diff --git a/.github/DEVELOPMENT.md b/.github/DEVELOPMENT.md
index 05baa979d493..3da05a0f6b41 100644
--- a/.github/DEVELOPMENT.md
+++ b/.github/DEVELOPMENT.md
@@ -26,22 +26,26 @@ A typical pull request should strive to contain a single logical change (but not
 necessarily a single commit). Unrelated changes should generally be extracted
 into their own PRs.
 
-If a pull request does consist of multiple commits, it is expected that every
-prefix of it is correct. That is, there might be preparatory commits at the 
-bottom of the stack that don't bring any value by themselves, but none of the
-commits should introduce an error that is fixed by some future commit. Every
-commit should build and pass all tests.
-
-Commit messages and history are also important, as they are used by other
-developers to keep track of the motivation behind changes. Keep logical diffs
-grouped together in separate commits, and order commits in a way that explains
-the progress of the changes. Rewriting and reordering commits may be a necessary
-part of the PR review process as the code changes. Mechanical changes (like
-refactoring and renaming)should be separated from logical and functional
-changes. E.g. deduplicating code or extracting helper methods should happen in a
-separate commit from the commit where new features or behavior is introduced.
-This makes reviewing the code much easier and reduces the chance of introducing
-unintended changes in behavior.
+If a pull request contains a stack of more than one commit, then
+popping any number of commits from the top of the stack, should not
+break the PR, ie. every commit should build and pass all tests.
+
+Commit messages and history are important as well, because they are
+used by other developers to keep track of the motivation behind
+changes. Keep logical diffs grouped together in separate commits and
+order commits in a way that explains by itself the evolution of the
+change. Rewriting and reordering commits is a natural part of the
+review process. Mechanical changes like refactoring, renaming, removing
+duplication, extracting helper methods, static imports should be kept
+separated from logical and functional changes like adding a new feature
+or modifying code behaviour. This makes reviewing the code much easier
+and reduces the chance of introducing unintended changes in behavior.
+
+Whenever in doubt on splitting a change into a separate commit, ask
+yourself the following question: if all other work in the PR needs to
+be reverted after merging to master for some objective reason (eg. a
+bug has been discovered), is it worth keeping that commit still in
+master.
 
 ## Code Style
 
@@ -151,6 +155,16 @@ allows static code analysis tools (e.g. Error Prone's `MissingCasesInEnumSwitch`
 check) report a problem when the enum definition is updated but the code using
 it is not.
 
+## Keep pom.xml clean and sorted
+
+There are several plugins in place to keep pom.xml clean.
+Your build may fail if:
+ - dependencies or XML elements are not ordered correctly
+ - overall pom.xml structure is not correct
+
+Many such errors may be fixed automatically by running the following:
+`./mvnw sortpom:sort`
+
 ## Additional IDE configuration
 
 When using IntelliJ to develop Trino, we recommend starting with all of the
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 6eb32e400f7d..c455d40906b6 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -5,8 +5,11 @@ inputs:
     description: "Java version to setup"
     default: 17
   cache:
-    description: "Cache Maven repo"
+    description: "Cache Maven repo (true/false/restore)"
     default: true
+  cleanup-node:
+    description: "Clean up node (true/false) to increase free disk space"
+    default: false # Disabled by default as it adds ~4 minutes of test runtime. Should be enabled case by case.
   download_dependencies:
     description: "Download all Maven dependencies so Maven can work in offline mode"
     default: true
@@ -33,12 +36,16 @@ runs:
       - name: Fetch base ref to find merge-base for GIB
         shell: bash
         run: .github/bin/git-fetch-base-ref.sh
+      - name: Free additional disk space
+        if: ${{ format('{0}', inputs.cleanup-node) == 'true' }}
+        shell: bash
+        run: ./.github/bin/free-disk-space.sh
       - uses: actions/setup-java@v3
         if: ${{ inputs.java-version != '' }}
         with:
-          distribution: 'zulu'
+          distribution: 'temurin' # use same JDK distro as in Trino docker images
           java-version: ${{ inputs.java-version }}
-      - name: Cache local Maven repo
+      - name: Cache and Restore local Maven repo
         id: cache
         if: ${{ format('{0}', inputs.cache) == 'true' }}
         uses: actions/cache@v3
@@ -47,6 +54,15 @@ runs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
+      - name: Restore local Maven repo
+        id: cache_restore
+        if: ${{ format('{0}', inputs.cache) == 'restore' }}
+        uses: actions/cache/restore@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
       - name: Fetch any missing dependencies
         shell: bash
         if: ${{ format('{0}', inputs.download_dependencies) == 'true' }}
diff --git a/.github/actions/update-check/action.yml b/.github/actions/update-check/action.yml
index b19b63c1740f..3bce2aacbe97 100644
--- a/.github/actions/update-check/action.yml
+++ b/.github/actions/update-check/action.yml
@@ -1,15 +1,15 @@
 name: "update-check-action"
-description: "Creates or updates a check for a specific PR"
+description: "Creates or updates a check for a specific PR and/or a comment"
 inputs:
   pull_request_number:
     description: "Number of the pull request to update checks in"
     required: true
   check_name:
     description: "Name of the check to update"
-    required: true
+    required: false
   conclusion:
     description: "Conclusion to set for the check"
-    required: true
+    required: false
   github_token:
     description: "GitHub token to authenticate with"
     default: ${{ github.token }}
@@ -25,7 +25,7 @@ runs:
   steps:
     - uses: actions/github-script@v6
       id: update-check-run
-      if: ${{ always() }}
+      if: inputs.check_name != '' && inputs.conclusion != ''
       env:
         number: ${{ inputs.pull_request_number }}
         check_name: ${{ inputs.check_name }}
@@ -63,7 +63,7 @@ runs:
           return result;
     - uses: actions/github-script@v6
       id: comment
-      if: ${{ always() }}
+      if: always()
       env:
         number: ${{ inputs.pull_request_number }}
         run_id: ${{ inputs.run_id }}
@@ -83,21 +83,31 @@ runs:
             exclude_pull_requests: true
           });
 
-          const message = "The CI workflow run with tests that require additional secrets finished as " + process.env.conclusion + ": " + run.html_url
+          const started = "The CI workflow run with tests that require additional secrets has been started: " + run.html_url
+          const finished = "The CI workflow run with tests that require additional secrets finished as " + process.env.conclusion + ": " + run.html_url
           const comments = await github.paginate(github.rest.issues.listComments.endpoint.merge({
             ...context.repo,
             issue_number: process.env.number
           }))
-          const exists = comments.filter(comment => comment.body === message).length != 0
+          const comment = comments.find(comment => comment.body === started || comment.body === finished)
+
+          if (comment !== undefined) {
+            if (comment.body === finished) {
+              return;
+            }
+            const { data: result } = await github.rest.issues.updateComment({
+              ...context.repo,
+              comment_id: comment.id,
+              body: finished
+            });
 
-          if (exists) {
-            return;
+            return result;
           }
 
           const { data: result } = await github.rest.issues.createComment({
             ...context.repo,
             issue_number: process.env.number,
-            body: message
+            body: started
           });
 
           return result;
diff --git a/.github/bin/cleanup-node.sh b/.github/bin/cleanup-node.sh
deleted file mode 100755
index 7abce200d961..000000000000
--- a/.github/bin/cleanup-node.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -euxo pipefail
-
-echo "Space before cleanup"
-df -h
-
-echo "Removing redundant directories"
-sudo rm -rf /opt/hostedtoolcache/go
-sudo rm -rf /usr/local/lib/android
-sudo rm -rf /usr/share/dotnet
-
-echo "Space after cleanup"
-df -h
diff --git a/.github/bin/download-maven-dependencies.sh b/.github/bin/download-maven-dependencies.sh
index f64fb9ec15b7..73331c43efa9 100755
--- a/.github/bin/download-maven-dependencies.sh
+++ b/.github/bin/download-maven-dependencies.sh
@@ -19,3 +19,5 @@ $RETRY $MAVEN_ONLINE -B -P ci,errorprone-compiler ${MAVEN_GIB} -Dgib.disable de.
 # TODO: Remove next step once https://github.com/qaware/go-offline-maven-plugin/issues/28 is fixed
 # trino-pinot overrides some common dependency versions, focus on it to make sure those overrides are downloaded as well
 $RETRY $MAVEN_ONLINE -B -P ci,errorprone-compiler ${MAVEN_GIB} -Dgib.disable de.qaware.maven:go-offline-maven-plugin:resolve-dependencies -pl ':trino-pinot'
+
+# Add more dynamic dependencies in the configuration section of the go-offline-maven-plugin in the root pom.xml
diff --git a/.github/bin/free-disk-space.sh b/.github/bin/free-disk-space.sh
new file mode 100755
index 000000000000..ef80026b7406
--- /dev/null
+++ b/.github/bin/free-disk-space.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+set -euo pipefail
+
+function list_installed_packages()
+{
+    apt list --installed "$1" 2>/dev/null | awk -F'/' 'NR>1{print $1}' | tr '\n' ' '
+}
+
+function free_up_disk_space_ubuntu()
+{
+    local packages=(
+        'azure-cli'
+        'aspnetcore-*'
+        'dotnet-*'
+        'firefox*'
+        'google-chrome-*'
+        'google-cloud-*'
+        'libmono-*'
+        'llvm-*'
+        'imagemagick'
+        'postgresql-*'
+        'rubu-*'
+        'spinxsearch'
+        'unixodbc-dev'
+        'mercurial'
+        'esl-erlang'
+        'microsoft-edge-stable'
+        'mono-*'
+        'msbuild'
+        'mysql-server-core-*'
+        'php-*'
+        'php7*'
+        'powershell*'
+        'mongo*'
+        'microsoft-edge*'
+        'subversion')
+
+    for package in "${packages[@]}"; do
+        installed_packages=$(list_installed_packages "${package}")
+        echo "Removing packages by pattern ${package}: ${installed_packages}"
+        sudo apt-get --auto-remove -y purge ${installed_packages}
+    done
+
+    echo "Autoremoving packages"
+    sudo apt-get autoremove -y
+
+    echo "Autocleaning"
+    sudo apt-get autoclean -y
+
+    echo  "Removing toolchains"
+    sudo rm -rf \
+      /usr/local/graalvm \
+      /usr/local/lib/android/ \
+      /usr/share/dotnet/ \
+      /opt/ghc/ \
+      /usr/local/share/boost/ \
+      "${AGENT_TOOLSDIRECTORY}"
+
+      echo "Prune docker images"
+      sudo docker system prune --all -f
+}
+
+echo "Disk space usage before cleaning:"
+df -k .
+
+echo "Clearing up disk usage:"
+free_up_disk_space_ubuntu
+
+echo "Disk space usage after cleaning:"
+df -k .
diff --git a/.github/bin/s3/delete-s3-bucket.sh b/.github/bin/s3/delete-s3-bucket.sh
new file mode 100755
index 000000000000..3b6dae54f457
--- /dev/null
+++ b/.github/bin/s3/delete-s3-bucket.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+S3_SCRIPTS_DIR="${BASH_SOURCE%/*}"
+
+if [[ ! -f "${S3_SCRIPTS_DIR}/.bucket-identifier" ]];  then
+    echo "Missing file ${S3_SCRIPTS_DIR}/.bucket-identifier"
+    exit 1
+fi
+
+S3_BUCKET_IDENTIFIER=$(cat "${S3_SCRIPTS_DIR}"/.bucket-identifier)
+
+echo "Deleting all leftover objects from AWS S3 bucket ${S3_BUCKET_IDENTIFIER}"
+aws s3 rm s3://"${S3_BUCKET_IDENTIFIER}" \
+  --region "${AWS_REGION}" \
+  --recursive
+
+echo "Deleting AWS S3 bucket ${S3_BUCKET_IDENTIFIER}"
+aws s3api delete-bucket \
+  --bucket "${S3_BUCKET_IDENTIFIER}" \
+  --region "${AWS_REGION}"
+
+echo "Waiting for AWS S3 bucket ${S3_BUCKET_IDENTIFIER} to be deleted"
+
+aws s3api wait bucket-not-exists \
+  --bucket "${S3_BUCKET_IDENTIFIER}" \
+  --region "${AWS_REGION}"
+
+echo "AWS S3 bucket ${S3_BUCKET_IDENTIFIER} has been deleted"
+
+rm -f "${S3_SCRIPTS_DIR}"/.bucket-identifier
diff --git a/.github/bin/s3/setup-empty-s3-bucket.sh b/.github/bin/s3/setup-empty-s3-bucket.sh
new file mode 100755
index 000000000000..89a9d7c9939f
--- /dev/null
+++ b/.github/bin/s3/setup-empty-s3-bucket.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+S3_SCRIPTS_DIR="${BASH_SOURCE%/*}"
+
+S3_BUCKET_IDENTIFIER=trino-s3fs-ci-$(openssl rand -hex 8)
+
+# Support both -d and -v date offset formats depending on operating system (-d for linux, -v for osx)
+S3_BUCKET_TTL=$(date -u -d "+2 hours" +"%Y-%m-%dT%H:%M:%SZ" 2>/dev/null || date -u -v "+2H" +"%Y-%m-%dT%H:%M:%SZ")
+
+echo "Creating an empty AWS S3 bucket ${S3_BUCKET_IDENTIFIER} in the region ${AWS_REGION}"
+
+OPTIONAL_BUCKET_CONFIGURATION=()
+# LocationConstraint configuration property is not allowed for us-east-1 AWS region
+if [ "${AWS_REGION}" != 'us-east-1' ]; then
+    OPTIONAL_BUCKET_CONFIGURATION+=("--create-bucket-configuration" "LocationConstraint=${AWS_REGION}")
+fi
+
+S3_CREATE_BUCKET_OUTPUT=$(aws s3api create-bucket \
+  --bucket "${S3_BUCKET_IDENTIFIER}" \
+  --region "${AWS_REGION}" \
+  "${OPTIONAL_BUCKET_CONFIGURATION[@]}")
+
+if [ -z "${S3_CREATE_BUCKET_OUTPUT}" ]; then
+    echo "Unexpected error while attempting to create the S3 bucket ${S3_BUCKET_IDENTIFIER} in the region ${AWS_REGION}"
+    exit 1
+fi
+
+echo "${S3_BUCKET_IDENTIFIER}" > "${S3_SCRIPTS_DIR}"/.bucket-identifier
+echo "Waiting for the AWS S3 bucket ${S3_BUCKET_IDENTIFIER} in the region ${AWS_REGION} to exist"
+
+# Wait for the bucket to exist
+aws s3api wait bucket-exists \
+  --bucket "${S3_BUCKET_IDENTIFIER}"
+
+echo "The AWS S3 bucket ${S3_BUCKET_IDENTIFIER} in the region ${AWS_REGION} exists"
+
+echo "Tagging the AWS S3 bucket ${S3_BUCKET_IDENTIFIER} with TTL tags"
+
+# "test" environment tag is needed so that the bucket gets cleaned up by the daily AWS resource cleanup job in case the
+# temporary bucket is not properly cleaned up by delete-s3-bucket.sh. The ttl tag tells the AWS resource cleanup job
+# when the bucket is expired and should be cleaned up
+aws s3api put-bucket-tagging \
+  --bucket "${S3_BUCKET_IDENTIFIER}" \
+  --tagging "TagSet=[{Key=environment,Value=test},{Key=ttl,Value=${S3_BUCKET_TTL}}]"
diff --git a/.github/config/labeler-config.yml b/.github/config/labeler-config.yml
index f5603c7ea04c..ae685830c4a4 100644
--- a/.github/config/labeler-config.yml
+++ b/.github/config/labeler-config.yml
@@ -6,6 +6,8 @@
   - plugin/trino-hive-hadoop2/**
   - plugin/trino-hive/**
   - testing/trino-product-tests/**
+  - lib/trino-filesystem/**
+  - lib/trino-filesystem-*/**
 
 jdbc:
   - client/trino-jdbc/**
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index bc650ac09562..2977a0a3a162 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -12,8 +12,8 @@
 <!-- Mark the appropriate option with an (x). Propose a release note if you can. -->
 ## Release notes
 
-( ) This is not user-visible or docs only and no release notes are required.
-( ) Release notes are required, please propose a release note for me.
+( ) This is not user-visible or is docs only, and no release notes are required.
+( ) Release notes are required. Please propose a release note for me.
 ( ) Release notes are required, with the following suggested text:
 
 ```markdown
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 56e8583ea151..2b1f31afd155 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,11 +31,11 @@ env:
   # the Docker daemon only downloads 3 layers concurrently which prevents the other pull from making any progress.
   # This value should be greater than the time taken for the longest image pull.
   TESTCONTAINERS_PULL_PAUSE_TIMEOUT: 600
-  TESTCONTAINERS_SKIP_ARCHITECTURE_CHECK: true
   TEST_REPORT_RETENTION_DAYS: 5
   HEAP_DUMP_RETENTION_DAYS: 14
   # used by actions/cache to retry the download after this time: https://github.com/actions/cache/blob/main/workarounds.md#cache-segment-restore-timeout
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
+  CI_SKIP_SECRETS_PRESENCE_CHECKS: ${{ secrets.CI_SKIP_SECRETS_PRESENCE_CHECKS }}
 
 # Cancel previous PR builds.
 concurrency:
@@ -57,10 +57,10 @@ jobs:
       matrix:
         java-version:
           - 17
-          - 20
+          - 21
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # checkout all commits, as the build result depends on `git describe` equivalent
           ref: |
@@ -70,20 +70,53 @@ jobs:
       - uses: ./.github/actions/setup
         with:
           java-version: ${{ matrix.java-version }}
+      - name: Check SPI backward compatibility
+        run: |
+          export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
+          $MAVEN clean install ${MAVEN_FAST_INSTALL} -pl :trino-spi -am
+          ${MAVEN//--offline/} clean verify -B --strict-checksums -DskipTests -pl :trino-spi
       - name: Maven Checks
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
-          $MAVEN clean install -B --strict-checksums -V -T 1C -DskipTests -P ci -pl '!:trino-server-rpm'
+          $MAVEN clean verify -B --strict-checksums -V -T 1C -DskipTests -P ci -pl '!:trino-server-rpm'
+      - name: Remove Trino from local Maven repo to avoid caching it
+        # Avoid caching artifacts built in this job, cache should only include dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: rm -rf ~/.m2/repository/io/trino/trino-*
+
+  artifact-checks:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # checkout all commits, as the build result depends on `git describe` equivalent
+          ref: |
+            ${{ github.event_name == 'repository_dispatch' &&
+                github.event.client_payload.pull_request.head.sha == github.event.client_payload.slash_command.args.named.sha &&
+                format('refs/pull/{0}/head', github.event.client_payload.pull_request.number) || '' }}
+      - uses: ./.github/actions/setup
+        with:
+          cleanup-node: true
+      - name: Maven Install
+        run: |
+          export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
+          $MAVEN clean install ${MAVEN_FAST_INSTALL} -pl '!:trino-docs,!:trino-server-rpm'
       - name: Test Server RPM
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
           $MAVEN verify -B --strict-checksums -P ci -pl :trino-server-rpm
+      - name: Test JDBC shading
+        # Run only integration tests to verify JDBC driver shading
+        run: |
+          export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
+          $MAVEN failsafe:integration-test failsafe:verify -B --strict-checksums -P ci -pl :trino-jdbc
       - name: Clean Maven Output
         run: $MAVEN clean -pl '!:trino-server,!:trino-cli'
       - uses: docker/setup-qemu-action@v2
         with:
           platforms: arm64,ppc64le
-      - name: Test Docker Image
+      - name: Build and Test Docker Image
         run: core/docker/build.sh
       - name: Remove Trino from local Maven repo to avoid caching it
         # Avoid caching artifacts built in this job, cache should only include dependencies
@@ -96,7 +129,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # checkout all commits to be able to determine merge base
       - name: Block illegal commits
@@ -128,7 +161,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.check-commits-dispatcher.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: matrix.commit != ''
         with:
           fetch-depth: 0 # checkout all commits to be able to determine merge base
@@ -146,7 +179,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # checkout all commits to be able to determine merge base for GIB
           ref: |
@@ -154,28 +187,24 @@ jobs:
                 github.event.client_payload.pull_request.head.sha == github.event.client_payload.slash_command.args.named.sha &&
                 format('refs/pull/{0}/head', github.event.client_payload.pull_request.number) || '' }}
       - uses: ./.github/actions/setup
-      - name: Maven Package
+        with:
+          cache: restore
+      - name: Maven Install
         run: |
+          # build everything to make sure dependencies of impacted modules are present
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
-          $MAVEN clean package ${MAVEN_FAST_INSTALL} ${MAVEN_GIB} -pl '!:trino-docs,!:trino-server,!:trino-server-rpm'
+          $MAVEN clean install ${MAVEN_FAST_INSTALL} ${MAVEN_GIB} -pl '!:trino-docs,!:trino-server,!:trino-server-rpm'
       - name: Error Prone Checks
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
-          # Run Error Prone on one module with a retry to ensure all runtime dependencies are fetched
-          $MAVEN ${MAVEN_TEST} -T 1C clean verify -DskipTests -P gib,errorprone-compiler -am -pl ':trino-spi'
-          # The main Error Prone run
-          $MAVEN ${MAVEN_TEST} -T 1C clean verify -DskipTests -P gib,errorprone-compiler \
+          $MAVEN ${MAVEN_TEST} -T 1C clean verify -DskipTests ${MAVEN_GIB} -Dgib.buildUpstream=never -P errorprone-compiler \
             -pl '!:trino-docs,!:trino-server,!:trino-server-rpm'
-      - name: Clean local Maven repo
-        # Avoid creating a cache entry because this job doesn't download all dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: rm -rf ~/.m2/repository
 
   web-ui-checks:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # checkout all commits: it's not needed here, but it's needed almost always, so let's do this for completeness
           ref: |
@@ -191,7 +220,7 @@ jobs:
     env:
       SECRETS_PRESENT: ${{ secrets.SECRETS_PRESENT }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # checkout tags so version in Manifest is set properly
           ref: |
@@ -199,6 +228,8 @@ jobs:
                 github.event.client_payload.pull_request.head.sha == github.event.client_payload.slash_command.args.named.sha &&
                 format('refs/pull/{0}/head', github.event.client_payload.pull_request.number) || '' }}
       - uses: ./.github/actions/setup
+        with:
+          cache: restore
       - name: Maven Install
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
@@ -243,10 +274,6 @@ jobs:
           path: |
             **/*.hprof
           retention-days: ${{ env.HEAP_DUMP_RETENTION_DAYS }}
-      - name: Clean local Maven repo
-        # Avoid creating a cache entry because this job doesn't download all dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: rm -rf ~/.m2/repository
 
   hive-tests:
     runs-on: ubuntu-latest
@@ -260,7 +287,7 @@ jobs:
     env:
       SECRETS_PRESENT: ${{ secrets.SECRETS_PRESENT }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # checkout all commits to be able to determine merge base for GIB
           ref: |
@@ -268,6 +295,8 @@ jobs:
                 github.event.client_payload.pull_request.head.sha == github.event.client_payload.slash_command.args.named.sha &&
                 format('refs/pull/{0}/head', github.event.client_payload.pull_request.number) || '' }}
       - uses: ./.github/actions/setup
+        with:
+          cache: restore
       - name: Install Hive Module
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
@@ -280,8 +309,8 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.TRINO_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.TRINO_AWS_SECRET_ACCESS_KEY }}
-          S3_BUCKET: "trino-ci-test"
-          S3_BUCKET_ENDPOINT: "https://s3.us-east-2.amazonaws.com"
+          S3_BUCKET: ${{ vars.TRINO_S3_BUCKET }}
+          S3_BUCKET_ENDPOINT: "https://s3.${{ vars.TRINO_AWS_REGION }}.amazonaws.com"
         run: |
           if [ "${AWS_ACCESS_KEY_ID}" != "" ]; then
             source plugin/trino-hive-hadoop2/conf/hive-tests-${{ matrix.config }}.sh &&
@@ -295,12 +324,14 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.TRINO_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.TRINO_AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: us-east-2
-          S3_BUCKET: "trino-ci-test"
-          S3_BUCKET_ENDPOINT: "s3.us-east-2.amazonaws.com"
+          AWS_REGION: ${{ vars.TRINO_AWS_REGION }}
+          S3_BUCKET: ${{ vars.TRINO_S3_BUCKET }}
+          S3_BUCKET_ENDPOINT: "s3.${{ vars.TRINO_AWS_REGION }}.amazonaws.com"
         run: |
           if [ "${AWS_ACCESS_KEY_ID}" != "" ]; then
-            $MAVEN test ${MAVEN_TEST} -pl :trino-hive -P aws-tests
+            $MAVEN test ${MAVEN_TEST} -pl :trino-hive -P aws-tests \
+              -Ds3.bucket="${S3_BUCKET}" \
+              -Ds3.bucket-endpoint="${S3_BUCKET_ENDPOINT}"
           fi
       - name: Run Hive Azure ABFS Access Key Tests
         if: matrix.config != 'config-empty' # Hive 1.x does not support Azure storage
@@ -349,10 +380,6 @@ jobs:
             source plugin/trino-hive-hadoop2/conf/hive-tests-${{ matrix.config }}.sh &&
               plugin/trino-hive-hadoop2/bin/run_hive_adl_tests.sh
           fi
-      - name: Run Hive Alluxio Tests
-        run: |
-          source plugin/trino-hive-hadoop2/conf/hive-tests-${{ matrix.config }}.sh &&
-            plugin/trino-hive-hadoop2/bin/run_hive_alluxio_tests.sh
       - name: Upload test results
         uses: actions/upload-artifact@v3
         # Upload all test reports only on failure, because the artifacts are large
@@ -394,10 +421,6 @@ jobs:
           check_name: ${{ github.job }} (${{ matrix.config }}) with secrets
           conclusion: ${{ job.status }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Clean local Maven repo
-        # Avoid creating a cache entry because this job doesn't download all dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: rm -rf ~/.m2/repository
 
   test-other-modules:
     runs-on: ubuntu-latest
@@ -405,7 +428,7 @@ jobs:
     env:
       SECRETS_PRESENT: ${{ secrets.SECRETS_PRESENT }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # checkout all commits to be able to determine merge base for GIB
           ref: |
@@ -413,6 +436,9 @@ jobs:
                 github.event.client_payload.pull_request.head.sha == github.event.client_payload.slash_command.args.named.sha &&
                 format('refs/pull/{0}/head', github.event.client_payload.pull_request.number) || '' }}
       - uses: ./.github/actions/setup
+        with:
+          cache: restore
+          cleanup-node: true
       - name: Maven Install
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
@@ -421,36 +447,50 @@ jobs:
         run: |
           $MAVEN test ${MAVEN_TEST} -pl '
             !:trino-accumulo,
+            !:trino-base-jdbc,
             !:trino-bigquery,
             !:trino-cassandra,
             !:trino-clickhouse,
             !:trino-delta-lake,
-            !:trino-docs,!:trino-server,!:trino-server-rpm,
+            !:trino-docs,
             !:trino-druid,
             !:trino-elasticsearch,
             !:trino-faulttolerant-tests,
+            !:trino-filesystem,
+            !:trino-filesystem-azure,
+            !:trino-filesystem-manager,
+            !:trino-filesystem-s3,
+            !:trino-google-sheets,
+            !:trino-hdfs,
             !:trino-hive,
             !:trino-hudi,
             !:trino-iceberg,
             !:trino-ignite,
-            !:trino-jdbc,!:trino-base-jdbc,!:trino-thrift,!:trino-memory,
+            !:trino-jdbc,
             !:trino-kafka,
             !:trino-kudu,
             !:trino-main,
             !:trino-mariadb,
+            !:trino-memory,
             !:trino-mongodb,
             !:trino-mysql,
             !:trino-oracle,
+            !:trino-orc,
+            !:trino-parquet,
             !:trino-phoenix5,
             !:trino-pinot,
             !:trino-postgresql,
             !:trino-raptor-legacy,
             !:trino-redis,
             !:trino-redshift,
+            !:trino-resource-group-managers,
+            !:trino-server,
+            !:trino-server-rpm,
             !:trino-singlestore,
             !:trino-sqlserver,
             !:trino-test-jdbc-compatibility-old-server,
-            !:trino-tests'
+            !:trino-tests,
+            !:trino-thrift'
       - name: Upload test results
         uses: actions/upload-artifact@v3
         # Upload all test reports only on failure, because the artifacts are large
@@ -480,17 +520,13 @@ jobs:
           path: |
             **/*.hprof
           retention-days: ${{ env.HEAP_DUMP_RETENTION_DAYS }}
-      - name: Clean local Maven repo
-        # Avoid creating a cache entry because this job doesn't download all dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: rm -rf ~/.m2/repository
 
   build-test-matrix:
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # checkout all commits to be able to determine merge base for GIB
           ref: |
@@ -498,6 +534,17 @@ jobs:
                 github.event.client_payload.pull_request.head.sha == github.event.client_payload.slash_command.args.named.sha &&
                 format('refs/pull/{0}/head', github.event.client_payload.pull_request.number) || '' }}
       - uses: ./.github/actions/setup
+        with:
+          cache: restore
+      - name: Update PR check
+        uses: ./.github/actions/update-check
+        if: >-
+          github.event_name == 'repository_dispatch' &&
+          github.event.client_payload.slash_command.args.named.sha != '' &&
+          github.event.client_payload.pull_request.head.sha == github.event.client_payload.slash_command.args.named.sha
+        with:
+          pull_request_number: ${{ github.event.client_payload.pull_request.number }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
       - name: Maven validate
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
@@ -509,10 +556,24 @@ jobs:
           touch gib-impacted.log
           cat <<EOF > .github/test-matrix.yaml
           include:
-            - { modules: [ client/trino-jdbc, plugin/trino-base-jdbc, plugin/trino-thrift, plugin/trino-memory ] }
+            - modules:
+                - client/trino-jdbc
+                - plugin/trino-base-jdbc
+                - plugin/trino-memory
+                - plugin/trino-thrift
+            - modules:
+                - lib/trino-orc
+                - lib/trino-parquet
+            - modules:
+                - lib/trino-filesystem
+                - lib/trino-filesystem-azure
+                - lib/trino-filesystem-manager
+                - lib/trino-filesystem-s3
+                - lib/trino-hdfs
             - { modules: core/trino-main }
-            - { modules: core/trino-main, jdk: 19 }
-            - { modules: core/trino-main, jdk: 20 }
+            - { modules: core/trino-main, jdk: 21 }
+            - { modules: lib/trino-filesystem-s3, profile: cloud-tests }
+            - { modules: lib/trino-filesystem-azure, profile: cloud-tests }
             - { modules: plugin/trino-accumulo }
             - { modules: plugin/trino-bigquery }
             - { modules: plugin/trino-bigquery, profile: cloud-tests-arrow }
@@ -520,14 +581,18 @@ jobs:
             - { modules: plugin/trino-clickhouse }
             - { modules: plugin/trino-delta-lake }
             - { modules: plugin/trino-delta-lake, profile: cloud-tests }
-            - { modules: plugin/trino-delta-lake, profile: gcs-tests }
+            - { modules: plugin/trino-delta-lake, profile: fte-tests }
             - { modules: plugin/trino-druid }
             - { modules: plugin/trino-elasticsearch }
+            - { modules: plugin/trino-google-sheets }
             - { modules: plugin/trino-hive }
+            - { modules: plugin/trino-hive, profile: fte-tests }
             - { modules: plugin/trino-hive, profile: test-parquet }
             - { modules: plugin/trino-hudi }
             - { modules: plugin/trino-iceberg }
             - { modules: plugin/trino-iceberg, profile: cloud-tests }
+            - { modules: plugin/trino-iceberg, profile: fte-tests }
+            - { modules: plugin/trino-iceberg, profile: minio-and-avro }
             - { modules: plugin/trino-ignite }
             - { modules: plugin/trino-kafka }
             - { modules: plugin/trino-kudu }
@@ -542,28 +607,19 @@ jobs:
             - { modules: plugin/trino-redis }
             - { modules: plugin/trino-redshift }
             - { modules: plugin/trino-redshift, profile: cloud-tests }
+            - { modules: plugin/trino-redshift, profile: fte-tests }
+            - { modules: plugin/trino-resource-group-managers }
             - { modules: plugin/trino-singlestore }
             - { modules: plugin/trino-sqlserver }
             - { modules: testing/trino-faulttolerant-tests, profile: default }
-            - { modules: plugin/trino-delta-lake, profile: fte-tests }
             - { modules: testing/trino-faulttolerant-tests, profile: test-fault-tolerant-delta }
-            - { modules: plugin/trino-hive, profile: fte-tests }
             - { modules: testing/trino-faulttolerant-tests, profile: test-fault-tolerant-hive }
-            - { modules: plugin/trino-iceberg, profile: fte-tests }
             - { modules: testing/trino-faulttolerant-tests, profile: test-fault-tolerant-iceberg }
-            - { modules: plugin/trino-postgresql, profile: fte-tests }
-            - { modules: plugin/trino-mongodb, profile: fte-tests }
-            - { modules: plugin/trino-mysql, profile: fte-tests }
-            - { modules: plugin/trino-sqlserver, profile: fte-tests }
             - { modules: testing/trino-tests }
           EOF
           ./.github/bin/build-matrix-from-impacted.py -v -i gib-impacted.log -m .github/test-matrix.yaml -o matrix.json
           echo "Matrix: $(jq '.' matrix.json)"
           echo "matrix=$(jq -c '.' matrix.json)" >> $GITHUB_OUTPUT
-      - name: Clean local Maven repo
-        # Avoid creating a cache entry because this job doesn't download all dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: rm -rf ~/.m2/repository
 
   test:
     runs-on: ubuntu-latest
@@ -576,7 +632,7 @@ jobs:
     env:
       SECRETS_PRESENT: ${{ secrets.SECRETS_PRESENT }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # checkout all commits to be able to determine merge base for GIB
           ref: |
@@ -585,11 +641,9 @@ jobs:
                 format('refs/pull/{0}/head', github.event.client_payload.pull_request.number) || '' }}
       - uses: ./.github/actions/setup
         with:
+          cache: restore
           java-version: ${{ matrix.jdk != '' && matrix.jdk || '17' }}
-      - name: Cleanup node
-        # This is required as a virtual environment update 20210219.1 left too little space for MemSQL to work
-        if: matrix.modules == 'plugin/trino-singlestore'
-        run: .github/bin/cleanup-node.sh
+          cleanup-node: ${{ format('{0}', matrix.modules == 'plugin/trino-singlestore') }}
       - name: Maven Install
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
@@ -598,92 +652,131 @@ jobs:
         if: >-
           matrix.modules != 'plugin/trino-singlestore'
           && ! (contains(matrix.modules, 'trino-delta-lake') && contains(matrix.profile, 'cloud-tests'))
-          && ! (contains(matrix.modules, 'trino-delta-lake') && contains(matrix.profile, 'gcs-tests'))
           && ! (contains(matrix.modules, 'trino-iceberg') && contains(matrix.profile, 'cloud-tests'))
           && ! (contains(matrix.modules, 'trino-bigquery') && contains(matrix.profile, 'cloud-tests-arrow'))
           && ! (contains(matrix.modules, 'trino-redshift') && contains(matrix.profile, 'cloud-tests'))
+          && ! (contains(matrix.modules, 'trino-redshift') && contains(matrix.profile, 'fte-tests'))
+          && ! (contains(matrix.modules, 'trino-filesystem-s3') && contains(matrix.profile, 'cloud-tests'))
+          && ! (contains(matrix.modules, 'trino-filesystem-azure') && contains(matrix.profile, 'cloud-tests'))
         run: $MAVEN test ${MAVEN_TEST} -pl ${{ matrix.modules }} ${{ matrix.profile != '' && format('-P {0}', matrix.profile) || '' }}
       # Additional tests for selected modules
+      - name: HDFS file system cache isolated JVM tests
+        if: contains(matrix.modules, 'trino-hdfs')
+        run: |
+          $MAVEN test ${MAVEN_TEST} -pl :trino-hdfs -P test-isolated-jvm-suites
+      - name: S3 FileSystem Cloud Tests
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.TRINO_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.TRINO_AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: ${{ vars.TRINO_AWS_REGION }}
+        if: >-
+          contains(matrix.modules, 'trino-filesystem-s3') && contains(matrix.profile, 'cloud-tests') &&
+          (env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || env.AWS_ACCESS_KEY_ID != '' || env.AWS_SECRET_ACCESS_KEY != '')
+        run: |
+          # Create an empty S3 bucket for S3 filesystem cloud tests and add the bucket name to GitHub environment variables
+          .github/bin/s3/setup-empty-s3-bucket.sh
+          EMPTY_S3_BUCKET=$(cat .github/bin/s3/.bucket-identifier)
+          export EMPTY_S3_BUCKET
+          $MAVEN test ${MAVEN_TEST} -pl ${{ matrix.modules }} ${{ format('-P {0}', matrix.profile) }}
+      - name: Cleanup ephemeral S3 buckets
+        env:
+          AWS_REGION: ${{ vars.TRINO_AWS_REGION }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.TRINO_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.TRINO_AWS_SECRET_ACCESS_KEY }}
+        # Cancelled workflows may not have cleaned up the ephemeral bucket
+        if: always()
+        run: .github/bin/s3/delete-s3-bucket.sh || true
+      - name: Azure FileSystem Cloud Tests
+        env:
+          ABFS_BLOB_ACCOUNT: todo
+          ABFS_BLOB_ACCESS_KEY: todo
+          ABFS_FLAT_ACCOUNT: todo
+          ABFS_FLAT_ACCESS_KEY: todo
+          ABFS_ACCOUNT: todo
+          ABFS_ACCESS_KEY: todo
+        # todo(https://github.com/trinodb/trino/issues/18998) Enable when we have env variables in place
+        if: >-
+          false &&
+          contains(matrix.modules, 'trino-filesystem-azure') && contains(matrix.profile, 'cloud-tests') &&
+          (env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || env.ABFS_BLOB_ACCOUNT != '' || env.ABFS_BLOB_ACCESS_KEY != '' || env.ABFS_FLAT_ACCOUNT != '' || env.ABFS_FLAT_ACCESS_KEY != '' || env.ABFS_ACCOUNT != '' || env.ABFS_ACCESS_KEY != '')
+        run: |
+          $MAVEN test ${MAVEN_TEST} -pl ${{ matrix.modules }} ${{ format('-P {0}', matrix.profile) }}
       - name: Cloud Delta Lake Tests
       # Cloud tests are separate because they are time intensive, requiring cross-cloud network communication
         env:
           ABFS_CONTAINER: ${{ secrets.AZURE_ABFS_CONTAINER }}
           ABFS_ACCOUNT: ${{ secrets.AZURE_ABFS_ACCOUNT }}
           ABFS_ACCESSKEY: ${{ secrets.AZURE_ABFS_ACCESSKEY }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESSKEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRETKEY }}
-          AWS_REGION: us-east-2
+          AWS_ACCESS_KEY_ID: ${{ secrets.TRINO_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.TRINO_AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: ${{ vars.TRINO_AWS_REGION }}
+          S3_BUCKET: ${{ vars.TRINO_S3_BUCKET }}
+          GCP_CREDENTIALS_KEY: ${{ secrets.GCP_CREDENTIALS_KEY }}
+          GCP_STORAGE_BUCKET: ${{ vars.GCP_STORAGE_BUCKET }}
         # Run tests if any of the secrets is present. Do not skip tests when one secret renamed, or secret name has a typo.
         if: >-
           contains(matrix.modules, 'trino-delta-lake') && contains(matrix.profile, 'cloud-tests') &&
-          (env.ABFS_ACCOUNT != '' || env.ABFS_CONTAINER != '' || env.ABFS_ACCESSKEY != '' || env.AWS_ACCESS_KEY_ID != '' || env.AWS_SECRET_ACCESS_KEY != '')
+          (env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || env.ABFS_ACCOUNT != '' || env.ABFS_CONTAINER != '' || env.ABFS_ACCESSKEY != '' || env.AWS_ACCESS_KEY_ID != '' || env.AWS_SECRET_ACCESS_KEY != '' || env.GCP_CREDENTIALS_KEY != '')
         run: |
           $MAVEN test ${MAVEN_TEST} ${{ format('-P {0}', matrix.profile) }} -pl :trino-delta-lake \
             -Dhive.hadoop2.azure-abfs-container="${ABFS_CONTAINER}" \
             -Dhive.hadoop2.azure-abfs-account="${ABFS_ACCOUNT}" \
-            -Dhive.hadoop2.azure-abfs-access-key="${ABFS_ACCESSKEY}"
-      - name: GCS Delta Lake Tests
-      # Cloud tests are separate because they are time intensive, requiring cross-cloud network communication
-        env:
-          GCP_CREDENTIALS_KEY: ${{ secrets.GCP_CREDENTIALS_KEY }}
-        # Run tests if any of the secrets is present. Do not skip tests when one secret renamed, or secret name has a typo.
-        if: >-
-          contains(matrix.modules, 'trino-delta-lake') && contains(matrix.profile, 'gcs-tests') && env.GCP_CREDENTIALS_KEY != ''
-        run: |
-          $MAVEN test ${MAVEN_TEST} -P gcs-tests -pl :trino-delta-lake \
-            -Dtesting.gcp-storage-bucket="trino-ci-test" \
+            -Dhive.hadoop2.azure-abfs-access-key="${ABFS_ACCESSKEY}" \
+            -Dtesting.gcp-storage-bucket="${GCP_STORAGE_BUCKET}" \
             -Dtesting.gcp-credentials-key="${GCP_CREDENTIALS_KEY}"
       - name: Memsql Tests
         env:
           MEMSQL_LICENSE: ${{ secrets.MEMSQL_LICENSE }}
-        if: matrix.modules == 'plugin/trino-singlestore' && env.MEMSQL_LICENSE != ''
+        if: matrix.modules == 'plugin/trino-singlestore' && (env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || env.MEMSQL_LICENSE != '')
         run: |
           $MAVEN test ${MAVEN_TEST} -pl :trino-singlestore -Dmemsql.license=${MEMSQL_LICENSE}
       - name: Cloud BigQuery Tests
         env:
           BIGQUERY_CREDENTIALS_KEY: ${{ secrets.BIGQUERY_CREDENTIALS_KEY }}
-        if: matrix.modules == 'plugin/trino-bigquery' && !contains(matrix.profile, 'cloud-tests-arrow') && env.BIGQUERY_CREDENTIALS_KEY != ''
+          GCP_STORAGE_BUCKET: ${{ vars.GCP_STORAGE_BUCKET }}
+        if: matrix.modules == 'plugin/trino-bigquery' && !contains(matrix.profile, 'cloud-tests-arrow') && (env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || env.BIGQUERY_CREDENTIALS_KEY != '')
         run: |
           $MAVEN test ${MAVEN_TEST} -pl :trino-bigquery -Pcloud-tests \
             -Dbigquery.credentials-key="${BIGQUERY_CREDENTIALS_KEY}" \
-            -Dtesting.gcp-storage-bucket="trino-ci-test" \
+            -Dtesting.gcp-storage-bucket="${GCP_STORAGE_BUCKET}" \
             -Dtesting.alternate-bq-project-id=bigquery-cicd-alternate
       - name: Cloud BigQuery Arrow Serialization Tests
         env:
           BIGQUERY_CREDENTIALS_KEY: ${{ secrets.BIGQUERY_CREDENTIALS_KEY }}
-        if: matrix.modules == 'plugin/trino-bigquery' && contains(matrix.profile, 'cloud-tests-arrow') && env.BIGQUERY_CREDENTIALS_KEY != ''
+          GCP_STORAGE_BUCKET: ${{ vars.GCP_STORAGE_BUCKET }}
+        if: matrix.modules == 'plugin/trino-bigquery' && contains(matrix.profile, 'cloud-tests-arrow') && (env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || env.BIGQUERY_CREDENTIALS_KEY != '')
         run: |
           $MAVEN test ${MAVEN_TEST} -pl :trino-bigquery -Pcloud-tests-arrow \
             -Dbigquery.credentials-key="${BIGQUERY_CREDENTIALS_KEY}" \
-            -Dtesting.gcp-storage-bucket="trino-ci-test"
+            -Dtesting.gcp-storage-bucket="${GCP_STORAGE_BUCKET}"
       - name: Cloud BigQuery Case Insensitive Mapping Tests
         env:
           BIGQUERY_CASE_INSENSITIVE_CREDENTIALS_KEY: ${{ secrets.BIGQUERY_CASE_INSENSITIVE_CREDENTIALS_KEY }}
-        if: matrix.modules == 'plugin/trino-bigquery' && !contains(matrix.profile, 'cloud-tests-arrow') && env.BIGQUERY_CASE_INSENSITIVE_CREDENTIALS_KEY != ''
+        if: matrix.modules == 'plugin/trino-bigquery' && !contains(matrix.profile, 'cloud-tests-arrow') && (env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || env.BIGQUERY_CASE_INSENSITIVE_CREDENTIALS_KEY != '')
         run: |
           $MAVEN test ${MAVEN_TEST} -pl :trino-bigquery -Pcloud-tests-case-insensitive-mapping -Dbigquery.credentials-key="${BIGQUERY_CASE_INSENSITIVE_CREDENTIALS_KEY}"
       - name: Iceberg Cloud Tests
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.TRINO_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.TRINO_AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: us-east-2
-          S3_BUCKET: trino-ci-test
+          AWS_REGION: ${{ vars.TRINO_AWS_REGION }}
+          S3_BUCKET: ${{ vars.TRINO_S3_BUCKET }}
           GCP_CREDENTIALS_KEY: ${{ secrets.GCP_CREDENTIALS_KEY }}
+          GCP_STORAGE_BUCKET: ${{ vars.GCP_STORAGE_BUCKET }}
           ABFS_CONTAINER: ${{ secrets.AZURE_ABFS_CONTAINER }}
           ABFS_ACCOUNT: ${{ secrets.AZURE_ABFS_ACCOUNT }}
           ABFS_ACCESS_KEY: ${{ secrets.AZURE_ABFS_ACCESSKEY }}
         if: >-
           contains(matrix.modules, 'trino-iceberg') && contains(matrix.profile, 'cloud-tests') &&
-          (env.AWS_ACCESS_KEY_ID != '' || env.AWS_SECRET_ACCESS_KEY != '' || env.GCP_CREDENTIALS_KEY != '')
+          (env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || env.AWS_ACCESS_KEY_ID != '' || env.AWS_SECRET_ACCESS_KEY != '' || env.GCP_CREDENTIALS_KEY != '')
         run: |
           $MAVEN test ${MAVEN_TEST} -pl :trino-iceberg ${{ format('-P {0}', matrix.profile) }} \
-            -Ds3.bucket=${S3_BUCKET} \
-            -Dtesting.gcp-storage-bucket="trino-ci-test-us-east" \
+            -Dtesting.gcp-storage-bucket="${GCP_STORAGE_BUCKET}" \
             -Dtesting.gcp-credentials-key="${GCP_CREDENTIALS_KEY}" \
             -Dhive.hadoop2.azure-abfs-container="${ABFS_CONTAINER}" \
             -Dhive.hadoop2.azure-abfs-account="${ABFS_ACCOUNT}" \
             -Dhive.hadoop2.azure-abfs-access-key="${ABFS_ACCESS_KEY}"
-      - name: Cloud Redshift Tests
+      - name: Cloud Redshift Tests ${{ matrix.profile }}
         env:
           AWS_REGION: ${{ vars.REDSHIFT_AWS_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.REDSHIFT_AWS_ACCESS_KEY_ID }}
@@ -693,12 +786,13 @@ jobs:
           REDSHIFT_VPC_SECURITY_GROUP_IDS: ${{ vars.REDSHIFT_VPC_SECURITY_GROUP_IDS }}
           REDSHIFT_S3_TPCH_TABLES_ROOT: ${{ vars.REDSHIFT_S3_TPCH_TABLES_ROOT }}
         if: >-
-          contains(matrix.modules, 'trino-redshift') && contains(matrix.profile, 'cloud-tests') &&
-          (env.AWS_ACCESS_KEY_ID != '' || env.REDSHIFT_SUBNET_GROUP_NAME != '')
+          contains(matrix.modules, 'trino-redshift') &&
+          (contains(matrix.profile, 'cloud-tests') || contains(matrix.profile, 'fte-tests')) &&
+          (env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || env.AWS_ACCESS_KEY_ID != '' || env.REDSHIFT_SUBNET_GROUP_NAME != '')
         run: |
           source .github/bin/redshift/setup-aws-redshift.sh
 
-          $MAVEN test ${MAVEN_TEST} -pl :trino-redshift ${{ format('-P {0}', matrix.profile) }} \
+          $MAVEN test ${MAVEN_TEST} -pl ${{ matrix.modules }} ${{ format('-P {0}', matrix.profile) }} \
             -Dtest.redshift.jdbc.user="${REDSHIFT_USER}" \
             -Dtest.redshift.jdbc.password="${REDSHIFT_PASSWORD}" \
             -Dtest.redshift.jdbc.endpoint="${REDSHIFT_ENDPOINT}:${REDSHIFT_PORT}/" \
@@ -764,10 +858,6 @@ jobs:
           check_name: ${{ github.job }} with secrets
           conclusion: ${{ job.status }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Clean local Maven repo
-        # Avoid creating a cache entry because this job doesn't download all dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: rm -rf ~/.m2/repository
 
   build-pt:
     runs-on: ubuntu-latest
@@ -775,7 +865,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
       product-tests-changed: ${{ steps.filter.outputs.product-tests }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # checkout all commits to be able to determine merge base for GIB
           ref: |
@@ -783,6 +873,9 @@ jobs:
                 github.event.client_payload.pull_request.head.sha == github.event.client_payload.slash_command.args.named.sha &&
                 format('refs/pull/{0}/head', github.event.client_payload.pull_request.number) || '' }}
       - uses: ./.github/actions/setup
+        with:
+          cache: restore
+          cleanup-node: true
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -802,7 +895,8 @@ jobs:
       - name: Map impacted plugins to features
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
-          $MAVEN validate ${MAVEN_FAST_INSTALL} ${MAVEN_GIB} -Dgib.logImpactedTo=gib-impacted.log -pl '!:trino-docs'
+          # build a list of impacted modules, ignoring modules that cannot affect either product tests or Trino
+          $MAVEN validate ${MAVEN_FAST_INSTALL} ${MAVEN_GIB} -Dgib.logImpactedTo=gib-impacted.log -pl '!:trino-docs,!:trino-tests,!:trino-faulttolerant-tests'
           # GIB doesn't run on master, so make sure the file always exist
           touch gib-impacted.log
           testing/trino-plugin-reader/target/trino-plugin-reader-*-executable.jar -i gib-impacted.log -p core/trino-server/target/trino-server-*-hardlinks/plugin > impacted-features.log
@@ -824,67 +918,67 @@ jobs:
           cat <<EOF > .github/test-pt-matrix.yaml
           config:
             - default
-            - hdp3
-            # TODO: config-apache-hive3
           suite:
             - suite-1
             - suite-2
             - suite-3
             # suite-4 does not exist
             - suite-5
+            - suite-6-non-generic
+            - suite-7-non-generic
+            - suite-8-non-generic
             - suite-azure
-            - suite-delta-lake-databricks73
             - suite-delta-lake-databricks91
             - suite-delta-lake-databricks104
             - suite-delta-lake-databricks113
+            - suite-delta-lake-databricks122
+            - suite-delta-lake-databricks133
             - suite-gcs
             - suite-clients
             - suite-functions
             - suite-tpch
+            - suite-tpcds
             - suite-storage-formats-detailed
+            - suite-parquet
+            - suite-oauth2
+            - suite-ldap
+            - suite-compatibility
+            - suite-all-connectors-smoke
+            - suite-delta-lake-oss
+            - suite-kafka
+            - suite-cassandra
+            - suite-clickhouse
+            - suite-mysql
+            - suite-iceberg
+            - suite-hudi
+            - suite-ignite
           exclude:
-            - config: default
-              ignore exclusion if: >-
-                ${{ github.event_name != 'pull_request'
-                 || github.event.pull_request.head.repo.full_name == github.repository
-                 || contains(github.event.pull_request.labels.*.name, 'tests:all')
-                 || contains(github.event.pull_request.labels.*.name, 'tests:hive')
-                 }}
-
-            - suite: suite-azure
-              config: default
             - suite: suite-azure
               ignore exclusion if: >-
-                ${{ secrets.AZURE_ABFS_CONTAINER != '' &&
-                    secrets.AZURE_ABFS_ACCOUNT != '' &&
+                ${{ env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' ||
+                    secrets.AZURE_ABFS_CONTAINER != '' ||
+                    secrets.AZURE_ABFS_ACCOUNT != '' ||
                     secrets.AZURE_ABFS_ACCESSKEY != '' }}
 
-            - suite: suite-gcs
-              config: default
             - suite: suite-gcs
               ignore exclusion if: >-
-                ${{ secrets.GCP_CREDENTIALS_KEY != '' }}
+                ${{ env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || secrets.GCP_CREDENTIALS_KEY != '' }}
 
-            - suite: suite-delta-lake-databricks73
-              config: hdp3
-            - suite: suite-delta-lake-databricks73
-              ignore exclusion if: >-
-                ${{ secrets.DATABRICKS_TOKEN != '' }}
-            - suite: suite-delta-lake-databricks91
-              config: hdp3
             - suite: suite-delta-lake-databricks91
               ignore exclusion if: >-
-                ${{ secrets.DATABRICKS_TOKEN != '' }}
-            - suite: suite-delta-lake-databricks104
-              config: hdp3
+                ${{ env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || secrets.DATABRICKS_TOKEN != '' }}
             - suite: suite-delta-lake-databricks104
               ignore exclusion if: >-
-                ${{ secrets.DATABRICKS_TOKEN != '' }}
-            - suite: suite-delta-lake-databricks113
-              config: hdp3
+                ${{ env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || secrets.DATABRICKS_TOKEN != '' }}
             - suite: suite-delta-lake-databricks113
               ignore exclusion if: >-
-                ${{ secrets.DATABRICKS_TOKEN != '' }}
+                ${{ env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || secrets.DATABRICKS_TOKEN != '' }}
+            - suite: suite-delta-lake-databricks122
+              ignore exclusion if: >-
+                ${{ env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || secrets.DATABRICKS_TOKEN != '' }}
+            - suite: suite-delta-lake-databricks133
+              ignore exclusion if: >-
+                ${{ env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || secrets.DATABRICKS_TOKEN != '' }}
 
           ignore exclusion if:
             # Do not use this property outside of the matrix configuration.
@@ -898,60 +992,9 @@ jobs:
             #   value of the property, and the exclusion will apply normally.
             - "false"
           include:
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-6-non-generic
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-7-non-generic
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-8-non-generic
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-tpcds
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-parquet
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-oauth2
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-ldap
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-compatibility
             # this suite is designed specifically for apache-hive3. TODO remove the suite once we can run all regular tests on apache-hive3.
             - config: apache-hive3
               suite: suite-hms-only
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-all-connectors-smoke
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-delta-lake-oss
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-kafka
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-cassandra
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-clickhouse
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-mysql
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-iceberg
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-hudi
-            # this suite is not meant to be run with different configs
-            - config: default
-              suite: suite-ignite
           EOF
       - name: Build PT matrix (all)
         if: |
@@ -977,10 +1020,11 @@ jobs:
           AWS_REGION:
           TRINO_AWS_ACCESS_KEY_ID:
           TRINO_AWS_SECRET_ACCESS_KEY:
-          DATABRICKS_73_JDBC_URL:
           DATABRICKS_91_JDBC_URL:
           DATABRICKS_104_JDBC_URL:
           DATABRICKS_113_JDBC_URL:
+          DATABRICKS_122_JDBC_URL:
+          DATABRICKS_133_JDBC_URL:
           DATABRICKS_LOGIN:
           DATABRICKS_TOKEN:
           GCP_CREDENTIALS_KEY:
@@ -993,10 +1037,6 @@ jobs:
         run: |
           echo "Matrix: $(jq '.' matrix.json)"
           echo "matrix=$(cat matrix.json)" >> $GITHUB_OUTPUT
-      - name: Clean local Maven repo
-        # Avoid creating a cache entry because this job doesn't download all dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: rm -rf ~/.m2/repository
 
   pt:
     runs-on: ubuntu-latest
@@ -1010,7 +1050,7 @@ jobs:
     timeout-minutes: 130
     needs: build-pt
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # checkout all commits, as the build result depends on `git describe` equivalent
           ref: |
@@ -1043,18 +1083,19 @@ jobs:
           ABFS_CONTAINER: ${{ secrets.AZURE_ABFS_CONTAINER }}
           ABFS_ACCOUNT: ${{ secrets.AZURE_ABFS_ACCOUNT }}
           ABFS_ACCESS_KEY: ${{ secrets.AZURE_ABFS_ACCESSKEY }}
-          S3_BUCKET: trino-ci-test
-          AWS_REGION: us-east-2
+          S3_BUCKET: ${{ vars.TRINO_S3_BUCKET }}
+          AWS_REGION: ${{ vars.TRINO_AWS_REGION }}
           TRINO_AWS_ACCESS_KEY_ID: ${{ secrets.TRINO_AWS_ACCESS_KEY_ID }}
           TRINO_AWS_SECRET_ACCESS_KEY: ${{ secrets.TRINO_AWS_SECRET_ACCESS_KEY }}
-          DATABRICKS_73_JDBC_URL: ${{ secrets.DATABRICKS_73_JDBC_URL }}
           DATABRICKS_91_JDBC_URL: ${{ secrets.DATABRICKS_91_JDBC_URL }}
           DATABRICKS_104_JDBC_URL: ${{ secrets.DATABRICKS_104_JDBC_URL }}
           DATABRICKS_113_JDBC_URL: ${{ secrets.DATABRICKS_113_JDBC_URL }}
+          DATABRICKS_122_JDBC_URL: ${{ secrets.DATABRICKS_122_JDBC_URL }}
+          DATABRICKS_133_JDBC_URL: ${{ secrets.DATABRICKS_133_JDBC_URL }}
           DATABRICKS_LOGIN: token
           DATABRICKS_TOKEN: ${{ secrets.DATABRICKS_TOKEN }}
           GCP_CREDENTIALS_KEY: ${{ secrets.GCP_CREDENTIALS_KEY }}
-          GCP_STORAGE_BUCKET: trino-ci-test-us-east
+          GCP_STORAGE_BUCKET: ${{ vars.GCP_STORAGE_BUCKET }}
         run: |
           exec testing/trino-product-tests-launcher/target/trino-product-tests-launcher-*-executable.jar suite run \
             --suite ${{ matrix.suite }} \
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 29fb4d475f65..f8f49d9408b4 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -48,10 +48,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
+          distribution: 'temurin' # use same JDK distro as in Trino docker images
           java-version: 17
           cache: 'maven'
       - name: Configure Problem Matchers
@@ -80,12 +80,12 @@ jobs:
           - ":trino-tests"
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # checkout all commits, as the build result depends on `git describe` equivalent
       - uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
+          distribution: 'temurin' # use same JDK distro as in Trino docker images
           java-version: 17
           cache: 'maven'
       - name: Configure Problem Matchers
diff --git a/.github/workflows/milestone.yml b/.github/workflows/milestone.yml
index 8169eb6cc78d..57ba2e10da6d 100644
--- a/.github/workflows/milestone.yml
+++ b/.github/workflows/milestone.yml
@@ -14,11 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get milestone from pom.xml
         run: |
           .github/bin/retry ./mvnw -v
-          echo "MILESTONE_NUMBER=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout | cut -d- -f1)" >> $GITHUB_ENV
+          MILESTONE_NUMBER="$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout | cut -d- -f1)"
+          echo "Setting PR milestone to ${MILESTONE_NUMBER}"
+          echo "MILESTONE_NUMBER=${MILESTONE_NUMBER}" >> $GITHUB_ENV
       - name: Set milestone to PR
         uses: actions/github-script@v6
         with:
diff --git a/.github/workflows/ok-to-test.yml b/.github/workflows/ok-to-test.yml
index 93014719766d..bb4580da8dd0 100644
--- a/.github/workflows/ok-to-test.yml
+++ b/.github/workflows/ok-to-test.yml
@@ -8,8 +8,8 @@ on:
 jobs:
   test-with-secrets:
     runs-on: ubuntu-latest
-    # Only run for PRs, not issue comments
-    if: ${{ github.event.issue.pull_request }}
+    # Only run for PRs, not issue comments and not on forks
+    if: ${{ github.event.issue.pull_request }} && github.repository_owner == 'trinodb'
     steps:
     # Generate a GitHub App installation access token from an App ID and private key
     # To create a new GitHub App:
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index b42202950465..82cb8ccfa07b 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'trinodb/trino'
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v8.0.0
         with:
           stale-pr-message: 'This pull request has gone a while without any activity. Tagging the Trino developer relations team: @bitsondatadev @colebow @mosabua'
           days-before-pr-stale: 21
           days-before-pr-close: 21
           close-pr-message: 'Closing this pull request, as it has been stale for six weeks. Feel free to re-open at any time.'
           stale-pr-label: 'stale'
-          exempt-pr-labels: 'no-stale'
           start-date: '2023-01-01T00:00:00Z'
+          exempt-draft-pr: true
diff --git a/.gitignore b/.gitignore
index ea694efb023a..489583161271 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ benchmark_outputs
 *.class
 .checkstyle
 .mvn/timing.properties
+.mvn/maven.config
 node_modules
 product-test-reports
 .vscode/
@@ -31,3 +32,4 @@ product-test-reports
 .github/test-matrix.yaml
 .github/test-pt-matrix.yaml
 .github/bin/redshift/.cluster-identifier
+**/dependency-reduced-pom.xml
diff --git a/.idea/icon.png b/.idea/icon.png
new file mode 100644
index 000000000000..e45ccd0e9752
Binary files /dev/null and b/.idea/icon.png differ
diff --git a/.mvn/modernizer/violations.xml b/.mvn/modernizer/violations.xml
index 6b4ad47ca408..bdc4a234fa7a 100644
--- a/.mvn/modernizer/violations.xml
+++ b/.mvn/modernizer/violations.xml
@@ -152,6 +152,30 @@
         <comment>Table type is nullable in Glue model, which is too easy to forget about. Prefer GlueToTrinoConverter.getTableType</comment>
     </violation>
 
+    <violation>
+        <name>com/amazonaws/services/glue/model/Column.getParameters:()Ljava/util/Map;</name>
+        <version>1.1</version>
+        <comment>Column parameters map is nullable in Glue model, which is too easy to forget about. Prefer GlueToTrinoConverter.getColumnParameters</comment>
+    </violation>
+
+    <violation>
+        <name>com/amazonaws/services/glue/model/Table.getParameters:()Ljava/util/Map;</name>
+        <version>1.1</version>
+        <comment>Table parameters map is nullable in Glue model, which is too easy to forget about. Prefer GlueToTrinoConverter.getTableParameters</comment>
+    </violation>
+
+    <violation>
+        <name>com/amazonaws/services/glue/model/Partition.getParameters:()Ljava/util/Map;</name>
+        <version>1.1</version>
+        <comment>Partition parameters map is nullable in Glue model, which is too easy to forget about. Prefer GlueToTrinoConverter.getPartitionParameters</comment>
+    </violation>
+
+    <violation>
+        <name>com/amazonaws/services/glue/model/SerDeInfo.getParameters:()Ljava/util/Map;</name>
+        <version>1.1</version>
+        <comment>SerDeInfo parameters map is nullable in Glue model, which is too easy to forget about. Prefer GlueToTrinoConverter.getSerDeInfoParameters</comment>
+    </violation>
+
     <violation>
         <name>org/apache/hadoop/mapred/JobConf."&lt;init&gt;":()V</name>
         <version>1.1</version>
@@ -283,4 +307,28 @@
         <version>1.8</version>
         <comment>Use io.airlift.slice.SizeOf.instanceSize</comment>
     </violation>
+
+    <violation>
+        <name>org/testng/annotations/BeforeTest</name>
+        <version>1.8</version>
+        <comment>Prefer org.testng.annotations.BeforeClass</comment>
+    </violation>
+
+    <violation>
+        <name>org/testng/annotations/AfterTest</name>
+        <version>1.8</version>
+        <comment>Prefer org.testng.annotations.AfterClass</comment>
+    </violation>
+
+    <violation>
+        <name>com/fasterxml/jackson/core/JsonFactory."&lt;init&gt;":()V</name>
+        <version>1.8</version>
+        <comment>Use io.trino.plugin.base.util.JsonUtils.jsonFactory()</comment>
+    </violation>
+
+    <violation>
+        <name>com/fasterxml/jackson/core/JsonFactoryBuilder."&lt;init&gt;":()V</name>
+        <version>1.8</version>
+        <comment>Use io.trino.plugin.base.util.JsonUtils.jsonFactoryBuilder() instead</comment>
+    </violation>
 </modernizer>
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
index c1dd12f17644..cb28b0e37c7d 100644
Binary files a/.mvn/wrapper/maven-wrapper.jar and b/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index f559dfe19e33..eacdc9ed17a1 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1,18 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
+# 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.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/client/trino-cli/pom.xml b/client/trino-cli/pom.xml
index a7bd31e8b60e..ca48c0314080 100644
--- a/client/trino-cli/pom.xml
+++ b/client/trino-cli/pom.xml
@@ -5,45 +5,28 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-cli</artifactId>
-    <name>trino-cli</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
         <project.build.targetJdk>8</project.build.targetJdk>
         <main-class>io.trino.cli.Trino</main-class>
-        <dep.jline.version>3.21.0</dep.jline.version>
+        <dep.jline.version>3.24.0</dep.jline.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-parser</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-            <version>1.7</version> <!-- JDK8 support dropped by version 1.8+ -->
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -67,6 +50,28 @@
             <artifactId>picocli</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
+            <!-- JDK8 support dropped by version 1.8+ -->
+            <version>1.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-grammar</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>net.sf.opencsv</groupId>
             <artifactId>opencsv</artifactId>
@@ -107,7 +112,12 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>json</artifactId>
@@ -115,8 +125,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -126,6 +136,18 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -135,15 +157,33 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <phase>package</phase>
                         <configuration>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>executable</shadedClassifierName>
@@ -168,10 +208,10 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>really-executable-jar</goal>
                         </goals>
+                        <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>
diff --git a/client/trino-cli/src/main/java/io/trino/cli/AlignedTablePrinter.java b/client/trino-cli/src/main/java/io/trino/cli/AlignedTablePrinter.java
index ab917ec01cdc..0d97b3cf5649 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/AlignedTablePrinter.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/AlignedTablePrinter.java
@@ -13,26 +13,21 @@
  */
 package io.trino.cli;
 
-import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import io.trino.client.Column;
-import io.trino.client.Row;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.repeat;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.Iterables.partition;
-import static com.google.common.collect.Iterables.transform;
-import static com.google.common.io.BaseEncoding.base16;
+import static io.trino.cli.FormatUtils.formatValue;
 import static io.trino.client.ClientStandardTypes.BIGINT;
 import static io.trino.client.ClientStandardTypes.DECIMAL;
 import static io.trino.client.ClientStandardTypes.DOUBLE;
@@ -43,7 +38,6 @@
 import static java.lang.Math.max;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.joining;
 import static org.jline.utils.AttributedString.stripAnsi;
 import static org.jline.utils.WCWidth.wcwidth;
 
@@ -53,15 +47,12 @@ public class AlignedTablePrinter
     private static final Set<String> NUMERIC_TYPES = ImmutableSet.of(TINYINT, SMALLINT, INTEGER, BIGINT, REAL, DOUBLE, DECIMAL);
 
     private static final Splitter LINE_SPLITTER = Splitter.on('\n');
-    private static final Splitter HEX_SPLITTER = Splitter.fixedLength(2);
-    private static final Joiner HEX_BYTE_JOINER = Joiner.on(' ');
-    private static final Joiner HEX_LINE_JOINER = Joiner.on('\n');
 
     private final List<String> fieldNames;
     private final List<Boolean> numericFields;
     private final Writer writer;
 
-    private boolean headerOutput;
+    private boolean headerRendered;
     private long rowCount;
 
     public AlignedTablePrinter(List<Column> columns, Writer writer)
@@ -93,26 +84,26 @@ public void printRows(List<List<?>> rows, boolean complete)
         rowCount += rows.size();
         int columns = fieldNames.size();
 
-        int[] maxWidth = new int[columns];
+        int[] columnWidth = new int[columns];
         for (int i = 0; i < columns; i++) {
-            maxWidth[i] = max(1, consoleWidth(fieldNames.get(i)));
+            columnWidth[i] = max(1, consoleWidth(fieldNames.get(i)));
         }
+
         for (List<?> row : rows) {
             for (int i = 0; i < row.size(); i++) {
-                String s = formatValue(row.get(i));
-                maxWidth[i] = max(maxWidth[i], maxLineLength(s));
+                String value = formatValue(row.get(i));
+                columnWidth[i] = max(columnWidth[i], maxLineLength(value));
             }
         }
 
-        if (!headerOutput) {
-            headerOutput = true;
+        if (!headerRendered) {
+            headerRendered = true;
 
             for (int i = 0; i < columns; i++) {
                 if (i > 0) {
                     writer.append('|');
                 }
-                String name = fieldNames.get(i);
-                writer.append(center(name, maxWidth[i], 1));
+                writer.append(center(fieldNames.get(i), columnWidth[i], 1));
             }
             writer.append('\n');
 
@@ -120,7 +111,7 @@ public void printRows(List<List<?>> rows, boolean complete)
                 if (i > 0) {
                     writer.append('+');
                 }
-                writer.append(repeat("-", maxWidth[i] + 2));
+                writer.append(repeat("-", columnWidth[i] + 2));
             }
             writer.append('\n');
         }
@@ -129,8 +120,8 @@ public void printRows(List<List<?>> rows, boolean complete)
             List<List<String>> columnLines = new ArrayList<>(columns);
             int maxLines = 1;
             for (int i = 0; i < columns; i++) {
-                String s = formatValue(row.get(i));
-                ImmutableList<String> lines = ImmutableList.copyOf(LINE_SPLITTER.split(s));
+                String value = formatValue(row.get(i));
+                ImmutableList<String> lines = ImmutableList.copyOf(LINE_SPLITTER.split(value));
                 columnLines.add(lines);
                 maxLines = max(maxLines, lines.size());
             }
@@ -141,9 +132,9 @@ public void printRows(List<List<?>> rows, boolean complete)
                         writer.append('|');
                     }
                     List<String> lines = columnLines.get(column);
-                    String s = (line < lines.size()) ? lines.get(line) : "";
+                    String value = (line < lines.size()) ? lines.get(line) : "";
                     boolean numeric = numericFields.get(column);
-                    String out = align(s, maxWidth[column], 1, numeric);
+                    String out = align(value, columnWidth[column], 1, numeric);
                     if ((!complete || (rowCount > 1)) && ((line + 1) < lines.size())) {
                         out = out.substring(0, out.length() - 1) + "+";
                     }
@@ -156,121 +147,40 @@ public void printRows(List<List<?>> rows, boolean complete)
         writer.flush();
     }
 
-    static String formatValue(Object o)
-    {
-        if (o == null) {
-            return "NULL";
-        }
-
-        if (o instanceof Map) {
-            return formatMap((Map<?, ?>) o);
-        }
-
-        if (o instanceof List) {
-            return formatList((List<?>) o);
-        }
-
-        if (o instanceof Row) {
-            return formatRow(((Row) o));
-        }
-
-        if (o instanceof byte[]) {
-            return formatHexDump((byte[]) o, 16);
-        }
-
-        return o.toString();
-    }
-
-    private static String formatHexDump(byte[] bytes, int bytesPerLine)
-    {
-        // hex pairs: ["61", "62", "63"]
-        Iterable<String> hexPairs = createHexPairs(bytes);
-
-        // hex lines: [["61", "62", "63], [...]]
-        Iterable<List<String>> hexLines = partition(hexPairs, bytesPerLine);
-
-        // lines: ["61 62 63", ...]
-        Iterable<String> lines = transform(hexLines, HEX_BYTE_JOINER::join);
-
-        // joined: "61 62 63\n..."
-        return HEX_LINE_JOINER.join(lines);
-    }
-
-    static String formatHexDump(byte[] bytes)
-    {
-        return HEX_BYTE_JOINER.join(createHexPairs(bytes));
-    }
-
-    private static Iterable<String> createHexPairs(byte[] bytes)
-    {
-        // hex dump: "616263"
-        String hexDump = base16().lowerCase().encode(bytes);
-
-        // hex pairs: ["61", "62", "63"]
-        return HEX_SPLITTER.split(hexDump);
-    }
-
-    static String formatList(List<? extends Object> list)
-    {
-        return list.stream()
-                .map(AlignedTablePrinter::formatValue)
-                .collect(joining(", ", "[", "]"));
-    }
-
-    static String formatMap(Map<? extends Object, ? extends Object> map)
-    {
-        return map.entrySet().stream()
-                .map(entry -> format("%s=%s", formatValue(entry.getKey()), formatValue(entry.getValue())))
-                .collect(joining(", ", "{", "}"));
-    }
-
-    static String formatRow(Row row)
-    {
-        return row.getFields().stream()
-                .map(field -> {
-                    String formattedValue = formatValue(field.getValue());
-                    if (field.getName().isPresent()) {
-                        return format("%s=%s", formatValue(field.getName().get()), formattedValue);
-                    }
-                    return formattedValue;
-                })
-                .collect(joining(", ", "{", "}"));
-    }
-
-    private static String center(String s, int maxWidth, int padding)
+    private static String center(String value, int maxWidth, int padding)
     {
-        int width = consoleWidth(s);
-        checkState(width <= maxWidth, "string width is greater than max width");
+        int width = consoleWidth(value);
+        checkState(width <= maxWidth, format("Variable width %d is greater than column width %d", width, maxWidth));
         int left = (maxWidth - width) / 2;
         int right = maxWidth - (left + width);
-        return repeat(" ", left + padding) + s + repeat(" ", right + padding);
+        return repeat(" ", left + padding) + value + repeat(" ", right + padding);
     }
 
-    private static String align(String s, int maxWidth, int padding, boolean right)
+    private static String align(String value, int maxWidth, int padding, boolean right)
     {
-        int width = consoleWidth(s);
-        checkState(width <= maxWidth, "string width is greater than max width");
-        String large = repeat(" ", (maxWidth - width) + padding);
+        int width = consoleWidth(value);
+        checkState(width <= maxWidth, format("Variable width %d is greater than column width %d", width, maxWidth));
+        String large = repeat(" ", maxWidth - width + padding);
         String small = repeat(" ", padding);
-        return right ? (large + s + small) : (small + s + large);
+        return right ? (large + value + small) : (small + value + large);
     }
 
-    static int maxLineLength(String s)
+    static int maxLineLength(String value)
     {
-        int n = 0;
-        for (String line : LINE_SPLITTER.split(s)) {
-            n = max(n, consoleWidth(line));
+        int result = 0;
+        for (String line : LINE_SPLITTER.split(value)) {
+            result = max(result, consoleWidth(line));
         }
-        return n;
+        return result;
     }
 
-    static int consoleWidth(String s)
+    static int consoleWidth(String value)
     {
-        CharSequence plain = stripAnsi(s);
-        int n = 0;
+        CharSequence plain = stripAnsi(value);
+        int result = 0;
         for (int i = 0; i < plain.length(); i++) {
-            n += max(wcwidth(plain.charAt(i)), 0);
+            result += max(wcwidth(plain.charAt(i)), 0);
         }
-        return n;
+        return result;
     }
 }
diff --git a/client/trino-cli/src/main/java/io/trino/cli/ClientOptions.java b/client/trino-cli/src/main/java/io/trino/cli/ClientOptions.java
index b2ecda37b9d7..9168e2e623e0 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/ClientOptions.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/ClientOptions.java
@@ -16,17 +16,24 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.HostAndPort;
 import io.airlift.units.Duration;
 import io.trino.client.ClientSession;
 import io.trino.client.auth.external.ExternalRedirectStrategy;
+import io.trino.client.uri.PropertyName;
+import io.trino.client.uri.RestrictedPropertyException;
+import io.trino.client.uri.TrinoUri;
 import okhttp3.logging.HttpLoggingInterceptor;
 import org.jline.reader.LineReader;
+import org.jline.reader.LineReaderBuilder;
 
+import java.lang.annotation.Retention;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.sql.SQLException;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
@@ -37,103 +44,171 @@
 import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.nullToEmpty;
+import static io.trino.cli.TerminalUtils.getTerminal;
 import static io.trino.client.KerberosUtil.defaultCredentialCachePath;
+import static io.trino.client.uri.PropertyName.ACCESS_TOKEN;
+import static io.trino.client.uri.PropertyName.CATALOG;
+import static io.trino.client.uri.PropertyName.CLIENT_INFO;
+import static io.trino.client.uri.PropertyName.CLIENT_TAGS;
+import static io.trino.client.uri.PropertyName.EXTERNAL_AUTHENTICATION;
+import static io.trino.client.uri.PropertyName.EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS;
+import static io.trino.client.uri.PropertyName.EXTRA_CREDENTIALS;
+import static io.trino.client.uri.PropertyName.HTTP_PROXY;
+import static io.trino.client.uri.PropertyName.KERBEROS_CONFIG_PATH;
+import static io.trino.client.uri.PropertyName.KERBEROS_CREDENTIAL_CACHE_PATH;
+import static io.trino.client.uri.PropertyName.KERBEROS_KEYTAB_PATH;
+import static io.trino.client.uri.PropertyName.KERBEROS_PRINCIPAL;
+import static io.trino.client.uri.PropertyName.KERBEROS_REMOTE_SERVICE_NAME;
+import static io.trino.client.uri.PropertyName.KERBEROS_SERVICE_PRINCIPAL_PATTERN;
+import static io.trino.client.uri.PropertyName.KERBEROS_USE_CANONICAL_HOSTNAME;
+import static io.trino.client.uri.PropertyName.PASSWORD;
+import static io.trino.client.uri.PropertyName.SCHEMA;
+import static io.trino.client.uri.PropertyName.SESSION_PROPERTIES;
+import static io.trino.client.uri.PropertyName.SESSION_USER;
+import static io.trino.client.uri.PropertyName.SOCKS_PROXY;
+import static io.trino.client.uri.PropertyName.SOURCE;
+import static io.trino.client.uri.PropertyName.SSL_KEY_STORE_PASSWORD;
+import static io.trino.client.uri.PropertyName.SSL_KEY_STORE_PATH;
+import static io.trino.client.uri.PropertyName.SSL_KEY_STORE_TYPE;
+import static io.trino.client.uri.PropertyName.SSL_TRUST_STORE_PASSWORD;
+import static io.trino.client.uri.PropertyName.SSL_TRUST_STORE_PATH;
+import static io.trino.client.uri.PropertyName.SSL_TRUST_STORE_TYPE;
+import static io.trino.client.uri.PropertyName.SSL_USE_SYSTEM_TRUST_STORE;
+import static io.trino.client.uri.PropertyName.SSL_VERIFICATION;
+import static io.trino.client.uri.PropertyName.TRACE_TOKEN;
+import static io.trino.client.uri.PropertyName.USER;
+import static java.lang.String.format;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static picocli.CommandLine.Option;
+import static picocli.CommandLine.Parameters;
 
 public class ClientOptions
 {
     private static final Splitter NAME_VALUE_SPLITTER = Splitter.on('=').limit(2);
     private static final CharMatcher PRINTABLE_ASCII = CharMatcher.inRange((char) 0x21, (char) 0x7E); // spaces are not allowed
     private static final String DEFAULT_VALUE = "(default: ${DEFAULT-VALUE})";
+    private static final String SERVER_DEFAULT = "localhost:8080";
+    private static final String SOURCE_DEFAULT = "trino-cli";
+    static final String DEBUG_OPTION_NAME = "--debug";
 
-    @Option(names = "--server", paramLabel = "<server>", defaultValue = "localhost:8080", description = "Trino server location " + DEFAULT_VALUE)
-    public String server;
+    @Parameters(paramLabel = "URL", description = "Trino server URL", arity = "0..1")
+    public Optional<String> url;
 
+    @Option(names = "--server", paramLabel = "<server>", description = "Trino server location (default: " + SERVER_DEFAULT + ")")
+    public Optional<String> server;
+
+    @PropertyMapping(KERBEROS_SERVICE_PRINCIPAL_PATTERN)
     @Option(names = "--krb5-service-principal-pattern", paramLabel = "<pattern>", defaultValue = "$${SERVICE}@$${HOST}", description = "Remote kerberos service principal pattern " + DEFAULT_VALUE)
     public Optional<String> krb5ServicePrincipalPattern;
 
+    @PropertyMapping(KERBEROS_REMOTE_SERVICE_NAME)
     @Option(names = "--krb5-remote-service-name", paramLabel = "<name>", description = "Remote peer's kerberos service name")
     public Optional<String> krb5RemoteServiceName;
 
+    @PropertyMapping(KERBEROS_CONFIG_PATH)
     @Option(names = "--krb5-config-path", paramLabel = "<path>", defaultValue = "/etc/krb5.conf", description = "Kerberos config file path " + DEFAULT_VALUE)
     public Optional<String> krb5ConfigPath;
 
+    @PropertyMapping(KERBEROS_KEYTAB_PATH)
     @Option(names = "--krb5-keytab-path", paramLabel = "<path>", defaultValue = "/etc/krb5.keytab", description = "Kerberos key table path " + DEFAULT_VALUE)
     public Optional<String> krb5KeytabPath;
 
+    @PropertyMapping(KERBEROS_CREDENTIAL_CACHE_PATH)
     @Option(names = "--krb5-credential-cache-path", paramLabel = "<path>", description = "Kerberos credential cache path")
     public Optional<String> krb5CredentialCachePath = defaultCredentialCachePath();
 
+    @PropertyMapping(KERBEROS_PRINCIPAL)
     @Option(names = "--krb5-principal", paramLabel = "<principal>", description = "Kerberos principal to be used")
     public Optional<String> krb5Principal;
 
+    @PropertyMapping(KERBEROS_USE_CANONICAL_HOSTNAME)
     @Option(names = "--krb5-disable-remote-service-hostname-canonicalization", description = "Disable service hostname canonicalization using the DNS reverse lookup")
     public boolean krb5DisableRemoteServiceHostnameCanonicalization;
 
+    @PropertyMapping(SSL_KEY_STORE_PATH)
     @Option(names = "--keystore-path", paramLabel = "<path>", description = "Keystore path")
     public Optional<String> keystorePath;
 
+    @PropertyMapping(SSL_KEY_STORE_PASSWORD)
     @Option(names = "--keystore-password", paramLabel = "<password>", description = "Keystore password")
     public Optional<String> keystorePassword;
 
+    @PropertyMapping(SSL_KEY_STORE_TYPE)
     @Option(names = "--keystore-type", paramLabel = "<type>", description = "Keystore type")
     public Optional<String> keystoreType;
 
+    @PropertyMapping(SSL_TRUST_STORE_PATH)
     @Option(names = "--truststore-path", paramLabel = "<path>", description = "Truststore path")
     public Optional<String> truststorePath;
 
+    @PropertyMapping(SSL_TRUST_STORE_PASSWORD)
     @Option(names = "--truststore-password", paramLabel = "<password>", description = "Truststore password")
     public Optional<String> truststorePassword;
 
+    @PropertyMapping(SSL_TRUST_STORE_TYPE)
     @Option(names = "--truststore-type", paramLabel = "<type>", description = "Truststore type")
     public Optional<String> truststoreType;
 
+    @PropertyMapping(SSL_USE_SYSTEM_TRUST_STORE)
     @Option(names = "--use-system-truststore", description = "Use default system (OS) truststore")
     public boolean useSystemTruststore;
 
+    @PropertyMapping(SSL_VERIFICATION)
     @Option(names = "--insecure", description = "Skip validation of HTTP server certificates (should only be used for debugging)")
     public boolean insecure;
 
+    @PropertyMapping(ACCESS_TOKEN)
     @Option(names = "--access-token", paramLabel = "<token>", description = "Access token")
     public Optional<String> accessToken;
 
+    @PropertyMapping(USER)
     @Option(names = "--user", paramLabel = "<user>", defaultValue = "${sys:user.name}", description = "Username " + DEFAULT_VALUE)
     public Optional<String> user;
 
+    @PropertyMapping(PASSWORD)
     @Option(names = "--password", paramLabel = "<password>", description = "Prompt for password")
     public boolean password;
 
+    @PropertyMapping(EXTERNAL_AUTHENTICATION)
     @Option(names = "--external-authentication", paramLabel = "<externalAuthentication>", description = "Enable external authentication")
     public boolean externalAuthentication;
 
+    @PropertyMapping(EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS)
     @Option(names = "--external-authentication-redirect-handler", paramLabel = "<externalAuthenticationRedirectHandler>", description = "External authentication redirect handlers: ${COMPLETION-CANDIDATES} " + DEFAULT_VALUE, defaultValue = "ALL")
     public List<ExternalRedirectStrategy> externalAuthenticationRedirectHandler = new ArrayList<>();
 
-    @Option(names = "--source", paramLabel = "<source>", defaultValue = "trino-cli", description = "Name of source making query " + DEFAULT_VALUE)
-    public String source;
+    @PropertyMapping(SOURCE)
+    @Option(names = "--source", paramLabel = "<source>", description = "Name of the client to use as source that submits the query (default: " + SOURCE_DEFAULT + ")")
+    public Optional<String> source;
 
+    @PropertyMapping(CLIENT_INFO)
     @Option(names = "--client-info", paramLabel = "<info>", description = "Extra information about client making query")
-    public String clientInfo;
+    public Optional<String> clientInfo;
 
+    @PropertyMapping(CLIENT_TAGS)
     @Option(names = "--client-tags", paramLabel = "<tags>", description = "Client tags")
-    public String clientTags;
+    public Optional<String> clientTags;
 
+    @PropertyMapping(TRACE_TOKEN)
     @Option(names = "--trace-token", paramLabel = "<token>", description = "Trace token")
-    public String traceToken;
+    public Optional<String> traceToken;
 
+    @PropertyMapping(CATALOG)
     @Option(names = "--catalog", paramLabel = "<catalog>", description = "Default catalog")
-    public String catalog;
+    public Optional<String> catalog;
 
+    @PropertyMapping(SCHEMA)
     @Option(names = "--schema", paramLabel = "<schema>", description = "Default schema")
-    public String schema;
+    public Optional<String> schema;
 
     @Option(names = {"-f", "--file"}, paramLabel = "<file>", description = "Execute statements from file and exit")
     public String file;
 
-    @Option(names = "--debug", paramLabel = "<debug>", description = "Enable debug information")
+    @Option(names = DEBUG_OPTION_NAME, paramLabel = "<debug>", description = "Enable debug information")
     public boolean debug;
 
     @Option(names = "--history-file", paramLabel = "<historyFile>", defaultValue = "${env:TRINO_HISTORY_FILE:-${sys:user.home}/.trino_history}", description = "Path to the history file " + DEFAULT_VALUE)
@@ -160,18 +235,23 @@ public class ClientOptions
     @Option(names = "--resource-estimate", paramLabel = "<estimate>", description = "Resource estimate (property can be used multiple times; format is key=value)")
     public final List<ClientResourceEstimate> resourceEstimates = new ArrayList<>();
 
+    @PropertyMapping(SESSION_PROPERTIES)
     @Option(names = "--session", paramLabel = "<session>", description = "Session property (property can be used multiple times; format is key=value; use 'SHOW SESSION' to see available properties)")
     public final List<ClientSessionProperty> sessionProperties = new ArrayList<>();
 
+    @PropertyMapping(SESSION_USER)
     @Option(names = "--session-user", paramLabel = "<user>", description = "Username to impersonate")
     public Optional<String> sessionUser;
 
+    @PropertyMapping(EXTRA_CREDENTIALS)
     @Option(names = "--extra-credential", paramLabel = "<credential>", description = "Extra credentials (property can be used multiple times; format is key=value)")
     public final List<ClientExtraCredential> extraCredentials = new ArrayList<>();
 
+    @PropertyMapping(SOCKS_PROXY)
     @Option(names = "--socks-proxy", paramLabel = "<proxy>", description = "SOCKS proxy to use for server connections")
     public Optional<HostAndPort> socksProxy;
 
+    @PropertyMapping(HTTP_PROXY)
     @Option(names = "--http-proxy", paramLabel = "<proxy>", description = "HTTP proxy to use for server connections")
     public Optional<HostAndPort> httpProxy;
 
@@ -205,9 +285,16 @@ public enum OutputFormat
         CSV_UNQUOTED,
         CSV_HEADER_UNQUOTED,
         JSON,
+        MARKDOWN,
         NULL
     }
 
+    @Retention(RUNTIME)
+    @interface PropertyMapping
+    {
+        PropertyName value();
+    }
+
     public enum EditingMode
     {
         EMACS(LineReader.EMACS),
@@ -226,19 +313,19 @@ public String getKeyMap()
         }
     }
 
-    public ClientSession toClientSession()
+    public ClientSession toClientSession(TrinoUri uri)
     {
         return ClientSession.builder()
-                .server(parseServer(server))
+                .server(uri.getHttpUri())
                 .principal(user)
                 .user(sessionUser)
-                .source(source)
-                .traceToken(Optional.ofNullable(traceToken))
-                .clientTags(parseClientTags(nullToEmpty(clientTags)))
-                .clientInfo(clientInfo)
-                .catalog(catalog)
-                .schema(schema)
-                .timeZone(timeZone)
+                .source(source.orElse("trino-cli"))
+                .traceToken(traceToken)
+                .clientTags(parseClientTags(clientTags.orElse("")))
+                .clientInfo(clientInfo.orElse(null))
+                .catalog(uri.getCatalog().orElse(catalog.orElse(null)))
+                .schema(uri.getSchema().orElse(schema.orElse(null)))
+                .timeZone(uri.getTimeZone())
                 .locale(Locale.getDefault())
                 .resourceEstimates(toResourceEstimates(resourceEstimates))
                 .properties(toProperties(sessionProperties))
@@ -249,10 +336,128 @@ public ClientSession toClientSession()
                 .build();
     }
 
+    public TrinoUri getTrinoUri()
+    {
+        return getTrinoUri(ImmutableMap.of());
+    }
+
+    public TrinoUri getTrinoUri(Map<PropertyName, String> restrictedProperties)
+    {
+        URI uri;
+        if (url.isPresent()) {
+            if (server.isPresent()) {
+                throw new IllegalArgumentException("Using both the URL parameter and the --server option is not allowed");
+            }
+            uri = parseServer(url.get());
+        }
+        else {
+            uri = parseServer(server.orElse(SERVER_DEFAULT));
+        }
+        List<PropertyName> bannedProperties = ImmutableList.<PropertyName>builder()
+                .addAll(restrictedProperties.keySet())
+                .add(PASSWORD)
+                .build();
+        TrinoUri.Builder builder = TrinoUri.builder()
+                .setUri(uri)
+                .setRestrictedProperties(bannedProperties);
+        catalog.ifPresent(builder::setCatalog);
+        schema.ifPresent(builder::setSchema);
+        user.ifPresent(builder::setUser);
+        sessionUser.ifPresent(builder::setSessionUser);
+        if (password) {
+            builder.setPassword(getPassword());
+        }
+        krb5RemoteServiceName.ifPresent(builder::setKerberosRemoveServiceName);
+        krb5ServicePrincipalPattern.ifPresent(builder::setKerberosServicePrincipalPattern);
+        if (krb5RemoteServiceName.isPresent()) {
+            krb5ConfigPath.ifPresent(builder::setKerberosConfigPath);
+            krb5KeytabPath.ifPresent(builder::setKerberosKeytabPath);
+        }
+        krb5CredentialCachePath.ifPresent(builder::setKerberosCredentialCachePath);
+        krb5Principal.ifPresent(builder::setKerberosPrincipal);
+        if (krb5DisableRemoteServiceHostnameCanonicalization) {
+            builder.setKerberosUseCanonicalHostname(false);
+        }
+        boolean useSecureConnection = uri.getScheme().equals("https") || (uri.getScheme().equals("trino") && uri.getPort() == 443);
+        if (useSecureConnection) {
+            builder.setSsl(true);
+        }
+        if (insecure) {
+            builder.setSslVerificationNone();
+        }
+        keystorePath.ifPresent(builder::setSslKeyStorePath);
+        keystorePassword.ifPresent(builder::setSslKeyStorePassword);
+        keystoreType.ifPresent(builder::setSslKeyStoreType);
+        truststorePath.ifPresent(builder::setSslTrustStorePath);
+        truststorePassword.ifPresent(builder::setSslTrustStorePassword);
+        truststoreType.ifPresent(builder::setSslTrustStoreType);
+        if (useSystemTruststore) {
+            builder.setSslUseSystemTrustStore(true);
+        }
+        accessToken.ifPresent(builder::setAccessToken);
+        if (!extraCredentials.isEmpty()) {
+            builder.setExtraCredentials(toExtraCredentials(extraCredentials));
+        }
+        if (!sessionProperties.isEmpty()) {
+            builder.setSessionProperties(toProperties(sessionProperties));
+        }
+        builder.setExternalAuthentication(externalAuthentication);
+        builder.setExternalRedirectStrategies(externalAuthenticationRedirectHandler);
+        source.ifPresent(builder::setSource);
+        clientInfo.ifPresent(builder::setClientInfo);
+        clientTags.ifPresent(builder::setClientTags);
+        traceToken.ifPresent(builder::setTraceToken);
+        socksProxy.ifPresent(builder::setSocksProxy);
+        httpProxy.ifPresent(builder::setHttpProxy);
+        builder.setTimeZone(timeZone);
+        builder.setDisableCompression(disableCompression);
+        TrinoUri trinoUri;
+
+        try {
+            trinoUri = builder.build();
+        }
+        catch (RestrictedPropertyException e) {
+            if (e.getPropertyName() == PropertyName.PASSWORD) {
+                throw new IllegalArgumentException(
+                        "Setting the password in the URL parameter is not allowed, " +
+                                "use the `--password` option or the `TRINO_PASSWORD` environment variable");
+            }
+            throw new IllegalArgumentException(format(
+                    "Connection property '%s' cannot be set in the URL when option '%s' is set",
+                    e.getPropertyName(),
+                    restrictedProperties.get(e.getPropertyName())), e);
+        }
+        catch (SQLException e) {
+            throw new IllegalArgumentException(e);
+        }
+        return trinoUri;
+    }
+
+    private String getPassword()
+    {
+        checkState(user.isPresent() && !user.get().isEmpty(), "Both username and password must be specified");
+        String defaultPassword = System.getenv("TRINO_PASSWORD");
+        if (defaultPassword != null) {
+            return defaultPassword;
+        }
+
+        java.io.Console console = System.console();
+        if (console != null) {
+            char[] password = console.readPassword("Password: ");
+            if (password != null) {
+                return new String(password);
+            }
+            return "";
+        }
+
+        LineReader reader = LineReaderBuilder.builder().terminal(getTerminal()).build();
+        return reader.readLine("Password: ", (char) 0);
+    }
+
     public static URI parseServer(String server)
     {
-        server = server.toLowerCase(ENGLISH);
-        if (server.startsWith("http://") || server.startsWith("https://")) {
+        String lowerServer = server.toLowerCase(ENGLISH);
+        if (lowerServer.startsWith("http://") || lowerServer.startsWith("https://") || lowerServer.startsWith("trino://")) {
             return URI.create(server);
         }
 
diff --git a/client/trino-cli/src/main/java/io/trino/cli/Console.java b/client/trino-cli/src/main/java/io/trino/cli/Console.java
index 37323207226f..c6ba90b6d46b 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/Console.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/Console.java
@@ -14,22 +14,25 @@
 package io.trino.cli;
 
 import com.google.common.base.CharMatcher;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.ByteStreams;
 import io.airlift.units.Duration;
 import io.trino.cli.ClientOptions.OutputFormat;
+import io.trino.cli.ClientOptions.PropertyMapping;
 import io.trino.cli.Trino.VersionProvider;
+import io.trino.cli.lexer.StatementSplitter;
 import io.trino.client.ClientSelectedRole;
 import io.trino.client.ClientSession;
-import io.trino.sql.parser.StatementSplitter;
+import io.trino.client.uri.PropertyName;
+import io.trino.client.uri.TrinoUri;
 import org.jline.reader.EndOfFileException;
 import org.jline.reader.History;
-import org.jline.reader.LineReader;
-import org.jline.reader.LineReaderBuilder;
 import org.jline.reader.UserInterruptException;
 import org.jline.terminal.Terminal;
 import org.jline.utils.AttributedStringBuilder;
 import org.jline.utils.InfoCmp;
+import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
@@ -37,8 +40,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.lang.reflect.Field;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -48,8 +53,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static com.google.common.base.CharMatcher.whitespace;
-import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.isNullOrEmpty;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.io.Files.asCharSource;
 import static com.google.common.util.concurrent.Uninterruptibles.awaitUninterruptibly;
 import static io.trino.cli.Completion.commandCompleter;
@@ -59,9 +64,10 @@
 import static io.trino.cli.TerminalUtils.getTerminal;
 import static io.trino.cli.TerminalUtils.isRealTerminal;
 import static io.trino.cli.TerminalUtils.terminalEncoding;
+import static io.trino.cli.Trino.formatCliErrorMessage;
+import static io.trino.cli.lexer.StatementSplitter.Statement;
+import static io.trino.cli.lexer.StatementSplitter.isEmptyStatement;
 import static io.trino.client.ClientSession.stripTransactionId;
-import static io.trino.sql.parser.StatementSplitter.Statement;
-import static io.trino.sql.parser.StatementSplitter.isEmptyStatement;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Locale.ENGLISH;
@@ -85,6 +91,9 @@ public class Console
     private static final String PROMPT_NAME = "trino";
     private static final Duration EXIT_DELAY = new Duration(3, SECONDS);
 
+    @CommandLine.Spec
+    CommandLine.Model.CommandSpec spec;
+
     @Option(names = {"-h", "--help"}, usageHelp = true, description = "Show this help message and exit")
     public boolean usageHelpRequested;
 
@@ -102,7 +111,18 @@ public Integer call()
 
     public boolean run()
     {
-        ClientSession session = clientOptions.toClientSession();
+        CommandLine.ParseResult parseResult = spec.commandLine().getParseResult();
+
+        Map<PropertyName, String> restrictedOptions = spec.options().stream()
+                .filter(parseResult::hasMatchedOption)
+                .map(option -> getMapping(option.userObject())
+                        .map(value -> new AbstractMap.SimpleEntry<>(value, option.longestName())))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
+
+        TrinoUri uri = clientOptions.getTrinoUri(restrictedOptions);
+        ClientSession session = clientOptions.toClientSession(uri);
         boolean hasQuery = clientOptions.execute != null;
         boolean isFromFile = !isNullOrEmpty(clientOptions.file);
 
@@ -147,38 +167,17 @@ public boolean run()
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             exiting.set(true);
             interruptor.interrupt();
-            awaitUninterruptibly(exited, EXIT_DELAY.toMillis(), MILLISECONDS);
+            @SuppressWarnings("CheckReturnValue")
+            boolean ignored = awaitUninterruptibly(exited, EXIT_DELAY.toMillis(), MILLISECONDS);
             // Terminal closing restores terminal settings and releases underlying system resources
             closeTerminal();
         }));
 
         try (QueryRunner queryRunner = new QueryRunner(
+                uri,
                 session,
                 clientOptions.debug,
-                clientOptions.networkLogging,
-                clientOptions.socksProxy,
-                clientOptions.httpProxy,
-                clientOptions.keystorePath,
-                clientOptions.keystorePassword,
-                clientOptions.keystoreType,
-                clientOptions.truststorePath,
-                clientOptions.truststorePassword,
-                clientOptions.truststoreType,
-                clientOptions.useSystemTruststore,
-                clientOptions.insecure,
-                clientOptions.accessToken,
-                clientOptions.user,
-                clientOptions.password ? Optional.of(getPassword()) : Optional.empty(),
-                clientOptions.krb5Principal,
-                clientOptions.krb5ServicePrincipalPattern,
-                clientOptions.krb5RemoteServiceName,
-                clientOptions.krb5ConfigPath,
-                clientOptions.krb5KeytabPath,
-                clientOptions.krb5CredentialCachePath,
-                !clientOptions.krb5DisableRemoteServiceHostnameCanonicalization,
-                false,
-                clientOptions.externalAuthentication,
-                clientOptions.externalAuthenticationRedirectHandler)) {
+                clientOptions.networkLogging)) {
             if (hasQuery) {
                 return executeCommand(
                         queryRunner,
@@ -207,25 +206,14 @@ public boolean run()
         }
     }
 
-    private String getPassword()
+    private static Optional<PropertyName> getMapping(Object userObject)
     {
-        checkState(clientOptions.user.isPresent(), "Username must be specified along with password");
-        String defaultPassword = System.getenv("TRINO_PASSWORD");
-        if (defaultPassword != null) {
-            return defaultPassword;
-        }
-
-        java.io.Console console = System.console();
-        if (console != null) {
-            char[] password = console.readPassword("Password: ");
-            if (password != null) {
-                return new String(password);
-            }
-            return "";
+        if (userObject instanceof Field) {
+            return Optional.ofNullable(((Field) userObject).getAnnotation(PropertyMapping.class))
+                    .map(PropertyMapping::value);
         }
 
-        LineReader reader = LineReaderBuilder.builder().terminal(getTerminal()).build();
-        return reader.readLine("Password: ", (char) 0);
+        return Optional.empty();
     }
 
     private static void runConsole(
@@ -245,10 +233,9 @@ private static void runConsole(
             while (!exiting.get()) {
                 // setup prompt
                 String prompt = PROMPT_NAME;
-                String schema = queryRunner.getSession().getSchema();
-                if (schema != null) {
-                    prompt += ":" + schema.replace("%", "%%");
-                }
+                Optional<String> schema = queryRunner.getSession().getSchema();
+                prompt += schema.map(value -> ":" + value.replace("%", "%%"))
+                        .orElse("");
                 String commandPrompt = prompt + "> ";
 
                 // read a line of input from user
@@ -361,8 +348,8 @@ private static boolean process(
         try {
             finalSql = preprocessQuery(
                     terminal,
-                    Optional.ofNullable(queryRunner.getSession().getCatalog()),
-                    Optional.ofNullable(queryRunner.getSession().getSchema()),
+                    queryRunner.getSession().getCatalog(),
+                    queryRunner.getSession().getSchema(),
                     sql);
         }
         catch (QueryPreprocessorException e) {
@@ -380,10 +367,10 @@ private static boolean process(
 
             // update catalog and schema if present
             if (query.getSetCatalog().isPresent() || query.getSetSchema().isPresent()) {
-                session = ClientSession.builder(session)
-                        .catalog(query.getSetCatalog().orElse(session.getCatalog()))
-                        .schema(query.getSetSchema().orElse(session.getSchema()))
-                        .build();
+                ClientSession.Builder builder = ClientSession.builder(session);
+                query.getSetCatalog().ifPresent(builder::catalog);
+                query.getSetSchema().ifPresent(builder::schema);
+                session = builder.build();
             }
 
             // update transaction ID if necessary
@@ -402,6 +389,17 @@ private static boolean process(
                 builder = builder.path(query.getSetPath().get());
             }
 
+            // update authorization user if present
+            if (query.getSetAuthorizationUser().isPresent()) {
+                builder = builder.authorizationUser(query.getSetAuthorizationUser());
+                builder = builder.roles(ImmutableMap.of());
+            }
+
+            if (query.isResetAuthorizationUser()) {
+                builder = builder.authorizationUser(Optional.empty());
+                builder = builder.roles(ImmutableMap.of());
+            }
+
             // update session properties if present
             if (!query.getSetSessionProperties().isEmpty() || !query.getResetSessionProperties().isEmpty()) {
                 Map<String, String> sessionProperties = new HashMap<>(session.getProperties());
@@ -435,10 +433,7 @@ private static boolean process(
             return success;
         }
         catch (RuntimeException e) {
-            System.err.println("Error running command: " + e.getMessage());
-            if (queryRunner.isDebug()) {
-                e.printStackTrace(System.err);
-            }
+            System.err.println(formatCliErrorMessage(e, queryRunner.isDebug()));
             return false;
         }
     }
diff --git a/client/trino-cli/src/main/java/io/trino/cli/CsvPrinter.java b/client/trino-cli/src/main/java/io/trino/cli/CsvPrinter.java
index 466dd67ec595..205adb5193e4 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/CsvPrinter.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/CsvPrinter.java
@@ -15,17 +15,12 @@
 
 import au.com.bytecode.opencsv.CSVWriter;
 import com.google.common.collect.ImmutableList;
-import io.trino.client.Row;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.util.List;
-import java.util.Map;
 
-import static io.trino.cli.AlignedTablePrinter.formatHexDump;
-import static io.trino.cli.AlignedTablePrinter.formatList;
-import static io.trino.cli.AlignedTablePrinter.formatMap;
-import static io.trino.cli.AlignedTablePrinter.formatRow;
+import static io.trino.cli.FormatUtils.formatValue;
 import static java.util.Objects.requireNonNull;
 
 public class CsvPrinter
@@ -43,8 +38,8 @@ public enum CsvOutputFormat
         NO_QUOTES(true, false),
         NO_HEADER_AND_QUOTES(false, false);
 
-        private boolean header;
-        private boolean quote;
+        private final boolean header;
+        private final boolean quote;
 
         CsvOutputFormat(boolean header, boolean quote)
         {
@@ -114,33 +109,8 @@ private static String[] toStrings(List<?> values, String[] array)
             array = new String[rowSize];
         }
         for (int i = 0; i < rowSize; i++) {
-            array[i] = formatValue(values.get(i));
+            array[i] = formatValue(values.get(i), "", -1);
         }
         return array;
     }
-
-    static String formatValue(Object o)
-    {
-        if (o == null) {
-            return "";
-        }
-
-        if (o instanceof Map) {
-            return formatMap((Map<?, ?>) o);
-        }
-
-        if (o instanceof List) {
-            return formatList((List<?>) o);
-        }
-
-        if (o instanceof Row) {
-            return formatRow((Row) o);
-        }
-
-        if (o instanceof byte[]) {
-            return formatHexDump((byte[]) o);
-        }
-
-        return o.toString();
-    }
 }
diff --git a/client/trino-cli/src/main/java/io/trino/cli/FormatUtils.java b/client/trino-cli/src/main/java/io/trino/cli/FormatUtils.java
index 3c70452a37b5..d9066ae28c32 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/FormatUtils.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/FormatUtils.java
@@ -13,23 +13,36 @@
  */
 package io.trino.cli;
 
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
 import com.google.common.primitives.Ints;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.trino.client.Row;
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
+import java.util.List;
+import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.repeat;
+import static com.google.common.collect.Iterables.partition;
+import static com.google.common.collect.Iterables.transform;
+import static com.google.common.io.BaseEncoding.base16;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static java.lang.String.format;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.stream.Collectors.joining;
 
 public final class FormatUtils
 {
+    private static final Splitter HEX_SPLITTER = Splitter.fixedLength(2);
+    private static final Joiner HEX_BYTE_JOINER = Joiner.on(' ');
+    private static final Joiner HEX_LINE_JOINER = Joiner.on('\n');
+
     private FormatUtils() {}
 
     public static String formatCount(long count)
@@ -196,21 +209,19 @@ public static String formatProgressBar(int width, int tick)
                 repeat(" ", width - (lower + markerWidth));
     }
 
-    public static String formatProgressBar(int width, int complete, int running, int total)
+    public static String formatProgressBar(int width, int progressPercentage, int runningPercentage)
     {
-        if (total == 0) {
-            return repeat(" ", width);
-        }
+        int totalPercentage = 100;
 
-        int pending = max(0, total - complete - running);
+        int pending = max(0, totalPercentage - progressPercentage - runningPercentage);
 
         // compute nominal lengths
-        int completeLength = min(width, ceil(complete * width, total));
-        int pendingLength = min(width, ceil(pending * width, total));
+        int completeLength = min(width, ceil(progressPercentage * width, totalPercentage));
+        int pendingLength = min(width, ceil(pending * width, totalPercentage));
 
-        // leave space for at least one ">" as long as running is > 0
-        int minRunningLength = (running > 0) ? 1 : 0;
-        int runningLength = max(min(width, ceil(running * width, total)), minRunningLength);
+        // leave space for at least one ">" as long as runningPercentage is > 0
+        int minRunningLength = (runningPercentage > 0) ? 1 : 0;
+        int runningLength = max(min(width, ceil(runningPercentage * width, totalPercentage)), minRunningLength);
 
         // adjust to fix rounding errors
         if (((completeLength + runningLength + pendingLength) != width) && (pending > 0)) {
@@ -218,17 +229,17 @@ public static String formatProgressBar(int width, int complete, int running, int
             pendingLength = max(0, width - completeLength - runningLength);
         }
         if ((completeLength + runningLength + pendingLength) != width) {
-            // then, sacrifice "running"
+            // then, sacrifice "runningPercentage"
             runningLength = max(minRunningLength, width - completeLength - pendingLength);
         }
-        if (((completeLength + runningLength + pendingLength) > width) && (complete > 0)) {
-            // finally, sacrifice "complete" if we're still over the limit
+        if (((completeLength + runningLength + pendingLength) > width) && (progressPercentage > 0)) {
+            // finally, sacrifice "progressPercentage" if we're still over the limit
             completeLength = max(0, width - runningLength - pendingLength);
         }
 
         checkState((completeLength + runningLength + pendingLength) == width,
-                "Expected completeLength (%s) + runningLength (%s) + pendingLength (%s) == width (%s), was %s for complete = %s, running = %s, total = %s",
-                completeLength, runningLength, pendingLength, width, completeLength + runningLength + pendingLength, complete, running, total);
+                "Expected completeLength (%s) + runningLength (%s) + pendingLength (%s) == width (%s), was %s for progressPercentage = %s, runningPercentage = %s, totalPercentage = %s",
+                completeLength, runningLength, pendingLength, width, completeLength + runningLength + pendingLength, progressPercentage, runningPercentage, totalPercentage);
 
         return repeat("=", completeLength) + repeat(">", runningLength) + repeat(" ", pendingLength);
     }
@@ -240,4 +251,93 @@ private static int ceil(int dividend, int divisor)
     {
         return ((dividend + divisor) - 1) / divisor;
     }
+
+    static String formatValue(Object o)
+    {
+        return formatValue(o, "NULL", 16);
+    }
+
+    static String formatValue(Object o, String nullValue, int bytesPerLine)
+    {
+        if (o == null) {
+            return nullValue;
+        }
+
+        if (o instanceof Map) {
+            return formatMap((Map<?, ?>) o);
+        }
+
+        if (o instanceof List) {
+            return formatList((List<?>) o);
+        }
+
+        if (o instanceof Row) {
+            return formatRow(((Row) o));
+        }
+
+        if (o instanceof byte[]) {
+            return formatHexDump((byte[]) o, bytesPerLine);
+        }
+
+        return o.toString();
+    }
+
+    private static String formatHexDump(byte[] bytes, int bytesPerLine)
+    {
+        if (bytesPerLine <= 0) {
+            return formatHexDump(bytes);
+        }
+        // hex pairs: ["61", "62", "63"]
+        Iterable<String> hexPairs = createHexPairs(bytes);
+
+        // hex lines: [["61", "62", "63], [...]]
+        Iterable<List<String>> hexLines = partition(hexPairs, bytesPerLine);
+
+        // lines: ["61 62 63", ...]
+        Iterable<String> lines = transform(hexLines, HEX_BYTE_JOINER::join);
+
+        // joined: "61 62 63\n..."
+        return HEX_LINE_JOINER.join(lines);
+    }
+
+    static String formatHexDump(byte[] bytes)
+    {
+        return HEX_BYTE_JOINER.join(createHexPairs(bytes));
+    }
+
+    private static Iterable<String> createHexPairs(byte[] bytes)
+    {
+        // hex dump: "616263"
+        String hexDump = base16().lowerCase().encode(bytes);
+
+        // hex pairs: ["61", "62", "63"]
+        return HEX_SPLITTER.split(hexDump);
+    }
+
+    static String formatList(List<? extends Object> list)
+    {
+        return list.stream()
+                .map(FormatUtils::formatValue)
+                .collect(joining(", ", "[", "]"));
+    }
+
+    static String formatMap(Map<? extends Object, ? extends Object> map)
+    {
+        return map.entrySet().stream()
+                .map(entry -> format("%s=%s", formatValue(entry.getKey()), formatValue(entry.getValue())))
+                .collect(joining(", ", "{", "}"));
+    }
+
+    static String formatRow(Row row)
+    {
+        return row.getFields().stream()
+                .map(field -> {
+                    String formattedValue = formatValue(field.getValue());
+                    if (field.getName().isPresent()) {
+                        return format("%s=%s", formatValue(field.getName().get()), formattedValue);
+                    }
+                    return formattedValue;
+                })
+                .collect(joining(", ", "{", "}"));
+    }
 }
diff --git a/client/trino-cli/src/main/java/io/trino/cli/InputHighlighter.java b/client/trino-cli/src/main/java/io/trino/cli/InputHighlighter.java
index 945ea05bb92a..325c0b769f41 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/InputHighlighter.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/InputHighlighter.java
@@ -13,8 +13,8 @@
  */
 package io.trino.cli;
 
-import io.trino.sql.parser.SqlBaseLexer;
-import io.trino.sql.parser.StatementSplitter;
+import io.trino.cli.lexer.StatementSplitter;
+import io.trino.grammar.sql.SqlBaseLexer;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.TokenSource;
 import org.jline.reader.Highlighter;
@@ -28,7 +28,7 @@
 
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.cli.Console.STATEMENT_DELIMITERS;
-import static io.trino.sql.ReservedIdentifiers.sqlKeywords;
+import static io.trino.grammar.sql.SqlKeywords.sqlKeywords;
 import static java.util.Locale.ENGLISH;
 import static org.jline.utils.AttributedStyle.BOLD;
 import static org.jline.utils.AttributedStyle.BRIGHT;
diff --git a/client/trino-cli/src/main/java/io/trino/cli/InputParser.java b/client/trino-cli/src/main/java/io/trino/cli/InputParser.java
index 405c8fa8b9cf..b562626f47df 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/InputParser.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/InputParser.java
@@ -14,7 +14,7 @@
 package io.trino.cli;
 
 import com.google.common.collect.ImmutableSet;
-import io.trino.sql.parser.StatementSplitter;
+import io.trino.cli.lexer.StatementSplitter;
 import org.jline.reader.EOFError;
 import org.jline.reader.ParsedLine;
 import org.jline.reader.Parser;
diff --git a/client/trino-cli/src/main/java/io/trino/cli/JsonPrinter.java b/client/trino-cli/src/main/java/io/trino/cli/JsonPrinter.java
index 6b6e69a4614c..1530a37a7147 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/JsonPrinter.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/JsonPrinter.java
@@ -14,14 +14,17 @@
 package io.trino.cli;
 
 import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.google.common.collect.ImmutableList;
+import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.util.List;
 
-import static io.trino.cli.AlignedTablePrinter.formatHexDump;
+import static io.trino.cli.FormatUtils.formatHexDump;
 import static java.util.Objects.requireNonNull;
 
 public class JsonPrinter
@@ -40,7 +43,7 @@ public JsonPrinter(List<String> fieldNames, Writer writer)
     public void printRows(List<List<?>> rows, boolean complete)
             throws IOException
     {
-        JsonFactory jsonFactory = new JsonFactory().configure(JsonGenerator.Feature.AUTO_CLOSE_TARGET, false);
+        JsonFactory jsonFactory = jsonFactory();
         try (JsonGenerator jsonGenerator = jsonFactory.createGenerator(writer)) {
             jsonGenerator.setRootValueSeparator(null);
             for (List<?> row : rows) {
@@ -70,4 +73,18 @@ private static Object formatValue(Object o)
         }
         return o;
     }
+
+    @SuppressModernizer
+    // JsonFactoryBuilder usage is intentional as we don't want to bring additional dependency on plugin-toolkit module
+    private static JsonFactory jsonFactory()
+    {
+        return new JsonFactoryBuilder()
+                .streamReadConstraints(StreamReadConstraints.builder()
+                        .maxNumberLength(Integer.MAX_VALUE)
+                        .maxNestingDepth(Integer.MAX_VALUE)
+                        .maxStringLength(Integer.MAX_VALUE)
+                        .build())
+                .build()
+                .configure(JsonGenerator.Feature.AUTO_CLOSE_TARGET, false);
+    }
 }
diff --git a/client/trino-cli/src/main/java/io/trino/cli/MarkdownTablePrinter.java b/client/trino-cli/src/main/java/io/trino/cli/MarkdownTablePrinter.java
new file mode 100644
index 000000000000..43b5cff47c60
--- /dev/null
+++ b/client/trino-cli/src/main/java/io/trino/cli/MarkdownTablePrinter.java
@@ -0,0 +1,144 @@
+/*
+ * Licensed 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 io.trino.cli;
+
+import com.google.common.collect.ImmutableSet;
+import io.trino.client.Column;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Strings.repeat;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.client.ClientStandardTypes.BIGINT;
+import static io.trino.client.ClientStandardTypes.DECIMAL;
+import static io.trino.client.ClientStandardTypes.DOUBLE;
+import static io.trino.client.ClientStandardTypes.INTEGER;
+import static io.trino.client.ClientStandardTypes.REAL;
+import static io.trino.client.ClientStandardTypes.SMALLINT;
+import static io.trino.client.ClientStandardTypes.TINYINT;
+import static java.lang.Math.max;
+import static java.util.Objects.requireNonNull;
+import static org.jline.utils.AttributedString.stripAnsi;
+import static org.jline.utils.WCWidth.wcwidth;
+
+public class MarkdownTablePrinter
+        implements OutputPrinter
+{
+    private static final Set<String> NUMERIC_TYPES = ImmutableSet.of(TINYINT, SMALLINT, INTEGER, BIGINT, REAL, DOUBLE, DECIMAL);
+    private final List<String> fieldNames;
+    private final List<Align> alignments;
+    private final Writer writer;
+
+    private boolean headerRendered;
+
+    public MarkdownTablePrinter(List<Column> columns, Writer writer)
+    {
+        requireNonNull(columns, "columns is null");
+        this.fieldNames = columns.stream()
+                .map(Column::getName)
+                .collect(toImmutableList());
+        this.alignments = columns.stream()
+                .map(Column::getTypeSignature)
+                .map(signature -> NUMERIC_TYPES.contains(signature.getRawType()) ? Align.RIGHT : Align.LEFT)
+                .collect(toImmutableList());
+        this.writer = requireNonNull(writer, "writer is null");
+    }
+
+    private enum Align
+    {
+        LEFT,
+        RIGHT;
+    }
+
+    @Override
+    public void printRows(List<List<?>> rows, boolean complete)
+            throws IOException
+    {
+        int columns = fieldNames.size();
+
+        int[] columnWidth = new int[columns];
+        for (int i = 0; i < columns; i++) {
+            columnWidth[i] = max(1, consoleWidth(fieldNames.get(i)));
+        }
+
+        for (List<?> row : rows) {
+            for (int i = 0; i < row.size(); i++) {
+                String s = formatValue(row.get(i));
+                columnWidth[i] = max(columnWidth[i], consoleWidth(s));
+            }
+        }
+
+        if (!headerRendered) {
+            headerRendered = true;
+
+            for (int i = 0; i < columns; i++) {
+                writer.append('|');
+                writer.append(align(fieldNames.get(i), columnWidth[i], alignments.get(i)));
+            }
+            writer.append("|\n");
+
+            for (int i = 0; i < columns; i++) {
+                writer.append("| ");
+                writer.append(repeat("-", columnWidth[i]));
+                writer.write(alignments.get(i) == Align.RIGHT ? ':' : ' ');
+            }
+            writer.append("|\n");
+        }
+
+        for (List<?> row : rows) {
+            for (int column = 0; column < columns; column++) {
+                writer.append('|');
+                writer.append(align(formatValue(row.get(column)), columnWidth[column], alignments.get(column)));
+            }
+            writer.append("|\n");
+        }
+        writer.flush();
+    }
+
+    static String formatValue(Object o)
+    {
+        return FormatUtils.formatValue(o)
+                .replaceAll("([\\\\`*_{}\\[\\]<>()#+!|])", "\\\\$1")
+                .replace("\n", "<br>");
+    }
+
+    @Override
+    public void finish()
+            throws IOException
+    {
+        writer.flush();
+    }
+
+    private static String align(String value, int maxWidth, Align align)
+    {
+        int width = consoleWidth(value);
+        checkState(width <= maxWidth, "Variable width %s is greater than column width %s", width, maxWidth);
+        String padding = repeat(" ", (maxWidth - width) + 1);
+        return align == Align.RIGHT ? (padding + value + " ") : (" " + value + padding);
+    }
+
+    static int consoleWidth(String value)
+    {
+        CharSequence plain = stripAnsi(value);
+        int n = 0;
+        for (int i = 0; i < plain.length(); i++) {
+            n += max(wcwidth(plain.charAt(i)), 0);
+        }
+        return n;
+    }
+}
diff --git a/client/trino-cli/src/main/java/io/trino/cli/Pager.java b/client/trino-cli/src/main/java/io/trino/cli/Pager.java
index db0c8e592d52..27ea0e1d173d 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/Pager.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/Pager.java
@@ -14,8 +14,7 @@
 package io.trino.cli;
 
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;
diff --git a/client/trino-cli/src/main/java/io/trino/cli/Query.java b/client/trino-cli/src/main/java/io/trino/cli/Query.java
index cb306b31cc96..1bfc64d70359 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/Query.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/Query.java
@@ -91,6 +91,16 @@ public Optional<String> getSetPath()
         return client.getSetPath();
     }
 
+    public Optional<String> getSetAuthorizationUser()
+    {
+        return client.getSetAuthorizationUser();
+    }
+
+    public boolean isResetAuthorizationUser()
+    {
+        return client.isResetAuthorizationUser();
+    }
+
     public Map<String, String> getSetSessionProperties()
     {
         return client.getSetSessionProperties();
@@ -347,6 +357,8 @@ private static OutputPrinter createOutputPrinter(OutputFormat format, int maxWid
                 return new TsvPrinter(fieldNames, writer, true);
             case JSON:
                 return new JsonPrinter(fieldNames, writer);
+            case MARKDOWN:
+                return new MarkdownTablePrinter(columns, writer);
             case NULL:
                 return new NullPrinter();
         }
diff --git a/client/trino-cli/src/main/java/io/trino/cli/QueryRunner.java b/client/trino-cli/src/main/java/io/trino/cli/QueryRunner.java
index 669d2db36e10..54ea863dfa7a 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/QueryRunner.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/QueryRunner.java
@@ -13,38 +13,20 @@
  */
 package io.trino.cli;
 
-import com.google.common.net.HostAndPort;
 import io.trino.client.ClientSession;
-import io.trino.client.OkHttpUtil;
 import io.trino.client.StatementClient;
-import io.trino.client.auth.external.CompositeRedirectHandler;
-import io.trino.client.auth.external.ExternalAuthenticator;
-import io.trino.client.auth.external.ExternalRedirectStrategy;
-import io.trino.client.auth.external.HttpTokenPoller;
-import io.trino.client.auth.external.KnownToken;
-import io.trino.client.auth.external.RedirectHandler;
-import io.trino.client.auth.external.TokenPoller;
+import io.trino.client.uri.TrinoUri;
+import okhttp3.Call;
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 
 import java.io.Closeable;
-import java.io.File;
-import java.time.Duration;
-import java.util.List;
-import java.util.Optional;
+import java.sql.SQLException;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.client.ClientSession.stripTransactionId;
-import static io.trino.client.OkHttpUtil.basicAuth;
-import static io.trino.client.OkHttpUtil.setupCookieJar;
-import static io.trino.client.OkHttpUtil.setupHttpProxy;
-import static io.trino.client.OkHttpUtil.setupKerberos;
-import static io.trino.client.OkHttpUtil.setupSocksProxy;
-import static io.trino.client.OkHttpUtil.setupSsl;
 import static io.trino.client.OkHttpUtil.setupTimeouts;
-import static io.trino.client.OkHttpUtil.tokenAuth;
 import static io.trino.client.StatementClientFactory.newStatementClient;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -58,69 +40,27 @@ public class QueryRunner
     private final Consumer<OkHttpClient.Builder> sslSetup;
 
     public QueryRunner(
+            TrinoUri uri,
             ClientSession session,
             boolean debug,
-            HttpLoggingInterceptor.Level networkLogging,
-            Optional<HostAndPort> socksProxy,
-            Optional<HostAndPort> httpProxy,
-            Optional<String> keystorePath,
-            Optional<String> keystorePassword,
-            Optional<String> keystoreType,
-            Optional<String> truststorePath,
-            Optional<String> truststorePassword,
-            Optional<String> truststoreType,
-            boolean useSystemTruststore,
-            boolean insecureSsl,
-            Optional<String> accessToken,
-            Optional<String> user,
-            Optional<String> password,
-            Optional<String> kerberosPrincipal,
-            Optional<String> krb5ServicePrincipalPattern,
-            Optional<String> kerberosRemoteServiceName,
-            Optional<String> kerberosConfigPath,
-            Optional<String> kerberosKeytabPath,
-            Optional<String> kerberosCredentialCachePath,
-            boolean kerberosUseCanonicalHostname,
-            boolean delegatedKerberos,
-            boolean externalAuthentication,
-            List<ExternalRedirectStrategy> externalRedirectHandlers)
+            HttpLoggingInterceptor.Level networkLogging)
     {
         this.session = new AtomicReference<>(requireNonNull(session, "session is null"));
         this.debug = debug;
 
-        if (insecureSsl) {
-            this.sslSetup = OkHttpUtil::setupInsecureSsl;
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        try {
+            sslSetup = uri.getSetupSsl();
+            uri.setupClient(builder);
         }
-        else {
-            this.sslSetup = builder -> setupSsl(builder, keystorePath, keystorePassword, keystoreType, truststorePath, truststorePassword, truststoreType, useSystemTruststore);
+        catch (SQLException e) {
+            throw new IllegalArgumentException(e);
         }
 
-        OkHttpClient.Builder builder = new OkHttpClient.Builder();
-
         setupTimeouts(builder, 30, SECONDS);
-        setupCookieJar(builder);
-        setupSocksProxy(builder, socksProxy);
-        setupHttpProxy(builder, httpProxy);
-        setupBasicAuth(builder, session, user, password);
-        setupTokenAuth(builder, session, accessToken);
-        setupExternalAuth(builder, session, externalAuthentication, externalRedirectHandlers, sslSetup);
-
-        builder.addNetworkInterceptor(new HttpLoggingInterceptor(System.err::println).setLevel(networkLogging));
-
-        if (kerberosRemoteServiceName.isPresent()) {
-            checkArgument(session.getServer().getScheme().equalsIgnoreCase("https"),
-                    "Authentication using Kerberos requires HTTPS to be enabled");
-            setupKerberos(
-                    builder,
-                    krb5ServicePrincipalPattern.get(),
-                    kerberosRemoteServiceName.get(),
-                    kerberosUseCanonicalHostname,
-                    kerberosPrincipal,
-                    kerberosConfigPath.map(File::new),
-                    kerberosKeytabPath.map(File::new),
-                    kerberosCredentialCachePath.map(File::new),
-                    delegatedKerberos);
-        }
+        builder.addNetworkInterceptor(
+                new HttpLoggingInterceptor(System.err::println)
+                        .setLevel(networkLogging));
 
         this.httpClient = builder.build();
     }
@@ -156,7 +96,7 @@ private StatementClient startInternalQuery(ClientSession session, String query)
         sslSetup.accept(builder);
         OkHttpClient client = builder.build();
 
-        return newStatementClient(client, session, query);
+        return newStatementClient((Call.Factory) client, session, query);
     }
 
     @Override
@@ -165,56 +105,4 @@ public void close()
         httpClient.dispatcher().executorService().shutdown();
         httpClient.connectionPool().evictAll();
     }
-
-    private static void setupBasicAuth(
-            OkHttpClient.Builder clientBuilder,
-            ClientSession session,
-            Optional<String> user,
-            Optional<String> password)
-    {
-        if (user.isPresent() && password.isPresent()) {
-            checkArgument(session.getServer().getScheme().equalsIgnoreCase("https"),
-                    "Authentication using username/password requires HTTPS to be enabled");
-            clientBuilder.addInterceptor(basicAuth(user.get(), password.get()));
-        }
-    }
-
-    private static void setupExternalAuth(
-            OkHttpClient.Builder builder,
-            ClientSession session,
-            boolean enabled,
-            List<ExternalRedirectStrategy> externalRedirectHandlers,
-            Consumer<OkHttpClient.Builder> sslSetup)
-    {
-        if (!enabled) {
-            return;
-        }
-        checkArgument(session.getServer().getScheme().equalsIgnoreCase("https"),
-                "Authentication using externalAuthentication requires HTTPS to be enabled");
-
-        RedirectHandler redirectHandler = new CompositeRedirectHandler(externalRedirectHandlers);
-
-        TokenPoller poller = new HttpTokenPoller(builder.build(), sslSetup);
-
-        ExternalAuthenticator authenticator = new ExternalAuthenticator(
-                redirectHandler,
-                poller,
-                KnownToken.local(),
-                Duration.ofMinutes(10));
-
-        builder.authenticator(authenticator);
-        builder.addInterceptor(authenticator);
-    }
-
-    private static void setupTokenAuth(
-            OkHttpClient.Builder clientBuilder,
-            ClientSession session,
-            Optional<String> accessToken)
-    {
-        if (accessToken.isPresent()) {
-            checkArgument(session.getServer().getScheme().equalsIgnoreCase("https"),
-                    "Authentication using an access token requires HTTPS to be enabled");
-            clientBuilder.addInterceptor(tokenAuth(accessToken.get()));
-        }
-    }
 }
diff --git a/client/trino-cli/src/main/java/io/trino/cli/StatusPrinter.java b/client/trino-cli/src/main/java/io/trino/cli/StatusPrinter.java
index 373a64518778..39bb1f0885b6 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/StatusPrinter.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/StatusPrinter.java
@@ -44,6 +44,7 @@
 import static io.trino.cli.TerminalUtils.isRealTerminal;
 import static io.trino.cli.TerminalUtils.terminalWidth;
 import static java.lang.Character.toUpperCase;
+import static java.lang.Math.ceil;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static java.lang.String.format;
@@ -324,10 +325,10 @@ private void printQueryInfo(QueryStatusInfo results, WarningsPrinter warningsPri
             int progressWidth = (min(terminalWidth, 100) - 75) + 17; // progress bar is 17-42 characters wide
 
             if (stats.isScheduled()) {
-                String progressBar = formatProgressBar(progressWidth,
-                        stats.getCompletedSplits(),
-                        max(0, stats.getRunningSplits()),
-                        stats.getTotalSplits());
+                String progressBar = formatProgressBar(
+                        progressWidth,
+                        progressPercentage,
+                        (int) ceil(stats.getRunningPercentage().orElse(0.0)));
 
                 // 0:17 [ 103MB,  802K rows] [5.74MB/s, 44.9K rows/s] [=====>>                                   ] 10%
                 String progressLine = format("%s [%5s rows, %6s] [%5s rows/s, %8s] [%s] %d%%",
diff --git a/client/trino-cli/src/main/java/io/trino/cli/TableNameCompleter.java b/client/trino-cli/src/main/java/io/trino/cli/TableNameCompleter.java
index 0029f0f07566..797bf2761eff 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/TableNameCompleter.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/TableNameCompleter.java
@@ -28,6 +28,7 @@
 
 import java.io.Closeable;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -99,13 +100,10 @@ private List<String> queryMetadata(String query)
 
     public void populateCache()
     {
-        String schemaName = queryRunner.getSession().getSchema();
-        if (schemaName != null) {
-            executor.execute(() -> {
-                functionCache.refresh(schemaName);
-                tableCache.refresh(schemaName);
-            });
-        }
+        queryRunner.getSession().getSchema().ifPresent(schemaName -> executor.execute(() -> {
+            functionCache.refresh(schemaName);
+            tableCache.refresh(schemaName);
+        }));
     }
 
     @Override
@@ -114,21 +112,22 @@ public void complete(LineReader reader, ParsedLine line, List<Candidate> candida
         String buffer = line.word().substring(0, line.wordCursor());
         int blankPos = findLastBlank(buffer);
         String prefix = buffer.substring(blankPos + 1);
-        String schemaName = queryRunner.getSession().getSchema();
+        Optional<String> schemaName = queryRunner.getSession().getSchema();
 
-        if (schemaName != null) {
-            List<String> functionNames = functionCache.getIfPresent(schemaName);
-            List<String> tableNames = tableCache.getIfPresent(schemaName);
+        if (!schemaName.isPresent()) {
+            return;
+        }
+        List<String> functionNames = functionCache.getIfPresent(schemaName.get());
+        List<String> tableNames = tableCache.getIfPresent(schemaName.get());
 
-            if (functionNames != null) {
-                for (String name : filterResults(functionNames, prefix)) {
-                    candidates.add(new Candidate(name));
-                }
+        if (functionNames != null) {
+            for (String name : filterResults(functionNames, prefix)) {
+                candidates.add(new Candidate(name));
             }
-            if (tableNames != null) {
-                for (String name : filterResults(tableNames, prefix)) {
-                    candidates.add(new Candidate(name));
-                }
+        }
+        if (tableNames != null) {
+            for (String name : filterResults(tableNames, prefix)) {
+                candidates.add(new Candidate(name));
             }
         }
     }
diff --git a/client/trino-cli/src/main/java/io/trino/cli/ThreadInterruptor.java b/client/trino-cli/src/main/java/io/trino/cli/ThreadInterruptor.java
index 6d23f2369b4e..f7386fa5563a 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/ThreadInterruptor.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/ThreadInterruptor.java
@@ -13,7 +13,7 @@
  */
 package io.trino.cli;
 
-import javax.annotation.concurrent.GuardedBy;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 
 import java.io.Closeable;
 
diff --git a/client/trino-cli/src/main/java/io/trino/cli/Trino.java b/client/trino-cli/src/main/java/io/trino/cli/Trino.java
index edde910f1c3f..a9ce8190bd59 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/Trino.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/Trino.java
@@ -18,6 +18,8 @@
 import io.trino.cli.ClientOptions.ClientExtraCredential;
 import io.trino.cli.ClientOptions.ClientResourceEstimate;
 import io.trino.cli.ClientOptions.ClientSessionProperty;
+import org.jline.utils.AttributedStringBuilder;
+import org.jline.utils.AttributedStyle;
 import picocli.CommandLine;
 import picocli.CommandLine.IVersionProvider;
 
@@ -31,7 +33,10 @@
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.StandardSystemProperty.USER_HOME;
 import static com.google.common.base.Strings.emptyToNull;
+import static com.google.common.base.Throwables.getStackTraceAsString;
+import static io.trino.cli.ClientOptions.DEBUG_OPTION_NAME;
 import static java.lang.System.getenv;
+import static java.util.regex.Pattern.quote;
 
 public final class Trino
 {
@@ -50,12 +55,34 @@ public static CommandLine createCommandLine(Object command)
                 .registerConverter(ClientSessionProperty.class, ClientSessionProperty::new)
                 .registerConverter(ClientExtraCredential.class, ClientExtraCredential::new)
                 .registerConverter(HostAndPort.class, HostAndPort::fromString)
-                .registerConverter(Duration.class, Duration::valueOf);
+                .registerConverter(Duration.class, Duration::valueOf)
+                .setExecutionExceptionHandler((e, cmd, parseResult) -> {
+                    System.err.println(formatCliErrorMessage(e, parseResult.hasMatchedOption(DEBUG_OPTION_NAME)));
+                    return 1;
+                });
 
         getConfigFile().ifPresent(file -> ValidatingPropertiesDefaultProvider.attach(commandLine, file));
         return commandLine;
     }
 
+    public static String formatCliErrorMessage(Throwable throwable, boolean debug)
+    {
+        AttributedStringBuilder builder = new AttributedStringBuilder();
+        if (debug) {
+            builder.append(throwable.getClass().getName()).append(": ");
+        }
+
+        builder.append(throwable.getMessage(), AttributedStyle.BOLD.foreground(AttributedStyle.RED));
+
+        if (debug) {
+            String messagePattern = quote(throwable.getClass().getName() + ": " + throwable.getMessage());
+            String stackTraceWithoutMessage = getStackTraceAsString(throwable).replaceFirst(messagePattern, "");
+            builder.append(stackTraceWithoutMessage);
+        }
+
+        return builder.toAnsi();
+    }
+
     private static Optional<File> getConfigFile()
     {
         return getConfigSearchPaths()
diff --git a/client/trino-cli/src/main/java/io/trino/cli/TsvPrinter.java b/client/trino-cli/src/main/java/io/trino/cli/TsvPrinter.java
index 8bcdb06a6720..48c33591e320 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/TsvPrinter.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/TsvPrinter.java
@@ -20,7 +20,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import static io.trino.cli.CsvPrinter.formatValue;
+import static io.trino.cli.FormatUtils.formatValue;
 import static java.util.Objects.requireNonNull;
 
 public class TsvPrinter
@@ -65,7 +65,7 @@ private static String formatRow(List<?> row)
         StringBuilder sb = new StringBuilder();
         Iterator<?> iter = row.iterator();
         while (iter.hasNext()) {
-            String s = formatValue(iter.next());
+            String s = formatValue(iter.next(), "", -1);
 
             for (int i = 0; i < s.length(); i++) {
                 escapeCharacter(sb, s.charAt(i));
diff --git a/client/trino-cli/src/main/java/io/trino/cli/VerticalRecordPrinter.java b/client/trino-cli/src/main/java/io/trino/cli/VerticalRecordPrinter.java
index 28b789f18e1b..8b1c27a60821 100644
--- a/client/trino-cli/src/main/java/io/trino/cli/VerticalRecordPrinter.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/VerticalRecordPrinter.java
@@ -22,8 +22,8 @@
 
 import static com.google.common.base.Strings.repeat;
 import static io.trino.cli.AlignedTablePrinter.consoleWidth;
-import static io.trino.cli.AlignedTablePrinter.formatValue;
 import static io.trino.cli.AlignedTablePrinter.maxLineLength;
+import static io.trino.cli.FormatUtils.formatValue;
 import static java.lang.Math.max;
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-parser/src/main/java/io/trino/sql/parser/DelimiterLexer.java b/client/trino-cli/src/main/java/io/trino/cli/lexer/DelimiterLexer.java
similarity index 89%
rename from core/trino-parser/src/main/java/io/trino/sql/parser/DelimiterLexer.java
rename to client/trino-cli/src/main/java/io/trino/cli/lexer/DelimiterLexer.java
index 20a73c62ff74..e4b0ce50aa55 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/parser/DelimiterLexer.java
+++ b/client/trino-cli/src/main/java/io/trino/cli/lexer/DelimiterLexer.java
@@ -11,14 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.sql.parser;
+package io.trino.cli.lexer;
 
 import com.google.common.collect.ImmutableSet;
+import io.trino.grammar.sql.SqlBaseLexer;
+import io.trino.grammar.sql.SqlBaseParser;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.IntStream;
 import org.antlr.v4.runtime.LexerNoViableAltException;
 import org.antlr.v4.runtime.Token;
 
+import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -28,17 +31,26 @@
  * The code in nextToken() is a copy of the implementation in org.antlr.v4.runtime.Lexer, with a
  * bit added to match the token before the default behavior is invoked.
  */
-class DelimiterLexer
+public class DelimiterLexer
         extends SqlBaseLexer
 {
     private final Set<String> delimiters;
+    private final boolean useSemicolon;
 
     public DelimiterLexer(CharStream input, Set<String> delimiters)
     {
         super(input);
+        delimiters = new HashSet<>(delimiters);
+        this.useSemicolon = delimiters.remove(";");
         this.delimiters = ImmutableSet.copyOf(delimiters);
     }
 
+    public boolean isDelimiter(Token token)
+    {
+        return (token.getType() == SqlBaseParser.DELIMITER) ||
+                (useSemicolon && (token.getType() == SEMICOLON));
+    }
+
     @Override
     public Token nextToken()
     {
diff --git a/client/trino-cli/src/main/java/io/trino/cli/lexer/StatementSplitter.java b/client/trino-cli/src/main/java/io/trino/cli/lexer/StatementSplitter.java
new file mode 100644
index 000000000000..01b960b63142
--- /dev/null
+++ b/client/trino-cli/src/main/java/io/trino/cli/lexer/StatementSplitter.java
@@ -0,0 +1,222 @@
+/*
+ * Licensed 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 io.trino.cli.lexer;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import io.trino.grammar.sql.SqlBaseBaseVisitor;
+import io.trino.grammar.sql.SqlBaseLexer;
+import io.trino.grammar.sql.SqlBaseParser;
+import io.trino.grammar.sql.SqlBaseParser.FunctionSpecificationContext;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenSource;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.RuleNode;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import static java.util.Objects.requireNonNull;
+
+public class StatementSplitter
+{
+    private final List<Statement> completeStatements;
+    private final String partialStatement;
+
+    public StatementSplitter(String sql)
+    {
+        this(sql, ImmutableSet.of(";"));
+    }
+
+    public StatementSplitter(String sql, Set<String> delimiters)
+    {
+        DelimiterLexer lexer = getLexer(sql, delimiters);
+        CommonTokenStream tokenStream = new CommonTokenStream(lexer);
+        tokenStream.fill();
+
+        SqlBaseParser parser = new SqlBaseParser(tokenStream);
+        parser.removeErrorListeners();
+
+        ImmutableList.Builder<Statement> list = ImmutableList.builder();
+        StringBuilder sb = new StringBuilder();
+        int index = 0;
+
+        while (index < tokenStream.size()) {
+            ParserRuleContext context = parser.statement();
+
+            if (containsFunction(context)) {
+                Token stop = context.getStop();
+                if ((stop != null) && (stop.getTokenIndex() >= index)) {
+                    int endIndex = stop.getTokenIndex();
+                    while (index <= endIndex) {
+                        Token token = tokenStream.get(index);
+                        index++;
+                        sb.append(token.getText());
+                    }
+                }
+            }
+
+            while (index < tokenStream.size()) {
+                Token token = tokenStream.get(index);
+                index++;
+                if (token.getType() == Token.EOF) {
+                    break;
+                }
+                if (lexer.isDelimiter(token)) {
+                    String statement = sb.toString().trim();
+                    if (!statement.isEmpty()) {
+                        list.add(new Statement(statement, token.getText()));
+                    }
+                    sb = new StringBuilder();
+                    break;
+                }
+                sb.append(token.getText());
+            }
+        }
+
+        this.completeStatements = list.build();
+        this.partialStatement = sb.toString().trim();
+    }
+
+    public List<Statement> getCompleteStatements()
+    {
+        return completeStatements;
+    }
+
+    public String getPartialStatement()
+    {
+        return partialStatement;
+    }
+
+    public static String squeezeStatement(String sql)
+    {
+        TokenSource tokens = getLexer(sql, ImmutableSet.of());
+        StringBuilder sb = new StringBuilder();
+        while (true) {
+            Token token = tokens.nextToken();
+            if (token.getType() == Token.EOF) {
+                break;
+            }
+            if (token.getType() == SqlBaseLexer.WS) {
+                sb.append(' ');
+            }
+            else {
+                sb.append(token.getText());
+            }
+        }
+        return sb.toString().trim();
+    }
+
+    public static boolean isEmptyStatement(String sql)
+    {
+        TokenSource tokens = getLexer(sql, ImmutableSet.of());
+        while (true) {
+            Token token = tokens.nextToken();
+            if (token.getType() == Token.EOF) {
+                return true;
+            }
+            if (token.getChannel() != Token.HIDDEN_CHANNEL) {
+                return false;
+            }
+        }
+    }
+
+    public static DelimiterLexer getLexer(String sql, Set<String> terminators)
+    {
+        requireNonNull(sql, "sql is null");
+        return new DelimiterLexer(CharStreams.fromString(sql), terminators);
+    }
+
+    private static boolean containsFunction(ParseTree tree)
+    {
+        return new SqlBaseBaseVisitor<Boolean>()
+        {
+            @Override
+            protected Boolean defaultResult()
+            {
+                return false;
+            }
+
+            @Override
+            protected Boolean aggregateResult(Boolean aggregate, Boolean nextResult)
+            {
+                return aggregate || nextResult;
+            }
+
+            @Override
+            protected boolean shouldVisitNextChild(RuleNode node, Boolean currentResult)
+            {
+                return !currentResult;
+            }
+
+            @Override
+            public Boolean visitFunctionSpecification(FunctionSpecificationContext context)
+            {
+                return true;
+            }
+        }.visit(tree);
+    }
+
+    public static class Statement
+    {
+        private final String statement;
+        private final String terminator;
+
+        public Statement(String statement, String terminator)
+        {
+            this.statement = requireNonNull(statement, "statement is null");
+            this.terminator = requireNonNull(terminator, "terminator is null");
+        }
+
+        public String statement()
+        {
+            return statement;
+        }
+
+        public String terminator()
+        {
+            return terminator;
+        }
+
+        @Override
+        public boolean equals(Object obj)
+        {
+            if (this == obj) {
+                return true;
+            }
+            if ((obj == null) || (getClass() != obj.getClass())) {
+                return false;
+            }
+            Statement o = (Statement) obj;
+            return Objects.equals(statement, o.statement) &&
+                    Objects.equals(terminator, o.terminator);
+        }
+
+        @Override
+        public int hashCode()
+        {
+            return Objects.hash(statement, terminator);
+        }
+
+        @Override
+        public String toString()
+        {
+            return statement + terminator;
+        }
+    }
+}
diff --git a/client/trino-cli/src/test/java/io/trino/cli/TestAlignedTablePrinter.java b/client/trino-cli/src/test/java/io/trino/cli/TestAlignedTablePrinter.java
index b2a3bc2a4e13..eb097f24f36e 100644
--- a/client/trino-cli/src/test/java/io/trino/cli/TestAlignedTablePrinter.java
+++ b/client/trino-cli/src/test/java/io/trino/cli/TestAlignedTablePrinter.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.client.ClientTypeSignature;
 import io.trino.client.Column;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringWriter;
 import java.util.Arrays;
@@ -300,9 +300,9 @@ static List<List<?>> rows(List<?>... rows)
         return asList(rows);
     }
 
-    static byte[] bytes(String s)
+    static byte[] bytes(String value)
     {
-        return s.getBytes(UTF_8);
+        return value.getBytes(UTF_8);
     }
 
     static class KeyValue
diff --git a/client/trino-cli/src/test/java/io/trino/cli/TestAutoTablePrinter.java b/client/trino-cli/src/test/java/io/trino/cli/TestAutoTablePrinter.java
index 655d999206e5..6e06cc3247b8 100644
--- a/client/trino-cli/src/test/java/io/trino/cli/TestAutoTablePrinter.java
+++ b/client/trino-cli/src/test/java/io/trino/cli/TestAutoTablePrinter.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.client.ClientTypeSignature;
 import io.trino.client.Column;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringWriter;
 import java.util.List;
diff --git a/client/trino-cli/src/test/java/io/trino/cli/TestClientOptions.java b/client/trino-cli/src/test/java/io/trino/cli/TestClientOptions.java
index 1a937501e8b2..0e5bde65df4f 100644
--- a/client/trino-cli/src/test/java/io/trino/cli/TestClientOptions.java
+++ b/client/trino-cli/src/test/java/io/trino/cli/TestClientOptions.java
@@ -20,13 +20,16 @@
 import io.trino.cli.ClientOptions.ClientSessionProperty;
 import io.trino.cli.ClientOptions.OutputFormat;
 import io.trino.client.ClientSession;
-import org.testng.annotations.Test;
+import io.trino.client.uri.TrinoUri;
+import org.junit.jupiter.api.Test;
 
+import java.sql.SQLException;
 import java.time.ZoneId;
 import java.util.Optional;
 
 import static io.trino.cli.Trino.createCommandLine;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
@@ -38,7 +41,7 @@ public void testDefaults()
         Console console = createConsole();
         ClientOptions options = console.clientOptions;
         assertEquals(options.krb5ServicePrincipalPattern, Optional.of("${SERVICE}@${HOST}"));
-        ClientSession session = options.toClientSession();
+        ClientSession session = options.toClientSession(options.getTrinoUri());
         assertEquals(session.getServer().toString(), "http://localhost:8080");
         assertEquals(session.getSource(), "trino-cli");
         assertEquals(session.getTimeZone(), ZoneId.systemDefault());
@@ -48,7 +51,7 @@ public void testDefaults()
     public void testSource()
     {
         Console console = createConsole("--source=test");
-        ClientSession session = console.clientOptions.toClientSession();
+        ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
         assertEquals(session.getSource(), "test");
     }
 
@@ -56,7 +59,7 @@ public void testSource()
     public void testTraceToken()
     {
         Console console = createConsole("--trace-token", "test token");
-        ClientSession session = console.clientOptions.toClientSession();
+        ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
         assertEquals(session.getTraceToken(), Optional.of("test token"));
     }
 
@@ -64,7 +67,7 @@ public void testTraceToken()
     public void testServerHostOnly()
     {
         Console console = createConsole("--server=test");
-        ClientSession session = console.clientOptions.toClientSession();
+        ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
         assertEquals(session.getServer().toString(), "http://test:80");
     }
 
@@ -72,7 +75,7 @@ public void testServerHostOnly()
     public void testServerHostPort()
     {
         Console console = createConsole("--server=test:8888");
-        ClientSession session = console.clientOptions.toClientSession();
+        ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
         assertEquals(session.getServer().toString(), "http://test:8888");
     }
 
@@ -80,23 +83,34 @@ public void testServerHostPort()
     public void testServerHttpUri()
     {
         Console console = createConsole("--server=http://test/foo");
-        ClientSession session = console.clientOptions.toClientSession();
-        assertEquals(session.getServer().toString(), "http://test/foo");
+        ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
+        assertEquals(session.getServer().toString(), "http://test:80");
+        assertEquals(session.getCatalog(), Optional.of("foo"));
+    }
+
+    @Test
+    public void testServerTrinoUri()
+    {
+        Console console = createConsole("--server=trino://test/foo");
+        ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
+        assertEquals(session.getServer().toString(), "http://test:80");
+        assertEquals(session.getCatalog(), Optional.of("foo"));
     }
 
     @Test
     public void testServerHttpsUri()
     {
         Console console = createConsole("--server=https://test/foo");
-        ClientSession session = console.clientOptions.toClientSession();
-        assertEquals(session.getServer().toString(), "https://test/foo");
+        ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
+        assertEquals(session.getServer().toString(), "https://test:443");
+        assertEquals(session.getCatalog(), Optional.of("foo"));
     }
 
     @Test
     public void testServer443Port()
     {
         Console console = createConsole("--server=test:443");
-        ClientSession session = console.clientOptions.toClientSession();
+        ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
         assertEquals(session.getServer().toString(), "https://test:443");
     }
 
@@ -104,7 +118,7 @@ public void testServer443Port()
     public void testServerHttpsHostPort()
     {
         Console console = createConsole("--server=https://test:443");
-        ClientSession session = console.clientOptions.toClientSession();
+        ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
         assertEquals(session.getServer().toString(), "https://test:443");
     }
 
@@ -112,15 +126,62 @@ public void testServerHttpsHostPort()
     public void testServerHttpWithPort443()
     {
         Console console = createConsole("--server=http://test:443");
-        ClientSession session = console.clientOptions.toClientSession();
+        ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
         assertEquals(session.getServer().toString(), "http://test:443");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Unparseable port number: x:y")
+    @Test
     public void testInvalidServer()
     {
-        Console console = createConsole("--server=x:y");
-        console.clientOptions.toClientSession();
+        assertThatThrownBy(() -> {
+            Console console = createConsole("--server=x:y");
+            console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
+        })
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Unparseable port number: x:y");
+    }
+
+    @Test
+    public void testServerAndURL()
+    {
+        assertThatThrownBy(() -> {
+            Console console = createConsole("--server=trino://server.example:80", "trino://server.example:80");
+            console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
+        })
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Using both the URL parameter and the --server option is not allowed");
+    }
+
+    @Test
+    public void testURLHostOnly()
+    {
+        Console console = createConsole("test");
+        ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
+        assertEquals(session.getServer().toString(), "http://test:80");
+    }
+
+    @Test
+    public void testURLParams()
+            throws SQLException
+    {
+        Console console = createConsole("trino://server.example:8080/my-catalog/my-schema?source=my-client");
+        TrinoUri uri = console.clientOptions.getTrinoUri();
+        ClientSession session = console.clientOptions.toClientSession(uri);
+        assertEquals(session.getServer().toString(), "http://server.example:8080");
+        assertEquals(session.getCatalog(), Optional.of("my-catalog"));
+        assertEquals(session.getSchema(), Optional.of("my-schema"));
+        assertEquals(uri.getSource(), Optional.of("my-client"));
+    }
+
+    @Test
+    public void testURLPassword()
+    {
+        assertThatThrownBy(() -> {
+            Console console = createConsole("trino://server.example:80?password=invalid");
+            console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
+        })
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageMatching("Setting the password in the URL parameter is not allowed.*");
     }
 
     @Test
@@ -192,7 +253,7 @@ public void testTimeZone()
         ClientOptions options = console.clientOptions;
         assertEquals(options.timeZone, ZoneId.of("Europe/Vilnius"));
 
-        ClientSession session = options.toClientSession();
+        ClientSession session = options.toClientSession(options.getTrinoUri());
         assertEquals(session.getTimeZone(), ZoneId.of("Europe/Vilnius"));
     }
 
@@ -204,45 +265,59 @@ public void testDisableCompression()
         ClientOptions options = console.clientOptions;
         assertTrue(options.disableCompression);
 
-        ClientSession session = options.toClientSession();
+        ClientSession session = options.toClientSession(options.getTrinoUri());
         assertTrue(session.isCompressionDisabled());
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "\\QInvalid session property: foo.bar.baz=value\\E")
+    @Test
     public void testThreePartPropertyName()
     {
-        new ClientSessionProperty("foo.bar.baz=value");
+        assertThatThrownBy(() -> new ClientSessionProperty("foo.bar.baz=value"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Invalid session property: foo.bar.baz=value");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "\\QSession property name is empty\\E")
+    @Test
     public void testEmptyPropertyName()
     {
-        new ClientSessionProperty("=value");
+        assertThatThrownBy(() -> new ClientSessionProperty("=value"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Session property name is empty");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "\\QSession property name contains spaces or is not ASCII: ☃\\E")
+    @Test
     public void testInvalidCharsetPropertyName()
     {
-        new ClientSessionProperty("\u2603=value");
+        assertThatThrownBy(() -> new ClientSessionProperty("\u2603=value"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Session property name contains spaces or is not ASCII: ☃");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "\\QSession property value contains spaces or is not ASCII: ☃\\E")
+    @Test
     public void testInvalidCharsetPropertyValue()
     {
-        new ClientSessionProperty("name=\u2603");
+        assertThatThrownBy(() -> new ClientSessionProperty("name=\u2603"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Session property value contains spaces or is not ASCII: ☃");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "\\QSession property catalog must not contain '=': name\\E")
+    @Test
     public void testEqualSignNoAllowedInPropertyCatalog()
     {
-        new ClientSessionProperty(Optional.of("cat=alog"), "name", "value");
+        assertThatThrownBy(() -> new ClientSessionProperty(Optional.of("cat=alog"), "name", "value"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Session property catalog must not contain '=': name");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "\\QMultiple entries with same key: test.token.foo=bar and test.token.foo=foo\\E")
+    @Test
     public void testDuplicateExtraCredentialKey()
     {
-        Console console = createConsole("--extra-credential", "test.token.foo=foo", "--extra-credential", "test.token.foo=bar");
-        console.clientOptions.toClientSession();
+        assertThatThrownBy(() -> {
+            Console console = createConsole("--extra-credential", "test.token.foo=foo", "--extra-credential", "test.token.foo=bar");
+            console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
+        })
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Multiple entries with same key: test.token.foo=bar and test.token.foo=foo");
     }
 
     private static Console createConsole(String... args)
diff --git a/client/trino-cli/src/test/java/io/trino/cli/TestCsvPrinter.java b/client/trino-cli/src/test/java/io/trino/cli/TestCsvPrinter.java
index 150dcd87e58e..7bfd9c15d4de 100644
--- a/client/trino-cli/src/test/java/io/trino/cli/TestCsvPrinter.java
+++ b/client/trino-cli/src/test/java/io/trino/cli/TestCsvPrinter.java
@@ -14,7 +14,7 @@
 package io.trino.cli;
 
 import com.google.common.collect.ImmutableList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/client/trino-cli/src/test/java/io/trino/cli/TestInputParser.java b/client/trino-cli/src/test/java/io/trino/cli/TestInputParser.java
index 01110ff7d06e..d40b75a790d4 100644
--- a/client/trino-cli/src/test/java/io/trino/cli/TestInputParser.java
+++ b/client/trino-cli/src/test/java/io/trino/cli/TestInputParser.java
@@ -14,7 +14,7 @@
 package io.trino.cli;
 
 import org.jline.reader.EOFError;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.jline.reader.Parser.ParseContext.ACCEPT_LINE;
diff --git a/client/trino-cli/src/test/java/io/trino/cli/TestInsecureQueryRunner.java b/client/trino-cli/src/test/java/io/trino/cli/TestInsecureQueryRunner.java
index 1db889214f7a..e0ddac8c3da4 100644
--- a/client/trino-cli/src/test/java/io/trino/cli/TestInsecureQueryRunner.java
+++ b/client/trino-cli/src/test/java/io/trino/cli/TestInsecureQueryRunner.java
@@ -15,9 +15,10 @@
 
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
@@ -35,15 +36,17 @@
 import static io.trino.cli.TestQueryRunner.createClientSession;
 import static io.trino.cli.TestQueryRunner.createQueryRunner;
 import static io.trino.cli.TestQueryRunner.createResults;
+import static io.trino.cli.TestQueryRunner.createTrinoUri;
 import static io.trino.cli.TestQueryRunner.nullPrintStream;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestInsecureQueryRunner
 {
     private MockWebServer server;
 
-    @BeforeMethod
+    @BeforeEach
     public void setup()
             throws Exception
     {
@@ -53,7 +56,7 @@ public void setup()
         server.start();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void teardown()
             throws Exception
     {
@@ -72,7 +75,7 @@ public void testInsecureConnection()
                 .addHeader(CONTENT_TYPE, "application/json")
                 .setBody(createResults(server)));
 
-        QueryRunner queryRunner = createQueryRunner(createClientSession(server), true);
+        QueryRunner queryRunner = createQueryRunner(createTrinoUri(server, true), createClientSession(server));
 
         try (Query query = queryRunner.startQuery("query with insecure mode")) {
             query.renderOutput(getTerminal(), nullPrintStream(), nullPrintStream(), CSV, Optional.of(""), false);
diff --git a/client/trino-cli/src/test/java/io/trino/cli/TestJsonPrinter.java b/client/trino-cli/src/test/java/io/trino/cli/TestJsonPrinter.java
index 655e9f800a4a..88eb152e8329 100644
--- a/client/trino-cli/src/test/java/io/trino/cli/TestJsonPrinter.java
+++ b/client/trino-cli/src/test/java/io/trino/cli/TestJsonPrinter.java
@@ -14,7 +14,7 @@
 package io.trino.cli;
 
 import com.google.common.collect.ImmutableList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/client/trino-cli/src/test/java/io/trino/cli/TestMarkdownTablePrinter.java b/client/trino-cli/src/test/java/io/trino/cli/TestMarkdownTablePrinter.java
new file mode 100644
index 000000000000..64aefa83d575
--- /dev/null
+++ b/client/trino-cli/src/test/java/io/trino/cli/TestMarkdownTablePrinter.java
@@ -0,0 +1,183 @@
+/*
+ * Licensed 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 io.trino.cli;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.client.ClientTypeSignature;
+import io.trino.client.Column;
+import org.junit.jupiter.api.Test;
+
+import java.io.StringWriter;
+import java.util.List;
+
+import static io.trino.client.ClientStandardTypes.BIGINT;
+import static io.trino.client.ClientStandardTypes.VARBINARY;
+import static io.trino.client.ClientStandardTypes.VARCHAR;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Arrays.asList;
+import static org.testng.Assert.assertEquals;
+
+public class TestMarkdownTablePrinter
+{
+    @Test
+    public void testMarkdownPrinting()
+            throws Exception
+    {
+        List<Column> columns = ImmutableList.<Column>builder()
+                .add(column("first", VARCHAR))
+                .add(column("last", VARCHAR))
+                .add(column("quantity", BIGINT))
+                .build();
+        StringWriter writer = new StringWriter();
+        OutputPrinter printer = new MarkdownTablePrinter(columns, writer);
+
+        printer.printRows(rows(
+                        row("hello", "world", 123),
+                        row("a", null, 4.5),
+                        row("b", null, null),
+                        row("some long\ntext that\ndoes not\nfit on\none line", "more\ntext", 4567),
+                        row("bye | not **& <a>**", "done", -15)),
+                true);
+        printer.finish();
+
+        String expected = "" +
+                "| first                                                    | last         | quantity |\n" +
+                "| -------------------------------------------------------- | ------------ | --------:|\n" +
+                "| hello                                                    | world        |      123 |\n" +
+                "| a                                                        | NULL         |      4.5 |\n" +
+                "| b                                                        | NULL         |     NULL |\n" +
+                "| some long<br>text that<br>does not<br>fit on<br>one line | more<br>text |     4567 |\n" +
+                "| bye \\| not \\*\\*& \\<a\\>\\*\\*                               | done         |      -15 |\n";
+
+        assertEquals(writer.getBuffer().toString(), expected);
+    }
+
+    @Test
+    public void testMarkdownPrintingOneRow()
+            throws Exception
+    {
+        List<Column> columns = ImmutableList.<Column>builder()
+                .add(column("first", VARCHAR))
+                .add(column("last", VARCHAR))
+                .build();
+        StringWriter writer = new StringWriter();
+        OutputPrinter printer = new MarkdownTablePrinter(columns, writer);
+
+        printer.printRows(rows(row("a long line\nwithout wrapping", "text")), true);
+        printer.finish();
+
+        String expected = "" +
+                "| first                           | last |\n" +
+                "| ------------------------------- | ---- |\n" +
+                "| a long line<br>without wrapping | text |\n";
+
+        assertEquals(writer.getBuffer().toString(), expected);
+    }
+
+    @Test
+    public void testMarkdownPrintingNoRows()
+            throws Exception
+    {
+        List<Column> columns = ImmutableList.<Column>builder()
+                .add(column("first", VARCHAR))
+                .add(column("last", VARCHAR))
+                .build();
+        StringWriter writer = new StringWriter();
+        OutputPrinter printer = new MarkdownTablePrinter(columns, writer);
+
+        printer.finish();
+
+        String expected = "";
+
+        assertEquals(writer.getBuffer().toString(), expected);
+    }
+
+    @Test
+    public void testMarkdownPrintingHex()
+            throws Exception
+    {
+        List<Column> columns = ImmutableList.<Column>builder()
+                .add(column("first", VARCHAR))
+                .add(column("binary", VARBINARY))
+                .add(column("last", VARCHAR))
+                .build();
+        StringWriter writer = new StringWriter();
+        OutputPrinter printer = new MarkdownTablePrinter(columns, writer);
+
+        printer.printRows(rows(
+                        row("hello", bytes("hello"), "world"),
+                        row("a", bytes("some long text that is more than 16 bytes"), "b"),
+                        row("cat", bytes(""), "dog")),
+                true);
+        printer.finish();
+
+        String expected = "" +
+                "| first | binary                                                                                                                           | last  |\n" +
+                "| ----- | -------------------------------------------------------------------------------------------------------------------------------- | ----- |\n" +
+                "| hello | 68 65 6c 6c 6f                                                                                                                   | world |\n" +
+                "| a     | 73 6f 6d 65 20 6c 6f 6e 67 20 74 65 78 74 20 74<br>68 61 74 20 69 73 20 6d 6f 72 65 20 74 68 61 6e<br>20 31 36 20 62 79 74 65 73 | b     |\n" +
+                "| cat   |                                                                                                                                  | dog   |\n";
+
+        assertEquals(writer.getBuffer().toString(), expected);
+    }
+
+    @Test
+    public void testMarkdownPrintingWideCharacters()
+            throws Exception
+    {
+        List<Column> columns = ImmutableList.<Column>builder()
+                .add(column("go\u7f51", VARCHAR))
+                .add(column("last", VARCHAR))
+                .add(column("quantity\u7f51", BIGINT))
+                .build();
+        StringWriter writer = new StringWriter();
+        OutputPrinter printer = new MarkdownTablePrinter(columns, writer);
+
+        printer.printRows(rows(
+                        row("hello", "wide\u7f51", 123),
+                        row("some long\ntext \u7f51\ndoes not\u7f51\nfit", "more\ntext", 4567),
+                        row("bye", "done", -15)),
+                true);
+        printer.finish();
+
+        String expected = "" +
+                "| go\u7f51                                      | last         | quantity\u7f51 |\n" +
+                "| ----------------------------------------- | ------------ | ----------:|\n" +
+                "| hello                                     | wide\u7f51       |        123 |\n" +
+                "| some long<br>text \u7f51<br>does not\u7f51<br>fit | more<br>text |       4567 |\n" +
+                "| bye                                       | done         |        -15 |\n";
+
+        assertEquals(writer.getBuffer().toString(), expected);
+    }
+
+    static Column column(String name, String type)
+    {
+        return new Column(name, type, new ClientTypeSignature(type));
+    }
+
+    static List<?> row(Object... values)
+    {
+        return asList(values);
+    }
+
+    static List<List<?>> rows(List<?>... rows)
+    {
+        return asList(rows);
+    }
+
+    static byte[] bytes(String value)
+    {
+        return value.getBytes(UTF_8);
+    }
+}
diff --git a/client/trino-cli/src/test/java/io/trino/cli/TestQueryRunner.java b/client/trino-cli/src/test/java/io/trino/cli/TestQueryRunner.java
index b42942004830..2f9ad459d83a 100644
--- a/client/trino-cli/src/test/java/io/trino/cli/TestQueryRunner.java
+++ b/client/trino-cli/src/test/java/io/trino/cli/TestQueryRunner.java
@@ -21,18 +21,24 @@
 import io.trino.client.Column;
 import io.trino.client.QueryResults;
 import io.trino.client.StatementStats;
+import io.trino.client.uri.PropertyName;
+import io.trino.client.uri.TrinoUri;
 import okhttp3.logging.HttpLoggingInterceptor;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.io.PrintStream;
+import java.sql.SQLException;
 import java.time.ZoneId;
 import java.util.Locale;
 import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.Properties;
 
 import static com.google.common.io.ByteStreams.nullOutputStream;
 import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
@@ -44,17 +50,18 @@
 import static io.trino.client.ClientStandardTypes.BIGINT;
 import static io.trino.client.auth.external.ExternalRedirectStrategy.PRINT;
 import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestQueryRunner
 {
     private static final JsonCodec<QueryResults> QUERY_RESULTS_CODEC = jsonCodec(QueryResults.class);
 
     private MockWebServer server;
 
-    @BeforeMethod
+    @BeforeEach
     public void setup()
             throws IOException
     {
@@ -62,7 +69,7 @@ public void setup()
         server.start();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void teardown()
             throws IOException
     {
@@ -85,7 +92,7 @@ public void testCookie()
                 .addHeader(CONTENT_TYPE, "application/json")
                 .setBody(createResults(server)));
 
-        QueryRunner queryRunner = createQueryRunner(createClientSession(server), false);
+        QueryRunner queryRunner = createQueryRunner(createTrinoUri(server, false), createClientSession(server));
 
         try (Query query = queryRunner.startQuery("first query will introduce a cookie")) {
             query.renderOutput(getTerminal(), nullPrintStream(), nullPrintStream(), CSV, Optional.of(""), false);
@@ -99,6 +106,15 @@ public void testCookie()
         assertEquals(server.takeRequest().getHeader("Cookie"), "a=apple");
     }
 
+    static TrinoUri createTrinoUri(MockWebServer server, boolean insecureSsl)
+            throws SQLException
+    {
+        Properties properties = new Properties();
+        properties.setProperty(PropertyName.EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS.toString(), PRINT.name());
+        properties.setProperty(PropertyName.SSL.toString(), Boolean.toString(!insecureSsl));
+        return TrinoUri.create(server.url("/").uri(), properties);
+    }
+
     static ClientSession createClientSession(MockWebServer server)
     {
         return ClientSession.builder()
@@ -125,7 +141,11 @@ static String createResults(MockWebServer server)
                 null,
                 ImmutableList.of(new Column("_col0", BIGINT, new ClientTypeSignature(BIGINT))),
                 ImmutableList.of(ImmutableList.of(123)),
-                StatementStats.builder().setState("FINISHED").build(),
+                StatementStats.builder()
+                        .setState("FINISHED")
+                        .setProgressPercentage(OptionalDouble.empty())
+                        .setRunningPercentage(OptionalDouble.empty())
+                        .build(),
                 //new StatementStats("FINISHED", false, true, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, null),
                 null,
                 ImmutableList.of(),
@@ -134,35 +154,13 @@ static String createResults(MockWebServer server)
         return QUERY_RESULTS_CODEC.toJson(queryResults);
     }
 
-    static QueryRunner createQueryRunner(ClientSession clientSession, boolean insecureSsl)
+    static QueryRunner createQueryRunner(TrinoUri uri, ClientSession clientSession)
     {
         return new QueryRunner(
+                uri,
                 clientSession,
                 false,
-                HttpLoggingInterceptor.Level.NONE,
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                false,
-                insecureSsl,
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                false,
-                false,
-                false,
-                ImmutableList.of(PRINT));
+                HttpLoggingInterceptor.Level.NONE);
     }
 
     static PrintStream nullPrintStream()
diff --git a/client/trino-cli/src/test/java/io/trino/cli/TestTsvPrinter.java b/client/trino-cli/src/test/java/io/trino/cli/TestTsvPrinter.java
index 0d503c221073..714e625663cd 100644
--- a/client/trino-cli/src/test/java/io/trino/cli/TestTsvPrinter.java
+++ b/client/trino-cli/src/test/java/io/trino/cli/TestTsvPrinter.java
@@ -14,7 +14,7 @@
 package io.trino.cli;
 
 import com.google.common.collect.ImmutableList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/client/trino-cli/src/test/java/io/trino/cli/TestVerticalRecordPrinter.java b/client/trino-cli/src/test/java/io/trino/cli/TestVerticalRecordPrinter.java
index 3a611cb29274..6f8ed957af7d 100644
--- a/client/trino-cli/src/test/java/io/trino/cli/TestVerticalRecordPrinter.java
+++ b/client/trino-cli/src/test/java/io/trino/cli/TestVerticalRecordPrinter.java
@@ -14,7 +14,7 @@
 package io.trino.cli;
 
 import com.google.common.collect.ImmutableList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringWriter;
 import java.util.List;
@@ -24,7 +24,6 @@
 import static io.trino.cli.TestAlignedTablePrinter.rows;
 import static org.testng.Assert.assertEquals;
 
-@SuppressWarnings("Duplicates")
 public class TestVerticalRecordPrinter
 {
     @Test
diff --git a/client/trino-cli/src/test/java/io/trino/cli/lexer/TestStatementSplitter.java b/client/trino-cli/src/test/java/io/trino/cli/lexer/TestStatementSplitter.java
new file mode 100644
index 000000000000..6b219c1a73cf
--- /dev/null
+++ b/client/trino-cli/src/test/java/io/trino/cli/lexer/TestStatementSplitter.java
@@ -0,0 +1,485 @@
+/*
+ * Licensed 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 io.trino.cli.lexer;
+
+import com.google.common.collect.ImmutableSet;
+import io.trino.cli.lexer.StatementSplitter.Statement;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.cli.lexer.StatementSplitter.isEmptyStatement;
+import static io.trino.cli.lexer.StatementSplitter.squeezeStatement;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestStatementSplitter
+{
+    @Test
+    public void testSplitterIncomplete()
+    {
+        StatementSplitter splitter = new StatementSplitter(" select * FROM foo  ");
+        assertThat(splitter.getCompleteStatements()).isEmpty();
+        assertThat(splitter.getPartialStatement()).isEqualTo("select * FROM foo");
+    }
+
+    @Test
+    public void testSplitterEmptyInput()
+    {
+        StatementSplitter splitter = new StatementSplitter("");
+        assertThat(splitter.getCompleteStatements()).isEmpty();
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterEmptyStatements()
+    {
+        StatementSplitter splitter = new StatementSplitter(";;;");
+        assertThat(splitter.getCompleteStatements()).isEmpty();
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterSingle()
+    {
+        StatementSplitter splitter = new StatementSplitter("select * from foo;");
+        assertThat(splitter.getCompleteStatements()).containsExactly(statement("select * from foo"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterMultiple()
+    {
+        StatementSplitter splitter = new StatementSplitter(" select * from  foo ; select * from t; select * from ");
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("select * from  foo"),
+                statement("select * from t"));
+        assertThat(splitter.getPartialStatement()).isEqualTo("select * from");
+    }
+
+    @Test
+    public void testSplitterMultipleWithEmpty()
+    {
+        StatementSplitter splitter = new StatementSplitter("; select * from  foo ; select * from t;;;select * from ");
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("select * from  foo"),
+                statement("select * from t"));
+        assertThat(splitter.getPartialStatement()).isEqualTo("select * from");
+    }
+
+    @Test
+    public void testSplitterCustomDelimiters()
+    {
+        String sql = "// select * from  foo // select * from t;//select * from ";
+        StatementSplitter splitter = new StatementSplitter(sql, ImmutableSet.of(";", "//"));
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                new Statement("select * from  foo", "//"),
+                new Statement("select * from t", ";"));
+        assertEquals("select * from", splitter.getPartialStatement());
+    }
+
+    @Test
+    public void testSplitterErrorBeforeComplete()
+    {
+        StatementSplitter splitter = new StatementSplitter(" select * from z# oops ; select ");
+        assertThat(splitter.getCompleteStatements()).containsExactly(statement("select * from z# oops"));
+        assertThat(splitter.getPartialStatement()).isEqualTo("select");
+    }
+
+    @Test
+    public void testSplitterErrorAfterComplete()
+    {
+        StatementSplitter splitter = new StatementSplitter("select * from foo; select z# oops ");
+        assertThat(splitter.getCompleteStatements()).containsExactly(statement("select * from foo"));
+        assertThat(splitter.getPartialStatement()).isEqualTo("select z# oops");
+    }
+
+    @Test
+    public void testSplitterWithQuotedString()
+    {
+        String sql = "select 'foo bar' x from dual";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).isEmpty();
+        assertThat(splitter.getPartialStatement()).isEqualTo(sql);
+    }
+
+    @Test
+    public void testSplitterWithIncompleteQuotedString()
+    {
+        String sql = "select 'foo', 'bar";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).isEmpty();
+        assertThat(splitter.getPartialStatement()).isEqualTo(sql);
+    }
+
+    @Test
+    public void testSplitterWithEscapedSingleQuote()
+    {
+        String sql = "select 'hello''world' from dual";
+        StatementSplitter splitter = new StatementSplitter(sql + ";");
+        assertThat(splitter.getCompleteStatements()).containsExactly(statement(sql));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterWithQuotedIdentifier()
+    {
+        String sql = "select \"0\"\"bar\" from dual";
+        StatementSplitter splitter = new StatementSplitter(sql + ";");
+        assertThat(splitter.getCompleteStatements()).containsExactly(statement(sql));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterWithBackquote()
+    {
+        String sql = "select  ` f``o o ` from dual";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).isEmpty();
+        assertThat(splitter.getPartialStatement()).isEqualTo(sql);
+    }
+
+    @Test
+    public void testSplitterWithDigitIdentifier()
+    {
+        String sql = "select   1x  from dual";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).isEmpty();
+        assertThat(splitter.getPartialStatement()).isEqualTo(sql);
+    }
+
+    @Test
+    public void testSplitterWithSingleLineComment()
+    {
+        StatementSplitter splitter = new StatementSplitter("--empty\n;-- start\nselect * -- junk\n-- hi\nfrom foo; -- done");
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("--empty"),
+                statement("-- start\nselect * -- junk\n-- hi\nfrom foo"));
+        assertThat(splitter.getPartialStatement()).isEqualTo("-- done");
+    }
+
+    @Test
+    public void testSplitterWithMultiLineComment()
+    {
+        StatementSplitter splitter = new StatementSplitter("/* empty */;/* start */ select * /* middle */ from foo; /* end */");
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("/* empty */"),
+                statement("/* start */ select * /* middle */ from foo"));
+        assertThat(splitter.getPartialStatement()).isEqualTo("/* end */");
+    }
+
+    @Test
+    public void testSplitterWithSingleLineCommentPartial()
+    {
+        String sql = "-- start\nselect * -- junk\n-- hi\nfrom foo -- done";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).isEmpty();
+        assertThat(splitter.getPartialStatement()).isEqualTo(sql);
+    }
+
+    @Test
+    public void testSplitterWithMultiLineCommentPartial()
+    {
+        String sql = "/* start */ select * /* middle */ from foo /* end */";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).isEmpty();
+        assertThat(splitter.getPartialStatement()).isEqualTo(sql);
+    }
+
+    @Test
+    public void testSplitterIncompleteSelect()
+    {
+        String sql = "select abc, ; select 456;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("select abc,"),
+                statement("select 456"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterIncompleteSelectAndFrom()
+    {
+        String sql = "select abc, from ; select 456;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("select abc, from"),
+                statement("select 456"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterIncompleteSelectWithFrom()
+    {
+        String sql = "select abc, from xxx ; select 456;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("select abc, from xxx"),
+                statement("select 456"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterIncompleteSelectAndWhere()
+    {
+        String sql = "select abc, from xxx where ; select 456;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("select abc, from xxx where"),
+                statement("select 456"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterIncompleteSelectWithWhere()
+    {
+        String sql = "select abc, from xxx where false ; select 456;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("select abc, from xxx where false"),
+                statement("select 456"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterIncompleteSelectWithInvalidWhere()
+    {
+        String sql = "select abc, from xxx where and false ; select 456;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("select abc, from xxx where and false"),
+                statement("select 456"));
+    }
+
+    @Test
+    public void testSplitterIncompleteSelectAndFromAndWhere()
+    {
+        String sql = "select abc, from where ; select 456;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("select abc, from where"),
+                statement("select 456"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterSelectItemsWithoutComma()
+    {
+        String sql = "select abc xyz foo ; select 456;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("select abc xyz foo"),
+                statement("select 456"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterSimpleInlineFunction()
+    {
+        String function = "WITH FUNCTION abc() RETURNS int RETURN 42 SELECT abc() FROM t";
+        String sql = function + "; SELECT 456;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement(function),
+                statement("SELECT 456"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterSimpleInlineFunctionWithIncompleteSelect()
+    {
+        String function = "WITH FUNCTION abc() RETURNS int RETURN 42 SELECT abc(), FROM t";
+        String sql = function + "; SELECT 456;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement(function),
+                statement("SELECT 456"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterSimpleInlineFunctionWithComments()
+    {
+        String function = "/* start */ WITH FUNCTION abc() RETURNS int /* middle */ RETURN 42 SELECT abc() FROM t /* end */";
+        String sql = function + "; SELECT 456;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement(function),
+                statement("SELECT 456"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterCreateFunction()
+    {
+        String function = "CREATE FUNCTION fib(n int) RETURNS int BEGIN IF false THEN RETURN 0; END IF; RETURN 1; END";
+        String sql = function + "; SELECT 123;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement(function),
+                statement("SELECT 123"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterCreateFunctionInvalidThen()
+    {
+        String function = "CREATE FUNCTION fib(n int) RETURNS int BEGIN IF false THEN oops; END IF; RETURN 1; END";
+        String sql = function + "; SELECT 123;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement(function),
+                statement("SELECT 123"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterCreateFunctionInvalidReturn()
+    {
+        String function = "CREATE FUNCTION fib(n int) RETURNS int BEGIN IF false THEN oops; END IF; RETURN 1 xxx; END";
+        String sql = function + "; SELECT 123;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement(function),
+                statement("SELECT 123"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterCreateFunctionInvalidBegin()
+    {
+        String function = "CREATE FUNCTION fib(n int) RETURNS int BEGIN xxx IF false THEN oops; END IF; RETURN 1; END";
+        String sql = function + "; SELECT 123;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("CREATE FUNCTION fib(n int) RETURNS int BEGIN xxx IF false THEN oops; END IF"),
+                statement("RETURN 1"),
+                statement("END"),
+                statement("SELECT 123"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterCreateFunctionInvalidDelimitedThen()
+    {
+        String function = "CREATE FUNCTION fib(n int) RETURNS int BEGIN IF false THEN; oops; END IF; RETURN 1; END";
+        String sql = function + "; SELECT 123;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement(function),
+                statement("SELECT 123"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterComplexCreateFunction()
+    {
+        String function = "" +
+                "CREATE FUNCTION fib(n bigint)\n" +
+                "RETURNS bigint\n" +
+                "BEGIN\n" +
+                "  DECLARE a bigint DEFAULT 1;\n" +
+                "  DECLARE b bigint DEFAULT 1;\n" +
+                "  DECLARE c bigint;\n" +
+                "  IF n <= 2 THEN\n" +
+                "    RETURN 1;\n" +
+                "  END IF;\n" +
+                "  WHILE n > 2 DO\n" +
+                "    SET n = n - 1;\n" +
+                "    SET c = a + b;\n" +
+                "    SET a = b;\n" +
+                "    SET b = c;\n" +
+                "  END WHILE;\n" +
+                "  RETURN c;\n" +
+                "END";
+        String sql = function + ";\nSELECT 123;\nSELECT 456;\n";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement(function),
+                statement("SELECT 123"),
+                statement("SELECT 456"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testSplitterMultipleFunctions()
+    {
+        String function1 = "CREATE FUNCTION f1() RETURNS int BEGIN IF false THEN RETURN 0; END IF; RETURN 1; END";
+        String function2 = "CREATE FUNCTION f2() RETURNS int BEGIN IF false THEN RETURN 0; END IF; RETURN 1; END";
+        String sql = "SELECT 11;" + function1 + ";" + function2 + ";SELECT 22;" + function2 + ";SELECT 33;";
+        StatementSplitter splitter = new StatementSplitter(sql);
+        assertThat(splitter.getCompleteStatements()).containsExactly(
+                statement("SELECT 11"),
+                statement(function1),
+                statement(function2),
+                statement("SELECT 22"),
+                statement(function2),
+                statement("SELECT 33"));
+        assertThat(splitter.getPartialStatement()).isEmpty();
+    }
+
+    @Test
+    public void testIsEmptyStatement()
+    {
+        assertTrue(isEmptyStatement(""));
+        assertTrue(isEmptyStatement(" "));
+        assertTrue(isEmptyStatement("\t\n "));
+        assertTrue(isEmptyStatement("--foo\n  --what"));
+        assertTrue(isEmptyStatement("/* oops */"));
+        assertFalse(isEmptyStatement("x"));
+        assertFalse(isEmptyStatement("select"));
+        assertFalse(isEmptyStatement("123"));
+        assertFalse(isEmptyStatement("z#oops"));
+    }
+
+    @Test
+    public void testSqueezeStatement()
+    {
+        String sql = "select   *  from\n foo\n  order by x ; ";
+        assertEquals("select * from foo order by x ;", squeezeStatement(sql));
+    }
+
+    @Test
+    public void testSqueezeStatementWithIncompleteQuotedString()
+    {
+        String sql = "select   *  from\n foo\n  where x = 'oops";
+        assertEquals("select * from foo where x = 'oops", squeezeStatement(sql));
+    }
+
+    @Test
+    public void testSqueezeStatementWithBackquote()
+    {
+        String sql = "select  `  f``o  o`` `   from dual";
+        assertEquals("select `  f``o  o`` ` from dual", squeezeStatement(sql));
+    }
+
+    @Test
+    public void testSqueezeStatementAlternateDelimiter()
+    {
+        String sql = "select   *  from\n foo\n  order by x // ";
+        assertEquals("select * from foo order by x //", squeezeStatement(sql));
+    }
+
+    @Test
+    public void testSqueezeStatementError()
+    {
+        String sql = "select   *  from z#oops";
+        assertEquals("select * from z#oops", squeezeStatement(sql));
+    }
+
+    private static Statement statement(String value)
+    {
+        return new Statement(value, ";");
+    }
+}
diff --git a/client/trino-client/pom.xml b/client/trino-client/pom.xml
index 1d7eaf411bc3..57a9ead14300 100644
--- a/client/trino-client/pom.xml
+++ b/client/trino-client/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-client</artifactId>
-    <name>trino-client</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,12 +17,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-            <version>1.7</version> <!-- JDK8 support dropped by version 1.8+ -->
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
@@ -45,8 +38,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -70,10 +63,27 @@
             <artifactId>failsafe</artifactId>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
+            <!-- JDK8 support dropped by version 1.8+ -->
+            <version>1.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -90,8 +100,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -101,6 +111,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
diff --git a/client/trino-client/src/main/java/io/trino/client/ClientCapabilities.java b/client/trino-client/src/main/java/io/trino/client/ClientCapabilities.java
index 809e2c43e581..ba55f3872ea4 100644
--- a/client/trino-client/src/main/java/io/trino/client/ClientCapabilities.java
+++ b/client/trino-client/src/main/java/io/trino/client/ClientCapabilities.java
@@ -23,5 +23,7 @@ public enum ClientCapabilities
     //   time(p) without time zone
     //   interval X(p1) to Y(p2)
     // When this capability is not set, the server returns datetime types with precision = 3
-    PARAMETRIC_DATETIME;
+    PARAMETRIC_DATETIME,
+    // Whether clients support the session authorization set/reset feature
+    SESSION_AUTHORIZATION;
 }
diff --git a/client/trino-client/src/main/java/io/trino/client/ClientSession.java b/client/trino-client/src/main/java/io/trino/client/ClientSession.java
index 8fd96c6c7e53..36f280cd15d8 100644
--- a/client/trino-client/src/main/java/io/trino/client/ClientSession.java
+++ b/client/trino-client/src/main/java/io/trino/client/ClientSession.java
@@ -36,12 +36,13 @@ public class ClientSession
     private final URI server;
     private final Optional<String> principal;
     private final Optional<String> user;
+    private final Optional<String> authorizationUser;
     private final String source;
     private final Optional<String> traceToken;
     private final Set<String> clientTags;
     private final String clientInfo;
-    private final String catalog;
-    private final String schema;
+    private final Optional<String> catalog;
+    private final Optional<String> schema;
     private final String path;
     private final ZoneId timeZone;
     private final Locale locale;
@@ -75,12 +76,13 @@ private ClientSession(
             URI server,
             Optional<String> principal,
             Optional<String> user,
+            Optional<String> authorizationUser,
             String source,
             Optional<String> traceToken,
             Set<String> clientTags,
             String clientInfo,
-            String catalog,
-            String schema,
+            Optional<String> catalog,
+            Optional<String> schema,
             String path,
             ZoneId timeZone,
             Locale locale,
@@ -96,6 +98,7 @@ private ClientSession(
         this.server = requireNonNull(server, "server is null");
         this.principal = requireNonNull(principal, "principal is null");
         this.user = requireNonNull(user, "user is null");
+        this.authorizationUser = requireNonNull(authorizationUser, "authorizationUser is null");
         this.source = source;
         this.traceToken = requireNonNull(traceToken, "traceToken is null");
         this.clientTags = ImmutableSet.copyOf(requireNonNull(clientTags, "clientTags is null"));
@@ -158,6 +161,11 @@ public Optional<String> getUser()
         return user;
     }
 
+    public Optional<String> getAuthorizationUser()
+    {
+        return authorizationUser;
+    }
+
     public String getSource()
     {
         return source;
@@ -178,12 +186,12 @@ public String getClientInfo()
         return clientInfo;
     }
 
-    public String getCatalog()
+    public Optional<String> getCatalog()
     {
         return catalog;
     }
 
-    public String getSchema()
+    public Optional<String> getSchema()
     {
         return schema;
     }
@@ -258,6 +266,7 @@ public String toString()
                 .add("server", server)
                 .add("principal", principal)
                 .add("user", user)
+                .add("authorizationUser", authorizationUser)
                 .add("clientTags", clientTags)
                 .add("clientInfo", clientInfo)
                 .add("catalog", catalog)
@@ -277,6 +286,7 @@ public static final class Builder
         private URI server;
         private Optional<String> principal = Optional.empty();
         private Optional<String> user = Optional.empty();
+        private Optional<String> authorizationUser = Optional.empty();
         private String source;
         private Optional<String> traceToken = Optional.empty();
         private Set<String> clientTags = ImmutableSet.of();
@@ -303,12 +313,13 @@ private Builder(ClientSession clientSession)
             server = clientSession.getServer();
             principal = clientSession.getPrincipal();
             user = clientSession.getUser();
+            authorizationUser = clientSession.getAuthorizationUser();
             source = clientSession.getSource();
             traceToken = clientSession.getTraceToken();
             clientTags = clientSession.getClientTags();
             clientInfo = clientSession.getClientInfo();
-            catalog = clientSession.getCatalog();
-            schema = clientSession.getSchema();
+            catalog = clientSession.getCatalog().orElse(null);
+            schema = clientSession.getSchema().orElse(null);
             path = clientSession.getPath();
             timeZone = clientSession.getTimeZone();
             locale = clientSession.getLocale();
@@ -334,6 +345,12 @@ public Builder user(Optional<String> user)
             return this;
         }
 
+        public Builder authorizationUser(Optional<String> authorizationUser)
+        {
+            this.authorizationUser = authorizationUser;
+            return this;
+        }
+
         public Builder principal(Optional<String> principal)
         {
             this.principal = principal;
@@ -448,12 +465,13 @@ public ClientSession build()
                     server,
                     principal,
                     user,
+                    authorizationUser,
                     source,
                     traceToken,
                     clientTags,
                     clientInfo,
-                    catalog,
-                    schema,
+                    Optional.ofNullable(catalog),
+                    Optional.ofNullable(schema),
                     path,
                     timeZone,
                     locale,
diff --git a/client/trino-client/src/main/java/io/trino/client/ClientTypeSignature.java b/client/trino-client/src/main/java/io/trino/client/ClientTypeSignature.java
index 36e7c992e0b2..b408006b9949 100644
--- a/client/trino-client/src/main/java/io/trino/client/ClientTypeSignature.java
+++ b/client/trino-client/src/main/java/io/trino/client/ClientTypeSignature.java
@@ -16,10 +16,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.client.ClientTypeSignatureParameter.ParameterKind;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
diff --git a/client/trino-client/src/main/java/io/trino/client/ClientTypeSignatureParameter.java b/client/trino-client/src/main/java/io/trino/client/ClientTypeSignatureParameter.java
index a180607a883f..a4c900d338c0 100644
--- a/client/trino-client/src/main/java/io/trino/client/ClientTypeSignatureParameter.java
+++ b/client/trino-client/src/main/java/io/trino/client/ClientTypeSignatureParameter.java
@@ -21,8 +21,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.io.IOException;
 import java.util.Objects;
diff --git a/client/trino-client/src/main/java/io/trino/client/Column.java b/client/trino-client/src/main/java/io/trino/client/Column.java
index e7fb2ca50dbb..2aabb8033cce 100644
--- a/client/trino-client/src/main/java/io/trino/client/Column.java
+++ b/client/trino-client/src/main/java/io/trino/client/Column.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/DnsResolver.java b/client/trino-client/src/main/java/io/trino/client/DnsResolver.java
similarity index 96%
rename from client/trino-jdbc/src/main/java/io/trino/jdbc/DnsResolver.java
rename to client/trino-client/src/main/java/io/trino/client/DnsResolver.java
index bc6a6114801b..0043590edd49 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/DnsResolver.java
+++ b/client/trino-client/src/main/java/io/trino/client/DnsResolver.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.jdbc;
+package io.trino.client;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/client/trino-client/src/main/java/io/trino/client/ErrorLocation.java b/client/trino-client/src/main/java/io/trino/client/ErrorLocation.java
index 5cf8c84f9b36..f8817091050a 100644
--- a/client/trino-client/src/main/java/io/trino/client/ErrorLocation.java
+++ b/client/trino-client/src/main/java/io/trino/client/ErrorLocation.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/client/trino-client/src/main/java/io/trino/client/FailureInfo.java b/client/trino-client/src/main/java/io/trino/client/FailureInfo.java
index 7db0642bad72..040a730e75fa 100644
--- a/client/trino-client/src/main/java/io/trino/client/FailureInfo.java
+++ b/client/trino-client/src/main/java/io/trino/client/FailureInfo.java
@@ -16,9 +16,8 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.regex.Matcher;
diff --git a/client/trino-client/src/main/java/io/trino/client/JsonCodec.java b/client/trino-client/src/main/java/io/trino/client/JsonCodec.java
index 2c684cdb11ea..5bde9542209c 100644
--- a/client/trino-client/src/main/java/io/trino/client/JsonCodec.java
+++ b/client/trino-client/src/main/java/io/trino/client/JsonCodec.java
@@ -13,12 +13,15 @@
  */
 package io.trino.client;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 
 import java.io.IOException;
@@ -33,18 +36,29 @@
 public class JsonCodec<T>
 {
     // copy of https://github.com/airlift/airlift/blob/master/json/src/main/java/io/airlift/json/ObjectMapperProvider.java
-    static final Supplier<ObjectMapper> OBJECT_MAPPER_SUPPLIER = () -> new ObjectMapper()
-            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-            .disable(MapperFeature.AUTO_DETECT_CREATORS)
-            .disable(MapperFeature.AUTO_DETECT_FIELDS)
-            .disable(MapperFeature.AUTO_DETECT_SETTERS)
-            .disable(MapperFeature.AUTO_DETECT_GETTERS)
-            .disable(MapperFeature.AUTO_DETECT_IS_GETTERS)
-            .disable(MapperFeature.USE_GETTERS_AS_SETTERS)
-            .disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)
-            .disable(MapperFeature.INFER_PROPERTY_MUTATORS)
-            .disable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
-            .registerModule(new Jdk8Module());
+    static final Supplier<ObjectMapper> OBJECT_MAPPER_SUPPLIER = () -> {
+        JsonFactory jsonFactory = JsonFactory.builder()
+                .streamReadConstraints(StreamReadConstraints.builder()
+                    .maxStringLength(Integer.MAX_VALUE)
+                    .maxNestingDepth(Integer.MAX_VALUE)
+                    .maxNumberLength(Integer.MAX_VALUE)
+                    .build())
+                .build();
+
+        return JsonMapper.builder(jsonFactory)
+                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                .disable(MapperFeature.AUTO_DETECT_CREATORS)
+                .disable(MapperFeature.AUTO_DETECT_FIELDS)
+                .disable(MapperFeature.AUTO_DETECT_SETTERS)
+                .disable(MapperFeature.AUTO_DETECT_GETTERS)
+                .disable(MapperFeature.AUTO_DETECT_IS_GETTERS)
+                .disable(MapperFeature.USE_GETTERS_AS_SETTERS)
+                .disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)
+                .disable(MapperFeature.INFER_PROPERTY_MUTATORS)
+                .disable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
+                .addModule(new Jdk8Module())
+                .build();
+    };
 
     public static <T> JsonCodec<T> jsonCodec(Class<T> type)
     {
@@ -84,7 +98,7 @@ public T fromJson(String json)
     }
 
     public T fromJson(InputStream inputStream)
-            throws IOException, JsonProcessingException
+            throws IOException
     {
         try (JsonParser parser = mapper.createParser(inputStream)) {
             T value = mapper.readerFor(javaType).readValue(parser);
diff --git a/client/trino-client/src/main/java/io/trino/client/JsonResponse.java b/client/trino-client/src/main/java/io/trino/client/JsonResponse.java
index c5f1aee3a3a3..d9cf6a84ed5c 100644
--- a/client/trino-client/src/main/java/io/trino/client/JsonResponse.java
+++ b/client/trino-client/src/main/java/io/trino/client/JsonResponse.java
@@ -14,15 +14,14 @@
 package io.trino.client;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.annotation.Nullable;
+import okhttp3.Call;
 import okhttp3.Headers;
 import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Optional;
@@ -109,7 +108,7 @@ public String toString()
                 .toString();
     }
 
-    public static <T> JsonResponse<T> execute(JsonCodec<T> codec, OkHttpClient client, Request request, OptionalLong materializedJsonSizeLimit)
+    public static <T> JsonResponse<T> execute(JsonCodec<T> codec, Call.Factory client, Request request, OptionalLong materializedJsonSizeLimit)
     {
         try (Response response = client.newCall(request).execute()) {
             ResponseBody responseBody = requireNonNull(response.body());
diff --git a/client/trino-client/src/main/java/io/trino/client/NodeVersion.java b/client/trino-client/src/main/java/io/trino/client/NodeVersion.java
index 2f5c7f5bb6c0..c9c9ea1591c9 100644
--- a/client/trino-client/src/main/java/io/trino/client/NodeVersion.java
+++ b/client/trino-client/src/main/java/io/trino/client/NodeVersion.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 
diff --git a/client/trino-client/src/main/java/io/trino/client/OkHttpUtil.java b/client/trino-client/src/main/java/io/trino/client/OkHttpUtil.java
index 67d213db0d13..7d9a2935f611 100644
--- a/client/trino-client/src/main/java/io/trino/client/OkHttpUtil.java
+++ b/client/trino-client/src/main/java/io/trino/client/OkHttpUtil.java
@@ -16,15 +16,17 @@
 import com.google.common.base.CharMatcher;
 import com.google.common.base.StandardSystemProperty;
 import com.google.common.net.HostAndPort;
-import io.trino.client.auth.kerberos.ContextBasedSubjectProvider;
-import io.trino.client.auth.kerberos.LoginBasedSubjectProvider;
+import io.trino.client.auth.kerberos.DelegatedConstrainedContextProvider;
+import io.trino.client.auth.kerberos.DelegatedUnconstrainedContextProvider;
+import io.trino.client.auth.kerberos.GSSContextProvider;
+import io.trino.client.auth.kerberos.LoginBasedUnconstrainedContextProvider;
 import io.trino.client.auth.kerberos.SpnegoHandler;
-import io.trino.client.auth.kerberos.SubjectProvider;
 import okhttp3.Credentials;
 import okhttp3.Interceptor;
 import okhttp3.JavaNetCookieJar;
 import okhttp3.OkHttpClient;
 import okhttp3.internal.tls.LegacyHostnameVerifier;
+import org.ietf.jgss.GSSCredential;
 
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
@@ -315,17 +317,30 @@ public static void setupKerberos(
             Optional<File> kerberosConfig,
             Optional<File> keytab,
             Optional<File> credentialCache,
-            boolean delegatedKerberos)
+            boolean delegatedKerberos,
+            Optional<GSSCredential> gssCredential)
     {
-        SubjectProvider subjectProvider;
+        GSSContextProvider contextProvider;
         if (delegatedKerberos) {
-            subjectProvider = new ContextBasedSubjectProvider();
+            contextProvider = getDelegatedGSSContextProvider(gssCredential);
         }
         else {
-            subjectProvider = new LoginBasedSubjectProvider(principal, kerberosConfig, keytab, credentialCache);
+            contextProvider = new LoginBasedUnconstrainedContextProvider(principal, kerberosConfig, keytab, credentialCache);
         }
-        SpnegoHandler handler = new SpnegoHandler(servicePrincipalPattern, remoteServiceName, useCanonicalHostname, subjectProvider);
+        SpnegoHandler handler = new SpnegoHandler(servicePrincipalPattern, remoteServiceName, useCanonicalHostname, contextProvider);
         clientBuilder.addInterceptor(handler);
         clientBuilder.authenticator(handler);
     }
+
+    public static void setupAlternateHostnameVerification(OkHttpClient.Builder clientBuilder, String alternativeHostname)
+    {
+        clientBuilder.hostnameVerifier((hostname, session) -> LegacyHostnameVerifier.INSTANCE.verify(alternativeHostname, session));
+    }
+
+    private static GSSContextProvider getDelegatedGSSContextProvider(Optional<GSSCredential> gssCredential)
+    {
+        return gssCredential.map(DelegatedConstrainedContextProvider::new)
+                .map(gssCred -> (GSSContextProvider) gssCred)
+                .orElse(new DelegatedUnconstrainedContextProvider());
+    }
 }
diff --git a/client/trino-client/src/main/java/io/trino/client/ProtocolHeaders.java b/client/trino-client/src/main/java/io/trino/client/ProtocolHeaders.java
index 418b4bb2041e..e09555d84755 100644
--- a/client/trino-client/src/main/java/io/trino/client/ProtocolHeaders.java
+++ b/client/trino-client/src/main/java/io/trino/client/ProtocolHeaders.java
@@ -25,7 +25,36 @@ public final class ProtocolHeaders
     public static final ProtocolHeaders TRINO_HEADERS = new ProtocolHeaders("Trino");
 
     private final String name;
-    private final String prefix;
+    private final String requestUser;
+    private final String requestOriginalUser;
+    private final String requestSource;
+    private final String requestCatalog;
+    private final String requestSchema;
+    private final String requestPath;
+    private final String requestTimeZone;
+    private final String requestLanguage;
+    private final String requestTraceToken;
+    private final String requestSession;
+    private final String requestRole;
+    private final String requestPreparedStatement;
+    private final String requestTransactionId;
+    private final String requestClientInfo;
+    private final String requestClientTags;
+    private final String requestClientCapabilities;
+    private final String requestResourceEstimate;
+    private final String requestExtraCredential;
+    private final String responseSetCatalog;
+    private final String responseSetSchema;
+    private final String responseSetPath;
+    private final String responseSetSession;
+    private final String responseClearSession;
+    private final String responseSetRole;
+    private final String responseAddedPrepare;
+    private final String responseDeallocatedPrepare;
+    private final String responseStartedTransactionId;
+    private final String responseClearTransactionId;
+    private final String responseSetAuthorizationUser;
+    private final String responseResetAuthorizationUser;
 
     public static ProtocolHeaders createProtocolHeaders(String name)
     {
@@ -41,7 +70,37 @@ private ProtocolHeaders(String name)
         requireNonNull(name, "name is null");
         checkArgument(!name.isEmpty(), "name is empty");
         this.name = name;
-        this.prefix = "X-" + name + "-";
+        String prefix = "X-" + name + "-";
+        requestUser = prefix + "User";
+        requestOriginalUser = prefix + "Original-User";
+        requestSource = prefix + "Source";
+        requestCatalog = prefix + "Catalog";
+        requestSchema = prefix + "Schema";
+        requestPath = prefix + "Path";
+        requestTimeZone = prefix + "Time-Zone";
+        requestLanguage = prefix + "Language";
+        requestTraceToken = prefix + "Trace-Token";
+        requestSession = prefix + "Session";
+        requestRole = prefix + "Role";
+        requestPreparedStatement = prefix + "Prepared-Statement";
+        requestTransactionId = prefix + "Transaction-Id";
+        requestClientInfo = prefix + "Client-Info";
+        requestClientTags = prefix + "Client-Tags";
+        requestClientCapabilities = prefix + "Client-Capabilities";
+        requestResourceEstimate = prefix + "Resource-Estimate";
+        requestExtraCredential = prefix + "Extra-Credential";
+        responseSetCatalog = prefix + "Set-Catalog";
+        responseSetSchema = prefix + "Set-Schema";
+        responseSetPath = prefix + "Set-Path";
+        responseSetSession = prefix + "Set-Session";
+        responseClearSession = prefix + "Clear-Session";
+        responseSetRole = prefix + "Set-Role";
+        responseAddedPrepare = prefix + "Added-Prepare";
+        responseDeallocatedPrepare = prefix + "Deallocated-Prepare";
+        responseStartedTransactionId = prefix + "Started-Transaction-Id";
+        responseClearTransactionId = prefix + "Clear-Transaction-Id";
+        responseSetAuthorizationUser = prefix + "Set-Authorization-User";
+        responseResetAuthorizationUser = prefix + "Reset-Authorization-User";
     }
 
     public String getProtocolName()
@@ -51,137 +110,152 @@ public String getProtocolName()
 
     public String requestUser()
     {
-        return prefix + "User";
+        return requestUser;
+    }
+
+    public String requestOriginalUser()
+    {
+        return requestOriginalUser;
     }
 
     public String requestSource()
     {
-        return prefix + "Source";
+        return requestSource;
     }
 
     public String requestCatalog()
     {
-        return prefix + "Catalog";
+        return requestCatalog;
     }
 
     public String requestSchema()
     {
-        return prefix + "Schema";
+        return requestSchema;
     }
 
     public String requestPath()
     {
-        return prefix + "Path";
+        return requestPath;
     }
 
     public String requestTimeZone()
     {
-        return prefix + "Time-Zone";
+        return requestTimeZone;
     }
 
     public String requestLanguage()
     {
-        return prefix + "Language";
+        return requestLanguage;
     }
 
     public String requestTraceToken()
     {
-        return prefix + "Trace-Token";
+        return requestTraceToken;
     }
 
     public String requestSession()
     {
-        return prefix + "Session";
+        return requestSession;
     }
 
     public String requestRole()
     {
-        return prefix + "Role";
+        return requestRole;
     }
 
     public String requestPreparedStatement()
     {
-        return prefix + "Prepared-Statement";
+        return requestPreparedStatement;
     }
 
     public String requestTransactionId()
     {
-        return prefix + "Transaction-Id";
+        return requestTransactionId;
     }
 
     public String requestClientInfo()
     {
-        return prefix + "Client-Info";
+        return requestClientInfo;
     }
 
     public String requestClientTags()
     {
-        return prefix + "Client-Tags";
+        return requestClientTags;
     }
 
     public String requestClientCapabilities()
     {
-        return prefix + "Client-Capabilities";
+        return requestClientCapabilities;
     }
 
     public String requestResourceEstimate()
     {
-        return prefix + "Resource-Estimate";
+        return requestResourceEstimate;
     }
 
     public String requestExtraCredential()
     {
-        return prefix + "Extra-Credential";
+        return requestExtraCredential;
     }
 
     public String responseSetCatalog()
     {
-        return prefix + "Set-Catalog";
+        return responseSetCatalog;
     }
 
     public String responseSetSchema()
     {
-        return prefix + "Set-Schema";
+        return responseSetSchema;
     }
 
     public String responseSetPath()
     {
-        return prefix + "Set-Path";
+        return responseSetPath;
     }
 
     public String responseSetSession()
     {
-        return prefix + "Set-Session";
+        return responseSetSession;
     }
 
     public String responseClearSession()
     {
-        return prefix + "Clear-Session";
+        return responseClearSession;
     }
 
     public String responseSetRole()
     {
-        return prefix + "Set-Role";
+        return responseSetRole;
     }
 
     public String responseAddedPrepare()
     {
-        return prefix + "Added-Prepare";
+        return responseAddedPrepare;
     }
 
     public String responseDeallocatedPrepare()
     {
-        return prefix + "Deallocated-Prepare";
+        return responseDeallocatedPrepare;
     }
 
     public String responseStartedTransactionId()
     {
-        return prefix + "Started-Transaction-Id";
+        return responseStartedTransactionId;
     }
 
     public String responseClearTransactionId()
     {
-        return prefix + "Clear-Transaction-Id";
+        return responseClearTransactionId;
+    }
+
+    public String responseSetAuthorizationUser()
+    {
+        return responseSetAuthorizationUser;
+    }
+
+    public String responseResetAuthorizationUser()
+    {
+        return responseResetAuthorizationUser;
     }
 
     public static ProtocolHeaders detectProtocol(Optional<String> alternateHeaderName, Set<String> headerNames)
diff --git a/client/trino-client/src/main/java/io/trino/client/QueryError.java b/client/trino-client/src/main/java/io/trino/client/QueryError.java
index 8947d168672d..8efeacabb1fe 100644
--- a/client/trino-client/src/main/java/io/trino/client/QueryError.java
+++ b/client/trino-client/src/main/java/io/trino/client/QueryError.java
@@ -15,9 +15,8 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
+import jakarta.annotation.Nullable;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 
diff --git a/client/trino-client/src/main/java/io/trino/client/QueryResults.java b/client/trino-client/src/main/java/io/trino/client/QueryResults.java
index faedf1b4fdf1..741d20b710fd 100644
--- a/client/trino-client/src/main/java/io/trino/client/QueryResults.java
+++ b/client/trino-client/src/main/java/io/trino/client/QueryResults.java
@@ -16,9 +16,8 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.net.URI;
 import java.util.List;
diff --git a/client/trino-client/src/main/java/io/trino/client/Row.java b/client/trino-client/src/main/java/io/trino/client/Row.java
index df6ffbfe5392..913c8d9eddb5 100644
--- a/client/trino-client/src/main/java/io/trino/client/Row.java
+++ b/client/trino-client/src/main/java/io/trino/client/Row.java
@@ -14,8 +14,7 @@
 package io.trino.client;
 
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/client/trino-client/src/main/java/io/trino/client/RowField.java b/client/trino-client/src/main/java/io/trino/client/RowField.java
index 420b5a86c48e..547c99258218 100644
--- a/client/trino-client/src/main/java/io/trino/client/RowField.java
+++ b/client/trino-client/src/main/java/io/trino/client/RowField.java
@@ -13,7 +13,7 @@
  */
 package io.trino.client;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/client/trino-client/src/main/java/io/trino/client/ServerInfo.java b/client/trino-client/src/main/java/io/trino/client/ServerInfo.java
index cad74dbfa9cd..5e5229dacb4f 100644
--- a/client/trino-client/src/main/java/io/trino/client/ServerInfo.java
+++ b/client/trino-client/src/main/java/io/trino/client/ServerInfo.java
@@ -15,10 +15,9 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.Immutable;
 import io.airlift.units.Duration;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Objects;
 import java.util.Optional;
 
diff --git a/client/trino-client/src/main/java/io/trino/client/StageStats.java b/client/trino-client/src/main/java/io/trino/client/StageStats.java
index d18b8d8846b9..8305c127b392 100644
--- a/client/trino-client/src/main/java/io/trino/client/StageStats.java
+++ b/client/trino-client/src/main/java/io/trino/client/StageStats.java
@@ -16,8 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.List;
 
diff --git a/client/trino-client/src/main/java/io/trino/client/StatementClient.java b/client/trino-client/src/main/java/io/trino/client/StatementClient.java
index 79fd84a61177..841c1b296f5b 100644
--- a/client/trino-client/src/main/java/io/trino/client/StatementClient.java
+++ b/client/trino-client/src/main/java/io/trino/client/StatementClient.java
@@ -13,7 +13,7 @@
  */
 package io.trino.client;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.Closeable;
 import java.time.ZoneId;
@@ -50,6 +50,10 @@ public interface StatementClient
 
     Optional<String> getSetPath();
 
+    Optional<String> getSetAuthorizationUser();
+
+    boolean isResetAuthorizationUser();
+
     Map<String, String> getSetSessionProperties();
 
     Set<String> getResetSessionProperties();
diff --git a/client/trino-client/src/main/java/io/trino/client/StatementClientFactory.java b/client/trino-client/src/main/java/io/trino/client/StatementClientFactory.java
index 6e5004994c95..cde74b30fa8c 100644
--- a/client/trino-client/src/main/java/io/trino/client/StatementClientFactory.java
+++ b/client/trino-client/src/main/java/io/trino/client/StatementClientFactory.java
@@ -13,6 +13,7 @@
  */
 package io.trino.client;
 
+import okhttp3.Call;
 import okhttp3.OkHttpClient;
 
 import java.util.Optional;
@@ -22,13 +23,13 @@ public final class StatementClientFactory
 {
     private StatementClientFactory() {}
 
-    public static StatementClient newStatementClient(OkHttpClient httpClient, ClientSession session, String query)
+    public static StatementClient newStatementClient(Call.Factory httpCallFactory, ClientSession session, String query)
     {
-        return new StatementClientV1(httpClient, session, query, Optional.empty());
+        return new StatementClientV1(httpCallFactory, session, query, Optional.empty());
     }
 
     public static StatementClient newStatementClient(OkHttpClient httpClient, ClientSession session, String query, Optional<Set<String>> clientCapabilities)
     {
-        return new StatementClientV1(httpClient, session, query, clientCapabilities);
+        return new StatementClientV1((Call.Factory) httpClient, session, query, clientCapabilities);
     }
 }
diff --git a/client/trino-client/src/main/java/io/trino/client/StatementClientV1.java b/client/trino-client/src/main/java/io/trino/client/StatementClientV1.java
index 6532c6610c8a..cc57d9da62c7 100644
--- a/client/trino-client/src/main/java/io/trino/client/StatementClientV1.java
+++ b/client/trino-client/src/main/java/io/trino/client/StatementClientV1.java
@@ -18,19 +18,21 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.units.Duration;
+import jakarta.annotation.Nullable;
+import okhttp3.Call;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
 import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.io.IOException;
+import java.io.InterruptedIOException;
 import java.io.UnsupportedEncodingException;
+import java.net.ProtocolException;
+import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -48,6 +50,7 @@
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Throwables.getCausalChain;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.net.HttpHeaders.ACCEPT_ENCODING;
 import static com.google.common.net.HttpHeaders.USER_AGENT;
@@ -74,12 +77,14 @@ class StatementClientV1
             firstNonNull(StatementClientV1.class.getPackage().getImplementationVersion(), "unknown");
     private static final long MAX_MATERIALIZED_JSON_RESPONSE_SIZE = 128 * 1024;
 
-    private final OkHttpClient httpClient;
+    private final Call.Factory httpCallFactory;
     private final String query;
     private final AtomicReference<QueryResults> currentResults = new AtomicReference<>();
     private final AtomicReference<String> setCatalog = new AtomicReference<>();
     private final AtomicReference<String> setSchema = new AtomicReference<>();
     private final AtomicReference<String> setPath = new AtomicReference<>();
+    private final AtomicReference<String> setAuthorizationUser = new AtomicReference<>();
+    private final AtomicBoolean resetAuthorizationUser = new AtomicBoolean();
     private final Map<String, String> setSessionProperties = new ConcurrentHashMap<>();
     private final Set<String> resetSessionProperties = Sets.newConcurrentHashSet();
     private final Map<String, ClientSelectedRole> setRoles = new ConcurrentHashMap<>();
@@ -90,22 +95,27 @@ class StatementClientV1
     private final ZoneId timeZone;
     private final Duration requestTimeoutNanos;
     private final Optional<String> user;
+    private final Optional<String> originalUser;
     private final String clientCapabilities;
     private final boolean compressionDisabled;
 
     private final AtomicReference<State> state = new AtomicReference<>(State.RUNNING);
 
-    public StatementClientV1(OkHttpClient httpClient, ClientSession session, String query, Optional<Set<String>> clientCapabilities)
+    public StatementClientV1(Call.Factory httpCallFactory, ClientSession session, String query, Optional<Set<String>> clientCapabilities)
     {
-        requireNonNull(httpClient, "httpClient is null");
+        requireNonNull(httpCallFactory, "httpCallFactory is null");
         requireNonNull(session, "session is null");
         requireNonNull(query, "query is null");
 
-        this.httpClient = httpClient;
+        this.httpCallFactory = httpCallFactory;
         this.timeZone = session.getTimeZone();
         this.query = query;
         this.requestTimeoutNanos = session.getClientRequestTimeout();
-        this.user = Stream.of(session.getUser(), session.getPrincipal())
+        this.user = Stream.of(session.getAuthorizationUser(), session.getUser(), session.getPrincipal())
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .findFirst();
+        this.originalUser = Stream.of(session.getUser(), session.getPrincipal())
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .findFirst();
@@ -117,7 +127,7 @@ public StatementClientV1(OkHttpClient httpClient, ClientSession session, String
         Request request = buildQueryRequest(session, query);
 
         // Always materialize the first response to avoid losing the response body if the initial response parsing fails
-        JsonResponse<QueryResults> response = JsonResponse.execute(QUERY_RESULTS_CODEC, httpClient, request, OptionalLong.empty());
+        JsonResponse<QueryResults> response = JsonResponse.execute(QUERY_RESULTS_CODEC, httpCallFactory, request, OptionalLong.empty());
         if ((response.getStatusCode() != HTTP_OK) || !response.hasValue()) {
             state.compareAndSet(State.RUNNING, State.CLIENT_ERROR);
             throw requestFailedException("starting query", request, response);
@@ -149,12 +159,8 @@ private Request buildQueryRequest(ClientSession session, String query)
         if (session.getClientInfo() != null) {
             builder.addHeader(TRINO_HEADERS.requestClientInfo(), session.getClientInfo());
         }
-        if (session.getCatalog() != null) {
-            builder.addHeader(TRINO_HEADERS.requestCatalog(), session.getCatalog());
-        }
-        if (session.getSchema() != null) {
-            builder.addHeader(TRINO_HEADERS.requestSchema(), session.getSchema());
-        }
+        session.getCatalog().ifPresent(value -> builder.addHeader(TRINO_HEADERS.requestCatalog(), value));
+        session.getSchema().ifPresent(value -> builder.addHeader(TRINO_HEADERS.requestSchema(), value));
         if (session.getPath() != null) {
             builder.addHeader(TRINO_HEADERS.requestPath(), session.getPath());
         }
@@ -275,6 +281,18 @@ public Optional<String> getSetPath()
         return Optional.ofNullable(setPath.get());
     }
 
+    @Override
+    public Optional<String> getSetAuthorizationUser()
+    {
+        return Optional.ofNullable(setAuthorizationUser.get());
+    }
+
+    @Override
+    public boolean isResetAuthorizationUser()
+    {
+        return resetAuthorizationUser.get();
+    }
+
     @Override
     public Map<String, String> getSetSessionProperties()
     {
@@ -324,6 +342,7 @@ private Request.Builder prepareRequest(HttpUrl url)
                 .addHeader(USER_AGENT, USER_AGENT_VALUE)
                 .url(url);
         user.ifPresent(requestUser -> builder.addHeader(TRINO_HEADERS.requestUser(), requestUser));
+        originalUser.ifPresent(originalUser -> builder.addHeader(TRINO_HEADERS.requestOriginalUser(), originalUser));
         if (compressionDisabled) {
             builder.header(ACCEPT_ENCODING, "identity");
         }
@@ -379,12 +398,16 @@ public boolean advance()
 
             JsonResponse<QueryResults> response;
             try {
-                response = JsonResponse.execute(QUERY_RESULTS_CODEC, httpClient, request, OptionalLong.of(MAX_MATERIALIZED_JSON_RESPONSE_SIZE));
+                response = JsonResponse.execute(QUERY_RESULTS_CODEC, httpCallFactory, request, OptionalLong.of(MAX_MATERIALIZED_JSON_RESPONSE_SIZE));
             }
             catch (RuntimeException e) {
                 cause = e;
                 continue;
             }
+            if (isTransient(response.getException())) {
+                cause = response.getException();
+                continue;
+            }
 
             if ((response.getStatusCode() == HTTP_OK) && response.hasValue()) {
                 processResponse(response.getHeaders(), response.getValue());
@@ -398,12 +421,30 @@ public boolean advance()
         }
     }
 
+    private boolean isTransient(Throwable exception)
+    {
+        return exception != null && getCausalChain(exception).stream()
+                .anyMatch(e -> (e instanceof InterruptedIOException && e.getMessage().equals("timeout")
+                        || e instanceof ProtocolException
+                        || e instanceof SocketTimeoutException));
+    }
+
     private void processResponse(Headers headers, QueryResults results)
     {
         setCatalog.set(headers.get(TRINO_HEADERS.responseSetCatalog()));
         setSchema.set(headers.get(TRINO_HEADERS.responseSetSchema()));
         setPath.set(headers.get(TRINO_HEADERS.responseSetPath()));
 
+        String setAuthorizationUser = headers.get(TRINO_HEADERS.responseSetAuthorizationUser());
+        if (setAuthorizationUser != null) {
+            this.setAuthorizationUser.set(setAuthorizationUser);
+        }
+
+        String resetAuthorizationUser = headers.get(TRINO_HEADERS.responseResetAuthorizationUser());
+        if (resetAuthorizationUser != null) {
+            this.resetAuthorizationUser.set(Boolean.parseBoolean(resetAuthorizationUser));
+        }
+
         for (String setSession : headers.values(TRINO_HEADERS.responseSetSession())) {
             List<String> keyValue = COLLECTION_HEADER_SPLITTER.splitToList(setSession);
             if (keyValue.size() != 2) {
@@ -488,7 +529,7 @@ private void httpDelete(URI uri)
                 .delete()
                 .build();
         try {
-            httpClient.newCall(request)
+            httpCallFactory.newCall(request)
                     .execute()
                     .close();
         }
diff --git a/client/trino-client/src/main/java/io/trino/client/StatementStats.java b/client/trino-client/src/main/java/io/trino/client/StatementStats.java
index 93e02af9ddf9..b0d3e94ef929 100644
--- a/client/trino-client/src/main/java/io/trino/client/StatementStats.java
+++ b/client/trino-client/src/main/java/io/trino/client/StatementStats.java
@@ -15,14 +15,12 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.util.OptionalDouble;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
-import static java.lang.Math.min;
 import static java.util.Objects.requireNonNull;
 
 @Immutable
@@ -31,6 +29,8 @@ public class StatementStats
     private final String state;
     private final boolean queued;
     private final boolean scheduled;
+    private final OptionalDouble progressPercentage;
+    private final OptionalDouble runningPercentage;
     private final int nodes;
     private final int totalSplits;
     private final int queuedSplits;
@@ -43,6 +43,7 @@ public class StatementStats
     private final long processedRows;
     private final long processedBytes;
     private final long physicalInputBytes;
+    private final long physicalWrittenBytes;
     private final long peakMemoryBytes;
     private final long spilledBytes;
     private final StageStats rootStage;
@@ -52,6 +53,8 @@ public StatementStats(
             @JsonProperty("state") String state,
             @JsonProperty("queued") boolean queued,
             @JsonProperty("scheduled") boolean scheduled,
+            @JsonProperty("progressPercentage") OptionalDouble progressPercentage,
+            @JsonProperty("runningPercentage") OptionalDouble runningPercentage,
             @JsonProperty("nodes") int nodes,
             @JsonProperty("totalSplits") int totalSplits,
             @JsonProperty("queuedSplits") int queuedSplits,
@@ -64,6 +67,7 @@ public StatementStats(
             @JsonProperty("processedRows") long processedRows,
             @JsonProperty("processedBytes") long processedBytes,
             @JsonProperty("physicalInputBytes") long physicalInputBytes,
+            @JsonProperty("physicalWrittenBytes") long physicalWrittenBytes,
             @JsonProperty("peakMemoryBytes") long peakMemoryBytes,
             @JsonProperty("spilledBytes") long spilledBytes,
             @JsonProperty("rootStage") StageStats rootStage)
@@ -71,6 +75,8 @@ public StatementStats(
         this.state = requireNonNull(state, "state is null");
         this.queued = queued;
         this.scheduled = scheduled;
+        this.progressPercentage = requireNonNull(progressPercentage, "progressPercentage is null");
+        this.runningPercentage = requireNonNull(runningPercentage, "runningPercentage is null");
         this.nodes = nodes;
         this.totalSplits = totalSplits;
         this.queuedSplits = queuedSplits;
@@ -83,6 +89,7 @@ public StatementStats(
         this.processedRows = processedRows;
         this.processedBytes = processedBytes;
         this.physicalInputBytes = physicalInputBytes;
+        this.physicalWrittenBytes = physicalWrittenBytes;
         this.peakMemoryBytes = peakMemoryBytes;
         this.spilledBytes = spilledBytes;
         this.rootStage = rootStage;
@@ -106,6 +113,18 @@ public boolean isScheduled()
         return scheduled;
     }
 
+    @JsonProperty
+    public OptionalDouble getProgressPercentage()
+    {
+        return progressPercentage;
+    }
+
+    @JsonProperty
+    public OptionalDouble getRunningPercentage()
+    {
+        return runningPercentage;
+    }
+
     @JsonProperty
     public int getNodes()
     {
@@ -178,6 +197,12 @@ public long getPhysicalInputBytes()
         return physicalInputBytes;
     }
 
+    @JsonProperty
+    public long getPhysicalWrittenBytes()
+    {
+        return physicalWrittenBytes;
+    }
+
     @JsonProperty
     public long getPeakMemoryBytes()
     {
@@ -191,15 +216,6 @@ public StageStats getRootStage()
         return rootStage;
     }
 
-    @JsonProperty
-    public OptionalDouble getProgressPercentage()
-    {
-        if (!scheduled || totalSplits == 0) {
-            return OptionalDouble.empty();
-        }
-        return OptionalDouble.of(min(100, (completedSplits * 100.0) / totalSplits));
-    }
-
     @JsonProperty
     public long getSpilledBytes()
     {
@@ -213,6 +229,8 @@ public String toString()
                 .add("state", state)
                 .add("queued", queued)
                 .add("scheduled", scheduled)
+                .add("progressPercentage", progressPercentage)
+                .add("runningPercentage", runningPercentage)
                 .add("nodes", nodes)
                 .add("totalSplits", totalSplits)
                 .add("queuedSplits", queuedSplits)
@@ -225,6 +243,7 @@ public String toString()
                 .add("processedRows", processedRows)
                 .add("processedBytes", processedBytes)
                 .add("physicalInputBytes", physicalInputBytes)
+                .add("physicalWrittenBytes", physicalWrittenBytes)
                 .add("peakMemoryBytes", peakMemoryBytes)
                 .add("spilledBytes", spilledBytes)
                 .add("rootStage", rootStage)
@@ -241,6 +260,8 @@ public static class Builder
         private String state;
         private boolean queued;
         private boolean scheduled;
+        private OptionalDouble progressPercentage;
+        private OptionalDouble runningPercentage;
         private int nodes;
         private int totalSplits;
         private int queuedSplits;
@@ -253,6 +274,7 @@ public static class Builder
         private long processedRows;
         private long processedBytes;
         private long physicalInputBytes;
+        private long physicalWrittenBytes;
         private long peakMemoryBytes;
         private long spilledBytes;
         private StageStats rootStage;
@@ -283,6 +305,18 @@ public Builder setScheduled(boolean scheduled)
             return this;
         }
 
+        public Builder setProgressPercentage(OptionalDouble progressPercentage)
+        {
+            this.progressPercentage = progressPercentage;
+            return this;
+        }
+
+        public Builder setRunningPercentage(OptionalDouble runningPercentage)
+        {
+            this.runningPercentage = runningPercentage;
+            return this;
+        }
+
         public Builder setTotalSplits(int totalSplits)
         {
             this.totalSplits = totalSplits;
@@ -349,6 +383,12 @@ public Builder setPhysicalInputBytes(long physicalInputBytes)
             return this;
         }
 
+        public Builder setPhysicalWrittenBytes(long physicalWrittenBytes)
+        {
+            this.physicalWrittenBytes = physicalWrittenBytes;
+            return this;
+        }
+
         public Builder setPeakMemoryBytes(long peakMemoryBytes)
         {
             this.peakMemoryBytes = peakMemoryBytes;
@@ -373,6 +413,8 @@ public StatementStats build()
                     state,
                     queued,
                     scheduled,
+                    progressPercentage,
+                    runningPercentage,
                     nodes,
                     totalSplits,
                     queuedSplits,
@@ -385,6 +427,7 @@ public StatementStats build()
                     processedRows,
                     processedBytes,
                     physicalInputBytes,
+                    physicalWrittenBytes,
                     peakMemoryBytes,
                     spilledBytes,
                     rootStage);
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/external/CompositeRedirectHandler.java b/client/trino-client/src/main/java/io/trino/client/auth/external/CompositeRedirectHandler.java
index 7725b2e0eff0..fe1112cf855c 100644
--- a/client/trino-client/src/main/java/io/trino/client/auth/external/CompositeRedirectHandler.java
+++ b/client/trino-client/src/main/java/io/trino/client/auth/external/CompositeRedirectHandler.java
@@ -34,7 +34,8 @@ public CompositeRedirectHandler(List<ExternalRedirectStrategy> strategies)
     }
 
     @Override
-    public void redirectTo(URI uri) throws RedirectException
+    public void redirectTo(URI uri)
+            throws RedirectException
     {
         RedirectException redirectException = new RedirectException("Could not redirect to " + uri);
         for (RedirectHandler handler : handlers) {
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/external/ExternalAuthenticator.java b/client/trino-client/src/main/java/io/trino/client/auth/external/ExternalAuthenticator.java
index e91ff6572dcd..d97a324ac964 100644
--- a/client/trino-client/src/main/java/io/trino/client/auth/external/ExternalAuthenticator.java
+++ b/client/trino-client/src/main/java/io/trino/client/auth/external/ExternalAuthenticator.java
@@ -15,6 +15,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import io.trino.client.ClientException;
+import jakarta.annotation.Nullable;
 import okhttp3.Authenticator;
 import okhttp3.Challenge;
 import okhttp3.Interceptor;
@@ -22,8 +23,6 @@
 import okhttp3.Response;
 import okhttp3.Route;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/external/LocalKnownToken.java b/client/trino-client/src/main/java/io/trino/client/auth/external/LocalKnownToken.java
index 40b984a0764b..b31e573924ac 100644
--- a/client/trino-client/src/main/java/io/trino/client/auth/external/LocalKnownToken.java
+++ b/client/trino-client/src/main/java/io/trino/client/auth/external/LocalKnownToken.java
@@ -13,8 +13,6 @@
  */
 package io.trino.client.auth.external;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.Optional;
 import java.util.function.Supplier;
 
@@ -24,7 +22,7 @@
  * LocalKnownToken class keeps the token on its field
  * and it's designed to use it in fully serialized manner.
  */
-@NotThreadSafe
+// This class is not considered thread-safe.
 class LocalKnownToken
         implements KnownToken
 {
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/external/MemoryCachedKnownToken.java b/client/trino-client/src/main/java/io/trino/client/auth/external/MemoryCachedKnownToken.java
index e8513e4bd87f..1d429d8465a6 100644
--- a/client/trino-client/src/main/java/io/trino/client/auth/external/MemoryCachedKnownToken.java
+++ b/client/trino-client/src/main/java/io/trino/client/auth/external/MemoryCachedKnownToken.java
@@ -13,7 +13,7 @@
  */
 package io.trino.client.auth.external;
 
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
 
 import java.util.Optional;
 import java.util.concurrent.locks.Lock;
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/external/SystemOutPrintRedirectHandler.java b/client/trino-client/src/main/java/io/trino/client/auth/external/SystemOutPrintRedirectHandler.java
index 5452264a3ccd..90355b628c9f 100644
--- a/client/trino-client/src/main/java/io/trino/client/auth/external/SystemOutPrintRedirectHandler.java
+++ b/client/trino-client/src/main/java/io/trino/client/auth/external/SystemOutPrintRedirectHandler.java
@@ -19,7 +19,8 @@ public class SystemOutPrintRedirectHandler
         implements RedirectHandler
 {
     @Override
-    public void redirectTo(URI uri) throws RedirectException
+    public void redirectTo(URI uri)
+            throws RedirectException
     {
         System.out.println("External authentication required. Please go to:");
         System.out.println(uri.toString());
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/AbstractUnconstrainedContextProvider.java b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/AbstractUnconstrainedContextProvider.java
new file mode 100644
index 000000000000..4d3f3320cc3f
--- /dev/null
+++ b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/AbstractUnconstrainedContextProvider.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed 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 io.trino.client.auth.kerberos;
+
+import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSException;
+
+import javax.security.auth.Subject;
+
+import java.security.Principal;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+import static com.google.common.base.Throwables.throwIfInstanceOf;
+import static com.google.common.base.Throwables.throwIfUnchecked;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.ietf.jgss.GSSCredential.DEFAULT_LIFETIME;
+import static org.ietf.jgss.GSSCredential.INITIATE_ONLY;
+import static org.ietf.jgss.GSSName.NT_USER_NAME;
+
+public abstract class AbstractUnconstrainedContextProvider
+        extends BaseGSSContextProvider
+{
+    private GSSCredential clientCredential;
+
+    @Override
+    public GSSContext getContext(String servicePrincipal)
+            throws GSSException
+    {
+        if ((clientCredential == null) || clientCredential.getRemainingLifetime() < MIN_CREDENTIAL_LIFETIME.getValue(SECONDS)) {
+            clientCredential = createGssCredential();
+        }
+
+        return doAs(getSubject(), () -> createContext(servicePrincipal, clientCredential));
+    }
+
+    private GSSCredential createGssCredential()
+            throws GSSException
+    {
+        refresh();
+        Subject subject = getSubject();
+        Principal clientPrincipal = subject.getPrincipals().iterator().next();
+        return doAs(subject, () -> GSS_MANAGER.createCredential(
+                GSS_MANAGER.createName(clientPrincipal.getName(), NT_USER_NAME),
+                DEFAULT_LIFETIME,
+                KERBEROS_OID,
+                INITIATE_ONLY));
+    }
+
+    public abstract void refresh()
+            throws GSSException;
+
+    protected abstract Subject getSubject();
+
+    interface GssSupplier<T>
+    {
+        T get()
+                throws GSSException;
+    }
+
+    static <T> T doAs(Subject subject, GssSupplier<T> action)
+            throws GSSException
+    {
+        try {
+            return Subject.doAs(subject, (PrivilegedExceptionAction<T>) action::get);
+        }
+        catch (PrivilegedActionException e) {
+            Throwable t = e.getCause();
+            throwIfInstanceOf(t, GSSException.class);
+            throwIfUnchecked(t);
+            throw new RuntimeException(t);
+        }
+    }
+}
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/BaseGSSContextProvider.java b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/BaseGSSContextProvider.java
new file mode 100644
index 000000000000..67ad182eac3e
--- /dev/null
+++ b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/BaseGSSContextProvider.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed 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 io.trino.client.auth.kerberos;
+
+import io.airlift.units.Duration;
+import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSException;
+import org.ietf.jgss.GSSManager;
+import org.ietf.jgss.Oid;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.ietf.jgss.GSSContext.INDEFINITE_LIFETIME;
+import static org.ietf.jgss.GSSName.NT_HOSTBASED_SERVICE;
+
+public abstract class BaseGSSContextProvider
+        implements GSSContextProvider
+{
+    protected static final GSSManager GSS_MANAGER = GSSManager.getInstance();
+    protected static final Oid SPNEGO_OID = createOid("1.3.6.1.5.5.2");
+    protected static final Oid KERBEROS_OID = createOid("1.2.840.113554.1.2.2");
+    protected static final Duration MIN_CREDENTIAL_LIFETIME = new Duration(60, SECONDS);
+
+    protected GSSContext createContext(String servicePrincipal, GSSCredential gssCredential)
+            throws GSSException
+    {
+        GSSContext result = GSS_MANAGER.createContext(
+                GSS_MANAGER.createName(servicePrincipal, NT_HOSTBASED_SERVICE),
+                SPNEGO_OID,
+                gssCredential,
+                INDEFINITE_LIFETIME);
+
+        result.requestMutualAuth(true);
+        result.requestConf(true);
+        result.requestInteg(true);
+        result.requestCredDeleg(true);
+        return result;
+    }
+
+    static Oid createOid(String value)
+    {
+        try {
+            return new Oid(value);
+        }
+        catch (GSSException e) {
+            throw new AssertionError(e);
+        }
+    }
+}
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/ContextBasedSubjectProvider.java b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/ContextBasedSubjectProvider.java
deleted file mode 100644
index 02a58ad0163f..000000000000
--- a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/ContextBasedSubjectProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed 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 io.trino.client.auth.kerberos;
-
-import io.trino.client.ClientException;
-import org.ietf.jgss.GSSException;
-
-import javax.security.auth.RefreshFailedException;
-import javax.security.auth.Subject;
-import javax.security.auth.kerberos.KerberosTicket;
-import javax.security.auth.login.LoginException;
-
-import java.util.Set;
-
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static java.security.AccessController.getContext;
-
-public class ContextBasedSubjectProvider
-        implements SubjectProvider
-{
-    private final Subject subject = Subject.getSubject(getContext());
-
-    @Override
-    public Subject getSubject()
-    {
-        return subject;
-    }
-
-    @Override
-    public void refresh()
-            throws LoginException, GSSException
-    {
-        Set<KerberosTicket> credentials = subject.getPrivateCredentials(KerberosTicket.class);
-
-        if (credentials.size() > 1) {
-            throw new ClientException("Invalid Credentials. Multiple Kerberos Credentials found.");
-        }
-        KerberosTicket kerberosTicket = getOnlyElement(credentials);
-        if (kerberosTicket.isRenewable()) {
-            try {
-                kerberosTicket.refresh();
-            }
-            catch (RefreshFailedException exception) {
-                throw new ClientException("Unable to refresh the kerberos ticket", exception);
-            }
-        }
-    }
-}
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/DelegatedConstrainedContextProvider.java b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/DelegatedConstrainedContextProvider.java
new file mode 100644
index 000000000000..01c7393eb774
--- /dev/null
+++ b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/DelegatedConstrainedContextProvider.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed 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 io.trino.client.auth.kerberos;
+
+import io.trino.client.ClientException;
+import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSException;
+
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public class DelegatedConstrainedContextProvider
+        extends BaseGSSContextProvider
+{
+    private final GSSCredential gssCredential;
+
+    public DelegatedConstrainedContextProvider(GSSCredential gssCredential)
+    {
+        this.gssCredential = requireNonNull(gssCredential, "gssCredential is null");
+    }
+
+    @Override
+    public GSSContext getContext(String servicePrincipal)
+            throws GSSException
+    {
+        if (gssCredential.getRemainingLifetime() < MIN_CREDENTIAL_LIFETIME.getValue(SECONDS)) {
+            throw new ClientException(format("Kerberos credential is expired: %s seconds", gssCredential.getRemainingLifetime()));
+        }
+        return createContext(servicePrincipal, gssCredential);
+    }
+}
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/DelegatedUnconstrainedContextProvider.java b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/DelegatedUnconstrainedContextProvider.java
new file mode 100644
index 000000000000..263fdeb4f7b1
--- /dev/null
+++ b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/DelegatedUnconstrainedContextProvider.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed 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 io.trino.client.auth.kerberos;
+
+import io.trino.client.ClientException;
+import org.ietf.jgss.GSSException;
+
+import javax.security.auth.RefreshFailedException;
+import javax.security.auth.Subject;
+import javax.security.auth.kerberos.KerberosTicket;
+
+import java.security.AccessController;
+import java.util.Set;
+
+import static com.google.common.collect.Iterables.getOnlyElement;
+
+public class DelegatedUnconstrainedContextProvider
+        extends AbstractUnconstrainedContextProvider
+{
+    private final Subject subject = Subject.getSubject(AccessController.getContext());
+
+    @Override
+    protected Subject getSubject()
+    {
+        return subject;
+    }
+
+    @Override
+    public void refresh()
+            throws GSSException
+    {
+        Set<KerberosTicket> credentials = subject.getPrivateCredentials(KerberosTicket.class);
+
+        if (credentials.size() > 1) {
+            throw new ClientException("Invalid Credentials. Multiple Kerberos Credentials found.");
+        }
+        KerberosTicket kerberosTicket = getOnlyElement(credentials);
+        if (kerberosTicket.isRenewable()) {
+            try {
+                kerberosTicket.refresh();
+            }
+            catch (RefreshFailedException exception) {
+                throw new ClientException("Unable to refresh the kerberos ticket", exception);
+            }
+        }
+    }
+}
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/GSSContextProvider.java b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/GSSContextProvider.java
new file mode 100644
index 000000000000..cee1c6ed151e
--- /dev/null
+++ b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/GSSContextProvider.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed 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 io.trino.client.auth.kerberos;
+
+import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSException;
+
+public interface GSSContextProvider
+{
+    GSSContext getContext(String servicePrincipal)
+            throws GSSException;
+}
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/LoginBasedSubjectProvider.java b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/LoginBasedSubjectProvider.java
deleted file mode 100644
index e385cbefc8d1..000000000000
--- a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/LoginBasedSubjectProvider.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed 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 io.trino.client.auth.kerberos;
-
-import com.google.common.collect.ImmutableMap;
-import com.sun.security.auth.module.Krb5LoginModule;
-import org.ietf.jgss.GSSException;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.security.auth.Subject;
-import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.login.Configuration;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-
-import java.io.File;
-import java.util.Objects;
-import java.util.Optional;
-
-import static com.google.common.base.Preconditions.checkState;
-import static java.lang.Boolean.getBoolean;
-import static java.util.Objects.requireNonNull;
-import static javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag.REQUIRED;
-
-public class LoginBasedSubjectProvider
-        implements SubjectProvider
-{
-    private final Optional<String> principal;
-    private final Optional<File> keytab;
-    private final Optional<File> credentialCache;
-
-    @GuardedBy("this")
-    private LoginContext loginContext;
-
-    public LoginBasedSubjectProvider(
-            Optional<String> principal,
-            Optional<File> kerberosConfig,
-            Optional<File> keytab,
-            Optional<File> credentialCache)
-    {
-        this.principal = requireNonNull(principal, "principal is null");
-        this.keytab = requireNonNull(keytab, "keytab is null");
-        this.credentialCache = requireNonNull(credentialCache, "credentialCache is null");
-
-        kerberosConfig.ifPresent(file -> {
-            String newValue = file.getAbsolutePath();
-            String currentValue = System.getProperty("java.security.krb5.conf");
-            checkState(
-                    currentValue == null || Objects.equals(currentValue, newValue),
-                    "Refusing to set system property 'java.security.krb5.conf' to '%s', it is already set to '%s'",
-                    newValue,
-                    currentValue);
-            checkState(
-                    file.exists() && !file.isDirectory(),
-                    "Kerberos config file '%s' does not exist or is a directory",
-                    newValue);
-            checkState(file.canRead(), "Kerberos config file '%s' is not readable", newValue);
-            System.setProperty("java.security.krb5.conf", newValue);
-        });
-    }
-
-    @Override
-    public Subject getSubject()
-    {
-        return loginContext.getSubject();
-    }
-
-    @Override
-    public void refresh()
-            throws LoginException, GSSException
-    {
-        // TODO: do we need to call logout() on the LoginContext?
-
-        loginContext = new LoginContext("", null, null, new Configuration()
-        {
-            @Override
-            public AppConfigurationEntry[] getAppConfigurationEntry(String name)
-            {
-                ImmutableMap.Builder<String, String> options = ImmutableMap.builder();
-                options.put("refreshKrb5Config", "true");
-                options.put("doNotPrompt", "true");
-                options.put("useKeyTab", "true");
-
-                if (getBoolean("trino.client.debugKerberos")) {
-                    options.put("debug", "true");
-                }
-
-                keytab.ifPresent(file -> options.put("keyTab", file.getAbsolutePath()));
-
-                credentialCache.ifPresent(file -> {
-                    options.put("ticketCache", file.getAbsolutePath());
-                    options.put("renewTGT", "true");
-                });
-
-                if (!keytab.isPresent() || credentialCache.isPresent()) {
-                    options.put("useTicketCache", "true");
-                }
-
-                principal.ifPresent(value -> options.put("principal", value));
-
-                return new AppConfigurationEntry[] {
-                        new AppConfigurationEntry(Krb5LoginModule.class.getName(), REQUIRED, options.buildOrThrow())
-                };
-            }
-        });
-
-        loginContext.login();
-    }
-}
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/LoginBasedUnconstrainedContextProvider.java b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/LoginBasedUnconstrainedContextProvider.java
new file mode 100644
index 000000000000..9a785132e143
--- /dev/null
+++ b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/LoginBasedUnconstrainedContextProvider.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed 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 io.trino.client.auth.kerberos;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.sun.security.auth.module.Krb5LoginModule;
+import io.trino.client.ClientException;
+import org.ietf.jgss.GSSException;
+
+import javax.security.auth.Subject;
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+
+import java.io.File;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkState;
+import static java.lang.Boolean.getBoolean;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+import static javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag.REQUIRED;
+
+public class LoginBasedUnconstrainedContextProvider
+        extends AbstractUnconstrainedContextProvider
+{
+    private final Optional<String> principal;
+    private final Optional<File> keytab;
+    private final Optional<File> credentialCache;
+
+    @GuardedBy("this")
+    private LoginContext loginContext;
+
+    public LoginBasedUnconstrainedContextProvider(
+            Optional<String> principal,
+            Optional<File> kerberosConfig,
+            Optional<File> keytab,
+            Optional<File> credentialCache)
+    {
+        this.principal = requireNonNull(principal, "principal is null");
+        this.keytab = requireNonNull(keytab, "keytab is null");
+        this.credentialCache = requireNonNull(credentialCache, "credentialCache is null");
+
+        kerberosConfig.ifPresent(file -> {
+            String newValue = file.getAbsolutePath();
+            String currentValue = System.getProperty("java.security.krb5.conf");
+            checkState(
+                    currentValue == null || Objects.equals(currentValue, newValue),
+                    "Refusing to set system property 'java.security.krb5.conf' to '%s', it is already set to '%s'",
+                    newValue,
+                    currentValue);
+            checkState(
+                    file.exists() && !file.isDirectory(),
+                    "Kerberos config file '%s' does not exist or is a directory",
+                    newValue);
+            checkState(file.canRead(), "Kerberos config file '%s' is not readable", newValue);
+            System.setProperty("java.security.krb5.conf", newValue);
+        });
+    }
+
+    @Override
+    public Subject getSubject()
+    {
+        return loginContext.getSubject();
+    }
+
+    @Override
+    public void refresh()
+            throws GSSException
+    {
+        // TODO: do we need to call logout() on the LoginContext?
+        try {
+            loginContext = new LoginContext("", null, null, new Configuration()
+            {
+                @Override
+                public AppConfigurationEntry[] getAppConfigurationEntry(String name)
+                {
+                    ImmutableMap.Builder<String, String> options = ImmutableMap.builder();
+                    options.put("refreshKrb5Config", "true");
+                    options.put("doNotPrompt", "true");
+                    options.put("useKeyTab", "true");
+
+                    if (getBoolean("trino.client.debugKerberos")) {
+                        options.put("debug", "true");
+                    }
+
+                    keytab.ifPresent(file -> options.put("keyTab", file.getAbsolutePath()));
+
+                    credentialCache.ifPresent(file -> {
+                        options.put("ticketCache", file.getAbsolutePath());
+                        options.put("renewTGT", "true");
+                    });
+
+                    if (!keytab.isPresent() || credentialCache.isPresent()) {
+                        options.put("useTicketCache", "true");
+                    }
+
+                    principal.ifPresent(value -> options.put("principal", value));
+
+                    return new AppConfigurationEntry[] {
+                            new AppConfigurationEntry(Krb5LoginModule.class.getName(), REQUIRED, options.buildOrThrow())
+                    };
+                }
+            });
+
+            loginContext.login();
+        }
+        catch (LoginException e) {
+            throw new ClientException(format("Kerberos login error for [%s]: %s", principal.orElse("not defined"), e.getMessage()), e);
+        }
+    }
+}
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/SpnegoHandler.java b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/SpnegoHandler.java
index f603d905464f..f2d329178f0f 100644
--- a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/SpnegoHandler.java
+++ b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/SpnegoHandler.java
@@ -14,7 +14,6 @@
 package io.trino.client.auth.kerberos;
 
 import com.google.common.base.Splitter;
-import io.airlift.units.Duration;
 import io.trino.client.ClientException;
 import okhttp3.Authenticator;
 import okhttp3.Interceptor;
@@ -22,68 +21,42 @@
 import okhttp3.Response;
 import okhttp3.Route;
 import org.ietf.jgss.GSSContext;
-import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSException;
-import org.ietf.jgss.GSSManager;
-import org.ietf.jgss.Oid;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.security.auth.Subject;
 import javax.security.auth.login.LoginException;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.security.Principal;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.Base64;
 import java.util.Locale;
 
 import static com.google.common.base.CharMatcher.whitespace;
-import static com.google.common.base.Throwables.throwIfInstanceOf;
-import static com.google.common.base.Throwables.throwIfUnchecked;
 import static com.google.common.net.HttpHeaders.AUTHORIZATION;
 import static com.google.common.net.HttpHeaders.WWW_AUTHENTICATE;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.ietf.jgss.GSSContext.INDEFINITE_LIFETIME;
-import static org.ietf.jgss.GSSCredential.DEFAULT_LIFETIME;
-import static org.ietf.jgss.GSSCredential.INITIATE_ONLY;
-import static org.ietf.jgss.GSSName.NT_HOSTBASED_SERVICE;
-import static org.ietf.jgss.GSSName.NT_USER_NAME;
 
 // TODO: This class is similar to SpnegoAuthentication in Airlift. Consider extracting a library.
 public class SpnegoHandler
         implements Interceptor, Authenticator
 {
     private static final String NEGOTIATE = "Negotiate";
-    private static final Duration MIN_CREDENTIAL_LIFETIME = new Duration(60, SECONDS);
-
-    private static final GSSManager GSS_MANAGER = GSSManager.getInstance();
-
-    private static final Oid SPNEGO_OID = createOid("1.3.6.1.5.5.2");
-    private static final Oid KERBEROS_OID = createOid("1.2.840.113554.1.2.2");
-
     private final String servicePrincipalPattern;
     private final String remoteServiceName;
     private final boolean useCanonicalHostname;
-    private final SubjectProvider subjectProvider;
-
-    @GuardedBy("this")
-    private GSSCredential clientCredential;
+    private final GSSContextProvider contextProvider;
 
     public SpnegoHandler(
             String servicePrincipalPattern,
             String remoteServiceName,
             boolean useCanonicalHostname,
-            SubjectProvider subjectProvider)
+            GSSContextProvider contextProvider)
     {
         this.servicePrincipalPattern = requireNonNull(servicePrincipalPattern, "servicePrincipalPattern is null");
         this.remoteServiceName = requireNonNull(remoteServiceName, "remoteServiceName is null");
         this.useCanonicalHostname = useCanonicalHostname;
-        this.subjectProvider = requireNonNull(subjectProvider, "subjectProvider is null");
+        this.contextProvider = requireNonNull(contextProvider, "subjectProvider is null");
     }
 
     @Override
@@ -132,21 +105,7 @@ private byte[] generateToken(String servicePrincipal)
     {
         GSSContext context = null;
         try {
-            GSSCredential clientCredential = getGssCredential();
-            context = doAs(subjectProvider.getSubject(), () -> {
-                GSSContext result = GSS_MANAGER.createContext(
-                        GSS_MANAGER.createName(servicePrincipal, NT_HOSTBASED_SERVICE),
-                        SPNEGO_OID,
-                        clientCredential,
-                        INDEFINITE_LIFETIME);
-
-                result.requestMutualAuth(true);
-                result.requestConf(true);
-                result.requestInteg(true);
-                result.requestCredDeleg(true);
-                return result;
-            });
-
+            context = contextProvider.getContext(servicePrincipal);
             byte[] token = context.initSecContext(new byte[0], 0, 0);
             if (token == null) {
                 throw new LoginException("No token generated from GSS context");
@@ -167,28 +126,6 @@ private byte[] generateToken(String servicePrincipal)
         }
     }
 
-    private synchronized GSSCredential getGssCredential()
-            throws LoginException, GSSException
-    {
-        if ((clientCredential == null) || clientCredential.getRemainingLifetime() < MIN_CREDENTIAL_LIFETIME.getValue(SECONDS)) {
-            clientCredential = createGssCredential();
-        }
-        return clientCredential;
-    }
-
-    private GSSCredential createGssCredential()
-            throws LoginException, GSSException
-    {
-        subjectProvider.refresh();
-        Subject subject = subjectProvider.getSubject();
-        Principal clientPrincipal = subject.getPrincipals().iterator().next();
-        return doAs(subject, () -> GSS_MANAGER.createCredential(
-                GSS_MANAGER.createName(clientPrincipal.getName(), NT_USER_NAME),
-                DEFAULT_LIFETIME,
-                KERBEROS_OID,
-                INITIATE_ONLY));
-    }
-
     private static String makeServicePrincipal(String servicePrincipalPattern, String serviceName, String hostName, boolean useCanonicalHostname)
     {
         String serviceHostName = hostName;
@@ -218,34 +155,4 @@ private static String canonicalizeServiceHostName(String hostName)
             throw new ClientException("Failed to resolve host: " + hostName, e);
         }
     }
-
-    private interface GssSupplier<T>
-    {
-        T get()
-                throws GSSException;
-    }
-
-    private static <T> T doAs(Subject subject, GssSupplier<T> action)
-            throws GSSException
-    {
-        try {
-            return Subject.doAs(subject, (PrivilegedExceptionAction<T>) action::get);
-        }
-        catch (PrivilegedActionException e) {
-            Throwable t = e.getCause();
-            throwIfInstanceOf(t, GSSException.class);
-            throwIfUnchecked(t);
-            throw new RuntimeException(t);
-        }
-    }
-
-    private static Oid createOid(String value)
-    {
-        try {
-            return new Oid(value);
-        }
-        catch (GSSException e) {
-            throw new AssertionError(e);
-        }
-    }
 }
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/SubjectProvider.java b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/SubjectProvider.java
deleted file mode 100644
index 106450c4658f..000000000000
--- a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/SubjectProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed 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 io.trino.client.auth.kerberos;
-
-import org.ietf.jgss.GSSException;
-
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
-
-public interface SubjectProvider
-{
-    Subject getSubject();
-
-    void refresh()
-            throws LoginException, GSSException;
-}
diff --git a/client/trino-client/src/main/java/io/trino/client/uri/AbstractConnectionProperty.java b/client/trino-client/src/main/java/io/trino/client/uri/AbstractConnectionProperty.java
new file mode 100644
index 000000000000..9e0ca1ca4fff
--- /dev/null
+++ b/client/trino-client/src/main/java/io/trino/client/uri/AbstractConnectionProperty.java
@@ -0,0 +1,239 @@
+/*
+ * Licensed 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 io.trino.client.uri;
+
+import com.google.common.reflect.TypeToken;
+
+import java.io.File;
+import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.lang.String.format;
+import static java.util.Locale.ENGLISH;
+import static java.util.Objects.requireNonNull;
+
+abstract class AbstractConnectionProperty<V, T>
+        implements ConnectionProperty<V, T>
+{
+    private final PropertyName propertyName;
+    private final String key;
+    private final Optional<T> defaultValue;
+    private final Predicate<Properties> isRequired;
+    private final Validator<Properties> validator;
+    private final Converter<V, T> converter;
+    private final String[] choices;
+
+    protected AbstractConnectionProperty(
+            PropertyName propertyName,
+            Optional<T> defaultValue,
+            Predicate<Properties> isRequired,
+            Validator<Properties> validator,
+            Converter<V, T> converter)
+    {
+        this.propertyName = requireNonNull(propertyName, "key is null");
+        this.key = propertyName.toString();
+        this.defaultValue = requireNonNull(defaultValue, "defaultValue is null");
+        this.isRequired = requireNonNull(isRequired, "isRequired is null");
+        this.validator = requireNonNull(validator, "validator is null");
+        this.converter = requireNonNull(converter, "converter is null");
+
+        Class<? super T> type = new TypeToken<T>(getClass()) {}.getRawType();
+        if (type == Boolean.class) {
+            choices = new String[] {"true", "false"};
+        }
+        else if (Enum.class.isAssignableFrom(type)) {
+            choices = Stream.of(type.getEnumConstants())
+                    .map(Object::toString)
+                    .toArray(String[]::new);
+        }
+        else {
+            choices = null;
+        }
+    }
+
+    protected AbstractConnectionProperty(
+            PropertyName key,
+            Predicate<Properties> required,
+            Validator<Properties> allowed,
+            Converter<V, T> converter)
+    {
+        this(key, Optional.empty(), required, allowed, converter);
+    }
+
+    @Override
+    public PropertyName getPropertyName()
+    {
+        return propertyName;
+    }
+
+    @Override
+    public DriverPropertyInfo getDriverPropertyInfo(Properties mergedProperties)
+    {
+        String currentValue = mergedProperties.getProperty(key);
+        DriverPropertyInfo result = new DriverPropertyInfo(key, currentValue);
+        result.required = isRequired.test(mergedProperties);
+        result.choices = (choices != null) ? choices.clone() : null;
+        return result;
+    }
+
+    @Override
+    public boolean isRequired(Properties properties)
+    {
+        return isRequired.test(properties);
+    }
+
+    @Override
+    public boolean isValid(Properties properties)
+    {
+        return !validator.validate(properties).isPresent();
+    }
+
+    @Override
+    public Optional<T> getValue(Properties properties)
+            throws SQLException
+    {
+        return getValueOrDefault(properties, defaultValue);
+    }
+
+    @Override
+    public Optional<T> getValueOrDefault(Properties properties, Optional<T> defaultValue)
+            throws SQLException
+    {
+        V value = (V) properties.get(key);
+        if (value == null) {
+            if (isRequired(properties) && !defaultValue.isPresent()) {
+                throw new SQLException(format("Connection property %s is required", key));
+            }
+            return defaultValue;
+        }
+
+        try {
+            return Optional.of(converter.convert(value));
+        }
+        catch (RuntimeException e) {
+            if (isEmpty(value)) {
+                throw new SQLException(format("Connection property %s value is empty", key), e);
+            }
+            throw new SQLException(format("Connection property %s value is invalid: %s", key, value), e);
+        }
+    }
+
+    private boolean isEmpty(V value)
+    {
+        if (value instanceof String) {
+            return ((String) value).isEmpty();
+        }
+        return false;
+    }
+
+    @Override
+    public void validate(Properties properties)
+            throws SQLException
+    {
+        if (properties.containsKey(key)) {
+            Optional<String> message = validator.validate(properties);
+            if (message.isPresent()) {
+                throw new SQLException(message.get());
+            }
+        }
+
+        getValue(properties);
+    }
+
+    protected static final Predicate<Properties> NOT_REQUIRED = properties -> false;
+
+    protected static final Validator<Properties> ALLOWED = properties -> Optional.empty();
+
+    interface Converter<V, T>
+    {
+        T convert(V value);
+    }
+
+    protected static final Converter<String, String> STRING_CONVERTER = String.class::cast;
+
+    protected static final Converter<String, String> NON_EMPTY_STRING_CONVERTER = value -> {
+        checkArgument(!value.isEmpty(), "value is empty");
+        return value;
+    };
+
+    protected static final Converter<String, File> FILE_CONVERTER = File::new;
+
+    protected static final Converter<String, Boolean> BOOLEAN_CONVERTER = value -> {
+        switch (value.toLowerCase(ENGLISH)) {
+            case "true":
+                return true;
+            case "false":
+                return false;
+        }
+        throw new IllegalArgumentException("value must be 'true' or 'false'");
+    };
+
+    protected interface Validator<T>
+    {
+        /**
+         * @param value Value to validate
+         * @return An error message if the value is invalid or empty otherwise
+         */
+        Optional<String> validate(T value);
+
+        default Validator<T> and(Validator<? super T> other)
+        {
+            requireNonNull(other, "other is null");
+            // return the first non-empty optional
+            return (t) -> {
+                Optional<String> result = validate(t);
+                if (result.isPresent()) {
+                    return result;
+                }
+                return other.validate(t);
+            };
+        }
+    }
+
+    protected static <T> Validator<T> validator(Predicate<T> predicate, String errorMessage)
+    {
+        requireNonNull(predicate, "predicate is null");
+        requireNonNull(errorMessage, "errorMessage is null");
+        return value -> {
+            if (predicate.test(value)) {
+                return Optional.empty();
+            }
+            return Optional.of(errorMessage);
+        };
+    }
+
+    protected interface CheckedPredicate<T>
+    {
+        boolean test(T t)
+                throws SQLException;
+    }
+
+    protected static <T> Predicate<T> checkedPredicate(CheckedPredicate<T> predicate)
+    {
+        requireNonNull(predicate, "predicate is null");
+        return value -> {
+            try {
+                return predicate.test(value);
+            }
+            catch (SQLException e) {
+                return false;
+            }
+        };
+    }
+}
diff --git a/client/trino-client/src/main/java/io/trino/client/uri/ConnectionProperties.java b/client/trino-client/src/main/java/io/trino/client/uri/ConnectionProperties.java
new file mode 100644
index 000000000000..b8c79c3d32e1
--- /dev/null
+++ b/client/trino-client/src/main/java/io/trino/client/uri/ConnectionProperties.java
@@ -0,0 +1,768 @@
+/*
+ * Licensed 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 io.trino.client.uri;
+
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.net.HostAndPort;
+import io.airlift.units.Duration;
+import io.trino.client.ClientSelectedRole;
+import io.trino.client.DnsResolver;
+import io.trino.client.auth.external.ExternalRedirectStrategy;
+import org.ietf.jgss.GSSCredential;
+
+import java.io.File;
+import java.time.ZoneId;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static com.google.common.collect.Maps.immutableEntry;
+import static com.google.common.collect.Streams.stream;
+import static io.trino.client.ClientSelectedRole.Type.ALL;
+import static io.trino.client.ClientSelectedRole.Type.NONE;
+import static io.trino.client.uri.AbstractConnectionProperty.Validator;
+import static io.trino.client.uri.AbstractConnectionProperty.checkedPredicate;
+import static io.trino.client.uri.AbstractConnectionProperty.validator;
+import static java.lang.String.format;
+import static java.util.Collections.singletonList;
+import static java.util.Collections.unmodifiableMap;
+import static java.util.Objects.requireNonNull;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toMap;
+
+final class ConnectionProperties
+{
+    enum SslVerificationMode
+    {
+        FULL, CA, NONE
+    }
+
+    public static final ConnectionProperty<String, String> USER = new User();
+    public static final ConnectionProperty<String, String> PASSWORD = new Password();
+    public static final ConnectionProperty<String, String> SESSION_USER = new SessionUser();
+    public static final ConnectionProperty<String, Map<String, ClientSelectedRole>> ROLES = new Roles();
+    public static final ConnectionProperty<String, HostAndPort> SOCKS_PROXY = new SocksProxy();
+    public static final ConnectionProperty<String, HostAndPort> HTTP_PROXY = new HttpProxy();
+    public static final ConnectionProperty<String, String> APPLICATION_NAME_PREFIX = new ApplicationNamePrefix();
+    public static final ConnectionProperty<String, Boolean> DISABLE_COMPRESSION = new DisableCompression();
+    public static final ConnectionProperty<String, Boolean> ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS = new AssumeLiteralNamesInMetadataCallsForNonConformingClients();
+    public static final ConnectionProperty<String, Boolean> ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS = new AssumeLiteralUnderscoreInMetadataCallsForNonConformingClients();
+    public static final ConnectionProperty<String, Boolean> SSL = new Ssl();
+    public static final ConnectionProperty<String, SslVerificationMode> SSL_VERIFICATION = new SslVerification();
+    public static final ConnectionProperty<String, String> SSL_KEY_STORE_PATH = new SslKeyStorePath();
+    public static final ConnectionProperty<String, String> SSL_KEY_STORE_PASSWORD = new SslKeyStorePassword();
+    public static final ConnectionProperty<String, String> SSL_KEY_STORE_TYPE = new SslKeyStoreType();
+    public static final ConnectionProperty<String, String> SSL_TRUST_STORE_PATH = new SslTrustStorePath();
+    public static final ConnectionProperty<String, String> SSL_TRUST_STORE_PASSWORD = new SslTrustStorePassword();
+    public static final ConnectionProperty<String, String> SSL_TRUST_STORE_TYPE = new SslTrustStoreType();
+    public static final ConnectionProperty<String, Boolean> SSL_USE_SYSTEM_TRUST_STORE = new SslUseSystemTrustStore();
+    public static final ConnectionProperty<String, String> KERBEROS_SERVICE_PRINCIPAL_PATTERN = new KerberosServicePrincipalPattern();
+    public static final ConnectionProperty<String, String> KERBEROS_REMOTE_SERVICE_NAME = new KerberosRemoteServiceName();
+    public static final ConnectionProperty<String, Boolean> KERBEROS_USE_CANONICAL_HOSTNAME = new KerberosUseCanonicalHostname();
+    public static final ConnectionProperty<String, String> KERBEROS_PRINCIPAL = new KerberosPrincipal();
+    public static final ConnectionProperty<String, File> KERBEROS_CONFIG_PATH = new KerberosConfigPath();
+    public static final ConnectionProperty<String, File> KERBEROS_KEYTAB_PATH = new KerberosKeytabPath();
+    public static final ConnectionProperty<String, File> KERBEROS_CREDENTIAL_CACHE_PATH = new KerberosCredentialCachePath();
+    public static final ConnectionProperty<String, Boolean> KERBEROS_DELEGATION = new KerberosDelegation();
+    public static final ConnectionProperty<GSSCredential, GSSCredential> KERBEROS_CONSTRAINED_DELEGATION = new KerberosConstrainedDelegation();
+    public static final ConnectionProperty<String, String> ACCESS_TOKEN = new AccessToken();
+    public static final ConnectionProperty<String, Boolean> EXTERNAL_AUTHENTICATION = new ExternalAuthentication();
+    public static final ConnectionProperty<String, Duration> EXTERNAL_AUTHENTICATION_TIMEOUT = new ExternalAuthenticationTimeout();
+    public static final ConnectionProperty<String, List<ExternalRedirectStrategy>> EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS = new ExternalAuthenticationRedirectHandlers();
+    public static final ConnectionProperty<String, KnownTokenCache> EXTERNAL_AUTHENTICATION_TOKEN_CACHE = new ExternalAuthenticationTokenCache();
+    public static final ConnectionProperty<String, Map<String, String>> EXTRA_CREDENTIALS = new ExtraCredentials();
+    public static final ConnectionProperty<String, String> CLIENT_INFO = new ClientInfo();
+    public static final ConnectionProperty<String, String> CLIENT_TAGS = new ClientTags();
+    public static final ConnectionProperty<String, String> TRACE_TOKEN = new TraceToken();
+    public static final ConnectionProperty<String, Map<String, String>> SESSION_PROPERTIES = new SessionProperties();
+    public static final ConnectionProperty<String, String> SOURCE = new Source();
+    public static final ConnectionProperty<String, Class<? extends DnsResolver>> DNS_RESOLVER = new Resolver();
+    public static final ConnectionProperty<String, String> DNS_RESOLVER_CONTEXT = new ResolverContext();
+    public static final ConnectionProperty<String, String> HOSTNAME_IN_CERTIFICATE = new HostnameInCertificate();
+    public static final ConnectionProperty<String, ZoneId> TIMEZONE = new TimeZone();
+    public static final ConnectionProperty<String, Boolean> EXPLICIT_PREPARE = new ExplicitPrepare();
+
+    private static final Set<ConnectionProperty<?, ?>> ALL_PROPERTIES = ImmutableSet.<ConnectionProperty<?, ?>>builder()
+            .add(USER)
+            .add(PASSWORD)
+            .add(SESSION_USER)
+            .add(ROLES)
+            .add(SOCKS_PROXY)
+            .add(HTTP_PROXY)
+            .add(APPLICATION_NAME_PREFIX)
+            .add(DISABLE_COMPRESSION)
+            .add(ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS)
+            .add(ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS)
+            .add(SSL)
+            .add(SSL_VERIFICATION)
+            .add(SSL_KEY_STORE_PATH)
+            .add(SSL_KEY_STORE_PASSWORD)
+            .add(SSL_KEY_STORE_TYPE)
+            .add(SSL_TRUST_STORE_PATH)
+            .add(SSL_TRUST_STORE_PASSWORD)
+            .add(SSL_TRUST_STORE_TYPE)
+            .add(SSL_USE_SYSTEM_TRUST_STORE)
+            .add(KERBEROS_REMOTE_SERVICE_NAME)
+            .add(KERBEROS_SERVICE_PRINCIPAL_PATTERN)
+            .add(KERBEROS_USE_CANONICAL_HOSTNAME)
+            .add(KERBEROS_PRINCIPAL)
+            .add(KERBEROS_CONFIG_PATH)
+            .add(KERBEROS_KEYTAB_PATH)
+            .add(KERBEROS_CREDENTIAL_CACHE_PATH)
+            .add(KERBEROS_DELEGATION)
+            .add(KERBEROS_CONSTRAINED_DELEGATION)
+            .add(ACCESS_TOKEN)
+            .add(EXTRA_CREDENTIALS)
+            .add(CLIENT_INFO)
+            .add(CLIENT_TAGS)
+            .add(TRACE_TOKEN)
+            .add(SESSION_PROPERTIES)
+            .add(SOURCE)
+            .add(EXTERNAL_AUTHENTICATION)
+            .add(EXTERNAL_AUTHENTICATION_TIMEOUT)
+            .add(EXTERNAL_AUTHENTICATION_TOKEN_CACHE)
+            .add(EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS)
+            .add(DNS_RESOLVER)
+            .add(DNS_RESOLVER_CONTEXT)
+            .add(HOSTNAME_IN_CERTIFICATE)
+            .add(TIMEZONE)
+            .add(EXPLICIT_PREPARE)
+            .build();
+
+    private static final Map<String, ConnectionProperty<?, ?>> KEY_LOOKUP = unmodifiableMap(ALL_PROPERTIES.stream()
+            .collect(toMap(ConnectionProperty::getKey, identity())));
+
+    private ConnectionProperties() {}
+
+    public static ConnectionProperty<?, ?> forKey(String propertiesKey)
+    {
+        return KEY_LOOKUP.get(propertiesKey);
+    }
+
+    public static Set<ConnectionProperty<?, ?>> allProperties()
+    {
+        return ALL_PROPERTIES;
+    }
+
+    private static class User
+            extends AbstractConnectionProperty<String, String>
+    {
+        public User()
+        {
+            super(PropertyName.USER, NOT_REQUIRED, ALLOWED, NON_EMPTY_STRING_CONVERTER);
+        }
+    }
+
+    private static class Password
+            extends AbstractConnectionProperty<String, String>
+    {
+        public Password()
+        {
+            super(PropertyName.PASSWORD, NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
+        }
+    }
+
+    private static class SessionUser
+            extends AbstractConnectionProperty<String, String>
+    {
+        protected SessionUser()
+        {
+            super(PropertyName.SESSION_USER, NOT_REQUIRED, ALLOWED, NON_EMPTY_STRING_CONVERTER);
+        }
+    }
+
+    private static class Roles
+            extends AbstractConnectionProperty<String, Map<String, ClientSelectedRole>>
+    {
+        public Roles()
+        {
+            super(PropertyName.ROLES, NOT_REQUIRED, ALLOWED, Roles::parseRoles);
+        }
+
+        // Roles consists of a list of catalog role pairs.
+        // E.g., `jdbc:trino://example.net:8080/?roles=catalog1:none;catalog2:all;catalog3:role` will set following roles:
+        //  - `none` in `catalog1`
+        //  - `all` in `catalog2`
+        //  - `role` in `catalog3`
+        public static Map<String, ClientSelectedRole> parseRoles(String roles)
+        {
+            return new MapPropertyParser(PropertyName.ROLES.toString()).parse(roles).entrySet().stream()
+                    .collect(toImmutableMap(Map.Entry::getKey, entry -> mapToClientSelectedRole(entry.getValue())));
+        }
+
+        private static ClientSelectedRole mapToClientSelectedRole(String role)
+        {
+            checkArgument(!role.contains("\""), "Role must not contain double quotes: %s", role);
+            if (ALL.name().equalsIgnoreCase(role)) {
+                return new ClientSelectedRole(ALL, Optional.empty());
+            }
+            if (NONE.name().equalsIgnoreCase(role)) {
+                return new ClientSelectedRole(NONE, Optional.empty());
+            }
+            return new ClientSelectedRole(ClientSelectedRole.Type.ROLE, Optional.of(role));
+        }
+    }
+
+    private static class SocksProxy
+            extends AbstractConnectionProperty<String, HostAndPort>
+    {
+        private static final Validator<Properties> NO_HTTP_PROXY = validator(
+                checkedPredicate(properties -> !HTTP_PROXY.getValue(properties).isPresent()),
+                format("Connection property %s cannot be used when %s is set", PropertyName.SOCKS_PROXY, PropertyName.HTTP_PROXY));
+
+        public SocksProxy()
+        {
+            super(PropertyName.SOCKS_PROXY, NOT_REQUIRED, NO_HTTP_PROXY, HostAndPort::fromString);
+        }
+    }
+
+    private static class HttpProxy
+            extends AbstractConnectionProperty<String, HostAndPort>
+    {
+        private static final Validator<Properties> NO_SOCKS_PROXY = validator(
+                checkedPredicate(properties -> !SOCKS_PROXY.getValue(properties).isPresent()),
+                format("Connection property %s cannot be used when %s is set", PropertyName.HTTP_PROXY, PropertyName.SOCKS_PROXY));
+
+        public HttpProxy()
+        {
+            super(PropertyName.HTTP_PROXY, NOT_REQUIRED, NO_SOCKS_PROXY, HostAndPort::fromString);
+        }
+    }
+
+    private static class ApplicationNamePrefix
+            extends AbstractConnectionProperty<String, String>
+    {
+        public ApplicationNamePrefix()
+        {
+            super(PropertyName.APPLICATION_NAME_PREFIX, NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
+        }
+    }
+
+    private static class ClientInfo
+            extends AbstractConnectionProperty<String, String>
+    {
+        public ClientInfo()
+        {
+            super(PropertyName.CLIENT_INFO, NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
+        }
+    }
+
+    private static class ClientTags
+            extends AbstractConnectionProperty<String, String>
+    {
+        public ClientTags()
+        {
+            super(PropertyName.CLIENT_TAGS, NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
+        }
+    }
+
+    private static class TraceToken
+            extends AbstractConnectionProperty<String, String>
+    {
+        public TraceToken()
+        {
+            super(PropertyName.TRACE_TOKEN, NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
+        }
+    }
+
+    private static class DisableCompression
+            extends AbstractConnectionProperty<String, Boolean>
+    {
+        public DisableCompression()
+        {
+            super(PropertyName.DISABLE_COMPRESSION, NOT_REQUIRED, ALLOWED, BOOLEAN_CONVERTER);
+        }
+    }
+
+    /**
+     * @deprecated use {@link AssumeLiteralUnderscoreInMetadataCallsForNonConformingClients}
+     */
+    private static class AssumeLiteralNamesInMetadataCallsForNonConformingClients
+            extends AbstractConnectionProperty<String, Boolean>
+    {
+        private static final Predicate<Properties> IS_NOT_ENABLED =
+                checkedPredicate(properties -> !ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS.getValue(properties).orElse(false));
+
+        public AssumeLiteralNamesInMetadataCallsForNonConformingClients()
+        {
+            super(
+                    PropertyName.ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS,
+                    NOT_REQUIRED,
+                    validator(
+                            AssumeLiteralUnderscoreInMetadataCallsForNonConformingClients.IS_NOT_ENABLED.or(IS_NOT_ENABLED),
+                            format(
+                                    "Connection property %s cannot be set if %s is enabled",
+                                    PropertyName.ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS,
+                                    PropertyName.ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS)),
+                    BOOLEAN_CONVERTER);
+        }
+    }
+
+    private static class AssumeLiteralUnderscoreInMetadataCallsForNonConformingClients
+            extends AbstractConnectionProperty<String, Boolean>
+    {
+        private static final Predicate<Properties> IS_NOT_ENABLED =
+                checkedPredicate(properties -> !ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS.getValue(properties).orElse(false));
+
+        public AssumeLiteralUnderscoreInMetadataCallsForNonConformingClients()
+        {
+            super(
+                    PropertyName.ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS,
+                    NOT_REQUIRED,
+                    validator(
+                            AssumeLiteralNamesInMetadataCallsForNonConformingClients.IS_NOT_ENABLED.or(IS_NOT_ENABLED),
+                            format(
+                                    "Connection property %s cannot be set if %s is enabled",
+                                    PropertyName.ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS,
+                                    PropertyName.ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS)),
+                    BOOLEAN_CONVERTER);
+        }
+    }
+
+    private static class Ssl
+            extends AbstractConnectionProperty<String, Boolean>
+    {
+        public Ssl()
+        {
+            super(PropertyName.SSL, NOT_REQUIRED, ALLOWED, BOOLEAN_CONVERTER);
+        }
+    }
+
+    private static class SslVerification
+            extends AbstractConnectionProperty<String, SslVerificationMode>
+    {
+        private static final Predicate<Properties> IF_SSL_ENABLED =
+                checkedPredicate(properties -> SSL.getValue(properties).orElse(false));
+
+        static Validator<Properties> validateEnabled(PropertyName propertyName)
+        {
+            return validator(
+                    IF_SSL_ENABLED.and(checkedPredicate(properties -> !SSL_VERIFICATION.getValue(properties).orElse(SslVerificationMode.FULL).equals(SslVerificationMode.NONE))),
+                    format("Connection property %s cannot be set if %s is set to %s", propertyName, PropertyName.SSL_VERIFICATION, SslVerificationMode.NONE));
+        }
+
+        static Validator<Properties> validateFull(PropertyName propertyName)
+        {
+            return validator(
+                    IF_SSL_ENABLED.and(checkedPredicate(properties -> SSL_VERIFICATION.getValue(properties).orElse(SslVerificationMode.FULL).equals(SslVerificationMode.FULL))),
+                    format("Connection property %s requires %s to be set to %s", propertyName, PropertyName.SSL_VERIFICATION, SslVerificationMode.FULL));
+        }
+
+        public SslVerification()
+        {
+            super(
+                    PropertyName.SSL_VERIFICATION,
+                    NOT_REQUIRED,
+                    validator(IF_SSL_ENABLED, format("Connection property %s requires TLS/SSL to be enabled", PropertyName.SSL_VERIFICATION)),
+                    SslVerificationMode::valueOf);
+        }
+    }
+
+    private static class SslKeyStorePath
+            extends AbstractConnectionProperty<String, String>
+    {
+        public SslKeyStorePath()
+        {
+            super(PropertyName.SSL_KEY_STORE_PATH, NOT_REQUIRED, SslVerification.validateEnabled(PropertyName.SSL_KEY_STORE_PATH), STRING_CONVERTER);
+        }
+    }
+
+    private static class SslKeyStorePassword
+            extends AbstractConnectionProperty<String, String>
+    {
+        private static final Validator<Properties> VALID_KEY_STORE = validator(
+                checkedPredicate(properties -> SSL_KEY_STORE_PATH.getValue(properties).isPresent()),
+                format("Connection property %s requires %s to be set", PropertyName.SSL_KEY_STORE_PASSWORD, PropertyName.SSL_KEY_STORE_PATH));
+
+        public SslKeyStorePassword()
+        {
+            super(PropertyName.SSL_KEY_STORE_PASSWORD, NOT_REQUIRED, VALID_KEY_STORE.and(SslVerification.validateEnabled(PropertyName.SSL_KEY_STORE_PASSWORD)), STRING_CONVERTER);
+        }
+    }
+
+    private static class SslKeyStoreType
+            extends AbstractConnectionProperty<String, String>
+    {
+        private static final Validator<Properties> VALID_KEY_STORE = validator(
+                checkedPredicate(properties -> SSL_KEY_STORE_PATH.getValue(properties).isPresent()),
+                format("Connection property %s requires %s to be set", PropertyName.SSL_KEY_STORE_TYPE, PropertyName.SSL_KEY_STORE_PATH));
+
+        public SslKeyStoreType()
+        {
+            super(PropertyName.SSL_KEY_STORE_TYPE, NOT_REQUIRED, VALID_KEY_STORE.and(SslVerification.validateEnabled(PropertyName.SSL_KEY_STORE_TYPE)), STRING_CONVERTER);
+        }
+    }
+
+    private static class SslTrustStorePath
+            extends AbstractConnectionProperty<String, String>
+    {
+        private static final Validator<Properties> VALIDATE_SYSTEM_TRUST_STORE_NOT_ENABLED = validator(
+                checkedPredicate(properties -> !SSL_USE_SYSTEM_TRUST_STORE.getValue(properties).orElse(false)),
+                format("Connection property %s cannot be set if %s is enabled", PropertyName.SSL_TRUST_STORE_PATH, PropertyName.SSL_USE_SYSTEM_TRUST_STORE));
+
+        public SslTrustStorePath()
+        {
+            super(PropertyName.SSL_TRUST_STORE_PATH, NOT_REQUIRED, VALIDATE_SYSTEM_TRUST_STORE_NOT_ENABLED.and(SslVerification.validateEnabled(PropertyName.SSL_TRUST_STORE_PATH)), STRING_CONVERTER);
+        }
+    }
+
+    private static class SslTrustStorePassword
+            extends AbstractConnectionProperty<String, String>
+    {
+        private static final Validator<Properties> VALIDATE_TRUST_STORE = validator(
+                checkedPredicate(properties -> SSL_TRUST_STORE_PATH.getValue(properties).isPresent()),
+                format("Connection property %s requires %s to be set", PropertyName.SSL_TRUST_STORE_PASSWORD, PropertyName.SSL_TRUST_STORE_PATH));
+
+        public SslTrustStorePassword()
+        {
+            super(PropertyName.SSL_TRUST_STORE_PASSWORD, NOT_REQUIRED, VALIDATE_TRUST_STORE.and(SslVerification.validateEnabled(PropertyName.SSL_TRUST_STORE_PASSWORD)), STRING_CONVERTER);
+        }
+    }
+
+    private static class SslTrustStoreType
+            extends AbstractConnectionProperty<String, String>
+    {
+        private static final Validator<Properties> VALIDATE_TRUST_STORE = validator(
+                checkedPredicate(properties -> SSL_TRUST_STORE_PATH.getValue(properties).isPresent() || SSL_USE_SYSTEM_TRUST_STORE.getValue(properties).orElse(false)),
+                format("Connection property %s requires %s to be set or %s to be enabled", PropertyName.SSL_TRUST_STORE_TYPE, PropertyName.SSL_TRUST_STORE_PATH, PropertyName.SSL_USE_SYSTEM_TRUST_STORE));
+
+        public SslTrustStoreType()
+        {
+            super(PropertyName.SSL_TRUST_STORE_TYPE, NOT_REQUIRED, VALIDATE_TRUST_STORE.and(SslVerification.validateEnabled(PropertyName.SSL_TRUST_STORE_TYPE)), STRING_CONVERTER);
+        }
+    }
+
+    private static class SslUseSystemTrustStore
+            extends AbstractConnectionProperty<String, Boolean>
+    {
+        public SslUseSystemTrustStore()
+        {
+            super(PropertyName.SSL_USE_SYSTEM_TRUST_STORE, NOT_REQUIRED, SslVerification.validateEnabled(PropertyName.SSL_USE_SYSTEM_TRUST_STORE), BOOLEAN_CONVERTER);
+        }
+    }
+
+    private static class KerberosRemoteServiceName
+            extends AbstractConnectionProperty<String, String>
+    {
+        public KerberosRemoteServiceName()
+        {
+            super(PropertyName.KERBEROS_REMOTE_SERVICE_NAME, NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
+        }
+    }
+
+    private static Predicate<Properties> isKerberosEnabled()
+    {
+        return checkedPredicate(properties -> KERBEROS_REMOTE_SERVICE_NAME.getValue(properties).isPresent());
+    }
+
+    private static Validator<Properties> validateKerberosWithoutDelegation(PropertyName propertyName)
+    {
+        return validator(isKerberosEnabled(), format("Connection property %s requires %s to be set", propertyName, PropertyName.KERBEROS_REMOTE_SERVICE_NAME))
+                .and(validator(
+                        checkedPredicate(properties -> !KERBEROS_DELEGATION.getValue(properties).orElse(false)),
+                        format("Connection property %s cannot be set if %s is enabled", propertyName, PropertyName.KERBEROS_DELEGATION)));
+    }
+
+    private static Validator<Properties> validateKerberosWithDelegation(PropertyName propertyName)
+    {
+        return validator(isKerberosEnabled(), format("Connection property %s requires %s to be set", propertyName, PropertyName.KERBEROS_REMOTE_SERVICE_NAME))
+                .and(validator(
+                        checkedPredicate(properties -> KERBEROS_DELEGATION.getValue(properties).orElse(false)),
+                        format("Connection property %s requires %s to be enabled", propertyName, PropertyName.KERBEROS_DELEGATION)));
+    }
+
+    private static class KerberosServicePrincipalPattern
+            extends AbstractConnectionProperty<String, String>
+    {
+        public KerberosServicePrincipalPattern()
+        {
+            super(PropertyName.KERBEROS_SERVICE_PRINCIPAL_PATTERN, Optional.of("${SERVICE}@${HOST}"), isKerberosEnabled(), ALLOWED, STRING_CONVERTER);
+        }
+    }
+
+    private static class KerberosPrincipal
+            extends AbstractConnectionProperty<String, String>
+    {
+        public KerberosPrincipal()
+        {
+            super(PropertyName.KERBEROS_PRINCIPAL, NOT_REQUIRED, validateKerberosWithoutDelegation(PropertyName.KERBEROS_PRINCIPAL), STRING_CONVERTER);
+        }
+    }
+
+    private static class KerberosUseCanonicalHostname
+            extends AbstractConnectionProperty<String, Boolean>
+    {
+        public KerberosUseCanonicalHostname()
+        {
+            super(PropertyName.KERBEROS_USE_CANONICAL_HOSTNAME, Optional.of(true), isKerberosEnabled(), ALLOWED, BOOLEAN_CONVERTER);
+        }
+    }
+
+    private static class KerberosConfigPath
+            extends AbstractConnectionProperty<String, File>
+    {
+        public KerberosConfigPath()
+        {
+            super(PropertyName.KERBEROS_CONFIG_PATH, NOT_REQUIRED, validateKerberosWithoutDelegation(PropertyName.KERBEROS_CONFIG_PATH), FILE_CONVERTER);
+        }
+    }
+
+    private static class KerberosKeytabPath
+            extends AbstractConnectionProperty<String, File>
+    {
+        public KerberosKeytabPath()
+        {
+            super(PropertyName.KERBEROS_KEYTAB_PATH, NOT_REQUIRED, validateKerberosWithoutDelegation(PropertyName.KERBEROS_KEYTAB_PATH), FILE_CONVERTER);
+        }
+    }
+
+    private static class KerberosCredentialCachePath
+            extends AbstractConnectionProperty<String, File>
+    {
+        public KerberosCredentialCachePath()
+        {
+            super(PropertyName.KERBEROS_CREDENTIAL_CACHE_PATH, NOT_REQUIRED, validateKerberosWithoutDelegation(PropertyName.KERBEROS_CREDENTIAL_CACHE_PATH), FILE_CONVERTER);
+        }
+    }
+
+    private static class KerberosDelegation
+            extends AbstractConnectionProperty<String, Boolean>
+    {
+        public KerberosDelegation()
+        {
+            super(PropertyName.KERBEROS_DELEGATION, Optional.of(false), isKerberosEnabled(), ALLOWED, BOOLEAN_CONVERTER);
+        }
+    }
+
+    private static class KerberosConstrainedDelegation
+            extends AbstractConnectionProperty<GSSCredential, GSSCredential>
+    {
+        public KerberosConstrainedDelegation()
+        {
+            super(PropertyName.KERBEROS_CONSTRAINED_DELEGATION, Optional.empty(), NOT_REQUIRED, validateKerberosWithDelegation(PropertyName.KERBEROS_CONSTRAINED_DELEGATION), GSSCredential.class::cast);
+        }
+    }
+
+    private static class AccessToken
+            extends AbstractConnectionProperty<String, String>
+    {
+        public AccessToken()
+        {
+            super(PropertyName.ACCESS_TOKEN, NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
+        }
+    }
+
+    private static class ExternalAuthentication
+            extends AbstractConnectionProperty<String, Boolean>
+    {
+        public ExternalAuthentication()
+        {
+            super(PropertyName.EXTERNAL_AUTHENTICATION, Optional.of(false), NOT_REQUIRED, ALLOWED, BOOLEAN_CONVERTER);
+        }
+    }
+
+    private static class ExternalAuthenticationRedirectHandlers
+            extends AbstractConnectionProperty<String, List<ExternalRedirectStrategy>>
+    {
+        private static final Splitter ENUM_SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings();
+
+        public ExternalAuthenticationRedirectHandlers()
+        {
+            super(
+                    PropertyName.EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS,
+                    Optional.of(singletonList(ExternalRedirectStrategy.OPEN)),
+                    NOT_REQUIRED,
+                    ALLOWED,
+                    ExternalAuthenticationRedirectHandlers::parse);
+        }
+
+        public static List<ExternalRedirectStrategy> parse(String value)
+        {
+            return stream(ENUM_SPLITTER.split(value))
+                    .map(ExternalRedirectStrategy::valueOf)
+                    .collect(toImmutableList());
+        }
+    }
+
+    private static class ExternalAuthenticationTimeout
+            extends AbstractConnectionProperty<String, Duration>
+    {
+        private static final Validator<Properties> VALIDATE_EXTERNAL_AUTHENTICATION_ENABLED = validator(
+                checkedPredicate(properties -> EXTERNAL_AUTHENTICATION.getValue(properties).orElse(false)),
+                format("Connection property %s requires %s to be enabled", PropertyName.EXTERNAL_AUTHENTICATION_TIMEOUT, PropertyName.EXTERNAL_AUTHENTICATION));
+
+        public ExternalAuthenticationTimeout()
+        {
+            super(PropertyName.EXTERNAL_AUTHENTICATION_TIMEOUT, NOT_REQUIRED, VALIDATE_EXTERNAL_AUTHENTICATION_ENABLED, Duration::valueOf);
+        }
+    }
+
+    private static class ExternalAuthenticationTokenCache
+            extends AbstractConnectionProperty<String, KnownTokenCache>
+    {
+        public ExternalAuthenticationTokenCache()
+        {
+            super(PropertyName.EXTERNAL_AUTHENTICATION_TOKEN_CACHE, Optional.of(KnownTokenCache.NONE), NOT_REQUIRED, ALLOWED, KnownTokenCache::valueOf);
+        }
+    }
+
+    private static class ExtraCredentials
+            extends AbstractConnectionProperty<String, Map<String, String>>
+    {
+        public ExtraCredentials()
+        {
+            super(PropertyName.EXTRA_CREDENTIALS, NOT_REQUIRED, ALLOWED, ExtraCredentials::parseExtraCredentials);
+        }
+
+        // Extra credentials consists of a list of credential name value pairs.
+        // E.g., `jdbc:trino://example.net:8080/?extraCredentials=abc:xyz;foo:bar` will create credentials `abc=xyz` and `foo=bar`
+        public static Map<String, String> parseExtraCredentials(String extraCredentialString)
+        {
+            return new MapPropertyParser(PropertyName.EXTRA_CREDENTIALS.toString()).parse(extraCredentialString);
+        }
+    }
+
+    private static class SessionProperties
+            extends AbstractConnectionProperty<String, Map<String, String>>
+    {
+        private static final Splitter NAME_PARTS_SPLITTER = Splitter.on('.');
+
+        public SessionProperties()
+        {
+            super(PropertyName.SESSION_PROPERTIES, NOT_REQUIRED, ALLOWED, SessionProperties::parseSessionProperties);
+        }
+
+        // Session properties consists of a list of session property name value pairs.
+        // E.g., `jdbc:trino://example.net:8080/?sessionProperties=abc:xyz;catalog.foo:bar` will create session properties `abc=xyz` and `catalog.foo=bar`
+        public static Map<String, String> parseSessionProperties(String sessionPropertiesString)
+        {
+            Map<String, String> sessionProperties = new MapPropertyParser(PropertyName.SESSION_PROPERTIES.toString()).parse(sessionPropertiesString);
+            for (String sessionPropertyName : sessionProperties.keySet()) {
+                checkArgument(NAME_PARTS_SPLITTER.splitToList(sessionPropertyName).size() <= 2, "Malformed session property name: %s", sessionPropertyName);
+            }
+            return sessionProperties;
+        }
+    }
+
+    private static class Source
+            extends AbstractConnectionProperty<String, String>
+    {
+        public Source()
+        {
+            super(PropertyName.SOURCE, NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
+        }
+    }
+
+    private static class Resolver
+            extends AbstractConnectionProperty<String, Class<? extends DnsResolver>>
+    {
+        public Resolver()
+        {
+            super(PropertyName.DNS_RESOLVER, NOT_REQUIRED, ALLOWED, Resolver::findByName);
+        }
+
+        public static Class<? extends DnsResolver> findByName(String name)
+        {
+            try {
+                return Class.forName(name).asSubclass(DnsResolver.class);
+            }
+            catch (ClassNotFoundException e) {
+                throw new RuntimeException("DNS resolver class not found: " + name, e);
+            }
+        }
+    }
+
+    private static class ResolverContext
+            extends AbstractConnectionProperty<String, String>
+    {
+        public ResolverContext()
+        {
+            super(PropertyName.DNS_RESOLVER_CONTEXT, NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
+        }
+    }
+
+    private static class HostnameInCertificate
+            extends AbstractConnectionProperty<String, String>
+    {
+        public HostnameInCertificate()
+        {
+            super(PropertyName.HOSTNAME_IN_CERTIFICATE, NOT_REQUIRED, SslVerification.validateFull(PropertyName.HOSTNAME_IN_CERTIFICATE), STRING_CONVERTER);
+        }
+    }
+
+    private static class TimeZone
+            extends AbstractConnectionProperty<String, ZoneId>
+    {
+        public TimeZone()
+        {
+            super(PropertyName.TIMEZONE, NOT_REQUIRED, ALLOWED, ZoneId::of);
+        }
+    }
+
+    private static class ExplicitPrepare
+            extends AbstractConnectionProperty<String, Boolean>
+    {
+        public ExplicitPrepare()
+        {
+            super(PropertyName.EXPLICIT_PREPARE, NOT_REQUIRED, ALLOWED, BOOLEAN_CONVERTER);
+        }
+    }
+
+    private static class MapPropertyParser
+    {
+        private static final CharMatcher PRINTABLE_ASCII = CharMatcher.inRange((char) 0x21, (char) 0x7E);
+        private static final Splitter MAP_ENTRIES_SPLITTER = Splitter.on(';');
+        private static final Splitter MAP_ENTRY_SPLITTER = Splitter.on(':');
+
+        private final String mapName;
+
+        private MapPropertyParser(String mapName)
+        {
+            this.mapName = requireNonNull(mapName, "mapName is null");
+        }
+
+        /**
+         * Parses map in a form: key1:value1;key2:value2
+         */
+        public Map<String, String> parse(String map)
+        {
+            return MAP_ENTRIES_SPLITTER.splitToList(map).stream()
+                    .map(this::parseEntry)
+                    .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
+        }
+
+        private Map.Entry<String, String> parseEntry(String credential)
+        {
+            List<String> keyValue = MAP_ENTRY_SPLITTER.limit(2).splitToList(credential);
+            checkArgument(keyValue.size() == 2, "Malformed %s: %s", mapName, credential);
+            String key = keyValue.get(0);
+            String value = keyValue.get(1);
+            checkArgument(!key.isEmpty(), "%s key is empty", mapName);
+            checkArgument(!value.isEmpty(), "%s key is empty", mapName);
+
+            checkArgument(PRINTABLE_ASCII.matchesAllOf(key), "%s key '%s' contains spaces or is not printable ASCII", mapName, key);
+            // do not log value as it may contain sensitive information
+            checkArgument(PRINTABLE_ASCII.matchesAllOf(value), "%s value for key '%s' contains spaces or is not printable ASCII", mapName, key);
+            return immutableEntry(key, value);
+        }
+    }
+}
diff --git a/client/trino-client/src/main/java/io/trino/client/uri/ConnectionProperty.java b/client/trino-client/src/main/java/io/trino/client/uri/ConnectionProperty.java
new file mode 100644
index 000000000000..6eb475a6ec5c
--- /dev/null
+++ b/client/trino-client/src/main/java/io/trino/client/uri/ConnectionProperty.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed 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 io.trino.client.uri;
+
+import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
+import java.util.Optional;
+import java.util.Properties;
+
+import static java.lang.String.format;
+
+interface ConnectionProperty<V, T>
+{
+    default String getKey()
+    {
+        return getPropertyName().toString();
+    }
+
+    PropertyName getPropertyName();
+
+    DriverPropertyInfo getDriverPropertyInfo(Properties properties);
+
+    boolean isRequired(Properties properties);
+
+    boolean isValid(Properties properties);
+
+    Optional<T> getValue(Properties properties)
+            throws SQLException;
+
+    default T getRequiredValue(Properties properties)
+            throws SQLException
+    {
+        return getValue(properties).orElseThrow(() ->
+                new SQLException(format("Connection property %s is required", getKey())));
+    }
+
+    Optional<T> getValueOrDefault(Properties properties, Optional<T> defaultValue)
+            throws SQLException;
+
+    void validate(Properties properties)
+            throws SQLException;
+}
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/KnownTokenCache.java b/client/trino-client/src/main/java/io/trino/client/uri/KnownTokenCache.java
similarity index 96%
rename from client/trino-jdbc/src/main/java/io/trino/jdbc/KnownTokenCache.java
rename to client/trino-client/src/main/java/io/trino/client/uri/KnownTokenCache.java
index 6c3dde57d8c7..c4ea61fa04e0 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/KnownTokenCache.java
+++ b/client/trino-client/src/main/java/io/trino/client/uri/KnownTokenCache.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.jdbc;
+package io.trino.client.uri;
 
 import io.trino.client.auth.external.KnownToken;
 
diff --git a/client/trino-client/src/main/java/io/trino/client/uri/PropertyName.java b/client/trino-client/src/main/java/io/trino/client/uri/PropertyName.java
new file mode 100644
index 000000000000..b03b0064aa92
--- /dev/null
+++ b/client/trino-client/src/main/java/io/trino/client/uri/PropertyName.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed 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 io.trino.client.uri;
+
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static java.util.Arrays.stream;
+import static java.util.function.Function.identity;
+
+public enum PropertyName
+{
+    USER("user"),
+    PASSWORD("password"),
+    SESSION_USER("sessionUser"),
+    ROLES("roles"),
+    SOCKS_PROXY("socksProxy"),
+    HTTP_PROXY("httpProxy"),
+    APPLICATION_NAME_PREFIX("applicationNamePrefix"),
+    DISABLE_COMPRESSION("disableCompression"),
+    ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS("assumeLiteralNamesInMetadataCallsForNonConformingClients"),
+    ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS("assumeLiteralUnderscoreInMetadataCallsForNonConformingClients"),
+    SSL("SSL"),
+    SSL_VERIFICATION("SSLVerification"),
+    SSL_KEY_STORE_PATH("SSLKeyStorePath"),
+    SSL_KEY_STORE_PASSWORD("SSLKeyStorePassword"),
+    SSL_KEY_STORE_TYPE("SSLKeyStoreType"),
+    SSL_TRUST_STORE_PATH("SSLTrustStorePath"),
+    SSL_TRUST_STORE_PASSWORD("SSLTrustStorePassword"),
+    SSL_TRUST_STORE_TYPE("SSLTrustStoreType"),
+    SSL_USE_SYSTEM_TRUST_STORE("SSLUseSystemTrustStore"),
+    KERBEROS_SERVICE_PRINCIPAL_PATTERN("KerberosServicePrincipalPattern"),
+    KERBEROS_REMOTE_SERVICE_NAME("KerberosRemoteServiceName"),
+    KERBEROS_USE_CANONICAL_HOSTNAME("KerberosUseCanonicalHostname"),
+    KERBEROS_PRINCIPAL("KerberosPrincipal"),
+    KERBEROS_CONFIG_PATH("KerberosConfigPath"),
+    KERBEROS_KEYTAB_PATH("KerberosKeytabPath"),
+    KERBEROS_CREDENTIAL_CACHE_PATH("KerberosCredentialCachePath"),
+    KERBEROS_DELEGATION("KerberosDelegation"),
+    KERBEROS_CONSTRAINED_DELEGATION("KerberosConstrainedDelegation"),
+    ACCESS_TOKEN("accessToken"),
+    EXTERNAL_AUTHENTICATION("externalAuthentication"),
+    EXTERNAL_AUTHENTICATION_TIMEOUT("externalAuthenticationTimeout"),
+    EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS("externalAuthenticationRedirectHandlers"),
+    EXTERNAL_AUTHENTICATION_TOKEN_CACHE("externalAuthenticationTokenCache"),
+    EXTRA_CREDENTIALS("extraCredentials"),
+    CLIENT_INFO("clientInfo"),
+    CLIENT_TAGS("clientTags"),
+    TRACE_TOKEN("traceToken"),
+    SESSION_PROPERTIES("sessionProperties"),
+    SOURCE("source"),
+    EXPLICIT_PREPARE("explicitPrepare"),
+    DNS_RESOLVER("dnsResolver"),
+    DNS_RESOLVER_CONTEXT("dnsResolverContext"),
+    HOSTNAME_IN_CERTIFICATE("hostnameInCertificate"),
+    TIMEZONE("timezone"),
+    // these two are not actual properties but parts of the path
+    CATALOG("catalog"),
+    SCHEMA("schema");
+
+    private final String key;
+
+    private static final Map<String, PropertyName> lookup = stream(values())
+            .collect(toImmutableMap(PropertyName::toString, identity()));
+
+    PropertyName(final String key)
+    {
+        this.key = key;
+    }
+
+    @Override
+    public String toString()
+    {
+        return key;
+    }
+
+    public static Optional<PropertyName> findByKey(String key)
+    {
+        return Optional.ofNullable(lookup.get(key));
+    }
+}
diff --git a/client/trino-client/src/main/java/io/trino/client/uri/RestrictedPropertyException.java b/client/trino-client/src/main/java/io/trino/client/uri/RestrictedPropertyException.java
new file mode 100644
index 000000000000..c033190ac99a
--- /dev/null
+++ b/client/trino-client/src/main/java/io/trino/client/uri/RestrictedPropertyException.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.client.uri;
+
+import java.sql.SQLException;
+
+public class RestrictedPropertyException
+        extends SQLException
+{
+    private final PropertyName name;
+
+    public RestrictedPropertyException(PropertyName name, String message)
+    {
+        super(message);
+        this.name = name;
+    }
+
+    public PropertyName getPropertyName()
+    {
+        return this.name;
+    }
+}
diff --git a/client/trino-client/src/main/java/io/trino/client/uri/TrinoUri.java b/client/trino-client/src/main/java/io/trino/client/uri/TrinoUri.java
new file mode 100644
index 000000000000..ba461c5192d7
--- /dev/null
+++ b/client/trino-client/src/main/java/io/trino/client/uri/TrinoUri.java
@@ -0,0 +1,1288 @@
+/*
+ * Licensed 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 io.trino.client.uri;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.net.HostAndPort;
+import io.trino.client.ClientException;
+import io.trino.client.ClientSelectedRole;
+import io.trino.client.DnsResolver;
+import io.trino.client.OkHttpUtil;
+import io.trino.client.auth.external.CompositeRedirectHandler;
+import io.trino.client.auth.external.ExternalAuthenticator;
+import io.trino.client.auth.external.ExternalRedirectStrategy;
+import io.trino.client.auth.external.HttpTokenPoller;
+import io.trino.client.auth.external.RedirectHandler;
+import io.trino.client.auth.external.TokenPoller;
+import okhttp3.OkHttpClient;
+import org.ietf.jgss.GSSCredential;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
+import java.time.Duration;
+import java.time.ZoneId;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static io.trino.client.KerberosUtil.defaultCredentialCachePath;
+import static io.trino.client.OkHttpUtil.basicAuth;
+import static io.trino.client.OkHttpUtil.setupAlternateHostnameVerification;
+import static io.trino.client.OkHttpUtil.setupCookieJar;
+import static io.trino.client.OkHttpUtil.setupHttpProxy;
+import static io.trino.client.OkHttpUtil.setupInsecureSsl;
+import static io.trino.client.OkHttpUtil.setupKerberos;
+import static io.trino.client.OkHttpUtil.setupSocksProxy;
+import static io.trino.client.OkHttpUtil.setupSsl;
+import static io.trino.client.OkHttpUtil.tokenAuth;
+import static io.trino.client.uri.ConnectionProperties.ACCESS_TOKEN;
+import static io.trino.client.uri.ConnectionProperties.APPLICATION_NAME_PREFIX;
+import static io.trino.client.uri.ConnectionProperties.ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS;
+import static io.trino.client.uri.ConnectionProperties.ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS;
+import static io.trino.client.uri.ConnectionProperties.CLIENT_INFO;
+import static io.trino.client.uri.ConnectionProperties.CLIENT_TAGS;
+import static io.trino.client.uri.ConnectionProperties.DISABLE_COMPRESSION;
+import static io.trino.client.uri.ConnectionProperties.DNS_RESOLVER;
+import static io.trino.client.uri.ConnectionProperties.DNS_RESOLVER_CONTEXT;
+import static io.trino.client.uri.ConnectionProperties.EXPLICIT_PREPARE;
+import static io.trino.client.uri.ConnectionProperties.EXTERNAL_AUTHENTICATION;
+import static io.trino.client.uri.ConnectionProperties.EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS;
+import static io.trino.client.uri.ConnectionProperties.EXTERNAL_AUTHENTICATION_TIMEOUT;
+import static io.trino.client.uri.ConnectionProperties.EXTERNAL_AUTHENTICATION_TOKEN_CACHE;
+import static io.trino.client.uri.ConnectionProperties.EXTRA_CREDENTIALS;
+import static io.trino.client.uri.ConnectionProperties.HOSTNAME_IN_CERTIFICATE;
+import static io.trino.client.uri.ConnectionProperties.HTTP_PROXY;
+import static io.trino.client.uri.ConnectionProperties.KERBEROS_CONFIG_PATH;
+import static io.trino.client.uri.ConnectionProperties.KERBEROS_CONSTRAINED_DELEGATION;
+import static io.trino.client.uri.ConnectionProperties.KERBEROS_CREDENTIAL_CACHE_PATH;
+import static io.trino.client.uri.ConnectionProperties.KERBEROS_DELEGATION;
+import static io.trino.client.uri.ConnectionProperties.KERBEROS_KEYTAB_PATH;
+import static io.trino.client.uri.ConnectionProperties.KERBEROS_PRINCIPAL;
+import static io.trino.client.uri.ConnectionProperties.KERBEROS_REMOTE_SERVICE_NAME;
+import static io.trino.client.uri.ConnectionProperties.KERBEROS_SERVICE_PRINCIPAL_PATTERN;
+import static io.trino.client.uri.ConnectionProperties.KERBEROS_USE_CANONICAL_HOSTNAME;
+import static io.trino.client.uri.ConnectionProperties.PASSWORD;
+import static io.trino.client.uri.ConnectionProperties.ROLES;
+import static io.trino.client.uri.ConnectionProperties.SESSION_PROPERTIES;
+import static io.trino.client.uri.ConnectionProperties.SESSION_USER;
+import static io.trino.client.uri.ConnectionProperties.SOCKS_PROXY;
+import static io.trino.client.uri.ConnectionProperties.SOURCE;
+import static io.trino.client.uri.ConnectionProperties.SSL;
+import static io.trino.client.uri.ConnectionProperties.SSL_KEY_STORE_PASSWORD;
+import static io.trino.client.uri.ConnectionProperties.SSL_KEY_STORE_PATH;
+import static io.trino.client.uri.ConnectionProperties.SSL_KEY_STORE_TYPE;
+import static io.trino.client.uri.ConnectionProperties.SSL_TRUST_STORE_PASSWORD;
+import static io.trino.client.uri.ConnectionProperties.SSL_TRUST_STORE_PATH;
+import static io.trino.client.uri.ConnectionProperties.SSL_TRUST_STORE_TYPE;
+import static io.trino.client.uri.ConnectionProperties.SSL_USE_SYSTEM_TRUST_STORE;
+import static io.trino.client.uri.ConnectionProperties.SSL_VERIFICATION;
+import static io.trino.client.uri.ConnectionProperties.SslVerificationMode;
+import static io.trino.client.uri.ConnectionProperties.SslVerificationMode.CA;
+import static io.trino.client.uri.ConnectionProperties.SslVerificationMode.FULL;
+import static io.trino.client.uri.ConnectionProperties.SslVerificationMode.NONE;
+import static io.trino.client.uri.ConnectionProperties.TIMEZONE;
+import static io.trino.client.uri.ConnectionProperties.TRACE_TOKEN;
+import static io.trino.client.uri.ConnectionProperties.USER;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Parses and extracts parameters from a Trino URL.
+ */
+public class TrinoUri
+{
+    private static final String URL_START = "trino:";
+
+    private static final Splitter QUERY_SPLITTER = Splitter.on('&').omitEmptyStrings();
+    private static final Splitter ARG_SPLITTER = Splitter.on('=').limit(2);
+    private static final AtomicReference<RedirectHandler> REDIRECT_HANDLER = new AtomicReference<>(null);
+    private final HostAndPort address;
+    private final URI uri;
+
+    private final Properties properties;
+
+    private Optional<String> user;
+    private Optional<String> password;
+    private Optional<String> sessionUser;
+    private Optional<Map<String, ClientSelectedRole>> roles;
+    private Optional<HostAndPort> socksProxy;
+    private Optional<HostAndPort> httpProxy;
+    private Optional<String> applicationNamePrefix;
+    private Optional<Boolean> disableCompression;
+    private Optional<Boolean> assumeLiteralNamesInMetadataCallsForNonConformingClients;
+    private Optional<Boolean> assumeLiteralUnderscoreInMetadataCallsForNonConformingClients;
+    private Optional<Boolean> ssl;
+    private Optional<SslVerificationMode> sslVerification;
+    private Optional<String> sslKeyStorePath;
+    private Optional<String> sslKeyStorePassword;
+    private Optional<String> sslKeyStoreType;
+    private Optional<String> sslTrustStorePath;
+    private Optional<String> sslTrustStorePassword;
+    private Optional<String> sslTrustStoreType;
+    private Optional<Boolean> sslUseSystemTrustStore;
+    private Optional<String> kerberosServicePrincipalPattern;
+    private Optional<String> kerberosRemoteServiceName;
+    private Optional<Boolean> kerberosUseCanonicalHostname;
+    private Optional<String> kerberosPrincipal;
+    private Optional<File> kerberosConfigPath;
+    private Optional<File> kerberosKeytabPath;
+    private Optional<File> kerberosCredentialCachePath;
+    private Optional<Boolean> kerberosDelegation;
+    private Optional<GSSCredential> kerberosConstrainedDelegation;
+    private Optional<String> accessToken;
+    private Optional<Boolean> externalAuthentication;
+    private Optional<io.airlift.units.Duration> externalAuthenticationTimeout;
+    private Optional<List<ExternalRedirectStrategy>> externalRedirectStrategies;
+    private Optional<KnownTokenCache> externalAuthenticationTokenCache;
+    private Optional<Map<String, String>> extraCredentials;
+    private Optional<String> hostnameInCertificate;
+    private Optional<ZoneId> timeZone;
+    private Optional<String> clientInfo;
+    private Optional<String> clientTags;
+    private Optional<String> traceToken;
+    private Optional<Map<String, String>> sessionProperties;
+    private Optional<String> source;
+    private Optional<Boolean> explicitPrepare;
+
+    private Optional<String> catalog = Optional.empty();
+    private Optional<String> schema = Optional.empty();
+    private final List<PropertyName> restrictedProperties;
+
+    private final boolean useSecureConnection;
+
+    private TrinoUri(
+            URI uri,
+            Optional<String> catalog,
+            Optional<String> schema,
+            List<PropertyName> restrictedProperties,
+            Optional<String> user,
+            Optional<String> password,
+            Optional<String> sessionUser,
+            Optional<Map<String, ClientSelectedRole>> roles,
+            Optional<HostAndPort> socksProxy,
+            Optional<HostAndPort> httpProxy,
+            Optional<String> applicationNamePrefix,
+            Optional<Boolean> disableCompression,
+            Optional<Boolean> assumeLiteralNamesInMetadataCallsForNonConformingClients,
+            Optional<Boolean> assumeLiteralUnderscoreInMetadataCallsForNonConformingClients,
+            Optional<Boolean> ssl,
+            Optional<SslVerificationMode> sslVerification,
+            Optional<String> sslKeyStorePath,
+            Optional<String> sslKeyStorePassword,
+            Optional<String> sslKeyStoreType,
+            Optional<String> sslTrustStorePath,
+            Optional<String> sslTrustStorePassword,
+            Optional<String> sslTrustStoreType,
+            Optional<Boolean> sslUseSystemTrustStore,
+            Optional<String> kerberosServicePrincipalPattern,
+            Optional<String> kerberosRemoteServiceName,
+            Optional<Boolean> kerberosUseCanonicalHostname,
+            Optional<String> kerberosPrincipal,
+            Optional<File> kerberosConfigPath,
+            Optional<File> kerberosKeytabPath,
+            Optional<File> kerberosCredentialCachePath,
+            Optional<Boolean> kerberosDelegation,
+            Optional<GSSCredential> kerberosConstrainedDelegation,
+            Optional<String> accessToken,
+            Optional<Boolean> externalAuthentication,
+            Optional<io.airlift.units.Duration> externalAuthenticationTimeout,
+            Optional<List<ExternalRedirectStrategy>> externalRedirectStrategies,
+            Optional<KnownTokenCache> externalAuthenticationTokenCache,
+            Optional<Map<String, String>> extraCredentials,
+            Optional<String> hostnameInCertificate,
+            Optional<ZoneId> timeZone,
+            Optional<String> clientInfo,
+            Optional<String> clientTags,
+            Optional<String> traceToken,
+            Optional<Map<String, String>> sessionProperties,
+            Optional<String> source,
+            Optional<Boolean> explicitPrepare)
+            throws SQLException
+    {
+        this.uri = requireNonNull(uri, "uri is null");
+        this.catalog = catalog;
+        this.schema = schema;
+        this.restrictedProperties = restrictedProperties;
+
+        Map<String, Object> urlParameters = parseParameters(uri.getQuery());
+        Properties urlProperties = new Properties();
+        urlProperties.putAll(urlParameters);
+
+        this.user = USER.getValueOrDefault(urlProperties, user);
+        this.password = PASSWORD.getValueOrDefault(urlProperties, password);
+        this.sessionUser = SESSION_USER.getValueOrDefault(urlProperties, sessionUser);
+        this.roles = ROLES.getValueOrDefault(urlProperties, roles);
+        this.socksProxy = SOCKS_PROXY.getValueOrDefault(urlProperties, socksProxy);
+        this.httpProxy = HTTP_PROXY.getValueOrDefault(urlProperties, httpProxy);
+        this.applicationNamePrefix = APPLICATION_NAME_PREFIX.getValueOrDefault(urlProperties, applicationNamePrefix);
+        this.disableCompression = DISABLE_COMPRESSION.getValueOrDefault(urlProperties, disableCompression);
+        this.assumeLiteralNamesInMetadataCallsForNonConformingClients = ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS.getValueOrDefault(urlProperties, assumeLiteralNamesInMetadataCallsForNonConformingClients);
+        this.assumeLiteralUnderscoreInMetadataCallsForNonConformingClients = ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS.getValueOrDefault(urlProperties, assumeLiteralUnderscoreInMetadataCallsForNonConformingClients);
+        this.ssl = SSL.getValueOrDefault(urlProperties, ssl);
+        this.sslVerification = SSL_VERIFICATION.getValueOrDefault(urlProperties, sslVerification);
+        this.sslKeyStorePath = SSL_KEY_STORE_PATH.getValueOrDefault(urlProperties, sslKeyStorePath);
+        this.sslKeyStorePassword = SSL_KEY_STORE_PASSWORD.getValueOrDefault(urlProperties, sslKeyStorePassword);
+        this.sslKeyStoreType = SSL_KEY_STORE_TYPE.getValueOrDefault(urlProperties, sslKeyStoreType);
+        this.sslTrustStorePath = SSL_TRUST_STORE_PATH.getValueOrDefault(urlProperties, sslTrustStorePath);
+        this.sslTrustStorePassword = SSL_TRUST_STORE_PASSWORD.getValueOrDefault(urlProperties, sslTrustStorePassword);
+        this.sslTrustStoreType = SSL_TRUST_STORE_TYPE.getValueOrDefault(urlProperties, sslTrustStoreType);
+        this.sslUseSystemTrustStore = SSL_USE_SYSTEM_TRUST_STORE.getValueOrDefault(urlProperties, sslUseSystemTrustStore);
+        this.kerberosServicePrincipalPattern = KERBEROS_SERVICE_PRINCIPAL_PATTERN.getValueOrDefault(urlProperties, kerberosServicePrincipalPattern);
+        this.kerberosRemoteServiceName = KERBEROS_REMOTE_SERVICE_NAME.getValueOrDefault(urlProperties, kerberosRemoteServiceName);
+        this.kerberosUseCanonicalHostname = KERBEROS_USE_CANONICAL_HOSTNAME.getValueOrDefault(urlProperties, kerberosUseCanonicalHostname);
+        this.kerberosPrincipal = KERBEROS_PRINCIPAL.getValueOrDefault(urlProperties, kerberosPrincipal);
+        this.kerberosConfigPath = KERBEROS_CONFIG_PATH.getValueOrDefault(urlProperties, kerberosConfigPath);
+        this.kerberosKeytabPath = KERBEROS_KEYTAB_PATH.getValueOrDefault(urlProperties, kerberosKeytabPath);
+        this.kerberosCredentialCachePath = KERBEROS_CREDENTIAL_CACHE_PATH.getValueOrDefault(urlProperties, kerberosCredentialCachePath);
+        this.kerberosDelegation = KERBEROS_DELEGATION.getValueOrDefault(urlProperties, kerberosDelegation);
+        this.kerberosConstrainedDelegation = KERBEROS_CONSTRAINED_DELEGATION.getValueOrDefault(urlProperties, kerberosConstrainedDelegation);
+        this.accessToken = ACCESS_TOKEN.getValueOrDefault(urlProperties, accessToken);
+        this.externalAuthentication = EXTERNAL_AUTHENTICATION.getValueOrDefault(urlProperties, externalAuthentication);
+        this.externalAuthenticationTimeout = EXTERNAL_AUTHENTICATION_TIMEOUT.getValueOrDefault(urlProperties, externalAuthenticationTimeout);
+        this.externalRedirectStrategies = EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS.getValueOrDefault(urlProperties, externalRedirectStrategies);
+        this.externalAuthenticationTokenCache = EXTERNAL_AUTHENTICATION_TOKEN_CACHE.getValueOrDefault(urlProperties, externalAuthenticationTokenCache);
+        this.extraCredentials = EXTRA_CREDENTIALS.getValueOrDefault(urlProperties, extraCredentials);
+        this.hostnameInCertificate = HOSTNAME_IN_CERTIFICATE.getValueOrDefault(urlProperties, hostnameInCertificate);
+        this.timeZone = TIMEZONE.getValueOrDefault(urlProperties, timeZone);
+        this.clientInfo = CLIENT_INFO.getValueOrDefault(urlProperties, clientInfo);
+        this.clientTags = CLIENT_TAGS.getValueOrDefault(urlProperties, clientTags);
+        this.traceToken = TRACE_TOKEN.getValueOrDefault(urlProperties, traceToken);
+        this.sessionProperties = SESSION_PROPERTIES.getValueOrDefault(urlProperties, sessionProperties);
+        this.source = SOURCE.getValueOrDefault(urlProperties, source);
+        this.explicitPrepare = EXPLICIT_PREPARE.getValueOrDefault(urlProperties, explicitPrepare);
+
+        properties = buildProperties();
+
+        // enable SSL by default for the trino schema and the standard port
+        useSecureConnection = SSL.getValue(properties).orElse(uri.getScheme().equals("https") || (uri.getScheme().equals("trino") && uri.getPort() == 443));
+        if (!password.orElse("").isEmpty()) {
+            if (!useSecureConnection) {
+                throw new SQLException("TLS/SSL required for authentication with username and password");
+            }
+        }
+        validateConnectionProperties(properties);
+
+        this.address = HostAndPort.fromParts(uri.getHost(), uri.getPort() == -1 ? (useSecureConnection ? 443 : 80) : uri.getPort());
+        initCatalogAndSchema();
+    }
+
+    private Properties buildProperties()
+    {
+        Properties properties = new Properties();
+        user.ifPresent(value -> properties.setProperty(PropertyName.USER.toString(), value));
+        password.ifPresent(value -> properties.setProperty(PropertyName.PASSWORD.toString(), value));
+        sessionUser.ifPresent(value -> properties.setProperty(PropertyName.SESSION_USER.toString(), value));
+        roles.ifPresent(value -> properties.setProperty(
+                PropertyName.ROLES.toString(),
+                value.entrySet().stream()
+                        .map(entry -> entry.getKey() + ":" + entry.getValue())
+                        .collect(Collectors.joining(";"))));
+        socksProxy.ifPresent(value -> properties.setProperty(PropertyName.SOCKS_PROXY.toString(), value.toString()));
+        httpProxy.ifPresent(value -> properties.setProperty(PropertyName.HTTP_PROXY.toString(), value.toString()));
+        applicationNamePrefix.ifPresent(value -> properties.setProperty(PropertyName.APPLICATION_NAME_PREFIX.toString(), value));
+        disableCompression.ifPresent(value -> properties.setProperty(PropertyName.DISABLE_COMPRESSION.toString(), Boolean.toString(value)));
+        assumeLiteralNamesInMetadataCallsForNonConformingClients.ifPresent(
+                value -> properties.setProperty(
+                        PropertyName.ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS.toString(),
+                        Boolean.toString(value)));
+        assumeLiteralUnderscoreInMetadataCallsForNonConformingClients.ifPresent(
+                value -> properties.setProperty(
+                        PropertyName.ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS.toString(),
+                        Boolean.toString(value)));
+        ssl.ifPresent(value -> properties.setProperty(PropertyName.SSL.toString(), Boolean.toString(value)));
+        sslVerification.ifPresent(value -> properties.setProperty(PropertyName.SSL_VERIFICATION.toString(), value.toString()));
+        sslKeyStoreType.ifPresent(value -> properties.setProperty(PropertyName.SSL_KEY_STORE_TYPE.toString(), value));
+        sslKeyStorePath.ifPresent(value -> properties.setProperty(PropertyName.SSL_KEY_STORE_PATH.toString(), value));
+        sslKeyStorePassword.ifPresent(value -> properties.setProperty(PropertyName.SSL_KEY_STORE_PASSWORD.toString(), value));
+        sslTrustStoreType.ifPresent(value -> properties.setProperty(PropertyName.SSL_TRUST_STORE_TYPE.toString(), value));
+        sslTrustStorePath.ifPresent(value -> properties.setProperty(PropertyName.SSL_TRUST_STORE_PATH.toString(), value));
+        sslTrustStorePassword.ifPresent(value -> properties.setProperty(PropertyName.SSL_TRUST_STORE_PASSWORD.toString(), value));
+        sslUseSystemTrustStore.ifPresent(value -> properties.setProperty(PropertyName.SSL_USE_SYSTEM_TRUST_STORE.toString(), Boolean.toString(value)));
+        kerberosServicePrincipalPattern.ifPresent(value -> properties.setProperty(PropertyName.KERBEROS_SERVICE_PRINCIPAL_PATTERN.toString(), value));
+        kerberosRemoteServiceName.ifPresent(value -> properties.setProperty(PropertyName.KERBEROS_REMOTE_SERVICE_NAME.toString(), value));
+        kerberosUseCanonicalHostname.ifPresent(value -> properties.setProperty(PropertyName.KERBEROS_USE_CANONICAL_HOSTNAME.toString(), Boolean.toString(value)));
+        kerberosPrincipal.ifPresent(value -> properties.setProperty(PropertyName.KERBEROS_PRINCIPAL.toString(), value));
+        kerberosConfigPath.ifPresent(value -> properties.setProperty(PropertyName.KERBEROS_CONFIG_PATH.toString(), value.getPath()));
+        kerberosKeytabPath.ifPresent(value -> properties.setProperty(PropertyName.KERBEROS_KEYTAB_PATH.toString(), value.getPath()));
+        kerberosCredentialCachePath.ifPresent(value -> properties.setProperty(PropertyName.KERBEROS_CREDENTIAL_CACHE_PATH.toString(), value.getPath()));
+        kerberosDelegation.ifPresent(value -> properties.setProperty(PropertyName.KERBEROS_DELEGATION.toString(), Boolean.toString(value)));
+        kerberosConstrainedDelegation.ifPresent(value -> properties.put(PropertyName.KERBEROS_CONSTRAINED_DELEGATION.toString(), value));
+        accessToken.ifPresent(value -> properties.setProperty(PropertyName.ACCESS_TOKEN.toString(), value));
+        externalAuthentication.ifPresent(value -> properties.setProperty(PropertyName.EXTERNAL_AUTHENTICATION.toString(), Boolean.toString(value)));
+        externalAuthenticationTimeout.ifPresent(value -> properties.setProperty(PropertyName.EXTERNAL_AUTHENTICATION_TIMEOUT.toString(), value.toString()));
+        externalRedirectStrategies.ifPresent(value ->
+                properties.setProperty(
+                        PropertyName.EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS.toString(),
+                        value.stream()
+                                .map(ExternalRedirectStrategy::toString)
+                                .collect(Collectors.joining(","))));
+        externalAuthenticationTokenCache.ifPresent(value -> properties.setProperty(PropertyName.EXTERNAL_AUTHENTICATION_TOKEN_CACHE.toString(), value.toString()));
+        extraCredentials.ifPresent(value ->
+                properties.setProperty(
+                        PropertyName.EXTRA_CREDENTIALS.toString(),
+                        value.entrySet().stream()
+                                .map(entry -> entry.getKey() + ":" + entry.getValue())
+                                .collect(Collectors.joining(";"))));
+        sessionProperties.ifPresent(value ->
+                properties.setProperty(
+                        PropertyName.SESSION_PROPERTIES.toString(),
+                        value.entrySet().stream()
+                                .map(entry -> entry.getKey() + ":" + entry.getValue())
+                                .collect(Collectors.joining(";"))));
+        hostnameInCertificate.ifPresent(value -> properties.setProperty(PropertyName.HOSTNAME_IN_CERTIFICATE.toString(), value));
+        timeZone.ifPresent(value -> properties.setProperty(PropertyName.TIMEZONE.toString(), value.getId()));
+        clientInfo.ifPresent(value -> properties.setProperty(PropertyName.CLIENT_INFO.toString(), value));
+        clientTags.ifPresent(value -> properties.setProperty(PropertyName.CLIENT_TAGS.toString(), value));
+        traceToken.ifPresent(value -> properties.setProperty(PropertyName.TRACE_TOKEN.toString(), value));
+        source.ifPresent(value -> properties.setProperty(PropertyName.SOURCE.toString(), value));
+        explicitPrepare.ifPresent(value -> properties.setProperty(PropertyName.EXPLICIT_PREPARE.toString(), value.toString()));
+        return properties;
+    }
+
+    protected TrinoUri(String url, Properties properties)
+            throws SQLException
+    {
+        this(parseDriverUrl(url), properties);
+    }
+
+    protected TrinoUri(URI uri, Properties driverProperties)
+            throws SQLException
+    {
+        this.restrictedProperties = Collections.emptyList();
+        this.uri = requireNonNull(uri, "uri is null");
+        properties = mergeConnectionProperties(uri, driverProperties);
+
+        validateConnectionProperties(properties);
+
+        this.user = USER.getValue(properties);
+        this.password = PASSWORD.getValue(properties);
+        this.sessionUser = SESSION_USER.getValue(properties);
+        this.roles = ROLES.getValue(properties);
+        this.socksProxy = SOCKS_PROXY.getValue(properties);
+        this.httpProxy = HTTP_PROXY.getValue(properties);
+        this.applicationNamePrefix = APPLICATION_NAME_PREFIX.getValue(properties);
+        this.disableCompression = DISABLE_COMPRESSION.getValue(properties);
+        this.assumeLiteralNamesInMetadataCallsForNonConformingClients = ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS.getValue(properties);
+        this.assumeLiteralUnderscoreInMetadataCallsForNonConformingClients = ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS.getValue(properties);
+        this.ssl = SSL.getValue(properties);
+        this.sslVerification = SSL_VERIFICATION.getValue(properties);
+        this.sslKeyStorePath = SSL_KEY_STORE_PATH.getValue(properties);
+        this.sslKeyStorePassword = SSL_KEY_STORE_PASSWORD.getValue(properties);
+        this.sslKeyStoreType = SSL_KEY_STORE_TYPE.getValue(properties);
+        this.sslTrustStorePath = SSL_TRUST_STORE_PATH.getValue(properties);
+        this.sslTrustStorePassword = SSL_TRUST_STORE_PASSWORD.getValue(properties);
+        this.sslTrustStoreType = SSL_TRUST_STORE_TYPE.getValue(properties);
+        this.sslUseSystemTrustStore = SSL_USE_SYSTEM_TRUST_STORE.getValue(properties);
+        this.kerberosServicePrincipalPattern = KERBEROS_SERVICE_PRINCIPAL_PATTERN.getValue(properties);
+        this.kerberosRemoteServiceName = KERBEROS_REMOTE_SERVICE_NAME.getValue(properties);
+        this.kerberosUseCanonicalHostname = KERBEROS_USE_CANONICAL_HOSTNAME.getValue(properties);
+        this.kerberosPrincipal = KERBEROS_PRINCIPAL.getValue(properties);
+        this.kerberosConfigPath = KERBEROS_CONFIG_PATH.getValue(properties);
+        this.kerberosKeytabPath = KERBEROS_KEYTAB_PATH.getValue(properties);
+        this.kerberosCredentialCachePath = KERBEROS_CREDENTIAL_CACHE_PATH.getValue(properties);
+        this.kerberosDelegation = KERBEROS_DELEGATION.getValue(properties);
+        this.kerberosConstrainedDelegation = KERBEROS_CONSTRAINED_DELEGATION.getValue(properties);
+        this.accessToken = ACCESS_TOKEN.getValue(properties);
+        this.externalAuthentication = EXTERNAL_AUTHENTICATION.getValue(properties);
+        this.externalAuthenticationTimeout = EXTERNAL_AUTHENTICATION_TIMEOUT.getValue(properties);
+        this.externalRedirectStrategies = EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS.getValue(properties);
+        this.externalAuthenticationTokenCache = EXTERNAL_AUTHENTICATION_TOKEN_CACHE.getValue(properties);
+        this.extraCredentials = EXTRA_CREDENTIALS.getValue(properties);
+        this.hostnameInCertificate = HOSTNAME_IN_CERTIFICATE.getValue(properties);
+        this.timeZone = TIMEZONE.getValue(properties);
+        this.clientInfo = CLIENT_INFO.getValue(properties);
+        this.clientTags = CLIENT_TAGS.getValue(properties);
+        this.traceToken = TRACE_TOKEN.getValue(properties);
+        this.sessionProperties = SESSION_PROPERTIES.getValue(properties);
+        this.source = SOURCE.getValue(properties);
+        this.explicitPrepare = EXPLICIT_PREPARE.getValue(properties);
+
+        // enable SSL by default for the trino schema and the standard port
+        useSecureConnection = ssl.orElse(uri.getScheme().equals("https") || (uri.getScheme().equals("trino") && uri.getPort() == 443));
+        address = HostAndPort.fromParts(uri.getHost(), uri.getPort() == -1 ? (useSecureConnection ? 443 : 80) : uri.getPort());
+
+        initCatalogAndSchema();
+    }
+
+    public static TrinoUri create(String url, Properties properties)
+            throws SQLException
+    {
+        return new TrinoUri(url, firstNonNull(properties, new Properties()));
+    }
+
+    public static TrinoUri create(URI uri, Properties properties)
+            throws SQLException
+    {
+        return new TrinoUri(uri, firstNonNull(properties, new Properties()));
+    }
+
+    public URI getUri()
+    {
+        return uri;
+    }
+
+    public Optional<String> getSchema()
+    {
+        return schema;
+    }
+
+    public Optional<String> getCatalog()
+    {
+        return catalog;
+    }
+
+    public URI getHttpUri()
+    {
+        return buildHttpUri();
+    }
+
+    public String getRequiredUser()
+            throws SQLException
+    {
+        return checkRequired(user, PropertyName.USER);
+    }
+
+    public static <T> T checkRequired(Optional<T> obj, PropertyName name)
+            throws SQLException
+    {
+        return obj.orElseThrow(() -> new SQLException(format("Connection property '%s' is required", name)));
+    }
+
+    public Optional<String> getUser()
+    {
+        return user;
+    }
+
+    public boolean hasPassword()
+    {
+        return password.isPresent();
+    }
+
+    public Optional<String> getSessionUser()
+    {
+        return sessionUser;
+    }
+
+    public Map<String, ClientSelectedRole> getRoles()
+    {
+        return roles.orElse(ImmutableMap.of());
+    }
+
+    public Optional<String> getApplicationNamePrefix()
+    {
+        return applicationNamePrefix;
+    }
+
+    public Map<String, String> getExtraCredentials()
+    {
+        return extraCredentials.orElse(ImmutableMap.of());
+    }
+
+    public Optional<String> getClientInfo()
+    {
+        return clientInfo;
+    }
+
+    public Optional<String> getClientTags()
+    {
+        return clientTags;
+    }
+
+    public Optional<String> getTraceToken()
+    {
+        return traceToken;
+    }
+
+    public Map<String, String> getSessionProperties()
+    {
+        return sessionProperties.orElse(ImmutableMap.of());
+    }
+
+    public Optional<String> getSource()
+    {
+        return source;
+    }
+
+    public Optional<Boolean> getExplicitPrepare()
+    {
+        return explicitPrepare;
+    }
+
+    public boolean isCompressionDisabled()
+    {
+        return disableCompression.orElse(false);
+    }
+
+    public boolean isAssumeLiteralNamesInMetadataCallsForNonConformingClients()
+    {
+        return assumeLiteralNamesInMetadataCallsForNonConformingClients.orElse(false);
+    }
+
+    public boolean isAssumeLiteralUnderscoreInMetadataCallsForNonConformingClients()
+    {
+        return assumeLiteralUnderscoreInMetadataCallsForNonConformingClients.orElse(false);
+    }
+
+    public ZoneId getTimeZone()
+    {
+        return timeZone.orElseGet(ZoneId::systemDefault);
+    }
+
+    public Properties getProperties()
+    {
+        return properties;
+    }
+
+    public static DriverPropertyInfo[] getPropertyInfo(String url, Properties info)
+    {
+        Properties properties = urlProperties(url, info);
+
+        return ConnectionProperties.allProperties().stream()
+                .filter(property -> property.isValid(properties))
+                .map(property -> property.getDriverPropertyInfo(properties))
+                .toArray(DriverPropertyInfo[]::new);
+    }
+
+    private static Properties urlProperties(String url, Properties info)
+    {
+        try {
+            return create(url, info).getProperties();
+        }
+        catch (SQLException e) {
+            return info;
+        }
+    }
+
+    public Consumer<OkHttpClient.Builder> getSetupSsl()
+    {
+        if (!useSecureConnection) {
+            return OkHttpUtil::setupInsecureSsl;
+        }
+        SslVerificationMode sslVerificationMode = sslVerification.orElse(FULL);
+        if (sslVerificationMode.equals(NONE)) {
+            return OkHttpUtil::setupInsecureSsl;
+        }
+        return builder -> setupSsl(
+                builder,
+                sslKeyStorePath,
+                sslKeyStorePassword,
+                sslKeyStoreType,
+                sslTrustStorePath,
+                sslTrustStorePassword,
+                sslTrustStoreType,
+                sslUseSystemTrustStore.orElse(false));
+    }
+
+    public void setupClient(OkHttpClient.Builder builder)
+            throws SQLException
+    {
+        try {
+            setupCookieJar(builder);
+            setupSocksProxy(builder, socksProxy);
+            setupHttpProxy(builder, httpProxy);
+
+            String password = this.password.orElse("");
+            if (!password.isEmpty()) {
+                if (!useSecureConnection) {
+                    throw new SQLException("TLS/SSL is required for authentication with username and password");
+                }
+                builder.addInterceptor(basicAuth(getRequiredUser(), password));
+            }
+
+            if (useSecureConnection) {
+                SslVerificationMode sslVerificationMode = sslVerification.orElse(FULL);
+                if (sslVerificationMode.equals(FULL) || sslVerificationMode.equals(CA)) {
+                    setupSsl(
+                            builder,
+                            sslKeyStorePath,
+                            sslKeyStorePassword,
+                            sslKeyStoreType,
+                            sslTrustStorePath,
+                            sslTrustStorePassword,
+                            sslTrustStoreType,
+                            sslUseSystemTrustStore.orElse(false));
+                }
+                if (sslVerificationMode.equals(FULL)) {
+                    HOSTNAME_IN_CERTIFICATE.getValue(properties).ifPresent(certHostname ->
+                            setupAlternateHostnameVerification(builder, certHostname));
+                }
+
+                if (sslVerificationMode.equals(CA)) {
+                    builder.hostnameVerifier((hostname, session) -> true);
+                }
+
+                if (sslVerificationMode.equals(NONE)) {
+                    setupInsecureSsl(builder);
+                }
+            }
+
+            if (kerberosRemoteServiceName.isPresent()) {
+                if (!useSecureConnection) {
+                    throw new SQLException("TLS/SSL is required for Kerberos authentication");
+                }
+                setupKerberos(
+                        builder,
+                        checkRequired(kerberosServicePrincipalPattern, PropertyName.KERBEROS_SERVICE_PRINCIPAL_PATTERN),
+                        checkRequired(kerberosRemoteServiceName, PropertyName.KERBEROS_REMOTE_SERVICE_NAME),
+                        checkRequired(kerberosUseCanonicalHostname, PropertyName.KERBEROS_USE_CANONICAL_HOSTNAME),
+                        kerberosPrincipal,
+                        kerberosConfigPath,
+                        kerberosKeytabPath,
+                        Optional.ofNullable(kerberosCredentialCachePath
+                                .orElseGet(() -> defaultCredentialCachePath().map(File::new).orElse(null))),
+                        kerberosDelegation.orElse(false),
+                        kerberosConstrainedDelegation);
+            }
+
+            if (accessToken.isPresent()) {
+                if (!useSecureConnection) {
+                    throw new SQLException("TLS/SSL required for authentication using an access token");
+                }
+                builder.addInterceptor(tokenAuth(accessToken.get()));
+            }
+
+            if (externalAuthentication.orElse(false)) {
+                if (!useSecureConnection) {
+                    throw new SQLException("TLS/SSL required for authentication using external authorization");
+                }
+
+                // create HTTP client that shares the same settings, but without the external authenticator
+                TokenPoller poller = new HttpTokenPoller(builder.build());
+
+                Duration timeout = externalAuthenticationTimeout
+                        .map(value -> Duration.ofMillis(value.toMillis()))
+                        .orElse(Duration.ofMinutes(2));
+
+                KnownTokenCache knownTokenCache = externalAuthenticationTokenCache.orElse(KnownTokenCache.NONE);
+
+                Optional<RedirectHandler> configuredHandler = externalRedirectStrategies
+                        .map(CompositeRedirectHandler::new)
+                        .map(RedirectHandler.class::cast);
+
+                RedirectHandler redirectHandler = Optional.ofNullable(REDIRECT_HANDLER.get())
+                        .orElseGet(() -> configuredHandler.orElseThrow(() -> new RuntimeException("External authentication redirect handler is not configured")));
+
+                ExternalAuthenticator authenticator = new ExternalAuthenticator(
+                        redirectHandler, poller, knownTokenCache.create(), timeout);
+
+                builder.authenticator(authenticator);
+                builder.addInterceptor(authenticator);
+            }
+
+            Optional<String> resolverContext = DNS_RESOLVER_CONTEXT.getValue(properties);
+            DNS_RESOLVER.getValue(properties).ifPresent(resolverClass -> builder.dns(instantiateDnsResolver(resolverClass, resolverContext)::lookup));
+        }
+        catch (ClientException e) {
+            throw new SQLException(e.getMessage(), e);
+        }
+        catch (RuntimeException e) {
+            throw new SQLException("Error setting up connection", e);
+        }
+    }
+
+    private static DnsResolver instantiateDnsResolver(Class<? extends DnsResolver> resolverClass, Optional<String> context)
+    {
+        try {
+            return resolverClass.getConstructor(String.class).newInstance(context.orElse(null));
+        }
+        catch (ReflectiveOperationException e) {
+            throw new ClientException("Unable to instantiate custom DNS resolver " + resolverClass.getName(), e);
+        }
+    }
+
+    private Map<String, Object> parseParameters(String query)
+            throws SQLException
+    {
+        Map<String, Object> result = new HashMap<>();
+
+        if (query == null) {
+            return result;
+        }
+
+        Iterable<String> queryArgs = QUERY_SPLITTER.split(query);
+        for (String queryArg : queryArgs) {
+            List<String> parts = ARG_SPLITTER.splitToList(queryArg);
+            if (parts.size() != 2) {
+                throw new SQLException(format("Connection argument is not a valid connection property: '%s'", queryArg));
+            }
+
+            String key = parts.get(0);
+            PropertyName name = PropertyName.findByKey(key).orElseThrow(() -> new SQLException(format("Unrecognized connection property '%s'", key)));
+            if (restrictedProperties.contains(name)) {
+                throw new RestrictedPropertyException(name, format("Connection property %s cannot be set in the URL", parts.get(0)));
+            }
+            if (result.put(parts.get(0), parts.get(1)) != null) {
+                throw new SQLException(format("Connection property %s is in the URL multiple times", parts.get(0)));
+            }
+        }
+
+        return result;
+    }
+
+    private static URI parseDriverUrl(String url)
+            throws SQLException
+    {
+        validatePrefix(url);
+        URI uri = parseUrl(url);
+
+        if (isNullOrEmpty(uri.getHost())) {
+            throw new SQLException("No host specified: " + url);
+        }
+        if (uri.getPort() == -1) {
+            throw new SQLException("No port number specified: " + url);
+        }
+        if ((uri.getPort() < 1) || (uri.getPort() > 65535)) {
+            throw new SQLException("Invalid port number: " + url);
+        }
+        return uri;
+    }
+
+    private static URI parseUrl(String url)
+            throws SQLException
+    {
+        try {
+            return new URI(url);
+        }
+        catch (URISyntaxException e) {
+            throw new SQLException("Invalid Trino URL: " + url, e);
+        }
+    }
+
+    private static void validatePrefix(String url)
+            throws SQLException
+    {
+        if (!url.startsWith(URL_START)) {
+            throw new SQLException("Invalid Trino URL: " + url);
+        }
+
+        if (url.equals(URL_START)) {
+            throw new SQLException("Empty Trino URL: " + url);
+        }
+    }
+
+    private URI buildHttpUri()
+    {
+        String scheme = useSecureConnection ? "https" : "http";
+        try {
+            return new URI(scheme, null, address.getHost(), address.getPort(), null, null, null);
+        }
+        catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void initCatalogAndSchema()
+            throws SQLException
+    {
+        String path = uri.getPath();
+        if (isNullOrEmpty(uri.getPath()) || path.equals("/")) {
+            return;
+        }
+
+        // remove first slash
+        if (!path.startsWith("/")) {
+            throw new SQLException("Path does not start with a slash: " + uri);
+        }
+        path = path.substring(1);
+
+        List<String> parts = Splitter.on("/").splitToList(path);
+        // remove last item due to a trailing slash
+        if (parts.get(parts.size() - 1).isEmpty()) {
+            parts = parts.subList(0, parts.size() - 1);
+        }
+
+        if (parts.size() > 2) {
+            throw new SQLException("Invalid path segments in URL: " + uri);
+        }
+
+        if (parts.get(0).isEmpty()) {
+            throw new SQLException("Catalog name is empty: " + uri);
+        }
+
+        if (catalog.isPresent()) {
+            throw new RestrictedPropertyException(PropertyName.CATALOG, "Catalog cannot be set in the URL");
+        }
+        catalog = Optional.ofNullable(parts.get(0));
+
+        if (parts.size() > 1) {
+            if (parts.get(1).isEmpty()) {
+                throw new SQLException("Schema name is empty: " + uri);
+            }
+
+            if (schema.isPresent()) {
+                throw new RestrictedPropertyException(PropertyName.SCHEMA, "Schema cannot be set in the URL");
+            }
+            schema = Optional.ofNullable(parts.get(1));
+        }
+    }
+
+    private Properties mergeConnectionProperties(URI uri, Properties driverProperties)
+            throws SQLException
+    {
+        Map<String, Object> urlProperties = parseParameters(uri.getQuery());
+        Map<String, Object> suppliedProperties = driverProperties.entrySet().stream()
+                .collect(toImmutableMap(entry -> (String) entry.getKey(), Entry::getValue));
+
+        for (String key : urlProperties.keySet()) {
+            if (suppliedProperties.containsKey(key)) {
+                throw new SQLException(format("Connection property %s is both in the URL and an argument", key));
+            }
+        }
+
+        Properties result = new Properties();
+        setProperties(result, suppliedProperties);
+        setProperties(result, urlProperties);
+        return result;
+    }
+
+    private static void setProperties(Properties properties, Map<String, Object> values)
+    {
+        properties.putAll(values);
+    }
+
+    private static void validateConnectionProperties(Properties connectionProperties)
+            throws SQLException
+    {
+        for (String propertyName : connectionProperties.stringPropertyNames()) {
+            if (ConnectionProperties.forKey(propertyName) == null) {
+                throw new SQLException(format("Unrecognized connection property '%s'", propertyName));
+            }
+        }
+
+        for (ConnectionProperty<?, ?> property : ConnectionProperties.allProperties()) {
+            property.validate(connectionProperties);
+        }
+    }
+
+    @VisibleForTesting
+    public static void setRedirectHandler(RedirectHandler handler)
+    {
+        REDIRECT_HANDLER.set(requireNonNull(handler, "handler is null"));
+    }
+
+    public static Builder builder()
+    {
+        return new Builder();
+    }
+
+    public static final class Builder
+    {
+        private URI uri;
+        private String catalog;
+        private String schema;
+        private List<PropertyName> restrictedProperties;
+        private String user;
+        private String password;
+        private String sessionUser;
+        private Map<String, ClientSelectedRole> roles;
+        private HostAndPort socksProxy;
+        private HostAndPort httpProxy;
+        private String applicationNamePrefix;
+        private Boolean disableCompression;
+        private Boolean assumeLiteralNamesInMetadataCallsForNonConformingClients;
+        private Boolean assumeLiteralUnderscoreInMetadataCallsForNonConformingClients;
+        private Boolean ssl;
+        private SslVerificationMode sslVerification;
+        private String sslKeyStorePath;
+        private String sslKeyStorePassword;
+        private String sslKeyStoreType;
+        private String sslTrustStorePath;
+        private String sslTrustStorePassword;
+        private String sslTrustStoreType;
+        private Boolean sslUseSystemTrustStore;
+        private String kerberosServicePrincipalPattern;
+        private String kerberosRemoteServiceName;
+        private Boolean kerberosUseCanonicalHostname;
+        private String kerberosPrincipal;
+        private File kerberosConfigPath;
+        private File kerberosKeytabPath;
+        private File kerberosCredentialCachePath;
+        private Boolean kerberosDelegation;
+        private GSSCredential kerberosConstrainedDelegation;
+        private String accessToken;
+        private Boolean externalAuthentication;
+        private io.airlift.units.Duration externalAuthenticationTimeout;
+        private List<ExternalRedirectStrategy> externalRedirectStrategies;
+        private KnownTokenCache externalAuthenticationTokenCache;
+        private Map<String, String> extraCredentials;
+        private String hostnameInCertificate;
+        private ZoneId timeZone;
+        private String clientInfo;
+        private String clientTags;
+        private String traceToken;
+        private Map<String, String> sessionProperties;
+        private String source;
+        private Boolean explicitPrepare;
+
+        private Builder() {}
+
+        public Builder setUri(URI uri)
+        {
+            this.uri = requireNonNull(uri, "uri is null");
+            return this;
+        }
+
+        public Builder setCatalog(String catalog)
+        {
+            this.catalog = requireNonNull(catalog, "catalog is null");
+            return this;
+        }
+
+        public Builder setSchema(String schema)
+        {
+            this.schema = requireNonNull(schema, "schema is null");
+            return this;
+        }
+
+        public Builder setRestrictedProperties(List<PropertyName> restrictedProperties)
+        {
+            this.restrictedProperties = requireNonNull(restrictedProperties, "restrictedProperties is null");
+            return this;
+        }
+
+        public Builder setUser(String user)
+        {
+            this.user = requireNonNull(user, "user is null");
+            return this;
+        }
+
+        public Builder setPassword(String password)
+        {
+            this.password = requireNonNull(password, "password is null");
+            return this;
+        }
+
+        public Builder setSessionUser(String sessionUser)
+        {
+            this.sessionUser = requireNonNull(sessionUser, "sessionUser is null");
+            return this;
+        }
+
+        public Builder setRoles(Map<String, ClientSelectedRole> roles)
+        {
+            this.roles = requireNonNull(roles, "roles is null");
+            return this;
+        }
+
+        public Builder setSocksProxy(HostAndPort socksProxy)
+        {
+            this.socksProxy = requireNonNull(socksProxy, "socksProxy is null");
+            return this;
+        }
+
+        public Builder setHttpProxy(HostAndPort httpProxy)
+        {
+            this.httpProxy = requireNonNull(httpProxy, "httpProxy is null");
+            return this;
+        }
+
+        public Builder setApplicationNamePrefix(String applicationNamePrefix)
+        {
+            this.applicationNamePrefix = requireNonNull(applicationNamePrefix, "applicationNamePrefix is null");
+            return this;
+        }
+
+        public Builder setDisableCompression(Boolean disableCompression)
+        {
+            this.disableCompression = requireNonNull(disableCompression, "disableCompression is null");
+            return this;
+        }
+
+        public Builder setAssumeLiteralNamesInMetadataCallsForNonConformingClients(Boolean assumeLiteralNamesInMetadataCallsForNonConformingClients)
+        {
+            this.assumeLiteralNamesInMetadataCallsForNonConformingClients = requireNonNull(assumeLiteralNamesInMetadataCallsForNonConformingClients, "assumeLiteralNamesInMetadataCallsForNonConformingClients is null");
+            return this;
+        }
+
+        public Builder setAssumeLiteralUnderscoreInMetadataCallsForNonConformingClients(Boolean assumeLiteralUnderscoreInMetadataCallsForNonConformingClients)
+        {
+            this.assumeLiteralUnderscoreInMetadataCallsForNonConformingClients = requireNonNull(assumeLiteralUnderscoreInMetadataCallsForNonConformingClients, "assumeLiteralUnderscoreInMetadataCallsForNonConformingClients is null");
+            return this;
+        }
+
+        public Builder setSsl(Boolean ssl)
+        {
+            this.ssl = requireNonNull(ssl, "ssl is null");
+            return this;
+        }
+
+        public Builder setSslVerificationNone()
+        {
+            this.sslVerification = NONE;
+            return this;
+        }
+
+        public Builder setSslKeyStorePath(String sslKeyStorePath)
+        {
+            this.sslKeyStorePath = requireNonNull(sslKeyStorePath, "sslKeyStorePath is null");
+            return this;
+        }
+
+        public Builder setSslKeyStorePassword(String sslKeyStorePassword)
+        {
+            this.sslKeyStorePassword = requireNonNull(sslKeyStorePassword, "sslKeyStorePassword is null");
+            return this;
+        }
+
+        public Builder setSslKeyStoreType(String sslKeyStoreType)
+        {
+            this.sslKeyStoreType = requireNonNull(sslKeyStoreType, "sslKeyStoreType is null");
+            return this;
+        }
+
+        public Builder setSslTrustStorePath(String sslTrustStorePath)
+        {
+            this.sslTrustStorePath = requireNonNull(sslTrustStorePath, "sslTrustStorePath is null");
+            return this;
+        }
+
+        public Builder setSslTrustStorePassword(String sslTrustStorePassword)
+        {
+            this.sslTrustStorePassword = requireNonNull(sslTrustStorePassword, "sslTrustStorePassword is null");
+            return this;
+        }
+
+        public Builder setSslTrustStoreType(String sslTrustStoreType)
+        {
+            this.sslTrustStoreType = requireNonNull(sslTrustStoreType, "sslTrustStoreType is null");
+            return this;
+        }
+
+        public Builder setSslUseSystemTrustStore(Boolean sslUseSystemTrustStore)
+        {
+            this.sslUseSystemTrustStore = requireNonNull(sslUseSystemTrustStore, "sslUseSystemTrustStore is null");
+            return this;
+        }
+
+        public Builder setKerberosServicePrincipalPattern(String kerberosServicePrincipalPattern)
+        {
+            this.kerberosServicePrincipalPattern = requireNonNull(kerberosServicePrincipalPattern, "kerberosServicePrincipalPattern is null");
+            return this;
+        }
+
+        public Builder setKerberosRemoveServiceName(String kerberosRemoteServiceName)
+        {
+            this.kerberosRemoteServiceName = requireNonNull(kerberosRemoteServiceName, "kerberosRemoteServiceName is null");
+            return this;
+        }
+
+        public Builder setKerberosUseCanonicalHostname(Boolean kerberosUseCanonicalHostname)
+        {
+            this.kerberosUseCanonicalHostname = requireNonNull(kerberosUseCanonicalHostname, "kerberosUseCanonicalHostname is null");
+            return this;
+        }
+
+        public Builder setKerberosPrincipal(String kerberosPrincipal)
+        {
+            this.kerberosPrincipal = requireNonNull(kerberosPrincipal, "kerberosPrincipal is null");
+            return this;
+        }
+
+        public Builder setKerberosConfigPath(String kerberosConfigPath)
+        {
+            return setKerberosConfigPath(new File(requireNonNull(kerberosConfigPath, "kerberosConfigPath is null")));
+        }
+
+        public Builder setKerberosConfigPath(File kerberosConfigPath)
+        {
+            this.kerberosConfigPath = requireNonNull(kerberosConfigPath, "kerberosConfigPath is null");
+            return this;
+        }
+
+        public Builder setKerberosKeytabPath(String kerberosKeytabPath)
+        {
+            return setKerberosKeytabPath(new File(requireNonNull(kerberosKeytabPath, "kerberosKeytabPath is null")));
+        }
+
+        public Builder setKerberosKeytabPath(File kerberosKeytabPath)
+        {
+            this.kerberosKeytabPath = requireNonNull(kerberosKeytabPath, "kerberosKeytabPath is null");
+            return this;
+        }
+
+        public Builder setKerberosCredentialCachePath(String kerberosCredentialCachePath)
+        {
+            return setKerberosCredentialCachePath(new File(requireNonNull(kerberosCredentialCachePath, "kerberosCredentialCachePath is null")));
+        }
+
+        public Builder setKerberosCredentialCachePath(File kerberosCredentialCachePath)
+        {
+            this.kerberosCredentialCachePath = requireNonNull(kerberosCredentialCachePath, "kerberosCredentialCachePath is null");
+            return this;
+        }
+
+        public Builder setKerberosDelegation(Boolean kerberosDelegation)
+        {
+            this.kerberosDelegation = requireNonNull(kerberosDelegation, "kerberosDelegation is null");
+            return this;
+        }
+
+        public Builder setKerberosConstrainedDelegation(GSSCredential kerberosConstrainedDelegation)
+        {
+            this.kerberosConstrainedDelegation = requireNonNull(kerberosConstrainedDelegation, "kerberosConstrainedDelegation is null");
+            return this;
+        }
+
+        public Builder setAccessToken(String accessToken)
+        {
+            this.accessToken = requireNonNull(accessToken, "accessToken is null");
+            return this;
+        }
+
+        public Builder setExternalAuthentication(Boolean externalAuthentication)
+        {
+            this.externalAuthentication = requireNonNull(externalAuthentication, "externalAuthentication is null");
+            return this;
+        }
+
+        public Builder setExternalAuthenticationTimeout(io.airlift.units.Duration externalAuthenticationTimeout)
+        {
+            this.externalAuthenticationTimeout = requireNonNull(externalAuthenticationTimeout, "externalAuthenticationTimeout is null");
+            return this;
+        }
+
+        public Builder setExternalRedirectStrategies(List<ExternalRedirectStrategy> externalRedirectStrategies)
+        {
+            this.externalRedirectStrategies = requireNonNull(externalRedirectStrategies, "externalRedirectStrategies is null");
+            return this;
+        }
+
+        public Builder setExternalAuthenticationTokenCache(KnownTokenCache externalAuthenticationTokenCache)
+        {
+            this.externalAuthenticationTokenCache = requireNonNull(externalAuthenticationTokenCache, "externalAuthenticationTokenCache is null");
+            return this;
+        }
+
+        public Builder setExtraCredentials(Map<String, String> extraCredentials)
+        {
+            this.extraCredentials = requireNonNull(extraCredentials, "extraCredentials is null");
+            return this;
+        }
+
+        public Builder setHostnameInCertificate(String hostnameInCertificate)
+        {
+            this.hostnameInCertificate = requireNonNull(hostnameInCertificate, "hostnameInCertificate is null");
+            return this;
+        }
+
+        public Builder setTimeZone(ZoneId timeZone)
+        {
+            this.timeZone = requireNonNull(timeZone, "timeZone is null");
+            return this;
+        }
+
+        public Builder setClientInfo(String clientInfo)
+        {
+            this.clientInfo = requireNonNull(clientInfo, "clientInfo is null");
+            return this;
+        }
+
+        public Builder setClientTags(String clientTags)
+        {
+            this.clientTags = requireNonNull(clientTags, "clientTags is null");
+            return this;
+        }
+
+        public Builder setTraceToken(String traceToken)
+        {
+            this.traceToken = requireNonNull(traceToken, "traceToken is null");
+            return this;
+        }
+
+        public Builder setSessionProperties(Map<String, String> sessionProperties)
+        {
+            this.sessionProperties = requireNonNull(sessionProperties, "sessionProperties is null");
+            return this;
+        }
+
+        public Builder setSource(String source)
+        {
+            this.source = requireNonNull(source, "source is null");
+            return this;
+        }
+
+        public Builder setExplicitPrepare(Boolean explicitPrepare)
+        {
+            this.explicitPrepare = requireNonNull(explicitPrepare, "explicitPrepare is null");
+            return this;
+        }
+
+        public TrinoUri build()
+                throws SQLException
+        {
+            return new TrinoUri(
+                    uri,
+                    Optional.ofNullable(catalog),
+                    Optional.ofNullable(schema),
+                    restrictedProperties,
+                    Optional.ofNullable(user),
+                    Optional.ofNullable(password),
+                    Optional.ofNullable(sessionUser),
+                    Optional.ofNullable(roles),
+                    Optional.ofNullable(socksProxy),
+                    Optional.ofNullable(httpProxy),
+                    Optional.ofNullable(applicationNamePrefix),
+                    Optional.ofNullable(disableCompression),
+                    Optional.ofNullable(assumeLiteralNamesInMetadataCallsForNonConformingClients),
+                    Optional.ofNullable(assumeLiteralUnderscoreInMetadataCallsForNonConformingClients),
+                    Optional.ofNullable(ssl),
+                    Optional.ofNullable(sslVerification),
+                    Optional.ofNullable(sslKeyStorePath),
+                    Optional.ofNullable(sslKeyStorePassword),
+                    Optional.ofNullable(sslKeyStoreType),
+                    Optional.ofNullable(sslTrustStorePath),
+                    Optional.ofNullable(sslTrustStorePassword),
+                    Optional.ofNullable(sslTrustStoreType),
+                    Optional.ofNullable(sslUseSystemTrustStore),
+                    Optional.ofNullable(kerberosServicePrincipalPattern),
+                    Optional.ofNullable(kerberosRemoteServiceName),
+                    Optional.ofNullable(kerberosUseCanonicalHostname),
+                    Optional.ofNullable(kerberosPrincipal),
+                    Optional.ofNullable(kerberosConfigPath),
+                    Optional.ofNullable(kerberosKeytabPath),
+                    Optional.ofNullable(kerberosCredentialCachePath),
+                    Optional.ofNullable(kerberosDelegation),
+                    Optional.ofNullable(kerberosConstrainedDelegation),
+                    Optional.ofNullable(accessToken),
+                    Optional.ofNullable(externalAuthentication),
+                    Optional.ofNullable(externalAuthenticationTimeout),
+                    Optional.ofNullable(externalRedirectStrategies),
+                    Optional.ofNullable(externalAuthenticationTokenCache),
+                    Optional.ofNullable(extraCredentials),
+                    Optional.ofNullable(hostnameInCertificate),
+                    Optional.ofNullable(timeZone),
+                    Optional.ofNullable(clientInfo),
+                    Optional.ofNullable(clientTags),
+                    Optional.ofNullable(traceToken),
+                    Optional.ofNullable(sessionProperties),
+                    Optional.ofNullable(source),
+                    Optional.ofNullable(explicitPrepare));
+        }
+    }
+}
diff --git a/client/trino-client/src/main/java/okhttp3/internal/tls/DistinguishedNameParser.java b/client/trino-client/src/main/java/okhttp3/internal/tls/DistinguishedNameParser.java
index b58507e616b3..fe993d989b12 100644
--- a/client/trino-client/src/main/java/okhttp3/internal/tls/DistinguishedNameParser.java
+++ b/client/trino-client/src/main/java/okhttp3/internal/tls/DistinguishedNameParser.java
@@ -164,7 +164,7 @@ private String hexAV()
                 break;
             }
             else if (chars[pos] >= 'A' && chars[pos] <= 'F') {
-                chars[pos] += 32; //to low case
+                chars[pos] += (char) 32; // to low case
             }
 
             pos++;
diff --git a/client/trino-client/src/test/java/io/trino/client/TestClientTypeSignature.java b/client/trino-client/src/test/java/io/trino/client/TestClientTypeSignature.java
index e1cd159dfffc..4a0a681100ce 100644
--- a/client/trino-client/src/test/java/io/trino/client/TestClientTypeSignature.java
+++ b/client/trino-client/src/test/java/io/trino/client/TestClientTypeSignature.java
@@ -18,7 +18,7 @@
 import io.airlift.json.JsonCodecFactory;
 import io.airlift.json.ObjectMapperProvider;
 import io.trino.spi.type.StandardTypes;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/client/trino-client/src/test/java/io/trino/client/TestFixJsonDataUtils.java b/client/trino-client/src/test/java/io/trino/client/TestFixJsonDataUtils.java
index a231fc5ad056..26c1b8cb7d8e 100644
--- a/client/trino-client/src/test/java/io/trino/client/TestFixJsonDataUtils.java
+++ b/client/trino-client/src/test/java/io/trino/client/TestFixJsonDataUtils.java
@@ -18,7 +18,7 @@
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.TypeSignatureParameter;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Base64;
 import java.util.List;
diff --git a/client/trino-client/src/test/java/io/trino/client/TestIntervalDayTime.java b/client/trino-client/src/test/java/io/trino/client/TestIntervalDayTime.java
index cbe533a5e302..f09b6ef58d51 100644
--- a/client/trino-client/src/test/java/io/trino/client/TestIntervalDayTime.java
+++ b/client/trino-client/src/test/java/io/trino/client/TestIntervalDayTime.java
@@ -13,7 +13,7 @@
  */
 package io.trino.client;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.client.IntervalDayTime.formatMillis;
 import static io.trino.client.IntervalDayTime.parseMillis;
diff --git a/client/trino-client/src/test/java/io/trino/client/TestIntervalYearMonth.java b/client/trino-client/src/test/java/io/trino/client/TestIntervalYearMonth.java
index 09cd219bd0a3..d67ed4989611 100644
--- a/client/trino-client/src/test/java/io/trino/client/TestIntervalYearMonth.java
+++ b/client/trino-client/src/test/java/io/trino/client/TestIntervalYearMonth.java
@@ -13,7 +13,7 @@
  */
 package io.trino.client;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.client.IntervalYearMonth.formatMonths;
 import static io.trino.client.IntervalYearMonth.parseMonths;
diff --git a/client/trino-client/src/test/java/io/trino/client/TestJsonCodec.java b/client/trino-client/src/test/java/io/trino/client/TestJsonCodec.java
index 9ecb5f5b13fa..9d62db41db50 100644
--- a/client/trino-client/src/test/java/io/trino/client/TestJsonCodec.java
+++ b/client/trino-client/src/test/java/io/trino/client/TestJsonCodec.java
@@ -14,7 +14,7 @@
 package io.trino.client;
 
 import com.fasterxml.jackson.core.JsonParseException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 
diff --git a/client/trino-client/src/test/java/io/trino/client/TestProtocolHeaders.java b/client/trino-client/src/test/java/io/trino/client/TestProtocolHeaders.java
index 12e06a82e834..014e63138b94 100644
--- a/client/trino-client/src/test/java/io/trino/client/TestProtocolHeaders.java
+++ b/client/trino-client/src/test/java/io/trino/client/TestProtocolHeaders.java
@@ -14,7 +14,7 @@
 package io.trino.client;
 
 import com.google.common.collect.ImmutableSet;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/client/trino-client/src/test/java/io/trino/client/TestQueryResults.java b/client/trino-client/src/test/java/io/trino/client/TestQueryResults.java
index 4d26f514edc1..0f77f0354291 100644
--- a/client/trino-client/src/test/java/io/trino/client/TestQueryResults.java
+++ b/client/trino-client/src/test/java/io/trino/client/TestQueryResults.java
@@ -13,53 +13,66 @@
  */
 package io.trino.client;
 
-import io.airlift.json.JsonCodec;
-import org.testng.annotations.Test;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.google.common.base.Strings;
+import org.junit.jupiter.api.Test;
 
-import static io.airlift.json.JsonCodec.jsonCodec;
+import static io.trino.client.JsonCodec.jsonCodec;
+import static java.lang.String.format;
 import static org.testng.Assert.assertEquals;
 
 public class TestQueryResults
 {
     private static final JsonCodec<QueryResults> QUERY_RESULTS_CODEC = jsonCodec(QueryResults.class);
 
+    private static final String GOLDEN_VALUE = "{\n" +
+            "  \"id\" : \"20160128_214710_00012_rk68b\",\n" +
+            "  \"infoUri\" : \"http://localhost:54855/query.html?20160128_214710_00012_rk68b\",\n" +
+            "  \"columns\" : [ {\n" +
+            "    \"name\" : \"_col0\",\n" +
+            "    \"type\" : \"bigint\",\n" +
+            "    \"typeSignature\" : {\n" +
+            "      \"rawType\" : \"varchar\",\n" +
+            "      \"typeArguments\" : [ ],\n" +
+            "      \"literalArguments\" : [ ],\n" +
+            "      \"arguments\" : [ ]\n" +
+            "    }\n" +
+            "  } ],\n" +
+            "  \"data\" : [ [ %s ] ],\n" +
+            "  \"stats\" : {\n" +
+            "    \"state\" : \"FINISHED\",\n" +
+            "    \"queued\" : false,\n" +
+            "    \"scheduled\" : false,\n" +
+            "    \"nodes\" : 0,\n" +
+            "    \"totalSplits\" : 0,\n" +
+            "    \"queuedSplits\" : 0,\n" +
+            "    \"runningSplits\" : 0,\n" +
+            "    \"completedSplits\" : 0,\n" +
+            "    \"cpuTimeMillis\" : 0,\n" +
+            "    \"wallTimeMillis\" : 0,\n" +
+            "    \"queuedTimeMillis\" : 0,\n" +
+            "    \"elapsedTimeMillis\" : 0,\n" +
+            "    \"processedRows\" : 0,\n" +
+            "    \"processedBytes\" : 0,\n" +
+            "    \"peakMemoryBytes\" : 0\n" +
+            "  }\n" +
+            "}";
+
     @Test
     public void testCompatibility()
+            throws JsonProcessingException
     {
-        String goldenValue = "{\n" +
-                "  \"id\" : \"20160128_214710_00012_rk68b\",\n" +
-                "  \"infoUri\" : \"http://localhost:54855/query.html?20160128_214710_00012_rk68b\",\n" +
-                "  \"columns\" : [ {\n" +
-                "    \"name\" : \"_col0\",\n" +
-                "    \"type\" : \"bigint\",\n" +
-                "    \"typeSignature\" : {\n" +
-                "      \"rawType\" : \"bigint\",\n" +
-                "      \"typeArguments\" : [ ],\n" +
-                "      \"literalArguments\" : [ ],\n" +
-                "      \"arguments\" : [ ]\n" +
-                "    }\n" +
-                "  } ],\n" +
-                "  \"data\" : [ [ 123 ] ],\n" +
-                "  \"stats\" : {\n" +
-                "    \"state\" : \"FINISHED\",\n" +
-                "    \"queued\" : false,\n" +
-                "    \"scheduled\" : false,\n" +
-                "    \"nodes\" : 0,\n" +
-                "    \"totalSplits\" : 0,\n" +
-                "    \"queuedSplits\" : 0,\n" +
-                "    \"runningSplits\" : 0,\n" +
-                "    \"completedSplits\" : 0,\n" +
-                "    \"cpuTimeMillis\" : 0,\n" +
-                "    \"wallTimeMillis\" : 0,\n" +
-                "    \"queuedTimeMillis\" : 0,\n" +
-                "    \"elapsedTimeMillis\" : 0,\n" +
-                "    \"processedRows\" : 0,\n" +
-                "    \"processedBytes\" : 0,\n" +
-                "    \"peakMemoryBytes\" : 0\n" +
-                "  }\n" +
-                "}";
+        QueryResults results = QUERY_RESULTS_CODEC.fromJson(format(GOLDEN_VALUE, "\"123\""));
+        assertEquals(results.getId(), "20160128_214710_00012_rk68b");
+    }
 
-        QueryResults results = QUERY_RESULTS_CODEC.fromJson(goldenValue);
+    @Test
+    public void testReadLongColumn()
+            throws JsonProcessingException
+    {
+        String longString = Strings.repeat("a", StreamReadConstraints.DEFAULT_MAX_STRING_LEN + 1);
+        QueryResults results = QUERY_RESULTS_CODEC.fromJson(format(GOLDEN_VALUE, '"' + longString + '"'));
         assertEquals(results.getId(), "20160128_214710_00012_rk68b");
     }
 }
diff --git a/client/trino-client/src/test/java/io/trino/client/TestRetry.java b/client/trino-client/src/test/java/io/trino/client/TestRetry.java
new file mode 100644
index 000000000000..852b02a3849a
--- /dev/null
+++ b/client/trino-client/src/test/java/io/trino/client/TestRetry.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed 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 io.trino.client;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.json.JsonCodec;
+import io.airlift.units.Duration;
+import okhttp3.OkHttpClient;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.SocketPolicy;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.io.IOException;
+import java.net.URI;
+import java.time.ZoneId;
+import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
+import static com.google.common.net.MediaType.JSON_UTF_8;
+import static io.airlift.json.JsonCodec.jsonCodec;
+import static io.trino.client.StatementClientFactory.newStatementClient;
+import static io.trino.spi.type.StandardTypes.INTEGER;
+import static io.trino.spi.type.StandardTypes.VARCHAR;
+import static java.lang.String.format;
+import static java.net.HttpURLConnection.HTTP_OK;
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
+import static org.testng.Assert.assertTrue;
+
+@TestInstance(PER_METHOD)
+public class TestRetry
+{
+    private MockWebServer server;
+    private static final JsonCodec<QueryResults> QUERY_RESULTS_CODEC = jsonCodec(QueryResults.class);
+
+    @BeforeEach
+    public void setup()
+            throws Exception
+    {
+        server = new MockWebServer();
+        server.start();
+    }
+
+    @AfterEach
+    public void teardown()
+            throws IOException
+    {
+        server.close();
+        server = null;
+    }
+
+    @Test
+    public void testRetryOnBrokenStream()
+    {
+        java.time.Duration timeout = java.time.Duration.ofMillis(100);
+        OkHttpClient httpClient = new OkHttpClient.Builder()
+                .connectTimeout(timeout)
+                .readTimeout(timeout)
+                .writeTimeout(timeout)
+                .callTimeout(timeout)
+                .build();
+        ClientSession session = ClientSession.builder()
+                .server(URI.create("http://" + server.getHostName() + ":" + server.getPort()))
+                .timeZone(ZoneId.of("UTC"))
+                .clientRequestTimeout(Duration.valueOf("2s"))
+                .build();
+
+        server.enqueue(statusAndBody(HTTP_OK, newQueryResults("RUNNING")));
+        server.enqueue(statusAndBody(HTTP_OK, newQueryResults("FINISHED"))
+                .setSocketPolicy(SocketPolicy.DISCONNECT_DURING_RESPONSE_BODY));
+        server.enqueue(statusAndBody(HTTP_OK, newQueryResults("FINISHED")));
+
+        try (StatementClient client = newStatementClient(httpClient, session, "SELECT 1", Optional.empty())) {
+            while (client.advance()) {
+                // consume all client data
+            }
+            assertTrue(client.isFinished());
+        }
+        assertThat(server.getRequestCount()).isEqualTo(3);
+    }
+
+    private String newQueryResults(String state)
+    {
+        String queryId = "20160128_214710_00012_rk68b";
+        int numRecords = 10;
+
+        QueryResults queryResults = new QueryResults(
+                queryId,
+                server.url("/query.html?" + queryId).uri(),
+                null,
+                state.equals("RUNNING") ? server.url(format("/v1/statement/%s/%s", queryId, "aa")).uri() : null,
+                Stream.of(new Column("id", INTEGER, new ClientTypeSignature("integer")),
+                                new Column("name", VARCHAR, new ClientTypeSignature("varchar")))
+                        .collect(toList()),
+                IntStream.range(0, numRecords)
+                        .mapToObj(index -> Stream.of((Object) index, "a").collect(toList()))
+                        .collect(toList()),
+                new StatementStats(state, state.equals("QUEUED"), true, OptionalDouble.of(0), OptionalDouble.of(0), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, null),
+                null,
+                ImmutableList.of(),
+                null,
+                null);
+
+        return QUERY_RESULTS_CODEC.toJson(queryResults);
+    }
+
+    private static MockResponse statusAndBody(int status, String body)
+    {
+        return new MockResponse()
+                .setResponseCode(status)
+                .addHeader(CONTENT_TYPE, JSON_UTF_8)
+                .setBody(body);
+    }
+}
diff --git a/client/trino-client/src/test/java/io/trino/client/TestServerInfo.java b/client/trino-client/src/test/java/io/trino/client/TestServerInfo.java
index 66390b162f0e..524196d6464b 100644
--- a/client/trino-client/src/test/java/io/trino/client/TestServerInfo.java
+++ b/client/trino-client/src/test/java/io/trino/client/TestServerInfo.java
@@ -15,7 +15,7 @@
 
 import io.airlift.json.JsonCodec;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/client/trino-client/src/test/java/io/trino/client/auth/external/TestExternalAuthentication.java b/client/trino-client/src/test/java/io/trino/client/auth/external/TestExternalAuthentication.java
index 9d81a5bf4499..7aa42b8cb95e 100644
--- a/client/trino-client/src/test/java/io/trino/client/auth/external/TestExternalAuthentication.java
+++ b/client/trino-client/src/test/java/io/trino/client/auth/external/TestExternalAuthentication.java
@@ -14,7 +14,7 @@
 package io.trino.client.auth.external;
 
 import io.trino.client.ClientException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/client/trino-client/src/test/java/io/trino/client/auth/external/TestExternalAuthenticator.java b/client/trino-client/src/test/java/io/trino/client/auth/external/TestExternalAuthenticator.java
index 99be93901378..b7daaa378dac 100644
--- a/client/trino-client/src/test/java/io/trino/client/auth/external/TestExternalAuthenticator.java
+++ b/client/trino-client/src/test/java/io/trino/client/auth/external/TestExternalAuthenticator.java
@@ -21,8 +21,10 @@
 import okhttp3.Response;
 import org.assertj.core.api.ListAssert;
 import org.assertj.core.api.ThrowableAssert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -51,13 +53,14 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestExternalAuthenticator
 {
     private static final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(TestExternalAuthenticator.class.getName() + "-%d"));
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void shutDownThreadPool()
     {
         executor.shutdownNow();
@@ -158,7 +161,8 @@ public void testReAuthenticationAfterRejectingToken()
                 .containsExactly("Bearer second-token");
     }
 
-    @Test(timeOut = 2000)
+    @Test
+    @Timeout(2)
     public void testAuthenticationFromMultipleThreadsWithLocallyStoredToken()
     {
         MockTokenPoller tokenPoller = new MockTokenPoller()
@@ -184,7 +188,8 @@ public void testAuthenticationFromMultipleThreadsWithLocallyStoredToken()
         assertThat(redirectHandler.getRedirectionCount()).isEqualTo(4);
     }
 
-    @Test(timeOut = 2000)
+    @Test
+    @Timeout(2)
     public void testAuthenticationFromMultipleThreadsWithCachedToken()
     {
         MockTokenPoller tokenPoller = new MockTokenPoller()
@@ -208,7 +213,8 @@ public void testAuthenticationFromMultipleThreadsWithCachedToken()
         assertThat(redirectHandler.getRedirectionCount()).isEqualTo(1);
     }
 
-    @Test(timeOut = 2000)
+    @Test
+    @Timeout(2)
     public void testAuthenticationFromMultipleThreadsWithCachedTokenAfterAuthenticateFails()
     {
         MockTokenPoller tokenPoller = new MockTokenPoller()
@@ -235,7 +241,8 @@ public void testAuthenticationFromMultipleThreadsWithCachedTokenAfterAuthenticat
         assertThat(redirectHandler.getRedirectionCount()).isEqualTo(2);
     }
 
-    @Test(timeOut = 2000)
+    @Test
+    @Timeout(2)
     public void testAuthenticationFromMultipleThreadsWithCachedTokenAfterAuthenticateTimesOut()
     {
         MockRedirectHandler redirectHandler = new MockRedirectHandler()
@@ -255,7 +262,8 @@ public void testAuthenticationFromMultipleThreadsWithCachedTokenAfterAuthenticat
         assertThat(redirectHandler.getRedirectionCount()).isEqualTo(1);
     }
 
-    @Test(timeOut = 2000)
+    @Test
+    @Timeout(2)
     public void testAuthenticationFromMultipleThreadsWithCachedTokenAfterAuthenticateIsInterrupted()
             throws Exception
     {
@@ -343,12 +351,12 @@ public ConcurrentRequestAssertion(List<Future<Request>> requests)
             }
         }
 
-        ThrowableAssert firstException()
+        ThrowableAssert<Throwable> firstException()
         {
             return exceptions.stream()
                     .findFirst()
                     .map(ThrowableAssert::new)
-                    .orElseGet(() -> new ThrowableAssert(() -> null));
+                    .orElseGet(() -> new ThrowableAssert<Throwable>(() -> null));
         }
 
         void assertThatNoExceptionsHasBeenThrown()
diff --git a/client/trino-client/src/test/java/io/trino/client/auth/external/TestHttpTokenPoller.java b/client/trino-client/src/test/java/io/trino/client/auth/external/TestHttpTokenPoller.java
index cc342201acc4..2d1bd130a186 100644
--- a/client/trino-client/src/test/java/io/trino/client/auth/external/TestHttpTokenPoller.java
+++ b/client/trino-client/src/test/java/io/trino/client/auth/external/TestHttpTokenPoller.java
@@ -18,9 +18,10 @@
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -37,8 +38,9 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestHttpTokenPoller
 {
     private static final String TOKEN_PATH = "/v1/authentications/sso/test/token";
@@ -47,7 +49,7 @@ public class TestHttpTokenPoller
     private TokenPoller tokenPoller;
     private MockWebServer server;
 
-    @BeforeMethod(alwaysRun = true)
+    @BeforeEach
     public void setup()
             throws Exception
     {
@@ -59,7 +61,7 @@ public void setup()
                 .build());
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void teardown()
             throws IOException
     {
diff --git a/client/trino-client/src/test/java/io/trino/client/uri/TestTrinoUri.java b/client/trino-client/src/test/java/io/trino/client/uri/TestTrinoUri.java
new file mode 100644
index 000000000000..860f6be08bc9
--- /dev/null
+++ b/client/trino-client/src/test/java/io/trino/client/uri/TestTrinoUri.java
@@ -0,0 +1,446 @@
+/*
+ * Licensed 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 io.trino.client.uri;
+
+import org.junit.jupiter.api.Test;
+
+import java.net.URI;
+import java.sql.SQLException;
+import java.util.Properties;
+
+import static io.trino.client.uri.ConnectionProperties.SslVerificationMode.CA;
+import static io.trino.client.uri.ConnectionProperties.SslVerificationMode.FULL;
+import static io.trino.client.uri.ConnectionProperties.SslVerificationMode.NONE;
+import static io.trino.client.uri.PropertyName.CLIENT_TAGS;
+import static io.trino.client.uri.PropertyName.DISABLE_COMPRESSION;
+import static io.trino.client.uri.PropertyName.EXTRA_CREDENTIALS;
+import static io.trino.client.uri.PropertyName.HTTP_PROXY;
+import static io.trino.client.uri.PropertyName.SOCKS_PROXY;
+import static io.trino.client.uri.PropertyName.SSL_TRUST_STORE_PASSWORD;
+import static io.trino.client.uri.PropertyName.SSL_TRUST_STORE_PATH;
+import static io.trino.client.uri.PropertyName.SSL_TRUST_STORE_TYPE;
+import static io.trino.client.uri.PropertyName.SSL_USE_SYSTEM_TRUST_STORE;
+import static io.trino.client.uri.PropertyName.SSL_VERIFICATION;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
+public class TestTrinoUri
+{
+    @Test
+    public void testInvalidUrls()
+    {
+        // missing trino: prefix
+        assertInvalid("test", "Invalid Trino URL: test");
+
+        // empty trino: url
+        assertInvalid("trino:", "Empty Trino URL: trino:");
+
+        // invalid scheme
+        assertInvalid("mysql://localhost", "Invalid Trino URL: mysql://localhost");
+
+        // missing port
+        assertInvalid("trino://localhost/", "No port number specified:");
+
+        // extra path segments
+        assertInvalid("trino://localhost:8080/hive/default/abc", "Invalid path segments in URL:");
+
+        // extra slash
+        assertInvalid("trino://localhost:8080//", "Catalog name is empty:");
+
+        // has schema but is missing catalog
+        assertInvalid("trino://localhost:8080//default", "Catalog name is empty:");
+
+        // has catalog but schema is missing
+        assertInvalid("trino://localhost:8080/a//", "Schema name is empty:");
+
+        // unrecognized property
+        assertInvalid("trino://localhost:8080/hive/default?ShoeSize=13", "Unrecognized connection property 'ShoeSize'");
+
+        // empty property
+        assertInvalid("trino://localhost:8080/hive/default?SSL=", "Connection property SSL value is empty");
+
+        // empty ssl verification property
+        assertInvalid("trino://localhost:8080/hive/default?SSL=true&SSLVerification=", "Connection property SSLVerification value is empty");
+
+        // property in url multiple times
+        assertInvalid("trino://localhost:8080/blackhole?password=a&password=b", "Connection property password is in the URL multiple times");
+
+        // property not well formed, missing '='
+        assertInvalid("trino://localhost:8080/blackhole?password&user=abc", "Connection argument is not a valid connection property: 'password'");
+
+        // property in both url and arguments
+        assertInvalid("trino://localhost:8080/blackhole?user=test123", "Connection property user is both in the URL and an argument");
+
+        // setting both socks and http proxy
+        assertInvalid("trino://localhost:8080?socksProxy=localhost:1080&httpProxy=localhost:8888", "Connection property socksProxy cannot be used when httpProxy is set");
+        assertInvalid("trino://localhost:8080?httpProxy=localhost:8888&socksProxy=localhost:1080", "Connection property socksProxy cannot be used when httpProxy is set");
+
+        // invalid ssl flag
+        assertInvalid("trino://localhost:8080?SSL=0", "Connection property SSL value is invalid: 0");
+        assertInvalid("trino://localhost:8080?SSL=1", "Connection property SSL value is invalid: 1");
+        assertInvalid("trino://localhost:8080?SSL=2", "Connection property SSL value is invalid: 2");
+        assertInvalid("trino://localhost:8080?SSL=abc", "Connection property SSL value is invalid: abc");
+
+        //invalid ssl verification mode
+        assertInvalid("trino://localhost:8080?SSL=true&SSLVerification=0", "Connection property SSLVerification value is invalid: 0");
+        assertInvalid("trino://localhost:8080?SSL=true&SSLVerification=abc", "Connection property SSLVerification value is invalid: abc");
+
+        // ssl verification without ssl
+        assertInvalid("trino://localhost:8080?SSLVerification=FULL", "Connection property SSLVerification requires TLS/SSL to be enabled");
+
+        // ssl verification using port 443 without ssl
+        assertInvalid("trino://localhost:443?SSLVerification=FULL", "Connection property SSLVerification requires TLS/SSL to be enabled");
+
+        // ssl key store password without path
+        assertInvalid("trino://localhost:8080?SSL=true&SSLKeyStorePassword=password", "Connection property SSLKeyStorePassword requires SSLKeyStorePath to be set");
+
+        // ssl key store type without path
+        assertInvalid("trino://localhost:8080?SSL=true&SSLKeyStoreType=type", "Connection property SSLKeyStoreType requires SSLKeyStorePath to be set");
+
+        // ssl trust store password without path
+        assertInvalid("trino://localhost:8080?SSL=true&SSLTrustStorePassword=password", "Connection property SSLTrustStorePassword requires SSLTrustStorePath to be set");
+
+        // ssl trust store type without path
+        assertInvalid("trino://localhost:8080?SSL=true&SSLTrustStoreType=type", "Connection property SSLTrustStoreType requires SSLTrustStorePath to be set or SSLUseSystemTrustStore to be enabled");
+
+        // key store path without ssl
+        assertInvalid("trino://localhost:8080?SSLKeyStorePath=keystore.jks", "Connection property SSLKeyStorePath cannot be set if SSLVerification is set to NONE");
+
+        // key store path using port 443 without ssl
+        assertInvalid("trino://localhost:443?SSLKeyStorePath=keystore.jks", "Connection property SSLKeyStorePath cannot be set if SSLVerification is set to NONE");
+
+        // trust store path without ssl
+        assertInvalid("trino://localhost:8080?SSLTrustStorePath=truststore.jks", "Connection property SSLTrustStorePath cannot be set if SSLVerification is set to NONE");
+
+        // trust store path using port 443 without ssl
+        assertInvalid("trino://localhost:443?SSLTrustStorePath=truststore.jks", "Connection property SSLTrustStorePath cannot be set if SSLVerification is set to NONE");
+
+        // key store password without ssl
+        assertInvalid("trino://localhost:8080?SSLKeyStorePassword=password", "Connection property SSLKeyStorePassword requires SSLKeyStorePath to be set");
+
+        // trust store password without ssl
+        assertInvalid("trino://localhost:8080?SSLTrustStorePassword=password", "Connection property SSLTrustStorePassword requires SSLTrustStorePath to be set");
+
+        // key store path with ssl verification mode NONE
+        assertInvalid("trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLKeyStorePath=keystore.jks", "Connection property SSLKeyStorePath cannot be set if SSLVerification is set to NONE");
+
+        // ssl key store password with ssl verification mode NONE
+        assertInvalid("trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLKeyStorePassword=password", "Connection property SSLKeyStorePassword requires SSLKeyStorePath to be set");
+
+        // ssl key store type with ssl verification mode NONE
+        assertInvalid("trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLKeyStoreType=type", "Connection property SSLKeyStoreType requires SSLKeyStorePath to be set");
+
+        // trust store path with ssl verification mode NONE
+        assertInvalid("trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLTrustStorePath=truststore.jks", "Connection property SSLTrustStorePath cannot be set if SSLVerification is set to NONE");
+
+        // ssl trust store password with ssl verification mode NONE
+        assertInvalid("trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLTrustStorePassword=password", "Connection property SSLTrustStorePassword requires SSLTrustStorePath to be set");
+
+        // key store path with ssl verification mode NONE
+        assertInvalid("trino://localhost:8080?SSLKeyStorePath=keystore.jks", "Connection property SSLKeyStorePath cannot be set if SSLVerification is set to NONE");
+
+        // use system trust store with ssl verification mode NONE
+        assertInvalid("trino://localhost:8080?SSLUseSystemTrustStore=true", "Connection property SSLUseSystemTrustStore cannot be set if SSLVerification is set to NONE");
+
+        // use system trust store with key store path
+        assertInvalid("trino://localhost:8080?SSL=true&SSLUseSystemTrustStore=true&SSLTrustStorePath=truststore.jks", "Connection property SSLTrustStorePath cannot be set if SSLUseSystemTrustStore is enabled");
+
+        // kerberos config without service name
+        assertInvalid("trino://localhost:8080?KerberosCredentialCachePath=/test", "Connection property KerberosCredentialCachePath requires KerberosRemoteServiceName to be set");
+
+        // kerberos config with delegated kerberos
+        assertInvalid("trino://localhost:8080?KerberosRemoteServiceName=test&KerberosDelegation=true&KerberosCredentialCachePath=/test", "Connection property KerberosCredentialCachePath cannot be set if KerberosDelegation is enabled");
+
+        // invalid extra credentials
+        assertInvalid("trino://localhost:8080?extraCredentials=:invalid", "Connection property extraCredentials value is invalid:");
+        assertInvalid("trino://localhost:8080?extraCredentials=invalid:", "Connection property extraCredentials value is invalid:");
+        assertInvalid("trino://localhost:8080?extraCredentials=:invalid", "Connection property extraCredentials value is invalid:");
+
+        // duplicate credential keys
+        assertInvalid("trino://localhost:8080?extraCredentials=test.token.foo:bar;test.token.foo:xyz", "Connection property extraCredentials value is invalid");
+
+        // empty extra credentials
+        assertInvalid("trino://localhost:8080?extraCredentials=", "Connection property extraCredentials value is empty");
+
+        // legacy url
+        assertInvalid("presto://localhost:8080", "Invalid Trino URL: presto://localhost:8080");
+
+        // cannot set mutually exclusive properties for non-conforming clients to true
+        assertInvalid("trino://localhost:8080?assumeLiteralNamesInMetadataCallsForNonConformingClients=true&assumeLiteralUnderscoreInMetadataCallsForNonConformingClients=true",
+                "Connection property assumeLiteralNamesInMetadataCallsForNonConformingClients cannot be set if assumeLiteralUnderscoreInMetadataCallsForNonConformingClients is enabled");
+    }
+
+    @Test
+    public void testEmptyUser()
+    {
+        assertThatThrownBy(() -> TrinoUri.create("trino://localhost:8080?user=", new Properties()))
+                .isInstanceOf(SQLException.class)
+                .hasMessage("Connection property user value is empty");
+    }
+
+    @Test
+    public void testEmptyPassword()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080?password=");
+        assertEquals(parameters.getProperties().getProperty("password"), "");
+    }
+
+    @Test
+    public void testNonEmptyPassword()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080?password=secret");
+        assertEquals(parameters.getProperties().getProperty("password"), "secret");
+    }
+
+    @Test
+    public void testUriWithSocksProxy()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080?socksProxy=localhost:1234");
+        assertUriPortScheme(parameters, 8080, "http");
+
+        Properties properties = parameters.getProperties();
+        assertEquals(properties.getProperty(SOCKS_PROXY.toString()), "localhost:1234");
+    }
+
+    @Test
+    public void testUriWithHttpProxy()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080?httpProxy=localhost:5678");
+        assertUriPortScheme(parameters, 8080, "http");
+
+        Properties properties = parameters.getProperties();
+        assertEquals(properties.getProperty(HTTP_PROXY.toString()), "localhost:5678");
+    }
+
+    @Test
+    public void testUriWithoutCompression()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080?disableCompression=true");
+        assertTrue(parameters.isCompressionDisabled());
+
+        Properties properties = parameters.getProperties();
+        assertEquals(properties.getProperty(DISABLE_COMPRESSION.toString()), "true");
+    }
+
+    @Test
+    public void testUriWithoutSsl()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080/blackhole");
+        assertUriPortScheme(parameters, 8080, "http");
+    }
+
+    @Test
+    public void testUriWithSslDisabled()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080/blackhole?SSL=false");
+        assertUriPortScheme(parameters, 8080, "http");
+    }
+
+    @Test
+    public void testUriWithSslEnabled()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080/blackhole?SSL=true");
+        assertUriPortScheme(parameters, 8080, "https");
+
+        Properties properties = parameters.getProperties();
+        assertNull(properties.getProperty(SSL_TRUST_STORE_PATH.toString()));
+        assertNull(properties.getProperty(SSL_TRUST_STORE_PASSWORD.toString()));
+    }
+
+    @Test
+    public void testUriWithSslDisabledUsing443()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:443/blackhole?SSL=false");
+        assertUriPortScheme(parameters, 443, "http");
+    }
+
+    @Test
+    public void testUriWithSslEnabledUsing443()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:443/blackhole");
+        assertUriPortScheme(parameters, 443, "https");
+    }
+
+    @Test
+    public void testUriWithSslEnabledPathOnly()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080/blackhole?SSL=true&SSLTrustStorePath=truststore.jks");
+        assertUriPortScheme(parameters, 8080, "https");
+
+        Properties properties = parameters.getProperties();
+        assertEquals(properties.getProperty(SSL_TRUST_STORE_PATH.toString()), "truststore.jks");
+        assertNull(properties.getProperty(SSL_TRUST_STORE_PASSWORD.toString()));
+    }
+
+    @Test
+    public void testUriWithSslEnabledPassword()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080/blackhole?SSL=true&SSLTrustStorePath=truststore.jks&SSLTrustStorePassword=password");
+        assertUriPortScheme(parameters, 8080, "https");
+
+        Properties properties = parameters.getProperties();
+        assertEquals(properties.getProperty(SSL_TRUST_STORE_PATH.toString()), "truststore.jks");
+        assertEquals(properties.getProperty(SSL_TRUST_STORE_PASSWORD.toString()), "password");
+    }
+
+    @Test
+    public void testUriWithSslEnabledUsing443SslVerificationFull()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:443/blackhole?SSL=true&SSLVerification=FULL");
+        assertUriPortScheme(parameters, 443, "https");
+
+        Properties properties = parameters.getProperties();
+        assertEquals(properties.getProperty(SSL_VERIFICATION.toString()), FULL.name());
+    }
+
+    @Test
+    public void testUriWithSslEnabledUsing443SslVerificationCA()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:443/blackhole?SSL=true&SSLVerification=CA");
+        assertUriPortScheme(parameters, 443, "https");
+
+        Properties properties = parameters.getProperties();
+        assertEquals(properties.getProperty(SSL_VERIFICATION.toString()), CA.name());
+    }
+
+    @Test
+    public void testUriWithSslEnabledUsing443SslVerificationNONE()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:443/blackhole?SSL=true&SSLVerification=NONE");
+        assertUriPortScheme(parameters, 443, "https");
+
+        Properties properties = parameters.getProperties();
+        assertEquals(properties.getProperty(SSL_VERIFICATION.toString()), NONE.name());
+    }
+
+    @Test
+    public void testUriWithSslEnabledSystemTrustStoreDefault()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080/blackhole?SSL=true&SSLUseSystemTrustStore=true");
+        assertUriPortScheme(parameters, 8080, "https");
+
+        Properties properties = parameters.getProperties();
+        assertEquals(properties.getProperty(SSL_USE_SYSTEM_TRUST_STORE.toString()), "true");
+    }
+
+    @Test
+    public void testUriWithSslEnabledSystemTrustStoreOverride()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080/blackhole?SSL=true&SSLTrustStoreType=Override&SSLUseSystemTrustStore=true");
+        assertUriPortScheme(parameters, 8080, "https");
+
+        Properties properties = parameters.getProperties();
+        assertEquals(properties.getProperty(SSL_TRUST_STORE_TYPE.toString()), "Override");
+        assertEquals(properties.getProperty(SSL_USE_SYSTEM_TRUST_STORE.toString()), "true");
+    }
+
+    @Test
+    public void testUriWithExtraCredentials()
+            throws SQLException
+    {
+        String extraCredentials = "test.token.foo:bar;test.token.abc:xyz";
+        TrinoUri parameters = createDriverUri("trino://localhost:8080?extraCredentials=" + extraCredentials);
+        Properties properties = parameters.getProperties();
+        assertEquals(properties.getProperty(EXTRA_CREDENTIALS.toString()), extraCredentials);
+    }
+
+    @Test
+    public void testUriWithClientTags()
+            throws SQLException
+    {
+        String clientTags = "c1,c2";
+        TrinoUri parameters = createDriverUri("trino://localhost:8080?clientTags=" + clientTags);
+        Properties properties = parameters.getProperties();
+        assertEquals(properties.getProperty(CLIENT_TAGS.toString()), clientTags);
+    }
+
+    @Test
+    public void testOptionalCatalogAndSchema()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080");
+        assertThat(parameters.getCatalog()).isEmpty();
+        assertThat(parameters.getSchema()).isEmpty();
+    }
+
+    @Test
+    public void testOptionalSchema()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080/catalog");
+        assertThat(parameters.getCatalog()).isPresent();
+        assertThat(parameters.getSchema()).isEmpty();
+    }
+
+    @Test
+    public void testAssumeLiteralNamesInMetadataCallsForNonConformingClients()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080?assumeLiteralNamesInMetadataCallsForNonConformingClients=true");
+        assertThat(parameters.isAssumeLiteralNamesInMetadataCallsForNonConformingClients()).isTrue();
+        assertThat(parameters.isAssumeLiteralUnderscoreInMetadataCallsForNonConformingClients()).isFalse();
+    }
+
+    @Test
+    public void testAssumeLiteralUnderscoreInMetadataCallsForNonConformingClients()
+            throws SQLException
+    {
+        TrinoUri parameters = createDriverUri("trino://localhost:8080?assumeLiteralUnderscoreInMetadataCallsForNonConformingClients=true");
+        assertThat(parameters.isAssumeLiteralUnderscoreInMetadataCallsForNonConformingClients()).isTrue();
+        assertThat(parameters.isAssumeLiteralNamesInMetadataCallsForNonConformingClients()).isFalse();
+    }
+
+    private static void assertUriPortScheme(TrinoUri parameters, int port, String scheme)
+    {
+        URI uri = parameters.getHttpUri();
+        assertEquals(uri.getPort(), port);
+        assertEquals(uri.getScheme(), scheme);
+    }
+
+    private static TrinoUri createDriverUri(String url)
+            throws SQLException
+    {
+        Properties properties = new Properties();
+        properties.setProperty("user", "test");
+
+        return TrinoUri.create(url, properties);
+    }
+
+    private static void assertInvalid(String url, String prefix)
+    {
+        assertThatThrownBy(() -> createDriverUri(url))
+                .isInstanceOf(SQLException.class)
+                .hasMessageStartingWith(prefix);
+    }
+}
diff --git a/client/trino-jdbc/pom.xml b/client/trino-jdbc/pom.xml
index 6c0662d91827..6153f48e9896 100644
--- a/client/trino-jdbc/pom.xml
+++ b/client/trino-jdbc/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-jdbc</artifactId>
-    <name>trino-jdbc</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -20,19 +19,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-            <version>1.7</version> <!-- JDK8 support dropped by version 1.8+ -->
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -41,8 +29,8 @@
             <artifactId>guava</artifactId>
             <exclusions>
                 <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-qual</artifactId>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>com.google.errorprone</groupId>
@@ -52,6 +40,10 @@
                     <groupId>com.google.j2objc</groupId>
                     <artifactId>j2objc-annotations</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>animal-sniffer-annotations</artifactId>
@@ -65,74 +57,54 @@
         </dependency>
 
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
-
-        <!-- for testing -->
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-blackhole</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hive-hadoop2</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
+            <!-- JDK8 support dropped by version 1.8+ -->
+            <version>1.7</version>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
-            <scope>test</scope>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-okhttp-3.0</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-memory</artifactId>
-            <scope>test</scope>
+            <artifactId>trino-client</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-parser</artifactId>
-            <scope>test</scope>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-password-authenticators</artifactId>
-            <scope>test</scope>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>test</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc11</artifactId>
+            <version>${dep.oracle.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-tpch</artifactId>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -160,6 +132,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>log</artifactId>
@@ -185,45 +163,92 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <version>${dep.oracle.version}</version>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-blackhole</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-impl</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hive-hadoop2</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-jackson</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-memory</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-parser</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-password-authenticators</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-tpch</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -235,7 +260,13 @@
 
         <dependency>
             <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-servlet-api</artifactId>
+            <artifactId>jetty-jakarta-servlet-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -273,15 +304,15 @@
     <build>
         <resources>
             <resource>
-                <directory>src/main/resources</directory>
                 <filtering>true</filtering>
+                <directory>src/main/resources</directory>
                 <includes>
                     <include>io/trino/jdbc/driver.properties</include>
                 </includes>
             </resource>
             <resource>
-                <directory>src/main/resources</directory>
                 <filtering>false</filtering>
+                <directory>src/main/resources</directory>
                 <excludes>
                     <exclude>io/trino/jdbc/driver.properties</exclude>
                 </excludes>
@@ -316,19 +347,41 @@
         </pluginManagement>
 
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <phase>package</phase>
                         <configuration>
                             <createSourcesJar>true</createSourcesJar>
                             <shadeSourcesContent>true</shadeSourcesContent>
-                            <dependencyReducedPomLocation>${project.build.directory}/pom.xml</dependencyReducedPomLocation>
                             <relocations>
                                 <relocation>
                                     <pattern>io.trino.client</pattern>
@@ -351,12 +404,8 @@
                                     <shadedPattern>${shadeBase}.airlift</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>javax.annotation</pattern>
-                                    <shadedPattern>${shadeBase}.javax.annotation</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>javax.inject</pattern>
-                                    <shadedPattern>${shadeBase}.javax.inject</shadedPattern>
+                                    <pattern>jakarta.annotation</pattern>
+                                    <shadedPattern>${shadeBase}.jakarta.annotation</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.joda.time</pattern>
@@ -366,6 +415,14 @@
                                     <pattern>okhttp3</pattern>
                                     <shadedPattern>${shadeBase}.okhttp3</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>io.opentelemetry.extension</pattern>
+                                    <shadedPattern>${shadeBase}.opentelemetry.extension</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>io.opentelemetry.instrumentation</pattern>
+                                    <shadedPattern>${shadeBase}.opentelemetry.instrumentation</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>okio</pattern>
                                     <shadedPattern>${shadeBase}.okio</shadedPattern>
@@ -374,6 +431,10 @@
                                     <pattern>dev.failsafe</pattern>
                                     <shadedPattern>${shadeBase}.dev.failsafe</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>kotlin</pattern>
+                                    <shadedPattern>${shadeBase}.kotlin</shadedPattern>
+                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>
@@ -385,10 +446,22 @@
                                 <filter>
                                     <artifact>*:*</artifact>
                                     <excludes>
+                                        <exclude>org/jetbrains/**</exclude>
+                                        <exclude>org/intellij/**</exclude>
+                                        <exclude>com/google/errorprone/**</exclude>
                                         <exclude>META-INF/maven/**</exclude>
                                         <exclude>META-INF/services/com.fasterxml.**</exclude>
-                                        <exclude>META-INF/proguard/okhttp3.pro</exclude>
+                                        <exclude>META-INF/proguard/**</exclude>
                                         <exclude>LICENSE</exclude>
+                                        <exclude>META-INF/**.kotlin_module</exclude>
+                                        <exclude>META-INF/versions/**</exclude>
+                                        <exclude>META-INF/NOTICE**</exclude>
+                                        <exclude>META-INF/*-NOTICE</exclude>
+                                        <exclude>META-INF/*-LICENSE</exclude>
+                                        <exclude>META-INF/LICENSE**</exclude>
+                                        <exclude>META-INF/io/opentelemetry/**</exclude>
+                                        <exclude>io/opentelemetry/semconv/**</exclude>
+                                        <exclude>META-INF/native-image/**</exclude>
                                     </excludes>
                                 </filter>
                             </filters>
@@ -398,4 +471,31 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>ci</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <jdbc-jar>${project.build.directory}/${project.name}-${project.version}.jar</jdbc-jar>
+                            </systemPropertyVariables>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractConnectionProperty.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractConnectionProperty.java
deleted file mode 100644
index 7ee819766d02..000000000000
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractConnectionProperty.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed 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 io.trino.jdbc;
-
-import com.google.common.reflect.TypeToken;
-
-import java.io.File;
-import java.sql.DriverPropertyInfo;
-import java.sql.SQLException;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static java.lang.String.format;
-import static java.util.Locale.ENGLISH;
-import static java.util.Objects.requireNonNull;
-
-abstract class AbstractConnectionProperty<T>
-        implements ConnectionProperty<T>
-{
-    private final String key;
-    private final Optional<String> defaultValue;
-    private final Predicate<Properties> isRequired;
-    private final Predicate<Properties> isAllowed;
-    private final Converter<T> converter;
-    private final String[] choices;
-
-    protected AbstractConnectionProperty(
-            String key,
-            Optional<String> defaultValue,
-            Predicate<Properties> isRequired,
-            Predicate<Properties> isAllowed,
-            Converter<T> converter)
-    {
-        this.key = requireNonNull(key, "key is null");
-        this.defaultValue = requireNonNull(defaultValue, "defaultValue is null");
-        this.isRequired = requireNonNull(isRequired, "isRequired is null");
-        this.isAllowed = requireNonNull(isAllowed, "isAllowed is null");
-        this.converter = requireNonNull(converter, "converter is null");
-
-        Class<? super T> type = new TypeToken<T>(getClass()) {}.getRawType();
-        if (type == Boolean.class) {
-            choices = new String[] {"true", "false"};
-        }
-        else if (Enum.class.isAssignableFrom(type)) {
-            choices = Stream.of(type.getEnumConstants())
-                    .map(Object::toString)
-                    .toArray(String[]::new);
-        }
-        else {
-            choices = null;
-        }
-    }
-
-    protected AbstractConnectionProperty(
-            String key,
-            Predicate<Properties> required,
-            Predicate<Properties> allowed,
-            Converter<T> converter)
-    {
-        this(key, Optional.empty(), required, allowed, converter);
-    }
-
-    @Override
-    public String getKey()
-    {
-        return key;
-    }
-
-    @Override
-    public Optional<String> getDefault()
-    {
-        return defaultValue;
-    }
-
-    @Override
-    public DriverPropertyInfo getDriverPropertyInfo(Properties mergedProperties)
-    {
-        String currentValue = mergedProperties.getProperty(key);
-        DriverPropertyInfo result = new DriverPropertyInfo(key, currentValue);
-        result.required = isRequired.test(mergedProperties);
-        result.choices = (choices != null) ? choices.clone() : null;
-        return result;
-    }
-
-    @Override
-    public boolean isRequired(Properties properties)
-    {
-        return isRequired.test(properties);
-    }
-
-    @Override
-    public boolean isAllowed(Properties properties)
-    {
-        return isAllowed.test(properties);
-    }
-
-    @Override
-    public Optional<T> getValue(Properties properties)
-            throws SQLException
-    {
-        String value = properties.getProperty(key);
-        if (value == null) {
-            if (isRequired(properties)) {
-                throw new SQLException(format("Connection property '%s' is required", key));
-            }
-            return Optional.empty();
-        }
-
-        try {
-            return Optional.of(converter.convert(value));
-        }
-        catch (RuntimeException e) {
-            if (value.isEmpty()) {
-                throw new SQLException(format("Connection property '%s' value is empty", key), e);
-            }
-            throw new SQLException(format("Connection property '%s' value is invalid: %s", key, value), e);
-        }
-    }
-
-    @Override
-    public void validate(Properties properties)
-            throws SQLException
-    {
-        if (properties.containsKey(key) && !isAllowed(properties)) {
-            throw new SQLException(format("Connection property '%s' is not allowed", key));
-        }
-
-        getValue(properties);
-    }
-
-    protected static final Predicate<Properties> NOT_REQUIRED = properties -> false;
-
-    protected static final Predicate<Properties> ALLOWED = properties -> true;
-
-    interface Converter<T>
-    {
-        T convert(String value);
-    }
-
-    protected static final Converter<String> STRING_CONVERTER = value -> value;
-
-    protected static final Converter<String> NON_EMPTY_STRING_CONVERTER = value -> {
-        checkArgument(!value.isEmpty(), "value is empty");
-        return value;
-    };
-
-    protected static final Converter<File> FILE_CONVERTER = File::new;
-
-    protected static final Converter<Boolean> BOOLEAN_CONVERTER = value -> {
-        switch (value.toLowerCase(ENGLISH)) {
-            case "true":
-                return true;
-            case "false":
-                return false;
-        }
-        throw new IllegalArgumentException("value must be 'true' or 'false'");
-    };
-
-    protected interface CheckedPredicate<T>
-    {
-        boolean test(T t)
-                throws SQLException;
-    }
-
-    protected static <T> Predicate<T> checkedPredicate(CheckedPredicate<T> predicate)
-    {
-        return t -> {
-            try {
-                return predicate.test(t);
-            }
-            catch (SQLException e) {
-                return false;
-            }
-        };
-    }
-}
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractTrinoResultSet.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractTrinoResultSet.java
index 5981a7c17f8e..03a1a4cfaca3 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractTrinoResultSet.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractTrinoResultSet.java
@@ -92,8 +92,8 @@ abstract class AbstractTrinoResultSet
 {
     private static final Pattern DATETIME_PATTERN = Pattern.compile("" +
             "(?<year>[-+]?\\d{4,})-(?<month>\\d{1,2})-(?<day>\\d{1,2})" +
-            "(?: (?<hour>\\d{1,2}):(?<minute>\\d{1,2})(?::(?<second>\\d{1,2})(?:\\.(?<fraction>\\d+))?)?)?" +
-            "\\s*(?<timezone>.+)?");
+            "( (?:(?<hour>\\d{1,2}):(?<minute>\\d{1,2})(?::(?<second>\\d{1,2})(?:\\.(?<fraction>\\d+))?)?)?" +
+            "(?:\\s*(?<timezone>.+))?)?");
 
     private static final Pattern TIME_PATTERN = Pattern.compile("(?<hour>\\d{1,2}):(?<minute>\\d{1,2}):(?<second>\\d{1,2})(?:\\.(?<fraction>\\d+))?");
     private static final Pattern TIME_WITH_TIME_ZONE_PATTERN = Pattern.compile("" +
@@ -150,15 +150,8 @@ abstract class AbstractTrinoResultSet
             TypeConversions.builder()
                     .add("decimal", String.class, BigDecimal.class, AbstractTrinoResultSet::parseBigDecimal)
                     .add("varbinary", byte[].class, String.class, value -> "0x" + BaseEncoding.base16().encode(value))
-                    .add("date", String.class, Date.class, string -> {
-                        try {
-                            return parseDate(string, DateTimeZone.forID(ZoneId.systemDefault().getId()));
-                        }
-                        // TODO (https://github.com/trinodb/trino/issues/6242) this should never fail
-                        catch (IllegalArgumentException e) {
-                            throw new SQLException("Expected value to be a date but is: " + string, e);
-                        }
-                    })
+                    .add("date", String.class, Date.class, string -> parseDate(string, DateTimeZone.forID(ZoneId.systemDefault().getId())))
+                    .add("date", String.class, java.time.LocalDate.class, string -> parseDate(string, DateTimeZone.forID(ZoneId.systemDefault().getId())).toLocalDate())
                     .add("time", String.class, Time.class, string -> parseTime(string, ZoneId.systemDefault()))
                     .add("time with time zone", String.class, Time.class, AbstractTrinoResultSet::parseTimeWithTimeZone)
                     .add("timestamp", String.class, Timestamp.class, string -> parseTimestampAsSqlTimestamp(string, ZoneId.systemDefault()))
@@ -361,7 +354,8 @@ private Date getDate(int columnIndex, DateTimeZone localTimeZone)
 
     private static Date parseDate(String value, DateTimeZone localTimeZone)
     {
-        long millis = DATE_FORMATTER.withZone(localTimeZone).parseMillis(String.valueOf(value));
+        LocalDate localDate = DATE_FORMATTER.parseLocalDate(String.valueOf(value));
+        long millis = localDate.toDateTimeAtStartOfDay(localTimeZone).getMillis();
         if (millis >= START_OF_MODERN_ERA_SECONDS * MILLISECONDS_PER_SECOND) {
             return new Date(millis);
         }
@@ -373,8 +367,8 @@ private static Date parseDate(String value, DateTimeZone localTimeZone)
         // expensive GregorianCalendar; note that Joda also has a chronology that works for
         // older dates, but it uses a slightly different algorithm and yields results that
         // are not compatible with java.sql.Date.
-        LocalDate localDate = DATE_FORMATTER.parseLocalDate(String.valueOf(value));
-        Calendar calendar = new GregorianCalendar(localDate.getYear(), localDate.getMonthOfYear() - 1, localDate.getDayOfMonth());
+        LocalDate preGregorianDate = DATE_FORMATTER.parseLocalDate(String.valueOf(value));
+        Calendar calendar = new GregorianCalendar(preGregorianDate.getYear(), preGregorianDate.getMonthOfYear() - 1, preGregorianDate.getDayOfMonth());
         calendar.setTimeZone(TimeZone.getTimeZone(ZoneId.of(localTimeZone.getID())));
 
         return new Date(calendar.getTimeInMillis());
@@ -657,8 +651,8 @@ public Object getObject(int columnIndex)
         return column(columnIndex);
     }
 
-    @javax.annotation.Nullable
-    private static Object convertFromClientRepresentation(ClientTypeSignature columnType, @javax.annotation.Nullable Object value)
+    @jakarta.annotation.Nullable
+    private static Object convertFromClientRepresentation(ClientTypeSignature columnType, @jakarta.annotation.Nullable Object value)
             throws SQLException
     {
         requireNonNull(columnType, "columnType is null");
@@ -2139,9 +2133,9 @@ private static Time parseTimeWithTimeZone(String value)
             fractionValue = Long.parseLong(fraction);
         }
 
-        long epochMilli = (hour * 3600 + minute * 60 + second) * MILLISECONDS_PER_SECOND + rescale(fractionValue, precision, 3);
+        long epochMilli = (hour * 3600L + minute * 60L + second) * MILLISECONDS_PER_SECOND + rescale(fractionValue, precision, 3);
 
-        epochMilli -= calculateOffsetMinutes(offsetSign, offsetHour, offsetMinute) * MILLISECONDS_PER_MINUTE;
+        epochMilli -= calculateOffsetMinutes(offsetSign, offsetHour, offsetMinute) * (long) MILLISECONDS_PER_MINUTE;
 
         return new Time(epochMilli);
     }
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/ConnectionProperties.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/ConnectionProperties.java
deleted file mode 100644
index 93d97d58f6fa..000000000000
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/ConnectionProperties.java
+++ /dev/null
@@ -1,686 +0,0 @@
-/*
- * Licensed 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 io.trino.jdbc;
-
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.net.HostAndPort;
-import io.airlift.units.Duration;
-import io.trino.client.ClientSelectedRole;
-import io.trino.client.auth.external.ExternalRedirectStrategy;
-
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.Set;
-import java.util.function.Predicate;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static com.google.common.collect.Maps.immutableEntry;
-import static com.google.common.collect.Streams.stream;
-import static io.trino.client.ClientSelectedRole.Type.ALL;
-import static io.trino.client.ClientSelectedRole.Type.NONE;
-import static io.trino.jdbc.AbstractConnectionProperty.checkedPredicate;
-import static java.util.Collections.unmodifiableMap;
-import static java.util.Objects.requireNonNull;
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toMap;
-
-final class ConnectionProperties
-{
-    enum SslVerificationMode
-    {
-        FULL, CA, NONE
-    }
-
-    public static final ConnectionProperty<String> USER = new User();
-    public static final ConnectionProperty<String> PASSWORD = new Password();
-    public static final ConnectionProperty<String> SESSION_USER = new SessionUser();
-    public static final ConnectionProperty<Map<String, ClientSelectedRole>> ROLES = new Roles();
-    public static final ConnectionProperty<HostAndPort> SOCKS_PROXY = new SocksProxy();
-    public static final ConnectionProperty<HostAndPort> HTTP_PROXY = new HttpProxy();
-    public static final ConnectionProperty<String> APPLICATION_NAME_PREFIX = new ApplicationNamePrefix();
-    public static final ConnectionProperty<Boolean> DISABLE_COMPRESSION = new DisableCompression();
-    public static final ConnectionProperty<Boolean> ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS = new AssumeLiteralNamesInMetadataCallsForNonConformingClients();
-    public static final ConnectionProperty<Boolean> ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS = new AssumeLiteralUnderscoreInMetadataCallsForNonConformingClients();
-    public static final ConnectionProperty<Boolean> SSL = new Ssl();
-    public static final ConnectionProperty<SslVerificationMode> SSL_VERIFICATION = new SslVerification();
-    public static final ConnectionProperty<String> SSL_KEY_STORE_PATH = new SslKeyStorePath();
-    public static final ConnectionProperty<String> SSL_KEY_STORE_PASSWORD = new SslKeyStorePassword();
-    public static final ConnectionProperty<String> SSL_KEY_STORE_TYPE = new SslKeyStoreType();
-    public static final ConnectionProperty<String> SSL_TRUST_STORE_PATH = new SslTrustStorePath();
-    public static final ConnectionProperty<String> SSL_TRUST_STORE_PASSWORD = new SslTrustStorePassword();
-    public static final ConnectionProperty<String> SSL_TRUST_STORE_TYPE = new SslTrustStoreType();
-    public static final ConnectionProperty<Boolean> SSL_USE_SYSTEM_TRUST_STORE = new SslUseSystemTrustStore();
-    public static final ConnectionProperty<String> KERBEROS_SERVICE_PRINCIPAL_PATTERN = new KerberosServicePrincipalPattern();
-    public static final ConnectionProperty<String> KERBEROS_REMOTE_SERVICE_NAME = new KerberosRemoteServiceName();
-    public static final ConnectionProperty<Boolean> KERBEROS_USE_CANONICAL_HOSTNAME = new KerberosUseCanonicalHostname();
-    public static final ConnectionProperty<String> KERBEROS_PRINCIPAL = new KerberosPrincipal();
-    public static final ConnectionProperty<File> KERBEROS_CONFIG_PATH = new KerberosConfigPath();
-    public static final ConnectionProperty<File> KERBEROS_KEYTAB_PATH = new KerberosKeytabPath();
-    public static final ConnectionProperty<File> KERBEROS_CREDENTIAL_CACHE_PATH = new KerberosCredentialCachePath();
-    public static final ConnectionProperty<Boolean> KERBEROS_DELEGATION = new KerberosDelegation();
-    public static final ConnectionProperty<String> ACCESS_TOKEN = new AccessToken();
-    public static final ConnectionProperty<Boolean> EXTERNAL_AUTHENTICATION = new ExternalAuthentication();
-    public static final ConnectionProperty<Duration> EXTERNAL_AUTHENTICATION_TIMEOUT = new ExternalAuthenticationTimeout();
-    public static final ConnectionProperty<List<ExternalRedirectStrategy>> EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS = new ExternalAuthenticationRedirectHandlers();
-    public static final ConnectionProperty<KnownTokenCache> EXTERNAL_AUTHENTICATION_TOKEN_CACHE = new ExternalAuthenticationTokenCache();
-    public static final ConnectionProperty<Map<String, String>> EXTRA_CREDENTIALS = new ExtraCredentials();
-    public static final ConnectionProperty<String> CLIENT_INFO = new ClientInfo();
-    public static final ConnectionProperty<String> CLIENT_TAGS = new ClientTags();
-    public static final ConnectionProperty<String> TRACE_TOKEN = new TraceToken();
-    public static final ConnectionProperty<Map<String, String>> SESSION_PROPERTIES = new SessionProperties();
-    public static final ConnectionProperty<String> SOURCE = new Source();
-    public static final ConnectionProperty<Class<? extends DnsResolver>> DNS_RESOLVER = new Resolver();
-    public static final ConnectionProperty<String> DNS_RESOLVER_CONTEXT = new ResolverContext();
-
-    private static final Set<ConnectionProperty<?>> ALL_PROPERTIES = ImmutableSet.<ConnectionProperty<?>>builder()
-            .add(USER)
-            .add(PASSWORD)
-            .add(SESSION_USER)
-            .add(ROLES)
-            .add(SOCKS_PROXY)
-            .add(HTTP_PROXY)
-            .add(APPLICATION_NAME_PREFIX)
-            .add(DISABLE_COMPRESSION)
-            .add(ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS)
-            .add(ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS)
-            .add(SSL)
-            .add(SSL_VERIFICATION)
-            .add(SSL_KEY_STORE_PATH)
-            .add(SSL_KEY_STORE_PASSWORD)
-            .add(SSL_KEY_STORE_TYPE)
-            .add(SSL_TRUST_STORE_PATH)
-            .add(SSL_TRUST_STORE_PASSWORD)
-            .add(SSL_TRUST_STORE_TYPE)
-            .add(SSL_USE_SYSTEM_TRUST_STORE)
-            .add(KERBEROS_REMOTE_SERVICE_NAME)
-            .add(KERBEROS_SERVICE_PRINCIPAL_PATTERN)
-            .add(KERBEROS_USE_CANONICAL_HOSTNAME)
-            .add(KERBEROS_PRINCIPAL)
-            .add(KERBEROS_CONFIG_PATH)
-            .add(KERBEROS_KEYTAB_PATH)
-            .add(KERBEROS_CREDENTIAL_CACHE_PATH)
-            .add(KERBEROS_DELEGATION)
-            .add(ACCESS_TOKEN)
-            .add(EXTRA_CREDENTIALS)
-            .add(CLIENT_INFO)
-            .add(CLIENT_TAGS)
-            .add(TRACE_TOKEN)
-            .add(SESSION_PROPERTIES)
-            .add(SOURCE)
-            .add(EXTERNAL_AUTHENTICATION)
-            .add(EXTERNAL_AUTHENTICATION_TIMEOUT)
-            .add(EXTERNAL_AUTHENTICATION_TOKEN_CACHE)
-            .add(EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS)
-            .add(DNS_RESOLVER)
-            .add(DNS_RESOLVER_CONTEXT)
-            .build();
-
-    private static final Map<String, ConnectionProperty<?>> KEY_LOOKUP = unmodifiableMap(ALL_PROPERTIES.stream()
-            .collect(toMap(ConnectionProperty::getKey, identity())));
-
-    private static final Map<String, String> DEFAULTS;
-
-    static {
-        ImmutableMap.Builder<String, String> defaults = ImmutableMap.builder();
-        for (ConnectionProperty<?> property : ALL_PROPERTIES) {
-            property.getDefault().ifPresent(value -> defaults.put(property.getKey(), value));
-        }
-        DEFAULTS = defaults.buildOrThrow();
-    }
-
-    private ConnectionProperties() {}
-
-    public static ConnectionProperty<?> forKey(String propertiesKey)
-    {
-        return KEY_LOOKUP.get(propertiesKey);
-    }
-
-    public static Set<ConnectionProperty<?>> allProperties()
-    {
-        return ALL_PROPERTIES;
-    }
-
-    public static Map<String, String> getDefaults()
-    {
-        return DEFAULTS;
-    }
-
-    private static class User
-            extends AbstractConnectionProperty<String>
-    {
-        public User()
-        {
-            super("user", NOT_REQUIRED, ALLOWED, NON_EMPTY_STRING_CONVERTER);
-        }
-    }
-
-    private static class Password
-            extends AbstractConnectionProperty<String>
-    {
-        public Password()
-        {
-            super("password", NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
-        }
-    }
-
-    private static class SessionUser
-            extends AbstractConnectionProperty<String>
-    {
-        protected SessionUser()
-        {
-            super("sessionUser", NOT_REQUIRED, ALLOWED, NON_EMPTY_STRING_CONVERTER);
-        }
-    }
-
-    private static class Roles
-            extends AbstractConnectionProperty<Map<String, ClientSelectedRole>>
-    {
-        public Roles()
-        {
-            super("roles", NOT_REQUIRED, ALLOWED, Roles::parseRoles);
-        }
-
-        // Roles consists of a list of catalog role pairs.
-        // E.g., `jdbc:trino://example.net:8080/?roles=catalog1:none;catalog2:all;catalog3:role` will set following roles:
-        //  - `none` in `catalog1`
-        //  - `all` in `catalog2`
-        //  - `role` in `catalog3`
-        public static Map<String, ClientSelectedRole> parseRoles(String roles)
-        {
-            return new MapPropertyParser("roles").parse(roles).entrySet().stream()
-                    .collect(toImmutableMap(Map.Entry::getKey, entry -> mapToClientSelectedRole(entry.getValue())));
-        }
-
-        private static ClientSelectedRole mapToClientSelectedRole(String role)
-        {
-            checkArgument(!role.contains("\""), "Role must not contain double quotes: %s", role);
-            if (ALL.name().equalsIgnoreCase(role)) {
-                return new ClientSelectedRole(ALL, Optional.empty());
-            }
-            if (NONE.name().equalsIgnoreCase(role)) {
-                return new ClientSelectedRole(NONE, Optional.empty());
-            }
-            return new ClientSelectedRole(ClientSelectedRole.Type.ROLE, Optional.of(role));
-        }
-    }
-
-    private static class SocksProxy
-            extends AbstractConnectionProperty<HostAndPort>
-    {
-        private static final Predicate<Properties> NO_HTTP_PROXY =
-                checkedPredicate(properties -> !HTTP_PROXY.getValue(properties).isPresent());
-
-        public SocksProxy()
-        {
-            super("socksProxy", NOT_REQUIRED, NO_HTTP_PROXY, HostAndPort::fromString);
-        }
-    }
-
-    private static class HttpProxy
-            extends AbstractConnectionProperty<HostAndPort>
-    {
-        private static final Predicate<Properties> NO_SOCKS_PROXY =
-                checkedPredicate(properties -> !SOCKS_PROXY.getValue(properties).isPresent());
-
-        public HttpProxy()
-        {
-            super("httpProxy", NOT_REQUIRED, NO_SOCKS_PROXY, HostAndPort::fromString);
-        }
-    }
-
-    private static class ApplicationNamePrefix
-            extends AbstractConnectionProperty<String>
-    {
-        public ApplicationNamePrefix()
-        {
-            super("applicationNamePrefix", NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
-        }
-    }
-
-    private static class ClientInfo
-            extends AbstractConnectionProperty<String>
-    {
-        public ClientInfo()
-        {
-            super("clientInfo", NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
-        }
-    }
-
-    private static class ClientTags
-            extends AbstractConnectionProperty<String>
-    {
-        public ClientTags()
-        {
-            super("clientTags", NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
-        }
-    }
-
-    private static class TraceToken
-            extends AbstractConnectionProperty<String>
-    {
-        public TraceToken()
-        {
-            super("traceToken", NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
-        }
-    }
-
-    private static class DisableCompression
-            extends AbstractConnectionProperty<Boolean>
-    {
-        public DisableCompression()
-        {
-            super("disableCompression", NOT_REQUIRED, ALLOWED, BOOLEAN_CONVERTER);
-        }
-    }
-
-    /**
-     * @deprecated use {@link AssumeLiteralUnderscoreInMetadataCallsForNonConformingClients}
-     */
-    private static class AssumeLiteralNamesInMetadataCallsForNonConformingClients
-            extends AbstractConnectionProperty<Boolean>
-    {
-        private static final Predicate<Properties> IS_ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS_NOT_ENABLED =
-                checkedPredicate(properties -> !ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS.getValue(properties).orElse(false));
-
-        public AssumeLiteralNamesInMetadataCallsForNonConformingClients()
-        {
-            super(
-                    "assumeLiteralNamesInMetadataCallsForNonConformingClients",
-                    NOT_REQUIRED,
-                    AssumeLiteralUnderscoreInMetadataCallsForNonConformingClients.IS_ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS_NOT_ENABLED
-                            .or(IS_ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS_NOT_ENABLED),
-                    BOOLEAN_CONVERTER);
-        }
-    }
-
-    private static class AssumeLiteralUnderscoreInMetadataCallsForNonConformingClients
-            extends AbstractConnectionProperty<Boolean>
-    {
-        private static final Predicate<Properties> IS_ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS_NOT_ENABLED =
-                checkedPredicate(properties -> !ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS.getValue(properties).orElse(false));
-
-        public AssumeLiteralUnderscoreInMetadataCallsForNonConformingClients()
-        {
-            super(
-                    "assumeLiteralUnderscoreInMetadataCallsForNonConformingClients",
-                    NOT_REQUIRED,
-                    AssumeLiteralNamesInMetadataCallsForNonConformingClients.IS_ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS_NOT_ENABLED
-                            .or(IS_ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS_NOT_ENABLED),
-                    BOOLEAN_CONVERTER);
-        }
-    }
-
-    private static class Ssl
-            extends AbstractConnectionProperty<Boolean>
-    {
-        public Ssl()
-        {
-            super("SSL", NOT_REQUIRED, ALLOWED, BOOLEAN_CONVERTER);
-        }
-    }
-
-    private static class SslVerification
-            extends AbstractConnectionProperty<SslVerificationMode>
-    {
-        private static final Predicate<Properties> IF_SSL_ENABLED =
-                checkedPredicate(properties -> SSL.getValue(properties).orElse(false));
-
-        static final Predicate<Properties> IF_SSL_VERIFICATION_ENABLED =
-                IF_SSL_ENABLED.and(checkedPredicate(properties -> !SSL_VERIFICATION.getValue(properties).orElse(SslVerificationMode.FULL).equals(SslVerificationMode.NONE)));
-
-        public SslVerification()
-        {
-            super("SSLVerification", NOT_REQUIRED, IF_SSL_ENABLED, SslVerificationMode::valueOf);
-        }
-    }
-
-    private static class SslKeyStorePath
-            extends AbstractConnectionProperty<String>
-    {
-        public SslKeyStorePath()
-        {
-            super("SSLKeyStorePath", NOT_REQUIRED, SslVerification.IF_SSL_VERIFICATION_ENABLED, STRING_CONVERTER);
-        }
-    }
-
-    private static class SslKeyStorePassword
-            extends AbstractConnectionProperty<String>
-    {
-        private static final Predicate<Properties> IF_KEY_STORE =
-                checkedPredicate(properties -> SSL_KEY_STORE_PATH.getValue(properties).isPresent());
-
-        public SslKeyStorePassword()
-        {
-            super("SSLKeyStorePassword", NOT_REQUIRED, IF_KEY_STORE.and(SslVerification.IF_SSL_VERIFICATION_ENABLED), STRING_CONVERTER);
-        }
-    }
-
-    private static class SslKeyStoreType
-            extends AbstractConnectionProperty<String>
-    {
-        private static final Predicate<Properties> IF_KEY_STORE =
-                checkedPredicate(properties -> SSL_KEY_STORE_PATH.getValue(properties).isPresent());
-
-        public SslKeyStoreType()
-        {
-            super("SSLKeyStoreType", NOT_REQUIRED, IF_KEY_STORE.and(SslVerification.IF_SSL_VERIFICATION_ENABLED), STRING_CONVERTER);
-        }
-    }
-
-    private static class SslTrustStorePath
-            extends AbstractConnectionProperty<String>
-    {
-        private static final Predicate<Properties> IF_SYSTEM_TRUST_STORE_NOT_ENABLED =
-                checkedPredicate(properties -> !SSL_USE_SYSTEM_TRUST_STORE.getValue(properties).orElse(false));
-
-        public SslTrustStorePath()
-        {
-            super("SSLTrustStorePath", NOT_REQUIRED, IF_SYSTEM_TRUST_STORE_NOT_ENABLED.and(SslVerification.IF_SSL_VERIFICATION_ENABLED), STRING_CONVERTER);
-        }
-    }
-
-    private static class SslTrustStorePassword
-            extends AbstractConnectionProperty<String>
-    {
-        private static final Predicate<Properties> IF_TRUST_STORE =
-                checkedPredicate(properties -> SSL_TRUST_STORE_PATH.getValue(properties).isPresent());
-
-        public SslTrustStorePassword()
-        {
-            super("SSLTrustStorePassword", NOT_REQUIRED, IF_TRUST_STORE.and(SslVerification.IF_SSL_VERIFICATION_ENABLED), STRING_CONVERTER);
-        }
-    }
-
-    private static class SslTrustStoreType
-            extends AbstractConnectionProperty<String>
-    {
-        private static final Predicate<Properties> IF_TRUST_STORE =
-                checkedPredicate(properties -> SSL_TRUST_STORE_PATH.getValue(properties).isPresent() || SSL_USE_SYSTEM_TRUST_STORE.getValue(properties).orElse(false));
-
-        public SslTrustStoreType()
-        {
-            super("SSLTrustStoreType", NOT_REQUIRED, IF_TRUST_STORE.and(SslVerification.IF_SSL_VERIFICATION_ENABLED), STRING_CONVERTER);
-        }
-    }
-
-    private static class SslUseSystemTrustStore
-            extends AbstractConnectionProperty<Boolean>
-    {
-        public SslUseSystemTrustStore()
-        {
-            super("SSLUseSystemTrustStore", NOT_REQUIRED, SslVerification.IF_SSL_VERIFICATION_ENABLED, BOOLEAN_CONVERTER);
-        }
-    }
-
-    private static class KerberosRemoteServiceName
-            extends AbstractConnectionProperty<String>
-    {
-        public KerberosRemoteServiceName()
-        {
-            super("KerberosRemoteServiceName", NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
-        }
-    }
-
-    private static Predicate<Properties> isKerberosEnabled()
-    {
-        return checkedPredicate(properties -> KERBEROS_REMOTE_SERVICE_NAME.getValue(properties).isPresent());
-    }
-
-    private static Predicate<Properties> isKerberosWithoutDelegation()
-    {
-        return isKerberosEnabled().and(checkedPredicate(properties -> !KERBEROS_DELEGATION.getValue(properties).orElse(false)));
-    }
-
-    private static class KerberosServicePrincipalPattern
-            extends AbstractConnectionProperty<String>
-    {
-        public KerberosServicePrincipalPattern()
-        {
-            super("KerberosServicePrincipalPattern", Optional.of("${SERVICE}@${HOST}"), isKerberosEnabled(), ALLOWED, STRING_CONVERTER);
-        }
-    }
-
-    private static class KerberosPrincipal
-            extends AbstractConnectionProperty<String>
-    {
-        public KerberosPrincipal()
-        {
-            super("KerberosPrincipal", NOT_REQUIRED, isKerberosWithoutDelegation(), STRING_CONVERTER);
-        }
-    }
-
-    private static class KerberosUseCanonicalHostname
-            extends AbstractConnectionProperty<Boolean>
-    {
-        public KerberosUseCanonicalHostname()
-        {
-            super("KerberosUseCanonicalHostname", Optional.of("true"), isKerberosEnabled(), ALLOWED, BOOLEAN_CONVERTER);
-        }
-    }
-
-    private static class KerberosConfigPath
-            extends AbstractConnectionProperty<File>
-    {
-        public KerberosConfigPath()
-        {
-            super("KerberosConfigPath", NOT_REQUIRED, isKerberosWithoutDelegation(), FILE_CONVERTER);
-        }
-    }
-
-    private static class KerberosKeytabPath
-            extends AbstractConnectionProperty<File>
-    {
-        public KerberosKeytabPath()
-        {
-            super("KerberosKeytabPath", NOT_REQUIRED, isKerberosWithoutDelegation(), FILE_CONVERTER);
-        }
-    }
-
-    private static class KerberosCredentialCachePath
-            extends AbstractConnectionProperty<File>
-    {
-        public KerberosCredentialCachePath()
-        {
-            super("KerberosCredentialCachePath", NOT_REQUIRED, isKerberosWithoutDelegation(), FILE_CONVERTER);
-        }
-    }
-
-    private static class KerberosDelegation
-            extends AbstractConnectionProperty<Boolean>
-    {
-        public KerberosDelegation()
-        {
-            super("KerberosDelegation", Optional.of("false"), isKerberosEnabled(), ALLOWED, BOOLEAN_CONVERTER);
-        }
-    }
-
-    private static class AccessToken
-            extends AbstractConnectionProperty<String>
-    {
-        public AccessToken()
-        {
-            super("accessToken", NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
-        }
-    }
-
-    private static class ExternalAuthentication
-            extends AbstractConnectionProperty<Boolean>
-    {
-        public ExternalAuthentication()
-        {
-            super("externalAuthentication", Optional.of("false"), NOT_REQUIRED, ALLOWED, BOOLEAN_CONVERTER);
-        }
-    }
-
-    private static class ExternalAuthenticationRedirectHandlers
-            extends AbstractConnectionProperty<List<ExternalRedirectStrategy>>
-    {
-        private static final Splitter ENUM_SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings();
-
-        public ExternalAuthenticationRedirectHandlers()
-        {
-            super("externalAuthenticationRedirectHandlers", Optional.of("OPEN"), NOT_REQUIRED, ALLOWED, ExternalAuthenticationRedirectHandlers::parse);
-        }
-
-        public static List<ExternalRedirectStrategy> parse(String value)
-        {
-            return stream(ENUM_SPLITTER.split(value))
-                    .map(ExternalRedirectStrategy::valueOf)
-                    .collect(toImmutableList());
-        }
-    }
-
-    private static class ExternalAuthenticationTimeout
-            extends AbstractConnectionProperty<Duration>
-    {
-        private static final Predicate<Properties> IF_EXTERNAL_AUTHENTICATION_ENABLED =
-                checkedPredicate(properties -> EXTERNAL_AUTHENTICATION.getValue(properties).orElse(false));
-
-        public ExternalAuthenticationTimeout()
-        {
-            super("externalAuthenticationTimeout", NOT_REQUIRED, IF_EXTERNAL_AUTHENTICATION_ENABLED, Duration::valueOf);
-        }
-    }
-
-    private static class ExternalAuthenticationTokenCache
-            extends AbstractConnectionProperty<KnownTokenCache>
-    {
-        public ExternalAuthenticationTokenCache()
-        {
-            super("externalAuthenticationTokenCache", Optional.of(KnownTokenCache.NONE.name()), NOT_REQUIRED, ALLOWED, KnownTokenCache::valueOf);
-        }
-    }
-
-    private static class ExtraCredentials
-            extends AbstractConnectionProperty<Map<String, String>>
-    {
-        public ExtraCredentials()
-        {
-            super("extraCredentials", NOT_REQUIRED, ALLOWED, ExtraCredentials::parseExtraCredentials);
-        }
-
-        // Extra credentials consists of a list of credential name value pairs.
-        // E.g., `jdbc:trino://example.net:8080/?extraCredentials=abc:xyz;foo:bar` will create credentials `abc=xyz` and `foo=bar`
-        public static Map<String, String> parseExtraCredentials(String extraCredentialString)
-        {
-            return new MapPropertyParser("extraCredentials").parse(extraCredentialString);
-        }
-    }
-
-    private static class SessionProperties
-            extends AbstractConnectionProperty<Map<String, String>>
-    {
-        private static final Splitter NAME_PARTS_SPLITTER = Splitter.on('.');
-
-        public SessionProperties()
-        {
-            super("sessionProperties", NOT_REQUIRED, ALLOWED, SessionProperties::parseSessionProperties);
-        }
-
-        // Session properties consists of a list of session property name value pairs.
-        // E.g., `jdbc:trino://example.net:8080/?sessionProperties=abc:xyz;catalog.foo:bar` will create session properties `abc=xyz` and `catalog.foo=bar`
-        public static Map<String, String> parseSessionProperties(String sessionPropertiesString)
-        {
-            Map<String, String> sessionProperties = new MapPropertyParser("sessionProperties").parse(sessionPropertiesString);
-            for (String sessionPropertyName : sessionProperties.keySet()) {
-                checkArgument(NAME_PARTS_SPLITTER.splitToList(sessionPropertyName).size() <= 2, "Malformed session property name: %s", sessionPropertyName);
-            }
-            return sessionProperties;
-        }
-    }
-
-    private static class Source
-            extends AbstractConnectionProperty<String>
-    {
-        public Source()
-        {
-            super("source", NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
-        }
-    }
-
-    private static class Resolver
-            extends AbstractConnectionProperty<Class<? extends DnsResolver>>
-    {
-        public Resolver()
-        {
-            super("dnsResolver", NOT_REQUIRED, ALLOWED, Resolver::findByName);
-        }
-
-        public static Class<? extends DnsResolver> findByName(String name)
-        {
-            try {
-                return Class.forName(name).asSubclass(DnsResolver.class);
-            }
-            catch (ClassNotFoundException e) {
-                throw new RuntimeException("DNS resolver class not found: " + name, e);
-            }
-        }
-    }
-
-    private static class ResolverContext
-            extends AbstractConnectionProperty<String>
-    {
-        public ResolverContext()
-        {
-            super("dnsResolverContext", NOT_REQUIRED, ALLOWED, STRING_CONVERTER);
-        }
-    }
-
-    private static class MapPropertyParser
-    {
-        private static final CharMatcher PRINTABLE_ASCII = CharMatcher.inRange((char) 0x21, (char) 0x7E);
-        private static final Splitter MAP_ENTRIES_SPLITTER = Splitter.on(';');
-        private static final Splitter MAP_ENTRY_SPLITTER = Splitter.on(':');
-
-        private final String mapName;
-
-        private MapPropertyParser(String mapName)
-        {
-            this.mapName = requireNonNull(mapName, "mapName is null");
-        }
-
-        /**
-         * Parses map in a form: key1:value1;key2:value2
-         */
-        public Map<String, String> parse(String map)
-        {
-            return MAP_ENTRIES_SPLITTER.splitToList(map).stream()
-                    .map(this::parseEntry)
-                    .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
-        }
-
-        private Map.Entry<String, String> parseEntry(String credential)
-        {
-            List<String> keyValue = MAP_ENTRY_SPLITTER.limit(2).splitToList(credential);
-            checkArgument(keyValue.size() == 2, "Malformed %s: %s", mapName, credential);
-            String key = keyValue.get(0);
-            String value = keyValue.get(1);
-            checkArgument(!key.isEmpty(), "%s key is empty", mapName);
-            checkArgument(!value.isEmpty(), "%s key is empty", mapName);
-
-            checkArgument(PRINTABLE_ASCII.matchesAllOf(key), "%s key '%s' contains spaces or is not printable ASCII", mapName, key);
-            // do not log value as it may contain sensitive information
-            checkArgument(PRINTABLE_ASCII.matchesAllOf(value), "%s value for key '%s' contains spaces or is not printable ASCII", mapName, key);
-            return immutableEntry(key, value);
-        }
-    }
-}
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/ConnectionProperty.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/ConnectionProperty.java
deleted file mode 100644
index 590046b195e9..000000000000
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/ConnectionProperty.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed 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 io.trino.jdbc;
-
-import java.sql.DriverPropertyInfo;
-import java.sql.SQLException;
-import java.util.Optional;
-import java.util.Properties;
-
-import static java.lang.String.format;
-
-interface ConnectionProperty<T>
-{
-    String getKey();
-
-    Optional<String> getDefault();
-
-    DriverPropertyInfo getDriverPropertyInfo(Properties properties);
-
-    boolean isRequired(Properties properties);
-
-    boolean isAllowed(Properties properties);
-
-    Optional<T> getValue(Properties properties)
-            throws SQLException;
-
-    default T getRequiredValue(Properties properties)
-            throws SQLException
-    {
-        return getValue(properties).orElseThrow(() ->
-                new SQLException(format("Connection property '%s' is required", getKey())));
-    }
-
-    void validate(Properties properties)
-            throws SQLException;
-}
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/NonRegisteringTrinoDriver.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/NonRegisteringTrinoDriver.java
index cefc529f4ead..69d725657289 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/NonRegisteringTrinoDriver.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/NonRegisteringTrinoDriver.java
@@ -13,6 +13,10 @@
  */
 package io.trino.jdbc;
 
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.okhttp.v3_0.OkHttpTelemetry;
+import okhttp3.Call;
 import okhttp3.OkHttpClient;
 
 import java.io.Closeable;
@@ -55,7 +59,19 @@ public Connection connect(String url, Properties info)
         OkHttpClient.Builder builder = httpClient.newBuilder();
         uri.setupClient(builder);
 
-        return new TrinoConnection(uri, builder.build());
+        return new TrinoConnection(uri, instrumentClient(builder.build()));
+    }
+
+    private Call.Factory instrumentClient(OkHttpClient client)
+    {
+        try {
+            OpenTelemetry openTelemetry = GlobalOpenTelemetry.get();
+            return OkHttpTelemetry.builder(openTelemetry).build().newCallFactory(client);
+        }
+        catch (NoClassDefFoundError ignored) {
+            // assume OTEL is not available and return the original client
+            return (Call.Factory) client;
+        }
     }
 
     @Override
@@ -70,24 +86,8 @@ public boolean acceptsURL(String url)
 
     @Override
     public DriverPropertyInfo[] getPropertyInfo(String url, Properties info)
-            throws SQLException
     {
-        Properties properties = urlProperties(url, info);
-
-        return ConnectionProperties.allProperties().stream()
-                .filter(property -> property.isAllowed(properties))
-                .map(property -> property.getDriverPropertyInfo(properties))
-                .toArray(DriverPropertyInfo[]::new);
-    }
-
-    private static Properties urlProperties(String url, Properties info)
-    {
-        try {
-            return TrinoDriverUri.create(url, info).getProperties();
-        }
-        catch (SQLException e) {
-            return info;
-        }
+        return TrinoDriverUri.getPropertyInfo(url, info);
     }
 
     @Override
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/QueryStats.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/QueryStats.java
index 33efda892018..d09f3297de66 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/QueryStats.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/QueryStats.java
@@ -18,7 +18,6 @@
 import java.util.Optional;
 import java.util.OptionalDouble;
 
-import static java.lang.Math.min;
 import static java.util.Objects.requireNonNull;
 
 public final class QueryStats
@@ -27,6 +26,7 @@ public final class QueryStats
     private final String state;
     private final boolean queued;
     private final boolean scheduled;
+    private final OptionalDouble progressPercentage;
     private final int nodes;
     private final int totalSplits;
     private final int queuedSplits;
@@ -46,6 +46,7 @@ public QueryStats(
             String state,
             boolean queued,
             boolean scheduled,
+            OptionalDouble progressPercentage,
             int nodes,
             int totalSplits,
             int queuedSplits,
@@ -64,6 +65,7 @@ public QueryStats(
         this.state = requireNonNull(state, "state is null");
         this.queued = queued;
         this.scheduled = scheduled;
+        this.progressPercentage = requireNonNull(progressPercentage, "progressPercentage is null");
         this.nodes = nodes;
         this.totalSplits = totalSplits;
         this.queuedSplits = queuedSplits;
@@ -86,6 +88,7 @@ static QueryStats create(String queryId, StatementStats stats)
                 stats.getState(),
                 stats.isQueued(),
                 stats.isScheduled(),
+                stats.getProgressPercentage(),
                 stats.getNodes(),
                 stats.getTotalSplits(),
                 stats.getQueuedSplits(),
@@ -121,6 +124,11 @@ public boolean isScheduled()
         return scheduled;
     }
 
+    public OptionalDouble getProgressPercentage()
+    {
+        return progressPercentage;
+    }
+
     public int getNodes()
     {
         return nodes;
@@ -185,12 +193,4 @@ public Optional<StageStats> getRootStage()
     {
         return rootStage;
     }
-
-    public OptionalDouble getProgressPercentage()
-    {
-        if (!scheduled || totalSplits == 0) {
-            return OptionalDouble.empty();
-        }
-        return OptionalDouble.of(min(100, (completedSplits * 100.0) / totalSplits));
-    }
 }
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/Row.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/Row.java
index 28297c890df5..21b061110539 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/Row.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/Row.java
@@ -14,8 +14,7 @@
 package io.trino.jdbc;
 
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/RowField.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/RowField.java
index a2b7bcfbd576..49a9184a3a67 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/RowField.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/RowField.java
@@ -13,7 +13,7 @@
  */
 package io.trino.jdbc;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoConnection.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoConnection.java
index b2675de1180b..0864fa43e5cc 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoConnection.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoConnection.java
@@ -22,9 +22,8 @@
 import io.trino.client.ClientSelectedRole;
 import io.trino.client.ClientSession;
 import io.trino.client.StatementClient;
-import okhttp3.OkHttpClient;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
+import okhttp3.Call;
 
 import java.net.URI;
 import java.nio.charset.CharsetEncoder;
@@ -90,15 +89,16 @@ public class TrinoConnection
     private final AtomicReference<String> catalog = new AtomicReference<>();
     private final AtomicReference<String> schema = new AtomicReference<>();
     private final AtomicReference<String> path = new AtomicReference<>();
+    private final AtomicReference<String> authorizationUser = new AtomicReference<>();
     private final AtomicReference<ZoneId> timeZoneId = new AtomicReference<>();
     private final AtomicReference<Locale> locale = new AtomicReference<>();
     private final AtomicReference<Integer> networkTimeoutMillis = new AtomicReference<>(Ints.saturatedCast(MINUTES.toMillis(2)));
     private final AtomicLong nextStatementId = new AtomicLong(1);
+    private final AtomicReference<Optional<String>> sessionUser = new AtomicReference<>();
 
     private final URI jdbcUri;
     private final URI httpUri;
     private final Optional<String> user;
-    private final Optional<String> sessionUser;
     private final boolean compressionDisabled;
     private final boolean assumeLiteralNamesInMetadataCallsForNonConformingClients;
     private final boolean assumeLiteralUnderscoreInMetadataCallsForNonConformingClients;
@@ -110,19 +110,19 @@ public class TrinoConnection
     private final Map<String, String> preparedStatements = new ConcurrentHashMap<>();
     private final Map<String, ClientSelectedRole> roles = new ConcurrentHashMap<>();
     private final AtomicReference<String> transactionId = new AtomicReference<>();
-    private final OkHttpClient httpClient;
+    private final Call.Factory httpCallFactory;
     private final Set<TrinoStatement> statements = newSetFromMap(new ConcurrentHashMap<>());
+    private boolean useExplicitPrepare = true;
 
-    TrinoConnection(TrinoDriverUri uri, OkHttpClient httpClient)
-            throws SQLException
+    TrinoConnection(TrinoDriverUri uri, Call.Factory httpCallFactory)
     {
         requireNonNull(uri, "uri is null");
-        this.jdbcUri = uri.getJdbcUri();
+        this.jdbcUri = uri.getUri();
         this.httpUri = uri.getHttpUri();
         uri.getSchema().ifPresent(schema::set);
         uri.getCatalog().ifPresent(catalog::set);
         this.user = uri.getUser();
-        this.sessionUser = uri.getSessionUser();
+        this.sessionUser.set(uri.getSessionUser());
         this.applicationNamePrefix = uri.getApplicationNamePrefix();
         this.source = uri.getSource();
         this.extraCredentials = uri.getExtraCredentials();
@@ -136,15 +136,17 @@ public class TrinoConnection
 
         this.assumeLiteralUnderscoreInMetadataCallsForNonConformingClients = uri.isAssumeLiteralUnderscoreInMetadataCallsForNonConformingClients();
 
-        this.httpClient = requireNonNull(httpClient, "httpClient is null");
+        this.httpCallFactory = requireNonNull(httpCallFactory, "httpCallFactory is null");
         uri.getClientInfo().ifPresent(tags -> clientInfo.put(CLIENT_INFO, tags));
         uri.getClientTags().ifPresent(tags -> clientInfo.put(CLIENT_TAGS, tags));
         uri.getTraceToken().ifPresent(tags -> clientInfo.put(TRACE_TOKEN, tags));
 
         roles.putAll(uri.getRoles());
-        timeZoneId.set(ZoneId.systemDefault());
+        timeZoneId.set(uri.getTimeZone());
         locale.set(Locale.getDefault());
         sessionProperties.putAll(uri.getSessionProperties());
+
+        uri.getExplicitPrepare().ifPresent(value -> this.useExplicitPrepare = value);
     }
 
     @Override
@@ -327,7 +329,6 @@ public void setTransactionIsolation(int level)
         isolationLevel.set(level);
     }
 
-    @SuppressWarnings("MagicConstant")
     @Override
     public int getTransactionIsolation()
             throws SQLException
@@ -638,6 +639,17 @@ public void setSessionProperty(String name, String value)
         sessionProperties.put(name, value);
     }
 
+    public void setSessionUser(String sessionUser)
+    {
+        requireNonNull(sessionUser, "sessionUser is null");
+        this.sessionUser.set(Optional.of(sessionUser));
+    }
+
+    public void clearSessionUser()
+    {
+        this.sessionUser.set(Optional.empty());
+    }
+
     @VisibleForTesting
     Map<String, ClientSelectedRole> getRoles()
     {
@@ -736,7 +748,8 @@ StatementClient startQuery(String sql, Map<String, String> sessionPropertiesOver
         ClientSession session = ClientSession.builder()
                 .server(httpUri)
                 .principal(user)
-                .user(sessionUser)
+                .user(sessionUser.get())
+                .authorizationUser(Optional.ofNullable(authorizationUser.get()))
                 .source(source)
                 .traceToken(Optional.ofNullable(clientInfo.get(TRACE_TOKEN)))
                 .clientTags(ImmutableSet.copyOf(clientTags))
@@ -755,7 +768,7 @@ StatementClient startQuery(String sql, Map<String, String> sessionPropertiesOver
                 .compressionDisabled(compressionDisabled)
                 .build();
 
-        return newStatementClient(httpClient, session, sql);
+        return newStatementClient(httpCallFactory, session, sql);
     }
 
     void updateSession(StatementClient client)
@@ -772,6 +785,15 @@ void updateSession(StatementClient client)
         client.getSetSchema().ifPresent(schema::set);
         client.getSetPath().ifPresent(path::set);
 
+        if (client.getSetAuthorizationUser().isPresent()) {
+            authorizationUser.set(client.getSetAuthorizationUser().get());
+            roles.clear();
+        }
+        if (client.isResetAuthorizationUser()) {
+            authorizationUser.set(null);
+            roles.clear();
+        }
+
         if (client.getStartedTransactionId() != null) {
             transactionId.set(client.getStartedTransactionId());
         }
@@ -801,6 +823,12 @@ int activeStatements()
         return statements.size();
     }
 
+    @VisibleForTesting
+    String getAuthorizationUser()
+    {
+        return authorizationUser.get();
+    }
+
     private void checkOpen()
             throws SQLException
     {
@@ -886,4 +914,9 @@ public void throwIfHeld()
             }
         }
     }
+
+    public boolean useExplicitPrepare()
+    {
+        return this.useExplicitPrepare;
+    }
 }
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoDatabaseMetaData.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoDatabaseMetaData.java
index f88295936b82..e0d18523f47e 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoDatabaseMetaData.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoDatabaseMetaData.java
@@ -19,8 +19,7 @@
 import io.trino.client.ClientTypeSignature;
 import io.trino.client.ClientTypeSignatureParameter;
 import io.trino.client.Column;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoDriverUri.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoDriverUri.java
index 4862ba3dad5d..e586d93c929f 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoDriverUri.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoDriverUri.java
@@ -13,131 +13,29 @@
  */
 package io.trino.jdbc;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import com.google.common.net.HostAndPort;
-import io.trino.client.ClientException;
-import io.trino.client.ClientSelectedRole;
-import io.trino.client.auth.external.CompositeRedirectHandler;
-import io.trino.client.auth.external.ExternalAuthenticator;
-import io.trino.client.auth.external.HttpTokenPoller;
-import io.trino.client.auth.external.RedirectHandler;
-import io.trino.client.auth.external.TokenPoller;
-import okhttp3.OkHttpClient;
+import io.trino.client.uri.TrinoUri;
 
-import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.sql.SQLException;
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.Properties;
-import java.util.concurrent.atomic.AtomicReference;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static io.trino.client.KerberosUtil.defaultCredentialCachePath;
-import static io.trino.client.OkHttpUtil.basicAuth;
-import static io.trino.client.OkHttpUtil.setupCookieJar;
-import static io.trino.client.OkHttpUtil.setupHttpProxy;
-import static io.trino.client.OkHttpUtil.setupInsecureSsl;
-import static io.trino.client.OkHttpUtil.setupKerberos;
-import static io.trino.client.OkHttpUtil.setupSocksProxy;
-import static io.trino.client.OkHttpUtil.setupSsl;
-import static io.trino.client.OkHttpUtil.tokenAuth;
-import static io.trino.jdbc.ConnectionProperties.ACCESS_TOKEN;
-import static io.trino.jdbc.ConnectionProperties.APPLICATION_NAME_PREFIX;
-import static io.trino.jdbc.ConnectionProperties.ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS;
-import static io.trino.jdbc.ConnectionProperties.ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS;
-import static io.trino.jdbc.ConnectionProperties.CLIENT_INFO;
-import static io.trino.jdbc.ConnectionProperties.CLIENT_TAGS;
-import static io.trino.jdbc.ConnectionProperties.DISABLE_COMPRESSION;
-import static io.trino.jdbc.ConnectionProperties.DNS_RESOLVER;
-import static io.trino.jdbc.ConnectionProperties.DNS_RESOLVER_CONTEXT;
-import static io.trino.jdbc.ConnectionProperties.EXTERNAL_AUTHENTICATION;
-import static io.trino.jdbc.ConnectionProperties.EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS;
-import static io.trino.jdbc.ConnectionProperties.EXTERNAL_AUTHENTICATION_TIMEOUT;
-import static io.trino.jdbc.ConnectionProperties.EXTERNAL_AUTHENTICATION_TOKEN_CACHE;
-import static io.trino.jdbc.ConnectionProperties.EXTRA_CREDENTIALS;
-import static io.trino.jdbc.ConnectionProperties.HTTP_PROXY;
-import static io.trino.jdbc.ConnectionProperties.KERBEROS_CONFIG_PATH;
-import static io.trino.jdbc.ConnectionProperties.KERBEROS_CREDENTIAL_CACHE_PATH;
-import static io.trino.jdbc.ConnectionProperties.KERBEROS_DELEGATION;
-import static io.trino.jdbc.ConnectionProperties.KERBEROS_KEYTAB_PATH;
-import static io.trino.jdbc.ConnectionProperties.KERBEROS_PRINCIPAL;
-import static io.trino.jdbc.ConnectionProperties.KERBEROS_REMOTE_SERVICE_NAME;
-import static io.trino.jdbc.ConnectionProperties.KERBEROS_SERVICE_PRINCIPAL_PATTERN;
-import static io.trino.jdbc.ConnectionProperties.KERBEROS_USE_CANONICAL_HOSTNAME;
-import static io.trino.jdbc.ConnectionProperties.PASSWORD;
-import static io.trino.jdbc.ConnectionProperties.ROLES;
-import static io.trino.jdbc.ConnectionProperties.SESSION_PROPERTIES;
-import static io.trino.jdbc.ConnectionProperties.SESSION_USER;
-import static io.trino.jdbc.ConnectionProperties.SOCKS_PROXY;
-import static io.trino.jdbc.ConnectionProperties.SOURCE;
-import static io.trino.jdbc.ConnectionProperties.SSL;
-import static io.trino.jdbc.ConnectionProperties.SSL_KEY_STORE_PASSWORD;
-import static io.trino.jdbc.ConnectionProperties.SSL_KEY_STORE_PATH;
-import static io.trino.jdbc.ConnectionProperties.SSL_KEY_STORE_TYPE;
-import static io.trino.jdbc.ConnectionProperties.SSL_TRUST_STORE_PASSWORD;
-import static io.trino.jdbc.ConnectionProperties.SSL_TRUST_STORE_PATH;
-import static io.trino.jdbc.ConnectionProperties.SSL_TRUST_STORE_TYPE;
-import static io.trino.jdbc.ConnectionProperties.SSL_USE_SYSTEM_TRUST_STORE;
-import static io.trino.jdbc.ConnectionProperties.SSL_VERIFICATION;
-import static io.trino.jdbc.ConnectionProperties.SslVerificationMode;
-import static io.trino.jdbc.ConnectionProperties.SslVerificationMode.CA;
-import static io.trino.jdbc.ConnectionProperties.SslVerificationMode.FULL;
-import static io.trino.jdbc.ConnectionProperties.SslVerificationMode.NONE;
-import static io.trino.jdbc.ConnectionProperties.TRACE_TOKEN;
-import static io.trino.jdbc.ConnectionProperties.USER;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
 
 /**
  * Parses and extracts parameters from a Trino JDBC URL.
  */
 public final class TrinoDriverUri
+        extends TrinoUri
 {
     private static final String JDBC_URL_PREFIX = "jdbc:";
     private static final String JDBC_URL_START = JDBC_URL_PREFIX + "trino:";
 
-    private static final Splitter QUERY_SPLITTER = Splitter.on('&').omitEmptyStrings();
-    private static final Splitter ARG_SPLITTER = Splitter.on('=').limit(2);
-    private static final AtomicReference<RedirectHandler> REDIRECT_HANDLER = new AtomicReference<>(null);
-    private final HostAndPort address;
-    private final URI uri;
-
-    private final Properties properties;
-
-    private Optional<String> catalog = Optional.empty();
-    private Optional<String> schema = Optional.empty();
-
-    private final boolean useSecureConnection;
-
-    private TrinoDriverUri(String url, Properties driverProperties)
+    private TrinoDriverUri(String uri, Properties driverProperties)
             throws SQLException
     {
-        this(parseDriverUrl(url), driverProperties);
-    }
-
-    private TrinoDriverUri(URI uri, Properties driverProperties)
-            throws SQLException
-    {
-        this.uri = requireNonNull(uri, "uri is null");
-        address = HostAndPort.fromParts(uri.getHost(), uri.getPort());
-        properties = mergeConnectionProperties(uri, driverProperties);
-
-        validateConnectionProperties(properties);
-
-        // enable SSL by default for standard port
-        useSecureConnection = SSL.getValue(properties).orElse(uri.getPort() == 443);
-
-        initCatalogAndSchema();
+        super(parseDriverUrl(uri), driverProperties);
     }
 
     public static TrinoDriverUri create(String url, Properties properties)
@@ -151,266 +49,11 @@ public static boolean acceptsURL(String url)
         return url.startsWith(JDBC_URL_START);
     }
 
-    public URI getJdbcUri()
-    {
-        return uri;
-    }
-
-    public Optional<String> getSchema()
-    {
-        return schema;
-    }
-
-    public Optional<String> getCatalog()
-    {
-        return catalog;
-    }
-
-    public URI getHttpUri()
-    {
-        return buildHttpUri();
-    }
-
-    public String getRequiredUser()
-            throws SQLException
-    {
-        return USER.getRequiredValue(properties);
-    }
-
-    public Optional<String> getUser()
-            throws SQLException
-    {
-        return USER.getValue(properties);
-    }
-
-    public Optional<String> getSessionUser()
-            throws SQLException
-    {
-        return SESSION_USER.getValue(properties);
-    }
-
-    public Map<String, ClientSelectedRole> getRoles()
-            throws SQLException
-    {
-        return ROLES.getValue(properties).orElse(ImmutableMap.of());
-    }
-
-    public Optional<String> getApplicationNamePrefix()
-            throws SQLException
-    {
-        return APPLICATION_NAME_PREFIX.getValue(properties);
-    }
-
-    public Properties getProperties()
-    {
-        return properties;
-    }
-
-    public Map<String, String> getExtraCredentials()
-            throws SQLException
-    {
-        return EXTRA_CREDENTIALS.getValue(properties).orElse(ImmutableMap.of());
-    }
-
-    public Optional<String> getClientInfo()
-            throws SQLException
-    {
-        return CLIENT_INFO.getValue(properties);
-    }
-
-    public Optional<String> getClientTags()
-            throws SQLException
-    {
-        return CLIENT_TAGS.getValue(properties);
-    }
-
-    public Optional<String> getTraceToken()
-            throws SQLException
-    {
-        return TRACE_TOKEN.getValue(properties);
-    }
-
-    public Map<String, String> getSessionProperties()
-            throws SQLException
-    {
-        return SESSION_PROPERTIES.getValue(properties).orElse(ImmutableMap.of());
-    }
-
-    public Optional<String> getSource()
-            throws SQLException
-    {
-        return SOURCE.getValue(properties);
-    }
-
-    public boolean isCompressionDisabled()
-            throws SQLException
-    {
-        return DISABLE_COMPRESSION.getValue(properties).orElse(false);
-    }
-
-    public boolean isAssumeLiteralNamesInMetadataCallsForNonConformingClients()
-            throws SQLException
-    {
-        return ASSUME_LITERAL_NAMES_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS.getValue(properties).orElse(false);
-    }
-
-    public boolean isAssumeLiteralUnderscoreInMetadataCallsForNonConformingClients()
-            throws SQLException
-    {
-        return ASSUME_LITERAL_UNDERSCORE_IN_METADATA_CALLS_FOR_NON_CONFORMING_CLIENTS.getValue(properties).orElse(false);
-    }
-
-    public void setupClient(OkHttpClient.Builder builder)
-            throws SQLException
-    {
-        try {
-            setupCookieJar(builder);
-            setupSocksProxy(builder, SOCKS_PROXY.getValue(properties));
-            setupHttpProxy(builder, HTTP_PROXY.getValue(properties));
-
-            // TODO: fix Tempto to allow empty passwords
-            String password = PASSWORD.getValue(properties).orElse("");
-            if (!password.isEmpty() && !password.equals("***empty***")) {
-                if (!useSecureConnection) {
-                    throw new SQLException("Authentication using username/password requires SSL to be enabled");
-                }
-                builder.addInterceptor(basicAuth(getRequiredUser(), password));
-            }
-
-            if (useSecureConnection) {
-                SslVerificationMode sslVerificationMode = SSL_VERIFICATION.getValue(properties).orElse(FULL);
-                if (sslVerificationMode.equals(FULL) || sslVerificationMode.equals(CA)) {
-                    setupSsl(
-                            builder,
-                            SSL_KEY_STORE_PATH.getValue(properties),
-                            SSL_KEY_STORE_PASSWORD.getValue(properties),
-                            SSL_KEY_STORE_TYPE.getValue(properties),
-                            SSL_TRUST_STORE_PATH.getValue(properties),
-                            SSL_TRUST_STORE_PASSWORD.getValue(properties),
-                            SSL_TRUST_STORE_TYPE.getValue(properties),
-                            SSL_USE_SYSTEM_TRUST_STORE.getValue(properties).orElse(false));
-                }
-
-                if (sslVerificationMode.equals(CA)) {
-                    builder.hostnameVerifier((hostname, session) -> true);
-                }
-
-                if (sslVerificationMode.equals(NONE)) {
-                    setupInsecureSsl(builder);
-                }
-            }
-
-            if (KERBEROS_REMOTE_SERVICE_NAME.getValue(properties).isPresent()) {
-                if (!useSecureConnection) {
-                    throw new SQLException("Authentication using Kerberos requires SSL to be enabled");
-                }
-                setupKerberos(
-                        builder,
-                        KERBEROS_SERVICE_PRINCIPAL_PATTERN.getRequiredValue(properties),
-                        KERBEROS_REMOTE_SERVICE_NAME.getRequiredValue(properties),
-                        KERBEROS_USE_CANONICAL_HOSTNAME.getRequiredValue(properties),
-                        KERBEROS_PRINCIPAL.getValue(properties),
-                        KERBEROS_CONFIG_PATH.getValue(properties),
-                        KERBEROS_KEYTAB_PATH.getValue(properties),
-                        Optional.ofNullable(KERBEROS_CREDENTIAL_CACHE_PATH.getValue(properties)
-                                .orElseGet(() -> defaultCredentialCachePath().map(File::new).orElse(null))),
-                        KERBEROS_DELEGATION.getRequiredValue(properties));
-            }
-
-            if (ACCESS_TOKEN.getValue(properties).isPresent()) {
-                if (!useSecureConnection) {
-                    throw new SQLException("Authentication using an access token requires SSL to be enabled");
-                }
-                builder.addInterceptor(tokenAuth(ACCESS_TOKEN.getValue(properties).get()));
-            }
-
-            if (EXTERNAL_AUTHENTICATION.getValue(properties).orElse(false)) {
-                if (!useSecureConnection) {
-                    throw new SQLException("Authentication using external authorization requires SSL to be enabled");
-                }
-
-                // create HTTP client that shares the same settings, but without the external authenticator
-                TokenPoller poller = new HttpTokenPoller(builder.build());
-
-                Duration timeout = EXTERNAL_AUTHENTICATION_TIMEOUT.getValue(properties)
-                        .map(value -> Duration.ofMillis(value.toMillis()))
-                        .orElse(Duration.ofMinutes(2));
-
-                KnownTokenCache knownTokenCache = EXTERNAL_AUTHENTICATION_TOKEN_CACHE.getValue(properties).get();
-
-                Optional<RedirectHandler> configuredHandler = EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS.getValue(properties)
-                        .map(CompositeRedirectHandler::new)
-                        .map(RedirectHandler.class::cast);
-
-                RedirectHandler redirectHandler = Optional.ofNullable(REDIRECT_HANDLER.get())
-                        .orElseGet(() -> configuredHandler.orElseThrow(() -> new RuntimeException("External authentication redirect handler is not configured")));
-
-                ExternalAuthenticator authenticator = new ExternalAuthenticator(redirectHandler, poller, knownTokenCache.create(), timeout);
-
-                builder.authenticator(authenticator);
-                builder.addInterceptor(authenticator);
-            }
-
-            Optional<String> resolverContext = DNS_RESOLVER_CONTEXT.getValue(properties);
-            DNS_RESOLVER.getValue(properties).ifPresent(resolverClass -> builder.dns(instantiateDnsResolver(resolverClass, resolverContext)::lookup));
-        }
-        catch (ClientException e) {
-            throw new SQLException(e.getMessage(), e);
-        }
-        catch (RuntimeException e) {
-            throw new SQLException("Error setting up connection", e);
-        }
-    }
-
-    private static DnsResolver instantiateDnsResolver(Class<? extends DnsResolver> resolverClass, Optional<String> context)
-    {
-        try {
-            return resolverClass.getConstructor(String.class).newInstance(context.orElse(null));
-        }
-        catch (ReflectiveOperationException e) {
-            throw new ClientException("Unable to instantiate custom DNS resolver " + resolverClass.getName(), e);
-        }
-    }
-
-    private static Map<String, String> parseParameters(String query)
-            throws SQLException
-    {
-        Map<String, String> result = new HashMap<>();
-
-        if (query != null) {
-            Iterable<String> queryArgs = QUERY_SPLITTER.split(query);
-            for (String queryArg : queryArgs) {
-                List<String> parts = ARG_SPLITTER.splitToList(queryArg);
-                if (parts.size() != 2) {
-                    throw new SQLException(format("Connection argument is not valid connection property: '%s'", queryArg));
-                }
-                if (result.put(parts.get(0), parts.get(1)) != null) {
-                    throw new SQLException(format("Connection property '%s' is in URL multiple times", parts.get(0)));
-                }
-            }
-        }
-
-        return result;
-    }
-
     private static URI parseDriverUrl(String url)
             throws SQLException
     {
-        if (!url.startsWith(JDBC_URL_START)) {
-            throw new SQLException("Invalid JDBC URL: " + url);
-        }
-
-        if (url.equals(JDBC_URL_START)) {
-            throw new SQLException("Empty JDBC URL: " + url);
-        }
-
-        URI uri;
-        try {
-            uri = new URI(url.substring(JDBC_URL_PREFIX.length()));
-        }
-        catch (URISyntaxException e) {
-            throw new SQLException("Invalid JDBC URL: " + url, e);
-        }
+        validatePrefix(url);
+        URI uri = parseUrl(url);
 
         if (isNullOrEmpty(uri.getHost())) {
             throw new SQLException("No host specified: " + url);
@@ -424,100 +67,26 @@ private static URI parseDriverUrl(String url)
         return uri;
     }
 
-    private URI buildHttpUri()
+    private static URI parseUrl(String url)
+            throws SQLException
     {
-        String scheme = useSecureConnection ? "https" : "http";
         try {
-            return new URI(scheme, null, address.getHost(), address.getPort(), null, null, null);
+            return new URI(url.substring(JDBC_URL_PREFIX.length()));
         }
         catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private void initCatalogAndSchema()
-            throws SQLException
-    {
-        String path = uri.getPath();
-        if (isNullOrEmpty(uri.getPath()) || path.equals("/")) {
-            return;
-        }
-
-        // remove first slash
-        if (!path.startsWith("/")) {
-            throw new SQLException("Path does not start with a slash: " + uri);
-        }
-        path = path.substring(1);
-
-        List<String> parts = Splitter.on("/").splitToList(path);
-        // remove last item due to a trailing slash
-        if (parts.get(parts.size() - 1).isEmpty()) {
-            parts = parts.subList(0, parts.size() - 1);
-        }
-
-        if (parts.size() > 2) {
-            throw new SQLException("Invalid path segments in URL: " + uri);
-        }
-
-        if (parts.get(0).isEmpty()) {
-            throw new SQLException("Catalog name is empty: " + uri);
-        }
-
-        catalog = Optional.ofNullable(parts.get(0));
-
-        if (parts.size() > 1) {
-            if (parts.get(1).isEmpty()) {
-                throw new SQLException("Schema name is empty: " + uri);
-            }
-
-            schema = Optional.ofNullable(parts.get(1));
-        }
-    }
-
-    private static Properties mergeConnectionProperties(URI uri, Properties driverProperties)
-            throws SQLException
-    {
-        Map<String, String> defaults = ConnectionProperties.getDefaults();
-        Map<String, String> urlProperties = parseParameters(uri.getQuery());
-        Map<String, String> suppliedProperties = Maps.fromProperties(driverProperties);
-
-        for (String key : urlProperties.keySet()) {
-            if (suppliedProperties.containsKey(key)) {
-                throw new SQLException(format("Connection property '%s' is both in the URL and an argument", key));
-            }
-        }
-
-        Properties result = new Properties();
-        setProperties(result, defaults);
-        setProperties(result, urlProperties);
-        setProperties(result, suppliedProperties);
-        return result;
-    }
-
-    private static void setProperties(Properties properties, Map<String, String> values)
-    {
-        for (Entry<String, String> entry : values.entrySet()) {
-            properties.setProperty(entry.getKey(), entry.getValue());
+            throw new SQLException("Invalid JDBC URL: " + url, e);
         }
     }
 
-    private static void validateConnectionProperties(Properties connectionProperties)
+    private static void validatePrefix(String url)
             throws SQLException
     {
-        for (String propertyName : connectionProperties.stringPropertyNames()) {
-            if (ConnectionProperties.forKey(propertyName) == null) {
-                throw new SQLException(format("Unrecognized connection property '%s'", propertyName));
-            }
+        if (!url.startsWith(JDBC_URL_START)) {
+            throw new SQLException("Invalid JDBC URL: " + url);
         }
 
-        for (ConnectionProperty<?> property : ConnectionProperties.allProperties()) {
-            property.validate(connectionProperties);
+        if (url.equals(JDBC_URL_START)) {
+            throw new SQLException("Empty JDBC URL: " + url);
         }
     }
-
-    @VisibleForTesting
-    static void setRedirectHandler(RedirectHandler handler)
-    {
-        REDIRECT_HANDLER.set(requireNonNull(handler, "handler is null"));
-    }
 }
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoPreparedStatement.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoPreparedStatement.java
index 4c646837d79b..a1e17775dde6 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoPreparedStatement.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoPreparedStatement.java
@@ -109,6 +109,7 @@ public class TrinoPreparedStatement
     private final String statementName;
     private final String originalSql;
     private boolean isBatch;
+    private boolean prepareStatementExecuted;
 
     TrinoPreparedStatement(TrinoConnection connection, Consumer<TrinoStatement> onClose, String statementName, String sql)
             throws SQLException
@@ -116,7 +117,10 @@ public class TrinoPreparedStatement
         super(connection, onClose);
         this.statementName = requireNonNull(statementName, "statementName is null");
         this.originalSql = requireNonNull(sql, "sql is null");
-        super.execute(format("PREPARE %s FROM %s", statementName, sql));
+        if (connection().useExplicitPrepare()) {
+            super.execute(format("PREPARE %s FROM %s", statementName, sql));
+            prepareStatementExecuted = true;
+        }
     }
 
     @Override
@@ -683,6 +687,8 @@ public void setArray(int parameterIndex, Array x)
     public ResultSetMetaData getMetaData()
             throws SQLException
     {
+        prepareStatementIfNecessary();
+
         try (Statement statement = connection().createStatement(); ResultSet resultSet = statement.executeQuery("DESCRIBE OUTPUT " + statementName)) {
             return new TrinoResultSetMetaData(getDescribeOutputColumnInfoList(resultSet));
         }
@@ -720,6 +726,8 @@ public void setURL(int parameterIndex, URL x)
     public ParameterMetaData getParameterMetaData()
             throws SQLException
     {
+        prepareStatementIfNecessary();
+
         try (Statement statement = connection().createStatement(); ResultSet resultSet = statement.executeQuery("DESCRIBE INPUT " + statementName)) {
             return new TrinoParameterMetaData(getParamerters(resultSet));
         }
@@ -986,7 +994,19 @@ private void requireNonBatchStatement()
         }
     }
 
-    private static String getExecuteSql(String statementName, List<String> values)
+    private String getExecuteImmediateSql(List<String> values)
+    {
+        StringBuilder sql = new StringBuilder();
+        sql.append("EXECUTE IMMEDIATE ");
+        sql.append(formatStringLiteral(originalSql));
+        if (!values.isEmpty()) {
+            sql.append(" USING ");
+            Joiner.on(", ").appendTo(sql, values);
+        }
+        return sql.toString();
+    }
+
+    private String getLegacySql(String statementName, List<String> values)
     {
         StringBuilder sql = new StringBuilder();
         sql.append("EXECUTE ").append(statementName);
@@ -997,6 +1017,14 @@ private static String getExecuteSql(String statementName, List<String> values)
         return sql.toString();
     }
 
+    private String getExecuteSql(String statementName, List<String> values)
+            throws SQLException
+    {
+        return connection().useExplicitPrepare()
+                ? getLegacySql(statementName, values)
+                : getExecuteImmediateSql(values);
+    }
+
     private static String formatLiteral(String type, String x)
     {
         return type + " " + formatStringLiteral(x);
@@ -1118,6 +1146,22 @@ private static List<ColumnInfo> getDescribeOutputColumnInfoList(ResultSet result
         return list.build();
     }
 
+    /*
+    When explicitPrepare is disabled, the PREPARE statement won't be executed unless needed
+    e.g. when getMetadata() or getParameterMetadata() are called.
+    When needed, just make sure it is executed only once, even if the metadata methods are called many times
+     */
+    private void prepareStatementIfNecessary()
+            throws SQLException
+    {
+        if (prepareStatementExecuted) {
+            return;
+        }
+
+        super.execute(format("PREPARE %s FROM %s", statementName, originalSql));
+        prepareStatementExecuted = true;
+    }
+
     @VisibleForTesting
     static ClientTypeSignature getClientTypeSignatureFromTypeString(String type)
     {
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoResultSet.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoResultSet.java
index 8611b6733653..bb29e8c8ba48 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoResultSet.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoResultSet.java
@@ -17,12 +17,11 @@
 import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.Streams;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.client.Column;
 import io.trino.client.QueryStatusInfo;
 import io.trino.client.StatementClient;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Iterator;
diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/WarningsManager.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/WarningsManager.java
index 5dddd7216246..832524a2b199 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/WarningsManager.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/WarningsManager.java
@@ -13,11 +13,10 @@
  */
 package io.trino.jdbc;
 
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.client.Warning;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.sql.SQLWarning;
 import java.util.HashSet;
 import java.util.List;
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/BaseTestJdbcResultSet.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/BaseTestJdbcResultSet.java
index 4bff405d215c..ba7c0f699334 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/BaseTestJdbcResultSet.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/BaseTestJdbcResultSet.java
@@ -247,7 +247,7 @@ public void testDate()
 
                 assertEquals(rs.getObject(column), sqlDate);
                 assertEquals(rs.getObject(column, Date.class), sqlDate);
-                // TODO assertEquals(rs.getObject(column, LocalDate.class), localDate);
+                assertEquals(rs.getObject(column, LocalDate.class), localDate);
 
                 assertEquals(rs.getDate(column), sqlDate);
                 assertThatThrownBy(() -> rs.getTime(column))
@@ -267,7 +267,7 @@ public void testDate()
 
                 assertEquals(rs.getObject(column), sqlDate);
                 assertEquals(rs.getObject(column, Date.class), sqlDate);
-                // TODO assertEquals(rs.getObject(column, LocalDate.class), localDate);
+                assertEquals(rs.getObject(column, LocalDate.class), localDate);
 
                 assertEquals(rs.getDate(column), sqlDate);
                 assertThatThrownBy(() -> rs.getTime(column))
@@ -283,24 +283,12 @@ public void testDate()
             // date which midnight does not exist in test JVM zone
             checkRepresentation(connectedStatement.getStatement(), "DATE '1970-01-01'", Types.DATE, (rs, column) -> {
                 LocalDate localDate = LocalDate.of(1970, 1, 1);
+                Date sqlDate = Date.valueOf(localDate);
 
-                // TODO (https://github.com/trinodb/trino/issues/6242) this should not fail
-                assertThatThrownBy(() -> rs.getObject(column))
-                        .isInstanceOf(SQLException.class)
-                        .hasMessage("Expected value to be a date but is: 1970-01-01")
-                        .hasStackTraceContaining("Cannot parse \"1970-01-01\": Illegal instant due to time zone offset transition (America/Bahia_Banderas)");
-                // TODO (https://github.com/trinodb/trino/issues/6242) this should not fail
-                assertThatThrownBy(() -> rs.getObject(column, Date.class))
-                        .isInstanceOf(SQLException.class)
-                        .hasMessage("Expected value to be a date but is: 1970-01-01")
-                        .hasStackTraceContaining("Cannot parse \"1970-01-01\": Illegal instant due to time zone offset transition (America/Bahia_Banderas)");
-                // TODO assertEquals(rs.getObject(column, LocalDate.class), localDate);
-
-                // TODO (https://github.com/trinodb/trino/issues/6242) this should not fail
-                assertThatThrownBy(() -> rs.getDate(column))
-                        .isInstanceOf(SQLException.class)
-                        .hasMessage("Expected value to be a date but is: 1970-01-01")
-                        .hasStackTraceContaining("Cannot parse \"1970-01-01\": Illegal instant due to time zone offset transition (America/Bahia_Banderas)");
+                assertEquals(rs.getObject(column), sqlDate);
+                assertEquals(rs.getObject(column, Date.class), sqlDate);
+                assertEquals(rs.getObject(column, LocalDate.class), localDate);
+                assertEquals(rs.getDate(column), sqlDate);
                 assertThatThrownBy(() -> rs.getTime(column))
                         .isInstanceOf(IllegalArgumentException.class)
                         .hasMessage("Expected column to be a time type but is date");
@@ -318,7 +306,7 @@ public void testDate()
 
                 assertEquals(rs.getObject(column), sqlDate);
                 assertEquals(rs.getObject(column, Date.class), sqlDate);
-                // TODO assertEquals(rs.getObject(column, LocalDate.class), localDate);
+                assertEquals(rs.getObject(column, LocalDate.class), localDate);
 
                 assertEquals(rs.getDate(column), sqlDate);
                 assertThatThrownBy(() -> rs.getTime(column))
@@ -338,7 +326,9 @@ public void testDate()
 
                 assertEquals(rs.getObject(column), sqlDate);
                 assertEquals(rs.getObject(column, Date.class), sqlDate);
-                // TODO assertEquals(rs.getObject(column, LocalDate.class), localDate);
+
+                // There are no days between 1582-10-05 and 1582-10-14
+                assertEquals(rs.getObject(column, LocalDate.class), LocalDate.of(1582, 10, 20));
 
                 assertEquals(rs.getDate(column), sqlDate);
                 assertThatThrownBy(() -> rs.getTime(column))
@@ -358,7 +348,7 @@ public void testDate()
 
                 assertEquals(rs.getObject(column), sqlDate);
                 assertEquals(rs.getObject(column, Date.class), sqlDate);
-                // TODO assertEquals(rs.getObject(column, LocalDate.class), localDate);
+                assertEquals(rs.getObject(column, LocalDate.class), localDate);
 
                 assertEquals(rs.getDate(column), sqlDate);
                 assertThatThrownBy(() -> rs.getTime(column))
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/JdbcDriverIT.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/JdbcDriverIT.java
new file mode 100644
index 000000000000..37590034ee2c
--- /dev/null
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/JdbcDriverIT.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed 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 io.trino.jdbc;
+
+import com.google.common.collect.ImmutableSet;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.List;
+import java.util.Set;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class JdbcDriverIT
+{
+    private static final Set<String> MANIFEST_FILES = ImmutableSet.of(
+            "META-INF/MANIFEST.MF",
+            "META-INF/services/java.sql.Driver");
+
+    @Test
+    public void testDependenciesRelocated()
+    {
+        String file = System.getProperty("jdbc-jar");
+        try (JarFile jarFile = new JarFile(file)) {
+            List<String> nonRelocatedFiles = jarFile.stream()
+                    .filter(value -> !value.isDirectory())
+                    .map(ZipEntry::getName)
+                    .filter(name -> !isExpectedFile(name))
+                    .collect(toImmutableList());
+
+            assertThat(nonRelocatedFiles)
+                    .describedAs("Non-relocated files in the shaded jar")
+                    .isEmpty();
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    public static boolean isExpectedFile(String filename)
+    {
+        return MANIFEST_FILES.contains(filename) || filename.startsWith("io/trino/jdbc");
+    }
+}
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestAbstractTrinoResultSet.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestAbstractTrinoResultSet.java
index 250fe1ef501d..0dc0f4218a74 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestAbstractTrinoResultSet.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestAbstractTrinoResultSet.java
@@ -13,7 +13,7 @@
  */
 package io.trino.jdbc;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.jdbc.AbstractTrinoResultSet.DEFAULT_OBJECT_REPRESENTATION;
 import static io.trino.jdbc.AbstractTrinoResultSet.TYPE_CONVERSIONS;
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java
index cd68841641af..eca4ea92d40c 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java
@@ -32,10 +32,12 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.testing.DataProviders;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -65,18 +67,20 @@
 import static java.util.stream.IntStream.range;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
+@TestInstance(PER_CLASS)
 public class TestJdbcConnection
 {
     private final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getName()));
 
     private TestingTrinoServer server;
 
-    @BeforeClass
+    @BeforeAll
     public void setupServer()
             throws Exception
     {
@@ -109,7 +113,7 @@ public void setupServer()
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -274,16 +278,16 @@ public void testSession()
             }
 
             for (String part : ImmutableList.of(",", "=", ":", "|", "/", "\\", "'", "\\'", "''", "\"", "\\\"", "[", "]")) {
-                String value = format("/tmp/presto-%s-${USER}", part);
+                String value = format("my-table-%s-name", part);
                 try {
                     try (Statement statement = connection.createStatement()) {
-                        statement.execute(format("SET SESSION hive.temporary_staging_directory_path = '%s'", value.replace("'", "''")));
+                        statement.execute(format("SET SESSION spatial_partitioning_table_name = '%s'", value.replace("'", "''")));
                     }
 
                     assertThat(listSession(connection))
                             .contains("join_distribution_type|BROADCAST|AUTOMATIC")
                             .contains("exchange_compression|true|false")
-                            .contains(format("hive.temporary_staging_directory_path|%s|/tmp/presto-${USER}", value));
+                            .contains(format("spatial_partitioning_table_name|%s|", value));
                 }
                 catch (Exception e) {
                     fail(format("Failed to set session property value to [%s]", value), e);
@@ -420,14 +424,29 @@ private void testRole(String roleParameterValue, ClientSelectedRole clientSelect
     public void testSessionProperties()
             throws SQLException
     {
-        try (Connection connection = createConnection("roles=hive:admin&sessionProperties=hive.temporary_staging_directory_path:/tmp;execution_policy:all-at-once")) {
+        try (Connection connection = createConnection("roles=hive:admin&sessionProperties=hive.hive_views_legacy_translation:true;execution_policy:all-at-once")) {
             TrinoConnection trinoConnection = connection.unwrap(TrinoConnection.class);
             assertThat(trinoConnection.getSessionProperties())
-                    .extractingByKeys("hive.temporary_staging_directory_path", "execution_policy")
-                    .containsExactly("/tmp", "all-at-once");
+                    .extractingByKeys("hive.hive_views_legacy_translation", "execution_policy")
+                    .containsExactly("true", "all-at-once");
             assertThat(listSession(connection)).containsAll(ImmutableSet.of(
                     "execution_policy|all-at-once|phased",
-                    "hive.temporary_staging_directory_path|/tmp|/tmp/presto-${USER}"));
+                    "hive.hive_views_legacy_translation|true|false"));
+        }
+    }
+
+    @Test
+    public void testSessionUser()
+            throws SQLException
+    {
+        try (Connection connection = createConnection()) {
+            assertThat(getSingleStringColumn(connection, "select current_user")).isEqualTo("admin");
+            TrinoConnection trinoConnection = connection.unwrap(TrinoConnection.class);
+            String impersonatedUser = "alice";
+            trinoConnection.setSessionUser(impersonatedUser);
+            assertThat(getSingleStringColumn(connection, "select current_user")).isEqualTo(impersonatedUser);
+            trinoConnection.clearSessionUser();
+            assertThat(getSingleStringColumn(connection, "select current_user")).isEqualTo("admin");
         }
     }
 
@@ -436,8 +455,17 @@ public void testSessionProperties()
      * @see TestJdbcStatement#testConcurrentCancellationOnStatementClose()
      */
     // TODO https://github.com/trinodb/trino/issues/10096 - enable test once concurrent jdbc statements are supported
-    @Test(timeOut = 60_000, dataProviderClass = DataProviders.class, dataProvider = "trueFalse", enabled = false)
-    public void testConcurrentCancellationOnConnectionClose(boolean autoCommit)
+    @Test
+    @Timeout(60)
+    @Disabled
+    public void testConcurrentCancellationOnConnectionClose()
+            throws Exception
+    {
+        testConcurrentCancellationOnConnectionClose(true);
+        testConcurrentCancellationOnConnectionClose(false);
+    }
+
+    private void testConcurrentCancellationOnConnectionClose(boolean autoCommit)
             throws Exception
     {
         String sql = "SELECT * FROM blackhole.default.delay -- test cancellation " + randomUUID();
@@ -570,6 +598,18 @@ private List<String> listSingleStringColumn(String sql)
         return statuses.build();
     }
 
+    private String getSingleStringColumn(Connection connection, String sql)
+            throws SQLException
+    {
+        try (Statement statement = connection.createStatement(); ResultSet resultSet = statement.executeQuery(sql)) {
+            assertThat(resultSet.getMetaData().getColumnCount()).isOne();
+            assertThat(resultSet.next()).isTrue();
+            String result = resultSet.getString(1);
+            assertThat(resultSet.next()).isFalse();
+            return result;
+        }
+    }
+
     private static void assertConnectionSource(Connection connection, String expectedSource)
             throws SQLException
     {
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcExternalAuthentication.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcExternalAuthentication.java
index 3b984cad6b81..4afc14f41dda 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcExternalAuthentication.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcExternalAuthentication.java
@@ -30,22 +30,23 @@
 import io.trino.server.security.ResourceSecurity;
 import io.trino.server.testing.TestingTrinoServer;
 import io.trino.spi.security.Identity;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.io.File;
 import java.io.IOException;
@@ -76,23 +77,26 @@
 import static io.trino.jdbc.TrinoDriverUri.setRedirectHandler;
 import static io.trino.server.security.ResourceSecurity.AccessType.PUBLIC;
 import static io.trino.server.security.ServerSecurityModule.authenticatorModule;
+import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 import static java.lang.String.format;
 import static java.net.HttpURLConnection.HTTP_OK;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
-import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
+@Execution(SAME_THREAD)
 public class TestJdbcExternalAuthentication
 {
     private static final String TEST_CATALOG = "test_catalog";
     private TestingTrinoServer server;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
             throws Exception
     {
@@ -113,7 +117,7 @@ public void setup()
         server.waitForNodeRefresh(Duration.ofSeconds(10));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
             throws Exception
     {
@@ -121,16 +125,12 @@ public void teardown()
         server = null;
     }
 
-    @BeforeMethod(alwaysRun = true)
-    public void clearUpLoggingSessions()
-    {
-        invalidateAllTokens();
-    }
-
     @Test
     public void testSuccessfulAuthenticationWithHttpGetOnlyRedirectHandler()
             throws Exception
     {
+        invalidateAllTokens();
+
         try (RedirectHandlerFixture ignore = withHandler(new HttpGetOnlyRedirectHandler());
                 Connection connection = createConnection();
                 Statement statement = connection.createStatement()) {
@@ -142,10 +142,13 @@ public void testSuccessfulAuthenticationWithHttpGetOnlyRedirectHandler()
      * Ignored due to lack of ui environment with web-browser on CI servers.
      * Still this test is useful for local environments.
      */
-    @Test(enabled = false)
+    @Test
+    @Disabled
     public void testSuccessfulAuthenticationWithDefaultBrowserRedirect()
             throws Exception
     {
+        invalidateAllTokens();
+
         try (Connection connection = createConnection();
                 Statement statement = connection.createStatement()) {
             assertThat(statement.execute("SELECT 123")).isTrue();
@@ -156,6 +159,8 @@ public void testSuccessfulAuthenticationWithDefaultBrowserRedirect()
     public void testAuthenticationFailsAfterUnfinishedRedirect()
             throws Exception
     {
+        invalidateAllTokens();
+
         try (RedirectHandlerFixture ignore = withHandler(new NoOpRedirectHandler());
                 Connection connection = createConnection();
                 Statement statement = connection.createStatement()) {
@@ -168,6 +173,8 @@ public void testAuthenticationFailsAfterUnfinishedRedirect()
     public void testAuthenticationFailsAfterRedirectException()
             throws Exception
     {
+        invalidateAllTokens();
+
         try (RedirectHandlerFixture ignore = withHandler(new FailingRedirectHandler());
                 Connection connection = createConnection();
                 Statement statement = connection.createStatement()) {
@@ -181,6 +188,8 @@ public void testAuthenticationFailsAfterRedirectException()
     public void testAuthenticationFailsAfterServerAuthenticationFailure()
             throws Exception
     {
+        invalidateAllTokens();
+
         try (RedirectHandlerFixture ignore = withHandler(new HttpGetOnlyRedirectHandler());
                 AutoCloseable ignore2 = withPollingError("error occurred during token polling");
                 Connection connection = createConnection();
@@ -195,6 +204,8 @@ public void testAuthenticationFailsAfterServerAuthenticationFailure()
     public void testAuthenticationFailsAfterReceivingMalformedHeaderFromServer()
             throws Exception
     {
+        invalidateAllTokens();
+
         try (RedirectHandlerFixture ignore = withHandler(new HttpGetOnlyRedirectHandler());
                 AutoCloseable ignored = withWwwAuthenticate("Bearer no-valid-fields");
                 Connection connection = createConnection();
@@ -210,6 +221,8 @@ public void testAuthenticationFailsAfterReceivingMalformedHeaderFromServer()
     public void testAuthenticationReusesObtainedTokenPerConnection()
             throws Exception
     {
+        invalidateAllTokens();
+
         try (RedirectHandlerFixture ignore = withHandler(new HttpGetOnlyRedirectHandler());
                 Connection connection = createConnection();
                 Statement statement = connection.createStatement()) {
@@ -225,6 +238,8 @@ public void testAuthenticationReusesObtainedTokenPerConnection()
     public void testAuthenticationAfterInitialTokenHasBeenInvalidated()
             throws Exception
     {
+        invalidateAllTokens();
+
         try (RedirectHandlerFixture ignore = withHandler(new HttpGetOnlyRedirectHandler());
                 Connection connection = createConnection();
                 Statement statement = connection.createStatement()) {
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcPreparedStatement.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcPreparedStatement.java
index 919c27bd741b..60f1f0c3f9de 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcPreparedStatement.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcPreparedStatement.java
@@ -22,9 +22,10 @@
 import io.trino.plugin.blackhole.BlackHolePlugin;
 import io.trino.plugin.memory.MemoryPlugin;
 import io.trino.server.testing.TestingTrinoServer;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -68,18 +69,20 @@
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestJdbcPreparedStatement
 {
     private static final int HEADER_SIZE_LIMIT = 16 * 1024;
 
     private TestingTrinoServer server;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
             throws Exception
     {
@@ -96,13 +99,13 @@ public void setup()
         server.createCatalog("memory", "memory");
         server.waitForNodeRefresh(Duration.ofSeconds(10));
 
-        try (Connection connection = createConnection();
+        try (Connection connection = createConnection(false);
                 Statement statement = connection.createStatement()) {
             statement.executeUpdate("CREATE SCHEMA blackhole.blackhole");
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -114,7 +117,14 @@ public void tearDown()
     public void testExecuteQuery()
             throws Exception
     {
-        try (Connection connection = createConnection();
+        testExecuteQuery(false);
+        testExecuteQuery(true);
+    }
+
+    private void testExecuteQuery(boolean explicitPrepare)
+            throws Exception
+    {
+        try (Connection connection = createConnection(explicitPrepare);
                 PreparedStatement statement = connection.prepareStatement("SELECT ?, ?")) {
             statement.setInt(1, 123);
             statement.setString(2, "hello");
@@ -140,7 +150,14 @@ public void testExecuteQuery()
     public void testGetMetadata()
             throws Exception
     {
-        try (Connection connection = createConnection("blackhole", "blackhole")) {
+        testGetMetadata(true);
+        testGetMetadata(false);
+    }
+
+    private void testGetMetadata(boolean explicitPrepare)
+            throws Exception
+    {
+        try (Connection connection = createConnection("blackhole", "blackhole", explicitPrepare)) {
             try (Statement statement = connection.createStatement()) {
                 statement.execute("CREATE TABLE test_get_metadata (" +
                         "c_boolean boolean, " +
@@ -198,7 +215,14 @@ public void testGetMetadata()
     public void testGetParameterMetaData()
             throws Exception
     {
-        try (Connection connection = createConnection("blackhole", "blackhole")) {
+        testGetParameterMetaData(true);
+        testGetParameterMetaData(false);
+    }
+
+    private void testGetParameterMetaData(boolean explicitPrepare)
+            throws Exception
+    {
+        try (Connection connection = createConnection("blackhole", "blackhole", explicitPrepare)) {
             try (Statement statement = connection.createStatement()) {
                 statement.execute("CREATE TABLE test_get_parameterMetaData (" +
                         "c_boolean boolean, " +
@@ -386,7 +410,14 @@ public void testGetClientTypeSignatureFromTypeString()
     public void testDeallocate()
             throws Exception
     {
-        try (Connection connection = createConnection()) {
+        testDeallocate(true);
+        testDeallocate(false);
+    }
+
+    private void testDeallocate(boolean explicitPrepare)
+            throws Exception
+    {
+        try (Connection connection = createConnection(explicitPrepare)) {
             for (int i = 0; i < 200; i++) {
                 try {
                     connection.prepareStatement("SELECT '" + repeat("a", 300) + "'").close();
@@ -402,7 +433,14 @@ public void testDeallocate()
     public void testCloseIdempotency()
             throws Exception
     {
-        try (Connection connection = createConnection()) {
+        testCloseIdempotency(true);
+        testCloseIdempotency(false);
+    }
+
+    private void testCloseIdempotency(boolean explicitPrepare)
+            throws Exception
+    {
+        try (Connection connection = createConnection(explicitPrepare)) {
             PreparedStatement statement = connection.prepareStatement("SELECT 123");
             statement.close();
             statement.close();
@@ -412,9 +450,16 @@ public void testCloseIdempotency()
     @Test
     public void testLargePreparedStatement()
             throws Exception
+    {
+        testLargePreparedStatement(true);
+        testLargePreparedStatement(false);
+    }
+
+    private void testLargePreparedStatement(boolean explicitPrepare)
+            throws Exception
     {
         int elements = HEADER_SIZE_LIMIT + 1;
-        try (Connection connection = createConnection();
+        try (Connection connection = createConnection(explicitPrepare);
                 PreparedStatement statement = connection.prepareStatement("VALUES ?" + repeat(", ?", elements - 1))) {
             for (int i = 0; i < elements; i++) {
                 statement.setLong(i + 1, i);
@@ -430,7 +475,14 @@ public void testLargePreparedStatement()
     public void testExecuteUpdate()
             throws Exception
     {
-        try (Connection connection = createConnection("blackhole", "blackhole")) {
+        testExecuteUpdate(true);
+        testExecuteUpdate(false);
+    }
+
+    public void testExecuteUpdate(boolean explicitPrepare)
+            throws Exception
+    {
+        try (Connection connection = createConnection("blackhole", "blackhole", explicitPrepare)) {
             try (Statement statement = connection.createStatement()) {
                 statement.execute("CREATE TABLE test_execute_update (" +
                         "c_boolean boolean, " +
@@ -469,7 +521,14 @@ public void testExecuteUpdate()
     public void testExecuteBatch()
             throws Exception
     {
-        try (Connection connection = createConnection("memory", "default")) {
+        testExecuteBatch(true);
+        testExecuteBatch(false);
+    }
+
+    private void testExecuteBatch(boolean explicitPrepare)
+            throws Exception
+    {
+        try (Connection connection = createConnection("memory", "default", explicitPrepare)) {
             try (Statement statement = connection.createStatement()) {
                 statement.execute("CREATE TABLE test_execute_batch(c_int integer)");
             }
@@ -516,7 +575,14 @@ public void testExecuteBatch()
     public void testInvalidExecuteBatch()
             throws Exception
     {
-        try (Connection connection = createConnection("blackhole", "blackhole")) {
+        testInvalidExecuteBatch(true);
+        testInvalidExecuteBatch(false);
+    }
+
+    private void testInvalidExecuteBatch(boolean explicitPrepare)
+            throws Exception
+    {
+        try (Connection connection = createConnection("blackhole", "blackhole", explicitPrepare)) {
             try (Statement statement = connection.createStatement()) {
                 statement.execute("CREATE TABLE test_invalid_execute_batch(c_int integer)");
             }
@@ -551,7 +617,14 @@ public void testInvalidExecuteBatch()
     public void testPrepareMultiple()
             throws Exception
     {
-        try (Connection connection = createConnection();
+        testPrepareMultiple(true);
+        testPrepareMultiple(false);
+    }
+
+    private void testPrepareMultiple(boolean explicitPrepare)
+            throws Exception
+    {
+        try (Connection connection = createConnection(explicitPrepare);
                 PreparedStatement statement1 = connection.prepareStatement("SELECT 123");
                 PreparedStatement statement2 = connection.prepareStatement("SELECT 456")) {
             try (ResultSet rs = statement1.executeQuery()) {
@@ -571,9 +644,16 @@ public void testPrepareMultiple()
     @Test
     public void testPrepareLarge()
             throws Exception
+    {
+        testPrepareLarge(true);
+        testPrepareLarge(false);
+    }
+
+    private void testPrepareLarge(boolean explicitPrepare)
+            throws Exception
     {
         String sql = format("SELECT '%s' = '%s'", repeat("x", 100_000), repeat("y", 100_000));
-        try (Connection connection = createConnection();
+        try (Connection connection = createConnection(explicitPrepare);
                 PreparedStatement statement = connection.prepareStatement(sql);
                 ResultSet rs = statement.executeQuery()) {
             assertTrue(rs.next());
@@ -586,43 +666,50 @@ public void testPrepareLarge()
     public void testSetNull()
             throws Exception
     {
-        assertSetNull(Types.BOOLEAN);
-        assertSetNull(Types.BIT, Types.BOOLEAN);
-        assertSetNull(Types.TINYINT);
-        assertSetNull(Types.SMALLINT);
-        assertSetNull(Types.INTEGER);
-        assertSetNull(Types.BIGINT);
-        assertSetNull(Types.REAL);
-        assertSetNull(Types.FLOAT, Types.REAL);
-        assertSetNull(Types.DECIMAL);
-        assertSetNull(Types.NUMERIC, Types.DECIMAL);
-        assertSetNull(Types.CHAR);
-        assertSetNull(Types.NCHAR, Types.CHAR);
-        assertSetNull(Types.VARCHAR, Types.VARCHAR);
-        assertSetNull(Types.NVARCHAR, Types.VARCHAR);
-        assertSetNull(Types.LONGVARCHAR, Types.VARCHAR);
-        assertSetNull(Types.VARCHAR, Types.VARCHAR);
-        assertSetNull(Types.CLOB, Types.VARCHAR);
-        assertSetNull(Types.NCLOB, Types.VARCHAR);
-        assertSetNull(Types.VARBINARY, Types.VARBINARY);
-        assertSetNull(Types.VARBINARY);
-        assertSetNull(Types.BLOB, Types.VARBINARY);
-        assertSetNull(Types.DATE);
-        assertSetNull(Types.TIME);
-        assertSetNull(Types.TIMESTAMP);
-        assertSetNull(Types.NULL);
-    }
-
-    private void assertSetNull(int sqlType)
+        testSetNull(true);
+        testSetNull(false);
+    }
+
+    private void testSetNull(boolean explicitPrepare)
+            throws Exception
+    {
+        assertSetNull(Types.BOOLEAN, explicitPrepare);
+        assertSetNull(Types.BIT, Types.BOOLEAN, explicitPrepare);
+        assertSetNull(Types.TINYINT, explicitPrepare);
+        assertSetNull(Types.SMALLINT, explicitPrepare);
+        assertSetNull(Types.INTEGER, explicitPrepare);
+        assertSetNull(Types.BIGINT, explicitPrepare);
+        assertSetNull(Types.REAL, explicitPrepare);
+        assertSetNull(Types.FLOAT, Types.REAL, explicitPrepare);
+        assertSetNull(Types.DECIMAL, explicitPrepare);
+        assertSetNull(Types.NUMERIC, Types.DECIMAL, explicitPrepare);
+        assertSetNull(Types.CHAR, explicitPrepare);
+        assertSetNull(Types.NCHAR, Types.CHAR, explicitPrepare);
+        assertSetNull(Types.VARCHAR, Types.VARCHAR, explicitPrepare);
+        assertSetNull(Types.NVARCHAR, Types.VARCHAR, explicitPrepare);
+        assertSetNull(Types.LONGVARCHAR, Types.VARCHAR, explicitPrepare);
+        assertSetNull(Types.VARCHAR, Types.VARCHAR, explicitPrepare);
+        assertSetNull(Types.CLOB, Types.VARCHAR, explicitPrepare);
+        assertSetNull(Types.NCLOB, Types.VARCHAR, explicitPrepare);
+        assertSetNull(Types.VARBINARY, Types.VARBINARY, explicitPrepare);
+        assertSetNull(Types.VARBINARY, explicitPrepare);
+        assertSetNull(Types.BLOB, Types.VARBINARY, explicitPrepare);
+        assertSetNull(Types.DATE, explicitPrepare);
+        assertSetNull(Types.TIME, explicitPrepare);
+        assertSetNull(Types.TIMESTAMP, explicitPrepare);
+        assertSetNull(Types.NULL, explicitPrepare);
+    }
+
+    private void assertSetNull(int sqlType, boolean explicitPrepare)
             throws SQLException
     {
-        assertSetNull(sqlType, sqlType);
+        assertSetNull(sqlType, sqlType, explicitPrepare);
     }
 
-    private void assertSetNull(int sqlType, int expectedSqlType)
+    private void assertSetNull(int sqlType, int expectedSqlType, boolean explicitPrepare)
             throws SQLException
     {
-        try (Connection connection = createConnection();
+        try (Connection connection = createConnection(explicitPrepare);
                 PreparedStatement statement = connection.prepareStatement("SELECT ?")) {
             statement.setNull(1, sqlType);
 
@@ -641,20 +728,27 @@ private void assertSetNull(int sqlType, int expectedSqlType)
     public void testConvertBoolean()
             throws SQLException
     {
-        assertBind((ps, i) -> ps.setBoolean(i, true)).roundTripsAs(Types.BOOLEAN, true);
-        assertBind((ps, i) -> ps.setBoolean(i, false)).roundTripsAs(Types.BOOLEAN, false);
-        assertBind((ps, i) -> ps.setObject(i, true)).roundTripsAs(Types.BOOLEAN, true);
-        assertBind((ps, i) -> ps.setObject(i, false)).roundTripsAs(Types.BOOLEAN, false);
+        testConvertBoolean(true);
+        testConvertBoolean(false);
+    }
+
+    private void testConvertBoolean(boolean explicitPrepare)
+            throws SQLException
+    {
+        assertBind((ps, i) -> ps.setBoolean(i, true), explicitPrepare).roundTripsAs(Types.BOOLEAN, true);
+        assertBind((ps, i) -> ps.setBoolean(i, false), explicitPrepare).roundTripsAs(Types.BOOLEAN, false);
+        assertBind((ps, i) -> ps.setObject(i, true), explicitPrepare).roundTripsAs(Types.BOOLEAN, true);
+        assertBind((ps, i) -> ps.setObject(i, false), explicitPrepare).roundTripsAs(Types.BOOLEAN, false);
 
         for (int type : asList(Types.BOOLEAN, Types.BIT)) {
-            assertBind((ps, i) -> ps.setObject(i, true, type)).roundTripsAs(Types.BOOLEAN, true);
-            assertBind((ps, i) -> ps.setObject(i, false, type)).roundTripsAs(Types.BOOLEAN, false);
-            assertBind((ps, i) -> ps.setObject(i, 13, type)).roundTripsAs(Types.BOOLEAN, true);
-            assertBind((ps, i) -> ps.setObject(i, 0, type)).roundTripsAs(Types.BOOLEAN, false);
-            assertBind((ps, i) -> ps.setObject(i, "1", type)).roundTripsAs(Types.BOOLEAN, true);
-            assertBind((ps, i) -> ps.setObject(i, "true", type)).roundTripsAs(Types.BOOLEAN, true);
-            assertBind((ps, i) -> ps.setObject(i, "0", type)).roundTripsAs(Types.BOOLEAN, false);
-            assertBind((ps, i) -> ps.setObject(i, "false", type)).roundTripsAs(Types.BOOLEAN, false);
+            assertBind((ps, i) -> ps.setObject(i, true, type), explicitPrepare).roundTripsAs(Types.BOOLEAN, true);
+            assertBind((ps, i) -> ps.setObject(i, false, type), explicitPrepare).roundTripsAs(Types.BOOLEAN, false);
+            assertBind((ps, i) -> ps.setObject(i, 13, type), explicitPrepare).roundTripsAs(Types.BOOLEAN, true);
+            assertBind((ps, i) -> ps.setObject(i, 0, type), explicitPrepare).roundTripsAs(Types.BOOLEAN, false);
+            assertBind((ps, i) -> ps.setObject(i, "1", type), explicitPrepare).roundTripsAs(Types.BOOLEAN, true);
+            assertBind((ps, i) -> ps.setObject(i, "true", type), explicitPrepare).roundTripsAs(Types.BOOLEAN, true);
+            assertBind((ps, i) -> ps.setObject(i, "0", type), explicitPrepare).roundTripsAs(Types.BOOLEAN, false);
+            assertBind((ps, i) -> ps.setObject(i, "false", type), explicitPrepare).roundTripsAs(Types.BOOLEAN, false);
         }
     }
 
@@ -662,103 +756,138 @@ public void testConvertBoolean()
     public void testConvertTinyint()
             throws SQLException
     {
-        assertBind((ps, i) -> ps.setByte(i, (byte) 123)).roundTripsAs(Types.TINYINT, (byte) 123);
-        assertBind((ps, i) -> ps.setObject(i, (byte) 123)).roundTripsAs(Types.TINYINT, (byte) 123);
-        assertBind((ps, i) -> ps.setObject(i, (byte) 123, Types.TINYINT)).roundTripsAs(Types.TINYINT, (byte) 123);
-        assertBind((ps, i) -> ps.setObject(i, (short) 123, Types.TINYINT)).roundTripsAs(Types.TINYINT, (byte) 123);
-        assertBind((ps, i) -> ps.setObject(i, 123, Types.TINYINT)).roundTripsAs(Types.TINYINT, (byte) 123);
-        assertBind((ps, i) -> ps.setObject(i, 123L, Types.TINYINT)).roundTripsAs(Types.TINYINT, (byte) 123);
-        assertBind((ps, i) -> ps.setObject(i, 123.9f, Types.TINYINT)).roundTripsAs(Types.TINYINT, (byte) 123);
-        assertBind((ps, i) -> ps.setObject(i, 123.9d, Types.TINYINT)).roundTripsAs(Types.TINYINT, (byte) 123);
-        assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), Types.TINYINT)).roundTripsAs(Types.TINYINT, (byte) 123);
-        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), Types.TINYINT)).roundTripsAs(Types.TINYINT, (byte) 123);
-        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), Types.TINYINT)).roundTripsAs(Types.TINYINT, (byte) 123);
-        assertBind((ps, i) -> ps.setObject(i, "123", Types.TINYINT)).roundTripsAs(Types.TINYINT, (byte) 123);
-        assertBind((ps, i) -> ps.setObject(i, true, Types.TINYINT)).roundTripsAs(Types.TINYINT, (byte) 1);
-        assertBind((ps, i) -> ps.setObject(i, false, Types.TINYINT)).roundTripsAs(Types.TINYINT, (byte) 0);
+        testConvertTinyint(true);
+        testConvertTinyint(false);
+    }
+
+    private void testConvertTinyint(boolean explicitPrepare)
+            throws SQLException
+    {
+        assertBind((ps, i) -> ps.setByte(i, (byte) 123), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 123);
+        assertBind((ps, i) -> ps.setObject(i, (byte) 123), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 123);
+        assertBind((ps, i) -> ps.setObject(i, (byte) 123, Types.TINYINT), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 123);
+        assertBind((ps, i) -> ps.setObject(i, (short) 123, Types.TINYINT), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 123);
+        assertBind((ps, i) -> ps.setObject(i, 123, Types.TINYINT), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 123);
+        assertBind((ps, i) -> ps.setObject(i, 123L, Types.TINYINT), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 123);
+        assertBind((ps, i) -> ps.setObject(i, 123.9f, Types.TINYINT), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 123);
+        assertBind((ps, i) -> ps.setObject(i, 123.9d, Types.TINYINT), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 123);
+        assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), Types.TINYINT), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 123);
+        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), Types.TINYINT), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 123);
+        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), Types.TINYINT), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 123);
+        assertBind((ps, i) -> ps.setObject(i, "123", Types.TINYINT), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 123);
+        assertBind((ps, i) -> ps.setObject(i, true, Types.TINYINT), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 1);
+        assertBind((ps, i) -> ps.setObject(i, false, Types.TINYINT), explicitPrepare).roundTripsAs(Types.TINYINT, (byte) 0);
     }
 
     @Test
     public void testConvertSmallint()
             throws SQLException
     {
-        assertBind((ps, i) -> ps.setShort(i, (short) 123)).roundTripsAs(Types.SMALLINT, (short) 123);
-        assertBind((ps, i) -> ps.setObject(i, (short) 123)).roundTripsAs(Types.SMALLINT, (short) 123);
-        assertBind((ps, i) -> ps.setObject(i, (byte) 123, Types.SMALLINT)).roundTripsAs(Types.SMALLINT, (short) 123);
-        assertBind((ps, i) -> ps.setObject(i, (short) 123, Types.SMALLINT)).roundTripsAs(Types.SMALLINT, (short) 123);
-        assertBind((ps, i) -> ps.setObject(i, 123, Types.SMALLINT)).roundTripsAs(Types.SMALLINT, (short) 123);
-        assertBind((ps, i) -> ps.setObject(i, 123L, Types.SMALLINT)).roundTripsAs(Types.SMALLINT, (short) 123);
-        assertBind((ps, i) -> ps.setObject(i, 123.9f, Types.SMALLINT)).roundTripsAs(Types.SMALLINT, (short) 123);
-        assertBind((ps, i) -> ps.setObject(i, 123.9d, Types.SMALLINT)).roundTripsAs(Types.SMALLINT, (short) 123);
-        assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), Types.SMALLINT)).roundTripsAs(Types.SMALLINT, (short) 123);
-        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), Types.SMALLINT)).roundTripsAs(Types.SMALLINT, (short) 123);
-        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), Types.SMALLINT)).roundTripsAs(Types.SMALLINT, (short) 123);
-        assertBind((ps, i) -> ps.setObject(i, "123", Types.SMALLINT)).roundTripsAs(Types.SMALLINT, (short) 123);
-        assertBind((ps, i) -> ps.setObject(i, true, Types.SMALLINT)).roundTripsAs(Types.SMALLINT, (short) 1);
-        assertBind((ps, i) -> ps.setObject(i, false, Types.SMALLINT)).roundTripsAs(Types.SMALLINT, (short) 0);
+        testConvertSmallint(true);
+        testConvertSmallint(false);
+    }
+
+    private void testConvertSmallint(boolean explicitPrepare)
+            throws SQLException
+    {
+        assertBind((ps, i) -> ps.setShort(i, (short) 123), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 123);
+        assertBind((ps, i) -> ps.setObject(i, (short) 123), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 123);
+        assertBind((ps, i) -> ps.setObject(i, (byte) 123, Types.SMALLINT), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 123);
+        assertBind((ps, i) -> ps.setObject(i, (short) 123, Types.SMALLINT), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 123);
+        assertBind((ps, i) -> ps.setObject(i, 123, Types.SMALLINT), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 123);
+        assertBind((ps, i) -> ps.setObject(i, 123L, Types.SMALLINT), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 123);
+        assertBind((ps, i) -> ps.setObject(i, 123.9f, Types.SMALLINT), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 123);
+        assertBind((ps, i) -> ps.setObject(i, 123.9d, Types.SMALLINT), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 123);
+        assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), Types.SMALLINT), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 123);
+        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), Types.SMALLINT), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 123);
+        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), Types.SMALLINT), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 123);
+        assertBind((ps, i) -> ps.setObject(i, "123", Types.SMALLINT), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 123);
+        assertBind((ps, i) -> ps.setObject(i, true, Types.SMALLINT), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 1);
+        assertBind((ps, i) -> ps.setObject(i, false, Types.SMALLINT), explicitPrepare).roundTripsAs(Types.SMALLINT, (short) 0);
     }
 
     @Test
     public void testConvertInteger()
             throws SQLException
     {
-        assertBind((ps, i) -> ps.setInt(i, 123)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, 123)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, (byte) 123, Types.INTEGER)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, (byte) 123, Types.INTEGER)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, (short) 123, Types.INTEGER)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, 123, Types.INTEGER)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, 123L, Types.INTEGER)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, 123.9f, Types.INTEGER)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, 123.9d, Types.INTEGER)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), Types.INTEGER)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), Types.INTEGER)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), Types.INTEGER)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, "123", Types.INTEGER)).roundTripsAs(Types.INTEGER, 123);
-        assertBind((ps, i) -> ps.setObject(i, true, Types.INTEGER)).roundTripsAs(Types.INTEGER, 1);
-        assertBind((ps, i) -> ps.setObject(i, false, Types.INTEGER)).roundTripsAs(Types.INTEGER, 0);
+        testConvertInteger(true);
+        testConvertInteger(false);
+    }
+
+    private void testConvertInteger(boolean explicitPrepare)
+            throws SQLException
+    {
+        assertBind((ps, i) -> ps.setInt(i, 123), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, 123), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, (byte) 123, Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, (byte) 123, Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, (short) 123, Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, 123, Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, 123L, Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, 123.9f, Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, 123.9d, Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, "123", Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 123);
+        assertBind((ps, i) -> ps.setObject(i, true, Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 1);
+        assertBind((ps, i) -> ps.setObject(i, false, Types.INTEGER), explicitPrepare).roundTripsAs(Types.INTEGER, 0);
     }
 
     @Test
     public void testConvertBigint()
             throws SQLException
     {
-        assertBind((ps, i) -> ps.setLong(i, 123L)).roundTripsAs(Types.BIGINT, 123L);
-        assertBind((ps, i) -> ps.setObject(i, 123L)).roundTripsAs(Types.BIGINT, 123L);
-        assertBind((ps, i) -> ps.setObject(i, (byte) 123, Types.BIGINT)).roundTripsAs(Types.BIGINT, 123L);
-        assertBind((ps, i) -> ps.setObject(i, (short) 123, Types.BIGINT)).roundTripsAs(Types.BIGINT, 123L);
-        assertBind((ps, i) -> ps.setObject(i, 123, Types.BIGINT)).roundTripsAs(Types.BIGINT, 123L);
-        assertBind((ps, i) -> ps.setObject(i, 123L, Types.BIGINT)).roundTripsAs(Types.BIGINT, 123L);
-        assertBind((ps, i) -> ps.setObject(i, 123.9f, Types.BIGINT)).roundTripsAs(Types.BIGINT, 123L);
-        assertBind((ps, i) -> ps.setObject(i, 123.9d, Types.BIGINT)).roundTripsAs(Types.BIGINT, 123L);
-        assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), Types.BIGINT)).roundTripsAs(Types.BIGINT, 123L);
-        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), Types.BIGINT)).roundTripsAs(Types.BIGINT, 123L);
-        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), Types.BIGINT)).roundTripsAs(Types.BIGINT, 123L);
-        assertBind((ps, i) -> ps.setObject(i, "123", Types.BIGINT)).roundTripsAs(Types.BIGINT, 123L);
-        assertBind((ps, i) -> ps.setObject(i, true, Types.BIGINT)).roundTripsAs(Types.BIGINT, 1L);
-        assertBind((ps, i) -> ps.setObject(i, false, Types.BIGINT)).roundTripsAs(Types.BIGINT, 0L);
+        testConvertBigint(true);
+        testConvertBigint(false);
+    }
+
+    private void testConvertBigint(boolean explicitPrepare)
+            throws SQLException
+    {
+        assertBind((ps, i) -> ps.setLong(i, 123L), explicitPrepare).roundTripsAs(Types.BIGINT, 123L);
+        assertBind((ps, i) -> ps.setObject(i, 123L), explicitPrepare).roundTripsAs(Types.BIGINT, 123L);
+        assertBind((ps, i) -> ps.setObject(i, (byte) 123, Types.BIGINT), explicitPrepare).roundTripsAs(Types.BIGINT, 123L);
+        assertBind((ps, i) -> ps.setObject(i, (short) 123, Types.BIGINT), explicitPrepare).roundTripsAs(Types.BIGINT, 123L);
+        assertBind((ps, i) -> ps.setObject(i, 123, Types.BIGINT), explicitPrepare).roundTripsAs(Types.BIGINT, 123L);
+        assertBind((ps, i) -> ps.setObject(i, 123L, Types.BIGINT), explicitPrepare).roundTripsAs(Types.BIGINT, 123L);
+        assertBind((ps, i) -> ps.setObject(i, 123.9f, Types.BIGINT), explicitPrepare).roundTripsAs(Types.BIGINT, 123L);
+        assertBind((ps, i) -> ps.setObject(i, 123.9d, Types.BIGINT), explicitPrepare).roundTripsAs(Types.BIGINT, 123L);
+        assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), Types.BIGINT), explicitPrepare).roundTripsAs(Types.BIGINT, 123L);
+        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), Types.BIGINT), explicitPrepare).roundTripsAs(Types.BIGINT, 123L);
+        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), Types.BIGINT), explicitPrepare).roundTripsAs(Types.BIGINT, 123L);
+        assertBind((ps, i) -> ps.setObject(i, "123", Types.BIGINT), explicitPrepare).roundTripsAs(Types.BIGINT, 123L);
+        assertBind((ps, i) -> ps.setObject(i, true, Types.BIGINT), explicitPrepare).roundTripsAs(Types.BIGINT, 1L);
+        assertBind((ps, i) -> ps.setObject(i, false, Types.BIGINT), explicitPrepare).roundTripsAs(Types.BIGINT, 0L);
     }
 
     @Test
     public void testConvertReal()
             throws SQLException
     {
-        assertBind((ps, i) -> ps.setFloat(i, 4.2f)).roundTripsAs(Types.REAL, 4.2f);
-        assertBind((ps, i) -> ps.setObject(i, 4.2f)).roundTripsAs(Types.REAL, 4.2f);
+        testConvertReal(true);
+        testConvertReal(false);
+    }
+
+    private void testConvertReal(boolean explicitPrepare)
+            throws SQLException
+    {
+        assertBind((ps, i) -> ps.setFloat(i, 4.2f), explicitPrepare).roundTripsAs(Types.REAL, 4.2f);
+        assertBind((ps, i) -> ps.setObject(i, 4.2f), explicitPrepare).roundTripsAs(Types.REAL, 4.2f);
 
         for (int type : asList(Types.REAL, Types.FLOAT)) {
-            assertBind((ps, i) -> ps.setObject(i, (byte) 123, type)).roundTripsAs(Types.REAL, 123.0f);
-            assertBind((ps, i) -> ps.setObject(i, (short) 123, type)).roundTripsAs(Types.REAL, 123.0f);
-            assertBind((ps, i) -> ps.setObject(i, 123, type)).roundTripsAs(Types.REAL, 123.0f);
-            assertBind((ps, i) -> ps.setObject(i, 123L, type)).roundTripsAs(Types.REAL, 123.0f);
-            assertBind((ps, i) -> ps.setObject(i, 123.9f, type)).roundTripsAs(Types.REAL, 123.9f);
-            assertBind((ps, i) -> ps.setObject(i, 123.9d, type)).roundTripsAs(Types.REAL, 123.9f);
-            assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), type)).roundTripsAs(Types.REAL, 123.0f);
-            assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), type)).roundTripsAs(Types.REAL, 123.0f);
-            assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), type)).roundTripsAs(Types.REAL, 123.9f);
-            assertBind((ps, i) -> ps.setObject(i, "4.2", type)).roundTripsAs(Types.REAL, 4.2f);
-            assertBind((ps, i) -> ps.setObject(i, true, type)).roundTripsAs(Types.REAL, 1.0f);
-            assertBind((ps, i) -> ps.setObject(i, false, type)).roundTripsAs(Types.REAL, 0.0f);
+            assertBind((ps, i) -> ps.setObject(i, (byte) 123, type), explicitPrepare).roundTripsAs(Types.REAL, 123.0f);
+            assertBind((ps, i) -> ps.setObject(i, (short) 123, type), explicitPrepare).roundTripsAs(Types.REAL, 123.0f);
+            assertBind((ps, i) -> ps.setObject(i, 123, type), explicitPrepare).roundTripsAs(Types.REAL, 123.0f);
+            assertBind((ps, i) -> ps.setObject(i, 123L, type), explicitPrepare).roundTripsAs(Types.REAL, 123.0f);
+            assertBind((ps, i) -> ps.setObject(i, 123.9f, type), explicitPrepare).roundTripsAs(Types.REAL, 123.9f);
+            assertBind((ps, i) -> ps.setObject(i, 123.9d, type), explicitPrepare).roundTripsAs(Types.REAL, 123.9f);
+            assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), type), explicitPrepare).roundTripsAs(Types.REAL, 123.0f);
+            assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), type), explicitPrepare).roundTripsAs(Types.REAL, 123.0f);
+            assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), type), explicitPrepare).roundTripsAs(Types.REAL, 123.9f);
+            assertBind((ps, i) -> ps.setObject(i, "4.2", type), explicitPrepare).roundTripsAs(Types.REAL, 4.2f);
+            assertBind((ps, i) -> ps.setObject(i, true, type), explicitPrepare).roundTripsAs(Types.REAL, 1.0f);
+            assertBind((ps, i) -> ps.setObject(i, false, type), explicitPrepare).roundTripsAs(Types.REAL, 0.0f);
         }
     }
 
@@ -766,42 +895,56 @@ public void testConvertReal()
     public void testConvertDouble()
             throws SQLException
     {
-        assertBind((ps, i) -> ps.setDouble(i, 4.2d)).roundTripsAs(Types.DOUBLE, 4.2d);
-        assertBind((ps, i) -> ps.setObject(i, 4.2d)).roundTripsAs(Types.DOUBLE, 4.2d);
-        assertBind((ps, i) -> ps.setObject(i, (byte) 123, Types.DOUBLE)).roundTripsAs(Types.DOUBLE, 123.0d);
-        assertBind((ps, i) -> ps.setObject(i, (short) 123, Types.DOUBLE)).roundTripsAs(Types.DOUBLE, 123.0d);
-        assertBind((ps, i) -> ps.setObject(i, 123, Types.DOUBLE)).roundTripsAs(Types.DOUBLE, 123.0d);
-        assertBind((ps, i) -> ps.setObject(i, 123L, Types.DOUBLE)).roundTripsAs(Types.DOUBLE, 123.0d);
-        assertBind((ps, i) -> ps.setObject(i, 123.9f, Types.DOUBLE)).roundTripsAs(Types.DOUBLE, (double) 123.9f);
-        assertBind((ps, i) -> ps.setObject(i, 123.9d, Types.DOUBLE)).roundTripsAs(Types.DOUBLE, 123.9d);
-        assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), Types.DOUBLE)).roundTripsAs(Types.DOUBLE, 123.0d);
-        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), Types.DOUBLE)).roundTripsAs(Types.DOUBLE, 123.0d);
-        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), Types.DOUBLE)).roundTripsAs(Types.DOUBLE, 123.9d);
-        assertBind((ps, i) -> ps.setObject(i, "4.2", Types.DOUBLE)).roundTripsAs(Types.DOUBLE, 4.2d);
-        assertBind((ps, i) -> ps.setObject(i, true, Types.DOUBLE)).roundTripsAs(Types.DOUBLE, 1.0d);
-        assertBind((ps, i) -> ps.setObject(i, false, Types.DOUBLE)).roundTripsAs(Types.DOUBLE, 0.0d);
+        testConvertDouble(true);
+        testConvertDouble(false);
+    }
+
+    private void testConvertDouble(boolean explicitPrepare)
+            throws SQLException
+    {
+        assertBind((ps, i) -> ps.setDouble(i, 4.2d), explicitPrepare).roundTripsAs(Types.DOUBLE, 4.2d);
+        assertBind((ps, i) -> ps.setObject(i, 4.2d), explicitPrepare).roundTripsAs(Types.DOUBLE, 4.2d);
+        assertBind((ps, i) -> ps.setObject(i, (byte) 123, Types.DOUBLE), explicitPrepare).roundTripsAs(Types.DOUBLE, 123.0d);
+        assertBind((ps, i) -> ps.setObject(i, (short) 123, Types.DOUBLE), explicitPrepare).roundTripsAs(Types.DOUBLE, 123.0d);
+        assertBind((ps, i) -> ps.setObject(i, 123, Types.DOUBLE), explicitPrepare).roundTripsAs(Types.DOUBLE, 123.0d);
+        assertBind((ps, i) -> ps.setObject(i, 123L, Types.DOUBLE), explicitPrepare).roundTripsAs(Types.DOUBLE, 123.0d);
+        assertBind((ps, i) -> ps.setObject(i, 123.9f, Types.DOUBLE), explicitPrepare).roundTripsAs(Types.DOUBLE, (double) 123.9f);
+        assertBind((ps, i) -> ps.setObject(i, 123.9d, Types.DOUBLE), explicitPrepare).roundTripsAs(Types.DOUBLE, 123.9d);
+        assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), Types.DOUBLE), explicitPrepare).roundTripsAs(Types.DOUBLE, 123.0d);
+        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), Types.DOUBLE), explicitPrepare).roundTripsAs(Types.DOUBLE, 123.0d);
+        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), Types.DOUBLE), explicitPrepare).roundTripsAs(Types.DOUBLE, 123.9d);
+        assertBind((ps, i) -> ps.setObject(i, "4.2", Types.DOUBLE), explicitPrepare).roundTripsAs(Types.DOUBLE, 4.2d);
+        assertBind((ps, i) -> ps.setObject(i, true, Types.DOUBLE), explicitPrepare).roundTripsAs(Types.DOUBLE, 1.0d);
+        assertBind((ps, i) -> ps.setObject(i, false, Types.DOUBLE), explicitPrepare).roundTripsAs(Types.DOUBLE, 0.0d);
     }
 
     @Test
     public void testConvertDecimal()
             throws SQLException
     {
-        assertBind((ps, i) -> ps.setBigDecimal(i, BigDecimal.valueOf(123))).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
-        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123))).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
+        testConvertDecimal(true);
+        testConvertDecimal(false);
+    }
+
+    private void testConvertDecimal(boolean explicitPrepare)
+            throws SQLException
+    {
+        assertBind((ps, i) -> ps.setBigDecimal(i, BigDecimal.valueOf(123)), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
+        assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123)), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
 
         for (int type : asList(Types.DECIMAL, Types.NUMERIC)) {
-            assertBind((ps, i) -> ps.setObject(i, (byte) 123, type)).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
-            assertBind((ps, i) -> ps.setObject(i, (short) 123, type)).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
-            assertBind((ps, i) -> ps.setObject(i, 123, type)).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
-            assertBind((ps, i) -> ps.setObject(i, 123L, type)).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
-            assertBind((ps, i) -> ps.setObject(i, 123.9f, type)).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123.9f));
-            assertBind((ps, i) -> ps.setObject(i, 123.9d, type)).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123.9d));
-            assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), type)).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
-            assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), type)).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
-            assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9d), type)).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123.9d));
-            assertBind((ps, i) -> ps.setObject(i, "123", type)).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
-            assertBind((ps, i) -> ps.setObject(i, true, type)).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(1));
-            assertBind((ps, i) -> ps.setObject(i, false, type)).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(0));
+            assertBind((ps, i) -> ps.setObject(i, (byte) 123, type), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
+            assertBind((ps, i) -> ps.setObject(i, (short) 123, type), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
+            assertBind((ps, i) -> ps.setObject(i, 123, type), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
+            assertBind((ps, i) -> ps.setObject(i, 123L, type), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
+            assertBind((ps, i) -> ps.setObject(i, 123.9f, type), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123.9f));
+            assertBind((ps, i) -> ps.setObject(i, 123.9d, type), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123.9d));
+            assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), type), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
+            assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), type), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
+            assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9d), type), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123.9d));
+            assertBind((ps, i) -> ps.setObject(i, "123", type), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(123));
+            assertBind((ps, i) -> ps.setObject(i, true, type), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(1));
+            assertBind((ps, i) -> ps.setObject(i, false, type), explicitPrepare).roundTripsAs(Types.DECIMAL, BigDecimal.valueOf(0));
         }
     }
 
@@ -809,48 +952,69 @@ public void testConvertDecimal()
     public void testConvertVarchar()
             throws SQLException
     {
-        assertBind((ps, i) -> ps.setString(i, "hello")).roundTripsAs(Types.VARCHAR, "hello");
-        assertBind((ps, i) -> ps.setObject(i, "hello")).roundTripsAs(Types.VARCHAR, "hello");
+        testConvertVarchar(true);
+        testConvertVarchar(false);
+    }
+
+    private void testConvertVarchar(boolean explicitPrepare)
+            throws SQLException
+    {
+        assertBind((ps, i) -> ps.setString(i, "hello"), explicitPrepare).roundTripsAs(Types.VARCHAR, "hello");
+        assertBind((ps, i) -> ps.setObject(i, "hello"), explicitPrepare).roundTripsAs(Types.VARCHAR, "hello");
 
         String unicodeAndNull = "abc'xyz\0\u2603\uD835\uDCABtest";
-        assertBind((ps, i) -> ps.setString(i, unicodeAndNull)).roundTripsAs(Types.VARCHAR, unicodeAndNull);
+        assertBind((ps, i) -> ps.setString(i, unicodeAndNull), explicitPrepare).roundTripsAs(Types.VARCHAR, unicodeAndNull);
 
         for (int type : asList(Types.CHAR, Types.NCHAR, Types.VARCHAR, Types.NVARCHAR, Types.LONGVARCHAR, Types.LONGNVARCHAR)) {
-            assertBind((ps, i) -> ps.setObject(i, (byte) 123, type)).roundTripsAs(Types.VARCHAR, "123");
-            assertBind((ps, i) -> ps.setObject(i, (byte) 123, type)).roundTripsAs(Types.VARCHAR, "123");
-            assertBind((ps, i) -> ps.setObject(i, (short) 123, type)).roundTripsAs(Types.VARCHAR, "123");
-            assertBind((ps, i) -> ps.setObject(i, 123, type)).roundTripsAs(Types.VARCHAR, "123");
-            assertBind((ps, i) -> ps.setObject(i, 123L, type)).roundTripsAs(Types.VARCHAR, "123");
-            assertBind((ps, i) -> ps.setObject(i, 123.9f, type)).roundTripsAs(Types.VARCHAR, "123.9");
-            assertBind((ps, i) -> ps.setObject(i, 123.9d, type)).roundTripsAs(Types.VARCHAR, "123.9");
-            assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), type)).roundTripsAs(Types.VARCHAR, "123");
-            assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), type)).roundTripsAs(Types.VARCHAR, "123");
-            assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), type)).roundTripsAs(Types.VARCHAR, "123.9");
-            assertBind((ps, i) -> ps.setObject(i, "hello", type)).roundTripsAs(Types.VARCHAR, "hello");
-            assertBind((ps, i) -> ps.setObject(i, true, type)).roundTripsAs(Types.VARCHAR, "true");
-            assertBind((ps, i) -> ps.setObject(i, false, type)).roundTripsAs(Types.VARCHAR, "false");
+            assertBind((ps, i) -> ps.setObject(i, (byte) 123, type), explicitPrepare).roundTripsAs(Types.VARCHAR, "123");
+            assertBind((ps, i) -> ps.setObject(i, (byte) 123, type), explicitPrepare).roundTripsAs(Types.VARCHAR, "123");
+            assertBind((ps, i) -> ps.setObject(i, (short) 123, type), explicitPrepare).roundTripsAs(Types.VARCHAR, "123");
+            assertBind((ps, i) -> ps.setObject(i, 123, type), explicitPrepare).roundTripsAs(Types.VARCHAR, "123");
+            assertBind((ps, i) -> ps.setObject(i, 123L, type), explicitPrepare).roundTripsAs(Types.VARCHAR, "123");
+            assertBind((ps, i) -> ps.setObject(i, 123.9f, type), explicitPrepare).roundTripsAs(Types.VARCHAR, "123.9");
+            assertBind((ps, i) -> ps.setObject(i, 123.9d, type), explicitPrepare).roundTripsAs(Types.VARCHAR, "123.9");
+            assertBind((ps, i) -> ps.setObject(i, BigInteger.valueOf(123), type), explicitPrepare).roundTripsAs(Types.VARCHAR, "123");
+            assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), type), explicitPrepare).roundTripsAs(Types.VARCHAR, "123");
+            assertBind((ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), type), explicitPrepare).roundTripsAs(Types.VARCHAR, "123.9");
+            assertBind((ps, i) -> ps.setObject(i, "hello", type), explicitPrepare).roundTripsAs(Types.VARCHAR, "hello");
+            assertBind((ps, i) -> ps.setObject(i, true, type), explicitPrepare).roundTripsAs(Types.VARCHAR, "true");
+            assertBind((ps, i) -> ps.setObject(i, false, type), explicitPrepare).roundTripsAs(Types.VARCHAR, "false");
         }
     }
 
     @Test
     public void testConvertVarbinary()
             throws SQLException
+    {
+        testConvertVarbinary(true);
+        testConvertVarbinary(false);
+    }
+
+    private void testConvertVarbinary(boolean explicitPrepare)
+            throws SQLException
     {
         String value = "abc\0xyz";
         byte[] bytes = value.getBytes(UTF_8);
 
-        assertBind((ps, i) -> ps.setBytes(i, bytes)).roundTripsAs(Types.VARBINARY, bytes);
-        assertBind((ps, i) -> ps.setObject(i, bytes)).roundTripsAs(Types.VARBINARY, bytes);
+        assertBind((ps, i) -> ps.setBytes(i, bytes), explicitPrepare).roundTripsAs(Types.VARBINARY, bytes);
+        assertBind((ps, i) -> ps.setObject(i, bytes), explicitPrepare).roundTripsAs(Types.VARBINARY, bytes);
 
         for (int type : asList(Types.BINARY, Types.VARBINARY, Types.LONGVARBINARY)) {
-            assertBind((ps, i) -> ps.setObject(i, bytes, type)).roundTripsAs(Types.VARBINARY, bytes);
-            assertBind((ps, i) -> ps.setObject(i, value, type)).roundTripsAs(Types.VARBINARY, bytes);
+            assertBind((ps, i) -> ps.setObject(i, bytes, type), explicitPrepare).roundTripsAs(Types.VARBINARY, bytes);
+            assertBind((ps, i) -> ps.setObject(i, value, type), explicitPrepare).roundTripsAs(Types.VARBINARY, bytes);
         }
     }
 
     @Test
     public void testConvertDate()
             throws SQLException
+    {
+        testConvertDate(true);
+        testConvertDate(false);
+    }
+
+    private void testConvertDate(boolean explicitPrepare)
+            throws SQLException
     {
         LocalDate date = LocalDate.of(2001, 5, 6);
         Date sqlDate = Date.valueOf(date);
@@ -858,35 +1022,35 @@ public void testConvertDate()
         LocalDateTime dateTime = LocalDateTime.of(date, LocalTime.of(12, 34, 56));
         Timestamp sqlTimestamp = Timestamp.valueOf(dateTime);
 
-        assertBind((ps, i) -> ps.setDate(i, sqlDate))
+        assertBind((ps, i) -> ps.setDate(i, sqlDate), explicitPrepare)
                 .resultsIn("date", "DATE '2001-05-06'")
                 .roundTripsAs(Types.DATE, sqlDate);
 
-        assertBind((ps, i) -> ps.setObject(i, sqlDate))
+        assertBind((ps, i) -> ps.setObject(i, sqlDate), explicitPrepare)
                 .resultsIn("date", "DATE '2001-05-06'")
                 .roundTripsAs(Types.DATE, sqlDate);
 
-        assertBind((ps, i) -> ps.setObject(i, sqlDate, Types.DATE))
+        assertBind((ps, i) -> ps.setObject(i, sqlDate, Types.DATE), explicitPrepare)
                 .resultsIn("date", "DATE '2001-05-06'")
                 .roundTripsAs(Types.DATE, sqlDate);
 
-        assertBind((ps, i) -> ps.setObject(i, sqlTimestamp, Types.DATE))
+        assertBind((ps, i) -> ps.setObject(i, sqlTimestamp, Types.DATE), explicitPrepare)
                 .resultsIn("date", "DATE '2001-05-06'")
                 .roundTripsAs(Types.DATE, sqlDate);
 
-        assertBind((ps, i) -> ps.setObject(i, javaDate, Types.DATE))
+        assertBind((ps, i) -> ps.setObject(i, javaDate, Types.DATE), explicitPrepare)
                 .resultsIn("date", "DATE '2001-05-06'")
                 .roundTripsAs(Types.DATE, sqlDate);
 
-        assertBind((ps, i) -> ps.setObject(i, date, Types.DATE))
+        assertBind((ps, i) -> ps.setObject(i, date, Types.DATE), explicitPrepare)
                 .resultsIn("date", "DATE '2001-05-06'")
                 .roundTripsAs(Types.DATE, sqlDate);
 
-        assertBind((ps, i) -> ps.setObject(i, dateTime, Types.DATE))
+        assertBind((ps, i) -> ps.setObject(i, dateTime, Types.DATE), explicitPrepare)
                 .resultsIn("date", "DATE '2001-05-06'")
                 .roundTripsAs(Types.DATE, sqlDate);
 
-        assertBind((ps, i) -> ps.setObject(i, "2001-05-06", Types.DATE))
+        assertBind((ps, i) -> ps.setObject(i, "2001-05-06", Types.DATE), explicitPrepare)
                 .resultsIn("date", "DATE '2001-05-06'")
                 .roundTripsAs(Types.DATE, sqlDate);
     }
@@ -894,48 +1058,57 @@ public void testConvertDate()
     @Test
     public void testConvertLocalDate()
             throws SQLException
+    {
+        testConvertLocalDate(true);
+        testConvertLocalDate(false);
+    }
+
+    private void testConvertLocalDate(boolean explicitPrepare)
+            throws SQLException
     {
         LocalDate date = LocalDate.of(2001, 5, 6);
 
-        assertBind((ps, i) -> ps.setObject(i, date))
+        assertBind((ps, i) -> ps.setObject(i, date), explicitPrepare)
                 .resultsIn("date", "DATE '2001-05-06'")
                 .roundTripsAs(Types.DATE, Date.valueOf(date));
 
-        assertBind((ps, i) -> ps.setObject(i, date, Types.DATE))
+        assertBind((ps, i) -> ps.setObject(i, date, Types.DATE), explicitPrepare)
                 .resultsIn("date", "DATE '2001-05-06'")
                 .roundTripsAs(Types.DATE, Date.valueOf(date));
 
-        assertBind((ps, i) -> ps.setObject(i, date, Types.TIME))
+        assertBind((ps, i) -> ps.setObject(i, date, Types.TIME), explicitPrepare)
                 .isInvalid("Cannot convert instance of java.time.LocalDate to time");
 
-        assertBind((ps, i) -> ps.setObject(i, date, Types.TIME_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, date, Types.TIME_WITH_TIMEZONE), explicitPrepare)
                 .isInvalid("Cannot convert instance of java.time.LocalDate to time with time zone");
 
-        assertBind((ps, i) -> ps.setObject(i, date, Types.TIMESTAMP))
+        assertBind((ps, i) -> ps.setObject(i, date, Types.TIMESTAMP), explicitPrepare)
                 .isInvalid("Cannot convert instance of java.time.LocalDate to timestamp");
 
-        assertBind((ps, i) -> ps.setObject(i, date, Types.TIMESTAMP_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, date, Types.TIMESTAMP_WITH_TIMEZONE), explicitPrepare)
                 .isInvalid("Cannot convert instance of java.time.LocalDate to timestamp with time zone");
 
         LocalDate jvmGapDate = LocalDate.of(1970, 1, 1);
         checkIsGap(ZoneId.systemDefault(), jvmGapDate.atTime(LocalTime.MIDNIGHT));
 
-        BindAssertion assertion = assertBind((ps, i) -> ps.setObject(i, jvmGapDate))
-                .resultsIn("date", "DATE '1970-01-01'");
-        assertThatThrownBy(() -> assertion.roundTripsAs(Types.DATE, Date.valueOf(jvmGapDate)))
-                // TODO (https://github.com/trinodb/trino/issues/6242) this currently fails
-                .isInstanceOf(SQLException.class)
-                .hasStackTraceContaining("io.trino.jdbc.TrinoResultSet.getObject")
-                .hasMessage("Expected value to be a date but is: 1970-01-01");
+        assertBind((ps, i) -> ps.setObject(i, jvmGapDate), explicitPrepare)
+                .resultsIn("date", "DATE '1970-01-01'")
+                .roundTripsAs(Types.DATE, Date.valueOf(jvmGapDate));
 
-        assertBind((ps, i) -> ps.setObject(i, jvmGapDate, Types.DATE))
-                .resultsIn("date", "DATE '1970-01-01'");
-//                .roundTripsAs(Types.DATE, Date.valueOf(jvmGapDate)); // TODO (https://github.com/trinodb/trino/issues/6242) this currently fails
+        assertBind((ps, i) -> ps.setObject(i, jvmGapDate, Types.DATE), explicitPrepare)
+                .roundTripsAs(Types.DATE, Date.valueOf(jvmGapDate));
     }
 
     @Test
     public void testConvertTime()
             throws SQLException
+    {
+        testConvertTime(true);
+        testConvertTime(false);
+    }
+
+    private void testConvertTime(boolean explicitPrepare)
+            throws SQLException
     {
         LocalTime time = LocalTime.of(12, 34, 56);
         Time sqlTime = Time.valueOf(time);
@@ -943,54 +1116,58 @@ public void testConvertTime()
         LocalDateTime dateTime = LocalDateTime.of(LocalDate.of(2001, 5, 6), time);
         Timestamp sqlTimestamp = Timestamp.valueOf(dateTime);
 
-        assertBind((ps, i) -> ps.setTime(i, sqlTime))
+        assertBind((ps, i) -> ps.setTime(i, sqlTime), explicitPrepare)
                 .resultsIn("time(3)", "TIME '12:34:56.000'")
                 .roundTripsAs(Types.TIME, sqlTime);
 
-        assertBind((ps, i) -> ps.setObject(i, sqlTime))
+        assertBind((ps, i) -> ps.setObject(i, sqlTime), explicitPrepare)
                 .resultsIn("time(3)", "TIME '12:34:56.000'")
                 .roundTripsAs(Types.TIME, sqlTime);
 
-        assertBind((ps, i) -> ps.setObject(i, sqlTime, Types.TIME))
+        assertBind((ps, i) -> ps.setObject(i, sqlTime, Types.TIME), explicitPrepare)
                 .resultsIn("time(3)", "TIME '12:34:56.000'")
                 .roundTripsAs(Types.TIME, sqlTime);
 
-        assertBind((ps, i) -> ps.setObject(i, sqlTimestamp, Types.TIME))
+        assertBind((ps, i) -> ps.setObject(i, sqlTimestamp, Types.TIME), explicitPrepare)
                 .resultsIn("time(3)", "TIME '12:34:56.000'")
                 .roundTripsAs(Types.TIME, sqlTime);
 
-        assertBind((ps, i) -> ps.setObject(i, javaDate, Types.TIME))
+        assertBind((ps, i) -> ps.setObject(i, javaDate, Types.TIME), explicitPrepare)
                 .resultsIn("time(3)", "TIME '12:34:56.000'")
                 .roundTripsAs(Types.TIME, sqlTime);
 
-        assertBind((ps, i) -> ps.setObject(i, dateTime, Types.TIME))
+        assertBind((ps, i) -> ps.setObject(i, dateTime, Types.TIME), explicitPrepare)
                 .resultsIn("time(0)", "TIME '12:34:56'")
                 .roundTripsAs(Types.TIME, sqlTime);
 
-        assertBind((ps, i) -> ps.setObject(i, "12:34:56", Types.TIME))
+        assertBind((ps, i) -> ps.setObject(i, "12:34:56", Types.TIME), explicitPrepare)
                 .resultsIn("time(0)", "TIME '12:34:56'")
                 .roundTripsAs(Types.TIME, sqlTime);
 
-        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123", Types.TIME)).resultsIn("time(3)", "TIME '12:34:56.123'");
-        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123456", Types.TIME)).resultsIn("time(6)", "TIME '12:34:56.123456'");
-        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123456789", Types.TIME)).resultsIn("time(9)", "TIME '12:34:56.123456789'");
-        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123456789012", Types.TIME)).resultsIn("time(12)", "TIME '12:34:56.123456789012'");
+        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123", Types.TIME), explicitPrepare).resultsIn("time(3)", "TIME '12:34:56.123'");
+        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123456", Types.TIME), explicitPrepare).resultsIn("time(6)", "TIME '12:34:56.123456'");
+
+        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123456789", Types.TIME), explicitPrepare)
+                .resultsIn("time(9)", "TIME '12:34:56.123456789'");
+
+        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123456789012", Types.TIME), explicitPrepare)
+                .resultsIn("time(12)", "TIME '12:34:56.123456789012'");
 
         Time timeWithDecisecond = new Time(sqlTime.getTime() + 100);
-        assertBind((ps, i) -> ps.setObject(i, timeWithDecisecond))
+        assertBind((ps, i) -> ps.setObject(i, timeWithDecisecond), explicitPrepare)
                 .resultsIn("time(3)", "TIME '12:34:56.100'")
                 .roundTripsAs(Types.TIME, timeWithDecisecond);
 
-        assertBind((ps, i) -> ps.setObject(i, timeWithDecisecond, Types.TIME))
+        assertBind((ps, i) -> ps.setObject(i, timeWithDecisecond, Types.TIME), explicitPrepare)
                 .resultsIn("time(3)", "TIME '12:34:56.100'")
                 .roundTripsAs(Types.TIME, timeWithDecisecond);
 
         Time timeWithMillisecond = new Time(sqlTime.getTime() + 123);
-        assertBind((ps, i) -> ps.setObject(i, timeWithMillisecond))
+        assertBind((ps, i) -> ps.setObject(i, timeWithMillisecond), explicitPrepare)
                 .resultsIn("time(3)", "TIME '12:34:56.123'")
                 .roundTripsAs(Types.TIME, timeWithMillisecond);
 
-        assertBind((ps, i) -> ps.setObject(i, timeWithMillisecond, Types.TIME))
+        assertBind((ps, i) -> ps.setObject(i, timeWithMillisecond, Types.TIME), explicitPrepare)
                 .resultsIn("time(3)", "TIME '12:34:56.123'")
                 .roundTripsAs(Types.TIME, timeWithMillisecond);
     }
@@ -998,56 +1175,77 @@ public void testConvertTime()
     @Test
     public void testConvertTimeWithTimeZone()
             throws SQLException
+    {
+        testConvertTimeWithTimeZone(true);
+        testConvertTimeWithTimeZone(false);
+    }
+
+    private void testConvertTimeWithTimeZone(boolean explicitPrepare)
+            throws SQLException
     {
         // zero fraction
-        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 0, UTC), Types.TIME_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 0, UTC), Types.TIME_WITH_TIMEZONE), explicitPrepare)
                 .resultsIn("time(0) with time zone", "TIME '12:34:56+00:00'")
                 .roundTripsAs(Types.TIME_WITH_TIMEZONE, toSqlTime(LocalTime.of(5, 34, 56)));
 
         // setObject with implicit type
-        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 0, UTC)))
+        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 0, UTC)), explicitPrepare)
                 .resultsIn("time(0) with time zone", "TIME '12:34:56+00:00'");
 
         // setObject with JDBCType
-        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 0, UTC), JDBCType.TIME_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 0, UTC), JDBCType.TIME_WITH_TIMEZONE), explicitPrepare)
                 .resultsIn("time(0) with time zone", "TIME '12:34:56+00:00'");
 
         // millisecond precision
-        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 555_000_000, UTC), Types.TIME_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 555_000_000, UTC), Types.TIME_WITH_TIMEZONE), explicitPrepare)
                 .resultsIn("time(3) with time zone", "TIME '12:34:56.555+00:00'")
                 .roundTripsAs(Types.TIME_WITH_TIMEZONE, toSqlTime(LocalTime.of(5, 34, 56, 555_000_000)));
 
         // microsecond precision
-        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 555_555_000, UTC), Types.TIME_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 555_555_000, UTC), Types.TIME_WITH_TIMEZONE), explicitPrepare)
                 .resultsIn("time(6) with time zone", "TIME '12:34:56.555555+00:00'")
                 .roundTripsAs(Types.TIME_WITH_TIMEZONE, toSqlTime(LocalTime.of(5, 34, 56, 556_000_000)));
 
         // nanosecond precision
-        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 555_555_555, UTC), Types.TIME_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 555_555_555, UTC), Types.TIME_WITH_TIMEZONE), explicitPrepare)
                 .resultsIn("time(9) with time zone", "TIME '12:34:56.555555555+00:00'")
                 .roundTripsAs(Types.TIME_WITH_TIMEZONE, toSqlTime(LocalTime.of(5, 34, 56, 556_000_000)));
 
         // positive offset
-        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 123_456_789, ZoneOffset.ofHoursMinutes(7, 35)), Types.TIME_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 123_456_789, ZoneOffset.ofHoursMinutes(7, 35)), Types.TIME_WITH_TIMEZONE), explicitPrepare)
                 .resultsIn("time(9) with time zone", "TIME '12:34:56.123456789+07:35'");
         // TODO (https://github.com/trinodb/trino/issues/6351) the result is not as expected here:
         //      .roundTripsAs(Types.TIME_WITH_TIMEZONE, toSqlTime(LocalTime.of(20, 59, 56, 123_000_000)));
 
         // negative offset
-        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 123_456_789, ZoneOffset.ofHoursMinutes(-7, -35)), Types.TIME_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, OffsetTime.of(12, 34, 56, 123_456_789, ZoneOffset.ofHoursMinutes(-7, -35)), Types.TIME_WITH_TIMEZONE), explicitPrepare)
                 .resultsIn("time(9) with time zone", "TIME '12:34:56.123456789-07:35'")
                 .roundTripsAs(Types.TIME_WITH_TIMEZONE, toSqlTime(LocalTime.of(13, 9, 56, 123_000_000)));
 
         // String as TIME WITH TIME ZONE
-        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123 +05:45", Types.TIME_WITH_TIMEZONE)).resultsIn("time(3) with time zone", "TIME '12:34:56.123 +05:45'");
-        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123456 +05:45", Types.TIME_WITH_TIMEZONE)).resultsIn("time(6) with time zone", "TIME '12:34:56.123456 +05:45'");
-        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123456789 +05:45", Types.TIME_WITH_TIMEZONE)).resultsIn("time(9) with time zone", "TIME '12:34:56.123456789 +05:45'");
-        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123456789012 +05:45", Types.TIME_WITH_TIMEZONE)).resultsIn("time(12) with time zone", "TIME '12:34:56.123456789012 +05:45'");
+        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123 +05:45", Types.TIME_WITH_TIMEZONE), explicitPrepare)
+                .resultsIn("time(3) with time zone", "TIME '12:34:56.123 +05:45'");
+
+        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123456 +05:45", Types.TIME_WITH_TIMEZONE), explicitPrepare)
+                .resultsIn("time(6) with time zone", "TIME '12:34:56.123456 +05:45'");
+
+        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123456789 +05:45", Types.TIME_WITH_TIMEZONE), explicitPrepare)
+                .resultsIn("time(9) with time zone", "TIME '12:34:56.123456789 +05:45'");
+
+        assertBind((ps, i) -> ps.setObject(i, "12:34:56.123456789012 +05:45", Types.TIME_WITH_TIMEZONE), explicitPrepare)
+                .resultsIn("time(12) with time zone", "TIME '12:34:56.123456789012 +05:45'");
     }
 
     @Test
     public void testConvertTimestamp()
             throws SQLException
+    {
+        testConvertTimestamp(true);
+        testConvertTimestamp(false);
+    }
+
+    private void testConvertTimestamp(boolean explicitPrepare)
+            throws SQLException
     {
         LocalDateTime dateTime = LocalDateTime.of(2001, 5, 6, 12, 34, 56);
         Date sqlDate = Date.valueOf(dateTime.toLocalDate());
@@ -1056,78 +1254,85 @@ public void testConvertTimestamp()
         Timestamp sameInstantInWarsawZone = Timestamp.valueOf(dateTime.atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneId.of("Europe/Warsaw")).toLocalDateTime());
         java.util.Date javaDate = java.util.Date.from(dateTime.atZone(ZoneId.systemDefault()).toInstant());
 
-        assertBind((ps, i) -> ps.setTimestamp(i, sqlTimestamp))
+        assertBind((ps, i) -> ps.setTimestamp(i, sqlTimestamp), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.000'")
                 .roundTripsAs(Types.TIMESTAMP, sqlTimestamp);
 
-        assertBind((ps, i) -> ps.setTimestamp(i, sqlTimestamp, null))
+        assertBind((ps, i) -> ps.setTimestamp(i, sqlTimestamp, null), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.000'")
                 .roundTripsAs(Types.TIMESTAMP, sqlTimestamp);
 
-        assertBind((ps, i) -> ps.setTimestamp(i, sqlTimestamp, Calendar.getInstance()))
+        assertBind((ps, i) -> ps.setTimestamp(i, sqlTimestamp, Calendar.getInstance()), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.000'")
                 .roundTripsAs(Types.TIMESTAMP, sqlTimestamp);
 
-        assertBind((ps, i) -> ps.setTimestamp(i, sqlTimestamp, Calendar.getInstance(TimeZone.getTimeZone(ZoneId.of("Europe/Warsaw")))))
+        assertBind((ps, i) -> ps.setTimestamp(i, sqlTimestamp, Calendar.getInstance(TimeZone.getTimeZone(ZoneId.of("Europe/Warsaw")))), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 20:34:56.000'")
                 .roundTripsAs(Types.TIMESTAMP, sameInstantInWarsawZone);
 
-        assertBind((ps, i) -> ps.setObject(i, sqlTimestamp))
+        assertBind((ps, i) -> ps.setObject(i, sqlTimestamp), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.000'")
                 .roundTripsAs(Types.TIMESTAMP, sqlTimestamp);
 
-        assertBind((ps, i) -> ps.setObject(i, sqlDate, Types.TIMESTAMP))
+        assertBind((ps, i) -> ps.setObject(i, sqlDate, Types.TIMESTAMP), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 00:00:00.000'")
                 .roundTripsAs(Types.TIMESTAMP, new Timestamp(sqlDate.getTime()));
 
-        assertBind((ps, i) -> ps.setObject(i, sqlTime, Types.TIMESTAMP))
+        assertBind((ps, i) -> ps.setObject(i, sqlTime, Types.TIMESTAMP), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '1970-01-01 12:34:56.000'")
                 .roundTripsAs(Types.TIMESTAMP, new Timestamp(sqlTime.getTime()));
 
-        assertBind((ps, i) -> ps.setObject(i, sqlTimestamp, Types.TIMESTAMP))
+        assertBind((ps, i) -> ps.setObject(i, sqlTimestamp, Types.TIMESTAMP), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.000'")
                 .roundTripsAs(Types.TIMESTAMP, sqlTimestamp);
 
-        assertBind((ps, i) -> ps.setObject(i, javaDate, Types.TIMESTAMP))
+        assertBind((ps, i) -> ps.setObject(i, javaDate, Types.TIMESTAMP), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.000'")
                 .roundTripsAs(Types.TIMESTAMP, sqlTimestamp);
 
-        assertBind((ps, i) -> ps.setObject(i, dateTime, Types.TIMESTAMP))
+        assertBind((ps, i) -> ps.setObject(i, dateTime, Types.TIMESTAMP), explicitPrepare)
                 .resultsIn("timestamp(0)", "TIMESTAMP '2001-05-06 12:34:56'")
                 .roundTripsAs(Types.TIMESTAMP, sqlTimestamp);
 
-        assertBind((ps, i) -> ps.setObject(i, "2001-05-06 12:34:56", Types.TIMESTAMP))
+        assertBind((ps, i) -> ps.setObject(i, "2001-05-06 12:34:56", Types.TIMESTAMP), explicitPrepare)
                 .resultsIn("timestamp(0)", "TIMESTAMP '2001-05-06 12:34:56'")
                 .roundTripsAs(Types.TIMESTAMP, sqlTimestamp);
 
-        assertBind((ps, i) -> ps.setObject(i, "2001-05-06 12:34:56.123", Types.TIMESTAMP)).resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.123'");
-        assertBind((ps, i) -> ps.setObject(i, "2001-05-06 12:34:56.123456", Types.TIMESTAMP)).resultsIn("timestamp(6)", "TIMESTAMP '2001-05-06 12:34:56.123456'");
-        assertBind((ps, i) -> ps.setObject(i, "2001-05-06 12:34:56.123456789", Types.TIMESTAMP)).resultsIn("timestamp(9)", "TIMESTAMP '2001-05-06 12:34:56.123456789'");
-        assertBind((ps, i) -> ps.setObject(i, "2001-05-06 12:34:56.123456789012", Types.TIMESTAMP)).resultsIn("timestamp(12)", "TIMESTAMP '2001-05-06 12:34:56.123456789012'");
+        assertBind((ps, i) -> ps.setObject(i, "2001-05-06 12:34:56.123", Types.TIMESTAMP), explicitPrepare)
+                .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.123'");
+
+        assertBind((ps, i) -> ps.setObject(i, "2001-05-06 12:34:56.123456", Types.TIMESTAMP), explicitPrepare)
+                .resultsIn("timestamp(6)", "TIMESTAMP '2001-05-06 12:34:56.123456'");
+
+        assertBind((ps, i) -> ps.setObject(i, "2001-05-06 12:34:56.123456789", Types.TIMESTAMP), explicitPrepare)
+                .resultsIn("timestamp(9)", "TIMESTAMP '2001-05-06 12:34:56.123456789'");
+
+        assertBind((ps, i) -> ps.setObject(i, "2001-05-06 12:34:56.123456789012", Types.TIMESTAMP), explicitPrepare)
+                .resultsIn("timestamp(12)", "TIMESTAMP '2001-05-06 12:34:56.123456789012'");
 
         Timestamp timestampWithWithDecisecond = new Timestamp(sqlTimestamp.getTime() + 100);
-        assertBind((ps, i) -> ps.setTimestamp(i, timestampWithWithDecisecond))
+        assertBind((ps, i) -> ps.setTimestamp(i, timestampWithWithDecisecond), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.100'")
                 .roundTripsAs(Types.TIMESTAMP, timestampWithWithDecisecond);
 
-        assertBind((ps, i) -> ps.setObject(i, timestampWithWithDecisecond))
+        assertBind((ps, i) -> ps.setObject(i, timestampWithWithDecisecond), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.100'")
                 .roundTripsAs(Types.TIMESTAMP, timestampWithWithDecisecond);
 
-        assertBind((ps, i) -> ps.setObject(i, timestampWithWithDecisecond, Types.TIMESTAMP))
+        assertBind((ps, i) -> ps.setObject(i, timestampWithWithDecisecond, Types.TIMESTAMP), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.100'")
                 .roundTripsAs(Types.TIMESTAMP, timestampWithWithDecisecond);
 
         Timestamp timestampWithMillisecond = new Timestamp(sqlTimestamp.getTime() + 123);
-        assertBind((ps, i) -> ps.setTimestamp(i, timestampWithMillisecond))
+        assertBind((ps, i) -> ps.setTimestamp(i, timestampWithMillisecond), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.123'")
                 .roundTripsAs(Types.TIMESTAMP, timestampWithMillisecond);
 
-        assertBind((ps, i) -> ps.setObject(i, timestampWithMillisecond))
+        assertBind((ps, i) -> ps.setObject(i, timestampWithMillisecond), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.123'")
                 .roundTripsAs(Types.TIMESTAMP, timestampWithMillisecond);
 
-        assertBind((ps, i) -> ps.setObject(i, timestampWithMillisecond, Types.TIMESTAMP))
+        assertBind((ps, i) -> ps.setObject(i, timestampWithMillisecond, Types.TIMESTAMP), explicitPrepare)
                 .resultsIn("timestamp(3)", "TIMESTAMP '2001-05-06 12:34:56.123'")
                 .roundTripsAs(Types.TIMESTAMP, timestampWithMillisecond);
     }
@@ -1135,20 +1340,27 @@ public void testConvertTimestamp()
     @Test
     public void testConvertTimestampWithTimeZone()
             throws SQLException
+    {
+        testConvertTimestampWithTimeZone(true);
+        testConvertTimestampWithTimeZone(false);
+    }
+
+    private void testConvertTimestampWithTimeZone(boolean explicitPrepare)
+            throws SQLException
     {
         // TODO (https://github.com/trinodb/trino/issues/6299) support ZonedDateTime
 
         // String as TIMESTAMP WITH TIME ZONE
-        assertBind((ps, i) -> ps.setObject(i, "1970-01-01 12:34:56.123 +05:45", Types.TIMESTAMP_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, "1970-01-01 12:34:56.123 +05:45", Types.TIMESTAMP_WITH_TIMEZONE), explicitPrepare)
                 .resultsIn("timestamp(3) with time zone", "TIMESTAMP '1970-01-01 12:34:56.123 +05:45'");
 
-        assertBind((ps, i) -> ps.setObject(i, "1970-01-01 12:34:56.123456 +05:45", Types.TIMESTAMP_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, "1970-01-01 12:34:56.123456 +05:45", Types.TIMESTAMP_WITH_TIMEZONE), explicitPrepare)
                 .resultsIn("timestamp(6) with time zone", "TIMESTAMP '1970-01-01 12:34:56.123456 +05:45'");
 
-        assertBind((ps, i) -> ps.setObject(i, "1970-01-01 12:34:56.123456789 +05:45", Types.TIMESTAMP_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, "1970-01-01 12:34:56.123456789 +05:45", Types.TIMESTAMP_WITH_TIMEZONE), explicitPrepare)
                 .resultsIn("timestamp(9) with time zone", "TIMESTAMP '1970-01-01 12:34:56.123456789 +05:45'");
 
-        assertBind((ps, i) -> ps.setObject(i, "1970-01-01 12:34:56.123456789012 +05:45", Types.TIMESTAMP_WITH_TIMEZONE))
+        assertBind((ps, i) -> ps.setObject(i, "1970-01-01 12:34:56.123456789012 +05:45", Types.TIMESTAMP_WITH_TIMEZONE), explicitPrepare)
                 .resultsIn("timestamp(12) with time zone", "TIMESTAMP '1970-01-01 12:34:56.123456789012 +05:45'");
     }
 
@@ -1156,30 +1368,137 @@ public void testConvertTimestampWithTimeZone()
     public void testInvalidConversions()
             throws SQLException
     {
-        assertBind((ps, i) -> ps.setObject(i, String.class)).isInvalid("Unsupported object type: java.lang.Class");
-        assertBind((ps, i) -> ps.setObject(i, String.class, Types.BIGINT)).isInvalid("Cannot convert instance of java.lang.Class to SQL type " + Types.BIGINT);
-        assertBind((ps, i) -> ps.setObject(i, "abc", Types.SMALLINT)).isInvalid("Cannot convert instance of java.lang.String to SQL type " + Types.SMALLINT);
+        testInvalidConversions(true);
+        testInvalidConversions(false);
+    }
+
+    private void testInvalidConversions(boolean explicitPrepare)
+            throws SQLException
+    {
+        assertBind((ps, i) -> ps.setObject(i, String.class), explicitPrepare).isInvalid("Unsupported object type: java.lang.Class");
+        assertBind((ps, i) -> ps.setObject(i, String.class, Types.BIGINT), explicitPrepare)
+                .isInvalid("Cannot convert instance of java.lang.Class to SQL type " + Types.BIGINT);
+        assertBind((ps, i) -> ps.setObject(i, "abc", Types.SMALLINT), explicitPrepare)
+                .isInvalid("Cannot convert instance of java.lang.String to SQL type " + Types.SMALLINT);
     }
 
-    private BindAssertion assertBind(Binder binder)
+    @Test
+    public void testExplicitPrepare()
+            throws Exception
     {
-        return new BindAssertion(this::createConnection, binder);
+        testExplicitPrepareSetting(true,
+                "EXECUTE %statement% USING %values%");
     }
 
-    private Connection createConnection()
+    @Test
+    public void testExecuteImmediate()
+            throws Exception
+    {
+        testExplicitPrepareSetting(false,
+                "EXECUTE IMMEDIATE '%query%' USING %values%");
+    }
+
+    private BindAssertion assertBind(Binder binder, boolean explicitPrepare)
+    {
+        return new BindAssertion(() -> this.createConnection(explicitPrepare), binder);
+    }
+
+    private Connection createConnection(boolean explicitPrepare)
             throws SQLException
     {
-        String url = format("jdbc:trino://%s", server.getAddress());
+        String url = format("jdbc:trino://%s?explicitPrepare=" + explicitPrepare, server.getAddress());
         return DriverManager.getConnection(url, "test", null);
     }
 
-    private Connection createConnection(String catalog, String schema)
+    private Connection createConnection(String catalog, String schema, boolean explicitPrepare)
             throws SQLException
     {
-        String url = format("jdbc:trino://%s/%s/%s", server.getAddress(), catalog, schema);
+        String url = format("jdbc:trino://%s/%s/%s?explicitPrepare=" + explicitPrepare, server.getAddress(), catalog, schema);
         return DriverManager.getConnection(url, "test", null);
     }
 
+    private void testExplicitPrepareSetting(boolean explicitPrepare, String expectedSql)
+            throws Exception
+    {
+        String selectSql = "SELECT * FROM blackhole.blackhole.test_table WHERE x = ? AND y = ? AND y <> 'Test'";
+        String insertSql = "INSERT INTO blackhole.blackhole.test_table (x, y) VALUES (?, ?)";
+
+        try (Connection connection = createConnection(explicitPrepare)) {
+            try (Statement statement = connection.createStatement()) {
+                assertEquals(statement.executeUpdate("CREATE TABLE blackhole.blackhole.test_table (x bigint, y varchar)"), 0);
+            }
+
+            try (PreparedStatement ps = connection.prepareStatement(selectSql)) {
+                ps.setInt(1, 42);
+                ps.setString(2, "value1's");
+
+                ps.executeQuery();
+                checkSQLExecuted(connection, expectedSql
+                        .replace("%statement%", "statement1")
+                        .replace("%query%", selectSql.replace("'", "''"))
+                        .replace("%values%", "INTEGER '42', 'value1''s'"));
+            }
+
+            try (PreparedStatement ps = connection.prepareStatement(selectSql)) {
+                ps.setInt(1, 42);
+                ps.setString(2, "value1's");
+
+                ps.execute();
+                checkSQLExecuted(connection, expectedSql
+                        .replace("%statement%", "statement2")
+                        .replace("%query%", selectSql.replace("'", "''"))
+                        .replace("%values%", "INTEGER '42', 'value1''s'"));
+            }
+
+            try (PreparedStatement ps = connection.prepareStatement(insertSql)) {
+                ps.setInt(1, 42);
+                ps.setString(2, "value1's");
+
+                ps.executeLargeUpdate();
+                checkSQLExecuted(connection, expectedSql
+                        .replace("%statement%", "statement3")
+                        .replace("%query%", insertSql.replace("'", "''"))
+                        .replace("%values%", "INTEGER '42', 'value1''s'"));
+            }
+
+            try (PreparedStatement ps = connection.prepareStatement(insertSql)) {
+                ps.setInt(1, 42);
+                ps.setString(2, "value1's");
+                ps.addBatch();
+
+                ps.setInt(1, 43);
+                ps.setString(2, "value2's");
+                ps.addBatch();
+
+                ps.executeBatch();
+                String statement4 = expectedSql
+                        .replace("%statement%", "statement4")
+                        .replace("%query%", insertSql.replace("'", "''"));
+                checkSQLExecuted(connection, statement4
+                        .replace("%values%", "INTEGER '42', 'value1''s'"));
+                checkSQLExecuted(connection, statement4
+                        .replace("%values%", "INTEGER '43', 'value2''s'"));
+            }
+
+            try (Statement statement = connection.createStatement()) {
+                assertEquals(statement.executeUpdate("DROP TABLE blackhole.blackhole.test_table"), 0);
+            }
+        }
+    }
+
+    private void checkSQLExecuted(Connection connection, String expectedSql)
+    {
+        String sql = format("SELECT state FROM system.runtime.queries WHERE query = '%s'", expectedSql.replace("'", "''"));
+
+        try (Statement statement = connection.createStatement();
+                ResultSet resultSet = statement.executeQuery(sql)) {
+            assertTrue(resultSet.next(), "Cannot find SQL query " + expectedSql);
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private static class BindAssertion
     {
         private final ConnectionFactory connectionFactory;
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcStatement.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcStatement.java
index 26acf253cf6d..709b188de1a8 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcStatement.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcStatement.java
@@ -18,9 +18,11 @@
 import io.airlift.log.Logging;
 import io.trino.plugin.blackhole.BlackHolePlugin;
 import io.trino.server.testing.TestingTrinoServer;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -41,13 +43,15 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestJdbcStatement
 {
     private final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getName()));
     private TestingTrinoServer server;
 
-    @BeforeClass
+    @BeforeAll
     public void setupServer()
             throws Exception
     {
@@ -68,7 +72,7 @@ public void setupServer()
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -78,7 +82,8 @@ public void tearDown()
         server = null;
     }
 
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testCancellationOnStatementClose()
             throws Exception
     {
@@ -114,7 +119,8 @@ public void testCancellationOnStatementClose()
     /**
      * @see TestJdbcConnection#testConcurrentCancellationOnConnectionClose
      */
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testConcurrentCancellationOnStatementClose()
             throws Exception
     {
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcVendorCompatibility.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcVendorCompatibility.java
index 9a77450e05df..fadcf2f2c18a 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcVendorCompatibility.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcVendorCompatibility.java
@@ -19,14 +19,13 @@
 import io.trino.server.testing.TestingTrinoServer;
 import io.trino.util.AutoCloseableCloser;
 import oracle.jdbc.OracleType;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.parallel.Execution;
 import org.testcontainers.containers.OracleContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.Closeable;
 import java.sql.Connection;
@@ -64,12 +63,15 @@
 import static java.sql.JDBCType.TIMESTAMP_WITH_TIMEZONE;
 import static java.sql.JDBCType.VARBINARY;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
+@Execution(SAME_THREAD)
 public class TestJdbcVendorCompatibility
 {
     private static final String OTHER_TIMEZONE = "Asia/Kathmandu";
@@ -78,10 +80,7 @@ public class TestJdbcVendorCompatibility
     private TestingTrinoServer server;
     private List<ReferenceDriver> referenceDrivers;
 
-    private Connection connection;
-    private Statement statement;
-
-    @BeforeClass
+    @BeforeAll
     public void setupServer()
     {
         assertNotEquals(OTHER_TIMEZONE, TimeZone.getDefault().getID(), "We need a timezone different from the default JVM one");
@@ -95,7 +94,7 @@ public void setupServer()
         referenceDrivers.add(new OracleReferenceDriver());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDownServer()
             throws Exception
     {
@@ -108,247 +107,283 @@ public void tearDownServer()
                 closer.register(server);
                 server = null;
             }
-            if (connection != null) {
-                closer.register(connection);
-                connection = null;
-            }
-            if (statement != null) {
-                closer.register(statement);
-                statement = null;
-            }
         }
     }
 
-    @SuppressWarnings("JDBCResourceOpenedButNotSafelyClosed")
-    @BeforeMethod
-    public void setUp()
+    @Test
+    public void testVarbinary()
             throws Exception
     {
-        // recreate connection since tests modify connection state
-        connection = DriverManager.getConnection("jdbc:trino://" + server.getAddress(), "test", null);
-        statement = connection.createStatement();
-        referenceDrivers.forEach(ReferenceDriver::setUp);
+        try (Connection connection = createConnection();
+                Statement statement = connection.createStatement();
+                ConnectionSetup connectionSetup = new ConnectionSetup(referenceDrivers)) {
+            checkRepresentation(
+                    connection, statement, "X'12345678'",
+                    ImmutableList.of(
+                            "bytea E'\\\\x12345678'", // PostgreSQL
+                            "hextoraw('12345678')"), // Oracle
+                    VARBINARY,
+                    Optional.empty(),
+                    (rs, reference, column) -> {
+                        assertThat(rs.getBytes(column)).isEqualTo(new byte[] {0x12, 0x34, 0x56, 0x78});
+                        assertThat(rs.getBytes(column)).isEqualTo(reference.getBytes(column));
+                        assertThat(rs.getObject(column)).isEqualTo(reference.getObject(column));
+
+                        // Trino returns "0x<hex>"
+                        // PostgreSQL returns "\x<hex>"
+                        // Oracle returns "<hex>"
+                        assertThat(rs.getString(column).replaceFirst("^0x", ""))
+                                .isEqualTo(reference.getString(column).replaceFirst("^\\\\x", ""));
+                    });
+        }
     }
 
-    @AfterMethod(alwaysRun = true)
-    public void tearDown()
+    @Test
+    public void testDate()
             throws Exception
     {
-        if (statement != null) {
-            statement.close();
-            statement = null;
-        }
-        if (connection != null) {
-            connection.close();
-            connection = null;
-        }
-        for (ReferenceDriver driver : referenceDrivers) {
-            try {
-                driver.tearDown();
-            }
-            catch (Exception e) {
-                log.warn(e, "Failed to close reference JDBC driver %s; continuing", driver);
-            }
+        testDate(Optional.empty());
+        testDate(Optional.of("UTC"));
+        testDate(Optional.of("Europe/Warsaw"));
+        testDate(Optional.of("America/Denver"));
+        testDate(Optional.of(ZoneId.systemDefault().getId()));
+    }
+
+    private void testDate(Optional<String> sessionTimezoneId)
+            throws Exception
+    {
+        try (Connection connection = createConnection();
+                Statement statement = connection.createStatement();
+                ConnectionSetup connectionSetup = new ConnectionSetup(referenceDrivers)) {
+            checkRepresentation(connection, statement, "DATE '2018-02-13'", DATE, sessionTimezoneId, (rs, reference, column) -> {
+                assertEquals(rs.getDate(column), reference.getDate(column));
+                assertEquals(rs.getDate(column), Date.valueOf(LocalDate.of(2018, 2, 13)));
+
+                // with calendar
+                assertEquals(rs.getDate(column, getCalendar()), reference.getDate(column, getCalendar()));
+                assertEquals(rs.getDate(column, getCalendar()), new Date(LocalDate.of(2018, 2, 13).atStartOfDay(getZoneId()).toInstant().toEpochMilli()));
+            });
         }
     }
 
-    // test behavior with UTC and time zones to the east and west
-    @DataProvider
-    public Object[][] timeZoneIds()
+    @Test
+    public void testTimestamp()
+            throws Exception
+    {
+        testTimestamp(Optional.empty());
+        testTimestamp(Optional.of("UTC"));
+        testTimestamp(Optional.of("Europe/Warsaw"));
+        testTimestamp(Optional.of("America/Denver"));
+        testTimestamp(Optional.of(ZoneId.systemDefault().getId()));
+    }
+
+    private void testTimestamp(Optional<String> sessionTimezoneId)
+            throws Exception
     {
-        return new Object[][] {
-                {Optional.empty()},
-                {Optional.of("UTC")},
-                {Optional.of("Europe/Warsaw")},
-                {Optional.of("America/Denver")},
-                {Optional.of(ZoneId.systemDefault().getId())}
-        };
+        try (Connection connection = createConnection();
+                Statement statement = connection.createStatement();
+                ConnectionSetup connectionSetup = new ConnectionSetup(referenceDrivers)) {
+            checkRepresentation(connection, statement, "TIMESTAMP '2018-02-13 13:14:15.123'", TIMESTAMP, sessionTimezoneId, (rs, reference, column) -> {
+                assertEquals(rs.getTimestamp(column), reference.getTimestamp(column));
+                assertEquals(
+                        rs.getTimestamp(column),
+                        Timestamp.valueOf(LocalDateTime.of(2018, 2, 13, 13, 14, 15, 123_000_000)));
+
+                // with calendar
+                assertEquals(rs.getTimestamp(column, getCalendar()), reference.getTimestamp(column, getCalendar()));
+                assertEquals(
+                        rs.getTimestamp(column, getCalendar()),
+                        new Timestamp(LocalDateTime.of(2018, 2, 13, 13, 14, 15, 123_000_000).atZone(getZoneId()).toInstant().toEpochMilli()));
+            });
+        }
     }
 
     @Test
-    public void testVarbinary()
+    public void testTimestampWithTimeZone()
             throws Exception
     {
-        checkRepresentation(
-                "X'12345678'",
-                ImmutableList.of(
-                        "bytea E'\\\\x12345678'", // PostgreSQL
-                        "hextoraw('12345678')"), // Oracle
-                VARBINARY,
-                Optional.empty(),
-                (rs, reference, column) -> {
-                    assertThat(rs.getBytes(column)).isEqualTo(new byte[] {0x12, 0x34, 0x56, 0x78});
-                    assertThat(rs.getBytes(column)).isEqualTo(reference.getBytes(column));
-                    assertThat(rs.getObject(column)).isEqualTo(reference.getObject(column));
-
-                    // Trino returns "0x<hex>"
-                    // PostgreSQL returns "\x<hex>"
-                    // Oracle returns "<hex>"
-                    assertThat(rs.getString(column).replaceFirst("^0x", ""))
-                            .isEqualTo(reference.getString(column).replaceFirst("^\\\\x", ""));
-                });
+        testTimestampWithTimeZone(Optional.empty());
+        testTimestampWithTimeZone(Optional.of("UTC"));
+        testTimestampWithTimeZone(Optional.of("Europe/Warsaw"));
+        testTimestampWithTimeZone(Optional.of("America/Denver"));
+        testTimestampWithTimeZone(Optional.of(ZoneId.systemDefault().getId()));
     }
 
-    @Test(dataProvider = "timeZoneIds")
-    public void testDate(Optional<String> sessionTimezoneId)
+    private void testTimestampWithTimeZone(Optional<String> sessionTimezoneId)
             throws Exception
     {
-        checkRepresentation("DATE '2018-02-13'", DATE, sessionTimezoneId, (rs, reference, column) -> {
-            assertEquals(rs.getDate(column), reference.getDate(column));
-            assertEquals(rs.getDate(column), Date.valueOf(LocalDate.of(2018, 2, 13)));
-
-            // with calendar
-            assertEquals(rs.getDate(column, getCalendar()), reference.getDate(column, getCalendar()));
-            assertEquals(rs.getDate(column, getCalendar()), new Date(LocalDate.of(2018, 2, 13).atStartOfDay(getZoneId()).toInstant().toEpochMilli()));
-        });
+        try (Connection connection = createConnection();
+                Statement statement = connection.createStatement();
+                ConnectionSetup connectionSetup = new ConnectionSetup(referenceDrivers)) {
+            checkRepresentation(
+                    connection, statement, "TIMESTAMP '1970-01-01 00:00:00.000 +00:00'", // Trino
+                    ImmutableList.of(
+                            "TIMESTAMP WITH TIME ZONE '1970-01-01 00:00:00.000 +00:00'", // PostgreSQL
+                            "from_tz(TIMESTAMP '1970-01-01 00:00:00.000', '+00:00')"), // Oracle
+                    TIMESTAMP_WITH_TIMEZONE,
+                    sessionTimezoneId,
+                    (rs, reference, column) -> {
+                        Timestamp timestampForPointInTime = Timestamp.from(Instant.EPOCH);
+
+                        assertEquals(rs.getTimestamp(column).getTime(), reference.getTimestamp(column).getTime()); // point in time
+                        assertEquals(rs.getTimestamp(column), reference.getTimestamp(column));
+                        assertEquals(rs.getTimestamp(column), timestampForPointInTime);
+
+                        // with calendar
+                        assertEquals(rs.getTimestamp(column, getCalendar()).getTime(), reference.getTimestamp(column, getCalendar()).getTime()); // point in time
+                        assertEquals(rs.getTimestamp(column, getCalendar()), reference.getTimestamp(column, getCalendar()));
+                        assertEquals(rs.getTimestamp(column, getCalendar()), timestampForPointInTime);
+                    });
+
+            checkRepresentation(
+                    connection, statement, "TIMESTAMP '2018-02-13 13:14:15.123 +03:15'", // Trino
+                    ImmutableList.of(
+                            "TIMESTAMP WITH TIME ZONE '2018-02-13 13:14:15.123 +03:15'", // PostgreSQL
+                            "from_tz(TIMESTAMP '2018-02-13 13:14:15.123', '+03:15')"), // Oracle
+                    TIMESTAMP_WITH_TIMEZONE,
+                    sessionTimezoneId,
+                    (rs, reference, column) -> {
+                        Timestamp timestampForPointInTime = Timestamp.from(
+                                ZonedDateTime.of(2018, 2, 13, 13, 14, 15, 123_000_000, ZoneOffset.ofHoursMinutes(3, 15))
+                                        .toInstant());
+
+                        assertEquals(rs.getTimestamp(column).getTime(), reference.getTimestamp(column).getTime()); // point in time
+                        assertEquals(rs.getTimestamp(column), reference.getTimestamp(column));
+                        assertEquals(rs.getTimestamp(column), timestampForPointInTime);
+
+                        // with calendar
+                        assertEquals(rs.getTimestamp(column, getCalendar()).getTime(), reference.getTimestamp(column, getCalendar()).getTime()); // point in time
+                        assertEquals(rs.getTimestamp(column, getCalendar()), reference.getTimestamp(column, getCalendar()));
+                        assertEquals(rs.getTimestamp(column, getCalendar()), timestampForPointInTime);
+                    });
+
+            checkRepresentation(
+                    connection, statement, "TIMESTAMP '2018-02-13 13:14:15.123 Europe/Warsaw'", // Trino
+                    ImmutableList.of(
+                            "TIMESTAMP WITH TIME ZONE '2018-02-13 13:14:15.123 Europe/Warsaw'", // PostgreSQL
+                            "from_tz(TIMESTAMP '2018-02-13 13:14:15.123', 'Europe/Warsaw')"), // Oracle
+                    TIMESTAMP_WITH_TIMEZONE,
+                    sessionTimezoneId,
+                    (rs, reference, column) -> {
+                        Timestamp timestampForPointInTime = Timestamp.from(
+                                ZonedDateTime.of(2018, 2, 13, 13, 14, 15, 123_000_000, ZoneId.of("Europe/Warsaw"))
+                                        .toInstant());
+
+                        assertEquals(rs.getTimestamp(column).getTime(), reference.getTimestamp(column).getTime()); // point in time
+                        assertEquals(rs.getTimestamp(column), reference.getTimestamp(column));
+                        assertEquals(rs.getTimestamp(column), timestampForPointInTime);
+
+                        // with calendar
+                        assertEquals(rs.getTimestamp(column, getCalendar()).getTime(), reference.getTimestamp(column, getCalendar()).getTime()); // point in time
+                        assertEquals(rs.getTimestamp(column, getCalendar()), reference.getTimestamp(column, getCalendar()));
+                        assertEquals(rs.getTimestamp(column, getCalendar()), timestampForPointInTime);
+                    });
+        }
     }
 
-    @Test(dataProvider = "timeZoneIds")
-    public void testTimestamp(Optional<String> sessionTimezoneId)
+    @Test
+    public void testTime()
             throws Exception
     {
-        checkRepresentation("TIMESTAMP '2018-02-13 13:14:15.123'", TIMESTAMP, sessionTimezoneId, (rs, reference, column) -> {
-            assertEquals(rs.getTimestamp(column), reference.getTimestamp(column));
-            assertEquals(
-                    rs.getTimestamp(column),
-                    Timestamp.valueOf(LocalDateTime.of(2018, 2, 13, 13, 14, 15, 123_000_000)));
-
-            // with calendar
-            assertEquals(rs.getTimestamp(column, getCalendar()), reference.getTimestamp(column, getCalendar()));
-            assertEquals(
-                    rs.getTimestamp(column, getCalendar()),
-                    new Timestamp(LocalDateTime.of(2018, 2, 13, 13, 14, 15, 123_000_000).atZone(getZoneId()).toInstant().toEpochMilli()));
-        });
+        testTime(Optional.empty());
+        testTime(Optional.of("UTC"));
+        testTime(Optional.of("Europe/Warsaw"));
+        testTime(Optional.of("America/Denver"));
+        testTime(Optional.of(ZoneId.systemDefault().getId()));
     }
 
-    @Test(dataProvider = "timeZoneIds")
-    public void testTimestampWithTimeZone(Optional<String> sessionTimezoneId)
+    private void testTime(Optional<String> sessionTimezoneId)
             throws Exception
     {
-        checkRepresentation(
-                "TIMESTAMP '1970-01-01 00:00:00.000 +00:00'", // Trino
-                ImmutableList.of(
-                        "TIMESTAMP WITH TIME ZONE '1970-01-01 00:00:00.000 +00:00'", // PostgreSQL
-                        "from_tz(TIMESTAMP '1970-01-01 00:00:00.000', '+00:00')"), // Oracle
-                TIMESTAMP_WITH_TIMEZONE,
-                sessionTimezoneId,
-                (rs, reference, column) -> {
-                    Timestamp timestampForPointInTime = Timestamp.from(Instant.EPOCH);
-
-                    assertEquals(rs.getTimestamp(column).getTime(), reference.getTimestamp(column).getTime()); // point in time
-                    assertEquals(rs.getTimestamp(column), reference.getTimestamp(column));
-                    assertEquals(rs.getTimestamp(column), timestampForPointInTime);
-
-                    // with calendar
-                    assertEquals(rs.getTimestamp(column, getCalendar()).getTime(), reference.getTimestamp(column, getCalendar()).getTime()); // point in time
-                    assertEquals(rs.getTimestamp(column, getCalendar()), reference.getTimestamp(column, getCalendar()));
-                    assertEquals(rs.getTimestamp(column, getCalendar()), timestampForPointInTime);
-                });
-
-        checkRepresentation(
-                "TIMESTAMP '2018-02-13 13:14:15.123 +03:15'", // Trino
-                ImmutableList.of(
-                        "TIMESTAMP WITH TIME ZONE '2018-02-13 13:14:15.123 +03:15'", // PostgreSQL
-                        "from_tz(TIMESTAMP '2018-02-13 13:14:15.123', '+03:15')"), // Oracle
-                TIMESTAMP_WITH_TIMEZONE,
-                sessionTimezoneId,
-                (rs, reference, column) -> {
-                    Timestamp timestampForPointInTime = Timestamp.from(
-                            ZonedDateTime.of(2018, 2, 13, 13, 14, 15, 123_000_000, ZoneOffset.ofHoursMinutes(3, 15))
-                                    .toInstant());
-
-                    assertEquals(rs.getTimestamp(column).getTime(), reference.getTimestamp(column).getTime()); // point in time
-                    assertEquals(rs.getTimestamp(column), reference.getTimestamp(column));
-                    assertEquals(rs.getTimestamp(column), timestampForPointInTime);
-
-                    // with calendar
-                    assertEquals(rs.getTimestamp(column, getCalendar()).getTime(), reference.getTimestamp(column, getCalendar()).getTime()); // point in time
-                    assertEquals(rs.getTimestamp(column, getCalendar()), reference.getTimestamp(column, getCalendar()));
-                    assertEquals(rs.getTimestamp(column, getCalendar()), timestampForPointInTime);
-                });
-
-        checkRepresentation(
-                "TIMESTAMP '2018-02-13 13:14:15.123 Europe/Warsaw'", // Trino
-                ImmutableList.of(
-                        "TIMESTAMP WITH TIME ZONE '2018-02-13 13:14:15.123 Europe/Warsaw'", // PostgreSQL
-                        "from_tz(TIMESTAMP '2018-02-13 13:14:15.123', 'Europe/Warsaw')"), // Oracle
-                TIMESTAMP_WITH_TIMEZONE,
-                sessionTimezoneId,
-                (rs, reference, column) -> {
-                    Timestamp timestampForPointInTime = Timestamp.from(
-                            ZonedDateTime.of(2018, 2, 13, 13, 14, 15, 123_000_000, ZoneId.of("Europe/Warsaw"))
-                                    .toInstant());
-
-                    assertEquals(rs.getTimestamp(column).getTime(), reference.getTimestamp(column).getTime()); // point in time
-                    assertEquals(rs.getTimestamp(column), reference.getTimestamp(column));
-                    assertEquals(rs.getTimestamp(column), timestampForPointInTime);
-
-                    // with calendar
-                    assertEquals(rs.getTimestamp(column, getCalendar()).getTime(), reference.getTimestamp(column, getCalendar()).getTime()); // point in time
-                    assertEquals(rs.getTimestamp(column, getCalendar()), reference.getTimestamp(column, getCalendar()));
-                    assertEquals(rs.getTimestamp(column, getCalendar()), timestampForPointInTime);
-                });
+        try (Connection connection = createConnection();
+                Statement statement = connection.createStatement();
+                ConnectionSetup connectionSetup = new ConnectionSetup(referenceDrivers)) {
+            checkRepresentation(connection, statement, "TIME '09:39:05'", TIME, sessionTimezoneId, (rs, reference, column) -> {
+                assertEquals(rs.getTime(column), reference.getTime(column));
+                assertEquals(rs.getTime(column), Time.valueOf(LocalTime.of(9, 39, 5)));
+
+                // with calendar
+                assertEquals(rs.getTime(column, getCalendar()), reference.getTime(column, getCalendar()));
+                assertEquals(rs.getTime(column, getCalendar()), new Time(LocalDate.of(1970, 1, 1).atTime(LocalTime.of(9, 39, 5)).atZone(getZoneId()).toInstant().toEpochMilli()));
+            });
+        }
     }
 
-    @Test(dataProvider = "timeZoneIds")
-    public void testTime(Optional<String> sessionTimezoneId)
+    @Test
+    public void testDateRoundTrip()
+            throws Exception
+    {
+        testDateRoundTrip(Optional.empty());
+        testDateRoundTrip(Optional.of("UTC"));
+        testDateRoundTrip(Optional.of("Europe/Warsaw"));
+        testDateRoundTrip(Optional.of("America/Denver"));
+        testDateRoundTrip(Optional.of(ZoneId.systemDefault().getId()));
+    }
+
+    private void testDateRoundTrip(Optional<String> sessionTimezoneId)
+            throws SQLException
+    {
+        try (Connection connection = createConnection()) {
+            LocalDate date = LocalDate.of(2001, 5, 6);
+            Date sqlDate = Date.valueOf(date);
+            java.util.Date javaDate = new java.util.Date(sqlDate.getTime());
+            LocalDateTime dateTime = LocalDateTime.of(date, LocalTime.of(12, 34, 56));
+            Timestamp sqlTimestamp = Timestamp.valueOf(dateTime);
+
+            assertParameter(connection, sqlDate, sessionTimezoneId, (ps, i) -> ps.setDate(i, sqlDate));
+            assertParameter(connection, sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlDate));
+            assertParameter(connection, sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlDate, Types.DATE));
+            assertParameter(connection, sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlTimestamp, Types.DATE));
+            assertParameter(connection, sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, javaDate, Types.DATE));
+            assertParameter(connection, sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, date, Types.DATE));
+            assertParameter(connection, sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, dateTime, Types.DATE));
+            assertParameter(connection, sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, "2001-05-06", Types.DATE));
+        }
+    }
+
+    @Test
+    public void testTimestampRoundTrip()
             throws Exception
     {
-        checkRepresentation("TIME '09:39:05'", TIME, sessionTimezoneId, (rs, reference, column) -> {
-            assertEquals(rs.getTime(column), reference.getTime(column));
-            assertEquals(rs.getTime(column), Time.valueOf(LocalTime.of(9, 39, 5)));
-
-            // with calendar
-            assertEquals(rs.getTime(column, getCalendar()), reference.getTime(column, getCalendar()));
-            assertEquals(rs.getTime(column, getCalendar()), new Time(LocalDate.of(1970, 1, 1).atTime(LocalTime.of(9, 39, 5)).atZone(getZoneId()).toInstant().toEpochMilli()));
-        });
+        testTimestampRoundTrip(Optional.empty());
+        testTimestampRoundTrip(Optional.of("UTC"));
+        testTimestampRoundTrip(Optional.of("Europe/Warsaw"));
+        testTimestampRoundTrip(Optional.of("America/Denver"));
+        testTimestampRoundTrip(Optional.of(ZoneId.systemDefault().getId()));
     }
 
-    @Test(dataProvider = "timeZoneIds")
-    public void testDateRoundTrip(Optional<String> sessionTimezoneId)
+    private void testTimestampRoundTrip(Optional<String> sessionTimezoneId)
             throws SQLException
     {
-        LocalDate date = LocalDate.of(2001, 5, 6);
-        Date sqlDate = Date.valueOf(date);
-        java.util.Date javaDate = new java.util.Date(sqlDate.getTime());
-        LocalDateTime dateTime = LocalDateTime.of(date, LocalTime.of(12, 34, 56));
-        Timestamp sqlTimestamp = Timestamp.valueOf(dateTime);
-
-        assertParameter(sqlDate, sessionTimezoneId, (ps, i) -> ps.setDate(i, sqlDate));
-        assertParameter(sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlDate));
-        assertParameter(sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlDate, Types.DATE));
-        assertParameter(sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlTimestamp, Types.DATE));
-        assertParameter(sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, javaDate, Types.DATE));
-        assertParameter(sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, date, Types.DATE));
-        assertParameter(sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, dateTime, Types.DATE));
-        assertParameter(sqlDate, sessionTimezoneId, (ps, i) -> ps.setObject(i, "2001-05-06", Types.DATE));
+        try (Connection connection = createConnection()) {
+            LocalDateTime dateTime = LocalDateTime.of(2001, 5, 6, 12, 34, 56);
+            Date sqlDate = Date.valueOf(dateTime.toLocalDate());
+            Time sqlTime = Time.valueOf(dateTime.toLocalTime());
+            Timestamp sqlTimestamp = Timestamp.valueOf(dateTime);
+            Timestamp sameInstantInWarsawZone = Timestamp.valueOf(dateTime.atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneId.of("Europe/Warsaw")).toLocalDateTime());
+            java.util.Date javaDate = java.util.Date.from(dateTime.atZone(ZoneId.systemDefault()).toInstant());
+
+            assertParameter(connection, sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setTimestamp(i, sqlTimestamp));
+            assertParameter(connection, sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setTimestamp(i, sqlTimestamp, null));
+            assertParameter(connection, sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setTimestamp(i, sqlTimestamp, Calendar.getInstance()));
+            assertParameter(connection, sameInstantInWarsawZone, sessionTimezoneId, (ps, i) -> ps.setTimestamp(i, sqlTimestamp, Calendar.getInstance(TimeZone.getTimeZone(ZoneId.of("Europe/Warsaw")))));
+            assertParameter(connection, sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlTimestamp));
+            assertParameter(connection, new Timestamp(sqlDate.getTime()), sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlDate, Types.TIMESTAMP));
+            assertParameter(connection, new Timestamp(sqlTime.getTime()), sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlTime, Types.TIMESTAMP));
+            assertParameter(connection, sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlTimestamp, Types.TIMESTAMP));
+            assertParameter(connection, sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setObject(i, javaDate, Types.TIMESTAMP));
+            assertParameter(connection, sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setObject(i, dateTime, Types.TIMESTAMP));
+            assertParameter(connection, sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setObject(i, "2001-05-06 12:34:56", Types.TIMESTAMP));
+        }
     }
 
-    @Test(dataProvider = "timeZoneIds")
-    public void testTimestampRoundTrip(Optional<String> sessionTimezoneId)
+    private Connection createConnection()
             throws SQLException
     {
-        LocalDateTime dateTime = LocalDateTime.of(2001, 5, 6, 12, 34, 56);
-        Date sqlDate = Date.valueOf(dateTime.toLocalDate());
-        Time sqlTime = Time.valueOf(dateTime.toLocalTime());
-        Timestamp sqlTimestamp = Timestamp.valueOf(dateTime);
-        Timestamp sameInstantInWarsawZone = Timestamp.valueOf(dateTime.atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneId.of("Europe/Warsaw")).toLocalDateTime());
-        java.util.Date javaDate = java.util.Date.from(dateTime.atZone(ZoneId.systemDefault()).toInstant());
-
-        assertParameter(sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setTimestamp(i, sqlTimestamp));
-        assertParameter(sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setTimestamp(i, sqlTimestamp, null));
-        assertParameter(sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setTimestamp(i, sqlTimestamp, Calendar.getInstance()));
-        assertParameter(sameInstantInWarsawZone, sessionTimezoneId, (ps, i) -> ps.setTimestamp(i, sqlTimestamp, Calendar.getInstance(TimeZone.getTimeZone(ZoneId.of("Europe/Warsaw")))));
-        assertParameter(sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlTimestamp));
-        assertParameter(new Timestamp(sqlDate.getTime()), sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlDate, Types.TIMESTAMP));
-        assertParameter(new Timestamp(sqlTime.getTime()), sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlTime, Types.TIMESTAMP));
-        assertParameter(sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setObject(i, sqlTimestamp, Types.TIMESTAMP));
-        assertParameter(sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setObject(i, javaDate, Types.TIMESTAMP));
-        assertParameter(sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setObject(i, dateTime, Types.TIMESTAMP));
-        assertParameter(sqlTimestamp, sessionTimezoneId, (ps, i) -> ps.setObject(i, "2001-05-06 12:34:56", Types.TIMESTAMP));
+        return DriverManager.getConnection("jdbc:trino://" + server.getAddress(), "test", null);
     }
 
-    private void assertParameter(Object expectedValue, Optional<String> sessionTimezoneId, Binder binder)
+    private void assertParameter(Connection connection, Object expectedValue, Optional<String> sessionTimezoneId, Binder binder)
             throws SQLException
     {
         // connection is recreated before each test invocation
@@ -364,16 +399,16 @@ private void assertParameter(Object expectedValue, Optional<String> sessionTimez
         }
     }
 
-    private void checkRepresentation(String expression, JDBCType type, Optional<String> sessionTimezoneId, ResultAssertion assertion)
+    private void checkRepresentation(Connection connection, Statement statement, String expression, JDBCType type, Optional<String> sessionTimezoneId, ResultAssertion assertion)
             throws Exception
     {
         List<String> referenceDriversExpressions = referenceDrivers.stream()
                 .map(driver -> driver.supports(type) ? expression : "")
                 .collect(toImmutableList());
-        checkRepresentation(expression, referenceDriversExpressions, type, sessionTimezoneId, assertion);
+        checkRepresentation(connection, statement, expression, referenceDriversExpressions, type, sessionTimezoneId, assertion);
     }
 
-    private void checkRepresentation(String trinoExpression, List<String> referenceDriversExpressions, JDBCType type, Optional<String> sessionTimezoneId, ResultAssertion assertion)
+    private void checkRepresentation(Connection connection, Statement statement, String trinoExpression, List<String> referenceDriversExpressions, JDBCType type, Optional<String> sessionTimezoneId, ResultAssertion assertion)
             throws Exception
     {
         verify(referenceDriversExpressions.size() == referenceDrivers.size(), "Wrong referenceDriversExpressions list size");
@@ -391,7 +426,7 @@ private void checkRepresentation(String trinoExpression, List<String> referenceD
                 log.info("Checking behavior against %s using expression: %s", driver, referenceExpression);
                 try {
                     verify(!referenceExpression.isEmpty(), "referenceExpression is empty");
-                    checkRepresentation(trinoExpression, referenceExpression, type, sessionTimezoneId, driver, assertion);
+                    checkRepresentation(connection, statement, trinoExpression, referenceExpression, type, sessionTimezoneId, driver, assertion);
                 }
                 catch (RuntimeException | AssertionError e) {
                     String message = format("Failure when checking behavior against %s", driver);
@@ -416,10 +451,10 @@ private void checkRepresentation(String trinoExpression, List<String> referenceD
         }
     }
 
-    private void checkRepresentation(String trinoExpression, String referenceExpression, JDBCType type, Optional<String> sessionTimezoneId, ReferenceDriver reference, ResultAssertion assertion)
+    private void checkRepresentation(Connection connection, Statement statement, String trinoExpression, String referenceExpression, JDBCType type, Optional<String> sessionTimezoneId, ReferenceDriver reference, ResultAssertion assertion)
             throws Exception
     {
-        try (ResultSet trinoResultSet = trinoQuery(trinoExpression, sessionTimezoneId);
+        try (ResultSet trinoResultSet = trinoQuery(connection, statement, trinoExpression, sessionTimezoneId);
                 ResultSet referenceResultSet = reference.query(referenceExpression, sessionTimezoneId)) {
             assertTrue(trinoResultSet.next());
             assertTrue(referenceResultSet.next());
@@ -436,7 +471,7 @@ private void checkRepresentation(String trinoExpression, String referenceExpress
         }
     }
 
-    private ResultSet trinoQuery(String expression, Optional<String> sessionTimezoneId)
+    private ResultSet trinoQuery(Connection connection, Statement statement, String expression, Optional<String> sessionTimezoneId)
             throws Exception
     {
         // connection is recreated before each test invocation
@@ -454,6 +489,33 @@ private ZoneId getZoneId()
         return ZoneId.of(getCalendar().getTimeZone().getID());
     }
 
+    private class ConnectionSetup
+            implements Closeable
+    {
+        private final List<ReferenceDriver> drivers;
+
+        public ConnectionSetup(List<ReferenceDriver> drivers)
+        {
+            this.drivers = drivers;
+            for (ReferenceDriver driver : drivers) {
+                driver.setUp();
+            }
+        }
+
+        @Override
+        public void close()
+        {
+            for (ReferenceDriver driver : drivers) {
+                try {
+                    driver.tearDown();
+                }
+                catch (Exception e) {
+                    log.warn(e, "Failed to close reference JDBC driver %s; continuing", driver);
+                }
+            }
+        }
+    }
+
     private interface ReferenceDriver
             extends Closeable
     {
@@ -570,7 +632,7 @@ private static class PostgresqlReferenceDriver
         PostgresqlReferenceDriver()
         {
             // Use the current latest PostgreSQL version as the reference
-            postgresqlContainer = new PostgreSQLContainer<>("postgres:12.4");
+            postgresqlContainer = new PostgreSQLContainer<>("postgres:15");
             postgresqlContainer.start();
         }
 
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcWarnings.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcWarnings.java
index 99996dea4697..d5c9b9ac71e9 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcWarnings.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcWarnings.java
@@ -24,11 +24,11 @@
 import io.trino.spi.WarningCode;
 import io.trino.testing.TestingWarningCollector;
 import io.trino.testing.TestingWarningCollectorConfig;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -50,24 +50,25 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
+@Execution(SAME_THREAD)
 public class TestJdbcWarnings
 {
     // Number of warnings preloaded to the testing warning collector before a query runs
     private static final int PRELOADED_WARNINGS = 5;
 
     private TestingTrinoServer server;
-    private Connection connection;
-    private Statement statement;
-    private ExecutorService executor;
+    private final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
 
-    @BeforeClass
+    @BeforeAll
     public void setupServer()
             throws Exception
     {
@@ -95,82 +96,72 @@ public void setupServer()
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDownServer()
             throws Exception
     {
         server.close();
         server = null;
-    }
-
-    @SuppressWarnings("JDBCResourceOpenedButNotSafelyClosed")
-    @BeforeMethod
-    public void setup()
-            throws Exception
-    {
-        connection = createConnection();
-        statement = connection.createStatement();
-        executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
-    }
-
-    @AfterMethod(alwaysRun = true)
-    public void teardown()
-            throws Exception
-    {
         executor.shutdownNow();
-        executor = null;
-        statement.close();
-        statement = null;
-        connection.close();
-        connection = null;
     }
 
     @Test
     public void testStatementWarnings()
             throws SQLException
     {
-        assertFalse(statement.execute("CREATE SCHEMA blackhole.test_schema"));
-        SQLWarning warning = statement.getWarnings();
-        assertNotNull(warning);
-        TestingWarningCollectorConfig warningCollectorConfig = new TestingWarningCollectorConfig().setPreloadedWarnings(PRELOADED_WARNINGS);
-        TestingWarningCollector warningCollector = new TestingWarningCollector(new WarningCollectorConfig(), warningCollectorConfig);
-        List<TrinoWarning> expectedWarnings = warningCollector.getWarnings();
-        assertStartsWithExpectedWarnings(warning, fromTrinoWarnings(expectedWarnings));
-        statement.clearWarnings();
-        assertNull(statement.getWarnings());
+        try (Connection connection = createConnection();
+                Statement statement = connection.createStatement()) {
+            assertFalse(statement.execute("CREATE SCHEMA blackhole.test_schema"));
+            SQLWarning warning = statement.getWarnings();
+            assertNotNull(warning);
+            TestingWarningCollectorConfig warningCollectorConfig = new TestingWarningCollectorConfig().setPreloadedWarnings(PRELOADED_WARNINGS);
+            TestingWarningCollector warningCollector = new TestingWarningCollector(new WarningCollectorConfig(), warningCollectorConfig);
+            List<TrinoWarning> expectedWarnings = warningCollector.getWarnings();
+            assertStartsWithExpectedWarnings(warning, fromTrinoWarnings(expectedWarnings));
+            statement.clearWarnings();
+            assertNull(statement.getWarnings());
+        }
     }
 
     @Test
     public void testLongRunningStatement()
             throws Exception
     {
-        Future<?> future = executor.submit(() -> {
-            statement.execute("CREATE TABLE test_long_running AS SELECT * FROM slow_table");
-            return null;
-        });
-        assertStatementWarnings(statement, future);
-        statement.execute("DROP TABLE test_long_running");
+        try (Connection connection = createConnection();
+                Statement statement = connection.createStatement()) {
+            Future<?> future = executor.submit(() -> {
+                statement.execute("CREATE TABLE test_long_running AS SELECT * FROM slow_table");
+                return null;
+            });
+            assertStatementWarnings(statement, future);
+            statement.execute("DROP TABLE test_long_running");
+        }
     }
 
     @Test
     public void testLongRunningQuery()
             throws Exception
     {
-        Future<?> future = executor.submit(() -> {
-            ResultSet resultSet = statement.executeQuery("SELECT * FROM slow_table");
-            while (resultSet.next()) {
-                // discard results
-            }
-            return null;
-        });
-        assertStatementWarnings(statement, future);
+        try (Connection connection = createConnection();
+                Statement statement = connection.createStatement()) {
+            Future<?> future = executor.submit(() -> {
+                ResultSet resultSet = statement.executeQuery("SELECT * FROM slow_table");
+                while (resultSet.next()) {
+                    // discard results
+                }
+                return null;
+            });
+            assertStatementWarnings(statement, future);
+        }
     }
 
     @Test
     public void testExecuteQueryWarnings()
             throws SQLException
     {
-        try (ResultSet rs = statement.executeQuery("SELECT a FROM (VALUES 1, 2, 3) t(a)")) {
+        try (Connection connection = createConnection();
+                Statement statement = connection.createStatement();
+                ResultSet rs = statement.executeQuery("SELECT a FROM (VALUES 1, 2, 3) t(a)")) {
             assertNull(statement.getConnection().getWarnings());
             Set<WarningEntry> currentWarnings = new HashSet<>();
             assertWarnings(rs.getWarnings(), currentWarnings);
@@ -189,6 +180,7 @@ public void testExecuteQueryWarnings()
 
     @Test
     public void testSqlWarning()
+            throws SQLException
     {
         ImmutableList.Builder<TrinoWarning> builder = ImmutableList.builder();
         for (int i = 0; i < 3; i++) {
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestProgressMonitor.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestProgressMonitor.java
index 208a17a1bc83..47c57122670b 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestProgressMonitor.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestProgressMonitor.java
@@ -22,9 +22,11 @@
 import io.trino.spi.type.StandardTypes;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -34,6 +36,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.List;
+import java.util.OptionalDouble;
 import java.util.function.Consumer;
 
 import static com.google.common.base.Preconditions.checkState;
@@ -41,18 +44,21 @@
 import static io.airlift.json.JsonCodec.jsonCodec;
 import static io.airlift.testing.Assertions.assertGreaterThanOrEqual;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
+@Execution(SAME_THREAD)
 public class TestProgressMonitor
 {
     private static final JsonCodec<QueryResults> QUERY_RESULTS_CODEC = jsonCodec(QueryResults.class);
 
     private MockWebServer server;
 
-    @BeforeMethod
+    @BeforeEach
     public void setup()
             throws IOException
     {
@@ -60,7 +66,7 @@ public void setup()
         server.start();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void teardown()
             throws IOException
     {
@@ -91,7 +97,7 @@ private String newQueryResults(Integer partialCancelId, Integer nextUriId, List<
                 nextUriId == null ? null : server.url(format("/v1/statement/%s/%s", queryId, nextUriId)).uri(),
                 responseColumns,
                 data,
-                new StatementStats(state, state.equals("QUEUED"), true, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, null),
+                new StatementStats(state, state.equals("QUEUED"), true, OptionalDouble.of(0), OptionalDouble.of(0), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, null),
                 null,
                 ImmutableList.of(),
                 null,
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDatabaseMetaData.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDatabaseMetaData.java
index 1da1ce99930f..b45dd11edaf4 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDatabaseMetaData.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDatabaseMetaData.java
@@ -40,14 +40,12 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.testing.CountingMockConnector;
-import io.trino.testing.CountingMockConnector.MetadataCallsCount;
 import io.trino.type.ColorType;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -68,6 +66,7 @@
 
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMultiset.toImmutableMultiset;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.airlift.testing.Assertions.assertContains;
@@ -83,16 +82,20 @@
 import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.spi.type.VarcharType.createVarcharType;
+import static io.trino.testing.MultisetAssertions.assertMultisetsEqual;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
+@Execution(SAME_THREAD)
 public class TestTrinoDatabaseMetaData
 {
     private static final String TEST_CATALOG = "test_catalog";
@@ -101,9 +104,7 @@ public class TestTrinoDatabaseMetaData
     private CountingMockConnector countingMockConnector;
     private TestingTrinoServer server;
 
-    private Connection connection;
-
-    @BeforeClass
+    @BeforeAll
     public void setupServer()
             throws Exception
     {
@@ -144,49 +145,36 @@ public void setupServer()
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDownServer()
             throws Exception
     {
         server.close();
         server = null;
+        countingMockConnector.close();
         countingMockConnector = null;
     }
 
-    @SuppressWarnings("JDBCResourceOpenedButNotSafelyClosed")
-    @BeforeMethod
-    public void setup()
-            throws Exception
-    {
-        connection = createConnection();
-    }
-
-    @AfterMethod(alwaysRun = true)
-    public void tearDown()
-            throws Exception
-    {
-        connection.close();
-        connection = null;
-    }
-
     @Test
     public void testGetClientInfoProperties()
             throws Exception
     {
-        DatabaseMetaData metaData = connection.getMetaData();
-
-        try (ResultSet resultSet = metaData.getClientInfoProperties()) {
-            assertResultSet(resultSet)
-                    .hasColumnCount(4)
-                    .hasColumn(1, "NAME", Types.VARCHAR)
-                    .hasColumn(2, "MAX_LEN", Types.INTEGER)
-                    .hasColumn(3, "DEFAULT_VALUE", Types.VARCHAR)
-                    .hasColumn(4, "DESCRIPTION", Types.VARCHAR)
-                    .hasRows((list(
-                            list("ApplicationName", Integer.MAX_VALUE, null, null),
-                            list("ClientInfo", Integer.MAX_VALUE, null, null),
-                            list("ClientTags", Integer.MAX_VALUE, null, null),
-                            list("TraceToken", Integer.MAX_VALUE, null, null))));
+        try (Connection connection = createConnection()) {
+            DatabaseMetaData metaData = connection.getMetaData();
+
+            try (ResultSet resultSet = metaData.getClientInfoProperties()) {
+                assertResultSet(resultSet)
+                        .hasColumnCount(4)
+                        .hasColumn(1, "NAME", Types.VARCHAR)
+                        .hasColumn(2, "MAX_LEN", Types.INTEGER)
+                        .hasColumn(3, "DEFAULT_VALUE", Types.VARCHAR)
+                        .hasColumn(4, "DESCRIPTION", Types.VARCHAR)
+                        .hasRows((list(
+                                list("ApplicationName", Integer.MAX_VALUE, null, null),
+                                list("ClientInfo", Integer.MAX_VALUE, null, null),
+                                list("ClientTags", Integer.MAX_VALUE, null, null),
+                                list("TraceToken", Integer.MAX_VALUE, null, null))));
+            }
         }
     }
 
@@ -194,52 +182,56 @@ public void testGetClientInfoProperties()
     public void testPassEscapeInMetaDataQuery()
             throws Exception
     {
-        DatabaseMetaData metaData = connection.getMetaData();
+        try (Connection connection = createConnection()) {
+            DatabaseMetaData metaData = connection.getMetaData();
 
-        Set<String> queries = captureQueries(() -> {
-            String schemaPattern = "defau" + metaData.getSearchStringEscape() + "_t";
-            try (ResultSet resultSet = metaData.getColumns("blackhole", schemaPattern, null, null)) {
-                assertFalse(resultSet.next(), "There should be no results");
-            }
-            return null;
-        });
+            Set<String> queries = captureQueries(() -> {
+                String schemaPattern = "defau" + metaData.getSearchStringEscape() + "_t";
+                try (ResultSet resultSet = metaData.getColumns("blackhole", schemaPattern, null, null)) {
+                    assertFalse(resultSet.next(), "There should be no results");
+                }
+                return null;
+            });
 
-        assertEquals(queries.size(), 1, "Expected exactly one query, got " + queries.size());
-        String query = getOnlyElement(queries);
+            assertEquals(queries.size(), 1, "Expected exactly one query, got " + queries.size());
+            String query = getOnlyElement(queries);
 
-        assertContains(query, "_t' ESCAPE '", "Metadata query does not contain ESCAPE");
+            assertContains(query, "_t' ESCAPE '", "Metadata query does not contain ESCAPE");
+        }
     }
 
     @Test
     public void testGetTypeInfo()
             throws Exception
     {
-        DatabaseMetaData metaData = connection.getMetaData();
-        ResultSet typeInfo = metaData.getTypeInfo();
-        while (typeInfo.next()) {
-            int jdbcType = typeInfo.getInt("DATA_TYPE");
-            switch (jdbcType) {
-                case Types.BIGINT:
-                    assertColumnSpec(typeInfo, Types.BIGINT, 19L, 10L, "bigint");
-                    break;
-                case Types.BOOLEAN:
-                    assertColumnSpec(typeInfo, Types.BOOLEAN, null, null, "boolean");
-                    break;
-                case Types.INTEGER:
-                    assertColumnSpec(typeInfo, Types.INTEGER, 10L, 10L, "integer");
-                    break;
-                case Types.DECIMAL:
-                    assertColumnSpec(typeInfo, Types.DECIMAL, 38L, 10L, "decimal");
-                    break;
-                case Types.VARCHAR:
-                    assertColumnSpec(typeInfo, Types.VARCHAR, null, null, "varchar");
-                    break;
-                case Types.TIMESTAMP:
-                    assertColumnSpec(typeInfo, Types.TIMESTAMP, 23L, null, "timestamp");
-                    break;
-                case Types.DOUBLE:
-                    assertColumnSpec(typeInfo, Types.DOUBLE, 53L, 2L, "double");
-                    break;
+        try (Connection connection = createConnection()) {
+            DatabaseMetaData metaData = connection.getMetaData();
+            ResultSet typeInfo = metaData.getTypeInfo();
+            while (typeInfo.next()) {
+                int jdbcType = typeInfo.getInt("DATA_TYPE");
+                switch (jdbcType) {
+                    case Types.BIGINT:
+                        assertColumnSpec(typeInfo, Types.BIGINT, 19L, 10L, "bigint");
+                        break;
+                    case Types.BOOLEAN:
+                        assertColumnSpec(typeInfo, Types.BOOLEAN, null, null, "boolean");
+                        break;
+                    case Types.INTEGER:
+                        assertColumnSpec(typeInfo, Types.INTEGER, 10L, 10L, "integer");
+                        break;
+                    case Types.DECIMAL:
+                        assertColumnSpec(typeInfo, Types.DECIMAL, 38L, 10L, "decimal");
+                        break;
+                    case Types.VARCHAR:
+                        assertColumnSpec(typeInfo, Types.VARCHAR, null, null, "varchar");
+                        break;
+                    case Types.TIMESTAMP:
+                        assertColumnSpec(typeInfo, Types.TIMESTAMP, 23L, null, "timestamp");
+                        break;
+                    case Types.DOUBLE:
+                        assertColumnSpec(typeInfo, Types.DOUBLE, 53L, 2L, "double");
+                        break;
+                }
             }
         }
     }
@@ -248,8 +240,10 @@ public void testGetTypeInfo()
     public void testGetUrl()
             throws Exception
     {
-        DatabaseMetaData metaData = connection.getMetaData();
-        assertEquals(metaData.getURL(), "jdbc:trino://" + server.getAddress());
+        try (Connection connection = createConnection()) {
+            DatabaseMetaData metaData = connection.getMetaData();
+            assertEquals(metaData.getURL(), "jdbc:trino://" + server.getAddress());
+        }
     }
 
     @Test
@@ -304,6 +298,8 @@ public void testGetSchemas()
         countingCatalog.add(list(COUNTING_CATALOG, "information_schema"));
         countingCatalog.add(list(COUNTING_CATALOG, "test_schema1"));
         countingCatalog.add(list(COUNTING_CATALOG, "test_schema2"));
+        countingCatalog.add(list(COUNTING_CATALOG, "test_schema3_empty"));
+        countingCatalog.add(list(COUNTING_CATALOG, "test_schema4_empty"));
 
         List<List<String>> system = new ArrayList<>();
         system.add(list("system", "information_schema"));
@@ -347,6 +343,10 @@ public void testGetSchemas()
                 assertGetSchemasResult(rs, list());
             }
 
+            try (ResultSet rs = connection.getMetaData().getSchemas(null, "")) {
+                assertGetSchemasResult(rs, list());
+            }
+
             try (ResultSet rs = connection.getMetaData().getSchemas(TEST_CATALOG, "information_schema")) {
                 assertGetSchemasResult(rs, list(list(TEST_CATALOG, "information_schema")));
             }
@@ -1014,418 +1014,493 @@ public void testGetSuperTypes()
     public void testGetSchemasMetadataCalls()
             throws Exception
     {
-        verify(connection.getMetaData().getSearchStringEscape().equals("\\")); // this test uses escape inline for readability
+        try (Connection connection = createConnection()) {
+            verify(connection.getMetaData().getSearchStringEscape().equals("\\")); // this test uses escape inline for readability
 
-        // No filter
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getSchemas(null, null),
-                        list("TABLE_CATALOG", "TABLE_SCHEM")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1));
+            // No filter
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getSchemas(null, null),
+                            list("TABLE_CATALOG", "TABLE_SCHEM")),
+                    ImmutableMultiset.of("ConnectorMetadata.listSchemaNames"));
 
-        // Equality predicate on catalog name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getSchemas(COUNTING_CATALOG, null),
-                        list("TABLE_CATALOG", "TABLE_SCHEM")),
-                list(
-                        list(COUNTING_CATALOG, "information_schema"),
-                        list(COUNTING_CATALOG, "test_schema1"),
-                        list(COUNTING_CATALOG, "test_schema2")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1));
+            // Equality predicate on catalog name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getSchemas(COUNTING_CATALOG, null),
+                            list("TABLE_CATALOG", "TABLE_SCHEM")),
+                    list(
+                            list(COUNTING_CATALOG, "information_schema"),
+                            list(COUNTING_CATALOG, "test_schema1"),
+                            list(COUNTING_CATALOG, "test_schema2"),
+                            list(COUNTING_CATALOG, "test_schema3_empty"),
+                            list(COUNTING_CATALOG, "test_schema4_empty")),
+                    ImmutableMultiset.of("ConnectorMetadata.listSchemaNames"));
+
+            // Equality predicate on schema name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getSchemas(COUNTING_CATALOG, "test\\_schema%"),
+                            list("TABLE_CATALOG", "TABLE_SCHEM")),
+                    list(
+                            list(COUNTING_CATALOG, "test_schema1"),
+                            list(COUNTING_CATALOG, "test_schema2"),
+                            list(COUNTING_CATALOG, "test_schema3_empty"),
+                            list(COUNTING_CATALOG, "test_schema4_empty")),
+                    ImmutableMultiset.of("ConnectorMetadata.listSchemaNames"));
+
+            // LIKE predicate on schema name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getSchemas(COUNTING_CATALOG, "test_sch_ma1"),
+                            list("TABLE_CATALOG", "TABLE_SCHEM")),
+                    list(list(COUNTING_CATALOG, "test_schema1")),
+                    ImmutableMultiset.of("ConnectorMetadata.listSchemaNames"));
 
-        // Equality predicate on schema name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getSchemas(COUNTING_CATALOG, "test\\_schema%"),
-                        list("TABLE_CATALOG", "TABLE_SCHEM")),
-                list(
-                        list(COUNTING_CATALOG, "test_schema1"),
-                        list(COUNTING_CATALOG, "test_schema2")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1));
-
-        // LIKE predicate on schema name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getSchemas(COUNTING_CATALOG, "test_sch_ma1"),
-                        list("TABLE_CATALOG", "TABLE_SCHEM")),
-                list(list(COUNTING_CATALOG, "test_schema1")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1));
-
-        // Empty schema name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getSchemas(COUNTING_CATALOG, ""),
-                        list("TABLE_CATALOG", "TABLE_SCHEM")),
-                list(),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1));
-
-        // catalog does not exist
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getSchemas("wrong", null),
-                        list("TABLE_CATALOG", "TABLE_SCHEM")),
-                list(),
-                new MetadataCallsCount());
+            // Empty schema name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getSchemas(COUNTING_CATALOG, ""),
+                            list("TABLE_CATALOG", "TABLE_SCHEM")),
+                    list(),
+                    ImmutableMultiset.of());
+
+            // catalog does not exist
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getSchemas("wrong", null),
+                            list("TABLE_CATALOG", "TABLE_SCHEM")),
+                    list(),
+                    ImmutableMultiset.of());
+
+            // empty catalog name (means null filter)
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getSchemas("", null),
+                            list("TABLE_CATALOG", "TABLE_SCHEM")),
+                    list(),
+                    ImmutableMultiset.of());
+        }
     }
 
     @Test
     public void testGetTablesMetadataCalls()
             throws Exception
     {
-        verify(connection.getMetaData().getSearchStringEscape().equals("\\")); // this test uses escape inline for readability
+        try (Connection connection = createConnection()) {
+            verify(connection.getMetaData().getSearchStringEscape().equals("\\")); // this test uses escape inline for readability
 
-        // No filter
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getTables(null, null, null, null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2));
-
-        // Equality predicate on catalog name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, null, null, null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2));
-
-        // Equality predicate on schema name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, "test\\_schema1", null, null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
-                countingMockConnector.getAllTables()
-                        .filter(schemaTableName -> schemaTableName.getSchemaName().equals("test_schema1"))
-                        .map(schemaTableName -> list(COUNTING_CATALOG, schemaTableName.getSchemaName(), schemaTableName.getTableName(), "TABLE"))
-                        .collect(toImmutableList()),
-                new MetadataCallsCount()
-                        .withListTablesCount(1));
-
-        // LIKE predicate on schema name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, "test_sch_ma1", null, null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
-                countingMockConnector.getAllTables()
-                        .filter(schemaTableName -> schemaTableName.getSchemaName().equals("test_schema1"))
-                        .map(schemaTableName -> list(COUNTING_CATALOG, schemaTableName.getSchemaName(), schemaTableName.getTableName(), "TABLE"))
-                        .collect(toImmutableList()),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2));
-
-        // Equality predicate on table name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, null, "test\\_table1", null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
-                list(
-                        list(COUNTING_CATALOG, "test_schema1", "test_table1", "TABLE"),
-                        list(COUNTING_CATALOG, "test_schema2", "test_table1", "TABLE")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2));
-
-        // LIKE predicate on table name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, null, "test_t_ble1", null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
-                list(
-                        list(COUNTING_CATALOG, "test_schema1", "test_table1", "TABLE"),
-                        list(COUNTING_CATALOG, "test_schema2", "test_table1", "TABLE")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2));
-
-        // Equality predicate on schema name and table name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, "test\\_schema1", "test\\_table1", null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
-                list(list(COUNTING_CATALOG, "test_schema1", "test_table1", "TABLE")),
-                new MetadataCallsCount()
-                        .withGetTableHandleCount(1));
-
-        // LIKE predicate on schema name and table name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, "test_schema1", "test_table1", null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
-                list(list(COUNTING_CATALOG, "test_schema1", "test_table1", "TABLE")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2));
-
-        // catalog does not exist
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getTables("wrong", null, null, null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
-                list(),
-                new MetadataCallsCount());
+            // No filter
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables(null, null, null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    ImmutableMultiset.<String>builder()
+                            .add("ConnectorMetadata.listViews")
+                            .add("ConnectorMetadata.listTables")
+                            .build());
 
-        // empty schema name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, "", null, null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
-                list(),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2));
-
-        // empty table name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, null, "", null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
-                list(),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2));
-
-        // no table types selected
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, null, null, new String[0]),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
-                list(),
-                new MetadataCallsCount());
+            // Equality predicate on catalog name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, null, null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    ImmutableMultiset.<String>builder()
+                            .add("ConnectorMetadata.listViews")
+                            .add("ConnectorMetadata.listTables")
+                            .build());
+
+            // Equality predicate on schema name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, "test\\_schema1", null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    countingMockConnector.getAllTables()
+                            .filter(schemaTableName -> schemaTableName.getSchemaName().equals("test_schema1"))
+                            .map(schemaTableName -> list(COUNTING_CATALOG, schemaTableName.getSchemaName(), schemaTableName.getTableName(), "TABLE"))
+                            .collect(toImmutableList()),
+                    ImmutableMultiset.<String>builder()
+                            .add("ConnectorMetadata.listViews(schema=test_schema1)")
+                            .add("ConnectorMetadata.listTables(schema=test_schema1)")
+                            .build());
+
+            // LIKE predicate on schema name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, "test_sch_ma1", null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    countingMockConnector.getAllTables()
+                            .filter(schemaTableName -> schemaTableName.getSchemaName().equals("test_schema1"))
+                            .map(schemaTableName -> list(COUNTING_CATALOG, schemaTableName.getSchemaName(), schemaTableName.getTableName(), "TABLE"))
+                            .collect(toImmutableList()),
+                    ImmutableMultiset.<String>builder()
+                            .add("ConnectorMetadata.listViews")
+                            .add("ConnectorMetadata.listTables")
+                            .build());
+
+            // Equality predicate on table name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, null, "test\\_table1", null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    list(
+                            list(COUNTING_CATALOG, "test_schema1", "test_table1", "TABLE"),
+                            list(COUNTING_CATALOG, "test_schema2", "test_table1", "TABLE")),
+                    ImmutableMultiset.<String>builder()
+                            .add("ConnectorMetadata.listViews")
+                            .add("ConnectorMetadata.listTables")
+                            .build());
+
+            // LIKE predicate on table name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, null, "test_t_ble1", null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    list(
+                            list(COUNTING_CATALOG, "test_schema1", "test_table1", "TABLE"),
+                            list(COUNTING_CATALOG, "test_schema2", "test_table1", "TABLE")),
+                    ImmutableMultiset.<String>builder()
+                            .add("ConnectorMetadata.listViews")
+                            .add("ConnectorMetadata.listTables")
+                            .build());
+
+            // Equality predicate on schema name and table name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, "test\\_schema1", "test\\_table1", null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    list(list(COUNTING_CATALOG, "test_schema1", "test_table1", "TABLE")),
+                    ImmutableMultiset.<String>builder()
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 5)
+                            .addCopies("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)", 2)
+                            .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                            .build());
+
+            // LIKE predicate on schema name and table name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, "test_schema1", "test_table1", null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    list(list(COUNTING_CATALOG, "test_schema1", "test_table1", "TABLE")),
+                    ImmutableMultiset.<String>builder()
+                            .add("ConnectorMetadata.listViews")
+                            .add("ConnectorMetadata.listTables")
+                            .build());
+
+            // catalog does not exist
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables("wrong", null, null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    list(),
+                    ImmutableMultiset.of());
+
+            // empty catalog name (means null filter)
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables("", null, null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    list(),
+                    ImmutableMultiset.of());
+
+            // empty schema name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, "", null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    list(),
+                    ImmutableMultiset.of());
+
+            // empty table name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, null, "", null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    list(),
+                    ImmutableMultiset.of());
+
+            // no table types selected
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, null, null, new String[0]),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
+                    list(),
+                    ImmutableMultiset.of());
+        }
     }
 
     @Test
     public void testGetColumnsMetadataCalls()
             throws Exception
     {
-        verify(connection.getMetaData().getSearchStringEscape().equals("\\")); // this test uses escape inline for readability
+        try (Connection connection = createConnection()) {
+            verify(connection.getMetaData().getSearchStringEscape().equals("\\")); // this test uses escape inline for readability
 
-        // No filter
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(null, null, null, null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2)
-                        .withGetColumnsCount(3000));
-
-        // Equality predicate on catalog name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, null, null, null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2)
-                        .withGetColumnsCount(3000));
-
-        // Equality predicate on catalog name and schema name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "test\\_schema1", null, null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(0)
-                        .withListTablesCount(1)
-                        .withGetColumnsCount(1000));
-
-        // Equality predicate on catalog name, schema name and table name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "test\\_schema1", "test\\_table1", null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                IntStream.range(0, 100)
-                        .mapToObj(i -> list(COUNTING_CATALOG, "test_schema1", "test_table1", "column_" + i, "varchar"))
-                        .collect(toImmutableList()),
-                new MetadataCallsCount()
-                        .withListTablesCount(1)
-                        .withGetColumnsCount(1));
-
-        // Equality predicate on catalog name, schema name, table name and column name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "test\\_schema1", "test\\_table1", "column\\_17"),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                list(list(COUNTING_CATALOG, "test_schema1", "test_table1", "column_17", "varchar")),
-                new MetadataCallsCount()
-                        .withListTablesCount(1)
-                        .withGetColumnsCount(1));
-
-        // Equality predicate on catalog name, LIKE predicate on schema name, table name and column name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "test_schema1", "test_table1", "column_17"),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                list(list(COUNTING_CATALOG, "test_schema1", "test_table1", "column_17", "varchar")),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2)
-                        .withGetColumnsCount(1));
-
-        // LIKE predicate on schema name and table name, but no predicate on catalog name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(null, "test_schema1", "test_table1", null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                IntStream.range(0, 100)
-                        .mapToObj(columnIndex -> list(COUNTING_CATALOG, "test_schema1", "test_table1", "column_" + columnIndex, "varchar"))
-                        .collect(toImmutableList()),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2)
-                        .withGetColumnsCount(1));
-
-        // LIKE predicate on schema name, but no predicate on catalog name and table name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(null, "test_schema1", null, null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                IntStream.range(0, 1000).boxed()
-                        .flatMap(tableIndex ->
-                                IntStream.range(0, 100)
-                                        .mapToObj(columnIndex -> list(COUNTING_CATALOG, "test_schema1", "test_table" + tableIndex, "column_" + columnIndex, "varchar")))
-                        .collect(toImmutableList()),
-                new MetadataCallsCount()
-                        .withListSchemasCount(4)
-                        .withListTablesCount(1)
-                        .withGetColumnsCount(1000));
-
-        // LIKE predicate on table name, but no predicate on catalog name and schema name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(null, null, "test_table1", null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                IntStream.rangeClosed(1, 2).boxed()
-                        .flatMap(schemaIndex ->
-                                IntStream.range(0, 100)
-                                        .mapToObj(columnIndex -> list(COUNTING_CATALOG, "test_schema" + schemaIndex, "test_table1", "column_" + columnIndex, "varchar")))
-                        .collect(toImmutableList()),
-                new MetadataCallsCount()
-                        .withListSchemasCount(5)
-                        .withListTablesCount(4)
-                        .withGetTableHandleCount(8)
-                        .withGetColumnsCount(2));
-
-        // Equality predicate on schema name and table name, but no predicate on catalog name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(null, "test\\_schema1", "test\\_table1", null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                IntStream.range(0, 100)
-                        .mapToObj(i -> list(COUNTING_CATALOG, "test_schema1", "test_table1", "column_" + i, "varchar"))
-                        .collect(toImmutableList()),
-                new MetadataCallsCount()
-                        .withListTablesCount(1)
-                        .withGetColumnsCount(1));
-
-        // catalog does not exist
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns("wrong", null, null, null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                list(),
-                new MetadataCallsCount());
+            // No filter
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(null, null, null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    ImmutableMultiset.of("ConnectorMetadata.streamRelationColumns"));
 
-        // schema does not exist
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "wrong\\_schema1", "test\\_table1", null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                list(),
-                new MetadataCallsCount()
-                        .withListTablesCount(1));
-
-        // schema does not exist
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "wrong_schema1", "test_table1", null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                list(),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(0)
-                        .withGetColumnsCount(0));
-
-        // empty schema name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "", null, null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                list(),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(0)
-                        .withGetColumnsCount(0));
-
-        // empty table name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, null, "", null),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                list(),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(0)
-                        .withGetColumnsCount(0));
-
-        // empty column name
-        assertMetadataCalls(
-                connection,
-                readMetaData(
-                        databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, null, null, ""),
-                        list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
-                list(),
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2)
-                        .withGetColumnsCount(3000));
+            // Equality predicate on catalog name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, null, null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    ImmutableMultiset.of("ConnectorMetadata.streamRelationColumns"));
+
+            // Equality predicate on catalog name and schema name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "test\\_schema1", null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    ImmutableMultiset.of("ConnectorMetadata.streamRelationColumns(schema=test_schema1)"));
+
+            // Equality predicate on catalog name, schema name and table name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "test\\_schema1", "test\\_table1", null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    IntStream.range(0, 100)
+                            .mapToObj(i -> list(COUNTING_CATALOG, "test_schema1", "test_table1", "column_" + i, "varchar"))
+                            .collect(toImmutableList()),
+                    ImmutableMultiset.<String>builder()
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 4)
+                            .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableMetadata(handle=test_schema1.test_table1)")
+                            .build());
+
+            // Equality predicate on catalog name, schema name, table name and column name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "test\\_schema1", "test\\_table1", "column\\_17"),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    list(list(COUNTING_CATALOG, "test_schema1", "test_table1", "column_17", "varchar")),
+                    ImmutableMultiset.<String>builder()
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 4)
+                            .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableMetadata(handle=test_schema1.test_table1)")
+                            .build());
+
+            // Equality predicate on catalog name, LIKE predicate on schema name, table name and column name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "test_schema1", "test_table1", "column_17"),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    list(list(COUNTING_CATALOG, "test_schema1", "test_table1", "column_17", "varchar")),
+                    ImmutableMultiset.<String>builder()
+                            .add("ConnectorMetadata.listSchemaNames")
+                            .add("ConnectorMetadata.listTables(schema=test_schema1)")
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 4)
+                            .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableMetadata(handle=test_schema1.test_table1)")
+                            .build());
+
+            // LIKE predicate on schema name and table name, but no predicate on catalog name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(null, "test_schema1", "test_table1", null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    IntStream.range(0, 100)
+                            .mapToObj(columnIndex -> list(COUNTING_CATALOG, "test_schema1", "test_table1", "column_" + columnIndex, "varchar"))
+                            .collect(toImmutableList()),
+                    ImmutableMultiset.<String>builder()
+                            .add("ConnectorMetadata.listSchemaNames")
+                            .add("ConnectorMetadata.listTables(schema=test_schema1)")
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 4)
+                            .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableMetadata(handle=test_schema1.test_table1)")
+                            .build());
+
+            // LIKE predicate on schema name, but no predicate on catalog name and table name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(null, "test_schema1", null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    IntStream.range(0, 1000).boxed()
+                            .flatMap(tableIndex ->
+                                    IntStream.range(0, 100)
+                                            .mapToObj(columnIndex -> list(COUNTING_CATALOG, "test_schema1", "test_table" + tableIndex, "column_" + columnIndex, "varchar")))
+                            .collect(toImmutableList()),
+                    ImmutableMultiset.<String>builder()
+                            .addCopies("ConnectorMetadata.listSchemaNames", 4)
+                            .add("ConnectorMetadata.streamRelationColumns(schema=test_schema1)")
+                            .build());
+
+            // LIKE predicate on table name, but no predicate on catalog name and schema name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(null, null, "test_table1", null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    IntStream.rangeClosed(1, 2).boxed()
+                            .flatMap(schemaIndex ->
+                                    IntStream.range(0, 100)
+                                            .mapToObj(columnIndex -> list(COUNTING_CATALOG, "test_schema" + schemaIndex, "test_table1", "column_" + columnIndex, "varchar")))
+                            .collect(toImmutableList()),
+                    ImmutableMultiset.<String>builder()
+                            .addCopies("ConnectorMetadata.listSchemaNames", 5)
+                            .add("ConnectorMetadata.listTables(schema=test_schema1)")
+                            .add("ConnectorMetadata.listTables(schema=test_schema2)")
+                            .add("ConnectorMetadata.listTables(schema=test_schema3_empty)")
+                            .add("ConnectorMetadata.listTables(schema=test_schema4_empty)")
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 20)
+                            .addCopies("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)", 5)
+                            .addCopies("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)", 5)
+                            .addCopies("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)", 5)
+                            .addCopies("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)", 5)
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema2, table=test_table1)", 20)
+                            .addCopies("ConnectorMetadata.getMaterializedView(schema=test_schema2, table=test_table1)", 5)
+                            .addCopies("ConnectorMetadata.getView(schema=test_schema2, table=test_table1)", 5)
+                            .addCopies("ConnectorMetadata.redirectTable(schema=test_schema2, table=test_table1)", 5)
+                            .addCopies("ConnectorMetadata.getTableHandle(schema=test_schema2, table=test_table1)", 5)
+                            .add("ConnectorMetadata.getTableMetadata(handle=test_schema1.test_table1)")
+                            .add("ConnectorMetadata.getTableMetadata(handle=test_schema2.test_table1)")
+                            .build());
+
+            // Equality predicate on schema name and table name, but no predicate on catalog name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(null, "test\\_schema1", "test\\_table1", null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    IntStream.range(0, 100)
+                            .mapToObj(i -> list(COUNTING_CATALOG, "test_schema1", "test_table1", "column_" + i, "varchar"))
+                            .collect(toImmutableList()),
+                    ImmutableMultiset.<String>builder()
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 4)
+                            .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableMetadata(handle=test_schema1.test_table1)")
+                            .build());
+
+            // catalog does not exist
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns("wrong", null, null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    list(),
+                    ImmutableMultiset.of());
+
+            // empty catalog name (means null filter)
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns("", null, null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    list(),
+                    ImmutableMultiset.of());
+
+            // schema does not exist
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "wrong\\_schema1", "test\\_table1", null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    list(),
+                    ImmutableMultiset.<String>builder()
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=wrong_schema1, table=test_table1)", 4)
+                            .add("ConnectorMetadata.getMaterializedView(schema=wrong_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getView(schema=wrong_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.redirectTable(schema=wrong_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableHandle(schema=wrong_schema1, table=test_table1)")
+                            .build());
+
+            // schema does not exist
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "wrong_schema1", "test_table1", null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    list(),
+                    ImmutableMultiset.of("ConnectorMetadata.listSchemaNames"));
+
+            // empty schema name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "", null, null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    list(),
+                    ImmutableMultiset.of());
+
+            // empty table name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, null, "", null),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    list(),
+                    ImmutableMultiset.of());
+
+            // empty column name
+            assertMetadataCalls(
+                    connection,
+                    readMetaData(
+                            databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, null, null, ""),
+                            list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
+                    list(),
+                    ImmutableMultiset.of("ConnectorMetadata.streamRelationColumns"));
+        }
+    }
+
+    @Test
+    public void testAssumeLiteralMetadataCalls()
+            throws Exception
+    {
+        testAssumeLiteralMetadataCalls("assumeLiteralNamesInMetadataCallsForNonConformingClients=true");
+        testAssumeLiteralMetadataCalls("assumeLiteralUnderscoreInMetadataCallsForNonConformingClients=true");
+        testAssumeLiteralMetadataCalls("assumeLiteralNamesInMetadataCallsForNonConformingClients=false&assumeLiteralUnderscoreInMetadataCallsForNonConformingClients=true");
+        testAssumeLiteralMetadataCalls("assumeLiteralNamesInMetadataCallsForNonConformingClients=true&assumeLiteralUnderscoreInMetadataCallsForNonConformingClients=false");
     }
 
-    @Test(dataProvider = "escapeLiteralParameters")
-    public void testAssumeLiteralMetadataCalls(String escapeLiteralParameter)
+    private void testAssumeLiteralMetadataCalls(String escapeLiteralParameter)
             throws Exception
     {
         try (Connection connection = DriverManager.getConnection(
@@ -1442,9 +1517,10 @@ public void testAssumeLiteralMetadataCalls(String escapeLiteralParameter)
                             .filter(schemaTableName -> schemaTableName.getSchemaName().equals("test_schema1"))
                             .map(schemaTableName -> list(COUNTING_CATALOG, schemaTableName.getSchemaName(), schemaTableName.getTableName(), "TABLE"))
                             .collect(toImmutableList()),
-                    new MetadataCallsCount()
-                            .withListSchemasCount(0)
-                            .withListTablesCount(1));
+                    ImmutableMultiset.<String>builder()
+                            .add("ConnectorMetadata.listViews(schema=test_schema1)")
+                            .add("ConnectorMetadata.listTables(schema=test_schema1)")
+                            .build());
 
             // getTables's schema and table name patterns treated as literals
             assertMetadataCalls(
@@ -1453,8 +1529,13 @@ public void testAssumeLiteralMetadataCalls(String escapeLiteralParameter)
                             databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, "test_schema1", "test_table1", null),
                             list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
                     list(list(COUNTING_CATALOG, "test_schema1", "test_table1", "TABLE")),
-                    new MetadataCallsCount()
-                            .withGetTableHandleCount(1));
+                    ImmutableMultiset.<String>builder()
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 5)
+                            .addCopies("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)", 2)
+                            .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                            .build());
 
             // no matches in getTables call as table name pattern treated as literal
             assertMetadataCalls(
@@ -1463,8 +1544,10 @@ public void testAssumeLiteralMetadataCalls(String escapeLiteralParameter)
                             databaseMetaData -> databaseMetaData.getTables(COUNTING_CATALOG, "test_schema_", null, null),
                             list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "TABLE_TYPE")),
                     list(),
-                    new MetadataCallsCount()
-                            .withListTablesCount(1));
+                    ImmutableMultiset.<String>builder()
+                            .add("ConnectorMetadata.listViews(schema=test_schema_)")
+                            .add("ConnectorMetadata.listTables(schema=test_schema_)")
+                            .build());
 
             // getColumns's schema and table name patterns treated as literals
             assertMetadataCalls(
@@ -1475,9 +1558,14 @@ public void testAssumeLiteralMetadataCalls(String escapeLiteralParameter)
                     IntStream.range(0, 100)
                             .mapToObj(i -> list(COUNTING_CATALOG, "test_schema1", "test_table1", "column_" + i, "varchar"))
                             .collect(toImmutableList()),
-                    new MetadataCallsCount()
-                            .withListTablesCount(1)
-                            .withGetColumnsCount(1));
+                    ImmutableMultiset.<String>builder()
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 4)
+                            .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableMetadata(handle=test_schema1.test_table1)")
+                            .build());
 
             // getColumns's schema, table and column name patterns treated as literals
             assertMetadataCalls(
@@ -1486,9 +1574,14 @@ public void testAssumeLiteralMetadataCalls(String escapeLiteralParameter)
                             databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "test_schema1", "test_table1", "column_17"),
                             list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
                     list(list(COUNTING_CATALOG, "test_schema1", "test_table1", "column_17", "varchar")),
-                    new MetadataCallsCount()
-                            .withListTablesCount(1)
-                            .withGetColumnsCount(1));
+                    ImmutableMultiset.<String>builder()
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 4)
+                            .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                            .add("ConnectorMetadata.getTableMetadata(handle=test_schema1.test_table1)")
+                            .build());
 
             // no matches in getColumns call as table name pattern treated as literal
             assertMetadataCalls(
@@ -1497,37 +1590,29 @@ public void testAssumeLiteralMetadataCalls(String escapeLiteralParameter)
                             databaseMetaData -> databaseMetaData.getColumns(COUNTING_CATALOG, "test_schema1", "test_table_", null),
                             list("TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "TYPE_NAME")),
                     list(),
-                    new MetadataCallsCount()
-                            .withListTablesCount(1));
+                    ImmutableMultiset.<String>builder()
+                            .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table_)", 4)
+                            .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table_)")
+                            .add("ConnectorMetadata.getView(schema=test_schema1, table=test_table_)")
+                            .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table_)")
+                            .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table_)")
+                            .build());
         }
     }
 
-    @DataProvider
-    public Object[][] escapeLiteralParameters()
-    {
-        return new Object[][]{
-                {"assumeLiteralNamesInMetadataCallsForNonConformingClients=true"},
-                {"assumeLiteralUnderscoreInMetadataCallsForNonConformingClients=true"},
-                {"assumeLiteralNamesInMetadataCallsForNonConformingClients=false&assumeLiteralUnderscoreInMetadataCallsForNonConformingClients=true"},
-                {"assumeLiteralNamesInMetadataCallsForNonConformingClients=true&assumeLiteralUnderscoreInMetadataCallsForNonConformingClients=false"},
-        };
-    }
-
     @Test
     public void testFailedBothEscapeLiteralParameters()
-            throws SQLException
     {
         assertThatThrownBy(() -> DriverManager.getConnection(
                 format("jdbc:trino://%s?%s", server.getAddress(), "assumeLiteralNamesInMetadataCallsForNonConformingClients=true&assumeLiteralUnderscoreInMetadataCallsForNonConformingClients=true"),
                 "admin",
                 null))
                 .isInstanceOf(SQLException.class)
-                .hasMessage("Connection property 'assumeLiteralNamesInMetadataCallsForNonConformingClients' is not allowed");
+                .hasMessage("Connection property assumeLiteralNamesInMetadataCallsForNonConformingClients cannot be set if assumeLiteralUnderscoreInMetadataCallsForNonConformingClients is enabled");
     }
 
     @Test
     public void testEscapeIfNecessary()
-            throws SQLException
     {
         assertEquals(TrinoDatabaseMetaData.escapeIfNecessary(false, false, null), null);
         assertEquals(TrinoDatabaseMetaData.escapeIfNecessary(false, false, "a"), "a");
@@ -1554,27 +1639,28 @@ public void testEscapeIfNecessary()
     public void testStatementsDoNotLeak()
             throws Exception
     {
-        TrinoConnection connection = (TrinoConnection) this.connection;
-        DatabaseMetaData metaData = connection.getMetaData();
+        try (TrinoConnection connection = (TrinoConnection) createConnection()) {
+            DatabaseMetaData metaData = connection.getMetaData();
 
-        // consumed
-        try (ResultSet resultSet = metaData.getCatalogs()) {
-            assertThat(countRows(resultSet)).isEqualTo(5);
-        }
-        try (ResultSet resultSet = metaData.getSchemas(TEST_CATALOG, null)) {
-            assertThat(countRows(resultSet)).isEqualTo(10);
-        }
-        try (ResultSet resultSet = metaData.getTables(TEST_CATALOG, "sf%", null, null)) {
-            assertThat(countRows(resultSet)).isEqualTo(64);
-        }
+            // consumed
+            try (ResultSet resultSet = metaData.getCatalogs()) {
+                assertThat(countRows(resultSet)).isEqualTo(5);
+            }
+            try (ResultSet resultSet = metaData.getSchemas(TEST_CATALOG, null)) {
+                assertThat(countRows(resultSet)).isEqualTo(10);
+            }
+            try (ResultSet resultSet = metaData.getTables(TEST_CATALOG, "sf%", null, null)) {
+                assertThat(countRows(resultSet)).isEqualTo(64);
+            }
 
-        // not consumed
-        metaData.getCatalogs().close();
-        metaData.getSchemas(TEST_CATALOG, null).close();
-        metaData.getTables(TEST_CATALOG, "sf%", null, null).close();
+            // not consumed
+            metaData.getCatalogs().close();
+            metaData.getSchemas(TEST_CATALOG, null).close();
+            metaData.getTables(TEST_CATALOG, "sf%", null, null).close();
 
-        assertThat(connection.activeStatements()).as("activeStatements")
-                .isEqualTo(0);
+            assertThat(connection.activeStatements()).as("activeStatements")
+                    .isEqualTo(0);
+        }
     }
 
     private static void assertColumnSpec(ResultSet rs, int dataType, Long precision, Long numPrecRadix, String typeName)
@@ -1616,7 +1702,7 @@ private Set<String> captureQueries(Callable<?> action)
                 .collect(toImmutableSet());
     }
 
-    private void assertMetadataCalls(Connection connection, MetaDataCallback<? extends Collection<List<Object>>> callback, MetadataCallsCount expectedMetadataCallsCount)
+    private void assertMetadataCalls(Connection connection, MetaDataCallback<? extends Collection<List<Object>>> callback, Multiset<String> expectedMetadataCallsCount)
     {
         assertMetadataCalls(
                 connection,
@@ -1629,7 +1715,7 @@ private void assertMetadataCalls(
             Connection connection,
             MetaDataCallback<? extends Collection<List<Object>>> callback,
             Collection<List<?>> expected,
-            MetadataCallsCount expectedMetadataCallsCount)
+            Multiset<String> expectedMetadataCallsCount)
     {
         assertMetadataCalls(
                 connection,
@@ -1643,9 +1729,9 @@ private void assertMetadataCalls(
             Connection connection,
             MetaDataCallback<? extends Collection<List<Object>>> callback,
             Consumer<Collection<List<Object>>> resultsVerification,
-            MetadataCallsCount expectedMetadataCallsCount)
+            Multiset<String> expectedMetadataCallsCount)
     {
-        MetadataCallsCount actualMetadataCallsCount = countingMockConnector.runCounting(() -> {
+        Multiset<String> actualMetadataCallsCount = countingMockConnector.runTracing(() -> {
             try {
                 Collection<List<Object>> actual = callback.apply(connection.getMetaData());
                 resultsVerification.accept(actual);
@@ -1654,7 +1740,13 @@ private void assertMetadataCalls(
                 throw new RuntimeException(e);
             }
         });
-        assertEquals(actualMetadataCallsCount, expectedMetadataCallsCount);
+
+        actualMetadataCallsCount = actualMetadataCallsCount.stream()
+                // Every query involves beginQuery and cleanupQuery, so ignore them.
+                .filter(method -> !"ConnectorMetadata.beginQuery".equals(method) && !"ConnectorMetadata.cleanupQuery".equals(method))
+                .collect(toImmutableMultiset());
+
+        assertMultisetsEqual(actualMetadataCallsCount, expectedMetadataCallsCount);
     }
 
     private MetaDataCallback<List<List<Object>>> readMetaData(MetaDataCallback<ResultSet> query, List<String> columns)
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriver.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriver.java
index 48605dc7495c..a92d4504b5ec 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriver.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriver.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.log.Logging;
 import io.trino.client.ClientSelectedRole;
+import io.trino.client.DnsResolver;
 import io.trino.execution.QueryState;
 import io.trino.plugin.blackhole.BlackHolePlugin;
 import io.trino.plugin.tpch.TpchPlugin;
@@ -24,9 +25,11 @@
 import io.trino.spi.type.TimeZoneKey;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.math.BigDecimal;
 import java.net.InetAddress;
@@ -48,6 +51,7 @@
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.time.zone.ZoneRulesException;
 import java.util.ArrayList;
 import java.util.GregorianCalendar;
 import java.util.List;
@@ -77,6 +81,7 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
@@ -84,6 +89,7 @@
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
+@TestInstance(PER_CLASS)
 public class TestTrinoDriver
 {
     private static final DateTimeZone ASIA_ORAL_ZONE = DateTimeZone.forID("Asia/Oral");
@@ -93,7 +99,7 @@ public class TestTrinoDriver
     private TestingTrinoServer server;
     private ExecutorService executorService;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
             throws Exception
     {
@@ -126,7 +132,7 @@ private void setupTestTables()
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
             throws Exception
     {
@@ -607,16 +613,20 @@ public void testGetResultSet()
         }
     }
 
-    @Test(expectedExceptions = SQLFeatureNotSupportedException.class, expectedExceptionsMessageRegExp = "Multiple open results not supported")
+    @Test
     public void testGetMoreResultsException()
             throws Exception
     {
-        try (Connection connection = createConnection()) {
-            try (Statement statement = connection.createStatement()) {
-                assertTrue(statement.execute("SELECT 123 x, 'foo' y"));
-                statement.getMoreResults(Statement.KEEP_CURRENT_RESULT);
+        assertThatThrownBy(() -> {
+            try (Connection connection = createConnection()) {
+                try (Statement statement = connection.createStatement()) {
+                    assertTrue(statement.execute("SELECT 123 x, 'foo' y"));
+                    statement.getMoreResults(Statement.KEEP_CURRENT_RESULT);
+                }
             }
-        }
+        })
+                .isInstanceOf(SQLFeatureNotSupportedException.class)
+                .hasMessage("Multiple open results not supported");
     }
 
     @Test
@@ -665,6 +675,32 @@ public void testSetTimeZoneId()
                 assertEquals(rs.getTimestamp("ts"), new Timestamp(new DateTime(2001, 2, 3, 3, 4, 5, defaultZone).getMillis()));
             }
         }
+
+        try (Connection connection = createConnectionWithParameter("timezone=Asia/Kolkata")) {
+            try (Statement statement = connection.createStatement();
+                    ResultSet rs = statement.executeQuery(sql)) {
+                assertTrue(rs.next());
+                assertEquals(rs.getString("zone"), "Asia/Kolkata");
+                // setting the session timezone has no effect on the interpretation of timestamps in the JDBC driver
+                assertEquals(rs.getTimestamp("ts"), new Timestamp(new DateTime(2001, 2, 3, 3, 4, 5, defaultZone).getMillis()));
+            }
+        }
+
+        try (Connection connection = createConnectionWithParameter("timezone=UTC+05:30")) {
+            try (Statement statement = connection.createStatement();
+                    ResultSet rs = statement.executeQuery(sql)) {
+                assertTrue(rs.next());
+                assertEquals(rs.getString("zone"), "+05:30");
+                // setting the session timezone has no effect on the interpretation of timestamps in the JDBC driver
+                assertEquals(rs.getTimestamp("ts"), new Timestamp(new DateTime(2001, 2, 3, 3, 4, 5, defaultZone).getMillis()));
+            }
+        }
+
+        assertThatThrownBy(() -> createConnectionWithParameter("timezone=Asia/NOT_FOUND"))
+                .isInstanceOf(SQLException.class)
+                .hasMessage("Connection property timezone value is invalid: Asia/NOT_FOUND")
+                .hasRootCauseInstanceOf(ZoneRulesException.class)
+                .hasRootCauseMessage("Unknown time-zone ID: Asia/NOT_FOUND");
     }
 
     @Test
@@ -764,17 +800,21 @@ public void testConnectionResourceHandling()
         }
     }
 
-    @Test(expectedExceptions = SQLException.class, expectedExceptionsMessageRegExp = ".* does not exist")
+    @Test
     public void testBadQuery()
             throws Exception
     {
-        try (Connection connection = createConnection(TEST_CATALOG, "tiny")) {
-            try (Statement statement = connection.createStatement()) {
-                try (ResultSet ignored = statement.executeQuery("SELECT * FROM bad_table")) {
-                    fail("expected exception");
+        assertThatThrownBy(() -> {
+            try (Connection connection = createConnection(TEST_CATALOG, "tiny")) {
+                try (Statement statement = connection.createStatement()) {
+                    try (ResultSet ignored = statement.executeQuery("SELECT * FROM bad_table")) {
+                        fail("expected exception");
+                    }
                 }
             }
-        }
+        })
+                .isInstanceOf(SQLException.class)
+                .hasMessageMatching(".* does not exist");
     }
 
     @Test
@@ -794,7 +834,7 @@ public void testPropertyAllowed()
                         .put("KerberosPrincipal", "test")
                         .buildOrThrow())))
                 .isInstanceOf(SQLException.class)
-                .hasMessage("Connection property 'KerberosPrincipal' is not allowed");
+                .hasMessage("Connection property KerberosPrincipal requires KerberosRemoteServiceName to be set");
 
         assertThat(DriverManager.getConnection(jdbcUrl(),
                 toProperties(ImmutableMap.<String, String>builder()
@@ -811,7 +851,7 @@ public void testPropertyAllowed()
                         .put("SSLVerification", "NONE")
                         .buildOrThrow())))
                 .isInstanceOf(SQLException.class)
-                .hasMessage("Connection property 'SSLVerification' is not allowed");
+                .hasMessage("Connection property SSLVerification requires TLS/SSL to be enabled");
 
         assertThat(DriverManager.getConnection(jdbcUrl(),
                 toProperties(ImmutableMap.<String, String>builder()
@@ -870,7 +910,8 @@ public void testSetRole()
         }
     }
 
-    @Test(timeOut = 10000)
+    @Test
+    @Timeout(10)
     public void testQueryCancelByInterrupt()
             throws Exception
     {
@@ -914,7 +955,8 @@ public void testQueryCancelByInterrupt()
         assertEquals(getQueryState(queryId.get()), FAILED);
     }
 
-    @Test(timeOut = 10000)
+    @Test
+    @Timeout(10)
     public void testQueryCancelExplicit()
             throws Exception
     {
@@ -955,7 +997,8 @@ public void testQueryCancelExplicit()
         }
     }
 
-    @Test(timeOut = 10000)
+    @Test
+    @Timeout(10)
     public void testUpdateCancelExplicit()
             throws Exception
     {
@@ -998,7 +1041,8 @@ public void testUpdateCancelExplicit()
         }
     }
 
-    @Test(timeOut = 10000)
+    @Test
+    @Timeout(10)
     public void testQueryTimeout()
             throws Exception
     {
@@ -1046,7 +1090,8 @@ public void testQueryTimeout()
         }
     }
 
-    @Test(timeOut = 10000)
+    @Test
+    @Timeout(10)
     public void testQueryPartialCancel()
             throws Exception
     {
@@ -1059,7 +1104,8 @@ public void testQueryPartialCancel()
         }
     }
 
-    @Test(timeOut = 10000)
+    @Test
+    @Timeout(10)
     public void testUpdatePartialCancel()
             throws Exception
     {
@@ -1104,6 +1150,49 @@ public void testCustomDnsResolver()
         }
     }
 
+    @Test
+    @Timeout(10)
+    public void testResetSessionAuthorization()
+            throws Exception
+    {
+        try (TrinoConnection connection = createConnection("blackhole", "blackhole").unwrap(TrinoConnection.class);
+                Statement statement = connection.createStatement()) {
+            assertEquals(connection.getAuthorizationUser(), null);
+            assertEquals(getCurrentUser(connection), "test");
+            statement.execute("SET SESSION AUTHORIZATION john");
+            assertEquals(connection.getAuthorizationUser(), "john");
+            assertEquals(getCurrentUser(connection), "john");
+            statement.execute("SET SESSION AUTHORIZATION bob");
+            assertEquals(connection.getAuthorizationUser(), "bob");
+            assertEquals(getCurrentUser(connection), "bob");
+            statement.execute("RESET SESSION AUTHORIZATION");
+            assertEquals(connection.getAuthorizationUser(), null);
+            assertEquals(getCurrentUser(connection), "test");
+        }
+    }
+
+    @Test
+    @Timeout(10)
+    public void testSetRoleAfterSetSessionAuthorization()
+            throws Exception
+    {
+        try (TrinoConnection connection = createConnection("blackhole", "blackhole").unwrap(TrinoConnection.class);
+                Statement statement = connection.createStatement()) {
+            statement.execute("SET SESSION AUTHORIZATION john");
+            assertEquals(connection.getAuthorizationUser(), "john");
+            statement.execute("SET ROLE ALL");
+            assertEquals(connection.getRoles(), ImmutableMap.of("system", new ClientSelectedRole(ClientSelectedRole.Type.ALL, Optional.empty())));
+            statement.execute("SET SESSION AUTHORIZATION bob");
+            assertEquals(connection.getAuthorizationUser(), "bob");
+            assertEquals(connection.getRoles(), ImmutableMap.of());
+            statement.execute("SET ROLE NONE");
+            assertEquals(connection.getRoles(), ImmutableMap.of("system", new ClientSelectedRole(ClientSelectedRole.Type.NONE, Optional.empty())));
+            statement.execute("RESET SESSION AUTHORIZATION");
+            assertEquals(connection.getAuthorizationUser(), null);
+            assertEquals(connection.getRoles(), ImmutableMap.of());
+        }
+    }
+
     private QueryState getQueryState(String queryId)
             throws SQLException
     {
@@ -1158,6 +1247,13 @@ private Connection createConnection(String catalog, String schema)
         return DriverManager.getConnection(url, "test", null);
     }
 
+    private Connection createConnectionWithParameter(String parameter)
+            throws SQLException
+    {
+        String url = format("jdbc:trino://%s?%s", server.getAddress(), parameter);
+        return DriverManager.getConnection(url, "test", null);
+    }
+
     private static Properties toProperties(Map<String, String> map)
     {
         Properties properties = new Properties();
@@ -1165,6 +1261,19 @@ private static Properties toProperties(Map<String, String> map)
         return properties;
     }
 
+    private static String getCurrentUser(Connection connection)
+            throws SQLException
+    {
+        try (Statement statement = connection.createStatement();
+                ResultSet rs = statement.executeQuery("SELECT current_user")) {
+            while (rs.next()) {
+                return rs.getString(1);
+            }
+        }
+
+        throw new RuntimeException("Failed to get CURRENT_USER");
+    }
+
     public static class TestingDnsResolver
             implements DnsResolver
     {
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverAuth.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverAuth.java
index 42e8f897974b..d7bd11efc743 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverAuth.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverAuth.java
@@ -16,12 +16,15 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.log.Logging;
 import io.airlift.security.pem.PemReader;
-import io.jsonwebtoken.security.Keys;
+import io.jsonwebtoken.Jwts;
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.server.testing.TestingTrinoServer;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import javax.crypto.SecretKey;
 
 import java.io.File;
 import java.net.URL;
@@ -39,19 +42,19 @@
 
 import static com.google.common.io.Files.asCharSource;
 import static com.google.common.io.Resources.getResource;
-import static io.jsonwebtoken.JwsHeader.KEY_ID;
-import static io.jsonwebtoken.SignatureAlgorithm.HS512;
 import static io.jsonwebtoken.security.Keys.hmacShaKeyFor;
 import static io.trino.server.security.jwt.JwtUtil.newJwtBuilder;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static java.util.Base64.getMimeDecoder;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestTrinoDriverAuth
 {
     private static final String TEST_CATALOG = "test_catalog";
@@ -60,7 +63,7 @@ public class TestTrinoDriverAuth
     private Key hmac222;
     private PrivateKey privateKey33;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
             throws Exception
     {
@@ -88,7 +91,7 @@ public void setup()
         server.waitForNodeRefresh(Duration.ofSeconds(10));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
             throws Exception
     {
@@ -101,18 +104,17 @@ public void testSuccessDefaultKey()
             throws Exception
     {
         String accessToken = newJwtBuilder()
-                .setSubject("test")
+                .subject("test")
                 .signWith(defaultKey)
                 .compact();
 
-        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken))) {
-            try (Statement statement = connection.createStatement()) {
-                assertTrue(statement.execute("SELECT 123"));
-                ResultSet rs = statement.getResultSet();
-                assertTrue(rs.next());
-                assertEquals(rs.getLong(1), 123);
-                assertFalse(rs.next());
-            }
+        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken));
+                Statement statement = connection.createStatement()) {
+            assertTrue(statement.execute("SELECT 123"));
+            ResultSet rs = statement.getResultSet();
+            assertTrue(rs.next());
+            assertEquals(rs.getLong(1), 123);
+            assertFalse(rs.next());
         }
     }
 
@@ -121,19 +123,19 @@ public void testSuccessHmac()
             throws Exception
     {
         String accessToken = newJwtBuilder()
-                .setSubject("test")
-                .setHeaderParam(KEY_ID, "222")
+                .subject("test")
+                .header().keyId("222")
+                .and()
                 .signWith(hmac222)
                 .compact();
 
-        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken))) {
-            try (Statement statement = connection.createStatement()) {
-                assertTrue(statement.execute("SELECT 123"));
-                ResultSet rs = statement.getResultSet();
-                assertTrue(rs.next());
-                assertEquals(rs.getLong(1), 123);
-                assertFalse(rs.next());
-            }
+        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken));
+                Statement statement = connection.createStatement()) {
+            assertTrue(statement.execute("SELECT 123"));
+            ResultSet rs = statement.getResultSet();
+            assertTrue(rs.next());
+            assertEquals(rs.getLong(1), 123);
+            assertFalse(rs.next());
         }
     }
 
@@ -142,34 +144,36 @@ public void testSuccessPublicKey()
             throws Exception
     {
         String accessToken = newJwtBuilder()
-                .setSubject("test")
-                .setHeaderParam(KEY_ID, "33")
+                .subject("test")
+                .header().keyId("33")
+                .and()
                 .signWith(privateKey33)
                 .compact();
 
-        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken))) {
-            try (Statement statement = connection.createStatement()) {
-                assertTrue(statement.execute("SELECT 123"));
-                ResultSet rs = statement.getResultSet();
-                assertTrue(rs.next());
-                assertEquals(rs.getLong(1), 123);
-                assertFalse(rs.next());
-            }
+        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken));
+                Statement statement = connection.createStatement()) {
+            assertTrue(statement.execute("SELECT 123"));
+            ResultSet rs = statement.getResultSet();
+            assertTrue(rs.next());
+            assertEquals(rs.getLong(1), 123);
+            assertFalse(rs.next());
         }
     }
 
-    @Test(expectedExceptions = SQLException.class, expectedExceptionsMessageRegExp = "Authentication failed: Unauthorized")
+    @Test
     public void testFailedNoToken()
-            throws Exception
     {
-        try (Connection connection = createConnection(ImmutableMap.of())) {
-            try (Statement statement = connection.createStatement()) {
+        assertThatThrownBy(() -> {
+            try (Connection connection = createConnection(ImmutableMap.of());
+                    Statement statement = connection.createStatement()) {
                 statement.execute("SELECT 123");
             }
-        }
+        })
+                .isInstanceOf(SQLException.class)
+                .hasMessage("Authentication failed: Unauthorized");
     }
 
-    @Test(expectedExceptions = SQLException.class, expectedExceptionsMessageRegExp = "Authentication failed: Unsigned Claims JWTs are not supported.")
+    @Test
     public void testFailedUnsigned()
             throws Exception
     {
@@ -177,103 +181,211 @@ public void testFailedUnsigned()
                 .setSubject("test")
                 .compact();
 
-        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken))) {
-            try (Statement statement = connection.createStatement()) {
-                statement.execute("SELECT 123");
-            }
+        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken));
+                Statement statement = connection.createStatement()) {
+            assertThatThrownBy(() -> statement.execute("SELECT 123"))
+                    .isInstanceOf(SQLException.class)
+                    .hasMessageContaining("Authentication failed: Unsecured JWSs (those with an 'alg' (Algorithm) header value of 'none') are disallowed by default");
         }
     }
 
-    @Test(expectedExceptions = SQLException.class, expectedExceptionsMessageRegExp = "Authentication failed: JWT signature does not match.*")
+    @Test
     public void testFailedBadHmacSignature()
             throws Exception
     {
-        Key badKey = Keys.secretKeyFor(HS512);
+        SecretKey badKey = Jwts.SIG.HS512.key().build();
         String accessToken = newJwtBuilder()
-                .setSubject("test")
+                .subject("test")
                 .signWith(badKey)
                 .compact();
 
-        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken))) {
-            try (Statement statement = connection.createStatement()) {
-                statement.execute("SELECT 123");
-            }
+        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken));
+                Statement statement = connection.createStatement()) {
+            assertThatThrownBy(() -> statement.execute("SELECT 123"))
+                    .isInstanceOf(SQLException.class)
+                    .hasMessageContaining("Authentication failed: JWT signature does not match locally computed signature. JWT validity cannot be asserted and should not be trusted.");
         }
     }
 
-    @Test(expectedExceptions = SQLException.class, expectedExceptionsMessageRegExp = "Authentication failed: JWT signature does not match.*")
+    @Test
     public void testFailedWrongPublicKey()
+    {
+        assertThatThrownBy(() -> {
+            String accessToken = newJwtBuilder()
+                    .subject("test")
+                    .header().keyId("42")
+                    .and()
+                    .signWith(privateKey33)
+                    .compact();
+
+            try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken));
+                    Statement statement = connection.createStatement()) {
+                statement.execute("SELECT 123");
+            }
+        })
+                .isInstanceOf(SQLException.class)
+                .hasMessageMatching("Authentication failed: JWT signature does not match.*");
+    }
+
+    @Test
+    public void testFailedUnknownPublicKey()
+    {
+        assertThatThrownBy(() -> {
+            String accessToken = newJwtBuilder()
+                    .subject("test")
+                    .header().keyId("unknown")
+                    .and()
+                    .signWith(privateKey33)
+                    .compact();
+
+            try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken));
+                    Statement statement = connection.createStatement()) {
+                statement.execute("SELECT 123");
+            }
+        })
+                .isInstanceOf(SQLException.class)
+                .hasMessage("Authentication failed: Unknown signing key ID");
+    }
+
+    @Test
+    public void testSuccessFullSslVerification()
             throws Exception
     {
         String accessToken = newJwtBuilder()
-                .setSubject("test")
-                .setHeaderParam(KEY_ID, "42")
+                .subject("test")
+                .header().keyId("33")
+                .and()
                 .signWith(privateKey33)
                 .compact();
 
-        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken))) {
-            try (Statement statement = connection.createStatement()) {
-                statement.execute("SELECT 123");
-            }
+        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken, "SSLVerification", "FULL"));
+                Statement statement = connection.createStatement()) {
+            assertTrue(statement.execute("SELECT 123"));
+            ResultSet rs = statement.getResultSet();
+            assertTrue(rs.next());
+            assertEquals(rs.getLong(1), 123);
+            assertFalse(rs.next());
         }
     }
 
-    @Test(expectedExceptions = SQLException.class, expectedExceptionsMessageRegExp = "Authentication failed: Unknown signing key ID")
-    public void testFailedUnknownPublicKey()
+    @Test
+    public void testSuccessFullSslVerificationAlternateHostname()
             throws Exception
     {
         String accessToken = newJwtBuilder()
-                .setSubject("test")
-                .setHeaderParam(KEY_ID, "unknown")
+                .subject("test")
+                .header().keyId("33")
+                .and()
                 .signWith(privateKey33)
                 .compact();
 
-        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken))) {
-            try (Statement statement = connection.createStatement()) {
-                statement.execute("SELECT 123");
-            }
+        String url = format("jdbc:trino://127.0.0.1:%s", server.getHttpsAddress().getPort());
+        Properties properties = new Properties();
+        properties.setProperty("SSL", "true");
+        properties.setProperty("SSLVerification", "FULL");
+        properties.setProperty("SSLTrustStorePath", new File(getResource("localhost.truststore").toURI()).getPath());
+        properties.setProperty("SSLTrustStorePassword", "changeit");
+        properties.setProperty("accessToken", accessToken);
+        properties.setProperty("hostnameInCertificate", "localhost");
+
+        try (Connection connection = DriverManager.getConnection(url, properties);
+                Statement statement = connection.createStatement()) {
+            assertTrue(statement.execute("SELECT 123"));
+            ResultSet rs = statement.getResultSet();
+            assertTrue(rs.next());
+            assertEquals(rs.getLong(1), 123);
+            assertFalse(rs.next());
         }
     }
 
     @Test
-    public void testSuccessFullSslVerification()
+    public void testFailedFullSslVerificationAlternateHostnameNotProvided()
             throws Exception
     {
         String accessToken = newJwtBuilder()
-                .setSubject("test")
-                .setHeaderParam(KEY_ID, "33")
+                .subject("test")
+                .header().keyId("33")
+                .and()
                 .signWith(privateKey33)
                 .compact();
 
-        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken, "SSLVerification", "FULL"))) {
-            try (Statement statement = connection.createStatement()) {
-                assertTrue(statement.execute("SELECT 123"));
-                ResultSet rs = statement.getResultSet();
-                assertTrue(rs.next());
-                assertEquals(rs.getLong(1), 123);
-                assertFalse(rs.next());
-            }
+        String url = format("jdbc:trino://127.0.0.1:%s", server.getHttpsAddress().getPort());
+        Properties properties = new Properties();
+        properties.setProperty("SSL", "true");
+        properties.setProperty("SSLVerification", "FULL");
+        properties.setProperty("SSLTrustStorePath", new File(getResource("localhost.truststore").toURI()).getPath());
+        properties.setProperty("SSLTrustStorePassword", "changeit");
+        properties.setProperty("accessToken", accessToken);
+
+        try (Connection connection = DriverManager.getConnection(url, properties);
+                Statement statement = connection.createStatement()) {
+            assertThatThrownBy(() -> statement.execute("SELECT 123"))
+                    .isInstanceOf(SQLException.class).hasMessageContaining("Error executing query: javax.net.ssl.SSLPeerUnverifiedException: Hostname 127.0.0.1 not verified");
         }
     }
 
+    @Test
+    public void testFailedCaSslVerificationAlternateHostname()
+    {
+        String accessToken = newJwtBuilder()
+                .subject("test")
+                .header().keyId("33")
+                .and()
+                .signWith(privateKey33)
+                .compact();
+
+        String url = format("jdbc:trino://127.0.0.1:%s", server.getHttpsAddress().getPort());
+        Properties properties = new Properties();
+        properties.setProperty("SSL", "true");
+        properties.setProperty("SSLVerification", "CA");
+        properties.setProperty("accessToken", accessToken);
+        properties.setProperty("hostnameInCertificate", "localhost");
+
+        assertThatThrownBy(() -> DriverManager.getConnection(url, properties))
+                .isInstanceOf(SQLException.class)
+                .hasMessage("Connection property hostnameInCertificate requires SSLVerification to be set to FULL");
+    }
+
+    @Test
+    public void testFailedNoneSslVerificationAlternateHostname()
+    {
+        String accessToken = newJwtBuilder()
+                .subject("test")
+                .header().keyId("33")
+                .and()
+                .signWith(privateKey33)
+                .compact();
+
+        String url = format("jdbc:trino://127.0.0.1:%s", server.getHttpsAddress().getPort());
+        Properties properties = new Properties();
+        properties.setProperty("SSL", "true");
+        properties.setProperty("SSLVerification", "NONE");
+        properties.setProperty("accessToken", accessToken);
+        properties.setProperty("hostnameInCertificate", "localhost");
+
+        assertThatThrownBy(() -> DriverManager.getConnection(url, properties))
+                .isInstanceOf(SQLException.class)
+                .hasMessage("Connection property hostnameInCertificate requires SSLVerification to be set to FULL");
+    }
+
     @Test
     public void testSuccessCaSslVerification()
             throws Exception
     {
         String accessToken = newJwtBuilder()
-                .setSubject("test")
-                .setHeaderParam(KEY_ID, "33")
+                .subject("test")
+                .header().keyId("33")
+                .and()
                 .signWith(privateKey33)
                 .compact();
 
-        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken, "SSLVerification", "CA"))) {
-            try (Statement statement = connection.createStatement()) {
-                assertTrue(statement.execute("SELECT 123"));
-                ResultSet rs = statement.getResultSet();
-                assertTrue(rs.next());
-                assertEquals(rs.getLong(1), 123);
-                assertFalse(rs.next());
-            }
+        try (Connection connection = createConnection(ImmutableMap.of("accessToken", accessToken, "SSLVerification", "CA"));
+                Statement statement = connection.createStatement()) {
+            assertTrue(statement.execute("SELECT 123"));
+            ResultSet rs = statement.getResultSet();
+            assertTrue(rs.next());
+            assertEquals(rs.getLong(1), 123);
+            assertFalse(rs.next());
         }
     }
 
@@ -288,7 +400,7 @@ public void testFailedFullSslVerificationWithoutSSL()
     {
         assertThatThrownBy(() -> createBasicConnection(ImmutableMap.of("SSLVerification", "FULL")))
                 .isInstanceOf(SQLException.class)
-                .hasMessage("Connection property 'SSLVerification' is not allowed");
+                .hasMessage("Connection property SSLVerification requires TLS/SSL to be enabled");
     }
 
     // TODO: testFailedFullSslVerificationMismatchedHostname()
@@ -300,7 +412,7 @@ public void testFailedCaSslVerificationWithoutSSL()
     {
         assertThatThrownBy(() -> createBasicConnection(ImmutableMap.of("SSLVerification", "CA")))
                 .isInstanceOf(SQLException.class)
-                .hasMessage("Connection property 'SSLVerification' is not allowed");
+                .hasMessage("Connection property SSLVerification requires TLS/SSL to be enabled");
     }
 
     // TODO: testFailedCaSslVerificationInvalidCA()
@@ -310,18 +422,19 @@ public void testFailedNoneSslVerificationWithSSL()
     {
         assertThatThrownBy(() -> createConnection(ImmutableMap.of("SSLVerification", "NONE")))
                 .isInstanceOf(SQLException.class)
-                .hasMessage("Connection property 'SSLTrustStorePath' is not allowed");
+                .hasMessage("Connection property SSLTrustStorePath cannot be set if SSLVerification is set to NONE");
     }
 
     @Test
     public void testFailedNoneSslVerificationWithSSLUnsigned()
             throws Exception
     {
-        Connection connection = createBasicConnection(ImmutableMap.of("SSL", "true", "SSLVerification", "NONE"));
-        Statement statement = connection.createStatement();
-        assertThatThrownBy(() -> statement.execute("SELECT 123"))
-                .isInstanceOf(SQLException.class)
-                .hasMessage("Authentication failed: Unauthorized");
+        try (Connection connection = createBasicConnection(ImmutableMap.of("SSL", "true", "SSLVerification", "NONE"));
+                Statement statement = connection.createStatement()) {
+            assertThatThrownBy(() -> statement.execute("SELECT 123"))
+                    .isInstanceOf(SQLException.class)
+                    .hasMessage("Authentication failed: Unauthorized");
+        }
     }
 
     private Connection createConnection(Map<String, String> additionalProperties)
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverImpersonateUser.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverImpersonateUser.java
index 78b559a05db6..e1de4b559a7e 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverImpersonateUser.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverImpersonateUser.java
@@ -19,9 +19,10 @@
 import io.trino.server.testing.TestingTrinoServer;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.BasicPrincipal;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -37,9 +38,11 @@
 import static com.google.common.io.Resources.getResource;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestTrinoDriverImpersonateUser
 {
     private static final String TEST_USER = "test_user";
@@ -47,7 +50,7 @@ public class TestTrinoDriverImpersonateUser
 
     private TestingTrinoServer server;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
             throws Exception
     {
@@ -74,7 +77,7 @@ private static Principal authenticate(String user, String password)
         throw new AccessDeniedException("Invalid credentials");
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
             throws Exception
     {
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverUri.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverUri.java
index e76bdc203ba5..c50b2f2d8646 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverUri.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverUri.java
@@ -13,25 +13,24 @@
  */
 package io.trino.jdbc;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.sql.SQLException;
+import java.time.ZoneId;
+import java.time.zone.ZoneRulesException;
 import java.util.Properties;
 
-import static io.trino.jdbc.ConnectionProperties.CLIENT_TAGS;
-import static io.trino.jdbc.ConnectionProperties.DISABLE_COMPRESSION;
-import static io.trino.jdbc.ConnectionProperties.EXTRA_CREDENTIALS;
-import static io.trino.jdbc.ConnectionProperties.HTTP_PROXY;
-import static io.trino.jdbc.ConnectionProperties.SOCKS_PROXY;
-import static io.trino.jdbc.ConnectionProperties.SSL_TRUST_STORE_PASSWORD;
-import static io.trino.jdbc.ConnectionProperties.SSL_TRUST_STORE_PATH;
-import static io.trino.jdbc.ConnectionProperties.SSL_TRUST_STORE_TYPE;
-import static io.trino.jdbc.ConnectionProperties.SSL_USE_SYSTEM_TRUST_STORE;
-import static io.trino.jdbc.ConnectionProperties.SSL_VERIFICATION;
-import static io.trino.jdbc.ConnectionProperties.SslVerificationMode.CA;
-import static io.trino.jdbc.ConnectionProperties.SslVerificationMode.FULL;
-import static io.trino.jdbc.ConnectionProperties.SslVerificationMode.NONE;
+import static io.trino.client.uri.PropertyName.CLIENT_TAGS;
+import static io.trino.client.uri.PropertyName.DISABLE_COMPRESSION;
+import static io.trino.client.uri.PropertyName.EXTRA_CREDENTIALS;
+import static io.trino.client.uri.PropertyName.HTTP_PROXY;
+import static io.trino.client.uri.PropertyName.SOCKS_PROXY;
+import static io.trino.client.uri.PropertyName.SSL_TRUST_STORE_PASSWORD;
+import static io.trino.client.uri.PropertyName.SSL_TRUST_STORE_PATH;
+import static io.trino.client.uri.PropertyName.SSL_TRUST_STORE_TYPE;
+import static io.trino.client.uri.PropertyName.SSL_USE_SYSTEM_TRUST_STORE;
+import static io.trino.client.uri.PropertyName.SSL_VERIFICATION;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
@@ -55,6 +54,9 @@ public void testInvalidUrls()
         // invalid scheme
         assertInvalid("jdbc:mysql://localhost", "Invalid JDBC URL: jdbc:mysql://localhost");
 
+        // invalid scheme
+        assertInvalid("jdbc:http://localhost", "Invalid JDBC URL: jdbc:http://localhost");
+
         // missing port
         assertInvalid("jdbc:trino://localhost/", "No port number specified:");
 
@@ -74,123 +76,125 @@ public void testInvalidUrls()
         assertInvalid("jdbc:trino://localhost:8080/hive/default?ShoeSize=13", "Unrecognized connection property 'ShoeSize'");
 
         // empty property
-        assertInvalid("jdbc:trino://localhost:8080/hive/default?SSL=", "Connection property 'SSL' value is empty");
+        assertInvalid("jdbc:trino://localhost:8080/hive/default?SSL=", "Connection property SSL value is empty");
 
         // empty ssl verification property
-        assertInvalid("jdbc:trino://localhost:8080/hive/default?SSL=true&SSLVerification=", "Connection property 'SSLVerification' value is empty");
+        assertInvalid("jdbc:trino://localhost:8080/hive/default?SSL=true&SSLVerification=", "Connection property SSLVerification value is empty");
 
         // property in url multiple times
-        assertInvalid("jdbc:trino://localhost:8080/blackhole?password=a&password=b", "Connection property 'password' is in URL multiple times");
+        assertInvalid("jdbc:trino://localhost:8080/blackhole?password=a&password=b", "Connection property password is in the URL multiple times");
 
         // property not well formed, missing '='
-        assertInvalid("jdbc:trino://localhost:8080/blackhole?password&user=abc", "Connection argument is not valid connection property: 'password'");
+        assertInvalid("jdbc:trino://localhost:8080/blackhole?password&user=abc", "Connection argument is not a valid connection property: 'password'");
 
         // property in both url and arguments
-        assertInvalid("jdbc:trino://localhost:8080/blackhole?user=test123", "Connection property 'user' is both in the URL and an argument");
+        assertInvalid("jdbc:trino://localhost:8080/blackhole?user=test123", "Connection property user is both in the URL and an argument");
 
         // setting both socks and http proxy
-        assertInvalid("jdbc:trino://localhost:8080?socksProxy=localhost:1080&httpProxy=localhost:8888", "Connection property 'socksProxy' is not allowed");
-        assertInvalid("jdbc:trino://localhost:8080?httpProxy=localhost:8888&socksProxy=localhost:1080", "Connection property 'socksProxy' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?socksProxy=localhost:1080&httpProxy=localhost:8888", "Connection property socksProxy cannot be used when httpProxy is set");
+        assertInvalid("jdbc:trino://localhost:8080?httpProxy=localhost:8888&socksProxy=localhost:1080", "Connection property socksProxy cannot be used when httpProxy is set");
 
         // invalid ssl flag
-        assertInvalid("jdbc:trino://localhost:8080?SSL=0", "Connection property 'SSL' value is invalid: 0");
-        assertInvalid("jdbc:trino://localhost:8080?SSL=1", "Connection property 'SSL' value is invalid: 1");
-        assertInvalid("jdbc:trino://localhost:8080?SSL=2", "Connection property 'SSL' value is invalid: 2");
-        assertInvalid("jdbc:trino://localhost:8080?SSL=abc", "Connection property 'SSL' value is invalid: abc");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=0", "Connection property SSL value is invalid: 0");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=1", "Connection property SSL value is invalid: 1");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=2", "Connection property SSL value is invalid: 2");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=abc", "Connection property SSL value is invalid: abc");
 
         //invalid ssl verification mode
-        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=0", "Connection property 'SSLVerification' value is invalid: 0");
-        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=abc", "Connection property 'SSLVerification' value is invalid: abc");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=0", "Connection property SSLVerification value is invalid: 0");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=abc", "Connection property SSLVerification value is invalid: abc");
 
         // ssl verification without ssl
-        assertInvalid("jdbc:trino://localhost:8080?SSLVerification=FULL", "Connection property 'SSLVerification' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSLVerification=FULL", "Connection property SSLVerification requires TLS/SSL to be enabled");
 
         // ssl verification using port 443 without ssl
-        assertInvalid("jdbc:trino://localhost:443?SSLVerification=FULL", "Connection property 'SSLVerification' is not allowed");
+        assertInvalid("jdbc:trino://localhost:443?SSLVerification=FULL", "Connection property SSLVerification requires TLS/SSL to be enabled");
 
         // ssl key store password without path
-        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLKeyStorePassword=password", "Connection property 'SSLKeyStorePassword' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLKeyStorePassword=password", "Connection property SSLKeyStorePassword requires SSLKeyStorePath to be set");
 
         // ssl key store type without path
-        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLKeyStoreType=type", "Connection property 'SSLKeyStoreType' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLKeyStoreType=type", "Connection property SSLKeyStoreType requires SSLKeyStorePath to be set");
 
         // ssl trust store password without path
-        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLTrustStorePassword=password", "Connection property 'SSLTrustStorePassword' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLTrustStorePassword=password", "Connection property SSLTrustStorePassword requires SSLTrustStorePath to be set");
 
         // ssl trust store type without path
-        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLTrustStoreType=type", "Connection property 'SSLTrustStoreType' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLTrustStoreType=type", "Connection property SSLTrustStoreType requires SSLTrustStorePath to be set or SSLUseSystemTrustStore to be enabled");
 
         // key store path without ssl
-        assertInvalid("jdbc:trino://localhost:8080?SSLKeyStorePath=keystore.jks", "Connection property 'SSLKeyStorePath' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSLKeyStorePath=keystore.jks", "Connection property SSLKeyStorePath cannot be set if SSLVerification is set to NONE");
 
         // key store path using port 443 without ssl
-        assertInvalid("jdbc:trino://localhost:443?SSLKeyStorePath=keystore.jks", "Connection property 'SSLKeyStorePath' is not allowed");
+        assertInvalid("jdbc:trino://localhost:443?SSLKeyStorePath=keystore.jks", "Connection property SSLKeyStorePath cannot be set if SSLVerification is set to NONE");
 
         // trust store path without ssl
-        assertInvalid("jdbc:trino://localhost:8080?SSLTrustStorePath=truststore.jks", "Connection property 'SSLTrustStorePath' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSLTrustStorePath=truststore.jks", "Connection property SSLTrustStorePath cannot be set if SSLVerification is set to NONE");
 
         // trust store path using port 443 without ssl
-        assertInvalid("jdbc:trino://localhost:443?SSLTrustStorePath=truststore.jks", "Connection property 'SSLTrustStorePath' is not allowed");
+        assertInvalid("jdbc:trino://localhost:443?SSLTrustStorePath=truststore.jks", "Connection property SSLTrustStorePath cannot be set if SSLVerification is set to NONE");
 
         // key store password without ssl
-        assertInvalid("jdbc:trino://localhost:8080?SSLKeyStorePassword=password", "Connection property 'SSLKeyStorePassword' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSLKeyStorePassword=password", "Connection property SSLKeyStorePassword requires SSLKeyStorePath to be set");
 
         // trust store password without ssl
-        assertInvalid("jdbc:trino://localhost:8080?SSLTrustStorePassword=password", "Connection property 'SSLTrustStorePassword' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSLTrustStorePassword=password", "Connection property SSLTrustStorePassword requires SSLTrustStorePath to be set");
 
         // key store path with ssl verification mode NONE
-        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLKeyStorePath=keystore.jks", "Connection property 'SSLKeyStorePath' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLKeyStorePath=keystore.jks", "Connection property SSLKeyStorePath cannot be set if SSLVerification is set to NONE");
 
         // ssl key store password with ssl verification mode NONE
-        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLKeyStorePassword=password", "Connection property 'SSLKeyStorePassword' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLKeyStorePassword=password", "Connection property SSLKeyStorePassword requires SSLKeyStorePath to be set");
 
         // ssl key store type with ssl verification mode NONE
-        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLKeyStoreType=type", "Connection property 'SSLKeyStoreType' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLKeyStoreType=type", "Connection property SSLKeyStoreType requires SSLKeyStorePath to be set");
 
         // trust store path with ssl verification mode NONE
-        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLTrustStorePath=truststore.jks", "Connection property 'SSLTrustStorePath' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLTrustStorePath=truststore.jks", "Connection property SSLTrustStorePath cannot be set if SSLVerification is set to NONE");
 
         // ssl trust store password with ssl verification mode NONE
-        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLTrustStorePassword=password", "Connection property 'SSLTrustStorePassword' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLVerification=NONE&SSLTrustStorePassword=password", "Connection property SSLTrustStorePassword requires SSLTrustStorePath to be set");
 
         // key store path with ssl verification mode NONE
-        assertInvalid("jdbc:trino://localhost:8080?SSLKeyStorePath=keystore.jks", "Connection property 'SSLKeyStorePath' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSLKeyStorePath=keystore.jks", "Connection property SSLKeyStorePath cannot be set if SSLVerification is set to NONE");
 
         // use system trust store with ssl verification mode NONE
-        assertInvalid("jdbc:trino://localhost:8080?SSLUseSystemTrustStore=true", "Connection property 'SSLUseSystemTrustStore' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSLUseSystemTrustStore=true", "Connection property SSLUseSystemTrustStore cannot be set if SSLVerification is set to NONE");
 
         // use system trust store with key store path
-        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLUseSystemTrustStore=true&SSLTrustStorePath=truststore.jks", "Connection property 'SSLTrustStorePath' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?SSL=true&SSLUseSystemTrustStore=true&SSLTrustStorePath=truststore.jks", "Connection property SSLTrustStorePath cannot be set if SSLUseSystemTrustStore is enabled");
 
         // kerberos config without service name
-        assertInvalid("jdbc:trino://localhost:8080?KerberosCredentialCachePath=/test", "Connection property 'KerberosCredentialCachePath' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?KerberosCredentialCachePath=/test", "Connection property KerberosCredentialCachePath requires KerberosRemoteServiceName to be set");
 
         // kerberos config with delegated kerberos
-        assertInvalid("jdbc:trino://localhost:8080?KerberosRemoteServiceName=test&KerberosDelegation=true&KerberosCredentialCachePath=/test", "Connection property 'KerberosCredentialCachePath' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?KerberosRemoteServiceName=test&KerberosDelegation=true&KerberosCredentialCachePath=/test", "Connection property KerberosCredentialCachePath cannot be set if KerberosDelegation is enabled");
 
         // invalid extra credentials
-        assertInvalid("jdbc:trino://localhost:8080?extraCredentials=:invalid", "Connection property 'extraCredentials' value is invalid:");
-        assertInvalid("jdbc:trino://localhost:8080?extraCredentials=invalid:", "Connection property 'extraCredentials' value is invalid:");
-        assertInvalid("jdbc:trino://localhost:8080?extraCredentials=:invalid", "Connection property 'extraCredentials' value is invalid:");
+        assertInvalid("jdbc:trino://localhost:8080?extraCredentials=:invalid", "Connection property extraCredentials value is invalid:");
+        assertInvalid("jdbc:trino://localhost:8080?extraCredentials=invalid:", "Connection property extraCredentials value is invalid:");
+        assertInvalid("jdbc:trino://localhost:8080?extraCredentials=:invalid", "Connection property extraCredentials value is invalid:");
 
         // duplicate credential keys
-        assertInvalid("jdbc:trino://localhost:8080?extraCredentials=test.token.foo:bar;test.token.foo:xyz", "Connection property 'extraCredentials' value is invalid");
+        assertInvalid("jdbc:trino://localhost:8080?extraCredentials=test.token.foo:bar;test.token.foo:xyz", "Connection property extraCredentials value is invalid");
 
         // empty extra credentials
-        assertInvalid("jdbc:trino://localhost:8080?extraCredentials=", "Connection property 'extraCredentials' value is empty");
+        assertInvalid("jdbc:trino://localhost:8080?extraCredentials=", "Connection property extraCredentials value is empty");
 
         // legacy url
         assertInvalid("jdbc:presto://localhost:8080", "Invalid JDBC URL: jdbc:presto://localhost:8080");
 
         // cannot set mutually exclusive properties for non-conforming clients to true
-        assertInvalid("jdbc:trino://localhost:8080?assumeLiteralNamesInMetadataCallsForNonConformingClients=true&assumeLiteralUnderscoreInMetadataCallsForNonConformingClients=true", "Connection property 'assumeLiteralNamesInMetadataCallsForNonConformingClients' is not allowed");
+        assertInvalid("jdbc:trino://localhost:8080?assumeLiteralNamesInMetadataCallsForNonConformingClients=true&assumeLiteralUnderscoreInMetadataCallsForNonConformingClients=true",
+                "Connection property assumeLiteralNamesInMetadataCallsForNonConformingClients cannot be set if assumeLiteralUnderscoreInMetadataCallsForNonConformingClients is enabled");
     }
 
-    @Test(expectedExceptions = SQLException.class, expectedExceptionsMessageRegExp = "Connection property 'user' value is empty")
+    @Test
     public void testEmptyUser()
-            throws Exception
     {
-        TrinoDriverUri.create("jdbc:trino://localhost:8080?user=", new Properties());
+        assertThatThrownBy(() -> TrinoDriverUri.create("jdbc:trino://localhost:8080?user=", new Properties()))
+                .isInstanceOf(SQLException.class)
+                .hasMessage("Connection property user value is empty");
     }
 
     @Test
@@ -217,7 +221,7 @@ public void testUriWithSocksProxy()
         assertUriPortScheme(parameters, 8080, "http");
 
         Properties properties = parameters.getProperties();
-        assertEquals(properties.getProperty(SOCKS_PROXY.getKey()), "localhost:1234");
+        assertEquals(properties.getProperty(SOCKS_PROXY.toString()), "localhost:1234");
     }
 
     @Test
@@ -228,7 +232,7 @@ public void testUriWithHttpProxy()
         assertUriPortScheme(parameters, 8080, "http");
 
         Properties properties = parameters.getProperties();
-        assertEquals(properties.getProperty(HTTP_PROXY.getKey()), "localhost:5678");
+        assertEquals(properties.getProperty(HTTP_PROXY.toString()), "localhost:5678");
     }
 
     @Test
@@ -239,7 +243,7 @@ public void testUriWithoutCompression()
         assertTrue(parameters.isCompressionDisabled());
 
         Properties properties = parameters.getProperties();
-        assertEquals(properties.getProperty(DISABLE_COMPRESSION.getKey()), "true");
+        assertEquals(properties.getProperty(DISABLE_COMPRESSION.toString()), "true");
     }
 
     @Test
@@ -266,8 +270,8 @@ public void testUriWithSslEnabled()
         assertUriPortScheme(parameters, 8080, "https");
 
         Properties properties = parameters.getProperties();
-        assertNull(properties.getProperty(SSL_TRUST_STORE_PATH.getKey()));
-        assertNull(properties.getProperty(SSL_TRUST_STORE_PASSWORD.getKey()));
+        assertNull(properties.getProperty(SSL_TRUST_STORE_PATH.toString()));
+        assertNull(properties.getProperty(SSL_TRUST_STORE_PASSWORD.toString()));
     }
 
     @Test
@@ -294,8 +298,8 @@ public void testUriWithSslEnabledPathOnly()
         assertUriPortScheme(parameters, 8080, "https");
 
         Properties properties = parameters.getProperties();
-        assertEquals(properties.getProperty(SSL_TRUST_STORE_PATH.getKey()), "truststore.jks");
-        assertNull(properties.getProperty(SSL_TRUST_STORE_PASSWORD.getKey()));
+        assertEquals(properties.getProperty(SSL_TRUST_STORE_PATH.toString()), "truststore.jks");
+        assertNull(properties.getProperty(SSL_TRUST_STORE_PASSWORD.toString()));
     }
 
     @Test
@@ -306,8 +310,8 @@ public void testUriWithSslEnabledPassword()
         assertUriPortScheme(parameters, 8080, "https");
 
         Properties properties = parameters.getProperties();
-        assertEquals(properties.getProperty(SSL_TRUST_STORE_PATH.getKey()), "truststore.jks");
-        assertEquals(properties.getProperty(SSL_TRUST_STORE_PASSWORD.getKey()), "password");
+        assertEquals(properties.getProperty(SSL_TRUST_STORE_PATH.toString()), "truststore.jks");
+        assertEquals(properties.getProperty(SSL_TRUST_STORE_PASSWORD.toString()), "password");
     }
 
     @Test
@@ -318,7 +322,7 @@ public void testUriWithSslEnabledUsing443SslVerificationFull()
         assertUriPortScheme(parameters, 443, "https");
 
         Properties properties = parameters.getProperties();
-        assertEquals(properties.getProperty(SSL_VERIFICATION.getKey()), FULL.name());
+        assertEquals(properties.getProperty(SSL_VERIFICATION.toString()), "FULL");
     }
 
     @Test
@@ -329,7 +333,7 @@ public void testUriWithSslEnabledUsing443SslVerificationCA()
         assertUriPortScheme(parameters, 443, "https");
 
         Properties properties = parameters.getProperties();
-        assertEquals(properties.getProperty(SSL_VERIFICATION.getKey()), CA.name());
+        assertEquals(properties.getProperty(SSL_VERIFICATION.toString()), "CA");
     }
 
     @Test
@@ -340,7 +344,7 @@ public void testUriWithSslEnabledUsing443SslVerificationNONE()
         assertUriPortScheme(parameters, 443, "https");
 
         Properties properties = parameters.getProperties();
-        assertEquals(properties.getProperty(SSL_VERIFICATION.getKey()), NONE.name());
+        assertEquals(properties.getProperty(SSL_VERIFICATION.toString()), "NONE");
     }
 
     @Test
@@ -351,7 +355,7 @@ public void testUriWithSslEnabledSystemTrustStoreDefault()
         assertUriPortScheme(parameters, 8080, "https");
 
         Properties properties = parameters.getProperties();
-        assertEquals(properties.getProperty(SSL_USE_SYSTEM_TRUST_STORE.getKey()), "true");
+        assertEquals(properties.getProperty(SSL_USE_SYSTEM_TRUST_STORE.toString()), "true");
     }
 
     @Test
@@ -362,8 +366,8 @@ public void testUriWithSslEnabledSystemTrustStoreOverride()
         assertUriPortScheme(parameters, 8080, "https");
 
         Properties properties = parameters.getProperties();
-        assertEquals(properties.getProperty(SSL_TRUST_STORE_TYPE.getKey()), "Override");
-        assertEquals(properties.getProperty(SSL_USE_SYSTEM_TRUST_STORE.getKey()), "true");
+        assertEquals(properties.getProperty(SSL_TRUST_STORE_TYPE.toString()), "Override");
+        assertEquals(properties.getProperty(SSL_USE_SYSTEM_TRUST_STORE.toString()), "true");
     }
 
     @Test
@@ -373,7 +377,7 @@ public void testUriWithExtraCredentials()
         String extraCredentials = "test.token.foo:bar;test.token.abc:xyz";
         TrinoDriverUri parameters = createDriverUri("jdbc:trino://localhost:8080?extraCredentials=" + extraCredentials);
         Properties properties = parameters.getProperties();
-        assertEquals(properties.getProperty(EXTRA_CREDENTIALS.getKey()), extraCredentials);
+        assertEquals(properties.getProperty(EXTRA_CREDENTIALS.toString()), extraCredentials);
     }
 
     @Test
@@ -383,7 +387,7 @@ public void testUriWithClientTags()
         String clientTags = "c1,c2";
         TrinoDriverUri parameters = createDriverUri("jdbc:trino://localhost:8080?clientTags=" + clientTags);
         Properties properties = parameters.getProperties();
-        assertEquals(properties.getProperty(CLIENT_TAGS.getKey()), clientTags);
+        assertEquals(properties.getProperty(CLIENT_TAGS.toString()), clientTags);
     }
 
     @Test
@@ -422,6 +426,26 @@ public void testAssumeLiteralUnderscoreInMetadataCallsForNonConformingClients()
         assertThat(parameters.isAssumeLiteralNamesInMetadataCallsForNonConformingClients()).isFalse();
     }
 
+    @Test
+    public void testTimezone()
+            throws SQLException
+    {
+        TrinoDriverUri defaultParameters = createDriverUri("jdbc:trino://localhost:8080");
+        assertThat(defaultParameters.getTimeZone()).isEqualTo(ZoneId.systemDefault());
+
+        TrinoDriverUri parameters = createDriverUri("jdbc:trino://localhost:8080?timezone=Asia/Kolkata");
+        assertThat(parameters.getTimeZone()).isEqualTo(ZoneId.of("Asia/Kolkata"));
+
+        TrinoDriverUri offsetParameters = createDriverUri("jdbc:trino://localhost:8080?timezone=UTC+05:30");
+        assertThat(offsetParameters.getTimeZone()).isEqualTo(ZoneId.of("UTC+05:30"));
+
+        assertThatThrownBy(() -> createDriverUri("jdbc:trino://localhost:8080?timezone=Asia/NOT_FOUND"))
+                .isInstanceOf(SQLException.class)
+                .hasMessage("Connection property timezone value is invalid: Asia/NOT_FOUND")
+                .hasRootCauseInstanceOf(ZoneRulesException.class)
+                .hasRootCauseMessage("Unknown time-zone ID: Asia/NOT_FOUND");
+    }
+
     private static void assertUriPortScheme(TrinoDriverUri parameters, int port, String scheme)
     {
         URI uri = parameters.getHttpUri();
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoResultSet.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoResultSet.java
index 6975a09a98ac..8d8873fdd311 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoResultSet.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoResultSet.java
@@ -19,7 +19,8 @@
 import io.trino.client.QueryStatusInfo;
 import io.trino.client.StatementClient;
 import io.trino.client.StatementStats;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.time.ZoneId;
 import java.util.Iterator;
@@ -42,7 +43,8 @@
  */
 public class TestTrinoResultSet
 {
-    @Test(timeOut = 10000)
+    @Test
+    @Timeout(10)
     public void testIteratorCancelWhenQueueNotFull()
             throws Exception
     {
@@ -83,7 +85,8 @@ public Iterable<List<Object>> next()
         assertTrue(interruptedButSwallowed);
     }
 
-    @Test(timeOut = 10000)
+    @Test
+    @Timeout(10)
     public void testIteratorCancelWhenQueueIsFull()
             throws Exception
     {
@@ -206,6 +209,18 @@ public Optional<String> getSetPath()
                             throw new UnsupportedOperationException();
                         }
 
+                        @Override
+                        public Optional<String> getSetAuthorizationUser()
+                        {
+                            throw new UnsupportedOperationException();
+                        }
+
+                        @Override
+                        public boolean isResetAuthorizationUser()
+                        {
+                            throw new UnsupportedOperationException();
+                        }
+
                         @Override
                         public Map<String, String> getSetSessionProperties()
                         {
diff --git a/core/docker/Dockerfile b/core/docker/Dockerfile
index 16947114a48a..26dc62443b3a 100644
--- a/core/docker/Dockerfile
+++ b/core/docker/Dockerfile
@@ -11,29 +11,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM eclipse-temurin:17-jdk AS builder
-
-COPY default/apt/sources.list.d /etc/apt/sources.list.d
-
-RUN \
-    set -xeu && \
-    . /etc/os-release && \
-    sed -i "s/\${UBUNTU_CODENAME}/${UBUNTU_CODENAME}/g" /etc/apt/sources.list.d/* && \
-    echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \
-    echo 'Acquire::http::Timeout "15";' > /etc/apt/apt.conf.d/80-timeouts && \
-    apt-get update -q && \
-    apt-get install -y -q git gcc make && \
-    git clone https://github.com/airlift/jvmkill /tmp/jvmkill && \
-    make -C /tmp/jvmkill
+FROM ghcr.io/airlift/jvmkill:latest AS jvmkill
 
+# Use Eclipse Temurin as they have base Docker images for more architectures.
 FROM eclipse-temurin:17-jdk
 
-COPY default/apt/sources.list.d /etc/apt/sources.list.d
-
 RUN \
     set -xeu && \
-    . /etc/os-release && \
-    sed -i "s/\${UBUNTU_CODENAME}/${UBUNTU_CODENAME}/g" /etc/apt/sources.list.d/* && \
     echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \
     echo 'Acquire::http::Timeout "15";' > /etc/apt/apt.conf.d/80-timeouts && \
     apt-get update -q && \
@@ -46,10 +30,10 @@ RUN \
     chown -R "trino:trino" /usr/lib/trino /data/trino
 
 ARG TRINO_VERSION
-COPY trino-cli-${TRINO_VERSION}-executable.jar /usr/bin/trino
+COPY --chown=trino:trino trino-cli-${TRINO_VERSION}-executable.jar /usr/bin/trino
 COPY --chown=trino:trino trino-server-${TRINO_VERSION} /usr/lib/trino
 COPY --chown=trino:trino default/etc /etc/trino
-COPY --chown=trino:trino --from=builder /tmp/jvmkill/libjvmkill.so /usr/lib/trino/bin
+COPY --chown=trino:trino --from=jvmkill /libjvmkill.so /usr/lib/trino/bin
 
 EXPOSE 8080
 USER trino:trino
diff --git a/core/docker/build.sh b/core/docker/build.sh
index 0e11502e762c..99b93a33bbc1 100755
--- a/core/docker/build.sh
+++ b/core/docker/build.sh
@@ -65,15 +65,12 @@ cp "$trino_client" "${WORK_DIR}/"
 tar -C "${WORK_DIR}" -xzf "${WORK_DIR}/trino-server-${TRINO_VERSION}.tar.gz"
 rm "${WORK_DIR}/trino-server-${TRINO_VERSION}.tar.gz"
 cp -R bin "${WORK_DIR}/trino-server-${TRINO_VERSION}"
-mkdir -p "${WORK_DIR}/default"
-cp -R default/etc "${WORK_DIR}/default/"
+cp -R default "${WORK_DIR}/"
 
 TAG_PREFIX="trino:${TRINO_VERSION}"
 
 for arch in "${ARCHITECTURES[@]}"; do
     echo "🫙  Building the image for $arch"
-    mkdir -p "${WORK_DIR}/default/apt/sources.list.d"
-    cp "default/apt/sources.list.d/mirrors-$arch.sources" "${WORK_DIR}/default/apt/sources.list.d/"
     docker build \
         "${WORK_DIR}" \
         --pull \
@@ -81,7 +78,6 @@ for arch in "${ARCHITECTURES[@]}"; do
         -f Dockerfile \
         -t "${TAG_PREFIX}-$arch" \
         --build-arg "TRINO_VERSION=${TRINO_VERSION}"
-    rm -fr "${WORK_DIR}/default/apt/sources.list.d"
 done
 
 echo "🧹 Cleaning up the build context directory"
diff --git a/core/docker/container-test.sh b/core/docker/container-test.sh
index 388c58d6bc26..4a86852691fa 100644
--- a/core/docker/container-test.sh
+++ b/core/docker/container-test.sh
@@ -38,7 +38,7 @@ function test_trino_starts {
     trap - EXIT
 
     if ! [[ ${RESULT} == '"success"' ]]; then
-        echo "🚨 Test query didn't return expected result (\"success\")" >&2
+        echo "🚨 Test query didn't return expected result (\"success\"): [${RESULT}]" >&2
         return 1
     fi
 
diff --git a/core/docker/default/apt/sources.list.d/mirrors-amd64.sources b/core/docker/default/apt/sources.list.d/mirrors-amd64.sources
deleted file mode 100644
index 9fd0eeef7052..000000000000
--- a/core/docker/default/apt/sources.list.d/mirrors-amd64.sources
+++ /dev/null
@@ -1,6 +0,0 @@
-Enabled: yes
-Types: deb
-URIs: https://mirrors.ocf.berkeley.edu/ubuntu/ https://mirror.kumi.systems/ubuntu/
-Suites: ${UBUNTU_CODENAME} ${UBUNTU_CODENAME}-updates ${UBUNTU_CODENAME}-backports ${UBUNTU_CODENAME}-security
-Components: main restricted universe multiverse
-Architectures: amd64
diff --git a/core/docker/default/apt/sources.list.d/mirrors-arm64.sources b/core/docker/default/apt/sources.list.d/mirrors-arm64.sources
deleted file mode 100644
index 3f1b0dd9c7f3..000000000000
--- a/core/docker/default/apt/sources.list.d/mirrors-arm64.sources
+++ /dev/null
@@ -1,6 +0,0 @@
-Enabled: yes
-Types: deb
-URIs: https://mirrors.ocf.berkeley.edu/ubuntu-ports/ https://mirror.kumi.systems/ubuntu-ports/
-Suites: ${UBUNTU_CODENAME} ${UBUNTU_CODENAME}-updates ${UBUNTU_CODENAME}-backports ${UBUNTU_CODENAME}-security
-Components: main restricted universe multiverse
-Architectures: arm64
diff --git a/core/docker/default/apt/sources.list.d/mirrors-ppc64le.sources b/core/docker/default/apt/sources.list.d/mirrors-ppc64le.sources
deleted file mode 100644
index 4cc866de6b5c..000000000000
--- a/core/docker/default/apt/sources.list.d/mirrors-ppc64le.sources
+++ /dev/null
@@ -1,7 +0,0 @@
-Enabled: yes
-Types: deb
-URIs: https://mirrors.ocf.berkeley.edu/ubuntu-ports/ https://mirror.kumi.systems/ubuntu-ports/
-Suites: ${UBUNTU_CODENAME} ${UBUNTU_CODENAME}-updates ${UBUNTU_CODENAME}-backports ${UBUNTU_CODENAME}-security
-Components: main restricted universe multiverse
-# This is NOT a typo, Ubuntu calls "little endian" architecture "endian little"
-Architectures: ppc64el
diff --git a/core/docker/default/etc/jvm.config b/core/docker/default/etc/jvm.config
index 47e9e3176ac7..f667372c8db0 100644
--- a/core/docker/default/etc/jvm.config
+++ b/core/docker/default/etc/jvm.config
@@ -17,3 +17,5 @@
 -XX:+UseAESCTRIntrinsics
 # Disable Preventive GC for performance reasons (JDK-8293861)
 -XX:-G1UsePreventiveGC
+# Reduce starvation of threads by GClocker, recommend to set about the number of cpu cores (JDK-8192647)
+-XX:GCLockerRetryAllocationCount=32
diff --git a/core/trino-grammar/pom.xml b/core/trino-grammar/pom.xml
new file mode 100644
index 000000000000..fe40ecae85d2
--- /dev/null
+++ b/core/trino-grammar/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>io.trino</groupId>
+        <artifactId>trino-root</artifactId>
+        <version>432-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>trino-grammar</artifactId>
+
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <project.build.targetJdk>8</project.build.targetJdk>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/core/trino-parser/src/main/antlr4/io/trino/jsonpath/JsonPath.g4 b/core/trino-grammar/src/main/antlr4/io/trino/grammar/jsonpath/JsonPath.g4
similarity index 96%
rename from core/trino-parser/src/main/antlr4/io/trino/jsonpath/JsonPath.g4
rename to core/trino-grammar/src/main/antlr4/io/trino/grammar/jsonpath/JsonPath.g4
index 90dcd5e6cf1c..93304114b7be 100644
--- a/core/trino-parser/src/main/antlr4/io/trino/jsonpath/JsonPath.g4
+++ b/core/trino-grammar/src/main/antlr4/io/trino/grammar/jsonpath/JsonPath.g4
@@ -39,6 +39,8 @@ accessorExpression
     | accessorExpression '.' identifier                         #memberAccessor
     | accessorExpression '.' stringLiteral                      #memberAccessor
     | accessorExpression '.' '*'                                #wildcardMemberAccessor
+    | accessorExpression '..' identifier                        #descendantMemberAccessor
+    | accessorExpression '..' stringLiteral                     #descendantMemberAccessor
     | accessorExpression '[' subscript (',' subscript)* ']'     #arrayAccessor
     | accessorExpression '[' '*' ']'                            #wildcardArrayAccessor
     | accessorExpression '?' '(' predicate ')'                  #filter
diff --git a/core/trino-parser/src/main/antlr4/io/trino/sql/parser/SqlBase.g4 b/core/trino-grammar/src/main/antlr4/io/trino/grammar/sql/SqlBase.g4
similarity index 83%
rename from core/trino-parser/src/main/antlr4/io/trino/sql/parser/SqlBase.g4
rename to core/trino-grammar/src/main/antlr4/io/trino/grammar/sql/SqlBase.g4
index c385844f2667..0f01927a5023 100644
--- a/core/trino-parser/src/main/antlr4/io/trino/sql/parser/SqlBase.g4
+++ b/core/trino-grammar/src/main/antlr4/io/trino/grammar/sql/SqlBase.g4
@@ -14,6 +14,8 @@
 
 grammar SqlBase;
 
+options { caseInsensitive = true; }
+
 tokens {
     DELIMITER
 }
@@ -38,8 +40,12 @@ standaloneRowPattern
     : rowPattern EOF
     ;
 
+standaloneFunctionSpecification
+    : functionSpecification EOF
+    ;
+
 statement
-    : query                                                            #statementDefault
+    : rootQuery                                                        #statementDefault
     | USE schema=identifier                                            #use
     | USE catalog=identifier '.' schema=identifier                     #use
     | CREATE CATALOG (IF NOT EXISTS)? catalog=identifier
@@ -55,16 +61,17 @@ statement
     | DROP SCHEMA (IF EXISTS)? qualifiedName (CASCADE | RESTRICT)?     #dropSchema
     | ALTER SCHEMA qualifiedName RENAME TO identifier                  #renameSchema
     | ALTER SCHEMA qualifiedName SET AUTHORIZATION principal           #setSchemaAuthorization
-    | CREATE TABLE (IF NOT EXISTS)? qualifiedName columnAliases?
+    | CREATE (OR REPLACE)? TABLE (IF NOT EXISTS)? qualifiedName
+        columnAliases?
         (COMMENT string)?
-        (WITH properties)? AS (query | '('query')')
+        (WITH properties)? AS (rootQuery | '('rootQuery')')
         (WITH (NO)? DATA)?                                             #createTableAsSelect
-    | CREATE TABLE (IF NOT EXISTS)? qualifiedName
+    | CREATE (OR REPLACE)? TABLE (IF NOT EXISTS)? qualifiedName
         '(' tableElement (',' tableElement)* ')'
          (COMMENT string)?
          (WITH properties)?                                            #createTable
     | DROP TABLE (IF EXISTS)? qualifiedName                            #dropTable
-    | INSERT INTO qualifiedName columnAliases? query                   #insertInto
+    | INSERT INTO qualifiedName columnAliases? rootQuery               #insertInto
     | DELETE FROM qualifiedName (WHERE booleanExpression)?             #delete
     | TRUNCATE TABLE qualifiedName                                     #truncateTable
     | COMMENT ON TABLE qualifiedName IS (string | NULL)                #commentTable
@@ -75,11 +82,11 @@ statement
     | ALTER TABLE (IF EXISTS)? tableName=qualifiedName
         ADD COLUMN (IF NOT EXISTS)? column=columnDefinition            #addColumn
     | ALTER TABLE (IF EXISTS)? tableName=qualifiedName
-        RENAME COLUMN (IF EXISTS)? from=identifier TO to=identifier    #renameColumn
+        RENAME COLUMN (IF EXISTS)? from=qualifiedName TO to=identifier #renameColumn
     | ALTER TABLE (IF EXISTS)? tableName=qualifiedName
         DROP COLUMN (IF EXISTS)? column=qualifiedName                  #dropColumn
     | ALTER TABLE (IF EXISTS)? tableName=qualifiedName
-        ALTER COLUMN columnName=identifier SET DATA TYPE type          #setColumnType
+        ALTER COLUMN columnName=qualifiedName SET DATA TYPE type       #setColumnType
     | ALTER TABLE tableName=qualifiedName SET AUTHORIZATION principal  #setTableAuthorization
     | ALTER TABLE tableName=qualifiedName
         SET PROPERTIES propertyAssignments                             #setTableProperties
@@ -92,10 +99,10 @@ statement
         (IF NOT EXISTS)? qualifiedName
         (GRACE PERIOD interval)?
         (COMMENT string)?
-        (WITH properties)? AS query                                    #createMaterializedView
+        (WITH properties)? AS rootQuery                                #createMaterializedView
     | CREATE (OR REPLACE)? VIEW qualifiedName
         (COMMENT string)?
-        (SECURITY (DEFINER | INVOKER))? AS query                       #createView
+        (SECURITY (DEFINER | INVOKER))? AS rootQuery                   #createView
     | REFRESH MATERIALIZED VIEW qualifiedName                          #refreshMaterializedView
     | DROP MATERIALIZED VIEW (IF EXISTS)? qualifiedName                #dropMaterializedView
     | ALTER MATERIALIZED VIEW (IF EXISTS)? from=qualifiedName
@@ -106,6 +113,8 @@ statement
     | ALTER VIEW from=qualifiedName RENAME TO to=qualifiedName         #renameView
     | ALTER VIEW from=qualifiedName SET AUTHORIZATION principal        #setViewAuthorization
     | CALL qualifiedName '(' (callArgument (',' callArgument)*)? ')'   #call
+    | CREATE (OR REPLACE)? functionSpecification                       #createFunction
+    | DROP FUNCTION (IF EXISTS)? functionDeclaration                   #dropFunction
     | CREATE ROLE name=identifier
         (WITH ADMIN grantor)?
         (IN catalog=identifier)?                                       #createRole
@@ -154,15 +163,17 @@ statement
     | SHOW COLUMNS (FROM | IN) qualifiedName?
         (LIKE pattern=string (ESCAPE escape=string)?)?                 #showColumns
     | SHOW STATS FOR qualifiedName                                     #showStats
-    | SHOW STATS FOR '(' query ')'                                     #showStatsForQuery
+    | SHOW STATS FOR '(' rootQuery ')'                                 #showStatsForQuery
     | SHOW CURRENT? ROLES ((FROM | IN) identifier)?                    #showRoles
     | SHOW ROLE GRANTS ((FROM | IN) identifier)?                       #showRoleGrants
     | DESCRIBE qualifiedName                                           #showColumns
     | DESC qualifiedName                                               #showColumns
-    | SHOW FUNCTIONS
+    | SHOW FUNCTIONS ((FROM | IN) qualifiedName)?
         (LIKE pattern=string (ESCAPE escape=string)?)?                 #showFunctions
     | SHOW SESSION
         (LIKE pattern=string (ESCAPE escape=string)?)?                 #showSession
+    | SET SESSION AUTHORIZATION authorizationUser                      #setSessionAuthorization
+    | RESET SESSION AUTHORIZATION                                      #resetSessionAuthorization
     | SET SESSION qualifiedName EQ expression                          #setSession
     | RESET SESSION qualifiedName                                      #resetSession
     | START TRANSACTION (transactionMode (',' transactionMode)*)?      #startTransaction
@@ -171,6 +182,7 @@ statement
     | PREPARE identifier FROM statement                                #prepare
     | DEALLOCATE PREPARE identifier                                    #deallocate
     | EXECUTE identifier (USING expression (',' expression)*)?         #execute
+    | EXECUTE IMMEDIATE string (USING expression (',' expression)*)?   #executeImmediate
     | DESCRIBE INPUT identifier                                        #describeInput
     | DESCRIBE OUTPUT identifier                                       #describeOutput
     | SET PATH pathSpecification                                       #setPath
@@ -182,8 +194,16 @@ statement
         USING relation ON expression mergeCase+                        #merge
     ;
 
+rootQuery
+    : withFunction? query
+    ;
+
+withFunction
+    : WITH functionSpecification (',' functionSpecification)*
+    ;
+
 query
-    :  with? queryNoWith
+    : with? queryNoWith
     ;
 
 with
@@ -196,7 +216,7 @@ tableElement
     ;
 
 columnDefinition
-    : identifier type (NOT NULL)? (COMMENT string)? (WITH properties)?
+    : qualifiedName type (NOT NULL)? (COMMENT string)? (WITH properties)?
     ;
 
 likeClause
@@ -271,8 +291,8 @@ groupBy
 
 groupingElement
     : groupingSet                                            #singleGroupingSet
-    | ROLLUP '(' (expression (',' expression)*)? ')'         #rollup
-    | CUBE '(' (expression (',' expression)*)? ')'           #cube
+    | ROLLUP '(' (groupingSet (',' groupingSet)*)? ')'       #rollup
+    | CUBE '(' (groupingSet (',' groupingSet)*)? ')'         #cube
     | GROUPING SETS '(' groupingSet (',' groupingSet)* ')'   #multipleGroupingSets
     ;
 
@@ -418,6 +438,51 @@ relationPrimary
     | LATERAL '(' query ')'                                           #lateral
     | TABLE '(' tableFunctionCall ')'                                 #tableFunctionInvocation
     | '(' relation ')'                                                #parenthesizedRelation
+    | JSON_TABLE '('
+        jsonPathInvocation
+        COLUMNS '(' jsonTableColumn (',' jsonTableColumn)* ')'
+        (PLAN '(' jsonTableSpecificPlan ')'
+        | PLAN DEFAULT '(' jsonTableDefaultPlan ')'
+        )?
+        ((ERROR | EMPTY) ON ERROR)?
+      ')'                                                             #jsonTable
+    ;
+
+jsonTableColumn
+    : identifier FOR ORDINALITY                                     #ordinalityColumn
+    | identifier type
+        (PATH string)?
+        (emptyBehavior=jsonValueBehavior ON EMPTY)?
+        (errorBehavior=jsonValueBehavior ON ERROR)?                 #valueColumn
+    | identifier type FORMAT jsonRepresentation
+        (PATH string)?
+        (jsonQueryWrapperBehavior WRAPPER)?
+        ((KEEP | OMIT) QUOTES (ON SCALAR TEXT_STRING)?)?
+        (emptyBehavior=jsonQueryBehavior ON EMPTY)?
+        (errorBehavior=jsonQueryBehavior ON ERROR)?                 #queryColumn
+    | NESTED PATH? string (AS identifier)?
+        COLUMNS '(' jsonTableColumn (',' jsonTableColumn)* ')'      #nestedColumns
+    ;
+
+jsonTableSpecificPlan
+    : jsonTablePathName                                         #leafPlan
+    | jsonTablePathName (OUTER | INNER) planPrimary             #joinPlan
+    | planPrimary UNION planPrimary (UNION planPrimary)*        #unionPlan
+    | planPrimary CROSS planPrimary (CROSS planPrimary)*        #crossPlan
+    ;
+
+jsonTablePathName
+    : identifier
+    ;
+
+planPrimary
+    : jsonTablePathName
+    | '(' jsonTableSpecificPlan ')'
+    ;
+
+jsonTableDefaultPlan
+    : (OUTER | INNER) (',' (UNION | CROSS))?
+    | (UNION | CROSS) (',' (OUTER | INNER))?
     ;
 
 tableFunctionCall
@@ -571,6 +636,7 @@ primaryExpression
 
 jsonPathInvocation
     : jsonValueExpression ',' path=string
+        (AS pathName=identifier)?
         (PASSING jsonArgument (',' jsonArgument)*)?
     ;
 
@@ -789,6 +855,65 @@ pathSpecification
     : pathElement (',' pathElement)*
     ;
 
+functionSpecification
+    : FUNCTION functionDeclaration returnsClause routineCharacteristic* controlStatement
+    ;
+
+functionDeclaration
+    : qualifiedName '(' (parameterDeclaration (',' parameterDeclaration)*)? ')'
+    ;
+
+parameterDeclaration
+    : identifier? type
+    ;
+
+returnsClause
+    : RETURNS type
+    ;
+
+routineCharacteristic
+    : LANGUAGE identifier               #languageCharacteristic
+    | NOT? DETERMINISTIC                #deterministicCharacteristic
+    | RETURNS NULL ON NULL INPUT        #returnsNullOnNullInputCharacteristic
+    | CALLED ON NULL INPUT              #calledOnNullInputCharacteristic
+    | SECURITY (DEFINER | INVOKER)      #securityCharacteristic
+    | COMMENT string                    #commentCharacteristic
+    ;
+
+controlStatement
+    : RETURN valueExpression                                                        #returnStatement
+    | SET identifier EQ expression                                                  #assignmentStatement
+    | CASE expression caseStatementWhenClause+ elseClause? END CASE                 #simpleCaseStatement
+    | CASE caseStatementWhenClause+ elseClause? END CASE                            #searchedCaseStatement
+    | IF expression THEN sqlStatementList elseIfClause* elseClause? END IF          #ifStatement
+    | ITERATE identifier                                                            #iterateStatement
+    | LEAVE identifier                                                              #leaveStatement
+    | BEGIN (variableDeclaration SEMICOLON)* sqlStatementList? END                  #compoundStatement
+    | (label=identifier ':')? LOOP sqlStatementList END LOOP                        #loopStatement
+    | (label=identifier ':')? WHILE expression DO sqlStatementList END WHILE        #whileStatement
+    | (label=identifier ':')? REPEAT sqlStatementList UNTIL expression END REPEAT   #repeatStatement
+    ;
+
+caseStatementWhenClause
+    : WHEN expression THEN sqlStatementList
+    ;
+
+elseIfClause
+    : ELSEIF expression THEN sqlStatementList
+    ;
+
+elseClause
+    : ELSE sqlStatementList
+    ;
+
+variableDeclaration
+    : DECLARE identifier (',' identifier)* type (DEFAULT valueExpression)?
+    ;
+
+sqlStatementList
+    : (controlStatement SEMICOLON)+
+    ;
+
 privilege
     : CREATE | SELECT | DELETE | INSERT | UPDATE
     ;
@@ -836,32 +961,37 @@ number
     | MINUS? INTEGER_VALUE  #integerLiteral
     ;
 
+authorizationUser
+    : identifier            #identifierUser
+    | string                #stringUser
+    ;
+
 nonReserved
     // IMPORTANT: this rule must only contain tokens. Nested rules are not supported. See SqlParser.exitNonReserved
     : ABSENT | ADD | ADMIN | AFTER | ALL | ANALYZE | ANY | ARRAY | ASC | AT | AUTHORIZATION
-    | BERNOULLI | BOTH
-    | CALL | CASCADE | CATALOG | CATALOGS | COLUMN | COLUMNS | COMMENT | COMMIT | COMMITTED | CONDITIONAL | COPARTITION | COUNT | CURRENT
-    | DATA | DATE | DAY | DEFAULT | DEFINE | DEFINER | DENY | DESC | DESCRIPTOR | DISTRIBUTED | DOUBLE
-    | EMPTY | ENCODING | ERROR | EXCLUDING | EXPLAIN
-    | FETCH | FILTER | FINAL | FIRST | FOLLOWING | FORMAT | FUNCTIONS
+    | BEGIN | BERNOULLI | BOTH
+    | CALL | CALLED | CASCADE | CATALOG | CATALOGS | COLUMN | COLUMNS | COMMENT | COMMIT | COMMITTED | CONDITIONAL | COPARTITION | COUNT | CURRENT
+    | DATA | DATE | DAY | DECLARE | DEFAULT | DEFINE | DEFINER | DENY | DESC | DESCRIPTOR | DETERMINISTIC | DISTRIBUTED | DO | DOUBLE
+    | ELSEIF | EMPTY | ENCODING | ERROR | EXCLUDING | EXPLAIN
+    | FETCH | FILTER | FINAL | FIRST | FOLLOWING | FORMAT | FUNCTION | FUNCTIONS
     | GRACE | GRANT | GRANTED | GRANTS | GRAPHVIZ | GROUPS
     | HOUR
-    | IF | IGNORE | INCLUDING | INITIAL | INPUT | INTERVAL | INVOKER | IO | ISOLATION
+    | IF | IGNORE | IMMEDIATE | INCLUDING | INITIAL | INPUT | INTERVAL | INVOKER | IO | ITERATE | ISOLATION
     | JSON
     | KEEP | KEY | KEYS
-    | LAST | LATERAL | LEADING | LEVEL | LIMIT | LOCAL | LOGICAL
+    | LANGUAGE | LAST | LATERAL | LEADING | LEAVE | LEVEL | LIMIT | LOCAL | LOGICAL | LOOP
     | MAP | MATCH | MATCHED | MATCHES | MATCH_RECOGNIZE | MATERIALIZED | MEASURES | MERGE | MINUTE | MONTH
-    | NEXT | NFC | NFD | NFKC | NFKD | NO | NONE | NULLIF | NULLS
+    | NESTED | NEXT | NFC | NFD | NFKC | NFKD | NO | NONE | NULLIF | NULLS
     | OBJECT | OF | OFFSET | OMIT | ONE | ONLY | OPTION | ORDINALITY | OUTPUT | OVER | OVERFLOW
-    | PARTITION | PARTITIONS | PASSING | PAST | PATH | PATTERN | PER | PERIOD | PERMUTE | POSITION | PRECEDING | PRECISION | PRIVILEGES | PROPERTIES | PRUNE
+    | PARTITION | PARTITIONS | PASSING | PAST | PATH | PATTERN | PER | PERIOD | PERMUTE | PLAN | POSITION | PRECEDING | PRECISION | PRIVILEGES | PROPERTIES | PRUNE
     | QUOTES
-    | RANGE | READ | REFRESH | RENAME | REPEATABLE | REPLACE | RESET | RESPECT | RESTRICT | RETURNING | REVOKE | ROLE | ROLES | ROLLBACK | ROW | ROWS | RUNNING
+    | RANGE | READ | REFRESH | RENAME | REPEAT  | REPEATABLE | REPLACE | RESET | RESPECT | RESTRICT | RETURN | RETURNING | RETURNS | REVOKE | ROLE | ROLES | ROLLBACK | ROW | ROWS | RUNNING
     | SCALAR | SCHEMA | SCHEMAS | SECOND | SECURITY | SEEK | SERIALIZABLE | SESSION | SET | SETS
     | SHOW | SOME | START | STATS | SUBSET | SUBSTRING | SYSTEM
     | TABLES | TABLESAMPLE | TEXT | TEXT_STRING | TIES | TIME | TIMESTAMP | TO | TRAILING | TRANSACTION | TRUNCATE | TRY_CAST | TYPE
-    | UNBOUNDED | UNCOMMITTED | UNCONDITIONAL | UNIQUE | UNKNOWN | UNMATCHED | UPDATE | USE | USER | UTF16 | UTF32 | UTF8
+    | UNBOUNDED | UNCOMMITTED | UNCONDITIONAL | UNIQUE | UNKNOWN | UNMATCHED | UNTIL | UPDATE | USE | USER | UTF16 | UTF32 | UTF8
     | VALIDATE | VALUE | VERBOSE | VERSION | VIEW
-    | WINDOW | WITHIN | WITHOUT | WORK | WRAPPER | WRITE
+    | WHILE | WINDOW | WITHIN | WITHOUT | WORK | WRAPPER | WRITE
     | YEAR
     | ZONE
     ;
@@ -880,11 +1010,13 @@ AS: 'AS';
 ASC: 'ASC';
 AT: 'AT';
 AUTHORIZATION: 'AUTHORIZATION';
+BEGIN: 'BEGIN';
 BERNOULLI: 'BERNOULLI';
 BETWEEN: 'BETWEEN';
 BOTH: 'BOTH';
 BY: 'BY';
 CALL: 'CALL';
+CALLED: 'CALLED';
 CASCADE: 'CASCADE';
 CASE: 'CASE';
 CAST: 'CAST';
@@ -915,6 +1047,7 @@ DATA: 'DATA';
 DATE: 'DATE';
 DAY: 'DAY';
 DEALLOCATE: 'DEALLOCATE';
+DECLARE: 'DECLARE';
 DEFAULT: 'DEFAULT';
 DEFINE: 'DEFINE';
 DEFINER: 'DEFINER';
@@ -923,12 +1056,15 @@ DENY: 'DENY';
 DESC: 'DESC';
 DESCRIBE: 'DESCRIBE';
 DESCRIPTOR: 'DESCRIPTOR';
+DETERMINISTIC: 'DETERMINISTIC';
 DISTINCT: 'DISTINCT';
 DISTRIBUTED: 'DISTRIBUTED';
+DO: 'DO';
 DOUBLE: 'DOUBLE';
 DROP: 'DROP';
 ELSE: 'ELSE';
 EMPTY: 'EMPTY';
+ELSEIF: 'ELSEIF';
 ENCODING: 'ENCODING';
 END: 'END';
 ERROR: 'ERROR';
@@ -949,6 +1085,7 @@ FOR: 'FOR';
 FORMAT: 'FORMAT';
 FROM: 'FROM';
 FULL: 'FULL';
+FUNCTION: 'FUNCTION';
 FUNCTIONS: 'FUNCTIONS';
 GRACE: 'GRACE';
 GRANT: 'GRANT';
@@ -962,6 +1099,7 @@ HAVING: 'HAVING';
 HOUR: 'HOUR';
 IF: 'IF';
 IGNORE: 'IGNORE';
+IMMEDIATE: 'IMMEDIATE';
 IN: 'IN';
 INCLUDING: 'INCLUDING';
 INITIAL: 'INITIAL';
@@ -975,19 +1113,23 @@ INVOKER: 'INVOKER';
 IO: 'IO';
 IS: 'IS';
 ISOLATION: 'ISOLATION';
+ITERATE: 'ITERATE';
 JOIN: 'JOIN';
 JSON: 'JSON';
 JSON_ARRAY: 'JSON_ARRAY';
 JSON_EXISTS: 'JSON_EXISTS';
 JSON_OBJECT: 'JSON_OBJECT';
 JSON_QUERY: 'JSON_QUERY';
+JSON_TABLE: 'JSON_TABLE';
 JSON_VALUE: 'JSON_VALUE';
 KEEP: 'KEEP';
 KEY: 'KEY';
 KEYS: 'KEYS';
+LANGUAGE: 'LANGUAGE';
 LAST: 'LAST';
 LATERAL: 'LATERAL';
 LEADING: 'LEADING';
+LEAVE: 'LEAVE';
 LEFT: 'LEFT';
 LEVEL: 'LEVEL';
 LIKE: 'LIKE';
@@ -997,6 +1139,7 @@ LOCAL: 'LOCAL';
 LOCALTIME: 'LOCALTIME';
 LOCALTIMESTAMP: 'LOCALTIMESTAMP';
 LOGICAL: 'LOGICAL';
+LOOP: 'LOOP';
 MAP: 'MAP';
 MATCH: 'MATCH';
 MATCHED: 'MATCHED';
@@ -1008,6 +1151,7 @@ MERGE: 'MERGE';
 MINUTE: 'MINUTE';
 MONTH: 'MONTH';
 NATURAL: 'NATURAL';
+NESTED: 'NESTED';
 NEXT: 'NEXT';
 NFC : 'NFC';
 NFD : 'NFD';
@@ -1044,6 +1188,7 @@ PATTERN: 'PATTERN';
 PER: 'PER';
 PERIOD: 'PERIOD';
 PERMUTE: 'PERMUTE';
+PLAN : 'PLAN';
 POSITION: 'POSITION';
 PRECEDING: 'PRECEDING';
 PRECISION: 'PRECISION';
@@ -1057,12 +1202,15 @@ READ: 'READ';
 RECURSIVE: 'RECURSIVE';
 REFRESH: 'REFRESH';
 RENAME: 'RENAME';
+REPEAT: 'REPEAT';
 REPEATABLE: 'REPEATABLE';
 REPLACE: 'REPLACE';
 RESET: 'RESET';
 RESPECT: 'RESPECT';
 RESTRICT: 'RESTRICT';
+RETURN: 'RETURN';
 RETURNING: 'RETURNING';
+RETURNS: 'RETURNS';
 REVOKE: 'REVOKE';
 RIGHT: 'RIGHT';
 ROLE: 'ROLE';
@@ -1116,6 +1264,7 @@ UNIQUE: 'UNIQUE';
 UNKNOWN: 'UNKNOWN';
 UNMATCHED: 'UNMATCHED';
 UNNEST: 'UNNEST';
+UNTIL: 'UNTIL';
 UPDATE: 'UPDATE';
 USE: 'USE';
 USER: 'USER';
@@ -1131,6 +1280,7 @@ VERSION: 'VERSION';
 VIEW: 'VIEW';
 WHEN: 'WHEN';
 WHERE: 'WHERE';
+WHILE: 'WHILE';
 WINDOW: 'WINDOW';
 WITH: 'WITH';
 WITHIN: 'WITHIN';
@@ -1155,6 +1305,7 @@ SLASH: '/';
 PERCENT: '%';
 CONCAT: '||';
 QUESTION_MARK: '?';
+SEMICOLON: ';';
 
 STRING
     : '\'' ( ~'\'' | '\'\'' )* '\''
@@ -1172,12 +1323,15 @@ BINARY_LITERAL
     ;
 
 INTEGER_VALUE
-    : DIGIT+
+    : DECIMAL_INTEGER
+    | HEXADECIMAL_INTEGER
+    | OCTAL_INTEGER
+    | BINARY_INTEGER
     ;
 
 DECIMAL_VALUE
-    : DIGIT+ '.' DIGIT*
-    | '.' DIGIT+
+    : DECIMAL_INTEGER '.' DECIMAL_INTEGER?
+    | '.' DECIMAL_INTEGER
     ;
 
 DOUBLE_VALUE
@@ -1201,6 +1355,22 @@ BACKQUOTED_IDENTIFIER
     : '`' ( ~'`' | '``' )* '`'
     ;
 
+fragment DECIMAL_INTEGER
+    : DIGIT ('_'? DIGIT)*
+    ;
+
+fragment HEXADECIMAL_INTEGER
+    : '0X' ('_'? (DIGIT | [A-F]))+
+    ;
+
+fragment OCTAL_INTEGER
+    : '0O' ('_'? [0-7])+
+    ;
+
+fragment BINARY_INTEGER
+    : '0B' ('_'? [01])+
+    ;
+
 fragment EXPONENT
     : 'E' [+-]? DIGIT+
     ;
diff --git a/core/trino-parser/src/main/antlr4/io/trino/type/TypeCalculation.g4 b/core/trino-grammar/src/main/antlr4/io/trino/grammar/type/TypeCalculation.g4
similarity index 97%
rename from core/trino-parser/src/main/antlr4/io/trino/type/TypeCalculation.g4
rename to core/trino-grammar/src/main/antlr4/io/trino/grammar/type/TypeCalculation.g4
index d86a9ae1c3c3..652bf75fa645 100644
--- a/core/trino-parser/src/main/antlr4/io/trino/type/TypeCalculation.g4
+++ b/core/trino-grammar/src/main/antlr4/io/trino/grammar/type/TypeCalculation.g4
@@ -15,6 +15,8 @@
 //TODO: consider using the SQL grammar for this
 grammar TypeCalculation;
 
+options { caseInsensitive = true; }
+
 // workaround for:
 //  https://github.com/antlr/antlr4/issues/118
 typeCalculation
@@ -57,7 +59,7 @@ fragment DIGIT
     ;
 
 fragment LETTER
-    : [A-Za-z]
+    : [A-Z]
     ;
 
 WS
diff --git a/core/trino-grammar/src/main/java/io/trino/grammar/sql/SqlKeywords.java b/core/trino-grammar/src/main/java/io/trino/grammar/sql/SqlKeywords.java
new file mode 100644
index 000000000000..7c68eb087a99
--- /dev/null
+++ b/core/trino-grammar/src/main/java/io/trino/grammar/sql/SqlKeywords.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed 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 io.trino.grammar.sql;
+
+import com.google.common.collect.ImmutableSet;
+import org.antlr.v4.runtime.Vocabulary;
+
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.google.common.base.Strings.nullToEmpty;
+
+public final class SqlKeywords
+{
+    private static final Pattern IDENTIFIER = Pattern.compile("'([A-Z_]+)'");
+
+    private SqlKeywords() {}
+
+    public static Set<String> sqlKeywords()
+    {
+        ImmutableSet.Builder<String> names = ImmutableSet.builder();
+        Vocabulary vocabulary = SqlBaseLexer.VOCABULARY;
+        for (int i = 0; i <= vocabulary.getMaxTokenType(); i++) {
+            String name = nullToEmpty(vocabulary.getLiteralName(i));
+            Matcher matcher = IDENTIFIER.matcher(name);
+            if (matcher.matches()) {
+                names.add(matcher.group(1));
+            }
+        }
+        return names.build();
+    }
+}
diff --git a/core/trino-grammar/src/test/java/io/trino/grammar/sql/TestSqlKeywords.java b/core/trino-grammar/src/test/java/io/trino/grammar/sql/TestSqlKeywords.java
new file mode 100644
index 000000000000..5249453a081e
--- /dev/null
+++ b/core/trino-grammar/src/test/java/io/trino/grammar/sql/TestSqlKeywords.java
@@ -0,0 +1,322 @@
+/*
+ * Licensed 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 io.trino.grammar.sql;
+
+import com.google.common.collect.ImmutableSet;
+import org.junit.jupiter.api.Test;
+
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestSqlKeywords
+{
+    @Test
+    public void test()
+    {
+        assertThat(SqlKeywords.sqlKeywords().stream().sorted().collect(toImmutableSet()))
+                .isEqualTo(ImmutableSet.of(
+                        "ABSENT",
+                        "ADD",
+                        "ADMIN",
+                        "AFTER",
+                        "ALL",
+                        "ALTER",
+                        "ANALYZE",
+                        "AND",
+                        "ANY",
+                        "ARRAY",
+                        "AS",
+                        "ASC",
+                        "AT",
+                        "AUTHORIZATION",
+                        "BEGIN",
+                        "BERNOULLI",
+                        "BETWEEN",
+                        "BOTH",
+                        "BY",
+                        "CALL",
+                        "CALLED",
+                        "CASCADE",
+                        "CASE",
+                        "CAST",
+                        "CATALOG",
+                        "CATALOGS",
+                        "COLUMN",
+                        "COLUMNS",
+                        "COMMENT",
+                        "COMMIT",
+                        "COMMITTED",
+                        "CONDITIONAL",
+                        "CONSTRAINT",
+                        "COPARTITION",
+                        "COUNT",
+                        "CREATE",
+                        "CROSS",
+                        "CUBE",
+                        "CURRENT",
+                        "CURRENT_CATALOG",
+                        "CURRENT_DATE",
+                        "CURRENT_PATH",
+                        "CURRENT_ROLE",
+                        "CURRENT_SCHEMA",
+                        "CURRENT_TIME",
+                        "CURRENT_TIMESTAMP",
+                        "CURRENT_USER",
+                        "DATA",
+                        "DATE",
+                        "DAY",
+                        "DEALLOCATE",
+                        "DECLARE",
+                        "DEFAULT",
+                        "DEFINE",
+                        "DEFINER",
+                        "DELETE",
+                        "DENY",
+                        "DESC",
+                        "DESCRIBE",
+                        "DESCRIPTOR",
+                        "DETERMINISTIC",
+                        "DISTINCT",
+                        "DISTRIBUTED",
+                        "DO",
+                        "DOUBLE",
+                        "DROP",
+                        "ELSE",
+                        "ELSEIF",
+                        "EMPTY",
+                        "ENCODING",
+                        "END",
+                        "ERROR",
+                        "ESCAPE",
+                        "EXCEPT",
+                        "EXCLUDING",
+                        "EXECUTE",
+                        "EXISTS",
+                        "EXPLAIN",
+                        "EXTRACT",
+                        "FALSE",
+                        "FETCH",
+                        "FILTER",
+                        "FINAL",
+                        "FIRST",
+                        "FOLLOWING",
+                        "FOR",
+                        "FORMAT",
+                        "FROM",
+                        "FULL",
+                        "FUNCTION",
+                        "FUNCTIONS",
+                        "GRACE",
+                        "GRANT",
+                        "GRANTED",
+                        "GRANTS",
+                        "GRAPHVIZ",
+                        "GROUP",
+                        "GROUPING",
+                        "GROUPS",
+                        "HAVING",
+                        "HOUR",
+                        "IF",
+                        "IGNORE",
+                        "IMMEDIATE",
+                        "IN",
+                        "INCLUDING",
+                        "INITIAL",
+                        "INNER",
+                        "INPUT",
+                        "INSERT",
+                        "INTERSECT",
+                        "INTERVAL",
+                        "INTO",
+                        "INVOKER",
+                        "IO",
+                        "IS",
+                        "ISOLATION",
+                        "ITERATE",
+                        "JOIN",
+                        "JSON",
+                        "JSON_ARRAY",
+                        "JSON_EXISTS",
+                        "JSON_OBJECT",
+                        "JSON_QUERY",
+                        "JSON_TABLE",
+                        "JSON_VALUE",
+                        "KEEP",
+                        "KEY",
+                        "KEYS",
+                        "LANGUAGE",
+                        "LAST",
+                        "LATERAL",
+                        "LEADING",
+                        "LEAVE",
+                        "LEFT",
+                        "LEVEL",
+                        "LIKE",
+                        "LIMIT",
+                        "LISTAGG",
+                        "LOCAL",
+                        "LOCALTIME",
+                        "LOCALTIMESTAMP",
+                        "LOGICAL",
+                        "LOOP",
+                        "MAP",
+                        "MATCH",
+                        "MATCHED",
+                        "MATCHES",
+                        "MATCH_RECOGNIZE",
+                        "MATERIALIZED",
+                        "MEASURES",
+                        "MERGE",
+                        "MINUTE",
+                        "MONTH",
+                        "NATURAL",
+                        "NESTED",
+                        "NEXT",
+                        "NFC",
+                        "NFD",
+                        "NFKC",
+                        "NFKD",
+                        "NO",
+                        "NONE",
+                        "NORMALIZE",
+                        "NOT",
+                        "NULL",
+                        "NULLIF",
+                        "NULLS",
+                        "OBJECT",
+                        "OF",
+                        "OFFSET",
+                        "OMIT",
+                        "ON",
+                        "ONE",
+                        "ONLY",
+                        "OPTION",
+                        "OR",
+                        "ORDER",
+                        "ORDINALITY",
+                        "OUTER",
+                        "OUTPUT",
+                        "OVER",
+                        "OVERFLOW",
+                        "PARTITION",
+                        "PARTITIONS",
+                        "PASSING",
+                        "PAST",
+                        "PATH",
+                        "PATTERN",
+                        "PER",
+                        "PERIOD",
+                        "PERMUTE",
+                        "PLAN",
+                        "POSITION",
+                        "PRECEDING",
+                        "PRECISION",
+                        "PREPARE",
+                        "PRIVILEGES",
+                        "PROPERTIES",
+                        "PRUNE",
+                        "QUOTES",
+                        "RANGE",
+                        "READ",
+                        "RECURSIVE",
+                        "REFRESH",
+                        "RENAME",
+                        "REPEAT",
+                        "REPEATABLE",
+                        "REPLACE",
+                        "RESET",
+                        "RESPECT",
+                        "RESTRICT",
+                        "RETURN",
+                        "RETURNING",
+                        "RETURNS",
+                        "REVOKE",
+                        "RIGHT",
+                        "ROLE",
+                        "ROLES",
+                        "ROLLBACK",
+                        "ROLLUP",
+                        "ROW",
+                        "ROWS",
+                        "RUNNING",
+                        "SCALAR",
+                        "SCHEMA",
+                        "SCHEMAS",
+                        "SECOND",
+                        "SECURITY",
+                        "SEEK",
+                        "SELECT",
+                        "SERIALIZABLE",
+                        "SESSION",
+                        "SET",
+                        "SETS",
+                        "SHOW",
+                        "SKIP",
+                        "SOME",
+                        "START",
+                        "STATS",
+                        "STRING",
+                        "SUBSET",
+                        "SUBSTRING",
+                        "SYSTEM",
+                        "TABLE",
+                        "TABLES",
+                        "TABLESAMPLE",
+                        "TEXT",
+                        "THEN",
+                        "TIES",
+                        "TIME",
+                        "TIMESTAMP",
+                        "TO",
+                        "TRAILING",
+                        "TRANSACTION",
+                        "TRIM",
+                        "TRUE",
+                        "TRUNCATE",
+                        "TRY_CAST",
+                        "TYPE",
+                        "UESCAPE",
+                        "UNBOUNDED",
+                        "UNCOMMITTED",
+                        "UNCONDITIONAL",
+                        "UNION",
+                        "UNIQUE",
+                        "UNKNOWN",
+                        "UNMATCHED",
+                        "UNNEST",
+                        "UNTIL",
+                        "UPDATE",
+                        "USE",
+                        "USER",
+                        "USING",
+                        "VALIDATE",
+                        "VALUE",
+                        "VALUES",
+                        "VERBOSE",
+                        "VERSION",
+                        "VIEW",
+                        "WHEN",
+                        "WHERE",
+                        "WHILE",
+                        "WINDOW",
+                        "WITH",
+                        "WITHIN",
+                        "WITHOUT",
+                        "WORK",
+                        "WRAPPER",
+                        "WRITE",
+                        "YEAR",
+                        "ZONE"));
+    }
+}
diff --git a/core/trino-main/pom.xml b/core/trino-main/pom.xml
index 1337968ec808..4054fcfb090b 100644
--- a/core/trino-main/pom.xml
+++ b/core/trino-main/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-main</artifactId>
-    <name>trino-main</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -27,58 +26,69 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-array</artifactId>
+            <groupId>com.clearspring.analytics</groupId>
+            <artifactId>stream</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
-                    <artifactId>okhttp</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
-                    <artifactId>okhttp-urlconnection</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>com.esri.geometry</groupId>
+            <artifactId>esri-geometry-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-geospatial-toolkit</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-matching</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-memory-context</artifactId>
+            <groupId>com.github.oshi</groupId>
+            <artifactId>oshi-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-parser</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>nimbus-jose-jwt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>oauth2-oidc-sdk</artifactId>
+            <classifier>jdk11</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
         </dependency>
 
         <dependency>
@@ -193,102 +203,108 @@
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.discovery</groupId>
-            <artifactId>discovery-server</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.clearspring.analytics</groupId>
-            <artifactId>stream</artifactId>
+            <artifactId>tracing</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.esri.geometry</groupId>
-            <artifactId>esri-geometry-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.airlift.discovery</groupId>
+            <artifactId>discovery-server</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>validation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.github.oshi</groupId>
-            <artifactId>oshi-core</artifactId>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>re2j</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-array</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.nimbusds</groupId>
-            <artifactId>nimbus-jose-jwt</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.nimbusds</groupId>
-            <artifactId>oauth2-oidc-sdk</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp-urlconnection</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>com.teradata</groupId>
-            <artifactId>re2j-td</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-geospatial-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-matching</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-memory-context</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-parser</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-impl</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-jackson</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
         </dependency>
 
         <dependency>
@@ -297,23 +313,18 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
 
         <dependency>
@@ -329,12 +340,12 @@
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-analyzers-common</artifactId>
-            <version>8.4.1</version>
+            <version>8.11.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-servlet-api</artifactId>
+            <artifactId>jetty-jakarta-servlet-api</artifactId>
         </dependency>
 
         <dependency>
@@ -367,14 +378,6 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna-platform</artifactId>
-            <version>5.12.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -393,79 +396,90 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-exchange-filesystem</artifactId>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna-platform</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-parser</artifactId>
-            <type>test-jar</type>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp-urlconnection</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <type>test-jar</type>
+            <groupId>io.airlift</groupId>
+            <artifactId>jaxrs-testing</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-tpch</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.tpch</groupId>
-            <artifactId>tpch</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-exchange-filesystem</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>jaxrs-testing</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-parser</artifactId>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-tpch</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp-urlconnection</artifactId>
+            <groupId>io.trino.tpch</groupId>
+            <artifactId>tpch</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-guava</artifactId>
-            <version>3.4.0</version>
+            <version>${dep.assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -481,6 +495,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <!-- Needed while junit 4 is in classpath -->
             <groupId>org.junit.vintage</groupId>
@@ -543,14 +563,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>benchmarks</id>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                            </execution>
-                        </executions>
                         <configuration>
                             <executable>${java.home}/bin/java</executable>
                             <arguments>
@@ -561,6 +573,14 @@
                             </arguments>
                             <classpathScope>test</classpathScope>
                         </configuration>
+                        <executions>
+                            <execution>
+                                <id>benchmarks</id>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/core/trino-main/src/main/java/io/trino/FeaturesConfig.java b/core/trino-main/src/main/java/io/trino/FeaturesConfig.java
index 616095caa3b5..9963288f623c 100644
--- a/core/trino-main/src/main/java/io/trino/FeaturesConfig.java
+++ b/core/trino-main/src/main/java/io/trino/FeaturesConfig.java
@@ -23,11 +23,10 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.MaxDataSize;
 import io.trino.sql.analyzer.RegexLibrary;
-
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -35,6 +34,7 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.units.DataSize.Unit.KILOBYTE;
+import static io.airlift.units.DataSize.succinctBytes;
 import static io.trino.sql.analyzer.RegexLibrary.JONI;
 
 @DefunctConfig({
@@ -63,6 +63,8 @@
         "experimental.spill-order-by",
         "spill-window-operator",
         "experimental.spill-window-operator",
+        "legacy.allow-set-view-authorization",
+        "parse-decimal-literals-as-double"
 })
 public class FeaturesConfig
 {
@@ -71,7 +73,8 @@ public class FeaturesConfig
 
     private boolean redistributeWrites = true;
     private boolean scaleWriters = true;
-    private DataSize writerMinSize = DataSize.of(32, DataSize.Unit.MEGABYTE);
+    private DataSize writerScalingMinDataProcessed = DataSize.of(120, DataSize.Unit.MEGABYTE);
+    private DataSize maxMemoryPerPartitionWriter = DataSize.of(256, DataSize.Unit.MEGABYTE);
     private DataIntegrityVerification exchangeDataIntegrityVerification = DataIntegrityVerification.ABORT;
     /**
      * default value is overwritten for fault tolerant execution in {@link #applyFaultTolerantExecutionDefaults()}}
@@ -91,7 +94,6 @@ public class FeaturesConfig
     private double spillMaxUsedSpaceThreshold = 0.9;
     private double memoryRevokingTarget = 0.5;
     private double memoryRevokingThreshold = 0.9;
-    private boolean parseDecimalLiteralsAsDouble;
     private boolean lateMaterializationEnabled;
 
     private DataSize filterAndProjectMinOutputPageSize = DataSize.of(500, KILOBYTE);
@@ -100,7 +102,6 @@ public class FeaturesConfig
 
     private boolean legacyCatalogRoles;
     private boolean incrementalHashArrayLoadFactorEnabled = true;
-    private boolean allowSetViewAuthorization;
 
     private boolean legacyMaterializedViewGracePeriod;
     private boolean hideInaccessibleColumns;
@@ -154,16 +155,39 @@ public FeaturesConfig setScaleWriters(boolean scaleWriters)
     }
 
     @NotNull
-    public DataSize getWriterMinSize()
+    public DataSize getWriterScalingMinDataProcessed()
     {
-        return writerMinSize;
+        return writerScalingMinDataProcessed;
     }
 
-    @Config("writer-min-size")
+    @Config("writer-scaling-min-data-processed")
+    @ConfigDescription("Minimum amount of uncompressed output data processed by writers before writer scaling can happen")
+    public FeaturesConfig setWriterScalingMinDataProcessed(DataSize writerScalingMinDataProcessed)
+    {
+        this.writerScalingMinDataProcessed = writerScalingMinDataProcessed;
+        return this;
+    }
+
+    @Deprecated
+    @LegacyConfig(value = "writer-min-size", replacedBy = "writer-scaling-min-data-processed")
     @ConfigDescription("Target minimum size of writer output when scaling writers")
     public FeaturesConfig setWriterMinSize(DataSize writerMinSize)
     {
-        this.writerMinSize = writerMinSize;
+        this.writerScalingMinDataProcessed = succinctBytes(writerMinSize.toBytes() * 2);
+        return this;
+    }
+
+    @NotNull
+    public DataSize getMaxMemoryPerPartitionWriter()
+    {
+        return maxMemoryPerPartitionWriter;
+    }
+
+    @Config("max-memory-per-partition-writer")
+    @ConfigDescription("Estimated maximum memory required per partition writer in a single thread")
+    public FeaturesConfig setMaxMemoryPerPartitionWriter(DataSize maxMemoryPerPartitionWriter)
+    {
+        this.maxMemoryPerPartitionWriter = maxMemoryPerPartitionWriter;
         return this;
     }
 
@@ -328,18 +352,6 @@ public FeaturesConfig setExchangeDataIntegrityVerification(DataIntegrityVerifica
         return this;
     }
 
-    public boolean isParseDecimalLiteralsAsDouble()
-    {
-        return parseDecimalLiteralsAsDouble;
-    }
-
-    @Config("parse-decimal-literals-as-double")
-    public FeaturesConfig setParseDecimalLiteralsAsDouble(boolean parseDecimalLiteralsAsDouble)
-    {
-        this.parseDecimalLiteralsAsDouble = parseDecimalLiteralsAsDouble;
-        return this;
-    }
-
     public boolean isPagesIndexEagerCompactionEnabled()
     {
         return pagesIndexEagerCompactionEnabled;
@@ -474,20 +486,6 @@ public FeaturesConfig setHideInaccessibleColumns(boolean hideInaccessibleColumns
         return this;
     }
 
-    public boolean isAllowSetViewAuthorization()
-    {
-        return allowSetViewAuthorization;
-    }
-
-    @Config("legacy.allow-set-view-authorization")
-    @ConfigDescription("For security reasons ALTER VIEW SET AUTHORIZATION is disabled for SECURITY DEFINER; " +
-            "setting this option to true will re-enable this functionality")
-    public FeaturesConfig setAllowSetViewAuthorization(boolean allowSetViewAuthorization)
-    {
-        this.allowSetViewAuthorization = allowSetViewAuthorization;
-        return this;
-    }
-
     public boolean isForceSpillingJoin()
     {
         return forceSpillingJoin;
diff --git a/core/trino-main/src/main/java/io/trino/Session.java b/core/trino-main/src/main/java/io/trino/Session.java
index 0fd1b26ce096..bacd9bf60bf1 100644
--- a/core/trino-main/src/main/java/io/trino/Session.java
+++ b/core/trino-main/src/main/java/io/trino/Session.java
@@ -21,6 +21,7 @@
 import io.airlift.slice.Slice;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
 import io.trino.client.ProtocolHeaders;
 import io.trino.metadata.SessionPropertyManager;
 import io.trino.security.AccessControl;
@@ -28,6 +29,7 @@
 import io.trino.spi.QueryId;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.SelectedRole;
@@ -41,6 +43,7 @@
 import java.security.Principal;
 import java.time.Instant;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -54,15 +57,18 @@
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.client.ProtocolHeaders.TRINO_HEADERS;
 import static io.trino.spi.StandardErrorCode.NOT_FOUND;
+import static io.trino.sql.SqlPath.EMPTY_PATH;
 import static io.trino.util.Failures.checkCondition;
 import static java.util.Objects.requireNonNull;
 
 public final class Session
 {
     private final QueryId queryId;
+    private final Span querySpan;
     private final Optional<TransactionId> transactionId;
     private final boolean clientTransactionSupport;
     private final Identity identity;
+    private final Identity originalIdentity;
     private final Optional<String> source;
     private final Optional<String> catalog;
     private final Optional<String> schema;
@@ -87,9 +93,11 @@ public final class Session
 
     public Session(
             QueryId queryId,
+            Span querySpan,
             Optional<TransactionId> transactionId,
             boolean clientTransactionSupport,
             Identity identity,
+            Identity originalIdentity,
             Optional<String> source,
             Optional<String> catalog,
             Optional<String> schema,
@@ -112,9 +120,11 @@ public Session(
             Optional<Slice> exchangeEncryptionKey)
     {
         this.queryId = requireNonNull(queryId, "queryId is null");
+        this.querySpan = requireNonNull(querySpan, "querySpan is null");
         this.transactionId = requireNonNull(transactionId, "transactionId is null");
         this.clientTransactionSupport = clientTransactionSupport;
         this.identity = requireNonNull(identity, "identity is null");
+        this.originalIdentity = requireNonNull(originalIdentity, "originalIdentity is null");
         this.source = requireNonNull(source, "source is null");
         this.catalog = requireNonNull(catalog, "catalog is null");
         this.schema = requireNonNull(schema, "schema is null");
@@ -150,6 +160,11 @@ public QueryId getQueryId()
         return queryId;
     }
 
+    public Span getQuerySpan()
+    {
+        return querySpan;
+    }
+
     public String getUser()
     {
         return identity.getUser();
@@ -160,6 +175,11 @@ public Identity getIdentity()
         return identity;
     }
 
+    public Identity getOriginalIdentity()
+    {
+        return originalIdentity;
+    }
+
     public Optional<String> getSource()
     {
         return source;
@@ -293,6 +313,11 @@ public Optional<Slice> getExchangeEncryptionKey()
         return exchangeEncryptionKey;
     }
 
+    public SessionPropertyManager getSessionPropertyManager()
+    {
+        return sessionPropertyManager;
+    }
+
     public Session beginTransactionId(TransactionId transactionId, TransactionManager transactionManager, AccessControl accessControl)
     {
         requireNonNull(transactionId, "transactionId is null");
@@ -325,18 +350,20 @@ public Session beginTransactionId(TransactionId transactionId, TransactionManage
                 throw new TrinoException(NOT_FOUND, "Catalog for role does not exist: " + catalogName);
             }
             if (role.getType() == SelectedRole.Type.ROLE) {
-                accessControl.checkCanSetCatalogRole(new SecurityContext(transactionId, identity, queryId), role.getRole().orElseThrow(), catalogName);
+                accessControl.checkCanSetCatalogRole(new SecurityContext(transactionId, identity, queryId, start), role.getRole().orElseThrow(), catalogName);
             }
             connectorRoles.put(catalogName, role);
         }
 
         return new Session(
                 queryId,
+                querySpan,
                 Optional.of(transactionId),
                 clientTransactionSupport,
                 Identity.from(identity)
                         .withConnectorRoles(connectorRoles.buildOrThrow())
                         .build(),
+                originalIdentity,
                 source,
                 catalog,
                 schema,
@@ -381,9 +408,11 @@ public Session withDefaultProperties(Map<String, String> systemPropertyDefaults,
 
         return new Session(
                 queryId,
+                querySpan,
                 transactionId,
                 clientTransactionSupport,
                 identity,
+                originalIdentity,
                 source,
                 catalog,
                 schema,
@@ -411,9 +440,11 @@ public Session withExchangeEncryption(Slice encryptionKey)
         checkState(exchangeEncryptionKey.isEmpty(), "exchangeEncryptionKey is already present");
         return new Session(
                 queryId,
+                querySpan,
                 transactionId,
                 clientTransactionSupport,
                 identity,
+                originalIdentity,
                 source,
                 catalog,
                 schema,
@@ -459,10 +490,13 @@ public SessionRepresentation toSessionRepresentation()
     {
         return new SessionRepresentation(
                 queryId.toString(),
+                querySpan,
                 transactionId,
                 clientTransactionSupport,
                 identity.getUser(),
+                originalIdentity.getUser(),
                 identity.getGroups(),
+                originalIdentity.getGroups(),
                 identity.getPrincipal().map(Principal::toString),
                 identity.getEnabledRoles(),
                 source,
@@ -491,6 +525,7 @@ public String toString()
     {
         return toStringHelper(this)
                 .add("queryId", queryId)
+                .add("querySpan", querySpanString().orElse(null))
                 .add("transactionId", transactionId)
                 .add("user", getUser())
                 .add("principal", getIdentity().getPrincipal().orElse(null))
@@ -512,6 +547,16 @@ public String toString()
                 .toString();
     }
 
+    private Optional<String> querySpanString()
+    {
+        return Optional.of(querySpan)
+                .filter(span -> span.getSpanContext().isValid())
+                .map(span -> toStringHelper("Span")
+                        .add("spanId", span.getSpanContext().getSpanId())
+                        .add("traceId", span.getSpanContext().getTraceId())
+                        .toString());
+    }
+
     private void validateCatalogProperties(
             Optional<TransactionId> transactionId,
             AccessControl accessControl,
@@ -522,7 +567,7 @@ private void validateCatalogProperties(
         for (Entry<String, String> property : catalogProperties.entrySet()) {
             // verify permissions
             if (transactionId.isPresent()) {
-                accessControl.checkCanSetCatalogSessionProperty(new SecurityContext(transactionId.get(), identity, queryId), catalogName, property.getKey());
+                accessControl.checkCanSetCatalogSessionProperty(new SecurityContext(transactionId.get(), identity, queryId, start), catalogName, property.getKey());
             }
 
             // validate catalog session property value
@@ -541,6 +586,31 @@ private void validateSystemProperties(AccessControl accessControl, Map<String, S
         }
     }
 
+    public Session createViewSession(Optional<String> catalog, Optional<String> schema, Identity identity, List<CatalogSchemaName> viewPath)
+    {
+        return createViewSession(catalog, schema, identity, path.forView(viewPath));
+    }
+
+    public Session createViewSession(Optional<String> catalog, Optional<String> schema, Identity identity, SqlPath sqlPath)
+    {
+        return builder(sessionPropertyManager)
+                .setQueryId(getQueryId())
+                .setTransactionId(getTransactionId().orElse(null))
+                .setIdentity(identity)
+                .setOriginalIdentity(getOriginalIdentity())
+                .setSource(getSource().orElse(null))
+                .setCatalog(catalog)
+                .setSchema(schema)
+                .setPath(sqlPath)
+                .setTimeZoneKey(getTimeZoneKey())
+                .setLocale(getLocale())
+                .setRemoteUserAddress(getRemoteUserAddress().orElse(null))
+                .setUserAgent(getUserAgent().orElse(null))
+                .setClientInfo(getClientInfo().orElse(null))
+                .setStart(getStart())
+                .build();
+    }
+
     public static SessionBuilder builder(SessionPropertyManager sessionPropertyManager)
     {
         return new SessionBuilder(sessionPropertyManager);
@@ -554,19 +624,21 @@ public static SessionBuilder builder(Session session)
 
     public SecurityContext toSecurityContext()
     {
-        return new SecurityContext(getRequiredTransactionId(), getIdentity(), queryId);
+        return new SecurityContext(getRequiredTransactionId(), getIdentity(), queryId, start);
     }
 
     public static class SessionBuilder
     {
         private QueryId queryId;
+        private Span querySpan = Span.getInvalid();
         private TransactionId transactionId;
         private boolean clientTransactionSupport;
         private Identity identity;
+        private Identity originalIdentity;
         private String source;
         private String catalog;
         private String schema;
-        private SqlPath path;
+        private SqlPath path = EMPTY_PATH;
         private Optional<String> traceToken = Optional.empty();
         private TimeZoneKey timeZoneKey;
         private Locale locale;
@@ -597,6 +669,7 @@ private SessionBuilder(Session session)
             this.transactionId = session.transactionId.orElse(null);
             this.clientTransactionSupport = session.clientTransactionSupport;
             this.identity = session.identity;
+            this.originalIdentity = session.originalIdentity;
             this.source = session.source.orElse(null);
             this.catalog = session.catalog.orElse(null);
             this.path = session.path;
@@ -624,6 +697,13 @@ public SessionBuilder setQueryId(QueryId queryId)
             return this;
         }
 
+        @CanIgnoreReturnValue
+        public SessionBuilder setQuerySpan(Span querySpan)
+        {
+            this.querySpan = requireNonNull(querySpan, "querySpan is null");
+            return this;
+        }
+
         @CanIgnoreReturnValue
         public SessionBuilder setTransactionId(TransactionId transactionId)
         {
@@ -695,13 +775,6 @@ public SessionBuilder setPath(SqlPath path)
             return this;
         }
 
-        @CanIgnoreReturnValue
-        public SessionBuilder setPath(Optional<SqlPath> path)
-        {
-            this.path = path.orElse(null);
-            return this;
-        }
-
         @CanIgnoreReturnValue
         public SessionBuilder setSource(String source)
         {
@@ -751,6 +824,13 @@ public SessionBuilder setIdentity(Identity identity)
             return this;
         }
 
+        @CanIgnoreReturnValue
+        public SessionBuilder setOriginalIdentity(Identity originalIdentity)
+        {
+            this.originalIdentity = originalIdentity;
+            return this;
+        }
+
         @CanIgnoreReturnValue
         public SessionBuilder setUserAgent(String userAgent)
         {
@@ -853,13 +933,15 @@ public Session build()
         {
             return new Session(
                     queryId,
+                    querySpan,
                     Optional.ofNullable(transactionId),
                     clientTransactionSupport,
                     identity,
+                    originalIdentity,
                     Optional.ofNullable(source),
                     Optional.ofNullable(catalog),
                     Optional.ofNullable(schema),
-                    path != null ? path : new SqlPath(Optional.empty()),
+                    path,
                     traceToken,
                     timeZoneKey != null ? timeZoneKey : TimeZoneKey.getTimeZoneKey(TimeZone.getDefault().getID()),
                     locale != null ? locale : Locale.getDefault(),
diff --git a/core/trino-main/src/main/java/io/trino/SessionRepresentation.java b/core/trino-main/src/main/java/io/trino/SessionRepresentation.java
index b0e2dbd93b2e..649b3cdbb3e8 100644
--- a/core/trino-main/src/main/java/io/trino/SessionRepresentation.java
+++ b/core/trino-main/src/main/java/io/trino/SessionRepresentation.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.slice.Slice;
+import io.opentelemetry.api.trace.Span;
 import io.trino.metadata.SessionPropertyManager;
 import io.trino.spi.QueryId;
 import io.trino.spi.security.BasicPrincipal;
@@ -42,10 +43,13 @@
 public final class SessionRepresentation
 {
     private final String queryId;
+    private final Span querySpan;
     private final Optional<TransactionId> transactionId;
     private final boolean clientTransactionSupport;
     private final String user;
+    private final String originalUser;
     private final Set<String> groups;
+    private final Set<String> originalUserGroups;
     private final Optional<String> principal;
     private final Set<String> enabledRoles;
     private final Optional<String> source;
@@ -71,10 +75,13 @@ public final class SessionRepresentation
     @JsonCreator
     public SessionRepresentation(
             @JsonProperty("queryId") String queryId,
+            @JsonProperty("querySpan") Span querySpan,
             @JsonProperty("transactionId") Optional<TransactionId> transactionId,
             @JsonProperty("clientTransactionSupport") boolean clientTransactionSupport,
             @JsonProperty("user") String user,
+            @JsonProperty("originalUser") String originalUser,
             @JsonProperty("groups") Set<String> groups,
+            @JsonProperty("originalUserGroups") Set<String> originalUserGroups,
             @JsonProperty("principal") Optional<String> principal,
             @JsonProperty("enabledRoles") Set<String> enabledRoles,
             @JsonProperty("source") Optional<String> source,
@@ -98,10 +105,13 @@ public SessionRepresentation(
             @JsonProperty("protocolName") String protocolName)
     {
         this.queryId = requireNonNull(queryId, "queryId is null");
+        this.querySpan = requireNonNull(querySpan, "querySpan is null");
         this.transactionId = requireNonNull(transactionId, "transactionId is null");
         this.clientTransactionSupport = clientTransactionSupport;
         this.user = requireNonNull(user, "user is null");
+        this.originalUser = requireNonNull(originalUser, "originalUser is null");
         this.groups = requireNonNull(groups, "groups is null");
+        this.originalUserGroups = requireNonNull(originalUserGroups, "originalUserGroups is null");
         this.principal = requireNonNull(principal, "principal is null");
         this.enabledRoles = ImmutableSet.copyOf(requireNonNull(enabledRoles, "enabledRoles is null"));
         this.source = requireNonNull(source, "source is null");
@@ -136,6 +146,12 @@ public String getQueryId()
         return queryId;
     }
 
+    @JsonProperty
+    public Span getQuerySpan()
+    {
+        return querySpan;
+    }
+
     @JsonProperty
     public Optional<TransactionId> getTransactionId()
     {
@@ -154,12 +170,24 @@ public String getUser()
         return user;
     }
 
+    @JsonProperty
+    public String getOriginalUser()
+    {
+        return originalUser;
+    }
+
     @JsonProperty
     public Set<String> getGroups()
     {
         return groups;
     }
 
+    @JsonProperty
+    public Set<String> getOriginalUserGroups()
+    {
+        return originalUserGroups;
+    }
+
     @JsonProperty
     public Optional<String> getPrincipal()
     {
@@ -308,6 +336,15 @@ public Identity toIdentity(Map<String, String> extraCredentials)
                 .build();
     }
 
+    public Identity toOriginalIdentity(Map<String, String> extraCredentials)
+    {
+        return Identity.forUser(originalUser)
+                .withGroups(originalUserGroups)
+                .withPrincipal(principal.map(BasicPrincipal::new))
+                .withExtraCredentials(extraCredentials)
+                .build();
+    }
+
     public Session toSession(SessionPropertyManager sessionPropertyManager)
     {
         return toSession(sessionPropertyManager, emptyMap(), Optional.empty());
@@ -317,9 +354,11 @@ public Session toSession(SessionPropertyManager sessionPropertyManager, Map<Stri
     {
         return new Session(
                 new QueryId(queryId),
+                querySpan,
                 transactionId,
                 clientTransactionSupport,
                 toIdentity(extraCredentials),
+                toOriginalIdentity(extraCredentials),
                 source,
                 catalog,
                 schema,
diff --git a/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java b/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java
index e06323d0287d..1e3c3c6f7a9f 100644
--- a/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java
+++ b/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java
@@ -14,6 +14,7 @@
 package io.trino;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.execution.DynamicFilterConfig;
@@ -30,13 +31,13 @@
 import io.trino.sql.planner.OptimizerConfig.JoinReorderingStrategy;
 import io.trino.sql.planner.OptimizerConfig.MarkDistinctStrategy;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.airlift.units.DataSize.Unit.MEGABYTE;
+import static io.trino.execution.QueryManagerConfig.FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT;
 import static io.trino.execution.QueryManagerConfig.MAX_TASK_RETRY_ATTEMPTS;
 import static io.trino.plugin.base.session.PropertyMetadataUtil.dataSizeProperty;
 import static io.trino.plugin.base.session.PropertyMetadataUtil.durationProperty;
@@ -60,11 +61,13 @@ public final class SystemSessionProperties
     public static final String JOIN_DISTRIBUTION_TYPE = "join_distribution_type";
     public static final String JOIN_MAX_BROADCAST_TABLE_SIZE = "join_max_broadcast_table_size";
     public static final String JOIN_MULTI_CLAUSE_INDEPENDENCE_FACTOR = "join_multi_clause_independence_factor";
+    public static final String DETERMINE_PARTITION_COUNT_FOR_WRITE_ENABLED = "determine_partition_count_for_write_enabled";
     public static final String MAX_HASH_PARTITION_COUNT = "max_hash_partition_count";
     public static final String MIN_HASH_PARTITION_COUNT = "min_hash_partition_count";
+    public static final String MIN_HASH_PARTITION_COUNT_FOR_WRITE = "min_hash_partition_count_for_write";
     public static final String PREFER_STREAMING_OPERATORS = "prefer_streaming_operators";
-    public static final String TASK_WRITER_COUNT = "task_writer_count";
-    public static final String TASK_PARTITIONED_WRITER_COUNT = "task_partitioned_writer_count";
+    public static final String TASK_MIN_WRITER_COUNT = "task_min_writer_count";
+    public static final String TASK_MAX_WRITER_COUNT = "task_max_writer_count";
     public static final String TASK_CONCURRENCY = "task_concurrency";
     public static final String TASK_SHARE_INDEX_LOADING = "task_share_index_loading";
     public static final String QUERY_MAX_MEMORY = "query_max_memory";
@@ -78,12 +81,12 @@ public final class SystemSessionProperties
     public static final String QUERY_MAX_STAGE_COUNT = "query_max_stage_count";
     public static final String REDISTRIBUTE_WRITES = "redistribute_writes";
     public static final String USE_PREFERRED_WRITE_PARTITIONING = "use_preferred_write_partitioning";
-    public static final String PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS = "preferred_write_partitioning_min_number_of_partitions";
     public static final String SCALE_WRITERS = "scale_writers";
     public static final String TASK_SCALE_WRITERS_ENABLED = "task_scale_writers_enabled";
     public static final String MAX_WRITER_TASKS_COUNT = "max_writer_tasks_count";
-    public static final String TASK_SCALE_WRITERS_MAX_WRITER_COUNT = "task_scale_writers_max_writer_count";
-    public static final String WRITER_MIN_SIZE = "writer_min_size";
+    public static final String WRITER_SCALING_MIN_DATA_PROCESSED = "writer_scaling_min_data_processed";
+    public static final String SKEWED_PARTITION_MIN_DATA_PROCESSED_REBALANCE_THRESHOLD = "skewed_partition_min_data_processed_rebalance_threshold";
+    public static final String MAX_MEMORY_PER_PARTITION_WRITER = "max_memory_per_partition_writer";
     public static final String PUSH_TABLE_WRITE_THROUGH_UNION = "push_table_write_through_union";
     public static final String EXECUTION_POLICY = "execution_policy";
     public static final String DICTIONARY_AGGREGATION = "dictionary_aggregation";
@@ -108,7 +111,6 @@ public final class SystemSessionProperties
     public static final String PUSH_AGGREGATION_THROUGH_OUTER_JOIN = "push_aggregation_through_outer_join";
     public static final String PUSH_PARTIAL_AGGREGATION_THROUGH_JOIN = "push_partial_aggregation_through_join";
     public static final String PRE_AGGREGATE_CASE_AGGREGATIONS_ENABLED = "pre_aggregate_case_aggregations_enabled";
-    public static final String PARSE_DECIMAL_LITERALS_AS_DOUBLE = "parse_decimal_literals_as_double";
     public static final String FORCE_SINGLE_NODE_OUTPUT = "force_single_node_output";
     public static final String FILTER_AND_PROJECT_MIN_OUTPUT_PAGE_SIZE = "filter_and_project_min_output_page_size";
     public static final String FILTER_AND_PROJECT_MIN_OUTPUT_PAGE_ROW_COUNT = "filter_and_project_min_output_page_row_count";
@@ -116,7 +118,6 @@ public final class SystemSessionProperties
     public static final String USE_PARTIAL_TOPN = "use_partial_topn";
     public static final String USE_PARTIAL_DISTINCT_LIMIT = "use_partial_distinct_limit";
     public static final String MAX_RECURSION_DEPTH = "max_recursion_depth";
-    public static final String USE_MARK_DISTINCT = "use_mark_distinct";
     public static final String MARK_DISTINCT_STRATEGY = "mark_distinct_strategy";
     public static final String PREFER_PARTIAL_AGGREGATION = "prefer_partial_aggregation";
     public static final String OPTIMIZE_TOP_N_RANKING = "optimize_top_n_ranking";
@@ -174,15 +175,27 @@ public final class SystemSessionProperties
     public static final String FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_COMPUTE_TASK_TARGET_SIZE = "fault_tolerant_execution_hash_distribution_compute_task_target_size";
     public static final String FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_WRITE_TASK_TARGET_SIZE = "fault_tolerant_execution_hash_distribution_write_task_target_size";
     public static final String FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_WRITE_TASK_TARGET_MAX_COUNT = "fault_tolerant_execution_hash_distribution_write_task_target_max_count";
+    public static final String FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_COMPUTE_TASK_TO_NODE_MIN_RATIO = "fault_tolerant_execution_hash_distribution_compute_task_to_node_min_ratio";
+    public static final String FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_WRITE_TASK_TO_NODE_MIN_RATIO = "fault_tolerant_execution_hash_distribution_write_task_to_node_min_ratio";
     public static final String FAULT_TOLERANT_EXECUTION_STANDARD_SPLIT_SIZE = "fault_tolerant_execution_standard_split_size";
     public static final String FAULT_TOLERANT_EXECUTION_MAX_TASK_SPLIT_COUNT = "fault_tolerant_execution_max_task_split_count";
     public static final String FAULT_TOLERANT_EXECUTION_COORDINATOR_TASK_MEMORY = "fault_tolerant_execution_coordinator_task_memory";
     public static final String FAULT_TOLERANT_EXECUTION_TASK_MEMORY = "fault_tolerant_execution_task_memory";
     public static final String FAULT_TOLERANT_EXECUTION_TASK_MEMORY_GROWTH_FACTOR = "fault_tolerant_execution_task_memory_growth_factor";
     public static final String FAULT_TOLERANT_EXECUTION_TASK_MEMORY_ESTIMATION_QUANTILE = "fault_tolerant_execution_task_memory_estimation_quantile";
-    public static final String FAULT_TOLERANT_EXECUTION_PARTITION_COUNT = "fault_tolerant_execution_partition_count";
+    public static final String FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT = "fault_tolerant_execution_max_partition_count";
+    public static final String FAULT_TOLERANT_EXECUTION_MIN_PARTITION_COUNT = "fault_tolerant_execution_min_partition_count";
+    public static final String FAULT_TOLERANT_EXECUTION_MIN_PARTITION_COUNT_FOR_WRITE = "fault_tolerant_execution_min_partition_count_for_write";
+    public static final String FAULT_TOLERANT_EXECUTION_RUNTIME_ADAPTIVE_PARTITIONING_ENABLED = "fault_tolerant_execution_runtime_adaptive_partitioning_enabled";
+    public static final String FAULT_TOLERANT_EXECUTION_RUNTIME_ADAPTIVE_PARTITIONING_PARTITION_COUNT = "fault_tolerant_execution_runtime_adaptive_partitioning_partition_count";
+    public static final String FAULT_TOLERANT_EXECUTION_RUNTIME_ADAPTIVE_PARTITIONING_MAX_TASK_SIZE = "fault_tolerant_execution_runtime_adaptive_partitioning_max_task_size";
+    public static final String FAULT_TOLERANT_EXECUTION_MIN_SOURCE_STAGE_PROGRESS = "fault_tolerant_execution_min_source_stage_progress";
+    private static final String FAULT_TOLERANT_EXECUTION_SMALL_STAGE_ESTIMATION_ENABLED = "fault_tolerant_execution_small_stage_estimation_enabled";
+    private static final String FAULT_TOLERANT_EXECUTION_SMALL_STAGE_ESTIMATION_THRESHOLD = "fault_tolerant_execution_small_stage_estimation_threshold";
+    private static final String FAULT_TOLERANT_EXECUTION_SMALL_STAGE_SOURCE_SIZE_MULTIPLIER = "fault_tolerant_execution_small_stage_source_size_multiplier";
+    private static final String FAULT_TOLERANT_EXECUTION_SMALL_STAGE_REQUIRE_NO_MORE_PARTITIONS = "fault_tolerant_execution_small_stage_require_no_more_partitions";
+    private static final String FAULT_TOLERANT_EXECUTION_STAGE_ESTIMATION_FOR_EAGER_PARENT_ENABLED = "fault_tolerant_execution_stage_estimation_for_eager_parent_enabled";
     public static final String ADAPTIVE_PARTIAL_AGGREGATION_ENABLED = "adaptive_partial_aggregation_enabled";
-    public static final String ADAPTIVE_PARTIAL_AGGREGATION_MIN_ROWS = "adaptive_partial_aggregation_min_rows";
     public static final String ADAPTIVE_PARTIAL_AGGREGATION_UNIQUE_ROWS_RATIO_THRESHOLD = "adaptive_partial_aggregation_unique_rows_ratio_threshold";
     public static final String REMOTE_TASK_ADAPTIVE_UPDATE_REQUEST_SIZE_ENABLED = "remote_task_adaptive_update_request_size_enabled";
     public static final String REMOTE_TASK_MAX_REQUEST_SIZE = "remote_task_max_request_size";
@@ -194,7 +207,6 @@ public final class SystemSessionProperties
     public static final String USE_EXACT_PARTITIONING = "use_exact_partitioning";
     public static final String USE_COST_BASED_PARTITIONING = "use_cost_based_partitioning";
     public static final String FORCE_SPILLING_JOIN = "force_spilling_join";
-    public static final String FAULT_TOLERANT_EXECUTION_FORCE_PREFERRED_WRITE_PARTITIONING_ENABLED = "fault_tolerant_execution_force_preferred_write_partitioning_enabled";
     public static final String PAGE_PARTITIONING_BUFFER_POOL_SIZE = "page_partitioning_buffer_pool_size";
 
     private final List<PropertyMetadata<?>> sessionProperties;
@@ -254,6 +266,11 @@ public SystemSessionProperties(
                         false,
                         value -> validateDoubleRange(value, JOIN_MULTI_CLAUSE_INDEPENDENCE_FACTOR, 0.0, 1.0),
                         value -> value),
+                booleanProperty(
+                        DETERMINE_PARTITION_COUNT_FOR_WRITE_ENABLED,
+                        "Determine the number of partitions based on amount of data read and processed by the query for write queries",
+                        queryManagerConfig.isDeterminePartitionCountForWriteEnabled(),
+                        false),
                 integerProperty(
                         MAX_HASH_PARTITION_COUNT,
                         "Maximum number of partitions for distributed joins and aggregations",
@@ -266,21 +283,27 @@ public SystemSessionProperties(
                         queryManagerConfig.getMinHashPartitionCount(),
                         value -> validateIntegerValue(value, MIN_HASH_PARTITION_COUNT, 1, false),
                         false),
+                integerProperty(
+                        MIN_HASH_PARTITION_COUNT_FOR_WRITE,
+                        "Minimum number of partitions for distributed joins and aggregations in write queries",
+                        queryManagerConfig.getMinHashPartitionCountForWrite(),
+                        value -> validateIntegerValue(value, MIN_HASH_PARTITION_COUNT_FOR_WRITE, 1, false),
+                        false),
                 booleanProperty(
                         PREFER_STREAMING_OPERATORS,
                         "Prefer source table layouts that produce streaming operators",
                         false,
                         false),
                 integerProperty(
-                        TASK_WRITER_COUNT,
-                        "Number of local parallel table writers per task when prefer partitioning and task writer scaling are not used",
-                        taskManagerConfig.getWriterCount(),
+                        TASK_MIN_WRITER_COUNT,
+                        "Minimum number of local parallel table writers per task when preferred partitioning and task writer scaling are not used",
+                        taskManagerConfig.getMinWriterCount(),
                         false),
                 integerProperty(
-                        TASK_PARTITIONED_WRITER_COUNT,
-                        "Number of local parallel table writers per task when prefer partitioning is used",
-                        taskManagerConfig.getPartitionedWriterCount(),
-                        value -> validateValueIsPowerOfTwo(value, TASK_PARTITIONED_WRITER_COUNT),
+                        TASK_MAX_WRITER_COUNT,
+                        "Maximum number of local parallel table writers per task when either task writer scaling or preferred partitioning is used",
+                        taskManagerConfig.getMaxWriterCount(),
+                        value -> validateValueIsPowerOfTwo(value, TASK_MAX_WRITER_COUNT),
                         false),
                 booleanProperty(
                         REDISTRIBUTE_WRITES,
@@ -292,16 +315,6 @@ public SystemSessionProperties(
                         "Use preferred write partitioning",
                         optimizerConfig.isUsePreferredWritePartitioning(),
                         false),
-                integerProperty(
-                        PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS,
-                        "Use preferred write partitioning when the number of written partitions exceeds the configured threshold",
-                        optimizerConfig.getPreferredWritePartitioningMinNumberOfPartitions(),
-                        value -> {
-                            if (value < 1) {
-                                throw new TrinoException(INVALID_SESSION_PROPERTY, format("%s must be greater than or equal to 1: %s", PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, value));
-                            }
-                        },
-                        false),
                 booleanProperty(
                         SCALE_WRITERS,
                         "Scale out writers based on throughput (use minimum necessary)",
@@ -318,16 +331,21 @@ public SystemSessionProperties(
                         "Scale the number of concurrent table writers per task based on throughput",
                         taskManagerConfig.isScaleWritersEnabled(),
                         false),
-                integerProperty(
-                        TASK_SCALE_WRITERS_MAX_WRITER_COUNT,
-                        "Maximum number of writers per task up to which scaling will happen if task.scale-writers.enabled is set",
-                        taskManagerConfig.getScaleWritersMaxWriterCount(),
-                        true),
                 dataSizeProperty(
-                        WRITER_MIN_SIZE,
-                        "Target minimum size of writer output when scaling writers",
-                        featuresConfig.getWriterMinSize(),
+                        WRITER_SCALING_MIN_DATA_PROCESSED,
+                        "Minimum amount of uncompressed output data processed by writers before writer scaling can happen",
+                        featuresConfig.getWriterScalingMinDataProcessed(),
                         false),
+                dataSizeProperty(
+                        SKEWED_PARTITION_MIN_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                        "Minimum data processed to trigger skewed partition rebalancing in local and remote exchange",
+                        DataSize.of(200, MEGABYTE),
+                        true),
+                dataSizeProperty(
+                        MAX_MEMORY_PER_PARTITION_WRITER,
+                        "Estimated maximum memory required per partition writer in a single thread",
+                        featuresConfig.getMaxMemoryPerPartitionWriter(),
+                        true),
                 booleanProperty(
                         PUSH_TABLE_WRITE_THROUGH_UNION,
                         "Parallelize writes when using UNION ALL in queries that write data",
@@ -510,11 +528,6 @@ public SystemSessionProperties(
                         "Pre-aggregate rows before GROUP BY with multiple CASE aggregations on same column",
                         optimizerConfig.isPreAggregateCaseAggregationsEnabled(),
                         false),
-                booleanProperty(
-                        PARSE_DECIMAL_LITERALS_AS_DOUBLE,
-                        "Parse decimal literals as DOUBLE instead of DECIMAL",
-                        featuresConfig.isParseDecimalLiteralsAsDouble(),
-                        false),
                 booleanProperty(
                         FORCE_SINGLE_NODE_OUTPUT,
                         "Force single node output",
@@ -556,11 +569,6 @@ public SystemSessionProperties(
                         false,
                         value -> validateIntegerValue(value, MAX_RECURSION_DEPTH, 1, false),
                         object -> object),
-                booleanProperty(
-                        USE_MARK_DISTINCT,
-                        "Implement DISTINCT aggregations using MarkDistinct",
-                        optimizerConfig.isUseMarkDistinct(),
-                        false),
                 enumProperty(
                         MARK_DISTINCT_STRATEGY,
                         "",
@@ -881,52 +889,121 @@ public SystemSessionProperties(
                         "Soft upper bound on number of writer tasks in a stage of hash distribution of fault-tolerant execution",
                         queryManagerConfig.getFaultTolerantExecutionHashDistributionWriteTaskTargetMaxCount(),
                         true),
+                doubleProperty(FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_COMPUTE_TASK_TO_NODE_MIN_RATIO,
+                        "Minimal ratio of tasks count vs cluster nodes count for hash distributed compute stage in fault-tolerant execution",
+                        queryManagerConfig.getFaultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio(),
+                        true),
+                doubleProperty(FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_WRITE_TASK_TO_NODE_MIN_RATIO,
+                        "Minimal ratio of tasks count vs cluster nodes count for hash distributed writer stage in fault-tolerant execution",
+                        queryManagerConfig.getFaultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio(),
+                        true),
                 dataSizeProperty(
                         FAULT_TOLERANT_EXECUTION_STANDARD_SPLIT_SIZE,
                         "Standard split size for a single fault tolerant task (split weight aware)",
                         queryManagerConfig.getFaultTolerantExecutionStandardSplitSize(),
-                        false),
+                        true),
                 integerProperty(
                         FAULT_TOLERANT_EXECUTION_MAX_TASK_SPLIT_COUNT,
                         "Maximal number of splits for a single fault tolerant task (count based)",
                         queryManagerConfig.getFaultTolerantExecutionMaxTaskSplitCount(),
-                        false),
+                        true),
                 dataSizeProperty(
                         FAULT_TOLERANT_EXECUTION_COORDINATOR_TASK_MEMORY,
                         "Estimated amount of memory a single coordinator task will use when task level retries are used; value is used when allocating nodes for tasks execution",
                         memoryManagerConfig.getFaultTolerantExecutionCoordinatorTaskMemory(),
-                        false),
+                        true),
                 dataSizeProperty(
                         FAULT_TOLERANT_EXECUTION_TASK_MEMORY,
                         "Estimated amount of memory a single task will use when task level retries are used; value is used when allocating nodes for tasks execution",
                         memoryManagerConfig.getFaultTolerantExecutionTaskMemory(),
-                        false),
+                        true),
                 doubleProperty(
                         FAULT_TOLERANT_EXECUTION_TASK_MEMORY_GROWTH_FACTOR,
                         "Factor by which estimated task memory is increased if task execution runs out of memory; value is used allocating nodes for tasks execution",
                         memoryManagerConfig.getFaultTolerantExecutionTaskMemoryGrowthFactor(),
-                        false),
+                        true),
                 doubleProperty(
                         FAULT_TOLERANT_EXECUTION_TASK_MEMORY_ESTIMATION_QUANTILE,
                         "What quantile of memory usage of completed tasks to look at when estimating memory usage for upcoming tasks",
                         memoryManagerConfig.getFaultTolerantExecutionTaskMemoryEstimationQuantile(),
                         value -> validateDoubleRange(value, FAULT_TOLERANT_EXECUTION_TASK_MEMORY_ESTIMATION_QUANTILE, 0.0, 1.0),
-                        false),
+                        true),
                 integerProperty(
-                        FAULT_TOLERANT_EXECUTION_PARTITION_COUNT,
-                        "Number of partitions for distributed joins and aggregations executed with fault tolerant execution enabled",
-                        queryManagerConfig.getFaultTolerantExecutionPartitionCount(),
-                        false),
+                        FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT,
+                        "Maximum number of partitions for distributed joins and aggregations executed with fault tolerant execution enabled",
+                        queryManagerConfig.getFaultTolerantExecutionMaxPartitionCount(),
+                        value -> validateIntegerValue(value, FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT, 1, FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT, false),
+                        true),
+                integerProperty(
+                        FAULT_TOLERANT_EXECUTION_MIN_PARTITION_COUNT,
+                        "Minimum number of partitions for distributed joins and aggregations executed with fault tolerant execution enabled",
+                        queryManagerConfig.getFaultTolerantExecutionMinPartitionCount(),
+                        value -> validateIntegerValue(value, FAULT_TOLERANT_EXECUTION_MIN_PARTITION_COUNT, 1, FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT, false),
+                        true),
+                integerProperty(
+                        FAULT_TOLERANT_EXECUTION_MIN_PARTITION_COUNT_FOR_WRITE,
+                        "Minimum number of partitions for distributed joins and aggregations in write queries executed with fault tolerant execution enabled",
+                        queryManagerConfig.getFaultTolerantExecutionMinPartitionCountForWrite(),
+                        value -> validateIntegerValue(value, FAULT_TOLERANT_EXECUTION_MIN_PARTITION_COUNT_FOR_WRITE, 1, FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT, false),
+                        true),
+                booleanProperty(
+                        FAULT_TOLERANT_EXECUTION_RUNTIME_ADAPTIVE_PARTITIONING_ENABLED,
+                        "Enables change of number of partitions at runtime when intermediate data size is large",
+                        queryManagerConfig.isFaultTolerantExecutionRuntimeAdaptivePartitioningEnabled(),
+                        true),
+                integerProperty(
+                        FAULT_TOLERANT_EXECUTION_RUNTIME_ADAPTIVE_PARTITIONING_PARTITION_COUNT,
+                        "The partition count to use for runtime adaptive partitioning when enabled",
+                        queryManagerConfig.getFaultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount(),
+                        value -> validateIntegerValue(value, FAULT_TOLERANT_EXECUTION_RUNTIME_ADAPTIVE_PARTITIONING_PARTITION_COUNT, 1, FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT, false),
+                        true),
+                dataSizeProperty(
+                        FAULT_TOLERANT_EXECUTION_RUNTIME_ADAPTIVE_PARTITIONING_MAX_TASK_SIZE,
+                        "Max average task input size when deciding runtime adaptive partitioning",
+                        queryManagerConfig.getFaultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize(),
+                        true),
+                doubleProperty(
+                        FAULT_TOLERANT_EXECUTION_MIN_SOURCE_STAGE_PROGRESS,
+                        "Minimal progress of source stage to consider scheduling of parent stage",
+                        queryManagerConfig.getFaultTolerantExecutionMinSourceStageProgress(),
+                        true),
+                booleanProperty(
+                        FAULT_TOLERANT_EXECUTION_SMALL_STAGE_ESTIMATION_ENABLED,
+                        "Enable small stage estimation heuristic, used for more aggresive speculative stage scheduling",
+                        queryManagerConfig.isFaultTolerantExecutionSmallStageEstimationEnabled(),
+                        true),
+                dataSizeProperty(
+                        FAULT_TOLERANT_EXECUTION_SMALL_STAGE_ESTIMATION_THRESHOLD,
+                        "Threshold until which stage is considered small",
+                        queryManagerConfig.getFaultTolerantExecutionSmallStageEstimationThreshold(),
+                        true),
+                doubleProperty(
+                        FAULT_TOLERANT_EXECUTION_SMALL_STAGE_SOURCE_SIZE_MULTIPLIER,
+                        "Multiplier used for heuristic estimation is stage is small; the bigger the more conservative estimation is",
+                        queryManagerConfig.getFaultTolerantExecutionSmallStageSourceSizeMultiplier(),
+                        value -> {
+                            if (value < 1.0) {
+                                throw new TrinoException(
+                                        INVALID_SESSION_PROPERTY,
+                                        format("%s must be greater than or equal to 1.0: %s", FAULT_TOLERANT_EXECUTION_SMALL_STAGE_SOURCE_SIZE_MULTIPLIER, value));
+                            }
+                        },
+                        true),
+                booleanProperty(
+                        FAULT_TOLERANT_EXECUTION_SMALL_STAGE_REQUIRE_NO_MORE_PARTITIONS,
+                        "Is it required for all stage partitions (tasks) to be enumerated for stage to be used in heuristic to determine if parent stage is small",
+                        queryManagerConfig.isFaultTolerantExecutionSmallStageRequireNoMorePartitions(),
+                        true),
+                booleanProperty(
+                        FAULT_TOLERANT_EXECUTION_STAGE_ESTIMATION_FOR_EAGER_PARENT_ENABLED,
+                        "Enable aggressive stage output size estimation heuristic for children of stages to be executed eagerly",
+                        queryManagerConfig.isFaultTolerantExecutionStageEstimationForEagerParentEnabled(),
+                        true),
                 booleanProperty(
                         ADAPTIVE_PARTIAL_AGGREGATION_ENABLED,
                         "When enabled, partial aggregation might be adaptively turned off when it does not provide any performance gain",
                         optimizerConfig.isAdaptivePartialAggregationEnabled(),
                         false),
-                longProperty(
-                        ADAPTIVE_PARTIAL_AGGREGATION_MIN_ROWS,
-                        "Minimum number of processed rows before partial aggregation might be adaptively turned off",
-                        optimizerConfig.getAdaptivePartialAggregationMinRows(),
-                        false),
                 doubleProperty(
                         ADAPTIVE_PARTIAL_AGGREGATION_UNIQUE_ROWS_RATIO_THRESHOLD,
                         "Ratio between aggregation output and input rows above which partial aggregation might be adaptively turned off",
@@ -984,11 +1061,6 @@ public SystemSessionProperties(
                         "Force the usage of spliing join operator in favor of the non-spilling one, even if spill is not enabled",
                         featuresConfig.isForceSpillingJoin(),
                         false),
-                booleanProperty(
-                        FAULT_TOLERANT_EXECUTION_FORCE_PREFERRED_WRITE_PARTITIONING_ENABLED,
-                        "Force preferred write partitioning for fault tolerant execution",
-                        queryManagerConfig.isFaultTolerantExecutionForcePreferredWritePartitioningEnabled(),
-                        true),
                 integerProperty(PAGE_PARTITIONING_BUFFER_POOL_SIZE,
                         "Maximum number of free buffers in the per task partitioned page buffer pool. Setting this to zero effectively disables the pool",
                         taskManagerConfig.getPagePartitioningBufferPoolSize(),
@@ -1026,6 +1098,11 @@ public static double getJoinMultiClauseIndependenceFactor(Session session)
         return session.getSystemProperty(JOIN_MULTI_CLAUSE_INDEPENDENCE_FACTOR, Double.class);
     }
 
+    public static boolean isDeterminePartitionCountForWriteEnabled(Session session)
+    {
+        return session.getSystemProperty(DETERMINE_PARTITION_COUNT_FOR_WRITE_ENABLED, Boolean.class);
+    }
+
     public static int getMaxHashPartitionCount(Session session)
     {
         return session.getSystemProperty(MAX_HASH_PARTITION_COUNT, Integer.class);
@@ -1036,19 +1113,24 @@ public static int getMinHashPartitionCount(Session session)
         return session.getSystemProperty(MIN_HASH_PARTITION_COUNT, Integer.class);
     }
 
+    public static int getMinHashPartitionCountForWrite(Session session)
+    {
+        return session.getSystemProperty(MIN_HASH_PARTITION_COUNT_FOR_WRITE, Integer.class);
+    }
+
     public static boolean preferStreamingOperators(Session session)
     {
         return session.getSystemProperty(PREFER_STREAMING_OPERATORS, Boolean.class);
     }
 
-    public static int getTaskWriterCount(Session session)
+    public static int getTaskMinWriterCount(Session session)
     {
-        return session.getSystemProperty(TASK_WRITER_COUNT, Integer.class);
+        return session.getSystemProperty(TASK_MIN_WRITER_COUNT, Integer.class);
     }
 
-    public static int getTaskPartitionedWriterCount(Session session)
+    public static int getTaskMaxWriterCount(Session session)
     {
-        return session.getSystemProperty(TASK_PARTITIONED_WRITER_COUNT, Integer.class);
+        return session.getSystemProperty(TASK_MAX_WRITER_COUNT, Integer.class);
     }
 
     public static boolean isRedistributeWrites(Session session)
@@ -1061,11 +1143,6 @@ public static boolean isUsePreferredWritePartitioning(Session session)
         return session.getSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, Boolean.class);
     }
 
-    public static int getPreferredWritePartitioningMinNumberOfPartitions(Session session)
-    {
-        return session.getSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, Integer.class);
-    }
-
     public static boolean isScaleWriters(Session session)
     {
         return session.getSystemProperty(SCALE_WRITERS, Boolean.class);
@@ -1076,19 +1153,24 @@ public static boolean isTaskScaleWritersEnabled(Session session)
         return session.getSystemProperty(TASK_SCALE_WRITERS_ENABLED, Boolean.class);
     }
 
-    public static int getTaskScaleWritersMaxWriterCount(Session session)
+    public static int getMaxWriterTaskCount(Session session)
+    {
+        return session.getSystemProperty(MAX_WRITER_TASKS_COUNT, Integer.class);
+    }
+
+    public static DataSize getWriterScalingMinDataProcessed(Session session)
     {
-        return session.getSystemProperty(TASK_SCALE_WRITERS_MAX_WRITER_COUNT, Integer.class);
+        return session.getSystemProperty(WRITER_SCALING_MIN_DATA_PROCESSED, DataSize.class);
     }
 
-    public static int getMaxWriterTaskCount(Session session)
+    public static DataSize getSkewedPartitionMinDataProcessedRebalanceThreshold(Session session)
     {
-        return session.getSystemProperty(MAX_WRITER_TASKS_COUNT, Integer.class);
+        return session.getSystemProperty(SKEWED_PARTITION_MIN_DATA_PROCESSED_REBALANCE_THRESHOLD, DataSize.class);
     }
 
-    public static DataSize getWriterMinSize(Session session)
+    public static DataSize getMaxMemoryPerPartitionWriter(Session session)
     {
-        return session.getSystemProperty(WRITER_MIN_SIZE, DataSize.class);
+        return session.getSystemProperty(MAX_MEMORY_PER_PARTITION_WRITER, DataSize.class);
     }
 
     public static boolean isPushTableWriteThroughUnion(Session session)
@@ -1265,11 +1347,6 @@ public static boolean isPreAggregateCaseAggregationsEnabled(Session session)
         return session.getSystemProperty(PRE_AGGREGATE_CASE_AGGREGATIONS_ENABLED, Boolean.class);
     }
 
-    public static boolean isParseDecimalLiteralsAsDouble(Session session)
-    {
-        return session.getSystemProperty(PARSE_DECIMAL_LITERALS_AS_DOUBLE, Boolean.class);
-    }
-
     public static boolean isForceSingleNodeOutput(Session session)
     {
         return session.getSystemProperty(FORCE_SINGLE_NODE_OUTPUT, Boolean.class);
@@ -1287,19 +1364,7 @@ public static int getFilterAndProjectMinOutputPageRowCount(Session session)
 
     public static MarkDistinctStrategy markDistinctStrategy(Session session)
     {
-        MarkDistinctStrategy markDistinctStrategy = session.getSystemProperty(MARK_DISTINCT_STRATEGY, MarkDistinctStrategy.class);
-        if (markDistinctStrategy != null) {
-            // mark_distinct_strategy is set, so it takes precedence over use_mark_distinct
-            return markDistinctStrategy;
-        }
-
-        Boolean useMarkDistinct = session.getSystemProperty(USE_MARK_DISTINCT, Boolean.class);
-        if (useMarkDistinct == null) {
-            // both mark_distinct_strategy and use_mark_distinct have default null values, use AUTOMATIC
-            return MarkDistinctStrategy.AUTOMATIC;
-        }
-        // use_mark_distinct is set but mark_distinct_strategy is not, map use_mark_distinct to mark_distinct_strategy
-        return useMarkDistinct ? MarkDistinctStrategy.AUTOMATIC : MarkDistinctStrategy.NONE;
+        return session.getSystemProperty(MARK_DISTINCT_STRATEGY, MarkDistinctStrategy.class);
     }
 
     public static boolean preferPartialAggregation(Session session)
@@ -1374,6 +1439,11 @@ private static Integer validateNullablePositiveIntegerValue(Object value, String
     }
 
     private static Integer validateIntegerValue(Object value, String property, int lowerBoundIncluded, boolean allowNull)
+    {
+        return validateIntegerValue(value, property, lowerBoundIncluded, Integer.MAX_VALUE, allowNull);
+    }
+
+    private static Integer validateIntegerValue(Object value, String property, int lowerBoundIncluded, int upperBoundIncluded, boolean allowNull)
     {
         if (value == null && !allowNull) {
             throw new TrinoException(INVALID_SESSION_PROPERTY, format("%s must be non-null", property));
@@ -1387,6 +1457,10 @@ private static Integer validateIntegerValue(Object value, String property, int l
         if (intValue < lowerBoundIncluded) {
             throw new TrinoException(INVALID_SESSION_PROPERTY, format("%s must be equal or greater than %s", property, lowerBoundIncluded));
         }
+        if (intValue > upperBoundIncluded) {
+            throw new TrinoException(INVALID_SESSION_PROPERTY, format("%s must be equal or less than %s", property, upperBoundIncluded));
+        }
+
         return intValue;
     }
 
@@ -1669,6 +1743,16 @@ public static int getFaultTolerantExecutionHashDistributionWriteTaskTargetMaxCou
         return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_WRITE_TASK_TARGET_MAX_COUNT, Integer.class);
     }
 
+    public static double getFaultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio(Session session)
+    {
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_COMPUTE_TASK_TO_NODE_MIN_RATIO, Double.class);
+    }
+
+    public static double getFaultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio(Session session)
+    {
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_WRITE_TASK_TO_NODE_MIN_RATIO, Double.class);
+    }
+
     public static DataSize getFaultTolerantExecutionStandardSplitSize(Session session)
     {
         return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_STANDARD_SPLIT_SIZE, DataSize.class);
@@ -1699,19 +1783,69 @@ public static double getFaultTolerantExecutionTaskMemoryEstimationQuantile(Sessi
         return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_TASK_MEMORY_ESTIMATION_QUANTILE, Double.class);
     }
 
-    public static int getFaultTolerantExecutionPartitionCount(Session session)
+    public static int getFaultTolerantExecutionMaxPartitionCount(Session session)
     {
-        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_PARTITION_COUNT, Integer.class);
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT, Integer.class);
     }
 
-    public static boolean isAdaptivePartialAggregationEnabled(Session session)
+    public static int getFaultTolerantExecutionMinPartitionCount(Session session)
     {
-        return session.getSystemProperty(ADAPTIVE_PARTIAL_AGGREGATION_ENABLED, Boolean.class);
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_MIN_PARTITION_COUNT, Integer.class);
     }
 
-    public static long getAdaptivePartialAggregationMinRows(Session session)
+    public static int getFaultTolerantExecutionMinPartitionCountForWrite(Session session)
     {
-        return session.getSystemProperty(ADAPTIVE_PARTIAL_AGGREGATION_MIN_ROWS, Long.class);
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_MIN_PARTITION_COUNT_FOR_WRITE, Integer.class);
+    }
+
+    public static boolean isFaultTolerantExecutionRuntimeAdaptivePartitioningEnabled(Session session)
+    {
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_RUNTIME_ADAPTIVE_PARTITIONING_ENABLED, Boolean.class);
+    }
+
+    public static int getFaultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount(Session session)
+    {
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_RUNTIME_ADAPTIVE_PARTITIONING_PARTITION_COUNT, Integer.class);
+    }
+
+    public static DataSize getFaultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize(Session session)
+    {
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_RUNTIME_ADAPTIVE_PARTITIONING_MAX_TASK_SIZE, DataSize.class);
+    }
+
+    public static double getFaultTolerantExecutionMinSourceStageProgress(Session session)
+    {
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_MIN_SOURCE_STAGE_PROGRESS, Double.class);
+    }
+
+    public static boolean isFaultTolerantExecutionSmallStageEstimationEnabled(Session session)
+    {
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_SMALL_STAGE_ESTIMATION_ENABLED, Boolean.class);
+    }
+
+    public static DataSize getFaultTolerantExecutionSmallStageEstimationThreshold(Session session)
+    {
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_SMALL_STAGE_ESTIMATION_THRESHOLD, DataSize.class);
+    }
+
+    public static double getFaultTolerantExecutionSmallStageSourceSizeMultiplier(Session session)
+    {
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_SMALL_STAGE_SOURCE_SIZE_MULTIPLIER, Double.class);
+    }
+
+    public static boolean isFaultTolerantExecutionSmallStageRequireNoMorePartitions(Session session)
+    {
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_SMALL_STAGE_REQUIRE_NO_MORE_PARTITIONS, Boolean.class);
+    }
+
+    public static boolean isFaultTolerantExecutionStageEstimationForEagerParentEnabled(Session session)
+    {
+        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_STAGE_ESTIMATION_FOR_EAGER_PARENT_ENABLED, Boolean.class);
+    }
+
+    public static boolean isAdaptivePartialAggregationEnabled(Session session)
+    {
+        return session.getSystemProperty(ADAPTIVE_PARTIAL_AGGREGATION_ENABLED, Boolean.class);
     }
 
     public static double getAdaptivePartialAggregationUniqueRowsRatioThreshold(Session session)
@@ -1769,11 +1903,6 @@ public static boolean isForceSpillingOperator(Session session)
         return session.getSystemProperty(FORCE_SPILLING_JOIN, Boolean.class);
     }
 
-    public static boolean isFaultTolerantExecutionForcePreferredWritePartitioningEnabled(Session session)
-    {
-        return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_FORCE_PREFERRED_WRITE_PARTITIONING_ENABLED, Boolean.class);
-    }
-
     public static int getPagePartitioningBufferPoolSize(Session session)
     {
         return session.getSystemProperty(PAGE_PARTITIONING_BUFFER_POOL_SIZE, Integer.class);
diff --git a/core/trino-main/src/main/java/io/trino/annotation/UsedByGeneratedCode.java b/core/trino-main/src/main/java/io/trino/annotation/UsedByGeneratedCode.java
index e98e3748b13f..08fd80b90893 100644
--- a/core/trino-main/src/main/java/io/trino/annotation/UsedByGeneratedCode.java
+++ b/core/trino-main/src/main/java/io/trino/annotation/UsedByGeneratedCode.java
@@ -13,6 +13,8 @@
  */
 package io.trino.annotation;
 
+import com.google.errorprone.annotations.Keep;
+
 import java.lang.annotation.Target;
 
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
@@ -25,6 +27,7 @@
  * This can be used to prevent warnings about program elements that
  * static analysis tools flag as unused.
  */
+@Keep
 @Target({TYPE, FIELD, METHOD, CONSTRUCTOR})
 public @interface UsedByGeneratedCode
 {
diff --git a/core/trino-main/src/main/java/io/trino/block/BlockJsonSerde.java b/core/trino-main/src/main/java/io/trino/block/BlockJsonSerde.java
index 1431d5de871f..6917b36ac61f 100644
--- a/core/trino-main/src/main/java/io/trino/block/BlockJsonSerde.java
+++ b/core/trino-main/src/main/java/io/trino/block/BlockJsonSerde.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.google.inject.Inject;
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
@@ -27,8 +28,6 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockEncodingSerde;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 
 import static io.trino.block.BlockSerdeUtil.readBlock;
diff --git a/core/trino-main/src/main/java/io/trino/connector/CatalogFactory.java b/core/trino-main/src/main/java/io/trino/connector/CatalogFactory.java
index 2922387f532f..fc1cce6cc606 100644
--- a/core/trino-main/src/main/java/io/trino/connector/CatalogFactory.java
+++ b/core/trino-main/src/main/java/io/trino/connector/CatalogFactory.java
@@ -13,12 +13,11 @@
  */
 package io.trino.connector;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorFactory;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.function.Function;
 
 @ThreadSafe
diff --git a/core/trino-main/src/main/java/io/trino/connector/CatalogManagerConfig.java b/core/trino-main/src/main/java/io/trino/connector/CatalogManagerConfig.java
index be06b3249199..e621e00dae88 100644
--- a/core/trino-main/src/main/java/io/trino/connector/CatalogManagerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/connector/CatalogManagerConfig.java
@@ -14,8 +14,7 @@
 package io.trino.connector;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class CatalogManagerConfig
 {
diff --git a/core/trino-main/src/main/java/io/trino/connector/CatalogPruneTask.java b/core/trino-main/src/main/java/io/trino/connector/CatalogPruneTask.java
index 68df9fb0abc2..0dccf39a35ce 100644
--- a/core/trino-main/src/main/java/io/trino/connector/CatalogPruneTask.java
+++ b/core/trino-main/src/main/java/io/trino/connector/CatalogPruneTask.java
@@ -16,6 +16,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
 import io.airlift.discovery.client.ServiceDescriptor;
 import io.airlift.discovery.client.ServiceSelector;
@@ -32,15 +33,12 @@
 import io.trino.server.InternalCommunicationConfig;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.transaction.TransactionManager;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -184,11 +182,7 @@ private URI getHttpUri(ServiceDescriptor descriptor)
     {
         String url = descriptor.getProperties().get(httpsRequired ? "https" : "http");
         if (url != null) {
-            try {
-                return new URI(url);
-            }
-            catch (URISyntaxException ignored) {
-            }
+            return URI.create(url);
         }
         return null;
     }
diff --git a/core/trino-main/src/main/java/io/trino/connector/CatalogPruneTaskConfig.java b/core/trino-main/src/main/java/io/trino/connector/CatalogPruneTaskConfig.java
index 2568c2cfc861..5251e3b18ad3 100644
--- a/core/trino-main/src/main/java/io/trino/connector/CatalogPruneTaskConfig.java
+++ b/core/trino-main/src/main/java/io/trino/connector/CatalogPruneTaskConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 
diff --git a/core/trino-main/src/main/java/io/trino/connector/CatalogServiceProvider.java b/core/trino-main/src/main/java/io/trino/connector/CatalogServiceProvider.java
index ec0502d3fff9..d3f8fd344493 100644
--- a/core/trino-main/src/main/java/io/trino/connector/CatalogServiceProvider.java
+++ b/core/trino-main/src/main/java/io/trino/connector/CatalogServiceProvider.java
@@ -14,8 +14,7 @@
 package io.trino.connector;
 
 import io.trino.spi.connector.CatalogHandle;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/core/trino-main/src/main/java/io/trino/connector/CatalogServiceProviderModule.java b/core/trino-main/src/main/java/io/trino/connector/CatalogServiceProviderModule.java
index 84791d0ba852..7598411d2dd0 100644
--- a/core/trino-main/src/main/java/io/trino/connector/CatalogServiceProviderModule.java
+++ b/core/trino-main/src/main/java/io/trino/connector/CatalogServiceProviderModule.java
@@ -14,8 +14,10 @@
 package io.trino.connector;
 
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import io.trino.SystemSessionPropertiesProvider;
 import io.trino.metadata.AnalyzePropertyManager;
 import io.trino.metadata.CatalogProcedures;
@@ -36,9 +38,6 @@
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.function.FunctionProvider;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import java.util.Optional;
 import java.util.Set;
 
diff --git a/core/trino-main/src/main/java/io/trino/connector/CatalogStore.java b/core/trino-main/src/main/java/io/trino/connector/CatalogStore.java
index 0296e03fe897..a6073990e579 100644
--- a/core/trino-main/src/main/java/io/trino/connector/CatalogStore.java
+++ b/core/trino-main/src/main/java/io/trino/connector/CatalogStore.java
@@ -13,7 +13,7 @@
  */
 package io.trino.connector;
 
-import javax.annotation.concurrent.NotThreadSafe;
+import io.trino.annotation.NotThreadSafe;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/connector/CatalogStoreConfig.java b/core/trino-main/src/main/java/io/trino/connector/CatalogStoreConfig.java
index 9a5cf248df1e..5862e20a7b25 100644
--- a/core/trino-main/src/main/java/io/trino/connector/CatalogStoreConfig.java
+++ b/core/trino-main/src/main/java/io/trino/connector/CatalogStoreConfig.java
@@ -14,8 +14,7 @@
 package io.trino.connector;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class CatalogStoreConfig
 {
diff --git a/core/trino-main/src/main/java/io/trino/connector/ConnectorContextInstance.java b/core/trino-main/src/main/java/io/trino/connector/ConnectorContextInstance.java
index 486cd3b23d2e..677a4626ba95 100644
--- a/core/trino-main/src/main/java/io/trino/connector/ConnectorContextInstance.java
+++ b/core/trino-main/src/main/java/io/trino/connector/ConnectorContextInstance.java
@@ -13,6 +13,8 @@
  */
 package io.trino.connector;
 
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.spi.NodeManager;
 import io.trino.spi.PageIndexerFactory;
 import io.trino.spi.PageSorter;
@@ -31,6 +33,8 @@
 public class ConnectorContextInstance
         implements ConnectorContext
 {
+    private final OpenTelemetry openTelemetry;
+    private final Tracer tracer;
     private final NodeManager nodeManager;
     private final VersionEmbedder versionEmbedder;
     private final TypeManager typeManager;
@@ -43,6 +47,8 @@ public class ConnectorContextInstance
 
     public ConnectorContextInstance(
             CatalogHandle catalogHandle,
+            OpenTelemetry openTelemetry,
+            Tracer tracer,
             NodeManager nodeManager,
             VersionEmbedder versionEmbedder,
             TypeManager typeManager,
@@ -51,6 +57,8 @@ public ConnectorContextInstance(
             PageIndexerFactory pageIndexerFactory,
             Supplier<ClassLoader> duplicatePluginClassLoaderFactory)
     {
+        this.openTelemetry = requireNonNull(openTelemetry, "openTelemetry is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
         this.nodeManager = requireNonNull(nodeManager, "nodeManager is null");
         this.versionEmbedder = requireNonNull(versionEmbedder, "versionEmbedder is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
@@ -61,6 +69,18 @@ public ConnectorContextInstance(
         this.catalogHandle = requireNonNull(catalogHandle, "catalogHandle is null");
     }
 
+    @Override
+    public OpenTelemetry getOpenTelemetry()
+    {
+        return openTelemetry;
+    }
+
+    @Override
+    public Tracer getTracer()
+    {
+        return tracer;
+    }
+
     @Override
     public CatalogHandle getCatalogHandle()
     {
diff --git a/core/trino-main/src/main/java/io/trino/connector/ConnectorServices.java b/core/trino-main/src/main/java/io/trino/connector/ConnectorServices.java
index 81d6de16ddae..fc1a4d5650ef 100644
--- a/core/trino-main/src/main/java/io/trino/connector/ConnectorServices.java
+++ b/core/trino-main/src/main/java/io/trino/connector/ConnectorServices.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import io.airlift.log.Logger;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.metadata.CatalogMetadata.SecurityManagement;
 import io.trino.metadata.CatalogProcedures;
 import io.trino.metadata.CatalogTableFunctions;
@@ -31,25 +32,31 @@
 import io.trino.spi.connector.ConnectorPageSinkProvider;
 import io.trino.spi.connector.ConnectorPageSourceProvider;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
+import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.ConnectorSplitManager;
+import io.trino.spi.connector.SchemaRoutineName;
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.connector.TableProcedureMetadata;
 import io.trino.spi.eventlistener.EventListener;
+import io.trino.spi.function.FunctionKind;
 import io.trino.spi.function.FunctionProvider;
+import io.trino.spi.function.table.ArgumentSpecification;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ReturnTypeSpecification.DescribedTable;
+import io.trino.spi.function.table.TableArgumentSpecification;
 import io.trino.spi.procedure.Procedure;
-import io.trino.spi.ptf.ArgumentSpecification;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.ReturnTypeSpecification.DescribedTable;
-import io.trino.spi.ptf.TableArgumentSpecification;
+import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.split.RecordPageSourceProvider;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
@@ -62,6 +69,7 @@ public class ConnectorServices
 {
     private static final Logger log = Logger.get(ConnectorServices.class);
 
+    private final Tracer tracer;
     private final CatalogHandle catalogHandle;
     private final Connector connector;
     private final Runnable afterShutdown;
@@ -87,8 +95,9 @@ public class ConnectorServices
 
     private final AtomicBoolean shutdown = new AtomicBoolean();
 
-    public ConnectorServices(CatalogHandle catalogHandle, Connector connector, Runnable afterShutdown)
+    public ConnectorServices(Tracer tracer, CatalogHandle catalogHandle, Connector connector, Runnable afterShutdown)
     {
+        this.tracer = requireNonNull(tracer, "tracer is null");
         this.catalogHandle = requireNonNull(catalogHandle, "catalogHandle is null");
         this.connector = requireNonNull(connector, "connector is null");
         this.afterShutdown = requireNonNull(afterShutdown, "afterShutdown is null");
@@ -172,6 +181,7 @@ public ConnectorServices(CatalogHandle catalogHandle, Connector connector, Runna
         }
         catch (UnsupportedOperationException ignored) {
         }
+        verifyAccessControl(accessControl);
         this.accessControl = Optional.ofNullable(accessControl);
 
         Iterable<EventListener> eventListeners = connector.getEventListeners();
@@ -207,6 +217,11 @@ public ConnectorServices(CatalogHandle catalogHandle, Connector connector, Runna
         this.capabilities = capabilities;
     }
 
+    public Tracer getTracer()
+    {
+        return tracer;
+    }
+
     public CatalogHandle getCatalogHandle()
     {
         return catalogHandle;
@@ -366,4 +381,24 @@ private static void validateTableFunction(ConnectorTableFunction tableFunction)
             checkArgument(describedTable.getDescriptor().isTyped(), "field types missing in returned type specification");
         }
     }
+
+    private static void verifyAccessControl(ConnectorAccessControl accessControl)
+    {
+        if (accessControl != null) {
+            mustNotDeclareMethod(accessControl.getClass(), "checkCanExecuteFunction", ConnectorSecurityContext.class, FunctionKind.class, SchemaRoutineName.class);
+            mustNotDeclareMethod(accessControl.getClass(), "checkCanGrantExecuteFunctionPrivilege", ConnectorSecurityContext.class, FunctionKind.class, SchemaRoutineName.class, TrinoPrincipal.class, boolean.class);
+        }
+    }
+
+    private static void mustNotDeclareMethod(Class<?> clazz, String name, Class<?>... parameterTypes)
+    {
+        try {
+            clazz.getMethod(name, parameterTypes);
+            throw new IllegalArgumentException(format("Access control %s must not implement removed method %s(%s)",
+                    clazz.getName(),
+                    name, Arrays.stream(parameterTypes).map(Class::getName).collect(Collectors.joining(", "))));
+        }
+        catch (ReflectiveOperationException ignored) {
+        }
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/connector/CoordinatorDynamicCatalogManager.java b/core/trino-main/src/main/java/io/trino/connector/CoordinatorDynamicCatalogManager.java
index 6a3902f34e1d..68cef226315e 100644
--- a/core/trino-main/src/main/java/io/trino/connector/CoordinatorDynamicCatalogManager.java
+++ b/core/trino-main/src/main/java/io/trino/connector/CoordinatorDynamicCatalogManager.java
@@ -15,6 +15,9 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.Session;
 import io.trino.connector.system.GlobalSystemConnector;
@@ -24,11 +27,7 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.CatalogHandle.CatalogVersion;
-
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/core/trino-main/src/main/java/io/trino/connector/DefaultCatalogFactory.java b/core/trino-main/src/main/java/io/trino/connector/DefaultCatalogFactory.java
index 19d958f5a650..f544ef90e27a 100644
--- a/core/trino-main/src/main/java/io/trino/connector/DefaultCatalogFactory.java
+++ b/core/trino-main/src/main/java/io/trino/connector/DefaultCatalogFactory.java
@@ -13,7 +13,12 @@
  */
 package io.trino.connector;
 
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.node.NodeInfo;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.connector.informationschema.InformationSchemaConnector;
 import io.trino.connector.system.CoordinatorSystemTablesProvider;
 import io.trino.connector.system.StaticSystemTablesProvider;
@@ -34,12 +39,9 @@
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.spi.type.TypeManager;
+import io.trino.sql.planner.OptimizerConfig;
 import io.trino.transaction.TransactionManager;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -66,10 +68,12 @@ public class DefaultCatalogFactory
     private final PageIndexerFactory pageIndexerFactory;
     private final NodeInfo nodeInfo;
     private final VersionEmbedder versionEmbedder;
+    private final OpenTelemetry openTelemetry;
     private final TransactionManager transactionManager;
     private final TypeManager typeManager;
 
     private final boolean schedulerIncludeCoordinator;
+    private final int maxPrefetchedInformationSchemaPrefixes;
 
     private final ConcurrentMap<ConnectorName, InternalConnectorFactory> connectorFactories = new ConcurrentHashMap<>();
 
@@ -83,9 +87,11 @@ public DefaultCatalogFactory(
             PageIndexerFactory pageIndexerFactory,
             NodeInfo nodeInfo,
             VersionEmbedder versionEmbedder,
+            OpenTelemetry openTelemetry,
             TransactionManager transactionManager,
             TypeManager typeManager,
-            NodeSchedulerConfig nodeSchedulerConfig)
+            NodeSchedulerConfig nodeSchedulerConfig,
+            OptimizerConfig optimizerConfig)
     {
         this.metadata = requireNonNull(metadata, "metadata is null");
         this.accessControl = requireNonNull(accessControl, "accessControl is null");
@@ -95,9 +101,11 @@ public DefaultCatalogFactory(
         this.pageIndexerFactory = requireNonNull(pageIndexerFactory, "pageIndexerFactory is null");
         this.nodeInfo = requireNonNull(nodeInfo, "nodeInfo is null");
         this.versionEmbedder = requireNonNull(versionEmbedder, "versionEmbedder is null");
+        this.openTelemetry = requireNonNull(openTelemetry, "openTelemetry is null");
         this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         this.schedulerIncludeCoordinator = nodeSchedulerConfig.isIncludeCoordinator();
+        this.maxPrefetchedInformationSchemaPrefixes = optimizerConfig.getMaxPrefetchedInformationSchemaPrefixes();
     }
 
     @Override
@@ -121,18 +129,24 @@ public CatalogConnector createCatalog(CatalogProperties catalogProperties)
                 catalogProperties.getCatalogHandle(),
                 factory.getDuplicatePluginClassLoaderFactory(),
                 handleResolver);
-        Connector connector = createConnector(
-                catalogProperties.getCatalogHandle().getCatalogName(),
-                catalogProperties.getCatalogHandle(),
-                factory.getConnectorFactory(),
-                duplicatePluginClassLoaderFactory,
-                catalogProperties.getProperties());
-        return createCatalog(
-                catalogProperties.getCatalogHandle(),
-                catalogProperties.getConnectorName(),
-                connector,
-                duplicatePluginClassLoaderFactory::destroy,
-                Optional.of(catalogProperties));
+        try {
+            Connector connector = createConnector(
+                    catalogProperties.getCatalogHandle().getCatalogName(),
+                    catalogProperties.getCatalogHandle(),
+                    factory.getConnectorFactory(),
+                    duplicatePluginClassLoaderFactory,
+                    catalogProperties.getProperties());
+            return createCatalog(
+                    catalogProperties.getCatalogHandle(),
+                    catalogProperties.getConnectorName(),
+                    connector,
+                    duplicatePluginClassLoaderFactory::destroy,
+                    Optional.of(catalogProperties));
+        }
+        catch (Throwable e) {
+            duplicatePluginClassLoaderFactory.destroy();
+            throw e;
+        }
     }
 
     @Override
@@ -143,14 +157,18 @@ public CatalogConnector createCatalog(CatalogHandle catalogHandle, ConnectorName
 
     private CatalogConnector createCatalog(CatalogHandle catalogHandle, ConnectorName connectorName, Connector connector, Runnable destroy, Optional<CatalogProperties> catalogProperties)
     {
+        Tracer tracer = createTracer(catalogHandle);
+
         ConnectorServices catalogConnector = new ConnectorServices(
+                tracer,
                 catalogHandle,
                 connector,
                 destroy);
 
         ConnectorServices informationSchemaConnector = new ConnectorServices(
+                tracer,
                 createInformationSchemaCatalogHandle(catalogHandle),
-                new InformationSchemaConnector(catalogHandle.getCatalogName(), nodeManager, metadata, accessControl),
+                new InformationSchemaConnector(catalogHandle.getCatalogName(), nodeManager, metadata, accessControl, maxPrefetchedInformationSchemaPrefixes),
                 () -> {});
 
         SystemTablesProvider systemTablesProvider;
@@ -166,6 +184,7 @@ private CatalogConnector createCatalog(CatalogHandle catalogHandle, ConnectorNam
         }
 
         ConnectorServices systemConnector = new ConnectorServices(
+                tracer,
                 createSystemTablesCatalogHandle(catalogHandle),
                 new SystemConnector(
                         nodeManager,
@@ -191,6 +210,8 @@ private Connector createConnector(
     {
         ConnectorContext context = new ConnectorContextInstance(
                 catalogHandle,
+                openTelemetry,
+                createTracer(catalogHandle),
                 new ConnectorAwareNodeManager(nodeManager, nodeInfo.getEnvironment(), catalogHandle, schedulerIncludeCoordinator),
                 versionEmbedder,
                 typeManager,
@@ -204,6 +225,11 @@ private Connector createConnector(
         }
     }
 
+    private Tracer createTracer(CatalogHandle catalogHandle)
+    {
+        return openTelemetry.getTracer("trino.catalog." + catalogHandle.getCatalogName());
+    }
+
     private static class InternalConnectorFactory
     {
         private final ConnectorFactory connectorFactory;
diff --git a/core/trino-main/src/main/java/io/trino/connector/DynamicCatalogManagerModule.java b/core/trino-main/src/main/java/io/trino/connector/DynamicCatalogManagerModule.java
index 9b57ca393bca..92f0f1c1f769 100644
--- a/core/trino-main/src/main/java/io/trino/connector/DynamicCatalogManagerModule.java
+++ b/core/trino-main/src/main/java/io/trino/connector/DynamicCatalogManagerModule.java
@@ -14,14 +14,13 @@
 package io.trino.connector;
 
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Scopes;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.connector.system.GlobalSystemConnector;
 import io.trino.metadata.CatalogManager;
 import io.trino.server.ServerConfig;
 
-import javax.inject.Inject;
-
 import static io.airlift.configuration.ConfigBinder.configBinder;
 
 public class DynamicCatalogManagerModule
diff --git a/core/trino-main/src/main/java/io/trino/connector/FileCatalogStore.java b/core/trino-main/src/main/java/io/trino/connector/FileCatalogStore.java
index 1a06e65898d4..150cd44aa3cc 100644
--- a/core/trino-main/src/main/java/io/trino/connector/FileCatalogStore.java
+++ b/core/trino-main/src/main/java/io/trino/connector/FileCatalogStore.java
@@ -18,14 +18,13 @@
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.hash.Hasher;
 import com.google.common.hash.Hashing;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.connector.system.GlobalSystemConnector;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.CatalogHandle.CatalogVersion;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -49,6 +48,8 @@
 import static io.trino.spi.StandardErrorCode.CATALOG_STORE_ERROR;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.connector.CatalogHandle.createRootCatalogHandle;
+import static java.nio.file.Files.createDirectories;
+import static java.nio.file.Files.deleteIfExists;
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static java.util.Objects.requireNonNull;
 
@@ -66,7 +67,7 @@ public FileCatalogStore(FileCatalogStoreConfig config)
     {
         requireNonNull(config, "config is null");
         readOnly = config.isReadOnly();
-        catalogsDirectory = config.getCatalogConfigurationDir();
+        catalogsDirectory = config.getCatalogConfigurationDir().getAbsoluteFile();
         List<String> disabledCatalogs = firstNonNull(config.getDisabledCatalogs(), ImmutableList.of());
 
         for (File file : listCatalogFiles(catalogsDirectory)) {
@@ -108,6 +109,7 @@ public void addOrReplaceCatalog(CatalogProperties catalogProperties)
 
         try {
             File temporary = new File(file.getPath() + ".tmp");
+            createDirectories(temporary.getParentFile().toPath());
             try (FileOutputStream out = new FileOutputStream(temporary)) {
                 properties.store(out, null);
                 out.flush();
@@ -128,7 +130,12 @@ public void removeCatalog(String catalogName)
     {
         checkModifiable();
         catalogs.remove(catalogName);
-        toFile(catalogName).delete();
+        try {
+            deleteIfExists(toFile(catalogName).toPath());
+        }
+        catch (IOException e) {
+            log.warn(e, "Could not remove catalog properties for %s", catalogName);
+        }
     }
 
     private void checkModifiable()
diff --git a/core/trino-main/src/main/java/io/trino/connector/FileCatalogStoreConfig.java b/core/trino-main/src/main/java/io/trino/connector/FileCatalogStoreConfig.java
index bfdffda54294..79bfc2cb0ba0 100644
--- a/core/trino-main/src/main/java/io/trino/connector/FileCatalogStoreConfig.java
+++ b/core/trino-main/src/main/java/io/trino/connector/FileCatalogStoreConfig.java
@@ -17,8 +17,7 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.LegacyConfig;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/connector/StaticCatalogManager.java b/core/trino-main/src/main/java/io/trino/connector/StaticCatalogManager.java
index 4fc82ba34adf..3e0277002b0d 100644
--- a/core/trino-main/src/main/java/io/trino/connector/StaticCatalogManager.java
+++ b/core/trino-main/src/main/java/io/trino/connector/StaticCatalogManager.java
@@ -17,6 +17,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Files;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.Session;
 import io.trino.connector.system.GlobalSystemConnector;
@@ -26,10 +28,7 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.CatalogHandle.CatalogVersion;
-
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/core/trino-main/src/main/java/io/trino/connector/StaticCatalogManagerConfig.java b/core/trino-main/src/main/java/io/trino/connector/StaticCatalogManagerConfig.java
index 4969dff82e30..0484685aee15 100644
--- a/core/trino-main/src/main/java/io/trino/connector/StaticCatalogManagerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/connector/StaticCatalogManagerConfig.java
@@ -17,8 +17,7 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.LegacyConfig;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/connector/StaticCatalogManagerModule.java b/core/trino-main/src/main/java/io/trino/connector/StaticCatalogManagerModule.java
index 52755be568b3..7b487b37b56e 100644
--- a/core/trino-main/src/main/java/io/trino/connector/StaticCatalogManagerModule.java
+++ b/core/trino-main/src/main/java/io/trino/connector/StaticCatalogManagerModule.java
@@ -14,13 +14,12 @@
 package io.trino.connector;
 
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import com.google.inject.Scopes;
 import io.trino.connector.system.GlobalSystemConnector;
 import io.trino.metadata.CatalogManager;
 
-import javax.inject.Inject;
-
 import static io.airlift.configuration.ConfigBinder.configBinder;
 
 public class StaticCatalogManagerModule
diff --git a/core/trino-main/src/main/java/io/trino/connector/WorkerDynamicCatalogManager.java b/core/trino-main/src/main/java/io/trino/connector/WorkerDynamicCatalogManager.java
index 53286a8048dc..7403f3d2d14b 100644
--- a/core/trino-main/src/main/java/io/trino/connector/WorkerDynamicCatalogManager.java
+++ b/core/trino-main/src/main/java/io/trino/connector/WorkerDynamicCatalogManager.java
@@ -14,15 +14,14 @@
 package io.trino.connector;
 
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.Session;
 import io.trino.connector.system.GlobalSystemConnector;
 import io.trino.spi.connector.CatalogHandle;
-
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaConnector.java b/core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaConnector.java
index f1be534b57dc..a629b35e8c36 100644
--- a/core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaConnector.java
+++ b/core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaConnector.java
@@ -34,12 +34,12 @@ public class InformationSchemaConnector
     private final ConnectorSplitManager splitManager;
     private final ConnectorPageSourceProvider pageSourceProvider;
 
-    public InformationSchemaConnector(String catalogName, InternalNodeManager nodeManager, Metadata metadata, AccessControl accessControl)
+    public InformationSchemaConnector(String catalogName, InternalNodeManager nodeManager, Metadata metadata, AccessControl accessControl, int maxPrefetchedInformationSchemaPrefixes)
     {
         requireNonNull(catalogName, "catalogName is null");
         requireNonNull(metadata, "metadata is null");
 
-        this.metadata = new InformationSchemaMetadata(catalogName, metadata);
+        this.metadata = new InformationSchemaMetadata(catalogName, metadata, maxPrefetchedInformationSchemaPrefixes);
         this.splitManager = new InformationSchemaSplitManager(nodeManager);
         this.pageSourceProvider = new InformationSchemaPageSourceProvider(metadata, accessControl);
     }
diff --git a/core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaMetadata.java b/core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaMetadata.java
index 9f5d20352f4c..24e4ad501976 100644
--- a/core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaMetadata.java
+++ b/core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaMetadata.java
@@ -22,7 +22,6 @@
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.QualifiedTablePrefix;
-import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -64,7 +63,6 @@
 import static io.trino.connector.informationschema.InformationSchemaTable.TABLE_PRIVILEGES;
 import static io.trino.connector.informationschema.InformationSchemaTable.VIEWS;
 import static io.trino.metadata.MetadataUtil.findColumnMetadata;
-import static io.trino.spi.StandardErrorCode.TABLE_REDIRECTION_ERROR;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static java.util.Collections.emptyList;
 import static java.util.Locale.ENGLISH;
@@ -79,15 +77,16 @@ public class InformationSchemaMetadata
     private static final InformationSchemaColumnHandle TABLE_NAME_COLUMN_HANDLE = new InformationSchemaColumnHandle("table_name");
     private static final InformationSchemaColumnHandle ROLE_NAME_COLUMN_HANDLE = new InformationSchemaColumnHandle("role_name");
     private static final InformationSchemaColumnHandle GRANTEE_COLUMN_HANDLE = new InformationSchemaColumnHandle("grantee");
-    private static final int MAX_PREFIXES_COUNT = 100;
 
     private final String catalogName;
     private final Metadata metadata;
+    private final int maxPrefetchedInformationSchemaPrefixes;
 
-    public InformationSchemaMetadata(String catalogName, Metadata metadata)
+    public InformationSchemaMetadata(String catalogName, Metadata metadata, int maxPrefetchedInformationSchemaPrefixes)
     {
         this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.metadata = requireNonNull(metadata, "metadata is null");
+        this.maxPrefetchedInformationSchemaPrefixes = maxPrefetchedInformationSchemaPrefixes;
     }
 
     @Override
@@ -164,7 +163,6 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
                 tableHandle.getPrefixes().isEmpty() ? TupleDomain.none() : TupleDomain.all(),
                 Optional.empty(),
                 Optional.empty(),
-                Optional.empty(),
                 emptyList());
     }
 
@@ -218,18 +216,10 @@ private Set<QualifiedTablePrefix> getPrefixes(ConnectorSession session, Informat
         }
 
         InformationSchemaTable informationSchemaTable = table.getTable();
-        Set<QualifiedTablePrefix> prefixes = calculatePrefixesWithSchemaName(session, constraint.getSummary(), constraint.predicate());
-        Set<QualifiedTablePrefix> tablePrefixes = calculatePrefixesWithTableName(informationSchemaTable, session, prefixes, constraint.getSummary(), constraint.predicate());
-
-        if (tablePrefixes.size() <= MAX_PREFIXES_COUNT) {
-            prefixes = tablePrefixes;
-        }
-        if (prefixes.size() > MAX_PREFIXES_COUNT) {
-            // in case of high number of prefixes it is better to populate all data and then filter
-            prefixes = defaultPrefixes(catalogName);
-        }
-
-        return prefixes;
+        Set<QualifiedTablePrefix> schemaPrefixes = calculatePrefixesWithSchemaName(session, constraint.getSummary(), constraint.predicate());
+        Set<QualifiedTablePrefix> tablePrefixes = calculatePrefixesWithTableName(informationSchemaTable, session, schemaPrefixes, constraint.getSummary(), constraint.predicate());
+        verify(tablePrefixes.size() <= maxPrefetchedInformationSchemaPrefixes, "calculatePrefixesWithTableName returned too many prefixes: %s", tablePrefixes.size());
+        return tablePrefixes;
     }
 
     public static boolean isTablesEnumeratingTable(InformationSchemaTable table)
@@ -244,11 +234,15 @@ private Set<QualifiedTablePrefix> calculatePrefixesWithSchemaName(
     {
         Optional<Set<String>> schemas = filterString(constraint, SCHEMA_COLUMN_HANDLE);
         if (schemas.isPresent()) {
-            return schemas.get().stream()
+            Set<QualifiedTablePrefix> schemasFromPredicate = schemas.get().stream()
                     .filter(this::isLowerCase)
                     .filter(schema -> predicate.isEmpty() || predicate.get().test(schemaAsFixedValues(schema)))
                     .map(schema -> new QualifiedTablePrefix(catalogName, schema))
                     .collect(toImmutableSet());
+            if (schemasFromPredicate.size() > maxPrefetchedInformationSchemaPrefixes) {
+                return ImmutableSet.of(new QualifiedTablePrefix(catalogName));
+            }
+            return schemasFromPredicate;
         }
 
         if (predicate.isEmpty()) {
@@ -256,9 +250,15 @@ private Set<QualifiedTablePrefix> calculatePrefixesWithSchemaName(
         }
 
         Session session = ((FullConnectorSession) connectorSession).getSession();
-        return listSchemaNames(session)
+        Set<QualifiedTablePrefix> schemaPrefixes = listSchemaNames(session)
                 .filter(prefix -> predicate.get().test(schemaAsFixedValues(prefix.getSchemaName().get())))
                 .collect(toImmutableSet());
+        if (schemaPrefixes.size() > maxPrefetchedInformationSchemaPrefixes) {
+            // in case of high number of prefixes it is better to populate all data and then filter
+            // TODO this may cause re-running the above filtering upon next applyFilter
+            return defaultPrefixes(catalogName);
+        }
+        return schemaPrefixes;
     }
 
     private Set<QualifiedTablePrefix> calculatePrefixesWithTableName(
@@ -272,7 +272,7 @@ private Set<QualifiedTablePrefix> calculatePrefixesWithTableName(
 
         Optional<Set<String>> tables = filterString(constraint, TABLE_NAME_COLUMN_HANDLE);
         if (tables.isPresent()) {
-            return prefixes.stream()
+            Set<QualifiedTablePrefix> tablePrefixes = prefixes.stream()
                     .peek(prefix -> verify(prefix.asQualifiedObjectName().isEmpty()))
                     .flatMap(prefix -> prefix.getSchemaName()
                             .map(schemaName -> Stream.of(prefix))
@@ -280,56 +280,37 @@ private Set<QualifiedTablePrefix> calculatePrefixesWithTableName(
                     .flatMap(prefix -> tables.get().stream()
                             .filter(this::isLowerCase)
                             .map(table -> new QualifiedObjectName(catalogName, prefix.getSchemaName().get(), table)))
-                    .filter(objectName -> {
-                        if (!isColumnsEnumeratingTable(informationSchemaTable) ||
-                                metadata.isMaterializedView(session, objectName) ||
-                                metadata.isView(session, objectName)) {
-                            return true;
-                        }
-
-                        // This is a columns enumerating table and the object is not a view
-                        try {
-                            // Table redirection to enumerate columns from target table happens later in
-                            // MetadataListing#listTableColumns, but also applying it here to avoid incorrect
-                            // filtering in case the source table does not exist or there is a problem with redirection.
-                            return metadata.getRedirectionAwareTableHandle(session, objectName).getTableHandle().isPresent();
-                        }
-                        catch (TrinoException e) {
-                            if (e.getErrorCode().equals(TABLE_REDIRECTION_ERROR.toErrorCode())) {
-                                // Ignore redirection errors for listing, treat as if the table does not exist
-                                return false;
-                            }
-
-                            throw e;
-                        }
-                    })
                     .filter(objectName -> predicate.isEmpty() || predicate.get().test(asFixedValues(objectName)))
                     .map(QualifiedObjectName::asQualifiedTablePrefix)
-                    // In method #getPrefixes, if the prefix set returned by this method has size larger than MAX_PREFIXES_COUNT,
-                    // we will overwrite it with #defaultPrefixes. Limiting the stream at MAX_PREFIXES_COUNT + 1 elements helps
-                    // skip unnecessary computation because we know the resulting set will be discarded when more than MAX_PREFIXES_COUNT
-                    // elements are present. Since there may be duplicate prefixes, a distinct operator is applied to the stream,
-                    // otherwise the stream may be truncated incorrectly.
                     .distinct()
-                    .limit(MAX_PREFIXES_COUNT + 1)
+                    .limit(maxPrefetchedInformationSchemaPrefixes + 1)
                     .collect(toImmutableSet());
+
+            if (tablePrefixes.size() > maxPrefetchedInformationSchemaPrefixes) {
+                // in case of high number of prefixes it is better to populate all data and then filter
+                // TODO this may cause re-running the above filtering upon next applyFilter
+                return defaultPrefixes(catalogName);
+            }
+            return tablePrefixes;
         }
 
         if (predicate.isEmpty() || !isColumnsEnumeratingTable(informationSchemaTable)) {
             return prefixes;
         }
 
-        return prefixes.stream()
-                .flatMap(prefix -> Stream.concat(
-                        metadata.listTables(session, prefix).stream(),
-                        metadata.listViews(session, prefix).stream()))
+        Set<QualifiedTablePrefix> tablePrefixes = prefixes.stream()
+                .flatMap(prefix -> metadata.listTables(session, prefix).stream())
                 .filter(objectName -> predicate.get().test(asFixedValues(objectName)))
                 .map(QualifiedObjectName::asQualifiedTablePrefix)
-                // Same as the prefixes computed above; we use the distinct operator and limit the stream to MAX_PREFIXES_COUNT + 1
-                // elements to skip unnecessary computation.
                 .distinct()
-                .limit(MAX_PREFIXES_COUNT + 1)
+                .limit(maxPrefetchedInformationSchemaPrefixes + 1)
                 .collect(toImmutableSet());
+        if (tablePrefixes.size() > maxPrefetchedInformationSchemaPrefixes) {
+            // in case of high number of prefixes it is better to populate all data and then filter
+            // TODO this may cause re-running the above filtering upon next applyFilter
+            return defaultPrefixes(catalogName);
+        }
+        return tablePrefixes;
     }
 
     private boolean isColumnsEnumeratingTable(InformationSchemaTable table)
diff --git a/core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaPageSource.java b/core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaPageSource.java
index 29998ce48fad..8802461a2c86 100644
--- a/core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaPageSource.java
+++ b/core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaPageSource.java
@@ -73,6 +73,7 @@ public class InformationSchemaPageSource
 
     private final String catalogName;
     private final InformationSchemaTable table;
+    private final Set<String> requiredColumns;
     private final Supplier<Iterator<QualifiedTablePrefix>> prefixIterator;
     private final OptionalLong limit;
 
@@ -99,6 +100,11 @@ public InformationSchemaPageSource(
         requireNonNull(tableHandle, "tableHandle is null");
         requireNonNull(columns, "columns is null");
 
+        requiredColumns = columns.stream()
+                .map(columnHandle -> (InformationSchemaColumnHandle) columnHandle)
+                .map(InformationSchemaColumnHandle::getColumnName)
+                .collect(toImmutableSet());
+
         catalogName = tableHandle.getCatalogName();
         table = tableHandle.getTable();
         prefixIterator = Suppliers.memoize(() -> {
@@ -271,12 +277,20 @@ private void addColumnsRecords(QualifiedTablePrefix prefix)
     private void addTablesRecords(QualifiedTablePrefix prefix)
     {
         Set<SchemaTableName> tables = listTables(session, metadata, accessControl, prefix);
-        Set<SchemaTableName> views = listViews(session, metadata, accessControl, prefix);
+        boolean needsTableType = requiredColumns.contains("table_type");
+        Set<SchemaTableName> views = Set.of();
+        if (needsTableType) {
+            // TODO introduce a dedicated method for getting relations with their type from the connector, instead of calling (potentially much more expensive) getViews
+            views = listViews(session, metadata, accessControl, prefix);
+        }
         // TODO (https://github.com/trinodb/trino/issues/8207) define a type for materialized views
 
         for (SchemaTableName name : union(tables, views)) {
-            // if table and view names overlap, the view wins
-            String type = views.contains(name) ? "VIEW" : "BASE TABLE";
+            String type = null;
+            if (needsTableType) {
+                // if table and view names overlap, the view wins
+                type = views.contains(name) ? "VIEW" : "BASE TABLE";
+            }
             addRecord(
                     prefix.getCatalogName(),
                     name.getSchemaName(),
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/AnalyzePropertiesSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/AnalyzePropertiesSystemTable.java
index f4a6531e5410..6e41b269f189 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/AnalyzePropertiesSystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/AnalyzePropertiesSystemTable.java
@@ -13,12 +13,11 @@
  */
 package io.trino.connector.system;
 
+import com.google.inject.Inject;
 import io.trino.metadata.AnalyzePropertyManager;
 import io.trino.metadata.Metadata;
 import io.trino.security.AccessControl;
 
-import javax.inject.Inject;
-
 public class AnalyzePropertiesSystemTable
         extends AbstractPropertiesSystemTable
 {
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/CatalogSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/CatalogSystemTable.java
index 79f7a4337b0c..77406f8fbf47 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/CatalogSystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/CatalogSystemTable.java
@@ -13,6 +13,7 @@
  */
 package io.trino.connector.system;
 
+import com.google.inject.Inject;
 import io.trino.FullConnectorSession;
 import io.trino.Session;
 import io.trino.metadata.CatalogInfo;
@@ -28,8 +29,6 @@
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import static io.trino.metadata.MetadataListing.listCatalogs;
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
 import static io.trino.spi.connector.SystemTable.Distribution.SINGLE_COORDINATOR;
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/ColumnPropertiesSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/ColumnPropertiesSystemTable.java
index fe2c616d2ec7..e8fdcdaed551 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/ColumnPropertiesSystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/ColumnPropertiesSystemTable.java
@@ -13,12 +13,11 @@
  */
 package io.trino.connector.system;
 
+import com.google.inject.Inject;
 import io.trino.metadata.ColumnPropertyManager;
 import io.trino.metadata.Metadata;
 import io.trino.security.AccessControl;
 
-import javax.inject.Inject;
-
 public class ColumnPropertiesSystemTable
         extends AbstractPropertiesSystemTable
 {
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/GlobalSystemConnector.java b/core/trino-main/src/main/java/io/trino/connector/system/GlobalSystemConnector.java
index 047dcff8c139..3912bbe262c9 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/GlobalSystemConnector.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/GlobalSystemConnector.java
@@ -14,22 +14,26 @@
 package io.trino.connector.system;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import io.trino.operator.table.Sequence.SequenceFunctionHandle;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.CatalogHandle.CatalogVersion;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorSplitManager;
+import io.trino.spi.connector.ConnectorSplitSource;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.SystemTable;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.procedure.Procedure;
-import io.trino.spi.ptf.ConnectorTableFunction;
 import io.trino.spi.transaction.IsolationLevel;
 import io.trino.transaction.InternalConnector;
 import io.trino.transaction.TransactionId;
 
-import javax.inject.Inject;
-
 import java.util.Set;
 
+import static io.trino.operator.table.Sequence.getSequenceFunctionSplitSource;
 import static io.trino.spi.connector.CatalogHandle.createRootCatalogHandle;
 import static java.util.Objects.requireNonNull;
 
@@ -80,4 +84,21 @@ public Set<ConnectorTableFunction> getTableFunctions()
     {
         return tableFunctions;
     }
+
+    @Override
+    public ConnectorSplitManager getSplitManager()
+    {
+        return new ConnectorSplitManager()
+        {
+            @Override
+            public ConnectorSplitSource getSplits(ConnectorTransactionHandle transaction, ConnectorSession session, ConnectorTableFunctionHandle functionHandle)
+            {
+                if (functionHandle instanceof SequenceFunctionHandle sequenceFunctionHandle) {
+                    return getSequenceFunctionSplitSource(sequenceFunctionHandle);
+                }
+
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/KillQueryProcedure.java b/core/trino-main/src/main/java/io/trino/connector/system/KillQueryProcedure.java
index 5cf8ed468232..c65bd5f4ea53 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/KillQueryProcedure.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/KillQueryProcedure.java
@@ -14,6 +14,8 @@
 package io.trino.connector.system;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.trino.FullConnectorSession;
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.dispatcher.DispatchManager;
@@ -25,8 +27,6 @@
 import io.trino.spi.procedure.Procedure;
 import io.trino.spi.procedure.Procedure.Argument;
 
-import javax.inject.Inject;
-
 import java.lang.invoke.MethodHandle;
 import java.util.NoSuchElementException;
 import java.util.Optional;
@@ -45,6 +45,7 @@
 import static java.util.Objects.requireNonNull;
 
 public class KillQueryProcedure
+        implements Provider<Procedure>
 {
     private static final MethodHandle KILL_QUERY = methodHandle(KillQueryProcedure.class, "killQuery", String.class, String.class, ConnectorSession.class);
 
@@ -89,7 +90,8 @@ public void killQuery(String queryId, String message, ConnectorSession session)
         }
     }
 
-    public Procedure getProcedure()
+    @Override
+    public Procedure get()
     {
         return new Procedure(
                 "runtime",
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/MaterializedViewPropertiesSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/MaterializedViewPropertiesSystemTable.java
index 21cda74d7a17..7378ae5b7f4a 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/MaterializedViewPropertiesSystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/MaterializedViewPropertiesSystemTable.java
@@ -13,12 +13,11 @@
  */
 package io.trino.connector.system;
 
+import com.google.inject.Inject;
 import io.trino.metadata.MaterializedViewPropertyManager;
 import io.trino.metadata.Metadata;
 import io.trino.security.AccessControl;
 
-import javax.inject.Inject;
-
 public class MaterializedViewPropertiesSystemTable
         extends AbstractPropertiesSystemTable
 {
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/MaterializedViewSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/MaterializedViewSystemTable.java
index b466af10b9aa..8af514cbaa46 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/MaterializedViewSystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/MaterializedViewSystemTable.java
@@ -13,6 +13,8 @@
  */
 package io.trino.connector.system;
 
+import com.google.inject.Inject;
+import io.airlift.slice.Slice;
 import io.trino.FullConnectorSession;
 import io.trino.Session;
 import io.trino.metadata.Metadata;
@@ -30,13 +32,17 @@
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SystemTable;
+import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.LongTimestampWithTimeZone;
 
-import javax.inject.Inject;
-
+import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.Set;
 
+import static com.google.common.collect.MoreCollectors.onlyElement;
+import static com.google.common.collect.Streams.mapWithIndex;
+import static io.trino.connector.system.jdbc.FilterUtil.isImpossibleObjectName;
 import static io.trino.connector.system.jdbc.FilterUtil.tablePrefix;
 import static io.trino.connector.system.jdbc.FilterUtil.tryGetSingleVarcharValue;
 import static io.trino.metadata.MetadataListing.getMaterializedViews;
@@ -46,7 +52,10 @@
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
 import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_NANOSECOND;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static java.lang.Math.toIntExact;
+import static java.util.Map.entry;
 import static java.util.Objects.requireNonNull;
 
 public class MaterializedViewSystemTable
@@ -92,41 +101,67 @@ public ConnectorTableMetadata getTableMetadata()
     public RecordCursor cursor(
             ConnectorTransactionHandle transactionHandle,
             ConnectorSession connectorSession,
-            TupleDomain<Integer> constraint)
+            TupleDomain<Integer> constraint,
+            Set<Integer> requiredColumns)
     {
         Session session = ((FullConnectorSession) connectorSession).getSession();
         InMemoryRecordSet.Builder displayTable = InMemoryRecordSet.builder(getTableMetadata());
 
-        Optional<String> catalogFilter = tryGetSingleVarcharValue(constraint, 0);
-        Optional<String> schemaFilter = tryGetSingleVarcharValue(constraint, 1);
-        Optional<String> tableFilter = tryGetSingleVarcharValue(constraint, 2);
+        Domain catalogDomain = constraint.getDomain(0, VARCHAR);
+        Domain schemaDomain = constraint.getDomain(1, VARCHAR);
+        Domain tableDomain = constraint.getDomain(2, VARCHAR);
+
+        if (isImpossibleObjectName(catalogDomain) || isImpossibleObjectName(schemaDomain) || isImpossibleObjectName(tableDomain)) {
+            return displayTable.build().cursor();
+        }
+
+        Optional<String> tableFilter = tryGetSingleVarcharValue(tableDomain);
+        boolean needFreshness = requiredColumns.contains(columnIndex("freshness")) || requiredColumns.contains(columnIndex("last_fresh_time"));
+
+        listCatalogNames(session, metadata, accessControl, catalogDomain).forEach(catalogName -> {
+            // TODO A connector may be able to pull information from multiple schemas at once, so pass the schema filter to the connector instead.
+            // TODO Support LIKE predicates on schema name (or any other functional predicates), so pass the schema filter as Constraint-like to the connector.
+            if (schemaDomain.isNullableDiscreteSet()) {
+                for (Object slice : schemaDomain.getNullableDiscreteSet().getNonNullValues()) {
+                    String schemaName = ((Slice) slice).toStringUtf8();
+                    if (isImpossibleObjectName(schemaName)) {
+                        continue;
+                    }
+                    addMaterializedViewForCatalog(session, displayTable, tablePrefix(catalogName, Optional.of(schemaName), tableFilter), needFreshness);
+                }
+            }
+            else {
+                addMaterializedViewForCatalog(session, displayTable, tablePrefix(catalogName, Optional.empty(), tableFilter), needFreshness);
+            }
+        });
 
-        listCatalogNames(session, metadata, accessControl, catalogFilter).forEach(catalogName -> {
-            QualifiedTablePrefix tablePrefix = tablePrefix(catalogName, schemaFilter, tableFilter);
+        return displayTable.build().cursor();
+    }
 
-            getMaterializedViews(session, metadata, accessControl, tablePrefix).forEach((tableName, definition) -> {
-                QualifiedObjectName name = new QualifiedObjectName(tablePrefix.getCatalogName(), tableName.getSchemaName(), tableName.getTableName());
-                MaterializedViewFreshness freshness;
+    private void addMaterializedViewForCatalog(Session session, InMemoryRecordSet.Builder displayTable, QualifiedTablePrefix tablePrefix, boolean needFreshness)
+    {
+        getMaterializedViews(session, metadata, accessControl, tablePrefix).forEach((tableName, definition) -> {
+            QualifiedObjectName name = new QualifiedObjectName(tablePrefix.getCatalogName(), tableName.getSchemaName(), tableName.getTableName());
+            Optional<MaterializedViewFreshness> freshness = Optional.empty();
 
+            if (needFreshness) {
                 try {
-                    freshness = metadata.getMaterializedViewFreshness(session, name);
+                    freshness = Optional.of(metadata.getMaterializedViewFreshness(session, name));
                 }
                 catch (MaterializedViewNotFoundException e) {
                     // Ignore materialized view that was dropped during query execution (race condition)
                     return;
                 }
+            }
 
-                Object[] materializedViewRow = createMaterializedViewRow(name, freshness, definition);
-                displayTable.addRow(materializedViewRow);
-            });
+            Object[] materializedViewRow = createMaterializedViewRow(name, freshness, definition);
+            displayTable.addRow(materializedViewRow);
         });
-
-        return displayTable.build().cursor();
     }
 
     private static Object[] createMaterializedViewRow(
             QualifiedObjectName name,
-            MaterializedViewFreshness freshness,
+            Optional<MaterializedViewFreshness> freshness,
             ViewInfo definition)
     {
         return new Object[] {
@@ -143,9 +178,11 @@ private static Object[] createMaterializedViewRow(
                         .map(storageTable -> storageTable.getSchemaTableName().getTableName())
                         .orElse(""),
                 // freshness
-                freshness.getFreshness().name(),
+                freshness.map(MaterializedViewFreshness::getFreshness)
+                        .map(Enum::name)
+                        .orElse(null),
                 // last_fresh_time
-                freshness.getLastFreshTime()
+                freshness.flatMap(MaterializedViewFreshness::getLastFreshTime)
                         .map(instant -> LongTimestampWithTimeZone.fromEpochSecondsAndFraction(
                                 instant.getEpochSecond(),
                                 (long) instant.getNano() * PICOSECONDS_PER_NANOSECOND,
@@ -155,4 +192,12 @@ private static Object[] createMaterializedViewRow(
                 definition.getOriginalSql()
         };
     }
+
+    private static int columnIndex(String columnName)
+    {
+        return toIntExact(mapWithIndex(TABLE_DEFINITION.getColumns().stream(), (column, index) -> entry(column.getName(), index))
+                .filter(entry -> entry.getKey().equals(columnName))
+                .map(Entry::getValue)
+                .collect(onlyElement()));
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/NodeSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/NodeSystemTable.java
index ac4892dc75a6..174635c44c50 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/NodeSystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/NodeSystemTable.java
@@ -13,6 +13,7 @@
  */
 package io.trino.connector.system;
 
+import com.google.inject.Inject;
 import io.trino.metadata.AllNodes;
 import io.trino.metadata.InternalNode;
 import io.trino.metadata.InternalNodeManager;
@@ -27,8 +28,6 @@
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import java.util.Locale;
 import java.util.Set;
 
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/QuerySystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/QuerySystemTable.java
index 696f9d0fa9b1..4a08b847d61d 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/QuerySystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/QuerySystemTable.java
@@ -13,6 +13,7 @@
  */
 package io.trino.connector.system;
 
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
 import io.trino.FullConnectorSession;
 import io.trino.dispatcher.DispatchManager;
@@ -36,8 +37,6 @@
 import io.trino.spi.type.ArrayType;
 import org.joda.time.DateTime;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/RuleStatsSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/RuleStatsSystemTable.java
index 3051dd6e71ea..92c5a5e99e97 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/RuleStatsSystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/RuleStatsSystemTable.java
@@ -14,9 +14,11 @@
 package io.trino.connector.system;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorSession;
@@ -30,8 +32,6 @@
 import io.trino.sql.planner.RuleStatsRecorder;
 import io.trino.sql.planner.iterative.RuleStats;
 
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.Optional;
 
@@ -99,12 +99,13 @@ public ConnectorPageSource pageSource(ConnectorTransactionHandle transactionHand
             BIGINT.writeLong(blockBuilders.get("failures"), stats.getFailures());
             DOUBLE.writeDouble(blockBuilders.get("average_time"), stats.getTime().getAvg());
 
-            BlockBuilder mapWriter = blockBuilders.get("time_distribution_percentiles").beginBlockEntry();
-            for (Map.Entry<Double, Double> percentile : stats.getTime().getPercentiles().entrySet()) {
-                DOUBLE.writeDouble(mapWriter, percentile.getKey());
-                DOUBLE.writeDouble(mapWriter, percentile.getValue());
-            }
-            blockBuilders.get("time_distribution_percentiles").closeEntry();
+            MapBlockBuilder blockBuilder = (MapBlockBuilder) blockBuilders.get("time_distribution_percentiles");
+            blockBuilder.buildEntry((keyBuilder, valueBuilder) -> {
+                stats.getTime().getPercentiles().forEach((key, value) -> {
+                    DOUBLE.writeDouble(keyBuilder, key);
+                    DOUBLE.writeDouble(valueBuilder, value);
+                });
+            });
         }
 
         Block[] blocks = ruleStatsTable.getColumns().stream()
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/SchemaPropertiesSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/SchemaPropertiesSystemTable.java
index ce705000e66e..6c98b94ea944 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/SchemaPropertiesSystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/SchemaPropertiesSystemTable.java
@@ -13,12 +13,11 @@
  */
 package io.trino.connector.system;
 
+import com.google.inject.Inject;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.SchemaPropertyManager;
 import io.trino.security.AccessControl;
 
-import javax.inject.Inject;
-
 public class SchemaPropertiesSystemTable
         extends AbstractPropertiesSystemTable
 {
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/SystemConnector.java b/core/trino-main/src/main/java/io/trino/connector/system/SystemConnector.java
index 41018abbbbe2..1871c8f4717b 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/SystemConnector.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/SystemConnector.java
@@ -19,12 +19,10 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.connector.SystemTable;
 import io.trino.spi.transaction.IsolationLevel;
 import io.trino.transaction.InternalConnector;
 import io.trino.transaction.TransactionId;
 
-import java.util.Set;
 import java.util.function.Function;
 
 import static java.util.Objects.requireNonNull;
@@ -37,14 +35,6 @@ public class SystemConnector
     private final ConnectorPageSourceProvider pageSourceProvider;
     private final Function<TransactionId, ConnectorTransactionHandle> transactionHandleFunction;
 
-    public SystemConnector(
-            InternalNodeManager nodeManager,
-            Set<SystemTable> tables,
-            Function<TransactionId, ConnectorTransactionHandle> transactionHandleFunction)
-    {
-        this(nodeManager, new StaticSystemTablesProvider(tables), transactionHandleFunction);
-    }
-
     public SystemConnector(
             InternalNodeManager nodeManager,
             SystemTablesProvider tables,
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/SystemConnectorModule.java b/core/trino-main/src/main/java/io/trino/connector/system/SystemConnectorModule.java
index 8693413f279b..306fb4347c39 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/SystemConnectorModule.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/SystemConnectorModule.java
@@ -17,7 +17,6 @@
 import com.google.inject.Module;
 import com.google.inject.Scopes;
 import com.google.inject.multibindings.Multibinder;
-import com.google.inject.multibindings.ProvidesIntoSet;
 import io.trino.connector.system.jdbc.AttributeJdbcTable;
 import io.trino.connector.system.jdbc.CatalogJdbcTable;
 import io.trino.connector.system.jdbc.ColumnJdbcTable;
@@ -32,11 +31,10 @@
 import io.trino.connector.system.jdbc.TypesJdbcTable;
 import io.trino.connector.system.jdbc.UdtJdbcTable;
 import io.trino.operator.table.ExcludeColumns;
+import io.trino.operator.table.Sequence;
 import io.trino.spi.connector.SystemTable;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.procedure.Procedure;
-import io.trino.spi.ptf.ConnectorTableFunction;
-
-import static com.google.inject.multibindings.Multibinder.newSetBinder;
 
 public class SystemConnectorModule
         implements Module
@@ -73,18 +71,15 @@ public void configure(Binder binder)
         globalTableBinder.addBinding().to(TableTypeJdbcTable.class).in(Scopes.SINGLETON);
         globalTableBinder.addBinding().to(UdtJdbcTable.class).in(Scopes.SINGLETON);
 
-        Multibinder.newSetBinder(binder, Procedure.class);
+        Multibinder<Procedure> procedures = Multibinder.newSetBinder(binder, Procedure.class);
+        procedures.addBinding().toProvider(KillQueryProcedure.class).in(Scopes.SINGLETON);
 
         binder.bind(KillQueryProcedure.class).in(Scopes.SINGLETON);
 
         binder.bind(GlobalSystemConnector.class).in(Scopes.SINGLETON);
 
-        newSetBinder(binder, ConnectorTableFunction.class).addBinding().toProvider(ExcludeColumns.class).in(Scopes.SINGLETON);
-    }
-
-    @ProvidesIntoSet
-    public static Procedure getKillQueryProcedure(KillQueryProcedure procedure)
-    {
-        return procedure.getProcedure();
+        Multibinder<ConnectorTableFunction> tableFunctions = Multibinder.newSetBinder(binder, ConnectorTableFunction.class);
+        tableFunctions.addBinding().toProvider(ExcludeColumns.class).in(Scopes.SINGLETON);
+        tableFunctions.addBinding().toProvider(Sequence.class).in(Scopes.SINGLETON);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/SystemPageSourceProvider.java b/core/trino-main/src/main/java/io/trino/connector/system/SystemPageSourceProvider.java
index 952f8486e8ad..66816f39bfe4 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/SystemPageSourceProvider.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/SystemPageSourceProvider.java
@@ -14,6 +14,7 @@
 package io.trino.connector.system;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import io.trino.plugin.base.MappedPageSource;
 import io.trino.plugin.base.MappedRecordSet;
 import io.trino.spi.TrinoException;
@@ -38,6 +39,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
@@ -83,6 +85,7 @@ public ConnectorPageSource createPageSource(
         }
 
         ImmutableList.Builder<Integer> userToSystemFieldIndex = ImmutableList.builder();
+        ImmutableSet.Builder<Integer> requiredColumns = ImmutableSet.builder();
         for (ColumnHandle column : columns) {
             String columnName = ((SystemColumnHandle) column).getColumnName();
 
@@ -92,6 +95,7 @@ public ConnectorPageSource createPageSource(
             }
 
             userToSystemFieldIndex.add(index);
+            requiredColumns.add(index);
         }
 
         TupleDomain<ColumnHandle> constraint = systemSplit.getConstraint();
@@ -105,11 +109,18 @@ public ConnectorPageSource createPageSource(
             return new MappedPageSource(systemTable.pageSource(systemTransaction.getConnectorTransactionHandle(), session, newConstraint), userToSystemFieldIndex.build());
         }
         catch (UnsupportedOperationException e) {
-            return new RecordPageSource(new MappedRecordSet(toRecordSet(systemTransaction.getConnectorTransactionHandle(), systemTable, session, newConstraint), userToSystemFieldIndex.build()));
+            return new RecordPageSource(new MappedRecordSet(
+                    toRecordSet(
+                            systemTransaction.getConnectorTransactionHandle(),
+                            systemTable,
+                            session,
+                            newConstraint,
+                            requiredColumns.build()),
+                    userToSystemFieldIndex.build()));
         }
     }
 
-    private static RecordSet toRecordSet(ConnectorTransactionHandle sourceTransaction, SystemTable table, ConnectorSession session, TupleDomain<Integer> constraint)
+    private static RecordSet toRecordSet(ConnectorTransactionHandle sourceTransaction, SystemTable table, ConnectorSession session, TupleDomain<Integer> constraint, Set<Integer> requiredColumns)
     {
         return new RecordSet()
         {
@@ -126,7 +137,7 @@ public List<Type> getColumnTypes()
             @Override
             public RecordCursor cursor()
             {
-                return table.cursor(sourceTransaction, session, constraint);
+                return table.cursor(sourceTransaction, session, constraint, requiredColumns);
             }
         };
     }
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/TableCommentSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/TableCommentSystemTable.java
index 81537e945533..828d7feb44b4 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/TableCommentSystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/TableCommentSystemTable.java
@@ -13,42 +13,45 @@
  */
 package io.trino.connector.system;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
+import io.airlift.slice.Slice;
 import io.trino.FullConnectorSession;
 import io.trino.Session;
+import io.trino.metadata.MaterializedViewDefinition;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.QualifiedTablePrefix;
-import io.trino.metadata.ViewInfo;
+import io.trino.metadata.RedirectionAwareTableHandle;
+import io.trino.metadata.ViewDefinition;
 import io.trino.security.AccessControl;
-import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.InMemoryRecordSet;
 import io.trino.spi.connector.InMemoryRecordSet.Builder;
 import io.trino.spi.connector.RecordCursor;
+import io.trino.spi.connector.RelationCommentMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SystemTable;
+import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
-import java.util.Map;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 
-import static com.google.common.collect.Sets.union;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static io.trino.connector.system.jdbc.FilterUtil.isImpossibleObjectName;
 import static io.trino.connector.system.jdbc.FilterUtil.tablePrefix;
 import static io.trino.connector.system.jdbc.FilterUtil.tryGetSingleVarcharValue;
-import static io.trino.metadata.MetadataListing.getMaterializedViews;
-import static io.trino.metadata.MetadataListing.getViews;
 import static io.trino.metadata.MetadataListing.listCatalogNames;
-import static io.trino.metadata.MetadataListing.listTables;
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
 import static io.trino.spi.connector.SystemTable.Distribution.SINGLE_COORDINATOR;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static java.util.Objects.requireNonNull;
 
@@ -91,70 +94,138 @@ public ConnectorTableMetadata getTableMetadata()
     @Override
     public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, ConnectorSession connectorSession, TupleDomain<Integer> constraint)
     {
-        Optional<String> catalogFilter = tryGetSingleVarcharValue(constraint, 0);
-        Optional<String> schemaFilter = tryGetSingleVarcharValue(constraint, 1);
-        Optional<String> tableFilter = tryGetSingleVarcharValue(constraint, 2);
+        Builder table = InMemoryRecordSet.builder(COMMENT_TABLE);
+
+        Domain catalogDomain = constraint.getDomain(0, VARCHAR);
+        Domain schemaDomain = constraint.getDomain(1, VARCHAR);
+        Domain tableDomain = constraint.getDomain(2, VARCHAR);
+
+        if (isImpossibleObjectName(catalogDomain) || isImpossibleObjectName(schemaDomain) || isImpossibleObjectName(tableDomain)) {
+            return table.build().cursor();
+        }
+
+        Optional<String> tableFilter = tryGetSingleVarcharValue(tableDomain);
 
         Session session = ((FullConnectorSession) connectorSession).getSession();
-        Builder table = InMemoryRecordSet.builder(COMMENT_TABLE);
 
-        for (String catalog : listCatalogNames(session, metadata, accessControl, catalogFilter)) {
-            QualifiedTablePrefix prefix = tablePrefix(catalog, schemaFilter, tableFilter);
+        for (String catalog : listCatalogNames(session, metadata, accessControl, catalogDomain)) {
+            // TODO A connector may be able to pull information from multiple schemas at once, so pass the schema filter to the connector instead.
+            // TODO Support LIKE predicates on schema name (or any other functional predicates), so pass the schema filter as Constraint-like to the connector.
+            if (schemaDomain.isNullableDiscreteSet()) {
+                for (Object slice : schemaDomain.getNullableDiscreteSet().getNonNullValues()) {
+                    String schemaName = ((Slice) slice).toStringUtf8();
+                    if (isImpossibleObjectName(schemaName)) {
+                        continue;
+                    }
+                    addTableCommentForCatalog(session, table, catalog, tablePrefix(catalog, Optional.of(schemaName), tableFilter));
+                }
+            }
+            else {
+                addTableCommentForCatalog(session, table, catalog, tablePrefix(catalog, Optional.empty(), tableFilter));
+            }
+        }
+
+        return table.build().cursor();
+    }
 
-            Set<SchemaTableName> names = ImmutableSet.of();
-            Map<SchemaTableName, ViewInfo> views = ImmutableMap.of();
-            Map<SchemaTableName, ViewInfo> materializedViews = ImmutableMap.of();
+    private void addTableCommentForCatalog(Session session, Builder table, String catalog, QualifiedTablePrefix prefix)
+    {
+        if (prefix.getTableName().isPresent()) {
+            QualifiedObjectName relationName = new QualifiedObjectName(catalog, prefix.getSchemaName().orElseThrow(), prefix.getTableName().get());
+            RelationComment relationComment;
             try {
-                materializedViews = getMaterializedViews(session, metadata, accessControl, prefix);
-                views = getViews(session, metadata, accessControl, prefix);
-                // Some connectors like blackhole, accumulo and raptor don't return views in listTables
-                // Materialized views are consistently returned in listTables by the relevant connectors
-                names = union(listTables(session, metadata, accessControl, prefix), views.keySet());
+                relationComment = getRelationComment(session, relationName);
             }
-            catch (TrinoException e) {
-                // listTables throws an exception if cannot connect the database
-                LOG.warn(e, "Failed to get tables for catalog: %s", catalog);
+            catch (RuntimeException e) {
+                LOG.warn(e, "Failed to get comment for relation: %s", relationName);
+                relationComment = new RelationComment(false, Optional.empty());
             }
-
-            for (SchemaTableName name : names) {
-                Optional<String> comment = Optional.empty();
-                try {
-                    comment = getComment(session, prefix, name, views, materializedViews);
+            if (relationComment.found()) {
+                SchemaTableName schemaTableName = relationName.asSchemaTableName();
+                // Consulting accessControl first would be simpler but some AccessControl implementations may have issues when asked for a relation that does not exist.
+                if (accessControl.filterTables(session.toSecurityContext(), catalog, ImmutableSet.of(schemaTableName)).contains(schemaTableName)) {
+                    table.addRow(catalog, schemaTableName.getSchemaName(), schemaTableName.getTableName(), relationComment.comment().orElse(null));
+                }
+            }
+        }
+        else {
+            AtomicInteger filteredCount = new AtomicInteger();
+            List<RelationCommentMetadata> relationComments = metadata.listRelationComments(
+                    session,
+                    prefix.getCatalogName(),
+                    prefix.getSchemaName(),
+                    relationNames -> {
+                        Set<SchemaTableName> filtered = accessControl.filterTables(session.toSecurityContext(), catalog, relationNames);
+                        filteredCount.addAndGet(filtered.size());
+                        return filtered;
+                    });
+            checkState(
+                    // Inequality because relationFilter can be invoked more than once on a set of names.
+                    filteredCount.get() >= relationComments.size(),
+                    "relationFilter is mandatory, but it has not been called for some of returned relations: returned %s relations, %s passed the filter",
+                    relationComments.size(),
+                    filteredCount.get());
+
+            for (RelationCommentMetadata commentMetadata : relationComments) {
+                SchemaTableName name = commentMetadata.name();
+                if (!commentMetadata.tableRedirected()) {
+                    table.addRow(catalog, name.getSchemaName(), name.getTableName(), commentMetadata.comment().orElse(null));
                 }
-                catch (RuntimeException e) {
-                    // getTableHandle may throw an exception (e.g. Cassandra connector doesn't allow case insensitive column names)
-                    LOG.warn(e, "Failed to get metadata for table: %s", name);
+                else {
+                    try {
+                        RelationComment relationComment = getTableCommentRedirectionAware(session, new QualifiedObjectName(catalog, name.getSchemaName(), name.getTableName()));
+                        if (relationComment.found()) {
+                            table.addRow(catalog, name.getSchemaName(), name.getTableName(), relationComment.comment().orElse(null));
+                        }
+                    }
+                    catch (RuntimeException e) {
+                        LOG.warn(e, "Failed to get metadata for redirected table: %s", name);
+                    }
                 }
-                table.addRow(prefix.getCatalogName(), name.getSchemaName(), name.getTableName(), comment.orElse(null));
             }
         }
+    }
 
-        return table.build().cursor();
+    private RelationComment getRelationComment(Session session, QualifiedObjectName relationName)
+    {
+        Optional<MaterializedViewDefinition> materializedView = metadata.getMaterializedView(session, relationName);
+        if (materializedView.isPresent()) {
+            return new RelationComment(true, materializedView.get().getComment());
+        }
+
+        Optional<ViewDefinition> view = metadata.getView(session, relationName);
+        if (view.isPresent()) {
+            return new RelationComment(true, view.get().getComment());
+        }
+
+        return getTableCommentRedirectionAware(session, relationName);
     }
 
-    private Optional<String> getComment(
-            Session session,
-            QualifiedTablePrefix prefix,
-            SchemaTableName name,
-            Map<SchemaTableName, ViewInfo> views,
-            Map<SchemaTableName, ViewInfo> materializedViews)
+    private RelationComment getTableCommentRedirectionAware(Session session, QualifiedObjectName relationName)
     {
-        ViewInfo materializedViewDefinition = materializedViews.get(name);
-        if (materializedViewDefinition != null) {
-            return materializedViewDefinition.getComment();
+        RedirectionAwareTableHandle redirectionAware = metadata.getRedirectionAwareTableHandle(session, relationName);
+
+        if (redirectionAware.tableHandle().isEmpty()) {
+            return new RelationComment(false, Optional.empty());
+        }
+
+        if (redirectionAware.redirectedTableName().isPresent()) {
+            QualifiedObjectName redirectedRelationName = redirectionAware.redirectedTableName().get();
+            SchemaTableName redirectedTableName = redirectedRelationName.asSchemaTableName();
+            if (!accessControl.filterTables(session.toSecurityContext(), redirectedRelationName.getCatalogName(), ImmutableSet.of(redirectedTableName)).contains(redirectedTableName)) {
+                return new RelationComment(false, Optional.empty());
+            }
         }
-        ViewInfo viewInfo = views.get(name);
-        if (viewInfo != null) {
-            return viewInfo.getComment();
+
+        return new RelationComment(true, metadata.getTableMetadata(session, redirectionAware.tableHandle().get()).getMetadata().getComment());
+    }
+
+    private record RelationComment(boolean found, Optional<String> comment)
+    {
+        RelationComment
+        {
+            requireNonNull(comment, "comment is null");
+            checkArgument(found || comment.isEmpty(), "Unexpected comment for a relation that is not found");
         }
-        QualifiedObjectName tableName = new QualifiedObjectName(prefix.getCatalogName(), name.getSchemaName(), name.getTableName());
-        return metadata.getRedirectionAwareTableHandle(session, tableName).getTableHandle()
-                .map(handle -> metadata.getTableMetadata(session, handle))
-                .map(metadata -> metadata.getMetadata().getComment())
-                .orElseGet(() -> {
-                    // A previously listed table might have been dropped concurrently
-                    LOG.warn("Failed to get metadata for table: %s", name);
-                    return Optional.empty();
-                });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/TablePropertiesSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/TablePropertiesSystemTable.java
index 0ebf62bab3a3..8c10e0c06b2c 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/TablePropertiesSystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/TablePropertiesSystemTable.java
@@ -13,12 +13,11 @@
  */
 package io.trino.connector.system;
 
+import com.google.inject.Inject;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.TablePropertyManager;
 import io.trino.security.AccessControl;
 
-import javax.inject.Inject;
-
 public class TablePropertiesSystemTable
         extends AbstractPropertiesSystemTable
 {
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/TaskSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/TaskSystemTable.java
index b8d172c8c938..7811eaafbfb6 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/TaskSystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/TaskSystemTable.java
@@ -13,6 +13,7 @@
  */
 package io.trino.connector.system;
 
+import com.google.inject.Inject;
 import io.airlift.node.NodeInfo;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
@@ -31,8 +32,6 @@
 import io.trino.spi.predicate.TupleDomain;
 import org.joda.time.DateTime;
 
-import javax.inject.Inject;
-
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
 import static io.trino.spi.connector.SystemTable.Distribution.ALL_NODES;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/TransactionsSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/TransactionsSystemTable.java
index 4585eef3e53e..678b3886569f 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/TransactionsSystemTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/TransactionsSystemTable.java
@@ -14,6 +14,7 @@
 package io.trino.connector.system;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
@@ -32,8 +33,6 @@
 import io.trino.transaction.TransactionManager;
 import org.joda.time.DateTime;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/AttributeJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/AttributeJdbcTable.java
index 95cded5049be..67b2519b01d8 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/AttributeJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/AttributeJdbcTable.java
@@ -23,7 +23,7 @@
 
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
 import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public class AttributeJdbcTable
         extends JdbcTable
@@ -31,26 +31,26 @@ public class AttributeJdbcTable
     public static final SchemaTableName NAME = new SchemaTableName("jdbc", "attributes");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("type_cat", createUnboundedVarcharType())
-            .column("type_schem", createUnboundedVarcharType())
-            .column("type_name", createUnboundedVarcharType())
-            .column("attr_name", createUnboundedVarcharType())
+            .column("type_cat", VARCHAR)
+            .column("type_schem", VARCHAR)
+            .column("type_name", VARCHAR)
+            .column("attr_name", VARCHAR)
             .column("data_type", BIGINT)
-            .column("attr_type_name", createUnboundedVarcharType())
+            .column("attr_type_name", VARCHAR)
             .column("attr_size", BIGINT)
             .column("decimal_digits", BIGINT)
             .column("num_prec_radix", BIGINT)
             .column("nullable", BIGINT)
-            .column("remarks", createUnboundedVarcharType())
-            .column("attr_def", createUnboundedVarcharType())
+            .column("remarks", VARCHAR)
+            .column("attr_def", VARCHAR)
             .column("sql_data_type", BIGINT)
             .column("sql_datetime_sub", BIGINT)
             .column("char_octet_length", BIGINT)
             .column("ordinal_position", BIGINT)
-            .column("is_nullable", createUnboundedVarcharType())
-            .column("scope_catalog", createUnboundedVarcharType())
-            .column("scope_schema", createUnboundedVarcharType())
-            .column("scope_table", createUnboundedVarcharType())
+            .column("is_nullable", VARCHAR)
+            .column("scope_catalog", VARCHAR)
+            .column("scope_schema", VARCHAR)
+            .column("scope_table", VARCHAR)
             .column("source_data_type", BIGINT)
             .build();
 
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/CatalogJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/CatalogJdbcTable.java
index cac5b083204c..7b7f0ee70b16 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/CatalogJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/CatalogJdbcTable.java
@@ -13,6 +13,7 @@
  */
 package io.trino.connector.system.jdbc;
 
+import com.google.inject.Inject;
 import io.trino.FullConnectorSession;
 import io.trino.Session;
 import io.trino.metadata.Metadata;
@@ -24,13 +25,12 @@
 import io.trino.spi.connector.InMemoryRecordSet.Builder;
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import static io.trino.metadata.MetadataListing.listCatalogNames;
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
 
 public class CatalogJdbcTable
@@ -39,7 +39,7 @@ public class CatalogJdbcTable
     public static final SchemaTableName NAME = new SchemaTableName("jdbc", "catalogs");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("table_cat", createUnboundedVarcharType())
+            .column("table_cat", VARCHAR)
             .build();
 
     private final Metadata metadata;
@@ -63,7 +63,7 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
     {
         Session session = ((FullConnectorSession) connectorSession).getSession();
         Builder table = InMemoryRecordSet.builder(METADATA);
-        for (String name : listCatalogNames(session, metadata, accessControl)) {
+        for (String name : listCatalogNames(session, metadata, accessControl, Domain.all(VARCHAR))) {
             table.addRow(name);
         }
         return table.build().cursor();
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ColumnJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ColumnJdbcTable.java
index 7393b87bff30..6913e9152ca4 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ColumnJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ColumnJdbcTable.java
@@ -15,6 +15,7 @@
 
 import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.airlift.slice.Slices;
 import io.trino.FullConnectorSession;
 import io.trino.Session;
@@ -47,8 +48,6 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
 
-import javax.inject.Inject;
-
 import java.sql.DatabaseMetaData;
 import java.sql.Types;
 import java.time.ZoneId;
@@ -66,6 +65,7 @@
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.SystemSessionProperties.isOmitDateTimeTypePrecision;
+import static io.trino.connector.system.jdbc.FilterUtil.isImpossibleObjectName;
 import static io.trino.connector.system.jdbc.FilterUtil.tablePrefix;
 import static io.trino.connector.system.jdbc.FilterUtil.tryGetSingleVarcharValue;
 import static io.trino.metadata.MetadataListing.listCatalogNames;
@@ -82,10 +82,9 @@
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.type.TypeUtils.getDisplayLabel;
 import static java.lang.Math.min;
-import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 
 public class ColumnJdbcTable
@@ -104,30 +103,30 @@ public class ColumnJdbcTable
     private static final ColumnHandle TABLE_NAME_COLUMN = new SystemColumnHandle("table_name");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("table_cat", createUnboundedVarcharType())
-            .column("table_schem", createUnboundedVarcharType())
-            .column("table_name", createUnboundedVarcharType())
-            .column("column_name", createUnboundedVarcharType())
+            .column("table_cat", VARCHAR)
+            .column("table_schem", VARCHAR)
+            .column("table_name", VARCHAR)
+            .column("column_name", VARCHAR)
             .column("data_type", BIGINT)
-            .column("type_name", createUnboundedVarcharType())
+            .column("type_name", VARCHAR)
             .column("column_size", BIGINT)
             .column("buffer_length", BIGINT)
             .column("decimal_digits", BIGINT)
             .column("num_prec_radix", BIGINT)
             .column("nullable", BIGINT)
-            .column("remarks", createUnboundedVarcharType())
-            .column("column_def", createUnboundedVarcharType())
+            .column("remarks", VARCHAR)
+            .column("column_def", VARCHAR)
             .column("sql_data_type", BIGINT)
             .column("sql_datetime_sub", BIGINT)
             .column("char_octet_length", BIGINT)
             .column("ordinal_position", BIGINT)
-            .column("is_nullable", createUnboundedVarcharType())
-            .column("scope_catalog", createUnboundedVarcharType())
-            .column("scope_schema", createUnboundedVarcharType())
-            .column("scope_table", createUnboundedVarcharType())
+            .column("is_nullable", VARCHAR)
+            .column("scope_catalog", VARCHAR)
+            .column("scope_schema", VARCHAR)
+            .column("scope_table", VARCHAR)
             .column("source_data_type", BIGINT)
-            .column("is_autoincrement", createUnboundedVarcharType())
-            .column("is_generatedcolumn", createUnboundedVarcharType())
+            .column("is_autoincrement", VARCHAR)
+            .column("is_generatedcolumn", VARCHAR)
             .build();
 
     private final Metadata metadata;
@@ -165,16 +164,23 @@ public TupleDomain<ColumnHandle> applyFilter(ConnectorSession connectorSession,
 
         Session session = ((FullConnectorSession) connectorSession).getSession();
 
-        Optional<String> catalogFilter = tryGetSingleVarcharValue(tupleDomain, TABLE_CATALOG_COLUMN);
-        Optional<String> schemaFilter = tryGetSingleVarcharValue(tupleDomain, TABLE_SCHEMA_COLUMN);
-        Optional<String> tableFilter = tryGetSingleVarcharValue(tupleDomain, TABLE_NAME_COLUMN);
+        Domain catalogDomain = tupleDomain.getDomain(TABLE_CATALOG_COLUMN, VARCHAR);
+        Domain schemaDomain = tupleDomain.getDomain(TABLE_SCHEMA_COLUMN, VARCHAR);
+        Domain tableDomain = tupleDomain.getDomain(TABLE_NAME_COLUMN, VARCHAR);
+
+        if (isImpossibleObjectName(catalogDomain) || isImpossibleObjectName(schemaDomain) || isImpossibleObjectName(tableDomain)) {
+            return TupleDomain.none();
+        }
+
+        Optional<String> schemaFilter = tryGetSingleVarcharValue(schemaDomain);
+        Optional<String> tableFilter = tryGetSingleVarcharValue(tableDomain);
 
         if (schemaFilter.isPresent() && tableFilter.isPresent()) {
             // No need to narrow down the domain.
             return tupleDomain;
         }
 
-        List<String> catalogs = listCatalogNames(session, metadata, accessControl, catalogFilter).stream()
+        List<String> catalogs = listCatalogNames(session, metadata, accessControl, catalogDomain).stream()
                 .filter(catalogName -> predicate.test(ImmutableMap.of(TABLE_CATALOG_COLUMN, toNullableValue(catalogName))))
                 .collect(toImmutableList());
 
@@ -240,20 +246,19 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
 
         Session session = ((FullConnectorSession) connectorSession).getSession();
         boolean omitDateTimeTypePrecision = isOmitDateTimeTypePrecision(session);
-        Optional<String> catalogFilter = tryGetSingleVarcharValue(constraint, 0);
-        Optional<String> schemaFilter = tryGetSingleVarcharValue(constraint, 1);
-        Optional<String> tableFilter = tryGetSingleVarcharValue(constraint, 2);
 
-        Domain catalogDomain = constraint.getDomains().get().getOrDefault(0, Domain.all(createUnboundedVarcharType()));
-        Domain schemaDomain = constraint.getDomains().get().getOrDefault(1, Domain.all(createUnboundedVarcharType()));
-        Domain tableDomain = constraint.getDomains().get().getOrDefault(2, Domain.all(createUnboundedVarcharType()));
+        Domain catalogDomain = constraint.getDomain(0, VARCHAR);
+        Domain schemaDomain = constraint.getDomain(1, VARCHAR);
+        Domain tableDomain = constraint.getDomain(2, VARCHAR);
 
-        if (isNonLowercase(schemaFilter) || isNonLowercase(tableFilter)) {
-            // Non-lowercase predicate will never match a lowercase name (until TODO https://github.com/trinodb/trino/issues/17)
+        if (isImpossibleObjectName(catalogDomain) || isImpossibleObjectName(schemaDomain) || isImpossibleObjectName(tableDomain)) {
             return table.build().cursor();
         }
 
-        for (String catalog : listCatalogNames(session, metadata, accessControl, catalogFilter)) {
+        Optional<String> schemaFilter = tryGetSingleVarcharValue(schemaDomain);
+        Optional<String> tableFilter = tryGetSingleVarcharValue(tableDomain);
+
+        for (String catalog : listCatalogNames(session, metadata, accessControl, catalogDomain)) {
             if (!catalogDomain.includesNullableValue(utf8Slice(catalog))) {
                 continue;
             }
@@ -289,11 +294,6 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
         return table.build().cursor();
     }
 
-    private static boolean isNonLowercase(Optional<String> filter)
-    {
-        return filter.filter(value -> !value.equals(value.toLowerCase(ENGLISH))).isPresent();
-    }
-
     private static void addColumnsRow(Builder builder, String catalog, Map<SchemaTableName, List<ColumnMetadata>> columns, boolean isOmitTimestampPrecision)
     {
         for (Entry<SchemaTableName, List<ColumnMetadata>> entry : columns.entrySet()) {
@@ -542,16 +542,16 @@ static Integer numPrecRadix(Type type)
 
     private static NullableValue toNullableValue(String varcharValue)
     {
-        return NullableValue.of(createUnboundedVarcharType(), utf8Slice(varcharValue));
+        return NullableValue.of(VARCHAR, utf8Slice(varcharValue));
     }
 
     private static Collector<String, ?, Domain> toVarcharDomain()
     {
         return Collectors.collectingAndThen(toImmutableSet(), set -> {
             if (set.isEmpty()) {
-                return Domain.none(createUnboundedVarcharType());
+                return Domain.none(VARCHAR);
             }
-            return Domain.multipleValues(createUnboundedVarcharType(), set.stream()
+            return Domain.multipleValues(VARCHAR, set.stream()
                     .map(Slices::utf8Slice)
                     .collect(toImmutableList()));
         });
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/FilterUtil.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/FilterUtil.java
index 8dca5f34c0da..471750fb1430 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/FilterUtil.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/FilterUtil.java
@@ -16,25 +16,21 @@
 import io.airlift.slice.Slice;
 import io.trino.metadata.QualifiedTablePrefix;
 import io.trino.spi.predicate.Domain;
-import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.predicate.Domain.DiscreteSet;
 
 import java.util.Optional;
 
+import static java.util.Locale.ENGLISH;
+
 public final class FilterUtil
 {
     private FilterUtil() {}
 
-    public static <T> Optional<String> tryGetSingleVarcharValue(TupleDomain<T> constraint, T index)
+    public static <T> Optional<String> tryGetSingleVarcharValue(Domain domain)
     {
-        if (constraint.isNone()) {
+        if (!domain.isSingleValue()) {
             return Optional.empty();
         }
-
-        Domain domain = constraint.getDomains().get().get(index);
-        if ((domain == null) || !domain.isSingleValue()) {
-            return Optional.empty();
-        }
-
         Object value = domain.getSingleValue();
         return Optional.of(((Slice) value).toStringUtf8());
     }
@@ -50,8 +46,20 @@ public static QualifiedTablePrefix tablePrefix(String catalog, Optional<String>
         return new QualifiedTablePrefix(catalog);
     }
 
-    public static <T> boolean emptyOrEquals(Optional<T> value, T other)
+    public static boolean isImpossibleObjectName(Domain domain)
+    {
+        if (!domain.isNullableDiscreteSet()) {
+            return false;
+        }
+        DiscreteSet discreteSet = domain.getNullableDiscreteSet();
+        return discreteSet.getNonNullValues().stream()
+                .allMatch(element -> isImpossibleObjectName(((Slice) element).toStringUtf8()));
+    }
+
+    public static boolean isImpossibleObjectName(String candidate)
     {
-        return value.isEmpty() || value.get().equals(other);
+        return candidate.equals("") ||
+                // TODO (https://github.com/trinodb/trino/issues/17) Currently all object names are lowercase in Trino
+                !candidate.equals(candidate.toLowerCase(ENGLISH));
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ProcedureColumnJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ProcedureColumnJdbcTable.java
index c73e0e8cacbc..7eafaa13ee8e 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ProcedureColumnJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ProcedureColumnJdbcTable.java
@@ -23,7 +23,7 @@
 
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
 import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public class ProcedureColumnJdbcTable
         extends JdbcTable
@@ -31,26 +31,26 @@ public class ProcedureColumnJdbcTable
     public static final SchemaTableName NAME = new SchemaTableName("jdbc", "procedure_columns");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("procedure_cat", createUnboundedVarcharType())
-            .column("procedure_schem", createUnboundedVarcharType())
-            .column("procedure_name", createUnboundedVarcharType())
-            .column("column_name", createUnboundedVarcharType())
+            .column("procedure_cat", VARCHAR)
+            .column("procedure_schem", VARCHAR)
+            .column("procedure_name", VARCHAR)
+            .column("column_name", VARCHAR)
             .column("column_type", BIGINT)
             .column("data_type", BIGINT)
-            .column("type_name", createUnboundedVarcharType())
+            .column("type_name", VARCHAR)
             .column("precision", BIGINT)
             .column("length", BIGINT)
             .column("scale", BIGINT)
             .column("radix", BIGINT)
             .column("nullable", BIGINT)
-            .column("remarks", createUnboundedVarcharType())
-            .column("column_def", createUnboundedVarcharType())
+            .column("remarks", VARCHAR)
+            .column("column_def", VARCHAR)
             .column("sql_data_type", BIGINT)
             .column("sql_datetime_sub", BIGINT)
             .column("char_octet_length", BIGINT)
             .column("ordinal_position", BIGINT)
-            .column("is_nullable", createUnboundedVarcharType())
-            .column("specific_name", createUnboundedVarcharType())
+            .column("is_nullable", VARCHAR)
+            .column("specific_name", VARCHAR)
             .build();
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ProcedureJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ProcedureJdbcTable.java
index 141527e9f643..088900e036c2 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ProcedureJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ProcedureJdbcTable.java
@@ -23,7 +23,7 @@
 
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
 import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public class ProcedureJdbcTable
         extends JdbcTable
@@ -31,12 +31,12 @@ public class ProcedureJdbcTable
     public static final SchemaTableName NAME = new SchemaTableName("jdbc", "procedures");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("procedure_cat", createUnboundedVarcharType())
-            .column("procedure_schem", createUnboundedVarcharType())
-            .column("procedure_name", createUnboundedVarcharType())
-            .column("remarks", createUnboundedVarcharType())
+            .column("procedure_cat", VARCHAR)
+            .column("procedure_schem", VARCHAR)
+            .column("procedure_name", VARCHAR)
+            .column("remarks", VARCHAR)
             .column("procedure_type", BIGINT)
-            .column("specific_name", createUnboundedVarcharType())
+            .column("specific_name", VARCHAR)
             .build();
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/PseudoColumnJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/PseudoColumnJdbcTable.java
index 0a21f8e89dbf..cf6fc7478e9a 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/PseudoColumnJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/PseudoColumnJdbcTable.java
@@ -23,7 +23,7 @@
 
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
 import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public class PseudoColumnJdbcTable
         extends JdbcTable
@@ -31,16 +31,16 @@ public class PseudoColumnJdbcTable
     public static final SchemaTableName NAME = new SchemaTableName("jdbc", "pseudo_columns");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("table_cat", createUnboundedVarcharType())
-            .column("table_schem", createUnboundedVarcharType())
-            .column("table_name", createUnboundedVarcharType())
-            .column("column_name", createUnboundedVarcharType())
+            .column("table_cat", VARCHAR)
+            .column("table_schem", VARCHAR)
+            .column("table_name", VARCHAR)
+            .column("column_name", VARCHAR)
             .column("data_type", BIGINT)
             .column("column_size", BIGINT)
             .column("decimal_digits", BIGINT)
             .column("num_prec_radix", BIGINT)
-            .column("column_usage", createUnboundedVarcharType())
-            .column("remarks", createUnboundedVarcharType())
+            .column("column_usage", VARCHAR)
+            .column("remarks", VARCHAR)
             .column("char_octet_length", BIGINT)
             .column("is_nullable", BIGINT)
             .build();
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/SchemaJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/SchemaJdbcTable.java
index 15ff2949c8ba..cde364ab79a7 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/SchemaJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/SchemaJdbcTable.java
@@ -13,6 +13,7 @@
  */
 package io.trino.connector.system.jdbc;
 
+import com.google.inject.Inject;
 import io.trino.FullConnectorSession;
 import io.trino.Session;
 import io.trino.metadata.Metadata;
@@ -24,17 +25,14 @@
 import io.trino.spi.connector.InMemoryRecordSet.Builder;
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
-import java.util.Optional;
-
-import static io.trino.connector.system.jdbc.FilterUtil.tryGetSingleVarcharValue;
+import static io.trino.connector.system.jdbc.FilterUtil.isImpossibleObjectName;
 import static io.trino.metadata.MetadataListing.listCatalogNames;
 import static io.trino.metadata.MetadataListing.listSchemas;
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
 
 public class SchemaJdbcTable
@@ -43,8 +41,8 @@ public class SchemaJdbcTable
     public static final SchemaTableName NAME = new SchemaTableName("jdbc", "schemas");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("table_schem", createUnboundedVarcharType())
-            .column("table_catalog", createUnboundedVarcharType())
+            .column("table_schem", VARCHAR)
+            .column("table_catalog", VARCHAR)
             .build();
 
     private final Metadata metadata;
@@ -66,11 +64,17 @@ public ConnectorTableMetadata getTableMetadata()
     @Override
     public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, ConnectorSession connectorSession, TupleDomain<Integer> constraint)
     {
+        Builder table = InMemoryRecordSet.builder(METADATA);
         Session session = ((FullConnectorSession) connectorSession).getSession();
-        Optional<String> catalogFilter = tryGetSingleVarcharValue(constraint, 1);
 
-        Builder table = InMemoryRecordSet.builder(METADATA);
-        for (String catalog : listCatalogNames(session, metadata, accessControl, catalogFilter)) {
+        Domain schemaDomain = constraint.getDomain(0, VARCHAR);
+        Domain catalogDomain = constraint.getDomain(1, VARCHAR);
+
+        if (isImpossibleObjectName(catalogDomain) || isImpossibleObjectName(schemaDomain)) {
+            return table.build().cursor();
+        }
+
+        for (String catalog : listCatalogNames(session, metadata, accessControl, catalogDomain)) {
             for (String schema : listSchemas(session, metadata, accessControl, catalog)) {
                 table.addRow(schema, catalog);
             }
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/SuperTableJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/SuperTableJdbcTable.java
index d26c5b0a4003..17b3aa315da7 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/SuperTableJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/SuperTableJdbcTable.java
@@ -22,7 +22,7 @@
 import io.trino.spi.predicate.TupleDomain;
 
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public class SuperTableJdbcTable
         extends JdbcTable
@@ -30,10 +30,10 @@ public class SuperTableJdbcTable
     public static final SchemaTableName NAME = new SchemaTableName("jdbc", "super_tables");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("table_cat", createUnboundedVarcharType())
-            .column("table_schem", createUnboundedVarcharType())
-            .column("table_name", createUnboundedVarcharType())
-            .column("supertable_name", createUnboundedVarcharType())
+            .column("table_cat", VARCHAR)
+            .column("table_schem", VARCHAR)
+            .column("table_name", VARCHAR)
+            .column("supertable_name", VARCHAR)
             .build();
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/SuperTypeJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/SuperTypeJdbcTable.java
index 1f8233d29374..604282eec4ea 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/SuperTypeJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/SuperTypeJdbcTable.java
@@ -22,7 +22,7 @@
 import io.trino.spi.predicate.TupleDomain;
 
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public class SuperTypeJdbcTable
         extends JdbcTable
@@ -30,12 +30,12 @@ public class SuperTypeJdbcTable
     public static final SchemaTableName NAME = new SchemaTableName("jdbc", "super_types");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("type_cat", createUnboundedVarcharType())
-            .column("type_schem", createUnboundedVarcharType())
-            .column("type_name", createUnboundedVarcharType())
-            .column("supertype_cat", createUnboundedVarcharType())
-            .column("supertype_schem", createUnboundedVarcharType())
-            .column("supertype_name", createUnboundedVarcharType())
+            .column("type_cat", VARCHAR)
+            .column("type_schem", VARCHAR)
+            .column("type_name", VARCHAR)
+            .column("supertype_cat", VARCHAR)
+            .column("supertype_schem", VARCHAR)
+            .column("supertype_name", VARCHAR)
             .build();
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/TableJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/TableJdbcTable.java
index 459e362f6d63..320172490d1f 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/TableJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/TableJdbcTable.java
@@ -13,6 +13,8 @@
  */
 package io.trino.connector.system.jdbc;
 
+import com.google.inject.Inject;
+import io.airlift.slice.Slices;
 import io.trino.FullConnectorSession;
 import io.trino.Session;
 import io.trino.metadata.Metadata;
@@ -25,22 +27,20 @@
 import io.trino.spi.connector.InMemoryRecordSet.Builder;
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 import java.util.Set;
 
-import static io.trino.connector.system.jdbc.FilterUtil.emptyOrEquals;
+import static io.trino.connector.system.jdbc.FilterUtil.isImpossibleObjectName;
 import static io.trino.connector.system.jdbc.FilterUtil.tablePrefix;
 import static io.trino.connector.system.jdbc.FilterUtil.tryGetSingleVarcharValue;
 import static io.trino.metadata.MetadataListing.listCatalogNames;
 import static io.trino.metadata.MetadataListing.listTables;
 import static io.trino.metadata.MetadataListing.listViews;
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
-import static java.util.Locale.ENGLISH;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
 
 public class TableJdbcTable
@@ -49,16 +49,16 @@ public class TableJdbcTable
     public static final SchemaTableName NAME = new SchemaTableName("jdbc", "tables");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("table_cat", createUnboundedVarcharType())
-            .column("table_schem", createUnboundedVarcharType())
-            .column("table_name", createUnboundedVarcharType())
-            .column("table_type", createUnboundedVarcharType())
-            .column("remarks", createUnboundedVarcharType())
-            .column("type_cat", createUnboundedVarcharType())
-            .column("type_schem", createUnboundedVarcharType())
-            .column("type_name", createUnboundedVarcharType())
-            .column("self_referencing_col_name", createUnboundedVarcharType())
-            .column("ref_generation", createUnboundedVarcharType())
+            .column("table_cat", VARCHAR)
+            .column("table_schem", VARCHAR)
+            .column("table_name", VARCHAR)
+            .column("table_type", VARCHAR)
+            .column("remarks", VARCHAR)
+            .column("type_cat", VARCHAR)
+            .column("type_schem", VARCHAR)
+            .column("type_name", VARCHAR)
+            .column("self_referencing_col_name", VARCHAR)
+            .column("ref_generation", VARCHAR)
             .build();
 
     private final Metadata metadata;
@@ -80,26 +80,28 @@ public ConnectorTableMetadata getTableMetadata()
     @Override
     public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, ConnectorSession connectorSession, TupleDomain<Integer> constraint)
     {
+        Builder table = InMemoryRecordSet.builder(METADATA);
         Session session = ((FullConnectorSession) connectorSession).getSession();
-        Optional<String> catalogFilter = tryGetSingleVarcharValue(constraint, 0);
-        Optional<String> schemaFilter = tryGetSingleVarcharValue(constraint, 1);
-        Optional<String> tableFilter = tryGetSingleVarcharValue(constraint, 2);
-        Optional<String> typeFilter = tryGetSingleVarcharValue(constraint, 3);
 
-        boolean includeTables = emptyOrEquals(typeFilter, "TABLE");
-        boolean includeViews = emptyOrEquals(typeFilter, "VIEW");
-        Builder table = InMemoryRecordSet.builder(METADATA);
+        Domain catalogDomain = constraint.getDomain(0, VARCHAR);
+        Domain schemaDomain = constraint.getDomain(1, VARCHAR);
+        Domain tableDomain = constraint.getDomain(2, VARCHAR);
+        Domain typeDomain = constraint.getDomain(3, VARCHAR);
 
-        if (!includeTables && !includeViews) {
+        if (isImpossibleObjectName(catalogDomain) || isImpossibleObjectName(schemaDomain) || isImpossibleObjectName(tableDomain)) {
             return table.build().cursor();
         }
 
-        if (isNonLowercase(schemaFilter) || isNonLowercase(tableFilter)) {
-            // Non-lowercase predicate will never match a lowercase name (until TODO https://github.com/trinodb/trino/issues/17)
+        Optional<String> schemaFilter = tryGetSingleVarcharValue(schemaDomain);
+        Optional<String> tableFilter = tryGetSingleVarcharValue(tableDomain);
+
+        boolean includeTables = typeDomain.includesNullableValue(Slices.utf8Slice("TABLE"));
+        boolean includeViews = typeDomain.includesNullableValue(Slices.utf8Slice("VIEW"));
+        if (!includeTables && !includeViews) {
             return table.build().cursor();
         }
 
-        for (String catalog : listCatalogNames(session, metadata, accessControl, catalogFilter)) {
+        for (String catalog : listCatalogNames(session, metadata, accessControl, catalogDomain)) {
             QualifiedTablePrefix prefix = tablePrefix(catalog, schemaFilter, tableFilter);
 
             Set<SchemaTableName> views = listViews(session, metadata, accessControl, prefix);
@@ -113,11 +115,6 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
         return table.build().cursor();
     }
 
-    private static boolean isNonLowercase(Optional<String> filter)
-    {
-        return filter.filter(value -> !value.equals(value.toLowerCase(ENGLISH))).isPresent();
-    }
-
     private static Object[] tableRow(String catalog, SchemaTableName name, String type)
     {
         return new Object[] {catalog, name.getSchemaName(), name.getTableName(), type,
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/TableTypeJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/TableTypeJdbcTable.java
index f5007dc70369..53c5b6ee6b66 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/TableTypeJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/TableTypeJdbcTable.java
@@ -22,7 +22,7 @@
 import io.trino.spi.predicate.TupleDomain;
 
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public class TableTypeJdbcTable
         extends JdbcTable
@@ -30,7 +30,7 @@ public class TableTypeJdbcTable
     public static final SchemaTableName NAME = new SchemaTableName("jdbc", "table_types");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("table_type", createUnboundedVarcharType())
+            .column("table_type", VARCHAR)
             .build();
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/TypesJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/TypesJdbcTable.java
index ba5027b4ebf6..46316f8f1691 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/TypesJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/TypesJdbcTable.java
@@ -13,6 +13,7 @@
  */
 package io.trino.connector.system.jdbc;
 
+import com.google.inject.Inject;
 import io.trino.metadata.TypeRegistry;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableMetadata;
@@ -25,8 +26,6 @@
 import io.trino.spi.type.ParametricType;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.sql.DatabaseMetaData;
 import java.sql.Types;
 
@@ -36,7 +35,7 @@
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
 
 public class TypesJdbcTable
@@ -45,19 +44,19 @@ public class TypesJdbcTable
     public static final SchemaTableName NAME = new SchemaTableName("jdbc", "types");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("type_name", createUnboundedVarcharType())
+            .column("type_name", VARCHAR)
             .column("data_type", BIGINT)
             .column("precision", BIGINT)
-            .column("literal_prefix", createUnboundedVarcharType())
-            .column("literal_suffix", createUnboundedVarcharType())
-            .column("create_params", createUnboundedVarcharType())
+            .column("literal_prefix", VARCHAR)
+            .column("literal_suffix", VARCHAR)
+            .column("create_params", VARCHAR)
             .column("nullable", BIGINT)
             .column("case_sensitive", BOOLEAN)
             .column("searchable", BIGINT)
             .column("unsigned_attribute", BOOLEAN)
             .column("fixed_prec_scale", BOOLEAN)
             .column("auto_increment", BOOLEAN)
-            .column("local_type_name", createUnboundedVarcharType())
+            .column("local_type_name", VARCHAR)
             .column("minimum_scale", BIGINT)
             .column("maximum_scale", BIGINT)
             .column("sql_data_type", BIGINT)
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/UdtJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/UdtJdbcTable.java
index fdead013b101..745763fe2dcd 100644
--- a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/UdtJdbcTable.java
+++ b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/UdtJdbcTable.java
@@ -22,7 +22,7 @@
 import io.trino.spi.predicate.TupleDomain;
 
 import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public class UdtJdbcTable
         extends JdbcTable
@@ -30,13 +30,13 @@ public class UdtJdbcTable
     public static final SchemaTableName NAME = new SchemaTableName("jdbc", "udts");
 
     public static final ConnectorTableMetadata METADATA = tableMetadataBuilder(NAME)
-            .column("type_cat", createUnboundedVarcharType())
-            .column("type_schem", createUnboundedVarcharType())
-            .column("type_name", createUnboundedVarcharType())
-            .column("class_name", createUnboundedVarcharType())
-            .column("data_type", createUnboundedVarcharType())
-            .column("remarks", createUnboundedVarcharType())
-            .column("base_type", createUnboundedVarcharType())
+            .column("type_cat", VARCHAR)
+            .column("type_schem", VARCHAR)
+            .column("type_name", VARCHAR)
+            .column("class_name", VARCHAR)
+            .column("data_type", VARCHAR)
+            .column("remarks", VARCHAR)
+            .column("base_type", VARCHAR)
             .build();
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/cost/ComposableStatsCalculator.java b/core/trino-main/src/main/java/io/trino/cost/ComposableStatsCalculator.java
index 151cdc41494f..fa06ba70cefd 100644
--- a/core/trino-main/src/main/java/io/trino/cost/ComposableStatsCalculator.java
+++ b/core/trino-main/src/main/java/io/trino/cost/ComposableStatsCalculator.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.matching.Pattern;
 import io.trino.matching.pattern.TypeOfPattern;
@@ -22,8 +23,6 @@
 import io.trino.sql.planner.iterative.Lookup;
 import io.trino.sql.planner.plan.PlanNode;
 
-import javax.inject.Inject;
-
 import java.lang.reflect.Modifier;
 import java.util.Iterator;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/cost/CostCalculator.java b/core/trino-main/src/main/java/io/trino/cost/CostCalculator.java
index 372584716637..113ca6e2b01f 100644
--- a/core/trino-main/src/main/java/io/trino/cost/CostCalculator.java
+++ b/core/trino-main/src/main/java/io/trino/cost/CostCalculator.java
@@ -14,13 +14,12 @@
 
 package io.trino.cost;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import com.google.inject.BindingAnnotation;
 import io.trino.Session;
 import io.trino.sql.planner.TypeProvider;
 import io.trino.sql.planner.plan.PlanNode;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
diff --git a/core/trino-main/src/main/java/io/trino/cost/CostCalculatorUsingExchanges.java b/core/trino-main/src/main/java/io/trino/cost/CostCalculatorUsingExchanges.java
index c3e50fd0973f..571fd7d8d835 100644
--- a/core/trino-main/src/main/java/io/trino/cost/CostCalculatorUsingExchanges.java
+++ b/core/trino-main/src/main/java/io/trino/cost/CostCalculatorUsingExchanges.java
@@ -15,6 +15,8 @@
 package io.trino.cost;
 
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.TypeProvider;
@@ -37,9 +39,6 @@
 import io.trino.sql.planner.plan.UnionNode;
 import io.trino.sql.planner.plan.ValuesNode;
 
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/cost/CostCalculatorWithEstimatedExchanges.java b/core/trino-main/src/main/java/io/trino/cost/CostCalculatorWithEstimatedExchanges.java
index 58bc37d5c921..d536ca27c102 100644
--- a/core/trino-main/src/main/java/io/trino/cost/CostCalculatorWithEstimatedExchanges.java
+++ b/core/trino-main/src/main/java/io/trino/cost/CostCalculatorWithEstimatedExchanges.java
@@ -14,6 +14,8 @@
 
 package io.trino.cost;
 
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.sql.planner.TypeProvider;
 import io.trino.sql.planner.iterative.GroupReference;
@@ -27,9 +29,6 @@
 import io.trino.sql.planner.plan.SpatialJoinNode;
 import io.trino.sql.planner.plan.UnionNode;
 
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.util.Objects;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/cost/CostComparator.java b/core/trino-main/src/main/java/io/trino/cost/CostComparator.java
index 544a3fca4061..a303124680be 100644
--- a/core/trino-main/src/main/java/io/trino/cost/CostComparator.java
+++ b/core/trino-main/src/main/java/io/trino/cost/CostComparator.java
@@ -15,11 +15,10 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Ordering;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.sql.planner.OptimizerConfig;
 
-import javax.inject.Inject;
-
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-main/src/main/java/io/trino/cost/FilterStatsCalculator.java b/core/trino-main/src/main/java/io/trino/cost/FilterStatsCalculator.java
index e7ec20e07e52..9e6ca355f519 100644
--- a/core/trino-main/src/main/java/io/trino/cost/FilterStatsCalculator.java
+++ b/core/trino-main/src/main/java/io/trino/cost/FilterStatsCalculator.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ListMultimap;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.security.AllowAllAccessControl;
@@ -47,9 +48,7 @@
 import io.trino.sql.tree.NotExpression;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.util.DisjointSet;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Map;
@@ -126,7 +125,7 @@ private Expression simplifyExpression(Session session, Expression predicate, Typ
             // Expression evaluates to SQL null, which in Filter is equivalent to false. This assumes the expression is a top-level expression (eg. not in NOT).
             value = false;
         }
-        return new LiteralEncoder(plannerContext).toExpression(session, value, BOOLEAN);
+        return new LiteralEncoder(plannerContext).toExpression(value, BOOLEAN);
     }
 
     private class FilterExpressionStatsCalculatingVisitor
@@ -315,7 +314,8 @@ protected PlanNodeStatsEstimate visitIsNullPredicate(IsNullPredicate node, Void
         @Override
         protected PlanNodeStatsEstimate visitBetweenPredicate(BetweenPredicate node, Void context)
         {
-            if (!(node.getValue() instanceof SymbolReference)) {
+            SymbolStatsEstimate valueStats = getExpressionStats(node.getValue());
+            if (valueStats.isUnknown()) {
                 return PlanNodeStatsEstimate.unknown();
             }
             if (!getExpressionStats(node.getMin()).isSingleValue()) {
@@ -325,7 +325,6 @@ protected PlanNodeStatsEstimate visitBetweenPredicate(BetweenPredicate node, Voi
                 return PlanNodeStatsEstimate.unknown();
             }
 
-            SymbolStatsEstimate valueStats = input.getSymbolStatistics(Symbol.from(node.getValue()));
             Expression lowerBound = new ComparisonExpression(GREATER_THAN_OR_EQUAL, node.getValue(), node.getMin());
             Expression upperBound = new ComparisonExpression(LESS_THAN_OR_EQUAL, node.getValue(), node.getMax());
 
@@ -410,7 +409,19 @@ protected PlanNodeStatsEstimate visitComparisonExpression(ComparisonExpression n
             SymbolStatsEstimate leftStats = getExpressionStats(left);
             Optional<Symbol> leftSymbol = left instanceof SymbolReference ? Optional.of(Symbol.from(left)) : Optional.empty();
             if (isEffectivelyLiteral(right)) {
-                OptionalDouble literal = doubleValueFromLiteral(getType(left), right);
+                Type type = getType(left);
+                Object literalValue = evaluateConstantExpression(
+                        right,
+                        type,
+                        plannerContext,
+                        session,
+                        new AllowAllAccessControl(),
+                        ImmutableMap.of());
+                if (literalValue == null) {
+                    // Possible when we process `x IN (..., NULL)` case.
+                    return input.mapOutputRowCount(rowCountEstimate -> 0.);
+                }
+                OptionalDouble literal = toStatsRepresentation(type, literalValue);
                 return estimateExpressionToLiteralComparison(input, leftStats, leftSymbol, literal, operator);
             }
 
@@ -466,18 +477,6 @@ private boolean isEffectivelyLiteral(Expression expression)
         {
             return ExpressionUtils.isEffectivelyLiteral(plannerContext, session, expression);
         }
-
-        private OptionalDouble doubleValueFromLiteral(Type type, Expression literal)
-        {
-            Object literalValue = evaluateConstantExpression(
-                    literal,
-                    type,
-                    plannerContext,
-                    session,
-                    new AllowAllAccessControl(),
-                    ImmutableMap.of());
-            return toStatsRepresentation(type, literalValue);
-        }
     }
 
     private static List<List<Expression>> extractCorrelatedGroups(List<Expression> terms, double filterConjunctionIndependenceFactor)
diff --git a/core/trino-main/src/main/java/io/trino/cost/ScalarStatsCalculator.java b/core/trino-main/src/main/java/io/trino/cost/ScalarStatsCalculator.java
index 54d37ad68124..4a4192391ac6 100644
--- a/core/trino-main/src/main/java/io/trino/cost/ScalarStatsCalculator.java
+++ b/core/trino-main/src/main/java/io/trino/cost/ScalarStatsCalculator.java
@@ -14,6 +14,7 @@
 package io.trino.cost;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.security.AllowAllAccessControl;
@@ -45,8 +46,6 @@
 import io.trino.sql.tree.NullLiteral;
 import io.trino.sql.tree.SymbolReference;
 
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.OptionalDouble;
 
diff --git a/core/trino-main/src/main/java/io/trino/cost/StatsCalculatorModule.java b/core/trino-main/src/main/java/io/trino/cost/StatsCalculatorModule.java
index 3440ee204902..6aa98da8596b 100644
--- a/core/trino-main/src/main/java/io/trino/cost/StatsCalculatorModule.java
+++ b/core/trino-main/src/main/java/io/trino/cost/StatsCalculatorModule.java
@@ -15,14 +15,13 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Module;
+import com.google.inject.Provider;
 import com.google.inject.Scopes;
 import com.google.inject.TypeLiteral;
 import io.trino.sql.PlannerContext;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.util.List;
 
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
diff --git a/core/trino-main/src/main/java/io/trino/cost/TaskCountEstimator.java b/core/trino-main/src/main/java/io/trino/cost/TaskCountEstimator.java
index 488bb5749281..21a460d5a8b3 100644
--- a/core/trino-main/src/main/java/io/trino/cost/TaskCountEstimator.java
+++ b/core/trino-main/src/main/java/io/trino/cost/TaskCountEstimator.java
@@ -13,19 +13,18 @@
  */
 package io.trino.cost;
 
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.scheduler.NodeSchedulerConfig;
 import io.trino.metadata.InternalNode;
 import io.trino.metadata.InternalNodeManager;
 import io.trino.operator.RetryPolicy;
 
-import javax.inject.Inject;
-
 import java.util.Set;
 import java.util.function.IntSupplier;
 
 import static io.trino.SystemSessionProperties.getCostEstimationWorkerCount;
-import static io.trino.SystemSessionProperties.getFaultTolerantExecutionPartitionCount;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionMaxPartitionCount;
 import static io.trino.SystemSessionProperties.getMaxHashPartitionCount;
 import static io.trino.SystemSessionProperties.getRetryPolicy;
 import static java.lang.Math.min;
@@ -70,7 +69,7 @@ public int estimateHashedTaskCount(Session session)
     {
         int partitionCount;
         if (getRetryPolicy(session) == RetryPolicy.TASK) {
-            partitionCount = getFaultTolerantExecutionPartitionCount(session);
+            partitionCount = getFaultTolerantExecutionMaxPartitionCount(session);
         }
         else {
             partitionCount = getMaxHashPartitionCount(session);
diff --git a/core/trino-main/src/main/java/io/trino/cost/ValuesStatsRule.java b/core/trino-main/src/main/java/io/trino/cost/ValuesStatsRule.java
index 65b024eefdce..e91a88deba12 100644
--- a/core/trino-main/src/main/java/io/trino/cost/ValuesStatsRule.java
+++ b/core/trino-main/src/main/java/io/trino/cost/ValuesStatsRule.java
@@ -18,7 +18,7 @@
 import io.trino.cost.ComposableStatsCalculator.Rule;
 import io.trino.matching.Pattern;
 import io.trino.security.AllowAllAccessControl;
-import io.trino.spi.block.SingleRowBlock;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.sql.PlannerContext;
@@ -95,8 +95,8 @@ private List<Object> getSymbolValues(ValuesNode valuesNode, int symbolId, Sessio
         checkState(valuesNode.getRows().isPresent(), "rows is empty");
         return valuesNode.getRows().get().stream()
                 .map(row -> {
-                    Object rowValue = evaluateConstantExpression(row, rowType, plannerContext, session, new AllowAllAccessControl(), ImmutableMap.of());
-                    return readNativeValue(symbolType, (SingleRowBlock) rowValue, symbolId);
+                    SqlRow rowValue = (SqlRow) evaluateConstantExpression(row, rowType, plannerContext, session, new AllowAllAccessControl(), ImmutableMap.of());
+                    return readNativeValue(symbolType, rowValue.getRawFieldBlock(symbolId), rowValue.getRawIndex());
                 })
                 .collect(toList());
     }
diff --git a/core/trino-main/src/main/java/io/trino/dispatcher/CoordinatorLocation.java b/core/trino-main/src/main/java/io/trino/dispatcher/CoordinatorLocation.java
index 388d6a0d0528..5db90ff0498a 100644
--- a/core/trino-main/src/main/java/io/trino/dispatcher/CoordinatorLocation.java
+++ b/core/trino-main/src/main/java/io/trino/dispatcher/CoordinatorLocation.java
@@ -13,7 +13,7 @@
  */
 package io.trino.dispatcher;
 
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriInfo;
 
 import java.net.URI;
 
diff --git a/core/trino-main/src/main/java/io/trino/dispatcher/DecoratingListeningExecutorService.java b/core/trino-main/src/main/java/io/trino/dispatcher/DecoratingListeningExecutorService.java
index bd555bb43eba..e9ef1b4fe9f2 100644
--- a/core/trino-main/src/main/java/io/trino/dispatcher/DecoratingListeningExecutorService.java
+++ b/core/trino-main/src/main/java/io/trino/dispatcher/DecoratingListeningExecutorService.java
@@ -16,12 +16,11 @@
 import com.google.common.util.concurrent.ForwardingListeningExecutorService;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
+import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -33,6 +32,7 @@
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.util.Reflection.methodHandle;
 import static java.util.Objects.requireNonNull;
 
 public class DecoratingListeningExecutorService
@@ -50,14 +50,9 @@ public class DecoratingListeningExecutorService
         catch (NoSuchMethodException e) {
             closeMethod = null;
         }
-        try {
-            CLOSE_METHOD = closeMethod != null
-                    ? MethodHandles.lookup().unreflect(closeMethod)
-                    : null;
-        }
-        catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
+        CLOSE_METHOD = closeMethod != null
+                ? methodHandle(closeMethod)
+                : null;
     }
 
     private final ListeningExecutorService delegate;
@@ -119,6 +114,17 @@ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, lo
                 timeout, unit);
     }
 
+    @Override
+    public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, Duration timeout)
+            throws InterruptedException
+    {
+        return delegate.invokeAll(
+                tasks.stream()
+                        .map(decorator::decorate)
+                        .collect(toImmutableList()),
+                timeout);
+    }
+
     @Override
     public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
             throws InterruptedException, ExecutionException
@@ -139,6 +145,17 @@ public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, Ti
                 timeout, unit);
     }
 
+    @Override
+    public <T> T invokeAny(Collection<? extends Callable<T>> tasks, Duration timeout)
+            throws InterruptedException, ExecutionException, TimeoutException
+    {
+        return delegate.invokeAny(
+                tasks.stream()
+                        .map(decorator::decorate)
+                        .collect(toImmutableList()),
+                timeout);
+    }
+
     @Override
     public void shutdown()
     {
@@ -170,6 +187,13 @@ public boolean awaitTermination(long timeout, TimeUnit unit)
         return super.awaitTermination(timeout, unit);
     }
 
+    @Override
+    public boolean awaitTermination(Duration duration)
+            throws InterruptedException
+    {
+        return super.awaitTermination(duration);
+    }
+
     // TODO This is temporary, until Guava's ForwardingExecutorService has the method in their interface. See https://github.com/google/guava/issues/6296
     //@Override
     public void close()
diff --git a/core/trino-main/src/main/java/io/trino/dispatcher/DispatchExecutor.java b/core/trino-main/src/main/java/io/trino/dispatcher/DispatchExecutor.java
index ea969f13801d..7acd03cc6812 100644
--- a/core/trino-main/src/main/java/io/trino/dispatcher/DispatchExecutor.java
+++ b/core/trino-main/src/main/java/io/trino/dispatcher/DispatchExecutor.java
@@ -16,16 +16,15 @@
 import com.google.common.io.Closer;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.ListeningScheduledExecutorService;
+import com.google.inject.Inject;
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
 import io.trino.execution.QueryManagerConfig;
 import io.trino.spi.VersionEmbedder;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
diff --git a/core/trino-main/src/main/java/io/trino/dispatcher/DispatchManager.java b/core/trino-main/src/main/java/io/trino/dispatcher/DispatchManager.java
index 19148442fbe0..fd3e9b3563c6 100644
--- a/core/trino-main/src/main/java/io/trino/dispatcher/DispatchManager.java
+++ b/core/trino-main/src/main/java/io/trino/dispatcher/DispatchManager.java
@@ -16,6 +16,11 @@
 import com.google.common.util.concurrent.AbstractFuture;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
 import io.trino.Session;
 import io.trino.execution.QueryIdGenerator;
 import io.trino.execution.QueryInfo;
@@ -36,13 +41,11 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.resourcegroups.SelectionContext;
 import io.trino.spi.resourcegroups.SelectionCriteria;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.Executor;
@@ -52,6 +55,7 @@
 import static io.trino.execution.QueryState.QUEUED;
 import static io.trino.execution.QueryState.RUNNING;
 import static io.trino.spi.StandardErrorCode.QUERY_TEXT_TOO_LARGE;
+import static io.trino.tracing.ScopedSpan.scopedSpan;
 import static io.trino.util.StatementUtils.getQueryType;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
@@ -67,6 +71,7 @@ public class DispatchManager
     private final SessionSupplier sessionSupplier;
     private final SessionPropertyDefaults sessionPropertyDefaults;
     private final SessionPropertyManager sessionPropertyManager;
+    private final Tracer tracer;
 
     private final int maxQueryLength;
 
@@ -87,6 +92,7 @@ public DispatchManager(
             SessionSupplier sessionSupplier,
             SessionPropertyDefaults sessionPropertyDefaults,
             SessionPropertyManager sessionPropertyManager,
+            Tracer tracer,
             QueryManagerConfig queryManagerConfig,
             DispatchExecutor dispatchExecutor)
     {
@@ -99,6 +105,7 @@ public DispatchManager(
         this.sessionSupplier = requireNonNull(sessionSupplier, "sessionSupplier is null");
         this.sessionPropertyDefaults = requireNonNull(sessionPropertyDefaults, "sessionPropertyDefaults is null");
         this.sessionPropertyManager = sessionPropertyManager;
+        this.tracer = requireNonNull(tracer, "tracer is null");
 
         this.maxQueryLength = queryManagerConfig.getMaxQueryLength();
 
@@ -131,26 +138,31 @@ public QueryId createQueryId()
         return queryIdGenerator.createNextQueryId();
     }
 
-    public ListenableFuture<Void> createQuery(QueryId queryId, Slug slug, SessionContext sessionContext, String query)
+    public ListenableFuture<Void> createQuery(QueryId queryId, Span querySpan, Slug slug, SessionContext sessionContext, String query)
     {
         requireNonNull(queryId, "queryId is null");
+        requireNonNull(querySpan, "querySpan is null");
         requireNonNull(sessionContext, "sessionContext is null");
         requireNonNull(query, "query is null");
         checkArgument(!query.isEmpty(), "query must not be empty string");
-        checkArgument(queryTracker.tryGetQuery(queryId).isEmpty(), "query %s already exists", queryId);
+        checkArgument(!queryTracker.hasQuery(queryId), "query %s already exists", queryId);
 
         // It is important to return a future implementation which ignores cancellation request.
         // Using NonCancellationPropagatingFuture is not enough; it does not propagate cancel to wrapped future
         // but it would still return true on call to isCancelled() after cancel() is called on it.
         DispatchQueryCreationFuture queryCreationFuture = new DispatchQueryCreationFuture();
-        dispatchExecutor.execute(() -> {
-            try {
-                createQueryInternal(queryId, slug, sessionContext, query, resourceGroupManager);
+        dispatchExecutor.execute(Context.current().wrap(() -> {
+            Span span = tracer.spanBuilder("dispatch")
+                    .addLink(Span.current().getSpanContext())
+                    .setParent(Context.current().with(querySpan))
+                    .startSpan();
+            try (var ignored = scopedSpan(span)) {
+                createQueryInternal(queryId, querySpan, slug, sessionContext, query, resourceGroupManager);
             }
             finally {
                 queryCreationFuture.set(null);
             }
-        });
+        }));
         return queryCreationFuture;
     }
 
@@ -158,7 +170,7 @@ public ListenableFuture<Void> createQuery(QueryId queryId, Slug slug, SessionCon
      * Creates and registers a dispatch query with the query tracker.  This method will never fail to register a query with the query
      * tracker.  If an error occurs while creating a dispatch query, a failed dispatch will be created and registered.
      */
-    private <C> void createQueryInternal(QueryId queryId, Slug slug, SessionContext sessionContext, String query, ResourceGroupManager<C> resourceGroupManager)
+    private <C> void createQueryInternal(QueryId queryId, Span querySpan, Slug slug, SessionContext sessionContext, String query, ResourceGroupManager<C> resourceGroupManager)
     {
         Session session = null;
         PreparedQuery preparedQuery = null;
@@ -170,7 +182,7 @@ private <C> void createQueryInternal(QueryId queryId, Slug slug, SessionContext
             }
 
             // decode session
-            session = sessionSupplier.createSession(queryId, sessionContext);
+            session = sessionSupplier.createSession(queryId, querySpan, sessionContext);
 
             // check query execute permissions
             accessControl.checkCanExecuteQuery(sessionContext.getIdentity());
@@ -217,12 +229,16 @@ private <C> void createQueryInternal(QueryId queryId, Slug slug, SessionContext
                 session = Session.builder(sessionPropertyManager)
                         .setQueryId(queryId)
                         .setIdentity(sessionContext.getIdentity())
+                        .setOriginalIdentity(sessionContext.getOriginalIdentity())
                         .setSource(sessionContext.getSource().orElse(null))
                         .build();
             }
             Optional<String> preparedSql = Optional.ofNullable(preparedQuery).flatMap(PreparedQuery::getPrepareSql);
             DispatchQuery failedDispatchQuery = failedDispatchQueryFactory.createFailedDispatchQuery(session, query, preparedSql, Optional.empty(), throwable);
             queryCreated(failedDispatchQuery);
+            querySpan.setStatus(StatusCode.ERROR, throwable.getMessage())
+                    .recordException(throwable)
+                    .end();
         }
     }
 
@@ -271,6 +287,14 @@ public long getQueuedQueries()
 
     @Managed
     public long getRunningQueries()
+    {
+        return queryTracker.getAllQueries().stream()
+                .filter(query -> query.getState() == RUNNING)
+                .count();
+    }
+
+    @Managed
+    public long getProgressingQueries()
     {
         return queryTracker.getAllQueries().stream()
                 .filter(query -> query.getState() == RUNNING && !query.getBasicQueryInfo().getQueryStats().isFullyBlocked())
@@ -279,7 +303,7 @@ public long getRunningQueries()
 
     public boolean isQueryRegistered(QueryId queryId)
     {
-        return queryTracker.tryGetQuery(queryId).isPresent();
+        return queryTracker.hasQuery(queryId);
     }
 
     public DispatchQuery getQuery(QueryId queryId)
diff --git a/core/trino-main/src/main/java/io/trino/dispatcher/FailedDispatchQuery.java b/core/trino-main/src/main/java/io/trino/dispatcher/FailedDispatchQuery.java
index b4df9cfa2184..36fa9270cba3 100644
--- a/core/trino-main/src/main/java/io/trino/dispatcher/FailedDispatchQuery.java
+++ b/core/trino-main/src/main/java/io/trino/dispatcher/FailedDispatchQuery.java
@@ -35,6 +35,7 @@
 
 import java.net.URI;
 import java.util.Optional;
+import java.util.OptionalDouble;
 import java.util.concurrent.Executor;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
@@ -225,6 +226,8 @@ private static QueryInfo immediateFailureQueryInfo(
                 Optional.empty(),
                 Optional.empty(),
                 Optional.empty(),
+                Optional.empty(),
+                false,
                 ImmutableMap.of(),
                 ImmutableSet.of(),
                 ImmutableMap.of(),
@@ -267,6 +270,7 @@ private static QueryStats immediateFailureQueryStats()
                 new Duration(0, MILLISECONDS),
                 new Duration(0, MILLISECONDS),
                 new Duration(0, MILLISECONDS),
+                new Duration(0, MILLISECONDS),
                 0,
                 0,
                 0,
@@ -288,6 +292,8 @@ private static QueryStats immediateFailureQueryStats()
                 DataSize.ofBytes(0),
                 DataSize.ofBytes(0),
                 false,
+                OptionalDouble.empty(),
+                OptionalDouble.empty(),
                 new Duration(0, MILLISECONDS),
                 new Duration(0, MILLISECONDS),
                 new Duration(0, MILLISECONDS),
diff --git a/core/trino-main/src/main/java/io/trino/dispatcher/FailedDispatchQueryFactory.java b/core/trino-main/src/main/java/io/trino/dispatcher/FailedDispatchQueryFactory.java
index 65f177162fc4..3eeab6198ef3 100644
--- a/core/trino-main/src/main/java/io/trino/dispatcher/FailedDispatchQueryFactory.java
+++ b/core/trino-main/src/main/java/io/trino/dispatcher/FailedDispatchQueryFactory.java
@@ -13,6 +13,7 @@
  */
 package io.trino.dispatcher;
 
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.client.NodeVersion;
 import io.trino.event.QueryMonitor;
@@ -20,8 +21,6 @@
 import io.trino.server.BasicQueryInfo;
 import io.trino.spi.resourcegroups.ResourceGroupId;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 
diff --git a/core/trino-main/src/main/java/io/trino/dispatcher/LocalCoordinatorLocation.java b/core/trino-main/src/main/java/io/trino/dispatcher/LocalCoordinatorLocation.java
index 7aa147e61c9a..946869925561 100644
--- a/core/trino-main/src/main/java/io/trino/dispatcher/LocalCoordinatorLocation.java
+++ b/core/trino-main/src/main/java/io/trino/dispatcher/LocalCoordinatorLocation.java
@@ -13,7 +13,7 @@
  */
 package io.trino.dispatcher;
 
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriInfo;
 
 import java.net.URI;
 
diff --git a/core/trino-main/src/main/java/io/trino/dispatcher/LocalDispatchQuery.java b/core/trino-main/src/main/java/io/trino/dispatcher/LocalDispatchQuery.java
index 77cbce851d06..994b860204d5 100644
--- a/core/trino-main/src/main/java/io/trino/dispatcher/LocalDispatchQuery.java
+++ b/core/trino-main/src/main/java/io/trino/dispatcher/LocalDispatchQuery.java
@@ -97,8 +97,11 @@ public LocalDispatchQuery(
                     queryMonitor.queryImmediateFailureEvent(getBasicQueryInfo(), getFullQueryInfo().getFailureInfo());
                 }
             }
-            if (state.isDone()) {
+            // any PLANNING or later state means the query has been submitted for execution
+            if (state.ordinal() >= QueryState.PLANNING.ordinal()) {
                 submitted.set(null);
+            }
+            if (state.isDone()) {
                 queryExecutionFuture.cancel(true);
             }
         });
@@ -123,8 +126,8 @@ private void waitForMinimumWorkers()
             }
             ListenableFuture<Void> minimumWorkerFuture = clusterSizeMonitor.waitForMinimumWorkers(executionMinCount, getRequiredWorkersMaxWait(session));
             // when worker requirement is met, start the execution
-            addSuccessCallback(minimumWorkerFuture, () -> startExecution(queryExecution));
-            addExceptionCallback(minimumWorkerFuture, throwable -> queryExecutor.execute(() -> stateMachine.transitionToFailed(throwable)));
+            addSuccessCallback(minimumWorkerFuture, () -> startExecution(queryExecution), queryExecutor);
+            addExceptionCallback(minimumWorkerFuture, throwable -> stateMachine.transitionToFailed(throwable), queryExecutor);
 
             // cancel minimumWorkerFuture if query fails for some reason or is cancelled by user
             stateMachine.addStateChangeListener(state -> {
@@ -137,25 +140,23 @@ private void waitForMinimumWorkers()
 
     private void startExecution(QueryExecution queryExecution)
     {
-        queryExecutor.execute(() -> {
-            if (stateMachine.transitionToDispatching()) {
-                try {
-                    querySubmitter.accept(queryExecution);
-                    if (notificationSentOrGuaranteed.compareAndSet(false, true)) {
-                        queryExecution.addFinalQueryInfoListener(queryMonitor::queryCompletedEvent);
-                    }
-                }
-                catch (Throwable t) {
-                    // this should never happen but be safe
-                    stateMachine.transitionToFailed(t);
-                    log.error(t, "query submitter threw exception");
-                    throw t;
-                }
-                finally {
-                    submitted.set(null);
+        if (stateMachine.transitionToDispatching()) {
+            try {
+                querySubmitter.accept(queryExecution);
+                if (notificationSentOrGuaranteed.compareAndSet(false, true)) {
+                    queryExecution.addFinalQueryInfoListener(queryMonitor::queryCompletedEvent);
                 }
             }
-        });
+            catch (Throwable t) {
+                // this should never happen but be safe
+                stateMachine.transitionToFailed(t);
+                log.error(t, "query submitter threw exception");
+                throw t;
+            }
+            finally {
+                submitted.set(null);
+            }
+        }
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/dispatcher/LocalDispatchQueryFactory.java b/core/trino-main/src/main/java/io/trino/dispatcher/LocalDispatchQueryFactory.java
index 54ee292675f3..5205b1268a9e 100644
--- a/core/trino-main/src/main/java/io/trino/dispatcher/LocalDispatchQueryFactory.java
+++ b/core/trino-main/src/main/java/io/trino/dispatcher/LocalDispatchQueryFactory.java
@@ -15,6 +15,7 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.inject.Inject;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.log.Logger;
 import io.trino.FeaturesConfig;
@@ -41,8 +42,6 @@
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
 
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/dispatcher/QueuedStatementResource.java b/core/trino-main/src/main/java/io/trino/dispatcher/QueuedStatementResource.java
index 861b39aaef2c..b4cd5713344c 100644
--- a/core/trino-main/src/main/java/io/trino/dispatcher/QueuedStatementResource.java
+++ b/core/trino-main/src/main/java/io/trino/dispatcher/QueuedStatementResource.java
@@ -18,8 +18,13 @@
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.client.QueryError;
 import io.trino.client.QueryResults;
 import io.trino.client.StatementStats;
@@ -37,33 +42,32 @@
 import io.trino.spi.ErrorCode;
 import io.trino.spi.QueryId;
 import io.trino.spi.security.Identity;
-
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
+import io.trino.tracing.TrinoAttributes;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
 
 import java.net.URI;
 import java.util.Optional;
+import java.util.OptionalDouble;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executor;
@@ -88,15 +92,15 @@
 import static io.trino.server.security.ResourceSecurity.AccessType.AUTHENTICATED_USER;
 import static io.trino.server.security.ResourceSecurity.AccessType.PUBLIC;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 
 @Path("/v1/statement")
 public class QueuedStatementResource
@@ -108,6 +112,7 @@ public class QueuedStatementResource
 
     private final HttpRequestSessionContextFactory sessionContextFactory;
     private final DispatchManager dispatchManager;
+    private final Tracer tracer;
 
     private final QueryInfoUrlFactory queryInfoUrlFactory;
 
@@ -122,6 +127,7 @@ public class QueuedStatementResource
     public QueuedStatementResource(
             HttpRequestSessionContextFactory sessionContextFactory,
             DispatchManager dispatchManager,
+            Tracer tracer,
             DispatchExecutor executor,
             QueryInfoUrlFactory queryInfoUrlTemplate,
             ServerConfig serverConfig,
@@ -130,6 +136,7 @@ public QueuedStatementResource(
     {
         this.sessionContextFactory = requireNonNull(sessionContextFactory, "sessionContextFactory is null");
         this.dispatchManager = requireNonNull(dispatchManager, "dispatchManager is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
         this.responseExecutor = executor.getExecutor();
         this.timeoutExecutor = executor.getScheduledExecutor();
         this.queryInfoUrlFactory = requireNonNull(queryInfoUrlTemplate, "queryInfoUrlTemplate is null");
@@ -179,7 +186,7 @@ private Query registerQuery(String statement, HttpServletRequest servletRequest,
         MultivaluedMap<String, String> headers = httpHeaders.getRequestHeaders();
 
         SessionContext sessionContext = sessionContextFactory.createSessionContext(headers, alternateHeaderName, remoteAddress, identity);
-        Query query = new Query(statement, sessionContext, dispatchManager, queryInfoUrlFactory);
+        Query query = new Query(statement, sessionContext, dispatchManager, queryInfoUrlFactory, tracer);
         queryManager.registerQuery(query);
 
         // let authentication filter know that identity lifecycle has been handed off
@@ -282,6 +289,8 @@ private static QueryResults createQueryResults(
                 StatementStats.builder()
                         .setState(state.toString())
                         .setQueued(state == QUEUED)
+                        .setProgressPercentage(OptionalDouble.empty())
+                        .setRunningPercentage(OptionalDouble.empty())
                         .setElapsedTimeMillis(elapsedTime.toMillis())
                         .setQueuedTimeMillis(queuedTime.toMillis())
                         .build(),
@@ -307,6 +316,7 @@ private static final class Query
         private final DispatchManager dispatchManager;
         private final QueryId queryId;
         private final Optional<URI> queryInfoUrl;
+        private final Span querySpan;
         private final Slug slug = Slug.createNew();
         private final AtomicLong lastToken = new AtomicLong();
 
@@ -314,7 +324,7 @@ private static final class Query
         private final AtomicReference<Boolean> submissionGate = new AtomicReference<>();
         private final SettableFuture<Void> creationFuture = SettableFuture.create();
 
-        public Query(String query, SessionContext sessionContext, DispatchManager dispatchManager, QueryInfoUrlFactory queryInfoUrlFactory)
+        public Query(String query, SessionContext sessionContext, DispatchManager dispatchManager, QueryInfoUrlFactory queryInfoUrlFactory, Tracer tracer)
         {
             this.query = requireNonNull(query, "query is null");
             this.sessionContext = requireNonNull(sessionContext, "sessionContext is null");
@@ -322,6 +332,10 @@ public Query(String query, SessionContext sessionContext, DispatchManager dispat
             this.queryId = dispatchManager.createQueryId();
             requireNonNull(queryInfoUrlFactory, "queryInfoUrlFactory is null");
             this.queryInfoUrl = queryInfoUrlFactory.getQueryInfoUrl(queryId);
+            requireNonNull(tracer, "tracer is null");
+            this.querySpan = tracer.spanBuilder("query")
+                    .setAttribute(TrinoAttributes.QUERY_ID, queryId.toString())
+                    .startSpan();
         }
 
         public QueryId getQueryId()
@@ -367,7 +381,8 @@ private ListenableFuture<Void> waitForDispatched()
         private void submitIfNeeded()
         {
             if (submissionGate.compareAndSet(null, true)) {
-                creationFuture.setFuture(dispatchManager.createQuery(queryId, slug, sessionContext, query));
+                querySpan.addEvent("submit");
+                creationFuture.setFuture(dispatchManager.createQuery(queryId, querySpan, slug, sessionContext, query));
             }
         }
 
@@ -405,6 +420,7 @@ public void cancel()
 
         public void destroy()
         {
+            querySpan.setStatus(StatusCode.ERROR).end();
             sessionContext.getIdentity().destroy();
         }
 
@@ -485,7 +501,15 @@ public QueryManager(Duration querySubmissionTimeout)
 
         public void initialize(DispatchManager dispatchManager)
         {
-            scheduledExecutorService.scheduleWithFixedDelay(() -> syncWith(dispatchManager), 200, 200, MILLISECONDS);
+            scheduledExecutorService.scheduleWithFixedDelay(() -> {
+                try {
+                    syncWith(dispatchManager);
+                }
+                catch (Throwable e) {
+                    // ignore to avoid getting unscheduled
+                    log.error(e, "Unexpected error synchronizing with dispatch manager");
+                }
+            }, 200, 200, MILLISECONDS);
         }
 
         public void destroy()
diff --git a/core/trino-main/src/main/java/io/trino/event/QueryMonitor.java b/core/trino-main/src/main/java/io/trino/event/QueryMonitor.java
index 0c637a20f56d..5aeb4df582cf 100644
--- a/core/trino-main/src/main/java/io/trino/event/QueryMonitor.java
+++ b/core/trino-main/src/main/java/io/trino/event/QueryMonitor.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
 import io.airlift.node.NodeInfo;
@@ -75,8 +76,6 @@
 import io.trino.transaction.TransactionId;
 import org.joda.time.DateTime;
 
-import javax.inject.Inject;
-
 import java.time.Duration;
 import java.util.Collection;
 import java.util.LinkedHashMap;
@@ -201,6 +200,7 @@ public void queryImmediateFailureEvent(BasicQueryInfo queryInfo, ExecutionFailur
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
+                        Optional.empty(),
                         0,
                         0,
                         0,
@@ -304,6 +304,7 @@ private QueryStatistics createQueryStatistics(QueryInfo queryInfo)
                 Optional.of(ofMillis(queryStats.getResourceWaitingTime().toMillis())),
                 Optional.of(ofMillis(queryStats.getAnalysisTime().toMillis())),
                 Optional.of(ofMillis(queryStats.getPlanningTime().toMillis())),
+                Optional.of(ofMillis(queryStats.getPlanningCpuTime().toMillis())),
                 Optional.of(ofMillis(queryStats.getExecutionTime().toMillis())),
                 Optional.of(ofMillis(queryStats.getInputBlockedTime().toMillis())),
                 Optional.of(ofMillis(queryStats.getFailedInputBlockedTime().toMillis())),
@@ -342,7 +343,9 @@ private QueryContext createQueryContext(SessionRepresentation session, Optional<
     {
         return new QueryContext(
                 session.getUser(),
+                session.getOriginalUser(),
                 session.getPrincipal(),
+                session.getEnabledRoles(),
                 session.getGroups(),
                 session.getTraceToken(),
                 session.getRemoteUserAddress(),
@@ -351,6 +354,7 @@ private QueryContext createQueryContext(SessionRepresentation session, Optional<
                 session.getClientTags(),
                 session.getClientCapabilities(),
                 session.getSource(),
+                session.getTimeZone(),
                 session.getCatalog(),
                 session.getSchema(),
                 resourceGroup,
@@ -430,6 +434,7 @@ private static QueryIOMetadata getQueryIOMetadata(QueryInfo queryInfo)
 
             inputs.add(new QueryInputMetadata(
                     input.getCatalogName(),
+                    input.getCatalogVersion(),
                     input.getSchema(),
                     input.getTable(),
                     input.getColumns().stream()
@@ -461,6 +466,7 @@ private static QueryIOMetadata getQueryIOMetadata(QueryInfo queryInfo)
             output = Optional.of(
                     new QueryOutputMetadata(
                             queryInfo.getOutput().get().getCatalogName(),
+                            queryInfo.getOutput().get().getCatalogVersion(),
                             queryInfo.getOutput().get().getSchema(),
                             queryInfo.getOutput().get().getTable(),
                             outputColumnsMetadata,
diff --git a/core/trino-main/src/main/java/io/trino/event/QueryMonitorConfig.java b/core/trino-main/src/main/java/io/trino/event/QueryMonitorConfig.java
index 9ff1d46b6055..914c2d00d520 100644
--- a/core/trino-main/src/main/java/io/trino/event/QueryMonitorConfig.java
+++ b/core/trino-main/src/main/java/io/trino/event/QueryMonitorConfig.java
@@ -18,8 +18,7 @@
 import io.airlift.units.DataSize.Unit;
 import io.airlift.units.MaxDataSize;
 import io.airlift.units.MinDataSize;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class QueryMonitorConfig
 {
diff --git a/core/trino-main/src/main/java/io/trino/event/SplitMonitor.java b/core/trino-main/src/main/java/io/trino/event/SplitMonitor.java
index 5f1a75896791..9696326da2f3 100644
--- a/core/trino-main/src/main/java/io/trino/event/SplitMonitor.java
+++ b/core/trino-main/src/main/java/io/trino/event/SplitMonitor.java
@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.eventlistener.EventListenerManager;
 import io.trino.execution.TaskId;
@@ -24,9 +25,7 @@
 import io.trino.spi.eventlistener.SplitCompletedEvent;
 import io.trino.spi.eventlistener.SplitFailureInfo;
 import io.trino.spi.eventlistener.SplitStatistics;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
+import jakarta.annotation.Nullable;
 
 import java.time.Duration;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/eventlistener/EventListenerConfig.java b/core/trino-main/src/main/java/io/trino/eventlistener/EventListenerConfig.java
index 625feaf58182..8cd69fe1ce0f 100644
--- a/core/trino-main/src/main/java/io/trino/eventlistener/EventListenerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/eventlistener/EventListenerConfig.java
@@ -17,8 +17,7 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/exchange/ExchangeManagerRegistry.java b/core/trino-main/src/main/java/io/trino/exchange/ExchangeManagerRegistry.java
index 8e4df6fb39d6..6ebb2086dcb4 100644
--- a/core/trino-main/src/main/java/io/trino/exchange/ExchangeManagerRegistry.java
+++ b/core/trino-main/src/main/java/io/trino/exchange/ExchangeManagerRegistry.java
@@ -18,8 +18,7 @@
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.exchange.ExchangeManager;
 import io.trino.spi.exchange.ExchangeManagerFactory;
-
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/core/trino-main/src/main/java/io/trino/execution/AddColumnTask.java b/core/trino-main/src/main/java/io/trino/execution/AddColumnTask.java
index 850517ad6260..9fd1b52ead1e 100644
--- a/core/trino-main/src/main/java/io/trino/execution/AddColumnTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/AddColumnTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.ColumnPropertyManager;
@@ -21,25 +22,31 @@
 import io.trino.metadata.RedirectionAwareTableHandle;
 import io.trino.metadata.TableHandle;
 import io.trino.security.AccessControl;
+import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeNotFoundException;
 import io.trino.sql.PlannerContext;
 import io.trino.sql.tree.AddColumn;
 import io.trino.sql.tree.ColumnDefinition;
 import io.trino.sql.tree.Expression;
-
-import javax.inject.Inject;
+import io.trino.sql.tree.Identifier;
 
 import java.util.List;
 import java.util.Map;
 
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Iterables.getLast;
+import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
 import static io.trino.execution.ParameterExtractor.bindParameters;
 import static io.trino.metadata.MetadataUtil.createQualifiedObjectName;
+import static io.trino.spi.StandardErrorCode.AMBIGUOUS_NAME;
 import static io.trino.spi.StandardErrorCode.COLUMN_ALREADY_EXISTS;
+import static io.trino.spi.StandardErrorCode.COLUMN_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.COLUMN_TYPE_UNKNOWN;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
@@ -82,59 +89,119 @@ public ListenableFuture<Void> execute(
         Session session = stateMachine.getSession();
         QualifiedObjectName originalTableName = createQualifiedObjectName(session, statement, statement.getName());
         RedirectionAwareTableHandle redirectionAwareTableHandle = plannerContext.getMetadata().getRedirectionAwareTableHandle(session, originalTableName);
-        if (redirectionAwareTableHandle.getTableHandle().isEmpty()) {
+        if (redirectionAwareTableHandle.tableHandle().isEmpty()) {
             if (!statement.isTableExists()) {
                 throw semanticException(TABLE_NOT_FOUND, statement, "Table '%s' does not exist", originalTableName);
             }
             return immediateVoidFuture();
         }
-        TableHandle tableHandle = redirectionAwareTableHandle.getTableHandle().get();
+        TableHandle tableHandle = redirectionAwareTableHandle.tableHandle().get();
         CatalogHandle catalogHandle = tableHandle.getCatalogHandle();
 
-        accessControl.checkCanAddColumns(session.toSecurityContext(), redirectionAwareTableHandle.getRedirectedTableName().orElse(originalTableName));
+        QualifiedObjectName qualifiedTableName = redirectionAwareTableHandle.redirectedTableName().orElse(originalTableName);
 
         Map<String, ColumnHandle> columnHandles = plannerContext.getMetadata().getColumnHandles(session, tableHandle);
 
         ColumnDefinition element = statement.getColumn();
+        Identifier columnName = element.getName().getOriginalParts().get(0);
         Type type;
         try {
             type = plannerContext.getTypeManager().getType(toTypeSignature(element.getType()));
         }
         catch (TypeNotFoundException e) {
-            throw semanticException(TYPE_NOT_FOUND, element, "Unknown type '%s' for column '%s'", element.getType(), element.getName());
-        }
-        if (type.equals(UNKNOWN)) {
-            throw semanticException(COLUMN_TYPE_UNKNOWN, element, "Unknown type '%s' for column '%s'", element.getType(), element.getName());
+            throw semanticException(TYPE_NOT_FOUND, element, "Unknown type '%s' for column '%s'", element.getType(), columnName);
         }
-        if (columnHandles.containsKey(element.getName().getValue().toLowerCase(ENGLISH))) {
-            if (!statement.isColumnNotExists()) {
-                throw semanticException(COLUMN_ALREADY_EXISTS, statement, "Column '%s' already exists", element.getName());
+
+        if (element.getName().getParts().size() == 1) {
+            accessControl.checkCanAddColumns(session.toSecurityContext(), qualifiedTableName);
+
+            if (type.equals(UNKNOWN)) {
+                throw semanticException(COLUMN_TYPE_UNKNOWN, element, "Unknown type '%s' for column '%s'", element.getType(), columnName);
             }
-            return immediateVoidFuture();
+            if (columnHandles.containsKey(columnName.getValue().toLowerCase(ENGLISH))) {
+                if (!statement.isColumnNotExists()) {
+                    throw semanticException(COLUMN_ALREADY_EXISTS, statement, "Column '%s' already exists", columnName);
+                }
+                return immediateVoidFuture();
+            }
+            if (!element.isNullable() && !plannerContext.getMetadata().getConnectorCapabilities(session, catalogHandle).contains(NOT_NULL_COLUMN_CONSTRAINT)) {
+                throw semanticException(NOT_SUPPORTED, element, "Catalog '%s' does not support NOT NULL for column '%s'", catalogHandle, columnName);
+            }
+
+            Map<String, Object> columnProperties = columnPropertyManager.getProperties(
+                    catalogHandle.getCatalogName(),
+                    catalogHandle,
+                    element.getProperties(),
+                    session,
+                    plannerContext,
+                    accessControl,
+                    bindParameters(statement, parameters),
+                    true);
+
+            ColumnMetadata column = ColumnMetadata.builder()
+                    .setName(columnName.getValue())
+                    .setType(type)
+                    .setNullable(element.isNullable())
+                    .setComment(element.getComment())
+                    .setProperties(columnProperties)
+                    .build();
+
+            plannerContext.getMetadata().addColumn(session, tableHandle, qualifiedTableName.asCatalogSchemaTableName(), column);
         }
-        if (!element.isNullable() && !plannerContext.getMetadata().getConnectorCapabilities(session, catalogHandle).contains(NOT_NULL_COLUMN_CONSTRAINT)) {
-            throw semanticException(NOT_SUPPORTED, element, "Catalog '%s' does not support NOT NULL for column '%s'", catalogHandle, element.getName());
+        else {
+            accessControl.checkCanAlterColumn(session.toSecurityContext(), qualifiedTableName);
+
+            if (!columnHandles.containsKey(columnName.getValue().toLowerCase(ENGLISH))) {
+                throw semanticException(COLUMN_NOT_FOUND, statement, "Column '%s' does not exist", columnName);
+            }
+
+            List<String> parentPath = statement.getColumn().getName().getOriginalParts().subList(0, statement.getColumn().getName().getOriginalParts().size() - 1).stream()
+                    .map(identifier -> identifier.getValue().toLowerCase(ENGLISH))
+                    .collect(toImmutableList());
+            List<String> fieldPath = statement.getColumn().getName().getOriginalParts().subList(1, statement.getColumn().getName().getOriginalParts().size()).stream()
+                    .map(Identifier::getValue)
+                    .collect(toImmutableList());
+
+            ColumnMetadata columnMetadata = plannerContext.getMetadata().getColumnMetadata(session, tableHandle, columnHandles.get(columnName.getValue().toLowerCase(ENGLISH)));
+            Type currentType = columnMetadata.getType();
+            for (int i = 0; i < fieldPath.size() - 1; i++) {
+                String fieldName = fieldPath.get(i);
+                List<RowType.Field> candidates = getCandidates(currentType, fieldName);
+
+                if (candidates.isEmpty()) {
+                    throw semanticException(COLUMN_NOT_FOUND, statement, "Field '%s' does not exist within %s", fieldName, currentType);
+                }
+                if (candidates.size() > 1) {
+                    throw semanticException(AMBIGUOUS_NAME, statement, "Field path %s within %s is ambiguous", fieldPath, columnMetadata.getType());
+                }
+                currentType = getOnlyElement(candidates).getType();
+            }
+
+            String fieldName = getLast(statement.getColumn().getName().getParts());
+            List<RowType.Field> candidates = getCandidates(currentType, fieldName);
+
+            if (!candidates.isEmpty()) {
+                if (statement.isColumnNotExists()) {
+                    return immediateVoidFuture();
+                }
+                throw semanticException(COLUMN_ALREADY_EXISTS, statement, "Field '%s' already exists", fieldName);
+            }
+            plannerContext.getMetadata().addField(session, tableHandle, parentPath, fieldName, type, statement.isColumnNotExists());
         }
-        Map<String, Object> columnProperties = columnPropertyManager.getProperties(
-                catalogHandle.getCatalogName(),
-                catalogHandle,
-                element.getProperties(),
-                session,
-                plannerContext,
-                accessControl,
-                bindParameters(statement, parameters),
-                true);
-
-        ColumnMetadata column = ColumnMetadata.builder()
-                .setName(element.getName().getValue())
-                .setType(type)
-                .setNullable(element.isNullable())
-                .setComment(element.getComment())
-                .setProperties(columnProperties)
-                .build();
-
-        plannerContext.getMetadata().addColumn(session, tableHandle, column);
 
         return immediateVoidFuture();
     }
+
+    private static List<RowType.Field> getCandidates(Type type, String fieldName)
+    {
+        if (!(type instanceof RowType rowType)) {
+            throw new TrinoException(NOT_SUPPORTED, "Unsupported type: " + type);
+        }
+        List<RowType.Field> candidates = rowType.getFields().stream()
+                // case-insensitive match
+                .filter(rowField -> rowField.getName().isPresent() && rowField.getName().get().equalsIgnoreCase(fieldName))
+                .collect(toImmutableList());
+
+        return candidates;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/BasicStageStats.java b/core/trino-main/src/main/java/io/trino/execution/BasicStageStats.java
index 6d62bdb96be1..6ef3d5b336f3 100644
--- a/core/trino-main/src/main/java/io/trino/execution/BasicStageStats.java
+++ b/core/trino-main/src/main/java/io/trino/execution/BasicStageStats.java
@@ -62,6 +62,7 @@ public class BasicStageStats
             false,
             ImmutableSet.of(),
 
+            OptionalDouble.empty(),
             OptionalDouble.empty());
 
     private final boolean isScheduled;
@@ -77,8 +78,8 @@ public class BasicStageStats
     private final long internalNetworkInputPositions;
     private final DataSize rawInputDataSize;
     private final long rawInputPositions;
-    private final long cumulativeUserMemory;
-    private final long failedCumulativeUserMemory;
+    private final double cumulativeUserMemory;
+    private final double failedCumulativeUserMemory;
     private final DataSize userMemoryReservation;
     private final DataSize totalMemoryReservation;
     private final Duration totalCpuTime;
@@ -88,6 +89,7 @@ public class BasicStageStats
     private final boolean fullyBlocked;
     private final Set<BlockedReason> blockedReasons;
     private final OptionalDouble progressPercentage;
+    private final OptionalDouble runningPercentage;
 
     public BasicStageStats(
             boolean isScheduled,
@@ -109,8 +111,8 @@ public BasicStageStats(
             DataSize rawInputDataSize,
             long rawInputPositions,
 
-            long cumulativeUserMemory,
-            long failedCumulativeUserMemory,
+            double cumulativeUserMemory,
+            double failedCumulativeUserMemory,
             DataSize userMemoryReservation,
             DataSize totalMemoryReservation,
 
@@ -122,7 +124,8 @@ public BasicStageStats(
             boolean fullyBlocked,
             Set<BlockedReason> blockedReasons,
 
-            OptionalDouble progressPercentage)
+            OptionalDouble progressPercentage,
+            OptionalDouble runningPercentage)
     {
         this.isScheduled = isScheduled;
         this.failedTasks = failedTasks;
@@ -148,6 +151,7 @@ public BasicStageStats(
         this.fullyBlocked = fullyBlocked;
         this.blockedReasons = ImmutableSet.copyOf(requireNonNull(blockedReasons, "blockedReasons is null"));
         this.progressPercentage = requireNonNull(progressPercentage, "progressPercentage is null");
+        this.runningPercentage = requireNonNull(runningPercentage, "runningPerentage is null");
     }
 
     public boolean isScheduled()
@@ -215,12 +219,12 @@ public Duration getPhysicalInputReadTime()
         return physicalInputReadTime;
     }
 
-    public long getCumulativeUserMemory()
+    public double getCumulativeUserMemory()
     {
         return cumulativeUserMemory;
     }
 
-    public long getFailedCumulativeUserMemory()
+    public double getFailedCumulativeUserMemory()
     {
         return failedCumulativeUserMemory;
     }
@@ -270,6 +274,11 @@ public OptionalDouble getProgressPercentage()
         return progressPercentage;
     }
 
+    public OptionalDouble getRunningPercentage()
+    {
+        return runningPercentage;
+    }
+
     public static BasicStageStats aggregateBasicStageStats(Iterable<BasicStageStats> stages)
     {
         int failedTasks = 0;
@@ -279,8 +288,8 @@ public static BasicStageStats aggregateBasicStageStats(Iterable<BasicStageStats>
         int runningDrivers = 0;
         int completedDrivers = 0;
 
-        long cumulativeUserMemory = 0;
-        long failedCumulativeUserMemory = 0;
+        double cumulativeUserMemory = 0;
+        double failedCumulativeUserMemory = 0;
         long userMemoryReservation = 0;
         long totalMemoryReservation = 0;
 
@@ -342,6 +351,10 @@ public static BasicStageStats aggregateBasicStageStats(Iterable<BasicStageStats>
         if (isScheduled && totalDrivers != 0) {
             progressPercentage = OptionalDouble.of(min(100, (completedDrivers * 100.0) / totalDrivers));
         }
+        OptionalDouble runningPercentage = OptionalDouble.empty();
+        if (isScheduled && totalDrivers != 0) {
+            runningPercentage = OptionalDouble.of(min(100, (runningDrivers * 100.0) / totalDrivers));
+        }
 
         return new BasicStageStats(
                 isScheduled,
@@ -376,6 +389,7 @@ public static BasicStageStats aggregateBasicStageStats(Iterable<BasicStageStats>
                 fullyBlocked,
                 blockedReasons,
 
-                progressPercentage);
+                progressPercentage,
+                runningPercentage);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/CallTask.java b/core/trino-main/src/main/java/io/trino/execution/CallTask.java
index cba836740393..f67052f28a54 100644
--- a/core/trino-main/src/main/java/io/trino/execution/CallTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/CallTask.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.ProcedureRegistry;
@@ -22,7 +23,7 @@
 import io.trino.security.AccessControl;
 import io.trino.security.InjectedConnectorAccessControl;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.Block;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
@@ -40,8 +41,6 @@
 import io.trino.sql.tree.Parameter;
 import io.trino.transaction.TransactionManager;
 
-import javax.inject.Inject;
-
 import java.lang.invoke.MethodType;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -223,8 +222,7 @@ else if (ConnectorAccessControl.class.equals(type)) {
 
     private static Object toTypeObjectValue(Session session, Type type, Object value)
     {
-        BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
-        writeNativeValue(type, blockBuilder, value);
-        return type.getObjectValue(session.toConnectorSession(), blockBuilder, 0);
+        Block block = writeNativeValue(type, value);
+        return type.getObjectValue(session.toConnectorSession(), block, 0);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/ClusterSizeMonitor.java b/core/trino-main/src/main/java/io/trino/execution/ClusterSizeMonitor.java
index 8498bc040a9b..d44c521ef5a0 100644
--- a/core/trino-main/src/main/java/io/trino/execution/ClusterSizeMonitor.java
+++ b/core/trino-main/src/main/java/io/trino/execution/ClusterSizeMonitor.java
@@ -17,18 +17,17 @@
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
 import io.trino.execution.scheduler.NodeSchedulerConfig;
 import io.trino.metadata.AllNodes;
 import io.trino.metadata.InternalNodeManager;
 import io.trino.spi.TrinoException;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.util.PriorityQueue;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
diff --git a/core/trino-main/src/main/java/io/trino/execution/CommentTask.java b/core/trino-main/src/main/java/io/trino/execution/CommentTask.java
index 80f705b4ddb5..994b5e4838ae 100644
--- a/core/trino-main/src/main/java/io/trino/execution/CommentTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/CommentTask.java
@@ -14,8 +14,10 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
+import io.trino.metadata.MaterializedViewDefinition;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.RedirectionAwareTableHandle;
@@ -28,8 +30,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.QualifiedName;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 
@@ -104,12 +104,12 @@ private void commentOnTable(Comment statement, Session session)
         }
 
         RedirectionAwareTableHandle redirectionAwareTableHandle = metadata.getRedirectionAwareTableHandle(session, originalTableName);
-        if (redirectionAwareTableHandle.getTableHandle().isEmpty()) {
+        if (redirectionAwareTableHandle.tableHandle().isEmpty()) {
             throw semanticException(TABLE_NOT_FOUND, statement, "Table does not exist: %s", originalTableName);
         }
 
-        accessControl.checkCanSetTableComment(session.toSecurityContext(), redirectionAwareTableHandle.getRedirectedTableName().orElse(originalTableName));
-        TableHandle tableHandle = redirectionAwareTableHandle.getTableHandle().get();
+        accessControl.checkCanSetTableComment(session.toSecurityContext(), redirectionAwareTableHandle.redirectedTableName().orElse(originalTableName));
+        TableHandle tableHandle = redirectionAwareTableHandle.tableHandle().get();
         metadata.setTableComment(session, tableHandle, statement.getComment());
     }
 
@@ -141,25 +141,21 @@ private void commentOnColumn(Comment statement, Session session)
 
         QualifiedObjectName originalObjectName = createQualifiedObjectName(session, statement, prefix);
         if (metadata.isView(session, originalObjectName)) {
-            String columnName = statement.getName().getSuffix();
             ViewDefinition viewDefinition = metadata.getView(session, originalObjectName).get();
-            ViewColumn viewColumn = viewDefinition.getColumns().stream()
-                    .filter(column -> column.getName().equals(columnName))
-                    .findAny()
-                    .orElseThrow(() -> semanticException(COLUMN_NOT_FOUND, statement, "Column does not exist: %s", columnName));
-
-            accessControl.checkCanSetColumnComment(session.toSecurityContext(), originalObjectName);
+            ViewColumn viewColumn = findAndCheckViewColumn(statement, session, viewDefinition, originalObjectName);
             metadata.setViewColumnComment(session, originalObjectName, viewColumn.getName(), statement.getComment());
         }
         else if (metadata.isMaterializedView(session, originalObjectName)) {
-            throw semanticException(TABLE_NOT_FOUND, statement, "Setting comments on the columns of materialized views is unsupported");
+            MaterializedViewDefinition materializedViewDefinition = metadata.getMaterializedView(session, originalObjectName).get();
+            ViewColumn viewColumn = findAndCheckViewColumn(statement, session, materializedViewDefinition, originalObjectName);
+            metadata.setMaterializedViewColumnComment(session, originalObjectName, viewColumn.getName(), statement.getComment());
         }
         else {
             RedirectionAwareTableHandle redirectionAwareTableHandle = metadata.getRedirectionAwareTableHandle(session, originalObjectName);
-            if (redirectionAwareTableHandle.getTableHandle().isEmpty()) {
+            if (redirectionAwareTableHandle.tableHandle().isEmpty()) {
                 throw semanticException(TABLE_NOT_FOUND, statement, "Table does not exist: %s", originalObjectName);
             }
-            TableHandle tableHandle = redirectionAwareTableHandle.getTableHandle().get();
+            TableHandle tableHandle = redirectionAwareTableHandle.tableHandle().get();
 
             String columnName = statement.getName().getSuffix();
             Map<String, ColumnHandle> columnHandles = metadata.getColumnHandles(session, tableHandle);
@@ -167,9 +163,20 @@ else if (metadata.isMaterializedView(session, originalObjectName)) {
                 throw semanticException(COLUMN_NOT_FOUND, statement, "Column does not exist: %s", columnName);
             }
 
-            accessControl.checkCanSetColumnComment(session.toSecurityContext(), redirectionAwareTableHandle.getRedirectedTableName().orElse(originalObjectName));
+            accessControl.checkCanSetColumnComment(session.toSecurityContext(), redirectionAwareTableHandle.redirectedTableName().orElse(originalObjectName));
 
             metadata.setColumnComment(session, tableHandle, columnHandles.get(columnName), statement.getComment());
         }
     }
+
+    private ViewColumn findAndCheckViewColumn(Comment statement, Session session, ViewDefinition viewDefinition, QualifiedObjectName originalObjectName)
+    {
+        String columnName = statement.getName().getSuffix();
+        ViewColumn viewColumn = viewDefinition.getColumns().stream()
+                .filter(column -> column.getName().equals(columnName))
+                .findAny()
+                .orElseThrow(() -> semanticException(COLUMN_NOT_FOUND, statement, "Column does not exist: %s", columnName));
+        accessControl.checkCanSetColumnComment(session.toSecurityContext(), originalObjectName);
+        return viewColumn;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/CommitTask.java b/core/trino-main/src/main/java/io/trino/execution/CommitTask.java
index 43438e9adb7b..3e40aaf93dc6 100644
--- a/core/trino-main/src/main/java/io/trino/execution/CommitTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/CommitTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.spi.TrinoException;
@@ -22,8 +23,6 @@
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.spi.StandardErrorCode.NOT_IN_TRANSACTION;
diff --git a/core/trino-main/src/main/java/io/trino/execution/CreateCatalogTask.java b/core/trino-main/src/main/java/io/trino/execution/CreateCatalogTask.java
index 5d192ac2a063..bed8534adf8d 100644
--- a/core/trino-main/src/main/java/io/trino/execution/CreateCatalogTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/CreateCatalogTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.connector.ConnectorName;
 import io.trino.execution.warnings.WarningCollector;
@@ -26,8 +27,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.Property;
 
-import javax.inject.Inject;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/execution/CreateFunctionTask.java b/core/trino-main/src/main/java/io/trino/execution/CreateFunctionTask.java
new file mode 100644
index 000000000000..54d246310985
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/CreateFunctionTask.java
@@ -0,0 +1,172 @@
+/*
+ * Licensed 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 io.trino.execution;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
+import io.trino.Session;
+import io.trino.connector.system.GlobalSystemConnector;
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.metadata.FunctionManager;
+import io.trino.metadata.LanguageFunctionManager;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.QualifiedObjectName;
+import io.trino.security.AccessControl;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.CatalogSchemaName;
+import io.trino.spi.function.LanguageFunction;
+import io.trino.sql.SqlEnvironmentConfig;
+import io.trino.sql.parser.ParsingException;
+import io.trino.sql.parser.SqlParser;
+import io.trino.sql.tree.CreateFunction;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.FunctionSpecification;
+import io.trino.sql.tree.Node;
+import io.trino.sql.tree.QualifiedName;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiFunction;
+
+import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
+import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
+import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.StandardErrorCode.SYNTAX_ERROR;
+import static io.trino.sql.SqlFormatter.formatSql;
+import static io.trino.sql.analyzer.SemanticExceptions.semanticException;
+import static io.trino.sql.routine.SqlRoutineAnalyzer.isRunAsInvoker;
+import static java.util.Objects.requireNonNull;
+
+public class CreateFunctionTask
+        implements DataDefinitionTask<CreateFunction>
+{
+    private final Optional<CatalogSchemaName> defaultFunctionSchema;
+    private final SqlParser sqlParser;
+    private final Metadata metadata;
+    private final FunctionManager functionManager;
+    private final AccessControl accessControl;
+    private final LanguageFunctionManager languageFunctionManager;
+
+    @Inject
+    public CreateFunctionTask(
+            SqlEnvironmentConfig sqlEnvironmentConfig,
+            SqlParser sqlParser,
+            Metadata metadata,
+            FunctionManager functionManager,
+            AccessControl accessControl,
+            LanguageFunctionManager languageFunctionManager)
+    {
+        this.defaultFunctionSchema = defaultFunctionSchema(sqlEnvironmentConfig);
+        this.sqlParser = requireNonNull(sqlParser, "sqlParser is null");
+        this.metadata = requireNonNull(metadata, "metadata is null");
+        this.functionManager = requireNonNull(functionManager, "functionManager is null");
+        this.accessControl = requireNonNull(accessControl, "accessControl is null");
+        this.languageFunctionManager = requireNonNull(languageFunctionManager, "languageFunctionManager is null");
+    }
+
+    @Override
+    public String getName()
+    {
+        return "CREATE FUNCTION";
+    }
+
+    @Override
+    public ListenableFuture<Void> execute(CreateFunction statement, QueryStateMachine stateMachine, List<Expression> parameters, WarningCollector warningCollector)
+    {
+        Session session = stateMachine.getSession();
+
+        FunctionSpecification function = statement.getSpecification();
+        QualifiedObjectName name = qualifiedFunctionName(defaultFunctionSchema, statement, function.getName());
+
+        accessControl.checkCanCreateFunction(session.toSecurityContext(), name);
+
+        String formatted = formatSql(function);
+        verifyFormattedFunction(formatted, function);
+
+        languageFunctionManager.verifyForCreate(session, formatted, functionManager, accessControl);
+
+        String signatureToken = languageFunctionManager.getSignatureToken(function.getParameters());
+
+        // system path elements currently are not stored
+        List<CatalogSchemaName> path = session.getPath().getPath().stream()
+                .filter(element -> !element.getCatalogName().equals(GlobalSystemConnector.NAME))
+                .toList();
+
+        Optional<String> owner = isRunAsInvoker(function) ? Optional.empty() : Optional.of(session.getUser());
+
+        LanguageFunction languageFunction = new LanguageFunction(signatureToken, formatted, path, owner);
+
+        boolean replace = false;
+        if (metadata.languageFunctionExists(session, name, signatureToken)) {
+            if (!statement.isReplace()) {
+                throw semanticException(ALREADY_EXISTS, statement, "Function already exists");
+            }
+            accessControl.checkCanDropFunction(session.toSecurityContext(), name);
+            replace = true;
+        }
+
+        metadata.createLanguageFunction(session, name, languageFunction, replace);
+
+        return immediateVoidFuture();
+    }
+
+    private void verifyFormattedFunction(String sql, FunctionSpecification function)
+    {
+        try {
+            FunctionSpecification parsed = sqlParser.createFunctionSpecification(sql);
+            if (!function.equals(parsed)) {
+                throw formattingFailure(null, "Function does not round-trip", function, sql);
+            }
+        }
+        catch (ParsingException e) {
+            throw formattingFailure(e, "Formatted function does not parse", function, sql);
+        }
+    }
+
+    static Optional<CatalogSchemaName> defaultFunctionSchema(SqlEnvironmentConfig config)
+    {
+        return combine(config.getDefaultFunctionCatalog(), config.getDefaultFunctionSchema(), CatalogSchemaName::new);
+    }
+
+    static QualifiedObjectName qualifiedFunctionName(Optional<CatalogSchemaName> functionSchema, Node node, QualifiedName name)
+    {
+        List<String> parts = name.getParts();
+        return switch (parts.size()) {
+            case 1 -> {
+                CatalogSchemaName schema = functionSchema.orElseThrow(() ->
+                        semanticException(NOT_SUPPORTED, node, "Catalog and schema must be specified when function schema is not configured"));
+                yield new QualifiedObjectName(schema.getCatalogName(), schema.getSchemaName(), parts.get(0));
+            }
+            case 2 -> throw semanticException(NOT_SUPPORTED, node, "Function name must be unqualified or fully qualified with catalog and schema");
+            case 3 -> new QualifiedObjectName(parts.get(0), parts.get(1), parts.get(2));
+            default -> throw semanticException(SYNTAX_ERROR, node, "Too many dots in function name: %s", name);
+        };
+    }
+
+    private static TrinoException formattingFailure(Throwable cause, String message, FunctionSpecification function, String sql)
+    {
+        TrinoException exception = new TrinoException(GENERIC_INTERNAL_ERROR, message, cause);
+        exception.addSuppressed(new RuntimeException("Function: " + function));
+        exception.addSuppressed(new RuntimeException("Formatted: [%s]".formatted(sql)));
+        return exception;
+    }
+
+    private static <T, U, R> Optional<R> combine(Optional<T> first, Optional<U> second, BiFunction<T, U, R> combiner)
+    {
+        return (first.isPresent() && second.isPresent())
+                ? Optional.of(combiner.apply(first.get(), second.get()))
+                : Optional.empty();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/CreateMaterializedViewTask.java b/core/trino-main/src/main/java/io/trino/execution/CreateMaterializedViewTask.java
index 78417c13c109..021ed3a89760 100644
--- a/core/trino-main/src/main/java/io/trino/execution/CreateMaterializedViewTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/CreateMaterializedViewTask.java
@@ -14,7 +14,9 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
+import io.trino.connector.system.GlobalSystemConnector;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.MaterializedViewDefinition;
 import io.trino.metadata.MaterializedViewPropertyManager;
@@ -33,8 +35,6 @@
 import io.trino.sql.tree.NodeRef;
 import io.trino.sql.tree.Parameter;
 
-import javax.inject.Inject;
-
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
@@ -156,6 +156,10 @@ public ListenableFuture<Void> execute(
                 gracePeriod,
                 statement.getComment(),
                 session.getIdentity(),
+                session.getPath().getPath().stream()
+                        // system path elements are not stored
+                        .filter(element -> !element.getCatalogName().equals(GlobalSystemConnector.NAME))
+                        .collect(toImmutableList()),
                 Optional.empty(),
                 properties);
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/CreateRoleTask.java b/core/trino-main/src/main/java/io/trino/execution/CreateRoleTask.java
index f460b6356dfc..4479ff942e0d 100644
--- a/core/trino-main/src/main/java/io/trino/execution/CreateRoleTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/CreateRoleTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -23,8 +24,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.Identifier;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/CreateSchemaTask.java b/core/trino-main/src/main/java/io/trino/execution/CreateSchemaTask.java
index 4579e2cb2d5e..24c98b16e2f3 100644
--- a/core/trino-main/src/main/java/io/trino/execution/CreateSchemaTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/CreateSchemaTask.java
@@ -15,6 +15,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -29,8 +30,6 @@
 import io.trino.sql.tree.CreateSchema;
 import io.trino.sql.tree.Expression;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/execution/CreateTableTask.java b/core/trino-main/src/main/java/io/trino/execution/CreateTableTask.java
index e4b537214f0a..955e3a83ae95 100644
--- a/core/trino-main/src/main/java/io/trino/execution/CreateTableTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/CreateTableTask.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.ColumnPropertyManager;
@@ -31,6 +32,7 @@
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorTableMetadata;
+import io.trino.spi.connector.SaveMode;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeNotFoundException;
@@ -40,13 +42,12 @@
 import io.trino.sql.tree.ColumnDefinition;
 import io.trino.sql.tree.CreateTable;
 import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.LikeClause;
 import io.trino.sql.tree.NodeRef;
 import io.trino.sql.tree.Parameter;
 import io.trino.sql.tree.TableElement;
 
-import javax.inject.Inject;
-
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -62,6 +63,7 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
 import static io.trino.execution.ParameterExtractor.bindParameters;
 import static io.trino.metadata.MetadataUtil.createQualifiedObjectName;
@@ -81,6 +83,8 @@
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toTypeSignature;
 import static io.trino.sql.tree.LikeClause.PropertiesOption.EXCLUDING;
 import static io.trino.sql.tree.LikeClause.PropertiesOption.INCLUDING;
+import static io.trino.sql.tree.SaveMode.FAIL;
+import static io.trino.sql.tree.SaveMode.REPLACE;
 import static io.trino.type.UnknownType.UNKNOWN;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
@@ -139,8 +143,8 @@ ListenableFuture<Void> internalExecute(CreateTable statement, Session session, L
             }
             throw e;
         }
-        if (tableHandle.isPresent()) {
-            if (!statement.isNotExists()) {
+        if (tableHandle.isPresent() && statement.getSaveMode() != REPLACE) {
+            if (statement.getSaveMode() == FAIL) {
                 throw semanticException(TABLE_ALREADY_EXISTS, statement, "Table '%s' already exists", tableName);
             }
             return immediateVoidFuture();
@@ -149,27 +153,40 @@ ListenableFuture<Void> internalExecute(CreateTable statement, Session session, L
         String catalogName = tableName.getCatalogName();
         CatalogHandle catalogHandle = getRequiredCatalogHandle(plannerContext.getMetadata(), session, statement, catalogName);
 
+        Map<String, Object> properties = tablePropertyManager.getProperties(
+                catalogName,
+                catalogHandle,
+                statement.getProperties(),
+                session,
+                plannerContext,
+                accessControl,
+                parameterLookup,
+                true);
+
         LinkedHashMap<String, ColumnMetadata> columns = new LinkedHashMap<>();
         Map<String, Object> inheritedProperties = ImmutableMap.of();
         boolean includingProperties = false;
         for (TableElement element : statement.getElements()) {
             if (element instanceof ColumnDefinition column) {
-                String name = column.getName().getValue().toLowerCase(Locale.ENGLISH);
+                if (column.getName().getParts().size() != 1) {
+                    throw semanticException(NOT_SUPPORTED, statement, "Column name '%s' must not be qualified", column.getName());
+                }
+                Identifier name = getOnlyElement(column.getName().getOriginalParts());
                 Type type;
                 try {
                     type = plannerContext.getTypeManager().getType(toTypeSignature(column.getType()));
                 }
                 catch (TypeNotFoundException e) {
-                    throw semanticException(TYPE_NOT_FOUND, element, "Unknown type '%s' for column '%s'", column.getType(), column.getName());
+                    throw semanticException(TYPE_NOT_FOUND, element, "Unknown type '%s' for column '%s'", column.getType(), name);
                 }
                 if (type.equals(UNKNOWN)) {
-                    throw semanticException(COLUMN_TYPE_UNKNOWN, element, "Unknown type '%s' for column '%s'", column.getType(), column.getName());
+                    throw semanticException(COLUMN_TYPE_UNKNOWN, element, "Unknown type '%s' for column '%s'", column.getType(), name);
                 }
-                if (columns.containsKey(name)) {
-                    throw semanticException(DUPLICATE_COLUMN_NAME, column, "Column name '%s' specified more than once", column.getName());
+                if (columns.containsKey(name.getValue().toLowerCase(ENGLISH))) {
+                    throw semanticException(DUPLICATE_COLUMN_NAME, column, "Column name '%s' specified more than once", name);
                 }
                 if (!column.isNullable() && !plannerContext.getMetadata().getConnectorCapabilities(session, catalogHandle).contains(NOT_NULL_COLUMN_CONSTRAINT)) {
-                    throw semanticException(NOT_SUPPORTED, column, "Catalog '%s' does not support non-null column for column name '%s'", catalogName, column.getName());
+                    throw semanticException(NOT_SUPPORTED, column, "Catalog '%s' does not support non-null column for column name '%s'", catalogName, name);
                 }
                 Map<String, Object> columnProperties = columnPropertyManager.getProperties(
                         catalogName,
@@ -181,9 +198,9 @@ ListenableFuture<Void> internalExecute(CreateTable statement, Session session, L
                         parameterLookup,
                         true);
 
-                columns.put(name, ColumnMetadata.builder()
-                        .setName(name)
-                        .setType(type)
+                columns.put(name.getValue().toLowerCase(ENGLISH), ColumnMetadata.builder()
+                        .setName(name.getValue().toLowerCase(ENGLISH))
+                        .setType(getSupportedType(session, catalogHandle, properties, type))
                         .setNullable(column.isNullable())
                         .setComment(column.getComment())
                         .setProperties(columnProperties)
@@ -196,11 +213,11 @@ else if (element instanceof LikeClause likeClause) {
                 }
 
                 RedirectionAwareTableHandle redirection = plannerContext.getMetadata().getRedirectionAwareTableHandle(session, originalLikeTableName);
-                TableHandle likeTable = redirection.getTableHandle()
+                TableHandle likeTable = redirection.tableHandle()
                         .orElseThrow(() -> semanticException(TABLE_NOT_FOUND, statement, "LIKE table '%s' does not exist", originalLikeTableName));
 
                 LikeClause.PropertiesOption propertiesOption = likeClause.getPropertiesOption().orElse(EXCLUDING);
-                QualifiedObjectName likeTableName = redirection.getRedirectedTableName().orElse(originalLikeTableName);
+                QualifiedObjectName likeTableName = redirection.redirectedTableName().orElse(originalLikeTableName);
                 if (propertiesOption == INCLUDING && !catalogName.equals(likeTableName.getCatalogName())) {
                     if (!originalLikeTableName.equals(likeTableName)) {
                         throw semanticException(
@@ -252,22 +269,17 @@ else if (element instanceof LikeClause likeClause) {
                             if (columns.containsKey(column.getName().toLowerCase(Locale.ENGLISH))) {
                                 throw semanticException(DUPLICATE_COLUMN_NAME, element, "Column name '%s' specified more than once", column.getName());
                             }
-                            columns.put(column.getName().toLowerCase(Locale.ENGLISH), column);
+                            columns.put(
+                                    column.getName().toLowerCase(Locale.ENGLISH),
+                                    ColumnMetadata.builderFrom(column)
+                                            .setType(getSupportedType(session, catalogHandle, properties, column.getType()))
+                                            .build());
                         });
             }
             else {
                 throw new TrinoException(GENERIC_INTERNAL_ERROR, "Invalid TableElement: " + element.getClass().getName());
             }
         }
-        Map<String, Object> properties = tablePropertyManager.getProperties(
-                catalogName,
-                catalogHandle,
-                statement.getProperties(),
-                session,
-                plannerContext,
-                accessControl,
-                parameterLookup,
-                true);
 
         Set<String> specifiedPropertyKeys = statement.getProperties().stream()
                 // property names are case-insensitive and normalized to lower case
@@ -282,16 +294,17 @@ else if (element instanceof LikeClause likeClause) {
         Map<String, Object> finalProperties = combineProperties(specifiedPropertyKeys, properties, inheritedProperties);
         ConnectorTableMetadata tableMetadata = new ConnectorTableMetadata(tableName.asSchemaTableName(), ImmutableList.copyOf(columns.values()), finalProperties, statement.getComment());
         try {
-            plannerContext.getMetadata().createTable(session, catalogName, tableMetadata, statement.isNotExists());
+            plannerContext.getMetadata().createTable(session, catalogName, tableMetadata, toConnectorSaveMode(statement.getSaveMode()));
         }
         catch (TrinoException e) {
             // connectors are not required to handle the ignoreExisting flag
-            if (!e.getErrorCode().equals(ALREADY_EXISTS.toErrorCode()) || !statement.isNotExists()) {
+            if (!e.getErrorCode().equals(ALREADY_EXISTS.toErrorCode()) || statement.getSaveMode() == FAIL) {
                 throw e;
             }
         }
         outputConsumer.accept(new Output(
                 catalogName,
+                catalogHandle.getVersion(),
                 tableName.getSchemaName(),
                 tableName.getObjectName(),
                 Optional.of(tableMetadata.getColumns().stream()
@@ -300,6 +313,13 @@ else if (element instanceof LikeClause likeClause) {
         return immediateVoidFuture();
     }
 
+    private Type getSupportedType(Session session, CatalogHandle catalogHandle, Map<String, Object> tableProperties, Type type)
+    {
+        return plannerContext.getMetadata()
+                .getSupportedType(session, catalogHandle, tableProperties, type)
+                .orElse(type);
+    }
+
     private static Map<String, Object> combineProperties(Set<String> specifiedPropertyKeys, Map<String, Object> defaultProperties, Map<String, Object> inheritedProperties)
     {
         Map<String, Object> finalProperties = new HashMap<>(inheritedProperties);
@@ -310,4 +330,13 @@ private static Map<String, Object> combineProperties(Set<String> specifiedProper
         }
         return finalProperties;
     }
+
+    private static SaveMode toConnectorSaveMode(io.trino.sql.tree.SaveMode saveMode)
+    {
+        return switch (saveMode) {
+            case FAIL -> SaveMode.FAIL;
+            case IGNORE -> SaveMode.IGNORE;
+            case REPLACE -> SaveMode.REPLACE;
+        };
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/CreateViewTask.java b/core/trino-main/src/main/java/io/trino/execution/CreateViewTask.java
index 355ab34acc85..e52e5d6b8c12 100644
--- a/core/trino-main/src/main/java/io/trino/execution/CreateViewTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/CreateViewTask.java
@@ -14,7 +14,9 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
+import io.trino.connector.system.GlobalSystemConnector;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedObjectName;
@@ -28,8 +30,6 @@
 import io.trino.sql.tree.CreateView;
 import io.trino.sql.tree.Expression;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
@@ -112,7 +112,11 @@ else if (metadata.getTableHandle(session, name).isPresent()) {
                 session.getSchema(),
                 columns,
                 statement.getComment(),
-                owner);
+                owner,
+                session.getPath().getPath().stream()
+                        // system path elements currently are not stored
+                        .filter(element -> !element.getCatalogName().equals(GlobalSystemConnector.NAME))
+                        .collect(toImmutableList()));
 
         metadata.createView(session, name, definition, statement.isReplace());
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/DataDefinitionExecution.java b/core/trino-main/src/main/java/io/trino/execution/DataDefinitionExecution.java
index df5328e4f1d9..93035bdc2f45 100644
--- a/core/trino-main/src/main/java/io/trino/execution/DataDefinitionExecution.java
+++ b/core/trino-main/src/main/java/io/trino/execution/DataDefinitionExecution.java
@@ -16,6 +16,7 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.Session;
@@ -29,11 +30,9 @@
 import io.trino.sql.planner.Plan;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.Statement;
+import jakarta.annotation.Nullable;
 import org.joda.time.DateTime;
 
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/execution/DenyTask.java b/core/trino-main/src/main/java/io/trino/execution/DenyTask.java
index d968b83369e8..4a89f0bd8069 100644
--- a/core/trino-main/src/main/java/io/trino/execution/DenyTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/DenyTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -26,8 +27,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.GrantOnType;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -94,11 +93,11 @@ private static void executeDenyOnTable(Session session, Deny statement, Metadata
     {
         QualifiedObjectName tableName = createQualifiedObjectName(session, statement, statement.getName());
         RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, tableName);
-        if (redirection.getTableHandle().isEmpty()) {
+        if (redirection.tableHandle().isEmpty()) {
             throw semanticException(TABLE_NOT_FOUND, statement, "Table '%s' does not exist", tableName);
         }
-        if (redirection.getRedirectedTableName().isPresent()) {
-            throw semanticException(NOT_SUPPORTED, statement, "Table %s is redirected to %s and DENY is not supported with table redirections", tableName, redirection.getRedirectedTableName().get());
+        if (redirection.redirectedTableName().isPresent()) {
+            throw semanticException(NOT_SUPPORTED, statement, "Table %s is redirected to %s and DENY is not supported with table redirections", tableName, redirection.redirectedTableName().get());
         }
 
         Set<Privilege> privileges = parseStatementPrivileges(statement, statement.getPrivileges());
diff --git a/core/trino-main/src/main/java/io/trino/execution/DropCatalogTask.java b/core/trino-main/src/main/java/io/trino/execution/DropCatalogTask.java
index 0460a01e70cd..27a7acdd02b5 100644
--- a/core/trino-main/src/main/java/io/trino/execution/DropCatalogTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/DropCatalogTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.CatalogManager;
 import io.trino.security.AccessControl;
@@ -21,8 +22,6 @@
 import io.trino.sql.tree.DropCatalog;
 import io.trino.sql.tree.Expression;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
diff --git a/core/trino-main/src/main/java/io/trino/execution/DropColumnTask.java b/core/trino-main/src/main/java/io/trino/execution/DropColumnTask.java
index 9dacadd6ef84..e454a571d903 100644
--- a/core/trino-main/src/main/java/io/trino/execution/DropColumnTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/DropColumnTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -29,8 +30,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.Identifier;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.base.Verify.verifyNotNull;
@@ -73,18 +72,19 @@ public ListenableFuture<Void> execute(
         Session session = stateMachine.getSession();
         QualifiedObjectName tableName = createQualifiedObjectName(session, statement, statement.getTable());
         RedirectionAwareTableHandle redirectionAwareTableHandle = metadata.getRedirectionAwareTableHandle(session, tableName);
-        if (redirectionAwareTableHandle.getTableHandle().isEmpty()) {
+        if (redirectionAwareTableHandle.tableHandle().isEmpty()) {
             if (!statement.isTableExists()) {
                 throw semanticException(TABLE_NOT_FOUND, statement, "Table '%s' does not exist", tableName);
             }
             return immediateVoidFuture();
         }
-        TableHandle tableHandle = redirectionAwareTableHandle.getTableHandle().get();
+        TableHandle tableHandle = redirectionAwareTableHandle.tableHandle().get();
 
         // Use getParts method because the column name should be lowercase
         String column = statement.getField().getParts().get(0);
 
-        accessControl.checkCanDropColumn(session.toSecurityContext(), redirectionAwareTableHandle.getRedirectedTableName().orElse(tableName));
+        QualifiedObjectName qualifiedTableName = redirectionAwareTableHandle.redirectedTableName().orElse(tableName);
+        accessControl.checkCanDropColumn(session.toSecurityContext(), qualifiedTableName);
 
         ColumnHandle columnHandle = metadata.getColumnHandles(session, tableHandle).get(column);
         if (columnHandle == null) {
@@ -107,7 +107,7 @@ public ListenableFuture<Void> execute(
                     .filter(info -> !info.isHidden()).count() <= 1) {
                 throw semanticException(NOT_SUPPORTED, statement, "Cannot drop the only column in a table");
             }
-            metadata.dropColumn(session, tableHandle, columnHandle);
+            metadata.dropColumn(session, tableHandle, qualifiedTableName.asCatalogSchemaTableName(), columnHandle);
         }
         else {
             RowType containingType = null;
diff --git a/core/trino-main/src/main/java/io/trino/execution/DropFunctionTask.java b/core/trino-main/src/main/java/io/trino/execution/DropFunctionTask.java
new file mode 100644
index 000000000000..f2b4a602cd48
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/DropFunctionTask.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed 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 io.trino.execution;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
+import io.trino.Session;
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.metadata.LanguageFunctionManager;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.QualifiedObjectName;
+import io.trino.security.AccessControl;
+import io.trino.spi.connector.CatalogSchemaName;
+import io.trino.sql.SqlEnvironmentConfig;
+import io.trino.sql.tree.DropFunction;
+import io.trino.sql.tree.Expression;
+
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
+import static io.trino.execution.CreateFunctionTask.defaultFunctionSchema;
+import static io.trino.execution.CreateFunctionTask.qualifiedFunctionName;
+import static io.trino.spi.StandardErrorCode.NOT_FOUND;
+import static io.trino.sql.analyzer.SemanticExceptions.semanticException;
+import static java.util.Objects.requireNonNull;
+
+public class DropFunctionTask
+        implements DataDefinitionTask<DropFunction>
+{
+    private final Optional<CatalogSchemaName> functionSchema;
+    private final Metadata metadata;
+    private final AccessControl accessControl;
+    private final LanguageFunctionManager languageFunctionManager;
+
+    @Inject
+    public DropFunctionTask(
+            SqlEnvironmentConfig sqlEnvironmentConfig,
+            Metadata metadata,
+            AccessControl accessControl,
+            LanguageFunctionManager languageFunctionManager)
+    {
+        this.functionSchema = defaultFunctionSchema(sqlEnvironmentConfig);
+        this.metadata = requireNonNull(metadata, "metadata is null");
+        this.accessControl = requireNonNull(accessControl, "accessControl is null");
+        this.languageFunctionManager = requireNonNull(languageFunctionManager, "languageFunctionManager is null");
+    }
+
+    @Override
+    public String getName()
+    {
+        return "DROP FUNCTION";
+    }
+
+    @Override
+    public ListenableFuture<Void> execute(DropFunction statement, QueryStateMachine stateMachine, List<Expression> parameters, WarningCollector warningCollector)
+    {
+        Session session = stateMachine.getSession();
+
+        QualifiedObjectName name = qualifiedFunctionName(functionSchema, statement, statement.getName());
+
+        accessControl.checkCanDropFunction(session.toSecurityContext(), name);
+
+        String signatureToken = languageFunctionManager.getSignatureToken(statement.getParameters());
+
+        if (!metadata.languageFunctionExists(session, name, signatureToken)) {
+            if (!statement.isExists()) {
+                throw semanticException(NOT_FOUND, statement, "Function not found");
+            }
+            return immediateVoidFuture();
+        }
+
+        metadata.dropLanguageFunction(session, name, signatureToken);
+
+        return immediateVoidFuture();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/DropMaterializedViewTask.java b/core/trino-main/src/main/java/io/trino/execution/DropMaterializedViewTask.java
index 41b49a3db267..053035710e7b 100644
--- a/core/trino-main/src/main/java/io/trino/execution/DropMaterializedViewTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/DropMaterializedViewTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -22,8 +23,6 @@
 import io.trino.sql.tree.DropMaterializedView;
 import io.trino.sql.tree.Expression;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
diff --git a/core/trino-main/src/main/java/io/trino/execution/DropRoleTask.java b/core/trino-main/src/main/java/io/trino/execution/DropRoleTask.java
index f5a71c21b289..f47d12ab3c35 100644
--- a/core/trino-main/src/main/java/io/trino/execution/DropRoleTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/DropRoleTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -22,8 +23,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.Identifier;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/DropSchemaTask.java b/core/trino-main/src/main/java/io/trino/execution/DropSchemaTask.java
index 9ea081224168..0bec8f78f543 100644
--- a/core/trino-main/src/main/java/io/trino/execution/DropSchemaTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/DropSchemaTask.java
@@ -14,24 +14,21 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedTablePrefix;
 import io.trino.security.AccessControl;
-import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.sql.tree.DropSchema;
 import io.trino.sql.tree.Expression;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
 import static io.trino.metadata.MetadataUtil.createCatalogSchemaName;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_EMPTY;
 import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_FOUND;
 import static io.trino.sql.analyzer.SemanticExceptions.semanticException;
@@ -63,10 +60,6 @@ public ListenableFuture<Void> execute(
             List<Expression> parameters,
             WarningCollector warningCollector)
     {
-        if (statement.isCascade()) {
-            throw new TrinoException(NOT_SUPPORTED, "CASCADE is not yet supported for DROP SCHEMA");
-        }
-
         Session session = stateMachine.getSession();
         CatalogSchemaName schema = createCatalogSchemaName(session, statement, Optional.of(statement.getSchemaName()));
 
@@ -77,13 +70,13 @@ public ListenableFuture<Void> execute(
             return immediateVoidFuture();
         }
 
-        if (!isSchemaEmpty(session, schema, metadata)) {
+        if (!statement.isCascade() && !isSchemaEmpty(session, schema, metadata)) {
             throw semanticException(SCHEMA_NOT_EMPTY, statement, "Cannot drop non-empty schema '%s'", schema.getSchemaName());
         }
 
         accessControl.checkCanDropSchema(session.toSecurityContext(), schema);
 
-        metadata.dropSchema(session, schema);
+        metadata.dropSchema(session, schema, statement.isCascade());
 
         return immediateVoidFuture();
     }
diff --git a/core/trino-main/src/main/java/io/trino/execution/DropTableTask.java b/core/trino-main/src/main/java/io/trino/execution/DropTableTask.java
index 6cac86863f40..8bdfdb8d18b4 100644
--- a/core/trino-main/src/main/java/io/trino/execution/DropTableTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/DropTableTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -23,8 +24,6 @@
 import io.trino.sql.tree.DropTable;
 import io.trino.sql.tree.Expression;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
@@ -77,16 +76,16 @@ public ListenableFuture<Void> execute(
         }
 
         RedirectionAwareTableHandle redirectionAwareTableHandle = metadata.getRedirectionAwareTableHandle(session, originalTableName);
-        if (redirectionAwareTableHandle.getTableHandle().isEmpty()) {
+        if (redirectionAwareTableHandle.tableHandle().isEmpty()) {
             if (!statement.isExists()) {
                 throw semanticException(TABLE_NOT_FOUND, statement, "Table '%s' does not exist", originalTableName);
             }
             return immediateVoidFuture();
         }
-        QualifiedObjectName tableName = redirectionAwareTableHandle.getRedirectedTableName().orElse(originalTableName);
+        QualifiedObjectName tableName = redirectionAwareTableHandle.redirectedTableName().orElse(originalTableName);
         accessControl.checkCanDropTable(session.toSecurityContext(), tableName);
 
-        metadata.dropTable(session, redirectionAwareTableHandle.getTableHandle().get(), tableName.asCatalogSchemaTableName());
+        metadata.dropTable(session, redirectionAwareTableHandle.tableHandle().get(), tableName.asCatalogSchemaTableName());
 
         return immediateVoidFuture();
     }
diff --git a/core/trino-main/src/main/java/io/trino/execution/DropViewTask.java b/core/trino-main/src/main/java/io/trino/execution/DropViewTask.java
index 520cb7a2a8f3..37ada8a9839f 100644
--- a/core/trino-main/src/main/java/io/trino/execution/DropViewTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/DropViewTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -22,8 +23,6 @@
 import io.trino.sql.tree.DropView;
 import io.trino.sql.tree.Expression;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
diff --git a/core/trino-main/src/main/java/io/trino/execution/DynamicFilterConfig.java b/core/trino-main/src/main/java/io/trino/execution/DynamicFilterConfig.java
index b4460942de99..75579bf38a0b 100644
--- a/core/trino-main/src/main/java/io/trino/execution/DynamicFilterConfig.java
+++ b/core/trino-main/src/main/java/io/trino/execution/DynamicFilterConfig.java
@@ -19,9 +19,8 @@
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.units.DataSize;
 import io.airlift.units.MaxDataSize;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import static io.airlift.units.DataSize.Unit.KILOBYTE;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
@@ -41,24 +40,36 @@ public class DynamicFilterConfig
     private boolean enableCoordinatorDynamicFiltersDistribution = true;
     private boolean enableLargeDynamicFilters;
 
-    private int smallBroadcastMaxDistinctValuesPerDriver = 200;
-    private DataSize smallBroadcastMaxSizePerDriver = DataSize.of(20, KILOBYTE);
-    private int smallBroadcastRangeRowLimitPerDriver = 400;
-    private DataSize smallBroadcastMaxSizePerOperator = DataSize.of(200, KILOBYTE);
-    private int smallPartitionedMaxDistinctValuesPerDriver = 20;
-    private DataSize smallPartitionedMaxSizePerDriver = DataSize.of(10, KILOBYTE);
-    private int smallPartitionedRangeRowLimitPerDriver = 100;
-    private DataSize smallPartitionedMaxSizePerOperator = DataSize.of(100, KILOBYTE);
-    private DataSize smallMaxSizePerFilter = DataSize.of(1, MEGABYTE);
-
-    private int largeBroadcastMaxDistinctValuesPerDriver = 5_000;
-    private DataSize largeBroadcastMaxSizePerDriver = DataSize.of(500, KILOBYTE);
-    private int largeBroadcastRangeRowLimitPerDriver = 10_000;
-    private DataSize largeBroadcastMaxSizePerOperator = DataSize.of(5, MEGABYTE);
-    private int largePartitionedMaxDistinctValuesPerDriver = 500;
-    private DataSize largePartitionedMaxSizePerDriver = DataSize.of(50, KILOBYTE);
-    private int largePartitionedRangeRowLimitPerDriver = 1_000;
-    private DataSize largePartitionedMaxSizePerOperator = DataSize.of(500, KILOBYTE);
+    /*
+     * dynamic-filtering.small.* and dynamic-filtering.large.* limits are applied when
+     * collected over a not pre-partitioned source (when join distribution type is
+     * REPLICATED or when FTE is enabled).
+     *
+     * dynamic-filtering.small-partitioned.* and dynamic-filtering.large-partitioned.*
+     * limits are applied when collected over a pre-partitioned source (when join
+     * distribution type is PARTITIONED and FTE is disabled).
+     *
+     * When FTE is enabled dynamic filters are always collected over non partitioned data,
+     * hence the dynamic-filtering.small.* and dynamic-filtering.large.* limits applied.
+     */
+    private int smallMaxDistinctValuesPerDriver = 1_000;
+    private DataSize smallMaxSizePerDriver = DataSize.of(100, KILOBYTE);
+    private int smallRangeRowLimitPerDriver = 2_000;
+    private DataSize smallMaxSizePerOperator = DataSize.of(1, MEGABYTE);
+    private int smallPartitionedMaxDistinctValuesPerDriver = 100;
+    private DataSize smallPartitionedMaxSizePerDriver = DataSize.of(50, KILOBYTE);
+    private int smallPartitionedRangeRowLimitPerDriver = 500;
+    private DataSize smallPartitionedMaxSizePerOperator = DataSize.of(500, KILOBYTE);
+    private DataSize smallMaxSizePerFilter = DataSize.of(5, MEGABYTE);
+
+    private int largeMaxDistinctValuesPerDriver = 10_000;
+    private DataSize largeMaxSizePerDriver = DataSize.of(2, MEGABYTE);
+    private int largeRangeRowLimitPerDriver = 20_000;
+    private DataSize largeMaxSizePerOperator = DataSize.of(5, MEGABYTE);
+    private int largePartitionedMaxDistinctValuesPerDriver = 1_000;
+    private DataSize largePartitionedMaxSizePerDriver = DataSize.of(200, KILOBYTE);
+    private int largePartitionedRangeRowLimitPerDriver = 2_000;
+    private DataSize largePartitionedMaxSizePerOperator = DataSize.of(2, MEGABYTE);
     private DataSize largeMaxSizePerFilter = DataSize.of(5, MEGABYTE);
 
     public boolean isEnableDynamicFiltering()
@@ -100,54 +111,58 @@ public DynamicFilterConfig setEnableLargeDynamicFilters(boolean enableLargeDynam
     }
 
     @Min(0)
-    public int getSmallBroadcastMaxDistinctValuesPerDriver()
+    public int getSmallMaxDistinctValuesPerDriver()
     {
-        return smallBroadcastMaxDistinctValuesPerDriver;
+        return smallMaxDistinctValuesPerDriver;
     }
 
-    @Config("dynamic-filtering.small-broadcast.max-distinct-values-per-driver")
-    public DynamicFilterConfig setSmallBroadcastMaxDistinctValuesPerDriver(int smallBroadcastMaxDistinctValuesPerDriver)
+    @LegacyConfig("dynamic-filtering.small-broadcast.max-distinct-values-per-driver")
+    @Config("dynamic-filtering.small.max-distinct-values-per-driver")
+    public DynamicFilterConfig setSmallMaxDistinctValuesPerDriver(int smallMaxDistinctValuesPerDriver)
     {
-        this.smallBroadcastMaxDistinctValuesPerDriver = smallBroadcastMaxDistinctValuesPerDriver;
+        this.smallMaxDistinctValuesPerDriver = smallMaxDistinctValuesPerDriver;
         return this;
     }
 
     @MaxDataSize("1MB")
-    public DataSize getSmallBroadcastMaxSizePerDriver()
+    public DataSize getSmallMaxSizePerDriver()
     {
-        return smallBroadcastMaxSizePerDriver;
+        return smallMaxSizePerDriver;
     }
 
-    @Config("dynamic-filtering.small-broadcast.max-size-per-driver")
-    public DynamicFilterConfig setSmallBroadcastMaxSizePerDriver(DataSize smallBroadcastMaxSizePerDriver)
+    @LegacyConfig("dynamic-filtering.small-broadcast.max-size-per-driver")
+    @Config("dynamic-filtering.small.max-size-per-driver")
+    public DynamicFilterConfig setSmallMaxSizePerDriver(DataSize smallMaxSizePerDriver)
     {
-        this.smallBroadcastMaxSizePerDriver = smallBroadcastMaxSizePerDriver;
+        this.smallMaxSizePerDriver = smallMaxSizePerDriver;
         return this;
     }
 
     @Min(0)
-    public int getSmallBroadcastRangeRowLimitPerDriver()
+    public int getSmallRangeRowLimitPerDriver()
     {
-        return smallBroadcastRangeRowLimitPerDriver;
+        return smallRangeRowLimitPerDriver;
     }
 
-    @Config("dynamic-filtering.small-broadcast.range-row-limit-per-driver")
-    public DynamicFilterConfig setSmallBroadcastRangeRowLimitPerDriver(int smallBroadcastRangeRowLimitPerDriver)
+    @LegacyConfig("dynamic-filtering.small-broadcast.range-row-limit-per-driver")
+    @Config("dynamic-filtering.small.range-row-limit-per-driver")
+    public DynamicFilterConfig setSmallRangeRowLimitPerDriver(int smallRangeRowLimitPerDriver)
     {
-        this.smallBroadcastRangeRowLimitPerDriver = smallBroadcastRangeRowLimitPerDriver;
+        this.smallRangeRowLimitPerDriver = smallRangeRowLimitPerDriver;
         return this;
     }
 
     @MaxDataSize("10MB")
-    public DataSize getSmallBroadcastMaxSizePerOperator()
+    public DataSize getSmallMaxSizePerOperator()
     {
-        return smallBroadcastMaxSizePerOperator;
+        return smallMaxSizePerOperator;
     }
 
-    @Config("dynamic-filtering.small-broadcast.max-size-per-operator")
-    public DynamicFilterConfig setSmallBroadcastMaxSizePerOperator(DataSize smallBroadcastMaxSizePerOperator)
+    @LegacyConfig("dynamic-filtering.small-broadcast.max-size-per-operator")
+    @Config("dynamic-filtering.small.max-size-per-operator")
+    public DynamicFilterConfig setSmallMaxSizePerOperator(DataSize smallMaxSizePerOperator)
     {
-        this.smallBroadcastMaxSizePerOperator = smallBroadcastMaxSizePerOperator;
+        this.smallMaxSizePerOperator = smallMaxSizePerOperator;
         return this;
     }
 
@@ -218,53 +233,57 @@ public DynamicFilterConfig setSmallMaxSizePerFilter(DataSize smallMaxSizePerFilt
     }
 
     @Min(0)
-    public int getLargeBroadcastMaxDistinctValuesPerDriver()
+    public int getLargeMaxDistinctValuesPerDriver()
     {
-        return largeBroadcastMaxDistinctValuesPerDriver;
+        return largeMaxDistinctValuesPerDriver;
     }
 
-    @Config("dynamic-filtering.large-broadcast.max-distinct-values-per-driver")
-    public DynamicFilterConfig setLargeBroadcastMaxDistinctValuesPerDriver(int largeBroadcastMaxDistinctValuesPerDriver)
+    @LegacyConfig("dynamic-filtering.large-broadcast.max-distinct-values-per-driver")
+    @Config("dynamic-filtering.large.max-distinct-values-per-driver")
+    public DynamicFilterConfig setLargeMaxDistinctValuesPerDriver(int largeMaxDistinctValuesPerDriver)
     {
-        this.largeBroadcastMaxDistinctValuesPerDriver = largeBroadcastMaxDistinctValuesPerDriver;
+        this.largeMaxDistinctValuesPerDriver = largeMaxDistinctValuesPerDriver;
         return this;
     }
 
-    public DataSize getLargeBroadcastMaxSizePerDriver()
+    public DataSize getLargeMaxSizePerDriver()
     {
-        return largeBroadcastMaxSizePerDriver;
+        return largeMaxSizePerDriver;
     }
 
-    @Config("dynamic-filtering.large-broadcast.max-size-per-driver")
-    public DynamicFilterConfig setLargeBroadcastMaxSizePerDriver(DataSize largeBroadcastMaxSizePerDriver)
+    @LegacyConfig("dynamic-filtering.large-broadcast.max-size-per-driver")
+    @Config("dynamic-filtering.large.max-size-per-driver")
+    public DynamicFilterConfig setLargeMaxSizePerDriver(DataSize largeMaxSizePerDriver)
     {
-        this.largeBroadcastMaxSizePerDriver = largeBroadcastMaxSizePerDriver;
+        this.largeMaxSizePerDriver = largeMaxSizePerDriver;
         return this;
     }
 
     @Min(0)
-    public int getLargeBroadcastRangeRowLimitPerDriver()
+    public int getLargeRangeRowLimitPerDriver()
     {
-        return largeBroadcastRangeRowLimitPerDriver;
+        return largeRangeRowLimitPerDriver;
     }
 
-    @Config("dynamic-filtering.large-broadcast.range-row-limit-per-driver")
-    public DynamicFilterConfig setLargeBroadcastRangeRowLimitPerDriver(int largeBroadcastRangeRowLimitPerDriver)
+    @LegacyConfig("dynamic-filtering.large-broadcast.range-row-limit-per-driver")
+    @Config("dynamic-filtering.large.range-row-limit-per-driver")
+    public DynamicFilterConfig setLargeRangeRowLimitPerDriver(int largeRangeRowLimitPerDriver)
     {
-        this.largeBroadcastRangeRowLimitPerDriver = largeBroadcastRangeRowLimitPerDriver;
+        this.largeRangeRowLimitPerDriver = largeRangeRowLimitPerDriver;
         return this;
     }
 
     @MaxDataSize("100MB")
-    public DataSize getLargeBroadcastMaxSizePerOperator()
+    public DataSize getLargeMaxSizePerOperator()
     {
-        return largeBroadcastMaxSizePerOperator;
+        return largeMaxSizePerOperator;
     }
 
-    @Config("dynamic-filtering.large-broadcast.max-size-per-operator")
-    public DynamicFilterConfig setLargeBroadcastMaxSizePerOperator(DataSize largeBroadcastMaxSizePerOperator)
+    @LegacyConfig("dynamic-filtering.large-broadcast.max-size-per-operator")
+    @Config("dynamic-filtering.large.max-size-per-operator")
+    public DynamicFilterConfig setLargeMaxSizePerOperator(DataSize largeMaxSizePerOperator)
     {
-        this.largeBroadcastMaxSizePerOperator = largeBroadcastMaxSizePerOperator;
+        this.largeMaxSizePerOperator = largeMaxSizePerOperator;
         return this;
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/DynamicFiltersCollector.java b/core/trino-main/src/main/java/io/trino/execution/DynamicFiltersCollector.java
index df4023d1d3f8..09b69f45d904 100644
--- a/core/trino-main/src/main/java/io/trino/execution/DynamicFiltersCollector.java
+++ b/core/trino-main/src/main/java/io/trino/execution/DynamicFiltersCollector.java
@@ -16,11 +16,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.spi.predicate.Domain;
 import io.trino.sql.planner.plan.DynamicFilterId;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/ExecutionFailureInfo.java b/core/trino-main/src/main/java/io/trino/execution/ExecutionFailureInfo.java
index 41c407b042da..9ecb0cf04ec5 100644
--- a/core/trino-main/src/main/java/io/trino/execution/ExecutionFailureInfo.java
+++ b/core/trino-main/src/main/java/io/trino/execution/ExecutionFailureInfo.java
@@ -16,13 +16,12 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.client.ErrorLocation;
 import io.trino.client.FailureInfo;
 import io.trino.spi.ErrorCode;
 import io.trino.spi.HostAddress;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.regex.Matcher;
diff --git a/core/trino-main/src/main/java/io/trino/execution/ExplainAnalyzeContext.java b/core/trino-main/src/main/java/io/trino/execution/ExplainAnalyzeContext.java
index 9423476dc83d..678bc544eac2 100644
--- a/core/trino-main/src/main/java/io/trino/execution/ExplainAnalyzeContext.java
+++ b/core/trino-main/src/main/java/io/trino/execution/ExplainAnalyzeContext.java
@@ -13,7 +13,7 @@
  */
 package io.trino.execution;
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/Failure.java b/core/trino-main/src/main/java/io/trino/execution/Failure.java
index 1e6899e865e1..34061b0d64af 100644
--- a/core/trino-main/src/main/java/io/trino/execution/Failure.java
+++ b/core/trino-main/src/main/java/io/trino/execution/Failure.java
@@ -14,8 +14,7 @@
 package io.trino.execution;
 
 import io.trino.spi.ErrorCode;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/FailureInjectionConfig.java b/core/trino-main/src/main/java/io/trino/execution/FailureInjectionConfig.java
index db6379879b2a..2ee459b52484 100644
--- a/core/trino-main/src/main/java/io/trino/execution/FailureInjectionConfig.java
+++ b/core/trino-main/src/main/java/io/trino/execution/FailureInjectionConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/FailureInjector.java b/core/trino-main/src/main/java/io/trino/execution/FailureInjector.java
index 8d6c1108ba4b..295d3c694a1d 100644
--- a/core/trino-main/src/main/java/io/trino/execution/FailureInjector.java
+++ b/core/trino-main/src/main/java/io/trino/execution/FailureInjector.java
@@ -14,21 +14,20 @@
 package io.trino.execution;
 
 import com.google.common.cache.CacheBuilder;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 import io.trino.spi.ErrorCode;
 import io.trino.spi.ErrorCodeSupplier;
 import io.trino.spi.ErrorType;
 import io.trino.spi.TrinoException;
 
-import javax.inject.Inject;
-
 import java.util.Objects;
 import java.util.Optional;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.execution.FailureInjector.InjectedFailureType.TASK_FAILURE;
 import static io.trino.spi.ErrorType.EXTERNAL;
 import static io.trino.spi.ErrorType.INSUFFICIENT_RESOURCES;
diff --git a/core/trino-main/src/main/java/io/trino/execution/ForQueryExecution.java b/core/trino-main/src/main/java/io/trino/execution/ForQueryExecution.java
index b5f15c08c799..2eec6b2c9349 100644
--- a/core/trino-main/src/main/java/io/trino/execution/ForQueryExecution.java
+++ b/core/trino-main/src/main/java/io/trino/execution/ForQueryExecution.java
@@ -13,7 +13,7 @@
  */
 package io.trino.execution;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForQueryExecution
 {
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/FutureStateChange.java b/core/trino-main/src/main/java/io/trino/execution/FutureStateChange.java
index bc8e02e72842..67aeecec4438 100644
--- a/core/trino-main/src/main/java/io/trino/execution/FutureStateChange.java
+++ b/core/trino-main/src/main/java/io/trino/execution/FutureStateChange.java
@@ -16,9 +16,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 
 import java.util.HashSet;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/execution/GrantRolesTask.java b/core/trino-main/src/main/java/io/trino/execution/GrantRolesTask.java
index 3cecf8db63ae..876eee78a30e 100644
--- a/core/trino-main/src/main/java/io/trino/execution/GrantRolesTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/GrantRolesTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -24,8 +25,6 @@
 import io.trino.sql.tree.GrantRoles;
 import io.trino.sql.tree.Identifier;
 
-import javax.inject.Inject;
-
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
diff --git a/core/trino-main/src/main/java/io/trino/execution/GrantTask.java b/core/trino-main/src/main/java/io/trino/execution/GrantTask.java
index 98194ee8ab35..62f522b1ffc3 100644
--- a/core/trino-main/src/main/java/io/trino/execution/GrantTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/GrantTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -26,8 +27,6 @@
 import io.trino.sql.tree.Grant;
 import io.trino.sql.tree.GrantOnType;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -98,11 +97,11 @@ private void executeGrantOnTable(Session session, Grant statement)
     {
         QualifiedObjectName tableName = createQualifiedObjectName(session, statement, statement.getName());
         RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, tableName);
-        if (redirection.getTableHandle().isEmpty()) {
+        if (redirection.tableHandle().isEmpty()) {
             throw semanticException(TABLE_NOT_FOUND, statement, "Table '%s' does not exist", tableName);
         }
-        if (redirection.getRedirectedTableName().isPresent()) {
-            throw semanticException(NOT_SUPPORTED, statement, "Table %s is redirected to %s and GRANT is not supported with table redirections", tableName, redirection.getRedirectedTableName().get());
+        if (redirection.redirectedTableName().isPresent()) {
+            throw semanticException(NOT_SUPPORTED, statement, "Table %s is redirected to %s and GRANT is not supported with table redirections", tableName, redirection.redirectedTableName().get());
         }
 
         Set<Privilege> privileges = parseStatementPrivileges(statement, statement.getPrivileges());
diff --git a/core/trino-main/src/main/java/io/trino/execution/Input.java b/core/trino-main/src/main/java/io/trino/execution/Input.java
index 825f894d1be1..a2d498a088c3 100644
--- a/core/trino-main/src/main/java/io/trino/execution/Input.java
+++ b/core/trino-main/src/main/java/io/trino/execution/Input.java
@@ -16,11 +16,11 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
+import io.trino.spi.connector.CatalogHandle.CatalogVersion;
 import io.trino.sql.planner.plan.PlanFragmentId;
 import io.trino.sql.planner.plan.PlanNodeId;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -32,6 +32,7 @@
 public final class Input
 {
     private final String catalogName;
+    private final CatalogVersion catalogVersion;
     private final String schema;
     private final String table;
     private final List<Column> columns;
@@ -42,6 +43,7 @@ public final class Input
     @JsonCreator
     public Input(
             @JsonProperty("catalogName") String catalogName,
+            @JsonProperty("catalogVersion") CatalogVersion catalogVersion,
             @JsonProperty("schema") String schema,
             @JsonProperty("table") String table,
             @JsonProperty("connectorInfo") Optional<Object> connectorInfo,
@@ -49,21 +51,14 @@ public Input(
             @JsonProperty("fragmentId") PlanFragmentId fragmentId,
             @JsonProperty("planNodeId") PlanNodeId planNodeId)
     {
-        requireNonNull(catalogName, "catalogName is null");
-        requireNonNull(schema, "schema is null");
-        requireNonNull(table, "table is null");
-        requireNonNull(connectorInfo, "connectorInfo is null");
-        requireNonNull(columns, "columns is null");
-        requireNonNull(fragmentId, "fragmentId is null");
-        requireNonNull(planNodeId, "planNodeId is null");
-
-        this.catalogName = catalogName;
-        this.schema = schema;
-        this.table = table;
-        this.connectorInfo = connectorInfo;
-        this.columns = ImmutableList.copyOf(columns);
-        this.fragmentId = fragmentId;
-        this.planNodeId = planNodeId;
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
+        this.catalogVersion = requireNonNull(catalogVersion, "catalogVersion is null");
+        this.schema = requireNonNull(schema, "schema is null");
+        this.table = requireNonNull(table, "table is null");
+        this.connectorInfo = requireNonNull(connectorInfo, "connectorInfo is null");
+        this.columns = ImmutableList.copyOf(requireNonNull(columns, "columns is null"));
+        this.fragmentId = requireNonNull(fragmentId, "fragmentId is null");
+        this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
     }
 
     @JsonProperty
@@ -72,6 +67,12 @@ public String getCatalogName()
         return catalogName;
     }
 
+    @JsonProperty
+    public CatalogVersion getCatalogVersion()
+    {
+        return catalogVersion;
+    }
+
     @JsonProperty
     public String getSchema()
     {
@@ -119,6 +120,7 @@ public boolean equals(Object o)
         }
         Input input = (Input) o;
         return Objects.equals(catalogName, input.catalogName) &&
+                Objects.equals(catalogVersion, input.catalogVersion) &&
                 Objects.equals(schema, input.schema) &&
                 Objects.equals(table, input.table) &&
                 Objects.equals(columns, input.columns) &&
@@ -130,7 +132,7 @@ public boolean equals(Object o)
     @Override
     public int hashCode()
     {
-        return Objects.hash(catalogName, schema, table, columns, connectorInfo, fragmentId, planNodeId);
+        return Objects.hash(catalogName, catalogVersion, schema, table, columns, connectorInfo, fragmentId, planNodeId);
     }
 
     @Override
@@ -138,6 +140,7 @@ public String toString()
     {
         return toStringHelper(this)
                 .addValue(catalogName)
+                .addValue(catalogVersion)
                 .addValue(schema)
                 .addValue(table)
                 .addValue(columns)
diff --git a/core/trino-main/src/main/java/io/trino/execution/MemoryRevokingScheduler.java b/core/trino-main/src/main/java/io/trino/execution/MemoryRevokingScheduler.java
index edb2aad79a8a..07e4b5ed6e03 100644
--- a/core/trino-main/src/main/java/io/trino/execution/MemoryRevokingScheduler.java
+++ b/core/trino-main/src/main/java/io/trino/execution/MemoryRevokingScheduler.java
@@ -15,6 +15,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Ordering;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.FeaturesConfig;
 import io.trino.memory.LocalMemoryManager;
@@ -25,11 +26,9 @@
 import io.trino.operator.OperatorContext;
 import io.trino.operator.PipelineContext;
 import io.trino.operator.TaskContext;
-
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/execution/MemoryTrackingRemoteTaskFactory.java b/core/trino-main/src/main/java/io/trino/execution/MemoryTrackingRemoteTaskFactory.java
index 2275cff23e69..8c645315a9b3 100644
--- a/core/trino-main/src/main/java/io/trino/execution/MemoryTrackingRemoteTaskFactory.java
+++ b/core/trino-main/src/main/java/io/trino/execution/MemoryTrackingRemoteTaskFactory.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.Multimap;
 import io.airlift.units.DataSize;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.execution.NodeTaskMap.PartitionedSplitCountTracker;
 import io.trino.execution.StateMachine.StateChangeListener;
@@ -45,8 +46,10 @@ public MemoryTrackingRemoteTaskFactory(RemoteTaskFactory remoteTaskFactory, Quer
     @Override
     public RemoteTask createRemoteTask(
             Session session,
+            Span stageSpan,
             TaskId taskId,
             InternalNode node,
+            boolean speculative,
             PlanFragment fragment,
             Multimap<PlanNodeId, Split> initialSplits,
             OutputBuffers outputBuffers,
@@ -55,9 +58,12 @@ public RemoteTask createRemoteTask(
             Optional<DataSize> estimatedMemory,
             boolean summarizeTaskInfo)
     {
-        RemoteTask task = remoteTaskFactory.createRemoteTask(session,
+        RemoteTask task = remoteTaskFactory.createRemoteTask(
+                session,
+                stageSpan,
                 taskId,
                 node,
+                speculative,
                 fragment,
                 initialSplits,
                 outputBuffers,
diff --git a/core/trino-main/src/main/java/io/trino/execution/NodeTaskMap.java b/core/trino-main/src/main/java/io/trino/execution/NodeTaskMap.java
index 5999d75a31a0..aefe550d4543 100644
--- a/core/trino-main/src/main/java/io/trino/execution/NodeTaskMap.java
+++ b/core/trino-main/src/main/java/io/trino/execution/NodeTaskMap.java
@@ -14,13 +14,12 @@
 package io.trino.execution;
 
 import com.google.common.collect.Sets;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.metadata.InternalNode;
 import io.trino.util.FinalizerService;
 
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/core/trino-main/src/main/java/io/trino/execution/PrepareTask.java b/core/trino-main/src/main/java/io/trino/execution/PrepareTask.java
index 626ea60e86ef..059a71c52518 100644
--- a/core/trino-main/src/main/java/io/trino/execution/PrepareTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/PrepareTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.spi.TrinoException;
 import io.trino.sql.parser.SqlParser;
@@ -23,8 +24,6 @@
 import io.trino.sql.tree.Prepare;
 import io.trino.sql.tree.Statement;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryExecutionMBean.java b/core/trino-main/src/main/java/io/trino/execution/QueryExecutionMBean.java
index 7504c25e531e..cebb0948a503 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryExecutionMBean.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryExecutionMBean.java
@@ -13,12 +13,11 @@
  */
 package io.trino.execution;
 
+import com.google.inject.Inject;
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryIdGenerator.java b/core/trino-main/src/main/java/io/trino/execution/QueryIdGenerator.java
index cdbdadab5de7..8799f4a69a27 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryIdGenerator.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryIdGenerator.java
@@ -16,10 +16,9 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.primitives.Chars;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.spi.QueryId;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryInfo.java b/core/trino-main/src/main/java/io/trino/execution/QueryInfo.java
index c5f1a1500307..0c276b6ab8cf 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryInfo.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryInfo.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.SessionRepresentation;
 import io.trino.client.NodeVersion;
 import io.trino.operator.RetryPolicy;
@@ -32,14 +33,13 @@
 import io.trino.spi.security.SelectedRole;
 import io.trino.sql.analyzer.Output;
 import io.trino.transaction.TransactionId;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalDouble;
 import java.util.Set;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
@@ -60,6 +60,8 @@ public class QueryInfo
     private final Optional<String> setCatalog;
     private final Optional<String> setSchema;
     private final Optional<String> setPath;
+    private final Optional<String> setAuthorizationUser;
+    private final boolean resetAuthorizationUser;
     private final Map<String, String> setSessionProperties;
     private final Set<String> resetSessionProperties;
     private final Map<String, SelectedRole> setRoles;
@@ -97,6 +99,8 @@ public QueryInfo(
             @JsonProperty("setCatalog") Optional<String> setCatalog,
             @JsonProperty("setSchema") Optional<String> setSchema,
             @JsonProperty("setPath") Optional<String> setPath,
+            @JsonProperty("setAuthorizationUser") Optional<String> setAuthorizationUser,
+            @JsonProperty("resetAuthorizationUser") boolean resetAuthorizationUser,
             @JsonProperty("setSessionProperties") Map<String, String> setSessionProperties,
             @JsonProperty("resetSessionProperties") Set<String> resetSessionProperties,
             @JsonProperty("setRoles") Map<String, SelectedRole> setRoles,
@@ -129,6 +133,7 @@ public QueryInfo(
         requireNonNull(setCatalog, "setCatalog is null");
         requireNonNull(setSchema, "setSchema is null");
         requireNonNull(setPath, "setPath is null");
+        requireNonNull(setAuthorizationUser, "setAuthorizationUser is null");
         requireNonNull(setSessionProperties, "setSessionProperties is null");
         requireNonNull(resetSessionProperties, "resetSessionProperties is null");
         requireNonNull(addedPreparedStatements, "addedPreparedStatements is null");
@@ -158,6 +163,8 @@ public QueryInfo(
         this.setCatalog = setCatalog;
         this.setSchema = setSchema;
         this.setPath = setPath;
+        this.setAuthorizationUser = setAuthorizationUser;
+        this.resetAuthorizationUser = resetAuthorizationUser;
         this.setSessionProperties = ImmutableMap.copyOf(setSessionProperties);
         this.resetSessionProperties = ImmutableSet.copyOf(resetSessionProperties);
         this.setRoles = ImmutableMap.copyOf(setRoles);
@@ -208,6 +215,18 @@ public boolean isScheduled()
         return queryStats.isScheduled();
     }
 
+    @JsonProperty
+    public OptionalDouble getProgressPercentage()
+    {
+        return queryStats.getProgressPercentage();
+    }
+
+    @JsonProperty
+    public OptionalDouble getRunningPercentage()
+    {
+        return queryStats.getRunningPercentage();
+    }
+
     @JsonProperty
     public URI getSelf()
     {
@@ -256,6 +275,18 @@ public Optional<String> getSetPath()
         return setPath;
     }
 
+    @JsonProperty
+    public Optional<String> getSetAuthorizationUser()
+    {
+        return setAuthorizationUser;
+    }
+
+    @JsonProperty
+    public boolean isResetAuthorizationUser()
+    {
+        return resetAuthorizationUser;
+    }
+
     @JsonProperty
     public Map<String, String> getSetSessionProperties()
     {
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryManager.java b/core/trino-main/src/main/java/io/trino/execution/QueryManager.java
index c0d3c588e389..af52ae4edbeb 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryManager.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryManager.java
@@ -92,6 +92,8 @@ QueryInfo getFullQueryInfo(QueryId queryId)
     QueryState getQueryState(QueryId queryId)
             throws NoSuchElementException;
 
+    boolean hasQuery(QueryId queryId);
+
     /**
      * Updates the client heartbeat time, to prevent the query from be automatically purged.
      * If the query does not exist, the call is ignored.
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java b/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java
index 3a8769770348..f977a365ff89 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java
@@ -22,10 +22,10 @@
 import io.airlift.units.MinDataSize;
 import io.airlift.units.MinDuration;
 import io.trino.operator.RetryPolicy;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -40,24 +40,31 @@
         "query.max-pending-splits-per-node",
         "query.queue-config-file",
         "experimental.big-query-initial-hash-partitions",
+        "experimental.fault-tolerant-execution-force-preferred-write-partitioning-enabled",
         "experimental.max-concurrent-big-queries",
         "experimental.max-queued-big-queries",
         "query-manager.initialization-required-workers",
         "query-manager.initialization-timeout",
-        " fault-tolerant-execution-target-task-split-count",
-        "query.remote-task.max-consecutive-error-count"})
+        "fault-tolerant-execution-target-task-split-count",
+        "fault-tolerant-execution-target-task-input-size",
+        "query.remote-task.max-consecutive-error-count",
+        "query.remote-task.min-error-duration",
+})
 public class QueryManagerConfig
 {
     public static final long AVAILABLE_HEAP_MEMORY = Runtime.getRuntime().maxMemory();
     public static final int MAX_TASK_RETRY_ATTEMPTS = 126;
+    public static final int FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT = 1000;
 
     private int scheduleSplitBatchSize = 1000;
     private int minScheduleSplitBatchSize = 100;
     private int maxConcurrentQueries = 1000;
     private int maxQueuedQueries = 5000;
 
+    private boolean determinePartitionCountForWriteEnabled;
     private int maxHashPartitionCount = 100;
     private int minHashPartitionCount = 4;
+    private int minHashPartitionCountForWrite = 50;
     private int maxWriterTasksCount = 100;
     private Duration minQueryExpireAge = new Duration(15, TimeUnit.MINUTES);
     private int maxQueryHistory = 100;
@@ -104,24 +111,40 @@ public class QueryManagerConfig
     private int remoteTaskGuaranteedSplitPerTask = 3;
 
     private int faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthPeriod = 64;
-    private double faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthFactor = 1.2;
+    private double faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthFactor = 1.26;
     private DataSize faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeMin = DataSize.of(512, MEGABYTE);
     private DataSize faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeMax = DataSize.of(50, GIGABYTE);
 
     private int faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthPeriod = 64;
-    private double faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthFactor = 1.2;
+    private double faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthFactor = 1.26;
     private DataSize faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeMin = DataSize.of(4, GIGABYTE);
     private DataSize faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeMax = DataSize.of(50, GIGABYTE);
 
     private DataSize faultTolerantExecutionHashDistributionComputeTaskTargetSize = DataSize.of(512, MEGABYTE);
+    private double faultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio = 2.0;
     private DataSize faultTolerantExecutionHashDistributionWriteTaskTargetSize = DataSize.of(4, GIGABYTE);
+    private double faultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio = 2.0;
     private int faultTolerantExecutionHashDistributionWriteTaskTargetMaxCount = 2000;
 
     private DataSize faultTolerantExecutionStandardSplitSize = DataSize.of(64, MEGABYTE);
     private int faultTolerantExecutionMaxTaskSplitCount = 256;
     private DataSize faultTolerantExecutionTaskDescriptorStorageMaxMemory = DataSize.ofBytes(Math.round(AVAILABLE_HEAP_MEMORY * 0.15));
-    private int faultTolerantExecutionPartitionCount = 50;
+    private int faultTolerantExecutionMaxPartitionCount = 50;
+    private int faultTolerantExecutionMinPartitionCount = 4;
+    private int faultTolerantExecutionMinPartitionCountForWrite = 50;
+    private boolean faultTolerantExecutionRuntimeAdaptivePartitioningEnabled;
+    private int faultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount = FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT;
+    // Currently, initial setup is 5GB of task memory processing 4GB data. Given that we triple the memory in case of
+    // task OOM, max task size is set to 12GB such that tasks of stages below threshold will succeed within one retry.
+    private DataSize faultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize = DataSize.of(12, GIGABYTE);
     private boolean faultTolerantExecutionForcePreferredWritePartitioningEnabled = true;
+    private double faultTolerantExecutionMinSourceStageProgress = 0.2;
+
+    private boolean faultTolerantExecutionSmallStageEstimationEnabled = true;
+    private DataSize faultTolerantExecutionSmallStageEstimationThreshold = DataSize.of(20, GIGABYTE);
+    private double faultTolerantExecutionSmallStageSourceSizeMultiplier = 1.2;
+    private boolean faultTolerantExecutionSmallStageRequireNoMorePartitions;
+    private boolean faultTolerantExecutionStageEstimationForEagerParentEnabled = true;
 
     @Min(1)
     public int getScheduleSplitBatchSize()
@@ -179,6 +202,19 @@ public QueryManagerConfig setMaxQueuedQueries(int maxQueuedQueries)
         return this;
     }
 
+    public boolean isDeterminePartitionCountForWriteEnabled()
+    {
+        return determinePartitionCountForWriteEnabled;
+    }
+
+    @Config("query.determine-partition-count-for-write-enabled")
+    @ConfigDescription("Determine the number of partitions based on amount of data read and processed by the query for write queries")
+    public QueryManagerConfig setDeterminePartitionCountForWriteEnabled(boolean determinePartitionCountForWriteEnabled)
+    {
+        this.determinePartitionCountForWriteEnabled = determinePartitionCountForWriteEnabled;
+        return this;
+    }
+
     @Min(1)
     public int getMaxHashPartitionCount()
     {
@@ -208,6 +244,20 @@ public QueryManagerConfig setMinHashPartitionCount(int minHashPartitionCount)
         return this;
     }
 
+    @Min(1)
+    public int getMinHashPartitionCountForWrite()
+    {
+        return minHashPartitionCountForWrite;
+    }
+
+    @Config("query.min-hash-partition-count-for-write")
+    @ConfigDescription("Minimum number of partitions for distributed joins and aggregations in write queries")
+    public QueryManagerConfig setMinHashPartitionCountForWrite(int minHashPartitionCountForWrite)
+    {
+        this.minHashPartitionCountForWrite = minHashPartitionCountForWrite;
+        return this;
+    }
+
     @Min(1)
     public int getMaxWriterTasksCount()
     {
@@ -344,19 +394,6 @@ public QueryManagerConfig setMaxStateMachineCallbackThreads(int maxStateMachineC
         return this;
     }
 
-    @Deprecated
-    public Duration getRemoteTaskMinErrorDuration()
-    {
-        return remoteTaskMaxErrorDuration;
-    }
-
-    @Deprecated
-    @Config("query.remote-task.min-error-duration")
-    public QueryManagerConfig setRemoteTaskMinErrorDuration(Duration remoteTaskMinErrorDuration)
-    {
-        return this;
-    }
-
     @NotNull
     @MinDuration("1s")
     public Duration getRemoteTaskMaxErrorDuration()
@@ -673,13 +710,14 @@ public int getFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGr
     }
 
     @Config("fault-tolerant-execution-arbitrary-distribution-compute-task-target-size-growth-period")
-    @ConfigDescription("The number of tasks we create for given non-writer stage of arbitrary distribution before we increase task size")
+    @ConfigDescription("The number of tasks created for any given non-writer stage of arbitrary distribution before task size is increased")
     public QueryManagerConfig setFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthPeriod(int faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthPeriod)
     {
         this.faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthPeriod = faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthPeriod;
         return this;
     }
 
+    @Min(1)
     public double getFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthFactor()
     {
         return faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthFactor;
@@ -727,13 +765,14 @@ public int getFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrow
     }
 
     @Config("fault-tolerant-execution-arbitrary-distribution-write-task-target-size-growth-period")
-    @ConfigDescription("The number of tasks we create for given writer stage of arbitrary distribution before we increase task size")
+    @ConfigDescription("The number of tasks created for any given writer stage of arbitrary distribution before task size is increased")
     public QueryManagerConfig setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthPeriod(int faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthPeriod)
     {
         this.faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthPeriod = faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthPeriod;
         return this;
     }
 
+    @Min(1)
     public double getFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthFactor()
     {
         return faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthFactor;
@@ -789,6 +828,20 @@ public QueryManagerConfig setFaultTolerantExecutionHashDistributionComputeTaskTa
         return this;
     }
 
+    @DecimalMin(value = "0.0", inclusive = true)
+    public double getFaultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio()
+    {
+        return faultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio;
+    }
+
+    @Config("fault-tolerant-execution-hash-distribution-compute-task-to-node-min-ratio")
+    @ConfigDescription("Minimal ratio of tasks count vs cluster nodes count for hash distributed compute stage in fault-tolerant execution")
+    public QueryManagerConfig setFaultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio(double faultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio)
+    {
+        this.faultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio = faultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio;
+        return this;
+    }
+
     @NotNull
     public DataSize getFaultTolerantExecutionHashDistributionWriteTaskTargetSize()
     {
@@ -803,6 +856,20 @@ public QueryManagerConfig setFaultTolerantExecutionHashDistributionWriteTaskTarg
         return this;
     }
 
+    @DecimalMin(value = "0.0", inclusive = true)
+    public double getFaultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio()
+    {
+        return faultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio;
+    }
+
+    @Config("fault-tolerant-execution-hash-distribution-write-task-to-node-min-ratio")
+    @ConfigDescription("Minimal ratio of tasks count vs cluster nodes count for hash distributed writer stage in fault-tolerant execution")
+    public QueryManagerConfig setFaultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio(double faultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio)
+    {
+        this.faultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio = faultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio;
+        return this;
+    }
+
     @Min(1)
     public int getFaultTolerantExecutionHashDistributionWriteTaskTargetMaxCount()
     {
@@ -860,28 +927,167 @@ public QueryManagerConfig setFaultTolerantExecutionTaskDescriptorStorageMaxMemor
     }
 
     @Min(1)
-    public int getFaultTolerantExecutionPartitionCount()
+    @Max(FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT)
+    public int getFaultTolerantExecutionMaxPartitionCount()
+    {
+        return faultTolerantExecutionMaxPartitionCount;
+    }
+
+    @Config("fault-tolerant-execution-max-partition-count")
+    @LegacyConfig("fault-tolerant-execution-partition-count")
+    @ConfigDescription("Maximum number of partitions for distributed joins and aggregations executed with fault tolerant execution enabled")
+    public QueryManagerConfig setFaultTolerantExecutionMaxPartitionCount(int faultTolerantExecutionMaxPartitionCount)
+    {
+        this.faultTolerantExecutionMaxPartitionCount = faultTolerantExecutionMaxPartitionCount;
+        return this;
+    }
+
+    @Min(1)
+    @Max(FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT)
+    public int getFaultTolerantExecutionMinPartitionCount()
+    {
+        return faultTolerantExecutionMinPartitionCount;
+    }
+
+    @Config("fault-tolerant-execution-min-partition-count")
+    @ConfigDescription("Minimum number of partitions for distributed joins and aggregations executed with fault tolerant execution enabled")
+    public QueryManagerConfig setFaultTolerantExecutionMinPartitionCount(int faultTolerantExecutionMinPartitionCount)
+    {
+        this.faultTolerantExecutionMinPartitionCount = faultTolerantExecutionMinPartitionCount;
+        return this;
+    }
+
+    @Min(1)
+    @Max(FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT)
+    public int getFaultTolerantExecutionMinPartitionCountForWrite()
+    {
+        return faultTolerantExecutionMinPartitionCountForWrite;
+    }
+
+    @Config("fault-tolerant-execution-min-partition-count-for-write")
+    @ConfigDescription("Minimum number of partitions for distributed joins and aggregations in write queries executed with fault tolerant execution enabled")
+    public QueryManagerConfig setFaultTolerantExecutionMinPartitionCountForWrite(int faultTolerantExecutionMinPartitionCountForWrite)
+    {
+        this.faultTolerantExecutionMinPartitionCountForWrite = faultTolerantExecutionMinPartitionCountForWrite;
+        return this;
+    }
+
+    public boolean isFaultTolerantExecutionRuntimeAdaptivePartitioningEnabled()
+    {
+        return faultTolerantExecutionRuntimeAdaptivePartitioningEnabled;
+    }
+
+    @Config("fault-tolerant-execution-runtime-adaptive-partitioning-enabled")
+    public QueryManagerConfig setFaultTolerantExecutionRuntimeAdaptivePartitioningEnabled(boolean faultTolerantExecutionRuntimeAdaptivePartitioningEnabled)
+    {
+        this.faultTolerantExecutionRuntimeAdaptivePartitioningEnabled = faultTolerantExecutionRuntimeAdaptivePartitioningEnabled;
+        return this;
+    }
+
+    @Min(1)
+    @Max(FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT)
+    public int getFaultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount()
+    {
+        return faultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount;
+    }
+
+    @Config("fault-tolerant-execution-runtime-adaptive-partitioning-partition-count")
+    @ConfigDescription("The partition count to use for runtime adaptive partitioning when enabled")
+    public QueryManagerConfig setFaultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount(int faultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount)
+    {
+        this.faultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount = faultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount;
+        return this;
+    }
+
+    public DataSize getFaultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize()
+    {
+        return faultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize;
+    }
+
+    @Config("fault-tolerant-execution-runtime-adaptive-partitioning-max-task-size")
+    @ConfigDescription("Max average task input size when deciding runtime adaptive partitioning")
+    public QueryManagerConfig setFaultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize(DataSize faultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize)
+    {
+        this.faultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize = faultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize;
+        return this;
+    }
+
+    public double getFaultTolerantExecutionMinSourceStageProgress()
+    {
+        return faultTolerantExecutionMinSourceStageProgress;
+    }
+
+    @Config("fault-tolerant-execution-min-source-stage-progress")
+    @ConfigDescription("Minimal progress of source stage to consider scheduling of parent stage")
+    public QueryManagerConfig setFaultTolerantExecutionMinSourceStageProgress(double faultTolerantExecutionMinSourceStageProgress)
+    {
+        this.faultTolerantExecutionMinSourceStageProgress = faultTolerantExecutionMinSourceStageProgress;
+        return this;
+    }
+
+    public boolean isFaultTolerantExecutionSmallStageEstimationEnabled()
+    {
+        return faultTolerantExecutionSmallStageEstimationEnabled;
+    }
+
+    @Config("fault-tolerant-execution-small-stage-estimation-enabled")
+    @ConfigDescription("Enable small stage estimation heuristic, used for more aggresive speculative stage scheduling")
+    public QueryManagerConfig setFaultTolerantExecutionSmallStageEstimationEnabled(boolean faultTolerantExecutionSmallStageEstimationEnabled)
+    {
+        this.faultTolerantExecutionSmallStageEstimationEnabled = faultTolerantExecutionSmallStageEstimationEnabled;
+        return this;
+    }
+
+    public DataSize getFaultTolerantExecutionSmallStageEstimationThreshold()
+    {
+        return faultTolerantExecutionSmallStageEstimationThreshold;
+    }
+
+    @Config("fault-tolerant-execution-small-stage-estimation-threshold")
+    @ConfigDescription("Threshold until which stage is considered small")
+    public QueryManagerConfig setFaultTolerantExecutionSmallStageEstimationThreshold(DataSize faultTolerantExecutionSmallStageEstimationThreshold)
+    {
+        this.faultTolerantExecutionSmallStageEstimationThreshold = faultTolerantExecutionSmallStageEstimationThreshold;
+        return this;
+    }
+
+    @DecimalMin("1.0")
+    public double getFaultTolerantExecutionSmallStageSourceSizeMultiplier()
+    {
+        return faultTolerantExecutionSmallStageSourceSizeMultiplier;
+    }
+
+    @Config("fault-tolerant-execution-small-stage-source-size-multiplier")
+    @ConfigDescription("Multiplier used for heuristic estimation is stage is small; the bigger the more conservative estimation is")
+    public QueryManagerConfig setFaultTolerantExecutionSmallStageSourceSizeMultiplier(double faultTolerantExecutionSmallStageSourceSizeMultiplier)
+    {
+        this.faultTolerantExecutionSmallStageSourceSizeMultiplier = faultTolerantExecutionSmallStageSourceSizeMultiplier;
+        return this;
+    }
+
+    public boolean isFaultTolerantExecutionSmallStageRequireNoMorePartitions()
     {
-        return faultTolerantExecutionPartitionCount;
+        return faultTolerantExecutionSmallStageRequireNoMorePartitions;
     }
 
-    @Config("fault-tolerant-execution-partition-count")
-    @ConfigDescription("Number of partitions for distributed joins and aggregations executed with fault tolerant execution enabled")
-    public QueryManagerConfig setFaultTolerantExecutionPartitionCount(int faultTolerantExecutionPartitionCount)
+    @Config("fault-tolerant-execution-small-stage-require-no-more-partitions")
+    @ConfigDescription("Is it required for all stage partitions (tasks) to be enumerated for stage to be used in heuristic to determine if parent stage is small")
+    public QueryManagerConfig setFaultTolerantExecutionSmallStageRequireNoMorePartitions(boolean faultTolerantExecutionSmallStageRequireNoMorePartitions)
     {
-        this.faultTolerantExecutionPartitionCount = faultTolerantExecutionPartitionCount;
+        this.faultTolerantExecutionSmallStageRequireNoMorePartitions = faultTolerantExecutionSmallStageRequireNoMorePartitions;
         return this;
     }
 
-    public boolean isFaultTolerantExecutionForcePreferredWritePartitioningEnabled()
+    public boolean isFaultTolerantExecutionStageEstimationForEagerParentEnabled()
     {
-        return faultTolerantExecutionForcePreferredWritePartitioningEnabled;
+        return faultTolerantExecutionStageEstimationForEagerParentEnabled;
     }
 
-    @Config("experimental.fault-tolerant-execution-force-preferred-write-partitioning-enabled")
-    public QueryManagerConfig setFaultTolerantExecutionForcePreferredWritePartitioningEnabled(boolean faultTolerantExecutionForcePreferredWritePartitioningEnabled)
+    @Config("fault-tolerant-execution-stage-estimation-for-eager-parent-enabled")
+    @ConfigDescription("Enable aggressive stage output size estimation heuristic for children of stages to be executed eagerly")
+    public QueryManagerConfig setFaultTolerantExecutionStageEstimationForEagerParentEnabled(boolean faultTolerantExecutionStageEstimationForEagerParentEnabled)
     {
-        this.faultTolerantExecutionForcePreferredWritePartitioningEnabled = faultTolerantExecutionForcePreferredWritePartitioningEnabled;
+        this.faultTolerantExecutionStageEstimationForEagerParentEnabled = faultTolerantExecutionStageEstimationForEagerParentEnabled;
         return this;
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryManagerStats.java b/core/trino-main/src/main/java/io/trino/execution/QueryManagerStats.java
index 5adb668e04e6..92f4ea047196 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryManagerStats.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryManagerStats.java
@@ -13,6 +13,7 @@
  */
 package io.trino.execution;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.stats.CounterStat;
 import io.airlift.stats.DistributionStat;
 import io.airlift.stats.TimeStat;
@@ -22,8 +23,6 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.util.Optional;
 import java.util.function.Supplier;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryPreparer.java b/core/trino-main/src/main/java/io/trino/execution/QueryPreparer.java
index 110eba95efe9..0286027e99ab 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryPreparer.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryPreparer.java
@@ -14,25 +14,24 @@
 package io.trino.execution;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.spi.TrinoException;
 import io.trino.spi.resourcegroups.QueryType;
 import io.trino.sql.parser.ParsingException;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.Execute;
+import io.trino.sql.tree.ExecuteImmediate;
 import io.trino.sql.tree.ExplainAnalyze;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.Statement;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
 import static io.trino.execution.ParameterExtractor.getParameterCount;
 import static io.trino.spi.StandardErrorCode.INVALID_PARAMETER_USAGE;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static io.trino.sql.ParsingUtil.createParsingOptions;
 import static io.trino.sql.analyzer.ConstantExpressionVerifier.verifyExpressionIsConstant;
 import static io.trino.sql.analyzer.SemanticExceptions.semanticException;
 import static io.trino.util.StatementUtils.getQueryType;
@@ -52,7 +51,7 @@ public QueryPreparer(SqlParser sqlParser)
     public PreparedQuery prepareQuery(Session session, String query)
             throws ParsingException, TrinoException
     {
-        Statement wrappedStatement = sqlParser.createStatement(query, createParsingOptions(session));
+        Statement wrappedStatement = sqlParser.createStatement(query);
         return prepareQuery(session, wrappedStatement);
     }
 
@@ -61,23 +60,32 @@ public PreparedQuery prepareQuery(Session session, Statement wrappedStatement)
     {
         Statement statement = wrappedStatement;
         Optional<String> prepareSql = Optional.empty();
-        if (statement instanceof Execute) {
-            prepareSql = Optional.of(session.getPreparedStatementFromExecute((Execute) statement));
-            statement = sqlParser.createStatement(prepareSql.get(), createParsingOptions(session));
+        if (statement instanceof Execute executeStatement) {
+            prepareSql = Optional.of(session.getPreparedStatementFromExecute(executeStatement));
+            statement = sqlParser.createStatement(prepareSql.get());
         }
-
-        if (statement instanceof ExplainAnalyze) {
-            Statement innerStatement = ((ExplainAnalyze) statement).getStatement();
+        else if (statement instanceof ExecuteImmediate executeImmediateStatement) {
+            statement = sqlParser.createStatement(
+                    executeImmediateStatement.getStatement().getValue(),
+                    executeImmediateStatement.getStatement().getLocation().orElseThrow(() -> new ParsingException("Missing location for embedded statement")));
+        }
+        else if (statement instanceof ExplainAnalyze explainAnalyzeStatement) {
+            Statement innerStatement = explainAnalyzeStatement.getStatement();
             Optional<QueryType> innerQueryType = getQueryType(innerStatement);
             if (innerQueryType.isEmpty() || innerQueryType.get() == QueryType.DATA_DEFINITION) {
                 throw new TrinoException(NOT_SUPPORTED, "EXPLAIN ANALYZE doesn't support statement type: " + innerStatement.getClass().getSimpleName());
             }
         }
+
         List<Expression> parameters = ImmutableList.of();
-        if (wrappedStatement instanceof Execute) {
-            parameters = ((Execute) wrappedStatement).getParameters();
+        if (wrappedStatement instanceof Execute executeStatement) {
+            parameters = executeStatement.getParameters();
+        }
+        else if (wrappedStatement instanceof ExecuteImmediate executeImmediateStatement) {
+            parameters = executeImmediateStatement.getParameters();
         }
         validateParameters(statement, parameters);
+
         return new PreparedQuery(statement, parameters, prepareSql);
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryStateMachine.java b/core/trino-main/src/main/java/io/trino/execution/QueryStateMachine.java
index a347b7c67c17..fab76cad511a 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryStateMachine.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryStateMachine.java
@@ -22,8 +22,13 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
 import io.trino.Session;
 import io.trino.client.NodeVersion;
 import io.trino.exchange.ExchangeInput;
@@ -50,22 +55,22 @@
 import io.trino.sql.analyzer.Output;
 import io.trino.sql.planner.PlanFragment;
 import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.tracing.TrinoAttributes;
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionInfo;
 import io.trino.transaction.TransactionManager;
+import jakarta.annotation.Nullable;
 import org.joda.time.DateTime;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.net.URI;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalDouble;
 import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -79,6 +84,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Strings.nullToEmpty;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static io.airlift.units.DataSize.succinctBytes;
 import static io.trino.SystemSessionProperties.getRetryPolicy;
@@ -101,6 +107,7 @@
 import static io.trino.util.Ciphers.createRandomAesEncryptionKey;
 import static io.trino.util.Ciphers.serializeAesEncryptionKey;
 import static io.trino.util.Failures.toFailure;
+import static java.lang.Math.min;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
@@ -144,6 +151,9 @@ public class QueryStateMachine
     private final AtomicReference<String> setSchema = new AtomicReference<>();
     private final AtomicReference<String> setPath = new AtomicReference<>();
 
+    private final AtomicReference<String> setAuthorizationUser = new AtomicReference<>();
+    private final AtomicBoolean resetAuthorizationUser = new AtomicBoolean();
+
     private final Map<String, String> setSessionProperties = new ConcurrentHashMap<>();
     private final Set<String> resetSessionProperties = Sets.newConcurrentHashSet();
 
@@ -298,6 +308,10 @@ static QueryStateMachine beginWithTicker(
             session = session.withExchangeEncryption(serializeAesEncryptionKey(createRandomAesEncryptionKey()));
         }
 
+        Span querySpan = session.getQuerySpan();
+
+        querySpan.setAttribute(TrinoAttributes.QUERY_TYPE, queryType.map(Enum::name).orElse("UNKNOWN"));
+
         QueryStateMachine queryStateMachine = new QueryStateMachine(
                 query,
                 preparedQuery,
@@ -312,6 +326,7 @@ static QueryStateMachine beginWithTicker(
                 queryStatsCollector,
                 queryType,
                 version);
+
         queryStateMachine.addStateChangeListener(newState -> {
             QUERY_STATE_LOG.debug("Query %s is %s", queryStateMachine.getQueryId(), newState);
             if (newState.isDone()) {
@@ -320,6 +335,26 @@ static QueryStateMachine beginWithTicker(
             }
         });
 
+        queryStateMachine.addStateChangeListener(newState -> {
+            querySpan.addEvent("query_state", Attributes.of(
+                    TrinoAttributes.EVENT_STATE, newState.toString()));
+            if (newState.isDone()) {
+                queryStateMachine.getFailureInfo().ifPresentOrElse(
+                        failure -> {
+                            ErrorCode errorCode = requireNonNull(failure.getErrorCode());
+                            querySpan.setStatus(StatusCode.ERROR, nullToEmpty(failure.getMessage()))
+                                    .recordException(failure.toException())
+                                    .setAttribute(TrinoAttributes.ERROR_CODE, errorCode.getCode())
+                                    .setAttribute(TrinoAttributes.ERROR_NAME, errorCode.getName())
+                                    .setAttribute(TrinoAttributes.ERROR_TYPE, errorCode.getType().toString());
+                        },
+                        () -> querySpan.setStatus(StatusCode.OK));
+                querySpan.end();
+            }
+        });
+
+        metadata.beginQuery(session);
+
         return queryStateMachine;
     }
 
@@ -446,7 +481,8 @@ public BasicQueryInfo getBasicQueryInfo(Optional<BasicStageStats> rootStage)
 
                 stageStats.isFullyBlocked(),
                 stageStats.getBlockedReasons(),
-                stageStats.getProgressPercentage());
+                stageStats.getProgressPercentage(),
+                stageStats.getRunningPercentage());
 
         return new BasicQueryInfo(
                 queryId,
@@ -499,6 +535,8 @@ QueryInfo getQueryInfo(Optional<StageInfo> rootStage)
                 Optional.ofNullable(setCatalog.get()),
                 Optional.ofNullable(setSchema.get()),
                 Optional.ofNullable(setPath.get()),
+                Optional.ofNullable(setAuthorizationUser.get()),
+                resetAuthorizationUser.get(),
                 setSessionProperties,
                 resetSessionProperties,
                 setRoles,
@@ -536,8 +574,8 @@ private QueryStats getQueryStats(Optional<StageInfo> rootStage, List<StageInfo>
         int blockedDrivers = 0;
         int completedDrivers = 0;
 
-        long cumulativeUserMemory = 0;
-        long failedCumulativeUserMemory = 0;
+        double cumulativeUserMemory = 0;
+        double failedCumulativeUserMemory = 0;
         long userMemoryReservation = 0;
         long revocableMemoryReservation = 0;
         long totalMemoryReservation = 0;
@@ -665,9 +703,52 @@ private QueryStats getQueryStats(Optional<StageInfo> rootStage, List<StageInfo>
             failedOutputPositions += outputStageStats.getFailedOutputPositions();
         }
 
-        boolean isScheduled = rootStage.isPresent() && allStages.stream()
-                .map(StageInfo::getState)
-                .allMatch(state -> state == StageState.RUNNING || state == StageState.PENDING || state.isDone());
+        boolean scheduled;
+        OptionalDouble progressPercentage;
+        OptionalDouble runningPercentage;
+        if (getRetryPolicy(session).equals(TASK)) {
+            // Unlike pipelined execution, fault tolerant execution doesn't execute stages all at
+            // once and some stages will be in PLANNED state in the middle of execution.
+            scheduled = rootStage.isPresent() && allStages.stream()
+                    .map(StageInfo::getState)
+                    .anyMatch(StageState::isScheduled);
+            if (!scheduled || totalDrivers == 0) {
+                progressPercentage = OptionalDouble.empty();
+                runningPercentage = OptionalDouble.empty();
+            }
+            else {
+                double completedPercentageSum = 0.0;
+                double runningPercentageSum = 0.0;
+                int totalStages = 0;
+                Queue<StageInfo> queue = new ArrayDeque<>();
+                queue.add(rootStage.get());
+                while (!queue.isEmpty()) {
+                    StageInfo stage = queue.poll();
+                    StageStats stageStats = stage.getStageStats();
+                    totalStages++;
+                    if (stage.getState().isScheduled()) {
+                        completedPercentageSum += 100.0 * stageStats.getCompletedDrivers() / stageStats.getTotalDrivers();
+                        runningPercentageSum += 100.0 * stageStats.getRunningDrivers() / stageStats.getTotalDrivers();
+                    }
+                    queue.addAll(stage.getSubStages());
+                }
+                progressPercentage = OptionalDouble.of(min(100, completedPercentageSum / totalStages));
+                runningPercentage = OptionalDouble.of(min(100, runningPercentageSum / totalStages));
+            }
+        }
+        else {
+            scheduled = rootStage.isPresent() && allStages.stream()
+                    .map(StageInfo::getState)
+                    .allMatch(StageState::isScheduled);
+            if (!scheduled || totalDrivers == 0) {
+                progressPercentage = OptionalDouble.empty();
+                runningPercentage = OptionalDouble.empty();
+            }
+            else {
+                progressPercentage = OptionalDouble.of(min(100, (completedDrivers * 100.0) / totalDrivers));
+                runningPercentage = OptionalDouble.of(min(100, (runningDrivers * 100.0) / totalDrivers));
+            }
+        }
 
         return new QueryStats(
                 queryStateTimer.getCreateTime(),
@@ -682,6 +763,7 @@ private QueryStats getQueryStats(Optional<StageInfo> rootStage, List<StageInfo>
                 queryStateTimer.getExecutionTime(),
                 queryStateTimer.getAnalysisTime(),
                 queryStateTimer.getPlanningTime(),
+                queryStateTimer.getPlanningCpuTime(),
                 queryStateTimer.getFinishingTime(),
 
                 totalTasks,
@@ -707,7 +789,9 @@ private QueryStats getQueryStats(Optional<StageInfo> rootStage, List<StageInfo>
                 succinctBytes(getPeakTaskRevocableMemory()),
                 succinctBytes(getPeakTaskTotalMemory()),
 
-                isScheduled,
+                scheduled,
+                progressPercentage,
+                runningPercentage,
 
                 new Duration(totalScheduledTime, MILLISECONDS).convertToMostSuccinctTimeUnit(),
                 new Duration(failedScheduledTime, MILLISECONDS).convertToMostSuccinctTimeUnit(),
@@ -846,6 +930,18 @@ public String getSetPath()
         return setPath.get();
     }
 
+    public void setSetAuthorizationUser(String authorizationUser)
+    {
+        checkState(authorizationUser != null && !authorizationUser.isEmpty(), "Authorization user cannot be null or empty");
+        setAuthorizationUser.set(authorizationUser);
+    }
+
+    public void resetAuthorizationUser()
+    {
+        checkArgument(setAuthorizationUser.get() == null, "Cannot set and reset the authorization user in the same request");
+        resetAuthorizationUser.set(true);
+    }
+
     public void addSetSessionProperties(String key, String value)
     {
         setSessionProperties.put(requireNonNull(key, "key is null"), requireNonNull(value, "value is null"));
@@ -1229,6 +1325,8 @@ public void pruneQueryInfo()
                 queryInfo.getSetCatalog(),
                 queryInfo.getSetSchema(),
                 queryInfo.getSetPath(),
+                queryInfo.getSetAuthorizationUser(),
+                queryInfo.isResetAuthorizationUser(),
                 queryInfo.getSetSessionProperties(),
                 queryInfo.getResetSessionProperties(),
                 queryInfo.getSetRoles(),
@@ -1268,6 +1366,7 @@ private static QueryStats pruneQueryStats(QueryStats queryStats)
                 queryStats.getExecutionTime(),
                 queryStats.getAnalysisTime(),
                 queryStats.getPlanningTime(),
+                queryStats.getPlanningCpuTime(),
                 queryStats.getFinishingTime(),
                 queryStats.getTotalTasks(),
                 queryStats.getFailedTasks(),
@@ -1290,6 +1389,8 @@ private static QueryStats pruneQueryStats(QueryStats queryStats)
                 queryStats.getPeakTaskRevocableMemory(),
                 queryStats.getPeakTaskTotalMemory(),
                 queryStats.isScheduled(),
+                queryStats.getProgressPercentage(),
+                queryStats.getRunningPercentage(),
                 queryStats.getTotalScheduledTime(),
                 queryStats.getFailedScheduledTime(),
                 queryStats.getTotalCpuTime(),
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryStateTimer.java b/core/trino-main/src/main/java/io/trino/execution/QueryStateTimer.java
index 31860e579e45..d1642ab47cc8 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryStateTimer.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryStateTimer.java
@@ -17,6 +17,8 @@
 import io.airlift.units.Duration;
 import org.joda.time.DateTime;
 
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadMXBean;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -28,6 +30,7 @@
 
 class QueryStateTimer
 {
+    private static final ThreadMXBean THREAD_MX_BEAN = ManagementFactory.getThreadMXBean();
     private final Ticker ticker;
 
     private final DateTime createTime = DateTime.now();
@@ -36,6 +39,7 @@ class QueryStateTimer
     private final AtomicReference<Long> beginResourceWaitingNanos = new AtomicReference<>();
     private final AtomicReference<Long> beginDispatchingNanos = new AtomicReference<>();
     private final AtomicReference<Long> beginPlanningNanos = new AtomicReference<>();
+    private final AtomicReference<Long> beginPlanningCpuNanos = new AtomicReference<>();
     private final AtomicReference<Long> beginFinishingNanos = new AtomicReference<>();
     private final AtomicReference<Long> endNanos = new AtomicReference<>();
 
@@ -44,6 +48,7 @@ class QueryStateTimer
     private final AtomicReference<Duration> dispatchingTime = new AtomicReference<>();
     private final AtomicReference<Duration> executionTime = new AtomicReference<>();
     private final AtomicReference<Duration> planningTime = new AtomicReference<>();
+    private final AtomicReference<Duration> planningCpuTime = new AtomicReference<>();
     private final AtomicReference<Duration> finishingTime = new AtomicReference<>();
 
     private final AtomicReference<Long> beginAnalysisNanos = new AtomicReference<>();
@@ -87,25 +92,27 @@ private void beginDispatching(long now)
 
     public void beginPlanning()
     {
-        beginPlanning(tickerNanos());
+        beginPlanning(tickerNanos(), currentThreadCpuTime());
     }
 
-    private void beginPlanning(long now)
+    private void beginPlanning(long now, long cpuNow)
     {
         beginDispatching(now);
         dispatchingTime.compareAndSet(null, nanosSince(beginDispatchingNanos, now));
         beginPlanningNanos.compareAndSet(null, now);
+        beginPlanningCpuNanos.compareAndSet(null, cpuNow);
     }
 
     public void beginStarting()
     {
-        beginStarting(tickerNanos());
+        beginStarting(tickerNanos(), currentThreadCpuTime());
     }
 
-    private void beginStarting(long now)
+    private void beginStarting(long now, long cpuNow)
     {
-        beginPlanning(now);
+        beginPlanning(now, cpuNow);
         planningTime.compareAndSet(null, nanosSince(beginPlanningNanos, now));
+        planningCpuTime.compareAndSet(null, nanosSince(beginPlanningCpuNanos, cpuNow));
     }
 
     public void beginRunning()
@@ -115,7 +122,7 @@ public void beginRunning()
 
     private void beginRunning(long now)
     {
-        beginStarting(now);
+        beginStarting(now, currentThreadCpuTime());
     }
 
     public void beginFinishing()
@@ -228,6 +235,11 @@ public Duration getPlanningTime()
         return getDuration(planningTime, beginPlanningNanos);
     }
 
+    public Duration getPlanningCpuTime()
+    {
+        return getDuration(planningCpuTime, beginPlanningCpuNanos);
+    }
+
     public Duration getFinishingTime()
     {
         return getDuration(finishingTime, beginFinishingNanos);
@@ -303,4 +315,9 @@ private DateTime toDateTime(long instantNanos)
         long millisSinceCreate = NANOSECONDS.toMillis(instantNanos - createNanos);
         return new DateTime(createTime.getMillis() + millisSinceCreate);
     }
+
+    private static long currentThreadCpuTime()
+    {
+        return THREAD_MX_BEAN.getCurrentThreadCpuTime();
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryStats.java b/core/trino-main/src/main/java/io/trino/execution/QueryStats.java
index a4e488a14f1d..68d5d7fb77b8 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryStats.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryStats.java
@@ -24,10 +24,9 @@
 import io.trino.operator.TableWriterOperator;
 import io.trino.spi.eventlistener.QueryPlanOptimizerStatistics;
 import io.trino.spi.eventlistener.StageGcStatistics;
+import jakarta.annotation.Nullable;
 import org.joda.time.DateTime;
 
-import javax.annotation.Nullable;
-
 import java.util.List;
 import java.util.OptionalDouble;
 import java.util.Set;
@@ -35,7 +34,6 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.units.DataSize.succinctBytes;
 import static io.trino.server.DynamicFilterService.DynamicFiltersStats;
-import static java.lang.Math.min;
 import static java.util.Objects.requireNonNull;
 
 public class QueryStats
@@ -53,6 +51,7 @@ public class QueryStats
     private final Duration executionTime;
     private final Duration analysisTime;
     private final Duration planningTime;
+    private final Duration planningCpuTime;
     private final Duration finishingTime;
 
     private final int totalTasks;
@@ -79,6 +78,8 @@ public class QueryStats
     private final DataSize peakTaskTotalMemory;
 
     private final boolean scheduled;
+    private final OptionalDouble progressPercentage;
+    private final OptionalDouble runningPercentage;
     private final Duration totalScheduledTime;
     private final Duration failedScheduledTime;
     private final Duration totalCpuTime;
@@ -144,6 +145,7 @@ public QueryStats(
             @JsonProperty("executionTime") Duration executionTime,
             @JsonProperty("analysisTime") Duration analysisTime,
             @JsonProperty("planningTime") Duration planningTime,
+            @JsonProperty("planningCpuTime") Duration planningCpuTime,
             @JsonProperty("finishingTime") Duration finishingTime,
 
             @JsonProperty("totalTasks") int totalTasks,
@@ -170,6 +172,8 @@ public QueryStats(
             @JsonProperty("peakTaskTotalMemory") DataSize peakTaskTotalMemory,
 
             @JsonProperty("scheduled") boolean scheduled,
+            @JsonProperty("progressPercentage") OptionalDouble progressPercentage,
+            @JsonProperty("runningPercentage") OptionalDouble runningPercentage,
             @JsonProperty("totalScheduledTime") Duration totalScheduledTime,
             @JsonProperty("failedScheduledTime") Duration failedScheduledTime,
             @JsonProperty("totalCpuTime") Duration totalCpuTime,
@@ -233,6 +237,7 @@ public QueryStats(
         this.executionTime = requireNonNull(executionTime, "executionTime is null");
         this.analysisTime = requireNonNull(analysisTime, "analysisTime is null");
         this.planningTime = requireNonNull(planningTime, "planningTime is null");
+        this.planningCpuTime = requireNonNull(planningCpuTime, "planningCpuTime is null");
         this.finishingTime = requireNonNull(finishingTime, "finishingTime is null");
 
         checkArgument(totalTasks >= 0, "totalTasks is negative");
@@ -267,6 +272,8 @@ public QueryStats(
         this.peakTaskRevocableMemory = requireNonNull(peakTaskRevocableMemory, "peakTaskRevocableMemory is null");
         this.peakTaskTotalMemory = requireNonNull(peakTaskTotalMemory, "peakTaskTotalMemory is null");
         this.scheduled = scheduled;
+        this.progressPercentage = requireNonNull(progressPercentage, "progressPercentage is null");
+        this.runningPercentage = requireNonNull(runningPercentage, "runningPercentage is null");
         this.totalScheduledTime = requireNonNull(totalScheduledTime, "totalScheduledTime is null");
         this.failedScheduledTime = requireNonNull(failedScheduledTime, "failedScheduledTime is null");
         this.totalCpuTime = requireNonNull(totalCpuTime, "totalCpuTime is null");
@@ -396,6 +403,12 @@ public Duration getPlanningTime()
         return planningTime;
     }
 
+    @JsonProperty
+    public Duration getPlanningCpuTime()
+    {
+        return planningCpuTime;
+    }
+
     @JsonProperty
     public Duration getFinishingTime()
     {
@@ -528,6 +541,18 @@ public boolean isScheduled()
         return scheduled;
     }
 
+    @JsonProperty
+    public OptionalDouble getProgressPercentage()
+    {
+        return progressPercentage;
+    }
+
+    @JsonProperty
+    public OptionalDouble getRunningPercentage()
+    {
+        return runningPercentage;
+    }
+
     @JsonProperty
     public Duration getTotalScheduledTime()
     {
@@ -781,15 +806,6 @@ public List<QueryPlanOptimizerStatistics> getOptimizerRulesSummaries()
         return optimizerRulesSummaries;
     }
 
-    @JsonProperty
-    public OptionalDouble getProgressPercentage()
-    {
-        if (!scheduled || totalDrivers == 0) {
-            return OptionalDouble.empty();
-        }
-        return OptionalDouble.of(min(100, (completedDrivers * 100.0) / totalDrivers));
-    }
-
     @JsonProperty
     public DataSize getSpilledDataSize()
     {
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryTracker.java b/core/trino-main/src/main/java/io/trino/execution/QueryTracker.java
index 6d4d222f5679..78267db6e416 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryTracker.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryTracker.java
@@ -14,6 +14,8 @@
 package io.trino.execution;
 
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.Session;
@@ -22,9 +24,6 @@
 import io.trino.spi.TrinoException;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.Collection;
 import java.util.NoSuchElementException;
 import java.util.Optional;
@@ -147,6 +146,12 @@ public T getQuery(QueryId queryId)
                 .orElseThrow(() -> new NoSuchElementException(queryId.toString()));
     }
 
+    public boolean hasQuery(QueryId queryId)
+    {
+        requireNonNull(queryId, "queryId is null");
+        return queries.containsKey(queryId);
+    }
+
     public Optional<T> tryGetQuery(QueryId queryId)
     {
         requireNonNull(queryId, "queryId is null");
diff --git a/core/trino-main/src/main/java/io/trino/execution/RemoteTask.java b/core/trino-main/src/main/java/io/trino/execution/RemoteTask.java
index 18d64a6d37cb..2275072a330b 100644
--- a/core/trino-main/src/main/java/io/trino/execution/RemoteTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/RemoteTask.java
@@ -39,6 +39,8 @@ public interface RemoteTask
 
     void setOutputBuffers(OutputBuffers outputBuffers);
 
+    void setSpeculative(boolean speculative);
+
     /**
      * Listener is always notified asynchronously using a dedicated notification thread pool so, care should
      * be taken to avoid leaking {@code this} when adding a listener in a constructor. Additionally, it is
diff --git a/core/trino-main/src/main/java/io/trino/execution/RemoteTaskFactory.java b/core/trino-main/src/main/java/io/trino/execution/RemoteTaskFactory.java
index 085107dcb74e..4b232c9e377d 100644
--- a/core/trino-main/src/main/java/io/trino/execution/RemoteTaskFactory.java
+++ b/core/trino-main/src/main/java/io/trino/execution/RemoteTaskFactory.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.Multimap;
 import io.airlift.units.DataSize;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.execution.NodeTaskMap.PartitionedSplitCountTracker;
 import io.trino.execution.buffer.OutputBuffers;
@@ -31,8 +32,10 @@ public interface RemoteTaskFactory
 {
     RemoteTask createRemoteTask(
             Session session,
+            Span stageSpan,
             TaskId taskId,
             InternalNode node,
+            boolean speculative,
             PlanFragment fragment,
             Multimap<PlanNodeId, Split> initialSplits,
             OutputBuffers outputBuffers,
diff --git a/core/trino-main/src/main/java/io/trino/execution/RenameColumnTask.java b/core/trino-main/src/main/java/io/trino/execution/RenameColumnTask.java
index b5d98dc8aaac..782f4c52bb47 100644
--- a/core/trino-main/src/main/java/io/trino/execution/RenameColumnTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/RenameColumnTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -21,17 +22,23 @@
 import io.trino.metadata.RedirectionAwareTableHandle;
 import io.trino.metadata.TableHandle;
 import io.trino.security.AccessControl;
+import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.Type;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.RenameColumn;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Iterables.getLast;
+import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
 import static io.trino.metadata.MetadataUtil.createQualifiedObjectName;
+import static io.trino.spi.StandardErrorCode.AMBIGUOUS_NAME;
 import static io.trino.spi.StandardErrorCode.COLUMN_ALREADY_EXISTS;
 import static io.trino.spi.StandardErrorCode.COLUMN_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
@@ -69,18 +76,18 @@ public ListenableFuture<Void> execute(
         Session session = stateMachine.getSession();
         QualifiedObjectName originalTableName = createQualifiedObjectName(session, statement, statement.getTable());
         RedirectionAwareTableHandle redirectionAwareTableHandle = metadata.getRedirectionAwareTableHandle(session, originalTableName);
-        if (redirectionAwareTableHandle.getTableHandle().isEmpty()) {
+        if (redirectionAwareTableHandle.tableHandle().isEmpty()) {
             if (!statement.isTableExists()) {
                 throw semanticException(TABLE_NOT_FOUND, statement, "Table '%s' does not exist", originalTableName);
             }
             return immediateVoidFuture();
         }
-        TableHandle tableHandle = redirectionAwareTableHandle.getTableHandle().get();
+        TableHandle tableHandle = redirectionAwareTableHandle.tableHandle().get();
 
-        String source = statement.getSource().getValue().toLowerCase(ENGLISH);
+        String source = statement.getSource().getParts().get(0).toLowerCase(ENGLISH);
         String target = statement.getTarget().getValue().toLowerCase(ENGLISH);
 
-        accessControl.checkCanRenameColumn(session.toSecurityContext(), redirectionAwareTableHandle.getRedirectedTableName().orElse(originalTableName));
+        QualifiedObjectName qualifiedTableName = redirectionAwareTableHandle.redirectedTableName().orElse(originalTableName);
 
         Map<String, ColumnHandle> columnHandles = metadata.getColumnHandles(session, tableHandle);
         ColumnHandle columnHandle = columnHandles.get(source);
@@ -90,17 +97,72 @@ public ListenableFuture<Void> execute(
             }
             return immediateVoidFuture();
         }
-
-        if (columnHandles.containsKey(target)) {
-            throw semanticException(COLUMN_ALREADY_EXISTS, statement, "Column '%s' already exists", target);
-        }
-
         if (metadata.getColumnMetadata(session, tableHandle, columnHandle).isHidden()) {
             throw semanticException(NOT_SUPPORTED, statement, "Cannot rename hidden column");
         }
 
-        metadata.renameColumn(session, tableHandle, columnHandle, target);
+        if (statement.getSource().getParts().size() == 1) {
+            accessControl.checkCanRenameColumn(session.toSecurityContext(), qualifiedTableName);
+
+            if (columnHandles.containsKey(target)) {
+                throw semanticException(COLUMN_ALREADY_EXISTS, statement, "Column '%s' already exists", target);
+            }
+
+            metadata.renameColumn(session, tableHandle, qualifiedTableName.asCatalogSchemaTableName(), columnHandle, target);
+        }
+        else {
+            accessControl.checkCanAlterColumn(session.toSecurityContext(), qualifiedTableName);
+
+            List<String> fieldPath = statement.getSource().getParts();
+
+            ColumnMetadata columnMetadata = metadata.getColumnMetadata(session, tableHandle, columnHandle);
+            Type currentType = columnMetadata.getType();
+            for (int i = 1; i < fieldPath.size() - 1; i++) {
+                String fieldName = fieldPath.get(i);
+                List<RowType.Field> candidates = getCandidates(currentType, fieldName);
+
+                if (candidates.isEmpty()) {
+                    throw semanticException(COLUMN_NOT_FOUND, statement, "Field '%s' does not exist within %s", fieldName, currentType);
+                }
+                if (candidates.size() > 1) {
+                    throw semanticException(AMBIGUOUS_NAME, statement, "Field path %s within %s is ambiguous", fieldPath, columnMetadata.getType());
+                }
+                currentType = getOnlyElement(candidates).getType();
+            }
+
+            String sourceFieldName = getLast(statement.getSource().getParts());
+            List<RowType.Field> sourceCandidates = getCandidates(currentType, sourceFieldName);
+            if (sourceCandidates.isEmpty()) {
+                if (!statement.isColumnExists()) {
+                    throw semanticException(COLUMN_NOT_FOUND, statement, "Field '%s' does not exist", source);
+                }
+                return immediateVoidFuture();
+            }
+            if (sourceCandidates.size() > 1) {
+                throw semanticException(AMBIGUOUS_NAME, statement, "Field path %s within %s is ambiguous", fieldPath, columnMetadata.getType());
+            }
+
+            List<RowType.Field> targetCandidates = getCandidates(currentType, target);
+            if (!targetCandidates.isEmpty()) {
+                throw semanticException(COLUMN_ALREADY_EXISTS, statement, "Field '%s' already exists", target);
+            }
+
+            metadata.renameField(session, tableHandle, fieldPath, target);
+        }
 
         return immediateVoidFuture();
     }
+
+    private static List<RowType.Field> getCandidates(Type type, String fieldName)
+    {
+        if (!(type instanceof RowType rowType)) {
+            throw new TrinoException(NOT_SUPPORTED, "Unsupported type: " + type);
+        }
+        List<RowType.Field> candidates = rowType.getFields().stream()
+                // case-insensitive match
+                .filter(rowField -> rowField.getName().isPresent() && rowField.getName().get().equalsIgnoreCase(fieldName))
+                .collect(toImmutableList());
+
+        return candidates;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/RenameMaterializedViewTask.java b/core/trino-main/src/main/java/io/trino/execution/RenameMaterializedViewTask.java
index 9e41861d39bd..becb213306b4 100644
--- a/core/trino-main/src/main/java/io/trino/execution/RenameMaterializedViewTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/RenameMaterializedViewTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -22,8 +23,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.RenameMaterializedView;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
diff --git a/core/trino-main/src/main/java/io/trino/execution/RenameSchemaTask.java b/core/trino-main/src/main/java/io/trino/execution/RenameSchemaTask.java
index dd5827ddc688..fdc9b33957eb 100644
--- a/core/trino-main/src/main/java/io/trino/execution/RenameSchemaTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/RenameSchemaTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -22,8 +23,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.RenameSchema;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/RenameTableTask.java b/core/trino-main/src/main/java/io/trino/execution/RenameTableTask.java
index b4af05175e3e..63e8fa04ddd3 100644
--- a/core/trino-main/src/main/java/io/trino/execution/RenameTableTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/RenameTableTask.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -27,8 +28,6 @@
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.RenameTable;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
@@ -87,15 +86,15 @@ public ListenableFuture<Void> execute(
         }
 
         RedirectionAwareTableHandle redirectionAwareTableHandle = metadata.getRedirectionAwareTableHandle(session, tableName);
-        if (redirectionAwareTableHandle.getTableHandle().isEmpty()) {
+        if (redirectionAwareTableHandle.tableHandle().isEmpty()) {
             if (!statement.isExists()) {
                 throw semanticException(TABLE_NOT_FOUND, statement, "Table '%s' does not exist", tableName);
             }
             return immediateVoidFuture();
         }
 
-        TableHandle tableHandle = redirectionAwareTableHandle.getTableHandle().get();
-        QualifiedObjectName source = redirectionAwareTableHandle.getRedirectedTableName().orElse(tableName);
+        TableHandle tableHandle = redirectionAwareTableHandle.tableHandle().get();
+        QualifiedObjectName source = redirectionAwareTableHandle.redirectedTableName().orElse(tableName);
         QualifiedObjectName target = createTargetQualifiedObjectName(source, statement.getTarget());
         if (metadata.getCatalogHandle(session, target.getCatalogName()).isEmpty()) {
             throw semanticException(CATALOG_NOT_FOUND, statement, "Target catalog '%s' does not exist", target.getCatalogName());
diff --git a/core/trino-main/src/main/java/io/trino/execution/RenameViewTask.java b/core/trino-main/src/main/java/io/trino/execution/RenameViewTask.java
index b93f8892eb04..b74d05786dd6 100644
--- a/core/trino-main/src/main/java/io/trino/execution/RenameViewTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/RenameViewTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -22,8 +23,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.RenameView;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
diff --git a/core/trino-main/src/main/java/io/trino/execution/ResetSessionAuthorizationTask.java b/core/trino-main/src/main/java/io/trino/execution/ResetSessionAuthorizationTask.java
new file mode 100644
index 000000000000..8af7bf504227
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/ResetSessionAuthorizationTask.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed 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 io.trino.execution;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
+import io.trino.Session;
+import io.trino.client.ClientCapabilities;
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.spi.TrinoException;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.ResetSessionAuthorization;
+import io.trino.transaction.TransactionManager;
+
+import java.util.List;
+
+import static com.google.common.util.concurrent.Futures.immediateFuture;
+import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static java.util.Objects.requireNonNull;
+
+public class ResetSessionAuthorizationTask
+        implements DataDefinitionTask<ResetSessionAuthorization>
+{
+    private final TransactionManager transactionManager;
+
+    @Inject
+    public ResetSessionAuthorizationTask(TransactionManager transactionManager)
+    {
+        this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
+    }
+
+    @Override
+    public String getName()
+    {
+        return "RESET SESSION AUTHORIZATION";
+    }
+
+    @Override
+    public ListenableFuture<Void> execute(
+            ResetSessionAuthorization statement,
+            QueryStateMachine stateMachine,
+            List<Expression> parameters,
+            WarningCollector warningCollector)
+    {
+        Session session = stateMachine.getSession();
+        if (!session.getClientCapabilities().contains(ClientCapabilities.SESSION_AUTHORIZATION.toString())) {
+            throw new TrinoException(NOT_SUPPORTED, "RESET SESSION AUTHORIZATION not supported by client");
+        }
+        session.getTransactionId().ifPresent(transactionId -> {
+            if (!transactionManager.getTransactionInfo(transactionId).isAutoCommitContext()) {
+                throw new TrinoException(GENERIC_USER_ERROR, "Can't reset authorization user in the middle of a transaction");
+            }
+        });
+        stateMachine.resetAuthorizationUser();
+        return immediateFuture(null);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/ResetSessionTask.java b/core/trino-main/src/main/java/io/trino/execution/ResetSessionTask.java
index fb4b42014238..125a0ddb783c 100644
--- a/core/trino-main/src/main/java/io/trino/execution/ResetSessionTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/ResetSessionTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.SessionPropertyManager;
@@ -21,8 +22,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.ResetSession;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
diff --git a/core/trino-main/src/main/java/io/trino/execution/RevokeRolesTask.java b/core/trino-main/src/main/java/io/trino/execution/RevokeRolesTask.java
index 5e0e11abcb40..6e7070ba359f 100644
--- a/core/trino-main/src/main/java/io/trino/execution/RevokeRolesTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/RevokeRolesTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -24,8 +25,6 @@
 import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.RevokeRoles;
 
-import javax.inject.Inject;
-
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
diff --git a/core/trino-main/src/main/java/io/trino/execution/RevokeTask.java b/core/trino-main/src/main/java/io/trino/execution/RevokeTask.java
index 83b0882ec62f..47bda73522dd 100644
--- a/core/trino-main/src/main/java/io/trino/execution/RevokeTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/RevokeTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -26,8 +27,6 @@
 import io.trino.sql.tree.GrantOnType;
 import io.trino.sql.tree.Revoke;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -98,11 +97,11 @@ private void executeRevokeOnTable(Session session, Revoke statement)
     {
         QualifiedObjectName tableName = createQualifiedObjectName(session, statement, statement.getName());
         RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, tableName);
-        if (redirection.getTableHandle().isEmpty()) {
+        if (redirection.tableHandle().isEmpty()) {
             throw semanticException(TABLE_NOT_FOUND, statement, "Table '%s' does not exist", tableName);
         }
-        if (redirection.getRedirectedTableName().isPresent()) {
-            throw semanticException(NOT_SUPPORTED, statement, "Table %s is redirected to %s and REVOKE is not supported with table redirections", tableName, redirection.getRedirectedTableName().get());
+        if (redirection.redirectedTableName().isPresent()) {
+            throw semanticException(NOT_SUPPORTED, statement, "Table %s is redirected to %s and REVOKE is not supported with table redirections", tableName, redirection.redirectedTableName().get());
         }
 
         Set<Privilege> privileges = parseStatementPrivileges(statement, statement.getPrivileges());
diff --git a/core/trino-main/src/main/java/io/trino/execution/RollbackTask.java b/core/trino-main/src/main/java/io/trino/execution/RollbackTask.java
index 965018c050d7..6b4925b54120 100644
--- a/core/trino-main/src/main/java/io/trino/execution/RollbackTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/RollbackTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.spi.TrinoException;
@@ -22,8 +23,6 @@
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
diff --git a/core/trino-main/src/main/java/io/trino/execution/SetColumnTypeTask.java b/core/trino-main/src/main/java/io/trino/execution/SetColumnTypeTask.java
index 196759a13080..fab3a71a84eb 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SetColumnTypeTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SetColumnTypeTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -21,22 +22,28 @@
 import io.trino.metadata.RedirectionAwareTableHandle;
 import io.trino.metadata.TableHandle;
 import io.trino.security.AccessControl;
+import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeNotFoundException;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.SetColumnType;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
 import static io.trino.metadata.MetadataUtil.createQualifiedObjectName;
+import static io.trino.spi.StandardErrorCode.AMBIGUOUS_NAME;
 import static io.trino.spi.StandardErrorCode.COLUMN_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.COLUMN_TYPE_UNKNOWN;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.TYPE_NOT_FOUND;
 import static io.trino.sql.analyzer.SemanticExceptions.semanticException;
@@ -77,7 +84,7 @@ public ListenableFuture<Void> execute(
         Session session = stateMachine.getSession();
         QualifiedObjectName qualifiedObjectName = createQualifiedObjectName(session, statement, statement.getTableName());
         RedirectionAwareTableHandle redirectionAwareTableHandle = metadata.getRedirectionAwareTableHandle(session, qualifiedObjectName);
-        if (redirectionAwareTableHandle.getTableHandle().isEmpty()) {
+        if (redirectionAwareTableHandle.tableHandle().isEmpty()) {
             String exceptionMessage = format("Table '%s' does not exist", qualifiedObjectName);
             if (metadata.getMaterializedView(session, qualifiedObjectName).isPresent()) {
                 exceptionMessage += ", but a materialized view with that name exists.";
@@ -91,20 +98,58 @@ else if (metadata.getView(session, qualifiedObjectName).isPresent()) {
             return immediateVoidFuture();
         }
 
-        accessControl.checkCanAlterColumn(session.toSecurityContext(), redirectionAwareTableHandle.getRedirectedTableName().orElse(qualifiedObjectName));
+        accessControl.checkCanAlterColumn(session.toSecurityContext(), redirectionAwareTableHandle.redirectedTableName().orElse(qualifiedObjectName));
 
-        TableHandle tableHandle = redirectionAwareTableHandle.getTableHandle().get();
+        TableHandle tableHandle = redirectionAwareTableHandle.tableHandle().get();
         Map<String, ColumnHandle> columnHandles = metadata.getColumnHandles(session, tableHandle);
-        ColumnHandle column = columnHandles.get(statement.getColumnName().getValue().toLowerCase(ENGLISH));
+        String columnName = statement.getColumnName().getParts().get(0).toLowerCase(ENGLISH);
+        ColumnHandle column = columnHandles.get(columnName);
         if (column == null) {
             throw semanticException(COLUMN_NOT_FOUND, statement, "Column '%s' does not exist", statement.getColumnName());
         }
 
-        metadata.setColumnType(session, tableHandle, column, getColumnType(statement));
+        Type type = getColumnType(statement);
+        if (statement.getColumnName().getParts().size() == 1) {
+            metadata.setColumnType(session, tableHandle, column, type);
+        }
+        else {
+            ColumnMetadata columnMetadata = metadata.getColumnMetadata(session, tableHandle, column);
+            List<String> fieldPath = statement.getColumnName().getParts();
+
+            Type currentType = columnMetadata.getType();
+            for (int i = 1; i < fieldPath.size(); i++) {
+                String fieldName = fieldPath.get(i);
+                List<RowType.Field> candidates = getCandidates(currentType, fieldName);
+
+                if (candidates.isEmpty()) {
+                    throw semanticException(COLUMN_NOT_FOUND, statement, "Field '%s' does not exist within %s", fieldName, currentType);
+                }
+                if (candidates.size() > 1) {
+                    throw semanticException(AMBIGUOUS_NAME, statement, "Field path %s within %s is ambiguous", fieldPath, columnMetadata.getType());
+                }
+                currentType = getOnlyElement(candidates).getType();
+            }
+
+            checkState(fieldPath.size() >= 2, "fieldPath size must be >= 2: %s", fieldPath);
+            metadata.setFieldType(session, tableHandle, fieldPath, type);
+        }
 
         return immediateVoidFuture();
     }
 
+    private static List<RowType.Field> getCandidates(Type type, String fieldName)
+    {
+        if (!(type instanceof RowType rowType)) {
+            throw new TrinoException(NOT_SUPPORTED, "Unsupported type: " + type);
+        }
+        List<RowType.Field> candidates = rowType.getFields().stream()
+                // case-insensitive match
+                .filter(rowField -> rowField.getName().isPresent() && rowField.getName().get().equalsIgnoreCase(fieldName))
+                .collect(toImmutableList());
+
+        return candidates;
+    }
+
     private Type getColumnType(SetColumnType statement)
     {
         Type type;
diff --git a/core/trino-main/src/main/java/io/trino/execution/SetPathTask.java b/core/trino-main/src/main/java/io/trino/execution/SetPathTask.java
index f46240198c9f..813bc19a1942 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SetPathTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SetPathTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.client.ClientCapabilities;
 import io.trino.execution.warnings.WarningCollector;
@@ -24,10 +25,7 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.SetPath;
 
-import javax.inject.Inject;
-
 import java.util.List;
-import java.util.Optional;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
 import static io.trino.metadata.MetadataUtil.getRequiredCatalogHandle;
@@ -68,9 +66,8 @@ public ListenableFuture<Void> execute(
         }
 
         // convert to IR before setting HTTP headers - ensures that the representations of all path objects outside the parser remain consistent
-        SqlPath sqlPath = new SqlPath(Optional.of(statement.getPathSpecification().toString()));
-
-        for (SqlPathElement element : sqlPath.getParsedPath()) {
+        String rawPath = statement.getPathSpecification().toString();
+        for (SqlPathElement element : SqlPath.parsePath(rawPath)) {
             if (element.getCatalog().isEmpty() && session.getCatalog().isEmpty()) {
                 throw semanticException(MISSING_CATALOG_NAME, statement, "Catalog must be specified for each path element when session catalog is not set");
             }
@@ -80,7 +77,7 @@ public ListenableFuture<Void> execute(
                 getRequiredCatalogHandle(metadata, session, statement, catalogName);
             });
         }
-        stateMachine.setSetPath(sqlPath.toString());
+        stateMachine.setSetPath(rawPath);
         return immediateVoidFuture();
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/SetPropertiesTask.java b/core/trino-main/src/main/java/io/trino/execution/SetPropertiesTask.java
index 0121b5809a4c..949857b731a3 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SetPropertiesTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SetPropertiesTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.MaterializedViewPropertyManager;
@@ -25,8 +26,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.SetProperties;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/execution/SetRoleTask.java b/core/trino-main/src/main/java/io/trino/execution/SetRoleTask.java
index e320eadd430a..70f3a764c2da 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SetRoleTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SetRoleTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -26,8 +27,6 @@
 import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.SetRole;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
diff --git a/core/trino-main/src/main/java/io/trino/execution/SetSchemaAuthorizationTask.java b/core/trino-main/src/main/java/io/trino/execution/SetSchemaAuthorizationTask.java
index 886305e7dd51..c1cdd7ba1d66 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SetSchemaAuthorizationTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SetSchemaAuthorizationTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -23,8 +24,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.SetSchemaAuthorization;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/SetSessionAuthorizationTask.java b/core/trino-main/src/main/java/io/trino/execution/SetSessionAuthorizationTask.java
new file mode 100644
index 000000000000..b351549a23ee
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/SetSessionAuthorizationTask.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed 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 io.trino.execution;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
+import io.trino.Session;
+import io.trino.client.ClientCapabilities;
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.security.AccessControl;
+import io.trino.spi.TrinoException;
+import io.trino.spi.security.Identity;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.Identifier;
+import io.trino.sql.tree.SetSessionAuthorization;
+import io.trino.sql.tree.StringLiteral;
+import io.trino.transaction.TransactionManager;
+
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.util.concurrent.Futures.immediateFuture;
+import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static java.util.Objects.requireNonNull;
+
+public class SetSessionAuthorizationTask
+        implements DataDefinitionTask<SetSessionAuthorization>
+{
+    private final AccessControl accessControl;
+    private final TransactionManager transactionManager;
+
+    @Inject
+    public SetSessionAuthorizationTask(AccessControl accessControl, TransactionManager transactionManager)
+    {
+        this.accessControl = requireNonNull(accessControl, "accessControl is null");
+        this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
+    }
+
+    @Override
+    public String getName()
+    {
+        return "SET SESSION AUTHORIZATION";
+    }
+
+    @Override
+    public ListenableFuture<Void> execute(
+            SetSessionAuthorization statement,
+            QueryStateMachine stateMachine,
+            List<Expression> parameters,
+            WarningCollector warningCollector)
+    {
+        Session session = stateMachine.getSession();
+        if (!session.getClientCapabilities().contains(ClientCapabilities.SESSION_AUTHORIZATION.toString())) {
+            throw new TrinoException(NOT_SUPPORTED, "SET SESSION AUTHORIZATION not supported by client");
+        }
+        Identity originalIdentity = session.getOriginalIdentity();
+        // Set authorization user in the middle of a transaction is disallowed by the SQL spec
+        session.getTransactionId().ifPresent(transactionId -> {
+            if (!transactionManager.getTransactionInfo(transactionId).isAutoCommitContext()) {
+                throw new TrinoException(GENERIC_USER_ERROR, "Can't set authorization user in the middle of a transaction");
+            }
+        });
+
+        String user;
+        Expression userExpression = statement.getUser();
+        if (userExpression instanceof Identifier identifier) {
+            user = identifier.getValue();
+        }
+        else if (userExpression instanceof StringLiteral stringLiteral) {
+            user = stringLiteral.getValue();
+        }
+        else {
+            throw new IllegalArgumentException("Unsupported user expression: " + userExpression.getClass().getName());
+        }
+        checkState(user != null && !user.isEmpty(), "Authorization user cannot be null or empty");
+
+        if (!originalIdentity.getUser().equals(user)) {
+            accessControl.checkCanSetUser(originalIdentity.getPrincipal(), user);
+            accessControl.checkCanImpersonateUser(originalIdentity, user);
+        }
+        stateMachine.setSetAuthorizationUser(user);
+        return immediateFuture(null);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/SetSessionTask.java b/core/trino-main/src/main/java/io/trino/execution/SetSessionTask.java
index 9666dfe9e291..87b01124a2d1 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SetSessionTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SetSessionTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.SessionPropertyManager;
@@ -28,8 +29,6 @@
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SetSession;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
diff --git a/core/trino-main/src/main/java/io/trino/execution/SetTableAuthorizationTask.java b/core/trino-main/src/main/java/io/trino/execution/SetTableAuthorizationTask.java
index 651642269ce7..2c1d3833fd7f 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SetTableAuthorizationTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SetTableAuthorizationTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -24,8 +25,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.SetTableAuthorization;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
@@ -70,11 +69,11 @@ public ListenableFuture<Void> execute(
 
         getRequiredCatalogHandle(metadata, session, statement, tableName.getCatalogName());
         RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, tableName);
-        if (redirection.getTableHandle().isEmpty()) {
+        if (redirection.tableHandle().isEmpty()) {
             throw semanticException(TABLE_NOT_FOUND, statement, "Table '%s' does not exist", tableName);
         }
-        if (redirection.getRedirectedTableName().isPresent()) {
-            throw semanticException(NOT_SUPPORTED, statement, "Table %s is redirected to %s and SET TABLE AUTHORIZATION is not supported with table redirections", tableName, redirection.getRedirectedTableName().get());
+        if (redirection.redirectedTableName().isPresent()) {
+            throw semanticException(NOT_SUPPORTED, statement, "Table %s is redirected to %s and SET TABLE AUTHORIZATION is not supported with table redirections", tableName, redirection.redirectedTableName().get());
         }
 
         TrinoPrincipal principal = createPrincipal(statement.getPrincipal());
diff --git a/core/trino-main/src/main/java/io/trino/execution/SetTimeZoneTask.java b/core/trino-main/src/main/java/io/trino/execution/SetTimeZoneTask.java
index 9b6ab2eb1671..433082c3d3bb 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SetTimeZoneTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SetTimeZoneTask.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.security.AccessControl;
@@ -31,8 +32,6 @@
 import io.trino.sql.tree.SetTimeZone;
 import io.trino.type.IntervalDayTimeType;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -125,14 +124,14 @@ else if (timeZoneValue instanceof Long) {
             timeZoneKey = getTimeZoneKeyForOffset(getZoneOffsetMinutes((Long) timeZoneValue));
         }
         else {
-            throw new IllegalStateException(format("Time Zone expression '%s' not supported", expression));
+            throw new IllegalStateException(format("TIME ZONE expression '%s' not supported", expression));
         }
         return timeZoneKey.getId();
     }
 
     private static long getZoneOffsetMinutes(long interval)
     {
-        checkCondition((interval % 60_000L) == 0L, INVALID_LITERAL, "Invalid time zone offset interval: interval contains seconds");
+        checkCondition((interval % 60_000L) == 0L, INVALID_LITERAL, "Invalid TIME ZONE offset interval: interval contains seconds");
         return interval / 60_000L;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/SetViewAuthorizationTask.java b/core/trino-main/src/main/java/io/trino/execution/SetViewAuthorizationTask.java
index 99baa2829833..e98cdb563a8d 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SetViewAuthorizationTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SetViewAuthorizationTask.java
@@ -14,20 +14,16 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import io.trino.FeaturesConfig;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedObjectName;
-import io.trino.metadata.ViewDefinition;
 import io.trino.security.AccessControl;
-import io.trino.spi.TrinoException;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.SetViewAuthorization;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
@@ -36,10 +32,8 @@
 import static io.trino.metadata.MetadataUtil.createPrincipal;
 import static io.trino.metadata.MetadataUtil.createQualifiedObjectName;
 import static io.trino.metadata.MetadataUtil.getRequiredCatalogHandle;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
 import static io.trino.sql.analyzer.SemanticExceptions.semanticException;
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class SetViewAuthorizationTask
@@ -47,14 +41,12 @@ public class SetViewAuthorizationTask
 {
     private final Metadata metadata;
     private final AccessControl accessControl;
-    private final boolean isAllowSetViewAuthorization;
 
     @Inject
-    public SetViewAuthorizationTask(Metadata metadata, AccessControl accessControl, FeaturesConfig featuresConfig)
+    public SetViewAuthorizationTask(Metadata metadata, AccessControl accessControl)
     {
         this.metadata = requireNonNull(metadata, "metadata is null");
         this.accessControl = requireNonNull(accessControl, "accessControl is null");
-        this.isAllowSetViewAuthorization = featuresConfig.isAllowSetViewAuthorization();
     }
 
     @Override
@@ -73,19 +65,13 @@ public ListenableFuture<Void> execute(
         Session session = stateMachine.getSession();
         QualifiedObjectName viewName = createQualifiedObjectName(session, statement, statement.getSource());
         getRequiredCatalogHandle(metadata, session, statement, viewName.getCatalogName());
-        ViewDefinition view = metadata.getView(session, viewName)
-                .orElseThrow(() -> semanticException(TABLE_NOT_FOUND, statement, "View '%s' does not exist", viewName));
+        if (metadata.getView(session, viewName).isEmpty()) {
+            throw semanticException(TABLE_NOT_FOUND, statement, "View '%s' does not exist", viewName);
+        }
 
         TrinoPrincipal principal = createPrincipal(statement.getPrincipal());
         checkRoleExists(session, statement, metadata, principal, Optional.of(viewName.getCatalogName()).filter(catalog -> metadata.isCatalogManagedSecurity(session, catalog)));
 
-        if (!view.isRunAsInvoker() && !isAllowSetViewAuthorization) {
-            throw new TrinoException(
-                    NOT_SUPPORTED,
-                    format(
-                            "Cannot set authorization for view %s to %s: this feature is disabled",
-                            viewName.getCatalogName() + '.' + viewName.getSchemaName() + '.' + viewName.getObjectName(), principal));
-        }
         accessControl.checkCanSetViewAuthorization(session.toSecurityContext(), viewName, principal);
 
         metadata.setViewAuthorization(session, viewName.asCatalogSchemaTableName(), principal);
diff --git a/core/trino-main/src/main/java/io/trino/execution/SplitConcurrencyController.java b/core/trino-main/src/main/java/io/trino/execution/SplitConcurrencyController.java
index 31d800c56a24..82f380491314 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SplitConcurrencyController.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SplitConcurrencyController.java
@@ -14,8 +14,7 @@
 package io.trino.execution;
 
 import io.airlift.units.Duration;
-
-import javax.annotation.concurrent.NotThreadSafe;
+import io.trino.annotation.NotThreadSafe;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
diff --git a/core/trino-main/src/main/java/io/trino/execution/SplitRunner.java b/core/trino-main/src/main/java/io/trino/execution/SplitRunner.java
index 3bc1cac89f1f..5b12171230ec 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SplitRunner.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SplitRunner.java
@@ -15,12 +15,17 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
 
 import java.io.Closeable;
 
 public interface SplitRunner
         extends Closeable
 {
+    int getPipelineId();
+
+    Span getPipelineSpan();
+
     boolean isFinished();
 
     ListenableFuture<Void> processFor(Duration duration);
diff --git a/core/trino-main/src/main/java/io/trino/execution/SqlQueryExecution.java b/core/trino-main/src/main/java/io/trino/execution/SqlQueryExecution.java
index ac097e49b9c1..b309706b68f6 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SqlQueryExecution.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SqlQueryExecution.java
@@ -14,9 +14,14 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.airlift.concurrent.SetThreadName;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
 import io.trino.Session;
 import io.trino.SystemSessionProperties;
 import io.trino.cost.CostCalculator;
@@ -25,16 +30,17 @@
 import io.trino.execution.QueryPreparer.PreparedQuery;
 import io.trino.execution.StateMachine.StateChangeListener;
 import io.trino.execution.querystats.PlanOptimizersStatsCollector;
-import io.trino.execution.scheduler.EventDrivenFaultTolerantQueryScheduler;
-import io.trino.execution.scheduler.EventDrivenTaskSourceFactory;
-import io.trino.execution.scheduler.NodeAllocatorService;
 import io.trino.execution.scheduler.NodeScheduler;
-import io.trino.execution.scheduler.PartitionMemoryEstimatorFactory;
 import io.trino.execution.scheduler.PipelinedQueryScheduler;
 import io.trino.execution.scheduler.QueryScheduler;
 import io.trino.execution.scheduler.SplitSchedulerStats;
-import io.trino.execution.scheduler.TaskDescriptorStorage;
 import io.trino.execution.scheduler.TaskExecutionStats;
+import io.trino.execution.scheduler.faulttolerant.EventDrivenFaultTolerantQueryScheduler;
+import io.trino.execution.scheduler.faulttolerant.EventDrivenTaskSourceFactory;
+import io.trino.execution.scheduler.faulttolerant.NodeAllocatorService;
+import io.trino.execution.scheduler.faulttolerant.OutputDataSizeEstimatorFactory;
+import io.trino.execution.scheduler.faulttolerant.PartitionMemoryEstimatorFactory;
+import io.trino.execution.scheduler.faulttolerant.TaskDescriptorStorage;
 import io.trino.execution.scheduler.policy.ExecutionPolicy;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.failuredetector.FailureDetector;
@@ -68,9 +74,6 @@
 import io.trino.sql.tree.Statement;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -92,6 +95,7 @@
 import static io.trino.execution.QueryState.PLANNING;
 import static io.trino.server.DynamicFilterService.DynamicFiltersStats;
 import static io.trino.spi.StandardErrorCode.STACK_OVERFLOW;
+import static io.trino.tracing.ScopedSpan.scopedSpan;
 import static java.lang.Thread.currentThread;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -102,12 +106,14 @@ public class SqlQueryExecution
 {
     private final QueryStateMachine stateMachine;
     private final Slug slug;
+    private final Tracer tracer;
     private final PlannerContext plannerContext;
     private final SplitSourceFactory splitSourceFactory;
     private final NodePartitioningManager nodePartitioningManager;
     private final NodeScheduler nodeScheduler;
     private final NodeAllocatorService nodeAllocatorService;
     private final PartitionMemoryEstimatorFactory partitionMemoryEstimatorFactory;
+    private final OutputDataSizeEstimatorFactory outputDataSizeEstimatorFactory;
     private final TaskExecutionStats taskExecutionStats;
     private final List<PlanOptimizer> planOptimizers;
     private final PlanFragmenter planFragmenter;
@@ -138,6 +144,7 @@ private SqlQueryExecution(
             PreparedQuery preparedQuery,
             QueryStateMachine stateMachine,
             Slug slug,
+            Tracer tracer,
             PlannerContext plannerContext,
             AnalyzerFactory analyzerFactory,
             SplitSourceFactory splitSourceFactory,
@@ -145,6 +152,7 @@ private SqlQueryExecution(
             NodeScheduler nodeScheduler,
             NodeAllocatorService nodeAllocatorService,
             PartitionMemoryEstimatorFactory partitionMemoryEstimatorFactory,
+            OutputDataSizeEstimatorFactory outputDataSizeEstimatorFactory,
             TaskExecutionStats taskExecutionStats,
             List<PlanOptimizer> planOptimizers,
             PlanFragmenter planFragmenter,
@@ -170,12 +178,14 @@ private SqlQueryExecution(
     {
         try (SetThreadName ignored = new SetThreadName("Query-%s", stateMachine.getQueryId())) {
             this.slug = requireNonNull(slug, "slug is null");
+            this.tracer = requireNonNull(tracer, "tracer is null");
             this.plannerContext = requireNonNull(plannerContext, "plannerContext is null");
             this.splitSourceFactory = requireNonNull(splitSourceFactory, "splitSourceFactory is null");
             this.nodePartitioningManager = requireNonNull(nodePartitioningManager, "nodePartitioningManager is null");
             this.nodeScheduler = requireNonNull(nodeScheduler, "nodeScheduler is null");
             this.nodeAllocatorService = requireNonNull(nodeAllocatorService, "nodeAllocatorService is null");
             this.partitionMemoryEstimatorFactory = requireNonNull(partitionMemoryEstimatorFactory, "partitionMemoryEstimatorFactory is null");
+            this.outputDataSizeEstimatorFactory = requireNonNull(outputDataSizeEstimatorFactory, "outputDataSizeEstimatorFactory is null");
             this.taskExecutionStats = requireNonNull(taskExecutionStats, "taskExecutionStats is null");
             this.planOptimizers = requireNonNull(planOptimizers, "planOptimizers is null");
             this.planFragmenter = requireNonNull(planFragmenter, "planFragmenter is null");
@@ -214,7 +224,7 @@ private SqlQueryExecution(
             this.exchangeManagerRegistry = requireNonNull(exchangeManagerRegistry, "exchangeManagerRegistry is null");
             this.eventDrivenTaskSourceFactory = requireNonNull(eventDrivenTaskSourceFactory, "taskSourceFactory is null");
             this.taskDescriptorStorage = requireNonNull(taskDescriptorStorage, "taskDescriptorStorage is null");
-            this.planOptimizersStatsCollector = requireNonNull(planOptimizersStatsCollector, "queryStatsCollector is null");
+            this.planOptimizersStatsCollector = requireNonNull(planOptimizersStatsCollector, "planOptimizersStatsCollector is null");
         }
     }
 
@@ -449,7 +459,10 @@ public void addFinalQueryInfoListener(StateChangeListener<QueryInfo> stateChange
 
     private PlanRoot planQuery()
     {
-        try {
+        Span span = tracer.spanBuilder("planner")
+                .setParent(Context.current().with(getSession().getQuerySpan()))
+                .startSpan();
+        try (var ignored = scopedSpan(span)) {
             return doPlanQuery();
         }
         catch (StackOverflowError e) {
@@ -474,11 +487,15 @@ private PlanRoot doPlanQuery()
         queryPlan.set(plan);
 
         // fragment the plan
-        SubPlan fragmentedPlan = planFragmenter.createSubPlans(stateMachine.getSession(), plan, false, stateMachine.getWarningCollector());
+        SubPlan fragmentedPlan;
+        try (var ignored = scopedSpan(tracer, "fragment-plan")) {
+            fragmentedPlan = planFragmenter.createSubPlans(stateMachine.getSession(), plan, false, stateMachine.getWarningCollector());
+        }
 
         // extract inputs
-        List<Input> inputs = new InputExtractor(plannerContext.getMetadata(), stateMachine.getSession()).extractInputs(fragmentedPlan);
-        stateMachine.setInputs(inputs);
+        try (var ignored = scopedSpan(tracer, "extract-inputs")) {
+            stateMachine.setInputs(new InputExtractor(plannerContext.getMetadata(), stateMachine.getSession()).extractInputs(fragmentedPlan));
+        }
 
         stateMachine.setOutput(analysis.getTarget());
 
@@ -517,6 +534,7 @@ private void planDistribution(PlanRoot plan)
                         failureDetector,
                         nodeTaskMap,
                         executionPolicy,
+                        tracer,
                         schedulerStats,
                         dynamicFilterService,
                         tableExecuteContextManager,
@@ -535,8 +553,10 @@ private void planDistribution(PlanRoot plan)
                         nodeTaskMap,
                         queryExecutor,
                         schedulerExecutor,
+                        tracer,
                         schedulerStats,
                         partitionMemoryEstimatorFactory,
+                        outputDataSizeEstimatorFactory,
                         nodePartitioningManager,
                         exchangeManagerRegistry.getExchangeManager(),
                         nodeAllocatorService,
@@ -550,6 +570,11 @@ private void planDistribution(PlanRoot plan)
         }
 
         queryScheduler.set(scheduler);
+        stateMachine.addQueryInfoStateChangeListener(queryInfo -> {
+            if (queryInfo.isFinalQueryInfo()) {
+                queryScheduler.set(null);
+            }
+        });
     }
 
     @Override
@@ -671,14 +696,7 @@ private QueryInfo buildQueryInfo(QueryScheduler scheduler)
         if (scheduler != null) {
             stageInfo = Optional.ofNullable(scheduler.getStageInfo());
         }
-
-        QueryInfo queryInfo = stateMachine.updateQueryInfo(stageInfo);
-        if (queryInfo.isFinalQueryInfo()) {
-            // capture the final query state and drop reference to the scheduler
-            queryScheduler.set(null);
-        }
-
-        return queryInfo;
+        return stateMachine.updateQueryInfo(stageInfo);
     }
 
     @Override
@@ -724,6 +742,7 @@ public boolean isSummarizeTaskInfos()
     public static class SqlQueryExecutionFactory
             implements QueryExecutionFactory<QueryExecution>
     {
+        private final Tracer tracer;
         private final SplitSchedulerStats schedulerStats;
         private final int scheduleSplitBatchSize;
         private final PlannerContext plannerContext;
@@ -733,6 +752,7 @@ public static class SqlQueryExecutionFactory
         private final NodeScheduler nodeScheduler;
         private final NodeAllocatorService nodeAllocatorService;
         private final PartitionMemoryEstimatorFactory partitionMemoryEstimatorFactory;
+        private final OutputDataSizeEstimatorFactory outputDataSizeEstimatorFactory;
         private final TaskExecutionStats taskExecutionStats;
         private final List<PlanOptimizer> planOptimizers;
         private final PlanFragmenter planFragmenter;
@@ -754,6 +774,7 @@ public static class SqlQueryExecutionFactory
 
         @Inject
         SqlQueryExecutionFactory(
+                Tracer tracer,
                 QueryManagerConfig config,
                 PlannerContext plannerContext,
                 AnalyzerFactory analyzerFactory,
@@ -762,6 +783,7 @@ public static class SqlQueryExecutionFactory
                 NodeScheduler nodeScheduler,
                 NodeAllocatorService nodeAllocatorService,
                 PartitionMemoryEstimatorFactory partitionMemoryEstimatorFactory,
+                OutputDataSizeEstimatorFactory outputDataSizeEstimatorFactory,
                 TaskExecutionStats taskExecutionStats,
                 PlanOptimizersFactory planOptimizersFactory,
                 PlanFragmenter planFragmenter,
@@ -782,6 +804,7 @@ public static class SqlQueryExecutionFactory
                 EventDrivenTaskSourceFactory eventDrivenTaskSourceFactory,
                 TaskDescriptorStorage taskDescriptorStorage)
         {
+            this.tracer = requireNonNull(tracer, "tracer is null");
             this.schedulerStats = requireNonNull(schedulerStats, "schedulerStats is null");
             this.scheduleSplitBatchSize = config.getScheduleSplitBatchSize();
             this.plannerContext = requireNonNull(plannerContext, "plannerContext is null");
@@ -791,6 +814,7 @@ public static class SqlQueryExecutionFactory
             this.nodeScheduler = requireNonNull(nodeScheduler, "nodeScheduler is null");
             this.nodeAllocatorService = requireNonNull(nodeAllocatorService, "nodeAllocatorService is null");
             this.partitionMemoryEstimatorFactory = requireNonNull(partitionMemoryEstimatorFactory, "partitionMemoryEstimatorFactory is null");
+            this.outputDataSizeEstimatorFactory = requireNonNull(outputDataSizeEstimatorFactory, "outputDataSizeEstimatorFactory is null");
             this.taskExecutionStats = requireNonNull(taskExecutionStats, "taskExecutionStats is null");
             this.planFragmenter = requireNonNull(planFragmenter, "planFragmenter is null");
             this.remoteTaskFactory = requireNonNull(remoteTaskFactory, "remoteTaskFactory is null");
@@ -827,6 +851,7 @@ public QueryExecution createQueryExecution(
                     preparedQuery,
                     stateMachine,
                     slug,
+                    tracer,
                     plannerContext,
                     analyzerFactory,
                     splitSourceFactory,
@@ -834,6 +859,7 @@ public QueryExecution createQueryExecution(
                     nodeScheduler,
                     nodeAllocatorService,
                     partitionMemoryEstimatorFactory,
+                    outputDataSizeEstimatorFactory,
                     taskExecutionStats,
                     planOptimizers,
                     planFragmenter,
diff --git a/core/trino-main/src/main/java/io/trino/execution/SqlQueryManager.java b/core/trino-main/src/main/java/io/trino/execution/SqlQueryManager.java
index 0e206a349260..fa3ee37b9454 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SqlQueryManager.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SqlQueryManager.java
@@ -15,6 +15,8 @@
 
 import com.google.common.collect.Ordering;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.airlift.concurrent.SetThreadName;
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
 import io.airlift.log.Logger;
@@ -31,14 +33,11 @@
 import io.trino.spi.QueryId;
 import io.trino.spi.TrinoException;
 import io.trino.sql.planner.Plan;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Objects;
@@ -226,6 +225,12 @@ public QueryState getQueryState(QueryId queryId)
         return queryTracker.getQuery(queryId).getState();
     }
 
+    @Override
+    public boolean hasQuery(QueryId queryId)
+    {
+        return queryTracker.hasQuery(queryId);
+    }
+
     @Override
     public void recordHeartbeat(QueryId queryId)
     {
diff --git a/core/trino-main/src/main/java/io/trino/execution/SqlStage.java b/core/trino-main/src/main/java/io/trino/execution/SqlStage.java
index 3eb447a3488f..0d8a146ee925 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SqlStage.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SqlStage.java
@@ -15,8 +15,12 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.Session;
 import io.trino.execution.StateMachine.StateChangeListener;
 import io.trino.execution.buffer.OutputBuffers;
@@ -27,9 +31,6 @@
 import io.trino.sql.planner.plan.DynamicFilterId;
 import io.trino.sql.planner.plan.PlanNodeId;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -82,6 +83,7 @@ public static SqlStage createSqlStage(
             boolean summarizeTaskInfo,
             NodeTaskMap nodeTaskMap,
             Executor stateMachineExecutor,
+            Tracer tracer,
             SplitSchedulerStats schedulerStats)
     {
         requireNonNull(stageId, "stageId is null");
@@ -92,11 +94,21 @@ public static SqlStage createSqlStage(
         requireNonNull(session, "session is null");
         requireNonNull(nodeTaskMap, "nodeTaskMap is null");
         requireNonNull(stateMachineExecutor, "stateMachineExecutor is null");
+        requireNonNull(tracer, "tracer is null");
         requireNonNull(schedulerStats, "schedulerStats is null");
 
+        StageStateMachine stateMachine = new StageStateMachine(
+                stageId,
+                fragment,
+                tables,
+                stateMachineExecutor,
+                tracer,
+                session.getQuerySpan(),
+                schedulerStats);
+
         SqlStage sqlStage = new SqlStage(
                 session,
-                new StageStateMachine(stageId, fragment, tables, stateMachineExecutor, schedulerStats),
+                stateMachine,
                 remoteTaskFactory,
                 nodeTaskMap,
                 summarizeTaskInfo);
@@ -136,6 +148,11 @@ public StageId getStageId()
         return stateMachine.getStageId();
     }
 
+    public Span getStageSpan()
+    {
+        return stateMachine.getStageSpan();
+    }
+
     public StageState getState()
     {
         return stateMachine.getState();
@@ -228,7 +245,8 @@ public synchronized Optional<RemoteTask> createTask(
             OutputBuffers outputBuffers,
             Multimap<PlanNodeId, Split> splits,
             Set<PlanNodeId> noMoreSplits,
-            Optional<DataSize> estimatedMemory)
+            Optional<DataSize> estimatedMemory,
+            boolean speculative)
     {
         if (stateMachine.getState().isDone()) {
             return Optional.empty();
@@ -240,8 +258,10 @@ public synchronized Optional<RemoteTask> createTask(
 
         RemoteTask task = remoteTaskFactory.createRemoteTask(
                 session,
+                stateMachine.getStageSpan(),
                 taskId,
                 node,
+                speculative,
                 stateMachine.getFragment().withBucketToPartition(bucketToPartition),
                 splits,
                 outputBuffers,
diff --git a/core/trino-main/src/main/java/io/trino/execution/SqlTask.java b/core/trino-main/src/main/java/io/trino/execution/SqlTask.java
index 9e646931bb34..46f9db069649 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SqlTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SqlTask.java
@@ -17,11 +17,16 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.concurrent.SetThreadName;
 import io.airlift.log.Logger;
 import io.airlift.stats.CounterStat;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
 import io.trino.Session;
 import io.trino.exchange.ExchangeManagerRegistry;
 import io.trino.execution.DynamicFiltersCollector.VersionedDynamicFilterDomains;
@@ -41,11 +46,10 @@
 import io.trino.sql.planner.PlanFragment;
 import io.trino.sql.planner.plan.DynamicFilterId;
 import io.trino.sql.planner.plan.PlanNodeId;
+import io.trino.tracing.TrinoAttributes;
+import jakarta.annotation.Nullable;
 import org.joda.time.DateTime;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
@@ -67,13 +71,8 @@
 import static io.airlift.units.DataSize.succinctBytes;
 import static io.trino.execution.DynamicFiltersCollector.INITIAL_DYNAMIC_FILTERS_VERSION;
 import static io.trino.execution.DynamicFiltersCollector.INITIAL_DYNAMIC_FILTER_DOMAINS;
-import static io.trino.execution.TaskState.ABORTED;
-import static io.trino.execution.TaskState.ABORTING;
-import static io.trino.execution.TaskState.CANCELED;
-import static io.trino.execution.TaskState.CANCELING;
 import static io.trino.execution.TaskState.FAILED;
 import static io.trino.execution.TaskState.FAILING;
-import static io.trino.execution.TaskState.FINISHED;
 import static io.trino.execution.TaskState.RUNNING;
 import static io.trino.util.Failures.toFailures;
 import static java.lang.String.format;
@@ -88,9 +87,11 @@ public class SqlTask
     private final String taskInstanceId;
     private final URI location;
     private final String nodeId;
+    private final AtomicBoolean speculative = new AtomicBoolean(false);
     private final TaskStateMachine taskStateMachine;
     private final OutputBuffer outputBuffer;
     private final QueryContext queryContext;
+    private final Tracer tracer;
 
     private final SqlTaskExecutionFactory sqlTaskExecutionFactory;
     private final Executor taskNotificationExecutor;
@@ -103,6 +104,7 @@ public class SqlTask
     @GuardedBy("taskHolderLock")
     private final AtomicReference<TaskHolder> taskHolderReference = new AtomicReference<>(new TaskHolder());
     private final AtomicBoolean needsPlan = new AtomicBoolean(true);
+    private final AtomicReference<Span> taskSpan = new AtomicReference<>(Span.getInvalid());
     private final AtomicReference<String> traceToken = new AtomicReference<>();
     private final AtomicReference<Set<CatalogHandle>> catalogs = new AtomicReference<>();
 
@@ -111,6 +113,7 @@ public static SqlTask createSqlTask(
             URI location,
             String nodeId,
             QueryContext queryContext,
+            Tracer tracer,
             SqlTaskExecutionFactory sqlTaskExecutionFactory,
             ExecutorService taskNotificationExecutor,
             Consumer<SqlTask> onDone,
@@ -119,7 +122,7 @@ public static SqlTask createSqlTask(
             ExchangeManagerRegistry exchangeManagerRegistry,
             CounterStat failedTasks)
     {
-        SqlTask sqlTask = new SqlTask(taskId, location, nodeId, queryContext, sqlTaskExecutionFactory, taskNotificationExecutor, maxBufferSize, maxBroadcastBufferSize, exchangeManagerRegistry);
+        SqlTask sqlTask = new SqlTask(taskId, location, nodeId, queryContext, tracer, sqlTaskExecutionFactory, taskNotificationExecutor, maxBufferSize, maxBroadcastBufferSize, exchangeManagerRegistry);
         sqlTask.initialize(onDone, failedTasks);
         return sqlTask;
     }
@@ -129,6 +132,7 @@ private SqlTask(
             URI location,
             String nodeId,
             QueryContext queryContext,
+            Tracer tracer,
             SqlTaskExecutionFactory sqlTaskExecutionFactory,
             ExecutorService taskNotificationExecutor,
             DataSize maxBufferSize,
@@ -140,6 +144,7 @@ private SqlTask(
         this.location = requireNonNull(location, "location is null");
         this.nodeId = requireNonNull(nodeId, "nodeId is null");
         this.queryContext = requireNonNull(queryContext, "queryContext is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
         this.sqlTaskExecutionFactory = requireNonNull(sqlTaskExecutionFactory, "sqlTaskExecutionFactory is null");
         this.taskNotificationExecutor = requireNonNull(taskNotificationExecutor, "taskNotificationExecutor is null");
         requireNonNull(maxBufferSize, "maxBufferSize is null");
@@ -166,6 +171,9 @@ private void initialize(Consumer<SqlTask> onDone, CounterStat failedTasks)
 
         AtomicBoolean outputBufferCleanedUp = new AtomicBoolean();
         taskStateMachine.addStateChangeListener(newState -> {
+            taskSpan.get().addEvent("task_state", Attributes.of(
+                    TrinoAttributes.EVENT_STATE, newState.toString()));
+
             if (newState.isTerminatingOrDone()) {
                 if (newState.isTerminating()) {
                     // This section must be synchronized to lock out any threads that might be attempting to create a SqlTaskExecution
@@ -223,6 +231,10 @@ else if (newState.isDone()) {
             if (newState != RUNNING) {
                 notifyStatusChanged();
             }
+
+            if (newState.isDone()) {
+                taskSpan.get().end();
+            }
         });
     }
 
@@ -310,6 +322,7 @@ private TaskStatus createTaskStatus(TaskHolder taskHolder)
         int runningPartitionedDrivers = 0;
         long runningPartitionedSplitsWeight = 0L;
         DataSize outputDataSize = DataSize.ofBytes(0);
+        DataSize writerInputDataSize = DataSize.ofBytes(0);
         DataSize physicalWrittenDataSize = DataSize.ofBytes(0);
         Optional<Integer> writerCount = Optional.empty();
         DataSize userMemoryReservation = DataSize.ofBytes(0);
@@ -325,6 +338,7 @@ private TaskStatus createTaskStatus(TaskHolder taskHolder)
             queuedPartitionedSplitsWeight = taskStats.getQueuedPartitionedSplitsWeight();
             runningPartitionedDrivers = taskStats.getRunningPartitionedDrivers();
             runningPartitionedSplitsWeight = taskStats.getRunningPartitionedSplitsWeight();
+            writerInputDataSize = taskStats.getWriterInputDataSize();
             physicalWrittenDataSize = taskStats.getPhysicalWrittenDataSize();
             writerCount = taskStats.getMaxWriterCount();
             userMemoryReservation = taskStats.getUserMemoryReservation();
@@ -346,6 +360,7 @@ else if (taskHolder.getTaskExecution() != null) {
                 runningPartitionedSplitsWeight += pipelineStatus.getRunningPartitionedSplitsWeight();
                 physicalWrittenBytes += pipelineContext.getPhysicalWrittenDataSize();
             }
+            writerInputDataSize = succinctBytes(taskContext.getWriterInputDataSize());
             physicalWrittenDataSize = succinctBytes(physicalWrittenBytes);
             writerCount = taskContext.getMaxWriterCount();
             userMemoryReservation = taskContext.getMemoryReservation();
@@ -364,11 +379,13 @@ else if (taskHolder.getTaskExecution() != null) {
                 state,
                 location,
                 nodeId,
+                speculative.get(),
                 failures,
                 queuedPartitionedDrivers,
                 runningPartitionedDrivers,
                 outputBuffer.getStatus(),
                 outputDataSize,
+                writerInputDataSize,
                 physicalWrittenDataSize,
                 writerCount,
                 userMemoryReservation,
@@ -452,10 +469,12 @@ public synchronized ListenableFuture<TaskInfo> getTaskInfo(long callersCurrentVe
 
     public TaskInfo updateTask(
             Session session,
+            Span stageSpan,
             Optional<PlanFragment> fragment,
             List<SplitAssignment> splitAssignments,
             OutputBuffers outputBuffers,
-            Map<DynamicFilterId, Domain> dynamicFilterDomains)
+            Map<DynamicFilterId, Domain> dynamicFilterDomains,
+            boolean speculative)
     {
         try {
             // trace token must be set first to make sure failure injection for getTaskResults requests works as expected
@@ -475,13 +494,16 @@ public TaskInfo updateTask(
             SqlTaskExecution taskExecution = taskHolder.getTaskExecution();
             if (taskExecution == null) {
                 checkState(fragment.isPresent(), "fragment must be present");
-                taskExecution = tryCreateSqlTaskExecution(session, fragment.get());
+                taskExecution = tryCreateSqlTaskExecution(session, stageSpan, fragment.get());
             }
             // taskExecution can still be null if the creation was skipped
             if (taskExecution != null) {
-                taskExecution.addSplitAssignments(splitAssignments);
                 taskExecution.getTaskContext().addDynamicFilter(dynamicFilterDomains);
+                taskExecution.addSplitAssignments(splitAssignments);
             }
+
+            // update speculative flag
+            this.speculative.set(speculative);
         }
         catch (Error e) {
             failed(e);
@@ -495,7 +517,7 @@ public TaskInfo updateTask(
     }
 
     @Nullable
-    private SqlTaskExecution tryCreateSqlTaskExecution(Session session, PlanFragment fragment)
+    private SqlTaskExecution tryCreateSqlTaskExecution(Session session, Span stageSpan, PlanFragment fragment)
     {
         synchronized (taskHolderLock) {
             // Recheck holder for task execution after acquiring the lock
@@ -513,8 +535,16 @@ private SqlTaskExecution tryCreateSqlTaskExecution(Session session, PlanFragment
                 return null;
             }
 
+            taskSpan.set(tracer.spanBuilder("task")
+                    .setParent(Context.current().with(stageSpan))
+                    .setAttribute(TrinoAttributes.QUERY_ID, taskId.getQueryId().toString())
+                    .setAttribute(TrinoAttributes.STAGE_ID, taskId.getStageId().toString())
+                    .setAttribute(TrinoAttributes.TASK_ID, taskId.toString())
+                    .startSpan());
+
             execution = sqlTaskExecutionFactory.create(
                     session,
+                    taskSpan.get(),
                     queryContext,
                     taskStateMachine,
                     outputBuffer,
diff --git a/core/trino-main/src/main/java/io/trino/execution/SqlTaskExecution.java b/core/trino-main/src/main/java/io/trino/execution/SqlTaskExecution.java
index eb97f0101b17..b0fc34aa3a31 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SqlTaskExecution.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SqlTaskExecution.java
@@ -19,8 +19,13 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.concurrent.SetThreadName;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.event.SplitMonitor;
 import io.trino.execution.StateMachine.StateChangeListener;
 import io.trino.execution.buffer.BufferState;
@@ -37,10 +42,8 @@
 import io.trino.spi.TrinoException;
 import io.trino.sql.planner.LocalExecutionPlanner.LocalExecutionPlan;
 import io.trino.sql.planner.plan.PlanNodeId;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
+import io.trino.tracing.TrinoAttributes;
+import jakarta.annotation.Nullable;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -81,6 +84,7 @@ public class SqlTaskExecution
 {
     private final TaskId taskId;
     private final TaskStateMachine taskStateMachine;
+    private final Span taskSpan;
     private final TaskContext taskContext;
     private final OutputBuffer outputBuffer;
 
@@ -114,14 +118,17 @@ public class SqlTaskExecution
     public SqlTaskExecution(
             TaskStateMachine taskStateMachine,
             TaskContext taskContext,
+            Span taskSpan,
             OutputBuffer outputBuffer,
             LocalExecutionPlan localExecutionPlan,
             TaskExecutor taskExecutor,
             SplitMonitor splitMonitor,
+            Tracer tracer,
             Executor notificationExecutor)
     {
         this.taskStateMachine = requireNonNull(taskStateMachine, "taskStateMachine is null");
         this.taskId = taskStateMachine.getTaskId();
+        this.taskSpan = requireNonNull(taskSpan, "taskSpan is null");
         this.taskContext = requireNonNull(taskContext, "taskContext is null");
         this.outputBuffer = requireNonNull(outputBuffer, "outputBuffer is null");
 
@@ -141,10 +148,10 @@ public SqlTaskExecution(
             for (DriverFactory driverFactory : driverFactories) {
                 Optional<PlanNodeId> sourceId = driverFactory.getSourceId();
                 if (sourceId.isPresent() && partitionedSources.contains(sourceId.get())) {
-                    driverRunnerFactoriesWithSplitLifeCycle.put(sourceId.get(), new DriverSplitRunnerFactory(driverFactory, true));
+                    driverRunnerFactoriesWithSplitLifeCycle.put(sourceId.get(), new DriverSplitRunnerFactory(driverFactory, tracer, true));
                 }
                 else {
-                    DriverSplitRunnerFactory runnerFactory = new DriverSplitRunnerFactory(driverFactory, false);
+                    DriverSplitRunnerFactory runnerFactory = new DriverSplitRunnerFactory(driverFactory, tracer, false);
                     sourceId.ifPresent(planNodeId -> driverRunnerFactoriesWithRemoteSource.put(planNodeId, runnerFactory));
                     driverRunnerFactoriesWithTaskLifeCycle.add(runnerFactory);
                 }
@@ -172,6 +179,14 @@ public SqlTaskExecution(
             else {
                 taskHandle = createTaskHandle(taskStateMachine, taskContext, outputBuffer, driverFactories, taskExecutor, driverAndTaskTerminationTracker);
             }
+
+            taskStateMachine.addStateChangeListener(state -> {
+                if (state.isDone()) {
+                    for (DriverSplitRunnerFactory factory : allDriverRunnerFactories) {
+                        factory.getPipelineSpan().end();
+                    }
+                }
+            });
         }
     }
 
@@ -590,6 +605,7 @@ private class DriverSplitRunnerFactory
     {
         private final DriverFactory driverFactory;
         private final PipelineContext pipelineContext;
+        private final Span pipelineSpan;
 
         // number of created DriverSplitRunners that haven't created underlying Driver
         private final AtomicInteger pendingCreations = new AtomicInteger();
@@ -601,10 +617,17 @@ private class DriverSplitRunnerFactory
         private final AtomicLong inFlightSplits = new AtomicLong();
         private final AtomicBoolean noMoreSplits = new AtomicBoolean();
 
-        private DriverSplitRunnerFactory(DriverFactory driverFactory, boolean partitioned)
+        private DriverSplitRunnerFactory(DriverFactory driverFactory, Tracer tracer, boolean partitioned)
         {
             this.driverFactory = driverFactory;
             this.pipelineContext = taskContext.addPipelineContext(driverFactory.getPipelineId(), driverFactory.isInputDriver(), driverFactory.isOutputDriver(), partitioned);
+            this.pipelineSpan = tracer.spanBuilder("pipeline")
+                    .setParent(Context.current().with(taskSpan))
+                    .setAttribute(TrinoAttributes.QUERY_ID, taskId.getQueryId().toString())
+                    .setAttribute(TrinoAttributes.STAGE_ID, taskId.getStageId().toString())
+                    .setAttribute(TrinoAttributes.TASK_ID, taskId.toString())
+                    .setAttribute(TrinoAttributes.PIPELINE_ID, taskId.getStageId() + "-" + pipelineContext.getPipelineId())
+                    .startSpan();
         }
 
         public DriverSplitRunner createPartitionedDriverRunner(ScheduledSplit partitionedSplit)
@@ -640,6 +663,7 @@ public Driver createDriver(DriverContext driverContext, @Nullable ScheduledSplit
             Driver driver;
             try {
                 driver = driverFactory.createDriver(driverContext);
+                Span.fromContext(Context.current()).addEvent("driver-created");
             }
             catch (Throwable t) {
                 try {
@@ -761,6 +785,7 @@ public void closeDriverFactoryIfFullyCreated()
             }
             if (isNoMoreDriverRunner() && pendingCreations.get() == 0) {
                 driverFactory.noMoreDrivers();
+                pipelineSpan.addEvent("driver-factory-closed");
             }
         }
 
@@ -778,6 +803,11 @@ public void splitsAdded(int count, long weightSum)
         {
             pipelineContext.splitsAdded(count, weightSum);
         }
+
+        public Span getPipelineSpan()
+        {
+            return pipelineSpan;
+        }
     }
 
     private static class DriverSplitRunner
@@ -810,6 +840,18 @@ public synchronized DriverContext getDriverContext()
             return driver.getDriverContext();
         }
 
+        @Override
+        public int getPipelineId()
+        {
+            return driverContext.getPipelineContext().getPipelineId();
+        }
+
+        @Override
+        public Span getPipelineSpan()
+        {
+            return driverSplitRunnerFactory.getPipelineSpan();
+        }
+
         @Override
         public synchronized boolean isFinished()
         {
diff --git a/core/trino-main/src/main/java/io/trino/execution/SqlTaskExecutionFactory.java b/core/trino-main/src/main/java/io/trino/execution/SqlTaskExecutionFactory.java
index dd89d6e1cf78..6778cf252fb2 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SqlTaskExecutionFactory.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SqlTaskExecutionFactory.java
@@ -14,6 +14,8 @@
 package io.trino.execution;
 
 import io.airlift.concurrent.SetThreadName;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.Session;
 import io.trino.event.SplitMonitor;
 import io.trino.execution.buffer.OutputBuffer;
@@ -28,6 +30,7 @@
 import java.util.concurrent.Executor;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
+import static io.trino.tracing.ScopedSpan.scopedSpan;
 import static java.util.Objects.requireNonNull;
 
 public class SqlTaskExecutionFactory
@@ -38,6 +41,7 @@ public class SqlTaskExecutionFactory
 
     private final LocalExecutionPlanner planner;
     private final SplitMonitor splitMonitor;
+    private final Tracer tracer;
     private final boolean perOperatorCpuTimerEnabled;
     private final boolean cpuTimerEnabled;
 
@@ -46,18 +50,21 @@ public SqlTaskExecutionFactory(
             TaskExecutor taskExecutor,
             LocalExecutionPlanner planner,
             SplitMonitor splitMonitor,
+            Tracer tracer,
             TaskManagerConfig config)
     {
         this.taskNotificationExecutor = requireNonNull(taskNotificationExecutor, "taskNotificationExecutor is null");
         this.taskExecutor = requireNonNull(taskExecutor, "taskExecutor is null");
         this.planner = requireNonNull(planner, "planner is null");
         this.splitMonitor = requireNonNull(splitMonitor, "splitMonitor is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
         this.perOperatorCpuTimerEnabled = config.isPerOperatorCpuTimerEnabled();
         this.cpuTimerEnabled = config.isTaskCpuTimerEnabled();
     }
 
     public SqlTaskExecution create(
             Session session,
+            Span taskSpan,
             QueryContext queryContext,
             TaskStateMachine taskStateMachine,
             OutputBuffer outputBuffer,
@@ -73,7 +80,7 @@ public SqlTaskExecution create(
 
         LocalExecutionPlan localExecutionPlan;
         try (SetThreadName ignored = new SetThreadName("Task-%s", taskStateMachine.getTaskId())) {
-            try {
+            try (var ignoredSpan = scopedSpan(tracer, "local-planner")) {
                 localExecutionPlan = planner.plan(
                         taskContext,
                         fragment.getRoot(),
@@ -92,10 +99,12 @@ public SqlTaskExecution create(
         return new SqlTaskExecution(
                 taskStateMachine,
                 taskContext,
+                taskSpan,
                 outputBuffer,
                 localExecutionPlan,
                 taskExecutor,
                 splitMonitor,
+                tracer,
                 taskNotificationExecutor);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/SqlTaskManager.java b/core/trino-main/src/main/java/io/trino/execution/SqlTaskManager.java
index d0bb6beb8e5d..685d8c2718b1 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SqlTaskManager.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SqlTaskManager.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
 import io.airlift.log.Logger;
 import io.airlift.node.NodeInfo;
@@ -26,8 +27,10 @@
 import io.airlift.stats.GcMonitor;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.Session;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.connector.CatalogProperties;
 import io.trino.connector.ConnectorServicesProvider;
 import io.trino.event.SplitMonitor;
@@ -37,12 +40,13 @@
 import io.trino.execution.buffer.BufferResult;
 import io.trino.execution.buffer.OutputBuffers;
 import io.trino.execution.buffer.PipelinedOutputBuffers;
-import io.trino.execution.executor.PrioritizedSplitRunner;
+import io.trino.execution.executor.RunningSplitInfo;
 import io.trino.execution.executor.TaskExecutor;
-import io.trino.execution.executor.TaskExecutor.RunningSplitInfo;
+import io.trino.execution.executor.timesharing.PrioritizedSplitRunner;
 import io.trino.memory.LocalMemoryManager;
 import io.trino.memory.NodeMemoryConfig;
 import io.trino.memory.QueryContext;
+import io.trino.metadata.LanguageFunctionProvider;
 import io.trino.operator.RetryPolicy;
 import io.trino.operator.scalar.JoniRegexpFunctions;
 import io.trino.operator.scalar.JoniRegexpReplaceLambdaFunction;
@@ -56,15 +60,13 @@
 import io.trino.sql.planner.LocalExecutionPlanner;
 import io.trino.sql.planner.PlanFragment;
 import io.trino.sql.planner.plan.DynamicFilterId;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.joda.time.DateTime;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.io.Closeable;
 import java.util.HashSet;
 import java.util.List;
@@ -87,9 +89,9 @@
 import static io.trino.SystemSessionProperties.getQueryMaxMemoryPerNode;
 import static io.trino.SystemSessionProperties.getRetryPolicy;
 import static io.trino.SystemSessionProperties.resourceOvercommit;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.execution.SqlTask.createSqlTask;
-import static io.trino.execution.executor.PrioritizedSplitRunner.SPLIT_RUN_QUANTA;
+import static io.trino.execution.executor.timesharing.PrioritizedSplitRunner.SPLIT_RUN_QUANTA;
 import static io.trino.operator.RetryPolicy.TASK;
 import static io.trino.spi.StandardErrorCode.ABANDONED_TASK;
 import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
@@ -135,12 +137,14 @@ public class SqlTaskManager
 
     private final CounterStat failedTasks = new CounterStat();
     private final Optional<StuckSplitTasksInterrupter> stuckSplitTasksInterrupter;
+    private final LanguageFunctionProvider languageFunctionProvider;
 
     @Inject
     public SqlTaskManager(
             VersionEmbedder versionEmbedder,
             ConnectorServicesProvider connectorServicesProvider,
             LocalExecutionPlanner planner,
+            LanguageFunctionProvider languageFunctionProvider,
             LocationFactory locationFactory,
             TaskExecutor taskExecutor,
             SplitMonitor splitMonitor,
@@ -152,11 +156,13 @@ public SqlTaskManager(
             LocalSpillManager localSpillManager,
             NodeSpillConfig nodeSpillConfig,
             GcMonitor gcMonitor,
+            Tracer tracer,
             ExchangeManagerRegistry exchangeManagerRegistry)
     {
         this(versionEmbedder,
                 connectorServicesProvider,
                 planner,
+                languageFunctionProvider,
                 locationFactory,
                 taskExecutor,
                 splitMonitor,
@@ -168,6 +174,7 @@ public SqlTaskManager(
                 localSpillManager,
                 nodeSpillConfig,
                 gcMonitor,
+                tracer,
                 exchangeManagerRegistry,
                 STUCK_SPLIT_STACK_TRACE_PREDICATE);
     }
@@ -177,6 +184,7 @@ public SqlTaskManager(
             VersionEmbedder versionEmbedder,
             ConnectorServicesProvider connectorServicesProvider,
             LocalExecutionPlanner planner,
+            LanguageFunctionProvider languageFunctionProvider,
             LocationFactory locationFactory,
             TaskExecutor taskExecutor,
             SplitMonitor splitMonitor,
@@ -188,10 +196,12 @@ public SqlTaskManager(
             LocalSpillManager localSpillManager,
             NodeSpillConfig nodeSpillConfig,
             GcMonitor gcMonitor,
+            Tracer tracer,
             ExchangeManagerRegistry exchangeManagerRegistry,
             Predicate<List<StackTraceElement>> stuckSplitStackTracePredicate)
     {
         this.connectorServicesProvider = requireNonNull(connectorServicesProvider, "connectorServicesProvider is null");
+        this.languageFunctionProvider = languageFunctionProvider;
 
         requireNonNull(nodeInfo, "nodeInfo is null");
         infoCacheTime = config.getInfoMaxAge();
@@ -207,7 +217,7 @@ public SqlTaskManager(
         this.taskManagementExecutor = taskManagementExecutor.getExecutor();
         this.driverYieldExecutor = newScheduledThreadPool(config.getTaskYieldThreads(), threadsNamed("task-yield-%s"));
 
-        SqlTaskExecutionFactory sqlTaskExecutionFactory = new SqlTaskExecutionFactory(taskNotificationExecutor, taskExecutor, planner, splitMonitor, config);
+        SqlTaskExecutionFactory sqlTaskExecutionFactory = new SqlTaskExecutionFactory(taskNotificationExecutor, taskExecutor, planner, splitMonitor, tracer, config);
 
         DataSize maxQueryMemoryPerNode = nodeMemoryConfig.getMaxQueryMemoryPerNode();
         DataSize maxQuerySpillPerNode = nodeSpillConfig.getQueryMaxSpillPerNode();
@@ -223,9 +233,13 @@ public SqlTaskManager(
                         locationFactory.createLocalTaskLocation(taskId),
                         nodeInfo.getNodeId(),
                         queryContexts.getUnchecked(taskId.getQueryId()),
+                        tracer,
                         sqlTaskExecutionFactory,
                         taskNotificationExecutor,
-                        sqlTask -> finishedTaskStats.merge(sqlTask.getIoStats()),
+                        sqlTask -> {
+                            languageFunctionProvider.unregisterTask(taskId);
+                            finishedTaskStats.merge(sqlTask.getIoStats());
+                        },
                         maxBufferSize,
                         maxBroadcastBufferSize,
                         requireNonNull(exchangeManagerRegistry, "exchangeManagerRegistry is null"),
@@ -460,13 +474,15 @@ public void pruneCatalogs(Set<CatalogHandle> activeCatalogs)
     public TaskInfo updateTask(
             Session session,
             TaskId taskId,
+            Span stageSpan,
             Optional<PlanFragment> fragment,
             List<SplitAssignment> splitAssignments,
             OutputBuffers outputBuffers,
-            Map<DynamicFilterId, Domain> dynamicFilterDomains)
+            Map<DynamicFilterId, Domain> dynamicFilterDomains,
+            boolean speculative)
     {
         try {
-            return versionEmbedder.embedVersion(() -> doUpdateTask(session, taskId, fragment, splitAssignments, outputBuffers, dynamicFilterDomains)).call();
+            return versionEmbedder.embedVersion(() -> doUpdateTask(session, taskId, stageSpan, fragment, splitAssignments, outputBuffers, dynamicFilterDomains, speculative)).call();
         }
         catch (Exception e) {
             throwIfUnchecked(e);
@@ -478,13 +494,16 @@ public TaskInfo updateTask(
     private TaskInfo doUpdateTask(
             Session session,
             TaskId taskId,
+            Span stageSpan,
             Optional<PlanFragment> fragment,
             List<SplitAssignment> splitAssignments,
             OutputBuffers outputBuffers,
-            Map<DynamicFilterId, Domain> dynamicFilterDomains)
+            Map<DynamicFilterId, Domain> dynamicFilterDomains,
+            boolean speculative)
     {
         requireNonNull(session, "session is null");
         requireNonNull(taskId, "taskId is null");
+        requireNonNull(stageSpan, "stageSpan is null");
         requireNonNull(fragment, "fragment is null");
         requireNonNull(splitAssignments, "splitAssignments is null");
         requireNonNull(outputBuffers, "outputBuffers is null");
@@ -518,8 +537,11 @@ private TaskInfo doUpdateTask(
                     }
                 });
 
+        fragment.map(PlanFragment::getLanguageFunctions)
+                .ifPresent(languageFunctions -> languageFunctionProvider.registerTask(taskId, languageFunctions));
+
         sqlTask.recordHeartbeat();
-        return sqlTask.updateTask(session, fragment, splitAssignments, outputBuffers, dynamicFilterDomains);
+        return sqlTask.updateTask(session, stageSpan, fragment, splitAssignments, outputBuffers, dynamicFilterDomains, speculative);
     }
 
     /**
@@ -736,7 +758,7 @@ private Optional<StuckSplitTasksInterrupter> createStuckSplitTasksInterrupter(
      * The detection is invoked periodically with the frequency of {@link StuckSplitTasksInterrupter#stuckSplitsDetectionInterval}.
      * A thread gets interrupted once the split processing continues beyond {@link StuckSplitTasksInterrupter#interruptStuckSplitTasksTimeout} and
      * the split threaddump matches with {@link StuckSplitTasksInterrupter#stuckSplitStackTracePredicate}. <p>
-     *
+     * <p>
      * There is a potential race condition for this {@link StuckSplitTasksInterrupter} class. The problematic flow is that we may
      * kill a task that is long-running, but not really stuck on the code that matches {@link StuckSplitTasksInterrupter#stuckSplitStackTracePredicate} (e.g. JONI code).
      * Consider the following example:
diff --git a/core/trino-main/src/main/java/io/trino/execution/StageId.java b/core/trino-main/src/main/java/io/trino/execution/StageId.java
index 70ff78858f07..e5bf48ab03dd 100644
--- a/core/trino-main/src/main/java/io/trino/execution/StageId.java
+++ b/core/trino-main/src/main/java/io/trino/execution/StageId.java
@@ -56,6 +56,7 @@ public StageId(String queryId, int id)
     public StageId(QueryId queryId, int id)
     {
         this.queryId = requireNonNull(queryId, "queryId is null");
+        checkArgument(id >= 0, "id is negative: %s", id);
         this.id = id;
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/StageInfo.java b/core/trino-main/src/main/java/io/trino/execution/StageInfo.java
index f406f3e90722..b12bc71849d4 100644
--- a/core/trino-main/src/main/java/io/trino/execution/StageInfo.java
+++ b/core/trino-main/src/main/java/io/trino/execution/StageInfo.java
@@ -17,13 +17,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.QueryId;
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.PlanFragment;
 import io.trino.sql.planner.plan.PlanNodeId;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/execution/StageState.java b/core/trino-main/src/main/java/io/trino/execution/StageState.java
index c543dd335cf7..cf88c8f7f49a 100644
--- a/core/trino-main/src/main/java/io/trino/execution/StageState.java
+++ b/core/trino-main/src/main/java/io/trino/execution/StageState.java
@@ -80,4 +80,12 @@ public boolean isFailure()
     {
         return failureState;
     }
+
+    /**
+     * Is this a scheduled state
+     */
+    public boolean isScheduled()
+    {
+        return this.equals(StageState.RUNNING) || this.equals(StageState.PENDING) || this.isDone();
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/StageStateMachine.java b/core/trino-main/src/main/java/io/trino/execution/StageStateMachine.java
index 6b5482330fe7..2ddc4a6c3a9e 100644
--- a/core/trino-main/src/main/java/io/trino/execution/StageStateMachine.java
+++ b/core/trino-main/src/main/java/io/trino/execution/StageStateMachine.java
@@ -15,9 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.log.Logger;
 import io.airlift.stats.Distribution;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
 import io.trino.execution.StateMachine.StateChangeListener;
 import io.trino.execution.scheduler.SplitSchedulerStats;
 import io.trino.operator.BlockedReason;
@@ -29,13 +34,11 @@
 import io.trino.sql.planner.PlanFragment;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.tracing.TrinoAttributes;
 import io.trino.util.Failures;
-import io.trino.util.Optionals;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -82,6 +85,7 @@ public class StageStateMachine
 
     private final StateMachine<StageState> stageState;
     private final StateMachine<Optional<StageInfo>> finalStageInfo;
+    private final Span stageSpan;
     private final AtomicReference<ExecutionFailureInfo> failureCause = new AtomicReference<>();
 
     private final AtomicReference<DateTime> schedulingComplete = new AtomicReference<>();
@@ -98,6 +102,8 @@ public StageStateMachine(
             PlanFragment fragment,
             Map<PlanNodeId, TableInfo> tables,
             Executor executor,
+            Tracer tracer,
+            Span querySpan,
             SplitSchedulerStats schedulerStats)
     {
         this.stageId = requireNonNull(stageId, "stageId is null");
@@ -109,6 +115,20 @@ public StageStateMachine(
         stageState.addStateChangeListener(state -> log.debug("Stage %s is %s", stageId, state));
 
         finalStageInfo = new StateMachine<>("final stage " + stageId, executor, Optional.empty());
+
+        stageSpan = tracer.spanBuilder("stage")
+                .setParent(Context.current().with(querySpan))
+                .setAttribute(TrinoAttributes.QUERY_ID, stageId.getQueryId().toString())
+                .setAttribute(TrinoAttributes.STAGE_ID, stageId.toString())
+                .startSpan();
+
+        stageState.addStateChangeListener(state -> {
+            stageSpan.addEvent("stage_state", Attributes.of(
+                    TrinoAttributes.EVENT_STATE, state.toString()));
+            if (state.isDone()) {
+                stageSpan.end();
+            }
+        });
     }
 
     public StageId getStageId()
@@ -126,6 +146,11 @@ public PlanFragment getFragment()
         return fragment;
     }
 
+    public Span getStageSpan()
+    {
+        return stageSpan;
+    }
+
     /**
      * Listener is always notified asynchronously using a dedicated notification thread pool so, care should
      * be taken to avoid leaking {@code this} when adding a listener in a constructor. Additionally, it is
@@ -247,8 +272,8 @@ public BasicStageStats getBasicStageStats(Supplier<Iterable<TaskInfo>> taskInfos
         int runningDrivers = 0;
         int completedDrivers = 0;
 
-        long cumulativeUserMemory = 0;
-        long failedCumulativeUserMemory = 0;
+        double cumulativeUserMemory = 0;
+        double failedCumulativeUserMemory = 0;
         long userMemoryReservation = 0;
         long totalMemoryReservation = 0;
 
@@ -323,6 +348,10 @@ public BasicStageStats getBasicStageStats(Supplier<Iterable<TaskInfo>> taskInfos
         if (isScheduled && totalDrivers != 0) {
             progressPercentage = OptionalDouble.of(min(100, (completedDrivers * 100.0) / totalDrivers));
         }
+        OptionalDouble runningPercentage = OptionalDouble.empty();
+        if (isScheduled && totalDrivers != 0) {
+            runningPercentage = OptionalDouble.of(min(100, (runningDrivers * 100.0) / totalDrivers));
+        }
 
         return new BasicStageStats(
                 isScheduled,
@@ -357,7 +386,8 @@ public BasicStageStats getBasicStageStats(Supplier<Iterable<TaskInfo>> taskInfos
                 fullyBlocked,
                 blockedReasons,
 
-                progressPercentage);
+                progressPercentage,
+                runningPercentage);
     }
 
     public StageInfo getStageInfo(Supplier<Iterable<TaskInfo>> taskInfosSupplier)
@@ -386,8 +416,8 @@ public StageInfo getStageInfo(Supplier<Iterable<TaskInfo>> taskInfosSupplier)
         int blockedDrivers = 0;
         int completedDrivers = 0;
 
-        long cumulativeUserMemory = 0;
-        long failedCumulativeUserMemory = 0;
+        double cumulativeUserMemory = 0;
+        double failedCumulativeUserMemory = 0;
         long userMemoryReservation = currentUserMemory.get();
         long revocableMemoryReservation = currentRevocableMemory.get();
         long totalMemoryReservation = currentTotalMemory.get();
@@ -426,7 +456,7 @@ public StageInfo getStageInfo(Supplier<Iterable<TaskInfo>> taskInfosSupplier)
         long failedInputBlockedTime = 0;
 
         long bufferedDataSize = 0;
-        Optional<TDigestHistogram> outputBufferUtilization = Optional.empty();
+        ImmutableList.Builder<TDigestHistogram> bufferUtilizationHistograms = ImmutableList.builderWithExpectedSize(taskInfos.size());
         long outputDataSize = 0;
         long failedOutputDataSize = 0;
         long outputPositions = 0;
@@ -503,7 +533,7 @@ public StageInfo getStageInfo(Supplier<Iterable<TaskInfo>> taskInfosSupplier)
             inputBlockedTime += taskStats.getInputBlockedTime().roundTo(NANOSECONDS);
 
             bufferedDataSize += taskInfo.getOutputBuffers().getTotalBufferedBytes();
-            outputBufferUtilization = Optionals.combine(outputBufferUtilization, taskInfo.getOutputBuffers().getUtilization(), TDigestHistogram::mergeWith);
+            taskInfo.getOutputBuffers().getUtilization().ifPresent(bufferUtilizationHistograms::add);
             outputDataSize += taskStats.getOutputDataSize().toBytes();
             outputPositions += taskStats.getOutputPositions();
 
@@ -608,7 +638,7 @@ public StageInfo getStageInfo(Supplier<Iterable<TaskInfo>> taskInfosSupplier)
                 succinctDuration(inputBlockedTime, NANOSECONDS),
                 succinctDuration(failedInputBlockedTime, NANOSECONDS),
                 succinctBytes(bufferedDataSize),
-                outputBufferUtilization,
+                TDigestHistogram.merge(bufferUtilizationHistograms.build()),
                 succinctBytes(outputDataSize),
                 succinctBytes(failedOutputDataSize),
                 outputPositions,
diff --git a/core/trino-main/src/main/java/io/trino/execution/StageStats.java b/core/trino-main/src/main/java/io/trino/execution/StageStats.java
index 8358f27efc92..ee7998313425 100644
--- a/core/trino-main/src/main/java/io/trino/execution/StageStats.java
+++ b/core/trino-main/src/main/java/io/trino/execution/StageStats.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.airlift.stats.Distribution;
 import io.airlift.stats.Distribution.DistributionSnapshot;
 import io.airlift.units.DataSize;
@@ -27,8 +28,6 @@
 import io.trino.spi.eventlistener.StageGcStatistics;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalDouble;
@@ -634,6 +633,10 @@ public BasicStageStats toBasicStageStats(StageState stageState)
         if (isScheduled && totalDrivers != 0) {
             progressPercentage = OptionalDouble.of(min(100, (completedDrivers * 100.0) / totalDrivers));
         }
+        OptionalDouble runningPercentage = OptionalDouble.empty();
+        if (isScheduled && totalDrivers != 0) {
+            progressPercentage = OptionalDouble.of(min(100, (runningDrivers * 100.0) / totalDrivers));
+        }
 
         return new BasicStageStats(
                 isScheduled,
@@ -659,7 +662,8 @@ public BasicStageStats toBasicStageStats(StageState stageState)
                 failedScheduledTime,
                 fullyBlocked,
                 blockedReasons,
-                progressPercentage);
+                progressPercentage,
+                runningPercentage);
     }
 
     public static StageStats createInitial()
diff --git a/core/trino-main/src/main/java/io/trino/execution/StartTransactionTask.java b/core/trino-main/src/main/java/io/trino/execution/StartTransactionTask.java
index 3fed5a48f845..fadf348bdcc4 100644
--- a/core/trino-main/src/main/java/io/trino/execution/StartTransactionTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/StartTransactionTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.spi.StandardErrorCode;
@@ -26,8 +27,6 @@
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/StateMachine.java b/core/trino-main/src/main/java/io/trino/execution/StateMachine.java
index 34db60a09f6f..66051d52d00b 100644
--- a/core/trino-main/src/main/java/io/trino/execution/StateMachine.java
+++ b/core/trino-main/src/main/java/io/trino/execution/StateMachine.java
@@ -17,12 +17,11 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import io.trino.spi.TrinoException;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -286,7 +285,7 @@ public void addStateChangeListener(StateChangeListener<T> stateChangeListener)
 
         // fire state change listener with the current state
         // always fire listener callbacks from a different thread
-        safeExecute(() -> stateChangeListener.stateChanged(currentState));
+        safeExecute(() -> fireStateChangedListener(currentState, stateChangeListener));
     }
 
     @VisibleForTesting
diff --git a/core/trino-main/src/main/java/io/trino/execution/TableExecuteContext.java b/core/trino-main/src/main/java/io/trino/execution/TableExecuteContext.java
index ff0b796c8018..5f73ce670ae5 100644
--- a/core/trino-main/src/main/java/io/trino/execution/TableExecuteContext.java
+++ b/core/trino-main/src/main/java/io/trino/execution/TableExecuteContext.java
@@ -14,8 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.concurrent.GuardedBy;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/TableExecuteContextManager.java b/core/trino-main/src/main/java/io/trino/execution/TableExecuteContextManager.java
index aa85c44f52de..116deb0169f3 100644
--- a/core/trino-main/src/main/java/io/trino/execution/TableExecuteContextManager.java
+++ b/core/trino-main/src/main/java/io/trino/execution/TableExecuteContextManager.java
@@ -13,10 +13,9 @@
  */
 package io.trino.execution;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.spi.QueryId;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/TableInfo.java b/core/trino-main/src/main/java/io/trino/execution/TableInfo.java
index 64286ffa21cf..97db3946e217 100644
--- a/core/trino-main/src/main/java/io/trino/execution/TableInfo.java
+++ b/core/trino-main/src/main/java/io/trino/execution/TableInfo.java
@@ -15,13 +15,14 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.Session;
 import io.trino.connector.ConnectorName;
 import io.trino.metadata.CatalogInfo;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.TableProperties;
-import io.trino.metadata.TableSchema;
+import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.sql.planner.PlanFragment;
@@ -29,8 +30,6 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.planner.plan.TableScanNode;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Map;
 import java.util.Optional;
 
@@ -86,13 +85,14 @@ public static Map<PlanNodeId, TableInfo> extract(Session session, Metadata metad
 
     private static TableInfo extract(Session session, Metadata metadata, TableScanNode node)
     {
-        TableSchema tableSchema = metadata.getTableSchema(session, node.getTable());
+        CatalogSchemaTableName tableName = metadata.getTableName(session, node.getTable());
         TableProperties tableProperties = metadata.getTableProperties(session, node.getTable());
         Optional<String> connectorName = metadata.listCatalogs(session).stream()
-                .filter(catalogInfo -> catalogInfo.getCatalogName().equals(tableSchema.getCatalogName()))
+                .filter(catalogInfo -> catalogInfo.getCatalogName().equals(tableName.getCatalogName()))
                 .map(CatalogInfo::getConnectorName)
                 .map(ConnectorName::toString)
                 .findFirst();
-        return new TableInfo(connectorName, tableSchema.getQualifiedName(), tableProperties.getPredicate());
+        QualifiedObjectName objectName = new QualifiedObjectName(tableName.getCatalogName(), tableName.getSchemaTableName().getSchemaName(), tableName.getSchemaTableName().getTableName());
+        return new TableInfo(connectorName, objectName, tableProperties.getPredicate());
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/TaskId.java b/core/trino-main/src/main/java/io/trino/execution/TaskId.java
index d81f0546aee6..938a647a7d2d 100644
--- a/core/trino-main/src/main/java/io/trino/execution/TaskId.java
+++ b/core/trino-main/src/main/java/io/trino/execution/TaskId.java
@@ -25,6 +25,7 @@
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.spi.QueryId.parseDottedId;
 import static java.lang.Integer.parseInt;
+import static java.lang.String.join;
 import static java.util.Objects.requireNonNull;
 
 public class TaskId
@@ -42,9 +43,13 @@ public static TaskId valueOf(String taskId)
     public TaskId(StageId stageId, int partitionId, int attemptId)
     {
         requireNonNull(stageId, "stageId is null");
-        checkArgument(partitionId >= 0, "partitionId is negative");
-        checkArgument(attemptId >= 0, "attemptId is negative");
-        this.fullId = stageId + "." + partitionId + "." + attemptId;
+        checkArgument(partitionId >= 0, "partitionId is negative: %s", partitionId);
+        checkArgument(attemptId >= 0, "attemptId is negative: %s", attemptId);
+
+        // There is a strange JDK bug related to the CompactStrings implementation in JDK20+ which causes some fullId values
+        // to get corrupted when this particular line is JIT-optimized. Changing implicit concatenation to a String.join call
+        // seems to mitigate this issue. See: https://github.com/trinodb/trino/issues/18272 for more details.
+        this.fullId = join(".", stageId.toString(), String.valueOf(partitionId), String.valueOf(attemptId));
     }
 
     private TaskId(String fullId)
diff --git a/core/trino-main/src/main/java/io/trino/execution/TaskInfo.java b/core/trino-main/src/main/java/io/trino/execution/TaskInfo.java
index 3dddcc9a2199..121bc8aa864b 100644
--- a/core/trino-main/src/main/java/io/trino/execution/TaskInfo.java
+++ b/core/trino-main/src/main/java/io/trino/execution/TaskInfo.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.airlift.units.DataSize;
 import io.trino.execution.buffer.OutputBufferInfo;
 import io.trino.execution.buffer.PipelinedBufferInfo;
@@ -23,8 +24,6 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.net.URI;
 import java.util.List;
 import java.util.Optional;
@@ -130,10 +129,10 @@ public String toString()
                 .toString();
     }
 
-    public static TaskInfo createInitialTask(TaskId taskId, URI location, String nodeId, Optional<List<PipelinedBufferInfo>> pipelinedBufferStates, TaskStats taskStats)
+    public static TaskInfo createInitialTask(TaskId taskId, URI location, String nodeId, boolean speculative, Optional<List<PipelinedBufferInfo>> pipelinedBufferStates, TaskStats taskStats)
     {
         return new TaskInfo(
-                initialTaskStatus(taskId, location, nodeId),
+                initialTaskStatus(taskId, location, nodeId, speculative),
                 DateTime.now(),
                 new OutputBufferInfo(
                         "UNINITIALIZED",
diff --git a/core/trino-main/src/main/java/io/trino/execution/TaskManagementExecutor.java b/core/trino-main/src/main/java/io/trino/execution/TaskManagementExecutor.java
index 29b7bd5a37f3..d9a4b36a67bd 100644
--- a/core/trino-main/src/main/java/io/trino/execution/TaskManagementExecutor.java
+++ b/core/trino-main/src/main/java/io/trino/execution/TaskManagementExecutor.java
@@ -14,11 +14,10 @@
 package io.trino.execution;
 
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PreDestroy;
-
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/TaskManagerConfig.java b/core/trino-main/src/main/java/io/trino/execution/TaskManagerConfig.java
index 571078f272ad..2d964eb0d00a 100644
--- a/core/trino-main/src/main/java/io/trino/execution/TaskManagerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/execution/TaskManagerConfig.java
@@ -23,9 +23,8 @@
 import io.airlift.units.MaxDuration;
 import io.airlift.units.MinDuration;
 import io.trino.util.PowerOfTwo;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.math.BigDecimal;
 import java.util.concurrent.TimeUnit;
@@ -46,20 +45,21 @@
         "task.level-absolute-priority"})
 public class TaskManagerConfig
 {
+    private boolean threadPerDriverSchedulerEnabled;
     private boolean perOperatorCpuTimerEnabled = true;
     private boolean taskCpuTimerEnabled = true;
     private boolean statisticsCpuTimerEnabled = true;
     private DataSize maxPartialAggregationMemoryUsage = DataSize.of(16, Unit.MEGABYTE);
     private DataSize maxPartialTopNMemory = DataSize.of(16, Unit.MEGABYTE);
-    private DataSize maxLocalExchangeBufferSize = DataSize.of(32, Unit.MEGABYTE);
+    private DataSize maxLocalExchangeBufferSize = DataSize.of(128, Unit.MEGABYTE);
     private DataSize maxIndexMemoryUsage = DataSize.of(64, Unit.MEGABYTE);
     private boolean shareIndexLoading;
     private int maxWorkerThreads = Runtime.getRuntime().availableProcessors() * 2;
     private Integer minDrivers;
-    private Integer initialSplitsPerNode;
+    private int initialSplitsPerNode = Runtime.getRuntime().availableProcessors() * 4;
     private int minDriversPerTask = 3;
     private int maxDriversPerTask = Integer.MAX_VALUE;
-    private Duration splitConcurrencyAdjustmentInterval = new Duration(100, TimeUnit.MILLISECONDS);
+    private Duration splitConcurrencyAdjustmentInterval = new Duration(1, TimeUnit.SECONDS);
 
     private DataSize sinkMaxBufferSize = DataSize.of(32, Unit.MEGABYTE);
     private DataSize sinkMaxBroadcastBufferSize = DataSize.of(200, Unit.MEGABYTE);
@@ -79,18 +79,13 @@ public class TaskManagerConfig
     private Duration interruptStuckSplitTasksDetectionInterval = new Duration(2, TimeUnit.MINUTES);
 
     private boolean scaleWritersEnabled = true;
-    // Set the value of default max writer count to the number of processors and cap it to 32. We can do this
-    // because preferred write partitioning is always enabled for local exchange thus partitioned inserts will never
-    // use this property. Hence, there is no risk in terms of more numbers of physical writers which can cause high
-    // resource utilization.
-    private int scaleWritersMaxWriterCount = min(getAvailablePhysicalProcessorCount(), 32);
-    private int writerCount = 1;
-    // Default value of partitioned task writer count should be above 1, otherwise it can create a plan
-    // with a single gather exchange node on the coordinator due to a single available processor. Whereas,
-    // on the worker nodes due to more available processors, the default value could be above 1. Therefore,
-    // it can cause error due to config mismatch during execution. Additionally, cap it to 32 in order to
-    // avoid small pages produced by local partitioning exchanges.
-    private int partitionedWriterCount = min(max(nextPowerOfTwo(getAvailablePhysicalProcessorCount()), 2), 32);
+    private int minWriterCount = 1;
+    // Set the value of default max writer count to the number of processors * 2 and cap it to 64. It should be
+    // above 1, otherwise it can create a plan with a single gather exchange node on the coordinator due to a single
+    // available processor. Whereas, on the worker nodes due to more available processors, the default value could
+    // be above 1. Therefore, it can cause error due to config mismatch during execution. Additionally, cap
+    // it to 64 in order to avoid small pages produced by local partitioning exchanges.
+    private int maxWriterCount = min(max(nextPowerOfTwo(getAvailablePhysicalProcessorCount() * 2), 2), 64);
     // Default value of task concurrency should be above 1, otherwise it can create a plan with a single gather
     // exchange node on the coordinator due to a single available processor. Whereas, on the worker nodes due to
     // more available processors, the default value could be above 1. Therefore, it can cause error due to config
@@ -108,6 +103,18 @@ public class TaskManagerConfig
 
     private BigDecimal levelTimeMultiplier = new BigDecimal(2.0);
 
+    @Config("experimental.thread-per-driver-scheduler-enabled")
+    public TaskManagerConfig setThreadPerDriverSchedulerEnabled(boolean enabled)
+    {
+        this.threadPerDriverSchedulerEnabled = enabled;
+        return this;
+    }
+
+    public boolean isThreadPerDriverSchedulerEnabled()
+    {
+        return threadPerDriverSchedulerEnabled;
+    }
+
     @MinDuration("1ms")
     @MaxDuration("10s")
     @NotNull
@@ -287,9 +294,6 @@ public TaskManagerConfig setMaxWorkerThreads(int maxWorkerThreads)
     @Min(1)
     public int getInitialSplitsPerNode()
     {
-        if (initialSplitsPerNode == null) {
-            return maxWorkerThreads;
-        }
         return initialSplitsPerNode;
     }
 
@@ -449,46 +453,50 @@ public TaskManagerConfig setScaleWritersEnabled(boolean scaleWritersEnabled)
         return this;
     }
 
-    @Min(1)
-    public int getScaleWritersMaxWriterCount()
-    {
-        return scaleWritersMaxWriterCount;
-    }
-
-    @Config("task.scale-writers.max-writer-count")
+    @Deprecated
+    @LegacyConfig(value = "task.scale-writers.max-writer-count", replacedBy = "task.max-writer-count")
     @ConfigDescription("Maximum number of writers per task up to which scaling will happen if task.scale-writers.enabled is set")
     public TaskManagerConfig setScaleWritersMaxWriterCount(int scaleWritersMaxWriterCount)
     {
-        this.scaleWritersMaxWriterCount = scaleWritersMaxWriterCount;
+        this.maxWriterCount = scaleWritersMaxWriterCount;
         return this;
     }
 
     @Min(1)
-    public int getWriterCount()
+    public int getMinWriterCount()
     {
-        return writerCount;
+        return minWriterCount;
     }
 
-    @Config("task.writer-count")
-    @ConfigDescription("Number of local parallel table writers per task when prefer partitioning and task writer scaling are not used")
-    public TaskManagerConfig setWriterCount(int writerCount)
+    @Config("task.min-writer-count")
+    @ConfigDescription("Minimum number of local parallel table writers per task when preferred partitioning and task writer scaling are not used")
+    public TaskManagerConfig setMinWriterCount(int minWriterCount)
     {
-        this.writerCount = writerCount;
+        this.minWriterCount = minWriterCount;
         return this;
     }
 
     @Min(1)
     @PowerOfTwo
-    public int getPartitionedWriterCount()
+    public int getMaxWriterCount()
     {
-        return partitionedWriterCount;
+        return maxWriterCount;
+    }
+
+    @Config("task.max-writer-count")
+    @ConfigDescription("Maximum number of local parallel table writers per task when either task writer scaling or preferred partitioning is used")
+    public TaskManagerConfig setMaxWriterCount(int maxWriterCount)
+    {
+        this.maxWriterCount = maxWriterCount;
+        return this;
     }
 
-    @Config("task.partitioned-writer-count")
+    @Deprecated
+    @LegacyConfig(value = "task.partitioned-writer-count", replacedBy = "task.max-writer-count")
     @ConfigDescription("Number of local parallel table writers per task when prefer partitioning is used")
     public TaskManagerConfig setPartitionedWriterCount(int partitionedWriterCount)
     {
-        this.partitionedWriterCount = partitionedWriterCount;
+        this.maxWriterCount = partitionedWriterCount;
         return this;
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/TaskStateMachine.java b/core/trino-main/src/main/java/io/trino/execution/TaskStateMachine.java
index c41e6e054bfe..a7998d6d8d89 100644
--- a/core/trino-main/src/main/java/io/trino/execution/TaskStateMachine.java
+++ b/core/trino-main/src/main/java/io/trino/execution/TaskStateMachine.java
@@ -16,13 +16,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import io.trino.execution.StateMachine.StateChangeListener;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/execution/TaskStatus.java b/core/trino-main/src/main/java/io/trino/execution/TaskStatus.java
index 50f1aac49b0d..6940d6e55483 100644
--- a/core/trino-main/src/main/java/io/trino/execution/TaskStatus.java
+++ b/core/trino-main/src/main/java/io/trino/execution/TaskStatus.java
@@ -52,12 +52,14 @@ public class TaskStatus
     private final TaskState state;
     private final URI self;
     private final String nodeId;
+    private final boolean speculative;
 
     private final int queuedPartitionedDrivers;
     private final long queuedPartitionedSplitsWeight;
     private final int runningPartitionedDrivers;
     private final long runningPartitionedSplitsWeight;
     private final OutputBufferStatus outputBufferStatus;
+    private final DataSize writerInputDataSize;
     private final DataSize outputDataSize;
     private final DataSize physicalWrittenDataSize;
     private final Optional<Integer> maxWriterCount;
@@ -80,11 +82,13 @@ public TaskStatus(
             @JsonProperty("state") TaskState state,
             @JsonProperty("self") URI self,
             @JsonProperty("nodeId") String nodeId,
+            @JsonProperty("speculative") boolean speculative,
             @JsonProperty("failures") List<ExecutionFailureInfo> failures,
             @JsonProperty("queuedPartitionedDrivers") int queuedPartitionedDrivers,
             @JsonProperty("runningPartitionedDrivers") int runningPartitionedDrivers,
             @JsonProperty("outputBufferStatus") OutputBufferStatus outputBufferStatus,
             @JsonProperty("outputDataSize") DataSize outputDataSize,
+            @JsonProperty("writerInputDataSize") DataSize writerInputDataSize,
             @JsonProperty("physicalWrittenDataSize") DataSize physicalWrittenDataSize,
             @JsonProperty("writerCount") Optional<Integer> maxWriterCount,
             @JsonProperty("memoryReservation") DataSize memoryReservation,
@@ -104,6 +108,7 @@ public TaskStatus(
         this.state = requireNonNull(state, "state is null");
         this.self = requireNonNull(self, "self is null");
         this.nodeId = requireNonNull(nodeId, "nodeId is null");
+        this.speculative = speculative;
 
         checkArgument(queuedPartitionedDrivers >= 0, "queuedPartitionedDrivers must be positive");
         this.queuedPartitionedDrivers = queuedPartitionedDrivers;
@@ -118,6 +123,7 @@ public TaskStatus(
         this.outputBufferStatus = requireNonNull(outputBufferStatus, "outputBufferStatus is null");
         this.outputDataSize = requireNonNull(outputDataSize, "outputDataSize is null");
 
+        this.writerInputDataSize = requireNonNull(writerInputDataSize, "writerInputDataSize is null");
         this.physicalWrittenDataSize = requireNonNull(physicalWrittenDataSize, "physicalWrittenDataSize is null");
         this.maxWriterCount = requireNonNull(maxWriterCount, "maxWriterCount is null");
 
@@ -169,6 +175,12 @@ public String getNodeId()
         return nodeId;
     }
 
+    @JsonProperty
+    public boolean isSpeculative()
+    {
+        return speculative;
+    }
+
     @JsonProperty
     public List<ExecutionFailureInfo> getFailures()
     {
@@ -187,6 +199,12 @@ public int getRunningPartitionedDrivers()
         return runningPartitionedDrivers;
     }
 
+    @JsonProperty
+    public DataSize getWriterInputDataSize()
+    {
+        return writerInputDataSize;
+    }
+
     @JsonProperty
     public DataSize getPhysicalWrittenDataSize()
     {
@@ -268,7 +286,7 @@ public String toString()
                 .toString();
     }
 
-    public static TaskStatus initialTaskStatus(TaskId taskId, URI location, String nodeId)
+    public static TaskStatus initialTaskStatus(TaskId taskId, URI location, String nodeId, boolean speculative)
     {
         return new TaskStatus(
                 taskId,
@@ -277,12 +295,14 @@ public static TaskStatus initialTaskStatus(TaskId taskId, URI location, String n
                 PLANNED,
                 location,
                 nodeId,
+                speculative,
                 ImmutableList.of(),
                 0,
                 0,
                 OutputBufferStatus.initial(),
                 DataSize.ofBytes(0),
                 DataSize.ofBytes(0),
+                DataSize.ofBytes(0),
                 Optional.empty(),
                 DataSize.ofBytes(0),
                 DataSize.ofBytes(0),
@@ -303,11 +323,13 @@ public static TaskStatus failWith(TaskStatus taskStatus, TaskState state, List<E
                 state,
                 taskStatus.getSelf(),
                 taskStatus.getNodeId(),
+                false,
                 exceptions,
                 taskStatus.getQueuedPartitionedDrivers(),
                 taskStatus.getRunningPartitionedDrivers(),
                 taskStatus.getOutputBufferStatus(),
                 taskStatus.getOutputDataSize(),
+                taskStatus.getWriterInputDataSize(),
                 taskStatus.getPhysicalWrittenDataSize(),
                 taskStatus.getMaxWriterCount(),
                 taskStatus.getMemoryReservation(),
diff --git a/core/trino-main/src/main/java/io/trino/execution/TruncateTableTask.java b/core/trino-main/src/main/java/io/trino/execution/TruncateTableTask.java
index f5ed8e86eb60..1219cc857612 100644
--- a/core/trino-main/src/main/java/io/trino/execution/TruncateTableTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/TruncateTableTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -23,8 +24,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.TruncateTable;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateFuture;
diff --git a/core/trino-main/src/main/java/io/trino/execution/UseTask.java b/core/trino-main/src/main/java/io/trino/execution/UseTask.java
index fae97106c45b..6d0158e746e5 100644
--- a/core/trino-main/src/main/java/io/trino/execution/UseTask.java
+++ b/core/trino-main/src/main/java/io/trino/execution/UseTask.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
@@ -26,8 +27,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.Use;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
diff --git a/core/trino-main/src/main/java/io/trino/execution/buffer/ArbitraryOutputBuffer.java b/core/trino-main/src/main/java/io/trino/execution/buffer/ArbitraryOutputBuffer.java
index c38123a7164a..9ec5805f5c21 100644
--- a/core/trino-main/src/main/java/io/trino/execution/buffer/ArbitraryOutputBuffer.java
+++ b/core/trino-main/src/main/java/io/trino/execution/buffer/ArbitraryOutputBuffer.java
@@ -18,6 +18,8 @@
 import com.google.common.collect.Sets;
 import com.google.common.collect.Sets.SetView;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.slice.Slice;
 import io.airlift.units.DataSize;
 import io.trino.execution.StateMachine.StateChangeListener;
@@ -27,9 +29,6 @@
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.plugin.base.metrics.TDigestHistogram;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/core/trino-main/src/main/java/io/trino/execution/buffer/BroadcastOutputBuffer.java b/core/trino-main/src/main/java/io/trino/execution/buffer/BroadcastOutputBuffer.java
index 1b857e2780ca..aecbc8454f9e 100644
--- a/core/trino-main/src/main/java/io/trino/execution/buffer/BroadcastOutputBuffer.java
+++ b/core/trino-main/src/main/java/io/trino/execution/buffer/BroadcastOutputBuffer.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.Sets;
 import com.google.common.collect.Sets.SetView;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.slice.Slice;
 import io.airlift.units.DataSize;
 import io.trino.execution.StateMachine.StateChangeListener;
@@ -26,8 +27,6 @@
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.plugin.base.metrics.TDigestHistogram;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/execution/buffer/ClientBuffer.java b/core/trino-main/src/main/java/io/trino/execution/buffer/ClientBuffer.java
index f3a0fd1c1529..9566bf04c331 100644
--- a/core/trino-main/src/main/java/io/trino/execution/buffer/ClientBuffer.java
+++ b/core/trino-main/src/main/java/io/trino/execution/buffer/ClientBuffer.java
@@ -16,15 +16,14 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.Immutable;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.slice.Slice;
 import io.airlift.units.DataSize;
 import io.trino.execution.buffer.PipelinedOutputBuffers.OutputBufferId;
 import io.trino.execution.buffer.SerializedPageReference.PagesReleasedListener;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.Immutable;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/core/trino-main/src/main/java/io/trino/execution/buffer/LazyOutputBuffer.java b/core/trino-main/src/main/java/io/trino/execution/buffer/LazyOutputBuffer.java
index 173e76756dd3..bf4885d4d012 100644
--- a/core/trino-main/src/main/java/io/trino/execution/buffer/LazyOutputBuffer.java
+++ b/core/trino-main/src/main/java/io/trino/execution/buffer/LazyOutputBuffer.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.slice.Slice;
 import io.airlift.units.DataSize;
 import io.trino.exchange.ExchangeManagerRegistry;
@@ -27,9 +28,7 @@
 import io.trino.spi.exchange.ExchangeManager;
 import io.trino.spi.exchange.ExchangeSink;
 import io.trino.spi.exchange.ExchangeSinkInstanceHandle;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
+import jakarta.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/core/trino-main/src/main/java/io/trino/execution/buffer/OutputBufferMemoryManager.java b/core/trino-main/src/main/java/io/trino/execution/buffer/OutputBufferMemoryManager.java
index c06b4b41e8ce..04ecb522df98 100644
--- a/core/trino-main/src/main/java/io/trino/execution/buffer/OutputBufferMemoryManager.java
+++ b/core/trino-main/src/main/java/io/trino/execution/buffer/OutputBufferMemoryManager.java
@@ -18,12 +18,11 @@
 import com.google.common.base.Ticker;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.stats.TDigest;
 import io.trino.memory.context.LocalMemoryContext;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/core/trino-main/src/main/java/io/trino/execution/buffer/PageDeserializer.java b/core/trino-main/src/main/java/io/trino/execution/buffer/PageDeserializer.java
index 60c96879d8fe..062396000d24 100644
--- a/core/trino-main/src/main/java/io/trino/execution/buffer/PageDeserializer.java
+++ b/core/trino-main/src/main/java/io/trino/execution/buffer/PageDeserializer.java
@@ -238,6 +238,76 @@ public void readBytes(byte[] destination, int destinationIndex, int length)
             }
         }
 
+        @Override
+        public void readShorts(short[] destination, int destinationIndex, int length)
+        {
+            ReadBuffer buffer = buffers[0];
+            int shortsRemaining = length;
+            while (shortsRemaining > 0) {
+                ensureReadable(min(Long.BYTES, shortsRemaining * Short.BYTES));
+                int shortsToRead = min(shortsRemaining, buffer.available() / Short.BYTES);
+                buffer.readShorts(destination, destinationIndex, shortsToRead);
+                shortsRemaining -= shortsToRead;
+                destinationIndex += shortsToRead;
+            }
+        }
+
+        @Override
+        public void readInts(int[] destination, int destinationIndex, int length)
+        {
+            ReadBuffer buffer = buffers[0];
+            int intsRemaining = length;
+            while (intsRemaining > 0) {
+                ensureReadable(min(Long.BYTES, intsRemaining * Integer.BYTES));
+                int intsToRead = min(intsRemaining, buffer.available() / Integer.BYTES);
+                buffer.readInts(destination, destinationIndex, intsToRead);
+                intsRemaining -= intsToRead;
+                destinationIndex += intsToRead;
+            }
+        }
+
+        @Override
+        public void readLongs(long[] destination, int destinationIndex, int length)
+        {
+            ReadBuffer buffer = buffers[0];
+            int longsRemaining = length;
+            while (longsRemaining > 0) {
+                ensureReadable(min(Long.BYTES, longsRemaining * Long.BYTES));
+                int longsToRead = min(longsRemaining, buffer.available() / Long.BYTES);
+                buffer.readLongs(destination, destinationIndex, longsToRead);
+                longsRemaining -= longsToRead;
+                destinationIndex += longsToRead;
+            }
+        }
+
+        @Override
+        public void readFloats(float[] destination, int destinationIndex, int length)
+        {
+            ReadBuffer buffer = buffers[0];
+            int floatsRemaining = length;
+            while (floatsRemaining > 0) {
+                ensureReadable(min(Long.BYTES, floatsRemaining * Float.BYTES));
+                int floatsToRead = min(floatsRemaining, buffer.available() / Float.BYTES);
+                buffer.readFloats(destination, destinationIndex, floatsToRead);
+                floatsRemaining -= floatsToRead;
+                destinationIndex += floatsToRead;
+            }
+        }
+
+        @Override
+        public void readDoubles(double[] destination, int destinationIndex, int length)
+        {
+            ReadBuffer buffer = buffers[0];
+            int doublesRemaining = length;
+            while (doublesRemaining > 0) {
+                ensureReadable(min(Long.BYTES, doublesRemaining * Double.BYTES));
+                int doublesToRead = min(doublesRemaining, buffer.available() / Double.BYTES);
+                buffer.readDoubles(destination, destinationIndex, doublesToRead);
+                doublesRemaining -= doublesToRead;
+                destinationIndex += doublesToRead;
+            }
+        }
+
         @Override
         public void readBytes(Slice destination, int destinationIndex, int length)
         {
@@ -469,7 +539,6 @@ private static class ReadBuffer
         public ReadBuffer(Slice slice)
         {
             requireNonNull(slice, "slice is null");
-            checkArgument(slice.hasByteArray(), "slice is expected to be based on a byte array");
             this.slice = slice;
             limit = slice.length();
         }
@@ -572,6 +641,36 @@ public void readBytes(byte[] destination, int destinationIndex, int length)
             position += length;
         }
 
+        public void readShorts(short[] destination, int destinationIndex, int length)
+        {
+            slice.getShorts(position, destination, destinationIndex, length);
+            position += length * Short.BYTES;
+        }
+
+        public void readInts(int[] destination, int destinationIndex, int length)
+        {
+            slice.getInts(position, destination, destinationIndex, length);
+            position += length * Integer.BYTES;
+        }
+
+        public void readLongs(long[] destination, int destinationIndex, int length)
+        {
+            slice.getLongs(position, destination, destinationIndex, length);
+            position += length * Long.BYTES;
+        }
+
+        public void readFloats(float[] destination, int destinationIndex, int length)
+        {
+            slice.getFloats(position, destination, destinationIndex, length);
+            position += length * Float.BYTES;
+        }
+
+        public void readDoubles(double[] destination, int destinationIndex, int length)
+        {
+            slice.getDoubles(position, destination, destinationIndex, length);
+            position += length * Double.BYTES;
+        }
+
         public void readBytes(Slice destination, int destinationIndex, int length)
         {
             slice.getBytes(position, destination, destinationIndex, length);
diff --git a/core/trino-main/src/main/java/io/trino/execution/buffer/PageSerializer.java b/core/trino-main/src/main/java/io/trino/execution/buffer/PageSerializer.java
index 6f43faed87aa..31a3a62c35b1 100644
--- a/core/trino-main/src/main/java/io/trino/execution/buffer/PageSerializer.java
+++ b/core/trino-main/src/main/java/io/trino/execution/buffer/PageSerializer.java
@@ -243,6 +243,91 @@ public void writeBytes(byte[] source, int sourceIndex, int length)
             uncompressedSize += length;
         }
 
+        @Override
+        public void writeShorts(short[] source, int sourceIndex, int length)
+        {
+            WriteBuffer buffer = buffers[0];
+            int currentIndex = sourceIndex;
+            int shortsRemaining = length;
+            while (shortsRemaining > 0) {
+                ensureCapacityFor(min(Long.BYTES, shortsRemaining * Short.BYTES));
+                int bufferCapacity = buffer.remainingCapacity();
+                int shortsToCopy = min(shortsRemaining, bufferCapacity / Short.BYTES);
+                buffer.writeShorts(source, currentIndex, shortsToCopy);
+                currentIndex += shortsToCopy;
+                shortsRemaining -= shortsToCopy;
+            }
+            uncompressedSize += length * Short.BYTES;
+        }
+
+        @Override
+        public void writeInts(int[] source, int sourceIndex, int length)
+        {
+            WriteBuffer buffer = buffers[0];
+            int currentIndex = sourceIndex;
+            int intsRemaining = length;
+            while (intsRemaining > 0) {
+                ensureCapacityFor(min(Long.BYTES, intsRemaining * Integer.BYTES));
+                int bufferCapacity = buffer.remainingCapacity();
+                int intsToCopy = min(intsRemaining, bufferCapacity / Integer.BYTES);
+                buffer.writeInts(source, currentIndex, intsToCopy);
+                currentIndex += intsToCopy;
+                intsRemaining -= intsToCopy;
+            }
+            uncompressedSize += length * Integer.BYTES;
+        }
+
+        @Override
+        public void writeLongs(long[] source, int sourceIndex, int length)
+        {
+            WriteBuffer buffer = buffers[0];
+            int currentIndex = sourceIndex;
+            int longsRemaining = length;
+            while (longsRemaining > 0) {
+                ensureCapacityFor(min(Long.BYTES, longsRemaining * Long.BYTES));
+                int bufferCapacity = buffer.remainingCapacity();
+                int longsToCopy = min(longsRemaining, bufferCapacity / Long.BYTES);
+                buffer.writeLongs(source, currentIndex, longsToCopy);
+                currentIndex += longsToCopy;
+                longsRemaining -= longsToCopy;
+            }
+            uncompressedSize += length * Long.BYTES;
+        }
+
+        @Override
+        public void writeFloats(float[] source, int sourceIndex, int length)
+        {
+            WriteBuffer buffer = buffers[0];
+            int currentIndex = sourceIndex;
+            int floatsRemaining = length;
+            while (floatsRemaining > 0) {
+                ensureCapacityFor(min(Long.BYTES, floatsRemaining * Float.BYTES));
+                int bufferCapacity = buffer.remainingCapacity();
+                int floatsToCopy = min(floatsRemaining, bufferCapacity / Float.BYTES);
+                buffer.writeFloats(source, currentIndex, floatsToCopy);
+                currentIndex += floatsToCopy;
+                floatsRemaining -= floatsToCopy;
+            }
+            uncompressedSize += length * Float.BYTES;
+        }
+
+        @Override
+        public void writeDoubles(double[] source, int sourceIndex, int length)
+        {
+            WriteBuffer buffer = buffers[0];
+            int currentIndex = sourceIndex;
+            int doublesRemaining = length;
+            while (doublesRemaining > 0) {
+                ensureCapacityFor(min(Long.BYTES, doublesRemaining * Double.BYTES));
+                int bufferCapacity = buffer.remainingCapacity();
+                int doublesToCopy = min(doublesRemaining, bufferCapacity / Double.BYTES);
+                buffer.writeDoubles(source, currentIndex, doublesToCopy);
+                currentIndex += doublesToCopy;
+                doublesRemaining -= doublesToCopy;
+            }
+            uncompressedSize += length * Double.BYTES;
+        }
+
         public Slice closePage()
         {
             compress();
@@ -257,7 +342,7 @@ public Slice closePage()
 
             Slice page;
             if (serializedPageSize < slice.length() / 2) {
-                page = Slices.copyOf(slice, 0, serializedPageSize);
+                page = slice.copy(0, serializedPageSize);
             }
             else {
                 page = slice.slice(0, serializedPageSize);
@@ -589,6 +674,36 @@ public void writeBytes(byte[] source, int sourceIndex, int length)
             position += length;
         }
 
+        public void writeShorts(short[] source, int sourceIndex, int length)
+        {
+            slice.setShorts(position, source, sourceIndex, length);
+            position += length * Short.BYTES;
+        }
+
+        public void writeInts(int[] source, int sourceIndex, int length)
+        {
+            slice.setInts(position, source, sourceIndex, length);
+            position += length * Integer.BYTES;
+        }
+
+        public void writeLongs(long[] source, int sourceIndex, int length)
+        {
+            slice.setLongs(position, source, sourceIndex, length);
+            position += length * Long.BYTES;
+        }
+
+        public void writeFloats(float[] source, int sourceIndex, int length)
+        {
+            slice.setFloats(position, source, sourceIndex, length);
+            position += length * Float.BYTES;
+        }
+
+        public void writeDoubles(double[] source, int sourceIndex, int length)
+        {
+            slice.setDoubles(position, source, sourceIndex, length);
+            position += length * Double.BYTES;
+        }
+
         public void skip(int length)
         {
             position += length;
diff --git a/core/trino-main/src/main/java/io/trino/execution/buffer/PagesSerdeUtil.java b/core/trino-main/src/main/java/io/trino/execution/buffer/PagesSerdeUtil.java
index 2d5cab6e6150..925135291931 100644
--- a/core/trino-main/src/main/java/io/trino/execution/buffer/PagesSerdeUtil.java
+++ b/core/trino-main/src/main/java/io/trino/execution/buffer/PagesSerdeUtil.java
@@ -34,7 +34,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.io.ByteStreams.readFully;
-import static io.airlift.slice.UnsafeSlice.getIntUnchecked;
 import static io.trino.block.BlockSerdeUtil.readBlock;
 import static io.trino.block.BlockSerdeUtil.writeBlock;
 import static io.trino.execution.buffer.PageCodecMarker.COMPRESSED;
@@ -121,6 +120,11 @@ public static int getSerializedPagePositionCount(Slice serializedPage)
         return serializedPage.getInt(SERIALIZED_PAGE_POSITION_COUNT_OFFSET);
     }
 
+    public static int getSerializedPageUncompressedSizeInBytes(Slice serializedPage)
+    {
+        return serializedPage.getInt(SERIALIZED_PAGE_UNCOMPRESSED_SIZE_OFFSET);
+    }
+
     public static boolean isSerializedPageEncrypted(Slice serializedPage)
     {
         return getSerializedPageMarkerSet(serializedPage).contains(ENCRYPTED);
@@ -212,7 +216,7 @@ public static Slice readSerializedPage(Slice headerSlice, InputStream inputStrea
     {
         checkArgument(headerSlice.length() == SERIALIZED_PAGE_HEADER_SIZE, "headerSlice length should equal to %s", SERIALIZED_PAGE_HEADER_SIZE);
 
-        int compressedSize = getIntUnchecked(headerSlice, SERIALIZED_PAGE_COMPRESSED_SIZE_OFFSET);
+        int compressedSize = headerSlice.getIntUnchecked(SERIALIZED_PAGE_COMPRESSED_SIZE_OFFSET);
         byte[] outputBuffer = new byte[SERIALIZED_PAGE_HEADER_SIZE + compressedSize];
         headerSlice.getBytes(0, outputBuffer, 0, SERIALIZED_PAGE_HEADER_SIZE);
         readFully(inputStream, outputBuffer, SERIALIZED_PAGE_HEADER_SIZE, compressedSize);
diff --git a/core/trino-main/src/main/java/io/trino/execution/buffer/SerializedPageReference.java b/core/trino-main/src/main/java/io/trino/execution/buffer/SerializedPageReference.java
index 51d7cc939f31..b3551a69e2c3 100644
--- a/core/trino-main/src/main/java/io/trino/execution/buffer/SerializedPageReference.java
+++ b/core/trino-main/src/main/java/io/trino/execution/buffer/SerializedPageReference.java
@@ -13,10 +13,9 @@
  */
 package io.trino.execution.buffer;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.slice.Slice;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.List;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/buffer/SpoolingExchangeOutputBuffer.java b/core/trino-main/src/main/java/io/trino/execution/buffer/SpoolingExchangeOutputBuffer.java
index f1864ed9fa07..0ceadee2e631 100644
--- a/core/trino-main/src/main/java/io/trino/execution/buffer/SpoolingExchangeOutputBuffer.java
+++ b/core/trino-main/src/main/java/io/trino/execution/buffer/SpoolingExchangeOutputBuffer.java
@@ -14,6 +14,7 @@
 package io.trino.execution.buffer;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
 import io.airlift.units.DataSize;
@@ -21,8 +22,6 @@
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.spi.exchange.ExchangeSink;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
@@ -32,6 +31,7 @@
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
 import static io.airlift.concurrent.MoreFutures.toListenableFuture;
 import static io.trino.execution.buffer.PagesSerdeUtil.getSerializedPagePositionCount;
+import static io.trino.execution.buffer.PagesSerdeUtil.getSerializedPageUncompressedSizeInBytes;
 import static java.util.Objects.requireNonNull;
 
 @ThreadSafe
@@ -193,7 +193,7 @@ public void enqueue(int partition, List<Slice> pages)
         checkState(sink != null, "exchangeSink is null");
         long dataSizeInBytes = 0;
         for (Slice page : pages) {
-            dataSizeInBytes += page.length();
+            dataSizeInBytes += getSerializedPageUncompressedSizeInBytes(page);
             sink.add(partition, page);
             totalRowsAdded.addAndGet(getSerializedPagePositionCount(page));
         }
diff --git a/core/trino-main/src/main/java/io/trino/execution/buffer/SpoolingOutputStats.java b/core/trino-main/src/main/java/io/trino/execution/buffer/SpoolingOutputStats.java
index 32c51a7928eb..aff307fc5b32 100644
--- a/core/trino-main/src/main/java/io/trino/execution/buffer/SpoolingOutputStats.java
+++ b/core/trino-main/src/main/java/io/trino/execution/buffer/SpoolingOutputStats.java
@@ -15,11 +15,10 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLongArray;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/RunningSplitInfo.java b/core/trino-main/src/main/java/io/trino/execution/executor/RunningSplitInfo.java
new file mode 100644
index 000000000000..6669d7ef597b
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/RunningSplitInfo.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed 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 io.trino.execution.executor;
+
+import com.google.common.collect.ComparisonChain;
+import io.trino.execution.TaskId;
+
+import java.util.function.Supplier;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * A class representing a split that is running on the TaskRunner.
+ * It has a Thread object that gets assigned while assigning the split
+ * to the taskRunner. However, when the TaskRunner moves to a different split,
+ * the thread stored here will not remain assigned to this split anymore.
+ */
+public class RunningSplitInfo
+        implements Comparable<RunningSplitInfo>
+{
+    private final long startTime;
+    private final String threadId;
+    private final Thread thread;
+    private boolean printed;
+    private final TaskId taskId;
+    private final Supplier<String> splitInfo;
+
+    public RunningSplitInfo(long startTime, String threadId, Thread thread, TaskId taskId, Supplier<String> splitInfo)
+    {
+        this.startTime = startTime;
+        this.threadId = requireNonNull(threadId, "threadId is null");
+        this.thread = requireNonNull(thread, "thread is null");
+        this.taskId = requireNonNull(taskId, "taskId is null");
+        this.splitInfo = requireNonNull(splitInfo, "split is null");
+        this.printed = false;
+    }
+
+    public long getStartTime()
+    {
+        return startTime;
+    }
+
+    public String getThreadId()
+    {
+        return threadId;
+    }
+
+    public Thread getThread()
+    {
+        return thread;
+    }
+
+    public TaskId getTaskId()
+    {
+        return taskId;
+    }
+
+    /**
+     * {@link PrioritizedSplitRunner#getInfo()} provides runtime statistics for the split (such as total cpu utilization so far).
+     * A value returned from this method changes over time and cannot be cached as a field of {@link RunningSplitInfo}.
+     *
+     * @return Formatted string containing runtime statistics for the split.
+     */
+    public String getSplitInfo()
+    {
+        return splitInfo.get();
+    }
+
+    public boolean isPrinted()
+    {
+        return printed;
+    }
+
+    public void setPrinted()
+    {
+        printed = true;
+    }
+
+    @Override
+    public int compareTo(RunningSplitInfo o)
+    {
+        return ComparisonChain.start()
+                .compare(startTime, o.getStartTime())
+                .compare(threadId, o.getThreadId())
+                .result();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/TaskExecutor.java b/core/trino-main/src/main/java/io/trino/execution/executor/TaskExecutor.java
index c501e223ccfc..d9ddc32772be 100644
--- a/core/trino-main/src/main/java/io/trino/execution/executor/TaskExecutor.java
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/TaskExecutor.java
@@ -13,982 +13,33 @@
  */
 package io.trino.execution.executor;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Ticker;
-import com.google.common.collect.ComparisonChain;
 import com.google.common.util.concurrent.ListenableFuture;
-import io.airlift.concurrent.SetThreadName;
-import io.airlift.concurrent.ThreadPoolExecutorMBean;
-import io.airlift.log.Logger;
-import io.airlift.stats.CounterStat;
-import io.airlift.stats.DistributionStat;
-import io.airlift.stats.TimeDistribution;
-import io.airlift.stats.TimeStat;
 import io.airlift.units.Duration;
 import io.trino.execution.SplitRunner;
 import io.trino.execution.TaskId;
-import io.trino.execution.TaskManagerConfig;
-import io.trino.spi.TrinoException;
-import io.trino.spi.VersionEmbedder;
-import org.weakref.jmx.Managed;
-import org.weakref.jmx.Nested;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.OptionalInt;
 import java.util.Set;
-import java.util.SortedSet;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicLongArray;
 import java.util.function.DoubleSupplier;
 import java.util.function.Predicate;
 
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.common.collect.Sets.newConcurrentHashSet;
-import static io.airlift.concurrent.Threads.daemonThreadsNamed;
-import static io.airlift.concurrent.Threads.threadsNamed;
-import static io.trino.execution.executor.MultilevelSplitQueue.computeLevel;
-import static io.trino.version.EmbedVersion.testingVersionEmbedder;
-import static java.lang.Math.min;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.Executors.newCachedThreadPool;
-import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
-import static java.util.concurrent.TimeUnit.MICROSECONDS;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
-
-@ThreadSafe
-public class TaskExecutor
+public interface TaskExecutor
 {
-    private static final Logger log = Logger.get(TaskExecutor.class);
-    private static final AtomicLong NEXT_RUNNER_ID = new AtomicLong();
-
-    private final ExecutorService executor;
-    private final ThreadPoolExecutorMBean executorMBean;
-
-    private final int runnerThreads;
-    private final int minimumNumberOfDrivers;
-    private final int guaranteedNumberOfDriversPerTask;
-    private final int maximumNumberOfDriversPerTask;
-    private final VersionEmbedder versionEmbedder;
-
-    private final Ticker ticker;
-
-    private final Duration stuckSplitsWarningThreshold;
-    private final ScheduledExecutorService splitMonitorExecutor = newSingleThreadScheduledExecutor(daemonThreadsNamed("TaskExecutor"));
-    private final SortedSet<RunningSplitInfo> runningSplitInfos = new ConcurrentSkipListSet<>();
-
-    @GuardedBy("this")
-    private final List<TaskHandle> tasks;
-
-    /**
-     * All splits registered with the task executor.
-     */
-    @GuardedBy("this")
-    private final Set<PrioritizedSplitRunner> allSplits = new HashSet<>();
-
-    /**
-     * Intermediate splits (i.e. splits that should not be queued).
-     */
-    @GuardedBy("this")
-    private final Set<PrioritizedSplitRunner> intermediateSplits = new HashSet<>();
-
-    /**
-     * Splits waiting for a runner thread.
-     */
-    private final MultilevelSplitQueue waitingSplits;
-
-    /**
-     * Splits running on a thread.
-     */
-    private final Set<PrioritizedSplitRunner> runningSplits = newConcurrentHashSet();
-
-    /**
-     * Splits blocked by the driver.
-     */
-    private final Map<PrioritizedSplitRunner, Future<Void>> blockedSplits = new ConcurrentHashMap<>();
-
-    private final AtomicLongArray completedTasksPerLevel = new AtomicLongArray(5);
-    private final AtomicLongArray completedSplitsPerLevel = new AtomicLongArray(5);
-
-    private final TimeStat splitQueuedTime = new TimeStat(NANOSECONDS);
-    private final TimeStat splitWallTime = new TimeStat(NANOSECONDS);
-
-    private final TimeDistribution leafSplitWallTime = new TimeDistribution(MICROSECONDS);
-    private final TimeDistribution intermediateSplitWallTime = new TimeDistribution(MICROSECONDS);
-
-    private final TimeDistribution leafSplitScheduledTime = new TimeDistribution(MICROSECONDS);
-    private final TimeDistribution intermediateSplitScheduledTime = new TimeDistribution(MICROSECONDS);
-
-    private final TimeDistribution leafSplitWaitTime = new TimeDistribution(MICROSECONDS);
-    private final TimeDistribution intermediateSplitWaitTime = new TimeDistribution(MICROSECONDS);
-
-    private final TimeDistribution leafSplitCpuTime = new TimeDistribution(MICROSECONDS);
-    private final TimeDistribution intermediateSplitCpuTime = new TimeDistribution(MICROSECONDS);
-
-    // shared between SplitRunners
-    private final CounterStat globalCpuTimeMicros = new CounterStat();
-    private final CounterStat globalScheduledTimeMicros = new CounterStat();
-
-    private final TimeStat blockedQuantaWallTime = new TimeStat(MICROSECONDS);
-    private final TimeStat unblockedQuantaWallTime = new TimeStat(MICROSECONDS);
-
-    private final DistributionStat leafSplitsSize = new DistributionStat();
-    @GuardedBy("this")
-    private long lastLeafSplitsSizeRecordTime;
-    @GuardedBy("this")
-    private long lastLeafSplitsSize;
-
-    private volatile boolean closed;
-
-    @Inject
-    public TaskExecutor(TaskManagerConfig config, VersionEmbedder versionEmbedder, MultilevelSplitQueue splitQueue)
-    {
-        this(
-                config.getMaxWorkerThreads(),
-                config.getMinDrivers(),
-                config.getMinDriversPerTask(),
-                config.getMaxDriversPerTask(),
-                config.getInterruptStuckSplitTasksWarningThreshold(),
-                versionEmbedder,
-                splitQueue,
-                Ticker.systemTicker());
-    }
-
-    @VisibleForTesting
-    public TaskExecutor(int runnerThreads, int minDrivers, int guaranteedNumberOfDriversPerTask, int maximumNumberOfDriversPerTask, Ticker ticker)
-    {
-        this(runnerThreads, minDrivers, guaranteedNumberOfDriversPerTask, maximumNumberOfDriversPerTask, new Duration(10, TimeUnit.MINUTES), testingVersionEmbedder(), new MultilevelSplitQueue(2), ticker);
-    }
-
-    @VisibleForTesting
-    public TaskExecutor(int runnerThreads, int minDrivers, int guaranteedNumberOfDriversPerTask, int maximumNumberOfDriversPerTask, MultilevelSplitQueue splitQueue, Ticker ticker)
-    {
-        this(runnerThreads, minDrivers, guaranteedNumberOfDriversPerTask, maximumNumberOfDriversPerTask, new Duration(10, TimeUnit.MINUTES), testingVersionEmbedder(), splitQueue, ticker);
-    }
-
-    @VisibleForTesting
-    public TaskExecutor(
-            int runnerThreads,
-            int minDrivers,
-            int guaranteedNumberOfDriversPerTask,
-            int maximumNumberOfDriversPerTask,
-            Duration stuckSplitsWarningThreshold,
-            VersionEmbedder versionEmbedder,
-            MultilevelSplitQueue splitQueue,
-            Ticker ticker)
-    {
-        checkArgument(runnerThreads > 0, "runnerThreads must be at least 1");
-        checkArgument(guaranteedNumberOfDriversPerTask > 0, "guaranteedNumberOfDriversPerTask must be at least 1");
-        checkArgument(maximumNumberOfDriversPerTask > 0, "maximumNumberOfDriversPerTask must be at least 1");
-        checkArgument(guaranteedNumberOfDriversPerTask <= maximumNumberOfDriversPerTask, "guaranteedNumberOfDriversPerTask cannot be greater than maximumNumberOfDriversPerTask");
-
-        // we manage thread pool size directly, so create an unlimited pool
-        this.executor = newCachedThreadPool(threadsNamed("task-processor-%s"));
-        this.executorMBean = new ThreadPoolExecutorMBean((ThreadPoolExecutor) executor);
-        this.runnerThreads = runnerThreads;
-        this.versionEmbedder = requireNonNull(versionEmbedder, "versionEmbedder is null");
-
-        this.ticker = requireNonNull(ticker, "ticker is null");
-        this.stuckSplitsWarningThreshold = requireNonNull(stuckSplitsWarningThreshold, "stuckSplitsWarningThreshold is null");
-
-        this.minimumNumberOfDrivers = minDrivers;
-        this.guaranteedNumberOfDriversPerTask = guaranteedNumberOfDriversPerTask;
-        this.maximumNumberOfDriversPerTask = maximumNumberOfDriversPerTask;
-        this.waitingSplits = requireNonNull(splitQueue, "splitQueue is null");
-        this.tasks = new LinkedList<>();
-        this.lastLeafSplitsSizeRecordTime = ticker.read();
-    }
-
-    @PostConstruct
-    public synchronized void start()
-    {
-        checkState(!closed, "TaskExecutor is closed");
-        for (int i = 0; i < runnerThreads; i++) {
-            addRunnerThread();
-        }
-    }
-
-    @PreDestroy
-    public synchronized void stop()
-    {
-        closed = true;
-        executor.shutdownNow();
-        splitMonitorExecutor.shutdownNow();
-    }
-
-    @Override
-    public synchronized String toString()
-    {
-        return toStringHelper(this)
-                .add("runnerThreads", runnerThreads)
-                .add("allSplits", allSplits.size())
-                .add("intermediateSplits", intermediateSplits.size())
-                .add("waitingSplits", waitingSplits.size())
-                .add("runningSplits", runningSplits.size())
-                .add("blockedSplits", blockedSplits.size())
-                .toString();
-    }
-
-    private synchronized void addRunnerThread()
-    {
-        try {
-            executor.execute(versionEmbedder.embedVersion(new TaskRunner()));
-        }
-        catch (RejectedExecutionException ignored) {
-        }
-    }
-
-    public synchronized TaskHandle addTask(
+    TaskHandle addTask(
             TaskId taskId,
             DoubleSupplier utilizationSupplier,
             int initialSplitConcurrency,
             Duration splitConcurrencyAdjustFrequency,
-            OptionalInt maxDriversPerTask)
-    {
-        requireNonNull(taskId, "taskId is null");
-        requireNonNull(utilizationSupplier, "utilizationSupplier is null");
-        checkArgument(maxDriversPerTask.isEmpty() || maxDriversPerTask.getAsInt() <= maximumNumberOfDriversPerTask,
-                "maxDriversPerTask cannot be greater than the configured value");
-
-        log.debug("Task scheduled %s", taskId);
-
-        TaskHandle taskHandle = new TaskHandle(taskId, waitingSplits, utilizationSupplier, initialSplitConcurrency, splitConcurrencyAdjustFrequency, maxDriversPerTask);
-
-        tasks.add(taskHandle);
-        return taskHandle;
-    }
-
-    public void removeTask(TaskHandle taskHandle)
-    {
-        try (SetThreadName ignored = new SetThreadName("Task-%s", taskHandle.getTaskId())) {
-            // Skip additional scheduling if the task was already destroyed
-            if (!doRemoveTask(taskHandle)) {
-                return;
-            }
-        }
-
-        // replace blocked splits that were terminated
-        synchronized (this) {
-            addNewEntrants();
-            recordLeafSplitsSize();
-        }
-    }
-
-    /**
-     * Returns <code>true</code> if the task handle was destroyed and removed splits as a result that may need to be replaced. Otherwise,
-     * if the {@link TaskHandle} was already destroyed or no splits were removed then this method returns <code>false</code> and no additional
-     * splits need to be scheduled.
-     */
-    private boolean doRemoveTask(TaskHandle taskHandle)
-    {
-        List<PrioritizedSplitRunner> splits;
-        synchronized (this) {
-            tasks.remove(taskHandle);
-
-            // Task is already destroyed
-            if (taskHandle.isDestroyed()) {
-                return false;
-            }
-
-            splits = taskHandle.destroy();
-            // stop tracking splits (especially blocked splits which may never unblock)
-            allSplits.removeAll(splits);
-            intermediateSplits.removeAll(splits);
-            blockedSplits.keySet().removeAll(splits);
-            waitingSplits.removeAll(splits);
-            recordLeafSplitsSize();
-        }
-
-        // call destroy outside of synchronized block as it is expensive and doesn't need a lock on the task executor
-        for (PrioritizedSplitRunner split : splits) {
-            split.destroy();
-        }
-
-        // record completed stats
-        long threadUsageNanos = taskHandle.getScheduledNanos();
-        completedTasksPerLevel.incrementAndGet(computeLevel(threadUsageNanos));
-
-        log.debug("Task finished or failed %s", taskHandle.getTaskId());
-        return !splits.isEmpty();
-    }
-
-    public List<ListenableFuture<Void>> enqueueSplits(TaskHandle taskHandle, boolean intermediate, List<? extends SplitRunner> taskSplits)
-    {
-        List<PrioritizedSplitRunner> splitsToDestroy = new ArrayList<>();
-        List<ListenableFuture<Void>> finishedFutures = new ArrayList<>(taskSplits.size());
-        synchronized (this) {
-            for (SplitRunner taskSplit : taskSplits) {
-                PrioritizedSplitRunner prioritizedSplitRunner = new PrioritizedSplitRunner(
-                        taskHandle,
-                        taskSplit,
-                        ticker,
-                        globalCpuTimeMicros,
-                        globalScheduledTimeMicros,
-                        blockedQuantaWallTime,
-                        unblockedQuantaWallTime);
-
-                if (intermediate) {
-                    // add the runner to the handle so it can be destroyed if the task is canceled
-                    if (taskHandle.recordIntermediateSplit(prioritizedSplitRunner)) {
-                        // Note: we do not record queued time for intermediate splits
-                        startIntermediateSplit(prioritizedSplitRunner);
-                    }
-                    else {
-                        splitsToDestroy.add(prioritizedSplitRunner);
-                    }
-                }
-                else {
-                    // add this to the work queue for the task
-                    if (taskHandle.enqueueSplit(prioritizedSplitRunner)) {
-                        // if task is under the limit for guaranteed splits, start one
-                        scheduleTaskIfNecessary(taskHandle);
-                        // if globally we have more resources, start more
-                        addNewEntrants();
-                    }
-                    else {
-                        splitsToDestroy.add(prioritizedSplitRunner);
-                    }
-                }
-
-                finishedFutures.add(prioritizedSplitRunner.getFinishedFuture());
-            }
-            recordLeafSplitsSize();
-        }
-        for (PrioritizedSplitRunner split : splitsToDestroy) {
-            split.destroy();
-        }
-        return finishedFutures;
-    }
-
-    private void splitFinished(PrioritizedSplitRunner split)
-    {
-        completedSplitsPerLevel.incrementAndGet(split.getPriority().getLevel());
-        synchronized (this) {
-            allSplits.remove(split);
-
-            long wallNanos = System.nanoTime() - split.getCreatedNanos();
-            splitWallTime.add(Duration.succinctNanos(wallNanos));
-
-            if (intermediateSplits.remove(split)) {
-                intermediateSplitWallTime.add(wallNanos);
-                intermediateSplitScheduledTime.add(split.getScheduledNanos());
-                intermediateSplitWaitTime.add(split.getWaitNanos());
-                intermediateSplitCpuTime.add(split.getCpuTimeNanos());
-            }
-            else {
-                leafSplitWallTime.add(wallNanos);
-                leafSplitScheduledTime.add(split.getScheduledNanos());
-                leafSplitWaitTime.add(split.getWaitNanos());
-                leafSplitCpuTime.add(split.getCpuTimeNanos());
-            }
-
-            TaskHandle taskHandle = split.getTaskHandle();
-            taskHandle.splitComplete(split);
-
-            scheduleTaskIfNecessary(taskHandle);
-
-            addNewEntrants();
-            recordLeafSplitsSize();
-        }
-        // call destroy outside of synchronized block as it is expensive and doesn't need a lock on the task executor
-        split.destroy();
-    }
-
-    private synchronized void scheduleTaskIfNecessary(TaskHandle taskHandle)
-    {
-        // if task has less than the minimum guaranteed splits running,
-        // immediately schedule new splits for this task.  This assures
-        // that a task gets its fair amount of consideration (you have to
-        // have splits to be considered for running on a thread).
-        int splitsToSchedule = min(guaranteedNumberOfDriversPerTask, taskHandle.getMaxDriversPerTask().orElse(Integer.MAX_VALUE)) - taskHandle.getRunningLeafSplits();
-        for (int i = 0; i < splitsToSchedule; ++i) {
-            PrioritizedSplitRunner split = taskHandle.pollNextSplit();
-            if (split == null) {
-                // no more splits to schedule
-                return;
-            }
-
-            startSplit(split);
-            splitQueuedTime.add(Duration.nanosSince(split.getCreatedNanos()));
-        }
-        recordLeafSplitsSize();
-    }
-
-    private synchronized void addNewEntrants()
-    {
-        // Ignore intermediate splits when checking minimumNumberOfDrivers.
-        // Otherwise with (for example) minimumNumberOfDrivers = 100, 200 intermediate splits
-        // and 100 leaf splits, depending on order of appearing splits, number of
-        // simultaneously running splits may vary. If leaf splits start first, there will
-        // be 300 running splits. If intermediate splits start first, there will be only
-        // 200 running splits.
-        int running = allSplits.size() - intermediateSplits.size();
-        for (int i = 0; i < minimumNumberOfDrivers - running; i++) {
-            PrioritizedSplitRunner split = pollNextSplitWorker();
-            if (split == null) {
-                break;
-            }
-
-            splitQueuedTime.add(Duration.nanosSince(split.getCreatedNanos()));
-            startSplit(split);
-        }
-    }
-
-    private synchronized void startIntermediateSplit(PrioritizedSplitRunner split)
-    {
-        startSplit(split);
-        intermediateSplits.add(split);
-    }
-
-    private synchronized void startSplit(PrioritizedSplitRunner split)
-    {
-        allSplits.add(split);
-        waitingSplits.offer(split);
-    }
-
-    private synchronized PrioritizedSplitRunner pollNextSplitWorker()
-    {
-        // todo find a better algorithm for this
-        // find the first task that produces a split, then move that task to the
-        // end of the task list, so we get round robin
-        for (Iterator<TaskHandle> iterator = tasks.iterator(); iterator.hasNext(); ) {
-            TaskHandle task = iterator.next();
-            // skip tasks that are already running the configured max number of drivers
-            if (task.getRunningLeafSplits() >= task.getMaxDriversPerTask().orElse(maximumNumberOfDriversPerTask)) {
-                continue;
-            }
-            PrioritizedSplitRunner split = task.pollNextSplit();
-            if (split != null) {
-                // move task to end of list
-                iterator.remove();
-
-                // CAUTION: we are modifying the list in the loop which would normally
-                // cause a ConcurrentModificationException but we exit immediately
-                tasks.add(task);
-                return split;
-            }
-        }
-        return null;
-    }
-
-    private synchronized void recordLeafSplitsSize()
-    {
-        long now = ticker.read();
-        long timeDifference = now - this.lastLeafSplitsSizeRecordTime;
-        if (timeDifference > 0) {
-            this.leafSplitsSize.add(lastLeafSplitsSize, timeDifference);
-            this.lastLeafSplitsSizeRecordTime = now;
-        }
-        // always record new lastLeafSplitsSize as it might have changed
-        // even if timeDifference is 0
-        this.lastLeafSplitsSize = allSplits.size() - intermediateSplits.size();
-    }
-
-    private class TaskRunner
-            implements Runnable
-    {
-        private final long runnerId = NEXT_RUNNER_ID.getAndIncrement();
-
-        @Override
-        public void run()
-        {
-            try (SetThreadName runnerName = new SetThreadName("SplitRunner-%s", runnerId)) {
-                while (!closed && !Thread.currentThread().isInterrupted()) {
-                    // select next worker
-                    PrioritizedSplitRunner split;
-                    try {
-                        split = waitingSplits.take();
-                    }
-                    catch (InterruptedException e) {
-                        Thread.currentThread().interrupt();
-                        return;
-                    }
-
-                    String threadId = split.getTaskHandle().getTaskId() + "-" + split.getSplitId();
-                    try (SetThreadName splitName = new SetThreadName(threadId)) {
-                        RunningSplitInfo splitInfo = new RunningSplitInfo(ticker.read(), threadId, Thread.currentThread(), split);
-                        runningSplitInfos.add(splitInfo);
-                        runningSplits.add(split);
-
-                        ListenableFuture<Void> blocked;
-                        try {
-                            blocked = split.process();
-                        }
-                        finally {
-                            runningSplitInfos.remove(splitInfo);
-                            runningSplits.remove(split);
-                        }
-
-                        if (split.isFinished()) {
-                            if (log.isDebugEnabled()) {
-                                log.debug("%s is finished", split.getInfo());
-                            }
-                            splitFinished(split);
-                        }
-                        else {
-                            if (blocked.isDone()) {
-                                waitingSplits.offer(split);
-                            }
-                            else {
-                                blockedSplits.put(split, blocked);
-                                blocked.addListener(() -> {
-                                    blockedSplits.remove(split);
-                                    // reset the level priority to prevent previously-blocked splits from starving existing splits
-                                    split.resetLevelPriority();
-                                    waitingSplits.offer(split);
-                                }, executor);
-                            }
-                        }
-                    }
-                    catch (Throwable t) {
-                        // ignore random errors due to driver thread interruption
-                        if (!split.isDestroyed()) {
-                            if (t instanceof TrinoException trinoException) {
-                                log.error(t, "Error processing %s: %s: %s", split.getInfo(), trinoException.getErrorCode().getName(), trinoException.getMessage());
-                            }
-                            else {
-                                log.error(t, "Error processing %s", split.getInfo());
-                            }
-                        }
-                        splitFinished(split);
-                    }
-                    finally {
-                        // Clear the interrupted flag on the current thread, driver cancellation may have triggered an interrupt
-                        if (Thread.interrupted()) {
-                            if (closed) {
-                                // reset interrupted flag if closed before interrupt
-                                Thread.currentThread().interrupt();
-                            }
-                        }
-                    }
-                }
-            }
-            finally {
-                // unless we have been closed, we need to replace this thread
-                if (!closed) {
-                    addRunnerThread();
-                }
-            }
-        }
-    }
-
-    //
-    // STATS
-    //
-
-    @Managed
-    public synchronized int getTasks()
-    {
-        return tasks.size();
-    }
-
-    @Managed
-    public int getRunnerThreads()
-    {
-        return runnerThreads;
-    }
-
-    @Managed
-    public int getMinimumNumberOfDrivers()
-    {
-        return minimumNumberOfDrivers;
-    }
-
-    @Managed
-    public synchronized int getTotalSplits()
-    {
-        return allSplits.size();
-    }
-
-    @Managed
-    public synchronized int getIntermediateSplits()
-    {
-        return intermediateSplits.size();
-    }
-
-    @Managed
-    public int getWaitingSplits()
-    {
-        return waitingSplits.size();
-    }
-
-    @Managed
-    @Nested
-    public DistributionStat getLeafSplitsSize()
-    {
-        return leafSplitsSize;
-    }
-
-    @Managed
-    public int getRunningSplits()
-    {
-        return runningSplits.size();
-    }
-
-    @Managed
-    public int getBlockedSplits()
-    {
-        return blockedSplits.size();
-    }
-
-    @Managed
-    public long getCompletedTasksLevel0()
-    {
-        return completedTasksPerLevel.get(0);
-    }
-
-    @Managed
-    public long getCompletedTasksLevel1()
-    {
-        return completedTasksPerLevel.get(1);
-    }
-
-    @Managed
-    public long getCompletedTasksLevel2()
-    {
-        return completedTasksPerLevel.get(2);
-    }
-
-    @Managed
-    public long getCompletedTasksLevel3()
-    {
-        return completedTasksPerLevel.get(3);
-    }
-
-    @Managed
-    public long getCompletedTasksLevel4()
-    {
-        return completedTasksPerLevel.get(4);
-    }
-
-    @Managed
-    public long getCompletedSplitsLevel0()
-    {
-        return completedSplitsPerLevel.get(0);
-    }
-
-    @Managed
-    public long getCompletedSplitsLevel1()
-    {
-        return completedSplitsPerLevel.get(1);
-    }
-
-    @Managed
-    public long getCompletedSplitsLevel2()
-    {
-        return completedSplitsPerLevel.get(2);
-    }
-
-    @Managed
-    public long getCompletedSplitsLevel3()
-    {
-        return completedSplitsPerLevel.get(3);
-    }
-
-    @Managed
-    public long getCompletedSplitsLevel4()
-    {
-        return completedSplitsPerLevel.get(4);
-    }
-
-    @Managed
-    public long getRunningTasksLevel0()
-    {
-        return getRunningTasksForLevel(0);
-    }
-
-    @Managed
-    public long getRunningTasksLevel1()
-    {
-        return getRunningTasksForLevel(1);
-    }
-
-    @Managed
-    public long getRunningTasksLevel2()
-    {
-        return getRunningTasksForLevel(2);
-    }
-
-    @Managed
-    public long getRunningTasksLevel3()
-    {
-        return getRunningTasksForLevel(3);
-    }
-
-    @Managed
-    public long getRunningTasksLevel4()
-    {
-        return getRunningTasksForLevel(4);
-    }
-
-    @Managed
-    @Nested
-    public TimeStat getSplitQueuedTime()
-    {
-        return splitQueuedTime;
-    }
-
-    @Managed
-    @Nested
-    public TimeStat getSplitWallTime()
-    {
-        return splitWallTime;
-    }
-
-    @Managed
-    @Nested
-    public TimeStat getBlockedQuantaWallTime()
-    {
-        return blockedQuantaWallTime;
-    }
-
-    @Managed
-    @Nested
-    public TimeStat getUnblockedQuantaWallTime()
-    {
-        return unblockedQuantaWallTime;
-    }
-
-    @Managed
-    @Nested
-    public TimeDistribution getLeafSplitScheduledTime()
-    {
-        return leafSplitScheduledTime;
-    }
-
-    @Managed
-    @Nested
-    public TimeDistribution getIntermediateSplitScheduledTime()
-    {
-        return intermediateSplitScheduledTime;
-    }
-
-    @Managed
-    @Nested
-    public TimeDistribution getLeafSplitWallTime()
-    {
-        return leafSplitWallTime;
-    }
-
-    @Managed
-    @Nested
-    public TimeDistribution getIntermediateSplitWallTime()
-    {
-        return intermediateSplitWallTime;
-    }
-
-    @Managed
-    @Nested
-    public TimeDistribution getLeafSplitWaitTime()
-    {
-        return leafSplitWaitTime;
-    }
-
-    @Managed
-    @Nested
-    public TimeDistribution getIntermediateSplitWaitTime()
-    {
-        return intermediateSplitWaitTime;
-    }
-
-    @Managed
-    @Nested
-    public TimeDistribution getLeafSplitCpuTime()
-    {
-        return leafSplitCpuTime;
-    }
-
-    @Managed
-    @Nested
-    public TimeDistribution getIntermediateSplitCpuTime()
-    {
-        return intermediateSplitCpuTime;
-    }
-
-    @Managed
-    @Nested
-    public CounterStat getGlobalScheduledTimeMicros()
-    {
-        return globalScheduledTimeMicros;
-    }
-
-    @Managed
-    @Nested
-    public CounterStat getGlobalCpuTimeMicros()
-    {
-        return globalCpuTimeMicros;
-    }
-
-    private synchronized int getRunningTasksForLevel(int level)
-    {
-        int count = 0;
-        for (TaskHandle task : tasks) {
-            if (task.getPriority().getLevel() == level) {
-                count++;
-            }
-        }
-        return count;
-    }
-
-    public String getMaxActiveSplitsInfo()
-    {
-        // Sample output:
-        //
-        // 2 splits have been continuously active for more than 600.00ms seconds
-        //
-        // "20180907_054754_00000_88xi4.1.0-2" tid=99
-        // at java.util.Formatter$FormatSpecifier.<init>(Formatter.java:2708)
-        // at java.util.Formatter.parse(Formatter.java:2560)
-        // at java.util.Formatter.format(Formatter.java:2501)
-        // at ... (more lines of stacktrace)
-        //
-        // "20180907_054754_00000_88xi4.1.0-3" tid=106
-        // at java.util.Formatter$FormatSpecifier.<init>(Formatter.java:2709)
-        // at java.util.Formatter.parse(Formatter.java:2560)
-        // at java.util.Formatter.format(Formatter.java:2501)
-        // at ... (more line of stacktrace)
-        StringBuilder stackTrace = new StringBuilder();
-        int maxActiveSplitCount = 0;
-        String message = "%s splits have been continuously active for more than %s seconds\n";
-        for (RunningSplitInfo splitInfo : runningSplitInfos) {
-            Duration duration = Duration.succinctNanos(ticker.read() - splitInfo.getStartTime());
-            if (duration.compareTo(stuckSplitsWarningThreshold) >= 0) {
-                maxActiveSplitCount++;
-                stackTrace.append("\n");
-                stackTrace.append(format("\"%s\" tid=%s", splitInfo.getThreadId(), splitInfo.getThread().getId())).append("\n");
-                for (StackTraceElement traceElement : splitInfo.getThread().getStackTrace()) {
-                    stackTrace.append("\tat ").append(traceElement).append("\n");
-                }
-            }
-        }
-
-        return format(message, maxActiveSplitCount, stuckSplitsWarningThreshold).concat(stackTrace.toString());
-    }
-
-    @Managed
-    public long getRunAwaySplitCount()
-    {
-        int count = 0;
-        for (RunningSplitInfo splitInfo : runningSplitInfos) {
-            Duration duration = Duration.succinctNanos(ticker.read() - splitInfo.getStartTime());
-            if (duration.compareTo(stuckSplitsWarningThreshold) > 0) {
-                count++;
-            }
-        }
-        return count;
-    }
-
-    public Set<TaskId> getStuckSplitTaskIds(Duration processingDurationThreshold, Predicate<RunningSplitInfo> filter)
-    {
-        return runningSplitInfos.stream()
-                .filter((RunningSplitInfo splitInfo) -> {
-                    Duration splitProcessingDuration = Duration.succinctNanos(ticker.read() - splitInfo.getStartTime());
-                    return splitProcessingDuration.compareTo(processingDurationThreshold) > 0;
-                })
-                .filter(filter).map(RunningSplitInfo::getTaskId).collect(toImmutableSet());
-    }
-
-    /**
-     * A class representing a split that is running on the TaskRunner.
-     * It has a Thread object that gets assigned while assigning the split
-     * to the taskRunner. However, when the TaskRunner moves to a different split,
-     * the thread stored here will not remain assigned to this split anymore.
-     */
-    public static class RunningSplitInfo
-            implements Comparable<RunningSplitInfo>
-    {
-        private final long startTime;
-        private final String threadId;
-        private final Thread thread;
-        private boolean printed;
-        private final PrioritizedSplitRunner split;
-
-        public RunningSplitInfo(long startTime, String threadId, Thread thread, PrioritizedSplitRunner split)
-        {
-            this.startTime = startTime;
-            this.threadId = requireNonNull(threadId, "threadId is null");
-            this.thread = requireNonNull(thread, "thread is null");
-            this.split = requireNonNull(split, "split is null");
-            this.printed = false;
-        }
-
-        public long getStartTime()
-        {
-            return startTime;
-        }
-
-        public String getThreadId()
-        {
-            return threadId;
-        }
-
-        public Thread getThread()
-        {
-            return thread;
-        }
-
-        public TaskId getTaskId()
-        {
-            return split.getTaskHandle().getTaskId();
-        }
+            OptionalInt maxDriversPerTask);
 
-        /**
-         * {@link PrioritizedSplitRunner#getInfo()} provides runtime statistics for the split (such as total cpu utilization so far).
-         * A value returned from this method changes over time and cannot be cached as a field of {@link RunningSplitInfo}.
-         *
-         * @return Formatted string containing runtime statistics for the split.
-         */
-        public String getSplitInfo()
-        {
-            return split.getInfo();
-        }
+    void removeTask(TaskHandle taskHandle);
 
-        public boolean isPrinted()
-        {
-            return printed;
-        }
+    List<ListenableFuture<Void>> enqueueSplits(TaskHandle taskHandle, boolean intermediate, List<? extends SplitRunner> taskSplits);
 
-        public void setPrinted()
-        {
-            printed = true;
-        }
+    Set<TaskId> getStuckSplitTaskIds(Duration processingDurationThreshold, Predicate<RunningSplitInfo> filter);
 
-        @Override
-        public int compareTo(RunningSplitInfo o)
-        {
-            return ComparisonChain.start()
-                    .compare(startTime, o.getStartTime())
-                    .compare(threadId, o.getThreadId())
-                    .result();
-        }
-    }
+    void start();
 
-    @Managed(description = "Task processor executor")
-    @Nested
-    public ThreadPoolExecutorMBean getProcessorExecutor()
-    {
-        return executorMBean;
-    }
+    void stop();
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/TaskHandle.java b/core/trino-main/src/main/java/io/trino/execution/executor/TaskHandle.java
index b8be2c577721..2a032768feea 100644
--- a/core/trino-main/src/main/java/io/trino/execution/executor/TaskHandle.java
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/TaskHandle.java
@@ -13,189 +13,7 @@
  */
 package io.trino.execution.executor;
 
-import com.google.common.collect.ImmutableList;
-import io.airlift.units.Duration;
-import io.trino.execution.SplitConcurrencyController;
-import io.trino.execution.TaskId;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.OptionalInt;
-import java.util.Queue;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.DoubleSupplier;
-
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static java.util.Objects.requireNonNull;
-
-@ThreadSafe
-public class TaskHandle
+public interface TaskHandle
 {
-    private volatile boolean destroyed;
-    private final TaskId taskId;
-    private final DoubleSupplier utilizationSupplier;
-
-    @GuardedBy("this")
-    protected final Queue<PrioritizedSplitRunner> queuedLeafSplits = new ArrayDeque<>(10);
-    @GuardedBy("this")
-    protected final List<PrioritizedSplitRunner> runningLeafSplits = new ArrayList<>(10);
-    @GuardedBy("this")
-    protected final List<PrioritizedSplitRunner> runningIntermediateSplits = new ArrayList<>(10);
-    @GuardedBy("this")
-    protected long scheduledNanos;
-    @GuardedBy("this")
-    protected final SplitConcurrencyController concurrencyController;
-
-    private final AtomicInteger nextSplitId = new AtomicInteger();
-
-    private final AtomicReference<Priority> priority = new AtomicReference<>(new Priority(0, 0));
-    private final MultilevelSplitQueue splitQueue;
-    private final OptionalInt maxDriversPerTask;
-
-    public TaskHandle(
-            TaskId taskId,
-            MultilevelSplitQueue splitQueue,
-            DoubleSupplier utilizationSupplier,
-            int initialSplitConcurrency,
-            Duration splitConcurrencyAdjustFrequency,
-            OptionalInt maxDriversPerTask)
-    {
-        this.taskId = requireNonNull(taskId, "taskId is null");
-        this.splitQueue = requireNonNull(splitQueue, "splitQueue is null");
-        this.utilizationSupplier = requireNonNull(utilizationSupplier, "utilizationSupplier is null");
-        this.maxDriversPerTask = requireNonNull(maxDriversPerTask, "maxDriversPerTask is null");
-        this.concurrencyController = new SplitConcurrencyController(
-                initialSplitConcurrency,
-                requireNonNull(splitConcurrencyAdjustFrequency, "splitConcurrencyAdjustFrequency is null"));
-    }
-
-    public synchronized Priority addScheduledNanos(long durationNanos)
-    {
-        concurrencyController.update(durationNanos, utilizationSupplier.getAsDouble(), runningLeafSplits.size());
-        scheduledNanos += durationNanos;
-
-        Priority newPriority = splitQueue.updatePriority(priority.get(), durationNanos, scheduledNanos);
-
-        priority.set(newPriority);
-        return newPriority;
-    }
-
-    public synchronized Priority resetLevelPriority()
-    {
-        Priority currentPriority = priority.get();
-        long levelMinPriority = splitQueue.getLevelMinPriority(currentPriority.getLevel(), scheduledNanos);
-
-        if (currentPriority.getLevelPriority() < levelMinPriority) {
-            Priority newPriority = new Priority(currentPriority.getLevel(), levelMinPriority);
-            priority.set(newPriority);
-            return newPriority;
-        }
-
-        return currentPriority;
-    }
-
-    public boolean isDestroyed()
-    {
-        return destroyed;
-    }
-
-    public Priority getPriority()
-    {
-        return priority.get();
-    }
-
-    public TaskId getTaskId()
-    {
-        return taskId;
-    }
-
-    public OptionalInt getMaxDriversPerTask()
-    {
-        return maxDriversPerTask;
-    }
-
-    // Returns any remaining splits. The caller must destroy these.
-    public synchronized List<PrioritizedSplitRunner> destroy()
-    {
-        destroyed = true;
-
-        ImmutableList.Builder<PrioritizedSplitRunner> builder = ImmutableList.builderWithExpectedSize(runningIntermediateSplits.size() + runningLeafSplits.size() + queuedLeafSplits.size());
-        builder.addAll(runningIntermediateSplits);
-        builder.addAll(runningLeafSplits);
-        builder.addAll(queuedLeafSplits);
-        runningIntermediateSplits.clear();
-        runningLeafSplits.clear();
-        queuedLeafSplits.clear();
-        return builder.build();
-    }
-
-    public synchronized boolean enqueueSplit(PrioritizedSplitRunner split)
-    {
-        if (destroyed) {
-            return false;
-        }
-        queuedLeafSplits.add(split);
-        return true;
-    }
-
-    public synchronized boolean recordIntermediateSplit(PrioritizedSplitRunner split)
-    {
-        if (destroyed) {
-            return false;
-        }
-        runningIntermediateSplits.add(split);
-        return true;
-    }
-
-    synchronized int getRunningLeafSplits()
-    {
-        return runningLeafSplits.size();
-    }
-
-    public synchronized long getScheduledNanos()
-    {
-        return scheduledNanos;
-    }
-
-    public synchronized PrioritizedSplitRunner pollNextSplit()
-    {
-        if (destroyed) {
-            return null;
-        }
-
-        if (runningLeafSplits.size() >= concurrencyController.getTargetConcurrency()) {
-            return null;
-        }
-
-        PrioritizedSplitRunner split = queuedLeafSplits.poll();
-        if (split != null) {
-            runningLeafSplits.add(split);
-        }
-        return split;
-    }
-
-    public synchronized void splitComplete(PrioritizedSplitRunner split)
-    {
-        concurrencyController.splitFinished(split.getScheduledNanos(), utilizationSupplier.getAsDouble(), runningLeafSplits.size());
-        runningIntermediateSplits.remove(split);
-        runningLeafSplits.remove(split);
-    }
-
-    public int getNextSplitId()
-    {
-        return nextSplitId.getAndIncrement();
-    }
-
-    @Override
-    public String toString()
-    {
-        return toStringHelper(this)
-                .add("taskId", taskId)
-                .toString();
-    }
+    boolean isDestroyed();
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/dedicated/SplitProcessor.java b/core/trino-main/src/main/java/io/trino/execution/executor/dedicated/SplitProcessor.java
new file mode 100644
index 000000000000..87efbed973a0
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/dedicated/SplitProcessor.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed 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 io.trino.execution.executor.dedicated;
+
+import com.google.common.base.Ticker;
+import com.google.common.util.concurrent.ListenableFuture;
+import io.airlift.concurrent.SetThreadName;
+import io.airlift.log.Logger;
+import io.airlift.stats.CpuTimer;
+import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
+import io.trino.execution.SplitRunner;
+import io.trino.execution.TaskId;
+import io.trino.execution.executor.scheduler.Schedulable;
+import io.trino.execution.executor.scheduler.SchedulerContext;
+import io.trino.tracing.TrinoAttributes;
+
+import java.util.concurrent.TimeUnit;
+
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+class SplitProcessor
+        implements Schedulable
+{
+    private static final Logger LOG = Logger.get(SplitProcessor.class);
+
+    private static final Duration SPLIT_RUN_QUANTA = new Duration(1, TimeUnit.SECONDS);
+
+    private final TaskId taskId;
+    private final int splitId;
+    private final SplitRunner split;
+    private final Tracer tracer;
+
+    public SplitProcessor(TaskId taskId, int splitId, SplitRunner split, Tracer tracer)
+    {
+        this.taskId = requireNonNull(taskId, "taskId is null");
+        this.splitId = splitId;
+        this.split = requireNonNull(split, "split is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
+    }
+
+    @Override
+    public void run(SchedulerContext context)
+    {
+        Span splitSpan = tracer.spanBuilder("split")
+                .setParent(Context.current().with(split.getPipelineSpan()))
+                .setAttribute(TrinoAttributes.QUERY_ID, taskId.getQueryId().toString())
+                .setAttribute(TrinoAttributes.STAGE_ID, taskId.getStageId().toString())
+                .setAttribute(TrinoAttributes.TASK_ID, taskId.toString())
+                .setAttribute(TrinoAttributes.PIPELINE_ID, taskId.getStageId() + "-" + split.getPipelineId())
+                .setAttribute(TrinoAttributes.SPLIT_ID, taskId + "-" + splitId)
+                .startSpan();
+
+        Span processSpan = newSpan(splitSpan, null);
+
+        CpuTimer timer = new CpuTimer(Ticker.systemTicker(), false);
+        long previousCpuNanos = 0;
+        long previousScheduledNanos = 0;
+        try (SetThreadName ignored = new SetThreadName("SplitRunner-%s-%s", taskId, splitId)) {
+            while (!split.isFinished()) {
+                ListenableFuture<Void> blocked = split.processFor(SPLIT_RUN_QUANTA);
+                CpuTimer.CpuDuration elapsed = timer.elapsedTime();
+
+                long scheduledNanos = elapsed.getWall().roundTo(NANOSECONDS);
+                processSpan.setAttribute(TrinoAttributes.SPLIT_SCHEDULED_TIME_NANOS, scheduledNanos - previousScheduledNanos);
+                previousScheduledNanos = scheduledNanos;
+
+                long cpuNanos = elapsed.getCpu().roundTo(NANOSECONDS);
+                processSpan.setAttribute(TrinoAttributes.SPLIT_CPU_TIME_NANOS, cpuNanos - previousCpuNanos);
+                previousCpuNanos = cpuNanos;
+
+                if (!split.isFinished()) {
+                    if (blocked.isDone()) {
+                        processSpan.addEvent("yield");
+                        processSpan.end();
+                        if (!context.maybeYield()) {
+                            processSpan = null;
+                            return;
+                        }
+                    }
+                    else {
+                        processSpan.addEvent("blocked");
+                        processSpan.end();
+                        if (!context.block(blocked)) {
+                            processSpan = null;
+                            return;
+                        }
+                    }
+                    processSpan = newSpan(splitSpan, processSpan);
+                }
+            }
+        }
+        catch (Exception e) {
+            LOG.error(e);
+        }
+        finally {
+            if (processSpan != null) {
+                processSpan.end();
+            }
+
+            splitSpan.setAttribute(TrinoAttributes.SPLIT_CPU_TIME_NANOS, timer.elapsedTime().getCpu().roundTo(NANOSECONDS));
+            splitSpan.setAttribute(TrinoAttributes.SPLIT_SCHEDULED_TIME_NANOS, context.getScheduledNanos());
+            splitSpan.setAttribute(TrinoAttributes.SPLIT_BLOCK_TIME_NANOS, context.getBlockedNanos());
+            splitSpan.setAttribute(TrinoAttributes.SPLIT_WAIT_TIME_NANOS, context.getWaitNanos());
+            splitSpan.setAttribute(TrinoAttributes.SPLIT_START_TIME_NANOS, context.getStartNanos());
+            splitSpan.end();
+        }
+    }
+
+    private Span newSpan(Span parent, Span previous)
+    {
+        SpanBuilder builder = tracer.spanBuilder("process")
+                .setParent(Context.current().with(parent));
+
+        if (previous != null) {
+            builder.addLink(previous.getSpanContext());
+        }
+
+        return builder.startSpan();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/dedicated/ThreadPerDriverTaskExecutor.java b/core/trino-main/src/main/java/io/trino/execution/executor/dedicated/ThreadPerDriverTaskExecutor.java
new file mode 100644
index 000000000000..ff95f39dea13
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/dedicated/ThreadPerDriverTaskExecutor.java
@@ -0,0 +1,218 @@
+/*
+ * Licensed 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 io.trino.execution.executor.dedicated;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Ticker;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
+import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.execution.SplitRunner;
+import io.trino.execution.TaskId;
+import io.trino.execution.TaskManagerConfig;
+import io.trino.execution.executor.RunningSplitInfo;
+import io.trino.execution.executor.TaskExecutor;
+import io.trino.execution.executor.TaskHandle;
+import io.trino.execution.executor.scheduler.FairScheduler;
+import io.trino.execution.executor.scheduler.Group;
+import io.trino.execution.executor.scheduler.Schedulable;
+import io.trino.execution.executor.scheduler.SchedulerContext;
+import io.trino.spi.VersionEmbedder;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.OptionalInt;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.DoubleSupplier;
+import java.util.function.Predicate;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static java.util.Objects.requireNonNull;
+
+@ThreadSafe
+public class ThreadPerDriverTaskExecutor
+        implements TaskExecutor
+{
+    private final FairScheduler scheduler;
+    private final Tracer tracer;
+    private final VersionEmbedder versionEmbedder;
+    private volatile boolean closed;
+
+    @Inject
+    public ThreadPerDriverTaskExecutor(TaskManagerConfig config, Tracer tracer, VersionEmbedder versionEmbedder)
+    {
+        this(tracer, versionEmbedder, new FairScheduler(config.getMaxWorkerThreads(), "SplitRunner-%d", Ticker.systemTicker()));
+    }
+
+    @VisibleForTesting
+    public ThreadPerDriverTaskExecutor(Tracer tracer, VersionEmbedder versionEmbedder, FairScheduler scheduler)
+    {
+        this.scheduler = scheduler;
+        this.tracer = requireNonNull(tracer, "tracer is null");
+        this.versionEmbedder = requireNonNull(versionEmbedder, "versionEmbedder is null");
+    }
+
+    @PostConstruct
+    @Override
+    public synchronized void start()
+    {
+        scheduler.start();
+    }
+
+    @PreDestroy
+    @Override
+    public synchronized void stop()
+    {
+        closed = true;
+        scheduler.close();
+    }
+
+    @Override
+    public synchronized TaskHandle addTask(
+            TaskId taskId,
+            DoubleSupplier utilizationSupplier,
+            int initialSplitConcurrency,
+            Duration splitConcurrencyAdjustFrequency,
+            OptionalInt maxDriversPerTask)
+    {
+        checkArgument(!closed, "Executor is already closed");
+
+        Group group = scheduler.createGroup(taskId.toString());
+        return new TaskEntry(taskId, group);
+    }
+
+    @Override
+    public synchronized void removeTask(TaskHandle handle)
+    {
+        TaskEntry entry = (TaskEntry) handle;
+
+        if (!entry.isDestroyed()) {
+            scheduler.removeGroup(entry.group());
+            entry.destroy();
+        }
+    }
+
+    @Override
+    public synchronized List<ListenableFuture<Void>> enqueueSplits(TaskHandle handle, boolean intermediate, List<? extends SplitRunner> splits)
+    {
+        checkArgument(!closed, "Executor is already closed");
+
+        TaskEntry entry = (TaskEntry) handle;
+
+        List<ListenableFuture<Void>> futures = new ArrayList<>();
+        for (SplitRunner split : splits) {
+            entry.addSplit(split);
+
+            int splitId = entry.nextSplitId();
+            ListenableFuture<Void> done = scheduler.submit(entry.group(), splitId, new VersionEmbedderBridge(versionEmbedder, new SplitProcessor(entry.taskId(), splitId, split, tracer)));
+            done.addListener(
+                    () -> {
+                        split.close();
+                        entry.removeSplit(split);
+                    },
+                    directExecutor());
+            futures.add(done);
+        }
+
+        return futures;
+    }
+
+    @Override
+    public Set<TaskId> getStuckSplitTaskIds(Duration processingDurationThreshold, Predicate<RunningSplitInfo> filter)
+    {
+        // TODO
+        return ImmutableSet.of();
+    }
+
+    private static class TaskEntry
+            implements TaskHandle
+    {
+        private final TaskId taskId;
+        private final Group group;
+        private final AtomicInteger nextSplitId = new AtomicInteger();
+        private volatile boolean destroyed;
+
+        @GuardedBy("this")
+        private Set<SplitRunner> splits = new HashSet<>();
+
+        public TaskEntry(TaskId taskId, Group group)
+        {
+            this.taskId = taskId;
+            this.group = group;
+        }
+
+        public TaskId taskId()
+        {
+            return taskId;
+        }
+
+        public Group group()
+        {
+            return group;
+        }
+
+        public synchronized void destroy()
+        {
+            destroyed = true;
+
+            for (SplitRunner split : splits) {
+                split.close();
+            }
+
+            splits.clear();
+        }
+
+        public synchronized void addSplit(SplitRunner split)
+        {
+            checkArgument(!destroyed, "Task already destroyed: %s", taskId);
+            splits.add(split);
+        }
+
+        public synchronized void removeSplit(SplitRunner split)
+        {
+            splits.remove(split);
+        }
+
+        public int nextSplitId()
+        {
+            return nextSplitId.incrementAndGet();
+        }
+
+        @Override
+        public boolean isDestroyed()
+        {
+            return destroyed;
+        }
+    }
+
+    private record VersionEmbedderBridge(VersionEmbedder versionEmbedder, Schedulable delegate)
+            implements Schedulable
+    {
+        @Override
+        public void run(SchedulerContext context)
+        {
+            Runnable adapter = () -> delegate.run(context);
+            versionEmbedder.embedVersion(adapter).run();
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/BlockingSchedulingQueue.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/BlockingSchedulingQueue.java
new file mode 100644
index 000000000000..7fc6e22e9615
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/BlockingSchedulingQueue.java
@@ -0,0 +1,175 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+
+import java.util.Set;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+final class BlockingSchedulingQueue<G, T>
+{
+    private final Lock lock = new ReentrantLock();
+    private final Condition notEmpty = lock.newCondition();
+
+    @GuardedBy("lock")
+    private final SchedulingQueue<G, T> queue = new SchedulingQueue<>();
+
+    public void startGroup(G group)
+    {
+        lock.lock();
+        try {
+            queue.startGroup(group);
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public Set<T> finishGroup(G group)
+    {
+        lock.lock();
+        try {
+            return queue.finishGroup(group);
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public Set<T> getTasks(G group)
+    {
+        lock.lock();
+        try {
+            if (!queue.containsGroup(group)) {
+                return ImmutableSet.of();
+            }
+
+            return queue.getTasks(group);
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public Set<T> finishAll()
+    {
+        lock.lock();
+        try {
+            return queue.finishAll();
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public boolean enqueue(G group, T task, long deltaWeight)
+    {
+        lock.lock();
+        try {
+            if (!queue.containsGroup(group)) {
+                return false;
+            }
+
+            queue.enqueue(group, task, deltaWeight);
+            notEmpty.signal();
+
+            return true;
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public boolean block(G group, T task, long deltaWeight)
+    {
+        lock.lock();
+        try {
+            if (!queue.containsGroup(group)) {
+                return false;
+            }
+
+            queue.block(group, task, deltaWeight);
+            return true;
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public T dequeue(long expectedWeight)
+            throws InterruptedException
+    {
+        lock.lock();
+        try {
+            T result;
+            do {
+                result = queue.dequeue(expectedWeight);
+                if (result == null) {
+                    notEmpty.await();
+                }
+            }
+            while (result == null);
+
+            return result;
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public boolean finish(G group, T task)
+    {
+        lock.lock();
+        try {
+            if (!queue.containsGroup(group)) {
+                return false;
+            }
+
+            queue.finish(group, task);
+            return true;
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public String toString()
+    {
+        lock.lock();
+        try {
+            return queue.toString();
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public int getRunnableCount()
+    {
+        lock.lock();
+        try {
+            return queue.getRunnableCount();
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/FairScheduler.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/FairScheduler.java
new file mode 100644
index 000000000000..03283c8b1663
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/FairScheduler.java
@@ -0,0 +1,315 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import com.google.common.base.Ticker;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import io.airlift.log.Logger;
+
+import java.util.Set;
+import java.util.StringJoiner;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * <h2>Implementation nodes</h2>
+ *
+ * <ul>
+ *     <li>The TaskControl state machine is only modified by the task executor
+ * thread (i.e., from within {@link FairScheduler#runTask(Schedulable, TaskControl)} )}). Other threads
+ * can indirectly affect what the task executor thread does by marking the task as ready or cancelled
+ * and unblocking the task executor thread, which will then act on that information.</li>
+ * </ul>
+ */
+@ThreadSafe
+public final class FairScheduler
+        implements AutoCloseable
+{
+    private static final Logger LOG = Logger.get(FairScheduler.class);
+
+    public static final long QUANTUM_NANOS = TimeUnit.MILLISECONDS.toNanos(1000);
+
+    private final ExecutorService schedulerExecutor;
+    private final ListeningExecutorService taskExecutor;
+    private final BlockingSchedulingQueue<Group, TaskControl> queue = new BlockingSchedulingQueue<>();
+    private final Reservation<TaskControl> concurrencyControl;
+    private final Ticker ticker;
+
+    private final Gate paused = new Gate(true);
+
+    @GuardedBy("this")
+    private boolean closed;
+
+    public FairScheduler(int maxConcurrentTasks, String threadNameFormat, Ticker ticker)
+    {
+        this.ticker = requireNonNull(ticker, "ticker is null");
+
+        concurrencyControl = new Reservation<>(maxConcurrentTasks);
+
+        schedulerExecutor = Executors.newCachedThreadPool(new ThreadFactoryBuilder()
+                .setNameFormat("fair-scheduler-%d")
+                .setDaemon(true)
+                .build());
+
+        taskExecutor = MoreExecutors.listeningDecorator(Executors.newCachedThreadPool(new ThreadFactoryBuilder()
+                .setNameFormat(threadNameFormat)
+                .setDaemon(true)
+                .build()));
+    }
+
+    public static FairScheduler newInstance(int maxConcurrentTasks)
+    {
+        return newInstance(maxConcurrentTasks, Ticker.systemTicker());
+    }
+
+    public static FairScheduler newInstance(int maxConcurrentTasks, Ticker ticker)
+    {
+        FairScheduler scheduler = new FairScheduler(maxConcurrentTasks, "fair-scheduler-runner-%d", ticker);
+        scheduler.start();
+        return scheduler;
+    }
+
+    public void start()
+    {
+        schedulerExecutor.submit(this::runScheduler);
+    }
+
+    public void pause()
+    {
+        paused.close();
+    }
+
+    public void resume()
+    {
+        paused.open();
+    }
+
+    @Override
+    public synchronized void close()
+    {
+        if (closed) {
+            return;
+        }
+        closed = true;
+
+        Set<TaskControl> tasks = queue.finishAll();
+
+        for (TaskControl task : tasks) {
+            task.cancel();
+        }
+
+        taskExecutor.shutdownNow();
+        schedulerExecutor.shutdownNow();
+    }
+
+    public synchronized Group createGroup(String name)
+    {
+        checkArgument(!closed, "Already closed");
+
+        Group group = new Group(name);
+        queue.startGroup(group);
+
+        return group;
+    }
+
+    public synchronized void removeGroup(Group group)
+    {
+        checkArgument(!closed, "Already closed");
+
+        Set<TaskControl> tasks = queue.finishGroup(group);
+
+        for (TaskControl task : tasks) {
+            task.cancel();
+        }
+    }
+
+    public Set<Integer> getTasks(Group group)
+    {
+        return queue.getTasks(group).stream()
+                .map(TaskControl::id)
+                .collect(toImmutableSet());
+    }
+
+    public synchronized ListenableFuture<Void> submit(Group group, int id, Schedulable runner)
+    {
+        checkArgument(!closed, "Already closed");
+
+        TaskControl task = new TaskControl(group, id, ticker);
+
+        return taskExecutor.submit(() -> runTask(runner, task), null);
+    }
+
+    private void runTask(Schedulable runner, TaskControl task)
+    {
+        task.setThread(Thread.currentThread());
+
+        if (!makeRunnableAndAwait(task, 0)) {
+            return;
+        }
+
+        SchedulerContext context = new SchedulerContext(this, task);
+        try {
+            runner.run(context);
+        }
+        catch (Exception e) {
+            LOG.error(e);
+        }
+        finally {
+            // If the runner exited due to an exception in user code or
+            // normally (not in response to an interruption during blocking or yield),
+            // it must have had a semaphore permit reserved, so release it.
+            if (task.getState() == TaskControl.State.RUNNING) {
+                concurrencyControl.release(task);
+            }
+            queue.finish(task.group(), task);
+            task.transitionToFinished();
+        }
+    }
+
+    private boolean makeRunnableAndAwait(TaskControl task, long deltaWeight)
+    {
+        if (!task.transitionToWaiting()) {
+            return false;
+        }
+
+        if (!queue.enqueue(task.group(), task, deltaWeight)) {
+            return false;
+        }
+
+        // wait for the task to be scheduled
+        return awaitReadyAndTransitionToRunning(task);
+    }
+
+    /**
+     * @return false if the transition was unsuccessful due to the task being cancelled
+     */
+    private boolean awaitReadyAndTransitionToRunning(TaskControl task)
+    {
+        if (!task.awaitReady()) {
+            if (task.isReady()) {
+                // If the task was marked as ready (slot acquired) but then cancelled before
+                // awaitReady() was notified, we need to release the slot.
+                concurrencyControl.release(task);
+            }
+            return false;
+        }
+
+        if (!task.transitionToRunning()) {
+            concurrencyControl.release(task);
+            return false;
+        }
+
+        return true;
+    }
+
+    boolean yield(TaskControl task)
+    {
+        checkState(task.getThread() == Thread.currentThread(), "yield() may only be called from the task thread");
+
+        long delta = task.elapsed();
+        if (delta < QUANTUM_NANOS) {
+            return true;
+        }
+
+        concurrencyControl.release(task);
+
+        return makeRunnableAndAwait(task, delta);
+    }
+
+    boolean block(TaskControl task, ListenableFuture<?> future)
+    {
+        checkState(task.getThread() == Thread.currentThread(), "block() may only be called from the task thread");
+
+        long delta = task.elapsed();
+
+        concurrencyControl.release(task);
+
+        if (!task.transitionToBlocked()) {
+            return false;
+        }
+
+        if (!queue.block(task.group(), task, delta)) {
+            return false;
+        }
+
+        future.addListener(task::markUnblocked, MoreExecutors.directExecutor());
+        task.awaitUnblock();
+
+        return makeRunnableAndAwait(task, 0);
+    }
+
+    private void runScheduler()
+    {
+        while (true) {
+            try {
+                paused.awaitOpen();
+                concurrencyControl.reserve();
+                TaskControl task = queue.dequeue(QUANTUM_NANOS);
+
+                concurrencyControl.register(task);
+                if (!task.markReady()) {
+                    concurrencyControl.release(task);
+                }
+            }
+            catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                return;
+            }
+            catch (Exception e) {
+                LOG.error(e);
+            }
+        }
+    }
+
+    long getStartNanos(TaskControl task)
+    {
+        return task.getStartNanos();
+    }
+
+    long getScheduledNanos(TaskControl task)
+    {
+        return task.getScheduledNanos();
+    }
+
+    long getWaitNanos(TaskControl task)
+    {
+        return task.getWaitNanos();
+    }
+
+    long getBlockedNanos(TaskControl task)
+    {
+        return task.getBlockedNanos();
+    }
+
+    @Override
+    public String toString()
+    {
+        return new StringJoiner(", ", FairScheduler.class.getSimpleName() + "[", "]")
+                .add("queue=" + queue)
+                .add("concurrencyControl=" + concurrencyControl)
+                .add("closed=" + closed)
+                .toString();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Gate.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Gate.java
new file mode 100644
index 000000000000..adcc930b6f24
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Gate.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import com.google.errorprone.annotations.ThreadSafe;
+
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+final class Gate
+{
+    private final Lock lock = new ReentrantLock();
+    private final Condition opened = lock.newCondition();
+    private boolean open;
+
+    public Gate(boolean opened)
+    {
+        this.open = opened;
+    }
+
+    public void close()
+    {
+        lock.lock();
+        try {
+            open = false;
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public void open()
+    {
+        lock.lock();
+        try {
+            open = true;
+            opened.signalAll();
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public void awaitOpen()
+            throws InterruptedException
+    {
+        lock.lock();
+        try {
+            while (!open) {
+                opened.await();
+            }
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Group.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Group.java
new file mode 100644
index 000000000000..596abffbe1e3
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Group.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+public record Group(String name, long startTime)
+{
+    public Group(String name)
+    {
+        this(name, System.nanoTime());
+    }
+
+    @Override
+    public String toString()
+    {
+        return name;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/PriorityQueue.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/PriorityQueue.java
new file mode 100644
index 000000000000..7724400f4c50
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/PriorityQueue.java
@@ -0,0 +1,149 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import io.trino.annotation.NotThreadSafe;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+
+@NotThreadSafe
+final class PriorityQueue<T>
+{
+    // The tree is ordered by priorities in this map, so any operations on the data
+    // structures needs to consider the importance of the relative order of the operations.
+    // For instance, removing an entry from the tree before the corresponding entry in the
+    // queue is removed will lead to NPEs.
+    private final Map<T, Priority> priorities = new HashMap<>();
+    private final TreeSet<T> queue;
+
+    private long sequence;
+
+    public PriorityQueue()
+    {
+        queue = new TreeSet<>((a, b) -> {
+            Priority first = priorities.get(a);
+            Priority second = priorities.get(b);
+
+            int result = Long.compare(first.priority(), second.priority());
+            if (result == 0) {
+                result = Long.compare(first.sequence(), second.sequence());
+            }
+            return result;
+        });
+    }
+
+    public void add(T value, long priority)
+    {
+        checkArgument(!priorities.containsKey(value), "Value already in queue: %s", value);
+        priorities.put(value, new Priority(priority, nextSequence()));
+        queue.add(value);
+    }
+
+    public void addOrReplace(T value, long priority)
+    {
+        if (priorities.containsKey(value)) {
+            queue.remove(value);
+            priorities.put(value, new Priority(priority, nextSequence()));
+            queue.add(value);
+        }
+        else {
+            add(value, priority);
+        }
+    }
+
+    public T takeOrThrow()
+    {
+        T result = poll();
+        checkState(result != null, "Queue is empty");
+        return result;
+    }
+
+    public T poll()
+    {
+        T result = queue.pollFirst();
+        if (result != null) {
+            priorities.remove(result);
+        }
+
+        return result;
+    }
+
+    public void remove(T value)
+    {
+        checkArgument(priorities.containsKey(value), "Value not in queue: %s", value);
+        queue.remove(value);
+        priorities.remove(value);
+    }
+
+    public void removeIfPresent(T value)
+    {
+        if (priorities.containsKey(value)) {
+            queue.remove(value);
+            priorities.remove(value);
+        }
+    }
+
+    public boolean contains(T value)
+    {
+        return priorities.containsKey(value);
+    }
+
+    public boolean isEmpty()
+    {
+        return priorities.isEmpty();
+    }
+
+    public Set<T> values()
+    {
+        return priorities.keySet();
+    }
+
+    public long nextPriority()
+    {
+        checkState(!queue.isEmpty(), "Queue is empty");
+        return priorities.get(queue.first()).priority();
+    }
+
+    public T peek()
+    {
+        if (queue.isEmpty()) {
+            return null;
+        }
+        return queue.first();
+    }
+
+    public int size()
+    {
+        return queue.size();
+    }
+
+    @Override
+    public String toString()
+    {
+        return queue.toString();
+    }
+
+    private long nextSequence()
+    {
+        return sequence++;
+    }
+
+    private record Priority(long priority, long sequence) {}
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Reservation.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Reservation.java
new file mode 100644
index 000000000000..85d484c99d36
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Reservation.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.ThreadSafe;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.StringJoiner;
+import java.util.concurrent.Semaphore;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+/**
+ * <p>Semaphore-like structure that allows for tracking reservations to avoid double-reserving or double-releasing.</p>
+ *
+ * <p>Callers are expected to call {@link #reserve()} to acquire a slot, and then {@link #register(T)} to associate
+ * an entity with the reservation.</p>
+ *
+ * <p>Upon completion, callers should call {@link #release(T)} to release the reservation.</p>
+ */
+@ThreadSafe
+final class Reservation<T>
+{
+    private final Semaphore semaphore;
+    private final Set<T> reservations = new HashSet<>();
+
+    public Reservation(int slots)
+    {
+        semaphore = new Semaphore(slots);
+    }
+
+    public int availablePermits()
+    {
+        return semaphore.availablePermits();
+    }
+
+    public void reserve()
+            throws InterruptedException
+    {
+        semaphore.acquire();
+    }
+
+    public synchronized void register(T entry)
+    {
+        checkArgument(!reservations.contains(entry), "Already acquired: %s", entry);
+        reservations.add(entry);
+    }
+
+    public synchronized void release(T entry)
+    {
+        checkArgument(reservations.contains(entry), "Already released: %s", entry);
+        reservations.remove(entry);
+
+        semaphore.release();
+    }
+
+    public synchronized Set<T> reservations()
+    {
+        return ImmutableSet.copyOf(reservations);
+    }
+
+    @Override
+    public synchronized String toString()
+    {
+        return new StringJoiner(", ", Reservation.class.getSimpleName() + "[", "]")
+                .add("semaphore=" + semaphore)
+                .add("reservations=" + reservations)
+                .toString();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Schedulable.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Schedulable.java
new file mode 100644
index 000000000000..39032d7dafff
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Schedulable.java
@@ -0,0 +1,19 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+public interface Schedulable
+{
+    void run(SchedulerContext context);
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/SchedulerContext.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/SchedulerContext.java
new file mode 100644
index 000000000000..789086ff08e8
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/SchedulerContext.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import io.trino.annotation.NotThreadSafe;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+@NotThreadSafe
+public final class SchedulerContext
+{
+    private final FairScheduler scheduler;
+    private final TaskControl handle;
+
+    public SchedulerContext(FairScheduler scheduler, TaskControl handle)
+    {
+        this.scheduler = scheduler;
+        this.handle = handle;
+    }
+
+    /**
+     * Attempt to relinquish control to let other tasks run.
+     *
+     * @return false if the task was interrupted or cancelled while yielding,
+     * for example if the Java thread was interrupted, the scheduler was shutdown,
+     * or the scheduling group was removed. The caller is expected to clean up and finish.
+     */
+    public boolean maybeYield()
+    {
+        checkArgument(handle.getState() == TaskControl.State.RUNNING, "Task is not running");
+
+        return scheduler.yield(handle);
+    }
+
+    /**
+     * Indicate that the current task is blocked. The method returns when the future
+     * completes of it the task is interrupted.
+     *
+     * @return false if the task was interrupted or cancelled while blocked,
+     * for example if the Java thread was interrupted, the scheduler was shutdown,
+     * or the scheduling group was removed. The caller is expected to clean up and finish.
+     */
+    public boolean block(ListenableFuture<?> future)
+    {
+        checkArgument(handle.getState() == TaskControl.State.RUNNING, "Task is not running");
+
+        return scheduler.block(handle, future);
+    }
+
+    public long getStartNanos()
+    {
+        return scheduler.getStartNanos(handle);
+    }
+
+    public long getWaitNanos()
+    {
+        return scheduler.getWaitNanos(handle);
+    }
+
+    public long getScheduledNanos()
+    {
+        return scheduler.getScheduledNanos(handle);
+    }
+
+    public long getBlockedNanos()
+    {
+        return scheduler.getBlockedNanos(handle);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/SchedulingGroup.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/SchedulingGroup.java
new file mode 100644
index 000000000000..6eb20732e667
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/SchedulingGroup.java
@@ -0,0 +1,194 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import com.google.common.collect.ImmutableSet;
+import io.trino.annotation.NotThreadSafe;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.execution.executor.scheduler.State.BLOCKED;
+import static io.trino.execution.executor.scheduler.State.RUNNABLE;
+import static io.trino.execution.executor.scheduler.State.RUNNING;
+
+@NotThreadSafe
+final class SchedulingGroup<T>
+{
+    private State state;
+    private long weight;
+    private final Map<T, Task> tasks = new HashMap<>();
+    private final PriorityQueue<T> runnableQueue = new PriorityQueue<>();
+    private final Set<T> blocked = new HashSet<>();
+    private final PriorityQueue<T> baselineWeights = new PriorityQueue<>();
+
+    public SchedulingGroup()
+    {
+        this.state = BLOCKED;
+    }
+
+    public void enqueue(T handle, long deltaWeight)
+    {
+        Task task = tasks.get(handle);
+
+        if (task == null) {
+            // New tasks get assigned the baseline weight so that they don't monopolize the queue
+            // while they catch up
+            task = new Task(baselineWeight());
+            tasks.put(handle, task);
+        }
+        else if (task.state() == BLOCKED) {
+            blocked.remove(handle);
+            task.addWeight(baselineWeight());
+        }
+
+        weight -= task.uncommittedWeight();
+        weight += deltaWeight;
+
+        task.commitWeight(deltaWeight);
+        task.setState(RUNNABLE);
+        runnableQueue.add(handle, task.weight());
+        baselineWeights.addOrReplace(handle, task.weight());
+
+        updateState();
+    }
+
+    public T dequeue(long expectedWeight)
+    {
+        checkArgument(state == RUNNABLE);
+
+        T task = runnableQueue.takeOrThrow();
+
+        Task info = tasks.get(task);
+        info.setUncommittedWeight(expectedWeight);
+        info.setState(RUNNING);
+        weight += expectedWeight;
+
+        baselineWeights.addOrReplace(task, info.weight());
+
+        updateState();
+
+        return task;
+    }
+
+    public void finish(T task)
+    {
+        checkArgument(tasks.containsKey(task), "Unknown task: %s", task);
+        tasks.remove(task);
+        blocked.remove(task);
+        runnableQueue.removeIfPresent(task);
+        baselineWeights.removeIfPresent(task);
+
+        updateState();
+    }
+
+    public void block(T handle, long deltaWeight)
+    {
+        checkArgument(tasks.containsKey(handle), "Unknown task: %s", handle);
+        checkArgument(!runnableQueue.contains(handle), "Task is already in queue: %s", handle);
+
+        weight += deltaWeight;
+
+        Task task = tasks.get(handle);
+        task.commitWeight(deltaWeight);
+        task.setState(BLOCKED);
+        task.addWeight(-baselineWeight());
+        blocked.add(handle);
+        baselineWeights.remove(handle);
+
+        updateState();
+    }
+
+    public long baselineWeight()
+    {
+        if (baselineWeights.isEmpty()) {
+            return 0;
+        }
+
+        return baselineWeights.nextPriority();
+    }
+
+    public void addWeight(long delta)
+    {
+        weight += delta;
+    }
+
+    private void updateState()
+    {
+        if (blocked.size() == tasks.size()) {
+            state = BLOCKED;
+        }
+        else if (runnableQueue.isEmpty()) {
+            state = RUNNING;
+        }
+        else {
+            state = RUNNABLE;
+        }
+    }
+
+    public long weight()
+    {
+        return weight;
+    }
+
+    public Set<T> tasks()
+    {
+        return ImmutableSet.copyOf(tasks.keySet());
+    }
+
+    public State state()
+    {
+        return state;
+    }
+
+    public T peek()
+    {
+        return runnableQueue.peek();
+    }
+
+    public int runnableCount()
+    {
+        return runnableQueue.size();
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        for (Map.Entry<T, Task> entry : tasks.entrySet()) {
+            T key = entry.getKey();
+            Task task = entry.getValue();
+
+            String prefix = "%s %s".formatted(
+                    key == peek() ? "=>" : "  ",
+                    key);
+
+            String details = switch (task.state()) {
+                case BLOCKED -> "[BLOCKED, saved delta = %s]".formatted(task.weight());
+                case RUNNABLE -> "[RUNNABLE, weight = %s]".formatted(task.weight());
+                case RUNNING -> "[RUNNING, weight = %s, uncommitted = %s]".formatted(task.weight(), task.uncommittedWeight());
+            };
+
+            builder.append(prefix)
+                    .append(" ")
+                    .append(details)
+                    .append("\n");
+        }
+
+        return builder.toString();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/SchedulingQueue.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/SchedulingQueue.java
new file mode 100644
index 000000000000..a8b2428d6e17
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/SchedulingQueue.java
@@ -0,0 +1,351 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import com.google.common.collect.ImmutableSet;
+import io.trino.annotation.NotThreadSafe;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Verify.verify;
+import static io.trino.execution.executor.scheduler.State.BLOCKED;
+import static io.trino.execution.executor.scheduler.State.RUNNABLE;
+import static io.trino.execution.executor.scheduler.State.RUNNING;
+
+/**
+ * <p>A queue of tasks that are scheduled for execution. Modeled after
+ * <a href="https://en.wikipedia.org/wiki/Completely_Fair_Scheduler">Completely Fair Scheduler</a>.
+ * Tasks are grouped into scheduling groups. Within a group, tasks are ordered based
+ * on their relative weight. Groups are ordered relative to each other based on the
+ * accumulated weight of their tasks.</p>
+ *
+ * <p>A task can be in one of three states:
+ * <ul>
+ *     <li><b>runnable</b>: the task is ready to run and waiting to be dequeued
+ *     <li><b>running</b>: the task has been dequeued and is running
+ *     <li><b>blocked</b>: the task is blocked on some external event and is not running
+ * </ul>
+ * </p>
+ * <p>
+ * A group can be in one of three states:
+ * <ul>
+ *     <li><b>runnable</b>: the group has at least one runnable task
+ *     <li><b>running</b>: all the tasks in the group are currently running
+ *     <li><b>blocked</b>: all the tasks in the group are currently blocked
+ * </ul>
+ * </p>
+ * <p>
+ * The goal is to balance the consideration among groups to ensure the accumulated
+ * weight in the long run is equal among groups. Within a group, the goal is to
+ * balance the consideration among tasks to ensure the accumulated weight in the
+ * long run is equal among tasks within the group.
+ *
+ * <p>Groups start in the blocked state and transition to the runnable state when a task is
+ * added via the {@link #enqueue(Object, Object, long)} method.</p>
+ *
+ * <p>Tasks are dequeued via the {@link #dequeue(long)}. When all tasks in a group have
+ * been dequeued, the group transitions to the running state and is removed from the
+ * queue.</p>
+ *
+ * <p>When a task time slice completes, it needs to be re-enqueued via the
+ * {@link #enqueue(Object, Object, long)}, which includes the desired
+ * increment in relative weight to apply to the task for further prioritization.
+ * The weight increment is also applied to the group.
+ * </p>
+ *
+ * <p>If a task blocks, the caller must call the {@link #block(Object, Object, long)}
+ * method to indicate that the task is no longer running. A weight increment can be
+ * included for the portion of time the task was not blocked.</p>
+ * <br/>
+ * <h2>Group state transitions</h2>
+ * <pre>
+ *                                                                 blockTask()
+ *    finishTask()               enqueueTask()                     enqueueTask()
+ *        ┌───┐   ┌──────────────────────────────────────────┐       ┌────┐
+ *        │   │   │                                          │       │    │
+ *        │   ▼   │                                          ▼       ▼    │
+ *      ┌─┴───────┴─┐   all blocked        finishTask()   ┌────────────┐  │
+ *      │           │◄──────────────O◄────────────────────┤            ├──┘
+ * ────►│  BLOCKED  │               │                     │  RUNNABLE  │
+ *      │           │               │   ┌────────────────►│            │◄───┐
+ *      └───────────┘       not all │   │  enqueueTask()  └──────┬─────┘    │
+ *            ▲             blocked │   │                        │          │
+ *            │                     │   │           dequeueTask()│          │
+ *            │ all blocked         ▼   │                        │          │
+ *            │                   ┌─────┴─────┐                  ▼          │
+ *            │                   │           │◄─────────────────O──────────┘
+ *            O◄──────────────────┤  RUNNING  │      queue empty     queue
+ *            │      blockTask()  │           ├───┐                 not empty
+ *            │                   └───────────┘   │
+ *            │                     ▲      ▲      │ finishTask()
+ *            └─────────────────────┘      └──────┘
+ *                not all blocked
+ *
+ * </pre>
+ *
+ * <h2>Implementation notes</h2>
+ * <ul>
+ *     <li>TODO: Initial weight upon registration</li>
+ *     <li>TODO: Weight adjustment during blocking / unblocking</li>
+ *     <li>TODO: Uncommitted weight on dequeue</li>
+ * </ul>
+ * </p>
+ */
+@NotThreadSafe
+final class SchedulingQueue<G, T>
+{
+    private final PriorityQueue<G> runnableQueue = new PriorityQueue<>();
+    private final Map<G, SchedulingGroup<T>> groups = new HashMap<>();
+    private final PriorityQueue<G> baselineWeights = new PriorityQueue<>();
+
+    public void startGroup(G group)
+    {
+        checkArgument(!groups.containsKey(group), "Group already started: %s", group);
+
+        SchedulingGroup<T> info = new SchedulingGroup<>();
+        groups.put(group, info);
+    }
+
+    public Set<T> finishGroup(G group)
+    {
+        SchedulingGroup<T> info = groups.remove(group);
+        checkArgument(info != null, "Unknown group: %s", group);
+
+        runnableQueue.removeIfPresent(group);
+        baselineWeights.removeIfPresent(group);
+        return info.tasks();
+    }
+
+    public boolean containsGroup(G group)
+    {
+        return groups.containsKey(group);
+    }
+
+    public Set<T> getTasks(G group)
+    {
+        checkArgument(groups.containsKey(group), "Unknown group: %s", group);
+        return groups.get(group).tasks();
+    }
+
+    public Set<T> finishAll()
+    {
+        Set<G> groups = ImmutableSet.copyOf(this.groups.keySet());
+        return groups.stream()
+                .map(this::finishGroup)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toSet());
+    }
+
+    public void finish(G group, T task)
+    {
+        checkArgument(groups.containsKey(group), "Unknown group: %s", group);
+
+        SchedulingGroup<T> info = groups.get(group);
+
+        State previousState = info.state();
+        info.finish(task);
+        State newState = info.state();
+
+        if (newState == RUNNABLE) {
+            runnableQueue.addOrReplace(group, info.weight());
+            baselineWeights.addOrReplace(group, info.weight());
+        }
+        else if (newState == RUNNING) {
+            runnableQueue.removeIfPresent(group);
+            baselineWeights.addOrReplace(group, info.weight());
+        }
+        else if (newState == BLOCKED && previousState != BLOCKED) {
+            info.addWeight(-baselineWeight());
+            runnableQueue.removeIfPresent(group);
+            baselineWeights.removeIfPresent(group);
+        }
+
+        verifyState(group);
+    }
+
+    public void enqueue(G group, T task, long deltaWeight)
+    {
+        checkArgument(groups.containsKey(group), "Unknown group: %s", group);
+
+        SchedulingGroup<T> info = groups.get(group);
+
+        State previousState = info.state();
+        info.enqueue(task, deltaWeight);
+        verify(info.state() == RUNNABLE);
+
+        if (previousState == BLOCKED) {
+            // When transitioning from blocked, set the baseline weight to the minimum current weight
+            // to avoid the newly unblocked group from monopolizing the queue while it catches up
+            info.addWeight(baselineWeight());
+        }
+
+        runnableQueue.addOrReplace(group, info.weight());
+        baselineWeights.addOrReplace(group, info.weight());
+
+        verifyState(group);
+    }
+
+    public void block(G group, T task, long deltaWeight)
+    {
+        SchedulingGroup<T> info = groups.get(group);
+        checkArgument(info != null, "Unknown group: %s", group);
+        checkArgument(info.state() == RUNNABLE || info.state() == RUNNING, "Group is already blocked: %s", group);
+
+        State previousState = info.state();
+        info.block(task, deltaWeight);
+
+        doTransition(group, info, previousState, info.state());
+    }
+
+    public T dequeue(long expectedWeight)
+    {
+        G group = runnableQueue.poll();
+
+        if (group == null) {
+            return null;
+        }
+
+        SchedulingGroup<T> info = groups.get(group);
+        verify(info.state() == RUNNABLE, "Group is not runnable: %s", group);
+
+        T task = info.dequeue(expectedWeight);
+        verify(task != null);
+
+        baselineWeights.addOrReplace(group, info.weight());
+        if (info.state() == RUNNABLE) {
+            runnableQueue.add(group, info.weight());
+        }
+
+        checkState(info.state() == RUNNABLE || info.state() == RUNNING);
+        verifyState(group);
+
+        return task;
+    }
+
+    public T peek()
+    {
+        G group = runnableQueue.peek();
+
+        if (group == null) {
+            return null;
+        }
+
+        SchedulingGroup<T> info = groups.get(group);
+        verify(info.state() == RUNNABLE, "Group is not runnable: %s", group);
+
+        T task = info.peek();
+        checkState(task != null);
+
+        return task;
+    }
+
+    public int getRunnableCount()
+    {
+        return runnableQueue.values().stream()
+                .map(groups::get)
+                .mapToInt(SchedulingGroup::runnableCount)
+                .sum();
+    }
+
+    public State state(G group)
+    {
+        SchedulingGroup<T> info = groups.get(group);
+        checkArgument(info != null, "Unknown group: %s", group);
+
+        return info.state();
+    }
+
+    private long baselineWeight()
+    {
+        if (baselineWeights.isEmpty()) {
+            return 0;
+        }
+
+        return baselineWeights.nextPriority();
+    }
+
+    private void doTransition(G group, SchedulingGroup<T> info, State previousState, State newState)
+    {
+        if (newState == RUNNABLE) {
+            runnableQueue.addOrReplace(group, info.weight());
+            baselineWeights.addOrReplace(group, info.weight());
+        }
+        else if (newState == RUNNING) {
+            runnableQueue.removeIfPresent(group);
+            baselineWeights.addOrReplace(group, info.weight());
+        }
+        else if (newState == BLOCKED && previousState != BLOCKED) {
+            info.addWeight(-baselineWeight());
+            runnableQueue.removeIfPresent(group);
+            baselineWeights.removeIfPresent(group);
+        }
+
+        verifyState(group);
+    }
+
+    private void verifyState(G groupKey)
+    {
+        SchedulingGroup<T> group = groups.get(groupKey);
+        checkArgument(group != null, "Unknown group: %s", groupKey);
+
+        switch (group.state()) {
+            case BLOCKED -> {
+                checkState(!runnableQueue.contains(groupKey), "Group in BLOCKED state should not be in queue: %s", groupKey);
+                checkState(!baselineWeights.contains(groupKey));
+            }
+            case RUNNABLE -> {
+                checkState(runnableQueue.contains(groupKey), "Group in RUNNABLE state should be in queue: %s", groupKey);
+                checkState(baselineWeights.contains(groupKey));
+            }
+            case RUNNING -> {
+                checkState(!runnableQueue.contains(groupKey), "Group in RUNNING state should not be in queue: %s", groupKey);
+                checkState(baselineWeights.contains(groupKey));
+            }
+        }
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+
+        builder.append("Baseline weight: %s\n".formatted(baselineWeight()));
+        builder.append("\n");
+
+        for (Map.Entry<G, SchedulingGroup<T>> entry : groups.entrySet()) {
+            G group = entry.getKey();
+            SchedulingGroup<T> info = entry.getValue();
+
+            String prefix = "%s %s".formatted(
+                    group == runnableQueue.peek() ? "=>" : " -",
+                    group);
+
+            String details = switch (entry.getValue().state()) {
+                case BLOCKED -> "[BLOCKED, saved delta = %s]".formatted(info.weight());
+                case RUNNING, RUNNABLE -> "[%s, weight = %s, baseline = %s]".formatted(info.state(), info.weight(), info.baselineWeight());
+            };
+
+            builder.append((prefix + " " + details).indent(4));
+            builder.append(info.toString().indent(8));
+        }
+
+        return builder.toString();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/State.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/State.java
new file mode 100644
index 000000000000..35e9bca8a6d6
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/State.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+enum State
+{
+    BLOCKED, // all tasks are blocked
+    RUNNING, // all tasks are dequeued and running
+    RUNNABLE // some tasks are enqueued and ready to run
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Task.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Task.java
new file mode 100644
index 000000000000..af62f7e4fb1d
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/Task.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import io.trino.annotation.NotThreadSafe;
+
+@NotThreadSafe
+final class Task
+{
+    private State state;
+    private long weight;
+    private long uncommittedWeight;
+
+    public Task(long initialWeight)
+    {
+        weight = initialWeight;
+    }
+
+    public void setState(State state)
+    {
+        this.state = state;
+    }
+
+    public void commitWeight(long delta)
+    {
+        weight += delta;
+        uncommittedWeight = 0;
+    }
+
+    public void addWeight(long delta)
+    {
+        weight += delta;
+    }
+
+    public long weight()
+    {
+        return weight + uncommittedWeight;
+    }
+
+    public void setUncommittedWeight(long weight)
+    {
+        this.uncommittedWeight = weight;
+    }
+
+    public long uncommittedWeight()
+    {
+        return uncommittedWeight;
+    }
+
+    public State state()
+    {
+        return state;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/TaskControl.java b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/TaskControl.java
new file mode 100644
index 000000000000..dd2e4f41759f
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/TaskControl.java
@@ -0,0 +1,371 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import com.google.common.base.Ticker;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Equality is based on group and id for the purpose of adding to the scheduling queue.
+ */
+@ThreadSafe
+final class TaskControl
+{
+    private final Group group;
+    private final int id;
+    private final Ticker ticker;
+
+    private final Lock lock = new ReentrantLock();
+
+    @GuardedBy("lock")
+    private final Condition wakeup = lock.newCondition();
+
+    @GuardedBy("lock")
+    private boolean ready;
+
+    @GuardedBy("lock")
+    private boolean blocked;
+
+    @GuardedBy("lock")
+    private boolean cancelled;
+
+    @GuardedBy("lock")
+    private State state;
+
+    private volatile long periodStart;
+    private final AtomicLong startNanos = new AtomicLong();
+    private final AtomicLong scheduledNanos = new AtomicLong();
+    private final AtomicLong blockedNanos = new AtomicLong();
+    private final AtomicLong waitNanos = new AtomicLong();
+    private volatile Thread thread;
+
+    public TaskControl(Group group, int id, Ticker ticker)
+    {
+        this.group = requireNonNull(group, "group is null");
+        this.id = id;
+        this.ticker = requireNonNull(ticker, "ticker is null");
+        this.state = State.NEW;
+        this.ready = false;
+        this.periodStart = ticker.read();
+    }
+
+    public int id()
+    {
+        return id;
+    }
+
+    public void setThread(Thread thread)
+    {
+        this.thread = thread;
+    }
+
+    public void cancel()
+    {
+        lock.lock();
+        try {
+            cancelled = true;
+            wakeup.signal();
+
+            // TODO: it should be possible to interrupt the thread, but
+            //       it appears that it's not safe to do so. It can cause the query
+            //       to get stuck (e.g., AbstractDistributedEngineOnlyQueries.testSelectiveLimit)
+            //
+            //       Thread thread = this.thread;
+            //       if (thread != null) {
+            //           thread.interrupt();
+            //       }
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    /**
+     * Called by the scheduler thread when the task is ready to run. It
+     * causes anyone blocking in {@link #awaitReady()} to wake up.
+     *
+     * @return false if the task was already cancelled
+     */
+    public boolean markReady()
+    {
+        lock.lock();
+        try {
+            if (cancelled) {
+                return false;
+            }
+            ready = true;
+            wakeup.signal();
+        }
+        finally {
+            lock.unlock();
+        }
+
+        return true;
+    }
+
+    public void markNotReady()
+    {
+        lock.lock();
+        try {
+            ready = false;
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public boolean isReady()
+    {
+        lock.lock();
+        try {
+            return ready;
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    /**
+     * @return false if the operation was interrupted due to cancellation
+     */
+    public boolean awaitReady()
+    {
+        lock.lock();
+        try {
+            while (!ready && !cancelled) {
+                try {
+                    wakeup.await();
+                }
+                catch (InterruptedException e) {
+                }
+            }
+
+            return !cancelled;
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public void markUnblocked()
+    {
+        lock.lock();
+        try {
+            blocked = false;
+            wakeup.signal();
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public void markBlocked()
+    {
+        lock.lock();
+        try {
+            blocked = true;
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public void awaitUnblock()
+    {
+        lock.lock();
+        try {
+            while (blocked && !cancelled) {
+                try {
+                    wakeup.await();
+                }
+                catch (InterruptedException e) {
+                }
+            }
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    /**
+     * @return false if the transition was unsuccessful due to the task being interrupted
+     */
+    public boolean transitionToBlocked()
+    {
+        boolean success = transitionTo(State.BLOCKED);
+
+        if (success) {
+            markBlocked();
+        }
+
+        return success;
+    }
+
+    public void transitionToFinished()
+    {
+        transitionTo(State.FINISHED);
+    }
+
+    /**
+     * @return false if the transition was unsuccessful due to the task being interrupted
+     */
+    public boolean transitionToWaiting()
+    {
+        boolean success = transitionTo(State.WAITING);
+
+        if (success) {
+            markNotReady();
+        }
+
+        return success;
+    }
+
+    /**
+     * @return false if the transition was unsuccessful due to the task being interrupted
+     */
+    public boolean transitionToRunning()
+    {
+        return transitionTo(State.RUNNING);
+    }
+
+    private boolean transitionTo(State state)
+    {
+        lock.lock();
+        try {
+            recordPeriodEnd(this.state);
+
+            if (cancelled) {
+                this.state = State.INTERRUPTED;
+                return false;
+            }
+            else {
+                this.state = state;
+                return true;
+            }
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    private void recordPeriodEnd(State state)
+    {
+        long now = ticker.read();
+        long elapsed = now - periodStart;
+        switch (state) {
+            case RUNNING -> scheduledNanos.addAndGet(elapsed);
+            case BLOCKED -> blockedNanos.addAndGet(elapsed);
+            case NEW -> startNanos.addAndGet(elapsed);
+            case WAITING -> waitNanos.addAndGet(elapsed);
+            case INTERRUPTED, FINISHED -> {}
+        }
+        periodStart = now;
+    }
+
+    public Group group()
+    {
+        return group;
+    }
+
+    public State getState()
+    {
+        lock.lock();
+        try {
+            return state;
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public long elapsed()
+    {
+        return ticker.read() - periodStart;
+    }
+
+    public long getStartNanos()
+    {
+        return startNanos.get();
+    }
+
+    public long getWaitNanos()
+    {
+        return waitNanos.get();
+    }
+
+    public long getScheduledNanos()
+    {
+        return scheduledNanos.get();
+    }
+
+    public long getBlockedNanos()
+    {
+        return blockedNanos.get();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TaskControl that = (TaskControl) o;
+        return id == that.id && group.equals(that.group);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(group, id);
+    }
+
+    @Override
+    public String toString()
+    {
+        lock.lock();
+        try {
+            return group.name() + "-" + id + " [" + state + "]";
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public Thread getThread()
+    {
+        return thread;
+    }
+
+    public enum State
+    {
+        NEW,
+        WAITING,
+        RUNNING,
+        BLOCKED,
+        INTERRUPTED,
+        FINISHED
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/group-state-diagram.dot b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/group-state-diagram.dot
new file mode 100644
index 000000000000..bc1346753ee0
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/scheduler/group-state-diagram.dot
@@ -0,0 +1,24 @@
+digraph Group {
+    node [shape=box];
+
+    start [shape=point];
+    split1 [shape=point];
+    split2 [shape=point];
+
+
+    start -> blocked;
+    blocked -> runnable [label="enqueueTask()"];
+    runnable -> runnable [label="enqueueTask()\nblockTask()"];
+    runnable -> split1 [label="dequeueTask()"];
+    split1 -> runnable [label="queue not empty"];
+    split1 -> running [label="queue empty"];
+    running -> split2 [label="blockTask()"];
+    running -> runnable [label="enqueueTask()"];
+    split2 -> blocked [label="all blocked"];
+    split2 -> running [label="not all blocked"];
+    blocked -> blocked [label="finishTask()"];
+    running -> running [label="finishTask()"];
+    runnable -> split3 [label="finishTask()"];
+    split3 -> blocked [label="all blocked"];
+    split3 -> running [label="all running"];
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/MultilevelSplitQueue.java b/core/trino-main/src/main/java/io/trino/execution/executor/timesharing/MultilevelSplitQueue.java
similarity index 96%
rename from core/trino-main/src/main/java/io/trino/execution/executor/MultilevelSplitQueue.java
rename to core/trino-main/src/main/java/io/trino/execution/executor/timesharing/MultilevelSplitQueue.java
index a012a3d7085a..70403cb6c7ca 100644
--- a/core/trino-main/src/main/java/io/trino/execution/executor/MultilevelSplitQueue.java
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/timesharing/MultilevelSplitQueue.java
@@ -11,18 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.executor;
+package io.trino.execution.executor.timesharing;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.stats.CounterStat;
 import io.trino.execution.TaskManagerConfig;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.PriorityQueue;
 import java.util.concurrent.atomic.AtomicLong;
@@ -31,6 +30,8 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.math.DoubleMath.roundToLong;
+import static java.math.RoundingMode.HALF_UP;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
@@ -170,7 +171,7 @@ private PrioritizedSplitRunner pollSplit()
                 }
             }
 
-            targetScheduledTime /= levelTimeMultiplier;
+            targetScheduledTime = roundToLong(targetScheduledTime / levelTimeMultiplier, HALF_UP);
         }
 
         if (selectedLevel == -1) {
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/PrioritizedSplitRunner.java b/core/trino-main/src/main/java/io/trino/execution/executor/timesharing/PrioritizedSplitRunner.java
similarity index 81%
rename from core/trino-main/src/main/java/io/trino/execution/executor/PrioritizedSplitRunner.java
rename to core/trino-main/src/main/java/io/trino/execution/executor/timesharing/PrioritizedSplitRunner.java
index 5b98af62e0a3..157c6cdd0cd9 100644
--- a/core/trino-main/src/main/java/io/trino/execution/executor/PrioritizedSplitRunner.java
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/timesharing/PrioritizedSplitRunner.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.executor;
+package io.trino.execution.executor.timesharing;
 
 import com.google.common.base.Ticker;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -21,7 +21,11 @@
 import io.airlift.stats.CpuTimer;
 import io.airlift.stats.TimeStat;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
 import io.trino.execution.SplitRunner;
+import io.trino.tracing.TrinoAttributes;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -29,11 +33,12 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import static io.trino.operator.Operator.NOT_BLOCKED;
+import static io.trino.tracing.ScopedSpan.scopedSpan;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
-public class PrioritizedSplitRunner
+public final class PrioritizedSplitRunner
         implements Comparable<PrioritizedSplitRunner>
 {
     private static final AtomicLong NEXT_WORKER_ID = new AtomicLong();
@@ -45,20 +50,22 @@ public class PrioritizedSplitRunner
 
     private final long createdNanos = System.nanoTime();
 
-    private final TaskHandle taskHandle;
+    private final TimeSharingTaskHandle taskHandle;
     private final int splitId;
     private final long workerId;
     private final SplitRunner split;
 
+    private final Span splitSpan;
+
+    private final Tracer tracer;
     private final Ticker ticker;
 
     private final SettableFuture<Void> finishedFuture = SettableFuture.create();
 
     private final AtomicBoolean destroyed = new AtomicBoolean();
 
-    protected final AtomicReference<Priority> priority = new AtomicReference<>(new Priority(0, 0));
+    private final AtomicReference<Priority> priority = new AtomicReference<>(new Priority(0, 0));
 
-    protected final AtomicLong lastRun = new AtomicLong();
     private final AtomicLong lastReady = new AtomicLong();
     private final AtomicLong start = new AtomicLong();
 
@@ -74,8 +81,11 @@ public class PrioritizedSplitRunner
     private final TimeStat unblockedQuantaWallTime;
 
     PrioritizedSplitRunner(
-            TaskHandle taskHandle,
+            TimeSharingTaskHandle taskHandle,
+            int splitId,
             SplitRunner split,
+            Span splitSpan,
+            Tracer tracer,
             Ticker ticker,
             CounterStat globalCpuTimeMicros,
             CounterStat globalScheduledTimeMicros,
@@ -83,8 +93,10 @@ public class PrioritizedSplitRunner
             TimeStat unblockedQuantaWallTime)
     {
         this.taskHandle = requireNonNull(taskHandle, "taskHandle is null");
-        this.splitId = taskHandle.getNextSplitId();
+        this.splitId = splitId;
         this.split = requireNonNull(split, "split is null");
+        this.splitSpan = requireNonNull(splitSpan, "splitSpan is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
         this.ticker = requireNonNull(ticker, "ticker is null");
         this.workerId = NEXT_WORKER_ID.getAndIncrement();
         this.globalCpuTimeMicros = requireNonNull(globalCpuTimeMicros, "globalCpuTimeMicros is null");
@@ -92,10 +104,10 @@ public class PrioritizedSplitRunner
         this.blockedQuantaWallTime = requireNonNull(blockedQuantaWallTime, "blockedQuantaWallTime is null");
         this.unblockedQuantaWallTime = requireNonNull(unblockedQuantaWallTime, "unblockedQuantaWallTime is null");
 
-        this.updateLevelPriority();
+        updateLevelPriority();
     }
 
-    public TaskHandle getTaskHandle()
+    public TimeSharingTaskHandle getTaskHandle()
     {
         return taskHandle;
     }
@@ -119,6 +131,12 @@ public void destroy()
         catch (RuntimeException e) {
             log.error(e, "Error closing split for task %s", taskHandle.getTaskId());
         }
+        finally {
+            splitSpan.setAttribute(TrinoAttributes.SPLIT_SCHEDULED_TIME_NANOS, getScheduledNanos());
+            splitSpan.setAttribute(TrinoAttributes.SPLIT_CPU_TIME_NANOS, getCpuTimeNanos());
+            splitSpan.setAttribute(TrinoAttributes.SPLIT_WAIT_TIME_NANOS, getWaitNanos());
+            splitSpan.end();
+        }
     }
 
     public long getCreatedNanos()
@@ -152,7 +170,11 @@ public long getWaitNanos()
 
     public ListenableFuture<Void> process()
     {
-        try {
+        Span span = tracer.spanBuilder("process")
+                .setParent(Context.current().with(splitSpan))
+                .startSpan();
+
+        try (var ignored = scopedSpan(span)) {
             long startNanos = ticker.read();
             start.compareAndSet(0, startNanos);
             lastReady.compareAndSet(0, startNanos);
@@ -165,12 +187,10 @@ public ListenableFuture<Void> process()
             ListenableFuture<Void> blocked = split.processFor(SPLIT_RUN_QUANTA);
             CpuTimer.CpuDuration elapsed = timer.elapsedTime();
 
-            long endNanos = ticker.read();
-            long quantaScheduledNanos = endNanos - startNanos;
+            long quantaScheduledNanos = elapsed.getWall().roundTo(NANOSECONDS);
             scheduledNanos.addAndGet(quantaScheduledNanos);
 
             priority.set(taskHandle.addScheduledNanos(quantaScheduledNanos));
-            lastRun.set(endNanos);
 
             if (blocked == NOT_BLOCKED) {
                 unblockedQuantaWallTime.add(elapsed.getWall());
@@ -185,6 +205,10 @@ public ListenableFuture<Void> process()
             globalCpuTimeMicros.update(quantaCpuNanos / 1000);
             globalScheduledTimeMicros.update(quantaScheduledNanos / 1000);
 
+            span.setAttribute(TrinoAttributes.SPLIT_CPU_TIME_NANOS, quantaCpuNanos);
+            span.setAttribute(TrinoAttributes.SPLIT_SCHEDULED_TIME_NANOS, quantaScheduledNanos);
+            span.setAttribute(TrinoAttributes.SPLIT_BLOCKED, blocked != NOT_BLOCKED);
+
             return blocked;
         }
         catch (Throwable e) {
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/Priority.java b/core/trino-main/src/main/java/io/trino/execution/executor/timesharing/Priority.java
similarity index 95%
rename from core/trino-main/src/main/java/io/trino/execution/executor/Priority.java
rename to core/trino-main/src/main/java/io/trino/execution/executor/timesharing/Priority.java
index d1b5c9fa8345..a7c0ac0c9f82 100644
--- a/core/trino-main/src/main/java/io/trino/execution/executor/Priority.java
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/timesharing/Priority.java
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.executor;
+package io.trino.execution.executor.timesharing;
 
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/timesharing/TimeSharingTaskExecutor.java b/core/trino-main/src/main/java/io/trino/execution/executor/timesharing/TimeSharingTaskExecutor.java
new file mode 100644
index 000000000000..4536d9437af1
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/timesharing/TimeSharingTaskExecutor.java
@@ -0,0 +1,954 @@
+/*
+ * Licensed 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 io.trino.execution.executor.timesharing;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Ticker;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
+import io.airlift.concurrent.SetThreadName;
+import io.airlift.concurrent.ThreadPoolExecutorMBean;
+import io.airlift.log.Logger;
+import io.airlift.stats.CounterStat;
+import io.airlift.stats.DistributionStat;
+import io.airlift.stats.TimeDistribution;
+import io.airlift.stats.TimeStat;
+import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
+import io.trino.execution.SplitRunner;
+import io.trino.execution.TaskId;
+import io.trino.execution.TaskManagerConfig;
+import io.trino.execution.executor.RunningSplitInfo;
+import io.trino.execution.executor.TaskExecutor;
+import io.trino.execution.executor.TaskHandle;
+import io.trino.spi.TrinoException;
+import io.trino.spi.VersionEmbedder;
+import io.trino.tracing.TrinoAttributes;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import org.weakref.jmx.Managed;
+import org.weakref.jmx.Nested;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.OptionalInt;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicLongArray;
+import java.util.function.DoubleSupplier;
+import java.util.function.Predicate;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.collect.Sets.newConcurrentHashSet;
+import static io.airlift.concurrent.Threads.threadsNamed;
+import static io.airlift.tracing.Tracing.noopTracer;
+import static io.trino.execution.executor.timesharing.MultilevelSplitQueue.computeLevel;
+import static io.trino.version.EmbedVersion.testingVersionEmbedder;
+import static java.lang.Math.min;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.Executors.newCachedThreadPool;
+import static java.util.concurrent.TimeUnit.MICROSECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+@ThreadSafe
+public class TimeSharingTaskExecutor
+        implements TaskExecutor
+{
+    private static final Logger log = Logger.get(TimeSharingTaskExecutor.class);
+    private static final AtomicLong NEXT_RUNNER_ID = new AtomicLong();
+
+    private final ExecutorService executor;
+    private final ThreadPoolExecutorMBean executorMBean;
+
+    private final int runnerThreads;
+    private final int minimumNumberOfDrivers;
+    private final int guaranteedNumberOfDriversPerTask;
+    private final int maximumNumberOfDriversPerTask;
+    private final VersionEmbedder versionEmbedder;
+    private final Tracer tracer;
+
+    private final Ticker ticker;
+
+    private final Duration stuckSplitsWarningThreshold;
+    private final SortedSet<RunningSplitInfo> runningSplitInfos = new ConcurrentSkipListSet<>();
+
+    @GuardedBy("this")
+    private final List<TimeSharingTaskHandle> tasks;
+
+    /**
+     * All splits registered with the task executor.
+     */
+    @GuardedBy("this")
+    private final Set<PrioritizedSplitRunner> allSplits = new HashSet<>();
+
+    /**
+     * Intermediate splits (i.e. splits that should not be queued).
+     */
+    @GuardedBy("this")
+    private final Set<PrioritizedSplitRunner> intermediateSplits = new HashSet<>();
+
+    /**
+     * Splits waiting for a runner thread.
+     */
+    private final MultilevelSplitQueue waitingSplits;
+
+    /**
+     * Splits running on a thread.
+     */
+    private final Set<PrioritizedSplitRunner> runningSplits = newConcurrentHashSet();
+
+    /**
+     * Splits blocked by the driver.
+     */
+    private final Map<PrioritizedSplitRunner, Future<Void>> blockedSplits = new ConcurrentHashMap<>();
+
+    private final AtomicLongArray completedTasksPerLevel = new AtomicLongArray(5);
+    private final AtomicLongArray completedSplitsPerLevel = new AtomicLongArray(5);
+
+    private final TimeStat splitQueuedTime = new TimeStat(NANOSECONDS);
+    private final TimeStat splitWallTime = new TimeStat(NANOSECONDS);
+
+    private final TimeDistribution leafSplitWallTime = new TimeDistribution(MICROSECONDS);
+    private final TimeDistribution intermediateSplitWallTime = new TimeDistribution(MICROSECONDS);
+
+    private final TimeDistribution leafSplitScheduledTime = new TimeDistribution(MICROSECONDS);
+    private final TimeDistribution intermediateSplitScheduledTime = new TimeDistribution(MICROSECONDS);
+
+    private final TimeDistribution leafSplitWaitTime = new TimeDistribution(MICROSECONDS);
+    private final TimeDistribution intermediateSplitWaitTime = new TimeDistribution(MICROSECONDS);
+
+    private final TimeDistribution leafSplitCpuTime = new TimeDistribution(MICROSECONDS);
+    private final TimeDistribution intermediateSplitCpuTime = new TimeDistribution(MICROSECONDS);
+
+    // shared between SplitRunners
+    private final CounterStat globalCpuTimeMicros = new CounterStat();
+    private final CounterStat globalScheduledTimeMicros = new CounterStat();
+
+    private final TimeStat blockedQuantaWallTime = new TimeStat(MICROSECONDS);
+    private final TimeStat unblockedQuantaWallTime = new TimeStat(MICROSECONDS);
+
+    private final DistributionStat leafSplitsSize = new DistributionStat();
+    @GuardedBy("this")
+    private long lastLeafSplitsSizeRecordTime;
+    @GuardedBy("this")
+    private long lastLeafSplitsSize;
+
+    private volatile boolean closed;
+
+    @Inject
+    public TimeSharingTaskExecutor(TaskManagerConfig config, VersionEmbedder versionEmbedder, Tracer tracer, MultilevelSplitQueue splitQueue)
+    {
+        this(
+                config.getMaxWorkerThreads(),
+                config.getMinDrivers(),
+                config.getMinDriversPerTask(),
+                config.getMaxDriversPerTask(),
+                config.getInterruptStuckSplitTasksWarningThreshold(),
+                versionEmbedder,
+                tracer,
+                splitQueue,
+                Ticker.systemTicker());
+    }
+
+    @VisibleForTesting
+    public TimeSharingTaskExecutor(int runnerThreads, int minDrivers, int guaranteedNumberOfDriversPerTask, int maximumNumberOfDriversPerTask, Ticker ticker)
+    {
+        this(runnerThreads, minDrivers, guaranteedNumberOfDriversPerTask, maximumNumberOfDriversPerTask, new Duration(10, TimeUnit.MINUTES), testingVersionEmbedder(), noopTracer(), new MultilevelSplitQueue(2), ticker);
+    }
+
+    @VisibleForTesting
+    public TimeSharingTaskExecutor(int runnerThreads, int minDrivers, int guaranteedNumberOfDriversPerTask, int maximumNumberOfDriversPerTask, MultilevelSplitQueue splitQueue, Ticker ticker)
+    {
+        this(runnerThreads, minDrivers, guaranteedNumberOfDriversPerTask, maximumNumberOfDriversPerTask, new Duration(10, TimeUnit.MINUTES), testingVersionEmbedder(), noopTracer(), splitQueue, ticker);
+    }
+
+    @VisibleForTesting
+    public TimeSharingTaskExecutor(
+            int runnerThreads,
+            int minDrivers,
+            int guaranteedNumberOfDriversPerTask,
+            int maximumNumberOfDriversPerTask,
+            Duration stuckSplitsWarningThreshold,
+            VersionEmbedder versionEmbedder,
+            Tracer tracer,
+            MultilevelSplitQueue splitQueue,
+            Ticker ticker)
+    {
+        checkArgument(runnerThreads > 0, "runnerThreads must be at least 1");
+        checkArgument(guaranteedNumberOfDriversPerTask > 0, "guaranteedNumberOfDriversPerTask must be at least 1");
+        checkArgument(maximumNumberOfDriversPerTask > 0, "maximumNumberOfDriversPerTask must be at least 1");
+        checkArgument(guaranteedNumberOfDriversPerTask <= maximumNumberOfDriversPerTask, "guaranteedNumberOfDriversPerTask cannot be greater than maximumNumberOfDriversPerTask");
+
+        // we manage thread pool size directly, so create an unlimited pool
+        this.executor = newCachedThreadPool(threadsNamed("task-processor-%s"));
+        this.executorMBean = new ThreadPoolExecutorMBean((ThreadPoolExecutor) executor);
+        this.runnerThreads = runnerThreads;
+        this.versionEmbedder = requireNonNull(versionEmbedder, "versionEmbedder is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
+
+        this.ticker = requireNonNull(ticker, "ticker is null");
+        this.stuckSplitsWarningThreshold = requireNonNull(stuckSplitsWarningThreshold, "stuckSplitsWarningThreshold is null");
+
+        this.minimumNumberOfDrivers = minDrivers;
+        this.guaranteedNumberOfDriversPerTask = guaranteedNumberOfDriversPerTask;
+        this.maximumNumberOfDriversPerTask = maximumNumberOfDriversPerTask;
+        this.waitingSplits = requireNonNull(splitQueue, "splitQueue is null");
+        this.tasks = new LinkedList<>();
+        this.lastLeafSplitsSizeRecordTime = ticker.read();
+    }
+
+    @PostConstruct
+    @Override
+    public synchronized void start()
+    {
+        checkState(!closed, "TaskExecutor is closed");
+        for (int i = 0; i < runnerThreads; i++) {
+            addRunnerThread();
+        }
+    }
+
+    @PreDestroy
+    @Override
+    public synchronized void stop()
+    {
+        closed = true;
+        executor.shutdownNow();
+    }
+
+    @Override
+    public synchronized String toString()
+    {
+        return toStringHelper(this)
+                .add("runnerThreads", runnerThreads)
+                .add("allSplits", allSplits.size())
+                .add("intermediateSplits", intermediateSplits.size())
+                .add("waitingSplits", waitingSplits.size())
+                .add("runningSplits", runningSplits.size())
+                .add("blockedSplits", blockedSplits.size())
+                .toString();
+    }
+
+    private synchronized void addRunnerThread()
+    {
+        try {
+            executor.execute(versionEmbedder.embedVersion(new TaskRunner()));
+        }
+        catch (RejectedExecutionException ignored) {
+        }
+    }
+
+    @Override
+    public synchronized TimeSharingTaskHandle addTask(
+            TaskId taskId,
+            DoubleSupplier utilizationSupplier,
+            int initialSplitConcurrency,
+            Duration splitConcurrencyAdjustFrequency,
+            OptionalInt maxDriversPerTask)
+    {
+        requireNonNull(taskId, "taskId is null");
+        requireNonNull(utilizationSupplier, "utilizationSupplier is null");
+        checkArgument(maxDriversPerTask.isEmpty() || maxDriversPerTask.getAsInt() <= maximumNumberOfDriversPerTask,
+                "maxDriversPerTask cannot be greater than the configured value");
+
+        log.debug("Task scheduled %s", taskId);
+
+        TimeSharingTaskHandle taskHandle = new TimeSharingTaskHandle(taskId, waitingSplits, utilizationSupplier, initialSplitConcurrency, splitConcurrencyAdjustFrequency, maxDriversPerTask);
+
+        tasks.add(taskHandle);
+        return taskHandle;
+    }
+
+    @Override
+    public void removeTask(TaskHandle taskHandle)
+    {
+        TimeSharingTaskHandle handle = (TimeSharingTaskHandle) taskHandle;
+        try (SetThreadName ignored = new SetThreadName("Task-%s", handle.getTaskId())) {
+            // Skip additional scheduling if the task was already destroyed
+            if (!doRemoveTask(handle)) {
+                return;
+            }
+        }
+
+        // replace blocked splits that were terminated
+        synchronized (this) {
+            addNewEntrants();
+            recordLeafSplitsSize();
+        }
+    }
+
+    /**
+     * Returns <code>true</code> if the task handle was destroyed and removed splits as a result that may need to be replaced. Otherwise,
+     * if the {@link TimeSharingTaskHandle} was already destroyed or no splits were removed then this method returns <code>false</code> and no additional
+     * splits need to be scheduled.
+     */
+    private boolean doRemoveTask(TimeSharingTaskHandle taskHandle)
+    {
+        List<PrioritizedSplitRunner> splits;
+        synchronized (this) {
+            tasks.remove(taskHandle);
+
+            // Task is already destroyed
+            if (taskHandle.isDestroyed()) {
+                return false;
+            }
+
+            splits = taskHandle.destroy();
+            // stop tracking splits (especially blocked splits which may never unblock)
+            allSplits.removeAll(splits);
+            intermediateSplits.removeAll(splits);
+            blockedSplits.keySet().removeAll(splits);
+            waitingSplits.removeAll(splits);
+            recordLeafSplitsSize();
+        }
+
+        // call destroy outside of synchronized block as it is expensive and doesn't need a lock on the task executor
+        for (PrioritizedSplitRunner split : splits) {
+            split.destroy();
+        }
+
+        // record completed stats
+        long threadUsageNanos = taskHandle.getScheduledNanos();
+        completedTasksPerLevel.incrementAndGet(computeLevel(threadUsageNanos));
+
+        log.debug("Task finished or failed %s", taskHandle.getTaskId());
+        return !splits.isEmpty();
+    }
+
+    @Override
+    public List<ListenableFuture<Void>> enqueueSplits(TaskHandle taskHandle, boolean intermediate, List<? extends SplitRunner> taskSplits)
+    {
+        TimeSharingTaskHandle handle = (TimeSharingTaskHandle) taskHandle;
+        List<PrioritizedSplitRunner> splitsToDestroy = new ArrayList<>();
+        List<ListenableFuture<Void>> finishedFutures = new ArrayList<>(taskSplits.size());
+        synchronized (this) {
+            for (SplitRunner taskSplit : taskSplits) {
+                TaskId taskId = handle.getTaskId();
+                int splitId = handle.getNextSplitId();
+
+                Span splitSpan = tracer.spanBuilder(intermediate ? "split (intermediate)" : "split (leaf)")
+                        .setParent(Context.current().with(taskSplit.getPipelineSpan()))
+                        .setAttribute(TrinoAttributes.QUERY_ID, taskId.getQueryId().toString())
+                        .setAttribute(TrinoAttributes.STAGE_ID, taskId.getStageId().toString())
+                        .setAttribute(TrinoAttributes.TASK_ID, taskId.toString())
+                        .setAttribute(TrinoAttributes.PIPELINE_ID, taskId.getStageId() + "-" + taskSplit.getPipelineId())
+                        .setAttribute(TrinoAttributes.SPLIT_ID, taskId + "-" + splitId)
+                        .startSpan();
+
+                PrioritizedSplitRunner prioritizedSplitRunner = new PrioritizedSplitRunner(
+                        handle,
+                        splitId,
+                        taskSplit,
+                        splitSpan,
+                        tracer,
+                        ticker,
+                        globalCpuTimeMicros,
+                        globalScheduledTimeMicros,
+                        blockedQuantaWallTime,
+                        unblockedQuantaWallTime);
+
+                if (intermediate) {
+                    // add the runner to the handle so it can be destroyed if the task is canceled
+                    if (handle.recordIntermediateSplit(prioritizedSplitRunner)) {
+                        // Note: we do not record queued time for intermediate splits
+                        startIntermediateSplit(prioritizedSplitRunner);
+                    }
+                    else {
+                        splitsToDestroy.add(prioritizedSplitRunner);
+                    }
+                }
+                else {
+                    // add this to the work queue for the task
+                    if (handle.enqueueSplit(prioritizedSplitRunner)) {
+                        // if task is under the limit for guaranteed splits, start one
+                        scheduleTaskIfNecessary(handle);
+                        // if globally we have more resources, start more
+                        addNewEntrants();
+                    }
+                    else {
+                        splitsToDestroy.add(prioritizedSplitRunner);
+                    }
+                }
+
+                finishedFutures.add(prioritizedSplitRunner.getFinishedFuture());
+            }
+            recordLeafSplitsSize();
+        }
+        for (PrioritizedSplitRunner split : splitsToDestroy) {
+            split.destroy();
+        }
+        return finishedFutures;
+    }
+
+    private void splitFinished(PrioritizedSplitRunner split)
+    {
+        completedSplitsPerLevel.incrementAndGet(split.getPriority().getLevel());
+        synchronized (this) {
+            allSplits.remove(split);
+
+            long wallNanos = System.nanoTime() - split.getCreatedNanos();
+            splitWallTime.add(Duration.succinctNanos(wallNanos));
+
+            if (intermediateSplits.remove(split)) {
+                intermediateSplitWallTime.add(wallNanos);
+                intermediateSplitScheduledTime.add(split.getScheduledNanos());
+                intermediateSplitWaitTime.add(split.getWaitNanos());
+                intermediateSplitCpuTime.add(split.getCpuTimeNanos());
+            }
+            else {
+                leafSplitWallTime.add(wallNanos);
+                leafSplitScheduledTime.add(split.getScheduledNanos());
+                leafSplitWaitTime.add(split.getWaitNanos());
+                leafSplitCpuTime.add(split.getCpuTimeNanos());
+            }
+
+            TimeSharingTaskHandle taskHandle = split.getTaskHandle();
+            taskHandle.splitComplete(split);
+
+            scheduleTaskIfNecessary(taskHandle);
+
+            addNewEntrants();
+            recordLeafSplitsSize();
+        }
+        // call destroy outside of synchronized block as it is expensive and doesn't need a lock on the task executor
+        split.destroy();
+    }
+
+    private synchronized void scheduleTaskIfNecessary(TimeSharingTaskHandle taskHandle)
+    {
+        // if task has less than the minimum guaranteed splits running,
+        // immediately schedule new splits for this task.  This assures
+        // that a task gets its fair amount of consideration (you have to
+        // have splits to be considered for running on a thread).
+        int splitsToSchedule = min(guaranteedNumberOfDriversPerTask, taskHandle.getMaxDriversPerTask().orElse(Integer.MAX_VALUE)) - taskHandle.getRunningLeafSplits();
+        for (int i = 0; i < splitsToSchedule; ++i) {
+            PrioritizedSplitRunner split = taskHandle.pollNextSplit();
+            if (split == null) {
+                // no more splits to schedule
+                return;
+            }
+
+            startSplit(split);
+            splitQueuedTime.add(Duration.nanosSince(split.getCreatedNanos()));
+        }
+        recordLeafSplitsSize();
+    }
+
+    private synchronized void addNewEntrants()
+    {
+        // Ignore intermediate splits when checking minimumNumberOfDrivers.
+        // Otherwise with (for example) minimumNumberOfDrivers = 100, 200 intermediate splits
+        // and 100 leaf splits, depending on order of appearing splits, number of
+        // simultaneously running splits may vary. If leaf splits start first, there will
+        // be 300 running splits. If intermediate splits start first, there will be only
+        // 200 running splits.
+        int running = allSplits.size() - intermediateSplits.size();
+        for (int i = 0; i < minimumNumberOfDrivers - running; i++) {
+            PrioritizedSplitRunner split = pollNextSplitWorker();
+            if (split == null) {
+                break;
+            }
+
+            splitQueuedTime.add(Duration.nanosSince(split.getCreatedNanos()));
+            startSplit(split);
+        }
+    }
+
+    private synchronized void startIntermediateSplit(PrioritizedSplitRunner split)
+    {
+        startSplit(split);
+        intermediateSplits.add(split);
+    }
+
+    private synchronized void startSplit(PrioritizedSplitRunner split)
+    {
+        allSplits.add(split);
+        waitingSplits.offer(split);
+    }
+
+    private synchronized PrioritizedSplitRunner pollNextSplitWorker()
+    {
+        // todo find a better algorithm for this
+        // find the first task that produces a split, then move that task to the
+        // end of the task list, so we get round robin
+        for (Iterator<TimeSharingTaskHandle> iterator = tasks.iterator(); iterator.hasNext(); ) {
+            TimeSharingTaskHandle task = iterator.next();
+            // skip tasks that are already running the configured max number of drivers
+            if (task.getRunningLeafSplits() >= task.getMaxDriversPerTask().orElse(maximumNumberOfDriversPerTask)) {
+                continue;
+            }
+            PrioritizedSplitRunner split = task.pollNextSplit();
+            if (split != null) {
+                // move task to end of list
+                iterator.remove();
+
+                // CAUTION: we are modifying the list in the loop which would normally
+                // cause a ConcurrentModificationException but we exit immediately
+                tasks.add(task);
+                return split;
+            }
+        }
+        return null;
+    }
+
+    private synchronized void recordLeafSplitsSize()
+    {
+        long now = ticker.read();
+        long timeDifference = now - this.lastLeafSplitsSizeRecordTime;
+        if (timeDifference > 0) {
+            this.leafSplitsSize.add(lastLeafSplitsSize, timeDifference);
+            this.lastLeafSplitsSizeRecordTime = now;
+        }
+        // always record new lastLeafSplitsSize as it might have changed
+        // even if timeDifference is 0
+        this.lastLeafSplitsSize = allSplits.size() - intermediateSplits.size();
+    }
+
+    private class TaskRunner
+            implements Runnable
+    {
+        private final long runnerId = NEXT_RUNNER_ID.getAndIncrement();
+
+        @Override
+        public void run()
+        {
+            try (SetThreadName runnerName = new SetThreadName("SplitRunner-%s", runnerId)) {
+                while (!closed && !Thread.currentThread().isInterrupted()) {
+                    // select next worker
+                    PrioritizedSplitRunner split;
+                    try {
+                        split = waitingSplits.take();
+                    }
+                    catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                        return;
+                    }
+
+                    String threadId = split.getTaskHandle().getTaskId() + "-" + split.getSplitId();
+                    try (SetThreadName splitName = new SetThreadName(threadId)) {
+                        RunningSplitInfo splitInfo = new RunningSplitInfo(ticker.read(), threadId, Thread.currentThread(), split.getTaskHandle().getTaskId(), split::getInfo);
+                        runningSplitInfos.add(splitInfo);
+                        runningSplits.add(split);
+
+                        ListenableFuture<Void> blocked;
+                        try {
+                            blocked = split.process();
+                        }
+                        finally {
+                            runningSplitInfos.remove(splitInfo);
+                            runningSplits.remove(split);
+                        }
+
+                        if (split.isFinished()) {
+                            if (log.isDebugEnabled()) {
+                                log.debug("%s is finished", split.getInfo());
+                            }
+                            splitFinished(split);
+                        }
+                        else {
+                            if (blocked.isDone()) {
+                                waitingSplits.offer(split);
+                            }
+                            else {
+                                blockedSplits.put(split, blocked);
+                                blocked.addListener(() -> {
+                                    blockedSplits.remove(split);
+                                    // reset the level priority to prevent previously-blocked splits from starving existing splits
+                                    split.resetLevelPriority();
+                                    waitingSplits.offer(split);
+                                }, executor);
+                            }
+                        }
+                    }
+                    catch (Throwable t) {
+                        // ignore random errors due to driver thread interruption
+                        if (!split.isDestroyed()) {
+                            if (t instanceof TrinoException trinoException) {
+                                log.error(t, "Error processing %s: %s: %s", split.getInfo(), trinoException.getErrorCode().getName(), trinoException.getMessage());
+                            }
+                            else {
+                                log.error(t, "Error processing %s", split.getInfo());
+                            }
+                        }
+                        splitFinished(split);
+                    }
+                    finally {
+                        // Clear the interrupted flag on the current thread, driver cancellation may have triggered an interrupt
+                        if (Thread.interrupted()) {
+                            if (closed) {
+                                // reset interrupted flag if closed before interrupt
+                                Thread.currentThread().interrupt();
+                            }
+                        }
+                    }
+                }
+            }
+            finally {
+                // unless we have been closed, we need to replace this thread
+                if (!closed) {
+                    addRunnerThread();
+                }
+            }
+        }
+    }
+
+    //
+    // STATS
+    //
+
+    @Managed
+    public synchronized int getTasks()
+    {
+        return tasks.size();
+    }
+
+    @Managed
+    public int getRunnerThreads()
+    {
+        return runnerThreads;
+    }
+
+    @Managed
+    public int getMinimumNumberOfDrivers()
+    {
+        return minimumNumberOfDrivers;
+    }
+
+    @Managed
+    public synchronized int getTotalSplits()
+    {
+        return allSplits.size();
+    }
+
+    @Managed
+    public synchronized int getIntermediateSplits()
+    {
+        return intermediateSplits.size();
+    }
+
+    @Managed
+    public int getWaitingSplits()
+    {
+        return waitingSplits.size();
+    }
+
+    @Managed
+    @Nested
+    public DistributionStat getLeafSplitsSize()
+    {
+        return leafSplitsSize;
+    }
+
+    @Managed
+    public synchronized int getCurrentLeafSplitsSize()
+    {
+        return allSplits.size() - intermediateSplits.size();
+    }
+
+    @Managed
+    public int getRunningSplits()
+    {
+        return runningSplits.size();
+    }
+
+    @Managed
+    public int getBlockedSplits()
+    {
+        return blockedSplits.size();
+    }
+
+    @Managed
+    public long getCompletedTasksLevel0()
+    {
+        return completedTasksPerLevel.get(0);
+    }
+
+    @Managed
+    public long getCompletedTasksLevel1()
+    {
+        return completedTasksPerLevel.get(1);
+    }
+
+    @Managed
+    public long getCompletedTasksLevel2()
+    {
+        return completedTasksPerLevel.get(2);
+    }
+
+    @Managed
+    public long getCompletedTasksLevel3()
+    {
+        return completedTasksPerLevel.get(3);
+    }
+
+    @Managed
+    public long getCompletedTasksLevel4()
+    {
+        return completedTasksPerLevel.get(4);
+    }
+
+    @Managed
+    public long getCompletedSplitsLevel0()
+    {
+        return completedSplitsPerLevel.get(0);
+    }
+
+    @Managed
+    public long getCompletedSplitsLevel1()
+    {
+        return completedSplitsPerLevel.get(1);
+    }
+
+    @Managed
+    public long getCompletedSplitsLevel2()
+    {
+        return completedSplitsPerLevel.get(2);
+    }
+
+    @Managed
+    public long getCompletedSplitsLevel3()
+    {
+        return completedSplitsPerLevel.get(3);
+    }
+
+    @Managed
+    public long getCompletedSplitsLevel4()
+    {
+        return completedSplitsPerLevel.get(4);
+    }
+
+    @Managed
+    public long getRunningTasksLevel0()
+    {
+        return getRunningTasksForLevel(0);
+    }
+
+    @Managed
+    public long getRunningTasksLevel1()
+    {
+        return getRunningTasksForLevel(1);
+    }
+
+    @Managed
+    public long getRunningTasksLevel2()
+    {
+        return getRunningTasksForLevel(2);
+    }
+
+    @Managed
+    public long getRunningTasksLevel3()
+    {
+        return getRunningTasksForLevel(3);
+    }
+
+    @Managed
+    public long getRunningTasksLevel4()
+    {
+        return getRunningTasksForLevel(4);
+    }
+
+    @Managed
+    @Nested
+    public TimeStat getSplitQueuedTime()
+    {
+        return splitQueuedTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeStat getSplitWallTime()
+    {
+        return splitWallTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeStat getBlockedQuantaWallTime()
+    {
+        return blockedQuantaWallTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeStat getUnblockedQuantaWallTime()
+    {
+        return unblockedQuantaWallTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeDistribution getLeafSplitScheduledTime()
+    {
+        return leafSplitScheduledTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeDistribution getIntermediateSplitScheduledTime()
+    {
+        return intermediateSplitScheduledTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeDistribution getLeafSplitWallTime()
+    {
+        return leafSplitWallTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeDistribution getIntermediateSplitWallTime()
+    {
+        return intermediateSplitWallTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeDistribution getLeafSplitWaitTime()
+    {
+        return leafSplitWaitTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeDistribution getIntermediateSplitWaitTime()
+    {
+        return intermediateSplitWaitTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeDistribution getLeafSplitCpuTime()
+    {
+        return leafSplitCpuTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeDistribution getIntermediateSplitCpuTime()
+    {
+        return intermediateSplitCpuTime;
+    }
+
+    @Managed
+    @Nested
+    public CounterStat getGlobalScheduledTimeMicros()
+    {
+        return globalScheduledTimeMicros;
+    }
+
+    @Managed
+    @Nested
+    public CounterStat getGlobalCpuTimeMicros()
+    {
+        return globalCpuTimeMicros;
+    }
+
+    private synchronized int getRunningTasksForLevel(int level)
+    {
+        int count = 0;
+        for (TimeSharingTaskHandle task : tasks) {
+            if (task.getPriority().getLevel() == level) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    public String getMaxActiveSplitsInfo()
+    {
+        // Sample output:
+        //
+        // 2 splits have been continuously active for more than 600.00ms seconds
+        //
+        // "20180907_054754_00000_88xi4.1.0-2" tid=99
+        // at java.util.Formatter$FormatSpecifier.<init>(Formatter.java:2708)
+        // at java.util.Formatter.parse(Formatter.java:2560)
+        // at java.util.Formatter.format(Formatter.java:2501)
+        // at ... (more lines of stacktrace)
+        //
+        // "20180907_054754_00000_88xi4.1.0-3" tid=106
+        // at java.util.Formatter$FormatSpecifier.<init>(Formatter.java:2709)
+        // at java.util.Formatter.parse(Formatter.java:2560)
+        // at java.util.Formatter.format(Formatter.java:2501)
+        // at ... (more line of stacktrace)
+        StringBuilder stackTrace = new StringBuilder();
+        int maxActiveSplitCount = 0;
+        String message = "%s splits have been continuously active for more than %s seconds\n";
+        for (RunningSplitInfo splitInfo : runningSplitInfos) {
+            Duration duration = Duration.succinctNanos(ticker.read() - splitInfo.getStartTime());
+            if (duration.compareTo(stuckSplitsWarningThreshold) >= 0) {
+                maxActiveSplitCount++;
+                stackTrace.append("\n");
+                stackTrace.append(format("\"%s\" tid=%s", splitInfo.getThreadId(), splitInfo.getThread().getId())).append("\n");
+                for (StackTraceElement traceElement : splitInfo.getThread().getStackTrace()) {
+                    stackTrace.append("\tat ").append(traceElement).append("\n");
+                }
+            }
+        }
+
+        return format(message, maxActiveSplitCount, stuckSplitsWarningThreshold).concat(stackTrace.toString());
+    }
+
+    @Managed
+    public long getRunAwaySplitCount()
+    {
+        int count = 0;
+        for (RunningSplitInfo splitInfo : runningSplitInfos) {
+            Duration duration = Duration.succinctNanos(ticker.read() - splitInfo.getStartTime());
+            if (duration.compareTo(stuckSplitsWarningThreshold) > 0) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    @Override
+    public Set<TaskId> getStuckSplitTaskIds(Duration processingDurationThreshold, Predicate<RunningSplitInfo> filter)
+    {
+        return runningSplitInfos.stream()
+                .filter((RunningSplitInfo splitInfo) -> {
+                    Duration splitProcessingDuration = Duration.succinctNanos(ticker.read() - splitInfo.getStartTime());
+                    return splitProcessingDuration.compareTo(processingDurationThreshold) > 0;
+                })
+                .filter(filter).map(RunningSplitInfo::getTaskId).collect(toImmutableSet());
+    }
+
+    @Managed(description = "Task processor executor")
+    @Nested
+    public ThreadPoolExecutorMBean getProcessorExecutor()
+    {
+        return executorMBean;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/executor/timesharing/TimeSharingTaskHandle.java b/core/trino-main/src/main/java/io/trino/execution/executor/timesharing/TimeSharingTaskHandle.java
new file mode 100644
index 000000000000..6c235ba90b48
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/executor/timesharing/TimeSharingTaskHandle.java
@@ -0,0 +1,203 @@
+/*
+ * Licensed 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 io.trino.execution.executor.timesharing;
+
+import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import io.airlift.units.Duration;
+import io.trino.execution.SplitConcurrencyController;
+import io.trino.execution.TaskId;
+import io.trino.execution.executor.TaskHandle;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.OptionalInt;
+import java.util.Queue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.DoubleSupplier;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+@ThreadSafe
+public class TimeSharingTaskHandle
+        implements TaskHandle
+{
+    private volatile boolean destroyed;
+    private final TaskId taskId;
+    private final DoubleSupplier utilizationSupplier;
+
+    @GuardedBy("this")
+    protected final Queue<PrioritizedSplitRunner> queuedLeafSplits = new ArrayDeque<>(10);
+    @GuardedBy("this")
+    protected final List<PrioritizedSplitRunner> runningLeafSplits = new ArrayList<>(10);
+    @GuardedBy("this")
+    protected final List<PrioritizedSplitRunner> runningIntermediateSplits = new ArrayList<>(10);
+    @GuardedBy("this")
+    protected long scheduledNanos;
+    @GuardedBy("this")
+    protected final SplitConcurrencyController concurrencyController;
+
+    private final AtomicInteger nextSplitId = new AtomicInteger();
+
+    private final AtomicReference<Priority> priority = new AtomicReference<>(new Priority(0, 0));
+    private final MultilevelSplitQueue splitQueue;
+    private final OptionalInt maxDriversPerTask;
+
+    public TimeSharingTaskHandle(
+            TaskId taskId,
+            MultilevelSplitQueue splitQueue,
+            DoubleSupplier utilizationSupplier,
+            int initialSplitConcurrency,
+            Duration splitConcurrencyAdjustFrequency,
+            OptionalInt maxDriversPerTask)
+    {
+        this.taskId = requireNonNull(taskId, "taskId is null");
+        this.splitQueue = requireNonNull(splitQueue, "splitQueue is null");
+        this.utilizationSupplier = requireNonNull(utilizationSupplier, "utilizationSupplier is null");
+        this.maxDriversPerTask = requireNonNull(maxDriversPerTask, "maxDriversPerTask is null");
+        this.concurrencyController = new SplitConcurrencyController(
+                initialSplitConcurrency,
+                requireNonNull(splitConcurrencyAdjustFrequency, "splitConcurrencyAdjustFrequency is null"));
+    }
+
+    public synchronized Priority addScheduledNanos(long durationNanos)
+    {
+        concurrencyController.update(durationNanos, utilizationSupplier.getAsDouble(), runningLeafSplits.size());
+        scheduledNanos += durationNanos;
+
+        Priority newPriority = splitQueue.updatePriority(priority.get(), durationNanos, scheduledNanos);
+
+        priority.set(newPriority);
+        return newPriority;
+    }
+
+    public synchronized Priority resetLevelPriority()
+    {
+        Priority currentPriority = priority.get();
+        long levelMinPriority = splitQueue.getLevelMinPriority(currentPriority.getLevel(), scheduledNanos);
+
+        if (currentPriority.getLevelPriority() < levelMinPriority) {
+            Priority newPriority = new Priority(currentPriority.getLevel(), levelMinPriority);
+            priority.set(newPriority);
+            return newPriority;
+        }
+
+        return currentPriority;
+    }
+
+    @Override
+    public boolean isDestroyed()
+    {
+        return destroyed;
+    }
+
+    public Priority getPriority()
+    {
+        return priority.get();
+    }
+
+    public TaskId getTaskId()
+    {
+        return taskId;
+    }
+
+    public OptionalInt getMaxDriversPerTask()
+    {
+        return maxDriversPerTask;
+    }
+
+    // Returns any remaining splits. The caller must destroy these.
+    public synchronized List<PrioritizedSplitRunner> destroy()
+    {
+        destroyed = true;
+
+        ImmutableList.Builder<PrioritizedSplitRunner> builder = ImmutableList.builderWithExpectedSize(runningIntermediateSplits.size() + runningLeafSplits.size() + queuedLeafSplits.size());
+        builder.addAll(runningIntermediateSplits);
+        builder.addAll(runningLeafSplits);
+        builder.addAll(queuedLeafSplits);
+        runningIntermediateSplits.clear();
+        runningLeafSplits.clear();
+        queuedLeafSplits.clear();
+        return builder.build();
+    }
+
+    public synchronized boolean enqueueSplit(PrioritizedSplitRunner split)
+    {
+        if (destroyed) {
+            return false;
+        }
+        queuedLeafSplits.add(split);
+        return true;
+    }
+
+    public synchronized boolean recordIntermediateSplit(PrioritizedSplitRunner split)
+    {
+        if (destroyed) {
+            return false;
+        }
+        runningIntermediateSplits.add(split);
+        return true;
+    }
+
+    synchronized int getRunningLeafSplits()
+    {
+        return runningLeafSplits.size();
+    }
+
+    public synchronized long getScheduledNanos()
+    {
+        return scheduledNanos;
+    }
+
+    public synchronized PrioritizedSplitRunner pollNextSplit()
+    {
+        if (destroyed) {
+            return null;
+        }
+
+        if (runningLeafSplits.size() >= concurrencyController.getTargetConcurrency()) {
+            return null;
+        }
+
+        PrioritizedSplitRunner split = queuedLeafSplits.poll();
+        if (split != null) {
+            runningLeafSplits.add(split);
+        }
+        return split;
+    }
+
+    public synchronized void splitComplete(PrioritizedSplitRunner split)
+    {
+        concurrencyController.splitFinished(split.getScheduledNanos(), utilizationSupplier.getAsDouble(), runningLeafSplits.size());
+        runningIntermediateSplits.remove(split);
+        runningLeafSplits.remove(split);
+    }
+
+    public int getNextSplitId()
+    {
+        return nextSplitId.getAndIncrement();
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("taskId", taskId)
+                .toString();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/querystats/PlanOptimizersStatsCollector.java b/core/trino-main/src/main/java/io/trino/execution/querystats/PlanOptimizersStatsCollector.java
index b17e09c15859..fa7051741ffa 100644
--- a/core/trino-main/src/main/java/io/trino/execution/querystats/PlanOptimizersStatsCollector.java
+++ b/core/trino-main/src/main/java/io/trino/execution/querystats/PlanOptimizersStatsCollector.java
@@ -13,20 +13,22 @@
  */
 package io.trino.execution.querystats;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.spi.eventlistener.QueryPlanOptimizerStatistics;
 import io.trino.sql.planner.iterative.Rule;
 import io.trino.sql.planner.optimizations.PlanOptimizer;
 
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 
+@ThreadSafe
 public class PlanOptimizersStatsCollector
 {
-    private final Map<Class<?>, QueryPlanOptimizerStats> stats = new HashMap<>();
+    private final Map<Class<?>, QueryPlanOptimizerStats> stats = new ConcurrentHashMap<>();
     private final int queryReportedRuleStatsLimit;
 
     public PlanOptimizersStatsCollector(int queryReportedRuleStatsLimit)
@@ -37,26 +39,26 @@ public PlanOptimizersStatsCollector(int queryReportedRuleStatsLimit)
     public void recordRule(Rule<?> rule, boolean invoked, boolean applied, long elapsedNanos)
     {
         if (invoked) {
-            stats.computeIfAbsent(rule.getClass(), (key) -> new QueryPlanOptimizerStats(key.getCanonicalName()))
+            statsForClass(rule.getClass())
                     .record(elapsedNanos, applied);
         }
     }
 
     public void recordOptimizer(PlanOptimizer planOptimizer, long duration)
     {
-        stats.computeIfAbsent(planOptimizer.getClass(), (key) -> new QueryPlanOptimizerStats(key.getCanonicalName()))
+        statsForClass(planOptimizer.getClass())
                 .record(duration, true);
     }
 
     public void recordFailure(Rule<?> rule)
     {
-        stats.computeIfAbsent(rule.getClass(), (key) -> new QueryPlanOptimizerStats(key.getCanonicalName()))
+        statsForClass(rule.getClass())
                 .recordFailure();
     }
 
     public void recordFailure(PlanOptimizer rule)
     {
-        stats.computeIfAbsent(rule.getClass(), (key) -> new QueryPlanOptimizerStats(key.getCanonicalName()))
+        statsForClass(rule.getClass())
                 .recordFailure();
     }
 
@@ -67,17 +69,21 @@ public List<QueryPlanOptimizerStatistics> getTopRuleStats()
 
     public List<QueryPlanOptimizerStatistics> getTopRuleStats(int limit)
     {
-        return stats.entrySet().stream()
-                .sorted(Comparator.<Map.Entry<Class<?>, QueryPlanOptimizerStats>, Long>comparing(entry -> entry.getValue().getTotalTime()).reversed())
+        return stats.values().stream()
+                .map(QueryPlanOptimizerStats::snapshot)
+                .sorted(Comparator.comparing(QueryPlanOptimizerStatistics::totalTime).reversed())
                 .limit(limit)
-                .map((Map.Entry<Class<?>, QueryPlanOptimizerStats> entry) -> entry.getValue().snapshot(entry.getKey().getCanonicalName()))
                 .collect(toImmutableList());
     }
 
-    public void add(PlanOptimizersStatsCollector collector)
+    public void add(PlanOptimizersStatsCollector other)
     {
-        collector.stats.entrySet().stream()
-                .forEach(entry -> this.stats.computeIfAbsent(entry.getKey(), key -> new QueryPlanOptimizerStats(key.getCanonicalName())).merge(entry.getValue()));
+        other.stats.forEach((key, value) -> statsForClass(key).merge(value));
+    }
+
+    private QueryPlanOptimizerStats statsForClass(Class<?> clazz)
+    {
+        return stats.computeIfAbsent(clazz, key -> new QueryPlanOptimizerStats(key.getCanonicalName()));
     }
 
     public static PlanOptimizersStatsCollector createPlanOptimizersStatsCollector()
diff --git a/core/trino-main/src/main/java/io/trino/execution/querystats/QueryPlanOptimizerStats.java b/core/trino-main/src/main/java/io/trino/execution/querystats/QueryPlanOptimizerStats.java
index 117102f2137f..457ff4d3abe5 100644
--- a/core/trino-main/src/main/java/io/trino/execution/querystats/QueryPlanOptimizerStats.java
+++ b/core/trino-main/src/main/java/io/trino/execution/querystats/QueryPlanOptimizerStats.java
@@ -13,34 +13,41 @@
  */
 package io.trino.execution.querystats;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.spi.eventlistener.QueryPlanOptimizerStatistics;
 
+import java.util.concurrent.atomic.AtomicLong;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+@ThreadSafe
 public class QueryPlanOptimizerStats
 {
     private final String rule;
-    private long invocations;
-    private long applied;
-    private long totalTime;
-    private long failures;
+    private final AtomicLong invocations = new AtomicLong();
+    private final AtomicLong applied = new AtomicLong();
+    private final AtomicLong totalTime = new AtomicLong();
+    private final AtomicLong failures = new AtomicLong();
 
     public QueryPlanOptimizerStats(String rule)
     {
-        this.rule = rule;
+        this.rule = requireNonNull(rule, "rule is null");
     }
 
     public void record(long nanos, boolean applied)
     {
         if (applied) {
-            this.applied += 1;
+            this.applied.incrementAndGet();
         }
 
-        invocations += 1;
-        totalTime += nanos;
+        invocations.incrementAndGet();
+        totalTime.addAndGet(nanos);
     }
 
     public void recordFailure()
     {
-        failures += 1;
+        failures.incrementAndGet();
     }
 
     public String getRule()
@@ -50,35 +57,37 @@ public String getRule()
 
     public long getInvocations()
     {
-        return invocations;
+        return invocations.get();
     }
 
     public long getApplied()
     {
-        return applied;
+        return applied.get();
     }
 
     public long getFailures()
     {
-        return failures;
+        return failures.get();
     }
 
     public long getTotalTime()
     {
-        return totalTime;
+        return totalTime.get();
     }
 
-    public QueryPlanOptimizerStatistics snapshot(String rule)
+    public QueryPlanOptimizerStatistics snapshot()
     {
-        return new QueryPlanOptimizerStatistics(rule, invocations, applied, totalTime, failures);
+        return new QueryPlanOptimizerStatistics(rule, invocations.get(), applied.get(), totalTime.get(), failures.get());
     }
 
     public QueryPlanOptimizerStats merge(QueryPlanOptimizerStats other)
     {
-        invocations += other.getInvocations();
-        applied += other.getApplied();
-        failures += other.getFailures();
-        totalTime += other.getTotalTime();
+        checkArgument(rule.equals(other.getRule()), "Cannot merge stats for different rules: %s and %s", rule, other.getRule());
+
+        invocations.addAndGet(other.getInvocations());
+        applied.addAndGet(other.getApplied());
+        failures.addAndGet(other.getFailures());
+        totalTime.addAndGet(other.getTotalTime());
 
         return this;
     }
diff --git a/core/trino-main/src/main/java/io/trino/execution/resourcegroups/IndexedPriorityQueue.java b/core/trino-main/src/main/java/io/trino/execution/resourcegroups/IndexedPriorityQueue.java
index 63656d0bb66e..7d4d2d7e3f20 100644
--- a/core/trino-main/src/main/java/io/trino/execution/resourcegroups/IndexedPriorityQueue.java
+++ b/core/trino-main/src/main/java/io/trino/execution/resourcegroups/IndexedPriorityQueue.java
@@ -21,6 +21,8 @@
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.Iterators.transform;
+import static io.trino.execution.resourcegroups.IndexedPriorityQueue.PriorityOrdering.HIGH_TO_LOW;
+import static java.util.Comparator.comparingLong;
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -30,17 +32,37 @@
 public final class IndexedPriorityQueue<E>
         implements UpdateablePriorityQueue<E>
 {
+    public enum PriorityOrdering {
+        LOW_TO_HIGH,
+        HIGH_TO_LOW
+    }
+
     private final Map<E, Entry<E>> index = new HashMap<>();
-    private final Set<Entry<E>> queue = new TreeSet<>((entry1, entry2) -> {
-        int priorityComparison = Long.compare(entry2.getPriority(), entry1.getPriority());
-        if (priorityComparison != 0) {
-            return priorityComparison;
-        }
-        return Long.compare(entry1.getGeneration(), entry2.getGeneration());
-    });
+    private final Set<Entry<E>> queue;
 
     private long generation;
 
+    public IndexedPriorityQueue()
+    {
+        this(HIGH_TO_LOW);
+    }
+
+    public IndexedPriorityQueue(PriorityOrdering priorityOrdering)
+    {
+        queue = switch (priorityOrdering) {
+            case LOW_TO_HIGH -> new TreeSet<>(
+                    comparingLong((Entry<E> entry) -> entry.getPriority())
+                            .thenComparingLong(Entry::getGeneration));
+            case HIGH_TO_LOW -> new TreeSet<>((entry1, entry2) -> {
+                int priorityComparison = Long.compare(entry2.getPriority(), entry1.getPriority());
+                if (priorityComparison != 0) {
+                    return priorityComparison;
+                }
+                return Long.compare(entry1.getGeneration(), entry2.getGeneration());
+            });
+        };
+    }
+
     @Override
     public boolean addOrUpdate(E element, long priority)
     {
@@ -81,6 +103,34 @@ public boolean remove(E element)
 
     @Override
     public E poll()
+    {
+        Entry<E> entry = pollEntry();
+        if (entry == null) {
+            return null;
+        }
+        return entry.getValue();
+    }
+
+    public Prioritized<E> getPrioritized(E element)
+    {
+        Entry<E> entry = index.get(element);
+        if (entry == null) {
+            return null;
+        }
+
+        return new Prioritized<>(entry.getValue(), entry.getPriority());
+    }
+
+    public Prioritized<E> pollPrioritized()
+    {
+        Entry<E> entry = pollEntry();
+        if (entry == null) {
+            return null;
+        }
+        return new Prioritized<>(entry.getValue(), entry.getPriority());
+    }
+
+    private Entry<E> pollEntry()
     {
         Iterator<Entry<E>> iterator = queue.iterator();
         if (!iterator.hasNext()) {
@@ -89,18 +139,35 @@ public E poll()
         Entry<E> entry = iterator.next();
         iterator.remove();
         checkState(index.remove(entry.getValue()) != null, "Failed to remove entry from index");
-        return entry.getValue();
+        return entry;
     }
 
     @Override
     public E peek()
+    {
+        Entry<E> entry = peekEntry();
+        if (entry == null) {
+            return null;
+        }
+        return entry.getValue();
+    }
+
+    public Prioritized<E> peekPrioritized()
+    {
+        Entry<E> entry = peekEntry();
+        if (entry == null) {
+            return null;
+        }
+        return new Prioritized<>(entry.getValue(), entry.getPriority());
+    }
+
+    public Entry<E> peekEntry()
     {
         Iterator<Entry<E>> iterator = queue.iterator();
         if (!iterator.hasNext()) {
             return null;
         }
-        Entry<E> entry = iterator.next();
-        return entry.getValue();
+        return iterator.next();
     }
 
     @Override
@@ -149,4 +216,26 @@ public long getGeneration()
             return generation;
         }
     }
+
+    public static class Prioritized<V>
+    {
+        private final V value;
+        private final long priority;
+
+        public Prioritized(V value, long priority)
+        {
+            this.value = requireNonNull(value, "value is null");
+            this.priority = priority;
+        }
+
+        public V getValue()
+        {
+            return value;
+        }
+
+        public long getPriority()
+        {
+            return priority;
+        }
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/resourcegroups/InternalResourceGroup.java b/core/trino-main/src/main/java/io/trino/execution/resourcegroups/InternalResourceGroup.java
index 05813cc68c5e..8f830685d177 100644
--- a/core/trino-main/src/main/java/io/trino/execution/resourcegroups/InternalResourceGroup.java
+++ b/core/trino-main/src/main/java/io/trino/execution/resourcegroups/InternalResourceGroup.java
@@ -15,6 +15,8 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.stats.CounterStat;
 import io.trino.execution.ManagedQueryExecution;
 import io.trino.execution.resourcegroups.WeightedFairQueue.Usage;
@@ -28,9 +30,6 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.time.Duration;
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/core/trino-main/src/main/java/io/trino/execution/resourcegroups/InternalResourceGroupManager.java b/core/trino-main/src/main/java/io/trino/execution/resourcegroups/InternalResourceGroupManager.java
index ea225fb4d4cf..1d47a478fc29 100644
--- a/core/trino-main/src/main/java/io/trino/execution/resourcegroups/InternalResourceGroupManager.java
+++ b/core/trino-main/src/main/java/io/trino/execution/resourcegroups/InternalResourceGroupManager.java
@@ -15,6 +15,8 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.node.NodeInfo;
 import io.trino.execution.ManagedQueryExecution;
@@ -28,15 +30,12 @@
 import io.trino.spi.resourcegroups.ResourceGroupId;
 import io.trino.spi.resourcegroups.SelectionContext;
 import io.trino.spi.resourcegroups.SelectionCriteria;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.JmxException;
 import org.weakref.jmx.MBeanExporter;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.io.File;
 import java.util.HashMap;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/execution/resourcegroups/LegacyResourceGroupConfigurationManager.java b/core/trino-main/src/main/java/io/trino/execution/resourcegroups/LegacyResourceGroupConfigurationManager.java
index 42bcad193fd3..d50f1e4a063c 100644
--- a/core/trino-main/src/main/java/io/trino/execution/resourcegroups/LegacyResourceGroupConfigurationManager.java
+++ b/core/trino-main/src/main/java/io/trino/execution/resourcegroups/LegacyResourceGroupConfigurationManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.execution.resourcegroups;
 
+import com.google.inject.Inject;
 import io.trino.execution.QueryManagerConfig;
 import io.trino.execution.resourcegroups.LegacyResourceGroupConfigurationManager.VoidContext;
 import io.trino.spi.resourcegroups.ResourceGroup;
@@ -21,8 +22,6 @@
 import io.trino.spi.resourcegroups.SelectionContext;
 import io.trino.spi.resourcegroups.SelectionCriteria;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/execution/resourcegroups/ResourceGroupManager.java b/core/trino-main/src/main/java/io/trino/execution/resourcegroups/ResourceGroupManager.java
index b52f10404cef..43d23bae727f 100644
--- a/core/trino-main/src/main/java/io/trino/execution/resourcegroups/ResourceGroupManager.java
+++ b/core/trino-main/src/main/java/io/trino/execution/resourcegroups/ResourceGroupManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.execution.resourcegroups;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.execution.ManagedQueryExecution;
 import io.trino.server.ResourceGroupInfo;
 import io.trino.spi.resourcegroups.ResourceGroupConfigurationManagerFactory;
@@ -20,8 +21,6 @@
 import io.trino.spi.resourcegroups.SelectionContext;
 import io.trino.spi.resourcegroups.SelectionCriteria;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.Executor;
diff --git a/core/trino-main/src/main/java/io/trino/execution/resourcegroups/ResourceUsage.java b/core/trino-main/src/main/java/io/trino/execution/resourcegroups/ResourceUsage.java
index c65b20c4dc25..bb9c13f56298 100644
--- a/core/trino-main/src/main/java/io/trino/execution/resourcegroups/ResourceUsage.java
+++ b/core/trino-main/src/main/java/io/trino/execution/resourcegroups/ResourceUsage.java
@@ -13,7 +13,7 @@
  */
 package io.trino.execution.resourcegroups;
 
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/BinPackingNodeAllocatorService.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/BinPackingNodeAllocatorService.java
deleted file mode 100644
index 147ee4b6c438..000000000000
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/BinPackingNodeAllocatorService.java
+++ /dev/null
@@ -1,723 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.scheduler;
-
-import com.google.common.base.Stopwatch;
-import com.google.common.base.Ticker;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Ordering;
-import com.google.common.collect.SetMultimap;
-import com.google.common.collect.Streams;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
-import io.airlift.log.Logger;
-import io.airlift.stats.TDigest;
-import io.airlift.units.DataSize;
-import io.trino.Session;
-import io.trino.execution.TaskId;
-import io.trino.memory.ClusterMemoryManager;
-import io.trino.memory.MemoryInfo;
-import io.trino.memory.MemoryManagerConfig;
-import io.trino.metadata.InternalNode;
-import io.trino.metadata.InternalNodeManager;
-import io.trino.metadata.InternalNodeManager.NodesSnapshot;
-import io.trino.spi.ErrorCode;
-import io.trino.spi.TrinoException;
-import io.trino.spi.memory.MemoryPoolInfo;
-import org.assertj.core.util.VisibleForTesting;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
-import java.time.Duration;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Verify.verify;
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.Sets.newConcurrentHashSet;
-import static io.airlift.concurrent.MoreFutures.getFutureValue;
-import static io.airlift.concurrent.Threads.daemonThreadsNamed;
-import static io.trino.SystemSessionProperties.getFaultTolerantExecutionTaskMemoryEstimationQuantile;
-import static io.trino.SystemSessionProperties.getFaultTolerantExecutionTaskMemoryGrowthFactor;
-import static io.trino.execution.scheduler.ErrorCodes.isOutOfMemoryError;
-import static io.trino.execution.scheduler.ErrorCodes.isWorkerCrashAssociatedError;
-import static io.trino.spi.StandardErrorCode.NO_NODES_AVAILABLE;
-import static java.lang.Math.max;
-import static java.lang.Thread.currentThread;
-import static java.util.Comparator.comparing;
-import static java.util.Objects.requireNonNull;
-
-@ThreadSafe
-public class BinPackingNodeAllocatorService
-        implements NodeAllocatorService, NodeAllocator, PartitionMemoryEstimatorFactory
-{
-    private static final Logger log = Logger.get(BinPackingNodeAllocatorService.class);
-
-    @VisibleForTesting
-    static final int PROCESS_PENDING_ACQUIRES_DELAY_SECONDS = 5;
-
-    private final InternalNodeManager nodeManager;
-    private final Supplier<Map<String, Optional<MemoryInfo>>> workerMemoryInfoSupplier;
-
-    private final ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(2, daemonThreadsNamed("bin-packing-node-allocator"));
-    private final AtomicBoolean started = new AtomicBoolean();
-    private final AtomicBoolean stopped = new AtomicBoolean();
-    private final Semaphore processSemaphore = new Semaphore(0);
-    private final AtomicReference<Map<String, MemoryPoolInfo>> nodePoolMemoryInfos = new AtomicReference<>(ImmutableMap.of());
-    private final AtomicReference<Optional<DataSize>> maxNodePoolSize = new AtomicReference<>(Optional.empty());
-    private final boolean scheduleOnCoordinator;
-    private final boolean memoryRequirementIncreaseOnWorkerCrashEnabled;
-    private final DataSize taskRuntimeMemoryEstimationOverhead;
-    private final Ticker ticker;
-
-    private final ConcurrentMap<String, Long> allocatedMemory = new ConcurrentHashMap<>();
-    private final Deque<PendingAcquire> pendingAcquires = new ConcurrentLinkedDeque<>();
-    private final Set<BinPackingNodeLease> fulfilledAcquires = newConcurrentHashSet();
-    private final Duration allowedNoMatchingNodePeriod;
-
-    @Inject
-    public BinPackingNodeAllocatorService(
-            InternalNodeManager nodeManager,
-            ClusterMemoryManager clusterMemoryManager,
-            NodeSchedulerConfig nodeSchedulerConfig,
-            MemoryManagerConfig memoryManagerConfig)
-    {
-        this(nodeManager,
-                clusterMemoryManager::getWorkerMemoryInfo,
-                nodeSchedulerConfig.isIncludeCoordinator(),
-                memoryManagerConfig.isFaultTolerantExecutionMemoryRequirementIncreaseOnWorkerCrashEnabled(),
-                Duration.ofMillis(nodeSchedulerConfig.getAllowedNoMatchingNodePeriod().toMillis()),
-                memoryManagerConfig.getFaultTolerantExecutionTaskRuntimeMemoryEstimationOverhead(),
-                Ticker.systemTicker());
-    }
-
-    @VisibleForTesting
-    BinPackingNodeAllocatorService(
-            InternalNodeManager nodeManager,
-            Supplier<Map<String, Optional<MemoryInfo>>> workerMemoryInfoSupplier,
-            boolean scheduleOnCoordinator,
-            boolean memoryRequirementIncreaseOnWorkerCrashEnabled,
-            Duration allowedNoMatchingNodePeriod,
-            DataSize taskRuntimeMemoryEstimationOverhead,
-            Ticker ticker)
-    {
-        this.nodeManager = requireNonNull(nodeManager, "nodeManager is null");
-        this.workerMemoryInfoSupplier = requireNonNull(workerMemoryInfoSupplier, "workerMemoryInfoSupplier is null");
-        this.scheduleOnCoordinator = scheduleOnCoordinator;
-        this.memoryRequirementIncreaseOnWorkerCrashEnabled = memoryRequirementIncreaseOnWorkerCrashEnabled;
-        this.allowedNoMatchingNodePeriod = requireNonNull(allowedNoMatchingNodePeriod, "allowedNoMatchingNodePeriod is null");
-        this.taskRuntimeMemoryEstimationOverhead = requireNonNull(taskRuntimeMemoryEstimationOverhead, "taskRuntimeMemoryEstimationOverhead is null");
-        this.ticker = requireNonNull(ticker, "ticker is null");
-    }
-
-    @PostConstruct
-    public void start()
-    {
-        if (started.compareAndSet(false, true)) {
-            executor.schedule(() -> {
-                while (!stopped.get()) {
-                    try {
-                        // pending acquires are processed when node is released (semaphore is bumped) and periodically (every couple seconds)
-                        // in case node list in cluster have changed.
-                        processSemaphore.tryAcquire(PROCESS_PENDING_ACQUIRES_DELAY_SECONDS, TimeUnit.SECONDS);
-                        processSemaphore.drainPermits();
-                        processPendingAcquires();
-                    }
-                    catch (InterruptedException e) {
-                        currentThread().interrupt();
-                    }
-                    catch (Exception e) {
-                        // ignore to avoid getting unscheduled
-                        log.warn(e, "Error updating nodes");
-                    }
-                }
-            }, 0, TimeUnit.SECONDS);
-        }
-
-        refreshNodePoolMemoryInfos();
-        executor.scheduleWithFixedDelay(this::refreshNodePoolMemoryInfos, 1, 1, TimeUnit.SECONDS);
-    }
-
-    @PreDestroy
-    public void stop()
-    {
-        stopped.set(true);
-        executor.shutdownNow();
-    }
-
-    @VisibleForTesting
-    void refreshNodePoolMemoryInfos()
-    {
-        ImmutableMap.Builder<String, MemoryPoolInfo> newNodePoolMemoryInfos = ImmutableMap.builder();
-
-        Map<String, Optional<MemoryInfo>> workerMemoryInfos = workerMemoryInfoSupplier.get();
-        long maxNodePoolSizeBytes = -1;
-        for (Map.Entry<String, Optional<MemoryInfo>> entry : workerMemoryInfos.entrySet()) {
-            if (entry.getValue().isEmpty()) {
-                continue;
-            }
-            MemoryPoolInfo poolInfo = entry.getValue().get().getPool();
-            newNodePoolMemoryInfos.put(entry.getKey(), poolInfo);
-            maxNodePoolSizeBytes = Math.max(poolInfo.getMaxBytes(), maxNodePoolSizeBytes);
-        }
-        maxNodePoolSize.set(maxNodePoolSizeBytes == -1 ? Optional.empty() : Optional.of(DataSize.ofBytes(maxNodePoolSizeBytes)));
-        nodePoolMemoryInfos.set(newNodePoolMemoryInfos.buildOrThrow());
-    }
-
-    @VisibleForTesting
-    synchronized void processPendingAcquires()
-    {
-        // synchronized only for sake manual triggering in test code. In production code it should only be called by single thread
-        Iterator<PendingAcquire> iterator = pendingAcquires.iterator();
-
-        BinPackingSimulation simulation = new BinPackingSimulation(
-                nodeManager.getActiveNodesSnapshot(),
-                nodePoolMemoryInfos.get(),
-                fulfilledAcquires,
-                allocatedMemory,
-                scheduleOnCoordinator,
-                taskRuntimeMemoryEstimationOverhead);
-
-        while (iterator.hasNext()) {
-            PendingAcquire pendingAcquire = iterator.next();
-
-            if (pendingAcquire.getFuture().isCancelled()) {
-                // request aborted
-                iterator.remove();
-                continue;
-            }
-
-            BinPackingSimulation.ReserveResult result = simulation.tryReserve(pendingAcquire);
-            switch (result.getStatus()) {
-                case RESERVED:
-                    InternalNode reservedNode = result.getNode().orElseThrow();
-                    fulfilledAcquires.add(pendingAcquire.getLease());
-                    updateAllocatedMemory(reservedNode, pendingAcquire.getMemoryLease());
-                    pendingAcquire.getFuture().set(reservedNode);
-                    if (pendingAcquire.getFuture().isCancelled()) {
-                        // completing future was unsuccessful - request was cancelled in the meantime
-                        pendingAcquire.getLease().deallocateMemory(reservedNode);
-
-                        fulfilledAcquires.remove(pendingAcquire.getLease());
-
-                        // run once again when we are done
-                        wakeupProcessPendingAcquires();
-                    }
-                    iterator.remove();
-                    break;
-                case NONE_MATCHING:
-                    Duration noMatchingNodePeriod = pendingAcquire.markNoMatchingNodeFound();
-
-                    if (noMatchingNodePeriod.compareTo(allowedNoMatchingNodePeriod) <= 0) {
-                        // wait some more time
-                        break;
-                    }
-
-                    pendingAcquire.getFuture().setException(new TrinoException(NO_NODES_AVAILABLE, "No nodes available to run query"));
-                    iterator.remove();
-                    break;
-                case NOT_ENOUGH_RESOURCES_NOW:
-                    pendingAcquire.resetNoMatchingNodeFound();
-                    break; // nothing to be done
-                default:
-                    throw new IllegalArgumentException("unknown status: " + result.getStatus());
-            }
-        }
-    }
-
-    private void wakeupProcessPendingAcquires()
-    {
-        processSemaphore.release();
-    }
-
-    @Override
-    public NodeAllocator getNodeAllocator(Session session)
-    {
-        return this;
-    }
-
-    @Override
-    public NodeLease acquire(NodeRequirements nodeRequirements, DataSize memoryRequirement)
-    {
-        BinPackingNodeLease nodeLease = new BinPackingNodeLease(memoryRequirement.toBytes());
-        PendingAcquire pendingAcquire = new PendingAcquire(nodeRequirements, memoryRequirement, nodeLease, ticker);
-        pendingAcquires.add(pendingAcquire);
-        wakeupProcessPendingAcquires();
-        return nodeLease;
-    }
-
-    @Override
-    public void close()
-    {
-        // nothing to do here. leases should be released by the calling party.
-        // TODO would be great to be able to validate if it actually happened but close() is called from SqlQueryScheduler code
-        //      and that can be done before all leases are yet returned from running (soon to be failed) tasks.
-    }
-
-    private void updateAllocatedMemory(InternalNode node, long delta)
-    {
-        allocatedMemory.compute(
-                node.getNodeIdentifier(),
-                (key, oldValue) -> {
-                    verify(delta > 0 || (oldValue != null && oldValue >= -delta), "tried to release more than allocated (%s vs %s) for node %s", -delta, oldValue, key);
-                    long newValue = oldValue == null ? delta : oldValue + delta;
-                    if (newValue == 0) {
-                        return null; // delete
-                    }
-                    return newValue;
-                });
-    }
-
-    private static class PendingAcquire
-    {
-        private final NodeRequirements nodeRequirements;
-        private final DataSize memoryRequirement;
-        private final BinPackingNodeLease lease;
-        private final Stopwatch noMatchingNodeStopwatch;
-
-        private PendingAcquire(NodeRequirements nodeRequirements, DataSize memoryRequirement, BinPackingNodeLease lease, Ticker ticker)
-        {
-            this.nodeRequirements = requireNonNull(nodeRequirements, "nodeRequirements is null");
-            this.memoryRequirement = requireNonNull(memoryRequirement, "memoryRequirement is null");
-            this.lease = requireNonNull(lease, "lease is null");
-            this.noMatchingNodeStopwatch = Stopwatch.createUnstarted(ticker);
-        }
-
-        public NodeRequirements getNodeRequirements()
-        {
-            return nodeRequirements;
-        }
-
-        public BinPackingNodeLease getLease()
-        {
-            return lease;
-        }
-
-        public SettableFuture<InternalNode> getFuture()
-        {
-            return lease.getNodeSettableFuture();
-        }
-
-        public long getMemoryLease()
-        {
-            return memoryRequirement.toBytes();
-        }
-
-        public Duration markNoMatchingNodeFound()
-        {
-            if (!noMatchingNodeStopwatch.isRunning()) {
-                noMatchingNodeStopwatch.start();
-            }
-            return noMatchingNodeStopwatch.elapsed();
-        }
-
-        public void resetNoMatchingNodeFound()
-        {
-            noMatchingNodeStopwatch.reset();
-        }
-    }
-
-    private class BinPackingNodeLease
-            implements NodeAllocator.NodeLease
-    {
-        private final SettableFuture<InternalNode> node = SettableFuture.create();
-        private final AtomicBoolean released = new AtomicBoolean();
-        private final AtomicBoolean memoryDeallocated = new AtomicBoolean();
-        private final long memoryLease;
-        private final AtomicReference<TaskId> taskId = new AtomicReference<>();
-
-        private BinPackingNodeLease(long memoryLease)
-        {
-            this.memoryLease = memoryLease;
-        }
-
-        @Override
-        public ListenableFuture<InternalNode> getNode()
-        {
-            return node;
-        }
-
-        InternalNode getAssignedNode()
-        {
-            try {
-                return Futures.getDone(node);
-            }
-            catch (ExecutionException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        SettableFuture<InternalNode> getNodeSettableFuture()
-        {
-            return node;
-        }
-
-        @Override
-        public void attachTaskId(TaskId taskId)
-        {
-            if (!this.taskId.compareAndSet(null, taskId)) {
-                throw new IllegalStateException("cannot attach taskId " + taskId + "; already attached to " + this.taskId.get());
-            }
-        }
-
-        public Optional<TaskId> getAttachedTaskId()
-        {
-            return Optional.ofNullable(this.taskId.get());
-        }
-
-        public long getMemoryLease()
-        {
-            return memoryLease;
-        }
-
-        @Override
-        public void release()
-        {
-            if (released.compareAndSet(false, true)) {
-                node.cancel(true);
-                if (node.isDone() && !node.isCancelled()) {
-                    deallocateMemory(getFutureValue(node));
-                    checkState(fulfilledAcquires.remove(this), "node lease %s not found in fulfilledAcquires %s", this, fulfilledAcquires);
-                    wakeupProcessPendingAcquires();
-                }
-            }
-            else {
-                throw new IllegalStateException("Node " + node + " already released");
-            }
-        }
-
-        public void deallocateMemory(InternalNode node)
-        {
-            if (memoryDeallocated.compareAndSet(false, true)) {
-                updateAllocatedMemory(node, -memoryLease);
-            }
-        }
-    }
-
-    private static class BinPackingSimulation
-    {
-        private final NodesSnapshot nodesSnapshot;
-        private final List<InternalNode> allNodesSorted;
-        private final Map<String, Long> nodesRemainingMemory;
-        private final Map<String, Long> nodesRemainingMemoryRuntimeAdjusted;
-
-        private final Map<String, MemoryPoolInfo> nodeMemoryPoolInfos;
-        private final boolean scheduleOnCoordinator;
-
-        public BinPackingSimulation(
-                NodesSnapshot nodesSnapshot,
-                Map<String, MemoryPoolInfo> nodeMemoryPoolInfos,
-                Set<BinPackingNodeLease> fulfilledAcquires,
-                Map<String, Long> preReservedMemory,
-                boolean scheduleOnCoordinator,
-                DataSize taskRuntimeMemoryEstimationOverhead)
-        {
-            this.nodesSnapshot = requireNonNull(nodesSnapshot, "nodesSnapshot is null");
-            // use same node ordering for each simulation
-            this.allNodesSorted = nodesSnapshot.getAllNodes().stream()
-                    .sorted(comparing(InternalNode::getNodeIdentifier))
-                    .collect(toImmutableList());
-
-            requireNonNull(nodeMemoryPoolInfos, "nodeMemoryPoolInfos is null");
-            this.nodeMemoryPoolInfos = ImmutableMap.copyOf(nodeMemoryPoolInfos);
-
-            requireNonNull(preReservedMemory, "preReservedMemory is null");
-            this.scheduleOnCoordinator = scheduleOnCoordinator;
-
-            Map<String, Map<String, Long>> realtimeTasksMemoryPerNode = new HashMap<>();
-            for (InternalNode node : nodesSnapshot.getAllNodes()) {
-                MemoryPoolInfo memoryPoolInfo = nodeMemoryPoolInfos.get(node.getNodeIdentifier());
-                if (memoryPoolInfo == null) {
-                    realtimeTasksMemoryPerNode.put(node.getNodeIdentifier(), ImmutableMap.of());
-                    continue;
-                }
-                realtimeTasksMemoryPerNode.put(node.getNodeIdentifier(), memoryPoolInfo.getTaskMemoryReservations());
-            }
-
-            SetMultimap<String, BinPackingNodeLease> fulfilledAcquiresByNode = HashMultimap.create();
-            for (BinPackingNodeLease fulfilledAcquire : fulfilledAcquires) {
-                InternalNode node = fulfilledAcquire.getAssignedNode();
-                fulfilledAcquiresByNode.put(node.getNodeIdentifier(), fulfilledAcquire);
-            }
-
-            nodesRemainingMemory = new HashMap<>();
-            for (InternalNode node : nodesSnapshot.getAllNodes()) {
-                MemoryPoolInfo memoryPoolInfo = nodeMemoryPoolInfos.get(node.getNodeIdentifier());
-                if (memoryPoolInfo == null) {
-                    nodesRemainingMemory.put(node.getNodeIdentifier(), 0L);
-                    continue;
-                }
-                long nodeReservedMemory = preReservedMemory.getOrDefault(node.getNodeIdentifier(), 0L);
-                nodesRemainingMemory.put(node.getNodeIdentifier(), memoryPoolInfo.getMaxBytes() - nodeReservedMemory);
-            }
-
-            nodesRemainingMemoryRuntimeAdjusted = new HashMap<>();
-            for (InternalNode node : nodesSnapshot.getAllNodes()) {
-                MemoryPoolInfo memoryPoolInfo = nodeMemoryPoolInfos.get(node.getNodeIdentifier());
-                if (memoryPoolInfo == null) {
-                    nodesRemainingMemoryRuntimeAdjusted.put(node.getNodeIdentifier(), 0L);
-                    continue;
-                }
-
-                Map<String, Long> realtimeNodeMemory = realtimeTasksMemoryPerNode.get(node.getNodeIdentifier());
-                Set<BinPackingNodeLease> nodeFulfilledAcquires = fulfilledAcquiresByNode.get(node.getNodeIdentifier());
-
-                long nodeUsedMemoryRuntimeAdjusted = 0;
-                for (BinPackingNodeLease lease : nodeFulfilledAcquires) {
-                    long realtimeTaskMemory = 0;
-                    if (lease.getAttachedTaskId().isPresent()) {
-                        realtimeTaskMemory = realtimeNodeMemory.getOrDefault(lease.getAttachedTaskId().get().toString(), 0L);
-                        realtimeTaskMemory += taskRuntimeMemoryEstimationOverhead.toBytes();
-                    }
-                    long reservedTaskMemory = lease.getMemoryLease();
-                    nodeUsedMemoryRuntimeAdjusted += max(realtimeTaskMemory, reservedTaskMemory);
-                }
-
-                // if globally reported memory usage of node is greater than computed one lets use that.
-                // it can be greater if there are tasks executed on cluster which do not have task retries enabled.
-                nodeUsedMemoryRuntimeAdjusted = max(nodeUsedMemoryRuntimeAdjusted, memoryPoolInfo.getReservedBytes());
-                nodesRemainingMemoryRuntimeAdjusted.put(node.getNodeIdentifier(), memoryPoolInfo.getMaxBytes() - nodeUsedMemoryRuntimeAdjusted);
-            }
-        }
-
-        public ReserveResult tryReserve(PendingAcquire acquire)
-        {
-            NodeRequirements requirements = acquire.getNodeRequirements();
-            Optional<Set<InternalNode>> catalogNodes = requirements.getCatalogHandle().map(nodesSnapshot::getConnectorNodes);
-
-            List<InternalNode> candidates = allNodesSorted.stream()
-                    .filter(node -> catalogNodes.isEmpty() || catalogNodes.get().contains(node))
-                    .filter(node -> {
-                        // Allow using coordinator if explicitly requested
-                        if (requirements.getAddresses().contains(node.getHostAndPort())) {
-                            return true;
-                        }
-                        if (requirements.getAddresses().isEmpty()) {
-                            return scheduleOnCoordinator || !node.isCoordinator();
-                        }
-                        return false;
-                    })
-                    .collect(toImmutableList());
-
-            if (candidates.isEmpty()) {
-                return ReserveResult.NONE_MATCHING;
-            }
-
-            InternalNode selectedNode = candidates.stream()
-                    .max(comparing(node -> nodesRemainingMemoryRuntimeAdjusted.get(node.getNodeIdentifier())))
-                    .orElseThrow();
-
-            if (nodesRemainingMemoryRuntimeAdjusted.get(selectedNode.getNodeIdentifier()) >= acquire.getMemoryLease() || isNodeEmpty(selectedNode.getNodeIdentifier())) {
-                // there is enough unreserved memory on the node
-                // OR
-                // there is not enough memory available on the node but the node is empty so we cannot to better anyway
-
-                // todo: currant logic does not handle heterogenous clusters best. There is a chance that there is a larger node in the cluster but
-                //       with less memory available right now, hence that one was not selected as a candidate.
-                // mark memory reservation
-                subtractFromRemainingMemory(selectedNode.getNodeIdentifier(), acquire.getMemoryLease());
-                return ReserveResult.reserved(selectedNode);
-            }
-
-            // If selected node cannot be used right now, select best one ignoring runtime memory usage and reserve space there
-            // for later use. This is important from algorithm liveliness perspective. If we did not reserve space for a task which
-            // is too big to be scheduled right now, it could be starved by smaller tasks coming later.
-            InternalNode fallbackNode = candidates.stream()
-                    .max(comparing(node -> nodesRemainingMemory.get(node.getNodeIdentifier())))
-                    .orElseThrow();
-            subtractFromRemainingMemory(fallbackNode.getNodeIdentifier(), acquire.getMemoryLease());
-            return ReserveResult.NOT_ENOUGH_RESOURCES_NOW;
-        }
-
-        private void subtractFromRemainingMemory(String nodeIdentifier, long memoryLease)
-        {
-            nodesRemainingMemoryRuntimeAdjusted.compute(
-                    nodeIdentifier,
-                    (key, free) -> free - memoryLease);
-            nodesRemainingMemory.compute(
-                    nodeIdentifier,
-                    (key, free) -> free - memoryLease);
-        }
-
-        private boolean isNodeEmpty(String nodeIdentifier)
-        {
-            return nodeMemoryPoolInfos.containsKey(nodeIdentifier)
-                    && nodesRemainingMemory.get(nodeIdentifier).equals(nodeMemoryPoolInfos.get(nodeIdentifier).getMaxBytes());
-        }
-
-        public enum ReservationStatus
-        {
-            NONE_MATCHING,
-            NOT_ENOUGH_RESOURCES_NOW,
-            RESERVED
-        }
-
-        public static class ReserveResult
-        {
-            public static final ReserveResult NONE_MATCHING = new ReserveResult(ReservationStatus.NONE_MATCHING, Optional.empty());
-            public static final ReserveResult NOT_ENOUGH_RESOURCES_NOW = new ReserveResult(ReservationStatus.NOT_ENOUGH_RESOURCES_NOW, Optional.empty());
-
-            public static ReserveResult reserved(InternalNode node)
-            {
-                return new ReserveResult(ReservationStatus.RESERVED, Optional.of(node));
-            }
-
-            private final ReservationStatus status;
-            private final Optional<InternalNode> node;
-
-            private ReserveResult(ReservationStatus status, Optional<InternalNode> node)
-            {
-                this.status = requireNonNull(status, "status is null");
-                this.node = requireNonNull(node, "node is null");
-                checkArgument(node.isPresent() == (status == ReservationStatus.RESERVED), "node must be set iff status is RESERVED");
-            }
-
-            public ReservationStatus getStatus()
-            {
-                return status;
-            }
-
-            public Optional<InternalNode> getNode()
-            {
-                return node;
-            }
-        }
-    }
-
-    @Override
-    public PartitionMemoryEstimator createPartitionMemoryEstimator()
-    {
-        return new ExponentialGrowthPartitionMemoryEstimator();
-    }
-
-    private class ExponentialGrowthPartitionMemoryEstimator
-            implements PartitionMemoryEstimator
-    {
-        private final TDigest memoryUsageDistribution = new TDigest();
-
-        private ExponentialGrowthPartitionMemoryEstimator() {}
-
-        @Override
-        public MemoryRequirements getInitialMemoryRequirements(Session session, DataSize defaultMemoryLimit)
-        {
-            DataSize memory = Ordering.natural().max(defaultMemoryLimit, getEstimatedMemoryUsage(session));
-            memory = capMemoryToMaxNodeSize(memory);
-            return new MemoryRequirements(memory);
-        }
-
-        @Override
-        public MemoryRequirements getNextRetryMemoryRequirements(Session session, MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, ErrorCode errorCode)
-        {
-            DataSize previousMemory = previousMemoryRequirements.getRequiredMemory();
-
-            // start with the maximum of previously used memory and actual usage
-            DataSize newMemory = Ordering.natural().max(peakMemoryUsage, previousMemory);
-            if (shouldIncreaseMemoryRequirement(errorCode)) {
-                // multiply if we hit an oom error
-                double growthFactor = getFaultTolerantExecutionTaskMemoryGrowthFactor(session);
-                newMemory = DataSize.of((long) (newMemory.toBytes() * growthFactor), DataSize.Unit.BYTE);
-            }
-
-            // if we are still below current estimate for new partition let's bump further
-            newMemory = Ordering.natural().max(newMemory, getEstimatedMemoryUsage(session));
-
-            newMemory = capMemoryToMaxNodeSize(newMemory);
-            return new MemoryRequirements(newMemory);
-        }
-
-        private DataSize capMemoryToMaxNodeSize(DataSize memory)
-        {
-            Optional<DataSize> currentMaxNodePoolSize = maxNodePoolSize.get();
-            if (currentMaxNodePoolSize.isEmpty()) {
-                return memory;
-            }
-            return Ordering.natural().min(memory, currentMaxNodePoolSize.get());
-        }
-
-        @Override
-        public synchronized void registerPartitionFinished(Session session, MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, boolean success, Optional<ErrorCode> errorCode)
-        {
-            if (success) {
-                memoryUsageDistribution.add(peakMemoryUsage.toBytes());
-            }
-            if (!success && errorCode.isPresent() && shouldIncreaseMemoryRequirement(errorCode.get())) {
-                double growthFactor = getFaultTolerantExecutionTaskMemoryGrowthFactor(session);
-                // take previousRequiredBytes into account when registering failure on oom. It is conservative hence safer (and in-line with getNextRetryMemoryRequirements)
-                long previousRequiredBytes = previousMemoryRequirements.getRequiredMemory().toBytes();
-                long previousPeakBytes = peakMemoryUsage.toBytes();
-                memoryUsageDistribution.add(Math.max(previousRequiredBytes, previousPeakBytes) * growthFactor);
-            }
-        }
-
-        private synchronized DataSize getEstimatedMemoryUsage(Session session)
-        {
-            double estimationQuantile = getFaultTolerantExecutionTaskMemoryEstimationQuantile(session);
-            double estimation = memoryUsageDistribution.valueAt(estimationQuantile);
-            if (Double.isNaN(estimation)) {
-                return DataSize.ofBytes(0);
-            }
-            return DataSize.ofBytes((long) estimation);
-        }
-
-        private String memoryUsageDistributionInfo()
-        {
-            List<Double> quantiles = ImmutableList.of(0.01, 0.05, 0.1, 0.2, 0.5, 0.8, 0.9, 0.95, 0.99);
-            List<Double> values;
-            synchronized (this) {
-                values = memoryUsageDistribution.valuesAt(quantiles);
-            }
-
-            return Streams.zip(
-                            quantiles.stream(),
-                            values.stream(),
-                            (quantile, value) -> "" + quantile + "=" + value)
-                    .collect(Collectors.joining(", ", "[", "]"));
-        }
-
-        @Override
-        public String toString()
-        {
-            return "memoryUsageDistribution=" + memoryUsageDistributionInfo();
-        }
-    }
-
-    private boolean shouldIncreaseMemoryRequirement(ErrorCode errorCode)
-    {
-        return isOutOfMemoryError(errorCode) || (memoryRequirementIncreaseOnWorkerCrashEnabled && isWorkerCrashAssociatedError(errorCode));
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/BroadcastPipelinedOutputBufferManager.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/BroadcastPipelinedOutputBufferManager.java
index 11923483f2f3..e5b0f3ce4aad 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/BroadcastPipelinedOutputBufferManager.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/BroadcastPipelinedOutputBufferManager.java
@@ -13,12 +13,11 @@
  */
 package io.trino.execution.scheduler;
 
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.execution.buffer.PipelinedOutputBuffers;
 import io.trino.execution.buffer.PipelinedOutputBuffers.OutputBufferId;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import static io.trino.execution.buffer.PipelinedOutputBuffers.BROADCAST_PARTITION_ID;
 import static io.trino.execution.buffer.PipelinedOutputBuffers.BufferType.BROADCAST;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/ConstantPartitionMemoryEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/ConstantPartitionMemoryEstimator.java
deleted file mode 100644
index b26dc58c22d1..000000000000
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/ConstantPartitionMemoryEstimator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.scheduler;
-
-import io.airlift.units.DataSize;
-import io.trino.Session;
-import io.trino.spi.ErrorCode;
-
-import java.util.Optional;
-
-public class ConstantPartitionMemoryEstimator
-        implements PartitionMemoryEstimator
-{
-    @Override
-    public MemoryRequirements getInitialMemoryRequirements(Session session, DataSize defaultMemoryLimit)
-    {
-        return new MemoryRequirements(defaultMemoryLimit);
-    }
-
-    @Override
-    public MemoryRequirements getNextRetryMemoryRequirements(Session session, MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, ErrorCode errorCode)
-    {
-        return previousMemoryRequirements;
-    }
-
-    @Override
-    public void registerPartitionFinished(Session session, MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, boolean success, Optional<ErrorCode> errorCode) {}
-}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenFaultTolerantQueryScheduler.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenFaultTolerantQueryScheduler.java
deleted file mode 100644
index 2aa19f767187..000000000000
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenFaultTolerantQueryScheduler.java
+++ /dev/null
@@ -1,2300 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.scheduler;
-
-import com.google.common.base.Stopwatch;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableListMultimap;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.SetMultimap;
-import com.google.common.collect.Sets;
-import com.google.common.graph.Traverser;
-import com.google.common.io.Closer;
-import com.google.common.primitives.ImmutableLongArray;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-import io.airlift.log.Logger;
-import io.airlift.units.DataSize;
-import io.airlift.units.Duration;
-import io.trino.Session;
-import io.trino.exchange.SpoolingExchangeInput;
-import io.trino.execution.BasicStageStats;
-import io.trino.execution.ExecutionFailureInfo;
-import io.trino.execution.NodeTaskMap;
-import io.trino.execution.QueryState;
-import io.trino.execution.QueryStateMachine;
-import io.trino.execution.RemoteTask;
-import io.trino.execution.RemoteTaskFactory;
-import io.trino.execution.SqlStage;
-import io.trino.execution.StageId;
-import io.trino.execution.StageInfo;
-import io.trino.execution.StageState;
-import io.trino.execution.StateMachine.StateChangeListener;
-import io.trino.execution.TableInfo;
-import io.trino.execution.TaskId;
-import io.trino.execution.TaskState;
-import io.trino.execution.TaskStatus;
-import io.trino.execution.buffer.OutputBufferStatus;
-import io.trino.execution.buffer.SpoolingOutputBuffers;
-import io.trino.execution.buffer.SpoolingOutputStats;
-import io.trino.execution.resourcegroups.IndexedPriorityQueue;
-import io.trino.execution.scheduler.NodeAllocator.NodeLease;
-import io.trino.execution.scheduler.PartitionMemoryEstimator.MemoryRequirements;
-import io.trino.execution.scheduler.SplitAssigner.AssignmentResult;
-import io.trino.execution.scheduler.SplitAssigner.Partition;
-import io.trino.execution.scheduler.SplitAssigner.PartitionUpdate;
-import io.trino.failuredetector.FailureDetector;
-import io.trino.metadata.InternalNode;
-import io.trino.metadata.Metadata;
-import io.trino.metadata.Split;
-import io.trino.operator.RetryPolicy;
-import io.trino.server.DynamicFilterService;
-import io.trino.spi.ErrorCode;
-import io.trino.spi.StandardErrorCode;
-import io.trino.spi.TrinoException;
-import io.trino.spi.exchange.Exchange;
-import io.trino.spi.exchange.ExchangeContext;
-import io.trino.spi.exchange.ExchangeId;
-import io.trino.spi.exchange.ExchangeManager;
-import io.trino.spi.exchange.ExchangeSinkHandle;
-import io.trino.spi.exchange.ExchangeSinkInstanceHandle;
-import io.trino.spi.exchange.ExchangeSourceHandle;
-import io.trino.spi.exchange.ExchangeSourceOutputSelector;
-import io.trino.split.RemoteSplit;
-import io.trino.sql.planner.NodePartitioningManager;
-import io.trino.sql.planner.PlanFragment;
-import io.trino.sql.planner.SubPlan;
-import io.trino.sql.planner.plan.PlanFragmentId;
-import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.sql.planner.plan.RemoteSourceNode;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Verify.verify;
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static com.google.common.util.concurrent.Futures.getDone;
-import static io.trino.SystemSessionProperties.getFaultTolerantExecutionDefaultCoordinatorTaskMemory;
-import static io.trino.SystemSessionProperties.getFaultTolerantExecutionDefaultTaskMemory;
-import static io.trino.SystemSessionProperties.getFaultTolerantExecutionPartitionCount;
-import static io.trino.SystemSessionProperties.getMaxTasksWaitingForExecutionPerQuery;
-import static io.trino.SystemSessionProperties.getMaxTasksWaitingForNodePerStage;
-import static io.trino.SystemSessionProperties.getRetryDelayScaleFactor;
-import static io.trino.SystemSessionProperties.getRetryInitialDelay;
-import static io.trino.SystemSessionProperties.getRetryMaxDelay;
-import static io.trino.SystemSessionProperties.getRetryPolicy;
-import static io.trino.SystemSessionProperties.getTaskRetryAttemptsPerTask;
-import static io.trino.execution.BasicStageStats.aggregateBasicStageStats;
-import static io.trino.execution.StageState.ABORTED;
-import static io.trino.execution.StageState.PLANNED;
-import static io.trino.execution.scheduler.ErrorCodes.isOutOfMemoryError;
-import static io.trino.execution.scheduler.Exchanges.getAllSourceHandles;
-import static io.trino.failuredetector.FailureDetector.State.GONE;
-import static io.trino.operator.ExchangeOperator.REMOTE_CATALOG_HANDLE;
-import static io.trino.operator.RetryPolicy.TASK;
-import static io.trino.spi.ErrorType.EXTERNAL;
-import static io.trino.spi.ErrorType.INTERNAL_ERROR;
-import static io.trino.spi.ErrorType.USER_ERROR;
-import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
-import static io.trino.spi.StandardErrorCode.REMOTE_HOST_GONE;
-import static io.trino.sql.planner.SystemPartitioningHandle.COORDINATOR_DISTRIBUTION;
-import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
-import static io.trino.util.Failures.toFailure;
-import static java.lang.Math.max;
-import static java.lang.Math.min;
-import static java.lang.Math.round;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.MINUTES;
-
-public class EventDrivenFaultTolerantQueryScheduler
-        implements QueryScheduler
-{
-    private static final Logger log = Logger.get(EventDrivenFaultTolerantQueryScheduler.class);
-
-    private final QueryStateMachine queryStateMachine;
-    private final Metadata metadata;
-    private final RemoteTaskFactory remoteTaskFactory;
-    private final TaskDescriptorStorage taskDescriptorStorage;
-    private final EventDrivenTaskSourceFactory taskSourceFactory;
-    private final boolean summarizeTaskInfo;
-    private final NodeTaskMap nodeTaskMap;
-    private final ExecutorService queryExecutor;
-    private final ScheduledExecutorService scheduledExecutorService;
-    private final SplitSchedulerStats schedulerStats;
-    private final PartitionMemoryEstimatorFactory memoryEstimatorFactory;
-    private final NodePartitioningManager nodePartitioningManager;
-    private final ExchangeManager exchangeManager;
-    private final NodeAllocatorService nodeAllocatorService;
-    private final FailureDetector failureDetector;
-    private final DynamicFilterService dynamicFilterService;
-    private final TaskExecutionStats taskExecutionStats;
-    private final SubPlan originalPlan;
-
-    private final StageRegistry stageRegistry;
-
-    @GuardedBy("this")
-    private boolean started;
-    @GuardedBy("this")
-    private Scheduler scheduler;
-
-    public EventDrivenFaultTolerantQueryScheduler(
-            QueryStateMachine queryStateMachine,
-            Metadata metadata,
-            RemoteTaskFactory remoteTaskFactory,
-            TaskDescriptorStorage taskDescriptorStorage,
-            EventDrivenTaskSourceFactory taskSourceFactory,
-            boolean summarizeTaskInfo,
-            NodeTaskMap nodeTaskMap,
-            ExecutorService queryExecutor,
-            ScheduledExecutorService scheduledExecutorService,
-            SplitSchedulerStats schedulerStats,
-            PartitionMemoryEstimatorFactory memoryEstimatorFactory,
-            NodePartitioningManager nodePartitioningManager,
-            ExchangeManager exchangeManager,
-            NodeAllocatorService nodeAllocatorService,
-            FailureDetector failureDetector,
-            DynamicFilterService dynamicFilterService,
-            TaskExecutionStats taskExecutionStats,
-            SubPlan originalPlan)
-    {
-        this.queryStateMachine = requireNonNull(queryStateMachine, "queryStateMachine is null");
-        RetryPolicy retryPolicy = getRetryPolicy(queryStateMachine.getSession());
-        verify(retryPolicy == TASK, "unexpected retry policy: %s", retryPolicy);
-        this.metadata = requireNonNull(metadata, "metadata is null");
-        this.remoteTaskFactory = requireNonNull(remoteTaskFactory, "remoteTaskFactory is null");
-        this.taskDescriptorStorage = requireNonNull(taskDescriptorStorage, "taskDescriptorStorage is null");
-        this.taskSourceFactory = requireNonNull(taskSourceFactory, "taskSourceFactory is null");
-        this.summarizeTaskInfo = summarizeTaskInfo;
-        this.nodeTaskMap = requireNonNull(nodeTaskMap, "nodeTaskMap is null");
-        this.queryExecutor = requireNonNull(queryExecutor, "queryExecutor is null");
-        this.scheduledExecutorService = requireNonNull(scheduledExecutorService, "scheduledExecutorService is null");
-        this.schedulerStats = requireNonNull(schedulerStats, "schedulerStats is null");
-        this.memoryEstimatorFactory = requireNonNull(memoryEstimatorFactory, "memoryEstimatorFactory is null");
-        this.nodePartitioningManager = requireNonNull(nodePartitioningManager, "partitioningSchemeFactory is null");
-        this.exchangeManager = requireNonNull(exchangeManager, "exchangeManager is null");
-        this.nodeAllocatorService = requireNonNull(nodeAllocatorService, "nodeAllocatorService is null");
-        this.failureDetector = requireNonNull(failureDetector, "failureDetector is null");
-        this.dynamicFilterService = requireNonNull(dynamicFilterService, "dynamicFilterService is null");
-        this.taskExecutionStats = requireNonNull(taskExecutionStats, "taskExecutionStats is null");
-        this.originalPlan = requireNonNull(originalPlan, "originalPlan is null");
-
-        stageRegistry = new StageRegistry(queryStateMachine, originalPlan);
-    }
-
-    @Override
-    public synchronized void start()
-    {
-        checkState(!started, "already started");
-        started = true;
-
-        if (queryStateMachine.isDone()) {
-            return;
-        }
-
-        taskDescriptorStorage.initialize(queryStateMachine.getQueryId());
-        queryStateMachine.addStateChangeListener(state -> {
-            if (state.isDone()) {
-                taskDescriptorStorage.destroy(queryStateMachine.getQueryId());
-            }
-        });
-
-        // when query is done or any time a stage completes, attempt to transition query to "final query info ready"
-        queryStateMachine.addStateChangeListener(state -> {
-            if (!state.isDone()) {
-                return;
-            }
-            Scheduler scheduler;
-            synchronized (this) {
-                scheduler = this.scheduler;
-                this.scheduler = null;
-            }
-            if (scheduler != null) {
-                scheduler.abort();
-            }
-            queryStateMachine.updateQueryInfo(Optional.ofNullable(stageRegistry.getStageInfo()));
-        });
-
-        Session session = queryStateMachine.getSession();
-        FaultTolerantPartitioningSchemeFactory partitioningSchemeFactory = new FaultTolerantPartitioningSchemeFactory(
-                nodePartitioningManager,
-                session,
-                getFaultTolerantExecutionPartitionCount(session));
-        Closer closer = Closer.create();
-        NodeAllocator nodeAllocator = closer.register(nodeAllocatorService.getNodeAllocator(session));
-        try {
-            scheduler = new Scheduler(
-                    queryStateMachine,
-                    metadata,
-                    remoteTaskFactory,
-                    taskDescriptorStorage,
-                    taskSourceFactory,
-                    summarizeTaskInfo,
-                    nodeTaskMap,
-                    queryExecutor,
-                    scheduledExecutorService, schedulerStats,
-                    memoryEstimatorFactory,
-                    partitioningSchemeFactory,
-                    exchangeManager,
-                    getTaskRetryAttemptsPerTask(session) + 1,
-                    getMaxTasksWaitingForNodePerStage(session),
-                    getMaxTasksWaitingForExecutionPerQuery(session),
-                    nodeAllocator,
-                    failureDetector,
-                    stageRegistry,
-                    taskExecutionStats,
-                    dynamicFilterService,
-                    new SchedulingDelayer(
-                            getRetryInitialDelay(session),
-                            getRetryMaxDelay(session),
-                            getRetryDelayScaleFactor(session),
-                            Stopwatch.createUnstarted()),
-                    originalPlan);
-            queryExecutor.submit(scheduler::run);
-        }
-        catch (Throwable t) {
-            try {
-                closer.close();
-            }
-            catch (Throwable closerFailure) {
-                if (t != closerFailure) {
-                    t.addSuppressed(closerFailure);
-                }
-            }
-            throw t;
-        }
-    }
-
-    @Override
-    public void cancelStage(StageId stageId)
-    {
-        throw new UnsupportedOperationException("partial cancel is not supported in fault tolerant mode");
-    }
-
-    @Override
-    public void failTask(TaskId taskId, Throwable failureCause)
-    {
-        stageRegistry.failTaskRemotely(taskId, failureCause);
-    }
-
-    @Override
-    public BasicStageStats getBasicStageStats()
-    {
-        return stageRegistry.getBasicStageStats();
-    }
-
-    @Override
-    public StageInfo getStageInfo()
-    {
-        return stageRegistry.getStageInfo();
-    }
-
-    @Override
-    public long getUserMemoryReservation()
-    {
-        return stageRegistry.getUserMemoryReservation();
-    }
-
-    @Override
-    public long getTotalMemoryReservation()
-    {
-        return stageRegistry.getTotalMemoryReservation();
-    }
-
-    @Override
-    public Duration getTotalCpuTime()
-    {
-        return stageRegistry.getTotalCpuTime();
-    }
-
-    @ThreadSafe
-    private static class StageRegistry
-    {
-        private final QueryStateMachine queryStateMachine;
-        private final AtomicReference<SubPlan> plan;
-        private final Map<StageId, SqlStage> stages = new ConcurrentHashMap<>();
-
-        public StageRegistry(QueryStateMachine queryStateMachine, SubPlan plan)
-        {
-            this.queryStateMachine = requireNonNull(queryStateMachine, "queryStateMachine is null");
-            this.plan = new AtomicReference<>(requireNonNull(plan, "plan is null"));
-        }
-
-        public void add(SqlStage stage)
-        {
-            verify(stages.putIfAbsent(stage.getStageId(), stage) == null, "stage %s is already present", stage.getStageId());
-        }
-
-        public void updatePlan(SubPlan plan)
-        {
-            this.plan.set(requireNonNull(plan, "plan is null"));
-        }
-
-        public StageInfo getStageInfo()
-        {
-            SubPlan plan = requireNonNull(this.plan.get(), "plan is null");
-            Map<PlanFragmentId, StageInfo> stageInfos = stages.values().stream()
-                    .collect(toImmutableMap(stage -> stage.getFragment().getId(), SqlStage::getStageInfo));
-            Set<PlanFragmentId> reportedFragments = new HashSet<>();
-            StageInfo stageInfo = getStageInfo(plan, stageInfos, reportedFragments);
-            // TODO Some stages may no longer be present in the plan when adaptive re-planning is implemented
-            // TODO Figure out how to report statistics for such stages
-            verify(reportedFragments.containsAll(stageInfos.keySet()), "some stages are left unreported");
-            return stageInfo;
-        }
-
-        private StageInfo getStageInfo(SubPlan plan, Map<PlanFragmentId, StageInfo> infos, Set<PlanFragmentId> reportedFragments)
-        {
-            PlanFragmentId fragmentId = plan.getFragment().getId();
-            reportedFragments.add(fragmentId);
-            StageInfo info = infos.get(fragmentId);
-            if (info == null) {
-                info = StageInfo.createInitial(
-                        queryStateMachine.getQueryId(),
-                        queryStateMachine.getQueryState().isDone() ? ABORTED : PLANNED,
-                        plan.getFragment());
-            }
-            List<StageInfo> children = plan.getChildren().stream()
-                    .map(child -> getStageInfo(child, infos, reportedFragments))
-                    .collect(toImmutableList());
-            return info.withSubStages(children);
-        }
-
-        public BasicStageStats getBasicStageStats()
-        {
-            List<BasicStageStats> stageStats = stages.values().stream()
-                    .map(SqlStage::getBasicStageStats)
-                    .collect(toImmutableList());
-            return aggregateBasicStageStats(stageStats);
-        }
-
-        public long getUserMemoryReservation()
-        {
-            return stages.values().stream()
-                    .mapToLong(SqlStage::getUserMemoryReservation)
-                    .sum();
-        }
-
-        public long getTotalMemoryReservation()
-        {
-            return stages.values().stream()
-                    .mapToLong(SqlStage::getTotalMemoryReservation)
-                    .sum();
-        }
-
-        public Duration getTotalCpuTime()
-        {
-            long millis = stages.values().stream()
-                    .mapToLong(stage -> stage.getTotalCpuTime().toMillis())
-                    .sum();
-            return new Duration(millis, MILLISECONDS);
-        }
-
-        public void failTaskRemotely(TaskId taskId, Throwable failureCause)
-        {
-            SqlStage sqlStage = requireNonNull(stages.get(taskId.getStageId()), () -> "stage not found: %s" + taskId.getStageId());
-            sqlStage.failTaskRemotely(taskId, failureCause);
-        }
-    }
-
-    private static class Scheduler
-            implements EventListener
-    {
-        private static final int EVENT_BUFFER_CAPACITY = 100;
-
-        private final QueryStateMachine queryStateMachine;
-        private final Metadata metadata;
-        private final RemoteTaskFactory remoteTaskFactory;
-        private final TaskDescriptorStorage taskDescriptorStorage;
-        private final EventDrivenTaskSourceFactory taskSourceFactory;
-        private final boolean summarizeTaskInfo;
-        private final NodeTaskMap nodeTaskMap;
-        private final ExecutorService queryExecutor;
-        private final ScheduledExecutorService scheduledExecutorService;
-        private final SplitSchedulerStats schedulerStats;
-        private final PartitionMemoryEstimatorFactory memoryEstimatorFactory;
-        private final FaultTolerantPartitioningSchemeFactory partitioningSchemeFactory;
-        private final ExchangeManager exchangeManager;
-        private final int maxTaskExecutionAttempts;
-        private final int maxTasksWaitingForNode;
-        private final int maxTasksWaitingForExecution;
-        private final NodeAllocator nodeAllocator;
-        private final FailureDetector failureDetector;
-        private final StageRegistry stageRegistry;
-        private final TaskExecutionStats taskExecutionStats;
-        private final DynamicFilterService dynamicFilterService;
-
-        private final BlockingQueue<Event> eventQueue = new LinkedBlockingQueue<>();
-        private final List<Event> eventBuffer = new ArrayList<>(EVENT_BUFFER_CAPACITY);
-
-        private boolean started;
-
-        private SubPlan plan;
-        private List<SubPlan> planInTopologicalOrder;
-        private final Map<StageId, StageExecution> stageExecutions = new HashMap<>();
-        private final SetMultimap<StageId, StageId> stageConsumers = HashMultimap.create();
-
-        private final SchedulingQueue schedulingQueue = new SchedulingQueue();
-        private int nextSchedulingPriority;
-
-        private final Map<ScheduledTask, NodeLease> nodeAcquisitions = new HashMap<>();
-        private final Set<ScheduledTask> tasksWaitingForSinkInstanceHandle = new HashSet<>();
-
-        private final SchedulingDelayer schedulingDelayer;
-
-        private boolean queryOutputSet;
-
-        public Scheduler(
-                QueryStateMachine queryStateMachine,
-                Metadata metadata,
-                RemoteTaskFactory remoteTaskFactory,
-                TaskDescriptorStorage taskDescriptorStorage,
-                EventDrivenTaskSourceFactory taskSourceFactory,
-                boolean summarizeTaskInfo,
-                NodeTaskMap nodeTaskMap,
-                ExecutorService queryExecutor,
-                ScheduledExecutorService scheduledExecutorService,
-                SplitSchedulerStats schedulerStats,
-                PartitionMemoryEstimatorFactory memoryEstimatorFactory,
-                FaultTolerantPartitioningSchemeFactory partitioningSchemeFactory,
-                ExchangeManager exchangeManager,
-                int maxTaskExecutionAttempts,
-                int maxTasksWaitingForNode,
-                int maxTasksWaitingForExecution,
-                NodeAllocator nodeAllocator,
-                FailureDetector failureDetector,
-                StageRegistry stageRegistry,
-                TaskExecutionStats taskExecutionStats,
-                DynamicFilterService dynamicFilterService,
-                SchedulingDelayer schedulingDelayer,
-                SubPlan plan)
-        {
-            this.queryStateMachine = requireNonNull(queryStateMachine, "queryStateMachine is null");
-            this.metadata = requireNonNull(metadata, "metadata is null");
-            this.remoteTaskFactory = requireNonNull(remoteTaskFactory, "remoteTaskFactory is null");
-            this.taskDescriptorStorage = requireNonNull(taskDescriptorStorage, "taskDescriptorStorage is null");
-            this.taskSourceFactory = requireNonNull(taskSourceFactory, "taskSourceFactory is null");
-            this.summarizeTaskInfo = summarizeTaskInfo;
-            this.nodeTaskMap = requireNonNull(nodeTaskMap, "nodeTaskMap is null");
-            this.queryExecutor = requireNonNull(queryExecutor, "queryExecutor is null");
-            this.scheduledExecutorService = requireNonNull(scheduledExecutorService, "scheduledExecutorService is null");
-            this.schedulerStats = requireNonNull(schedulerStats, "schedulerStats is null");
-            this.memoryEstimatorFactory = requireNonNull(memoryEstimatorFactory, "memoryEstimatorFactory is null");
-            this.partitioningSchemeFactory = requireNonNull(partitioningSchemeFactory, "partitioningSchemeFactory is null");
-            this.exchangeManager = requireNonNull(exchangeManager, "exchangeManager is null");
-            checkArgument(maxTaskExecutionAttempts > 0, "maxTaskExecutionAttempts must be greater than zero: %s", maxTaskExecutionAttempts);
-            this.maxTaskExecutionAttempts = maxTaskExecutionAttempts;
-            this.maxTasksWaitingForNode = maxTasksWaitingForNode;
-            this.maxTasksWaitingForExecution = maxTasksWaitingForExecution;
-            this.nodeAllocator = requireNonNull(nodeAllocator, "nodeAllocator is null");
-            this.failureDetector = requireNonNull(failureDetector, "failureDetector is null");
-            this.stageRegistry = requireNonNull(stageRegistry, "stageRegistry is null");
-            this.taskExecutionStats = requireNonNull(taskExecutionStats, "taskExecutionStats is null");
-            this.dynamicFilterService = requireNonNull(dynamicFilterService, "dynamicFilterService is null");
-            this.schedulingDelayer = requireNonNull(schedulingDelayer, "schedulingDelayer is null");
-            this.plan = requireNonNull(plan, "plan is null");
-
-            planInTopologicalOrder = sortPlanInTopologicalOrder(plan);
-        }
-
-        public void run()
-        {
-            checkState(!started, "already started");
-            started = true;
-
-            queryStateMachine.addStateChangeListener(state -> {
-                if (state.isDone()) {
-                    eventQueue.add(Event.WAKE_UP);
-                }
-            });
-
-            Optional<Throwable> failure = Optional.empty();
-            try {
-                if (schedule()) {
-                    while (processEvents()) {
-                        if (schedulingDelayer.getRemainingDelayInMillis() > 0) {
-                            continue;
-                        }
-                        if (!schedule()) {
-                            break;
-                        }
-                    }
-                }
-            }
-            catch (Throwable t) {
-                failure = Optional.of(t);
-            }
-
-            for (StageExecution execution : stageExecutions.values()) {
-                failure = closeAndAddSuppressed(failure, execution::abort);
-            }
-            for (NodeLease nodeLease : nodeAcquisitions.values()) {
-                failure = closeAndAddSuppressed(failure, nodeLease::release);
-            }
-            nodeAcquisitions.clear();
-            tasksWaitingForSinkInstanceHandle.clear();
-            failure = closeAndAddSuppressed(failure, nodeAllocator);
-
-            failure.ifPresent(queryStateMachine::transitionToFailed);
-        }
-
-        private Optional<Throwable> closeAndAddSuppressed(Optional<Throwable> existingFailure, Closeable closeable)
-        {
-            try {
-                closeable.close();
-            }
-            catch (Throwable t) {
-                if (existingFailure.isEmpty()) {
-                    return Optional.of(t);
-                }
-                if (existingFailure.get() != t) {
-                    existingFailure.get().addSuppressed(t);
-                }
-            }
-            return existingFailure;
-        }
-
-        private boolean processEvents()
-        {
-            try {
-                Event event = eventQueue.poll(1, MINUTES);
-                if (event == null) {
-                    return true;
-                }
-                eventBuffer.add(event);
-            }
-            catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                throw new RuntimeException(e);
-            }
-
-            while (true) {
-                // poll multiple events from the queue in one shot to improve efficiency
-                eventQueue.drainTo(eventBuffer, EVENT_BUFFER_CAPACITY - eventBuffer.size());
-                if (eventBuffer.isEmpty()) {
-                    return true;
-                }
-                for (Event e : eventBuffer) {
-                    if (e == Event.ABORT) {
-                        return false;
-                    }
-                    if (e == Event.WAKE_UP) {
-                        continue;
-                    }
-                    e.accept(this);
-                }
-                eventBuffer.clear();
-            }
-        }
-
-        private boolean schedule()
-        {
-            if (checkComplete()) {
-                return false;
-            }
-            optimize();
-            updateStageExecutions();
-            scheduleTasks();
-            processNodeAcquisitions();
-            loadMoreTaskDescriptorsIfNecessary();
-            return true;
-        }
-
-        private boolean checkComplete()
-        {
-            if (queryStateMachine.isDone()) {
-                return true;
-            }
-
-            for (StageExecution execution : stageExecutions.values()) {
-                if (execution.getState() == StageState.FAILED) {
-                    StageInfo stageInfo = execution.getStageInfo();
-                    ExecutionFailureInfo failureCause = stageInfo.getFailureCause();
-                    RuntimeException failure = failureCause == null ?
-                            new TrinoException(StandardErrorCode.GENERIC_INTERNAL_ERROR, "stage failed due to unknown error: %s".formatted(execution.getStageId())) :
-                            failureCause.toException();
-                    queryStateMachine.transitionToFailed(failure);
-                    return true;
-                }
-            }
-            setQueryOutputIfReady();
-            return false;
-        }
-
-        private void setQueryOutputIfReady()
-        {
-            StageId rootStageId = getStageId(plan.getFragment().getId());
-            StageExecution rootStageExecution = stageExecutions.get(rootStageId);
-            if (!queryOutputSet && rootStageExecution != null && rootStageExecution.getState() == StageState.FINISHED) {
-                ListenableFuture<List<ExchangeSourceHandle>> sourceHandles = getAllSourceHandles(rootStageExecution.getExchange().getSourceHandles());
-                Futures.addCallback(sourceHandles, new FutureCallback<>()
-                {
-                    @Override
-                    public void onSuccess(List<ExchangeSourceHandle> handles)
-                    {
-                        try {
-                            queryStateMachine.updateInputsForQueryResults(
-                                    ImmutableList.of(new SpoolingExchangeInput(handles, Optional.of(rootStageExecution.getSinkOutputSelector()))),
-                                    true);
-                            queryStateMachine.transitionToFinishing();
-                        }
-                        catch (Throwable t) {
-                            onFailure(t);
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Throwable t)
-                    {
-                        queryStateMachine.transitionToFailed(t);
-                    }
-                }, queryExecutor);
-                queryOutputSet = true;
-            }
-        }
-
-        private void optimize()
-        {
-            plan = optimizePlan(plan);
-            planInTopologicalOrder = sortPlanInTopologicalOrder(plan);
-            stageRegistry.updatePlan(plan);
-        }
-
-        private SubPlan optimizePlan(SubPlan plan)
-        {
-            // Re-optimize plan here based on available runtime statistics.
-            // Fragments changed due to re-optimization as well as their downstream stages are expected to be assigned new fragment ids.
-            return plan;
-        }
-
-        private void updateStageExecutions()
-        {
-            Set<StageId> currentPlanStages = new HashSet<>();
-            PlanFragmentId rootFragmentId = plan.getFragment().getId();
-            for (SubPlan subPlan : planInTopologicalOrder) {
-                PlanFragmentId fragmentId = subPlan.getFragment().getId();
-                StageId stageId = getStageId(fragmentId);
-                currentPlanStages.add(stageId);
-                StageExecution stageExecution = stageExecutions.get(stageId);
-                if (isReadyForExecution(subPlan) && stageExecution == null) {
-                    createStageExecution(subPlan, fragmentId.equals(rootFragmentId), nextSchedulingPriority++);
-                }
-                if (stageExecution != null && stageExecution.getState().equals(StageState.FINISHED) && !stageExecution.isExchangeClosed()) {
-                    // we are ready to close its source exchanges
-                    closeSourceExchanges(subPlan);
-                }
-            }
-            stageExecutions.forEach((stageId, stageExecution) -> {
-                if (!currentPlanStages.contains(stageId)) {
-                    // stage got re-written during re-optimization
-                    stageExecution.abort();
-                }
-            });
-        }
-
-        private boolean isReadyForExecution(SubPlan subPlan)
-        {
-            for (SubPlan child : subPlan.getChildren()) {
-                StageExecution childExecution = stageExecutions.get(getStageId(child.getFragment().getId()));
-                if (childExecution == null) {
-                    return false;
-                }
-                // TODO enable speculative execution
-                if (childExecution.getState() != StageState.FINISHED) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        private void closeSourceExchanges(SubPlan subPlan)
-        {
-            for (SubPlan child : subPlan.getChildren()) {
-                StageExecution childExecution = stageExecutions.get(getStageId(child.getFragment().getId()));
-                if (childExecution != null) {
-                    childExecution.closeExchange();
-                }
-            }
-        }
-
-        private void createStageExecution(SubPlan subPlan, boolean rootFragment, int schedulingPriority)
-        {
-            Closer closer = Closer.create();
-
-            try {
-                PlanFragment fragment = subPlan.getFragment();
-                Session session = queryStateMachine.getSession();
-
-                StageId stageId = getStageId(fragment.getId());
-                SqlStage stage = SqlStage.createSqlStage(
-                        stageId,
-                        fragment,
-                        TableInfo.extract(session, metadata, fragment),
-                        remoteTaskFactory,
-                        session,
-                        summarizeTaskInfo,
-                        nodeTaskMap,
-                        queryStateMachine.getStateMachineExecutor(),
-                        schedulerStats);
-                closer.register(stage::abort);
-                stageRegistry.add(stage);
-                stage.addFinalStageInfoListener(status -> queryStateMachine.updateQueryInfo(Optional.ofNullable(stageRegistry.getStageInfo())));
-
-                ImmutableMap.Builder<PlanFragmentId, Exchange> sourceExchanges = ImmutableMap.builder();
-                Map<PlanFragmentId, OutputDataSizeEstimate> outputEstimates = new HashMap<>();
-                for (SubPlan child : subPlan.getChildren()) {
-                    PlanFragmentId childFragmentId = child.getFragment().getId();
-                    StageExecution childExecution = getStageExecution(getStageId(childFragmentId));
-                    sourceExchanges.put(childFragmentId, childExecution.getExchange());
-                    outputEstimates.put(childFragmentId, childExecution.getOutputDataSize());
-                    stageConsumers.put(childExecution.getStageId(), stageId);
-                }
-
-                ImmutableMap.Builder<PlanNodeId, OutputDataSizeEstimate> outputDataSizeEstimates = ImmutableMap.builder();
-                for (RemoteSourceNode remoteSource : stage.getFragment().getRemoteSourceNodes()) {
-                    List<OutputDataSizeEstimate> estimates = new ArrayList<>();
-                    for (PlanFragmentId fragmentId : remoteSource.getSourceFragmentIds()) {
-                        OutputDataSizeEstimate fragmentEstimate = outputEstimates.get(fragmentId);
-                        verify(fragmentEstimate != null, "fragmentEstimate not found for fragment %s", fragmentId);
-                        estimates.add(fragmentEstimate);
-                    }
-                    // merge estimates for all source fragments of a single remote source
-                    outputDataSizeEstimates.put(remoteSource.getId(), OutputDataSizeEstimate.merge(estimates));
-                }
-
-                EventDrivenTaskSource taskSource = closer.register(taskSourceFactory.create(
-                        session,
-                        fragment,
-                        sourceExchanges.buildOrThrow(),
-                        partitioningSchemeFactory.get(fragment.getPartitioning()),
-                        stage::recordGetSplitTime,
-                        outputDataSizeEstimates.buildOrThrow()));
-
-                FaultTolerantPartitioningScheme sinkPartitioningScheme = partitioningSchemeFactory.get(fragment.getOutputPartitioningScheme().getPartitioning().getHandle());
-                ExchangeContext exchangeContext = new ExchangeContext(queryStateMachine.getQueryId(), new ExchangeId("external-exchange-" + stage.getStageId().getId()));
-
-                boolean preserveOrderWithinPartition = rootFragment && stage.getFragment().getPartitioning().equals(SINGLE_DISTRIBUTION);
-                Exchange exchange = closer.register(exchangeManager.createExchange(
-                        exchangeContext,
-                        sinkPartitioningScheme.getPartitionCount(),
-                        preserveOrderWithinPartition));
-
-                boolean coordinatorStage = stage.getFragment().getPartitioning().equals(COORDINATOR_DISTRIBUTION);
-
-                StageExecution execution = new StageExecution(
-                        queryStateMachine,
-                        taskDescriptorStorage,
-                        stage,
-                        taskSource,
-                        sinkPartitioningScheme,
-                        exchange,
-                        memoryEstimatorFactory.createPartitionMemoryEstimator(),
-                        // do not retry coordinator only tasks
-                        coordinatorStage ? 1 : maxTaskExecutionAttempts,
-                        schedulingPriority,
-                        dynamicFilterService);
-
-                stageExecutions.put(execution.getStageId(), execution);
-
-                for (SubPlan child : subPlan.getChildren()) {
-                    PlanFragmentId childFragmentId = child.getFragment().getId();
-                    StageExecution childExecution = getStageExecution(getStageId(childFragmentId));
-                    execution.setSourceOutputSelector(childFragmentId, childExecution.getSinkOutputSelector());
-                }
-            }
-            catch (Throwable t) {
-                try {
-                    closer.close();
-                }
-                catch (Throwable closerFailure) {
-                    if (closerFailure != t) {
-                        t.addSuppressed(closerFailure);
-                    }
-                }
-                throw t;
-            }
-        }
-
-        private StageId getStageId(PlanFragmentId fragmentId)
-        {
-            return StageId.create(queryStateMachine.getQueryId(), fragmentId);
-        }
-
-        private void scheduleTasks()
-        {
-            while (nodeAcquisitions.size() < maxTasksWaitingForNode && !schedulingQueue.isEmpty()) {
-                ScheduledTask scheduledTask = schedulingQueue.pollOrThrow();
-                StageExecution stageExecution = getStageExecution(scheduledTask.stageId());
-                if (stageExecution.getState().isDone()) {
-                    continue;
-                }
-                int partitionId = scheduledTask.partitionId();
-                Optional<NodeRequirements> nodeRequirements = stageExecution.getNodeRequirements(partitionId);
-                if (nodeRequirements.isEmpty()) {
-                    // execution finished
-                    continue;
-                }
-                MemoryRequirements memoryRequirements = stageExecution.getMemoryRequirements(partitionId);
-                NodeLease lease = nodeAllocator.acquire(nodeRequirements.get(), memoryRequirements.getRequiredMemory());
-                lease.getNode().addListener(() -> eventQueue.add(Event.WAKE_UP), queryExecutor);
-                nodeAcquisitions.put(scheduledTask, lease);
-            }
-        }
-
-        private void processNodeAcquisitions()
-        {
-            Iterator<Map.Entry<ScheduledTask, NodeLease>> nodeAcquisitionIterator = nodeAcquisitions.entrySet().iterator();
-            while (nodeAcquisitionIterator.hasNext()) {
-                Map.Entry<ScheduledTask, NodeLease> nodeAcquisition = nodeAcquisitionIterator.next();
-                ScheduledTask scheduledTask = nodeAcquisition.getKey();
-                NodeLease nodeLease = nodeAcquisition.getValue();
-                StageExecution stageExecution = getStageExecution(scheduledTask.stageId());
-                if (stageExecution.getState().isDone()) {
-                    nodeAcquisitionIterator.remove();
-                    nodeLease.release();
-                }
-                else if (nodeLease.getNode().isDone()) {
-                    nodeAcquisitionIterator.remove();
-                    tasksWaitingForSinkInstanceHandle.add(scheduledTask);
-                    Optional<GetExchangeSinkInstanceHandleResult> getExchangeSinkInstanceHandleResult = stageExecution.getExchangeSinkInstanceHandle(scheduledTask.partitionId());
-                    if (getExchangeSinkInstanceHandleResult.isPresent()) {
-                        CompletableFuture<ExchangeSinkInstanceHandle> sinkInstanceHandleFuture = getExchangeSinkInstanceHandleResult.get().exchangeSinkInstanceHandleFuture();
-                        sinkInstanceHandleFuture.whenComplete((sinkInstanceHandle, throwable) -> {
-                            if (throwable != null) {
-                                eventQueue.add(new StageFailureEvent(scheduledTask.stageId, throwable));
-                            }
-                            else {
-                                eventQueue.add(new SinkInstanceHandleAcquiredEvent(
-                                        scheduledTask.stageId(),
-                                        scheduledTask.partitionId(),
-                                        nodeLease,
-                                        getExchangeSinkInstanceHandleResult.get().attempt(),
-                                        sinkInstanceHandle));
-                            }
-                        });
-                    }
-                    else {
-                        nodeLease.release();
-                    }
-                }
-            }
-        }
-
-        @Override
-        public void onSinkInstanceHandleAcquired(SinkInstanceHandleAcquiredEvent sinkInstanceHandleAcquiredEvent)
-        {
-            ScheduledTask scheduledTask = new ScheduledTask(sinkInstanceHandleAcquiredEvent.getStageId(), sinkInstanceHandleAcquiredEvent.getPartitionId());
-            verify(tasksWaitingForSinkInstanceHandle.remove(scheduledTask), "expected %s in tasksWaitingForSinkInstanceHandle", scheduledTask);
-            NodeLease nodeLease = sinkInstanceHandleAcquiredEvent.getNodeLease();
-            int partitionId = sinkInstanceHandleAcquiredEvent.getPartitionId();
-            StageId stageId = sinkInstanceHandleAcquiredEvent.getStageId();
-            int attempt = sinkInstanceHandleAcquiredEvent.getAttempt();
-            ExchangeSinkInstanceHandle sinkInstanceHandle = sinkInstanceHandleAcquiredEvent.getSinkInstanceHandle();
-            StageExecution stageExecution = getStageExecution(stageId);
-
-            try {
-                InternalNode node = getDone(nodeLease.getNode());
-                Optional<RemoteTask> remoteTask = stageExecution.schedule(partitionId, sinkInstanceHandle, attempt, node);
-                remoteTask.ifPresent(task -> {
-                    task.addStateChangeListener(createExchangeSinkInstanceHandleUpdateRequiredListener());
-                    task.addStateChangeListener(taskStatus -> {
-                        if (taskStatus.getState().isDone()) {
-                            nodeLease.release();
-                        }
-                    });
-                    task.addFinalTaskInfoListener(taskExecutionStats::update);
-                    task.addFinalTaskInfoListener(taskInfo -> eventQueue.add(new RemoteTaskCompletedEvent(taskInfo.getTaskStatus())));
-                    nodeLease.attachTaskId(task.getTaskId());
-                    task.start();
-                    if (queryStateMachine.getQueryState() == QueryState.STARTING) {
-                        queryStateMachine.transitionToRunning();
-                    }
-                });
-                if (remoteTask.isEmpty()) {
-                    nodeLease.release();
-                }
-            }
-            catch (ExecutionException e) {
-                throw new UncheckedExecutionException(e);
-            }
-        }
-
-        private StateChangeListener<TaskStatus> createExchangeSinkInstanceHandleUpdateRequiredListener()
-        {
-            AtomicLong respondedToVersion = new AtomicLong(-1);
-            return taskStatus -> {
-                OutputBufferStatus outputBufferStatus = taskStatus.getOutputBufferStatus();
-                if (outputBufferStatus.getOutputBuffersVersion().isEmpty()) {
-                    return;
-                }
-                if (!outputBufferStatus.isExchangeSinkInstanceHandleUpdateRequired()) {
-                    return;
-                }
-                long remoteVersion = outputBufferStatus.getOutputBuffersVersion().getAsLong();
-                while (true) {
-                    long localVersion = respondedToVersion.get();
-                    if (remoteVersion <= localVersion) {
-                        // version update is scheduled or sent already but got not propagated yet
-                        break;
-                    }
-                    if (respondedToVersion.compareAndSet(localVersion, remoteVersion)) {
-                        eventQueue.add(new RemoteTaskExchangeSinkUpdateRequiredEvent(taskStatus));
-                        break;
-                    }
-                }
-            };
-        }
-
-        private void loadMoreTaskDescriptorsIfNecessary()
-        {
-            boolean schedulingQueueIsFull = schedulingQueue.getNonSpeculativeTaskCount() >= maxTasksWaitingForExecution;
-            for (StageExecution stageExecution : stageExecutions.values()) {
-                if (!schedulingQueueIsFull || stageExecution.hasOpenTaskRunning()) {
-                    stageExecution.loadMoreTaskDescriptors().ifPresent(future -> Futures.addCallback(future, new FutureCallback<>()
-                    {
-                        @Override
-                        public void onSuccess(AssignmentResult result)
-                        {
-                            eventQueue.add(new SplitAssignmentEvent(stageExecution.getStageId(), result));
-                        }
-
-                        @Override
-                        public void onFailure(Throwable t)
-                        {
-                            eventQueue.add(new StageFailureEvent(stageExecution.getStageId(), t));
-                        }
-                    }, queryExecutor));
-                }
-            }
-        }
-
-        public void abort()
-        {
-            eventQueue.clear();
-            eventQueue.add(Event.ABORT);
-        }
-
-        @Override
-        public void onRemoteTaskCompleted(RemoteTaskCompletedEvent event)
-        {
-            TaskStatus taskStatus = event.getTaskStatus();
-            TaskId taskId = taskStatus.getTaskId();
-            TaskState taskState = taskStatus.getState();
-            StageExecution stageExecution = getStageExecution(taskId.getStageId());
-            if (taskState == TaskState.FINISHED) {
-                stageExecution.taskFinished(taskId, taskStatus);
-            }
-            else if (taskState == TaskState.FAILED) {
-                ExecutionFailureInfo failureInfo = taskStatus.getFailures().stream()
-                        .findFirst()
-                        .map(this::rewriteTransportFailure)
-                        .orElseGet(() -> toFailure(new TrinoException(GENERIC_INTERNAL_ERROR, "A task failed for an unknown reason")));
-
-                List<PrioritizedScheduledTask> replacementTasks = stageExecution.taskFailed(taskId, failureInfo, taskStatus);
-                replacementTasks.forEach(schedulingQueue::addOrUpdate);
-
-                if (shouldDelayScheduling(failureInfo.getErrorCode())) {
-                    schedulingDelayer.startOrProlongDelayIfNecessary();
-                    scheduledExecutorService.schedule(() -> eventQueue.add(Event.WAKE_UP), schedulingDelayer.getRemainingDelayInMillis(), MILLISECONDS);
-                }
-            }
-
-            // update output selectors
-            ExchangeSourceOutputSelector outputSelector = stageExecution.getSinkOutputSelector();
-            for (StageId consumerStageId : stageConsumers.get(stageExecution.getStageId())) {
-                getStageExecution(consumerStageId).setSourceOutputSelector(stageExecution.getStageFragmentId(), outputSelector);
-            }
-        }
-
-        @Override
-        public void onRemoteTaskExchangeSinkUpdateRequired(RemoteTaskExchangeSinkUpdateRequiredEvent event)
-        {
-            TaskId taskId = event.getTaskStatus().getTaskId();
-            StageExecution stageExecution = getStageExecution(taskId.getStageId());
-            stageExecution.initializeUpdateOfExchangeSinkInstanceHandle(taskId, eventQueue);
-        }
-
-        @Override
-        public void onRemoteTaskExchangeUpdatedSinkAcquired(RemoteTaskExchangeUpdatedSinkAcquired event)
-        {
-            TaskId taskId = event.getTaskId();
-            StageExecution stageExecution = getStageExecution(taskId.getStageId());
-            stageExecution.finalizeUpdateOfExchangeSinkInstanceHandle(taskId, event.getExchangeSinkInstanceHandle());
-        }
-
-        @Override
-        public void onSplitAssignment(SplitAssignmentEvent event)
-        {
-            StageExecution stageExecution = getStageExecution(event.getStageId());
-            AssignmentResult assignment = event.getAssignmentResult();
-            for (Partition partition : assignment.partitionsAdded()) {
-                Optional<PrioritizedScheduledTask> scheduledTask = stageExecution.addPartition(partition.partitionId(), partition.nodeRequirements());
-                scheduledTask.ifPresent(schedulingQueue::addOrUpdate);
-            }
-            for (PartitionUpdate partitionUpdate : assignment.partitionUpdates()) {
-                stageExecution.updatePartition(
-                        partitionUpdate.partitionId(),
-                        partitionUpdate.planNodeId(),
-                        partitionUpdate.splits(),
-                        partitionUpdate.noMoreSplits());
-            }
-            assignment.sealedPartitions().forEach(partitionId -> {
-                Optional<PrioritizedScheduledTask> scheduledTask = stageExecution.sealPartition(partitionId);
-                scheduledTask.ifPresent(prioritizedTask -> {
-                    if (nodeAcquisitions.containsKey(prioritizedTask.task()) || tasksWaitingForSinkInstanceHandle.contains(prioritizedTask.task)) {
-                        // task is already waiting for node or for sink instance handle
-                        return;
-                    }
-                    schedulingQueue.addOrUpdate(prioritizedTask);
-                });
-            });
-            if (assignment.noMorePartitions()) {
-                stageExecution.noMorePartitions();
-            }
-            stageExecution.taskDescriptorLoadingComplete();
-        }
-
-        @Override
-        public void onStageFailure(StageFailureEvent event)
-        {
-            StageExecution stageExecution = getStageExecution(event.getStageId());
-            stageExecution.fail(event.getFailure());
-        }
-
-        private StageExecution getStageExecution(StageId stageId)
-        {
-            StageExecution execution = stageExecutions.get(stageId);
-            checkState(execution != null, "stage execution does not exist for stage: %s", stageId);
-            return execution;
-        }
-
-        private static List<SubPlan> sortPlanInTopologicalOrder(SubPlan subPlan)
-        {
-            ImmutableList.Builder<SubPlan> result = ImmutableList.builder();
-            Traverser.forTree(SubPlan::getChildren).depthFirstPreOrder(subPlan).forEach(result::add);
-            return result.build();
-        }
-
-        private boolean shouldDelayScheduling(@Nullable ErrorCode errorCode)
-        {
-            return errorCode == null || errorCode.getType() == INTERNAL_ERROR || errorCode.getType() == EXTERNAL;
-        }
-
-        private ExecutionFailureInfo rewriteTransportFailure(ExecutionFailureInfo executionFailureInfo)
-        {
-            if (executionFailureInfo.getRemoteHost() == null || failureDetector.getState(executionFailureInfo.getRemoteHost()) != GONE) {
-                return executionFailureInfo;
-            }
-
-            return new ExecutionFailureInfo(
-                    executionFailureInfo.getType(),
-                    executionFailureInfo.getMessage(),
-                    executionFailureInfo.getCause(),
-                    executionFailureInfo.getSuppressed(),
-                    executionFailureInfo.getStack(),
-                    executionFailureInfo.getErrorLocation(),
-                    REMOTE_HOST_GONE.toErrorCode(),
-                    executionFailureInfo.getRemoteHost());
-        }
-    }
-
-    private static class StageExecution
-    {
-        private final QueryStateMachine queryStateMachine;
-        private final TaskDescriptorStorage taskDescriptorStorage;
-
-        private final SqlStage stage;
-        private final EventDrivenTaskSource taskSource;
-        private final FaultTolerantPartitioningScheme sinkPartitioningScheme;
-        private final Exchange exchange;
-        private final PartitionMemoryEstimator partitionMemoryEstimator;
-        private final int maxTaskExecutionAttempts;
-        private final int schedulingPriority;
-        private final DynamicFilterService dynamicFilterService;
-        private final long[] outputDataSize;
-
-        private final Int2ObjectMap<StagePartition> partitions = new Int2ObjectOpenHashMap<>();
-        private boolean noMorePartitions;
-
-        private final IntSet runningPartitions = new IntOpenHashSet();
-        private final IntSet remainingPartitions = new IntOpenHashSet();
-
-        private ExchangeSourceOutputSelector.Builder sinkOutputSelectorBuilder;
-        private ExchangeSourceOutputSelector finalSinkOutputSelector;
-
-        private final Set<PlanNodeId> remoteSourceIds;
-        private final Map<PlanFragmentId, RemoteSourceNode> remoteSources;
-        private final Map<PlanFragmentId, ExchangeSourceOutputSelector> sourceOutputSelectors = new HashMap<>();
-
-        private boolean taskDescriptorLoadingActive;
-        private boolean exchangeClosed;
-
-        private StageExecution(
-                QueryStateMachine queryStateMachine,
-                TaskDescriptorStorage taskDescriptorStorage,
-                SqlStage stage,
-                EventDrivenTaskSource taskSource,
-                FaultTolerantPartitioningScheme sinkPartitioningScheme,
-                Exchange exchange,
-                PartitionMemoryEstimator partitionMemoryEstimator,
-                int maxTaskExecutionAttempts,
-                int schedulingPriority,
-                DynamicFilterService dynamicFilterService)
-        {
-            this.queryStateMachine = requireNonNull(queryStateMachine, "queryStateMachine is null");
-            this.taskDescriptorStorage = requireNonNull(taskDescriptorStorage, "taskDescriptorStorage is null");
-            this.stage = requireNonNull(stage, "stage is null");
-            this.taskSource = requireNonNull(taskSource, "taskSource is null");
-            this.sinkPartitioningScheme = requireNonNull(sinkPartitioningScheme, "sinkPartitioningScheme is null");
-            this.exchange = requireNonNull(exchange, "exchange is null");
-            this.partitionMemoryEstimator = requireNonNull(partitionMemoryEstimator, "partitionMemoryEstimator is null");
-            this.maxTaskExecutionAttempts = maxTaskExecutionAttempts;
-            this.schedulingPriority = schedulingPriority;
-            this.dynamicFilterService = requireNonNull(dynamicFilterService, "dynamicFilterService is null");
-            outputDataSize = new long[sinkPartitioningScheme.getPartitionCount()];
-            sinkOutputSelectorBuilder = ExchangeSourceOutputSelector.builder(ImmutableSet.of(exchange.getId()));
-            ImmutableMap.Builder<PlanFragmentId, RemoteSourceNode> remoteSources = ImmutableMap.builder();
-            ImmutableSet.Builder<PlanNodeId> remoteSourceIds = ImmutableSet.builder();
-            for (RemoteSourceNode remoteSource : stage.getFragment().getRemoteSourceNodes()) {
-                remoteSourceIds.add(remoteSource.getId());
-                remoteSource.getSourceFragmentIds().forEach(fragmentId -> remoteSources.put(fragmentId, remoteSource));
-            }
-            this.remoteSourceIds = remoteSourceIds.build();
-            this.remoteSources = remoteSources.buildOrThrow();
-        }
-
-        public StageId getStageId()
-        {
-            return stage.getStageId();
-        }
-
-        public PlanFragmentId getStageFragmentId()
-        {
-            return stage.getFragment().getId();
-        }
-
-        public StageState getState()
-        {
-            return stage.getState();
-        }
-
-        public StageInfo getStageInfo()
-        {
-            return stage.getStageInfo();
-        }
-
-        public Exchange getExchange()
-        {
-            return exchange;
-        }
-
-        public boolean isExchangeClosed()
-        {
-            return exchangeClosed;
-        }
-
-        public Optional<PrioritizedScheduledTask> addPartition(int partitionId, NodeRequirements nodeRequirements)
-        {
-            if (getState().isDone()) {
-                return Optional.empty();
-            }
-
-            ExchangeSinkHandle exchangeSinkHandle = exchange.addSink(partitionId);
-            Session session = queryStateMachine.getSession();
-            DataSize defaultTaskMemory = stage.getFragment().getPartitioning().equals(COORDINATOR_DISTRIBUTION) ?
-                    getFaultTolerantExecutionDefaultCoordinatorTaskMemory(session) :
-                    getFaultTolerantExecutionDefaultTaskMemory(session);
-            StagePartition partition = new StagePartition(
-                    taskDescriptorStorage,
-                    stage.getStageId(),
-                    partitionId,
-                    exchangeSinkHandle,
-                    remoteSourceIds,
-                    nodeRequirements,
-                    partitionMemoryEstimator.getInitialMemoryRequirements(session, defaultTaskMemory),
-                    maxTaskExecutionAttempts);
-            checkState(partitions.putIfAbsent(partitionId, partition) == null, "partition with id %s already exist in stage %s", partitionId, stage.getStageId());
-            getSourceOutputSelectors().forEach((partition::updateExchangeSourceOutputSelector));
-            remainingPartitions.add(partitionId);
-
-            return Optional.of(PrioritizedScheduledTask.createSpeculative(stage.getStageId(), partitionId, schedulingPriority));
-        }
-
-        public void updatePartition(int partitionId, PlanNodeId planNodeId, List<Split> splits, boolean noMoreSplits)
-        {
-            if (getState().isDone()) {
-                return;
-            }
-
-            StagePartition partition = getStagePartition(partitionId);
-            partition.addSplits(planNodeId, splits, noMoreSplits);
-        }
-
-        public Optional<PrioritizedScheduledTask> sealPartition(int partitionId)
-        {
-            if (getState().isDone()) {
-                return Optional.empty();
-            }
-
-            StagePartition partition = getStagePartition(partitionId);
-            partition.seal(partitionId);
-
-            if (!partition.isRunning()) {
-                // if partition is not yet running update its priority as it is no longer speculative
-                return Optional.of(PrioritizedScheduledTask.create(stage.getStageId(), partitionId, schedulingPriority));
-            }
-
-            // TODO: split into smaller partitions here if necessary (for example if a task for a given partition failed with out of memory)
-
-            return Optional.empty();
-        }
-
-        public void noMorePartitions()
-        {
-            if (getState().isDone()) {
-                return;
-            }
-
-            noMorePartitions = true;
-            if (remainingPartitions.isEmpty()) {
-                stage.finish();
-                // TODO close exchange early
-                taskSource.close();
-            }
-        }
-
-        public void closeExchange()
-        {
-            if (exchangeClosed) {
-                return;
-            }
-
-            exchange.close();
-            exchangeClosed = true;
-        }
-
-        public Optional<EventDrivenFaultTolerantQueryScheduler.GetExchangeSinkInstanceHandleResult> getExchangeSinkInstanceHandle(int partitionId)
-        {
-            if (getState().isDone()) {
-                return Optional.empty();
-            }
-
-            StagePartition partition = getStagePartition(partitionId);
-            verify(partition.getRemainingAttempts() >= 0, "remaining attempts is expected to be greater than or equal to zero: %s", partition.getRemainingAttempts());
-
-            if (partition.isFinished()) {
-                return Optional.empty();
-            }
-
-            int attempt = maxTaskExecutionAttempts - partition.getRemainingAttempts();
-            return Optional.of(new EventDrivenFaultTolerantQueryScheduler.GetExchangeSinkInstanceHandleResult(
-                    exchange.instantiateSink(partition.getExchangeSinkHandle(), attempt),
-                    attempt));
-        }
-
-        public Optional<RemoteTask> schedule(int partitionId, ExchangeSinkInstanceHandle exchangeSinkInstanceHandle, int attempt, InternalNode node)
-        {
-            if (getState().isDone()) {
-                return Optional.empty();
-            }
-
-            StagePartition partition = getStagePartition(partitionId);
-            verify(partition.getRemainingAttempts() >= 0, "remaining attempts is expected to be greater than or equal to zero: %s", partition.getRemainingAttempts());
-
-            if (partition.isFinished()) {
-                return Optional.empty();
-            }
-
-            Map<PlanNodeId, ExchangeSourceOutputSelector> outputSelectors = getSourceOutputSelectors();
-
-            ListMultimap<PlanNodeId, Split> splits = ArrayListMultimap.create();
-            splits.putAll(partition.getSplits());
-            outputSelectors.forEach((planNodeId, outputSelector) -> splits.put(planNodeId, createOutputSelectorSplit(outputSelector)));
-
-            Set<PlanNodeId> noMoreSplits = new HashSet<>();
-            for (RemoteSourceNode remoteSource : stage.getFragment().getRemoteSourceNodes()) {
-                ExchangeSourceOutputSelector selector = outputSelectors.get(remoteSource.getId());
-                if (selector != null && selector.isFinal() && partition.isNoMoreSplits(remoteSource.getId())) {
-                    noMoreSplits.add(remoteSource.getId());
-                }
-            }
-            for (PlanNodeId partitionedSource : stage.getFragment().getPartitionedSources()) {
-                if (partition.isNoMoreSplits(partitionedSource)) {
-                    noMoreSplits.add(partitionedSource);
-                }
-            }
-
-            SpoolingOutputBuffers outputBuffers = SpoolingOutputBuffers.createInitial(exchangeSinkInstanceHandle, sinkPartitioningScheme.getPartitionCount());
-            Optional<RemoteTask> task = stage.createTask(
-                    node,
-                    partitionId,
-                    attempt,
-                    sinkPartitioningScheme.getBucketToPartitionMap(),
-                    outputBuffers,
-                    splits,
-                    noMoreSplits,
-                    Optional.of(partition.getMemoryRequirements().getRequiredMemory()));
-            task.ifPresent(remoteTask -> {
-                partition.addTask(remoteTask, outputBuffers);
-                runningPartitions.add(partitionId);
-            });
-            return task;
-        }
-
-        public boolean hasOpenTaskRunning()
-        {
-            if (getState().isDone()) {
-                return false;
-            }
-
-            if (runningPartitions.isEmpty()) {
-                return false;
-            }
-
-            for (int partitionId : runningPartitions) {
-                StagePartition partition = getStagePartition(partitionId);
-                if (!partition.isSealed()) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        public Optional<ListenableFuture<AssignmentResult>> loadMoreTaskDescriptors()
-        {
-            if (getState().isDone() || taskDescriptorLoadingActive) {
-                return Optional.empty();
-            }
-            taskDescriptorLoadingActive = true;
-            return Optional.of(taskSource.process());
-        }
-
-        public void taskDescriptorLoadingComplete()
-        {
-            taskDescriptorLoadingActive = false;
-        }
-
-        private Map<PlanNodeId, ExchangeSourceOutputSelector> getSourceOutputSelectors()
-        {
-            ImmutableMap.Builder<PlanNodeId, ExchangeSourceOutputSelector> result = ImmutableMap.builder();
-            for (RemoteSourceNode remoteSource : stage.getFragment().getRemoteSourceNodes()) {
-                ExchangeSourceOutputSelector mergedSelector = null;
-                for (PlanFragmentId sourceFragmentId : remoteSource.getSourceFragmentIds()) {
-                    ExchangeSourceOutputSelector sourceFragmentSelector = sourceOutputSelectors.get(sourceFragmentId);
-                    if (sourceFragmentSelector == null) {
-                        continue;
-                    }
-                    if (mergedSelector == null) {
-                        mergedSelector = sourceFragmentSelector;
-                    }
-                    else {
-                        mergedSelector = mergedSelector.merge(sourceFragmentSelector);
-                    }
-                }
-                if (mergedSelector != null) {
-                    result.put(remoteSource.getId(), mergedSelector);
-                }
-            }
-            return result.buildOrThrow();
-        }
-
-        public void initializeUpdateOfExchangeSinkInstanceHandle(TaskId taskId, BlockingQueue<Event> eventQueue)
-        {
-            if (getState().isDone()) {
-                return;
-            }
-            StagePartition partition = getStagePartition(taskId.getPartitionId());
-            CompletableFuture<ExchangeSinkInstanceHandle> exchangeSinkInstanceHandleFuture = exchange.updateSinkInstanceHandle(partition.getExchangeSinkHandle(), taskId.getAttemptId());
-
-            exchangeSinkInstanceHandleFuture.whenComplete((sinkInstanceHandle, throwable) -> {
-                if (throwable != null) {
-                    eventQueue.add(new StageFailureEvent(taskId.getStageId(), throwable));
-                }
-                else {
-                    eventQueue.add(new RemoteTaskExchangeUpdatedSinkAcquired(taskId, sinkInstanceHandle));
-                }
-            });
-        }
-
-        public void finalizeUpdateOfExchangeSinkInstanceHandle(TaskId taskId, ExchangeSinkInstanceHandle updatedExchangeSinkInstanceHandle)
-        {
-            if (getState().isDone()) {
-                return;
-            }
-            StagePartition partition = getStagePartition(taskId.getPartitionId());
-            partition.updateExchangeSinkInstanceHandle(taskId, updatedExchangeSinkInstanceHandle);
-        }
-
-        public void taskFinished(TaskId taskId, TaskStatus taskStatus)
-        {
-            if (getState().isDone()) {
-                return;
-            }
-
-            int partitionId = taskId.getPartitionId();
-            StagePartition partition = getStagePartition(partitionId);
-            exchange.sinkFinished(partition.getExchangeSinkHandle(), taskId.getAttemptId());
-            SpoolingOutputStats.Snapshot outputStats = partition.taskFinished(taskId);
-
-            if (!partition.isRunning()) {
-                runningPartitions.remove(partitionId);
-            }
-
-            if (!remainingPartitions.remove(partitionId)) {
-                // a different task for the same partition finished before
-                return;
-            }
-
-            updateOutputSize(outputStats);
-
-            partitionMemoryEstimator.registerPartitionFinished(
-                    queryStateMachine.getSession(),
-                    partition.getMemoryRequirements(),
-                    taskStatus.getPeakMemoryReservation(),
-                    true,
-                    Optional.empty());
-
-            sinkOutputSelectorBuilder.include(exchange.getId(), taskId.getPartitionId(), taskId.getAttemptId());
-
-            if (noMorePartitions && remainingPartitions.isEmpty() && !stage.getState().isDone()) {
-                dynamicFilterService.stageCannotScheduleMoreTasks(stage.getStageId(), 0, partitions.size());
-                exchange.noMoreSinks();
-                exchange.allRequiredSinksFinished();
-                verify(finalSinkOutputSelector == null, "finalOutputSelector is already set");
-                sinkOutputSelectorBuilder.setPartitionCount(exchange.getId(), partitions.size());
-                sinkOutputSelectorBuilder.setFinal();
-                finalSinkOutputSelector = sinkOutputSelectorBuilder.build();
-                sinkOutputSelectorBuilder = null;
-                stage.finish();
-            }
-        }
-
-        private void updateOutputSize(SpoolingOutputStats.Snapshot taskOutputStats)
-        {
-            for (int partitionId = 0; partitionId < sinkPartitioningScheme.getPartitionCount(); partitionId++) {
-                long partitionSizeInBytes = taskOutputStats.getPartitionSizeInBytes(partitionId);
-                checkArgument(partitionSizeInBytes >= 0, "partitionSizeInBytes must be greater than or equal to zero: %s", partitionSizeInBytes);
-                outputDataSize[partitionId] += partitionSizeInBytes;
-            }
-        }
-
-        public List<PrioritizedScheduledTask> taskFailed(TaskId taskId, ExecutionFailureInfo failureInfo, TaskStatus taskStatus)
-        {
-            if (getState().isDone()) {
-                return ImmutableList.of();
-            }
-
-            int partitionId = taskId.getPartitionId();
-            StagePartition partition = getStagePartition(partitionId);
-            partition.taskFailed(taskId);
-
-            if (!partition.isRunning()) {
-                runningPartitions.remove(partitionId);
-            }
-
-            RuntimeException failure = failureInfo.toException();
-            ErrorCode errorCode = failureInfo.getErrorCode();
-            partitionMemoryEstimator.registerPartitionFinished(
-                    queryStateMachine.getSession(),
-                    partition.getMemoryRequirements(),
-                    taskStatus.getPeakMemoryReservation(),
-                    false,
-                    Optional.ofNullable(errorCode));
-
-            // update memory limits for next attempt
-            MemoryRequirements currentMemoryLimits = partition.getMemoryRequirements();
-            MemoryRequirements newMemoryLimits = partitionMemoryEstimator.getNextRetryMemoryRequirements(
-                    queryStateMachine.getSession(),
-                    partition.getMemoryRequirements(),
-                    taskStatus.getPeakMemoryReservation(),
-                    errorCode);
-            partition.setMemoryRequirements(newMemoryLimits);
-            log.debug(
-                    "Computed next memory requirements for task from stage %s; previous=%s; new=%s; peak=%s; estimator=%s",
-                    stage.getStageId(),
-                    currentMemoryLimits,
-                    newMemoryLimits,
-                    taskStatus.getPeakMemoryReservation(),
-                    partitionMemoryEstimator);
-
-            if (errorCode != null && isOutOfMemoryError(errorCode) && newMemoryLimits.getRequiredMemory().toBytes() * 0.99 <= taskStatus.getPeakMemoryReservation().toBytes()) {
-                String message = format(
-                        "Cannot allocate enough memory for task %s. Reported peak memory reservation: %s. Maximum possible reservation: %s.",
-                        taskId,
-                        taskStatus.getPeakMemoryReservation(),
-                        newMemoryLimits.getRequiredMemory());
-                stage.fail(new TrinoException(() -> errorCode, message, failure));
-                return ImmutableList.of();
-            }
-
-            if (partition.getRemainingAttempts() == 0 || (errorCode != null && errorCode.getType() == USER_ERROR)) {
-                stage.fail(failure);
-                // stage failed, don't reschedule
-                return ImmutableList.of();
-            }
-
-            if (!partition.isSealed()) {
-                // don't reschedule speculative tasks
-                return ImmutableList.of();
-            }
-
-            // TODO: split into smaller partitions here if necessary (for example if a task for a given partition failed with out of memory)
-
-            // reschedule a task
-            return ImmutableList.of(PrioritizedScheduledTask.create(stage.getStageId(), partitionId, schedulingPriority));
-        }
-
-        public MemoryRequirements getMemoryRequirements(int partitionId)
-        {
-            return getStagePartition(partitionId).getMemoryRequirements();
-        }
-
-        public Optional<NodeRequirements> getNodeRequirements(int partitionId)
-        {
-            return getStagePartition(partitionId).getNodeRequirements();
-        }
-
-        public OutputDataSizeEstimate getOutputDataSize()
-        {
-            // TODO enable speculative execution
-            checkState(stage.getState() == StageState.FINISHED, "stage %s is expected to be in FINISHED state, got %s", stage.getStageId(), stage.getState());
-            return new OutputDataSizeEstimate(ImmutableLongArray.copyOf(outputDataSize));
-        }
-
-        public ExchangeSourceOutputSelector getSinkOutputSelector()
-        {
-            if (finalSinkOutputSelector != null) {
-                return finalSinkOutputSelector;
-            }
-            return sinkOutputSelectorBuilder.build();
-        }
-
-        public void setSourceOutputSelector(PlanFragmentId sourceFragmentId, ExchangeSourceOutputSelector selector)
-        {
-            sourceOutputSelectors.put(sourceFragmentId, selector);
-            RemoteSourceNode remoteSourceNode = remoteSources.get(sourceFragmentId);
-            verify(remoteSourceNode != null, "remoteSourceNode is null for fragment: %s", sourceFragmentId);
-            ExchangeSourceOutputSelector mergedSelector = selector;
-            for (PlanFragmentId fragmentId : remoteSourceNode.getSourceFragmentIds()) {
-                if (fragmentId.equals(sourceFragmentId)) {
-                    continue;
-                }
-                ExchangeSourceOutputSelector fragmentSelector = sourceOutputSelectors.get(fragmentId);
-                if (fragmentSelector != null) {
-                    mergedSelector = mergedSelector.merge(fragmentSelector);
-                }
-            }
-            ExchangeSourceOutputSelector finalMergedSelector = mergedSelector;
-            remainingPartitions.forEach((java.util.function.IntConsumer) value -> {
-                StagePartition partition = partitions.get(value);
-                verify(partition != null, "partition not found: %s", value);
-                partition.updateExchangeSourceOutputSelector(remoteSourceNode.getId(), finalMergedSelector);
-            });
-        }
-
-        public void abort()
-        {
-            Closer closer = createStageExecutionCloser();
-            closer.register(stage::abort);
-            try {
-                closer.close();
-            }
-            catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
-        }
-
-        public void fail(Throwable t)
-        {
-            Closer closer = createStageExecutionCloser();
-            closer.register(() -> stage.fail(t));
-            try {
-                closer.close();
-            }
-            catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
-            taskDescriptorLoadingComplete();
-        }
-
-        private Closer createStageExecutionCloser()
-        {
-            Closer closer = Closer.create();
-            closer.register(taskSource);
-            closer.register(this::closeExchange);
-            return closer;
-        }
-
-        private StagePartition getStagePartition(int partitionId)
-        {
-            StagePartition partition = partitions.get(partitionId);
-            checkState(partition != null, "partition with id %s does not exist in stage %s", partitionId, stage.getStageId());
-            return partition;
-        }
-    }
-
-    private static class StagePartition
-    {
-        private final TaskDescriptorStorage taskDescriptorStorage;
-        private final StageId stageId;
-        private final int partitionId;
-        private final ExchangeSinkHandle exchangeSinkHandle;
-        private final Set<PlanNodeId> remoteSourceIds;
-
-        // empty when task descriptor is closed and stored in TaskDescriptorStorage
-        private Optional<OpenTaskDescriptor> openTaskDescriptor;
-        private MemoryRequirements memoryRequirements;
-        private int remainingAttempts;
-
-        private final Map<TaskId, RemoteTask> tasks = new HashMap<>();
-        private final Map<TaskId, SpoolingOutputBuffers> taskOutputBuffers = new HashMap<>();
-        private final Set<TaskId> runningTasks = new HashSet<>();
-        private final Set<PlanNodeId> finalSelectors = new HashSet<>();
-        private final Set<PlanNodeId> noMoreSplits = new HashSet<>();
-        private boolean finished;
-
-        public StagePartition(
-                TaskDescriptorStorage taskDescriptorStorage,
-                StageId stageId,
-                int partitionId,
-                ExchangeSinkHandle exchangeSinkHandle,
-                Set<PlanNodeId> remoteSourceIds,
-                NodeRequirements nodeRequirements,
-                MemoryRequirements memoryRequirements,
-                int maxTaskExecutionAttempts)
-        {
-            this.taskDescriptorStorage = requireNonNull(taskDescriptorStorage, "taskDescriptorStorage is null");
-            this.stageId = requireNonNull(stageId, "stageId is null");
-            this.partitionId = partitionId;
-            this.exchangeSinkHandle = requireNonNull(exchangeSinkHandle, "exchangeSinkHandle is null");
-            this.remoteSourceIds = ImmutableSet.copyOf(requireNonNull(remoteSourceIds, "remoteSourceIds is null"));
-            requireNonNull(nodeRequirements, "nodeRequirements is null");
-            this.openTaskDescriptor = Optional.of(new OpenTaskDescriptor(ImmutableListMultimap.of(), ImmutableSet.of(), nodeRequirements));
-            this.memoryRequirements = requireNonNull(memoryRequirements, "memoryRequirements is null");
-            this.remainingAttempts = maxTaskExecutionAttempts;
-        }
-
-        public int getPartitionId()
-        {
-            return partitionId;
-        }
-
-        public ExchangeSinkHandle getExchangeSinkHandle()
-        {
-            return exchangeSinkHandle;
-        }
-
-        public void addSplits(PlanNodeId planNodeId, List<Split> splits, boolean noMoreSplits)
-        {
-            checkState(openTaskDescriptor.isPresent(), "openTaskDescriptor is empty");
-            openTaskDescriptor = Optional.of(openTaskDescriptor.get().update(planNodeId, splits, noMoreSplits));
-            if (noMoreSplits) {
-                this.noMoreSplits.add(planNodeId);
-            }
-            for (RemoteTask task : tasks.values()) {
-                task.addSplits(ImmutableListMultimap.<PlanNodeId, Split>builder()
-                        .putAll(planNodeId, splits)
-                        .build());
-                if (noMoreSplits && isFinalOutputSelectorDelivered(planNodeId)) {
-                    task.noMoreSplits(planNodeId);
-                }
-            }
-        }
-
-        private boolean isFinalOutputSelectorDelivered(PlanNodeId planNodeId)
-        {
-            if (!remoteSourceIds.contains(planNodeId)) {
-                // not a remote source; input selector concept not applicable
-                return true;
-            }
-            return finalSelectors.contains(planNodeId);
-        }
-
-        public void seal(int partitionId)
-        {
-            checkState(openTaskDescriptor.isPresent(), "openTaskDescriptor is empty");
-            TaskDescriptor taskDescriptor = openTaskDescriptor.get().createTaskDescriptor(partitionId);
-            openTaskDescriptor = Optional.empty();
-            // a task may finish before task descriptor is sealed
-            if (!finished) {
-                taskDescriptorStorage.put(stageId, taskDescriptor);
-            }
-        }
-
-        public ListMultimap<PlanNodeId, Split> getSplits()
-        {
-            if (finished) {
-                return ImmutableListMultimap.of();
-            }
-            return openTaskDescriptor.map(OpenTaskDescriptor::getSplits)
-                    .or(() -> taskDescriptorStorage.get(stageId, partitionId).map(TaskDescriptor::getSplits))
-                    // execution is finished
-                    .orElse(ImmutableListMultimap.of());
-        }
-
-        public boolean isNoMoreSplits(PlanNodeId planNodeId)
-        {
-            if (finished) {
-                return true;
-            }
-            return openTaskDescriptor.map(taskDescriptor -> taskDescriptor.getNoMoreSplits().contains(planNodeId))
-                    // task descriptor is sealed, no more splits are expected
-                    .orElse(true);
-        }
-
-        public boolean isSealed()
-        {
-            return openTaskDescriptor.isEmpty();
-        }
-
-        /**
-         * Returns {@link Optional#empty()} when execution is finished
-         */
-        public Optional<NodeRequirements> getNodeRequirements()
-        {
-            if (finished) {
-                return Optional.empty();
-            }
-            if (openTaskDescriptor.isPresent()) {
-                return openTaskDescriptor.map(OpenTaskDescriptor::getNodeRequirements);
-            }
-            Optional<TaskDescriptor> taskDescriptor = taskDescriptorStorage.get(stageId, partitionId);
-            if (taskDescriptor.isPresent()) {
-                return taskDescriptor.map(TaskDescriptor::getNodeRequirements);
-            }
-            return Optional.empty();
-        }
-
-        public MemoryRequirements getMemoryRequirements()
-        {
-            return memoryRequirements;
-        }
-
-        public void setMemoryRequirements(MemoryRequirements memoryRequirements)
-        {
-            this.memoryRequirements = requireNonNull(memoryRequirements, "memoryRequirements is null");
-        }
-
-        public int getRemainingAttempts()
-        {
-            return remainingAttempts;
-        }
-
-        public void addTask(RemoteTask remoteTask, SpoolingOutputBuffers outputBuffers)
-        {
-            TaskId taskId = remoteTask.getTaskId();
-            tasks.put(taskId, remoteTask);
-            taskOutputBuffers.put(taskId, outputBuffers);
-            runningTasks.add(taskId);
-        }
-
-        public SpoolingOutputStats.Snapshot taskFinished(TaskId taskId)
-        {
-            RemoteTask remoteTask = tasks.get(taskId);
-            checkArgument(remoteTask != null, "task not found: %s", taskId);
-            SpoolingOutputStats.Snapshot outputStats = remoteTask.retrieveAndDropSpoolingOutputStats();
-            runningTasks.remove(taskId);
-            tasks.values().forEach(RemoteTask::abort);
-            finished = true;
-            // task descriptor has been created
-            if (isSealed()) {
-                taskDescriptorStorage.remove(stageId, partitionId);
-            }
-            return outputStats;
-        }
-
-        public void taskFailed(TaskId taskId)
-        {
-            runningTasks.remove(taskId);
-            remainingAttempts--;
-        }
-
-        public void updateExchangeSinkInstanceHandle(TaskId taskId, ExchangeSinkInstanceHandle handle)
-        {
-            SpoolingOutputBuffers outputBuffers = taskOutputBuffers.get(taskId);
-            checkArgument(outputBuffers != null, "output buffers not found: %s", taskId);
-            RemoteTask remoteTask = tasks.get(taskId);
-            checkArgument(remoteTask != null, "task not found: %s", taskId);
-            SpoolingOutputBuffers updatedOutputBuffers = outputBuffers.withExchangeSinkInstanceHandle(handle);
-            taskOutputBuffers.put(taskId, updatedOutputBuffers);
-            remoteTask.setOutputBuffers(updatedOutputBuffers);
-        }
-
-        public void updateExchangeSourceOutputSelector(PlanNodeId planNodeId, ExchangeSourceOutputSelector selector)
-        {
-            if (selector.isFinal()) {
-                finalSelectors.add(planNodeId);
-            }
-            for (TaskId taskId : runningTasks) {
-                RemoteTask task = tasks.get(taskId);
-                verify(task != null, "task is null: %s", taskId);
-                task.addSplits(ImmutableListMultimap.of(
-                        planNodeId,
-                        createOutputSelectorSplit(selector)));
-                if (selector.isFinal() && noMoreSplits.contains(planNodeId)) {
-                    task.noMoreSplits(planNodeId);
-                }
-            }
-        }
-
-        public boolean isRunning()
-        {
-            return !runningTasks.isEmpty();
-        }
-
-        public boolean isFinished()
-        {
-            return finished;
-        }
-    }
-
-    private static Split createOutputSelectorSplit(ExchangeSourceOutputSelector selector)
-    {
-        return new Split(REMOTE_CATALOG_HANDLE, new RemoteSplit(new SpoolingExchangeInput(ImmutableList.of(), Optional.of(selector))));
-    }
-
-    private static class OpenTaskDescriptor
-    {
-        private final ListMultimap<PlanNodeId, Split> splits;
-        private final Set<PlanNodeId> noMoreSplits;
-        private final NodeRequirements nodeRequirements;
-
-        private OpenTaskDescriptor(ListMultimap<PlanNodeId, Split> splits, Set<PlanNodeId> noMoreSplits, NodeRequirements nodeRequirements)
-        {
-            this.splits = ImmutableListMultimap.copyOf(requireNonNull(splits, "splits is null"));
-            this.noMoreSplits = ImmutableSet.copyOf(requireNonNull(noMoreSplits, "noMoreSplits is null"));
-            this.nodeRequirements = requireNonNull(nodeRequirements, "nodeRequirements is null");
-        }
-
-        public ListMultimap<PlanNodeId, Split> getSplits()
-        {
-            return splits;
-        }
-
-        public Set<PlanNodeId> getNoMoreSplits()
-        {
-            return noMoreSplits;
-        }
-
-        public NodeRequirements getNodeRequirements()
-        {
-            return nodeRequirements;
-        }
-
-        public OpenTaskDescriptor update(PlanNodeId planNodeId, List<Split> splits, boolean noMoreSplits)
-        {
-            ListMultimap<PlanNodeId, Split> updatedSplits = ImmutableListMultimap.<PlanNodeId, Split>builder()
-                    .putAll(this.splits)
-                    .putAll(planNodeId, splits)
-                    .build();
-
-            Set<PlanNodeId> updatedNoMoreSplits = this.noMoreSplits;
-            if (noMoreSplits && !updatedNoMoreSplits.contains(planNodeId)) {
-                updatedNoMoreSplits = ImmutableSet.<PlanNodeId>builder()
-                        .addAll(this.noMoreSplits)
-                        .add(planNodeId)
-                        .build();
-            }
-            return new OpenTaskDescriptor(
-                    updatedSplits,
-                    updatedNoMoreSplits,
-                    nodeRequirements);
-        }
-
-        public TaskDescriptor createTaskDescriptor(int partitionId)
-        {
-            Set<PlanNodeId> missingNoMoreSplits = Sets.difference(splits.keySet(), noMoreSplits);
-            checkState(missingNoMoreSplits.isEmpty(), "missing no more splits for plan nodes: %s", missingNoMoreSplits);
-            return new TaskDescriptor(
-                    partitionId,
-                    splits,
-                    nodeRequirements);
-        }
-    }
-
-    private record ScheduledTask(StageId stageId, int partitionId)
-    {
-        private ScheduledTask
-        {
-            requireNonNull(stageId, "stageId is null");
-            checkArgument(partitionId >= 0, "partitionId must be greater than or equal to zero: %s", partitionId);
-        }
-    }
-
-    private record PrioritizedScheduledTask(ScheduledTask task, int priority)
-    {
-        private static final int SPECULATIVE_EXECUTION_PRIORITY = 1_000_000_000;
-
-        private PrioritizedScheduledTask
-        {
-            requireNonNull(task, "task is null");
-            checkArgument(priority >= 0, "priority must be greater than or equal to zero: %s", priority);
-        }
-
-        public static PrioritizedScheduledTask create(StageId stageId, int partitionId, int priority)
-        {
-            checkArgument(priority < SPECULATIVE_EXECUTION_PRIORITY, "priority is expected to be less than %s: %s", SPECULATIVE_EXECUTION_PRIORITY, priority);
-            return new PrioritizedScheduledTask(new ScheduledTask(stageId, partitionId), priority);
-        }
-
-        public static PrioritizedScheduledTask createSpeculative(StageId stageId, int partitionId, int priority)
-        {
-            checkArgument(priority < SPECULATIVE_EXECUTION_PRIORITY, "priority is expected to be less than %s: %s", SPECULATIVE_EXECUTION_PRIORITY, priority);
-            return new PrioritizedScheduledTask(new ScheduledTask(stageId, partitionId), priority + SPECULATIVE_EXECUTION_PRIORITY);
-        }
-
-        public boolean isNonSpeculative()
-        {
-            return priority < SPECULATIVE_EXECUTION_PRIORITY;
-        }
-    }
-
-    private static class SchedulingQueue
-    {
-        private final IndexedPriorityQueue<ScheduledTask> queue = new IndexedPriorityQueue<>();
-        private int nonSpeculativeTaskCount;
-
-        public boolean isEmpty()
-        {
-            return queue.isEmpty();
-        }
-
-        public int getNonSpeculativeTaskCount()
-        {
-            return nonSpeculativeTaskCount;
-        }
-
-        public ScheduledTask pollOrThrow()
-        {
-            ScheduledTask task = queue.poll();
-            checkState(task != null, "queue is empty");
-            if (nonSpeculativeTaskCount > 0) {
-                // non speculative tasks are always pooled first
-                nonSpeculativeTaskCount--;
-            }
-            return task;
-        }
-
-        public void addOrUpdate(PrioritizedScheduledTask prioritizedTask)
-        {
-            if (prioritizedTask.isNonSpeculative()) {
-                nonSpeculativeTaskCount++;
-            }
-            queue.addOrUpdate(prioritizedTask.task(), prioritizedTask.priority());
-        }
-    }
-
-    private static class SchedulingDelayer
-    {
-        private final long minRetryDelayInMillis;
-        private final long maxRetryDelayInMillis;
-        private final double retryDelayScaleFactor;
-        private final Stopwatch stopwatch;
-
-        private long currentDelayInMillis;
-
-        private SchedulingDelayer(Duration minRetryDelay, Duration maxRetryDelay, double retryDelayScaleFactor, Stopwatch stopwatch)
-        {
-            this.minRetryDelayInMillis = requireNonNull(minRetryDelay, "minRetryDelay is null").toMillis();
-            this.maxRetryDelayInMillis = requireNonNull(maxRetryDelay, "maxRetryDelay is null").toMillis();
-            checkArgument(retryDelayScaleFactor >= 1, "retryDelayScaleFactor is expected to be greater than or equal to 1: %s", retryDelayScaleFactor);
-            this.retryDelayScaleFactor = retryDelayScaleFactor;
-            this.stopwatch = requireNonNull(stopwatch, "stopwatch is null");
-        }
-
-        public void startOrProlongDelayIfNecessary()
-        {
-            if (stopwatch.isRunning()) {
-                if (stopwatch.elapsed(MILLISECONDS) > currentDelayInMillis) {
-                    // we are past previous delay period and still getting failures; let's make it longer
-                    stopwatch.reset().start();
-                    currentDelayInMillis = min(round(currentDelayInMillis * retryDelayScaleFactor), maxRetryDelayInMillis);
-                }
-            }
-            else {
-                // initialize delaying of tasks scheduling
-                stopwatch.start();
-                currentDelayInMillis = minRetryDelayInMillis;
-            }
-        }
-
-        public long getRemainingDelayInMillis()
-        {
-            if (stopwatch.isRunning()) {
-                return max(0, currentDelayInMillis - stopwatch.elapsed(MILLISECONDS));
-            }
-            return 0;
-        }
-    }
-
-    private interface Event
-    {
-        Event ABORT = listener -> {
-            throw new UnsupportedOperationException();
-        };
-
-        Event WAKE_UP = listener -> {
-            throw new UnsupportedOperationException();
-        };
-
-        void accept(EventListener listener);
-    }
-
-    private interface EventListener
-    {
-        void onRemoteTaskCompleted(RemoteTaskCompletedEvent event);
-
-        void onRemoteTaskExchangeSinkUpdateRequired(RemoteTaskExchangeSinkUpdateRequiredEvent event);
-
-        void onRemoteTaskExchangeUpdatedSinkAcquired(RemoteTaskExchangeUpdatedSinkAcquired event);
-
-        void onSplitAssignment(SplitAssignmentEvent event);
-
-        void onStageFailure(StageFailureEvent event);
-
-        void onSinkInstanceHandleAcquired(SinkInstanceHandleAcquiredEvent sinkInstanceHandleAcquiredEvent);
-    }
-
-    private static class SinkInstanceHandleAcquiredEvent
-            implements Event
-    {
-        private final StageId stageId;
-        private final int partitionId;
-        private final NodeLease nodeLease;
-        private final int attempt;
-        private final ExchangeSinkInstanceHandle sinkInstanceHandle;
-
-        public SinkInstanceHandleAcquiredEvent(StageId stageId, int partitionId, NodeLease nodeLease, int attempt, ExchangeSinkInstanceHandle sinkInstanceHandle)
-        {
-            this.stageId = requireNonNull(stageId, "stageId is null");
-            this.partitionId = partitionId;
-            this.nodeLease = requireNonNull(nodeLease, "nodeLease is null");
-            this.attempt = attempt;
-            this.sinkInstanceHandle = requireNonNull(sinkInstanceHandle, "sinkInstanceHandle is null");
-        }
-
-        public StageId getStageId()
-        {
-            return stageId;
-        }
-
-        public int getPartitionId()
-        {
-            return partitionId;
-        }
-
-        public NodeLease getNodeLease()
-        {
-            return nodeLease;
-        }
-
-        public int getAttempt()
-        {
-            return attempt;
-        }
-
-        public ExchangeSinkInstanceHandle getSinkInstanceHandle()
-        {
-            return sinkInstanceHandle;
-        }
-
-        @Override
-        public void accept(EventListener listener)
-        {
-            listener.onSinkInstanceHandleAcquired(this);
-        }
-    }
-
-    private static class RemoteTaskCompletedEvent
-            extends RemoteTaskEvent
-    {
-        public RemoteTaskCompletedEvent(TaskStatus taskStatus)
-        {
-            super(taskStatus);
-        }
-
-        @Override
-        public void accept(EventListener listener)
-        {
-            listener.onRemoteTaskCompleted(this);
-        }
-    }
-
-    private static class RemoteTaskExchangeSinkUpdateRequiredEvent
-            extends RemoteTaskEvent
-    {
-        protected RemoteTaskExchangeSinkUpdateRequiredEvent(TaskStatus taskStatus)
-        {
-            super(taskStatus);
-        }
-
-        @Override
-        public void accept(EventListener listener)
-        {
-            listener.onRemoteTaskExchangeSinkUpdateRequired(this);
-        }
-    }
-
-    private static class RemoteTaskExchangeUpdatedSinkAcquired
-            implements Event
-    {
-        private final TaskId taskId;
-        private final ExchangeSinkInstanceHandle exchangeSinkInstanceHandle;
-
-        private RemoteTaskExchangeUpdatedSinkAcquired(TaskId taskId, ExchangeSinkInstanceHandle exchangeSinkInstanceHandle)
-        {
-            this.taskId = requireNonNull(taskId, "taskId is null");
-            this.exchangeSinkInstanceHandle = requireNonNull(exchangeSinkInstanceHandle, "exchangeSinkInstanceHandle is null");
-        }
-
-        @Override
-        public void accept(EventListener listener)
-        {
-            listener.onRemoteTaskExchangeUpdatedSinkAcquired(this);
-        }
-
-        public TaskId getTaskId()
-        {
-            return taskId;
-        }
-
-        public ExchangeSinkInstanceHandle getExchangeSinkInstanceHandle()
-        {
-            return exchangeSinkInstanceHandle;
-        }
-    }
-
-    private abstract static class RemoteTaskEvent
-            implements Event
-    {
-        private final TaskStatus taskStatus;
-
-        protected RemoteTaskEvent(TaskStatus taskStatus)
-        {
-            this.taskStatus = requireNonNull(taskStatus, "taskStatus is null");
-        }
-
-        public TaskStatus getTaskStatus()
-        {
-            return taskStatus;
-        }
-    }
-
-    private static class SplitAssignmentEvent
-            extends StageEvent
-    {
-        private final AssignmentResult assignmentResult;
-
-        public SplitAssignmentEvent(StageId stageId, AssignmentResult assignmentResult)
-        {
-            super(stageId);
-            this.assignmentResult = requireNonNull(assignmentResult, "assignmentResult is null");
-        }
-
-        public AssignmentResult getAssignmentResult()
-        {
-            return assignmentResult;
-        }
-
-        @Override
-        public void accept(EventListener listener)
-        {
-            listener.onSplitAssignment(this);
-        }
-    }
-
-    private static class StageFailureEvent
-            extends StageEvent
-    {
-        private final Throwable failure;
-
-        public StageFailureEvent(StageId stageId, Throwable failure)
-        {
-            super(stageId);
-            this.failure = requireNonNull(failure, "failure is null");
-        }
-
-        public Throwable getFailure()
-        {
-            return failure;
-        }
-
-        @Override
-        public void accept(EventListener listener)
-        {
-            listener.onStageFailure(this);
-        }
-    }
-
-    private abstract static class StageEvent
-            implements Event
-    {
-        private final StageId stageId;
-
-        protected StageEvent(StageId stageId)
-        {
-            this.stageId = requireNonNull(stageId, "stageId is null");
-        }
-
-        public StageId getStageId()
-        {
-            return stageId;
-        }
-    }
-
-    private record GetExchangeSinkInstanceHandleResult(CompletableFuture<ExchangeSinkInstanceHandle> exchangeSinkInstanceHandleFuture, int attempt)
-    {
-        public GetExchangeSinkInstanceHandleResult
-        {
-            requireNonNull(exchangeSinkInstanceHandleFuture, "exchangeSinkInstanceHandleFuture is null");
-        }
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/FileBasedNetworkTopology.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/FileBasedNetworkTopology.java
index 401aa3e7382d..70114136cc99 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/FileBasedNetworkTopology.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/FileBasedNetworkTopology.java
@@ -17,14 +17,13 @@
 import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.spi.HostAddress;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/FixedCountNodeAllocatorService.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/FixedCountNodeAllocatorService.java
deleted file mode 100644
index a3e90a09855d..000000000000
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/FixedCountNodeAllocatorService.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.scheduler;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
-import io.airlift.log.Logger;
-import io.airlift.units.DataSize;
-import io.trino.Session;
-import io.trino.metadata.InternalNode;
-import io.trino.spi.TrinoException;
-import io.trino.spi.connector.CatalogHandle;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Verify.verify;
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.Sets.newConcurrentHashSet;
-import static com.google.common.util.concurrent.Futures.immediateFailedFuture;
-import static com.google.common.util.concurrent.Futures.immediateFuture;
-import static io.airlift.concurrent.MoreFutures.getFutureValue;
-import static io.airlift.concurrent.Threads.daemonThreadsNamed;
-import static io.trino.spi.StandardErrorCode.NO_NODES_AVAILABLE;
-import static java.util.Comparator.comparing;
-import static java.util.Objects.requireNonNull;
-
-/**
- * A simplistic node allocation service which only limits number of allocations per node within each
- * {@link FixedCountNodeAllocator} instance. Each allocator will allow each node to be acquired up to {@link FixedCountNodeAllocatorService#MAXIMUM_ALLOCATIONS_PER_NODE}
- * times at the same time.
- */
-@ThreadSafe
-public class FixedCountNodeAllocatorService
-        implements NodeAllocatorService
-{
-    private static final Logger log = Logger.get(FixedCountNodeAllocatorService.class);
-
-    // Single FixedCountNodeAllocator will allow for at most MAXIMUM_ALLOCATIONS_PER_NODE.
-    // If we reach this state subsequent calls to acquire will return blocked lease.
-    private static final int MAXIMUM_ALLOCATIONS_PER_NODE = 1; // TODO make configurable?
-
-    private final ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1, daemonThreadsNamed("fixed-count-node-allocator"));
-    private final NodeScheduler nodeScheduler;
-
-    private final Set<FixedCountNodeAllocator> allocators = newConcurrentHashSet();
-    private final AtomicBoolean started = new AtomicBoolean();
-
-    @Inject
-    public FixedCountNodeAllocatorService(NodeScheduler nodeScheduler)
-    {
-        this.nodeScheduler = requireNonNull(nodeScheduler, "nodeScheduler is null");
-    }
-
-    @PostConstruct
-    public void start()
-    {
-        if (!started.compareAndSet(false, true)) {
-            // already started
-            return;
-        }
-        executor.scheduleWithFixedDelay(() -> {
-            try {
-                updateNodes();
-            }
-            catch (Throwable e) {
-                // ignore to avoid getting unscheduled
-                log.warn(e, "Error updating nodes");
-            }
-        }, 5, 5, TimeUnit.SECONDS);
-    }
-
-    @PreDestroy
-    public void stop()
-    {
-        executor.shutdownNow();
-    }
-
-    @VisibleForTesting
-    void updateNodes()
-    {
-        allocators.forEach(FixedCountNodeAllocator::updateNodes);
-    }
-
-    @Override
-    public NodeAllocator getNodeAllocator(Session session)
-    {
-        requireNonNull(session, "session is null");
-        return getNodeAllocator(session, MAXIMUM_ALLOCATIONS_PER_NODE);
-    }
-
-    @VisibleForTesting
-    NodeAllocator getNodeAllocator(Session session, int maximumAllocationsPerNode)
-    {
-        FixedCountNodeAllocator allocator = new FixedCountNodeAllocator(session, maximumAllocationsPerNode);
-        allocators.add(allocator);
-        return allocator;
-    }
-
-    private class FixedCountNodeAllocator
-            implements NodeAllocator
-    {
-        private final Session session;
-        private final int maximumAllocationsPerNode;
-
-        @GuardedBy("this")
-        private final Map<Optional<CatalogHandle>, NodeSelector> nodeSelectorCache = new HashMap<>();
-
-        @GuardedBy("this")
-        private final Map<InternalNode, Integer> allocationCountMap = new HashMap<>();
-
-        @GuardedBy("this")
-        private final List<PendingAcquire> pendingAcquires = new LinkedList<>();
-
-        public FixedCountNodeAllocator(
-                Session session,
-                int maximumAllocationsPerNode)
-        {
-            this.session = requireNonNull(session, "session is null");
-            this.maximumAllocationsPerNode = maximumAllocationsPerNode;
-        }
-
-        @Override
-        public synchronized NodeLease acquire(NodeRequirements nodeRequirements, DataSize memoryRequirement)
-        {
-            try {
-                Optional<InternalNode> node = tryAcquireNode(nodeRequirements);
-                if (node.isPresent()) {
-                    return new FixedCountNodeLease(immediateFuture(node.get()));
-                }
-            }
-            catch (RuntimeException e) {
-                return new FixedCountNodeLease(immediateFailedFuture(e));
-            }
-
-            SettableFuture<InternalNode> future = SettableFuture.create();
-            PendingAcquire pendingAcquire = new PendingAcquire(nodeRequirements, future);
-            pendingAcquires.add(pendingAcquire);
-
-            return new FixedCountNodeLease(future);
-        }
-
-        public void updateNodes()
-        {
-            processPendingAcquires();
-        }
-
-        private synchronized Optional<InternalNode> tryAcquireNode(NodeRequirements requirements)
-        {
-            NodeSelector nodeSelector = nodeSelectorCache.computeIfAbsent(requirements.getCatalogHandle(), catalogHandle -> nodeScheduler.createNodeSelector(session, catalogHandle));
-
-            List<InternalNode> nodes = nodeSelector.allNodes();
-            if (nodes.isEmpty()) {
-                throw new TrinoException(NO_NODES_AVAILABLE, "No nodes available to run query");
-            }
-
-            List<InternalNode> nodesMatchingRequirements = nodes.stream()
-                    .filter(node -> requirements.getAddresses().isEmpty() || requirements.getAddresses().contains(node.getHostAndPort()))
-                    .collect(toImmutableList());
-
-            if (nodesMatchingRequirements.isEmpty()) {
-                throw new TrinoException(NO_NODES_AVAILABLE, "No nodes available to run query");
-            }
-
-            Optional<InternalNode> selectedNode = nodesMatchingRequirements.stream()
-                    .filter(node -> allocationCountMap.getOrDefault(node, 0) < maximumAllocationsPerNode)
-                    .min(comparing(node -> allocationCountMap.getOrDefault(node, 0)));
-
-            if (selectedNode.isEmpty()) {
-                return Optional.empty();
-            }
-
-            allocationCountMap.compute(selectedNode.get(), (key, value) -> value == null ? 1 : value + 1);
-            return selectedNode;
-        }
-
-        private void releaseNode(InternalNode node)
-        {
-            synchronized (this) {
-                int allocationCount = allocationCountMap.compute(node, (key, value) -> value == null ? 0 : value - 1);
-                checkState(allocationCount >= 0, "allocation count for node %s is expected to be greater than or equal to zero: %s", node, allocationCount);
-            }
-            processPendingAcquires();
-        }
-
-        private void processPendingAcquires()
-        {
-            verify(!Thread.holdsLock(this));
-
-            IdentityHashMap<PendingAcquire, InternalNode> assignedNodes = new IdentityHashMap<>();
-            IdentityHashMap<PendingAcquire, RuntimeException> failures = new IdentityHashMap<>();
-            synchronized (this) {
-                Iterator<PendingAcquire> iterator = pendingAcquires.iterator();
-                while (iterator.hasNext()) {
-                    PendingAcquire pendingAcquire = iterator.next();
-                    if (pendingAcquire.getFuture().isCancelled()) {
-                        iterator.remove();
-                        continue;
-                    }
-                    try {
-                        Optional<InternalNode> node = tryAcquireNode(pendingAcquire.getNodeRequirements());
-                        if (node.isPresent()) {
-                            iterator.remove();
-                            assignedNodes.put(pendingAcquire, node.get());
-                        }
-                    }
-                    catch (RuntimeException e) {
-                        iterator.remove();
-                        failures.put(pendingAcquire, e);
-                    }
-                }
-            }
-
-            // set futures outside of critical section
-            assignedNodes.forEach((pendingAcquire, node) -> {
-                SettableFuture<InternalNode> future = pendingAcquire.getFuture();
-                future.set(node);
-                if (future.isCancelled()) {
-                    releaseNode(node);
-                }
-            });
-
-            failures.forEach((pendingAcquire, failure) -> {
-                SettableFuture<InternalNode> future = pendingAcquire.getFuture();
-                future.setException(failure);
-            });
-        }
-
-        @Override
-        public synchronized void close()
-        {
-            allocators.remove(this);
-        }
-
-        private class FixedCountNodeLease
-                implements NodeAllocator.NodeLease
-        {
-            private final ListenableFuture<InternalNode> node;
-            private final AtomicBoolean released = new AtomicBoolean();
-
-            private FixedCountNodeLease(ListenableFuture<InternalNode> node)
-            {
-                this.node = requireNonNull(node, "node is null");
-            }
-
-            @Override
-            public ListenableFuture<InternalNode> getNode()
-            {
-                return node;
-            }
-
-            @Override
-            public void release()
-            {
-                if (released.compareAndSet(false, true)) {
-                    node.cancel(true);
-                    if (node.isDone() && !node.isCancelled()) {
-                        releaseNode(getFutureValue(node));
-                    }
-                }
-                else {
-                    throw new IllegalStateException("Node " + node + " already released");
-                }
-            }
-        }
-    }
-
-    private static class PendingAcquire
-    {
-        private final NodeRequirements nodeRequirements;
-        private final SettableFuture<InternalNode> future;
-
-        private PendingAcquire(NodeRequirements nodeRequirements, SettableFuture<InternalNode> future)
-        {
-            this.nodeRequirements = requireNonNull(nodeRequirements, "nodeRequirements is null");
-            this.future = requireNonNull(future, "future is null");
-        }
-
-        public NodeRequirements getNodeRequirements()
-        {
-            return nodeRequirements;
-        }
-
-        public SettableFuture<InternalNode> getFuture()
-        {
-            return future;
-        }
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/MultiSourcePartitionedScheduler.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/MultiSourcePartitionedScheduler.java
new file mode 100644
index 000000000000..6ec29f079139
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/MultiSourcePartitionedScheduler.java
@@ -0,0 +1,163 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import io.airlift.log.Logger;
+import io.trino.annotation.NotThreadSafe;
+import io.trino.execution.RemoteTask;
+import io.trino.execution.TableExecuteContextManager;
+import io.trino.metadata.InternalNode;
+import io.trino.server.DynamicFilterService;
+import io.trino.split.SplitSource;
+import io.trino.sql.planner.plan.PlanNodeId;
+
+import java.util.ArrayDeque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.function.BooleanSupplier;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
+import static io.trino.execution.scheduler.SourcePartitionedScheduler.newSourcePartitionedSchedulerAsSourceScheduler;
+import static java.util.Objects.requireNonNull;
+
+@NotThreadSafe
+public class MultiSourcePartitionedScheduler
+        implements StageScheduler
+{
+    private static final Logger log = Logger.get(MultiSourcePartitionedScheduler.class);
+
+    private final StageExecution stageExecution;
+    private final Queue<SourceScheduler> sourceSchedulers;
+    private final Map<InternalNode, RemoteTask> scheduledTasks = new HashMap<>();
+    private final DynamicFilterService dynamicFilterService;
+    private final SplitPlacementPolicy splitPlacementPolicy;
+    private final PartitionIdAllocator partitionIdAllocator = new PartitionIdAllocator();
+
+    public MultiSourcePartitionedScheduler(
+            StageExecution stageExecution,
+            Map<PlanNodeId, SplitSource> splitSources,
+            SplitPlacementPolicy splitPlacementPolicy,
+            int splitBatchSize,
+            DynamicFilterService dynamicFilterService,
+            TableExecuteContextManager tableExecuteContextManager,
+            BooleanSupplier anySourceTaskBlocked)
+    {
+        requireNonNull(splitSources, "splitSources is null");
+        checkArgument(splitSources.size() > 1, "It is expected that there will be more than one split sources");
+
+        ImmutableList.Builder<SourceScheduler> sourceSchedulers = ImmutableList.builder();
+        for (PlanNodeId planNodeId : splitSources.keySet()) {
+            SplitSource splitSource = splitSources.get(planNodeId);
+            SourceScheduler sourceScheduler = newSourcePartitionedSchedulerAsSourceScheduler(
+                    stageExecution,
+                    planNodeId,
+                    splitSource,
+                    splitPlacementPolicy,
+                    splitBatchSize,
+                    dynamicFilterService,
+                    tableExecuteContextManager,
+                    anySourceTaskBlocked,
+                    partitionIdAllocator,
+                    scheduledTasks);
+            sourceSchedulers.add(sourceScheduler);
+        }
+        this.stageExecution = requireNonNull(stageExecution, "stageExecution is null");
+        this.sourceSchedulers = new ArrayDeque<>(sourceSchedulers.build());
+        this.dynamicFilterService = requireNonNull(dynamicFilterService, "dynamicFilterService is null");
+        this.splitPlacementPolicy = requireNonNull(splitPlacementPolicy, "splitPlacementPolicy is null");
+    }
+
+    @Override
+    public synchronized void start()
+    {
+        /*
+         * Avoid deadlocks by immediately scheduling a task for collecting dynamic filters because:
+         *  * there can be task in other stage blocked waiting for the dynamic filters, or
+         *  * connector split source for this stage might be blocked waiting the dynamic filters.
+        */
+        if (dynamicFilterService.isCollectingTaskNeeded(stageExecution.getStageId().getQueryId(), stageExecution.getFragment())) {
+            stageExecution.beginScheduling();
+            /*
+             * We can select node randomly because DynamicFilterSourceOperator is not dependent on splits
+             * scheduled by this scheduler.
+             */
+            scheduleTaskOnRandomNode();
+        }
+    }
+
+    @Override
+    public synchronized ScheduleResult schedule()
+    {
+        ImmutableSet.Builder<RemoteTask> newScheduledTasks = ImmutableSet.builder();
+        ListenableFuture<Void> blocked = immediateVoidFuture();
+        Optional<ScheduleResult.BlockedReason> blockedReason = Optional.empty();
+        int splitsScheduled = 0;
+
+        while (!sourceSchedulers.isEmpty()) {
+            SourceScheduler scheduler = sourceSchedulers.peek();
+            ScheduleResult scheduleResult = scheduler.schedule();
+
+            splitsScheduled += scheduleResult.getSplitsScheduled();
+            newScheduledTasks.addAll(scheduleResult.getNewTasks());
+            blocked = scheduleResult.getBlocked();
+            blockedReason = scheduleResult.getBlockedReason();
+
+            // if the source is not done scheduling, stop scheduling for now
+            if (!blocked.isDone() || !scheduleResult.isFinished()) {
+                break;
+            }
+
+            stageExecution.schedulingComplete(scheduler.getPlanNodeId());
+            sourceSchedulers.remove().close();
+        }
+        if (blockedReason.isPresent()) {
+            return new ScheduleResult(sourceSchedulers.isEmpty(), newScheduledTasks.build(), blocked, blockedReason.get(), splitsScheduled);
+        }
+        return new ScheduleResult(sourceSchedulers.isEmpty(), newScheduledTasks.build(), splitsScheduled);
+    }
+
+    @Override
+    public void close()
+    {
+        for (SourceScheduler sourceScheduler : sourceSchedulers) {
+            try {
+                sourceScheduler.close();
+            }
+            catch (Throwable t) {
+                log.warn(t, "Error closing split source");
+            }
+        }
+        sourceSchedulers.clear();
+    }
+
+    private void scheduleTaskOnRandomNode()
+    {
+        checkState(scheduledTasks.isEmpty(), "Stage task is already scheduled on node");
+        List<InternalNode> allNodes = splitPlacementPolicy.allNodes();
+        checkState(allNodes.size() > 0, "No nodes available");
+        InternalNode node = allNodes.get(ThreadLocalRandom.current().nextInt(0, allNodes.size()));
+        Optional<RemoteTask> remoteTask = stageExecution.scheduleTask(node, partitionIdAllocator.getNextId(), ImmutableMultimap.of());
+        remoteTask.ifPresent(task -> scheduledTasks.put(node, task));
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/NetworkTopology.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/NetworkTopology.java
index 4a446172c6a2..c3cc5df0cedb 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/NetworkTopology.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/NetworkTopology.java
@@ -13,10 +13,9 @@
  */
 package io.trino.execution.scheduler;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.spi.HostAddress;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 /**
  * Implementations of this interface must be thread safe.
  */
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeAllocator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeAllocator.java
deleted file mode 100644
index 6c105daf20ce..000000000000
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeAllocator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.scheduler;
-
-import com.google.common.util.concurrent.ListenableFuture;
-import io.airlift.units.DataSize;
-import io.trino.execution.TaskId;
-import io.trino.metadata.InternalNode;
-
-import java.io.Closeable;
-
-public interface NodeAllocator
-        extends Closeable
-{
-    /**
-     * Requests acquisition of node. Obtained node can be obtained via {@link NodeLease#getNode()} method.
-     * The node may not be available immediately. Calling party needs to wait until future returned is done.
-     *
-     * It is obligatory for the calling party to release all the leases they obtained via {@link NodeLease#release()}.
-     */
-    NodeLease acquire(NodeRequirements nodeRequirements, DataSize memoryRequirement);
-
-    @Override
-    void close();
-
-    interface NodeLease
-    {
-        ListenableFuture<InternalNode> getNode();
-
-        default void attachTaskId(TaskId taskId) {}
-
-        void release();
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeScheduler.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeScheduler.java
index 2677518ac8ea..fef4831353c4 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeScheduler.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeScheduler.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.Multimap;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.NodeTaskMap;
 import io.trino.execution.RemoteTask;
@@ -28,8 +29,6 @@
 import io.trino.spi.SplitWeight;
 import io.trino.spi.connector.CatalogHandle;
 
-import javax.inject.Inject;
-
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -108,17 +107,17 @@ public static List<InternalNode> selectExactNodes(NodeMap nodeMap, List<HostAddr
                     .filter(node -> includeCoordinator || !coordinatorIds.contains(node.getNodeIdentifier()))
                     .forEach(chosen::add);
 
-            InetAddress address;
-            try {
-                address = host.toInetAddress();
-            }
-            catch (UnknownHostException e) {
-                // skip hosts that don't resolve
-                continue;
-            }
-
             // consider a split with a host without a port as being accessible by all nodes in that host
             if (!host.hasPort()) {
+                InetAddress address;
+                try {
+                    address = host.toInetAddress();
+                }
+                catch (UnknownHostException e) {
+                    // skip hosts that don't resolve
+                    continue;
+                }
+
                 nodeMap.getNodesByHost().get(address).stream()
                         .filter(node -> includeCoordinator || !coordinatorIds.contains(node.getNodeIdentifier()))
                         .forEach(chosen::add);
@@ -134,17 +133,17 @@ public static List<InternalNode> selectExactNodes(NodeMap nodeMap, List<HostAddr
 
                 chosen.addAll(nodeMap.getNodesByHostAndPort().get(host));
 
-                InetAddress address;
-                try {
-                    address = host.toInetAddress();
-                }
-                catch (UnknownHostException e) {
-                    // skip hosts that don't resolve
-                    continue;
-                }
-
                 // consider a split with a host without a port as being accessible by all nodes in that host
                 if (!host.hasPort()) {
+                    InetAddress address;
+                    try {
+                        address = host.toInetAddress();
+                    }
+                    catch (UnknownHostException e) {
+                        // skip hosts that don't resolve
+                        continue;
+                    }
+
                     chosen.addAll(nodeMap.getNodesByHost().get(address));
                 }
             }
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeSchedulerConfig.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeSchedulerConfig.java
index 11b54b099514..c534d09939ae 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeSchedulerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeSchedulerConfig.java
@@ -18,15 +18,15 @@
 import io.airlift.configuration.DefunctConfig;
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.concurrent.TimeUnit;
 
 import static java.util.Locale.ENGLISH;
 
 @DefunctConfig({
+        "node-scheduler.allocator-type",
         "node-scheduler.location-aware-scheduling-enabled",
         "node-scheduler.multiple-tasks-per-node-enabled",
         "node-scheduler.max-fraction-full-nodes-per-query",
@@ -45,15 +45,14 @@ public enum SplitsBalancingPolicy
 
     private int minCandidates = 10;
     private boolean includeCoordinator = true;
-    private int maxSplitsPerNode = 100;
-    private int minPendingSplitsPerTask = 10;
+    private int maxSplitsPerNode = 256;
+    private int minPendingSplitsPerTask = 16;
     private int maxAdjustedPendingSplitsWeightPerTask = 2000;
     private NodeSchedulerPolicy nodeSchedulerPolicy = NodeSchedulerPolicy.UNIFORM;
     private boolean optimizedLocalScheduling = true;
     private SplitsBalancingPolicy splitsBalancingPolicy = SplitsBalancingPolicy.STAGE;
     private int maxUnacknowledgedSplitsPerTask = 2000;
     private Duration allowedNoMatchingNodePeriod = new Duration(2, TimeUnit.MINUTES);
-    private NodeAllocatorType nodeAllocatorType = NodeAllocatorType.BIN_PACKING;
 
     @NotNull
     public NodeSchedulerPolicy getNodeSchedulerPolicy()
@@ -199,34 +198,4 @@ public Duration getAllowedNoMatchingNodePeriod()
     {
         return allowedNoMatchingNodePeriod;
     }
-
-    public enum NodeAllocatorType
-    {
-        FIXED_COUNT,
-        BIN_PACKING
-    }
-
-    @NotNull
-    public NodeAllocatorType getNodeAllocatorType()
-    {
-        return nodeAllocatorType;
-    }
-
-    @Config("node-scheduler.allocator-type")
-    public NodeSchedulerConfig setNodeAllocatorType(String nodeAllocatorType)
-    {
-        this.nodeAllocatorType = toNodeAllocatorType(nodeAllocatorType);
-        return this;
-    }
-
-    private static NodeAllocatorType toNodeAllocatorType(String nodeAllocatorType)
-    {
-        switch (nodeAllocatorType.toLowerCase(ENGLISH)) {
-            case "fixed_count":
-                return NodeAllocatorType.FIXED_COUNT;
-            case "bin_packing":
-                return NodeAllocatorType.BIN_PACKING;
-        }
-        throw new IllegalArgumentException("Unknown node allocator type: " + nodeAllocatorType);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeSchedulerExporter.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeSchedulerExporter.java
index 9a97e4b1a358..14ee617d40bb 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeSchedulerExporter.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeSchedulerExporter.java
@@ -14,15 +14,14 @@
 package io.trino.execution.scheduler;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.stats.CounterStat;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.JmxException;
 import org.weakref.jmx.MBeanExport;
 import org.weakref.jmx.MBeanExporter;
 
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/OutputDataSizeEstimate.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/OutputDataSizeEstimate.java
index b1fd57610faa..ef70a0d71126 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/OutputDataSizeEstimate.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/OutputDataSizeEstimate.java
@@ -34,6 +34,15 @@ public long getPartitionSizeInBytes(int partitionId)
         return partitionDataSizes.get(partitionId);
     }
 
+    public long getTotalSizeInBytes()
+    {
+        long totalSizeInBytes = 0;
+        for (int partitionId = 0; partitionId < partitionDataSizes.length(); partitionId++) {
+            totalSizeInBytes += partitionDataSizes.get(partitionId);
+        }
+        return totalSizeInBytes;
+    }
+
     public static OutputDataSizeEstimate merge(Collection<OutputDataSizeEstimate> estimates)
     {
         int partitionCount = getPartitionCount(estimates);
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionMemoryEstimatorFactory.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionMemoryEstimatorFactory.java
deleted file mode 100644
index 59f27b30dd5a..000000000000
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionMemoryEstimatorFactory.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.scheduler;
-
-@FunctionalInterface
-public interface PartitionMemoryEstimatorFactory
-{
-    PartitionMemoryEstimator createPartitionMemoryEstimator();
-}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionedPipelinedOutputBufferManager.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionedPipelinedOutputBufferManager.java
index baf801169194..7f77d2ac88dd 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionedPipelinedOutputBufferManager.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionedPipelinedOutputBufferManager.java
@@ -14,12 +14,11 @@
 package io.trino.execution.scheduler;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.execution.buffer.PipelinedOutputBuffers;
 import io.trino.execution.buffer.PipelinedOutputBuffers.OutputBufferId;
 import io.trino.sql.planner.PartitioningHandle;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/PipelinedQueryScheduler.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/PipelinedQueryScheduler.java
index 855185fc742c..c370e7bca4da 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/PipelinedQueryScheduler.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/PipelinedQueryScheduler.java
@@ -21,10 +21,13 @@
 import com.google.common.primitives.Ints;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.concurrent.SetThreadName;
 import io.airlift.log.Logger;
 import io.airlift.stats.TimeStat;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.Session;
 import io.trino.exchange.DirectExchangeInput;
 import io.trino.execution.BasicStageStats;
@@ -69,8 +72,6 @@
 import io.trino.sql.planner.plan.RemoteSourceNode;
 import io.trino.sql.planner.plan.TableScanNode;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -113,7 +114,7 @@
 import static io.trino.SystemSessionProperties.getRetryInitialDelay;
 import static io.trino.SystemSessionProperties.getRetryMaxDelay;
 import static io.trino.SystemSessionProperties.getRetryPolicy;
-import static io.trino.SystemSessionProperties.getWriterMinSize;
+import static io.trino.SystemSessionProperties.getWriterScalingMinDataProcessed;
 import static io.trino.execution.QueryState.STARTING;
 import static io.trino.execution.scheduler.PipelinedStageExecution.createPipelinedStageExecution;
 import static io.trino.execution.scheduler.SourcePartitionedScheduler.newSourcePartitionedSchedulerAsStageScheduler;
@@ -199,6 +200,7 @@ public PipelinedQueryScheduler(
             FailureDetector failureDetector,
             NodeTaskMap nodeTaskMap,
             ExecutionPolicy executionPolicy,
+            Tracer tracer,
             SplitSchedulerStats schedulerStats,
             DynamicFilterService dynamicFilterService,
             TableExecuteContextManager tableExecuteContextManager,
@@ -224,6 +226,7 @@ public PipelinedQueryScheduler(
                 metadata,
                 remoteTaskFactory,
                 nodeTaskMap,
+                tracer,
                 schedulerStats,
                 plan,
                 summarizeTaskInfo);
@@ -1025,10 +1028,11 @@ private static StageScheduler createStageScheduler(
                 TableExecuteContextManager tableExecuteContextManager)
         {
             Session session = queryStateMachine.getSession();
+            Span stageSpan = stageExecution.getStageSpan();
             PlanFragment fragment = stageExecution.getFragment();
             PartitioningHandle partitioningHandle = fragment.getPartitioning();
             Optional<Integer> partitionCount = fragment.getPartitionCount();
-            Map<PlanNodeId, SplitSource> splitSources = splitSourceFactory.createSplitSources(session, fragment);
+            Map<PlanNodeId, SplitSource> splitSources = splitSourceFactory.createSplitSources(session, stageSpan, fragment);
             if (!splitSources.isEmpty()) {
                 queryStateMachine.addStateChangeListener(new StateChangeListener<>()
                 {
@@ -1050,19 +1054,39 @@ public void stateChanged(QueryState newState)
 
             if (partitioningHandle.equals(SOURCE_DISTRIBUTION)) {
                 // nodes are selected dynamically based on the constraints of the splits and the system load
-                Entry<PlanNodeId, SplitSource> entry = getOnlyElement(splitSources.entrySet());
-                PlanNodeId planNodeId = entry.getKey();
-                SplitSource splitSource = entry.getValue();
-                Optional<CatalogHandle> catalogHandle = Optional.of(splitSource.getCatalogHandle())
-                        .filter(catalog -> !catalog.getType().isInternal());
-                NodeSelector nodeSelector = nodeScheduler.createNodeSelector(session, catalogHandle);
-                SplitPlacementPolicy placementPolicy = new DynamicSplitPlacementPolicy(nodeSelector, stageExecution::getAllTasks);
+                if (splitSources.size() == 1) {
+                    Entry<PlanNodeId, SplitSource> entry = getOnlyElement(splitSources.entrySet());
+                    PlanNodeId planNodeId = entry.getKey();
+                    SplitSource splitSource = entry.getValue();
+                    Optional<CatalogHandle> catalogHandle = Optional.of(splitSource.getCatalogHandle())
+                            .filter(catalog -> !catalog.getType().isInternal());
+                    NodeSelector nodeSelector = nodeScheduler.createNodeSelector(session, catalogHandle);
+                    SplitPlacementPolicy placementPolicy = new DynamicSplitPlacementPolicy(nodeSelector, stageExecution::getAllTasks);
+
+                    return newSourcePartitionedSchedulerAsStageScheduler(
+                            stageExecution,
+                            planNodeId,
+                            splitSource,
+                            placementPolicy,
+                            splitBatchSize,
+                            dynamicFilterService,
+                            tableExecuteContextManager,
+                            () -> childStageExecutions.stream().anyMatch(StageExecution::isAnyTaskBlocked));
+                }
+                Set<CatalogHandle> allCatalogHandles = splitSources.values()
+                        .stream()
+                        .map(SplitSource::getCatalogHandle)
+                        .filter(catalog -> !catalog.getType().isInternal())
+                        .collect(toImmutableSet());
+                checkState(allCatalogHandles.size() <= 1, "table scans that are within one stage should read from same catalog");
 
-                return newSourcePartitionedSchedulerAsStageScheduler(
+                Optional<CatalogHandle> catalogHandle = allCatalogHandles.size() == 1 ? Optional.of(getOnlyElement(allCatalogHandles)) : Optional.empty();
+
+                NodeSelector nodeSelector = nodeScheduler.createNodeSelector(session, catalogHandle);
+                return new MultiSourcePartitionedScheduler(
                         stageExecution,
-                        planNodeId,
-                        splitSource,
-                        placementPolicy,
+                        splitSources,
+                        new DynamicSplitPlacementPolicy(nodeSelector, stageExecution::getAllTasks),
                         splitBatchSize,
                         dynamicFilterService,
                         tableExecuteContextManager,
@@ -1083,7 +1107,7 @@ public void stateChanged(QueryState newState)
                         writerTasksProvider,
                         nodeScheduler.createNodeSelector(session, Optional.empty()),
                         executor,
-                        getWriterMinSize(session),
+                        getWriterScalingMinDataProcessed(session),
                         partitionCount.get());
 
                 whenAllStages(childStageExecutions, StageExecution.State::isDone)
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/PipelinedStageExecution.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/PipelinedStageExecution.java
index 3e01c9e3966a..c5aa469b9b68 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/PipelinedStageExecution.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/PipelinedStageExecution.java
@@ -19,7 +19,9 @@
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
+import io.opentelemetry.api.trace.Span;
 import io.trino.exchange.DirectExchangeInput;
 import io.trino.execution.ExecutionFailureInfo;
 import io.trino.execution.RemoteTask;
@@ -44,8 +46,6 @@
 import io.trino.sql.planner.plan.RemoteSourceNode;
 import io.trino.util.Failures;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.net.URI;
 import java.util.HashSet;
 import java.util.List;
@@ -298,7 +298,8 @@ public synchronized Optional<RemoteTask> scheduleTask(
                 outputBuffers,
                 initialSplits,
                 ImmutableSet.of(),
-                Optional.empty());
+                Optional.empty(),
+                false);
 
         if (optionalTask.isEmpty()) {
             return Optional.empty();
@@ -552,6 +553,12 @@ public int getAttemptId()
         return attempt;
     }
 
+    @Override
+    public Span getStageSpan()
+    {
+        return stage.getStageSpan();
+    }
+
     @Override
     public PlanFragment getFragment()
     {
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/ScaledPipelinedOutputBufferManager.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/ScaledPipelinedOutputBufferManager.java
index 94692bd9d6b0..28493e00ce90 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/ScaledPipelinedOutputBufferManager.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/ScaledPipelinedOutputBufferManager.java
@@ -13,11 +13,10 @@
  */
 package io.trino.execution.scheduler;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.execution.buffer.PipelinedOutputBuffers;
 import io.trino.execution.buffer.PipelinedOutputBuffers.OutputBufferId;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import static io.trino.execution.buffer.PipelinedOutputBuffers.BufferType.ARBITRARY;
 
 public class ScaledPipelinedOutputBufferManager
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/ScaledWriterScheduler.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/ScaledWriterScheduler.java
index da7f22bdcdfa..64d07852f68c 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/ScaledWriterScheduler.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/ScaledWriterScheduler.java
@@ -47,7 +47,7 @@ public class ScaledWriterScheduler
     private final Supplier<Collection<TaskStatus>> writerTasksProvider;
     private final NodeSelector nodeSelector;
     private final ScheduledExecutorService executor;
-    private final long writerMinSizeBytes;
+    private final long writerScalingMinDataProcessed;
     private final Set<InternalNode> scheduledNodes = new HashSet<>();
     private final AtomicBoolean done = new AtomicBoolean();
     private final int maxWriterNodeCount;
@@ -59,7 +59,7 @@ public ScaledWriterScheduler(
             Supplier<Collection<TaskStatus>> writerTasksProvider,
             NodeSelector nodeSelector,
             ScheduledExecutorService executor,
-            DataSize writerMinSize,
+            DataSize writerScalingMinDataProcessed,
             int maxWriterNodeCount)
     {
         this.stage = requireNonNull(stage, "stage is null");
@@ -67,7 +67,7 @@ public ScaledWriterScheduler(
         this.writerTasksProvider = requireNonNull(writerTasksProvider, "writerTasksProvider is null");
         this.nodeSelector = requireNonNull(nodeSelector, "nodeSelector is null");
         this.executor = requireNonNull(executor, "executor is null");
-        this.writerMinSizeBytes = writerMinSize.toBytes();
+        this.writerScalingMinDataProcessed = writerScalingMinDataProcessed.toBytes();
         this.maxWriterNodeCount = maxWriterNodeCount;
     }
 
@@ -120,17 +120,17 @@ private boolean isSourceTasksBufferFull()
     private boolean isWriteThroughputSufficient()
     {
         Collection<TaskStatus> writerTasks = writerTasksProvider.get();
-        long writtenBytes = writerTasks.stream()
-                .map(TaskStatus::getPhysicalWrittenDataSize)
+        long writerInputBytes = writerTasks.stream()
+                .map(TaskStatus::getWriterInputDataSize)
                 .mapToLong(DataSize::toBytes)
                 .sum();
 
-        long minWrittenBytesToScaleUp = writerTasks.stream()
+        long minWriterInputBytesToScaleUp = writerTasks.stream()
                 .map(TaskStatus::getMaxWriterCount)
                 .map(Optional::get)
-                .mapToLong(writerCount -> writerMinSizeBytes * writerCount)
+                .mapToLong(writerCount -> writerScalingMinDataProcessed * writerCount)
                 .sum();
-        return writtenBytes >= minWrittenBytesToScaleUp;
+        return writerInputBytes >= minWriterInputBytesToScaleUp;
     }
 
     private boolean isWeightedBufferFull()
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/SchedulingUtils.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/SchedulingUtils.java
new file mode 100644
index 000000000000..c9726e2aebee
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/SchedulingUtils.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.sql.planner.SubPlan;
+import io.trino.sql.planner.plan.IndexJoinNode;
+import io.trino.sql.planner.plan.JoinNode;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import io.trino.sql.planner.plan.PlanNode;
+import io.trino.sql.planner.plan.PlanVisitor;
+import io.trino.sql.planner.plan.RemoteSourceNode;
+import io.trino.sql.planner.plan.SemiJoinNode;
+import io.trino.sql.planner.plan.SpatialJoinNode;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.collect.MoreCollectors.onlyElement;
+
+public final class SchedulingUtils
+{
+    private SchedulingUtils() {}
+
+    public static boolean canStream(SubPlan plan, SubPlan source)
+    {
+        // can data from source be streamed through plan
+        PlanFragmentId sourceFragmentId = source.getFragment().getId();
+
+        PlanNode root = plan.getFragment().getRoot();
+        RemoteSourceNode sourceNode = plan.getFragment().getRemoteSourceNodes().stream().filter(node -> node.getSourceFragmentIds().contains(sourceFragmentId)).collect(onlyElement());
+        List<PlanNode> pathToSource = findPath(root, sourceNode).orElseThrow(() -> new RuntimeException("Could not find path from %s to %s in %s".formatted(root, sourceNode, plan.getFragment())));
+
+        for (int pos = 0; pos < pathToSource.size() - 1; ++pos) {
+            PlanNode node = pathToSource.get(pos);
+
+            if (node instanceof JoinNode ||
+                    node instanceof SemiJoinNode ||
+                    node instanceof IndexJoinNode ||
+                    node instanceof SpatialJoinNode) {
+                PlanNode leftSource = node.getSources().get(0);
+                PlanNode child = pathToSource.get(pos + 1);
+
+                if (leftSource != child) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    private static Optional<List<PlanNode>> findPath(PlanNode start, PlanNode end)
+    {
+        PlanVisitor<Optional<List<PlanNode>>, Deque<PlanNode>> visitor = new PlanVisitor<>()
+        {
+            @Override
+            protected Optional<List<PlanNode>> visitPlan(PlanNode node, Deque<PlanNode> queue)
+            {
+                queue.add(node);
+                if (node == end) {
+                    return Optional.of(ImmutableList.copyOf(queue));
+                }
+                for (PlanNode source : node.getSources()) {
+                    Optional<List<PlanNode>> result = source.accept(this, queue);
+                    if (result.isPresent()) {
+                        return result;
+                    }
+                }
+                queue.removeLast();
+                return Optional.empty();
+            }
+        };
+
+        return start.accept(visitor, new ArrayDeque<>());
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/SplitSchedulerStats.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/SplitSchedulerStats.java
index 810acf2af4b1..89493ebed0a4 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/SplitSchedulerStats.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/SplitSchedulerStats.java
@@ -13,14 +13,13 @@
  */
 package io.trino.execution.scheduler;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.stats.CounterStat;
 import io.airlift.stats.DistributionStat;
 import io.airlift.stats.TimeStat;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 @ThreadSafe
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/StageExecution.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/StageExecution.java
index 89fc0bc73e2e..d283010b7f65 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/StageExecution.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/StageExecution.java
@@ -14,6 +14,7 @@
 package io.trino.execution.scheduler;
 
 import com.google.common.collect.Multimap;
+import io.opentelemetry.api.trace.Span;
 import io.trino.execution.ExecutionFailureInfo;
 import io.trino.execution.RemoteTask;
 import io.trino.execution.StageId;
@@ -36,6 +37,8 @@ public interface StageExecution
 
     int getAttemptId();
 
+    Span getStageSpan();
+
     PlanFragment getFragment();
 
     boolean isAnyTaskBlocked();
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/StageManager.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/StageManager.java
index 524424ca968d..2bc6391858b2 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/StageManager.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/StageManager.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.graph.Traverser;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.Session;
 import io.trino.execution.BasicStageStats;
 import io.trino.execution.NodeTaskMap;
@@ -65,6 +66,7 @@ static StageManager create(
             Metadata metadata,
             RemoteTaskFactory taskFactory,
             NodeTaskMap nodeTaskMap,
+            Tracer tracer,
             SplitSchedulerStats schedulerStats,
             SubPlan planTree,
             boolean summarizeTaskInfo)
@@ -88,6 +90,7 @@ static StageManager create(
                     summarizeTaskInfo,
                     nodeTaskMap,
                     queryStateMachine.getStateMachineExecutor(),
+                    tracer,
                     schedulerStats);
             StageId stageId = stage.getStageId();
             stages.put(stageId, stage);
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/SubnetBasedTopology.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/SubnetBasedTopology.java
index c9b5dc478131..dd0fa663b1fd 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/SubnetBasedTopology.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/SubnetBasedTopology.java
@@ -17,10 +17,9 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Ordering;
 import com.google.common.net.InetAddresses;
+import com.google.inject.Inject;
 import io.trino.spi.HostAddress;
 
-import javax.inject.Inject;
-
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptorStorage.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptorStorage.java
deleted file mode 100644
index ca8712ccbe17..000000000000
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptorStorage.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.scheduler;
-
-import com.google.common.base.VerifyException;
-import com.google.common.collect.Multimap;
-import com.google.common.math.Stats;
-import io.airlift.log.Logger;
-import io.airlift.units.DataSize;
-import io.trino.execution.QueryManagerConfig;
-import io.trino.execution.StageId;
-import io.trino.metadata.Split;
-import io.trino.spi.QueryId;
-import io.trino.spi.TrinoException;
-import io.trino.sql.planner.plan.PlanNodeId;
-import org.weakref.jmx.Managed;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
-import javax.inject.Inject;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Verify.verify;
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.common.collect.ImmutableSetMultimap.toImmutableSetMultimap;
-import static io.airlift.units.DataSize.succinctBytes;
-import static io.trino.spi.StandardErrorCode.EXCEEDED_TASK_DESCRIPTOR_STORAGE_CAPACITY;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-
-public class TaskDescriptorStorage
-{
-    private static final Logger log = Logger.get(TaskDescriptorStorage.class);
-
-    private final long maxMemoryInBytes;
-
-    @GuardedBy("this")
-    private final Map<QueryId, TaskDescriptors> storages = new HashMap<>();
-    @GuardedBy("this")
-    private long reservedBytes;
-
-    @Inject
-    public TaskDescriptorStorage(QueryManagerConfig config)
-    {
-        this(config.getFaultTolerantExecutionTaskDescriptorStorageMaxMemory());
-    }
-
-    public TaskDescriptorStorage(DataSize maxMemory)
-    {
-        this.maxMemoryInBytes = maxMemory.toBytes();
-    }
-
-    /**
-     * Initializes task descriptor storage for a given <code>queryId</code>.
-     * It is expected to be called before query scheduling begins.
-     */
-    public synchronized void initialize(QueryId queryId)
-    {
-        TaskDescriptors storage = new TaskDescriptors();
-        verify(storages.putIfAbsent(queryId, storage) == null, "storage is already initialized for query: %s", queryId);
-        updateMemoryReservation(storage.getReservedBytes());
-    }
-
-    /**
-     * Stores {@link TaskDescriptor} for a task identified by the <code>stageId</code> and <code>partitionId</code>.
-     * The <code>partitionId</code> is obtained from the {@link TaskDescriptor} by calling {@link TaskDescriptor#getPartitionId()}.
-     * If the query has been terminated the call is ignored.
-     *
-     * @throws IllegalStateException if the storage already has a task descriptor for a given task
-     */
-    public synchronized void put(StageId stageId, TaskDescriptor descriptor)
-    {
-        TaskDescriptors storage = storages.get(stageId.getQueryId());
-        if (storage == null) {
-            // query has been terminated
-            return;
-        }
-        long previousReservedBytes = storage.getReservedBytes();
-        storage.put(stageId, descriptor.getPartitionId(), descriptor);
-        long currentReservedBytes = storage.getReservedBytes();
-        long delta = currentReservedBytes - previousReservedBytes;
-        updateMemoryReservation(delta);
-    }
-
-    /**
-     * Get task descriptor
-     *
-     * @return Non empty {@link TaskDescriptor} for a task identified by the <code>stageId</code> and <code>partitionId</code>.
-     * Returns {@link Optional#empty()} if the query of a given <code>stageId</code> has been finished (e.g.: cancelled by the user or finished early).
-     * @throws java.util.NoSuchElementException if {@link TaskDescriptor} for a given task does not exist
-     */
-    public synchronized Optional<TaskDescriptor> get(StageId stageId, int partitionId)
-    {
-        TaskDescriptors storage = storages.get(stageId.getQueryId());
-        if (storage == null) {
-            // query has been terminated
-            return Optional.empty();
-        }
-        return Optional.of(storage.get(stageId, partitionId));
-    }
-
-    /**
-     * Removes {@link TaskDescriptor} for a task identified by the <code>stageId</code> and <code>partitionId</code>.
-     * If the query has been terminated the call is ignored.
-     *
-     * @throws java.util.NoSuchElementException if {@link TaskDescriptor} for a given task does not exist
-     */
-    public synchronized void remove(StageId stageId, int partitionId)
-    {
-        TaskDescriptors storage = storages.get(stageId.getQueryId());
-        if (storage == null) {
-            // query has been terminated
-            return;
-        }
-        long previousReservedBytes = storage.getReservedBytes();
-        storage.remove(stageId, partitionId);
-        long currentReservedBytes = storage.getReservedBytes();
-        long delta = currentReservedBytes - previousReservedBytes;
-        updateMemoryReservation(delta);
-    }
-
-    /**
-     * Notifies the storage that the query with a given <code>queryId</code> has been finished and the task descriptors can be safely discarded.
-     * <p>
-     * The engine may decided to destroy the storage while the scheduling is still in process (for example if query was cancelled). Under such
-     * circumstances the implementation will ignore future calls to {@link #put(StageId, TaskDescriptor)} and return
-     * {@link Optional#empty()} from {@link #get(StageId, int)}. The scheduler is expected to handle this condition appropriately.
-     */
-    public synchronized void destroy(QueryId queryId)
-    {
-        TaskDescriptors storage = storages.remove(queryId);
-        if (storage != null) {
-            updateMemoryReservation(-storage.getReservedBytes());
-        }
-    }
-
-    private synchronized void updateMemoryReservation(long delta)
-    {
-        reservedBytes += delta;
-        if (delta <= 0) {
-            return;
-        }
-        while (reservedBytes > maxMemoryInBytes) {
-            // drop a query that uses the most storage
-            QueryId killCandidate = storages.entrySet().stream()
-                    .max(Comparator.comparingLong(entry -> entry.getValue().getReservedBytes()))
-                    .map(Map.Entry::getKey)
-                    .orElseThrow(() -> new VerifyException(format("storage is empty but reservedBytes (%s) is still greater than maxMemoryInBytes (%s)", reservedBytes, maxMemoryInBytes)));
-            TaskDescriptors storage = storages.get(killCandidate);
-            long previousReservedBytes = storage.getReservedBytes();
-
-            log.info("Failing query %s; reclaiming %s of %s task descriptor memory from %s queries; extraStorageInfo=%s", killCandidate, storage.getReservedBytes(), succinctBytes(reservedBytes), storages.size(), storage.getDebugInfo());
-
-            storage.fail(new TrinoException(
-                    EXCEEDED_TASK_DESCRIPTOR_STORAGE_CAPACITY,
-                    format("Task descriptor storage capacity has been exceeded: %s > %s", succinctBytes(maxMemoryInBytes), succinctBytes(reservedBytes))));
-            long currentReservedBytes = storage.getReservedBytes();
-            reservedBytes += (currentReservedBytes - previousReservedBytes);
-        }
-    }
-
-    @Managed
-    public synchronized long getReservedBytes()
-    {
-        return reservedBytes;
-    }
-
-    @NotThreadSafe
-    private static class TaskDescriptors
-    {
-        private final Map<TaskDescriptorKey, TaskDescriptor> descriptors = new HashMap<>();
-        private long reservedBytes;
-        private RuntimeException failure;
-
-        public void put(StageId stageId, int partitionId, TaskDescriptor descriptor)
-        {
-            throwIfFailed();
-            TaskDescriptorKey key = new TaskDescriptorKey(stageId, partitionId);
-            checkState(descriptors.putIfAbsent(key, descriptor) == null, "task descriptor is already present for key %s ", key);
-            reservedBytes += descriptor.getRetainedSizeInBytes();
-        }
-
-        public TaskDescriptor get(StageId stageId, int partitionId)
-        {
-            throwIfFailed();
-            TaskDescriptorKey key = new TaskDescriptorKey(stageId, partitionId);
-            TaskDescriptor descriptor = descriptors.get(key);
-            if (descriptor == null) {
-                throw new NoSuchElementException(format("descriptor not found for key %s", key));
-            }
-            return descriptor;
-        }
-
-        public void remove(StageId stageId, int partitionId)
-        {
-            throwIfFailed();
-            TaskDescriptorKey key = new TaskDescriptorKey(stageId, partitionId);
-            TaskDescriptor descriptor = descriptors.remove(key);
-            if (descriptor == null) {
-                throw new NoSuchElementException(format("descriptor not found for key %s", key));
-            }
-            reservedBytes -= descriptor.getRetainedSizeInBytes();
-        }
-
-        public long getReservedBytes()
-        {
-            return reservedBytes;
-        }
-
-        private String getDebugInfo()
-        {
-            Multimap<StageId, TaskDescriptor> descriptorsByStageId = descriptors.entrySet().stream()
-                    .collect(toImmutableSetMultimap(
-                            entry -> entry.getKey().getStageId(),
-                            Map.Entry::getValue));
-
-            Map<StageId, String> debugInfoByStageId = descriptorsByStageId.asMap().entrySet().stream()
-                    .collect(toImmutableMap(
-                            Map.Entry::getKey,
-                            entry -> getDebugInfo(entry.getValue())));
-
-            return String.valueOf(debugInfoByStageId);
-        }
-
-        private String getDebugInfo(Collection<TaskDescriptor> taskDescriptors)
-        {
-            int taskDescriptorsCount = taskDescriptors.size();
-            Stats taskDescriptorsRetainedSizeStats = Stats.of(taskDescriptors.stream().mapToLong(TaskDescriptor::getRetainedSizeInBytes));
-
-            Set<PlanNodeId> planNodeIds = taskDescriptors.stream().flatMap(taskDescriptor -> taskDescriptor.getSplits().keySet().stream()).collect(toImmutableSet());
-            Map<PlanNodeId, String> splitsDebugInfo = new HashMap<>();
-            for (PlanNodeId planNodeId : planNodeIds) {
-                Stats splitCountStats = Stats.of(taskDescriptors.stream().mapToLong(taskDescriptor -> taskDescriptor.getSplits().asMap().get(planNodeId).size()));
-                Stats splitSizeStats = Stats.of(taskDescriptors.stream().flatMap(taskDescriptor -> taskDescriptor.getSplits().get(planNodeId).stream()).mapToLong(Split::getRetainedSizeInBytes));
-                splitsDebugInfo.put(
-                        planNodeId,
-                        "{splitCountMean=%s, splitCountStdDev=%s, splitSizeMean=%s, splitSizeStdDev=%s}".formatted(
-                                splitCountStats.mean(),
-                                splitCountStats.populationStandardDeviation(),
-                                splitSizeStats.mean(),
-                                splitSizeStats.populationStandardDeviation()));
-            }
-
-            return "[taskDescriptorsCount=%s, taskDescriptorsRetainedSizeMean=%s, taskDescriptorsRetainedSizeStdDev=%s, splits=%s]".formatted(
-                    taskDescriptorsCount,
-                    taskDescriptorsRetainedSizeStats.mean(),
-                    taskDescriptorsRetainedSizeStats.populationStandardDeviation(),
-                    splitsDebugInfo);
-        }
-
-        private void fail(RuntimeException failure)
-        {
-            if (this.failure == null) {
-                descriptors.clear();
-                reservedBytes = 0;
-                this.failure = failure;
-            }
-        }
-
-        private void throwIfFailed()
-        {
-            if (failure != null) {
-                throw failure;
-            }
-        }
-    }
-
-    private static class TaskDescriptorKey
-    {
-        private final StageId stageId;
-        private final int partitionId;
-
-        private TaskDescriptorKey(StageId stageId, int partitionId)
-        {
-            this.stageId = requireNonNull(stageId, "stageId is null");
-            this.partitionId = partitionId;
-        }
-
-        public StageId getStageId()
-        {
-            return stageId;
-        }
-
-        public int getPartitionId()
-        {
-            return partitionId;
-        }
-
-        @Override
-        public boolean equals(Object o)
-        {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            TaskDescriptorKey key = (TaskDescriptorKey) o;
-            return partitionId == key.partitionId && Objects.equals(stageId, key.stageId);
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hash(stageId, partitionId);
-        }
-
-        @Override
-        public String toString()
-        {
-            return toStringHelper(this)
-                    .add("stageId", stageId)
-                    .add("partitionId", partitionId)
-                    .toString();
-        }
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelector.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelector.java
index 9a27f8114215..1d897df549bc 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelector.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelector.java
@@ -27,8 +27,7 @@
 import io.trino.spi.HostAddress;
 import io.trino.spi.SplitWeight;
 import io.trino.spi.TrinoException;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelectorConfig.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelectorConfig.java
index 2dd6d6fafb7a..b2a68a7321ae 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelectorConfig.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelectorConfig.java
@@ -16,8 +16,7 @@
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelectorFactory.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelectorFactory.java
index 0e5d0b348c47..af6755d945e7 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelectorFactory.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/TopologyAwareNodeSelectorFactory.java
@@ -19,10 +19,11 @@
 import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSetMultimap;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.stats.CounterStat;
 import io.trino.Session;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 import io.trino.execution.NodeTaskMap;
 import io.trino.metadata.InternalNode;
 import io.trino.metadata.InternalNodeManager;
@@ -30,8 +31,6 @@
 import io.trino.spi.SplitWeight;
 import io.trino.spi.connector.CatalogHandle;
 
-import javax.inject.Inject;
-
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
@@ -44,8 +43,8 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.SystemSessionProperties.getMaxUnacknowledgedSplitsPerTask;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.metadata.NodeState.ACTIVE;
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/UniformNodeSelector.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/UniformNodeSelector.java
index 37ca0098bdeb..359380eb96c6 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/UniformNodeSelector.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/UniformNodeSelector.java
@@ -33,8 +33,7 @@
 import io.trino.spi.HostAddress;
 import io.trino.spi.SplitWeight;
 import io.trino.spi.TrinoException;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/UniformNodeSelectorFactory.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/UniformNodeSelectorFactory.java
index 501fbf7af5f3..661f2e9bb3ad 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/UniformNodeSelectorFactory.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/UniformNodeSelectorFactory.java
@@ -17,10 +17,11 @@
 import com.google.common.base.Suppliers;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableSetMultimap;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.Session;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 import io.trino.execution.NodeTaskMap;
 import io.trino.execution.scheduler.NodeSchedulerConfig.SplitsBalancingPolicy;
 import io.trino.metadata.InternalNode;
@@ -29,8 +30,6 @@
 import io.trino.spi.SplitWeight;
 import io.trino.spi.connector.CatalogHandle;
 
-import javax.inject.Inject;
-
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Optional;
@@ -41,8 +40,8 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.SystemSessionProperties.getMaxUnacknowledgedSplitsPerTask;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.metadata.NodeState.ACTIVE;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/ArbitraryDistributionSplitAssigner.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ArbitraryDistributionSplitAssigner.java
similarity index 88%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/ArbitraryDistributionSplitAssigner.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ArbitraryDistributionSplitAssigner.java
index d34fd273d550..89d70cf94cbe 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/ArbitraryDistributionSplitAssigner.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ArbitraryDistributionSplitAssigner.java
@@ -11,10 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ListMultimap;
 import io.trino.exchange.SpoolingExchangeInput;
@@ -60,6 +61,7 @@ class ArbitraryDistributionSplitAssigner
     private int nextPartitionId;
     private int adaptiveCounter;
     private long targetPartitionSizeInBytes;
+    private long roundedTargetPartitionSizeInBytes;
     private final List<PartitionAssignment> allAssignments = new ArrayList<>();
     private final Map<Optional<HostAddress>, PartitionAssignment> openAssignments = new HashMap<>();
 
@@ -94,6 +96,7 @@ class ArbitraryDistributionSplitAssigner
         this.maxTaskSplitCount = maxTaskSplitCount;
 
         this.targetPartitionSizeInBytes = minTargetPartitionSizeInBytes;
+        this.roundedTargetPartitionSizeInBytes = minTargetPartitionSizeInBytes;
     }
 
     @Override
@@ -128,7 +131,8 @@ private AssignmentResult assignReplicatedSplits(PlanNodeId planNodeId, List<Spli
             assignment.updatePartition(new PartitionUpdate(
                     partitionAssignment.getPartitionId(),
                     planNodeId,
-                    splits,
+                    false,
+                    singleSourcePartition(SINGLE_SOURCE_PARTITION_ID, splits),
                     noMoreSplits));
         }
         if (noMoreSplits) {
@@ -153,14 +157,16 @@ private AssignmentResult assignReplicatedSplits(PlanNodeId planNodeId, List<Spli
                     assignment.updatePartition(new PartitionUpdate(
                             0,
                             replicatedSourceId,
-                            replicatedSplits.get(replicatedSourceId),
+                            false,
+                            singleSourcePartition(SINGLE_SOURCE_PARTITION_ID, replicatedSplits.get(replicatedSourceId)),
                             true));
                 }
                 for (PlanNodeId partitionedSourceId : partitionedSources) {
                     assignment.updatePartition(new PartitionUpdate(
                             0,
                             partitionedSourceId,
-                            ImmutableList.of(),
+                            false,
+                            ImmutableListMultimap.of(),
                             true));
                 }
                 assignment.sealPartition(0);
@@ -173,7 +179,8 @@ private AssignmentResult assignReplicatedSplits(PlanNodeId planNodeId, List<Spli
                             assignment.updatePartition(new PartitionUpdate(
                                     partitionAssignment.getPartitionId(),
                                     partitionedSourceNodeId,
-                                    ImmutableList.of(),
+                                    false,
+                                    singleSourcePartition(0, ImmutableList.of()),
                                     true));
                         }
                         // seal partition
@@ -188,6 +195,13 @@ private AssignmentResult assignReplicatedSplits(PlanNodeId planNodeId, List<Spli
         return assignment.build();
     }
 
+    private ListMultimap<Integer, Split> singleSourcePartition(int sourcePartitionId, List<Split> splits)
+    {
+        ImmutableListMultimap.Builder<Integer, Split> builder = ImmutableListMultimap.builder();
+        builder.putAll(0, splits);
+        return builder.build();
+    }
+
     private AssignmentResult assignPartitionedSplits(PlanNodeId planNodeId, List<Split> splits, boolean noMoreSplits)
     {
         AssignmentResult.Builder assignment = AssignmentResult.builder();
@@ -196,14 +210,15 @@ private AssignmentResult assignPartitionedSplits(PlanNodeId planNodeId, List<Spl
             Optional<HostAddress> hostRequirement = getHostRequirement(split);
             PartitionAssignment partitionAssignment = openAssignments.get(hostRequirement);
             long splitSizeInBytes = getSplitSizeInBytes(split);
-            if (partitionAssignment != null && ((partitionAssignment.getAssignedDataSizeInBytes() + splitSizeInBytes > targetPartitionSizeInBytes)
+            if (partitionAssignment != null && ((partitionAssignment.getAssignedDataSizeInBytes() + splitSizeInBytes > roundedTargetPartitionSizeInBytes)
                     || (partitionAssignment.getAssignedSplitCount() + 1 > maxTaskSplitCount))) {
                 partitionAssignment.setFull(true);
                 for (PlanNodeId partitionedSourceNodeId : partitionedSources) {
                     assignment.updatePartition(new PartitionUpdate(
                             partitionAssignment.getPartitionId(),
                             partitionedSourceNodeId,
-                            ImmutableList.of(),
+                            false,
+                            ImmutableListMultimap.of(),
                             true));
                 }
                 if (completedSources.containsAll(replicatedSources)) {
@@ -216,7 +231,8 @@ private AssignmentResult assignPartitionedSplits(PlanNodeId planNodeId, List<Spl
                 if (adaptiveCounter >= adaptiveGrowthPeriod) {
                     targetPartitionSizeInBytes = (long) min(maxTargetPartitionSizeInBytes, ceil(targetPartitionSizeInBytes * adaptiveGrowthFactor));
                     // round to a multiple of minTargetPartitionSizeInBytes so work will be evenly distributed among drivers of a task
-                    targetPartitionSizeInBytes = (targetPartitionSizeInBytes + minTargetPartitionSizeInBytes - 1) / minTargetPartitionSizeInBytes * minTargetPartitionSizeInBytes;
+                    roundedTargetPartitionSizeInBytes = round(targetPartitionSizeInBytes * 1.0 / minTargetPartitionSizeInBytes) * minTargetPartitionSizeInBytes;
+                    verify(roundedTargetPartitionSizeInBytes > 0, "roundedTargetPartitionSizeInBytes %s not positive", roundedTargetPartitionSizeInBytes);
                     adaptiveCounter = 0;
                 }
             }
@@ -232,14 +248,16 @@ private AssignmentResult assignPartitionedSplits(PlanNodeId planNodeId, List<Spl
                     assignment.updatePartition(new PartitionUpdate(
                             partitionAssignment.getPartitionId(),
                             replicatedSourceId,
-                            replicatedSplits.get(replicatedSourceId),
+                            false,
+                            singleSourcePartition(SINGLE_SOURCE_PARTITION_ID, replicatedSplits.get(replicatedSourceId)),
                             completedSources.contains(replicatedSourceId)));
                 }
             }
             assignment.updatePartition(new PartitionUpdate(
                     partitionAssignment.getPartitionId(),
                     planNodeId,
-                    ImmutableList.of(split),
+                    true,
+                    singleSourcePartition(SINGLE_SOURCE_PARTITION_ID, ImmutableList.of(split)),
                     false));
             partitionAssignment.assignSplit(splitSizeInBytes);
         }
@@ -257,14 +275,16 @@ private AssignmentResult assignPartitionedSplits(PlanNodeId planNodeId, List<Spl
                     assignment.updatePartition(new PartitionUpdate(
                             0,
                             replicatedSourceId,
-                            replicatedSplits.get(replicatedSourceId),
+                            false,
+                            singleSourcePartition(SINGLE_SOURCE_PARTITION_ID, replicatedSplits.get(replicatedSourceId)),
                             true));
                 }
                 for (PlanNodeId partitionedSourceId : partitionedSources) {
                     assignment.updatePartition(new PartitionUpdate(
                             0,
                             partitionedSourceId,
-                            ImmutableList.of(),
+                            false,
+                            ImmutableListMultimap.of(),
                             true));
                 }
 
@@ -277,7 +297,8 @@ private AssignmentResult assignPartitionedSplits(PlanNodeId planNodeId, List<Spl
                         assignment.updatePartition(new PartitionUpdate(
                                 partitionAssignment.getPartitionId(),
                                 partitionedSourceNodeId,
-                                ImmutableList.of(),
+                                false,
+                                ImmutableListMultimap.of(),
                                 true));
                     }
                     // seal partition
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/BinPackingNodeAllocatorService.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/BinPackingNodeAllocatorService.java
new file mode 100644
index 000000000000..c77fab6592cf
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/BinPackingNodeAllocatorService.java
@@ -0,0 +1,682 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.base.Stopwatch;
+import com.google.common.base.Ticker;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.SetMultimap;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
+import io.airlift.log.Logger;
+import io.airlift.units.DataSize;
+import io.trino.Session;
+import io.trino.execution.TaskId;
+import io.trino.execution.scheduler.NodeSchedulerConfig;
+import io.trino.memory.ClusterMemoryManager;
+import io.trino.memory.MemoryInfo;
+import io.trino.memory.MemoryManagerConfig;
+import io.trino.metadata.InternalNode;
+import io.trino.metadata.InternalNodeManager;
+import io.trino.metadata.InternalNodeManager.NodesSnapshot;
+import io.trino.spi.TrinoException;
+import io.trino.spi.memory.MemoryPoolInfo;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import org.assertj.core.util.VisibleForTesting;
+
+import java.time.Duration;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Sets.newConcurrentHashSet;
+import static io.airlift.concurrent.Threads.daemonThreadsNamed;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.EAGER_SPECULATIVE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.SPECULATIVE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.STANDARD;
+import static io.trino.spi.StandardErrorCode.NO_NODES_AVAILABLE;
+import static java.lang.Math.max;
+import static java.lang.Thread.currentThread;
+import static java.util.Comparator.comparing;
+import static java.util.Objects.requireNonNull;
+
+@ThreadSafe
+public class BinPackingNodeAllocatorService
+        implements NodeAllocatorService, NodeAllocator
+{
+    private static final Logger log = Logger.get(BinPackingNodeAllocatorService.class);
+
+    @VisibleForTesting
+    static final int PROCESS_PENDING_ACQUIRES_DELAY_SECONDS = 5;
+
+    private final InternalNodeManager nodeManager;
+    private final Supplier<Map<String, Optional<MemoryInfo>>> workerMemoryInfoSupplier;
+
+    private final ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(2, daemonThreadsNamed("bin-packing-node-allocator"));
+    private final AtomicBoolean started = new AtomicBoolean();
+    private final AtomicBoolean stopped = new AtomicBoolean();
+    private final Semaphore processSemaphore = new Semaphore(0);
+    private final AtomicReference<Map<String, MemoryPoolInfo>> nodePoolMemoryInfos = new AtomicReference<>(ImmutableMap.of());
+    private final boolean scheduleOnCoordinator;
+    private final DataSize taskRuntimeMemoryEstimationOverhead;
+    private final DataSize eagerSpeculativeTasksNodeMemoryOvercommit;
+    private final Ticker ticker;
+
+    private final Deque<PendingAcquire> pendingAcquires = new ConcurrentLinkedDeque<>();
+    private final Set<BinPackingNodeLease> fulfilledAcquires = newConcurrentHashSet();
+    private final Duration allowedNoMatchingNodePeriod;
+
+    @Inject
+    public BinPackingNodeAllocatorService(
+            InternalNodeManager nodeManager,
+            ClusterMemoryManager clusterMemoryManager,
+            NodeSchedulerConfig nodeSchedulerConfig,
+            MemoryManagerConfig memoryManagerConfig)
+    {
+        this(nodeManager,
+                clusterMemoryManager::getWorkerMemoryInfo,
+                nodeSchedulerConfig.isIncludeCoordinator(),
+                Duration.ofMillis(nodeSchedulerConfig.getAllowedNoMatchingNodePeriod().toMillis()),
+                memoryManagerConfig.getFaultTolerantExecutionTaskRuntimeMemoryEstimationOverhead(),
+                memoryManagerConfig.getFaultTolerantExecutionEagerSpeculativeTasksNodeMemoryOvercommit(),
+                Ticker.systemTicker());
+    }
+
+    @VisibleForTesting
+    BinPackingNodeAllocatorService(
+            InternalNodeManager nodeManager,
+            Supplier<Map<String, Optional<MemoryInfo>>> workerMemoryInfoSupplier,
+            boolean scheduleOnCoordinator,
+            Duration allowedNoMatchingNodePeriod,
+            DataSize taskRuntimeMemoryEstimationOverhead,
+            DataSize eagerSpeculativeTasksNodeMemoryOvercommit,
+            Ticker ticker)
+    {
+        this.nodeManager = requireNonNull(nodeManager, "nodeManager is null");
+        this.workerMemoryInfoSupplier = requireNonNull(workerMemoryInfoSupplier, "workerMemoryInfoSupplier is null");
+        this.scheduleOnCoordinator = scheduleOnCoordinator;
+        this.allowedNoMatchingNodePeriod = requireNonNull(allowedNoMatchingNodePeriod, "allowedNoMatchingNodePeriod is null");
+        this.taskRuntimeMemoryEstimationOverhead = requireNonNull(taskRuntimeMemoryEstimationOverhead, "taskRuntimeMemoryEstimationOverhead is null");
+        this.eagerSpeculativeTasksNodeMemoryOvercommit = eagerSpeculativeTasksNodeMemoryOvercommit;
+        this.ticker = requireNonNull(ticker, "ticker is null");
+    }
+
+    @PostConstruct
+    public void start()
+    {
+        if (started.compareAndSet(false, true)) {
+            executor.schedule(() -> {
+                while (!stopped.get()) {
+                    try {
+                        // pending acquires are processed when node is released (semaphore is bumped) and periodically (every couple seconds)
+                        // in case node list in cluster have changed.
+                        processSemaphore.tryAcquire(PROCESS_PENDING_ACQUIRES_DELAY_SECONDS, TimeUnit.SECONDS);
+                        processSemaphore.drainPermits();
+                        processPendingAcquires();
+                    }
+                    catch (InterruptedException e) {
+                        currentThread().interrupt();
+                    }
+                    catch (Exception e) {
+                        // ignore to avoid getting unscheduled
+                        log.warn(e, "Error updating nodes");
+                    }
+                }
+            }, 0, TimeUnit.SECONDS);
+        }
+
+        refreshNodePoolMemoryInfos();
+        executor.scheduleWithFixedDelay(() -> {
+            try {
+                refreshNodePoolMemoryInfos();
+            }
+            catch (Throwable e) {
+                // ignore to avoid getting unscheduled
+                log.error(e, "Unexpected error while refreshing node pool memory infos");
+            }
+        }, 1, 1, TimeUnit.SECONDS);
+    }
+
+    @PreDestroy
+    public void stop()
+    {
+        stopped.set(true);
+        executor.shutdownNow();
+    }
+
+    @VisibleForTesting
+    void refreshNodePoolMemoryInfos()
+    {
+        ImmutableMap.Builder<String, MemoryPoolInfo> newNodePoolMemoryInfos = ImmutableMap.builder();
+
+        Map<String, Optional<MemoryInfo>> workerMemoryInfos = workerMemoryInfoSupplier.get();
+        long maxNodePoolSizeBytes = -1;
+        for (Map.Entry<String, Optional<MemoryInfo>> entry : workerMemoryInfos.entrySet()) {
+            if (entry.getValue().isEmpty()) {
+                continue;
+            }
+            MemoryPoolInfo poolInfo = entry.getValue().get().getPool();
+            newNodePoolMemoryInfos.put(entry.getKey(), poolInfo);
+            maxNodePoolSizeBytes = Math.max(poolInfo.getMaxBytes(), maxNodePoolSizeBytes);
+        }
+        nodePoolMemoryInfos.set(newNodePoolMemoryInfos.buildOrThrow());
+    }
+
+    @VisibleForTesting
+    synchronized void processPendingAcquires()
+    {
+        // Process EAGER_SPECULATIVE first; it increases the chance that tasks which have potential to end query early get scheduled to worker nodes.
+        // Even though EAGER_SPECULATIVE tasks depend on upstream STANDARD tasks this logic will not lead to deadlock.
+        // When processing STANDARD acquires below, we will ignore EAGER_SPECULATIVE (and SPECULATIVE) tasks when assessing if node has enough resources for processing task.
+        processPendingAcquires(EAGER_SPECULATIVE);
+        processPendingAcquires(STANDARD);
+        boolean hasNonSpeculativePendingAcquires = pendingAcquires.stream().anyMatch(pendingAcquire -> !pendingAcquire.isSpeculative());
+        if (!hasNonSpeculativePendingAcquires) {
+            processPendingAcquires(SPECULATIVE);
+        }
+    }
+
+    private void processPendingAcquires(TaskExecutionClass executionClass)
+    {
+        // synchronized only for sake manual triggering in test code. In production code it should only be called by single thread
+        Iterator<PendingAcquire> iterator = pendingAcquires.iterator();
+
+        BinPackingSimulation simulation = new BinPackingSimulation(
+                nodeManager.getActiveNodesSnapshot(),
+                nodePoolMemoryInfos.get(),
+                fulfilledAcquires,
+                scheduleOnCoordinator,
+                taskRuntimeMemoryEstimationOverhead,
+                executionClass == EAGER_SPECULATIVE ? eagerSpeculativeTasksNodeMemoryOvercommit : DataSize.ofBytes(0),
+                executionClass == STANDARD); // if we are processing non-speculative pending acquires we are ignoring speculative acquired ones
+
+        while (iterator.hasNext()) {
+            PendingAcquire pendingAcquire = iterator.next();
+
+            if (pendingAcquire.getFuture().isCancelled()) {
+                // request aborted
+                iterator.remove();
+                continue;
+            }
+
+            if (pendingAcquire.getExecutionClass() != executionClass) {
+                continue;
+            }
+
+            BinPackingSimulation.ReserveResult result = simulation.tryReserve(pendingAcquire);
+            switch (result.getStatus()) {
+                case RESERVED:
+                    InternalNode reservedNode = result.getNode();
+                    fulfilledAcquires.add(pendingAcquire.getLease());
+                    pendingAcquire.getFuture().set(reservedNode);
+                    if (pendingAcquire.getFuture().isCancelled()) {
+                        // completing future was unsuccessful - request was cancelled in the meantime
+                        fulfilledAcquires.remove(pendingAcquire.getLease());
+
+                        // run once again when we are done
+                        wakeupProcessPendingAcquires();
+                    }
+                    iterator.remove();
+                    break;
+                case NONE_MATCHING:
+                    Duration noMatchingNodePeriod = pendingAcquire.markNoMatchingNodeFound();
+
+                    if (noMatchingNodePeriod.compareTo(allowedNoMatchingNodePeriod) <= 0) {
+                        // wait some more time
+                        break;
+                    }
+
+                    pendingAcquire.getFuture().setException(new TrinoException(NO_NODES_AVAILABLE, "No nodes available to run query"));
+                    iterator.remove();
+                    break;
+                case NOT_ENOUGH_RESOURCES_NOW:
+                    pendingAcquire.resetNoMatchingNodeFound();
+                    break; // nothing to be done
+                default:
+                    throw new IllegalArgumentException("unknown status: " + result.getStatus());
+            }
+        }
+    }
+
+    private void wakeupProcessPendingAcquires()
+    {
+        processSemaphore.release();
+    }
+
+    @Override
+    public NodeAllocator getNodeAllocator(Session session)
+    {
+        return this;
+    }
+
+    @Override
+    public NodeLease acquire(NodeRequirements nodeRequirements, DataSize memoryRequirement, TaskExecutionClass executionClass)
+    {
+        BinPackingNodeLease nodeLease = new BinPackingNodeLease(memoryRequirement.toBytes(), executionClass);
+        PendingAcquire pendingAcquire = new PendingAcquire(nodeRequirements, nodeLease, ticker);
+        pendingAcquires.add(pendingAcquire);
+        wakeupProcessPendingAcquires();
+        return nodeLease;
+    }
+
+    @Override
+    public void close()
+    {
+        // nothing to do here. leases should be released by the calling party.
+        // TODO would be great to be able to validate if it actually happened but close() is called from SqlQueryScheduler code
+        //      and that can be done before all leases are yet returned from running (soon to be failed) tasks.
+    }
+
+    private static class PendingAcquire
+    {
+        private final NodeRequirements nodeRequirements;
+        private final BinPackingNodeLease lease;
+        private final Stopwatch noMatchingNodeStopwatch;
+
+        private PendingAcquire(NodeRequirements nodeRequirements, BinPackingNodeLease lease, Ticker ticker)
+        {
+            this.nodeRequirements = requireNonNull(nodeRequirements, "nodeRequirements is null");
+            this.lease = requireNonNull(lease, "lease is null");
+            this.noMatchingNodeStopwatch = Stopwatch.createUnstarted(ticker);
+        }
+
+        public NodeRequirements getNodeRequirements()
+        {
+            return nodeRequirements;
+        }
+
+        public BinPackingNodeLease getLease()
+        {
+            return lease;
+        }
+
+        public SettableFuture<InternalNode> getFuture()
+        {
+            return lease.getNodeSettableFuture();
+        }
+
+        public long getMemoryLease()
+        {
+            return lease.getMemoryLease();
+        }
+
+        public Duration markNoMatchingNodeFound()
+        {
+            if (!noMatchingNodeStopwatch.isRunning()) {
+                noMatchingNodeStopwatch.start();
+            }
+            return noMatchingNodeStopwatch.elapsed();
+        }
+
+        public void resetNoMatchingNodeFound()
+        {
+            noMatchingNodeStopwatch.reset();
+        }
+
+        public boolean isSpeculative()
+        {
+            return lease.isSpeculative();
+        }
+
+        public TaskExecutionClass getExecutionClass()
+        {
+            return lease.getExecutionClass();
+        }
+    }
+
+    private class BinPackingNodeLease
+            implements NodeAllocator.NodeLease
+    {
+        private final SettableFuture<InternalNode> node = SettableFuture.create();
+        private final AtomicBoolean released = new AtomicBoolean();
+        private final AtomicLong memoryLease;
+        private final AtomicReference<TaskId> taskId = new AtomicReference<>();
+        private final AtomicReference<TaskExecutionClass> executionClass;
+
+        private BinPackingNodeLease(long memoryLease, TaskExecutionClass executionClass)
+        {
+            this.memoryLease = new AtomicLong(memoryLease);
+            requireNonNull(executionClass, "executionClass is null");
+            this.executionClass = new AtomicReference<>(executionClass);
+        }
+
+        @Override
+        public ListenableFuture<InternalNode> getNode()
+        {
+            return node;
+        }
+
+        InternalNode getAssignedNode()
+        {
+            try {
+                return Futures.getDone(node);
+            }
+            catch (ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        SettableFuture<InternalNode> getNodeSettableFuture()
+        {
+            return node;
+        }
+
+        @Override
+        public void attachTaskId(TaskId taskId)
+        {
+            if (!this.taskId.compareAndSet(null, taskId)) {
+                throw new IllegalStateException("cannot attach taskId " + taskId + "; already attached to " + this.taskId.get());
+            }
+        }
+
+        @Override
+        public void setExecutionClass(TaskExecutionClass newExecutionClass)
+        {
+            TaskExecutionClass changedFrom = this.executionClass.getAndUpdate(oldExecutionClass -> {
+                checkArgument(oldExecutionClass.canTransitionTo(newExecutionClass), "cannot change execution class from %s to %s", oldExecutionClass, newExecutionClass);
+                return newExecutionClass;
+            });
+
+            if (changedFrom != newExecutionClass) {
+                wakeupProcessPendingAcquires();
+            }
+        }
+
+        public boolean isSpeculative()
+        {
+            return executionClass.get().isSpeculative();
+        }
+
+        public TaskExecutionClass getExecutionClass()
+        {
+            return executionClass.get();
+        }
+
+        public Optional<TaskId> getAttachedTaskId()
+        {
+            return Optional.ofNullable(this.taskId.get());
+        }
+
+        @Override
+        public void setMemoryRequirement(DataSize memoryRequirement)
+        {
+            long newBytes = memoryRequirement.toBytes();
+            long previousBytes = memoryLease.getAndSet(newBytes);
+            if (newBytes < previousBytes) {
+                wakeupProcessPendingAcquires();
+            }
+        }
+
+        public long getMemoryLease()
+        {
+            return memoryLease.get();
+        }
+
+        @Override
+        public void release()
+        {
+            if (released.compareAndSet(false, true)) {
+                node.cancel(true);
+                if (node.isDone() && !node.isCancelled()) {
+                    checkState(fulfilledAcquires.remove(this), "node lease %s not found in fulfilledAcquires %s", this, fulfilledAcquires);
+                    wakeupProcessPendingAcquires();
+                }
+            }
+            else {
+                throw new IllegalStateException("Node " + node + " already released");
+            }
+        }
+    }
+
+    private static class BinPackingSimulation
+    {
+        private final NodesSnapshot nodesSnapshot;
+        private final List<InternalNode> allNodesSorted;
+        private final boolean ignoreAcquiredSpeculative;
+        private final Map<String, Long> nodesRemainingMemory;
+        private final Map<String, Long> nodesRemainingMemoryRuntimeAdjusted;
+        private final Map<String, Long> speculativeMemoryReserved;
+
+        private final Map<String, MemoryPoolInfo> nodeMemoryPoolInfos;
+        private final boolean scheduleOnCoordinator;
+
+        public BinPackingSimulation(
+                NodesSnapshot nodesSnapshot,
+                Map<String, MemoryPoolInfo> nodeMemoryPoolInfos,
+                Set<BinPackingNodeLease> fulfilledAcquires,
+                boolean scheduleOnCoordinator,
+                DataSize taskRuntimeMemoryEstimationOverhead,
+                DataSize nodeMemoryOvercommit,
+                boolean ignoreAcquiredSpeculative)
+        {
+            this.nodesSnapshot = requireNonNull(nodesSnapshot, "nodesSnapshot is null");
+            // use same node ordering for each simulation
+            this.allNodesSorted = nodesSnapshot.getAllNodes().stream()
+                    .sorted(comparing(InternalNode::getNodeIdentifier))
+                    .collect(toImmutableList());
+
+            this.ignoreAcquiredSpeculative = ignoreAcquiredSpeculative;
+
+            requireNonNull(nodeMemoryPoolInfos, "nodeMemoryPoolInfos is null");
+            this.nodeMemoryPoolInfos = ImmutableMap.copyOf(nodeMemoryPoolInfos);
+
+            this.scheduleOnCoordinator = scheduleOnCoordinator;
+
+            Map<String, Map<String, Long>> realtimeTasksMemoryPerNode = new HashMap<>();
+            for (InternalNode node : nodesSnapshot.getAllNodes()) {
+                MemoryPoolInfo memoryPoolInfo = nodeMemoryPoolInfos.get(node.getNodeIdentifier());
+                if (memoryPoolInfo == null) {
+                    realtimeTasksMemoryPerNode.put(node.getNodeIdentifier(), ImmutableMap.of());
+                    continue;
+                }
+                realtimeTasksMemoryPerNode.put(node.getNodeIdentifier(), memoryPoolInfo.getTaskMemoryReservations());
+            }
+
+            Map<String, Long> preReservedMemory = new HashMap<>();
+            speculativeMemoryReserved = new HashMap<>();
+            SetMultimap<String, BinPackingNodeLease> fulfilledAcquiresByNode = HashMultimap.create();
+            for (BinPackingNodeLease fulfilledAcquire : fulfilledAcquires) {
+                InternalNode node = fulfilledAcquire.getAssignedNode();
+                long memoryLease = fulfilledAcquire.getMemoryLease();
+                if (ignoreAcquiredSpeculative && fulfilledAcquire.isSpeculative()) {
+                    speculativeMemoryReserved.merge(node.getNodeIdentifier(), memoryLease, Long::sum);
+                }
+                else {
+                    fulfilledAcquiresByNode.put(node.getNodeIdentifier(), fulfilledAcquire);
+                    preReservedMemory.merge(node.getNodeIdentifier(), memoryLease, Long::sum);
+                }
+            }
+
+            nodesRemainingMemory = new HashMap<>();
+            for (InternalNode node : nodesSnapshot.getAllNodes()) {
+                MemoryPoolInfo memoryPoolInfo = nodeMemoryPoolInfos.get(node.getNodeIdentifier());
+                if (memoryPoolInfo == null) {
+                    nodesRemainingMemory.put(node.getNodeIdentifier(), 0L);
+                    continue;
+                }
+                long nodeReservedMemory = preReservedMemory.getOrDefault(node.getNodeIdentifier(), 0L);
+                nodesRemainingMemory.put(node.getNodeIdentifier(), max(memoryPoolInfo.getMaxBytes() + nodeMemoryOvercommit.toBytes() - nodeReservedMemory, 0L));
+            }
+
+            nodesRemainingMemoryRuntimeAdjusted = new HashMap<>();
+            for (InternalNode node : nodesSnapshot.getAllNodes()) {
+                MemoryPoolInfo memoryPoolInfo = nodeMemoryPoolInfos.get(node.getNodeIdentifier());
+                if (memoryPoolInfo == null) {
+                    nodesRemainingMemoryRuntimeAdjusted.put(node.getNodeIdentifier(), 0L);
+                    continue;
+                }
+
+                Map<String, Long> realtimeNodeMemory = realtimeTasksMemoryPerNode.get(node.getNodeIdentifier());
+                Set<BinPackingNodeLease> nodeFulfilledAcquires = fulfilledAcquiresByNode.get(node.getNodeIdentifier());
+
+                long nodeUsedMemoryRuntimeAdjusted = 0;
+                for (BinPackingNodeLease lease : nodeFulfilledAcquires) {
+                    long realtimeTaskMemory = 0;
+                    if (lease.getAttachedTaskId().isPresent()) {
+                        realtimeTaskMemory = realtimeNodeMemory.getOrDefault(lease.getAttachedTaskId().get().toString(), 0L);
+                        realtimeTaskMemory += taskRuntimeMemoryEstimationOverhead.toBytes();
+                    }
+                    long reservedTaskMemory = lease.getMemoryLease();
+                    nodeUsedMemoryRuntimeAdjusted += max(realtimeTaskMemory, reservedTaskMemory);
+                }
+
+                // if globally reported memory usage of node is greater than computed one lets use that.
+                // it can be greater if there are tasks executed on cluster which do not have task retries enabled.
+                nodeUsedMemoryRuntimeAdjusted = max(nodeUsedMemoryRuntimeAdjusted, memoryPoolInfo.getReservedBytes());
+                nodesRemainingMemoryRuntimeAdjusted.put(node.getNodeIdentifier(), max(memoryPoolInfo.getMaxBytes() + nodeMemoryOvercommit.toBytes() - nodeUsedMemoryRuntimeAdjusted, 0L));
+            }
+        }
+
+        public ReserveResult tryReserve(PendingAcquire acquire)
+        {
+            NodeRequirements requirements = acquire.getNodeRequirements();
+            Optional<Set<InternalNode>> catalogNodes = requirements.getCatalogHandle().map(nodesSnapshot::getConnectorNodes);
+
+            List<InternalNode> candidates = allNodesSorted.stream()
+                    .filter(node -> catalogNodes.isEmpty() || catalogNodes.get().contains(node))
+                    .filter(node -> {
+                        // Allow using coordinator if explicitly requested
+                        if (requirements.getAddresses().contains(node.getHostAndPort())) {
+                            return true;
+                        }
+                        if (requirements.getAddresses().isEmpty()) {
+                            return scheduleOnCoordinator || !node.isCoordinator();
+                        }
+                        return false;
+                    })
+                    .collect(toImmutableList());
+
+            if (candidates.isEmpty()) {
+                return ReserveResult.NONE_MATCHING;
+            }
+
+            Comparator<InternalNode> comparator = comparing(node -> nodesRemainingMemoryRuntimeAdjusted.get(node.getNodeIdentifier()));
+            if (ignoreAcquiredSpeculative) {
+                comparator = resolveTiesWithSpeculativeMemory(comparator);
+            }
+            InternalNode selectedNode = candidates.stream()
+                    .max(comparator)
+                    .orElseThrow();
+
+            // result of acquire.getMemoryLease() can change; store memory as a variable, so we have consistent value through this method.
+            long memoryRequirements = acquire.getMemoryLease();
+
+            if (nodesRemainingMemoryRuntimeAdjusted.get(selectedNode.getNodeIdentifier()) >= memoryRequirements || isNodeEmpty(selectedNode.getNodeIdentifier())) {
+                // there is enough unreserved memory on the node
+                // OR
+                // there is not enough memory available on the node but the node is empty so we cannot to better anyway
+
+                // todo: currant logic does not handle heterogenous clusters best. There is a chance that there is a larger node in the cluster but
+                //       with less memory available right now, hence that one was not selected as a candidate.
+                // mark memory reservation
+                subtractFromRemainingMemory(selectedNode.getNodeIdentifier(), memoryRequirements);
+                return ReserveResult.reserved(selectedNode);
+            }
+
+            // If selected node cannot be used right now, select best one ignoring runtime memory usage and reserve space there
+            // for later use. This is important from algorithm liveliness perspective. If we did not reserve space for a task which
+            // is too big to be scheduled right now, it could be starved by smaller tasks coming later.
+            Comparator<InternalNode> fallbackComparator = comparing(node -> nodesRemainingMemory.get(node.getNodeIdentifier()));
+            if (ignoreAcquiredSpeculative) {
+                fallbackComparator = resolveTiesWithSpeculativeMemory(fallbackComparator);
+            }
+            InternalNode fallbackNode = candidates.stream()
+                    .max(fallbackComparator)
+                    .orElseThrow();
+            subtractFromRemainingMemory(fallbackNode.getNodeIdentifier(), memoryRequirements);
+            return ReserveResult.NOT_ENOUGH_RESOURCES_NOW;
+        }
+
+        private Comparator<InternalNode> resolveTiesWithSpeculativeMemory(Comparator<InternalNode> comparator)
+        {
+            return comparator.thenComparing(node -> -speculativeMemoryReserved.getOrDefault(node.getNodeIdentifier(), 0L));
+        }
+
+        private void subtractFromRemainingMemory(String nodeIdentifier, long memoryLease)
+        {
+            nodesRemainingMemoryRuntimeAdjusted.compute(
+                    nodeIdentifier,
+                    (key, free) -> max(free - memoryLease, 0));
+            nodesRemainingMemory.compute(
+                    nodeIdentifier,
+                    (key, free) -> max(free - memoryLease, 0));
+        }
+
+        private boolean isNodeEmpty(String nodeIdentifier)
+        {
+            return nodeMemoryPoolInfos.containsKey(nodeIdentifier)
+                    && nodesRemainingMemory.get(nodeIdentifier).equals(nodeMemoryPoolInfos.get(nodeIdentifier).getMaxBytes());
+        }
+
+        public enum ReservationStatus
+        {
+            NONE_MATCHING,
+            NOT_ENOUGH_RESOURCES_NOW,
+            RESERVED
+        }
+
+        public static class ReserveResult
+        {
+            public static final ReserveResult NONE_MATCHING = new ReserveResult(ReservationStatus.NONE_MATCHING, Optional.empty());
+            public static final ReserveResult NOT_ENOUGH_RESOURCES_NOW = new ReserveResult(ReservationStatus.NOT_ENOUGH_RESOURCES_NOW, Optional.empty());
+
+            public static ReserveResult reserved(InternalNode node)
+            {
+                return new ReserveResult(ReservationStatus.RESERVED, Optional.of(node));
+            }
+
+            private final ReservationStatus status;
+            private final Optional<InternalNode> node;
+
+            private ReserveResult(ReservationStatus status, Optional<InternalNode> node)
+            {
+                this.status = requireNonNull(status, "status is null");
+                this.node = requireNonNull(node, "node is null");
+                checkArgument(node.isPresent() == (status == ReservationStatus.RESERVED), "node must be set iff status is RESERVED");
+            }
+
+            public ReservationStatus getStatus()
+            {
+                return status;
+            }
+
+            public InternalNode getNode()
+            {
+                return node.orElseThrow(() -> new IllegalStateException("node not set"));
+            }
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ByEagerParentOutputDataSizeEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ByEagerParentOutputDataSizeEstimator.java
new file mode 100644
index 000000000000..5e8bf8b03574
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ByEagerParentOutputDataSizeEstimator.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.primitives.ImmutableLongArray;
+import io.trino.Session;
+import io.trino.execution.StageId;
+import io.trino.execution.scheduler.faulttolerant.EventDrivenFaultTolerantQueryScheduler.StageExecution;
+
+import java.util.Optional;
+import java.util.function.Function;
+
+public class ByEagerParentOutputDataSizeEstimator
+        implements OutputDataSizeEstimator
+{
+    public static class Factory
+            implements OutputDataSizeEstimatorFactory
+    {
+        @Override
+        public OutputDataSizeEstimator create(Session session)
+        {
+            return new ByEagerParentOutputDataSizeEstimator();
+        }
+    }
+
+    @Override
+    public Optional<OutputDataSizeEstimateResult> getEstimatedOutputDataSize(StageExecution stageExecution, Function<StageId, StageExecution> stageExecutionLookup, boolean parentEager)
+    {
+        if (!parentEager) {
+            return Optional.empty();
+        }
+
+        // use empty estimate as fallback for eager parents. It matches current logic of assessing if node should be processed eagerly or not.
+        // Currently, we use eager task exectuion only for stages with small FINAL LIMIT which implies small input from child stages (child stages will
+        // enforce small input via PARTIAL LIMIT)
+        int outputPartitionsCount = stageExecution.getSinkPartitioningScheme().getPartitionCount();
+        ImmutableLongArray.Builder estimateBuilder = ImmutableLongArray.builder(outputPartitionsCount);
+        for (int i = 0; i < outputPartitionsCount; ++i) {
+            estimateBuilder.add(0);
+        }
+        return Optional.of(new OutputDataSizeEstimateResult(estimateBuilder.build(), OutputDataSizeEstimateStatus.ESTIMATED_FOR_EAGER_PARENT));
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/BySmallStageOutputDataSizeEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/BySmallStageOutputDataSizeEstimator.java
new file mode 100644
index 000000000000..8a1a03556b0a
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/BySmallStageOutputDataSizeEstimator.java
@@ -0,0 +1,147 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.primitives.ImmutableLongArray;
+import io.airlift.units.DataSize;
+import io.trino.Session;
+import io.trino.execution.StageId;
+import io.trino.execution.scheduler.faulttolerant.EventDrivenFaultTolerantQueryScheduler.StageExecution;
+import io.trino.spi.QueryId;
+import io.trino.sql.planner.PlanFragment;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import io.trino.sql.planner.plan.RemoteSourceNode;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeMin;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionSmallStageEstimationThreshold;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionSmallStageSourceSizeMultiplier;
+import static io.trino.SystemSessionProperties.isFaultTolerantExecutionSmallStageEstimationEnabled;
+import static io.trino.SystemSessionProperties.isFaultTolerantExecutionSmallStageRequireNoMorePartitions;
+import static java.util.Objects.requireNonNull;
+
+public class BySmallStageOutputDataSizeEstimator
+        implements OutputDataSizeEstimator
+{
+    public static class Factory
+            implements OutputDataSizeEstimatorFactory
+    {
+        @Override
+        public OutputDataSizeEstimator create(Session session)
+        {
+            return new BySmallStageOutputDataSizeEstimator(
+                    session.getQueryId(),
+                    isFaultTolerantExecutionSmallStageEstimationEnabled(session),
+                    getFaultTolerantExecutionSmallStageEstimationThreshold(session),
+                    getFaultTolerantExecutionSmallStageSourceSizeMultiplier(session),
+                    getFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeMin(session),
+                    isFaultTolerantExecutionSmallStageRequireNoMorePartitions(session));
+        }
+    }
+
+    private final QueryId queryId;
+    private final boolean smallStageEstimationEnabled;
+    private final DataSize smallStageEstimationThreshold;
+    private final double smallStageSourceSizeMultiplier;
+    private final DataSize smallSizePartitionSizeEstimate;
+    private final boolean smallStageRequireNoMorePartitions;
+
+    private BySmallStageOutputDataSizeEstimator(
+            QueryId queryId,
+            boolean smallStageEstimationEnabled,
+            DataSize smallStageEstimationThreshold,
+            double smallStageSourceSizeMultiplier,
+            DataSize smallSizePartitionSizeEstimate,
+            boolean smallStageRequireNoMorePartitions)
+    {
+        this.queryId = requireNonNull(queryId, "queryId is null");
+        this.smallStageEstimationEnabled = smallStageEstimationEnabled;
+        this.smallStageEstimationThreshold = requireNonNull(smallStageEstimationThreshold, "smallStageEstimationThreshold is null");
+        this.smallStageSourceSizeMultiplier = smallStageSourceSizeMultiplier;
+        this.smallSizePartitionSizeEstimate = requireNonNull(smallSizePartitionSizeEstimate, "smallSizePartitionSizeEstimate is null");
+        this.smallStageRequireNoMorePartitions = smallStageRequireNoMorePartitions;
+    }
+
+    @Override
+    public Optional<OutputDataSizeEstimateResult> getEstimatedOutputDataSize(StageExecution stageExecution, Function<StageId, StageExecution> stageExecutionLookup, boolean parentEager)
+    {
+        if (!smallStageEstimationEnabled) {
+            return Optional.empty();
+        }
+
+        if (smallStageRequireNoMorePartitions && !stageExecution.isNoMorePartitions()) {
+            return Optional.empty();
+        }
+
+        long[] currentOutputDataSize = stageExecution.currentOutputDataSize();
+        long totaleOutputDataSize = 0;
+        for (long partitionOutputDataSize : currentOutputDataSize) {
+            totaleOutputDataSize += partitionOutputDataSize;
+        }
+        if (totaleOutputDataSize > smallStageEstimationThreshold.toBytes()) {
+            // our output is too big already
+            return Optional.empty();
+        }
+
+        PlanFragment planFragment = stageExecution.getStageInfo().getPlan();
+        boolean hasPartitionedSources = planFragment.getPartitionedSources().size() > 0;
+        List<RemoteSourceNode> remoteSourceNodes = planFragment.getRemoteSourceNodes();
+
+        long partitionedInputSizeEstimate = 0;
+        if (hasPartitionedSources) {
+            if (!stageExecution.isNoMorePartitions()) {
+                // stage is reading directly from table
+                // for leaf stages require all tasks to be enumerated
+                return Optional.empty();
+            }
+            // estimate partitioned input based on number of task partitions
+            partitionedInputSizeEstimate += stageExecution.getPartitionsCount() * smallSizePartitionSizeEstimate.toBytes();
+        }
+
+        long remoteInputSizeEstimate = 0;
+        for (RemoteSourceNode remoteSourceNode : remoteSourceNodes) {
+            for (PlanFragmentId sourceFragmentId : remoteSourceNode.getSourceFragmentIds()) {
+                StageId sourceStageId = StageId.create(queryId, sourceFragmentId);
+
+                StageExecution sourceStage = stageExecutionLookup.apply(sourceStageId);
+                requireNonNull(sourceStage, "sourceStage is null");
+                Optional<OutputDataSizeEstimateResult> sourceStageOutputDataSize = sourceStage.getOutputDataSize(stageExecutionLookup, false);
+
+                if (sourceStageOutputDataSize.isEmpty()) {
+                    // cant estimate size of one of sources; should not happen in practice
+                    return Optional.empty();
+                }
+
+                remoteInputSizeEstimate += sourceStageOutputDataSize.orElseThrow().outputDataSizeEstimate().getTotalSizeInBytes();
+            }
+        }
+
+        long inputSizeEstimate = (long) ((partitionedInputSizeEstimate + remoteInputSizeEstimate) * smallStageSourceSizeMultiplier);
+        if (inputSizeEstimate > smallStageEstimationThreshold.toBytes()) {
+            return Optional.empty();
+        }
+
+        int outputPartitionsCount = stageExecution.getSinkPartitioningScheme().getPartitionCount();
+        ImmutableLongArray.Builder estimateBuilder = ImmutableLongArray.builder(outputPartitionsCount);
+        for (int i = 0; i < outputPartitionsCount; ++i) {
+            // assume uniform distribution
+            // TODO; should we use distribution as in this.outputDataSize if we have some data there already?
+            estimateBuilder.add(inputSizeEstimate / outputPartitionsCount);
+        }
+        return Optional.of(new OutputDataSizeEstimateResult(estimateBuilder.build(), OutputDataSizeEstimateStatus.ESTIMATED_BY_SMALL_INPUT));
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ByTaskProgressOutputDataSizeEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ByTaskProgressOutputDataSizeEstimator.java
new file mode 100644
index 000000000000..4b3e42eb6c40
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ByTaskProgressOutputDataSizeEstimator.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.primitives.ImmutableLongArray;
+import io.trino.Session;
+import io.trino.execution.StageId;
+import io.trino.execution.scheduler.OutputDataSizeEstimate;
+import io.trino.execution.scheduler.faulttolerant.EventDrivenFaultTolerantQueryScheduler.StageExecution;
+
+import java.util.Optional;
+import java.util.function.Function;
+
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionMinSourceStageProgress;
+
+public class ByTaskProgressOutputDataSizeEstimator
+        implements OutputDataSizeEstimator
+{
+    public static class Factory
+            implements OutputDataSizeEstimatorFactory
+    {
+        @Override
+        public OutputDataSizeEstimator create(Session session)
+        {
+            return new ByTaskProgressOutputDataSizeEstimator(getFaultTolerantExecutionMinSourceStageProgress(session));
+        }
+    }
+
+    private final double minSourceStageProgress;
+
+    private ByTaskProgressOutputDataSizeEstimator(double minSourceStageProgress)
+    {
+        this.minSourceStageProgress = minSourceStageProgress;
+    }
+
+    @Override
+    public Optional<OutputDataSizeEstimateResult> getEstimatedOutputDataSize(StageExecution stageExecution, Function<StageId, StageExecution> stageExecutionLookup, boolean parentEager)
+    {
+        if (!stageExecution.isNoMorePartitions()) {
+            return Optional.empty();
+        }
+
+        int allPartitionsCount = stageExecution.getPartitionsCount();
+        int remainingPartitionsCount = stageExecution.getRemainingPartitionsCount();
+
+        if (remainingPartitionsCount == allPartitionsCount) {
+            return Optional.empty();
+        }
+
+        double progress = (double) (allPartitionsCount - remainingPartitionsCount) / allPartitionsCount;
+
+        if (progress < minSourceStageProgress) {
+            return Optional.empty();
+        }
+
+        long[] currentOutputDataSize = stageExecution.currentOutputDataSize();
+
+        ImmutableLongArray.Builder estimateBuilder = ImmutableLongArray.builder(currentOutputDataSize.length);
+
+        for (long partitionSize : currentOutputDataSize) {
+            estimateBuilder.add((long) (partitionSize / progress));
+        }
+        return Optional.of(new OutputDataSizeEstimateResult(new OutputDataSizeEstimate(estimateBuilder.build()), OutputDataSizeEstimateStatus.ESTIMATED_BY_PROGRESS));
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/CompositeOutputDataSizeEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/CompositeOutputDataSizeEstimator.java
new file mode 100644
index 000000000000..021a2cc8cd63
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/CompositeOutputDataSizeEstimator.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.BindingAnnotation;
+import com.google.inject.Inject;
+import io.trino.Session;
+import io.trino.execution.StageId;
+import io.trino.execution.scheduler.faulttolerant.EventDrivenFaultTolerantQueryScheduler.StageExecution;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+public class CompositeOutputDataSizeEstimator
+        implements OutputDataSizeEstimator
+{
+    public static class Factory
+            implements OutputDataSizeEstimatorFactory
+    {
+        private final List<OutputDataSizeEstimatorFactory> delegateFactories;
+
+        @Inject
+        public Factory(@ForCompositeOutputDataSizeEstimator List<OutputDataSizeEstimatorFactory> delegateFactories)
+        {
+            checkArgument(!delegateFactories.isEmpty(), "Got empty list of delegates");
+            this.delegateFactories = ImmutableList.copyOf(delegateFactories);
+        }
+
+        @Override
+        public OutputDataSizeEstimator create(Session session)
+        {
+            List<OutputDataSizeEstimator> estimators = delegateFactories.stream().map(factory -> factory.create(session))
+                    .collect(toImmutableList());
+            return new CompositeOutputDataSizeEstimator(estimators);
+        }
+    }
+
+    @Retention(RUNTIME)
+    @Target({FIELD, PARAMETER, METHOD})
+    @BindingAnnotation
+    public @interface ForCompositeOutputDataSizeEstimator {}
+
+    private final List<OutputDataSizeEstimator> estimators;
+
+    private CompositeOutputDataSizeEstimator(List<OutputDataSizeEstimator> estimators)
+    {
+        this.estimators = ImmutableList.copyOf(estimators);
+    }
+
+    @Override
+    public Optional<OutputDataSizeEstimateResult> getEstimatedOutputDataSize(
+            StageExecution stageExecution,
+            Function<StageId, StageExecution> stageExecutionLookup,
+            boolean parentEager)
+    {
+        for (OutputDataSizeEstimator estimator : estimators) {
+            Optional<OutputDataSizeEstimateResult> result = estimator.getEstimatedOutputDataSize(stageExecution, stageExecutionLookup, parentEager);
+            if (result.isPresent()) {
+                return result;
+            }
+        }
+        return Optional.empty();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenFaultTolerantQueryScheduler.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenFaultTolerantQueryScheduler.java
new file mode 100644
index 000000000000..c6d92ba5b5c5
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenFaultTolerantQueryScheduler.java
@@ -0,0 +1,2898 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Multimaps;
+import com.google.common.collect.SetMultimap;
+import com.google.common.collect.Sets;
+import com.google.common.io.Closer;
+import com.google.common.primitives.ImmutableLongArray;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.errorprone.annotations.CheckReturnValue;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import io.airlift.log.Logger;
+import io.airlift.units.DataSize;
+import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.Session;
+import io.trino.exchange.SpoolingExchangeInput;
+import io.trino.execution.BasicStageStats;
+import io.trino.execution.ExecutionFailureInfo;
+import io.trino.execution.NodeTaskMap;
+import io.trino.execution.QueryState;
+import io.trino.execution.QueryStateMachine;
+import io.trino.execution.RemoteTask;
+import io.trino.execution.RemoteTaskFactory;
+import io.trino.execution.SqlStage;
+import io.trino.execution.StageId;
+import io.trino.execution.StageInfo;
+import io.trino.execution.StageState;
+import io.trino.execution.StateMachine.StateChangeListener;
+import io.trino.execution.TableInfo;
+import io.trino.execution.TaskId;
+import io.trino.execution.TaskState;
+import io.trino.execution.TaskStatus;
+import io.trino.execution.buffer.OutputBufferStatus;
+import io.trino.execution.buffer.SpoolingOutputBuffers;
+import io.trino.execution.buffer.SpoolingOutputStats;
+import io.trino.execution.resourcegroups.IndexedPriorityQueue;
+import io.trino.execution.scheduler.OutputDataSizeEstimate;
+import io.trino.execution.scheduler.QueryScheduler;
+import io.trino.execution.scheduler.SplitSchedulerStats;
+import io.trino.execution.scheduler.TaskExecutionStats;
+import io.trino.execution.scheduler.faulttolerant.NodeAllocator.NodeLease;
+import io.trino.execution.scheduler.faulttolerant.OutputDataSizeEstimator.OutputDataSizeEstimateResult;
+import io.trino.execution.scheduler.faulttolerant.OutputDataSizeEstimator.OutputDataSizeEstimateStatus;
+import io.trino.execution.scheduler.faulttolerant.PartitionMemoryEstimator.MemoryRequirements;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.AssignmentResult;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.Partition;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.PartitionUpdate;
+import io.trino.failuredetector.FailureDetector;
+import io.trino.metadata.InternalNode;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.Split;
+import io.trino.operator.RetryPolicy;
+import io.trino.server.DynamicFilterService;
+import io.trino.spi.ErrorCode;
+import io.trino.spi.TrinoException;
+import io.trino.spi.exchange.Exchange;
+import io.trino.spi.exchange.ExchangeContext;
+import io.trino.spi.exchange.ExchangeId;
+import io.trino.spi.exchange.ExchangeManager;
+import io.trino.spi.exchange.ExchangeSinkHandle;
+import io.trino.spi.exchange.ExchangeSinkInstanceHandle;
+import io.trino.spi.exchange.ExchangeSourceHandle;
+import io.trino.spi.exchange.ExchangeSourceOutputSelector;
+import io.trino.split.RemoteSplit;
+import io.trino.sql.planner.NodePartitioningManager;
+import io.trino.sql.planner.PlanFragment;
+import io.trino.sql.planner.PlanFragmentIdAllocator;
+import io.trino.sql.planner.PlanNodeIdAllocator;
+import io.trino.sql.planner.SubPlan;
+import io.trino.sql.planner.optimizations.PlanNodeSearcher;
+import io.trino.sql.planner.plan.AggregationNode;
+import io.trino.sql.planner.plan.LimitNode;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import io.trino.sql.planner.plan.PlanNode;
+import io.trino.sql.planner.plan.PlanNodeId;
+import io.trino.sql.planner.plan.RemoteSourceNode;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
+import jakarta.annotation.Nullable;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.function.IntConsumer;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.airlift.units.DataSize.succinctBytes;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionMaxPartitionCount;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount;
+import static io.trino.SystemSessionProperties.getMaxTasksWaitingForExecutionPerQuery;
+import static io.trino.SystemSessionProperties.getMaxTasksWaitingForNodePerStage;
+import static io.trino.SystemSessionProperties.getRetryDelayScaleFactor;
+import static io.trino.SystemSessionProperties.getRetryInitialDelay;
+import static io.trino.SystemSessionProperties.getRetryMaxDelay;
+import static io.trino.SystemSessionProperties.getRetryPolicy;
+import static io.trino.SystemSessionProperties.getTaskRetryAttemptsPerTask;
+import static io.trino.SystemSessionProperties.isFaultTolerantExecutionRuntimeAdaptivePartitioningEnabled;
+import static io.trino.SystemSessionProperties.isFaultTolerantExecutionStageEstimationForEagerParentEnabled;
+import static io.trino.execution.BasicStageStats.aggregateBasicStageStats;
+import static io.trino.execution.StageState.ABORTED;
+import static io.trino.execution.StageState.PLANNED;
+import static io.trino.execution.resourcegroups.IndexedPriorityQueue.PriorityOrdering.LOW_TO_HIGH;
+import static io.trino.execution.scheduler.ErrorCodes.isOutOfMemoryError;
+import static io.trino.execution.scheduler.Exchanges.getAllSourceHandles;
+import static io.trino.execution.scheduler.SchedulingUtils.canStream;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.EAGER_SPECULATIVE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.SPECULATIVE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.STANDARD;
+import static io.trino.failuredetector.FailureDetector.State.GONE;
+import static io.trino.operator.ExchangeOperator.REMOTE_CATALOG_HANDLE;
+import static io.trino.operator.RetryPolicy.TASK;
+import static io.trino.spi.ErrorType.EXTERNAL;
+import static io.trino.spi.ErrorType.INTERNAL_ERROR;
+import static io.trino.spi.ErrorType.USER_ERROR;
+import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static io.trino.spi.StandardErrorCode.REMOTE_HOST_GONE;
+import static io.trino.spi.exchange.Exchange.SourceHandlesDeliveryMode.EAGER;
+import static io.trino.sql.planner.RuntimeAdaptivePartitioningRewriter.consumesHashPartitionedInput;
+import static io.trino.sql.planner.RuntimeAdaptivePartitioningRewriter.getMaxPlanFragmentId;
+import static io.trino.sql.planner.RuntimeAdaptivePartitioningRewriter.getMaxPlanId;
+import static io.trino.sql.planner.RuntimeAdaptivePartitioningRewriter.overridePartitionCountRecursively;
+import static io.trino.sql.planner.SystemPartitioningHandle.COORDINATOR_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
+import static io.trino.sql.planner.TopologicalOrderSubPlanVisitor.sortPlanInTopologicalOrder;
+import static io.trino.sql.planner.plan.ExchangeNode.Type.REPLICATE;
+import static io.trino.util.Failures.toFailure;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+import static java.lang.Math.round;
+import static java.lang.Math.toIntExact;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+public class EventDrivenFaultTolerantQueryScheduler
+        implements QueryScheduler
+{
+    private static final Logger log = Logger.get(EventDrivenFaultTolerantQueryScheduler.class);
+
+    private final QueryStateMachine queryStateMachine;
+    private final Metadata metadata;
+    private final RemoteTaskFactory remoteTaskFactory;
+    private final TaskDescriptorStorage taskDescriptorStorage;
+    private final EventDrivenTaskSourceFactory taskSourceFactory;
+    private final boolean summarizeTaskInfo;
+    private final NodeTaskMap nodeTaskMap;
+    private final ExecutorService queryExecutor;
+    private final ScheduledExecutorService scheduledExecutorService;
+    private final Tracer tracer;
+    private final SplitSchedulerStats schedulerStats;
+    private final PartitionMemoryEstimatorFactory memoryEstimatorFactory;
+    private final OutputDataSizeEstimatorFactory outputDataSizeEstimatorFactory;
+    private final NodePartitioningManager nodePartitioningManager;
+    private final ExchangeManager exchangeManager;
+    private final NodeAllocatorService nodeAllocatorService;
+    private final FailureDetector failureDetector;
+    private final DynamicFilterService dynamicFilterService;
+    private final TaskExecutionStats taskExecutionStats;
+    private final SubPlan originalPlan;
+    private final boolean stageEstimationForEagerParentEnabled;
+
+    private final StageRegistry stageRegistry;
+
+    @GuardedBy("this")
+    private boolean started;
+    @GuardedBy("this")
+    private Scheduler scheduler;
+
+    public EventDrivenFaultTolerantQueryScheduler(
+            QueryStateMachine queryStateMachine,
+            Metadata metadata,
+            RemoteTaskFactory remoteTaskFactory,
+            TaskDescriptorStorage taskDescriptorStorage,
+            EventDrivenTaskSourceFactory taskSourceFactory,
+            boolean summarizeTaskInfo,
+            NodeTaskMap nodeTaskMap,
+            ExecutorService queryExecutor,
+            ScheduledExecutorService scheduledExecutorService,
+            Tracer tracer,
+            SplitSchedulerStats schedulerStats,
+            PartitionMemoryEstimatorFactory memoryEstimatorFactory,
+            OutputDataSizeEstimatorFactory outputDataSizeEstimatorFactory,
+            NodePartitioningManager nodePartitioningManager,
+            ExchangeManager exchangeManager,
+            NodeAllocatorService nodeAllocatorService,
+            FailureDetector failureDetector,
+            DynamicFilterService dynamicFilterService,
+            TaskExecutionStats taskExecutionStats,
+            SubPlan originalPlan)
+    {
+        this.queryStateMachine = requireNonNull(queryStateMachine, "queryStateMachine is null");
+        RetryPolicy retryPolicy = getRetryPolicy(queryStateMachine.getSession());
+        verify(retryPolicy == TASK, "unexpected retry policy: %s", retryPolicy);
+        this.metadata = requireNonNull(metadata, "metadata is null");
+        this.remoteTaskFactory = requireNonNull(remoteTaskFactory, "remoteTaskFactory is null");
+        this.taskDescriptorStorage = requireNonNull(taskDescriptorStorage, "taskDescriptorStorage is null");
+        this.taskSourceFactory = requireNonNull(taskSourceFactory, "taskSourceFactory is null");
+        this.summarizeTaskInfo = summarizeTaskInfo;
+        this.nodeTaskMap = requireNonNull(nodeTaskMap, "nodeTaskMap is null");
+        this.queryExecutor = requireNonNull(queryExecutor, "queryExecutor is null");
+        this.scheduledExecutorService = requireNonNull(scheduledExecutorService, "scheduledExecutorService is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
+        this.schedulerStats = requireNonNull(schedulerStats, "schedulerStats is null");
+        this.memoryEstimatorFactory = requireNonNull(memoryEstimatorFactory, "memoryEstimatorFactory is null");
+        this.outputDataSizeEstimatorFactory = requireNonNull(outputDataSizeEstimatorFactory, "outputDataSizeEstimatorFactory is null");
+        this.nodePartitioningManager = requireNonNull(nodePartitioningManager, "partitioningSchemeFactory is null");
+        this.exchangeManager = requireNonNull(exchangeManager, "exchangeManager is null");
+        this.nodeAllocatorService = requireNonNull(nodeAllocatorService, "nodeAllocatorService is null");
+        this.failureDetector = requireNonNull(failureDetector, "failureDetector is null");
+        this.dynamicFilterService = requireNonNull(dynamicFilterService, "dynamicFilterService is null");
+        this.taskExecutionStats = requireNonNull(taskExecutionStats, "taskExecutionStats is null");
+        this.originalPlan = requireNonNull(originalPlan, "originalPlan is null");
+
+        this.stageEstimationForEagerParentEnabled = isFaultTolerantExecutionStageEstimationForEagerParentEnabled(queryStateMachine.getSession());
+
+        stageRegistry = new StageRegistry(queryStateMachine, originalPlan);
+    }
+
+    @Override
+    public synchronized void start()
+    {
+        checkState(!started, "already started");
+        started = true;
+
+        if (queryStateMachine.isDone()) {
+            return;
+        }
+
+        taskDescriptorStorage.initialize(queryStateMachine.getQueryId());
+        queryStateMachine.addStateChangeListener(state -> {
+            if (state.isDone()) {
+                taskDescriptorStorage.destroy(queryStateMachine.getQueryId());
+            }
+        });
+
+        // when query is done or any time a stage completes, attempt to transition query to "final query info ready"
+        queryStateMachine.addStateChangeListener(state -> {
+            if (!state.isDone()) {
+                return;
+            }
+            Scheduler scheduler;
+            synchronized (this) {
+                scheduler = this.scheduler;
+                this.scheduler = null;
+            }
+            if (scheduler != null) {
+                scheduler.abort();
+            }
+            queryStateMachine.updateQueryInfo(Optional.ofNullable(stageRegistry.getStageInfo()));
+        });
+
+        Session session = queryStateMachine.getSession();
+        int maxPartitionCount = getFaultTolerantExecutionMaxPartitionCount(session);
+        FaultTolerantPartitioningSchemeFactory partitioningSchemeFactory = new FaultTolerantPartitioningSchemeFactory(
+                nodePartitioningManager,
+                session,
+                maxPartitionCount);
+        Closer closer = Closer.create();
+        NodeAllocator nodeAllocator = closer.register(nodeAllocatorService.getNodeAllocator(session));
+        try {
+            scheduler = new Scheduler(
+                    queryStateMachine,
+                    metadata,
+                    remoteTaskFactory,
+                    taskDescriptorStorage,
+                    taskSourceFactory,
+                    summarizeTaskInfo,
+                    nodeTaskMap,
+                    queryExecutor,
+                    scheduledExecutorService,
+                    tracer,
+                    schedulerStats,
+                    memoryEstimatorFactory,
+                    outputDataSizeEstimatorFactory.create(session),
+                    partitioningSchemeFactory,
+                    exchangeManager,
+                    getTaskRetryAttemptsPerTask(session) + 1,
+                    getMaxTasksWaitingForNodePerStage(session),
+                    getMaxTasksWaitingForExecutionPerQuery(session),
+                    nodeAllocator,
+                    failureDetector,
+                    stageRegistry,
+                    taskExecutionStats,
+                    dynamicFilterService,
+                    new SchedulingDelayer(
+                            getRetryInitialDelay(session),
+                            getRetryMaxDelay(session),
+                            getRetryDelayScaleFactor(session),
+                            Stopwatch.createUnstarted()),
+                    originalPlan,
+                    maxPartitionCount,
+                    isFaultTolerantExecutionRuntimeAdaptivePartitioningEnabled(session),
+                    getFaultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount(session),
+                    getFaultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize(session),
+                    stageEstimationForEagerParentEnabled);
+            queryExecutor.submit(scheduler::run);
+        }
+        catch (Throwable t) {
+            try {
+                closer.close();
+            }
+            catch (Throwable closerFailure) {
+                if (t != closerFailure) {
+                    t.addSuppressed(closerFailure);
+                }
+            }
+            throw t;
+        }
+    }
+
+    @Override
+    public void cancelStage(StageId stageId)
+    {
+        throw new UnsupportedOperationException("partial cancel is not supported in fault tolerant mode");
+    }
+
+    @Override
+    public void failTask(TaskId taskId, Throwable failureCause)
+    {
+        stageRegistry.failTaskRemotely(taskId, failureCause);
+    }
+
+    @Override
+    public BasicStageStats getBasicStageStats()
+    {
+        return stageRegistry.getBasicStageStats();
+    }
+
+    @Override
+    public StageInfo getStageInfo()
+    {
+        return stageRegistry.getStageInfo();
+    }
+
+    @Override
+    public long getUserMemoryReservation()
+    {
+        return stageRegistry.getUserMemoryReservation();
+    }
+
+    @Override
+    public long getTotalMemoryReservation()
+    {
+        return stageRegistry.getTotalMemoryReservation();
+    }
+
+    @Override
+    public Duration getTotalCpuTime()
+    {
+        return stageRegistry.getTotalCpuTime();
+    }
+
+    @ThreadSafe
+    private static class StageRegistry
+    {
+        private final QueryStateMachine queryStateMachine;
+        private final AtomicReference<SubPlan> plan;
+        private final Map<StageId, SqlStage> stages = new ConcurrentHashMap<>();
+
+        public StageRegistry(QueryStateMachine queryStateMachine, SubPlan plan)
+        {
+            this.queryStateMachine = requireNonNull(queryStateMachine, "queryStateMachine is null");
+            this.plan = new AtomicReference<>(requireNonNull(plan, "plan is null"));
+        }
+
+        public void add(SqlStage stage)
+        {
+            verify(stages.putIfAbsent(stage.getStageId(), stage) == null, "stage %s is already present", stage.getStageId());
+        }
+
+        public void updatePlan(SubPlan plan)
+        {
+            this.plan.set(requireNonNull(plan, "plan is null"));
+        }
+
+        public StageInfo getStageInfo()
+        {
+            Map<PlanFragmentId, StageInfo> stageInfos = stages.values().stream()
+                    .collect(toImmutableMap(stage -> stage.getFragment().getId(), SqlStage::getStageInfo));
+            // make sure that plan is not staler than stageInfos since `getStageInfo` is called asynchronously
+            SubPlan plan = requireNonNull(this.plan.get(), "plan is null");
+            Set<PlanFragmentId> reportedFragments = new HashSet<>();
+            StageInfo stageInfo = getStageInfo(plan, stageInfos, reportedFragments);
+            // TODO Some stages may no longer be present in the plan when adaptive re-planning is implemented
+            // TODO Figure out how to report statistics for such stages
+            verify(reportedFragments.containsAll(stageInfos.keySet()), "some stages are left unreported");
+            return stageInfo;
+        }
+
+        private StageInfo getStageInfo(SubPlan plan, Map<PlanFragmentId, StageInfo> infos, Set<PlanFragmentId> reportedFragments)
+        {
+            PlanFragmentId fragmentId = plan.getFragment().getId();
+            reportedFragments.add(fragmentId);
+            StageInfo info = infos.get(fragmentId);
+            if (info == null) {
+                info = StageInfo.createInitial(
+                        queryStateMachine.getQueryId(),
+                        queryStateMachine.getQueryState().isDone() ? ABORTED : PLANNED,
+                        plan.getFragment());
+            }
+            List<StageInfo> sourceStages = plan.getChildren().stream()
+                    .map(source -> getStageInfo(source, infos, reportedFragments))
+                    .collect(toImmutableList());
+            return info.withSubStages(sourceStages);
+        }
+
+        public BasicStageStats getBasicStageStats()
+        {
+            List<BasicStageStats> stageStats = stages.values().stream()
+                    .map(SqlStage::getBasicStageStats)
+                    .collect(toImmutableList());
+            return aggregateBasicStageStats(stageStats);
+        }
+
+        public long getUserMemoryReservation()
+        {
+            return stages.values().stream()
+                    .mapToLong(SqlStage::getUserMemoryReservation)
+                    .sum();
+        }
+
+        public long getTotalMemoryReservation()
+        {
+            return stages.values().stream()
+                    .mapToLong(SqlStage::getTotalMemoryReservation)
+                    .sum();
+        }
+
+        public Duration getTotalCpuTime()
+        {
+            long millis = stages.values().stream()
+                    .mapToLong(stage -> stage.getTotalCpuTime().toMillis())
+                    .sum();
+            return new Duration(millis, MILLISECONDS);
+        }
+
+        public void failTaskRemotely(TaskId taskId, Throwable failureCause)
+        {
+            SqlStage sqlStage = requireNonNull(stages.get(taskId.getStageId()), () -> "stage not found: %s" + taskId.getStageId());
+            sqlStage.failTaskRemotely(taskId, failureCause);
+        }
+    }
+
+    private static class Scheduler
+            implements EventListener
+    {
+        private static final int EVENT_BUFFER_CAPACITY = 100;
+
+        private final QueryStateMachine queryStateMachine;
+        private final Metadata metadata;
+        private final RemoteTaskFactory remoteTaskFactory;
+        private final TaskDescriptorStorage taskDescriptorStorage;
+        private final EventDrivenTaskSourceFactory taskSourceFactory;
+        private final boolean summarizeTaskInfo;
+        private final NodeTaskMap nodeTaskMap;
+        private final ExecutorService queryExecutor;
+        private final ScheduledExecutorService scheduledExecutorService;
+        private final Tracer tracer;
+        private final SplitSchedulerStats schedulerStats;
+        private final PartitionMemoryEstimatorFactory memoryEstimatorFactory;
+        private final OutputDataSizeEstimator outputDataSizeEstimator;
+        private final FaultTolerantPartitioningSchemeFactory partitioningSchemeFactory;
+        private final ExchangeManager exchangeManager;
+        private final int maxTaskExecutionAttempts;
+        private final int maxTasksWaitingForNode;
+        private final int maxTasksWaitingForExecution;
+        private final NodeAllocator nodeAllocator;
+        private final FailureDetector failureDetector;
+        private final StageRegistry stageRegistry;
+        private final TaskExecutionStats taskExecutionStats;
+        private final DynamicFilterService dynamicFilterService;
+        private final int maxPartitionCount;
+        private final boolean runtimeAdaptivePartitioningEnabled;
+        private final int runtimeAdaptivePartitioningPartitionCount;
+        private final long runtimeAdaptivePartitioningMaxTaskSizeInBytes;
+        private final boolean stageEstimationForEagerParentEnabled;
+
+        private final BlockingQueue<Event> eventQueue = new LinkedBlockingQueue<>();
+        private final List<Event> eventBuffer = new ArrayList<>(EVENT_BUFFER_CAPACITY);
+
+        private boolean started;
+        private boolean runtimeAdaptivePartitioningApplied;
+
+        private SubPlan plan;
+        private List<SubPlan> planInTopologicalOrder;
+        private final Map<StageId, StageExecution> stageExecutions = new HashMap<>();
+        private final Map<SubPlan, IsReadyForExecutionResult> isReadyForExecutionCache = new HashMap<>();
+        private final SetMultimap<StageId, StageId> stageConsumers = HashMultimap.create();
+
+        private final SchedulingQueue schedulingQueue = new SchedulingQueue();
+        private int nextSchedulingPriority;
+
+        private final Map<ScheduledTask, PreSchedulingTaskContext> preSchedulingTaskContexts = new HashMap<>();
+
+        private final SchedulingDelayer schedulingDelayer;
+
+        private boolean queryOutputSet;
+
+        public Scheduler(
+                QueryStateMachine queryStateMachine,
+                Metadata metadata,
+                RemoteTaskFactory remoteTaskFactory,
+                TaskDescriptorStorage taskDescriptorStorage,
+                EventDrivenTaskSourceFactory taskSourceFactory,
+                boolean summarizeTaskInfo,
+                NodeTaskMap nodeTaskMap,
+                ExecutorService queryExecutor,
+                ScheduledExecutorService scheduledExecutorService,
+                Tracer tracer,
+                SplitSchedulerStats schedulerStats,
+                PartitionMemoryEstimatorFactory memoryEstimatorFactory,
+                OutputDataSizeEstimator outputDataSizeEstimator,
+                FaultTolerantPartitioningSchemeFactory partitioningSchemeFactory,
+                ExchangeManager exchangeManager,
+                int maxTaskExecutionAttempts,
+                int maxTasksWaitingForNode,
+                int maxTasksWaitingForExecution,
+                NodeAllocator nodeAllocator,
+                FailureDetector failureDetector,
+                StageRegistry stageRegistry,
+                TaskExecutionStats taskExecutionStats,
+                DynamicFilterService dynamicFilterService,
+                SchedulingDelayer schedulingDelayer,
+                SubPlan plan,
+                int maxPartitionCount,
+                boolean runtimeAdaptivePartitioningEnabled,
+                int runtimeAdaptivePartitioningPartitionCount,
+                DataSize runtimeAdaptivePartitioningMaxTaskSize,
+                boolean stageEstimationForEagerParentEnabled)
+        {
+            this.queryStateMachine = requireNonNull(queryStateMachine, "queryStateMachine is null");
+            this.metadata = requireNonNull(metadata, "metadata is null");
+            this.remoteTaskFactory = requireNonNull(remoteTaskFactory, "remoteTaskFactory is null");
+            this.taskDescriptorStorage = requireNonNull(taskDescriptorStorage, "taskDescriptorStorage is null");
+            this.taskSourceFactory = requireNonNull(taskSourceFactory, "taskSourceFactory is null");
+            this.summarizeTaskInfo = summarizeTaskInfo;
+            this.nodeTaskMap = requireNonNull(nodeTaskMap, "nodeTaskMap is null");
+            this.queryExecutor = requireNonNull(queryExecutor, "queryExecutor is null");
+            this.scheduledExecutorService = requireNonNull(scheduledExecutorService, "scheduledExecutorService is null");
+            this.tracer = requireNonNull(tracer, "tracer is null");
+            this.schedulerStats = requireNonNull(schedulerStats, "schedulerStats is null");
+            this.memoryEstimatorFactory = requireNonNull(memoryEstimatorFactory, "memoryEstimatorFactory is null");
+            this.outputDataSizeEstimator = requireNonNull(outputDataSizeEstimator, "outputDataSizeEstimator is null");
+            this.partitioningSchemeFactory = requireNonNull(partitioningSchemeFactory, "partitioningSchemeFactory is null");
+            this.exchangeManager = requireNonNull(exchangeManager, "exchangeManager is null");
+            checkArgument(maxTaskExecutionAttempts > 0, "maxTaskExecutionAttempts must be greater than zero: %s", maxTaskExecutionAttempts);
+            this.maxTaskExecutionAttempts = maxTaskExecutionAttempts;
+            this.maxTasksWaitingForNode = maxTasksWaitingForNode;
+            this.maxTasksWaitingForExecution = maxTasksWaitingForExecution;
+            this.nodeAllocator = requireNonNull(nodeAllocator, "nodeAllocator is null");
+            this.failureDetector = requireNonNull(failureDetector, "failureDetector is null");
+            this.stageRegistry = requireNonNull(stageRegistry, "stageRegistry is null");
+            this.taskExecutionStats = requireNonNull(taskExecutionStats, "taskExecutionStats is null");
+            this.dynamicFilterService = requireNonNull(dynamicFilterService, "dynamicFilterService is null");
+            this.schedulingDelayer = requireNonNull(schedulingDelayer, "schedulingDelayer is null");
+            this.plan = requireNonNull(plan, "plan is null");
+            this.maxPartitionCount = maxPartitionCount;
+            this.runtimeAdaptivePartitioningEnabled = runtimeAdaptivePartitioningEnabled;
+            this.runtimeAdaptivePartitioningPartitionCount = runtimeAdaptivePartitioningPartitionCount;
+            this.runtimeAdaptivePartitioningMaxTaskSizeInBytes = requireNonNull(runtimeAdaptivePartitioningMaxTaskSize, "runtimeAdaptivePartitioningMaxTaskSize is null").toBytes();
+            this.stageEstimationForEagerParentEnabled = stageEstimationForEagerParentEnabled;
+
+            planInTopologicalOrder = sortPlanInTopologicalOrder(plan);
+        }
+
+        public void run()
+        {
+            checkState(!started, "already started");
+            started = true;
+
+            queryStateMachine.addStateChangeListener(state -> {
+                if (state.isDone()) {
+                    eventQueue.add(Event.WAKE_UP);
+                }
+            });
+
+            Optional<Throwable> failure = Optional.empty();
+            try {
+                if (schedule()) {
+                    while (processEvents()) {
+                        if (schedulingDelayer.getRemainingDelayInMillis() > 0) {
+                            continue;
+                        }
+                        if (!schedule()) {
+                            break;
+                        }
+                    }
+                }
+            }
+            catch (Throwable t) {
+                failure = Optional.of(t);
+            }
+
+            for (StageExecution execution : stageExecutions.values()) {
+                failure = closeAndAddSuppressed(failure, execution::abort);
+            }
+            for (PreSchedulingTaskContext context : preSchedulingTaskContexts.values()) {
+                failure = closeAndAddSuppressed(failure, context.getNodeLease()::release);
+            }
+            preSchedulingTaskContexts.clear();
+            failure = closeAndAddSuppressed(failure, nodeAllocator);
+
+            failure.ifPresent(queryStateMachine::transitionToFailed);
+        }
+
+        private Optional<Throwable> closeAndAddSuppressed(Optional<Throwable> existingFailure, Closeable closeable)
+        {
+            try {
+                closeable.close();
+            }
+            catch (Throwable t) {
+                if (existingFailure.isEmpty()) {
+                    return Optional.of(t);
+                }
+                if (existingFailure.get() != t) {
+                    existingFailure.get().addSuppressed(t);
+                }
+            }
+            return existingFailure;
+        }
+
+        private boolean processEvents()
+        {
+            try {
+                Event event = eventQueue.poll(1, MINUTES);
+                if (event == null) {
+                    return true;
+                }
+                eventBuffer.add(event);
+            }
+            catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new RuntimeException(e);
+            }
+
+            while (true) {
+                // poll multiple events from the queue in one shot to improve efficiency
+                eventQueue.drainTo(eventBuffer, EVENT_BUFFER_CAPACITY - eventBuffer.size());
+                if (eventBuffer.isEmpty()) {
+                    return true;
+                }
+                for (Event e : eventBuffer) {
+                    if (e == Event.ABORT) {
+                        return false;
+                    }
+                    if (e == Event.WAKE_UP) {
+                        continue;
+                    }
+                    e.accept(this);
+                }
+                eventBuffer.clear();
+            }
+        }
+
+        private boolean schedule()
+        {
+            if (checkComplete()) {
+                return false;
+            }
+            optimize();
+            updateStageExecutions();
+            scheduleTasks();
+            processNodeAcquisitions();
+            updateMemoryRequirements();
+            loadMoreTaskDescriptorsIfNecessary();
+            return true;
+        }
+
+        private boolean checkComplete()
+        {
+            if (queryStateMachine.isDone()) {
+                return true;
+            }
+
+            for (StageExecution execution : stageExecutions.values()) {
+                if (execution.getState() == StageState.FAILED) {
+                    StageInfo stageInfo = execution.getStageInfo();
+                    ExecutionFailureInfo failureCause = stageInfo.getFailureCause();
+                    RuntimeException failure = failureCause == null ?
+                            new TrinoException(GENERIC_INTERNAL_ERROR, "stage failed due to unknown error: %s".formatted(execution.getStageId())) :
+                            failureCause.toException();
+                    queryStateMachine.transitionToFailed(failure);
+                    return true;
+                }
+            }
+            setQueryOutputIfReady();
+            return false;
+        }
+
+        private void setQueryOutputIfReady()
+        {
+            StageId rootStageId = getStageId(plan.getFragment().getId());
+            StageExecution rootStageExecution = stageExecutions.get(rootStageId);
+            if (!queryOutputSet && rootStageExecution != null && rootStageExecution.getState() == StageState.FINISHED) {
+                ListenableFuture<List<ExchangeSourceHandle>> sourceHandles = getAllSourceHandles(rootStageExecution.getExchange().getSourceHandles());
+                Futures.addCallback(sourceHandles, new FutureCallback<>()
+                {
+                    @Override
+                    public void onSuccess(List<ExchangeSourceHandle> handles)
+                    {
+                        try {
+                            queryStateMachine.updateInputsForQueryResults(
+                                    ImmutableList.of(new SpoolingExchangeInput(handles, Optional.of(rootStageExecution.getSinkOutputSelector()))),
+                                    true);
+                            queryStateMachine.transitionToFinishing();
+                        }
+                        catch (Throwable t) {
+                            onFailure(t);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Throwable t)
+                    {
+                        queryStateMachine.transitionToFailed(t);
+                    }
+                }, queryExecutor);
+                queryOutputSet = true;
+            }
+        }
+
+        private void optimize()
+        {
+            SubPlan oldPlan = plan;
+            plan = optimizePlan(plan);
+            if (plan != oldPlan) {
+                planInTopologicalOrder = sortPlanInTopologicalOrder(plan);
+                stageRegistry.updatePlan(plan);
+            }
+        }
+
+        private SubPlan optimizePlan(SubPlan plan)
+        {
+            // Re-optimize plan here based on available runtime statistics.
+            // Fragments changed due to re-optimization as well as their downstream stages are expected to be assigned new fragment ids.
+            plan = updateStagesPartitioning(plan);
+            return plan;
+        }
+
+        private SubPlan updateStagesPartitioning(SubPlan plan)
+        {
+            if (!runtimeAdaptivePartitioningEnabled || runtimeAdaptivePartitioningApplied) {
+                return plan;
+            }
+
+            for (SubPlan subPlan : planInTopologicalOrder) {
+                PlanFragment fragment = subPlan.getFragment();
+                if (!consumesHashPartitionedInput(fragment)) {
+                    // no input hash partitioning present
+                    continue;
+                }
+
+                StageId stageId = getStageId(fragment.getId());
+                if (stageExecutions.containsKey(stageId)) {
+                    // already started
+                    continue;
+                }
+
+                IsReadyForExecutionResult isReadyForExecutionResult = isReadyForExecution(subPlan);
+                // Caching is not only needed to avoid duplicate calls, but also to avoid the case that a stage that
+                // is not ready now but becomes ready when updateStageExecutions.
+                // We want to avoid starting an execution without considering changing the number of partitions.
+                // TODO: think about how to eliminate the cache
+                isReadyForExecutionCache.put(subPlan, isReadyForExecutionResult);
+                if (!isReadyForExecutionResult.isReadyForExecution()) {
+                    // not ready for execution
+                    continue;
+                }
+
+                // calculate (estimated) input data size to determine if we want to change number of partitions at runtime
+                List<Long> partitionedInputBytes = fragment.getRemoteSourceNodes().stream()
+                        .filter(remoteSourceNode -> remoteSourceNode.getExchangeType() != REPLICATE)
+                        .map(remoteSourceNode -> remoteSourceNode.getSourceFragmentIds().stream()
+                                .mapToLong(sourceFragmentId -> {
+                                    StageId sourceStageId = getStageId(sourceFragmentId);
+                                    OutputDataSizeEstimate outputDataSizeEstimate = isReadyForExecutionResult.getSourceOutputSizeEstimates().get(sourceStageId);
+                                    verify(outputDataSizeEstimate != null, "outputDataSizeEstimate not found for source stage %s", sourceStageId);
+                                    return outputDataSizeEstimate.getTotalSizeInBytes();
+                                })
+                                .sum())
+                        .collect(toImmutableList());
+                // Currently the memory estimation is simplified:
+                // if it's an aggregation, then we use the total input bytes as the memory consumption
+                // if it involves multiple joins, conservatively we assume the smallest remote source will be streamed through
+                // and use the sum of input bytes of other remote sources as the memory consumption
+                // TODO: more accurate memory estimation based on context (https://github.com/trinodb/trino/issues/18698)
+                long estimatedMemoryConsumptionInBytes = (partitionedInputBytes.size() == 1) ? partitionedInputBytes.get(0) :
+                        partitionedInputBytes.stream().mapToLong(Long::longValue).sum() - Collections.min(partitionedInputBytes);
+
+                int partitionCount = fragment.getPartitionCount().orElse(maxPartitionCount);
+                if (estimatedMemoryConsumptionInBytes > runtimeAdaptivePartitioningMaxTaskSizeInBytes * partitionCount) {
+                    log.info("Stage %s has an estimated memory consumption of %s, changing partition count from %s to %s",
+                            stageId, succinctBytes(estimatedMemoryConsumptionInBytes), partitionCount, runtimeAdaptivePartitioningPartitionCount);
+                    runtimeAdaptivePartitioningApplied = true;
+                    PlanFragmentIdAllocator planFragmentIdAllocator = new PlanFragmentIdAllocator(getMaxPlanFragmentId(planInTopologicalOrder) + 1);
+                    PlanNodeIdAllocator planNodeIdAllocator = new PlanNodeIdAllocator(getMaxPlanId(planInTopologicalOrder) + 1);
+                    return overridePartitionCountRecursively(
+                            plan,
+                            partitionCount,
+                            runtimeAdaptivePartitioningPartitionCount,
+                            planFragmentIdAllocator,
+                            planNodeIdAllocator,
+                            planInTopologicalOrder.stream()
+                                    .map(SubPlan::getFragment)
+                                    .map(PlanFragment::getId)
+                                    .filter(planFragmentId -> stageExecutions.containsKey(getStageId(planFragmentId)))
+                                    .collect(toImmutableSet()));
+                }
+            }
+
+            return plan;
+        }
+
+        private void updateStageExecutions()
+        {
+            Set<StageId> currentPlanStages = new HashSet<>();
+            PlanFragmentId rootFragmentId = plan.getFragment().getId();
+            for (SubPlan subPlan : planInTopologicalOrder) {
+                PlanFragmentId fragmentId = subPlan.getFragment().getId();
+                StageId stageId = getStageId(fragmentId);
+                currentPlanStages.add(stageId);
+                StageExecution stageExecution = stageExecutions.get(stageId);
+                if (stageExecution == null) {
+                    IsReadyForExecutionResult result = isReadyForExecutionCache.computeIfAbsent(subPlan, ignored -> isReadyForExecution(subPlan));
+                    if (result.isReadyForExecution()) {
+                        createStageExecution(subPlan, fragmentId.equals(rootFragmentId), result.getSourceOutputSizeEstimates(), nextSchedulingPriority++, result.isEager());
+                    }
+                }
+                if (stageExecution != null && stageExecution.getState().equals(StageState.FINISHED) && !stageExecution.isExchangeClosed()) {
+                    // we are ready to close its source exchanges
+                    closeSourceExchanges(subPlan);
+                }
+            }
+            stageExecutions.forEach((stageId, stageExecution) -> {
+                if (!currentPlanStages.contains(stageId)) {
+                    // stage got re-written during re-optimization
+                    stageExecution.abort();
+                }
+            });
+            isReadyForExecutionCache.clear();
+        }
+
+        private static class IsReadyForExecutionResult
+        {
+            private final boolean readyForExecution;
+            private final Optional<Map<StageId, OutputDataSizeEstimate>> sourceOutputSizeEstimates;
+            private final boolean eager;
+
+            @CheckReturnValue
+            public static IsReadyForExecutionResult ready(Map<StageId, OutputDataSizeEstimate> sourceOutputSizeEstimates, boolean eager)
+            {
+                return new IsReadyForExecutionResult(true, Optional.of(sourceOutputSizeEstimates), eager);
+            }
+
+            @CheckReturnValue
+            public static IsReadyForExecutionResult notReady()
+            {
+                return new IsReadyForExecutionResult(false, Optional.empty(), false);
+            }
+
+            private IsReadyForExecutionResult(boolean readyForExecution, Optional<Map<StageId, OutputDataSizeEstimate>> sourceOutputSizeEstimates, boolean eager)
+            {
+                requireNonNull(sourceOutputSizeEstimates, "sourceOutputSizeEstimates is null");
+                if (readyForExecution) {
+                    checkArgument(sourceOutputSizeEstimates.isPresent(), "expected sourceOutputSizeEstimates to be set");
+                }
+                if (!readyForExecution) {
+                    checkArgument(sourceOutputSizeEstimates.isEmpty(), "expected sourceOutputSizeEstimates to be not set");
+                }
+                this.readyForExecution = readyForExecution;
+                this.sourceOutputSizeEstimates = sourceOutputSizeEstimates.map(ImmutableMap::copyOf);
+                this.eager = eager;
+            }
+
+            public boolean isReadyForExecution()
+            {
+                return readyForExecution;
+            }
+
+            public Map<StageId, OutputDataSizeEstimate> getSourceOutputSizeEstimates()
+            {
+                return sourceOutputSizeEstimates.orElseThrow();
+            }
+
+            public boolean isEager()
+            {
+                return eager;
+            }
+        }
+
+        private IsReadyForExecutionResult isReadyForExecution(SubPlan subPlan)
+        {
+            boolean standardTasksInQueue = schedulingQueue.getTaskCount(STANDARD) > 0;
+            boolean standardTasksWaitingForNode = preSchedulingTaskContexts.values().stream()
+                    .anyMatch(task -> task.getExecutionClass() == STANDARD && !task.getNodeLease().getNode().isDone());
+
+            boolean eager = stageEstimationForEagerParentEnabled && shouldScheduleEagerly(subPlan);
+            boolean speculative = false;
+            int finishedSourcesCount = 0;
+            int estimatedByProgressSourcesCount = 0;
+            int estimatedBySmallInputSourcesCount = 0;
+            int estimatedForEagerParent = 0;
+
+            ImmutableMap.Builder<StageId, OutputDataSizeEstimate> sourceOutputSizeEstimates = ImmutableMap.builder();
+
+            boolean someSourcesMadeProgress = false;
+
+            for (SubPlan source : subPlan.getChildren()) {
+                StageExecution sourceStageExecution = stageExecutions.get(getStageId(source.getFragment().getId()));
+                if (sourceStageExecution == null) {
+                    // source stage did not yet start
+                    return IsReadyForExecutionResult.notReady();
+                }
+
+                if (sourceStageExecution.getState() != StageState.FINISHED) {
+                    if (!exchangeManager.supportsConcurrentReadAndWrite()) {
+                        // speculative execution not supported by Exchange implementation
+                        return IsReadyForExecutionResult.notReady();
+                    }
+                    if (runtimeAdaptivePartitioningApplied) {
+                        // Do not start a speculative stage after partition count has been changed at runtime, as when we estimate
+                        // by progress, repartition tasks will produce very uneven output for different output partitions, which
+                        // will result in very bad task bin-packing results; also the fact that runtime adaptive partitioning
+                        // happened already suggests that there is plenty work ahead.
+                        return IsReadyForExecutionResult.notReady();
+                    }
+
+                    if ((standardTasksInQueue || standardTasksWaitingForNode) && !eager) {
+                        // Do not start a non-eager speculative stage if there is non-speculative work still to be done.
+                        return IsReadyForExecutionResult.notReady();
+                    }
+
+                    speculative = true;
+                }
+                else {
+                    // source stage finished; no more checks needed
+                    OutputDataSizeEstimateResult result = sourceStageExecution.getOutputDataSize(stageExecutions::get, eager).orElseThrow();
+                    verify(result.status() == OutputDataSizeEstimateStatus.FINISHED, "expected FINISHED status but got %s", result.status());
+                    finishedSourcesCount++;
+                    sourceOutputSizeEstimates.put(sourceStageExecution.getStageId(), result.outputDataSizeEstimate());
+                    someSourcesMadeProgress = true;
+                    continue;
+                }
+
+                if (!canOutputDataEarly(source)) {
+                    // no point in starting stage if source stage needs to complete before we can get any input data to make progress
+                    return IsReadyForExecutionResult.notReady();
+                }
+
+                if (!canStream(subPlan, source)) {
+                    // only allow speculative execution of stage if all source stages for which we cannot stream data are finished
+                    return IsReadyForExecutionResult.notReady();
+                }
+
+                Optional<OutputDataSizeEstimateResult> result = sourceStageExecution.getOutputDataSize(stageExecutions::get, eager);
+                if (result.isEmpty()) {
+                    return IsReadyForExecutionResult.notReady();
+                }
+
+                switch (result.orElseThrow().status()) {
+                    case ESTIMATED_BY_PROGRESS -> estimatedByProgressSourcesCount++;
+                    case ESTIMATED_BY_SMALL_INPUT -> estimatedBySmallInputSourcesCount++;
+                    case ESTIMATED_FOR_EAGER_PARENT -> estimatedForEagerParent++;
+                    default -> throw new IllegalStateException(format("unexpected status %s", result.orElseThrow().status())); // FINISHED handled above
+                }
+
+                sourceOutputSizeEstimates.put(sourceStageExecution.getStageId(), result.orElseThrow().outputDataSizeEstimate());
+                someSourcesMadeProgress = someSourcesMadeProgress || sourceStageExecution.isSomeProgressMade();
+            }
+
+            if (!subPlan.getChildren().isEmpty() && !someSourcesMadeProgress && !eager) {
+                return IsReadyForExecutionResult.notReady();
+            }
+
+            if (speculative) {
+                log.debug("scheduling speculative %s/%s; sources: finished=%s; estimatedByProgress=%s; estimatedSmall=%s; estimatedForEagerParent=%s",
+                        queryStateMachine.getQueryId(),
+                        subPlan.getFragment().getId(),
+                        finishedSourcesCount,
+                        estimatedByProgressSourcesCount,
+                        estimatedBySmallInputSourcesCount,
+                        estimatedForEagerParent);
+            }
+            return IsReadyForExecutionResult.ready(sourceOutputSizeEstimates.buildOrThrow(), eager);
+        }
+
+        private boolean shouldScheduleEagerly(SubPlan subPlan)
+        {
+            return hasSmallFinalLimitNode(subPlan);
+        }
+
+        private static boolean hasSmallFinalLimitNode(SubPlan subPlan)
+        {
+            if (!subPlan.getFragment().getPartitioning().isSingleNode()) {
+                // Final LIMIT should always have SINGLE distribution
+                return false;
+            }
+            return PlanNodeSearcher.searchFrom(subPlan.getFragment().getRoot())
+                    .where(node -> node instanceof LimitNode limitNode && !limitNode.isPartial() && limitNode.getCount() < 1_000_000)
+                    .matches();
+        }
+
+        /**
+         * Verify if source plan is expected to output data as its tasks are progressing.
+         * E.g. tasks building final aggregation would not output any data until task completes; all data
+         * for partition task is responsible for must be processed.
+         * <br/>
+         * Note that logic here is conservative. It is still possible that stage produces output data before it is
+         * finished because some tasks finish sooner than the other.
+         */
+        private boolean canOutputDataEarly(SubPlan source)
+        {
+            PlanFragment fragment = source.getFragment();
+            return canOutputDataEarly(fragment.getRoot());
+        }
+
+        private boolean canOutputDataEarly(PlanNode node)
+        {
+            if (node instanceof AggregationNode aggregationNode) {
+                return aggregationNode.getStep().isOutputPartial();
+            }
+            // todo filter out more (window?)
+            return node.getSources().stream().allMatch(this::canOutputDataEarly);
+        }
+
+        private void closeSourceExchanges(SubPlan subPlan)
+        {
+            for (SubPlan source : subPlan.getChildren()) {
+                StageExecution sourceStageExecution = stageExecutions.get(getStageId(source.getFragment().getId()));
+                if (sourceStageExecution != null && sourceStageExecution.getState().isDone()) {
+                    // Only close source exchange if source stage writing to it is already done.
+                    // It could be that closeSourceExchanges was called because downstream stage already
+                    // finished while some upstream stages are still running.
+                    // E.g this may happen in case of early limit termination.
+                    sourceStageExecution.closeExchange();
+                }
+            }
+        }
+
+        private void createStageExecution(SubPlan subPlan, boolean rootFragment, Map<StageId, OutputDataSizeEstimate> sourceOutputSizeEstimates, int schedulingPriority, boolean eager)
+        {
+            Closer closer = Closer.create();
+
+            try {
+                PlanFragment fragment = subPlan.getFragment();
+                Session session = queryStateMachine.getSession();
+
+                StageId stageId = getStageId(fragment.getId());
+                SqlStage stage = SqlStage.createSqlStage(
+                        stageId,
+                        fragment,
+                        TableInfo.extract(session, metadata, fragment),
+                        remoteTaskFactory,
+                        session,
+                        summarizeTaskInfo,
+                        nodeTaskMap,
+                        queryStateMachine.getStateMachineExecutor(),
+                        tracer,
+                        schedulerStats);
+                closer.register(stage::abort);
+                stageRegistry.add(stage);
+                stage.addFinalStageInfoListener(status -> queryStateMachine.updateQueryInfo(Optional.ofNullable(stageRegistry.getStageInfo())));
+
+                ImmutableMap.Builder<PlanFragmentId, Exchange> sourceExchangesBuilder = ImmutableMap.builder();
+                Map<PlanFragmentId, OutputDataSizeEstimate> sourceOutputEstimatesByFragmentId = new HashMap<>();
+                for (SubPlan source : subPlan.getChildren()) {
+                    PlanFragmentId sourceFragmentId = source.getFragment().getId();
+                    StageId sourceStageId = getStageId(sourceFragmentId);
+                    StageExecution sourceStageExecution = getStageExecution(sourceStageId);
+                    sourceExchangesBuilder.put(sourceFragmentId, sourceStageExecution.getExchange());
+                    OutputDataSizeEstimate outputDataSizeResult = sourceOutputSizeEstimates.get(sourceStageId);
+                    verify(outputDataSizeResult != null, "No output data size estimate in %s map for stage %s", sourceOutputSizeEstimates, sourceStageId);
+                    sourceOutputEstimatesByFragmentId.put(sourceFragmentId, outputDataSizeResult);
+                    stageConsumers.put(sourceStageExecution.getStageId(), stageId);
+                }
+
+                ImmutableMap.Builder<PlanNodeId, OutputDataSizeEstimate> outputDataSizeEstimates = ImmutableMap.builder();
+                for (RemoteSourceNode remoteSource : stage.getFragment().getRemoteSourceNodes()) {
+                    List<OutputDataSizeEstimate> estimates = new ArrayList<>();
+                    for (PlanFragmentId fragmentId : remoteSource.getSourceFragmentIds()) {
+                        OutputDataSizeEstimate fragmentEstimate = sourceOutputEstimatesByFragmentId.get(fragmentId);
+                        verify(fragmentEstimate != null, "fragmentEstimate not found for fragment %s", fragmentId);
+                        estimates.add(fragmentEstimate);
+                    }
+                    // merge estimates for all source fragments of a single remote source
+                    outputDataSizeEstimates.put(remoteSource.getId(), OutputDataSizeEstimate.merge(estimates));
+                }
+
+                Map<PlanFragmentId, Exchange> sourceExchanges = sourceExchangesBuilder.buildOrThrow();
+                EventDrivenTaskSource taskSource = closer.register(taskSourceFactory.create(
+                        session,
+                        stage.getStageSpan(),
+                        fragment,
+                        sourceExchanges,
+                        partitioningSchemeFactory.get(fragment.getPartitioning(), fragment.getPartitionCount()),
+                        stage::recordGetSplitTime,
+                        outputDataSizeEstimates.buildOrThrow()));
+
+                FaultTolerantPartitioningScheme sinkPartitioningScheme = partitioningSchemeFactory.get(
+                        fragment.getOutputPartitioningScheme().getPartitioning().getHandle(),
+                        fragment.getOutputPartitioningScheme().getPartitionCount());
+                ExchangeContext exchangeContext = new ExchangeContext(queryStateMachine.getQueryId(), new ExchangeId("external-exchange-" + stage.getStageId().getId()));
+
+                boolean preserveOrderWithinPartition = rootFragment && stage.getFragment().getPartitioning().equals(SINGLE_DISTRIBUTION);
+                Exchange exchange = closer.register(exchangeManager.createExchange(
+                        exchangeContext,
+                        sinkPartitioningScheme.getPartitionCount(),
+                        preserveOrderWithinPartition));
+
+                boolean coordinatorStage = stage.getFragment().getPartitioning().equals(COORDINATOR_DISTRIBUTION);
+
+                if (eager) {
+                    sourceExchanges.values().forEach(sourceExchange -> sourceExchange.setSourceHandlesDeliveryMode(EAGER));
+                }
+
+                Function<PlanFragmentId, PlanFragment> planFragmentLookup = planFragmentId -> {
+                    StageExecution stageExecution = stageExecutions.get(getStageId(planFragmentId));
+                    checkArgument(stageExecution != null, "stage for fragment %s not started yet", planFragmentId);
+                    return stageExecution.getStageInfo().getPlan();
+                };
+                StageExecution execution = new StageExecution(
+                        taskDescriptorStorage,
+                        stage,
+                        taskSource,
+                        sinkPartitioningScheme,
+                        exchange,
+                        memoryEstimatorFactory.createPartitionMemoryEstimator(session, fragment, planFragmentLookup),
+                        outputDataSizeEstimator,
+                        // do not retry coordinator only tasks
+                        coordinatorStage ? 1 : maxTaskExecutionAttempts,
+                        schedulingPriority,
+                        eager,
+                        dynamicFilterService);
+
+                stageExecutions.put(execution.getStageId(), execution);
+
+                for (SubPlan source : subPlan.getChildren()) {
+                    PlanFragmentId sourceFragmentId = source.getFragment().getId();
+                    StageExecution sourceExecution = getStageExecution(getStageId(sourceFragmentId));
+                    execution.setSourceOutputSelector(sourceFragmentId, sourceExecution.getSinkOutputSelector());
+                }
+            }
+            catch (Throwable t) {
+                try {
+                    closer.close();
+                }
+                catch (Throwable closerFailure) {
+                    if (closerFailure != t) {
+                        t.addSuppressed(closerFailure);
+                    }
+                }
+                throw t;
+            }
+        }
+
+        private StageId getStageId(PlanFragmentId fragmentId)
+        {
+            return StageId.create(queryStateMachine.getQueryId(), fragmentId);
+        }
+
+        private void scheduleTasks()
+        {
+            long standardTasksWaitingForNode = getWaitingForNodeTasksCount(STANDARD);
+            long speculativeTasksWaitingForNode = getWaitingForNodeTasksCount(SPECULATIVE);
+            long eagerSpeculativeTasksWaitingForNode = getWaitingForNodeTasksCount(EAGER_SPECULATIVE);
+
+            while (!schedulingQueue.isEmpty()) {
+                PrioritizedScheduledTask scheduledTask;
+
+                if (schedulingQueue.getTaskCount(EAGER_SPECULATIVE) > 0 && eagerSpeculativeTasksWaitingForNode < maxTasksWaitingForNode) {
+                    scheduledTask = schedulingQueue.pollOrThrow(EAGER_SPECULATIVE);
+                }
+                else if (schedulingQueue.getTaskCount(STANDARD) > 0) {
+                    // schedule STANDARD tasks if available
+                    if (standardTasksWaitingForNode >= maxTasksWaitingForNode) {
+                        break;
+                    }
+                    scheduledTask = schedulingQueue.pollOrThrow(STANDARD);
+                }
+                else if (schedulingQueue.getTaskCount(SPECULATIVE) > 0) {
+                    if (standardTasksWaitingForNode > 0) {
+                        // do not handle any speculative tasks if there are non-speculative waiting
+                        break;
+                    }
+                    if (speculativeTasksWaitingForNode >= maxTasksWaitingForNode) {
+                        // too many speculative tasks waiting for node
+                        break;
+                    }
+                    // we can schedule one more speculative task
+                    scheduledTask = schedulingQueue.pollOrThrow(SPECULATIVE);
+                }
+                else {
+                    // cannot schedule anything more right now
+                    break;
+                }
+
+                StageExecution stageExecution = getStageExecution(scheduledTask.task().stageId());
+                if (stageExecution.getState().isDone()) {
+                    continue;
+                }
+                int partitionId = scheduledTask.task().partitionId();
+                Optional<NodeRequirements> nodeRequirements = stageExecution.getNodeRequirements(partitionId);
+                if (nodeRequirements.isEmpty()) {
+                    // execution finished
+                    continue;
+                }
+                MemoryRequirements memoryRequirements = stageExecution.getMemoryRequirements(partitionId);
+                NodeLease lease = nodeAllocator.acquire(nodeRequirements.get(), memoryRequirements.getRequiredMemory(), scheduledTask.getExecutionClass());
+                lease.getNode().addListener(() -> eventQueue.add(Event.WAKE_UP), queryExecutor);
+                preSchedulingTaskContexts.put(scheduledTask.task(), new PreSchedulingTaskContext(lease, scheduledTask.getExecutionClass()));
+
+                switch (scheduledTask.getExecutionClass()) {
+                    case STANDARD -> standardTasksWaitingForNode++;
+                    case SPECULATIVE -> speculativeTasksWaitingForNode++;
+                    case EAGER_SPECULATIVE -> eagerSpeculativeTasksWaitingForNode++;
+                    default -> throw new IllegalArgumentException("Unknown execution class " + scheduledTask.getExecutionClass());
+                }
+            }
+        }
+
+        private long getWaitingForNodeTasksCount(TaskExecutionClass executionClass)
+        {
+            return preSchedulingTaskContexts.values().stream()
+                    .filter(context -> !context.getNodeLease().getNode().isDone())
+                    .filter(context -> context.getExecutionClass() == executionClass)
+                    .count();
+        }
+
+        private void processNodeAcquisitions()
+        {
+            Iterator<Map.Entry<ScheduledTask, PreSchedulingTaskContext>> iterator = preSchedulingTaskContexts.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry<ScheduledTask, PreSchedulingTaskContext> entry = iterator.next();
+                ScheduledTask scheduledTask = entry.getKey();
+                PreSchedulingTaskContext context = entry.getValue();
+                if (context.isWaitingForSinkInstanceHandle()) {
+                    verify(context.getNodeLease().getNode().isDone(), "isWaitingForSinkInstanceHandle true but node not set");
+                    continue; // this entry is already in the isWaitingForSinkInstanceHandle phase
+                }
+
+                NodeLease nodeLease = context.getNodeLease();
+                StageExecution stageExecution = getStageExecution(scheduledTask.stageId());
+                if (stageExecution.getState().isDone()) {
+                    iterator.remove();
+                    nodeLease.release();
+                }
+                else if (nodeLease.getNode().isDone()) {
+                    context.setWaitingForSinkInstanceHandle(true);
+                    Optional<GetExchangeSinkInstanceHandleResult> getExchangeSinkInstanceHandleResult = stageExecution.getExchangeSinkInstanceHandle(scheduledTask.partitionId());
+                    if (getExchangeSinkInstanceHandleResult.isPresent()) {
+                        CompletableFuture<ExchangeSinkInstanceHandle> sinkInstanceHandleFuture = getExchangeSinkInstanceHandleResult.get().exchangeSinkInstanceHandleFuture();
+                        sinkInstanceHandleFuture.whenComplete((sinkInstanceHandle, throwable) -> {
+                            if (throwable != null) {
+                                eventQueue.add(new StageFailureEvent(scheduledTask.stageId, throwable));
+                            }
+                            else {
+                                eventQueue.add(new SinkInstanceHandleAcquiredEvent(
+                                        scheduledTask.stageId(),
+                                        scheduledTask.partitionId(),
+                                        nodeLease,
+                                        getExchangeSinkInstanceHandleResult.get().attempt(),
+                                        sinkInstanceHandle));
+                            }
+                        });
+                    }
+                    else {
+                        iterator.remove();
+                        nodeLease.release();
+                    }
+                }
+            }
+        }
+
+        private void updateMemoryRequirements()
+        {
+            // update memory requirements for stages
+            // it will update memory requirements regarding tasks which have node acquired and remote task created
+            for (StageExecution stageExecution : stageExecutions.values()) {
+                stageExecution.updateMemoryRequirements();
+            }
+
+            // update pending acquires
+            for (Map.Entry<ScheduledTask, PreSchedulingTaskContext> entry : preSchedulingTaskContexts.entrySet()) {
+                ScheduledTask scheduledTask = entry.getKey();
+                PreSchedulingTaskContext taskContext = entry.getValue();
+
+                MemoryRequirements currentPartitionMemoryRequirements = stageExecutions.get(scheduledTask.stageId()).getMemoryRequirements(scheduledTask.partitionId());
+                taskContext.getNodeLease().setMemoryRequirement(currentPartitionMemoryRequirements.getRequiredMemory());
+            }
+        }
+
+        @Override
+        public void onSinkInstanceHandleAcquired(SinkInstanceHandleAcquiredEvent sinkInstanceHandleAcquiredEvent)
+        {
+            ScheduledTask scheduledTask = new ScheduledTask(sinkInstanceHandleAcquiredEvent.getStageId(), sinkInstanceHandleAcquiredEvent.getPartitionId());
+            PreSchedulingTaskContext context = preSchedulingTaskContexts.remove(scheduledTask);
+            verify(context != null, "expected %s in preSchedulingTaskContexts", scheduledTask);
+            verify(context.getNodeLease().getNode().isDone(), "expected node set for %s", scheduledTask);
+            verify(context.isWaitingForSinkInstanceHandle(), "expected isWaitingForSinkInstanceHandle set for %s", scheduledTask);
+            NodeLease nodeLease = sinkInstanceHandleAcquiredEvent.getNodeLease();
+            int partitionId = sinkInstanceHandleAcquiredEvent.getPartitionId();
+            StageId stageId = sinkInstanceHandleAcquiredEvent.getStageId();
+            int attempt = sinkInstanceHandleAcquiredEvent.getAttempt();
+            ExchangeSinkInstanceHandle sinkInstanceHandle = sinkInstanceHandleAcquiredEvent.getSinkInstanceHandle();
+            StageExecution stageExecution = getStageExecution(stageId);
+
+            Optional<RemoteTask> remoteTask = stageExecution.schedule(partitionId, sinkInstanceHandle, attempt, nodeLease, context.getExecutionClass().isSpeculative());
+            remoteTask.ifPresent(task -> {
+                task.addStateChangeListener(createExchangeSinkInstanceHandleUpdateRequiredListener());
+                task.addStateChangeListener(taskStatus -> {
+                    if (taskStatus.getState().isDone()) {
+                        nodeLease.release();
+                    }
+                });
+                task.addFinalTaskInfoListener(taskExecutionStats::update);
+                task.addFinalTaskInfoListener(taskInfo -> eventQueue.add(new RemoteTaskCompletedEvent(taskInfo.getTaskStatus())));
+                nodeLease.attachTaskId(task.getTaskId());
+                task.start();
+                if (queryStateMachine.getQueryState() == QueryState.STARTING) {
+                    queryStateMachine.transitionToRunning();
+                }
+            });
+            if (remoteTask.isEmpty()) {
+                nodeLease.release();
+            }
+        }
+
+        private StateChangeListener<TaskStatus> createExchangeSinkInstanceHandleUpdateRequiredListener()
+        {
+            AtomicLong respondedToVersion = new AtomicLong(-1);
+            return taskStatus -> {
+                OutputBufferStatus outputBufferStatus = taskStatus.getOutputBufferStatus();
+                if (outputBufferStatus.getOutputBuffersVersion().isEmpty()) {
+                    return;
+                }
+                if (!outputBufferStatus.isExchangeSinkInstanceHandleUpdateRequired()) {
+                    return;
+                }
+                long remoteVersion = outputBufferStatus.getOutputBuffersVersion().getAsLong();
+                while (true) {
+                    long localVersion = respondedToVersion.get();
+                    if (remoteVersion <= localVersion) {
+                        // version update is scheduled or sent already but got not propagated yet
+                        break;
+                    }
+                    if (respondedToVersion.compareAndSet(localVersion, remoteVersion)) {
+                        eventQueue.add(new RemoteTaskExchangeSinkUpdateRequiredEvent(taskStatus));
+                        break;
+                    }
+                }
+            };
+        }
+
+        private void loadMoreTaskDescriptorsIfNecessary()
+        {
+            boolean schedulingQueueIsFull = schedulingQueue.getTaskCount(STANDARD) >= maxTasksWaitingForExecution;
+            for (StageExecution stageExecution : stageExecutions.values()) {
+                if (!schedulingQueueIsFull || stageExecution.hasOpenTaskRunning() || stageExecution.isEager()) {
+                    stageExecution.loadMoreTaskDescriptors().ifPresent(future -> Futures.addCallback(future, new FutureCallback<>()
+                    {
+                        @Override
+                        public void onSuccess(AssignmentResult result)
+                        {
+                            eventQueue.add(new SplitAssignmentEvent(stageExecution.getStageId(), result));
+                        }
+
+                        @Override
+                        public void onFailure(Throwable t)
+                        {
+                            eventQueue.add(new StageFailureEvent(stageExecution.getStageId(), t));
+                        }
+                    }, queryExecutor));
+                }
+            }
+        }
+
+        public void abort()
+        {
+            eventQueue.clear();
+            eventQueue.add(Event.ABORT);
+        }
+
+        @Override
+        public void onRemoteTaskCompleted(RemoteTaskCompletedEvent event)
+        {
+            TaskStatus taskStatus = event.getTaskStatus();
+            TaskId taskId = taskStatus.getTaskId();
+            TaskState taskState = taskStatus.getState();
+            StageExecution stageExecution = getStageExecution(taskId.getStageId());
+            if (taskState == TaskState.FINISHED) {
+                stageExecution.taskFinished(taskId, taskStatus);
+            }
+            else if (taskState == TaskState.FAILED) {
+                ExecutionFailureInfo failureInfo = taskStatus.getFailures().stream()
+                        .findFirst()
+                        .map(this::rewriteTransportFailure)
+                        .orElseGet(() -> toFailure(new TrinoException(GENERIC_INTERNAL_ERROR, "A task failed for an unknown reason")));
+
+                List<PrioritizedScheduledTask> replacementTasks = stageExecution.taskFailed(taskId, failureInfo, taskStatus);
+                replacementTasks.forEach(schedulingQueue::addOrUpdate);
+
+                if (shouldDelayScheduling(failureInfo.getErrorCode())) {
+                    schedulingDelayer.startOrProlongDelayIfNecessary();
+                    scheduledExecutorService.schedule(() -> eventQueue.add(Event.WAKE_UP), schedulingDelayer.getRemainingDelayInMillis(), MILLISECONDS);
+                }
+            }
+
+            // update output selectors
+            ExchangeSourceOutputSelector outputSelector = stageExecution.getSinkOutputSelector();
+            for (StageId consumerStageId : stageConsumers.get(stageExecution.getStageId())) {
+                getStageExecution(consumerStageId).setSourceOutputSelector(stageExecution.getStageFragmentId(), outputSelector);
+            }
+        }
+
+        @Override
+        public void onRemoteTaskExchangeSinkUpdateRequired(RemoteTaskExchangeSinkUpdateRequiredEvent event)
+        {
+            TaskId taskId = event.getTaskStatus().getTaskId();
+            StageExecution stageExecution = getStageExecution(taskId.getStageId());
+            stageExecution.initializeUpdateOfExchangeSinkInstanceHandle(taskId, eventQueue);
+        }
+
+        @Override
+        public void onRemoteTaskExchangeUpdatedSinkAcquired(RemoteTaskExchangeUpdatedSinkAcquired event)
+        {
+            TaskId taskId = event.getTaskId();
+            StageExecution stageExecution = getStageExecution(taskId.getStageId());
+            stageExecution.finalizeUpdateOfExchangeSinkInstanceHandle(taskId, event.getExchangeSinkInstanceHandle());
+        }
+
+        @Override
+        public void onSplitAssignment(SplitAssignmentEvent event)
+        {
+            StageExecution stageExecution = getStageExecution(event.getStageId());
+            AssignmentResult assignment = event.getAssignmentResult();
+            for (Partition partition : assignment.partitionsAdded()) {
+                stageExecution.addPartition(partition.partitionId(), partition.nodeRequirements());
+            }
+            for (PartitionUpdate partitionUpdate : assignment.partitionUpdates()) {
+                Optional<PrioritizedScheduledTask> scheduledTask = stageExecution.updatePartition(
+                        partitionUpdate.partitionId(),
+                        partitionUpdate.planNodeId(),
+                        partitionUpdate.readyForScheduling(),
+                        partitionUpdate.splits(),
+                        partitionUpdate.noMoreSplits());
+                scheduledTask.ifPresent(schedulingQueue::addOrUpdate);
+            }
+            assignment.sealedPartitions().forEach(partitionId -> {
+                Optional<PrioritizedScheduledTask> scheduledTask = stageExecution.sealPartition(partitionId);
+                scheduledTask.ifPresent(prioritizedTask -> {
+                    PreSchedulingTaskContext context = preSchedulingTaskContexts.get(prioritizedTask.task());
+                    if (context != null) {
+                        // task is already waiting for node or for sink instance handle
+                        // update speculative flag
+                        context.setExecutionClass(prioritizedTask.getExecutionClass());
+                        context.getNodeLease().setExecutionClass(prioritizedTask.getExecutionClass());
+                        return;
+                    }
+                    schedulingQueue.addOrUpdate(prioritizedTask);
+                });
+            });
+            if (assignment.noMorePartitions()) {
+                stageExecution.noMorePartitions();
+            }
+            stageExecution.taskDescriptorLoadingComplete();
+        }
+
+        @Override
+        public void onStageFailure(StageFailureEvent event)
+        {
+            StageExecution stageExecution = getStageExecution(event.getStageId());
+            stageExecution.fail(event.getFailure());
+        }
+
+        private StageExecution getStageExecution(StageId stageId)
+        {
+            StageExecution execution = stageExecutions.get(stageId);
+            checkState(execution != null, "stage execution does not exist for stage: %s", stageId);
+            return execution;
+        }
+
+        private boolean shouldDelayScheduling(@Nullable ErrorCode errorCode)
+        {
+            return errorCode == null || errorCode.getType() == INTERNAL_ERROR || errorCode.getType() == EXTERNAL;
+        }
+
+        private ExecutionFailureInfo rewriteTransportFailure(ExecutionFailureInfo executionFailureInfo)
+        {
+            if (executionFailureInfo.getRemoteHost() == null || failureDetector.getState(executionFailureInfo.getRemoteHost()) != GONE) {
+                return executionFailureInfo;
+            }
+
+            return new ExecutionFailureInfo(
+                    executionFailureInfo.getType(),
+                    executionFailureInfo.getMessage(),
+                    executionFailureInfo.getCause(),
+                    executionFailureInfo.getSuppressed(),
+                    executionFailureInfo.getStack(),
+                    executionFailureInfo.getErrorLocation(),
+                    REMOTE_HOST_GONE.toErrorCode(),
+                    executionFailureInfo.getRemoteHost());
+        }
+    }
+
+    public static class StageExecution
+    {
+        private final TaskDescriptorStorage taskDescriptorStorage;
+
+        private final SqlStage stage;
+        private final EventDrivenTaskSource taskSource;
+        private final FaultTolerantPartitioningScheme sinkPartitioningScheme;
+        private final Exchange exchange;
+        private final PartitionMemoryEstimator partitionMemoryEstimator;
+        private final OutputDataSizeEstimator outputDataSizeEstimator;
+        private final int maxTaskExecutionAttempts;
+        private final int schedulingPriority;
+        private final boolean eager;
+        private final DynamicFilterService dynamicFilterService;
+        private final long[] outputDataSize;
+
+        private final Int2ObjectMap<StagePartition> partitions = new Int2ObjectOpenHashMap<>();
+        private boolean noMorePartitions;
+
+        private final IntSet runningPartitions = new IntOpenHashSet();
+        private final IntSet remainingPartitions = new IntOpenHashSet();
+
+        private ExchangeSourceOutputSelector.Builder sinkOutputSelectorBuilder;
+        private ExchangeSourceOutputSelector finalSinkOutputSelector;
+
+        private final Set<PlanNodeId> remoteSourceIds;
+        private final Map<PlanFragmentId, RemoteSourceNode> remoteSources;
+        private final Map<PlanFragmentId, ExchangeSourceOutputSelector> sourceOutputSelectors = new HashMap<>();
+
+        private boolean taskDescriptorLoadingActive;
+        private boolean exchangeClosed;
+
+        private MemoryRequirements initialMemoryRequirements;
+
+        private StageExecution(
+                TaskDescriptorStorage taskDescriptorStorage,
+                SqlStage stage,
+                EventDrivenTaskSource taskSource,
+                FaultTolerantPartitioningScheme sinkPartitioningScheme,
+                Exchange exchange,
+                PartitionMemoryEstimator partitionMemoryEstimator,
+                OutputDataSizeEstimator outputDataSizeEstimator,
+                int maxTaskExecutionAttempts,
+                int schedulingPriority,
+                boolean eager,
+                DynamicFilterService dynamicFilterService)
+        {
+            this.taskDescriptorStorage = requireNonNull(taskDescriptorStorage, "taskDescriptorStorage is null");
+            this.stage = requireNonNull(stage, "stage is null");
+            this.taskSource = requireNonNull(taskSource, "taskSource is null");
+            this.sinkPartitioningScheme = requireNonNull(sinkPartitioningScheme, "sinkPartitioningScheme is null");
+            this.exchange = requireNonNull(exchange, "exchange is null");
+            this.partitionMemoryEstimator = requireNonNull(partitionMemoryEstimator, "partitionMemoryEstimator is null");
+            this.outputDataSizeEstimator = requireNonNull(outputDataSizeEstimator, "outputDataSizeEstimator is null");
+            this.maxTaskExecutionAttempts = maxTaskExecutionAttempts;
+            this.schedulingPriority = schedulingPriority;
+            this.eager = eager;
+            this.dynamicFilterService = requireNonNull(dynamicFilterService, "dynamicFilterService is null");
+            outputDataSize = new long[sinkPartitioningScheme.getPartitionCount()];
+            sinkOutputSelectorBuilder = ExchangeSourceOutputSelector.builder(ImmutableSet.of(exchange.getId()));
+            ImmutableMap.Builder<PlanFragmentId, RemoteSourceNode> remoteSources = ImmutableMap.builder();
+            ImmutableSet.Builder<PlanNodeId> remoteSourceIds = ImmutableSet.builder();
+            for (RemoteSourceNode remoteSource : stage.getFragment().getRemoteSourceNodes()) {
+                remoteSourceIds.add(remoteSource.getId());
+                remoteSource.getSourceFragmentIds().forEach(fragmentId -> remoteSources.put(fragmentId, remoteSource));
+            }
+            this.remoteSourceIds = remoteSourceIds.build();
+            this.remoteSources = remoteSources.buildOrThrow();
+            this.initialMemoryRequirements = computeCurrentInitialMemoryRequirements();
+        }
+
+        private MemoryRequirements computeCurrentInitialMemoryRequirements()
+        {
+            return partitionMemoryEstimator.getInitialMemoryRequirements();
+        }
+
+        private void updateMemoryRequirements()
+        {
+            MemoryRequirements newInitialMemoryRequirements = computeCurrentInitialMemoryRequirements();
+            if (initialMemoryRequirements.equals(newInitialMemoryRequirements)) {
+                return;
+            }
+
+            initialMemoryRequirements = newInitialMemoryRequirements;
+
+            for (StagePartition partition : partitions.values()) {
+                if (partition.isFinished()) {
+                    continue;
+                }
+
+                partition.updateInitialMemoryRequirements(initialMemoryRequirements);
+            }
+        }
+
+        public StageId getStageId()
+        {
+            return stage.getStageId();
+        }
+
+        public PlanFragmentId getStageFragmentId()
+        {
+            return stage.getFragment().getId();
+        }
+
+        public StageState getState()
+        {
+            return stage.getState();
+        }
+
+        public StageInfo getStageInfo()
+        {
+            return stage.getStageInfo();
+        }
+
+        public Exchange getExchange()
+        {
+            return exchange;
+        }
+
+        public boolean isExchangeClosed()
+        {
+            return exchangeClosed;
+        }
+
+        public void addPartition(int partitionId, NodeRequirements nodeRequirements)
+        {
+            if (getState().isDone()) {
+                return;
+            }
+
+            ExchangeSinkHandle exchangeSinkHandle = exchange.addSink(partitionId);
+            StagePartition partition = new StagePartition(
+                    taskDescriptorStorage,
+                    stage.getStageId(),
+                    partitionId,
+                    exchangeSinkHandle,
+                    remoteSourceIds,
+                    nodeRequirements,
+                    initialMemoryRequirements,
+                    maxTaskExecutionAttempts);
+            checkState(partitions.putIfAbsent(partitionId, partition) == null, "partition with id %s already exist in stage %s", partitionId, stage.getStageId());
+            getSourceOutputSelectors().forEach((partition::updateExchangeSourceOutputSelector));
+            remainingPartitions.add(partitionId);
+        }
+
+        public Optional<PrioritizedScheduledTask> updatePartition(
+                int taskPartitionId,
+                PlanNodeId planNodeId,
+                boolean readyForScheduling,
+                ListMultimap<Integer, Split> splits, // sourcePartitionId -> splits
+                boolean noMoreSplits)
+        {
+            if (getState().isDone()) {
+                return Optional.empty();
+            }
+
+            StagePartition partition = getStagePartition(taskPartitionId);
+            partition.addSplits(planNodeId, splits, noMoreSplits);
+            if (readyForScheduling && !partition.isTaskScheduled()) {
+                partition.setTaskScheduled(true);
+                return Optional.of(PrioritizedScheduledTask.createSpeculative(stage.getStageId(), taskPartitionId, schedulingPriority, eager));
+            }
+            return Optional.empty();
+        }
+
+        public Optional<PrioritizedScheduledTask> sealPartition(int partitionId)
+        {
+            if (getState().isDone()) {
+                return Optional.empty();
+            }
+
+            StagePartition partition = getStagePartition(partitionId);
+            partition.seal();
+
+            if (!partition.isRunning()) {
+                // if partition is not yet running update its priority as it is no longer speculative
+                return Optional.of(PrioritizedScheduledTask.create(stage.getStageId(), partitionId, schedulingPriority));
+            }
+
+            // TODO: split into smaller partitions here if necessary (for example if a task for a given partition failed with out of memory)
+
+            return Optional.empty();
+        }
+
+        public void noMorePartitions()
+        {
+            noMorePartitions = true;
+            if (getState().isDone()) {
+                return;
+            }
+
+            if (remainingPartitions.isEmpty()) {
+                stage.finish();
+                // TODO close exchange early
+                taskSource.close();
+            }
+        }
+
+        public boolean isNoMorePartitions()
+        {
+            return noMorePartitions;
+        }
+
+        public int getPartitionsCount()
+        {
+            checkState(noMorePartitions, "noMorePartitions not set yet");
+            return partitions.size();
+        }
+
+        public int getRemainingPartitionsCount()
+        {
+            checkState(noMorePartitions, "noMorePartitions not set yet");
+            return remainingPartitions.size();
+        }
+
+        public void closeExchange()
+        {
+            if (exchangeClosed) {
+                return;
+            }
+
+            exchange.close();
+            exchangeClosed = true;
+        }
+
+        public Optional<GetExchangeSinkInstanceHandleResult> getExchangeSinkInstanceHandle(int partitionId)
+        {
+            if (getState().isDone()) {
+                return Optional.empty();
+            }
+
+            StagePartition partition = getStagePartition(partitionId);
+            verify(partition.getRemainingAttempts() >= 0, "remaining attempts is expected to be greater than or equal to zero: %s", partition.getRemainingAttempts());
+
+            if (partition.isFinished()) {
+                return Optional.empty();
+            }
+
+            int attempt = maxTaskExecutionAttempts - partition.getRemainingAttempts();
+            return Optional.of(new GetExchangeSinkInstanceHandleResult(
+                    exchange.instantiateSink(partition.getExchangeSinkHandle(), attempt),
+                    attempt));
+        }
+
+        public Optional<RemoteTask> schedule(int partitionId, ExchangeSinkInstanceHandle exchangeSinkInstanceHandle, int attempt, NodeLease nodeLease, boolean speculative)
+        {
+            InternalNode node;
+            try {
+                // "schedule" should be called when we have node assigned already
+                node = Futures.getDone(nodeLease.getNode());
+            }
+            catch (ExecutionException e) {
+                throw new UncheckedExecutionException(e);
+            }
+
+            if (getState().isDone()) {
+                return Optional.empty();
+            }
+
+            StagePartition partition = getStagePartition(partitionId);
+            verify(partition.getRemainingAttempts() >= 0, "remaining attempts is expected to be greater than or equal to zero: %s", partition.getRemainingAttempts());
+
+            if (partition.isFinished()) {
+                return Optional.empty();
+            }
+
+            Map<PlanNodeId, ExchangeSourceOutputSelector> outputSelectors = getSourceOutputSelectors();
+
+            ListMultimap<PlanNodeId, Split> splits = ArrayListMultimap.create();
+            splits.putAll(partition.getSplits().getSplitsFlat());
+            outputSelectors.forEach((planNodeId, outputSelector) -> splits.put(planNodeId, createOutputSelectorSplit(outputSelector)));
+
+            Set<PlanNodeId> noMoreSplits = new HashSet<>();
+            for (RemoteSourceNode remoteSource : stage.getFragment().getRemoteSourceNodes()) {
+                ExchangeSourceOutputSelector selector = outputSelectors.get(remoteSource.getId());
+                if (selector != null && selector.isFinal() && partition.isNoMoreSplits(remoteSource.getId())) {
+                    noMoreSplits.add(remoteSource.getId());
+                }
+            }
+            for (PlanNodeId partitionedSource : stage.getFragment().getPartitionedSources()) {
+                if (partition.isNoMoreSplits(partitionedSource)) {
+                    noMoreSplits.add(partitionedSource);
+                }
+            }
+
+            SpoolingOutputBuffers outputBuffers = SpoolingOutputBuffers.createInitial(exchangeSinkInstanceHandle, sinkPartitioningScheme.getPartitionCount());
+            Optional<RemoteTask> task = stage.createTask(
+                    node,
+                    partitionId,
+                    attempt,
+                    sinkPartitioningScheme.getBucketToPartitionMap(),
+                    outputBuffers,
+                    splits,
+                    noMoreSplits,
+                    Optional.of(partition.getMemoryRequirements().getRequiredMemory()),
+                    speculative);
+            task.ifPresent(remoteTask -> {
+                // record nodeLease so we can change execution class later
+                partition.addTask(remoteTask, outputBuffers, nodeLease);
+                runningPartitions.add(partitionId);
+            });
+            return task;
+        }
+
+        public boolean isEager()
+        {
+            return eager;
+        }
+
+        public boolean hasOpenTaskRunning()
+        {
+            if (getState().isDone()) {
+                return false;
+            }
+
+            if (runningPartitions.isEmpty()) {
+                return false;
+            }
+
+            for (int partitionId : runningPartitions) {
+                StagePartition partition = getStagePartition(partitionId);
+                if (!partition.isSealed()) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public Optional<ListenableFuture<AssignmentResult>> loadMoreTaskDescriptors()
+        {
+            if (getState().isDone() || taskDescriptorLoadingActive) {
+                return Optional.empty();
+            }
+            taskDescriptorLoadingActive = true;
+            return Optional.of(taskSource.process());
+        }
+
+        public void taskDescriptorLoadingComplete()
+        {
+            taskDescriptorLoadingActive = false;
+        }
+
+        private Map<PlanNodeId, ExchangeSourceOutputSelector> getSourceOutputSelectors()
+        {
+            ImmutableMap.Builder<PlanNodeId, ExchangeSourceOutputSelector> result = ImmutableMap.builder();
+            for (RemoteSourceNode remoteSource : stage.getFragment().getRemoteSourceNodes()) {
+                ExchangeSourceOutputSelector mergedSelector = null;
+                for (PlanFragmentId sourceFragmentId : remoteSource.getSourceFragmentIds()) {
+                    ExchangeSourceOutputSelector sourceFragmentSelector = sourceOutputSelectors.get(sourceFragmentId);
+                    if (sourceFragmentSelector == null) {
+                        continue;
+                    }
+                    if (mergedSelector == null) {
+                        mergedSelector = sourceFragmentSelector;
+                    }
+                    else {
+                        mergedSelector = mergedSelector.merge(sourceFragmentSelector);
+                    }
+                }
+                if (mergedSelector != null) {
+                    result.put(remoteSource.getId(), mergedSelector);
+                }
+            }
+            return result.buildOrThrow();
+        }
+
+        public void initializeUpdateOfExchangeSinkInstanceHandle(TaskId taskId, BlockingQueue<Event> eventQueue)
+        {
+            if (getState().isDone()) {
+                return;
+            }
+            StagePartition partition = getStagePartition(taskId.getPartitionId());
+            CompletableFuture<ExchangeSinkInstanceHandle> exchangeSinkInstanceHandleFuture = exchange.updateSinkInstanceHandle(partition.getExchangeSinkHandle(), taskId.getAttemptId());
+
+            exchangeSinkInstanceHandleFuture.whenComplete((sinkInstanceHandle, throwable) -> {
+                if (throwable != null) {
+                    eventQueue.add(new StageFailureEvent(taskId.getStageId(), throwable));
+                }
+                else {
+                    eventQueue.add(new RemoteTaskExchangeUpdatedSinkAcquired(taskId, sinkInstanceHandle));
+                }
+            });
+        }
+
+        public void finalizeUpdateOfExchangeSinkInstanceHandle(TaskId taskId, ExchangeSinkInstanceHandle updatedExchangeSinkInstanceHandle)
+        {
+            if (getState().isDone()) {
+                return;
+            }
+            StagePartition partition = getStagePartition(taskId.getPartitionId());
+            partition.updateExchangeSinkInstanceHandle(taskId, updatedExchangeSinkInstanceHandle);
+        }
+
+        public void taskFinished(TaskId taskId, TaskStatus taskStatus)
+        {
+            if (getState().isDone()) {
+                return;
+            }
+
+            int partitionId = taskId.getPartitionId();
+            StagePartition partition = getStagePartition(partitionId);
+            exchange.sinkFinished(partition.getExchangeSinkHandle(), taskId.getAttemptId());
+            SpoolingOutputStats.Snapshot outputStats = partition.taskFinished(taskId);
+
+            if (!partition.isRunning()) {
+                runningPartitions.remove(partitionId);
+            }
+
+            if (!remainingPartitions.remove(partitionId)) {
+                // a different task for the same partition finished before
+                return;
+            }
+
+            updateOutputSize(outputStats);
+
+            partitionMemoryEstimator.registerPartitionFinished(
+                    partition.getMemoryRequirements(),
+                    taskStatus.getPeakMemoryReservation(),
+                    true,
+                    Optional.empty());
+
+            sinkOutputSelectorBuilder.include(exchange.getId(), taskId.getPartitionId(), taskId.getAttemptId());
+
+            if (noMorePartitions && remainingPartitions.isEmpty() && !stage.getState().isDone()) {
+                dynamicFilterService.stageCannotScheduleMoreTasks(stage.getStageId(), 0, partitions.size());
+                exchange.noMoreSinks();
+                exchange.allRequiredSinksFinished();
+                verify(finalSinkOutputSelector == null, "finalOutputSelector is already set");
+                sinkOutputSelectorBuilder.setPartitionCount(exchange.getId(), partitions.size());
+                sinkOutputSelectorBuilder.setFinal();
+                finalSinkOutputSelector = sinkOutputSelectorBuilder.build();
+                sinkOutputSelectorBuilder = null;
+                stage.finish();
+            }
+        }
+
+        private void updateOutputSize(SpoolingOutputStats.Snapshot taskOutputStats)
+        {
+            for (int partitionId = 0; partitionId < sinkPartitioningScheme.getPartitionCount(); partitionId++) {
+                long partitionSizeInBytes = taskOutputStats.getPartitionSizeInBytes(partitionId);
+                checkArgument(partitionSizeInBytes >= 0, "partitionSizeInBytes must be greater than or equal to zero: %s", partitionSizeInBytes);
+                outputDataSize[partitionId] += partitionSizeInBytes;
+            }
+        }
+
+        public List<PrioritizedScheduledTask> taskFailed(TaskId taskId, ExecutionFailureInfo failureInfo, TaskStatus taskStatus)
+        {
+            if (getState().isDone()) {
+                return ImmutableList.of();
+            }
+
+            int partitionId = taskId.getPartitionId();
+            StagePartition partition = getStagePartition(partitionId);
+            partition.taskFailed(taskId);
+
+            if (!partition.isRunning()) {
+                runningPartitions.remove(partitionId);
+            }
+
+            if (!remainingPartitions.contains(partitionId)) {
+                // another task for this partition finished successfully
+                return ImmutableList.of();
+            }
+
+            RuntimeException failure = failureInfo.toException();
+            ErrorCode errorCode = failureInfo.getErrorCode();
+            partitionMemoryEstimator.registerPartitionFinished(
+                    partition.getMemoryRequirements(),
+                    taskStatus.getPeakMemoryReservation(),
+                    false,
+                    Optional.ofNullable(errorCode));
+
+            // update memory limits for next attempt
+            MemoryRequirements currentMemoryLimits = partition.getMemoryRequirements();
+            MemoryRequirements newMemoryLimits = partitionMemoryEstimator.getNextRetryMemoryRequirements(
+                    partition.getMemoryRequirements(),
+                    taskStatus.getPeakMemoryReservation(),
+                    errorCode);
+            partition.setPostFailureMemoryRequirements(newMemoryLimits);
+            log.debug(
+                    "Computed next memory requirements for task from stage %s; previous=%s; new=%s; peak=%s; estimator=%s",
+                    stage.getStageId(),
+                    currentMemoryLimits,
+                    newMemoryLimits,
+                    taskStatus.getPeakMemoryReservation(),
+                    partitionMemoryEstimator);
+
+            if (errorCode != null && isOutOfMemoryError(errorCode) && newMemoryLimits.getRequiredMemory().toBytes() * 0.99 <= taskStatus.getPeakMemoryReservation().toBytes()) {
+                String message = format(
+                        "Cannot allocate enough memory for task %s. Reported peak memory reservation: %s. Maximum possible reservation: %s.",
+                        taskId,
+                        taskStatus.getPeakMemoryReservation(),
+                        newMemoryLimits.getRequiredMemory());
+                stage.fail(new TrinoException(() -> errorCode, message, failure));
+                return ImmutableList.of();
+            }
+
+            if (partition.getRemainingAttempts() == 0 || (errorCode != null && errorCode.getType() == USER_ERROR)) {
+                stage.fail(failure);
+                // stage failed, don't reschedule
+                return ImmutableList.of();
+            }
+
+            if (!partition.isSealed()) {
+                // don't reschedule speculative tasks
+                return ImmutableList.of();
+            }
+
+            // TODO[https://github.com/trinodb/trino/issues/18025]: split into smaller partitions here if necessary (for example if a task for a given partition failed with out of memory)
+
+            // reschedule a task
+            return ImmutableList.of(PrioritizedScheduledTask.create(stage.getStageId(), partitionId, schedulingPriority));
+        }
+
+        public MemoryRequirements getMemoryRequirements(int partitionId)
+        {
+            return getStagePartition(partitionId).getMemoryRequirements();
+        }
+
+        public Optional<NodeRequirements> getNodeRequirements(int partitionId)
+        {
+            return getStagePartition(partitionId).getNodeRequirements();
+        }
+
+        public Optional<OutputDataSizeEstimateResult> getOutputDataSize(Function<StageId, StageExecution> stageExecutionLookup, boolean parentEager)
+        {
+            if (stage.getState() == StageState.FINISHED) {
+                return Optional.of(new OutputDataSizeEstimateResult(
+                        new OutputDataSizeEstimate(ImmutableLongArray.copyOf(outputDataSize)), OutputDataSizeEstimateStatus.FINISHED));
+            }
+            return outputDataSizeEstimator.getEstimatedOutputDataSize(this, stageExecutionLookup, parentEager);
+        }
+
+        public boolean isSomeProgressMade()
+        {
+            return partitions.size() > 0 && remainingPartitions.size() < partitions.size();
+        }
+
+        public ExchangeSourceOutputSelector getSinkOutputSelector()
+        {
+            if (finalSinkOutputSelector != null) {
+                return finalSinkOutputSelector;
+            }
+            return sinkOutputSelectorBuilder.build();
+        }
+
+        public void setSourceOutputSelector(PlanFragmentId sourceFragmentId, ExchangeSourceOutputSelector selector)
+        {
+            sourceOutputSelectors.put(sourceFragmentId, selector);
+            RemoteSourceNode remoteSourceNode = remoteSources.get(sourceFragmentId);
+            verify(remoteSourceNode != null, "remoteSourceNode is null for fragment: %s", sourceFragmentId);
+            ExchangeSourceOutputSelector mergedSelector = selector;
+            for (PlanFragmentId fragmentId : remoteSourceNode.getSourceFragmentIds()) {
+                if (fragmentId.equals(sourceFragmentId)) {
+                    continue;
+                }
+                ExchangeSourceOutputSelector fragmentSelector = sourceOutputSelectors.get(fragmentId);
+                if (fragmentSelector != null) {
+                    mergedSelector = mergedSelector.merge(fragmentSelector);
+                }
+            }
+            ExchangeSourceOutputSelector finalMergedSelector = mergedSelector;
+            remainingPartitions.forEach((IntConsumer) value -> {
+                StagePartition partition = partitions.get(value);
+                verify(partition != null, "partition not found: %s", value);
+                partition.updateExchangeSourceOutputSelector(remoteSourceNode.getId(), finalMergedSelector);
+            });
+        }
+
+        public void abort()
+        {
+            Closer closer = createStageExecutionCloser();
+            closer.register(stage::abort);
+            try {
+                closer.close();
+            }
+            catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+
+        public void fail(Throwable t)
+        {
+            Closer closer = createStageExecutionCloser();
+            closer.register(() -> stage.fail(t));
+            try {
+                closer.close();
+            }
+            catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+            taskDescriptorLoadingComplete();
+        }
+
+        private Closer createStageExecutionCloser()
+        {
+            Closer closer = Closer.create();
+            closer.register(taskSource);
+            closer.register(this::closeExchange);
+            return closer;
+        }
+
+        private StagePartition getStagePartition(int partitionId)
+        {
+            StagePartition partition = partitions.get(partitionId);
+            checkState(partition != null, "partition with id %s does not exist in stage %s", partitionId, stage.getStageId());
+            return partition;
+        }
+
+        /**
+         * This returns current output data size as captured on internal long[] field.
+         * Returning internal mutable field is done due to performance reasons.
+         * It is not allowed for the caller to mutate contents of returned array.
+         */
+        public long[] currentOutputDataSize()
+        {
+            return outputDataSize;
+        }
+
+        public FaultTolerantPartitioningScheme getSinkPartitioningScheme()
+        {
+            return sinkPartitioningScheme;
+        }
+    }
+
+    private static class StagePartition
+    {
+        private final TaskDescriptorStorage taskDescriptorStorage;
+        private final StageId stageId;
+        private final int partitionId;
+        private final ExchangeSinkHandle exchangeSinkHandle;
+        private final Set<PlanNodeId> remoteSourceIds;
+
+        // empty when task descriptor is closed and stored in TaskDescriptorStorage
+        private Optional<OpenTaskDescriptor> openTaskDescriptor;
+        private MemoryRequirements memoryRequirements;
+        private boolean failureObserved;
+        private int remainingAttempts;
+
+        private final Map<TaskId, RemoteTask> tasks = new HashMap<>();
+        private final Map<TaskId, SpoolingOutputBuffers> taskOutputBuffers = new HashMap<>();
+        private final Set<TaskId> runningTasks = new HashSet<>();
+        private final Map<TaskId, NodeLease> taskNodeLeases = new HashMap<>();
+        private final Set<PlanNodeId> finalSelectors = new HashSet<>();
+        private final Set<PlanNodeId> noMoreSplits = new HashSet<>();
+        private boolean taskScheduled;
+        private boolean finished;
+
+        public StagePartition(
+                TaskDescriptorStorage taskDescriptorStorage,
+                StageId stageId,
+                int partitionId,
+                ExchangeSinkHandle exchangeSinkHandle,
+                Set<PlanNodeId> remoteSourceIds,
+                NodeRequirements nodeRequirements,
+                MemoryRequirements memoryRequirements,
+                int maxTaskExecutionAttempts)
+        {
+            this.taskDescriptorStorage = requireNonNull(taskDescriptorStorage, "taskDescriptorStorage is null");
+            this.stageId = requireNonNull(stageId, "stageId is null");
+            this.partitionId = partitionId;
+            this.exchangeSinkHandle = requireNonNull(exchangeSinkHandle, "exchangeSinkHandle is null");
+            this.remoteSourceIds = ImmutableSet.copyOf(requireNonNull(remoteSourceIds, "remoteSourceIds is null"));
+            requireNonNull(nodeRequirements, "nodeRequirements is null");
+            this.openTaskDescriptor = Optional.of(new OpenTaskDescriptor(SplitsMapping.EMPTY, ImmutableSet.of(), nodeRequirements));
+            this.memoryRequirements = requireNonNull(memoryRequirements, "memoryRequirements is null");
+            this.remainingAttempts = maxTaskExecutionAttempts;
+        }
+
+        public ExchangeSinkHandle getExchangeSinkHandle()
+        {
+            return exchangeSinkHandle;
+        }
+
+        public void addSplits(PlanNodeId planNodeId, ListMultimap<Integer, Split> splits, boolean noMoreSplits)
+        {
+            checkState(openTaskDescriptor.isPresent(), "openTaskDescriptor is empty");
+            openTaskDescriptor = Optional.of(openTaskDescriptor.get().update(planNodeId, splits, noMoreSplits));
+            if (noMoreSplits) {
+                this.noMoreSplits.add(planNodeId);
+            }
+            for (RemoteTask task : tasks.values()) {
+                task.addSplits(ImmutableListMultimap.<PlanNodeId, Split>builder()
+                        .putAll(planNodeId, splits.values())
+                        .build());
+                if (noMoreSplits && isFinalOutputSelectorDelivered(planNodeId)) {
+                    task.noMoreSplits(planNodeId);
+                }
+            }
+        }
+
+        private boolean isFinalOutputSelectorDelivered(PlanNodeId planNodeId)
+        {
+            if (!remoteSourceIds.contains(planNodeId)) {
+                // not a remote source; input selector concept not applicable
+                return true;
+            }
+            return finalSelectors.contains(planNodeId);
+        }
+
+        public void seal()
+        {
+            checkState(openTaskDescriptor.isPresent(), "openTaskDescriptor is empty");
+            TaskDescriptor taskDescriptor = openTaskDescriptor.get().createTaskDescriptor(partitionId);
+            openTaskDescriptor = Optional.empty();
+            // a task may finish before task descriptor is sealed
+            if (!finished) {
+                taskDescriptorStorage.put(stageId, taskDescriptor);
+
+                // update speculative flag for running tasks.
+                // Remote task is updated so we no longer prioritize non-longer speculative task if worker runs out of memory.
+                // Lease is updated as execution class plays a role in how NodeAllocator works.
+                for (TaskId runningTaskId : runningTasks) {
+                    RemoteTask runningTask = tasks.get(runningTaskId);
+                    runningTask.setSpeculative(false);
+                    taskNodeLeases.get(runningTaskId).setExecutionClass(STANDARD);
+                }
+            }
+        }
+
+        public SplitsMapping getSplits()
+        {
+            if (finished) {
+                return SplitsMapping.EMPTY;
+            }
+            return openTaskDescriptor.map(OpenTaskDescriptor::getSplits)
+                    .or(() -> taskDescriptorStorage.get(stageId, partitionId).map(TaskDescriptor::getSplits))
+                    // execution is finished
+                    .orElse(SplitsMapping.EMPTY);
+        }
+
+        public boolean isNoMoreSplits(PlanNodeId planNodeId)
+        {
+            if (finished) {
+                return true;
+            }
+            return openTaskDescriptor.map(taskDescriptor -> taskDescriptor.getNoMoreSplits().contains(planNodeId))
+                    // task descriptor is sealed, no more splits are expected
+                    .orElse(true);
+        }
+
+        public boolean isSealed()
+        {
+            return openTaskDescriptor.isEmpty();
+        }
+
+        /**
+         * Returns {@link Optional#empty()} when execution is finished
+         */
+        public Optional<NodeRequirements> getNodeRequirements()
+        {
+            if (finished) {
+                return Optional.empty();
+            }
+            if (openTaskDescriptor.isPresent()) {
+                return openTaskDescriptor.map(OpenTaskDescriptor::getNodeRequirements);
+            }
+            Optional<TaskDescriptor> taskDescriptor = taskDescriptorStorage.get(stageId, partitionId);
+            if (taskDescriptor.isPresent()) {
+                return taskDescriptor.map(TaskDescriptor::getNodeRequirements);
+            }
+            return Optional.empty();
+        }
+
+        public MemoryRequirements getMemoryRequirements()
+        {
+            return memoryRequirements;
+        }
+
+        public void updateInitialMemoryRequirements(MemoryRequirements memoryRequirements)
+        {
+            if (failureObserved && memoryRequirements.getRequiredMemory().toBytes() < this.memoryRequirements.getRequiredMemory().toBytes()) {
+                // If observed failure for this partition we are ignoring updated general initial memory requirements if those are smaller than current.
+                // Memory requirements for retry task will be based on statistics specific to this partition.
+                //
+                // Conservatively we still use updated memoryRequirements if they are larger than currently computed even if we
+                // observed failure for this partition.
+                return;
+            }
+
+            this.memoryRequirements = memoryRequirements;
+
+            // update memory requirements for running tasks (typically it should be just one)
+            for (TaskId runningTaskId : runningTasks) {
+                taskNodeLeases.get(runningTaskId).setMemoryRequirement(memoryRequirements.getRequiredMemory());
+            }
+        }
+
+        public void setPostFailureMemoryRequirements(MemoryRequirements memoryRequirements)
+        {
+            this.memoryRequirements = requireNonNull(memoryRequirements, "memoryRequirements is null");
+        }
+
+        public int getRemainingAttempts()
+        {
+            return remainingAttempts;
+        }
+
+        public void addTask(RemoteTask remoteTask, SpoolingOutputBuffers outputBuffers, NodeLease nodeLease)
+        {
+            TaskId taskId = remoteTask.getTaskId();
+            tasks.put(taskId, remoteTask);
+            taskOutputBuffers.put(taskId, outputBuffers);
+            taskNodeLeases.put(taskId, nodeLease);
+            runningTasks.add(taskId);
+        }
+
+        public SpoolingOutputStats.Snapshot taskFinished(TaskId taskId)
+        {
+            RemoteTask remoteTask = tasks.get(taskId);
+            checkArgument(remoteTask != null, "task not found: %s", taskId);
+            SpoolingOutputStats.Snapshot outputStats = remoteTask.retrieveAndDropSpoolingOutputStats();
+            runningTasks.remove(taskId);
+            tasks.values().forEach(RemoteTask::abort);
+            finished = true;
+            // task descriptor has been created
+            if (isSealed()) {
+                taskDescriptorStorage.remove(stageId, partitionId);
+            }
+            return outputStats;
+        }
+
+        public void taskFailed(TaskId taskId)
+        {
+            runningTasks.remove(taskId);
+            failureObserved = true;
+            remainingAttempts--;
+        }
+
+        public void updateExchangeSinkInstanceHandle(TaskId taskId, ExchangeSinkInstanceHandle handle)
+        {
+            SpoolingOutputBuffers outputBuffers = taskOutputBuffers.get(taskId);
+            checkArgument(outputBuffers != null, "output buffers not found: %s", taskId);
+            RemoteTask remoteTask = tasks.get(taskId);
+            checkArgument(remoteTask != null, "task not found: %s", taskId);
+            SpoolingOutputBuffers updatedOutputBuffers = outputBuffers.withExchangeSinkInstanceHandle(handle);
+            taskOutputBuffers.put(taskId, updatedOutputBuffers);
+            remoteTask.setOutputBuffers(updatedOutputBuffers);
+        }
+
+        public void updateExchangeSourceOutputSelector(PlanNodeId planNodeId, ExchangeSourceOutputSelector selector)
+        {
+            if (selector.isFinal()) {
+                finalSelectors.add(planNodeId);
+            }
+            for (TaskId taskId : runningTasks) {
+                RemoteTask task = tasks.get(taskId);
+                verify(task != null, "task is null: %s", taskId);
+                task.addSplits(ImmutableListMultimap.of(
+                        planNodeId,
+                        createOutputSelectorSplit(selector)));
+                if (selector.isFinal() && noMoreSplits.contains(planNodeId)) {
+                    task.noMoreSplits(planNodeId);
+                }
+            }
+        }
+
+        public boolean isRunning()
+        {
+            return !runningTasks.isEmpty();
+        }
+
+        public boolean isTaskScheduled()
+        {
+            return taskScheduled;
+        }
+
+        public void setTaskScheduled(boolean taskScheduled)
+        {
+            checkArgument(taskScheduled, "taskScheduled must be true");
+            this.taskScheduled = taskScheduled;
+        }
+
+        public boolean isFinished()
+        {
+            return finished;
+        }
+    }
+
+    private static Split createOutputSelectorSplit(ExchangeSourceOutputSelector selector)
+    {
+        return new Split(REMOTE_CATALOG_HANDLE, new RemoteSplit(new SpoolingExchangeInput(ImmutableList.of(), Optional.of(selector))));
+    }
+
+    private static class OpenTaskDescriptor
+    {
+        private final SplitsMapping splits;
+        private final Set<PlanNodeId> noMoreSplits;
+        private final NodeRequirements nodeRequirements;
+
+        private OpenTaskDescriptor(SplitsMapping splits, Set<PlanNodeId> noMoreSplits, NodeRequirements nodeRequirements)
+        {
+            this.splits = requireNonNull(splits, "splits is null");
+            this.noMoreSplits = ImmutableSet.copyOf(requireNonNull(noMoreSplits, "noMoreSplits is null"));
+            this.nodeRequirements = requireNonNull(nodeRequirements, "nodeRequirements is null");
+        }
+
+        private static Map<PlanNodeId, ListMultimap<Integer, Split>> copySplits(Map<PlanNodeId, ListMultimap<Integer, Split>> splits)
+        {
+            ImmutableMap.Builder<PlanNodeId, ListMultimap<Integer, Split>> splitsBuilder = ImmutableMap.builder();
+            splits.forEach((planNodeId, planNodeSplits) -> splitsBuilder.put(planNodeId, ImmutableListMultimap.copyOf(planNodeSplits)));
+            return splitsBuilder.buildOrThrow();
+        }
+
+        public SplitsMapping getSplits()
+        {
+            return splits;
+        }
+
+        public Set<PlanNodeId> getNoMoreSplits()
+        {
+            return noMoreSplits;
+        }
+
+        public NodeRequirements getNodeRequirements()
+        {
+            return nodeRequirements;
+        }
+
+        public OpenTaskDescriptor update(PlanNodeId planNodeId, ListMultimap<Integer, Split> splits, boolean noMoreSplits)
+        {
+            SplitsMapping.Builder updatedSplitsMapping = SplitsMapping.builder(this.splits);
+
+            for (Map.Entry<Integer, List<Split>> entry : Multimaps.asMap(splits).entrySet()) {
+                Integer sourcePartition = entry.getKey();
+                List<Split> partitionSplits = entry.getValue();
+                updatedSplitsMapping.addSplits(planNodeId, sourcePartition, partitionSplits);
+            }
+
+            Set<PlanNodeId> updatedNoMoreSplits = this.noMoreSplits;
+            if (noMoreSplits && !updatedNoMoreSplits.contains(planNodeId)) {
+                updatedNoMoreSplits = ImmutableSet.<PlanNodeId>builder()
+                        .addAll(this.noMoreSplits)
+                        .add(planNodeId)
+                        .build();
+            }
+            return new OpenTaskDescriptor(
+                    updatedSplitsMapping.build(),
+                    updatedNoMoreSplits,
+                    nodeRequirements);
+        }
+
+        public TaskDescriptor createTaskDescriptor(int partitionId)
+        {
+            Set<PlanNodeId> missingNoMoreSplits = Sets.difference(splits.getPlanNodeIds(), noMoreSplits);
+            checkState(missingNoMoreSplits.isEmpty(), "missing no more splits for plan nodes: %s", missingNoMoreSplits);
+            return new TaskDescriptor(
+                    partitionId,
+                    splits,
+                    nodeRequirements);
+        }
+    }
+
+    private record ScheduledTask(StageId stageId, int partitionId)
+    {
+        private ScheduledTask
+        {
+            requireNonNull(stageId, "stageId is null");
+            checkArgument(partitionId >= 0, "partitionId must be greater than or equal to zero: %s", partitionId);
+        }
+    }
+
+    private record PrioritizedScheduledTask(ScheduledTask task, TaskExecutionClass executionClass, int priority)
+    {
+        private PrioritizedScheduledTask
+        {
+            requireNonNull(task, "task is null");
+            requireNonNull(executionClass, "executionClass is null");
+            checkArgument(priority >= 0, "priority must be greater than or equal to zero: %s", priority);
+        }
+
+        public static PrioritizedScheduledTask create(StageId stageId, int partitionId, int priority)
+        {
+            return new PrioritizedScheduledTask(new ScheduledTask(stageId, partitionId), STANDARD, priority);
+        }
+
+        public static PrioritizedScheduledTask createSpeculative(StageId stageId, int partitionId, int priority, boolean eager)
+        {
+            return new PrioritizedScheduledTask(new ScheduledTask(stageId, partitionId), eager ? EAGER_SPECULATIVE : SPECULATIVE, priority);
+        }
+
+        public TaskExecutionClass getExecutionClass()
+        {
+            return executionClass;
+        }
+
+        @Override
+        public String toString()
+        {
+            return task.stageId() + "/" + task.partitionId() + "[" + executionClass + "/" + priority + "]";
+        }
+    }
+
+    private static class SchedulingQueue
+    {
+        private final Map<TaskExecutionClass, IndexedPriorityQueue<ScheduledTask>> queues;
+
+        public boolean isEmpty()
+        {
+            return queues.values().stream().allMatch(IndexedPriorityQueue::isEmpty);
+        }
+
+        private int getTaskCount(TaskExecutionClass executionClass)
+        {
+            return queues.get(executionClass).size();
+        }
+
+        public SchedulingQueue()
+        {
+            this.queues = ImmutableMap.<TaskExecutionClass, IndexedPriorityQueue<ScheduledTask>>builder()
+                    .put(STANDARD, new IndexedPriorityQueue<>(LOW_TO_HIGH))
+                    .put(SPECULATIVE, new IndexedPriorityQueue<>(LOW_TO_HIGH))
+                    .put(EAGER_SPECULATIVE, new IndexedPriorityQueue<>(LOW_TO_HIGH))
+                    .buildOrThrow();
+        }
+
+        public PrioritizedScheduledTask pollOrThrow(TaskExecutionClass executionClass)
+        {
+            IndexedPriorityQueue.Prioritized<ScheduledTask> task = queues.get(executionClass).pollPrioritized();
+            checkState(task != null, "queue for %s is empty", executionClass);
+            return getPrioritizedTask(executionClass, task);
+        }
+
+        public void addOrUpdate(PrioritizedScheduledTask prioritizedTask)
+        {
+            queues.values().forEach(queue -> queue.remove(prioritizedTask.task()));
+            queues.get(prioritizedTask.getExecutionClass()).addOrUpdate(prioritizedTask.task(), prioritizedTask.priority());
+        }
+
+        private static PrioritizedScheduledTask getPrioritizedTask(TaskExecutionClass executionClass, IndexedPriorityQueue.Prioritized<ScheduledTask> task)
+        {
+            return new PrioritizedScheduledTask(task.getValue(), executionClass, toIntExact(task.getPriority()));
+        }
+    }
+
+    private static class SchedulingDelayer
+    {
+        private final long minRetryDelayInMillis;
+        private final long maxRetryDelayInMillis;
+        private final double retryDelayScaleFactor;
+        private final Stopwatch stopwatch;
+
+        private long currentDelayInMillis;
+
+        private SchedulingDelayer(Duration minRetryDelay, Duration maxRetryDelay, double retryDelayScaleFactor, Stopwatch stopwatch)
+        {
+            this.minRetryDelayInMillis = requireNonNull(minRetryDelay, "minRetryDelay is null").toMillis();
+            this.maxRetryDelayInMillis = requireNonNull(maxRetryDelay, "maxRetryDelay is null").toMillis();
+            checkArgument(retryDelayScaleFactor >= 1, "retryDelayScaleFactor is expected to be greater than or equal to 1: %s", retryDelayScaleFactor);
+            this.retryDelayScaleFactor = retryDelayScaleFactor;
+            this.stopwatch = requireNonNull(stopwatch, "stopwatch is null");
+        }
+
+        public void startOrProlongDelayIfNecessary()
+        {
+            if (stopwatch.isRunning()) {
+                if (stopwatch.elapsed(MILLISECONDS) > currentDelayInMillis) {
+                    // we are past previous delay period and still getting failures; let's make it longer
+                    stopwatch.reset().start();
+                    currentDelayInMillis = min(round(currentDelayInMillis * retryDelayScaleFactor), maxRetryDelayInMillis);
+                }
+            }
+            else {
+                // initialize delaying of tasks scheduling
+                stopwatch.start();
+                currentDelayInMillis = minRetryDelayInMillis;
+            }
+        }
+
+        public long getRemainingDelayInMillis()
+        {
+            if (stopwatch.isRunning()) {
+                return max(0, currentDelayInMillis - stopwatch.elapsed(MILLISECONDS));
+            }
+            return 0;
+        }
+    }
+
+    private interface Event
+    {
+        Event ABORT = listener -> {
+            throw new UnsupportedOperationException();
+        };
+
+        Event WAKE_UP = listener -> {
+            throw new UnsupportedOperationException();
+        };
+
+        void accept(EventListener listener);
+    }
+
+    private interface EventListener
+    {
+        void onRemoteTaskCompleted(RemoteTaskCompletedEvent event);
+
+        void onRemoteTaskExchangeSinkUpdateRequired(RemoteTaskExchangeSinkUpdateRequiredEvent event);
+
+        void onRemoteTaskExchangeUpdatedSinkAcquired(RemoteTaskExchangeUpdatedSinkAcquired event);
+
+        void onSplitAssignment(SplitAssignmentEvent event);
+
+        void onStageFailure(StageFailureEvent event);
+
+        void onSinkInstanceHandleAcquired(SinkInstanceHandleAcquiredEvent sinkInstanceHandleAcquiredEvent);
+    }
+
+    private static class SinkInstanceHandleAcquiredEvent
+            implements Event
+    {
+        private final StageId stageId;
+        private final int partitionId;
+        private final NodeLease nodeLease;
+        private final int attempt;
+        private final ExchangeSinkInstanceHandle sinkInstanceHandle;
+
+        public SinkInstanceHandleAcquiredEvent(StageId stageId, int partitionId, NodeLease nodeLease, int attempt, ExchangeSinkInstanceHandle sinkInstanceHandle)
+        {
+            this.stageId = requireNonNull(stageId, "stageId is null");
+            this.partitionId = partitionId;
+            this.nodeLease = requireNonNull(nodeLease, "nodeLease is null");
+            this.attempt = attempt;
+            this.sinkInstanceHandle = requireNonNull(sinkInstanceHandle, "sinkInstanceHandle is null");
+        }
+
+        public StageId getStageId()
+        {
+            return stageId;
+        }
+
+        public int getPartitionId()
+        {
+            return partitionId;
+        }
+
+        public NodeLease getNodeLease()
+        {
+            return nodeLease;
+        }
+
+        public int getAttempt()
+        {
+            return attempt;
+        }
+
+        public ExchangeSinkInstanceHandle getSinkInstanceHandle()
+        {
+            return sinkInstanceHandle;
+        }
+
+        @Override
+        public void accept(EventListener listener)
+        {
+            listener.onSinkInstanceHandleAcquired(this);
+        }
+    }
+
+    private static class RemoteTaskCompletedEvent
+            extends RemoteTaskEvent
+    {
+        public RemoteTaskCompletedEvent(TaskStatus taskStatus)
+        {
+            super(taskStatus);
+        }
+
+        @Override
+        public void accept(EventListener listener)
+        {
+            listener.onRemoteTaskCompleted(this);
+        }
+    }
+
+    private static class RemoteTaskExchangeSinkUpdateRequiredEvent
+            extends RemoteTaskEvent
+    {
+        protected RemoteTaskExchangeSinkUpdateRequiredEvent(TaskStatus taskStatus)
+        {
+            super(taskStatus);
+        }
+
+        @Override
+        public void accept(EventListener listener)
+        {
+            listener.onRemoteTaskExchangeSinkUpdateRequired(this);
+        }
+    }
+
+    private static class RemoteTaskExchangeUpdatedSinkAcquired
+            implements Event
+    {
+        private final TaskId taskId;
+        private final ExchangeSinkInstanceHandle exchangeSinkInstanceHandle;
+
+        private RemoteTaskExchangeUpdatedSinkAcquired(TaskId taskId, ExchangeSinkInstanceHandle exchangeSinkInstanceHandle)
+        {
+            this.taskId = requireNonNull(taskId, "taskId is null");
+            this.exchangeSinkInstanceHandle = requireNonNull(exchangeSinkInstanceHandle, "exchangeSinkInstanceHandle is null");
+        }
+
+        @Override
+        public void accept(EventListener listener)
+        {
+            listener.onRemoteTaskExchangeUpdatedSinkAcquired(this);
+        }
+
+        public TaskId getTaskId()
+        {
+            return taskId;
+        }
+
+        public ExchangeSinkInstanceHandle getExchangeSinkInstanceHandle()
+        {
+            return exchangeSinkInstanceHandle;
+        }
+    }
+
+    private abstract static class RemoteTaskEvent
+            implements Event
+    {
+        private final TaskStatus taskStatus;
+
+        protected RemoteTaskEvent(TaskStatus taskStatus)
+        {
+            this.taskStatus = requireNonNull(taskStatus, "taskStatus is null");
+        }
+
+        public TaskStatus getTaskStatus()
+        {
+            return taskStatus;
+        }
+    }
+
+    private static class SplitAssignmentEvent
+            extends StageEvent
+    {
+        private final AssignmentResult assignmentResult;
+
+        public SplitAssignmentEvent(StageId stageId, AssignmentResult assignmentResult)
+        {
+            super(stageId);
+            this.assignmentResult = requireNonNull(assignmentResult, "assignmentResult is null");
+        }
+
+        public AssignmentResult getAssignmentResult()
+        {
+            return assignmentResult;
+        }
+
+        @Override
+        public void accept(EventListener listener)
+        {
+            listener.onSplitAssignment(this);
+        }
+    }
+
+    private static class StageFailureEvent
+            extends StageEvent
+    {
+        private final Throwable failure;
+
+        public StageFailureEvent(StageId stageId, Throwable failure)
+        {
+            super(stageId);
+            this.failure = requireNonNull(failure, "failure is null");
+        }
+
+        public Throwable getFailure()
+        {
+            return failure;
+        }
+
+        @Override
+        public void accept(EventListener listener)
+        {
+            listener.onStageFailure(this);
+        }
+    }
+
+    private abstract static class StageEvent
+            implements Event
+    {
+        private final StageId stageId;
+
+        protected StageEvent(StageId stageId)
+        {
+            this.stageId = requireNonNull(stageId, "stageId is null");
+        }
+
+        public StageId getStageId()
+        {
+            return stageId;
+        }
+    }
+
+    private record GetExchangeSinkInstanceHandleResult(CompletableFuture<ExchangeSinkInstanceHandle> exchangeSinkInstanceHandleFuture, int attempt)
+    {
+        public GetExchangeSinkInstanceHandleResult
+        {
+            requireNonNull(exchangeSinkInstanceHandleFuture, "exchangeSinkInstanceHandleFuture is null");
+        }
+    }
+
+    private static class PreSchedulingTaskContext
+    {
+        private final NodeLease nodeLease;
+        private TaskExecutionClass executionClass;
+        private boolean waitingForSinkInstanceHandle;
+
+        public PreSchedulingTaskContext(NodeLease nodeLease, TaskExecutionClass executionClass)
+        {
+            this.nodeLease = requireNonNull(nodeLease, "nodeLease is null");
+            this.executionClass = requireNonNull(executionClass, "executionClass is null");
+        }
+
+        public NodeLease getNodeLease()
+        {
+            return nodeLease;
+        }
+
+        public TaskExecutionClass getExecutionClass()
+        {
+            return executionClass;
+        }
+
+        public void setExecutionClass(TaskExecutionClass executionClass)
+        {
+            checkArgument(this.executionClass.canTransitionTo(executionClass), "cannot change execution class from %s to %s", this.executionClass, executionClass);
+            this.executionClass = executionClass;
+        }
+
+        public boolean isWaitingForSinkInstanceHandle()
+        {
+            return waitingForSinkInstanceHandle;
+        }
+
+        public void setWaitingForSinkInstanceHandle(boolean waitingForSinkInstanceHandle)
+        {
+            this.waitingForSinkInstanceHandle = waitingForSinkInstanceHandle;
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSource.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSource.java
similarity index 98%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSource.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSource.java
index 0f9b06d5236a..d6e6d74582f8 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSource.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSource.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -24,10 +24,12 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.exchange.SpoolingExchangeInput;
 import io.trino.execution.TableExecuteContext;
 import io.trino.execution.TableExecuteContextManager;
-import io.trino.execution.scheduler.SplitAssigner.AssignmentResult;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.AssignmentResult;
 import io.trino.metadata.Split;
 import io.trino.spi.QueryId;
 import io.trino.spi.connector.CatalogHandle;
@@ -41,9 +43,6 @@
 import io.trino.sql.planner.plan.PlanFragmentId;
 import io.trino.sql.planner.plan.PlanNodeId;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSourceFactory.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSourceFactory.java
similarity index 94%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSourceFactory.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSourceFactory.java
index 2ea724d34985..9b3867875f62 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSourceFactory.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSourceFactory.java
@@ -11,14 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
+import com.google.inject.Inject;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.execution.ForQueryExecution;
 import io.trino.execution.QueryManagerConfig;
 import io.trino.execution.TableExecuteContextManager;
+import io.trino.execution.scheduler.OutputDataSizeEstimate;
 import io.trino.metadata.InternalNodeManager;
 import io.trino.spi.HostAddress;
 import io.trino.spi.Node;
@@ -32,8 +35,6 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.planner.plan.RemoteSourceNode;
 
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executor;
@@ -52,8 +53,10 @@
 import static io.trino.SystemSessionProperties.getFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeMax;
 import static io.trino.SystemSessionProperties.getFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeMin;
 import static io.trino.SystemSessionProperties.getFaultTolerantExecutionHashDistributionComputeTaskTargetSize;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio;
 import static io.trino.SystemSessionProperties.getFaultTolerantExecutionHashDistributionWriteTaskTargetMaxCount;
 import static io.trino.SystemSessionProperties.getFaultTolerantExecutionHashDistributionWriteTaskTargetSize;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio;
 import static io.trino.SystemSessionProperties.getFaultTolerantExecutionMaxTaskSplitCount;
 import static io.trino.SystemSessionProperties.getFaultTolerantExecutionStandardSplitSize;
 import static io.trino.sql.planner.SystemPartitioningHandle.COORDINATOR_DISTRIBUTION;
@@ -64,6 +67,8 @@
 import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
 import static io.trino.sql.planner.SystemPartitioningHandle.SOURCE_DISTRIBUTION;
 import static io.trino.sql.planner.plan.ExchangeNode.Type.REPLICATE;
+import static java.lang.Math.round;
+import static java.lang.StrictMath.toIntExact;
 import static java.util.Objects.requireNonNull;
 
 public class EventDrivenTaskSourceFactory
@@ -106,6 +111,7 @@ public EventDrivenTaskSourceFactory(
 
     public EventDrivenTaskSource create(
             Session session,
+            Span stageSpan,
             PlanFragment fragment,
             Map<PlanFragmentId, Exchange> sourceExchanges,
             FaultTolerantPartitioningScheme sourcePartitioningScheme,
@@ -125,7 +131,7 @@ public EventDrivenTaskSource create(
                 tableExecuteContextManager,
                 sourceExchanges,
                 remoteSources.build(),
-                () -> splitSourceFactory.createSplitSources(session, fragment),
+                () -> splitSourceFactory.createSplitSources(session, stageSpan, fragment),
                 createSplitAssigner(
                         session,
                         fragment,
@@ -230,6 +236,7 @@ private SplitAssigner createSplitAssigner(
                     outputDataSizeEstimates,
                     fragment,
                     getFaultTolerantExecutionHashDistributionComputeTaskTargetSize(session).toBytes(),
+                    toIntExact(round(getFaultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio(session) * nodeManager.getAllNodes().getActiveNodes().size())),
                     Integer.MAX_VALUE); // compute tasks are bounded by the number of partitions anyways
         }
         if (partitioning.equals(SCALED_WRITER_HASH_DISTRIBUTION)) {
@@ -241,6 +248,7 @@ private SplitAssigner createSplitAssigner(
                     outputDataSizeEstimates,
                     fragment,
                     getFaultTolerantExecutionHashDistributionWriteTaskTargetSize(session).toBytes(),
+                    toIntExact(round(getFaultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio(session) * nodeManager.getAllNodes().getActiveNodes().size())),
                     getFaultTolerantExecutionHashDistributionWriteTaskTargetMaxCount(session));
         }
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ExponentialGrowthPartitionMemoryEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ExponentialGrowthPartitionMemoryEstimator.java
new file mode 100644
index 000000000000..4d92ba20d77f
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ExponentialGrowthPartitionMemoryEstimator.java
@@ -0,0 +1,245 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.collect.Ordering;
+import com.google.inject.Inject;
+import io.airlift.log.Logger;
+import io.airlift.stats.TDigest;
+import io.airlift.units.DataSize;
+import io.trino.Session;
+import io.trino.memory.ClusterMemoryManager;
+import io.trino.memory.MemoryInfo;
+import io.trino.memory.MemoryManagerConfig;
+import io.trino.spi.ErrorCode;
+import io.trino.spi.memory.MemoryPoolInfo;
+import io.trino.sql.planner.PlanFragment;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import org.assertj.core.util.VisibleForTesting;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionDefaultCoordinatorTaskMemory;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionDefaultTaskMemory;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionTaskMemoryEstimationQuantile;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionTaskMemoryGrowthFactor;
+import static io.trino.execution.scheduler.ErrorCodes.isOutOfMemoryError;
+import static io.trino.execution.scheduler.ErrorCodes.isWorkerCrashAssociatedError;
+import static io.trino.sql.planner.SystemPartitioningHandle.COORDINATOR_DISTRIBUTION;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
+
+public class ExponentialGrowthPartitionMemoryEstimator
+        implements PartitionMemoryEstimator
+{
+    public static class Factory
+            implements PartitionMemoryEstimatorFactory
+    {
+        private static final Logger log = Logger.get(Factory.class);
+
+        private final Supplier<Map<String, Optional<MemoryInfo>>> workerMemoryInfoSupplier;
+        private final boolean memoryRequirementIncreaseOnWorkerCrashEnabled;
+        private final ScheduledExecutorService executor = newSingleThreadScheduledExecutor();
+        private final AtomicReference<Optional<DataSize>> maxNodePoolSize = new AtomicReference<>(Optional.empty());
+
+        @Inject
+        public Factory(
+                ClusterMemoryManager clusterMemoryManager,
+                MemoryManagerConfig memoryManagerConfig)
+        {
+            this(
+                    clusterMemoryManager::getWorkerMemoryInfo,
+                    memoryManagerConfig.isFaultTolerantExecutionMemoryRequirementIncreaseOnWorkerCrashEnabled());
+        }
+
+        @VisibleForTesting
+        Factory(
+                Supplier<Map<String, Optional<MemoryInfo>>> workerMemoryInfoSupplier,
+                boolean memoryRequirementIncreaseOnWorkerCrashEnabled)
+        {
+            this.workerMemoryInfoSupplier = requireNonNull(workerMemoryInfoSupplier, "workerMemoryInfoSupplier is null");
+            this.memoryRequirementIncreaseOnWorkerCrashEnabled = memoryRequirementIncreaseOnWorkerCrashEnabled;
+        }
+
+        @PostConstruct
+        public void start()
+        {
+            refreshNodePoolMemoryInfos();
+            executor.scheduleWithFixedDelay(() -> {
+                try {
+                    refreshNodePoolMemoryInfos();
+                }
+                catch (Throwable e) {
+                    // ignore to avoid getting unscheduled
+                    log.error(e, "Unexpected error while refreshing node pool memory infos");
+                }
+            }, 1, 1, TimeUnit.SECONDS);
+        }
+
+        @PreDestroy
+        public void stop()
+        {
+            executor.shutdownNow();
+        }
+
+        @VisibleForTesting
+        void refreshNodePoolMemoryInfos()
+        {
+            Map<String, Optional<MemoryInfo>> workerMemoryInfos = workerMemoryInfoSupplier.get();
+            long maxNodePoolSizeBytes = -1;
+            for (Map.Entry<String, Optional<MemoryInfo>> entry : workerMemoryInfos.entrySet()) {
+                if (entry.getValue().isEmpty()) {
+                    continue;
+                }
+                MemoryPoolInfo poolInfo = entry.getValue().get().getPool();
+                maxNodePoolSizeBytes = Math.max(poolInfo.getMaxBytes(), maxNodePoolSizeBytes);
+            }
+            maxNodePoolSize.set(maxNodePoolSizeBytes == -1 ? Optional.empty() : Optional.of(DataSize.ofBytes(maxNodePoolSizeBytes)));
+        }
+
+        @Override
+        public PartitionMemoryEstimator createPartitionMemoryEstimator(
+                Session session,
+                PlanFragment planFragment,
+                Function<PlanFragmentId, PlanFragment> sourceFragmentLookup)
+        {
+            DataSize defaultInitialMemoryLimit = planFragment.getPartitioning().equals(COORDINATOR_DISTRIBUTION) ?
+                    getFaultTolerantExecutionDefaultCoordinatorTaskMemory(session) :
+                    getFaultTolerantExecutionDefaultTaskMemory(session);
+
+            return new ExponentialGrowthPartitionMemoryEstimator(
+                    defaultInitialMemoryLimit,
+                    memoryRequirementIncreaseOnWorkerCrashEnabled,
+                    getFaultTolerantExecutionTaskMemoryGrowthFactor(session),
+                    getFaultTolerantExecutionTaskMemoryEstimationQuantile(session),
+                    maxNodePoolSize::get);
+        }
+    }
+
+    private final DataSize defaultInitialMemoryLimit;
+    private final boolean memoryRequirementIncreaseOnWorkerCrashEnabled;
+    private final double growthFactor;
+    private final double estimationQuantile;
+
+    private final Supplier<Optional<DataSize>> maxNodePoolSizeSupplier;
+    private final TDigest memoryUsageDistribution = new TDigest();
+
+    private ExponentialGrowthPartitionMemoryEstimator(
+            DataSize defaultInitialMemoryLimit,
+            boolean memoryRequirementIncreaseOnWorkerCrashEnabled,
+            double growthFactor,
+            double estimationQuantile,
+            Supplier<Optional<DataSize>> maxNodePoolSizeSupplier)
+    {
+        this.defaultInitialMemoryLimit = requireNonNull(defaultInitialMemoryLimit, "defaultInitialMemoryLimit is null");
+        this.memoryRequirementIncreaseOnWorkerCrashEnabled = memoryRequirementIncreaseOnWorkerCrashEnabled;
+        this.growthFactor = growthFactor;
+        this.estimationQuantile = estimationQuantile;
+        this.maxNodePoolSizeSupplier = requireNonNull(maxNodePoolSizeSupplier, "maxNodePoolSizeSupplier is null");
+    }
+
+    @Override
+    public MemoryRequirements getInitialMemoryRequirements()
+    {
+        DataSize memory = Ordering.natural().max(defaultInitialMemoryLimit, getEstimatedMemoryUsage());
+        memory = capMemoryToMaxNodeSize(memory);
+        return new MemoryRequirements(memory);
+    }
+
+    @Override
+    public MemoryRequirements getNextRetryMemoryRequirements(MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, ErrorCode errorCode)
+    {
+        DataSize previousMemory = previousMemoryRequirements.getRequiredMemory();
+
+        // start with the maximum of previously used memory and actual usage
+        DataSize newMemory = Ordering.natural().max(peakMemoryUsage, previousMemory);
+        if (shouldIncreaseMemoryRequirement(errorCode)) {
+            // multiply if we hit an oom error
+
+            newMemory = DataSize.of((long) (newMemory.toBytes() * growthFactor), DataSize.Unit.BYTE);
+        }
+
+        // if we are still below current estimate for new partition let's bump further
+        newMemory = Ordering.natural().max(newMemory, getEstimatedMemoryUsage());
+
+        newMemory = capMemoryToMaxNodeSize(newMemory);
+        return new MemoryRequirements(newMemory);
+    }
+
+    private DataSize capMemoryToMaxNodeSize(DataSize memory)
+    {
+        Optional<DataSize> currentMaxNodePoolSize = maxNodePoolSizeSupplier.get();
+        if (currentMaxNodePoolSize.isEmpty()) {
+            return memory;
+        }
+        return Ordering.natural().min(memory, currentMaxNodePoolSize.get());
+    }
+
+    @Override
+    public synchronized void registerPartitionFinished(MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, boolean success, Optional<ErrorCode> errorCode)
+    {
+        if (success) {
+            memoryUsageDistribution.add(peakMemoryUsage.toBytes());
+        }
+        if (!success && errorCode.isPresent() && shouldIncreaseMemoryRequirement(errorCode.get())) {
+            // take previousRequiredBytes into account when registering failure on oom. It is conservative hence safer (and in-line with getNextRetryMemoryRequirements)
+            long previousRequiredBytes = previousMemoryRequirements.getRequiredMemory().toBytes();
+            long previousPeakBytes = peakMemoryUsage.toBytes();
+            memoryUsageDistribution.add(Math.max(previousRequiredBytes, previousPeakBytes) * growthFactor);
+        }
+    }
+
+    private synchronized DataSize getEstimatedMemoryUsage()
+    {
+        double estimation = memoryUsageDistribution.valueAt(estimationQuantile);
+        if (Double.isNaN(estimation)) {
+            return DataSize.ofBytes(0);
+        }
+        return DataSize.ofBytes((long) estimation);
+    }
+
+    private String memoryUsageDistributionInfo()
+    {
+        double[] quantiles = new double[] {0.01, 0.05, 0.1, 0.2, 0.5, 0.8, 0.9, 0.95, 0.99};
+        double[] values;
+        synchronized (this) {
+            values = memoryUsageDistribution.valuesAt(quantiles);
+        }
+
+        return IntStream.range(0, quantiles.length)
+                .mapToObj(i -> "" + quantiles[i] + "=" + values[i])
+                .collect(Collectors.joining(", ", "[", "]"));
+    }
+
+    @Override
+    public String toString()
+    {
+        return "memoryUsageDistribution=" + memoryUsageDistributionInfo();
+    }
+
+    private boolean shouldIncreaseMemoryRequirement(ErrorCode errorCode)
+    {
+        return isOutOfMemoryError(errorCode) || (memoryRequirementIncreaseOnWorkerCrashEnabled && isWorkerCrashAssociatedError(errorCode));
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningScheme.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningScheme.java
similarity index 91%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningScheme.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningScheme.java
index 5344b2207cc3..d64cae61d71f 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningScheme.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningScheme.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
@@ -94,4 +94,13 @@ public Optional<List<InternalNode>> getPartitionToNodeMap()
     {
         return partitionToNodeMap;
     }
+
+    public FaultTolerantPartitioningScheme withPartitionCount(int partitionCount)
+    {
+        return new FaultTolerantPartitioningScheme(
+                partitionCount,
+                this.bucketToPartitionMap,
+                this.splitToBucketFunction,
+                this.partitionToNodeMap);
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningSchemeFactory.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningSchemeFactory.java
similarity index 84%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningSchemeFactory.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningSchemeFactory.java
index 0f6bad247b2b..d81a4f3195ed 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningSchemeFactory.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningSchemeFactory.java
@@ -11,10 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.collect.ImmutableList;
 import io.trino.Session;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.metadata.InternalNode;
 import io.trino.metadata.Split;
 import io.trino.spi.Node;
@@ -23,8 +24,6 @@
 import io.trino.sql.planner.NodePartitioningManager;
 import io.trino.sql.planner.PartitioningHandle;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -42,43 +41,49 @@ public class FaultTolerantPartitioningSchemeFactory
 {
     private final NodePartitioningManager nodePartitioningManager;
     private final Session session;
-    private final int partitionCount;
+    private final int maxPartitionCount;
 
     private final Map<PartitioningHandle, FaultTolerantPartitioningScheme> cache = new HashMap<>();
 
-    public FaultTolerantPartitioningSchemeFactory(NodePartitioningManager nodePartitioningManager, Session session, int partitionCount)
+    public FaultTolerantPartitioningSchemeFactory(NodePartitioningManager nodePartitioningManager, Session session, int maxPartitionCount)
     {
         this.nodePartitioningManager = requireNonNull(nodePartitioningManager, "nodePartitioningManager is null");
         this.session = requireNonNull(session, "session is null");
-        this.partitionCount = partitionCount;
+        this.maxPartitionCount = maxPartitionCount;
     }
 
-    public FaultTolerantPartitioningScheme get(PartitioningHandle handle)
+    public FaultTolerantPartitioningScheme get(PartitioningHandle handle, Optional<Integer> partitionCount)
     {
         FaultTolerantPartitioningScheme result = cache.get(handle);
         if (result == null) {
             // Avoid using computeIfAbsent as the "get" method is called recursively from the "create" method
-            result = create(handle);
+            result = create(handle, partitionCount);
             cache.put(handle, result);
         }
+        else if (partitionCount.isPresent()) {
+            // With runtime adaptive partitioning, it's no longer guaranteed that the same handle will always map to
+            // the same partition count. Therefore, use the supplied `partitionCount` as the source of truth.
+            result = result.withPartitionCount(partitionCount.get());
+        }
+
         return result;
     }
 
-    private FaultTolerantPartitioningScheme create(PartitioningHandle partitioningHandle)
+    private FaultTolerantPartitioningScheme create(PartitioningHandle partitioningHandle, Optional<Integer> partitionCount)
     {
         if (partitioningHandle.getConnectorHandle() instanceof MergePartitioningHandle mergePartitioningHandle) {
-            return mergePartitioningHandle.getFaultTolerantPartitioningScheme(this::get);
+            return mergePartitioningHandle.getFaultTolerantPartitioningScheme(handle -> this.get(handle, partitionCount));
         }
         if (partitioningHandle.equals(FIXED_HASH_DISTRIBUTION) || partitioningHandle.equals(SCALED_WRITER_HASH_DISTRIBUTION)) {
-            return createSystemSchema(partitionCount);
+            return createSystemSchema(partitionCount.orElse(maxPartitionCount));
         }
         if (partitioningHandle.getCatalogHandle().isPresent()) {
             Optional<ConnectorBucketNodeMap> connectorBucketNodeMap = nodePartitioningManager.getConnectorBucketNodeMap(session, partitioningHandle);
             if (connectorBucketNodeMap.isEmpty()) {
-                return createSystemSchema(partitionCount);
+                return createSystemSchema(partitionCount.orElse(maxPartitionCount));
             }
             ToIntFunction<Split> splitToBucket = nodePartitioningManager.getSplitToBucket(session, partitioningHandle);
-            return createConnectorSpecificSchema(partitionCount, connectorBucketNodeMap.get(), splitToBucket);
+            return createConnectorSpecificSchema(partitionCount.orElse(maxPartitionCount), connectorBucketNodeMap.get(), splitToBucket);
         }
         return new FaultTolerantPartitioningScheme(1, Optional.empty(), Optional.empty(), Optional.empty());
     }
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/HashDistributionSplitAssigner.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/HashDistributionSplitAssigner.java
similarity index 81%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/HashDistributionSplitAssigner.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/HashDistributionSplitAssigner.java
index 254c25162124..db0e693e0fd6 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/HashDistributionSplitAssigner.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/HashDistributionSplitAssigner.java
@@ -11,14 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ListMultimap;
+import io.trino.execution.scheduler.OutputDataSizeEstimate;
 import io.trino.metadata.InternalNode;
 import io.trino.metadata.Split;
 import io.trino.spi.HostAddress;
@@ -56,28 +58,28 @@ class HashDistributionSplitAssigner
     private final Set<PlanNodeId> replicatedSources;
     private final Set<PlanNodeId> allSources;
     private final FaultTolerantPartitioningScheme sourcePartitioningScheme;
-    private final Map<Integer, TaskPartition> outputPartitionToTaskPartition;
+    private final Map<Integer, TaskPartition> sourcePartitionToTaskPartition;
 
     private final Set<Integer> createdTaskPartitions = new HashSet<>();
     private final Set<PlanNodeId> completedSources = new HashSet<>();
+
     private final ListMultimap<PlanNodeId, Split> replicatedSplits = ArrayListMultimap.create();
 
-    private int nextTaskPartitionId;
+    private boolean allTaskPartitionsCreated;
 
     public static HashDistributionSplitAssigner create(
             Optional<CatalogHandle> catalogRequirement,
             Set<PlanNodeId> partitionedSources,
             Set<PlanNodeId> replicatedSources,
             FaultTolerantPartitioningScheme sourcePartitioningScheme,
-            Map<PlanNodeId, OutputDataSizeEstimate> outputDataSizeEstimates,
+            Map<PlanNodeId, OutputDataSizeEstimate> sourceDataSizeEstimates,
             PlanFragment fragment,
             long targetPartitionSizeInBytes,
+            int targetMinTaskCount,
             int targetMaxTaskCount)
     {
         if (fragment.getPartitioning().equals(SCALED_WRITER_HASH_DISTRIBUTION)) {
-            verify(
-
-                    fragment.getPartitionedSources().isEmpty() && fragment.getRemoteSourceNodes().size() == 1,
+            verify(fragment.getPartitionedSources().isEmpty() && fragment.getRemoteSourceNodes().size() == 1,
                     "SCALED_WRITER_HASH_DISTRIBUTION fragments are expected to have exactly one remote source and no table scans");
         }
         return new HashDistributionSplitAssigner(
@@ -85,11 +87,12 @@ public static HashDistributionSplitAssigner create(
                 partitionedSources,
                 replicatedSources,
                 sourcePartitioningScheme,
-                createOutputPartitionToTaskPartition(
+                createSourcePartitionToTaskPartition(
                         sourcePartitioningScheme,
                         partitionedSources,
-                        outputDataSizeEstimates,
+                        sourceDataSizeEstimates,
                         targetPartitionSizeInBytes,
+                        targetMinTaskCount,
                         targetMaxTaskCount,
                         sourceId -> fragment.getPartitioning().equals(SCALED_WRITER_HASH_DISTRIBUTION),
                         // never merge partitions for table write to avoid running into the maximum writers limit per task
@@ -102,16 +105,16 @@ public static HashDistributionSplitAssigner create(
             Set<PlanNodeId> partitionedSources,
             Set<PlanNodeId> replicatedSources,
             FaultTolerantPartitioningScheme sourcePartitioningScheme,
-            Map<Integer, TaskPartition> outputPartitionToTaskPartition)
+            Map<Integer, TaskPartition> sourcePartitionToTaskPartition)
     {
         this.catalogRequirement = requireNonNull(catalogRequirement, "catalogRequirement is null");
         this.replicatedSources = ImmutableSet.copyOf(requireNonNull(replicatedSources, "replicatedSources is null"));
-        allSources = ImmutableSet.<PlanNodeId>builder()
+        this.allSources = ImmutableSet.<PlanNodeId>builder()
                 .addAll(partitionedSources)
                 .addAll(replicatedSources)
                 .build();
         this.sourcePartitioningScheme = requireNonNull(sourcePartitioningScheme, "sourcePartitioningScheme is null");
-        this.outputPartitionToTaskPartition = ImmutableMap.copyOf(requireNonNull(outputPartitionToTaskPartition, "outputPartitionToTaskPartition is null"));
+        this.sourcePartitionToTaskPartition = ImmutableMap.copyOf(requireNonNull(sourcePartitionToTaskPartition, "sourcePartitionToTaskPartition is null"));
     }
 
     @Override
@@ -119,16 +122,43 @@ public AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Spli
     {
         AssignmentResult.Builder assignment = AssignmentResult.builder();
 
+        if (!allTaskPartitionsCreated) {
+            // create tasks all at once
+            int nextTaskPartitionId = 0;
+            for (int sourcePartitionId = 0; sourcePartitionId < sourcePartitioningScheme.getPartitionCount(); sourcePartitionId++) {
+                TaskPartition taskPartition = sourcePartitionToTaskPartition.get(sourcePartitionId);
+                verify(taskPartition != null, "taskPartition not found for sourcePartitionId: %s", sourcePartitionId);
+
+                for (SubPartition subPartition : taskPartition.getSubPartitions()) {
+                    if (!subPartition.isIdAssigned()) {
+                        int taskPartitionId = nextTaskPartitionId++;
+                        subPartition.assignId(taskPartitionId);
+                        Set<HostAddress> hostRequirement = sourcePartitioningScheme.getNodeRequirement(sourcePartitionId)
+                                .map(InternalNode::getHostAndPort)
+                                .map(ImmutableSet::of)
+                                .orElse(ImmutableSet.of());
+                        assignment.addPartition(new Partition(
+                                taskPartitionId,
+                                new NodeRequirements(catalogRequirement, hostRequirement)));
+                        createdTaskPartitions.add(taskPartitionId);
+                    }
+                }
+            }
+            assignment.setNoMorePartitions();
+
+            allTaskPartitionsCreated = true;
+        }
+
         if (replicatedSources.contains(planNodeId)) {
             replicatedSplits.putAll(planNodeId, splits.values());
             for (Integer partitionId : createdTaskPartitions) {
-                assignment.updatePartition(new PartitionUpdate(partitionId, planNodeId, ImmutableList.copyOf(splits.values()), noMoreSplits));
+                assignment.updatePartition(new PartitionUpdate(partitionId, planNodeId, false, replicatedSourcePartition(ImmutableList.copyOf(splits.values())), noMoreSplits));
             }
         }
         else {
-            splits.forEach((outputPartitionId, split) -> {
-                TaskPartition taskPartition = outputPartitionToTaskPartition.get(outputPartitionId);
-                verify(taskPartition != null, "taskPartition not found for outputPartitionId: %s", outputPartitionId);
+            splits.forEach((sourcePartitionId, split) -> {
+                TaskPartition taskPartition = sourcePartitionToTaskPartition.get(sourcePartitionId);
+                verify(taskPartition != null, "taskPartition not found for sourcePartitionId: %s", sourcePartitionId);
 
                 List<SubPartition> subPartitions;
                 if (taskPartition.getSplitBy().isPresent() && taskPartition.getSplitBy().get().equals(planNodeId)) {
@@ -139,28 +169,8 @@ public AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Spli
                 }
 
                 for (SubPartition subPartition : subPartitions) {
-                    if (!subPartition.isIdAssigned()) {
-                        int taskPartitionId = nextTaskPartitionId++;
-                        // Assigns lazily to ensure task ids are incremental and with no gaps.
-                        // Gaps can occur when scanning over a bucketed table as some buckets may contain no data.
-                        subPartition.assignId(taskPartitionId);
-                        Set<HostAddress> hostRequirement = sourcePartitioningScheme.getNodeRequirement(outputPartitionId)
-                                .map(InternalNode::getHostAndPort)
-                                .map(ImmutableSet::of)
-                                .orElse(ImmutableSet.of());
-                        assignment.addPartition(new Partition(
-                                taskPartitionId,
-                                new NodeRequirements(catalogRequirement, hostRequirement)));
-                        for (PlanNodeId replicatedSource : replicatedSplits.keySet()) {
-                            assignment.updatePartition(new PartitionUpdate(taskPartitionId, replicatedSource, replicatedSplits.get(replicatedSource), completedSources.contains(replicatedSource)));
-                        }
-                        for (PlanNodeId completedSource : completedSources) {
-                            assignment.updatePartition(new PartitionUpdate(taskPartitionId, completedSource, ImmutableList.of(), true));
-                        }
-                        createdTaskPartitions.add(taskPartitionId);
-                    }
-
-                    assignment.updatePartition(new PartitionUpdate(subPartition.getId(), planNodeId, ImmutableList.of(split), false));
+                    // todo see if having lots of PartitionUpdates is not a problem; should we merge
+                    assignment.updatePartition(new PartitionUpdate(subPartition.getId(), planNodeId, true, ImmutableListMultimap.of(sourcePartitionId, split), false));
                 }
             });
         }
@@ -168,25 +178,13 @@ public AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Spli
         if (noMoreSplits) {
             completedSources.add(planNodeId);
             for (Integer taskPartition : createdTaskPartitions) {
-                assignment.updatePartition(new PartitionUpdate(taskPartition, planNodeId, ImmutableList.of(), true));
+                assignment.updatePartition(new PartitionUpdate(taskPartition, planNodeId, false, ImmutableListMultimap.of(), true));
             }
+
             if (completedSources.containsAll(allSources)) {
-                if (createdTaskPartitions.isEmpty()) {
-                    assignment.addPartition(new Partition(
-                            0,
-                            new NodeRequirements(catalogRequirement, ImmutableSet.of())));
-                    for (PlanNodeId replicatedSource : replicatedSplits.keySet()) {
-                        assignment.updatePartition(new PartitionUpdate(0, replicatedSource, replicatedSplits.get(replicatedSource), true));
-                    }
-                    for (PlanNodeId completedSource : completedSources) {
-                        assignment.updatePartition(new PartitionUpdate(0, completedSource, ImmutableList.of(), true));
-                    }
-                    createdTaskPartitions.add(0);
-                }
                 for (Integer taskPartition : createdTaskPartitions) {
                     assignment.sealPartition(taskPartition);
                 }
-                assignment.setNoMorePartitions();
                 replicatedSplits.clear();
             }
         }
@@ -194,6 +192,13 @@ public AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Spli
         return assignment.build();
     }
 
+    public static ListMultimap<Integer, Split> replicatedSourcePartition(List<Split> splits)
+    {
+        ImmutableListMultimap.Builder<Integer, Split> builder = ImmutableListMultimap.builder();
+        builder.putAll(SINGLE_SOURCE_PARTITION_ID, splits);
+        return builder.build();
+    }
+
     @Override
     public AssignmentResult finish()
     {
@@ -202,11 +207,12 @@ public AssignmentResult finish()
     }
 
     @VisibleForTesting
-    static Map<Integer, TaskPartition> createOutputPartitionToTaskPartition(
+    static Map<Integer, TaskPartition> createSourcePartitionToTaskPartition(
             FaultTolerantPartitioningScheme sourcePartitioningScheme,
             Set<PlanNodeId> partitionedSources,
-            Map<PlanNodeId, OutputDataSizeEstimate> outputDataSizeEstimates,
+            Map<PlanNodeId, OutputDataSizeEstimate> sourceDataSizeEstimates,
             long targetPartitionSizeInBytes,
+            int targetMinTaskCount,
             int targetMaxTaskCount,
             Predicate<PlanNodeId> canSplit,
             boolean canMerge)
@@ -214,30 +220,32 @@ static Map<Integer, TaskPartition> createOutputPartitionToTaskPartition(
         int partitionCount = sourcePartitioningScheme.getPartitionCount();
         if (sourcePartitioningScheme.isExplicitPartitionToNodeMappingPresent() ||
                 partitionedSources.isEmpty() ||
-                !outputDataSizeEstimates.keySet().containsAll(partitionedSources)) {
+                !sourceDataSizeEstimates.keySet().containsAll(partitionedSources)) {
             // if bucket scheme is set explicitly or if estimates are missing create one task partition per output partition
             return IntStream.range(0, partitionCount)
                     .boxed()
                     .collect(toImmutableMap(Function.identity(), (key) -> new TaskPartition(1, Optional.empty())));
         }
 
-        List<OutputDataSizeEstimate> partitionedSourcesEstimates = outputDataSizeEstimates.entrySet().stream()
+        List<OutputDataSizeEstimate> partitionedSourcesEstimates = sourceDataSizeEstimates.entrySet().stream()
                 .filter(entry -> partitionedSources.contains(entry.getKey()))
                 .map(Map.Entry::getValue)
                 .collect(toImmutableList());
         OutputDataSizeEstimate mergedEstimate = OutputDataSizeEstimate.merge(partitionedSourcesEstimates);
 
         // adjust targetPartitionSizeInBytes based on total input bytes
-        if (targetMaxTaskCount != Integer.MAX_VALUE) {
-            long totalBytes = 0;
-            for (int partitionId = 0; partitionId < partitionCount; partitionId++) {
-                totalBytes += mergedEstimate.getPartitionSizeInBytes(partitionId);
-            }
+        if (targetMaxTaskCount != Integer.MAX_VALUE || targetMinTaskCount != 0) {
+            long totalBytes = mergedEstimate.getTotalSizeInBytes();
+
             if (totalBytes / targetPartitionSizeInBytes > targetMaxTaskCount) {
                 // targetMaxTaskCount is only used to adjust targetPartitionSizeInBytes to avoid excessive number
                 // of tasks; actual number of tasks depend on the data size distribution and may exceed its value
                 targetPartitionSizeInBytes = (totalBytes + targetMaxTaskCount - 1) / targetMaxTaskCount;
             }
+
+            if (totalBytes / targetPartitionSizeInBytes < targetMinTaskCount) {
+                targetPartitionSizeInBytes = Math.max(totalBytes / targetMinTaskCount, 1);
+            }
         }
 
         ImmutableMap.Builder<Integer, TaskPartition> result = ImmutableMap.builder();
@@ -249,7 +257,7 @@ static Map<Integer, TaskPartition> createOutputPartitionToTaskPartition(
                         partitionSizeInBytes,
                         targetPartitionSizeInBytes,
                         partitionedSources,
-                        outputDataSizeEstimates,
+                        sourceDataSizeEstimates,
                         partitionId,
                         canSplit);
                 result.put(partitionId, taskPartition);
@@ -268,13 +276,13 @@ private static TaskPartition createTaskPartition(
             long partitionSizeInBytes,
             long targetPartitionSizeInBytes,
             Set<PlanNodeId> partitionedSources,
-            Map<PlanNodeId, OutputDataSizeEstimate> outputDataSizeEstimates,
+            Map<PlanNodeId, OutputDataSizeEstimate> sourceDataSizeEstimates,
             int partitionId,
             Predicate<PlanNodeId> canSplit)
     {
         if (partitionSizeInBytes > targetPartitionSizeInBytes) {
             // try to assign multiple sub-partitions if possible
-            Map<PlanNodeId, Long> sourceSizes = getSourceSizes(partitionedSources, outputDataSizeEstimates, partitionId);
+            Map<PlanNodeId, Long> sourceSizes = getSourceSizes(partitionedSources, sourceDataSizeEstimates, partitionId);
             PlanNodeId largestSource = sourceSizes.entrySet().stream()
                     .max(Map.Entry.comparingByValue())
                     .map(Map.Entry::getKey)
@@ -289,10 +297,10 @@ private static TaskPartition createTaskPartition(
         return new TaskPartition(1, Optional.empty());
     }
 
-    private static Map<PlanNodeId, Long> getSourceSizes(Set<PlanNodeId> partitionedSources, Map<PlanNodeId, OutputDataSizeEstimate> outputDataSizeEstimates, int partitionId)
+    private static Map<PlanNodeId, Long> getSourceSizes(Set<PlanNodeId> partitionedSources, Map<PlanNodeId, OutputDataSizeEstimate> sourceDataSizeEstimates, int partitionId)
     {
         return partitionedSources.stream()
-                .collect(toImmutableMap(Function.identity(), source -> outputDataSizeEstimates.get(source).getPartitionSizeInBytes(partitionId)));
+                .collect(toImmutableMap(Function.identity(), source -> sourceDataSizeEstimates.get(source).getPartitionSizeInBytes(partitionId)));
     }
 
     private record PartitionAssignment(TaskPartition taskPartition, long assignedDataSizeInBytes)
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NoMemoryAwarePartitionMemoryEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NoMemoryAwarePartitionMemoryEstimator.java
new file mode 100644
index 000000000000..2703acc2ce09
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NoMemoryAwarePartitionMemoryEstimator.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.inject.BindingAnnotation;
+import com.google.inject.Inject;
+import io.trino.Session;
+import io.trino.connector.informationschema.InformationSchemaTableHandle;
+import io.trino.connector.system.GlobalSystemConnector;
+import io.trino.connector.system.SystemTableHandle;
+import io.trino.sql.planner.PlanFragment;
+import io.trino.sql.planner.optimizations.PlanNodeSearcher;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import io.trino.sql.planner.plan.PlanNode;
+import io.trino.sql.planner.plan.RefreshMaterializedViewNode;
+import io.trino.sql.planner.plan.TableScanNode;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.util.List;
+import java.util.function.Function;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.util.Objects.requireNonNull;
+
+public class NoMemoryAwarePartitionMemoryEstimator
+{
+    @Retention(RUNTIME)
+    @Target({FIELD, PARAMETER, METHOD})
+    @BindingAnnotation
+    public @interface ForNoMemoryAwarePartitionMemoryEstimator {}
+
+    public static class Factory
+            implements PartitionMemoryEstimatorFactory
+    {
+        private final PartitionMemoryEstimatorFactory delegateFactory;
+
+        @Inject
+        public Factory(@ForNoMemoryAwarePartitionMemoryEstimator PartitionMemoryEstimatorFactory delegateFactory)
+        {
+            this.delegateFactory = requireNonNull(delegateFactory, "delegateFactory is null");
+        }
+
+        @Override
+        public PartitionMemoryEstimator createPartitionMemoryEstimator(
+                Session session,
+                PlanFragment planFragment,
+                Function<PlanFragmentId, PlanFragment> sourceFragmentLookup)
+        {
+            if (isNoMemoryFragment(planFragment, sourceFragmentLookup)) {
+                return NoMemoryPartitionMemoryEstimator.INSTANCE;
+            }
+            return delegateFactory.createPartitionMemoryEstimator(session, planFragment, sourceFragmentLookup);
+        }
+
+        private boolean isNoMemoryFragment(PlanFragment fragment, Function<PlanFragmentId, PlanFragment> childFragmentLookup)
+        {
+            if (fragment.getRoot().getSources().stream()
+                    .anyMatch(planNode -> planNode instanceof RefreshMaterializedViewNode)) {
+                // REFRESH MATERIALIZED VIEW will issue other SQL commands under the hood. If its task memory is
+                // non-zero, then a deadlock scenario is possible if we only have a single node in the cluster.
+                return true;
+            }
+
+            // If source fragments are not tagged as "no-memory" assume that they may produce significant amount of data.
+            // We stay on the safe side an assume that we should use standard memory estimation for this fragment
+            if (!fragment.getRemoteSourceNodes().stream().flatMap(node -> node.getSourceFragmentIds().stream())
+                    // TODO: childFragmentLookup will be executed for subtree of every fragment in query plan. That means fragment will be
+                    // analyzed multiple time. Given fact that logic here is not extremely expensive and plans are not gigantic (up to ~200 fragments)
+                    // we can keep it as a first approach. Ultimately we should profile execution and possibly put in place some mechanisms to avoid repeated work.
+                    .allMatch(sourceFragmentId -> isNoMemoryFragment(childFragmentLookup.apply(sourceFragmentId), childFragmentLookup))) {
+                return false;
+            }
+
+            // If fragment source is not reading any external tables or only accesses information_schema assume it does not need significant amount of memory.
+            // Allow scheduling even if whole server memory is pre allocated.
+            List<PlanNode> tableScanNodes = PlanNodeSearcher.searchFrom(fragment.getRoot()).whereIsInstanceOfAny(TableScanNode.class).findAll();
+            return tableScanNodes.stream().allMatch(node -> isMetadataTableScan((TableScanNode) node));
+        }
+
+        private static boolean isMetadataTableScan(TableScanNode tableScanNode)
+        {
+            return (tableScanNode.getTable().getConnectorHandle() instanceof InformationSchemaTableHandle) ||
+                    (tableScanNode.getTable().getCatalogHandle().getCatalogName().equals(GlobalSystemConnector.NAME) && (tableScanNode.getTable().getConnectorHandle() instanceof SystemTableHandle));
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NoMemoryPartitionMemoryEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NoMemoryPartitionMemoryEstimator.java
new file mode 100644
index 000000000000..9f17ada58eeb
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NoMemoryPartitionMemoryEstimator.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import io.airlift.units.DataSize;
+import io.trino.spi.ErrorCode;
+
+import java.util.Optional;
+
+public class NoMemoryPartitionMemoryEstimator
+        implements PartitionMemoryEstimator
+{
+    public static final NoMemoryPartitionMemoryEstimator INSTANCE = new NoMemoryPartitionMemoryEstimator();
+
+    private NoMemoryPartitionMemoryEstimator() {}
+
+    @Override
+    public MemoryRequirements getInitialMemoryRequirements()
+    {
+        return new MemoryRequirements(DataSize.ofBytes(0));
+    }
+
+    @Override
+    public MemoryRequirements getNextRetryMemoryRequirements(MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, ErrorCode errorCode)
+    {
+        return new MemoryRequirements(DataSize.ofBytes(0));
+    }
+
+    @Override
+    public void registerPartitionFinished(MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, boolean success, Optional<ErrorCode> errorCode) {}
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeAllocator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeAllocator.java
new file mode 100644
index 000000000000..73346eaf3af3
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeAllocator.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import io.airlift.units.DataSize;
+import io.trino.execution.TaskId;
+import io.trino.metadata.InternalNode;
+
+import java.io.Closeable;
+
+public interface NodeAllocator
+        extends Closeable
+{
+    /**
+     * Requests acquisition of node. Obtained node can be obtained via {@link NodeLease#getNode()} method.
+     * The node may not be available immediately. Calling party needs to wait until future returned is done.
+     *
+     * It is obligatory for the calling party to release all the leases they obtained via {@link NodeLease#release()}.
+     */
+    NodeLease acquire(NodeRequirements nodeRequirements, DataSize memoryRequirement, TaskExecutionClass executionClass);
+
+    @Override
+    void close();
+
+    interface NodeLease
+    {
+        ListenableFuture<InternalNode> getNode();
+
+        default void attachTaskId(TaskId taskId) {}
+
+        /**
+         * Update execution class if it changes at runtime.
+         * It is only allowed to change execution class from speculative to non-speculative.
+         */
+        void setExecutionClass(TaskExecutionClass executionClass);
+
+        /**
+         * Update memory requirement for lease. There is no constraint when this method can be called - it
+         * can be done both before and after node lease is already fulfilled.
+         */
+        void setMemoryRequirement(DataSize memoryRequirement);
+
+        void release();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeAllocatorService.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeAllocatorService.java
similarity index 92%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/NodeAllocatorService.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeAllocatorService.java
index faea8c229f25..068d41e3bb93 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeAllocatorService.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeAllocatorService.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import io.trino.Session;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeRequirements.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeRequirements.java
similarity index 98%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/NodeRequirements.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeRequirements.java
index adb1a6a5955f..8dbbc262ebea 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeRequirements.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeRequirements.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.collect.ImmutableSet;
 import io.trino.spi.HostAddress;
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/OutputDataSizeEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/OutputDataSizeEstimator.java
new file mode 100644
index 000000000000..ffa4aba127a2
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/OutputDataSizeEstimator.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.primitives.ImmutableLongArray;
+import io.trino.execution.StageId;
+import io.trino.execution.scheduler.OutputDataSizeEstimate;
+
+import java.util.Optional;
+import java.util.function.Function;
+
+import static java.util.Objects.requireNonNull;
+
+public interface OutputDataSizeEstimator
+{
+    Optional<OutputDataSizeEstimateResult> getEstimatedOutputDataSize(
+            EventDrivenFaultTolerantQueryScheduler.StageExecution stageExecution,
+            Function<StageId, EventDrivenFaultTolerantQueryScheduler.StageExecution> stageExecutionLookup,
+            boolean parentEager);
+
+    enum OutputDataSizeEstimateStatus {
+        FINISHED,
+        ESTIMATED_BY_PROGRESS,
+        ESTIMATED_BY_SMALL_INPUT,
+        ESTIMATED_FOR_EAGER_PARENT
+    }
+
+    record OutputDataSizeEstimateResult(
+            OutputDataSizeEstimate outputDataSizeEstimate,
+            OutputDataSizeEstimateStatus status)
+    {
+        OutputDataSizeEstimateResult(ImmutableLongArray partitionDataSizes, OutputDataSizeEstimateStatus status)
+        {
+            this(new OutputDataSizeEstimate(partitionDataSizes), status);
+        }
+
+        public OutputDataSizeEstimateResult
+        {
+            requireNonNull(outputDataSizeEstimate, "outputDataSizeEstimate is null");
+            requireNonNull(status, "status is null");
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/OutputDataSizeEstimatorFactory.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/OutputDataSizeEstimatorFactory.java
new file mode 100644
index 000000000000..7c806026a536
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/OutputDataSizeEstimatorFactory.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import io.trino.Session;
+
+public interface OutputDataSizeEstimatorFactory
+{
+    OutputDataSizeEstimator create(Session session);
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionMemoryEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/PartitionMemoryEstimator.java
similarity index 79%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionMemoryEstimator.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/PartitionMemoryEstimator.java
index 0fccfb1795f5..632e0f5e0241 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionMemoryEstimator.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/PartitionMemoryEstimator.java
@@ -11,10 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import io.airlift.units.DataSize;
-import io.trino.Session;
 import io.trino.spi.ErrorCode;
 
 import java.util.Objects;
@@ -25,11 +24,11 @@
 
 public interface PartitionMemoryEstimator
 {
-    MemoryRequirements getInitialMemoryRequirements(Session session, DataSize defaultMemoryLimit);
+    MemoryRequirements getInitialMemoryRequirements();
 
-    MemoryRequirements getNextRetryMemoryRequirements(Session session, MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, ErrorCode errorCode);
+    MemoryRequirements getNextRetryMemoryRequirements(MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, ErrorCode errorCode);
 
-    void registerPartitionFinished(Session session, MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, boolean success, Optional<ErrorCode> errorCode);
+    void registerPartitionFinished(MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, boolean success, Optional<ErrorCode> errorCode);
 
     class MemoryRequirements
     {
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/PartitionMemoryEstimatorFactory.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/PartitionMemoryEstimatorFactory.java
new file mode 100644
index 000000000000..47beb0bbd03a
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/PartitionMemoryEstimatorFactory.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import io.trino.Session;
+import io.trino.sql.planner.PlanFragment;
+import io.trino.sql.planner.plan.PlanFragmentId;
+
+import java.util.function.Function;
+
+@FunctionalInterface
+public interface PartitionMemoryEstimatorFactory
+{
+    PartitionMemoryEstimator createPartitionMemoryEstimator(
+            Session session,
+            PlanFragment planFragment,
+            Function<PlanFragmentId, PlanFragment> sourceFragmentLookup);
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/SingleDistributionSplitAssigner.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SingleDistributionSplitAssigner.java
similarity index 92%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/SingleDistributionSplitAssigner.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SingleDistributionSplitAssigner.java
index 4cbf38e130bf..3f1801c382b6 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/SingleDistributionSplitAssigner.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SingleDistributionSplitAssigner.java
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
-import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ListMultimap;
 import io.trino.metadata.Split;
@@ -56,14 +56,16 @@ public AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Spli
             assignment.updatePartition(new PartitionUpdate(
                     0,
                     planNodeId,
-                    ImmutableList.copyOf(splits.values()),
+                    true,
+                    ImmutableListMultimap.copyOf(splits),
                     false));
         }
         if (noMoreSplits) {
             assignment.updatePartition(new PartitionUpdate(
                     0,
                     planNodeId,
-                    ImmutableList.of(),
+                    false,
+                    ImmutableListMultimap.of(),
                     true));
             completedSources.add(planNodeId);
         }
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/SplitAssigner.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SplitAssigner.java
similarity index 82%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/SplitAssigner.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SplitAssigner.java
index 908d8a42b2ae..161bf7e01642 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/SplitAssigner.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SplitAssigner.java
@@ -11,19 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.common.primitives.ImmutableIntArray;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.metadata.Split;
 import io.trino.sql.planner.plan.PlanNodeId;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.List;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -32,6 +33,9 @@
 @NotThreadSafe
 interface SplitAssigner
 {
+    // marker source partition id for data which is not hash distributed
+    int SINGLE_SOURCE_PARTITION_ID = 0;
+
     AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Split> splits, boolean noMoreSplits);
 
     AssignmentResult finish();
@@ -44,12 +48,18 @@ record Partition(int partitionId, NodeRequirements nodeRequirements)
         }
     }
 
-    record PartitionUpdate(int partitionId, PlanNodeId planNodeId, List<Split> splits, boolean noMoreSplits)
+    record PartitionUpdate(
+            int partitionId,
+            PlanNodeId planNodeId,
+            boolean readyForScheduling,
+            ListMultimap<Integer, Split> splits, // sourcePartition -> splits
+            boolean noMoreSplits)
     {
         public PartitionUpdate
         {
             requireNonNull(planNodeId, "planNodeId is null");
-            splits = ImmutableList.copyOf(requireNonNull(splits, "splits is null"));
+            checkArgument(!(readyForScheduling && splits.isEmpty()), "partition update with empty splits marked as ready for scheduling");
+            splits = ImmutableListMultimap.copyOf(requireNonNull(splits, "splits is null"));
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SplitsMapping.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SplitsMapping.java
new file mode 100644
index 000000000000..d1f662dff9d4
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SplitsMapping.java
@@ -0,0 +1,291 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Multimaps;
+import com.google.common.collect.Sets;
+import io.trino.metadata.Split;
+import io.trino.sql.planner.plan.PlanNodeId;
+import jakarta.annotation.Nullable;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.airlift.slice.SizeOf.INTEGER_INSTANCE_SIZE;
+import static io.airlift.slice.SizeOf.estimatedSizeOf;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static java.util.Objects.requireNonNull;
+
+public final class SplitsMapping
+{
+    private static final int INSTANCE_SIZE = instanceSize(SplitsMapping.class);
+
+    public static final SplitsMapping EMPTY = SplitsMapping.builder().build();
+
+    // not using Multimap to avoid extensive data structure copying when building updated SplitsMapping
+    private final Map<PlanNodeId, Map<Integer, List<Split>>> splits; // plan-node -> hash-partition -> Split
+
+    private SplitsMapping(ImmutableMap<PlanNodeId, Map<Integer, List<Split>>> splits)
+    {
+        // Builder implementations ensure that external map as well as Maps/Lists used in values
+        // are immutable.
+        this.splits = splits;
+    }
+
+    public Set<PlanNodeId> getPlanNodeIds()
+    {
+        return splits.keySet();
+    }
+
+    public ListMultimap<PlanNodeId, Split> getSplitsFlat()
+    {
+        ImmutableListMultimap.Builder<PlanNodeId, Split> splitsFlat = ImmutableListMultimap.builder();
+        for (Map.Entry<PlanNodeId, Map<Integer, List<Split>>> entry : splits.entrySet()) {
+            // TODO can we do less copying?
+            splitsFlat.putAll(entry.getKey(), entry.getValue().values().stream().flatMap(Collection::stream).collect(toImmutableList()));
+        }
+        return splitsFlat.build();
+    }
+
+    public List<Split> getSplitsFlat(PlanNodeId planNodeId)
+    {
+        Map<Integer, List<Split>> splits = this.splits.get(planNodeId);
+        if (splits == null) {
+            return ImmutableList.of();
+        }
+        verify(!splits.isEmpty(), "expected not empty splits list %s", splits);
+
+        if (splits.size() == 1) {
+            return getOnlyElement(splits.values());
+        }
+
+        // TODO improve to not copy here; return view instead
+        ImmutableList.Builder<Split> result = ImmutableList.builder();
+        for (List<Split> partitionSplits : splits.values()) {
+            result.addAll(partitionSplits);
+        }
+        return result.build();
+    }
+
+    @VisibleForTesting
+    ListMultimap<Integer, Split> getSplits(PlanNodeId planNodeId)
+    {
+        Map<Integer, List<Split>> splits = this.splits.get(planNodeId);
+        if (splits == null) {
+            return ImmutableListMultimap.of();
+        }
+        verify(!splits.isEmpty(), "expected not empty splits list %s", splits);
+
+        ImmutableListMultimap.Builder<Integer, Split> result = ImmutableListMultimap.builder();
+        for (Map.Entry<Integer, List<Split>> entry : splits.entrySet()) {
+            result.putAll(entry.getKey(), entry.getValue());
+        }
+        return result.build();
+    }
+
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE +
+                estimatedSizeOf(
+                        splits,
+                        PlanNodeId::getRetainedSizeInBytes,
+                        planNodeSplits -> estimatedSizeOf(
+                                planNodeSplits,
+                                partitionId -> INTEGER_INSTANCE_SIZE,
+                                splitList -> estimatedSizeOf(splitList, Split::getRetainedSizeInBytes)));
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        SplitsMapping that = (SplitsMapping) o;
+        return Objects.equals(splits, that.splits);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(splits);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("splits", splits)
+                .toString();
+    }
+
+    public static Builder builder()
+    {
+        return new NewBuilder();
+    }
+
+    public static Builder builder(SplitsMapping mapping)
+    {
+        return new UpdatingBuilder(mapping);
+    }
+
+    public long size()
+    {
+        return splits.values().stream()
+                .flatMap(sourcePartitionToSplits -> sourcePartitionToSplits.values().stream())
+                .mapToLong(List::size)
+                .sum();
+    }
+
+    public abstract static class Builder
+    {
+        private Builder() {} // close for extension
+
+        public Builder addSplit(PlanNodeId planNodeId, int partitionId, Split split)
+        {
+            return addSplits(planNodeId, partitionId, ImmutableList.of(split));
+        }
+
+        public Builder addSplits(PlanNodeId planNodeId, ListMultimap<Integer, Split> splits)
+        {
+            Multimaps.asMap(splits).forEach((partitionId, partitionSplits) -> addSplits(planNodeId, partitionId, partitionSplits));
+            return this;
+        }
+
+        public Builder addMapping(SplitsMapping updatingMapping)
+        {
+            for (Map.Entry<PlanNodeId, Map<Integer, List<Split>>> entry : updatingMapping.splits.entrySet()) {
+                PlanNodeId planNodeId = entry.getKey();
+                entry.getValue().forEach((partitionId, partitionSplits) -> addSplits(planNodeId, partitionId, partitionSplits));
+            }
+            return this;
+        }
+
+        public abstract Builder addSplits(PlanNodeId planNodeId, int partitionId, List<Split> splits);
+
+        public abstract SplitsMapping build();
+    }
+
+    private static class UpdatingBuilder
+            extends Builder
+    {
+        private final SplitsMapping originalMapping;
+        private final Map<PlanNodeId, Map<Integer, ImmutableList.Builder<Split>>> updates = new HashMap<>();
+
+        public UpdatingBuilder(SplitsMapping originalMapping)
+        {
+            this.originalMapping = requireNonNull(originalMapping, "sourceMapping is null");
+        }
+
+        @Override
+        public Builder addSplits(PlanNodeId planNodeId, int partitionId, List<Split> splits)
+        {
+            if (splits.isEmpty()) {
+                // ensure we do not have empty lists in result splits map.
+                return this;
+            }
+            updates.computeIfAbsent(planNodeId, ignored -> new HashMap<>())
+                    .computeIfAbsent(partitionId, key -> ImmutableList.builder())
+                    .addAll(splits);
+            return this;
+        }
+
+        @Override
+        public SplitsMapping build()
+        {
+            ImmutableMap.Builder<PlanNodeId, Map<Integer, List<Split>>> result = ImmutableMap.builder();
+            for (PlanNodeId planNodeId : Sets.union(originalMapping.splits.keySet(), updates.keySet())) {
+                Map<Integer, List<Split>> planNodeOriginalMapping = originalMapping.splits.getOrDefault(planNodeId, ImmutableMap.of());
+                Map<Integer, ImmutableList.Builder<Split>> planNodeUpdates = updates.getOrDefault(planNodeId, ImmutableMap.of());
+                if (planNodeUpdates.isEmpty()) {
+                    // just use original splits for planNodeId
+                    result.put(planNodeId, planNodeOriginalMapping);
+                    continue;
+                }
+                // create new mapping for planNodeId reusing as much of source as possible
+                ImmutableMap.Builder<Integer, List<Split>> targetSplitsMapBuilder = ImmutableMap.builder();
+                for (Integer sourcePartitionId : Sets.union(planNodeOriginalMapping.keySet(), planNodeUpdates.keySet())) {
+                    @Nullable List<Split> originalSplits = planNodeOriginalMapping.get(sourcePartitionId);
+                    @Nullable ImmutableList.Builder<Split> splitUpdates = planNodeUpdates.get(sourcePartitionId);
+                    targetSplitsMapBuilder.put(sourcePartitionId, mergeIfPresent(originalSplits, splitUpdates));
+                }
+                result.put(planNodeId, targetSplitsMapBuilder.buildOrThrow());
+            }
+            return new SplitsMapping(result.buildOrThrow());
+        }
+
+        private static <T> List<T> mergeIfPresent(@Nullable List<T> list, @Nullable ImmutableList.Builder<T> additionalElements)
+        {
+            if (additionalElements == null) {
+                // reuse source immutable split list
+                return requireNonNull(list, "list is null");
+            }
+            if (list == null) {
+                return additionalElements.build();
+            }
+            return ImmutableList.<T>builder()
+                    .addAll(list)
+                    .addAll(additionalElements.build())
+                    .build();
+        }
+    }
+
+    private static class NewBuilder
+            extends Builder
+    {
+        private final Map<PlanNodeId, Map<Integer, ImmutableList.Builder<Split>>> splitsBuilder = new HashMap<>();
+
+        @Override
+        public Builder addSplits(PlanNodeId planNodeId, int partitionId, List<Split> splits)
+        {
+            if (splits.isEmpty()) {
+                // ensure we do not have empty lists in result splits map.
+                return this;
+            }
+            splitsBuilder.computeIfAbsent(planNodeId, ignored -> new HashMap<>())
+                    .computeIfAbsent(partitionId, ignored -> ImmutableList.builder())
+                    .addAll(splits);
+            return this;
+        }
+
+        @Override
+        public SplitsMapping build()
+        {
+            return new SplitsMapping(splitsBuilder.entrySet().stream()
+                    .collect(toImmutableMap(
+                            Map.Entry::getKey,
+                            planNodeMapping -> planNodeMapping.getValue().entrySet().stream()
+                                    .collect(toImmutableMap(
+                                            Map.Entry::getKey,
+                                            sourcePartitionMapping -> sourcePartitionMapping.getValue().build())))));
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptor.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskDescriptor.java
similarity index 77%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptor.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskDescriptor.java
index a9f6bfa6b313..7521617f5a0b 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptor.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskDescriptor.java
@@ -11,18 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
-
-import com.google.common.collect.ImmutableListMultimap;
-import com.google.common.collect.ListMultimap;
-import io.trino.metadata.Split;
-import io.trino.sql.planner.plan.PlanNodeId;
+package io.trino.execution.scheduler.faulttolerant;
 
 import java.util.Objects;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.common.collect.Multimaps.asMap;
-import static io.airlift.slice.SizeOf.estimatedSizeOf;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static java.util.Objects.requireNonNull;
 
@@ -31,18 +24,18 @@ public class TaskDescriptor
     private static final int INSTANCE_SIZE = instanceSize(TaskDescriptor.class);
 
     private final int partitionId;
-    private final ListMultimap<PlanNodeId, Split> splits;
+    private final SplitsMapping splits;
     private final NodeRequirements nodeRequirements;
 
     private transient volatile long retainedSizeInBytes;
 
     public TaskDescriptor(
             int partitionId,
-            ListMultimap<PlanNodeId, Split> splits,
+            SplitsMapping splitsMapping,
             NodeRequirements nodeRequirements)
     {
         this.partitionId = partitionId;
-        this.splits = ImmutableListMultimap.copyOf(requireNonNull(splits, "splits is null"));
+        this.splits = requireNonNull(splitsMapping, "splitsMapping is null");
         this.nodeRequirements = requireNonNull(nodeRequirements, "nodeRequirements is null");
     }
 
@@ -51,7 +44,7 @@ public int getPartitionId()
         return partitionId;
     }
 
-    public ListMultimap<PlanNodeId, Split> getSplits()
+    public SplitsMapping getSplits()
     {
         return splits;
     }
@@ -95,7 +88,7 @@ public long getRetainedSizeInBytes()
         long result = retainedSizeInBytes;
         if (result == 0) {
             result = INSTANCE_SIZE
-                    + estimatedSizeOf(asMap(splits), PlanNodeId::getRetainedSizeInBytes, splits -> estimatedSizeOf(splits, Split::getRetainedSizeInBytes))
+                    + splits.getRetainedSizeInBytes()
                     + nodeRequirements.getRetainedSizeInBytes();
             retainedSizeInBytes = result;
         }
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskDescriptorStorage.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskDescriptorStorage.java
new file mode 100644
index 000000000000..599a593b4a7f
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskDescriptorStorage.java
@@ -0,0 +1,484 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Suppliers;
+import com.google.common.base.VerifyException;
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Table;
+import com.google.common.math.Quantiles;
+import com.google.common.math.Stats;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
+import io.airlift.json.JsonCodec;
+import io.airlift.log.Logger;
+import io.airlift.units.DataSize;
+import io.trino.annotation.NotThreadSafe;
+import io.trino.execution.QueryManagerConfig;
+import io.trino.execution.StageId;
+import io.trino.metadata.Split;
+import io.trino.spi.QueryId;
+import io.trino.spi.TrinoException;
+import io.trino.sql.planner.plan.PlanNodeId;
+import org.weakref.jmx.Managed;
+import org.weakref.jmx.Nested;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.collect.ImmutableSetMultimap.toImmutableSetMultimap;
+import static com.google.common.math.Quantiles.percentiles;
+import static io.airlift.units.DataSize.succinctBytes;
+import static io.trino.spi.StandardErrorCode.EXCEEDED_TASK_DESCRIPTOR_STORAGE_CAPACITY;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+public class TaskDescriptorStorage
+{
+    private static final Logger log = Logger.get(TaskDescriptorStorage.class);
+
+    private final long maxMemoryInBytes;
+    private final JsonCodec<Split> splitJsonCodec;
+    private final StorageStats storageStats;
+
+    @GuardedBy("this")
+    private final Map<QueryId, TaskDescriptors> storages = new HashMap<>();
+    @GuardedBy("this")
+    private long reservedBytes;
+
+    @Inject
+    public TaskDescriptorStorage(
+            QueryManagerConfig config,
+            JsonCodec<Split> splitJsonCodec)
+    {
+        this(config.getFaultTolerantExecutionTaskDescriptorStorageMaxMemory(), splitJsonCodec);
+    }
+
+    public TaskDescriptorStorage(DataSize maxMemory, JsonCodec<Split> splitJsonCodec)
+    {
+        this.maxMemoryInBytes = maxMemory.toBytes();
+        this.splitJsonCodec = requireNonNull(splitJsonCodec, "splitJsonCodec is null");
+        this.storageStats = new StorageStats(Suppliers.memoizeWithExpiration(this::computeStats, 1, TimeUnit.SECONDS));
+    }
+
+    /**
+     * Initializes task descriptor storage for a given <code>queryId</code>.
+     * It is expected to be called before query scheduling begins.
+     */
+    public synchronized void initialize(QueryId queryId)
+    {
+        TaskDescriptors storage = new TaskDescriptors();
+        verify(storages.putIfAbsent(queryId, storage) == null, "storage is already initialized for query: %s", queryId);
+        updateMemoryReservation(storage.getReservedBytes());
+    }
+
+    /**
+     * Stores {@link TaskDescriptor} for a task identified by the <code>stageId</code> and <code>partitionId</code>.
+     * The <code>partitionId</code> is obtained from the {@link TaskDescriptor} by calling {@link TaskDescriptor#getPartitionId()}.
+     * If the query has been terminated the call is ignored.
+     *
+     * @throws IllegalStateException if the storage already has a task descriptor for a given task
+     */
+    public synchronized void put(StageId stageId, TaskDescriptor descriptor)
+    {
+        TaskDescriptors storage = storages.get(stageId.getQueryId());
+        if (storage == null) {
+            // query has been terminated
+            return;
+        }
+        long previousReservedBytes = storage.getReservedBytes();
+        storage.put(stageId, descriptor.getPartitionId(), descriptor);
+        long currentReservedBytes = storage.getReservedBytes();
+        long delta = currentReservedBytes - previousReservedBytes;
+        updateMemoryReservation(delta);
+    }
+
+    /**
+     * Get task descriptor
+     *
+     * @return Non empty {@link TaskDescriptor} for a task identified by the <code>stageId</code> and <code>partitionId</code>.
+     * Returns {@link Optional#empty()} if the query of a given <code>stageId</code> has been finished (e.g.: cancelled by the user or finished early).
+     * @throws java.util.NoSuchElementException if {@link TaskDescriptor} for a given task does not exist
+     */
+    public synchronized Optional<TaskDescriptor> get(StageId stageId, int partitionId)
+    {
+        TaskDescriptors storage = storages.get(stageId.getQueryId());
+        if (storage == null) {
+            // query has been terminated
+            return Optional.empty();
+        }
+        return Optional.of(storage.get(stageId, partitionId));
+    }
+
+    /**
+     * Removes {@link TaskDescriptor} for a task identified by the <code>stageId</code> and <code>partitionId</code>.
+     * If the query has been terminated the call is ignored.
+     *
+     * @throws java.util.NoSuchElementException if {@link TaskDescriptor} for a given task does not exist
+     */
+    public synchronized void remove(StageId stageId, int partitionId)
+    {
+        TaskDescriptors storage = storages.get(stageId.getQueryId());
+        if (storage == null) {
+            // query has been terminated
+            return;
+        }
+        long previousReservedBytes = storage.getReservedBytes();
+        storage.remove(stageId, partitionId);
+        long currentReservedBytes = storage.getReservedBytes();
+        long delta = currentReservedBytes - previousReservedBytes;
+        updateMemoryReservation(delta);
+    }
+
+    /**
+     * Notifies the storage that the query with a given <code>queryId</code> has been finished and the task descriptors can be safely discarded.
+     * <p>
+     * The engine may decided to destroy the storage while the scheduling is still in process (for example if query was cancelled). Under such
+     * circumstances the implementation will ignore future calls to {@link #put(StageId, TaskDescriptor)} and return
+     * {@link Optional#empty()} from {@link #get(StageId, int)}. The scheduler is expected to handle this condition appropriately.
+     */
+    public synchronized void destroy(QueryId queryId)
+    {
+        TaskDescriptors storage = storages.remove(queryId);
+        if (storage != null) {
+            updateMemoryReservation(-storage.getReservedBytes());
+        }
+    }
+
+    private synchronized void updateMemoryReservation(long delta)
+    {
+        reservedBytes += delta;
+        if (delta <= 0) {
+            return;
+        }
+        while (reservedBytes > maxMemoryInBytes) {
+            // drop a query that uses the most storage
+            QueryId killCandidate = storages.entrySet().stream()
+                    .max(Comparator.comparingLong(entry -> entry.getValue().getReservedBytes()))
+                    .map(Map.Entry::getKey)
+                    .orElseThrow(() -> new VerifyException(format("storage is empty but reservedBytes (%s) is still greater than maxMemoryInBytes (%s)", reservedBytes, maxMemoryInBytes)));
+            TaskDescriptors storage = storages.get(killCandidate);
+            long previousReservedBytes = storage.getReservedBytes();
+
+            if (log.isInfoEnabled()) {
+                log.info("Failing query %s; reclaiming %s of %s task descriptor memory from %s queries; extraStorageInfo=%s", killCandidate, storage.getReservedBytes(), succinctBytes(reservedBytes), storages.size(), storage.getDebugInfo());
+            }
+
+            storage.fail(new TrinoException(
+                    EXCEEDED_TASK_DESCRIPTOR_STORAGE_CAPACITY,
+                    format("Task descriptor storage capacity has been exceeded: %s > %s", succinctBytes(maxMemoryInBytes), succinctBytes(reservedBytes))));
+            long currentReservedBytes = storage.getReservedBytes();
+            reservedBytes += (currentReservedBytes - previousReservedBytes);
+        }
+    }
+
+    @VisibleForTesting
+    synchronized long getReservedBytes()
+    {
+        return reservedBytes;
+    }
+
+    @Managed
+    @Nested
+    public StorageStats getStats()
+    {
+        // This should not contain materialized values. GuiceMBeanExporter calls it only once during application startup
+        // and then only @Managed methods all called on that instance.
+        return storageStats;
+    }
+
+    private synchronized StorageStatsValue computeStats()
+    {
+        int queriesCount = storages.size();
+        long stagesCount = storages.values().stream().mapToLong(TaskDescriptors::getStagesCount).sum();
+
+        Quantiles.ScaleAndIndexes percentiles = percentiles().indexes(50, 90, 95);
+
+        long queryReservedBytesP50 = 0;
+        long queryReservedBytesP90 = 0;
+        long queryReservedBytesP95 = 0;
+        long queryReservedBytesAvg = 0;
+        long stageReservedBytesP50 = 0;
+        long stageReservedBytesP90 = 0;
+        long stageReservedBytesP95 = 0;
+        long stageReservedBytesAvg = 0;
+
+        if (queriesCount > 0) { // we cannot compute percentiles for empty set
+
+            Map<Integer, Double> queryReservedBytesPercentiles = percentiles.compute(
+                    storages.values().stream()
+                            .map(TaskDescriptors::getReservedBytes)
+                            .collect(toImmutableList()));
+
+            queryReservedBytesP50 = queryReservedBytesPercentiles.get(50).longValue();
+            queryReservedBytesP90 = queryReservedBytesPercentiles.get(90).longValue();
+            queryReservedBytesP95 = queryReservedBytesPercentiles.get(95).longValue();
+            queryReservedBytesAvg = reservedBytes / queriesCount;
+
+            List<Long> storagesReservedBytes = storages.values().stream()
+                    .flatMap(TaskDescriptors::getStagesReservedBytes)
+                    .collect(toImmutableList());
+
+            if (!storagesReservedBytes.isEmpty()) {
+                Map<Integer, Double> stagesReservedBytesPercentiles = percentiles.compute(
+                        storagesReservedBytes);
+                stageReservedBytesP50 = stagesReservedBytesPercentiles.get(50).longValue();
+                stageReservedBytesP90 = stagesReservedBytesPercentiles.get(90).longValue();
+                stageReservedBytesP95 = stagesReservedBytesPercentiles.get(95).longValue();
+                stageReservedBytesAvg = reservedBytes / stagesCount;
+            }
+        }
+
+        return new StorageStatsValue(
+                queriesCount,
+                stagesCount,
+                reservedBytes,
+                queryReservedBytesAvg,
+                queryReservedBytesP50,
+                queryReservedBytesP90,
+                queryReservedBytesP95,
+                stageReservedBytesAvg,
+                stageReservedBytesP50,
+                stageReservedBytesP90,
+                stageReservedBytesP95);
+    }
+
+    @NotThreadSafe
+    private class TaskDescriptors
+    {
+        private final Table<StageId, Integer /* partitionId */, TaskDescriptor> descriptors = HashBasedTable.create();
+
+        private long reservedBytes;
+        private final Map<StageId, AtomicLong> stagesReservedBytes = new HashMap<>();
+        private RuntimeException failure;
+
+        public void put(StageId stageId, int partitionId, TaskDescriptor descriptor)
+        {
+            throwIfFailed();
+            checkState(!descriptors.contains(stageId, partitionId), "task descriptor is already present for key %s/%s ", stageId, partitionId);
+            descriptors.put(stageId, partitionId, descriptor);
+            long descriptorRetainedBytes = descriptor.getRetainedSizeInBytes();
+            reservedBytes += descriptorRetainedBytes;
+            stagesReservedBytes.computeIfAbsent(stageId, ignored -> new AtomicLong()).addAndGet(descriptorRetainedBytes);
+        }
+
+        public TaskDescriptor get(StageId stageId, int partitionId)
+        {
+            throwIfFailed();
+            TaskDescriptor descriptor = descriptors.get(stageId, partitionId);
+            if (descriptor == null) {
+                throw new NoSuchElementException(format("descriptor not found for key %s/%s", stageId, partitionId));
+            }
+            return descriptor;
+        }
+
+        public void remove(StageId stageId, int partitionId)
+        {
+            throwIfFailed();
+            TaskDescriptor descriptor = descriptors.remove(stageId, partitionId);
+            if (descriptor == null) {
+                throw new NoSuchElementException(format("descriptor not found for key %s/%s", stageId, partitionId));
+            }
+            long descriptorRetainedBytes = descriptor.getRetainedSizeInBytes();
+            reservedBytes -= descriptorRetainedBytes;
+            requireNonNull(stagesReservedBytes.get(stageId), () -> format("no entry for stage %s", stageId)).addAndGet(-descriptorRetainedBytes);
+        }
+
+        public long getReservedBytes()
+        {
+            return reservedBytes;
+        }
+
+        private String getDebugInfo()
+        {
+            Multimap<StageId, TaskDescriptor> descriptorsByStageId = descriptors.cellSet().stream()
+                    .collect(toImmutableSetMultimap(
+                            Table.Cell::getRowKey,
+                            Table.Cell::getValue));
+
+            Map<StageId, String> debugInfoByStageId = descriptorsByStageId.asMap().entrySet().stream()
+                    .collect(toImmutableMap(
+                            Map.Entry::getKey,
+                            entry -> getDebugInfo(entry.getValue())));
+
+            List<String> biggestSplits = descriptorsByStageId.entries().stream()
+                    .flatMap(entry -> entry.getValue().getSplits().getSplitsFlat().entries().stream().map(splitEntry -> Map.entry("%s/%s".formatted(entry.getKey(), splitEntry.getKey()), splitEntry.getValue())))
+                    .sorted(Comparator.<Map.Entry<String, Split>>comparingLong(entry -> entry.getValue().getRetainedSizeInBytes()).reversed())
+                    .limit(3)
+                    .map(entry -> "{nodeId=%s, size=%s, split=%s}".formatted(entry.getKey(), entry.getValue().getRetainedSizeInBytes(), splitJsonCodec.toJson(entry.getValue())))
+                    .toList();
+
+            return "stagesInfo=%s; biggestSplits=%s".formatted(debugInfoByStageId, biggestSplits);
+        }
+
+        private String getDebugInfo(Collection<TaskDescriptor> taskDescriptors)
+        {
+            int taskDescriptorsCount = taskDescriptors.size();
+            Stats taskDescriptorsRetainedSizeStats = Stats.of(taskDescriptors.stream().mapToLong(TaskDescriptor::getRetainedSizeInBytes));
+
+            Set<PlanNodeId> planNodeIds = taskDescriptors.stream().flatMap(taskDescriptor -> taskDescriptor.getSplits().getSplitsFlat().keySet().stream()).collect(toImmutableSet());
+            Map<PlanNodeId, String> splitsDebugInfo = new HashMap<>();
+            for (PlanNodeId planNodeId : planNodeIds) {
+                Stats splitCountStats = Stats.of(taskDescriptors.stream().mapToLong(taskDescriptor -> taskDescriptor.getSplits().getSplitsFlat().asMap().get(planNodeId).size()));
+                Stats splitSizeStats = Stats.of(taskDescriptors.stream().flatMap(taskDescriptor -> taskDescriptor.getSplits().getSplitsFlat().get(planNodeId).stream()).mapToLong(Split::getRetainedSizeInBytes));
+                splitsDebugInfo.put(
+                        planNodeId,
+                        "{splitCountMean=%s, splitCountStdDev=%s, splitSizeMean=%s, splitSizeStdDev=%s}".formatted(
+                                splitCountStats.mean(),
+                                splitCountStats.populationStandardDeviation(),
+                                splitSizeStats.mean(),
+                                splitSizeStats.populationStandardDeviation()));
+            }
+
+            return "[taskDescriptorsCount=%s, taskDescriptorsRetainedSizeMean=%s, taskDescriptorsRetainedSizeStdDev=%s, splits=%s]".formatted(
+                    taskDescriptorsCount,
+                    taskDescriptorsRetainedSizeStats.mean(),
+                    taskDescriptorsRetainedSizeStats.populationStandardDeviation(),
+                    splitsDebugInfo);
+        }
+
+        private void fail(RuntimeException failure)
+        {
+            if (this.failure == null) {
+                descriptors.clear();
+                reservedBytes = 0;
+                this.failure = failure;
+            }
+        }
+
+        private void throwIfFailed()
+        {
+            if (failure != null) {
+                throw failure;
+            }
+        }
+
+        public int getStagesCount()
+        {
+            return descriptors.rowMap().size();
+        }
+
+        public Stream<Long> getStagesReservedBytes()
+        {
+            return stagesReservedBytes.values().stream()
+                    .map(AtomicLong::get);
+        }
+    }
+
+    private record StorageStatsValue(
+            long queriesCount,
+            long stagesCount,
+            long reservedBytes,
+            long queryReservedBytesAvg,
+            long queryReservedBytesP50,
+            long queryReservedBytesP90,
+            long queryReservedBytesP95,
+            long stageReservedBytesAvg,
+            long stageReservedBytesP50,
+            long stageReservedBytesP90,
+            long stageReservedBytesP95) {}
+
+    public static class StorageStats
+    {
+        private final Supplier<StorageStatsValue> statsSupplier;
+
+        StorageStats(Supplier<StorageStatsValue> statsSupplier)
+        {
+            this.statsSupplier = requireNonNull(statsSupplier, "statsSupplier is null");
+        }
+
+        @Managed
+        public long getQueriesCount()
+        {
+            return statsSupplier.get().queriesCount();
+        }
+
+        @Managed
+        public long getStagesCount()
+        {
+            return statsSupplier.get().stagesCount();
+        }
+
+        @Managed
+        public long getReservedBytes()
+        {
+            return statsSupplier.get().reservedBytes();
+        }
+
+        @Managed
+        public long getQueryReservedBytesAvg()
+        {
+            return statsSupplier.get().queryReservedBytesAvg();
+        }
+
+        @Managed
+        public long getQueryReservedBytesP50()
+        {
+            return statsSupplier.get().queryReservedBytesP50();
+        }
+
+        @Managed
+        public long getQueryReservedBytesP90()
+        {
+            return statsSupplier.get().queryReservedBytesP90();
+        }
+
+        @Managed
+        public long getQueryReservedBytesP95()
+        {
+            return statsSupplier.get().queryReservedBytesP95();
+        }
+
+        @Managed
+        public long getStageReservedBytesAvg()
+        {
+            return statsSupplier.get().stageReservedBytesP50();
+        }
+
+        @Managed
+        public long getStageReservedBytesP50()
+        {
+            return statsSupplier.get().stageReservedBytesP50();
+        }
+
+        @Managed
+        public long getStageReservedBytesP90()
+        {
+            return statsSupplier.get().stageReservedBytesP90();
+        }
+
+        @Managed
+        public long getStageReservedBytesP95()
+        {
+            return statsSupplier.get().stageReservedBytesP95();
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskExecutionClass.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskExecutionClass.java
new file mode 100644
index 000000000000..949db5a03c9a
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskExecutionClass.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+public enum TaskExecutionClass
+{
+    // Tasks from stages with all upstream stages finished
+    STANDARD,
+
+    // Tasks from stages with some upstream stages still running.
+    // To be scheduled only if no STANDARD tasks can fit.
+    // Picked to kill if worker runs out of memory to prevent deadlock.
+    SPECULATIVE,
+
+    // Tasks from stages with some upstream stages still running but with high priority.
+    // Will be scheduled even if there are resources to schedule STANDARD tasks on cluster.
+    // Tasks of EAGER_SPECULATIVE are used to implement early termination of queries, when it
+    // is probable that we do not need to run whole downstream stages to produce final query result.
+    // EAGER_SPECULATIVE will not prevent STANDARD tasks from being scheduled and will still be picked
+    // to kill if needed when worker runs out of memory; this is needed to prevent deadlocks.
+    EAGER_SPECULATIVE,
+    /**/;
+
+    boolean canTransitionTo(TaskExecutionClass targetExecutionClass)
+    {
+        return switch (this) {
+            case STANDARD -> targetExecutionClass == STANDARD;
+            case SPECULATIVE -> targetExecutionClass == SPECULATIVE || targetExecutionClass == STANDARD;
+            case EAGER_SPECULATIVE -> targetExecutionClass == EAGER_SPECULATIVE || targetExecutionClass == STANDARD;
+        };
+    }
+
+    boolean isSpeculative()
+    {
+        return switch (this) {
+            case STANDARD -> false;
+            case SPECULATIVE, EAGER_SPECULATIVE -> true;
+        };
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionPolicy.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionPolicy.java
index 5f0ce506b5af..affbf65a4ace 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionPolicy.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionPolicy.java
@@ -13,11 +13,10 @@
  */
 package io.trino.execution.scheduler.policy;
 
+import com.google.inject.Inject;
 import io.trino.execution.scheduler.StageExecution;
 import io.trino.server.DynamicFilterService;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 
 import static java.util.Objects.requireNonNull;
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionSchedule.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionSchedule.java
index 4e95441ac040..beb8be903f24 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionSchedule.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionSchedule.java
@@ -22,6 +22,7 @@
 import com.google.common.graph.MutableGraph;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import io.trino.execution.scheduler.StageExecution;
 import io.trino.execution.scheduler.StageExecution.State;
@@ -39,11 +40,9 @@
 import io.trino.sql.planner.plan.SemiJoinNode;
 import io.trino.sql.planner.plan.SpatialJoinNode;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -312,7 +311,7 @@ private class Visitor
         private final QueryId queryId;
         private final Map<PlanFragmentId, PlanFragment> fragments;
         private final ImmutableSet.Builder<PlanFragmentId> nonLazyFragments = ImmutableSet.builder();
-        private final Map<PlanFragmentId, FragmentSubGraph> fragmentSubGraphs = new HashMap<>();
+        private final Set<PlanFragmentId> processedFragments = new HashSet<>();
 
         public Visitor(QueryId queryId, Collection<PlanFragment> fragments)
         {
@@ -341,20 +340,17 @@ public void processAllFragments()
                     .flatMap(Collection::stream)
                     .collect(toImmutableSet());
 
-            // process fragments (starting from root)
-            fragments.keySet().stream()
+            // process output fragment
+            PlanFragmentId outputFragmentId = fragments.keySet().stream()
                     .filter(fragmentId -> !remoteSources.contains(fragmentId))
-                    .forEach(this::processFragment);
+                    .collect(onlyElement());
+            processFragment(outputFragmentId);
         }
 
         public FragmentSubGraph processFragment(PlanFragmentId planFragmentId)
         {
-            if (fragmentSubGraphs.containsKey(planFragmentId)) {
-                return fragmentSubGraphs.get(planFragmentId);
-            }
-
+            verify(processedFragments.add(planFragmentId), "fragment %s was already processed", planFragmentId);
             FragmentSubGraph subGraph = processFragment(fragments.get(planFragmentId));
-            verify(fragmentSubGraphs.put(planFragmentId, subGraph) == null, "fragment %s was already processed", planFragmentId);
             sortedFragments.add(planFragmentId);
             return subGraph;
         }
diff --git a/core/trino-main/src/main/java/io/trino/execution/warnings/DefaultWarningCollector.java b/core/trino-main/src/main/java/io/trino/execution/warnings/DefaultWarningCollector.java
index 1e8eb41c254c..a8400cfe4945 100644
--- a/core/trino-main/src/main/java/io/trino/execution/warnings/DefaultWarningCollector.java
+++ b/core/trino-main/src/main/java/io/trino/execution/warnings/DefaultWarningCollector.java
@@ -14,11 +14,10 @@
 package io.trino.execution.warnings;
 
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.spi.TrinoWarning;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
diff --git a/core/trino-main/src/main/java/io/trino/failuredetector/FailureDetectorConfig.java b/core/trino-main/src/main/java/io/trino/failuredetector/FailureDetectorConfig.java
index 085e05caefc1..ed3ea1e402ed 100644
--- a/core/trino-main/src/main/java/io/trino/failuredetector/FailureDetectorConfig.java
+++ b/core/trino-main/src/main/java/io/trino/failuredetector/FailureDetectorConfig.java
@@ -17,10 +17,9 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/core/trino-main/src/main/java/io/trino/failuredetector/FailureDetectorModule.java b/core/trino-main/src/main/java/io/trino/failuredetector/FailureDetectorModule.java
index 259280f11093..37f0d031b61c 100644
--- a/core/trino-main/src/main/java/io/trino/failuredetector/FailureDetectorModule.java
+++ b/core/trino-main/src/main/java/io/trino/failuredetector/FailureDetectorModule.java
@@ -14,22 +14,22 @@
 package io.trino.failuredetector;
 
 import com.google.inject.Binder;
-import com.google.inject.Module;
 import com.google.inject.Scopes;
+import io.airlift.configuration.AbstractConfigurationAwareModule;
 import org.weakref.jmx.guice.ExportBinder;
 
 import static io.airlift.configuration.ConfigBinder.configBinder;
-import static io.airlift.http.client.HttpClientBinder.httpClientBinder;
+import static io.trino.server.InternalCommunicationHttpClientModule.internalHttpClientModule;
 
 public class FailureDetectorModule
-        implements Module
+        extends AbstractConfigurationAwareModule
 {
     @Override
-    public void configure(Binder binder)
+    protected void setup(Binder binder)
     {
-        httpClientBinder(binder)
-                .bindHttpClient("failure-detector", ForFailureDetector.class)
-                .withTracing();
+        install(internalHttpClientModule("failure-detector", ForFailureDetector.class)
+                .withTracing()
+                .build());
 
         configBinder(binder).bindConfig(FailureDetectorConfig.class);
 
diff --git a/core/trino-main/src/main/java/io/trino/failuredetector/HeartbeatFailureDetector.java b/core/trino-main/src/main/java/io/trino/failuredetector/HeartbeatFailureDetector.java
index e1940e66c0b6..b5f1e3b9876c 100644
--- a/core/trino-main/src/main/java/io/trino/failuredetector/HeartbeatFailureDetector.java
+++ b/core/trino-main/src/main/java/io/trino/failuredetector/HeartbeatFailureDetector.java
@@ -17,6 +17,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
 import io.airlift.discovery.client.ServiceDescriptor;
 import io.airlift.discovery.client.ServiceSelector;
@@ -34,21 +37,16 @@
 import io.trino.server.InternalCommunicationConfig;
 import io.trino.spi.HostAddress;
 import io.trino.util.Failures;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.joda.time.DateTime;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -267,11 +265,7 @@ private URI getHttpUri(ServiceDescriptor descriptor)
     {
         String url = descriptor.getProperties().get(httpsRequired ? "https" : "http");
         if (url != null) {
-            try {
-                return new URI(url);
-            }
-            catch (URISyntaxException ignored) {
-            }
+            return URI.create(url);
         }
         return null;
     }
diff --git a/core/trino-main/src/main/java/io/trino/index/IndexManager.java b/core/trino-main/src/main/java/io/trino/index/IndexManager.java
index 604795ce561b..c204fbe80449 100644
--- a/core/trino-main/src/main/java/io/trino/index/IndexManager.java
+++ b/core/trino-main/src/main/java/io/trino/index/IndexManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.index;
 
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.metadata.IndexHandle;
@@ -21,8 +22,6 @@
 import io.trino.spi.connector.ConnectorIndexProvider;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/core/trino-main/src/main/java/io/trino/json/CachingResolver.java b/core/trino-main/src/main/java/io/trino/json/CachingResolver.java
index d3c1ec519e47..c29ef889caad 100644
--- a/core/trino-main/src/main/java/io/trino/json/CachingResolver.java
+++ b/core/trino-main/src/main/java/io/trino/json/CachingResolver.java
@@ -15,14 +15,11 @@
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableList;
-import io.trino.FullConnectorSession;
-import io.trino.Session;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 import io.trino.json.ir.IrPathNode;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.OperatorNotFoundException;
 import io.trino.metadata.ResolvedFunction;
-import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.OperatorType;
 import io.trino.spi.type.Type;
@@ -34,7 +31,7 @@
 import java.util.concurrent.ExecutionException;
 
 import static com.google.common.base.Preconditions.checkState;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.json.CachingResolver.ResolvedOperatorAndCoercions.RESOLUTION_ERROR;
 import static io.trino.json.CachingResolver.ResolvedOperatorAndCoercions.operators;
 import static java.util.Objects.requireNonNull;
@@ -56,18 +53,15 @@ public class CachingResolver
     private static final int MAX_CACHE_SIZE = 1000;
 
     private final Metadata metadata;
-    private final Session session;
     private final TypeCoercion typeCoercion;
     private final NonEvictableCache<NodeAndTypes, ResolvedOperatorAndCoercions> operators = buildNonEvictableCache(CacheBuilder.newBuilder().maximumSize(MAX_CACHE_SIZE));
 
-    public CachingResolver(Metadata metadata, ConnectorSession connectorSession, TypeManager typeManager)
+    public CachingResolver(Metadata metadata, TypeManager typeManager)
     {
         requireNonNull(metadata, "metadata is null");
-        requireNonNull(connectorSession, "connectorSession is null");
         requireNonNull(typeManager, "typeManager is null");
 
         this.metadata = metadata;
-        this.session = ((FullConnectorSession) connectorSession).getSession();
         this.typeCoercion = new TypeCoercion(typeManager::getType);
     }
 
@@ -86,7 +80,7 @@ private ResolvedOperatorAndCoercions resolveOperators(OperatorType operatorType,
     {
         ResolvedFunction operator;
         try {
-            operator = metadata.resolveOperator(session, operatorType, ImmutableList.of(leftType, rightType));
+            operator = metadata.resolveOperator(operatorType, ImmutableList.of(leftType, rightType));
         }
         catch (OperatorNotFoundException e) {
             return RESOLUTION_ERROR;
@@ -97,7 +91,7 @@ private ResolvedOperatorAndCoercions resolveOperators(OperatorType operatorType,
         Optional<ResolvedFunction> leftCast = Optional.empty();
         if (!signature.getArgumentTypes().get(0).equals(leftType) && !typeCoercion.isTypeOnlyCoercion(leftType, signature.getArgumentTypes().get(0))) {
             try {
-                leftCast = Optional.of(metadata.getCoercion(session, leftType, signature.getArgumentTypes().get(0)));
+                leftCast = Optional.of(metadata.getCoercion(leftType, signature.getArgumentTypes().get(0)));
             }
             catch (OperatorNotFoundException e) {
                 return RESOLUTION_ERROR;
@@ -107,7 +101,7 @@ private ResolvedOperatorAndCoercions resolveOperators(OperatorType operatorType,
         Optional<ResolvedFunction> rightCast = Optional.empty();
         if (!signature.getArgumentTypes().get(1).equals(rightType) && !typeCoercion.isTypeOnlyCoercion(rightType, signature.getArgumentTypes().get(1))) {
             try {
-                rightCast = Optional.of(metadata.getCoercion(session, rightType, signature.getArgumentTypes().get(1)));
+                rightCast = Optional.of(metadata.getCoercion(rightType, signature.getArgumentTypes().get(1)));
             }
             catch (OperatorNotFoundException e) {
                 return RESOLUTION_ERROR;
diff --git a/core/trino-main/src/main/java/io/trino/json/JsonPathEvaluator.java b/core/trino-main/src/main/java/io/trino/json/JsonPathEvaluator.java
index 8b7d10554504..f31cf19cd495 100644
--- a/core/trino-main/src/main/java/io/trino/json/JsonPathEvaluator.java
+++ b/core/trino-main/src/main/java/io/trino/json/JsonPathEvaluator.java
@@ -51,7 +51,7 @@ public JsonPathEvaluator(IrJsonPath path, ConnectorSession session, Metadata met
 
         this.path = path;
         this.invoker = new Invoker(session, functionManager);
-        this.resolver = new CachingResolver(metadata, session, typeManager);
+        this.resolver = new CachingResolver(metadata, typeManager);
     }
 
     public List<Object> evaluate(JsonNode input, Object[] parameters)
diff --git a/core/trino-main/src/main/java/io/trino/json/PathEvaluationVisitor.java b/core/trino-main/src/main/java/io/trino/json/PathEvaluationVisitor.java
index 8427b5b77942..84299d759ed8 100644
--- a/core/trino-main/src/main/java/io/trino/json/PathEvaluationVisitor.java
+++ b/core/trino-main/src/main/java/io/trino/json/PathEvaluationVisitor.java
@@ -35,6 +35,7 @@
 import io.trino.json.ir.IrConstantJsonSequence;
 import io.trino.json.ir.IrContextVariable;
 import io.trino.json.ir.IrDatetimeMethod;
+import io.trino.json.ir.IrDescendantMemberAccessor;
 import io.trino.json.ir.IrDoubleMethod;
 import io.trino.json.ir.IrFilter;
 import io.trino.json.ir.IrFloorMethod;
@@ -145,7 +146,7 @@ protected List<Object> visitIrPathNode(IrPathNode node, PathEvaluationContext co
     @Override
     protected List<Object> visitIrAbsMethod(IrAbsMethod node, PathEvaluationContext context)
     {
-        List<Object> sequence = process(node.getBase(), context);
+        List<Object> sequence = process(node.base(), context);
 
         if (lax) {
             sequence = unwrapArrays(sequence);
@@ -269,8 +270,8 @@ private static TypedValue getAbsoluteValue(TypedValue typedValue)
     @Override
     protected List<Object> visitIrArithmeticBinary(IrArithmeticBinary node, PathEvaluationContext context)
     {
-        List<Object> leftSequence = process(node.getLeft(), context);
-        List<Object> rightSequence = process(node.getRight(), context);
+        List<Object> leftSequence = process(node.left(), context);
+        List<Object> rightSequence = process(node.right(), context);
 
         if (lax) {
             leftSequence = unwrapArrays(leftSequence);
@@ -301,9 +302,9 @@ protected List<Object> visitIrArithmeticBinary(IrArithmeticBinary node, PathEval
             right = (TypedValue) rightObject;
         }
 
-        ResolvedOperatorAndCoercions operators = resolver.getOperators(node, OperatorType.valueOf(node.getOperator().name()), left.getType(), right.getType());
+        ResolvedOperatorAndCoercions operators = resolver.getOperators(node, OperatorType.valueOf(node.operator().name()), left.getType(), right.getType());
         if (operators == RESOLUTION_ERROR) {
-            throw new PathEvaluationError(format("invalid operand types to %s operator (%s, %s)", node.getOperator().name(), left.getType(), right.getType()));
+            throw new PathEvaluationError(format("invalid operand types to %s operator (%s, %s)", node.operator().name(), left.getType(), right.getType()));
         }
 
         Object leftInput = left.getValueAsObject();
@@ -340,7 +341,7 @@ protected List<Object> visitIrArithmeticBinary(IrArithmeticBinary node, PathEval
     @Override
     protected List<Object> visitIrArithmeticUnary(IrArithmeticUnary node, PathEvaluationContext context)
     {
-        List<Object> sequence = process(node.getBase(), context);
+        List<Object> sequence = process(node.base(), context);
 
         if (lax) {
             sequence = unwrapArrays(sequence);
@@ -360,7 +361,7 @@ protected List<Object> visitIrArithmeticUnary(IrArithmeticUnary node, PathEvalua
                     throw itemTypeError("NUMBER", type.getDisplayName());
                 }
             }
-            if (node.getSign() == PLUS) {
+            if (node.sign() == PLUS) {
                 outputSequence.add(value);
             }
             else {
@@ -441,7 +442,7 @@ private static TypedValue negate(TypedValue typedValue)
     @Override
     protected List<Object> visitIrArrayAccessor(IrArrayAccessor node, PathEvaluationContext context)
     {
-        List<Object> sequence = process(node.getBase(), context);
+        List<Object> sequence = process(node.base(), context);
 
         ImmutableList.Builder<Object> outputSequence = ImmutableList.builder();
         for (Object object : sequence) {
@@ -465,7 +466,7 @@ else if (lax) {
             }
 
             // handle wildcard accessor
-            if (node.getSubscripts().isEmpty()) {
+            if (node.subscripts().isEmpty()) {
                 outputSequence.addAll(elements);
                 continue;
             }
@@ -479,9 +480,9 @@ else if (lax) {
             }
 
             PathEvaluationContext arrayContext = context.withLast(elements.size() - 1);
-            for (IrArrayAccessor.Subscript subscript : node.getSubscripts()) {
-                List<Object> from = process(subscript.getFrom(), arrayContext);
-                Optional<List<Object>> to = subscript.getTo().map(path -> process(path, arrayContext));
+            for (IrArrayAccessor.Subscript subscript : node.subscripts()) {
+                List<Object> from = process(subscript.from(), arrayContext);
+                Optional<List<Object>> to = subscript.to().map(path -> process(path, arrayContext));
                 if (from.size() != 1) {
                     throw new PathEvaluationError("array subscript 'from' value must be singleton numeric");
                 }
@@ -570,7 +571,7 @@ private static long asArrayIndex(Object object)
     @Override
     protected List<Object> visitIrCeilingMethod(IrCeilingMethod node, PathEvaluationContext context)
     {
-        List<Object> sequence = process(node.getBase(), context);
+        List<Object> sequence = process(node.base(), context);
 
         if (lax) {
             sequence = unwrapArrays(sequence);
@@ -633,7 +634,7 @@ private static TypedValue getCeiling(TypedValue typedValue)
     @Override
     protected List<Object> visitIrConstantJsonSequence(IrConstantJsonSequence node, PathEvaluationContext context)
     {
-        return ImmutableList.copyOf(node.getSequence());
+        return ImmutableList.copyOf(node.sequence());
     }
 
     @Override
@@ -648,10 +649,41 @@ protected List<Object> visitIrDatetimeMethod(IrDatetimeMethod node, PathEvaluati
         throw new UnsupportedOperationException("date method is not yet supported");
     }
 
+    @Override
+    protected List<Object> visitIrDescendantMemberAccessor(IrDescendantMemberAccessor node, PathEvaluationContext context)
+    {
+        List<Object> sequence = process(node.base(), context);
+
+        ImmutableList.Builder<Object> builder = ImmutableList.builder();
+        sequence.stream()
+                .forEach(object -> descendants(object, node.key(), builder));
+
+        return builder.build();
+    }
+
+    private void descendants(Object object, String key, ImmutableList.Builder<Object> builder)
+    {
+        if (object instanceof JsonNode jsonNode && jsonNode.isObject()) {
+            // prefix order: visit the enclosing object first
+            JsonNode boundValue = jsonNode.get(key);
+            if (boundValue != null) {
+                builder.add(boundValue);
+            }
+            // recurse into child nodes
+            ImmutableList.copyOf(jsonNode.fields()).stream()
+                    .forEach(field -> descendants(field.getValue(), key, builder));
+        }
+        if (object instanceof JsonNode jsonNode && jsonNode.isArray()) {
+            for (int index = 0; index < jsonNode.size(); index++) {
+                descendants(jsonNode.get(index), key, builder);
+            }
+        }
+    }
+
     @Override
     protected List<Object> visitIrDoubleMethod(IrDoubleMethod node, PathEvaluationContext context)
     {
-        List<Object> sequence = process(node.getBase(), context);
+        List<Object> sequence = process(node.base(), context);
 
         if (lax) {
             sequence = unwrapArrays(sequence);
@@ -712,7 +744,7 @@ private static TypedValue getDouble(TypedValue typedValue)
     @Override
     protected List<Object> visitIrFilter(IrFilter node, PathEvaluationContext context)
     {
-        List<Object> sequence = process(node.getBase(), context);
+        List<Object> sequence = process(node.base(), context);
 
         if (lax) {
             sequence = unwrapArrays(sequence);
@@ -721,7 +753,7 @@ protected List<Object> visitIrFilter(IrFilter node, PathEvaluationContext contex
         ImmutableList.Builder<Object> outputSequence = ImmutableList.builder();
         for (Object object : sequence) {
             PathEvaluationContext currentItemContext = context.withCurrentItem(object);
-            Boolean result = predicateVisitor.process(node.getPredicate(), currentItemContext);
+            Boolean result = predicateVisitor.process(node.predicate(), currentItemContext);
             if (Boolean.TRUE.equals(result)) {
                 outputSequence.add(object);
             }
@@ -733,7 +765,7 @@ protected List<Object> visitIrFilter(IrFilter node, PathEvaluationContext contex
     @Override
     protected List<Object> visitIrFloorMethod(IrFloorMethod node, PathEvaluationContext context)
     {
-        List<Object> sequence = process(node.getBase(), context);
+        List<Object> sequence = process(node.base(), context);
 
         if (lax) {
             sequence = unwrapArrays(sequence);
@@ -802,7 +834,7 @@ protected List<Object> visitIrJsonNull(IrJsonNull node, PathEvaluationContext co
     @Override
     protected List<Object> visitIrKeyValueMethod(IrKeyValueMethod node, PathEvaluationContext context)
     {
-        List<Object> sequence = process(node.getBase(), context);
+        List<Object> sequence = process(node.base(), context);
 
         if (lax) {
             sequence = unwrapArrays(sequence);
@@ -841,13 +873,13 @@ protected List<Object> visitIrLastIndexVariable(IrLastIndexVariable node, PathEv
     @Override
     protected List<Object> visitIrLiteral(IrLiteral node, PathEvaluationContext context)
     {
-        return ImmutableList.of(TypedValue.fromValueAsObject(node.getType().orElseThrow(), node.getValue()));
+        return ImmutableList.of(TypedValue.fromValueAsObject(node.type().orElseThrow(), node.value()));
     }
 
     @Override
     protected List<Object> visitIrMemberAccessor(IrMemberAccessor node, PathEvaluationContext context)
     {
-        List<Object> sequence = process(node.getBase(), context);
+        List<Object> sequence = process(node.base(), context);
 
         if (lax) {
             sequence = unwrapArrays(sequence);
@@ -871,14 +903,14 @@ protected List<Object> visitIrMemberAccessor(IrMemberAccessor node, PathEvaluati
 
             if (object instanceof JsonNode jsonNode && jsonNode.isObject()) {
                 // handle wildcard member accessor
-                if (node.getKey().isEmpty()) {
+                if (node.key().isEmpty()) {
                     outputSequence.addAll(jsonNode.elements());
                 }
                 else {
-                    JsonNode boundValue = jsonNode.get(node.getKey().get());
+                    JsonNode boundValue = jsonNode.get(node.key().get());
                     if (boundValue == null) {
                         if (!lax) {
-                            throw structuralError("missing member '%s' in JSON object", node.getKey().get());
+                            throw structuralError("missing member '%s' in JSON object", node.key().get());
                         }
                     }
                     else {
@@ -894,7 +926,7 @@ protected List<Object> visitIrMemberAccessor(IrMemberAccessor node, PathEvaluati
     @Override
     protected List<Object> visitIrNamedJsonVariable(IrNamedJsonVariable node, PathEvaluationContext context)
     {
-        Object value = parameters[node.getIndex()];
+        Object value = parameters[node.index()];
         checkState(value != null, "missing value for parameter");
         checkState(value instanceof JsonNode, "expected JSON, got SQL value");
 
@@ -907,7 +939,7 @@ protected List<Object> visitIrNamedJsonVariable(IrNamedJsonVariable node, PathEv
     @Override
     protected List<Object> visitIrNamedValueVariable(IrNamedValueVariable node, PathEvaluationContext context)
     {
-        Object value = parameters[node.getIndex()];
+        Object value = parameters[node.index()];
         checkState(value != null, "missing value for parameter");
         checkState(value instanceof TypedValue || value instanceof NullNode, "expected SQL value or JSON null, got non-null JSON");
 
@@ -923,7 +955,7 @@ protected List<Object> visitIrPredicateCurrentItemVariable(IrPredicateCurrentIte
     @Override
     protected List<Object> visitIrSizeMethod(IrSizeMethod node, PathEvaluationContext context)
     {
-        List<Object> sequence = process(node.getBase(), context);
+        List<Object> sequence = process(node.base(), context);
 
         ImmutableList.Builder<Object> outputSequence = ImmutableList.builder();
         for (Object object : sequence) {
@@ -953,9 +985,9 @@ protected List<Object> visitIrSizeMethod(IrSizeMethod node, PathEvaluationContex
     @Override
     protected List<Object> visitIrTypeMethod(IrTypeMethod node, PathEvaluationContext context)
     {
-        List<Object> sequence = process(node.getBase(), context);
+        List<Object> sequence = process(node.base(), context);
 
-        Type resultType = node.getType().orElseThrow();
+        Type resultType = node.type().orElseThrow();
         ImmutableList.Builder<Object> outputSequence = ImmutableList.builder();
 
         // In case when a new type is supported in JSON path, it might be necessary to update the
diff --git a/core/trino-main/src/main/java/io/trino/json/PathPredicateEvaluationVisitor.java b/core/trino-main/src/main/java/io/trino/json/PathPredicateEvaluationVisitor.java
index db85da4a44b0..b5d043be36ab 100644
--- a/core/trino-main/src/main/java/io/trino/json/PathPredicateEvaluationVisitor.java
+++ b/core/trino-main/src/main/java/io/trino/json/PathPredicateEvaluationVisitor.java
@@ -135,7 +135,7 @@ protected Boolean visitIrComparisonPredicate(IrComparisonPredicate node, PathEva
     {
         List<Object> leftSequence;
         try {
-            leftSequence = pathVisitor.process(node.getLeft(), context);
+            leftSequence = pathVisitor.process(node.left(), context);
         }
         catch (PathEvaluationError e) {
             return null;
@@ -143,7 +143,7 @@ protected Boolean visitIrComparisonPredicate(IrComparisonPredicate node, PathEva
 
         List<Object> rightSequence;
         try {
-            rightSequence = pathVisitor.process(node.getRight(), context);
+            rightSequence = pathVisitor.process(node.right(), context);
         }
         catch (PathEvaluationError e) {
             return null;
@@ -208,10 +208,10 @@ else if (((JsonNode) object).isValueNode()) {
         boolean found = false;
 
         // try to find a quick null-based answer for == and <> operators
-        if (node.getOperator() == EQUAL && leftHasJsonNull && rightHasJsonNull) {
+        if (node.operator() == EQUAL && leftHasJsonNull && rightHasJsonNull) {
             found = true;
         }
-        if (node.getOperator() == NOT_EQUAL) {
+        if (node.operator() == NOT_EQUAL) {
             if (leftHasJsonNull && (rightHasScalar || rightHasNonScalar) ||
                     rightHasJsonNull && (leftHasScalar || leftHasNonScalar)) {
                 found = true;
@@ -253,7 +253,7 @@ else if (((JsonNode) object).isValueNode()) {
 
     private Boolean compare(IrComparisonPredicate node, TypedValue left, TypedValue right)
     {
-        IrComparisonPredicate.Operator comparisonOperator = node.getOperator();
+        IrComparisonPredicate.Operator comparisonOperator = node.operator();
         ComparisonExpression.Operator operator;
         Type firstType = left.getType();
         Object firstValue = left.getValueAsObject();
@@ -328,11 +328,11 @@ private Boolean compare(IrComparisonPredicate node, TypedValue left, TypedValue
     @Override
     protected Boolean visitIrConjunctionPredicate(IrConjunctionPredicate node, PathEvaluationContext context)
     {
-        Boolean left = process(node.getLeft(), context);
+        Boolean left = process(node.left(), context);
         if (FALSE.equals(left)) {
             return FALSE;
         }
-        Boolean right = process(node.getRight(), context);
+        Boolean right = process(node.right(), context);
         if (FALSE.equals(right)) {
             return FALSE;
         }
@@ -345,11 +345,11 @@ protected Boolean visitIrConjunctionPredicate(IrConjunctionPredicate node, PathE
     @Override
     protected Boolean visitIrDisjunctionPredicate(IrDisjunctionPredicate node, PathEvaluationContext context)
     {
-        Boolean left = process(node.getLeft(), context);
+        Boolean left = process(node.left(), context);
         if (TRUE.equals(left)) {
             return TRUE;
         }
-        Boolean right = process(node.getRight(), context);
+        Boolean right = process(node.right(), context);
         if (TRUE.equals(right)) {
             return TRUE;
         }
@@ -364,7 +364,7 @@ protected Boolean visitIrExistsPredicate(IrExistsPredicate node, PathEvaluationC
     {
         List<Object> sequence;
         try {
-            sequence = pathVisitor.process(node.getPath(), context);
+            sequence = pathVisitor.process(node.path(), context);
         }
         catch (PathEvaluationError e) {
             return null;
@@ -376,7 +376,7 @@ protected Boolean visitIrExistsPredicate(IrExistsPredicate node, PathEvaluationC
     @Override
     protected Boolean visitIrIsUnknownPredicate(IrIsUnknownPredicate node, PathEvaluationContext context)
     {
-        Boolean predicateResult = process(node.getPredicate(), context);
+        Boolean predicateResult = process(node.predicate(), context);
 
         return predicateResult == null;
     }
@@ -384,7 +384,7 @@ protected Boolean visitIrIsUnknownPredicate(IrIsUnknownPredicate node, PathEvalu
     @Override
     protected Boolean visitIrNegationPredicate(IrNegationPredicate node, PathEvaluationContext context)
     {
-        Boolean predicateResult = process(node.getPredicate(), context);
+        Boolean predicateResult = process(node.predicate(), context);
 
         return predicateResult == null ? null : !predicateResult;
     }
@@ -394,7 +394,7 @@ protected Boolean visitIrStartsWithPredicate(IrStartsWithPredicate node, PathEva
     {
         List<Object> valueSequence;
         try {
-            valueSequence = pathVisitor.process(node.getValue(), context);
+            valueSequence = pathVisitor.process(node.value(), context);
         }
         catch (PathEvaluationError e) {
             return null;
@@ -402,7 +402,7 @@ protected Boolean visitIrStartsWithPredicate(IrStartsWithPredicate node, PathEva
 
         List<Object> prefixSequence;
         try {
-            prefixSequence = pathVisitor.process(node.getPrefix(), context);
+            prefixSequence = pathVisitor.process(node.prefix(), context);
         }
         catch (PathEvaluationError e) {
             return null;
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrAbsMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrAbsMethod.java
index 6c0dc8ddd986..365fb01b91f3 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrAbsMethod.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrAbsMethod.java
@@ -13,23 +13,23 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
 import java.util.Optional;
 
-public class IrAbsMethod
-        extends IrMethod
+import static java.util.Objects.requireNonNull;
+
+public record IrAbsMethod(IrPathNode base, Optional<Type> type)
+        implements IrPathNode
 {
-    @JsonCreator
-    public IrAbsMethod(@JsonProperty("base") IrPathNode base, @JsonProperty("type") Optional<Type> type)
+    public IrAbsMethod
     {
-        super(base, type);
+        requireNonNull(base, "abs() method base is null");
+        requireNonNull(type, "type is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrAbsMethod(this, context);
     }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrAccessor.java b/core/trino-main/src/main/java/io/trino/json/ir/IrAccessor.java
deleted file mode 100644
index 3ff7af0a8db7..000000000000
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrAccessor.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed 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 io.trino.json.ir;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.trino.spi.type.Type;
-
-import java.util.Objects;
-import java.util.Optional;
-
-import static java.util.Objects.requireNonNull;
-
-public abstract class IrAccessor
-        extends IrPathNode
-{
-    protected final IrPathNode base;
-
-    IrAccessor(IrPathNode base, Optional<Type> type)
-    {
-        super(type);
-        this.base = requireNonNull(base, "accessor base is null");
-    }
-
-    @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
-    {
-        return visitor.visitIrAccessor(this, context);
-    }
-
-    @JsonProperty
-    public IrPathNode getBase()
-    {
-        return base;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrAccessor other = (IrAccessor) obj;
-        return Objects.equals(this.base, other.base);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(base);
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrArithmeticBinary.java b/core/trino-main/src/main/java/io/trino/json/ir/IrArithmeticBinary.java
index 0a1361038444..5bd2bddd0c14 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrArithmeticBinary.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrArithmeticBinary.java
@@ -13,81 +13,30 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.function.OperatorType;
 import io.trino.spi.type.Type;
 
-import java.util.Objects;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
-public class IrArithmeticBinary
-        extends IrPathNode
+public record IrArithmeticBinary(Operator operator, IrPathNode left, IrPathNode right, Optional<Type> type)
+        implements IrPathNode
 {
-    private final Operator operator;
-    private final IrPathNode left;
-    private final IrPathNode right;
-
-    @JsonCreator
-    public IrArithmeticBinary(
-            @JsonProperty("operator") Operator operator,
-            @JsonProperty("left") IrPathNode left,
-            @JsonProperty("right") IrPathNode right,
-            @JsonProperty("type") Optional<Type> resultType)
+    public IrArithmeticBinary
     {
-        super(resultType);
-        this.operator = requireNonNull(operator, "operator is null");
-        this.left = requireNonNull(left, "left is null");
-        this.right = requireNonNull(right, "right is null");
+        requireNonNull(type, "type is null");
+        requireNonNull(operator, "operator is null");
+        requireNonNull(left, "left is null");
+        requireNonNull(right, "right is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrArithmeticBinary(this, context);
     }
 
-    @JsonProperty
-    public Operator getOperator()
-    {
-        return operator;
-    }
-
-    @JsonProperty
-    public IrPathNode getLeft()
-    {
-        return left;
-    }
-
-    @JsonProperty
-    public IrPathNode getRight()
-    {
-        return right;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrArithmeticBinary other = (IrArithmeticBinary) obj;
-        return this.operator == other.operator &&
-                Objects.equals(this.left, other.left) &&
-                Objects.equals(this.right, other.right);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(operator, left, right);
-    }
-
     public enum Operator
     {
         ADD(OperatorType.ADD),
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrArithmeticUnary.java b/core/trino-main/src/main/java/io/trino/json/ir/IrArithmeticUnary.java
index 29892d7a6f1d..c1c57db81e78 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrArithmeticUnary.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrArithmeticUnary.java
@@ -13,66 +13,28 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
-import java.util.Objects;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
-public class IrArithmeticUnary
-        extends IrPathNode
+public record IrArithmeticUnary(Sign sign, IrPathNode base, Optional<Type> type)
+        implements IrPathNode
 {
-    private final Sign sign;
-    private final IrPathNode base;
-
-    @JsonCreator
-    public IrArithmeticUnary(@JsonProperty("sign") Sign sign, @JsonProperty("base") IrPathNode base, @JsonProperty("type") Optional<Type> type)
+    public IrArithmeticUnary
     {
-        super(type);
-        this.sign = requireNonNull(sign, "sign is null");
-        this.base = requireNonNull(base, "base is null");
+        requireNonNull(type, "type is null");
+        requireNonNull(sign, "sign is null");
+        requireNonNull(base, "base is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrArithmeticUnary(this, context);
     }
 
-    @JsonProperty
-    public Sign getSign()
-    {
-        return sign;
-    }
-
-    @JsonProperty
-    public IrPathNode getBase()
-    {
-        return base;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrArithmeticUnary other = (IrArithmeticUnary) obj;
-        return this.sign == other.sign && Objects.equals(this.base, other.base);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(sign, base);
-    }
-
     public enum Sign
     {
         PLUS("+"),
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrArrayAccessor.java b/core/trino-main/src/main/java/io/trino/json/ir/IrArrayAccessor.java
index 4c05624af5c4..a6008ec12fd1 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrArrayAccessor.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrArrayAccessor.java
@@ -13,101 +13,36 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableList;
 import io.trino.spi.type.Type;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
-public class IrArrayAccessor
-        extends IrAccessor
+public record IrArrayAccessor(IrPathNode base, List<Subscript> subscripts, Optional<Type> type)
+        implements IrPathNode
 {
-    // list of subscripts or empty list for wildcard array accessor
-    private final List<Subscript> subscripts;
-
-    @JsonCreator
-    public IrArrayAccessor(@JsonProperty("base") IrPathNode base, @JsonProperty("subscripts") List<Subscript> subscripts, @JsonProperty("type") Optional<Type> type)
+    public IrArrayAccessor(IrPathNode base, List<Subscript> subscripts, Optional<Type> type)
     {
-        super(base, type);
-        this.subscripts = requireNonNull(subscripts, "subscripts is null");
+        this.type = requireNonNull(type, "type is null");
+        this.base = requireNonNull(base, "array accessor base is null");
+        this.subscripts = ImmutableList.copyOf(subscripts);
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrArrayAccessor(this, context);
     }
 
-    @JsonProperty
-    public List<Subscript> getSubscripts()
-    {
-        return subscripts;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrArrayAccessor other = (IrArrayAccessor) obj;
-        return Objects.equals(this.base, other.base) && Objects.equals(this.subscripts, other.subscripts);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(base, subscripts);
-    }
-
-    public static class Subscript
+    public record Subscript(IrPathNode from, Optional<IrPathNode> to)
     {
-        private final IrPathNode from;
-        private final Optional<IrPathNode> to;
-
-        @JsonCreator
-        public Subscript(@JsonProperty("from") IrPathNode from, @JsonProperty("to") Optional<IrPathNode> to)
-        {
-            this.from = requireNonNull(from, "from is null");
-            this.to = requireNonNull(to, "to is null");
-        }
-
-        @JsonProperty
-        public IrPathNode getFrom()
-        {
-            return from;
-        }
-
-        @JsonProperty
-        public Optional<IrPathNode> getTo()
-        {
-            return to;
-        }
-
-        @Override
-        public boolean equals(Object obj)
-        {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null || getClass() != obj.getClass()) {
-                return false;
-            }
-            Subscript other = (Subscript) obj;
-            return Objects.equals(this.from, other.from) && Objects.equals(this.to, other.to);
-        }
-
-        @Override
-        public int hashCode()
+        public Subscript
         {
-            return Objects.hash(from, to);
+            requireNonNull(from, "from is null");
+            requireNonNull(to, "to is null");
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrCeilingMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrCeilingMethod.java
index 05c00b8270bb..effc0ab2d2ad 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrCeilingMethod.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrCeilingMethod.java
@@ -13,23 +13,23 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
 import java.util.Optional;
 
-public class IrCeilingMethod
-        extends IrMethod
+import static java.util.Objects.requireNonNull;
+
+public record IrCeilingMethod(IrPathNode base, Optional<Type> type)
+        implements IrPathNode
 {
-    @JsonCreator
-    public IrCeilingMethod(@JsonProperty("base") IrPathNode base, @JsonProperty("type") Optional<Type> type)
+    public IrCeilingMethod
     {
-        super(base, type);
+        requireNonNull(type, "type is null");
+        requireNonNull(base, "ceiling() method base is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrCeilingMethod(this, context);
     }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrComparisonPredicate.java b/core/trino-main/src/main/java/io/trino/json/ir/IrComparisonPredicate.java
index ad3a40507d1c..63755d5e2e58 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrComparisonPredicate.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrComparisonPredicate.java
@@ -13,74 +13,24 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Objects;
-
 import static java.util.Objects.requireNonNull;
 
-public class IrComparisonPredicate
-        extends IrPredicate
+public record IrComparisonPredicate(Operator operator, IrPathNode left, IrPathNode right)
+        implements IrPredicate
 {
-    private final Operator operator;
-    private final IrPathNode left;
-    private final IrPathNode right;
-
-    @JsonCreator
-    public IrComparisonPredicate(@JsonProperty("operator") Operator operator, @JsonProperty("left") IrPathNode left, @JsonProperty("right") IrPathNode right)
+    public IrComparisonPredicate
     {
-        super();
-        this.operator = requireNonNull(operator, "operator is null");
-        this.left = requireNonNull(left, "left is null");
-        this.right = requireNonNull(right, "right is null");
+        requireNonNull(operator, "operator is null");
+        requireNonNull(left, "left is null");
+        requireNonNull(right, "right is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrComparisonPredicate(this, context);
     }
 
-    @JsonProperty
-    public Operator getOperator()
-    {
-        return operator;
-    }
-
-    @JsonProperty
-    public IrPathNode getLeft()
-    {
-        return left;
-    }
-
-    @JsonProperty
-    public IrPathNode getRight()
-    {
-        return right;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrComparisonPredicate other = (IrComparisonPredicate) obj;
-        return this.operator == other.operator &&
-                Objects.equals(this.left, other.left) &&
-                Objects.equals(this.right, other.right);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(operator, left, right);
-    }
-
     public enum Operator
     {
         EQUAL,
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrConjunctionPredicate.java b/core/trino-main/src/main/java/io/trino/json/ir/IrConjunctionPredicate.java
index af604abb9a37..4d7ce0f31f63 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrConjunctionPredicate.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrConjunctionPredicate.java
@@ -13,62 +13,20 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Objects;
-
 import static java.util.Objects.requireNonNull;
 
-public class IrConjunctionPredicate
-        extends IrPredicate
+public record IrConjunctionPredicate(IrPredicate left, IrPredicate right)
+        implements IrPredicate
 {
-    private final IrPredicate left;
-    private final IrPredicate right;
-
-    @JsonCreator
-    public IrConjunctionPredicate(@JsonProperty("left") IrPredicate left, @JsonProperty("right") IrPredicate right)
+    public IrConjunctionPredicate
     {
-        super();
-        this.left = requireNonNull(left, "left is null");
-        this.right = requireNonNull(right, "right is null");
+        requireNonNull(left, "left is null");
+        requireNonNull(right, "right is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrConjunctionPredicate(this, context);
     }
-
-    @JsonProperty
-    public IrPathNode getLeft()
-    {
-        return left;
-    }
-
-    @JsonProperty
-    public IrPathNode getRight()
-    {
-        return right;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrConjunctionPredicate other = (IrConjunctionPredicate) obj;
-        return Objects.equals(this.left, other.left) &&
-                Objects.equals(this.right, other.right);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(left, right);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrConstantJsonSequence.java b/core/trino-main/src/main/java/io/trino/json/ir/IrConstantJsonSequence.java
index 5820f0af6b45..74b12daf36d6 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrConstantJsonSequence.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrConstantJsonSequence.java
@@ -13,65 +13,34 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.type.Type;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
-public class IrConstantJsonSequence
-        extends IrPathNode
+public record IrConstantJsonSequence(List<JsonNode> sequence, Optional<Type> type)
+        implements IrPathNode
 {
     public static final IrConstantJsonSequence EMPTY_SEQUENCE = new IrConstantJsonSequence(ImmutableList.of(), Optional.empty());
 
-    private final List<JsonNode> sequence;
-
     public static IrConstantJsonSequence singletonSequence(JsonNode jsonNode, Optional<Type> type)
     {
         return new IrConstantJsonSequence(ImmutableList.of(jsonNode), type);
     }
 
-    @JsonCreator
-    public IrConstantJsonSequence(@JsonProperty("sequence") List<JsonNode> sequence, @JsonProperty("type") Optional<Type> type)
+    public IrConstantJsonSequence(List<JsonNode> sequence, Optional<Type> type)
     {
-        super(type);
-        this.sequence = ImmutableList.copyOf(requireNonNull(sequence, "sequence is null"));
+        this.type = requireNonNull(type, "type is null");
+        this.sequence = ImmutableList.copyOf(sequence);
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrConstantJsonSequence(this, context);
     }
-
-    @JsonProperty
-    public List<JsonNode> getSequence()
-    {
-        return sequence;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrConstantJsonSequence other = (IrConstantJsonSequence) obj;
-        return Objects.equals(this.sequence, other.sequence);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(sequence);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrContextVariable.java b/core/trino-main/src/main/java/io/trino/json/ir/IrContextVariable.java
index b4f633ae42e9..501c6f954b22 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrContextVariable.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrContextVariable.java
@@ -13,39 +13,23 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
 import java.util.Optional;
 
-public class IrContextVariable
-        extends IrPathNode
+import static java.util.Objects.requireNonNull;
+
+public record IrContextVariable(Optional<Type> type)
+        implements IrPathNode
 {
-    @JsonCreator
-    public IrContextVariable(@JsonProperty("type") Optional<Type> type)
+    public IrContextVariable
     {
-        super(type);
+        requireNonNull(type, "type is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrContextVariable(this, context);
     }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        return obj != null && getClass() == obj.getClass();
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return getClass().hashCode();
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrDatetimeMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrDatetimeMethod.java
index 5381e08b2708..a8d7026c4085 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrDatetimeMethod.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrDatetimeMethod.java
@@ -13,55 +13,25 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
-import java.util.Objects;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
-public class IrDatetimeMethod
-        extends IrMethod
+public record IrDatetimeMethod(IrPathNode base, Optional<String> format, Optional<Type> type)
+        implements IrPathNode
 {
-    private final Optional<String> format; // this is a string literal
-
-    @JsonCreator
-    public IrDatetimeMethod(@JsonProperty("base") IrPathNode base, @JsonProperty("format") Optional<String> format, @JsonProperty("type") Optional<Type> type)
+    public IrDatetimeMethod
     {
-        super(base, type);
-        this.format = requireNonNull(format, "format is null");
+        requireNonNull(type, "type is null");
+        requireNonNull(base, "datetime() method base is null");
+        requireNonNull(format, "format is null"); // this is a string literal
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrDatetimeMethod(this, context);
     }
-
-    @JsonProperty
-    public Optional<String> getFormat()
-    {
-        return format;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrDatetimeMethod other = (IrDatetimeMethod) obj;
-        return Objects.equals(this.base, other.base) && Objects.equals(this.format, other.format);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(base, format);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrDescendantMemberAccessor.java b/core/trino-main/src/main/java/io/trino/json/ir/IrDescendantMemberAccessor.java
new file mode 100644
index 000000000000..9995b0e300b1
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrDescendantMemberAccessor.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.json.ir;
+
+import io.trino.spi.type.Type;
+
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrDescendantMemberAccessor(IrPathNode base, String key, Optional<Type> type)
+        implements IrPathNode
+{
+    public IrDescendantMemberAccessor
+    {
+        requireNonNull(type, "type is null");
+        requireNonNull(base, "descendant member accessor base is null");
+        requireNonNull(key, "key is null");
+    }
+
+    @Override
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitIrDescendantMemberAccessor(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrDisjunctionPredicate.java b/core/trino-main/src/main/java/io/trino/json/ir/IrDisjunctionPredicate.java
index 58df11a0a806..86dfc7f4fbb1 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrDisjunctionPredicate.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrDisjunctionPredicate.java
@@ -13,62 +13,20 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Objects;
-
 import static java.util.Objects.requireNonNull;
 
-public class IrDisjunctionPredicate
-        extends IrPredicate
+public record IrDisjunctionPredicate(IrPredicate left, IrPredicate right)
+        implements IrPredicate
 {
-    private final IrPredicate left;
-    private final IrPredicate right;
-
-    @JsonCreator
-    public IrDisjunctionPredicate(@JsonProperty("left") IrPredicate left, @JsonProperty("right") IrPredicate right)
+    public IrDisjunctionPredicate
     {
-        super();
-        this.left = requireNonNull(left, "left is null");
-        this.right = requireNonNull(right, "right is null");
+        requireNonNull(left, "left is null");
+        requireNonNull(right, "right is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrDisjunctionPredicate(this, context);
     }
-
-    @JsonProperty
-    public IrPathNode getLeft()
-    {
-        return left;
-    }
-
-    @JsonProperty
-    public IrPathNode getRight()
-    {
-        return right;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrDisjunctionPredicate other = (IrDisjunctionPredicate) obj;
-        return Objects.equals(this.left, other.left) &&
-                Objects.equals(this.right, other.right);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(left, right);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrDoubleMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrDoubleMethod.java
index bd6e3042fdb1..7077f366d6d4 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrDoubleMethod.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrDoubleMethod.java
@@ -14,22 +14,24 @@
 package io.trino.json.ir;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
 import java.util.Optional;
 
-public class IrDoubleMethod
-        extends IrMethod
+import static java.util.Objects.requireNonNull;
+
+public record IrDoubleMethod(IrPathNode base, Optional<Type> type)
+        implements IrPathNode
 {
     @JsonCreator
-    public IrDoubleMethod(@JsonProperty("base") IrPathNode base, @JsonProperty("type") Optional<Type> type)
+    public IrDoubleMethod
     {
-        super(base, type);
+        requireNonNull(type, "type is null");
+        requireNonNull(base, "double() method base is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrDoubleMethod(this, context);
     }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrExistsPredicate.java b/core/trino-main/src/main/java/io/trino/json/ir/IrExistsPredicate.java
index bfee654ed3d8..0875b18e5254 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrExistsPredicate.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrExistsPredicate.java
@@ -13,53 +13,19 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Objects;
-
 import static java.util.Objects.requireNonNull;
 
-public class IrExistsPredicate
-        extends IrPredicate
+public record IrExistsPredicate(IrPathNode path)
+        implements IrPredicate
 {
-    private final IrPathNode path;
-
-    @JsonCreator
-    public IrExistsPredicate(@JsonProperty("path") IrPathNode path)
+    public IrExistsPredicate
     {
-        super();
-        this.path = requireNonNull(path, "path is null");
+        requireNonNull(path, "path is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrExistsPredicate(this, context);
     }
-
-    @JsonProperty
-    public IrPathNode getPath()
-    {
-        return path;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrExistsPredicate other = (IrExistsPredicate) obj;
-        return Objects.equals(this.path, other.path);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(path);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrFilter.java b/core/trino-main/src/main/java/io/trino/json/ir/IrFilter.java
index d35068aa2f97..878f80568aee 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrFilter.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrFilter.java
@@ -13,55 +13,25 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
-import java.util.Objects;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
-public class IrFilter
-        extends IrAccessor
+public record IrFilter(IrPathNode base, IrPredicate predicate, Optional<Type> type)
+        implements IrPathNode
 {
-    private final IrPredicate predicate;
-
-    @JsonCreator
-    public IrFilter(@JsonProperty("base") IrPathNode base, @JsonProperty("predicate") IrPredicate predicate, @JsonProperty("type") Optional<Type> type)
+    public IrFilter
     {
-        super(base, type);
-        this.predicate = requireNonNull(predicate, "predicate is null");
+        requireNonNull(type, "type is null");
+        requireNonNull(base, "filter base is null");
+        requireNonNull(predicate, "predicate is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrFilter(this, context);
     }
-
-    @JsonProperty
-    public IrPredicate getPredicate()
-    {
-        return predicate;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrFilter other = (IrFilter) obj;
-        return Objects.equals(this.base, other.base) && Objects.equals(this.predicate, other.predicate);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(base, predicate);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrFloorMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrFloorMethod.java
index 74acfbd567e9..81ae7d31a860 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrFloorMethod.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrFloorMethod.java
@@ -13,23 +13,23 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
 import java.util.Optional;
 
-public class IrFloorMethod
-        extends IrMethod
+import static java.util.Objects.requireNonNull;
+
+public record IrFloorMethod(IrPathNode base, Optional<Type> type)
+        implements IrPathNode
 {
-    @JsonCreator
-    public IrFloorMethod(@JsonProperty("base") IrPathNode base, @JsonProperty("type") Optional<Type> type)
+    public IrFloorMethod
     {
-        super(base, type);
+        requireNonNull(type, "type is null");
+        requireNonNull(base, "floor() method base is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrFloorMethod(this, context);
     }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrIsUnknownPredicate.java b/core/trino-main/src/main/java/io/trino/json/ir/IrIsUnknownPredicate.java
index 13ce6acc612d..d3111890436a 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrIsUnknownPredicate.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrIsUnknownPredicate.java
@@ -13,53 +13,19 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Objects;
-
 import static java.util.Objects.requireNonNull;
 
-public class IrIsUnknownPredicate
-        extends IrPredicate
+public record IrIsUnknownPredicate(IrPredicate predicate)
+        implements IrPredicate
 {
-    private final IrPredicate predicate;
-
-    @JsonCreator
-    public IrIsUnknownPredicate(@JsonProperty("predicate") IrPredicate predicate)
+    public IrIsUnknownPredicate
     {
-        super();
-        this.predicate = requireNonNull(predicate, "predicate is null");
+        requireNonNull(predicate, "predicate is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrIsUnknownPredicate(this, context);
     }
-
-    @JsonProperty
-    public IrPredicate getPredicate()
-    {
-        return predicate;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrIsUnknownPredicate other = (IrIsUnknownPredicate) obj;
-        return Objects.equals(this.predicate, other.predicate);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(predicate);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrJsonNull.java b/core/trino-main/src/main/java/io/trino/json/ir/IrJsonNull.java
index ac7495a9d195..fe2a9db577f3 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrJsonNull.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrJsonNull.java
@@ -13,37 +13,14 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-
-import java.util.Optional;
-
-public class IrJsonNull
-        extends IrPathNode
+public enum IrJsonNull
+        implements IrPathNode
 {
-    @JsonCreator
-    public IrJsonNull()
-    {
-        super(Optional.empty());
-    }
+    JSON_NULL;
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrJsonNull(this, context);
     }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        return obj != null && getClass() == obj.getClass();
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return getClass().hashCode();
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrJsonPathVisitor.java b/core/trino-main/src/main/java/io/trino/json/ir/IrJsonPathVisitor.java
index b65c8107856c..edc0bf9d04ad 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrJsonPathVisitor.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrJsonPathVisitor.java
@@ -13,7 +13,7 @@
  */
 package io.trino.json.ir;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 public abstract class IrJsonPathVisitor<R, C>
 {
@@ -32,11 +32,6 @@ protected R visitIrPathNode(IrPathNode node, C context)
         return null;
     }
 
-    protected R visitIrAccessor(IrAccessor node, C context)
-    {
-        return visitIrPathNode(node, context);
-    }
-
     protected R visitIrComparisonPredicate(IrComparisonPredicate node, C context)
     {
         return visitIrPredicate(node, context);
@@ -57,14 +52,9 @@ protected R visitIrExistsPredicate(IrExistsPredicate node, C context)
         return visitIrPredicate(node, context);
     }
 
-    protected R visitIrMethod(IrMethod node, C context)
-    {
-        return visitIrAccessor(node, context);
-    }
-
     protected R visitIrAbsMethod(IrAbsMethod node, C context)
     {
-        return visitIrMethod(node, context);
+        return visitIrPathNode(node, context);
     }
 
     protected R visitIrArithmeticBinary(IrArithmeticBinary node, C context)
@@ -79,12 +69,12 @@ protected R visitIrArithmeticUnary(IrArithmeticUnary node, C context)
 
     protected R visitIrArrayAccessor(IrArrayAccessor node, C context)
     {
-        return visitIrAccessor(node, context);
+        return visitIrPathNode(node, context);
     }
 
     protected R visitIrCeilingMethod(IrCeilingMethod node, C context)
     {
-        return visitIrMethod(node, context);
+        return visitIrPathNode(node, context);
     }
 
     protected R visitIrConstantJsonSequence(IrConstantJsonSequence node, C context)
@@ -99,22 +89,27 @@ protected R visitIrContextVariable(IrContextVariable node, C context)
 
     protected R visitIrDatetimeMethod(IrDatetimeMethod node, C context)
     {
-        return visitIrMethod(node, context);
+        return visitIrPathNode(node, context);
+    }
+
+    protected R visitIrDescendantMemberAccessor(IrDescendantMemberAccessor node, C context)
+    {
+        return visitIrPathNode(node, context);
     }
 
     protected R visitIrDoubleMethod(IrDoubleMethod node, C context)
     {
-        return visitIrMethod(node, context);
+        return visitIrPathNode(node, context);
     }
 
     protected R visitIrFilter(IrFilter node, C context)
     {
-        return visitIrAccessor(node, context);
+        return visitIrPathNode(node, context);
     }
 
     protected R visitIrFloorMethod(IrFloorMethod node, C context)
     {
-        return visitIrMethod(node, context);
+        return visitIrPathNode(node, context);
     }
 
     protected R visitIrIsUnknownPredicate(IrIsUnknownPredicate node, C context)
@@ -129,7 +124,7 @@ protected R visitIrJsonNull(IrJsonNull node, C context)
 
     protected R visitIrKeyValueMethod(IrKeyValueMethod node, C context)
     {
-        return visitIrMethod(node, context);
+        return visitIrPathNode(node, context);
     }
 
     protected R visitIrLastIndexVariable(IrLastIndexVariable node, C context)
@@ -144,7 +139,7 @@ protected R visitIrLiteral(IrLiteral node, C context)
 
     protected R visitIrMemberAccessor(IrMemberAccessor node, C context)
     {
-        return visitIrAccessor(node, context);
+        return visitIrPathNode(node, context);
     }
 
     protected R visitIrNamedJsonVariable(IrNamedJsonVariable node, C context)
@@ -174,7 +169,7 @@ protected R visitIrPredicateCurrentItemVariable(IrPredicateCurrentItemVariable n
 
     protected R visitIrSizeMethod(IrSizeMethod node, C context)
     {
-        return visitIrMethod(node, context);
+        return visitIrPathNode(node, context);
     }
 
     protected R visitIrStartsWithPredicate(IrStartsWithPredicate node, C context)
@@ -184,6 +179,6 @@ protected R visitIrStartsWithPredicate(IrStartsWithPredicate node, C context)
 
     protected R visitIrTypeMethod(IrTypeMethod node, C context)
     {
-        return visitIrMethod(node, context);
+        return visitIrPathNode(node, context);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrKeyValueMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrKeyValueMethod.java
index 5bf840a94686..2ca93a925302 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrKeyValueMethod.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrKeyValueMethod.java
@@ -13,22 +13,18 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import static java.util.Objects.requireNonNull;
 
-import java.util.Optional;
-
-public class IrKeyValueMethod
-        extends IrMethod
+public record IrKeyValueMethod(IrPathNode base)
+        implements IrPathNode
 {
-    @JsonCreator
-    public IrKeyValueMethod(@JsonProperty("base") IrPathNode base)
+    public IrKeyValueMethod
     {
-        super(base, Optional.empty());
+        requireNonNull(base, "keyvalue() method base is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrKeyValueMethod(this, context);
     }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrLastIndexVariable.java b/core/trino-main/src/main/java/io/trino/json/ir/IrLastIndexVariable.java
index c711e33471ec..cde090aa6d6c 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrLastIndexVariable.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrLastIndexVariable.java
@@ -13,39 +13,23 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
 import java.util.Optional;
 
-public class IrLastIndexVariable
-        extends IrPathNode
+import static java.util.Objects.requireNonNull;
+
+public record IrLastIndexVariable(Optional<Type> type)
+        implements IrPathNode
 {
-    @JsonCreator
-    public IrLastIndexVariable(@JsonProperty("type") Optional<Type> type)
+    public IrLastIndexVariable
     {
-        super(type);
+        requireNonNull(type, "type is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrLastIndexVariable(this, context);
     }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        return obj != null && getClass() == obj.getClass();
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return getClass().hashCode();
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrLiteral.java b/core/trino-main/src/main/java/io/trino/json/ir/IrLiteral.java
index 8acfe90bcf4b..36b7d754fd0b 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrLiteral.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrLiteral.java
@@ -14,12 +14,10 @@
 package io.trino.json.ir;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
 
-import java.util.Objects;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -27,16 +25,14 @@
 import static io.trino.spi.type.TypeUtils.readNativeValue;
 import static java.util.Objects.requireNonNull;
 
-public class IrLiteral
-        extends IrPathNode
+public record IrLiteral(Optional<Type> type, Object value)
+        implements IrPathNode
 {
-    // (boxed) native representation
-    private final Object value;
-
-    public IrLiteral(Type type, Object value)
+    public IrLiteral
     {
-        super(Optional.of(type));
-        this.value = requireNonNull(value, "value is null"); // no null values allowed
+        requireNonNull(type, "type is null");
+        checkArgument(type.isPresent(), "type is empty");
+        requireNonNull(value, "value is null"); // (boxed) native representation. No null values allowed.
     }
 
     @Deprecated // For JSON deserialization only
@@ -44,43 +40,18 @@ public IrLiteral(Type type, Object value)
     public static IrLiteral fromJson(@JsonProperty("type") Type type, @JsonProperty("valueAsBlock") Block value)
     {
         checkArgument(value.getPositionCount() == 1);
-        return new IrLiteral(type, readNativeValue(type, value, 0));
+        return new IrLiteral(Optional.of(type), readNativeValue(type, value, 0));
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrLiteral(this, context);
     }
 
-    @JsonIgnore
-    public Object getValue()
-    {
-        return value;
-    }
-
     @JsonProperty
     public Block getValueAsBlock()
     {
-        return nativeValueToBlock(getType().orElseThrow(), value);
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrLiteral other = (IrLiteral) obj;
-        return Objects.equals(this.value, other.value) && Objects.equals(this.getType(), other.getType());
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(value, getType());
+        return nativeValueToBlock(type().orElseThrow(), value);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrMemberAccessor.java b/core/trino-main/src/main/java/io/trino/json/ir/IrMemberAccessor.java
index 8e7c545a5fd8..03f7778168e5 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrMemberAccessor.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrMemberAccessor.java
@@ -13,56 +13,25 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
-import java.util.Objects;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
-public class IrMemberAccessor
-        extends IrAccessor
+public record IrMemberAccessor(IrPathNode base, Optional<String> key, Optional<Type> type)
+        implements IrPathNode
 {
-    // object member key or Optional.empty for wildcard member accessor
-    private final Optional<String> key;
-
-    @JsonCreator
-    public IrMemberAccessor(@JsonProperty("base") IrPathNode base, @JsonProperty("key") Optional<String> key, @JsonProperty("type") Optional<Type> type)
+    public IrMemberAccessor
     {
-        super(base, type);
-        this.key = requireNonNull(key, "key is null");
+        requireNonNull(type, "type is null");
+        requireNonNull(base, "member accessor base is null");
+        requireNonNull(key, "key is null"); // object member key or Optional.empty for wildcard member accessor
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrMemberAccessor(this, context);
     }
-
-    @JsonProperty
-    public Optional<String> getKey()
-    {
-        return key;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrMemberAccessor other = (IrMemberAccessor) obj;
-        return Objects.equals(this.base, other.base) && Objects.equals(this.key, other.key);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(base, key);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrMethod.java
deleted file mode 100644
index df5e5282fcfc..000000000000
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrMethod.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed 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 io.trino.json.ir;
-
-import io.trino.spi.type.Type;
-
-import java.util.Optional;
-
-public abstract class IrMethod
-        extends IrAccessor
-{
-    IrMethod(IrPathNode base, Optional<Type> type)
-    {
-        super(base, type);
-    }
-
-    @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
-    {
-        return visitor.visitIrMethod(this, context);
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrNamedJsonVariable.java b/core/trino-main/src/main/java/io/trino/json/ir/IrNamedJsonVariable.java
index 3c48143240a2..39cdb4c1d89e 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrNamedJsonVariable.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrNamedJsonVariable.java
@@ -13,56 +13,25 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
-import java.util.Objects;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
 
-public class IrNamedJsonVariable
-        extends IrPathNode
+public record IrNamedJsonVariable(int index, Optional<Type> type)
+        implements IrPathNode
 {
-    private final int index;
-
-    @JsonCreator
-    public IrNamedJsonVariable(@JsonProperty("index") int index, @JsonProperty("type") Optional<Type> type)
+    public IrNamedJsonVariable
     {
-        super(type);
+        requireNonNull(type, "type is null");
         checkArgument(index >= 0, "parameter index is negative");
-        this.index = index;
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrNamedJsonVariable(this, context);
     }
-
-    @JsonProperty
-    public int getIndex()
-    {
-        return index;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrNamedJsonVariable other = (IrNamedJsonVariable) obj;
-        return this.index == other.index;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(index);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrNamedValueVariable.java b/core/trino-main/src/main/java/io/trino/json/ir/IrNamedValueVariable.java
index 80f95c5eef6a..426927d0cfa5 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrNamedValueVariable.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrNamedValueVariable.java
@@ -13,56 +13,25 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
-import java.util.Objects;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
 
-public class IrNamedValueVariable
-        extends IrPathNode
+public record IrNamedValueVariable(int index, Optional<Type> type)
+        implements IrPathNode
 {
-    private final int index;
-
-    @JsonCreator
-    public IrNamedValueVariable(@JsonProperty("index") int index, @JsonProperty("type") Optional<Type> type)
+    public IrNamedValueVariable
     {
-        super(type);
+        requireNonNull(type, "type is null");
         checkArgument(index >= 0, "parameter index is negative");
-        this.index = index;
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrNamedValueVariable(this, context);
     }
-
-    @JsonProperty
-    public int getIndex()
-    {
-        return index;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrNamedValueVariable other = (IrNamedValueVariable) obj;
-        return this.index == other.index;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(index);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrNegationPredicate.java b/core/trino-main/src/main/java/io/trino/json/ir/IrNegationPredicate.java
index 275fd764e188..eb1fe12296b5 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrNegationPredicate.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrNegationPredicate.java
@@ -13,53 +13,19 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Objects;
-
 import static java.util.Objects.requireNonNull;
 
-public class IrNegationPredicate
-        extends IrPredicate
+public record IrNegationPredicate(IrPredicate predicate)
+        implements IrPredicate
 {
-    private final IrPredicate predicate;
-
-    @JsonCreator
-    public IrNegationPredicate(@JsonProperty("predicate") IrPredicate predicate)
+    public IrNegationPredicate
     {
-        super();
-        this.predicate = requireNonNull(predicate, "predicate is null");
+        requireNonNull(predicate, "predicate is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrNegationPredicate(this, context);
     }
-
-    @JsonProperty
-    public IrPredicate getPredicate()
-    {
-        return predicate;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrNegationPredicate other = (IrNegationPredicate) obj;
-        return Objects.equals(this.predicate, other.predicate);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(predicate);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrPathNode.java b/core/trino-main/src/main/java/io/trino/json/ir/IrPathNode.java
index b7dc3f45b256..3f96ee33916c 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrPathNode.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrPathNode.java
@@ -13,15 +13,12 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.trino.spi.type.Type;
 
 import java.util.Optional;
 
-import static java.util.Objects.requireNonNull;
-
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
         property = "@type")
@@ -36,6 +33,7 @@
         @JsonSubTypes.Type(value = IrConstantJsonSequence.class, name = "jsonsequence"),
         @JsonSubTypes.Type(value = IrContextVariable.class, name = "contextvariable"),
         @JsonSubTypes.Type(value = IrDatetimeMethod.class, name = "datetime"),
+        @JsonSubTypes.Type(value = IrDescendantMemberAccessor.class, name = "descendantmemberaccessor"),
         @JsonSubTypes.Type(value = IrDisjunctionPredicate.class, name = "disjunction"),
         @JsonSubTypes.Type(value = IrDoubleMethod.class, name = "double"),
         @JsonSubTypes.Type(value = IrExistsPredicate.class, name = "exists"),
@@ -55,20 +53,34 @@
         @JsonSubTypes.Type(value = IrStartsWithPredicate.class, name = "startswith"),
         @JsonSubTypes.Type(value = IrTypeMethod.class, name = "type"),
 })
-public abstract class IrPathNode
-{
-    // `type` is intentionally skipped in equals() and hashCode() methods of all IrPathNodes, so that
-    // those methods consider te node's structure only. `type` is a function of the other properties,
-    // and it might be optionally set or not, depending on when and how the node is created - e.g. either
-    // initially or by some optimization that will be added in the future (like constant folding, tree flattening).
-    private final Optional<Type> type;
-
-    protected IrPathNode(Optional<Type> type)
-    {
-        this.type = requireNonNull(type, "type is null");
-    }
 
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+public sealed interface IrPathNode
+        permits
+        IrAbsMethod,
+        IrArithmeticBinary,
+        IrArithmeticUnary,
+        IrArrayAccessor,
+        IrCeilingMethod,
+        IrConstantJsonSequence,
+        IrContextVariable,
+        IrDatetimeMethod,
+        IrDescendantMemberAccessor,
+        IrDoubleMethod,
+        IrFilter,
+        IrFloorMethod,
+        IrJsonNull,
+        IrKeyValueMethod,
+        IrLastIndexVariable,
+        IrLiteral,
+        IrMemberAccessor,
+        IrNamedJsonVariable,
+        IrNamedValueVariable,
+        IrPredicate,
+        IrPredicateCurrentItemVariable,
+        IrSizeMethod,
+        IrTypeMethod
+{
+    default <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrPathNode(this, context);
     }
@@ -82,15 +94,8 @@ protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
      * NOTE: Type is not applicable to every IrPathNode. If the IrPathNode produces an empty sequence,
      * a JSON null, or a sequence containing non-literal JSON items, Type cannot be determined.
      */
-    @JsonProperty
-    public final Optional<Type> getType()
+    default Optional<Type> type()
     {
-        return type;
+        return Optional.empty();
     }
-
-    @Override
-    public abstract boolean equals(Object obj);
-
-    @Override
-    public abstract int hashCode();
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrPredicate.java b/core/trino-main/src/main/java/io/trino/json/ir/IrPredicate.java
index 2f2fe90d1e60..8b48d07f8b91 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrPredicate.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrPredicate.java
@@ -13,21 +13,25 @@
  */
 package io.trino.json.ir;
 
+import io.trino.spi.type.Type;
+
 import java.util.Optional;
 
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 
-public abstract class IrPredicate
+public sealed interface IrPredicate
         extends IrPathNode
+        permits IrComparisonPredicate, IrConjunctionPredicate, IrDisjunctionPredicate, IrExistsPredicate, IrIsUnknownPredicate, IrNegationPredicate, IrStartsWithPredicate
 {
-    IrPredicate()
+    @Override
+    default <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
-        super(Optional.of(BOOLEAN));
+        return visitor.visitIrPredicate(this, context);
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    default Optional<Type> type()
     {
-        return visitor.visitIrPredicate(this, context);
+        return Optional.of(BOOLEAN);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrPredicateCurrentItemVariable.java b/core/trino-main/src/main/java/io/trino/json/ir/IrPredicateCurrentItemVariable.java
index fc75f571752f..a4356d47d22a 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrPredicateCurrentItemVariable.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrPredicateCurrentItemVariable.java
@@ -13,39 +13,23 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
 import java.util.Optional;
 
-public class IrPredicateCurrentItemVariable
-        extends IrPathNode
+import static java.util.Objects.requireNonNull;
+
+public record IrPredicateCurrentItemVariable(Optional<Type> type)
+        implements IrPathNode
 {
-    @JsonCreator
-    public IrPredicateCurrentItemVariable(@JsonProperty("type") Optional<Type> type)
+    public IrPredicateCurrentItemVariable
     {
-        super(type);
+        requireNonNull(type, "type is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrPredicateCurrentItemVariable(this, context);
     }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        return obj != null && getClass() == obj.getClass();
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return getClass().hashCode();
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrSizeMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrSizeMethod.java
index 34a61af8c443..687584dc3ec6 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrSizeMethod.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrSizeMethod.java
@@ -13,23 +13,23 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
 import java.util.Optional;
 
-public class IrSizeMethod
-        extends IrMethod
+import static java.util.Objects.requireNonNull;
+
+public record IrSizeMethod(IrPathNode base, Optional<Type> type)
+        implements IrPathNode
 {
-    @JsonCreator
-    public IrSizeMethod(@JsonProperty("base") IrPathNode base, @JsonProperty("type") Optional<Type> type)
+    public IrSizeMethod
     {
-        super(base, type);
+        requireNonNull(type, "type is null");
+        requireNonNull(base, "size() method base is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrSizeMethod(this, context);
     }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrStartsWithPredicate.java b/core/trino-main/src/main/java/io/trino/json/ir/IrStartsWithPredicate.java
index 7da485d7d8de..90a9f657b7aa 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrStartsWithPredicate.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrStartsWithPredicate.java
@@ -13,62 +13,20 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Objects;
-
 import static java.util.Objects.requireNonNull;
 
-public class IrStartsWithPredicate
-        extends IrPredicate
+public record IrStartsWithPredicate(IrPathNode value, IrPathNode prefix)
+        implements IrPredicate
 {
-    private final IrPathNode value;
-    private final IrPathNode prefix;
-
-    @JsonCreator
-    public IrStartsWithPredicate(@JsonProperty("value") IrPathNode value, @JsonProperty("prefix") IrPathNode prefix)
+    public IrStartsWithPredicate
     {
-        super();
-        this.value = requireNonNull(value, "value is null");
-        this.prefix = requireNonNull(prefix, "prefix is null");
+        requireNonNull(value, "value is null");
+        requireNonNull(prefix, "prefix is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrStartsWithPredicate(this, context);
     }
-
-    @JsonProperty
-    public IrPathNode getValue()
-    {
-        return value;
-    }
-
-    @JsonProperty
-    public IrPathNode getPrefix()
-    {
-        return prefix;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        IrStartsWithPredicate other = (IrStartsWithPredicate) obj;
-        return Objects.equals(this.value, other.value) &&
-                Objects.equals(this.prefix, other.prefix);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(value, prefix);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrTypeMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrTypeMethod.java
index 3545ee7457aa..bc2591e243ed 100644
--- a/core/trino-main/src/main/java/io/trino/json/ir/IrTypeMethod.java
+++ b/core/trino-main/src/main/java/io/trino/json/ir/IrTypeMethod.java
@@ -13,23 +13,23 @@
  */
 package io.trino.json.ir;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
 import java.util.Optional;
 
-public class IrTypeMethod
-        extends IrMethod
+import static java.util.Objects.requireNonNull;
+
+public record IrTypeMethod(IrPathNode base, Optional<Type> type)
+        implements IrPathNode
 {
-    @JsonCreator
-    public IrTypeMethod(@JsonProperty("base") IrPathNode base, @JsonProperty("type") Optional<Type> type)
+    public IrTypeMethod
     {
-        super(base, type);
+        requireNonNull(type, "type is null");
+        requireNonNull(base, "type() method base is null");
     }
 
     @Override
-    protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
+    public <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrTypeMethod(this, context);
     }
diff --git a/core/trino-main/src/main/java/io/trino/likematcher/FjsMatcher.java b/core/trino-main/src/main/java/io/trino/likematcher/FjsMatcher.java
new file mode 100644
index 000000000000..24fee50d8072
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/likematcher/FjsMatcher.java
@@ -0,0 +1,212 @@
+/*
+ * Licensed 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 io.trino.likematcher;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+public class FjsMatcher
+        implements Matcher
+{
+    private final List<Pattern> pattern;
+    private final int start;
+    private final int end;
+    private final boolean exact;
+
+    private volatile Fjs matcher;
+
+    public FjsMatcher(List<Pattern> pattern, int start, int end, boolean exact)
+    {
+        this.pattern = requireNonNull(pattern, "pattern is null");
+        this.start = start;
+        this.end = end;
+        this.exact = exact;
+    }
+
+    @Override
+    public boolean match(byte[] input, int offset, int length)
+    {
+        Fjs matcher = this.matcher;
+        if (matcher == null) {
+            matcher = new Fjs(pattern, start, end, exact);
+            this.matcher = matcher;
+        }
+
+        return matcher.match(input, offset, length);
+    }
+
+    private static class Fjs
+    {
+        private final boolean exact;
+        private final List<byte[]> patterns = new ArrayList<>();
+        private final List<int[]> bmsShifts = new ArrayList<>();
+        private final List<int[]> kmpShifts = new ArrayList<>();
+
+        public Fjs(List<Pattern> pattern, int start, int end, boolean exact)
+        {
+            this.exact = exact;
+
+            for (int i = start; i <= end; i++) {
+                Pattern element = pattern.get(i);
+
+                if (element instanceof Pattern.Literal literal) {
+                    checkArgument(i == 0 || !(pattern.get(i - 1) instanceof Pattern.Literal), "Multiple consecutive literals found");
+                    byte[] bytes = literal.value().getBytes(StandardCharsets.UTF_8);
+                    patterns.add(bytes);
+                    bmsShifts.add(computeBmsShifts(bytes));
+                    kmpShifts.add(computeKmpShifts(bytes));
+                }
+                else if (element instanceof Pattern.Any) {
+                    throw new IllegalArgumentException("'any' pattern not supported");
+                }
+            }
+        }
+
+        private static int[] computeKmpShifts(byte[] pattern)
+        {
+            int[] result = new int[pattern.length + 1];
+            result[0] = -1;
+
+            int j = -1;
+            for (int i = 1; i < result.length; i++) {
+                while (j >= 0 && pattern[i - 1] != pattern[j]) {
+                    j = result[j];
+                }
+                j++;
+                result[i] = j;
+            }
+
+            return result;
+        }
+
+        private static int[] computeBmsShifts(byte[] pattern)
+        {
+            int[] result = new int[256];
+
+            for (int i = 0; i < pattern.length; i++) {
+                result[pattern[i] & 0xFF] = i + 1;
+            }
+
+            return result;
+        }
+
+        private static int find(byte[] input, final int offset, final int length, byte[] pattern, int[] bmsShifts, int[] kmpShifts)
+        {
+            if (pattern.length > length || pattern.length == 0) {
+                return -1;
+            }
+
+            final int inputLimit = offset + length;
+
+            int i = offset;
+            while (true) {
+                // Attempt to match the last position of the pattern
+                // As long as it doesn't match, skip ahead based on the Boyer-Moore-Sunday heuristic
+                int matchEnd = i + pattern.length - 1;
+                while (matchEnd < inputLimit - 1 && input[matchEnd] != pattern[pattern.length - 1]) {
+                    int shift = pattern.length + 1 - bmsShifts[input[matchEnd + 1] & 0xFF];
+                    matchEnd += shift;
+                }
+
+                if (matchEnd == inputLimit - 1 && match(input, inputLimit - pattern.length, pattern)) {
+                    return inputLimit - pattern.length;
+                }
+                else if (matchEnd >= inputLimit - 1) {
+                    return -1;
+                }
+
+                // At this point, we know the last position of the pattern matches with some
+                // position in the input text given by "matchEnd"
+                // Use KMP to match the first length-1 characters of the pattern
+
+                i = matchEnd - (pattern.length - 1);
+
+                int j = findLongestMatch(input, i, pattern, 0, pattern.length - 1);
+
+                if (j == pattern.length - 1) {
+                    return i;
+                }
+
+                i += j;
+                j = kmpShifts[j];
+
+                // Continue to match the whole pattern using KMP
+                while (j > 0) {
+                    int size = findLongestMatch(input, i, pattern, j, Math.min(inputLimit - i, pattern.length - j));
+                    i += size;
+                    j += size;
+
+                    if (j == pattern.length) {
+                        return i - j;
+                    }
+
+                    j = kmpShifts[j];
+                }
+
+                i++;
+            }
+        }
+
+        private static int findLongestMatch(byte[] input, int inputOffset, byte[] pattern, int patternOffset, int length)
+        {
+            for (int i = 0; i < length; i++) {
+                if (input[inputOffset + i] != pattern[patternOffset + i]) {
+                    return i;
+                }
+            }
+
+            return length;
+        }
+
+        private static boolean match(byte[] input, int offset, byte[] pattern)
+        {
+            for (int i = 0; i < pattern.length; i++) {
+                if (input[offset + i] != pattern[i]) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public boolean match(byte[] input, int offset, int length)
+        {
+            int start = offset;
+            int remaining = length;
+
+            for (int i = 0; i < patterns.size(); i++) {
+                if (remaining == 0) {
+                    return false;
+                }
+
+                byte[] term = patterns.get(i);
+
+                int position = find(input, start, remaining, term, bmsShifts.get(i), kmpShifts.get(i));
+                if (position == -1) {
+                    return false;
+                }
+
+                position += term.length;
+                remaining -= position - start;
+                start = position;
+            }
+
+            return !exact || remaining == 0;
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/likematcher/LikeMatcher.java b/core/trino-main/src/main/java/io/trino/likematcher/LikeMatcher.java
index 575cb25f2d7b..458661d29b3b 100644
--- a/core/trino-main/src/main/java/io/trino/likematcher/LikeMatcher.java
+++ b/core/trino-main/src/main/java/io/trino/likematcher/LikeMatcher.java
@@ -25,9 +25,6 @@
 
 public class LikeMatcher
 {
-    private final String pattern;
-    private final Optional<Character> escape;
-
     private final int minSize;
     private final OptionalInt maxSize;
     private final byte[] prefix;
@@ -35,16 +32,12 @@ public class LikeMatcher
     private final Optional<Matcher> matcher;
 
     private LikeMatcher(
-            String pattern,
-            Optional<Character> escape,
             int minSize,
             OptionalInt maxSize,
             byte[] prefix,
             byte[] suffix,
             Optional<Matcher> matcher)
     {
-        this.pattern = pattern;
-        this.escape = escape;
         this.minSize = minSize;
         this.maxSize = maxSize;
         this.prefix = prefix;
@@ -52,16 +45,6 @@ private LikeMatcher(
         this.matcher = matcher;
     }
 
-    public String getPattern()
-    {
-        return pattern;
-    }
-
-    public Optional<Character> getEscape()
-    {
-        return escape;
-    }
-
     public static LikeMatcher compile(String pattern)
     {
         return compile(pattern, Optional.empty(), true);
@@ -132,17 +115,37 @@ else if (expression instanceof Any any) {
 
         Optional<Matcher> matcher = Optional.empty();
         if (patternStart <= patternEnd) {
-            if (optimize) {
-                matcher = Optional.of(new DenseDfaMatcher(parsed, patternStart, patternEnd, exact));
+            boolean hasAny = false;
+            boolean hasAnyAfterZeroOrMore = false;
+            boolean foundZeroOrMore = false;
+            for (int i = patternStart; i <= patternEnd; i++) {
+                Pattern item = parsed.get(i);
+                if (item instanceof Any) {
+                    if (foundZeroOrMore) {
+                        hasAnyAfterZeroOrMore = true;
+                    }
+                    hasAny = true;
+                    break;
+                }
+                else if (item instanceof Pattern.ZeroOrMore) {
+                    foundZeroOrMore = true;
+                }
+            }
+
+            if (hasAny) {
+                if (optimize && !hasAnyAfterZeroOrMore) {
+                    matcher = Optional.of(new DenseDfaMatcher(parsed, patternStart, patternEnd, exact));
+                }
+                else {
+                    matcher = Optional.of(new NfaMatcher(parsed, patternStart, patternEnd, exact));
+                }
             }
             else {
-                matcher = Optional.of(new NfaMatcher(parsed, patternStart, patternEnd, exact));
+                matcher = Optional.of(new FjsMatcher(parsed, patternStart, patternEnd, exact));
             }
         }
 
         return new LikeMatcher(
-                pattern,
-                escape,
                 minSize,
                 unbounded ? OptionalInt.empty() : OptionalInt.of(maxSize),
                 prefix,
diff --git a/core/trino-main/src/main/java/io/trino/memory/ClusterMemoryLeakDetector.java b/core/trino-main/src/main/java/io/trino/memory/ClusterMemoryLeakDetector.java
index 5ca46639a185..d2f2d8074929 100644
--- a/core/trino-main/src/main/java/io/trino/memory/ClusterMemoryLeakDetector.java
+++ b/core/trino-main/src/main/java/io/trino/memory/ClusterMemoryLeakDetector.java
@@ -15,14 +15,13 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import io.trino.server.BasicQueryInfo;
 import io.trino.spi.QueryId;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
diff --git a/core/trino-main/src/main/java/io/trino/memory/ClusterMemoryManager.java b/core/trino-main/src/main/java/io/trino/memory/ClusterMemoryManager.java
index d5dd3b2462f9..629dcafd3dad 100644
--- a/core/trino-main/src/main/java/io/trino/memory/ClusterMemoryManager.java
+++ b/core/trino-main/src/main/java/io/trino/memory/ClusterMemoryManager.java
@@ -21,6 +21,8 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Streams;
 import com.google.common.io.Closer;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.http.client.HttpClient;
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
@@ -44,14 +46,11 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.memory.ClusterMemoryPoolManager;
 import io.trino.spi.memory.MemoryPoolInfo;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.JmxException;
 import org.weakref.jmx.MBeanExporter;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/core/trino-main/src/main/java/io/trino/memory/ClusterMemoryPool.java b/core/trino-main/src/main/java/io/trino/memory/ClusterMemoryPool.java
index e36c001e9916..901748099a09 100644
--- a/core/trino-main/src/main/java/io/trino/memory/ClusterMemoryPool.java
+++ b/core/trino-main/src/main/java/io/trino/memory/ClusterMemoryPool.java
@@ -14,14 +14,13 @@
 package io.trino.memory;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.spi.QueryId;
 import io.trino.spi.memory.MemoryAllocation;
 import io.trino.spi.memory.MemoryPoolInfo;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/memory/ForMemoryManager.java b/core/trino-main/src/main/java/io/trino/memory/ForMemoryManager.java
index 73fc29d4e425..757ff6a45e31 100644
--- a/core/trino-main/src/main/java/io/trino/memory/ForMemoryManager.java
+++ b/core/trino-main/src/main/java/io/trino/memory/ForMemoryManager.java
@@ -13,7 +13,7 @@
  */
 package io.trino.memory;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForMemoryManager
 {
 }
diff --git a/core/trino-main/src/main/java/io/trino/memory/LeastWastedEffortTaskLowMemoryKiller.java b/core/trino-main/src/main/java/io/trino/memory/LeastWastedEffortTaskLowMemoryKiller.java
index a9d509159208..90e0a83cd31c 100644
--- a/core/trino-main/src/main/java/io/trino/memory/LeastWastedEffortTaskLowMemoryKiller.java
+++ b/core/trino-main/src/main/java/io/trino/memory/LeastWastedEffortTaskLowMemoryKiller.java
@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
@@ -69,21 +70,8 @@ public Optional<KillTarget> chooseTargetToKill(List<RunningQueryInfo> runningQue
                 continue;
             }
 
-            memoryPool.getTaskMemoryReservations().entrySet().stream()
-                    .map(entry -> new SimpleEntry<>(TaskId.valueOf(entry.getKey()), entry.getValue()))
-                    .filter(entry -> queriesWithTaskRetryPolicy.contains(entry.getKey().getQueryId()))
-                    .max(comparing(entry -> {
-                        TaskId taskId = entry.getKey();
-                        Long memoryUsed = entry.getValue();
-                        long wallTime = 0;
-                        if (taskInfos.containsKey(taskId)) {
-                            TaskStats stats = taskInfos.get(taskId).getStats();
-                            wallTime = stats.getTotalScheduledTime().toMillis() + stats.getTotalBlockedTime().toMillis();
-                        }
-                        wallTime = Math.max(wallTime, MIN_WALL_TIME); // only look at memory consumption for fairly short-lived tasks
-                        return (double) memoryUsed / wallTime;
-                    }))
-                    .map(SimpleEntry::getKey)
+            findBiggestTask(queriesWithTaskRetryPolicy, taskInfos, memoryPool, true) // try just speculative
+                    .or(() -> findBiggestTask(queriesWithTaskRetryPolicy, taskInfos, memoryPool, false)) // fallback to any task
                     .ifPresent(tasksToKillBuilder::add);
         }
         Set<TaskId> tasksToKill = tasksToKillBuilder.build();
@@ -92,4 +80,35 @@ public Optional<KillTarget> chooseTargetToKill(List<RunningQueryInfo> runningQue
         }
         return Optional.of(KillTarget.selectedTasks(tasksToKill));
     }
+
+    private static Optional<TaskId> findBiggestTask(Set<QueryId> queriesWithTaskRetryPolicy, Map<TaskId, TaskInfo> taskInfos, MemoryPoolInfo memoryPool, boolean onlySpeculative)
+    {
+        Stream<SimpleEntry<TaskId, Long>> stream = memoryPool.getTaskMemoryReservations().entrySet().stream()
+                .map(entry -> new SimpleEntry<>(TaskId.valueOf(entry.getKey()), entry.getValue()))
+                .filter(entry -> queriesWithTaskRetryPolicy.contains(entry.getKey().getQueryId()));
+
+        if (onlySpeculative) {
+            stream = stream.filter(entry -> {
+                TaskInfo taskInfo = taskInfos.get(entry.getKey());
+                if (taskInfo == null) {
+                    return false;
+                }
+                return taskInfo.getTaskStatus().isSpeculative();
+            });
+        }
+
+        return stream
+                .max(comparing(entry -> {
+                    TaskId taskId = entry.getKey();
+                    Long memoryUsed = entry.getValue();
+                    long wallTime = 0;
+                    if (taskInfos.containsKey(taskId)) {
+                        TaskStats stats = taskInfos.get(taskId).getStats();
+                        wallTime = stats.getTotalScheduledTime().toMillis() + stats.getTotalBlockedTime().toMillis();
+                    }
+                    wallTime = Math.max(wallTime, MIN_WALL_TIME); // only look at memory consumption for fairly short-lived tasks
+                    return (double) memoryUsed / wallTime;
+                }))
+                .map(SimpleEntry::getKey);
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/memory/LocalMemoryManager.java b/core/trino-main/src/main/java/io/trino/memory/LocalMemoryManager.java
index 7db1983579fa..e32b5ad4cf07 100644
--- a/core/trino-main/src/main/java/io/trino/memory/LocalMemoryManager.java
+++ b/core/trino-main/src/main/java/io/trino/memory/LocalMemoryManager.java
@@ -14,10 +14,9 @@
 package io.trino.memory;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 
-import javax.inject.Inject;
-
 import java.lang.management.ManagementFactory;
 import java.lang.management.OperatingSystemMXBean;
 
@@ -37,7 +36,7 @@ public LocalMemoryManager(NodeMemoryConfig config)
     }
 
     @VisibleForTesting
-    LocalMemoryManager(NodeMemoryConfig config, long availableMemory)
+    public LocalMemoryManager(NodeMemoryConfig config, long availableMemory)
     {
         validateHeapHeadroom(config, availableMemory);
         DataSize memoryPoolSize = DataSize.ofBytes(availableMemory - config.getHeapHeadroom().toBytes());
diff --git a/core/trino-main/src/main/java/io/trino/memory/LocalMemoryManagerExporter.java b/core/trino-main/src/main/java/io/trino/memory/LocalMemoryManagerExporter.java
index bae97eec5063..7519431ed985 100644
--- a/core/trino-main/src/main/java/io/trino/memory/LocalMemoryManagerExporter.java
+++ b/core/trino-main/src/main/java/io/trino/memory/LocalMemoryManagerExporter.java
@@ -13,13 +13,12 @@
  */
 package io.trino.memory;
 
+import com.google.inject.Inject;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.JmxException;
 import org.weakref.jmx.MBeanExporter;
 import org.weakref.jmx.ObjectNames;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 public final class LocalMemoryManagerExporter
diff --git a/core/trino-main/src/main/java/io/trino/memory/LowMemoryKiller.java b/core/trino-main/src/main/java/io/trino/memory/LowMemoryKiller.java
index aed1c4fc896c..7c74bdfecd5b 100644
--- a/core/trino-main/src/main/java/io/trino/memory/LowMemoryKiller.java
+++ b/core/trino-main/src/main/java/io/trino/memory/LowMemoryKiller.java
@@ -15,13 +15,12 @@
 package io.trino.memory;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.BindingAnnotation;
 import io.trino.execution.TaskId;
 import io.trino.execution.TaskInfo;
 import io.trino.operator.RetryPolicy;
 import io.trino.spi.QueryId;
 
-import javax.inject.Qualifier;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 import java.util.List;
@@ -93,11 +92,11 @@ public String toString()
 
     @Retention(RUNTIME)
     @Target({FIELD, PARAMETER, METHOD})
-    @Qualifier
+    @BindingAnnotation
     @interface ForQueryLowMemoryKiller {}
 
     @Retention(RUNTIME)
     @Target({FIELD, PARAMETER, METHOD})
-    @Qualifier
+    @BindingAnnotation
     @interface ForTaskLowMemoryKiller {}
 }
diff --git a/core/trino-main/src/main/java/io/trino/memory/MemoryManagerConfig.java b/core/trino-main/src/main/java/io/trino/memory/MemoryManagerConfig.java
index f146a595c26c..62bb5efeaadb 100644
--- a/core/trino-main/src/main/java/io/trino/memory/MemoryManagerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/memory/MemoryManagerConfig.java
@@ -18,8 +18,7 @@
 import io.airlift.configuration.DefunctConfig;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.units.DataSize.Unit.GIGABYTE;
@@ -46,6 +45,7 @@ public class MemoryManagerConfig
     private LowMemoryQueryKillerPolicy lowMemoryQueryKillerPolicy = LowMemoryQueryKillerPolicy.TOTAL_RESERVATION_ON_BLOCKED_NODES;
     private LowMemoryTaskKillerPolicy lowMemoryTaskKillerPolicy = LowMemoryTaskKillerPolicy.TOTAL_RESERVATION_ON_BLOCKED_NODES;
     private boolean faultTolerantExecutionMemoryRequirementIncreaseOnWorkerCrashEnabled = true;
+    private DataSize faultTolerantExecutionEagerSpeculativeTasksNodeMemoryOvercommit = DataSize.of(20, GIGABYTE);
 
     /**
      * default value is overwritten for fault tolerant execution in {@link #applyFaultTolerantExecutionDefaults()}}
@@ -205,6 +205,18 @@ public MemoryManagerConfig setFaultTolerantExecutionMemoryRequirementIncreaseOnW
         return this;
     }
 
+    public DataSize getFaultTolerantExecutionEagerSpeculativeTasksNodeMemoryOvercommit()
+    {
+        return faultTolerantExecutionEagerSpeculativeTasksNodeMemoryOvercommit;
+    }
+
+    @Config("fault-tolerant-execution-eager-speculative-tasks-node_memory-overcommit")
+    public MemoryManagerConfig setFaultTolerantExecutionEagerSpeculativeTasksNodeMemoryOvercommit(DataSize faultTolerantExecutionEagerSpeculativeTasksNodeMemoryOvercommit)
+    {
+        this.faultTolerantExecutionEagerSpeculativeTasksNodeMemoryOvercommit = faultTolerantExecutionEagerSpeculativeTasksNodeMemoryOvercommit;
+        return this;
+    }
+
     public void applyFaultTolerantExecutionDefaults()
     {
         killOnOutOfMemoryDelay = new Duration(0, MINUTES);
diff --git a/core/trino-main/src/main/java/io/trino/memory/MemoryPool.java b/core/trino-main/src/main/java/io/trino/memory/MemoryPool.java
index 0f0172a4bb45..b330931af945 100644
--- a/core/trino-main/src/main/java/io/trino/memory/MemoryPool.java
+++ b/core/trino-main/src/main/java/io/trino/memory/MemoryPool.java
@@ -17,16 +17,15 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.AbstractFuture;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.units.DataSize;
 import io.trino.execution.TaskId;
 import io.trino.spi.QueryId;
 import io.trino.spi.memory.MemoryAllocation;
 import io.trino.spi.memory.MemoryPoolInfo;
+import jakarta.annotation.Nullable;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -126,7 +125,7 @@ public void removeListener(MemoryPoolListener listener)
      */
     public ListenableFuture<Void> reserve(TaskId taskId, String allocationTag, long bytes)
     {
-        checkArgument(bytes >= 0, "bytes is negative");
+        checkArgument(bytes >= 0, "'%s' is negative", bytes);
         ListenableFuture<Void> result;
         synchronized (this) {
             if (bytes != 0) {
@@ -159,7 +158,7 @@ private void onMemoryReserved()
 
     public ListenableFuture<Void> reserveRevocable(TaskId taskId, long bytes)
     {
-        checkArgument(bytes >= 0, "bytes is negative");
+        checkArgument(bytes >= 0, "'%s' is negative", bytes);
 
         ListenableFuture<Void> result;
         synchronized (this) {
@@ -189,7 +188,7 @@ public ListenableFuture<Void> reserveRevocable(TaskId taskId, long bytes)
      */
     public boolean tryReserve(TaskId taskId, String allocationTag, long bytes)
     {
-        checkArgument(bytes >= 0, "bytes is negative");
+        checkArgument(bytes >= 0, "'%s' is negative", bytes);
         synchronized (this) {
             if (getFreeBytes() - bytes < 0) {
                 return false;
@@ -207,9 +206,23 @@ public boolean tryReserve(TaskId taskId, String allocationTag, long bytes)
         return true;
     }
 
+    public boolean tryReserveRevocable(long bytes)
+    {
+        checkArgument(bytes >= 0, "'%s' is negative", bytes);
+        synchronized (this) {
+            if (getFreeBytes() - bytes < 0) {
+                return false;
+            }
+            reservedRevocableBytes += bytes;
+        }
+
+        onMemoryReserved();
+        return true;
+    }
+
     public synchronized void free(TaskId taskId, String allocationTag, long bytes)
     {
-        checkArgument(bytes >= 0, "bytes is negative");
+        checkArgument(bytes >= 0, "'%s' is negative", bytes);
         checkArgument(reservedBytes >= bytes, "tried to free more memory than is reserved");
         if (bytes == 0) {
             // Freeing zero bytes is a no-op
@@ -252,7 +265,7 @@ public synchronized void free(TaskId taskId, String allocationTag, long bytes)
 
     public synchronized void freeRevocable(TaskId taskId, long bytes)
     {
-        checkArgument(bytes >= 0, "bytes is negative");
+        checkArgument(bytes >= 0, "'%s' is negative", bytes);
         checkArgument(reservedRevocableBytes >= bytes, "tried to free more revocable memory than is reserved");
         if (bytes == 0) {
             // Freeing zero bytes is a no-op
@@ -291,6 +304,22 @@ public synchronized void freeRevocable(TaskId taskId, long bytes)
         }
     }
 
+    public synchronized void freeRevocable(long bytes)
+    {
+        checkArgument(bytes >= 0, "'%s' is negative", bytes);
+        checkArgument(reservedRevocableBytes >= bytes, "tried to free more revocable memory than is reserved");
+        if (bytes == 0) {
+            // Freeing zero bytes is a no-op
+            return;
+        }
+
+        reservedRevocableBytes -= bytes;
+        if (getFreeBytes() > 0 && future != null) {
+            future.set(null);
+            future = null;
+        }
+    }
+
     /**
      * Returns the number of free bytes. This value may be negative, which indicates that the pool is over-committed.
      */
diff --git a/core/trino-main/src/main/java/io/trino/memory/MemoryResource.java b/core/trino-main/src/main/java/io/trino/memory/MemoryResource.java
index 9edaf38a2fde..20e5dde4baec 100644
--- a/core/trino-main/src/main/java/io/trino/memory/MemoryResource.java
+++ b/core/trino-main/src/main/java/io/trino/memory/MemoryResource.java
@@ -13,13 +13,12 @@
  */
 package io.trino.memory;
 
+import com.google.inject.Inject;
 import io.trino.server.security.ResourceSecurity;
-
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import static io.trino.server.security.ResourceSecurity.AccessType.INTERNAL_ONLY;
 import static java.util.Objects.requireNonNull;
diff --git a/core/trino-main/src/main/java/io/trino/memory/NodeMemoryConfig.java b/core/trino-main/src/main/java/io/trino/memory/NodeMemoryConfig.java
index d4ef3fcd6959..5ea55b480895 100644
--- a/core/trino-main/src/main/java/io/trino/memory/NodeMemoryConfig.java
+++ b/core/trino-main/src/main/java/io/trino/memory/NodeMemoryConfig.java
@@ -17,8 +17,7 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.DefunctConfig;
 import io.airlift.units.DataSize;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 // This is separate from MemoryManagerConfig because it's difficult to test the default value of maxQueryMemoryPerNode
 @DefunctConfig({
diff --git a/core/trino-main/src/main/java/io/trino/memory/QueryContext.java b/core/trino-main/src/main/java/io/trino/memory/QueryContext.java
index 9aec16d5fb36..c30e3ad282f7 100644
--- a/core/trino-main/src/main/java/io/trino/memory/QueryContext.java
+++ b/core/trino-main/src/main/java/io/trino/memory/QueryContext.java
@@ -15,6 +15,8 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.stats.GcMonitor;
 import io.airlift.units.DataSize;
 import io.trino.Session;
@@ -26,9 +28,6 @@
 import io.trino.spi.QueryId;
 import io.trino.spiller.SpillSpaceTracker;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -226,6 +225,11 @@ public synchronized MemoryPool getMemoryPool()
         return memoryPool;
     }
 
+    public synchronized long getUserMemoryReservation()
+    {
+        return memoryPool.getQueryMemoryReservation(queryId);
+    }
+
     public TaskContext addTaskContext(
             TaskStateMachine taskStateMachine,
             Session session,
diff --git a/core/trino-main/src/main/java/io/trino/memory/RemoteNodeMemory.java b/core/trino-main/src/main/java/io/trino/memory/RemoteNodeMemory.java
index f71081fa4e92..34d743b232b9 100644
--- a/core/trino-main/src/main/java/io/trino/memory/RemoteNodeMemory.java
+++ b/core/trino-main/src/main/java/io/trino/memory/RemoteNodeMemory.java
@@ -15,6 +15,7 @@
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.http.client.FullJsonResponseHandler.JsonResponse;
 import io.airlift.http.client.HttpClient;
 import io.airlift.http.client.HttpClient.HttpResponseFuture;
@@ -23,9 +24,7 @@
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.metadata.InternalNode;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.net.URI;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/memory/TotalReservationOnBlockedNodesTaskLowMemoryKiller.java b/core/trino-main/src/main/java/io/trino/memory/TotalReservationOnBlockedNodesTaskLowMemoryKiller.java
index a8b509d16a30..f81fe803d4ef 100644
--- a/core/trino-main/src/main/java/io/trino/memory/TotalReservationOnBlockedNodesTaskLowMemoryKiller.java
+++ b/core/trino-main/src/main/java/io/trino/memory/TotalReservationOnBlockedNodesTaskLowMemoryKiller.java
@@ -15,8 +15,9 @@
 package io.trino.memory;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
 import io.trino.execution.TaskId;
-import io.trino.operator.RetryPolicy;
+import io.trino.execution.TaskInfo;
 import io.trino.spi.QueryId;
 import io.trino.spi.memory.MemoryPoolInfo;
 
@@ -25,8 +26,10 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.operator.RetryPolicy.TASK;
 
 public class TotalReservationOnBlockedNodesTaskLowMemoryKiller
         implements LowMemoryKiller
@@ -35,7 +38,7 @@ public class TotalReservationOnBlockedNodesTaskLowMemoryKiller
     public Optional<KillTarget> chooseTargetToKill(List<RunningQueryInfo> runningQueries, List<MemoryInfo> nodes)
     {
         Set<QueryId> queriesWithTaskRetryPolicy = runningQueries.stream()
-                                                          .filter(query -> query.getRetryPolicy() == RetryPolicy.TASK)
+                                                          .filter(query -> query.getRetryPolicy() == TASK)
                                                           .map(RunningQueryInfo::getQueryId)
                                                           .collect(toImmutableSet());
 
@@ -43,6 +46,8 @@ public Optional<KillTarget> chooseTargetToKill(List<RunningQueryInfo> runningQue
             return Optional.empty();
         }
 
+        Map<QueryId, RunningQueryInfo> runningQueriesById = Maps.uniqueIndex(runningQueries, RunningQueryInfo::getQueryId);
+
         ImmutableSet.Builder<TaskId> tasksToKillBuilder = ImmutableSet.builder();
         for (MemoryInfo node : nodes) {
             MemoryPoolInfo memoryPool = node.getPool();
@@ -53,12 +58,8 @@ public Optional<KillTarget> chooseTargetToKill(List<RunningQueryInfo> runningQue
                 continue;
             }
 
-            memoryPool.getTaskMemoryReservations().entrySet().stream()
-                    // consider only tasks from queries with task retries enabled
-                    .map(entry -> new SimpleEntry<>(TaskId.valueOf(entry.getKey()), entry.getValue()))
-                    .filter(entry -> queriesWithTaskRetryPolicy.contains(entry.getKey().getQueryId()))
-                    .max(Map.Entry.comparingByValue())
-                    .map(SimpleEntry::getKey)
+            findBiggestTask(runningQueriesById, memoryPool, true) // try just speculative
+                    .or(() -> findBiggestTask(runningQueriesById, memoryPool, false)) // fallback to any task
                     .ifPresent(tasksToKillBuilder::add);
         }
         Set<TaskId> tasksToKill = tasksToKillBuilder.build();
@@ -67,4 +68,27 @@ public Optional<KillTarget> chooseTargetToKill(List<RunningQueryInfo> runningQue
         }
         return Optional.of(KillTarget.selectedTasks(tasksToKill));
     }
+
+    private static Optional<TaskId> findBiggestTask(Map<QueryId, RunningQueryInfo> runningQueries, MemoryPoolInfo memoryPool, boolean onlySpeculative)
+    {
+        Stream<SimpleEntry<TaskId, Long>> stream = memoryPool.getTaskMemoryReservations().entrySet().stream()
+                // consider only tasks from queries with task retries enabled
+                .map(entry -> new SimpleEntry<>(TaskId.valueOf(entry.getKey()), entry.getValue()))
+                .filter(entry -> runningQueries.containsKey(entry.getKey().getQueryId()))
+                .filter(entry -> runningQueries.get(entry.getKey().getQueryId()).getRetryPolicy() == TASK);
+
+        if (onlySpeculative) {
+            stream = stream.filter(entry -> {
+                TaskInfo taskInfo = runningQueries.get(entry.getKey().getQueryId()).getTaskInfos().get(entry.getKey());
+                if (taskInfo == null) {
+                    return false;
+                }
+                return taskInfo.getTaskStatus().isSpeculative();
+            });
+        }
+
+        return stream
+                .max(Map.Entry.comparingByValue())
+                .map(SimpleEntry::getKey);
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/AbstractTypedJacksonModule.java b/core/trino-main/src/main/java/io/trino/metadata/AbstractTypedJacksonModule.java
index 6a9260ff2b02..261804dcb250 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/AbstractTypedJacksonModule.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/AbstractTypedJacksonModule.java
@@ -35,7 +35,7 @@
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.google.common.cache.CacheBuilder;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
@@ -43,7 +43,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Throwables.throwIfInstanceOf;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static java.util.Objects.requireNonNull;
 
 public abstract class AbstractTypedJacksonModule<T>
diff --git a/core/trino-main/src/main/java/io/trino/metadata/BlockEncodingManager.java b/core/trino-main/src/main/java/io/trino/metadata/BlockEncodingManager.java
index fe79fba4dcc2..3adb72ce07d7 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/BlockEncodingManager.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/BlockEncodingManager.java
@@ -17,8 +17,8 @@
 import io.trino.spi.block.BlockEncoding;
 import io.trino.spi.block.ByteArrayBlockEncoding;
 import io.trino.spi.block.DictionaryBlockEncoding;
+import io.trino.spi.block.Fixed12BlockEncoding;
 import io.trino.spi.block.Int128ArrayBlockEncoding;
-import io.trino.spi.block.Int96ArrayBlockEncoding;
 import io.trino.spi.block.IntArrayBlockEncoding;
 import io.trino.spi.block.LazyBlockEncoding;
 import io.trino.spi.block.LongArrayBlockEncoding;
@@ -26,8 +26,6 @@
 import io.trino.spi.block.RowBlockEncoding;
 import io.trino.spi.block.RunLengthBlockEncoding;
 import io.trino.spi.block.ShortArrayBlockEncoding;
-import io.trino.spi.block.SingleMapBlockEncoding;
-import io.trino.spi.block.SingleRowBlockEncoding;
 import io.trino.spi.block.VariableWidthBlockEncoding;
 
 import java.util.Map;
@@ -48,14 +46,12 @@ public BlockEncodingManager()
         addBlockEncoding(new ShortArrayBlockEncoding());
         addBlockEncoding(new IntArrayBlockEncoding());
         addBlockEncoding(new LongArrayBlockEncoding());
-        addBlockEncoding(new Int96ArrayBlockEncoding());
+        addBlockEncoding(new Fixed12BlockEncoding());
         addBlockEncoding(new Int128ArrayBlockEncoding());
         addBlockEncoding(new DictionaryBlockEncoding());
         addBlockEncoding(new ArrayBlockEncoding());
         addBlockEncoding(new MapBlockEncoding());
-        addBlockEncoding(new SingleMapBlockEncoding());
         addBlockEncoding(new RowBlockEncoding());
-        addBlockEncoding(new SingleRowBlockEncoding());
         addBlockEncoding(new RunLengthBlockEncoding());
         addBlockEncoding(new LazyBlockEncoding());
     }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/BuiltinFunctionResolver.java b/core/trino-main/src/main/java/io/trino/metadata/BuiltinFunctionResolver.java
new file mode 100644
index 000000000000..fc2a81294823
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/metadata/BuiltinFunctionResolver.java
@@ -0,0 +1,182 @@
+/*
+ * Licensed 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 io.trino.metadata;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import io.trino.cache.NonEvictableCache;
+import io.trino.connector.system.GlobalSystemConnector;
+import io.trino.metadata.FunctionBinder.CatalogFunctionBinding;
+import io.trino.spi.TrinoException;
+import io.trino.spi.function.FunctionDependencyDeclaration;
+import io.trino.spi.function.OperatorType;
+import io.trino.spi.function.Signature;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeManager;
+import io.trino.sql.analyzer.TypeSignatureProvider;
+
+import java.util.Collection;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.metadata.FunctionResolver.resolveFunctionBinding;
+import static io.trino.metadata.GlobalFunctionCatalog.BUILTIN_SCHEMA;
+import static io.trino.metadata.GlobalFunctionCatalog.isBuiltinFunctionName;
+import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
+import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_ERROR;
+import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_MISSING;
+import static io.trino.spi.StandardErrorCode.FUNCTION_NOT_FOUND;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * This class is designed for the exclusive use of Metadata, and is not intended for any other use.
+ */
+class BuiltinFunctionResolver
+{
+    private final Metadata metadata;
+    private final TypeManager typeManager;
+    private final GlobalFunctionCatalog globalFunctionCatalog;
+    private final FunctionBinder functionBinder;
+    private final ResolvedFunction.ResolvedFunctionDecoder functionDecoder;
+
+    private final NonEvictableCache<OperatorCacheKey, ResolvedFunction> operatorCache;
+    private final NonEvictableCache<CoercionCacheKey, ResolvedFunction> coercionCache;
+
+    public BuiltinFunctionResolver(Metadata metadata, TypeManager typeManager, GlobalFunctionCatalog globalFunctionCatalog, ResolvedFunction.ResolvedFunctionDecoder functionDecoder)
+    {
+        this.metadata = requireNonNull(metadata, "metadata is null");
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.globalFunctionCatalog = requireNonNull(globalFunctionCatalog, "globalFunctionCatalog is null");
+        this.functionDecoder = functionDecoder;
+        this.functionBinder = new FunctionBinder(metadata, typeManager);
+
+        operatorCache = buildNonEvictableCache(CacheBuilder.newBuilder().maximumSize(1000));
+        coercionCache = buildNonEvictableCache(CacheBuilder.newBuilder().maximumSize(1000));
+    }
+
+    ResolvedFunction resolveBuiltinFunction(String name, List<TypeSignatureProvider> parameterTypes)
+    {
+        CatalogFunctionBinding functionBinding = functionBinder.bindFunction(parameterTypes, getBuiltinFunctions(name), name);
+        return resolveBuiltin(functionBinding);
+    }
+
+    ResolvedFunction resolveOperator(OperatorType operatorType, List<? extends Type> argumentTypes)
+            throws OperatorNotFoundException
+    {
+        try {
+            return uncheckedCacheGet(operatorCache, new OperatorCacheKey(operatorType, argumentTypes),
+                    () -> resolveBuiltinFunction(
+                            mangleOperatorName(operatorType),
+                            argumentTypes.stream()
+                                    .map(Type::getTypeSignature)
+                                    .map(TypeSignatureProvider::new)
+                                    .collect(toImmutableList())));
+        }
+        catch (UncheckedExecutionException e) {
+            if (e.getCause() instanceof TrinoException cause) {
+                if (cause.getErrorCode().getCode() == FUNCTION_NOT_FOUND.toErrorCode().getCode()) {
+                    throw new OperatorNotFoundException(operatorType, argumentTypes, cause);
+                }
+                throw cause;
+            }
+            throw e;
+        }
+    }
+
+    ResolvedFunction resolveCoercion(OperatorType operatorType, Type fromType, Type toType)
+    {
+        checkArgument(operatorType == OperatorType.CAST || operatorType == OperatorType.SATURATED_FLOOR_CAST);
+        try {
+            return uncheckedCacheGet(coercionCache, new CoercionCacheKey(operatorType, fromType, toType),
+                    () -> resolveCoercion(mangleOperatorName(operatorType), fromType, toType));
+        }
+        catch (UncheckedExecutionException e) {
+            if (e.getCause() instanceof TrinoException cause) {
+                if (cause.getErrorCode().getCode() == FUNCTION_IMPLEMENTATION_MISSING.toErrorCode().getCode()) {
+                    throw new OperatorNotFoundException(operatorType, ImmutableList.of(fromType), toType.getTypeSignature(), cause);
+                }
+                throw cause;
+            }
+            throw e;
+        }
+    }
+
+    ResolvedFunction resolveCoercion(String functionName, Type fromType, Type toType)
+    {
+        CatalogFunctionBinding functionBinding = functionBinder.bindCoercion(
+                Signature.builder()
+                        .returnType(toType)
+                        .argumentType(fromType)
+                        .build(),
+                getBuiltinFunctions(functionName));
+        return resolveBuiltin(functionBinding);
+    }
+
+    private ResolvedFunction resolveBuiltin(CatalogFunctionBinding functionBinding)
+    {
+        FunctionBinding binding = functionBinding.functionBinding();
+        FunctionDependencyDeclaration dependencies = globalFunctionCatalog.getFunctionDependencies(binding.getFunctionId(), binding.getBoundSignature());
+
+        return resolveFunctionBinding(
+                metadata,
+                typeManager,
+                functionBinder,
+                functionDecoder,
+                GlobalSystemConnector.CATALOG_HANDLE,
+                functionBinding.functionBinding(),
+                functionBinding.functionMetadata(),
+                dependencies,
+                catalogSchemaFunctionName -> {
+                    // builtin functions can only depend on other builtin functions
+                    if (!isBuiltinFunctionName(catalogSchemaFunctionName)) {
+                        throw new TrinoException(
+                                FUNCTION_IMPLEMENTATION_ERROR,
+                                format("Builtin function %s cannot depend on a non-builtin function: %s", functionBinding.functionBinding().getBoundSignature().getName(), catalogSchemaFunctionName));
+                    }
+                    return getBuiltinFunctions(catalogSchemaFunctionName.getFunctionName());
+                },
+                this::resolveBuiltin);
+    }
+
+    private Collection<CatalogFunctionMetadata> getBuiltinFunctions(String functionName)
+    {
+        return globalFunctionCatalog.getBuiltInFunctions(functionName).stream()
+                .map(function -> new CatalogFunctionMetadata(GlobalSystemConnector.CATALOG_HANDLE, BUILTIN_SCHEMA, function))
+                .collect(toImmutableList());
+    }
+
+    private record OperatorCacheKey(OperatorType operatorType, List<? extends Type> argumentTypes)
+    {
+        private OperatorCacheKey
+        {
+            requireNonNull(operatorType, "operatorType is null");
+            argumentTypes = ImmutableList.copyOf(requireNonNull(argumentTypes, "argumentTypes is null"));
+        }
+    }
+
+    private record CoercionCacheKey(OperatorType operatorType, Type fromType, Type toType)
+    {
+        private CoercionCacheKey
+        {
+            requireNonNull(operatorType, "operatorType is null");
+            requireNonNull(fromType, "fromType is null");
+            requireNonNull(toType, "toType is null");
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/metadata/Catalog.java b/core/trino-main/src/main/java/io/trino/metadata/Catalog.java
index cbbab652291a..f0cf057f1c78 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/Catalog.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/Catalog.java
@@ -134,7 +134,11 @@ private static CatalogTransaction beginTransaction(
             transactionHandle = connector.beginTransaction(isolationLevel, readOnly, autoCommitContext);
         }
 
-        return new CatalogTransaction(connectorServices.getCatalogHandle(), connector, transactionHandle);
+        return new CatalogTransaction(
+                connectorServices.getTracer(),
+                connectorServices.getCatalogHandle(),
+                connector,
+                transactionHandle);
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/metadata/CatalogFunctionMetadata.java b/core/trino-main/src/main/java/io/trino/metadata/CatalogFunctionMetadata.java
new file mode 100644
index 000000000000..b8ed7e6684db
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/metadata/CatalogFunctionMetadata.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed 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 io.trino.metadata;
+
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.function.FunctionMetadata;
+
+import static java.util.Objects.requireNonNull;
+
+public record CatalogFunctionMetadata(CatalogHandle catalogHandle, String schemaName, FunctionMetadata functionMetadata)
+{
+    public CatalogFunctionMetadata
+    {
+        requireNonNull(catalogHandle, "catalogHandle is null");
+        requireNonNull(schemaName, "schemaName is null");
+        requireNonNull(functionMetadata, "functionMetadata is null");
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/metadata/CatalogProcedures.java b/core/trino-main/src/main/java/io/trino/metadata/CatalogProcedures.java
index f0409cfb5a38..0ba67d35d70f 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/CatalogProcedures.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/CatalogProcedures.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.Maps;
 import com.google.common.primitives.Primitives;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
@@ -24,8 +25,6 @@
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.Type;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/metadata/CatalogSchemaFunctionName.java b/core/trino-main/src/main/java/io/trino/metadata/CatalogSchemaFunctionName.java
deleted file mode 100644
index 60f39bf23676..000000000000
--- a/core/trino-main/src/main/java/io/trino/metadata/CatalogSchemaFunctionName.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed 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 io.trino.metadata;
-
-import io.trino.spi.function.SchemaFunctionName;
-
-import java.util.Objects;
-
-public final class CatalogSchemaFunctionName
-{
-    private final String catalogName;
-    private final SchemaFunctionName schemaFunctionName;
-
-    public CatalogSchemaFunctionName(String catalogName, SchemaFunctionName schemaFunctionName)
-    {
-        this.catalogName = catalogName;
-        this.schemaFunctionName = schemaFunctionName;
-    }
-
-    public CatalogSchemaFunctionName(String catalogName, String schemaName, String functionName)
-    {
-        this(catalogName, new SchemaFunctionName(schemaName, functionName));
-    }
-
-    public String getCatalogName()
-    {
-        return catalogName;
-    }
-
-    public SchemaFunctionName getSchemaFunctionName()
-    {
-        return schemaFunctionName;
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CatalogSchemaFunctionName that = (CatalogSchemaFunctionName) o;
-        return Objects.equals(catalogName, that.catalogName) &&
-                Objects.equals(schemaFunctionName, that.schemaFunctionName);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(catalogName, schemaFunctionName);
-    }
-
-    @Override
-    public String toString()
-    {
-        return catalogName + '.' + schemaFunctionName;
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/metadata/CatalogTableFunctions.java b/core/trino-main/src/main/java/io/trino/metadata/CatalogTableFunctions.java
index 657cb19d8adf..34ffbedc49a8 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/CatalogTableFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/CatalogTableFunctions.java
@@ -14,10 +14,9 @@
 package io.trino.metadata;
 
 import com.google.common.collect.Maps;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.spi.function.SchemaFunctionName;
-import io.trino.spi.ptf.ConnectorTableFunction;
-
-import javax.annotation.concurrent.ThreadSafe;
+import io.trino.spi.function.table.ConnectorTableFunction;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/metadata/CatalogTableProcedures.java b/core/trino-main/src/main/java/io/trino/metadata/CatalogTableProcedures.java
index 345eb937d973..3794df65b4b0 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/CatalogTableProcedures.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/CatalogTableProcedures.java
@@ -14,11 +14,10 @@
 package io.trino.metadata;
 
 import com.google.common.collect.Maps;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.TableProcedureMetadata;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.Collection;
 import java.util.Map;
 
diff --git a/core/trino-main/src/main/java/io/trino/metadata/CatalogTransaction.java b/core/trino-main/src/main/java/io/trino/metadata/CatalogTransaction.java
index d4e7ac751d0d..9da038f307f2 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/CatalogTransaction.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/CatalogTransaction.java
@@ -13,14 +13,17 @@
  */
 package io.trino.metadata;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.Session;
+import io.trino.connector.informationschema.InformationSchemaMetadata;
+import io.trino.connector.system.SystemTablesMetadata;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-
-import javax.annotation.concurrent.GuardedBy;
+import io.trino.tracing.TracingConnectorMetadata;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -29,6 +32,7 @@
 
 public class CatalogTransaction
 {
+    private final Tracer tracer;
     private final CatalogHandle catalogHandle;
     private final Connector connector;
     private final ConnectorTransactionHandle transactionHandle;
@@ -37,10 +41,12 @@ public class CatalogTransaction
     private final AtomicBoolean finished = new AtomicBoolean();
 
     public CatalogTransaction(
+            Tracer tracer,
             CatalogHandle catalogHandle,
             Connector connector,
             ConnectorTransactionHandle transactionHandle)
     {
+        this.tracer = requireNonNull(tracer, "tracer is null");
         this.catalogHandle = requireNonNull(catalogHandle, "catalogHandle is null");
         this.connector = requireNonNull(connector, "connector is null");
         this.transactionHandle = requireNonNull(transactionHandle, "transactionHandle is null");
@@ -62,6 +68,7 @@ public synchronized ConnectorMetadata getConnectorMetadata(Session session)
         if (connectorMetadata == null) {
             ConnectorSession connectorSession = session.toConnectorSession(catalogHandle);
             connectorMetadata = connector.getMetadata(connectorSession, transactionHandle);
+            connectorMetadata = tracingConnectorMetadata(catalogHandle.getCatalogName(), connectorMetadata);
         }
         return connectorMetadata;
     }
@@ -85,4 +92,12 @@ public void abort()
             connector.rollback(transactionHandle);
         }
     }
+
+    private ConnectorMetadata tracingConnectorMetadata(String catalogName, ConnectorMetadata delegate)
+    {
+        if ((delegate instanceof SystemTablesMetadata) || (delegate instanceof InformationSchemaMetadata)) {
+            return delegate;
+        }
+        return new TracingConnectorMetadata(tracer, catalogName, delegate);
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/DisabledSystemSecurityMetadata.java b/core/trino-main/src/main/java/io/trino/metadata/DisabledSystemSecurityMetadata.java
index efedd3b9e545..3b86d92e84d0 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/DisabledSystemSecurityMetadata.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/DisabledSystemSecurityMetadata.java
@@ -18,6 +18,7 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.security.GrantInfo;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
@@ -166,6 +167,12 @@ public void setViewOwner(Session session, CatalogSchemaTableName view, TrinoPrin
         throw notSupportedException(view.getCatalogName());
     }
 
+    @Override
+    public Optional<Identity> getFunctionRunAsIdentity(Session session, CatalogSchemaFunctionName functionName)
+    {
+        return Optional.empty();
+    }
+
     @Override
     public void schemaCreated(Session session, CatalogSchemaName schema) {}
 
@@ -184,6 +191,15 @@ public void tableRenamed(Session session, CatalogSchemaTableName sourceTable, Ca
     @Override
     public void tableDropped(Session session, CatalogSchemaTableName table) {}
 
+    @Override
+    public void columnCreated(Session session, CatalogSchemaTableName table, String column) {}
+
+    @Override
+    public void columnRenamed(Session session, CatalogSchemaTableName table, String oldName, String newName) {}
+
+    @Override
+    public void columnDropped(Session session, CatalogSchemaTableName table, String column) {}
+
     private static TrinoException notSupportedException(String catalogName)
     {
         return new TrinoException(NOT_SUPPORTED, "Catalog does not support permission management: " + catalogName);
diff --git a/core/trino-main/src/main/java/io/trino/metadata/DiscoveryNodeManager.java b/core/trino-main/src/main/java/io/trino/metadata/DiscoveryNodeManager.java
index 394bdb8a6bc2..ad5e834d83da 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/DiscoveryNodeManager.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/DiscoveryNodeManager.java
@@ -20,6 +20,9 @@
 import com.google.common.collect.SetMultimap;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Sets.SetView;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.discovery.client.ServiceDescriptor;
 import io.airlift.discovery.client.ServiceSelector;
 import io.airlift.discovery.client.ServiceType;
@@ -32,16 +35,11 @@
 import io.trino.failuredetector.FailureDetector;
 import io.trino.server.InternalCommunicationConfig;
 import io.trino.spi.connector.CatalogHandle;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -211,8 +209,9 @@ public void refreshNodes()
     private synchronized void refreshNodesInternal()
     {
         // This is a deny-list.
+        Set<ServiceDescriptor> failed = failureDetector.getFailed();
         Set<ServiceDescriptor> services = serviceSelector.selectAllServices().stream()
-                .filter(service -> !failureDetector.getFailed().contains(service))
+                .filter(service -> !failed.contains(service))
                 .collect(toImmutableSet());
 
         ImmutableSet.Builder<InternalNode> activeNodesBuilder = ImmutableSet.builder();
@@ -388,11 +387,7 @@ private static URI getHttpUri(ServiceDescriptor descriptor, boolean httpsRequire
     {
         String url = descriptor.getProperties().get(httpsRequired ? "https" : "http");
         if (url != null) {
-            try {
-                return new URI(url);
-            }
-            catch (URISyntaxException ignored) {
-            }
+            return URI.create(url);
         }
         return null;
     }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/ForNodeManager.java b/core/trino-main/src/main/java/io/trino/metadata/ForNodeManager.java
index 28d9b311993f..0a7bbfb19519 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/ForNodeManager.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/ForNodeManager.java
@@ -13,7 +13,7 @@
  */
 package io.trino.metadata;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForNodeManager
 {
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/FunctionBinder.java b/core/trino-main/src/main/java/io/trino/metadata/FunctionBinder.java
new file mode 100644
index 000000000000..4017b8f22fa8
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/metadata/FunctionBinder.java
@@ -0,0 +1,461 @@
+/*
+ * Licensed 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 io.trino.metadata;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Ordering;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
+import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.FunctionNullability;
+import io.trino.spi.function.Signature;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeManager;
+import io.trino.sql.analyzer.TypeSignatureProvider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.spi.StandardErrorCode.AMBIGUOUS_FUNCTION_CALL;
+import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_MISSING;
+import static io.trino.spi.StandardErrorCode.FUNCTION_NOT_FOUND;
+import static io.trino.spi.function.FunctionKind.SCALAR;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypeSignatures;
+import static io.trino.type.UnknownType.UNKNOWN;
+import static java.lang.String.format;
+import static java.util.Collections.nCopies;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Binds an actual call site signature to a function.
+ */
+class FunctionBinder
+{
+    private final Metadata metadata;
+    private final TypeManager typeManager;
+
+    public FunctionBinder(Metadata metadata, TypeManager typeManager)
+    {
+        this.metadata = requireNonNull(metadata, "metadata is null");
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+    }
+
+    CatalogFunctionBinding bindFunction(List<TypeSignatureProvider> parameterTypes, Collection<CatalogFunctionMetadata> candidates, String displayName)
+    {
+        return tryBindFunction(parameterTypes, candidates).orElseThrow(() -> functionNotFound(displayName, parameterTypes, candidates));
+    }
+
+    Optional<CatalogFunctionBinding> tryBindFunction(List<TypeSignatureProvider> parameterTypes, Collection<CatalogFunctionMetadata> candidates)
+    {
+        if (candidates.isEmpty()) {
+            return Optional.empty();
+        }
+
+        List<CatalogFunctionMetadata> exactCandidates = candidates.stream()
+                .filter(function -> function.functionMetadata().getSignature().getTypeVariableConstraints().isEmpty())
+                .collect(toImmutableList());
+
+        Optional<CatalogFunctionBinding> match = matchFunctionExact(exactCandidates, parameterTypes);
+        if (match.isPresent()) {
+            return match;
+        }
+
+        List<CatalogFunctionMetadata> genericCandidates = candidates.stream()
+                .filter(function -> !function.functionMetadata().getSignature().getTypeVariableConstraints().isEmpty())
+                .collect(toImmutableList());
+
+        match = matchFunctionExact(genericCandidates, parameterTypes);
+        if (match.isPresent()) {
+            return match;
+        }
+
+        return matchFunctionWithCoercion(candidates, parameterTypes);
+    }
+
+    CatalogFunctionBinding bindCoercion(Signature signature, Collection<CatalogFunctionMetadata> candidates)
+    {
+        // coercions are much more common and much simpler than function calls, so we use a custom algorithm
+        List<CatalogFunctionMetadata> exactCandidates = candidates.stream()
+                .filter(function -> possibleExactCastMatch(signature, function.functionMetadata().getSignature()))
+                .collect(toImmutableList());
+        for (CatalogFunctionMetadata candidate : exactCandidates) {
+            if (canBindSignature(candidate.functionMetadata().getSignature(), signature)) {
+                return toFunctionBinding(candidate, signature);
+            }
+        }
+
+        // only consider generic genericCandidates
+        List<CatalogFunctionMetadata> genericCandidates = candidates.stream()
+                .filter(function -> !function.functionMetadata().getSignature().getTypeVariableConstraints().isEmpty())
+                .collect(toImmutableList());
+        for (CatalogFunctionMetadata candidate : genericCandidates) {
+            if (canBindSignature(candidate.functionMetadata().getSignature(), signature)) {
+                return toFunctionBinding(candidate, signature);
+            }
+        }
+
+        throw new TrinoException(FUNCTION_IMPLEMENTATION_MISSING, format("%s not found", signature));
+    }
+
+    private boolean canBindSignature(Signature declaredSignature, Signature actualSignature)
+    {
+        return new SignatureBinder(metadata, typeManager, declaredSignature, false)
+                .canBind(fromTypeSignatures(actualSignature.getArgumentTypes()), actualSignature.getReturnType());
+    }
+
+    private static boolean possibleExactCastMatch(Signature signature, Signature declaredSignature)
+    {
+        if (!declaredSignature.getTypeVariableConstraints().isEmpty()) {
+            return false;
+        }
+        if (!declaredSignature.getReturnType().getBase().equalsIgnoreCase(signature.getReturnType().getBase())) {
+            return false;
+        }
+        if (!declaredSignature.getArgumentTypes().get(0).getBase().equalsIgnoreCase(signature.getArgumentTypes().get(0).getBase())) {
+            return false;
+        }
+        return true;
+    }
+
+    private Optional<CatalogFunctionBinding> matchFunctionExact(List<CatalogFunctionMetadata> candidates, List<TypeSignatureProvider> actualParameters)
+    {
+        return matchFunction(candidates, actualParameters, false);
+    }
+
+    private Optional<CatalogFunctionBinding> matchFunctionWithCoercion(Collection<CatalogFunctionMetadata> candidates, List<TypeSignatureProvider> actualParameters)
+    {
+        return matchFunction(candidates, actualParameters, true);
+    }
+
+    private Optional<CatalogFunctionBinding> matchFunction(Collection<CatalogFunctionMetadata> candidates, List<TypeSignatureProvider> parameters, boolean coercionAllowed)
+    {
+        List<ApplicableFunction> applicableFunctions = identifyApplicableFunctions(candidates, parameters, coercionAllowed);
+        if (applicableFunctions.isEmpty()) {
+            return Optional.empty();
+        }
+
+        if (coercionAllowed) {
+            applicableFunctions = selectMostSpecificFunctions(applicableFunctions, parameters);
+            checkState(!applicableFunctions.isEmpty(), "at least single function must be left");
+        }
+
+        if (applicableFunctions.size() == 1) {
+            ApplicableFunction applicableFunction = getOnlyElement(applicableFunctions);
+            return Optional.of(toFunctionBinding(applicableFunction.function(), applicableFunction.boundSignature()));
+        }
+
+        StringBuilder errorMessageBuilder = new StringBuilder();
+        errorMessageBuilder.append("Could not choose a best candidate operator. Explicit type casts must be added.\n");
+        errorMessageBuilder.append("Candidates are:\n");
+        for (ApplicableFunction function : applicableFunctions) {
+            errorMessageBuilder.append("\t * ");
+            errorMessageBuilder.append(function.boundSignature());
+            errorMessageBuilder.append("\n");
+        }
+        throw new TrinoException(AMBIGUOUS_FUNCTION_CALL, errorMessageBuilder.toString());
+    }
+
+    private List<ApplicableFunction> identifyApplicableFunctions(Collection<CatalogFunctionMetadata> candidates, List<TypeSignatureProvider> actualParameters, boolean allowCoercion)
+    {
+        ImmutableList.Builder<ApplicableFunction> applicableFunctions = ImmutableList.builder();
+        for (CatalogFunctionMetadata function : candidates) {
+            new SignatureBinder(metadata, typeManager, function.functionMetadata().getSignature(), allowCoercion)
+                    .bind(actualParameters)
+                    .ifPresent(signature -> applicableFunctions.add(new ApplicableFunction(function, signature)));
+        }
+        return applicableFunctions.build();
+    }
+
+    private List<ApplicableFunction> selectMostSpecificFunctions(List<ApplicableFunction> applicableFunctions, List<TypeSignatureProvider> parameters)
+    {
+        checkArgument(!applicableFunctions.isEmpty());
+
+        List<ApplicableFunction> mostSpecificFunctions = selectMostSpecificFunctions(applicableFunctions);
+        if (mostSpecificFunctions.size() <= 1) {
+            return mostSpecificFunctions;
+        }
+
+        Optional<List<Type>> optionalParameterTypes = toTypes(parameters);
+        if (optionalParameterTypes.isEmpty()) {
+            // give up and return all remaining matches
+            return mostSpecificFunctions;
+        }
+
+        List<Type> parameterTypes = optionalParameterTypes.get();
+        if (!someParameterIsUnknown(parameterTypes)) {
+            // give up and return all remaining matches
+            return mostSpecificFunctions;
+        }
+
+        // look for functions that only cast the unknown arguments
+        List<ApplicableFunction> unknownOnlyCastFunctions = getUnknownOnlyCastFunctions(applicableFunctions, parameterTypes);
+        if (!unknownOnlyCastFunctions.isEmpty()) {
+            mostSpecificFunctions = unknownOnlyCastFunctions;
+            if (mostSpecificFunctions.size() == 1) {
+                return mostSpecificFunctions;
+            }
+        }
+
+        // If the return type for all the selected function is the same, and the parameters are declared as RETURN_NULL_ON_NULL, then
+        // all the functions are semantically the same. We can return just any of those.
+        if (returnTypeIsTheSame(mostSpecificFunctions) && allReturnNullOnGivenInputTypes(mostSpecificFunctions, parameterTypes)) {
+            // make it deterministic
+            ApplicableFunction selectedFunction = Ordering.usingToString()
+                    .reverse()
+                    .sortedCopy(mostSpecificFunctions)
+                    .get(0);
+            return ImmutableList.of(selectedFunction);
+        }
+
+        return mostSpecificFunctions;
+    }
+
+    private List<ApplicableFunction> selectMostSpecificFunctions(List<ApplicableFunction> candidates)
+    {
+        List<ApplicableFunction> representatives = new ArrayList<>();
+
+        for (ApplicableFunction current : candidates) {
+            boolean found = false;
+            for (int i = 0; i < representatives.size(); i++) {
+                ApplicableFunction representative = representatives.get(i);
+                if (isMoreSpecificThan(current, representative)) {
+                    representatives.set(i, current);
+                }
+                if (isMoreSpecificThan(current, representative) || isMoreSpecificThan(representative, current)) {
+                    found = true;
+                    break;
+                }
+            }
+
+            if (!found) {
+                representatives.add(current);
+            }
+        }
+
+        return representatives;
+    }
+
+    private static boolean someParameterIsUnknown(List<Type> parameters)
+    {
+        return parameters.stream().anyMatch(type -> type.equals(UNKNOWN));
+    }
+
+    private List<ApplicableFunction> getUnknownOnlyCastFunctions(List<ApplicableFunction> applicableFunction, List<Type> actualParameters)
+    {
+        return applicableFunction.stream()
+                .filter(function -> onlyCastsUnknown(function, actualParameters))
+                .collect(toImmutableList());
+    }
+
+    private boolean onlyCastsUnknown(ApplicableFunction applicableFunction, List<Type> actualParameters)
+    {
+        List<Type> boundTypes = applicableFunction.boundSignature().getArgumentTypes().stream()
+                .map(typeManager::getType)
+                .collect(toImmutableList());
+        checkState(actualParameters.size() == boundTypes.size(), "type lists are of different lengths");
+        for (int i = 0; i < actualParameters.size(); i++) {
+            if (!boundTypes.get(i).equals(actualParameters.get(i)) && actualParameters.get(i) != UNKNOWN) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean returnTypeIsTheSame(List<ApplicableFunction> applicableFunctions)
+    {
+        Set<Type> returnTypes = applicableFunctions.stream()
+                .map(function -> typeManager.getType(function.boundSignature().getReturnType()))
+                .collect(Collectors.toSet());
+        return returnTypes.size() == 1;
+    }
+
+    private static boolean allReturnNullOnGivenInputTypes(List<ApplicableFunction> applicableFunctions, List<Type> parameters)
+    {
+        return applicableFunctions.stream().allMatch(x -> returnsNullOnGivenInputTypes(x, parameters));
+    }
+
+    private static boolean returnsNullOnGivenInputTypes(ApplicableFunction applicableFunction, List<Type> parameterTypes)
+    {
+        FunctionMetadata function = applicableFunction.functionMetadata();
+
+        // Window and Aggregation functions have fixed semantic where NULL values are always skipped
+        if (function.getKind() != SCALAR) {
+            return true;
+        }
+
+        FunctionNullability functionNullability = function.getFunctionNullability();
+        for (int i = 0; i < parameterTypes.size(); i++) {
+            // if the argument value is always null and the function argument is not nullable, the function will always return null
+            if (parameterTypes.get(i).equals(UNKNOWN) && !functionNullability.isArgumentNullable(i)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private Optional<List<Type>> toTypes(List<TypeSignatureProvider> typeSignatureProviders)
+    {
+        ImmutableList.Builder<Type> resultBuilder = ImmutableList.builder();
+        for (TypeSignatureProvider typeSignatureProvider : typeSignatureProviders) {
+            if (typeSignatureProvider.hasDependency()) {
+                return Optional.empty();
+            }
+            resultBuilder.add(typeManager.getType(typeSignatureProvider.getTypeSignature()));
+        }
+        return Optional.of(resultBuilder.build());
+    }
+
+    /**
+     * One method is more specific than another if invocation handled by the first method could be passed on to the other one
+     */
+    private boolean isMoreSpecificThan(ApplicableFunction left, ApplicableFunction right)
+    {
+        List<TypeSignatureProvider> resolvedTypes = fromTypeSignatures(left.boundSignature().getArgumentTypes());
+        return new SignatureBinder(metadata, typeManager, right.declaredSignature(), true)
+                .canBind(resolvedTypes);
+    }
+
+    private CatalogFunctionBinding toFunctionBinding(CatalogFunctionMetadata functionMetadata, Signature signature)
+    {
+        BoundSignature boundSignature = new BoundSignature(
+                new CatalogSchemaFunctionName(
+                        functionMetadata.catalogHandle().getCatalogName(),
+                        functionMetadata.schemaName(),
+                        functionMetadata.functionMetadata().getCanonicalName()),
+                typeManager.getType(signature.getReturnType()),
+                signature.getArgumentTypes().stream()
+                        .map(typeManager::getType)
+                        .collect(toImmutableList()));
+        return new CatalogFunctionBinding(
+                functionMetadata.catalogHandle(),
+                bindFunctionMetadata(boundSignature, functionMetadata.functionMetadata()),
+                SignatureBinder.bindFunction(
+                        functionMetadata.functionMetadata().getFunctionId(),
+                        functionMetadata.functionMetadata().getSignature(),
+                        boundSignature));
+    }
+
+    private static FunctionMetadata bindFunctionMetadata(BoundSignature signature, FunctionMetadata functionMetadata)
+    {
+        FunctionMetadata.Builder newMetadata = FunctionMetadata.builder(functionMetadata.getCanonicalName(), functionMetadata.getKind())
+                .functionId(functionMetadata.getFunctionId())
+                .signature(signature.toSignature());
+
+        functionMetadata.getNames().forEach(newMetadata::alias);
+
+        if (functionMetadata.getDescription().isEmpty()) {
+            newMetadata.noDescription();
+        }
+        else {
+            newMetadata.description(functionMetadata.getDescription());
+        }
+
+        if (functionMetadata.isHidden()) {
+            newMetadata.hidden();
+        }
+        if (!functionMetadata.isDeterministic()) {
+            newMetadata.nondeterministic();
+        }
+        if (functionMetadata.isDeprecated()) {
+            newMetadata.deprecated();
+        }
+        if (functionMetadata.getFunctionNullability().isReturnNullable()) {
+            newMetadata.nullable();
+        }
+
+        // specialize function metadata to resolvedFunction
+        List<Boolean> argumentNullability = functionMetadata.getFunctionNullability().getArgumentNullable();
+        if (functionMetadata.getSignature().isVariableArity()) {
+            List<Boolean> fixedArgumentNullability = argumentNullability.subList(0, argumentNullability.size() - 1);
+            int variableArgumentCount = signature.getArgumentTypes().size() - fixedArgumentNullability.size();
+            argumentNullability = ImmutableList.<Boolean>builder()
+                    .addAll(fixedArgumentNullability)
+                    .addAll(nCopies(variableArgumentCount, argumentNullability.get(argumentNullability.size() - 1)))
+                    .build();
+        }
+        newMetadata.argumentNullability(argumentNullability);
+
+        return newMetadata.build();
+    }
+
+    static TrinoException functionNotFound(String name, List<TypeSignatureProvider> parameterTypes, Collection<CatalogFunctionMetadata> candidates)
+    {
+        if (candidates.isEmpty()) {
+            return new TrinoException(FUNCTION_NOT_FOUND, format("Function '%s' not registered", name));
+        }
+
+        Set<String> expectedParameters = new TreeSet<>();
+        for (CatalogFunctionMetadata function : candidates) {
+            String arguments = Joiner.on(", ").join(function.functionMetadata().getSignature().getArgumentTypes());
+            String constraints = Joiner.on(", ").join(function.functionMetadata().getSignature().getTypeVariableConstraints());
+            expectedParameters.add(format("%s(%s) %s", name, arguments, constraints).stripTrailing());
+        }
+
+        String parameters = Joiner.on(", ").join(parameterTypes);
+        String expected = Joiner.on(", ").join(expectedParameters);
+        String message = format("Unexpected parameters (%s) for function %s. Expected: %s", parameters, name, expected);
+        return new TrinoException(FUNCTION_NOT_FOUND, message);
+    }
+
+    /**
+     * @param boundSignature Ideally this would be a real bound signature,
+     * but the resolver algorithm considers functions with illegal types (e.g., char(large_number))
+     * We could just not consider these applicable functions, but there are tests that depend on
+     * the specific error messages for these failures.
+     */
+    private record ApplicableFunction(CatalogFunctionMetadata function, Signature boundSignature)
+    {
+        public FunctionMetadata functionMetadata()
+        {
+            return function.functionMetadata();
+        }
+
+        public Signature declaredSignature()
+        {
+            return function.functionMetadata().getSignature();
+        }
+
+        @Override
+        public String toString()
+        {
+            return toStringHelper(this)
+                    .add("declaredSignature", function.functionMetadata().getSignature())
+                    .add("boundSignature", boundSignature)
+                    .toString();
+        }
+    }
+
+    record CatalogFunctionBinding(CatalogHandle catalogHandle, FunctionMetadata functionMetadata, FunctionBinding functionBinding)
+    {
+        CatalogFunctionBinding
+        {
+            requireNonNull(catalogHandle, "catalogHandle is null");
+            requireNonNull(functionMetadata, "functionMetadata is null");
+            requireNonNull(functionBinding, "functionBinding is null");
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/metadata/FunctionManager.java b/core/trino-main/src/main/java/io/trino/metadata/FunctionManager.java
index 0e18eca190ae..0c309d73e5f4 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/FunctionManager.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/FunctionManager.java
@@ -15,44 +15,42 @@
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.inject.Inject;
 import io.trino.FeaturesConfig;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.connector.system.GlobalSystemConnector;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.AggregationImplementation;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionDependencies;
-import io.trino.spi.function.FunctionId;
 import io.trino.spi.function.FunctionProvider;
 import io.trino.spi.function.InOut;
 import io.trino.spi.function.InvocationConvention;
 import io.trino.spi.function.InvocationConvention.InvocationArgumentConvention;
 import io.trino.spi.function.ScalarFunctionImplementation;
-import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.function.WindowFunctionSupplier;
-import io.trino.spi.ptf.TableFunctionProcessorProvider;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 import io.trino.type.BlockTypeOperators;
 
-import javax.inject.Inject;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodType;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.List;
 
-import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static com.google.common.primitives.Primitives.wrap;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.client.NodeVersion.UNKNOWN;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.metadata.LanguageFunctionManager.isTrinoSqlLanguageFunction;
 import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_ERROR;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.lang.String.format;
@@ -62,14 +60,15 @@
 public class FunctionManager
 {
     private final NonEvictableCache<FunctionKey, ScalarFunctionImplementation> specializedScalarCache;
-    private final NonEvictableCache<FunctionKey, AggregationImplementation> specializedAggregationCache;
-    private final NonEvictableCache<FunctionKey, WindowFunctionSupplier> specializedWindowCache;
+    private final NonEvictableCache<ResolvedFunction, AggregationImplementation> specializedAggregationCache;
+    private final NonEvictableCache<ResolvedFunction, WindowFunctionSupplier> specializedWindowCache;
 
     private final CatalogServiceProvider<FunctionProvider> functionProviders;
     private final GlobalFunctionCatalog globalFunctionCatalog;
+    private final LanguageFunctionProvider languageFunctionProvider;
 
     @Inject
-    public FunctionManager(CatalogServiceProvider<FunctionProvider> functionProviders, GlobalFunctionCatalog globalFunctionCatalog)
+    public FunctionManager(CatalogServiceProvider<FunctionProvider> functionProviders, GlobalFunctionCatalog globalFunctionCatalog, LanguageFunctionProvider languageFunctionProvider)
     {
         specializedScalarCache = buildNonEvictableCache(CacheBuilder.newBuilder()
                 .maximumSize(1000)
@@ -85,6 +84,7 @@ public FunctionManager(CatalogServiceProvider<FunctionProvider> functionProvider
 
         this.functionProviders = requireNonNull(functionProviders, "functionProviders is null");
         this.globalFunctionCatalog = requireNonNull(globalFunctionCatalog, "globalFunctionCatalog is null");
+        this.languageFunctionProvider = requireNonNull(languageFunctionProvider, "functionProvider is null");
     }
 
     public ScalarFunctionImplementation getScalarFunctionImplementation(ResolvedFunction resolvedFunction, InvocationConvention invocationConvention)
@@ -101,11 +101,19 @@ public ScalarFunctionImplementation getScalarFunctionImplementation(ResolvedFunc
     private ScalarFunctionImplementation getScalarFunctionImplementationInternal(ResolvedFunction resolvedFunction, InvocationConvention invocationConvention)
     {
         FunctionDependencies functionDependencies = getFunctionDependencies(resolvedFunction);
-        ScalarFunctionImplementation scalarFunctionImplementation = getFunctionProvider(resolvedFunction).getScalarFunctionImplementation(
-                resolvedFunction.getFunctionId(),
-                resolvedFunction.getSignature(),
-                functionDependencies,
-                invocationConvention);
+
+        ScalarFunctionImplementation scalarFunctionImplementation;
+        if (isTrinoSqlLanguageFunction(resolvedFunction.getFunctionId())) {
+            scalarFunctionImplementation = languageFunctionProvider.specialize(this, resolvedFunction, functionDependencies, invocationConvention);
+        }
+        else {
+            scalarFunctionImplementation = getFunctionProvider(resolvedFunction).getScalarFunctionImplementation(
+                    resolvedFunction.getFunctionId(),
+                    resolvedFunction.getSignature(),
+                    functionDependencies,
+                    invocationConvention);
+        }
+
         verifyMethodHandleSignature(resolvedFunction.getSignature(), scalarFunctionImplementation, invocationConvention);
         return scalarFunctionImplementation;
     }
@@ -113,7 +121,7 @@ private ScalarFunctionImplementation getScalarFunctionImplementationInternal(Res
     public AggregationImplementation getAggregationImplementation(ResolvedFunction resolvedFunction)
     {
         try {
-            return uncheckedCacheGet(specializedAggregationCache, new FunctionKey(resolvedFunction), () -> getAggregationImplementationInternal(resolvedFunction));
+            return uncheckedCacheGet(specializedAggregationCache, resolvedFunction, () -> getAggregationImplementationInternal(resolvedFunction));
         }
         catch (UncheckedExecutionException e) {
             throwIfInstanceOf(e.getCause(), TrinoException.class);
@@ -133,7 +141,7 @@ private AggregationImplementation getAggregationImplementationInternal(ResolvedF
     public WindowFunctionSupplier getWindowFunctionSupplier(ResolvedFunction resolvedFunction)
     {
         try {
-            return uncheckedCacheGet(specializedWindowCache, new FunctionKey(resolvedFunction), () -> getWindowFunctionSupplierInternal(resolvedFunction));
+            return uncheckedCacheGet(specializedWindowCache, resolvedFunction, () -> getWindowFunctionSupplierInternal(resolvedFunction));
         }
         catch (UncheckedExecutionException e) {
             throwIfInstanceOf(e.getCause(), TrinoException.class);
@@ -153,7 +161,6 @@ private WindowFunctionSupplier getWindowFunctionSupplierInternal(ResolvedFunctio
     public TableFunctionProcessorProvider getTableFunctionProcessorProvider(TableFunctionHandle tableFunctionHandle)
     {
         CatalogHandle catalogHandle = tableFunctionHandle.getCatalogHandle();
-        SchemaFunctionName functionName = tableFunctionHandle.getSchemaFunctionName();
 
         FunctionProvider provider;
         if (catalogHandle.equals(GlobalSystemConnector.CATALOG_HANDLE)) {
@@ -161,10 +168,10 @@ public TableFunctionProcessorProvider getTableFunctionProcessorProvider(TableFun
         }
         else {
             provider = functionProviders.getService(catalogHandle);
-            checkArgument(provider != null, "No function provider for catalog: '%s' (function '%s')", catalogHandle, functionName);
+            checkArgument(provider != null, "No function provider for catalog: '%s'", catalogHandle);
         }
 
-        return provider.getTableFunctionProcessorProvider(functionName);
+        return provider.getTableFunctionProcessorProvider(tableFunctionHandle.getFunctionHandle());
     }
 
     private FunctionDependencies getFunctionDependencies(ResolvedFunction resolvedFunction)
@@ -191,10 +198,11 @@ private static void verifyMethodHandleSignature(BoundSignature boundSignature, S
         checkArgument(convention.getArgumentConventions().size() == boundSignature.getArgumentTypes().size(),
                 "Expected %s arguments, but got %s", boundSignature.getArgumentTypes().size(), convention.getArgumentConventions().size());
 
-        int expectedParameterCount = convention.getArgumentConventions().stream()
+        long expectedParameterCount = convention.getArgumentConventions().stream()
                 .mapToInt(InvocationArgumentConvention::getParameterCount)
                 .sum();
         expectedParameterCount += methodType.parameterList().stream().filter(ConnectorSession.class::equals).count();
+        expectedParameterCount += convention.getReturnConvention().getParameterCount();
         if (scalarFunctionImplementation.getInstanceFactory().isPresent()) {
             expectedParameterCount++;
         }
@@ -235,9 +243,21 @@ private static void verifyMethodHandleSignature(BoundSignature boundSignature, S
                     verifyFunctionSignature(parameterType.isAssignableFrom(wrap(argumentType.getJavaType())),
                             "Expected argument type to be %s, but is %s", wrap(argumentType.getJavaType()), parameterType);
                     break;
+                case BLOCK_POSITION_NOT_NULL:
                 case BLOCK_POSITION:
                     verifyFunctionSignature(parameterType.equals(Block.class) && methodType.parameterType(parameterIndex + 1).equals(int.class),
-                            "Expected BLOCK_POSITION argument types to be Block and int");
+                            "Expected %s argument types to be Block and int".formatted(argumentConvention));
+                    break;
+                case VALUE_BLOCK_POSITION:
+                case VALUE_BLOCK_POSITION_NOT_NULL:
+                    verifyFunctionSignature(ValueBlock.class.isAssignableFrom(parameterType) && methodType.parameterType(parameterIndex + 1).equals(int.class),
+                            "Expected %s argument types to be ValueBlock and int".formatted(argumentConvention));
+                    break;
+                case FLAT:
+                    verifyFunctionSignature(parameterType.equals(byte[].class) &&
+                                    methodType.parameterType(parameterIndex + 1).equals(int.class) &&
+                                    methodType.parameterType(parameterIndex + 2).equals(byte[].class),
+                            "Expected FLAT argument types to be byte[], int, byte[]");
                     break;
                 case IN_OUT:
                     verifyFunctionSignature(parameterType.equals(InOut.class), "Expected IN_OUT argument type to be InOut");
@@ -264,6 +284,20 @@ private static void verifyMethodHandleSignature(BoundSignature boundSignature, S
                 verifyFunctionSignature(methodType.returnType().isAssignableFrom(wrap(returnType.getJavaType())),
                         "Expected return type to be %s, but is %s", returnType.getJavaType(), wrap(methodType.returnType()));
                 break;
+            case BLOCK_BUILDER:
+                verifyFunctionSignature(methodType.lastParameterType().equals(BlockBuilder.class),
+                        "Expected last argument type to be BlockBuilder, but is %s", methodType.lastParameterType());
+                verifyFunctionSignature(methodType.returnType().equals(void.class),
+                        "Expected return type to be void, but is %s", methodType.returnType());
+                break;
+            case FLAT_RETURN:
+                List<Class<?>> parameters = methodType.parameterList();
+                parameters = parameters.subList(parameters.size() - 4, parameters.size());
+                verifyFunctionSignature(parameters.equals(List.of(byte[].class, int.class, byte[].class, int.class)),
+                        "Expected last argument types to be (byte[], int, byte[], int), but is %s", methodType);
+                verifyFunctionSignature(methodType.returnType().equals(void.class),
+                        "Expected return type to be void, but is %s", methodType.returnType());
+                break;
             default:
                 throw new UnsupportedOperationException("Unknown return convention: " + convention.getReturnConvention());
         }
@@ -276,58 +310,12 @@ private static void verifyFunctionSignature(boolean check, String message, Objec
         }
     }
 
-    private static class FunctionKey
+    private record FunctionKey(ResolvedFunction resolvedFunction, InvocationConvention invocationConvention)
     {
-        private final FunctionId functionId;
-        private final BoundSignature boundSignature;
-        private final Optional<InvocationConvention> invocationConvention;
-
-        public FunctionKey(ResolvedFunction resolvedFunction)
-        {
-            this(resolvedFunction.getFunctionId(), resolvedFunction.getSignature(), Optional.empty());
-        }
-
-        public FunctionKey(ResolvedFunction resolvedFunction, InvocationConvention invocationConvention)
-        {
-            this(resolvedFunction.getFunctionId(), resolvedFunction.getSignature(), Optional.of(invocationConvention));
-        }
-
-        public FunctionKey(FunctionId functionId, BoundSignature boundSignature, Optional<InvocationConvention> invocationConvention)
-        {
-            this.functionId = requireNonNull(functionId, "functionId is null");
-            this.boundSignature = requireNonNull(boundSignature, "boundSignature is null");
-            this.invocationConvention = requireNonNull(invocationConvention, "invocationConvention is null");
-        }
-
-        @Override
-        public boolean equals(Object o)
-        {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            FunctionKey that = (FunctionKey) o;
-            return functionId.equals(that.functionId) &&
-                    boundSignature.equals(that.boundSignature) &&
-                    invocationConvention.equals(that.invocationConvention);
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hash(functionId, boundSignature, invocationConvention);
-        }
-
-        @Override
-        public String toString()
+        private FunctionKey
         {
-            return toStringHelper(this).omitNullValues()
-                    .add("functionId", functionId)
-                    .add("boundSignature", boundSignature)
-                    .add("invocationConvention", invocationConvention.orElse(null))
-                    .toString();
+            requireNonNull(resolvedFunction, "resolvedFunction is null");
+            requireNonNull(invocationConvention, "invocationConvention is null");
         }
     }
 
@@ -337,6 +325,6 @@ public static FunctionManager createTestingFunctionManager()
         GlobalFunctionCatalog functionCatalog = new GlobalFunctionCatalog();
         functionCatalog.addFunctions(SystemFunctionBundle.create(new FeaturesConfig(), typeOperators, new BlockTypeOperators(typeOperators), UNKNOWN));
         functionCatalog.addFunctions(new InternalFunctionBundle(new LiteralFunction(new InternalBlockEncodingSerde(new BlockEncodingManager(), TESTING_TYPE_MANAGER))));
-        return new FunctionManager(CatalogServiceProvider.fail(), functionCatalog);
+        return new FunctionManager(CatalogServiceProvider.fail(), functionCatalog, LanguageFunctionProvider.DISABLED);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/FunctionResolver.java b/core/trino-main/src/main/java/io/trino/metadata/FunctionResolver.java
index f8b55833b3de..8ba0e9929cf2 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/FunctionResolver.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/FunctionResolver.java
@@ -13,497 +13,307 @@
  */
 package io.trino.metadata;
 
-import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Ordering;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 import io.trino.Session;
-import io.trino.connector.system.GlobalSystemConnector;
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.metadata.FunctionBinder.CatalogFunctionBinding;
+import io.trino.metadata.ResolvedFunction.ResolvedFunctionDecoder;
+import io.trino.security.AccessControl;
+import io.trino.security.SecurityContext;
 import io.trino.spi.TrinoException;
+import io.trino.spi.TrinoWarning;
 import io.trino.spi.connector.CatalogHandle;
-import io.trino.spi.function.BoundSignature;
+import io.trino.spi.connector.CatalogSchemaName;
+import io.trino.spi.function.CatalogSchemaFunctionName;
+import io.trino.spi.function.FunctionDependencyDeclaration;
+import io.trino.spi.function.FunctionDependencyDeclaration.CastDependency;
+import io.trino.spi.function.FunctionDependencyDeclaration.FunctionDependency;
+import io.trino.spi.function.FunctionDependencyDeclaration.OperatorDependency;
+import io.trino.spi.function.FunctionKind;
 import io.trino.spi.function.FunctionMetadata;
-import io.trino.spi.function.FunctionNullability;
-import io.trino.spi.function.QualifiedFunctionName;
-import io.trino.spi.function.Signature;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
-import io.trino.sql.SqlPathElement;
+import io.trino.spi.type.TypeSignature;
 import io.trino.sql.analyzer.TypeSignatureProvider;
-import io.trino.sql.tree.Identifier;
+import io.trino.sql.tree.QualifiedName;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.metadata.GlobalFunctionCatalog.BUILTIN_SCHEMA;
-import static io.trino.spi.StandardErrorCode.AMBIGUOUS_FUNCTION_CALL;
-import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_MISSING;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static io.trino.metadata.FunctionBinder.functionNotFound;
+import static io.trino.metadata.GlobalFunctionCatalog.isBuiltinFunctionName;
+import static io.trino.metadata.LanguageFunctionManager.isInlineFunction;
+import static io.trino.metadata.LanguageFunctionManager.isTrinoSqlLanguageFunction;
+import static io.trino.metadata.SignatureBinder.applyBoundVariables;
 import static io.trino.spi.StandardErrorCode.FUNCTION_NOT_FOUND;
+import static io.trino.spi.StandardErrorCode.MISSING_CATALOG_NAME;
+import static io.trino.spi.connector.StandardWarningCode.DEPRECATED_FUNCTION;
 import static io.trino.spi.function.FunctionKind.AGGREGATE;
-import static io.trino.spi.function.FunctionKind.SCALAR;
+import static io.trino.spi.function.FunctionKind.WINDOW;
+import static io.trino.spi.security.AccessDeniedException.denyExecuteFunction;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypeSignatures;
-import static io.trino.type.UnknownType.UNKNOWN;
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class FunctionResolver
 {
     private final Metadata metadata;
     private final TypeManager typeManager;
-
-    public FunctionResolver(Metadata metadata, TypeManager typeManager)
+    private final LanguageFunctionManager languageFunctionManager;
+    private final WarningCollector warningCollector;
+    private final ResolvedFunctionDecoder functionDecoder;
+    private final FunctionBinder functionBinder;
+
+    public FunctionResolver(
+            Metadata metadata,
+            TypeManager typeManager,
+            LanguageFunctionManager languageFunctionManager,
+            ResolvedFunctionDecoder functionDecoder,
+            WarningCollector warningCollector)
     {
         this.metadata = requireNonNull(metadata, "metadata is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.languageFunctionManager = requireNonNull(languageFunctionManager, "languageFunctionManager is null");
+        this.warningCollector = requireNonNull(warningCollector, "warningCollector is null");
+        this.functionDecoder = requireNonNull(functionDecoder, "functionDecoder is null");
+        this.functionBinder = new FunctionBinder(metadata, typeManager);
     }
 
-    boolean isAggregationFunction(Session session, QualifiedFunctionName name, Function<CatalogSchemaFunctionName, Collection<CatalogFunctionMetadata>> candidateLoader)
+    /**
+     * Is the named function an aggregation function?
+     * This does not need type parameters because overloads between aggregation and other function types are not allowed.
+     */
+    public boolean isAggregationFunction(Session session, QualifiedName name, AccessControl accessControl)
     {
-        for (CatalogSchemaFunctionName catalogSchemaFunctionName : toPath(session, name)) {
-            Collection<CatalogFunctionMetadata> candidates = candidateLoader.apply(catalogSchemaFunctionName);
+        return isFunctionKind(session, name, AGGREGATE, accessControl);
+    }
+
+    public boolean isWindowFunction(Session session, QualifiedName name, AccessControl accessControl)
+    {
+        return isFunctionKind(session, name, WINDOW, accessControl);
+    }
+
+    private boolean isFunctionKind(Session session, QualifiedName name, FunctionKind functionKind, AccessControl accessControl)
+    {
+        Optional<ResolvedFunction> resolvedFunction = functionDecoder.fromQualifiedName(name);
+        if (resolvedFunction.isPresent()) {
+            return resolvedFunction.get().getFunctionKind() == functionKind;
+        }
+
+        for (CatalogSchemaFunctionName catalogSchemaFunctionName : toPath(session, name, accessControl)) {
+            Collection<CatalogFunctionMetadata> candidates = metadata.getFunctions(session, catalogSchemaFunctionName);
             if (!candidates.isEmpty()) {
                 return candidates.stream()
-                        .map(CatalogFunctionMetadata::getFunctionMetadata)
+                        .map(CatalogFunctionMetadata::functionMetadata)
                         .map(FunctionMetadata::getKind)
-                        .anyMatch(AGGREGATE::equals);
+                        .anyMatch(functionKind::equals);
             }
         }
         return false;
     }
 
-    CatalogFunctionBinding resolveCoercion(Session session, QualifiedFunctionName name, Signature signature, Function<CatalogSchemaFunctionName, Collection<CatalogFunctionMetadata>> candidateLoader)
+    public ResolvedFunction resolveFunction(Session session, QualifiedName name, List<TypeSignatureProvider> parameterTypes, AccessControl accessControl)
     {
-        for (CatalogSchemaFunctionName catalogSchemaFunctionName : toPath(session, name)) {
-            Collection<CatalogFunctionMetadata> candidates = candidateLoader.apply(catalogSchemaFunctionName);
-            List<CatalogFunctionMetadata> exactCandidates = candidates.stream()
-                    .filter(function -> possibleExactCastMatch(signature, function.getFunctionMetadata().getSignature()))
-                    .collect(toImmutableList());
-            for (CatalogFunctionMetadata candidate : exactCandidates) {
-                if (canBindSignature(session, candidate.getFunctionMetadata().getSignature(), signature)) {
-                    return toFunctionBinding(candidate, signature);
-                }
-            }
-
-            // only consider generic genericCandidates
-            List<CatalogFunctionMetadata> genericCandidates = candidates.stream()
-                    .filter(function -> !function.getFunctionMetadata().getSignature().getTypeVariableConstraints().isEmpty())
-                    .collect(toImmutableList());
-            for (CatalogFunctionMetadata candidate : genericCandidates) {
-                if (canBindSignature(session, candidate.getFunctionMetadata().getSignature(), signature)) {
-                    return toFunctionBinding(candidate, signature);
-                }
-            }
+        Optional<ResolvedFunction> resolvedFunction = functionDecoder.fromQualifiedName(name);
+        if (resolvedFunction.isPresent()) {
+            return resolvedFunction.get();
         }
 
-        throw new TrinoException(FUNCTION_IMPLEMENTATION_MISSING, format("%s not found", signature));
-    }
+        CatalogFunctionBinding catalogFunctionBinding = bindFunction(
+                session,
+                name,
+                parameterTypes,
+                catalogSchemaFunctionName -> metadata.getFunctions(session, catalogSchemaFunctionName),
+                accessControl);
 
-    private boolean canBindSignature(Session session, Signature declaredSignature, Signature actualSignature)
-    {
-        return new SignatureBinder(session, metadata, typeManager, declaredSignature, false)
-                .canBind(fromTypeSignatures(actualSignature.getArgumentTypes()), actualSignature.getReturnType());
-    }
+        FunctionMetadata functionMetadata = catalogFunctionBinding.functionMetadata();
+        if (functionMetadata.isDeprecated()) {
+            warningCollector.add(new TrinoWarning(DEPRECATED_FUNCTION, "Use of deprecated function: %s: %s".formatted(name, functionMetadata.getDescription())));
+        }
 
-    private CatalogFunctionBinding toFunctionBinding(CatalogFunctionMetadata functionMetadata, Signature signature)
-    {
-        BoundSignature boundSignature = new BoundSignature(
-                signature.getName(),
-                typeManager.getType(signature.getReturnType()),
-                signature.getArgumentTypes().stream()
-                        .map(typeManager::getType)
-                        .collect(toImmutableList()));
-        return new CatalogFunctionBinding(
-                functionMetadata.getCatalogHandle(),
-                SignatureBinder.bindFunction(
-                        functionMetadata.getFunctionMetadata().getFunctionId(),
-                        functionMetadata.getFunctionMetadata().getSignature(),
-                        boundSignature));
+        return resolve(session, catalogFunctionBinding, accessControl);
     }
 
-    private static boolean possibleExactCastMatch(Signature signature, Signature declaredSignature)
+    private ResolvedFunction resolve(Session session, CatalogFunctionBinding functionBinding, AccessControl accessControl)
     {
-        if (!declaredSignature.getTypeVariableConstraints().isEmpty()) {
-            return false;
-        }
-        if (!declaredSignature.getReturnType().getBase().equalsIgnoreCase(signature.getReturnType().getBase())) {
-            return false;
-        }
-        if (!declaredSignature.getArgumentTypes().get(0).getBase().equalsIgnoreCase(signature.getArgumentTypes().get(0).getBase())) {
-            return false;
-        }
-        return true;
+        FunctionDependencyDeclaration dependencies;
+        if (isTrinoSqlLanguageFunction(functionBinding.functionBinding().getFunctionId())) {
+            dependencies = languageFunctionManager.getDependencies(session, functionBinding.functionBinding().getFunctionId(), accessControl);
+        }
+        else {
+            dependencies = metadata.getFunctionDependencies(
+                    session,
+                    functionBinding.catalogHandle(),
+                    functionBinding.functionBinding().getFunctionId(),
+                    functionBinding.functionBinding().getBoundSignature());
+        }
+
+        ResolvedFunction resolvedFunction = resolveFunctionBinding(
+                metadata,
+                typeManager,
+                functionBinder,
+                functionDecoder,
+                functionBinding.catalogHandle(),
+                functionBinding.functionBinding(),
+                functionBinding.functionMetadata(),
+                dependencies,
+                catalogSchemaFunctionName -> metadata.getFunctions(session, catalogSchemaFunctionName),
+                catalogFunctionBinding -> resolve(session, catalogFunctionBinding, accessControl));
+
+        // For SQL language functions, register the resolved function with the function manager,
+        // allowing the resolved function to be used later to retrieve the implementation.
+        if (isTrinoSqlLanguageFunction(resolvedFunction.getFunctionId())) {
+            languageFunctionManager.registerResolvedFunction(session, resolvedFunction);
+        }
+
+        return resolvedFunction;
     }
 
-    CatalogFunctionBinding resolveFunction(
+    private CatalogFunctionBinding bindFunction(
             Session session,
-            QualifiedFunctionName name,
+            QualifiedName name,
             List<TypeSignatureProvider> parameterTypes,
-            Function<CatalogSchemaFunctionName, Collection<CatalogFunctionMetadata>> candidateLoader)
+            Function<CatalogSchemaFunctionName, Collection<CatalogFunctionMetadata>> candidateLoader,
+            AccessControl accessControl)
     {
         ImmutableList.Builder<CatalogFunctionMetadata> allCandidates = ImmutableList.builder();
-        for (CatalogSchemaFunctionName catalogSchemaFunctionName : toPath(session, name)) {
+        List<CatalogSchemaFunctionName> fullPath = toPath(session, name, accessControl);
+        List<CatalogSchemaFunctionName> authorizedPath = fullPath.stream()
+                .filter(catalogSchemaFunctionName -> canExecuteFunction(session, accessControl, catalogSchemaFunctionName))
+                .collect(toImmutableList());
+        for (CatalogSchemaFunctionName catalogSchemaFunctionName : authorizedPath) {
             Collection<CatalogFunctionMetadata> candidates = candidateLoader.apply(catalogSchemaFunctionName);
-            List<CatalogFunctionMetadata> exactCandidates = candidates.stream()
-                    .filter(function -> function.getFunctionMetadata().getSignature().getTypeVariableConstraints().isEmpty())
-                    .collect(toImmutableList());
-
-            Optional<CatalogFunctionBinding> match = matchFunctionExact(session, exactCandidates, parameterTypes);
-            if (match.isPresent()) {
-                return match.get();
-            }
-
-            List<CatalogFunctionMetadata> genericCandidates = candidates.stream()
-                    .filter(function -> !function.getFunctionMetadata().getSignature().getTypeVariableConstraints().isEmpty())
-                    .collect(toImmutableList());
-
-            match = matchFunctionExact(session, genericCandidates, parameterTypes);
-            if (match.isPresent()) {
-                return match.get();
-            }
-
-            match = matchFunctionWithCoercion(session, candidates, parameterTypes);
+            Optional<CatalogFunctionBinding> match = functionBinder.tryBindFunction(parameterTypes, candidates);
             if (match.isPresent()) {
                 return match.get();
             }
-
             allCandidates.addAll(candidates);
         }
 
-        List<CatalogFunctionMetadata> candidates = allCandidates.build();
-        if (candidates.isEmpty()) {
-            throw new TrinoException(FUNCTION_NOT_FOUND, format("Function '%s' not registered", name));
+        Set<CatalogSchemaFunctionName> unauthorizedPath = Sets.difference(ImmutableSet.copyOf(fullPath), ImmutableSet.copyOf(authorizedPath));
+        if (unauthorizedPath.stream().anyMatch(functionName -> !candidateLoader.apply(functionName).isEmpty())) {
+            denyExecuteFunction(name.toString());
         }
 
-        List<String> expectedParameters = new ArrayList<>();
-        for (CatalogFunctionMetadata function : candidates) {
-            String arguments = Joiner.on(", ").join(function.getFunctionMetadata().getSignature().getArgumentTypes());
-            String constraints = Joiner.on(", ").join(function.getFunctionMetadata().getSignature().getTypeVariableConstraints());
-            expectedParameters.add(format("%s(%s) %s", name, arguments, constraints).stripTrailing());
-        }
-
-        String parameters = Joiner.on(", ").join(parameterTypes);
-        String expected = Joiner.on(", ").join(expectedParameters);
-        String message = format("Unexpected parameters (%s) for function %s. Expected: %s", parameters, name, expected);
-        throw new TrinoException(FUNCTION_NOT_FOUND, message);
-    }
-
-    public static List<CatalogSchemaFunctionName> toPath(Session session, QualifiedFunctionName name)
-    {
-        if (name.getCatalogName().isPresent()) {
-            return ImmutableList.of(new CatalogSchemaFunctionName(name.getCatalogName().orElseThrow(), name.getSchemaName().orElseThrow(), name.getFunctionName()));
-        }
-
-        if (name.getSchemaName().isPresent()) {
-            String currentCatalog = session.getCatalog()
-                    .orElseThrow(() -> new IllegalArgumentException("Session default catalog must be set to resolve a partial function name: " + name));
-            return ImmutableList.of(new CatalogSchemaFunctionName(currentCatalog, name.getSchemaName().orElseThrow(), name.getFunctionName()));
-        }
-
-        ImmutableList.Builder<CatalogSchemaFunctionName> names = ImmutableList.builder();
-
-        // global namespace
-        names.add(new CatalogSchemaFunctionName(GlobalSystemConnector.NAME, BUILTIN_SCHEMA, name.getFunctionName()));
-
-        // add resolved path items
-        for (SqlPathElement sqlPathElement : session.getPath().getParsedPath()) {
-            String catalog = sqlPathElement.getCatalog().map(Identifier::getCanonicalValue).or(session::getCatalog)
-                    .orElseThrow(() -> new IllegalArgumentException("Session default catalog must be set to resolve a partial function name: " + name));
-            names.add(new CatalogSchemaFunctionName(catalog, sqlPathElement.getSchema().getCanonicalValue(), name.getFunctionName()));
-        }
-        return names.build();
-    }
-
-    private Optional<CatalogFunctionBinding> matchFunctionExact(Session session, List<CatalogFunctionMetadata> candidates, List<TypeSignatureProvider> actualParameters)
-    {
-        return matchFunction(session, candidates, actualParameters, false);
-    }
-
-    private Optional<CatalogFunctionBinding> matchFunctionWithCoercion(Session session, Collection<CatalogFunctionMetadata> candidates, List<TypeSignatureProvider> actualParameters)
-    {
-        return matchFunction(session, candidates, actualParameters, true);
-    }
-
-    private Optional<CatalogFunctionBinding> matchFunction(Session session, Collection<CatalogFunctionMetadata> candidates, List<TypeSignatureProvider> parameters, boolean coercionAllowed)
-    {
-        List<ApplicableFunction> applicableFunctions = identifyApplicableFunctions(session, candidates, parameters, coercionAllowed);
-        if (applicableFunctions.isEmpty()) {
-            return Optional.empty();
-        }
-
-        if (coercionAllowed) {
-            applicableFunctions = selectMostSpecificFunctions(session, applicableFunctions, parameters);
-            checkState(!applicableFunctions.isEmpty(), "at least single function must be left");
-        }
-
-        if (applicableFunctions.size() == 1) {
-            ApplicableFunction applicableFunction = getOnlyElement(applicableFunctions);
-            return Optional.of(toFunctionBinding(applicableFunction.getFunction(), applicableFunction.getBoundSignature()));
-        }
-
-        StringBuilder errorMessageBuilder = new StringBuilder();
-        errorMessageBuilder.append("Could not choose a best candidate operator. Explicit type casts must be added.\n");
-        errorMessageBuilder.append("Candidates are:\n");
-        for (ApplicableFunction function : applicableFunctions) {
-            errorMessageBuilder.append("\t * ");
-            errorMessageBuilder.append(function.getBoundSignature());
-            errorMessageBuilder.append("\n");
-        }
-        throw new TrinoException(AMBIGUOUS_FUNCTION_CALL, errorMessageBuilder.toString());
-    }
-
-    private List<ApplicableFunction> identifyApplicableFunctions(Session session, Collection<CatalogFunctionMetadata> candidates, List<TypeSignatureProvider> actualParameters, boolean allowCoercion)
-    {
-        ImmutableList.Builder<ApplicableFunction> applicableFunctions = ImmutableList.builder();
-        for (CatalogFunctionMetadata function : candidates) {
-            new SignatureBinder(session, metadata, typeManager, function.getFunctionMetadata().getSignature(), allowCoercion)
-                    .bind(actualParameters)
-                    .ifPresent(signature -> applicableFunctions.add(new ApplicableFunction(function, signature)));
-        }
-        return applicableFunctions.build();
-    }
-
-    private List<ApplicableFunction> selectMostSpecificFunctions(Session session, List<ApplicableFunction> applicableFunctions, List<TypeSignatureProvider> parameters)
-    {
-        checkArgument(!applicableFunctions.isEmpty());
-
-        List<ApplicableFunction> mostSpecificFunctions = selectMostSpecificFunctions(session, applicableFunctions);
-        if (mostSpecificFunctions.size() <= 1) {
-            return mostSpecificFunctions;
-        }
-
-        Optional<List<Type>> optionalParameterTypes = toTypes(parameters);
-        if (optionalParameterTypes.isEmpty()) {
-            // give up and return all remaining matches
-            return mostSpecificFunctions;
-        }
-
-        List<Type> parameterTypes = optionalParameterTypes.get();
-        if (!someParameterIsUnknown(parameterTypes)) {
-            // give up and return all remaining matches
-            return mostSpecificFunctions;
-        }
-
-        // look for functions that only cast the unknown arguments
-        List<ApplicableFunction> unknownOnlyCastFunctions = getUnknownOnlyCastFunctions(applicableFunctions, parameterTypes);
-        if (!unknownOnlyCastFunctions.isEmpty()) {
-            mostSpecificFunctions = unknownOnlyCastFunctions;
-            if (mostSpecificFunctions.size() == 1) {
-                return mostSpecificFunctions;
-            }
-        }
-
-        // If the return type for all the selected function is the same, and the parameters are declared as RETURN_NULL_ON_NULL
-        // all the functions are semantically the same. We can return just any of those.
-        if (returnTypeIsTheSame(mostSpecificFunctions) && allReturnNullOnGivenInputTypes(mostSpecificFunctions, parameterTypes)) {
-            // make it deterministic
-            ApplicableFunction selectedFunction = Ordering.usingToString()
-                    .reverse()
-                    .sortedCopy(mostSpecificFunctions)
-                    .get(0);
-            return ImmutableList.of(selectedFunction);
-        }
-
-        return mostSpecificFunctions;
+        List<CatalogFunctionMetadata> candidates = allCandidates.build();
+        throw functionNotFound(name.toString(), parameterTypes, candidates);
     }
 
-    private List<ApplicableFunction> selectMostSpecificFunctions(Session session, List<ApplicableFunction> candidates)
+    static ResolvedFunction resolveFunctionBinding(
+            Metadata metadata,
+            TypeManager typeManager,
+            FunctionBinder functionBinder,
+            ResolvedFunctionDecoder functionDecoder,
+            CatalogHandle catalogHandle,
+            FunctionBinding functionBinding,
+            FunctionMetadata functionMetadata,
+            FunctionDependencyDeclaration dependencies,
+            Function<CatalogSchemaFunctionName, Collection<CatalogFunctionMetadata>> candidateLoader,
+            Function<CatalogFunctionBinding, ResolvedFunction> resolver)
     {
-        List<ApplicableFunction> representatives = new ArrayList<>();
-
-        for (ApplicableFunction current : candidates) {
-            boolean found = false;
-            for (int i = 0; i < representatives.size(); i++) {
-                ApplicableFunction representative = representatives.get(i);
-                if (isMoreSpecificThan(session, current, representative)) {
-                    representatives.set(i, current);
+        Map<TypeSignature, Type> dependentTypes = dependencies.getTypeDependencies().stream()
+                .map(typeSignature -> applyBoundVariables(typeSignature, functionBinding))
+                .collect(toImmutableMap(Function.identity(), typeManager::getType, (left, right) -> left));
+
+        ImmutableSet.Builder<ResolvedFunction> functions = ImmutableSet.builder();
+        for (FunctionDependency functionDependency : dependencies.getFunctionDependencies()) {
+            try {
+                CatalogSchemaFunctionName name = functionDependency.getName();
+                Optional<ResolvedFunction> resolvedFunction = functionDecoder.fromCatalogSchemaFunctionName(name);
+                if (resolvedFunction.isPresent()) {
+                    functions.add(resolvedFunction.get());
                 }
-                if (isMoreSpecificThan(session, current, representative) || isMoreSpecificThan(session, representative, current)) {
-                    found = true;
-                    break;
+                else {
+                    CatalogFunctionBinding catalogFunctionBinding = functionBinder.bindFunction(
+                            fromTypeSignatures(applyBoundVariables(functionDependency.getArgumentTypes(), functionBinding)),
+                            candidateLoader.apply(name),
+                            name.toString());
+                    functions.add(resolver.apply(catalogFunctionBinding));
                 }
             }
-
-            if (!found) {
-                representatives.add(current);
+            catch (TrinoException e) {
+                if (!functionDependency.isOptional()) {
+                    throw e;
+                }
             }
         }
-
-        return representatives;
-    }
-
-    private static boolean someParameterIsUnknown(List<Type> parameters)
-    {
-        return parameters.stream().anyMatch(type -> type.equals(UNKNOWN));
-    }
-
-    private List<ApplicableFunction> getUnknownOnlyCastFunctions(List<ApplicableFunction> applicableFunction, List<Type> actualParameters)
-    {
-        return applicableFunction.stream()
-                .filter(function -> onlyCastsUnknown(function, actualParameters))
-                .collect(toImmutableList());
-    }
-
-    private boolean onlyCastsUnknown(ApplicableFunction applicableFunction, List<Type> actualParameters)
-    {
-        List<Type> boundTypes = applicableFunction.getBoundSignature().getArgumentTypes().stream()
-                .map(typeManager::getType)
-                .collect(toImmutableList());
-        checkState(actualParameters.size() == boundTypes.size(), "type lists are of different lengths");
-        for (int i = 0; i < actualParameters.size(); i++) {
-            if (!boundTypes.get(i).equals(actualParameters.get(i)) && actualParameters.get(i) != UNKNOWN) {
-                return false;
+        for (OperatorDependency operatorDependency : dependencies.getOperatorDependencies()) {
+            try {
+                List<Type> argumentTypes = applyBoundVariables(operatorDependency.getArgumentTypes(), functionBinding).stream()
+                        .map(typeManager::getType)
+                        .collect(toImmutableList());
+                functions.add(metadata.resolveOperator(operatorDependency.getOperatorType(), argumentTypes));
             }
-        }
-        return true;
-    }
-
-    private boolean returnTypeIsTheSame(List<ApplicableFunction> applicableFunctions)
-    {
-        Set<Type> returnTypes = applicableFunctions.stream()
-                .map(function -> typeManager.getType(function.getBoundSignature().getReturnType()))
-                .collect(Collectors.toSet());
-        return returnTypes.size() == 1;
-    }
-
-    private static boolean allReturnNullOnGivenInputTypes(List<ApplicableFunction> applicableFunctions, List<Type> parameters)
-    {
-        return applicableFunctions.stream().allMatch(x -> returnsNullOnGivenInputTypes(x, parameters));
-    }
-
-    private static boolean returnsNullOnGivenInputTypes(ApplicableFunction applicableFunction, List<Type> parameterTypes)
-    {
-        FunctionMetadata function = applicableFunction.getFunctionMetadata();
-
-        // Window and Aggregation functions have fixed semantic where NULL values are always skipped
-        if (function.getKind() != SCALAR) {
-            return true;
-        }
-
-        FunctionNullability functionNullability = function.getFunctionNullability();
-        for (int i = 0; i < parameterTypes.size(); i++) {
-            // if the argument value will always be null and the function argument is not nullable, the function will always return null
-            if (parameterTypes.get(i).equals(UNKNOWN) && !functionNullability.isArgumentNullable(i)) {
-                return true;
+            catch (TrinoException e) {
+                if (!operatorDependency.isOptional()) {
+                    throw e;
+                }
             }
         }
-        return false;
-    }
-
-    private Optional<List<Type>> toTypes(List<TypeSignatureProvider> typeSignatureProviders)
-    {
-        ImmutableList.Builder<Type> resultBuilder = ImmutableList.builder();
-        for (TypeSignatureProvider typeSignatureProvider : typeSignatureProviders) {
-            if (typeSignatureProvider.hasDependency()) {
-                return Optional.empty();
+        for (CastDependency castDependency : dependencies.getCastDependencies()) {
+            try {
+                Type fromType = typeManager.getType(applyBoundVariables(castDependency.getFromType(), functionBinding));
+                Type toType = typeManager.getType(applyBoundVariables(castDependency.getToType(), functionBinding));
+                functions.add(metadata.getCoercion(fromType, toType));
+            }
+            catch (TrinoException e) {
+                if (!castDependency.isOptional()) {
+                    throw e;
+                }
             }
-            resultBuilder.add(typeManager.getType(typeSignatureProvider.getTypeSignature()));
         }
-        return Optional.of(resultBuilder.build());
-    }
 
-    /**
-     * One method is more specific than another if invocation handled by the first method could be passed on to the other one
-     */
-    private boolean isMoreSpecificThan(Session session, ApplicableFunction left, ApplicableFunction right)
-    {
-        List<TypeSignatureProvider> resolvedTypes = fromTypeSignatures(left.getBoundSignature().getArgumentTypes());
-        return new SignatureBinder(session, metadata, typeManager, right.getDeclaredSignature(), true)
-                .canBind(resolvedTypes);
+        return new ResolvedFunction(
+                functionBinding.getBoundSignature(),
+                catalogHandle,
+                functionBinding.getFunctionId(),
+                functionMetadata.getKind(),
+                functionMetadata.isDeterministic(),
+                functionMetadata.getFunctionNullability(),
+                dependentTypes,
+                functions.build());
     }
 
-    private static class ApplicableFunction
+    // this is visible for the table function resolution, which should be merged into this class
+    public static List<CatalogSchemaFunctionName> toPath(Session session, QualifiedName name, AccessControl accessControl)
     {
-        private final CatalogFunctionMetadata function;
-        // Ideally this would be a real bound signature, but the resolver algorithm considers functions with illegal types (e.g., char(large_number))
-        // We could just not consider these applicable functions, but there are tests that depend on the specific error messages for these failures.
-        private final Signature boundSignature;
-
-        private ApplicableFunction(CatalogFunctionMetadata function, Signature boundSignature)
-        {
-            this.function = function;
-            this.boundSignature = boundSignature;
+        List<String> parts = name.getParts();
+        if (parts.size() > 3) {
+            throw new TrinoException(FUNCTION_NOT_FOUND, "Invalid function name: " + name);
         }
-
-        public CatalogFunctionMetadata getFunction()
-        {
-            return function;
+        if (parts.size() == 3) {
+            return ImmutableList.of(new CatalogSchemaFunctionName(parts.get(0), parts.get(1), parts.get(2)));
         }
 
-        public FunctionMetadata getFunctionMetadata()
-        {
-            return function.getFunctionMetadata();
-        }
-
-        public Signature getDeclaredSignature()
-        {
-            return function.getFunctionMetadata().getSignature();
-        }
-
-        public Signature getBoundSignature()
-        {
-            return boundSignature;
-        }
-
-        @Override
-        public String toString()
-        {
-            return toStringHelper(this)
-                    .add("declaredSignature", function.getFunctionMetadata().getSignature())
-                    .add("boundSignature", boundSignature)
-                    .toString();
-        }
-    }
-
-    static class CatalogFunctionMetadata
-    {
-        private final CatalogHandle catalogHandle;
-        private final FunctionMetadata functionMetadata;
-
-        public CatalogFunctionMetadata(CatalogHandle catalogHandle, FunctionMetadata functionMetadata)
-        {
-            this.catalogHandle = requireNonNull(catalogHandle, "catalogHandle is null");
-            this.functionMetadata = requireNonNull(functionMetadata, "functionMetadata is null");
+        if (parts.size() == 2) {
+            String currentCatalog = session.getCatalog()
+                    .orElseThrow(() -> new TrinoException(MISSING_CATALOG_NAME, "Session default catalog must be set to resolve a partial function name: " + name));
+            return ImmutableList.of(new CatalogSchemaFunctionName(currentCatalog, parts.get(0), parts.get(1)));
         }
 
-        public CatalogHandle getCatalogHandle()
-        {
-            return catalogHandle;
-        }
+        ImmutableList.Builder<CatalogSchemaFunctionName> names = ImmutableList.builder();
 
-        public FunctionMetadata getFunctionMetadata()
-        {
-            return functionMetadata;
+        // add resolved path items
+        for (CatalogSchemaName element : session.getPath().getPath()) {
+            names.add(new CatalogSchemaFunctionName(element.getCatalogName(), element.getSchemaName(), parts.get(0)));
         }
+        return names.build();
     }
 
-    static class CatalogFunctionBinding
+    private static boolean canExecuteFunction(Session session, AccessControl accessControl, CatalogSchemaFunctionName functionName)
     {
-        private final CatalogHandle catalogHandle;
-        private final FunctionBinding functionBinding;
-
-        private CatalogFunctionBinding(CatalogHandle catalogHandle, FunctionBinding functionBinding)
-        {
-            this.catalogHandle = requireNonNull(catalogHandle, "catalogHandle is null");
-            this.functionBinding = requireNonNull(functionBinding, "functionBinding is null");
-        }
-
-        public CatalogHandle getCatalogHandle()
-        {
-            return catalogHandle;
-        }
-
-        public FunctionBinding getFunctionBinding()
-        {
-            return functionBinding;
+        if (isInlineFunction(functionName) || isBuiltinFunctionName(functionName)) {
+            return true;
         }
+        return accessControl.canExecuteFunction(
+                SecurityContext.of(session),
+                new QualifiedObjectName(functionName.getCatalogName(), functionName.getSchemaName(), functionName.getFunctionName()));
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/GlobalFunctionCatalog.java b/core/trino-main/src/main/java/io/trino/metadata/GlobalFunctionCatalog.java
index ce2ca868363f..0b8e28702a7c 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/GlobalFunctionCatalog.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/GlobalFunctionCatalog.java
@@ -17,10 +17,14 @@
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Multimap;
-import io.trino.operator.table.ExcludeColumns;
+import com.google.errorprone.annotations.ThreadSafe;
+import io.trino.connector.system.GlobalSystemConnector;
+import io.trino.operator.table.ExcludeColumns.ExcludeColumnsFunctionHandle;
+import io.trino.operator.table.Sequence.SequenceFunctionHandle;
 import io.trino.spi.function.AggregationFunctionMetadata;
 import io.trino.spi.function.AggregationImplementation;
 import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.function.FunctionDependencies;
 import io.trino.spi.function.FunctionDependencyDeclaration;
 import io.trino.spi.function.FunctionId;
@@ -29,14 +33,12 @@
 import io.trino.spi.function.InvocationConvention;
 import io.trino.spi.function.OperatorType;
 import io.trino.spi.function.ScalarFunctionImplementation;
-import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.function.Signature;
 import io.trino.spi.function.WindowFunctionSupplier;
-import io.trino.spi.ptf.TableFunctionProcessorProvider;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
 import io.trino.spi.type.TypeSignature;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -47,8 +49,10 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.trino.metadata.OperatorNameUtil.isOperatorName;
+import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
 import static io.trino.metadata.OperatorNameUtil.unmangleOperator;
 import static io.trino.operator.table.ExcludeColumns.getExcludeColumnsFunctionProcessorProvider;
+import static io.trino.operator.table.Sequence.getSequenceFunctionProcessorProvider;
 import static io.trino.spi.function.FunctionKind.AGGREGATE;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -65,12 +69,16 @@ public class GlobalFunctionCatalog
     public final synchronized void addFunctions(FunctionBundle functionBundle)
     {
         for (FunctionMetadata functionMetadata : functionBundle.getFunctions()) {
-            checkArgument(!functionMetadata.getSignature().getName().contains("|"), "Function name cannot contain '|' character: %s", functionMetadata.getSignature());
-            checkArgument(!functionMetadata.getSignature().getName().contains("@"), "Function name cannot contain '@' character: %s", functionMetadata.getSignature());
-            checkNotSpecializedTypeOperator(functionMetadata.getSignature());
-            for (FunctionMetadata existingFunction : this.functions.list()) {
-                checkArgument(!functionMetadata.getFunctionId().equals(existingFunction.getFunctionId()), "Function already registered: %s", functionMetadata.getFunctionId());
-                checkArgument(!functionMetadata.getSignature().equals(existingFunction.getSignature()), "Function already registered: %s", functionMetadata.getSignature());
+            checkArgument(!functions.getFunctionsById().containsKey(functionMetadata.getFunctionId()), "Function already registered: %s", functionMetadata.getFunctionId());
+
+            for (String alias : functionMetadata.getNames()) {
+                checkArgument(!alias.contains("|"), "Function name cannot contain '|' character: %s(%s)", alias, functionMetadata.getSignature());
+                checkArgument(!alias.contains("@"), "Function name cannot contain '@' character: %s(%s)", alias, functionMetadata.getSignature());
+                checkNotSpecializedTypeOperator(alias, functionMetadata.getSignature());
+
+                for (FunctionMetadata existingFunction : this.functions.get(alias)) {
+                    checkArgument(!functionMetadata.getSignature().equals(existingFunction.getSignature()), "Function already registered: %s(%s)", alias, functionMetadata.getSignature());
+                }
             }
         }
         this.functions = new FunctionMap(this.functions, functionBundle);
@@ -80,20 +88,18 @@ public final synchronized void addFunctions(FunctionBundle functionBundle)
      * Type operators are handled automatically by the engine, so custom operator implementations
      * cannot be registered for these.
      */
-    private static void checkNotSpecializedTypeOperator(Signature signature)
+    private static void checkNotSpecializedTypeOperator(String alias, Signature signature)
     {
-        String name = signature.getName();
-        if (!isOperatorName(name)) {
+        if (!isOperatorName(alias)) {
             return;
         }
 
-        OperatorType operatorType = unmangleOperator(name);
+        OperatorType operatorType = unmangleOperator(alias);
 
         // The trick here is the Generic*Operator implementations implement these exact signatures,
         // so we only these exact signatures to be registered.  Since, only a single function with
         // a specific signature can be registered, it prevents others from being registered.
         Signature.Builder expectedSignature = Signature.builder()
-                .name(signature.getName())
                 .argumentTypes(Collections.nCopies(operatorType.getArgumentCount(), new TypeSignature("T")));
 
         switch (operatorType) {
@@ -130,12 +136,9 @@ public List<FunctionMetadata> listFunctions()
         return functions.list();
     }
 
-    public Collection<FunctionMetadata> getFunctions(SchemaFunctionName name)
+    public Collection<FunctionMetadata> getBuiltInFunctions(String functionName)
     {
-        if (!BUILTIN_SCHEMA.equals(name.getSchemaName())) {
-            return ImmutableList.of();
-        }
-        return functions.get(name.getFunctionName());
+        return functions.get(functionName);
     }
 
     public FunctionMetadata getFunctionMetadata(FunctionId functionId)
@@ -176,15 +179,33 @@ public ScalarFunctionImplementation getScalarFunctionImplementation(
     }
 
     @Override
-    public TableFunctionProcessorProvider getTableFunctionProcessorProvider(SchemaFunctionName name)
+    public TableFunctionProcessorProvider getTableFunctionProcessorProvider(ConnectorTableFunctionHandle functionHandle)
     {
-        if (name.equals(new SchemaFunctionName(BUILTIN_SCHEMA, ExcludeColumns.NAME))) {
+        if (functionHandle instanceof ExcludeColumnsFunctionHandle) {
             return getExcludeColumnsFunctionProcessorProvider();
         }
+        if (functionHandle instanceof SequenceFunctionHandle) {
+            return getSequenceFunctionProcessorProvider();
+        }
 
         return null;
     }
 
+    public static boolean isBuiltinFunctionName(CatalogSchemaFunctionName functionName)
+    {
+        return functionName.getCatalogName().equals(GlobalSystemConnector.NAME) && functionName.getSchemaName().equals(BUILTIN_SCHEMA);
+    }
+
+    public static CatalogSchemaFunctionName builtinFunctionName(OperatorType operatorType)
+    {
+        return builtinFunctionName(mangleOperatorName(operatorType));
+    }
+
+    public static CatalogSchemaFunctionName builtinFunctionName(String functionName)
+    {
+        return new CatalogSchemaFunctionName(GlobalSystemConnector.NAME, BUILTIN_SCHEMA, functionName);
+    }
+
     private static class FunctionMap
     {
         private final Map<FunctionId, FunctionBundle> functionBundlesById;
@@ -215,8 +236,11 @@ public FunctionMap(FunctionMap map, FunctionBundle functionBundle)
 
             ImmutableListMultimap.Builder<String, FunctionMetadata> functionsByName = ImmutableListMultimap.<String, FunctionMetadata>builder()
                     .putAll(map.functionsByLowerCaseName);
-            functionBundle.getFunctions()
-                    .forEach(functionMetadata -> functionsByName.put(functionMetadata.getSignature().getName().toLowerCase(ENGLISH), functionMetadata));
+            for (FunctionMetadata function : functionBundle.getFunctions()) {
+                for (String alias : function.getNames()) {
+                    functionsByName.put(alias.toLowerCase(ENGLISH), function);
+                }
+            }
             this.functionsByLowerCaseName = functionsByName.build();
 
             // Make sure all functions with the same name are aggregations or none of them are
@@ -235,6 +259,11 @@ public List<FunctionMetadata> list()
             return ImmutableList.copyOf(functionsByLowerCaseName.values());
         }
 
+        public Map<FunctionId, FunctionMetadata> getFunctionsById()
+        {
+            return functionsById;
+        }
+
         public Collection<FunctionMetadata> get(String functionName)
         {
             return functionsByLowerCaseName.get(functionName.toLowerCase(ENGLISH));
diff --git a/core/trino-main/src/main/java/io/trino/metadata/HandleJsonModule.java b/core/trino-main/src/main/java/io/trino/metadata/HandleJsonModule.java
index def005789a67..2581657f9ae3 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/HandleJsonModule.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/HandleJsonModule.java
@@ -29,7 +29,7 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.exchange.ExchangeSinkInstanceHandle;
 import io.trino.spi.exchange.ExchangeSourceHandle;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 
 public class HandleJsonModule
         implements Module
diff --git a/core/trino-main/src/main/java/io/trino/metadata/HandleResolver.java b/core/trino-main/src/main/java/io/trino/metadata/HandleResolver.java
index 25d5b0d42d5f..452a568f1783 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/HandleResolver.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/HandleResolver.java
@@ -13,11 +13,10 @@
  */
 package io.trino.metadata;
 
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.trino.server.PluginClassLoader;
 
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
diff --git a/core/trino-main/src/main/java/io/trino/metadata/InMemoryNodeManager.java b/core/trino-main/src/main/java/io/trino/metadata/InMemoryNodeManager.java
index a2e17c960d30..f85dc0c7a8e3 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/InMemoryNodeManager.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/InMemoryNodeManager.java
@@ -14,6 +14,7 @@
 package io.trino.metadata;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.client.NodeVersion;
 import io.trino.spi.connector.CatalogHandle;
 
@@ -25,6 +26,7 @@
 
 import static java.util.Objects.requireNonNull;
 
+@ThreadSafe
 public class InMemoryNodeManager
         implements InternalNodeManager
 {
@@ -59,7 +61,7 @@ public Set<InternalNode> getNodes(NodeState state)
     {
         switch (state) {
             case ACTIVE:
-                return allNodes;
+                return ImmutableSet.copyOf(allNodes);
             case INACTIVE:
             case SHUTTING_DOWN:
                 return ImmutableSet.of();
@@ -70,20 +72,20 @@ public Set<InternalNode> getNodes(NodeState state)
     @Override
     public Set<InternalNode> getActiveCatalogNodes(CatalogHandle catalogHandle)
     {
-        return allNodes;
+        return ImmutableSet.copyOf(allNodes);
     }
 
     @Override
     public NodesSnapshot getActiveNodesSnapshot()
     {
-        return new NodesSnapshot(allNodes, Optional.empty());
+        return new NodesSnapshot(ImmutableSet.copyOf(allNodes), Optional.empty());
     }
 
     @Override
     public AllNodes getAllNodes()
     {
         return new AllNodes(
-                allNodes,
+                ImmutableSet.copyOf(allNodes),
                 ImmutableSet.of(),
                 ImmutableSet.of(),
                 ImmutableSet.of(CURRENT_NODE));
diff --git a/core/trino-main/src/main/java/io/trino/metadata/InternalBlockEncodingSerde.java b/core/trino-main/src/main/java/io/trino/metadata/InternalBlockEncodingSerde.java
index 31a0e2b213f6..c122b9e880f4 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/InternalBlockEncodingSerde.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/InternalBlockEncodingSerde.java
@@ -13,6 +13,7 @@
  */
 package io.trino.metadata;
 
+import com.google.inject.Inject;
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.SliceOutput;
 import io.trino.spi.block.Block;
@@ -23,8 +24,6 @@
 import io.trino.spi.type.TypeManager;
 import org.assertj.core.util.VisibleForTesting;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 import java.util.function.Function;
 
diff --git a/core/trino-main/src/main/java/io/trino/metadata/InternalFunctionBundle.java b/core/trino-main/src/main/java/io/trino/metadata/InternalFunctionBundle.java
index 39d3fc685486..20a94c3362fc 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/InternalFunctionBundle.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/InternalFunctionBundle.java
@@ -16,7 +16,7 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.UncheckedExecutionException;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 import io.trino.operator.scalar.SpecializedSqlScalarFunction;
 import io.trino.operator.scalar.annotations.ScalarFromAnnotationsParser;
 import io.trino.operator.window.SqlWindowFunction;
@@ -49,8 +49,8 @@
 import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.HOURS;
 
@@ -138,8 +138,9 @@ public ScalarFunctionImplementation getScalarFunctionImplementation(
 
     private SpecializedSqlScalarFunction specializeScalarFunction(FunctionId functionId, BoundSignature boundSignature, FunctionDependencies functionDependencies)
     {
-        SqlScalarFunction function = (SqlScalarFunction) getSqlFunction(functionId);
-        return function.specialize(boundSignature, functionDependencies);
+        SqlFunction function = getSqlFunction(functionId);
+        checkArgument(function instanceof SqlScalarFunction, "%s is not a scalar function", function.getFunctionMetadata().getSignature());
+        return ((SqlScalarFunction) function).specialize(boundSignature, functionDependencies);
     }
 
     @Override
@@ -156,8 +157,9 @@ public AggregationImplementation getAggregationImplementation(FunctionId functio
 
     private AggregationImplementation specializedAggregation(FunctionId functionId, BoundSignature boundSignature, FunctionDependencies functionDependencies)
     {
-        SqlAggregationFunction aggregationFunction = (SqlAggregationFunction) functions.get(functionId);
-        return aggregationFunction.specialize(boundSignature, functionDependencies);
+        SqlFunction function = getSqlFunction(functionId);
+        checkArgument(function instanceof SqlAggregationFunction, "%s is not an aggregation function", function.getFunctionMetadata().getSignature());
+        return ((SqlAggregationFunction) function).specialize(boundSignature, functionDependencies);
     }
 
     @Override
@@ -174,8 +176,9 @@ public WindowFunctionSupplier getWindowFunctionSupplier(FunctionId functionId, B
 
     private WindowFunctionSupplier specializeWindow(FunctionId functionId, BoundSignature boundSignature, FunctionDependencies functionDependencies)
     {
-        SqlWindowFunction function = (SqlWindowFunction) functions.get(functionId);
-        return function.specialize(boundSignature, functionDependencies);
+        SqlFunction function = functions.get(functionId);
+        checkArgument(function instanceof SqlWindowFunction, "%s is not a window function", function.getFunctionMetadata().getSignature());
+        return ((SqlWindowFunction) function).specialize(boundSignature, functionDependencies);
     }
 
     private SqlFunction getSqlFunction(FunctionId functionId)
diff --git a/core/trino-main/src/main/java/io/trino/metadata/InternalFunctionDependencies.java b/core/trino-main/src/main/java/io/trino/metadata/InternalFunctionDependencies.java
index 70bcd1425905..bac8bc7134e0 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/InternalFunctionDependencies.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/InternalFunctionDependencies.java
@@ -15,13 +15,12 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.function.FunctionDependencies;
 import io.trino.spi.function.FunctionNullability;
 import io.trino.spi.function.InvocationConvention;
 import io.trino.spi.function.OperatorType;
-import io.trino.spi.function.QualifiedFunctionName;
 import io.trino.spi.function.ScalarFunctionImplementation;
-import io.trino.spi.function.Signature;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignature;
 
@@ -34,6 +33,7 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static io.trino.metadata.GlobalFunctionCatalog.isBuiltinFunctionName;
 import static io.trino.metadata.OperatorNameUtil.isOperatorName;
 import static io.trino.metadata.OperatorNameUtil.unmangleOperator;
 import static io.trino.spi.function.OperatorType.CAST;
@@ -62,7 +62,7 @@ public InternalFunctionDependencies(
         this.specialization = specialization;
         this.types = ImmutableMap.copyOf(typeDependencies);
         this.functions = functionDependencies.stream()
-                .filter(function -> !isOperatorName(function.getSignature().getName()))
+                .filter(function -> !isOperatorName(function.getSignature().getName().getFunctionName()))
                 .collect(toImmutableMap(FunctionKey::new, identity()));
         this.operators = functionDependencies.stream()
                 .filter(InternalFunctionDependencies::isOperator)
@@ -84,7 +84,7 @@ public Type getType(TypeSignature typeSignature)
     }
 
     @Override
-    public FunctionNullability getFunctionNullability(QualifiedFunctionName name, List<Type> parameterTypes)
+    public FunctionNullability getFunctionNullability(CatalogSchemaFunctionName name, List<Type> parameterTypes)
     {
         FunctionKey functionKey = new FunctionKey(name, toTypeSignatures(parameterTypes));
         ResolvedFunction resolvedFunction = functions.get(functionKey);
@@ -117,7 +117,7 @@ public FunctionNullability getCastNullability(Type fromType, Type toType)
     }
 
     @Override
-    public ScalarFunctionImplementation getScalarFunctionImplementation(QualifiedFunctionName name, List<Type> parameterTypes, InvocationConvention invocationConvention)
+    public ScalarFunctionImplementation getScalarFunctionImplementation(CatalogSchemaFunctionName name, List<Type> parameterTypes, InvocationConvention invocationConvention)
     {
         FunctionKey functionKey = new FunctionKey(name, toTypeSignatures(parameterTypes));
         ResolvedFunction resolvedFunction = functions.get(functionKey);
@@ -128,7 +128,7 @@ public ScalarFunctionImplementation getScalarFunctionImplementation(QualifiedFun
     }
 
     @Override
-    public ScalarFunctionImplementation getScalarFunctionImplementationSignature(QualifiedFunctionName name, List<TypeSignature> parameterTypes, InvocationConvention invocationConvention)
+    public ScalarFunctionImplementation getScalarFunctionImplementationSignature(CatalogSchemaFunctionName name, List<TypeSignature> parameterTypes, InvocationConvention invocationConvention)
     {
         FunctionKey functionKey = new FunctionKey(name, parameterTypes);
         ResolvedFunction resolvedFunction = functions.get(functionKey);
@@ -191,31 +191,30 @@ private static List<TypeSignature> toTypeSignatures(List<Type> types)
 
     private static boolean isOperator(ResolvedFunction function)
     {
-        String name = function.getSignature().getName();
-        return isOperatorName(name) && unmangleOperator(name) != CAST;
+        CatalogSchemaFunctionName name = function.getSignature().getName();
+        return isBuiltinFunctionName(name) && isOperatorName(name.getFunctionName()) && unmangleOperator(name.getFunctionName()) != CAST;
     }
 
     private static boolean isCast(ResolvedFunction function)
     {
-        String name = function.getSignature().getName();
-        return isOperatorName(name) && unmangleOperator(name) == CAST;
+        CatalogSchemaFunctionName name = function.getSignature().getName();
+        return isBuiltinFunctionName(name) && isOperatorName(name.getFunctionName()) && unmangleOperator(name.getFunctionName()) == CAST;
     }
 
     public static final class FunctionKey
     {
-        private final QualifiedFunctionName name;
+        private final CatalogSchemaFunctionName name;
         private final List<TypeSignature> argumentTypes;
 
         private FunctionKey(ResolvedFunction resolvedFunction)
         {
-            Signature signature = resolvedFunction.getSignature().toSignature();
-            name = QualifiedFunctionName.of(signature.getName());
+            name = resolvedFunction.getSignature().getName();
             argumentTypes = resolvedFunction.getSignature().getArgumentTypes().stream()
                     .map(Type::getTypeSignature)
                     .collect(toImmutableList());
         }
 
-        private FunctionKey(QualifiedFunctionName name, List<TypeSignature> argumentTypes)
+        private FunctionKey(CatalogSchemaFunctionName name, List<TypeSignature> argumentTypes)
         {
             this.name = requireNonNull(name, "name is null");
             this.argumentTypes = ImmutableList.copyOf(requireNonNull(argumentTypes, "argumentTypes is null"));
@@ -257,7 +256,7 @@ public static final class OperatorKey
 
         private OperatorKey(ResolvedFunction resolvedFunction)
         {
-            operatorType = unmangleOperator(resolvedFunction.getSignature().getName());
+            operatorType = unmangleOperator(resolvedFunction.getSignature().getName().getFunctionName());
             argumentTypes = toTypeSignatures(resolvedFunction.getSignature().getArgumentTypes());
         }
 
diff --git a/core/trino-main/src/main/java/io/trino/metadata/InternalNodeManager.java b/core/trino-main/src/main/java/io/trino/metadata/InternalNodeManager.java
index 928ca1ebaf37..c9b6314b67bd 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/InternalNodeManager.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/InternalNodeManager.java
@@ -22,6 +22,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static java.util.Objects.requireNonNull;
 
 public interface InternalNodeManager
@@ -68,5 +69,14 @@ public Set<InternalNode> getConnectorNodes(CatalogHandle catalogHandle)
                     .map(map -> map.get(catalogHandle))
                     .orElse(allNodes);
         }
+
+        @Override
+        public String toString()
+        {
+            return toStringHelper(this)
+                    .add("allNodes", allNodes)
+                    .add("connectorNodes", connectorNodes.orElse(null))
+                    .toString();
+        }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/LanguageFunctionManager.java b/core/trino-main/src/main/java/io/trino/metadata/LanguageFunctionManager.java
new file mode 100644
index 000000000000..e4ae4ecfd77d
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/metadata/LanguageFunctionManager.java
@@ -0,0 +1,495 @@
+/*
+ * Licensed 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 io.trino.metadata;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.hash.Hashing;
+import com.google.inject.Inject;
+import io.trino.Session;
+import io.trino.connector.system.GlobalSystemConnector;
+import io.trino.execution.TaskId;
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.operator.scalar.SpecializedSqlScalarFunction;
+import io.trino.security.AccessControl;
+import io.trino.security.ViewAccessControl;
+import io.trino.spi.QueryId;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.connector.CatalogSchemaName;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.CatalogSchemaFunctionName;
+import io.trino.spi.function.FunctionDependencies;
+import io.trino.spi.function.FunctionDependencyDeclaration;
+import io.trino.spi.function.FunctionId;
+import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.InvocationConvention;
+import io.trino.spi.function.LanguageFunction;
+import io.trino.spi.function.ScalarFunctionImplementation;
+import io.trino.spi.function.SchemaFunctionName;
+import io.trino.spi.security.GroupProvider;
+import io.trino.spi.security.Identity;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeId;
+import io.trino.spi.type.TypeManager;
+import io.trino.sql.PlannerContext;
+import io.trino.sql.SqlPath;
+import io.trino.sql.analyzer.TypeSignatureTranslator;
+import io.trino.sql.parser.SqlParser;
+import io.trino.sql.routine.SqlRoutineAnalysis;
+import io.trino.sql.routine.SqlRoutineAnalyzer;
+import io.trino.sql.routine.SqlRoutineCompiler;
+import io.trino.sql.routine.SqlRoutinePlanner;
+import io.trino.sql.routine.ir.IrRoutine;
+import io.trino.sql.tree.FunctionSpecification;
+import io.trino.sql.tree.ParameterDeclaration;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_ERROR;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.sql.routine.SqlRoutineAnalyzer.extractFunctionMetadata;
+import static io.trino.sql.routine.SqlRoutineAnalyzer.isRunAsInvoker;
+import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.joining;
+
+public class LanguageFunctionManager
+        implements LanguageFunctionProvider
+{
+    public static final String QUERY_LOCAL_SCHEMA = "$query";
+    private static final String SQL_FUNCTION_PREFIX = "$trino_sql_";
+    private final SqlParser parser;
+    private final TypeManager typeManager;
+    private final GroupProvider groupProvider;
+    private SqlRoutineAnalyzer analyzer;
+    private SqlRoutinePlanner planner;
+    private final Map<QueryId, QueryFunctions> queryFunctions = new ConcurrentHashMap<>();
+
+    @Inject
+    public LanguageFunctionManager(SqlParser parser, TypeManager typeManager, GroupProvider groupProvider)
+    {
+        this.parser = requireNonNull(parser, "parser is null");
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.groupProvider = requireNonNull(groupProvider, "groupProvider is null");
+    }
+
+    // There is a circular dependency between LanguageFunctionManager and MetadataManager.
+    // To determine the dependencies of a language function, it must be analyzed, and that
+    // requires the metadata manager to resolve functions. The metadata manager needs the
+    // language function manager to resolve language functions.
+    public synchronized void setPlannerContext(PlannerContext plannerContext)
+    {
+        checkState(analyzer == null, "plannerContext already set");
+        analyzer = new SqlRoutineAnalyzer(plannerContext, WarningCollector.NOOP);
+        planner = new SqlRoutinePlanner(plannerContext, WarningCollector.NOOP);
+    }
+
+    public void tryRegisterQuery(Session session)
+    {
+        queryFunctions.putIfAbsent(session.getQueryId(), new QueryFunctions(session));
+    }
+
+    public void registerQuery(Session session)
+    {
+        boolean alreadyRegistered = queryFunctions.putIfAbsent(session.getQueryId(), new QueryFunctions(session)) != null;
+        if (alreadyRegistered) {
+            throw new IllegalStateException("Query already registered: " + session.getQueryId());
+        }
+    }
+
+    public void unregisterQuery(Session session)
+    {
+        queryFunctions.remove(session.getQueryId());
+    }
+
+    @Override
+    public void registerTask(TaskId taskId, List<LanguageScalarFunctionData> languageFunctions)
+    {
+        // the functions are already registered in the query, so we don't need to do anything here
+    }
+
+    @Override
+    public void unregisterTask(TaskId taskId) {}
+
+    private QueryFunctions getQueryFunctions(Session session)
+    {
+        QueryFunctions queryFunctions = this.queryFunctions.get(session.getQueryId());
+        if (queryFunctions == null) {
+            throw new IllegalStateException("Query not registered: " + session.getQueryId());
+        }
+        return queryFunctions;
+    }
+
+    public List<FunctionMetadata> listFunctions(Collection<LanguageFunction> languageFunctions)
+    {
+        return languageFunctions.stream()
+                .map(LanguageFunction::sql)
+                .map(sql -> extractFunctionMetadata(createSqlLanguageFunctionId(sql), parser.createFunctionSpecification(sql)))
+                .collect(toImmutableList());
+    }
+
+    public List<FunctionMetadata> getFunctions(Session session, CatalogHandle catalogHandle, SchemaFunctionName name, LanguageFunctionLoader languageFunctionLoader, RunAsIdentityLoader identityLoader)
+    {
+        return getQueryFunctions(session).getFunctions(catalogHandle, name, languageFunctionLoader, identityLoader);
+    }
+
+    public FunctionMetadata getFunctionMetadata(Session session, FunctionId functionId)
+    {
+        return getQueryFunctions(session).getFunctionMetadata(functionId);
+    }
+
+    public FunctionDependencyDeclaration getDependencies(Session session, FunctionId functionId, AccessControl accessControl)
+    {
+        return getQueryFunctions(session).getDependencies(functionId, accessControl);
+    }
+
+    @Override
+    public ScalarFunctionImplementation specialize(FunctionManager functionManager, ResolvedFunction resolvedFunction, FunctionDependencies functionDependencies, InvocationConvention invocationConvention)
+    {
+        // any resolved function in any query is guaranteed to have the same behavior, so we can use any query to get the implementation
+        return queryFunctions.values().stream()
+                .map(queryFunctions -> queryFunctions.specialize(resolvedFunction, functionManager, invocationConvention))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .findFirst()
+                .orElseThrow(() -> new IllegalStateException("Unknown function implementation: " + resolvedFunction.getFunctionId()));
+    }
+
+    public void registerResolvedFunction(Session session, ResolvedFunction resolvedFunction)
+    {
+        getQueryFunctions(session).registerResolvedFunction(resolvedFunction);
+    }
+
+    public List<LanguageScalarFunctionData> serializeFunctionsForWorkers(Session session)
+    {
+        return getQueryFunctions(session).serializeFunctionsForWorkers();
+    }
+
+    public void verifyForCreate(Session session, String sql, FunctionManager functionManager, AccessControl accessControl)
+    {
+        getQueryFunctions(session).verifyForCreate(sql, functionManager, accessControl);
+    }
+
+    public void addInlineFunction(Session session, String sql, AccessControl accessControl)
+    {
+        getQueryFunctions(session).addInlineFunction(sql, accessControl);
+    }
+
+    public interface LanguageFunctionLoader
+    {
+        Collection<LanguageFunction> getLanguageFunction(ConnectorSession session, SchemaFunctionName name);
+    }
+
+    public interface RunAsIdentityLoader
+    {
+        Identity getFunctionRunAsIdentity(Optional<String> owner);
+    }
+
+    public static boolean isInlineFunction(CatalogSchemaFunctionName functionName)
+    {
+        return functionName.getCatalogName().equals(GlobalSystemConnector.NAME) && functionName.getSchemaName().equals(QUERY_LOCAL_SCHEMA);
+    }
+
+    public static boolean isTrinoSqlLanguageFunction(FunctionId functionId)
+    {
+        return functionId.toString().startsWith(SQL_FUNCTION_PREFIX);
+    }
+
+    private static FunctionId createSqlLanguageFunctionId(String sql)
+    {
+        String hash = Hashing.sha256().hashUnencodedChars(sql).toString();
+        return new FunctionId(SQL_FUNCTION_PREFIX + hash);
+    }
+
+    public String getSignatureToken(List<ParameterDeclaration> parameters)
+    {
+        return parameters.stream()
+                .map(ParameterDeclaration::getType)
+                .map(TypeSignatureTranslator::toTypeSignature)
+                .map(typeManager::getType)
+                .map(Type::getTypeId)
+                .map(TypeId::getId)
+                .collect(joining(",", "(", ")"));
+    }
+
+    private class QueryFunctions
+    {
+        private final Session session;
+        private final Map<FunctionKey, FunctionListing> functionListing = new ConcurrentHashMap<>();
+        private final Map<FunctionId, LanguageFunctionImplementation> implementationsById = new ConcurrentHashMap<>();
+        private final Map<ResolvedFunction, LanguageFunctionImplementation> implementationsByResolvedFunction = new ConcurrentHashMap<>();
+
+        public QueryFunctions(Session session)
+        {
+            this.session = session;
+        }
+
+        public void verifyForCreate(String sql, FunctionManager functionManager, AccessControl accessControl)
+        {
+            implementationWithoutSecurity(sql).verifyForCreate(functionManager, accessControl);
+        }
+
+        public void addInlineFunction(String sql, AccessControl accessControl)
+        {
+            LanguageFunctionImplementation implementation = implementationWithoutSecurity(sql);
+            FunctionMetadata metadata = implementation.getFunctionMetadata();
+            implementationsById.put(metadata.getFunctionId(), implementation);
+            SchemaFunctionName name = new SchemaFunctionName(QUERY_LOCAL_SCHEMA, metadata.getCanonicalName());
+            getFunctionListing(GlobalSystemConnector.CATALOG_HANDLE, name).addFunction(metadata);
+
+            // enforce that functions may only call already registered functions and prevent recursive calls
+            implementation.analyzeAndPlan(accessControl);
+        }
+
+        public synchronized List<FunctionMetadata> getFunctions(CatalogHandle catalogHandle, SchemaFunctionName name, LanguageFunctionLoader languageFunctionLoader, RunAsIdentityLoader identityLoader)
+        {
+            return getFunctionListing(catalogHandle, name).getFunctions(languageFunctionLoader, identityLoader);
+        }
+
+        public FunctionDependencyDeclaration getDependencies(FunctionId functionId, AccessControl accessControl)
+        {
+            LanguageFunctionImplementation function = implementationsById.get(functionId);
+            checkArgument(function != null, "Unknown function implementation: " + functionId);
+            return function.getFunctionDependencies(accessControl);
+        }
+
+        public Optional<ScalarFunctionImplementation> specialize(ResolvedFunction resolvedFunction, FunctionManager functionManager, InvocationConvention invocationConvention)
+        {
+            LanguageFunctionImplementation function = implementationsByResolvedFunction.get(resolvedFunction);
+            if (function == null) {
+                return Optional.empty();
+            }
+            return Optional.of(function.specialize(functionManager, invocationConvention));
+        }
+
+        public FunctionMetadata getFunctionMetadata(FunctionId functionId)
+        {
+            LanguageFunctionImplementation function = implementationsById.get(functionId);
+            checkArgument(function != null, "Unknown function implementation: " + functionId);
+            return function.getFunctionMetadata();
+        }
+
+        public void registerResolvedFunction(ResolvedFunction resolvedFunction)
+        {
+            FunctionId functionId = resolvedFunction.getFunctionId();
+            LanguageFunctionImplementation function = implementationsById.get(functionId);
+            checkArgument(function != null, "Unknown function implementation: " + functionId);
+            implementationsByResolvedFunction.put(resolvedFunction, function);
+        }
+
+        public List<LanguageScalarFunctionData> serializeFunctionsForWorkers()
+        {
+            return implementationsByResolvedFunction.entrySet().stream()
+                    .map(entry -> new LanguageScalarFunctionData(
+                            entry.getKey(),
+                            entry.getValue().getFunctionDependencies(),
+                            entry.getValue().getRoutine()))
+                    .collect(toImmutableList());
+        }
+
+        private FunctionListing getFunctionListing(CatalogHandle catalogHandle, SchemaFunctionName name)
+        {
+            return functionListing.computeIfAbsent(new FunctionKey(catalogHandle, name), FunctionListing::new);
+        }
+
+        private record FunctionKey(CatalogHandle catalogHandle, SchemaFunctionName name) {}
+
+        private class FunctionListing
+        {
+            private final CatalogHandle catalogHandle;
+            private final SchemaFunctionName name;
+            private final List<FunctionMetadata> functions = new ArrayList<>();
+            private boolean loaded;
+
+            public FunctionListing(FunctionKey key)
+            {
+                catalogHandle = key.catalogHandle();
+                name = key.name();
+            }
+
+            public synchronized void addFunction(FunctionMetadata function)
+            {
+                functions.add(function);
+                loaded = true;
+            }
+
+            public synchronized List<FunctionMetadata> getFunctions(LanguageFunctionLoader languageFunctionLoader, RunAsIdentityLoader identityLoader)
+            {
+                if (loaded) {
+                    return ImmutableList.copyOf(functions);
+                }
+                loaded = true;
+
+                List<LanguageFunctionImplementation> implementations = languageFunctionLoader.getLanguageFunction(session.toConnectorSession(), name).stream()
+                        .map(function -> implementationWithSecurity(function.sql(), function.path(), function.owner(), identityLoader))
+                        .collect(toImmutableList());
+
+                // verify all names are correct
+                // Note: language functions don't have aliases
+                Set<String> names = implementations.stream()
+                        .map(function -> function.getFunctionMetadata().getCanonicalName())
+                        .collect(toImmutableSet());
+                if (!names.isEmpty() && !names.equals(Set.of(name.getFunctionName()))) {
+                    throw new TrinoException(FUNCTION_IMPLEMENTATION_ERROR, "Catalog %s returned functions named %s when listing functions named %s".formatted(catalogHandle.getCatalogName(), names, name));
+                }
+
+                // add the functions to this listing
+                implementations.forEach(implementation -> functions.add(implementation.getFunctionMetadata()));
+
+                // add the functions to the catalog index
+                implementations.forEach(processedFunction -> implementationsById.put(processedFunction.getFunctionMetadata().getFunctionId(), processedFunction));
+
+                return ImmutableList.copyOf(functions);
+            }
+        }
+
+        private LanguageFunctionImplementation implementationWithoutSecurity(String sql)
+        {
+            // use the original path during function creation and for inline functions
+            return new LanguageFunctionImplementation(sql, session.getPath(), Optional.empty(), Optional.empty());
+        }
+
+        private LanguageFunctionImplementation implementationWithSecurity(String sql, List<CatalogSchemaName> path, Optional<String> owner, RunAsIdentityLoader identityLoader)
+        {
+            // stored functions cannot see inline functions, so we need to rebuild the path
+            return new LanguageFunctionImplementation(sql, session.getPath().forView(path), owner, Optional.of(identityLoader));
+        }
+
+        private class LanguageFunctionImplementation
+        {
+            private final FunctionMetadata functionMetadata;
+            private final FunctionSpecification functionSpecification;
+            private final SqlPath path;
+            private final Optional<String> owner;
+            private final Optional<RunAsIdentityLoader> identityLoader;
+            private SqlRoutineAnalysis analysis;
+            private FunctionDependencyDeclaration dependencies;
+            private IrRoutine routine;
+            private boolean analyzing;
+
+            private LanguageFunctionImplementation(String sql, SqlPath path, Optional<String> owner, Optional<RunAsIdentityLoader> identityLoader)
+            {
+                this.functionSpecification = parser.createFunctionSpecification(sql);
+                this.functionMetadata = extractFunctionMetadata(createSqlLanguageFunctionId(sql), functionSpecification);
+                this.path = requireNonNull(path, "path is null");
+                this.owner = requireNonNull(owner, "owner is null");
+                this.identityLoader = requireNonNull(identityLoader, "identityLoader is null");
+            }
+
+            public FunctionMetadata getFunctionMetadata()
+            {
+                return functionMetadata;
+            }
+
+            public void verifyForCreate(FunctionManager functionManager, AccessControl accessControl)
+            {
+                checkState(identityLoader.isEmpty(), "create should not enforce security");
+                analyzeAndPlan(accessControl);
+                new SqlRoutineCompiler(functionManager).compile(getRoutine());
+            }
+
+            private synchronized void analyzeAndPlan(AccessControl accessControl)
+            {
+                if (analysis != null) {
+                    return;
+                }
+                if (analyzing) {
+                    throw new TrinoException(NOT_SUPPORTED, "Recursive language functions are not supported: %s%s".formatted(functionMetadata.getCanonicalName(), functionMetadata.getSignature()));
+                }
+
+                analyzing = true;
+                FunctionContext context = functionContext(accessControl);
+                analysis = analyzer.analyze(context.session(), context.accessControl(), functionSpecification);
+
+                FunctionDependencyDeclaration.FunctionDependencyDeclarationBuilder dependencies = FunctionDependencyDeclaration.builder();
+                for (ResolvedFunction resolvedFunction : analysis.analysis().getResolvedFunctions()) {
+                    dependencies.addFunction(resolvedFunction.toCatalogSchemaFunctionName(), resolvedFunction.getSignature().getArgumentTypes());
+                }
+                this.dependencies = dependencies.build();
+
+                routine = planner.planSqlFunction(session, functionSpecification, analysis);
+                analyzing = false;
+            }
+
+            public synchronized FunctionDependencyDeclaration getFunctionDependencies(AccessControl accessControl)
+            {
+                analyzeAndPlan(accessControl);
+                return dependencies;
+            }
+
+            public synchronized FunctionDependencyDeclaration getFunctionDependencies()
+            {
+                if (dependencies == null) {
+                    throw new IllegalStateException("Function not analyzed: " + functionMetadata.getSignature());
+                }
+                return dependencies;
+            }
+
+            public synchronized IrRoutine getRoutine()
+            {
+                if (routine == null) {
+                    throw new IllegalStateException("Function not analyzed: " + functionMetadata.getSignature());
+                }
+                return routine;
+            }
+
+            public ScalarFunctionImplementation specialize(FunctionManager functionManager, InvocationConvention invocationConvention)
+            {
+                // Recompile everytime this function is called as the function dependencies may have changed.
+                // The caller caches, so this should not be a problem.
+                // TODO: compiler should use function dependencies instead of function manager
+                SpecializedSqlScalarFunction function = new SqlRoutineCompiler(functionManager).compile(getRoutine());
+                return function.getScalarFunctionImplementation(invocationConvention);
+            }
+
+            private FunctionContext functionContext(AccessControl accessControl)
+            {
+                if (identityLoader.isEmpty() || isRunAsInvoker(functionSpecification)) {
+                    Session functionSession = createFunctionSession(session.getIdentity());
+                    return new FunctionContext(functionSession, accessControl);
+                }
+
+                Identity identity = identityLoader.get().getFunctionRunAsIdentity(owner);
+
+                Identity newIdentity = Identity.from(identity)
+                        .withGroups(groupProvider.getGroups(identity.getUser()))
+                        .build();
+
+                Session functionSession = createFunctionSession(newIdentity);
+
+                if (!identity.getUser().equals(session.getUser())) {
+                    accessControl = new ViewAccessControl(accessControl);
+                }
+
+                return new FunctionContext(functionSession, accessControl);
+            }
+
+            private Session createFunctionSession(Identity identity)
+            {
+                return session.createViewSession(Optional.empty(), Optional.empty(), identity, path);
+            }
+
+            private record FunctionContext(Session session, AccessControl accessControl) {}
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/metadata/LanguageFunctionProvider.java b/core/trino-main/src/main/java/io/trino/metadata/LanguageFunctionProvider.java
new file mode 100644
index 000000000000..126f454036b0
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/metadata/LanguageFunctionProvider.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed 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 io.trino.metadata;
+
+import io.trino.execution.TaskId;
+import io.trino.spi.function.FunctionDependencies;
+import io.trino.spi.function.InvocationConvention;
+import io.trino.spi.function.ScalarFunctionImplementation;
+
+import java.util.List;
+
+public interface LanguageFunctionProvider
+{
+    LanguageFunctionProvider DISABLED = new LanguageFunctionProvider()
+    {
+        @Override
+        public ScalarFunctionImplementation specialize(FunctionManager functionManager, ResolvedFunction resolvedFunction, FunctionDependencies functionDependencies, InvocationConvention invocationConvention)
+        {
+            throw new UnsupportedOperationException("SQL language functions are disabled");
+        }
+
+        @Override
+        public void registerTask(TaskId taskId, List<LanguageScalarFunctionData> languageFunctions)
+        {
+            if (!languageFunctions.isEmpty()) {
+                throw new UnsupportedOperationException("SQL language functions are disabled");
+            }
+        }
+
+        @Override
+        public void unregisterTask(TaskId taskId) {}
+    };
+
+    ScalarFunctionImplementation specialize(
+            FunctionManager functionManager,
+            ResolvedFunction resolvedFunction,
+            FunctionDependencies functionDependencies,
+            InvocationConvention invocationConvention);
+
+    void registerTask(TaskId taskId, List<LanguageScalarFunctionData> languageFunctions);
+
+    void unregisterTask(TaskId taskId);
+}
diff --git a/core/trino-main/src/main/java/io/trino/metadata/LanguageScalarFunctionData.java b/core/trino-main/src/main/java/io/trino/metadata/LanguageScalarFunctionData.java
new file mode 100644
index 000000000000..648d4e025e38
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/metadata/LanguageScalarFunctionData.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed 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 io.trino.metadata;
+
+import io.trino.spi.function.FunctionDependencyDeclaration;
+import io.trino.sql.routine.ir.IrRoutine;
+
+import static java.util.Objects.requireNonNull;
+
+public record LanguageScalarFunctionData(
+        ResolvedFunction resolvedFunction,
+        FunctionDependencyDeclaration functionDependencies,
+        IrRoutine routine)
+{
+    public LanguageScalarFunctionData
+    {
+        requireNonNull(resolvedFunction, "resolvedFunction is null");
+        requireNonNull(functionDependencies, "functionDependencies is null");
+        requireNonNull(routine, "routine is null");
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/metadata/LiteralFunction.java b/core/trino-main/src/main/java/io/trino/metadata/LiteralFunction.java
index f519582e934c..ad6268d07896 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/LiteralFunction.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/LiteralFunction.java
@@ -50,9 +50,8 @@ public class LiteralFunction
 
     public LiteralFunction(BlockEncodingSerde blockEncodingSerde)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(LITERAL_FUNCTION_NAME)
                 .signature(Signature.builder()
-                        .name(LITERAL_FUNCTION_NAME)
                         .typeVariable("F")
                         .typeVariable("T")
                         .returnType(new TypeSignature("T"))
diff --git a/core/trino-main/src/main/java/io/trino/metadata/MaterializedViewDefinition.java b/core/trino-main/src/main/java/io/trino/metadata/MaterializedViewDefinition.java
index 76a961eb8922..caff709a19b5 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/MaterializedViewDefinition.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/MaterializedViewDefinition.java
@@ -14,6 +14,7 @@
 package io.trino.metadata;
 
 import com.google.common.collect.ImmutableMap;
+import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ConnectorMaterializedViewDefinition;
 import io.trino.spi.security.Identity;
@@ -43,32 +44,17 @@ public MaterializedViewDefinition(
             Optional<Duration> gracePeriod,
             Optional<String> comment,
             Identity owner,
+            List<CatalogSchemaName> path,
             Optional<CatalogSchemaTableName> storageTable,
             Map<String, Object> properties)
     {
-        super(originalSql, catalog, schema, columns, comment, Optional.of(owner));
+        super(originalSql, catalog, schema, columns, comment, Optional.of(owner), path);
         checkArgument(gracePeriod.isEmpty() || !gracePeriod.get().isNegative(), "gracePeriod cannot be negative: %s", gracePeriod);
         this.gracePeriod = gracePeriod;
         this.storageTable = requireNonNull(storageTable, "storageTable is null");
         this.properties = ImmutableMap.copyOf(requireNonNull(properties, "properties is null"));
     }
 
-    public MaterializedViewDefinition(ConnectorMaterializedViewDefinition view, Identity runAsIdentity)
-    {
-        super(
-                view.getOriginalSql(),
-                view.getCatalog(),
-                view.getSchema(),
-                view.getColumns().stream()
-                        .map(column -> new ViewColumn(column.getName(), column.getType(), Optional.empty()))
-                        .collect(toImmutableList()),
-                view.getComment(),
-                Optional.of(runAsIdentity));
-        this.gracePeriod = view.getGracePeriod();
-        this.storageTable = view.getStorageTable();
-        this.properties = ImmutableMap.copyOf(view.getProperties());
-    }
-
     public Optional<Duration> getGracePeriod()
     {
         return gracePeriod;
@@ -92,11 +78,12 @@ public ConnectorMaterializedViewDefinition toConnectorMaterializedViewDefinition
                 getCatalog(),
                 getSchema(),
                 getColumns().stream()
-                        .map(column -> new ConnectorMaterializedViewDefinition.Column(column.getName(), column.getType()))
+                        .map(column -> new ConnectorMaterializedViewDefinition.Column(column.getName(), column.getType(), column.getComment()))
                         .collect(toImmutableList()),
                 getGracePeriod(),
                 getComment(),
                 getRunAsIdentity().map(Identity::getUser),
+                getPath(),
                 properties);
     }
 
@@ -111,6 +98,7 @@ public String toString()
                 .add("gracePeriod", gracePeriod.orElse(null))
                 .add("comment", getComment().orElse(null))
                 .add("runAsIdentity", getRunAsIdentity())
+                .add("path", getPath())
                 .add("storageTable", storageTable.orElse(null))
                 .add("properties", properties)
                 .toString();
diff --git a/core/trino-main/src/main/java/io/trino/metadata/Metadata.java b/core/trino-main/src/main/java/io/trino/metadata/Metadata.java
index 8c6838fd1449..e55b75efa63a 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/Metadata.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/Metadata.java
@@ -36,18 +36,28 @@
 import io.trino.spi.connector.LimitApplicationResult;
 import io.trino.spi.connector.MaterializedViewFreshness;
 import io.trino.spi.connector.ProjectionApplicationResult;
+import io.trino.spi.connector.RelationCommentMetadata;
 import io.trino.spi.connector.RowChangeParadigm;
 import io.trino.spi.connector.SampleApplicationResult;
 import io.trino.spi.connector.SampleType;
+import io.trino.spi.connector.SaveMode;
+import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SortItem;
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.connector.TableColumnsMetadata;
 import io.trino.spi.connector.TableFunctionApplicationResult;
 import io.trino.spi.connector.TableScanRedirectApplicationResult;
 import io.trino.spi.connector.TopNApplicationResult;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Constant;
 import io.trino.spi.function.AggregationFunctionMetadata;
+import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
+import io.trino.spi.function.FunctionDependencyDeclaration;
+import io.trino.spi.function.FunctionId;
 import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.function.OperatorType;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.GrantInfo;
@@ -70,6 +80,7 @@
 import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Set;
+import java.util.function.UnaryOperator;
 
 import static io.trino.spi.function.OperatorType.CAST;
 
@@ -122,6 +133,8 @@ Optional<TableExecuteHandle> getTableHandleForExecute(
 
     Optional<Object> getInfo(Session session, TableHandle handle);
 
+    CatalogSchemaTableName getTableName(Session session, TableHandle tableHandle);
+
     /**
      * Return table schema definition for the specified table handle.
      * Table schema definition is a set of information
@@ -169,7 +182,13 @@ Optional<TableExecuteHandle> getTableHandleForExecute(
      * Gets the columns metadata for all tables that match the specified prefix.
      * TODO: consider returning a stream for more efficient processing
      */
-    List<TableColumnsMetadata> listTableColumns(Session session, QualifiedTablePrefix prefix);
+    List<TableColumnsMetadata> listTableColumns(Session session, QualifiedTablePrefix prefix, UnaryOperator<Set<SchemaTableName>> relationFilter);
+
+    /**
+     * Gets the comments metadata for all relations (tables, views, materialized views) that match the specified prefix.
+     * TODO: consider returning a stream for more efficient processing
+     */
+    List<RelationCommentMetadata> listRelationComments(Session session, String catalogName, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter);
 
     /**
      * Creates a schema.
@@ -181,7 +200,7 @@ Optional<TableExecuteHandle> getTableHandleForExecute(
     /**
      * Drops the specified schema.
      */
-    void dropSchema(Session session, CatalogSchemaName schema);
+    void dropSchema(Session session, CatalogSchemaName schema, boolean cascade);
 
     /**
      * Renames the specified schema.
@@ -196,9 +215,9 @@ Optional<TableExecuteHandle> getTableHandleForExecute(
     /**
      * Creates a table using the specified table metadata.
      *
-     * @throws TrinoException with {@code ALREADY_EXISTS} if the table already exists and {@param ignoreExisting} is not set
+     * @throws TrinoException with {@code ALREADY_EXISTS} if the table already exists and {@param saveMode} is set to FAIL.
      */
-    void createTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, boolean ignoreExisting);
+    void createTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, SaveMode saveMode);
 
     /**
      * Rename the specified table.
@@ -233,18 +252,33 @@ Optional<TableExecuteHandle> getTableHandleForExecute(
     /**
      * Rename the specified column.
      */
-    void renameColumn(Session session, TableHandle tableHandle, ColumnHandle source, String target);
+    void renameColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnHandle source, String target);
+
+    /**
+     * Rename the specified field.
+     */
+    void renameField(Session session, TableHandle tableHandle, List<String> fieldPath, String target);
 
     /**
      * Add the specified column to the table.
      */
-    void addColumn(Session session, TableHandle tableHandle, ColumnMetadata column);
+    void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column);
+
+    /**
+     * Add the specified field to the column.
+     */
+    void addField(Session session, TableHandle tableHandle, List<String> parentPath, String fieldName, Type type, boolean ignoreExisting);
 
     /**
      * Set the specified type to the column.
      */
     void setColumnType(Session session, TableHandle tableHandle, ColumnHandle column, Type type);
 
+    /**
+     * Set the specified type to the field.
+     */
+    void setFieldType(Session session, TableHandle tableHandle, List<String> fieldPath, Type type);
+
     /**
      * Set the authorization (owner) of specified table's user/role
      */
@@ -253,7 +287,7 @@ Optional<TableExecuteHandle> getTableHandleForExecute(
     /**
      * Drop the specified column.
      */
-    void dropColumn(Session session, TableHandle tableHandle, ColumnHandle column);
+    void dropColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnHandle column);
 
     /**
      * Drop the specified field from the column.
@@ -274,10 +308,15 @@ Optional<TableExecuteHandle> getTableHandleForExecute(
 
     Optional<TableLayout> getNewTableLayout(Session session, String catalogName, ConnectorTableMetadata tableMetadata);
 
+    /**
+     * Return the effective {@link io.trino.spi.type.Type} that is supported by the connector for the given type, if {@link Optional#empty()} is returned, the type will be used as is during table creation which may or may not be supported by the connector.
+     */
+    Optional<Type> getSupportedType(Session session, CatalogHandle catalogHandle, Map<String, Object> tableProperties, Type type);
+
     /**
      * Begin the atomic creation of a table with data.
      */
-    OutputTableHandle beginCreateTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, Optional<TableLayout> layout);
+    OutputTableHandle beginCreateTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, Optional<TableLayout> layout, boolean replace);
 
     /**
      * Finish a table creation with data after the data is written.
@@ -306,6 +345,11 @@ Optional<TableExecuteHandle> getTableHandleForExecute(
      */
     void finishStatisticsCollection(Session session, AnalyzeTableHandle tableHandle, Collection<ComputedStatistics> computedStatistics);
 
+    /**
+     * Initialize before query begins
+     */
+    void beginQuery(Session session);
+
     /**
      * Cleanup after a query. This is the very last notification after the query finishes, regardless if it succeeds or fails.
      * An exception thrown in this method will not affect the result of the query.
@@ -353,6 +397,16 @@ Optional<ConnectorOutputMetadata> finishRefreshMaterializedView(
             Collection<ComputedStatistics> computedStatistics,
             List<TableHandle> sourceTableHandles);
 
+    /**
+     * Push update into connector
+     */
+    Optional<TableHandle> applyUpdate(Session session, TableHandle tableHandle, Map<ColumnHandle, Constant> assignments);
+
+    /**
+     * Execute update in connector
+     */
+    OptionalLong executeUpdate(Session session, TableHandle tableHandle);
+
     /**
      * Push delete into connector
      */
@@ -614,33 +668,37 @@ default void validateScan(Session session, TableHandle table) {}
     // Functions
     //
 
-    Collection<FunctionMetadata> listFunctions(Session session);
+    Collection<FunctionMetadata> listGlobalFunctions(Session session);
+
+    Collection<FunctionMetadata> listFunctions(Session session, CatalogSchemaName schema);
 
     ResolvedFunction decodeFunction(QualifiedName name);
 
-    ResolvedFunction resolveFunction(Session session, QualifiedName name, List<TypeSignatureProvider> parameterTypes);
+    Collection<CatalogFunctionMetadata> getFunctions(Session session, CatalogSchemaFunctionName catalogSchemaFunctionName);
 
-    ResolvedFunction resolveOperator(Session session, OperatorType operatorType, List<? extends Type> argumentTypes)
+    ResolvedFunction resolveBuiltinFunction(String name, List<TypeSignatureProvider> parameterTypes);
+
+    ResolvedFunction resolveOperator(OperatorType operatorType, List<? extends Type> argumentTypes)
             throws OperatorNotFoundException;
 
-    default ResolvedFunction getCoercion(Session session, Type fromType, Type toType)
+    default ResolvedFunction getCoercion(Type fromType, Type toType)
     {
-        return getCoercion(session, CAST, fromType, toType);
+        return getCoercion(CAST, fromType, toType);
     }
 
-    ResolvedFunction getCoercion(Session session, OperatorType operatorType, Type fromType, Type toType);
+    ResolvedFunction getCoercion(OperatorType operatorType, Type fromType, Type toType);
 
-    ResolvedFunction getCoercion(Session session, QualifiedName name, Type fromType, Type toType);
+    ResolvedFunction getCoercion(CatalogSchemaFunctionName name, Type fromType, Type toType);
 
-    /**
-     * Is the named function an aggregation function?  This does not need type parameters
-     * because overloads between aggregation and other function types are not allowed.
-     */
-    boolean isAggregationFunction(Session session, QualifiedName name);
+    AggregationFunctionMetadata getAggregationFunctionMetadata(Session session, ResolvedFunction resolvedFunction);
 
-    FunctionMetadata getFunctionMetadata(Session session, ResolvedFunction resolvedFunction);
+    FunctionDependencyDeclaration getFunctionDependencies(Session session, CatalogHandle catalogHandle, FunctionId functionId, BoundSignature boundSignature);
 
-    AggregationFunctionMetadata getAggregationFunctionMetadata(Session session, ResolvedFunction resolvedFunction);
+    boolean languageFunctionExists(Session session, QualifiedObjectName name, String signatureToken);
+
+    void createLanguageFunction(Session session, QualifiedObjectName name, LanguageFunction function, boolean replace);
+
+    void dropLanguageFunction(Session session, QualifiedObjectName name, String signatureToken);
 
     /**
      * Creates the specified materialized view with the specified view definition.
@@ -691,6 +749,11 @@ default boolean isMaterializedView(Session session, QualifiedObjectName viewName
      */
     void setMaterializedViewProperties(Session session, QualifiedObjectName viewName, Map<String, Optional<Object>> properties);
 
+    /**
+     * Comments to the specified materialized view column.
+     */
+    void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment);
+
     /**
      * Returns the result of redirecting the table scan on a given table to a different table.
      * This method is used by the engine during the plan optimization phase to allow a connector to offload table scans to any other connector.
@@ -709,23 +772,23 @@ default boolean isMaterializedView(Session session, QualifiedObjectName viewName
     RedirectionAwareTableHandle getRedirectionAwareTableHandle(Session session, QualifiedObjectName tableName, Optional<TableVersion> startVersion, Optional<TableVersion> endVersion);
 
     /**
-     * Returns true if the connector reports number of written bytes for an existing table. Otherwise, it returns false.
+     * Returns a table handle for the specified table name with a specified version
      */
-    boolean supportsReportingWrittenBytes(Session session, TableHandle tableHandle);
+    Optional<TableHandle> getTableHandle(Session session, QualifiedObjectName tableName, Optional<TableVersion> startVersion, Optional<TableVersion> endVersion);
 
     /**
-     * Returns true if the connector reports number of written bytes for a new table. Otherwise, it returns false.
+     * Returns maximum number of tasks that can be created while writing data to specific connector.
+     * Note: It is ignored when retry policy is set to TASK
      */
-    boolean supportsReportingWrittenBytes(Session session, QualifiedObjectName tableName, Map<String, Object> tableProperties);
+    OptionalInt getMaxWriterTasks(Session session, String catalogName);
 
     /**
-     * Returns a table handle for the specified table name with a specified version
+     * Returns writer scaling options for the specified table. This method is called when table handle is not available during CTAS.
      */
-    Optional<TableHandle> getTableHandle(Session session, QualifiedObjectName tableName, Optional<TableVersion> startVersion, Optional<TableVersion> endVersion);
+    WriterScalingOptions getNewTableWriterScalingOptions(Session session, QualifiedObjectName tableName, Map<String, Object> tableProperties);
 
     /**
-     * Returns maximum number of tasks that can be created while writing data to specific connector.
-     * Note: It is ignored when retry policy is set to TASK
+     * Returns writer scaling options for the specified table.
      */
-    OptionalInt getMaxWriterTasks(Session session, String catalogName);
+    WriterScalingOptions getInsertWriterScalingOptions(Session session, TableHandle tableHandle);
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/MetadataListing.java b/core/trino-main/src/main/java/io/trino/metadata/MetadataListing.java
index 71fadbf14eb0..f72cb857704c 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/MetadataListing.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/MetadataListing.java
@@ -24,7 +24,9 @@
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableColumnsMetadata;
+import io.trino.spi.predicate.Domain;
 import io.trino.spi.security.GrantInfo;
+import io.trino.spi.type.VarcharType;
 
 import java.util.List;
 import java.util.Map;
@@ -32,10 +34,16 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.SortedSet;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Predicate;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.connector.system.jdbc.FilterUtil.tryGetSingleVarcharValue;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.StandardErrorCode.TABLE_REDIRECTION_ERROR;
 
@@ -43,13 +51,9 @@ public final class MetadataListing
 {
     private MetadataListing() {}
 
-    public static SortedSet<String> listCatalogNames(Session session, Metadata metadata, AccessControl accessControl)
-    {
-        return listCatalogNames(session, metadata, accessControl, Optional.empty());
-    }
-
-    public static SortedSet<String> listCatalogNames(Session session, Metadata metadata, AccessControl accessControl, Optional<String> catalogName)
+    public static SortedSet<String> listCatalogNames(Session session, Metadata metadata, AccessControl accessControl, Domain catalogDomain)
     {
+        Optional<String> catalogName = tryGetSingleVarcharValue(catalogDomain);
         Set<String> catalogs;
         if (catalogName.isPresent()) {
             Optional<CatalogHandle> catalogHandle = metadata.getCatalogHandle(session, catalogName.get());
@@ -61,6 +65,7 @@ public static SortedSet<String> listCatalogNames(Session session, Metadata metad
         else {
             catalogs = metadata.listCatalogs(session).stream()
                     .map(CatalogInfo::getCatalogName)
+                    .filter(stringFilter(catalogDomain))
                     .collect(toImmutableSet());
         }
         return ImmutableSortedSet.copyOf(accessControl.filterCatalogs(session.toSecurityContext(), catalogs));
@@ -243,75 +248,92 @@ public static Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(Sessio
 
     private static Map<SchemaTableName, List<ColumnMetadata>> doListTableColumns(Session session, Metadata metadata, AccessControl accessControl, QualifiedTablePrefix prefix)
     {
-        List<TableColumnsMetadata> catalogColumns = metadata.listTableColumns(session, prefix);
-
-        Map<SchemaTableName, Optional<List<ColumnMetadata>>> tableColumns = catalogColumns.stream()
-                .collect(toImmutableMap(TableColumnsMetadata::getTable, TableColumnsMetadata::getColumns));
-
-        Set<SchemaTableName> allowedTables = accessControl.filterTables(
-                session.toSecurityContext(),
-                prefix.getCatalogName(),
-                tableColumns.keySet());
+        AtomicInteger filteredCount = new AtomicInteger();
+        List<TableColumnsMetadata> catalogColumns = metadata.listTableColumns(
+                session,
+                prefix,
+                relationNames -> {
+                    Set<SchemaTableName> filtered = accessControl.filterTables(session.toSecurityContext(), prefix.getCatalogName(), relationNames);
+                    filteredCount.addAndGet(filtered.size());
+                    return filtered;
+                });
+        checkState(
+                // Inequality because relationFilter can be invoked more than once on a set of names.
+                filteredCount.get() >= catalogColumns.size(),
+                "relationFilter is mandatory, but it has not been called for some of returned relations: returned %s relations, %s passed the filter",
+                catalogColumns.size(),
+                filteredCount.get());
 
         ImmutableMap.Builder<SchemaTableName, List<ColumnMetadata>> result = ImmutableMap.builder();
 
-        tableColumns.forEach((table, columnsOptional) -> {
-            if (!allowedTables.contains(table)) {
-                return;
-            }
-
-            QualifiedObjectName originalTableName = new QualifiedObjectName(prefix.getCatalogName(), table.getSchemaName(), table.getTableName());
-            List<ColumnMetadata> columns;
-            Optional<QualifiedObjectName> targetTableName = Optional.empty();
-
-            if (columnsOptional.isPresent()) {
-                columns = columnsOptional.get();
-            }
-            else {
-                TableHandle targetTableHandle = null;
-                boolean redirectionSucceeded = false;
-
-                try {
-                    // For redirected tables, column listing requires special handling, because the column metadata is unavailable
-                    // at the source table, and needs to be fetched from the target table.
-                    RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, originalTableName);
-                    targetTableName = redirection.getRedirectedTableName();
-
-                    // The target table name should be non-empty. If it is empty, it means that there is an
-                    // inconsistency in the connector's implementation of ConnectorMetadata#streamTableColumns and
-                    // ConnectorMetadata#redirectTable.
-                    if (targetTableName.isPresent()) {
-                        redirectionSucceeded = true;
-                        targetTableHandle = redirection.getTableHandle().orElseThrow();
+        // Process tables without redirect
+        Map<SchemaTableName, Set<String>> columnNamesByTable = catalogColumns.stream()
+                .filter(tableColumnsMetadata -> tableColumnsMetadata.getColumns().isPresent())
+                .collect(toImmutableMap(
+                        TableColumnsMetadata::getTable,
+                        tableColumnsMetadata -> tableColumnsMetadata.getColumns().orElseThrow().stream()
+                                .map(ColumnMetadata::getName)
+                                .collect(toImmutableSet())));
+        Map<SchemaTableName, Set<String>> catalogAllowedColumns = accessControl.filterColumns(session.toSecurityContext(), prefix.getCatalogName(), columnNamesByTable);
+        catalogColumns.stream()
+                .filter(tableColumnsMetadata -> tableColumnsMetadata.getColumns().isPresent())
+                .forEach(tableColumnsMetadata -> {
+                    Set<String> allowedTableColumns = catalogAllowedColumns.getOrDefault(tableColumnsMetadata.getTable(), ImmutableSet.of());
+                    result.put(
+                            tableColumnsMetadata.getTable(),
+                            tableColumnsMetadata.getColumns().get().stream()
+                                    .filter(column -> allowedTableColumns.contains(column.getName()))
+                                    .collect(toImmutableList()));
+                });
+
+        // Process redirects
+        catalogColumns.stream()
+                .filter(tableColumnsMetadata -> tableColumnsMetadata.getColumns().isEmpty())
+                .forEach(tableColumnsMetadata -> {
+                    SchemaTableName table = tableColumnsMetadata.getTable();
+                    QualifiedObjectName originalTableName = new QualifiedObjectName(prefix.getCatalogName(), table.getSchemaName(), table.getTableName());
+                    QualifiedObjectName actualTableName;
+                    TableHandle targetTableHandle;
+                    try {
+                        // For redirected tables, column listing requires special handling, because the column metadata is unavailable
+                        // at the source table, and needs to be fetched from the target table.
+                        RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, originalTableName);
+
+                        // The target table name should be non-empty. If it is empty, it means that there is an
+                        // inconsistency in the connector's implementation of ConnectorMetadata#streamTableColumns and
+                        // ConnectorMetadata#redirectTable.
+                        if (redirection.redirectedTableName().isEmpty()) {
+                            return;
+                        }
+                        actualTableName = redirection.redirectedTableName().get();
+                        targetTableHandle = redirection.tableHandle().orElseThrow();
                     }
-                }
-                catch (TrinoException e) {
-                    // Ignore redirection errors
-                    if (!e.getErrorCode().equals(TABLE_REDIRECTION_ERROR.toErrorCode())) {
+                    catch (TrinoException e) {
+                        // Ignore redirection errors
+                        if (e.getErrorCode().equals(TABLE_REDIRECTION_ERROR.toErrorCode())) {
+                            return;
+                        }
                         throw e;
                     }
-                }
-
-                if (!redirectionSucceeded) {
-                    return;
-                }
-
-                columns = metadata.getTableMetadata(session, targetTableHandle).getColumns();
-            }
 
-            Set<String> allowedColumns = accessControl.filterColumns(
-                    session.toSecurityContext(),
-                    // Use redirected table name for applying column filters, since the source does not know the column metadata
-                    targetTableName.orElse(originalTableName).asCatalogSchemaTableName(),
-                    columns.stream()
-                            .map(ColumnMetadata::getName)
-                            .collect(toImmutableSet()));
-            result.put(
-                    table,
-                    columns.stream()
-                            .filter(column -> allowedColumns.contains(column.getName()))
-                            .collect(toImmutableList()));
-        });
+                    List<ColumnMetadata> columns = metadata.getTableMetadata(session, targetTableHandle).getColumns();
+
+                    Set<String> allowedColumns = accessControl.filterColumns(
+                                    session.toSecurityContext(),
+                                    actualTableName.asCatalogSchemaTableName().getCatalogName(),
+                                    ImmutableMap.of(
+                                            // Use redirected table name for applying column filters, since the source does not know the column metadata
+                                            actualTableName.asSchemaTableName(),
+                                            columns.stream()
+                                                    .map(ColumnMetadata::getName)
+                                                    .collect(toImmutableSet())))
+                            .getOrDefault(actualTableName.asSchemaTableName(), ImmutableSet.of());
+                    result.put(
+                            table,
+                            columns.stream()
+                                    .filter(column -> allowedColumns.contains(column.getName()))
+                                    .collect(toImmutableList()));
+                });
 
         return result.buildOrThrow();
     }
@@ -327,4 +349,13 @@ private static TrinoException handleListingException(RuntimeException exception,
                 "Error listing %s for catalog %s: %s".formatted(type, catalogName, exception.getMessage()),
                 exception);
     }
+
+    private static Predicate<String> stringFilter(Domain varcharDomain)
+    {
+        checkArgument(varcharDomain.getType() instanceof VarcharType, "Invalid domain type: %s", varcharDomain.getType());
+        if (varcharDomain.isAll()) {
+            return value -> true;
+        }
+        return value -> varcharDomain.includesNullableValue(value == null ? null : utf8Slice(value));
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java b/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java
index dc1436a04e3b..958b8ae7d220 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java
@@ -14,22 +14,22 @@
 package io.trino.metadata;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
+import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
 import io.trino.FeaturesConfig;
 import io.trino.Session;
-import io.trino.collect.cache.NonEvictableCache;
 import io.trino.connector.system.GlobalSystemConnector;
-import io.trino.metadata.FunctionResolver.CatalogFunctionBinding;
-import io.trino.metadata.FunctionResolver.CatalogFunctionMetadata;
+import io.trino.metadata.LanguageFunctionManager.RunAsIdentityLoader;
 import io.trino.metadata.ResolvedFunction.ResolvedFunctionDecoder;
+import io.trino.spi.ErrorCode;
 import io.trino.spi.QueryId;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.AggregateFunction;
@@ -67,9 +67,12 @@
 import io.trino.spi.connector.LimitApplicationResult;
 import io.trino.spi.connector.MaterializedViewFreshness;
 import io.trino.spi.connector.ProjectionApplicationResult;
+import io.trino.spi.connector.RelationColumnsMetadata;
+import io.trino.spi.connector.RelationCommentMetadata;
 import io.trino.spi.connector.RowChangeParadigm;
 import io.trino.spi.connector.SampleApplicationResult;
 import io.trino.spi.connector.SampleType;
+import io.trino.spi.connector.SaveMode;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.connector.SortItem;
@@ -78,16 +81,20 @@
 import io.trino.spi.connector.TableFunctionApplicationResult;
 import io.trino.spi.connector.TableScanRedirectApplicationResult;
 import io.trino.spi.connector.TopNApplicationResult;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Constant;
 import io.trino.spi.expression.Variable;
 import io.trino.spi.function.AggregationFunctionMetadata;
 import io.trino.spi.function.AggregationFunctionMetadata.AggregationFunctionMetadataBuilder;
 import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.function.FunctionDependencyDeclaration;
 import io.trino.spi.function.FunctionId;
 import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.function.OperatorType;
-import io.trino.spi.function.QualifiedFunctionName;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.function.Signature;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.GrantInfo;
@@ -102,18 +109,14 @@
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeNotFoundException;
 import io.trino.spi.type.TypeOperators;
-import io.trino.spi.type.TypeSignature;
-import io.trino.sql.SqlPathElement;
 import io.trino.sql.analyzer.TypeSignatureProvider;
+import io.trino.sql.parser.SqlParser;
 import io.trino.sql.planner.ConnectorExpressions;
 import io.trino.sql.planner.PartitioningHandle;
-import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.QualifiedName;
 import io.trino.transaction.TransactionManager;
 import io.trino.type.BlockTypeOperators;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
+import io.trino.type.TypeCoercion;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -124,14 +127,13 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -140,35 +142,35 @@
 import static com.google.common.base.Verify.verify;
 import static com.google.common.base.Verify.verifyNotNull;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.collect.Streams.stream;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static io.airlift.concurrent.MoreFutures.toListenableFuture;
 import static io.trino.SystemSessionProperties.getRetryPolicy;
 import static io.trino.client.NodeVersion.UNKNOWN;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.metadata.CatalogMetadata.SecurityManagement.CONNECTOR;
 import static io.trino.metadata.CatalogMetadata.SecurityManagement.SYSTEM;
-import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
+import static io.trino.metadata.GlobalFunctionCatalog.BUILTIN_SCHEMA;
+import static io.trino.metadata.GlobalFunctionCatalog.isBuiltinFunctionName;
+import static io.trino.metadata.LanguageFunctionManager.isTrinoSqlLanguageFunction;
 import static io.trino.metadata.QualifiedObjectName.convertFromSchemaTableName;
 import static io.trino.metadata.RedirectionAwareTableHandle.noRedirection;
 import static io.trino.metadata.RedirectionAwareTableHandle.withRedirectionTo;
 import static io.trino.metadata.SignatureBinder.applyBoundVariables;
+import static io.trino.spi.ErrorType.EXTERNAL;
+import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_ERROR;
 import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_MISSING;
-import static io.trino.spi.StandardErrorCode.FUNCTION_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.INVALID_VIEW;
+import static io.trino.spi.StandardErrorCode.NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.SYNTAX_ERROR;
 import static io.trino.spi.StandardErrorCode.TABLE_REDIRECTION_ERROR;
+import static io.trino.spi.StandardErrorCode.UNSUPPORTED_TABLE_TYPE;
 import static io.trino.spi.connector.MaterializedViewFreshness.Freshness.STALE;
-import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypeSignatures;
-import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.transaction.InMemoryTransactionManager.createTestTransactionManager;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.lang.String.format;
-import static java.util.Collections.nCopies;
 import static java.util.Collections.singletonList;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
@@ -176,40 +178,40 @@
 public final class MetadataManager
         implements Metadata
 {
+    private static final Logger log = Logger.get(MetadataManager.class);
+
     @VisibleForTesting
     public static final int MAX_TABLE_REDIRECTIONS = 10;
 
     private final GlobalFunctionCatalog functions;
-    private final FunctionResolver functionResolver;
+    private final BuiltinFunctionResolver functionResolver;
     private final SystemSecurityMetadata systemSecurityMetadata;
     private final TransactionManager transactionManager;
+    private final LanguageFunctionManager languageFunctionManager;
     private final TypeManager typeManager;
+    private final TypeCoercion typeCoercion;
 
     private final ConcurrentMap<QueryId, QueryCatalogs> catalogsByQueryId = new ConcurrentHashMap<>();
 
     private final ResolvedFunctionDecoder functionDecoder;
 
-    private final NonEvictableCache<OperatorCacheKey, ResolvedFunction> operatorCache;
-    private final NonEvictableCache<CoercionCacheKey, ResolvedFunction> coercionCache;
-
     @Inject
     public MetadataManager(
             SystemSecurityMetadata systemSecurityMetadata,
             TransactionManager transactionManager,
             GlobalFunctionCatalog globalFunctionCatalog,
+            LanguageFunctionManager languageFunctionManager,
             TypeManager typeManager)
     {
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         functions = requireNonNull(globalFunctionCatalog, "globalFunctionCatalog is null");
-        functionResolver = new FunctionResolver(this, typeManager);
+        functionDecoder = new ResolvedFunctionDecoder(typeManager::getType);
+        functionResolver = new BuiltinFunctionResolver(this, typeManager, globalFunctionCatalog, functionDecoder);
+        this.typeCoercion = new TypeCoercion(typeManager::getType);
 
         this.systemSecurityMetadata = requireNonNull(systemSecurityMetadata, "systemSecurityMetadata is null");
         this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
-
-        functionDecoder = new ResolvedFunctionDecoder(typeManager::getType);
-
-        operatorCache = buildNonEvictableCache(CacheBuilder.newBuilder().maximumSize(1000));
-        coercionCache = buildNonEvictableCache(CacheBuilder.newBuilder().maximumSize(1000));
+        this.languageFunctionManager = requireNonNull(languageFunctionManager, "languageFunctionManager is null");
     }
 
     @Override
@@ -432,6 +434,17 @@ public Optional<Object> getInfo(Session session, TableHandle handle)
         return metadata.getInfo(handle.getConnectorHandle());
     }
 
+    @Override
+    public CatalogSchemaTableName getTableName(Session session, TableHandle tableHandle)
+    {
+        CatalogHandle catalogHandle = tableHandle.getCatalogHandle();
+        CatalogMetadata catalogMetadata = getCatalogMetadata(session, catalogHandle);
+        ConnectorMetadata metadata = catalogMetadata.getMetadataFor(session, catalogHandle);
+        SchemaTableName tableName = metadata.getTableName(session.toConnectorSession(catalogHandle), tableHandle.getConnectorHandle());
+
+        return new CatalogSchemaTableName(catalogMetadata.getCatalogName(), tableName);
+    }
+
     @Override
     public TableSchema getTableSchema(Session session, TableHandle tableHandle)
     {
@@ -516,7 +529,6 @@ public List<QualifiedObjectName> listTables(Session session, QualifiedTablePrefi
                 metadata.listTables(connectorSession, prefix.getSchemaName()).stream()
                         .map(convertFromSchemaTableName(prefix.getCatalogName()))
                         .filter(table -> !isExternalInformationSchema(catalogHandle, table.getSchemaName()))
-                        .filter(prefix::matches)
                         .forEach(tables::add);
             }
         }
@@ -534,7 +546,7 @@ private Optional<Boolean> isExistingRelationForListing(Session session, Qualifie
 
         // TODO: consider a better way to resolve relation names: https://github.com/trinodb/trino/issues/9400
         try {
-            return Optional.of(getRedirectionAwareTableHandle(session, name).getTableHandle().isPresent());
+            return Optional.of(getRedirectionAwareTableHandle(session, name).tableHandle().isPresent());
         }
         catch (TrinoException e) {
             // ignore redirection errors for consistency with listing
@@ -547,71 +559,164 @@ private Optional<Boolean> isExistingRelationForListing(Session session, Qualifie
     }
 
     @Override
-    public List<TableColumnsMetadata> listTableColumns(Session session, QualifiedTablePrefix prefix)
+    public List<TableColumnsMetadata> listTableColumns(Session session, QualifiedTablePrefix prefix, UnaryOperator<Set<SchemaTableName>> relationFilter)
     {
         requireNonNull(prefix, "prefix is null");
 
-        Optional<CatalogMetadata> catalog = getOptionalCatalogMetadata(session, prefix.getCatalogName());
+        String catalogName = prefix.getCatalogName();
+        Optional<String> schemaName = prefix.getSchemaName();
+        Optional<String> relationName = prefix.getTableName();
+
+        if (catalogName.isEmpty() ||
+                (schemaName.isPresent() && schemaName.get().isEmpty()) ||
+                (relationName.isPresent() && relationName.get().isEmpty())) {
+            // Cannot exist
+            return ImmutableList.of();
+        }
+
+        if (relationName.isPresent()) {
+            QualifiedObjectName objectName = new QualifiedObjectName(catalogName, schemaName.orElseThrow(), relationName.get());
+            SchemaTableName schemaTableName = objectName.asSchemaTableName();
+
+            return Optional.<RelationColumnsMetadata>empty()
+                    .or(() -> getMaterializedViewInternal(session, objectName)
+                            .map(materializedView -> RelationColumnsMetadata.forMaterializedView(schemaTableName, materializedView.getColumns())))
+                    .or(() -> getViewInternal(session, objectName)
+                            .map(view -> RelationColumnsMetadata.forView(schemaTableName, view.getColumns())))
+                    .or(() -> {
+                        try {
+                            // TODO: redirects are handled inefficiently: we currently throw-away redirect info and redo it later
+                            RedirectionAwareTableHandle redirectionAware = getRedirectionAwareTableHandle(session, objectName);
+                            if (redirectionAware.redirectedTableName().isPresent()) {
+                                return Optional.of(RelationColumnsMetadata.forRedirectedTable(schemaTableName));
+                            }
+                            if (redirectionAware.tableHandle().isPresent()) {
+                                return Optional.of(RelationColumnsMetadata.forTable(schemaTableName, getTableMetadata(session, redirectionAware.tableHandle().get()).getColumns()));
+                            }
+                        }
+                        catch (RuntimeException e) {
+                            boolean silent = false;
+                            if (e instanceof TrinoException trinoException) {
+                                ErrorCode errorCode = trinoException.getErrorCode();
+                                silent = errorCode.equals(UNSUPPORTED_TABLE_TYPE.toErrorCode()) ||
+                                        // e.g. table deleted concurrently
+                                        errorCode.equals(NOT_FOUND.toErrorCode()) ||
+                                        // e.g. Iceberg/Delta table being deleted concurrently resulting in failure to load metadata from filesystem
+                                        errorCode.getType() == EXTERNAL;
+                            }
+                            if (silent) {
+                                log.debug(e, "Failed to get metadata for table: %s", objectName);
+                            }
+                            else {
+                                log.warn(e, "Failed to get metadata for table: %s", objectName);
+                            }
+                        }
+                        // Not found, or getting metadata failed.
+                        return Optional.empty();
+                    })
+                    .filter(relationColumnsMetadata -> relationFilter.apply(ImmutableSet.of(relationColumnsMetadata.name())).contains(relationColumnsMetadata.name()))
+                    .map(relationColumnsMetadata -> ImmutableList.of(tableColumnsMetadata(catalogName, relationColumnsMetadata)))
+                    .orElse(ImmutableList.of());
+        }
 
-        // Track column metadata for every object name to resolve ties between table and view
-        Map<SchemaTableName, Optional<List<ColumnMetadata>>> tableColumns = new HashMap<>();
+        Optional<CatalogMetadata> catalog = getOptionalCatalogMetadata(session, catalogName);
+        Map<SchemaTableName, TableColumnsMetadata> tableColumns = new HashMap<>();
         if (catalog.isPresent()) {
             CatalogMetadata catalogMetadata = catalog.get();
-
-            SchemaTablePrefix tablePrefix = prefix.asSchemaTablePrefix();
             for (CatalogHandle catalogHandle : catalogMetadata.listCatalogHandles()) {
-                if (isExternalInformationSchema(catalogHandle, prefix.getSchemaName())) {
+                if (isExternalInformationSchema(catalogHandle, schemaName)) {
                     continue;
                 }
-
                 ConnectorMetadata metadata = catalogMetadata.getMetadataFor(session, catalogHandle);
-
                 ConnectorSession connectorSession = session.toConnectorSession(catalogHandle);
-
-                // Collect column metadata from tables
-                metadata.streamTableColumns(connectorSession, tablePrefix)
-                        .forEachRemaining(columnsMetadata -> {
-                            if (!isExternalInformationSchema(catalogHandle, columnsMetadata.getTable().getSchemaName())) {
-                                tableColumns.put(columnsMetadata.getTable(), columnsMetadata.getColumns());
+                metadata.streamRelationColumns(connectorSession, schemaName, relationFilter)
+                        .forEachRemaining(relationColumnsMetadata -> {
+                            if (!isExternalInformationSchema(catalogHandle, relationColumnsMetadata.name().getSchemaName())) {
+                                // putIfAbsent to resolve any potential conflicts between system tables and regular tables
+                                tableColumns.putIfAbsent(relationColumnsMetadata.name(), tableColumnsMetadata(catalogName, relationColumnsMetadata));
                             }
                         });
+            }
+        }
+        return ImmutableList.copyOf(tableColumns.values());
+    }
 
-                // Collect column metadata from views. if table and view names overlap, the view wins
-                for (Entry<QualifiedObjectName, ViewInfo> entry : getViews(session, prefix).entrySet()) {
-                    ImmutableList.Builder<ColumnMetadata> columns = ImmutableList.builder();
-                    for (ViewColumn column : entry.getValue().getColumns()) {
-                        try {
-                            columns.add(ColumnMetadata.builder()
-                                    .setName(column.getName())
-                                    .setType(typeManager.getType(column.getType()))
-                                    .setComment(column.getComment())
-                                    .build());
-                        }
-                        catch (TypeNotFoundException e) {
-                            throw new TrinoException(INVALID_VIEW, format("Unknown type '%s' for column '%s' in view: %s", column.getType(), column.getName(), entry.getKey()));
-                        }
-                    }
-                    tableColumns.put(entry.getKey().asSchemaTableName(), Optional.of(columns.build()));
-                }
+    private TableColumnsMetadata tableColumnsMetadata(String catalogName, RelationColumnsMetadata relationColumnsMetadata)
+    {
+        SchemaTableName relationName = relationColumnsMetadata.name();
+        Optional<List<ColumnMetadata>> columnsMetadata = Optional.<List<ColumnMetadata>>empty()
+                .or(() -> relationColumnsMetadata.materializedViewColumns()
+                        .map(columns -> materializedViewColumnMetadata(catalogName, relationName, columns)))
+                .or(() -> relationColumnsMetadata.viewColumns()
+                        .map(columns -> viewColumnMetadata(catalogName, relationName, columns)))
+                .or(relationColumnsMetadata::tableColumns)
+                .or(() -> {
+                    checkState(relationColumnsMetadata.redirected(), "Invalid RelationColumnsMetadata: %s", relationColumnsMetadata);
+                    return Optional.empty();
+                });
+        return new TableColumnsMetadata(relationName, columnsMetadata);
+    }
 
-                // if view and materialized view names overlap, the materialized view wins
-                for (Entry<QualifiedObjectName, ViewInfo> entry : getMaterializedViews(session, prefix).entrySet()) {
-                    ImmutableList.Builder<ColumnMetadata> columns = ImmutableList.builder();
-                    for (ViewColumn column : entry.getValue().getColumns()) {
-                        try {
-                            columns.add(new ColumnMetadata(column.getName(), typeManager.getType(column.getType())));
-                        }
-                        catch (TypeNotFoundException e) {
-                            throw new TrinoException(INVALID_VIEW, format("Unknown type '%s' for column '%s' in materialized view: %s", column.getType(), column.getName(), entry.getKey()));
-                        }
-                    }
-                    tableColumns.put(entry.getKey().asSchemaTableName(), Optional.of(columns.build()));
+    private List<ColumnMetadata> materializedViewColumnMetadata(String catalogName, SchemaTableName materializedViewName, List<ConnectorMaterializedViewDefinition.Column> columns)
+    {
+        ImmutableList.Builder<ColumnMetadata> columnMetadata = ImmutableList.builderWithExpectedSize(columns.size());
+        for (ConnectorMaterializedViewDefinition.Column column : columns) {
+            try {
+                columnMetadata.add(ColumnMetadata.builder()
+                        .setName(column.getName())
+                        .setType(typeManager.getType(column.getType()))
+                        .setComment(column.getComment())
+                        .build());
+            }
+            catch (TypeNotFoundException e) {
+                QualifiedObjectName name = new QualifiedObjectName(catalogName, materializedViewName.getSchemaName(), materializedViewName.getTableName());
+                throw new TrinoException(INVALID_VIEW, format("Unknown type '%s' for column '%s' in materialized view: %s", column.getType(), column.getName(), name));
+            }
+        }
+        return columnMetadata.build();
+    }
+
+    private List<ColumnMetadata> viewColumnMetadata(String catalogName, SchemaTableName viewName, List<ConnectorViewDefinition.ViewColumn> columns)
+    {
+        ImmutableList.Builder<ColumnMetadata> columnMetadata = ImmutableList.builderWithExpectedSize(columns.size());
+        for (ConnectorViewDefinition.ViewColumn column : columns) {
+            try {
+                columnMetadata.add(ColumnMetadata.builder()
+                        .setName(column.getName())
+                        .setType(typeManager.getType(column.getType()))
+                        .setComment(column.getComment())
+                        .build());
+            }
+            catch (TypeNotFoundException e) {
+                QualifiedObjectName name = new QualifiedObjectName(catalogName, viewName.getSchemaName(), viewName.getTableName());
+                throw new TrinoException(INVALID_VIEW, format("Unknown type '%s' for column '%s' in view: %s", column.getType(), column.getName(), name));
+            }
+        }
+        return columnMetadata.build();
+    }
+
+    @Override
+    public List<RelationCommentMetadata> listRelationComments(Session session, String catalogName, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        Optional<CatalogMetadata> catalog = getOptionalCatalogMetadata(session, catalogName);
+
+        ImmutableList.Builder<RelationCommentMetadata> tableComments = ImmutableList.builder();
+        if (catalog.isPresent()) {
+            CatalogMetadata catalogMetadata = catalog.get();
+
+            for (CatalogHandle catalogHandle : catalogMetadata.listCatalogHandles()) {
+                if (isExternalInformationSchema(catalogHandle, schemaName)) {
+                    continue;
                 }
+
+                ConnectorMetadata metadata = catalogMetadata.getMetadataFor(session, catalogHandle);
+                ConnectorSession connectorSession = session.toConnectorSession(catalogHandle);
+                stream(metadata.streamRelationComments(connectorSession, schemaName, relationFilter))
+                        .filter(commentMetadata -> !isExternalInformationSchema(catalogHandle, commentMetadata.name().getSchemaName()))
+                        .forEach(tableComments::add);
             }
         }
-        return tableColumns.entrySet().stream()
-                .map(entry -> new TableColumnsMetadata(entry.getKey(), entry.getValue()))
-                .collect(toImmutableList());
+        return tableComments.build();
     }
 
     @Override
@@ -627,12 +732,12 @@ public void createSchema(Session session, CatalogSchemaName schema, Map<String,
     }
 
     @Override
-    public void dropSchema(Session session, CatalogSchemaName schema)
+    public void dropSchema(Session session, CatalogSchemaName schema, boolean cascade)
     {
         CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, schema.getCatalogName());
         CatalogHandle catalogHandle = catalogMetadata.getCatalogHandle();
         ConnectorMetadata metadata = catalogMetadata.getMetadata(session);
-        metadata.dropSchema(session.toConnectorSession(catalogHandle), schema.getSchemaName());
+        metadata.dropSchema(session.toConnectorSession(catalogHandle), schema.getSchemaName(), cascade);
         if (catalogMetadata.getSecurityManagement() == SYSTEM) {
             systemSecurityMetadata.schemaDropped(session, schema);
         }
@@ -665,12 +770,12 @@ public void setSchemaAuthorization(Session session, CatalogSchemaName source, Tr
     }
 
     @Override
-    public void createTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, boolean ignoreExisting)
+    public void createTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, SaveMode saveMode)
     {
         CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, catalogName);
         CatalogHandle catalogHandle = catalogMetadata.getCatalogHandle();
         ConnectorMetadata metadata = catalogMetadata.getMetadata(session);
-        metadata.createTable(session.toConnectorSession(catalogHandle), tableMetadata, ignoreExisting);
+        metadata.createTable(session.toConnectorSession(catalogHandle), tableMetadata, saveMode);
         if (catalogMetadata.getSecurityManagement() == SYSTEM) {
             systemSecurityMetadata.tableCreated(session, new CatalogSchemaTableName(catalogName, tableMetadata.getTable()));
         }
@@ -735,27 +840,57 @@ public void setColumnComment(Session session, TableHandle tableHandle, ColumnHan
     }
 
     @Override
-    public void renameColumn(Session session, TableHandle tableHandle, ColumnHandle source, String target)
+    public void renameColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnHandle source, String target)
     {
         CatalogHandle catalogHandle = tableHandle.getCatalogHandle();
+        CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, catalogHandle.getCatalogName());
         ConnectorMetadata metadata = getMetadataForWrite(session, catalogHandle);
         metadata.renameColumn(session.toConnectorSession(catalogHandle), tableHandle.getConnectorHandle(), source, target.toLowerCase(ENGLISH));
+        if (catalogMetadata.getSecurityManagement() == SYSTEM) {
+            ColumnMetadata columnMetadata = getColumnMetadata(session, tableHandle, source);
+            systemSecurityMetadata.columnRenamed(session, table, columnMetadata.getName(), target);
+        }
     }
 
     @Override
-    public void addColumn(Session session, TableHandle tableHandle, ColumnMetadata column)
+    public void renameField(Session session, TableHandle tableHandle, List<String> fieldPath, String target)
     {
         CatalogHandle catalogHandle = tableHandle.getCatalogHandle();
         ConnectorMetadata metadata = getMetadataForWrite(session, catalogHandle);
+        metadata.renameField(session.toConnectorSession(catalogHandle), tableHandle.getConnectorHandle(), fieldPath, target.toLowerCase(ENGLISH));
+    }
+
+    @Override
+    public void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column)
+    {
+        CatalogHandle catalogHandle = tableHandle.getCatalogHandle();
+        CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, catalogHandle.getCatalogName());
+        ConnectorMetadata metadata = getMetadataForWrite(session, catalogHandle);
         metadata.addColumn(session.toConnectorSession(catalogHandle), tableHandle.getConnectorHandle(), column);
+        if (catalogMetadata.getSecurityManagement() == SYSTEM) {
+            systemSecurityMetadata.columnCreated(session, table, column.getName());
+        }
+    }
+
+    @Override
+    public void addField(Session session, TableHandle tableHandle, List<String> parentPath, String fieldName, Type type, boolean ignoreExisting)
+    {
+        CatalogHandle catalogHandle = tableHandle.getCatalogHandle();
+        ConnectorMetadata metadata = getMetadataForWrite(session, catalogHandle);
+        metadata.addField(session.toConnectorSession(catalogHandle), tableHandle.getConnectorHandle(), parentPath, fieldName, type, ignoreExisting);
     }
 
     @Override
-    public void dropColumn(Session session, TableHandle tableHandle, ColumnHandle column)
+    public void dropColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnHandle column)
     {
         CatalogHandle catalogHandle = tableHandle.getCatalogHandle();
+        CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, catalogHandle.getCatalogName());
         ConnectorMetadata metadata = getMetadataForWrite(session, catalogHandle);
         metadata.dropColumn(session.toConnectorSession(catalogHandle), tableHandle.getConnectorHandle(), column);
+        if (catalogMetadata.getSecurityManagement() == SYSTEM) {
+            ColumnMetadata columnMetadata = getColumnMetadata(session, tableHandle, column);
+            systemSecurityMetadata.columnDropped(session, table, columnMetadata.getName());
+        }
     }
 
     @Override
@@ -774,6 +909,14 @@ public void setColumnType(Session session, TableHandle tableHandle, ColumnHandle
         metadata.setColumnType(session.toConnectorSession(catalogHandle), tableHandle.getConnectorHandle(), column, type);
     }
 
+    @Override
+    public void setFieldType(Session session, TableHandle tableHandle, List<String> fieldPath, Type type)
+    {
+        CatalogHandle catalogHandle = tableHandle.getCatalogHandle();
+        ConnectorMetadata metadata = getMetadataForWrite(session, catalogHandle);
+        metadata.setFieldType(session.toConnectorSession(catalogHandle), tableHandle.getConnectorHandle(), fieldPath, type);
+    }
+
     @Override
     public void setTableAuthorization(Session session, CatalogSchemaTableName table, TrinoPrincipal principal)
     {
@@ -870,6 +1013,26 @@ public Optional<TableLayout> getNewTableLayout(Session session, String catalogNa
                 .map(layout -> new TableLayout(catalogHandle, transactionHandle, layout));
     }
 
+    @Override
+    public Optional<Type> getSupportedType(Session session, CatalogHandle catalogHandle, Map<String, Object> tableProperties, Type type)
+    {
+        CatalogMetadata catalogMetadata = getCatalogMetadata(session, catalogHandle);
+        ConnectorMetadata metadata = catalogMetadata.getMetadata(session);
+        return metadata.getSupportedType(session.toConnectorSession(catalogHandle), tableProperties, type)
+                .map(newType -> {
+                    if (!typeCoercion.isCompatible(newType, type)) {
+                        throw new TrinoException(FUNCTION_IMPLEMENTATION_ERROR, format("Type '%s' is not compatible with the supplied type '%s' in getSupportedType", type, newType));
+                    }
+                    return newType;
+                });
+    }
+
+    @Override
+    public void beginQuery(Session session)
+    {
+        languageFunctionManager.registerQuery(session);
+    }
+
     @Override
     public void cleanupQuery(Session session)
     {
@@ -877,10 +1040,11 @@ public void cleanupQuery(Session session)
         if (queryCatalogs != null) {
             queryCatalogs.finish();
         }
+        languageFunctionManager.unregisterQuery(session);
     }
 
     @Override
-    public OutputTableHandle beginCreateTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, Optional<TableLayout> layout)
+    public OutputTableHandle beginCreateTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, Optional<TableLayout> layout, boolean replace)
     {
         CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, catalogName);
         CatalogHandle catalogHandle = catalogMetadata.getCatalogHandle();
@@ -888,7 +1052,7 @@ public OutputTableHandle beginCreateTable(Session session, String catalogName, C
 
         ConnectorTransactionHandle transactionHandle = catalogMetadata.getTransactionHandleFor(catalogHandle);
         ConnectorSession connectorSession = session.toConnectorSession(catalogHandle);
-        ConnectorOutputTableHandle handle = metadata.beginCreateTable(connectorSession, tableMetadata, layout.map(TableLayout::getLayout), getRetryPolicy(session).getRetryMode());
+        ConnectorOutputTableHandle handle = metadata.beginCreateTable(connectorSession, tableMetadata, layout.map(TableLayout::getLayout), getRetryPolicy(session).getRetryMode(), replace);
         return new OutputTableHandle(catalogHandle, tableMetadata.getTable(), transactionHandle, handle);
     }
 
@@ -1013,6 +1177,27 @@ public Optional<PartitioningHandle> getUpdateLayout(Session session, TableHandle
                 .map(partitioning -> new PartitioningHandle(Optional.of(catalogHandle), Optional.of(transactionHandle), partitioning));
     }
 
+    @Override
+    public Optional<TableHandle> applyUpdate(Session session, TableHandle table, Map<ColumnHandle, Constant> assignments)
+    {
+        CatalogHandle catalogHandle = table.getCatalogHandle();
+        ConnectorMetadata metadata = getMetadata(session, catalogHandle);
+
+        ConnectorSession connectorSession = session.toConnectorSession(catalogHandle);
+        return metadata.applyUpdate(connectorSession, table.getConnectorHandle(), assignments)
+                .map(newHandle -> new TableHandle(catalogHandle, newHandle, table.getTransaction()));
+    }
+
+    @Override
+    public OptionalLong executeUpdate(Session session, TableHandle table)
+    {
+        CatalogHandle catalogHandle = table.getCatalogHandle();
+        ConnectorMetadata metadata = getMetadataForWrite(session, catalogHandle);
+        ConnectorSession connectorSession = session.toConnectorSession(catalogHandle);
+
+        return metadata.executeUpdate(connectorSession, table.getConnectorHandle());
+    }
+
     @Override
     public Optional<TableHandle> applyDelete(Session session, TableHandle table)
     {
@@ -1098,7 +1283,6 @@ public List<QualifiedObjectName> listViews(Session session, QualifiedTablePrefix
                 metadata.listViews(connectorSession, prefix.getSchemaName()).stream()
                         .map(convertFromSchemaTableName(prefix.getCatalogName()))
                         .filter(view -> !isExternalInformationSchema(catalogHandle, view.getSchemaName()))
-                        .filter(prefix::matches)
                         .forEach(views::add);
             }
         }
@@ -1161,7 +1345,7 @@ public Map<String, Object> getSchemaProperties(Session session, CatalogSchemaNam
         ConnectorMetadata metadata = catalogMetadata.getMetadataFor(session, catalogHandle);
 
         ConnectorSession connectorSession = session.toConnectorSession(catalogHandle);
-        return metadata.getSchemaProperties(connectorSession, schemaName);
+        return metadata.getSchemaProperties(connectorSession, schemaName.getSchemaName());
     }
 
     @Override
@@ -1177,7 +1361,7 @@ public Optional<TrinoPrincipal> getSchemaOwner(Session session, CatalogSchemaNam
         CatalogHandle catalogHandle = catalogMetadata.getConnectorHandleForSchema(schemaName);
         ConnectorMetadata metadata = catalogMetadata.getMetadataFor(session, catalogHandle);
         ConnectorSession connectorSession = session.toConnectorSession(catalogHandle);
-        return metadata.getSchemaOwner(connectorSession, schemaName);
+        return metadata.getSchemaOwner(connectorSession, schemaName.getSchemaName());
     }
 
     @Override
@@ -1191,13 +1375,34 @@ public Optional<ViewDefinition> getView(Session session, QualifiedObjectName vie
     {
         Optional<ConnectorViewDefinition> connectorView = getViewInternal(session, viewName);
         if (connectorView.isEmpty() || connectorView.get().isRunAsInvoker() || isCatalogManagedSecurity(session, viewName.getCatalogName())) {
-            return connectorView.map(view -> new ViewDefinition(viewName, view));
+            return connectorView.map(view -> createViewDefinition(viewName, view, view.getOwner().map(Identity::ofUser)));
         }
 
         Identity runAsIdentity = systemSecurityMetadata.getViewRunAsIdentity(session, viewName.asCatalogSchemaTableName())
                 .or(() -> connectorView.get().getOwner().map(Identity::ofUser))
                 .orElseThrow(() -> new TrinoException(NOT_SUPPORTED, "Catalog does not support run-as DEFINER views: " + viewName));
-        return Optional.of(new ViewDefinition(viewName, connectorView.get(), runAsIdentity));
+        return Optional.of(createViewDefinition(viewName, connectorView.get(), Optional.of(runAsIdentity)));
+    }
+
+    private static ViewDefinition createViewDefinition(QualifiedObjectName viewName, ConnectorViewDefinition view, Optional<Identity> runAsIdentity)
+    {
+        if (view.isRunAsInvoker() && runAsIdentity.isPresent()) {
+            throw new TrinoException(INVALID_VIEW, "Run-as identity cannot be set for a run-as invoker view: " + viewName);
+        }
+        if (!view.isRunAsInvoker() && runAsIdentity.isEmpty()) {
+            throw new TrinoException(INVALID_VIEW, "Run-as identity must be set for a run-as definer view: " + viewName);
+        }
+
+        return new ViewDefinition(
+                view.getOriginalSql(),
+                view.getCatalog(),
+                view.getSchema(),
+                view.getColumns().stream()
+                        .map(column -> new ViewColumn(column.getName(), column.getType(), column.getComment()))
+                        .collect(toImmutableList()),
+                view.getComment(),
+                runAsIdentity,
+                view.getPath());
     }
 
     private Optional<ConnectorViewDefinition> getViewInternal(Session session, QualifiedObjectName viewName)
@@ -1332,7 +1537,6 @@ public List<QualifiedObjectName> listMaterializedViews(Session session, Qualifie
                 metadata.listMaterializedViews(connectorSession, prefix.getSchemaName()).stream()
                         .map(convertFromSchemaTableName(prefix.getCatalogName()))
                         .filter(materializedView -> !isExternalInformationSchema(catalogHandle, materializedView.getSchemaName()))
-                        .filter(prefix::matches)
                         .forEach(materializedViews::add);
             }
         }
@@ -1396,14 +1600,31 @@ public Optional<MaterializedViewDefinition> getMaterializedView(Session session,
         if (connectorView.isEmpty() || isCatalogManagedSecurity(session, viewName.getCatalogName())) {
             return connectorView.map(view -> {
                 String runAsUser = view.getOwner().orElseThrow(() -> new TrinoException(INVALID_VIEW, "Owner not set for a run-as invoker view: " + viewName));
-                return new MaterializedViewDefinition(view, Identity.ofUser(runAsUser));
+                return createMaterializedViewDefinition(view, Identity.ofUser(runAsUser));
             });
         }
 
         Identity runAsIdentity = systemSecurityMetadata.getViewRunAsIdentity(session, viewName.asCatalogSchemaTableName())
                 .or(() -> connectorView.get().getOwner().map(Identity::ofUser))
                 .orElseThrow(() -> new TrinoException(NOT_SUPPORTED, "Materialized view does not have an owner: " + viewName));
-        return Optional.of(new MaterializedViewDefinition(connectorView.get(), runAsIdentity));
+        return Optional.of(createMaterializedViewDefinition(connectorView.get(), runAsIdentity));
+    }
+
+    private static MaterializedViewDefinition createMaterializedViewDefinition(ConnectorMaterializedViewDefinition view, Identity runAsIdentity)
+    {
+        return new MaterializedViewDefinition(
+                view.getOriginalSql(),
+                view.getCatalog(),
+                view.getSchema(),
+                view.getColumns().stream()
+                        .map(column -> new ViewColumn(column.getName(), column.getType(), Optional.empty()))
+                        .collect(toImmutableList()),
+                view.getGracePeriod(),
+                view.getComment(),
+                runAsIdentity,
+                view.getPath(),
+                view.getStorageTable(),
+                view.getProperties());
     }
 
     private Optional<ConnectorMaterializedViewDefinition> getMaterializedViewInternal(Session session, QualifiedObjectName viewName)
@@ -1466,6 +1687,15 @@ public void setMaterializedViewProperties(Session session, QualifiedObjectName v
         metadata.setMaterializedViewProperties(session.toConnectorSession(catalogHandle), viewName.asSchemaTableName(), properties);
     }
 
+    @Override
+    public void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
+    {
+        CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, viewName.getCatalogName());
+        CatalogHandle catalogHandle = catalogMetadata.getCatalogHandle();
+        ConnectorMetadata metadata = catalogMetadata.getMetadata(session);
+        metadata.setMaterializedViewColumnComment(session.toConnectorSession(catalogHandle), viewName.asSchemaTableName(), columnName, comment);
+    }
+
     private static boolean isExternalInformationSchema(CatalogHandle catalogHandle, Optional<String> schemaName)
     {
         return schemaName.isPresent() && isExternalInformationSchema(catalogHandle, schemaName.get());
@@ -2071,18 +2301,21 @@ public List<GrantInfo> listTablePrivileges(Session session, QualifiedTablePrefix
     //
 
     @Override
-    public Collection<FunctionMetadata> listFunctions(Session session)
+    public Collection<FunctionMetadata> listGlobalFunctions(Session session)
+    {
+        return functions.listFunctions();
+    }
+
+    @Override
+    public Collection<FunctionMetadata> listFunctions(Session session, CatalogSchemaName schema)
     {
         ImmutableList.Builder<FunctionMetadata> functions = ImmutableList.builder();
-        functions.addAll(this.functions.listFunctions());
-        for (SqlPathElement sqlPathElement : session.getPath().getParsedPath()) {
-            String catalog = sqlPathElement.getCatalog().map(Identifier::getValue).or(session::getCatalog)
-                    .orElseThrow(() -> new IllegalArgumentException("Session default catalog must be set to resolve a partial function name: " + sqlPathElement));
-            getOptionalCatalogMetadata(session, catalog).ifPresent(metadata -> {
-                ConnectorSession connectorSession = session.toConnectorSession(metadata.getCatalogHandle());
-                functions.addAll(metadata.getMetadata(session).listFunctions(connectorSession, sqlPathElement.getSchema().getValue().toLowerCase(ENGLISH)));
-            });
-        }
+        getOptionalCatalogMetadata(session, schema.getCatalogName()).ifPresent(catalogMetadata -> {
+            ConnectorSession connectorSession = session.toConnectorSession(catalogMetadata.getCatalogHandle());
+            ConnectorMetadata metadata = catalogMetadata.getMetadata(session);
+            functions.addAll(metadata.listFunctions(connectorSession, schema.getSchemaName()));
+            functions.addAll(languageFunctionManager.listFunctions(metadata.listLanguageFunctions(connectorSession, schema.getSchemaName())));
+        });
         return functions.build();
     }
 
@@ -2094,126 +2327,41 @@ public ResolvedFunction decodeFunction(QualifiedName name)
     }
 
     @Override
-    public ResolvedFunction resolveFunction(Session session, QualifiedName name, List<TypeSignatureProvider> parameterTypes)
+    public ResolvedFunction resolveBuiltinFunction(String name, List<TypeSignatureProvider> parameterTypes)
     {
-        return resolvedFunctionInternal(session, name, parameterTypes);
+        return functionResolver.resolveBuiltinFunction(name, parameterTypes);
     }
 
     @Override
-    public ResolvedFunction resolveOperator(Session session, OperatorType operatorType, List<? extends Type> argumentTypes)
+    public ResolvedFunction resolveOperator(OperatorType operatorType, List<? extends Type> argumentTypes)
             throws OperatorNotFoundException
     {
-        try {
-            // todo we should not be caching functions across session
-            return uncheckedCacheGet(operatorCache, new OperatorCacheKey(operatorType, argumentTypes), () -> {
-                String name = mangleOperatorName(operatorType);
-                return resolvedFunctionInternal(session, QualifiedName.of(name), fromTypes(argumentTypes));
-            });
-        }
-        catch (UncheckedExecutionException e) {
-            if (e.getCause() instanceof TrinoException cause) {
-                if (cause.getErrorCode().getCode() == FUNCTION_NOT_FOUND.toErrorCode().getCode()) {
-                    throw new OperatorNotFoundException(operatorType, argumentTypes, cause);
-                }
-                throw cause;
-            }
-            throw e;
-        }
-    }
-
-    private ResolvedFunction resolvedFunctionInternal(Session session, QualifiedName name, List<TypeSignatureProvider> parameterTypes)
-    {
-        return functionDecoder.fromQualifiedName(name)
-                .orElseGet(() -> resolvedFunctionInternal(session, toQualifiedFunctionName(name), parameterTypes));
-    }
-
-    private ResolvedFunction resolvedFunctionInternal(Session session, QualifiedFunctionName name, List<TypeSignatureProvider> parameterTypes)
-    {
-        CatalogFunctionBinding catalogFunctionBinding = functionResolver.resolveFunction(
-                session,
-                name,
-                parameterTypes,
-                catalogSchemaFunctionName -> getFunctions(session, catalogSchemaFunctionName));
-        return resolve(session, catalogFunctionBinding);
-    }
-
-    // this is only public for TableFunctionRegistry, which is effectively part of MetadataManager but for some reason is a separate class
-    public static QualifiedFunctionName toQualifiedFunctionName(QualifiedName qualifiedName)
-    {
-        List<String> parts = qualifiedName.getParts();
-        checkArgument(parts.size() <= 3, "Function name can only have 3 parts: " + qualifiedName);
-        if (parts.size() == 3) {
-            return QualifiedFunctionName.of(parts.get(0), parts.get(1), parts.get(2));
-        }
-        if (parts.size() == 2) {
-            return QualifiedFunctionName.of(parts.get(0), parts.get(1));
-        }
-        return QualifiedFunctionName.of(parts.get(0));
+        return functionResolver.resolveOperator(operatorType, argumentTypes);
     }
 
     @Override
-    public ResolvedFunction getCoercion(Session session, OperatorType operatorType, Type fromType, Type toType)
+    public ResolvedFunction getCoercion(OperatorType operatorType, Type fromType, Type toType)
     {
-        checkArgument(operatorType == OperatorType.CAST || operatorType == OperatorType.SATURATED_FLOOR_CAST);
-        try {
-            // todo we should not be caching functions across session
-            return uncheckedCacheGet(coercionCache, new CoercionCacheKey(operatorType, fromType, toType), () -> {
-                String name = mangleOperatorName(operatorType);
-                CatalogFunctionBinding functionBinding = functionResolver.resolveCoercion(
-                        session,
-                        QualifiedFunctionName.of(name),
-                        Signature.builder()
-                                .name(name)
-                                .returnType(toType)
-                                .argumentType(fromType)
-                                .build(),
-                        catalogSchemaFunctionName -> getFunctions(session, catalogSchemaFunctionName));
-                return resolve(session, functionBinding);
-            });
-        }
-        catch (UncheckedExecutionException e) {
-            if (e.getCause() instanceof TrinoException cause) {
-                if (cause.getErrorCode().getCode() == FUNCTION_IMPLEMENTATION_MISSING.toErrorCode().getCode()) {
-                    throw new OperatorNotFoundException(operatorType, ImmutableList.of(fromType), toType.getTypeSignature(), cause);
-                }
-                throw cause;
-            }
-            throw e;
-        }
+        return functionResolver.resolveCoercion(operatorType, fromType, toType);
     }
 
     @Override
-    public ResolvedFunction getCoercion(Session session, QualifiedName name, Type fromType, Type toType)
+    public ResolvedFunction getCoercion(CatalogSchemaFunctionName name, Type fromType, Type toType)
     {
-        CatalogFunctionBinding catalogFunctionBinding = functionResolver.resolveCoercion(
-                session,
-                toQualifiedFunctionName(name),
-                Signature.builder()
-                        .name(name.getSuffix())
-                        .returnType(toType)
-                        .argumentType(fromType)
-                        .build(),
-                catalogSchemaFunctionName -> getFunctions(session, catalogSchemaFunctionName));
-        return resolve(session, catalogFunctionBinding);
-    }
+        // coercion can only be resolved for builtin functions
+        if (!isBuiltinFunctionName(name)) {
+            throw new TrinoException(FUNCTION_IMPLEMENTATION_MISSING, format("%s not found", name));
+        }
 
-    private ResolvedFunction resolve(Session session, CatalogFunctionBinding functionBinding)
-    {
-        FunctionDependencyDeclaration dependencies = getDependencies(
-                session,
-                functionBinding.getCatalogHandle(),
-                functionBinding.getFunctionBinding().getFunctionId(),
-                functionBinding.getFunctionBinding().getBoundSignature());
-        FunctionMetadata functionMetadata = getFunctionMetadata(
-                session,
-                functionBinding.getCatalogHandle(),
-                functionBinding.getFunctionBinding().getFunctionId(),
-                functionBinding.getFunctionBinding().getBoundSignature());
-        return resolve(session, functionBinding.getCatalogHandle(), functionBinding.getFunctionBinding(), functionMetadata, dependencies);
+        return functionResolver.resolveCoercion(name.getFunctionName(), fromType, toType);
     }
 
-    private FunctionDependencyDeclaration getDependencies(Session session, CatalogHandle catalogHandle, FunctionId functionId, BoundSignature boundSignature)
+    @Override
+    public FunctionDependencyDeclaration getFunctionDependencies(Session session, CatalogHandle catalogHandle, FunctionId functionId, BoundSignature boundSignature)
     {
+        if (isTrinoSqlLanguageFunction(functionId)) {
+            throw new IllegalArgumentException("Function dependencies for SQL functions must be fetched directly from the language manager");
+        }
         if (catalogHandle.equals(GlobalSystemConnector.CATALOG_HANDLE)) {
             return functions.getFunctionDependencies(functionId, boundSignature);
         }
@@ -2222,152 +2370,51 @@ private FunctionDependencyDeclaration getDependencies(Session session, CatalogHa
                 .getFunctionDependencies(connectorSession, functionId, boundSignature);
     }
 
-    @VisibleForTesting
-    public ResolvedFunction resolve(Session session, CatalogHandle catalogHandle, FunctionBinding functionBinding, FunctionMetadata functionMetadata, FunctionDependencyDeclaration dependencies)
-    {
-        Map<TypeSignature, Type> dependentTypes = dependencies.getTypeDependencies().stream()
-                .map(typeSignature -> applyBoundVariables(typeSignature, functionBinding))
-                .collect(toImmutableMap(Function.identity(), typeManager::getType, (left, right) -> left));
-
-        ImmutableSet.Builder<ResolvedFunction> functions = ImmutableSet.builder();
-        dependencies.getFunctionDependencies().stream()
-                .map(functionDependency -> {
-                    try {
-                        List<TypeSignature> argumentTypes = applyBoundVariables(functionDependency.getArgumentTypes(), functionBinding);
-                        return resolvedFunctionInternal(session, functionDependency.getName(), fromTypeSignatures(argumentTypes));
-                    }
-                    catch (TrinoException e) {
-                        if (functionDependency.isOptional()) {
-                            return null;
-                        }
-                        throw e;
-                    }
-                })
-                .filter(Objects::nonNull)
-                .forEach(functions::add);
-
-        dependencies.getOperatorDependencies().stream()
-                .map(operatorDependency -> {
-                    try {
-                        List<TypeSignature> argumentTypes = applyBoundVariables(operatorDependency.getArgumentTypes(), functionBinding);
-                        return resolvedFunctionInternal(session, QualifiedName.of(mangleOperatorName(operatorDependency.getOperatorType())), fromTypeSignatures(argumentTypes));
-                    }
-                    catch (TrinoException e) {
-                        if (operatorDependency.isOptional()) {
-                            return null;
-                        }
-                        throw e;
-                    }
-                })
-                .filter(Objects::nonNull)
-                .forEach(functions::add);
-
-        dependencies.getCastDependencies().stream()
-                .map(castDependency -> {
-                    try {
-                        Type fromType = typeManager.getType(applyBoundVariables(castDependency.getFromType(), functionBinding));
-                        Type toType = typeManager.getType(applyBoundVariables(castDependency.getToType(), functionBinding));
-                        return getCoercion(session, fromType, toType);
-                    }
-                    catch (TrinoException e) {
-                        if (castDependency.isOptional()) {
-                            return null;
-                        }
-                        throw e;
-                    }
-                })
-                .filter(Objects::nonNull)
-                .forEach(functions::add);
-
-        return new ResolvedFunction(
-                functionBinding.getBoundSignature(),
-                catalogHandle,
-                functionBinding.getFunctionId(),
-                functionMetadata.getKind(),
-                functionMetadata.isDeterministic(),
-                functionMetadata.getFunctionNullability(),
-                dependentTypes,
-                functions.build());
-    }
-
     @Override
-    public boolean isAggregationFunction(Session session, QualifiedName name)
+    public Collection<CatalogFunctionMetadata> getFunctions(Session session, CatalogSchemaFunctionName name)
     {
-        return functionResolver.isAggregationFunction(session, toQualifiedFunctionName(name), catalogSchemaFunctionName -> getFunctions(session, catalogSchemaFunctionName));
-    }
-
-    private Collection<CatalogFunctionMetadata> getFunctions(Session session, CatalogSchemaFunctionName name)
-    {
-        if (name.getCatalogName().equals(GlobalSystemConnector.NAME)) {
-            return functions.getFunctions(name.getSchemaFunctionName()).stream()
-                    .map(function -> new CatalogFunctionMetadata(GlobalSystemConnector.CATALOG_HANDLE, function))
-                    .collect(toImmutableList());
+        if (isBuiltinFunctionName(name)) {
+            return getBuiltinFunctions(name.getFunctionName());
         }
 
         return getOptionalCatalogMetadata(session, name.getCatalogName())
-                .map(metadata -> metadata.getMetadata(session)
-                        .getFunctions(session.toConnectorSession(metadata.getCatalogHandle()), name.getSchemaFunctionName()).stream()
-                        .map(function -> new CatalogFunctionMetadata(metadata.getCatalogHandle(), function))
-                        .collect(toImmutableList()))
+                .map(metadata -> getFunctions(session, metadata.getMetadata(session), metadata.getCatalogHandle(), name.getSchemaFunctionName()))
                 .orElse(ImmutableList.of());
     }
 
-    @Override
-    public FunctionMetadata getFunctionMetadata(Session session, ResolvedFunction resolvedFunction)
+    private Collection<CatalogFunctionMetadata> getBuiltinFunctions(String functionName)
     {
-        return getFunctionMetadata(session, resolvedFunction.getCatalogHandle(), resolvedFunction.getFunctionId(), resolvedFunction.getSignature());
+        return functions.getBuiltInFunctions(functionName).stream()
+                .map(function -> new CatalogFunctionMetadata(GlobalSystemConnector.CATALOG_HANDLE, BUILTIN_SCHEMA, function))
+                .collect(toImmutableList());
     }
 
-    private FunctionMetadata getFunctionMetadata(Session session, CatalogHandle catalogHandle, FunctionId functionId, BoundSignature signature)
+    private List<CatalogFunctionMetadata> getFunctions(Session session, ConnectorMetadata metadata, CatalogHandle catalogHandle, SchemaFunctionName name)
     {
-        FunctionMetadata functionMetadata;
-        if (catalogHandle.equals(GlobalSystemConnector.CATALOG_HANDLE)) {
-            functionMetadata = functions.getFunctionMetadata(functionId);
-        }
-        else {
-            ConnectorSession connectorSession = session.toConnectorSession(catalogHandle);
-            functionMetadata = getMetadata(session, catalogHandle)
-                    .getFunctionMetadata(connectorSession, functionId);
-        }
+        ConnectorSession connectorSession = session.toConnectorSession(catalogHandle);
+        ImmutableList.Builder<CatalogFunctionMetadata> functions = ImmutableList.builder();
 
-        FunctionMetadata.Builder newMetadata = FunctionMetadata.builder(functionMetadata.getKind())
-                .functionId(functionMetadata.getFunctionId())
-                .signature(signature.toSignature())
-                .canonicalName(functionMetadata.getCanonicalName());
+        metadata.getFunctions(connectorSession, name).stream()
+                .map(function -> new CatalogFunctionMetadata(catalogHandle, name.getSchemaName(), function))
+                .forEach(functions::add);
 
-        if (functionMetadata.getDescription().isEmpty()) {
-            newMetadata.noDescription();
-        }
-        else {
-            newMetadata.description(functionMetadata.getDescription());
-        }
+        RunAsIdentityLoader identityLoader = owner -> {
+            CatalogSchemaFunctionName functionName = new CatalogSchemaFunctionName(catalogHandle.getCatalogName(), name);
 
-        if (functionMetadata.isHidden()) {
-            newMetadata.hidden();
-        }
-        if (!functionMetadata.isDeterministic()) {
-            newMetadata.nondeterministic();
-        }
-        if (functionMetadata.isDeprecated()) {
-            newMetadata.deprecated();
-        }
-        if (functionMetadata.getFunctionNullability().isReturnNullable()) {
-            newMetadata.nullable();
-        }
+            Optional<Identity> systemIdentity = Optional.empty();
+            if (getCatalogMetadata(session, catalogHandle).getSecurityManagement() == SYSTEM) {
+                systemIdentity = systemSecurityMetadata.getFunctionRunAsIdentity(session, functionName);
+            }
 
-        // specialize function metadata to resolvedFunction
-        List<Boolean> argumentNullability = functionMetadata.getFunctionNullability().getArgumentNullable();
-        if (functionMetadata.getSignature().isVariableArity()) {
-            List<Boolean> fixedArgumentNullability = argumentNullability.subList(0, argumentNullability.size() - 1);
-            int variableArgumentCount = signature.getArgumentTypes().size() - fixedArgumentNullability.size();
-            argumentNullability = ImmutableList.<Boolean>builder()
-                    .addAll(fixedArgumentNullability)
-                    .addAll(nCopies(variableArgumentCount, argumentNullability.get(argumentNullability.size() - 1)))
-                    .build();
-        }
-        newMetadata.argumentNullability(argumentNullability);
+            return systemIdentity.or(() -> owner.map(Identity::ofUser))
+                    .orElseThrow(() -> new TrinoException(NOT_SUPPORTED, "No identity for SECURITY DEFINER function: " + functionName));
+        };
+
+        languageFunctionManager.getFunctions(session, catalogHandle, name, metadata::getLanguageFunctions, identityLoader).stream()
+                .map(function -> new CatalogFunctionMetadata(catalogHandle, name.getSchemaName(), function))
+                .forEach(functions::add);
 
-        return newMetadata.build();
+        return functions.build();
     }
 
     @Override
@@ -2401,6 +2448,38 @@ public AggregationFunctionMetadata getAggregationFunctionMetadata(Session sessio
         return builder.build();
     }
 
+    @Override
+    public boolean languageFunctionExists(Session session, QualifiedObjectName name, String signatureToken)
+    {
+        return getOptionalCatalogMetadata(session, name.getCatalogName())
+                .map(catalogMetadata -> {
+                    ConnectorMetadata metadata = catalogMetadata.getMetadata(session);
+                    ConnectorSession connectorSession = session.toConnectorSession(catalogMetadata.getCatalogHandle());
+                    return metadata.languageFunctionExists(connectorSession, name.asSchemaFunctionName(), signatureToken);
+                })
+                .orElse(false);
+    }
+
+    @Override
+    public void createLanguageFunction(Session session, QualifiedObjectName name, LanguageFunction function, boolean replace)
+    {
+        CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, name.getCatalogName());
+        CatalogHandle catalogHandle = catalogMetadata.getCatalogHandle();
+        ConnectorMetadata metadata = catalogMetadata.getMetadata(session);
+
+        metadata.createLanguageFunction(session.toConnectorSession(catalogHandle), name.asSchemaFunctionName(), function, replace);
+    }
+
+    @Override
+    public void dropLanguageFunction(Session session, QualifiedObjectName name, String signatureToken)
+    {
+        CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, name.getCatalogName());
+        CatalogHandle catalogHandle = catalogMetadata.getCatalogHandle();
+        ConnectorMetadata metadata = catalogMetadata.getMetadata(session);
+
+        metadata.dropLanguageFunction(session.toConnectorSession(catalogHandle), name.asSchemaFunctionName(), signatureToken);
+    }
+
     @VisibleForTesting
     public static FunctionBinding toFunctionBinding(FunctionId functionId, BoundSignature boundSignature, Signature functionSignature)
     {
@@ -2510,37 +2589,32 @@ private synchronized void finish()
     }
 
     @Override
-    public boolean supportsReportingWrittenBytes(Session session, QualifiedObjectName tableName, Map<String, Object> tableProperties)
+    public OptionalInt getMaxWriterTasks(Session session, String catalogName)
     {
-        Optional<CatalogMetadata> catalog = getOptionalCatalogMetadata(session, tableName.getCatalogName());
+        Optional<CatalogMetadata> catalog = getOptionalCatalogMetadata(session, catalogName);
         if (catalog.isEmpty()) {
-            return false;
+            return OptionalInt.empty();
         }
 
         CatalogMetadata catalogMetadata = catalog.get();
-        CatalogHandle catalogHandle = catalogMetadata.getCatalogHandle(session, tableName);
-        ConnectorMetadata metadata = catalogMetadata.getMetadataFor(session, catalogHandle);
-        return metadata.supportsReportingWrittenBytes(session.toConnectorSession(catalogHandle), tableName.asSchemaTableName(), tableProperties);
+        CatalogHandle catalogHandle = catalogMetadata.getCatalogHandle();
+        return catalogMetadata.getMetadata(session).getMaxWriterTasks(session.toConnectorSession(catalogHandle));
     }
 
     @Override
-    public boolean supportsReportingWrittenBytes(Session session, TableHandle tableHandle)
+    public WriterScalingOptions getNewTableWriterScalingOptions(Session session, QualifiedObjectName tableName, Map<String, Object> tableProperties)
     {
-        ConnectorMetadata metadata = getMetadata(session, tableHandle.getCatalogHandle());
-        return metadata.supportsReportingWrittenBytes(session.toConnectorSession(tableHandle.getCatalogHandle()), tableHandle.getConnectorHandle());
+        CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, tableName.getCatalogName());
+        CatalogHandle catalogHandle = catalogMetadata.getCatalogHandle(session, tableName);
+        ConnectorMetadata metadata = catalogMetadata.getMetadataFor(session, catalogHandle);
+        return metadata.getNewTableWriterScalingOptions(session.toConnectorSession(catalogHandle), tableName.asSchemaTableName(), tableProperties);
     }
 
     @Override
-    public OptionalInt getMaxWriterTasks(Session session, String catalogName)
+    public WriterScalingOptions getInsertWriterScalingOptions(Session session, TableHandle tableHandle)
     {
-        Optional<CatalogMetadata> catalog = getOptionalCatalogMetadata(session, catalogName);
-        if (catalog.isEmpty()) {
-            return OptionalInt.empty();
-        }
-
-        CatalogMetadata catalogMetadata = catalog.get();
-        CatalogHandle catalogHandle = catalogMetadata.getCatalogHandle();
-        return catalogMetadata.getMetadata(session).getMaxWriterTasks(session.toConnectorSession(catalogHandle));
+        ConnectorMetadata metadata = getMetadataForWrite(session, tableHandle.getCatalogHandle());
+        return metadata.getInsertWriterScalingOptions(session.toConnectorSession(tableHandle.getCatalogHandle()), tableHandle.getConnectorHandle());
     }
 
     private Optional<ConnectorTableVersion> toConnectorVersion(Optional<TableVersion> version)
@@ -2552,98 +2626,6 @@ private Optional<ConnectorTableVersion> toConnectorVersion(Optional<TableVersion
         return connectorVersion;
     }
 
-    private static class OperatorCacheKey
-    {
-        private final OperatorType operatorType;
-        private final List<? extends Type> argumentTypes;
-
-        private OperatorCacheKey(OperatorType operatorType, List<? extends Type> argumentTypes)
-        {
-            this.operatorType = requireNonNull(operatorType, "operatorType is null");
-            this.argumentTypes = ImmutableList.copyOf(requireNonNull(argumentTypes, "argumentTypes is null"));
-        }
-
-        public OperatorType getOperatorType()
-        {
-            return operatorType;
-        }
-
-        public List<? extends Type> getArgumentTypes()
-        {
-            return argumentTypes;
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hash(operatorType, argumentTypes);
-        }
-
-        @Override
-        public boolean equals(Object obj)
-        {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof OperatorCacheKey)) {
-                return false;
-            }
-            OperatorCacheKey other = (OperatorCacheKey) obj;
-            return Objects.equals(this.operatorType, other.operatorType) &&
-                    Objects.equals(this.argumentTypes, other.argumentTypes);
-        }
-    }
-
-    private static class CoercionCacheKey
-    {
-        private final OperatorType operatorType;
-        private final Type fromType;
-        private final Type toType;
-
-        private CoercionCacheKey(OperatorType operatorType, Type fromType, Type toType)
-        {
-            this.operatorType = requireNonNull(operatorType, "operatorType is null");
-            this.fromType = requireNonNull(fromType, "fromType is null");
-            this.toType = requireNonNull(toType, "toType is null");
-        }
-
-        public OperatorType getOperatorType()
-        {
-            return operatorType;
-        }
-
-        public Type getFromType()
-        {
-            return fromType;
-        }
-
-        public Type getToType()
-        {
-            return toType;
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hash(operatorType, fromType, toType);
-        }
-
-        @Override
-        public boolean equals(Object obj)
-        {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof CoercionCacheKey)) {
-                return false;
-            }
-            CoercionCacheKey other = (CoercionCacheKey) obj;
-            return Objects.equals(this.operatorType, other.operatorType) &&
-                    Objects.equals(this.fromType, other.fromType) &&
-                    Objects.equals(this.toType, other.toType);
-        }
-    }
-
     public static MetadataManager createTestMetadataManager()
     {
         return testMetadataManagerBuilder().build();
@@ -2659,6 +2641,7 @@ public static class TestMetadataManagerBuilder
         private TransactionManager transactionManager;
         private TypeManager typeManager = TESTING_TYPE_MANAGER;
         private GlobalFunctionCatalog globalFunctionCatalog;
+        private LanguageFunctionManager languageFunctionManager;
 
         private TestMetadataManagerBuilder() {}
 
@@ -2680,6 +2663,12 @@ public TestMetadataManagerBuilder withGlobalFunctionCatalog(GlobalFunctionCatalo
             return this;
         }
 
+        public TestMetadataManagerBuilder withLanguageFunctionManager(LanguageFunctionManager languageFunctionManager)
+        {
+            this.languageFunctionManager = languageFunctionManager;
+            return this;
+        }
+
         public MetadataManager build()
         {
             TransactionManager transactionManager = this.transactionManager;
@@ -2695,10 +2684,15 @@ public MetadataManager build()
                 globalFunctionCatalog.addFunctions(new InternalFunctionBundle(new LiteralFunction(new InternalBlockEncodingSerde(new BlockEncodingManager(), typeManager))));
             }
 
+            if (languageFunctionManager == null) {
+                languageFunctionManager = new LanguageFunctionManager(new SqlParser(), typeManager, user -> ImmutableSet.of());
+            }
+
             return new MetadataManager(
                     new DisabledSystemSecurityMetadata(),
                     transactionManager,
                     globalFunctionCatalog,
+                    languageFunctionManager,
                     typeManager);
         }
     }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/PolymorphicScalarFunction.java b/core/trino-main/src/main/java/io/trino/metadata/PolymorphicScalarFunction.java
index a4640061fcdf..ad0674064d7c 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/PolymorphicScalarFunction.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/PolymorphicScalarFunction.java
@@ -144,6 +144,9 @@ private static boolean matchesParameterAndReturnTypes(
             }
             methodParameterIndex += argumentConvention.getParameterCount();
         }
+        if (returnConvention == InvocationReturnConvention.BLOCK_BUILDER) {
+            throw new UnsupportedOperationException("BLOCK_BUILDER return convention is not yet supported");
+        }
         return method.getReturnType().equals(getNullAwareContainerType(boundSignature.getReturnType().getJavaType(), returnConvention));
     }
 
@@ -171,13 +174,11 @@ private MethodHandle applyExtraParameters(Method matchingMethod, List<Object> ex
 
     private static Class<?> getNullAwareContainerType(Class<?> clazz, InvocationReturnConvention returnConvention)
     {
-        switch (returnConvention) {
-            case NULLABLE_RETURN:
-                return Primitives.wrap(clazz);
-            case FAIL_ON_NULL:
-                return clazz;
-        }
-        throw new UnsupportedOperationException("Unknown return convention: " + returnConvention);
+        return switch (returnConvention) {
+            case NULLABLE_RETURN -> Primitives.wrap(clazz);
+            case DEFAULT_ON_NULL, FAIL_ON_NULL -> clazz;
+            case BLOCK_BUILDER, FLAT_RETURN -> void.class;
+        };
     }
 
     static final class PolymorphicScalarFunctionChoice
diff --git a/core/trino-main/src/main/java/io/trino/metadata/PolymorphicScalarFunctionBuilder.java b/core/trino-main/src/main/java/io/trino/metadata/PolymorphicScalarFunctionBuilder.java
index 186f9d63a70f..972c5d8235ef 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/PolymorphicScalarFunctionBuilder.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/PolymorphicScalarFunctionBuilder.java
@@ -34,8 +34,10 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.metadata.OperatorNameUtil.isOperatorName;
 import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static java.util.Arrays.asList;
@@ -44,24 +46,33 @@
 
 public final class PolymorphicScalarFunctionBuilder
 {
+    private final String name;
     private final Class<?> clazz;
     private Signature signature;
     private boolean nullableResult;
     private List<Boolean> argumentNullability;
     private String description;
-    private Optional<Boolean> hidden = Optional.empty();
+    private boolean hidden;
     private Boolean deterministic;
     private final List<PolymorphicScalarFunctionChoice> choices = new ArrayList<>();
 
-    public PolymorphicScalarFunctionBuilder(Class<?> clazz)
+    public PolymorphicScalarFunctionBuilder(String name, Class<?> clazz)
     {
+        this.name = requireNonNull(name, "name is null");
+        checkArgument(!isOperatorName(name), "use the OperatorType constructor instead of the String name constructor");
         this.clazz = requireNonNull(clazz, "clazz is null");
     }
 
+    public PolymorphicScalarFunctionBuilder(OperatorType operatorType, Class<?> clazz)
+    {
+        this.name = mangleOperatorName(operatorType);
+        this.clazz = requireNonNull(clazz, "clazz is null");
+        hidden = true;
+    }
+
     public PolymorphicScalarFunctionBuilder signature(Signature signature)
     {
         this.signature = requireNonNull(signature, "signature is null");
-        this.hidden = Optional.of(hidden.orElseGet(() -> isOperator(signature)));
         return this;
     }
 
@@ -85,9 +96,9 @@ public PolymorphicScalarFunctionBuilder description(String description)
         return this;
     }
 
-    public PolymorphicScalarFunctionBuilder hidden(boolean hidden)
+    public PolymorphicScalarFunctionBuilder hidden()
     {
-        this.hidden = Optional.of(hidden);
+        this.hidden = true;
         return this;
     }
 
@@ -115,7 +126,7 @@ public SqlScalarFunction build()
         checkState(deterministic != null, "deterministic is null");
         checkState(argumentNullability != null, "argumentNullability is null");
 
-        FunctionMetadata.Builder functionMetadata = FunctionMetadata.scalarBuilder()
+        FunctionMetadata.Builder functionMetadata = FunctionMetadata.scalarBuilder(name)
                 .signature(signature);
 
         if (description != null) {
@@ -125,7 +136,7 @@ public SqlScalarFunction build()
             functionMetadata.noDescription();
         }
 
-        if (hidden.orElse(false)) {
+        if (hidden) {
             functionMetadata.hidden();
         }
         if (!deterministic) {
@@ -158,17 +169,6 @@ public static <T> Function<SpecializeContext, List<Object>> constant(T value)
         return context -> ImmutableList.of(value);
     }
 
-    private static boolean isOperator(Signature signature)
-    {
-        for (OperatorType operator : OperatorType.values()) {
-            if (signature.getName().equals(mangleOperatorName(operator))) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     public static final class SpecializeContext
     {
         private final FunctionBinding functionBinding;
@@ -256,9 +256,9 @@ public MethodsGroupBuilder methodWithExplicitJavaTypes(String methodName, List<O
             Iterator<Optional<Class<?>>> typesIterator = types.iterator();
             while (argumentConventionIterator.hasNext() && typesIterator.hasNext()) {
                 Optional<Class<?>> classOptional = typesIterator.next();
-                InvocationArgumentConvention argumentProperty = argumentConventionIterator.next();
-                checkState((argumentProperty == BLOCK_POSITION) == classOptional.isPresent(),
-                        "Explicit type is not set when null convention is BLOCK_AND_POSITION");
+                InvocationArgumentConvention argumentConvention = argumentConventionIterator.next();
+                checkState((argumentConvention == BLOCK_POSITION || argumentConvention == BLOCK_POSITION_NOT_NULL) == classOptional.isPresent(),
+                        "Explicit type is not set when argument convention is block and position");
             }
             methodAndNativeContainerTypesList.add(methodAndNativeContainerTypes);
             return this;
diff --git a/core/trino-main/src/main/java/io/trino/metadata/ProcedureRegistry.java b/core/trino-main/src/main/java/io/trino/metadata/ProcedureRegistry.java
index ce0e9bd4578c..ec8f76910afe 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/ProcedureRegistry.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/ProcedureRegistry.java
@@ -13,14 +13,13 @@
  */
 package io.trino.metadata;
 
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.procedure.Procedure;
 
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 @ThreadSafe
diff --git a/core/trino-main/src/main/java/io/trino/metadata/PropertyUtil.java b/core/trino-main/src/main/java/io/trino/metadata/PropertyUtil.java
index e03b30c94c22..2907f15c61c5 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/PropertyUtil.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/PropertyUtil.java
@@ -18,7 +18,7 @@
 import io.trino.security.AccessControl;
 import io.trino.spi.ErrorCodeSupplier;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.Block;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.Type;
 import io.trino.sql.PlannerContext;
@@ -147,9 +147,8 @@ public static Object evaluateProperty(
             Object value = evaluateConstantExpression(rewritten, propertyType, plannerContext, session, accessControl, parameters);
 
             // convert to object value type of SQL type
-            BlockBuilder blockBuilder = propertyType.createBlockBuilder(null, 1);
-            writeNativeValue(propertyType, blockBuilder, value);
-            sqlObjectValue = propertyType.getObjectValue(session.toConnectorSession(), blockBuilder, 0);
+            Block block = writeNativeValue(propertyType, value);
+            sqlObjectValue = propertyType.getObjectValue(session.toConnectorSession(), block, 0);
         }
         catch (TrinoException e) {
             throw new TrinoException(
diff --git a/core/trino-main/src/main/java/io/trino/metadata/QualifiedObjectName.java b/core/trino-main/src/main/java/io/trino/metadata/QualifiedObjectName.java
index 3ab21e6c6603..e052373185c0 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/QualifiedObjectName.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/QualifiedObjectName.java
@@ -17,12 +17,12 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.connector.CatalogSchemaRoutineName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.SchemaRoutineName;
 import io.trino.spi.connector.SchemaTableName;
-
-import javax.annotation.concurrent.Immutable;
+import io.trino.spi.function.SchemaFunctionName;
 
 import java.util.Objects;
 import java.util.function.Function;
@@ -97,6 +97,11 @@ public QualifiedTablePrefix asQualifiedTablePrefix()
         return new QualifiedTablePrefix(catalogName, schemaName, objectName);
     }
 
+    public SchemaFunctionName asSchemaFunctionName()
+    {
+        return new SchemaFunctionName(schemaName, objectName);
+    }
+
     @Override
     public boolean equals(Object obj)
     {
diff --git a/core/trino-main/src/main/java/io/trino/metadata/QualifiedTablePrefix.java b/core/trino-main/src/main/java/io/trino/metadata/QualifiedTablePrefix.java
index 3666e85c082b..2c153a97dbc7 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/QualifiedTablePrefix.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/QualifiedTablePrefix.java
@@ -15,10 +15,9 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.connector.SchemaTablePrefix;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Objects;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/metadata/RedirectionAwareTableHandle.java b/core/trino-main/src/main/java/io/trino/metadata/RedirectionAwareTableHandle.java
index 8b524a4b6977..f0e99407b828 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/RedirectionAwareTableHandle.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/RedirectionAwareTableHandle.java
@@ -15,68 +15,29 @@
 
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
-public abstract class RedirectionAwareTableHandle
+public record RedirectionAwareTableHandle(
+        Optional<TableHandle> tableHandle,
+        // the target table name after redirection. Optional.empty() if the table is not redirected.
+        Optional<QualifiedObjectName> redirectedTableName)
 {
-    private final Optional<TableHandle> tableHandle;
-
-    protected RedirectionAwareTableHandle(Optional<TableHandle> tableHandle)
-    {
-        this.tableHandle = requireNonNull(tableHandle, "tableHandle is null");
-    }
-
     public static RedirectionAwareTableHandle withRedirectionTo(QualifiedObjectName redirectedTableName, TableHandle tableHandle)
     {
-        return new TableHandleWithRedirection(redirectedTableName, tableHandle);
+        return new RedirectionAwareTableHandle(Optional.of(tableHandle), Optional.of(redirectedTableName));
     }
 
     public static RedirectionAwareTableHandle noRedirection(Optional<TableHandle> tableHandle)
     {
-        return new TableHandleWithoutRedirection(tableHandle);
-    }
-
-    public Optional<TableHandle> getTableHandle()
-    {
-        return tableHandle;
+        return new RedirectionAwareTableHandle(tableHandle, Optional.empty());
     }
 
-    /**
-     * @return the target table name after redirection. Optional.empty() if the table is not redirected.
-     */
-    public abstract Optional<QualifiedObjectName> getRedirectedTableName();
-
-    private static class TableHandleWithoutRedirection
-            extends RedirectionAwareTableHandle
+    public RedirectionAwareTableHandle
     {
-        protected TableHandleWithoutRedirection(Optional<TableHandle> tableHandle)
-        {
-            super(tableHandle);
-        }
-
-        @Override
-        public Optional<QualifiedObjectName> getRedirectedTableName()
-        {
-            return Optional.empty();
-        }
-    }
-
-    private static class TableHandleWithRedirection
-            extends RedirectionAwareTableHandle
-    {
-        private final QualifiedObjectName redirectedTableName;
-
-        public TableHandleWithRedirection(QualifiedObjectName redirectedTableName, TableHandle tableHandle)
-        {
-            // Table handle must exist if there is redirection
-            super(Optional.of(tableHandle));
-            this.redirectedTableName = requireNonNull(redirectedTableName, "redirectedTableName is null");
-        }
-
-        @Override
-        public Optional<QualifiedObjectName> getRedirectedTableName()
-        {
-            return Optional.of(redirectedTableName);
-        }
+        requireNonNull(tableHandle, "tableHandle is null");
+        requireNonNull(redirectedTableName, "redirectedTableName is null");
+        // Table handle must exist if there is redirection
+        checkArgument(tableHandle.isPresent() || redirectedTableName.isEmpty(), "redirectedTableName present without tableHandle");
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/RemoteNodeState.java b/core/trino-main/src/main/java/io/trino/metadata/RemoteNodeState.java
index 1185ffae5b52..0a1756ec8802 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/RemoteNodeState.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/RemoteNodeState.java
@@ -15,6 +15,7 @@
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.http.client.FullJsonResponseHandler.JsonResponse;
 import io.airlift.http.client.HttpClient;
 import io.airlift.http.client.HttpClient.HttpResponseFuture;
@@ -22,9 +23,7 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.net.URI;
 import java.util.Optional;
@@ -39,9 +38,9 @@
 import static io.airlift.http.client.Request.Builder.prepareGet;
 import static io.airlift.json.JsonCodec.jsonCodec;
 import static io.airlift.units.Duration.nanosSince;
+import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
 
 @ThreadSafe
 public class RemoteNodeState
diff --git a/core/trino-main/src/main/java/io/trino/metadata/ResolvedFunction.java b/core/trino-main/src/main/java/io/trino/metadata/ResolvedFunction.java
index b79ab8b0a366..3672d9eefb86 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/ResolvedFunction.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/ResolvedFunction.java
@@ -25,9 +25,11 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
 import io.airlift.json.ObjectMapperProvider;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
+import io.trino.connector.system.GlobalSystemConnector;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.function.FunctionId;
 import io.trino.spi.function.FunctionKind;
 import io.trino.spi.function.FunctionNullability;
@@ -51,7 +53,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.io.BaseEncoding.base32Hex;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static java.lang.Math.toIntExact;
 import static java.nio.ByteBuffer.allocate;
 import static java.util.Locale.ENGLISH;
@@ -59,7 +61,6 @@
 
 public class ResolvedFunction
 {
-    private static final String PREFIX = "@";
     private final BoundSignature signature;
     private final CatalogHandle catalogHandle;
     private final FunctionId functionId;
@@ -76,7 +77,7 @@ public ResolvedFunction(
             @JsonProperty("id") FunctionId functionId,
             @JsonProperty("functionKind") FunctionKind functionKind,
             @JsonProperty("deterministic") boolean deterministic,
-            @JsonProperty("nullability") FunctionNullability functionNullability,
+            @JsonProperty("functionNullability") FunctionNullability functionNullability,
             @JsonProperty("typeDependencies") Map<TypeSignature, Type> typeDependencies,
             @JsonProperty("functionDependencies") Set<ResolvedFunction> functionDependencies)
     {
@@ -85,7 +86,7 @@ public ResolvedFunction(
         this.functionId = requireNonNull(functionId, "functionId is null");
         this.functionKind = requireNonNull(functionKind, "functionKind is null");
         this.deterministic = deterministic;
-        this.functionNullability = requireNonNull(functionNullability, "nullability is null");
+        this.functionNullability = requireNonNull(functionNullability, "functionNullability is null");
         this.typeDependencies = ImmutableMap.copyOf(requireNonNull(typeDependencies, "typeDependencies is null"));
         this.functionDependencies = ImmutableSet.copyOf(requireNonNull(functionDependencies, "functionDependencies is null"));
         checkArgument(functionNullability.getArgumentNullable().size() == signature.getArgumentTypes().size(), "signature and functionNullability must have same argument count");
@@ -141,23 +142,24 @@ public Set<ResolvedFunction> getFunctionDependencies()
 
     public static boolean isResolved(QualifiedName name)
     {
-        return name.getSuffix().startsWith(PREFIX);
+        return SerializedResolvedFunction.isSerializedResolvedFunction(name);
     }
 
     public QualifiedName toQualifiedName()
     {
-        return ResolvedFunctionDecoder.toQualifiedName(this);
+        CatalogSchemaFunctionName name = toCatalogSchemaFunctionName();
+        return QualifiedName.of(name.getCatalogName(), name.getSchemaName(), name.getFunctionName());
     }
 
-    public static String extractFunctionName(QualifiedName qualifiedName)
+    public CatalogSchemaFunctionName toCatalogSchemaFunctionName()
     {
-        String data = qualifiedName.getSuffix();
-        if (!data.startsWith(PREFIX)) {
-            return data;
-        }
-        List<String> parts = Splitter.on(PREFIX).splitToList(data.subSequence(1, data.length()));
-        checkArgument(parts.size() == 2, "Expected encoded resolved function to contain two parts: %s", qualifiedName);
-        return parts.get(0);
+        return ResolvedFunctionDecoder.toCatalogSchemaFunctionName(this);
+    }
+
+    public static CatalogSchemaFunctionName extractFunctionName(QualifiedName qualifiedName)
+    {
+        checkArgument(isResolved(qualifiedName), "Expected qualifiedName to be a resolved function: %s", qualifiedName);
+        return SerializedResolvedFunction.fromSerializedName(qualifiedName).functionName();
     }
 
     @Override
@@ -200,7 +202,7 @@ public static class ResolvedFunctionDecoder
         private final NonEvictableLoadingCache<QualifiedName, ResolvedFunction> resolvedFunctions = buildNonEvictableCache(
                 CacheBuilder.newBuilder().maximumSize(1024), CacheLoader.from(this::deserialize));
 
-        private static final NonEvictableLoadingCache<ResolvedFunction, QualifiedName> qualifiedNames = buildNonEvictableCache(
+        private static final NonEvictableLoadingCache<ResolvedFunction, CatalogSchemaFunctionName> qualifiedNames = buildNonEvictableCache(
                 CacheBuilder.newBuilder().maximumSize(1024), CacheLoader.from(ResolvedFunctionDecoder::serialize));
 
         private final JsonCodec<ResolvedFunction> jsonCodec;
@@ -216,40 +218,43 @@ Type.class, new TypeDeserializer(typeLoader),
             jsonCodec = new JsonCodecFactory(objectMapperProvider).jsonCodec(ResolvedFunction.class);
         }
 
+        public Optional<ResolvedFunction> fromCatalogSchemaFunctionName(CatalogSchemaFunctionName name)
+        {
+            return fromQualifiedName(QualifiedName.of(name.getCatalogName(), name.getSchemaName(), name.getFunctionName()));
+        }
+
         public Optional<ResolvedFunction> fromQualifiedName(QualifiedName qualifiedName)
         {
-            if (!qualifiedName.getSuffix().startsWith(PREFIX)) {
+            if (!isResolved(qualifiedName)) {
                 return Optional.empty();
             }
 
             return Optional.of(resolvedFunctions.getUnchecked(qualifiedName));
         }
 
-        public static QualifiedName toQualifiedName(ResolvedFunction function)
+        public static CatalogSchemaFunctionName toCatalogSchemaFunctionName(ResolvedFunction function)
         {
             return qualifiedNames.getUnchecked(function);
         }
 
         private ResolvedFunction deserialize(QualifiedName qualifiedName)
         {
-            String data = qualifiedName.getSuffix();
-            List<String> parts = Splitter.on(PREFIX).splitToList(data.substring(1));
-            checkArgument(parts.size() == 2, "Expected encoded resolved function to contain two parts: %s", qualifiedName);
-            String base32 = parts.get(1);
+            SerializedResolvedFunction serialized = SerializedResolvedFunction.fromSerializedName(qualifiedName);
             // name may have been lower cased, but base32 decoder requires upper case
-            base32 = base32.toUpperCase(ENGLISH);
+            String base32 = serialized.base32Data().toUpperCase(ENGLISH);
             byte[] compressed = base32Hex().decode(base32);
 
             ByteBuffer decompressed = allocate(toIntExact(ZstdDecompressor.getDecompressedSize(compressed, 0, compressed.length)));
             COMPRESSOR_DECOMPRESSOR.decompress(ByteBuffer.wrap(compressed), decompressed);
 
             ResolvedFunction resolvedFunction = jsonCodec.fromJson(Arrays.copyOf(decompressed.array(), decompressed.position()));
-            checkArgument(resolvedFunction.getSignature().getName().equalsIgnoreCase(parts.get(0)),
-                    "Expected decoded function to have name %s, but name is %s", resolvedFunction.getSignature().getName(), parts.get(0));
+            // name may have been lower cased, so we have to compare the string version
+            checkArgument(resolvedFunction.getSignature().getName().toString().equalsIgnoreCase(serialized.functionName().toString()),
+                    "Expected decoded function to have name %s, but name is %s", resolvedFunction.getSignature().getName(), serialized.functionName());
             return resolvedFunction;
         }
 
-        private static QualifiedName serialize(ResolvedFunction function)
+        private static CatalogSchemaFunctionName serialize(ResolvedFunction function)
         {
             // json can be large so use zstd to compress
             byte[] value = SERIALIZE_JSON_CODEC.toJsonBytes(function);
@@ -258,7 +263,55 @@ private static QualifiedName serialize(ResolvedFunction function)
             // names are case insensitive, so use base32 instead of base64
             String base32 = base32Hex().encode(compressed.array(), 0, compressed.position());
             // add name so expressions are still readable
-            return QualifiedName.of(PREFIX + function.signature.getName() + PREFIX + base32);
+            return new SerializedResolvedFunction(function.getSignature().getName(), base32).serialize();
+        }
+    }
+
+    private record SerializedResolvedFunction(CatalogSchemaFunctionName functionName, String base32Data)
+    {
+        private static final String PREFIX = "@";
+        private static final String SCHEMA = "$resolved";
+
+        public static boolean isSerializedResolvedFunction(QualifiedName name)
+        {
+            // a serialized resolved function must be fully qualified in the system.resolved schema
+            List<String> parts = name.getParts();
+            return parts.size() == 3 &&
+                    parts.get(0).equals(GlobalSystemConnector.NAME) &&
+                    parts.get(1).equals(SCHEMA);
+        }
+
+        public static boolean isSerializedResolvedFunction(CatalogSchemaFunctionName name)
+        {
+            return name.getCatalogName().equals(GlobalSystemConnector.NAME) && name.getSchemaName().equals(SCHEMA);
+        }
+
+        public static SerializedResolvedFunction fromSerializedName(QualifiedName qualifiedName)
+        {
+            checkArgument(isSerializedResolvedFunction(qualifiedName), "Expected qualifiedName to be a resolved function: %s", qualifiedName);
+
+            String data = qualifiedName.getSuffix();
+            List<String> parts = Splitter.on(PREFIX).splitToList(data);
+            checkArgument(parts.size() == 5 && parts.get(0).isEmpty(), "Invalid serialized resolved function: %s", qualifiedName);
+            return new SerializedResolvedFunction(
+                    new CatalogSchemaFunctionName(parts.get(1), parts.get(2), parts.get(3)),
+                    parts.get(4));
+        }
+
+        private SerializedResolvedFunction
+        {
+            requireNonNull(functionName, "functionName is null");
+            checkArgument(!isSerializedResolvedFunction(functionName), "function is already a serialized resolved function: %s", functionName);
+            requireNonNull(base32Data, "base32Data is null");
+        }
+
+        public CatalogSchemaFunctionName serialize()
+        {
+            String encodedName = PREFIX + functionName.getCatalogName() +
+                    PREFIX + functionName.getSchemaName() +
+                    PREFIX + functionName.getFunctionName() +
+                    PREFIX + base32Data;
+            return new CatalogSchemaFunctionName(GlobalSystemConnector.NAME, SCHEMA, encodedName);
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/SessionPropertyManager.java b/core/trino-main/src/main/java/io/trino/metadata/SessionPropertyManager.java
index 2f4bcd57217d..b88f332115f7 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/SessionPropertyManager.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/SessionPropertyManager.java
@@ -24,7 +24,7 @@
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.security.AccessControl;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.Block;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
@@ -41,8 +41,7 @@
 import io.trino.sql.tree.ExpressionTreeRewriter;
 import io.trino.sql.tree.NodeRef;
 import io.trino.sql.tree.Parameter;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Map;
@@ -221,9 +220,8 @@ public static Object evaluatePropertyValue(Expression expression, Type expectedT
         Object value = evaluateConstantExpression(rewritten, expectedType, plannerContext, session, accessControl, parameters);
 
         // convert to object value type of SQL type
-        BlockBuilder blockBuilder = expectedType.createBlockBuilder(null, 1);
-        writeNativeValue(expectedType, blockBuilder, value);
-        Object objectValue = expectedType.getObjectValue(session.toConnectorSession(), blockBuilder, 0);
+        Block block = writeNativeValue(expectedType, value);
+        Object objectValue = expectedType.getObjectValue(session.toConnectorSession(), block, 0);
 
         if (objectValue == null) {
             throw new TrinoException(INVALID_SESSION_PROPERTY, "Session property value must not be null");
diff --git a/core/trino-main/src/main/java/io/trino/metadata/SignatureBinder.java b/core/trino-main/src/main/java/io/trino/metadata/SignatureBinder.java
index 4c05c47d1451..e072ddc248c9 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/SignatureBinder.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/SignatureBinder.java
@@ -17,7 +17,6 @@
 import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import io.trino.Session;
 import io.trino.spi.TrinoException;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionId;
@@ -87,7 +86,6 @@ public class SignatureBinder
     // 4 is chosen arbitrarily here. This limit is set to avoid having infinite loops in iterative solving.
     private static final int SOLVE_ITERATION_LIMIT = 4;
 
-    private final Session session;
     private final Metadata metadata;
     private final TypeManager typeManager;
     private final TypeCoercion typeCoercion;
@@ -95,10 +93,10 @@ public class SignatureBinder
     private final boolean allowCoercion;
     private final Map<String, TypeVariableConstraint> typeVariableConstraints;
 
-    SignatureBinder(Session session, Metadata metadata, TypeManager typeManager, Signature declaredSignature, boolean allowCoercion)
+    // this could use the function resolver instead of Metadata, but Metadata caches coercion resolution
+    SignatureBinder(Metadata metadata, TypeManager typeManager, Signature declaredSignature, boolean allowCoercion)
     {
         checkNoLiteralVariableUsageAcrossTypes(declaredSignature);
-        this.session = requireNonNull(session, "session is null");
         this.metadata = requireNonNull(metadata, "metadata is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         this.typeCoercion = new TypeCoercion(typeManager::getType);
@@ -181,7 +179,6 @@ private static Signature applyBoundVariables(Signature signature, TypeVariables
         TypeSignature boundReturnTypeSignature = applyBoundVariables(signature.getReturnType(), typeVariables);
 
         return Signature.builder()
-                .name(signature.getName())
                 .returnType(boundReturnTypeSignature)
                 .argumentTypes(boundArgumentSignatures)
                 .build();
@@ -703,7 +700,7 @@ private boolean canCast(Type fromType, Type toType)
             }
         }
         try {
-            metadata.getCoercion(session, fromType, toType);
+            metadata.getCoercion(fromType, toType);
             return true;
         }
         catch (TrinoException e) {
diff --git a/core/trino-main/src/main/java/io/trino/metadata/SqlAggregationFunction.java b/core/trino-main/src/main/java/io/trino/metadata/SqlAggregationFunction.java
index b88677b25104..32a984d93248 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/SqlAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/SqlAggregationFunction.java
@@ -37,7 +37,7 @@ public static List<SqlAggregationFunction> createFunctionsByAnnotations(Class<?>
             return ImmutableList.copyOf(AggregationFromAnnotationsParser.parseFunctionDefinitions(aggregationDefinition));
         }
         catch (RuntimeException e) {
-            throw new IllegalArgumentException("Invalid aggregation class " + aggregationDefinition.getSimpleName());
+            throw new IllegalArgumentException("Invalid aggregation class " + aggregationDefinition.getSimpleName(), e);
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/metadata/SystemFunctionBundle.java b/core/trino-main/src/main/java/io/trino/metadata/SystemFunctionBundle.java
index 437fd700bdc8..06b67b389a27 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/SystemFunctionBundle.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/SystemFunctionBundle.java
@@ -99,7 +99,9 @@
 import io.trino.operator.scalar.ArrayExceptFunction;
 import io.trino.operator.scalar.ArrayFilterFunction;
 import io.trino.operator.scalar.ArrayFunctions;
+import io.trino.operator.scalar.ArrayHistogramFunction;
 import io.trino.operator.scalar.ArrayIntersectFunction;
+import io.trino.operator.scalar.ArrayJoin;
 import io.trino.operator.scalar.ArrayMaxFunction;
 import io.trino.operator.scalar.ArrayMinFunction;
 import io.trino.operator.scalar.ArrayNgramsFunction;
@@ -133,6 +135,7 @@
 import io.trino.operator.scalar.GenericIndeterminateOperator;
 import io.trino.operator.scalar.GenericLessThanOperator;
 import io.trino.operator.scalar.GenericLessThanOrEqualOperator;
+import io.trino.operator.scalar.GenericReadValueOperator;
 import io.trino.operator.scalar.GenericXxHash64Operator;
 import io.trino.operator.scalar.HmacFunctions;
 import io.trino.operator.scalar.HyperLogLogFunctions;
@@ -275,8 +278,6 @@
 import static io.trino.operator.scalar.ArrayConcatFunction.ARRAY_CONCAT_FUNCTION;
 import static io.trino.operator.scalar.ArrayConstructor.ARRAY_CONSTRUCTOR;
 import static io.trino.operator.scalar.ArrayFlattenFunction.ARRAY_FLATTEN_FUNCTION;
-import static io.trino.operator.scalar.ArrayJoin.ARRAY_JOIN;
-import static io.trino.operator.scalar.ArrayJoin.ARRAY_JOIN_WITH_NULL_REPLACEMENT;
 import static io.trino.operator.scalar.ArrayReduceFunction.ARRAY_REDUCE_FUNCTION;
 import static io.trino.operator.scalar.ArraySubscriptOperator.ARRAY_SUBSCRIPT;
 import static io.trino.operator.scalar.ArrayToElementConcatFunction.ARRAY_TO_ELEMENT_CONCAT_FUNCTION;
@@ -515,7 +516,7 @@ public static FunctionBundle create(FeaturesConfig featuresConfig, TypeOperators
                 .scalar(DynamicFilters.NullableFunction.class)
                 .functions(ZIP_WITH_FUNCTION, MAP_ZIP_WITH_FUNCTION)
                 .functions(ZIP_FUNCTIONS)
-                .functions(ARRAY_JOIN, ARRAY_JOIN_WITH_NULL_REPLACEMENT)
+                .scalars(ArrayJoin.class)
                 .scalar(ArrayToArrayCast.class)
                 .functions(ARRAY_TO_ELEMENT_CONCAT_FUNCTION, ELEMENT_TO_ARRAY_CONCAT_FUNCTION)
                 .function(MAP_ELEMENT_AT)
@@ -568,6 +569,7 @@ public static FunctionBundle create(FeaturesConfig featuresConfig, TypeOperators
                 .functions(MAP_FILTER_FUNCTION, new MapTransformKeysFunction(blockTypeOperators), MAP_TRANSFORM_VALUES_FUNCTION)
                 .function(FORMAT_FUNCTION)
                 .function(TRY_CAST)
+                .function(new GenericReadValueOperator(typeOperators))
                 .function(new GenericEqualOperator(typeOperators))
                 .function(new GenericHashCodeOperator(typeOperators))
                 .function(new GenericXxHash64Operator(typeOperators))
@@ -584,7 +586,8 @@ public static FunctionBundle create(FeaturesConfig featuresConfig, TypeOperators
                 .scalars(SetDigestOperators.class)
                 .scalars(WilsonInterval.class)
                 .aggregates(BigintApproximateMostFrequent.class)
-                .aggregates(VarcharApproximateMostFrequent.class);
+                .aggregates(VarcharApproximateMostFrequent.class)
+                .scalar(ArrayHistogramFunction.class);
 
         // timestamp operators and functions
         builder
diff --git a/core/trino-main/src/main/java/io/trino/metadata/SystemSecurityMetadata.java b/core/trino-main/src/main/java/io/trino/metadata/SystemSecurityMetadata.java
index 7faa8d06d795..8318cd17b12f 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/SystemSecurityMetadata.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/SystemSecurityMetadata.java
@@ -16,6 +16,7 @@
 import io.trino.Session;
 import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.security.GrantInfo;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
@@ -138,6 +139,11 @@ public interface SystemSecurityMetadata
      */
     void setViewOwner(Session session, CatalogSchemaTableName view, TrinoPrincipal principal);
 
+    /**
+     * Get the identity to run the function as
+     */
+    Optional<Identity> getFunctionRunAsIdentity(Session session, CatalogSchemaFunctionName functionName);
+
     /**
      * A schema was created
      */
@@ -167,4 +173,19 @@ public interface SystemSecurityMetadata
      * A table or view was dropped
      */
     void tableDropped(Session session, CatalogSchemaTableName table);
+
+    /**
+     * A column was created
+     */
+    void columnCreated(Session session, CatalogSchemaTableName table, String column);
+
+    /**
+     * A column was renamed
+     */
+    void columnRenamed(Session session, CatalogSchemaTableName table, String oldName, String newName);
+
+    /**
+     * A column was dropped
+     */
+    void columnDropped(Session session, CatalogSchemaTableName table, String column);
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/TableFunctionHandle.java b/core/trino-main/src/main/java/io/trino/metadata/TableFunctionHandle.java
index 6d2885f7d69f..6f6865ab762c 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/TableFunctionHandle.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/TableFunctionHandle.java
@@ -17,27 +17,23 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.function.SchemaFunctionName;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 
 import static java.util.Objects.requireNonNull;
 
 public class TableFunctionHandle
 {
     private final CatalogHandle catalogHandle;
-    private final SchemaFunctionName schemaFunctionName;
     private final ConnectorTableFunctionHandle functionHandle;
     private final ConnectorTransactionHandle transactionHandle;
 
     @JsonCreator
     public TableFunctionHandle(
             @JsonProperty("catalogHandle") CatalogHandle catalogHandle,
-            @JsonProperty("schemaFunctionName") SchemaFunctionName schemaFunctionName,
             @JsonProperty("functionHandle") ConnectorTableFunctionHandle functionHandle,
             @JsonProperty("transactionHandle") ConnectorTransactionHandle transactionHandle)
     {
         this.catalogHandle = requireNonNull(catalogHandle, "catalogHandle is null");
-        this.schemaFunctionName = requireNonNull(schemaFunctionName, "schemaFunctionName is null");
         this.functionHandle = requireNonNull(functionHandle, "functionHandle is null");
         this.transactionHandle = requireNonNull(transactionHandle, "transactionHandle is null");
     }
@@ -48,12 +44,6 @@ public CatalogHandle getCatalogHandle()
         return catalogHandle;
     }
 
-    @JsonProperty
-    public SchemaFunctionName getSchemaFunctionName()
-    {
-        return schemaFunctionName;
-    }
-
     @JsonProperty
     public ConnectorTableFunctionHandle getFunctionHandle()
     {
diff --git a/core/trino-main/src/main/java/io/trino/metadata/TableFunctionMetadata.java b/core/trino-main/src/main/java/io/trino/metadata/TableFunctionMetadata.java
index 0469ae6a8bb9..dfef7d239fd1 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/TableFunctionMetadata.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/TableFunctionMetadata.java
@@ -14,7 +14,7 @@
 package io.trino.metadata;
 
 import io.trino.spi.connector.CatalogHandle;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-main/src/main/java/io/trino/metadata/TableFunctionRegistry.java b/core/trino-main/src/main/java/io/trino/metadata/TableFunctionRegistry.java
index 07dd87c44539..f1b00ca6d0b3 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/TableFunctionRegistry.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/TableFunctionRegistry.java
@@ -13,13 +13,12 @@
  */
 package io.trino.metadata;
 
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.function.SchemaFunctionName;
-import io.trino.spi.ptf.ConnectorTableFunction;
-
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
+import io.trino.spi.function.table.ConnectorTableFunction;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/metadata/TableProceduresRegistry.java b/core/trino-main/src/main/java/io/trino/metadata/TableProceduresRegistry.java
index 3805d0b05076..fb48ce3c958e 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/TableProceduresRegistry.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/TableProceduresRegistry.java
@@ -13,12 +13,11 @@
  */
 package io.trino.metadata;
 
+import com.google.inject.Inject;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.TableProcedureMetadata;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 public class TableProceduresRegistry
diff --git a/core/trino-main/src/main/java/io/trino/metadata/TableProperties.java b/core/trino-main/src/main/java/io/trino/metadata/TableProperties.java
index 4e8b12ab4431..2bca714eb7db 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/TableProperties.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/TableProperties.java
@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 
 import static java.util.Objects.requireNonNull;
 
@@ -65,12 +64,8 @@ public Optional<TablePartitioning> getTablePartitioning()
                                 Optional.of(catalogHandle),
                                 Optional.of(transaction),
                                 nodePartitioning.getPartitioningHandle()),
-                        nodePartitioning.getPartitioningColumns()));
-    }
-
-    public Optional<Set<ColumnHandle>> getStreamPartitioningColumns()
-    {
-        return tableProperties.getStreamPartitioningColumns();
+                        nodePartitioning.getPartitioningColumns(),
+                        nodePartitioning.isSingleSplitPerPartition()));
     }
 
     public Optional<DiscretePredicates> getDiscretePredicates()
@@ -82,11 +77,13 @@ public static class TablePartitioning
     {
         private final PartitioningHandle partitioningHandle;
         private final List<ColumnHandle> partitioningColumns;
+        private final boolean singleSplitPerPartition;
 
-        public TablePartitioning(PartitioningHandle partitioningHandle, List<ColumnHandle> partitioningColumns)
+        public TablePartitioning(PartitioningHandle partitioningHandle, List<ColumnHandle> partitioningColumns, boolean singleSplitPerPartition)
         {
             this.partitioningHandle = requireNonNull(partitioningHandle, "partitioningHandle is null");
             this.partitioningColumns = ImmutableList.copyOf(requireNonNull(partitioningColumns, "partitioningColumns is null"));
+            this.singleSplitPerPartition = singleSplitPerPartition;
         }
 
         public PartitioningHandle getPartitioningHandle()
@@ -99,6 +96,11 @@ public List<ColumnHandle> getPartitioningColumns()
             return partitioningColumns;
         }
 
+        public boolean isSingleSplitPerPartition()
+        {
+            return singleSplitPerPartition;
+        }
+
         @Override
         public boolean equals(Object o)
         {
@@ -109,14 +111,15 @@ public boolean equals(Object o)
                 return false;
             }
             TablePartitioning that = (TablePartitioning) o;
-            return Objects.equals(partitioningHandle, that.partitioningHandle) &&
+            return singleSplitPerPartition == that.singleSplitPerPartition &&
+                    Objects.equals(partitioningHandle, that.partitioningHandle) &&
                     Objects.equals(partitioningColumns, that.partitioningColumns);
         }
 
         @Override
         public int hashCode()
         {
-            return Objects.hash(partitioningHandle, partitioningColumns);
+            return Objects.hash(partitioningHandle, partitioningColumns, singleSplitPerPartition);
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/TypeRegistry.java b/core/trino-main/src/main/java/io/trino/metadata/TypeRegistry.java
index f2325a01b7b9..4d6f1f9708b7 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/TypeRegistry.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/TypeRegistry.java
@@ -19,8 +19,10 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multimap;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.trino.FeaturesConfig;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 import io.trino.spi.function.OperatorType;
 import io.trino.spi.type.ParametricType;
 import io.trino.spi.type.Type;
@@ -37,9 +39,6 @@
 import io.trino.type.Re2JRegexpType;
 import io.trino.type.VarcharParametricType;
 
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -52,8 +51,8 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
diff --git a/core/trino-main/src/main/java/io/trino/metadata/ViewDefinition.java b/core/trino-main/src/main/java/io/trino/metadata/ViewDefinition.java
index 025f4883c893..413c46f024f5 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/ViewDefinition.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/ViewDefinition.java
@@ -13,7 +13,7 @@
  */
 package io.trino.metadata;
 
-import io.trino.spi.TrinoException;
+import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.ConnectorViewDefinition;
 import io.trino.spi.security.Identity;
 
@@ -23,7 +23,6 @@
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.spi.StandardErrorCode.INVALID_VIEW;
 import static java.util.Objects.requireNonNull;
 
 public class ViewDefinition
@@ -34,6 +33,7 @@ public class ViewDefinition
     private final List<ViewColumn> columns;
     private final Optional<String> comment;
     private final Optional<Identity> runAsIdentity;
+    private final List<CatalogSchemaName> path;
 
     public ViewDefinition(
             String originalSql,
@@ -41,7 +41,8 @@ public ViewDefinition(
             Optional<String> schema,
             List<ViewColumn> columns,
             Optional<String> comment,
-            Optional<Identity> runAsIdentity)
+            Optional<Identity> runAsIdentity,
+            List<CatalogSchemaName> path)
     {
         this.originalSql = requireNonNull(originalSql, "originalSql is null");
         this.catalog = requireNonNull(catalog, "catalog is null");
@@ -49,39 +50,11 @@ public ViewDefinition(
         this.columns = List.copyOf(requireNonNull(columns, "columns is null"));
         this.comment = requireNonNull(comment, "comment is null");
         this.runAsIdentity = requireNonNull(runAsIdentity, "runAsIdentity is null");
+        this.path = requireNonNull(path, "path is null");
         checkArgument(schema.isEmpty() || catalog.isPresent(), "catalog must be present if schema is present");
         checkArgument(!columns.isEmpty(), "columns list is empty");
     }
 
-    public ViewDefinition(QualifiedObjectName viewName, ConnectorViewDefinition view)
-    {
-        this(viewName, view, view.getOwner().map(Identity::ofUser));
-    }
-
-    public ViewDefinition(QualifiedObjectName viewName, ConnectorViewDefinition view, Identity runAsIdentityOverride)
-    {
-        this(viewName, view, Optional.of(runAsIdentityOverride));
-    }
-
-    private ViewDefinition(QualifiedObjectName viewName, ConnectorViewDefinition view, Optional<Identity> runAsIdentity)
-    {
-        requireNonNull(view, "view is null");
-        this.originalSql = view.getOriginalSql();
-        this.catalog = view.getCatalog();
-        this.schema = view.getSchema();
-        this.columns = view.getColumns().stream()
-                .map(column -> new ViewColumn(column.getName(), column.getType(), column.getComment()))
-                .collect(toImmutableList());
-        this.comment = view.getComment();
-        this.runAsIdentity = runAsIdentity;
-        if (view.isRunAsInvoker() && runAsIdentity.isPresent()) {
-            throw new TrinoException(INVALID_VIEW, "Run-as identity cannot be set for a run-as invoker view: " + viewName);
-        }
-        if (!view.isRunAsInvoker() && runAsIdentity.isEmpty()) {
-            throw new TrinoException(INVALID_VIEW, "Run-as identity must be set for a run-as definer view: " + viewName);
-        }
-    }
-
     public String getOriginalSql()
     {
         return originalSql;
@@ -117,6 +90,11 @@ public Optional<Identity> getRunAsIdentity()
         return runAsIdentity;
     }
 
+    public List<CatalogSchemaName> getPath()
+    {
+        return path;
+    }
+
     public ConnectorViewDefinition toConnectorViewDefinition()
     {
         return new ConnectorViewDefinition(
@@ -128,7 +106,8 @@ public ConnectorViewDefinition toConnectorViewDefinition()
                         .collect(toImmutableList()),
                 comment,
                 runAsIdentity.map(Identity::getUser),
-                runAsIdentity.isEmpty());
+                runAsIdentity.isEmpty(),
+                path);
     }
 
     @Override
@@ -141,6 +120,7 @@ public String toString()
                 .add("columns", columns)
                 .add("comment", comment.orElse(null))
                 .add("runAsIdentity", runAsIdentity.orElse(null))
+                .add("path", path)
                 .toString();
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/ViewInfo.java b/core/trino-main/src/main/java/io/trino/metadata/ViewInfo.java
index 91e2755585f2..9706820b5a4d 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/ViewInfo.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/ViewInfo.java
@@ -44,7 +44,7 @@ public ViewInfo(ConnectorMaterializedViewDefinition viewDefinition)
     {
         this.originalSql = viewDefinition.getOriginalSql();
         this.columns = viewDefinition.getColumns().stream()
-                .map(column -> new ViewColumn(column.getName(), column.getType(), Optional.empty()))
+                .map(column -> new ViewColumn(column.getName(), column.getType(), column.getComment()))
                 .collect(toImmutableList());
         this.comment = viewDefinition.getComment();
         this.storageTable = viewDefinition.getStorageTable();
diff --git a/core/trino-main/src/main/java/io/trino/metadata/WorkerLanguageFunctionProvider.java b/core/trino-main/src/main/java/io/trino/metadata/WorkerLanguageFunctionProvider.java
new file mode 100644
index 000000000000..bd46c6f79d23
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/metadata/WorkerLanguageFunctionProvider.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed 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 io.trino.metadata;
+
+import io.trino.execution.TaskId;
+import io.trino.operator.scalar.SpecializedSqlScalarFunction;
+import io.trino.spi.function.FunctionDependencies;
+import io.trino.spi.function.InvocationConvention;
+import io.trino.spi.function.ScalarFunctionImplementation;
+import io.trino.sql.routine.SqlRoutineCompiler;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+
+public class WorkerLanguageFunctionProvider
+        implements LanguageFunctionProvider
+{
+    private final Map<TaskId, Map<ResolvedFunction, LanguageScalarFunctionData>> queryFunctions = new ConcurrentHashMap<>();
+
+    @Override
+    public void registerTask(TaskId taskId, List<LanguageScalarFunctionData> functions)
+    {
+        queryFunctions.computeIfAbsent(taskId, ignored -> functions.stream().collect(toImmutableMap(LanguageScalarFunctionData::resolvedFunction, Function.identity())));
+    }
+
+    @Override
+    public void unregisterTask(TaskId taskId)
+    {
+        queryFunctions.remove(taskId);
+    }
+
+    @Override
+    public ScalarFunctionImplementation specialize(FunctionManager functionManager, ResolvedFunction resolvedFunction, FunctionDependencies functionDependencies, InvocationConvention invocationConvention)
+    {
+        LanguageScalarFunctionData functionData = queryFunctions.values().stream()
+                .map(queryFunctions -> queryFunctions.get(resolvedFunction))
+                .filter(Objects::nonNull)
+                .findFirst()
+                .orElseThrow(() -> new IllegalStateException("Unknown function implementation: " + resolvedFunction.getFunctionId()));
+
+        // Recompile every time this function is called as the function dependencies may have changed.
+        // The caller caches, so this should not be a problem.
+        // TODO: compiler should use function dependencies instead of function manager
+        SpecializedSqlScalarFunction function = new SqlRoutineCompiler(functionManager).compile(functionData.routine());
+        return function.getScalarFunctionImplementation(invocationConvention);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/AssignUniqueIdOperator.java b/core/trino-main/src/main/java/io/trino/operator/AssignUniqueIdOperator.java
index 6bc2835ba442..d098c545988c 100644
--- a/core/trino-main/src/main/java/io/trino/operator/AssignUniqueIdOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/AssignUniqueIdOperator.java
@@ -20,8 +20,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.sql.planner.plan.PlanNodeId;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.concurrent.atomic.AtomicLong;
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/BigintGroupByHash.java b/core/trino-main/src/main/java/io/trino/operator/BigintGroupByHash.java
index da215bab3051..ae783452f07e 100644
--- a/core/trino-main/src/main/java/io/trino/operator/BigintGroupByHash.java
+++ b/core/trino-main/src/main/java/io/trino/operator/BigintGroupByHash.java
@@ -14,22 +14,17 @@
 package io.trino.operator;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.DictionaryBlock;
-import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.AbstractLongType;
 import io.trino.spi.type.BigintType;
-import io.trino.spi.type.Type;
 
 import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
@@ -52,10 +47,7 @@ public class BigintGroupByHash
     private static final int BATCH_SIZE = 1024;
 
     private static final float FILL_RATIO = 0.75f;
-    private static final List<Type> TYPES = ImmutableList.of(BIGINT);
-    private static final List<Type> TYPES_WITH_RAW_HASH = ImmutableList.of(BIGINT, BIGINT);
 
-    private final int hashChannel;
     private final boolean outputRawHash;
 
     private int hashCapacity;
@@ -80,12 +72,10 @@ public class BigintGroupByHash
     private long preallocatedMemoryInBytes;
     private long currentPageSizeInBytes;
 
-    public BigintGroupByHash(int hashChannel, boolean outputRawHash, int expectedSize, UpdateMemory updateMemory)
+    public BigintGroupByHash(boolean outputRawHash, int expectedSize, UpdateMemory updateMemory)
     {
-        checkArgument(hashChannel >= 0, "hashChannel must be at least zero");
         checkArgument(expectedSize > 0, "expectedSize must be greater than zero");
 
-        this.hashChannel = hashChannel;
         this.outputRawHash = outputRawHash;
 
         hashCapacity = arraySize(expectedSize, FILL_RATIO);
@@ -113,12 +103,6 @@ public long getEstimatedSize()
                 preallocatedMemoryInBytes;
     }
 
-    @Override
-    public List<Type> getTypes()
-    {
-        return outputRawHash ? TYPES_WITH_RAW_HASH : TYPES;
-    }
-
     @Override
     public int getGroupCount()
     {
@@ -152,7 +136,7 @@ public void appendValuesTo(int groupId, PageBuilder pageBuilder)
     public Work<?> addPage(Page page)
     {
         currentPageSizeInBytes = page.getRetainedSizeInBytes();
-        Block block = page.getBlock(hashChannel);
+        Block block = page.getBlock(0);
         if (block instanceof RunLengthEncodedBlock rleBlock) {
             return new AddRunLengthEncodedPageWork(rleBlock);
         }
@@ -164,10 +148,10 @@ public Work<?> addPage(Page page)
     }
 
     @Override
-    public Work<GroupByIdBlock> getGroupIds(Page page)
+    public Work<int[]> getGroupIds(Page page)
     {
         currentPageSizeInBytes = page.getRetainedSizeInBytes();
-        Block block = page.getBlock(hashChannel);
+        Block block = page.getBlock(0);
         if (block instanceof RunLengthEncodedBlock rleBlock) {
             return new GetRunLengthEncodedGroupIdsWork(rleBlock);
         }
@@ -178,32 +162,6 @@ public Work<GroupByIdBlock> getGroupIds(Page page)
         return new GetGroupIdsWork(block);
     }
 
-    @Override
-    public boolean contains(int position, Page page, int[] hashChannels)
-    {
-        Block block = page.getBlock(hashChannel);
-        if (block.isNull(position)) {
-            return nullGroupId >= 0;
-        }
-
-        long value = BIGINT.getLong(block, position);
-        int hashPosition = getHashPosition(value, mask);
-
-        // look for an empty slot or a slot containing this key
-        while (true) {
-            int groupId = groupIds[hashPosition];
-            if (groupId == -1) {
-                return false;
-            }
-            if (value == values[hashPosition]) {
-                return true;
-            }
-
-            // increment position and mask to handle wrap around
-            hashPosition = (hashPosition + 1) & mask;
-        }
-    }
-
     @Override
     public long getRawHash(int groupId)
     {
@@ -490,9 +448,9 @@ public Void getResult()
 
     @VisibleForTesting
     class GetGroupIdsWork
-            implements Work<GroupByIdBlock>
+            implements Work<int[]>
     {
-        private final long[] groupIds;
+        private final int[] groupIds;
         private final Block block;
 
         private boolean finished;
@@ -501,7 +459,7 @@ class GetGroupIdsWork
         public GetGroupIdsWork(Block block)
         {
             this.block = requireNonNull(block, "block is null");
-            this.groupIds = new long[block.getPositionCount()];
+            this.groupIds = new int[block.getPositionCount()];
         }
 
         @Override
@@ -532,20 +490,20 @@ public boolean process()
         }
 
         @Override
-        public GroupByIdBlock getResult()
+        public int[] getResult()
         {
             checkState(lastPosition == block.getPositionCount(), "process has not yet finished");
             checkState(!finished, "result has produced");
             finished = true;
-            return new GroupByIdBlock(nextGroupId, new LongArrayBlock(block.getPositionCount(), Optional.empty(), groupIds));
+            return groupIds;
         }
     }
 
     @VisibleForTesting
     class GetDictionaryGroupIdsWork
-            implements Work<GroupByIdBlock>
+            implements Work<int[]>
     {
-        private final long[] groupIds;
+        private final int[] groupIds;
         private final Block dictionary;
         private final DictionaryBlock block;
 
@@ -558,7 +516,7 @@ public GetDictionaryGroupIdsWork(DictionaryBlock block)
             this.dictionary = block.getDictionary();
             updateDictionaryLookBack(dictionary);
 
-            this.groupIds = new long[block.getPositionCount()];
+            this.groupIds = new int[block.getPositionCount()];
         }
 
         @Override
@@ -586,18 +544,18 @@ public boolean process()
         }
 
         @Override
-        public GroupByIdBlock getResult()
+        public int[] getResult()
         {
             checkState(lastPosition == block.getPositionCount(), "process has not yet finished");
             checkState(!finished, "result has produced");
             finished = true;
-            return new GroupByIdBlock(nextGroupId, new LongArrayBlock(block.getPositionCount(), Optional.empty(), groupIds));
+            return groupIds;
         }
     }
 
     @VisibleForTesting
     class GetRunLengthEncodedGroupIdsWork
-            implements Work<GroupByIdBlock>
+            implements Work<int[]>
     {
         private final RunLengthEncodedBlock block;
 
@@ -632,17 +590,15 @@ public boolean process()
         }
 
         @Override
-        public GroupByIdBlock getResult()
+        public int[] getResult()
         {
             checkState(processFinished);
             checkState(!resultProduced);
             resultProduced = true;
 
-            return new GroupByIdBlock(
-                    nextGroupId,
-                    RunLengthEncodedBlock.create(
-                            BIGINT.createFixedSizeBlockBuilder(1).writeLong(groupId).build(),
-                            block.getPositionCount()));
+            int[] result = new int[block.getPositionCount()];
+            Arrays.fill(result, groupId);
+            return result;
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/BucketPartitionFunction.java b/core/trino-main/src/main/java/io/trino/operator/BucketPartitionFunction.java
index bd5ba587f35b..37676c4f9ebc 100644
--- a/core/trino-main/src/main/java/io/trino/operator/BucketPartitionFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/BucketPartitionFunction.java
@@ -35,7 +35,7 @@ public BucketPartitionFunction(BucketFunction bucketFunction, int[] bucketToPart
     }
 
     @Override
-    public int getPartitionCount()
+    public int partitionCount()
     {
         return partitionCount;
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/ChangeOnlyUpdatedColumnsMergeProcessor.java b/core/trino-main/src/main/java/io/trino/operator/ChangeOnlyUpdatedColumnsMergeProcessor.java
index c73317485108..4d93857d78a5 100644
--- a/core/trino-main/src/main/java/io/trino/operator/ChangeOnlyUpdatedColumnsMergeProcessor.java
+++ b/core/trino-main/src/main/java/io/trino/operator/ChangeOnlyUpdatedColumnsMergeProcessor.java
@@ -15,14 +15,13 @@
 
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.ColumnarRow;
 import io.trino.spi.block.RunLengthEncodedBlock;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
+import static io.trino.spi.block.RowBlock.getRowFieldsFromBlock;
 import static io.trino.spi.predicate.Utils.nativeValueToBlock;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static java.util.Objects.requireNonNull;
@@ -64,20 +63,21 @@ public Page transformPage(Page inputPage)
         int inputChannelCount = inputPage.getChannelCount();
         checkArgument(inputChannelCount >= 2 + writeRedistributionColumnCount, "inputPage channelCount (%s) should be >= 2 + %s", inputChannelCount, writeRedistributionColumnCount);
         int positionCount = inputPage.getPositionCount();
-        // TODO: Check with Karol to see if we can get empty pages
         checkArgument(positionCount > 0, "positionCount should be > 0, but is %s", positionCount);
 
-        ColumnarRow mergeRow = toColumnarRow(inputPage.getBlock(mergeRowChannel));
-        checkArgument(!mergeRow.mayHaveNull(), "The mergeRow may not have null rows");
-
-        // We've verified that the mergeRow block has no null rows, so it's okay to get the field blocks
+        Block mergeRow = inputPage.getBlock(mergeRowChannel).getLoadedBlock();
+        if (mergeRow.mayHaveNull()) {
+            for (int position = 0; position < positionCount; position++) {
+                checkArgument(!mergeRow.isNull(position), "The mergeRow may not have null rows");
+            }
+        }
 
+        List<Block> fields = getRowFieldsFromBlock(mergeRow);
         List<Block> builder = new ArrayList<>(dataColumnChannels.size() + 3);
-
         for (int channel : dataColumnChannels) {
-            builder.add(mergeRow.getField(channel));
+            builder.add(fields.get(channel));
         }
-        Block operationChannelBlock = mergeRow.getField(mergeRow.getFieldCount() - 2);
+        Block operationChannelBlock = fields.get(fields.size() - 2);
         builder.add(operationChannelBlock);
         builder.add(inputPage.getBlock(rowIdChannel));
         builder.add(RunLengthEncodedBlock.create(INSERT_FROM_UPDATE_BLOCK, positionCount));
@@ -86,7 +86,7 @@ public Page transformPage(Page inputPage)
 
         int defaultCaseCount = 0;
         for (int position = 0; position < positionCount; position++) {
-            if (TINYINT.getLong(operationChannelBlock, position) == DEFAULT_CASE_OPERATION_NUMBER) {
+            if (TINYINT.getByte(operationChannelBlock, position) == DEFAULT_CASE_OPERATION_NUMBER) {
                 defaultCaseCount++;
             }
         }
@@ -97,7 +97,7 @@ public Page transformPage(Page inputPage)
         int usedCases = 0;
         int[] positions = new int[positionCount - defaultCaseCount];
         for (int position = 0; position < positionCount; position++) {
-            if (TINYINT.getLong(operationChannelBlock, position) != DEFAULT_CASE_OPERATION_NUMBER) {
+            if (TINYINT.getByte(operationChannelBlock, position) != DEFAULT_CASE_OPERATION_NUMBER) {
                 positions[usedCases] = position;
                 usedCases++;
             }
diff --git a/core/trino-main/src/main/java/io/trino/operator/ChannelSet.java b/core/trino-main/src/main/java/io/trino/operator/ChannelSet.java
index 4b3fa88da142..dde56ee4ef20 100644
--- a/core/trino-main/src/main/java/io/trino/operator/ChannelSet.java
+++ b/core/trino-main/src/main/java/io/trino/operator/ChannelSet.java
@@ -13,47 +13,37 @@
  */
 package io.trino.operator;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
 import io.trino.memory.context.LocalMemoryContext;
-import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.Type;
-import io.trino.sql.gen.JoinCompiler;
-import io.trino.type.BlockTypeOperators;
-
-import java.util.List;
-import java.util.Optional;
-
-import static io.trino.operator.GroupByHash.createGroupByHash;
-import static io.trino.type.UnknownType.UNKNOWN;
+import io.trino.spi.type.TypeOperators;
+
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
+import static io.trino.spi.function.InvocationConvention.simpleConvention;
+import static io.trino.spi.type.BigintType.BIGINT;
 import static java.util.Objects.requireNonNull;
 
 public class ChannelSet
 {
-    private final GroupByHash hash;
-    private final boolean containsNull;
-    private final int[] hashChannels;
-
-    public ChannelSet(GroupByHash hash, boolean containsNull, int[] hashChannels)
-    {
-        this.hash = hash;
-        this.containsNull = containsNull;
-        this.hashChannels = hashChannels;
-    }
+    private final FlatSet set;
 
-    public Type getType()
+    private ChannelSet(FlatSet set)
     {
-        return hash.getTypes().get(0);
+        this.set = set;
     }
 
     public long getEstimatedSizeInBytes()
     {
-        return hash.getEstimatedSize();
+        return set.getEstimatedSize();
     }
 
     public int size()
     {
-        return hash.getGroupCount();
+        return set.size();
     }
 
     public boolean isEmpty()
@@ -63,79 +53,67 @@ public boolean isEmpty()
 
     public boolean containsNull()
     {
-        return containsNull;
+        return set.containsNull();
     }
 
-    public boolean contains(int position, Page page)
+    public boolean contains(Block valueBlock, int position)
     {
-        return hash.contains(position, page, hashChannels);
+        return set.contains(valueBlock, position);
     }
 
-    public boolean contains(int position, Page page, long rawHash)
+    public boolean contains(Block valueBlock, int position, long rawHash)
     {
-        return hash.contains(position, page, hashChannels, rawHash);
+        return set.contains(valueBlock, position, rawHash);
     }
 
     public static class ChannelSetBuilder
     {
-        private static final int[] HASH_CHANNELS = {0};
+        private final LocalMemoryContext memoryContext;
+        private final FlatSet set;
 
-        private final GroupByHash hash;
-        private final Page nullBlockPage;
-        private final OperatorContext operatorContext;
-        private final LocalMemoryContext localMemoryContext;
-
-        public ChannelSetBuilder(Type type, Optional<Integer> hashChannel, int expectedPositions, OperatorContext operatorContext, JoinCompiler joinCompiler, BlockTypeOperators blockTypeOperators)
+        public ChannelSetBuilder(Type type, TypeOperators typeOperators, LocalMemoryContext memoryContext)
         {
-            List<Type> types = ImmutableList.of(type);
-            this.hash = createGroupByHash(
-                    operatorContext.getSession(),
-                    types,
-                    HASH_CHANNELS,
-                    hashChannel,
-                    expectedPositions,
-                    joinCompiler,
-                    blockTypeOperators,
-                    this::updateMemoryReservation);
-            this.nullBlockPage = new Page(type.createBlockBuilder(null, 1, UNKNOWN.getFixedSize()).appendNull().build());
-            this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
-            this.localMemoryContext = operatorContext.localUserMemoryContext();
+            set = new FlatSet(
+                    type,
+                    typeOperators.getReadValueOperator(type, simpleConvention(FLAT_RETURN, BLOCK_POSITION_NOT_NULL)),
+                    typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, FLAT)),
+                    typeOperators.getDistinctFromOperator(type, simpleConvention(FAIL_ON_NULL, FLAT, BLOCK_POSITION_NOT_NULL)),
+                    typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)));
+            this.memoryContext = requireNonNull(memoryContext, "memoryContext is null");
+            this.memoryContext.setBytes(set.getEstimatedSize());
         }
 
         public ChannelSet build()
         {
-            return new ChannelSet(hash, hash.contains(0, nullBlockPage, HASH_CHANNELS), HASH_CHANNELS);
-        }
-
-        public long getEstimatedSize()
-        {
-            return hash.getEstimatedSize();
-        }
-
-        public int size()
-        {
-            return hash.getGroupCount();
-        }
-
-        public Work<?> addPage(Page page)
-        {
-            // Just add the page to the pending work, which will be processed later.
-            return hash.addPage(page);
-        }
-
-        public boolean updateMemoryReservation()
-        {
-            // If memory is not available, once we return, this operator will be blocked until memory is available.
-            localMemoryContext.setBytes(hash.getEstimatedSize());
-
-            // If memory is not available, inform the caller that we cannot proceed for allocation.
-            return operatorContext.isWaitingForMemory().isDone();
+            return new ChannelSet(set);
         }
 
-        @VisibleForTesting
-        public int getCapacity()
+        public void addAll(Block valueBlock, Block hashBlock)
         {
-            return hash.getCapacity();
+            if (valueBlock.getPositionCount() == 0) {
+                return;
+            }
+
+            if (valueBlock instanceof RunLengthEncodedBlock rleBlock) {
+                if (hashBlock != null) {
+                    set.add(rleBlock.getValue(), 0, BIGINT.getLong(hashBlock, 0));
+                }
+                else {
+                    set.add(rleBlock.getValue(), 0);
+                }
+            }
+            else if (hashBlock != null) {
+                for (int position = 0; position < valueBlock.getPositionCount(); position++) {
+                    set.add(valueBlock, position, BIGINT.getLong(hashBlock, position));
+                }
+            }
+            else {
+                for (int position = 0; position < valueBlock.getPositionCount(); position++) {
+                    set.add(valueBlock, position);
+                }
+            }
+
+            memoryContext.setBytes(set.getEstimatedSize());
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/CompletedWork.java b/core/trino-main/src/main/java/io/trino/operator/CompletedWork.java
index fd1e603b8e57..220ed136e35a 100644
--- a/core/trino-main/src/main/java/io/trino/operator/CompletedWork.java
+++ b/core/trino-main/src/main/java/io/trino/operator/CompletedWork.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/DeduplicatingDirectExchangeBuffer.java b/core/trino-main/src/main/java/io/trino/operator/DeduplicatingDirectExchangeBuffer.java
index f0168bd4ee41..becd8242c239 100644
--- a/core/trino-main/src/main/java/io/trino/operator/DeduplicatingDirectExchangeBuffer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/DeduplicatingDirectExchangeBuffer.java
@@ -22,13 +22,15 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
-import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.exchange.ExchangeManagerRegistry;
 import io.trino.execution.StageId;
 import io.trino.execution.TaskId;
@@ -44,10 +46,6 @@
 import io.trino.spi.exchange.ExchangeSource;
 import io.trino.spi.exchange.ExchangeSourceOutputSelector;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -619,7 +617,7 @@ private void writeToSink(TaskId taskId, List<Slice> pages)
                 writeBuffer.writeInt(taskId.getPartitionId());
                 writeBuffer.writeInt(taskId.getAttemptId());
                 writeBuffer.writeBytes(page);
-                exchangeSink.add(0, Slices.copyOf(writeBuffer.slice()));
+                exchangeSink.add(0, writeBuffer.slice().copy());
                 writeBuffer.reset();
                 spilledBytes += page.length();
                 spilledPageCount++;
diff --git a/core/trino-main/src/main/java/io/trino/operator/DeleteAndInsertMergeProcessor.java b/core/trino-main/src/main/java/io/trino/operator/DeleteAndInsertMergeProcessor.java
index 03fb52196038..bfcc2fc16808 100644
--- a/core/trino-main/src/main/java/io/trino/operator/DeleteAndInsertMergeProcessor.java
+++ b/core/trino-main/src/main/java/io/trino/operator/DeleteAndInsertMergeProcessor.java
@@ -19,21 +19,19 @@
 import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.ColumnarRow;
 import io.trino.spi.type.Type;
 
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
+import static io.trino.spi.block.RowBlock.getRowFieldsFromBlock;
 import static io.trino.spi.connector.ConnectorMergeSink.DELETE_OPERATION_NUMBER;
 import static io.trino.spi.connector.ConnectorMergeSink.INSERT_OPERATION_NUMBER;
 import static io.trino.spi.connector.ConnectorMergeSink.UPDATE_DELETE_OPERATION_NUMBER;
 import static io.trino.spi.connector.ConnectorMergeSink.UPDATE_INSERT_OPERATION_NUMBER;
 import static io.trino.spi.connector.ConnectorMergeSink.UPDATE_OPERATION_NUMBER;
 import static io.trino.spi.type.TinyintType.TINYINT;
-import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
 public class DeleteAndInsertMergeProcessor
@@ -101,14 +99,14 @@ public Page transformPage(Page inputPage)
         int originalPositionCount = inputPage.getPositionCount();
         checkArgument(originalPositionCount > 0, "originalPositionCount should be > 0, but is %s", originalPositionCount);
 
-        ColumnarRow mergeRow = toColumnarRow(inputPage.getBlock(mergeRowChannel));
-        Block operationChannelBlock = mergeRow.getField(mergeRow.getFieldCount() - 2);
+        List<Block> fields = getRowFieldsFromBlock(inputPage.getBlock(mergeRowChannel));
+        Block operationChannelBlock = fields.get(fields.size() - 2);
 
         int updatePositions = 0;
         int insertPositions = 0;
         int deletePositions = 0;
         for (int position = 0; position < originalPositionCount; position++) {
-            int operation = toIntExact(TINYINT.getLong(operationChannelBlock, position));
+            byte operation = TINYINT.getByte(operationChannelBlock, position);
             switch (operation) {
                 case DEFAULT_CASE_OPERATION_NUMBER -> { /* ignored */ }
                 case INSERT_OPERATION_NUMBER -> insertPositions++;
@@ -130,7 +128,7 @@ public Page transformPage(Page inputPage)
 
         PageBuilder pageBuilder = new PageBuilder(totalPositions, pageTypes);
         for (int position = 0; position < originalPositionCount; position++) {
-            long operation = TINYINT.getLong(operationChannelBlock, position);
+            byte operation = TINYINT.getByte(operationChannelBlock, position);
             if (operation != DEFAULT_CASE_OPERATION_NUMBER) {
                 // Delete and Update because both create a delete row
                 if (operation == DELETE_OPERATION_NUMBER || operation == UPDATE_OPERATION_NUMBER) {
@@ -138,7 +136,7 @@ public Page transformPage(Page inputPage)
                 }
                 // Insert and update because both create an insert row
                 if (operation == INSERT_OPERATION_NUMBER || operation == UPDATE_OPERATION_NUMBER) {
-                    addInsertRow(pageBuilder, mergeRow, position, operation != INSERT_OPERATION_NUMBER);
+                    addInsertRow(pageBuilder, fields, position, operation != INSERT_OPERATION_NUMBER);
                 }
             }
         }
@@ -180,14 +178,14 @@ private void addDeleteRow(PageBuilder pageBuilder, Page originalPage, int positi
         pageBuilder.declarePosition();
     }
 
-    private void addInsertRow(PageBuilder pageBuilder, ColumnarRow mergeCaseBlock, int position, boolean causedByUpdate)
+    private void addInsertRow(PageBuilder pageBuilder, List<Block> fields, int position, boolean causedByUpdate)
     {
         // Copy the values from the merge block
         for (int targetChannel : dataColumnChannels) {
             Type columnType = dataColumnTypes.get(targetChannel);
             BlockBuilder targetBlock = pageBuilder.getBlockBuilder(targetChannel);
             // The value comes from that column of the page
-            columnType.appendTo(mergeCaseBlock.getField(targetChannel), position, targetBlock);
+            columnType.appendTo(fields.get(targetChannel), position, targetBlock);
         }
 
         // Add the operation column == insert
diff --git a/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClient.java b/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClient.java
index 85c726045e13..6848c50915a7 100644
--- a/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClient.java
+++ b/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClient.java
@@ -16,6 +16,8 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.http.client.HttpClient;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
@@ -29,10 +31,7 @@
 import io.trino.operator.HttpPageBufferClient.ClientCallback;
 import io.trino.operator.WorkProcessor.ProcessState;
 import io.trino.plugin.base.metrics.TDigestHistogram;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.io.Closeable;
 import java.net.URI;
@@ -338,7 +337,7 @@ private boolean addPages(HttpPageBufferClient client, List<Slice> pages)
 
             successfulRequests++;
             // AVG_n = AVG_(n-1) * (n-1)/n + VALUE_n / n
-            averageBytesPerRequest = (long) (1.0 * averageBytesPerRequest * (successfulRequests - 1) / successfulRequests + responseSize / successfulRequests);
+            averageBytesPerRequest = (long) (1.0 * averageBytesPerRequest * (successfulRequests - 1) / successfulRequests + (double) responseSize / successfulRequests);
         }
 
         return true;
diff --git a/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientConfig.java b/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientConfig.java
index fed8567824d6..615f5ed75a4b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientConfig.java
+++ b/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientConfig.java
@@ -14,18 +14,19 @@
 package io.trino.operator;
 
 import io.airlift.configuration.Config;
+import io.airlift.configuration.DefunctConfig;
 import io.airlift.http.client.HttpClientConfig;
 import io.airlift.units.DataSize;
 import io.airlift.units.DataSize.Unit;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDataSize;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.concurrent.TimeUnit;
 
+@DefunctConfig("exchange.min-error-duration")
 public class DirectExchangeClientConfig
 {
     private DataSize maxBufferSize = DataSize.of(32, Unit.MEGABYTE);
@@ -63,19 +64,6 @@ public DirectExchangeClientConfig setConcurrentRequestMultiplier(int concurrentR
         return this;
     }
 
-    @Deprecated
-    public Duration getMinErrorDuration()
-    {
-        return maxErrorDuration;
-    }
-
-    @Deprecated
-    @Config("exchange.min-error-duration")
-    public DirectExchangeClientConfig setMinErrorDuration(Duration minErrorDuration)
-    {
-        return this;
-    }
-
     @NotNull
     @MinDuration("1ms")
     public Duration getMaxErrorDuration()
diff --git a/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientFactory.java b/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientFactory.java
index 601d900caa2e..ec629a531dcb 100644
--- a/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientFactory.java
@@ -13,6 +13,7 @@
  */
 package io.trino.operator;
 
+import com.google.inject.Inject;
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
 import io.airlift.http.client.HttpClient;
 import io.airlift.node.NodeInfo;
@@ -25,12 +26,10 @@
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.spi.QueryId;
 import io.trino.spi.exchange.ExchangeId;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
diff --git a/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientStatus.java b/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientStatus.java
index 4d1bf5efd568..ea95c7586a03 100644
--- a/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientStatus.java
+++ b/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientStatus.java
@@ -162,6 +162,47 @@ public DirectExchangeClientStatus mergeWith(DirectExchangeClientStatus other)
                 requestDuration.mergeWith(other.requestDuration)); // this is correct as long as all clients have the same shape of histogram
     }
 
+    @Override
+    public DirectExchangeClientStatus mergeWith(List<DirectExchangeClientStatus> others)
+    {
+        if (others.isEmpty()) {
+            return this;
+        }
+
+        long bufferedBytes = this.bufferedBytes;
+        long maxBufferedBytes = this.maxBufferedBytes;
+        long averageBytesPerRequest = this.averageBytesPerRequest;
+        long successfulRequestsCount = this.successfulRequestsCount;
+        int bufferedPages = this.bufferedPages;
+        int spilledPages = this.spilledPages;
+        long spilledBytes = this.spilledBytes;
+        boolean noMoreLocations = this.noMoreLocations;
+        ImmutableList.Builder<TDigestHistogram> requestDurations = ImmutableList.builderWithExpectedSize(others.size());
+        for (DirectExchangeClientStatus other : others) {
+            bufferedBytes = (bufferedBytes + other.bufferedBytes) / 2; // this is correct as long as all clients have the same buffer size (capacity)
+            maxBufferedBytes = Math.max(maxBufferedBytes, other.maxBufferedBytes);
+            averageBytesPerRequest = mergeAvgs(averageBytesPerRequest, successfulRequestsCount, other.averageBytesPerRequest, other.successfulRequestsCount);
+            successfulRequestsCount = successfulRequestsCount + other.successfulRequestsCount;
+            bufferedPages = bufferedPages + other.bufferedPages;
+            spilledPages = spilledPages + other.spilledPages;
+            spilledBytes = spilledBytes + other.spilledBytes;
+            noMoreLocations = noMoreLocations && other.noMoreLocations; // if at least one has some locations, mergee has some too
+            requestDurations.add(other.requestDuration);
+        }
+
+        return new DirectExchangeClientStatus(
+                bufferedBytes,
+                maxBufferedBytes,
+                averageBytesPerRequest,
+                successfulRequestsCount,
+                bufferedPages,
+                spilledPages,
+                spilledBytes,
+                noMoreLocations,
+                ImmutableList.of(), // pageBufferClientStatuses may be long, so we don't want to combine the lists
+                TDigestHistogram.merge(requestDurations.build()).orElseThrow()); // this is correct as long as all clients have the same shape of histogram
+    }
+
     private static long mergeAvgs(long value1, long count1, long value2, long count2)
     {
         if (count1 == 0) {
diff --git a/core/trino-main/src/main/java/io/trino/operator/DistinctLimitOperator.java b/core/trino-main/src/main/java/io/trino/operator/DistinctLimitOperator.java
index 6fda981f6c51..f23ff82a4e2b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/DistinctLimitOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/DistinctLimitOperator.java
@@ -21,9 +21,7 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.type.BlockTypeOperators;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
@@ -51,7 +49,6 @@ public static class DistinctLimitOperatorFactory
         private final Optional<Integer> hashChannel;
         private boolean closed;
         private final JoinCompiler joinCompiler;
-        private final BlockTypeOperators blockTypeOperators;
 
         public DistinctLimitOperatorFactory(
                 int operatorId,
@@ -60,8 +57,7 @@ public DistinctLimitOperatorFactory(
                 List<Integer> distinctChannels,
                 long limit,
                 Optional<Integer> hashChannel,
-                JoinCompiler joinCompiler,
-                BlockTypeOperators blockTypeOperators)
+                JoinCompiler joinCompiler)
         {
             this.operatorId = operatorId;
             this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
@@ -72,7 +68,6 @@ public DistinctLimitOperatorFactory(
             this.limit = limit;
             this.hashChannel = requireNonNull(hashChannel, "hashChannel is null");
             this.joinCompiler = requireNonNull(joinCompiler, "joinCompiler is null");
-            this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
         }
 
         @Override
@@ -83,7 +78,7 @@ public Operator createOperator(DriverContext driverContext)
             List<Type> distinctTypes = distinctChannels.stream()
                     .map(sourceTypes::get)
                     .collect(toImmutableList());
-            return new DistinctLimitOperator(operatorContext, distinctChannels, distinctTypes, limit, hashChannel, joinCompiler, blockTypeOperators);
+            return new DistinctLimitOperator(operatorContext, distinctChannels, distinctTypes, limit, hashChannel, joinCompiler);
         }
 
         @Override
@@ -95,7 +90,7 @@ public void noMoreOperators()
         @Override
         public OperatorFactory duplicate()
         {
-            return new DistinctLimitOperatorFactory(operatorId, planNodeId, sourceTypes, distinctChannels, limit, hashChannel, joinCompiler, blockTypeOperators);
+            return new DistinctLimitOperatorFactory(operatorId, planNodeId, sourceTypes, distinctChannels, limit, hashChannel, joinCompiler);
         }
     }
 
@@ -107,38 +102,44 @@ public OperatorFactory duplicate()
 
     private boolean finishing;
 
-    private final int[] outputChannels;
+    private final int[] inputChannels;
     private final GroupByHash groupByHash;
     private long nextDistinctId;
 
     // for yield when memory is not available
-    private GroupByIdBlock groupByIds;
-    private Work<GroupByIdBlock> unfinishedWork;
-
-    public DistinctLimitOperator(OperatorContext operatorContext, List<Integer> distinctChannels, List<Type> distinctTypes, long limit, Optional<Integer> hashChannel, JoinCompiler joinCompiler, BlockTypeOperators blockTypeOperators)
+    private int[] groupByIds;
+    private Work<int[]> unfinishedWork;
+
+    public DistinctLimitOperator(
+            OperatorContext operatorContext,
+            List<Integer> distinctChannels,
+            List<Type> distinctTypes,
+            long limit,
+            Optional<Integer> hashChannel,
+            JoinCompiler joinCompiler)
     {
         this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
         this.localUserMemoryContext = operatorContext.localUserMemoryContext();
         checkArgument(limit >= 0, "limit must be at least zero");
-        requireNonNull(hashChannel, "hashChannel is null");
+        checkArgument(distinctTypes.size() == distinctChannels.size(), "distinctTypes and distinctChannels sizes don't match");
 
-        int[] distinctChannelInts = Ints.toArray(requireNonNull(distinctChannels, "distinctChannels is null"));
         if (hashChannel.isPresent()) {
-            outputChannels = Arrays.copyOf(distinctChannelInts, distinctChannelInts.length + 1);
-            outputChannels[distinctChannelInts.length] = hashChannel.get();
+            this.inputChannels = new int[distinctChannels.size() + 1];
+            for (int i = 0; i < distinctChannels.size(); i++) {
+                this.inputChannels[i] = distinctChannels.get(i);
+            }
+            this.inputChannels[distinctChannels.size()] = hashChannel.get();
         }
         else {
-            outputChannels = distinctChannelInts.clone(); // defensive copy since this is passed into createGroupByHash
+            this.inputChannels = Ints.toArray(distinctChannels);
         }
 
         this.groupByHash = createGroupByHash(
                 operatorContext.getSession(),
                 distinctTypes,
-                distinctChannelInts,
-                hashChannel,
-                toIntExact(Math.min(limit, 10_000)),
+                hashChannel.isPresent(),
+                toIntExact(min(limit, 10_000)),
                 joinCompiler,
-                blockTypeOperators,
                 this::updateMemoryReservation);
         remainingLimit = limit;
     }
@@ -172,8 +173,8 @@ public void addInput(Page page)
     {
         checkState(needsInput());
 
-        inputPage = page;
-        unfinishedWork = groupByHash.getGroupIds(page);
+        inputPage = page.getColumns(inputChannels);
+        unfinishedWork = groupByHash.getGroupIds(inputPage);
         processUnfinishedWork();
         updateMemoryReservation();
     }
@@ -191,20 +192,20 @@ public Page getOutput()
 
         verifyNotNull(inputPage);
 
-        long resultingPositions = min(groupByIds.getGroupCount() - nextDistinctId, remainingLimit);
+        long resultingPositions = min(groupByHash.getGroupCount() - nextDistinctId, remainingLimit);
         Page result = null;
         if (resultingPositions > 0) {
             int[] distinctPositions = new int[toIntExact(resultingPositions)];
             int distinctCount = 0;
-            for (int position = 0; position < groupByIds.getPositionCount() && distinctCount < distinctPositions.length; position++) {
-                if (groupByIds.getGroupId(position) == nextDistinctId) {
+            for (int position = 0; position < groupByIds.length && distinctCount < distinctPositions.length; position++) {
+                if (groupByIds[position] == nextDistinctId) {
                     distinctPositions[distinctCount++] = position;
                     nextDistinctId++;
                 }
             }
             verify(distinctCount == distinctPositions.length);
             remainingLimit -= distinctCount;
-            result = inputPage.getColumns(outputChannels).getPositions(distinctPositions, 0, distinctPositions.length);
+            result = inputPage.getPositions(distinctPositions, 0, distinctPositions.length);
         }
 
         groupByIds = null;
@@ -221,6 +222,7 @@ private boolean processUnfinishedWork()
             return false;
         }
         groupByIds = unfinishedWork.getResult();
+        verify(groupByIds.length == inputPage.getPositionCount(), "Expected on groupId for each input position");
         unfinishedWork = null;
         return true;
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/Driver.java b/core/trino-main/src/main/java/io/trino/operator/Driver.java
index 7944881d70fb..f6949c4bb204 100644
--- a/core/trino-main/src/main/java/io/trino/operator/Driver.java
+++ b/core/trino-main/src/main/java/io/trino/operator/Driver.java
@@ -21,6 +21,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import com.google.errorprone.annotations.FormatMethod;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.execution.ScheduledSplit;
@@ -28,9 +29,6 @@
 import io.trino.metadata.Split;
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
-import io.trino.sql.planner.plan.PlanNodeId;
-
-import javax.annotation.concurrent.GuardedBy;
 
 import java.io.Closeable;
 import java.util.ArrayList;
@@ -164,11 +162,6 @@ public ListenableFuture<Void> getDestroyedFuture()
         return destroyedFuture;
     }
 
-    public Optional<PlanNodeId> getSourceId()
-    {
-        return sourceOperator.map(SourceOperator::getSourceId);
-    }
-
     @Override
     public void close()
     {
diff --git a/core/trino-main/src/main/java/io/trino/operator/DriverContext.java b/core/trino-main/src/main/java/io/trino/operator/DriverContext.java
index 9c3b61aa6bfb..0ea5d3a5d70e 100644
--- a/core/trino-main/src/main/java/io/trino/operator/DriverContext.java
+++ b/core/trino-main/src/main/java/io/trino/operator/DriverContext.java
@@ -266,6 +266,16 @@ public CounterStat getOutputPositions()
         return new CounterStat();
     }
 
+    public long getWriterInputDataSize()
+    {
+        // Avoid using stream api for performance reasons
+        long writerInputDataSize = 0;
+        for (OperatorContext context : operatorContexts) {
+            writerInputDataSize += context.getWriterInputDataSize();
+        }
+        return writerInputDataSize;
+    }
+
     public long getPhysicalWrittenDataSize()
     {
         // Avoid using stream api for performance reasons
diff --git a/core/trino-main/src/main/java/io/trino/operator/DriverFactory.java b/core/trino-main/src/main/java/io/trino/operator/DriverFactory.java
index e637c8ef8727..a37b29e417cd 100644
--- a/core/trino-main/src/main/java/io/trino/operator/DriverFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/DriverFactory.java
@@ -14,10 +14,9 @@
 package io.trino.operator;
 
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.sql.planner.plan.PlanNodeId;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -131,6 +130,7 @@ public Driver createDriver(DriverContext driverContext)
                     }
                 }
             }
+            driverContext.failed(failure);
             throw failure;
         }
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/DriverStats.java b/core/trino-main/src/main/java/io/trino/operator/DriverStats.java
index 1fd1954539b8..3c985a00a355 100644
--- a/core/trino-main/src/main/java/io/trino/operator/DriverStats.java
+++ b/core/trino-main/src/main/java/io/trino/operator/DriverStats.java
@@ -17,13 +17,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import jakarta.annotation.Nullable;
 import org.joda.time.DateTime;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Set;
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/DriverYieldSignal.java b/core/trino-main/src/main/java/io/trino/operator/DriverYieldSignal.java
index cb600183f2e8..abec9bd963eb 100644
--- a/core/trino-main/src/main/java/io/trino/operator/DriverYieldSignal.java
+++ b/core/trino-main/src/main/java/io/trino/operator/DriverYieldSignal.java
@@ -14,9 +14,8 @@
 package io.trino.operator;
 
 import com.google.common.annotations.VisibleForTesting;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
diff --git a/core/trino-main/src/main/java/io/trino/operator/DynamicFilterSourceOperator.java b/core/trino-main/src/main/java/io/trino/operator/DynamicFilterSourceOperator.java
index 8fb4b32bdf38..d27a388d7a52 100644
--- a/core/trino-main/src/main/java/io/trino/operator/DynamicFilterSourceOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/DynamicFilterSourceOperator.java
@@ -13,66 +13,38 @@
  */
 package io.trino.operator;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
 import io.trino.memory.context.LocalMemoryContext;
-import io.trino.operator.aggregation.TypedSet;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.predicate.ValueSet;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.sql.planner.DynamicFilterSourceConsumer;
 import io.trino.sql.planner.plan.DynamicFilterId;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.type.BlockTypeOperators;
-import io.trino.type.BlockTypeOperators.BlockPositionComparison;
-
-import javax.annotation.Nullable;
 
+import java.util.Arrays;
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
-import static io.trino.operator.aggregation.TypedSet.createUnboundedEqualityTypedSet;
-import static io.trino.spi.predicate.Range.range;
-import static io.trino.spi.predicate.Utils.blockToNativeValue;
-import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.RealType.REAL;
-import static io.trino.spi.type.TypeUtils.isFloatingPointNaN;
-import static io.trino.spi.type.TypeUtils.readNativeValue;
-import static java.lang.String.format;
 import static java.util.Arrays.stream;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toSet;
 
 /**
- * This operator acts as a simple "pass-through" pipe, while saving its input pages.
- * The collected pages' value are used for creating a run-time filtering constraint (for probe-side table scan in an inner join).
+ * This operator acts as a simple "pass-through" pipe, while saving a summary of input pages.
+ * The collected values are used for creating a run-time filtering constraint (for probe-side table scan in an inner join).
  * We record all values for the run-time filter only for small build-side pages (which should be the case when using "broadcast" join).
- * For large inputs on build side, we can optionally record the min and max values per channel for orderable types (except Double and Real).
+ * For large inputs on the build side, we can optionally record the min and max values per channel for orderable types (except Double and Real).
  */
 public class DynamicFilterSourceOperator
         implements Operator
 {
-    private static final int EXPECTED_BLOCK_BUILDER_SIZE = 8;
-
-    public static class Channel
-    {
-        private final DynamicFilterId filterId;
-        private final Type type;
-        private final int index;
-
-        public Channel(DynamicFilterId filterId, Type type, int index)
-        {
-            this.filterId = filterId;
-            this.type = type;
-            this.index = index;
-        }
-    }
+    public record Channel(DynamicFilterId filterId, Type type, int index) {}
 
     public static class DynamicFilterSourceOperatorFactory
             implements OperatorFactory
@@ -84,7 +56,7 @@ public static class DynamicFilterSourceOperatorFactory
         private final int maxDistinctValues;
         private final DataSize maxFilterSize;
         private final int minMaxCollectionLimit;
-        private final BlockTypeOperators blockTypeOperators;
+        private final TypeOperators typeOperators;
 
         private boolean closed;
         private int createdOperatorsCount;
@@ -97,20 +69,20 @@ public DynamicFilterSourceOperatorFactory(
                 int maxDistinctValues,
                 DataSize maxFilterSize,
                 int minMaxCollectionLimit,
-                BlockTypeOperators blockTypeOperators)
+                TypeOperators typeOperators)
         {
             this.operatorId = operatorId;
             this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
             this.dynamicPredicateConsumer = requireNonNull(dynamicPredicateConsumer, "dynamicPredicateConsumer is null");
             this.channels = requireNonNull(channels, "channels is null");
-            verify(channels.stream().map(channel -> channel.filterId).collect(toSet()).size() == channels.size(),
+            verify(channels.stream().map(Channel::filterId).collect(toSet()).size() == channels.size(),
                     "duplicate dynamic filters are not allowed");
-            verify(channels.stream().map(channel -> channel.index).collect(toSet()).size() == channels.size(),
+            verify(channels.stream().map(Channel::index).collect(toSet()).size() == channels.size(),
                     "duplicate channel indices are not allowed");
             this.maxDistinctValues = maxDistinctValues;
             this.maxFilterSize = maxFilterSize;
             this.minMaxCollectionLimit = minMaxCollectionLimit;
-            this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
+            this.typeOperators = requireNonNull(typeOperators, "typeOperators is null");
         }
 
         @Override
@@ -124,11 +96,10 @@ public Operator createOperator(DriverContext driverContext)
                         operatorContext,
                         dynamicPredicateConsumer,
                         channels,
-                        planNodeId,
                         maxDistinctValues,
                         maxFilterSize,
                         minMaxCollectionLimit,
-                        blockTypeOperators);
+                        typeOperators);
             }
             // Return a pass-through operator which adds little overhead
             return new PassthroughDynamicFilterSourceOperator(operatorContext);
@@ -145,7 +116,7 @@ public void noMoreOperators()
         @Override
         public OperatorFactory duplicate()
         {
-            // A duplicate factory may be required for DynamicFilterSourceOperatorFactory in fault tolerant execution mode
+            // A duplicate factory may be required for DynamicFilterSourceOperatorFactory in fault-tolerant execution mode
             // by LocalExecutionPlanner#addLookupOuterDrivers to add a new driver to output the unmatched rows in an outer join.
             // Since the logic for tracking partitions count for dynamicPredicateConsumer requires there to be only one DynamicFilterSourceOperatorFactory,
             // we turn off dynamic filtering and provide a duplicate factory which will act as pass through to allow the query to succeed.
@@ -173,7 +144,7 @@ public boolean isDomainCollectionComplete()
                     maxDistinctValues,
                     maxFilterSize,
                     minMaxCollectionLimit,
-                    blockTypeOperators);
+                    typeOperators);
         }
     }
 
@@ -184,7 +155,7 @@ public boolean isDomainCollectionComplete()
     private final DynamicFilterSourceConsumer dynamicPredicateConsumer;
 
     private final List<Channel> channels;
-    private final ChannelFilter[] channelFilters;
+    private final JoinDomainBuilder[] joinDomainBuilders;
 
     private int minMaxCollectionLimit;
     private boolean isDomainCollectionComplete;
@@ -193,29 +164,31 @@ private DynamicFilterSourceOperator(
             OperatorContext context,
             DynamicFilterSourceConsumer dynamicPredicateConsumer,
             List<Channel> channels,
-            PlanNodeId planNodeId,
             int maxDistinctValues,
             DataSize maxFilterSize,
             int minMaxCollectionLimit,
-            BlockTypeOperators blockTypeOperators)
+            TypeOperators typeOperators)
     {
         this.context = requireNonNull(context, "context is null");
         this.userMemoryContext = context.localUserMemoryContext();
         this.minMaxCollectionLimit = minMaxCollectionLimit;
         this.dynamicPredicateConsumer = requireNonNull(dynamicPredicateConsumer, "dynamicPredicateConsumer is null");
         this.channels = requireNonNull(channels, "channels is null");
-        this.channelFilters = new ChannelFilter[channels.size()];
 
-        for (int channelIndex = 0; channelIndex < channels.size(); ++channelIndex) {
-            channelFilters[channelIndex] = new ChannelFilter(
-                    blockTypeOperators,
-                    minMaxCollectionLimit > 0,
-                    planNodeId,
-                    maxDistinctValues,
-                    maxFilterSize.toBytes(),
-                    this::finishDomainCollectionIfNecessary,
-                    channels.get(channelIndex));
-        }
+        this.joinDomainBuilders = channels.stream()
+                .map(Channel::type)
+                .map(type -> new JoinDomainBuilder(
+                        type,
+                        maxDistinctValues,
+                        maxFilterSize,
+                        minMaxCollectionLimit > 0,
+                        this::finishDomainCollectionIfNecessary,
+                        typeOperators))
+                .toArray(JoinDomainBuilder[]::new);
+
+        userMemoryContext.setBytes(stream(joinDomainBuilders)
+                .mapToLong(JoinDomainBuilder::getRetainedSizeInBytes)
+                .sum());
     }
 
     @Override
@@ -244,19 +217,23 @@ public void addInput(Page page)
             minMaxCollectionLimit -= page.getPositionCount();
             if (minMaxCollectionLimit < 0) {
                 for (int channelIndex = 0; channelIndex < channels.size(); channelIndex++) {
-                    channelFilters[channelIndex].disableMinMax();
+                    joinDomainBuilders[channelIndex].disableMinMax();
                 }
                 finishDomainCollectionIfNecessary();
             }
         }
 
         // Collect only the columns which are relevant for the JOIN.
-        long filterSizeInBytes = 0;
+        long retainedSize = 0;
         for (int channelIndex = 0; channelIndex < channels.size(); ++channelIndex) {
-            Block block = page.getBlock(channels.get(channelIndex).index);
-            filterSizeInBytes += channelFilters[channelIndex].process(block);
+            Block block = page.getBlock(channels.get(channelIndex).index());
+            joinDomainBuilders[channelIndex].add(block);
+            if (isDomainCollectionComplete) {
+                return;
+            }
+            retainedSize += joinDomainBuilders[channelIndex].getRetainedSizeInBytes();
         }
-        userMemoryContext.setBytes(filterSizeInBytes);
+        userMemoryContext.setBytes(retainedSize);
     }
 
     @Override
@@ -282,11 +259,12 @@ public void finish()
 
         ImmutableMap.Builder<DynamicFilterId, Domain> domainsBuilder = ImmutableMap.builder();
         for (int channelIndex = 0; channelIndex < channels.size(); ++channelIndex) {
-            DynamicFilterId filterId = channels.get(channelIndex).filterId;
-            domainsBuilder.put(filterId, channelFilters[channelIndex].getDomain());
+            DynamicFilterId filterId = channels.get(channelIndex).filterId();
+            domainsBuilder.put(filterId, joinDomainBuilders[channelIndex].build());
         }
         dynamicPredicateConsumer.addPartition(TupleDomain.withColumnDomains(domainsBuilder.buildOrThrow()));
         userMemoryContext.setBytes(0);
+        Arrays.fill(joinDomainBuilders, null);
     }
 
     @Override
@@ -304,19 +282,14 @@ public void close()
 
     private void finishDomainCollectionIfNecessary()
     {
-        if (!isDomainCollectionComplete && stream(channelFilters).allMatch(channel -> channel.state == ChannelState.NONE)) {
+        if (!isDomainCollectionComplete && stream(joinDomainBuilders).noneMatch(JoinDomainBuilder::isCollecting)) {
             // allow all probe-side values to be read.
             dynamicPredicateConsumer.addPartition(TupleDomain.all());
             isDomainCollectionComplete = true;
+            userMemoryContext.setBytes(0);
         }
     }
 
-    private static boolean isMinMaxPossible(Type type)
-    {
-        // Skipping DOUBLE and REAL in collectMinMaxValues to avoid dealing with NaN values
-        return type.isOrderable() && type != DOUBLE && type != REAL;
-    }
-
     private static class PassthroughDynamicFilterSourceOperator
             implements Operator
     {
@@ -372,187 +345,4 @@ public boolean isFinished()
             return current == null && finished;
         }
     }
-
-    private static class ChannelFilter
-    {
-        private final Type type;
-        private final int maxDistinctValues;
-        private final long maxFilterSizeInBytes;
-        private final Runnable notifyStateChange;
-
-        private ChannelState state;
-        private boolean collectMinMax;
-        // May be dropped if the predicate becomes too large.
-        @Nullable
-        private BlockBuilder blockBuilder;
-        @Nullable
-        private TypedSet valueSet;
-        @Nullable
-        private Block minValues;
-        @Nullable
-        private Block maxValues;
-        @Nullable
-        private BlockPositionComparison minMaxComparison;
-
-        private ChannelFilter(
-                BlockTypeOperators blockTypeOperators,
-                boolean minMaxEnabled,
-                PlanNodeId planNodeId,
-                int maxDistinctValues,
-                long maxFilterSizeInBytes,
-                Runnable notifyStateChange,
-                Channel channel)
-        {
-            this.maxDistinctValues = maxDistinctValues;
-            this.maxFilterSizeInBytes = maxFilterSizeInBytes;
-            this.notifyStateChange = requireNonNull(notifyStateChange, "notifyStateChange is null");
-            type = channel.type;
-            state = ChannelState.SET;
-            collectMinMax = minMaxEnabled && isMinMaxPossible(type);
-            if (collectMinMax) {
-                minMaxComparison = blockTypeOperators.getComparisonUnorderedLastOperator(type);
-            }
-            blockBuilder = type.createBlockBuilder(null, EXPECTED_BLOCK_BUILDER_SIZE);
-            valueSet = createUnboundedEqualityTypedSet(
-                    type,
-                    blockTypeOperators.getEqualOperator(type),
-                    blockTypeOperators.getHashCodeOperator(type),
-                    blockBuilder,
-                    EXPECTED_BLOCK_BUILDER_SIZE,
-                    format("DynamicFilterSourceOperator_%s_%d", planNodeId, channel.index));
-        }
-
-        private long process(Block block)
-        {
-            long retainedSizeInBytes = 0;
-            switch (state) {
-                case SET:
-                    for (int position = 0; position < block.getPositionCount(); ++position) {
-                        valueSet.add(block, position);
-                    }
-                    if (valueSet.size() > maxDistinctValues || valueSet.getRetainedSizeInBytes() > maxFilterSizeInBytes) {
-                        if (collectMinMax) {
-                            state = ChannelState.MIN_MAX;
-                            updateMinMaxValues(blockBuilder.build(), minMaxComparison);
-                        }
-                        else {
-                            state = ChannelState.NONE;
-                            notifyStateChange.run();
-                        }
-                        valueSet = null;
-                        blockBuilder = null;
-                    }
-                    else {
-                        retainedSizeInBytes = valueSet.getRetainedSizeInBytes();
-                    }
-                    break;
-                case MIN_MAX:
-                    updateMinMaxValues(block, minMaxComparison);
-                    break;
-                case NONE:
-                    break;
-            }
-            return retainedSizeInBytes;
-        }
-
-        private Domain getDomain()
-        {
-            return switch (state) {
-                case SET -> {
-                    Block block = blockBuilder.build();
-                    ImmutableList.Builder<Object> values = ImmutableList.builder();
-                    for (int position = 0; position < block.getPositionCount(); ++position) {
-                        Object value = readNativeValue(type, block, position);
-                        if (value != null) {
-                            // join doesn't match rows with NaN values.
-                            if (!isFloatingPointNaN(type, value)) {
-                                values.add(value);
-                            }
-                        }
-                    }
-                    // Drop references to collected values
-                    valueSet = null;
-                    blockBuilder = null;
-                    // Inner and right join doesn't match rows with null key column values.
-                    yield Domain.create(ValueSet.copyOf(type, values.build()), false);
-                }
-                case MIN_MAX -> {
-                    if (minValues == null) {
-                        // all values were null
-                        yield Domain.none(type);
-                    }
-                    Object min = blockToNativeValue(type, minValues);
-                    Object max = blockToNativeValue(type, maxValues);
-                    // Drop references to collected values
-                    minValues = null;
-                    maxValues = null;
-                    yield Domain.create(ValueSet.ofRanges(range(type, min, true, max, true)), false);
-                }
-                case NONE -> Domain.all(type);
-            };
-        }
-
-        private void disableMinMax()
-        {
-            collectMinMax = false;
-            if (state == ChannelState.MIN_MAX) {
-                state = ChannelState.NONE;
-            }
-            // Drop references to collected values.
-            minValues = null;
-            maxValues = null;
-        }
-
-        private void updateMinMaxValues(Block block, BlockPositionComparison comparison)
-        {
-            int minValuePosition = -1;
-            int maxValuePosition = -1;
-
-            for (int position = 0; position < block.getPositionCount(); ++position) {
-                if (block.isNull(position)) {
-                    continue;
-                }
-                if (minValuePosition == -1) {
-                    // First non-null value
-                    minValuePosition = position;
-                    maxValuePosition = position;
-                    continue;
-                }
-                if (comparison.compare(block, position, block, minValuePosition) < 0) {
-                    minValuePosition = position;
-                }
-                else if (comparison.compare(block, position, block, maxValuePosition) > 0) {
-                    maxValuePosition = position;
-                }
-            }
-
-            if (minValuePosition == -1) {
-                // all block values are nulls
-                return;
-            }
-            if (minValues == null) {
-                // First Page with non-null value for this block
-                minValues = block.getSingleValueBlock(minValuePosition);
-                maxValues = block.getSingleValueBlock(maxValuePosition);
-                return;
-            }
-            // Compare with min/max values from previous Pages
-            Block currentMin = minValues;
-            Block currentMax = maxValues;
-
-            if (comparison.compare(block, minValuePosition, currentMin, 0) < 0) {
-                minValues = block.getSingleValueBlock(minValuePosition);
-            }
-            if (comparison.compare(block, maxValuePosition, currentMax, 0) > 0) {
-                maxValues = block.getSingleValueBlock(maxValuePosition);
-            }
-        }
-    }
-
-    private enum ChannelState
-    {
-        SET,
-        MIN_MAX,
-        NONE,
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/EmptyTableFunctionPartition.java b/core/trino-main/src/main/java/io/trino/operator/EmptyTableFunctionPartition.java
index c5ca7a5f006b..ee510951f4b3 100644
--- a/core/trino-main/src/main/java/io/trino/operator/EmptyTableFunctionPartition.java
+++ b/core/trino-main/src/main/java/io/trino/operator/EmptyTableFunctionPartition.java
@@ -17,17 +17,17 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.RunLengthEncodedBlock;
-import io.trino.spi.ptf.TableFunctionDataProcessor;
-import io.trino.spi.ptf.TableFunctionProcessorState;
-import io.trino.spi.ptf.TableFunctionProcessorState.Blocked;
-import io.trino.spi.ptf.TableFunctionProcessorState.Processed;
+import io.trino.spi.function.table.TableFunctionDataProcessor;
+import io.trino.spi.function.table.TableFunctionProcessorState;
+import io.trino.spi.function.table.TableFunctionProcessorState.Blocked;
+import io.trino.spi.function.table.TableFunctionProcessorState.Processed;
 import io.trino.spi.type.Type;
 
 import java.util.List;
 
 import static io.airlift.concurrent.MoreFutures.toListenableFuture;
 import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_ERROR;
-import static io.trino.spi.ptf.TableFunctionProcessorState.Finished.FINISHED;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Finished.FINISHED;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/ExchangeOperator.java b/core/trino-main/src/main/java/io/trino/operator/ExchangeOperator.java
index 34b1b5d58948..29b6e4f9b833 100644
--- a/core/trino-main/src/main/java/io/trino/operator/ExchangeOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/ExchangeOperator.java
@@ -14,6 +14,7 @@
 package io.trino.operator;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.slice.Slice;
 import io.trino.exchange.ExchangeDataSource;
 import io.trino.exchange.ExchangeManagerRegistry;
@@ -33,8 +34,6 @@
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.spi.connector.CatalogHandle.createRootCatalogHandle;
diff --git a/core/trino-main/src/main/java/io/trino/operator/FlatGroupByHash.java b/core/trino-main/src/main/java/io/trino/operator/FlatGroupByHash.java
new file mode 100644
index 000000000000..14e8fb6d42ad
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/FlatGroupByHash.java
@@ -0,0 +1,717 @@
+/*
+ * Licensed 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 io.trino.operator;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.primitives.Shorts;
+import io.trino.spi.Page;
+import io.trino.spi.PageBuilder;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.DictionaryBlock;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.type.Type;
+import io.trino.sql.gen.JoinCompiler;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Verify.verify;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.operator.FlatHash.sumExact;
+import static java.lang.Math.min;
+import static java.lang.Math.multiplyExact;
+
+// This implementation assumes arrays used in the hash are always a power of 2
+public class FlatGroupByHash
+        implements GroupByHash
+{
+    private static final int INSTANCE_SIZE = instanceSize(FlatGroupByHash.class);
+    private static final int BATCH_SIZE = 1024;
+    // Max (page value count / cumulative dictionary size) to trigger the low cardinality case
+    private static final double SMALL_DICTIONARIES_MAX_CARDINALITY_RATIO = 0.25;
+
+    private final FlatHash flatHash;
+    private final int groupByChannelCount;
+    private final boolean hasPrecomputedHash;
+
+    private final boolean processDictionary;
+
+    private DictionaryLookBack dictionaryLookBack;
+
+    private long currentPageSizeInBytes;
+
+    // reusable arrays for the blocks and block builders
+    private final Block[] currentBlocks;
+    private final BlockBuilder[] currentBlockBuilders;
+    // reusable array for computing hash batches into
+    private long[] currentHashes;
+
+    public FlatGroupByHash(
+            List<Type> hashTypes,
+            boolean hasPrecomputedHash,
+            int expectedSize,
+            boolean processDictionary,
+            JoinCompiler joinCompiler,
+            UpdateMemory checkMemoryReservation)
+    {
+        this.flatHash = new FlatHash(joinCompiler.getFlatHashStrategy(hashTypes), hasPrecomputedHash, expectedSize, checkMemoryReservation);
+        this.groupByChannelCount = hashTypes.size();
+        this.hasPrecomputedHash = hasPrecomputedHash;
+
+        checkArgument(expectedSize > 0, "expectedSize must be greater than zero");
+
+        int totalChannels = hashTypes.size() + (hasPrecomputedHash ? 1 : 0);
+        this.currentBlocks = new Block[totalChannels];
+        this.currentBlockBuilders = new BlockBuilder[totalChannels];
+
+        this.processDictionary = processDictionary && hashTypes.size() == 1;
+    }
+
+    public int getPhysicalPosition(int groupId)
+    {
+        return flatHash.getPhysicalPosition(groupId);
+    }
+
+    @Override
+    public long getRawHash(int groupId)
+    {
+        return flatHash.hashPosition(groupId);
+    }
+
+    @Override
+    public long getEstimatedSize()
+    {
+        return sumExact(
+                INSTANCE_SIZE,
+                flatHash.getEstimatedSize(),
+                currentPageSizeInBytes,
+                sizeOf(currentHashes),
+                (dictionaryLookBack != null ? dictionaryLookBack.getRetainedSizeInBytes() : 0));
+    }
+
+    @Override
+    public int getGroupCount()
+    {
+        return flatHash.size();
+    }
+
+    @Override
+    public void appendValuesTo(int groupId, PageBuilder pageBuilder)
+    {
+        BlockBuilder[] blockBuilders = currentBlockBuilders;
+        for (int i = 0; i < blockBuilders.length; i++) {
+            blockBuilders[i] = pageBuilder.getBlockBuilder(i);
+        }
+        flatHash.appendTo(groupId, blockBuilders);
+    }
+
+    @Override
+    public Work<?> addPage(Page page)
+    {
+        if (page.getPositionCount() == 0) {
+            return new CompletedWork<>(new int[0]);
+        }
+
+        currentPageSizeInBytes = page.getRetainedSizeInBytes();
+        Block[] blocks = getBlocksFromPage(page);
+
+        if (isRunLengthEncoded(blocks)) {
+            return new AddRunLengthEncodedPageWork(blocks);
+        }
+        if (canProcessDictionary(blocks)) {
+            return new AddDictionaryPageWork(blocks);
+        }
+        if (canProcessLowCardinalityDictionary(blocks)) {
+            return new AddLowCardinalityDictionaryPageWork(blocks);
+        }
+
+        return new AddNonDictionaryPageWork(blocks);
+    }
+
+    @Override
+    public Work<int[]> getGroupIds(Page page)
+    {
+        if (page.getPositionCount() == 0) {
+            return new CompletedWork<>(new int[0]);
+        }
+
+        currentPageSizeInBytes = page.getRetainedSizeInBytes();
+        Block[] blocks = getBlocksFromPage(page);
+
+        if (isRunLengthEncoded(blocks)) {
+            return new GetRunLengthEncodedGroupIdsWork(blocks);
+        }
+        if (canProcessDictionary(blocks)) {
+            return new GetDictionaryGroupIdsWork(blocks);
+        }
+        if (canProcessLowCardinalityDictionary(blocks)) {
+            return new GetLowCardinalityDictionaryGroupIdsWork(blocks);
+        }
+
+        return new GetNonDictionaryGroupIdsWork(blocks);
+    }
+
+    @VisibleForTesting
+    @Override
+    public int getCapacity()
+    {
+        return flatHash.getCapacity();
+    }
+
+    private int putIfAbsent(Block[] blocks, int position)
+    {
+        return flatHash.putIfAbsent(blocks, position);
+    }
+
+    private long[] getHashesBufferArray()
+    {
+        if (currentHashes == null) {
+            currentHashes = new long[BATCH_SIZE];
+        }
+        return currentHashes;
+    }
+
+    private Block[] getBlocksFromPage(Page page)
+    {
+        Block[] blocks = currentBlocks;
+        checkArgument(page.getChannelCount() == blocks.length);
+        for (int i = 0; i < blocks.length; i++) {
+            blocks[i] = page.getBlock(i);
+        }
+        return blocks;
+    }
+
+    private void updateDictionaryLookBack(Block dictionary)
+    {
+        if (dictionaryLookBack == null || dictionaryLookBack.getDictionary() != dictionary) {
+            dictionaryLookBack = new DictionaryLookBack(dictionary);
+        }
+    }
+
+    private boolean canProcessDictionary(Block[] blocks)
+    {
+        if (!processDictionary || !(blocks[0] instanceof DictionaryBlock inputDictionary)) {
+            return false;
+        }
+
+        if (!hasPrecomputedHash) {
+            return true;
+        }
+
+        // dictionarySourceIds of data block and hash block must match
+        return blocks[1] instanceof DictionaryBlock hashDictionary &&
+                hashDictionary.getDictionarySourceId().equals(inputDictionary.getDictionarySourceId());
+    }
+
+    private boolean canProcessLowCardinalityDictionary(Block[] blocks)
+    {
+        // We don't have to rely on 'optimizer.dictionary-aggregations' here since there is little to none chance of regression
+        int positionCount = blocks[0].getPositionCount();
+        long cardinality = 1;
+        for (int channel = 0; channel < groupByChannelCount; channel++) {
+            if (!(blocks[channel] instanceof DictionaryBlock dictionaryBlock)) {
+                return false;
+            }
+            cardinality = multiplyExact(cardinality, dictionaryBlock.getDictionary().getPositionCount());
+            if (cardinality > positionCount * SMALL_DICTIONARIES_MAX_CARDINALITY_RATIO
+                    || cardinality > Short.MAX_VALUE) { // Must into fit into short[]
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean isRunLengthEncoded(Block[] blocks)
+    {
+        for (int channel = 0; channel < groupByChannelCount; channel++) {
+            if (!(blocks[channel] instanceof RunLengthEncodedBlock)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private int registerGroupId(Block[] dictionaries, int positionInDictionary)
+    {
+        if (dictionaryLookBack.isProcessed(positionInDictionary)) {
+            return dictionaryLookBack.getGroupId(positionInDictionary);
+        }
+
+        int groupId = putIfAbsent(dictionaries, positionInDictionary);
+        dictionaryLookBack.setProcessed(positionInDictionary, groupId);
+        return groupId;
+    }
+
+    private static final class DictionaryLookBack
+    {
+        private static final int INSTANCE_SIZE = instanceSize(DictionaryLookBack.class);
+        private final Block dictionary;
+        private final int[] processed;
+
+        public DictionaryLookBack(Block dictionary)
+        {
+            this.dictionary = dictionary;
+            this.processed = new int[dictionary.getPositionCount()];
+            Arrays.fill(processed, -1);
+        }
+
+        public Block getDictionary()
+        {
+            return dictionary;
+        }
+
+        public int getGroupId(int position)
+        {
+            return processed[position];
+        }
+
+        public boolean isProcessed(int position)
+        {
+            return processed[position] != -1;
+        }
+
+        public void setProcessed(int position, int groupId)
+        {
+            processed[position] = groupId;
+        }
+
+        public long getRetainedSizeInBytes()
+        {
+            return sumExact(
+                    INSTANCE_SIZE,
+                    sizeOf(processed),
+                    dictionary.getRetainedSizeInBytes());
+        }
+    }
+
+    @VisibleForTesting
+    class AddNonDictionaryPageWork
+            implements Work<Void>
+    {
+        private final Block[] blocks;
+        private int lastPosition;
+
+        public AddNonDictionaryPageWork(Block[] blocks)
+        {
+            this.blocks = blocks;
+        }
+
+        @Override
+        public boolean process()
+        {
+            int positionCount = blocks[0].getPositionCount();
+            checkState(lastPosition <= positionCount, "position count out of bound");
+
+            int remainingPositions = positionCount - lastPosition;
+
+            long[] hashes = getHashesBufferArray();
+            while (remainingPositions != 0) {
+                int batchSize = min(remainingPositions, hashes.length);
+                if (!flatHash.ensureAvailableCapacity(batchSize)) {
+                    return false;
+                }
+
+                flatHash.computeHashes(blocks, hashes, lastPosition, batchSize);
+                for (int i = 0; i < batchSize; i++) {
+                    flatHash.putIfAbsent(blocks, lastPosition + i, hashes[i]);
+                }
+
+                lastPosition += batchSize;
+                remainingPositions -= batchSize;
+            }
+            verify(lastPosition == positionCount);
+            return true;
+        }
+
+        @Override
+        public Void getResult()
+        {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    @VisibleForTesting
+    class AddDictionaryPageWork
+            implements Work<Void>
+    {
+        private final DictionaryBlock dictionaryBlock;
+        private final Block[] dictionaries;
+        private int lastPosition;
+
+        public AddDictionaryPageWork(Block[] blocks)
+        {
+            verify(canProcessDictionary(blocks), "invalid call to addDictionaryPage");
+            this.dictionaryBlock = (DictionaryBlock) blocks[0];
+
+            this.dictionaries = Arrays.stream(blocks)
+                    .map(block -> (DictionaryBlock) block)
+                    .map(DictionaryBlock::getDictionary)
+                    .toArray(Block[]::new);
+            updateDictionaryLookBack(dictionaries[0]);
+        }
+
+        @Override
+        public boolean process()
+        {
+            int positionCount = dictionaryBlock.getPositionCount();
+            checkState(lastPosition <= positionCount, "position count out of bound");
+
+            while (lastPosition < positionCount && flatHash.ensureAvailableCapacity(1)) {
+                registerGroupId(dictionaries, dictionaryBlock.getId(lastPosition));
+                lastPosition++;
+            }
+            return lastPosition == positionCount;
+        }
+
+        @Override
+        public Void getResult()
+        {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    class AddLowCardinalityDictionaryPageWork
+            implements Work<Void>
+    {
+        private final Block[] blocks;
+        private final int[] combinationIdToPosition;
+        private int nextCombinationId;
+
+        public AddLowCardinalityDictionaryPageWork(Block[] blocks)
+        {
+            this.blocks = blocks;
+            this.combinationIdToPosition = calculateCombinationIdToPositionMapping(blocks);
+        }
+
+        @Override
+        public boolean process()
+        {
+            for (int combinationId = nextCombinationId; combinationId < combinationIdToPosition.length; combinationId++) {
+                int position = combinationIdToPosition[combinationId];
+                if (position != -1) {
+                    if (!flatHash.ensureAvailableCapacity(1)) {
+                        nextCombinationId = combinationId;
+                        return false;
+                    }
+                    putIfAbsent(blocks, position);
+                }
+            }
+            return true;
+        }
+
+        @Override
+        public Void getResult()
+        {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    @VisibleForTesting
+    class AddRunLengthEncodedPageWork
+            implements Work<Void>
+    {
+        private final Block[] blocks;
+        private boolean finished;
+
+        public AddRunLengthEncodedPageWork(Block[] blocks)
+        {
+            for (int i = 0; i < blocks.length; i++) {
+                // GroupBy blocks are guaranteed to be RLE, but hash block might not be an RLE due to bugs
+                // use getSingleValueBlock here, which for RLE is a no-op, but will still work if hash block is not RLE
+                blocks[i] = blocks[i].getSingleValueBlock(0);
+            }
+            this.blocks = blocks;
+        }
+
+        @Override
+        public boolean process()
+        {
+            checkState(!finished);
+
+            if (!flatHash.ensureAvailableCapacity(1)) {
+                return false;
+            }
+
+            // Only needs to process the first row since it is Run Length Encoded
+            putIfAbsent(blocks, 0);
+            finished = true;
+
+            return true;
+        }
+
+        @Override
+        public Void getResult()
+        {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    @VisibleForTesting
+    class GetNonDictionaryGroupIdsWork
+            implements Work<int[]>
+    {
+        private final Block[] blocks;
+        private final int[] groupIds;
+
+        private boolean finished;
+        private int lastPosition;
+
+        public GetNonDictionaryGroupIdsWork(Block[] blocks)
+        {
+            this.blocks = blocks;
+            this.groupIds = new int[currentBlocks[0].getPositionCount()];
+        }
+
+        @Override
+        public boolean process()
+        {
+            int positionCount = groupIds.length;
+            checkState(lastPosition <= positionCount, "position count out of bound");
+            checkState(!finished);
+
+            int remainingPositions = positionCount - lastPosition;
+
+            long[] hashes = getHashesBufferArray();
+            while (remainingPositions != 0) {
+                int batchSize = min(remainingPositions, hashes.length);
+                if (!flatHash.ensureAvailableCapacity(batchSize)) {
+                    return false;
+                }
+
+                flatHash.computeHashes(blocks, hashes, lastPosition, batchSize);
+                for (int i = 0, position = lastPosition; i < batchSize; i++, position++) {
+                    groupIds[position] = flatHash.putIfAbsent(blocks, position, hashes[i]);
+                }
+
+                lastPosition += batchSize;
+                remainingPositions -= batchSize;
+            }
+            verify(lastPosition == positionCount);
+            return true;
+        }
+
+        @Override
+        public int[] getResult()
+        {
+            checkState(lastPosition == currentBlocks[0].getPositionCount(), "process has not yet finished");
+            checkState(!finished, "result has produced");
+            finished = true;
+            return groupIds;
+        }
+    }
+
+    @VisibleForTesting
+    class GetLowCardinalityDictionaryGroupIdsWork
+            implements Work<int[]>
+    {
+        private final Block[] blocks;
+        private final short[] positionToCombinationId;
+        private final int[] combinationIdToGroupId;
+        private final int[] groupIds;
+
+        private int nextPosition;
+        private boolean finished;
+
+        public GetLowCardinalityDictionaryGroupIdsWork(Block[] blocks)
+        {
+            this.blocks = blocks;
+
+            int positionCount = blocks[0].getPositionCount();
+            positionToCombinationId = new short[positionCount];
+            int maxCardinality = calculatePositionToCombinationIdMapping(blocks, positionToCombinationId);
+
+            combinationIdToGroupId = new int[maxCardinality];
+            Arrays.fill(combinationIdToGroupId, -1);
+            groupIds = new int[positionCount];
+        }
+
+        @Override
+        public boolean process()
+        {
+            for (int position = nextPosition; position < positionToCombinationId.length; position++) {
+                short combinationId = positionToCombinationId[position];
+                int groupId = combinationIdToGroupId[combinationId];
+                if (groupId == -1) {
+                    if (!flatHash.ensureAvailableCapacity(1)) {
+                        nextPosition = position;
+                        return false;
+                    }
+                    groupId = putIfAbsent(blocks, position);
+                    combinationIdToGroupId[combinationId] = groupId;
+                }
+                groupIds[position] = groupId;
+            }
+            return true;
+        }
+
+        @Override
+        public int[] getResult()
+        {
+            checkState(!finished, "result has produced");
+            finished = true;
+            return groupIds;
+        }
+    }
+
+    @VisibleForTesting
+    class GetDictionaryGroupIdsWork
+            implements Work<int[]>
+    {
+        private final int[] groupIds;
+        private final DictionaryBlock dictionaryBlock;
+        private final Block[] dictionaries;
+
+        private boolean finished;
+        private int lastPosition;
+
+        public GetDictionaryGroupIdsWork(Block[] blocks)
+        {
+            verify(canProcessDictionary(blocks), "invalid call to processDictionary");
+
+            this.dictionaryBlock = (DictionaryBlock) blocks[0];
+            this.groupIds = new int[dictionaryBlock.getPositionCount()];
+
+            this.dictionaries = Arrays.stream(blocks)
+                    .map(block -> (DictionaryBlock) block)
+                    .map(DictionaryBlock::getDictionary)
+                    .toArray(Block[]::new);
+            updateDictionaryLookBack(dictionaries[0]);
+        }
+
+        @Override
+        public boolean process()
+        {
+            checkState(lastPosition <= groupIds.length, "position count out of bound");
+            checkState(!finished);
+
+            while (lastPosition < groupIds.length && flatHash.ensureAvailableCapacity(1)) {
+                groupIds[lastPosition] = registerGroupId(dictionaries, dictionaryBlock.getId(lastPosition));
+                lastPosition++;
+            }
+            return lastPosition == groupIds.length;
+        }
+
+        @Override
+        public int[] getResult()
+        {
+            checkState(lastPosition == groupIds.length, "process has not yet finished");
+            checkState(!finished, "result has produced");
+            finished = true;
+            return groupIds;
+        }
+    }
+
+    @VisibleForTesting
+    class GetRunLengthEncodedGroupIdsWork
+            implements Work<int[]>
+    {
+        private final int positionCount;
+        private final Block[] blocks;
+        private int groupId = -1;
+        private boolean processFinished;
+        private boolean resultProduced;
+
+        public GetRunLengthEncodedGroupIdsWork(Block[] blocks)
+        {
+            positionCount = blocks[0].getPositionCount();
+            for (int i = 0; i < blocks.length; i++) {
+                // GroupBy blocks are guaranteed to be RLE, but hash block might not be an RLE due to bugs
+                // use getSingleValueBlock here, which for RLE is a no-op, but will still work if hash block is not RLE
+                blocks[i] = blocks[i].getSingleValueBlock(0);
+            }
+            this.blocks = blocks;
+        }
+
+        @Override
+        public boolean process()
+        {
+            checkState(!processFinished);
+
+            if (!flatHash.ensureAvailableCapacity(1)) {
+                return false;
+            }
+
+            // Only needs to process the first row since it is Run Length Encoded
+            groupId = putIfAbsent(blocks, 0);
+            processFinished = true;
+            return true;
+        }
+
+        @Override
+        public int[] getResult()
+        {
+            checkState(processFinished);
+            checkState(!resultProduced);
+            resultProduced = true;
+
+            int[] groupIds = new int[positionCount];
+            Arrays.fill(groupIds, groupId);
+            return groupIds;
+        }
+    }
+
+    /**
+     * Returns an array containing a position that corresponds to the low cardinality
+     * dictionary combinationId, or a value of -1 if no position exists within the page
+     * for that combinationId.
+     */
+    private int[] calculateCombinationIdToPositionMapping(Block[] blocks)
+    {
+        short[] positionToCombinationId = new short[blocks[0].getPositionCount()];
+        int maxCardinality = calculatePositionToCombinationIdMapping(blocks, positionToCombinationId);
+
+        int[] combinationIdToPosition = new int[maxCardinality];
+        Arrays.fill(combinationIdToPosition, -1);
+        for (int position = 0; position < positionToCombinationId.length; position++) {
+            combinationIdToPosition[positionToCombinationId[position]] = position;
+        }
+        return combinationIdToPosition;
+    }
+
+    /**
+     * Returns the number of combinations in all dictionary ids in input page blocks and populates
+     * positionToCombinationIds with the combinationId for each position in the input Page
+     */
+    private int calculatePositionToCombinationIdMapping(Block[] blocks, short[] positionToCombinationIds)
+    {
+        checkArgument(positionToCombinationIds.length == blocks[0].getPositionCount());
+
+        int maxCardinality = 1;
+        for (int channel = 0; channel < groupByChannelCount; channel++) {
+            Block block = blocks[channel];
+            verify(block instanceof DictionaryBlock, "Only dictionary blocks are supported");
+            DictionaryBlock dictionaryBlock = (DictionaryBlock) block;
+            int dictionarySize = dictionaryBlock.getDictionary().getPositionCount();
+            maxCardinality *= dictionarySize;
+            if (channel == 0) {
+                for (int position = 0; position < positionToCombinationIds.length; position++) {
+                    positionToCombinationIds[position] = (short) dictionaryBlock.getId(position);
+                }
+            }
+            else {
+                for (int position = 0; position < positionToCombinationIds.length; position++) {
+                    int combinationId = positionToCombinationIds[position];
+                    combinationId *= dictionarySize;
+                    combinationId += dictionaryBlock.getId(position);
+                    positionToCombinationIds[position] = Shorts.checkedCast(combinationId);
+                }
+            }
+        }
+        return maxCardinality;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/FlatHash.java b/core/trino-main/src/main/java/io/trino/operator/FlatHash.java
new file mode 100644
index 000000000000..3086d9594032
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/FlatHash.java
@@ -0,0 +1,552 @@
+/*
+ * Licensed 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 io.trino.operator;
+
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Throwables.throwIfUnchecked;
+import static com.google.common.base.Verify.verify;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.airlift.slice.SizeOf.sizeOfByteArray;
+import static io.airlift.slice.SizeOf.sizeOfIntArray;
+import static io.airlift.slice.SizeOf.sizeOfObjectArray;
+import static io.trino.operator.VariableWidthData.EMPTY_CHUNK;
+import static io.trino.operator.VariableWidthData.POINTER_SIZE;
+import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static java.lang.Math.addExact;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+import static java.lang.Math.multiplyExact;
+import static java.lang.Math.toIntExact;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
+
+public final class FlatHash
+{
+    private static final int INSTANCE_SIZE = instanceSize(FlatHash.class);
+
+    private static final double DEFAULT_LOAD_FACTOR = 15.0 / 16;
+
+    private static int computeCapacity(int maxSize, double loadFactor)
+    {
+        int capacity = (int) (maxSize / loadFactor);
+        return max(toIntExact(1L << (64 - Long.numberOfLeadingZeros(capacity - 1))), 16);
+    }
+
+    private static final int RECORDS_PER_GROUP_SHIFT = 10;
+    private static final int RECORDS_PER_GROUP = 1 << RECORDS_PER_GROUP_SHIFT;
+    private static final int RECORDS_PER_GROUP_MASK = RECORDS_PER_GROUP - 1;
+
+    private static final int VECTOR_LENGTH = Long.BYTES;
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, LITTLE_ENDIAN);
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, LITTLE_ENDIAN);
+
+    private final FlatHashStrategy flatHashStrategy;
+    private final boolean hasPrecomputedHash;
+
+    private final int recordSize;
+    private final int recordGroupIdOffset;
+    private final int recordHashOffset;
+    private final int recordValueOffset;
+
+    private int capacity;
+    private int mask;
+
+    private byte[] control;
+    private byte[][] recordGroups;
+    private final VariableWidthData variableWidthData;
+
+    // position of each group in the hash table
+    private int[] groupRecordIndex;
+
+    // reserve enough memory before rehash
+    private final UpdateMemory checkMemoryReservation;
+    private long fixedSizeEstimate;
+    private long rehashMemoryReservation;
+
+    private int nextGroupId;
+    private int maxFill;
+
+    public FlatHash(FlatHashStrategy flatHashStrategy, boolean hasPrecomputedHash, int expectedSize, UpdateMemory checkMemoryReservation)
+    {
+        this.flatHashStrategy = flatHashStrategy;
+        this.hasPrecomputedHash = hasPrecomputedHash;
+        this.checkMemoryReservation = checkMemoryReservation;
+
+        capacity = max(VECTOR_LENGTH, computeCapacity(expectedSize, DEFAULT_LOAD_FACTOR));
+        maxFill = calculateMaxFill(capacity);
+        mask = capacity - 1;
+        control = new byte[capacity + VECTOR_LENGTH];
+
+        groupRecordIndex = new int[maxFill];
+
+        // the record is laid out as follows:
+        // 1. optional variable width pointer
+        // 2. groupId (int)
+        // 3. fixed data for each type
+        boolean variableWidth = flatHashStrategy.isAnyVariableWidth();
+        variableWidthData = variableWidth ? new VariableWidthData() : null;
+        recordGroupIdOffset = (variableWidth ? POINTER_SIZE : 0);
+        recordHashOffset = recordGroupIdOffset + Integer.BYTES;
+        recordValueOffset = recordHashOffset + (hasPrecomputedHash ? Long.BYTES : 0);
+        recordSize = recordValueOffset + flatHashStrategy.getTotalFlatFixedLength();
+
+        recordGroups = createRecordGroups(capacity, recordSize);
+        fixedSizeEstimate = computeFixedSizeEstimate(capacity, recordSize);
+    }
+
+    public long getEstimatedSize()
+    {
+        return sumExact(
+                fixedSizeEstimate,
+                (variableWidthData == null ? 0 : variableWidthData.getRetainedSizeBytes()),
+                rehashMemoryReservation);
+    }
+
+    public int size()
+    {
+        return nextGroupId;
+    }
+
+    public int getCapacity()
+    {
+        return capacity;
+    }
+
+    public long hashPosition(int groupId)
+    {
+        // for spilling
+        checkArgument(groupId < nextGroupId, "groupId out of range");
+
+        int index = groupRecordIndex[groupId];
+        byte[] records = getRecords(index);
+        if (hasPrecomputedHash) {
+            return (long) LONG_HANDLE.get(records, getRecordOffset(index) + recordHashOffset);
+        }
+        else {
+            return valueHashCode(records, index);
+        }
+    }
+
+    public void appendTo(int groupId, BlockBuilder[] blockBuilders)
+    {
+        checkArgument(groupId < nextGroupId, "groupId out of range");
+        int index = groupRecordIndex[groupId];
+        byte[] records = getRecords(index);
+        int recordOffset = getRecordOffset(index);
+
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            variableWidthChunk = variableWidthData.getChunk(records, recordOffset);
+        }
+
+        flatHashStrategy.readFlat(records, recordOffset + recordValueOffset, variableWidthChunk, blockBuilders);
+        if (hasPrecomputedHash) {
+            BIGINT.writeLong(blockBuilders[blockBuilders.length - 1], (long) LONG_HANDLE.get(records, recordOffset + recordHashOffset));
+        }
+    }
+
+    public boolean contains(Block[] blocks, int position)
+    {
+        return contains(blocks, position, flatHashStrategy.hash(blocks, position));
+    }
+
+    public boolean contains(Block[] blocks, int position, long hash)
+    {
+        return getIndex(blocks, position, hash) >= 0;
+    }
+
+    public void computeHashes(Block[] blocks, long[] hashes, int offset, int length)
+    {
+        if (hasPrecomputedHash) {
+            Block hashBlock = blocks[blocks.length - 1];
+            for (int i = 0; i < length; i++) {
+                hashes[i] = BIGINT.getLong(hashBlock, offset + i);
+            }
+        }
+        else {
+            flatHashStrategy.hashBlocksBatched(blocks, hashes, offset, length);
+        }
+    }
+
+    public int putIfAbsent(Block[] blocks, int position, long hash)
+    {
+        int index = getIndex(blocks, position, hash);
+        if (index >= 0) {
+            return (int) INT_HANDLE.get(getRecords(index), getRecordOffset(index) + recordGroupIdOffset);
+        }
+
+        index = -index - 1;
+        int groupId = addNewGroup(index, blocks, position, hash);
+        if (nextGroupId >= maxFill) {
+            rehash(0);
+        }
+        return groupId;
+    }
+
+    public int putIfAbsent(Block[] blocks, int position)
+    {
+        long hash;
+        if (hasPrecomputedHash) {
+            hash = BIGINT.getLong(blocks[blocks.length - 1], position);
+        }
+        else {
+            hash = flatHashStrategy.hash(blocks, position);
+        }
+
+        return putIfAbsent(blocks, position, hash);
+    }
+
+    private int getIndex(Block[] blocks, int position, long hash)
+    {
+        byte hashPrefix = (byte) (hash & 0x7F | 0x80);
+        int bucket = bucket((int) (hash >> 7));
+
+        int step = 1;
+        long repeated = repeat(hashPrefix);
+
+        while (true) {
+            final long controlVector = (long) LONG_HANDLE.get(control, bucket);
+
+            int matchIndex = matchInVector(blocks, position, hash, bucket, repeated, controlVector);
+            if (matchIndex >= 0) {
+                return matchIndex;
+            }
+
+            int emptyIndex = findEmptyInVector(controlVector, bucket);
+            if (emptyIndex >= 0) {
+                return -emptyIndex - 1;
+            }
+
+            bucket = bucket(bucket + step);
+            step += VECTOR_LENGTH;
+        }
+    }
+
+    private int matchInVector(Block[] blocks, int position, long hash, int vectorStartBucket, long repeated, long controlVector)
+    {
+        long controlMatches = match(controlVector, repeated);
+        while (controlMatches != 0) {
+            int index = bucket(vectorStartBucket + (Long.numberOfTrailingZeros(controlMatches) >>> 3));
+            if (valueNotDistinctFrom(index, blocks, position, hash)) {
+                return index;
+            }
+
+            controlMatches = controlMatches & (controlMatches - 1);
+        }
+        return -1;
+    }
+
+    private int findEmptyInVector(long vector, int vectorStartBucket)
+    {
+        long controlMatches = match(vector, 0x00_00_00_00_00_00_00_00L);
+        if (controlMatches == 0) {
+            return -1;
+        }
+        int slot = Long.numberOfTrailingZeros(controlMatches) >>> 3;
+        return bucket(vectorStartBucket + slot);
+    }
+
+    private int addNewGroup(int index, Block[] blocks, int position, long hash)
+    {
+        setControl(index, (byte) (hash & 0x7F | 0x80));
+
+        byte[] records = getRecords(index);
+        int recordOffset = getRecordOffset(index);
+
+        int groupId = nextGroupId++;
+        INT_HANDLE.set(records, recordOffset + recordGroupIdOffset, groupId);
+        groupRecordIndex[groupId] = index;
+
+        if (hasPrecomputedHash) {
+            LONG_HANDLE.set(records, recordOffset + recordHashOffset, hash);
+        }
+
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        int variableWidthChunkOffset = 0;
+        if (variableWidthData != null) {
+            int variableWidthSize = flatHashStrategy.getTotalVariableWidth(blocks, position);
+            variableWidthChunk = variableWidthData.allocate(records, recordOffset, variableWidthSize);
+            variableWidthChunkOffset = VariableWidthData.getChunkOffset(records, recordOffset);
+        }
+        flatHashStrategy.writeFlat(blocks, position, records, recordOffset + recordValueOffset, variableWidthChunk, variableWidthChunkOffset);
+        return groupId;
+    }
+
+    private void setControl(int index, byte hashPrefix)
+    {
+        control[index] = hashPrefix;
+        if (index < VECTOR_LENGTH) {
+            control[index + capacity] = hashPrefix;
+        }
+    }
+
+    public boolean ensureAvailableCapacity(int batchSize)
+    {
+        long requiredMaxFill = nextGroupId + batchSize;
+        if (requiredMaxFill >= maxFill) {
+            long minimumRequiredCapacity = (requiredMaxFill + 1) * 16 / 15;
+            return tryRehash(toIntExact(minimumRequiredCapacity));
+        }
+        return true;
+    }
+
+    private boolean tryRehash(int minimumRequiredCapacity)
+    {
+        int newCapacity = computeNewCapacity(minimumRequiredCapacity);
+
+        // update the fixed size estimate to the new size as we will need this much memory after the rehash
+        fixedSizeEstimate = computeFixedSizeEstimate(newCapacity, recordSize);
+
+        // the rehash incrementally allocates the new records as needed, so as new memory is added old memory is released
+        // while the rehash is in progress, the old control array is retained, and one additional record group is retained
+        rehashMemoryReservation = sumExact(sizeOf(control), sizeOf(recordGroups[0]));
+        verify(rehashMemoryReservation >= 0, "rehashMemoryReservation is negative");
+        if (!checkMemoryReservation.update()) {
+            return false;
+        }
+
+        rehash(minimumRequiredCapacity);
+        return true;
+    }
+
+    private void rehash(int minimumRequiredCapacity)
+    {
+        int oldCapacity = capacity;
+        byte[] oldControl = control;
+        byte[][] oldRecordGroups = recordGroups;
+
+        capacity = computeNewCapacity(minimumRequiredCapacity);
+        maxFill = calculateMaxFill(capacity);
+        mask = capacity - 1;
+
+        control = new byte[capacity + VECTOR_LENGTH];
+
+        // we incrementally allocate the record groups to smooth out memory allocation
+        if (capacity <= RECORDS_PER_GROUP) {
+            recordGroups = new byte[][]{new byte[multiplyExact(capacity, recordSize)]};
+        }
+        else {
+            recordGroups = new byte[(capacity + 1) >> RECORDS_PER_GROUP_SHIFT][];
+        }
+
+        groupRecordIndex = new int[maxFill];
+
+        for (int oldRecordGroupIndex = 0; oldRecordGroupIndex < oldRecordGroups.length; oldRecordGroupIndex++) {
+            byte[] oldRecords = oldRecordGroups[oldRecordGroupIndex];
+            oldRecordGroups[oldRecordGroupIndex] = null;
+            for (int indexInRecordGroup = 0; indexInRecordGroup < min(RECORDS_PER_GROUP, oldCapacity); indexInRecordGroup++) {
+                int oldIndex = (oldRecordGroupIndex << RECORDS_PER_GROUP_SHIFT) + indexInRecordGroup;
+                if (oldControl[oldIndex] == 0) {
+                    continue;
+                }
+
+                long hash;
+                if (hasPrecomputedHash) {
+                    hash = (long) LONG_HANDLE.get(oldRecords, getRecordOffset(oldIndex) + recordHashOffset);
+                }
+                else {
+                    hash = valueHashCode(oldRecords, oldIndex);
+                }
+
+                byte hashPrefix = (byte) (hash & 0x7F | 0x80);
+                int bucket = bucket((int) (hash >> 7));
+
+                // getIndex is not used here because values in a rehash are always distinct
+                int step = 1;
+                while (true) {
+                    final long controlVector = (long) LONG_HANDLE.get(control, bucket);
+                    // values are already distinct, so just find the first empty slot
+                    int emptyIndex = findEmptyInVector(controlVector, bucket);
+                    if (emptyIndex >= 0) {
+                        setControl(emptyIndex, hashPrefix);
+
+                        int newRecordGroupIndex = emptyIndex >> RECORDS_PER_GROUP_SHIFT;
+                        byte[] records = recordGroups[newRecordGroupIndex];
+                        if (records == null) {
+                            records = new byte[multiplyExact(RECORDS_PER_GROUP, recordSize)];
+                            recordGroups[newRecordGroupIndex] = records;
+                        }
+                        int recordOffset = getRecordOffset(emptyIndex);
+                        int oldRecordOffset = getRecordOffset(oldIndex);
+                        System.arraycopy(oldRecords, oldRecordOffset, records, recordOffset, recordSize);
+
+                        int groupId = (int) INT_HANDLE.get(records, recordOffset + recordGroupIdOffset);
+                        groupRecordIndex[groupId] = emptyIndex;
+
+                        break;
+                    }
+
+                    bucket = bucket(bucket + step);
+                    step += VECTOR_LENGTH;
+                }
+            }
+        }
+
+        // add any completely empty record groups
+        // the odds of needing this are exceedingly low, but it is technically possible
+        for (int i = 0; i < recordGroups.length; i++) {
+            if (recordGroups[i] == null) {
+                recordGroups[i] = new byte[multiplyExact(RECORDS_PER_GROUP, recordSize)];
+            }
+        }
+
+        // release temporary memory reservation
+        rehashMemoryReservation = 0;
+        fixedSizeEstimate = computeFixedSizeEstimate(capacity, recordSize);
+        checkMemoryReservation.update();
+    }
+
+    private int computeNewCapacity(int minimumRequiredCapacity)
+    {
+        checkArgument(minimumRequiredCapacity >= 0, "minimumRequiredCapacity must be positive");
+        long newCapacityLong = capacity * 2L;
+        while (newCapacityLong < minimumRequiredCapacity) {
+            newCapacityLong = multiplyExact(newCapacityLong, 2);
+        }
+        if (newCapacityLong > Integer.MAX_VALUE) {
+            throw new TrinoException(GENERIC_INSUFFICIENT_RESOURCES, "Size of hash table cannot exceed 1 billion entries");
+        }
+        return toIntExact(newCapacityLong);
+    }
+
+    private int bucket(int hash)
+    {
+        return hash & mask;
+    }
+
+    private byte[] getRecords(int index)
+    {
+        return recordGroups[index >> RECORDS_PER_GROUP_SHIFT];
+    }
+
+    private int getRecordOffset(int index)
+    {
+        return (index & RECORDS_PER_GROUP_MASK) * recordSize;
+    }
+
+    private long valueHashCode(byte[] records, int index)
+    {
+        int recordOffset = getRecordOffset(index);
+
+        try {
+            byte[] variableWidthChunk = EMPTY_CHUNK;
+            if (variableWidthData != null) {
+                variableWidthChunk = variableWidthData.getChunk(records, recordOffset);
+            }
+
+            return flatHashStrategy.hash(records, recordOffset + recordValueOffset, variableWidthChunk);
+        }
+        catch (Throwable throwable) {
+            throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private boolean valueNotDistinctFrom(int leftIndex, Block[] rightBlocks, int rightPosition, long rightHash)
+    {
+        byte[] leftRecords = getRecords(leftIndex);
+        int leftRecordOffset = getRecordOffset(leftIndex);
+
+        if (hasPrecomputedHash) {
+            long leftHash = (long) LONG_HANDLE.get(leftRecords, leftRecordOffset + recordHashOffset);
+            if (leftHash != rightHash) {
+                return false;
+            }
+        }
+
+        byte[] leftVariableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            leftVariableWidthChunk = variableWidthData.getChunk(leftRecords, leftRecordOffset);
+        }
+
+        return flatHashStrategy.valueNotDistinctFrom(
+                leftRecords,
+                leftRecordOffset + recordValueOffset,
+                leftVariableWidthChunk,
+                rightBlocks,
+                rightPosition);
+    }
+
+    private static long repeat(byte value)
+    {
+        return ((value & 0xFF) * 0x01_01_01_01_01_01_01_01L);
+    }
+
+    private static long match(long vector, long repeatedValue)
+    {
+        // HD 6-1
+        long comparison = vector ^ repeatedValue;
+        return (comparison - 0x01_01_01_01_01_01_01_01L) & ~comparison & 0x80_80_80_80_80_80_80_80L;
+    }
+
+    public int getPhysicalPosition(int groupId)
+    {
+        return groupRecordIndex[groupId];
+    }
+
+    private static int calculateMaxFill(int capacity)
+    {
+        return toIntExact(capacity * 15L / 16);
+    }
+
+    private static byte[][] createRecordGroups(int capacity, int recordSize)
+    {
+        if (capacity <= RECORDS_PER_GROUP) {
+            return new byte[][] {new byte[multiplyExact(capacity, recordSize)]};
+        }
+
+        byte[][] groups = new byte[(capacity + 1) >> RECORDS_PER_GROUP_SHIFT][];
+        for (int i = 0; i < groups.length; i++) {
+            groups[i] = new byte[multiplyExact(RECORDS_PER_GROUP, recordSize)];
+        }
+        return groups;
+    }
+
+    private static long computeRecordGroupsSize(int capacity, int recordSize)
+    {
+        if (capacity <= RECORDS_PER_GROUP) {
+            return sizeOfObjectArray(1) + sizeOfByteArray(multiplyExact(capacity, recordSize));
+        }
+
+        int groupCount = addExact(capacity, 1) >> RECORDS_PER_GROUP_SHIFT;
+        return sizeOfObjectArray(groupCount) +
+                multiplyExact(groupCount, sizeOfByteArray(multiplyExact(RECORDS_PER_GROUP, recordSize)));
+    }
+
+    private static long computeFixedSizeEstimate(int capacity, int recordSize)
+    {
+        return sumExact(
+                INSTANCE_SIZE,
+                sizeOfByteArray(capacity + VECTOR_LENGTH),
+                computeRecordGroupsSize(capacity, recordSize),
+                sizeOfIntArray(capacity));
+    }
+
+    public static long sumExact(long... values)
+    {
+        long result = 0;
+        for (long value : values) {
+            result = addExact(result, value);
+        }
+        return result;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/FlatHashStrategy.java b/core/trino-main/src/main/java/io/trino/operator/FlatHashStrategy.java
new file mode 100644
index 000000000000..7213d4fbc5e9
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/FlatHashStrategy.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed 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 io.trino.operator;
+
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+
+public interface FlatHashStrategy
+{
+    boolean isAnyVariableWidth();
+
+    int getTotalFlatFixedLength();
+
+    int getTotalVariableWidth(Block[] blocks, int position);
+
+    void readFlat(byte[] fixedChunk, int fixedOffset, byte[] variableChunk, BlockBuilder[] blockBuilders);
+
+    void writeFlat(Block[] blocks, int position, byte[] fixedChunk, int fixedOffset, byte[] variableChunk, int variableOffset);
+
+    boolean valueNotDistinctFrom(
+            byte[] leftFixedChunk,
+            int leftFixedOffset,
+            byte[] leftVariableChunk,
+            Block[] rightBlocks,
+            int rightPosition);
+
+    long hash(Block[] blocks, int position);
+
+    long hash(byte[] fixedChunk, int fixedOffset, byte[] variableChunk);
+
+    void hashBlocksBatched(Block[] blocks, long[] hashes, int offset, int length);
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/FlatHashStrategyCompiler.java b/core/trino-main/src/main/java/io/trino/operator/FlatHashStrategyCompiler.java
new file mode 100644
index 000000000000..1919c222ba91
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/FlatHashStrategyCompiler.java
@@ -0,0 +1,504 @@
+/*
+ * Licensed 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 io.trino.operator;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.bytecode.BytecodeBlock;
+import io.airlift.bytecode.ClassDefinition;
+import io.airlift.bytecode.FieldDefinition;
+import io.airlift.bytecode.MethodDefinition;
+import io.airlift.bytecode.Parameter;
+import io.airlift.bytecode.Scope;
+import io.airlift.bytecode.Variable;
+import io.airlift.bytecode.control.ForLoop;
+import io.airlift.bytecode.control.IfStatement;
+import io.trino.operator.scalar.CombineHashFunction;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
+import io.trino.sql.gen.CallSiteBinder;
+
+import java.lang.invoke.MethodHandle;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import static io.airlift.bytecode.Access.FINAL;
+import static io.airlift.bytecode.Access.PRIVATE;
+import static io.airlift.bytecode.Access.PUBLIC;
+import static io.airlift.bytecode.Access.STATIC;
+import static io.airlift.bytecode.Access.a;
+import static io.airlift.bytecode.Parameter.arg;
+import static io.airlift.bytecode.ParameterizedType.type;
+import static io.airlift.bytecode.expression.BytecodeExpressions.add;
+import static io.airlift.bytecode.expression.BytecodeExpressions.and;
+import static io.airlift.bytecode.expression.BytecodeExpressions.constantBoolean;
+import static io.airlift.bytecode.expression.BytecodeExpressions.constantFalse;
+import static io.airlift.bytecode.expression.BytecodeExpressions.constantInt;
+import static io.airlift.bytecode.expression.BytecodeExpressions.constantLong;
+import static io.airlift.bytecode.expression.BytecodeExpressions.constantTrue;
+import static io.airlift.bytecode.expression.BytecodeExpressions.invokeDynamic;
+import static io.airlift.bytecode.expression.BytecodeExpressions.invokeStatic;
+import static io.airlift.bytecode.expression.BytecodeExpressions.lessThan;
+import static io.airlift.bytecode.expression.BytecodeExpressions.not;
+import static io.airlift.bytecode.expression.BytecodeExpressions.notEqual;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
+import static io.trino.spi.function.InvocationConvention.simpleConvention;
+import static io.trino.spi.type.TypeUtils.NULL_HASH_CODE;
+import static io.trino.sql.gen.Bootstrap.BOOTSTRAP_METHOD;
+import static io.trino.sql.gen.BytecodeUtils.loadConstant;
+import static io.trino.sql.gen.SqlTypeBytecodeExpression.constantType;
+import static io.trino.sql.planner.optimizations.HashGenerationOptimizer.INITIAL_HASH_VALUE;
+import static io.trino.util.CompilerUtils.defineClass;
+import static io.trino.util.CompilerUtils.makeClassName;
+
+public final class FlatHashStrategyCompiler
+{
+    private FlatHashStrategyCompiler() {}
+
+    public static FlatHashStrategy compileFlatHashStrategy(List<Type> types, TypeOperators typeOperators)
+    {
+        boolean anyVariableWidth = (int) types.stream().filter(Type::isFlatVariableWidth).count() > 0;
+
+        List<KeyField> keyFields = new ArrayList<>();
+        int fixedOffset = 0;
+        for (int i = 0; i < types.size(); i++) {
+            Type type = types.get(i);
+            keyFields.add(new KeyField(
+                    i,
+                    type,
+                    fixedOffset,
+                    fixedOffset + 1,
+                    typeOperators.getReadValueOperator(type, simpleConvention(BLOCK_BUILDER, FLAT)),
+                    typeOperators.getReadValueOperator(type, simpleConvention(FLAT_RETURN, BLOCK_POSITION_NOT_NULL)),
+                    typeOperators.getDistinctFromOperator(type, simpleConvention(FAIL_ON_NULL, FLAT, BLOCK_POSITION_NOT_NULL)),
+                    typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, FLAT)),
+                    typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL))));
+            fixedOffset += 1 + type.getFlatFixedSize();
+        }
+
+        CallSiteBinder callSiteBinder = new CallSiteBinder();
+        ClassDefinition definition = new ClassDefinition(
+                a(PUBLIC, FINAL),
+                makeClassName("FlatHashStrategy"),
+                type(Object.class),
+                type(FlatHashStrategy.class));
+
+        // the 'types' field is not used, but it makes debugging easier
+        // this is an instance field because a static field doesn't seem to show up in the IntelliJ debugger
+        FieldDefinition typesField = definition.declareField(a(PRIVATE, FINAL), "types", type(List.class, Type.class));
+        MethodDefinition constructor = definition.declareConstructor(a(PUBLIC));
+        constructor
+                .getBody()
+                .append(constructor.getThis())
+                .invokeConstructor(Object.class)
+                .append(constructor.getThis().setField(typesField, loadConstant(callSiteBinder, ImmutableList.copyOf(types), List.class)))
+                .ret();
+
+        definition.declareMethod(a(PUBLIC), "isAnyVariableWidth", type(boolean.class)).getBody()
+                .append(constantBoolean(anyVariableWidth).ret());
+
+        definition.declareMethod(a(PUBLIC), "getTotalFlatFixedLength", type(int.class)).getBody()
+                .append(constantInt(fixedOffset).ret());
+
+        generateGetTotalVariableWidth(definition, keyFields, callSiteBinder);
+
+        generateReadFlat(definition, keyFields, callSiteBinder);
+        generateWriteFlat(definition, keyFields, callSiteBinder);
+        generateNotDistinctFromMethod(definition, keyFields, callSiteBinder);
+        generateHashBlock(definition, keyFields, callSiteBinder);
+        generateHashFlat(definition, keyFields, callSiteBinder);
+        generateHashBlocksBatched(definition, keyFields, callSiteBinder);
+
+        try {
+            return defineClass(definition, FlatHashStrategy.class, callSiteBinder.getBindings(), FlatHashStrategyCompiler.class.getClassLoader())
+                    .getConstructor()
+                    .newInstance();
+        }
+        catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static void generateGetTotalVariableWidth(ClassDefinition definition, List<KeyField> keyFields, CallSiteBinder callSiteBinder)
+    {
+        Parameter blocks = arg("blocks", type(Block[].class));
+        Parameter position = arg("position", type(int.class));
+        MethodDefinition methodDefinition = definition.declareMethod(
+                a(PUBLIC),
+                "getTotalVariableWidth",
+                type(int.class),
+                blocks,
+                position);
+        BytecodeBlock body = methodDefinition.getBody();
+
+        Scope scope = methodDefinition.getScope();
+        Variable variableWidth = scope.declareVariable("variableWidth", body, constantLong(0));
+
+        for (KeyField keyField : keyFields) {
+            Type type = keyField.type();
+            if (type.isFlatVariableWidth()) {
+                body.append(new IfStatement()
+                        .condition(not(blocks.getElement(keyField.index()).invoke("isNull", boolean.class, position)))
+                        .ifTrue(variableWidth.set(add(
+                                variableWidth,
+                                constantType(callSiteBinder, type).invoke("getFlatVariableWidthSize", int.class, blocks.getElement(keyField.index()), position).cast(long.class)))));
+            }
+        }
+        body.append(invokeStatic(Math.class, "toIntExact", int.class, variableWidth).ret());
+    }
+
+    private static void generateReadFlat(ClassDefinition definition, List<KeyField> keyFields, CallSiteBinder callSiteBinder)
+    {
+        Parameter fixedChunk = arg("fixedChunk", type(byte[].class));
+        Parameter fixedOffset = arg("fixedOffset", type(int.class));
+        Parameter variableChunk = arg("variableChunk", type(byte[].class));
+        Parameter blockBuilders = arg("blockBuilders", type(BlockBuilder[].class));
+        MethodDefinition methodDefinition = definition.declareMethod(
+                a(PUBLIC),
+                "readFlat",
+                type(void.class),
+                fixedChunk,
+                fixedOffset,
+                variableChunk,
+                blockBuilders);
+        BytecodeBlock body = methodDefinition.getBody();
+
+        for (KeyField keyField : keyFields) {
+            body.append(new IfStatement()
+                    .condition(notEqual(fixedChunk.getElement(add(fixedOffset, constantInt(keyField.fieldIsNullOffset()))).cast(int.class), constantInt(0)))
+                    .ifTrue(blockBuilders.getElement(keyField.index()).invoke("appendNull", BlockBuilder.class).pop())
+                    .ifFalse(new BytecodeBlock()
+                            .append(invokeDynamic(
+                                    BOOTSTRAP_METHOD,
+                                    ImmutableList.of(callSiteBinder.bind(keyField.readFlatMethod()).getBindingId()),
+                                    "readFlat",
+                                    void.class,
+                                    fixedChunk,
+                                    add(fixedOffset, constantInt(keyField.fieldFixedOffset())),
+                                    variableChunk,
+                                    blockBuilders.getElement(keyField.index())))));
+        }
+        body.ret();
+    }
+
+    private static void generateWriteFlat(ClassDefinition definition, List<KeyField> keyFields, CallSiteBinder callSiteBinder)
+    {
+        Parameter blocks = arg("blocks", type(Block[].class));
+        Parameter position = arg("position", type(int.class));
+        Parameter fixedChunk = arg("fixedChunk", type(byte[].class));
+        Parameter fixedOffset = arg("fixedOffset", type(int.class));
+        Parameter variableChunk = arg("variableChunk", type(byte[].class));
+        Parameter variableOffset = arg("variableOffset", type(int.class));
+        MethodDefinition methodDefinition = definition.declareMethod(
+                a(PUBLIC),
+                "writeFlat",
+                type(void.class),
+                blocks,
+                position,
+                fixedChunk,
+                fixedOffset,
+                variableChunk,
+                variableOffset);
+        BytecodeBlock body = methodDefinition.getBody();
+        for (KeyField keyField : keyFields) {
+            BytecodeBlock writeNonNullFlat = new BytecodeBlock()
+                    .append(invokeDynamic(
+                            BOOTSTRAP_METHOD,
+                            ImmutableList.of(callSiteBinder.bind(keyField.writeFlatMethod()).getBindingId()),
+                            "writeFlat",
+                            void.class,
+                            blocks.getElement(keyField.index()),
+                            position,
+                            fixedChunk,
+                            add(fixedOffset, constantInt(keyField.fieldFixedOffset())),
+                            variableChunk,
+                            variableOffset));
+            if (keyField.type().isFlatVariableWidth()) {
+                // variableOffset += type.getFlatVariableWidthSize(blocks[i], position);
+                writeNonNullFlat.append(variableOffset.set(add(variableOffset, constantType(callSiteBinder, keyField.type()).invoke(
+                        "getFlatVariableWidthSize",
+                        int.class,
+                        blocks.getElement(keyField.index()),
+                        position))));
+            }
+            body.append(new IfStatement()
+                    .condition(blocks.getElement(keyField.index()).invoke("isNull", boolean.class, position))
+                    .ifTrue(fixedChunk.setElement(add(fixedOffset, constantInt(keyField.fieldIsNullOffset())), constantInt(1).cast(byte.class)))
+                    .ifFalse(writeNonNullFlat));
+        }
+        body.ret();
+    }
+
+    private static void generateNotDistinctFromMethod(ClassDefinition definition, List<KeyField> keyFields, CallSiteBinder callSiteBinder)
+    {
+        Parameter leftFixedChunk = arg("leftFixedChunk", type(byte[].class));
+        Parameter leftFixedOffset = arg("leftFixedOffset", type(int.class));
+        Parameter leftVariableChunk = arg("leftVariableChunk", type(byte[].class));
+        Parameter rightBlocks = arg("rightBlocks", type(Block[].class));
+        Parameter rightPosition = arg("rightPosition", type(int.class));
+        MethodDefinition methodDefinition = definition.declareMethod(
+                a(PUBLIC),
+                "valueNotDistinctFrom",
+                type(boolean.class),
+                leftFixedChunk,
+                leftFixedOffset,
+                leftVariableChunk,
+                rightBlocks,
+                rightPosition);
+        BytecodeBlock body = methodDefinition.getBody();
+
+        for (KeyField keyField : keyFields) {
+            MethodDefinition distinctFromMethod = generateDistinctFromMethod(definition, keyField, callSiteBinder);
+            body.append(new IfStatement()
+                    .condition(invokeStatic(distinctFromMethod, leftFixedChunk, leftFixedOffset, leftVariableChunk, rightBlocks.getElement(keyField.index()), rightPosition))
+                    .ifTrue(constantFalse().ret()));
+        }
+        body.append(constantTrue().ret());
+    }
+
+    private static MethodDefinition generateDistinctFromMethod(ClassDefinition definition, KeyField keyField, CallSiteBinder callSiteBinder)
+    {
+        Parameter leftFixedChunk = arg("leftFixedChunk", type(byte[].class));
+        Parameter leftFixedOffset = arg("leftFixedOffset", type(int.class));
+        Parameter leftVariableChunk = arg("leftVariableChunk", type(byte[].class));
+        Parameter rightBlock = arg("rightBlock", type(Block.class));
+        Parameter rightPosition = arg("rightPosition", type(int.class));
+        MethodDefinition methodDefinition = definition.declareMethod(
+                a(PUBLIC, STATIC),
+                "valueDistinctFrom" + keyField.index(),
+                type(boolean.class),
+                leftFixedChunk,
+                leftFixedOffset,
+                leftVariableChunk,
+                rightBlock,
+                rightPosition);
+        BytecodeBlock body = methodDefinition.getBody();
+        Scope scope = methodDefinition.getScope();
+
+        Variable leftIsNull = scope.declareVariable("leftIsNull", body, notEqual(leftFixedChunk.getElement(add(leftFixedOffset, constantInt(keyField.fieldIsNullOffset()))).cast(int.class), constantInt(0)));
+        Variable rightIsNull = scope.declareVariable("rightIsNull", body, rightBlock.invoke("isNull", boolean.class, rightPosition));
+
+        // if (leftIsNull) {
+        //     return !rightIsNull;
+        // }
+        body.append(new IfStatement()
+                .condition(leftIsNull)
+                .ifTrue(not(rightIsNull).ret()));
+
+        // if (rightIsNull) {
+        //     return true;
+        // }
+        body.append(new IfStatement()
+                .condition(rightIsNull)
+                .ifTrue(constantTrue().ret()));
+
+        body.append(invokeDynamic(
+                BOOTSTRAP_METHOD,
+                ImmutableList.of(callSiteBinder.bind(keyField.distinctFlatBlockMethod()).getBindingId()),
+                "distinctFrom",
+                boolean.class,
+                leftFixedChunk,
+                add(leftFixedOffset, constantInt(keyField.fieldFixedOffset())),
+                leftVariableChunk,
+                rightBlock,
+                rightPosition)
+                .ret());
+        return methodDefinition;
+    }
+
+    private static void generateHashBlock(ClassDefinition definition, List<KeyField> keyFields, CallSiteBinder callSiteBinder)
+    {
+        Parameter blocks = arg("blocks", type(Block[].class));
+        Parameter position = arg("position", type(int.class));
+        MethodDefinition methodDefinition = definition.declareMethod(
+                a(PUBLIC),
+                "hash",
+                type(long.class),
+                blocks,
+                position);
+        BytecodeBlock body = methodDefinition.getBody();
+
+        Scope scope = methodDefinition.getScope();
+        Variable result = scope.declareVariable("result", body, constantLong(INITIAL_HASH_VALUE));
+        Variable hash = scope.declareVariable(long.class, "hash");
+        Variable block = scope.declareVariable(Block.class, "block");
+
+        for (KeyField keyField : keyFields) {
+            body.append(block.set(blocks.getElement(keyField.index())));
+            body.append(new IfStatement()
+                    .condition(block.invoke("isNull", boolean.class, position))
+                    .ifTrue(hash.set(constantLong(NULL_HASH_CODE)))
+                    .ifFalse(hash.set(invokeDynamic(
+                            BOOTSTRAP_METHOD,
+                            ImmutableList.of(callSiteBinder.bind(keyField.hashBlockMethod()).getBindingId()),
+                            "hash",
+                            long.class,
+                            block,
+                            position))));
+            body.append(result.set(invokeStatic(CombineHashFunction.class, "getHash", long.class, result, hash)));
+        }
+        body.append(result.ret());
+    }
+
+    private static void generateHashBlocksBatched(ClassDefinition definition, List<KeyField> keyFields, CallSiteBinder callSiteBinder)
+    {
+        Parameter blocks = arg("blocks", type(Block[].class));
+        Parameter hashes = arg("hashes", type(long[].class));
+        Parameter offset = arg("offset", type(int.class));
+        Parameter length = arg("length", type(int.class));
+
+        MethodDefinition methodDefinition = definition.declareMethod(
+                a(PUBLIC),
+                "hashBlocksBatched",
+                type(void.class),
+                blocks,
+                hashes,
+                offset,
+                length);
+
+        BytecodeBlock body = methodDefinition.getBody();
+        body.append(invokeStatic(Objects.class, "checkFromIndexSize", int.class, constantInt(0), length, hashes.length()).pop());
+
+        Map<Type, MethodDefinition> typeMethods = new HashMap<>();
+        for (KeyField keyField : keyFields) {
+            MethodDefinition method;
+            // First hash method implementation does not combine hashes, so it can't be reused
+            if (keyField.index() == 0) {
+                method = generateHashBlockVectorized(definition, keyField, callSiteBinder);
+            }
+            else {
+                // Columns of the same type can reuse the same static method implementation
+                method = typeMethods.get(keyField.type());
+                if (method == null) {
+                    method = generateHashBlockVectorized(definition, keyField, callSiteBinder);
+                    typeMethods.put(keyField.type(), method);
+                }
+            }
+            body.append(invokeStatic(method, blocks.getElement(keyField.index()), hashes, offset, length));
+        }
+        body.ret();
+    }
+
+    private static MethodDefinition generateHashBlockVectorized(ClassDefinition definition, KeyField field, CallSiteBinder callSiteBinder)
+    {
+        Parameter block = arg("block", type(Block.class));
+        Parameter hashes = arg("hashes", type(long[].class));
+        Parameter offset = arg("offset", type(int.class));
+        Parameter length = arg("length", type(int.class));
+
+        MethodDefinition methodDefinition = definition.declareMethod(
+                a(PRIVATE, STATIC),
+                "hashBlockVectorized_" + field.index(),
+                type(void.class),
+                block,
+                hashes,
+                offset,
+                length);
+
+        Scope scope = methodDefinition.getScope();
+        BytecodeBlock body = methodDefinition.getBody();
+
+        Variable index = scope.declareVariable(int.class, "index");
+        Variable position = scope.declareVariable(int.class, "position");
+        Variable mayHaveNull = scope.declareVariable(boolean.class, "mayHaveNull");
+        Variable hash = scope.declareVariable(long.class, "hash");
+
+        body.append(mayHaveNull.set(block.invoke("mayHaveNull", boolean.class)));
+        body.append(position.set(invokeStatic(Objects.class, "checkFromToIndex", int.class, offset, add(offset, length), block.invoke("getPositionCount", int.class))));
+        body.append(invokeStatic(Objects.class, "checkFromIndexSize", int.class, constantInt(0), length, hashes.length()).pop());
+
+        BytecodeBlock loopBody = new BytecodeBlock().append(new IfStatement("if (mayHaveNull && block.isNull(position))")
+                .condition(and(mayHaveNull, block.invoke("isNull", boolean.class, position)))
+                .ifTrue(hash.set(constantLong(NULL_HASH_CODE)))
+                .ifFalse(hash.set(invokeDynamic(
+                        BOOTSTRAP_METHOD,
+                        ImmutableList.of(callSiteBinder.bind(field.hashBlockMethod()).getBindingId()),
+                        "hash",
+                        long.class,
+                        block,
+                        position))));
+        if (field.index() == 0) {
+            // hashes[index] = hash;
+            loopBody.append(hashes.setElement(index, hash));
+        }
+        else {
+            // hashes[index] = CombineHashFunction.getHash(hashes[index], hash);
+            loopBody.append(hashes.setElement(index, invokeStatic(CombineHashFunction.class, "getHash", long.class, hashes.getElement(index), hash)));
+        }
+        loopBody.append(position.increment());
+
+        body.append(new ForLoop("for (index = 0; index < length; index++)")
+                .initialize(index.set(constantInt(0)))
+                .condition(lessThan(index, length))
+                .update(index.increment())
+                .body(loopBody))
+                .ret();
+
+        return methodDefinition;
+    }
+
+    private static void generateHashFlat(ClassDefinition definition, List<KeyField> keyFields, CallSiteBinder callSiteBinder)
+    {
+        Parameter fixedChunk = arg("fixedChunk", type(byte[].class));
+        Parameter fixedOffset = arg("fixedOffset", type(int.class));
+        Parameter variableChunk = arg("variableChunk", type(byte[].class));
+        MethodDefinition methodDefinition = definition.declareMethod(
+                a(PUBLIC),
+                "hash",
+                type(long.class),
+                fixedChunk,
+                fixedOffset,
+                variableChunk);
+        BytecodeBlock body = methodDefinition.getBody();
+
+        Scope scope = methodDefinition.getScope();
+        Variable result = scope.declareVariable("result", body, constantLong(INITIAL_HASH_VALUE));
+        Variable hash = scope.declareVariable(long.class, "hash");
+
+        for (KeyField keyField : keyFields) {
+            body.append(new IfStatement()
+                    .condition(notEqual(fixedChunk.getElement(add(fixedOffset, constantInt(keyField.fieldIsNullOffset()))).cast(int.class), constantInt(0)))
+                    .ifTrue(hash.set(constantLong(NULL_HASH_CODE)))
+                    .ifFalse(hash.set(invokeDynamic(
+                            BOOTSTRAP_METHOD,
+                            ImmutableList.of(callSiteBinder.bind(keyField.hashFlatMethod()).getBindingId()),
+                            "hash",
+                            long.class,
+                            fixedChunk,
+                            add(fixedOffset, constantInt(keyField.fieldFixedOffset())),
+                            variableChunk))));
+            body.append(result.set(invokeStatic(CombineHashFunction.class, "getHash", long.class, result, hash)));
+        }
+        body.append(result.ret());
+    }
+
+    private record KeyField(
+            int index,
+            Type type,
+            int fieldIsNullOffset,
+            int fieldFixedOffset,
+            MethodHandle readFlatMethod,
+            MethodHandle writeFlatMethod,
+            MethodHandle distinctFlatBlockMethod,
+            MethodHandle hashFlatMethod,
+            MethodHandle hashBlockMethod) {}
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/FlatSet.java b/core/trino-main/src/main/java/io/trino/operator/FlatSet.java
new file mode 100644
index 000000000000..5b5c298fdd28
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/FlatSet.java
@@ -0,0 +1,399 @@
+/*
+ * Licensed 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 io.trino.operator;
+
+import com.google.common.base.Throwables;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.type.Type;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.operator.VariableWidthData.EMPTY_CHUNK;
+import static io.trino.operator.VariableWidthData.POINTER_SIZE;
+import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
+import static java.lang.Math.multiplyExact;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
+import static java.util.Objects.requireNonNull;
+
+final class FlatSet
+{
+    private static final int INSTANCE_SIZE = instanceSize(FlatSet.class);
+
+    // See jdk.internal.util.ArraysSupport#SOFT_MAX_ARRAY_LENGTH for an explanation
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
+    // Hash table capacity must be a power of two and at least VECTOR_LENGTH
+    private static final int INITIAL_CAPACITY = 16;
+
+    private static final int RECORDS_PER_GROUP_SHIFT = 10;
+    private static final int RECORDS_PER_GROUP = 1 << RECORDS_PER_GROUP_SHIFT;
+    private static final int RECORDS_PER_GROUP_MASK = RECORDS_PER_GROUP - 1;
+
+    private static final int VECTOR_LENGTH = Long.BYTES;
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, LITTLE_ENDIAN);
+
+    private final Type type;
+    private final MethodHandle writeFlat;
+    private final MethodHandle hashFlat;
+    private final MethodHandle distinctFlatBlock;
+    private final MethodHandle hashBlock;
+
+    private final int recordSize;
+    private final int recordValueOffset;
+
+    private boolean hasNull;
+
+    private int capacity;
+    private int mask;
+
+    private byte[] control;
+    private byte[][] recordGroups;
+    private final VariableWidthData variableWidthData;
+
+    private int size;
+    private int maxFill;
+
+    public FlatSet(
+            Type type,
+            MethodHandle writeFlat,
+            MethodHandle hashFlat,
+            MethodHandle distinctFlatBlock,
+            MethodHandle hashBlock)
+    {
+        this.type = requireNonNull(type, "type is null");
+
+        this.writeFlat = requireNonNull(writeFlat, "writeFlat is null");
+        this.hashFlat = requireNonNull(hashFlat, "hashFlat is null");
+        this.distinctFlatBlock = requireNonNull(distinctFlatBlock, "distinctFlatBlock is null");
+        this.hashBlock = requireNonNull(hashBlock, "hashBlock is null");
+
+        capacity = INITIAL_CAPACITY;
+        maxFill = calculateMaxFill(capacity);
+        mask = capacity - 1;
+        control = new byte[capacity + VECTOR_LENGTH];
+
+        boolean variableWidth = type.isFlatVariableWidth();
+        variableWidthData = variableWidth ? new VariableWidthData() : null;
+
+        recordValueOffset = (variableWidth ? POINTER_SIZE : 0);
+        recordSize = recordValueOffset + type.getFlatFixedSize();
+        recordGroups = createRecordGroups(capacity, recordSize);
+    }
+
+    private static byte[][] createRecordGroups(int capacity, int recordSize)
+    {
+        if (capacity < RECORDS_PER_GROUP) {
+            return new byte[][]{new byte[multiplyExact(capacity, recordSize)]};
+        }
+
+        byte[][] groups = new byte[(capacity + 1) >> RECORDS_PER_GROUP_SHIFT][];
+        for (int i = 0; i < groups.length; i++) {
+            groups[i] = new byte[multiplyExact(RECORDS_PER_GROUP, recordSize)];
+        }
+        return groups;
+    }
+
+    public long getEstimatedSize()
+    {
+        return INSTANCE_SIZE +
+                sizeOf(control) +
+                (sizeOf(recordGroups[0]) * recordGroups.length) +
+                (variableWidthData == null ? 0 : variableWidthData.getRetainedSizeBytes());
+    }
+
+    public int size()
+    {
+        return size + (hasNull ? 1 : 0);
+    }
+
+    public boolean containsNull()
+    {
+        return hasNull;
+    }
+
+    public boolean contains(Block block, int position)
+    {
+        if (block.isNull(position)) {
+            return hasNull;
+        }
+        return getIndex(block, position, valueHashCode(block, position)) >= 0;
+    }
+
+    public boolean contains(Block block, int position, long hash)
+    {
+        if (block.isNull(position)) {
+            return hasNull;
+        }
+        return getIndex(block, position, hash) >= 0;
+    }
+
+    public void add(Block block, int position)
+    {
+        if (block.isNull(position)) {
+            hasNull = true;
+            return;
+        }
+        addNonNull(block, position, valueHashCode(block, position));
+    }
+
+    public void add(Block block, int position, long hash)
+    {
+        if (block.isNull(position)) {
+            hasNull = true;
+            return;
+        }
+        addNonNull(block, position, hash);
+    }
+
+    private void addNonNull(Block block, int position, long hash)
+    {
+        int index = getIndex(block, position, hash);
+        if (index >= 0) {
+            return;
+        }
+
+        index = -index - 1;
+        insert(index, block, position, hash);
+        size++;
+        if (size >= maxFill) {
+            rehash();
+        }
+    }
+
+    private int getIndex(Block block, int position, long hash)
+    {
+        byte hashPrefix = (byte) (hash & 0x7F | 0x80);
+        int bucket = bucket((int) (hash >> 7));
+
+        int step = 1;
+        long repeated = repeat(hashPrefix);
+
+        while (true) {
+            final long controlVector = (long) LONG_HANDLE.get(control, bucket);
+
+            int matchIndex = matchInVector(block, position, bucket, repeated, controlVector);
+            if (matchIndex >= 0) {
+                return matchIndex;
+            }
+
+            int emptyIndex = findEmptyInVector(controlVector, bucket);
+            if (emptyIndex >= 0) {
+                return -emptyIndex - 1;
+            }
+
+            bucket = bucket(bucket + step);
+            step += VECTOR_LENGTH;
+        }
+    }
+
+    private int matchInVector(Block block, int position, int vectorStartBucket, long repeated, long controlVector)
+    {
+        long controlMatches = match(controlVector, repeated);
+        while (controlMatches != 0) {
+            int bucket = bucket(vectorStartBucket + (Long.numberOfTrailingZeros(controlMatches) >>> 3));
+            if (valueNotDistinctFrom(bucket, block, position)) {
+                return bucket;
+            }
+
+            controlMatches = controlMatches & (controlMatches - 1);
+        }
+        return -1;
+    }
+
+    private int findEmptyInVector(long vector, int vectorStartBucket)
+    {
+        long controlMatches = match(vector, 0x00_00_00_00_00_00_00_00L);
+        if (controlMatches == 0) {
+            return -1;
+        }
+        int slot = Long.numberOfTrailingZeros(controlMatches) >>> 3;
+        return bucket(vectorStartBucket + slot);
+    }
+
+    private void insert(int index, Block block, int position, long hash)
+    {
+        setControl(index, (byte) (hash & 0x7F | 0x80));
+
+        byte[] records = getRecords(index);
+        int recordOffset = getRecordOffset(index);
+
+        // write value
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        int variableWidthChunkOffset = 0;
+        if (variableWidthData != null) {
+            int variableWidthLength = type.getFlatVariableWidthSize(block, position);
+            variableWidthChunk = variableWidthData.allocate(records, recordOffset, variableWidthLength);
+            variableWidthChunkOffset = VariableWidthData.getChunkOffset(records, recordOffset);
+        }
+
+        try {
+            writeFlat.invokeExact(block, position, records, recordOffset + recordValueOffset, variableWidthChunk, variableWidthChunkOffset);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private void setControl(int index, byte hashPrefix)
+    {
+        control[index] = hashPrefix;
+        if (index < VECTOR_LENGTH) {
+            control[index + capacity] = hashPrefix;
+        }
+    }
+
+    private void rehash()
+    {
+        int oldCapacity = capacity;
+        byte[] oldControl = control;
+        byte[][] oldRecordGroups = recordGroups;
+
+        long newCapacityLong = capacity * 2L;
+        if (newCapacityLong > MAX_ARRAY_SIZE) {
+            throw new TrinoException(GENERIC_INSUFFICIENT_RESOURCES, "Size of hash table cannot exceed 1 billion entries");
+        }
+
+        capacity = (int) newCapacityLong;
+        maxFill = calculateMaxFill(capacity);
+        mask = capacity - 1;
+
+        control = new byte[capacity + VECTOR_LENGTH];
+        recordGroups = createRecordGroups(capacity, recordSize);
+
+        for (int oldIndex = 0; oldIndex < oldCapacity; oldIndex++) {
+            if (oldControl[oldIndex] != 0) {
+                byte[] oldRecords = oldRecordGroups[oldIndex >> RECORDS_PER_GROUP_SHIFT];
+                int oldRecordOffset = getRecordOffset(oldIndex);
+
+                long hash = valueHashCode(oldRecords, oldIndex);
+                byte hashPrefix = (byte) (hash & 0x7F | 0x80);
+                int bucket = bucket((int) (hash >> 7));
+
+                int step = 1;
+                while (true) {
+                    final long controlVector = (long) LONG_HANDLE.get(control, bucket);
+                    // values are already distinct, so just find the first empty slot
+                    int emptyIndex = findEmptyInVector(controlVector, bucket);
+                    if (emptyIndex >= 0) {
+                        setControl(emptyIndex, hashPrefix);
+
+                        // copy full record including groupId and count
+                        byte[] records = getRecords(emptyIndex);
+                        int recordOffset = getRecordOffset(emptyIndex);
+                        System.arraycopy(oldRecords, oldRecordOffset, records, recordOffset, recordSize);
+                        break;
+                    }
+
+                    bucket = bucket(bucket + step);
+                    step += VECTOR_LENGTH;
+                }
+            }
+        }
+    }
+
+    private int bucket(int hash)
+    {
+        return hash & mask;
+    }
+
+    private byte[] getRecords(int index)
+    {
+        return recordGroups[index >> RECORDS_PER_GROUP_SHIFT];
+    }
+
+    private int getRecordOffset(int index)
+    {
+        return (index & RECORDS_PER_GROUP_MASK) * recordSize;
+    }
+
+    private long valueHashCode(byte[] records, int index)
+    {
+        int recordOffset = getRecordOffset(index);
+
+        try {
+            byte[] variableWidthChunk = EMPTY_CHUNK;
+            if (variableWidthData != null) {
+                variableWidthChunk = variableWidthData.getChunk(records, recordOffset);
+            }
+
+            return (long) hashFlat.invokeExact(
+                    records,
+                    recordOffset + recordValueOffset,
+                    variableWidthChunk);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private long valueHashCode(Block right, int rightPosition)
+    {
+        try {
+            return (long) hashBlock.invokeExact(right, rightPosition);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private boolean valueNotDistinctFrom(int leftPosition, Block right, int rightPosition)
+    {
+        byte[] leftRecords = getRecords(leftPosition);
+        int leftRecordOffset = getRecordOffset(leftPosition);
+
+        byte[] leftVariableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            leftVariableWidthChunk = variableWidthData.getChunk(leftRecords, leftRecordOffset);
+        }
+
+        try {
+            return !(boolean) distinctFlatBlock.invokeExact(
+                    leftRecords,
+                    leftRecordOffset + recordValueOffset,
+                    leftVariableWidthChunk,
+                    right,
+                    rightPosition);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private static long repeat(byte value)
+    {
+        return ((value & 0xFF) * 0x01_01_01_01_01_01_01_01L);
+    }
+
+    private static long match(long vector, long repeatedValue)
+    {
+        // HD 6-1
+        long comparison = vector ^ repeatedValue;
+        return (comparison - 0x01_01_01_01_01_01_01_01L) & ~comparison & 0x80_80_80_80_80_80_80_80L;
+    }
+
+    private static int calculateMaxFill(int capacity)
+    {
+        // The hash table uses a load factory of 15/16
+        return (capacity / 16) * 15;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/ForExchange.java b/core/trino-main/src/main/java/io/trino/operator/ForExchange.java
index 74a75f85317b..9df6824663ab 100644
--- a/core/trino-main/src/main/java/io/trino/operator/ForExchange.java
+++ b/core/trino-main/src/main/java/io/trino/operator/ForExchange.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForExchange
 {
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/ForScheduler.java b/core/trino-main/src/main/java/io/trino/operator/ForScheduler.java
index b5b694cba87a..a1cf43ce0fb9 100644
--- a/core/trino-main/src/main/java/io/trino/operator/ForScheduler.java
+++ b/core/trino-main/src/main/java/io/trino/operator/ForScheduler.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForScheduler
 {
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/GroupByHash.java b/core/trino-main/src/main/java/io/trino/operator/GroupByHash.java
index 1915d5f22b6e..41f98cc40c06 100644
--- a/core/trino-main/src/main/java/io/trino/operator/GroupByHash.java
+++ b/core/trino-main/src/main/java/io/trino/operator/GroupByHash.java
@@ -15,53 +15,48 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import io.trino.Session;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.JoinCompiler;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
-import java.util.Optional;
 
 import static io.trino.SystemSessionProperties.isDictionaryAggregationEnabled;
 import static io.trino.spi.type.BigintType.BIGINT;
 
+@NotThreadSafe
 public interface GroupByHash
 {
     static GroupByHash createGroupByHash(
             Session session,
-            List<? extends Type> hashTypes,
-            int[] hashChannels,
-            Optional<Integer> inputHashChannel,
+            List<Type> types,
+            boolean hasPrecomputedHash,
             int expectedSize,
             JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators,
             UpdateMemory updateMemory)
     {
-        return createGroupByHash(hashTypes, hashChannels, inputHashChannel, expectedSize, isDictionaryAggregationEnabled(session), joinCompiler, blockTypeOperators, updateMemory);
+        boolean dictionaryAggregationEnabled = isDictionaryAggregationEnabled(session);
+        return createGroupByHash(types, hasPrecomputedHash, expectedSize, dictionaryAggregationEnabled, joinCompiler, updateMemory);
     }
 
     static GroupByHash createGroupByHash(
-            List<? extends Type> hashTypes,
-            int[] hashChannels,
-            Optional<Integer> inputHashChannel,
+            List<Type> types,
+            boolean hasPrecomputedHash,
             int expectedSize,
-            boolean processDictionary,
+            boolean dictionaryAggregationEnabled,
             JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators,
             UpdateMemory updateMemory)
     {
-        if (hashTypes.size() == 1 && hashTypes.get(0).equals(BIGINT) && hashChannels.length == 1) {
-            return new BigintGroupByHash(hashChannels[0], inputHashChannel.isPresent(), expectedSize, updateMemory);
+        if (types.size() == 1 && types.get(0).equals(BIGINT)) {
+            return new BigintGroupByHash(hasPrecomputedHash, expectedSize, updateMemory);
         }
-        return new MultiChannelGroupByHash(hashTypes, hashChannels, inputHashChannel, expectedSize, processDictionary, joinCompiler, blockTypeOperators, updateMemory);
+        return new FlatGroupByHash(types, hasPrecomputedHash, expectedSize, dictionaryAggregationEnabled, joinCompiler, updateMemory);
     }
 
     long getEstimatedSize();
 
-    List<Type> getTypes();
-
     int getGroupCount();
 
     void appendValuesTo(int groupId, PageBuilder pageBuilder);
@@ -75,16 +70,9 @@ static GroupByHash createGroupByHash(
      * rows:      A B C B D A E
      * group ids: 1 2 3 2 4 1 5
      */
-    Work<GroupByIdBlock> getGroupIds(Page page);
-
-    boolean contains(int position, Page page, int[] hashChannels);
-
-    default boolean contains(int position, Page page, int[] hashChannels, long rawHash)
-    {
-        return contains(position, page, hashChannels);
-    }
+    Work<int[]> getGroupIds(Page page);
 
-    long getRawHash(int groupyId);
+    long getRawHash(int groupId);
 
     @VisibleForTesting
     int getCapacity();
diff --git a/core/trino-main/src/main/java/io/trino/operator/GroupByHashPageIndexer.java b/core/trino-main/src/main/java/io/trino/operator/GroupByHashPageIndexer.java
index 62a74ce95fde..772f12cfa61a 100644
--- a/core/trino-main/src/main/java/io/trino/operator/GroupByHashPageIndexer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/GroupByHashPageIndexer.java
@@ -17,15 +17,11 @@
 import io.trino.spi.PageIndexer;
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.JoinCompiler;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
-import java.util.Optional;
-import java.util.stream.IntStream;
 
 import static com.google.common.base.Verify.verify;
 import static io.trino.operator.UpdateMemory.NOOP;
-import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
 public class GroupByHashPageIndexer
@@ -33,17 +29,9 @@ public class GroupByHashPageIndexer
 {
     private final GroupByHash hash;
 
-    public GroupByHashPageIndexer(List<? extends Type> hashTypes, JoinCompiler joinCompiler, BlockTypeOperators blockTypeOperators)
+    public GroupByHashPageIndexer(List<Type> hashTypes, JoinCompiler joinCompiler)
     {
-        this(GroupByHash.createGroupByHash(
-                hashTypes,
-                IntStream.range(0, hashTypes.size()).toArray(),
-                Optional.empty(),
-                20,
-                false,
-                joinCompiler,
-                blockTypeOperators,
-                NOOP));
+        this(GroupByHash.createGroupByHash(hashTypes, false, 20, false, joinCompiler, NOOP));
     }
 
     public GroupByHashPageIndexer(GroupByHash hash)
@@ -54,16 +42,11 @@ public GroupByHashPageIndexer(GroupByHash hash)
     @Override
     public int[] indexPage(Page page)
     {
-        Work<GroupByIdBlock> work = hash.getGroupIds(page);
+        Work<int[]> work = hash.getGroupIds(page);
         boolean done = work.process();
         // TODO: this class does not yield wrt memory limit; enable it
         verify(done);
-        GroupByIdBlock groupIds = work.getResult();
-        int[] indexes = new int[page.getPositionCount()];
-        for (int i = 0; i < indexes.length; i++) {
-            indexes[i] = toIntExact(groupIds.getGroupId(i));
-        }
-        return indexes;
+        return work.getResult();
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/operator/GroupByHashPageIndexerFactory.java b/core/trino-main/src/main/java/io/trino/operator/GroupByHashPageIndexerFactory.java
index 45d9e9c04713..601d4fff0420 100644
--- a/core/trino-main/src/main/java/io/trino/operator/GroupByHashPageIndexerFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/GroupByHashPageIndexerFactory.java
@@ -13,14 +13,12 @@
  */
 package io.trino.operator;
 
+import com.google.inject.Inject;
 import io.trino.spi.Page;
 import io.trino.spi.PageIndexer;
 import io.trino.spi.PageIndexerFactory;
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.JoinCompiler;
-import io.trino.type.BlockTypeOperators;
-
-import javax.inject.Inject;
 
 import java.util.List;
 
@@ -30,22 +28,20 @@ public class GroupByHashPageIndexerFactory
         implements PageIndexerFactory
 {
     private final JoinCompiler joinCompiler;
-    private final BlockTypeOperators blockTypeOperators;
 
     @Inject
-    public GroupByHashPageIndexerFactory(JoinCompiler joinCompiler, BlockTypeOperators blockTypeOperators)
+    public GroupByHashPageIndexerFactory(JoinCompiler joinCompiler)
     {
         this.joinCompiler = requireNonNull(joinCompiler, "joinCompiler is null");
-        this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
     }
 
     @Override
-    public PageIndexer createPageIndexer(List<? extends Type> types)
+    public PageIndexer createPageIndexer(List<Type> types)
     {
         if (types.isEmpty()) {
             return new NoHashPageIndexer();
         }
-        return new GroupByHashPageIndexer(types, joinCompiler, blockTypeOperators);
+        return new GroupByHashPageIndexer(types, joinCompiler);
     }
 
     private static class NoHashPageIndexer
diff --git a/core/trino-main/src/main/java/io/trino/operator/GroupByIdBlock.java b/core/trino-main/src/main/java/io/trino/operator/GroupByIdBlock.java
deleted file mode 100644
index fa736816e86c..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/GroupByIdBlock.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Licensed 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 io.trino.operator;
-
-import io.airlift.slice.Slice;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-
-import java.util.List;
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
-
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static java.util.Collections.singletonList;
-import static java.util.Objects.requireNonNull;
-
-public class GroupByIdBlock
-        implements Block
-{
-    private static final int INSTANCE_SIZE = instanceSize(GroupByIdBlock.class);
-
-    private final long groupCount;
-    private final Block block;
-
-    public GroupByIdBlock(long groupCount, Block block)
-    {
-        requireNonNull(block, "block is null");
-        this.groupCount = groupCount;
-        this.block = block;
-    }
-
-    public long getGroupCount()
-    {
-        return groupCount;
-    }
-
-    public long getGroupId(int position)
-    {
-        return BIGINT.getLong(block, position);
-    }
-
-    @Override
-    public Block getRegion(int positionOffset, int length)
-    {
-        return block.getRegion(positionOffset, length);
-    }
-
-    @Override
-    public long getRegionSizeInBytes(int positionOffset, int length)
-    {
-        return block.getRegionSizeInBytes(positionOffset, length);
-    }
-
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return block.fixedSizeInBytesPerPosition();
-    }
-
-    @Override
-    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionCount)
-    {
-        return block.getPositionsSizeInBytes(positions, selectedPositionCount);
-    }
-
-    @Override
-    public Block copyRegion(int positionOffset, int length)
-    {
-        return block.copyRegion(positionOffset, length);
-    }
-
-    @Override
-    public int getSliceLength(int position)
-    {
-        return block.getSliceLength(position);
-    }
-
-    @Override
-    public byte getByte(int position, int offset)
-    {
-        return block.getByte(position, offset);
-    }
-
-    @Override
-    public short getShort(int position, int offset)
-    {
-        return block.getShort(position, offset);
-    }
-
-    @Override
-    public int getInt(int position, int offset)
-    {
-        return block.getInt(position, offset);
-    }
-
-    @Override
-    public long getLong(int position, int offset)
-    {
-        return block.getLong(position, offset);
-    }
-
-    @Override
-    public Slice getSlice(int position, int offset, int length)
-    {
-        return block.getSlice(position, offset, length);
-    }
-
-    @Override
-    public <T> T getObject(int position, Class<T> clazz)
-    {
-        return block.getObject(position, clazz);
-    }
-
-    @Override
-    public boolean bytesEqual(int position, int offset, Slice otherSlice, int otherOffset, int length)
-    {
-        return block.bytesEqual(position, offset, otherSlice, otherOffset, length);
-    }
-
-    @Override
-    public int bytesCompare(int position, int offset, int length, Slice otherSlice, int otherOffset, int otherLength)
-    {
-        return block.bytesCompare(position, offset, length, otherSlice, otherOffset, otherLength);
-    }
-
-    @Override
-    public void writeBytesTo(int position, int offset, int length, BlockBuilder blockBuilder)
-    {
-        block.writeBytesTo(position, offset, length, blockBuilder);
-    }
-
-    @Override
-    public boolean equals(int position, int offset, Block otherBlock, int otherPosition, int otherOffset, int length)
-    {
-        return block.equals(position, offset, otherBlock, otherPosition, otherOffset, length);
-    }
-
-    @Override
-    public long hash(int position, int offset, int length)
-    {
-        return block.hash(position, offset, length);
-    }
-
-    @Override
-    public int compareTo(int leftPosition, int leftOffset, int leftLength, Block rightBlock, int rightPosition, int rightOffset, int rightLength)
-    {
-        return block.compareTo(leftPosition, leftOffset, leftLength, rightBlock, rightPosition, rightOffset, rightLength);
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        return block.getSingleValueBlock(position);
-    }
-
-    @Override
-    public boolean mayHaveNull()
-    {
-        return block.mayHaveNull();
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        return block.isNull(position);
-    }
-
-    @Override
-    public int getPositionCount()
-    {
-        return block.getPositionCount();
-    }
-
-    @Override
-    public long getSizeInBytes()
-    {
-        return block.getSizeInBytes();
-    }
-
-    @Override
-    public long getRetainedSizeInBytes()
-    {
-        return INSTANCE_SIZE + block.getRetainedSizeInBytes();
-    }
-
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        return block.getEstimatedDataSizeForStats(position);
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(block, block.getRetainedSizeInBytes());
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        throw new UnsupportedOperationException("GroupByIdBlock does not support serialization");
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        return block.copyPositions(positions, offset, length);
-    }
-
-    @Override
-    public Block copyWithAppendedNull()
-    {
-        throw new UnsupportedOperationException("GroupByIdBlock does not support newBlockWithAppendedNull()");
-    }
-
-    @Override
-    public String toString()
-    {
-        return toStringHelper(this)
-                .add("groupCount", groupCount)
-                .add("positionCount", getPositionCount())
-                .toString();
-    }
-
-    @Override
-    public boolean isLoaded()
-    {
-        return block.isLoaded();
-    }
-
-    @Override
-    public Block getLoadedBlock()
-    {
-        return block.getLoadedBlock();
-    }
-
-    @Override
-    public final List<Block> getChildren()
-    {
-        return singletonList(block);
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRankAccumulator.java b/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRankAccumulator.java
index 9f748781a3a7..c57e7bf02953 100644
--- a/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRankAccumulator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRankAccumulator.java
@@ -15,10 +15,10 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import io.trino.array.LongBigArray;
+import io.trino.spi.Page;
 import io.trino.util.HeapTraversal;
 import io.trino.util.LongBigArrayFIFOQueue;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.function.LongConsumer;
 
@@ -92,6 +92,31 @@ public long sizeOf()
                 + peerGroupLookup.sizeOf();
     }
 
+    public int findFirstPositionToAdd(Page newPage, int groupCount, int[] groupIds, PageWithPositionComparator comparator, RowReferencePageManager pageManager)
+    {
+        int currentGroups = groupIdToHeapBuffer.getTotalGroups();
+        groupIdToHeapBuffer.allocateGroupIfNeeded(groupCount);
+
+        for (int position = 0; position < newPage.getPositionCount(); position++) {
+            int groupId = groupIds[position];
+            if (groupId >= currentGroups || groupIdToHeapBuffer.getHeapValueCount(groupId) < topN) {
+                return position;
+            }
+            long heapRootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
+            if (heapRootNodeIndex == UNKNOWN_INDEX) {
+                return position;
+            }
+            long rightPageRowId = peekRootRowIdByHeapNodeIndex(heapRootNodeIndex);
+            Page rightPage = pageManager.getPage(rightPageRowId);
+            int rightPosition = pageManager.getPosition(rightPageRowId);
+            // If the current position is equal to or less than the current heap root index, then we may need to insert it
+            if (comparator.compareTo(newPage, position, rightPage, rightPosition) <= 0) {
+                return position;
+            }
+        }
+        return -1;
+    }
+
     /**
      * Add the specified row to this accumulator.
      * <p>
@@ -99,13 +124,13 @@ public long sizeOf()
      *
      * @return true if this row was incorporated, false otherwise
      */
-    public boolean add(long groupId, RowReference rowReference)
+    public boolean add(int groupId, RowReference rowReference)
     {
         // Insert to any existing peer groups first (heap nodes contain distinct values)
         long peerHeapNodeIndex = peerGroupLookup.get(groupId, rowReference);
         if (peerHeapNodeIndex != UNKNOWN_INDEX) {
             directPeerGroupInsert(groupId, peerHeapNodeIndex, rowReference.allocateRowId());
-            if (calculateRootRank(groupId) > topN) {
+            if (calculateRootRank(groupId, groupIdToHeapBuffer.getHeapRootNodeIndex(groupId)) > topN) {
                 heapPop(groupId, rowIdEvictionListener);
             }
             // Return true because heapPop is guaranteed not to evict the newly inserted row (by definition of rank)
@@ -119,11 +144,12 @@ public boolean add(long groupId, RowReference rowReference)
             heapInsert(groupId, newPeerGroupIndex, 1);
             return true;
         }
-        if (rowReference.compareTo(strategy, peekRootRowId(groupId)) < 0) {
+        long heapRootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
+        if (rowReference.compareTo(strategy, peekRootRowIdByHeapNodeIndex(heapRootNodeIndex)) < 0) {
             // Given that total number of values >= topN, we can only consider values that are less than the root (otherwise topN would be violated)
             long newPeerGroupIndex = peerGroupBuffer.allocateNewNode(rowReference.allocateRowId(), UNKNOWN_INDEX);
             // Rank will increase by +1 after insertion, so only need to pop if root rank is already == topN.
-            if (calculateRootRank(groupId) < topN) {
+            if (calculateRootRank(groupId, heapRootNodeIndex) < topN) {
                 heapInsert(groupId, newPeerGroupIndex, 1);
             }
             else {
@@ -143,7 +169,7 @@ public boolean add(long groupId, RowReference rowReference)
      *
      * @return number of rows deposited to the output buffers
      */
-    public long drainTo(long groupId, LongBigArray rowIdOutput, LongBigArray rankingOutput)
+    public long drainTo(int groupId, LongBigArray rowIdOutput, LongBigArray rankingOutput)
     {
         long valueCount = groupIdToHeapBuffer.getHeapValueCount(groupId);
         rowIdOutput.ensureCapacity(valueCount);
@@ -158,7 +184,7 @@ public long drainTo(long groupId, LongBigArray rowIdOutput, LongBigArray ranking
             long peerGroupIndex = heapNodeBuffer.getPeerGroupIndex(heapRootNodeIndex);
             verify(peerGroupIndex != UNKNOWN_INDEX, "Peer group should have at least one value");
 
-            long rank = calculateRootRank(groupId);
+            long rank = calculateRootRank(groupId, heapRootNodeIndex);
             do {
                 rowIdOutput.set(insertionIndex, peerGroupBuffer.getRowId(peerGroupIndex));
                 rankingOutput.set(insertionIndex, rank);
@@ -180,7 +206,7 @@ public long drainTo(long groupId, LongBigArray rowIdOutput, LongBigArray ranking
      *
      * @return number of rows deposited to the output buffer
      */
-    public long drainTo(long groupId, LongBigArray rowIdOutput)
+    public long drainTo(int groupId, LongBigArray rowIdOutput)
     {
         long valueCount = groupIdToHeapBuffer.getHeapValueCount(groupId);
         rowIdOutput.ensureCapacity(valueCount);
@@ -206,16 +232,15 @@ public long drainTo(long groupId, LongBigArray rowIdOutput)
         return valueCount;
     }
 
-    private long calculateRootRank(long groupId)
+    private long calculateRootRank(int groupId, long heapRootIndex)
     {
         long heapValueCount = groupIdToHeapBuffer.getHeapValueCount(groupId);
-        long heapRootIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
         checkArgument(heapRootIndex != UNKNOWN_INDEX, "Group does not have a root");
         long rootPeerGroupCount = heapNodeBuffer.getPeerGroupCount(heapRootIndex);
         return heapValueCount - rootPeerGroupCount + 1;
     }
 
-    private void directPeerGroupInsert(long groupId, long heapNodeIndex, long rowId)
+    private void directPeerGroupInsert(int groupId, long heapNodeIndex, long rowId)
     {
         long existingPeerGroupIndex = heapNodeBuffer.getPeerGroupIndex(heapNodeIndex);
         long newPeerGroupIndex = peerGroupBuffer.allocateNewNode(rowId, existingPeerGroupIndex);
@@ -224,9 +249,8 @@ private void directPeerGroupInsert(long groupId, long heapNodeIndex, long rowId)
         groupIdToHeapBuffer.incrementHeapValueCount(groupId);
     }
 
-    private long peekRootRowId(long groupId)
+    private long peekRootRowIdByHeapNodeIndex(long heapRootNodeIndex)
     {
-        long heapRootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
         checkArgument(heapRootNodeIndex != UNKNOWN_INDEX, "Group has nothing to peek");
         return peerGroupBuffer.getRowId(heapNodeBuffer.getPeerGroupIndex(heapRootNodeIndex));
     }
@@ -253,7 +277,7 @@ private void setChildIndex(long heapNodeIndex, HeapTraversal.Child child, long n
      *
      * @param contextEvictionListener optional callback for the root node that gets popped off
      */
-    private void heapPop(long groupId, @Nullable LongConsumer contextEvictionListener)
+    private void heapPop(int groupId, @Nullable LongConsumer contextEvictionListener)
     {
         long heapRootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
         checkArgument(heapRootNodeIndex != UNKNOWN_INDEX, "Group ID has an empty heap");
@@ -283,7 +307,7 @@ private void heapPop(long groupId, @Nullable LongConsumer contextEvictionListene
      *
      * @return leaf node index that was detached from the heap
      */
-    private long heapDetachLastInsertionLeaf(long groupId)
+    private long heapDetachLastInsertionLeaf(int groupId)
     {
         long heapRootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
         long heapSize = groupIdToHeapBuffer.getHeapSize(groupId);
@@ -324,7 +348,7 @@ private long heapDetachLastInsertionLeaf(long groupId)
      * Insertions always fill the left child before the right, and fill up an entire heap level before moving to the
      * next level.
      */
-    private void heapInsert(long groupId, long newPeerGroupIndex, long newPeerGroupCount)
+    private void heapInsert(int groupId, long newPeerGroupIndex, long newPeerGroupCount)
     {
         long newCanonicalRowId = peerGroupBuffer.getRowId(newPeerGroupIndex);
 
@@ -389,7 +413,7 @@ private void heapInsert(long groupId, long newPeerGroupIndex, long newPeerGroupC
      *
      * @param contextEvictionListener optional callback for the root node that gets popped off
      */
-    private void heapPopAndInsert(long groupId, long newPeerGroupIndex, long newPeerGroupCount, @Nullable LongConsumer contextEvictionListener)
+    private void heapPopAndInsert(int groupId, long newPeerGroupIndex, long newPeerGroupCount, @Nullable LongConsumer contextEvictionListener)
     {
         long heapRootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
         checkState(heapRootNodeIndex != UNKNOWN_INDEX, "popAndInsert() requires at least a root node");
@@ -446,7 +470,7 @@ private void heapPopAndInsert(long groupId, long newPeerGroupIndex, long newPeer
      * Deallocates all peer group associations for this heap node, leaving a structural husk with no contents. Assumes
      * that any required group level metric changes are handled externally.
      */
-    private void dropHeapNodePeerGroup(long groupId, long heapNodeIndex, @Nullable LongConsumer contextEvictionListener)
+    private void dropHeapNodePeerGroup(int groupId, long heapNodeIndex, @Nullable LongConsumer contextEvictionListener)
     {
         long peerGroupIndex = heapNodeBuffer.getPeerGroupIndex(heapNodeIndex);
         checkState(peerGroupIndex != UNKNOWN_INDEX, "Heap node must have at least one peer group");
@@ -483,11 +507,11 @@ void verifyIntegrity()
     {
         long totalHeapNodes = 0;
         long totalValueCount = 0;
-        for (long groupId = 0; groupId < groupIdToHeapBuffer.getTotalGroups(); groupId++) {
+        for (int groupId = 0; groupId < groupIdToHeapBuffer.getTotalGroups(); groupId++) {
             long heapSize = groupIdToHeapBuffer.getHeapSize(groupId);
             long heapValueCount = groupIdToHeapBuffer.getHeapValueCount(groupId);
             long rootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
-            verify(rootNodeIndex == UNKNOWN_INDEX || calculateRootRank(rootNodeIndex) <= topN, "Max heap has more values than needed");
+            verify(rootNodeIndex == UNKNOWN_INDEX || calculateRootRank(groupId, rootNodeIndex) <= topN, "Max heap has more values than needed");
             IntegrityStats integrityStats = verifyHeapIntegrity(groupId, rootNodeIndex);
             verify(integrityStats.getPeerGroupCount() == heapSize, "Recorded heap size does not match actual heap size");
             totalHeapNodes += integrityStats.getPeerGroupCount();
@@ -499,7 +523,7 @@ void verifyIntegrity()
         verify(totalValueCount == peerGroupBuffer.getActiveNodeCount(), "Failed to deallocate some unused nodes");
     }
 
-    private IntegrityStats verifyHeapIntegrity(long groupId, long heapNodeIndex)
+    private IntegrityStats verifyHeapIntegrity(int groupId, long heapNodeIndex)
     {
         if (heapNodeIndex == UNKNOWN_INDEX) {
             return new IntegrityStats(0, 0, 0);
@@ -577,7 +601,7 @@ public long getValueCount()
     /**
      * Buffer abstracting a mapping from group ID to a heap. The group ID provides the index for all operations.
      */
-    private static class GroupIdToHeapBuffer
+    private static final class GroupIdToHeapBuffer
     {
         private static final long INSTANCE_SIZE = instanceSize(GroupIdToHeapBuffer.class);
         private static final int METRICS_POSITIONS_PER_ENTRY = 2;
@@ -600,70 +624,73 @@ private static class GroupIdToHeapBuffer
          */
         private final LongBigArray metricsBuffer = new LongBigArray(0);
 
-        private long totalGroups;
+        private int totalGroups;
 
-        public void allocateGroupIfNeeded(long groupId)
+        public void allocateGroupIfNeeded(int groupId)
         {
+            if (totalGroups > groupId) {
+                return;
+            }
             // Group IDs generated by GroupByHash are always generated consecutively starting from 0, so observing a
             // group ID N means groups [0, N] inclusive must exist.
-            totalGroups = max(groupId + 1, totalGroups);
+            totalGroups = groupId + 1;
             heapIndexBuffer.ensureCapacity(totalGroups);
-            metricsBuffer.ensureCapacity(totalGroups * METRICS_POSITIONS_PER_ENTRY);
+            metricsBuffer.ensureCapacity((long) totalGroups * METRICS_POSITIONS_PER_ENTRY);
         }
 
-        public long getTotalGroups()
+        public int getTotalGroups()
         {
             return totalGroups;
         }
 
-        public long getHeapRootNodeIndex(long groupId)
+        public long getHeapRootNodeIndex(int groupId)
         {
             return heapIndexBuffer.get(groupId);
         }
 
-        public void setHeapRootNodeIndex(long groupId, long heapNodeIndex)
+        public void setHeapRootNodeIndex(int groupId, long heapNodeIndex)
         {
             heapIndexBuffer.set(groupId, heapNodeIndex);
         }
 
-        public long getHeapValueCount(long groupId)
+        public long getHeapValueCount(int groupId)
         {
-            return metricsBuffer.get(groupId * METRICS_POSITIONS_PER_ENTRY);
+            return metricsBuffer.get((long) groupId * METRICS_POSITIONS_PER_ENTRY);
         }
 
-        public void setHeapValueCount(long groupId, long count)
+        public void setHeapValueCount(int groupId, long count)
         {
-            metricsBuffer.set(groupId * METRICS_POSITIONS_PER_ENTRY, count);
+            metricsBuffer.set((long) groupId * METRICS_POSITIONS_PER_ENTRY, count);
         }
 
-        public void addHeapValueCount(long groupId, long delta)
+        public void addHeapValueCount(int groupId, long delta)
         {
-            metricsBuffer.add(groupId * METRICS_POSITIONS_PER_ENTRY, delta);
+            metricsBuffer.add((long) groupId * METRICS_POSITIONS_PER_ENTRY, delta);
         }
 
-        public void incrementHeapValueCount(long groupId)
+        public void incrementHeapValueCount(int groupId)
         {
-            metricsBuffer.increment(groupId * METRICS_POSITIONS_PER_ENTRY);
+            metricsBuffer.increment((long) groupId * METRICS_POSITIONS_PER_ENTRY);
         }
 
-        public long getHeapSize(long groupId)
+        public long getHeapSize(int groupId)
         {
-            return metricsBuffer.get(groupId * METRICS_POSITIONS_PER_ENTRY + METRICS_HEAP_SIZE_OFFSET);
+            return metricsBuffer.get((long) groupId * METRICS_POSITIONS_PER_ENTRY + METRICS_HEAP_SIZE_OFFSET);
         }
 
-        public void setHeapSize(long groupId, long size)
+        public void setHeapSize(int groupId, long size)
         {
-            metricsBuffer.set(groupId * METRICS_POSITIONS_PER_ENTRY + METRICS_HEAP_SIZE_OFFSET, size);
+            metricsBuffer.set((long) groupId * METRICS_POSITIONS_PER_ENTRY + METRICS_HEAP_SIZE_OFFSET, size);
         }
 
-        public void addHeapSize(long groupId, long delta)
+        public void addHeapSize(int groupId, long delta)
         {
-            metricsBuffer.add(groupId * METRICS_POSITIONS_PER_ENTRY + METRICS_HEAP_SIZE_OFFSET, delta);
+            metricsBuffer.add((long) groupId * METRICS_POSITIONS_PER_ENTRY + METRICS_HEAP_SIZE_OFFSET, delta);
         }
 
-        public void incrementHeapSize(long groupId)
+        public void incrementHeapSize(int groupId)
         {
-            metricsBuffer.increment(groupId * METRICS_POSITIONS_PER_ENTRY + METRICS_HEAP_SIZE_OFFSET);
+            metricsBuffer.increment((long) groupId * METRICS_POSITIONS_PER_ENTRY + METRICS_HEAP_SIZE_OFFSET);
         }
 
         public long sizeOf()
@@ -675,7 +702,7 @@ public long sizeOf()
     /**
      * Buffer abstracting storage of nodes in the heap. Nodes are referenced by their node index for operations.
      */
-    private static class HeapNodeBuffer
+    private static final class HeapNodeBuffer
     {
         private static final long INSTANCE_SIZE = instanceSize(HeapNodeBuffer.class);
         private static final int POSITIONS_PER_ENTRY = 4;
@@ -790,7 +817,7 @@ public long sizeOf()
      * Buffer abstracting storage of peer groups as linked chains of matching values. Peer groups are referenced by
      * their node index for operations.
      */
-    private static class PeerGroupBuffer
+    private static final class PeerGroupBuffer
     {
         private static final long INSTANCE_SIZE = instanceSize(PeerGroupBuffer.class);
         private static final int POSITIONS_PER_ENTRY = 2;
diff --git a/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRankBuilder.java b/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRankBuilder.java
index fcbb81103c48..2a525bbea7b9 100644
--- a/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRankBuilder.java
+++ b/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRankBuilder.java
@@ -41,7 +41,9 @@ public class GroupedTopNRankBuilder
 
     private final List<Type> sourceTypes;
     private final boolean produceRanking;
+    private final int[] groupByChannels;
     private final GroupByHash groupByHash;
+    private final PageWithPositionComparator comparator;
     private final RowReferencePageManager pageManager = new RowReferencePageManager();
     private final GroupedTopNRankAccumulator groupedTopNRankAccumulator;
 
@@ -51,14 +53,16 @@ public GroupedTopNRankBuilder(
             PageWithPositionEqualsAndHash equalsAndHash,
             int topN,
             boolean produceRanking,
+            int[] groupByChannels,
             GroupByHash groupByHash)
     {
         this.sourceTypes = requireNonNull(sourceTypes, "sourceTypes is null");
         checkArgument(topN > 0, "topN must be > 0");
         this.produceRanking = produceRanking;
+        this.groupByChannels = requireNonNull(groupByChannels, "groupByChannels is null");
         this.groupByHash = requireNonNull(groupByHash, "groupByHash is null");
 
-        requireNonNull(comparator, "comparator is null");
+        this.comparator = requireNonNull(comparator, "comparator is null");
         requireNonNull(equalsAndHash, "equalsAndHash is null");
         groupedTopNRankAccumulator = new GroupedTopNRankAccumulator(
                 new RowIdComparisonHashStrategy()
@@ -99,9 +103,9 @@ public long hashCode(long rowId)
     public Work<?> processPage(Page page)
     {
         return new TransformWork<>(
-                groupByHash.getGroupIds(page),
+                groupByHash.getGroupIds(page.getColumns(groupByChannels)),
                 groupIds -> {
-                    processPage(page, groupIds);
+                    processPage(page, groupByHash.getGroupCount(), groupIds);
                     return null;
                 });
     }
@@ -121,11 +125,16 @@ public long getEstimatedSizeInBytes()
                 + groupedTopNRankAccumulator.sizeOf();
     }
 
-    private void processPage(Page newPage, GroupByIdBlock groupIds)
+    private void processPage(Page newPage, int groupCount, int[] groupIds)
     {
-        try (LoadCursor loadCursor = pageManager.add(newPage)) {
-            for (int position = 0; position < newPage.getPositionCount(); position++) {
-                long groupId = groupIds.getGroupId(position);
+        int firstPositionToAdd = groupedTopNRankAccumulator.findFirstPositionToAdd(newPage, groupCount, groupIds, comparator, pageManager);
+        if (firstPositionToAdd < 0) {
+            return;
+        }
+
+        try (LoadCursor loadCursor = pageManager.add(newPage, firstPositionToAdd)) {
+            for (int position = firstPositionToAdd; position < newPage.getPositionCount(); position++) {
+                int groupId = groupIds[position];
                 loadCursor.advance();
                 groupedTopNRankAccumulator.add(groupId, loadCursor);
             }
@@ -139,8 +148,8 @@ private class ResultIterator
             extends AbstractIterator<Page>
     {
         private final PageBuilder pageBuilder;
-        private final long groupIdCount = groupByHash.getGroupCount();
-        private long currentGroupId = -1;
+        private final int groupIdCount = groupByHash.getGroupCount();
+        private int currentGroupId = -1;
         private final LongBigArray rowIdOutput = new LongBigArray();
         private final LongBigArray rankingOutput = new LongBigArray();
         private long currentGroupSize;
diff --git a/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRowNumberAccumulator.java b/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRowNumberAccumulator.java
index f73676d1fd6b..1ccce5c69811 100644
--- a/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRowNumberAccumulator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRowNumberAccumulator.java
@@ -15,10 +15,10 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import io.trino.array.LongBigArray;
+import io.trino.spi.Page;
 import io.trino.util.HeapTraversal;
 import io.trino.util.LongBigArrayFIFOQueue;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.function.LongConsumer;
 
@@ -72,6 +72,30 @@ public long sizeOf()
         return INSTANCE_SIZE + groupIdToHeapBuffer.sizeOf() + heapNodeBuffer.sizeOf() + heapTraversal.sizeOf();
     }
 
+    public int findFirstPositionToAdd(Page newPage, int groupCount, int[] groupIds, PageWithPositionComparator comparator, RowReferencePageManager pageManager)
+    {
+        int currentTotalGroups = groupIdToHeapBuffer.getTotalGroups();
+        groupIdToHeapBuffer.allocateGroupIfNeeded(groupCount);
+
+        for (int position = 0; position < newPage.getPositionCount(); position++) {
+            int groupId = groupIds[position];
+            if (groupId >= currentTotalGroups || calculateRootRowNumber(groupId) < topN) {
+                return position;
+            }
+            long heapRootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
+            if (heapRootNodeIndex == UNKNOWN_INDEX) {
+                return position;
+            }
+            long rowId = heapNodeBuffer.getRowId(heapRootNodeIndex);
+            Page rightPage = pageManager.getPage(rowId);
+            int rightPosition = pageManager.getPosition(rowId);
+            if (comparator.compareTo(newPage, position, rightPage, rightPosition) < 0) {
+                return position;
+            }
+        }
+        return -1;
+    }
+
     /**
      * Add the specified row to this accumulator.
      * <p>
@@ -79,7 +103,7 @@ public long sizeOf()
      *
      * @return true if this row was incorporated, false otherwise
      */
-    public boolean add(long groupId, RowReference rowReference)
+    public boolean add(int groupId, RowReference rowReference)
     {
         groupIdToHeapBuffer.allocateGroupIfNeeded(groupId);
 
@@ -103,7 +127,7 @@ public boolean add(long groupId, RowReference rowReference)
      *
      * @return number of rows deposited to the output buffer
      */
-    public long drainTo(long groupId, LongBigArray rowIdOutput)
+    public long drainTo(int groupId, LongBigArray rowIdOutput)
     {
         long heapSize = groupIdToHeapBuffer.getHeapSize(groupId);
         rowIdOutput.ensureCapacity(heapSize);
@@ -116,12 +140,12 @@ public long drainTo(long groupId, LongBigArray rowIdOutput)
         return heapSize;
     }
 
-    private long calculateRootRowNumber(long groupId)
+    private long calculateRootRowNumber(int groupId)
     {
         return groupIdToHeapBuffer.getHeapSize(groupId);
     }
 
-    private long peekRootRowId(long groupId)
+    private long peekRootRowId(int groupId)
     {
         long heapRootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
         checkArgument(heapRootNodeIndex != UNKNOWN_INDEX, "No root to peek");
@@ -150,7 +174,7 @@ private void setChildIndex(long heapNodeIndex, HeapTraversal.Child child, long n
      *
      * @param contextEvictionListener optional callback for the root node that gets popped off
      */
-    private void heapPop(long groupId, @Nullable LongConsumer contextEvictionListener)
+    private void heapPop(int groupId, @Nullable LongConsumer contextEvictionListener)
     {
         long heapRootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
         checkArgument(heapRootNodeIndex != UNKNOWN_INDEX, "Group ID has an empty heap");
@@ -179,7 +203,7 @@ private void heapPop(long groupId, @Nullable LongConsumer contextEvictionListene
      *
      * @return leaf node index that was detached from the heap
      */
-    private long heapDetachLastInsertionLeaf(long groupId)
+    private long heapDetachLastInsertionLeaf(int groupId)
     {
         long heapRootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
         long heapSize = groupIdToHeapBuffer.getHeapSize(groupId);
@@ -218,7 +242,7 @@ private long heapDetachLastInsertionLeaf(long groupId)
      * Insertions always fill the left child before the right, and fill up an entire heap level before moving to the
      * next level.
      */
-    private void heapInsert(long groupId, long newRowId)
+    private void heapInsert(int groupId, long newRowId)
     {
         long heapRootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
         if (heapRootNodeIndex == UNKNOWN_INDEX) {
@@ -268,7 +292,7 @@ private void heapInsert(long groupId, long newRowId)
      *
      * @param contextEvictionListener optional callback for the root node that gets popped off
      */
-    private void heapPopAndInsert(long groupId, long newRowId, @Nullable LongConsumer contextEvictionListener)
+    private void heapPopAndInsert(int groupId, long newRowId, @Nullable LongConsumer contextEvictionListener)
     {
         long heapRootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
         checkState(heapRootNodeIndex != UNKNOWN_INDEX, "popAndInsert() requires at least a root node");
@@ -322,10 +346,10 @@ private void heapPopAndInsert(long groupId, long newRowId, @Nullable LongConsume
     void verifyIntegrity()
     {
         long totalHeapNodes = 0;
-        for (long groupId = 0; groupId < groupIdToHeapBuffer.getTotalGroups(); groupId++) {
+        for (int groupId = 0; groupId < groupIdToHeapBuffer.getTotalGroups(); groupId++) {
             long heapSize = groupIdToHeapBuffer.getHeapSize(groupId);
             long rootNodeIndex = groupIdToHeapBuffer.getHeapRootNodeIndex(groupId);
-            verify(rootNodeIndex == UNKNOWN_INDEX || calculateRootRowNumber(rootNodeIndex) <= topN, "Max heap has more values than needed");
+            verify(rootNodeIndex == UNKNOWN_INDEX || calculateRootRowNumber(groupId) <= topN, "Max heap has more values than needed");
             IntegrityStats integrityStats = verifyHeapIntegrity(rootNodeIndex);
             verify(integrityStats.getNodeCount() == heapSize, "Recorded heap size does not match actual heap size");
             totalHeapNodes += integrityStats.getNodeCount();
@@ -407,48 +431,51 @@ private static class GroupIdToHeapBuffer
         // Since we have a single element per group, this array is effectively indexed on group ID
         private final LongBigArray sizeBuffer = new LongBigArray(0);
 
-        private long totalGroups;
+        private int totalGroups;
 
-        public void allocateGroupIfNeeded(long groupId)
+        public void allocateGroupIfNeeded(int groupId)
         {
+            if (totalGroups > groupId) {
+                return;
+            }
             // Group IDs generated by GroupByHash are always generated consecutively starting from 0, so observing a
             // group ID N means groups [0, N] inclusive must exist.
-            totalGroups = max(groupId + 1, totalGroups);
+            totalGroups = groupId + 1;
             heapIndexBuffer.ensureCapacity(totalGroups);
             sizeBuffer.ensureCapacity(totalGroups);
         }
 
-        public long getTotalGroups()
+        public int getTotalGroups()
         {
             return totalGroups;
         }
 
-        public long getHeapRootNodeIndex(long groupId)
+        public long getHeapRootNodeIndex(int groupId)
         {
             return heapIndexBuffer.get(groupId);
         }
 
-        public void setHeapRootNodeIndex(long groupId, long heapNodeIndex)
+        public void setHeapRootNodeIndex(int groupId, long heapNodeIndex)
         {
             heapIndexBuffer.set(groupId, heapNodeIndex);
         }
 
-        public long getHeapSize(long groupId)
+        public long getHeapSize(int groupId)
         {
             return sizeBuffer.get(groupId);
         }
 
-        public void setHeapSize(long groupId, long count)
+        public void setHeapSize(int groupId, long count)
         {
             sizeBuffer.set(groupId, count);
         }
 
-        public void addHeapSize(long groupId, long delta)
+        public void addHeapSize(int groupId, long delta)
         {
             sizeBuffer.add(groupId, delta);
         }
 
-        public void incrementHeapSize(long groupId)
+        public void incrementHeapSize(int groupId)
         {
             sizeBuffer.increment(groupId);
         }
diff --git a/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRowNumberBuilder.java b/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRowNumberBuilder.java
index e40bf847af4e..e7f4e7de3d26 100644
--- a/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRowNumberBuilder.java
+++ b/core/trino-main/src/main/java/io/trino/operator/GroupedTopNRowNumberBuilder.java
@@ -41,23 +41,27 @@ public class GroupedTopNRowNumberBuilder
 
     private final List<Type> sourceTypes;
     private final boolean produceRowNumber;
+    private final int[] groupByChannels;
     private final GroupByHash groupByHash;
     private final RowReferencePageManager pageManager = new RowReferencePageManager();
     private final GroupedTopNRowNumberAccumulator groupedTopNRowNumberAccumulator;
+    private final PageWithPositionComparator comparator;
 
     public GroupedTopNRowNumberBuilder(
             List<Type> sourceTypes,
             PageWithPositionComparator comparator,
             int topN,
             boolean produceRowNumber,
+            int[] groupByChannels,
             GroupByHash groupByHash)
     {
         this.sourceTypes = requireNonNull(sourceTypes, "sourceTypes is null");
         checkArgument(topN > 0, "topN must be > 0");
         this.produceRowNumber = produceRowNumber;
+        this.groupByChannels = groupByChannels;
         this.groupByHash = requireNonNull(groupByHash, "groupByHash is null");
 
-        requireNonNull(comparator, "comparator is null");
+        this.comparator = requireNonNull(comparator, "comparator is null");
         groupedTopNRowNumberAccumulator = new GroupedTopNRowNumberAccumulator(
                 (leftRowId, rightRowId) -> {
                     Page leftPage = pageManager.getPage(leftRowId);
@@ -74,9 +78,9 @@ public GroupedTopNRowNumberBuilder(
     public Work<?> processPage(Page page)
     {
         return new TransformWork<>(
-                groupByHash.getGroupIds(page),
+                groupByHash.getGroupIds(page.getColumns(groupByChannels)),
                 groupIds -> {
-                    processPage(page, groupIds);
+                    processPage(page, groupByHash.getGroupCount(), groupIds);
                     return null;
                 });
     }
@@ -96,11 +100,16 @@ public long getEstimatedSizeInBytes()
                 + groupedTopNRowNumberAccumulator.sizeOf();
     }
 
-    private void processPage(Page newPage, GroupByIdBlock groupIds)
+    private void processPage(Page newPage, int groupCount, int[] groupIds)
     {
-        try (LoadCursor loadCursor = pageManager.add(newPage)) {
-            for (int position = 0; position < newPage.getPositionCount(); position++) {
-                long groupId = groupIds.getGroupId(position);
+        int firstPositionToAdd = groupedTopNRowNumberAccumulator.findFirstPositionToAdd(newPage, groupCount, groupIds, comparator, pageManager);
+        if (firstPositionToAdd < 0) {
+            return;
+        }
+
+        try (LoadCursor loadCursor = pageManager.add(newPage, firstPositionToAdd)) {
+            for (int position = firstPositionToAdd; position < newPage.getPositionCount(); position++) {
+                int groupId = groupIds[position];
                 loadCursor.advance();
                 groupedTopNRowNumberAccumulator.add(groupId, loadCursor);
             }
@@ -120,8 +129,8 @@ private class ResultIterator
             extends AbstractIterator<Page>
     {
         private final PageBuilder pageBuilder;
-        private final long groupIdCount = groupByHash.getGroupCount();
-        private long currentGroupId = -1;
+        private final int groupIdCount = groupByHash.getGroupCount();
+        private int currentGroupId = -1;
         private final LongBigArray rowIdOutput = new LongBigArray();
         private long currentGroupSize;
         private int currentIndexInGroup;
diff --git a/core/trino-main/src/main/java/io/trino/operator/HashAggregationOperator.java b/core/trino-main/src/main/java/io/trino/operator/HashAggregationOperator.java
index b7fd8d807c1f..0aaa7d2335ec 100644
--- a/core/trino-main/src/main/java/io/trino/operator/HashAggregationOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/HashAggregationOperator.java
@@ -15,6 +15,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.airlift.units.DataSize;
 import io.trino.memory.context.LocalMemoryContext;
@@ -25,23 +26,27 @@
 import io.trino.operator.aggregation.partial.PartialAggregationController;
 import io.trino.operator.aggregation.partial.SkipAggregationBuilder;
 import io.trino.operator.scalar.CombineHashFunction;
+import io.trino.plugin.base.metrics.LongCount;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
+import io.trino.spi.metrics.Metrics;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.spiller.SpillerFactory;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.AggregationNode.Step;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.OptionalLong;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.operator.aggregation.builder.InMemoryHashAggregationBuilder.toTypes;
+import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.optimizations.HashGenerationOptimizer.INITIAL_HASH_VALUE;
 import static io.trino.type.TypeUtils.NULL_HASH_CODE;
 import static java.util.Objects.requireNonNull;
@@ -49,6 +54,7 @@
 public class HashAggregationOperator
         implements Operator
 {
+    static final String INPUT_ROWS_WITH_PARTIAL_AGGREGATION_DISABLED_METRIC_NAME = "Input rows processed without partial aggregation enabled";
     private static final double MERGE_WITH_MEMORY_RATIO = 0.9;
 
     public static class HashAggregationOperatorFactory
@@ -72,7 +78,7 @@ public static class HashAggregationOperatorFactory
         private final DataSize memoryLimitForMergeWithMemory;
         private final SpillerFactory spillerFactory;
         private final JoinCompiler joinCompiler;
-        private final BlockTypeOperators blockTypeOperators;
+        private final TypeOperators typeOperators;
         private final Optional<PartialAggregationController> partialAggregationController;
 
         private boolean closed;
@@ -91,7 +97,7 @@ public HashAggregationOperatorFactory(
                 int expectedGroups,
                 Optional<DataSize> maxPartialMemory,
                 JoinCompiler joinCompiler,
-                BlockTypeOperators blockTypeOperators,
+                TypeOperators typeOperators,
                 Optional<PartialAggregationController> partialAggregationController)
         {
             this(operatorId,
@@ -113,7 +119,7 @@ public HashAggregationOperatorFactory(
                         throw new UnsupportedOperationException();
                     },
                     joinCompiler,
-                    blockTypeOperators,
+                    typeOperators,
                     partialAggregationController);
         }
 
@@ -134,7 +140,7 @@ public HashAggregationOperatorFactory(
                 DataSize unspillMemoryLimit,
                 SpillerFactory spillerFactory,
                 JoinCompiler joinCompiler,
-                BlockTypeOperators blockTypeOperators,
+                TypeOperators typeOperators,
                 Optional<PartialAggregationController> partialAggregationController)
         {
             this(operatorId,
@@ -154,7 +160,7 @@ public HashAggregationOperatorFactory(
                     DataSize.succinctBytes((long) (unspillMemoryLimit.toBytes() * MERGE_WITH_MEMORY_RATIO)),
                     spillerFactory,
                     joinCompiler,
-                    blockTypeOperators,
+                    typeOperators,
                     partialAggregationController);
         }
 
@@ -177,7 +183,7 @@ public HashAggregationOperatorFactory(
                 DataSize memoryLimitForMergeWithMemory,
                 SpillerFactory spillerFactory,
                 JoinCompiler joinCompiler,
-                BlockTypeOperators blockTypeOperators,
+                TypeOperators typeOperators,
                 Optional<PartialAggregationController> partialAggregationController)
         {
             this.operatorId = operatorId;
@@ -197,7 +203,7 @@ public HashAggregationOperatorFactory(
             this.memoryLimitForMergeWithMemory = requireNonNull(memoryLimitForMergeWithMemory, "memoryLimitForMergeWithMemory is null");
             this.spillerFactory = requireNonNull(spillerFactory, "spillerFactory is null");
             this.joinCompiler = requireNonNull(joinCompiler, "joinCompiler is null");
-            this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
+            this.typeOperators = requireNonNull(typeOperators, "typeOperators is null");
             this.partialAggregationController = requireNonNull(partialAggregationController, "partialAggregationController is null");
         }
 
@@ -224,7 +230,7 @@ public Operator createOperator(DriverContext driverContext)
                     memoryLimitForMergeWithMemory,
                     spillerFactory,
                     joinCompiler,
-                    blockTypeOperators,
+                    typeOperators,
                     partialAggregationController);
             return hashAggregationOperator;
         }
@@ -256,7 +262,7 @@ public OperatorFactory duplicate()
                     memoryLimitForMergeWithMemory,
                     spillerFactory,
                     joinCompiler,
-                    blockTypeOperators,
+                    typeOperators,
                     partialAggregationController.map(PartialAggregationController::duplicate));
         }
     }
@@ -278,21 +284,23 @@ public OperatorFactory duplicate()
     private final DataSize memoryLimitForMergeWithMemory;
     private final SpillerFactory spillerFactory;
     private final JoinCompiler joinCompiler;
-    private final BlockTypeOperators blockTypeOperators;
+    private final TypeOperators typeOperators;
 
     private final List<Type> types;
 
     private HashAggregationBuilder aggregationBuilder;
     private final LocalMemoryContext memoryContext;
     private WorkProcessor<Page> outputPages;
-    private boolean inputProcessed;
+    private long totalInputRowsProcessed;
+    private long inputRowsProcessedWithPartialAggregationDisabled;
     private boolean finishing;
     private boolean finished;
 
     // for yield when memory is not available
     private Work<?> unfinishedWork;
-    private long numberOfInputRowsProcessed;
-    private long numberOfUniqueRowsProduced;
+    private long aggregationInputBytesProcessed;
+    private long aggregationInputRowsProcessed;
+    private long aggregationUniqueRowsProduced;
 
     private HashAggregationOperator(
             OperatorContext operatorContext,
@@ -311,7 +319,7 @@ private HashAggregationOperator(
             DataSize memoryLimitForMergeWithMemory,
             SpillerFactory spillerFactory,
             JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators,
+            TypeOperators typeOperators,
             Optional<PartialAggregationController> partialAggregationController)
     {
         this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
@@ -337,7 +345,7 @@ private HashAggregationOperator(
         this.memoryLimitForMergeWithMemory = requireNonNull(memoryLimitForMergeWithMemory, "memoryLimitForMergeWithMemory is null");
         this.spillerFactory = requireNonNull(spillerFactory, "spillerFactory is null");
         this.joinCompiler = requireNonNull(joinCompiler, "joinCompiler is null");
-        this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
+        this.typeOperators = requireNonNull(typeOperators, "typeOperators is null");
 
         this.memoryContext = operatorContext.localUserMemoryContext();
     }
@@ -378,7 +386,7 @@ public void addInput(Page page)
         checkState(unfinishedWork == null, "Operator has unfinished work");
         checkState(!finishing, "Operator is already finishing");
         requireNonNull(page, "page is null");
-        inputProcessed = true;
+        totalInputRowsProcessed += page.getPositionCount();
 
         if (aggregationBuilder == null) {
             boolean partialAggregationDisabled = partialAggregationController
@@ -399,7 +407,6 @@ else if (step.isOutputPartial() || !spillEnabled || !isSpillable()) {
                         operatorContext,
                         maxPartialMemory,
                         joinCompiler,
-                        blockTypeOperators,
                         () -> {
                             memoryContext.setBytes(((InMemoryHashAggregationBuilder) aggregationBuilder).getSizeInMemory());
                             if (step.isOutputPartial() && maxPartialMemory.isPresent()) {
@@ -422,7 +429,7 @@ else if (step.isOutputPartial() || !spillEnabled || !isSpillable()) {
                         memoryLimitForMergeWithMemory,
                         spillerFactory,
                         joinCompiler,
-                        blockTypeOperators);
+                        typeOperators);
             }
 
             // assume initial aggregationBuilder is not full
@@ -437,7 +444,8 @@ else if (step.isOutputPartial() || !spillEnabled || !isSpillable()) {
             unfinishedWork = null;
         }
         aggregationBuilder.updateMemory();
-        numberOfInputRowsProcessed += page.getPositionCount();
+        aggregationInputBytesProcessed += page.getSizeInBytes();
+        aggregationInputRowsProcessed += page.getPositionCount();
     }
 
     private boolean isSpillable()
@@ -481,7 +489,7 @@ public Page getOutput()
 
         if (outputPages == null) {
             if (finishing) {
-                if (!inputProcessed && produceDefaultOutput) {
+                if (totalInputRowsProcessed == 0 && produceDefaultOutput) {
                     // global aggregations always generate an output row with the default aggregation output (e.g. 0 for COUNT, NULL for SUM)
                     finished = true;
                     return getGlobalAggregationOutput();
@@ -511,7 +519,7 @@ public Page getOutput()
         }
 
         Page result = outputPages.getResult();
-        numberOfUniqueRowsProduced += result.getPositionCount();
+        aggregationUniqueRowsProduced += result.getPositionCount();
         return result;
     }
 
@@ -529,6 +537,19 @@ public HashAggregationBuilder getAggregationBuilder()
 
     private void closeAggregationBuilder()
     {
+        if (aggregationBuilder instanceof SkipAggregationBuilder) {
+            inputRowsProcessedWithPartialAggregationDisabled += aggregationInputRowsProcessed;
+            operatorContext.setLatestMetrics(new Metrics(ImmutableMap.of(
+                    INPUT_ROWS_WITH_PARTIAL_AGGREGATION_DISABLED_METRIC_NAME, new LongCount(inputRowsProcessedWithPartialAggregationDisabled))));
+            partialAggregationController.ifPresent(controller -> controller.onFlush(aggregationInputBytesProcessed, aggregationInputRowsProcessed, OptionalLong.empty()));
+        }
+        else {
+            partialAggregationController.ifPresent(controller -> controller.onFlush(aggregationInputBytesProcessed, aggregationInputRowsProcessed, OptionalLong.of(aggregationUniqueRowsProduced)));
+        }
+        aggregationInputBytesProcessed = 0;
+        aggregationInputRowsProcessed = 0;
+        aggregationUniqueRowsProduced = 0;
+
         outputPages = null;
         if (aggregationBuilder != null) {
             aggregationBuilder.close();
@@ -537,10 +558,6 @@ private void closeAggregationBuilder()
             aggregationBuilder = null;
         }
         memoryContext.setBytes(0);
-        partialAggregationController.ifPresent(
-                controller -> controller.onFlush(numberOfInputRowsProcessed, numberOfUniqueRowsProduced));
-        numberOfInputRowsProcessed = 0;
-        numberOfUniqueRowsProduced = 0;
     }
 
     private Page getGlobalAggregationOutput()
@@ -555,7 +572,7 @@ private Page getGlobalAggregationOutput()
 
             while (channel < groupByTypes.size()) {
                 if (channel == groupIdChannel.orElseThrow()) {
-                    output.getBlockBuilder(channel).writeLong(groupId);
+                    BIGINT.writeLong(output.getBlockBuilder(channel), groupId);
                 }
                 else {
                     output.getBlockBuilder(channel).appendNull();
@@ -565,7 +582,7 @@ private Page getGlobalAggregationOutput()
 
             if (hashChannel.isPresent()) {
                 long hashValue = calculateDefaultOutputHash(groupByTypes, groupIdChannel.orElseThrow(), groupId);
-                output.getBlockBuilder(channel).writeLong(hashValue);
+                BIGINT.writeLong(output.getBlockBuilder(channel), hashValue);
                 channel++;
             }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/HashSemiJoinOperator.java b/core/trino-main/src/main/java/io/trino/operator/HashSemiJoinOperator.java
index 8a02762962fe..6bf7d9fe1b44 100644
--- a/core/trino-main/src/main/java/io/trino/operator/HashSemiJoinOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/HashSemiJoinOperator.java
@@ -27,8 +27,7 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.plan.PlanNodeId;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Optional;
@@ -175,7 +174,7 @@ public TransformationState<Page> process(Page inputPage)
 
             if (channelSet == null) {
                 if (!channelSetFuture.isDone()) {
-                    // This will materialize page but it shouldn't matter for the first page
+                    // This will materialize page, but it shouldn't matter for the first page
                     localMemoryContext.setBytes(inputPage.getSizeInBytes());
                     return blocked(asVoid(channelSetFuture));
                 }
@@ -183,20 +182,20 @@ public TransformationState<Page> process(Page inputPage)
                 channelSet = getFutureValue(channelSetFuture);
                 localMemoryContext.setBytes(0);
             }
-            // use an effectively-final local variable instead of the non-final instance field inside of the loop
+            // use an effectively-final local variable instead of the non-final instance field inside the loop
             ChannelSet channelSet = requireNonNull(this.channelSet, "channelSet is null");
 
             // create the block builder for the new boolean column
             // we know the exact size required for the block
             BlockBuilder blockBuilder = BOOLEAN.createFixedSizeBlockBuilder(inputPage.getPositionCount());
 
-            Page probeJoinPage = inputPage.getLoadedPage(probeJoinChannel);
-            Block probeJoinNulls = probeJoinPage.getBlock(0).mayHaveNull() ? probeJoinPage.getBlock(0) : null;
-            Block hashBlock = probeHashChannel >= 0 ? inputPage.getBlock(probeHashChannel) : null;
+            Block probeBlock = inputPage.getBlock(probeJoinChannel).copyRegion(0, inputPage.getPositionCount());
+            boolean probeMayHaveNull = probeBlock.mayHaveNull();
+            Block hashBlock = probeHashChannel >= 0 ? inputPage.getBlock(probeHashChannel).copyRegion(0, inputPage.getPositionCount()) : null;
 
             // update hashing strategy to use probe cursor
             for (int position = 0; position < inputPage.getPositionCount(); position++) {
-                if (probeJoinNulls != null && probeJoinNulls.isNull(position)) {
+                if (probeMayHaveNull && probeBlock.isNull(position)) {
                     if (channelSet.isEmpty()) {
                         BOOLEAN.writeBoolean(blockBuilder, false);
                     }
@@ -208,10 +207,10 @@ public TransformationState<Page> process(Page inputPage)
                     boolean contains;
                     if (hashBlock != null) {
                         long rawHash = BIGINT.getLong(hashBlock, position);
-                        contains = channelSet.contains(position, probeJoinPage, rawHash);
+                        contains = channelSet.contains(probeBlock, position, rawHash);
                     }
                     else {
-                        contains = channelSet.contains(position, probeJoinPage);
+                        contains = channelSet.contains(probeBlock, position);
                     }
                     if (!contains && channelSet.containsNull()) {
                         blockBuilder.appendNull();
diff --git a/core/trino-main/src/main/java/io/trino/operator/HttpPageBufferClient.java b/core/trino-main/src/main/java/io/trino/operator/HttpPageBufferClient.java
index 66004b83a462..2ab26e3953fe 100644
--- a/core/trino-main/src/main/java/io/trino/operator/HttpPageBufferClient.java
+++ b/core/trino-main/src/main/java/io/trino/operator/HttpPageBufferClient.java
@@ -20,6 +20,8 @@
 import com.google.common.net.MediaType;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.http.client.HttpClient;
 import io.airlift.http.client.HttpClient.HttpResponseFuture;
 import io.airlift.http.client.HttpStatus;
@@ -38,12 +40,9 @@
 import io.trino.server.remotetask.Backoff;
 import io.trino.spi.TrinoException;
 import io.trino.spi.TrinoTransportException;
+import jakarta.annotation.Nullable;
 import org.joda.time.DateTime;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/core/trino-main/src/main/java/io/trino/operator/IdRegistry.java b/core/trino-main/src/main/java/io/trino/operator/IdRegistry.java
index 30030460af6c..4584ef440300 100644
--- a/core/trino-main/src/main/java/io/trino/operator/IdRegistry.java
+++ b/core/trino-main/src/main/java/io/trino/operator/IdRegistry.java
@@ -26,7 +26,7 @@
  * <p>
  * This class may recycle deallocated IDs for new allocations.
  */
-public class IdRegistry<T>
+public final class IdRegistry<T>
 {
     private static final long INSTANCE_SIZE = instanceSize(IdRegistry.class);
 
@@ -38,18 +38,19 @@ public class IdRegistry<T>
      *
      * @return ID referencing the provided object
      */
-    public int allocateId(IntFunction<T> factory)
+    public T allocateId(IntFunction<T> factory)
     {
-        int newId;
+        T result;
         if (!emptySlots.isEmpty()) {
-            newId = emptySlots.dequeueInt();
-            objects.set(newId, factory.apply(newId));
+            int id = emptySlots.dequeueInt();
+            result = factory.apply(id);
+            objects.set(id, result);
         }
         else {
-            newId = objects.size();
-            objects.add(factory.apply(newId));
+            result = factory.apply(objects.size());
+            objects.add(result);
         }
-        return newId;
+        return result;
     }
 
     public void deallocate(int id)
diff --git a/core/trino-main/src/main/java/io/trino/operator/InterpretedHashGenerator.java b/core/trino-main/src/main/java/io/trino/operator/InterpretedHashGenerator.java
index 233789e5c8f9..29590941c856 100644
--- a/core/trino-main/src/main/java/io/trino/operator/InterpretedHashGenerator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/InterpretedHashGenerator.java
@@ -13,60 +13,62 @@
  */
 package io.trino.operator;
 
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
-import com.google.common.primitives.Ints;
 import io.trino.operator.scalar.CombineHashFunction;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.sql.planner.optimizations.HashGenerationOptimizer;
-import io.trino.type.BlockTypeOperators;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
+import java.lang.invoke.MethodHandle;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.IntFunction;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.simpleConvention;
+import static io.trino.spi.type.TypeUtils.NULL_HASH_CODE;
 import static java.util.Objects.requireNonNull;
 
+// TODO this class could be made more efficient by replacing the hashChannels array making the channel a constant in the
+//  method handle. Additionally, the method handles could be combined into a single method handle using method handle
+//  combinators. To do all of this, we would need to add a cache for instances of this class since the method handles
+//  would be modified for each instance.
 public class InterpretedHashGenerator
         implements HashGenerator
 {
     private final List<Type> hashChannelTypes;
     @Nullable
     private final int[] hashChannels; // null value indicates that the identity channel mapping is used
-    private final BlockPositionHashCode[] hashCodeOperators;
-
-    public static InterpretedHashGenerator createPositionalWithTypes(List<Type> hashChannelTypes, BlockTypeOperators blockTypeOperators)
-    {
-        return new InterpretedHashGenerator(hashChannelTypes, null, blockTypeOperators, true);
-    }
+    private final MethodHandle[] hashCodeOperators;
 
-    public InterpretedHashGenerator(List<Type> hashChannelTypes, List<Integer> hashChannels, BlockTypeOperators blockTypeOperators)
+    public static InterpretedHashGenerator createPagePrefixHashGenerator(List<Type> hashChannelTypes, TypeOperators typeOperators)
     {
-        this(hashChannelTypes, Ints.toArray(requireNonNull(hashChannels, "hashChannels is null")), blockTypeOperators);
+        return new InterpretedHashGenerator(hashChannelTypes, null, typeOperators);
     }
 
-    public InterpretedHashGenerator(List<Type> hashChannelTypes, int[] hashChannels, BlockTypeOperators blockTypeOperators)
+    public static InterpretedHashGenerator createChannelsHashGenerator(List<Type> hashChannelTypes, int[] hashChannels, TypeOperators typeOperators)
     {
-        this(hashChannelTypes, requireNonNull(hashChannels, "hashChannels is null"), blockTypeOperators, false);
+        return new InterpretedHashGenerator(hashChannelTypes, hashChannels, typeOperators);
     }
 
-    private InterpretedHashGenerator(List<Type> hashChannelTypes, @Nullable int[] hashChannels, BlockTypeOperators blockTypeOperators, boolean positional)
+    private InterpretedHashGenerator(List<Type> hashChannelTypes, @Nullable int[] hashChannels, TypeOperators blockTypeOperators)
     {
         this.hashChannelTypes = ImmutableList.copyOf(requireNonNull(hashChannelTypes, "hashChannelTypes is null"));
-        this.hashCodeOperators = createHashCodeOperators(hashChannelTypes, blockTypeOperators);
-        checkArgument(hashCodeOperators.length == hashChannelTypes.size());
-        if (positional) {
-            checkArgument(hashChannels == null, "hashChannels must be null");
+        this.hashCodeOperators = new MethodHandle[hashChannelTypes.size()];
+        for (int i = 0; i < hashCodeOperators.length; i++) {
+            hashCodeOperators[i] = blockTypeOperators.getHashCodeOperator(hashChannelTypes.get(i), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL));
+        }
+        if (hashChannels == null) {
             this.hashChannels = null;
         }
         else {
-            requireNonNull(hashChannels, "hashChannels is null");
             checkArgument(hashChannels.length == hashCodeOperators.length);
             // simple positional indices are converted to null
             this.hashChannels = isPositionalChannels(hashChannels) ? null : hashChannels;
@@ -80,7 +82,7 @@ public long hashPosition(int position, Page page)
         long result = HashGenerationOptimizer.INITIAL_HASH_VALUE;
         for (int i = 0; i < hashCodeOperators.length; i++) {
             Block block = page.getBlock(hashChannels == null ? i : hashChannels[i]);
-            result = CombineHashFunction.getHash(result, hashCodeOperators[i].hashCodeNullSafe(block, position));
+            result = CombineHashFunction.getHash(result, nullSafeHash(i, block, position));
         }
         return result;
     }
@@ -91,11 +93,22 @@ public long hashPosition(int position, IntFunction<Block> blockProvider)
         long result = HashGenerationOptimizer.INITIAL_HASH_VALUE;
         for (int i = 0; i < hashCodeOperators.length; i++) {
             Block block = blockProvider.apply(hashChannels == null ? i : hashChannels[i]);
-            result = CombineHashFunction.getHash(result, hashCodeOperators[i].hashCodeNullSafe(block, position));
+            result = CombineHashFunction.getHash(result, nullSafeHash(i, block, position));
         }
         return result;
     }
 
+    private long nullSafeHash(int operatorIndex, Block block, int position)
+    {
+        try {
+            return block.isNull(position) ? NULL_HASH_CODE : (long) hashCodeOperators[operatorIndex].invokeExact(block, position);
+        }
+        catch (Throwable e) {
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
+        }
+    }
+
     @Override
     public String toString()
     {
@@ -114,15 +127,4 @@ private static boolean isPositionalChannels(int[] hashChannels)
         }
         return true;
     }
-
-    private static BlockPositionHashCode[] createHashCodeOperators(List<Type> hashChannelTypes, BlockTypeOperators blockTypeOperators)
-    {
-        requireNonNull(hashChannelTypes, "hashChannelTypes is null");
-        requireNonNull(blockTypeOperators, "blockTypeOperators is null");
-        BlockPositionHashCode[] hashCodeOperators = new BlockPositionHashCode[hashChannelTypes.size()];
-        for (int i = 0; i < hashCodeOperators.length; i++) {
-            hashCodeOperators[i] = blockTypeOperators.getHashCodeOperator(hashChannelTypes.get(i));
-        }
-        return hashCodeOperators;
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/JoinDomainBuilder.java b/core/trino-main/src/main/java/io/trino/operator/JoinDomainBuilder.java
new file mode 100644
index 000000000000..77a3f5789ab0
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/JoinDomainBuilder.java
@@ -0,0 +1,679 @@
+/*
+ * Licensed 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 io.trino.operator;
+
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
+import io.airlift.units.DataSize;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.DictionaryBlock;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.predicate.Domain;
+import io.trino.spi.predicate.ValueSet;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.operator.VariableWidthData.EMPTY_CHUNK;
+import static io.trino.operator.VariableWidthData.POINTER_SIZE;
+import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
+import static io.trino.spi.function.InvocationConvention.simpleConvention;
+import static io.trino.spi.predicate.Range.range;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.TypeUtils.isFloatingPointNaN;
+import static io.trino.spi.type.TypeUtils.readNativeValue;
+import static io.trino.spi.type.TypeUtils.writeNativeValue;
+import static java.lang.Math.multiplyExact;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
+import static java.util.Objects.requireNonNull;
+
+public class JoinDomainBuilder
+{
+    private static final int INSTANCE_SIZE = instanceSize(JoinDomainBuilder.class);
+
+    private static final int DEFAULT_DISTINCT_HASH_CAPACITY = 64;
+
+    private static final int VECTOR_LENGTH = Long.BYTES;
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, LITTLE_ENDIAN);
+
+    private final Type type;
+
+    private final int maxDistinctValues;
+    private final long maxFilterSizeInBytes;
+    private final Runnable notifyStateChange;
+
+    private final MethodHandle readFlat;
+    private final MethodHandle writeFlat;
+
+    private final MethodHandle hashFlat;
+    private final MethodHandle hashBlock;
+
+    private final MethodHandle distinctFlatFlat;
+    private final MethodHandle distinctFlatBlock;
+
+    private final MethodHandle compareFlatFlat;
+    private final MethodHandle compareBlockBlock;
+
+    private final int distinctRecordSize;
+    private final int distinctRecordValueOffset;
+
+    private int distinctCapacity;
+    private int distinctMask;
+
+    private byte[] distinctControl;
+    private byte[] distinctRecords;
+    private VariableWidthData distinctVariableWidthData;
+
+    private int distinctSize;
+    private int distinctMaxFill;
+
+    private ValueBlock minValue;
+    private ValueBlock maxValue;
+
+    private boolean collectDistinctValues = true;
+    private boolean collectMinMax;
+
+    private long retainedSizeInBytes = INSTANCE_SIZE;
+
+    public JoinDomainBuilder(
+            Type type,
+            int maxDistinctValues,
+            DataSize maxFilterSize,
+            boolean minMaxEnabled,
+            Runnable notifyStateChange,
+            TypeOperators typeOperators)
+    {
+        this.type = requireNonNull(type, "type is null");
+
+        this.maxDistinctValues = maxDistinctValues;
+        this.maxFilterSizeInBytes = maxFilterSize.toBytes();
+        this.notifyStateChange = requireNonNull(notifyStateChange, "notifyStateChange is null");
+
+        // Skipping DOUBLE and REAL in collectMinMaxValues to avoid dealing with NaN values
+        this.collectMinMax = minMaxEnabled && type.isOrderable() && type != DOUBLE && type != REAL;
+
+        MethodHandle readOperator = typeOperators.getReadValueOperator(type, simpleConvention(NULLABLE_RETURN, FLAT));
+        readOperator = readOperator.asType(readOperator.type().changeReturnType(Object.class));
+        this.readFlat = readOperator;
+        this.writeFlat = typeOperators.getReadValueOperator(type, simpleConvention(FLAT_RETURN, VALUE_BLOCK_POSITION_NOT_NULL));
+
+        this.hashFlat = typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, FLAT));
+        this.hashBlock = typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, VALUE_BLOCK_POSITION_NOT_NULL));
+        this.distinctFlatFlat = typeOperators.getDistinctFromOperator(type, simpleConvention(FAIL_ON_NULL, FLAT, FLAT));
+        this.distinctFlatBlock = typeOperators.getDistinctFromOperator(type, simpleConvention(FAIL_ON_NULL, FLAT, VALUE_BLOCK_POSITION_NOT_NULL));
+        if (collectMinMax) {
+            this.compareFlatFlat = typeOperators.getComparisonUnorderedLastOperator(type, simpleConvention(FAIL_ON_NULL, FLAT, FLAT));
+            this.compareBlockBlock = typeOperators.getComparisonUnorderedLastOperator(type, simpleConvention(FAIL_ON_NULL, VALUE_BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION_NOT_NULL));
+        }
+        else {
+            this.compareFlatFlat = null;
+            this.compareBlockBlock = null;
+        }
+
+        distinctCapacity = DEFAULT_DISTINCT_HASH_CAPACITY;
+        distinctMaxFill = (distinctCapacity / 16) * 15;
+        distinctMask = distinctCapacity - 1;
+        distinctControl = new byte[distinctCapacity + VECTOR_LENGTH];
+
+        boolean variableWidth = type.isFlatVariableWidth();
+        distinctVariableWidthData = variableWidth ? new VariableWidthData() : null;
+        distinctRecordValueOffset = (variableWidth ? POINTER_SIZE : 0);
+        distinctRecordSize = distinctRecordValueOffset + type.getFlatFixedSize();
+        distinctRecords = new byte[multiplyExact(distinctCapacity, distinctRecordSize)];
+
+        retainedSizeInBytes += sizeOf(distinctControl) + sizeOf(distinctRecords);
+    }
+
+    public long getRetainedSizeInBytes()
+    {
+        return retainedSizeInBytes + (distinctVariableWidthData == null ? 0 : distinctVariableWidthData.getRetainedSizeBytes());
+    }
+
+    public boolean isCollecting()
+    {
+        return collectMinMax || collectDistinctValues;
+    }
+
+    public void add(Block block)
+    {
+        block = block.getLoadedBlock();
+        if (collectDistinctValues) {
+            if (block instanceof ValueBlock valueBlock) {
+                for (int position = 0; position < block.getPositionCount(); position++) {
+                    add(valueBlock, position);
+                }
+            }
+            else if (block instanceof RunLengthEncodedBlock rleBlock) {
+                add(rleBlock.getValue(), 0);
+            }
+            else if (block instanceof DictionaryBlock dictionaryBlock) {
+                ValueBlock dictionary = dictionaryBlock.getDictionary();
+                for (int i = 0; i < dictionaryBlock.getPositionCount(); i++) {
+                    add(dictionary, dictionaryBlock.getId(i));
+                }
+            }
+            else {
+                throw new IllegalArgumentException("Unsupported block type: " + block.getClass().getSimpleName());
+            }
+
+            // if the distinct size is too large, fall back to min max, and drop the distinct values
+            if (distinctSize > maxDistinctValues || getRetainedSizeInBytes() > maxFilterSizeInBytes) {
+                retainedSizeInBytes = INSTANCE_SIZE;
+                if (collectMinMax) {
+                    int minIndex = -1;
+                    int maxIndex = -1;
+                    for (int index = 0; index < distinctCapacity; index++) {
+                        if (distinctControl[index] != 0) {
+                            if (minIndex == -1) {
+                                minIndex = index;
+                                maxIndex = index;
+                                continue;
+                            }
+
+                            if (valueCompare(index, minIndex) < 0) {
+                                minIndex = index;
+                            }
+                            else if (valueCompare(index, maxIndex) > 0) {
+                                maxIndex = index;
+                            }
+                        }
+                    }
+                    if (minIndex != -1) {
+                        minValue = readValueToBlock(minIndex);
+                        maxValue = readValueToBlock(maxIndex);
+                        retainedSizeInBytes += minValue.getRetainedSizeInBytes() + maxValue.getRetainedSizeInBytes();
+                    }
+                }
+                else {
+                    notifyStateChange.run();
+                }
+
+                collectDistinctValues = false;
+                distinctCapacity = 0;
+                distinctControl = null;
+                distinctRecords = null;
+                distinctVariableWidthData = null;
+                distinctSize = 0;
+                distinctMaxFill = 0;
+            }
+        }
+        else if (collectMinMax) {
+            int minValuePosition = -1;
+            int maxValuePosition = -1;
+
+            ValueBlock valueBlock = block.getUnderlyingValueBlock();
+            for (int i = 0; i < block.getPositionCount(); i++) {
+                int position = block.getUnderlyingValuePosition(i);
+                if (valueBlock.isNull(position)) {
+                    continue;
+                }
+                if (minValuePosition == -1) {
+                    // First non-null value
+                    minValuePosition = position;
+                    maxValuePosition = position;
+                    continue;
+                }
+                if (valueCompare(valueBlock, position, valueBlock, minValuePosition) < 0) {
+                    minValuePosition = position;
+                }
+                else if (valueCompare(valueBlock, position, valueBlock, maxValuePosition) > 0) {
+                    maxValuePosition = position;
+                }
+            }
+
+            if (minValuePosition == -1) {
+                // all block values are nulls
+                return;
+            }
+
+            if (minValue == null) {
+                minValue = valueBlock.getSingleValueBlock(minValuePosition);
+                maxValue = valueBlock.getSingleValueBlock(maxValuePosition);
+                return;
+            }
+            if (valueCompare(valueBlock, minValuePosition, minValue, 0) < 0) {
+                retainedSizeInBytes -= minValue.getRetainedSizeInBytes();
+                minValue = valueBlock.getSingleValueBlock(minValuePosition);
+                retainedSizeInBytes += minValue.getRetainedSizeInBytes();
+            }
+            if (valueCompare(valueBlock, maxValuePosition, maxValue, 0) > 0) {
+                retainedSizeInBytes -= maxValue.getRetainedSizeInBytes();
+                maxValue = valueBlock.getSingleValueBlock(maxValuePosition);
+                retainedSizeInBytes += maxValue.getRetainedSizeInBytes();
+            }
+        }
+    }
+
+    public void disableMinMax()
+    {
+        collectMinMax = false;
+        if (minValue != null) {
+            retainedSizeInBytes -= minValue.getRetainedSizeInBytes();
+            minValue = null;
+        }
+        if (maxValue != null) {
+            retainedSizeInBytes -= maxValue.getRetainedSizeInBytes();
+            maxValue = null;
+        }
+    }
+
+    public Domain build()
+    {
+        if (collectDistinctValues) {
+            ImmutableList.Builder<Object> values = ImmutableList.builder();
+            for (int i = 0; i < distinctCapacity; i++) {
+                if (distinctControl[i] != 0) {
+                    Object value = readValueToObject(i);
+                    // join doesn't match rows with NaN values.
+                    if (!isFloatingPointNaN(type, value)) {
+                        values.add(value);
+                    }
+                }
+            }
+            // Inner and right join doesn't match rows with null key column values.
+            return Domain.create(ValueSet.copyOf(type, values.build()), false);
+        }
+        if (collectMinMax) {
+            if (minValue == null) {
+                // all values were null
+                return Domain.none(type);
+            }
+            Object min = readNativeValue(type, minValue, 0);
+            Object max = readNativeValue(type, maxValue, 0);
+            return Domain.create(ValueSet.ofRanges(range(type, min, true, max, true)), false);
+        }
+        return Domain.all(type);
+    }
+
+    private void add(ValueBlock block, int position)
+    {
+        // Inner and right join doesn't match rows with null key column values.
+        if (block.isNull(position)) {
+            return;
+        }
+
+        long hash = valueHashCode(block, position);
+
+        byte hashPrefix = getHashPrefix(hash);
+        int hashBucket = getHashBucket(hash);
+
+        int step = 1;
+        long repeated = repeat(hashPrefix);
+
+        while (true) {
+            final long controlVector = getControlVector(hashBucket);
+
+            int matchBucket = matchInVector(block, position, hashBucket, repeated, controlVector);
+            if (matchBucket >= 0) {
+                return;
+            }
+
+            int emptyIndex = findEmptyInVector(controlVector, hashBucket);
+            if (emptyIndex >= 0) {
+                insert(emptyIndex, block, position, hashPrefix);
+                distinctSize++;
+
+                if (distinctSize >= distinctMaxFill) {
+                    rehash();
+                }
+                return;
+            }
+
+            hashBucket = bucket(hashBucket + step);
+            step += VECTOR_LENGTH;
+        }
+    }
+
+    private int matchInVector(byte[] otherValues, VariableWidthData otherVariableWidthData, int position, int vectorStartBucket, long repeated, long controlVector)
+    {
+        long controlMatches = match(controlVector, repeated);
+        while (controlMatches != 0) {
+            int slot = Long.numberOfTrailingZeros(controlMatches) >>> 3;
+            int bucket = bucket(vectorStartBucket + slot);
+            if (valueNotDistinctFrom(bucket, otherValues, otherVariableWidthData, position)) {
+                return bucket;
+            }
+
+            controlMatches = controlMatches & (controlMatches - 1);
+        }
+        return -1;
+    }
+
+    private int matchInVector(ValueBlock block, int position, int vectorStartBucket, long repeated, long controlVector)
+    {
+        long controlMatches = match(controlVector, repeated);
+        while (controlMatches != 0) {
+            int bucket = bucket(vectorStartBucket + (Long.numberOfTrailingZeros(controlMatches) >>> 3));
+            if (valueNotDistinctFrom(bucket, block, position)) {
+                return bucket;
+            }
+
+            controlMatches = controlMatches & (controlMatches - 1);
+        }
+        return -1;
+    }
+
+    private int findEmptyInVector(long vector, int vectorStartBucket)
+    {
+        long controlMatches = match(vector, 0x00_00_00_00_00_00_00_00L);
+        if (controlMatches == 0) {
+            return -1;
+        }
+        int slot = Long.numberOfTrailingZeros(controlMatches) >>> 3;
+        return bucket(vectorStartBucket + slot);
+    }
+
+    private void insert(int index, ValueBlock block, int position, byte hashPrefix)
+    {
+        setControl(index, hashPrefix);
+
+        int recordOffset = getRecordOffset(index);
+
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        int variableWidthChunkOffset = 0;
+        if (distinctVariableWidthData != null) {
+            int variableWidthLength = type.getFlatVariableWidthSize(block, position);
+            variableWidthChunk = distinctVariableWidthData.allocate(distinctRecords, recordOffset, variableWidthLength);
+            variableWidthChunkOffset = VariableWidthData.getChunkOffset(distinctRecords, recordOffset);
+        }
+
+        try {
+            writeFlat.invokeExact(
+                    block,
+                    position,
+                    distinctRecords,
+                    recordOffset + distinctRecordValueOffset,
+                    variableWidthChunk,
+                    variableWidthChunkOffset);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private void setControl(int index, byte hashPrefix)
+    {
+        distinctControl[index] = hashPrefix;
+        if (index < VECTOR_LENGTH) {
+            distinctControl[index + distinctCapacity] = hashPrefix;
+        }
+    }
+
+    private void rehash()
+    {
+        int oldCapacity = distinctCapacity;
+        byte[] oldControl = distinctControl;
+        byte[] oldRecords = distinctRecords;
+
+        long newCapacityLong = distinctCapacity * 2L;
+        if (newCapacityLong > Integer.MAX_VALUE) {
+            throw new TrinoException(GENERIC_INSUFFICIENT_RESOURCES, "Size of hash table cannot exceed 1 billion entries");
+        }
+
+        distinctSize = 0;
+        distinctCapacity = (int) newCapacityLong;
+        distinctMaxFill = (distinctCapacity / 16) * 15;
+        distinctMask = distinctCapacity - 1;
+
+        distinctControl = new byte[distinctCapacity + VECTOR_LENGTH];
+        distinctRecords = new byte[multiplyExact(distinctCapacity, distinctRecordSize)];
+
+        retainedSizeInBytes = retainedSizeInBytes - sizeOf(oldControl) - sizeOf(oldRecords) + sizeOf(distinctControl) + sizeOf(distinctRecords);
+
+        for (int oldIndex = 0; oldIndex < oldCapacity; oldIndex++) {
+            if (oldControl[oldIndex] != 0) {
+                long hash = valueHashCode(oldRecords, oldIndex);
+
+                byte hashPrefix = getHashPrefix(hash);
+                int bucket = getHashBucket(hash);
+
+                int step = 1;
+                long repeated = repeat(hashPrefix);
+
+                while (true) {
+                    long controlVector = getControlVector(bucket);
+
+                    int matchIndex = matchInVector(oldRecords, distinctVariableWidthData, oldIndex, bucket, repeated, controlVector);
+                    if (matchIndex >= 0) {
+                        break;
+                    }
+
+                    int emptyIndex = findEmptyInVector(controlVector, bucket);
+                    if (emptyIndex >= 0) {
+                        setControl(emptyIndex, hashPrefix);
+
+                        System.arraycopy(
+                                oldRecords,
+                                getRecordOffset(oldIndex),
+                                distinctRecords,
+                                getRecordOffset(emptyIndex),
+                                distinctRecordSize);
+                        // variable width data does not need to be copied, since rehash only moves the fixed records
+
+                        distinctSize++;
+                        break;
+                    }
+
+                    bucket = bucket(bucket + step);
+                    step += VECTOR_LENGTH;
+                }
+            }
+        }
+    }
+
+    private long getControlVector(int bucket)
+    {
+        return (long) LONG_HANDLE.get(distinctControl, bucket);
+    }
+
+    private int getHashBucket(long hash)
+    {
+        return bucket((int) (hash >> 7));
+    }
+
+    private static byte getHashPrefix(long hash)
+    {
+        return (byte) (hash & 0x7F | 0x80);
+    }
+
+    private int bucket(int hash)
+    {
+        return hash & distinctMask;
+    }
+
+    private int getRecordOffset(int bucket)
+    {
+        return bucket * distinctRecordSize;
+    }
+
+    private Object readValueToObject(int position)
+    {
+        int recordOffset = getRecordOffset(position);
+
+        try {
+            byte[] variableWidthChunk = EMPTY_CHUNK;
+            if (distinctVariableWidthData != null) {
+                variableWidthChunk = distinctVariableWidthData.getChunk(distinctRecords, recordOffset);
+            }
+
+            return (Object) readFlat.invokeExact(
+                    distinctRecords,
+                    recordOffset + distinctRecordValueOffset,
+                    variableWidthChunk);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private ValueBlock readValueToBlock(int position)
+    {
+        return writeNativeValue(type, readValueToObject(position));
+    }
+
+    private long valueHashCode(byte[] values, int position)
+    {
+        int recordOffset = getRecordOffset(position);
+
+        try {
+            byte[] variableWidthChunk = EMPTY_CHUNK;
+            if (distinctVariableWidthData != null) {
+                variableWidthChunk = distinctVariableWidthData.getChunk(values, recordOffset);
+            }
+
+            return (long) hashFlat.invokeExact(
+                    values,
+                    recordOffset + distinctRecordValueOffset,
+                    variableWidthChunk);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private long valueHashCode(ValueBlock right, int rightPosition)
+    {
+        try {
+            return (long) hashBlock.invokeExact(right, rightPosition);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private boolean valueNotDistinctFrom(int leftPosition, ValueBlock right, int rightPosition)
+    {
+        byte[] leftFixedRecordChunk = distinctRecords;
+        int leftRecordOffset = getRecordOffset(leftPosition);
+        byte[] leftVariableWidthChunk = EMPTY_CHUNK;
+        if (distinctVariableWidthData != null) {
+            leftVariableWidthChunk = distinctVariableWidthData.getChunk(leftFixedRecordChunk, leftRecordOffset);
+        }
+
+        try {
+            return !(boolean) distinctFlatBlock.invokeExact(
+                    leftFixedRecordChunk,
+                    leftRecordOffset + distinctRecordValueOffset,
+                    leftVariableWidthChunk,
+                    right,
+                    rightPosition);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private boolean valueNotDistinctFrom(int leftPosition, byte[] rightValues, VariableWidthData rightVariableWidthData, int rightPosition)
+    {
+        byte[] leftFixedRecordChunk = distinctRecords;
+        int leftRecordOffset = getRecordOffset(leftPosition);
+        byte[] leftVariableWidthChunk = EMPTY_CHUNK;
+        if (distinctVariableWidthData != null) {
+            leftVariableWidthChunk = distinctVariableWidthData.getChunk(leftFixedRecordChunk, leftRecordOffset);
+        }
+
+        byte[] rightFixedRecordChunk = rightValues;
+        int rightRecordOffset = getRecordOffset(rightPosition);
+        byte[] rightVariableWidthChunk = EMPTY_CHUNK;
+        if (rightVariableWidthData != null) {
+            rightVariableWidthChunk = rightVariableWidthData.getChunk(rightFixedRecordChunk, rightRecordOffset);
+        }
+
+        try {
+            return !(boolean) distinctFlatFlat.invokeExact(
+                    leftFixedRecordChunk,
+                    leftRecordOffset + distinctRecordValueOffset,
+                    leftVariableWidthChunk,
+                    rightFixedRecordChunk,
+                    rightRecordOffset + distinctRecordValueOffset,
+                    rightVariableWidthChunk);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private int valueCompare(ValueBlock left, int leftPosition, ValueBlock right, int rightPosition)
+    {
+        try {
+            return (int) (long) compareBlockBlock.invokeExact(
+                    left,
+                    leftPosition,
+                    right,
+                    rightPosition);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private int valueCompare(int leftPosition, int rightPosition)
+    {
+        int leftRecordOffset = getRecordOffset(leftPosition);
+        int rightRecordOffset = getRecordOffset(rightPosition);
+
+        byte[] leftVariableWidthChunk = EMPTY_CHUNK;
+        byte[] rightVariableWidthChunk = EMPTY_CHUNK;
+        if (distinctVariableWidthData != null) {
+            leftVariableWidthChunk = distinctVariableWidthData.getChunk(distinctRecords, leftRecordOffset);
+            rightVariableWidthChunk = distinctVariableWidthData.getChunk(distinctRecords, rightRecordOffset);
+        }
+
+        try {
+            return (int) (long) compareFlatFlat.invokeExact(
+                    distinctRecords,
+                    leftRecordOffset + distinctRecordValueOffset,
+                    leftVariableWidthChunk,
+                    distinctRecords,
+                    rightRecordOffset + distinctRecordValueOffset,
+                    rightVariableWidthChunk);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private static long repeat(byte value)
+    {
+        return ((value & 0xFF) * 0x01_01_01_01_01_01_01_01L);
+    }
+
+    private static long match(long vector, long repeatedValue)
+    {
+        // HD 6-1
+        long comparison = vector ^ repeatedValue;
+        return (comparison - 0x01_01_01_01_01_01_01_01L) & ~comparison & 0x80_80_80_80_80_80_80_80L;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/JoinOperatorType.java b/core/trino-main/src/main/java/io/trino/operator/JoinOperatorType.java
new file mode 100644
index 000000000000..f43771e69976
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/JoinOperatorType.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed 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 io.trino.operator;
+
+import io.trino.operator.join.LookupJoinOperatorFactory;
+import io.trino.sql.planner.plan.JoinNode;
+
+import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.FULL_OUTER;
+import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.INNER;
+import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.LOOKUP_OUTER;
+import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.PROBE_OUTER;
+import static java.util.Objects.requireNonNull;
+
+public class JoinOperatorType
+{
+    private final LookupJoinOperatorFactory.JoinType type;
+    private final boolean outputSingleMatch;
+    private final boolean waitForBuild;
+
+    public static JoinOperatorType ofJoinNodeType(JoinNode.Type joinNodeType, boolean outputSingleMatch, boolean waitForBuild)
+    {
+        return switch (joinNodeType) {
+            case INNER -> innerJoin(outputSingleMatch, waitForBuild);
+            case LEFT -> probeOuterJoin(outputSingleMatch);
+            case RIGHT -> lookupOuterJoin(waitForBuild);
+            case FULL -> fullOuterJoin();
+        };
+    }
+
+    public static JoinOperatorType innerJoin(boolean outputSingleMatch, boolean waitForBuild)
+    {
+        return new JoinOperatorType(INNER, outputSingleMatch, waitForBuild);
+    }
+
+    public static JoinOperatorType probeOuterJoin(boolean outputSingleMatch)
+    {
+        return new JoinOperatorType(PROBE_OUTER, outputSingleMatch, false);
+    }
+
+    public static JoinOperatorType lookupOuterJoin(boolean waitForBuild)
+    {
+        return new JoinOperatorType(LOOKUP_OUTER, false, waitForBuild);
+    }
+
+    public static JoinOperatorType fullOuterJoin()
+    {
+        return new JoinOperatorType(FULL_OUTER, false, false);
+    }
+
+    private JoinOperatorType(LookupJoinOperatorFactory.JoinType type, boolean outputSingleMatch, boolean waitForBuild)
+    {
+        this.type = requireNonNull(type, "type is null");
+        this.outputSingleMatch = outputSingleMatch;
+        this.waitForBuild = waitForBuild;
+    }
+
+    public boolean isOutputSingleMatch()
+    {
+        return outputSingleMatch;
+    }
+
+    public boolean isWaitForBuild()
+    {
+        return waitForBuild;
+    }
+
+    public LookupJoinOperatorFactory.JoinType getType()
+    {
+        return type;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/LeafTableFunctionOperator.java b/core/trino-main/src/main/java/io/trino/operator/LeafTableFunctionOperator.java
index 581351a25eb3..c951eb369647 100644
--- a/core/trino-main/src/main/java/io/trino/operator/LeafTableFunctionOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/LeafTableFunctionOperator.java
@@ -16,24 +16,26 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import io.trino.metadata.Split;
 import io.trino.spi.Page;
+import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplit;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-import io.trino.spi.ptf.TableFunctionProcessorProvider;
-import io.trino.spi.ptf.TableFunctionProcessorState;
-import io.trino.spi.ptf.TableFunctionProcessorState.Blocked;
-import io.trino.spi.ptf.TableFunctionProcessorState.Processed;
-import io.trino.spi.ptf.TableFunctionSplitProcessor;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
+import io.trino.spi.function.table.TableFunctionProcessorState;
+import io.trino.spi.function.table.TableFunctionProcessorState.Blocked;
+import io.trino.spi.function.table.TableFunctionProcessorState.Processed;
+import io.trino.spi.function.table.TableFunctionSplitProcessor;
 import io.trino.split.EmptySplit;
 import io.trino.sql.planner.plan.PlanNodeId;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayDeque;
+import java.util.Deque;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.concurrent.MoreFutures.toListenableFuture;
-import static io.trino.spi.ptf.TableFunctionProcessorState.Finished.FINISHED;
+import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_ERROR;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Finished.FINISHED;
 import static java.util.Objects.requireNonNull;
 
 public class LeafTableFunctionOperator
@@ -90,12 +92,10 @@ public void noMoreOperators()
     private final ConnectorTableFunctionHandle functionHandle;
     private final ConnectorSession session;
 
-    private ConnectorSplit currentSplit;
-    private final List<ConnectorSplit> pendingSplits = new ArrayList<>();
+    private final Deque<ConnectorSplit> pendingSplits = new ArrayDeque<>();
     private boolean noMoreSplits;
 
     private TableFunctionSplitProcessor processor;
-    private boolean processorUsedData;
     private boolean processorFinishedSplit = true;
     private ListenableFuture<Void> processorBlocked = NOT_BLOCKED;
 
@@ -113,10 +113,9 @@ public LeafTableFunctionOperator(
         this.session = operatorContext.getSession().toConnectorSession(functionCatalog);
     }
 
-    private void resetProcessor()
+    private void resetProcessor(ConnectorSplit nextSplit)
     {
-        this.processor = tableFunctionProvider.getSplitProcessor(session, functionHandle);
-        this.processorUsedData = false;
+        this.processor = tableFunctionProvider.getSplitProcessor(session, functionHandle, nextSplit);
         this.processorFinishedSplit = false;
         this.processorBlocked = NOT_BLOCKED;
     }
@@ -163,25 +162,18 @@ public Page getOutput()
     {
         if (processorFinishedSplit) {
             // start processing a new split
+            while (pendingSplits.peekFirst() instanceof EmptySplit) {
+                pendingSplits.remove();
+            }
             if (pendingSplits.isEmpty()) {
                 // no more splits to process at the moment
                 return null;
             }
-            currentSplit = pendingSplits.remove(0);
-            while (currentSplit instanceof EmptySplit) {
-                if (pendingSplits.isEmpty()) {
-                    return null;
-                }
-                currentSplit = pendingSplits.remove(0);
-            }
-            resetProcessor();
-        }
-        else {
-            // a split is being processed
-            requireNonNull(currentSplit, "currentSplit is null");
+            ConnectorSplit nextSplit = pendingSplits.remove();
+            resetProcessor(nextSplit);
         }
 
-        TableFunctionProcessorState state = processor.process(processorUsedData ? null : currentSplit);
+        TableFunctionProcessorState state = processor.process();
         if (state == FINISHED) {
             processorFinishedSplit = true;
         }
@@ -190,11 +182,9 @@ public Page getOutput()
         }
         if (state instanceof Processed processed) {
             if (processed.isUsedInput()) {
-                processorUsedData = true;
-            }
-            if (processed.getResult() != null) {
-                return processed.getResult();
+                throw new TrinoException(FUNCTION_IMPLEMENTATION_ERROR, "Invalid state, as no input has been provided: " + state);
             }
+            return processed.getResult();
         }
         return null;
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/MarkDistinctHash.java b/core/trino-main/src/main/java/io/trino/operator/MarkDistinctHash.java
index 119d480742ff..418ad8ee0ca2 100644
--- a/core/trino-main/src/main/java/io/trino/operator/MarkDistinctHash.java
+++ b/core/trino-main/src/main/java/io/trino/operator/MarkDistinctHash.java
@@ -21,10 +21,8 @@
 import io.trino.spi.type.BooleanType;
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.JoinCompiler;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
-import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.operator.GroupByHash.createGroupByHash;
@@ -34,14 +32,9 @@ public class MarkDistinctHash
     private final GroupByHash groupByHash;
     private long nextDistinctId;
 
-    public MarkDistinctHash(Session session, List<Type> types, int[] channels, Optional<Integer> hashChannel, JoinCompiler joinCompiler, BlockTypeOperators blockTypeOperators, UpdateMemory updateMemory)
+    public MarkDistinctHash(Session session, List<Type> types, boolean hasPrecomputedHash, JoinCompiler joinCompiler, UpdateMemory updateMemory)
     {
-        this(session, types, channels, hashChannel, 10_000, joinCompiler, blockTypeOperators, updateMemory);
-    }
-
-    public MarkDistinctHash(Session session, List<Type> types, int[] channels, Optional<Integer> hashChannel, int expectedDistinctValues, JoinCompiler joinCompiler, BlockTypeOperators blockTypeOperators, UpdateMemory updateMemory)
-    {
-        this.groupByHash = createGroupByHash(session, types, channels, hashChannel, expectedDistinctValues, joinCompiler, blockTypeOperators, updateMemory);
+        this.groupByHash = createGroupByHash(session, types, hasPrecomputedHash, 10_000, joinCompiler, updateMemory);
     }
 
     public long getEstimatedSize()
@@ -51,7 +44,7 @@ public long getEstimatedSize()
 
     public Work<Block> markDistinctRows(Page page)
     {
-        return new TransformWork<>(groupByHash.getGroupIds(page), this::processNextGroupIds);
+        return new TransformWork<>(groupByHash.getGroupIds(page), groupIds -> processNextGroupIds(groupByHash.getGroupCount(), groupIds, page.getPositionCount()));
     }
 
     @VisibleForTesting
@@ -60,24 +53,23 @@ public int getCapacity()
         return groupByHash.getCapacity();
     }
 
-    private Block processNextGroupIds(GroupByIdBlock ids)
+    private Block processNextGroupIds(int groupCount, int[] ids, int positions)
     {
-        int positions = ids.getPositionCount();
         if (positions > 1) {
             // must have > 1 positions to benefit from using a RunLengthEncoded block
-            if (nextDistinctId == ids.getGroupCount()) {
+            if (nextDistinctId == groupCount) {
                 // no new distinct positions
                 return RunLengthEncodedBlock.create(BooleanType.createBlockForSingleNonNullValue(false), positions);
             }
-            if (nextDistinctId + positions == ids.getGroupCount()) {
+            if (nextDistinctId + positions == groupCount) {
                 // all positions are distinct
-                nextDistinctId = ids.getGroupCount();
+                nextDistinctId = groupCount;
                 return RunLengthEncodedBlock.create(BooleanType.createBlockForSingleNonNullValue(true), positions);
             }
         }
         byte[] distinctMask = new byte[positions];
         for (int position = 0; position < distinctMask.length; position++) {
-            if (ids.getGroupId(position) == nextDistinctId) {
+            if (ids[position] == nextDistinctId) {
                 distinctMask[position] = 1;
                 nextDistinctId++;
             }
@@ -85,7 +77,7 @@ private Block processNextGroupIds(GroupByIdBlock ids)
                 distinctMask[position] = 0;
             }
         }
-        checkState(nextDistinctId == ids.getGroupCount());
+        checkState(nextDistinctId == groupCount);
         return BooleanType.wrapByteArrayAsBooleanBlockWithoutNulls(distinctMask);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/MarkDistinctOperator.java b/core/trino-main/src/main/java/io/trino/operator/MarkDistinctOperator.java
index e000d6e44faf..3672383219c1 100644
--- a/core/trino-main/src/main/java/io/trino/operator/MarkDistinctOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/MarkDistinctOperator.java
@@ -22,7 +22,6 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.Collection;
 import java.util.List;
@@ -45,7 +44,6 @@ public static class MarkDistinctOperatorFactory
         private final List<Integer> markDistinctChannels;
         private final List<Type> types;
         private final JoinCompiler joinCompiler;
-        private final BlockTypeOperators blockTypeOperators;
         private boolean closed;
 
         public MarkDistinctOperatorFactory(
@@ -54,8 +52,7 @@ public MarkDistinctOperatorFactory(
                 List<? extends Type> sourceTypes,
                 Collection<Integer> markDistinctChannels,
                 Optional<Integer> hashChannel,
-                JoinCompiler joinCompiler,
-                BlockTypeOperators blockTypeOperators)
+                JoinCompiler joinCompiler)
         {
             this.operatorId = operatorId;
             this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
@@ -63,7 +60,6 @@ public MarkDistinctOperatorFactory(
             checkArgument(!markDistinctChannels.isEmpty(), "markDistinctChannels is empty");
             this.hashChannel = requireNonNull(hashChannel, "hashChannel is null");
             this.joinCompiler = requireNonNull(joinCompiler, "joinCompiler is null");
-            this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
             this.types = ImmutableList.<Type>builder()
                     .addAll(sourceTypes)
                     .add(BOOLEAN)
@@ -75,7 +71,7 @@ public Operator createOperator(DriverContext driverContext)
         {
             checkState(!closed, "Factory is already closed");
             OperatorContext operatorContext = driverContext.addOperatorContext(operatorId, planNodeId, MarkDistinctOperator.class.getSimpleName());
-            return new MarkDistinctOperator(operatorContext, types, markDistinctChannels, hashChannel, joinCompiler, blockTypeOperators);
+            return new MarkDistinctOperator(operatorContext, types, markDistinctChannels, hashChannel, joinCompiler);
         }
 
         @Override
@@ -87,13 +83,14 @@ public void noMoreOperators()
         @Override
         public OperatorFactory duplicate()
         {
-            return new MarkDistinctOperatorFactory(operatorId, planNodeId, types.subList(0, types.size() - 1), markDistinctChannels, hashChannel, joinCompiler, blockTypeOperators);
+            return new MarkDistinctOperatorFactory(operatorId, planNodeId, types.subList(0, types.size() - 1), markDistinctChannels, hashChannel, joinCompiler);
         }
     }
 
     private final OperatorContext operatorContext;
     private final MarkDistinctHash markDistinctHash;
     private final LocalMemoryContext localUserMemoryContext;
+    private final int[] markDistinctChannels;
 
     private Page inputPage;
     private boolean finishing;
@@ -101,7 +98,7 @@ public OperatorFactory duplicate()
     // for yield when memory is not available
     private Work<Block> unfinishedWork;
 
-    public MarkDistinctOperator(OperatorContext operatorContext, List<Type> types, List<Integer> markDistinctChannels, Optional<Integer> hashChannel, JoinCompiler joinCompiler, BlockTypeOperators blockTypeOperators)
+    public MarkDistinctOperator(OperatorContext operatorContext, List<Type> types, List<Integer> markDistinctChannels, Optional<Integer> hashChannel, JoinCompiler joinCompiler)
     {
         this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
 
@@ -112,7 +109,18 @@ public MarkDistinctOperator(OperatorContext operatorContext, List<Type> types, L
         for (int channel : markDistinctChannels) {
             distinctTypes.add(types.get(channel));
         }
-        this.markDistinctHash = new MarkDistinctHash(operatorContext.getSession(), distinctTypes.build(), Ints.toArray(markDistinctChannels), hashChannel, joinCompiler, blockTypeOperators, this::updateMemoryReservation);
+        if (hashChannel.isPresent()) {
+            this.markDistinctChannels = new int[markDistinctChannels.size() + 1];
+            for (int i = 0; i < markDistinctChannels.size(); i++) {
+                this.markDistinctChannels[i] = markDistinctChannels.get(i);
+            }
+            this.markDistinctChannels[markDistinctChannels.size()] = hashChannel.get();
+        }
+        else {
+            this.markDistinctChannels = Ints.toArray(markDistinctChannels);
+        }
+
+        this.markDistinctHash = new MarkDistinctHash(operatorContext.getSession(), distinctTypes.build(), hashChannel.isPresent(), joinCompiler, this::updateMemoryReservation);
         this.localUserMemoryContext = operatorContext.localUserMemoryContext();
     }
 
@@ -148,7 +156,7 @@ public void addInput(Page page)
 
         inputPage = page;
 
-        unfinishedWork = markDistinctHash.markDistinctRows(page);
+        unfinishedWork = markDistinctHash.markDistinctRows(page.getColumns(markDistinctChannels));
         updateMemoryReservation();
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/MergeHashSort.java b/core/trino-main/src/main/java/io/trino/operator/MergeHashSort.java
index 1b421547309a..716074db14f5 100644
--- a/core/trino-main/src/main/java/io/trino/operator/MergeHashSort.java
+++ b/core/trino-main/src/main/java/io/trino/operator/MergeHashSort.java
@@ -17,7 +17,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators;
+import io.trino.spi.type.TypeOperators;
 import io.trino.util.MergeSortedPages.PageWithPosition;
 
 import java.io.Closeable;
@@ -26,6 +26,7 @@
 import java.util.stream.IntStream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.operator.InterpretedHashGenerator.createPagePrefixHashGenerator;
 import static io.trino.util.MergeSortedPages.mergeSortedPages;
 
 /**
@@ -39,12 +40,12 @@ public class MergeHashSort
         implements Closeable
 {
     private final AggregatedMemoryContext memoryContext;
-    private final BlockTypeOperators blockTypeOperators;
+    private final TypeOperators typeOperators;
 
-    public MergeHashSort(AggregatedMemoryContext memoryContext, BlockTypeOperators blockTypeOperators)
+    public MergeHashSort(AggregatedMemoryContext memoryContext, TypeOperators typeOperators)
     {
         this.memoryContext = memoryContext;
-        this.blockTypeOperators = blockTypeOperators;
+        this.typeOperators = typeOperators;
     }
 
     /**
@@ -52,7 +53,7 @@ public MergeHashSort(AggregatedMemoryContext memoryContext, BlockTypeOperators b
      */
     public WorkProcessor<Page> merge(List<Type> keyTypes, List<Type> allTypes, List<WorkProcessor<Page>> channels, DriverYieldSignal driverYieldSignal)
     {
-        InterpretedHashGenerator hashGenerator = InterpretedHashGenerator.createPositionalWithTypes(keyTypes, blockTypeOperators);
+        InterpretedHashGenerator hashGenerator = createPagePrefixHashGenerator(keyTypes, typeOperators);
         return mergeSortedPages(
                 channels,
                 createHashPageWithPositionComparator(hashGenerator),
@@ -72,11 +73,20 @@ public void close()
 
     private static BiPredicate<PageBuilder, PageWithPosition> keepSameHashValuesWithinSinglePage(InterpretedHashGenerator hashGenerator)
     {
-        return (pageBuilder, pageWithPosition) -> {
-            long hash = hashGenerator.hashPosition(pageWithPosition.getPosition(), pageWithPosition.getPage());
-            return !pageBuilder.isEmpty()
-                    && hashGenerator.hashPosition(pageBuilder.getPositionCount() - 1, pageBuilder::getBlockBuilder) != hash
-                    && pageBuilder.isFull();
+        return new BiPredicate<>()
+        {
+            private long lastHash;
+
+            @Override
+            public boolean test(PageBuilder pageBuilder, PageWithPosition pageWithPosition)
+            {
+                // set the last bit on the hash, so that zero is never produced
+                long hash = hashGenerator.hashPosition(pageWithPosition.getPosition(), pageWithPosition.getPage()) | 1;
+                boolean sameHash = hash == lastHash;
+                lastHash = hash;
+
+                return !pageBuilder.isEmpty() && !sameHash && pageBuilder.isFull();
+            }
         };
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/MergeWriterOperator.java b/core/trino-main/src/main/java/io/trino/operator/MergeWriterOperator.java
index 4e99873b92bd..918f31bbe683 100644
--- a/core/trino-main/src/main/java/io/trino/operator/MergeWriterOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/MergeWriterOperator.java
@@ -152,7 +152,7 @@ public void addInput(Page suppliedPage)
         long insertsFromUpdates = 0;
         int positionCount = page.getPositionCount();
         for (int position = 0; position < positionCount; position++) {
-            insertsFromUpdates += TINYINT.getLong(insertFromUpdateColumn, position);
+            insertsFromUpdates += TINYINT.getByte(insertFromUpdateColumn, position);
         }
         rowCount += positionCount - insertsFromUpdates;
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/MultiChannelGroupByHash.java b/core/trino-main/src/main/java/io/trino/operator/MultiChannelGroupByHash.java
deleted file mode 100644
index 98ba601bc34a..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/MultiChannelGroupByHash.java
+++ /dev/null
@@ -1,1035 +0,0 @@
-/*
- * Licensed 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 io.trino.operator;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import io.trino.spi.Page;
-import io.trino.spi.PageBuilder;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.DictionaryBlock;
-import io.trino.spi.block.LongArrayBlock;
-import io.trino.spi.block.RunLengthEncodedBlock;
-import io.trino.spi.type.Type;
-import io.trino.sql.gen.JoinCompiler;
-import io.trino.type.BlockTypeOperators;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-
-import javax.annotation.Nullable;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.OptionalInt;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Verify.verify;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.operator.SyntheticAddress.encodeSyntheticAddress;
-import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.sql.gen.JoinCompiler.PagesHashStrategyFactory;
-import static it.unimi.dsi.fastutil.HashCommon.arraySize;
-import static it.unimi.dsi.fastutil.HashCommon.murmurHash3;
-import static java.lang.Math.min;
-import static java.lang.Math.multiplyExact;
-import static java.lang.Math.toIntExact;
-import static java.util.Objects.requireNonNull;
-
-// This implementation assumes arrays used in the hash are always a power of 2
-public class MultiChannelGroupByHash
-        implements GroupByHash
-{
-    private static final int INSTANCE_SIZE = instanceSize(MultiChannelGroupByHash.class);
-    private static final float FILL_RATIO = 0.75f;
-    private static final int BATCH_SIZE = 1024;
-    // Max (page value count / cumulative dictionary size) to trigger the low cardinality case
-    private static final double SMALL_DICTIONARIES_MAX_CARDINALITY_RATIO = .25;
-    private static final int VALUES_PAGE_BITS = 14; // 16k positions
-    private static final int VALUES_PAGE_MAX_ROW_COUNT = 1 << VALUES_PAGE_BITS;
-    private static final int VALUES_PAGE_MASK = VALUES_PAGE_MAX_ROW_COUNT - 1;
-
-    private final List<Type> types;
-    private final List<Type> hashTypes;
-    private final int[] channels;
-
-    private final PagesHashStrategy hashStrategy;
-    private final List<ObjectArrayList<Block>> channelBuilders;
-    private final Optional<Integer> inputHashChannel;
-    private final HashGenerator hashGenerator;
-    private final OptionalInt precomputedHashChannel;
-    private final boolean processDictionary;
-    private PageBuilder currentPageBuilder;
-
-    private long completedPagesMemorySize;
-
-    private int hashCapacity;
-    private int maxFill;
-    private int mask;
-    // Group ids are assigned incrementally. Therefore, since values page size is constant and power of two,
-    // the group id is also an address (slice index and position within slice) to group row in channelBuilders.
-    private int[] groupIdsByHash;
-    private byte[] rawHashByHashPosition;
-
-    private int nextGroupId;
-    private DictionaryLookBack dictionaryLookBack;
-
-    // reserve enough memory before rehash
-    private final UpdateMemory updateMemory;
-    private long preallocatedMemoryInBytes;
-    private long currentPageSizeInBytes;
-
-    public MultiChannelGroupByHash(
-            List<? extends Type> hashTypes,
-            int[] hashChannels,
-            Optional<Integer> inputHashChannel,
-            int expectedSize,
-            boolean processDictionary,
-            JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators,
-            UpdateMemory updateMemory)
-    {
-        this.hashTypes = ImmutableList.copyOf(requireNonNull(hashTypes, "hashTypes is null"));
-
-        requireNonNull(joinCompiler, "joinCompiler is null");
-        requireNonNull(hashChannels, "hashChannels is null");
-        checkArgument(hashTypes.size() == hashChannels.length, "hashTypes and hashChannels have different sizes");
-        checkArgument(expectedSize > 0, "expectedSize must be greater than zero");
-
-        this.inputHashChannel = requireNonNull(inputHashChannel, "inputHashChannel is null");
-        this.types = inputHashChannel.isPresent() ? ImmutableList.copyOf(Iterables.concat(hashTypes, ImmutableList.of(BIGINT))) : this.hashTypes;
-        this.channels = hashChannels.clone();
-
-        this.hashGenerator = inputHashChannel.isPresent() ? new PrecomputedHashGenerator(inputHashChannel.get()) : new InterpretedHashGenerator(this.hashTypes, hashChannels, blockTypeOperators);
-        this.processDictionary = processDictionary;
-
-        // For each hashed channel, create an appendable list to hold the blocks (builders).  As we
-        // add new values we append them to the existing block builder until it fills up and then
-        // we add a new block builder to each list.
-        ImmutableList.Builder<Integer> outputChannels = ImmutableList.builder();
-        ImmutableList.Builder<ObjectArrayList<Block>> channelBuilders = ImmutableList.builder();
-        for (int i = 0; i < hashChannels.length; i++) {
-            outputChannels.add(i);
-            channelBuilders.add(ObjectArrayList.wrap(new Block[1024], 0));
-        }
-        if (inputHashChannel.isPresent()) {
-            this.precomputedHashChannel = OptionalInt.of(hashChannels.length);
-            channelBuilders.add(ObjectArrayList.wrap(new Block[1024], 0));
-        }
-        else {
-            this.precomputedHashChannel = OptionalInt.empty();
-        }
-        this.channelBuilders = channelBuilders.build();
-        PagesHashStrategyFactory pagesHashStrategyFactory = joinCompiler.compilePagesHashStrategyFactory(this.types, outputChannels.build());
-        hashStrategy = pagesHashStrategyFactory.createPagesHashStrategy(this.channelBuilders, this.precomputedHashChannel);
-
-        startNewPage();
-
-        // reserve memory for the arrays
-        hashCapacity = arraySize(expectedSize, FILL_RATIO);
-
-        maxFill = calculateMaxFill(hashCapacity);
-        mask = hashCapacity - 1;
-        rawHashByHashPosition = new byte[hashCapacity];
-        groupIdsByHash = new int[hashCapacity];
-        Arrays.fill(groupIdsByHash, -1);
-
-        // This interface is used for actively reserving memory (push model) for rehash.
-        // The caller can also query memory usage on this object (pull model)
-        this.updateMemory = requireNonNull(updateMemory, "updateMemory is null");
-    }
-
-    @Override
-    public long getRawHash(int groupId)
-    {
-        int blockIndex = groupId >> VALUES_PAGE_BITS;
-        int position = groupId & VALUES_PAGE_MASK;
-        return hashStrategy.hashPosition(blockIndex, position);
-    }
-
-    @Override
-    public long getEstimatedSize()
-    {
-        return INSTANCE_SIZE +
-                (sizeOf(channelBuilders.get(0).elements()) * channelBuilders.size()) +
-                completedPagesMemorySize +
-                currentPageBuilder.getRetainedSizeInBytes() +
-                sizeOf(groupIdsByHash) +
-                sizeOf(rawHashByHashPosition) +
-                preallocatedMemoryInBytes +
-                (dictionaryLookBack != null ? dictionaryLookBack.getRetainedSizeInBytes() : 0);
-    }
-
-    @Override
-    public List<Type> getTypes()
-    {
-        return types;
-    }
-
-    @Override
-    public int getGroupCount()
-    {
-        return nextGroupId;
-    }
-
-    @Override
-    public void appendValuesTo(int groupId, PageBuilder pageBuilder)
-    {
-        int blockIndex = groupId >> VALUES_PAGE_BITS;
-        int position = groupId & VALUES_PAGE_MASK;
-        hashStrategy.appendTo(blockIndex, position, pageBuilder, 0);
-    }
-
-    @Override
-    public Work<?> addPage(Page page)
-    {
-        currentPageSizeInBytes = page.getRetainedSizeInBytes();
-        if (isRunLengthEncoded(page)) {
-            return new AddRunLengthEncodedPageWork(page);
-        }
-        if (canProcessDictionary(page)) {
-            return new AddDictionaryPageWork(page);
-        }
-        if (canProcessLowCardinalityDictionary(page)) {
-            return new AddLowCardinalityDictionaryPageWork(page);
-        }
-
-        return new AddNonDictionaryPageWork(page);
-    }
-
-    @Override
-    public Work<GroupByIdBlock> getGroupIds(Page page)
-    {
-        currentPageSizeInBytes = page.getRetainedSizeInBytes();
-        if (isRunLengthEncoded(page)) {
-            return new GetRunLengthEncodedGroupIdsWork(page);
-        }
-        if (canProcessDictionary(page)) {
-            return new GetDictionaryGroupIdsWork(page);
-        }
-        if (canProcessLowCardinalityDictionary(page)) {
-            return new GetLowCardinalityDictionaryGroupIdsWork(page);
-        }
-
-        return new GetNonDictionaryGroupIdsWork(page);
-    }
-
-    @Override
-    public boolean contains(int position, Page page, int[] hashChannels)
-    {
-        long rawHash = hashStrategy.hashRow(position, page);
-        return contains(position, page, hashChannels, rawHash);
-    }
-
-    @Override
-    public boolean contains(int position, Page page, int[] hashChannels, long rawHash)
-    {
-        int hashPosition = getHashPosition(rawHash, mask);
-
-        // look for a slot containing this key
-        while (groupIdsByHash[hashPosition] != -1) {
-            if (positionNotDistinctFromCurrentRow(groupIdsByHash[hashPosition], hashPosition, position, page, (byte) rawHash, hashChannels)) {
-                // found an existing slot for this key
-                return true;
-            }
-            // increment position and mask to handle wrap around
-            hashPosition = (hashPosition + 1) & mask;
-        }
-
-        return false;
-    }
-
-    @VisibleForTesting
-    @Override
-    public int getCapacity()
-    {
-        return hashCapacity;
-    }
-
-    private int putIfAbsent(int position, Page page)
-    {
-        long rawHash = hashGenerator.hashPosition(position, page);
-        return putIfAbsent(position, page, rawHash);
-    }
-
-    private int putIfAbsent(int position, Page page, long rawHash)
-    {
-        int hashPosition = getHashPosition(rawHash, mask);
-
-        // look for an empty slot or a slot containing this key
-        int groupId = -1;
-        while (groupIdsByHash[hashPosition] != -1) {
-            if (positionNotDistinctFromCurrentRow(groupIdsByHash[hashPosition], hashPosition, position, page, (byte) rawHash, channels)) {
-                // found an existing slot for this key
-                groupId = groupIdsByHash[hashPosition];
-
-                break;
-            }
-            // increment position and mask to handle wrap around
-            hashPosition = (hashPosition + 1) & mask;
-        }
-
-        // did we find an existing group?
-        if (groupId < 0) {
-            groupId = addNewGroup(hashPosition, position, page, rawHash);
-        }
-        return groupId;
-    }
-
-    private int addNewGroup(int hashPosition, int position, Page page, long rawHash)
-    {
-        // add the row to the open page
-        for (int i = 0; i < channels.length; i++) {
-            int hashChannel = channels[i];
-            Type type = types.get(i);
-            type.appendTo(page.getBlock(hashChannel), position, currentPageBuilder.getBlockBuilder(i));
-        }
-        if (precomputedHashChannel.isPresent()) {
-            BIGINT.writeLong(currentPageBuilder.getBlockBuilder(precomputedHashChannel.getAsInt()), rawHash);
-        }
-        currentPageBuilder.declarePosition();
-        int pageIndex = channelBuilders.get(0).size() - 1;
-        int pagePosition = currentPageBuilder.getPositionCount() - 1;
-        long address = encodeSyntheticAddress(pageIndex, pagePosition);
-        // -1 is reserved for marking hash position as empty
-        checkState(address != -1, "Address cannot be -1");
-
-        // record group id in hash
-        int groupId = nextGroupId++;
-
-        rawHashByHashPosition[hashPosition] = (byte) rawHash;
-        groupIdsByHash[hashPosition] = groupId;
-
-        // create new page builder if this page is full
-        if (currentPageBuilder.getPositionCount() == VALUES_PAGE_MAX_ROW_COUNT) {
-            startNewPage();
-        }
-
-        // increase capacity, if necessary
-        if (needRehash()) {
-            tryRehash();
-        }
-        return groupId;
-    }
-
-    private boolean needRehash()
-    {
-        return nextGroupId >= maxFill;
-    }
-
-    private void startNewPage()
-    {
-        if (currentPageBuilder != null) {
-            completedPagesMemorySize += currentPageBuilder.getRetainedSizeInBytes();
-            currentPageBuilder.reset(currentPageBuilder.getPositionCount());
-        }
-        else {
-            currentPageBuilder = new PageBuilder(types);
-        }
-
-        for (int i = 0; i < types.size(); i++) {
-            channelBuilders.get(i).add(currentPageBuilder.getBlockBuilder(i));
-        }
-    }
-
-    private boolean tryRehash()
-    {
-        long newCapacityLong = hashCapacity * 2L;
-        if (newCapacityLong > Integer.MAX_VALUE) {
-            throw new TrinoException(GENERIC_INSUFFICIENT_RESOURCES, "Size of hash table cannot exceed 1 billion entries");
-        }
-        int newCapacity = toIntExact(newCapacityLong);
-
-        // An estimate of how much extra memory is needed before we can go ahead and expand the hash table.
-        // This includes the new capacity for rawHashByHashPosition, groupIdsByHash as well as the size of the current page
-        preallocatedMemoryInBytes = newCapacity * (long) (Integer.BYTES + Byte.BYTES)
-                + currentPageSizeInBytes;
-        if (!updateMemory.update()) {
-            // reserved memory but has exceeded the limit
-            return false;
-        }
-
-        int newMask = newCapacity - 1;
-        byte[] rawHashes = new byte[newCapacity];
-        int[] newGroupIdByHash = new int[newCapacity];
-        Arrays.fill(newGroupIdByHash, -1);
-
-        for (int i = 0; i < hashCapacity; i++) {
-            // seek to the next used slot
-            int groupId = groupIdsByHash[i];
-            if (groupId == -1) {
-                continue;
-            }
-
-            long rawHash = hashPosition(groupId);
-            // find an empty slot for the address
-            int pos = getHashPosition(rawHash, newMask);
-            while (newGroupIdByHash[pos] != -1) {
-                pos = (pos + 1) & newMask;
-            }
-
-            // record the mapping
-            rawHashes[pos] = (byte) rawHash;
-            newGroupIdByHash[pos] = groupId;
-        }
-
-        this.mask = newMask;
-        this.hashCapacity = newCapacity;
-        this.maxFill = calculateMaxFill(newCapacity);
-        this.rawHashByHashPosition = rawHashes;
-        this.groupIdsByHash = newGroupIdByHash;
-
-        preallocatedMemoryInBytes = 0;
-        // release temporary memory reservation
-        updateMemory.update();
-        return true;
-    }
-
-    private long hashPosition(int groupId)
-    {
-        int blockIndex = groupId >> VALUES_PAGE_BITS;
-        int blockPosition = groupId & VALUES_PAGE_MASK;
-        if (precomputedHashChannel.isPresent()) {
-            return getRawHash(blockIndex, blockPosition, precomputedHashChannel.getAsInt());
-        }
-        return hashStrategy.hashPosition(blockIndex, blockPosition);
-    }
-
-    private long getRawHash(int sliceIndex, int position, int hashChannel)
-    {
-        return channelBuilders.get(hashChannel).get(sliceIndex).getLong(position, 0);
-    }
-
-    private boolean positionNotDistinctFromCurrentRow(int groupId, int hashPosition, int position, Page page, byte rawHash, int[] hashChannels)
-    {
-        if (rawHashByHashPosition[hashPosition] != rawHash) {
-            return false;
-        }
-        int blockIndex = groupId >> VALUES_PAGE_BITS;
-        int blockPosition = groupId & VALUES_PAGE_MASK;
-        return hashStrategy.positionNotDistinctFromRow(blockIndex, blockPosition, position, page, hashChannels);
-    }
-
-    private static int getHashPosition(long rawHash, int mask)
-    {
-        return (int) (murmurHash3(rawHash) & mask); // mask is int so casting is safe
-    }
-
-    private static int calculateMaxFill(int hashSize)
-    {
-        checkArgument(hashSize > 0, "hashSize must be greater than 0");
-        int maxFill = (int) Math.ceil(hashSize * FILL_RATIO);
-        if (maxFill == hashSize) {
-            maxFill--;
-        }
-        checkArgument(hashSize > maxFill, "hashSize must be larger than maxFill");
-        return maxFill;
-    }
-
-    private void updateDictionaryLookBack(Block dictionary)
-    {
-        if (dictionaryLookBack == null || dictionaryLookBack.getDictionary() != dictionary) {
-            dictionaryLookBack = new DictionaryLookBack(dictionary);
-        }
-    }
-
-    // For a page that contains DictionaryBlocks, create a new page in which
-    // the dictionaries from the DictionaryBlocks are extracted into the corresponding channels
-    // From Page(DictionaryBlock1, DictionaryBlock2) create new page with Page(dictionary1, dictionary2)
-    private Page createPageWithExtractedDictionary(Page page)
-    {
-        Block[] blocks = new Block[page.getChannelCount()];
-        Block dictionary = ((DictionaryBlock) page.getBlock(channels[0])).getDictionary();
-
-        // extract data dictionary
-        blocks[channels[0]] = dictionary;
-
-        // extract hash dictionary
-        inputHashChannel.ifPresent(integer -> blocks[integer] = ((DictionaryBlock) page.getBlock(integer)).getDictionary());
-
-        return new Page(dictionary.getPositionCount(), blocks);
-    }
-
-    private boolean canProcessDictionary(Page page)
-    {
-        if (!this.processDictionary || channels.length > 1 || !(page.getBlock(channels[0]) instanceof DictionaryBlock)) {
-            return false;
-        }
-
-        if (inputHashChannel.isPresent()) {
-            Block inputHashBlock = page.getBlock(inputHashChannel.get());
-            DictionaryBlock inputDataBlock = (DictionaryBlock) page.getBlock(channels[0]);
-
-            if (!(inputHashBlock instanceof DictionaryBlock)) {
-                // data channel is dictionary encoded but hash channel is not
-                return false;
-            }
-            // dictionarySourceIds of data block and hash block do not match
-            return ((DictionaryBlock) inputHashBlock).getDictionarySourceId().equals(inputDataBlock.getDictionarySourceId());
-        }
-
-        return true;
-    }
-
-    private boolean canProcessLowCardinalityDictionary(Page page)
-    {
-        // We don't have to rely on 'optimizer.dictionary-aggregations' here since there is little to none chance of regression
-        int positionCount = page.getPositionCount();
-        long cardinality = 1;
-        for (int channel : channels) {
-            if (!(page.getBlock(channel) instanceof DictionaryBlock)) {
-                return false;
-            }
-            cardinality = multiplyExact(cardinality, ((DictionaryBlock) page.getBlock(channel)).getDictionary().getPositionCount());
-            if (cardinality > positionCount * SMALL_DICTIONARIES_MAX_CARDINALITY_RATIO
-                    || cardinality > Short.MAX_VALUE) { // Need to fit into short array
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private boolean isRunLengthEncoded(Page page)
-    {
-        for (int channel : channels) {
-            if (!(page.getBlock(channel) instanceof RunLengthEncodedBlock)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private int registerGroupId(HashGenerator hashGenerator, Page page, int positionInDictionary)
-    {
-        if (dictionaryLookBack.isProcessed(positionInDictionary)) {
-            return dictionaryLookBack.getGroupId(positionInDictionary);
-        }
-
-        int groupId = putIfAbsent(positionInDictionary, page, hashGenerator.hashPosition(positionInDictionary, page));
-        dictionaryLookBack.setProcessed(positionInDictionary, groupId);
-        return groupId;
-    }
-
-    private static final class DictionaryLookBack
-    {
-        private static final int INSTANCE_SIZE = instanceSize(DictionaryLookBack.class);
-        private final Block dictionary;
-        private final int[] processed;
-
-        public DictionaryLookBack(Block dictionary)
-        {
-            this.dictionary = dictionary;
-            this.processed = new int[dictionary.getPositionCount()];
-            Arrays.fill(processed, -1);
-        }
-
-        public Block getDictionary()
-        {
-            return dictionary;
-        }
-
-        public int getGroupId(int position)
-        {
-            return processed[position];
-        }
-
-        public boolean isProcessed(int position)
-        {
-            return processed[position] != -1;
-        }
-
-        public void setProcessed(int position, int groupId)
-        {
-            processed[position] = groupId;
-        }
-
-        public long getRetainedSizeInBytes()
-        {
-            return INSTANCE_SIZE +
-                    sizeOf(processed) +
-                    dictionary.getRetainedSizeInBytes();
-        }
-    }
-
-    @VisibleForTesting
-    class AddNonDictionaryPageWork
-            implements Work<Void>
-    {
-        private final Page page;
-        private int lastPosition;
-
-        public AddNonDictionaryPageWork(Page page)
-        {
-            this.page = requireNonNull(page, "page is null");
-        }
-
-        @Override
-        public boolean process()
-        {
-            int positionCount = page.getPositionCount();
-            checkState(lastPosition <= positionCount, "position count out of bound");
-            int remainingPositions = positionCount - lastPosition;
-
-            while (remainingPositions != 0) {
-                int batchSize = min(remainingPositions, BATCH_SIZE);
-                if (!ensureHashTableSize(batchSize)) {
-                    return false;
-                }
-
-                for (int i = lastPosition; i < lastPosition + batchSize; i++) {
-                    putIfAbsent(i, page);
-                }
-
-                lastPosition += batchSize;
-                remainingPositions -= batchSize;
-            }
-            verify(lastPosition == positionCount);
-            return true;
-        }
-
-        @Override
-        public Void getResult()
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    @VisibleForTesting
-    class AddDictionaryPageWork
-            implements Work<Void>
-    {
-        private final Page page;
-        private final Page dictionaryPage;
-        private final DictionaryBlock dictionaryBlock;
-
-        private int lastPosition;
-
-        public AddDictionaryPageWork(Page page)
-        {
-            verify(canProcessDictionary(page), "invalid call to addDictionaryPage");
-            this.page = requireNonNull(page, "page is null");
-            this.dictionaryBlock = (DictionaryBlock) page.getBlock(channels[0]);
-            updateDictionaryLookBack(dictionaryBlock.getDictionary());
-            this.dictionaryPage = createPageWithExtractedDictionary(page);
-        }
-
-        @Override
-        public boolean process()
-        {
-            int positionCount = page.getPositionCount();
-            checkState(lastPosition <= positionCount, "position count out of bound");
-
-            // needRehash() == false indicates we have reached capacity boundary and a rehash is needed.
-            // We can only proceed if tryRehash() successfully did a rehash.
-            if (needRehash() && !tryRehash()) {
-                return false;
-            }
-
-            // putIfAbsent will rehash automatically if rehash is needed, unless there isn't enough memory to do so.
-            // Therefore needRehash will not generally return true even if we have just crossed the capacity boundary.
-            while (lastPosition < positionCount && !needRehash()) {
-                int positionInDictionary = dictionaryBlock.getId(lastPosition);
-                registerGroupId(hashGenerator, dictionaryPage, positionInDictionary);
-                lastPosition++;
-            }
-            return lastPosition == positionCount;
-        }
-
-        @Override
-        public Void getResult()
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    class AddLowCardinalityDictionaryPageWork
-            implements Work<Void>
-    {
-        private final Page page;
-        @Nullable
-        private int[] combinationIdToPosition;
-        private int nextCombinationId;
-
-        public AddLowCardinalityDictionaryPageWork(Page page)
-        {
-            this.page = requireNonNull(page, "page is null");
-        }
-
-        @Override
-        public boolean process()
-        {
-            // needRehash() == false indicates we have reached capacity boundary and a rehash is needed.
-            // We can only proceed if tryRehash() successfully did a rehash.
-            if (needRehash() && !tryRehash()) {
-                return false;
-            }
-
-            if (combinationIdToPosition == null) {
-                combinationIdToPosition = calculateCombinationIdToPositionMapping(page);
-            }
-
-            // putIfAbsent will rehash automatically if rehash is needed, unless there isn't enough memory to do so.
-            // Therefore needRehash will not generally return true even if we have just crossed the capacity boundary.
-            for (int combinationId = nextCombinationId; combinationId < combinationIdToPosition.length; combinationId++) {
-                int position = combinationIdToPosition[combinationId];
-                if (position != -1) {
-                    if (needRehash()) {
-                        nextCombinationId = combinationId;
-                        return false;
-                    }
-                    putIfAbsent(position, page);
-                }
-            }
-            return true;
-        }
-
-        @Override
-        public Void getResult()
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    @VisibleForTesting
-    class AddRunLengthEncodedPageWork
-            implements Work<Void>
-    {
-        private final Page page;
-
-        private boolean finished;
-
-        public AddRunLengthEncodedPageWork(Page page)
-        {
-            this.page = requireNonNull(page, "page is null");
-        }
-
-        @Override
-        public boolean process()
-        {
-            checkState(!finished);
-            if (page.getPositionCount() == 0) {
-                finished = true;
-                return true;
-            }
-
-            // needRehash() == false indicates we have reached capacity boundary and a rehash is needed.
-            // We can only proceed if tryRehash() successfully did a rehash.
-            if (needRehash() && !tryRehash()) {
-                return false;
-            }
-
-            // Only needs to process the first row since it is Run Length Encoded
-            putIfAbsent(0, page);
-            finished = true;
-
-            return true;
-        }
-
-        @Override
-        public Void getResult()
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    @VisibleForTesting
-    class GetNonDictionaryGroupIdsWork
-            implements Work<GroupByIdBlock>
-    {
-        private final long[] groupIds;
-        private final Page page;
-
-        private boolean finished;
-        private int lastPosition;
-
-        public GetNonDictionaryGroupIdsWork(Page page)
-        {
-            this.page = requireNonNull(page, "page is null");
-            // we know the exact size required for the block
-            groupIds = new long[page.getPositionCount()];
-        }
-
-        @Override
-        public boolean process()
-        {
-            int positionCount = page.getPositionCount();
-            checkState(lastPosition <= positionCount, "position count out of bound");
-            checkState(!finished);
-
-            int remainingPositions = positionCount - lastPosition;
-
-            while (remainingPositions != 0) {
-                int batchSize = min(remainingPositions, BATCH_SIZE);
-                if (!ensureHashTableSize(batchSize)) {
-                    return false;
-                }
-
-                for (int i = lastPosition; i < lastPosition + batchSize; i++) {
-                    // output the group id for this row
-                    groupIds[i] = putIfAbsent(i, page);
-                }
-
-                lastPosition += batchSize;
-                remainingPositions -= batchSize;
-            }
-            verify(lastPosition == positionCount);
-            return true;
-        }
-
-        @Override
-        public GroupByIdBlock getResult()
-        {
-            checkState(lastPosition == page.getPositionCount(), "process has not yet finished");
-            checkState(!finished, "result has produced");
-            finished = true;
-            return new GroupByIdBlock(nextGroupId, new LongArrayBlock(groupIds.length, Optional.empty(), groupIds));
-        }
-    }
-
-    @VisibleForTesting
-    class GetLowCardinalityDictionaryGroupIdsWork
-            implements Work<GroupByIdBlock>
-    {
-        private final Page page;
-        private final long[] groupIds;
-        @Nullable
-        private short[] positionToCombinationId;
-        @Nullable
-        private int[] combinationIdToGroupId;
-        private int nextPosition;
-        private boolean finished;
-
-        public GetLowCardinalityDictionaryGroupIdsWork(Page page)
-        {
-            this.page = requireNonNull(page, "page is null");
-            groupIds = new long[page.getPositionCount()];
-        }
-
-        @Override
-        public boolean process()
-        {
-            // needRehash() == false indicates we have reached capacity boundary and a rehash is needed.
-            // We can only proceed if tryRehash() successfully did a rehash.
-            if (needRehash() && !tryRehash()) {
-                return false;
-            }
-
-            if (positionToCombinationId == null) {
-                positionToCombinationId = new short[groupIds.length];
-                int maxCardinality = calculatePositionToCombinationIdMapping(page, positionToCombinationId);
-                combinationIdToGroupId = new int[maxCardinality];
-                Arrays.fill(combinationIdToGroupId, -1);
-            }
-
-            for (int position = nextPosition; position < groupIds.length; position++) {
-                short combinationId = positionToCombinationId[position];
-                int groupId = combinationIdToGroupId[combinationId];
-                if (groupId == -1) {
-                    // putIfAbsent will rehash automatically if rehash is needed, unless there isn't enough memory to do so.
-                    // Therefore needRehash will not generally return true even if we have just crossed the capacity boundary.
-                    if (needRehash()) {
-                        nextPosition = position;
-                        return false;
-                    }
-                    groupId = putIfAbsent(position, page);
-                    combinationIdToGroupId[combinationId] = groupId;
-                }
-                groupIds[position] = groupId;
-            }
-            return true;
-        }
-
-        @Override
-        public GroupByIdBlock getResult()
-        {
-            checkState(!finished, "result has produced");
-            finished = true;
-            return new GroupByIdBlock(nextGroupId, new LongArrayBlock(groupIds.length, Optional.empty(), groupIds));
-        }
-    }
-
-    @VisibleForTesting
-    class GetDictionaryGroupIdsWork
-            implements Work<GroupByIdBlock>
-    {
-        private final long[] groupIds;
-        private final Page page;
-        private final Page dictionaryPage;
-        private final DictionaryBlock dictionaryBlock;
-
-        private boolean finished;
-        private int lastPosition;
-
-        public GetDictionaryGroupIdsWork(Page page)
-        {
-            this.page = requireNonNull(page, "page is null");
-            verify(canProcessDictionary(page), "invalid call to processDictionary");
-
-            this.dictionaryBlock = (DictionaryBlock) page.getBlock(channels[0]);
-            updateDictionaryLookBack(dictionaryBlock.getDictionary());
-            this.dictionaryPage = createPageWithExtractedDictionary(page);
-            groupIds = new long[page.getPositionCount()];
-        }
-
-        @Override
-        public boolean process()
-        {
-            int positionCount = page.getPositionCount();
-            checkState(lastPosition <= positionCount, "position count out of bound");
-            checkState(!finished);
-
-            // needRehash() == false indicates we have reached capacity boundary and a rehash is needed.
-            // We can only proceed if tryRehash() successfully did a rehash.
-            if (needRehash() && !tryRehash()) {
-                return false;
-            }
-
-            // putIfAbsent will rehash automatically if rehash is needed, unless there isn't enough memory to do so.
-            // Therefore needRehash will not generally return true even if we have just crossed the capacity boundary.
-            while (lastPosition < positionCount && !needRehash()) {
-                int positionInDictionary = dictionaryBlock.getId(lastPosition);
-                groupIds[lastPosition] = registerGroupId(hashGenerator, dictionaryPage, positionInDictionary);
-                lastPosition++;
-            }
-            return lastPosition == positionCount;
-        }
-
-        @Override
-        public GroupByIdBlock getResult()
-        {
-            checkState(lastPosition == page.getPositionCount(), "process has not yet finished");
-            checkState(!finished, "result has produced");
-            finished = true;
-            return new GroupByIdBlock(nextGroupId, new LongArrayBlock(groupIds.length, Optional.empty(), groupIds));
-        }
-    }
-
-    @VisibleForTesting
-    class GetRunLengthEncodedGroupIdsWork
-            implements Work<GroupByIdBlock>
-    {
-        private final Page page;
-
-        int groupId = -1;
-        private boolean processFinished;
-        private boolean resultProduced;
-
-        public GetRunLengthEncodedGroupIdsWork(Page page)
-        {
-            this.page = requireNonNull(page, "page is null");
-        }
-
-        @Override
-        public boolean process()
-        {
-            checkState(!processFinished);
-            if (page.getPositionCount() == 0) {
-                processFinished = true;
-                return true;
-            }
-
-            // needRehash() == false indicates we have reached capacity boundary and a rehash is needed.
-            // We can only proceed if tryRehash() successfully did a rehash.
-            if (needRehash() && !tryRehash()) {
-                return false;
-            }
-
-            // Only needs to process the first row since it is Run Length Encoded
-            groupId = putIfAbsent(0, page);
-            processFinished = true;
-            return true;
-        }
-
-        @Override
-        public GroupByIdBlock getResult()
-        {
-            checkState(processFinished);
-            checkState(!resultProduced);
-            resultProduced = true;
-
-            return new GroupByIdBlock(
-                    nextGroupId,
-                    RunLengthEncodedBlock.create(
-                            BIGINT.createFixedSizeBlockBuilder(1).writeLong(groupId).build(),
-                            page.getPositionCount()));
-        }
-    }
-
-    /**
-     * Returns an array containing a position that corresponds to the low cardinality
-     * dictionary combinationId, or a value of -1 if no position exists within the page
-     * for that combinationId.
-     */
-    private int[] calculateCombinationIdToPositionMapping(Page page)
-    {
-        short[] positionToCombinationId = new short[page.getPositionCount()];
-        int maxCardinality = calculatePositionToCombinationIdMapping(page, positionToCombinationId);
-
-        int[] combinationIdToPosition = new int[maxCardinality];
-        Arrays.fill(combinationIdToPosition, -1);
-        for (int position = 0; position < positionToCombinationId.length; position++) {
-            combinationIdToPosition[positionToCombinationId[position]] = position;
-        }
-        return combinationIdToPosition;
-    }
-
-    /**
-     * Returns the number of combinations of all dictionary ids in input page blocks and populates
-     * positionToCombinationIds with the combinationId for each position in the input Page
-     */
-    private int calculatePositionToCombinationIdMapping(Page page, short[] positionToCombinationIds)
-    {
-        checkArgument(positionToCombinationIds.length == page.getPositionCount());
-
-        int maxCardinality = 1;
-        for (int channel = 0; channel < channels.length; channel++) {
-            Block block = page.getBlock(channels[channel]);
-            verify(block instanceof DictionaryBlock, "Only dictionary blocks are supported");
-            DictionaryBlock dictionaryBlock = (DictionaryBlock) block;
-            int dictionarySize = dictionaryBlock.getDictionary().getPositionCount();
-            maxCardinality *= dictionarySize;
-            if (channel == 0) {
-                for (int position = 0; position < positionToCombinationIds.length; position++) {
-                    positionToCombinationIds[position] = (short) dictionaryBlock.getId(position);
-                }
-            }
-            else {
-                for (int position = 0; position < positionToCombinationIds.length; position++) {
-                    short combinationId = positionToCombinationIds[position];
-                    combinationId *= dictionarySize;
-                    combinationId += dictionaryBlock.getId(position);
-                    positionToCombinationIds[position] = combinationId;
-                }
-            }
-        }
-        return maxCardinality;
-    }
-
-    private boolean ensureHashTableSize(int batchSize)
-    {
-        int positionCountUntilRehash = maxFill - nextGroupId;
-        while (positionCountUntilRehash < batchSize) {
-            if (!tryRehash()) {
-                return false;
-            }
-            positionCountUntilRehash = maxFill - nextGroupId;
-        }
-        return true;
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/NoChannelGroupByHash.java b/core/trino-main/src/main/java/io/trino/operator/NoChannelGroupByHash.java
index fb2d21dcf562..37370b4a58e6 100644
--- a/core/trino-main/src/main/java/io/trino/operator/NoChannelGroupByHash.java
+++ b/core/trino-main/src/main/java/io/trino/operator/NoChannelGroupByHash.java
@@ -13,16 +13,10 @@
  */
 package io.trino.operator;
 
-import com.google.common.collect.ImmutableList;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
-import io.trino.spi.block.RunLengthEncodedBlock;
-import io.trino.spi.type.Type;
-
-import java.util.List;
 
 import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.spi.type.BigintType.BIGINT;
 
 public class NoChannelGroupByHash
         implements GroupByHash
@@ -37,12 +31,6 @@ public long getEstimatedSize()
         return INSTANCE_SIZE;
     }
 
-    @Override
-    public List<Type> getTypes()
-    {
-        return ImmutableList.of();
-    }
-
     @Override
     public int getGroupCount()
     {
@@ -64,20 +52,14 @@ public Work<?> addPage(Page page)
     }
 
     @Override
-    public Work<GroupByIdBlock> getGroupIds(Page page)
+    public Work<int[]> getGroupIds(Page page)
     {
         updateGroupCount(page);
-        return new CompletedWork<>(new GroupByIdBlock(page.getPositionCount() > 0 ? 1 : 0, RunLengthEncodedBlock.create(BIGINT, 0L, page.getPositionCount())));
-    }
-
-    @Override
-    public boolean contains(int position, Page page, int[] hashChannels)
-    {
-        throw new UnsupportedOperationException("NoChannelGroupByHash does not support getHashCollisions");
+        return new CompletedWork<>(new int[page.getPositionCount()]);
     }
 
     @Override
-    public long getRawHash(int groupyId)
+    public long getRawHash(int groupId)
     {
         throw new UnsupportedOperationException("NoChannelGroupByHash does not support getHashCollisions");
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/OperationTimer.java b/core/trino-main/src/main/java/io/trino/operator/OperationTimer.java
index 460f433e83fa..5919cbbdcf8d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/OperationTimer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/OperationTimer.java
@@ -13,8 +13,8 @@
  */
 package io.trino.operator;
 
-import javax.annotation.concurrent.NotThreadSafe;
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import io.trino.annotation.NotThreadSafe;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadMXBean;
diff --git a/core/trino-main/src/main/java/io/trino/operator/OperatorContext.java b/core/trino-main/src/main/java/io/trino/operator/OperatorContext.java
index f75d08035517..baedf47f8555 100644
--- a/core/trino-main/src/main/java/io/trino/operator/OperatorContext.java
+++ b/core/trino-main/src/main/java/io/trino/operator/OperatorContext.java
@@ -19,6 +19,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.stats.CounterStat;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
@@ -33,10 +35,7 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.metrics.Metrics;
 import io.trino.sql.planner.plan.PlanNodeId;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Optional;
@@ -91,6 +90,7 @@ public class OperatorContext
     private final AtomicReference<Metrics> metrics = new AtomicReference<>(Metrics.EMPTY);  // this is not incremental, but gets overwritten by the latest value.
     private final AtomicReference<Metrics> connectorMetrics = new AtomicReference<>(Metrics.EMPTY); // this is not incremental, but gets overwritten by the latest value.
 
+    private final AtomicLong writerInputDataSize = new AtomicLong();
     private final AtomicLong physicalWrittenDataSize = new AtomicLong();
 
     private final AtomicReference<SettableFuture<Void>> memoryFuture;
@@ -246,6 +246,11 @@ public void setFinishedFuture(ListenableFuture<Void> finishedFuture)
         checkState(this.finishedFuture.getAndSet(requireNonNull(finishedFuture, "finishedFuture is null")) == null, "finishedFuture already set");
     }
 
+    public void recordWriterInputDataSize(long sizeInBytes)
+    {
+        writerInputDataSize.getAndAdd(sizeInBytes);
+    }
+
     public void recordPhysicalWrittenData(long sizeInBytes)
     {
         physicalWrittenDataSize.getAndAdd(sizeInBytes);
@@ -486,6 +491,11 @@ public CounterStat getOutputPositions()
         return outputPositions;
     }
 
+    public long getWriterInputDataSize()
+    {
+        return writerInputDataSize.get();
+    }
+
     public long getPhysicalWrittenDataSize()
     {
         return physicalWrittenDataSize.get();
diff --git a/core/trino-main/src/main/java/io/trino/operator/OperatorFactories.java b/core/trino-main/src/main/java/io/trino/operator/OperatorFactories.java
index 3285660ebaa7..91862dcbe93b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/OperatorFactories.java
+++ b/core/trino-main/src/main/java/io/trino/operator/OperatorFactories.java
@@ -14,28 +14,28 @@
 package io.trino.operator;
 
 import io.trino.operator.join.JoinBridgeManager;
-import io.trino.operator.join.LookupJoinOperatorFactory.JoinType;
+import io.trino.operator.join.JoinProbe.JoinProbeFactory;
+import io.trino.operator.join.LookupJoinOperatorFactory;
 import io.trino.operator.join.LookupSourceFactory;
+import io.trino.operator.join.unspilled.JoinProbe;
 import io.trino.operator.join.unspilled.PartitionedLookupSourceFactory;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.spiller.PartitioningSpillerFactory;
-import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.stream.IntStream;
 
-import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.FULL_OUTER;
-import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.INNER;
-import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.LOOKUP_OUTER;
-import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.PROBE_OUTER;
-import static java.util.Objects.requireNonNull;
+import static com.google.common.collect.ImmutableList.toImmutableList;
 
-public interface OperatorFactories
+public class OperatorFactories
 {
-    OperatorFactory join(
+    private OperatorFactories() {}
+
+    public static OperatorFactory join(
             JoinOperatorType joinType,
             int operatorId,
             PlanNodeId planNodeId,
@@ -44,10 +44,29 @@ OperatorFactory join(
             List<Type> probeTypes,
             List<Integer> probeJoinChannel,
             OptionalInt probeHashChannel,
-            Optional<List<Integer>> probeOutputChannels,
-            BlockTypeOperators blockTypeOperators);
+            Optional<List<Integer>> probeOutputChannelsOptional,
+            TypeOperators typeOperators)
+    {
+        List<Integer> probeOutputChannels = probeOutputChannelsOptional.orElseGet(() -> rangeList(probeTypes.size()));
+        List<Type> probeOutputChannelTypes = probeOutputChannels.stream()
+                .map(probeTypes::get)
+                .collect(toImmutableList());
+
+        return new io.trino.operator.join.unspilled.LookupJoinOperatorFactory(
+                operatorId,
+                planNodeId,
+                lookupSourceFactory,
+                probeTypes,
+                probeOutputChannelTypes,
+                lookupSourceFactory.getBuildOutputTypes(),
+                joinType,
+                new JoinProbe.JoinProbeFactory(probeOutputChannels, probeJoinChannel, probeHashChannel, hasFilter),
+                typeOperators,
+                probeJoinChannel,
+                probeHashChannel);
+    }
 
-    OperatorFactory spillingJoin(
+    public static OperatorFactory spillingJoin(
             JoinOperatorType joinType,
             int operatorId,
             PlanNodeId planNodeId,
@@ -56,67 +75,36 @@ OperatorFactory spillingJoin(
             List<Type> probeTypes,
             List<Integer> probeJoinChannel,
             OptionalInt probeHashChannel,
-            Optional<List<Integer>> probeOutputChannels,
+            Optional<List<Integer>> probeOutputChannelsOptional,
             OptionalInt totalOperatorsCount,
             PartitioningSpillerFactory partitioningSpillerFactory,
-            BlockTypeOperators blockTypeOperators);
-
-    class JoinOperatorType
+            TypeOperators typeOperators)
     {
-        private final JoinType type;
-        private final boolean outputSingleMatch;
-        private final boolean waitForBuild;
-
-        public static JoinOperatorType ofJoinNodeType(JoinNode.Type joinNodeType, boolean outputSingleMatch, boolean waitForBuild)
-        {
-            return switch (joinNodeType) {
-                case INNER -> innerJoin(outputSingleMatch, waitForBuild);
-                case LEFT -> probeOuterJoin(outputSingleMatch);
-                case RIGHT -> lookupOuterJoin(waitForBuild);
-                case FULL -> fullOuterJoin();
-            };
-        }
-
-        public static JoinOperatorType innerJoin(boolean outputSingleMatch, boolean waitForBuild)
-        {
-            return new JoinOperatorType(INNER, outputSingleMatch, waitForBuild);
-        }
+        List<Integer> probeOutputChannels = probeOutputChannelsOptional.orElseGet(() -> rangeList(probeTypes.size()));
+        List<Type> probeOutputChannelTypes = probeOutputChannels.stream()
+                .map(probeTypes::get)
+                .collect(toImmutableList());
 
-        public static JoinOperatorType probeOuterJoin(boolean outputSingleMatch)
-        {
-            return new JoinOperatorType(PROBE_OUTER, outputSingleMatch, false);
-        }
-
-        public static JoinOperatorType lookupOuterJoin(boolean waitForBuild)
-        {
-            return new JoinOperatorType(LOOKUP_OUTER, false, waitForBuild);
-        }
-
-        public static JoinOperatorType fullOuterJoin()
-        {
-            return new JoinOperatorType(FULL_OUTER, false, false);
-        }
-
-        private JoinOperatorType(JoinType type, boolean outputSingleMatch, boolean waitForBuild)
-        {
-            this.type = requireNonNull(type, "type is null");
-            this.outputSingleMatch = outputSingleMatch;
-            this.waitForBuild = waitForBuild;
-        }
-
-        public boolean isOutputSingleMatch()
-        {
-            return outputSingleMatch;
-        }
-
-        public boolean isWaitForBuild()
-        {
-            return waitForBuild;
-        }
+        return new LookupJoinOperatorFactory(
+                operatorId,
+                planNodeId,
+                lookupSourceFactory,
+                probeTypes,
+                probeOutputChannelTypes,
+                lookupSourceFactory.getBuildOutputTypes(),
+                joinType,
+                new JoinProbeFactory(probeOutputChannels.stream().mapToInt(i -> i).toArray(), probeJoinChannel, probeHashChannel),
+                typeOperators,
+                totalOperatorsCount,
+                probeJoinChannel,
+                probeHashChannel,
+                partitioningSpillerFactory);
+    }
 
-        public JoinType getType()
-        {
-            return type;
-        }
+    private static List<Integer> rangeList(int endExclusive)
+    {
+        return IntStream.range(0, endExclusive)
+                .boxed()
+                .collect(toImmutableList());
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/OperatorStats.java b/core/trino-main/src/main/java/io/trino/operator/OperatorStats.java
index 2908b0ea3929..a7a8b63b2595 100644
--- a/core/trino-main/src/main/java/io/trino/operator/OperatorStats.java
+++ b/core/trino-main/src/main/java/io/trino/operator/OperatorStats.java
@@ -16,15 +16,15 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.spi.Mergeable;
 import io.trino.spi.metrics.Metrics;
 import io.trino.sql.planner.plan.PlanNodeId;
+import jakarta.annotation.Nullable;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
+import java.util.List;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -485,6 +485,7 @@ public OperatorStats add(Iterable<OperatorStats> operators)
         Optional<BlockedReason> blockedReason = this.blockedReason;
 
         Mergeable<OperatorInfo> base = getMergeableInfoOrNull(info);
+        ImmutableList.Builder<OperatorInfo> operatorInfos = ImmutableList.builder();
         for (OperatorStats operator : operators) {
             checkArgument(operator.getOperatorId() == operatorId, "Expected operatorId to be %s but was %s", operatorId, operator.getOperatorId());
             checkArgument(operator.getOperatorType().equals(operatorType), "Expected operatorType to be %s but was %s", operatorType, operator.getOperatorType());
@@ -538,7 +539,7 @@ public OperatorStats add(Iterable<OperatorStats> operators)
             OperatorInfo info = operator.getInfo();
             if (base != null && info != null) {
                 verify(base.getClass() == info.getClass(), "Cannot merge operator infos: %s and %s", base, info);
-                base = mergeInfo(base, info);
+                operatorInfos.add(info);
             }
         }
 
@@ -592,7 +593,7 @@ public OperatorStats add(Iterable<OperatorStats> operators)
 
                 blockedReason,
 
-                (OperatorInfo) base);
+                (OperatorInfo) mergeInfos(base, operatorInfos.build()));
     }
 
     @SuppressWarnings("unchecked")
@@ -606,9 +607,12 @@ private static Mergeable<OperatorInfo> getMergeableInfoOrNull(OperatorInfo info)
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> Mergeable<T> mergeInfo(Mergeable<T> base, T other)
+    private static <T> Mergeable<T> mergeInfos(Mergeable<T> base, List<T> others)
     {
-        return (Mergeable<T>) base.mergeWith(other);
+        if (base == null) {
+            return null;
+        }
+        return (Mergeable<T>) base.mergeWith(others);
     }
 
     public OperatorStats summarize()
diff --git a/core/trino-main/src/main/java/io/trino/operator/PageBuffer.java b/core/trino-main/src/main/java/io/trino/operator/PageBuffer.java
index 2c180cf8d84a..ef8385f5fee6 100644
--- a/core/trino-main/src/main/java/io/trino/operator/PageBuffer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/PageBuffer.java
@@ -15,8 +15,7 @@
 
 import io.trino.operator.WorkProcessorOperatorAdapter.AdapterWorkProcessorOperator;
 import io.trino.spi.Page;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.operator.WorkProcessor.ProcessState.finished;
diff --git a/core/trino-main/src/main/java/io/trino/operator/PagesIndex.java b/core/trino-main/src/main/java/io/trino/operator/PagesIndex.java
index 90f4558beffa..d8605025a3a3 100644
--- a/core/trino-main/src/main/java/io/trino/operator/PagesIndex.java
+++ b/core/trino-main/src/main/java/io/trino/operator/PagesIndex.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
 import io.airlift.units.DataSize;
@@ -43,8 +44,6 @@
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 
-import javax.inject.Inject;
-
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/operator/PagesIndexPageSorter.java b/core/trino-main/src/main/java/io/trino/operator/PagesIndexPageSorter.java
index 61c0f1bfe748..03760a796e49 100644
--- a/core/trino-main/src/main/java/io/trino/operator/PagesIndexPageSorter.java
+++ b/core/trino-main/src/main/java/io/trino/operator/PagesIndexPageSorter.java
@@ -13,13 +13,12 @@
  */
 package io.trino.operator;
 
+import com.google.inject.Inject;
 import io.trino.spi.Page;
 import io.trino.spi.PageSorter;
 import io.trino.spi.connector.SortOrder;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.operator.SyntheticAddress.decodePosition;
@@ -44,7 +43,7 @@ public long[] sort(List<Type> types, List<Page> pages, List<Integer> sortChannel
         pages.forEach(pagesIndex::addPage);
         pagesIndex.sort(sortChannels, sortOrders);
 
-        return pagesIndex.getValueAddresses().toLongArray(null);
+        return pagesIndex.getValueAddresses().toLongArray();
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/operator/PagesRTreeIndex.java b/core/trino-main/src/main/java/io/trino/operator/PagesRTreeIndex.java
index 51efd3bf9a6a..37ea2290c91f 100644
--- a/core/trino-main/src/main/java/io/trino/operator/PagesRTreeIndex.java
+++ b/core/trino-main/src/main/java/io/trino/operator/PagesRTreeIndex.java
@@ -44,7 +44,6 @@
 import static io.trino.operator.join.JoinUtils.channelsToPages;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.IntegerType.INTEGER;
-import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
 public class PagesRTreeIndex
@@ -144,7 +143,7 @@ public int[] findJoinPositions(int probePosition, Page probe, int probeGeometryC
             return EMPTY_ADDRESSES;
         }
 
-        int probePartition = probePartitionChannel.map(channel -> toIntExact(INTEGER.getLong(probe.getBlock(channel), probePosition))).orElse(-1);
+        int probePartition = probePartitionChannel.map(channel -> INTEGER.getInt(probe.getBlock(channel), probePosition)).orElse(-1);
 
         Slice slice = probeGeometryBlock.getSlice(probePosition, 0, probeGeometryBlock.getSliceLength(probePosition));
         OGCGeometry probeGeometry = deserialize(slice);
@@ -175,7 +174,7 @@ public int[] findJoinPositions(int probePosition, Page probe, int probeGeometryC
             }
         });
 
-        return matchingPositions.toIntArray(null);
+        return matchingPositions.toIntArray();
     }
 
     private boolean testReferencePoint(Envelope probeEnvelope, OGCGeometry buildGeometry, int partition)
diff --git a/core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexFactory.java b/core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexFactory.java
index b28b677c6710..18b620d24038 100644
--- a/core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexFactory.java
@@ -16,11 +16,10 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexSupplier.java b/core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexSupplier.java
index f4d150733299..92f96ac57788 100644
--- a/core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexSupplier.java
+++ b/core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexSupplier.java
@@ -47,7 +47,6 @@
 import static io.trino.operator.SyntheticAddress.decodeSliceIndex;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.IntegerType.INTEGER;
-import static java.lang.Math.toIntExact;
 
 public class PagesSpatialIndexSupplier
         implements Supplier<PagesSpatialIndex>
@@ -133,7 +132,7 @@ private static STRtree buildRTree(LongArrayList addresses, List<ObjectArrayList<
             int partition = -1;
             if (partitionChannel.isPresent()) {
                 Block partitionBlock = channels.get(partitionChannel.get()).get(blockIndex);
-                partition = toIntExact(INTEGER.getLong(partitionBlock, blockPosition));
+                partition = INTEGER.getInt(partitionBlock, blockPosition);
             }
 
             rtree.insert(getEnvelope(ogcGeometry, radius), new GeometryWithPosition(ogcGeometry, partition, position));
diff --git a/core/trino-main/src/main/java/io/trino/operator/ParametricImplementation.java b/core/trino-main/src/main/java/io/trino/operator/ParametricImplementation.java
index a1184f14fd3c..5cb0b0ef15fe 100644
--- a/core/trino-main/src/main/java/io/trino/operator/ParametricImplementation.java
+++ b/core/trino-main/src/main/java/io/trino/operator/ParametricImplementation.java
@@ -23,6 +23,4 @@ public interface ParametricImplementation
     boolean hasSpecializedTypeParameters();
 
     FunctionNullability getFunctionNullability();
-
-    ParametricImplementation withAlias(String alias);
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/ParametricImplementationsGroup.java b/core/trino-main/src/main/java/io/trino/operator/ParametricImplementationsGroup.java
index 7cf2741c33a9..9bdce2ab5e38 100644
--- a/core/trino-main/src/main/java/io/trino/operator/ParametricImplementationsGroup.java
+++ b/core/trino-main/src/main/java/io/trino/operator/ParametricImplementationsGroup.java
@@ -22,11 +22,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.operator.annotations.FunctionsParserHelper.validateSignaturesCompatibility;
 import static java.util.Objects.requireNonNull;
@@ -110,30 +107,6 @@ public Signature getSignature()
         return signature;
     }
 
-    public ParametricImplementationsGroup<T> withAlias(String alias)
-    {
-        if (alias.equals(signature.getName())) {
-            return this;
-        }
-        return new ParametricImplementationsGroup<>(
-                exactImplementations.values().stream()
-                        .map(implementation -> withAlias(alias, implementation))
-                        .collect(toImmutableMap(T::getSignature, Function.identity())),
-                specializedImplementations.stream()
-                        .map(implementation -> withAlias(alias, implementation))
-                        .collect(toImmutableList()),
-                genericImplementations.stream()
-                        .map(implementation -> withAlias(alias, implementation))
-                        .collect(toImmutableList()),
-                signature.withName(alias));
-    }
-
-    @SuppressWarnings("unchecked")
-    private static <T extends ParametricImplementation> T withAlias(String name, T implementation)
-    {
-        return (T) implementation.withAlias(name);
-    }
-
     public static <T extends ParametricImplementation> Builder<T> builder()
     {
         return new Builder<>();
diff --git a/core/trino-main/src/main/java/io/trino/operator/PartitionFunction.java b/core/trino-main/src/main/java/io/trino/operator/PartitionFunction.java
index 6f9768affeb8..ef1627843f86 100644
--- a/core/trino-main/src/main/java/io/trino/operator/PartitionFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/PartitionFunction.java
@@ -17,7 +17,7 @@
 
 public interface PartitionFunction
 {
-    int getPartitionCount();
+    int partitionCount();
 
     /**
      * @param page the arguments to bucketing function in order (no extra columns)
diff --git a/core/trino-main/src/main/java/io/trino/operator/PipelineContext.java b/core/trino-main/src/main/java/io/trino/operator/PipelineContext.java
index 364c030d3257..605d970564e1 100644
--- a/core/trino-main/src/main/java/io/trino/operator/PipelineContext.java
+++ b/core/trino-main/src/main/java/io/trino/operator/PipelineContext.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ListMultimap;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.stats.CounterStat;
 import io.airlift.stats.Distribution;
 import io.airlift.units.Duration;
@@ -29,8 +30,6 @@
 import io.trino.memory.context.MemoryTrackingContext;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.Iterator;
 import java.util.List;
 import java.util.TreeMap;
@@ -318,6 +317,16 @@ public CounterStat getOutputPositions()
         return stat;
     }
 
+    public long getWriterInputDataSize()
+    {
+        // Avoid using stream api due to performance reasons
+        long writerInputDataSize = 0;
+        for (DriverContext context : drivers) {
+            writerInputDataSize += context.getWriterInputDataSize();
+        }
+        return writerInputDataSize;
+    }
+
     public long getPhysicalWrittenDataSize()
     {
         // Avoid using stream api due to performance reasons
diff --git a/core/trino-main/src/main/java/io/trino/operator/PipelineStats.java b/core/trino-main/src/main/java/io/trino/operator/PipelineStats.java
index f5cac2aabd9c..edeb73224e38 100644
--- a/core/trino-main/src/main/java/io/trino/operator/PipelineStats.java
+++ b/core/trino-main/src/main/java/io/trino/operator/PipelineStats.java
@@ -17,14 +17,13 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.airlift.stats.Distribution.DistributionSnapshot;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import jakarta.annotation.Nullable;
 import org.joda.time.DateTime;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Set;
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/PipelineStatus.java b/core/trino-main/src/main/java/io/trino/operator/PipelineStatus.java
index 41969556e617..5c2801be2972 100644
--- a/core/trino-main/src/main/java/io/trino/operator/PipelineStatus.java
+++ b/core/trino-main/src/main/java/io/trino/operator/PipelineStatus.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator;
 
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 @Immutable
 public final class PipelineStatus
diff --git a/core/trino-main/src/main/java/io/trino/operator/PositionSearcher.java b/core/trino-main/src/main/java/io/trino/operator/PositionSearcher.java
new file mode 100644
index 000000000000..5fe80ca10915
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/PositionSearcher.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed 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 io.trino.operator;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.lang.Math.min;
+import static java.lang.Math.toIntExact;
+
+public class PositionSearcher
+{
+    private PositionSearcher()
+    {
+    }
+
+    /**
+     * @param startPosition - inclusive
+     * @param endPosition - exclusive
+     * @param comparator - returns true if positions given as parameters are equal
+     * @return the end of the group position exclusive
+     */
+    public static int findEndPosition(int startPosition, int endPosition, PositionComparator comparator)
+    {
+        checkArgument(startPosition >= 0, "startPosition must be greater or equal than zero: %s", startPosition);
+        checkArgument(startPosition < endPosition, "startPosition (%s) must be less than endPosition (%s)", startPosition, endPosition);
+
+        // exponential search to find the range enclosing the searched position, optimized for small partitions
+        // use long to avoid int overflow
+        long left;
+        long right = startPosition;
+        long distance = 1;
+        do {
+            left = right;
+            right += distance;
+            distance *= 2;
+        }
+        while (right < endPosition && comparator.test(toIntExact(left), toIntExact(right)));
+
+        // binary search to find the searched position within the range
+        // intLeft is always a position within the group
+        int intLeft = toIntExact(left);
+        // intRight is always a position out of the group
+        int intRight = toIntExact(min(right, endPosition));
+
+        while (intRight - intLeft > 1) {
+            int middle = (intLeft + intRight) >>> 1;
+
+            if (comparator.test(startPosition, middle)) {
+                intLeft = middle;
+            }
+            else {
+                intRight = middle;
+            }
+        }
+        // the returned value is the first position out of the group
+        return intRight;
+    }
+
+    public interface PositionComparator
+    {
+        boolean test(int first, int second);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/ReferenceCount.java b/core/trino-main/src/main/java/io/trino/operator/ReferenceCount.java
index aa6e5f70f50a..55f96fdb4ceb 100644
--- a/core/trino-main/src/main/java/io/trino/operator/ReferenceCount.java
+++ b/core/trino-main/src/main/java/io/trino/operator/ReferenceCount.java
@@ -15,9 +15,8 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
diff --git a/core/trino-main/src/main/java/io/trino/operator/RefreshMaterializedViewOperator.java b/core/trino-main/src/main/java/io/trino/operator/RefreshMaterializedViewOperator.java
index be287edee9c6..6a17fb3c92f3 100644
--- a/core/trino-main/src/main/java/io/trino/operator/RefreshMaterializedViewOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/RefreshMaterializedViewOperator.java
@@ -18,8 +18,7 @@
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.spi.Page;
 import io.trino.sql.planner.plan.PlanNodeId;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.concurrent.MoreFutures.getDone;
diff --git a/core/trino-main/src/main/java/io/trino/operator/RegularTableFunctionPartition.java b/core/trino-main/src/main/java/io/trino/operator/RegularTableFunctionPartition.java
index cd17c4ae6d53..4403db6116d6 100644
--- a/core/trino-main/src/main/java/io/trino/operator/RegularTableFunctionPartition.java
+++ b/core/trino-main/src/main/java/io/trino/operator/RegularTableFunctionPartition.java
@@ -22,10 +22,10 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.RunLengthEncodedBlock;
-import io.trino.spi.ptf.TableFunctionDataProcessor;
-import io.trino.spi.ptf.TableFunctionProcessorState;
-import io.trino.spi.ptf.TableFunctionProcessorState.Blocked;
-import io.trino.spi.ptf.TableFunctionProcessorState.Processed;
+import io.trino.spi.function.table.TableFunctionDataProcessor;
+import io.trino.spi.function.table.TableFunctionProcessorState;
+import io.trino.spi.function.table.TableFunctionProcessorState.Blocked;
+import io.trino.spi.function.table.TableFunctionProcessorState.Processed;
 import io.trino.spi.type.Type;
 
 import java.util.Arrays;
@@ -42,7 +42,7 @@
 import static com.google.common.util.concurrent.Futures.immediateFuture;
 import static io.airlift.concurrent.MoreFutures.toListenableFuture;
 import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_ERROR;
-import static io.trino.spi.ptf.TableFunctionProcessorState.Finished.FINISHED;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Finished.FINISHED;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static java.lang.Math.min;
 import static java.lang.Math.toIntExact;
diff --git a/core/trino-main/src/main/java/io/trino/operator/RowNumberOperator.java b/core/trino-main/src/main/java/io/trino/operator/RowNumberOperator.java
index 320bfd3447a3..ff3b084db483 100644
--- a/core/trino-main/src/main/java/io/trino/operator/RowNumberOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/RowNumberOperator.java
@@ -25,7 +25,6 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
 import java.util.Optional;
@@ -55,7 +54,6 @@ public static class RowNumberOperatorFactory
         private final int expectedPositions;
         private boolean closed;
         private final JoinCompiler joinCompiler;
-        private final BlockTypeOperators blockTypeOperators;
 
         public RowNumberOperatorFactory(
                 int operatorId,
@@ -67,8 +65,7 @@ public RowNumberOperatorFactory(
                 Optional<Integer> maxRowsPerPartition,
                 Optional<Integer> hashChannel,
                 int expectedPositions,
-                JoinCompiler joinCompiler,
-                BlockTypeOperators blockTypeOperators)
+                JoinCompiler joinCompiler)
         {
             this.operatorId = operatorId;
             this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
@@ -82,7 +79,6 @@ public RowNumberOperatorFactory(
             checkArgument(expectedPositions > 0, "expectedPositions < 0");
             this.expectedPositions = expectedPositions;
             this.joinCompiler = requireNonNull(joinCompiler, "joinCompiler is null");
-            this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
         }
 
         @Override
@@ -100,8 +96,7 @@ public Operator createOperator(DriverContext driverContext)
                     maxRowsPerPartition,
                     hashChannel,
                     expectedPositions,
-                    joinCompiler,
-                    blockTypeOperators);
+                    joinCompiler);
         }
 
         @Override
@@ -113,7 +108,17 @@ public void noMoreOperators()
         @Override
         public OperatorFactory duplicate()
         {
-            return new RowNumberOperatorFactory(operatorId, planNodeId, sourceTypes, outputChannels, partitionChannels, partitionTypes, maxRowsPerPartition, hashChannel, expectedPositions, joinCompiler, blockTypeOperators);
+            return new RowNumberOperatorFactory(
+                    operatorId,
+                    planNodeId,
+                    sourceTypes,
+                    outputChannels,
+                    partitionChannels,
+                    partitionTypes,
+                    maxRowsPerPartition,
+                    hashChannel,
+                    expectedPositions,
+                    joinCompiler);
         }
     }
 
@@ -124,7 +129,8 @@ public OperatorFactory duplicate()
     private final int[] outputChannels;
     private final List<Type> types;
 
-    private GroupByIdBlock partitionIds;
+    private int[] partitionIds;
+    private int[] groupByChannels;
     private final Optional<GroupByHash> groupByHash;
 
     private Page inputPage;
@@ -135,7 +141,7 @@ public OperatorFactory duplicate()
     private final Optional<PageBuilder> selectedRowPageBuilder;
 
     // for yield when memory is not available
-    private Work<GroupByIdBlock> unfinishedWork;
+    private Work<int[]> unfinishedWork;
 
     public RowNumberOperator(
             OperatorContext operatorContext,
@@ -146,8 +152,7 @@ public RowNumberOperator(
             Optional<Integer> maxRowsPerPartition,
             Optional<Integer> hashChannel,
             int expectedPositions,
-            JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators)
+            JoinCompiler joinCompiler)
     {
         this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
         this.localUserMemoryContext = operatorContext.localUserMemoryContext();
@@ -167,8 +172,23 @@ public RowNumberOperator(
             this.groupByHash = Optional.empty();
         }
         else {
-            int[] channels = Ints.toArray(partitionChannels);
-            this.groupByHash = Optional.of(createGroupByHash(operatorContext.getSession(), partitionTypes, channels, hashChannel, expectedPositions, joinCompiler, blockTypeOperators, this::updateMemoryReservation));
+            if (hashChannel.isPresent()) {
+                this.groupByChannels = new int[partitionChannels.size() + 1];
+                for (int i = 0; i < partitionChannels.size(); i++) {
+                    this.groupByChannels[i] = partitionChannels.get(i);
+                }
+                this.groupByChannels[partitionChannels.size()] = hashChannel.get();
+            }
+            else {
+                this.groupByChannels = Ints.toArray(partitionChannels);
+            }
+            this.groupByHash = Optional.of(createGroupByHash(
+                    operatorContext.getSession(),
+                    partitionTypes,
+                    hashChannel.isPresent(),
+                    expectedPositions,
+                    joinCompiler,
+                    this::updateMemoryReservation));
         }
     }
 
@@ -215,7 +235,7 @@ public void addInput(Page page)
         checkState(!hasUnfinishedInput());
         inputPage = page;
         if (groupByHash.isPresent()) {
-            unfinishedWork = groupByHash.get().getGroupIds(inputPage);
+            unfinishedWork = groupByHash.get().getGroupIds(inputPage.getColumns(groupByChannels));
             processUnfinishedWork();
         }
         updateMemoryReservation();
@@ -275,7 +295,7 @@ private boolean processUnfinishedWork()
             return false;
         }
         partitionIds = unfinishedWork.getResult();
-        partitionRowCount.ensureCapacity(partitionIds.getGroupCount());
+        partitionRowCount.ensureCapacity(groupByHash.orElseThrow().getGroupCount());
         unfinishedWork = null;
         return true;
     }
@@ -342,7 +362,7 @@ private Page getSelectedRows()
 
     private long getPartitionId(int position)
     {
-        return isSinglePartition() ? 0 : partitionIds.getGroupId(position);
+        return isSinglePartition() ? 0 : partitionIds[position];
     }
 
     private static List<Type> toTypes(List<? extends Type> sourceTypes, List<Integer> outputChannels)
diff --git a/core/trino-main/src/main/java/io/trino/operator/RowReferencePageManager.java b/core/trino-main/src/main/java/io/trino/operator/RowReferencePageManager.java
index f5044b5d6b8b..cce070a08cee 100644
--- a/core/trino-main/src/main/java/io/trino/operator/RowReferencePageManager.java
+++ b/core/trino-main/src/main/java/io/trino/operator/RowReferencePageManager.java
@@ -20,8 +20,7 @@
 import io.trino.util.LongBigArrayFIFOQueue;
 import it.unimi.dsi.fastutil.ints.IntIterator;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 
@@ -35,7 +34,7 @@
  * built against these row IDs, while still enabling bulk memory optimizations such as compaction and lazy loading
  * behind the scenes. Callers are responsible for explicitly de-referencing any rows that are no longer needed.
  */
-public class RowReferencePageManager
+public final class RowReferencePageManager
 {
     private static final long INSTANCE_SIZE = instanceSize(RowReferencePageManager.class);
     private static final long PAGE_ACCOUNTING_INSTANCE_SIZE = instanceSize(PageAccounting.class);
@@ -50,14 +49,19 @@ public class RowReferencePageManager
     private long pageBytes;
 
     public LoadCursor add(Page page)
+    {
+        return add(page, 0);
+    }
+
+    public LoadCursor add(Page page, int startingPosition)
     {
         checkState(currentCursor == null, "Cursor still active");
+        checkArgument(startingPosition >= 0 && startingPosition <= page.getPositionCount(), "invalid startingPosition: %s", startingPosition);
 
-        int pageId = pages.allocateId(id -> new PageAccounting(id, page));
-        PageAccounting pageAccounting = pages.get(pageId);
+        PageAccounting pageAccounting = pages.allocateId(id -> new PageAccounting(id, page));
 
         pageAccounting.lockPage();
-        currentCursor = new LoadCursor(pageAccounting, () -> {
+        currentCursor = new LoadCursor(pageAccounting, startingPosition, () -> {
             // Initiate additional actions on close
             checkState(currentCursor != null);
             pageAccounting.unlockPage();
@@ -157,17 +161,18 @@ public long sizeOf()
      * be preserved with a stable row ID. Row ID generation can be expensive in tight loops, so this allows callers to
      * quickly skip positions that won't be needed.
      */
-    public static class LoadCursor
+    public static final class LoadCursor
             implements RowReference, AutoCloseable
     {
         private final PageAccounting pageAccounting;
         private final Runnable closeCallback;
 
-        private int currentPosition = -1;
+        private int currentPosition;
 
-        private LoadCursor(PageAccounting pageAccounting, Runnable closeCallback)
+        private LoadCursor(PageAccounting pageAccounting, int startingPosition, Runnable closeCallback)
         {
             this.pageAccounting = pageAccounting;
+            this.currentPosition = startingPosition - 1;
             this.closeCallback = closeCallback;
         }
 
@@ -226,7 +231,7 @@ public void close()
         }
     }
 
-    private class PageAccounting
+    private final class PageAccounting
     {
         private static final int COMPACTION_MIN_FILL_MULTIPLIER = 2;
 
@@ -331,19 +336,19 @@ public void compact()
             int newIndex = 0;
             int[] positionsToKeep = new int[activePositions];
             long[] newRowIds = new long[activePositions];
-            for (int i = 0; i < page.getPositionCount(); i++) {
+            for (int i = 0; i < page.getPositionCount() && newIndex < positionsToKeep.length; i++) {
                 long rowId = rowIds[i];
-                if (rowId != RowIdBuffer.UNKNOWN_ID) {
-                    positionsToKeep[newIndex] = i;
-                    newRowIds[newIndex] = rowId;
-                    rowIdBuffer.setPosition(rowId, newIndex);
-                    newIndex++;
-                }
+                positionsToKeep[newIndex] = i;
+                newRowIds[newIndex] = rowId;
+                newIndex += rowId == RowIdBuffer.UNKNOWN_ID ? 0 : 1;
             }
             verify(newIndex == activePositions);
+            for (int i = 0; i < newRowIds.length; i++) {
+                rowIdBuffer.setPosition(newRowIds[i], i);
+            }
 
             // Compact page
-            page = page.copyPositions(positionsToKeep, 0, activePositions);
+            page = page.copyPositions(positionsToKeep, 0, positionsToKeep.length);
             rowIds = newRowIds;
         }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/ScanFilterAndProjectOperator.java b/core/trino-main/src/main/java/io/trino/operator/ScanFilterAndProjectOperator.java
index 8d0a1e5d911c..c04e5ffca005 100644
--- a/core/trino-main/src/main/java/io/trino/operator/ScanFilterAndProjectOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/ScanFilterAndProjectOperator.java
@@ -45,8 +45,7 @@
 import io.trino.split.EmptySplit;
 import io.trino.split.PageSourceProvider;
 import io.trino.sql.planner.plan.PlanNodeId;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -491,33 +490,33 @@ public SourceOperator createOperator(DriverContext driverContext)
 
         @Override
         public WorkProcessorSourceOperator create(
-                Session session,
+                OperatorContext operatorContext,
                 MemoryTrackingContext memoryTrackingContext,
                 DriverYieldSignal yieldSignal,
                 WorkProcessor<Split> splits)
         {
-            return create(session, memoryTrackingContext, yieldSignal, splits, true);
+            return create(operatorContext, memoryTrackingContext, yieldSignal, splits, true);
         }
 
         @Override
         public WorkProcessorSourceOperator createAdapterOperator(
-                Session session,
+                OperatorContext operatorContext,
                 MemoryTrackingContext memoryTrackingContext,
                 DriverYieldSignal yieldSignal,
                 WorkProcessor<Split> splits)
         {
-            return create(session, memoryTrackingContext, yieldSignal, splits, false);
+            return create(operatorContext, memoryTrackingContext, yieldSignal, splits, false);
         }
 
         private ScanFilterAndProjectOperator create(
-                Session session,
+                OperatorContext operatorContext,
                 MemoryTrackingContext memoryTrackingContext,
                 DriverYieldSignal yieldSignal,
                 WorkProcessor<Split> splits,
                 boolean avoidPageMaterialization)
         {
             return new ScanFilterAndProjectOperator(
-                    session,
+                    operatorContext.getSession(),
                     memoryTrackingContext,
                     yieldSignal,
                     splits,
diff --git a/core/trino-main/src/main/java/io/trino/operator/SetBuilderOperator.java b/core/trino-main/src/main/java/io/trino/operator/SetBuilderOperator.java
index c2273d9d6599..6345a68ccd95 100644
--- a/core/trino-main/src/main/java/io/trino/operator/SetBuilderOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/SetBuilderOperator.java
@@ -13,18 +13,15 @@
  */
 package io.trino.operator;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.operator.ChannelSet.ChannelSetBuilder;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.type.BlockTypeOperators;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
 
 import java.util.Optional;
 
@@ -74,7 +71,7 @@ public static class SetBuilderOperatorFactory
         private final int expectedPositions;
         private boolean closed;
         private final JoinCompiler joinCompiler;
-        private final BlockTypeOperators blockTypeOperators;
+        private final TypeOperators typeOperators;
 
         public SetBuilderOperatorFactory(
                 int operatorId,
@@ -84,7 +81,7 @@ public SetBuilderOperatorFactory(
                 Optional<Integer> hashChannel,
                 int expectedPositions,
                 JoinCompiler joinCompiler,
-                BlockTypeOperators blockTypeOperators)
+                TypeOperators typeOperators)
         {
             this.operatorId = operatorId;
             this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
@@ -94,7 +91,7 @@ public SetBuilderOperatorFactory(
             this.hashChannel = requireNonNull(hashChannel, "hashChannel is null");
             this.expectedPositions = expectedPositions;
             this.joinCompiler = requireNonNull(joinCompiler, "joinCompiler is null");
-            this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
+            this.typeOperators = requireNonNull(typeOperators, "blockTypeOperators is null");
         }
 
         public SetSupplier getSetProvider()
@@ -107,7 +104,7 @@ public Operator createOperator(DriverContext driverContext)
         {
             checkState(!closed, "Factory is already closed");
             OperatorContext operatorContext = driverContext.addOperatorContext(operatorId, planNodeId, SetBuilderOperator.class.getSimpleName());
-            return new SetBuilderOperator(operatorContext, setProvider, setChannel, hashChannel, expectedPositions, joinCompiler, blockTypeOperators);
+            return new SetBuilderOperator(operatorContext, setProvider, setChannel, hashChannel, expectedPositions, joinCompiler, typeOperators);
         }
 
         @Override
@@ -119,21 +116,19 @@ public void noMoreOperators()
         @Override
         public OperatorFactory duplicate()
         {
-            return new SetBuilderOperatorFactory(operatorId, planNodeId, setProvider.getType(), setChannel, hashChannel, expectedPositions, joinCompiler, blockTypeOperators);
+            return new SetBuilderOperatorFactory(operatorId, planNodeId, setProvider.getType(), setChannel, hashChannel, expectedPositions, joinCompiler, typeOperators);
         }
     }
 
     private final OperatorContext operatorContext;
     private final SetSupplier setSupplier;
-    private final int[] sourceChannels;
+    private final int setChannel;
+    private final int hashChannel;
 
     private final ChannelSetBuilder channelSetBuilder;
 
     private boolean finished;
 
-    @Nullable
-    private Work<?> unfinishedWork;  // The pending work for current page.
-
     public SetBuilderOperator(
             OperatorContext operatorContext,
             SetSupplier setSupplier,
@@ -141,26 +136,18 @@ public SetBuilderOperator(
             Optional<Integer> hashChannel,
             int expectedPositions,
             JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators)
+            TypeOperators typeOperators)
     {
         this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
         this.setSupplier = requireNonNull(setSupplier, "setSupplier is null");
 
-        if (hashChannel.isPresent()) {
-            this.sourceChannels = new int[] {setChannel, hashChannel.get()};
-        }
-        else {
-            this.sourceChannels = new int[] {setChannel};
-        }
-        // Set builder is has a single channel which goes in channel 0, if hash is present, add a hachBlock to channel 1
-        Optional<Integer> channelSetHashChannel = hashChannel.isPresent() ? Optional.of(1) : Optional.empty();
+        this.setChannel = setChannel;
+        this.hashChannel = hashChannel.orElse(-1);
+
+        // Set builder has a single channel which goes in channel 0, if hash is present, add a hashBlock to channel 1
         this.channelSetBuilder = new ChannelSetBuilder(
                 setSupplier.getType(),
-                channelSetHashChannel,
-                expectedPositions,
-                requireNonNull(operatorContext, "operatorContext is null"),
-                requireNonNull(joinCompiler, "joinCompiler is null"),
-                requireNonNull(blockTypeOperators, "blockTypeOperators is null"));
+                requireNonNull(typeOperators, "typeOperators is null"), operatorContext.localUserMemoryContext());
     }
 
     @Override
@@ -192,9 +179,8 @@ public boolean isFinished()
     public boolean needsInput()
     {
         // Since SetBuilderOperator doesn't produce any output, the getOutput()
-        // method may never be called. We need to handle any unfinished work
-        // before addInput() can be called again.
-        return !finished && (unfinishedWork == null || processUnfinishedWork());
+        // method may never be called.
+        return !finished;
     }
 
     @Override
@@ -203,8 +189,7 @@ public void addInput(Page page)
         requireNonNull(page, "page is null");
         checkState(!isFinished(), "Operator is already finished");
 
-        unfinishedWork = channelSetBuilder.addPage(page.getColumns(sourceChannels));
-        processUnfinishedWork();
+        channelSetBuilder.addAll(page.getBlock(setChannel), hashChannel == -1 ? null : page.getBlock(hashChannel));
     }
 
     @Override
@@ -212,24 +197,4 @@ public Page getOutput()
     {
         return null;
     }
-
-    private boolean processUnfinishedWork()
-    {
-        // Processes the unfinishedWork for this page by adding the data to the hash table. If this page
-        // can't be fully consumed (e.g. rehashing fails), the unfinishedWork will be left with non-empty value.
-        checkState(unfinishedWork != null, "unfinishedWork is empty");
-        boolean done = unfinishedWork.process();
-        if (done) {
-            unfinishedWork = null;
-        }
-        // We need to update the memory reservation again since the page builder memory may also be increasing.
-        channelSetBuilder.updateMemoryReservation();
-        return done;
-    }
-
-    @VisibleForTesting
-    public int getCapacity()
-    {
-        return channelSetBuilder.getCapacity();
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/SpatialJoinOperator.java b/core/trino-main/src/main/java/io/trino/operator/SpatialJoinOperator.java
index 1f8d4212537a..7621e3204a10 100644
--- a/core/trino-main/src/main/java/io/trino/operator/SpatialJoinOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/SpatialJoinOperator.java
@@ -22,8 +22,7 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.planner.plan.SpatialJoinNode;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/operator/StreamingAggregationOperator.java b/core/trino-main/src/main/java/io/trino/operator/StreamingAggregationOperator.java
index 0706e416c1ad..3afe0164304b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/StreamingAggregationOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/StreamingAggregationOperator.java
@@ -28,8 +28,7 @@
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Deque;
 import java.util.LinkedList;
diff --git a/core/trino-main/src/main/java/io/trino/operator/StreamingDirectExchangeBuffer.java b/core/trino-main/src/main/java/io/trino/operator/StreamingDirectExchangeBuffer.java
index 770bb306f569..3bd36377402a 100644
--- a/core/trino-main/src/main/java/io/trino/operator/StreamingDirectExchangeBuffer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/StreamingDirectExchangeBuffer.java
@@ -15,14 +15,13 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
 import io.airlift.units.DataSize;
 import io.trino.execution.TaskId;
 import io.trino.spi.TrinoException;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.util.ArrayDeque;
 import java.util.HashSet;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/operator/TableDeleteOperator.java b/core/trino-main/src/main/java/io/trino/operator/TableDeleteOperator.java
deleted file mode 100644
index dbb5a19ffe8b..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/TableDeleteOperator.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed 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 io.trino.operator;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.Session;
-import io.trino.metadata.Metadata;
-import io.trino.metadata.TableHandle;
-import io.trino.spi.Page;
-import io.trino.spi.PageBuilder;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-import io.trino.sql.planner.plan.PlanNodeId;
-
-import java.util.List;
-import java.util.OptionalLong;
-
-import static com.google.common.base.Preconditions.checkState;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static java.util.Objects.requireNonNull;
-
-public class TableDeleteOperator
-        implements Operator
-{
-    public static final List<Type> TYPES = ImmutableList.of(BIGINT);
-
-    public static class TableDeleteOperatorFactory
-            implements OperatorFactory
-    {
-        private final int operatorId;
-        private final PlanNodeId planNodeId;
-        private final Metadata metadata;
-        private final Session session;
-        private final TableHandle tableHandle;
-        private boolean closed;
-
-        public TableDeleteOperatorFactory(int operatorId, PlanNodeId planNodeId, Metadata metadata, Session session, TableHandle tableHandle)
-        {
-            this.operatorId = operatorId;
-            this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
-            this.metadata = requireNonNull(metadata, "metadata is null");
-            this.session = requireNonNull(session, "session is null");
-            this.tableHandle = requireNonNull(tableHandle, "tableHandle is null");
-        }
-
-        @Override
-        public Operator createOperator(DriverContext driverContext)
-        {
-            checkState(!closed, "Factory is already closed");
-            OperatorContext context = driverContext.addOperatorContext(operatorId, planNodeId, TableDeleteOperator.class.getSimpleName());
-            return new TableDeleteOperator(context, metadata, session, tableHandle);
-        }
-
-        @Override
-        public void noMoreOperators()
-        {
-            closed = true;
-        }
-
-        @Override
-        public OperatorFactory duplicate()
-        {
-            return new TableDeleteOperatorFactory(operatorId, planNodeId, metadata, session, tableHandle);
-        }
-    }
-
-    private final OperatorContext operatorContext;
-    private final Metadata metadata;
-    private final Session session;
-    private final TableHandle tableHandle;
-
-    private boolean finished;
-
-    public TableDeleteOperator(OperatorContext operatorContext, Metadata metadata, Session session, TableHandle tableHandle)
-    {
-        this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
-        this.metadata = requireNonNull(metadata, "metadata is null");
-        this.session = requireNonNull(session, "session is null");
-        this.tableHandle = requireNonNull(tableHandle, "tableHandle is null");
-    }
-
-    @Override
-    public OperatorContext getOperatorContext()
-    {
-        return operatorContext;
-    }
-
-    @Override
-    public void finish()
-    {
-    }
-
-    @Override
-    public boolean isFinished()
-    {
-        return finished;
-    }
-
-    @Override
-    public boolean needsInput()
-    {
-        return false;
-    }
-
-    @Override
-    public void addInput(Page page)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Page getOutput()
-    {
-        if (finished) {
-            return null;
-        }
-        finished = true;
-
-        OptionalLong rowsDeletedCount = metadata.executeDelete(session, tableHandle);
-
-        // output page will only be constructed once,
-        // so a new PageBuilder is constructed (instead of using PageBuilder.reset)
-        PageBuilder page = new PageBuilder(1, TYPES);
-        BlockBuilder rowsBuilder = page.getBlockBuilder(0);
-        page.declarePosition();
-        if (rowsDeletedCount.isPresent()) {
-            BIGINT.writeLong(rowsBuilder, rowsDeletedCount.getAsLong());
-        }
-        else {
-            rowsBuilder.appendNull();
-        }
-        return page.build();
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/TableFunctionOperator.java b/core/trino-main/src/main/java/io/trino/operator/TableFunctionOperator.java
index 1ef03c71212f..7172673412a6 100644
--- a/core/trino-main/src/main/java/io/trino/operator/TableFunctionOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/TableFunctionOperator.java
@@ -13,7 +13,6 @@
  */
 package io.trino.operator;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -24,8 +23,8 @@
 import io.trino.operator.RegularTableFunctionPartition.PassThroughColumnSpecification;
 import io.trino.spi.Page;
 import io.trino.spi.connector.SortOrder;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-import io.trino.spi.ptf.TableFunctionProcessorProvider;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.plan.PlanNodeId;
 
@@ -39,6 +38,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.concat;
+import static io.trino.operator.PositionSearcher.findEndPosition;
 import static io.trino.spi.connector.SortOrder.ASC_NULLS_LAST;
 import static java.util.Collections.nCopies;
 import static java.util.Objects.requireNonNull;
@@ -513,40 +513,6 @@ private static int findGroupEnd(PagesIndex pagesIndex, PagesHashStrategy pagesHa
         return findEndPosition(startPosition, pagesIndex.getPositionCount(), (firstPosition, secondPosition) -> pagesIndex.positionNotDistinctFromPosition(pagesHashStrategy, firstPosition, secondPosition));
     }
 
-    /**
-     * @param startPosition - inclusive
-     * @param endPosition - exclusive
-     * @param comparator - returns true if positions given as parameters are equal
-     * @return the end of the group position exclusive (the position the very next group starts)
-     */
-    @VisibleForTesting
-    static int findEndPosition(int startPosition, int endPosition, PositionComparator comparator)
-    {
-        checkArgument(startPosition >= 0, "startPosition must be greater or equal than zero: %s", startPosition);
-        checkArgument(startPosition < endPosition, "startPosition (%s) must be less than endPosition (%s)", startPosition, endPosition);
-
-        int left = startPosition;
-        int right = endPosition;
-
-        while (right - left > 1) {
-            int middle = (left + right) >>> 1;
-
-            if (comparator.test(startPosition, middle)) {
-                left = middle;
-            }
-            else {
-                right = middle;
-            }
-        }
-
-        return right;
-    }
-
-    private interface PositionComparator
-    {
-        boolean test(int first, int second);
-    }
-
     private WorkProcessor<TableFunctionPartition> pagesIndexToTableFunctionPartitions(
             PagesIndex pagesIndex,
             HashStrategies hashStrategies,
diff --git a/core/trino-main/src/main/java/io/trino/operator/TableMutationOperator.java b/core/trino-main/src/main/java/io/trino/operator/TableMutationOperator.java
new file mode 100644
index 000000000000..7c663af6525f
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/TableMutationOperator.java
@@ -0,0 +1,147 @@
+/*
+ * Licensed 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 io.trino.operator;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.spi.Page;
+import io.trino.spi.PageBuilder;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.Type;
+import io.trino.sql.planner.plan.PlanNodeId;
+
+import java.util.List;
+import java.util.OptionalLong;
+
+import static com.google.common.base.Preconditions.checkState;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static java.util.Objects.requireNonNull;
+
+public class TableMutationOperator
+        implements Operator
+{
+    public static final List<Type> TYPES = ImmutableList.of(BIGINT);
+
+    private final OperatorContext operatorContext;
+    private final Operation operation;
+    private boolean finished;
+
+    public static class TableMutationOperatorFactory
+            implements OperatorFactory
+    {
+        private final int operatorId;
+        private final PlanNodeId planNodeId;
+        private final Operation operation;
+        private boolean closed;
+
+        public TableMutationOperatorFactory(
+                int operatorId,
+                PlanNodeId planNodeId,
+                Operation operation)
+        {
+            this.operatorId = operatorId;
+            this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
+            this.operation = requireNonNull(operation, "operation is null");
+        }
+
+        @Override
+        public Operator createOperator(DriverContext driverContext)
+        {
+            checkState(!closed, "Factory is already closed");
+            OperatorContext context = driverContext.addOperatorContext(operatorId, planNodeId, TableMutationOperator.class.getSimpleName());
+            return new TableMutationOperator(context, operation);
+        }
+
+        @Override
+        public void noMoreOperators()
+        {
+            closed = true;
+        }
+
+        @Override
+        public OperatorFactory duplicate()
+        {
+            return new TableMutationOperatorFactory(
+                    operatorId,
+                    planNodeId,
+                    operation);
+        }
+    }
+
+    public TableMutationOperator(OperatorContext operatorContext, Operation operation)
+    {
+        this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
+        this.operation = requireNonNull(operation, "operation is null");
+    }
+
+    @Override
+    public OperatorContext getOperatorContext()
+    {
+        return operatorContext;
+    }
+
+    @Override
+    public void finish() {}
+
+    @Override
+    public boolean isFinished()
+    {
+        return finished;
+    }
+
+    @Override
+    public boolean needsInput()
+    {
+        return false;
+    }
+
+    @Override
+    public void addInput(Page page)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Page getOutput()
+    {
+        if (finished) {
+            return null;
+        }
+        finished = true;
+
+        OptionalLong rowsUpdatedCount = operation.execute();
+
+        return buildUpdatedCountPage(rowsUpdatedCount);
+    }
+
+    private Page buildUpdatedCountPage(OptionalLong count)
+    {
+        // output page will only be constructed once,
+        // so a new PageBuilder is constructed (instead of using PageBuilder.reset)
+        PageBuilder page = new PageBuilder(1, TYPES);
+        BlockBuilder rowsBuilder = page.getBlockBuilder(0);
+        page.declarePosition();
+        if (count.isPresent()) {
+            BIGINT.writeLong(rowsBuilder, count.getAsLong());
+        }
+        else {
+            rowsBuilder.appendNull();
+        }
+        return page.build();
+    }
+
+    public interface Operation
+    {
+        OptionalLong execute();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/TableScanOperator.java b/core/trino-main/src/main/java/io/trino/operator/TableScanOperator.java
index 4ffdb1481701..b2b663ddf46c 100644
--- a/core/trino-main/src/main/java/io/trino/operator/TableScanOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/TableScanOperator.java
@@ -18,7 +18,6 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import io.trino.Session;
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.memory.context.MemoryTrackingContext;
 import io.trino.metadata.Split;
@@ -31,8 +30,7 @@
 import io.trino.split.EmptySplit;
 import io.trino.split.PageSourceProvider;
 import io.trino.sql.planner.plan.PlanNodeId;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -51,6 +49,7 @@ public static class TableScanOperatorFactory
             implements SourceOperatorFactory, WorkProcessorSourceOperatorFactory
     {
         private final int operatorId;
+        private final PlanNodeId planNodeId;
         private final PlanNodeId sourceId;
         private final PageSourceProvider pageSourceProvider;
         private final TableHandle table;
@@ -60,6 +59,7 @@ public static class TableScanOperatorFactory
 
         public TableScanOperatorFactory(
                 int operatorId,
+                PlanNodeId planNodeId,
                 PlanNodeId sourceId,
                 PageSourceProvider pageSourceProvider,
                 TableHandle table,
@@ -67,6 +67,7 @@ public TableScanOperatorFactory(
                 DynamicFilter dynamicFilter)
         {
             this.operatorId = operatorId;
+            this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
             this.sourceId = requireNonNull(sourceId, "sourceId is null");
             this.pageSourceProvider = requireNonNull(pageSourceProvider, "pageSourceProvider is null");
             this.table = requireNonNull(table, "table is null");
@@ -89,7 +90,7 @@ public PlanNodeId getSourceId()
         @Override
         public PlanNodeId getPlanNodeId()
         {
-            return sourceId;
+            return planNodeId;
         }
 
         @Override
@@ -102,7 +103,7 @@ public String getOperatorType()
         public SourceOperator createOperator(DriverContext driverContext)
         {
             checkState(!closed, "Factory is already closed");
-            OperatorContext operatorContext = driverContext.addOperatorContext(operatorId, sourceId, getOperatorType());
+            OperatorContext operatorContext = driverContext.addOperatorContext(operatorId, planNodeId, getOperatorType());
             return new TableScanOperator(
                     operatorContext,
                     sourceId,
@@ -114,13 +115,13 @@ public SourceOperator createOperator(DriverContext driverContext)
 
         @Override
         public WorkProcessorSourceOperator create(
-                Session session,
+                OperatorContext operatorContext,
                 MemoryTrackingContext memoryTrackingContext,
                 DriverYieldSignal yieldSignal,
                 WorkProcessor<Split> splits)
         {
             return new TableScanWorkProcessorOperator(
-                    session,
+                    operatorContext.getSession(),
                     memoryTrackingContext,
                     splits,
                     pageSourceProvider,
@@ -137,7 +138,7 @@ public void noMoreOperators()
     }
 
     private final OperatorContext operatorContext;
-    private final PlanNodeId planNodeId;
+    private final PlanNodeId sourceId;
     private final PageSourceProvider pageSourceProvider;
     private final TableHandle table;
     private final List<ColumnHandle> columns;
@@ -158,14 +159,14 @@ public void noMoreOperators()
 
     public TableScanOperator(
             OperatorContext operatorContext,
-            PlanNodeId planNodeId,
+            PlanNodeId sourceId,
             PageSourceProvider pageSourceProvider,
             TableHandle table,
             Iterable<ColumnHandle> columns,
             DynamicFilter dynamicFilter)
     {
         this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
-        this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
+        this.sourceId = requireNonNull(sourceId, "planNodeId is null");
         this.pageSourceProvider = requireNonNull(pageSourceProvider, "pageSourceProvider is null");
         this.table = requireNonNull(table, "table is null");
         this.columns = ImmutableList.copyOf(requireNonNull(columns, "columns is null"));
@@ -182,7 +183,7 @@ public OperatorContext getOperatorContext()
     @Override
     public PlanNodeId getSourceId()
     {
-        return planNodeId;
+        return sourceId;
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/operator/TableScanWorkProcessorOperator.java b/core/trino-main/src/main/java/io/trino/operator/TableScanWorkProcessorOperator.java
index 49a620be8355..5df8b0f47d47 100644
--- a/core/trino-main/src/main/java/io/trino/operator/TableScanWorkProcessorOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/TableScanWorkProcessorOperator.java
@@ -34,8 +34,7 @@
 import io.trino.spi.metrics.Metrics;
 import io.trino.split.EmptySplit;
 import io.trino.split.PageSourceProvider;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/core/trino-main/src/main/java/io/trino/operator/TableWriterOperator.java b/core/trino-main/src/main/java/io/trino/operator/TableWriterOperator.java
index fbefc6f65f57..37619858e1e4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/TableWriterOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/TableWriterOperator.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.common.primitives.Ints;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.airlift.slice.Slice;
@@ -154,7 +155,7 @@ private enum State
     private final OperatorContext operatorContext;
     private final LocalMemoryContext pageSinkMemoryContext;
     private final ConnectorPageSink pageSink;
-    private final List<Integer> columnChannels;
+    private final int[] columnChannels;
     private final AtomicLong pageSinkPeakMemoryUsage = new AtomicLong();
     private final Operator statisticAggregationOperator;
     private final List<Type> types;
@@ -183,7 +184,7 @@ public TableWriterOperator(
         this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
         this.pageSinkMemoryContext = operatorContext.newLocalUserMemoryContext(TableWriterOperator.class.getSimpleName());
         this.pageSink = requireNonNull(pageSink, "pageSink is null");
-        this.columnChannels = requireNonNull(columnChannels, "columnChannels is null");
+        this.columnChannels = Ints.toArray(requireNonNull(columnChannels, "columnChannels is null"));
         this.statisticAggregationOperator = requireNonNull(statisticAggregationOperator, "statisticAggregationOperator is null");
         this.types = ImmutableList.copyOf(requireNonNull(types, "types is null"));
         this.statisticsCpuTimerEnabled = statisticsCpuTimerEnabled;
@@ -244,23 +245,20 @@ public void addInput(Page page)
         requireNonNull(page, "page is null");
         checkState(needsInput(), "Operator does not need input");
 
-        Block[] blocks = new Block[columnChannels.size()];
-        for (int outputChannel = 0; outputChannel < columnChannels.size(); outputChannel++) {
-            Block block = page.getBlock(columnChannels.get(outputChannel));
-            blocks[outputChannel] = block;
-        }
-
         OperationTimer timer = new OperationTimer(statisticsCpuTimerEnabled);
         statisticAggregationOperator.addInput(page);
         timer.end(statisticsTiming);
 
+        page = page.getColumns(columnChannels);
+
         ListenableFuture<Void> blockedOnAggregation = statisticAggregationOperator.isBlocked();
-        CompletableFuture<?> future = pageSink.appendPage(new Page(blocks));
+        CompletableFuture<?> future = pageSink.appendPage(page);
         updateMemoryUsage();
         ListenableFuture<?> blockedOnWrite = toListenableFuture(future);
         blocked = asVoid(allAsList(blockedOnAggregation, blockedOnWrite));
         rowCount += page.getPositionCount();
         updateWrittenBytes();
+        operatorContext.recordWriterInputDataSize(page.getSizeInBytes());
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/operator/TaskContext.java b/core/trino-main/src/main/java/io/trino/operator/TaskContext.java
index dc693037b66a..f0cfa007d5e1 100644
--- a/core/trino-main/src/main/java/io/trino/operator/TaskContext.java
+++ b/core/trino-main/src/main/java/io/trino/operator/TaskContext.java
@@ -18,6 +18,8 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.AtomicDouble;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.stats.CounterStat;
 import io.airlift.stats.GcMonitor;
 import io.airlift.units.DataSize;
@@ -39,9 +41,6 @@
 import io.trino.sql.planner.plan.DynamicFilterId;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -355,6 +354,16 @@ public CounterStat getOutputPositions()
         return stat;
     }
 
+    public long getWriterInputDataSize()
+    {
+        // Avoid using stream api due to performance reasons
+        long writerInputDataSize = 0;
+        for (PipelineContext context : pipelineContexts) {
+            writerInputDataSize += context.getWriterInputDataSize();
+        }
+        return writerInputDataSize;
+    }
+
     public long getPhysicalWrittenDataSize()
     {
         // Avoid using stream api for performance reasons
@@ -550,9 +559,12 @@ public TaskStats getTaskStats()
 
         synchronized (cumulativeMemoryLock) {
             long currentTimeNanos = System.nanoTime();
-            double sinceLastPeriodMillis = (currentTimeNanos - lastTaskStatCallNanos) / 1_000_000.0;
-            long averageUserMemoryForLastPeriod = (userMemory + lastUserMemoryReservation) / 2;
-            cumulativeUserMemory.addAndGet(averageUserMemoryForLastPeriod * sinceLastPeriodMillis);
+
+            if (lastTaskStatCallNanos != 0) {
+                double sinceLastPeriodMillis = (currentTimeNanos - lastTaskStatCallNanos) / 1_000_000.0;
+                long averageUserMemoryForLastPeriod = (userMemory + lastUserMemoryReservation) / 2;
+                cumulativeUserMemory.addAndGet(averageUserMemoryForLastPeriod * sinceLastPeriodMillis);
+            }
 
             lastTaskStatCallNanos = currentTimeNanos;
             lastUserMemoryReservation = userMemory;
@@ -600,6 +612,7 @@ public TaskStats getTaskStats()
                 succinctBytes(outputDataSize),
                 outputPositions,
                 new Duration(outputBlockedTime, NANOSECONDS).convertToMostSuccinctTimeUnit(),
+                succinctBytes(getWriterInputDataSize()),
                 succinctBytes(physicalWrittenDataSize),
                 getMaxWriterCount(),
                 fullGcCount,
@@ -631,6 +644,11 @@ public QueryContext getQueryContext()
         return queryContext;
     }
 
+    public DataSize getQueryMemoryReservation()
+    {
+        return DataSize.ofBytes(queryContext.getUserMemoryReservation());
+    }
+
     public LocalDynamicFiltersCollector getLocalDynamicFiltersCollector()
     {
         return localDynamicFiltersCollector;
diff --git a/core/trino-main/src/main/java/io/trino/operator/TaskStats.java b/core/trino-main/src/main/java/io/trino/operator/TaskStats.java
index 492634e2daf5..d5de839a9ea5 100644
--- a/core/trino-main/src/main/java/io/trino/operator/TaskStats.java
+++ b/core/trino-main/src/main/java/io/trino/operator/TaskStats.java
@@ -19,10 +19,9 @@
 import com.google.common.collect.ImmutableSet;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import jakarta.annotation.Nullable;
 import org.joda.time.DateTime;
 
-import javax.annotation.Nullable;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -84,6 +83,7 @@ public class TaskStats
 
     private final Duration outputBlockedTime;
 
+    private final DataSize writerInputDataSize;
     private final DataSize physicalWrittenDataSize;
     private final Optional<Integer> maxWriterCount;
 
@@ -134,6 +134,7 @@ public TaskStats(DateTime createTime, DateTime endTime)
                 0,
                 new Duration(0, MILLISECONDS),
                 DataSize.ofBytes(0),
+                DataSize.ofBytes(0),
                 Optional.empty(),
                 0,
                 new Duration(0, MILLISECONDS),
@@ -192,6 +193,7 @@ public TaskStats(
 
             @JsonProperty("outputBlockedTime") Duration outputBlockedTime,
 
+            @JsonProperty("writerInputDataSize") DataSize writerInputDataSize,
             @JsonProperty("physicalWrittenDataSize") DataSize physicalWrittenDataSize,
             @JsonProperty("writerCount") Optional<Integer> writerCount,
 
@@ -267,6 +269,7 @@ public TaskStats(
 
         this.outputBlockedTime = requireNonNull(outputBlockedTime, "outputBlockedTime is null");
 
+        this.writerInputDataSize = requireNonNull(writerInputDataSize, "writerInputDataSize is null");
         this.physicalWrittenDataSize = requireNonNull(physicalWrittenDataSize, "physicalWrittenDataSize is null");
         this.maxWriterCount = requireNonNull(writerCount, "writerCount is null");
 
@@ -492,6 +495,12 @@ public Duration getOutputBlockedTime()
         return outputBlockedTime;
     }
 
+    @JsonProperty
+    public DataSize getWriterInputDataSize()
+    {
+        return writerInputDataSize;
+    }
+
     @JsonProperty
     public DataSize getPhysicalWrittenDataSize()
     {
@@ -588,6 +597,7 @@ public TaskStats summarize()
                 outputDataSize,
                 outputPositions,
                 outputBlockedTime,
+                writerInputDataSize,
                 physicalWrittenDataSize,
                 maxWriterCount,
                 fullGcCount,
@@ -637,6 +647,7 @@ public TaskStats summarizeFinal()
                 outputDataSize,
                 outputPositions,
                 outputBlockedTime,
+                writerInputDataSize,
                 physicalWrittenDataSize,
                 maxWriterCount,
                 fullGcCount,
diff --git a/core/trino-main/src/main/java/io/trino/operator/TopNProcessor.java b/core/trino-main/src/main/java/io/trino/operator/TopNProcessor.java
index 92e10b236171..a57a360bed5e 100644
--- a/core/trino-main/src/main/java/io/trino/operator/TopNProcessor.java
+++ b/core/trino-main/src/main/java/io/trino/operator/TopNProcessor.java
@@ -19,8 +19,7 @@
 import io.trino.spi.connector.SortOrder;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Iterator;
 import java.util.List;
@@ -61,6 +60,7 @@ public TopNProcessor(
                     new SimplePageWithPositionComparator(types, sortChannels, sortOrders, typeOperators),
                     n,
                     false,
+                    new int[0],
                     new NoChannelGroupByHash());
         }
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/TopNRankingOperator.java b/core/trino-main/src/main/java/io/trino/operator/TopNRankingOperator.java
index 112ffb7dc4e9..5f08fb3ebcdb 100644
--- a/core/trino-main/src/main/java/io/trino/operator/TopNRankingOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/TopNRankingOperator.java
@@ -213,6 +213,18 @@ public TopNRankingOperator(
         checkArgument(maxPartialMemory.isEmpty() || !generateRanking, "no partial memory on final TopN");
         this.maxFlushableBytes = maxPartialMemory.map(DataSize::toBytes).orElse(Long.MAX_VALUE);
 
+        int[] groupByChannels;
+        if (hashChannel.isPresent()) {
+            groupByChannels = new int[partitionChannels.size() + 1];
+            for (int i = 0; i < partitionChannels.size(); i++) {
+                groupByChannels[i] = partitionChannels.get(i);
+            }
+            groupByChannels[partitionChannels.size()] = hashChannel.get();
+        }
+        else {
+            groupByChannels = Ints.toArray(partitionChannels);
+        }
+
         this.groupedTopNBuilderSupplier = getGroupedTopNBuilderSupplier(
                 rankingType,
                 ImmutableList.copyOf(sourceTypes),
@@ -222,40 +234,34 @@ public TopNRankingOperator(
                 generateRanking,
                 typeOperators,
                 blockTypeOperators,
+                groupByChannels,
                 getGroupByHashSupplier(
-                        partitionChannels,
                         expectedPositions,
                         partitionTypes,
-                        hashChannel,
+                        hashChannel.isPresent(),
                         operatorContext.getSession(),
                         joinCompiler,
-                        blockTypeOperators,
                         this::updateMemoryReservation));
     }
 
     private static Supplier<GroupByHash> getGroupByHashSupplier(
-            List<Integer> partitionChannels,
             int expectedPositions,
             List<Type> partitionTypes,
-            Optional<Integer> hashChannel,
+            boolean hasPrecomputedHash,
             Session session,
             JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators,
             UpdateMemory updateMemory)
     {
-        if (partitionChannels.isEmpty()) {
+        if (partitionTypes.isEmpty()) {
             return Suppliers.ofInstance(new NoChannelGroupByHash());
         }
         checkArgument(expectedPositions > 0, "expectedPositions must be > 0");
-        int[] channels = Ints.toArray(partitionChannels);
         return () -> createGroupByHash(
                 session,
                 partitionTypes,
-                channels,
-                hashChannel,
+                hasPrecomputedHash,
                 expectedPositions,
                 joinCompiler,
-                blockTypeOperators,
                 updateMemory);
     }
 
@@ -268,6 +274,7 @@ private static Supplier<GroupedTopNBuilder> getGroupedTopNBuilderSupplier(
             boolean generateRanking,
             TypeOperators typeOperators,
             BlockTypeOperators blockTypeOperators,
+            int[] groupByChannels,
             Supplier<GroupByHash> groupByHashSupplier)
     {
         if (rankingType == RankingType.ROW_NUMBER) {
@@ -277,6 +284,7 @@ private static Supplier<GroupedTopNBuilder> getGroupedTopNBuilderSupplier(
                     comparator,
                     maxRankingPerPartition,
                     generateRanking,
+                    groupByChannels,
                     groupByHashSupplier.get());
         }
         if (rankingType == RankingType.RANK) {
@@ -288,6 +296,7 @@ private static Supplier<GroupedTopNBuilder> getGroupedTopNBuilderSupplier(
                     equalsAndHash,
                     maxRankingPerPartition,
                     generateRanking,
+                    groupByChannels,
                     groupByHashSupplier.get());
         }
         if (rankingType == RankingType.DENSE_RANK) {
diff --git a/core/trino-main/src/main/java/io/trino/operator/TrinoOperatorFactories.java b/core/trino-main/src/main/java/io/trino/operator/TrinoOperatorFactories.java
deleted file mode 100644
index f28538f2833f..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/TrinoOperatorFactories.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed 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 io.trino.operator;
-
-import io.trino.operator.join.JoinBridgeManager;
-import io.trino.operator.join.JoinProbe.JoinProbeFactory;
-import io.trino.operator.join.LookupJoinOperatorFactory;
-import io.trino.operator.join.LookupSourceFactory;
-import io.trino.operator.join.unspilled.JoinProbe;
-import io.trino.operator.join.unspilled.PartitionedLookupSourceFactory;
-import io.trino.spi.type.Type;
-import io.trino.spiller.PartitioningSpillerFactory;
-import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.type.BlockTypeOperators;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.stream.IntStream;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-
-public class TrinoOperatorFactories
-        implements OperatorFactories
-{
-    @Override
-    public OperatorFactory join(
-            JoinOperatorType joinType,
-            int operatorId,
-            PlanNodeId planNodeId,
-            JoinBridgeManager<? extends PartitionedLookupSourceFactory> lookupSourceFactory,
-            boolean hasFilter,
-            List<Type> probeTypes,
-            List<Integer> probeJoinChannel,
-            OptionalInt probeHashChannel,
-            Optional<List<Integer>> probeOutputChannelsOptional,
-            BlockTypeOperators blockTypeOperators)
-    {
-        List<Integer> probeOutputChannels = probeOutputChannelsOptional.orElseGet(() -> rangeList(probeTypes.size()));
-        List<Type> probeOutputChannelTypes = probeOutputChannels.stream()
-                .map(probeTypes::get)
-                .collect(toImmutableList());
-
-        return new io.trino.operator.join.unspilled.LookupJoinOperatorFactory(
-                operatorId,
-                planNodeId,
-                lookupSourceFactory,
-                probeTypes,
-                probeOutputChannelTypes,
-                lookupSourceFactory.getBuildOutputTypes(),
-                joinType,
-                new JoinProbe.JoinProbeFactory(probeOutputChannels, probeJoinChannel, probeHashChannel),
-                blockTypeOperators,
-                probeJoinChannel,
-                probeHashChannel);
-    }
-
-    @Override
-    public OperatorFactory spillingJoin(
-            JoinOperatorType joinType,
-            int operatorId,
-            PlanNodeId planNodeId,
-            JoinBridgeManager<? extends LookupSourceFactory> lookupSourceFactory,
-            boolean hasFilter,
-            List<Type> probeTypes,
-            List<Integer> probeJoinChannel,
-            OptionalInt probeHashChannel,
-            Optional<List<Integer>> probeOutputChannelsOptional,
-            OptionalInt totalOperatorsCount,
-            PartitioningSpillerFactory partitioningSpillerFactory,
-            BlockTypeOperators blockTypeOperators)
-    {
-        List<Integer> probeOutputChannels = probeOutputChannelsOptional.orElseGet(() -> rangeList(probeTypes.size()));
-        List<Type> probeOutputChannelTypes = probeOutputChannels.stream()
-                .map(probeTypes::get)
-                .collect(toImmutableList());
-
-        return new LookupJoinOperatorFactory(
-                operatorId,
-                planNodeId,
-                lookupSourceFactory,
-                probeTypes,
-                probeOutputChannelTypes,
-                lookupSourceFactory.getBuildOutputTypes(),
-                joinType,
-                new JoinProbeFactory(probeOutputChannels.stream().mapToInt(i -> i).toArray(), probeJoinChannel, probeHashChannel),
-                blockTypeOperators,
-                totalOperatorsCount,
-                probeJoinChannel,
-                probeHashChannel,
-                partitioningSpillerFactory);
-    }
-
-    private static List<Integer> rangeList(int endExclusive)
-    {
-        return IntStream.range(0, endExclusive)
-                .boxed()
-                .collect(toImmutableList());
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/VariableWidthData.java b/core/trino-main/src/main/java/io/trino/operator/VariableWidthData.java
new file mode 100644
index 000000000000..8891d0c8ba49
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/VariableWidthData.java
@@ -0,0 +1,202 @@
+/*
+ * Licensed 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 io.trino.operator;
+
+import com.google.common.primitives.Ints;
+import io.airlift.slice.SizeOf;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.google.common.base.Verify.verify;
+import static io.airlift.slice.SizeOf.SIZE_OF_INT;
+import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.airlift.slice.SizeOf.sizeOfObjectArray;
+import static io.trino.operator.FlatHash.sumExact;
+import static java.lang.Math.addExact;
+import static java.lang.Math.max;
+import static java.lang.Math.subtractExact;
+import static java.util.Objects.checkIndex;
+
+public final class VariableWidthData
+{
+    private static final int INSTANCE_SIZE = instanceSize(VariableWidthData.class);
+
+    public static final int MIN_CHUNK_SIZE = 1024;
+    public static final int MAX_CHUNK_SIZE = 8 * 1024 * 1024;
+
+    public static final int POINTER_SIZE = SIZE_OF_INT + SIZE_OF_INT + SIZE_OF_INT;
+
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, ByteOrder.LITTLE_ENDIAN);
+    public static final byte[] EMPTY_CHUNK = new byte[0];
+
+    private final List<byte[]> chunks = new ArrayList<>();
+    private int openChunkOffset;
+
+    private long chunksRetainedSizeInBytes;
+
+    private long allocatedBytes;
+    private long freeBytes;
+
+    public VariableWidthData() {}
+
+    public VariableWidthData(VariableWidthData variableWidthData)
+    {
+        for (byte[] chunk : variableWidthData.chunks) {
+            chunks.add(Arrays.copyOf(chunk, chunk.length));
+        }
+        this.openChunkOffset = variableWidthData.openChunkOffset;
+
+        this.chunksRetainedSizeInBytes = variableWidthData.chunksRetainedSizeInBytes;
+
+        this.allocatedBytes = variableWidthData.allocatedBytes;
+        this.freeBytes = variableWidthData.freeBytes;
+    }
+
+    public VariableWidthData(List<byte[]> chunks, int openChunkOffset)
+    {
+        this.chunks.addAll(chunks);
+        this.openChunkOffset = openChunkOffset;
+        this.chunksRetainedSizeInBytes = chunks.stream().mapToLong(SizeOf::sizeOf).reduce(0L, Math::addExact);
+        this.allocatedBytes = chunks.stream().mapToLong(chunk -> chunk.length).sum();
+        this.freeBytes = 0;
+    }
+
+    public long getRetainedSizeBytes()
+    {
+        return sumExact(
+                INSTANCE_SIZE,
+                chunksRetainedSizeInBytes,
+                sizeOfObjectArray(chunks.size()));
+    }
+
+    public List<byte[]> getAllChunks()
+    {
+        return chunks;
+    }
+
+    public long getAllocatedBytes()
+    {
+        return allocatedBytes;
+    }
+
+    public long getFreeBytes()
+    {
+        return freeBytes;
+    }
+
+    public byte[] allocate(byte[] pointer, int pointerOffset, int size)
+    {
+        if (size == 0) {
+            writePointer(pointer, pointerOffset, 0, 0, 0);
+            return EMPTY_CHUNK;
+        }
+
+        byte[] openChunk = chunks.isEmpty() ? EMPTY_CHUNK : chunks.get(chunks.size() - 1);
+        if (openChunk.length - openChunkOffset < size) {
+            // record unused space as free bytes
+            freeBytes += (openChunk.length - openChunkOffset);
+
+            // allocate enough space for 32 values of the current size, or double the current chunk size, whichever is larger
+            int newSize = Ints.saturatedCast(max(size * 32L, openChunk.length * 2L));
+            // constrain to be between min and max chunk size
+            newSize = Ints.constrainToRange(newSize, MIN_CHUNK_SIZE, MAX_CHUNK_SIZE);
+            // jumbo rows get a separate allocation
+            newSize = max(newSize, size);
+            openChunk = new byte[newSize];
+            chunks.add(openChunk);
+            allocatedBytes += newSize;
+            chunksRetainedSizeInBytes = addExact(chunksRetainedSizeInBytes, sizeOf(openChunk));
+            openChunkOffset = 0;
+        }
+
+        writePointer(
+                pointer,
+                pointerOffset,
+                chunks.size() - 1,
+                openChunkOffset,
+                size);
+        openChunkOffset += size;
+        return openChunk;
+    }
+
+    public void free(byte[] pointer, int pointerOffset)
+    {
+        int valueLength = getValueLength(pointer, pointerOffset);
+        if (valueLength == 0) {
+            return;
+        }
+
+        int valueChunkIndex = getChunkIndex(pointer, pointerOffset);
+        byte[] valueChunk = chunks.get(valueChunkIndex);
+
+        // if this is the last value in the open byte[], then we can simply back up the open chunk offset
+        if (valueChunkIndex == chunks.size() - 1) {
+            int valueOffset = getChunkOffset(pointer, pointerOffset);
+            if (this.openChunkOffset - valueLength == valueOffset) {
+                this.openChunkOffset = valueOffset;
+                return;
+            }
+        }
+
+        // if this is the only value written to the chunk, we can simply replace the chunk with the empty chunk
+        if (valueLength == valueChunk.length) {
+            chunks.set(valueChunkIndex, EMPTY_CHUNK);
+            chunksRetainedSizeInBytes = subtractExact(chunksRetainedSizeInBytes, sizeOf(valueChunk));
+            allocatedBytes -= valueChunk.length;
+            return;
+        }
+
+        freeBytes += valueLength;
+    }
+
+    public byte[] getChunk(byte[] pointer, int pointerOffset)
+    {
+        int chunkIndex = getChunkIndex(pointer, pointerOffset);
+        if (chunks.isEmpty()) {
+            verify(chunkIndex == 0);
+            return EMPTY_CHUNK;
+        }
+        checkIndex(chunkIndex, chunks.size());
+        return chunks.get(chunkIndex);
+    }
+
+    private static int getChunkIndex(byte[] pointer, int pointerOffset)
+    {
+        return (int) INT_HANDLE.get(pointer, pointerOffset);
+    }
+
+    public static int getChunkOffset(byte[] pointer, int pointerOffset)
+    {
+        return (int) INT_HANDLE.get(pointer, pointerOffset + SIZE_OF_INT);
+    }
+
+    public static int getValueLength(byte[] pointer, int pointerOffset)
+    {
+        return (int) INT_HANDLE.get(pointer, pointerOffset + SIZE_OF_LONG);
+    }
+
+    public static void writePointer(byte[] pointer, int pointerOffset, int chunkIndex, int chunkOffset, int valueLength)
+    {
+        INT_HANDLE.set(pointer, pointerOffset, chunkIndex);
+        INT_HANDLE.set(pointer, pointerOffset + SIZE_OF_INT, chunkOffset);
+        INT_HANDLE.set(pointer, pointerOffset + SIZE_OF_LONG, valueLength);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/WindowInfo.java b/core/trino-main/src/main/java/io/trino/operator/WindowInfo.java
index ceaf8933aad0..6ad7d409afb8 100644
--- a/core/trino-main/src/main/java/io/trino/operator/WindowInfo.java
+++ b/core/trino-main/src/main/java/io/trino/operator/WindowInfo.java
@@ -16,11 +16,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.operator.window.WindowPartition;
 import io.trino.spi.Mergeable;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
@@ -102,7 +101,7 @@ public DriverWindowInfo build()
             long totalRowsCount = indexInfos.stream()
                     .mapToLong(IndexInfo::getTotalRowsCount)
                     .sum();
-            double averageIndexPositions = totalRowsCount / indexInfos.size();
+            double averageIndexPositions = (double) totalRowsCount / indexInfos.size();
             double squaredDifferencesPositionsOfIndex = indexInfos.stream()
                     .mapToDouble(index -> Math.pow(index.getTotalRowsCount() - averageIndexPositions, 2))
                     .sum();
@@ -219,7 +218,10 @@ public Optional<IndexInfo> build()
             }
             double avgSize = partitions.stream().mapToLong(Integer::longValue).average().getAsDouble();
             double squaredDifferences = partitions.stream().mapToDouble(size -> Math.pow(size - avgSize, 2)).sum();
-            checkState(partitions.stream().mapToLong(Integer::longValue).sum() == rowsNumber, "Total number of rows in index does not match number of rows in partitions within that index");
+            if (partitions.stream().mapToLong(Integer::longValue).sum() != rowsNumber) {
+                // when operator is cancelled, then rows in index might not match row count from processed partitions
+                return Optional.empty();
+            }
 
             return Optional.of(new IndexInfo(rowsNumber, sizeInBytes, squaredDifferences, partitions.size()));
         }
diff --git a/core/trino-main/src/main/java/io/trino/operator/WindowOperator.java b/core/trino-main/src/main/java/io/trino/operator/WindowOperator.java
index 7bc32aa40591..c51c3a609777 100644
--- a/core/trino-main/src/main/java/io/trino/operator/WindowOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/WindowOperator.java
@@ -13,7 +13,6 @@
  */
 package io.trino.operator;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -46,7 +45,6 @@
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.BiPredicate;
 import java.util.stream.Collectors;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -58,6 +56,7 @@
 import static com.google.common.collect.Iterators.peekingIterator;
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
 import static io.airlift.concurrent.MoreFutures.checkSuccess;
+import static io.trino.operator.PositionSearcher.findEndPosition;
 import static io.trino.operator.WorkProcessor.TransformationState.needsMoreData;
 import static io.trino.spi.connector.SortOrder.ASC_NULLS_LAST;
 import static io.trino.sql.tree.FrameBound.Type.FOLLOWING;
@@ -924,35 +923,6 @@ private static int findGroupEnd(PagesIndex pagesIndex, PagesHashStrategy pagesHa
         return findEndPosition(startPosition, pagesIndex.getPositionCount(), (firstPosition, secondPosition) -> pagesIndex.positionNotDistinctFromPosition(pagesHashStrategy, firstPosition, secondPosition));
     }
 
-    /**
-     * @param startPosition - inclusive
-     * @param endPosition - exclusive
-     * @param comparator - returns true if positions given as parameters are equal
-     * @return the end of the group position exclusive (the position the very next group starts)
-     */
-    @VisibleForTesting
-    static int findEndPosition(int startPosition, int endPosition, BiPredicate<Integer, Integer> comparator)
-    {
-        checkArgument(startPosition >= 0, "startPosition must be greater or equal than zero: %s", startPosition);
-        checkArgument(startPosition < endPosition, "startPosition (%s) must be less than endPosition (%s)", startPosition, endPosition);
-
-        int left = startPosition;
-        int right = endPosition;
-
-        while (left + 1 < right) {
-            int middle = (left + right) >>> 1;
-
-            if (comparator.test(startPosition, middle)) {
-                left = middle;
-            }
-            else {
-                right = middle;
-            }
-        }
-
-        return right;
-    }
-
     @Override
     public void close()
     {
diff --git a/core/trino-main/src/main/java/io/trino/operator/WorkProcessor.java b/core/trino-main/src/main/java/io/trino/operator/WorkProcessor.java
index 1fc142069a5a..b8662979dcf5 100644
--- a/core/trino-main/src/main/java/io/trino/operator/WorkProcessor.java
+++ b/core/trino-main/src/main/java/io/trino/operator/WorkProcessor.java
@@ -15,9 +15,8 @@
 
 import com.google.common.collect.Iterators;
 import com.google.common.util.concurrent.ListenableFuture;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.util.Comparator;
 import java.util.Iterator;
diff --git a/core/trino-main/src/main/java/io/trino/operator/WorkProcessorPipelineSourceOperator.java b/core/trino-main/src/main/java/io/trino/operator/WorkProcessorPipelineSourceOperator.java
index 46d2d2a6aa2b..b6ca026a3d5a 100644
--- a/core/trino-main/src/main/java/io/trino/operator/WorkProcessorPipelineSourceOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/WorkProcessorPipelineSourceOperator.java
@@ -32,10 +32,11 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.LocalExecutionPlanner.OperatorFactoryWithTypes;
 import io.trino.sql.planner.plan.PlanNodeId;
+import jakarta.annotation.Nullable;
 
-import javax.annotation.Nullable;
-
+import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Deque;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
@@ -71,7 +72,7 @@ public class WorkProcessorPipelineSourceOperator
     private final OperationTimer timer;
     // operator instances including source operator
     private final List<WorkProcessorOperatorContext> workProcessorOperatorContexts = new ArrayList<>();
-    private final List<Split> pendingSplits = new ArrayList<>();
+    private final Deque<Split> pendingSplits = new ArrayDeque<>();
 
     private ListenableFuture<Void> blockedFuture;
     private WorkProcessorSourceOperator sourceOperator;
@@ -144,7 +145,7 @@ private WorkProcessorPipelineSourceOperator(
         WorkProcessor<Split> splits = WorkProcessor.create(new Splits());
 
         sourceOperator = sourceOperatorFactory.create(
-                operatorContext.getSession(),
+                operatorContext,
                 sourceOperatorMemoryTrackingContext,
                 operatorContext.getDriverContext().getYieldSignal(),
                 splits);
@@ -502,7 +503,7 @@ public ProcessState<Split> process()
                 return ProcessState.blocked(blockedOnSplits);
             }
 
-            return ProcessState.ofResult(pendingSplits.remove(0));
+            return ProcessState.ofResult(pendingSplits.remove());
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/WorkProcessorSourceOperatorAdapter.java b/core/trino-main/src/main/java/io/trino/operator/WorkProcessorSourceOperatorAdapter.java
index 801154bac0da..7feb9a353985 100644
--- a/core/trino-main/src/main/java/io/trino/operator/WorkProcessorSourceOperatorAdapter.java
+++ b/core/trino-main/src/main/java/io/trino/operator/WorkProcessorSourceOperatorAdapter.java
@@ -16,15 +16,14 @@
 import com.google.common.base.Suppliers;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import io.trino.Session;
 import io.trino.memory.context.MemoryTrackingContext;
 import io.trino.metadata.Split;
 import io.trino.spi.Page;
 import io.trino.spi.metrics.Metrics;
 import io.trino.sql.planner.plan.PlanNodeId;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayDeque;
+import java.util.Deque;
 
 import static io.trino.operator.WorkProcessor.ProcessState.blocked;
 import static io.trino.operator.WorkProcessor.ProcessState.finished;
@@ -56,12 +55,12 @@ public interface AdapterWorkProcessorSourceOperatorFactory
             extends WorkProcessorSourceOperatorFactory
     {
         default WorkProcessorSourceOperator createAdapterOperator(
-                Session session,
+                OperatorContext operatorContext,
                 MemoryTrackingContext memoryTrackingContext,
                 DriverYieldSignal yieldSignal,
                 WorkProcessor<Split> splits)
         {
-            return create(session, memoryTrackingContext, yieldSignal, splits);
+            return create(operatorContext, memoryTrackingContext, yieldSignal, splits);
         }
     }
 
@@ -72,7 +71,7 @@ public WorkProcessorSourceOperatorAdapter(OperatorContext operatorContext, Adapt
         this.splitBuffer = new SplitBuffer();
         this.sourceOperator = sourceOperatorFactory
                 .createAdapterOperator(
-                        operatorContext.getSession(),
+                        operatorContext,
                         new MemoryTrackingContext(
                                 operatorContext.aggregateUserMemoryContext(),
                                 operatorContext.aggregateRevocableMemoryContext()),
@@ -237,7 +236,7 @@ private void updateOperatorStats()
     private static class SplitBuffer
             implements WorkProcessor.Process<Split>
     {
-        private final List<Split> pendingSplits = new ArrayList<>();
+        private final Deque<Split> pendingSplits = new ArrayDeque<>();
 
         private SettableFuture<Void> blockedOnSplits = SettableFuture.create();
         private boolean noMoreSplits;
@@ -254,7 +253,7 @@ public WorkProcessor.ProcessState<Split> process()
                 return blocked(blockedOnSplits);
             }
 
-            return ofResult(pendingSplits.remove(0));
+            return ofResult(pendingSplits.remove());
         }
 
         void add(Split split)
diff --git a/core/trino-main/src/main/java/io/trino/operator/WorkProcessorSourceOperatorFactory.java b/core/trino-main/src/main/java/io/trino/operator/WorkProcessorSourceOperatorFactory.java
index 04b4002f8d9f..6db14d8967f3 100644
--- a/core/trino-main/src/main/java/io/trino/operator/WorkProcessorSourceOperatorFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/WorkProcessorSourceOperatorFactory.java
@@ -13,7 +13,6 @@
  */
 package io.trino.operator;
 
-import io.trino.Session;
 import io.trino.memory.context.MemoryTrackingContext;
 import io.trino.metadata.Split;
 import io.trino.sql.planner.plan.PlanNodeId;
@@ -29,7 +28,7 @@ public interface WorkProcessorSourceOperatorFactory
     String getOperatorType();
 
     WorkProcessorSourceOperator create(
-            Session session,
+            OperatorContext operatorContext,
             MemoryTrackingContext memoryTrackingContext,
             DriverYieldSignal yieldSignal,
             WorkProcessor<Split> splits);
diff --git a/core/trino-main/src/main/java/io/trino/operator/WorkProcessorUtils.java b/core/trino-main/src/main/java/io/trino/operator/WorkProcessorUtils.java
index 5a06e4e1ca75..16c6aa33fadf 100644
--- a/core/trino-main/src/main/java/io/trino/operator/WorkProcessorUtils.java
+++ b/core/trino-main/src/main/java/io/trino/operator/WorkProcessorUtils.java
@@ -18,8 +18,7 @@
 import io.trino.operator.WorkProcessor.ProcessState;
 import io.trino.operator.WorkProcessor.Transformation;
 import io.trino.operator.WorkProcessor.TransformationState;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Comparator;
 import java.util.Iterator;
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AbstractGroupCollectionAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AbstractGroupCollectionAggregationState.java
deleted file mode 100644
index 569256552889..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/AbstractGroupCollectionAggregationState.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation;
-
-import io.trino.array.IntBigArray;
-import io.trino.array.ShortBigArray;
-import io.trino.operator.aggregation.state.AbstractGroupedAccumulatorState;
-import io.trino.spi.PageBuilder;
-import io.trino.spi.block.Block;
-import it.unimi.dsi.fastutil.longs.LongArrayList;
-import it.unimi.dsi.fastutil.longs.LongList;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.base.Verify.verify;
-import static io.airlift.slice.SizeOf.instanceSize;
-
-/**
- * Instances of this state use a single PageBuilder for all groups.
- */
-public abstract class AbstractGroupCollectionAggregationState<T>
-        extends AbstractGroupedAccumulatorState
-{
-    private static final int INSTANCE_SIZE = instanceSize(AbstractGroupCollectionAggregationState.class);
-    private static final int MAX_NUM_BLOCKS = 30000;
-    private static final short NULL = -1;
-
-    private final ShortBigArray headBlockIndex;
-    private final IntBigArray headPosition;
-
-    private final ShortBigArray nextBlockIndex;
-    private final IntBigArray nextPosition;
-
-    private final ShortBigArray tailBlockIndex;
-    private final IntBigArray tailPosition;
-
-    private final List<PageBuilder> values;
-    private final LongList sumPositions;
-    private final IntBigArray groupEntryCount;
-    private PageBuilder currentPageBuilder;
-
-    private long valueBlocksRetainedSizeInBytes;
-    private long totalPositions;
-    private long capacity;
-
-    protected AbstractGroupCollectionAggregationState(PageBuilder pageBuilder)
-    {
-        this.headBlockIndex = new ShortBigArray(NULL);
-        this.headPosition = new IntBigArray(NULL);
-        this.nextBlockIndex = new ShortBigArray(NULL);
-        this.nextPosition = new IntBigArray(NULL);
-        this.tailBlockIndex = new ShortBigArray(NULL);
-        this.tailPosition = new IntBigArray(NULL);
-
-        this.currentPageBuilder = pageBuilder;
-        this.values = new ArrayList<>();
-        this.sumPositions = new LongArrayList();
-        this.groupEntryCount = new IntBigArray();
-        values.add(currentPageBuilder);
-        sumPositions.add(0L);
-        valueBlocksRetainedSizeInBytes = 0;
-
-        totalPositions = 0;
-        capacity = 1024;
-        nextBlockIndex.ensureCapacity(capacity);
-        nextPosition.ensureCapacity(capacity);
-        groupEntryCount.ensureCapacity(capacity);
-    }
-
-    @Override
-    public void ensureCapacity(long size)
-    {
-        headBlockIndex.ensureCapacity(size);
-        headPosition.ensureCapacity(size);
-        tailBlockIndex.ensureCapacity(size);
-        tailPosition.ensureCapacity(size);
-        groupEntryCount.ensureCapacity(size);
-    }
-
-    @Override
-    public long getEstimatedSize()
-    {
-        return INSTANCE_SIZE +
-                headBlockIndex.sizeOf() +
-                headPosition.sizeOf() +
-                tailBlockIndex.sizeOf() +
-                tailPosition.sizeOf() +
-                nextBlockIndex.sizeOf() +
-                nextPosition.sizeOf() +
-                groupEntryCount.sizeOf() +
-                valueBlocksRetainedSizeInBytes +
-                // valueBlocksRetainedSizeInBytes doesn't contain the current block builder
-                currentPageBuilder.getRetainedSizeInBytes();
-    }
-
-    /**
-     * This method should be called before {@link #appendAtChannel(int, Block, int)} to update the internal linked list, where
-     * {@link #appendAtChannel(int, Block, int)} is called for each channel that has a new entry to be added.
-     */
-    protected final void prepareAdd()
-    {
-        if (currentPageBuilder.isFull()) {
-            valueBlocksRetainedSizeInBytes += currentPageBuilder.getRetainedSizeInBytes();
-            sumPositions.add(totalPositions);
-            currentPageBuilder = currentPageBuilder.newPageBuilderLike();
-            values.add(currentPageBuilder);
-
-            verify(values.size() <= MAX_NUM_BLOCKS);
-        }
-
-        long currentGroupId = getGroupId();
-        short insertedBlockIndex = (short) (values.size() - 1);
-        int insertedPosition = currentPageBuilder.getPositionCount();
-
-        if (totalPositions == capacity) {
-            capacity *= 1.5;
-            nextBlockIndex.ensureCapacity(capacity);
-            nextPosition.ensureCapacity(capacity);
-        }
-
-        if (isEmpty()) {
-            // new linked list, set up the header pointer
-            headBlockIndex.set(currentGroupId, insertedBlockIndex);
-            headPosition.set(currentGroupId, insertedPosition);
-        }
-        else {
-            // existing linked list, link the new entry to the tail
-            long absoluteTailAddress = toAbsolutePosition(tailBlockIndex.get(currentGroupId), tailPosition.get(currentGroupId));
-            nextBlockIndex.set(absoluteTailAddress, insertedBlockIndex);
-            nextPosition.set(absoluteTailAddress, insertedPosition);
-        }
-        tailBlockIndex.set(currentGroupId, insertedBlockIndex);
-        tailPosition.set(currentGroupId, insertedPosition);
-        groupEntryCount.increment(currentGroupId);
-        currentPageBuilder.declarePosition();
-        totalPositions++;
-    }
-
-    protected final void appendAtChannel(int channel, Block block, int position)
-    {
-        currentPageBuilder.getType(channel).appendTo(block, position, currentPageBuilder.getBlockBuilder(channel));
-    }
-
-    public void forEach(T consumer)
-    {
-        short currentBlockId = headBlockIndex.get(getGroupId());
-        int currentPosition = headPosition.get(getGroupId());
-        while (currentBlockId != NULL) {
-            if (!accept(consumer, values.get(currentBlockId), currentPosition)) {
-                break;
-            }
-
-            long absoluteCurrentAddress = toAbsolutePosition(currentBlockId, currentPosition);
-            currentBlockId = nextBlockIndex.get(absoluteCurrentAddress);
-            currentPosition = nextPosition.get(absoluteCurrentAddress);
-        }
-    }
-
-    public boolean isEmpty()
-    {
-        return headBlockIndex.get(getGroupId()) == NULL;
-    }
-
-    public final int getEntryCount()
-    {
-        return groupEntryCount.get(getGroupId());
-    }
-
-    private long toAbsolutePosition(short blockId, int position)
-    {
-        return sumPositions.get(blockId) + position;
-    }
-
-    protected abstract boolean accept(T consumer, PageBuilder pageBuilder, int currentPosition);
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AbstractMapAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AbstractMapAggregationState.java
new file mode 100644
index 000000000000..e410366b95db
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/AbstractMapAggregationState.java
@@ -0,0 +1,556 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import com.google.common.base.Throwables;
+import com.google.common.primitives.Ints;
+import io.trino.operator.VariableWidthData;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.type.Type;
+import jakarta.annotation.Nullable;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.util.Arrays;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.operator.VariableWidthData.EMPTY_CHUNK;
+import static io.trino.operator.VariableWidthData.POINTER_SIZE;
+import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
+import static java.lang.Math.multiplyExact;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
+import static java.util.Objects.checkIndex;
+import static java.util.Objects.requireNonNull;
+
+public abstract class AbstractMapAggregationState
+        implements MapAggregationState
+{
+    private static final int INSTANCE_SIZE = instanceSize(AbstractMapAggregationState.class);
+
+    // See java.util.ArrayList for an explanation
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
+    // Hash table capacity must be a power of 2 and at least VECTOR_LENGTH
+    private static final int INITIAL_CAPACITY = 16;
+
+    private static int calculateMaxFill(int capacity)
+    {
+        // The hash table uses a load factory of 15/16
+        return (capacity / 16) * 15;
+    }
+
+    private static final long HASH_COMBINE_PRIME = 4999L;
+
+    private static final int RECORDS_PER_GROUP_SHIFT = 10;
+    private static final int RECORDS_PER_GROUP = 1 << RECORDS_PER_GROUP_SHIFT;
+    private static final int RECORDS_PER_GROUP_MASK = RECORDS_PER_GROUP - 1;
+
+    private static final int VECTOR_LENGTH = Long.BYTES;
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, LITTLE_ENDIAN);
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, LITTLE_ENDIAN);
+
+    private final Type keyType;
+    private final MethodHandle keyReadFlat;
+    private final MethodHandle keyWriteFlat;
+    private final MethodHandle keyHashFlat;
+    private final MethodHandle keyDistinctFlatBlock;
+    private final MethodHandle keyHashBlock;
+
+    private final Type valueType;
+    private final MethodHandle valueReadFlat;
+    private final MethodHandle valueWriteFlat;
+
+    private final int recordSize;
+    private final int recordGroupIdOffset;
+    private final int recordNextIndexOffset;
+    private final int recordKeyOffset;
+    private final int recordValueNullOffset;
+    private final int recordValueOffset;
+
+    private int capacity;
+    private int mask;
+
+    private byte[] control;
+    private byte[][] recordGroups;
+    private final VariableWidthData variableWidthData;
+
+    // head position of each group in the hash table
+    @Nullable
+    private int[] groupRecordIndex;
+
+    private int size;
+    private int maxFill;
+
+    public AbstractMapAggregationState(
+            Type keyType,
+            MethodHandle keyReadFlat,
+            MethodHandle keyWriteFlat,
+            MethodHandle hashFlat,
+            MethodHandle distinctFlatBlock,
+            MethodHandle keyHashBlock,
+            Type valueType,
+            MethodHandle valueReadFlat,
+            MethodHandle valueWriteFlat,
+            boolean grouped)
+    {
+        this.keyType = requireNonNull(keyType, "keyType is null");
+
+        this.keyReadFlat = requireNonNull(keyReadFlat, "keyReadFlat is null");
+        this.keyWriteFlat = requireNonNull(keyWriteFlat, "keyWriteFlat is null");
+        this.keyHashFlat = requireNonNull(hashFlat, "hashFlat is null");
+        this.keyDistinctFlatBlock = requireNonNull(distinctFlatBlock, "distinctFlatBlock is null");
+        this.keyHashBlock = requireNonNull(keyHashBlock, "keyHashBlock is null");
+
+        this.valueType = requireNonNull(valueType, "valueType is null");
+        this.valueReadFlat = requireNonNull(valueReadFlat, "valueReadFlat is null");
+        this.valueWriteFlat = requireNonNull(valueWriteFlat, "valueWriteFlat is null");
+
+        capacity = INITIAL_CAPACITY;
+        maxFill = calculateMaxFill(capacity);
+        mask = capacity - 1;
+        control = new byte[capacity + VECTOR_LENGTH];
+
+        groupRecordIndex = grouped ? new int[0] : null;
+
+        boolean variableWidth = keyType.isFlatVariableWidth() || valueType.isFlatVariableWidth();
+        variableWidthData = variableWidth ? new VariableWidthData() : null;
+        if (grouped) {
+            recordGroupIdOffset = (variableWidth ? POINTER_SIZE : 0);
+            recordNextIndexOffset = recordGroupIdOffset + Integer.BYTES;
+            recordKeyOffset = recordNextIndexOffset + Integer.BYTES;
+        }
+        else {
+            // use MIN_VALUE so that when it is added to the record offset we get a negative value, and thus an ArrayIndexOutOfBoundsException
+            recordGroupIdOffset = Integer.MIN_VALUE;
+            recordNextIndexOffset = Integer.MIN_VALUE;
+            recordKeyOffset = (variableWidth ? POINTER_SIZE : 0);
+        }
+        recordValueNullOffset = recordKeyOffset + keyType.getFlatFixedSize();
+        recordValueOffset = recordValueNullOffset + 1;
+        recordSize = recordValueOffset + valueType.getFlatFixedSize();
+        recordGroups = createRecordGroups(capacity, recordSize);
+    }
+
+    public AbstractMapAggregationState(AbstractMapAggregationState state)
+    {
+        this.keyType = state.keyType;
+        this.keyReadFlat = state.keyReadFlat;
+        this.keyWriteFlat = state.keyWriteFlat;
+        this.keyHashFlat = state.keyHashFlat;
+        this.keyDistinctFlatBlock = state.keyDistinctFlatBlock;
+        this.keyHashBlock = state.keyHashBlock;
+
+        this.valueType = state.valueType;
+        this.valueReadFlat = state.valueReadFlat;
+        this.valueWriteFlat = state.valueWriteFlat;
+
+        this.recordSize = state.recordSize;
+        this.recordGroupIdOffset = state.recordGroupIdOffset;
+        this.recordNextIndexOffset = state.recordNextIndexOffset;
+        this.recordKeyOffset = state.recordKeyOffset;
+        this.recordValueNullOffset = state.recordValueNullOffset;
+        this.recordValueOffset = state.recordValueOffset;
+
+        this.capacity = state.capacity;
+        this.mask = state.mask;
+        this.control = Arrays.copyOf(state.control, state.control.length);
+
+        this.recordGroups = Arrays.stream(state.recordGroups)
+                .map(records -> Arrays.copyOf(records, records.length))
+                .toArray(byte[][]::new);
+        this.variableWidthData = state.variableWidthData == null ? null : new VariableWidthData(state.variableWidthData);
+        this.groupRecordIndex = state.groupRecordIndex == null ? null : Arrays.copyOf(state.groupRecordIndex, state.groupRecordIndex.length);
+
+        this.size = state.size;
+        this.maxFill = state.maxFill;
+    }
+
+    private static byte[][] createRecordGroups(int capacity, int recordSize)
+    {
+        if (capacity < RECORDS_PER_GROUP) {
+            return new byte[][]{new byte[multiplyExact(capacity, recordSize)]};
+        }
+
+        byte[][] groups = new byte[(capacity + 1) >> RECORDS_PER_GROUP_SHIFT][];
+        for (int i = 0; i < groups.length; i++) {
+            groups[i] = new byte[multiplyExact(RECORDS_PER_GROUP, recordSize)];
+        }
+        return groups;
+    }
+
+    @Override
+    public long getEstimatedSize()
+    {
+        return INSTANCE_SIZE +
+                sizeOf(control) +
+                (sizeOf(recordGroups[0]) * recordGroups.length) +
+                (variableWidthData == null ? 0 : variableWidthData.getRetainedSizeBytes()) +
+                (groupRecordIndex == null ? 0 : sizeOf(groupRecordIndex));
+    }
+
+    public void setMaxGroupId(int maxGroupId)
+    {
+        checkState(groupRecordIndex != null, "grouping is not enabled");
+
+        int requiredSize = maxGroupId + 1;
+        checkIndex(requiredSize, MAX_ARRAY_SIZE);
+
+        int currentSize = groupRecordIndex.length;
+        if (requiredSize > currentSize) {
+            groupRecordIndex = Arrays.copyOf(groupRecordIndex, Ints.constrainToRange(requiredSize * 2, 1024, MAX_ARRAY_SIZE));
+            Arrays.fill(groupRecordIndex, currentSize, groupRecordIndex.length, -1);
+        }
+    }
+
+    protected void serialize(int groupId, MapBlockBuilder out)
+    {
+        if (size == 0) {
+            out.appendNull();
+            return;
+        }
+
+        if (groupRecordIndex == null) {
+            checkArgument(groupId == 0, "groupId must be zero when grouping is not enabled");
+
+            // if not grouped, serialize the entire histogram
+            out.buildEntry((keyBuilder, valueBuilder) -> {
+                for (int i = 0; i < capacity; i++) {
+                    if (control[i] != 0) {
+                        byte[] records = getRecords(i);
+                        int recordOffset = getRecordOffset(i);
+                        serializeEntry(keyBuilder, valueBuilder, records, recordOffset);
+                    }
+                }
+            });
+            return;
+        }
+
+        int index = groupRecordIndex[groupId];
+        if (index == -1) {
+            out.appendNull();
+            return;
+        }
+
+        // follow the linked list of records for this group
+        out.buildEntry((keyBuilder, valueBuilder) -> {
+            int nextIndex = index;
+            while (nextIndex >= 0) {
+                byte[] records = getRecords(nextIndex);
+                int recordOffset = getRecordOffset(nextIndex);
+
+                serializeEntry(keyBuilder, valueBuilder, records, recordOffset);
+
+                nextIndex = (int) INT_HANDLE.get(records, recordOffset + recordNextIndexOffset);
+            }
+        });
+    }
+
+    private void serializeEntry(BlockBuilder keyBuilder, BlockBuilder valueBuilder, byte[] records, int recordOffset)
+    {
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            variableWidthChunk = variableWidthData.getChunk(records, recordOffset);
+        }
+
+        try {
+            keyReadFlat.invokeExact(records, recordOffset + recordKeyOffset, variableWidthChunk, keyBuilder);
+            if (records[recordOffset + recordValueNullOffset] != 0) {
+                valueBuilder.appendNull();
+            }
+            else {
+                valueReadFlat.invokeExact(records, recordOffset + recordValueOffset, variableWidthChunk, valueBuilder);
+            }
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    protected void add(int groupId, ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition)
+    {
+        checkArgument(!keyBlock.isNull(keyPosition), "key must not be null");
+        checkArgument(groupId == 0 || groupRecordIndex != null, "groupId must be zero when grouping is not enabled");
+
+        long hash = keyHashCode(groupId, keyBlock, keyPosition);
+
+        byte hashPrefix = (byte) (hash & 0x7F | 0x80);
+        int bucket = bucket((int) (hash >> 7));
+
+        int step = 1;
+        long repeated = repeat(hashPrefix);
+
+        while (true) {
+            final long controlVector = (long) LONG_HANDLE.get(control, bucket);
+
+            int matchBucket = matchInVector(groupId, keyBlock, keyPosition, bucket, repeated, controlVector);
+            if (matchBucket >= 0) {
+                return;
+            }
+
+            int emptyIndex = findEmptyInVector(controlVector, bucket);
+            if (emptyIndex >= 0) {
+                insert(emptyIndex, groupId, keyBlock, keyPosition, valueBlock, valuePosition, hashPrefix);
+                size++;
+
+                if (size >= maxFill) {
+                    rehash();
+                }
+                return;
+            }
+
+            bucket = bucket(bucket + step);
+            step += VECTOR_LENGTH;
+        }
+    }
+
+    private int matchInVector(int groupId, ValueBlock block, int position, int vectorStartBucket, long repeated, long controlVector)
+    {
+        long controlMatches = match(controlVector, repeated);
+        while (controlMatches != 0) {
+            int bucket = bucket(vectorStartBucket + (Long.numberOfTrailingZeros(controlMatches) >>> 3));
+            if (keyNotDistinctFrom(bucket, block, position, groupId)) {
+                return bucket;
+            }
+
+            controlMatches = controlMatches & (controlMatches - 1);
+        }
+        return -1;
+    }
+
+    private int findEmptyInVector(long vector, int vectorStartBucket)
+    {
+        long controlMatches = match(vector, 0x00_00_00_00_00_00_00_00L);
+        if (controlMatches == 0) {
+            return -1;
+        }
+        int slot = Long.numberOfTrailingZeros(controlMatches) >>> 3;
+        return bucket(vectorStartBucket + slot);
+    }
+
+    private void insert(int index, int groupId, ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition, byte hashPrefix)
+    {
+        setControl(index, hashPrefix);
+
+        byte[] records = getRecords(index);
+        int recordOffset = getRecordOffset(index);
+
+        if (groupRecordIndex != null) {
+            // write groupId
+            INT_HANDLE.set(records, recordOffset + recordGroupIdOffset, groupId);
+
+            // update linked list pointers
+            int nextRecordIndex = groupRecordIndex[groupId];
+            groupRecordIndex[groupId] = index;
+            INT_HANDLE.set(records, recordOffset + recordNextIndexOffset, nextRecordIndex);
+        }
+
+        int keyVariableWidthSize = 0;
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        int variableWidthChunkOffset = 0;
+        if (variableWidthData != null) {
+            keyVariableWidthSize = keyType.getFlatVariableWidthSize(keyBlock, keyPosition);
+            int valueVariableWidthSize = valueBlock.isNull(valuePosition) ? 0 : valueType.getFlatVariableWidthSize(valueBlock, valuePosition);
+            variableWidthChunk = variableWidthData.allocate(records, recordOffset, keyVariableWidthSize + valueVariableWidthSize);
+            variableWidthChunkOffset = VariableWidthData.getChunkOffset(records, recordOffset);
+        }
+
+        try {
+            keyWriteFlat.invokeExact(keyBlock, keyPosition, records, recordOffset + recordKeyOffset, variableWidthChunk, variableWidthChunkOffset);
+            if (valueBlock.isNull(valuePosition)) {
+                records[recordOffset + recordValueNullOffset] = 1;
+            }
+            else {
+                valueWriteFlat.invokeExact(valueBlock, valuePosition, records, recordOffset + recordValueOffset, variableWidthChunk, variableWidthChunkOffset + keyVariableWidthSize);
+            }
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private void setControl(int index, byte hashPrefix)
+    {
+        control[index] = hashPrefix;
+        if (index < VECTOR_LENGTH) {
+            control[index + capacity] = hashPrefix;
+        }
+    }
+
+    private void rehash()
+    {
+        int oldCapacity = capacity;
+        byte[] oldControl = control;
+        byte[][] oldRecordGroups = recordGroups;
+
+        long newCapacityLong = capacity * 2L;
+        if (newCapacityLong > MAX_ARRAY_SIZE) {
+            throw new TrinoException(GENERIC_INSUFFICIENT_RESOURCES, "Size of hash table cannot exceed 1 billion entries");
+        }
+
+        capacity = (int) newCapacityLong;
+        maxFill = calculateMaxFill(capacity);
+        mask = capacity - 1;
+
+        control = new byte[capacity + VECTOR_LENGTH];
+        recordGroups = createRecordGroups(capacity, recordSize);
+
+        if (groupRecordIndex != null) {
+            // reset the groupRecordIndex as it will be rebuilt during the rehash
+            Arrays.fill(groupRecordIndex, -1);
+        }
+
+        for (int oldIndex = 0; oldIndex < oldCapacity; oldIndex++) {
+            if (oldControl[oldIndex] != 0) {
+                byte[] oldRecords = oldRecordGroups[oldIndex >> RECORDS_PER_GROUP_SHIFT];
+                int oldRecordOffset = getRecordOffset(oldIndex);
+
+                int groupId = 0;
+                if (groupRecordIndex != null) {
+                    groupId = (int) INT_HANDLE.get(oldRecords, oldRecordOffset + recordGroupIdOffset);
+                }
+
+                long hash = keyHashCode(groupId, oldRecords, oldIndex);
+                byte hashPrefix = (byte) (hash & 0x7F | 0x80);
+                int bucket = bucket((int) (hash >> 7));
+
+                int step = 1;
+                while (true) {
+                    final long controlVector = (long) LONG_HANDLE.get(control, bucket);
+                    // values are already distinct, so just find the first empty slot
+                    int emptyIndex = findEmptyInVector(controlVector, bucket);
+                    if (emptyIndex >= 0) {
+                        setControl(emptyIndex, hashPrefix);
+
+                        // copy full record including groupId
+                        byte[] records = getRecords(emptyIndex);
+                        int recordOffset = getRecordOffset(emptyIndex);
+                        System.arraycopy(oldRecords, oldRecordOffset, records, recordOffset, recordSize);
+
+                        if (groupRecordIndex != null) {
+                            // update linked list pointer to reflect the positions in the new hash
+                            INT_HANDLE.set(records, recordOffset + recordNextIndexOffset, groupRecordIndex[groupId]);
+                            groupRecordIndex[groupId] = emptyIndex;
+                        }
+
+                        break;
+                    }
+
+                    bucket = bucket(bucket + step);
+                    step += VECTOR_LENGTH;
+                }
+            }
+        }
+    }
+
+    private int bucket(int hash)
+    {
+        return hash & mask;
+    }
+
+    private byte[] getRecords(int index)
+    {
+        return recordGroups[index >> RECORDS_PER_GROUP_SHIFT];
+    }
+
+    private int getRecordOffset(int index)
+    {
+        return (index & RECORDS_PER_GROUP_MASK) * recordSize;
+    }
+
+    private long keyHashCode(int groupId, byte[] records, int index)
+    {
+        int recordOffset = getRecordOffset(index);
+
+        try {
+            byte[] variableWidthChunk = EMPTY_CHUNK;
+            if (variableWidthData != null) {
+                variableWidthChunk = variableWidthData.getChunk(records, recordOffset);
+            }
+
+            long valueHash = (long) keyHashFlat.invokeExact(
+                    records,
+                    recordOffset + recordKeyOffset,
+                    variableWidthChunk);
+            return groupId * HASH_COMBINE_PRIME + valueHash;
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private long keyHashCode(int groupId, ValueBlock right, int rightPosition)
+    {
+        try {
+            long valueHash = (long) keyHashBlock.invokeExact(right, rightPosition);
+            return groupId * HASH_COMBINE_PRIME + valueHash;
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private boolean keyNotDistinctFrom(int leftPosition, ValueBlock right, int rightPosition, int rightGroupId)
+    {
+        byte[] leftRecords = getRecords(leftPosition);
+        int leftRecordOffset = getRecordOffset(leftPosition);
+
+        if (groupRecordIndex != null) {
+            long leftGroupId = (int) INT_HANDLE.get(leftRecords, leftRecordOffset + recordGroupIdOffset);
+            if (leftGroupId != rightGroupId) {
+                return false;
+            }
+        }
+
+        byte[] leftVariableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            leftVariableWidthChunk = variableWidthData.getChunk(leftRecords, leftRecordOffset);
+        }
+
+        try {
+            return !(boolean) keyDistinctFlatBlock.invokeExact(
+                    leftRecords,
+                    leftRecordOffset + recordKeyOffset,
+                    leftVariableWidthChunk,
+                    right,
+                    rightPosition);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private static long repeat(byte value)
+    {
+        return ((value & 0xFF) * 0x01_01_01_01_01_01_01_01L);
+    }
+
+    private static long match(long vector, long repeatedValue)
+    {
+        // HD 6-1
+        long comparison = vector ^ repeatedValue;
+        return (comparison - 0x01_01_01_01_01_01_01_01L) & ~comparison & 0x80_80_80_80_80_80_80_80L;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/Accumulator.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/Accumulator.java
index 34d2f9338602..6edae8fd67a5 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/Accumulator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/Accumulator.java
@@ -17,15 +17,13 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 
-import java.util.Optional;
-
 public interface Accumulator
 {
     long getEstimatedSize();
 
     Accumulator copy();
 
-    void addInput(Page arguments, Optional<Block> mask);
+    void addInput(Page arguments, AggregationMask mask);
 
     void addIntermediate(Block block);
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AccumulatorCompiler.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AccumulatorCompiler.java
index a86dcc362bac..1a5e6a312bbf 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/AccumulatorCompiler.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/AccumulatorCompiler.java
@@ -15,7 +15,6 @@
 
 import com.google.common.collect.ImmutableList;
 import io.airlift.bytecode.BytecodeBlock;
-import io.airlift.bytecode.BytecodeNode;
 import io.airlift.bytecode.ClassDefinition;
 import io.airlift.bytecode.DynamicClassLoader;
 import io.airlift.bytecode.FieldDefinition;
@@ -27,12 +26,14 @@
 import io.airlift.bytecode.control.IfStatement;
 import io.airlift.bytecode.expression.BytecodeExpression;
 import io.airlift.bytecode.expression.BytecodeExpressions;
-import io.trino.operator.GroupByIdBlock;
 import io.trino.operator.window.InternalWindowIndex;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.ColumnarRow;
+import io.trino.spi.block.RowBlock;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.RowValueBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateFactory;
 import io.trino.spi.function.AccumulatorStateSerializer;
@@ -67,15 +68,16 @@
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantFalse;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantInt;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantLong;
-import static io.airlift.bytecode.expression.BytecodeExpressions.constantNull;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantString;
 import static io.airlift.bytecode.expression.BytecodeExpressions.invokeDynamic;
 import static io.airlift.bytecode.expression.BytecodeExpressions.invokeStatic;
 import static io.airlift.bytecode.expression.BytecodeExpressions.newInstance;
-import static io.airlift.bytecode.expression.BytecodeExpressions.not;
+import static io.trino.operator.aggregation.AggregationLoopBuilder.buildLoop;
+import static io.trino.operator.aggregation.AggregationMaskCompiler.generateAggregationMaskBuilder;
 import static io.trino.sql.gen.Bootstrap.BOOTSTRAP_METHOD;
 import static io.trino.sql.gen.BytecodeUtils.invoke;
 import static io.trino.sql.gen.BytecodeUtils.loadConstant;
+import static io.trino.sql.gen.LambdaMetafactoryGenerator.generateMetafactory;
 import static io.trino.util.CompilerUtils.defineClass;
 import static io.trino.util.CompilerUtils.makeClassName;
 import static java.lang.String.format;
@@ -88,7 +90,8 @@ private AccumulatorCompiler() {}
     public static AccumulatorFactory generateAccumulatorFactory(
             BoundSignature boundSignature,
             AggregationImplementation implementation,
-            FunctionNullability functionNullability)
+            FunctionNullability functionNullability,
+            boolean specializedLoops)
     {
         // change types used in Aggregation methods to types used in the core Trino engine to simplify code generation
         implementation = normalizeAggregationMethods(implementation);
@@ -98,24 +101,35 @@ public static AccumulatorFactory generateAccumulatorFactory(
         List<Boolean> argumentNullable = functionNullability.getArgumentNullable()
                 .subList(0, functionNullability.getArgumentNullable().size() - implementation.getLambdaInterfaces().size());
 
-        Constructor<? extends Accumulator> accumulatorConstructor = generateAccumulatorClass(
+        Constructor<? extends GroupedAccumulator> groupedAccumulatorConstructor = generateAccumulatorClass(
                 boundSignature,
-                Accumulator.class,
+                GroupedAccumulator.class,
                 implementation,
                 argumentNullable,
-                classLoader);
+                classLoader,
+                specializedLoops);
 
-        Constructor<? extends GroupedAccumulator> groupedAccumulatorConstructor = generateAccumulatorClass(
+        Constructor<? extends Accumulator> accumulatorConstructor = generateAccumulatorClass(
                 boundSignature,
-                GroupedAccumulator.class,
+                Accumulator.class,
                 implementation,
                 argumentNullable,
-                classLoader);
+                classLoader,
+                specializedLoops);
+
+        List<Integer> nonNullArguments = new ArrayList<>();
+        for (int argumentIndex = 0; argumentIndex < argumentNullable.size(); argumentIndex++) {
+            if (!argumentNullable.get(argumentIndex)) {
+                nonNullArguments.add(argumentIndex);
+            }
+        }
+        Constructor<? extends AggregationMaskBuilder> maskBuilderConstructor = generateAggregationMaskBuilder(nonNullArguments.stream().mapToInt(Integer::intValue).toArray());
 
         return new CompiledAccumulatorFactory(
                 accumulatorConstructor,
                 groupedAccumulatorConstructor,
-                implementation.getLambdaInterfaces());
+                implementation.getLambdaInterfaces(),
+                maskBuilderConstructor);
     }
 
     private static <T> Constructor<? extends T> generateAccumulatorClass(
@@ -123,13 +137,14 @@ private static <T> Constructor<? extends T> generateAccumulatorClass(
             Class<T> accumulatorInterface,
             AggregationImplementation implementation,
             List<Boolean> argumentNullable,
-            DynamicClassLoader classLoader)
+            DynamicClassLoader classLoader,
+            boolean specializedLoops)
     {
         boolean grouped = accumulatorInterface == GroupedAccumulator.class;
 
         ClassDefinition definition = new ClassDefinition(
                 a(PUBLIC, FINAL),
-                makeClassName(boundSignature.getName() + accumulatorInterface.getSimpleName()),
+                makeClassName(boundSignature.getName().getFunctionName() + accumulatorInterface.getSimpleName()),
                 type(Object.class),
                 type(accumulatorInterface));
 
@@ -171,6 +186,7 @@ private static <T> Constructor<? extends T> generateAccumulatorClass(
 
         generateAddInput(
                 definition,
+                specializedLoops,
                 stateFields,
                 argumentNullable,
                 lambdaProviderFields,
@@ -179,6 +195,10 @@ private static <T> Constructor<? extends T> generateAccumulatorClass(
                 grouped);
         generateGetEstimatedSize(definition, stateFields);
 
+        if (grouped) {
+            generateSetGroupCount(definition, stateFields);
+        }
+
         generateAddIntermediateAsCombine(
                 definition,
                 stateFieldAndDescriptors,
@@ -229,7 +249,7 @@ public static Constructor<? extends WindowAccumulator> generateWindowAccumulator
 
         ClassDefinition definition = new ClassDefinition(
                 a(PUBLIC, FINAL),
-                makeClassName(boundSignature.getName() + WindowAccumulator.class.getSimpleName()),
+                makeClassName(boundSignature.getName().getFunctionName() + WindowAccumulator.class.getSimpleName()),
                 type(Object.class),
                 type(WindowAccumulator.class));
 
@@ -335,8 +355,22 @@ private static void generateGetEstimatedSize(ClassDefinition definition, List<Fi
         method.getBody().append(estimatedSize.ret());
     }
 
+    private static void generateSetGroupCount(ClassDefinition definition, List<FieldDefinition> stateFields)
+    {
+        Parameter groupCount = arg("groupCount", long.class);
+
+        MethodDefinition method = definition.declareMethod(a(PUBLIC), "setGroupCount", type(void.class), groupCount);
+        BytecodeBlock body = method.getBody();
+        for (FieldDefinition stateField : stateFields) {
+            BytecodeExpression state = method.getScope().getThis().getField(stateField);
+            body.append(state.invoke("ensureCapacity", void.class, groupCount));
+        }
+        body.ret();
+    }
+
     private static void generateAddInput(
             ClassDefinition definition,
+            boolean specializedLoops,
             List<FieldDefinition> stateField,
             List<Boolean> argumentNullable,
             List<FieldDefinition> lambdaProviderFields,
@@ -346,26 +380,21 @@ private static void generateAddInput(
     {
         ImmutableList.Builder<Parameter> parameters = ImmutableList.builder();
         if (grouped) {
-            parameters.add(arg("groupIdsBlock", GroupByIdBlock.class));
+            parameters.add(arg("groupIds", int[].class));
         }
         Parameter arguments = arg("arguments", Page.class);
         parameters.add(arguments);
-        Parameter mask = arg("mask", Optional.class);
+        Parameter mask = arg("mask", AggregationMask.class);
         parameters.add(mask);
 
         MethodDefinition method = definition.declareMethod(a(PUBLIC), "addInput", type(void.class), parameters.build());
         Scope scope = method.getScope();
         BytecodeBlock body = method.getBody();
 
-        if (grouped) {
-            generateEnsureCapacity(scope, stateField, body);
-        }
-
         List<Variable> parameterVariables = new ArrayList<>();
         for (int i = 0; i < argumentNullable.size(); i++) {
             parameterVariables.add(scope.declareVariable(Block.class, "block" + i));
         }
-        Variable masksBlock = scope.declareVariable("masksBlock", body, mask.invoke("orElse", Object.class, constantNull(Object.class)).cast(Block.class));
 
         // Get all parameter blocks
         for (int i = 0; i < parameterVariables.size(); i++) {
@@ -374,14 +403,13 @@ private static void generateAddInput(
         }
 
         BytecodeBlock block = generateInputForLoop(
-                arguments,
+                specializedLoops,
                 stateField,
-                argumentNullable,
                 inputFunction,
                 scope,
                 parameterVariables,
                 lambdaProviderFields,
-                masksBlock,
+                mask,
                 callSiteBinder,
                 grouped);
 
@@ -410,25 +438,40 @@ private static void generateAddOrRemoveInputWindowIndex(
                 type(void.class),
                 ImmutableList.of(index, startPosition, endPosition));
         Scope scope = method.getScope();
+        BytecodeBlock body = method.getBody();
 
         Variable position = scope.declareVariable(int.class, "position");
 
+        // input parameters
+        Variable inputBlockPosition = scope.declareVariable(int.class, "inputBlockPosition");
+        List<Variable> inputBlockVariables = new ArrayList<>();
+        for (int i = 0; i < argumentNullable.size(); i++) {
+            inputBlockVariables.add(scope.declareVariable(Block.class, "inputBlock" + i));
+        }
+
         Binding binding = callSiteBinder.bind(inputFunction);
-        BytecodeExpression invokeInputFunction = invokeDynamic(
+        BytecodeBlock invokeInputFunction = new BytecodeBlock();
+        // WindowIndex is built on PagesIndex, which simply wraps Blocks
+        // and currently does not understand ValueBlocks.
+        // Until PagesIndex is updated to understand ValueBlocks, the
+        // input function parameters must be directly unwrapped to ValueBlocks.
+        invokeInputFunction.append(inputBlockPosition.set(index.cast(InternalWindowIndex.class).invoke("getRawBlockPosition", int.class, position)));
+        for (int i = 0; i < inputBlockVariables.size(); i++) {
+            invokeInputFunction.append(inputBlockVariables.get(i).set(index.cast(InternalWindowIndex.class).invoke("getRawBlock", Block.class, constantInt(i), position)));
+        }
+        invokeInputFunction.append(invokeDynamic(
                 BOOTSTRAP_METHOD,
                 ImmutableList.of(binding.getBindingId()),
                 generatedFunctionName,
                 binding.getType(),
                 getInvokeFunctionOnWindowIndexParameters(
-                        scope,
-                        argumentNullable.size(),
-                        lambdaProviderFields,
+                        scope.getThis(),
                         stateField,
-                        index,
-                        position));
+                        inputBlockPosition,
+                        inputBlockVariables,
+                        lambdaProviderFields)));
 
-        method.getBody()
-                .append(new ForLoop()
+        body.append(new ForLoop()
                         .initialize(position.set(startPosition))
                         .condition(BytecodeExpressions.lessThanOrEqual(position, endPosition))
                         .update(position.increment())
@@ -454,33 +497,28 @@ private static BytecodeExpression anyParametersAreNull(
     }
 
     private static List<BytecodeExpression> getInvokeFunctionOnWindowIndexParameters(
-            Scope scope,
-            int inputParameterCount,
-            List<FieldDefinition> lambdaProviderFields,
+            Variable thisVariable,
             List<FieldDefinition> stateField,
-            Variable index,
-            Variable position)
+            Variable inputBlockPosition,
+            List<Variable> inputBlockVariables,
+            List<FieldDefinition> lambdaProviderFields)
     {
         List<BytecodeExpression> expressions = new ArrayList<>();
 
         // state parameters
         for (FieldDefinition field : stateField) {
-            expressions.add(scope.getThis().getField(field));
+            expressions.add(thisVariable.getField(field));
         }
 
         // input parameters
-        for (int i = 0; i < inputParameterCount; i++) {
-            expressions.add(index.cast(InternalWindowIndex.class).invoke("getRawBlock", Block.class, constantInt(i), position));
-        }
-
-        // position parameter
-        if (inputParameterCount > 0) {
-            expressions.add(index.cast(InternalWindowIndex.class).invoke("getRawBlockPosition", int.class, position));
+        for (Variable blockVariable : inputBlockVariables) {
+            expressions.add(blockVariable.invoke("getUnderlyingValueBlock", ValueBlock.class));
+            expressions.add(blockVariable.invoke("getUnderlyingValuePosition", int.class, inputBlockPosition));
         }
 
         // lambda parameters
         for (FieldDefinition lambdaProviderField : lambdaProviderFields) {
-            expressions.add(scope.getThis().getField(lambdaProviderField)
+            expressions.add(thisVariable.getField(lambdaProviderField)
                     .invoke("get", Object.class));
         }
 
@@ -488,109 +526,94 @@ private static List<BytecodeExpression> getInvokeFunctionOnWindowIndexParameters
     }
 
     private static BytecodeBlock generateInputForLoop(
-            Variable arguments,
+            boolean specializedLoops,
             List<FieldDefinition> stateField,
-            List<Boolean> argumentNullable,
             MethodHandle inputFunction,
             Scope scope,
             List<Variable> parameterVariables,
             List<FieldDefinition> lambdaProviderFields,
-            Variable masksBlock,
+            Variable mask,
             CallSiteBinder callSiteBinder,
             boolean grouped)
     {
+        if (specializedLoops) {
+            BytecodeBlock newBlock = new BytecodeBlock();
+            Variable thisVariable = scope.getThis();
+
+            MethodHandle mainLoop = buildLoop(inputFunction, stateField.size(), parameterVariables.size(), grouped);
+
+            ImmutableList.Builder<BytecodeExpression> parameters = ImmutableList.builder();
+            parameters.add(mask);
+            if (grouped) {
+                parameters.add(scope.getVariable("groupIds"));
+            }
+            for (FieldDefinition fieldDefinition : stateField) {
+                parameters.add(thisVariable.getField(fieldDefinition));
+            }
+            parameters.addAll(parameterVariables);
+            for (FieldDefinition lambdaProviderField : lambdaProviderFields) {
+                parameters.add(scope.getThis().getField(lambdaProviderField)
+                        .invoke("get", Object.class));
+            }
+
+            newBlock.append(invoke(callSiteBinder.bind(mainLoop), "mainLoop", parameters.build()));
+            return newBlock;
+        }
+
         // For-loop over rows
         Variable positionVariable = scope.declareVariable(int.class, "position");
         Variable rowsVariable = scope.declareVariable(int.class, "rows");
+        Variable selectedPositionsArrayVariable = scope.declareVariable(int[].class, "selectedPositionsArray");
+        Variable selectedPositionVariable = scope.declareVariable(int.class, "selectedPosition");
 
         BytecodeBlock block = new BytecodeBlock()
-                .append(arguments)
-                .invokeVirtual(Page.class, "getPositionCount", int.class)
-                .putVariable(rowsVariable)
+                .initializeVariable(rowsVariable)
+                .initializeVariable(selectedPositionVariable)
                 .initializeVariable(positionVariable);
 
-        /*
-            It differentiates two cases: (1) when a block may have null positions and (2) when there is no null positions for performance reason.
-            The expected skeleton of generated code is:
-                if false or block.mayHaveNull() or  ...
-                    for position in 0..rows
-                        if CompilerOperations.testMask(masksBlock, position) and !block0.isNull(position) and ...
-                            this.state_0.input<invokedynamic>(this.state_0, block0, ..., position)
-                else
-                    for position in 0..rows
-                        if CompilerOperations.testMask(masksBlock, position)
-                            this.state_0.input<invokedynamic>(this.state_0, block0, ..., position);
-
-         */
-        ForLoop nullCheckLoop = generateInputLoopBody(true, scope, stateField, positionVariable, parameterVariables, lambdaProviderFields, inputFunction, callSiteBinder, grouped, argumentNullable, masksBlock, rowsVariable);
-        ForLoop noNullCheckLoop = generateInputLoopBody(false, scope, stateField, positionVariable, parameterVariables, lambdaProviderFields, inputFunction, callSiteBinder, grouped, argumentNullable, masksBlock, rowsVariable);
-
-        // prepare mayHaveNull condition
-        BytecodeExpression mayHaveNullCondition = BytecodeExpressions.constantFalse();
-        for (int parameterIndex = 0; parameterIndex < parameterVariables.size(); parameterIndex++) {
-            if (!argumentNullable.get(parameterIndex)) {
-                mayHaveNullCondition = BytecodeExpressions.or(mayHaveNullCondition, parameterVariables.get(parameterIndex).invoke("mayHaveNull", boolean.class));
-            }
-        }
-
-        IfStatement mayHaveNullIf = new IfStatement("if(%s)", mayHaveNullCondition).condition(mayHaveNullCondition)
-                .ifFalse(noNullCheckLoop)
-                .ifTrue(nullCheckLoop);
-
-        block.append(new IfStatement("if(!maskGuaranteedToFilterAllRows(%s, %s))", rowsVariable.getName(), masksBlock.getName())
-                .condition(new BytecodeBlock()
-                        .getVariable(rowsVariable)
-                        .getVariable(masksBlock)
-                        .invokeStatic(AggregationUtils.class, "maskGuaranteedToFilterAllRows", boolean.class, int.class, Block.class))
-                .ifFalse(mayHaveNullIf));
+        ForLoop selectAllLoop = new ForLoop()
+                .initialize(new BytecodeBlock()
+                        .append(rowsVariable.set(mask.invoke("getPositionCount", int.class)))
+                        .append(positionVariable.set(constantInt(0))))
+                .condition(BytecodeExpressions.lessThan(positionVariable, rowsVariable))
+                .update(new BytecodeBlock().incrementVariable(positionVariable, (byte) 1))
+                .body(generateInvokeInputFunction(
+                        scope,
+                        stateField,
+                        positionVariable,
+                        parameterVariables,
+                        lambdaProviderFields,
+                        inputFunction,
+                        callSiteBinder,
+                        grouped));
+
+        ForLoop selectedPositionsLoop = new ForLoop()
+                .initialize(new BytecodeBlock()
+                        .append(rowsVariable.set(mask.invoke("getSelectedPositionCount", int.class)))
+                        .append(selectedPositionsArrayVariable.set(mask.invoke("getSelectedPositions", int[].class)))
+                        .append(positionVariable.set(constantInt(0))))
+                .condition(BytecodeExpressions.lessThan(positionVariable, rowsVariable))
+                .update(new BytecodeBlock().incrementVariable(positionVariable, (byte) 1))
+                .body(new BytecodeBlock()
+                        .append(selectedPositionVariable.set(selectedPositionsArrayVariable.getElement(positionVariable)))
+                        .append(generateInvokeInputFunction(
+                                scope,
+                                stateField,
+                                selectedPositionVariable,
+                                parameterVariables,
+                                lambdaProviderFields,
+                                inputFunction,
+                                callSiteBinder,
+                                grouped)));
+
+        block.append(new IfStatement()
+                .condition(mask.invoke("isSelectAll", boolean.class))
+                .ifTrue(selectAllLoop)
+                .ifFalse(selectedPositionsLoop));
 
         return block;
     }
 
-    private static ForLoop generateInputLoopBody(boolean isNullCheck, Scope scope, List<FieldDefinition> stateField, Variable positionVariable, List<Variable> parameterVariables, List<FieldDefinition> lambdaProviderFields, MethodHandle inputFunction, CallSiteBinder callSiteBinder, boolean grouped, List<Boolean> argumentNullable, Variable masksBlock, Variable rowsVariable)
-    {
-        BytecodeNode loopBody = generateInvokeInputFunction(
-                scope,
-                stateField,
-                positionVariable,
-                parameterVariables,
-                lambdaProviderFields,
-                inputFunction,
-                callSiteBinder,
-                grouped);
-
-        //  Wrap with null checks
-        if (isNullCheck) {
-            for (int parameterIndex = 0; parameterIndex < parameterVariables.size(); parameterIndex++) {
-                if (!argumentNullable.get(parameterIndex)) {
-                    Variable variableDefinition = parameterVariables.get(parameterIndex);
-                    loopBody = new IfStatement("if(!%s.isNull(position))", variableDefinition.getName())
-                            .condition(new BytecodeBlock()
-                                    .getVariable(variableDefinition)
-                                    .getVariable(positionVariable)
-                                    .invokeInterface(Block.class, "isNull", boolean.class, int.class))
-                            .ifFalse(loopBody);
-                }
-            }
-        }
-
-        loopBody = new IfStatement("if(testMask(%s, position))", masksBlock.getName())
-                .condition(new BytecodeBlock()
-                        .getVariable(masksBlock)
-                        .getVariable(positionVariable)
-                        .invokeStatic(CompilerOperations.class, "testMask", boolean.class, Block.class, int.class))
-                .ifTrue(loopBody);
-
-        return new ForLoop()
-                .initialize(new BytecodeBlock().putVariable(positionVariable, 0))
-                .condition(new BytecodeBlock()
-                        .getVariable(positionVariable)
-                        .getVariable(rowsVariable)
-                        .invokeStatic(CompilerOperations.class, "lessThan", boolean.class, int.class, int.class))
-                .update(new BytecodeBlock().incrementVariable(positionVariable, (byte) 1))
-                .body(loopBody);
-    }
-
     private static BytecodeBlock generateInvokeInputFunction(
             Scope scope,
             List<FieldDefinition> stateField,
@@ -604,7 +627,7 @@ private static BytecodeBlock generateInvokeInputFunction(
         BytecodeBlock block = new BytecodeBlock();
 
         if (grouped) {
-            generateSetGroupIdFromGroupIdsBlock(scope, stateField, block);
+            generateSetGroupIdFromGroupIds(scope, stateField, block, position);
         }
 
         block.comment("Call input function with unpacked Block arguments");
@@ -617,11 +640,9 @@ private static BytecodeBlock generateInvokeInputFunction(
         }
 
         // input parameters
-        parameters.addAll(parameterVariables);
-
-        // position parameter
-        if (!parameterVariables.isEmpty()) {
-            parameters.add(position);
+        for (Variable variable : parameterVariables) {
+            parameters.add(variable.invoke("getUnderlyingValueBlock", ValueBlock.class));
+            parameters.add(variable.invoke("getUnderlyingValuePosition", int.class, position));
         }
 
         // lambda parameters
@@ -665,19 +686,11 @@ private static void generateAddIntermediateAsCombine(
             block = ImmutableList.of(scope.getVariable("block"));
         }
         else {
-            // ColumnarRow is used to get the column blocks represents each state, this allows to
-            //  1. handle single state and multiple states in a unified way
-            //  2. avoid the cost of constructing SingleRowBlock for each group
-            Variable columnarRow = scope.declareVariable(ColumnarRow.class, "columnarRow");
-            body.append(columnarRow.set(
-                    invokeStatic(ColumnarRow.class, "toColumnarRow", ColumnarRow.class, scope.getVariable("block"))));
+            Variable fields = scope.declareVariable("fields", body, invokeStatic(RowBlock.class, "getRowFieldsFromBlock", List.class, scope.getVariable("block")));
 
             block = new ArrayList<>();
             for (int i = 0; i < stateCount; i++) {
-                Variable columnBlock = scope.declareVariable(Block.class, "columnBlock_" + i);
-                body.append(columnBlock.set(
-                        columnarRow.invoke("getField", Block.class, constantInt(i))));
-                block.add(columnBlock);
+                block.add(scope.declareVariable("columnBlock_" + i, body, fields.invoke("get", Object.class, constantInt(i)).cast(Block.class)));
             }
         }
 
@@ -695,17 +708,13 @@ private static void generateAddIntermediateAsCombine(
                 .map(StateFieldAndDescriptor::getStateField)
                 .collect(toImmutableList());
 
-        if (grouped) {
-            generateEnsureCapacity(scope, stateFields, body);
-        }
-
         BytecodeBlock loopBody = new BytecodeBlock();
 
         loopBody.comment("combine(state_0, state_1, ... scratchState_0, scratchState_1, ... lambda_0, lambda_1, ...)");
         for (FieldDefinition stateField : stateFields) {
             if (grouped) {
-                Variable groupIdsBlock = scope.getVariable("groupIdsBlock");
-                loopBody.append(thisVariable.getField(stateField).invoke("setGroupId", void.class, groupIdsBlock.invoke("getGroupId", long.class, position)));
+                Variable groupIds = scope.getVariable("groupIds");
+                loopBody.append(thisVariable.getField(stateField).invoke("setGroupId", void.class, groupIds.getElement(position).cast(long.class)));
             }
             loopBody.append(thisVariable.getField(stateField));
         }
@@ -720,35 +729,16 @@ private static void generateAddIntermediateAsCombine(
         }
         loopBody.append(invoke(callSiteBinder.bind(combineFunction.get()), "combine"));
 
-        if (grouped) {
-            // skip rows with null group id
-            IfStatement ifStatement = new IfStatement("if (!groupIdsBlock.isNull(position))")
-                    .condition(not(scope.getVariable("groupIdsBlock").invoke("isNull", boolean.class, position)))
-                    .ifTrue(loopBody);
-
-            loopBody = new BytecodeBlock().append(ifStatement);
-        }
-
         body.append(generateBlockNonNullPositionForLoop(scope, position, loopBody))
                 .ret();
     }
 
-    private static void generateSetGroupIdFromGroupIdsBlock(Scope scope, List<FieldDefinition> stateFields, BytecodeBlock block)
-    {
-        Variable groupIdsBlock = scope.getVariable("groupIdsBlock");
-        Variable position = scope.getVariable("position");
-        for (FieldDefinition stateField : stateFields) {
-            BytecodeExpression state = scope.getThis().getField(stateField);
-            block.append(state.invoke("setGroupId", void.class, groupIdsBlock.invoke("getGroupId", long.class, position)));
-        }
-    }
-
-    private static void generateEnsureCapacity(Scope scope, List<FieldDefinition> stateFields, BytecodeBlock block)
+    private static void generateSetGroupIdFromGroupIds(Scope scope, List<FieldDefinition> stateFields, BytecodeBlock block, Variable position)
     {
-        Variable groupIdsBlock = scope.getVariable("groupIdsBlock");
+        Variable groupIds = scope.getVariable("groupIds");
         for (FieldDefinition stateField : stateFields) {
             BytecodeExpression state = scope.getThis().getField(stateField);
-            block.append(state.invoke("ensureCapacity", void.class, groupIdsBlock.invoke("getGroupCount", long.class)));
+            block.append(state.invoke("setGroupId", void.class, groupIds.getElement(position).cast(long.class)));
         }
     }
 
@@ -756,7 +746,7 @@ private static MethodDefinition declareAddIntermediate(ClassDefinition definitio
     {
         ImmutableList.Builder<Parameter> parameters = ImmutableList.builder();
         if (grouped) {
-            parameters.add(arg("groupIdsBlock", GroupByIdBlock.class));
+            parameters.add(arg("groupIds", int[].class));
         }
         parameters.add(arg("block", Block.class));
 
@@ -823,18 +813,13 @@ private static void generateGroupedEvaluateIntermediate(ClassDefinition definiti
                     .ret();
         }
         else {
-            Variable rowBuilder = method.getScope().declareVariable(BlockBuilder.class, "rowBuilder");
-            body.append(rowBuilder.set(out.invoke("beginBlockEntry", BlockBuilder.class)));
-
             for (StateFieldAndDescriptor stateFieldAndDescriptor : stateFieldAndDescriptors) {
-                BytecodeExpression stateSerializer = thisVariable.getField(stateFieldAndDescriptor.getStateSerializerField());
                 BytecodeExpression state = thisVariable.getField(stateFieldAndDescriptor.getStateField());
-
-                body.append(state.invoke("setGroupId", void.class, groupId.cast(long.class)))
-                        .append(stateSerializer.invoke("serialize", void.class, state.cast(AccumulatorState.class), rowBuilder));
+                body.append(state.invoke("setGroupId", void.class, groupId.cast(long.class)));
             }
-            body.append(out.invoke("closeEntry", BlockBuilder.class).pop())
-                    .ret();
+
+            generateSerializeState(definition, stateFieldAndDescriptors, out, thisVariable, body);
+            body.ret();
         }
     }
 
@@ -865,17 +850,36 @@ private static void generateEvaluateIntermediate(ClassDefinition definition, Lis
                     .ret();
         }
         else {
-            Variable rowBuilder = method.getScope().declareVariable(BlockBuilder.class, "rowBuilder");
-            body.append(rowBuilder.set(out.invoke("beginBlockEntry", BlockBuilder.class)));
+            generateSerializeState(definition, stateFieldAndDescriptors, out, thisVariable, body);
+            body.ret();
+        }
+    }
 
-            for (StateFieldAndDescriptor stateFieldAndDescriptor : stateFieldAndDescriptors) {
-                BytecodeExpression stateSerializer = thisVariable.getField(stateFieldAndDescriptor.getStateSerializerField());
-                BytecodeExpression state = thisVariable.getField(stateFieldAndDescriptor.getStateField());
-                body.append(stateSerializer.invoke("serialize", void.class, state.cast(AccumulatorState.class), rowBuilder));
-            }
-            body.append(out.invoke("closeEntry", BlockBuilder.class).pop())
-                    .ret();
+    private static void generateSerializeState(ClassDefinition definition, List<StateFieldAndDescriptor> stateFieldAndDescriptors, Parameter out, Variable thisVariable, BytecodeBlock body)
+    {
+        MethodDefinition serializeState = generateSerializeStateMethod(definition, stateFieldAndDescriptors);
+
+        BytecodeExpression rowEntryBuilder = generateMetafactory(RowValueBuilder.class, serializeState, ImmutableList.of(thisVariable));
+        body.append(out.cast(RowBlockBuilder.class).invoke("buildEntry", void.class, rowEntryBuilder));
+    }
+
+    private static MethodDefinition generateSerializeStateMethod(ClassDefinition definition, List<StateFieldAndDescriptor> stateFieldAndDescriptors)
+    {
+        Parameter fieldBuilders = arg("fieldBuilders", type(List.class, BlockBuilder.class));
+        MethodDefinition method = definition.declareMethod(a(PRIVATE), "serializeState", type(void.class), fieldBuilders);
+
+        Variable thisVariable = method.getThis();
+        BytecodeBlock body = method.getBody();
+
+        for (int i = 0; i < stateFieldAndDescriptors.size(); i++) {
+            StateFieldAndDescriptor stateFieldAndDescriptor = stateFieldAndDescriptors.get(i);
+            BytecodeExpression stateSerializer = thisVariable.getField(stateFieldAndDescriptor.getStateSerializerField());
+            BytecodeExpression state = thisVariable.getField(stateFieldAndDescriptor.getStateField());
+            BytecodeExpression fieldBuilder = fieldBuilders.invoke("get", Object.class, constantInt(i)).cast(BlockBuilder.class);
+            body.append(stateSerializer.invoke("serialize", void.class, state.cast(AccumulatorState.class), fieldBuilder));
         }
+        body.ret();
+        return method;
     }
 
     private static void generateGroupedEvaluateFinal(
@@ -1084,32 +1088,38 @@ private static BytecodeExpression generateRequireNotNull(BytecodeExpression expr
     private static AggregationImplementation normalizeAggregationMethods(AggregationImplementation implementation)
     {
         // change aggregations state variables to simply AccumulatorState to avoid any class loader issues in generated code
-        int stateParameterCount = implementation.getAccumulatorStateDescriptors().size();
         int lambdaParameterCount = implementation.getLambdaInterfaces().size();
         AggregationImplementation.Builder builder = AggregationImplementation.builder();
-        builder.inputFunction(castStateParameters(implementation.getInputFunction(), stateParameterCount, lambdaParameterCount));
+        builder.inputFunction(normalizeParameters(implementation.getInputFunction(), lambdaParameterCount));
         implementation.getRemoveInputFunction()
-                .map(removeFunction -> castStateParameters(removeFunction, stateParameterCount, lambdaParameterCount))
+                .map(removeFunction -> normalizeParameters(removeFunction, lambdaParameterCount))
                 .ifPresent(builder::removeInputFunction);
         implementation.getCombineFunction()
-                .map(combineFunction -> castStateParameters(combineFunction, stateParameterCount * 2, lambdaParameterCount))
+                .map(combineFunction -> normalizeParameters(combineFunction, lambdaParameterCount))
                 .ifPresent(builder::combineFunction);
-        builder.outputFunction(castStateParameters(implementation.getOutputFunction(), stateParameterCount, 0));
+        builder.outputFunction(normalizeParameters(implementation.getOutputFunction(), 0));
         builder.accumulatorStateDescriptors(implementation.getAccumulatorStateDescriptors());
         builder.lambdaInterfaces(implementation.getLambdaInterfaces());
         return builder.build();
     }
 
-    private static MethodHandle castStateParameters(MethodHandle inputFunction, int stateParameterCount, int lambdaParameterCount)
+    private static MethodHandle normalizeParameters(MethodHandle function, int lambdaParameterCount)
     {
-        Class<?>[] parameterTypes = inputFunction.type().parameterArray();
-        for (int i = 0; i < stateParameterCount; i++) {
-            parameterTypes[i] = AccumulatorState.class;
+        Class<?>[] parameterTypes = function.type().parameterArray();
+        for (int i = 0; i < parameterTypes.length; i++) {
+            Class<?> parameterType = parameterTypes[i];
+            if (AccumulatorState.class.isAssignableFrom(parameterType)) {
+                parameterTypes[i] = AccumulatorState.class;
+            }
+            else if (ValueBlock.class.isAssignableFrom(parameterType)) {
+                parameterTypes[i] = ValueBlock.class;
+            }
         }
         for (int i = parameterTypes.length - lambdaParameterCount; i < parameterTypes.length; i++) {
             parameterTypes[i] = Object.class;
         }
-        return MethodHandles.explicitCastArguments(inputFunction, MethodType.methodType(inputFunction.type().returnType(), parameterTypes));
+        MethodType newType = MethodType.methodType(function.type().returnType(), parameterTypes);
+        return MethodHandles.explicitCastArguments(function, newType);
     }
 
     private static class StateFieldAndDescriptor
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AccumulatorFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AccumulatorFactory.java
index 374ce655a2c2..8aff4a287419 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/AccumulatorFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/AccumulatorFactory.java
@@ -27,4 +27,6 @@ public interface AccumulatorFactory
     GroupedAccumulator createGroupedAccumulator(List<Supplier<Object>> lambdaProviders);
 
     GroupedAccumulator createGroupedIntermediateAccumulator(List<Supplier<Object>> lambdaProviders);
+
+    AggregationMaskBuilder createAggregationMaskBuilder();
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationFromAnnotationsParser.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationFromAnnotationsParser.java
index 37c747c99071..a46cd8bcaa73 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationFromAnnotationsParser.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationFromAnnotationsParser.java
@@ -113,7 +113,6 @@ else if (combineFunction.isPresent()) {
                 Optional<Method> removeInputFunction = getRemoveInputFunction(aggregationDefinition, inputFunction);
                 ParametricAggregationImplementation implementation = parseImplementation(
                         aggregationDefinition,
-                        header.getName(),
                         stateDetails,
                         inputFunction,
                         removeInputFunction,
@@ -127,18 +126,13 @@ else if (combineFunction.isPresent()) {
                 }
             }
 
-            // register a set functions for the canonical name, and each alias
-            functions.addAll(buildFunctions(header.getName(), header, stateDetails, exactImplementations, nonExactImplementations));
-            for (String alias : getAliases(aggregationDefinition.getAnnotation(AggregationFunction.class), outputFunction)) {
-                functions.addAll(buildFunctions(alias, header, stateDetails, exactImplementations, nonExactImplementations));
-            }
+            functions.addAll(buildFunctions(header, stateDetails, exactImplementations, nonExactImplementations));
         }
 
         return functions.build();
     }
 
     private static List<ParametricAggregation> buildFunctions(
-            String name,
             AggregationHeader header,
             List<AccumulatorStateDetails<?>> stateDetails,
             List<ParametricAggregationImplementation> exactImplementations,
@@ -149,10 +143,10 @@ private static List<ParametricAggregation> buildFunctions(
         // create a separate function for each exact implementation
         for (ParametricAggregationImplementation exactImplementation : exactImplementations) {
             functions.add(new ParametricAggregation(
-                    exactImplementation.getSignature().withName(name),
+                    exactImplementation.getSignature(),
                     header,
                     stateDetails,
-                    ParametricImplementationsGroup.of(exactImplementation).withAlias(name)));
+                    ParametricImplementationsGroup.of(exactImplementation)));
         }
 
         // if there are non-exact functions, create a single generic/calculated function using these implementations
@@ -161,10 +155,10 @@ private static List<ParametricAggregation> buildFunctions(
             nonExactImplementations.forEach(implementationsBuilder::addImplementation);
             ParametricImplementationsGroup<ParametricAggregationImplementation> implementations = implementationsBuilder.build();
             functions.add(new ParametricAggregation(
-                    implementations.getSignature().withName(name),
+                    implementations.getSignature(),
                     header,
                     stateDetails,
-                    implementations.withAlias(name)));
+                    implementations));
         }
 
         return functions.build();
@@ -181,9 +175,9 @@ private static AggregationHeader parseHeader(AnnotatedElement aggregationDefinit
     {
         AggregationFunction aggregationAnnotation = aggregationDefinition.getAnnotation(AggregationFunction.class);
         requireNonNull(aggregationAnnotation, "aggregationAnnotation is null");
-        String name = getName(aggregationAnnotation, outputFunction);
         return new AggregationHeader(
-                name,
+                getName(aggregationAnnotation, outputFunction),
+                getAliases(aggregationAnnotation, outputFunction),
                 parseDescription(aggregationDefinition, outputFunction),
                 aggregationAnnotation.decomposable(),
                 aggregationAnnotation.isOrderSensitive(),
@@ -200,13 +194,13 @@ private static String getName(AggregationFunction aggregationAnnotation, Annotat
         return emptyToNull(aggregationAnnotation.value());
     }
 
-    private static List<String> getAliases(AggregationFunction aggregationAnnotation, AnnotatedElement outputFunction)
+    private static Set<String> getAliases(AggregationFunction aggregationAnnotation, AnnotatedElement outputFunction)
     {
         AggregationFunction annotation = outputFunction.getAnnotation(AggregationFunction.class);
         if (annotation != null && annotation.alias().length > 0) {
-            return ImmutableList.copyOf(annotation.alias());
+            return ImmutableSet.copyOf(annotation.alias());
         }
-        return ImmutableList.copyOf(aggregationAnnotation.alias());
+        return ImmutableSet.copyOf(aggregationAnnotation.alias());
     }
 
     private static Optional<Method> getCombineFunction(Class<?> clazz, List<AccumulatorStateDetails<?>> stateDetails)
@@ -286,7 +280,7 @@ private static List<Method> getInputFunctions(Class<?> clazz, List<AccumulatorSt
                     expectedParameterTypes.stream().map(Class::getSimpleName).collect(toImmutableList()),
                     inputFunction);
 
-            // g input functions did not require parameters to be fully annotated
+            // input functions did not require parameters to be fully annotated
             if (stateDetails.size() > 1) {
                 List<List<Annotation>> parameterAnnotations = getNonDependencyParameterAnnotations(inputFunction)
                         .subList(0, stateDetails.size());
@@ -484,7 +478,7 @@ private static TypeSignatureMapping getTypeParameterMapping(Class<?> stateClass,
         return new TypeSignatureMapping(mapping.buildOrThrow());
     }
 
-    public static List<ImplementationDependency> parseImplementationDependencies(TypeSignatureMapping typeSignatureMapping, Executable inputFunction)
+    private static List<ImplementationDependency> parseImplementationDependencies(TypeSignatureMapping typeSignatureMapping, Executable inputFunction)
     {
         ImmutableList.Builder<ImplementationDependency> builder = ImmutableList.builder();
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationFunctionAdapter.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationFunctionAdapter.java
index 84d20bfddf86..6315b354cdd7 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationFunctionAdapter.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationFunctionAdapter.java
@@ -15,15 +15,13 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.type.Type;
 
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodType;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -34,7 +32,7 @@
 import static io.trino.operator.aggregation.AggregationFunctionAdapter.AggregationParameterKind.STATE;
 import static java.lang.invoke.MethodHandles.collectArguments;
 import static java.lang.invoke.MethodHandles.lookup;
-import static java.lang.invoke.MethodHandles.permuteArguments;
+import static java.lang.invoke.MethodType.methodType;
 import static java.util.Objects.requireNonNull;
 
 public final class AggregationFunctionAdapter
@@ -55,10 +53,14 @@ public enum AggregationParameterKind
 
     static {
         try {
-            BOOLEAN_TYPE_GETTER = lookup().findVirtual(Type.class, "getBoolean", MethodType.methodType(boolean.class, Block.class, int.class));
-            LONG_TYPE_GETTER = lookup().findVirtual(Type.class, "getLong", MethodType.methodType(long.class, Block.class, int.class));
-            DOUBLE_TYPE_GETTER = lookup().findVirtual(Type.class, "getDouble", MethodType.methodType(double.class, Block.class, int.class));
-            OBJECT_TYPE_GETTER = lookup().findVirtual(Type.class, "getObject", MethodType.methodType(Object.class, Block.class, int.class));
+            BOOLEAN_TYPE_GETTER = lookup().findVirtual(Type.class, "getBoolean", methodType(boolean.class, Block.class, int.class))
+                    .asType(methodType(boolean.class, Type.class, ValueBlock.class, int.class));
+            LONG_TYPE_GETTER = lookup().findVirtual(Type.class, "getLong", methodType(long.class, Block.class, int.class))
+                    .asType(methodType(long.class, Type.class, ValueBlock.class, int.class));
+            DOUBLE_TYPE_GETTER = lookup().findVirtual(Type.class, "getDouble", methodType(double.class, Block.class, int.class))
+                    .asType(methodType(double.class, Type.class, ValueBlock.class, int.class));
+            OBJECT_TYPE_GETTER = lookup().findVirtual(Type.class, "getObject", methodType(Object.class, Block.class, int.class))
+                    .asType(methodType(Object.class, Type.class, ValueBlock.class, int.class));
         }
         catch (ReflectiveOperationException e) {
             throw new AssertionError(e);
@@ -103,7 +105,6 @@ public static MethodHandle normalizeInputMethod(
         List<AggregationParameterKind> inputArgumentKinds = parameterKinds.stream()
                 .filter(kind -> kind == INPUT_CHANNEL || kind == BLOCK_INPUT_CHANNEL || kind == NULLABLE_BLOCK_INPUT_CHANNEL)
                 .collect(toImmutableList());
-        boolean hasInputChannel = parameterKinds.stream().anyMatch(kind -> kind == BLOCK_INPUT_CHANNEL || kind == NULLABLE_BLOCK_INPUT_CHANNEL);
 
         checkArgument(
                 boundSignature.getArgumentTypes().size() - lambdaCount == inputArgumentKinds.size(),
@@ -113,21 +114,26 @@ public static MethodHandle normalizeInputMethod(
 
         List<AggregationParameterKind> expectedInputArgumentKinds = new ArrayList<>();
         expectedInputArgumentKinds.addAll(stateArgumentKinds);
-        expectedInputArgumentKinds.addAll(inputArgumentKinds);
-        if (hasInputChannel) {
-            expectedInputArgumentKinds.add(BLOCK_INDEX);
+        for (AggregationParameterKind kind : inputArgumentKinds) {
+            expectedInputArgumentKinds.add(kind);
+            if (kind == BLOCK_INPUT_CHANNEL || kind == NULLABLE_BLOCK_INPUT_CHANNEL) {
+                expectedInputArgumentKinds.add(BLOCK_INDEX);
+            }
         }
+
         checkArgument(
                 expectedInputArgumentKinds.equals(parameterKinds),
                 "Expected input parameter kinds %s, but got %s",
                 expectedInputArgumentKinds,
                 parameterKinds);
 
-        MethodType inputMethodType = inputMethod.type();
         for (int argumentIndex = 0; argumentIndex < inputArgumentKinds.size(); argumentIndex++) {
-            int parameterIndex = stateArgumentKinds.size() + argumentIndex;
+            int parameterIndex = stateArgumentKinds.size() + (argumentIndex * 2);
             AggregationParameterKind inputArgument = inputArgumentKinds.get(argumentIndex);
             if (inputArgument != INPUT_CHANNEL) {
+                if (inputArgument == BLOCK_INPUT_CHANNEL || inputArgument == NULLABLE_BLOCK_INPUT_CHANNEL) {
+                    checkArgument(ValueBlock.class.isAssignableFrom(inputMethod.type().parameterType(parameterIndex)), "Expected parameter %s to be a ValueBlock", parameterIndex);
+                }
                 continue;
             }
             Type argumentType = boundSignature.getArgumentType(argumentIndex);
@@ -145,27 +151,9 @@ else if (argumentType.getJavaType().equals(double.class)) {
             }
             else {
                 valueGetter = OBJECT_TYPE_GETTER.bindTo(argumentType);
-                valueGetter = valueGetter.asType(valueGetter.type().changeReturnType(inputMethodType.parameterType(parameterIndex)));
+                valueGetter = valueGetter.asType(valueGetter.type().changeReturnType(inputMethod.type().parameterType(parameterIndex)));
             }
             inputMethod = collectArguments(inputMethod, parameterIndex, valueGetter);
-
-            // move the position argument to the end (and combine with other existing position argument)
-            inputMethodType = inputMethodType.changeParameterType(parameterIndex, Block.class);
-
-            ArrayList<Integer> reorder;
-            if (hasInputChannel) {
-                reorder = IntStream.range(0, inputMethodType.parameterCount()).boxed().collect(Collectors.toCollection(ArrayList::new));
-                reorder.add(parameterIndex + 1, inputMethodType.parameterCount() - 1 - lambdaCount);
-            }
-            else {
-                inputMethodType = inputMethodType.insertParameterTypes(inputMethodType.parameterCount() - lambdaCount, int.class);
-                reorder = IntStream.range(0, inputMethodType.parameterCount()).boxed().collect(Collectors.toCollection(ArrayList::new));
-                int positionParameterIndex = inputMethodType.parameterCount() - 1 - lambdaCount;
-                reorder.remove(positionParameterIndex);
-                reorder.add(parameterIndex + 1, positionParameterIndex);
-                hasInputChannel = true;
-            }
-            inputMethod = permuteArguments(inputMethod, inputMethodType, reorder.stream().mapToInt(Integer::intValue).toArray());
         }
         return inputMethod;
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationHeader.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationHeader.java
index 1168fe061192..195077569d52 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationHeader.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationHeader.java
@@ -13,7 +13,10 @@
  */
 package io.trino.operator.aggregation;
 
+import com.google.common.collect.ImmutableSet;
+
 import java.util.Optional;
+import java.util.Set;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static java.util.Objects.requireNonNull;
@@ -21,15 +24,17 @@
 public class AggregationHeader
 {
     private final String name;
+    private final Set<String> aliases;
     private final Optional<String> description;
     private final boolean decomposable;
     private final boolean orderSensitive;
     private final boolean hidden;
     private final boolean deprecated;
 
-    public AggregationHeader(String name, Optional<String> description, boolean decomposable, boolean orderSensitive, boolean hidden, boolean deprecated)
+    public AggregationHeader(String name, Set<String> aliases, Optional<String> description, boolean decomposable, boolean orderSensitive, boolean hidden, boolean deprecated)
     {
         this.name = requireNonNull(name, "name cannot be null");
+        this.aliases = ImmutableSet.copyOf(aliases);
         this.description = requireNonNull(description, "description cannot be null");
         this.decomposable = decomposable;
         this.orderSensitive = orderSensitive;
@@ -42,6 +47,11 @@ public String getName()
         return name;
     }
 
+    public Set<String> getAliases()
+    {
+        return aliases;
+    }
+
     public Optional<String> getDescription()
     {
         return description;
@@ -72,6 +82,7 @@ public String toString()
     {
         return toStringHelper(this)
                 .add("name", name)
+                .add("aliases", aliases)
                 .add("description", description)
                 .add("decomposable", decomposable)
                 .add("orderSensitive", orderSensitive)
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationLoopBuilder.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationLoopBuilder.java
new file mode 100644
index 000000000000..e7b7dd678452
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationLoopBuilder.java
@@ -0,0 +1,331 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.bytecode.BytecodeBlock;
+import io.airlift.bytecode.BytecodeNode;
+import io.airlift.bytecode.ClassDefinition;
+import io.airlift.bytecode.MethodDefinition;
+import io.airlift.bytecode.Parameter;
+import io.airlift.bytecode.Scope;
+import io.airlift.bytecode.Variable;
+import io.airlift.bytecode.control.ForLoop;
+import io.airlift.bytecode.control.IfStatement;
+import io.airlift.bytecode.expression.BytecodeExpression;
+import io.airlift.bytecode.expression.BytecodeExpressions;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.DictionaryBlock;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.function.GroupedAccumulatorState;
+import io.trino.sql.gen.CallSiteBinder;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Method;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.Iterables.cycle;
+import static com.google.common.collect.Iterables.limit;
+import static com.google.common.collect.MoreCollectors.onlyElement;
+import static io.airlift.bytecode.Access.FINAL;
+import static io.airlift.bytecode.Access.PRIVATE;
+import static io.airlift.bytecode.Access.PUBLIC;
+import static io.airlift.bytecode.Access.STATIC;
+import static io.airlift.bytecode.Access.a;
+import static io.airlift.bytecode.Parameter.arg;
+import static io.airlift.bytecode.ParameterizedType.type;
+import static io.airlift.bytecode.expression.BytecodeExpressions.constantInt;
+import static io.airlift.bytecode.expression.BytecodeExpressions.constantString;
+import static io.airlift.bytecode.expression.BytecodeExpressions.invokeStatic;
+import static io.airlift.bytecode.expression.BytecodeExpressions.lessThan;
+import static io.airlift.bytecode.expression.BytecodeExpressions.newInstance;
+import static io.trino.sql.gen.BytecodeUtils.invoke;
+import static io.trino.util.CompilerUtils.defineClass;
+import static io.trino.util.CompilerUtils.makeClassName;
+import static java.lang.invoke.MethodHandles.lookup;
+import static java.lang.invoke.MethodType.methodType;
+
+final class AggregationLoopBuilder
+{
+    private AggregationLoopBuilder() {}
+
+    /**
+     * Build a loop over the aggregation function.  Internally, there are multiple loops generated that are specialized for
+     * RLE, Dictionary, and basic blocks, and for masked or unmasked input.  The method handle is expected to have a {@link Block} and int
+     * position argument for each parameter.  The returned method handle signature, will start with as {@link AggregationMask}
+     * and then a single {@link Block} for each parameter.
+     */
+    public static MethodHandle buildLoop(MethodHandle function, int stateCount, int parameterCount, boolean grouped)
+    {
+        verifyFunctionSignature(function, stateCount, parameterCount);
+        CallSiteBinder binder = new CallSiteBinder();
+        ClassDefinition definition = new ClassDefinition(
+                a(PUBLIC, STATIC, FINAL),
+                makeClassName("AggregationLoop"),
+                type(Object.class));
+
+        definition.declareDefaultConstructor(a(PRIVATE));
+
+        buildSpecializedLoop(binder, definition, function, stateCount, parameterCount, grouped);
+
+        Class<?> clazz = defineClass(definition, Object.class, binder.getBindings(), AggregationLoopBuilder.class.getClassLoader());
+
+        // it is simpler to find the method with reflection than using lookup().findStatic because of the complex signature
+        Method invokeMethod = Arrays.stream(clazz.getMethods())
+                .filter(method -> method.getName().equals("invoke"))
+                .collect(onlyElement());
+
+        try {
+            return lookup().unreflect(invokeMethod);
+        }
+        catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static void buildSpecializedLoop(CallSiteBinder binder, ClassDefinition classDefinition, MethodHandle function, int stateCount, int parameterCount, boolean grouped)
+    {
+        AggregationParameters aggregationParameters = AggregationParameters.create(function, stateCount, parameterCount, grouped);
+        MethodDefinition methodDefinition = classDefinition.declareMethod(
+                a(PUBLIC, STATIC),
+                "invoke",
+                type(void.class),
+                aggregationParameters.allParameters());
+
+        Function<List<BlockType>, BytecodeNode> coreLoopBuilder = (blockTypes) -> {
+            MethodDefinition method = buildCoreLoop(binder, classDefinition, function, blockTypes, aggregationParameters);
+            return invokeStatic(method, aggregationParameters.allParameters().toArray(new BytecodeExpression[0]));
+        };
+
+        BytecodeNode bytecodeNode = buildLoopSelection(coreLoopBuilder, new ArrayDeque<>(parameterCount), new ArrayDeque<>(aggregationParameters.blocks()));
+        methodDefinition.getBody()
+                .append(bytecodeNode)
+                .ret();
+    }
+
+    private static BytecodeNode buildLoopSelection(Function<List<BlockType>, BytecodeNode> coreLoopBuilder, ArrayDeque<BlockType> currentTypes, ArrayDeque<Parameter> remainingParameters)
+    {
+        if (remainingParameters.isEmpty()) {
+            return coreLoopBuilder.apply(ImmutableList.copyOf(currentTypes));
+        }
+
+        // remove the next parameter from the queue
+        Parameter blockParameter = remainingParameters.removeFirst();
+
+        currentTypes.addLast(BlockType.VALUE);
+        BytecodeNode valueLoop = buildLoopSelection(coreLoopBuilder, currentTypes, remainingParameters);
+        currentTypes.removeLast();
+
+        currentTypes.addLast(BlockType.DICTIONARY);
+        BytecodeNode dictionaryLoop = buildLoopSelection(coreLoopBuilder, currentTypes, remainingParameters);
+        currentTypes.removeLast();
+
+        currentTypes.addLast(BlockType.RLE);
+        BytecodeNode rleLoop = buildLoopSelection(coreLoopBuilder, currentTypes, remainingParameters);
+        currentTypes.removeLast();
+
+        IfStatement blockTypeSelection = new IfStatement()
+                .condition(blockParameter.instanceOf(ValueBlock.class))
+                .ifTrue(valueLoop)
+                .ifFalse(new IfStatement()
+                        .condition(blockParameter.instanceOf(DictionaryBlock.class))
+                        .ifTrue(dictionaryLoop)
+                        .ifFalse(new IfStatement()
+                                .condition(blockParameter.instanceOf(RunLengthEncodedBlock.class))
+                                .ifTrue(rleLoop)
+                                .ifFalse(new BytecodeBlock()
+                                        .append(newInstance(UnsupportedOperationException.class, constantString("Aggregation is not decomposable")))
+                                        .throwObject())));
+
+        // restore the parameter to the queue
+        remainingParameters.addFirst(blockParameter);
+
+        return blockTypeSelection;
+    }
+
+    private static MethodDefinition buildCoreLoop(
+            CallSiteBinder binder,
+            ClassDefinition classDefinition,
+            MethodHandle function,
+            List<BlockType> blockTypes,
+            AggregationParameters aggregationParameters)
+    {
+        StringBuilder methodName = new StringBuilder("invoke_");
+        for (BlockType blockType : blockTypes) {
+            methodName.append(blockType.name().charAt(0));
+        }
+
+        MethodDefinition methodDefinition = classDefinition.declareMethod(
+                a(PUBLIC, STATIC),
+                methodName.toString(),
+                type(void.class),
+                aggregationParameters.allParameters());
+        Scope scope = methodDefinition.getScope();
+        BytecodeBlock body = methodDefinition.getBody();
+
+        Variable position = scope.declareVariable(int.class, "position");
+
+        ImmutableList.Builder<BytecodeExpression> aggregationArguments = ImmutableList.builder();
+        aggregationArguments.addAll(aggregationParameters.states());
+        addBlockPositionArguments(methodDefinition, position, blockTypes, aggregationParameters.blocks(), aggregationArguments);
+        aggregationArguments.addAll(aggregationParameters.lambdas());
+
+        BytecodeBlock invokeFunction = new BytecodeBlock();
+        if (aggregationParameters.groupIds().isPresent()) {
+            // set groupId on state variables
+            Variable groupId = scope.declareVariable(int.class, "groupId");
+            invokeFunction.append(groupId.set(aggregationParameters.groupIds().get().getElement(position)));
+            for (Parameter stateParameter : aggregationParameters.states()) {
+                invokeFunction.append(stateParameter.cast(GroupedAccumulatorState.class).invoke("setGroupId", void.class, groupId.cast(long.class)));
+            }
+        }
+        invokeFunction.append(invoke(binder.bind(function), "input", aggregationArguments.build()));
+
+        Variable positionCount = scope.declareVariable("positionCount", body, aggregationParameters.mask().invoke("getSelectedPositionCount", int.class));
+
+        ForLoop selectAllLoop = new ForLoop()
+                .initialize(position.set(constantInt(0)))
+                .condition(lessThan(position, positionCount))
+                .update(position.increment())
+                .body(invokeFunction);
+
+        Variable index = scope.declareVariable("index", body, constantInt(0));
+        Variable selectedPositions = scope.declareVariable(int[].class, "selectedPositions");
+        ForLoop maskedLoop = new ForLoop()
+                .initialize(selectedPositions.set(aggregationParameters.mask().invoke("getSelectedPositions", int[].class)))
+                .condition(lessThan(index, positionCount))
+                .update(index.increment())
+                .body(new BytecodeBlock()
+                        .append(position.set(selectedPositions.getElement(index)))
+                        .append(invokeFunction));
+
+        body.append(new IfStatement()
+                .condition(aggregationParameters.mask().invoke("isSelectAll", boolean.class))
+                .ifTrue(selectAllLoop)
+                .ifFalse(maskedLoop));
+        body.ret();
+        return methodDefinition;
+    }
+
+    private static void addBlockPositionArguments(
+            MethodDefinition methodDefinition,
+            Variable position,
+            List<BlockType> blockTypes,
+            List<Parameter> blockParameters,
+            ImmutableList.Builder<BytecodeExpression> aggregationArguments)
+    {
+        Scope scope = methodDefinition.getScope();
+        BytecodeBlock methodBody = methodDefinition.getBody();
+
+        for (int i = 0; i < blockTypes.size(); i++) {
+            BlockType blockType = blockTypes.get(i);
+            switch (blockType) {
+                case VALUE -> {
+                    aggregationArguments.add(blockParameters.get(i).cast(ValueBlock.class));
+                    aggregationArguments.add(position);
+                }
+                case DICTIONARY -> {
+                    Variable valueBlock = scope.declareVariable(
+                            "valueBlock" + i,
+                            methodBody,
+                            blockParameters.get(i).cast(DictionaryBlock.class).invoke("getDictionary", ValueBlock.class));
+                    Variable rawIds = scope.declareVariable(
+                            "rawIds" + i,
+                            methodBody,
+                            blockParameters.get(i).cast(DictionaryBlock.class).invoke("getRawIds", int[].class));
+                    Variable rawIdsOffset = scope.declareVariable(
+                            "rawIdsOffset" + i,
+                            methodBody,
+                            blockParameters.get(i).cast(DictionaryBlock.class).invoke("getRawIdsOffset", int.class));
+                    aggregationArguments.add(valueBlock);
+                    aggregationArguments.add(rawIds.getElement(BytecodeExpressions.add(rawIdsOffset, position)));
+                }
+                case RLE -> {
+                    Variable valueBlock = scope.declareVariable(
+                            "valueBlock" + i,
+                            methodBody,
+                            blockParameters.get(i).cast(RunLengthEncodedBlock.class).invoke("getValue", ValueBlock.class));
+                    aggregationArguments.add(valueBlock);
+                    aggregationArguments.add(constantInt(0));
+                }
+            }
+        }
+    }
+
+    private static void verifyFunctionSignature(MethodHandle function, int stateCount, int parameterCount)
+    {
+        // verify signature
+        List<Class<?>> expectedParameterTypes = ImmutableList.<Class<?>>builder()
+                .addAll(function.type().parameterList().subList(0, stateCount))
+                .addAll(limit(cycle(ValueBlock.class, int.class), parameterCount * 2))
+                .addAll(function.type().parameterList().subList(stateCount + (parameterCount * 2), function.type().parameterCount()))
+                .build();
+        MethodType expectedSignature = methodType(void.class, expectedParameterTypes);
+        checkArgument(function.type().equals(expectedSignature), "Expected function signature to be %s, but is %s", expectedSignature, function.type());
+    }
+
+    private record AggregationParameters(Parameter mask, Optional<Parameter> groupIds, List<Parameter> states, List<Parameter> blocks, List<Parameter> lambdas)
+    {
+        static AggregationParameters create(MethodHandle function, int stateCount, int parameterCount, boolean grouped)
+        {
+            Parameter mask = arg("aggregationMask", AggregationMask.class);
+
+            Optional<Parameter> groupIds = Optional.empty();
+            if (grouped) {
+                groupIds = Optional.of(arg("groupIds", int[].class));
+            }
+
+            ImmutableList.Builder<Parameter> states = ImmutableList.builder();
+            for (int i = 0; i < stateCount; i++) {
+                states.add(arg("state" + i, function.type().parameterType(i)));
+            }
+
+            ImmutableList.Builder<Parameter> parameters = ImmutableList.builder();
+            for (int i = 0; i < parameterCount; i++) {
+                parameters.add(arg("block" + i, Block.class));
+            }
+
+            ImmutableList.Builder<Parameter> lambdas = ImmutableList.builder();
+            int lambdaFunctionOffset = stateCount + (parameterCount * 2);
+            for (int i = 0; i < function.type().parameterCount() - lambdaFunctionOffset; i++) {
+                lambdas.add(arg("lambda" + i, function.type().parameterType(lambdaFunctionOffset + i)));
+            }
+
+            return new AggregationParameters(mask, groupIds, states.build(), parameters.build(), lambdas.build());
+        }
+
+        public List<Parameter> allParameters()
+        {
+            return ImmutableList.<Parameter>builder()
+                    .add(mask)
+                    .addAll(groupIds.stream().iterator())
+                    .addAll(states)
+                    .addAll(blocks)
+                    .addAll(lambdas)
+                    .build();
+        }
+    }
+
+    private enum BlockType
+    {
+        RLE, DICTIONARY, VALUE
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationMask.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationMask.java
new file mode 100644
index 000000000000..a4a11fa9bdec
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationMask.java
@@ -0,0 +1,194 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import jakarta.annotation.Nullable;
+
+import java.util.Arrays;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
+
+public final class AggregationMask
+{
+    private static final int[] NO_SELECTED_POSITIONS = new int[0];
+
+    private int positionCount;
+    private int[] selectedPositions = NO_SELECTED_POSITIONS;
+    private int selectedPositionCount;
+
+    public static AggregationMask createSelectNone(int positionCount)
+    {
+        return createSelectedPositions(positionCount, NO_SELECTED_POSITIONS, 0);
+    }
+
+    public static AggregationMask createSelectAll(int positionCount)
+    {
+        return new AggregationMask(positionCount);
+    }
+
+    /**
+     * Creates a mask with the given selected positions. Selected positions must be sorted in ascending order.
+     */
+    public static AggregationMask createSelectedPositions(int positionCount, int[] selectedPositions, int selectedPositionCount)
+    {
+        return new AggregationMask(positionCount, selectedPositions, selectedPositionCount);
+    }
+
+    private AggregationMask(int positionCount)
+    {
+        reset(positionCount);
+    }
+
+    private AggregationMask(int positionCount, int[] selectedPositions, int selectedPositionCount)
+    {
+        checkArgument(positionCount >= 0, "positionCount is negative");
+        checkArgument(selectedPositionCount >= 0, "selectedPositionCount is negative");
+        checkArgument(selectedPositionCount <= positionCount, "selectedPositionCount cannot be greater than positionCount");
+        requireNonNull(selectedPositions, "selectedPositions is null");
+        checkArgument(selectedPositions.length >= selectedPositionCount, "selectedPosition is smaller than selectedPositionCount");
+
+        reset(positionCount);
+        this.selectedPositions = selectedPositions;
+        this.selectedPositionCount = selectedPositionCount;
+    }
+
+    public void reset(int positionCount)
+    {
+        checkArgument(positionCount >= 0, "positionCount is negative");
+        this.positionCount = positionCount;
+        this.selectedPositionCount = positionCount;
+    }
+
+    public int getPositionCount()
+    {
+        return positionCount;
+    }
+
+    public boolean isSelectAll()
+    {
+        return positionCount == selectedPositionCount;
+    }
+
+    public boolean isSelectNone()
+    {
+        return selectedPositionCount == 0;
+    }
+
+    public Page filterPage(Page page)
+    {
+        if (isSelectAll()) {
+            return page;
+        }
+        if (isSelectNone()) {
+            return page.getRegion(0, 0);
+        }
+        return page.getPositions(Arrays.copyOf(selectedPositions, selectedPositionCount), 0, selectedPositionCount);
+    }
+
+    /**
+     * Do not use this to filter a page, as the underlying array can change, and this will change the page after the filtering.
+     */
+    public int getSelectedPositionCount()
+    {
+        return selectedPositionCount;
+    }
+
+    public int[] getSelectedPositions()
+    {
+        checkState(!isSelectAll(), "getSelectedPositions not available when in selectAll mode");
+        return selectedPositions;
+    }
+
+    public void unselectNullPositions(Block block)
+    {
+        unselectPositions(block, false);
+    }
+
+    public void applyMaskBlock(@Nullable Block maskBlock)
+    {
+        if (maskBlock != null) {
+            unselectPositions(maskBlock, true);
+        }
+    }
+
+    private void unselectPositions(Block block, boolean shouldTestValues)
+    {
+        int positionCount = block.getPositionCount();
+        checkArgument(positionCount == this.positionCount, "Block position count does not match current position count");
+        if (isSelectNone()) {
+            return;
+        }
+
+        // short circuit if there are no nulls, and we are not testing the value
+        if (!block.mayHaveNull() && !shouldTestValues) {
+            // all positions selected, so change nothing
+            return;
+        }
+
+        if (block instanceof RunLengthEncodedBlock) {
+            if (test(block, 0, shouldTestValues)) {
+                // all positions selected, so change nothing
+                return;
+            }
+            // no positions selected
+            selectedPositionCount = 0;
+            return;
+        }
+
+        if (positionCount == selectedPositionCount) {
+            if (selectedPositions.length < positionCount) {
+                selectedPositions = new int[positionCount];
+            }
+
+            // add all positions that pass the test
+            int selectedPositionsIndex = 0;
+            for (int position = 0; position < positionCount; position++) {
+                if (test(block, position, shouldTestValues)) {
+                    selectedPositions[selectedPositionsIndex] = position;
+                    selectedPositionsIndex++;
+                }
+            }
+            selectedPositionCount = selectedPositionsIndex;
+            return;
+        }
+
+        // keep only the positions that pass the test
+        int originalIndex = 0;
+        int newIndex = 0;
+        for (; originalIndex < selectedPositionCount; originalIndex++) {
+            int position = selectedPositions[originalIndex];
+            if (test(block, position, shouldTestValues)) {
+                selectedPositions[newIndex] = position;
+                newIndex++;
+            }
+        }
+        selectedPositionCount = newIndex;
+    }
+
+    private static boolean test(Block block, int position, boolean testValue)
+    {
+        if (block.isNull(position)) {
+            return false;
+        }
+        if (testValue && block.getByte(position, 0) == 0) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationMaskBuilder.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationMaskBuilder.java
new file mode 100644
index 000000000000..e4640029b991
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationMaskBuilder.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+
+import java.util.Optional;
+
+public interface AggregationMaskBuilder
+{
+    /**
+     * Create an AggregationMask that only selects positions that pass the specified
+     * mask block, and do not have null for non-null arguments. The returned mask
+     * can be further modified if desired, but it should not be used after the next
+     * call to this method. Internally implementations are allowed to reuse position
+     * arrays across multiple calls.
+     */
+    AggregationMask buildAggregationMask(Page arguments, Optional<Block> optionalMaskBlock);
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationMaskCompiler.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationMaskCompiler.java
new file mode 100644
index 000000000000..bc7a225960d0
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationMaskCompiler.java
@@ -0,0 +1,212 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import com.google.common.collect.ImmutableMap;
+import io.airlift.bytecode.BytecodeBlock;
+import io.airlift.bytecode.ClassDefinition;
+import io.airlift.bytecode.FieldDefinition;
+import io.airlift.bytecode.MethodDefinition;
+import io.airlift.bytecode.Parameter;
+import io.airlift.bytecode.Scope;
+import io.airlift.bytecode.Variable;
+import io.airlift.bytecode.control.ForLoop;
+import io.airlift.bytecode.control.IfStatement;
+import io.airlift.bytecode.expression.BytecodeExpression;
+import io.trino.annotation.UsedByGeneratedCode;
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.RunLengthBlockEncoding;
+import io.trino.spi.block.RunLengthEncodedBlock;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import static io.airlift.bytecode.Access.FINAL;
+import static io.airlift.bytecode.Access.PRIVATE;
+import static io.airlift.bytecode.Access.PUBLIC;
+import static io.airlift.bytecode.Access.a;
+import static io.airlift.bytecode.Parameter.arg;
+import static io.airlift.bytecode.ParameterizedType.type;
+import static io.airlift.bytecode.expression.BytecodeExpressions.and;
+import static io.airlift.bytecode.expression.BytecodeExpressions.constantFalse;
+import static io.airlift.bytecode.expression.BytecodeExpressions.constantInt;
+import static io.airlift.bytecode.expression.BytecodeExpressions.constantNull;
+import static io.airlift.bytecode.expression.BytecodeExpressions.equal;
+import static io.airlift.bytecode.expression.BytecodeExpressions.invokeStatic;
+import static io.airlift.bytecode.expression.BytecodeExpressions.isNotNull;
+import static io.airlift.bytecode.expression.BytecodeExpressions.isNull;
+import static io.airlift.bytecode.expression.BytecodeExpressions.lessThan;
+import static io.airlift.bytecode.expression.BytecodeExpressions.newArray;
+import static io.airlift.bytecode.expression.BytecodeExpressions.not;
+import static io.airlift.bytecode.expression.BytecodeExpressions.notEqual;
+import static io.airlift.bytecode.expression.BytecodeExpressions.or;
+import static io.trino.util.CompilerUtils.defineClass;
+import static io.trino.util.CompilerUtils.makeClassName;
+
+public final class AggregationMaskCompiler
+{
+    private AggregationMaskCompiler() {}
+
+    public static Constructor<? extends AggregationMaskBuilder> generateAggregationMaskBuilder(int... nonNullArgumentChannels)
+    {
+        ClassDefinition definition = new ClassDefinition(
+                a(PUBLIC, FINAL),
+                makeClassName(AggregationMaskBuilder.class.getSimpleName()),
+                type(Object.class),
+                type(AggregationMaskBuilder.class));
+
+        FieldDefinition selectedPositionsField = definition.declareField(a(PRIVATE), "selectedPositions", int[].class);
+
+        MethodDefinition constructor = definition.declareConstructor(a(PUBLIC));
+        constructor.getBody().comment("super();")
+                .append(constructor.getThis())
+                .invokeConstructor(Object.class)
+                .append(constructor.getThis().setField(selectedPositionsField, newArray(type(int[].class), 0)))
+                .ret();
+
+        Parameter argumentsParameter = arg("arguments", type(Page.class));
+        Parameter maskBlockParameter = arg("optionalMaskBlock", type(Optional.class, Block.class));
+        MethodDefinition method = definition.declareMethod(
+                a(PUBLIC),
+                "buildAggregationMask",
+                type(AggregationMask.class),
+                argumentsParameter,
+                maskBlockParameter);
+
+        BytecodeBlock body = method.getBody();
+        Scope scope = method.getScope();
+        Variable positionCount = scope.declareVariable("positionCount", body, argumentsParameter.invoke("getPositionCount", int.class));
+
+        // if page is empty, return select none
+        body.append(new IfStatement()
+                .condition(equal(positionCount, constantInt(0)))
+                .ifTrue(invokeStatic(AggregationMask.class, "createSelectNone", AggregationMask.class, positionCount).ret()));
+
+        Variable maskBlock = scope.declareVariable("maskBlock", body, maskBlockParameter.invoke("orElse", Object.class, constantNull(Object.class)).cast(Block.class));
+        Variable hasMaskBlock = scope.declareVariable("hasMaskBlock", body, isNotNull(maskBlock));
+        Variable maskBlockMayHaveNull = scope.declareVariable(
+                "maskBlockMayHaveNull",
+                body,
+                and(hasMaskBlock, maskBlock.invoke("mayHaveNull", boolean.class)));
+
+        // if mask is RLE it will be, either all allowed, or all denied
+        body.append(new IfStatement()
+                .condition(maskBlock.instanceOf(RunLengthBlockEncoding.class))
+                .ifTrue(new BytecodeBlock()
+                        .append(new IfStatement()
+                                .condition(testMaskBlock(
+                                        maskBlock.cast(RunLengthEncodedBlock.class).invoke("getValue", Block.class),
+                                        maskBlockMayHaveNull,
+                                        constantInt(0)))
+                                .ifTrue(invokeStatic(AggregationMask.class, "createSelectNone", AggregationMask.class, positionCount).ret()))
+                        .append(hasMaskBlock.set(constantFalse()))
+                        .append(maskBlockMayHaveNull.set(constantFalse()))));
+
+        List<Variable> nonNullArgs = new ArrayList<>(nonNullArgumentChannels.length);
+        List<Variable> nonNullArgMayHaveNulls = new ArrayList<>(nonNullArgumentChannels.length);
+        for (int channel : nonNullArgumentChannels) {
+            Variable arg = scope.declareVariable("arg" + channel, body, argumentsParameter.invoke("getBlock", Block.class, constantInt(channel)));
+            body.append(new IfStatement()
+                    .condition(invokeStatic(AggregationMaskCompiler.class, "isAlwaysNull", boolean.class, arg))
+                    .ifTrue(invokeStatic(AggregationMask.class, "createSelectNone", AggregationMask.class, positionCount).ret()));
+            Variable mayHaveNull = scope.declareVariable("arg" + channel + "MayHaveNull", body, arg.invoke("mayHaveNull", boolean.class));
+            nonNullArgs.add(arg);
+            nonNullArgMayHaveNulls.add(mayHaveNull);
+        }
+
+        // if there is no mask block, and all non-null arguments do not have nulls, return selectAll
+        BytecodeExpression isSelectAll = not(hasMaskBlock);
+        for (Variable mayHaveNull : nonNullArgMayHaveNulls) {
+            isSelectAll = and(isSelectAll, not(mayHaveNull));
+        }
+        body.append(new IfStatement()
+                .condition(isSelectAll)
+                .ifTrue(invokeStatic(AggregationMask.class, "createSelectAll", AggregationMask.class, positionCount).ret()));
+
+        // grow the selection array if necessary
+        Variable selectedPositions = scope.declareVariable("selectedPositions", body, method.getThis().getField(selectedPositionsField));
+        body.append(new IfStatement()
+                .condition(lessThan(selectedPositions.length(), positionCount))
+                .ifTrue(new BytecodeBlock()
+                        .append(selectedPositions.set(newArray(type(int[].class), positionCount)))
+                        .append(method.getThis().setField(selectedPositionsField, selectedPositions))));
+
+        // add all positions that pass the tests
+        Variable position = scope.declareVariable("position", body, constantInt(0));
+        BytecodeExpression isPositionSelected = testMaskBlock(maskBlock, maskBlockMayHaveNull, position);
+        for (int i = 0; i < nonNullArgs.size(); i++) {
+            Variable arg = nonNullArgs.get(i);
+            Variable mayHaveNull = nonNullArgMayHaveNulls.get(i);
+            isPositionSelected = and(isPositionSelected, testPositionIsNotNull(arg, mayHaveNull, position));
+        }
+
+        Variable selectedPositionsIndex = scope.declareVariable("selectedPositionsIndex", body, constantInt(0));
+        body.append(new ForLoop()
+                .condition(lessThan(position, positionCount))
+                .update(position.increment())
+                .body(new IfStatement()
+                        .condition(isPositionSelected)
+                        .ifTrue(new BytecodeBlock()
+                                .append(selectedPositions.setElement(selectedPositionsIndex, position))
+                                .append(selectedPositionsIndex.increment()))));
+
+        body.append(invokeStatic(
+                AggregationMask.class,
+                "createSelectedPositions",
+                AggregationMask.class,
+                positionCount,
+                selectedPositions,
+                selectedPositionsIndex)
+                .ret());
+
+        Class<? extends AggregationMaskBuilder> builderClass = defineClass(
+                definition,
+                AggregationMaskBuilder.class,
+                ImmutableMap.of(),
+                AggregationMaskCompiler.class.getClassLoader());
+
+        try {
+            return builderClass.getConstructor();
+        }
+        catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static BytecodeExpression testPositionIsNotNull(BytecodeExpression block, BytecodeExpression mayHaveNulls, BytecodeExpression position)
+    {
+        return or(not(mayHaveNulls), not(block.invoke("isNull", boolean.class, position)));
+    }
+
+    private static BytecodeExpression testMaskBlock(BytecodeExpression block, BytecodeExpression mayHaveNulls, BytecodeExpression position)
+    {
+        return or(
+                isNull(block),
+                and(
+                        testPositionIsNotNull(block, mayHaveNulls, position),
+                        notEqual(block.invoke("getByte", byte.class, position, constantInt(0)).cast(int.class), constantInt(0))));
+    }
+
+    @UsedByGeneratedCode
+    public static boolean isAlwaysNull(Block block)
+    {
+        if (block instanceof RunLengthEncodedBlock rle) {
+            return rle.getValue().isNull(0);
+        }
+        return false;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationUtils.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationUtils.java
index 207940b8014e..eef1cc8d3165 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationUtils.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregationUtils.java
@@ -18,8 +18,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.sql.gen.CompilerOperations;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 public final class AggregationUtils
 {
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/Aggregator.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/Aggregator.java
index 45543c607509..b6b49fb294b2 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/Aggregator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/Aggregator.java
@@ -35,8 +35,16 @@ public class Aggregator
     private final Type finalType;
     private final int[] inputChannels;
     private final OptionalInt maskChannel;
+    private final AggregationMaskBuilder maskBuilder;
 
-    public Aggregator(Accumulator accumulator, Step step, Type intermediateType, Type finalType, List<Integer> inputChannels, OptionalInt maskChannel)
+    public Aggregator(
+            Accumulator accumulator,
+            Step step,
+            Type intermediateType,
+            Type finalType,
+            List<Integer> inputChannels,
+            OptionalInt maskChannel,
+            AggregationMaskBuilder maskBuilder)
     {
         this.accumulator = requireNonNull(accumulator, "accumulator is null");
         this.step = requireNonNull(step, "step is null");
@@ -44,6 +52,7 @@ public Aggregator(Accumulator accumulator, Step step, Type intermediateType, Typ
         this.finalType = requireNonNull(finalType, "finalType is null");
         this.inputChannels = Ints.toArray(requireNonNull(inputChannels, "inputChannels is null"));
         this.maskChannel = requireNonNull(maskChannel, "maskChannel is null");
+        this.maskBuilder = requireNonNull(maskBuilder, "maskBuilder is null");
         checkArgument(step.isInputRaw() || inputChannels.size() == 1, "expected 1 input channel for intermediate aggregation");
     }
 
@@ -58,21 +67,23 @@ public Type getType()
     public void processPage(Page page)
     {
         if (step.isInputRaw()) {
-            accumulator.addInput(page.getColumns(inputChannels), getMaskBlock(page));
+            Page arguments = page.getColumns(inputChannels);
+            Optional<Block> maskBlock = Optional.empty();
+            if (maskChannel.isPresent()) {
+                maskBlock = Optional.of(page.getBlock(maskChannel.getAsInt()));
+            }
+            AggregationMask mask = maskBuilder.buildAggregationMask(arguments, maskBlock);
+
+            if (mask.isSelectNone()) {
+                return;
+            }
+            accumulator.addInput(arguments, mask);
         }
         else {
             accumulator.addIntermediate(page.getBlock(inputChannels[0]));
         }
     }
 
-    private Optional<Block> getMaskBlock(Page page)
-    {
-        if (maskChannel.isEmpty()) {
-            return Optional.empty();
-        }
-        return Optional.of(page.getBlock(maskChannel.getAsInt()));
-    }
-
     public void evaluate(BlockBuilder blockBuilder)
     {
         if (step.isOutputPartial()) {
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregatorFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregatorFactory.java
index 968162f39347..057faab35c05 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregatorFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/AggregatorFactory.java
@@ -66,7 +66,7 @@ public Aggregator createAggregator()
         else {
             accumulator = accumulatorFactory.createIntermediateAccumulator(lambdaProviders);
         }
-        return new Aggregator(accumulator, step, intermediateType, finalType, inputChannels, maskChannel);
+        return new Aggregator(accumulator, step, intermediateType, finalType, inputChannels, maskChannel, accumulatorFactory.createAggregationMaskBuilder());
     }
 
     public GroupedAggregator createGroupedAggregator()
@@ -78,7 +78,7 @@ public GroupedAggregator createGroupedAggregator()
         else {
             accumulator = accumulatorFactory.createGroupedIntermediateAccumulator(lambdaProviders);
         }
-        return new GroupedAggregator(accumulator, step, intermediateType, finalType, inputChannels, maskChannel);
+        return new GroupedAggregator(accumulator, step, intermediateType, finalType, inputChannels, maskChannel, accumulatorFactory.createAggregationMaskBuilder());
     }
 
     public GroupedAggregator createUnspillGroupedAggregator(Step step, int inputChannel)
@@ -90,7 +90,7 @@ public GroupedAggregator createUnspillGroupedAggregator(Step step, int inputChan
         else {
             accumulator = accumulatorFactory.createGroupedIntermediateAccumulator(lambdaProviders);
         }
-        return new GroupedAggregator(accumulator, step, intermediateType, finalType, ImmutableList.of(inputChannel), maskChannel);
+        return new GroupedAggregator(accumulator, step, intermediateType, finalType, ImmutableList.of(inputChannel), maskChannel, accumulatorFactory.createAggregationMaskBuilder());
     }
 
     public boolean isSpillable()
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateCountDistinctAggregation.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateCountDistinctAggregation.java
index e28492becf3f..1679e3ece3ea 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateCountDistinctAggregation.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateCountDistinctAggregation.java
@@ -16,8 +16,8 @@
 import com.google.common.annotations.VisibleForTesting;
 import io.airlift.stats.cardinality.HyperLogLog;
 import io.trino.operator.aggregation.state.HyperLogLogState;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -52,7 +52,7 @@ private ApproximateCountDistinctAggregation() {}
     @InputFunction
     public static void input(
             @AggregationState HyperLogLogState state,
-            @BlockPosition @SqlType("unknown") Block block,
+            @BlockPosition @SqlType("unknown") ValueBlock block,
             @BlockIndex int index,
             @SqlType(StandardTypes.DOUBLE) double maxStandardError)
     {
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateDoublePercentileArrayAggregations.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateDoublePercentileArrayAggregations.java
index 0abd6c69c19c..b9384fef2f5d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateDoublePercentileArrayAggregations.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateDoublePercentileArrayAggregations.java
@@ -17,6 +17,7 @@
 import com.google.common.primitives.Doubles;
 import io.airlift.stats.TDigest;
 import io.trino.operator.aggregation.state.TDigestAndPercentileArrayState;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.AggregationFunction;
@@ -95,14 +96,12 @@ public static void output(@AggregationState TDigestAndPercentileArrayState state
             return;
         }
 
-        BlockBuilder blockBuilder = out.beginBlockEntry();
-
         List<Double> valuesAtPercentiles = valuesAtPercentiles(digest, percentiles);
-        for (double value : valuesAtPercentiles) {
-            DOUBLE.writeDouble(blockBuilder, value);
-        }
-
-        out.closeEntry();
+        ((ArrayBlockBuilder) out).buildEntry(elementBuilder -> {
+            for (double value : valuesAtPercentiles) {
+                DOUBLE.writeDouble(elementBuilder, value);
+            }
+        });
     }
 
     public static List<Double> valuesAtPercentiles(TDigest digest, List<Double> percentiles)
@@ -124,10 +123,10 @@ public static List<Double> valuesAtPercentiles(TDigest digest, List<Double> perc
             indexes[b] = tempIndex;
         });
 
-        List<Double> valuesAtPercentiles = digest.valuesAt(Doubles.asList(sortedPercentiles));
-        double[] result = new double[valuesAtPercentiles.size()];
-        for (int i = 0; i < valuesAtPercentiles.size(); i++) {
-            result[indexes[i]] = valuesAtPercentiles.get(i);
+        double[] valuesAtPercentiles = digest.valuesAt(sortedPercentiles);
+        double[] result = new double[valuesAtPercentiles.length];
+        for (int i = 0; i < valuesAtPercentiles.length; i++) {
+            result[indexes[i]] = valuesAtPercentiles[i];
         }
 
         return Doubles.asList(result);
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateLongPercentileArrayAggregations.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateLongPercentileArrayAggregations.java
index 3a13d7867a5d..1aa649e1e870 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateLongPercentileArrayAggregations.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateLongPercentileArrayAggregations.java
@@ -15,6 +15,7 @@
 
 import io.airlift.stats.TDigest;
 import io.trino.operator.aggregation.state.TDigestAndPercentileArrayState;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.AggregationFunction;
@@ -65,13 +66,11 @@ public static void output(@AggregationState TDigestAndPercentileArrayState state
             return;
         }
 
-        BlockBuilder blockBuilder = out.beginBlockEntry();
-
-        List<Double> valuesAtPercentiles = valuesAtPercentiles(digest, percentiles);
-        for (double value : valuesAtPercentiles) {
-            BIGINT.writeLong(blockBuilder, Math.round(value));
-        }
-
-        out.closeEntry();
+        ((ArrayBlockBuilder) out).buildEntry(elementBuilder -> {
+            List<Double> valuesAtPercentiles = valuesAtPercentiles(digest, percentiles);
+            for (double value : valuesAtPercentiles) {
+                BIGINT.writeLong(elementBuilder, Math.round(value));
+            }
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateRealPercentileArrayAggregations.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateRealPercentileArrayAggregations.java
index d3577b86fc6a..6679e8feff0a 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateRealPercentileArrayAggregations.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateRealPercentileArrayAggregations.java
@@ -15,6 +15,7 @@
 
 import io.airlift.stats.TDigest;
 import io.trino.operator.aggregation.state.TDigestAndPercentileArrayState;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.AggregationFunction;
@@ -66,13 +67,11 @@ public static void output(@AggregationState TDigestAndPercentileArrayState state
             return;
         }
 
-        BlockBuilder blockBuilder = out.beginBlockEntry();
-
         List<Double> valuesAtPercentiles = valuesAtPercentiles(digest, percentiles);
-        for (double value : valuesAtPercentiles) {
-            REAL.writeLong(blockBuilder, floatToRawIntBits((float) value));
-        }
-
-        out.closeEntry();
+        ((ArrayBlockBuilder) out).buildEntry(elementBuilder -> {
+            for (double value : valuesAtPercentiles) {
+                REAL.writeLong(elementBuilder, floatToRawIntBits((float) value));
+            }
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateSetGenericAggregation.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateSetGenericAggregation.java
index 459dabae0daf..4791fe78a83d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateSetGenericAggregation.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateSetGenericAggregation.java
@@ -16,8 +16,8 @@
 import io.airlift.stats.cardinality.HyperLogLog;
 import io.trino.operator.aggregation.state.HyperLogLogState;
 import io.trino.operator.aggregation.state.StateCompiler;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AccumulatorStateSerializer;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
@@ -51,7 +51,7 @@ private ApproximateSetGenericAggregation() {}
     @InputFunction
     public static void input(
             @AggregationState HyperLogLogState state,
-            @BlockPosition @SqlType("unknown") Block block,
+            @BlockPosition @SqlType("unknown") ValueBlock block,
             @BlockIndex int index)
     {
         // do nothing -- unknown type is always NULL
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/ArbitraryAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/ArbitraryAggregationFunction.java
index 4d6af393bcc0..e62a9ea91adf 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/ArbitraryAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/ArbitraryAggregationFunction.java
@@ -13,8 +13,8 @@
  */
 package io.trino.operator.aggregation;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -27,7 +27,7 @@
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 
-@AggregationFunction("arbitrary")
+@AggregationFunction(value = "any_value", alias = "arbitrary")
 @Description("Return an arbitrary non-null input value")
 public final class ArbitraryAggregationFunction
 {
@@ -37,7 +37,7 @@ private ArbitraryAggregationFunction() {}
     @TypeParameter("T")
     public static void input(
             @AggregationState("T") InOut state,
-            @BlockPosition @SqlType("T") Block block,
+            @BlockPosition @SqlType("T") ValueBlock block,
             @BlockIndex int position)
             throws Throwable
     {
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/BigintApproximateMostFrequent.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/BigintApproximateMostFrequent.java
index bdcf87242691..ecd50b8ac4e0 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/BigintApproximateMostFrequent.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/BigintApproximateMostFrequent.java
@@ -14,6 +14,7 @@
 package io.trino.operator.aggregation;
 
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateMetadata;
 import io.trino.spi.function.AggregationFunction;
@@ -94,12 +95,10 @@ public static void output(@AggregationState State state, BlockBuilder out)
             out.appendNull();
         }
         else {
-            BlockBuilder entryBuilder = out.beginBlockEntry();
-            state.get().forEachBucket((key, value) -> {
-                BigintType.BIGINT.writeLong(entryBuilder, key);
-                BigintType.BIGINT.writeLong(entryBuilder, value);
-            });
-            out.closeEntry();
+            ((MapBlockBuilder) out).buildEntry((keyBuilder, valueBuilder) -> state.get().forEachBucket((key, value) -> {
+                BigintType.BIGINT.writeLong(keyBuilder, key);
+                BigintType.BIGINT.writeLong(valueBuilder, value);
+            }));
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/BlockBuilderCopier.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/BlockBuilderCopier.java
deleted file mode 100644
index 7321f0407843..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/BlockBuilderCopier.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation;
-
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-
-public final class BlockBuilderCopier
-{
-    private BlockBuilderCopier() {}
-
-    public static BlockBuilder copyBlockBuilder(Type type, BlockBuilder blockBuilder)
-    {
-        if (blockBuilder == null) {
-            return null;
-        }
-
-        BlockBuilder copy = blockBuilder.newBlockBuilderLike(null);
-        for (int i = 0; i < blockBuilder.getPositionCount(); i++) {
-            type.appendTo(blockBuilder, i, copy);
-        }
-
-        return copy;
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/ChecksumAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/ChecksumAggregationFunction.java
index 498fd91a6b12..92bbc6e40326 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/ChecksumAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/ChecksumAggregationFunction.java
@@ -14,9 +14,11 @@
 package io.trino.operator.aggregation;
 
 import com.google.common.annotations.VisibleForTesting;
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
 import io.trino.operator.aggregation.state.NullableLongState;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -28,13 +30,13 @@
 import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.OperatorType;
 import io.trino.spi.function.OutputFunction;
+import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 
 import java.lang.invoke.MethodHandle;
 
-import static io.airlift.slice.Slices.wrappedLongArray;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 
@@ -53,10 +55,10 @@ public static void input(
             @OperatorDependency(
                     operator = OperatorType.XX_HASH_64,
                     argumentTypes = "T",
-                    convention = @Convention(arguments = BLOCK_POSITION, result = FAIL_ON_NULL))
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FAIL_ON_NULL))
                     MethodHandle xxHash64Operator,
             @AggregationState NullableLongState state,
-            @NullablePosition @BlockPosition @SqlType("T") Block block,
+            @SqlNullable @BlockPosition @SqlType("T") ValueBlock block,
             @BlockIndex int position)
             throws Throwable
     {
@@ -88,7 +90,9 @@ public static void output(
             out.appendNull();
         }
         else {
-            VARBINARY.writeSlice(out, wrappedLongArray(state.getValue()));
+            Slice value = Slices.allocate(Long.BYTES);
+            value.setLong(0, state.getValue());
+            VARBINARY.writeSlice(out, value);
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/CompiledAccumulatorFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/CompiledAccumulatorFactory.java
index 71f32311d7c3..8200a225228f 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/CompiledAccumulatorFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/CompiledAccumulatorFactory.java
@@ -27,15 +27,18 @@ public class CompiledAccumulatorFactory
     private final Constructor<? extends Accumulator> accumulatorConstructor;
     private final Constructor<? extends GroupedAccumulator> groupedAccumulatorConstructor;
     private final List<Class<?>> lambdaInterfaces;
+    private final Constructor<? extends AggregationMaskBuilder> maskBuilderConstructor;
 
     public CompiledAccumulatorFactory(
             Constructor<? extends Accumulator> accumulatorConstructor,
             Constructor<? extends GroupedAccumulator> groupedAccumulatorConstructor,
-            List<Class<?>> lambdaInterfaces)
+            List<Class<?>> lambdaInterfaces,
+            Constructor<? extends AggregationMaskBuilder> maskBuilderConstructor)
     {
         this.accumulatorConstructor = requireNonNull(accumulatorConstructor, "accumulatorConstructor is null");
         this.groupedAccumulatorConstructor = requireNonNull(groupedAccumulatorConstructor, "groupedAccumulatorConstructor is null");
         this.lambdaInterfaces = ImmutableList.copyOf(requireNonNull(lambdaInterfaces, "lambdaInterfaces is null"));
+        this.maskBuilderConstructor = requireNonNull(maskBuilderConstructor, "maskBuilderConstructor is null");
     }
 
     @Override
@@ -87,4 +90,15 @@ public GroupedAccumulator createGroupedIntermediateAccumulator(List<Supplier<Obj
             throw new RuntimeException(e);
         }
     }
+
+    @Override
+    public AggregationMaskBuilder createAggregationMaskBuilder()
+    {
+        try {
+            return maskBuilderConstructor.newInstance();
+        }
+        catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/CountColumn.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/CountColumn.java
index 9163dab81c84..87ccef50fbec 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/CountColumn.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/CountColumn.java
@@ -14,8 +14,8 @@
 package io.trino.operator.aggregation;
 
 import io.trino.operator.aggregation.state.LongState;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -40,7 +40,7 @@ private CountColumn() {}
     @TypeParameter("T")
     public static void input(
             @AggregationState LongState state,
-            @BlockPosition @SqlType("T") Block block,
+            @BlockPosition @SqlType("T") ValueBlock block,
             @BlockIndex int position)
     {
         state.setValue(state.getValue() + 1);
@@ -49,7 +49,7 @@ public static void input(
     @RemoveInputFunction
     public static void removeInput(
             @AggregationState LongState state,
-            @BlockPosition @SqlType("T") Block block,
+            @BlockPosition @SqlType("T") ValueBlock block,
             @BlockIndex int position)
     {
         state.setValue(state.getValue() - 1);
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/DecimalAverageAggregation.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/DecimalAverageAggregation.java
index cf8ef849a062..c62754cac935 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/DecimalAverageAggregation.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/DecimalAverageAggregation.java
@@ -15,8 +15,8 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import io.trino.operator.aggregation.state.LongDecimalWithOverflowAndLongState;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.Int128ArrayBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -80,7 +80,7 @@ public static void inputShortDecimal(
     @LiteralParameters({"p", "s"})
     public static void inputLongDecimal(
             @AggregationState LongDecimalWithOverflowAndLongState state,
-            @BlockPosition @SqlType(value = "decimal(p, s)", nativeContainerType = Int128.class) Block block,
+            @BlockPosition @SqlType(value = "decimal(p, s)", nativeContainerType = Int128.class) Int128ArrayBlock block,
             @BlockIndex int position)
     {
         state.addLong(1); // row counter
@@ -105,8 +105,6 @@ public static void inputLongDecimal(
     @CombineFunction
     public static void combine(@AggregationState LongDecimalWithOverflowAndLongState state, @AggregationState LongDecimalWithOverflowAndLongState otherState)
     {
-        state.addLong(otherState.getLong()); // row counter
-
         long[] decimal = state.getDecimalArray();
         int offset = state.getDecimalArrayOffset();
 
@@ -128,10 +126,12 @@ public static void combine(@AggregationState LongDecimalWithOverflowAndLongState
             decimal[offset + 1] = otherDecimal[otherOffset + 1];
             state.setOverflow(otherState.getOverflow());
         }
+
+        state.addLong(otherState.getLong()); // row counter
     }
 
     @OutputFunction("decimal(p,s)")
-    public static void outputShortDecimal(
+    public static void outputDecimal(
             @TypeParameter("decimal(p,s)") Type type,
             @AggregationState LongDecimalWithOverflowAndLongState state,
             BlockBuilder out)
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/DecimalSumAggregation.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/DecimalSumAggregation.java
index ea7ad1e1be77..f256a8748777 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/DecimalSumAggregation.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/DecimalSumAggregation.java
@@ -14,8 +14,9 @@
 package io.trino.operator.aggregation;
 
 import io.trino.operator.aggregation.state.LongDecimalWithOverflowState;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.Int128ArrayBlock;
+import io.trino.spi.block.Int128ArrayBlockBuilder;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -65,7 +66,7 @@ public static void inputShortDecimal(
     @LiteralParameters({"p", "s"})
     public static void inputLongDecimal(
             @AggregationState LongDecimalWithOverflowState state,
-            @BlockPosition @SqlType(value = "decimal(p,s)", nativeContainerType = Int128.class) Block block,
+            @BlockPosition @SqlType(value = "decimal(p,s)", nativeContainerType = Int128.class) Int128ArrayBlock block,
             @BlockIndex int position)
     {
         state.setNotNull();
@@ -115,7 +116,7 @@ public static void combine(@AggregationState LongDecimalWithOverflowState state,
     }
 
     @OutputFunction("decimal(38,s)")
-    public static void outputLongDecimal(@AggregationState LongDecimalWithOverflowState state, BlockBuilder out)
+    public static void outputDecimal(@AggregationState LongDecimalWithOverflowState state, BlockBuilder out)
     {
         if (state.isNotNull()) {
             if (state.getOverflow() != 0) {
@@ -129,9 +130,7 @@ public static void outputLongDecimal(@AggregationState LongDecimalWithOverflowSt
             long rawLow = decimal[offset + 1];
 
             Decimals.throwIfOverflows(rawHigh, rawLow);
-            out.writeLong(rawHigh);
-            out.writeLong(rawLow);
-            out.closeEntry();
+            ((Int128ArrayBlockBuilder) out).writeInt128(rawHigh, rawLow);
         }
         else {
             out.appendNull();
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/DefaultApproximateCountDistinctAggregation.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/DefaultApproximateCountDistinctAggregation.java
index ee7c9e7de10e..517fa4df07b4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/DefaultApproximateCountDistinctAggregation.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/DefaultApproximateCountDistinctAggregation.java
@@ -14,8 +14,8 @@
 package io.trino.operator.aggregation;
 
 import io.trino.operator.aggregation.state.HyperLogLogState;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -45,7 +45,7 @@ private DefaultApproximateCountDistinctAggregation() {}
     @InputFunction
     public static void input(
             @AggregationState HyperLogLogState state,
-            @BlockPosition @SqlType("unknown") Block block,
+            @BlockPosition @SqlType("unknown") ValueBlock block,
             @BlockIndex int index)
     {
         // do nothing
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/DistinctAccumulatorFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/DistinctAccumulatorFactory.java
index 8a958fd0f918..b621d999eeab 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/DistinctAccumulatorFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/DistinctAccumulatorFactory.java
@@ -15,26 +15,22 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.Session;
-import io.trino.operator.GroupByIdBlock;
 import io.trino.operator.MarkDistinctHash;
 import io.trino.operator.UpdateMemory;
 import io.trino.operator.Work;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.IntArrayBlock;
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.JoinCompiler;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
-import java.util.stream.IntStream;
 
 import static com.google.common.base.Preconditions.checkState;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.IntegerType.INTEGER;
 import static java.util.Objects.requireNonNull;
 
 public class DistinctAccumulatorFactory
@@ -43,20 +39,17 @@ public class DistinctAccumulatorFactory
     private final AccumulatorFactory delegate;
     private final List<Type> argumentTypes;
     private final JoinCompiler joinCompiler;
-    private final BlockTypeOperators blockTypeOperators;
     private final Session session;
 
     public DistinctAccumulatorFactory(
             AccumulatorFactory delegate,
             List<Type> argumentTypes,
             JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators,
             Session session)
     {
         this.delegate = requireNonNull(delegate, "delegate is null");
         this.argumentTypes = ImmutableList.copyOf(requireNonNull(argumentTypes, "argumentTypes is null"));
         this.joinCompiler = requireNonNull(joinCompiler, "joinCompiler is null");
-        this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
         this.session = requireNonNull(session, "session is null");
     }
 
@@ -73,8 +66,7 @@ public Accumulator createAccumulator(List<Supplier<Object>> lambdaProviders)
                 delegate.createAccumulator(lambdaProviders),
                 argumentTypes,
                 session,
-                joinCompiler,
-                blockTypeOperators);
+                joinCompiler);
     }
 
     @Override
@@ -90,8 +82,7 @@ public GroupedAccumulator createGroupedAccumulator(List<Supplier<Object>> lambda
                 delegate.createGroupedAccumulator(lambdaProviders),
                 argumentTypes,
                 session,
-                joinCompiler,
-                blockTypeOperators);
+                joinCompiler);
     }
 
     @Override
@@ -100,6 +91,12 @@ public GroupedAccumulator createGroupedIntermediateAccumulator(List<Supplier<Obj
         return delegate.createGroupedIntermediateAccumulator(lambdaProviders);
     }
 
+    @Override
+    public AggregationMaskBuilder createAggregationMaskBuilder()
+    {
+        return delegate.createAggregationMaskBuilder();
+    }
+
     private static class DistinctAccumulator
             implements Accumulator
     {
@@ -110,17 +107,14 @@ private DistinctAccumulator(
                 Accumulator accumulator,
                 List<Type> inputTypes,
                 Session session,
-                JoinCompiler joinCompiler,
-                BlockTypeOperators blockTypeOperators)
+                JoinCompiler joinCompiler)
         {
             this.accumulator = requireNonNull(accumulator, "accumulator is null");
             this.hash = new MarkDistinctHash(
                     session,
                     inputTypes,
-                    IntStream.range(0, inputTypes.size()).toArray(),
-                    Optional.empty(),
+                    false,
                     joinCompiler,
-                    blockTypeOperators,
                     UpdateMemory.NOOP);
         }
 
@@ -137,24 +131,25 @@ public Accumulator copy()
         }
 
         @Override
-        public void addInput(Page arguments, Optional<Block> mask)
+        public void addInput(Page arguments, AggregationMask mask)
         {
             // 1. filter out positions based on mask, if present
-            Page filtered = mask
-                    .map(maskBlock -> filter(arguments, maskBlock))
-                    .orElse(arguments);
+            Page filtered = mask.filterPage(arguments);
 
-            if (filtered.getPositionCount() == 0) {
-                return;
-            }
-
-            // 2. compute a distinct mask
+            // 2. compute a distinct mask block
             Work<Block> work = hash.markDistinctRows(filtered);
             checkState(work.process());
             Block distinctMask = work.getResult();
 
-            // 3. feed a Page with a new mask to the underlying aggregation
-            accumulator.addInput(filtered, Optional.of(distinctMask));
+            // 3. update original mask to the new distinct mask block
+            mask.reset(filtered.getPositionCount());
+            mask.applyMaskBlock(distinctMask);
+            if (mask.isSelectNone()) {
+                return;
+            }
+
+            // 4. feed a Page with a new mask to the underlying aggregation
+            accumulator.addInput(filtered, mask);
         }
 
         @Override
@@ -186,20 +181,17 @@ private DistinctGroupedAccumulator(
                 GroupedAccumulator accumulator,
                 List<Type> inputTypes,
                 Session session,
-                JoinCompiler joinCompiler,
-                BlockTypeOperators blockTypeOperators)
+                JoinCompiler joinCompiler)
         {
             this.accumulator = requireNonNull(accumulator, "accumulator is null");
             this.hash = new MarkDistinctHash(
                     session,
                     ImmutableList.<Type>builder()
-                            .add(BIGINT) // group id column
+                            .add(INTEGER) // group id column
                             .addAll(inputTypes)
                             .build(),
-                    IntStream.range(0, inputTypes.size() + 1).toArray(),
-                    Optional.empty(),
+                    false,
                     joinCompiler,
-                    blockTypeOperators,
                     UpdateMemory.NOOP);
         }
 
@@ -210,35 +202,50 @@ public long getEstimatedSize()
         }
 
         @Override
-        public void addInput(GroupByIdBlock groupIdsBlock, Page page, Optional<Block> mask)
+        public void setGroupCount(long groupCount)
         {
-            Page withGroup = page.prependColumn(groupIdsBlock);
+            accumulator.setGroupCount(groupCount);
+        }
 
-            // 1. filter out positions based on mask, if present
-            Page filteredWithGroup = mask
-                    .map(maskBlock -> filter(withGroup, maskBlock))
-                    .orElse(withGroup);
+        @Override
+        public void addInput(int[] groupIds, Page page, AggregationMask mask)
+        {
+            // 1. filter out positions based on mask
+            groupIds = maskGroupIds(groupIds, mask);
+            page = mask.filterPage(page);
 
             // 2. compute a mask for the distinct rows (including the group id)
-            Work<Block> work = hash.markDistinctRows(filteredWithGroup);
+            Work<Block> work = hash.markDistinctRows(page.prependColumn(new IntArrayBlock(page.getPositionCount(), Optional.empty(), groupIds)));
             checkState(work.process());
             Block distinctMask = work.getResult();
 
-            // 3. feed a Page with a new mask to the underlying aggregation
-            GroupByIdBlock groupIds = new GroupByIdBlock(groupIdsBlock.getGroupCount(), filteredWithGroup.getBlock(0));
+            // 3. update original mask to the new distinct mask block
+            mask.reset(page.getPositionCount());
+            mask.applyMaskBlock(distinctMask);
+            if (mask.isSelectNone()) {
+                return;
+            }
+
+            // 4. feed a Page with a new mask to the underlying aggregation
+            accumulator.addInput(groupIds, page, mask);
+        }
+
+        private static int[] maskGroupIds(int[] groupIds, AggregationMask mask)
+        {
+            if (mask.isSelectAll() || mask.isSelectNone()) {
+                return groupIds;
+            }
 
-            // drop the group id column and prepend the distinct mask column
-            int[] columnIndexes = new int[filteredWithGroup.getChannelCount() - 1];
-            for (int i = 0; i < columnIndexes.length; i++) {
-                columnIndexes[i] = i + 1;
+            int[] newGroupIds = new int[mask.getSelectedPositionCount()];
+            int[] selectedPositions = mask.getSelectedPositions();
+            for (int i = 0; i < newGroupIds.length; i++) {
+                newGroupIds[i] = groupIds[selectedPositions[i]];
             }
-            Page filtered = filteredWithGroup.getColumns(columnIndexes);
-            // NOTE: the accumulator must be called even if the filtered page is empty to inform the accumulator about the group count
-            accumulator.addInput(groupIds, filtered, Optional.of(distinctMask));
+            return newGroupIds;
         }
 
         @Override
-        public void addIntermediate(GroupByIdBlock groupIdsBlock, Block block)
+        public void addIntermediate(int[] groupIds, Block block)
         {
             throw new UnsupportedOperationException();
         }
@@ -258,30 +265,4 @@ public void evaluateFinal(int groupId, BlockBuilder output)
         @Override
         public void prepareFinal() {}
     }
-
-    private static Page filter(Page page, Block mask)
-    {
-        int positions = mask.getPositionCount();
-        if (positions > 0 && mask instanceof RunLengthEncodedBlock) {
-            // must have at least 1 position to be able to check the value at position 0
-            if (!mask.isNull(0) && BOOLEAN.getBoolean(mask, 0)) {
-                return page;
-            }
-            return page.getPositions(new int[0], 0, 0);
-        }
-        boolean mayHaveNull = mask.mayHaveNull();
-        int[] ids = new int[positions];
-        int next = 0;
-        for (int i = 0; i < ids.length; ++i) {
-            boolean isNull = mayHaveNull && mask.isNull(i);
-            if (!isNull && BOOLEAN.getBoolean(mask, i)) {
-                ids[next++] = i;
-            }
-        }
-
-        if (next == ids.length) {
-            return page; // no rows were eliminated by the filter
-        }
-        return page.getPositions(ids, 0, next);
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/DoubleHistogramAggregation.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/DoubleHistogramAggregation.java
index 71688ff75cb7..fd40d4d35c5f 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/DoubleHistogramAggregation.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/DoubleHistogramAggregation.java
@@ -15,6 +15,7 @@
 
 import io.trino.operator.aggregation.state.DoubleHistogramStateSerializer;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateMetadata;
 import io.trino.spi.function.AggregationFunction;
@@ -92,13 +93,12 @@ public static void output(@AggregationState State state, BlockBuilder out)
         }
         else {
             Map<Double, Double> value = state.get().getBuckets();
-
-            BlockBuilder entryBuilder = out.beginBlockEntry();
-            for (Map.Entry<Double, Double> entry : value.entrySet()) {
-                DoubleType.DOUBLE.writeDouble(entryBuilder, entry.getKey());
-                DoubleType.DOUBLE.writeDouble(entryBuilder, entry.getValue());
-            }
-            out.closeEntry();
+            ((MapBlockBuilder) out).buildEntry((keyBuilder, valueBuilder) -> {
+                for (Map.Entry<Double, Double> entry : value.entrySet()) {
+                    DoubleType.DOUBLE.writeDouble(keyBuilder, entry.getKey());
+                    DoubleType.DOUBLE.writeDouble(valueBuilder, entry.getValue());
+                }
+            });
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/GroupedAccumulator.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/GroupedAccumulator.java
index c1706beaeeca..0a36caa52a48 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/GroupedAccumulator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/GroupedAccumulator.java
@@ -13,20 +13,19 @@
  */
 package io.trino.operator.aggregation;
 
-import io.trino.operator.GroupByIdBlock;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 
-import java.util.Optional;
-
 public interface GroupedAccumulator
 {
     long getEstimatedSize();
 
-    void addInput(GroupByIdBlock groupIdsBlock, Page page, Optional<Block> mask);
+    void setGroupCount(long groupCount);
+
+    void addInput(int[] groupIds, Page page, AggregationMask mask);
 
-    void addIntermediate(GroupByIdBlock groupIdsBlock, Block block);
+    void addIntermediate(int[] groupIds, Block block);
 
     void evaluateIntermediate(int groupId, BlockBuilder output);
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/GroupedAggregator.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/GroupedAggregator.java
index 9098f325d145..998a914830d6 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/GroupedAggregator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/GroupedAggregator.java
@@ -14,7 +14,6 @@
 package io.trino.operator.aggregation;
 
 import com.google.common.primitives.Ints;
-import io.trino.operator.GroupByIdBlock;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
@@ -37,8 +36,16 @@ public class GroupedAggregator
     private final Type finalType;
     private final int[] inputChannels;
     private final OptionalInt maskChannel;
+    private final AggregationMaskBuilder maskBuilder;
 
-    public GroupedAggregator(GroupedAccumulator accumulator, Step step, Type intermediateType, Type finalType, List<Integer> inputChannels, OptionalInt maskChannel)
+    public GroupedAggregator(
+            GroupedAccumulator accumulator,
+            Step step,
+            Type intermediateType,
+            Type finalType,
+            List<Integer> inputChannels,
+            OptionalInt maskChannel,
+            AggregationMaskBuilder maskBuilder)
     {
         this.accumulator = requireNonNull(accumulator, "accumulator is null");
         this.step = requireNonNull(step, "step is null");
@@ -46,6 +53,7 @@ public GroupedAggregator(GroupedAccumulator accumulator, Step step, Type interme
         this.finalType = requireNonNull(finalType, "finalType is null");
         this.inputChannels = Ints.toArray(requireNonNull(inputChannels, "inputChannels is null"));
         this.maskChannel = requireNonNull(maskChannel, "maskChannel is null");
+        this.maskBuilder = requireNonNull(maskBuilder, "maskBuilder is null");
         checkArgument(step.isInputRaw() || inputChannels.size() == 1, "expected 1 input channel for intermediate aggregation");
     }
 
@@ -62,24 +70,30 @@ public Type getType()
         return finalType;
     }
 
-    public void processPage(GroupByIdBlock groupIds, Page page)
+    public void processPage(int groupCount, int[] groupIds, Page page)
     {
+        accumulator.setGroupCount(groupCount);
+
         if (step.isInputRaw()) {
-            accumulator.addInput(groupIds, page.getColumns(inputChannels), getMaskBlock(page));
+            Page arguments = page.getColumns(inputChannels);
+            Optional<Block> maskBlock = Optional.empty();
+            if (maskChannel.isPresent()) {
+                maskBlock = Optional.of(page.getBlock(maskChannel.getAsInt()).getLoadedBlock());
+            }
+            AggregationMask mask = maskBuilder.buildAggregationMask(arguments, maskBlock);
+
+            if (mask.isSelectNone()) {
+                return;
+            }
+            // Unwrap any LazyBlock values before evaluating the accumulator
+            arguments = arguments.getLoadedPage();
+            accumulator.addInput(groupIds, arguments, mask);
         }
         else {
             accumulator.addIntermediate(groupIds, page.getBlock(inputChannels[0]));
         }
     }
 
-    private Optional<Block> getMaskBlock(Page page)
-    {
-        if (maskChannel.isEmpty()) {
-            return Optional.empty();
-        }
-        return Optional.of(page.getBlock(maskChannel.getAsInt()));
-    }
-
     public void prepareFinal()
     {
         accumulator.prepareFinal();
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/GroupedMapAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/GroupedMapAggregationState.java
new file mode 100644
index 000000000000..0320d955a761
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/GroupedMapAggregationState.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.function.GroupedAccumulatorState;
+import io.trino.spi.type.Type;
+
+import java.lang.invoke.MethodHandle;
+
+import static java.lang.Math.toIntExact;
+
+public class GroupedMapAggregationState
+        extends AbstractMapAggregationState
+        implements GroupedAccumulatorState
+{
+    private int groupId;
+
+    public GroupedMapAggregationState(
+            Type keyType,
+            MethodHandle keyReadFlat,
+            MethodHandle keyWriteFlat,
+            MethodHandle hashFlat,
+            MethodHandle distinctFlatBlock,
+            MethodHandle keyHashBlock,
+            Type valueType,
+            MethodHandle valueReadFlat,
+            MethodHandle valueWriteFlat)
+    {
+        super(
+                keyType,
+                keyReadFlat,
+                keyWriteFlat,
+                hashFlat,
+                distinctFlatBlock,
+                keyHashBlock,
+                valueType,
+                valueReadFlat,
+                valueWriteFlat,
+                true);
+    }
+
+    @Override
+    public void setGroupId(long groupId)
+    {
+        this.groupId = toIntExact(groupId);
+    }
+
+    @Override
+    public void ensureCapacity(long size)
+    {
+        setMaxGroupId(toIntExact(size));
+    }
+
+    @Override
+    public void add(ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition)
+    {
+        add(groupId, keyBlock, keyPosition, valueBlock, valuePosition);
+    }
+
+    @Override
+    public void writeAll(MapBlockBuilder out)
+    {
+        serialize(groupId, out);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/KeyValuePairs.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/KeyValuePairs.java
deleted file mode 100644
index 21c50c9804f7..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/KeyValuePairs.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation;
-
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
-
-import java.util.Arrays;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
-import static io.trino.type.TypeUtils.expectedValueSize;
-import static it.unimi.dsi.fastutil.HashCommon.arraySize;
-import static java.util.Objects.requireNonNull;
-
-public class KeyValuePairs
-{
-    private static final int INSTANCE_SIZE = instanceSize(KeyValuePairs.class);
-    private static final int EXPECTED_ENTRIES = 10;
-    private static final int EXPECTED_ENTRY_SIZE = 16;
-    private static final float FILL_RATIO = 0.75f;
-    private static final int EMPTY_SLOT = -1;
-
-    private final BlockBuilder keyBlockBuilder;
-    private final Type keyType;
-    private final BlockPositionEqual keyEqualOperator;
-    private final BlockPositionHashCode keyHashCodeOperator;
-
-    private final BlockBuilder valueBlockBuilder;
-    private final Type valueType;
-
-    private int[] keyPositionByHash;
-    private int hashCapacity;
-    private int maxFill;
-    private int hashMask;
-
-    public KeyValuePairs(
-            Type keyType,
-            BlockPositionEqual keyEqualOperator,
-            BlockPositionHashCode keyHashCodeOperator,
-            Type valueType)
-    {
-        this.keyType = requireNonNull(keyType, "keyType is null");
-        this.valueType = requireNonNull(valueType, "valueType is null");
-        this.keyEqualOperator = requireNonNull(keyEqualOperator, "keyEqualOperator is null");
-        this.keyHashCodeOperator = requireNonNull(keyHashCodeOperator, "keyHashCodeOperator is null");
-        keyBlockBuilder = this.keyType.createBlockBuilder(null, EXPECTED_ENTRIES, expectedValueSize(keyType, EXPECTED_ENTRY_SIZE));
-        valueBlockBuilder = this.valueType.createBlockBuilder(null, EXPECTED_ENTRIES, expectedValueSize(valueType, EXPECTED_ENTRY_SIZE));
-        hashCapacity = arraySize(EXPECTED_ENTRIES, FILL_RATIO);
-        this.maxFill = calculateMaxFill(hashCapacity);
-        this.hashMask = hashCapacity - 1;
-        keyPositionByHash = new int[hashCapacity];
-        Arrays.fill(keyPositionByHash, EMPTY_SLOT);
-    }
-
-    public KeyValuePairs(
-            Block serialized,
-            Type keyType,
-            BlockPositionEqual keyEqualOperator,
-            BlockPositionHashCode keyHashCodeOperator,
-            Type valueType)
-
-    {
-        this(keyType, keyEqualOperator, keyHashCodeOperator, valueType);
-        deserialize(requireNonNull(serialized, "serialized is null"));
-    }
-
-    // for copying
-    private KeyValuePairs(
-            BlockBuilder keyBlockBuilder,
-            Type keyType,
-            BlockPositionEqual keyEqualOperator,
-            BlockPositionHashCode keyHashCodeOperator,
-            BlockBuilder valueBlockBuilder,
-            Type valueType,
-            int[] keyPositionByHash,
-            int hashCapacity,
-            int maxFill,
-            int hashMask)
-    {
-        this.keyBlockBuilder = keyBlockBuilder;
-        this.keyType = keyType;
-        this.keyEqualOperator = keyEqualOperator;
-        this.keyHashCodeOperator = keyHashCodeOperator;
-        this.valueBlockBuilder = valueBlockBuilder;
-        this.valueType = valueType;
-        this.keyPositionByHash = keyPositionByHash;
-        this.hashCapacity = hashCapacity;
-        this.maxFill = maxFill;
-        this.hashMask = hashMask;
-    }
-
-    public Block getKeys()
-    {
-        return keyBlockBuilder.build();
-    }
-
-    public Block getValues()
-    {
-        return valueBlockBuilder.build();
-    }
-
-    private void deserialize(Block block)
-    {
-        for (int i = 0; i < block.getPositionCount(); i += 2) {
-            add(block, block, i, i + 1);
-        }
-    }
-
-    public void serialize(BlockBuilder out)
-    {
-        BlockBuilder mapBlockBuilder = out.beginBlockEntry();
-        for (int i = 0; i < keyBlockBuilder.getPositionCount(); i++) {
-            keyType.appendTo(keyBlockBuilder, i, mapBlockBuilder);
-            valueType.appendTo(valueBlockBuilder, i, mapBlockBuilder);
-        }
-        out.closeEntry();
-    }
-
-    public long estimatedInMemorySize()
-    {
-        long size = INSTANCE_SIZE;
-        size += keyBlockBuilder.getRetainedSizeInBytes();
-        size += valueBlockBuilder.getRetainedSizeInBytes();
-        size += sizeOf(keyPositionByHash);
-        return size;
-    }
-
-    /**
-     * Only add this key value pair if we haven't seen this key before.
-     * Otherwise, ignore it.
-     */
-    public void add(Block key, Block value, int keyPosition, int valuePosition)
-    {
-        if (!keyExists(key, keyPosition)) {
-            addKey(key, keyPosition);
-            if (value.isNull(valuePosition)) {
-                valueBlockBuilder.appendNull();
-            }
-            else {
-                valueType.appendTo(value, valuePosition, valueBlockBuilder);
-            }
-        }
-    }
-
-    private boolean keyExists(Block key, int position)
-    {
-        checkArgument(position >= 0, "position is negative");
-        return keyPositionByHash[getHashPositionOfKey(key, position)] != EMPTY_SLOT;
-    }
-
-    private void addKey(Block key, int position)
-    {
-        checkArgument(position >= 0, "position is negative");
-        keyType.appendTo(key, position, keyBlockBuilder);
-        int hashPosition = getHashPositionOfKey(key, position);
-        if (keyPositionByHash[hashPosition] == EMPTY_SLOT) {
-            keyPositionByHash[hashPosition] = keyBlockBuilder.getPositionCount() - 1;
-            if (keyBlockBuilder.getPositionCount() >= maxFill) {
-                rehash();
-            }
-        }
-    }
-
-    private int getHashPositionOfKey(Block key, int position)
-    {
-        int hashPosition = getMaskedHash(keyHashCodeOperator.hashCodeNullSafe(key, position));
-        while (true) {
-            if (keyPositionByHash[hashPosition] == EMPTY_SLOT) {
-                return hashPosition;
-            }
-            if (keyEqualOperator.equalNullSafe(keyBlockBuilder, keyPositionByHash[hashPosition], key, position)) {
-                return hashPosition;
-            }
-            hashPosition = getMaskedHash(hashPosition + 1);
-        }
-    }
-
-    private void rehash()
-    {
-        long newCapacityLong = hashCapacity * 2L;
-        if (newCapacityLong > Integer.MAX_VALUE) {
-            throw new TrinoException(GENERIC_INSUFFICIENT_RESOURCES, "Size of hash table cannot exceed 1 billion entries");
-        }
-        int newCapacity = (int) newCapacityLong;
-        hashCapacity = newCapacity;
-        hashMask = newCapacity - 1;
-        maxFill = calculateMaxFill(newCapacity);
-        keyPositionByHash = new int[newCapacity];
-        Arrays.fill(keyPositionByHash, EMPTY_SLOT);
-        for (int position = 0; position < keyBlockBuilder.getPositionCount(); position++) {
-            keyPositionByHash[getHashPositionOfKey(keyBlockBuilder, position)] = position;
-        }
-    }
-
-    private static int calculateMaxFill(int hashSize)
-    {
-        checkArgument(hashSize > 0, "hashSize must be greater than 0");
-        int maxFill = (int) Math.ceil(hashSize * FILL_RATIO);
-        if (maxFill == hashSize) {
-            maxFill--;
-        }
-        checkArgument(hashSize > maxFill, "hashSize must be larger than maxFill");
-        return maxFill;
-    }
-
-    private int getMaskedHash(long rawHash)
-    {
-        return (int) (rawHash & hashMask);
-    }
-
-    public KeyValuePairs copy()
-    {
-        BlockBuilder keyBlockBuilderCopy = null;
-        if (keyBlockBuilder != null) {
-            keyBlockBuilderCopy = (BlockBuilder) keyBlockBuilder.copyRegion(0, keyBlockBuilder.getPositionCount());
-        }
-        BlockBuilder valueBlockBuilderCopy = null;
-        if (valueBlockBuilder != null) {
-            valueBlockBuilderCopy = (BlockBuilder) valueBlockBuilder.copyRegion(0, valueBlockBuilder.getPositionCount());
-        }
-        return new KeyValuePairs(
-                keyBlockBuilderCopy,
-                keyType,
-                keyEqualOperator,
-                keyHashCodeOperator,
-                valueBlockBuilderCopy,
-                valueType,
-                keyPositionByHash.clone(),
-                hashCapacity,
-                maxFill,
-                hashMask);
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationFunction.java
index 6c5de06b3659..a1f1ce4b57cd 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationFunction.java
@@ -13,29 +13,20 @@
  */
 package io.trino.operator.aggregation;
 
-import io.trino.operator.aggregation.state.KeyValuePairsState;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
 import io.trino.spi.function.BlockPosition;
 import io.trino.spi.function.CombineFunction;
-import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.InputFunction;
-import io.trino.spi.function.OperatorDependency;
-import io.trino.spi.function.OperatorType;
 import io.trino.spi.function.OutputFunction;
+import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
-import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
-
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 
 @AggregationFunction(value = "map_agg", isOrderSensitive = true)
 @Description("Aggregates all the rows (key/value pairs) into a single map")
@@ -47,63 +38,26 @@ private MapAggregationFunction() {}
     @TypeParameter("K")
     @TypeParameter("V")
     public static void input(
-            @TypeParameter("K") Type keyType,
-            @OperatorDependency(
-                    operator = OperatorType.EQUAL,
-                    argumentTypes = {"K", "K"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = NULLABLE_RETURN))
-                    BlockPositionEqual keyEqual,
-            @OperatorDependency(
-                    operator = OperatorType.HASH_CODE,
-                    argumentTypes = "K",
-                    convention = @Convention(arguments = BLOCK_POSITION, result = FAIL_ON_NULL))
-                    BlockPositionHashCode keyHashCode,
-            @TypeParameter("V") Type valueType,
-            @AggregationState({"K", "V"}) KeyValuePairsState state,
-            @BlockPosition @SqlType("K") Block key,
-            @NullablePosition @BlockPosition @SqlType("V") Block value,
-            @BlockIndex int position)
+            @AggregationState({"K", "V"}) MapAggregationState state,
+            @BlockPosition @SqlType("K") ValueBlock key,
+            @BlockIndex int keyPosition,
+            @SqlNullable @BlockPosition @SqlType("V") ValueBlock value,
+            @BlockIndex int valuePosition)
     {
-        KeyValuePairs pairs = state.get();
-        if (pairs == null) {
-            pairs = new KeyValuePairs(keyType, keyEqual, keyHashCode, valueType);
-            state.set(pairs);
-        }
-
-        long startSize = pairs.estimatedInMemorySize();
-        pairs.add(key, value, position, position);
-        state.addMemoryUsage(pairs.estimatedInMemorySize() - startSize);
+        state.add(key, keyPosition, value, valuePosition);
     }
 
     @CombineFunction
     public static void combine(
-            @AggregationState({"K", "V"}) KeyValuePairsState state,
-            @AggregationState({"K", "V"}) KeyValuePairsState otherState)
+            @AggregationState({"K", "V"}) MapAggregationState state,
+            @AggregationState({"K", "V"}) MapAggregationState otherState)
     {
-        if (state.get() != null && otherState.get() != null) {
-            Block keys = otherState.get().getKeys();
-            Block values = otherState.get().getValues();
-            KeyValuePairs pairs = state.get();
-            long startSize = pairs.estimatedInMemorySize();
-            for (int i = 0; i < keys.getPositionCount(); i++) {
-                pairs.add(keys, values, i, i);
-            }
-            state.addMemoryUsage(pairs.estimatedInMemorySize() - startSize);
-        }
-        else if (state.get() == null) {
-            state.set(otherState.get());
-        }
+        state.merge(otherState);
     }
 
     @OutputFunction("map(K, V)")
-    public static void output(@AggregationState({"K", "V"}) KeyValuePairsState state, BlockBuilder out)
+    public static void output(@AggregationState({"K", "V"}) MapAggregationState state, BlockBuilder out)
     {
-        KeyValuePairs pairs = state.get();
-        if (pairs == null) {
-            out.appendNull();
-        }
-        else {
-            pairs.serialize(out);
-        }
+        state.writeAll((MapBlockBuilder) out);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationState.java
new file mode 100644
index 000000000000..f1fdbe3122f9
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationState.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import io.trino.spi.block.Block;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.function.AccumulatorState;
+import io.trino.spi.function.AccumulatorStateMetadata;
+
+@AccumulatorStateMetadata(
+        stateFactoryClass = MapAggregationStateFactory.class,
+        stateSerializerClass = MapAggregationStateSerializer.class,
+        typeParameters = {"K", "V"},
+        serializedType = "map(K, V)")
+public interface MapAggregationState
+        extends AccumulatorState
+{
+    void add(ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition);
+
+    default void merge(MapAggregationState other)
+    {
+        SqlMap serializedState = ((SingleMapAggregationState) other).removeTempSerializedState();
+        int rawOffset = serializedState.getRawOffset();
+        Block rawKeyBlock = serializedState.getRawKeyBlock();
+        Block rawValueBlock = serializedState.getRawValueBlock();
+
+        ValueBlock rawKeyValues = rawKeyBlock.getUnderlyingValueBlock();
+        ValueBlock rawValueValues = rawValueBlock.getUnderlyingValueBlock();
+        for (int i = 0; i < serializedState.getSize(); i++) {
+            add(rawKeyValues, rawKeyBlock.getUnderlyingValuePosition(rawOffset + i), rawValueValues, rawValueBlock.getUnderlyingValuePosition(rawOffset + i));
+        }
+    }
+
+    void writeAll(MapBlockBuilder out);
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationStateFactory.java
new file mode 100644
index 000000000000..ddb2a4630a54
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationStateFactory.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import io.trino.spi.function.AccumulatorStateFactory;
+import io.trino.spi.function.Convention;
+import io.trino.spi.function.OperatorDependency;
+import io.trino.spi.function.OperatorType;
+import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.Type;
+
+import java.lang.invoke.MethodHandle;
+
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
+import static java.util.Objects.requireNonNull;
+
+public class MapAggregationStateFactory
+        implements AccumulatorStateFactory<MapAggregationState>
+{
+    private final Type keyType;
+    private final MethodHandle keyReadFlat;
+    private final MethodHandle keyWriteFlat;
+    private final MethodHandle keyHashFlat;
+    private final MethodHandle keyDistinctFlatBlock;
+    private final MethodHandle keyHashBlock;
+
+    private final Type valueType;
+    private final MethodHandle valueReadFlat;
+    private final MethodHandle valueWriteFlat;
+
+    public MapAggregationStateFactory(
+            @TypeParameter("K") Type keyType,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "K",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER)) MethodHandle keyReadFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "K",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN)) MethodHandle keyWriteFlat,
+            @OperatorDependency(
+                    operator = OperatorType.HASH_CODE,
+                    argumentTypes = "K",
+                    convention = @Convention(arguments = FLAT, result = FAIL_ON_NULL)) MethodHandle keyHashFlat,
+            @OperatorDependency(
+                    operator = OperatorType.IS_DISTINCT_FROM,
+                    argumentTypes = {"K", "K"},
+                    convention = @Convention(arguments = {FLAT, VALUE_BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL)) MethodHandle keyDistinctFlatBlock,
+            @OperatorDependency(
+                    operator = OperatorType.HASH_CODE,
+                    argumentTypes = "K",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FAIL_ON_NULL)) MethodHandle keyHashBlock,
+            @TypeParameter("V") Type valueType,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "V",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER)) MethodHandle valueReadFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "V",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN)) MethodHandle valueWriteFlat)
+    {
+        this.keyType = requireNonNull(keyType, "keyType is null");
+        this.keyReadFlat = requireNonNull(keyReadFlat, "keyReadFlat is null");
+        this.keyWriteFlat = requireNonNull(keyWriteFlat, "keyWriteFlat is null");
+        this.keyHashFlat = requireNonNull(keyHashFlat, "keyHashFlat is null");
+        this.keyDistinctFlatBlock = requireNonNull(keyDistinctFlatBlock, "keyDistinctFlatBlock is null");
+        this.keyHashBlock = requireNonNull(keyHashBlock, "keyHashBlock is null");
+
+        this.valueType = requireNonNull(valueType, "valueType is null");
+        this.valueReadFlat = requireNonNull(valueReadFlat, "valueReadFlat is null");
+        this.valueWriteFlat = requireNonNull(valueWriteFlat, "valueWriteFlat is null");
+    }
+
+    @Override
+    public MapAggregationState createSingleState()
+    {
+        return new SingleMapAggregationState(keyType, keyReadFlat, keyWriteFlat, keyHashFlat, keyDistinctFlatBlock, keyHashBlock, valueType, valueReadFlat, valueWriteFlat);
+    }
+
+    @Override
+    public MapAggregationState createGroupedState()
+    {
+        return new GroupedMapAggregationState(keyType, keyReadFlat, keyWriteFlat, keyHashFlat, keyDistinctFlatBlock, keyHashBlock, valueType, valueReadFlat, valueWriteFlat);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationStateSerializer.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationStateSerializer.java
new file mode 100644
index 000000000000..3d79890b0474
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/MapAggregationStateSerializer.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.function.AccumulatorStateSerializer;
+import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.Type;
+
+public class MapAggregationStateSerializer
+        implements AccumulatorStateSerializer<MapAggregationState>
+{
+    private final MapType serializedType;
+
+    public MapAggregationStateSerializer(@TypeParameter("map(K, V)") Type serializedType)
+    {
+        this.serializedType = (MapType) serializedType;
+    }
+
+    @Override
+    public Type getSerializedType()
+    {
+        return serializedType;
+    }
+
+    @Override
+    public void serialize(MapAggregationState state, BlockBuilder out)
+    {
+        state.writeAll((MapBlockBuilder) out);
+    }
+
+    @Override
+    public void deserialize(Block block, int index, MapAggregationState state)
+    {
+        SqlMap sqlMap = serializedType.getObject(block, index);
+        ((SingleMapAggregationState) state).setTempSerializedState(sqlMap);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/MapUnionAggregation.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/MapUnionAggregation.java
index c37f40c38156..718090b4601f 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/MapUnionAggregation.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/MapUnionAggregation.java
@@ -13,27 +13,20 @@
  */
 package io.trino.operator.aggregation;
 
-import io.trino.operator.aggregation.state.KeyValuePairsState;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.CombineFunction;
-import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.InputFunction;
-import io.trino.spi.function.OperatorDependency;
-import io.trino.spi.function.OperatorType;
 import io.trino.spi.function.OutputFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
-
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 
 @AggregationFunction("map_union")
 @Description("Aggregate all the maps into a single map")
@@ -45,45 +38,32 @@ private MapUnionAggregation() {}
     @TypeParameter("K")
     @TypeParameter("V")
     public static void input(
-            @TypeParameter("K") Type keyType,
-            @OperatorDependency(
-                    operator = OperatorType.EQUAL,
-                    argumentTypes = {"K", "K"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = NULLABLE_RETURN))
-                    BlockPositionEqual keyEqual,
-            @OperatorDependency(
-                    operator = OperatorType.HASH_CODE,
-                    argumentTypes = "K",
-                    convention = @Convention(arguments = BLOCK_POSITION, result = FAIL_ON_NULL))
-                    BlockPositionHashCode keyHashCode,
             @TypeParameter("V") Type valueType,
-            @AggregationState({"K", "V"}) KeyValuePairsState state,
-            @SqlType("map(K,V)") Block value)
+            @AggregationState({"K", "V"}) MapAggregationState state,
+            @SqlType("map(K,V)") SqlMap value)
     {
-        KeyValuePairs pairs = state.get();
-        if (pairs == null) {
-            pairs = new KeyValuePairs(keyType, keyEqual, keyHashCode, valueType);
-            state.set(pairs);
-        }
+        int rawOffset = value.getRawOffset();
+        Block rawKeyBlock = value.getRawKeyBlock();
+        Block rawValueBlock = value.getRawValueBlock();
 
-        long startSize = pairs.estimatedInMemorySize();
-        for (int i = 0; i < value.getPositionCount(); i += 2) {
-            pairs.add(value, value, i, i + 1);
+        ValueBlock rawKeyValues = rawKeyBlock.getUnderlyingValueBlock();
+        ValueBlock rawValueValues = rawValueBlock.getUnderlyingValueBlock();
+        for (int i = 0; i < value.getSize(); i++) {
+            state.add(rawKeyValues, rawKeyBlock.getUnderlyingValuePosition(rawOffset + i), rawValueValues, rawValueBlock.getUnderlyingValuePosition(rawOffset + i));
         }
-        state.addMemoryUsage(pairs.estimatedInMemorySize() - startSize);
     }
 
     @CombineFunction
     public static void combine(
-            @AggregationState({"K", "V"}) KeyValuePairsState state,
-            @AggregationState({"K", "V"}) KeyValuePairsState otherState)
+            @AggregationState({"K", "V"}) MapAggregationState state,
+            @AggregationState({"K", "V"}) MapAggregationState otherState)
     {
-        MapAggregationFunction.combine(state, otherState);
+        state.merge(otherState);
     }
 
     @OutputFunction("map(K, V)")
-    public static void output(@AggregationState({"K", "V"}) KeyValuePairsState state, BlockBuilder out)
+    public static void output(@AggregationState({"K", "V"}) MapAggregationState state, BlockBuilder out)
     {
-        MapAggregationFunction.output(state, out);
+        state.writeAll((MapBlockBuilder) out);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/MaxAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/MaxAggregationFunction.java
index b781a7358fa4..6ec2f540c84f 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/MaxAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/MaxAggregationFunction.java
@@ -13,8 +13,8 @@
  */
 package io.trino.operator.aggregation;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -32,8 +32,8 @@
 
 import java.lang.invoke.MethodHandle;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.IN_OUT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 
 @AggregationFunction("max")
@@ -48,10 +48,10 @@ public static void input(
             @OperatorDependency(
                     operator = OperatorType.COMPARISON_UNORDERED_FIRST,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, IN_OUT}, result = FAIL_ON_NULL))
+                    convention = @Convention(arguments = {VALUE_BLOCK_POSITION_NOT_NULL, IN_OUT}, result = FAIL_ON_NULL))
                     MethodHandle compare,
             @AggregationState("T") InOut state,
-            @BlockPosition @SqlType("T") Block block,
+            @BlockPosition @SqlType("T") ValueBlock block,
             @BlockIndex int position)
             throws Throwable
     {
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/MaxByAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/MaxByAggregationFunction.java
index 0c29d7421cfb..1e7a2f1294d9 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/MaxByAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/MaxByAggregationFunction.java
@@ -13,8 +13,8 @@
  */
 package io.trino.operator.aggregation;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -27,13 +27,14 @@
 import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.OperatorType;
 import io.trino.spi.function.OutputFunction;
+import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 
 import java.lang.invoke.MethodHandle;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.IN_OUT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 
 @AggregationFunction("max_by")
@@ -49,18 +50,19 @@ public static void input(
             @OperatorDependency(
                     operator = OperatorType.COMPARISON_UNORDERED_FIRST,
                     argumentTypes = {"K", "K"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, IN_OUT}, result = FAIL_ON_NULL))
+                    convention = @Convention(arguments = {VALUE_BLOCK_POSITION_NOT_NULL, IN_OUT}, result = FAIL_ON_NULL))
                     MethodHandle compare,
             @AggregationState("K") InOut keyState,
             @AggregationState("V") InOut valueState,
-            @NullablePosition @BlockPosition @SqlType("V") Block valueBlock,
-            @BlockPosition @SqlType("K") Block keyBlock,
-            @BlockIndex int position)
+            @SqlNullable @BlockPosition @SqlType("V") ValueBlock valueBlock,
+            @BlockIndex int valuePosition,
+            @BlockPosition @SqlType("K") ValueBlock keyBlock,
+            @BlockIndex int keyPosition)
             throws Throwable
     {
-        if (keyState.isNull() || ((long) compare.invokeExact(keyBlock, position, keyState)) > 0) {
-            keyState.set(keyBlock, position);
-            valueState.set(valueBlock, position);
+        if (keyState.isNull() || ((long) compare.invokeExact(keyBlock, keyPosition, keyState)) > 0) {
+            keyState.set(keyBlock, keyPosition);
+            valueState.set(valueBlock, valuePosition);
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/MaxDataSizeForStats.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/MaxDataSizeForStats.java
index c506f85ccd1d..317e16ba8649 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/MaxDataSizeForStats.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/MaxDataSizeForStats.java
@@ -14,8 +14,8 @@
 package io.trino.operator.aggregation;
 
 import io.trino.operator.aggregation.state.LongState;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -23,6 +23,7 @@
 import io.trino.spi.function.CombineFunction;
 import io.trino.spi.function.InputFunction;
 import io.trino.spi.function.OutputFunction;
+import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.BigintType;
@@ -39,7 +40,7 @@ private MaxDataSizeForStats() {}
 
     @InputFunction
     @TypeParameter("T")
-    public static void input(@AggregationState LongState state, @NullablePosition @BlockPosition @SqlType("T") Block block, @BlockIndex int index)
+    public static void input(@AggregationState LongState state, @SqlNullable @BlockPosition @SqlType("T") ValueBlock block, @BlockIndex int index)
     {
         update(state, block.getEstimatedDataSizeForStats(index));
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/MergeQuantileDigestFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/MergeQuantileDigestFunction.java
index 2c18f112974d..5076734a0a93 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/MergeQuantileDigestFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/MergeQuantileDigestFunction.java
@@ -15,8 +15,8 @@
 
 import io.airlift.stats.QuantileDigest;
 import io.trino.operator.aggregation.state.QuantileDigestState;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -45,7 +45,7 @@ private MergeQuantileDigestFunction() {}
     public static void input(
             @TypeParameter("qdigest(V)") Type type,
             @AggregationState QuantileDigestState state,
-            @BlockPosition @SqlType("qdigest(V)") Block value,
+            @BlockPosition @SqlType("qdigest(V)") ValueBlock value,
             @BlockIndex int index)
     {
         merge(state, new QuantileDigest(type.getSlice(value, index)));
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/MinAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/MinAggregationFunction.java
index 839d56965972..8616b7c2116c 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/MinAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/MinAggregationFunction.java
@@ -13,8 +13,8 @@
  */
 package io.trino.operator.aggregation;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -32,8 +32,8 @@
 
 import java.lang.invoke.MethodHandle;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.IN_OUT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 
 @AggregationFunction("min")
@@ -48,10 +48,10 @@ public static void input(
             @OperatorDependency(
                     operator = OperatorType.COMPARISON_UNORDERED_LAST,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, IN_OUT}, result = FAIL_ON_NULL))
+                    convention = @Convention(arguments = {VALUE_BLOCK_POSITION_NOT_NULL, IN_OUT}, result = FAIL_ON_NULL))
                     MethodHandle compare,
             @AggregationState("T") InOut state,
-            @BlockPosition @SqlType("T") Block block,
+            @BlockPosition @SqlType("T") ValueBlock block,
             @BlockIndex int position)
             throws Throwable
     {
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/MinByAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/MinByAggregationFunction.java
index b26648b0fa4b..3c79a80adc1f 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/MinByAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/MinByAggregationFunction.java
@@ -13,8 +13,8 @@
  */
 package io.trino.operator.aggregation;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -27,13 +27,14 @@
 import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.OperatorType;
 import io.trino.spi.function.OutputFunction;
+import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 
 import java.lang.invoke.MethodHandle;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.IN_OUT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 
 @AggregationFunction("min_by")
@@ -49,18 +50,19 @@ public static void input(
             @OperatorDependency(
                     operator = OperatorType.COMPARISON_UNORDERED_LAST,
                     argumentTypes = {"K", "K"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, IN_OUT}, result = FAIL_ON_NULL))
+                    convention = @Convention(arguments = {VALUE_BLOCK_POSITION_NOT_NULL, IN_OUT}, result = FAIL_ON_NULL))
                     MethodHandle compare,
             @AggregationState("K") InOut keyState,
             @AggregationState("V") InOut valueState,
-            @NullablePosition @BlockPosition @SqlType("V") Block valueBlock,
-            @BlockPosition @SqlType("K") Block keyBlock,
-            @BlockIndex int position)
+            @SqlNullable @BlockPosition @SqlType("V") ValueBlock valueBlock,
+            @BlockIndex int valuePosition,
+            @BlockPosition @SqlType("K") ValueBlock keyBlock,
+            @BlockIndex int keyPosition)
             throws Throwable
     {
-        if (keyState.isNull() || ((long) compare.invokeExact(keyBlock, position, keyState)) < 0) {
-            keyState.set(keyBlock, position);
-            valueState.set(valueBlock, position);
+        if (keyState.isNull() || ((long) compare.invokeExact(keyBlock, keyPosition, keyState)) < 0) {
+            keyState.set(keyBlock, keyPosition);
+            valueState.set(valueBlock, valuePosition);
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/NullablePosition.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/NullablePosition.java
deleted file mode 100644
index 06af037f12a4..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/NullablePosition.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-public @interface NullablePosition
-{
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/NumericHistogram.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/NumericHistogram.java
index 63cb2ab0ebae..34334d432ec9 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/NumericHistogram.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/NumericHistogram.java
@@ -71,8 +71,8 @@ public NumericHistogram(Slice serialized, int buffer)
         values = new double[maxBuckets + buffer];
         weights = new double[maxBuckets + buffer];
 
-        input.readBytes(Slices.wrappedDoubleArray(values), nextIndex * SizeOf.SIZE_OF_DOUBLE);
-        input.readBytes(Slices.wrappedDoubleArray(weights), nextIndex * SizeOf.SIZE_OF_DOUBLE);
+        input.readDoubles(values, 0, nextIndex);
+        input.readDoubles(weights, 0, nextIndex);
     }
 
     public Slice serialize()
@@ -90,8 +90,8 @@ public Slice serialize()
                 .appendByte(FORMAT_TAG)
                 .appendInt(maxBuckets)
                 .appendInt(nextIndex)
-                .appendBytes(Slices.wrappedDoubleArray(values, 0, nextIndex))
-                .appendBytes(Slices.wrappedDoubleArray(weights, 0, nextIndex))
+                .appendDoubles(values, 0, nextIndex)
+                .appendDoubles(weights, 0, nextIndex)
                 .getUnderlyingSlice();
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/OrderedAccumulatorFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/OrderedAccumulatorFactory.java
index 5e752410ee06..6b86643cdea9 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/OrderedAccumulatorFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/OrderedAccumulatorFactory.java
@@ -15,12 +15,12 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
-import io.trino.operator.GroupByIdBlock;
 import io.trino.operator.PagesIndex;
 import io.trino.operator.PagesIndex.Factory;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.IntArrayBlock;
 import io.trino.spi.connector.SortOrder;
 import io.trino.spi.type.Type;
 
@@ -31,8 +31,8 @@
 import java.util.function.Supplier;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static com.google.common.base.Verify.verify;
+import static io.trino.spi.type.IntegerType.INTEGER;
 import static java.lang.Long.max;
 import static java.util.Objects.requireNonNull;
 
@@ -96,6 +96,12 @@ public GroupedAccumulator createGroupedIntermediateAccumulator(List<Supplier<Obj
         return delegate.createGroupedIntermediateAccumulator(lambdaProviders);
     }
 
+    @Override
+    public AggregationMaskBuilder createAggregationMaskBuilder()
+    {
+        return delegate.createAggregationMaskBuilder();
+    }
+
     private static class OrderedAccumulator
             implements Accumulator
     {
@@ -133,12 +139,9 @@ public Accumulator copy()
         }
 
         @Override
-        public void addInput(Page page, Optional<Block> mask)
+        public void addInput(Page page, AggregationMask mask)
         {
-            if (mask.isPresent()) {
-                page = filter(page, mask.orElseThrow());
-            }
-            pagesIndex.addPage(page);
+            pagesIndex.addPage(mask.filterPage(page));
         }
 
         @Override
@@ -158,7 +161,11 @@ public void evaluateFinal(BlockBuilder blockBuilder)
         {
             pagesIndex.sort(orderByChannels, orderings);
             Iterator<Page> pagesIterator = pagesIndex.getSortedPages();
-            pagesIterator.forEachRemaining(arguments -> accumulator.addInput(arguments.getColumns(argumentChannels), Optional.empty()));
+            AggregationMask mask = AggregationMask.createSelectAll(0);
+            pagesIterator.forEachRemaining(arguments -> {
+                mask.reset(arguments.getPositionCount());
+                accumulator.addInput(arguments.getColumns(argumentChannels), mask);
+            });
             accumulator.evaluateFinal(blockBuilder);
         }
     }
@@ -188,7 +195,7 @@ private OrderingGroupedAccumulator(
             this.orderings = ImmutableList.copyOf(requireNonNull(orderings, "orderings is null"));
             List<Type> pageIndexTypes = new ArrayList<>(aggregationSourceTypes);
             // Add group id column
-            pageIndexTypes.add(BIGINT);
+            pageIndexTypes.add(INTEGER);
             this.pagesIndex = pagesIndexFactory.newPagesIndex(pageIndexTypes, 10_000);
             this.groupCount = 0;
         }
@@ -200,31 +207,28 @@ public long getEstimatedSize()
         }
 
         @Override
-        public void addInput(GroupByIdBlock groupIdsBlock, Page page, Optional<Block> mask)
+        public void setGroupCount(long groupCount)
         {
-            groupCount = max(groupCount, groupIdsBlock.getGroupCount());
+            this.groupCount = max(this.groupCount, groupCount);
+            accumulator.setGroupCount(groupCount);
+        }
+
+        @Override
+        public void addInput(int[] groupIds, Page page, AggregationMask mask)
+        {
+            if (mask.isSelectNone()) {
+                return;
+            }
 
             // Add group id block
-            page = page.appendColumn(groupIdsBlock);
+            page = page.appendColumn(new IntArrayBlock(page.getPositionCount(), Optional.empty(), groupIds));
 
             // mask page
-            if (mask.isPresent()) {
-                page = filter(page, mask.orElseThrow());
-            }
-            if (page.getPositionCount() == 0) {
-                // page was entirely filtered out, but we need to inform the accumulator of the new group count
-                accumulator.addInput(
-                        new GroupByIdBlock(groupCount, page.getBlock(page.getChannelCount() - 1)),
-                        page.getColumns(argumentChannels),
-                        Optional.empty());
-            }
-            else {
-                pagesIndex.addPage(page);
-            }
+            pagesIndex.addPage(mask.filterPage(page));
         }
 
         @Override
-        public void addIntermediate(GroupByIdBlock groupIdsBlock, Block block)
+        public void addIntermediate(int[] groupIds, Block block)
         {
             throw new UnsupportedOperationException();
         }
@@ -246,23 +250,22 @@ public void prepareFinal()
         {
             pagesIndex.sort(orderByChannels, orderings);
             Iterator<Page> pagesIterator = pagesIndex.getSortedPages();
-            pagesIterator.forEachRemaining(page -> accumulator.addInput(
-                    new GroupByIdBlock(groupCount, page.getBlock(page.getChannelCount() - 1)),
-                    page.getColumns(argumentChannels),
-                    Optional.empty()));
+            AggregationMask mask = AggregationMask.createSelectAll(0);
+            pagesIterator.forEachRemaining(page -> {
+                mask.reset(page.getPositionCount());
+                accumulator.addInput(
+                        extractGroupIds(page),
+                        page.getColumns(argumentChannels),
+                        mask);
+            });
         }
-    }
 
-    private static Page filter(Page page, Block mask)
-    {
-        int[] ids = new int[mask.getPositionCount()];
-        int next = 0;
-        for (int i = 0; i < page.getPositionCount(); ++i) {
-            if (BOOLEAN.getBoolean(mask, i)) {
-                ids[next++] = i;
-            }
+        private static int[] extractGroupIds(Page page)
+        {
+            // this works because getSortedPages copies data into new blocks
+            IntArrayBlock groupIdBlock = (IntArrayBlock) page.getBlock(page.getChannelCount() - 1);
+            verify(groupIdBlock.getRawValuesOffset() == 0);
+            return groupIdBlock.getRawValues();
         }
-
-        return page.getPositions(ids, 0, next);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/ParametricAggregation.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/ParametricAggregation.java
index d447e88ecd35..6d1454e18810 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/ParametricAggregation.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/ParametricAggregation.java
@@ -71,9 +71,10 @@ public ParametricAggregation(
 
     private static FunctionMetadata createFunctionMetadata(Signature signature, AggregationHeader details, FunctionNullability functionNullability)
     {
-        FunctionMetadata.Builder functionMetadata = FunctionMetadata.aggregateBuilder()
-                .signature(signature)
-                .canonicalName(details.getName());
+        FunctionMetadata.Builder functionMetadata = FunctionMetadata.aggregateBuilder(details.getName())
+                .signature(signature);
+
+        details.getAliases().forEach(functionMetadata::alias);
 
         if (details.getDescription().isPresent()) {
             functionMetadata.description(details.getDescription().get());
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/ParametricAggregationImplementation.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/ParametricAggregationImplementation.java
index f74054653d61..ba77f57d03dc 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/ParametricAggregationImplementation.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/ParametricAggregationImplementation.java
@@ -19,7 +19,7 @@
 import io.trino.operator.aggregation.AggregationFromAnnotationsParser.AccumulatorStateDetails;
 import io.trino.operator.aggregation.AggregationFunctionAdapter.AggregationParameterKind;
 import io.trino.operator.annotations.ImplementationDependency;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -28,6 +28,7 @@
 import io.trino.spi.function.FunctionNullability;
 import io.trino.spi.function.OutputFunction;
 import io.trino.spi.function.Signature;
+import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.TypeSignature;
@@ -219,7 +220,7 @@ public boolean areTypesAssignable(BoundSignature boundSignature)
 
             // block and position works for any type, but if block is annotated with SqlType nativeContainerType, then only types with the
             // specified container type match
-            if (isCurrentBlockPosition && methodDeclaredType.isAssignableFrom(Block.class)) {
+            if (isCurrentBlockPosition && ValueBlock.class.isAssignableFrom(methodDeclaredType)) {
                 continue;
             }
             if (methodDeclaredType.isAssignableFrom(argumentType)) {
@@ -231,24 +232,6 @@ public boolean areTypesAssignable(BoundSignature boundSignature)
         return true;
     }
 
-    @Override
-    public ParametricImplementation withAlias(String alias)
-    {
-        return new ParametricAggregationImplementation(
-                signature.withName(alias),
-                definitionClass,
-                inputFunction,
-                removeInputFunction,
-                outputFunction,
-                combineFunction,
-                argumentNativeContainerTypes,
-                inputDependencies,
-                removeInputDependencies,
-                combineDependencies,
-                outputDependencies,
-                inputParameterKinds);
-    }
-
     public static final class Parser
     {
         private final Class<?> aggregationDefinition;
@@ -270,7 +253,6 @@ public static final class Parser
 
         private Parser(
                 Class<?> aggregationDefinition,
-                String name,
                 List<AccumulatorStateDetails<?>> stateDetails,
                 Method inputFunction,
                 Optional<Method> removeInputFunction,
@@ -279,7 +261,6 @@ private Parser(
         {
             // rewrite data passed directly
             this.aggregationDefinition = aggregationDefinition;
-            signatureBuilder.name(name);
 
             // parse declared literal and type parameters
             // it is required to declare all literal and type parameters in input function
@@ -342,14 +323,13 @@ private ParametricAggregationImplementation get()
 
         public static ParametricAggregationImplementation parseImplementation(
                 Class<?> aggregationDefinition,
-                String name,
                 List<AccumulatorStateDetails<?>> stateDetails,
                 Method inputFunction,
                 Optional<Method> removeInputFunction,
                 Method outputFunction,
                 Optional<Method> combineFunction)
         {
-            return new Parser(aggregationDefinition, name, stateDetails, inputFunction, removeInputFunction, outputFunction, combineFunction).get();
+            return new Parser(aggregationDefinition, stateDetails, inputFunction, removeInputFunction, outputFunction, combineFunction).get();
         }
 
         private static List<AggregationParameterKind> parseInputParameterKinds(Method method)
@@ -486,7 +466,7 @@ public List<ImplementationDependency> parseImplementationDependencies(Method inp
 
         public static boolean isParameterNullable(Annotation[] annotations)
         {
-            return containsAnnotation(annotations, annotation -> annotation instanceof NullablePosition);
+            return containsAnnotation(annotations, annotation -> annotation instanceof SqlNullable);
         }
 
         public static boolean isParameterBlock(Annotation[] annotations)
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/RealHistogramAggregation.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/RealHistogramAggregation.java
index e4720a9b97f4..ce5820565715 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/RealHistogramAggregation.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/RealHistogramAggregation.java
@@ -14,6 +14,7 @@
 package io.trino.operator.aggregation;
 
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.CombineFunction;
@@ -59,12 +60,12 @@ public static void output(@AggregationState DoubleHistogramAggregation.State sta
         }
         else {
             Map<Double, Double> value = state.get().getBuckets();
-            BlockBuilder entryBuilder = out.beginBlockEntry();
-            for (Map.Entry<Double, Double> entry : value.entrySet()) {
-                REAL.writeLong(entryBuilder, floatToRawIntBits(entry.getKey().floatValue()));
-                REAL.writeLong(entryBuilder, floatToRawIntBits(entry.getValue().floatValue()));
-            }
-            out.closeEntry();
+            ((MapBlockBuilder) out).buildEntry((keyBuilder, valueBuilder) -> {
+                for (Map.Entry<Double, Double> entry : value.entrySet()) {
+                    REAL.writeLong(keyBuilder, floatToRawIntBits(entry.getKey().floatValue()));
+                    REAL.writeLong(valueBuilder, floatToRawIntBits(entry.getValue().floatValue()));
+                }
+            });
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/ReduceAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/ReduceAggregationFunction.java
index 4bb4a734b81e..4725fd8c87cf 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/ReduceAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/ReduceAggregationFunction.java
@@ -63,9 +63,8 @@ public class ReduceAggregationFunction
     public ReduceAggregationFunction()
     {
         super(
-                FunctionMetadata.aggregateBuilder()
+                FunctionMetadata.aggregateBuilder(NAME)
                         .signature(Signature.builder()
-                                .name(NAME)
                                 .typeVariable("T")
                                 .typeVariable("S")
                                 .returnType(new TypeSignature("S"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/SingleMapAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/SingleMapAggregationState.java
new file mode 100644
index 000000000000..1d6fd3b8421d
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/SingleMapAggregationState.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.function.AccumulatorState;
+import io.trino.spi.type.Type;
+
+import java.lang.invoke.MethodHandle;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+
+public class SingleMapAggregationState
+        extends AbstractMapAggregationState
+{
+    private SqlMap tempSerializedState;
+
+    public SingleMapAggregationState(
+            Type keyType,
+            MethodHandle keyReadFlat,
+            MethodHandle keyWriteFlat,
+            MethodHandle hashFlat,
+            MethodHandle distinctFlatBlock,
+            MethodHandle keyHashBlock,
+            Type valueType,
+            MethodHandle valueReadFlat,
+            MethodHandle valueWriteFlat)
+    {
+        super(
+                keyType,
+                keyReadFlat,
+                keyWriteFlat,
+                hashFlat,
+                distinctFlatBlock,
+                keyHashBlock,
+                valueType,
+                valueReadFlat,
+                valueWriteFlat,
+                false);
+    }
+
+    private SingleMapAggregationState(SingleMapAggregationState state)
+    {
+        super(state);
+        checkArgument(state.tempSerializedState == null, "state.tempSerializedState is not null");
+        tempSerializedState = null;
+    }
+
+    @Override
+    public void add(ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition)
+    {
+        add(0, keyBlock, keyPosition, valueBlock, valuePosition);
+    }
+
+    @Override
+    public void writeAll(MapBlockBuilder out)
+    {
+        serialize(0, out);
+    }
+
+    @Override
+    public AccumulatorState copy()
+    {
+        return new SingleMapAggregationState(this);
+    }
+
+    void setTempSerializedState(SqlMap tempSerializedState)
+    {
+        this.tempSerializedState = tempSerializedState;
+    }
+
+    SqlMap removeTempSerializedState()
+    {
+        SqlMap sqlMap = tempSerializedState;
+        checkState(sqlMap != null, "tempDeserializeBlock is null");
+        tempSerializedState = null;
+        return sqlMap;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/SumDataSizeForStats.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/SumDataSizeForStats.java
index 44a95f947bc2..04f2f607f8dd 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/SumDataSizeForStats.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/SumDataSizeForStats.java
@@ -14,8 +14,8 @@
 package io.trino.operator.aggregation;
 
 import io.trino.operator.aggregation.state.LongState;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -23,6 +23,7 @@
 import io.trino.spi.function.CombineFunction;
 import io.trino.spi.function.InputFunction;
 import io.trino.spi.function.OutputFunction;
+import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.BigintType;
@@ -37,7 +38,7 @@ private SumDataSizeForStats() {}
 
     @InputFunction
     @TypeParameter("T")
-    public static void input(@AggregationState LongState state, @NullablePosition @BlockPosition @SqlType("T") Block block, @BlockIndex int index)
+    public static void input(@AggregationState LongState state, @SqlNullable @BlockPosition @SqlType("T") ValueBlock block, @BlockIndex int index)
     {
         update(state, block.getEstimatedDataSizeForStats(index));
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/TypeSignatureMapping.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/TypeSignatureMapping.java
index 6016a1284e7e..6ba912c58362 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/TypeSignatureMapping.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/TypeSignatureMapping.java
@@ -61,7 +61,7 @@ public ImplementationDependency mapTypes(ImplementationDependency dependency)
         }
         if (dependency instanceof FunctionImplementationDependency functionDependency) {
             return new FunctionImplementationDependency(
-                    functionDependency.getFullyQualifiedName(),
+                    functionDependency.getName(),
                     functionDependency.getArgumentTypes().stream()
                             .map(this::mapTypeSignature)
                             .collect(toImmutableList()),
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/TypedSet.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/TypedSet.java
deleted file mode 100644
index 3a436a907e6b..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/TypedSet.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation;
-
-import com.google.common.annotations.VisibleForTesting;
-import io.airlift.units.DataSize;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
-import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.airlift.units.DataSize.Unit.MEGABYTE;
-import static io.trino.spi.StandardErrorCode.EXCEEDED_FUNCTION_MEMORY_LIMIT;
-import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
-import static it.unimi.dsi.fastutil.HashCommon.arraySize;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-
-/**
- * A set of unique SQL values stored in a {@link Block}.
- *
- * <p>Depending on the factory method used, the values' equality may be
- * determined using SQL equality or {@code IS DISTINCT FROM} semantics.
- */
-public class TypedSet
-{
-    @VisibleForTesting
-    public static final DataSize MAX_FUNCTION_MEMORY = DataSize.of(4, MEGABYTE);
-
-    private static final int INSTANCE_SIZE = instanceSize(TypedSet.class);
-    private static final int INT_ARRAY_LIST_INSTANCE_SIZE = instanceSize(IntArrayList.class);
-    private static final float FILL_RATIO = 0.75f;
-
-    private final Type elementType;
-    private final BlockPositionEqual elementEqualOperator;
-    private final BlockPositionIsDistinctFrom elementDistinctFromOperator;
-    private final BlockPositionHashCode elementHashCodeOperator;
-    private final IntArrayList blockPositionByHash;
-    private final BlockBuilder elementBlock;
-    private final String functionName;
-    private final long maxBlockMemoryInBytes;
-
-    private final int initialElementBlockOffset;
-    private final long initialElementBlockSizeInBytes;
-    // The number of elements added to the TypedSet (including null). Should
-    // always be equal to elementBlock.getPositionsCount() - initialElementBlockOffset.
-    private int size;
-    private int hashCapacity;
-    private int maxFill;
-    private int hashMask;
-    private static final int EMPTY_SLOT = -1;
-
-    private boolean containsNullElement;
-
-    /**
-     * Create a {@code TypedSet} that compares its elements using SQL equality
-     * comparison.
-     */
-    public static TypedSet createEqualityTypedSet(
-            Type elementType,
-            BlockPositionEqual elementEqualOperator,
-            BlockPositionHashCode elementHashCodeOperator,
-            int expectedSize,
-            String functionName)
-    {
-        return createEqualityTypedSet(
-                elementType,
-                elementEqualOperator,
-                elementHashCodeOperator,
-                elementType.createBlockBuilder(null, expectedSize),
-                expectedSize,
-                functionName);
-    }
-
-    /**
-     * Create a {@code TypedSet} that compares its elements using SQL equality
-     * comparison.
-     *
-     * <p>The elements of the set will be written in the given {@code BlockBuilder}.
-     * If the {@code BlockBuilder} is modified by the caller, the set will stop
-     * functioning correctly.
-     */
-    public static TypedSet createEqualityTypedSet(
-            Type elementType,
-            BlockPositionEqual elementEqualOperator,
-            BlockPositionHashCode elementHashCodeOperator,
-            BlockBuilder elementBlock,
-            int expectedSize,
-            String functionName)
-    {
-        return new TypedSet(
-                elementType,
-                elementEqualOperator,
-                null,
-                elementHashCodeOperator,
-                elementBlock,
-                expectedSize,
-                functionName,
-                false);
-    }
-
-    /**
-     * Create a {@code TypedSet} with no size limit that compares its elements
-     * using SQL equality comparison.
-     *
-     * <p>The elements of the set will be written in the given {@code BlockBuilder}.
-     * If the {@code BlockBuilder} is modified by the caller, the set will stop
-     * functioning correctly.
-     */
-    public static TypedSet createUnboundedEqualityTypedSet(
-            Type elementType,
-            BlockPositionEqual elementEqualOperator,
-            BlockPositionHashCode elementHashCodeOperator,
-            BlockBuilder elementBlock,
-            int expectedSize,
-            String functionName)
-    {
-        return new TypedSet(
-                elementType,
-                elementEqualOperator,
-                null,
-                elementHashCodeOperator,
-                elementBlock,
-                expectedSize,
-                functionName,
-                true);
-    }
-
-    /**
-     * Create a {@code TypedSet} that compares its elements using the semantics
-     * of {@code IS DISTINCT}.
-     */
-    public static TypedSet createDistinctTypedSet(
-            Type elementType,
-            BlockPositionIsDistinctFrom elementDistinctFromOperator,
-            BlockPositionHashCode elementHashCodeOperator,
-            int expectedSize,
-            String functionName)
-    {
-        return createDistinctTypedSet(
-                elementType,
-                elementDistinctFromOperator,
-                elementHashCodeOperator,
-                elementType.createBlockBuilder(null, expectedSize),
-                expectedSize,
-                functionName);
-    }
-
-    /**
-     * Create a {@code TypedSet} that compares its elements using the semantics
-     * of {@code IS DISTINCT}.
-     *
-     * <p>The elements of the set will be written in the given {@code BlockBuilder}.
-     * If the {@code BlockBuilder} is modified by the caller, the set will stop
-     * functioning correctly.
-     */
-    public static TypedSet createDistinctTypedSet(
-            Type elementType,
-            BlockPositionIsDistinctFrom elementDistinctFromOperator,
-            BlockPositionHashCode elementHashCodeOperator,
-            BlockBuilder elementBlock,
-            int expectedSize,
-            String functionName)
-    {
-        return new TypedSet(
-                elementType,
-                null,
-                elementDistinctFromOperator,
-                elementHashCodeOperator,
-                elementBlock,
-                expectedSize,
-                functionName,
-                false);
-    }
-
-    private TypedSet(
-            Type elementType,
-            BlockPositionEqual elementEqualOperator,
-            BlockPositionIsDistinctFrom elementDistinctFromOperator,
-            BlockPositionHashCode elementHashCodeOperator,
-            BlockBuilder elementBlock,
-            int expectedSize,
-            String functionName,
-            boolean unboundedMemory)
-    {
-        checkArgument(expectedSize >= 0, "expectedSize must not be negative");
-        this.elementType = requireNonNull(elementType, "elementType is null");
-
-        checkArgument(elementEqualOperator == null ^ elementDistinctFromOperator == null, "Element equal or distinct_from operator must be provided");
-        this.elementEqualOperator = elementEqualOperator;
-        this.elementDistinctFromOperator = elementDistinctFromOperator;
-        this.elementHashCodeOperator = requireNonNull(elementHashCodeOperator, "elementHashCodeOperator is null");
-
-        this.elementBlock = requireNonNull(elementBlock, "elementBlock must not be null");
-        this.functionName = functionName;
-        this.maxBlockMemoryInBytes = unboundedMemory ? Long.MAX_VALUE : MAX_FUNCTION_MEMORY.toBytes();
-
-        initialElementBlockOffset = elementBlock.getPositionCount();
-        initialElementBlockSizeInBytes = elementBlock.getSizeInBytes();
-
-        this.size = 0;
-        this.hashCapacity = arraySize(expectedSize, FILL_RATIO);
-        this.maxFill = calculateMaxFill(hashCapacity);
-        this.hashMask = hashCapacity - 1;
-
-        blockPositionByHash = new IntArrayList(hashCapacity);
-        blockPositionByHash.size(hashCapacity);
-        for (int i = 0; i < hashCapacity; i++) {
-            blockPositionByHash.set(i, EMPTY_SLOT);
-        }
-
-        this.containsNullElement = false;
-    }
-
-    /**
-     * Returns the retained size of this block in memory, including over-allocations.
-     * This method is called from the innermost execution loop and must be fast.
-     */
-    public long getRetainedSizeInBytes()
-    {
-        return INSTANCE_SIZE
-                + INT_ARRAY_LIST_INSTANCE_SIZE
-                + elementBlock.getRetainedSizeInBytes()
-                + blockPositionByHash.size() * (long) Integer.BYTES;
-    }
-
-    /**
-     * Return whether this set contains the value at the given {@code position}
-     * in the given {@code block}.
-     */
-    public boolean contains(Block block, int position)
-    {
-        requireNonNull(block, "block must not be null");
-        checkArgument(position >= 0, "position must be >= 0");
-
-        if (block.isNull(position)) {
-            return containsNullElement;
-        }
-        return blockPositionByHash.getInt(getHashPositionOfElement(block, position)) != EMPTY_SLOT;
-    }
-
-    /**
-     * Add the value at the given {@code position} in the given {@code block}
-     * to this set.
-     *
-     * @return {@code true} if the value was added, or {@code false} if it was
-     * already in this set.
-     */
-    public boolean add(Block block, int position)
-    {
-        requireNonNull(block, "block must not be null");
-        checkArgument(position >= 0, "position must be >= 0");
-
-        // containsNullElement flag is maintained so contains() method can have shortcut for null value
-        if (block.isNull(position)) {
-            if (containsNullElement) {
-                return false;
-            }
-            containsNullElement = true;
-        }
-
-        int hashPosition = getHashPositionOfElement(block, position);
-        if (blockPositionByHash.getInt(hashPosition) == EMPTY_SLOT) {
-            addNewElement(hashPosition, block, position);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Returns the number of elements in this set.
-     */
-    public int size()
-    {
-        return size;
-    }
-
-    /**
-     * Return the position in this set's {@code BlockBuilder} of the value at
-     * the given {@code position} in the given {@code block}, or -1 if the
-     * value is not in this set.
-     */
-    public int positionOf(Block block, int position)
-    {
-        return blockPositionByHash.getInt(getHashPositionOfElement(block, position));
-    }
-
-    /**
-     * Get slot position of element at {@code position} of {@code block}
-     */
-    private int getHashPositionOfElement(Block block, int position)
-    {
-        int hashPosition = getMaskedHash(elementHashCodeOperator.hashCodeNullSafe(block, position));
-        while (true) {
-            int blockPosition = blockPositionByHash.getInt(hashPosition);
-            if (blockPosition == EMPTY_SLOT) {
-                // Doesn't have this element
-                return hashPosition;
-            }
-            if (isNotDistinct(elementBlock, blockPosition, block, position)) {
-                // Already has this element
-                return hashPosition;
-            }
-
-            hashPosition = getMaskedHash(hashPosition + 1);
-        }
-    }
-
-    private boolean isNotDistinct(Block leftBlock, int leftPosition, Block rightBlock, int rightPosition)
-    {
-        if (elementDistinctFromOperator != null) {
-            return !elementDistinctFromOperator.isDistinctFrom(leftBlock, leftPosition, rightBlock, rightPosition);
-        }
-        return elementEqualOperator.equalNullSafe(leftBlock, leftPosition, rightBlock, rightPosition);
-    }
-
-    private void addNewElement(int hashPosition, Block block, int position)
-    {
-        elementType.appendTo(block, position, elementBlock);
-        if (elementBlock.getSizeInBytes() - initialElementBlockSizeInBytes > maxBlockMemoryInBytes) {
-            throw new TrinoException(
-                    EXCEEDED_FUNCTION_MEMORY_LIMIT,
-                    format("The input to %s is too large. More than %s of memory is needed to hold the intermediate hash set.\n",
-                            functionName,
-                            MAX_FUNCTION_MEMORY));
-        }
-        blockPositionByHash.set(hashPosition, elementBlock.getPositionCount() - 1);
-
-        // increase capacity, if necessary
-        size++;
-        if (size >= maxFill) {
-            rehash();
-        }
-    }
-
-    private void rehash()
-    {
-        long newCapacityLong = hashCapacity * 2L;
-        if (newCapacityLong > Integer.MAX_VALUE) {
-            throw new TrinoException(GENERIC_INSUFFICIENT_RESOURCES, "Size of hash table cannot exceed 1 billion entries");
-        }
-        int newCapacity = (int) newCapacityLong;
-
-        hashCapacity = newCapacity;
-        hashMask = newCapacity - 1;
-        maxFill = calculateMaxFill(newCapacity);
-        blockPositionByHash.size(newCapacity);
-        for (int i = 0; i < newCapacity; i++) {
-            blockPositionByHash.set(i, EMPTY_SLOT);
-        }
-
-        for (int blockPosition = initialElementBlockOffset; blockPosition < elementBlock.getPositionCount(); blockPosition++) {
-            blockPositionByHash.set(getHashPositionOfElement(elementBlock, blockPosition), blockPosition);
-        }
-    }
-
-    private static int calculateMaxFill(int hashSize)
-    {
-        checkArgument(hashSize > 0, "hashSize must be greater than 0");
-        int maxFill = (int) Math.ceil(hashSize * FILL_RATIO);
-        if (maxFill == hashSize) {
-            maxFill--;
-        }
-        checkArgument(hashSize > maxFill, "hashSize must be larger than maxFill");
-        return maxFill;
-    }
-
-    private int getMaskedHash(long rawHash)
-    {
-        return (int) (rawHash & hashMask);
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/VarcharApproximateMostFrequent.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/VarcharApproximateMostFrequent.java
index da94e4420cd2..b63a79d5ebff 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/VarcharApproximateMostFrequent.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/VarcharApproximateMostFrequent.java
@@ -15,6 +15,7 @@
 
 import io.airlift.slice.Slice;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateMetadata;
 import io.trino.spi.function.AggregationFunction;
@@ -97,12 +98,10 @@ public static void output(@AggregationState State state, BlockBuilder out)
             out.appendNull();
         }
         else {
-            BlockBuilder entryBuilder = out.beginBlockEntry();
-            state.get().forEachBucket((key, value) -> {
-                VarcharType.VARCHAR.writeSlice(entryBuilder, key);
-                BigintType.BIGINT.writeLong(entryBuilder, value);
-            });
-            out.closeEntry();
+            ((MapBlockBuilder) out).buildEntry((keyBuilder, valueBuilder) -> state.get().forEachBucket((key, value) -> {
+                VarcharType.VARCHAR.writeSlice(keyBuilder, key);
+                BigintType.BIGINT.writeLong(valueBuilder, value);
+            }));
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationFunction.java
index a4c4b295f292..d4e969d50bd6 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationFunction.java
@@ -13,9 +13,9 @@
  */
 package io.trino.operator.aggregation.arrayagg;
 
-import io.trino.operator.aggregation.NullablePosition;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -24,6 +24,7 @@
 import io.trino.spi.function.Description;
 import io.trino.spi.function.InputFunction;
 import io.trino.spi.function.OutputFunction;
+import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.Type;
@@ -38,7 +39,7 @@ private ArrayAggregationFunction() {}
     @TypeParameter("T")
     public static void input(
             @AggregationState("T") ArrayAggregationState state,
-            @NullablePosition @BlockPosition @SqlType("T") Block value,
+            @SqlNullable @BlockPosition @SqlType("T") ValueBlock value,
             @BlockIndex int position)
     {
         state.add(value, position);
@@ -62,9 +63,7 @@ public static void output(
             out.appendNull();
         }
         else {
-            BlockBuilder entryBuilder = out.beginBlockEntry();
-            state.forEach((block, position) -> elementType.appendTo(block, position, entryBuilder));
-            out.closeEntry();
+            ((ArrayBlockBuilder) out).buildEntry(state::writeAll);
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationState.java
index 2b4fce3fa318..4488e1708ff4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationState.java
@@ -14,6 +14,8 @@
 package io.trino.operator.aggregation.arrayagg;
 
 import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateMetadata;
 
@@ -25,19 +27,18 @@
 public interface ArrayAggregationState
         extends AccumulatorState
 {
-    void add(Block block, int position);
+    void add(ValueBlock block, int position);
 
-    void forEach(ArrayAggregationStateConsumer consumer);
+    void writeAll(BlockBuilder blockBuilder);
 
     boolean isEmpty();
 
     default void merge(ArrayAggregationState otherState)
     {
-        otherState.forEach(this::add);
-    }
-
-    default void reset()
-    {
-        throw new UnsupportedOperationException();
+        Block block = ((SingleArrayAggregationState) otherState).removeTempDeserializeBlock();
+        ValueBlock valueBlock = block.getUnderlyingValueBlock();
+        for (int position = 0; position < block.getPositionCount(); position++) {
+            add(valueBlock, block.getUnderlyingValuePosition(position));
+        }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationStateFactory.java
index c840b57cc69a..9176c313398e 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationStateFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationStateFactory.java
@@ -14,28 +14,53 @@
 package io.trino.operator.aggregation.arrayagg;
 
 import io.trino.spi.function.AccumulatorStateFactory;
+import io.trino.spi.function.Convention;
+import io.trino.spi.function.OperatorDependency;
+import io.trino.spi.function.OperatorType;
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.Type;
 
+import java.lang.invoke.MethodHandle;
+
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
+
 public class ArrayAggregationStateFactory
         implements AccumulatorStateFactory<ArrayAggregationState>
 {
     private final Type type;
+    private final MethodHandle readFlat;
+    private final MethodHandle writeFlat;
 
-    public ArrayAggregationStateFactory(@TypeParameter("T") Type type)
+    public ArrayAggregationStateFactory(
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER))
+            MethodHandle readFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN))
+            MethodHandle writeFlat,
+            @TypeParameter("T") Type type)
     {
         this.type = type;
+        this.readFlat = readFlat;
+        this.writeFlat = writeFlat;
     }
 
     @Override
     public ArrayAggregationState createSingleState()
     {
-        return new SingleArrayAggregationState(type);
+        return new SingleArrayAggregationState(type, readFlat, writeFlat);
     }
 
     @Override
     public ArrayAggregationState createGroupedState()
     {
-        return new GroupArrayAggregationState(type);
+        return new GroupArrayAggregationState(type, readFlat, writeFlat);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationStateSerializer.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationStateSerializer.java
index 5b9d93a0c7e2..725415f8b746 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationStateSerializer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/ArrayAggregationStateSerializer.java
@@ -13,6 +13,7 @@
  */
 package io.trino.operator.aggregation.arrayagg;
 
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.AccumulatorStateSerializer;
@@ -23,12 +24,10 @@
 public class ArrayAggregationStateSerializer
         implements AccumulatorStateSerializer<ArrayAggregationState>
 {
-    private final Type elementType;
     private final Type arrayType;
 
     public ArrayAggregationStateSerializer(@TypeParameter("T") Type elementType)
     {
-        this.elementType = elementType;
         this.arrayType = new ArrayType(elementType);
     }
 
@@ -45,19 +44,13 @@ public void serialize(ArrayAggregationState state, BlockBuilder out)
             out.appendNull();
         }
         else {
-            BlockBuilder entryBuilder = out.beginBlockEntry();
-            state.forEach((block, position) -> elementType.appendTo(block, position, entryBuilder));
-            out.closeEntry();
+            ((ArrayBlockBuilder) out).buildEntry(state::writeAll);
         }
     }
 
     @Override
     public void deserialize(Block block, int index, ArrayAggregationState state)
     {
-        state.reset();
-        Block stateBlock = (Block) arrayType.getObject(block, index);
-        for (int i = 0; i < stateBlock.getPositionCount(); i++) {
-            state.add(stateBlock, i);
-        }
+        ((SingleArrayAggregationState) state).setTempDeserializeBlock((Block) arrayType.getObject(block, index));
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/FlatArrayBuilder.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/FlatArrayBuilder.java
new file mode 100644
index 000000000000..57c2121508b2
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/FlatArrayBuilder.java
@@ -0,0 +1,285 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation.arrayagg;
+
+import com.google.common.base.Throwables;
+import io.trino.operator.VariableWidthData;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.type.Type;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.airlift.slice.SizeOf.sizeOfObjectArray;
+import static io.trino.operator.VariableWidthData.EMPTY_CHUNK;
+import static io.trino.operator.VariableWidthData.POINTER_SIZE;
+import static io.trino.operator.VariableWidthData.getChunkOffset;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
+import static java.util.Objects.checkIndex;
+import static java.util.Objects.requireNonNull;
+
+public class FlatArrayBuilder
+{
+    private static final int INSTANCE_SIZE = instanceSize(FlatArrayBuilder.class);
+
+    private static final int RECORDS_PER_GROUP_SHIFT = 10;
+    private static final int RECORDS_PER_GROUP = 1 << RECORDS_PER_GROUP_SHIFT;
+    private static final int RECORDS_PER_GROUP_MASK = RECORDS_PER_GROUP - 1;
+
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, LITTLE_ENDIAN);
+
+    private final Type type;
+    private final MethodHandle readFlat;
+    private final MethodHandle writeFlat;
+    private final boolean hasNextIndex;
+
+    private final int recordNextIndexOffset;
+    private final int recordNullOffset;
+    private final int recordValueOffset;
+    private final int recordSize;
+
+    /**
+     * The fixed chunk contains an array of records. The records are laid out as follows:
+     * <ul>
+     *     <li>12 byte optional pointer to variable width data (only present if the type is variable width)</li>
+     *     <li>8 byte next index (only present if {@code hasNextIndex} is true)</li>
+     *     <li>1 byte null flag for the element type</li>
+     *     <li>N byte fixed size data for the element type</li>
+     * </ul>
+     * The pointer is placed first to simplify the offset calculations for variable with code.
+     * This chunk contains {@code capacity + 1} records. The extra record is used for the swap operation.
+     */
+    private final List<byte[]> closedRecordGroups = new ArrayList<>();
+
+    private byte[] openRecordGroup;
+
+    private final VariableWidthData variableWidthData;
+
+    private long capacity;
+    private long size;
+
+    public FlatArrayBuilder(
+            Type type,
+            MethodHandle readFlat,
+            MethodHandle writeFlat,
+            boolean hasNextIndex)
+    {
+        this.type = requireNonNull(type, "type is null");
+        this.readFlat = requireNonNull(readFlat, "readFlat is null");
+        this.writeFlat = requireNonNull(writeFlat, "writeFlat is null");
+        this.hasNextIndex = hasNextIndex;
+
+        boolean variableWidth = type.isFlatVariableWidth();
+        variableWidthData = variableWidth ? new VariableWidthData() : null;
+        if (hasNextIndex) {
+            recordNextIndexOffset = (variableWidth ? POINTER_SIZE : 0);
+            recordNullOffset = recordNextIndexOffset + Long.BYTES;
+        }
+        else {
+            // use MIN_VALUE so that when it is added to the record offset we get a negative value, and thus an ArrayIndexOutOfBoundsException
+            recordNextIndexOffset = Integer.MIN_VALUE;
+            recordNullOffset = (variableWidth ? POINTER_SIZE : 0);
+        }
+        recordValueOffset = recordNullOffset + 1;
+
+        recordSize = recordValueOffset + type.getFlatFixedSize();
+    }
+
+    private FlatArrayBuilder(FlatArrayBuilder state)
+    {
+        this.type = state.type;
+        this.readFlat = state.readFlat;
+        this.writeFlat = state.writeFlat;
+        this.hasNextIndex = state.hasNextIndex;
+
+        this.recordNextIndexOffset = state.recordNextIndexOffset;
+        this.recordNullOffset = state.recordNullOffset;
+        this.recordValueOffset = state.recordValueOffset;
+        this.recordSize = state.recordSize;
+
+        this.variableWidthData = state.variableWidthData;
+        this.capacity = state.capacity;
+        this.size = state.size;
+        this.closedRecordGroups.addAll(state.closedRecordGroups);
+        // the last open record group must be cloned because it is still being written to
+        if (state.openRecordGroup != null) {
+            this.openRecordGroup = state.openRecordGroup.clone();
+        }
+    }
+
+    public long getEstimatedSize()
+    {
+        return INSTANCE_SIZE +
+                sizeOfObjectArray(closedRecordGroups.size()) +
+                ((long) closedRecordGroups.size() * RECORDS_PER_GROUP * recordSize) +
+                (openRecordGroup == null ? 0 : sizeOf(openRecordGroup)) +
+                (variableWidthData == null ? 0 : variableWidthData.getRetainedSizeBytes());
+    }
+
+    public Type type()
+    {
+        return type;
+    }
+
+    public long size()
+    {
+        return size;
+    }
+
+    public void setNextIndex(long tailIndex, long nextIndex)
+    {
+        checkArgument(hasNextIndex, "nextIndex is not supported");
+
+        byte[] records = getRecords(tailIndex);
+        int recordOffset = getRecordOffset(tailIndex);
+        LONG_HANDLE.set(records, recordOffset + recordNextIndexOffset, nextIndex);
+    }
+
+    public void add(ValueBlock block, int position)
+    {
+        if (size == capacity) {
+            growCapacity();
+        }
+
+        byte[] records = openRecordGroup;
+        int recordOffset = getRecordOffset(size);
+        size++;
+
+        if (hasNextIndex) {
+            LONG_HANDLE.set(records, recordOffset + recordNextIndexOffset, -1L);
+        }
+
+        if (block.isNull(position)) {
+            records[recordOffset + recordNullOffset] = 1;
+            return;
+        }
+
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        int variableWidthChunkOffset = 0;
+        if (variableWidthData != null) {
+            int variableWidthLength = type.getFlatVariableWidthSize(block, position);
+            variableWidthChunk = variableWidthData.allocate(records, recordOffset, variableWidthLength);
+            variableWidthChunkOffset = getChunkOffset(records, recordOffset);
+        }
+
+        try {
+            writeFlat.invokeExact(block, position, records, recordOffset + recordValueOffset, variableWidthChunk, variableWidthChunkOffset);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private void growCapacity()
+    {
+        if (openRecordGroup != null) {
+            closedRecordGroups.add(openRecordGroup);
+        }
+        openRecordGroup = new byte[recordSize * RECORDS_PER_GROUP];
+        capacity += RECORDS_PER_GROUP;
+    }
+
+    public void writeAll(BlockBuilder blockBuilder)
+    {
+        for (byte[] records : closedRecordGroups) {
+            int recordOffset = 0;
+            for (int recordIndex = 0; recordIndex < RECORDS_PER_GROUP; recordIndex++) {
+                write(records, recordOffset, blockBuilder);
+                recordOffset += recordSize;
+            }
+        }
+        int recordsInOpenGroup = ((int) size) & RECORDS_PER_GROUP_MASK;
+        int recordOffset = 0;
+        for (int recordIndex = 0; recordIndex < recordsInOpenGroup; recordIndex++) {
+            write(openRecordGroup, recordOffset, blockBuilder);
+            recordOffset += recordSize;
+        }
+    }
+
+    public long write(long index, BlockBuilder blockBuilder)
+    {
+        checkIndex(index, size);
+
+        byte[] records = getRecords(index);
+
+        int recordOffset = getRecordOffset(index);
+        write(records, recordOffset, blockBuilder);
+
+        if (hasNextIndex) {
+            return (long) LONG_HANDLE.get(records, recordOffset + recordNextIndexOffset);
+        }
+        return -1;
+    }
+
+    private void write(byte[] records, int recordOffset, BlockBuilder blockBuilder)
+    {
+        if (records[recordOffset + recordNullOffset] != 0) {
+            blockBuilder.appendNull();
+            return;
+        }
+
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            variableWidthChunk = variableWidthData.getChunk(records, recordOffset);
+        }
+
+        try {
+            readFlat.invokeExact(
+                    records,
+                    recordOffset + recordValueOffset,
+                    variableWidthChunk,
+                    blockBuilder);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    public FlatArrayBuilder copy()
+    {
+        return new FlatArrayBuilder(this);
+    }
+
+    private byte[] getRecords(long index)
+    {
+        int recordGroupIndex = (int) (index >>> RECORDS_PER_GROUP_SHIFT);
+        byte[] records;
+        if (recordGroupIndex < closedRecordGroups.size()) {
+            records = closedRecordGroups.get(recordGroupIndex);
+        }
+        else {
+            checkState(recordGroupIndex == closedRecordGroups.size());
+            records = openRecordGroup;
+        }
+        return records;
+    }
+
+    /**
+     * Gets the offset of the record within a record group
+     */
+    private int getRecordOffset(long index)
+    {
+        return (((int) index) & RECORDS_PER_GROUP_MASK) * recordSize;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/GroupArrayAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/GroupArrayAggregationState.java
index 9b2f015d8c6f..84381a9aa0ac 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/GroupArrayAggregationState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/GroupArrayAggregationState.java
@@ -13,35 +13,102 @@
  */
 package io.trino.operator.aggregation.arrayagg;
 
-import com.google.common.collect.ImmutableList;
-import io.trino.operator.aggregation.AbstractGroupCollectionAggregationState;
-import io.trino.spi.PageBuilder;
-import io.trino.spi.block.Block;
+import com.google.common.primitives.Ints;
+import io.trino.operator.aggregation.state.AbstractGroupedAccumulatorState;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
 
+import java.lang.invoke.MethodHandle;
+import java.util.Arrays;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static java.lang.Math.toIntExact;
+
 public final class GroupArrayAggregationState
-        extends AbstractGroupCollectionAggregationState<ArrayAggregationStateConsumer>
+        extends AbstractGroupedAccumulatorState
         implements ArrayAggregationState
 {
-    private static final int MAX_BLOCK_SIZE = 1024 * 1024;
-    private static final int VALUE_CHANNEL = 0;
+    private static final int INSTANCE_SIZE = instanceSize(GroupArrayAggregationState.class);
+
+    // See jdk.internal.util.ArraysSupport.SOFT_MAX_ARRAY_LENGTH for an explanation
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
+    private final FlatArrayBuilder arrayBuilder;
+    private long[] groupHeadPositions = new long[0];
+    private long[] groupTailPositions = new long[0];
+
+    public GroupArrayAggregationState(Type type, MethodHandle readFlat, MethodHandle writeFlat)
+    {
+        arrayBuilder = new FlatArrayBuilder(type, readFlat, writeFlat, true);
+    }
+
+    @Override
+    public long getEstimatedSize()
+    {
+        return INSTANCE_SIZE +
+                sizeOf(groupHeadPositions) +
+                sizeOf(groupTailPositions) +
+                arrayBuilder.getEstimatedSize();
+    }
 
-    GroupArrayAggregationState(Type valueType)
+    @Override
+    public void ensureCapacity(long maxGroupId)
     {
-        super(PageBuilder.withMaxPageSize(MAX_BLOCK_SIZE, ImmutableList.of(valueType)));
+        checkArgument(maxGroupId + 1 < MAX_ARRAY_SIZE, "Maximum array size exceeded");
+        int requiredSize = toIntExact(maxGroupId + 1);
+        if (requiredSize > groupHeadPositions.length) {
+            int newSize = Ints.constrainToRange(requiredSize * 2, 1024, MAX_ARRAY_SIZE);
+            int oldSize = groupHeadPositions.length;
+
+            groupHeadPositions = Arrays.copyOf(groupHeadPositions, newSize);
+            Arrays.fill(groupHeadPositions, oldSize, newSize, -1);
+
+            groupTailPositions = Arrays.copyOf(groupTailPositions, newSize);
+            Arrays.fill(groupTailPositions, oldSize, newSize, -1);
+        }
     }
 
     @Override
-    public void add(Block block, int position)
+    public void add(ValueBlock block, int position)
+    {
+        int groupId = (int) getGroupId();
+        long index = arrayBuilder.size();
+
+        if (groupTailPositions[groupId] == -1) {
+            groupHeadPositions[groupId] = index;
+        }
+        else {
+            arrayBuilder.setNextIndex(groupTailPositions[groupId], index);
+        }
+        groupTailPositions[groupId] = index;
+        arrayBuilder.add(block, position);
+    }
+
+    @Override
+    public void writeAll(BlockBuilder blockBuilder)
+    {
+        long nextIndex = getGroupHeadPosition();
+        checkArgument(nextIndex != -1, "Group is empty");
+        while (nextIndex != -1) {
+            nextIndex = arrayBuilder.write(nextIndex, blockBuilder);
+        }
+    }
+
+    private long getGroupHeadPosition()
     {
-        prepareAdd();
-        appendAtChannel(VALUE_CHANNEL, block, position);
+        int groupId = (int) getGroupId();
+        if (groupId >= groupHeadPositions.length) {
+            return -1;
+        }
+        return groupHeadPositions[groupId];
     }
 
     @Override
-    protected boolean accept(ArrayAggregationStateConsumer consumer, PageBuilder pageBuilder, int currentPosition)
+    public boolean isEmpty()
     {
-        consumer.accept(pageBuilder.getBlockBuilder(VALUE_CHANNEL), currentPosition);
-        return true;
+        return getGroupHeadPosition() == -1;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/SingleArrayAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/SingleArrayAggregationState.java
index bcfcf491ccce..30fcb7acdbc3 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/SingleArrayAggregationState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/arrayagg/SingleArrayAggregationState.java
@@ -15,83 +15,77 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.function.AccumulatorState;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
 
-import static com.google.common.base.Verify.verify;
+import java.lang.invoke.MethodHandle;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.operator.aggregation.BlockBuilderCopier.copyBlockBuilder;
-import static java.util.Objects.requireNonNull;
 
 public class SingleArrayAggregationState
         implements ArrayAggregationState
 {
     private static final int INSTANCE_SIZE = instanceSize(SingleArrayAggregationState.class);
-    private BlockBuilder blockBuilder;
-    private final Type type;
 
-    public SingleArrayAggregationState(Type type)
+    private final FlatArrayBuilder arrayBuilder;
+    private Block tempDeserializeBlock;
+
+    public SingleArrayAggregationState(Type type, MethodHandle readFlat, MethodHandle writeFlat)
     {
-        this.type = requireNonNull(type, "type is null");
+        arrayBuilder = new FlatArrayBuilder(type, readFlat, writeFlat, false);
     }
 
-    // for copying
-    private SingleArrayAggregationState(BlockBuilder blockBuilder, Type type)
+    private SingleArrayAggregationState(SingleArrayAggregationState state)
     {
-        this.blockBuilder = blockBuilder;
-        this.type = type;
+        // tempDeserializeBlock should never be set during a copy operation it is only used during deserialization
+        checkArgument(state.tempDeserializeBlock == null);
+
+        arrayBuilder = state.arrayBuilder.copy();
+        tempDeserializeBlock = null;
     }
 
     @Override
     public long getEstimatedSize()
     {
-        long estimatedSize = INSTANCE_SIZE;
-        if (blockBuilder != null) {
-            estimatedSize += blockBuilder.getRetainedSizeInBytes();
-        }
-        return estimatedSize;
+        return INSTANCE_SIZE + arrayBuilder.getEstimatedSize();
     }
 
     @Override
-    public void add(Block block, int position)
+    public void add(ValueBlock block, int position)
     {
-        if (blockBuilder == null) {
-            blockBuilder = type.createBlockBuilder(null, 16);
-        }
-        type.appendTo(block, position, blockBuilder);
+        arrayBuilder.add(block, position);
     }
 
     @Override
-    public void forEach(ArrayAggregationStateConsumer consumer)
+    public void writeAll(BlockBuilder blockBuilder)
     {
-        if (blockBuilder == null) {
-            return;
-        }
-
-        for (int i = 0; i < blockBuilder.getPositionCount(); i++) {
-            consumer.accept(blockBuilder, i);
-        }
+        arrayBuilder.writeAll(blockBuilder);
     }
 
     @Override
     public boolean isEmpty()
     {
-        if (blockBuilder == null) {
-            return true;
-        }
-        verify(blockBuilder.getPositionCount() != 0);
-        return false;
+        return arrayBuilder.size() == 0;
     }
 
     @Override
-    public void reset()
+    public ArrayAggregationState copy()
     {
-        blockBuilder = null;
+        return new SingleArrayAggregationState(this);
     }
 
-    @Override
-    public AccumulatorState copy()
+    Block removeTempDeserializeBlock()
+    {
+        Block block = tempDeserializeBlock;
+        checkState(block != null, "tempDeserializeBlock is null");
+        tempDeserializeBlock = null;
+        return block;
+    }
+
+    void setTempDeserializeBlock(Block tempDeserializeBlock)
     {
-        return new SingleArrayAggregationState(copyBlockBuilder(type, blockBuilder), type);
+        this.tempDeserializeBlock = tempDeserializeBlock;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/builder/InMemoryHashAggregationBuilder.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/builder/InMemoryHashAggregationBuilder.java
index 52a8b7c22e34..bcc661dfb389 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/builder/InMemoryHashAggregationBuilder.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/builder/InMemoryHashAggregationBuilder.java
@@ -34,7 +34,6 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.AggregationNode.Step;
-import io.trino.type.BlockTypeOperators;
 import it.unimi.dsi.fastutil.ints.AbstractIntIterator;
 import it.unimi.dsi.fastutil.ints.IntIterator;
 import it.unimi.dsi.fastutil.ints.IntIterators;
@@ -51,7 +50,9 @@
 public class InMemoryHashAggregationBuilder
         implements HashAggregationBuilder
 {
+    private final int[] groupByChannels;
     private final GroupByHash groupByHash;
+    private final List<Type> groupByOutputTypes;
     private final List<GroupedAggregator> groupedAggregators;
     private final boolean partial;
     private final OptionalLong maxPartialMemory;
@@ -69,7 +70,6 @@ public InMemoryHashAggregationBuilder(
             OperatorContext operatorContext,
             Optional<DataSize> maxPartialMemory,
             JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators,
             UpdateMemory updateMemory)
     {
         this(aggregatorFactories,
@@ -82,7 +82,6 @@ public InMemoryHashAggregationBuilder(
                 maxPartialMemory,
                 Optional.empty(),
                 joinCompiler,
-                blockTypeOperators,
                 updateMemory);
     }
 
@@ -97,17 +96,30 @@ public InMemoryHashAggregationBuilder(
             Optional<DataSize> maxPartialMemory,
             Optional<Integer> unspillIntermediateChannelOffset,
             JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators,
             UpdateMemory updateMemory)
     {
+        if (hashChannel.isPresent()) {
+            this.groupByOutputTypes = ImmutableList.<Type>builder()
+                    .addAll(groupByTypes)
+                    .add(BIGINT)
+                    .build();
+            this.groupByChannels = new int[groupByChannels.size() + 1];
+            for (int i = 0; i < groupByChannels.size(); i++) {
+                this.groupByChannels[i] = groupByChannels.get(i);
+            }
+            this.groupByChannels[groupByChannels.size()] = hashChannel.get();
+        }
+        else {
+            this.groupByOutputTypes = ImmutableList.copyOf(groupByTypes);
+            this.groupByChannels = Ints.toArray(groupByChannels);
+        }
+
         this.groupByHash = createGroupByHash(
                 operatorContext.getSession(),
                 groupByTypes,
-                Ints.toArray(groupByChannels),
-                hashChannel,
+                hashChannel.isPresent(),
                 expectedGroups,
                 joinCompiler,
-                blockTypeOperators,
                 updateMemory);
         this.partial = step.isOutputPartial();
         this.maxPartialMemory = maxPartialMemory.map(dataSize -> OptionalLong.of(dataSize.toBytes())).orElseGet(OptionalLong::empty);
@@ -135,13 +147,14 @@ public void close() {}
     public Work<?> processPage(Page page)
     {
         if (groupedAggregators.isEmpty()) {
-            return groupByHash.addPage(page);
+            return groupByHash.addPage(page.getLoadedPage(groupByChannels));
         }
         return new TransformWork<>(
-                groupByHash.getGroupIds(page),
+                groupByHash.getGroupIds(page.getLoadedPage(groupByChannels)),
                 groupByIdBlock -> {
+                    int groupCount = groupByHash.getGroupCount();
                     for (GroupedAggregator groupedAggregator : groupedAggregators) {
-                        groupedAggregator.processPage(groupByIdBlock, page);
+                        groupedAggregator.processPage(groupCount, groupByIdBlock, page);
                     }
                     // we do not need any output from TransformWork for this case
                     return null;
@@ -210,7 +223,7 @@ public void setSpillOutput()
 
     public int getKeyChannels()
     {
-        return groupByHash.getTypes().size();
+        return groupByChannels.length;
     }
 
     public long getGroupCount()
@@ -234,7 +247,7 @@ public WorkProcessor<Page> buildHashSortedResult()
 
     public List<Type> buildSpillTypes()
     {
-        ArrayList<Type> types = new ArrayList<>(groupByHash.getTypes());
+        ArrayList<Type> types = new ArrayList<>(groupByOutputTypes);
         for (GroupedAggregator groupedAggregator : groupedAggregators) {
             types.add(groupedAggregator.getSpillType());
         }
@@ -257,7 +270,6 @@ private WorkProcessor<Page> buildResult(IntIterator groupIds)
 
             pageBuilder.reset();
 
-            List<Type> types = groupByHash.getTypes();
             while (!pageBuilder.isFull() && groupIds.hasNext()) {
                 int groupId = groupIds.nextInt();
 
@@ -266,7 +278,7 @@ private WorkProcessor<Page> buildResult(IntIterator groupIds)
                 pageBuilder.declarePosition();
                 for (int i = 0; i < groupedAggregators.size(); i++) {
                     GroupedAggregator groupedAggregator = groupedAggregators.get(i);
-                    BlockBuilder output = pageBuilder.getBlockBuilder(types.size() + i);
+                    BlockBuilder output = pageBuilder.getBlockBuilder(groupByChannels.length + i);
                     groupedAggregator.evaluate(groupId, output);
                 }
             }
@@ -277,7 +289,7 @@ private WorkProcessor<Page> buildResult(IntIterator groupIds)
 
     public List<Type> buildTypes()
     {
-        ArrayList<Type> types = new ArrayList<>(groupByHash.getTypes());
+        ArrayList<Type> types = new ArrayList<>(groupByOutputTypes);
         for (GroupedAggregator groupedAggregator : groupedAggregators) {
             types.add(groupedAggregator.getType());
         }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/builder/MergingHashAggregationBuilder.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/builder/MergingHashAggregationBuilder.java
index ec53d872f881..e2afc32129af 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/builder/MergingHashAggregationBuilder.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/builder/MergingHashAggregationBuilder.java
@@ -26,7 +26,6 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.AggregationNode;
-import io.trino.type.BlockTypeOperators;
 
 import java.io.Closeable;
 import java.util.List;
@@ -50,7 +49,6 @@ public class MergingHashAggregationBuilder
     private final long memoryLimitForMerge;
     private final int overwriteIntermediateChannelOffset;
     private final JoinCompiler joinCompiler;
-    private final BlockTypeOperators blockTypeOperators;
 
     public MergingHashAggregationBuilder(
             List<AggregatorFactory> aggregatorFactories,
@@ -63,8 +61,7 @@ public MergingHashAggregationBuilder(
             AggregatedMemoryContext aggregatedMemoryContext,
             long memoryLimitForMerge,
             int overwriteIntermediateChannelOffset,
-            JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators)
+            JoinCompiler joinCompiler)
     {
         ImmutableList.Builder<Integer> groupByPartialChannels = ImmutableList.builder();
         for (int i = 0; i < groupByTypes.size(); i++) {
@@ -83,7 +80,6 @@ public MergingHashAggregationBuilder(
         this.memoryLimitForMerge = memoryLimitForMerge;
         this.overwriteIntermediateChannelOffset = overwriteIntermediateChannelOffset;
         this.joinCompiler = joinCompiler;
-        this.blockTypeOperators = blockTypeOperators;
 
         rebuildHashAggregationBuilder();
     }
@@ -154,7 +150,6 @@ private void rebuildHashAggregationBuilder()
                 Optional.of(DataSize.succinctBytes(0)),
                 Optional.of(overwriteIntermediateChannelOffset),
                 joinCompiler,
-                blockTypeOperators,
                 // TODO: merging should also yield on memory reservations
                 () -> true);
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/builder/SpillableHashAggregationBuilder.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/builder/SpillableHashAggregationBuilder.java
index f13ba9ae772e..9b851544b105 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/builder/SpillableHashAggregationBuilder.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/builder/SpillableHashAggregationBuilder.java
@@ -25,11 +25,11 @@
 import io.trino.operator.aggregation.AggregatorFactory;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.spiller.Spiller;
 import io.trino.spiller.SpillerFactory;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.AggregationNode;
-import io.trino.type.BlockTypeOperators;
 
 import java.io.IOException;
 import java.util.List;
@@ -64,7 +64,7 @@ public class SpillableHashAggregationBuilder
     private Optional<MergeHashSort> mergeHashSort = Optional.empty();
     private ListenableFuture<Void> spillInProgress = immediateVoidFuture();
     private final JoinCompiler joinCompiler;
-    private final BlockTypeOperators blockTypeOperators;
+    private final TypeOperators typeOperators;
 
     // todo get rid of that and only use revocable memory
     private long emptyHashAggregationBuilderSize;
@@ -83,7 +83,7 @@ public SpillableHashAggregationBuilder(
             DataSize memoryLimitForMergeWithMemory,
             SpillerFactory spillerFactory,
             JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators)
+            TypeOperators typeOperators)
     {
         this.aggregatorFactories = aggregatorFactories;
         this.step = step;
@@ -98,7 +98,7 @@ public SpillableHashAggregationBuilder(
         this.memoryLimitForMergeWithMemory = memoryLimitForMergeWithMemory.toBytes();
         this.spillerFactory = spillerFactory;
         this.joinCompiler = joinCompiler;
-        this.blockTypeOperators = blockTypeOperators;
+        this.typeOperators = typeOperators;
 
         rebuildHashAggregationBuilder();
     }
@@ -255,7 +255,7 @@ private WorkProcessor<Page> mergeFromDiskAndMemory()
         checkState(spiller.isPresent());
 
         hashAggregationBuilder.setSpillOutput();
-        mergeHashSort = Optional.of(new MergeHashSort(operatorContext.newAggregateUserMemoryContext(), blockTypeOperators));
+        mergeHashSort = Optional.of(new MergeHashSort(operatorContext.newAggregateUserMemoryContext(), typeOperators));
 
         WorkProcessor<Page> mergedSpilledPages = mergeHashSort.get().merge(
                 groupByTypes,
@@ -275,7 +275,7 @@ private WorkProcessor<Page> mergeFromDisk()
     {
         checkState(spiller.isPresent());
 
-        mergeHashSort = Optional.of(new MergeHashSort(operatorContext.newAggregateUserMemoryContext(), blockTypeOperators));
+        mergeHashSort = Optional.of(new MergeHashSort(operatorContext.newAggregateUserMemoryContext(), typeOperators));
 
         WorkProcessor<Page> mergedSpilledPages = mergeHashSort.get().merge(
                 groupByTypes,
@@ -301,8 +301,7 @@ private WorkProcessor<Page> mergeSortedPages(WorkProcessor<Page> sortedPages, lo
                 operatorContext.aggregateUserMemoryContext(),
                 memoryLimitForMerge,
                 hashAggregationBuilder.getKeyChannels(),
-                joinCompiler,
-                blockTypeOperators));
+                joinCompiler));
 
         return merger.get().buildResult();
     }
@@ -323,7 +322,6 @@ private void rebuildHashAggregationBuilder()
                 operatorContext,
                 Optional.of(DataSize.succinctBytes(0)),
                 joinCompiler,
-                blockTypeOperators,
                 () -> {
                     updateMemory();
                     // TODO: Support GroupByHash yielding in spillable hash aggregation (https://github.com/trinodb/trino/issues/460)
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/GroupedHistogramState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/GroupedHistogramState.java
index b75dd24050a6..ad9675303706 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/GroupedHistogramState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/GroupedHistogramState.java
@@ -15,63 +15,55 @@
 package io.trino.operator.aggregation.histogram;
 
 import io.trino.operator.aggregation.state.AbstractGroupedAccumulatorState;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
+
+import java.lang.invoke.MethodHandle;
 
 import static io.airlift.slice.SizeOf.instanceSize;
-import static java.util.Objects.requireNonNull;
+import static java.lang.Math.toIntExact;
 
-/**
- * state object that uses a single histogram for all groups. See {@link GroupedTypedHistogram}
- */
 public class GroupedHistogramState
         extends AbstractGroupedAccumulatorState
         implements HistogramState
 {
     private static final int INSTANCE_SIZE = instanceSize(GroupedHistogramState.class);
-    private final Type type;
-    private final BlockPositionEqual equalOperator;
-    private final BlockPositionHashCode hashCodeOperator;
-    private TypedHistogram typedHistogram;
-    private long size;
 
-    public GroupedHistogramState(Type type, BlockPositionEqual equalOperator, BlockPositionHashCode hashCodeOperator, int expectedEntriesCount)
-    {
-        this.type = requireNonNull(type, "type is null");
-        this.equalOperator = requireNonNull(equalOperator, "equalOperator is null");
-        this.hashCodeOperator = requireNonNull(hashCodeOperator, "hashCodeOperator is null");
-        typedHistogram = new GroupedTypedHistogram(type, equalOperator, hashCodeOperator, expectedEntriesCount);
-    }
+    private final TypedHistogram histogram;
 
-    @Override
-    public void ensureCapacity(long size)
+    public GroupedHistogramState(
+            Type keyType,
+            MethodHandle readFlat,
+            MethodHandle writeFlat,
+            MethodHandle hashFlat,
+            MethodHandle distinctFlatBlock,
+            MethodHandle hashBlock)
     {
-        typedHistogram.ensureCapacity(size);
+        this.histogram = new TypedHistogram(keyType, readFlat, writeFlat, hashFlat, distinctFlatBlock, hashBlock, true);
     }
 
     @Override
-    public TypedHistogram get()
+    public void ensureCapacity(long size)
     {
-        return typedHistogram.setGroupId(getGroupId());
+        histogram.setMaxGroupId(toIntExact(size));
     }
 
     @Override
-    public void deserialize(Block block, int expectedSize)
+    public void add(ValueBlock block, int position, long count)
     {
-        typedHistogram = new GroupedTypedHistogram(getGroupId(), block, type, equalOperator, hashCodeOperator, expectedSize);
+        histogram.add(toIntExact(getGroupId()), block, position, count);
     }
 
     @Override
-    public void addMemoryUsage(long memory)
+    public void writeAll(MapBlockBuilder out)
     {
-        size += memory;
+        histogram.serialize(toIntExact(getGroupId()), out);
     }
 
     @Override
     public long getEstimatedSize()
     {
-        return INSTANCE_SIZE + size + typedHistogram.getEstimatedSize();
+        return INSTANCE_SIZE + histogram.getEstimatedSize();
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/GroupedTypedHistogram.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/GroupedTypedHistogram.java
deleted file mode 100644
index 53695bb1da7c..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/GroupedTypedHistogram.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation.histogram;
-
-import io.trino.array.IntBigArray;
-import io.trino.array.LongBigArray;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.operator.aggregation.histogram.HashUtil.calculateMaxFill;
-import static io.trino.operator.aggregation.histogram.HashUtil.nextBucketId;
-import static io.trino.operator.aggregation.histogram.HashUtil.nextProbeLinear;
-import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static it.unimi.dsi.fastutil.HashCommon.arraySize;
-import static it.unimi.dsi.fastutil.HashCommon.murmurHash3;
-import static java.util.Objects.requireNonNull;
-
-/**
- * implementation that uses groupId in the hash key, so that we may store all groupId x value -> count in one giant map. The value, however,
- * is normalized into a single ValueBuilder. Further, we do not have per-group instances of objects. In order to construct a histogram for a group on
- * demand, a linked list for each group is stored that overlays all virtual nodes (a shared index, i, across parallel arrays).
- * <p>
- * <pre>
- * eg,
- * heads[100] -> 3
- *
- * means the first piece of data is (values[valuePositions[3]], counts[3])
- * If next[3] is 10, then we look at (values[valuePositions[10]], counts[10])
- *
- * and so on to construct the value, count pairs needed. An iterator-style function, readAllValues, exists and the caller may do whatever want with the
- * values.
- *
- * </pre>
- */
-
-public class GroupedTypedHistogram
-        implements TypedHistogram
-{
-    private static final float MAX_FILL_RATIO = 0.5f;
-
-    private static final int INSTANCE_SIZE = instanceSize(GroupedTypedHistogram.class);
-    private static final int EMPTY_BUCKET = -1;
-    private static final int NULL = -1;
-    private final int bucketId;
-
-    private final Type type;
-    private final BlockPositionEqual equalOperator;
-    private final BlockPositionHashCode hashCodeOperator;
-    private final BlockBuilder values;
-    private final BucketNodeFactory bucketNodeFactory;
-    //** these parallel arrays represent a node in the hash table; index -> int, value -> long
-    private final LongBigArray counts;
-    // need to store the groupId for a node for when we are doing value comparisons in hash lookups
-    private final LongBigArray groupIds;
-    // array of nodePointers (index in counts, valuePositions)
-    private final IntBigArray nextPointers;
-    // since we store histogram values in a hash, two histograms may have the same position (each unique value should have only one position in the internal
-    // BlockBuilder of values; not that we extract a subset of this when constructing per-group-id histograms)
-    private final IntBigArray valuePositions;
-    // bucketId -> valueHash (no group, no mask)
-    private final LongBigArray valueAndGroupHashes;
-    //** end per-node arrays
-
-    // per groupId, we have a pointer to the first in the list of nodes for this group
-    private final LongBigArray headPointers;
-
-    private IntBigArray buckets;
-    private int nextNodePointer;
-    private int mask;
-    private int bucketCount;
-    private int maxFill;
-    // at most one thread uses this object at one time, so this must be set to the group being operated on
-    private int currentGroupId = -1;
-    private long numberOfGroups = 1;
-    //
-    private final ValueStore valueStore;
-
-    public GroupedTypedHistogram(Type type, BlockPositionEqual equalOperator, BlockPositionHashCode hashCodeOperator, int expectedCount)
-    {
-        checkArgument(expectedCount > 0, "expectedSize must be greater than zero");
-        this.type = requireNonNull(type, "type is null");
-        this.equalOperator = requireNonNull(equalOperator, "equalOperator is null");
-        this.hashCodeOperator = requireNonNull(hashCodeOperator, "hashCodeOperator is null");
-        this.bucketId = expectedCount;
-        this.bucketCount = computeBucketCount(expectedCount, MAX_FILL_RATIO);
-        this.mask = bucketCount - 1;
-        this.maxFill = calculateMaxFill(bucketCount, MAX_FILL_RATIO);
-        this.values = type.createBlockBuilder(null, computeBucketCount(expectedCount, GroupedTypedHistogram.MAX_FILL_RATIO));
-        // buckets and node-arrays (bucket "points" to a node, so 1:1 relationship)
-        buckets = new IntBigArray(-1);
-        buckets.ensureCapacity(bucketCount);
-        counts = new LongBigArray();
-        valuePositions = new IntBigArray();
-        valueAndGroupHashes = new LongBigArray();
-        nextPointers = new IntBigArray(NULL);
-        groupIds = new LongBigArray(-1);
-        // here, one bucket is one node in the hash structure (vs a bucket may be a chain of nodes in closed-hashing with linked list hashing)
-        // ie, this is open-address hashing
-        resizeNodeArrays(bucketCount);
-        // end bucket/node based arrays
-        // per-group arrays: size will be set by external call, same as groups since the number will be the same
-        headPointers = new LongBigArray(NULL);
-        // index into counts/valuePositions
-        nextNodePointer = 0;
-        bucketNodeFactory = this.new BucketNodeFactory();
-        valueStore = new ValueStore(type, equalOperator, expectedCount, values);
-    }
-
-    /**
-     * TODO: use RowBlock in the future
-     *
-     * @param block of the form [key1, count1, key2, count2, ...]
-     */
-    public GroupedTypedHistogram(long groupId, Block block, Type type, BlockPositionEqual equalOperator, BlockPositionHashCode hashCodeOperator, int bucketId)
-    {
-        this(type, equalOperator, hashCodeOperator, bucketId);
-        currentGroupId = (int) groupId;
-        requireNonNull(block, "block is null");
-        for (int i = 0; i < block.getPositionCount(); i += 2) {
-            add(groupId, block, i, BIGINT.getLong(block, i + 1));
-        }
-    }
-
-    @Override
-    public void ensureCapacity(long size)
-    {
-        long actualSize = Math.max(numberOfGroups, size);
-        this.numberOfGroups = actualSize;
-        headPointers.ensureCapacity(actualSize);
-        valueAndGroupHashes.ensureCapacity(actualSize);
-    }
-
-    @Override
-    public long getEstimatedSize()
-    {
-        return INSTANCE_SIZE
-                + counts.sizeOf()
-                + groupIds.sizeOf()
-                + nextPointers.sizeOf()
-                + valuePositions.sizeOf()
-                + valueAndGroupHashes.sizeOf()
-                + buckets.sizeOf()
-                + values.getRetainedSizeInBytes()
-                + valueStore.getEstimatedSize()
-                + headPointers.sizeOf();
-    }
-
-    @Override
-    public void serialize(BlockBuilder out)
-    {
-        if (isCurrentGroupEmpty()) {
-            out.appendNull();
-        }
-        else {
-            BlockBuilder blockBuilder = out.beginBlockEntry();
-
-            iterateGroupNodes(currentGroupId, nodePointer -> {
-                checkArgument(nodePointer != NULL, "should never see null here as we exclude in iterateGroupNodesCall");
-                ValueNode valueNode = bucketNodeFactory.createValueNode(nodePointer);
-                valueNode.writeNodeAsBlock(values, blockBuilder);
-            });
-
-            out.closeEntry();
-        }
-    }
-
-    @Override
-    public void addAll(TypedHistogram other)
-    {
-        addAll(currentGroupId, other);
-    }
-
-    @Override
-    public void readAllValues(HistogramValueReader reader)
-    {
-        iterateGroupNodes(currentGroupId, nodePointer -> {
-            checkArgument(nodePointer != NULL, "should never see null here as we exclude in iterateGroupNodesCall");
-            ValueNode valueNode = bucketNodeFactory.createValueNode(nodePointer);
-            reader.read(values, valueNode.getValuePosition(), valueNode.getCount());
-        });
-    }
-
-    @Override
-    public TypedHistogram setGroupId(long groupId)
-    {
-        // TODO: should we change all indices into buckets nodePointers to longs?
-        this.currentGroupId = (int) groupId;
-        return this;
-    }
-
-    @Override
-    public Type getType()
-    {
-        return type;
-    }
-
-    @Override
-    public int getExpectedSize()
-    {
-        return bucketId;
-    }
-
-    @Override
-    public boolean isEmpty()
-    {
-        return isCurrentGroupEmpty();
-    }
-
-    @Override
-    public void add(int position, Block block, long count)
-    {
-        checkState(currentGroupId != -1, "setGroupId() not called yet");
-        add(currentGroupId, block, position, count);
-    }
-
-    private void resizeTableIfNecessary()
-    {
-        if (nextNodePointer >= maxFill) {
-            rehash();
-        }
-    }
-
-    private static int computeBucketCount(int expectedSize, float maxFillRatio)
-    {
-        return arraySize(expectedSize, maxFillRatio);
-    }
-
-    private void addAll(long groupId, TypedHistogram other)
-    {
-        other.readAllValues((block, position, count) -> add(groupId, block, position, count));
-    }
-
-    private void add(long groupId, Block block, int position, long count)
-    {
-        resizeTableIfNecessary();
-
-        BucketDataNode bucketDataNode = bucketNodeFactory.createBucketDataNode(groupId, block, position);
-
-        if (bucketDataNode.processEntry(groupId, block, position, count)) {
-            nextNodePointer++;
-        }
-    }
-
-    private boolean isCurrentGroupEmpty()
-    {
-        return headPointers.get(currentGroupId) == NULL;
-    }
-
-    /**
-     * used to iterate over all non-null nodes in the data structure
-     *
-     * @param nodeReader - will be passed every non-null nodePointer
-     */
-    private void iterateGroupNodes(long groupdId, NodeReader nodeReader)
-    {
-        // while the index can be a long, the value is always an int
-        int currentPointer = (int) headPointers.get(groupdId);
-        checkArgument(currentPointer != NULL, "valid group must have non-null head pointer");
-
-        while (currentPointer != NULL) {
-            checkState(currentPointer < nextNodePointer, "error, corrupt pointer; max valid %s, found %s", nextNodePointer, currentPointer);
-            nodeReader.read(currentPointer);
-            currentPointer = nextPointers.get(currentPointer);
-        }
-    }
-
-    private void rehash()
-    {
-        long newBucketCountLong = bucketCount * 2L;
-
-        if (newBucketCountLong > Integer.MAX_VALUE) {
-            throw new TrinoException(GENERIC_INSUFFICIENT_RESOURCES, "Size of hash table cannot exceed " + Integer.MAX_VALUE + " entries (" + newBucketCountLong + ")");
-        }
-
-        int newBucketCount = computeBucketCount((int) newBucketCountLong, MAX_FILL_RATIO);
-        int newMask = newBucketCount - 1;
-        IntBigArray newBuckets = new IntBigArray(-1);
-        newBuckets.ensureCapacity(newBucketCount);
-
-        for (int i = 0; i < nextNodePointer; i++) {
-            // find the old one
-            int bucketId = getBucketIdForNode(i, newMask);
-            int probeCount = 1;
-
-            int originalBucket = bucketId;
-            // find new one
-            while (newBuckets.get(bucketId) != -1) {
-                int probe = nextProbe(probeCount);
-                bucketId = nextBucketId(originalBucket, newMask, probe);
-                probeCount++;
-            }
-
-            // record the mapping
-            newBuckets.set(bucketId, i);
-        }
-        buckets = newBuckets;
-        bucketCount = newBucketCount;
-        maxFill = calculateMaxFill(newBucketCount, MAX_FILL_RATIO);
-        mask = newMask;
-
-        resizeNodeArrays(newBucketCount);
-    }
-
-    private int nextProbe(int probeCount)
-    {
-        return nextProbeLinear(probeCount);
-    }
-
-    //parallel arrays with data for
-    private void resizeNodeArrays(int newBucketCount)
-    {
-        // every per-bucket array needs to be updated
-        counts.ensureCapacity(newBucketCount);
-        valuePositions.ensureCapacity(newBucketCount);
-        nextPointers.ensureCapacity(newBucketCount);
-        valueAndGroupHashes.ensureCapacity(newBucketCount);
-        groupIds.ensureCapacity(newBucketCount);
-    }
-
-    private long combineGroupAndValueHash(long groupIdHash, long valueHash)
-    {
-        return groupIdHash ^ valueHash;
-    }
-
-    private int getBucketIdForNode(int nodePointer, int mask)
-    {
-        long valueAndGroupHash = valueAndGroupHashes.get(nodePointer); // without mask
-        int bucketId = (int) (valueAndGroupHash & mask);
-
-        return bucketId;
-    }
-
-    //short-lived abstraction that is basically a position into parallel arrays that we can treat as one data structure
-    private class ValueNode
-    {
-        // index into parallel arrays that are fields of a "node" in our hash table (eg counts, valuePositions)
-        private final int nodePointer;
-
-        /**
-         * @param nodePointer - index/pointer into parallel arrays of data structs
-         */
-        ValueNode(int nodePointer)
-        {
-            checkState(nodePointer > -1, "ValueNode must point to a non-empty node");
-            this.nodePointer = nodePointer;
-        }
-
-        long getCount()
-        {
-            return counts.get(nodePointer);
-        }
-
-        int getValuePosition()
-        {
-            return valuePositions.get(nodePointer);
-        }
-
-        void add(long count)
-        {
-            counts.add(nodePointer, count);
-        }
-
-        /**
-         * given an output outputBlockBuilder, writes one row (key -> count) of our histogram
-         *
-         * @param valuesBlock - values.build() is called externally
-         */
-        void writeNodeAsBlock(Block valuesBlock, BlockBuilder outputBlockBuilder)
-        {
-            type.appendTo(valuesBlock, getValuePosition(), outputBlockBuilder);
-            BIGINT.writeLong(outputBlockBuilder, getCount());
-        }
-    }
-
-    // short-lived class that wraps a position in int buckets[] to help handle treating
-    // it as a hash table with Nodes that have values
-    private class BucketDataNode
-    {
-        // index into parallel arrays that are fields of a "node" in our hash table (eg counts, valuePositions)
-        private final int bucketId;
-        private final ValueNode valueNode;
-        private final long valueHash;
-        private final long valueAndGroupHash;
-        private final int nodePointerToUse;
-        private final boolean isEmpty;
-
-        /**
-         * @param bucketId - index into the bucket array. Depending on createBucketNode(), this is either empty node that requires setup handled in
-         * processEntry->addNewGroup()
-         * *
-         * or one with an existing count and simply needs the count updated
-         * <p>
-         * processEntry handles these cases
-         */
-        private BucketDataNode(int bucketId, ValueNode valueNode, long valueHash, long valueAndGroupHash, int nodePointerToUse, boolean isEmpty)
-        {
-            this.bucketId = bucketId;
-            this.valueNode = valueNode;
-            this.valueHash = valueHash;
-            this.valueAndGroupHash = valueAndGroupHash;
-            this.nodePointerToUse = nodePointerToUse;
-            this.isEmpty = isEmpty;
-        }
-
-        private boolean isEmpty()
-        {
-            return isEmpty;
-        }
-
-        /**
-         * true iff needs to update nextNodePointer
-         */
-        private boolean processEntry(long groupId, Block block, int position, long count)
-        {
-            if (isEmpty()) {
-                addNewGroup(groupId, block, position, count);
-                return true;
-            }
-            valueNode.add(count);
-            return false;
-        }
-
-        private void addNewGroup(long groupId, Block block, int position, long count)
-        {
-            checkState(isEmpty(), "bucket %s not empty, points to %s", bucketId, buckets.get(bucketId));
-
-            // we've already computed the value hash for only the value only; ValueStore will save it for future use
-            int nextValuePosition = valueStore.addAndGetPosition(block, position, valueHash);
-            // set value pointer to hash map of values
-            valuePositions.set(nodePointerToUse, nextValuePosition);
-            // save hashes for future rehashing
-            valueAndGroupHashes.set(nodePointerToUse, valueAndGroupHash);
-            // set pointer to node for this bucket
-            buckets.set(bucketId, nodePointerToUse);
-            // save data for this node
-            counts.set(nodePointerToUse, count);
-            // used for doing value comparisons on hash collisions
-            groupIds.set(nodePointerToUse, groupId);
-            // we only ever store ints as values; we need long as an index
-            int currentHead = (int) headPointers.get(groupId);
-            // maintain linked list of nodes in this group (insert at head)
-            headPointers.set(groupId, nodePointerToUse);
-            nextPointers.set(nodePointerToUse, currentHead);
-        }
-    }
-
-    private class BucketNodeFactory
-    {
-        /**
-         * invariant: "points" to a virtual node of [key, count] for the histogram and includes any indirection calcs. Makes not guarantees if the node is empty or not
-         * (use isEmpty())
-         */
-        private BucketDataNode createBucketDataNode(long groupId, Block block, int position)
-        {
-            long valueHash = murmurHash3(hashCodeOperator.hashCodeNullSafe(block, position));
-            long groupIdHash = murmurHash3(groupId);
-            long valueAndGroupHash = combineGroupAndValueHash(groupIdHash, valueHash);
-            int bucketId = (int) (valueAndGroupHash & mask);
-            int nodePointer;
-            int probeCount = 1;
-            int originalBucketId = bucketId;
-            // look for an empty slot or a slot containing this group x key
-            while (true) {
-                nodePointer = buckets.get(bucketId);
-
-                if (nodePointer == EMPTY_BUCKET) {
-                    return new BucketDataNode(bucketId, new ValueNode(nextNodePointer), valueHash, valueAndGroupHash, nextNodePointer, true);
-                }
-                if (groupAndValueMatches(groupId, block, position, nodePointer, valuePositions.get(nodePointer))) {
-                    // value match
-                    return new BucketDataNode(bucketId, new ValueNode(nodePointer), valueHash, valueAndGroupHash, nodePointer, false);
-                }
-                // keep looking
-                int probe = nextProbe(probeCount);
-                bucketId = nextBucketId(originalBucketId, mask, probe);
-                probeCount++;
-            }
-        }
-
-        private boolean groupAndValueMatches(long groupId, Block block, int position, int nodePointer, int valuePosition)
-        {
-            long existingGroupId = groupIds.get(nodePointer);
-
-            return existingGroupId == groupId && equalOperator.equal(block, position, values, valuePosition);
-        }
-
-        private ValueNode createValueNode(int nodePointer)
-        {
-            return new ValueNode(nodePointer);
-        }
-    }
-
-    private interface NodeReader
-    {
-        void read(int nodePointer);
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HashUtil.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HashUtil.java
deleted file mode 100644
index 5619f6b06842..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HashUtil.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation.histogram;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static it.unimi.dsi.fastutil.HashCommon.arraySize;
-
-public final class HashUtil
-{
-    private HashUtil() {}
-
-    public static int nextProbeLinear(int probeCount)
-    {
-        return probeCount;
-    }
-
-    // found useful in highly loaded hashes (> .75, maybe > >.9)
-    public static int nextSumOfCount(int probeCount)
-    {
-        return (probeCount * (probeCount + 1)) / 2;
-    }
-
-    // found useful in highly loaded hashes (> .75, maybe > >.9)
-    public static int nextSumOfSquares(int probeCount)
-    {
-        return (probeCount * (probeCount * probeCount + 1)) / 2;
-    }
-
-    /**
-     * @param bucketId - previous bucketId location
-     * @param mask - mask being used (typically # of buckets-1; due to power-of-2 sized bucket arrays, handles wrap-around
-     * @param probe - how many buckets to jump to find next bucket
-     * @return next bucketId, including any necessary wrap-around (again mask handles this)
-     */
-    public static int nextBucketId(int bucketId, int mask, int probe)
-    {
-        return (bucketId + probe) & mask;
-    }
-
-    public static int calculateMaxFill(int bucketCount, float fillRatio)
-    {
-        checkArgument(bucketCount > 0, "bucketCount must be greater than 0");
-        int maxFill = (int) Math.ceil(bucketCount * fillRatio);
-
-        if (maxFill == bucketCount) {
-            maxFill--;
-        }
-        checkArgument(bucketCount > maxFill, "bucketCount must be larger than maxFill");
-        return maxFill;
-    }
-
-    /**
-     * uses HashCommon.arraySize() which does this calculation. this is just a wrapper to name the use of this case
-     *
-     * @param expectedSize - expected number of elements to store in the hash
-     * @param fillRatio - expected fill ratio of buckets by elemements
-     * @return nextPowerOfTwo(expectedSize / fillRatio)
-     */
-    public static int computeBucketCount(int expectedSize, float fillRatio)
-    {
-        return arraySize(expectedSize, fillRatio);
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/Histogram.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/Histogram.java
index 00e638cf2532..a835c4780cc0 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/Histogram.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/Histogram.java
@@ -13,8 +13,9 @@
  */
 package io.trino.operator.aggregation.histogram;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -27,8 +28,6 @@
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.Type;
 
-import static java.util.Objects.requireNonNull;
-
 @AggregationFunction("histogram")
 @Description("Count the number of times each value occurs")
 public final class Histogram
@@ -40,34 +39,21 @@ private Histogram() {}
     public static void input(
             @TypeParameter("T") Type type,
             @AggregationState("T") HistogramState state,
-            @BlockPosition @SqlType("T") Block key,
+            @BlockPosition @SqlType("T") ValueBlock key,
             @BlockIndex int position)
     {
-        TypedHistogram typedHistogram = state.get();
-        long startSize = typedHistogram.getEstimatedSize();
-        typedHistogram.add(position, key, 1L);
-        state.addMemoryUsage(typedHistogram.getEstimatedSize() - startSize);
+        state.add(key, position, 1L);
     }
 
     @CombineFunction
     public static void combine(@AggregationState("T") HistogramState state, @AggregationState("T") HistogramState otherState)
     {
-        // NOTE: state = current merged state; otherState = scratchState (new data to be added)
-        // for grouped histograms and single histograms, we have a single histogram object. In neither case, can otherState.get() return null.
-        // Semantically, a histogram object will be returned even if the group is empty.
-        // In that case, the histogram object will represent an empty histogram until we call add() on
-        // it.
-        requireNonNull(otherState.get(), "scratch state should always be non-null");
-        TypedHistogram typedHistogram = state.get();
-        long startSize = typedHistogram.getEstimatedSize();
-        typedHistogram.addAll(otherState.get());
-        state.addMemoryUsage(typedHistogram.getEstimatedSize() - startSize);
+        state.merge(otherState);
     }
 
     @OutputFunction("map(T, BIGINT)")
     public static void output(@TypeParameter("T") Type type, @AggregationState("T") HistogramState state, BlockBuilder out)
     {
-        TypedHistogram typedHistogram = state.get();
-        typedHistogram.serialize(out);
+        state.writeAll((MapBlockBuilder) out);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramState.java
index 88d882b143a2..b0ae54e64333 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramState.java
@@ -14,9 +14,14 @@
 package io.trino.operator.aggregation.histogram;
 
 import io.trino.spi.block.Block;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateMetadata;
 
+import static io.trino.spi.type.BigintType.BIGINT;
+
 @AccumulatorStateMetadata(
         stateFactoryClass = HistogramStateFactory.class,
         stateSerializerClass = HistogramStateSerializer.class,
@@ -25,14 +30,21 @@
 public interface HistogramState
         extends AccumulatorState
 {
-    /**
-     * will create an empty histogram if none exists
-     *
-     * @return histogram based on the type of state (single, grouped). Note that empty histograms will serialize to null as required
-     */
-    TypedHistogram get();
+    void add(ValueBlock block, int position, long count);
+
+    default void merge(HistogramState other)
+    {
+        SqlMap serializedState = ((SingleHistogramState) other).removeTempSerializedState();
+        int rawOffset = serializedState.getRawOffset();
+        Block rawKeyBlock = serializedState.getRawKeyBlock();
+        Block rawValueBlock = serializedState.getRawValueBlock();
 
-    void addMemoryUsage(long memory);
+        ValueBlock rawKeyValues = rawKeyBlock.getUnderlyingValueBlock();
+        ValueBlock rawValueValues = rawValueBlock.getUnderlyingValueBlock();
+        for (int i = 0; i < serializedState.getSize(); i++) {
+            add(rawKeyValues, rawKeyBlock.getUnderlyingValuePosition(rawOffset + i), BIGINT.getLong(rawValueValues, rawValueBlock.getUnderlyingValuePosition(rawOffset + i)));
+        }
+    }
 
-    void deserialize(Block block, int expectedSize);
+    void writeAll(MapBlockBuilder out);
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramStateFactory.java
index b54ad9106d83..4a11a67f39d1 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramStateFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramStateFactory.java
@@ -19,50 +19,66 @@
 import io.trino.spi.function.OperatorType;
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import java.lang.invoke.MethodHandle;
+
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static java.util.Objects.requireNonNull;
 
 public class HistogramStateFactory
         implements AccumulatorStateFactory<HistogramState>
 {
-    public static final int EXPECTED_SIZE_FOR_HASHING = 10;
-
     private final Type type;
-    private final BlockPositionEqual equalOperator;
-    private final BlockPositionHashCode hashCodeOperator;
+    private final MethodHandle readFlat;
+    private final MethodHandle writeFlat;
+    private final MethodHandle hashFlat;
+    private final MethodHandle distinctFlatBlock;
+    private final MethodHandle hashBlock;
 
     public HistogramStateFactory(
             @TypeParameter("T") Type type,
             @OperatorDependency(
-                    operator = OperatorType.EQUAL,
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER)) MethodHandle readFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN)) MethodHandle writeFlat,
+            @OperatorDependency(
+                    operator = OperatorType.HASH_CODE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = FLAT, result = FAIL_ON_NULL)) MethodHandle hashFlat,
+            @OperatorDependency(
+                    operator = OperatorType.IS_DISTINCT_FROM,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = NULLABLE_RETURN))
-                    BlockPositionEqual equalOperator,
+                    convention = @Convention(arguments = {FLAT, VALUE_BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL)) MethodHandle distinctFlatBlock,
             @OperatorDependency(
                     operator = OperatorType.HASH_CODE,
                     argumentTypes = "T",
-                    convention = @Convention(arguments = BLOCK_POSITION, result = FAIL_ON_NULL))
-                    BlockPositionHashCode hashCodeOperator)
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FAIL_ON_NULL)) MethodHandle hashBlock)
     {
         this.type = requireNonNull(type, "type is null");
-        this.equalOperator = requireNonNull(equalOperator, "equalOperator is null");
-        this.hashCodeOperator = requireNonNull(hashCodeOperator, "hashCodeOperator is null");
+        this.readFlat = requireNonNull(readFlat, "readFlat is null");
+        this.writeFlat = requireNonNull(writeFlat, "writeFlat is null");
+        this.hashFlat = requireNonNull(hashFlat, "hashFlat is null");
+        this.distinctFlatBlock = requireNonNull(distinctFlatBlock, "distinctFlatBlock is null");
+        this.hashBlock = requireNonNull(hashBlock, "hashBlock is null");
     }
 
     @Override
     public HistogramState createSingleState()
     {
-        return new SingleHistogramState(type, equalOperator, hashCodeOperator, EXPECTED_SIZE_FOR_HASHING);
+        return new SingleHistogramState(type, readFlat, writeFlat, hashFlat, distinctFlatBlock, hashBlock);
     }
 
     @Override
     public HistogramState createGroupedState()
     {
-        return new GroupedHistogramState(type, equalOperator, hashCodeOperator, EXPECTED_SIZE_FOR_HASHING);
+        return new GroupedHistogramState(type, readFlat, writeFlat, hashFlat, distinctFlatBlock, hashBlock);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramStateSerializer.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramStateSerializer.java
index d59781e8e805..742354ea9de7 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramStateSerializer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramStateSerializer.java
@@ -15,20 +15,21 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.AccumulatorStateSerializer;
 import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.MapType;
 import io.trino.spi.type.Type;
 
-import static io.trino.operator.aggregation.histogram.HistogramStateFactory.EXPECTED_SIZE_FOR_HASHING;
-
 public class HistogramStateSerializer
         implements AccumulatorStateSerializer<HistogramState>
 {
-    private final Type serializedType;
+    private final MapType serializedType;
 
     public HistogramStateSerializer(@TypeParameter("map(T, BIGINT)") Type serializedType)
     {
-        this.serializedType = serializedType;
+        this.serializedType = (MapType) serializedType;
     }
 
     @Override
@@ -40,12 +41,13 @@ public Type getSerializedType()
     @Override
     public void serialize(HistogramState state, BlockBuilder out)
     {
-        state.get().serialize(out);
+        state.writeAll((MapBlockBuilder) out);
     }
 
     @Override
     public void deserialize(Block block, int index, HistogramState state)
     {
-        state.deserialize((Block) serializedType.getObject(block, index), EXPECTED_SIZE_FOR_HASHING);
+        SqlMap sqlMap = serializedType.getObject(block, index);
+        ((SingleHistogramState) state).setTempSerializedState(sqlMap);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramValueReader.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramValueReader.java
deleted file mode 100644
index fe9d65776218..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/HistogramValueReader.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation.histogram;
-
-import io.trino.spi.block.Block;
-
-public interface HistogramValueReader
-{
-    void read(Block block, int position, long count);
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/SingleHistogramState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/SingleHistogramState.java
index 26c5aebe733c..c6a3494b6bae 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/SingleHistogramState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/SingleHistogramState.java
@@ -14,11 +14,14 @@
 
 package io.trino.operator.aggregation.histogram;
 
-import io.trino.spi.block.Block;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
 
+import java.lang.invoke.MethodHandle;
+
+import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static java.util.Objects.requireNonNull;
 
@@ -28,33 +31,47 @@ public class SingleHistogramState
     private static final int INSTANCE_SIZE = instanceSize(SingleHistogramState.class);
 
     private final Type keyType;
-    private final BlockPositionEqual equalOperator;
-    private final BlockPositionHashCode hashCodeOperator;
-    private SingleTypedHistogram typedHistogram;
+    private final MethodHandle readFlat;
+    private final MethodHandle writeFlat;
+    private final MethodHandle hashFlat;
+    private final MethodHandle distinctFlatBlock;
+    private final MethodHandle hashBlock;
+    private TypedHistogram typedHistogram;
+    private SqlMap tempSerializedState;
 
-    public SingleHistogramState(Type keyType, BlockPositionEqual equalOperator, BlockPositionHashCode hashCodeOperator, int expectedEntriesCount)
+    public SingleHistogramState(
+            Type keyType,
+            MethodHandle readFlat,
+            MethodHandle writeFlat,
+            MethodHandle hashFlat,
+            MethodHandle distinctFlatBlock,
+            MethodHandle hashBlock)
     {
         this.keyType = requireNonNull(keyType, "keyType is null");
-        this.equalOperator = requireNonNull(equalOperator, "equalOperator is null");
-        this.hashCodeOperator = requireNonNull(hashCodeOperator, "hashCodeOperator is null");
-        typedHistogram = new SingleTypedHistogram(keyType, equalOperator, hashCodeOperator, expectedEntriesCount);
+        this.readFlat = requireNonNull(readFlat, "readFlat is null");
+        this.writeFlat = requireNonNull(writeFlat, "writeFlat is null");
+        this.hashFlat = requireNonNull(hashFlat, "hashFlat is null");
+        this.distinctFlatBlock = requireNonNull(distinctFlatBlock, "distinctFlatBlock is null");
+        this.hashBlock = requireNonNull(hashBlock, "hashBlock is null");
     }
 
     @Override
-    public TypedHistogram get()
+    public void add(ValueBlock block, int position, long count)
     {
-        return typedHistogram;
-    }
-
-    @Override
-    public void deserialize(Block block, int expectedSize)
-    {
-        typedHistogram = new SingleTypedHistogram(block, keyType, equalOperator, hashCodeOperator, expectedSize);
+        if (typedHistogram == null) {
+            typedHistogram = new TypedHistogram(keyType, readFlat, writeFlat, hashFlat, distinctFlatBlock, hashBlock, false);
+        }
+        typedHistogram.add(0, block, position, count);
     }
 
     @Override
-    public void addMemoryUsage(long memory)
+    public void writeAll(MapBlockBuilder out)
     {
+        if (typedHistogram == null) {
+            out.appendNull();
+            return;
+        }
+        typedHistogram.serialize(0, out);
     }
 
     @Override
@@ -67,4 +84,17 @@ public long getEstimatedSize()
         }
         return estimatedSize;
     }
+
+    void setTempSerializedState(SqlMap tempSerializedState)
+    {
+        this.tempSerializedState = tempSerializedState;
+    }
+
+    SqlMap removeTempSerializedState()
+    {
+        SqlMap sqlMap = tempSerializedState;
+        checkState(sqlMap != null, "tempDeserializeBlock is null");
+        tempSerializedState = null;
+        return sqlMap;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/SingleTypedHistogram.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/SingleTypedHistogram.java
deleted file mode 100644
index cdd0a1a3aa76..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/SingleTypedHistogram.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation.histogram;
-
-import io.trino.array.IntBigArray;
-import io.trino.array.LongBigArray;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static it.unimi.dsi.fastutil.HashCommon.arraySize;
-import static it.unimi.dsi.fastutil.HashCommon.murmurHash3;
-import static java.util.Objects.requireNonNull;
-
-public class SingleTypedHistogram
-        implements TypedHistogram
-{
-    private static final int INSTANCE_SIZE = instanceSize(SingleTypedHistogram.class);
-    private static final float FILL_RATIO = 0.75f;
-
-    private final int expectedSize;
-    private int hashCapacity;
-    private int maxFill;
-    private int mask;
-
-    private final Type type;
-    private final BlockPositionEqual equalOperator;
-    private final BlockPositionHashCode hashCodeOperator;
-    private final BlockBuilder values;
-
-    private IntBigArray hashPositions;
-    private final LongBigArray counts;
-
-    private SingleTypedHistogram(Type type, BlockPositionEqual equalOperator, BlockPositionHashCode hashCodeOperator, int expectedSize, int hashCapacity, BlockBuilder values)
-    {
-        this.type = requireNonNull(type, "type is null");
-        this.equalOperator = requireNonNull(equalOperator, "equalOperator is null");
-        this.hashCodeOperator = requireNonNull(hashCodeOperator, "hashCodeOperator is null");
-        this.expectedSize = expectedSize;
-        this.hashCapacity = hashCapacity;
-        this.values = values;
-
-        checkArgument(expectedSize > 0, "expectedSize must be greater than zero");
-
-        maxFill = calculateMaxFill(hashCapacity);
-        mask = hashCapacity - 1;
-        hashPositions = new IntBigArray(-1);
-        hashPositions.ensureCapacity(hashCapacity);
-        counts = new LongBigArray();
-        counts.ensureCapacity(hashCapacity);
-    }
-
-    public SingleTypedHistogram(Type type, BlockPositionEqual equalOperator, BlockPositionHashCode hashCodeOperator, int expectedSize)
-    {
-        this(type,
-                equalOperator,
-                hashCodeOperator,
-                expectedSize,
-                computeBucketCount(expectedSize),
-                type.createBlockBuilder(null, computeBucketCount(expectedSize)));
-    }
-
-    private static int computeBucketCount(int expectedSize)
-    {
-        return arraySize(expectedSize, FILL_RATIO);
-    }
-
-    public SingleTypedHistogram(Block block, Type type, BlockPositionEqual equalOperator, BlockPositionHashCode hashCodeOperator, int expectedSize)
-    {
-        this(type, equalOperator, hashCodeOperator, expectedSize);
-        requireNonNull(block, "block is null");
-        for (int i = 0; i < block.getPositionCount(); i += 2) {
-            add(i, block, BIGINT.getLong(block, i + 1));
-        }
-    }
-
-    @Override
-    public long getEstimatedSize()
-    {
-        return INSTANCE_SIZE + values.getRetainedSizeInBytes() + counts.sizeOf() + hashPositions.sizeOf();
-    }
-
-    @Override
-    public void serialize(BlockBuilder out)
-    {
-        if (values.getPositionCount() == 0) {
-            out.appendNull();
-        }
-        else {
-            Block valuesBlock = values.build();
-            BlockBuilder blockBuilder = out.beginBlockEntry();
-            for (int i = 0; i < valuesBlock.getPositionCount(); i++) {
-                type.appendTo(valuesBlock, i, blockBuilder);
-                BIGINT.writeLong(blockBuilder, counts.get(i));
-            }
-            out.closeEntry();
-        }
-    }
-
-    @Override
-    public void addAll(TypedHistogram other)
-    {
-        other.readAllValues((block, position, count) -> add(position, block, count));
-    }
-
-    @Override
-    public void readAllValues(HistogramValueReader reader)
-    {
-        for (int i = 0; i < values.getPositionCount(); i++) {
-            long count = counts.get(i);
-            if (count > 0) {
-                reader.read(values, i, count);
-            }
-        }
-    }
-
-    @Override
-    public void add(int position, Block block, long count)
-    {
-        int hashPosition = getBucketId(hashCodeOperator.hashCodeNullSafe(block, position), mask);
-
-        // look for an empty slot or a slot containing this key
-        while (true) {
-            if (hashPositions.get(hashPosition) == -1) {
-                break;
-            }
-
-            if (equalOperator.equal(block, position, values, hashPositions.get(hashPosition))) {
-                counts.add(hashPositions.get(hashPosition), count);
-                return;
-            }
-            // increment position and mask to handle wrap around
-            hashPosition = (hashPosition + 1) & mask;
-        }
-
-        addNewGroup(hashPosition, position, block, count);
-    }
-
-    @Override
-    public Type getType()
-    {
-        return type;
-    }
-
-    @Override
-    public int getExpectedSize()
-    {
-        return expectedSize;
-    }
-
-    @Override
-    public boolean isEmpty()
-    {
-        return values.getPositionCount() == 0;
-    }
-
-    private void addNewGroup(int hashPosition, int position, Block block, long count)
-    {
-        hashPositions.set(hashPosition, values.getPositionCount());
-        counts.set(values.getPositionCount(), count);
-        type.appendTo(block, position, values);
-
-        // increase capacity, if necessary
-        if (values.getPositionCount() >= maxFill) {
-            rehash();
-        }
-    }
-
-    private void rehash()
-    {
-        long newCapacityLong = hashCapacity * 2L;
-        if (newCapacityLong > Integer.MAX_VALUE) {
-            throw new TrinoException(GENERIC_INSUFFICIENT_RESOURCES, "Size of hash table cannot exceed 1 billion entries");
-        }
-        int newCapacity = (int) newCapacityLong;
-
-        int newMask = newCapacity - 1;
-        IntBigArray newHashPositions = new IntBigArray(-1);
-        newHashPositions.ensureCapacity(newCapacity);
-
-        for (int i = 0; i < values.getPositionCount(); i++) {
-            // find an empty slot for the address
-            int hashPosition = getBucketId(hashCodeOperator.hashCodeNullSafe(values, i), newMask);
-
-            while (newHashPositions.get(hashPosition) != -1) {
-                hashPosition = (hashPosition + 1) & newMask;
-            }
-
-            // record the mapping
-            newHashPositions.set(hashPosition, i);
-        }
-
-        hashCapacity = newCapacity;
-        mask = newMask;
-        maxFill = calculateMaxFill(newCapacity);
-        hashPositions = newHashPositions;
-
-        this.counts.ensureCapacity(maxFill);
-    }
-
-    private static int getBucketId(long rawHash, int mask)
-    {
-        return ((int) murmurHash3(rawHash)) & mask;
-    }
-
-    private static int calculateMaxFill(int hashSize)
-    {
-        checkArgument(hashSize > 0, "hashSize must be greater than 0");
-        int maxFill = (int) Math.ceil(hashSize * FILL_RATIO);
-        if (maxFill == hashSize) {
-            maxFill--;
-        }
-        checkArgument(hashSize > maxFill, "hashSize must be larger than maxFill");
-        return maxFill;
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/TypedHistogram.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/TypedHistogram.java
index 0a9428e09235..e40f503047a0 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/TypedHistogram.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/TypedHistogram.java
@@ -13,33 +13,500 @@
  */
 package io.trino.operator.aggregation.histogram;
 
-import io.trino.spi.block.Block;
+import com.google.common.base.Throwables;
+import com.google.common.primitives.Ints;
+import io.trino.operator.VariableWidthData;
+import io.trino.spi.TrinoException;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
+import jakarta.annotation.Nullable;
 
-public interface TypedHistogram
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.util.Arrays;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.operator.VariableWidthData.EMPTY_CHUNK;
+import static io.trino.operator.VariableWidthData.POINTER_SIZE;
+import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static java.lang.Math.multiplyExact;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
+import static java.util.Objects.checkIndex;
+import static java.util.Objects.requireNonNull;
+
+public final class TypedHistogram
 {
-    long getEstimatedSize();
+    private static final int INSTANCE_SIZE = instanceSize(TypedHistogram.class);
+
+    // See jdk.internal.util.ArraysSupport#SOFT_MAX_ARRAY_LENGTH for an explanation
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
+    // Hash table capacity must be a power of 2 and at least VECTOR_LENGTH
+    private static final int INITIAL_CAPACITY = 16;
+
+    private static int calculateMaxFill(int capacity)
+    {
+        // The hash table uses a load factory of 15/16
+        return (capacity / 16) * 15;
+    }
+
+    private static final long HASH_COMBINE_PRIME = 4999L;
+
+    private static final int RECORDS_PER_GROUP_SHIFT = 10;
+    private static final int RECORDS_PER_GROUP = 1 << RECORDS_PER_GROUP_SHIFT;
+    private static final int RECORDS_PER_GROUP_MASK = RECORDS_PER_GROUP - 1;
+
+    private static final int VECTOR_LENGTH = Long.BYTES;
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, LITTLE_ENDIAN);
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, LITTLE_ENDIAN);
+
+    private final Type type;
+    private final MethodHandle readFlat;
+    private final MethodHandle writeFlat;
+    private final MethodHandle hashFlat;
+    private final MethodHandle distinctFlatBlock;
+    private final MethodHandle hashBlock;
+
+    private final int recordSize;
+    private final int recordGroupIdOffset;
+    private final int recordNextIndexOffset;
+    private final int recordCountOffset;
+    private final int recordValueOffset;
+
+    private int capacity;
+    private int mask;
+
+    private byte[] control;
+    private byte[][] recordGroups;
+    private final VariableWidthData variableWidthData;
+
+    // head position of each group in the hash table
+    @Nullable
+    private int[] groupRecordIndex;
 
-    void serialize(BlockBuilder out);
+    private int size;
+    private int maxFill;
 
-    void addAll(TypedHistogram other);
+    public TypedHistogram(
+            Type type,
+            MethodHandle readFlat,
+            MethodHandle writeFlat,
+            MethodHandle hashFlat,
+            MethodHandle distinctFlatBlock,
+            MethodHandle hashBlock,
+            boolean grouped)
+    {
+        this.type = requireNonNull(type, "type is null");
+
+        this.readFlat = requireNonNull(readFlat, "readFlat is null");
+        this.writeFlat = requireNonNull(writeFlat, "writeFlat is null");
+        this.hashFlat = requireNonNull(hashFlat, "hashFlat is null");
+        this.distinctFlatBlock = requireNonNull(distinctFlatBlock, "distinctFlatBlock is null");
+        this.hashBlock = requireNonNull(hashBlock, "hashBlock is null");
 
-    void readAllValues(HistogramValueReader reader);
+        capacity = INITIAL_CAPACITY;
+        maxFill = calculateMaxFill(capacity);
+        mask = capacity - 1;
+        control = new byte[capacity + VECTOR_LENGTH];
 
-    void add(int position, Block block, long count);
+        groupRecordIndex = grouped ? new int[0] : null;
+
+        boolean variableWidth = type.isFlatVariableWidth();
+        variableWidthData = variableWidth ? new VariableWidthData() : null;
+        if (grouped) {
+            recordGroupIdOffset = (variableWidth ? POINTER_SIZE : 0);
+            recordNextIndexOffset = recordGroupIdOffset + Integer.BYTES;
+            recordCountOffset = recordNextIndexOffset + Integer.BYTES;
+        }
+        else {
+            // use MIN_VALUE so that when it is added to the record offset we get a negative value, and thus an ArrayIndexOutOfBoundsException
+            recordGroupIdOffset = Integer.MIN_VALUE;
+            recordNextIndexOffset = Integer.MIN_VALUE;
+            recordCountOffset = (variableWidth ? POINTER_SIZE : 0);
+        }
+        recordValueOffset = recordCountOffset + Long.BYTES;
+        recordSize = recordValueOffset + type.getFlatFixedSize();
+        recordGroups = createRecordGroups(capacity, recordSize);
+    }
 
-    Type getType();
+    private static byte[][] createRecordGroups(int capacity, int recordSize)
+    {
+        if (capacity < RECORDS_PER_GROUP) {
+            return new byte[][]{new byte[multiplyExact(capacity, recordSize)]};
+        }
 
-    int getExpectedSize();
+        byte[][] groups = new byte[(capacity + 1) >> RECORDS_PER_GROUP_SHIFT][];
+        for (int i = 0; i < groups.length; i++) {
+            groups[i] = new byte[multiplyExact(RECORDS_PER_GROUP, recordSize)];
+        }
+        return groups;
+    }
 
-    boolean isEmpty();
+    public long getEstimatedSize()
+    {
+        return INSTANCE_SIZE +
+                sizeOf(control) +
+                (sizeOf(recordGroups[0]) * recordGroups.length) +
+                (variableWidthData == null ? 0 : variableWidthData.getRetainedSizeBytes()) +
+                (groupRecordIndex == null ? 0 : sizeOf(groupRecordIndex));
+    }
+
+    public void setMaxGroupId(int maxGroupId)
+    {
+        checkState(groupRecordIndex != null, "grouping is not enabled");
+
+        int requiredSize = maxGroupId + 1;
+        checkIndex(requiredSize, MAX_ARRAY_SIZE);
+
+        int currentSize = groupRecordIndex.length;
+        if (requiredSize > currentSize) {
+            groupRecordIndex = Arrays.copyOf(groupRecordIndex, Ints.constrainToRange(requiredSize * 2, 1024, MAX_ARRAY_SIZE));
+            Arrays.fill(groupRecordIndex, currentSize, groupRecordIndex.length, -1);
+        }
+    }
+
+    public int size()
+    {
+        return size;
+    }
+
+    public void serialize(int groupId, MapBlockBuilder out)
+    {
+        if (size == 0) {
+            out.appendNull();
+            return;
+        }
+
+        if (groupRecordIndex == null) {
+            checkArgument(groupId == 0, "groupId must be zero when grouping is not enabled");
+
+            // if there is only one group, serialize the entire histogram
+            out.buildEntry((keyBuilder, valueBuilder) -> {
+                for (int i = 0; i < capacity; i++) {
+                    if (control[i] != 0) {
+                        byte[] records = getRecords(i);
+                        int recordOffset = getRecordOffset(i);
+                        serializeEntry(keyBuilder, valueBuilder, records, recordOffset);
+                    }
+                }
+            });
+            return;
+        }
+
+        int index = groupRecordIndex[groupId];
+        if (index == -1) {
+            out.appendNull();
+            return;
+        }
+
+        // follow the linked list of records for this group
+        out.buildEntry((keyBuilder, valueBuilder) -> {
+            int nextIndex = index;
+            while (nextIndex >= 0) {
+                byte[] records = getRecords(nextIndex);
+                int recordOffset = getRecordOffset(nextIndex);
+
+                serializeEntry(keyBuilder, valueBuilder, records, recordOffset);
+
+                nextIndex = (int) INT_HANDLE.get(records, recordOffset + recordNextIndexOffset);
+            }
+        });
+    }
+
+    private void serializeEntry(BlockBuilder keyBuilder, BlockBuilder valueBuilder, byte[] records, int recordOffset)
+    {
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            variableWidthChunk = variableWidthData.getChunk(records, recordOffset);
+        }
+
+        try {
+            readFlat.invokeExact(records, recordOffset + recordValueOffset, variableWidthChunk, keyBuilder);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+        BIGINT.writeLong(valueBuilder, (long) LONG_HANDLE.get(records, recordOffset + recordCountOffset));
+    }
+
+    public void add(int groupId, ValueBlock block, int position, long count)
+    {
+        checkArgument(!block.isNull(position), "value must not be null");
+        checkArgument(groupId == 0 || groupRecordIndex != null, "groupId must be zero when grouping is not enabled");
+
+        long hash = valueHashCode(groupId, block, position);
+
+        byte hashPrefix = (byte) (hash & 0x7F | 0x80);
+        int bucket = bucket((int) (hash >> 7));
+
+        int step = 1;
+        long repeated = repeat(hashPrefix);
+
+        while (true) {
+            final long controlVector = (long) LONG_HANDLE.get(control, bucket);
+
+            int matchBucket = matchInVector(groupId, block, position, bucket, repeated, controlVector);
+            if (matchBucket >= 0) {
+                addCount(matchBucket, count);
+                return;
+            }
+
+            int emptyIndex = findEmptyInVector(controlVector, bucket);
+            if (emptyIndex >= 0) {
+                insert(emptyIndex, groupId, block, position, count, hashPrefix);
+                size++;
+
+                if (size >= maxFill) {
+                    rehash();
+                }
+                return;
+            }
+
+            bucket = bucket(bucket + step);
+            step += VECTOR_LENGTH;
+        }
+    }
+
+    private int matchInVector(int groupId, ValueBlock block, int position, int vectorStartBucket, long repeated, long controlVector)
+    {
+        long controlMatches = match(controlVector, repeated);
+        while (controlMatches != 0) {
+            int bucket = bucket(vectorStartBucket + (Long.numberOfTrailingZeros(controlMatches) >>> 3));
+            if (valueNotDistinctFrom(bucket, block, position, groupId)) {
+                return bucket;
+            }
+
+            controlMatches = controlMatches & (controlMatches - 1);
+        }
+        return -1;
+    }
 
-    // no-op on non-grouped
-    default TypedHistogram setGroupId(long groupId)
+    private int findEmptyInVector(long vector, int vectorStartBucket)
     {
-        return this;
+        long controlMatches = match(vector, 0x00_00_00_00_00_00_00_00L);
+        if (controlMatches == 0) {
+            return -1;
+        }
+        int slot = Long.numberOfTrailingZeros(controlMatches) >>> 3;
+        return bucket(vectorStartBucket + slot);
     }
 
-    default void ensureCapacity(long size) {}
+    private void addCount(int index, long increment)
+    {
+        byte[] records = getRecords(index);
+        int countOffset = getRecordOffset(index) + recordCountOffset;
+        LONG_HANDLE.set(records, countOffset, (long) LONG_HANDLE.get(records, countOffset) + increment);
+    }
+
+    private void insert(int index, int groupId, ValueBlock block, int position, long count, byte hashPrefix)
+    {
+        setControl(index, hashPrefix);
+
+        byte[] records = getRecords(index);
+        int recordOffset = getRecordOffset(index);
+
+        if (groupRecordIndex != null) {
+            // write groupId
+            INT_HANDLE.set(records, recordOffset + recordGroupIdOffset, groupId);
+
+            // update linked list pointers
+            int nextRecordIndex = groupRecordIndex[groupId];
+            groupRecordIndex[groupId] = index;
+            INT_HANDLE.set(records, recordOffset + recordNextIndexOffset, nextRecordIndex);
+        }
+
+        // write count
+        LONG_HANDLE.set(records, recordOffset + recordCountOffset, count);
+
+        // write value
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        int variableWidthChunkOffset = 0;
+        if (variableWidthData != null) {
+            int variableWidthLength = type.getFlatVariableWidthSize(block, position);
+            variableWidthChunk = variableWidthData.allocate(records, recordOffset, variableWidthLength);
+            variableWidthChunkOffset = VariableWidthData.getChunkOffset(records, recordOffset);
+        }
+
+        try {
+            writeFlat.invokeExact(block, position, records, recordOffset + recordValueOffset, variableWidthChunk, variableWidthChunkOffset);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private void setControl(int index, byte hashPrefix)
+    {
+        control[index] = hashPrefix;
+        if (index < VECTOR_LENGTH) {
+            control[index + capacity] = hashPrefix;
+        }
+    }
+
+    private void rehash()
+    {
+        int oldCapacity = capacity;
+        byte[] oldControl = control;
+        byte[][] oldRecordGroups = recordGroups;
+
+        long newCapacityLong = capacity * 2L;
+        if (newCapacityLong > MAX_ARRAY_SIZE) {
+            throw new TrinoException(GENERIC_INSUFFICIENT_RESOURCES, "Size of hash table cannot exceed 1 billion entries");
+        }
+
+        capacity = (int) newCapacityLong;
+        maxFill = calculateMaxFill(capacity);
+        mask = capacity - 1;
+
+        control = new byte[capacity + VECTOR_LENGTH];
+        recordGroups = createRecordGroups(capacity, recordSize);
+
+        if (groupRecordIndex != null) {
+            // reset the groupRecordIndex as it will be rebuilt during the rehash
+            Arrays.fill(groupRecordIndex, -1);
+        }
+
+        for (int oldIndex = 0; oldIndex < oldCapacity; oldIndex++) {
+            if (oldControl[oldIndex] != 0) {
+                byte[] oldRecords = oldRecordGroups[oldIndex >> RECORDS_PER_GROUP_SHIFT];
+                int oldRecordOffset = getRecordOffset(oldIndex);
+
+                int groupId = 0;
+                if (groupRecordIndex != null) {
+                    groupId = (int) INT_HANDLE.get(oldRecords, oldRecordOffset + recordGroupIdOffset);
+                }
+
+                long hash = valueHashCode(groupId, oldRecords, oldIndex);
+                byte hashPrefix = (byte) (hash & 0x7F | 0x80);
+                int bucket = bucket((int) (hash >> 7));
+
+                int step = 1;
+                while (true) {
+                    final long controlVector = (long) LONG_HANDLE.get(control, bucket);
+                    // values are already distinct, so just find the first empty slot
+                    int emptyIndex = findEmptyInVector(controlVector, bucket);
+                    if (emptyIndex >= 0) {
+                        setControl(emptyIndex, hashPrefix);
+
+                        // copy full record including groupId and count
+                        byte[] records = getRecords(emptyIndex);
+                        int recordOffset = getRecordOffset(emptyIndex);
+                        System.arraycopy(oldRecords, oldRecordOffset, records, recordOffset, recordSize);
+
+                        if (groupRecordIndex != null) {
+                            // update linked list pointer to reflect the positions in the new hash
+                            INT_HANDLE.set(records, recordOffset + recordNextIndexOffset, groupRecordIndex[groupId]);
+                            groupRecordIndex[groupId] = emptyIndex;
+                        }
+
+                        break;
+                    }
+
+                    bucket = bucket(bucket + step);
+                    step += VECTOR_LENGTH;
+                }
+            }
+        }
+    }
+
+    private int bucket(int hash)
+    {
+        return hash & mask;
+    }
+
+    private byte[] getRecords(int index)
+    {
+        return recordGroups[index >> RECORDS_PER_GROUP_SHIFT];
+    }
+
+    private int getRecordOffset(int index)
+    {
+        return (index & RECORDS_PER_GROUP_MASK) * recordSize;
+    }
+
+    private long valueHashCode(int groupId, byte[] records, int index)
+    {
+        int recordOffset = getRecordOffset(index);
+
+        try {
+            byte[] variableWidthChunk = EMPTY_CHUNK;
+            if (variableWidthData != null) {
+                variableWidthChunk = variableWidthData.getChunk(records, recordOffset);
+            }
+
+            long valueHash = (long) hashFlat.invokeExact(
+                    records,
+                    recordOffset + recordValueOffset,
+                    variableWidthChunk);
+            return groupId * HASH_COMBINE_PRIME + valueHash;
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private long valueHashCode(int groupId, ValueBlock right, int rightPosition)
+    {
+        try {
+            long valueHash = (long) hashBlock.invokeExact(right, rightPosition);
+            return groupId * HASH_COMBINE_PRIME + valueHash;
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private boolean valueNotDistinctFrom(int leftPosition, ValueBlock right, int rightPosition, int rightGroupId)
+    {
+        byte[] leftRecords = getRecords(leftPosition);
+        int leftRecordOffset = getRecordOffset(leftPosition);
+
+        if (groupRecordIndex != null) {
+            long leftGroupId = (int) INT_HANDLE.get(leftRecords, leftRecordOffset + recordGroupIdOffset);
+            if (leftGroupId != rightGroupId) {
+                return false;
+            }
+        }
+
+        byte[] leftVariableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            leftVariableWidthChunk = variableWidthData.getChunk(leftRecords, leftRecordOffset);
+        }
+
+        try {
+            return !(boolean) distinctFlatBlock.invokeExact(
+                    leftRecords,
+                    leftRecordOffset + recordValueOffset,
+                    leftVariableWidthChunk,
+                    right,
+                    rightPosition);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private static long repeat(byte value)
+    {
+        return ((value & 0xFF) * 0x01_01_01_01_01_01_01_01L);
+    }
+
+    private static long match(long vector, long repeatedValue)
+    {
+        // HD 6-1
+        long comparison = vector ^ repeatedValue;
+        return (comparison - 0x01_01_01_01_01_01_01_01L) & ~comparison & 0x80_80_80_80_80_80_80_80L;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/ValueStore.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/ValueStore.java
deleted file mode 100644
index f91340a25490..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/histogram/ValueStore.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation.histogram;
-
-import com.google.common.annotations.VisibleForTesting;
-import io.trino.array.IntBigArray;
-import io.trino.array.LongBigArray;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-
-import static com.google.common.base.Preconditions.checkState;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.operator.aggregation.histogram.HashUtil.calculateMaxFill;
-import static io.trino.operator.aggregation.histogram.HashUtil.computeBucketCount;
-import static io.trino.operator.aggregation.histogram.HashUtil.nextBucketId;
-import static io.trino.operator.aggregation.histogram.HashUtil.nextProbeLinear;
-import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
-import static java.util.Objects.requireNonNull;
-
-/**
- * helper class for {@link GroupedTypedHistogram}
- * May be used for other cases that need a simple hash for values
- * <p>
- * sort of a FlyWeightStore for values--will return unique number for a value. If it exists, you'll get the same number. Class map Value -> number
- * <p>
- * Note it assumes you're storing # -> Value (Type, Block, position, or the result of the ) somewhere else
- */
-public class ValueStore
-{
-    private static final int INSTANCE_SIZE = instanceSize(GroupedTypedHistogram.class);
-    private static final float MAX_FILL_RATIO = 0.5f;
-    private static final int EMPTY_BUCKET = -1;
-    private final Type type;
-    private final BlockPositionEqual equalOperator;
-    private final BlockBuilder values;
-    private int rehashCount;
-
-    private int mask;
-    private int bucketCount;
-    private IntBigArray buckets;
-    private final LongBigArray valueHashes;
-    private int maxFill;
-
-    @VisibleForTesting
-    public ValueStore(Type type, BlockPositionEqual equalOperator, int expectedSize, BlockBuilder values)
-    {
-        this.type = requireNonNull(type, "type is null");
-        this.equalOperator = requireNonNull(equalOperator, "equalOperator is null");
-        bucketCount = computeBucketCount(expectedSize, MAX_FILL_RATIO);
-        mask = bucketCount - 1;
-        maxFill = calculateMaxFill(bucketCount, MAX_FILL_RATIO);
-        this.values = values;
-        buckets = new IntBigArray(-1);
-        buckets.ensureCapacity(bucketCount);
-        valueHashes = new LongBigArray(-1);
-        valueHashes.ensureCapacity(bucketCount);
-    }
-
-    /**
-     * This will add an item if not already in the system. It returns a pointer that is unique for multiple instances of the value. If item present,
-     * returns the pointer into the system
-     */
-    public int addAndGetPosition(Block block, int position, long valueHash)
-    {
-        if (values.getPositionCount() >= maxFill) {
-            rehash();
-        }
-
-        int bucketId = getBucketId(valueHash, mask);
-        int valuePointer;
-
-        // look for an empty slot or a slot containing this key
-        int probeCount = 1;
-        int originalBucketId = bucketId;
-        while (true) {
-            checkState(probeCount < bucketCount, "could not find match for value nor empty slot in %s buckets", bucketCount);
-            valuePointer = buckets.get(bucketId);
-
-            if (valuePointer == EMPTY_BUCKET) {
-                valuePointer = values.getPositionCount();
-                valueHashes.set(valuePointer, (int) valueHash);
-                type.appendTo(block, position, values);
-                buckets.set(bucketId, valuePointer);
-
-                return valuePointer;
-            }
-            if (equalOperator.equal(block, position, values, valuePointer)) {
-                // value at position
-                return valuePointer;
-            }
-            int probe = nextProbe(probeCount);
-            bucketId = nextBucketId(originalBucketId, mask, probe);
-            probeCount++;
-        }
-    }
-
-    private int getBucketId(long valueHash, int mask)
-    {
-        return (int) (valueHash & mask);
-    }
-
-    @VisibleForTesting
-    void rehash()
-    {
-        ++rehashCount;
-
-        long newBucketCountLong = bucketCount * 2L;
-
-        if (newBucketCountLong > Integer.MAX_VALUE) {
-            throw new TrinoException(GENERIC_INSUFFICIENT_RESOURCES, "Size of hash table cannot exceed " + Integer.MAX_VALUE + " entries (" + newBucketCountLong + ")");
-        }
-
-        int newBucketCount = (int) newBucketCountLong;
-        int newMask = newBucketCount - 1;
-
-        IntBigArray newBuckets = new IntBigArray(-1);
-
-        newBuckets.ensureCapacity(newBucketCount);
-
-        for (int i = 0; i < values.getPositionCount(); i++) {
-            long valueHash = valueHashes.get(i);
-            int bucketId = getBucketId(valueHash, newMask);
-            int probeCount = 1;
-
-            while (newBuckets.get(bucketId) != EMPTY_BUCKET) {
-                int probe = nextProbe(probeCount);
-
-                bucketId = nextBucketId(bucketId, newMask, probe);
-                probeCount++;
-            }
-
-            // record the mapping
-            newBuckets.set(bucketId, i);
-        }
-
-        buckets = newBuckets;
-        // worst case is every bucket has a unique value, so pre-emptively keep this large enough to have a value for ever bucket
-        // TODO: could optimize the growth algorithm to be resize this only when necessary; this wastes memory but guarantees that if every value has a distinct hash, we have space
-        valueHashes.ensureCapacity(newBucketCount);
-        bucketCount = newBucketCount;
-        maxFill = calculateMaxFill(newBucketCount, MAX_FILL_RATIO);
-        mask = newMask;
-    }
-
-    public int getRehashCount()
-    {
-        return rehashCount;
-    }
-
-    public long getEstimatedSize()
-    {
-        return INSTANCE_SIZE + buckets.sizeOf();
-    }
-
-    private int nextProbe(int probe)
-    {
-        return nextProbeLinear(probe);
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/AbstractListaggAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/AbstractListaggAggregationState.java
new file mode 100644
index 000000000000..d06b00295590
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/AbstractListaggAggregationState.java
@@ -0,0 +1,300 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation.listagg;
+
+import com.google.common.annotations.VisibleForTesting;
+import io.airlift.slice.Slice;
+import io.airlift.slice.SliceOutput;
+import io.airlift.slice.Slices;
+import io.trino.operator.VariableWidthData;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlockBuilder;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlRow;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
+import io.trino.spi.type.ArrayType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.airlift.slice.SizeOf.sizeOfObjectArray;
+import static io.trino.operator.VariableWidthData.POINTER_SIZE;
+import static io.trino.operator.VariableWidthData.getChunkOffset;
+import static io.trino.spi.StandardErrorCode.EXCEEDED_FUNCTION_MEMORY_LIMIT;
+import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
+import static io.trino.spi.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+public abstract class AbstractListaggAggregationState
+        implements ListaggAggregationState
+{
+    private static final int INSTANCE_SIZE = instanceSize(AbstractListaggAggregationState.class);
+
+    private static final int MAX_OUTPUT_LENGTH = DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
+    private static final int MAX_OVERFLOW_FILLER_LENGTH = 65_536;
+
+    private static final int RECORDS_PER_GROUP_SHIFT = 10;
+    protected static final int RECORDS_PER_GROUP = 1 << RECORDS_PER_GROUP_SHIFT;
+    protected static final int RECORDS_PER_GROUP_MASK = RECORDS_PER_GROUP - 1;
+
+    private boolean initialized;
+    private Slice separator;
+    private boolean overflowError;
+    private Slice overflowFiller;
+    private boolean showOverflowEntryCount;
+    private int maxOutputLength = MAX_OUTPUT_LENGTH;
+
+    protected final int recordSize;
+
+    /**
+     * The fixed chunk contains an array of records. The records are laid out as follows:
+     * <ul>
+     *     <li>12 byte pointer to variable width data
+     *     <li>8 byte next index (only present if {@code hasNextIndex} is true)</li>
+     * </ul>
+     * The pointer is placed first to simplify the offset calculations for variable with code.
+     * This chunk contains {@code capacity + 1} records. The extra record is used for the swap operation.
+     */
+    protected final List<byte[]> closedRecordGroups = new ArrayList<>();
+
+    protected byte[] openRecordGroup;
+
+    private final VariableWidthData variableWidthData;
+
+    private long capacity;
+    private long size;
+
+    public AbstractListaggAggregationState(int extraRecordBytes)
+    {
+        variableWidthData = new VariableWidthData();
+        recordSize = POINTER_SIZE + extraRecordBytes;
+        openRecordGroup = new byte[recordSize * RECORDS_PER_GROUP];
+        capacity = RECORDS_PER_GROUP;
+    }
+
+    public AbstractListaggAggregationState(AbstractListaggAggregationState state)
+    {
+        this.initialized = state.initialized;
+        this.separator = state.separator;
+        this.overflowError = state.overflowError;
+        this.overflowFiller = state.overflowFiller;
+        this.showOverflowEntryCount = state.showOverflowEntryCount;
+        this.maxOutputLength = state.maxOutputLength;
+
+        this.recordSize = state.recordSize;
+
+        this.variableWidthData = state.variableWidthData;
+        this.capacity = state.capacity;
+        this.size = state.size;
+        this.closedRecordGroups.addAll(state.closedRecordGroups);
+        // the last open record group must be cloned because it is still being written to
+        if (state.openRecordGroup != null) {
+            this.openRecordGroup = state.openRecordGroup.clone();
+        }
+    }
+
+    @Override
+    public long getEstimatedSize()
+    {
+        return INSTANCE_SIZE +
+                sizeOfObjectArray(closedRecordGroups.size()) +
+                ((long) closedRecordGroups.size() * RECORDS_PER_GROUP * recordSize) +
+                (openRecordGroup == null ? 0 : sizeOf(openRecordGroup)) +
+                (variableWidthData == null ? 0 : variableWidthData.getRetainedSizeBytes());
+    }
+
+    protected final long size()
+    {
+        return size;
+    }
+
+    @Override
+    public final void initialize(Slice separator, boolean overflowError, Slice overflowFiller, boolean showOverflowEntryCount)
+    {
+        if (initialized) {
+            return;
+        }
+        requireNonNull(separator, "separator is null");
+        requireNonNull(overflowFiller, "overflowFiller is null");
+        if (overflowFiller.length() > MAX_OVERFLOW_FILLER_LENGTH) {
+            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format("Overflow filler length %d exceeds maximum length %d", overflowFiller.length(), MAX_OVERFLOW_FILLER_LENGTH));
+        }
+
+        this.separator = separator;
+        this.overflowError = overflowError;
+        this.overflowFiller = overflowFiller;
+        this.showOverflowEntryCount = showOverflowEntryCount;
+        initialized = true;
+    }
+
+    @VisibleForTesting
+    void setMaxOutputLength(int maxOutputLength)
+    {
+        this.maxOutputLength = maxOutputLength;
+    }
+
+    @Override
+    public void add(ValueBlock block, int position)
+    {
+        checkArgument(!block.isNull(position), "element is null");
+
+        if (size == capacity) {
+            closedRecordGroups.add(openRecordGroup);
+            openRecordGroup = new byte[recordSize * RECORDS_PER_GROUP];
+            capacity += RECORDS_PER_GROUP;
+        }
+
+        byte[] records = openRecordGroup;
+        int recordOffset = getRecordOffset(size);
+
+        Slice slice = VARCHAR.getSlice(block, position);
+
+        int variableWidthLength = slice.length();
+        byte[] variableWidthChunk = variableWidthData.allocate(records, recordOffset, variableWidthLength);
+        int variableWidthChunkOffset = getChunkOffset(records, recordOffset);
+
+        slice.getBytes(0, variableWidthChunk, variableWidthChunkOffset, variableWidthLength);
+
+        size++;
+    }
+
+    @Override
+    public void serialize(RowBlockBuilder rowBlockBuilder)
+    {
+        if (size == 0) {
+            rowBlockBuilder.appendNull();
+            return;
+        }
+        rowBlockBuilder.buildEntry(fieldBuilders -> {
+            VARCHAR.writeSlice(fieldBuilders.get(0), separator);
+            BOOLEAN.writeBoolean(fieldBuilders.get(1), overflowError);
+            VARCHAR.writeSlice(fieldBuilders.get(2), overflowFiller);
+            BOOLEAN.writeBoolean(fieldBuilders.get(3), showOverflowEntryCount);
+
+            ((ArrayBlockBuilder) fieldBuilders.get(4)).buildEntry(elementBuilder -> {
+                VariableWidthBlockBuilder valueBuilder = (VariableWidthBlockBuilder) elementBuilder;
+                for (byte[] records : closedRecordGroups) {
+                    int recordOffset = 0;
+                    for (int recordIndex = 0; recordIndex < RECORDS_PER_GROUP; recordIndex++) {
+                        writeValue(records, recordOffset, valueBuilder);
+                        recordOffset += recordSize;
+                    }
+                }
+                int recordsInOpenGroup = ((int) size) & RECORDS_PER_GROUP_MASK;
+                int recordOffset = 0;
+                for (int recordIndex = 0; recordIndex < recordsInOpenGroup; recordIndex++) {
+                    writeValue(openRecordGroup, recordOffset, valueBuilder);
+                    recordOffset += recordSize;
+                }
+            });
+        });
+    }
+
+    private void writeValue(byte[] records, int recordOffset, VariableWidthBlockBuilder elementBuilder)
+    {
+        byte[] variableWidthChunk = variableWidthData.getChunk(records, recordOffset);
+        int valueOffset = getChunkOffset(records, recordOffset);
+        int valueLength = VariableWidthData.getValueLength(records, recordOffset);
+
+        elementBuilder.writeEntry(variableWidthChunk, valueOffset, valueLength);
+    }
+
+    @Override
+    public void merge(ListaggAggregationState other)
+    {
+        SqlRow sqlRow = ((SingleListaggAggregationState) other).removeTempSerializedState();
+
+        List<Block> fields = sqlRow.getRawFieldBlocks();
+        int index = sqlRow.getRawIndex();
+        Slice separator = VARCHAR.getSlice(fields.get(0), index);
+        boolean overflowError = BOOLEAN.getBoolean(fields.get(1), index);
+        Slice overflowFiller = VARCHAR.getSlice(fields.get(2), index);
+        boolean showOverflowEntryCount = BOOLEAN.getBoolean(fields.get(3), index);
+        initialize(separator, overflowError, overflowFiller, showOverflowEntryCount);
+
+        Block array = new ArrayType(VARCHAR).getObject(fields.get(4), index);
+        ValueBlock arrayValues = array.getUnderlyingValueBlock();
+        for (int i = 0; i < array.getPositionCount(); i++) {
+            add(arrayValues, arrayValues.getUnderlyingValuePosition(i));
+        }
+    }
+
+    protected final boolean writeEntry(byte[] records, int recordOffset, SliceOutput out, int totalEntryCount, int emittedCount)
+    {
+        byte[] variableWidthChunk = variableWidthData.getChunk(records, recordOffset);
+        int valueOffset = getChunkOffset(records, recordOffset);
+        int valueLength = VariableWidthData.getValueLength(records, recordOffset);
+
+        int spaceRequired = valueLength + (emittedCount > 0 ? separator.length() : 0);
+
+        if (out.size() + spaceRequired > maxOutputLength) {
+            writeOverflow(out, totalEntryCount, emittedCount);
+            return false;
+        }
+
+        if (emittedCount > 0) {
+            out.writeBytes(separator);
+        }
+
+        out.writeBytes(variableWidthChunk, valueOffset, valueLength);
+        return true;
+    }
+
+    private void writeOverflow(SliceOutput out, int entryCount, int emittedCount)
+    {
+        if (overflowError) {
+            throw new TrinoException(EXCEEDED_FUNCTION_MEMORY_LIMIT, format("Concatenated string has the length in bytes larger than the maximum output length %d", maxOutputLength));
+        }
+
+        if (emittedCount > 0) {
+            out.writeBytes(separator);
+        }
+        out.writeBytes(overflowFiller);
+
+        if (showOverflowEntryCount) {
+            out.writeBytes(Slices.utf8Slice("("), 0, 1);
+            Slice count = Slices.utf8Slice(Integer.toString(entryCount - emittedCount));
+            out.writeBytes(count, 0, count.length());
+            out.writeBytes(Slices.utf8Slice(")"), 0, 1);
+        }
+    }
+
+    protected final byte[] getRecords(long index)
+    {
+        int recordGroupIndex = (int) (index >>> RECORDS_PER_GROUP_SHIFT);
+        byte[] records;
+        if (recordGroupIndex < closedRecordGroups.size()) {
+            records = closedRecordGroups.get(recordGroupIndex);
+        }
+        else {
+            checkState(recordGroupIndex == closedRecordGroups.size());
+            records = openRecordGroup;
+        }
+        return records;
+    }
+
+    protected final int getRecordOffset(long index)
+    {
+        return (((int) index) & RECORDS_PER_GROUP_MASK) * recordSize;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/GroupListaggAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/GroupListaggAggregationState.java
index b1511bff3505..863c3987c51a 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/GroupListaggAggregationState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/GroupListaggAggregationState.java
@@ -13,90 +13,145 @@
  */
 package io.trino.operator.aggregation.listagg;
 
-import com.google.common.collect.ImmutableList;
-import io.airlift.slice.Slice;
-import io.trino.operator.aggregation.AbstractGroupCollectionAggregationState;
-import io.trino.spi.PageBuilder;
-import io.trino.spi.block.Block;
+import com.google.common.primitives.Ints;
+import io.airlift.slice.SliceOutput;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
+import io.trino.spi.function.AccumulatorState;
+import io.trino.spi.function.GroupedAccumulatorState;
 
-import static io.trino.spi.type.VarcharType.VARCHAR;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.util.Arrays;
 
-public final class GroupListaggAggregationState
-        extends AbstractGroupCollectionAggregationState<ListaggAggregationStateConsumer>
-        implements ListaggAggregationState
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.operator.VariableWidthData.POINTER_SIZE;
+import static java.lang.Math.toIntExact;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
+
+public class GroupListaggAggregationState
+        extends AbstractListaggAggregationState
+        implements GroupedAccumulatorState
 {
-    private static final int MAX_BLOCK_SIZE = 1024 * 1024;
-    private static final int VALUE_CHANNEL = 0;
+    // See jdk.internal.util.ArraysSupport.SOFT_MAX_ARRAY_LENGTH for an explanation
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, LITTLE_ENDIAN);
+
+    private final int recordNextIndexOffset;
 
-    private Slice separator;
-    private boolean overflowError;
-    private Slice overflowFiller;
-    private boolean showOverflowEntryCount;
+    private long[] groupHeadPositions = new long[0];
+    private long[] groupTailPositions = new long[0];
+    private int[] groupSize = new int[0];
+
+    private int groupId = -1;
 
     public GroupListaggAggregationState()
     {
-        super(PageBuilder.withMaxPageSize(MAX_BLOCK_SIZE, ImmutableList.of(VARCHAR)));
+        super(Long.BYTES);
+        recordNextIndexOffset = POINTER_SIZE;
     }
 
-    @Override
-    public void setSeparator(Slice separator)
+    private GroupListaggAggregationState(GroupListaggAggregationState state)
     {
-        this.separator = separator;
-    }
+        super(state);
+        this.recordNextIndexOffset = state.recordNextIndexOffset;
 
-    @Override
-    public Slice getSeparator()
-    {
-        return separator;
-    }
+        this.groupHeadPositions = Arrays.copyOf(state.groupHeadPositions, state.groupHeadPositions.length);
+        this.groupTailPositions = Arrays.copyOf(state.groupTailPositions, state.groupTailPositions.length);
+        this.groupSize = Arrays.copyOf(state.groupSize, state.groupSize.length);
 
-    @Override
-    public void setOverflowFiller(Slice overflowFiller)
-    {
-        this.overflowFiller = overflowFiller;
+        checkArgument(state.groupId == -1, "state.groupId is not -1");
+        //noinspection DataFlowIssue
+        this.groupId = -1;
     }
 
     @Override
-    public Slice getOverflowFiller()
+    public long getEstimatedSize()
     {
-        return overflowFiller;
+        return super.getEstimatedSize() +
+                sizeOf(groupHeadPositions) +
+                sizeOf(groupTailPositions) +
+                sizeOf(groupSize);
     }
 
     @Override
-    public void setOverflowError(boolean overflowError)
+    public void setGroupId(long groupId)
     {
-        this.overflowError = overflowError;
+        this.groupId = toIntExact(groupId);
     }
 
     @Override
-    public boolean isOverflowError()
+    public void ensureCapacity(long maxGroupId)
     {
-        return overflowError;
+        checkArgument(maxGroupId + 1 < MAX_ARRAY_SIZE, "Maximum array size exceeded");
+        int requiredSize = toIntExact(maxGroupId + 1);
+        if (requiredSize > groupHeadPositions.length) {
+            int newSize = Ints.constrainToRange(requiredSize * 2, 1024, MAX_ARRAY_SIZE);
+            int oldSize = groupHeadPositions.length;
+
+            groupHeadPositions = Arrays.copyOf(groupHeadPositions, newSize);
+            Arrays.fill(groupHeadPositions, oldSize, newSize, -1);
+
+            groupTailPositions = Arrays.copyOf(groupTailPositions, newSize);
+            Arrays.fill(groupTailPositions, oldSize, newSize, -1);
+
+            groupSize = Arrays.copyOf(groupSize, newSize);
+        }
     }
 
     @Override
-    public void setShowOverflowEntryCount(boolean showOverflowEntryCount)
+    public void add(ValueBlock block, int position)
     {
-        this.showOverflowEntryCount = showOverflowEntryCount;
+        super.add(block, position);
+
+        long index = size() - 1;
+        byte[] records = openRecordGroup;
+        int recordOffset = getRecordOffset(index);
+        LONG_HANDLE.set(records, recordOffset + recordNextIndexOffset, -1L);
+
+        if (groupTailPositions[groupId] == -1) {
+            groupHeadPositions[groupId] = index;
+        }
+        else {
+            long tailIndex = groupTailPositions[groupId];
+            LONG_HANDLE.set(getRecords(tailIndex), getRecordOffset(tailIndex) + recordNextIndexOffset, index);
+        }
+        groupTailPositions[groupId] = index;
+
+        groupSize[groupId]++;
     }
 
     @Override
-    public boolean showOverflowEntryCount()
+    public void write(VariableWidthBlockBuilder blockBuilder)
     {
-        return showOverflowEntryCount;
+        if (groupSize[groupId] == 0) {
+            blockBuilder.appendNull();
+            return;
+        }
+        blockBuilder.buildEntry(this::write);
     }
 
-    @Override
-    public void add(Block block, int position)
+    private void write(SliceOutput out)
     {
-        prepareAdd();
-        appendAtChannel(VALUE_CHANNEL, block, position);
+        long index = groupHeadPositions[groupId];
+        int emittedCount = 0;
+        int entryCount = groupSize[groupId];
+        while (index != -1) {
+            byte[] records = getRecords(index);
+            int recordOffset = getRecordOffset(index);
+            if (!writeEntry(records, recordOffset, out, entryCount, emittedCount)) {
+                return;
+            }
+            index = (long) LONG_HANDLE.get(records, recordOffset + recordNextIndexOffset);
+            emittedCount++;
+        }
     }
 
     @Override
-    protected boolean accept(ListaggAggregationStateConsumer consumer, PageBuilder pageBuilder, int currentPosition)
+    public AccumulatorState copy()
     {
-        consumer.accept(pageBuilder.getBlockBuilder(VALUE_CHANNEL), currentPosition);
-        return true;
+        return new GroupListaggAggregationState(this);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/ListaggAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/ListaggAggregationFunction.java
index 8355dd9b5dda..738b1ffb806a 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/ListaggAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/ListaggAggregationFunction.java
@@ -13,12 +13,10 @@
  */
 package io.trino.operator.aggregation.listagg;
 
-import com.google.common.annotations.VisibleForTesting;
 import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -29,121 +27,35 @@
 import io.trino.spi.function.OutputFunction;
 import io.trino.spi.function.SqlType;
 
-import static io.trino.spi.StandardErrorCode.EXCEEDED_FUNCTION_MEMORY_LIMIT;
-import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
-import static io.trino.spi.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
-import static java.lang.String.format;
-
 @AggregationFunction(value = "listagg", isOrderSensitive = true)
 @Description("concatenates the input values with the specified separator")
 public final class ListaggAggregationFunction
 {
-    private static final int MAX_OUTPUT_LENGTH = DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
-    private static final int MAX_OVERFLOW_FILLER_LENGTH = 65_536;
-
     private ListaggAggregationFunction() {}
 
     @InputFunction
     public static void input(
             @AggregationState ListaggAggregationState state,
-            @BlockPosition @SqlType("VARCHAR") Block value,
+            @BlockPosition @SqlType("VARCHAR") ValueBlock value,
+            @BlockIndex int position,
             @SqlType("VARCHAR") Slice separator,
             @SqlType("BOOLEAN") boolean overflowError,
             @SqlType("VARCHAR") Slice overflowFiller,
-            @SqlType("BOOLEAN") boolean showOverflowEntryCount,
-            @BlockIndex int position)
+            @SqlType("BOOLEAN") boolean showOverflowEntryCount)
     {
-        if (state.isEmpty()) {
-            if (overflowFiller.length() > MAX_OVERFLOW_FILLER_LENGTH) {
-                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format("Overflow filler length %d exceeds maximum length %d", overflowFiller.length(), MAX_OVERFLOW_FILLER_LENGTH));
-            }
-            // Set the parameters of the LISTAGG command within the state so that
-            // they can be used within the `output` function
-            state.setSeparator(separator);
-            state.setOverflowError(overflowError);
-            state.setOverflowFiller(overflowFiller);
-            state.setShowOverflowEntryCount(showOverflowEntryCount);
-        }
+        state.initialize(separator, overflowError, overflowFiller, showOverflowEntryCount);
         state.add(value, position);
     }
 
     @CombineFunction
     public static void combine(@AggregationState ListaggAggregationState state, @AggregationState ListaggAggregationState otherState)
     {
-        Slice previousSeparator = state.getSeparator();
-        if (previousSeparator == null) {
-            state.setSeparator(otherState.getSeparator());
-            state.setOverflowError(otherState.isOverflowError());
-            state.setOverflowFiller(otherState.getOverflowFiller());
-            state.setShowOverflowEntryCount(otherState.showOverflowEntryCount());
-        }
-
         state.merge(otherState);
     }
 
     @OutputFunction("VARCHAR")
-    public static void output(ListaggAggregationState state, BlockBuilder out)
-    {
-        if (state.isEmpty()) {
-            out.appendNull();
-        }
-        else {
-            outputState(state, out, MAX_OUTPUT_LENGTH);
-        }
-    }
-
-    @VisibleForTesting
-    public static void outputState(ListaggAggregationState state, BlockBuilder out, int maxOutputLength)
-    {
-        Slice separator = state.getSeparator();
-        int separatorLength = separator.length();
-        OutputContext context = new OutputContext();
-        state.forEach((block, position) -> {
-            int entryLength = block.getSliceLength(position);
-            int spaceRequired = entryLength + (context.emittedEntryCount > 0 ? separatorLength : 0);
-
-            if (context.outputLength + spaceRequired > maxOutputLength) {
-                context.overflow = true;
-                return false;
-            }
-
-            if (context.emittedEntryCount > 0) {
-                out.writeBytes(separator, 0, separatorLength);
-                context.outputLength += separatorLength;
-            }
-
-            block.writeBytesTo(position, 0, entryLength, out);
-            context.outputLength += entryLength;
-            context.emittedEntryCount++;
-
-            return true;
-        });
-
-        if (context.overflow) {
-            if (state.isOverflowError()) {
-                throw new TrinoException(EXCEEDED_FUNCTION_MEMORY_LIMIT, format("Concatenated string has the length in bytes larger than the maximum output length %d", maxOutputLength));
-            }
-
-            if (context.emittedEntryCount > 0) {
-                out.writeBytes(separator, 0, separatorLength);
-            }
-            out.writeBytes(state.getOverflowFiller(), 0, state.getOverflowFiller().length());
-
-            if (state.showOverflowEntryCount()) {
-                out.writeBytes(Slices.utf8Slice("("), 0, 1);
-                Slice count = Slices.utf8Slice(Integer.toString(state.getEntryCount() - context.emittedEntryCount));
-                out.writeBytes(count, 0, count.length());
-                out.writeBytes(Slices.utf8Slice(")"), 0, 1);
-            }
-        }
-
-        out.closeEntry();
-    }
-
-    private static class OutputContext
+    public static void output(ListaggAggregationState state, BlockBuilder blockBuilder)
     {
-        long outputLength;
-        int emittedEntryCount;
-        boolean overflow;
+        state.write((VariableWidthBlockBuilder) blockBuilder);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/ListaggAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/ListaggAggregationState.java
index e472d31c29eb..c5b168c06d3d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/ListaggAggregationState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/ListaggAggregationState.java
@@ -14,7 +14,9 @@
 package io.trino.operator.aggregation.listagg;
 
 import io.airlift.slice.Slice;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateMetadata;
 
@@ -24,40 +26,13 @@
 public interface ListaggAggregationState
         extends AccumulatorState
 {
-    void setSeparator(Slice separator);
+    void initialize(Slice separator, boolean overflowError, Slice overflowFiller, boolean showOverflowEntryCount);
 
-    Slice getSeparator();
+    void add(ValueBlock block, int position);
 
-    void setOverflowFiller(Slice overflowFiller);
+    void serialize(RowBlockBuilder out);
 
-    Slice getOverflowFiller();
+    void merge(ListaggAggregationState otherState);
 
-    void setOverflowError(boolean overflowError);
-
-    boolean isOverflowError();
-
-    void setShowOverflowEntryCount(boolean showOverflowEntryCount);
-
-    boolean showOverflowEntryCount();
-
-    void add(Block block, int position);
-
-    void forEach(ListaggAggregationStateConsumer consumer);
-
-    boolean isEmpty();
-
-    int getEntryCount();
-
-    default void merge(ListaggAggregationState otherState)
-    {
-        otherState.forEach((block, position) -> {
-            add(block, position);
-            return true;
-        });
-    }
-
-    default void reset()
-    {
-        throw new UnsupportedOperationException();
-    }
+    void write(VariableWidthBlockBuilder blockBuilder);
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/ListaggAggregationStateSerializer.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/ListaggAggregationStateSerializer.java
index 965fc2dcf05c..b093cec6af32 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/ListaggAggregationStateSerializer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/ListaggAggregationStateSerializer.java
@@ -14,31 +14,26 @@
 package io.trino.operator.aggregation.listagg;
 
 import com.google.common.collect.ImmutableList;
-import io.airlift.slice.Slice;
-import io.trino.spi.block.AbstractRowBlock;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.ColumnarRow;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.AccumulatorStateSerializer;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public class ListaggAggregationStateSerializer
         implements AccumulatorStateSerializer<ListaggAggregationState>
 {
-    private final Type arrayType;
     private final Type serializedType;
 
     public ListaggAggregationStateSerializer()
     {
-        this.arrayType = new ArrayType(VARCHAR);
-        this.serializedType = RowType.anonymous(ImmutableList.of(VARCHAR, BOOLEAN, VARCHAR, BOOLEAN, arrayType));
+        this.serializedType = RowType.anonymous(ImmutableList.of(VARCHAR, BOOLEAN, VARCHAR, BOOLEAN, new ArrayType(VARCHAR)));
     }
 
     @Override
@@ -50,46 +45,13 @@ public Type getSerializedType()
     @Override
     public void serialize(ListaggAggregationState state, BlockBuilder out)
     {
-        if (state.isEmpty()) {
-            out.appendNull();
-        }
-        else {
-            BlockBuilder rowBlockBuilder = out.beginBlockEntry();
-            VARCHAR.writeSlice(rowBlockBuilder, state.getSeparator());
-            BOOLEAN.writeBoolean(rowBlockBuilder, state.isOverflowError());
-            VARCHAR.writeSlice(rowBlockBuilder, state.getOverflowFiller());
-            BOOLEAN.writeBoolean(rowBlockBuilder, state.showOverflowEntryCount());
-
-            BlockBuilder stateElementsBlockBuilder = rowBlockBuilder.beginBlockEntry();
-            state.forEach((block, position) -> {
-                VARCHAR.appendTo(block, position, stateElementsBlockBuilder);
-                return true;
-            });
-            rowBlockBuilder.closeEntry();
-
-            out.closeEntry();
-        }
+        state.serialize((RowBlockBuilder) out);
     }
 
     @Override
     public void deserialize(Block block, int index, ListaggAggregationState state)
     {
-        checkArgument(block instanceof AbstractRowBlock);
-        ColumnarRow columnarRow = toColumnarRow(block);
-
-        Slice separator = VARCHAR.getSlice(columnarRow.getField(0), index);
-        boolean overflowError = BOOLEAN.getBoolean(columnarRow.getField(1), index);
-        Slice overflowFiller = VARCHAR.getSlice(columnarRow.getField(2), index);
-        boolean showOverflowEntryCount = BOOLEAN.getBoolean(columnarRow.getField(3), index);
-        Block stateBlock = (Block) arrayType.getObject(columnarRow.getField(4), index);
-
-        state.reset();
-        state.setSeparator(separator);
-        state.setOverflowError(overflowError);
-        state.setOverflowFiller(overflowFiller);
-        state.setShowOverflowEntryCount(showOverflowEntryCount);
-        for (int i = 0; i < stateBlock.getPositionCount(); i++) {
-            state.add(stateBlock, i);
-        }
+        SqlRow sqlRow = (SqlRow) serializedType.getObject(block, index);
+        ((SingleListaggAggregationState) state).setTempSerializedState(sqlRow);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/SingleListaggAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/SingleListaggAggregationState.java
index 5ef8f7b0681f..2fcd62699907 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/SingleListaggAggregationState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/listagg/SingleListaggAggregationState.java
@@ -13,131 +13,83 @@
  */
 package io.trino.operator.aggregation.listagg;
 
-import io.airlift.slice.Slice;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.airlift.slice.SliceOutput;
+import io.trino.spi.block.SqlRow;
+import io.trino.spi.block.VariableWidthBlockBuilder;
+import io.trino.spi.function.AccumulatorState;
 
-import static com.google.common.base.Verify.verify;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.spi.type.VarcharType.VARCHAR;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static java.lang.Math.toIntExact;
 
 public class SingleListaggAggregationState
-        implements ListaggAggregationState
+        extends AbstractListaggAggregationState
 {
-    private static final int INSTANCE_SIZE = instanceSize(SingleListaggAggregationState.class);
-    private BlockBuilder blockBuilder;
-    private Slice separator;
-    private boolean overflowError;
-    private Slice overflowFiller;
-    private boolean showOverflowEntryCount;
+    private SqlRow tempSerializedState;
 
-    @Override
-    public long getEstimatedSize()
-    {
-        long estimatedSize = INSTANCE_SIZE;
-        if (blockBuilder != null) {
-            estimatedSize += blockBuilder.getRetainedSizeInBytes();
-        }
-        return estimatedSize;
-    }
-
-    @Override
-    public void setSeparator(Slice separator)
-    {
-        this.separator = separator;
-    }
-
-    @Override
-    public Slice getSeparator()
-    {
-        return separator;
-    }
-
-    @Override
-    public void setOverflowFiller(Slice overflowFiller)
-    {
-        this.overflowFiller = overflowFiller;
-    }
-
-    @Override
-    public Slice getOverflowFiller()
-    {
-        return overflowFiller;
-    }
-
-    @Override
-    public void setOverflowError(boolean overflowError)
-    {
-        this.overflowError = overflowError;
-    }
-
-    @Override
-    public boolean isOverflowError()
-    {
-        return overflowError;
-    }
-
-    @Override
-    public void setShowOverflowEntryCount(boolean showOverflowEntryCount)
+    public SingleListaggAggregationState()
     {
-        this.showOverflowEntryCount = showOverflowEntryCount;
+        super(0);
     }
 
-    @Override
-    public boolean showOverflowEntryCount()
+    private SingleListaggAggregationState(SingleListaggAggregationState state)
     {
-        return showOverflowEntryCount;
+        super(state);
+        checkArgument(state.tempSerializedState == null, "state.tempSerializedState is not null");
+        tempSerializedState = null;
     }
 
     @Override
-    public void add(Block block, int position)
+    public void write(VariableWidthBlockBuilder blockBuilder)
     {
-        if (blockBuilder == null) {
-            blockBuilder = VARCHAR.createBlockBuilder(null, 16);
+        if (size() == 0) {
+            blockBuilder.appendNull();
+            return;
         }
-        VARCHAR.appendTo(block, position, blockBuilder);
+        blockBuilder.buildEntry(this::writeNotGrouped);
     }
 
-    @Override
-    public void forEach(ListaggAggregationStateConsumer consumer)
+    private void writeNotGrouped(SliceOutput out)
     {
-        if (blockBuilder == null) {
-            return;
+        int entryCount = toIntExact(size());
+        int emittedCount = 0;
+        for (byte[] records : closedRecordGroups) {
+            int recordOffset = 0;
+            for (int recordIndex = 0; recordIndex < RECORDS_PER_GROUP; recordIndex++) {
+                if (!writeEntry(records, recordOffset, out, entryCount, emittedCount)) {
+                    return;
+                }
+                emittedCount++;
+                recordOffset += recordSize;
+            }
         }
-
-        for (int i = 0; i < blockBuilder.getPositionCount(); i++) {
-            if (!consumer.accept(blockBuilder, i)) {
-                break;
+        int recordsInOpenGroup = entryCount & RECORDS_PER_GROUP_MASK;
+        int recordOffset = 0;
+        for (int recordIndex = 0; recordIndex < recordsInOpenGroup; recordIndex++) {
+            if (!writeEntry(openRecordGroup, recordOffset, out, entryCount, emittedCount)) {
+                return;
             }
+            emittedCount++;
+            recordOffset += recordSize;
         }
     }
 
     @Override
-    public boolean isEmpty()
+    public AccumulatorState copy()
     {
-        if (blockBuilder == null) {
-            return true;
-        }
-        verify(blockBuilder.getPositionCount() != 0);
-        return false;
+        return new SingleListaggAggregationState(this);
     }
 
-    @Override
-    public int getEntryCount()
+    void setTempSerializedState(SqlRow tempSerializedState)
     {
-        if (blockBuilder == null) {
-            return 0;
-        }
-        return blockBuilder.getPositionCount();
+        this.tempSerializedState = tempSerializedState;
     }
 
-    @Override
-    public void reset()
+    SqlRow removeTempSerializedState()
     {
-        separator = null;
-        overflowError = false;
-        overflowFiller = null;
-        showOverflowEntryCount = false;
-        blockBuilder = null;
+        SqlRow sqlRow = tempSerializedState;
+        checkState(sqlRow != null, "tempDeserializeBlock is null");
+        tempSerializedState = null;
+        return sqlRow;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MaxByNAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MaxByNAggregationFunction.java
index 691414610afa..2b3ed17f7512 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MaxByNAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MaxByNAggregationFunction.java
@@ -13,9 +13,8 @@
  */
 package io.trino.operator.aggregation.minmaxbyn;
 
-import io.trino.operator.aggregation.NullablePosition;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -24,6 +23,7 @@
 import io.trino.spi.function.Description;
 import io.trino.spi.function.InputFunction;
 import io.trino.spi.function.OutputFunction;
+import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 
@@ -38,13 +38,14 @@ private MaxByNAggregationFunction() {}
     @TypeParameter("V")
     public static void input(
             @AggregationState({"K", "V"}) MaxByNState state,
-            @NullablePosition @BlockPosition @SqlType("V") Block valueBlock,
-            @BlockPosition @SqlType("K") Block keyBlock,
-            @SqlType("BIGINT") long n,
-            @BlockIndex int blockIndex)
+            @SqlNullable @BlockPosition @SqlType("V") ValueBlock valueBlock,
+            @BlockIndex int valuePosition,
+            @BlockPosition @SqlType("K") ValueBlock keyBlock,
+            @BlockIndex int keyPosition,
+            @SqlType("BIGINT") long n)
     {
         state.initialize(n);
-        state.add(keyBlock, valueBlock, blockIndex);
+        state.add(keyBlock, keyPosition, valueBlock, valuePosition);
     }
 
     @CombineFunction
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MaxByNStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MaxByNStateFactory.java
index 57b9ee42eee5..6c2b06af5ddf 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MaxByNStateFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MaxByNStateFactory.java
@@ -15,7 +15,6 @@
 
 import io.trino.operator.aggregation.minmaxbyn.MinMaxByNStateFactory.GroupedMinMaxByNState;
 import io.trino.operator.aggregation.minmaxbyn.MinMaxByNStateFactory.SingleMinMaxByNState;
-import io.trino.spi.block.Block;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateFactory;
 import io.trino.spi.function.Convention;
@@ -25,12 +24,14 @@
 import io.trino.spi.type.Type;
 
 import java.lang.invoke.MethodHandle;
-import java.util.function.Function;
 import java.util.function.LongFunction;
 
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static io.trino.util.Failures.checkCondition;
 import static java.lang.Math.toIntExact;
 
@@ -39,14 +40,38 @@ public class MaxByNStateFactory
 {
     private static final long MAX_NUMBER_OF_VALUES = 10_000;
     private final LongFunction<TypedKeyValueHeap> heapFactory;
-    private final Function<Block, TypedKeyValueHeap> deserializer;
 
     public MaxByNStateFactory(
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "K",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER))
+                    MethodHandle keyReadFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "K",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN))
+                    MethodHandle keyWriteFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "V",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER))
+                    MethodHandle valueReadFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "V",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN))
+                    MethodHandle valueWriteFlat,
+            @OperatorDependency(
+                    operator = OperatorType.COMPARISON_UNORDERED_FIRST,
+                    argumentTypes = {"K", "K"},
+                    convention = @Convention(arguments = {FLAT, FLAT}, result = FAIL_ON_NULL))
+                    MethodHandle compareFlatFlat,
             @OperatorDependency(
                     operator = OperatorType.COMPARISON_UNORDERED_FIRST,
                     argumentTypes = {"K", "K"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL))
-                    MethodHandle compare,
+                    convention = @Convention(arguments = {FLAT, VALUE_BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL))
+                    MethodHandle compareFlatBlock,
             @TypeParameter("K") Type keyType,
             @TypeParameter("V") Type valueType)
     {
@@ -58,30 +83,39 @@ public MaxByNStateFactory(
                     "third argument of max_by must be less than or equal to %s; found %s",
                     MAX_NUMBER_OF_VALUES,
                     n);
-            return new TypedKeyValueHeap(false, compare, keyType, valueType, toIntExact(n));
+            return new TypedKeyValueHeap(
+                    false,
+                    keyReadFlat,
+                    keyWriteFlat,
+                    valueReadFlat,
+                    valueWriteFlat,
+                    compareFlatFlat,
+                    compareFlatBlock,
+                    keyType,
+                    valueType,
+                    toIntExact(n));
         };
-        deserializer = rowBlock -> TypedKeyValueHeap.deserialize(false, compare, keyType, valueType, rowBlock);
     }
 
     @Override
     public MaxByNState createSingleState()
     {
-        return new SingleMaxByNState(heapFactory, deserializer);
+        return new SingleMaxByNState(heapFactory);
     }
 
     @Override
     public MaxByNState createGroupedState()
     {
-        return new GroupedMaxByNState(heapFactory, deserializer);
+        return new GroupedMaxByNState(heapFactory);
     }
 
     private static class GroupedMaxByNState
             extends GroupedMinMaxByNState
             implements MaxByNState
     {
-        public GroupedMaxByNState(LongFunction<TypedKeyValueHeap> heapFactory, Function<Block, TypedKeyValueHeap> deserializer)
+        public GroupedMaxByNState(LongFunction<TypedKeyValueHeap> heapFactory)
         {
-            super(heapFactory, deserializer);
+            super(heapFactory);
         }
     }
 
@@ -89,9 +123,9 @@ private static class SingleMaxByNState
             extends SingleMinMaxByNState
             implements MaxByNState
     {
-        public SingleMaxByNState(LongFunction<TypedKeyValueHeap> heapFactory, Function<Block, TypedKeyValueHeap> deserializer)
+        public SingleMaxByNState(LongFunction<TypedKeyValueHeap> heapFactory)
         {
-            super(heapFactory, deserializer);
+            super(heapFactory);
         }
 
         public SingleMaxByNState(SingleMaxByNState state)
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinByNAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinByNAggregationFunction.java
index e36d733095e7..451240b03d6b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinByNAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinByNAggregationFunction.java
@@ -13,9 +13,8 @@
  */
 package io.trino.operator.aggregation.minmaxbyn;
 
-import io.trino.operator.aggregation.NullablePosition;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -24,6 +23,7 @@
 import io.trino.spi.function.Description;
 import io.trino.spi.function.InputFunction;
 import io.trino.spi.function.OutputFunction;
+import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 
@@ -38,13 +38,14 @@ private MinByNAggregationFunction() {}
     @TypeParameter("V")
     public static void input(
             @AggregationState({"K", "V"}) MinByNState state,
-            @NullablePosition @BlockPosition @SqlType("V") Block valueBlock,
-            @BlockPosition @SqlType("K") Block keyBlock,
-            @SqlType("BIGINT") long n,
-            @BlockIndex int blockIndex)
+            @SqlNullable @BlockPosition @SqlType("V") ValueBlock valueBlock,
+            @BlockIndex int valuePosition,
+            @BlockPosition @SqlType("K") ValueBlock keyBlock,
+            @BlockIndex int keyPosition,
+            @SqlType("BIGINT") long n)
     {
         state.initialize(n);
-        state.add(keyBlock, valueBlock, blockIndex);
+        state.add(keyBlock, keyPosition, valueBlock, valuePosition);
     }
 
     @CombineFunction
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinByNStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinByNStateFactory.java
index bf19fccb41a1..644f586789e9 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinByNStateFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinByNStateFactory.java
@@ -15,7 +15,6 @@
 
 import io.trino.operator.aggregation.minmaxbyn.MinMaxByNStateFactory.GroupedMinMaxByNState;
 import io.trino.operator.aggregation.minmaxbyn.MinMaxByNStateFactory.SingleMinMaxByNState;
-import io.trino.spi.block.Block;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateFactory;
 import io.trino.spi.function.Convention;
@@ -25,12 +24,14 @@
 import io.trino.spi.type.Type;
 
 import java.lang.invoke.MethodHandle;
-import java.util.function.Function;
 import java.util.function.LongFunction;
 
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static io.trino.util.Failures.checkCondition;
 import static java.lang.Math.toIntExact;
 
@@ -39,14 +40,38 @@ public class MinByNStateFactory
 {
     private static final long MAX_NUMBER_OF_VALUES = 10_000;
     private final LongFunction<TypedKeyValueHeap> heapFactory;
-    private final Function<Block, TypedKeyValueHeap> deserializer;
 
     public MinByNStateFactory(
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "K",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER))
+                    MethodHandle keyReadFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "K",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN))
+                    MethodHandle keyWriteFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "V",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER))
+                    MethodHandle valueReadFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "V",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN))
+                    MethodHandle valueWriteFlat,
+            @OperatorDependency(
+                    operator = OperatorType.COMPARISON_UNORDERED_LAST,
+                    argumentTypes = {"K", "K"},
+                    convention = @Convention(arguments = {FLAT, FLAT}, result = FAIL_ON_NULL))
+                    MethodHandle compareFlatFlat,
             @OperatorDependency(
                     operator = OperatorType.COMPARISON_UNORDERED_LAST,
                     argumentTypes = {"K", "K"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL))
-                    MethodHandle compare,
+                    convention = @Convention(arguments = {FLAT, VALUE_BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL))
+                    MethodHandle compareFlatBlock,
             @TypeParameter("K") Type keyType,
             @TypeParameter("V") Type valueType)
     {
@@ -58,30 +83,39 @@ public MinByNStateFactory(
                     "third argument of min_by must be less than or equal to %s; found %s",
                     MAX_NUMBER_OF_VALUES,
                     n);
-            return new TypedKeyValueHeap(true, compare, keyType, valueType, toIntExact(n));
+            return new TypedKeyValueHeap(
+                    true,
+                    keyReadFlat,
+                    keyWriteFlat,
+                    valueReadFlat,
+                    valueWriteFlat,
+                    compareFlatFlat,
+                    compareFlatBlock,
+                    keyType,
+                    valueType,
+                    toIntExact(n));
         };
-        deserializer = rowBlock -> TypedKeyValueHeap.deserialize(true, compare, keyType, valueType, rowBlock);
     }
 
     @Override
     public MinByNState createSingleState()
     {
-        return new SingleMinByNState(heapFactory, deserializer);
+        return new SingleMinByNState(heapFactory);
     }
 
     @Override
     public MinByNState createGroupedState()
     {
-        return new GroupedMinByNState(heapFactory, deserializer);
+        return new GroupedMinByNState(heapFactory);
     }
 
     private static class GroupedMinByNState
             extends GroupedMinMaxByNState
             implements MinByNState
     {
-        public GroupedMinByNState(LongFunction<TypedKeyValueHeap> heapFactory, Function<Block, TypedKeyValueHeap> deserializer)
+        public GroupedMinByNState(LongFunction<TypedKeyValueHeap> heapFactory)
         {
-            super(heapFactory, deserializer);
+            super(heapFactory);
         }
     }
 
@@ -89,9 +123,9 @@ private static class SingleMinByNState
             extends SingleMinMaxByNState
             implements MinByNState
     {
-        public SingleMinByNState(LongFunction<TypedKeyValueHeap> heapFactory, Function<Block, TypedKeyValueHeap> deserializer)
+        public SingleMinByNState(LongFunction<TypedKeyValueHeap> heapFactory)
         {
-            super(heapFactory, deserializer);
+            super(heapFactory);
         }
 
         public SingleMinByNState(SingleMinByNState state)
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinMaxByNState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinMaxByNState.java
index d5bcd8e6c116..adf254926460 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinMaxByNState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinMaxByNState.java
@@ -13,8 +13,8 @@
  */
 package io.trino.operator.aggregation.minmaxbyn;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AccumulatorState;
 
 public interface MinMaxByNState
@@ -29,7 +29,7 @@ public interface MinMaxByNState
     /**
      * Adds the value to this state.
      */
-    void add(Block keyBlock, Block valueBlock, int position);
+    void add(ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition);
 
     /**
      * Merge with the specified state.
@@ -48,11 +48,4 @@ public interface MinMaxByNState
      * Write this state to the specified block builder.
      */
     void serialize(BlockBuilder out);
-
-    /**
-     * Read the state to the specified block builder.
-     *
-     * @throws IllegalStateException if state is already initialized
-     */
-    void deserialize(Block rowBlock);
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinMaxByNStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinMaxByNStateFactory.java
index 1b828b6fcf19..a2b63e971139 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinMaxByNStateFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinMaxByNStateFactory.java
@@ -14,16 +14,23 @@
 package io.trino.operator.aggregation.minmaxbyn;
 
 import io.trino.array.ObjectBigArray;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlRow;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.GroupedAccumulatorState;
+import io.trino.spi.type.ArrayType;
 
-import java.util.function.Function;
 import java.util.function.LongFunction;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.slice.SizeOf.instanceSize;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static java.lang.Math.toIntExact;
 
 public final class MinMaxByNStateFactory
 {
@@ -31,6 +38,44 @@ private abstract static class AbstractMinMaxByNState
             implements MinMaxByNState
     {
         abstract TypedKeyValueHeap getTypedKeyValueHeap();
+
+        @Override
+        public final void merge(MinMaxByNState other)
+        {
+            SqlRow sqlRow = ((SingleMinMaxByNState) other).removeTempSerializedState();
+            int rawIndex = sqlRow.getRawIndex();
+
+            int capacity = toIntExact(BIGINT.getLong(sqlRow.getRawFieldBlock(0), rawIndex));
+            initialize(capacity);
+            TypedKeyValueHeap typedKeyValueHeap = getTypedKeyValueHeap();
+
+            Block keys = new ArrayType(typedKeyValueHeap.getKeyType()).getObject(sqlRow.getRawFieldBlock(1), rawIndex);
+            Block values = new ArrayType(typedKeyValueHeap.getValueType()).getObject(sqlRow.getRawFieldBlock(2), rawIndex);
+
+            ValueBlock rawKeyValues = keys.getUnderlyingValueBlock();
+            ValueBlock rawValueValues = values.getUnderlyingValueBlock();
+            for (int i = 0; i < keys.getPositionCount(); i++) {
+                typedKeyValueHeap.add(rawKeyValues, keys.getUnderlyingValuePosition(i), rawValueValues, values.getUnderlyingValuePosition(i));
+            }
+        }
+
+        @Override
+        public final void serialize(BlockBuilder out)
+        {
+            TypedKeyValueHeap typedHeap = getTypedKeyValueHeap();
+            if (typedHeap == null) {
+                out.appendNull();
+            }
+            else {
+                ((RowBlockBuilder) out).buildEntry(fieldBuilders -> {
+                    BIGINT.writeLong(fieldBuilders.get(0), typedHeap.getCapacity());
+
+                    ArrayBlockBuilder keysColumn = (ArrayBlockBuilder) fieldBuilders.get(1);
+                    ArrayBlockBuilder valuesColumn = (ArrayBlockBuilder) fieldBuilders.get(2);
+                    keysColumn.buildEntry(keyBuilder -> valuesColumn.buildEntry(valueBuilder -> typedHeap.writeAllUnsorted(keyBuilder, valueBuilder)));
+                });
+            }
+        }
     }
 
     public abstract static class GroupedMinMaxByNState
@@ -40,16 +85,14 @@ public abstract static class GroupedMinMaxByNState
         private static final int INSTANCE_SIZE = instanceSize(GroupedMinMaxByNState.class);
 
         private final LongFunction<TypedKeyValueHeap> heapFactory;
-        private final Function<Block, TypedKeyValueHeap> deserializer;
 
         private final ObjectBigArray<TypedKeyValueHeap> heaps = new ObjectBigArray<>();
         private long groupId;
         private long size;
 
-        public GroupedMinMaxByNState(LongFunction<TypedKeyValueHeap> heapFactory, Function<Block, TypedKeyValueHeap> deserializer)
+        public GroupedMinMaxByNState(LongFunction<TypedKeyValueHeap> heapFactory)
         {
             this.heapFactory = heapFactory;
-            this.deserializer = deserializer;
         }
 
         @Override
@@ -75,41 +118,21 @@ public final void initialize(long n)
         {
             if (getTypedKeyValueHeap() == null) {
                 TypedKeyValueHeap typedHeap = heapFactory.apply(n);
-                setTypedKeyValueHeap(typedHeap);
+                setTypedKeyValueHeapNew(typedHeap);
                 size += typedHeap.getEstimatedSize();
             }
         }
 
         @Override
-        public final void add(Block keyBlock, Block valueBlock, int position)
+        public final void add(ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition)
         {
             TypedKeyValueHeap typedHeap = getTypedKeyValueHeap();
 
             size -= typedHeap.getEstimatedSize();
-            typedHeap.add(keyBlock, valueBlock, position);
+            typedHeap.add(keyBlock, keyPosition, valueBlock, valuePosition);
             size += typedHeap.getEstimatedSize();
         }
 
-        @Override
-        public final void merge(MinMaxByNState other)
-        {
-            TypedKeyValueHeap otherTypedHeap = ((AbstractMinMaxByNState) other).getTypedKeyValueHeap();
-            if (otherTypedHeap == null) {
-                return;
-            }
-
-            TypedKeyValueHeap typedHeap = getTypedKeyValueHeap();
-            if (typedHeap == null) {
-                setTypedKeyValueHeap(otherTypedHeap);
-                size += otherTypedHeap.getEstimatedSize();
-            }
-            else {
-                size -= typedHeap.getEstimatedSize();
-                typedHeap.addAll(otherTypedHeap);
-                size += typedHeap.getEstimatedSize();
-            }
-        }
-
         @Override
         public final void popAll(BlockBuilder out)
         {
@@ -119,34 +142,8 @@ public final void popAll(BlockBuilder out)
                 return;
             }
 
-            BlockBuilder arrayBlockBuilder = out.beginBlockEntry();
-
             size -= typedHeap.getEstimatedSize();
-            typedHeap.popAllReverse(arrayBlockBuilder);
-            size += typedHeap.getEstimatedSize();
-
-            out.closeEntry();
-        }
-
-        @Override
-        public final void serialize(BlockBuilder out)
-        {
-            TypedKeyValueHeap typedHeap = getTypedKeyValueHeap();
-            if (typedHeap == null) {
-                out.appendNull();
-            }
-            else {
-                typedHeap.serialize(out);
-            }
-        }
-
-        @Override
-        public final void deserialize(Block rowBlock)
-        {
-            checkState(getTypedKeyValueHeap() == null, "State already initialized");
-
-            TypedKeyValueHeap typedHeap = deserializer.apply(rowBlock);
-            setTypedKeyValueHeap(typedHeap);
+            ((ArrayBlockBuilder) out).buildEntry(typedHeap::writeValuesSorted);
             size += typedHeap.getEstimatedSize();
         }
 
@@ -156,7 +153,7 @@ final TypedKeyValueHeap getTypedKeyValueHeap()
             return heaps.get(groupId);
         }
 
-        private void setTypedKeyValueHeap(TypedKeyValueHeap value)
+        private void setTypedKeyValueHeapNew(TypedKeyValueHeap value)
         {
             heaps.set(groupId, value);
         }
@@ -168,24 +165,26 @@ public abstract static class SingleMinMaxByNState
         private static final int INSTANCE_SIZE = instanceSize(SingleMinMaxByNState.class);
 
         private final LongFunction<TypedKeyValueHeap> heapFactory;
-        private final Function<Block, TypedKeyValueHeap> deserializer;
 
         private TypedKeyValueHeap typedHeap;
+        private SqlRow tempSerializedState;
 
-        public SingleMinMaxByNState(LongFunction<TypedKeyValueHeap> heapFactory, Function<Block, TypedKeyValueHeap> deserializer)
+        public SingleMinMaxByNState(LongFunction<TypedKeyValueHeap> heapFactory)
         {
             this.heapFactory = heapFactory;
-            this.deserializer = deserializer;
         }
 
         // for copying
         protected SingleMinMaxByNState(SingleMinMaxByNState state)
         {
+            // tempSerializedState should never be set during a copy operation it is only used during deserialization
+            checkArgument(state.tempSerializedState == null);
+            tempSerializedState = null;
+
             this.heapFactory = state.heapFactory;
-            this.deserializer = state.deserializer;
 
             if (state.typedHeap != null) {
-                this.typedHeap = state.typedHeap.copy();
+                this.typedHeap = new TypedKeyValueHeap(state.typedHeap);
             }
             else {
                 this.typedHeap = null;
@@ -210,24 +209,9 @@ public final void initialize(long n)
         }
 
         @Override
-        public final void add(Block keyBlock, Block valueBlock, int position)
+        public final void add(ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition)
         {
-            typedHeap.add(keyBlock, valueBlock, position);
-        }
-
-        @Override
-        public final void merge(MinMaxByNState other)
-        {
-            TypedKeyValueHeap otherTypedHeap = ((AbstractMinMaxByNState) other).getTypedKeyValueHeap();
-            if (otherTypedHeap == null) {
-                return;
-            }
-            if (typedHeap == null) {
-                typedHeap = otherTypedHeap;
-            }
-            else {
-                typedHeap.addAll(otherTypedHeap);
-            }
+            typedHeap.add(keyBlock, keyPosition, valueBlock, valuePosition);
         }
 
         @Override
@@ -238,32 +222,26 @@ public final void popAll(BlockBuilder out)
                 return;
             }
 
-            BlockBuilder arrayBlockBuilder = out.beginBlockEntry();
-            typedHeap.popAllReverse(arrayBlockBuilder);
-            out.closeEntry();
+            ((ArrayBlockBuilder) out).buildEntry(typedHeap::writeValuesSorted);
         }
 
         @Override
-        public final void serialize(BlockBuilder out)
+        final TypedKeyValueHeap getTypedKeyValueHeap()
         {
-            if (typedHeap == null) {
-                out.appendNull();
-            }
-            else {
-                typedHeap.serialize(out);
-            }
+            return typedHeap;
         }
 
-        @Override
-        public final void deserialize(Block rowBlock)
+        void setTempSerializedState(SqlRow tempSerializedState)
         {
-            typedHeap = deserializer.apply(rowBlock);
+            this.tempSerializedState = tempSerializedState;
         }
 
-        @Override
-        final TypedKeyValueHeap getTypedKeyValueHeap()
+        SqlRow removeTempSerializedState()
         {
-            return typedHeap;
+            SqlRow sqlRow = tempSerializedState;
+            checkState(sqlRow != null, "tempDeserializeBlock is null");
+            tempSerializedState = null;
+            return sqlRow;
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinMaxByNStateSerializer.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinMaxByNStateSerializer.java
index 66219cbd6c6a..81dab19eed25 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinMaxByNStateSerializer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/MinMaxByNStateSerializer.java
@@ -15,6 +15,7 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.AccumulatorStateSerializer;
 import io.trino.spi.type.Type;
 
@@ -43,7 +44,7 @@ public void serialize(T state, BlockBuilder out)
     @Override
     public void deserialize(Block block, int index, T state)
     {
-        Block rowBlock = (Block) serializedType.getObject(block, index);
-        state.deserialize(rowBlock);
+        SqlRow sqlRow = (SqlRow) serializedType.getObject(block, index);
+        ((MinMaxByNStateFactory.SingleMinMaxByNState) state).setTempSerializedState(sqlRow);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/TypedKeyValueHeap.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/TypedKeyValueHeap.java
index 3f2586295da7..4b7afb267fa2 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/TypedKeyValueHeap.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxbyn/TypedKeyValueHeap.java
@@ -14,69 +14,139 @@
 package io.trino.operator.aggregation.minmaxbyn;
 
 import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableList;
-import io.trino.spi.block.Block;
+import io.airlift.slice.SizeOf;
+import io.trino.operator.VariableWidthData;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.ArrayType;
-import io.trino.spi.type.RowType;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
+import it.unimi.dsi.fastutil.ints.IntArrays;
+import jakarta.annotation.Nullable;
 
 import java.lang.invoke.MethodHandle;
+import java.util.Arrays;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.slice.SizeOf.instanceSize;
-import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static java.lang.Math.toIntExact;
+import static io.trino.operator.VariableWidthData.EMPTY_CHUNK;
+import static io.trino.operator.VariableWidthData.POINTER_SIZE;
+import static io.trino.operator.VariableWidthData.getChunkOffset;
+import static io.trino.operator.aggregation.minmaxn.TypedHeap.compactIfNecessary;
 import static java.util.Objects.requireNonNull;
 
-public class TypedKeyValueHeap
+public final class TypedKeyValueHeap
 {
     private static final int INSTANCE_SIZE = instanceSize(TypedKeyValueHeap.class);
 
-    private static final int COMPACT_THRESHOLD_BYTES = 32768;
-    private static final int COMPACT_THRESHOLD_RATIO = 3; // when 2/3 of elements in keyBlockBuilder is unreferenced, do compact
-
     private final boolean min;
-    private final MethodHandle compare;
+    private final MethodHandle keyReadFlat;
+    private final MethodHandle keyWriteFlat;
+    private final MethodHandle valueReadFlat;
+    private final MethodHandle valueWriteFlat;
+    private final MethodHandle compareFlatFlat;
+    private final MethodHandle compareFlatBlock;
     private final Type keyType;
     private final Type valueType;
     private final int capacity;
 
+    private final int recordKeyOffset;
+    private final int recordValueOffset;
+
+    private final int recordSize;
+    /**
+     * The fixed chunk contains an array of records. The records are laid out as follows:
+     * <ul>
+     *     <li>12 byte optional pointer to variable width data (only present if the key or value is variable width)</li>
+     *     <li>4 byte optional integer for variable size of the key (only present if the key is variable width)</li>
+     *     <li>1 byte null flag for the value</li>
+     *     <li>N byte fixed size data for the key type</li>
+     *     <li>N byte fixed size data for the value type</li>
+     * </ul>
+     * The pointer is placed first to simplify the offset calculations for variable with code.
+     * This chunk contains {@code capacity + 1} records. The extra record is used for the swap operation.
+     */
+    private final byte[] fixedChunk;
+
+    private final boolean keyVariableWidth;
+    private final boolean valueVariableWidth;
+    private VariableWidthData variableWidthData;
+
     private int positionCount;
-    private final int[] heapIndex;
-    private BlockBuilder keyBlockBuilder;
-    private BlockBuilder valueBlockBuilder;
 
-    public TypedKeyValueHeap(boolean min, MethodHandle compare, Type keyType, Type valueType, int capacity)
+    public TypedKeyValueHeap(
+            boolean min,
+            MethodHandle keyReadFlat,
+            MethodHandle keyWriteFlat,
+            MethodHandle valueReadFlat,
+            MethodHandle valueWriteFlat,
+            MethodHandle compareFlatFlat,
+            MethodHandle compareFlatBlock,
+            Type keyType,
+            Type valueType,
+            int capacity)
     {
         this.min = min;
-        this.compare = requireNonNull(compare, "compare is null");
+        this.keyReadFlat = requireNonNull(keyReadFlat, "keyReadFlat is null");
+        this.keyWriteFlat = requireNonNull(keyWriteFlat, "keyWriteFlat is null");
+        this.valueReadFlat = requireNonNull(valueReadFlat, "valueReadFlat is null");
+        this.valueWriteFlat = requireNonNull(valueWriteFlat, "valueWriteFlat is null");
+        this.compareFlatFlat = requireNonNull(compareFlatFlat, "compareFlatFlat is null");
+        this.compareFlatBlock = requireNonNull(compareFlatBlock, "compareFlatBlock is null");
         this.keyType = requireNonNull(keyType, "keyType is null");
         this.valueType = requireNonNull(valueType, "valueType is null");
         this.capacity = capacity;
-        this.heapIndex = new int[capacity];
-        this.keyBlockBuilder = keyType.createBlockBuilder(null, capacity);
-        this.valueBlockBuilder = valueType.createBlockBuilder(null, capacity);
+
+        keyVariableWidth = keyType.isFlatVariableWidth();
+        valueVariableWidth = valueType.isFlatVariableWidth();
+
+        boolean variableWidth = keyVariableWidth || valueVariableWidth;
+        variableWidthData = variableWidth ? new VariableWidthData() : null;
+
+        recordKeyOffset = (variableWidth ? POINTER_SIZE : 0) + 1;
+        recordValueOffset = recordKeyOffset + keyType.getFlatFixedSize();
+        recordSize = recordValueOffset + valueType.getFlatFixedSize();
+
+        // allocate the fixed chunk with on extra slow for use in swap
+        fixedChunk = new byte[recordSize * (capacity + 1)];
     }
 
-    // for copying
-    private TypedKeyValueHeap(boolean min, MethodHandle compare, Type keyType, Type valueType, int capacity, int positionCount, int[] heapIndex, BlockBuilder keyBlockBuilder, BlockBuilder valueBlockBuilder)
+    public TypedKeyValueHeap(TypedKeyValueHeap typedHeap)
     {
-        this.min = min;
-        this.compare = requireNonNull(compare, "compare is null");
-        this.keyType = requireNonNull(keyType, "keyType is null");
-        this.valueType = requireNonNull(valueType, "valueType is null");
-        this.capacity = capacity;
-        this.positionCount = positionCount;
-        this.heapIndex = heapIndex;
-        this.keyBlockBuilder = keyBlockBuilder;
-        this.valueBlockBuilder = valueBlockBuilder;
+        this.min = typedHeap.min;
+        this.keyReadFlat = typedHeap.keyReadFlat;
+        this.keyWriteFlat = typedHeap.keyWriteFlat;
+        this.valueReadFlat = typedHeap.valueReadFlat;
+        this.valueWriteFlat = typedHeap.valueWriteFlat;
+        this.compareFlatFlat = typedHeap.compareFlatFlat;
+        this.compareFlatBlock = typedHeap.compareFlatBlock;
+        this.keyType = typedHeap.keyType;
+        this.valueType = typedHeap.valueType;
+        this.capacity = typedHeap.capacity;
+        this.positionCount = typedHeap.positionCount;
+
+        this.keyVariableWidth = typedHeap.keyVariableWidth;
+        this.valueVariableWidth = typedHeap.valueVariableWidth;
+
+        this.recordKeyOffset = typedHeap.recordKeyOffset;
+        this.recordValueOffset = typedHeap.recordValueOffset;
+        this.recordSize = typedHeap.recordSize;
+        this.fixedChunk = Arrays.copyOf(typedHeap.fixedChunk, typedHeap.fixedChunk.length);
+
+        if (typedHeap.variableWidthData != null) {
+            this.variableWidthData = new VariableWidthData(typedHeap.variableWidthData);
+        }
+        else {
+            this.variableWidthData = null;
+        }
+    }
+
+    public Type getKeyType()
+    {
+        return keyType;
     }
 
-    public static Type getSerializedType(Type keyType, Type valueType)
+    public Type getValueType()
     {
-        return RowType.anonymous(ImmutableList.of(BIGINT, new ArrayType(keyType), new ArrayType(valueType)));
+        return valueType;
     }
 
     public int getCapacity()
@@ -86,7 +156,9 @@ public int getCapacity()
 
     public long getEstimatedSize()
     {
-        return INSTANCE_SIZE + keyBlockBuilder.getRetainedSizeInBytes() + valueBlockBuilder.getRetainedSizeInBytes() + sizeOf(heapIndex);
+        return INSTANCE_SIZE +
+                SizeOf.sizeOf(fixedChunk) +
+                (variableWidthData == null ? 0 : variableWidthData.getRetainedSizeBytes());
     }
 
     public boolean isEmpty()
@@ -94,119 +166,147 @@ public boolean isEmpty()
         return positionCount == 0;
     }
 
-    public void serialize(BlockBuilder out)
+    public void writeAllUnsorted(BlockBuilder keyBuilder, BlockBuilder valueBuilder)
     {
-        BlockBuilder blockBuilder = out.beginBlockEntry();
-        BIGINT.writeLong(blockBuilder, getCapacity());
-
-        BlockBuilder keyElements = blockBuilder.beginBlockEntry();
         for (int i = 0; i < positionCount; i++) {
-            keyType.appendTo(keyBlockBuilder, heapIndex[i], keyElements);
-        }
-        blockBuilder.closeEntry();
-
-        BlockBuilder valueElements = blockBuilder.beginBlockEntry();
-        for (int i = 0; i < positionCount; i++) {
-            valueType.appendTo(valueBlockBuilder, heapIndex[i], valueElements);
-        }
-        blockBuilder.closeEntry();
-
-        out.closeEntry();
-    }
-
-    public static TypedKeyValueHeap deserialize(boolean min, MethodHandle compare, Type keyType, Type valueType, Block rowBlock)
-    {
-        int capacity = toIntExact(BIGINT.getLong(rowBlock, 0));
-        int[] heapIndex = new int[capacity];
-
-        BlockBuilder keyBlockBuilder = keyType.createBlockBuilder(null, capacity);
-        Block keyBlock = new ArrayType(keyType).getObject(rowBlock, 1);
-        for (int position = 0; position < keyBlock.getPositionCount(); position++) {
-            heapIndex[position] = position;
-            keyType.appendTo(keyBlock, position, keyBlockBuilder);
+            write(i, keyBuilder, valueBuilder);
         }
-
-        BlockBuilder valueBlockBuilder = valueType.createBlockBuilder(null, capacity);
-        Block valueBlock = new ArrayType(valueType).getObject(rowBlock, 2);
-        for (int position = 0; position < valueBlock.getPositionCount(); position++) {
-            heapIndex[position] = position;
-            if (valueBlock.isNull(position)) {
-                valueBlockBuilder.appendNull();
-            }
-            else {
-                valueType.appendTo(valueBlock, position, valueBlockBuilder);
-            }
-        }
-
-        return new TypedKeyValueHeap(min, compare, keyType, valueType, capacity, keyBlock.getPositionCount(), heapIndex, keyBlockBuilder, valueBlockBuilder);
     }
 
-    public void popAllReverse(BlockBuilder resultBlockBuilder)
+    public void writeValuesSorted(BlockBuilder valueBlockBuilder)
     {
+        // fully sort the heap
         int[] indexes = new int[positionCount];
-        while (positionCount > 0) {
-            indexes[positionCount - 1] = heapIndex[0];
-            positionCount--;
-            heapIndex[0] = heapIndex[positionCount];
-            siftDown();
+        for (int i = 0; i < indexes.length; i++) {
+            indexes[i] = i;
         }
+        IntArrays.quickSort(indexes, (a, b) -> compare(a, b));
 
         for (int index : indexes) {
-            valueType.appendTo(valueBlockBuilder, index, resultBlockBuilder);
+            write(index, null, valueBlockBuilder);
         }
     }
 
-    public void popAll(BlockBuilder resultBlockBuilder)
+    private void write(int index, @Nullable BlockBuilder keyBlockBuilder, BlockBuilder valueBlockBuilder)
     {
-        while (positionCount > 0) {
-            pop(resultBlockBuilder);
-        }
-    }
+        int recordOffset = getRecordOffset(index);
 
-    public void pop(BlockBuilder resultBlockBuilder)
-    {
-        valueType.appendTo(valueBlockBuilder, heapIndex[0], resultBlockBuilder);
-        remove();
-    }
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            variableWidthChunk = variableWidthData.getChunk(fixedChunk, recordOffset);
+        }
 
-    private void remove()
-    {
-        positionCount--;
-        heapIndex[0] = heapIndex[positionCount];
-        siftDown();
+        if (keyBlockBuilder != null) {
+            try {
+                keyReadFlat.invokeExact(
+                        fixedChunk,
+                        recordOffset + recordKeyOffset,
+                        variableWidthChunk,
+                        keyBlockBuilder);
+            }
+            catch (Throwable throwable) {
+                Throwables.throwIfUnchecked(throwable);
+                throw new RuntimeException(throwable);
+            }
+        }
+        if (fixedChunk[recordOffset + recordKeyOffset - 1] != 0) {
+            valueBlockBuilder.appendNull();
+        }
+        else {
+            try {
+                valueReadFlat.invokeExact(
+                        fixedChunk,
+                        recordOffset + recordValueOffset,
+                        variableWidthChunk,
+                        valueBlockBuilder);
+            }
+            catch (Throwable throwable) {
+                Throwables.throwIfUnchecked(throwable);
+                throw new RuntimeException(throwable);
+            }
+        }
     }
 
-    public void add(Block keyBlock, Block valueBlock, int position)
+    public void add(ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition)
     {
-        checkArgument(!keyBlock.isNull(position));
+        checkArgument(!keyBlock.isNull(keyPosition));
         if (positionCount == capacity) {
-            if (keyGreaterThanOrEqual(keyBlockBuilder, heapIndex[0], keyBlock, position)) {
-                return; // and new element is not larger than heap top: do not add
+            // is it possible the value is within the top N values?
+            if (!shouldConsiderValue(keyBlock, keyPosition)) {
+                return;
             }
-            heapIndex[0] = keyBlockBuilder.getPositionCount();
-            keyType.appendTo(keyBlock, position, keyBlockBuilder);
-            valueType.appendTo(valueBlock, position, valueBlockBuilder);
+            clear(0);
+            set(0, keyBlock, keyPosition, valueBlock, valuePosition);
             siftDown();
         }
         else {
-            heapIndex[positionCount] = keyBlockBuilder.getPositionCount();
+            set(positionCount, keyBlock, keyPosition, valueBlock, valuePosition);
             positionCount++;
-            keyType.appendTo(keyBlock, position, keyBlockBuilder);
-            valueType.appendTo(valueBlock, position, valueBlockBuilder);
             siftUp();
         }
-        compactIfNecessary();
     }
 
-    public void addAll(TypedKeyValueHeap otherHeap)
+    private void clear(int index)
     {
-        addAll(otherHeap.keyBlockBuilder, otherHeap.valueBlockBuilder);
+        if (variableWidthData == null) {
+            return;
+        }
+
+        variableWidthData.free(fixedChunk, getRecordOffset(index));
+        variableWidthData = compactIfNecessary(
+                variableWidthData,
+                fixedChunk,
+                recordSize,
+                0,
+                positionCount,
+                (fixedSizeOffset, variableWidthChunk, variableWidthChunkOffset) -> {
+                    int keyVariableWidth = keyType.relocateFlatVariableWidthOffsets(fixedChunk, fixedSizeOffset + recordKeyOffset, variableWidthChunk, variableWidthChunkOffset);
+                    if (fixedChunk[fixedSizeOffset + recordKeyOffset - 1] != 0) {
+                        valueType.relocateFlatVariableWidthOffsets(fixedChunk, fixedSizeOffset + recordValueOffset, variableWidthChunk, variableWidthChunkOffset + keyVariableWidth);
+                    }
+                });
     }
 
-    public void addAll(Block keysBlock, Block valuesBlock)
+    private void set(int index, ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition)
     {
-        for (int i = 0; i < keysBlock.getPositionCount(); i++) {
-            add(keysBlock, valuesBlock, i);
+        int recordOffset = getRecordOffset(index);
+
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        int variableWidthChunkOffset = 0;
+        int keyVariableWidthLength = 0;
+        if (variableWidthData != null) {
+            if (keyVariableWidth) {
+                keyVariableWidthLength = keyType.getFlatVariableWidthSize(keyBlock, keyPosition);
+            }
+            int valueVariableWidthLength = valueType.getFlatVariableWidthSize(valueBlock, valuePosition);
+            variableWidthChunk = variableWidthData.allocate(fixedChunk, recordOffset, keyVariableWidthLength + valueVariableWidthLength);
+            variableWidthChunkOffset = getChunkOffset(fixedChunk, recordOffset);
+        }
+
+        try {
+            keyWriteFlat.invokeExact(keyBlock, keyPosition, fixedChunk, recordOffset + recordKeyOffset, variableWidthChunk, variableWidthChunkOffset);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+        if (valueBlock.isNull(valuePosition)) {
+            fixedChunk[recordOffset + recordKeyOffset - 1] = 1;
+        }
+        else {
+            try {
+                valueWriteFlat.invokeExact(
+                        valueBlock,
+                        valuePosition,
+                        fixedChunk,
+                        recordOffset + recordValueOffset,
+                        variableWidthChunk,
+                        variableWidthChunkOffset + keyVariableWidthLength);
+            }
+            catch (Throwable throwable) {
+                Throwables.throwIfUnchecked(throwable);
+                throw new RuntimeException(throwable);
+            }
         }
     }
 
@@ -224,14 +324,13 @@ private void siftDown()
                 smallerChildPosition = leftPosition;
             }
             else {
-                smallerChildPosition = keyGreaterThanOrEqual(keyBlockBuilder, heapIndex[leftPosition], keyBlockBuilder, heapIndex[rightPosition]) ? rightPosition : leftPosition;
+                smallerChildPosition = compare(leftPosition, rightPosition) < 0 ? rightPosition : leftPosition;
             }
-            if (keyGreaterThanOrEqual(keyBlockBuilder, heapIndex[smallerChildPosition], keyBlockBuilder, heapIndex[position])) {
-                break; // child is larger or equal
+            if (compare(smallerChildPosition, position) < 0) {
+                // child is larger or equal
+                break;
             }
-            int swapTemp = heapIndex[position];
-            heapIndex[position] = heapIndex[smallerChildPosition];
-            heapIndex[smallerChildPosition] = swapTemp;
+            swap(position, smallerChildPosition);
             position = smallerChildPosition;
         }
     }
@@ -241,40 +340,46 @@ private void siftUp()
         int position = positionCount - 1;
         while (position != 0) {
             int parentPosition = (position - 1) / 2;
-            if (keyGreaterThanOrEqual(keyBlockBuilder, heapIndex[position], keyBlockBuilder, heapIndex[parentPosition])) {
-                break; // child is larger or equal
+            if (compare(position, parentPosition) < 0) {
+                // child is larger or equal
+                break;
             }
-            int swapTemp = heapIndex[position];
-            heapIndex[position] = heapIndex[parentPosition];
-            heapIndex[parentPosition] = swapTemp;
+            swap(position, parentPosition);
             position = parentPosition;
         }
     }
 
-    private void compactIfNecessary()
+    private void swap(int leftPosition, int rightPosition)
     {
-        // Byte size check is needed. Otherwise, if size * 3 is small, BlockBuilder can be reallocate too often.
-        // Position count is needed. Otherwise, for large elements, heap will be compacted every time.
-        // Size instead of retained size is needed because default allocation size can be huge for some block builders. And the first check will become useless in such case.
-        if (keyBlockBuilder.getSizeInBytes() < COMPACT_THRESHOLD_BYTES || keyBlockBuilder.getPositionCount() / positionCount < COMPACT_THRESHOLD_RATIO) {
-            return;
-        }
-        BlockBuilder newHeapKeyBlockBuilder = keyType.createBlockBuilder(null, keyBlockBuilder.getPositionCount());
-        BlockBuilder newHeapValueBlockBuilder = valueType.createBlockBuilder(null, valueBlockBuilder.getPositionCount());
-        for (int i = 0; i < positionCount; i++) {
-            keyType.appendTo(keyBlockBuilder, heapIndex[i], newHeapKeyBlockBuilder);
-            valueType.appendTo(valueBlockBuilder, heapIndex[i], newHeapValueBlockBuilder);
-            heapIndex[i] = i;
-        }
-        keyBlockBuilder = newHeapKeyBlockBuilder;
-        valueBlockBuilder = newHeapValueBlockBuilder;
+        int leftOffset = getRecordOffset(leftPosition);
+        int rightOffset = getRecordOffset(rightPosition);
+        int tempOffset = getRecordOffset(capacity);
+        System.arraycopy(fixedChunk, leftOffset, fixedChunk, tempOffset, recordSize);
+        System.arraycopy(fixedChunk, rightOffset, fixedChunk, leftOffset, recordSize);
+        System.arraycopy(fixedChunk, tempOffset, fixedChunk, rightOffset, recordSize);
     }
 
-    private boolean keyGreaterThanOrEqual(Block leftBlock, int leftPosition, Block rightBlock, int rightPosition)
+    private int compare(int leftPosition, int rightPosition)
     {
+        int leftRecordOffset = getRecordOffset(leftPosition);
+        int rightRecordOffset = getRecordOffset(rightPosition);
+
+        byte[] leftVariableWidthChunk = EMPTY_CHUNK;
+        byte[] rightVariableWidthChunk = EMPTY_CHUNK;
+        if (keyVariableWidth) {
+            leftVariableWidthChunk = variableWidthData.getChunk(fixedChunk, leftRecordOffset);
+            rightVariableWidthChunk = variableWidthData.getChunk(fixedChunk, rightRecordOffset);
+        }
+
         try {
-            long result = (long) compare.invokeExact(leftBlock, leftPosition, rightBlock, rightPosition);
-            return min ? result <= 0 : result >= 0;
+            long result = (long) compareFlatFlat.invokeExact(
+                    fixedChunk,
+                    leftRecordOffset + recordKeyOffset,
+                    leftVariableWidthChunk,
+                    fixedChunk,
+                    rightRecordOffset + recordKeyOffset,
+                    rightVariableWidthChunk);
+            return (int) (min ? result : -result);
         }
         catch (Throwable throwable) {
             Throwables.throwIfUnchecked(throwable);
@@ -282,25 +387,32 @@ private boolean keyGreaterThanOrEqual(Block leftBlock, int leftPosition, Block r
         }
     }
 
-    public TypedKeyValueHeap copy()
+    private boolean shouldConsiderValue(ValueBlock right, int rightPosition)
     {
-        BlockBuilder keyBlockBuilderCopy = null;
-        if (keyBlockBuilder != null) {
-            keyBlockBuilderCopy = (BlockBuilder) keyBlockBuilder.copyRegion(0, keyBlockBuilder.getPositionCount());
+        byte[] leftFixedRecordChunk = fixedChunk;
+        int leftRecordOffset = getRecordOffset(0);
+        byte[] leftVariableWidthChunk = EMPTY_CHUNK;
+        if (keyVariableWidth) {
+            leftVariableWidthChunk = variableWidthData.getChunk(leftFixedRecordChunk, leftRecordOffset);
         }
-        BlockBuilder valueBlockBuilderCopy = null;
-        if (valueBlockBuilder != null) {
-            valueBlockBuilderCopy = (BlockBuilder) valueBlockBuilder.copyRegion(0, valueBlockBuilder.getPositionCount());
+
+        try {
+            long result = (long) compareFlatBlock.invokeExact(
+                    leftFixedRecordChunk,
+                    leftRecordOffset + recordKeyOffset,
+                    leftVariableWidthChunk,
+                    right,
+                    rightPosition);
+            return min ? result > 0 : result < 0;
         }
-        return new TypedKeyValueHeap(
-                min,
-                compare,
-                keyType,
-                valueType,
-                capacity,
-                positionCount,
-                heapIndex.clone(),
-                keyBlockBuilderCopy,
-                valueBlockBuilderCopy);
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private int getRecordOffset(int index)
+    {
+        return index * recordSize;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MaxNAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MaxNAggregationFunction.java
index 65d00a67f51f..df02803a46f4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MaxNAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MaxNAggregationFunction.java
@@ -13,8 +13,8 @@
  */
 package io.trino.operator.aggregation.minmaxn;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -36,9 +36,9 @@ private MaxNAggregationFunction() {}
     @TypeParameter("E")
     public static void input(
             @AggregationState("E") MaxNState state,
-            @BlockPosition @SqlType("E") Block block,
-            @SqlType("BIGINT") long n,
-            @BlockIndex int blockIndex)
+            @BlockPosition @SqlType("E") ValueBlock block,
+            @BlockIndex int blockIndex,
+            @SqlType("BIGINT") long n)
     {
         state.initialize(n);
         state.add(block, blockIndex);
@@ -55,6 +55,6 @@ public static void combine(
     @OutputFunction("array(E)")
     public static void output(@AggregationState("E") MaxNState state, BlockBuilder out)
     {
-        state.writeAll(out);
+        state.writeAllSorted(out);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MaxNStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MaxNStateFactory.java
index 448b78b0cccf..81c8fa1b9681 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MaxNStateFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MaxNStateFactory.java
@@ -13,8 +13,8 @@
  */
 package io.trino.operator.aggregation.minmaxn;
 
+import io.trino.operator.aggregation.minmaxn.MinMaxNStateFactory.GroupedMinMaxNState;
 import io.trino.operator.aggregation.minmaxn.MinMaxNStateFactory.SingleMinMaxNState;
-import io.trino.spi.block.Block;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateFactory;
 import io.trino.spi.function.Convention;
@@ -24,12 +24,14 @@
 import io.trino.spi.type.Type;
 
 import java.lang.invoke.MethodHandle;
-import java.util.function.Function;
 import java.util.function.LongFunction;
 
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static io.trino.util.Failures.checkCondition;
 import static java.lang.Math.toIntExact;
 
@@ -38,14 +40,28 @@ public class MaxNStateFactory
 {
     private static final long MAX_NUMBER_OF_VALUES = 10_000;
     private final LongFunction<TypedHeap> heapFactory;
-    private final Function<Block, TypedHeap> deserializer;
 
     public MaxNStateFactory(
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER))
+                    MethodHandle readFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN))
+                    MethodHandle writeFlat,
+            @OperatorDependency(
+                    operator = OperatorType.COMPARISON_UNORDERED_FIRST,
+                    argumentTypes = {"T", "T"},
+                    convention = @Convention(arguments = {FLAT, FLAT}, result = FAIL_ON_NULL))
+                    MethodHandle compareFlatFlat,
             @OperatorDependency(
                     operator = OperatorType.COMPARISON_UNORDERED_FIRST,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL))
-                    MethodHandle compare,
+                    convention = @Convention(arguments = {FLAT, VALUE_BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL))
+                    MethodHandle compareFlatBlock,
             @TypeParameter("T") Type elementType)
     {
         heapFactory = n -> {
@@ -56,30 +72,29 @@ public MaxNStateFactory(
                     "second argument of max_n must be less than or equal to %s; found %s",
                     MAX_NUMBER_OF_VALUES,
                     n);
-            return new TypedHeap(false, compare, elementType, toIntExact(n));
+            return new TypedHeap(false, readFlat, writeFlat, compareFlatFlat, compareFlatBlock, elementType, toIntExact(n));
         };
-        deserializer = rowBlock -> TypedHeap.deserialize(false, compare, elementType, rowBlock);
     }
 
     @Override
     public MaxNState createSingleState()
     {
-        return new SingleMaxNState(heapFactory, deserializer);
+        return new SingleMaxNState(heapFactory);
     }
 
     @Override
     public MaxNState createGroupedState()
     {
-        return new GroupedMaxNState(heapFactory, deserializer);
+        return new GroupedMaxNState(heapFactory);
     }
 
     private static class GroupedMaxNState
-            extends MinMaxNStateFactory.GroupedMinMaxNState
+            extends GroupedMinMaxNState
             implements MaxNState
     {
-        public GroupedMaxNState(LongFunction<TypedHeap> heapFactory, Function<Block, TypedHeap> deserializer)
+        public GroupedMaxNState(LongFunction<TypedHeap> heapFactory)
         {
-            super(heapFactory, deserializer);
+            super(heapFactory);
         }
     }
 
@@ -87,9 +102,9 @@ private static class SingleMaxNState
             extends SingleMinMaxNState
             implements MaxNState
     {
-        public SingleMaxNState(LongFunction<TypedHeap> heapFactory, Function<Block, TypedHeap> deserializer)
+        public SingleMaxNState(LongFunction<TypedHeap> heapFactory)
         {
-            super(heapFactory, deserializer);
+            super(heapFactory);
         }
 
         public SingleMaxNState(SingleMaxNState state)
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinMaxNState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinMaxNState.java
index 8ac9d36daa0b..1c61c61fec2d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinMaxNState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinMaxNState.java
@@ -13,8 +13,8 @@
  */
 package io.trino.operator.aggregation.minmaxn;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AccumulatorState;
 
 public interface MinMaxNState
@@ -29,7 +29,7 @@ public interface MinMaxNState
     /**
      * Adds the value to this state.
      */
-    void add(Block block, int position);
+    void add(ValueBlock block, int position);
 
     /**
      * Merge with the specified state.
@@ -41,17 +41,10 @@ public interface MinMaxNState
     /**
      * Writes all values to the supplied block builder as an array entry.
      */
-    void writeAll(BlockBuilder out);
+    void writeAllSorted(BlockBuilder out);
 
     /**
      * Write this state to the specified block builder.
      */
     void serialize(BlockBuilder out);
-
-    /**
-     * Read the state to the specified block builder.
-     *
-     * @throws IllegalStateException if state is already initialized
-     */
-    void deserialize(Block rowBlock);
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinMaxNStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinMaxNStateFactory.java
index 86a65446871b..fc94133942b3 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinMaxNStateFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinMaxNStateFactory.java
@@ -14,16 +14,23 @@
 package io.trino.operator.aggregation.minmaxn;
 
 import io.trino.array.ObjectBigArray;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlRow;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.GroupedAccumulatorState;
+import io.trino.spi.type.ArrayType;
 
-import java.util.function.Function;
 import java.util.function.LongFunction;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.slice.SizeOf.instanceSize;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
 public final class MinMaxNStateFactory
@@ -34,6 +41,39 @@ private abstract static class AbstractMinMaxNState
             implements MinMaxNState
     {
         abstract TypedHeap getTypedHeap();
+
+        @Override
+        public final void merge(MinMaxNState other)
+        {
+            SqlRow sqlRow = ((SingleMinMaxNState) other).removeTempSerializedState();
+            int rawIndex = sqlRow.getRawIndex();
+
+            int capacity = toIntExact(BIGINT.getLong(sqlRow.getRawFieldBlock(0), rawIndex));
+            initialize(capacity);
+            TypedHeap typedHeap = getTypedHeap();
+
+            Block array = new ArrayType(typedHeap.getElementType()).getObject(sqlRow.getRawFieldBlock(1), rawIndex);
+            ValueBlock arrayValues = array.getUnderlyingValueBlock();
+            for (int i = 0; i < array.getPositionCount(); i++) {
+                typedHeap.add(arrayValues, array.getUnderlyingValuePosition(i));
+            }
+        }
+
+        @Override
+        public final void serialize(BlockBuilder out)
+        {
+            TypedHeap typedHeap = getTypedHeap();
+            if (typedHeap == null) {
+                out.appendNull();
+            }
+            else {
+                ((RowBlockBuilder) out).buildEntry(fieldBuilders -> {
+                    BIGINT.writeLong(fieldBuilders.get(0), typedHeap.getCapacity());
+
+                    ((ArrayBlockBuilder) fieldBuilders.get(1)).buildEntry(typedHeap::writeAllUnsorted);
+                });
+            }
+        }
     }
 
     public abstract static class GroupedMinMaxNState
@@ -43,16 +83,14 @@ public abstract static class GroupedMinMaxNState
         private static final int INSTANCE_SIZE = instanceSize(GroupedMinMaxNState.class);
 
         private final LongFunction<TypedHeap> heapFactory;
-        private final Function<Block, TypedHeap> deserializer;
 
         private final ObjectBigArray<TypedHeap> heaps = new ObjectBigArray<>();
         private long groupId;
         private long size;
 
-        public GroupedMinMaxNState(LongFunction<TypedHeap> heapFactory, Function<Block, TypedHeap> deserializer)
+        public GroupedMinMaxNState(LongFunction<TypedHeap> heapFactory)
         {
             this.heapFactory = heapFactory;
-            this.deserializer = deserializer;
         }
 
         @Override
@@ -84,7 +122,7 @@ public final void initialize(long n)
         }
 
         @Override
-        public final void add(Block block, int position)
+        public final void add(ValueBlock block, int position)
         {
             TypedHeap typedHeap = getTypedHeap();
 
@@ -94,27 +132,7 @@ public final void add(Block block, int position)
         }
 
         @Override
-        public final void merge(MinMaxNState other)
-        {
-            TypedHeap otherTypedHeap = ((AbstractMinMaxNState) other).getTypedHeap();
-            if (otherTypedHeap == null) {
-                return;
-            }
-
-            TypedHeap typedHeap = getTypedHeap();
-            if (typedHeap == null) {
-                setTypedHeap(otherTypedHeap);
-                size += otherTypedHeap.getEstimatedSize();
-            }
-            else {
-                size -= typedHeap.getEstimatedSize();
-                typedHeap.addAll(otherTypedHeap);
-                size += typedHeap.getEstimatedSize();
-            }
-        }
-
-        @Override
-        public final void writeAll(BlockBuilder out)
+        public final void writeAllSorted(BlockBuilder out)
         {
             TypedHeap typedHeap = getTypedHeap();
             if (typedHeap == null || typedHeap.isEmpty()) {
@@ -122,33 +140,7 @@ public final void writeAll(BlockBuilder out)
                 return;
             }
 
-            BlockBuilder arrayBlockBuilder = out.beginBlockEntry();
-
-            typedHeap.writeAll(arrayBlockBuilder);
-
-            out.closeEntry();
-        }
-
-        @Override
-        public final void serialize(BlockBuilder out)
-        {
-            TypedHeap typedHeap = getTypedHeap();
-            if (typedHeap == null) {
-                out.appendNull();
-            }
-            else {
-                typedHeap.serialize(out);
-            }
-        }
-
-        @Override
-        public final void deserialize(Block rowBlock)
-        {
-            checkState(getTypedHeap() == null, "State already initialized");
-
-            TypedHeap typedHeap = deserializer.apply(rowBlock);
-            setTypedHeap(typedHeap);
-            size += typedHeap.getEstimatedSize();
+            ((ArrayBlockBuilder) out).buildEntry(typedHeap::writeAllSorted);
         }
 
         @Override
@@ -169,23 +161,25 @@ public abstract static class SingleMinMaxNState
         private static final int INSTANCE_SIZE = instanceSize(SingleMinMaxNState.class);
 
         private final LongFunction<TypedHeap> heapFactory;
-        private final Function<Block, TypedHeap> deserializer;
 
         private TypedHeap typedHeap;
+        private SqlRow tempSerializedState;
 
-        public SingleMinMaxNState(LongFunction<TypedHeap> heapFactory, Function<Block, TypedHeap> deserializer)
+        public SingleMinMaxNState(LongFunction<TypedHeap> heapFactory)
         {
             this.heapFactory = requireNonNull(heapFactory, "heapFactory is null");
-            this.deserializer = requireNonNull(deserializer, "deserializer is null");
         }
 
         protected SingleMinMaxNState(SingleMinMaxNState state)
         {
+            // tempSerializedState should never be set during a copy operation it is only used during deserialization
+            checkArgument(state.tempSerializedState == null);
+            tempSerializedState = null;
+
             this.heapFactory = state.heapFactory;
-            this.deserializer = state.deserializer;
 
             if (state.typedHeap != null) {
-                this.typedHeap = state.typedHeap.copy();
+                this.typedHeap = new TypedHeap(state.typedHeap);
             }
             else {
                 this.typedHeap = null;
@@ -210,60 +204,39 @@ public final void initialize(long n)
         }
 
         @Override
-        public final void add(Block block, int position)
+        public final void add(ValueBlock block, int position)
         {
             typedHeap.add(block, position);
         }
 
         @Override
-        public final void merge(MinMaxNState other)
-        {
-            TypedHeap otherTypedHeap = ((AbstractMinMaxNState) other).getTypedHeap();
-            if (otherTypedHeap == null) {
-                return;
-            }
-            if (typedHeap == null) {
-                typedHeap = otherTypedHeap;
-            }
-            else {
-                typedHeap.addAll(otherTypedHeap);
-            }
-        }
-
-        @Override
-        public final void writeAll(BlockBuilder out)
+        public final void writeAllSorted(BlockBuilder out)
         {
             if (typedHeap == null || typedHeap.isEmpty()) {
                 out.appendNull();
                 return;
             }
 
-            BlockBuilder arrayBlockBuilder = out.beginBlockEntry();
-            typedHeap.writeAll(arrayBlockBuilder);
-            out.closeEntry();
+            ((ArrayBlockBuilder) out).buildEntry(typedHeap::writeAllSorted);
         }
 
         @Override
-        public final void serialize(BlockBuilder out)
+        final TypedHeap getTypedHeap()
         {
-            if (typedHeap == null) {
-                out.appendNull();
-            }
-            else {
-                typedHeap.serialize(out);
-            }
+            return typedHeap;
         }
 
-        @Override
-        public final void deserialize(Block rowBlock)
+        void setTempSerializedState(SqlRow tempSerializedState)
         {
-            typedHeap = deserializer.apply(rowBlock);
+            this.tempSerializedState = tempSerializedState;
         }
 
-        @Override
-        final TypedHeap getTypedHeap()
+        SqlRow removeTempSerializedState()
         {
-            return typedHeap;
+            SqlRow sqlRow = tempSerializedState;
+            checkState(sqlRow != null, "tempDeserializeBlock is null");
+            tempSerializedState = null;
+            return sqlRow;
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinMaxNStateSerializer.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinMaxNStateSerializer.java
index fc87847dff7c..1f0d27486386 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinMaxNStateSerializer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinMaxNStateSerializer.java
@@ -13,8 +13,10 @@
  */
 package io.trino.operator.aggregation.minmaxn;
 
+import io.trino.operator.aggregation.minmaxn.MinMaxNStateFactory.SingleMinMaxNState;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.AccumulatorStateSerializer;
 import io.trino.spi.type.Type;
 
@@ -45,7 +47,10 @@ public void serialize(T state, BlockBuilder out)
     @Override
     public void deserialize(Block block, int index, T state)
     {
-        Block rowBlock = (Block) serializedType.getObject(block, index);
-        state.deserialize(rowBlock);
+        // the aggregation framework uses a scratch single state for deserialization, and then calls the combine function
+        // for typed heap is is simpler to store the deserialized row block in the state and then add the row block
+        // directly to the heap in the combine
+        SqlRow sqlRow = (SqlRow) serializedType.getObject(block, index);
+        ((SingleMinMaxNState) state).setTempSerializedState(sqlRow);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinNAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinNAggregationFunction.java
index 91bac2856f00..3f4f5a78ceb0 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinNAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinNAggregationFunction.java
@@ -13,8 +13,8 @@
  */
 package io.trino.operator.aggregation.minmaxn;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -36,9 +36,9 @@ private MinNAggregationFunction() {}
     @TypeParameter("E")
     public static void input(
             @AggregationState("E") MinNState state,
-            @BlockPosition @SqlType("E") Block block,
-            @SqlType("BIGINT") long n,
-            @BlockIndex int blockIndex)
+            @BlockPosition @SqlType("E") ValueBlock block,
+            @BlockIndex int blockIndex,
+            @SqlType("BIGINT") long n)
     {
         state.initialize(n);
         state.add(block, blockIndex);
@@ -55,6 +55,6 @@ public static void combine(
     @OutputFunction("array(E)")
     public static void output(@AggregationState("E") MinNState state, BlockBuilder out)
     {
-        state.writeAll(out);
+        state.writeAllSorted(out);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinNStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinNStateFactory.java
index 9727aabc8930..99fe5b6496d4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinNStateFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/MinNStateFactory.java
@@ -14,7 +14,6 @@
 package io.trino.operator.aggregation.minmaxn;
 
 import io.trino.operator.aggregation.minmaxn.MinMaxNStateFactory.SingleMinMaxNState;
-import io.trino.spi.block.Block;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateFactory;
 import io.trino.spi.function.Convention;
@@ -24,12 +23,14 @@
 import io.trino.spi.type.Type;
 
 import java.lang.invoke.MethodHandle;
-import java.util.function.Function;
 import java.util.function.LongFunction;
 
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static io.trino.util.Failures.checkCondition;
 import static java.lang.Math.toIntExact;
 
@@ -38,14 +39,28 @@ public class MinNStateFactory
 {
     private static final long MAX_NUMBER_OF_VALUES = 10_000;
     private final LongFunction<TypedHeap> heapFactory;
-    private final Function<Block, TypedHeap> deserializer;
 
     public MinNStateFactory(
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER))
+                    MethodHandle readFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN))
+                    MethodHandle writeFlat,
+            @OperatorDependency(
+                    operator = OperatorType.COMPARISON_UNORDERED_LAST,
+                    argumentTypes = {"T", "T"},
+                    convention = @Convention(arguments = {FLAT, FLAT}, result = FAIL_ON_NULL))
+                    MethodHandle compareFlatFlat,
             @OperatorDependency(
                     operator = OperatorType.COMPARISON_UNORDERED_LAST,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL))
-                    MethodHandle compare,
+                    convention = @Convention(arguments = {FLAT, VALUE_BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL))
+                    MethodHandle compareFlatBlock,
             @TypeParameter("T") Type elementType)
     {
         heapFactory = n -> {
@@ -57,30 +72,29 @@ public MinNStateFactory(
                     MAX_NUMBER_OF_VALUES,
                     n);
 
-            return new TypedHeap(true, compare, elementType, toIntExact(n));
+            return new TypedHeap(true, readFlat, writeFlat, compareFlatFlat, compareFlatBlock, elementType, toIntExact(n));
         };
-        deserializer = rowBlock -> TypedHeap.deserialize(true, compare, elementType, rowBlock);
     }
 
     @Override
     public MinNState createSingleState()
     {
-        return new SingleMinNState(heapFactory, deserializer);
+        return new SingleMinNState(heapFactory);
     }
 
     @Override
     public MinNState createGroupedState()
     {
-        return new GroupedMinNState(heapFactory, deserializer);
+        return new GroupedMinNState(heapFactory);
     }
 
     private static class GroupedMinNState
             extends MinMaxNStateFactory.GroupedMinMaxNState
             implements MinNState
     {
-        public GroupedMinNState(LongFunction<TypedHeap> heapFactory, Function<Block, TypedHeap> deserializer)
+        public GroupedMinNState(LongFunction<TypedHeap> heapFactory)
         {
-            super(heapFactory, deserializer);
+            super(heapFactory);
         }
     }
 
@@ -88,9 +102,9 @@ private static class SingleMinNState
             extends SingleMinMaxNState
             implements MinNState
     {
-        public SingleMinNState(LongFunction<TypedHeap> heapFactory, Function<Block, TypedHeap> deserializer)
+        public SingleMinNState(LongFunction<TypedHeap> heapFactory)
         {
-            super(heapFactory, deserializer);
+            super(heapFactory);
         }
 
         public SingleMinNState(SingleMinNState state)
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/TypedHeap.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/TypedHeap.java
index aa5dc34df168..7ba0168077d8 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/TypedHeap.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxn/TypedHeap.java
@@ -14,57 +14,114 @@
 package io.trino.operator.aggregation.minmaxn;
 
 import com.google.common.base.Throwables;
-import io.trino.spi.block.Block;
+import com.google.common.primitives.Ints;
+import io.airlift.slice.SizeOf;
+import io.trino.operator.VariableWidthData;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.ArrayType;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
 import it.unimi.dsi.fastutil.ints.IntArrays;
 
 import java.lang.invoke.MethodHandle;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.slice.SizeOf.instanceSize;
-import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static java.lang.Math.toIntExact;
+import static io.trino.operator.VariableWidthData.EMPTY_CHUNK;
+import static io.trino.operator.VariableWidthData.MAX_CHUNK_SIZE;
+import static io.trino.operator.VariableWidthData.MIN_CHUNK_SIZE;
+import static io.trino.operator.VariableWidthData.POINTER_SIZE;
+import static io.trino.operator.VariableWidthData.getChunkOffset;
+import static io.trino.operator.VariableWidthData.getValueLength;
+import static io.trino.operator.VariableWidthData.writePointer;
 import static java.util.Objects.requireNonNull;
 
-public class TypedHeap
+public final class TypedHeap
 {
     private static final int INSTANCE_SIZE = instanceSize(TypedHeap.class);
 
-    private static final int COMPACT_THRESHOLD_BYTES = 32768;
-    private static final int COMPACT_THRESHOLD_RATIO = 3; // when 2/3 of elements in heapBlockBuilder is unreferenced, do compact
-
     private final boolean min;
-    private final MethodHandle compare;
+    private final MethodHandle readFlat;
+    private final MethodHandle writeFlat;
+    private final MethodHandle compareFlatFlat;
+    private final MethodHandle compareFlatBlock;
     private final Type elementType;
     private final int capacity;
 
+    private final int recordElementOffset;
+
+    private final int recordSize;
+    /**
+     * The fixed chunk contains an array of records. The records are laid out as follows:
+     * <ul>
+     *     <li>12 byte optional pointer to variable width data (only present if the type is variable width)</li>
+     *     <li>N byte fixed size data for the element type</li>
+     * </ul>
+     * The pointer is placed first to simplify the offset calculations for variable with code.
+     * This chunk contains {@code capacity + 1} records. The extra record is used for the swap operation.
+     */
+    private final byte[] fixedChunk;
+
+    private VariableWidthData variableWidthData;
+
     private int positionCount;
-    private final int[] heapIndex;
-    private BlockBuilder heapBlockBuilder;
 
-    public TypedHeap(boolean min, MethodHandle compare, Type elementType, int capacity)
+    public TypedHeap(
+            boolean min,
+            MethodHandle readFlat,
+            MethodHandle writeFlat,
+            MethodHandle compareFlatFlat,
+            MethodHandle compareFlatBlock,
+            Type elementType,
+            int capacity)
     {
         this.min = min;
-        this.compare = requireNonNull(compare, "compare is null");
+        this.readFlat = requireNonNull(readFlat, "readFlat is null");
+        this.writeFlat = requireNonNull(writeFlat, "writeFlat is null");
+        this.compareFlatFlat = requireNonNull(compareFlatFlat, "compareFlatFlat is null");
+        this.compareFlatBlock = requireNonNull(compareFlatBlock, "compareFlatBlock is null");
         this.elementType = requireNonNull(elementType, "elementType is null");
         this.capacity = capacity;
-        this.heapIndex = new int[capacity];
-        this.heapBlockBuilder = elementType.createBlockBuilder(null, capacity);
+
+        boolean variableWidth = elementType.isFlatVariableWidth();
+        variableWidthData = variableWidth ? new VariableWidthData() : null;
+        recordElementOffset = (variableWidth ? POINTER_SIZE : 0);
+
+        recordSize = recordElementOffset + elementType.getFlatFixedSize();
+
+        // allocate the fixed chunk with on extra slow for use in swap
+        fixedChunk = new byte[recordSize * (capacity + 1)];
     }
 
-    // for copying
-    private TypedHeap(boolean min, MethodHandle compare, Type elementType, int capacity, int positionCount, int[] heapIndex, BlockBuilder heapBlockBuilder)
+    public TypedHeap(TypedHeap typedHeap)
     {
-        this.min = min;
-        this.compare = requireNonNull(compare, "compare is null");
-        this.elementType = requireNonNull(elementType, "elementType is null");
-        this.capacity = capacity;
-        this.positionCount = positionCount;
-        this.heapIndex = heapIndex;
-        this.heapBlockBuilder = heapBlockBuilder;
+        this.min = typedHeap.min;
+        this.readFlat = typedHeap.readFlat;
+        this.writeFlat = typedHeap.writeFlat;
+        this.compareFlatFlat = typedHeap.compareFlatFlat;
+        this.compareFlatBlock = typedHeap.compareFlatBlock;
+        this.elementType = typedHeap.elementType;
+        this.capacity = typedHeap.capacity;
+        this.positionCount = typedHeap.positionCount;
+
+        this.recordElementOffset = typedHeap.recordElementOffset;
+
+        this.recordSize = typedHeap.recordSize;
+        this.fixedChunk = Arrays.copyOf(typedHeap.fixedChunk, typedHeap.fixedChunk.length);
+
+        if (typedHeap.variableWidthData != null) {
+            this.variableWidthData = new VariableWidthData(typedHeap.variableWidthData);
+        }
+        else {
+            this.variableWidthData = null;
+        }
+    }
+
+    public Type getElementType()
+    {
+        return elementType;
     }
 
     public int getCapacity()
@@ -74,7 +131,9 @@ public int getCapacity()
 
     public long getEstimatedSize()
     {
-        return INSTANCE_SIZE + (heapBlockBuilder == null ? 0 : heapBlockBuilder.getRetainedSizeInBytes()) + sizeOf(heapIndex);
+        return INSTANCE_SIZE +
+                SizeOf.sizeOf(fixedChunk) +
+                (variableWidthData == null ? 0 : variableWidthData.getRetainedSizeBytes());
     }
 
     public boolean isEmpty()
@@ -82,78 +141,103 @@ public boolean isEmpty()
         return positionCount == 0;
     }
 
-    public void serialize(BlockBuilder out)
+    public void writeAllSorted(BlockBuilder resultBlockBuilder)
     {
-        BlockBuilder blockBuilder = out.beginBlockEntry();
-        BIGINT.writeLong(blockBuilder, capacity);
-
-        BlockBuilder elements = blockBuilder.beginBlockEntry();
-        for (int i = 0; i < positionCount; i++) {
-            elementType.appendTo(heapBlockBuilder, heapIndex[i], elements);
+        // fully sort the heap
+        int[] indexes = new int[positionCount];
+        for (int i = 0; i < indexes.length; i++) {
+            indexes[i] = i;
         }
-        blockBuilder.closeEntry();
+        IntArrays.quickSort(indexes, this::compare);
 
-        out.closeEntry();
+        for (int index : indexes) {
+            write(index, resultBlockBuilder);
+        }
     }
 
-    public static TypedHeap deserialize(boolean min, MethodHandle compare, Type elementType, Block rowBlock)
+    public void writeAllUnsorted(BlockBuilder elementBuilder)
     {
-        int capacity = toIntExact(BIGINT.getLong(rowBlock, 0));
-        int[] heapIndex = new int[capacity];
-
-        BlockBuilder heapBlockBuilder = elementType.createBlockBuilder(null, capacity);
-
-        Block heapBlock = new ArrayType(elementType).getObject(rowBlock, 1);
-        for (int position = 0; position < heapBlock.getPositionCount(); position++) {
-            heapIndex[position] = position;
-            elementType.appendTo(heapBlock, position, heapBlockBuilder);
+        for (int i = 0; i < positionCount; i++) {
+            write(i, elementBuilder);
         }
-
-        return new TypedHeap(min, compare, elementType, capacity, heapBlock.getPositionCount(), heapIndex, heapBlockBuilder);
     }
 
-    public void writeAll(BlockBuilder resultBlockBuilder)
+    private void write(int index, BlockBuilder blockBuilder)
     {
-        int[] indexes = new int[positionCount];
-        System.arraycopy(heapIndex, 0, indexes, 0, positionCount);
-        IntArrays.quickSort(indexes, (a, b) -> compare(heapBlockBuilder, a, heapBlockBuilder, b));
+        int recordOffset = getRecordOffset(index);
 
-        for (int index : indexes) {
-            elementType.appendTo(heapBlockBuilder, index, resultBlockBuilder);
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            variableWidthChunk = variableWidthData.getChunk(fixedChunk, recordOffset);
+        }
+
+        try {
+            readFlat.invokeExact(
+                    fixedChunk,
+                    recordOffset + recordElementOffset,
+                    variableWidthChunk,
+                    blockBuilder);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
         }
     }
 
-    public void add(Block block, int position)
+    public void add(ValueBlock block, int position)
     {
         checkArgument(!block.isNull(position));
         if (positionCount == capacity) {
-            if (keyGreaterThanOrEqual(heapBlockBuilder, heapIndex[0], block, position)) {
-                return; // and new element is not larger than heap top: do not add
+            // is it possible the value is within the top N values?
+            if (!shouldConsiderValue(block, position)) {
+                return;
             }
-            heapIndex[0] = heapBlockBuilder.getPositionCount();
-            elementType.appendTo(block, position, heapBlockBuilder);
+            clear(0);
+            set(0, block, position);
             siftDown();
         }
         else {
-            heapIndex[positionCount] = heapBlockBuilder.getPositionCount();
+            set(positionCount, block, position);
             positionCount++;
-            elementType.appendTo(block, position, heapBlockBuilder);
             siftUp();
         }
-        compactIfNecessary();
     }
 
-    public void addAll(TypedHeap other)
+    private void clear(int index)
     {
-        for (int i = 0; i < other.positionCount; i++) {
-            add(other.heapBlockBuilder, other.heapIndex[i]);
+        if (variableWidthData == null) {
+            return;
         }
+
+        variableWidthData.free(fixedChunk, getRecordOffset(index));
+        variableWidthData = compactIfNecessary(
+                variableWidthData,
+                fixedChunk,
+                recordSize,
+                0,
+                positionCount,
+                (fixedSizeOffset, variableWidthChunk, variableWidthChunkOffset) ->
+                        elementType.relocateFlatVariableWidthOffsets(fixedChunk, fixedSizeOffset + recordElementOffset, variableWidthChunk, variableWidthChunkOffset));
     }
 
-    public void addAll(Block block)
+    private void set(int index, ValueBlock block, int position)
     {
-        for (int i = 0; i < block.getPositionCount(); i++) {
-            add(block, i);
+        int recordOffset = getRecordOffset(index);
+
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        int variableWidthChunkOffset = 0;
+        if (variableWidthData != null) {
+            int variableWidthLength = elementType.getFlatVariableWidthSize(block, position);
+            variableWidthChunk = variableWidthData.allocate(fixedChunk, recordOffset, variableWidthLength);
+            variableWidthChunkOffset = getChunkOffset(fixedChunk, recordOffset);
+        }
+
+        try {
+            writeFlat.invokeExact(block, position, fixedChunk, recordOffset + recordElementOffset, variableWidthChunk, variableWidthChunkOffset);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
         }
     }
 
@@ -171,14 +255,13 @@ private void siftDown()
                 smallerChildPosition = leftPosition;
             }
             else {
-                smallerChildPosition = keyGreaterThanOrEqual(heapBlockBuilder, heapIndex[leftPosition], heapBlockBuilder, heapIndex[rightPosition]) ? rightPosition : leftPosition;
+                smallerChildPosition = compare(leftPosition, rightPosition) < 0 ? rightPosition : leftPosition;
             }
-            if (keyGreaterThanOrEqual(heapBlockBuilder, heapIndex[smallerChildPosition], heapBlockBuilder, heapIndex[position])) {
-                break; // child is larger or equal
+            if (compare(smallerChildPosition, position) < 0) {
+                // child is larger or equal
+                break;
             }
-            int swapTemp = heapIndex[position];
-            heapIndex[position] = heapIndex[smallerChildPosition];
-            heapIndex[smallerChildPosition] = swapTemp;
+            swap(position, smallerChildPosition);
             position = smallerChildPosition;
         }
     }
@@ -188,37 +271,70 @@ private void siftUp()
         int position = positionCount - 1;
         while (position != 0) {
             int parentPosition = (position - 1) / 2;
-            if (keyGreaterThanOrEqual(heapBlockBuilder, heapIndex[position], heapBlockBuilder, heapIndex[parentPosition])) {
-                break; // child is larger or equal
+            if (compare(position, parentPosition) < 0) {
+                // child is larger or equal
+                break;
             }
-            int swapTemp = heapIndex[position];
-            heapIndex[position] = heapIndex[parentPosition];
-            heapIndex[parentPosition] = swapTemp;
+            swap(position, parentPosition);
             position = parentPosition;
         }
     }
 
-    private void compactIfNecessary()
+    private void swap(int leftPosition, int rightPosition)
     {
-        // Byte size check is needed. Otherwise, if size * 3 is small, BlockBuilder can be reallocated too often.
-        // Position count is needed. Otherwise, for large elements, heap will be compacted every time.
-        // Size instead of retained size is needed because default allocation size can be huge for some block builders. And the first check will become useless in such case.
-        if (heapBlockBuilder.getSizeInBytes() < COMPACT_THRESHOLD_BYTES || heapBlockBuilder.getPositionCount() / positionCount < COMPACT_THRESHOLD_RATIO) {
-            return;
+        int leftOffset = getRecordOffset(leftPosition);
+        int rightOffset = getRecordOffset(rightPosition);
+        int tempOffset = getRecordOffset(capacity);
+        System.arraycopy(fixedChunk, leftOffset, fixedChunk, tempOffset, recordSize);
+        System.arraycopy(fixedChunk, rightOffset, fixedChunk, leftOffset, recordSize);
+        System.arraycopy(fixedChunk, tempOffset, fixedChunk, rightOffset, recordSize);
+    }
+
+    private int compare(int leftPosition, int rightPosition)
+    {
+        int leftRecordOffset = getRecordOffset(leftPosition);
+        int rightRecordOffset = getRecordOffset(rightPosition);
+
+        byte[] leftVariableWidthChunk = EMPTY_CHUNK;
+        byte[] rightVariableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            leftVariableWidthChunk = variableWidthData.getChunk(fixedChunk, leftRecordOffset);
+            rightVariableWidthChunk = variableWidthData.getChunk(fixedChunk, rightRecordOffset);
         }
-        BlockBuilder newHeapBlockBuilder = elementType.createBlockBuilder(null, heapBlockBuilder.getPositionCount());
-        for (int i = 0; i < positionCount; i++) {
-            elementType.appendTo(heapBlockBuilder, heapIndex[i], newHeapBlockBuilder);
-            heapIndex[i] = i;
+
+        try {
+            long result = (long) compareFlatFlat.invokeExact(
+                    fixedChunk,
+                    leftRecordOffset + recordElementOffset,
+                    leftVariableWidthChunk,
+                    fixedChunk,
+                    rightRecordOffset + recordElementOffset,
+                    rightVariableWidthChunk);
+            return (int) (min ? result : -result);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
         }
-        heapBlockBuilder = newHeapBlockBuilder;
     }
 
-    private int compare(Block leftBlock, int leftPosition, Block rightBlock, int rightPosition)
+    private boolean shouldConsiderValue(ValueBlock right, int rightPosition)
     {
+        byte[] leftFixedRecordChunk = fixedChunk;
+        int leftRecordOffset = getRecordOffset(0);
+        byte[] leftVariableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            leftVariableWidthChunk = variableWidthData.getChunk(leftFixedRecordChunk, leftRecordOffset);
+        }
+
         try {
-            long result = (long) compare.invokeExact(leftBlock, leftPosition, rightBlock, rightPosition);
-            return (int) (min ? result : -result);
+            long result = (long) compareFlatBlock.invokeExact(
+                    leftFixedRecordChunk,
+                    leftRecordOffset + recordElementOffset,
+                    leftVariableWidthChunk,
+                    right,
+                    rightPosition);
+            return min ? result > 0 : result < 0;
         }
         catch (Throwable throwable) {
             Throwables.throwIfUnchecked(throwable);
@@ -226,17 +342,91 @@ private int compare(Block leftBlock, int leftPosition, Block rightBlock, int rig
         }
     }
 
-    private boolean keyGreaterThanOrEqual(Block leftBlock, int leftPosition, Block rightBlock, int rightPosition)
+    private int getRecordOffset(int index)
     {
-        return compare(leftBlock, leftPosition, rightBlock, rightPosition) < 0;
+        return index * recordSize;
     }
 
-    public TypedHeap copy()
+    private static final double MAX_FREE_RATIO = 0.66;
+
+    public interface RelocateVariableWidthOffsets
+    {
+        void relocate(int fixedSizeOffset, byte[] variableWidthChunk, int variableWidthChunkOffset);
+    }
+
+    public static VariableWidthData compactIfNecessary(VariableWidthData data, byte[] fixedSizeChunk, int fixedRecordSize, int fixedRecordPointerOffset, int recordCount, RelocateVariableWidthOffsets relocateVariableWidthOffsets)
     {
-        BlockBuilder heapBlockBuilderCopy = null;
-        if (heapBlockBuilder != null) {
-            heapBlockBuilderCopy = (BlockBuilder) heapBlockBuilder.copyRegion(0, heapBlockBuilder.getPositionCount());
+        List<byte[]> chunks = data.getAllChunks();
+        double freeRatio = 1.0 * data.getFreeBytes() / data.getAllocatedBytes();
+        if (chunks.size() <= 1 || freeRatio < MAX_FREE_RATIO) {
+            return data;
+        }
+
+        // there are obviously much smarter ways to compact the memory, so feel free to improve this
+        List<byte[]> newSlices = new ArrayList<>();
+
+        int newSize = 0;
+        int indexStart = 0;
+        for (int i = 0; i < recordCount; i++) {
+            int valueLength = getValueLength(fixedSizeChunk, i * fixedRecordSize + fixedRecordPointerOffset);
+            if (newSize + valueLength > MAX_CHUNK_SIZE) {
+                moveVariableWidthToNewSlice(data, fixedSizeChunk, fixedRecordSize, fixedRecordPointerOffset, indexStart, i, newSlices, newSize, relocateVariableWidthOffsets);
+                indexStart = i;
+                newSize = 0;
+            }
+            newSize += valueLength;
+        }
+
+        // remaining data is copied into the open slice
+        int openChunkOffset;
+        if (newSize > 0) {
+            int openSliceSize = newSize;
+            if (newSize < MAX_CHUNK_SIZE) {
+                openSliceSize = Ints.constrainToRange(Ints.saturatedCast(openSliceSize * 2L), MIN_CHUNK_SIZE, MAX_CHUNK_SIZE);
+            }
+            moveVariableWidthToNewSlice(data, fixedSizeChunk, fixedRecordSize, fixedRecordPointerOffset, indexStart, recordCount, newSlices, openSliceSize, relocateVariableWidthOffsets);
+            openChunkOffset = newSize;
+        }
+        else {
+            openChunkOffset = newSlices.get(newSlices.size() - 1).length;
+        }
+
+        return new VariableWidthData(newSlices, openChunkOffset);
+    }
+
+    private static void moveVariableWidthToNewSlice(
+            VariableWidthData sourceData,
+            byte[] fixedSizeChunk,
+            int fixedRecordSize,
+            int fixedRecordPointerOffset,
+            int indexStart,
+            int indexEnd,
+            List<byte[]> newSlices,
+            int newSliceSize,
+            RelocateVariableWidthOffsets relocateVariableWidthOffsets)
+    {
+        int newSliceIndex = newSlices.size();
+        byte[] newSlice = new byte[newSliceSize];
+        newSlices.add(newSlice);
+
+        int newSliceOffset = 0;
+        for (int index = indexStart; index < indexEnd; index++) {
+            int fixedChunkOffset = index * fixedRecordSize;
+            int pointerOffset = fixedChunkOffset + fixedRecordPointerOffset;
+
+            int variableWidthOffset = getChunkOffset(fixedSizeChunk, pointerOffset);
+            byte[] variableWidthChunk = sourceData.getChunk(fixedSizeChunk, pointerOffset);
+            int variableWidthLength = getValueLength(fixedSizeChunk, pointerOffset);
+
+            System.arraycopy(variableWidthChunk, variableWidthOffset, newSlice, newSliceOffset, variableWidthLength);
+            writePointer(
+                    fixedSizeChunk,
+                    pointerOffset,
+                    newSliceIndex,
+                    newSliceOffset,
+                    variableWidthLength);
+            relocateVariableWidthOffsets.relocate(fixedChunkOffset, newSlice, newSliceOffset);
+            newSliceOffset += variableWidthLength;
         }
-        return new TypedHeap(min, compare, elementType, capacity, positionCount, heapIndex.clone(), heapBlockBuilderCopy);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/AbstractMultimapAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/AbstractMultimapAggregationState.java
new file mode 100644
index 000000000000..5a69677e9168
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/AbstractMultimapAggregationState.java
@@ -0,0 +1,614 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation.multimapagg;
+
+import com.google.common.base.Throwables;
+import com.google.common.primitives.Ints;
+import io.trino.operator.VariableWidthData;
+import io.trino.operator.aggregation.arrayagg.FlatArrayBuilder;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlockBuilder;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.Type;
+import jakarta.annotation.Nullable;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.util.Arrays;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Verify.verify;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.operator.VariableWidthData.EMPTY_CHUNK;
+import static io.trino.operator.VariableWidthData.POINTER_SIZE;
+import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
+import static java.lang.Math.multiplyExact;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
+import static java.util.Objects.checkIndex;
+import static java.util.Objects.requireNonNull;
+
+public abstract class AbstractMultimapAggregationState
+        implements MultimapAggregationState
+{
+    private static final int INSTANCE_SIZE = instanceSize(AbstractMultimapAggregationState.class);
+
+    // See java.util.ArrayList for an explanation
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
+    // Hash table capacity must be a power of 2 and at least VECTOR_LENGTH
+    private static final int INITIAL_CAPACITY = 16;
+
+    private static int calculateMaxFill(int capacity)
+    {
+        // The hash table uses a load factory of 15/16
+        return (capacity / 16) * 15;
+    }
+
+    private static final long HASH_COMBINE_PRIME = 4999L;
+
+    private static final int RECORDS_PER_GROUP_SHIFT = 10;
+    private static final int RECORDS_PER_GROUP = 1 << RECORDS_PER_GROUP_SHIFT;
+    private static final int RECORDS_PER_GROUP_MASK = RECORDS_PER_GROUP - 1;
+
+    private static final int VECTOR_LENGTH = Long.BYTES;
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, LITTLE_ENDIAN);
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, LITTLE_ENDIAN);
+
+    private final Type keyType;
+    private final MethodHandle keyReadFlat;
+    private final MethodHandle keyWriteFlat;
+    private final MethodHandle keyHashFlat;
+    private final MethodHandle keyDistinctFlatBlock;
+    private final MethodHandle keyHashBlock;
+
+    private final int recordSize;
+    private final int recordGroupIdOffset;
+    private final int recordNextIndexOffset;
+    private final int recordKeyOffset;
+    private final int recordKeyIdOffset;
+
+    private int nextKeyId;
+
+    private final FlatArrayBuilder valueArrayBuilder;
+    private long[] keyHeadPositions = new long[0];
+    private long[] keyTailPositions = new long[0];
+
+    private int capacity;
+    private int mask;
+
+    private byte[] control;
+    private byte[][] recordGroups;
+    private final VariableWidthData variableWidthData;
+
+    // head position of each group in the hash table
+    @Nullable
+    private int[] groupRecordIndex;
+
+    private int size;
+    private int maxFill;
+
+    public AbstractMultimapAggregationState(
+            Type keyType,
+            MethodHandle keyReadFlat,
+            MethodHandle keyWriteFlat,
+            MethodHandle hashFlat,
+            MethodHandle distinctFlatBlock,
+            MethodHandle keyHashBlock,
+            Type valueType,
+            MethodHandle valueReadFlat,
+            MethodHandle valueWriteFlat,
+            boolean grouped)
+    {
+        this.keyType = requireNonNull(keyType, "keyType is null");
+
+        this.keyReadFlat = requireNonNull(keyReadFlat, "keyReadFlat is null");
+        this.keyWriteFlat = requireNonNull(keyWriteFlat, "keyWriteFlat is null");
+        this.keyHashFlat = requireNonNull(hashFlat, "hashFlat is null");
+        this.keyDistinctFlatBlock = requireNonNull(distinctFlatBlock, "distinctFlatBlock is null");
+        this.keyHashBlock = requireNonNull(keyHashBlock, "keyHashBlock is null");
+
+        capacity = INITIAL_CAPACITY;
+        maxFill = calculateMaxFill(capacity);
+        mask = capacity - 1;
+        control = new byte[capacity + VECTOR_LENGTH];
+
+        groupRecordIndex = grouped ? new int[0] : null;
+
+        boolean variableWidth = keyType.isFlatVariableWidth() || valueType.isFlatVariableWidth();
+        variableWidthData = variableWidth ? new VariableWidthData() : null;
+        if (grouped) {
+            recordGroupIdOffset = (variableWidth ? POINTER_SIZE : 0);
+            recordNextIndexOffset = recordGroupIdOffset + Integer.BYTES;
+            recordKeyOffset = recordNextIndexOffset + Integer.BYTES;
+        }
+        else {
+            // use MIN_VALUE so that when it is added to the record offset we get a negative value, and thus an ArrayIndexOutOfBoundsException
+            recordGroupIdOffset = Integer.MIN_VALUE;
+            recordNextIndexOffset = Integer.MIN_VALUE;
+            recordKeyOffset = (variableWidth ? POINTER_SIZE : 0);
+        }
+        recordKeyIdOffset = recordKeyOffset + keyType.getFlatFixedSize();
+        recordSize = recordKeyIdOffset + Integer.BYTES;
+        recordGroups = createRecordGroups(capacity, recordSize);
+
+        valueArrayBuilder = new FlatArrayBuilder(valueType, valueReadFlat, valueWriteFlat, true);
+    }
+
+    public AbstractMultimapAggregationState(AbstractMultimapAggregationState state)
+    {
+        this.keyType = state.keyType;
+        this.keyReadFlat = state.keyReadFlat;
+        this.keyWriteFlat = state.keyWriteFlat;
+        this.keyHashFlat = state.keyHashFlat;
+        this.keyDistinctFlatBlock = state.keyDistinctFlatBlock;
+        this.keyHashBlock = state.keyHashBlock;
+
+        this.recordSize = state.recordSize;
+        this.recordGroupIdOffset = state.recordGroupIdOffset;
+        this.recordNextIndexOffset = state.recordNextIndexOffset;
+        this.recordKeyOffset = state.recordKeyOffset;
+        this.recordKeyIdOffset = state.recordKeyIdOffset;
+
+        this.nextKeyId = state.nextKeyId;
+
+        this.valueArrayBuilder = state.valueArrayBuilder.copy();
+        this.keyHeadPositions = Arrays.copyOf(state.keyHeadPositions, state.keyHeadPositions.length);
+        this.keyTailPositions = Arrays.copyOf(state.keyTailPositions, state.keyTailPositions.length);
+
+        this.capacity = state.capacity;
+        this.mask = state.mask;
+        this.control = Arrays.copyOf(state.control, state.control.length);
+
+        this.recordGroups = Arrays.stream(state.recordGroups)
+                .map(records -> Arrays.copyOf(records, records.length))
+                .toArray(byte[][]::new);
+        this.variableWidthData = state.variableWidthData == null ? null : new VariableWidthData(state.variableWidthData);
+        this.groupRecordIndex = state.groupRecordIndex == null ? null : Arrays.copyOf(state.groupRecordIndex, state.groupRecordIndex.length);
+
+        this.size = state.size;
+        this.maxFill = state.maxFill;
+    }
+
+    private static byte[][] createRecordGroups(int capacity, int recordSize)
+    {
+        if (capacity < RECORDS_PER_GROUP) {
+            return new byte[][]{new byte[multiplyExact(capacity, recordSize)]};
+        }
+
+        byte[][] groups = new byte[(capacity + 1) >> RECORDS_PER_GROUP_SHIFT][];
+        for (int i = 0; i < groups.length; i++) {
+            groups[i] = new byte[multiplyExact(RECORDS_PER_GROUP, recordSize)];
+        }
+        return groups;
+    }
+
+    @Override
+    public long getEstimatedSize()
+    {
+        return INSTANCE_SIZE +
+                sizeOf(control) +
+                (sizeOf(recordGroups[0]) * recordGroups.length) +
+                (variableWidthData == null ? 0 : variableWidthData.getRetainedSizeBytes()) +
+                (groupRecordIndex == null ? 0 : sizeOf(groupRecordIndex));
+    }
+
+    public void setMaxGroupId(int maxGroupId)
+    {
+        checkState(groupRecordIndex != null, "grouping is not enabled");
+
+        int requiredSize = maxGroupId + 1;
+        checkIndex(requiredSize, MAX_ARRAY_SIZE);
+
+        int currentSize = groupRecordIndex.length;
+        if (requiredSize > currentSize) {
+            groupRecordIndex = Arrays.copyOf(groupRecordIndex, Ints.constrainToRange(requiredSize * 2, 1024, MAX_ARRAY_SIZE));
+            Arrays.fill(groupRecordIndex, currentSize, groupRecordIndex.length, -1);
+        }
+    }
+
+    protected void serialize(int groupId, MapBlockBuilder out)
+    {
+        if (size == 0) {
+            out.appendNull();
+            return;
+        }
+
+        if (groupRecordIndex == null) {
+            checkArgument(groupId == 0, "groupId must be zero when grouping is not enabled");
+
+            // if not grouped, serialize the entire histogram
+            out.buildEntry((keyBuilder, valueBuilder) -> {
+                for (int i = 0; i < capacity; i++) {
+                    if (control[i] != 0) {
+                        byte[] records = getRecords(i);
+                        int recordOffset = getRecordOffset(i);
+                        serializeEntry(keyBuilder, (ArrayBlockBuilder) valueBuilder, records, recordOffset);
+                    }
+                }
+            });
+            return;
+        }
+
+        int index = groupRecordIndex[groupId];
+        if (index == -1) {
+            out.appendNull();
+            return;
+        }
+
+        // follow the linked list of records for this group
+        out.buildEntry((keyBuilder, valueBuilder) -> {
+            int nextIndex = index;
+            while (nextIndex >= 0) {
+                byte[] records = getRecords(nextIndex);
+                int recordOffset = getRecordOffset(nextIndex);
+
+                serializeEntry(keyBuilder, (ArrayBlockBuilder) valueBuilder, records, recordOffset);
+
+                nextIndex = (int) INT_HANDLE.get(records, recordOffset + recordNextIndexOffset);
+            }
+        });
+    }
+
+    private void serializeEntry(BlockBuilder keyBuilder, ArrayBlockBuilder valueBuilder, byte[] records, int recordOffset)
+    {
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            variableWidthChunk = variableWidthData.getChunk(records, recordOffset);
+        }
+
+        try {
+            keyReadFlat.invokeExact(records, recordOffset + recordKeyOffset, variableWidthChunk, keyBuilder);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+
+        int keyId = (int) INT_HANDLE.get(records, recordOffset + recordKeyIdOffset);
+
+        valueBuilder.buildEntry(elementBuilder -> {
+            long nextIndex = keyHeadPositions[keyId];
+            checkArgument(nextIndex != -1, "Key is empty");
+            while (nextIndex != -1) {
+                nextIndex = valueArrayBuilder.write(nextIndex, elementBuilder);
+            }
+        });
+    }
+
+    protected void deserialize(int groupId, SqlMap serializedState)
+    {
+        int rawOffset = serializedState.getRawOffset();
+        Block rawKeyBlock = serializedState.getRawKeyBlock();
+        Block rawValueBlock = serializedState.getRawValueBlock();
+
+        ValueBlock rawKeyValues = rawKeyBlock.getUnderlyingValueBlock();
+        ArrayType arrayType = new ArrayType(valueArrayBuilder.type());
+        for (int i = 0; i < serializedState.getSize(); i++) {
+            int keyId = putKeyIfAbsent(groupId, rawKeyValues, rawKeyBlock.getUnderlyingValuePosition(rawOffset + i));
+            Block array = arrayType.getObject(rawValueBlock, rawOffset + i);
+            verify(array.getPositionCount() > 0, "array is empty");
+            ValueBlock arrayValuesBlock = array.getUnderlyingValueBlock();
+            for (int arrayIndex = 0; arrayIndex < array.getPositionCount(); arrayIndex++) {
+                addKeyValue(keyId, arrayValuesBlock, array.getUnderlyingValuePosition(arrayIndex));
+            }
+        }
+    }
+
+    protected void add(int groupId, ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition)
+    {
+        int keyId = putKeyIfAbsent(groupId, keyBlock, keyPosition);
+        addKeyValue(keyId, valueBlock, valuePosition);
+    }
+
+    private int putKeyIfAbsent(int groupId, ValueBlock keyBlock, int keyPosition)
+    {
+        checkArgument(!keyBlock.isNull(keyPosition), "key must not be null");
+        checkArgument(groupId == 0 || groupRecordIndex != null, "groupId must be zero when grouping is not enabled");
+
+        long hash = keyHashCode(groupId, keyBlock, keyPosition);
+
+        byte hashPrefix = (byte) (hash & 0x7F | 0x80);
+        int bucket = bucket((int) (hash >> 7));
+
+        int step = 1;
+        long repeated = repeat(hashPrefix);
+
+        while (true) {
+            final long controlVector = (long) LONG_HANDLE.get(control, bucket);
+
+            int matchBucket = matchInVector(groupId, keyBlock, keyPosition, bucket, repeated, controlVector);
+            if (matchBucket >= 0) {
+                byte[] records = getRecords(matchBucket);
+                int recordOffset = getRecordOffset(matchBucket);
+                int keyId = (int) INT_HANDLE.get(records, recordOffset + recordKeyIdOffset);
+                return keyId;
+            }
+
+            int emptyIndex = findEmptyInVector(controlVector, bucket);
+            if (emptyIndex >= 0) {
+                int keyId = insert(emptyIndex, groupId, keyBlock, keyPosition, hashPrefix);
+                size++;
+
+                if (size >= maxFill) {
+                    rehash();
+                }
+                return keyId;
+            }
+
+            bucket = bucket(bucket + step);
+            step += VECTOR_LENGTH;
+        }
+    }
+
+    private int matchInVector(int groupId, ValueBlock block, int position, int vectorStartBucket, long repeated, long controlVector)
+    {
+        long controlMatches = match(controlVector, repeated);
+        while (controlMatches != 0) {
+            int bucket = bucket(vectorStartBucket + (Long.numberOfTrailingZeros(controlMatches) >>> 3));
+            if (keyNotDistinctFrom(bucket, block, position, groupId)) {
+                return bucket;
+            }
+
+            controlMatches = controlMatches & (controlMatches - 1);
+        }
+        return -1;
+    }
+
+    private int findEmptyInVector(long vector, int vectorStartBucket)
+    {
+        long controlMatches = match(vector, 0x00_00_00_00_00_00_00_00L);
+        if (controlMatches == 0) {
+            return -1;
+        }
+        int slot = Long.numberOfTrailingZeros(controlMatches) >>> 3;
+        return bucket(vectorStartBucket + slot);
+    }
+
+    private int insert(int keyIndex, int groupId, ValueBlock keyBlock, int keyPosition, byte hashPrefix)
+    {
+        setControl(keyIndex, hashPrefix);
+
+        byte[] records = getRecords(keyIndex);
+        int recordOffset = getRecordOffset(keyIndex);
+
+        if (groupRecordIndex != null) {
+            // write groupId
+            INT_HANDLE.set(records, recordOffset + recordGroupIdOffset, groupId);
+
+            // update linked list pointers
+            int nextRecordIndex = groupRecordIndex[groupId];
+            groupRecordIndex[groupId] = keyIndex;
+            INT_HANDLE.set(records, recordOffset + recordNextIndexOffset, nextRecordIndex);
+        }
+
+        byte[] variableWidthChunk = EMPTY_CHUNK;
+        int variableWidthChunkOffset = 0;
+        if (variableWidthData != null) {
+            int keyVariableWidthSize = keyType.getFlatVariableWidthSize(keyBlock, keyPosition);
+            variableWidthChunk = variableWidthData.allocate(records, recordOffset, keyVariableWidthSize);
+            variableWidthChunkOffset = VariableWidthData.getChunkOffset(records, recordOffset);
+        }
+
+        try {
+            keyWriteFlat.invokeExact(keyBlock, keyPosition, records, recordOffset + recordKeyOffset, variableWidthChunk, variableWidthChunkOffset);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+
+        if (nextKeyId >= keyHeadPositions.length) {
+            int newSize = Ints.constrainToRange(nextKeyId * 2, 1024, MAX_ARRAY_SIZE);
+            int oldSize = keyHeadPositions.length;
+
+            keyHeadPositions = Arrays.copyOf(keyHeadPositions, newSize);
+            Arrays.fill(keyHeadPositions, oldSize, newSize, -1);
+
+            keyTailPositions = Arrays.copyOf(keyTailPositions, newSize);
+            Arrays.fill(keyTailPositions, oldSize, newSize, -1);
+        }
+
+        int keyId = nextKeyId;
+        nextKeyId = Math.incrementExact(nextKeyId);
+        INT_HANDLE.set(records, recordOffset + recordKeyIdOffset, keyId);
+        return keyId;
+    }
+
+    private void addKeyValue(int keyId, ValueBlock valueBlock, int valuePosition)
+    {
+        long index = valueArrayBuilder.size();
+        if (keyTailPositions[keyId] == -1) {
+            keyHeadPositions[keyId] = index;
+        }
+        else {
+            valueArrayBuilder.setNextIndex(keyTailPositions[keyId], index);
+        }
+        keyTailPositions[keyId] = index;
+        valueArrayBuilder.add(valueBlock, valuePosition);
+    }
+
+    private void setControl(int index, byte hashPrefix)
+    {
+        control[index] = hashPrefix;
+        if (index < VECTOR_LENGTH) {
+            control[index + capacity] = hashPrefix;
+        }
+    }
+
+    private void rehash()
+    {
+        int oldCapacity = capacity;
+        byte[] oldControl = control;
+        byte[][] oldRecordGroups = recordGroups;
+
+        long newCapacityLong = capacity * 2L;
+        if (newCapacityLong > MAX_ARRAY_SIZE) {
+            throw new TrinoException(GENERIC_INSUFFICIENT_RESOURCES, "Size of hash table cannot exceed 1 billion entries");
+        }
+
+        capacity = (int) newCapacityLong;
+        maxFill = calculateMaxFill(capacity);
+        mask = capacity - 1;
+
+        control = new byte[capacity + VECTOR_LENGTH];
+        recordGroups = createRecordGroups(capacity, recordSize);
+
+        if (groupRecordIndex != null) {
+            // reset the groupRecordIndex as it will be rebuilt during the rehash
+            Arrays.fill(groupRecordIndex, -1);
+        }
+
+        for (int oldIndex = 0; oldIndex < oldCapacity; oldIndex++) {
+            if (oldControl[oldIndex] != 0) {
+                byte[] oldRecords = oldRecordGroups[oldIndex >> RECORDS_PER_GROUP_SHIFT];
+                int oldRecordOffset = getRecordOffset(oldIndex);
+
+                int groupId = 0;
+                if (groupRecordIndex != null) {
+                    groupId = (int) INT_HANDLE.get(oldRecords, oldRecordOffset + recordGroupIdOffset);
+                }
+
+                long hash = keyHashCode(groupId, oldRecords, oldIndex);
+                byte hashPrefix = (byte) (hash & 0x7F | 0x80);
+                int bucket = bucket((int) (hash >> 7));
+
+                int step = 1;
+                while (true) {
+                    final long controlVector = (long) LONG_HANDLE.get(control, bucket);
+                    // values are already distinct, so just find the first empty slot
+                    int emptyIndex = findEmptyInVector(controlVector, bucket);
+                    if (emptyIndex >= 0) {
+                        setControl(emptyIndex, hashPrefix);
+
+                        // copy full record including groupId
+                        byte[] records = getRecords(emptyIndex);
+                        int recordOffset = getRecordOffset(emptyIndex);
+                        System.arraycopy(oldRecords, oldRecordOffset, records, recordOffset, recordSize);
+
+                        if (groupRecordIndex != null) {
+                            // update linked list pointer to reflect the positions in the new hash
+                            INT_HANDLE.set(records, recordOffset + recordNextIndexOffset, groupRecordIndex[groupId]);
+                            groupRecordIndex[groupId] = emptyIndex;
+                        }
+
+                        break;
+                    }
+
+                    bucket = bucket(bucket + step);
+                    step += VECTOR_LENGTH;
+                }
+            }
+        }
+    }
+
+    private int bucket(int hash)
+    {
+        return hash & mask;
+    }
+
+    private byte[] getRecords(int index)
+    {
+        return recordGroups[index >> RECORDS_PER_GROUP_SHIFT];
+    }
+
+    private int getRecordOffset(int index)
+    {
+        return (index & RECORDS_PER_GROUP_MASK) * recordSize;
+    }
+
+    private long keyHashCode(int groupId, byte[] records, int index)
+    {
+        int recordOffset = getRecordOffset(index);
+
+        try {
+            byte[] variableWidthChunk = EMPTY_CHUNK;
+            if (variableWidthData != null) {
+                variableWidthChunk = variableWidthData.getChunk(records, recordOffset);
+            }
+
+            long valueHash = (long) keyHashFlat.invokeExact(
+                    records,
+                    recordOffset + recordKeyOffset,
+                    variableWidthChunk);
+            return groupId * HASH_COMBINE_PRIME + valueHash;
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private long keyHashCode(int groupId, ValueBlock right, int rightPosition)
+    {
+        try {
+            long valueHash = (long) keyHashBlock.invokeExact(right, rightPosition);
+            return groupId * HASH_COMBINE_PRIME + valueHash;
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private boolean keyNotDistinctFrom(int leftPosition, ValueBlock right, int rightPosition, int rightGroupId)
+    {
+        byte[] leftRecords = getRecords(leftPosition);
+        int leftRecordOffset = getRecordOffset(leftPosition);
+
+        if (groupRecordIndex != null) {
+            long leftGroupId = (int) INT_HANDLE.get(leftRecords, leftRecordOffset + recordGroupIdOffset);
+            if (leftGroupId != rightGroupId) {
+                return false;
+            }
+        }
+
+        byte[] leftVariableWidthChunk = EMPTY_CHUNK;
+        if (variableWidthData != null) {
+            leftVariableWidthChunk = variableWidthData.getChunk(leftRecords, leftRecordOffset);
+        }
+
+        try {
+            return !(boolean) keyDistinctFlatBlock.invokeExact(
+                    leftRecords,
+                    leftRecordOffset + recordKeyOffset,
+                    leftVariableWidthChunk,
+                    right,
+                    rightPosition);
+        }
+        catch (Throwable throwable) {
+            Throwables.throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    private static long repeat(byte value)
+    {
+        return ((value & 0xFF) * 0x01_01_01_01_01_01_01_01L);
+    }
+
+    private static long match(long vector, long repeatedValue)
+    {
+        // HD 6-1
+        long comparison = vector ^ repeatedValue;
+        return (comparison - 0x01_01_01_01_01_01_01_01L) & ~comparison & 0x80_80_80_80_80_80_80_80L;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/GroupedMultimapAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/GroupedMultimapAggregationState.java
index 094731abdac3..3116bbcd16d8 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/GroupedMultimapAggregationState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/GroupedMultimapAggregationState.java
@@ -13,37 +13,74 @@
  */
 package io.trino.operator.aggregation.multimapagg;
 
-import com.google.common.collect.ImmutableList;
-import io.trino.operator.aggregation.AbstractGroupCollectionAggregationState;
-import io.trino.spi.PageBuilder;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.function.GroupedAccumulatorState;
 import io.trino.spi.type.Type;
 
+import java.lang.invoke.MethodHandle;
+
+import static java.lang.Math.toIntExact;
+
 public final class GroupedMultimapAggregationState
-        extends AbstractGroupCollectionAggregationState<MultimapAggregationStateConsumer>
-        implements MultimapAggregationState
+        extends AbstractMultimapAggregationState
+        implements GroupedAccumulatorState
 {
-    private static final int MAX_BLOCK_SIZE = 1024 * 1024;
-    static final int VALUE_CHANNEL = 0;
-    static final int KEY_CHANNEL = 1;
+    private int groupId;
+
+    public GroupedMultimapAggregationState(
+            Type keyType,
+            MethodHandle keyReadFlat,
+            MethodHandle keyWriteFlat,
+            MethodHandle hashFlat,
+            MethodHandle distinctFlatBlock,
+            MethodHandle keyHashBlock,
+            Type valueType,
+            MethodHandle valueReadFlat,
+            MethodHandle valueWriteFlat)
+    {
+        super(
+                keyType,
+                keyReadFlat,
+                keyWriteFlat,
+                hashFlat,
+                distinctFlatBlock,
+                keyHashBlock,
+                valueType,
+                valueReadFlat,
+                valueWriteFlat,
+                true);
+    }
+
+    @Override
+    public void setGroupId(long groupId)
+    {
+        this.groupId = toIntExact(groupId);
+    }
 
-    public GroupedMultimapAggregationState(Type keyType, Type valueType)
+    @Override
+    public void ensureCapacity(long size)
+    {
+        setMaxGroupId(toIntExact(size));
+    }
+
+    @Override
+    public void add(ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition)
     {
-        super(PageBuilder.withMaxPageSize(MAX_BLOCK_SIZE, ImmutableList.of(valueType, keyType)));
+        add(groupId, keyBlock, keyPosition, valueBlock, valuePosition);
     }
 
     @Override
-    public void add(Block keyBlock, Block valueBlock, int position)
+    public void merge(MultimapAggregationState other)
     {
-        prepareAdd();
-        appendAtChannel(VALUE_CHANNEL, valueBlock, position);
-        appendAtChannel(KEY_CHANNEL, keyBlock, position);
+        SqlMap serializedState = ((SingleMultimapAggregationState) other).removeTempSerializedState();
+        deserialize(groupId, serializedState);
     }
 
     @Override
-    protected boolean accept(MultimapAggregationStateConsumer consumer, PageBuilder pageBuilder, int currentPosition)
+    public void writeAll(MapBlockBuilder out)
     {
-        consumer.accept(pageBuilder.getBlockBuilder(KEY_CHANNEL), pageBuilder.getBlockBuilder(VALUE_CHANNEL), currentPosition);
-        return true;
+        serialize(groupId, out);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationFunction.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationFunction.java
index 986d03094142..374de6495cee 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationFunction.java
@@ -13,41 +13,25 @@
  */
 package io.trino.operator.aggregation.multimapagg;
 
-import io.trino.array.ObjectBigArray;
-import io.trino.operator.aggregation.NullablePosition;
-import io.trino.operator.aggregation.TypedSet;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
 import io.trino.spi.function.BlockPosition;
 import io.trino.spi.function.CombineFunction;
-import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.InputFunction;
-import io.trino.spi.function.OperatorDependency;
-import io.trino.spi.function.OperatorType;
 import io.trino.spi.function.OutputFunction;
+import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
-import io.trino.spi.type.ArrayType;
-import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
-import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
-
-import static io.trino.operator.aggregation.TypedSet.createDistinctTypedSet;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
-import static io.trino.type.TypeUtils.expectedValueSize;
 
 @AggregationFunction(value = "multimap_agg", isOrderSensitive = true)
 @Description("Aggregates all the rows (key/value pairs) into a single multimap")
 public final class MultimapAggregationFunction
 {
-    private static final int EXPECTED_ENTRY_SIZE = 100;
-
     private MultimapAggregationFunction() {}
 
     @InputFunction
@@ -55,11 +39,12 @@ private MultimapAggregationFunction() {}
     @TypeParameter("V")
     public static void input(
             @AggregationState({"K", "V"}) MultimapAggregationState state,
-            @BlockPosition @SqlType("K") Block key,
-            @NullablePosition @BlockPosition @SqlType("V") Block value,
-            @BlockIndex int position)
+            @BlockPosition @SqlType("K") ValueBlock key,
+            @BlockIndex int keyPosition,
+            @SqlNullable @BlockPosition @SqlType("V") ValueBlock value,
+            @BlockIndex int valuePosition)
     {
-        state.add(key, value, position);
+        state.add(key, keyPosition, value, valuePosition);
     }
 
     @CombineFunction
@@ -71,50 +56,8 @@ public static void combine(
     }
 
     @OutputFunction("map(K, array(V))")
-    public static void output(
-            @TypeParameter("K") Type keyType,
-            @OperatorDependency(
-                    operator = OperatorType.IS_DISTINCT_FROM,
-                    argumentTypes = {"K", "K"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = NULLABLE_RETURN))
-                    BlockPositionIsDistinctFrom keyDistinctFrom,
-            @OperatorDependency(
-                    operator = OperatorType.HASH_CODE,
-                    argumentTypes = "K",
-                    convention = @Convention(arguments = BLOCK_POSITION, result = FAIL_ON_NULL))
-                    BlockPositionHashCode keyHashCode,
-            @TypeParameter("V") Type valueType,
-            @AggregationState({"K", "V"}) MultimapAggregationState state,
-            BlockBuilder out)
+    public static void output(@AggregationState({"K", "V"}) MultimapAggregationState state, BlockBuilder out)
     {
-        if (state.isEmpty()) {
-            out.appendNull();
-        }
-        else {
-            // TODO: Avoid copy value block associated with the same key by using strategy similar to multimap_from_entries
-            ObjectBigArray<BlockBuilder> valueArrayBlockBuilders = new ObjectBigArray<>();
-            valueArrayBlockBuilders.ensureCapacity(state.getEntryCount());
-            BlockBuilder distinctKeyBlockBuilder = keyType.createBlockBuilder(null, state.getEntryCount(), expectedValueSize(keyType, 100));
-            TypedSet keySet = createDistinctTypedSet(keyType, keyDistinctFrom, keyHashCode, state.getEntryCount(), "multimap_agg");
-
-            state.forEach((key, value, keyValueIndex) -> {
-                // Merge values of the same key into an array
-                if (keySet.add(key, keyValueIndex)) {
-                    keyType.appendTo(key, keyValueIndex, distinctKeyBlockBuilder);
-                    BlockBuilder valueArrayBuilder = valueType.createBlockBuilder(null, 10, expectedValueSize(valueType, EXPECTED_ENTRY_SIZE));
-                    valueArrayBlockBuilders.set(keySet.positionOf(key, keyValueIndex), valueArrayBuilder);
-                }
-                valueType.appendTo(value, keyValueIndex, valueArrayBlockBuilders.get(keySet.positionOf(key, keyValueIndex)));
-            });
-
-            // Write keys and value arrays into one Block
-            Type valueArrayType = new ArrayType(valueType);
-            BlockBuilder multimapBlockBuilder = out.beginBlockEntry();
-            for (int i = 0; i < distinctKeyBlockBuilder.getPositionCount(); i++) {
-                keyType.appendTo(distinctKeyBlockBuilder, i, multimapBlockBuilder);
-                valueArrayType.writeObject(multimapBlockBuilder, valueArrayBlockBuilders.get(i).build());
-            }
-            out.closeEntry();
-        }
+        state.writeAll((MapBlockBuilder) out);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationState.java
index 97aeb9307962..87143c148ec3 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationState.java
@@ -13,7 +13,8 @@
  */
 package io.trino.operator.aggregation.multimapagg;
 
-import io.trino.spi.block.Block;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateMetadata;
 
@@ -21,25 +22,13 @@
         stateFactoryClass = MultimapAggregationStateFactory.class,
         stateSerializerClass = MultimapAggregationStateSerializer.class,
         typeParameters = {"K", "V"},
-        serializedType = "array(row(V, K))")
+        serializedType = "map(K, array(V))")
 public interface MultimapAggregationState
         extends AccumulatorState
 {
-    void add(Block keyBlock, Block valueBlock, int position);
+    void add(ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition);
 
-    void forEach(MultimapAggregationStateConsumer consumer);
+    void merge(MultimapAggregationState other);
 
-    default void merge(MultimapAggregationState otherState)
-    {
-        otherState.forEach(this::add);
-    }
-
-    boolean isEmpty();
-
-    default void reset()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    int getEntryCount();
+    void writeAll(MapBlockBuilder out);
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationStateConsumer.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationStateConsumer.java
deleted file mode 100644
index c7ec00216307..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationStateConsumer.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation.multimapagg;
-
-import io.trino.spi.block.Block;
-
-public interface MultimapAggregationStateConsumer
-{
-    void accept(Block keyBlock, Block valueBlock, int position);
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationStateFactory.java
index 8be1645f5ae3..a0682a133f0a 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationStateFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationStateFactory.java
@@ -14,32 +14,88 @@
 package io.trino.operator.aggregation.multimapagg;
 
 import io.trino.spi.function.AccumulatorStateFactory;
+import io.trino.spi.function.Convention;
+import io.trino.spi.function.OperatorDependency;
+import io.trino.spi.function.OperatorType;
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.Type;
 
+import java.lang.invoke.MethodHandle;
+
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static java.util.Objects.requireNonNull;
 
 public class MultimapAggregationStateFactory
         implements AccumulatorStateFactory<MultimapAggregationState>
 {
     private final Type keyType;
+    private final MethodHandle keyReadFlat;
+    private final MethodHandle keyWriteFlat;
+    private final MethodHandle keyHashFlat;
+    private final MethodHandle keyDistinctFlatBlock;
+    private final MethodHandle keyHashBlock;
+
     private final Type valueType;
+    private final MethodHandle valueReadFlat;
+    private final MethodHandle valueWriteFlat;
 
-    public MultimapAggregationStateFactory(@TypeParameter("K") Type keyType, @TypeParameter("V") Type valueType)
+    public MultimapAggregationStateFactory(
+            @TypeParameter("K") Type keyType,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "K",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER)) MethodHandle keyReadFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "K",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN)) MethodHandle keyWriteFlat,
+            @OperatorDependency(
+                    operator = OperatorType.HASH_CODE,
+                    argumentTypes = "K",
+                    convention = @Convention(arguments = FLAT, result = FAIL_ON_NULL)) MethodHandle keyHashFlat,
+            @OperatorDependency(
+                    operator = OperatorType.IS_DISTINCT_FROM,
+                    argumentTypes = {"K", "K"},
+                    convention = @Convention(arguments = {FLAT, VALUE_BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL)) MethodHandle keyDistinctFlatBlock,
+            @OperatorDependency(
+                    operator = OperatorType.HASH_CODE,
+                    argumentTypes = "K",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FAIL_ON_NULL)) MethodHandle keyHashBlock,
+            @TypeParameter("V") Type valueType,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "V",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER)) MethodHandle valueReadFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "V",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN)) MethodHandle valueWriteFlat)
     {
-        this.keyType = requireNonNull(keyType);
-        this.valueType = requireNonNull(valueType);
+        this.keyType = requireNonNull(keyType, "keyType is null");
+        this.keyReadFlat = requireNonNull(keyReadFlat, "keyReadFlat is null");
+        this.keyWriteFlat = requireNonNull(keyWriteFlat, "keyWriteFlat is null");
+        this.keyHashFlat = requireNonNull(keyHashFlat, "keyHashFlat is null");
+        this.keyDistinctFlatBlock = requireNonNull(keyDistinctFlatBlock, "keyDistinctFlatBlock is null");
+        this.keyHashBlock = requireNonNull(keyHashBlock, "keyHashBlock is null");
+
+        this.valueType = requireNonNull(valueType, "valueType is null");
+        this.valueReadFlat = requireNonNull(valueReadFlat, "valueReadFlat is null");
+        this.valueWriteFlat = requireNonNull(valueWriteFlat, "valueWriteFlat is null");
     }
 
     @Override
     public MultimapAggregationState createSingleState()
     {
-        return new SingleMultimapAggregationState(keyType, valueType);
+        return new SingleMultimapAggregationState(keyType, keyReadFlat, keyWriteFlat, keyHashFlat, keyDistinctFlatBlock, keyHashBlock, valueType, valueReadFlat, valueWriteFlat);
     }
 
     @Override
     public MultimapAggregationState createGroupedState()
     {
-        return new GroupedMultimapAggregationState(keyType, valueType);
+        return new GroupedMultimapAggregationState(keyType, keyReadFlat, keyWriteFlat, keyHashFlat, keyDistinctFlatBlock, keyHashBlock, valueType, valueReadFlat, valueWriteFlat);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationStateSerializer.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationStateSerializer.java
index e3acd8549b8b..b5561e131930 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationStateSerializer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/MultimapAggregationStateSerializer.java
@@ -13,67 +13,41 @@
  */
 package io.trino.operator.aggregation.multimapagg;
 
-import com.google.common.collect.ImmutableList;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.ColumnarRow;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.AccumulatorStateSerializer;
 import io.trino.spi.function.TypeParameter;
-import io.trino.spi.type.ArrayType;
-import io.trino.spi.type.RowType;
+import io.trino.spi.type.MapType;
 import io.trino.spi.type.Type;
 
-import static io.trino.operator.aggregation.multimapagg.GroupedMultimapAggregationState.KEY_CHANNEL;
-import static io.trino.operator.aggregation.multimapagg.GroupedMultimapAggregationState.VALUE_CHANNEL;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
-import static java.util.Objects.requireNonNull;
-
 public class MultimapAggregationStateSerializer
         implements AccumulatorStateSerializer<MultimapAggregationState>
 {
-    private final Type keyType;
-    private final Type valueType;
-    private final ArrayType arrayType;
+    private final MapType serializedType;
 
-    public MultimapAggregationStateSerializer(@TypeParameter("K") Type keyType, @TypeParameter("V") Type valueType)
+    public MultimapAggregationStateSerializer(@TypeParameter("map(K, Array(V))") Type serializedType)
     {
-        this.keyType = requireNonNull(keyType);
-        this.valueType = requireNonNull(valueType);
-        this.arrayType = new ArrayType(RowType.anonymous(ImmutableList.of(valueType, keyType)));
+        this.serializedType = (MapType) serializedType;
     }
 
     @Override
     public Type getSerializedType()
     {
-        return arrayType;
+        return serializedType;
     }
 
     @Override
     public void serialize(MultimapAggregationState state, BlockBuilder out)
     {
-        if (state.isEmpty()) {
-            out.appendNull();
-            return;
-        }
-        BlockBuilder entryBuilder = out.beginBlockEntry();
-        state.forEach((keyBlock, valueBlock, position) -> {
-            BlockBuilder rowBlockBuilder = entryBuilder.beginBlockEntry();
-            valueType.appendTo(valueBlock, position, rowBlockBuilder);
-            keyType.appendTo(keyBlock, position, rowBlockBuilder);
-            entryBuilder.closeEntry();
-        });
-        out.closeEntry();
+        state.writeAll((MapBlockBuilder) out);
     }
 
     @Override
     public void deserialize(Block block, int index, MultimapAggregationState state)
     {
-        state.reset();
-        ColumnarRow columnarRow = toColumnarRow(arrayType.getObject(block, index));
-        Block keys = columnarRow.getField(KEY_CHANNEL);
-        Block values = columnarRow.getField(VALUE_CHANNEL);
-        for (int i = 0; i < columnarRow.getPositionCount(); i++) {
-            state.add(keys, values, i);
-        }
+        SqlMap sqlMap = serializedType.getObject(block, index);
+        ((SingleMultimapAggregationState) state).setTempSerializedState(sqlMap);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/SingleMultimapAggregationState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/SingleMultimapAggregationState.java
index ed9f78202824..65fa48b81eb1 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/SingleMultimapAggregationState.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/multimapagg/SingleMultimapAggregationState.java
@@ -13,89 +13,88 @@
  */
 package io.trino.operator.aggregation.multimapagg;
 
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.type.Type;
 
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.operator.aggregation.BlockBuilderCopier.copyBlockBuilder;
-import static io.trino.type.TypeUtils.expectedValueSize;
-import static java.util.Objects.requireNonNull;
+import java.lang.invoke.MethodHandle;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 
 public class SingleMultimapAggregationState
-        implements MultimapAggregationState
+        extends AbstractMultimapAggregationState
 {
-    private static final int INSTANCE_SIZE = instanceSize(SingleMultimapAggregationState.class);
-    private static final int EXPECTED_ENTRIES = 10;
-    private static final int EXPECTED_ENTRY_SIZE = 16;
-    private final Type keyType;
-    private final Type valueType;
-    private BlockBuilder keyBlockBuilder;
-    private BlockBuilder valueBlockBuilder;
+    private SqlMap tempSerializedState;
 
-    public SingleMultimapAggregationState(Type keyType, Type valueType)
+    public SingleMultimapAggregationState(
+            Type keyType,
+            MethodHandle keyReadFlat,
+            MethodHandle keyWriteFlat,
+            MethodHandle hashFlat,
+            MethodHandle distinctFlatBlock,
+            MethodHandle keyHashBlock,
+            Type valueType,
+            MethodHandle valueReadFlat,
+            MethodHandle valueWriteFlat)
     {
-        this.keyType = requireNonNull(keyType);
-        this.valueType = requireNonNull(valueType);
-        keyBlockBuilder = keyType.createBlockBuilder(null, EXPECTED_ENTRIES, expectedValueSize(keyType, EXPECTED_ENTRY_SIZE));
-        valueBlockBuilder = valueType.createBlockBuilder(null, EXPECTED_ENTRIES, expectedValueSize(valueType, EXPECTED_ENTRY_SIZE));
+        super(
+                keyType,
+                keyReadFlat,
+                keyWriteFlat,
+                hashFlat,
+                distinctFlatBlock,
+                keyHashBlock,
+                valueType,
+                valueReadFlat,
+                valueWriteFlat,
+                false);
     }
 
-    // for copying
-    private SingleMultimapAggregationState(Type keyType, Type valueType, BlockBuilder keyBlockBuilder, BlockBuilder valueBlockBuilder)
-    {
-        this.keyType = keyType;
-        this.valueType = valueType;
-        this.keyBlockBuilder = keyBlockBuilder;
-        this.valueBlockBuilder = valueBlockBuilder;
-    }
-
-    @Override
-    public void add(Block key, Block value, int position)
+    private SingleMultimapAggregationState(SingleMultimapAggregationState state)
     {
-        keyType.appendTo(key, position, keyBlockBuilder);
-        valueType.appendTo(value, position, valueBlockBuilder);
+        super(state);
+        checkArgument(state.tempSerializedState == null, "state.tempSerializedState is not null");
+        tempSerializedState = null;
     }
 
     @Override
-    public void forEach(MultimapAggregationStateConsumer consumer)
+    public void add(ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition)
     {
-        for (int i = 0; i < keyBlockBuilder.getPositionCount(); i++) {
-            consumer.accept(keyBlockBuilder, valueBlockBuilder, i);
-        }
+        add(0, keyBlock, keyPosition, valueBlock, valuePosition);
     }
 
     @Override
-    public boolean isEmpty()
+    public void merge(MultimapAggregationState other)
     {
-        return keyBlockBuilder.getPositionCount() == 0;
+        SqlMap serializedState = ((SingleMultimapAggregationState) other).removeTempSerializedState();
+        deserialize(0, serializedState);
     }
 
     @Override
-    public int getEntryCount()
+    public void writeAll(MapBlockBuilder out)
     {
-        return keyBlockBuilder.getPositionCount();
+        serialize(0, out);
     }
 
     @Override
-    public long getEstimatedSize()
+    public AccumulatorState copy()
     {
-        return INSTANCE_SIZE + keyBlockBuilder.getRetainedSizeInBytes() + valueBlockBuilder.getRetainedSizeInBytes();
+        return new SingleMultimapAggregationState(this);
     }
 
-    @Override
-    public void reset()
+    void setTempSerializedState(SqlMap tempSerializedState)
     {
-        // Single aggregation state is used as scratch state in group accumulator.
-        // Thus reset() will be called for each group (via MultimapAggregationStateSerializer#deserialize)
-        keyBlockBuilder = keyBlockBuilder.newBlockBuilderLike(null);
-        valueBlockBuilder = valueBlockBuilder.newBlockBuilderLike(null);
+        this.tempSerializedState = tempSerializedState;
     }
 
-    @Override
-    public AccumulatorState copy()
+    SqlMap removeTempSerializedState()
     {
-        return new SingleMultimapAggregationState(keyType, valueType, copyBlockBuilder(keyType, keyBlockBuilder), copyBlockBuilder(valueType, valueBlockBuilder));
+        SqlMap sqlMap = tempSerializedState;
+        checkState(sqlMap != null, "tempDeserializeBlock is null");
+        tempSerializedState = null;
+        return sqlMap;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/partial/PartialAggregationController.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/partial/PartialAggregationController.java
index 4408111feabb..b5ad7e1ccc75 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/partial/PartialAggregationController.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/partial/PartialAggregationController.java
@@ -13,14 +13,18 @@
  */
 package io.trino.operator.aggregation.partial;
 
+import io.airlift.units.DataSize;
 import io.trino.operator.HashAggregationOperator;
 
+import java.util.OptionalLong;
+
+import static java.util.Objects.requireNonNull;
+
 /**
  * Controls whenever partial aggregation is enabled across all {@link HashAggregationOperator}s
  * for a particular plan node on a single node.
- * Partial aggregation is disabled once enough rows has been processed ({@link #minNumberOfRowsProcessed})
+ * Partial aggregation is disabled after sampling sufficient amount of input
  * and the ratio between output(unique) and input rows is too high (> {@link #uniqueRowsRatioThreshold}).
- * TODO https://github.com/trinodb/trino/issues/11361 add support to adaptively re-enable partial aggregation.
  * <p>
  * The class is thread safe and objects of this class are used potentially by multiple threads/drivers simultaneously.
  * Different threads either:
@@ -29,16 +33,27 @@
  */
 public class PartialAggregationController
 {
-    private final long minNumberOfRowsProcessed;
+    /**
+     * Process enough pages to fill up partial-aggregation buffer before
+     * considering partial-aggregation to be turned off.
+     */
+    private static final double DISABLE_AGGREGATION_BUFFER_SIZE_TO_INPUT_BYTES_FACTOR = 1.5;
+    /**
+     * Re-enable partial aggregation periodically in case aggregation efficiency improved.
+     */
+    private static final double ENABLE_AGGREGATION_BUFFER_SIZE_TO_INPUT_BYTES_FACTOR = DISABLE_AGGREGATION_BUFFER_SIZE_TO_INPUT_BYTES_FACTOR * 200;
+
+    private final DataSize maxPartialMemory;
     private final double uniqueRowsRatioThreshold;
 
     private volatile boolean partialAggregationDisabled;
+    private long totalBytesProcessed;
     private long totalRowProcessed;
     private long totalUniqueRowsProduced;
 
-    public PartialAggregationController(long minNumberOfRowsProcessedToDisable, double uniqueRowsRatioThreshold)
+    public PartialAggregationController(DataSize maxPartialMemory, double uniqueRowsRatioThreshold)
     {
-        this.minNumberOfRowsProcessed = minNumberOfRowsProcessedToDisable;
+        this.maxPartialMemory = requireNonNull(maxPartialMemory, "maxPartialMemory is null");
         this.uniqueRowsRatioThreshold = uniqueRowsRatioThreshold;
     }
 
@@ -47,27 +62,38 @@ public boolean isPartialAggregationDisabled()
         return partialAggregationDisabled;
     }
 
-    public synchronized void onFlush(long rowsProcessed, long uniqueRowsProduced)
+    public synchronized void onFlush(long bytesProcessed, long rowsProcessed, OptionalLong uniqueRowsProduced)
     {
-        if (partialAggregationDisabled) {
+        if (!partialAggregationDisabled && uniqueRowsProduced.isEmpty()) {
+            // when PA is re-enabled, ignore stats from disabled flushes
             return;
         }
 
+        totalBytesProcessed += bytesProcessed;
         totalRowProcessed += rowsProcessed;
-        totalUniqueRowsProduced += uniqueRowsProduced;
-        if (shouldDisablePartialAggregation()) {
+        uniqueRowsProduced.ifPresent(value -> totalUniqueRowsProduced += value);
+
+        if (!partialAggregationDisabled && shouldDisablePartialAggregation()) {
             partialAggregationDisabled = true;
         }
+
+        if (partialAggregationDisabled
+                && totalBytesProcessed >= maxPartialMemory.toBytes() * ENABLE_AGGREGATION_BUFFER_SIZE_TO_INPUT_BYTES_FACTOR) {
+            totalBytesProcessed = 0;
+            totalRowProcessed = 0;
+            totalUniqueRowsProduced = 0;
+            partialAggregationDisabled = false;
+        }
     }
 
     private boolean shouldDisablePartialAggregation()
     {
-        return totalRowProcessed >= minNumberOfRowsProcessed
+        return totalBytesProcessed >= maxPartialMemory.toBytes() * DISABLE_AGGREGATION_BUFFER_SIZE_TO_INPUT_BYTES_FACTOR
                 && ((double) totalUniqueRowsProduced / totalRowProcessed) > uniqueRowsRatioThreshold;
     }
 
     public PartialAggregationController duplicate()
     {
-        return new PartialAggregationController(minNumberOfRowsProcessed, uniqueRowsRatioThreshold);
+        return new PartialAggregationController(maxPartialMemory, uniqueRowsRatioThreshold);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/partial/SkipAggregationBuilder.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/partial/SkipAggregationBuilder.java
index ae832c585dc9..39df5791c114 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/partial/SkipAggregationBuilder.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/partial/SkipAggregationBuilder.java
@@ -16,7 +16,6 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.operator.CompletedWork;
-import io.trino.operator.GroupByIdBlock;
 import io.trino.operator.Work;
 import io.trino.operator.WorkProcessor;
 import io.trino.operator.aggregation.AggregatorFactory;
@@ -25,9 +24,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.LongArrayBlock;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Optional;
@@ -129,17 +126,14 @@ private Page buildOutputPage(Page page)
 
     private void populateInitialAccumulatorState(Page page)
     {
-        GroupByIdBlock groupByIdBlock = getGroupByIdBlock(page.getPositionCount());
-        for (GroupedAggregator groupedAggregator : groupedAggregators) {
-            groupedAggregator.processPage(groupByIdBlock, page);
+        int[] groupIds = new int[page.getPositionCount()];
+        for (int position = 0; position < page.getPositionCount(); position++) {
+            groupIds[position] = position;
         }
-    }
 
-    private GroupByIdBlock getGroupByIdBlock(int positionCount)
-    {
-        return new GroupByIdBlock(
-                positionCount,
-                new LongArrayBlock(positionCount, Optional.empty(), consecutive(positionCount)));
+        for (GroupedAggregator groupedAggregator : groupedAggregators) {
+            groupedAggregator.processPage(page.getPositionCount(), groupIds, page);
+        }
     }
 
     private BlockBuilder[] serializeAccumulatorState(int positionCount)
@@ -170,13 +164,4 @@ private Page constructOutputPage(Page page, BlockBuilder[] outputBuilders)
         }
         return new Page(page.getPositionCount(), outputBlocks);
     }
-
-    private static long[] consecutive(int positionCount)
-    {
-        long[] longs = new long[positionCount];
-        for (int i = 0; i < positionCount; i++) {
-            longs[i] = i;
-        }
-        return longs;
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/KeyValuePairStateSerializer.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/KeyValuePairStateSerializer.java
deleted file mode 100644
index 91c1ea0c57a5..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/KeyValuePairStateSerializer.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation.state;
-
-import io.trino.operator.aggregation.KeyValuePairs;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.function.AccumulatorStateSerializer;
-import io.trino.spi.function.Convention;
-import io.trino.spi.function.OperatorDependency;
-import io.trino.spi.function.OperatorType;
-import io.trino.spi.function.TypeParameter;
-import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
-
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
-import static java.util.Objects.requireNonNull;
-
-public class KeyValuePairStateSerializer
-        implements AccumulatorStateSerializer<KeyValuePairsState>
-{
-    private final Type mapType;
-    private final BlockPositionEqual keyEqual;
-    private final BlockPositionHashCode keyHashCode;
-
-    public KeyValuePairStateSerializer(
-            @TypeParameter("MAP(K, V)") Type mapType,
-            @OperatorDependency(
-                    operator = OperatorType.EQUAL,
-                    argumentTypes = {"K", "K"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = NULLABLE_RETURN))
-                    BlockPositionEqual keyEqual,
-            @OperatorDependency(
-                    operator = OperatorType.HASH_CODE,
-                    argumentTypes = "K",
-                    convention = @Convention(arguments = BLOCK_POSITION, result = FAIL_ON_NULL))
-                    BlockPositionHashCode keyHashCode)
-    {
-        this.mapType = requireNonNull(mapType, "mapType is null");
-        this.keyEqual = requireNonNull(keyEqual, "keyEqual is null");
-        this.keyHashCode = requireNonNull(keyHashCode, "keyHashCode is null");
-    }
-
-    @Override
-    public Type getSerializedType()
-    {
-        return mapType;
-    }
-
-    @Override
-    public void serialize(KeyValuePairsState state, BlockBuilder out)
-    {
-        if (state.get() == null) {
-            out.appendNull();
-        }
-        else {
-            state.get().serialize(out);
-        }
-    }
-
-    @Override
-    public void deserialize(Block block, int index, KeyValuePairsState state)
-    {
-        state.set(new KeyValuePairs((Block) mapType.getObject(block, index), state.getKeyType(), keyEqual, keyHashCode, state.getValueType()));
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/KeyValuePairsState.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/KeyValuePairsState.java
deleted file mode 100644
index 3eca35be5de5..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/KeyValuePairsState.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation.state;
-
-import io.trino.operator.aggregation.KeyValuePairs;
-import io.trino.spi.function.AccumulatorState;
-import io.trino.spi.function.AccumulatorStateMetadata;
-import io.trino.spi.type.Type;
-
-@AccumulatorStateMetadata(
-        stateFactoryClass = KeyValuePairsStateFactory.class,
-        stateSerializerClass = KeyValuePairStateSerializer.class,
-        typeParameters = {"K", "V"},
-        serializedType = "MAP(K, V)")
-public interface KeyValuePairsState
-        extends AccumulatorState
-{
-    KeyValuePairs get();
-
-    void set(KeyValuePairs value);
-
-    void addMemoryUsage(long memory);
-
-    Type getKeyType();
-
-    Type getValueType();
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/KeyValuePairsStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/KeyValuePairsStateFactory.java
deleted file mode 100644
index 2890f896350a..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/KeyValuePairsStateFactory.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation.state;
-
-import io.trino.array.ObjectBigArray;
-import io.trino.operator.aggregation.KeyValuePairs;
-import io.trino.spi.function.AccumulatorState;
-import io.trino.spi.function.AccumulatorStateFactory;
-import io.trino.spi.function.TypeParameter;
-import io.trino.spi.type.Type;
-
-import static io.airlift.slice.SizeOf.instanceSize;
-import static java.util.Objects.requireNonNull;
-
-public class KeyValuePairsStateFactory
-        implements AccumulatorStateFactory<KeyValuePairsState>
-{
-    private final Type keyType;
-    private final Type valueType;
-
-    public KeyValuePairsStateFactory(@TypeParameter("K") Type keyType, @TypeParameter("V") Type valueType)
-    {
-        this.keyType = keyType;
-        this.valueType = valueType;
-    }
-
-    @Override
-    public KeyValuePairsState createSingleState()
-    {
-        return new SingleState(keyType, valueType);
-    }
-
-    @Override
-    public KeyValuePairsState createGroupedState()
-    {
-        return new GroupedState(keyType, valueType);
-    }
-
-    public static class GroupedState
-            extends AbstractGroupedAccumulatorState
-            implements KeyValuePairsState
-    {
-        private static final int INSTANCE_SIZE = instanceSize(GroupedState.class);
-        private final Type keyType;
-        private final Type valueType;
-        private final ObjectBigArray<KeyValuePairs> pairs = new ObjectBigArray<>();
-        private long size;
-
-        public GroupedState(Type keyType, Type valueType)
-        {
-            this.keyType = keyType;
-            this.valueType = valueType;
-        }
-
-        @Override
-        public void ensureCapacity(long size)
-        {
-            pairs.ensureCapacity(size);
-        }
-
-        @Override
-        public KeyValuePairs get()
-        {
-            return pairs.get(getGroupId());
-        }
-
-        @Override
-        public void set(KeyValuePairs value)
-        {
-            requireNonNull(value, "value is null");
-
-            KeyValuePairs previous = get();
-            if (previous != null) {
-                size -= previous.estimatedInMemorySize();
-            }
-
-            pairs.set(getGroupId(), value);
-            size += value.estimatedInMemorySize();
-        }
-
-        @Override
-        public void addMemoryUsage(long memory)
-        {
-            size += memory;
-        }
-
-        @Override
-        public Type getKeyType()
-        {
-            return keyType;
-        }
-
-        @Override
-        public Type getValueType()
-        {
-            return valueType;
-        }
-
-        @Override
-        public long getEstimatedSize()
-        {
-            return INSTANCE_SIZE + size + pairs.sizeOf();
-        }
-    }
-
-    public static class SingleState
-            implements KeyValuePairsState
-    {
-        private static final int INSTANCE_SIZE = instanceSize(SingleState.class);
-        private final Type keyType;
-        private final Type valueType;
-        private KeyValuePairs pair;
-
-        public SingleState(Type keyType, Type valueType)
-        {
-            this.keyType = keyType;
-            this.valueType = valueType;
-        }
-
-        // for copying
-        private SingleState(Type keyType, Type valueType, KeyValuePairs pair)
-        {
-            this.keyType = keyType;
-            this.valueType = valueType;
-            this.pair = pair;
-        }
-
-        @Override
-        public KeyValuePairs get()
-        {
-            return pair;
-        }
-
-        @Override
-        public void set(KeyValuePairs value)
-        {
-            pair = value;
-        }
-
-        @Override
-        public void addMemoryUsage(long memory)
-        {
-        }
-
-        @Override
-        public Type getKeyType()
-        {
-            return keyType;
-        }
-
-        @Override
-        public Type getValueType()
-        {
-            return valueType;
-        }
-
-        @Override
-        public long getEstimatedSize()
-        {
-            long estimatedSize = INSTANCE_SIZE;
-            if (pair != null) {
-                estimatedSize += pair.estimatedInMemorySize();
-            }
-            return estimatedSize;
-        }
-
-        @Override
-        public AccumulatorState copy()
-        {
-            KeyValuePairs pairCopy = null;
-            if (pair != null) {
-                pairCopy = pair.copy();
-            }
-            return new SingleState(keyType, valueType, pairCopy);
-        }
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowAndLongStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowAndLongStateFactory.java
index ba59e22c72e5..a703717b2e8d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowAndLongStateFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowAndLongStateFactory.java
@@ -16,8 +16,7 @@
 import io.trino.array.LongBigArray;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateFactory;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
 import static io.airlift.slice.SizeOf.instanceSize;
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowAndLongStateSerializer.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowAndLongStateSerializer.java
index 2fb2579bed1d..323347457862 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowAndLongStateSerializer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowAndLongStateSerializer.java
@@ -39,17 +39,17 @@ public void serialize(LongDecimalWithOverflowAndLongState state, BlockBuilder ou
             long overflow = state.getOverflow();
             long[] decimal = state.getDecimalArray();
             int offset = state.getDecimalArrayOffset();
-            long[] buffer = new long[4];
+            Slice buffer = Slices.allocate(Long.BYTES * 4);
             long high = decimal[offset];
             long low = decimal[offset + 1];
 
-            buffer[0] = low;
-            buffer[1] = high;
+            buffer.setLong(0, low);
+            buffer.setLong(Long.BYTES, high);
             // if high = 0, the count will overwrite it
             int countOffset = 1 + (high == 0 ? 0 : 1);
             // append count, overflow
-            buffer[countOffset] = count;
-            buffer[countOffset + 1] = overflow;
+            buffer.setLong(Long.BYTES * countOffset, count);
+            buffer.setLong(Long.BYTES * (countOffset + 1), overflow);
 
             // cases
             // high == 0 (countOffset = 1)
@@ -59,7 +59,7 @@ public void serialize(LongDecimalWithOverflowAndLongState state, BlockBuilder ou
             //    overflow == 0 & count == 1  -> bufferLength = 2
             //    overflow != 0 || count != 1 -> bufferLength = 4
             int bufferLength = countOffset + ((overflow == 0 & count == 1) ? 0 : 2);
-            VARBINARY.writeSlice(out, Slices.wrappedLongArray(buffer, 0, bufferLength));
+            VARBINARY.writeSlice(out, buffer, 0, bufferLength * Long.BYTES);
         }
         else {
             out.appendNull();
@@ -70,27 +70,26 @@ public void serialize(LongDecimalWithOverflowAndLongState state, BlockBuilder ou
     public void deserialize(Block block, int index, LongDecimalWithOverflowAndLongState state)
     {
         if (!block.isNull(index)) {
-            Slice slice = VARBINARY.getSlice(block, index);
             long[] decimal = state.getDecimalArray();
             int offset = state.getDecimalArrayOffset();
 
-            int sliceLength = slice.length();
-            long low = slice.getLong(0);
+            int sliceLength = block.getSliceLength(index);
+            long low = block.getLong(index, 0);
             long high = 0;
             long overflow = 0;
             long count = 1;
 
             switch (sliceLength) {
                 case 4 * Long.BYTES:
-                    overflow = slice.getLong(Long.BYTES * 3);
-                    count = slice.getLong(Long.BYTES * 2);
+                    overflow = block.getLong(index, Long.BYTES * 3);
+                    count = block.getLong(index, Long.BYTES * 2);
                     // fall through
                 case 2 * Long.BYTES:
-                    high = slice.getLong(Long.BYTES);
+                    high = block.getLong(index, Long.BYTES);
                     break;
                 case 3 * Long.BYTES:
-                    overflow = slice.getLong(Long.BYTES * 2);
-                    count = slice.getLong(Long.BYTES);
+                    overflow = block.getLong(index, Long.BYTES * 2);
+                    count = block.getLong(index, Long.BYTES);
             }
 
             decimal[offset + 1] = low;
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowStateFactory.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowStateFactory.java
index 69b59e00caff..351bfd8ddeb0 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowStateFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowStateFactory.java
@@ -17,8 +17,7 @@
 import io.trino.array.LongBigArray;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateFactory;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static io.airlift.slice.SizeOf.SIZE_OF_BYTE;
 import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowStateSerializer.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowStateSerializer.java
index 5ddfb51324ad..c7c46a008392 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowStateSerializer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/LongDecimalWithOverflowStateSerializer.java
@@ -38,18 +38,18 @@ public void serialize(LongDecimalWithOverflowState state, BlockBuilder out)
             long overflow = state.getOverflow();
             long[] decimal = state.getDecimalArray();
             int offset = state.getDecimalArrayOffset();
-            long[] buffer = new long[3];
+            Slice buffer = Slices.allocate(Long.BYTES * 3);
             long low = decimal[offset + 1];
             long high = decimal[offset];
-            buffer[0] = low;
-            buffer[1] = high;
-            buffer[2] = overflow;
+            buffer.setLong(0, low);
+            buffer.setLong(Long.BYTES, high);
+            buffer.setLong(Long.BYTES * 2, overflow);
             // if high == 0 and overflow == 0 we only write low (bufferLength = 1)
             // if high != 0 and overflow == 0 we write both low and high (bufferLength = 2)
             // if overflow != 0 we write all values (bufferLength = 3)
             int decimalsCount = 1 + (high == 0 ? 0 : 1);
             int bufferLength = overflow == 0 ? decimalsCount : 3;
-            VARBINARY.writeSlice(out, Slices.wrappedLongArray(buffer, 0, bufferLength));
+            VARBINARY.writeSlice(out, buffer, 0, bufferLength * Long.BYTES);
         }
         else {
             out.appendNull();
@@ -60,21 +60,20 @@ public void serialize(LongDecimalWithOverflowState state, BlockBuilder out)
     public void deserialize(Block block, int index, LongDecimalWithOverflowState state)
     {
         if (!block.isNull(index)) {
-            Slice slice = VARBINARY.getSlice(block, index);
             long[] decimal = state.getDecimalArray();
             int offset = state.getDecimalArrayOffset();
 
-            long low = slice.getLong(0);
-            int sliceLength = slice.length();
+            long low = block.getLong(index, 0);
+            int sliceLength = block.getSliceLength(index);
             long high = 0;
             long overflow = 0;
 
             switch (sliceLength) {
                 case 3 * Long.BYTES:
-                    overflow = slice.getLong(Long.BYTES * 2);
+                    overflow = block.getLong(index, Long.BYTES * 2);
                     // fall through
                 case 2 * Long.BYTES:
-                    high = slice.getLong(Long.BYTES);
+                    high = block.getLong(index, Long.BYTES);
             }
 
             decimal[offset + 1] = low;
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/StateCompiler.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/StateCompiler.java
index 4a3efbbec031..578cc114cfda 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/StateCompiler.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/StateCompiler.java
@@ -38,8 +38,14 @@
 import io.trino.array.LongBigArray;
 import io.trino.array.ObjectBigArray;
 import io.trino.array.SliceBigArray;
+import io.trino.array.SqlMapBigArray;
+import io.trino.array.SqlRowBigArray;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.RowValueBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateFactory;
 import io.trino.spi.function.AccumulatorStateMetadata;
@@ -101,6 +107,7 @@
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
+import static io.trino.sql.gen.LambdaMetafactoryGenerator.generateMetafactory;
 import static io.trino.sql.gen.SqlTypeBytecodeExpression.constantType;
 import static io.trino.type.UnknownType.UNKNOWN;
 import static io.trino.util.CompilerUtils.defineClass;
@@ -135,6 +142,12 @@ private static Class<?> getBigArrayType(Class<?> type)
         if (type.equals(Block.class)) {
             return BlockBigArray.class;
         }
+        if (type.equals(SqlMap.class)) {
+            return SqlMapBigArray.class;
+        }
+        if (type.equals(SqlRow.class)) {
+            return SqlRowBigArray.class;
+        }
         return ObjectBigArray.class;
     }
 
@@ -251,23 +264,26 @@ private static <T extends AccumulatorState> void generateDeserialize(ClassDefini
             }
         }
         else if (fields.size() > 1) {
-            Variable row = scope.declareVariable(Block.class, "row");
-            deserializerBody.append(row.set(block.invoke("getObject", Object.class, index, constantClass(Block.class)).cast(Block.class)));
+            Variable row = scope.declareVariable("row", deserializerBody, block.invoke("getObject", Object.class, index, constantClass(SqlRow.class)).cast(SqlRow.class));
+            Variable rawIndex = scope.declareVariable("rawIndex", deserializerBody, row.invoke("getRawIndex", int.class));
+            Variable fieldBlock = scope.declareVariable(Block.class, "fieldBlock");
+
             int position = 0;
             for (StateField field : fields) {
                 Method setter = getSetter(clazz, field);
+                deserializerBody.append(fieldBlock.set(row.invoke("getRawFieldBlock", Block.class, constantInt(position))));
                 if (!field.isPrimitiveType()) {
                     deserializerBody.append(new IfStatement()
-                            .condition(row.invoke("isNull", boolean.class, constantInt(position)))
+                            .condition(fieldBlock.invoke("isNull", boolean.class, rawIndex))
                             .ifTrue(state.cast(setter.getDeclaringClass()).invoke(setter, constantNull(field.getType())))
-                            .ifFalse(state.cast(setter.getDeclaringClass()).invoke(setter, constantType(binder, field.getSqlType()).getValue(row, constantInt(position)))));
+                            .ifFalse(state.cast(setter.getDeclaringClass()).invoke(setter, constantType(binder, field.getSqlType()).getValue(fieldBlock, rawIndex))));
                 }
                 else {
                     // For primitive type, we need to cast here because we serialize byte fields with TINYINT/INTEGER (whose java type is long).
                     deserializerBody.append(
                             state.cast(setter.getDeclaringClass()).invoke(
                                     setter,
-                                    constantType(binder, field.getSqlType()).getValue(row, constantInt(position)).cast(field.getType())));
+                                    constantType(binder, field.getSqlType()).getValue(fieldBlock, rawIndex).cast(field.getType())));
                 }
                 position++;
             }
@@ -283,7 +299,7 @@ private static <T> void generateSerialize(ClassDefinition definition, CallSiteBi
         Scope scope = method.getScope();
         BytecodeBlock serializerBody = method.getBody();
 
-        if (fields.size() == 0) {
+        if (fields.isEmpty()) {
             serializerBody.append(out.invoke("appendNull", BlockBuilder.class).pop());
         }
         else if (fields.size() == 1) {
@@ -302,29 +318,52 @@ else if (fields.size() == 1) {
                 serializerBody.append(sqlType.writeValue(out, fieldValue.cast(getOnlyElement(fields).getSqlType().getJavaType())));
             }
         }
-        else if (fields.size() > 1) {
-            Variable rowBuilder = scope.declareVariable(BlockBuilder.class, "rowBuilder");
-            serializerBody.append(rowBuilder.set(out.invoke("beginBlockEntry", BlockBuilder.class)));
-            for (StateField field : fields) {
-                Method getter = getGetter(clazz, field);
-                SqlTypeBytecodeExpression sqlType = constantType(binder, field.getSqlType());
-                Variable fieldValue = scope.createTempVariable(getter.getReturnType());
-                serializerBody.append(fieldValue.set(state.cast(getter.getDeclaringClass()).invoke(getter)));
-                if (!field.isPrimitiveType()) {
-                    serializerBody.append(new IfStatement().condition(equal(fieldValue, constantNull(getter.getReturnType())))
-                            .ifTrue(rowBuilder.invoke("appendNull", BlockBuilder.class).pop())
-                            .ifFalse(sqlType.writeValue(rowBuilder, fieldValue)));
-                }
-                else {
-                    // For primitive type, we need to cast here because we serialize byte fields with TINYINT/INTEGER (whose java type is long).
-                    serializerBody.append(sqlType.writeValue(rowBuilder, fieldValue.cast(field.getSqlType().getJavaType())));
-                }
-            }
-            serializerBody.append(out.invoke("closeEntry", BlockBuilder.class).pop());
+        else {
+            MethodDefinition serializeToRow = generateSerializeToRow(definition, binder, clazz, fields);
+            BytecodeExpression rowEntryBuilder = generateMetafactory(RowValueBuilder.class, serializeToRow, ImmutableList.of(state));
+            serializerBody.append(out.cast(RowBlockBuilder.class).invoke("buildEntry", void.class, rowEntryBuilder));
         }
         serializerBody.ret();
     }
 
+    private static MethodDefinition generateSerializeToRow(
+            ClassDefinition definition,
+            CallSiteBinder binder,
+            Class<?> clazz,
+            List<StateField> fields)
+    {
+        Parameter state = arg("state", AccumulatorState.class);
+        Parameter fieldBuilders = arg("fieldBuilders", type(List.class, BlockBuilder.class));
+        MethodDefinition method = definition.declareMethod(a(PRIVATE, STATIC), "serialize", type(void.class), state, fieldBuilders);
+        Scope scope = method.getScope();
+        BytecodeBlock body = method.getBody();
+
+        Variable fieldBuilder = scope.createTempVariable(BlockBuilder.class);
+        for (int i = 0; i < fields.size(); i++) {
+            StateField field = fields.get(i);
+            Method getter = getGetter(clazz, field);
+
+            SqlTypeBytecodeExpression sqlType = constantType(binder, field.getSqlType());
+
+            Variable fieldValue = scope.createTempVariable(getter.getReturnType());
+            body.append(fieldValue.set(state.cast(getter.getDeclaringClass()).invoke(getter)));
+
+            body.append(fieldBuilder.set(fieldBuilders.invoke("get", Object.class, constantInt(i)).cast(BlockBuilder.class)));
+
+            if (!field.isPrimitiveType()) {
+                body.append(new IfStatement().condition(equal(fieldValue, constantNull(getter.getReturnType())))
+                        .ifTrue(fieldBuilder.invoke("appendNull", BlockBuilder.class).pop())
+                        .ifFalse(sqlType.writeValue(fieldBuilder, fieldValue)));
+            }
+            else {
+                // For primitive type, we need to cast here because we serialize byte fields with TINYINT/INTEGER (whose java type is long).
+                body.append(sqlType.writeValue(fieldBuilder, fieldValue.cast(field.getSqlType().getJavaType())));
+            }
+        }
+        body.ret();
+        return method;
+    }
+
     private static Method getSetter(Class<?> clazz, StateField field)
     {
         try {
diff --git a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/TriStateBooleanStateSerializer.java b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/TriStateBooleanStateSerializer.java
index bc9ca23e935f..fe2222fc4d39 100644
--- a/core/trino-main/src/main/java/io/trino/operator/aggregation/state/TriStateBooleanStateSerializer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/aggregation/state/TriStateBooleanStateSerializer.java
@@ -39,7 +39,7 @@ public void serialize(TriStateBooleanState state, BlockBuilder out)
             out.appendNull();
         }
         else {
-            out.writeByte(state.getValue() == TRUE_VALUE ? 1 : 0).closeEntry();
+            BOOLEAN.writeBoolean(out, state.getValue() == TRUE_VALUE);
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/annotations/FunctionImplementationDependency.java b/core/trino-main/src/main/java/io/trino/operator/annotations/FunctionImplementationDependency.java
index d7b1c820a3ce..d14004bb6320 100644
--- a/core/trino-main/src/main/java/io/trino/operator/annotations/FunctionImplementationDependency.java
+++ b/core/trino-main/src/main/java/io/trino/operator/annotations/FunctionImplementationDependency.java
@@ -14,10 +14,10 @@
 package io.trino.operator.annotations;
 
 import io.trino.metadata.FunctionBinding;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.function.FunctionDependencies;
 import io.trino.spi.function.FunctionDependencyDeclaration.FunctionDependencyDeclarationBuilder;
 import io.trino.spi.function.InvocationConvention;
-import io.trino.spi.function.QualifiedFunctionName;
 import io.trino.spi.function.ScalarFunctionImplementation;
 import io.trino.spi.type.TypeSignature;
 
@@ -30,19 +30,19 @@
 public final class FunctionImplementationDependency
         extends ScalarImplementationDependency
 {
-    private final QualifiedFunctionName fullyQualifiedFunctionName;
+    private final CatalogSchemaFunctionName name;
     private final List<TypeSignature> argumentTypes;
 
-    public FunctionImplementationDependency(QualifiedFunctionName fullyQualifiedFunctionName, List<TypeSignature> argumentTypes, InvocationConvention invocationConvention, Class<?> type)
+    public FunctionImplementationDependency(CatalogSchemaFunctionName name, List<TypeSignature> argumentTypes, InvocationConvention invocationConvention, Class<?> type)
     {
         super(invocationConvention, type);
-        this.fullyQualifiedFunctionName = requireNonNull(fullyQualifiedFunctionName, "fullyQualifiedFunctionName is null");
+        this.name = requireNonNull(name, "name is null");
         this.argumentTypes = requireNonNull(argumentTypes, "argumentTypes is null");
     }
 
-    public QualifiedFunctionName getFullyQualifiedName()
+    public CatalogSchemaFunctionName getName()
     {
-        return fullyQualifiedFunctionName;
+        return name;
     }
 
     public List<TypeSignature> getArgumentTypes()
@@ -53,14 +53,14 @@ public List<TypeSignature> getArgumentTypes()
     @Override
     public void declareDependencies(FunctionDependencyDeclarationBuilder builder)
     {
-        builder.addFunctionSignature(fullyQualifiedFunctionName, argumentTypes);
+        builder.addFunctionSignature(name, argumentTypes);
     }
 
     @Override
     protected ScalarFunctionImplementation getImplementation(FunctionBinding functionBinding, FunctionDependencies functionDependencies, InvocationConvention invocationConvention)
     {
         List<TypeSignature> types = applyBoundVariables(argumentTypes, functionBinding);
-        return functionDependencies.getScalarFunctionImplementationSignature(fullyQualifiedFunctionName, types, invocationConvention);
+        return functionDependencies.getScalarFunctionImplementationSignature(name, types, invocationConvention);
     }
 
     @Override
@@ -73,13 +73,13 @@ public boolean equals(Object o)
             return false;
         }
         FunctionImplementationDependency that = (FunctionImplementationDependency) o;
-        return Objects.equals(fullyQualifiedFunctionName, that.fullyQualifiedFunctionName) &&
+        return Objects.equals(name, that.name) &&
                 Objects.equals(argumentTypes, that.argumentTypes);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(fullyQualifiedFunctionName, argumentTypes);
+        return Objects.hash(name, argumentTypes);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/annotations/FunctionsParserHelper.java b/core/trino-main/src/main/java/io/trino/operator/annotations/FunctionsParserHelper.java
index 53eb65b5aec8..2b262a42ec67 100644
--- a/core/trino-main/src/main/java/io/trino/operator/annotations/FunctionsParserHelper.java
+++ b/core/trino-main/src/main/java/io/trino/operator/annotations/FunctionsParserHelper.java
@@ -31,8 +31,7 @@
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.TypeSignatureParameter;
 import io.trino.type.Constraint;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
@@ -63,6 +62,7 @@
 import static io.trino.spi.function.OperatorType.IS_DISTINCT_FROM;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.parseTypeSignature;
 import static java.lang.String.CASE_INSENSITIVE_ORDER;
@@ -119,6 +119,9 @@ else if (ORDERABLE_TYPE_OPERATORS.contains(operator)) {
                         verifyTypeSignatureDoesNotContainAnyTypeParameters(typeSignature, typeSignature, typeParameterNames);
                     }
                 }
+                else if (operator == READ_VALUE) {
+                    verifyOperatorSignature(operator, argumentTypes);
+                }
                 else {
                     throw new IllegalArgumentException("Operator dependency on " + operator + " is not allowed");
                 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/annotations/ImplementationDependency.java b/core/trino-main/src/main/java/io/trino/operator/annotations/ImplementationDependency.java
index 10ab93ad9987..eb38b6fc0337 100644
--- a/core/trino-main/src/main/java/io/trino/operator/annotations/ImplementationDependency.java
+++ b/core/trino-main/src/main/java/io/trino/operator/annotations/ImplementationDependency.java
@@ -24,7 +24,6 @@
 import io.trino.spi.function.LiteralParameter;
 import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.OperatorType;
-import io.trino.spi.function.QualifiedFunctionName;
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.TypeSignatureParameter;
@@ -41,6 +40,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.operator.annotations.FunctionsParserHelper.containsImplementationDependencyAnnotation;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.parseTypeSignature;
 
@@ -110,7 +110,7 @@ public static ImplementationDependency createDependency(Annotation annotation, S
 
             if (annotation instanceof FunctionDependency functionDependency) {
                 return new FunctionImplementationDependency(
-                        QualifiedFunctionName.of(functionDependency.name()),
+                        builtinFunctionName(functionDependency.name()),
                         Arrays.stream(functionDependency.argumentTypes())
                                 .map(signature -> parseTypeSignature(signature, literalParameters))
                                 .collect(toImmutableList()),
diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchange.java b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchange.java
index 2e94a11f746f..ea5486a63750 100644
--- a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchange.java
+++ b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchange.java
@@ -16,34 +16,31 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.slice.XxHash64;
 import io.airlift.units.DataSize;
 import io.trino.Session;
 import io.trino.operator.BucketPartitionFunction;
 import io.trino.operator.HashGenerator;
-import io.trino.operator.InterpretedHashGenerator;
 import io.trino.operator.PartitionFunction;
 import io.trino.operator.PrecomputedHashGenerator;
+import io.trino.operator.output.SkewedPartitionRebalancer;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.sql.planner.MergePartitioningHandle;
 import io.trino.sql.planner.NodePartitioningManager;
 import io.trino.sql.planner.PartitioningHandle;
 import io.trino.sql.planner.SystemPartitioningHandle;
-import io.trino.type.BlockTypeOperators;
-import it.unimi.dsi.fastutil.longs.Long2LongMap;
-import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
 
 import java.io.Closeable;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -52,7 +49,11 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.SystemSessionProperties.getQueryMaxMemoryPerNode;
+import static io.trino.SystemSessionProperties.getSkewedPartitionMinDataProcessedRebalanceThreshold;
+import static io.trino.operator.InterpretedHashGenerator.createChannelsHashGenerator;
 import static io.trino.operator.exchange.LocalExchangeSink.finishedLocalExchangeSink;
+import static io.trino.operator.output.SkewedPartitionRebalancer.getScaleWritersMaxSkewedPartitions;
 import static io.trino.sql.planner.PartitioningHandle.isScaledWriterHashDistribution;
 import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_ARBITRARY_DISTRIBUTION;
 import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_BROADCAST_DISTRIBUTION;
@@ -60,6 +61,7 @@
 import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_PASSTHROUGH_DISTRIBUTION;
 import static io.trino.sql.planner.SystemPartitioningHandle.SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION;
 import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
+import static java.lang.Math.max;
 import static java.util.Objects.requireNonNull;
 import static java.util.function.Function.identity;
 
@@ -72,9 +74,6 @@ public class LocalExchange
 
     private final List<LocalExchangeSource> sources;
 
-    // Physical written bytes for each writer in the same order as source buffers
-    private final List<Supplier<Long>> physicalWrittenBytesSuppliers = new CopyOnWriteArrayList<>();
-
     @GuardedBy("this")
     private boolean allSourcesFinished;
 
@@ -99,8 +98,9 @@ public LocalExchange(
             List<Type> partitionChannelTypes,
             Optional<Integer> partitionHashChannel,
             DataSize maxBufferedBytes,
-            BlockTypeOperators blockTypeOperators,
-            DataSize writerMinSize)
+            TypeOperators typeOperators,
+            DataSize writerScalingMinDataProcessed,
+            Supplier<Long> totalMemoryUsed)
     {
         int bufferCount = computeBufferCount(partitioning, defaultConcurrency, partitionChannels);
 
@@ -130,30 +130,29 @@ else if (partitioning.equals(SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION)) {
             sources = IntStream.range(0, bufferCount)
                     .mapToObj(i -> new LocalExchangeSource(memoryManager, source -> checkAllSourcesFinished()))
                     .collect(toImmutableList());
+            AtomicLong dataProcessed = new AtomicLong(0);
             exchangerSupplier = () -> new ScaleWriterExchanger(
                     asPageConsumers(sources),
                     memoryManager,
                     maxBufferedBytes.toBytes(),
-                    () -> {
-                        // Avoid using stream api for performance reasons
-                        long physicalWrittenBytes = 0;
-                        for (Supplier<Long> physicalWrittenBytesSupplier : physicalWrittenBytesSuppliers) {
-                            physicalWrittenBytes += physicalWrittenBytesSupplier.get();
-                        }
-                        return physicalWrittenBytes;
-                    },
-                    writerMinSize);
+                    dataProcessed,
+                    writerScalingMinDataProcessed,
+                    totalMemoryUsed,
+                    getQueryMaxMemoryPerNode(session).toBytes());
         }
         else if (isScaledWriterHashDistribution(partitioning)) {
             int partitionCount = bufferCount * SCALE_WRITERS_MAX_PARTITIONS_PER_WRITER;
-            List<Supplier<Long2LongMap>> writerPartitionRowCountsSuppliers = new CopyOnWriteArrayList<>();
-            UniformPartitionRebalancer uniformPartitionRebalancer = new UniformPartitionRebalancer(
-                    physicalWrittenBytesSuppliers,
-                    () -> computeAggregatedPartitionRowCounts(writerPartitionRowCountsSuppliers),
+            SkewedPartitionRebalancer skewedPartitionRebalancer = new SkewedPartitionRebalancer(
                     partitionCount,
                     bufferCount,
-                    writerMinSize.toBytes());
-
+                    1,
+                    writerScalingMinDataProcessed.toBytes(),
+                    getSkewedPartitionMinDataProcessedRebalanceThreshold(session).toBytes(),
+                    // Keep the maxPartitionsToRebalance to atleast writer count such that single partition writes do
+                    // not suffer from skewness and can scale uniformly across all writers. Additionally, note that
+                    // maxWriterCount is calculated considering memory into account. So, it is safe to set the
+                    // maxPartitionsToRebalance to maximum number of writers.
+                    max(getScaleWritersMaxSkewedPartitions(session), bufferCount));
             LocalExchangeMemoryManager memoryManager = new LocalExchangeMemoryManager(maxBufferedBytes.toBytes());
             sources = IntStream.range(0, bufferCount)
                     .mapToObj(i -> new LocalExchangeSource(memoryManager, source -> checkAllSourcesFinished()))
@@ -163,22 +162,22 @@ else if (isScaledWriterHashDistribution(partitioning)) {
                 PartitionFunction partitionFunction = createPartitionFunction(
                         nodePartitioningManager,
                         session,
-                        blockTypeOperators,
+                        typeOperators,
                         partitioning,
                         partitionCount,
                         partitionChannels,
                         partitionChannelTypes,
                         partitionHashChannel);
-                ScaleWriterPartitioningExchanger exchanger = new ScaleWriterPartitioningExchanger(
+                return new ScaleWriterPartitioningExchanger(
                         asPageConsumers(sources),
                         memoryManager,
                         maxBufferedBytes.toBytes(),
                         createPartitionPagePreparer(partitioning, partitionChannels),
                         partitionFunction,
                         partitionCount,
-                        uniformPartitionRebalancer);
-                writerPartitionRowCountsSuppliers.add(exchanger::getAndResetPartitionRowCounts);
-                return exchanger;
+                        skewedPartitionRebalancer,
+                        totalMemoryUsed,
+                        getQueryMaxMemoryPerNode(session).toBytes());
             };
         }
         else if (partitioning.equals(FIXED_HASH_DISTRIBUTION) || partitioning.getCatalogHandle().isPresent() ||
@@ -191,7 +190,7 @@ else if (partitioning.equals(FIXED_HASH_DISTRIBUTION) || partitioning.getCatalog
                 PartitionFunction partitionFunction = createPartitionFunction(
                         nodePartitioningManager,
                         session,
-                        blockTypeOperators,
+                        typeOperators,
                         partitioning,
                         bufferCount,
                         partitionChannels,
@@ -222,29 +221,14 @@ public synchronized LocalExchangeSinkFactory createSinkFactory()
         return newFactory;
     }
 
-    public synchronized LocalExchangeSource getNextSource(Supplier<Long> physicalWrittenBytesSupplier)
+    public synchronized LocalExchangeSource getNextSource()
     {
         checkState(nextSourceIndex < sources.size(), "All operators already created");
         LocalExchangeSource result = sources.get(nextSourceIndex);
-        physicalWrittenBytesSuppliers.add(physicalWrittenBytesSupplier);
         nextSourceIndex++;
         return result;
     }
 
-    private Long2LongMap computeAggregatedPartitionRowCounts(List<Supplier<Long2LongMap>> writerPartitionRowCountsSuppliers)
-    {
-        Long2LongMap aggregatedPartitionRowCounts = new Long2LongOpenHashMap();
-        List<Long2LongMap> writerPartitionRowCounts = writerPartitionRowCountsSuppliers.stream()
-                .map(Supplier::get)
-                .collect(toImmutableList());
-
-        writerPartitionRowCounts.forEach(partitionRowCounts ->
-                partitionRowCounts.forEach((writerPartitionId, rowCount) ->
-                        aggregatedPartitionRowCounts.merge(writerPartitionId.longValue(), rowCount.longValue(), Long::sum)));
-
-        return aggregatedPartitionRowCounts;
-    }
-
     private static Function<Page, Page> createPartitionPagePreparer(PartitioningHandle partitioning, List<Integer> partitionChannels)
     {
         Function<Page, Page> partitionPagePreparer;
@@ -261,7 +245,7 @@ private static Function<Page, Page> createPartitionPagePreparer(PartitioningHand
     private static PartitionFunction createPartitionFunction(
             NodePartitioningManager nodePartitioningManager,
             Session session,
-            BlockTypeOperators blockTypeOperators,
+            TypeOperators typeOperators,
             PartitioningHandle partitioning,
             int partitionCount,
             List<Integer> partitionChannels,
@@ -276,7 +260,7 @@ private static PartitionFunction createPartitionFunction(
                 hashGenerator = new PrecomputedHashGenerator(partitionHashChannel.get());
             }
             else {
-                hashGenerator = new InterpretedHashGenerator(partitionChannelTypes, Ints.toArray(partitionChannels), blockTypeOperators);
+                hashGenerator = createChannelsHashGenerator(partitionChannelTypes, Ints.toArray(partitionChannels), typeOperators);
             }
             return new LocalPartitionGenerator(hashGenerator, partitionCount);
         }
diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeMemoryManager.java b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeMemoryManager.java
index 31dc880f6974..3c2aa2cc0dc4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeMemoryManager.java
+++ b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeMemoryManager.java
@@ -15,10 +15,9 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import jakarta.annotation.Nullable;
 
 import java.util.concurrent.atomic.AtomicLong;
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeSource.java b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeSource.java
index d5738a930b4f..083daa8f8a5e 100644
--- a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeSource.java
+++ b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeSource.java
@@ -15,13 +15,12 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.operator.WorkProcessor;
 import io.trino.operator.WorkProcessor.ProcessState;
 import io.trino.spi.Page;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.util.ArrayDeque;
 import java.util.Queue;
diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeSourceOperator.java b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeSourceOperator.java
index 3a78a8deb96c..57b6153d3b47 100644
--- a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeSourceOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeSourceOperator.java
@@ -48,7 +48,7 @@ public Operator createOperator(DriverContext driverContext)
             checkState(!closed, "Factory is already closed");
 
             OperatorContext operatorContext = driverContext.addOperatorContext(operatorId, planNodeId, LocalExchangeSourceOperator.class.getSimpleName());
-            return new LocalExchangeSourceOperator(operatorContext, localExchange.getNextSource(driverContext::getPhysicalWrittenDataSize));
+            return new LocalExchangeSourceOperator(operatorContext, localExchange.getNextSource());
         }
 
         @Override
diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalMergeSourceOperator.java b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalMergeSourceOperator.java
index 19172faf1744..ccf07a621a6f 100644
--- a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalMergeSourceOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalMergeSourceOperator.java
@@ -77,7 +77,7 @@ public Operator createOperator(DriverContext driverContext)
             PageWithPositionComparator comparator = orderingCompiler.compilePageWithPositionComparator(types, sortChannels, orderings);
             List<LocalExchangeSource> sources = IntStream.range(0, localExchange.getBufferCount())
                     .boxed()
-                    .map(index -> localExchange.getNextSource(driverContext::getPhysicalWrittenDataSize))
+                    .map(index -> localExchange.getNextSource())
                     .collect(toImmutableList());
             return new LocalMergeSourceOperator(operatorContext, sources, types, comparator);
         }
diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalPartitionGenerator.java b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalPartitionGenerator.java
index 20a01eb430d6..2c065f182238 100644
--- a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalPartitionGenerator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalPartitionGenerator.java
@@ -36,7 +36,7 @@ public LocalPartitionGenerator(HashGenerator hashGenerator, int partitionCount)
     }
 
     @Override
-    public int getPartitionCount()
+    public int partitionCount()
     {
         return partitionCount;
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/PartitioningExchanger.java b/core/trino-main/src/main/java/io/trino/operator/exchange/PartitioningExchanger.java
index 808d875ea431..1407b5f9908f 100644
--- a/core/trino-main/src/main/java/io/trino/operator/exchange/PartitioningExchanger.java
+++ b/core/trino-main/src/main/java/io/trino/operator/exchange/PartitioningExchanger.java
@@ -15,12 +15,11 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.operator.PartitionFunction;
 import io.trino.spi.Page;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/ScaleWriterExchanger.java b/core/trino-main/src/main/java/io/trino/operator/exchange/ScaleWriterExchanger.java
index 2b217790e7e7..1436d7b9790d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/exchange/ScaleWriterExchanger.java
+++ b/core/trino-main/src/main/java/io/trino/operator/exchange/ScaleWriterExchanger.java
@@ -20,13 +20,14 @@
 import io.trino.spi.Page;
 
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import static java.util.Objects.requireNonNull;
 
 /**
- * Scale up local writers based on throughput and physical written bytes.
+ * Scale up local writers based on throughput and data processed by writers.
  * Input pages are distributed across different writers in a round-robin fashion.
  */
 public class ScaleWriterExchanger
@@ -37,32 +38,38 @@ public class ScaleWriterExchanger
     private final List<Consumer<Page>> buffers;
     private final LocalExchangeMemoryManager memoryManager;
     private final long maxBufferedBytes;
-    private final Supplier<Long> physicalWrittenBytesSupplier;
-    private final long writerMinSize;
+    private final AtomicLong dataProcessed;
+    private final long writerScalingMinDataProcessed;
+    private final Supplier<Long> totalMemoryUsed;
+    private final long maxMemoryPerNode;
 
     // Start with single writer and increase the writer count based on
-    // physical written bytes and buffer utilization.
+    // data processed by writers and buffer utilization.
     private int writerCount = 1;
-    private long lastScaleUpPhysicalWrittenBytes;
     private int nextWriterIndex = -1;
 
     public ScaleWriterExchanger(
             List<Consumer<Page>> buffers,
             LocalExchangeMemoryManager memoryManager,
             long maxBufferedBytes,
-            Supplier<Long> physicalWrittenBytesSupplier,
-            DataSize writerMinSize)
+            AtomicLong dataProcessed,
+            DataSize writerScalingMinDataProcessed,
+            Supplier<Long> totalMemoryUsed,
+            long maxMemoryPerNode)
     {
         this.buffers = requireNonNull(buffers, "buffers is null");
         this.memoryManager = requireNonNull(memoryManager, "memoryManager is null");
         this.maxBufferedBytes = maxBufferedBytes;
-        this.physicalWrittenBytesSupplier = requireNonNull(physicalWrittenBytesSupplier, "physicalWrittenBytesSupplier is null");
-        this.writerMinSize = writerMinSize.toBytes();
+        this.dataProcessed = requireNonNull(dataProcessed, "dataProcessed is null");
+        this.writerScalingMinDataProcessed = writerScalingMinDataProcessed.toBytes();
+        this.totalMemoryUsed = requireNonNull(totalMemoryUsed, "totalMemoryUsed is null");
+        this.maxMemoryPerNode = maxMemoryPerNode;
     }
 
     @Override
     public void accept(Page page)
     {
+        dataProcessed.addAndGet(page.getSizeInBytes());
         Consumer<Page> buffer = buffers.get(getNextWriterIndex());
         memoryManager.updateMemoryUsage(page.getRetainedSizeInBytes());
         buffer.accept(page);
@@ -71,14 +78,15 @@ public void accept(Page page)
     private int getNextWriterIndex()
     {
         // Scale up writers when current buffer memory utilization is more than 50% of the
-        // maximum and physical written bytes by the last scaled up writer is greater than
-        // writerMinSize.
+        // maximum and data processed  is greater than current writer count * writerScalingMinOutputSize.
         // This also mean that we won't scale local writers if the writing speed can cope up
         // with incoming data. In another word, buffer utilization is below 50%.
         if (writerCount < buffers.size() && memoryManager.getBufferedBytes() >= maxBufferedBytes / 2) {
-            long physicalWrittenBytes = physicalWrittenBytesSupplier.get();
-            if ((physicalWrittenBytes - lastScaleUpPhysicalWrittenBytes) >= writerCount * writerMinSize) {
-                lastScaleUpPhysicalWrittenBytes = physicalWrittenBytes;
+            if (dataProcessed.get() >= writerCount * writerScalingMinDataProcessed
+                    // Do not scale up if total memory used is greater than 50% of max memory per node.
+                    // We have to be conservative here otherwise scaling of writers will happen first
+                    // before we hit this limit, and then we won't be able to do anything to stop OOM error.
+                    && totalMemoryUsed.get() < maxMemoryPerNode * 0.5) {
                 writerCount++;
                 log.debug("Increased task writer count: %d", writerCount);
             }
diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/ScaleWriterPartitioningExchanger.java b/core/trino-main/src/main/java/io/trino/operator/exchange/ScaleWriterPartitioningExchanger.java
index e8d193661a5f..c4f7e56fcc46 100644
--- a/core/trino-main/src/main/java/io/trino/operator/exchange/ScaleWriterPartitioningExchanger.java
+++ b/core/trino-main/src/main/java/io/trino/operator/exchange/ScaleWriterPartitioningExchanger.java
@@ -16,21 +16,15 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import io.trino.operator.PartitionFunction;
+import io.trino.operator.output.SkewedPartitionRebalancer;
 import io.trino.spi.Page;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.longs.Long2IntMap;
-import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
-import it.unimi.dsi.fastutil.longs.Long2LongMap;
-import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;
-
-import javax.annotation.concurrent.GuardedBy;
 
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
-import static io.trino.operator.exchange.UniformPartitionRebalancer.WriterPartitionId;
-import static io.trino.operator.exchange.UniformPartitionRebalancer.WriterPartitionId.serialize;
 import static java.util.Arrays.fill;
 import static java.util.Objects.requireNonNull;
 
@@ -42,23 +36,14 @@ public class ScaleWriterPartitioningExchanger
     private final long maxBufferedBytes;
     private final Function<Page, Page> partitionedPagePreparer;
     private final PartitionFunction partitionFunction;
-    private final UniformPartitionRebalancer partitionRebalancer;
+    private final SkewedPartitionRebalancer partitionRebalancer;
 
     private final IntArrayList[] writerAssignments;
     private final int[] partitionRowCounts;
     private final int[] partitionWriterIds;
     private final int[] partitionWriterIndexes;
-
-    private final IntArrayList usedPartitions = new IntArrayList();
-
-    // Use Long2IntMap instead of Map<WriterPartitionId, Integer> which helps to save memory in the worst case scenario.
-    // Here first 32 bit of long key contains writerId whereas last 32 bit contains partitionId.
-    private final Long2IntMap pageWriterPartitionRowCounts = new Long2IntOpenHashMap();
-
-    // Use Long2LongMap instead of Map<WriterPartitionId, Long> which helps to save memory in the worst case scenario.
-    // Here first 32 bit of long key contains writerId whereas last 32 bit contains partitionId.
-    @GuardedBy("this")
-    private final Long2LongMap writerPartitionRowCounts = new Long2LongOpenHashMap();
+    private final Supplier<Long> totalMemoryUsed;
+    private final long maxMemoryPerNode;
 
     public ScaleWriterPartitioningExchanger(
             List<Consumer<Page>> buffers,
@@ -67,7 +52,9 @@ public ScaleWriterPartitioningExchanger(
             Function<Page, Page> partitionedPagePreparer,
             PartitionFunction partitionFunction,
             int partitionCount,
-            UniformPartitionRebalancer partitionRebalancer)
+            SkewedPartitionRebalancer partitionRebalancer,
+            Supplier<Long> totalMemoryUsed,
+            long maxMemoryPerNode)
     {
         this.buffers = requireNonNull(buffers, "buffers is null");
         this.memoryManager = requireNonNull(memoryManager, "memoryManager is null");
@@ -75,6 +62,8 @@ public ScaleWriterPartitioningExchanger(
         this.partitionedPagePreparer = requireNonNull(partitionedPagePreparer, "partitionedPagePreparer is null");
         this.partitionFunction = requireNonNull(partitionFunction, "partitionFunction is null");
         this.partitionRebalancer = requireNonNull(partitionRebalancer, "partitionRebalancer is null");
+        this.totalMemoryUsed = requireNonNull(totalMemoryUsed, "totalMemoryUsed is null");
+        this.maxMemoryPerNode = maxMemoryPerNode;
 
         // Initialize writerAssignments with the buffer size
         writerAssignments = new IntArrayList[buffers.size()];
@@ -94,9 +83,12 @@ public ScaleWriterPartitioningExchanger(
     @Override
     public void accept(Page page)
     {
-        // Scale up writers when current buffer memory utilization is more than 50% of the maximum
-        if (memoryManager.getBufferedBytes() > maxBufferedBytes * 0.5) {
-            partitionRebalancer.rebalancePartitions();
+        // Scale up writers when current buffer memory utilization is more than 50% of the maximum.
+        // Do not scale up if total memory used is greater than 50% of max memory per node.
+        // We have to be conservative here otherwise scaling of writers will happen first
+        // before we hit this limit, and then we won't be able to do anything to stop OOM error.
+        if (memoryManager.getBufferedBytes() > maxBufferedBytes * 0.5 && totalMemoryUsed.get() < maxMemoryPerNode * 0.5) {
+            partitionRebalancer.rebalance();
         }
 
         Page partitionPage = partitionedPagePreparer.apply(page);
@@ -115,27 +107,17 @@ public void accept(Page page)
             if (writerId == -1) {
                 writerId = getNextWriterId(partitionId);
                 partitionWriterIds[partitionId] = writerId;
-                usedPartitions.add(partitionId);
             }
             writerAssignments[writerId].add(position);
         }
 
-        for (int partitionId : usedPartitions) {
-            int writerId = partitionWriterIds[partitionId];
-            pageWriterPartitionRowCounts.put(serialize(new WriterPartitionId(writerId, partitionId)), partitionRowCounts[partitionId]);
-
-            // Reset the value of partition row count and writer id for the next page processing cycle
+        for (int partitionId = 0; partitionId < partitionRowCounts.length; partitionId++) {
+            partitionRebalancer.addPartitionRowCount(partitionId, partitionRowCounts[partitionId]);
+            // Reset the value of partition row count
             partitionRowCounts[partitionId] = 0;
             partitionWriterIds[partitionId] = -1;
         }
 
-        // Update partitions row count state which will help with scaling partitions across writers
-        updatePartitionRowCounts(pageWriterPartitionRowCounts);
-
-        // Reset pageWriterPartitionRowCounts and usedPartitions for the next page processing cycle
-        pageWriterPartitionRowCounts.clear();
-        usedPartitions.clear();
-
         // build a page for each writer
         for (int bucket = 0; bucket < writerAssignments.length; bucket++) {
             IntArrayList positionsList = writerAssignments[bucket];
@@ -168,27 +150,16 @@ public ListenableFuture<Void> waitForWriting()
         return memoryManager.getNotFullFuture();
     }
 
-    public synchronized Long2LongMap getAndResetPartitionRowCounts()
-    {
-        Long2LongMap result = new Long2LongOpenHashMap(writerPartitionRowCounts);
-        writerPartitionRowCounts.clear();
-        return result;
-    }
-
-    private synchronized void updatePartitionRowCounts(Long2IntMap pagePartitionRowCounts)
-    {
-        pagePartitionRowCounts.forEach((writerPartitionId, rowCount) ->
-                writerPartitionRowCounts.merge(writerPartitionId, rowCount, Long::sum));
-    }
-
     private int getNextWriterId(int partitionId)
     {
-        return partitionRebalancer.getWriterId(partitionId, partitionWriterIndexes[partitionId]++);
+        return partitionRebalancer.getTaskId(partitionId, partitionWriterIndexes[partitionId]++);
     }
 
     private void sendPageToPartition(Consumer<Page> buffer, Page pageSplit)
     {
-        memoryManager.updateMemoryUsage(pageSplit.getRetainedSizeInBytes());
+        long retainedSizeInBytes = pageSplit.getRetainedSizeInBytes();
+        partitionRebalancer.addDataProcessed(retainedSizeInBytes);
+        memoryManager.updateMemoryUsage(retainedSizeInBytes);
         buffer.accept(pageSplit);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/UniformPartitionRebalancer.java b/core/trino-main/src/main/java/io/trino/operator/exchange/UniformPartitionRebalancer.java
deleted file mode 100644
index 13a35ae17920..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/exchange/UniformPartitionRebalancer.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.exchange;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
-import io.airlift.log.Logger;
-import io.airlift.units.DataSize;
-import io.trino.execution.resourcegroups.IndexedPriorityQueue;
-import it.unimi.dsi.fastutil.longs.Long2LongMap;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicLongArray;
-import java.util.function.Supplier;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.airlift.units.DataSize.Unit.MEGABYTE;
-import static java.lang.Double.isNaN;
-import static java.lang.Math.floorMod;
-import static java.lang.Math.max;
-import static java.util.Objects.requireNonNull;
-
-/**
- * Help in finding the skewness across writers when writing partitioned data using preferred partitioning.
- * It then tries to uniformly distribute the biggest partitions from skewed writers to all the available writers.
- * <p>
- * Example:
- * <p>
- * Before: For three writers with skewed partitions
- * Writer 1 -> No partition assigned -> 0 bytes
- * Writer 2 -> No partition assigned -> 0 bytes
- * Writer 3 -> Partition 1 (100MB) + Partition 2 (100MB) + Partition 3 (100MB) ->  300 MB
- * <p>
- * After scaling:
- * Writer 1 -> Partition 1 (50MB) + Partition 3 (50MB) -> 100 MB
- * Writer 2 -> Partition 2 (50MB) -> 50 MB
- * Writer 3 -> Partition 1 (150MB) + Partition 2 (150MB) + Partition 3 (150MB) ->  450 MB
- */
-@ThreadSafe
-public class UniformPartitionRebalancer
-{
-    private static final Logger log = Logger.get(UniformPartitionRebalancer.class);
-    // If the percentage difference between the two writers with maximum and minimum physical written bytes
-    // since last rebalance is above 0.7 (or 70%), then we consider them skewed.
-    private static final double SKEWNESS_THRESHOLD = 0.7;
-
-    private final List<Supplier<Long>> writerPhysicalWrittenBytesSuppliers;
-    // Use Long2LongMap instead of Map<WriterPartitionId, Integer> which helps to save memory in the worst case scenario.
-    // Here first 32 bit of Long key contains writerId whereas last 32 bit contains partitionId.
-    private final Supplier<Long2LongMap> partitionRowCountsSupplier;
-    private final long writerMinSize;
-    private final int numberOfWriters;
-    private final long rebalanceThresholdMinPhysicalWrittenBytes;
-
-    private final AtomicLongArray writerPhysicalWrittenBytesAtLastRebalance;
-
-    private final PartitionInfo[] partitionInfos;
-
-    public UniformPartitionRebalancer(
-            List<Supplier<Long>> writerPhysicalWrittenBytesSuppliers,
-            Supplier<Long2LongMap> partitionRowCountsSupplier,
-            int partitionCount,
-            int numberOfWriters,
-            long writerMinSize)
-    {
-        this.writerPhysicalWrittenBytesSuppliers = requireNonNull(writerPhysicalWrittenBytesSuppliers, "writerPhysicalWrittenBytesSuppliers is null");
-        this.partitionRowCountsSupplier = requireNonNull(partitionRowCountsSupplier, "partitionRowCountsSupplier is null");
-        this.writerMinSize = writerMinSize;
-        this.numberOfWriters = numberOfWriters;
-        this.rebalanceThresholdMinPhysicalWrittenBytes = max(DataSize.of(50, MEGABYTE).toBytes(), writerMinSize);
-
-        this.writerPhysicalWrittenBytesAtLastRebalance = new AtomicLongArray(numberOfWriters);
-
-        partitionInfos = new PartitionInfo[partitionCount];
-        for (int i = 0; i < partitionCount; i++) {
-            partitionInfos[i] = new PartitionInfo(i % numberOfWriters);
-        }
-    }
-
-    public int getWriterId(int partitionId, int index)
-    {
-        return partitionInfos[partitionId].getWriterId(index);
-    }
-
-    @VisibleForTesting
-    List<Integer> getWriterIds(int partitionId)
-    {
-        return partitionInfos[partitionId].getWriterIds();
-    }
-
-    public void rebalancePartitions()
-    {
-        List<Long> writerPhysicalWrittenBytes = writerPhysicalWrittenBytesSuppliers.stream()
-                .map(Supplier::get)
-                .collect(toImmutableList());
-
-        // Rebalance only when total bytes written since last rebalance is greater than rebalance threshold
-        if (getPhysicalWrittenBytesSinceLastRebalance(writerPhysicalWrittenBytes) > rebalanceThresholdMinPhysicalWrittenBytes) {
-            rebalancePartitions(writerPhysicalWrittenBytes);
-        }
-    }
-
-    private int getPhysicalWrittenBytesSinceLastRebalance(List<Long> writerPhysicalWrittenBytes)
-    {
-        int physicalWrittenBytesSinceLastRebalance = 0;
-        for (int writerId = 0; writerId < writerPhysicalWrittenBytes.size(); writerId++) {
-            physicalWrittenBytesSinceLastRebalance +=
-                    writerPhysicalWrittenBytes.get(writerId) - writerPhysicalWrittenBytesAtLastRebalance.get(writerId);
-        }
-
-        return physicalWrittenBytesSinceLastRebalance;
-    }
-
-    private synchronized void rebalancePartitions(List<Long> writerPhysicalWrittenBytes)
-    {
-        Long2LongMap partitionRowCounts = partitionRowCountsSupplier.get();
-        RebalanceContext context = new RebalanceContext(writerPhysicalWrittenBytes, partitionRowCounts);
-
-        IndexedPriorityQueue<WriterId> maxWriters = new IndexedPriorityQueue<>();
-        IndexedPriorityQueue<WriterId> minWriters = new IndexedPriorityQueue<>();
-        for (int writerId = 0; writerId < numberOfWriters; writerId++) {
-            WriterId writer = new WriterId(writerId);
-            maxWriters.addOrUpdate(writer, context.getWriterEstimatedWrittenBytes(writer));
-            minWriters.addOrUpdate(writer, Long.MAX_VALUE - context.getWriterEstimatedWrittenBytes(writer));
-        }
-
-        // Find skewed partitions and scale them across multiple writers
-        while (true) {
-            // Find the writer with maximum physical written bytes since last rebalance
-            WriterId maxWriter = maxWriters.poll();
-
-            if (maxWriter == null) {
-                break;
-            }
-
-            // Find the skewness against writer with max physical written bytes since last rebalance
-            List<WriterId> minSkewedWriters = findSkewedMinWriters(context, maxWriter, minWriters);
-            if (minSkewedWriters.isEmpty()) {
-                break;
-            }
-
-            for (WriterId minSkewedWriter : minSkewedWriters) {
-                // There's no need to add the maxWriter back to priority queues if no partition rebalancing happened
-                List<WriterId> affectedWriters = context.rebalancePartition(maxWriter, minSkewedWriter);
-                if (!affectedWriters.isEmpty()) {
-                    for (WriterId affectedWriter : affectedWriters) {
-                        maxWriters.addOrUpdate(affectedWriter, context.getWriterEstimatedWrittenBytes(maxWriter));
-                        minWriters.addOrUpdate(affectedWriter, Long.MAX_VALUE - context.getWriterEstimatedWrittenBytes(maxWriter));
-                    }
-                    break;
-                }
-            }
-
-            // Add all the min skewed writers back to the minWriters queue with updated priorities
-            for (WriterId minSkewedWriter : minSkewedWriters) {
-                maxWriters.addOrUpdate(minSkewedWriter, context.getWriterEstimatedWrittenBytes(minSkewedWriter));
-                minWriters.addOrUpdate(minSkewedWriter, Long.MAX_VALUE - context.getWriterEstimatedWrittenBytes(minSkewedWriter));
-            }
-        }
-
-        resetStateForNextRebalance(context, writerPhysicalWrittenBytes, partitionRowCounts);
-    }
-
-    private List<WriterId> findSkewedMinWriters(RebalanceContext context, WriterId maxWriter, IndexedPriorityQueue<WriterId> minWriters)
-    {
-        ImmutableList.Builder<WriterId> minSkewedWriters = ImmutableList.builder();
-        long maxWriterWrittenBytes = context.getWriterEstimatedWrittenBytes(maxWriter);
-        while (true) {
-            // Find the writer with minimum written bytes since last rebalance
-            WriterId minWriter = minWriters.poll();
-            if (minWriter == null) {
-                break;
-            }
-
-            long minWriterWrittenBytes = context.getWriterEstimatedWrittenBytes(minWriter);
-
-            // find the skewness against writer with max written bytes since last rebalance
-            double skewness = ((double) (maxWriterWrittenBytes - minWriterWrittenBytes)) / maxWriterWrittenBytes;
-            if (skewness <= SKEWNESS_THRESHOLD || isNaN(skewness)) {
-                break;
-            }
-
-            minSkewedWriters.add(minWriter);
-        }
-        return minSkewedWriters.build();
-    }
-
-    private void resetStateForNextRebalance(RebalanceContext context, List<Long> writerPhysicalWrittenBytes, Long2LongMap partitionRowCounts)
-    {
-        partitionRowCounts.forEach((serializedKey, rowCount) -> {
-            WriterPartitionId writerPartitionId = WriterPartitionId.deserialize(serializedKey);
-            PartitionInfo partitionInfo = partitionInfos[writerPartitionId.partitionId];
-            if (context.isPartitionRebalanced(writerPartitionId.partitionId)) {
-                // Reset physical written bytes for rebalanced partitions
-                partitionInfo.resetPhysicalWrittenBytesAtLastRebalance();
-            }
-            else {
-                long writtenBytes = context.estimatePartitionWrittenBytesSinceLastRebalance(new WriterId(writerPartitionId.writerId), rowCount);
-                partitionInfo.addToPhysicalWrittenBytesAtLastRebalance(writtenBytes);
-            }
-        });
-
-        for (int i = 0; i < numberOfWriters; i++) {
-            writerPhysicalWrittenBytesAtLastRebalance.set(i, writerPhysicalWrittenBytes.get(i));
-        }
-    }
-
-    private class RebalanceContext
-    {
-        private final Set<Integer> rebalancedPartitions = new HashSet<>();
-        private final long[] writerPhysicalWrittenBytesSinceLastRebalance;
-        private final long[] writerRowCountSinceLastRebalance;
-        private final long[] writerEstimatedWrittenBytes;
-        private final List<IndexedPriorityQueue<PartitionIdWithRowCount>> writerMaxPartitions;
-
-        private RebalanceContext(List<Long> writerPhysicalWrittenBytes, Long2LongMap partitionRowCounts)
-        {
-            writerPhysicalWrittenBytesSinceLastRebalance = new long[numberOfWriters];
-            writerEstimatedWrittenBytes = new long[numberOfWriters];
-            for (int writerId = 0; writerId < writerPhysicalWrittenBytes.size(); writerId++) {
-                long physicalWrittenBytesSinceLastRebalance =
-                        writerPhysicalWrittenBytes.get(writerId) - writerPhysicalWrittenBytesAtLastRebalance.get(writerId);
-                writerPhysicalWrittenBytesSinceLastRebalance[writerId] = physicalWrittenBytesSinceLastRebalance;
-                writerEstimatedWrittenBytes[writerId] = physicalWrittenBytesSinceLastRebalance;
-            }
-
-            writerRowCountSinceLastRebalance = new long[numberOfWriters];
-            writerMaxPartitions = new ArrayList<>(numberOfWriters);
-            for (int writerId = 0; writerId < numberOfWriters; writerId++) {
-                writerMaxPartitions.add(new IndexedPriorityQueue<>());
-            }
-
-            partitionRowCounts.forEach((serializedKey, rowCount) -> {
-                WriterPartitionId writerPartitionId = WriterPartitionId.deserialize(serializedKey);
-                writerRowCountSinceLastRebalance[writerPartitionId.writerId] += rowCount;
-                writerMaxPartitions
-                        .get(writerPartitionId.writerId)
-                        .addOrUpdate(new PartitionIdWithRowCount(writerPartitionId.partitionId, rowCount), rowCount);
-            });
-        }
-
-        private List<WriterId> rebalancePartition(WriterId from, WriterId to)
-        {
-            IndexedPriorityQueue<PartitionIdWithRowCount> maxPartitions = writerMaxPartitions.get(from.id);
-            ImmutableList.Builder<WriterId> affectedWriters = ImmutableList.builder();
-
-            for (PartitionIdWithRowCount partitionToRebalance : maxPartitions) {
-                // Find the partition with maximum written bytes since last rebalance
-                PartitionInfo partitionInfo = partitionInfos[partitionToRebalance.id];
-
-                // If a partition is already rebalanced or min skewed writer is already writing to that partition, then skip
-                // this partition and move on to the other partition inside max writer. Also, we don't rebalance same partition
-                // twice because we want to make sure that every writer wrote writerMinSize for a given partition
-                if (!isPartitionRebalanced(partitionToRebalance.id) && !partitionInfo.containsWriter(to.id)) {
-                    // First remove the partition from the priority queue since there's no need go over it again. As in the next
-                    // section we will check whether it can be scaled or not.
-                    maxPartitions.remove(partitionToRebalance);
-
-                    long estimatedPartitionWrittenBytesSinceLastRebalance = estimatePartitionWrittenBytesSinceLastRebalance(from, partitionToRebalance.rowCount);
-                    long estimatedPartitionWrittenBytes =
-                            estimatedPartitionWrittenBytesSinceLastRebalance + partitionInfo.getPhysicalWrittenBytesAtLastRebalancePerWriter();
-
-                    // Scale the partition when estimated physicalWrittenBytes is greater than writerMinSize.
-                    if (partitionInfo.getWriterCount() <= numberOfWriters && estimatedPartitionWrittenBytes >= writerMinSize) {
-                        partitionInfo.addWriter(to.id);
-                        rebalancedPartitions.add(partitionToRebalance.id);
-                        updateWriterEstimatedWrittenBytes(to, estimatedPartitionWrittenBytesSinceLastRebalance, partitionInfo);
-                        for (int writer : partitionInfo.getWriterIds()) {
-                            affectedWriters.add(new WriterId(writer));
-                        }
-                        log.debug("Scaled partition (%s) to writer %s with writer count %s", partitionToRebalance.id, to.id, partitionInfo.getWriterCount());
-                    }
-
-                    break;
-                }
-            }
-
-            return affectedWriters.build();
-        }
-
-        private void updateWriterEstimatedWrittenBytes(WriterId to, long estimatedPartitionWrittenBytesSinceLastRebalance, PartitionInfo partitionInfo)
-        {
-            // Since a partition is rebalanced from max to min skewed writer, decrease the priority of max
-            // writer as well as increase the priority of min writer.
-            int newWriterCount = partitionInfo.getWriterCount();
-            int oldWriterCount = newWriterCount - 1;
-            for (int writer : partitionInfo.getWriterIds()) {
-                if (writer != to.id) {
-                    writerEstimatedWrittenBytes[writer] -= estimatedPartitionWrittenBytesSinceLastRebalance / newWriterCount;
-                }
-            }
-
-            writerEstimatedWrittenBytes[to.id] += estimatedPartitionWrittenBytesSinceLastRebalance * oldWriterCount / newWriterCount;
-        }
-
-        private long getWriterEstimatedWrittenBytes(WriterId writer)
-        {
-            return writerEstimatedWrittenBytes[writer.id];
-        }
-
-        private boolean isPartitionRebalanced(int partitionId)
-        {
-            return rebalancedPartitions.contains(partitionId);
-        }
-
-        private long estimatePartitionWrittenBytesSinceLastRebalance(WriterId writer, long partitionRowCount)
-        {
-            if (writerRowCountSinceLastRebalance[writer.id] == 0) {
-                return 0L;
-            }
-            return (writerPhysicalWrittenBytesSinceLastRebalance[writer.id] * partitionRowCount) / writerRowCountSinceLastRebalance[writer.id];
-        }
-    }
-
-    @ThreadSafe
-    private static class PartitionInfo
-    {
-        private final List<Integer> writerAssignments;
-        // Partition estimated physical written bytes at the end of last rebalance cycle
-        private final AtomicLong physicalWrittenBytesAtLastRebalance = new AtomicLong(0);
-
-        private PartitionInfo(int initialWriterId)
-        {
-            this.writerAssignments = new CopyOnWriteArrayList<>(ImmutableList.of(initialWriterId));
-        }
-
-        private boolean containsWriter(int writerId)
-        {
-            return writerAssignments.contains(writerId);
-        }
-
-        private void addWriter(int writerId)
-        {
-            writerAssignments.add(writerId);
-        }
-
-        private int getWriterId(int index)
-        {
-            return writerAssignments.get(floorMod(index, getWriterCount()));
-        }
-
-        private List<Integer> getWriterIds()
-        {
-            return ImmutableList.copyOf(writerAssignments);
-        }
-
-        private int getWriterCount()
-        {
-            return writerAssignments.size();
-        }
-
-        private void resetPhysicalWrittenBytesAtLastRebalance()
-        {
-            physicalWrittenBytesAtLastRebalance.set(0);
-        }
-
-        private void addToPhysicalWrittenBytesAtLastRebalance(long writtenBytes)
-        {
-            physicalWrittenBytesAtLastRebalance.addAndGet(writtenBytes);
-        }
-
-        private long getPhysicalWrittenBytesAtLastRebalancePerWriter()
-        {
-            return physicalWrittenBytesAtLastRebalance.get() / writerAssignments.size();
-        }
-    }
-
-    public record WriterPartitionId(int writerId, int partitionId)
-    {
-        public static WriterPartitionId deserialize(long value)
-        {
-            int writerId = (int) (value >> 32);
-            int partitionId = (int) value;
-
-            return new WriterPartitionId(writerId, partitionId);
-        }
-
-        public static long serialize(WriterPartitionId writerPartitionId)
-        {
-            // Serialize to long to save memory where first 32 bit contains writerId whereas last 32 bit
-            // contains partitionId.
-            return ((long) writerPartitionId.writerId << 32 | writerPartitionId.partitionId & 0xFFFFFFFFL);
-        }
-
-        public WriterPartitionId(int writerId, int partitionId)
-        {
-            this.writerId = writerId;
-            this.partitionId = partitionId;
-        }
-    }
-
-    private record WriterId(int id)
-    {
-        private WriterId(int id)
-        {
-            this.id = id;
-        }
-    }
-
-    private record PartitionIdWithRowCount(int id, long rowCount)
-    {
-        private PartitionIdWithRowCount(int id, long rowCount)
-        {
-            this.id = id;
-            this.rowCount = rowCount;
-        }
-
-        @Override
-        public boolean equals(Object o)
-        {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            PartitionIdWithRowCount that = (PartitionIdWithRowCount) o;
-            return id == that.id;
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hashCode(id);
-        }
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/index/IndexJoinLookupStats.java b/core/trino-main/src/main/java/io/trino/operator/index/IndexJoinLookupStats.java
index 8e84f9261887..f1d928c813ab 100644
--- a/core/trino-main/src/main/java/io/trino/operator/index/IndexJoinLookupStats.java
+++ b/core/trino-main/src/main/java/io/trino/operator/index/IndexJoinLookupStats.java
@@ -13,12 +13,11 @@
  */
 package io.trino.operator.index;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.stats.CounterStat;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 @ThreadSafe
 public class IndexJoinLookupStats
 {
diff --git a/core/trino-main/src/main/java/io/trino/operator/index/IndexLoader.java b/core/trino-main/src/main/java/io/trino/operator/index/IndexLoader.java
index bc14bfc18beb..2eef30a052d3 100644
--- a/core/trino-main/src/main/java/io/trino/operator/index/IndexLoader.java
+++ b/core/trino-main/src/main/java/io/trino/operator/index/IndexLoader.java
@@ -1,4 +1,4 @@
-/*
+ /*
  * Licensed 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
@@ -16,7 +16,10 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.units.DataSize;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.execution.ScheduledSplit;
 import io.trino.execution.SplitAssignment;
 import io.trino.metadata.Split;
@@ -36,10 +39,6 @@
 import io.trino.type.BlockTypeOperators;
 import io.trino.type.BlockTypeOperators.BlockPositionEqual;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.OptionalInt;
@@ -75,7 +74,6 @@ public class IndexLoader
     private final List<BlockPositionEqual> keyEqualOperators;
     private final PagesIndex.Factory pagesIndexFactory;
     private final JoinCompiler joinCompiler;
-    private final BlockTypeOperators blockTypeOperators;
 
     @GuardedBy("this")
     private IndexSnapshotLoader indexSnapshotLoader; // Lazily initialized
@@ -111,7 +109,6 @@ public IndexLoader(
         requireNonNull(stats, "stats is null");
         requireNonNull(pagesIndexFactory, "pagesIndexFactory is null");
         requireNonNull(joinCompiler, "joinCompiler is null");
-        requireNonNull(blockTypeOperators, "blockTypeOperators is null");
 
         this.lookupSourceInputChannels = ImmutableSet.copyOf(lookupSourceInputChannels);
         this.keyOutputChannels = ImmutableList.copyOf(keyOutputChannels);
@@ -123,7 +120,6 @@ public IndexLoader(
         this.stats = stats;
         this.pagesIndexFactory = pagesIndexFactory;
         this.joinCompiler = joinCompiler;
-        this.blockTypeOperators = blockTypeOperators;
 
         this.keyTypes = keyOutputChannels.stream()
                 .map(outputTypes::get)
@@ -267,8 +263,7 @@ private synchronized void initializeStateIfNecessary()
                     expectedPositions,
                     maxIndexMemorySize,
                     pagesIndexFactory,
-                    joinCompiler,
-                    blockTypeOperators);
+                    joinCompiler);
         }
     }
 
@@ -282,7 +277,6 @@ private static class IndexSnapshotLoader
         private final List<Type> indexTypes;
         private final AtomicReference<IndexSnapshot> indexSnapshotReference;
         private final JoinCompiler joinCompiler;
-        private final BlockTypeOperators blockTypeOperators;
 
         private final IndexSnapshotBuilder indexSnapshotBuilder;
 
@@ -297,15 +291,13 @@ private IndexSnapshotLoader(
                 int expectedPositions,
                 DataSize maxIndexMemorySize,
                 PagesIndex.Factory pagesIndexFactory,
-                JoinCompiler joinCompiler,
-                BlockTypeOperators blockTypeOperators)
+                JoinCompiler joinCompiler)
         {
             this.pipelineContext = pipelineContext;
             this.indexSnapshotReference = indexSnapshotReference;
             this.lookupSourceInputChannels = lookupSourceInputChannels;
             this.indexTypes = indexTypes;
             this.joinCompiler = joinCompiler;
-            this.blockTypeOperators = blockTypeOperators;
 
             List<Type> outputTypes = indexBuildDriverFactoryProvider.getOutputTypes();
             this.indexSnapshotBuilder = new IndexSnapshotBuilder(
@@ -333,7 +325,7 @@ public long getCacheSizeInBytes()
         public boolean load(List<UpdateRequest> requests)
         {
             // Generate a RecordSet that only presents index keys that have not been cached and are deduped based on lookupSourceInputChannels
-            UnloadedIndexKeyRecordSet recordSetForLookupSource = new UnloadedIndexKeyRecordSet(pipelineContext.getSession(), indexSnapshotReference.get(), lookupSourceInputChannels, indexTypes, requests, joinCompiler, blockTypeOperators);
+            UnloadedIndexKeyRecordSet recordSetForLookupSource = new UnloadedIndexKeyRecordSet(pipelineContext.getSession(), indexSnapshotReference.get(), lookupSourceInputChannels, indexTypes, requests, joinCompiler);
 
             // Drive index lookup to produce the output (landing in indexSnapshotBuilder)
             try (Driver driver = driverFactory.createDriver(pipelineContext.addDriverContext())) {
@@ -354,7 +346,7 @@ public boolean load(List<UpdateRequest> requests)
             // Generate a RecordSet that presents unique index keys that have not been cached
             UnloadedIndexKeyRecordSet indexKeysRecordSet = (lookupSourceInputChannels.equals(allInputChannels))
                     ? recordSetForLookupSource
-                    : new UnloadedIndexKeyRecordSet(pipelineContext.getSession(), indexSnapshotReference.get(), allInputChannels, indexTypes, requests, joinCompiler, blockTypeOperators);
+                    : new UnloadedIndexKeyRecordSet(pipelineContext.getSession(), indexSnapshotReference.get(), allInputChannels, indexTypes, requests, joinCompiler);
 
             // Create lookup source with new data
             IndexSnapshot newValue = indexSnapshotBuilder.createIndexSnapshot(indexKeysRecordSet);
diff --git a/core/trino-main/src/main/java/io/trino/operator/index/IndexLookupSource.java b/core/trino-main/src/main/java/io/trino/operator/index/IndexLookupSource.java
index 03724e9febb1..f9c6e23ffefa 100644
--- a/core/trino-main/src/main/java/io/trino/operator/index/IndexLookupSource.java
+++ b/core/trino-main/src/main/java/io/trino/operator/index/IndexLookupSource.java
@@ -13,12 +13,11 @@
  */
 package io.trino.operator.index;
 
+import io.trino.annotation.NotThreadSafe;
 import io.trino.operator.join.LookupSource;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.operator.index.IndexSnapshot.UNLOADED_INDEX_KEY;
 import static java.util.Objects.requireNonNull;
diff --git a/core/trino-main/src/main/java/io/trino/operator/index/IndexLookupSourceFactory.java b/core/trino-main/src/main/java/io/trino/operator/index/IndexLookupSourceFactory.java
index df2554789a36..663f4bc0a727 100644
--- a/core/trino-main/src/main/java/io/trino/operator/index/IndexLookupSourceFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/index/IndexLookupSourceFactory.java
@@ -62,11 +62,33 @@ public IndexLookupSourceFactory(
         this.outputTypes = ImmutableList.copyOf(requireNonNull(outputTypes, "outputTypes is null"));
 
         if (shareIndexLoading) {
-            IndexLoader shared = new IndexLoader(lookupSourceInputChannels, keyOutputChannels, keyOutputHashChannel, outputTypes, indexBuildDriverFactoryProvider, 10_000, maxIndexMemorySize, stats, pagesIndexFactory, joinCompiler, blockTypeOperators);
+            IndexLoader shared = new IndexLoader(
+                    lookupSourceInputChannels,
+                    keyOutputChannels,
+                    keyOutputHashChannel,
+                    outputTypes,
+                    indexBuildDriverFactoryProvider,
+                    10_000,
+                    maxIndexMemorySize,
+                    stats,
+                    pagesIndexFactory,
+                    joinCompiler,
+                    blockTypeOperators);
             this.indexLoaderSupplier = () -> shared;
         }
         else {
-            this.indexLoaderSupplier = () -> new IndexLoader(lookupSourceInputChannels, keyOutputChannels, keyOutputHashChannel, outputTypes, indexBuildDriverFactoryProvider, 10_000, maxIndexMemorySize, stats, pagesIndexFactory, joinCompiler, blockTypeOperators);
+            this.indexLoaderSupplier = () -> new IndexLoader(
+                    lookupSourceInputChannels,
+                    keyOutputChannels,
+                    keyOutputHashChannel,
+                    outputTypes,
+                    indexBuildDriverFactoryProvider,
+                    10_000,
+                    maxIndexMemorySize,
+                    stats,
+                    pagesIndexFactory,
+                    joinCompiler,
+                    blockTypeOperators);
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/index/IndexSnapshot.java b/core/trino-main/src/main/java/io/trino/operator/index/IndexSnapshot.java
index 59cf792cb8ce..2bbace6222f0 100644
--- a/core/trino-main/src/main/java/io/trino/operator/index/IndexSnapshot.java
+++ b/core/trino-main/src/main/java/io/trino/operator/index/IndexSnapshot.java
@@ -13,12 +13,11 @@
  */
 package io.trino.operator.index;
 
+import com.google.errorprone.annotations.Immutable;
 import io.trino.operator.join.LookupSource;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 
-import javax.annotation.concurrent.Immutable;
-
 import static java.util.Objects.requireNonNull;
 
 @Immutable
diff --git a/core/trino-main/src/main/java/io/trino/operator/index/PageBuffer.java b/core/trino-main/src/main/java/io/trino/operator/index/PageBuffer.java
index bed279ef0825..6877d7321305 100644
--- a/core/trino-main/src/main/java/io/trino/operator/index/PageBuffer.java
+++ b/core/trino-main/src/main/java/io/trino/operator/index/PageBuffer.java
@@ -15,10 +15,9 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.spi.Page;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.ArrayDeque;
 import java.util.Queue;
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/index/PagesIndexBuilderOperator.java b/core/trino-main/src/main/java/io/trino/operator/index/PagesIndexBuilderOperator.java
index 591bb7d5d2a4..9d074c87b153 100644
--- a/core/trino-main/src/main/java/io/trino/operator/index/PagesIndexBuilderOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/index/PagesIndexBuilderOperator.java
@@ -13,6 +13,7 @@
  */
 package io.trino.operator.index;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.operator.DriverContext;
 import io.trino.operator.Operator;
 import io.trino.operator.OperatorContext;
@@ -20,8 +21,6 @@
 import io.trino.spi.Page;
 import io.trino.sql.planner.plan.PlanNodeId;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/index/StreamingIndexedData.java b/core/trino-main/src/main/java/io/trino/operator/index/StreamingIndexedData.java
index 535822eeb1ef..6ebcdedddc64 100644
--- a/core/trino-main/src/main/java/io/trino/operator/index/StreamingIndexedData.java
+++ b/core/trino-main/src/main/java/io/trino/operator/index/StreamingIndexedData.java
@@ -14,6 +14,7 @@
 package io.trino.operator.index;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.operator.Driver;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
@@ -22,8 +23,6 @@
 import io.trino.spi.type.Type;
 import io.trino.type.BlockTypeOperators.BlockPositionEqual;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/operator/index/UnloadedIndexKeyRecordSet.java b/core/trino-main/src/main/java/io/trino/operator/index/UnloadedIndexKeyRecordSet.java
index c604446b5c71..aef4d56044b9 100644
--- a/core/trino-main/src/main/java/io/trino/operator/index/UnloadedIndexKeyRecordSet.java
+++ b/core/trino-main/src/main/java/io/trino/operator/index/UnloadedIndexKeyRecordSet.java
@@ -18,7 +18,6 @@
 import io.airlift.slice.Slice;
 import io.trino.Session;
 import io.trino.operator.GroupByHash;
-import io.trino.operator.GroupByIdBlock;
 import io.trino.operator.Work;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
@@ -26,7 +25,6 @@
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.JoinCompiler;
-import io.trino.type.BlockTypeOperators;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 import it.unimi.dsi.fastutil.ints.IntListIterator;
@@ -34,10 +32,8 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static io.trino.operator.GroupByHash.createGroupByHash;
@@ -57,43 +53,40 @@ public UnloadedIndexKeyRecordSet(
             Set<Integer> channelsForDistinct,
             List<Type> types,
             List<UpdateRequest> requests,
-            JoinCompiler joinCompiler,
-            BlockTypeOperators blockTypeOperators)
+            JoinCompiler joinCompiler)
     {
         requireNonNull(existingSnapshot, "existingSnapshot is null");
         this.types = ImmutableList.copyOf(requireNonNull(types, "types is null"));
         requireNonNull(requests, "requests is null");
 
         int[] distinctChannels = Ints.toArray(channelsForDistinct);
-        int[] normalizedDistinctChannels = new int[distinctChannels.length];
         List<Type> distinctChannelTypes = new ArrayList<>(distinctChannels.length);
         for (int i = 0; i < distinctChannels.length; i++) {
-            normalizedDistinctChannels[i] = i;
             distinctChannelTypes.add(types.get(distinctChannels[i]));
         }
 
         ImmutableList.Builder<PageAndPositions> builder = ImmutableList.builder();
-        GroupByHash groupByHash = createGroupByHash(session, distinctChannelTypes, normalizedDistinctChannels, Optional.empty(), 10_000, joinCompiler, blockTypeOperators, NOOP);
+        GroupByHash groupByHash = createGroupByHash(session, distinctChannelTypes, false, 10_000, joinCompiler, NOOP);
         for (UpdateRequest request : requests) {
             Page page = request.getPage();
 
             // Move through the positions while advancing the cursors in lockstep
-            Work<GroupByIdBlock> work = groupByHash.getGroupIds(page.getColumns(distinctChannels));
+            Work<int[]> work = groupByHash.getGroupIds(page.getColumns(distinctChannels));
             boolean done = work.process();
             // TODO: this class does not yield wrt memory limit; enable it
             verify(done);
-            GroupByIdBlock groupIds = work.getResult();
+            int[] groupIds = work.getResult();
             int positionCount = page.getBlock(0).getPositionCount();
-            long nextDistinctId = -1;
-            checkArgument(groupIds.getGroupCount() <= Integer.MAX_VALUE);
-            IntList positions = new IntArrayList((int) groupIds.getGroupCount());
+            int nextDistinctId = -1;
+            int groupCount = groupByHash.getGroupCount();
+            IntList positions = new IntArrayList(groupCount);
             for (int position = 0; position < positionCount; position++) {
                 // We are reading ahead in the cursors, so we need to filter any nulls since they cannot join
                 if (!containsNullValue(position, page)) {
                     // Only include the key if it is not already in the index
                     if (existingSnapshot.getJoinPosition(position, page) == UNLOADED_INDEX_KEY) {
                         // Only add the position if we have not seen this tuple before (based on the distinct channels)
-                        long groupId = groupIds.getGroupId(position);
+                        int groupId = groupIds[position];
                         if (nextDistinctId < groupId) {
                             nextDistinctId = groupId;
                             positions.add(position);
diff --git a/core/trino-main/src/main/java/io/trino/operator/index/UpdateRequest.java b/core/trino-main/src/main/java/io/trino/operator/index/UpdateRequest.java
index 8b4647b16078..aae348fd2f8b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/index/UpdateRequest.java
+++ b/core/trino-main/src/main/java/io/trino/operator/index/UpdateRequest.java
@@ -14,11 +14,10 @@
 package io.trino.operator.index;
 
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.concurrent.MoreFutures;
 import io.trino.spi.Page;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/ArrayPositionLinks.java b/core/trino-main/src/main/java/io/trino/operator/join/ArrayPositionLinks.java
index a471b60bf6f5..37f2c82954db 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/ArrayPositionLinks.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/ArrayPositionLinks.java
@@ -13,7 +13,6 @@
  */
 package io.trino.operator.join;
 
-import io.airlift.slice.Slices;
 import io.airlift.slice.XxHash64;
 import io.trino.spi.Page;
 
@@ -64,7 +63,11 @@ public PositionLinks create(List<JoinFilterFunction> searchFunctions)
                 @Override
                 public long checksum()
                 {
-                    return XxHash64.hash(Slices.wrappedIntArray(positionLinks));
+                    long hash = 0;
+                    for (int positionLink : positionLinks) {
+                        hash = XxHash64.hash(hash, positionLink);
+                    }
+                    return hash;
                 }
             };
         }
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/DefaultPageJoiner.java b/core/trino-main/src/main/java/io/trino/operator/join/DefaultPageJoiner.java
index b2dc1d9fb216..d737b873feb5 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/DefaultPageJoiner.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/DefaultPageJoiner.java
@@ -28,8 +28,7 @@
 import io.trino.spi.type.Type;
 import io.trino.spiller.PartitioningSpiller;
 import io.trino.spiller.PartitioningSpillerFactory;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/DefaultPagesHash.java b/core/trino-main/src/main/java/io/trino/operator/join/DefaultPagesHash.java
index fbac2137741f..9764cd8e8687 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/DefaultPagesHash.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/DefaultPagesHash.java
@@ -179,6 +179,9 @@ public int getAddressIndex(int rightPosition, Page hashChannelsPage, long rawHas
     @Override
     public int[] getAddressIndex(int[] positions, Page hashChannelsPage)
     {
+        if (positions.length == 0) {
+            return new int[0];
+        }
         long[] hashes = new long[positions[positions.length - 1] + 1];
         for (int i = 0; i < positions.length; i++) {
             hashes[positions[i]] = pagesHashStrategy.hashRow(positions[i], hashChannelsPage);
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/HashBuilderOperator.java b/core/trino-main/src/main/java/io/trino/operator/join/HashBuilderOperator.java
index 2b75f876f036..958b650d1d5d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/HashBuilderOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/HashBuilderOperator.java
@@ -18,6 +18,7 @@
 import com.google.common.io.Closer;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.log.Logger;
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.operator.DriverContext;
@@ -31,9 +32,7 @@
 import io.trino.spiller.SingleStreamSpillerFactory;
 import io.trino.sql.gen.JoinFilterFunctionCompiler.JoinFilterFunctionFactory;
 import io.trino.sql.planner.plan.PlanNodeId;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.util.ArrayDeque;
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/JoinFilterFunction.java b/core/trino-main/src/main/java/io/trino/operator/join/JoinFilterFunction.java
index 5c1bc152578f..55da445c428e 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/JoinFilterFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/JoinFilterFunction.java
@@ -13,10 +13,9 @@
  */
 package io.trino.operator.join;
 
+import io.trino.annotation.NotThreadSafe;
 import io.trino.spi.Page;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 @NotThreadSafe
 public interface JoinFilterFunction
 {
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/JoinHash.java b/core/trino-main/src/main/java/io/trino/operator/join/JoinHash.java
index bf3f9e0f43d3..dec02813a47b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/JoinHash.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/JoinHash.java
@@ -15,8 +15,7 @@
 
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/JoinOperatorInfo.java b/core/trino-main/src/main/java/io/trino/operator/join/JoinOperatorInfo.java
index 9668efd911de..4a833d684be1 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/JoinOperatorInfo.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/JoinOperatorInfo.java
@@ -33,8 +33,10 @@ public class JoinOperatorInfo
     private final long[] logHistogramProbes;
     private final long[] logHistogramOutput;
     private final Optional<Long> lookupSourcePositions;
+    private final long rleProbes;
+    private final long totalProbes;
 
-    public static JoinOperatorInfo createJoinOperatorInfo(JoinType joinType, long[] logHistogramCounters, Optional<Long> lookupSourcePositions)
+    public static JoinOperatorInfo createJoinOperatorInfo(JoinType joinType, long[] logHistogramCounters, Optional<Long> lookupSourcePositions, long rleProbes, long totalProbes)
     {
         long[] logHistogramProbes = new long[HISTOGRAM_BUCKETS];
         long[] logHistogramOutput = new long[HISTOGRAM_BUCKETS];
@@ -42,7 +44,7 @@ public static JoinOperatorInfo createJoinOperatorInfo(JoinType joinType, long[]
             logHistogramProbes[i] = logHistogramCounters[2 * i];
             logHistogramOutput[i] = logHistogramCounters[2 * i + 1];
         }
-        return new JoinOperatorInfo(joinType, logHistogramProbes, logHistogramOutput, lookupSourcePositions);
+        return new JoinOperatorInfo(joinType, logHistogramProbes, logHistogramOutput, lookupSourcePositions, rleProbes, totalProbes);
     }
 
     @JsonCreator
@@ -50,7 +52,9 @@ public JoinOperatorInfo(
             @JsonProperty("joinType") JoinType joinType,
             @JsonProperty("logHistogramProbes") long[] logHistogramProbes,
             @JsonProperty("logHistogramOutput") long[] logHistogramOutput,
-            @JsonProperty("lookupSourcePositions") Optional<Long> lookupSourcePositions)
+            @JsonProperty("lookupSourcePositions") Optional<Long> lookupSourcePositions,
+            @JsonProperty("rleProbes") long rleProbes,
+            @JsonProperty("totalProbes") long totalProbes)
     {
         checkArgument(logHistogramProbes.length == HISTOGRAM_BUCKETS);
         checkArgument(logHistogramOutput.length == HISTOGRAM_BUCKETS);
@@ -58,6 +62,8 @@ public JoinOperatorInfo(
         this.logHistogramProbes = logHistogramProbes;
         this.logHistogramOutput = logHistogramOutput;
         this.lookupSourcePositions = lookupSourcePositions;
+        this.rleProbes = rleProbes;
+        this.totalProbes = totalProbes;
     }
 
     @JsonProperty
@@ -87,6 +93,18 @@ public Optional<Long> getLookupSourcePositions()
         return lookupSourcePositions;
     }
 
+    @JsonProperty
+    public long getRleProbes()
+    {
+        return rleProbes;
+    }
+
+    @JsonProperty
+    public long getTotalProbes()
+    {
+        return totalProbes;
+    }
+
     @Override
     public String toString()
     {
@@ -95,6 +113,8 @@ public String toString()
                 .add("logHistogramProbes", logHistogramProbes)
                 .add("logHistogramOutput", logHistogramOutput)
                 .add("lookupSourcePositions", lookupSourcePositions)
+                .add("rleProbes", rleProbes)
+                .add("totalProbes", totalProbes)
                 .toString();
     }
 
@@ -114,7 +134,7 @@ public JoinOperatorInfo mergeWith(JoinOperatorInfo other)
             mergedSourcePositions = Optional.of(this.lookupSourcePositions.orElse(0L) + other.lookupSourcePositions.orElse(0L));
         }
 
-        return new JoinOperatorInfo(this.joinType, logHistogramProbes, logHistogramOutput, mergedSourcePositions);
+        return new JoinOperatorInfo(this.joinType, logHistogramProbes, logHistogramOutput, mergedSourcePositions, this.rleProbes + other.rleProbes, this.totalProbes + other.totalProbes);
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/JoinProbe.java b/core/trino-main/src/main/java/io/trino/operator/join/JoinProbe.java
index 0fe47b280876..fc5f6e979fc2 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/JoinProbe.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/JoinProbe.java
@@ -16,8 +16,7 @@
 import com.google.common.primitives.Ints;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.OptionalInt;
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/JoinStatisticsCounter.java b/core/trino-main/src/main/java/io/trino/operator/join/JoinStatisticsCounter.java
index 2f1421ee78fd..c6853262a549 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/JoinStatisticsCounter.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/JoinStatisticsCounter.java
@@ -37,6 +37,9 @@ public class JoinStatisticsCounter
     //      [2*bucket + 1]  total count of rows that were produces by probe rows in this bucket.
     private final long[] logHistogramCounters = new long[HISTOGRAM_BUCKETS * 2];
 
+    private long rleProbes;
+    private long totalProbes;
+
     /**
      * Estimated number of positions in on the build side
      */
@@ -71,9 +74,19 @@ else if (numSourcePositions <= 100) {
         logHistogramCounters[2 * bucket + 1] += numSourcePositions;
     }
 
+    public void recordRleProbe()
+    {
+        rleProbes++;
+    }
+
+    public void recordCreateProbe()
+    {
+        totalProbes++;
+    }
+
     @Override
     public JoinOperatorInfo get()
     {
-        return createJoinOperatorInfo(joinType, logHistogramCounters, lookupSourcePositions);
+        return createJoinOperatorInfo(joinType, logHistogramCounters, lookupSourcePositions, rleProbes, totalProbes);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/LookupJoinOperatorFactory.java b/core/trino-main/src/main/java/io/trino/operator/join/LookupJoinOperatorFactory.java
index db0babd09068..3e0406ac0d3d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/LookupJoinOperatorFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/LookupJoinOperatorFactory.java
@@ -14,12 +14,12 @@
 package io.trino.operator.join;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.primitives.Ints;
 import io.trino.operator.DriverContext;
 import io.trino.operator.HashGenerator;
-import io.trino.operator.InterpretedHashGenerator;
+import io.trino.operator.JoinOperatorType;
 import io.trino.operator.Operator;
 import io.trino.operator.OperatorContext;
-import io.trino.operator.OperatorFactories.JoinOperatorType;
 import io.trino.operator.OperatorFactory;
 import io.trino.operator.PrecomputedHashGenerator;
 import io.trino.operator.ProcessorContext;
@@ -32,9 +32,9 @@
 import io.trino.operator.join.LookupOuterOperator.LookupOuterOperatorFactory;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.spiller.PartitioningSpillerFactory;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
 import java.util.Optional;
@@ -43,6 +43,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.operator.InterpretedHashGenerator.createChannelsHashGenerator;
 import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.INNER;
 import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.PROBE_OUTER;
 import static java.util.Objects.requireNonNull;
@@ -83,7 +84,7 @@ public LookupJoinOperatorFactory(
             List<Type> buildOutputTypes,
             JoinOperatorType joinOperatorType,
             JoinProbeFactory joinProbeFactory,
-            BlockTypeOperators blockTypeOperators,
+            TypeOperators typeOperators,
             OptionalInt totalOperatorsCount,
             List<Integer> probeJoinChannels,
             OptionalInt probeHashChannel,
@@ -123,7 +124,7 @@ public LookupJoinOperatorFactory(
             List<Type> hashTypes = probeJoinChannels.stream()
                     .map(probeTypes::get)
                     .collect(toImmutableList());
-            this.probeHashGenerator = new InterpretedHashGenerator(hashTypes, probeJoinChannels, blockTypeOperators);
+            this.probeHashGenerator = createChannelsHashGenerator(hashTypes, Ints.toArray(probeJoinChannels), typeOperators);
         }
 
         this.partitioningSpillerFactory = requireNonNull(partitioningSpillerFactory, "partitioningSpillerFactory is null");
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/LookupJoinPageBuilder.java b/core/trino-main/src/main/java/io/trino/operator/join/LookupJoinPageBuilder.java
index 7307530f680a..03b625c8ffda 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/LookupJoinPageBuilder.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/LookupJoinPageBuilder.java
@@ -38,8 +38,8 @@ public class LookupJoinPageBuilder
     private final IntArrayList probeIndexBuilder = new IntArrayList();
     private final PageBuilder buildPageBuilder;
     private final int buildOutputChannelCount;
-    private int estimatedProbeBlockBytes;
-    private int estimatedProbeRowSize = -1;
+    private long estimatedProbeBlockBytes;
+    private long estimatedProbeRowSize = -1;
     private int previousPosition = -1;
     private boolean isSequentialProbeIndices = true;
 
@@ -196,13 +196,13 @@ private void appendProbeIndex(JoinProbe probe)
         }
     }
 
-    private int getEstimatedProbeRowSize(JoinProbe probe)
+    private long getEstimatedProbeRowSize(JoinProbe probe)
     {
         if (estimatedProbeRowSize != -1) {
             return estimatedProbeRowSize;
         }
 
-        int estimatedProbeRowSize = 0;
+        long estimatedProbeRowSize = 0;
         for (int index : probe.getOutputChannels()) {
             Block block = probe.getPage().getBlock(index);
             // Estimate the size of the probe row
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/LookupSource.java b/core/trino-main/src/main/java/io/trino/operator/join/LookupSource.java
index 5b83fdf931b2..a98f024621ad 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/LookupSource.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/LookupSource.java
@@ -13,11 +13,10 @@
  */
 package io.trino.operator.join;
 
+import io.trino.annotation.NotThreadSafe;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.io.Closeable;
 
 @NotThreadSafe
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/OuterLookupSource.java b/core/trino-main/src/main/java/io/trino/operator/join/OuterLookupSource.java
index cbeb4d88f681..5defc0b6eac4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/OuterLookupSource.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/OuterLookupSource.java
@@ -13,13 +13,12 @@
  */
 package io.trino.operator.join;
 
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.function.Supplier;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/PartitionedConsumption.java b/core/trino-main/src/main/java/io/trino/operator/join/PartitionedConsumption.java
index 4047d9095d16..c37045eeb211 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/PartitionedConsumption.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/PartitionedConsumption.java
@@ -18,10 +18,9 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import jakarta.annotation.Nullable;
 
 import java.util.ArrayDeque;
 import java.util.Iterator;
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/PartitionedLookupSource.java b/core/trino-main/src/main/java/io/trino/operator/join/PartitionedLookupSource.java
index e53f073b868c..3ad6e7268b6b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/PartitionedLookupSource.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/PartitionedLookupSource.java
@@ -14,16 +14,14 @@
 package io.trino.operator.join;
 
 import com.google.common.io.Closer;
-import io.trino.operator.InterpretedHashGenerator;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.operator.exchange.LocalPartitionGenerator;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
+import io.trino.spi.type.TypeOperators;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -36,6 +34,7 @@
 
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.operator.InterpretedHashGenerator.createPagePrefixHashGenerator;
 import static java.lang.Integer.numberOfTrailingZeros;
 import static java.lang.Math.toIntExact;
 
@@ -43,7 +42,7 @@
 public class PartitionedLookupSource
         implements LookupSource
 {
-    public static TrackingLookupSourceSupplier createPartitionedLookupSourceSupplier(List<Supplier<LookupSource>> partitions, List<Type> hashChannelTypes, boolean outer, BlockTypeOperators blockTypeOperators)
+    public static TrackingLookupSourceSupplier createPartitionedLookupSourceSupplier(List<Supplier<LookupSource>> partitions, List<Type> hashChannelTypes, boolean outer, TypeOperators typeOperators)
     {
         if (outer) {
             OuterPositionTracker.Factory outerPositionTrackerFactory = new OuterPositionTracker.Factory(partitions);
@@ -59,7 +58,7 @@ public LookupSource getLookupSource()
                                     .collect(toImmutableList()),
                             hashChannelTypes,
                             Optional.of(outerPositionTrackerFactory.create()),
-                            blockTypeOperators);
+                            typeOperators);
                 }
 
                 @Override
@@ -76,7 +75,7 @@ public OuterPositionIterator getOuterPositionIterator()
                                 .collect(toImmutableList()),
                         hashChannelTypes,
                         Optional.empty(),
-                        blockTypeOperators));
+                        typeOperators));
     }
 
     private final LookupSource[] lookupSources;
@@ -88,13 +87,13 @@ public OuterPositionIterator getOuterPositionIterator()
 
     private boolean closed;
 
-    private PartitionedLookupSource(List<? extends LookupSource> lookupSources, List<Type> hashChannelTypes, Optional<OuterPositionTracker> outerPositionTracker, BlockTypeOperators blockTypeOperators)
+    private PartitionedLookupSource(List<? extends LookupSource> lookupSources, List<Type> hashChannelTypes, Optional<OuterPositionTracker> outerPositionTracker, TypeOperators typeOperators)
     {
         this.lookupSources = lookupSources.toArray(new LookupSource[lookupSources.size()]);
 
         // this generator is only used for getJoinPosition without a rawHash and in this case
         // the hash channels are always packed in a page without extra columns
-        this.partitionGenerator = new LocalPartitionGenerator(InterpretedHashGenerator.createPositionalWithTypes(hashChannelTypes, blockTypeOperators), lookupSources.size());
+        this.partitionGenerator = new LocalPartitionGenerator(createPagePrefixHashGenerator(hashChannelTypes, typeOperators), lookupSources.size());
 
         this.partitionMask = lookupSources.size() - 1;
         this.shiftSize = numberOfTrailingZeros(lookupSources.size()) + 1;
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/PartitionedLookupSourceFactory.java b/core/trino-main/src/main/java/io/trino/operator/join/PartitionedLookupSourceFactory.java
index 185d779ca495..2b99e73cf4e9 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/PartitionedLookupSourceFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/PartitionedLookupSourceFactory.java
@@ -17,15 +17,14 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.Immutable;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.operator.join.LookupSourceProvider.LookupSourceLease;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.Immutable;
-import javax.annotation.concurrent.NotThreadSafe;
+import io.trino.spi.type.TypeOperators;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -63,7 +62,7 @@ public final class PartitionedLookupSourceFactory
     private final List<Type> hashChannelTypes;
     private final boolean outer;
     private final SpilledLookupSource spilledLookupSource;
-    private final BlockTypeOperators blockTypeOperators;
+    private final TypeOperators typeOperators;
 
     private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
@@ -108,7 +107,7 @@ public final class PartitionedLookupSourceFactory
      */
     private final ConcurrentHashMap<SpillAwareLookupSourceProvider, LookupSource> suppliedLookupSources = new ConcurrentHashMap<>();
 
-    public PartitionedLookupSourceFactory(List<Type> types, List<Type> outputTypes, List<Type> hashChannelTypes, int partitionCount, boolean outer, BlockTypeOperators blockTypeOperators)
+    public PartitionedLookupSourceFactory(List<Type> types, List<Type> outputTypes, List<Type> hashChannelTypes, int partitionCount, boolean outer, TypeOperators typeOperators)
     {
         checkArgument(Integer.bitCount(partitionCount) == 1, "partitionCount must be a power of 2");
 
@@ -120,7 +119,7 @@ public PartitionedLookupSourceFactory(List<Type> types, List<Type> outputTypes,
         this.partitions = (Supplier<LookupSource>[]) new Supplier<?>[partitionCount];
         this.outer = outer;
         spilledLookupSource = new SpilledLookupSource();
-        this.blockTypeOperators = blockTypeOperators;
+        this.typeOperators = typeOperators;
     }
 
     @Override
@@ -241,7 +240,7 @@ public void setPartitionSpilledLookupSourceHandle(int partitionIndex, SpilledLoo
                 verify(!completed, "lookupSourceSupplier already exist when completing");
                 verify(!outer, "It is not possible to reset lookupSourceSupplier which is tracking for outer join");
                 verify(partitions.length > 1, "Spill occurred when only one partition");
-                lookupSourceSupplier = createPartitionedLookupSourceSupplier(ImmutableList.copyOf(partitions), hashChannelTypes, outer, blockTypeOperators);
+                lookupSourceSupplier = createPartitionedLookupSourceSupplier(ImmutableList.copyOf(partitions), hashChannelTypes, outer, typeOperators);
                 closeCachedLookupSources();
             }
             else {
@@ -274,7 +273,7 @@ private void supplyLookupSources()
 
             if (partitionsSet != 1) {
                 List<Supplier<LookupSource>> partitions = ImmutableList.copyOf(this.partitions);
-                this.lookupSourceSupplier = createPartitionedLookupSourceSupplier(partitions, hashChannelTypes, outer, blockTypeOperators);
+                this.lookupSourceSupplier = createPartitionedLookupSourceSupplier(partitions, hashChannelTypes, outer, typeOperators);
             }
             else if (outer) {
                 this.lookupSourceSupplier = createOuterLookupSourceSupplier(partitions[0]);
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/SpilledLookupSourceHandle.java b/core/trino-main/src/main/java/io/trino/operator/join/SpilledLookupSourceHandle.java
index 9a532d52fa50..cdf37fa57240 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/SpilledLookupSourceHandle.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/SpilledLookupSourceHandle.java
@@ -16,10 +16,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import jakarta.annotation.Nullable;
 
 import java.util.function.Supplier;
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/SpillingJoinProcessor.java b/core/trino-main/src/main/java/io/trino/operator/join/SpillingJoinProcessor.java
index 8329c7d5279c..3d34924866b2 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/SpillingJoinProcessor.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/SpillingJoinProcessor.java
@@ -21,8 +21,7 @@
 import io.trino.operator.join.PageJoiner.PageJoinerFactory;
 import io.trino.spi.Page;
 import io.trino.spiller.PartitioningSpillerFactory;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.util.Iterator;
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/HashBuilderOperator.java b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/HashBuilderOperator.java
index 7b66ffd6a115..7356c6dd830c 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/HashBuilderOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/HashBuilderOperator.java
@@ -16,6 +16,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.operator.DriverContext;
 import io.trino.operator.HashArraySizeSupplier;
@@ -28,9 +29,7 @@
 import io.trino.spi.Page;
 import io.trino.sql.gen.JoinFilterFunctionCompiler.JoinFilterFunctionFactory;
 import io.trino.sql.planner.plan.PlanNodeId;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/JoinProbe.java b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/JoinProbe.java
index 00d70ca74695..b58a54b59adf 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/JoinProbe.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/JoinProbe.java
@@ -17,19 +17,21 @@
 import io.trino.operator.join.LookupSource;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-
-import javax.annotation.Nullable;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.OptionalInt;
-import java.util.stream.IntStream;
 
 import static com.google.common.base.Verify.verify;
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static java.util.Objects.requireNonNull;
 
+/**
+ * This class eagerly calculates all join positions and stores them in an array
+ * PageJoiner is responsible for ensuring that only the first position is processed for RLE with no or single build row match
+ */
 public class JoinProbe
 {
     public static class JoinProbeFactory
@@ -37,32 +39,38 @@ public static class JoinProbeFactory
         private final int[] probeOutputChannels;
         private final int[] probeJoinChannels;
         private final int probeHashChannel; // only valid when >= 0
+        private final boolean hasFilter;
 
-        public JoinProbeFactory(List<Integer> probeOutputChannels, List<Integer> probeJoinChannels, OptionalInt probeHashChannel)
+        public JoinProbeFactory(List<Integer> probeOutputChannels, List<Integer> probeJoinChannels, OptionalInt probeHashChannel, boolean hasFilter)
         {
             this.probeOutputChannels = Ints.toArray(requireNonNull(probeOutputChannels, "probeOutputChannels is null"));
             this.probeJoinChannels = Ints.toArray(requireNonNull(probeJoinChannels, "probeJoinChannels is null"));
             this.probeHashChannel = requireNonNull(probeHashChannel, "probeHashChannel is null").orElse(-1);
+            this.hasFilter = hasFilter;
         }
 
         public JoinProbe createJoinProbe(Page page, LookupSource lookupSource)
         {
             Page probePage = page.getLoadedPage(probeJoinChannels);
-            return new JoinProbe(probeOutputChannels, page, probePage, lookupSource, probeHashChannel >= 0 ? page.getBlock(probeHashChannel).getLoadedBlock() : null);
+            return new JoinProbe(probeOutputChannels, page, probePage, lookupSource, probeHashChannel >= 0 ? page.getBlock(probeHashChannel).getLoadedBlock() : null, hasFilter);
         }
     }
 
     private final int[] probeOutputChannels;
     private final Page page;
     private final long[] joinPositionCache;
+    private final boolean isRle;
     private int position = -1;
 
-    private JoinProbe(int[] probeOutputChannels, Page page, Page probePage, LookupSource lookupSource, @Nullable Block probeHashBlock)
+    private JoinProbe(int[] probeOutputChannels, Page page, Page probePage, LookupSource lookupSource, @Nullable Block probeHashBlock, boolean hasFilter)
     {
         this.probeOutputChannels = requireNonNull(probeOutputChannels, "probeOutputChannels is null");
         this.page = requireNonNull(page, "page is null");
 
-        joinPositionCache = fillCache(lookupSource, page, probeHashBlock, probePage);
+        // if filter channels are not RLE encoded, then every probe
+        // row might be unique and must be matched independently
+        this.isRle = !hasFilter && hasOnlyRleBlocks(probePage);
+        joinPositionCache = fillCache(lookupSource, page, probeHashBlock, probePage, isRle);
     }
 
     public int[] getOutputChannels()
@@ -76,6 +84,11 @@ public boolean advanceNextPosition()
         return !isFinished();
     }
 
+    public void finish()
+    {
+        position = page.getPositionCount();
+    }
+
     public boolean isFinished()
     {
         return position == page.getPositionCount();
@@ -91,6 +104,11 @@ public int getPosition()
         return position;
     }
 
+    public boolean areProbeJoinChannelsRunLengthEncoded()
+    {
+        return isRle;
+    }
+
     public Page getPage()
     {
         return page;
@@ -100,19 +118,49 @@ private static long[] fillCache(
             LookupSource lookupSource,
             Page page,
             Block probeHashBlock,
-            Page probePage)
+            Page probePage,
+            boolean isRle)
     {
         int positionCount = page.getPositionCount();
-        List<Block> nullableBlocks = IntStream.range(0, probePage.getChannelCount())
-                .mapToObj(i -> probePage.getBlock(i))
-                .filter(Block::mayHaveNull)
-                .collect(toImmutableList());
+
+        Block[] nullableBlocks = new Block[probePage.getChannelCount()];
+        int nullableBlocksCount = 0;
+        for (int channel = 0; channel < probePage.getChannelCount(); channel++) {
+            Block probeBlock = probePage.getBlock(channel);
+            if (probeBlock.mayHaveNull()) {
+                nullableBlocks[nullableBlocksCount++] = probeBlock;
+            }
+        }
+
+        if (isRle) {
+            long[] joinPositionCache;
+            // Null values cannot be joined, so if any column contains null, there is no match
+            boolean anyAllNullsBlock = false;
+            for (int i = 0; i < nullableBlocksCount; i++) {
+                Block nullableBlock = nullableBlocks[i];
+                if (nullableBlock.isNull(0)) {
+                    anyAllNullsBlock = true;
+                    break;
+                }
+            }
+            if (anyAllNullsBlock) {
+                joinPositionCache = new long[1];
+                joinPositionCache[0] = -1;
+            }
+            else {
+                joinPositionCache = new long[positionCount];
+                // We can fall back to processing all positions in case there are multiple build rows matched for the first probe position
+                Arrays.fill(joinPositionCache, lookupSource.getJoinPosition(0, probePage, page));
+            }
+
+            return joinPositionCache;
+        }
 
         long[] joinPositionCache = new long[positionCount];
-        if (!nullableBlocks.isEmpty()) {
+        if (nullableBlocksCount > 0) {
             Arrays.fill(joinPositionCache, -1);
             boolean[] isNull = new boolean[positionCount];
-            int nonNullCount = getIsNull(nullableBlocks, positionCount, isNull);
+            int nonNullCount = getIsNull(nullableBlocks, nullableBlocksCount, positionCount, isNull);
             if (nonNullCount < positionCount) {
                 // We only store positions that are not null
                 int[] positions = new int[nonNullCount];
@@ -155,17 +203,17 @@ private static long[] fillCache(
         return joinPositionCache;
     }
 
-    private static int getIsNull(List<Block> nullableBlocks, int positionCount, boolean[] isNull)
+    private static int getIsNull(Block[] nullableBlocks, int nullableBlocksCount, int positionCount, boolean[] isNull)
     {
-        for (int i = 0; i < nullableBlocks.size() - 1; i++) {
-            Block block = nullableBlocks.get(i);
+        for (int i = 0; i < nullableBlocksCount - 1; i++) {
+            Block block = nullableBlocks[i];
             for (int position = 0; position < positionCount; position++) {
                 isNull[position] |= block.isNull(position);
             }
         }
         // Last block will also calculate `nonNullCount`
         int nonNullCount = 0;
-        Block lastBlock = nullableBlocks.get(nullableBlocks.size() - 1);
+        Block lastBlock = nullableBlocks[nullableBlocksCount - 1];
         for (int position = 0; position < positionCount; position++) {
             isNull[position] |= lastBlock.isNull(position);
             nonNullCount += isNull[position] ? 0 : 1;
@@ -173,4 +221,18 @@ private static int getIsNull(List<Block> nullableBlocks, int positionCount, bool
 
         return nonNullCount;
     }
+
+    private static boolean hasOnlyRleBlocks(Page probePage)
+    {
+        if (probePage.getChannelCount() == 0) {
+            return false;
+        }
+
+        for (int i = 0; i < probePage.getChannelCount(); i++) {
+            if (!(probePage.getBlock(i) instanceof RunLengthEncodedBlock)) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/LookupJoinOperatorFactory.java b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/LookupJoinOperatorFactory.java
index 6d6f39ae7f51..6d20cc151ee5 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/LookupJoinOperatorFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/LookupJoinOperatorFactory.java
@@ -14,12 +14,12 @@
 package io.trino.operator.join.unspilled;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.primitives.Ints;
 import io.trino.operator.DriverContext;
 import io.trino.operator.HashGenerator;
-import io.trino.operator.InterpretedHashGenerator;
+import io.trino.operator.JoinOperatorType;
 import io.trino.operator.Operator;
 import io.trino.operator.OperatorContext;
-import io.trino.operator.OperatorFactories.JoinOperatorType;
 import io.trino.operator.OperatorFactory;
 import io.trino.operator.PrecomputedHashGenerator;
 import io.trino.operator.ProcessorContext;
@@ -35,8 +35,8 @@
 import io.trino.operator.join.unspilled.JoinProbe.JoinProbeFactory;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
 import java.util.Optional;
@@ -45,6 +45,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.operator.InterpretedHashGenerator.createChannelsHashGenerator;
 import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.INNER;
 import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.PROBE_OUTER;
 import static java.util.Objects.requireNonNull;
@@ -75,7 +76,7 @@ public LookupJoinOperatorFactory(
             List<Type> buildOutputTypes,
             JoinOperatorType joinOperatorType,
             JoinProbeFactory joinProbeFactory,
-            BlockTypeOperators blockTypeOperators,
+            TypeOperators typeOperators,
             List<Integer> probeJoinChannels,
             OptionalInt probeHashChannel)
     {
@@ -112,7 +113,7 @@ public LookupJoinOperatorFactory(
             List<Type> hashTypes = probeJoinChannels.stream()
                     .map(probeTypes::get)
                     .collect(toImmutableList());
-            this.probeHashGenerator = new InterpretedHashGenerator(hashTypes, probeJoinChannels, blockTypeOperators);
+            this.probeHashGenerator = createChannelsHashGenerator(hashTypes, Ints.toArray(probeJoinChannels), typeOperators);
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/LookupJoinPageBuilder.java b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/LookupJoinPageBuilder.java
index d5fb4d890002..cb224977116f 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/LookupJoinPageBuilder.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/LookupJoinPageBuilder.java
@@ -17,6 +17,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.Type;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
@@ -39,10 +40,11 @@ public class LookupJoinPageBuilder
     private final IntArrayList probeIndexBuilder = new IntArrayList();
     private final PageBuilder buildPageBuilder;
     private final int buildOutputChannelCount;
-    private int estimatedProbeBlockBytes;
-    private int estimatedProbeRowSize = -1;
+    private long estimatedProbeBlockBytes;
+    private long estimatedProbeRowSize = -1;
     private int previousPosition = -1;
     private boolean isSequentialProbeIndices = true;
+    private boolean repeatBuildRow;
 
     public LookupJoinPageBuilder(List<Type> buildTypes)
     {
@@ -62,6 +64,13 @@ public boolean isEmpty()
         return probeIndexBuilder.isEmpty() && buildPageBuilder.isEmpty();
     }
 
+    public int getPositionCount()
+    {
+        // when build rows are repeated then position count is equal to probe position count
+        verify(!repeatBuildRow);
+        return probeIndexBuilder.size();
+    }
+
     public void reset()
     {
         // be aware that probeIndexBuilder will not clear its capacity
@@ -71,6 +80,7 @@ public void reset()
         estimatedProbeRowSize = -1;
         previousPosition = -1;
         isSequentialProbeIndices = true;
+        repeatBuildRow = false;
     }
 
     /**
@@ -101,8 +111,17 @@ public void appendNullForBuild(JoinProbe probe)
         }
     }
 
+    public void repeatBuildRow()
+    {
+        repeatBuildRow = true;
+    }
+
     public Page build(JoinProbe probe)
     {
+        if (repeatBuildRow) {
+            return buildRepeatedPage(probe);
+        }
+
         int outputPositions = probeIndexBuilder.size();
         verify(buildPageBuilder.getPositionCount() == outputPositions);
 
@@ -140,6 +159,32 @@ public Page build(JoinProbe probe)
         return new Page(outputPositions, blocks);
     }
 
+    private Page buildRepeatedPage(JoinProbe probe)
+    {
+        // Build match can be repeated only if there is a single build row match
+        // and probe join channels are run length encoded.
+        verify(probe.areProbeJoinChannelsRunLengthEncoded());
+        verify(buildPageBuilder.getPositionCount() == 1);
+        verify(probeIndexBuilder.size() == 1);
+        verify(probeIndexBuilder.getInt(0) == 0);
+
+        int positionCount = probe.getPage().getPositionCount();
+        int[] probeOutputChannels = probe.getOutputChannels();
+        Block[] blocks = new Block[probeOutputChannels.length + buildOutputChannelCount];
+
+        for (int i = 0; i < probeOutputChannels.length; i++) {
+            blocks[i] = probe.getPage().getBlock(probeOutputChannels[i]);
+        }
+
+        int offset = probeOutputChannels.length;
+        for (int i = 0; i < buildOutputChannelCount; i++) {
+            Block buildBlock = buildPageBuilder.getBlockBuilder(i).build();
+            blocks[offset + i] = RunLengthEncodedBlock.create(buildBlock, positionCount);
+        }
+
+        return new Page(positionCount, blocks);
+    }
+
     @Override
     public String toString()
     {
@@ -197,13 +242,13 @@ private void appendProbeIndex(JoinProbe probe)
         }
     }
 
-    private int getEstimatedProbeRowSize(JoinProbe probe)
+    private long getEstimatedProbeRowSize(JoinProbe probe)
     {
         if (estimatedProbeRowSize != -1) {
             return estimatedProbeRowSize;
         }
 
-        int estimatedProbeRowSize = 0;
+        long estimatedProbeRowSize = 0;
         for (int index : probe.getOutputChannels()) {
             Block block = probe.getPage().getBlock(index);
             // Estimate the size of the probe row
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PageJoiner.java b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PageJoiner.java
index 18751f386d35..a2a334977d47 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PageJoiner.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PageJoiner.java
@@ -24,8 +24,7 @@
 import io.trino.operator.join.unspilled.JoinProbe.JoinProbeFactory;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.Closeable;
 import java.util.List;
@@ -110,6 +109,7 @@ public WorkProcessor.TransformationState<Page> process(@Nullable Page probePage)
         }
         if (probe == null) {
             probe = joinProbeFactory.createJoinProbe(probePage, lookupSource);
+            statisticsCounter.recordCreateProbe();
         }
 
         processProbe(lookupSource);
@@ -147,6 +147,11 @@ private void processProbe(LookupSource lookupSource)
                 }
                 statisticsCounter.recordProbe(joinSourcePositions);
             }
+
+            if (handleRleProbe()) {
+                break;
+            }
+
             if (!advanceProbePosition()) {
                 break;
             }
@@ -154,6 +159,40 @@ private void processProbe(LookupSource lookupSource)
         while (!yieldSignal.isSet());
     }
 
+    /**
+     * @return true if run length encoded probe has been handled and probe page processing is now finished
+     */
+    private boolean handleRleProbe()
+    {
+        if (!probe.areProbeJoinChannelsRunLengthEncoded()) {
+            return false;
+        }
+
+        if (probe.getPosition() != 0) {
+            // RLE probe can be handled only after first row is processed
+            return false;
+        }
+
+        if (pageBuilder.getPositionCount() == 0) {
+            // skip matching of other probe rows since first
+            // row from RLE probe did not produce any matches
+            probe.finish();
+            statisticsCounter.recordRleProbe();
+            return true;
+        }
+
+        if (pageBuilder.getPositionCount() == 1) {
+            // repeat probe join key match
+            pageBuilder.repeatBuildRow();
+            probe.finish();
+            statisticsCounter.recordRleProbe();
+            return true;
+        }
+
+        // process probe row by row since there are multiple matches per probe join key
+        return false;
+    }
+
     /**
      * Produce rows matching join condition for the current probe position. If this method was called previously
      * for the current probe position, calling this again will produce rows that wasn't been produced in previous
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PartitionedLookupSource.java b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PartitionedLookupSource.java
index 70e2a1e4936c..9708ae7092e4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PartitionedLookupSource.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PartitionedLookupSource.java
@@ -14,7 +14,8 @@
 package io.trino.operator.join.unspilled;
 
 import com.google.common.io.Closer;
-import io.trino.operator.InterpretedHashGenerator;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.operator.exchange.LocalPartitionGenerator;
 import io.trino.operator.join.LookupSource;
 import io.trino.operator.join.OuterPositionIterator;
@@ -22,11 +23,8 @@
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
+import io.trino.spi.type.TypeOperators;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -39,6 +37,7 @@
 
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.operator.InterpretedHashGenerator.createPagePrefixHashGenerator;
 import static java.lang.Integer.numberOfTrailingZeros;
 import static java.lang.Math.toIntExact;
 
@@ -50,7 +49,7 @@
 public class PartitionedLookupSource
         implements LookupSource
 {
-    public static TrackingLookupSourceSupplier createPartitionedLookupSourceSupplier(List<Supplier<LookupSource>> partitions, List<Type> hashChannelTypes, boolean outer, BlockTypeOperators blockTypeOperators)
+    public static TrackingLookupSourceSupplier createPartitionedLookupSourceSupplier(List<Supplier<LookupSource>> partitions, List<Type> hashChannelTypes, boolean outer, TypeOperators typeOperators)
     {
         if (outer) {
             OuterPositionTracker.Factory outerPositionTrackerFactory = new OuterPositionTracker.Factory(partitions);
@@ -66,7 +65,7 @@ public LookupSource getLookupSource()
                                     .collect(toImmutableList()),
                             hashChannelTypes,
                             Optional.of(outerPositionTrackerFactory.create()),
-                            blockTypeOperators);
+                            typeOperators);
                 }
 
                 @Override
@@ -83,7 +82,7 @@ public OuterPositionIterator getOuterPositionIterator()
                                 .collect(toImmutableList()),
                         hashChannelTypes,
                         Optional.empty(),
-                        blockTypeOperators));
+                        typeOperators));
     }
 
     private final LookupSource[] lookupSources;
@@ -95,13 +94,13 @@ public OuterPositionIterator getOuterPositionIterator()
 
     private boolean closed;
 
-    private PartitionedLookupSource(List<? extends LookupSource> lookupSources, List<Type> hashChannelTypes, Optional<OuterPositionTracker> outerPositionTracker, BlockTypeOperators blockTypeOperators)
+    private PartitionedLookupSource(List<? extends LookupSource> lookupSources, List<Type> hashChannelTypes, Optional<OuterPositionTracker> outerPositionTracker, TypeOperators typeOperators)
     {
         this.lookupSources = lookupSources.toArray(new LookupSource[lookupSources.size()]);
 
         // this generator is only used for getJoinPosition without a rawHash and in this case
         // the hash channels are always packed in a page without extra columns
-        this.partitionGenerator = new LocalPartitionGenerator(InterpretedHashGenerator.createPositionalWithTypes(hashChannelTypes, blockTypeOperators), lookupSources.size());
+        this.partitionGenerator = new LocalPartitionGenerator(createPagePrefixHashGenerator(hashChannelTypes, typeOperators), lookupSources.size());
 
         this.partitionMask = lookupSources.size() - 1;
         this.shiftSize = numberOfTrailingZeros(lookupSources.size()) + 1;
@@ -150,7 +149,7 @@ public long getJoinPosition(int position, Page hashChannelsPage, Page allChannel
     public void getJoinPosition(int[] positions, Page hashChannelsPage, Page allChannelsPage, long[] rawHashes, long[] result)
     {
         int positionCount = positions.length;
-        int partitionCount = partitionGenerator.getPartitionCount();
+        int partitionCount = partitionGenerator.partitionCount();
 
         int[] partitions = new int[positionCount];
         int[] partitionPositionsCount = new int[partitionCount];
diff --git a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PartitionedLookupSourceFactory.java b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PartitionedLookupSourceFactory.java
index e170558d48d1..d604719ccde6 100644
--- a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PartitionedLookupSourceFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PartitionedLookupSourceFactory.java
@@ -16,14 +16,13 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.operator.join.JoinBridge;
 import io.trino.operator.join.LookupSource;
 import io.trino.operator.join.OuterPositionIterator;
 import io.trino.operator.join.TrackingLookupSourceSupplier;
 import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators;
-
-import javax.annotation.concurrent.GuardedBy;
+import io.trino.spi.type.TypeOperators;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -48,7 +47,7 @@ public final class PartitionedLookupSourceFactory
     private final List<Type> outputTypes;
     private final List<Type> hashChannelTypes;
     private final boolean outer;
-    private final BlockTypeOperators blockTypeOperators;
+    private final TypeOperators typeOperators;
 
     @GuardedBy("this")
     private final Supplier<LookupSource>[] partitions;
@@ -67,7 +66,7 @@ public final class PartitionedLookupSourceFactory
     @GuardedBy("this")
     private final List<SettableFuture<LookupSource>> lookupSourceFutures = new ArrayList<>();
 
-    public PartitionedLookupSourceFactory(List<Type> types, List<Type> outputTypes, List<Type> hashChannelTypes, int partitionCount, boolean outer, BlockTypeOperators blockTypeOperators)
+    public PartitionedLookupSourceFactory(List<Type> types, List<Type> outputTypes, List<Type> hashChannelTypes, int partitionCount, boolean outer, TypeOperators typeOperators)
     {
         checkArgument(Integer.bitCount(partitionCount) == 1, "partitionCount must be a power of 2");
 
@@ -78,7 +77,7 @@ public PartitionedLookupSourceFactory(List<Type> types, List<Type> outputTypes,
         //noinspection unchecked
         this.partitions = (Supplier<LookupSource>[]) new Supplier<?>[partitionCount];
         this.outer = outer;
-        this.blockTypeOperators = blockTypeOperators;
+        this.typeOperators = typeOperators;
     }
 
     public List<Type> getTypes()
@@ -163,7 +162,7 @@ private void supplyLookupSources()
 
             if (partitionsSet != 1) {
                 List<Supplier<LookupSource>> partitions = ImmutableList.copyOf(this.partitions);
-                lookupSourceSupplier = createPartitionedLookupSourceSupplier(partitions, hashChannelTypes, outer, blockTypeOperators);
+                lookupSourceSupplier = createPartitionedLookupSourceSupplier(partitions, hashChannelTypes, outer, typeOperators);
             }
             else if (outer) {
                 lookupSourceSupplier = createOuterLookupSourceSupplier(partitions[0]);
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/BytePositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/BytePositionsAppender.java
index d640db4e0208..8599de929e4b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/BytePositionsAppender.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/BytePositionsAppender.java
@@ -16,11 +16,13 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.ByteArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
 import java.util.Arrays;
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.trino.operator.output.PositionsAppenderUtil.calculateBlockResetSize;
@@ -55,9 +57,10 @@ public BytePositionsAppender(int expectedEntries)
     }
 
     @Override
-    // TODO: Make PositionsAppender work performant with different block types (https://github.com/trinodb/trino/issues/13267)
-    public void append(IntArrayList positions, Block block)
+    public void append(IntArrayList positions, ValueBlock block)
     {
+        checkArgument(block instanceof ByteArrayBlock, "Block must be instance of %s", ByteArrayBlock.class);
+
         if (positions.isEmpty()) {
             return;
         }
@@ -94,8 +97,10 @@ public void append(IntArrayList positions, Block block)
     }
 
     @Override
-    public void appendRle(Block block, int rlePositionCount)
+    public void appendRle(ValueBlock block, int rlePositionCount)
     {
+        checkArgument(block instanceof ByteArrayBlock, "Block must be instance of %s", ByteArrayBlock.class);
+
         if (rlePositionCount == 0) {
             return;
         }
@@ -116,8 +121,10 @@ public void appendRle(Block block, int rlePositionCount)
     }
 
     @Override
-    public void append(int sourcePosition, Block source)
+    public void append(int sourcePosition, ValueBlock source)
     {
+        checkArgument(source instanceof ByteArrayBlock, "Block must be instance of %s", ByteArrayBlock.class);
+
         ensureCapacity(positionCount + 1);
         if (source.isNull(sourcePosition)) {
             valueIsNull[positionCount] = true;
@@ -158,7 +165,8 @@ public long getSizeInBytes()
         return sizeInBytes;
     }
 
-    private void reset()
+    @Override
+    public void reset()
     {
         initialEntryCount = calculateBlockResetSize(positionCount);
         initialized = false;
@@ -185,7 +193,7 @@ private void ensureCapacity(int capacity)
             newSize = initialEntryCount;
             initialized = true;
         }
-        newSize = Math.max(newSize, capacity);
+        newSize = max(newSize, capacity);
 
         valueIsNull = Arrays.copyOf(valueIsNull, newSize);
         values = Arrays.copyOf(values, newSize);
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/Fixed12PositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/Fixed12PositionsAppender.java
new file mode 100644
index 000000000000..685db0271293
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/output/Fixed12PositionsAppender.java
@@ -0,0 +1,229 @@
+/*
+ * Licensed 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 io.trino.operator.output;
+
+import io.trino.spi.block.Block;
+import io.trino.spi.block.Fixed12Block;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.airlift.slice.SizeOf.SIZE_OF_INT;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.operator.output.PositionsAppenderUtil.calculateBlockResetSize;
+import static io.trino.operator.output.PositionsAppenderUtil.calculateNewArraySize;
+import static java.lang.Math.max;
+
+public class Fixed12PositionsAppender
+        implements PositionsAppender
+{
+    private static final int INSTANCE_SIZE = instanceSize(Fixed12PositionsAppender.class);
+    private static final Block NULL_VALUE_BLOCK = new Fixed12Block(1, Optional.of(new boolean[] {true}), new int[3]);
+
+    private boolean initialized;
+    private int initialEntryCount;
+
+    private int positionCount;
+    private boolean hasNullValue;
+    private boolean hasNonNullValue;
+
+    // it is assumed that these arrays are the same length
+    private boolean[] valueIsNull = new boolean[0];
+    private int[] values = new int[0];
+
+    private long retainedSizeInBytes;
+    private long sizeInBytes;
+
+    public Fixed12PositionsAppender(int expectedEntries)
+    {
+        this.initialEntryCount = max(expectedEntries, 1);
+
+        updateRetainedSize();
+    }
+
+    @Override
+    public void append(IntArrayList positions, ValueBlock block)
+    {
+        checkArgument(block instanceof Fixed12Block, "Block must be instance of %s", Fixed12Block.class);
+
+        if (positions.isEmpty()) {
+            return;
+        }
+        int[] positionArray = positions.elements();
+        int positionsSize = positions.size();
+        ensureCapacity(positionCount + positionsSize);
+
+        if (block.mayHaveNull()) {
+            for (int i = 0; i < positionsSize; i++) {
+                int position = positionArray[i];
+                boolean isNull = block.isNull(position);
+                if (isNull) {
+                    valueIsNull[positionCount + i] = true;
+                    hasNullValue = true;
+                }
+                else {
+                    int valuesIndex = (positionCount + i) * 3;
+                    values[valuesIndex] = block.getInt(position, 0);
+                    values[valuesIndex + 1] = block.getInt(position, SIZE_OF_INT);
+                    values[valuesIndex + 2] = block.getInt(position, SIZE_OF_INT + SIZE_OF_INT);
+                    hasNonNullValue = true;
+                }
+            }
+            positionCount += positionsSize;
+        }
+        else {
+            for (int i = 0; i < positionsSize; i++) {
+                int position = positionArray[i];
+                int valuesIndex = (positionCount + i) * 3;
+                values[valuesIndex] = block.getInt(position, 0);
+                values[valuesIndex + 1] = block.getInt(position, SIZE_OF_INT);
+                values[valuesIndex + 2] = block.getInt(position, SIZE_OF_INT + SIZE_OF_INT);
+            }
+            positionCount += positionsSize;
+            hasNonNullValue = true;
+        }
+
+        updateSize(positionsSize);
+    }
+
+    @Override
+    public void appendRle(ValueBlock block, int rlePositionCount)
+    {
+        checkArgument(block instanceof Fixed12Block, "Block must be instance of %s", Fixed12Block.class);
+
+        if (rlePositionCount == 0) {
+            return;
+        }
+        int sourcePosition = 0;
+        ensureCapacity(positionCount + rlePositionCount);
+        if (block.isNull(sourcePosition)) {
+            Arrays.fill(valueIsNull, positionCount, positionCount + rlePositionCount, true);
+            hasNullValue = true;
+        }
+        else {
+            int valueHigh = block.getInt(sourcePosition, 0);
+            int valueMid = block.getInt(sourcePosition, SIZE_OF_INT);
+            int valueLow = block.getInt(sourcePosition, SIZE_OF_INT + SIZE_OF_INT);
+            int positionIndex = positionCount * 3;
+            for (int i = 0; i < rlePositionCount; i++) {
+                values[positionIndex] = valueHigh;
+                values[positionIndex + 1] = valueMid;
+                values[positionIndex + 2] = valueLow;
+                positionIndex += 3;
+            }
+            hasNonNullValue = true;
+        }
+        positionCount += rlePositionCount;
+
+        updateSize(rlePositionCount);
+    }
+
+    @Override
+    public void append(int sourcePosition, ValueBlock source)
+    {
+        checkArgument(source instanceof Fixed12Block, "Block must be instance of %s", Fixed12Block.class);
+
+        ensureCapacity(positionCount + 1);
+        if (source.isNull(sourcePosition)) {
+            valueIsNull[positionCount] = true;
+            hasNullValue = true;
+        }
+        else {
+            int positionIndex = positionCount * 3;
+            values[positionIndex] = source.getInt(sourcePosition, 0);
+            values[positionIndex + 1] = source.getInt(sourcePosition, SIZE_OF_INT);
+            values[positionIndex + 2] = source.getInt(sourcePosition, SIZE_OF_INT + SIZE_OF_INT);
+            hasNonNullValue = true;
+        }
+        positionCount++;
+
+        updateSize(1);
+    }
+
+    @Override
+    public Block build()
+    {
+        Block result;
+        if (hasNonNullValue) {
+            result = new Fixed12Block(positionCount, hasNullValue ? Optional.of(valueIsNull) : Optional.empty(), values);
+        }
+        else {
+            result = RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, positionCount);
+        }
+        reset();
+        return result;
+    }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return retainedSizeInBytes;
+    }
+
+    @Override
+    public long getSizeInBytes()
+    {
+        return sizeInBytes;
+    }
+
+    @Override
+    public void reset()
+    {
+        initialEntryCount = calculateBlockResetSize(positionCount);
+        initialized = false;
+        valueIsNull = new boolean[0];
+        values = new int[0];
+        positionCount = 0;
+        sizeInBytes = 0;
+        hasNonNullValue = false;
+        hasNullValue = false;
+        updateRetainedSize();
+    }
+
+    private void ensureCapacity(int capacity)
+    {
+        if (valueIsNull.length >= capacity) {
+            return;
+        }
+
+        int newSize;
+        if (initialized) {
+            newSize = calculateNewArraySize(valueIsNull.length);
+        }
+        else {
+            newSize = initialEntryCount;
+            initialized = true;
+        }
+        newSize = max(newSize, capacity);
+
+        valueIsNull = Arrays.copyOf(valueIsNull, newSize);
+        values = Arrays.copyOf(values, newSize * 3);
+        updateRetainedSize();
+    }
+
+    private void updateSize(long positionsSize)
+    {
+        sizeInBytes += Fixed12Block.SIZE_IN_BYTES_PER_POSITION * positionsSize;
+    }
+
+    private void updateRetainedSize()
+    {
+        retainedSizeInBytes = INSTANCE_SIZE + sizeOf(valueIsNull) + sizeOf(values);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/Int128PositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/Int128PositionsAppender.java
index fceb70eb4d28..251a7f25eff4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/Int128PositionsAppender.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/Int128PositionsAppender.java
@@ -16,11 +16,13 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.Int128ArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
 import java.util.Arrays;
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
@@ -56,9 +58,10 @@ public Int128PositionsAppender(int expectedEntries)
     }
 
     @Override
-    // TODO: Make PositionsAppender work performant with different block types (https://github.com/trinodb/trino/issues/13267)
-    public void append(IntArrayList positions, Block block)
+    public void append(IntArrayList positions, ValueBlock block)
     {
+        checkArgument(block instanceof Int128ArrayBlock, "Block must be instance of %s", Int128ArrayBlock.class);
+
         if (positions.isEmpty()) {
             return;
         }
@@ -101,8 +104,10 @@ public void append(IntArrayList positions, Block block)
     }
 
     @Override
-    public void appendRle(Block block, int rlePositionCount)
+    public void appendRle(ValueBlock block, int rlePositionCount)
     {
+        checkArgument(block instanceof Int128ArrayBlock, "Block must be instance of %s", Int128ArrayBlock.class);
+
         if (rlePositionCount == 0) {
             return;
         }
@@ -129,8 +134,10 @@ public void appendRle(Block block, int rlePositionCount)
     }
 
     @Override
-    public void append(int sourcePosition, Block source)
+    public void append(int sourcePosition, ValueBlock source)
     {
+        checkArgument(source instanceof Int128ArrayBlock, "Block must be instance of %s", Int128ArrayBlock.class);
+
         ensureCapacity(positionCount + 1);
         if (source.isNull(sourcePosition)) {
             valueIsNull[positionCount] = true;
@@ -173,7 +180,8 @@ public long getSizeInBytes()
         return sizeInBytes;
     }
 
-    private void reset()
+    @Override
+    public void reset()
     {
         initialEntryCount = calculateBlockResetSize(positionCount);
         initialized = false;
@@ -200,7 +208,7 @@ private void ensureCapacity(int capacity)
             newSize = initialEntryCount;
             initialized = true;
         }
-        newSize = Math.max(newSize, capacity);
+        newSize = max(newSize, capacity);
 
         valueIsNull = Arrays.copyOf(valueIsNull, newSize);
         values = Arrays.copyOf(values, newSize * 2);
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/Int96PositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/Int96PositionsAppender.java
deleted file mode 100644
index 20aef8af8bc4..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/output/Int96PositionsAppender.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.output;
-
-import io.trino.spi.block.Block;
-import io.trino.spi.block.Int96ArrayBlock;
-import io.trino.spi.block.RunLengthEncodedBlock;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-
-import java.util.Arrays;
-import java.util.Optional;
-
-import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.operator.output.PositionsAppenderUtil.calculateBlockResetSize;
-import static io.trino.operator.output.PositionsAppenderUtil.calculateNewArraySize;
-import static java.lang.Math.max;
-
-public class Int96PositionsAppender
-        implements PositionsAppender
-{
-    private static final int INSTANCE_SIZE = instanceSize(Int96PositionsAppender.class);
-    private static final Block NULL_VALUE_BLOCK = new Int96ArrayBlock(1, Optional.of(new boolean[] {true}), new long[1], new int[1]);
-
-    private boolean initialized;
-    private int initialEntryCount;
-
-    private int positionCount;
-    private boolean hasNullValue;
-    private boolean hasNonNullValue;
-
-    // it is assumed that these arrays are the same length
-    private boolean[] valueIsNull = new boolean[0];
-    private long[] high = new long[0];
-    private int[] low = new int[0];
-
-    private long retainedSizeInBytes;
-    private long sizeInBytes;
-
-    public Int96PositionsAppender(int expectedEntries)
-    {
-        this.initialEntryCount = max(expectedEntries, 1);
-
-        updateRetainedSize();
-    }
-
-    @Override
-    // TODO: Make PositionsAppender work performant with different block types (https://github.com/trinodb/trino/issues/13267)
-    public void append(IntArrayList positions, Block block)
-    {
-        if (positions.isEmpty()) {
-            return;
-        }
-        int[] positionArray = positions.elements();
-        int positionsSize = positions.size();
-        ensureCapacity(positionCount + positionsSize);
-
-        if (block.mayHaveNull()) {
-            for (int i = 0; i < positionsSize; i++) {
-                int position = positionArray[i];
-                boolean isNull = block.isNull(position);
-                int positionIndex = positionCount + i;
-                if (isNull) {
-                    valueIsNull[positionIndex] = true;
-                    hasNullValue = true;
-                }
-                else {
-                    high[positionIndex] = block.getLong(position, 0);
-                    low[positionIndex] = block.getInt(position, SIZE_OF_LONG);
-                    hasNonNullValue = true;
-                }
-            }
-            positionCount += positionsSize;
-        }
-        else {
-            for (int i = 0; i < positionsSize; i++) {
-                int position = positionArray[i];
-                high[positionCount + i] = block.getLong(position, 0);
-                low[positionCount + i] = block.getInt(position, SIZE_OF_LONG);
-            }
-            positionCount += positionsSize;
-            hasNonNullValue = true;
-        }
-
-        updateSize(positionsSize);
-    }
-
-    @Override
-    public void appendRle(Block block, int rlePositionCount)
-    {
-        if (rlePositionCount == 0) {
-            return;
-        }
-        int sourcePosition = 0;
-        ensureCapacity(positionCount + rlePositionCount);
-        if (block.isNull(sourcePosition)) {
-            Arrays.fill(valueIsNull, positionCount, positionCount + rlePositionCount, true);
-            hasNullValue = true;
-        }
-        else {
-            long valueHigh = block.getLong(sourcePosition, 0);
-            int valueLow = block.getInt(sourcePosition, SIZE_OF_LONG);
-            for (int i = 0; i < rlePositionCount; i++) {
-                high[positionCount + i] = valueHigh;
-                low[positionCount + i] = valueLow;
-            }
-            hasNonNullValue = true;
-        }
-        positionCount += rlePositionCount;
-
-        updateSize(rlePositionCount);
-    }
-
-    @Override
-    public void append(int sourcePosition, Block source)
-    {
-        ensureCapacity(positionCount + 1);
-        if (source.isNull(sourcePosition)) {
-            valueIsNull[positionCount] = true;
-            hasNullValue = true;
-        }
-        else {
-            high[positionCount] = source.getLong(sourcePosition, 0);
-            low[positionCount] = source.getInt(sourcePosition, SIZE_OF_LONG);
-
-            hasNonNullValue = true;
-        }
-        positionCount++;
-
-        updateSize(1);
-    }
-
-    @Override
-    public Block build()
-    {
-        Block result;
-        if (hasNonNullValue) {
-            result = new Int96ArrayBlock(positionCount, hasNullValue ? Optional.of(valueIsNull) : Optional.empty(), high, low);
-        }
-        else {
-            result = RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, positionCount);
-        }
-        reset();
-        return result;
-    }
-
-    @Override
-    public long getRetainedSizeInBytes()
-    {
-        return retainedSizeInBytes;
-    }
-
-    @Override
-    public long getSizeInBytes()
-    {
-        return sizeInBytes;
-    }
-
-    private void reset()
-    {
-        initialEntryCount = calculateBlockResetSize(positionCount);
-        initialized = false;
-        valueIsNull = new boolean[0];
-        high = new long[0];
-        low = new int[0];
-        positionCount = 0;
-        sizeInBytes = 0;
-        hasNonNullValue = false;
-        hasNullValue = false;
-        updateRetainedSize();
-    }
-
-    private void ensureCapacity(int capacity)
-    {
-        if (valueIsNull.length >= capacity) {
-            return;
-        }
-
-        int newSize;
-        if (initialized) {
-            newSize = calculateNewArraySize(valueIsNull.length);
-        }
-        else {
-            newSize = initialEntryCount;
-            initialized = true;
-        }
-        newSize = Math.max(newSize, capacity);
-
-        valueIsNull = Arrays.copyOf(valueIsNull, newSize);
-        high = Arrays.copyOf(high, newSize);
-        low = Arrays.copyOf(low, newSize);
-        updateRetainedSize();
-    }
-
-    private void updateSize(long positionsSize)
-    {
-        sizeInBytes += Int96ArrayBlock.SIZE_IN_BYTES_PER_POSITION * positionsSize;
-    }
-
-    private void updateRetainedSize()
-    {
-        retainedSizeInBytes = INSTANCE_SIZE + sizeOf(valueIsNull) + sizeOf(high) + sizeOf(low);
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/IntPositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/IntPositionsAppender.java
index f4b28b1c5a0b..bcb7d73b046d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/IntPositionsAppender.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/IntPositionsAppender.java
@@ -16,11 +16,13 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.IntArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
 import java.util.Arrays;
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.trino.operator.output.PositionsAppenderUtil.calculateBlockResetSize;
@@ -55,9 +57,10 @@ public IntPositionsAppender(int expectedEntries)
     }
 
     @Override
-    // TODO: Make PositionsAppender work performant with different block types (https://github.com/trinodb/trino/issues/13267)
-    public void append(IntArrayList positions, Block block)
+    public void append(IntArrayList positions, ValueBlock block)
     {
+        checkArgument(block instanceof IntArrayBlock, "Block must be instance of %s", IntArrayBlock.class);
+
         if (positions.isEmpty()) {
             return;
         }
@@ -94,8 +97,10 @@ public void append(IntArrayList positions, Block block)
     }
 
     @Override
-    public void appendRle(Block block, int rlePositionCount)
+    public void appendRle(ValueBlock block, int rlePositionCount)
     {
+        checkArgument(block instanceof IntArrayBlock, "Block must be instance of %s", IntArrayBlock.class);
+
         if (rlePositionCount == 0) {
             return;
         }
@@ -116,8 +121,10 @@ public void appendRle(Block block, int rlePositionCount)
     }
 
     @Override
-    public void append(int sourcePosition, Block source)
+    public void append(int sourcePosition, ValueBlock source)
     {
+        checkArgument(source instanceof IntArrayBlock, "Block must be instance of %s", IntArrayBlock.class);
+
         ensureCapacity(positionCount + 1);
         if (source.isNull(sourcePosition)) {
             valueIsNull[positionCount] = true;
@@ -158,7 +165,8 @@ public long getSizeInBytes()
         return sizeInBytes;
     }
 
-    private void reset()
+    @Override
+    public void reset()
     {
         initialEntryCount = calculateBlockResetSize(positionCount);
         initialized = false;
@@ -185,7 +193,7 @@ private void ensureCapacity(int capacity)
             newSize = initialEntryCount;
             initialized = true;
         }
-        newSize = Math.max(newSize, capacity);
+        newSize = max(newSize, capacity);
 
         valueIsNull = Arrays.copyOf(valueIsNull, newSize);
         values = Arrays.copyOf(values, newSize);
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/LongPositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/LongPositionsAppender.java
index 2a5910efdec0..6fc555f02a01 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/LongPositionsAppender.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/LongPositionsAppender.java
@@ -16,11 +16,13 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
 import java.util.Arrays;
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.trino.operator.output.PositionsAppenderUtil.calculateBlockResetSize;
@@ -55,9 +57,10 @@ public LongPositionsAppender(int expectedEntries)
     }
 
     @Override
-    // TODO: Make PositionsAppender work performant with different block types (https://github.com/trinodb/trino/issues/13267)
-    public void append(IntArrayList positions, Block block)
+    public void append(IntArrayList positions, ValueBlock block)
     {
+        checkArgument(block instanceof LongArrayBlock, "Block must be instance of %s", LongArrayBlock.class);
+
         if (positions.isEmpty()) {
             return;
         }
@@ -94,8 +97,10 @@ public void append(IntArrayList positions, Block block)
     }
 
     @Override
-    public void appendRle(Block block, int rlePositionCount)
+    public void appendRle(ValueBlock block, int rlePositionCount)
     {
+        checkArgument(block instanceof LongArrayBlock, "Block must be instance of %s", LongArrayBlock.class);
+
         if (rlePositionCount == 0) {
             return;
         }
@@ -116,8 +121,10 @@ public void appendRle(Block block, int rlePositionCount)
     }
 
     @Override
-    public void append(int sourcePosition, Block source)
+    public void append(int sourcePosition, ValueBlock source)
     {
+        checkArgument(source instanceof LongArrayBlock, "Block must be instance of %s", LongArrayBlock.class);
+
         ensureCapacity(positionCount + 1);
         if (source.isNull(sourcePosition)) {
             valueIsNull[positionCount] = true;
@@ -158,7 +165,8 @@ public long getSizeInBytes()
         return sizeInBytes;
     }
 
-    private void reset()
+    @Override
+    public void reset()
     {
         initialEntryCount = calculateBlockResetSize(positionCount);
         initialized = false;
@@ -185,7 +193,7 @@ private void ensureCapacity(int capacity)
             newSize = initialEntryCount;
             initialized = true;
         }
-        newSize = Math.max(newSize, capacity);
+        newSize = max(newSize, capacity);
 
         valueIsNull = Arrays.copyOf(valueIsNull, newSize);
         values = Arrays.copyOf(values, newSize);
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/PagePartitioner.java b/core/trino-main/src/main/java/io/trino/operator/output/PagePartitioner.java
index e188c911beff..78e4a2ff12f5 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/PagePartitioner.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/PagePartitioner.java
@@ -33,8 +33,7 @@
 import io.trino.util.Ciphers;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.Closeable;
 import java.util.Arrays;
@@ -69,6 +68,7 @@ public class PagePartitioner
     private final PageSerializer serializer;
     private final PositionsAppenderPageBuilder[] positionsAppenders;
     private final boolean replicatesAnyRow;
+    private final boolean partitionProcessRleAndDictionaryBlocks;
     private final int nullChannel; // when >= 0, send the position to every partition if this channel is null
     private PartitionedOutputInfoSupplier partitionedOutputInfoSupplier;
 
@@ -86,7 +86,8 @@ public PagePartitioner(
             DataSize maxMemory,
             PositionsAppenderFactory positionsAppenderFactory,
             Optional<Slice> exchangeEncryptionKey,
-            AggregatedMemoryContext aggregatedMemoryContext)
+            AggregatedMemoryContext aggregatedMemoryContext,
+            boolean partitionProcessRleAndDictionaryBlocks)
     {
         this.partitionFunction = requireNonNull(partitionFunction, "partitionFunction is null");
         this.partitionChannels = Ints.toArray(requireNonNull(partitionChannels, "partitionChannels is null"));
@@ -104,6 +105,7 @@ public PagePartitioner(
         this.nullChannel = nullChannel.orElse(-1);
         this.outputBuffer = requireNonNull(outputBuffer, "outputBuffer is null");
         this.serializer = serdeFactory.createSerializer(exchangeEncryptionKey.map(Ciphers::deserializeAesEncryptionKey));
+        this.partitionProcessRleAndDictionaryBlocks = partitionProcessRleAndDictionaryBlocks;
 
         //  Ensure partition channels align with constant arguments provided
         for (int i = 0; i < this.partitionChannels.length; i++) {
@@ -113,7 +115,7 @@ public PagePartitioner(
             }
         }
 
-        int partitionCount = partitionFunction.getPartitionCount();
+        int partitionCount = partitionFunction.partitionCount();
         int pageSize = toIntExact(min(DEFAULT_MAX_PAGE_SIZE_IN_BYTES, maxMemory.toBytes() / partitionCount));
         pageSize = max(1, pageSize);
 
@@ -125,6 +127,11 @@ public PagePartitioner(
         updateMemoryUsage();
     }
 
+    public PartitionFunction getPartitionFunction()
+    {
+        return partitionFunction;
+    }
+
     // sets up this partitioner for the new operator
     public void setupOperator(OperatorContext operatorContext)
     {
@@ -139,7 +146,7 @@ public void partitionPage(Page page)
             return;
         }
 
-        if (page.getPositionCount() < partitionFunction.getPartitionCount() * COLUMNAR_STRATEGY_COEFFICIENT) {
+        if (page.getPositionCount() < partitionFunction.partitionCount() * COLUMNAR_STRATEGY_COEFFICIENT) {
             // Partition will have on average less than COLUMNAR_STRATEGY_COEFFICIENT rows.
             // Doing it column-wise would degrade performance, so we fall back to row-wise approach.
             // Performance degradation is the worst in case of skewed hash distribution when only small subset
@@ -202,7 +209,7 @@ public void partitionPageByColumn(Page page)
     {
         IntArrayList[] partitionedPositions = partitionPositions(page);
 
-        for (int i = 0; i < partitionFunction.getPartitionCount(); i++) {
+        for (int i = 0; i < partitionFunction.partitionCount(); i++) {
             IntArrayList partitionPositions = partitionedPositions[i];
             if (!partitionPositions.isEmpty()) {
                 positionsAppenders[i].appendToOutputPartition(page, partitionPositions);
@@ -232,12 +239,12 @@ private IntArrayList[] partitionPositions(Page page)
 
         Page partitionFunctionArgs = getPartitionFunctionArguments(page);
 
-        if (partitionFunctionArgs.getChannelCount() > 0 && onlyRleBlocks(partitionFunctionArgs)) {
+        if (partitionProcessRleAndDictionaryBlocks && partitionFunctionArgs.getChannelCount() > 0 && onlyRleBlocks(partitionFunctionArgs)) {
             // we need at least one Rle block since with no blocks partition function
             // can return a different value per invocation (e.g. RoundRobinBucketFunction)
             partitionBySingleRleValue(page, position, partitionFunctionArgs, partitionPositions);
         }
-        else if (partitionFunctionArgs.getChannelCount() == 1 && isDictionaryProcessingFaster(partitionFunctionArgs.getBlock(0))) {
+        else if (partitionProcessRleAndDictionaryBlocks && partitionFunctionArgs.getChannelCount() == 1 && isDictionaryProcessingFaster(partitionFunctionArgs.getBlock(0))) {
             partitionBySingleDictionary(page, position, partitionFunctionArgs, partitionPositions);
         }
         else {
@@ -252,9 +259,9 @@ private IntArrayList[] initPositions(Page page)
         // want memory to explode in case there are input pages with many positions, where each page
         // is assigned to a single partition entirely.
         // For example this can happen for partition columns if they are represented by RLE blocks.
-        IntArrayList[] partitionPositions = new IntArrayList[partitionFunction.getPartitionCount()];
+        IntArrayList[] partitionPositions = new IntArrayList[partitionFunction.partitionCount()];
         for (int i = 0; i < partitionPositions.length; i++) {
-            partitionPositions[i] = new IntArrayList(initialPartitionSize(page.getPositionCount() / partitionFunction.getPartitionCount()));
+            partitionPositions[i] = new IntArrayList(initialPartitionSize(page.getPositionCount() / partitionFunction.partitionCount()));
         }
         return partitionPositions;
     }
@@ -268,7 +275,7 @@ private static int initialPartitionSize(int averagePositionsPerPartition)
         return (int) (averagePositionsPerPartition * 1.1) + 32;
     }
 
-    private boolean onlyRleBlocks(Page page)
+    private static boolean onlyRleBlocks(Page page)
     {
         for (int i = 0; i < page.getChannelCount(); i++) {
             if (!(page.getBlock(i) instanceof RunLengthEncodedBlock)) {
@@ -301,7 +308,7 @@ private void partitionBySingleRleValue(Page page, int position, Page partitionFu
         }
     }
 
-    private Page extractRlePage(Page page)
+    private static Page extractRlePage(Page page)
     {
         Block[] valueBlocks = new Block[page.getChannelCount()];
         for (int channel = 0; channel < valueBlocks.length; ++channel) {
@@ -310,7 +317,7 @@ private Page extractRlePage(Page page)
         return new Page(valueBlocks);
     }
 
-    private int[] integersInRange(int start, int endExclusive)
+    private static int[] integersInRange(int start, int endExclusive)
     {
         int[] array = new int[endExclusive - start];
         int current = start;
@@ -320,7 +327,7 @@ private int[] integersInRange(int start, int endExclusive)
         return array;
     }
 
-    private boolean isDictionaryProcessingFaster(Block block)
+    private static boolean isDictionaryProcessingFaster(Block block)
     {
         if (!(block instanceof DictionaryBlock dictionaryBlock)) {
             return false;
@@ -379,7 +386,7 @@ private void partitionNullablePositions(Page page, int position, IntArrayList[]
         }
     }
 
-    private void partitionNotNullPositions(Page page, int startingPosition, IntArrayList[] partitionPositions, IntUnaryOperator partitionFunction)
+    private static void partitionNotNullPositions(Page page, int startingPosition, IntArrayList[] partitionPositions, IntUnaryOperator partitionFunction)
     {
         int positionCount = page.getPositionCount();
         int[] partitionPerPosition = new int[positionCount];
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/PagePartitionerPool.java b/core/trino-main/src/main/java/io/trino/operator/output/PagePartitionerPool.java
index 94c3f997c3e5..1d47760e4e66 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/PagePartitionerPool.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/PagePartitionerPool.java
@@ -15,8 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Closer;
-
-import javax.annotation.concurrent.GuardedBy;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 
 import java.io.IOException;
 import java.util.ArrayDeque;
@@ -36,7 +35,7 @@ public class PagePartitionerPool
      * In normal conditions, in the steady state,
      * the number of free {@link PagePartitioner}s is going to be close to 0.
      * There is a possible case though, where initially big number of concurrent drivers, say 128,
-     * drops to a small number e.g. 32 in a steady state. This could cause a lot of memory
+     * drops to a small number e.g., 32 in a steady state. This could cause a lot of memory
      * to be retained by the unused buffers.
      * To defend against that, {@link #maxFree} limits the number of free buffers,
      * thus limiting unused memory.
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/PartitionedOutputOperator.java b/core/trino-main/src/main/java/io/trino/operator/output/PartitionedOutputOperator.java
index 5b5aa956bcfc..be23b52ec017 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/PartitionedOutputOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/PartitionedOutputOperator.java
@@ -60,6 +60,7 @@ public static class PartitionedOutputFactory
         private final Optional<Slice> exchangeEncryptionKey;
         private final AggregatedMemoryContext memoryContext;
         private final int pagePartitionerPoolSize;
+        private final Optional<SkewedPartitionRebalancer> skewedPartitionRebalancer;
 
         public PartitionedOutputFactory(
                 PartitionFunction partitionFunction,
@@ -72,7 +73,8 @@ public PartitionedOutputFactory(
                 PositionsAppenderFactory positionsAppenderFactory,
                 Optional<Slice> exchangeEncryptionKey,
                 AggregatedMemoryContext memoryContext,
-                int pagePartitionerPoolSize)
+                int pagePartitionerPoolSize,
+                Optional<SkewedPartitionRebalancer> skewedPartitionRebalancer)
         {
             this.partitionFunction = requireNonNull(partitionFunction, "partitionFunction is null");
             this.partitionChannels = requireNonNull(partitionChannels, "partitionChannels is null");
@@ -85,6 +87,7 @@ public PartitionedOutputFactory(
             this.exchangeEncryptionKey = requireNonNull(exchangeEncryptionKey, "exchangeEncryptionKey is null");
             this.memoryContext = requireNonNull(memoryContext, "memoryContext is null");
             this.pagePartitionerPoolSize = pagePartitionerPoolSize;
+            this.skewedPartitionRebalancer = requireNonNull(skewedPartitionRebalancer, "skewedPartitionRebalancer is null");
         }
 
         @Override
@@ -111,7 +114,8 @@ public OperatorFactory createOutputOperator(
                     positionsAppenderFactory,
                     exchangeEncryptionKey,
                     memoryContext,
-                    pagePartitionerPoolSize);
+                    pagePartitionerPoolSize,
+                    skewedPartitionRebalancer);
         }
     }
 
@@ -134,6 +138,7 @@ public static class PartitionedOutputOperatorFactory
         private final Optional<Slice> exchangeEncryptionKey;
         private final AggregatedMemoryContext memoryContext;
         private final int pagePartitionerPoolSize;
+        private final Optional<SkewedPartitionRebalancer> skewedPartitionRebalancer;
         private final PagePartitionerPool pagePartitionerPool;
 
         public PartitionedOutputOperatorFactory(
@@ -152,7 +157,8 @@ public PartitionedOutputOperatorFactory(
                 PositionsAppenderFactory positionsAppenderFactory,
                 Optional<Slice> exchangeEncryptionKey,
                 AggregatedMemoryContext memoryContext,
-                int pagePartitionerPoolSize)
+                int pagePartitionerPoolSize,
+                Optional<SkewedPartitionRebalancer> skewedPartitionRebalancer)
         {
             this.operatorId = operatorId;
             this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
@@ -170,21 +176,33 @@ public PartitionedOutputOperatorFactory(
             this.exchangeEncryptionKey = requireNonNull(exchangeEncryptionKey, "exchangeEncryptionKey is null");
             this.memoryContext = requireNonNull(memoryContext, "memoryContext is null");
             this.pagePartitionerPoolSize = pagePartitionerPoolSize;
+            this.skewedPartitionRebalancer = requireNonNull(skewedPartitionRebalancer, "skewedPartitionRebalancer is null");
             this.pagePartitionerPool = new PagePartitionerPool(
                     pagePartitionerPoolSize,
-                    () -> new PagePartitioner(
-                            partitionFunction,
-                            partitionChannels,
-                            partitionConstants,
-                            replicatesAnyRow,
-                            nullChannel,
-                            outputBuffer,
-                            serdeFactory,
-                            sourceTypes,
-                            maxMemory,
-                            positionsAppenderFactory,
-                            exchangeEncryptionKey,
-                            memoryContext));
+                    () -> {
+                        boolean partitionProcessRleAndDictionaryBlocks = true;
+                        PartitionFunction function = partitionFunction;
+                        if (skewedPartitionRebalancer.isPresent()) {
+                            function = new SkewedPartitionFunction(partitionFunction, skewedPartitionRebalancer.get());
+                            // Partition flattened Rle and Dictionary blocks since if they are scaled then we want to
+                            // round-robin the entire block to increase the writing parallelism across tasks/workers.
+                            partitionProcessRleAndDictionaryBlocks = false;
+                        }
+                        return new PagePartitioner(
+                                function,
+                                partitionChannels,
+                                partitionConstants,
+                                replicatesAnyRow,
+                                nullChannel,
+                                outputBuffer,
+                                serdeFactory,
+                                sourceTypes,
+                                maxMemory,
+                                positionsAppenderFactory,
+                                exchangeEncryptionKey,
+                                memoryContext,
+                                partitionProcessRleAndDictionaryBlocks);
+                    });
         }
 
         @Override
@@ -195,7 +213,8 @@ public Operator createOperator(DriverContext driverContext)
                     operatorContext,
                     pagePreprocessor,
                     outputBuffer,
-                    pagePartitionerPool);
+                    pagePartitionerPool,
+                    skewedPartitionRebalancer);
         }
 
         @Override
@@ -223,14 +242,16 @@ public OperatorFactory duplicate()
                     positionsAppenderFactory,
                     exchangeEncryptionKey,
                     memoryContext,
-                    pagePartitionerPoolSize);
+                    pagePartitionerPoolSize,
+                    skewedPartitionRebalancer);
         }
     }
 
     private final OperatorContext operatorContext;
     private final Function<Page, Page> pagePreprocessor;
     private final PagePartitionerPool pagePartitionerPool;
-    private final PagePartitioner partitionFunction;
+    private final PagePartitioner pagePartitioner;
+    private final Optional<SkewedPartitionRebalancer> skewedPartitionRebalancer;
     // outputBuffer is used only to block the operator from finishing if the outputBuffer is full
     private final OutputBuffer outputBuffer;
     private ListenableFuture<Void> isBlocked = NOT_BLOCKED;
@@ -240,14 +261,16 @@ public PartitionedOutputOperator(
             OperatorContext operatorContext,
             Function<Page, Page> pagePreprocessor,
             OutputBuffer outputBuffer,
-            PagePartitionerPool pagePartitionerPool)
+            PagePartitionerPool pagePartitionerPool,
+            Optional<SkewedPartitionRebalancer> skewedPartitionRebalancer)
     {
         this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
         this.pagePreprocessor = requireNonNull(pagePreprocessor, "pagePreprocessor is null");
         this.pagePartitionerPool = requireNonNull(pagePartitionerPool, "pagePartitionerPool is null");
         this.outputBuffer = requireNonNull(outputBuffer, "outputBuffer is null");
-        this.partitionFunction = requireNonNull(pagePartitionerPool.poll(), "partitionFunction is null");
-        this.partitionFunction.setupOperator(operatorContext);
+        this.pagePartitioner = requireNonNull(pagePartitionerPool.poll(), "pagePartitioner is null");
+        this.skewedPartitionRebalancer = requireNonNull(skewedPartitionRebalancer, "skewedPartitionRebalancer is null");
+        this.pagePartitioner.setupOperator(operatorContext);
     }
 
     @Override
@@ -260,7 +283,7 @@ public OperatorContext getOperatorContext()
     public void finish()
     {
         if (!finished) {
-            pagePartitionerPool.release(partitionFunction);
+            pagePartitionerPool.release(pagePartitioner);
             finished = true;
         }
     }
@@ -309,7 +332,22 @@ public void addInput(Page page)
         }
 
         page = pagePreprocessor.apply(page);
-        partitionFunction.partitionPage(page);
+        pagePartitioner.partitionPage(page);
+
+        // Rebalance skewed partitions in the case of scale writer hash partitioning
+        if (skewedPartitionRebalancer.isPresent()) {
+            SkewedPartitionRebalancer rebalancer = skewedPartitionRebalancer.get();
+
+            // Update data processed and partitionRowCount state
+            rebalancer.addDataProcessed(page.getSizeInBytes());
+            ((SkewedPartitionFunction) pagePartitioner.getPartitionFunction()).flushPartitionRowCountToRebalancer();
+
+            // Rebalance only when output buffer is full. This resembles that the downstream writing stage is slow, and
+            // we could rebalance partitions to increase the concurrency at downstream stage.
+            if (!outputBuffer.isFull().isDone()) {
+                rebalancer.rebalance();
+            }
+        }
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppender.java
index 4b0a38b61a53..bc6e4109abc6 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppender.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppender.java
@@ -14,27 +14,28 @@
 package io.trino.operator.output;
 
 import io.trino.spi.block.Block;
+import io.trino.spi.block.ValueBlock;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
 public interface PositionsAppender
 {
-    void append(IntArrayList positions, Block source);
+    void append(IntArrayList positions, ValueBlock source);
 
     /**
      * Appends the specified value positionCount times.
-     * The result is the same as with using {@link PositionsAppender#append(IntArrayList, Block)} with
-     * positions list [0...positionCount -1] but with possible performance optimizations.
+     * The result is the same as with using {@link PositionsAppender#append(IntArrayList, ValueBlock)} with
+     * a position list [0...positionCount -1] but with possible performance optimizations.
      */
-    void appendRle(Block value, int rlePositionCount);
+    void appendRle(ValueBlock value, int rlePositionCount);
 
     /**
      * Appends single position. The implementation must be conceptually equal to
      * {@code append(IntArrayList.wrap(new int[] {position}), source)} but may be optimized.
-     * Caller should avoid using this method if {@link #append(IntArrayList, Block)} can be used
+     * Caller should avoid using this method if {@link #append(IntArrayList, ValueBlock)} can be used
      * as appending positions one by one can be significantly slower and may not support features
      * like pushing RLE through the appender.
      */
-    void append(int position, Block source);
+    void append(int position, ValueBlock source);
 
     /**
      * Creates the block from the appender data.
@@ -42,6 +43,11 @@ public interface PositionsAppender
      */
     Block build();
 
+    /**
+     * Reset this appender without creating a block.
+     */
+    void reset();
+
     /**
      * Returns number of bytes retained by this instance in memory including over-allocations.
      */
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppenderFactory.java b/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppenderFactory.java
index bbf0c970a108..34eab30e020e 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppenderFactory.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppenderFactory.java
@@ -13,13 +13,20 @@
  */
 package io.trino.operator.output;
 
+import io.trino.spi.block.ByteArrayBlock;
+import io.trino.spi.block.Fixed12Block;
 import io.trino.spi.block.Int128ArrayBlock;
-import io.trino.spi.block.Int96ArrayBlock;
-import io.trino.spi.type.FixedWidthType;
+import io.trino.spi.block.IntArrayBlock;
+import io.trino.spi.block.LongArrayBlock;
+import io.trino.spi.block.RowBlock;
+import io.trino.spi.block.ShortArrayBlock;
+import io.trino.spi.block.VariableWidthBlock;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
-import io.trino.spi.type.VariableWidthType;
 import io.trino.type.BlockTypeOperators;
+import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
+
+import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
@@ -32,45 +39,41 @@ public PositionsAppenderFactory(BlockTypeOperators blockTypeOperators)
         this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
     }
 
-    public PositionsAppender create(Type type, int expectedPositions, long maxPageSizeInBytes)
+    public UnnestingPositionsAppender create(Type type, int expectedPositions, long maxPageSizeInBytes)
     {
-        if (!type.isComparable()) {
-            return new UnnestingPositionsAppender(createPrimitiveAppender(type, expectedPositions, maxPageSizeInBytes));
+        Optional<BlockPositionIsDistinctFrom> distinctFromOperator = Optional.empty();
+        if (type.isComparable()) {
+            distinctFromOperator = Optional.of(blockTypeOperators.getDistinctFromOperator(type));
         }
-
-        return new UnnestingPositionsAppender(
-                new RleAwarePositionsAppender(
-                        blockTypeOperators.getDistinctFromOperator(type),
-                        createPrimitiveAppender(type, expectedPositions, maxPageSizeInBytes)));
+        return new UnnestingPositionsAppender(createPrimitiveAppender(type, expectedPositions, maxPageSizeInBytes), distinctFromOperator);
     }
 
     private PositionsAppender createPrimitiveAppender(Type type, int expectedPositions, long maxPageSizeInBytes)
     {
-        if (type instanceof FixedWidthType) {
-            switch (((FixedWidthType) type).getFixedSize()) {
-                case Byte.BYTES:
-                    return new BytePositionsAppender(expectedPositions);
-                case Short.BYTES:
-                    return new ShortPositionsAppender(expectedPositions);
-                case Integer.BYTES:
-                    return new IntPositionsAppender(expectedPositions);
-                case Long.BYTES:
-                    return new LongPositionsAppender(expectedPositions);
-                case Int96ArrayBlock.INT96_BYTES:
-                    return new Int96PositionsAppender(expectedPositions);
-                case Int128ArrayBlock.INT128_BYTES:
-                    return new Int128PositionsAppender(expectedPositions);
-                default:
-                    // size not supported directly, fallback to the generic appender
-            }
+        if (type.getValueBlockType() == ByteArrayBlock.class) {
+            return new BytePositionsAppender(expectedPositions);
+        }
+        if (type.getValueBlockType() == ShortArrayBlock.class) {
+            return new ShortPositionsAppender(expectedPositions);
+        }
+        if (type.getValueBlockType() == IntArrayBlock.class) {
+            return new IntPositionsAppender(expectedPositions);
         }
-        else if (type instanceof VariableWidthType) {
+        if (type.getValueBlockType() == LongArrayBlock.class) {
+            return new LongPositionsAppender(expectedPositions);
+        }
+        if (type.getValueBlockType() == Fixed12Block.class) {
+            return new Fixed12PositionsAppender(expectedPositions);
+        }
+        if (type.getValueBlockType() == Int128ArrayBlock.class) {
+            return new Int128PositionsAppender(expectedPositions);
+        }
+        if (type.getValueBlockType() == VariableWidthBlock.class) {
             return new SlicePositionsAppender(expectedPositions, maxPageSizeInBytes);
         }
-        else if (type instanceof RowType) {
+        if (type.getValueBlockType() == RowBlock.class) {
             return RowPositionsAppender.createRowAppender(this, (RowType) type, expectedPositions, maxPageSizeInBytes);
         }
-
         return new TypedPositionsAppender(type, expectedPositions);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppenderPageBuilder.java b/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppenderPageBuilder.java
index e19aaeb97401..7b113d87d429 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppenderPageBuilder.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppenderPageBuilder.java
@@ -26,7 +26,7 @@
 public class PositionsAppenderPageBuilder
 {
     private static final int DEFAULT_INITIAL_EXPECTED_ENTRIES = 8;
-    private final PositionsAppender[] channelAppenders;
+    private final UnnestingPositionsAppender[] channelAppenders;
     private final int maxPageSizeInBytes;
     private int declaredPositions;
 
@@ -45,7 +45,7 @@ private PositionsAppenderPageBuilder(
         requireNonNull(positionsAppenderFactory, "positionsAppenderFactory is null");
 
         this.maxPageSizeInBytes = maxPageSizeInBytes;
-        channelAppenders = new PositionsAppender[types.size()];
+        channelAppenders = new UnnestingPositionsAppender[types.size()];
         for (int i = 0; i < channelAppenders.length; i++) {
             channelAppenders[i] = positionsAppenderFactory.create(types.get(i), initialExpectedEntries, maxPageSizeInBytes);
         }
@@ -76,7 +76,7 @@ public long getRetainedSizeInBytes()
         // We use a foreach loop instead of streams
         // as it has much better performance.
         long retainedSizeInBytes = 0;
-        for (PositionsAppender positionsAppender : channelAppenders) {
+        for (UnnestingPositionsAppender positionsAppender : channelAppenders) {
             retainedSizeInBytes += positionsAppender.getRetainedSizeInBytes();
         }
         return retainedSizeInBytes;
@@ -85,13 +85,13 @@ public long getRetainedSizeInBytes()
     public long getSizeInBytes()
     {
         long sizeInBytes = 0;
-        for (PositionsAppender positionsAppender : channelAppenders) {
+        for (UnnestingPositionsAppender positionsAppender : channelAppenders) {
             sizeInBytes += positionsAppender.getSizeInBytes();
         }
         return sizeInBytes;
     }
 
-    public void declarePositions(int positions)
+    private void declarePositions(int positions)
     {
         declaredPositions += positions;
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppenderUtil.java b/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppenderUtil.java
index 001e60e460e4..0d1d6b642096 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppenderUtil.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/PositionsAppenderUtil.java
@@ -31,7 +31,7 @@ private PositionsAppenderUtil()
     // Copied from io.trino.spi.block.BlockUtil#calculateNewArraySize
     static int calculateNewArraySize(int currentSize)
     {
-        // grow array by 50%
+        // grow the array by 50%
         long newSize = (long) currentSize + (currentSize >> 1);
 
         // verify new size is within reasonable bounds
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/RleAwarePositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/RleAwarePositionsAppender.java
deleted file mode 100644
index 289608b9ad64..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/output/RleAwarePositionsAppender.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.output;
-
-import io.trino.spi.block.Block;
-import io.trino.spi.block.RunLengthEncodedBlock;
-import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-
-import javax.annotation.Nullable;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static java.util.Objects.requireNonNull;
-
-/**
- * {@link PositionsAppender} that will produce {@link RunLengthEncodedBlock} output if possible,
- * that is all inputs are {@link RunLengthEncodedBlock} blocks with the same value.
- */
-public class RleAwarePositionsAppender
-        implements PositionsAppender
-{
-    private static final int INSTANCE_SIZE = instanceSize(RleAwarePositionsAppender.class);
-    private static final int NO_RLE = -1;
-
-    private final BlockPositionIsDistinctFrom isDistinctFromOperator;
-    private final PositionsAppender delegate;
-
-    @Nullable
-    private Block rleValue;
-
-    // NO_RLE means flat state, 0 means initial empty state, positive means RLE state and the current RLE position count.
-    private int rlePositionCount;
-
-    public RleAwarePositionsAppender(BlockPositionIsDistinctFrom isDistinctFromOperator, PositionsAppender delegate)
-    {
-        this.delegate = requireNonNull(delegate, "delegate is null");
-        this.isDistinctFromOperator = requireNonNull(isDistinctFromOperator, "isDistinctFromOperator is null");
-    }
-
-    @Override
-    public void append(IntArrayList positions, Block source)
-    {
-        // RleAwarePositionsAppender should be used with FlatteningPositionsAppender that makes sure
-        // append is called only with flat block
-        checkArgument(!(source instanceof RunLengthEncodedBlock));
-        switchToFlat();
-        delegate.append(positions, source);
-    }
-
-    @Override
-    public void appendRle(Block value, int positionCount)
-    {
-        if (positionCount == 0) {
-            return;
-        }
-        checkArgument(value.getPositionCount() == 1, "Expected value to contain a single position but has %d positions".formatted(value.getPositionCount()));
-
-        if (rlePositionCount == 0) {
-            // initial empty state, switch to RLE state
-            rleValue = value;
-            rlePositionCount = positionCount;
-        }
-        else if (rleValue != null) {
-            // we are in the RLE state
-            if (!isDistinctFromOperator.isDistinctFrom(rleValue, 0, value, 0)) {
-                // the values match. we can just add positions.
-                this.rlePositionCount += positionCount;
-                return;
-            }
-            // RLE values do not match. switch to flat state
-            switchToFlat();
-            delegate.appendRle(value, positionCount);
-        }
-        else {
-            // flat state
-            delegate.appendRle(value, positionCount);
-        }
-    }
-
-    @Override
-    public void append(int position, Block value)
-    {
-        switchToFlat();
-        delegate.append(position, value);
-    }
-
-    @Override
-    public Block build()
-    {
-        Block result;
-        if (rleValue != null) {
-            result = RunLengthEncodedBlock.create(rleValue, rlePositionCount);
-        }
-        else {
-            result = delegate.build();
-        }
-
-        reset();
-        return result;
-    }
-
-    private void reset()
-    {
-        rleValue = null;
-        rlePositionCount = 0;
-    }
-
-    @Override
-    public long getRetainedSizeInBytes()
-    {
-        long retainedRleSize = rleValue != null ? rleValue.getRetainedSizeInBytes() : 0;
-        return INSTANCE_SIZE + retainedRleSize + delegate.getRetainedSizeInBytes();
-    }
-
-    @Override
-    public long getSizeInBytes()
-    {
-        long rleSize = rleValue != null ? rleValue.getSizeInBytes() : 0;
-        return rleSize + delegate.getSizeInBytes();
-    }
-
-    private void switchToFlat()
-    {
-        if (rleValue != null) {
-            // we are in the RLE state, flatten all RLE blocks
-            delegate.appendRle(rleValue, rlePositionCount);
-            rleValue = null;
-        }
-        rlePositionCount = NO_RLE;
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/RowPositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/RowPositionsAppender.java
index 00b501177df1..ff9b8d25a8be 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/RowPositionsAppender.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/RowPositionsAppender.java
@@ -13,9 +13,10 @@
  */
 package io.trino.operator.output;
 
-import io.trino.spi.block.AbstractRowBlock;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.RowBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.RowType;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
@@ -23,18 +24,20 @@
 import java.util.List;
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.trino.operator.output.PositionsAppenderUtil.calculateBlockResetSize;
 import static io.trino.operator.output.PositionsAppenderUtil.calculateNewArraySize;
-import static io.trino.spi.block.RowBlock.fromFieldBlocks;
+import static io.trino.spi.block.RowBlock.fromNotNullSuppressedFieldBlocks;
 import static java.util.Objects.requireNonNull;
 
 public class RowPositionsAppender
         implements PositionsAppender
 {
     private static final int INSTANCE_SIZE = instanceSize(RowPositionsAppender.class);
-    private final PositionsAppender[] fieldAppenders;
+    private final RowType type;
+    private final UnnestingPositionsAppender[] fieldAppenders;
     private int initialEntryCount;
     private boolean initialized;
 
@@ -51,54 +54,46 @@ public static RowPositionsAppender createRowAppender(
             int expectedPositions,
             long maxPageSizeInBytes)
     {
-        PositionsAppender[] fields = new PositionsAppender[type.getFields().size()];
+        UnnestingPositionsAppender[] fields = new UnnestingPositionsAppender[type.getFields().size()];
         for (int i = 0; i < fields.length; i++) {
             fields[i] = positionsAppenderFactory.create(type.getFields().get(i).getType(), expectedPositions, maxPageSizeInBytes);
         }
-        return new RowPositionsAppender(fields, expectedPositions);
+        return new RowPositionsAppender(type, fields, expectedPositions);
     }
 
-    private RowPositionsAppender(PositionsAppender[] fieldAppenders, int expectedPositions)
+    private RowPositionsAppender(RowType type, UnnestingPositionsAppender[] fieldAppenders, int expectedPositions)
     {
+        this.type = type;
         this.fieldAppenders = requireNonNull(fieldAppenders, "fields is null");
         this.initialEntryCount = expectedPositions;
         resetSize();
     }
 
     @Override
-    // TODO: Make PositionsAppender work performant with different block types (https://github.com/trinodb/trino/issues/13267)
-    public void append(IntArrayList positions, Block block)
+    public void append(IntArrayList positions, ValueBlock block)
     {
+        checkArgument(block instanceof RowBlock, "Block must be instance of %s", RowBlock.class);
+
         if (positions.isEmpty()) {
             return;
         }
         ensureCapacity(positions.size());
-        if (block instanceof AbstractRowBlock sourceRowBlock) {
-            IntArrayList nonNullPositions;
-            if (sourceRowBlock.mayHaveNull()) {
-                nonNullPositions = processNullablePositions(positions, sourceRowBlock);
-                hasNullRow |= nonNullPositions.size() < positions.size();
-                hasNonNullRow |= nonNullPositions.size() > 0;
-            }
-            else {
-                // the source Block does not have nulls
-                nonNullPositions = processNonNullablePositions(positions, sourceRowBlock);
-                hasNonNullRow = true;
-            }
+        RowBlock sourceRowBlock = (RowBlock) block;
 
-            List<Block> fieldBlocks = sourceRowBlock.getChildren();
-            for (int i = 0; i < fieldAppenders.length; i++) {
-                fieldAppenders[i].append(nonNullPositions, fieldBlocks.get(i));
-            }
+        for (int i = 0; i < fieldAppenders.length; i++) {
+            fieldAppenders[i].append(positions, sourceRowBlock.getFieldBlock(i));
         }
-        else if (allPositionsNull(positions, block)) {
-            // all input positions are null. We can handle that even if block type is not RowBLock.
-            // append positions.size() nulls
-            Arrays.fill(rowIsNull, positionCount, positionCount + positions.size(), true);
-            hasNullRow = true;
+
+        if (sourceRowBlock.mayHaveNull()) {
+            for (int i = 0; i < positions.size(); i++) {
+                boolean positionIsNull = sourceRowBlock.isNull(positions.getInt(i));
+                rowIsNull[positionCount + i] = positionIsNull;
+                hasNullRow |= positionIsNull;
+                hasNonNullRow |= !positionIsNull;
+            }
         }
         else {
-            throw new IllegalArgumentException("unsupported block type: " + block);
+            hasNonNullRow = true;
         }
 
         positionCount += positions.size();
@@ -106,62 +101,51 @@ else if (allPositionsNull(positions, block)) {
     }
 
     @Override
-    public void appendRle(Block value, int rlePositionCount)
+    public void appendRle(ValueBlock value, int rlePositionCount)
     {
+        checkArgument(value instanceof RowBlock, "Block must be instance of %s", RowBlock.class);
+
         ensureCapacity(rlePositionCount);
-        if (value instanceof AbstractRowBlock sourceRowBlock) {
-            if (sourceRowBlock.isNull(0)) {
-                // append rlePositionCount nulls
-                Arrays.fill(rowIsNull, positionCount, positionCount + rlePositionCount, true);
-                hasNullRow = true;
-            }
-            else {
-                // append not null row value
-                List<Block> fieldBlocks = sourceRowBlock.getChildren();
-                int fieldPosition = sourceRowBlock.getFieldBlockOffset(0);
-                for (int i = 0; i < fieldAppenders.length; i++) {
-                    fieldAppenders[i].appendRle(fieldBlocks.get(i).getSingleValueBlock(fieldPosition), rlePositionCount);
-                }
-                hasNonNullRow = true;
-            }
+        RowBlock sourceRowBlock = (RowBlock) value;
+
+        List<Block> fieldBlocks = sourceRowBlock.getFieldBlocks();
+        for (int i = 0; i < fieldAppenders.length; i++) {
+            fieldAppenders[i].appendRle(fieldBlocks.get(i).getSingleValueBlock(0), rlePositionCount);
         }
-        else if (value.isNull(0)) {
+
+        if (sourceRowBlock.isNull(0)) {
             // append rlePositionCount nulls
             Arrays.fill(rowIsNull, positionCount, positionCount + rlePositionCount, true);
             hasNullRow = true;
         }
         else {
-            throw new IllegalArgumentException("unsupported block type: " + value);
+            // append not null row value
+            hasNonNullRow = true;
         }
         positionCount += rlePositionCount;
         resetSize();
     }
 
     @Override
-    public void append(int position, Block value)
+    public void append(int position, ValueBlock value)
     {
+        checkArgument(value instanceof RowBlock, "Block must be instance of %s", RowBlock.class);
+
         ensureCapacity(1);
-        if (value instanceof AbstractRowBlock sourceRowBlock) {
-            if (sourceRowBlock.isNull(position)) {
-                rowIsNull[positionCount] = true;
-                hasNullRow = true;
-            }
-            else {
-                // append not null row value
-                List<Block> fieldBlocks = sourceRowBlock.getChildren();
-                int fieldPosition = sourceRowBlock.getFieldBlockOffset(position);
-                for (int i = 0; i < fieldAppenders.length; i++) {
-                    fieldAppenders[i].append(fieldPosition, fieldBlocks.get(i));
-                }
-                hasNonNullRow = true;
-            }
+        RowBlock sourceRowBlock = (RowBlock) value;
+
+        List<Block> fieldBlocks = sourceRowBlock.getChildren();
+        for (int i = 0; i < fieldAppenders.length; i++) {
+            fieldAppenders[i].append(position, fieldBlocks.get(i));
         }
-        else if (value.isNull(position)) {
+
+        if (sourceRowBlock.isNull(position)) {
             rowIsNull[positionCount] = true;
             hasNullRow = true;
         }
         else {
-            throw new IllegalArgumentException("unsupported block type: " + value);
+            // append not null row value
+            hasNonNullRow = true;
         }
         positionCount++;
         resetSize();
@@ -170,17 +154,25 @@ else if (value.isNull(position)) {
     @Override
     public Block build()
     {
-        Block[] fieldBlocks = new Block[fieldAppenders.length];
-        for (int i = 0; i < fieldAppenders.length; i++) {
-            fieldBlocks[i] = fieldAppenders[i].build();
-        }
         Block result;
         if (hasNonNullRow) {
-            result = fromFieldBlocks(positionCount, hasNullRow ? Optional.of(rowIsNull) : Optional.empty(), fieldBlocks);
+            Block[] fieldBlocks = new Block[fieldAppenders.length];
+            for (int i = 0; i < fieldAppenders.length; i++) {
+                fieldBlocks[i] = fieldAppenders[i].build();
+            }
+            result = fromNotNullSuppressedFieldBlocks(positionCount, hasNullRow ? Optional.of(rowIsNull) : Optional.empty(), fieldBlocks);
         }
         else {
-            Block nullRowBlock = fromFieldBlocks(1, Optional.of(new boolean[] {true}), fieldBlocks);
-            result = RunLengthEncodedBlock.create(nullRowBlock, positionCount);
+            for (UnnestingPositionsAppender fieldAppender : fieldAppenders) {
+                fieldAppender.reset();
+            }
+            if (hasNullRow) {
+                Block nullRowBlock = type.createBlockBuilder(null, 0).appendNull().build();
+                result = RunLengthEncodedBlock.create(nullRowBlock, positionCount);
+            }
+            else {
+                result = type.createBlockBuilder(null, 0).build();
+            }
         }
 
         reset();
@@ -195,7 +187,7 @@ public long getRetainedSizeInBytes()
         }
 
         long size = INSTANCE_SIZE + sizeOf(rowIsNull);
-        for (PositionsAppender field : fieldAppenders) {
+        for (UnnestingPositionsAppender field : fieldAppenders) {
             size += field.getRetainedSizeInBytes();
         }
 
@@ -211,7 +203,7 @@ public long getSizeInBytes()
         }
 
         long size = (Integer.BYTES + Byte.BYTES) * (long) positionCount;
-        for (PositionsAppender field : fieldAppenders) {
+        for (UnnestingPositionsAppender field : fieldAppenders) {
             size += field.getSizeInBytes();
         }
 
@@ -219,7 +211,8 @@ public long getSizeInBytes()
         return sizeInBytes;
     }
 
-    private void reset()
+    @Override
+    public void reset()
     {
         initialEntryCount = calculateBlockResetSize(positionCount);
         initialized = false;
@@ -230,41 +223,6 @@ private void reset()
         resetSize();
     }
 
-    private boolean allPositionsNull(IntArrayList positions, Block block)
-    {
-        for (int i = 0; i < positions.size(); i++) {
-            if (!block.isNull(positions.getInt(i))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private IntArrayList processNullablePositions(IntArrayList positions, AbstractRowBlock sourceRowBlock)
-    {
-        int[] nonNullPositions = new int[positions.size()];
-        int nonNullPositionsCount = 0;
-
-        for (int i = 0; i < positions.size(); i++) {
-            int position = positions.getInt(i);
-            boolean positionIsNull = sourceRowBlock.isNull(position);
-            nonNullPositions[nonNullPositionsCount] = sourceRowBlock.getFieldBlockOffset(position);
-            nonNullPositionsCount += positionIsNull ? 0 : 1;
-            rowIsNull[positionCount + i] = positionIsNull;
-        }
-
-        return IntArrayList.wrap(nonNullPositions, nonNullPositionsCount);
-    }
-
-    private IntArrayList processNonNullablePositions(IntArrayList positions, AbstractRowBlock sourceRowBlock)
-    {
-        int[] nonNullPositions = new int[positions.size()];
-        for (int i = 0; i < positions.size(); i++) {
-            nonNullPositions[i] = sourceRowBlock.getFieldBlockOffset(positions.getInt(i));
-        }
-        return IntArrayList.wrap(nonNullPositions);
-    }
-
     private void ensureCapacity(int additionalCapacity)
     {
         if (rowIsNull.length <= positionCount + additionalCapacity) {
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/ShortPositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/ShortPositionsAppender.java
index 21afc3a700bc..16739ae1ea04 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/ShortPositionsAppender.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/ShortPositionsAppender.java
@@ -16,11 +16,13 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.block.ShortArrayBlock;
+import io.trino.spi.block.ValueBlock;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
 import java.util.Arrays;
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.trino.operator.output.PositionsAppenderUtil.calculateBlockResetSize;
@@ -55,9 +57,10 @@ public ShortPositionsAppender(int expectedEntries)
     }
 
     @Override
-    // TODO: Make PositionsAppender work performant with different block types (https://github.com/trinodb/trino/issues/13267)
-    public void append(IntArrayList positions, Block block)
+    public void append(IntArrayList positions, ValueBlock block)
     {
+        checkArgument(block instanceof ShortArrayBlock, "Block must be instance of %s", ShortArrayBlock.class);
+
         if (positions.isEmpty()) {
             return;
         }
@@ -94,8 +97,10 @@ public void append(IntArrayList positions, Block block)
     }
 
     @Override
-    public void appendRle(Block block, int rlePositionCount)
+    public void appendRle(ValueBlock block, int rlePositionCount)
     {
+        checkArgument(block instanceof ShortArrayBlock, "Block must be instance of %s", ShortArrayBlock.class);
+
         if (rlePositionCount == 0) {
             return;
         }
@@ -116,8 +121,10 @@ public void appendRle(Block block, int rlePositionCount)
     }
 
     @Override
-    public void append(int sourcePosition, Block source)
+    public void append(int sourcePosition, ValueBlock source)
     {
+        checkArgument(source instanceof ShortArrayBlock, "Block must be instance of %s", ShortArrayBlock.class);
+
         ensureCapacity(positionCount + 1);
         if (source.isNull(sourcePosition)) {
             valueIsNull[positionCount] = true;
@@ -158,7 +165,8 @@ public long getSizeInBytes()
         return sizeInBytes;
     }
 
-    private void reset()
+    @Override
+    public void reset()
     {
         initialEntryCount = calculateBlockResetSize(positionCount);
         initialized = false;
@@ -185,7 +193,7 @@ private void ensureCapacity(int capacity)
             newSize = initialEntryCount;
             initialized = true;
         }
-        newSize = Math.max(newSize, capacity);
+        newSize = max(newSize, capacity);
 
         valueIsNull = Arrays.copyOf(valueIsNull, newSize);
         values = Arrays.copyOf(values, newSize);
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/SkewedPartitionFunction.java b/core/trino-main/src/main/java/io/trino/operator/output/SkewedPartitionFunction.java
new file mode 100644
index 000000000000..638fc54f3b16
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/output/SkewedPartitionFunction.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed 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 io.trino.operator.output;
+
+import io.trino.operator.PartitionFunction;
+import io.trino.spi.Page;
+
+import static java.util.Objects.requireNonNull;
+
+public class SkewedPartitionFunction
+        implements PartitionFunction
+{
+    private final PartitionFunction partitionFunction;
+    private final SkewedPartitionRebalancer skewedPartitionRebalancer;
+
+    private final long[] partitionRowCount;
+
+    public SkewedPartitionFunction(PartitionFunction partitionFunction, SkewedPartitionRebalancer skewedPartitionRebalancer)
+    {
+        this.partitionFunction = requireNonNull(partitionFunction, "partitionFunction is null");
+        this.skewedPartitionRebalancer = requireNonNull(skewedPartitionRebalancer, "skewedPartitionRebalancer is null");
+
+        this.partitionRowCount = new long[partitionFunction.partitionCount()];
+    }
+
+    @Override
+    public int partitionCount()
+    {
+        return skewedPartitionRebalancer.getTaskCount();
+    }
+
+    @Override
+    public int getPartition(Page page, int position)
+    {
+        int partition = partitionFunction.getPartition(page, position);
+        return skewedPartitionRebalancer.getTaskId(partition, partitionRowCount[partition]++);
+    }
+
+    public void flushPartitionRowCountToRebalancer()
+    {
+        for (int partition = 0; partition < partitionFunction.partitionCount(); partition++) {
+            skewedPartitionRebalancer.addPartitionRowCount(partition, partitionRowCount[partition]);
+            partitionRowCount[partition] = 0;
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/SkewedPartitionRebalancer.java b/core/trino-main/src/main/java/io/trino/operator/output/SkewedPartitionRebalancer.java
new file mode 100644
index 000000000000..458b4ccd17d3
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/output/SkewedPartitionRebalancer.java
@@ -0,0 +1,478 @@
+/*
+ * Licensed 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 io.trino.operator.output;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import io.airlift.log.Logger;
+import io.trino.Session;
+import io.trino.execution.resourcegroups.IndexedPriorityQueue;
+import io.trino.operator.PartitionFunction;
+import io.trino.spi.connector.ConnectorBucketNodeMap;
+import io.trino.spi.type.Type;
+import io.trino.sql.planner.NodePartitioningManager;
+import io.trino.sql.planner.PartitioningHandle;
+import io.trino.sql.planner.PartitioningScheme;
+import io.trino.sql.planner.SystemPartitioningHandle;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicLongArray;
+import java.util.stream.IntStream;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.SystemSessionProperties.getMaxMemoryPerPartitionWriter;
+import static io.trino.SystemSessionProperties.getQueryMaxMemoryPerNode;
+import static io.trino.sql.planner.PartitioningHandle.isScaledWriterHashDistribution;
+import static java.lang.Double.isNaN;
+import static java.lang.Math.ceil;
+import static java.lang.Math.floorMod;
+import static java.lang.Math.max;
+
+/**
+ * Helps in distributing big or skewed partitions across available tasks to improve the performance of
+ * partitioned writes.
+ * <p>
+ * This rebalancer initialize a bunch of buckets for each task based on a given taskBucketCount and then tries to
+ * uniformly distribute partitions across those buckets. This helps to mitigate two problems:
+ * 1. Mitigate skewness across tasks.
+ * 2. Scale few big partitions across tasks even if there's no skewness among them. This will essentially speed the
+ *    local scaling without impacting much overall resource utilization.
+ * <p>
+ * Example:
+ * <p>
+ * Before: 3 tasks, 3 buckets per task, and 2 skewed partitions
+ * Task1                Task2               Task3
+ * Bucket1 (Part 1)     Bucket1 (Part 2)    Bucket1
+ * Bucket2              Bucket2             Bucket2
+ * Bucket3              Bucket3             Bucket3
+ * <p>
+ * After rebalancing:
+ * Task1                Task2               Task3
+ * Bucket1 (Part 1)     Bucket1 (Part 2)    Bucket1 (Part 1)
+ * Bucket2 (Part 2)     Bucket2 (Part 1)    Bucket2 (Part 2)
+ * Bucket3              Bucket3             Bucket3
+ */
+@ThreadSafe
+public class SkewedPartitionRebalancer
+{
+    private static final Logger log = Logger.get(SkewedPartitionRebalancer.class);
+    // Keep the scale writers partition count big enough such that we could rebalance skewed partitions
+    // at more granularity, thus leading to less resource utilization at writer stage.
+    private static final int SCALE_WRITERS_PARTITION_COUNT = 4096;
+    // If the percentage difference between the two different task buckets with maximum and minimum processed bytes
+    // since last rebalance is above 0.7 (or 70%), then we consider them skewed.
+    private static final double TASK_BUCKET_SKEWNESS_THRESHOLD = 0.7;
+
+    private final int partitionCount;
+    private final int taskCount;
+    private final int taskBucketCount;
+    private final long minPartitionDataProcessedRebalanceThreshold;
+    private final long minDataProcessedRebalanceThreshold;
+    private final int maxPartitionsToRebalance;
+
+    private final AtomicLongArray partitionRowCount;
+    private final AtomicLong dataProcessed;
+    private final AtomicLong dataProcessedAtLastRebalance;
+    private final AtomicInteger numOfRebalancedPartitions;
+
+    @GuardedBy("this")
+    private final long[] partitionDataSize;
+
+    @GuardedBy("this")
+    private final long[] partitionDataSizeAtLastRebalance;
+
+    @GuardedBy("this")
+    private final long[] partitionDataSizeSinceLastRebalancePerTask;
+
+    @GuardedBy("this")
+    private final long[] estimatedTaskBucketDataSizeSinceLastRebalance;
+
+    private final List<List<TaskBucket>> partitionAssignments;
+
+    public static boolean checkCanScalePartitionsRemotely(Session session, int taskCount, PartitioningHandle partitioningHandle, NodePartitioningManager nodePartitioningManager)
+    {
+        // In case of connector partitioning, check if bucketToPartitions has fixed mapping or not. If it is fixed
+        // then we can't distribute a bucket across multiple tasks.
+        boolean hasFixedNodeMapping = partitioningHandle.getCatalogHandle()
+                .map(handle -> nodePartitioningManager.getConnectorBucketNodeMap(session, partitioningHandle)
+                        .map(ConnectorBucketNodeMap::hasFixedMapping)
+                        .orElse(false))
+                .orElse(false);
+        // Use skewed partition rebalancer only when there are more than one tasks
+        return taskCount > 1 && !hasFixedNodeMapping && isScaledWriterHashDistribution(partitioningHandle);
+    }
+
+    public static PartitionFunction createPartitionFunction(
+            Session session,
+            NodePartitioningManager nodePartitioningManager,
+            PartitioningScheme scheme,
+            List<Type> partitionChannelTypes)
+    {
+        PartitioningHandle handle = scheme.getPartitioning().getHandle();
+        // In case of SystemPartitioningHandle we can use arbitrary bucket count so that skewness mitigation
+        // is more granular.
+        // Whereas, in the case of connector partitioning we have to use connector provided bucketCount
+        // otherwise buckets will get mapped to tasks incorrectly which could affect skewness handling.
+        //
+        // For example: if there are 2 hive buckets, 2 tasks, and 10 artificial bucketCount then this
+        // could be how actual hive buckets are mapped to artificial buckets and tasks.
+        //
+        // hive bucket  artificial bucket   tasks
+        // 0            0, 2, 4, 6, 8       0, 0, 0, 0, 0
+        // 1            1, 3, 5, 7, 9       1, 1, 1, 1, 1
+        //
+        // Here rebalancing will happen slowly even if there's a skewness at task 0 or hive bucket 0 because
+        // five artificial buckets resemble the first hive bucket. Therefore, these artificial buckets
+        // have to write minPartitionDataProcessedRebalanceThreshold before they get scaled to task 1, which is slow
+        // compared to only a single hive bucket reaching the min limit.
+        int bucketCount = (handle.getConnectorHandle() instanceof SystemPartitioningHandle)
+                ? SCALE_WRITERS_PARTITION_COUNT
+                : nodePartitioningManager.getBucketNodeMap(session, handle).getBucketCount();
+        return nodePartitioningManager.getPartitionFunction(
+                session,
+                scheme,
+                partitionChannelTypes,
+                IntStream.range(0, bucketCount).toArray());
+    }
+
+    public static int getMaxWritersBasedOnMemory(Session session)
+    {
+        return (int) ceil((double) getQueryMaxMemoryPerNode(session).toBytes() / getMaxMemoryPerPartitionWriter(session).toBytes());
+    }
+
+    public static int getScaleWritersMaxSkewedPartitions(Session session)
+    {
+        // Set the value of maxSkewedPartitions to scale to 60% of maximum number of writers possible per node.
+        return (int) (getMaxWritersBasedOnMemory(session) * 0.60);
+    }
+
+    public static int getTaskCount(PartitioningScheme partitioningScheme)
+    {
+        // Todo: Handle skewness if there are more nodes/tasks than the buckets coming from connector
+        // https://github.com/trinodb/trino/issues/17254
+        int[] bucketToPartition = partitioningScheme.getBucketToPartition()
+                .orElseThrow(() -> new IllegalArgumentException("Bucket to partition must be set before calculating taskCount"));
+        // Buckets can be greater than the actual partitions or tasks. Therefore, use max to find the actual taskCount.
+        return IntStream.of(bucketToPartition).max().getAsInt() + 1;
+    }
+
+    public SkewedPartitionRebalancer(
+            int partitionCount,
+            int taskCount,
+            int taskBucketCount,
+            long minPartitionDataProcessedRebalanceThreshold,
+            long maxDataProcessedRebalanceThreshold,
+            int maxPartitionsToRebalance)
+    {
+        this.partitionCount = partitionCount;
+        this.taskCount = taskCount;
+        this.taskBucketCount = taskBucketCount;
+        this.minPartitionDataProcessedRebalanceThreshold = minPartitionDataProcessedRebalanceThreshold;
+        this.minDataProcessedRebalanceThreshold = max(minPartitionDataProcessedRebalanceThreshold, maxDataProcessedRebalanceThreshold);
+        this.maxPartitionsToRebalance = maxPartitionsToRebalance;
+
+        this.partitionRowCount = new AtomicLongArray(partitionCount);
+        this.dataProcessed = new AtomicLong();
+        this.dataProcessedAtLastRebalance = new AtomicLong();
+        this.numOfRebalancedPartitions = new AtomicInteger();
+
+        this.partitionDataSize = new long[partitionCount];
+        this.partitionDataSizeAtLastRebalance = new long[partitionCount];
+        this.partitionDataSizeSinceLastRebalancePerTask = new long[partitionCount];
+        this.estimatedTaskBucketDataSizeSinceLastRebalance = new long[taskCount * taskBucketCount];
+
+        int[] taskBucketIds = new int[taskCount];
+        ImmutableList.Builder<List<TaskBucket>> partitionAssignments = ImmutableList.builder();
+        for (int partition = 0; partition < partitionCount; partition++) {
+            int taskId = partition % taskCount;
+            int bucketId = taskBucketIds[taskId]++ % taskBucketCount;
+            partitionAssignments.add(new CopyOnWriteArrayList<>(ImmutableList.of(new TaskBucket(taskId, bucketId))));
+        }
+        this.partitionAssignments = partitionAssignments.build();
+    }
+
+    @VisibleForTesting
+    List<List<Integer>> getPartitionAssignments()
+    {
+        ImmutableList.Builder<List<Integer>> assignedTasks = ImmutableList.builder();
+        for (List<TaskBucket> partitionAssignment : partitionAssignments) {
+            List<Integer> tasks = partitionAssignment.stream()
+                    .map(taskBucket -> taskBucket.taskId)
+                    .collect(toImmutableList());
+            assignedTasks.add(tasks);
+        }
+        return assignedTasks.build();
+    }
+
+    public int getTaskCount()
+    {
+        return taskCount;
+    }
+
+    public int getTaskId(int partitionId, long index)
+    {
+        List<TaskBucket> taskIds = partitionAssignments.get(partitionId);
+        return taskIds.get(floorMod(index, taskIds.size())).taskId;
+    }
+
+    public void addDataProcessed(long dataSize)
+    {
+        dataProcessed.addAndGet(dataSize);
+    }
+
+    public void addPartitionRowCount(int partition, long rowCount)
+    {
+        partitionRowCount.addAndGet(partition, rowCount);
+    }
+
+    public void rebalance()
+    {
+        long currentDataProcessed = dataProcessed.get();
+        if (shouldRebalance(currentDataProcessed)) {
+            rebalancePartitions(currentDataProcessed);
+        }
+    }
+
+    private boolean shouldRebalance(long dataProcessed)
+    {
+        // Rebalance only when total bytes processed since last rebalance is greater than rebalance threshold.
+        // Check if the number of rebalanced partitions is less than maxPartitionsToRebalance.
+        return (dataProcessed - dataProcessedAtLastRebalance.get()) >= minDataProcessedRebalanceThreshold
+                && numOfRebalancedPartitions.get() < maxPartitionsToRebalance;
+    }
+
+    private synchronized void rebalancePartitions(long dataProcessed)
+    {
+        if (!shouldRebalance(dataProcessed)) {
+            return;
+        }
+
+        calculatePartitionDataSize(dataProcessed);
+
+        // initialize partitionDataSizeSinceLastRebalancePerTask
+        for (int partition = 0; partition < partitionCount; partition++) {
+            int totalAssignedTasks = partitionAssignments.get(partition).size();
+            long dataSize = partitionDataSize[partition];
+            partitionDataSizeSinceLastRebalancePerTask[partition] =
+                    (dataSize - partitionDataSizeAtLastRebalance[partition]) / totalAssignedTasks;
+            partitionDataSizeAtLastRebalance[partition] = dataSize;
+        }
+
+        // Initialize taskBucketMaxPartitions
+        List<IndexedPriorityQueue<Integer>> taskBucketMaxPartitions = new ArrayList<>(taskCount * taskBucketCount);
+        for (int taskId = 0; taskId < taskCount; taskId++) {
+            for (int bucketId = 0; bucketId < taskBucketCount; bucketId++) {
+                taskBucketMaxPartitions.add(new IndexedPriorityQueue<>());
+            }
+        }
+
+        for (int partition = 0; partition < partitionCount; partition++) {
+            List<TaskBucket> taskAssignments = partitionAssignments.get(partition);
+            for (TaskBucket taskBucket : taskAssignments) {
+                IndexedPriorityQueue<Integer> queue = taskBucketMaxPartitions.get(taskBucket.id);
+                queue.addOrUpdate(partition, partitionDataSizeSinceLastRebalancePerTask[partition]);
+            }
+        }
+
+        // Initialize maxTaskBuckets and minTaskBuckets
+        IndexedPriorityQueue<TaskBucket> maxTaskBuckets = new IndexedPriorityQueue<>();
+        IndexedPriorityQueue<TaskBucket> minTaskBuckets = new IndexedPriorityQueue<>();
+        for (int taskId = 0; taskId < taskCount; taskId++) {
+            for (int bucketId = 0; bucketId < taskBucketCount; bucketId++) {
+                TaskBucket taskBucket = new TaskBucket(taskId, bucketId);
+                estimatedTaskBucketDataSizeSinceLastRebalance[taskBucket.id] =
+                        calculateTaskBucketDataSizeSinceLastRebalance(taskBucketMaxPartitions.get(taskBucket.id));
+                maxTaskBuckets.addOrUpdate(taskBucket, estimatedTaskBucketDataSizeSinceLastRebalance[taskBucket.id]);
+                minTaskBuckets.addOrUpdate(taskBucket, Long.MAX_VALUE - estimatedTaskBucketDataSizeSinceLastRebalance[taskBucket.id]);
+            }
+        }
+
+        rebalanceBasedOnTaskBucketSkewness(maxTaskBuckets, minTaskBuckets, taskBucketMaxPartitions);
+        dataProcessedAtLastRebalance.set(dataProcessed);
+    }
+
+    private void calculatePartitionDataSize(long dataProcessed)
+    {
+        long totalPartitionRowCount = 0;
+        for (int partition = 0; partition < partitionCount; partition++) {
+            totalPartitionRowCount += partitionRowCount.get(partition);
+        }
+
+        for (int partition = 0; partition < partitionCount; partition++) {
+            partitionDataSize[partition] = (partitionRowCount.get(partition) * dataProcessed) / totalPartitionRowCount;
+        }
+    }
+
+    private long calculateTaskBucketDataSizeSinceLastRebalance(IndexedPriorityQueue<Integer> maxPartitions)
+    {
+        long estimatedDataSizeSinceLastRebalance = 0;
+        for (int partition : maxPartitions) {
+            estimatedDataSizeSinceLastRebalance += partitionDataSizeSinceLastRebalancePerTask[partition];
+        }
+        return estimatedDataSizeSinceLastRebalance;
+    }
+
+    private void rebalanceBasedOnTaskBucketSkewness(
+            IndexedPriorityQueue<TaskBucket> maxTaskBuckets,
+            IndexedPriorityQueue<TaskBucket> minTaskBuckets,
+            List<IndexedPriorityQueue<Integer>> taskBucketMaxPartitions)
+    {
+        List<Integer> scaledPartitions = new ArrayList<>();
+        while (true) {
+            TaskBucket maxTaskBucket = maxTaskBuckets.poll();
+            if (maxTaskBucket == null) {
+                break;
+            }
+
+            IndexedPriorityQueue<Integer> maxPartitions = taskBucketMaxPartitions.get(maxTaskBucket.id);
+            if (maxPartitions.isEmpty()) {
+                continue;
+            }
+
+            List<TaskBucket> minSkewedTaskBuckets = findSkewedMinTaskBuckets(maxTaskBucket, minTaskBuckets);
+            if (minSkewedTaskBuckets.isEmpty()) {
+                break;
+            }
+
+            while (true) {
+                Integer maxPartition = maxPartitions.poll();
+                if (maxPartition == null) {
+                    break;
+                }
+
+                // Rebalance partition only once in a single cycle. Otherwise, rebalancing will happen quite
+                // aggressively in the early stage of write, while it is not required. Thus, it can have an impact on
+                // output file sizes and resource usage such that produced files can be small and memory usage
+                // might be higher.
+                if (scaledPartitions.contains(maxPartition)) {
+                    continue;
+                }
+
+                int totalAssignedTasks = partitionAssignments.get(maxPartition).size();
+                if (partitionDataSize[maxPartition] >= (minPartitionDataProcessedRebalanceThreshold * totalAssignedTasks)) {
+                    for (TaskBucket minTaskBucket : minSkewedTaskBuckets) {
+                        if (rebalancePartition(maxPartition, minTaskBucket, maxTaskBuckets, minTaskBuckets)) {
+                            scaledPartitions.add(maxPartition);
+                            break;
+                        }
+                    }
+                }
+                else {
+                    break;
+                }
+            }
+        }
+    }
+
+    private List<TaskBucket> findSkewedMinTaskBuckets(TaskBucket maxTaskBucket, IndexedPriorityQueue<TaskBucket> minTaskBuckets)
+    {
+        ImmutableList.Builder<TaskBucket> minSkewedTaskBuckets = ImmutableList.builder();
+        for (TaskBucket minTaskBucket : minTaskBuckets) {
+            double skewness =
+                    ((double) (estimatedTaskBucketDataSizeSinceLastRebalance[maxTaskBucket.id]
+                            - estimatedTaskBucketDataSizeSinceLastRebalance[minTaskBucket.id]))
+                            / estimatedTaskBucketDataSizeSinceLastRebalance[maxTaskBucket.id];
+            if (skewness <= TASK_BUCKET_SKEWNESS_THRESHOLD || isNaN(skewness)) {
+                break;
+            }
+            if (maxTaskBucket.taskId != minTaskBucket.taskId) {
+                minSkewedTaskBuckets.add(minTaskBucket);
+            }
+        }
+
+        return minSkewedTaskBuckets.build();
+    }
+
+    private boolean rebalancePartition(
+            int partitionId,
+            TaskBucket toTaskBucket,
+            IndexedPriorityQueue<TaskBucket> maxTasks,
+            IndexedPriorityQueue<TaskBucket> minTasks)
+    {
+        List<TaskBucket> assignments = partitionAssignments.get(partitionId);
+        if (assignments.stream().anyMatch(taskBucket -> taskBucket.taskId == toTaskBucket.taskId)) {
+            return false;
+        }
+
+        // If the number of rebalanced partitions is less than maxPartitionsToRebalance then assign
+        // the partition to the task.
+        if (numOfRebalancedPartitions.get() >= maxPartitionsToRebalance) {
+            return false;
+        }
+
+        assignments.add(toTaskBucket);
+
+        int newTaskCount = assignments.size();
+        int oldTaskCount = newTaskCount - 1;
+        // Since a partition is rebalanced from max to min skewed taskBucket, decrease the priority of max
+        // taskBucket as well as increase the priority of min taskBucket.
+        for (TaskBucket taskBucket : assignments) {
+            if (taskBucket.equals(toTaskBucket)) {
+                estimatedTaskBucketDataSizeSinceLastRebalance[taskBucket.id] +=
+                        (partitionDataSizeSinceLastRebalancePerTask[partitionId] * oldTaskCount) / newTaskCount;
+            }
+            else {
+                estimatedTaskBucketDataSizeSinceLastRebalance[taskBucket.id] -=
+                        partitionDataSizeSinceLastRebalancePerTask[partitionId] / newTaskCount;
+            }
+
+            maxTasks.addOrUpdate(taskBucket, estimatedTaskBucketDataSizeSinceLastRebalance[taskBucket.id]);
+            minTasks.addOrUpdate(taskBucket, Long.MAX_VALUE - estimatedTaskBucketDataSizeSinceLastRebalance[taskBucket.id]);
+        }
+
+        // Increment the number of rebalanced partitions.
+        numOfRebalancedPartitions.incrementAndGet();
+        log.debug("Rebalanced partition %s to task %s with taskCount %s", partitionId, toTaskBucket.taskId, assignments.size());
+        return true;
+    }
+
+    private final class TaskBucket
+    {
+        private final int taskId;
+        private final int id;
+
+        private TaskBucket(int taskId, int bucketId)
+        {
+            this.taskId = taskId;
+            // Unique id for this task and bucket
+            this.id = (taskId * taskBucketCount) + bucketId;
+        }
+
+        @Override
+        public int hashCode()
+        {
+            return Objects.hash(taskId, id);
+        }
+
+        @Override
+        public boolean equals(Object o)
+        {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            TaskBucket that = (TaskBucket) o;
+            return that.id == id;
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/SlicePositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/SlicePositionsAppender.java
index 1811ef472497..204cf679520c 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/SlicePositionsAppender.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/SlicePositionsAppender.java
@@ -18,12 +18,14 @@
 import io.airlift.slice.Slices;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.block.VariableWidthBlock;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
 import java.util.Arrays;
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.slice.SizeOf.SIZE_OF_BYTE;
 import static io.airlift.slice.SizeOf.SIZE_OF_INT;
 import static io.airlift.slice.SizeOf.instanceSize;
@@ -51,7 +53,7 @@ public class SlicePositionsAppender
 
     private boolean hasNullValue;
     private boolean hasNonNullValue;
-    // it is assumed that the offsets array is one position longer than the valueIsNull array
+    // it is assumed that the offset array is one position longer than the valueIsNull array
     private boolean[] valueIsNull = new boolean[0];
     private int[] offsets = new int[1];
 
@@ -74,54 +76,53 @@ public SlicePositionsAppender(int expectedEntries, int expectedBytes)
     }
 
     @Override
-    // TODO: Make PositionsAppender work performant with different block types (https://github.com/trinodb/trino/issues/13267)
-    public void append(IntArrayList positions, Block block)
+    public void append(IntArrayList positions, ValueBlock block)
     {
+        checkArgument(block instanceof VariableWidthBlock, "Block must be instance of %s", VariableWidthBlock.class);
+
         if (positions.isEmpty()) {
             return;
         }
         ensurePositionCapacity(positionCount + positions.size());
-        if (block instanceof VariableWidthBlock variableWidthBlock) {
-            int newByteCount = 0;
-            int[] lengths = new int[positions.size()];
-            int[] sourceOffsets = new int[positions.size()];
-            int[] positionArray = positions.elements();
-
-            if (block.mayHaveNull()) {
-                for (int i = 0; i < positions.size(); i++) {
-                    int position = positionArray[i];
-                    int length = variableWidthBlock.getSliceLength(position);
-                    lengths[i] = length;
-                    sourceOffsets[i] = variableWidthBlock.getRawSliceOffset(position);
-                    newByteCount += length;
-                    boolean isNull = block.isNull(position);
-                    valueIsNull[positionCount + i] = isNull;
-                    offsets[positionCount + i + 1] = offsets[positionCount + i] + length;
-                    hasNullValue |= isNull;
-                    hasNonNullValue |= !isNull;
-                }
-            }
-            else {
-                for (int i = 0; i < positions.size(); i++) {
-                    int position = positionArray[i];
-                    int length = variableWidthBlock.getSliceLength(position);
-                    lengths[i] = length;
-                    sourceOffsets[i] = variableWidthBlock.getRawSliceOffset(position);
-                    newByteCount += length;
-                    offsets[positionCount + i + 1] = offsets[positionCount + i] + length;
-                }
-                hasNonNullValue = true;
+        VariableWidthBlock variableWidthBlock = (VariableWidthBlock) block;
+        int newByteCount = 0;
+        int[] lengths = new int[positions.size()];
+        int[] sourceOffsets = new int[positions.size()];
+        int[] positionArray = positions.elements();
+
+        if (block.mayHaveNull()) {
+            for (int i = 0; i < positions.size(); i++) {
+                int position = positionArray[i];
+                int length = variableWidthBlock.getSliceLength(position);
+                lengths[i] = length;
+                sourceOffsets[i] = variableWidthBlock.getRawSliceOffset(position);
+                newByteCount += length;
+                boolean isNull = block.isNull(position);
+                valueIsNull[positionCount + i] = isNull;
+                offsets[positionCount + i + 1] = offsets[positionCount + i] + length;
+                hasNullValue |= isNull;
+                hasNonNullValue |= !isNull;
             }
-            copyBytes(variableWidthBlock.getRawSlice(), lengths, sourceOffsets, positions.size(), newByteCount);
         }
         else {
-            appendGenericBlock(positions, block);
+            for (int i = 0; i < positions.size(); i++) {
+                int position = positionArray[i];
+                int length = variableWidthBlock.getSliceLength(position);
+                lengths[i] = length;
+                sourceOffsets[i] = variableWidthBlock.getRawSliceOffset(position);
+                newByteCount += length;
+                offsets[positionCount + i + 1] = offsets[positionCount + i] + length;
+            }
+            hasNonNullValue = true;
         }
+        copyBytes(variableWidthBlock.getRawSlice(), lengths, sourceOffsets, positions.size(), newByteCount);
     }
 
     @Override
-    public void appendRle(Block block, int rlePositionCount)
+    public void appendRle(ValueBlock block, int rlePositionCount)
     {
+        checkArgument(block instanceof VariableWidthBlock, "Block must be instance of %s", VariableWidthBlock.class);
+
         if (rlePositionCount == 0) {
             return;
         }
@@ -141,8 +142,10 @@ public void appendRle(Block block, int rlePositionCount)
     }
 
     @Override
-    public void append(int position, Block source)
+    public void append(int position, ValueBlock source)
     {
+        checkArgument(source instanceof VariableWidthBlock, "Block must be instance of %s but is %s".formatted(VariableWidthBlock.class, source.getClass()));
+
         ensurePositionCapacity(positionCount + 1);
         if (source.isNull(position)) {
             valueIsNull[positionCount] = true;
@@ -203,17 +206,10 @@ private void copyBytes(Slice rawSlice, int[] lengths, int[] sourceOffsets, int c
     {
         ensureExtraBytesCapacity(newByteCount);
 
-        if (rawSlice.hasByteArray()) {
-            byte[] base = rawSlice.byteArray();
-            int byteArrayOffset = rawSlice.byteArrayOffset();
-            for (int i = 0; i < count; i++) {
-                System.arraycopy(base, byteArrayOffset + sourceOffsets[i], bytes, offsets[positionCount + i], lengths[i]);
-            }
-        }
-        else {
-            for (int i = 0; i < count; i++) {
-                rawSlice.getBytes(sourceOffsets[i], bytes, offsets[positionCount + i], lengths[i]);
-            }
+        byte[] base = rawSlice.byteArray();
+        int byteArrayOffset = rawSlice.byteArrayOffset();
+        for (int i = 0; i < count; i++) {
+            System.arraycopy(base, byteArrayOffset + sourceOffsets[i], bytes, offsets[positionCount + i], lengths[i]);
         }
 
         positionCount += count;
@@ -266,31 +262,8 @@ static void duplicateBytes(Slice slice, byte[] bytes, int startOffset, int count
         System.arraycopy(bytes, startOffset, bytes, startOffset + duplicatedBytes, totalDuplicatedBytes - duplicatedBytes);
     }
 
-    private void appendGenericBlock(IntArrayList positions, Block block)
-    {
-        int newByteCount = 0;
-        for (int i = 0; i < positions.size(); i++) {
-            int position = positions.getInt(i);
-            if (block.isNull(position)) {
-                offsets[positionCount + 1] = offsets[positionCount];
-                valueIsNull[positionCount] = true;
-                hasNullValue = true;
-            }
-            else {
-                int length = block.getSliceLength(position);
-                ensureExtraBytesCapacity(length);
-                Slice slice = block.getSlice(position, 0, length);
-                slice.getBytes(0, bytes, offsets[positionCount], length);
-                offsets[positionCount + 1] = offsets[positionCount] + length;
-                hasNonNullValue = true;
-                newByteCount += length;
-            }
-            positionCount++;
-        }
-        updateSize(positions.size(), newByteCount);
-    }
-
-    private void reset()
+    @Override
+    public void reset()
     {
         initialEntryCount = calculateBlockResetSize(positionCount);
         initialBytesSize = calculateBlockResetBytes(getCurrentOffset());
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/TaskOutputOperator.java b/core/trino-main/src/main/java/io/trino/operator/output/TaskOutputOperator.java
index 49b9e87595ec..b687ed09ac74 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/TaskOutputOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/TaskOutputOperator.java
@@ -134,7 +134,7 @@ public boolean isFinished()
     @Override
     public ListenableFuture<Void> isBlocked()
     {
-        // Avoid re-synchronizing on the output buffer when operator is already blocked
+        // Avoid re-synchronizing on the output buffer when the operator is already blocked
         if (isBlocked.isDone()) {
             isBlocked = outputBuffer.isFull();
             if (isBlocked.isDone()) {
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/TypedPositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/TypedPositionsAppender.java
index 1f66dd05d0dc..2fcc0fda3b52 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/TypedPositionsAppender.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/TypedPositionsAppender.java
@@ -15,6 +15,7 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
@@ -30,20 +31,13 @@ class TypedPositionsAppender
     private BlockBuilder blockBuilder;
 
     TypedPositionsAppender(Type type, int expectedPositions)
-    {
-        this(
-                type,
-                type.createBlockBuilder(null, expectedPositions));
-    }
-
-    TypedPositionsAppender(Type type, BlockBuilder blockBuilder)
     {
         this.type = requireNonNull(type, "type is null");
-        this.blockBuilder = requireNonNull(blockBuilder, "blockBuilder is null");
+        this.blockBuilder = type.createBlockBuilder(null, expectedPositions);
     }
 
     @Override
-    public void append(IntArrayList positions, Block source)
+    public void append(IntArrayList positions, ValueBlock source)
     {
         int[] positionArray = positions.elements();
         for (int i = 0; i < positions.size(); i++) {
@@ -52,7 +46,7 @@ public void append(IntArrayList positions, Block source)
     }
 
     @Override
-    public void appendRle(Block block, int rlePositionCount)
+    public void appendRle(ValueBlock block, int rlePositionCount)
     {
         for (int i = 0; i < rlePositionCount; i++) {
             type.appendTo(block, 0, blockBuilder);
@@ -60,7 +54,7 @@ public void appendRle(Block block, int rlePositionCount)
     }
 
     @Override
-    public void append(int position, Block source)
+    public void append(int position, ValueBlock source)
     {
         type.appendTo(source, position, blockBuilder);
     }
@@ -69,10 +63,18 @@ public void append(int position, Block source)
     public Block build()
     {
         Block result = blockBuilder.build();
-        blockBuilder = blockBuilder.newBlockBuilderLike(null);
+        reset();
         return result;
     }
 
+    @Override
+    public void reset()
+    {
+        if (blockBuilder.getPositionCount() > 0) {
+            blockBuilder = blockBuilder.newBlockBuilderLike(null);
+        }
+    }
+
     @Override
     public long getRetainedSizeInBytes()
     {
diff --git a/core/trino-main/src/main/java/io/trino/operator/output/UnnestingPositionsAppender.java b/core/trino-main/src/main/java/io/trino/operator/output/UnnestingPositionsAppender.java
index d70145c9c4b6..63c1485fcc08 100644
--- a/core/trino-main/src/main/java/io/trino/operator/output/UnnestingPositionsAppender.java
+++ b/core/trino-main/src/main/java/io/trino/operator/output/UnnestingPositionsAppender.java
@@ -16,95 +16,264 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.DictionaryBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
+import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntArrays;
+import jakarta.annotation.Nullable;
 
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verify;
 import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.operator.output.PositionsAppenderUtil.calculateBlockResetSize;
+import static io.trino.operator.output.PositionsAppenderUtil.calculateNewArraySize;
+import static java.lang.Math.max;
 import static java.util.Objects.requireNonNull;
 
 /**
  * Dispatches the {@link #append} and {@link #appendRle} methods to the {@link #delegate} depending on the input {@link Block} class.
  */
 public class UnnestingPositionsAppender
-        implements PositionsAppender
 {
     private static final int INSTANCE_SIZE = instanceSize(UnnestingPositionsAppender.class);
 
+    // The initial state will transition to either the DICTIONARY or RLE state, and from there to the DIRECT state if necessary.
+    private enum State
+    {
+        UNINITIALIZED, DICTIONARY, RLE, DIRECT
+    }
+
     private final PositionsAppender delegate;
+    @Nullable
+    private final BlockPositionIsDistinctFrom isDistinctFromOperator;
+
+    private State state = State.UNINITIALIZED;
+
+    private ValueBlock dictionary;
+    private DictionaryIdsBuilder dictionaryIdsBuilder;
+
+    @Nullable
+    private ValueBlock rleValue;
+    private int rlePositionCount;
 
-    public UnnestingPositionsAppender(PositionsAppender delegate)
+    public UnnestingPositionsAppender(PositionsAppender delegate, Optional<BlockPositionIsDistinctFrom> isDistinctFromOperator)
     {
         this.delegate = requireNonNull(delegate, "delegate is null");
+        this.dictionaryIdsBuilder = new DictionaryIdsBuilder(1024);
+        this.isDistinctFromOperator = isDistinctFromOperator.orElse(null);
     }
 
-    @Override
     public void append(IntArrayList positions, Block source)
     {
         if (positions.isEmpty()) {
             return;
         }
-        if (source instanceof RunLengthEncodedBlock) {
-            delegate.appendRle(((RunLengthEncodedBlock) source).getValue(), positions.size());
+
+        if (source instanceof RunLengthEncodedBlock rleBlock) {
+            appendRle(rleBlock.getValue(), positions.size());
+        }
+        else if (source instanceof DictionaryBlock dictionaryBlock) {
+            ValueBlock dictionary = dictionaryBlock.getDictionary();
+            if (state == State.UNINITIALIZED) {
+                state = State.DICTIONARY;
+                this.dictionary = dictionary;
+                dictionaryIdsBuilder.appendPositions(positions, dictionaryBlock);
+            }
+            else if (state == State.DICTIONARY && this.dictionary == dictionary) {
+                dictionaryIdsBuilder.appendPositions(positions, dictionaryBlock);
+            }
+            else {
+                transitionToDirect();
+
+                int[] positionArray = new int[positions.size()];
+                for (int i = 0; i < positions.size(); i++) {
+                    positionArray[i] = dictionaryBlock.getId(positions.getInt(i));
+                }
+                delegate.append(IntArrayList.wrap(positionArray), dictionary);
+            }
         }
-        else if (source instanceof DictionaryBlock) {
-            appendDictionary(positions, (DictionaryBlock) source);
+        else if (source instanceof ValueBlock valueBlock) {
+            transitionToDirect();
+            delegate.append(positions, valueBlock);
         }
         else {
-            delegate.append(positions, source);
+            throw new IllegalArgumentException("Unsupported block type: " + source.getClass().getSimpleName());
         }
     }
 
-    @Override
-    public void appendRle(Block block, int rlePositionCount)
+    public void appendRle(ValueBlock value, int positionCount)
     {
-        if (rlePositionCount == 0) {
+        if (positionCount == 0) {
             return;
         }
-        delegate.appendRle(block, rlePositionCount);
+
+        if (state == State.DICTIONARY) {
+            transitionToDirect();
+        }
+        if (isDistinctFromOperator == null) {
+            transitionToDirect();
+        }
+
+        if (state == State.UNINITIALIZED) {
+            state = State.RLE;
+            rleValue = value;
+            rlePositionCount = positionCount;
+            return;
+        }
+        if (state == State.RLE) {
+            if (!isDistinctFromOperator.isDistinctFrom(rleValue, 0, value, 0)) {
+                // the values match. we can just add positions.
+                rlePositionCount += positionCount;
+                return;
+            }
+            transitionToDirect();
+        }
+
+        verify(state == State.DIRECT);
+        delegate.appendRle(value, positionCount);
     }
 
-    @Override
     public void append(int position, Block source)
     {
+        if (state != State.DIRECT) {
+            transitionToDirect();
+        }
+
         if (source instanceof RunLengthEncodedBlock runLengthEncodedBlock) {
             delegate.append(0, runLengthEncodedBlock.getValue());
         }
         else if (source instanceof DictionaryBlock dictionaryBlock) {
             delegate.append(dictionaryBlock.getId(position), dictionaryBlock.getDictionary());
         }
+        else if (source instanceof ValueBlock valueBlock) {
+            delegate.append(position, valueBlock);
+        }
         else {
-            delegate.append(position, source);
+            throw new IllegalArgumentException("Unsupported block type: " + source.getClass().getSimpleName());
+        }
+    }
+
+    private void transitionToDirect()
+    {
+        if (state == State.DICTIONARY) {
+            int[] dictionaryIds = dictionaryIdsBuilder.getDictionaryIds();
+            delegate.append(IntArrayList.wrap(dictionaryIds, dictionaryIdsBuilder.size()), dictionary);
+            dictionary = null;
+            dictionaryIdsBuilder = dictionaryIdsBuilder.newBuilderLike();
+        }
+        else if (state == State.RLE) {
+            delegate.appendRle(rleValue, rlePositionCount);
+            rleValue = null;
+            rlePositionCount = 0;
         }
+        state = State.DIRECT;
     }
 
-    @Override
     public Block build()
     {
-        return delegate.build();
+        Block result = switch (state) {
+            case DICTIONARY -> DictionaryBlock.create(dictionaryIdsBuilder.size(), dictionary, dictionaryIdsBuilder.getDictionaryIds());
+            case RLE -> RunLengthEncodedBlock.create(rleValue, rlePositionCount);
+            case UNINITIALIZED, DIRECT -> delegate.build();
+        };
+
+        reset();
+
+        return result;
     }
 
-    @Override
-    public long getRetainedSizeInBytes()
+    public void reset()
     {
-        return INSTANCE_SIZE + delegate.getRetainedSizeInBytes();
+        state = State.UNINITIALIZED;
+        dictionary = null;
+        dictionaryIdsBuilder = dictionaryIdsBuilder.newBuilderLike();
+        rleValue = null;
+        rlePositionCount = 0;
+        delegate.reset();
     }
 
-    @Override
-    public long getSizeInBytes()
+    public long getRetainedSizeInBytes()
     {
-        return delegate.getSizeInBytes();
+        return INSTANCE_SIZE +
+                delegate.getRetainedSizeInBytes() +
+                dictionaryIdsBuilder.getRetainedSizeInBytes() +
+                (rleValue != null ? rleValue.getRetainedSizeInBytes() : 0);
     }
 
-    private void appendDictionary(IntArrayList positions, DictionaryBlock source)
+    public long getSizeInBytes()
     {
-        delegate.append(mapPositions(positions, source), source.getDictionary());
+        return delegate.getSizeInBytes() +
+                // dictionary size is not included due to the expense of the calculation
+                (rleValue != null ? rleValue.getSizeInBytes() : 0);
     }
 
-    private IntArrayList mapPositions(IntArrayList positions, DictionaryBlock block)
+    private static class DictionaryIdsBuilder
     {
-        int[] positionArray = new int[positions.size()];
-        for (int i = 0; i < positions.size(); i++) {
-            positionArray[i] = block.getId(positions.getInt(i));
+        private static final int INSTANCE_SIZE = instanceSize(DictionaryIdsBuilder.class);
+
+        private final int initialEntryCount;
+        private int[] dictionaryIds;
+        private int size;
+
+        public DictionaryIdsBuilder(int initialEntryCount)
+        {
+            this.initialEntryCount = initialEntryCount;
+            this.dictionaryIds = new int[0];
+        }
+
+        public int[] getDictionaryIds()
+        {
+            return dictionaryIds;
+        }
+
+        public int size()
+        {
+            return size;
+        }
+
+        public long getRetainedSizeInBytes()
+        {
+            return INSTANCE_SIZE + sizeOf(dictionaryIds);
+        }
+
+        public void appendPositions(IntArrayList positions, DictionaryBlock block)
+        {
+            checkArgument(!positions.isEmpty(), "positions is empty");
+            ensureCapacity(size + positions.size());
+
+            for (int i = 0; i < positions.size(); i++) {
+                dictionaryIds[size + i] = block.getId(positions.getInt(i));
+            }
+            size += positions.size();
+        }
+
+        public DictionaryIdsBuilder newBuilderLike()
+        {
+            if (size == 0) {
+                return this;
+            }
+            return new DictionaryIdsBuilder(max(calculateBlockResetSize(size), initialEntryCount));
+        }
+
+        private void ensureCapacity(int capacity)
+        {
+            if (dictionaryIds.length >= capacity) {
+                return;
+            }
+
+            int newSize;
+            if (dictionaryIds.length > 0) {
+                newSize = calculateNewArraySize(dictionaryIds.length);
+            }
+            else {
+                newSize = initialEntryCount;
+            }
+            newSize = max(newSize, capacity);
+
+            dictionaryIds = IntArrays.ensureCapacity(dictionaryIds, newSize, size);
         }
-        return IntArrayList.wrap(positionArray);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/project/ConstantPageProjection.java b/core/trino-main/src/main/java/io/trino/operator/project/ConstantPageProjection.java
index fddadaeedb78..4365f594f76a 100644
--- a/core/trino-main/src/main/java/io/trino/operator/project/ConstantPageProjection.java
+++ b/core/trino-main/src/main/java/io/trino/operator/project/ConstantPageProjection.java
@@ -19,7 +19,6 @@
 import io.trino.operator.Work;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
@@ -37,9 +36,7 @@ public class ConstantPageProjection
     public ConstantPageProjection(Object value, Type type)
     {
         this.type = type;
-        BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
-        writeNativeValue(type, blockBuilder, value);
-        this.value = blockBuilder.build();
+        this.value = writeNativeValue(type, value);
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/operator/project/DictionaryAwarePageProjection.java b/core/trino-main/src/main/java/io/trino/operator/project/DictionaryAwarePageProjection.java
index 987cc515368e..5b1439c37b41 100644
--- a/core/trino-main/src/main/java/io/trino/operator/project/DictionaryAwarePageProjection.java
+++ b/core/trino-main/src/main/java/io/trino/operator/project/DictionaryAwarePageProjection.java
@@ -24,8 +24,7 @@
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Optional;
 import java.util.function.Function;
diff --git a/core/trino-main/src/main/java/io/trino/operator/project/PageProcessor.java b/core/trino-main/src/main/java/io/trino/operator/project/PageProcessor.java
index 8998e079936a..49c6673821ad 100644
--- a/core/trino-main/src/main/java/io/trino/operator/project/PageProcessor.java
+++ b/core/trino-main/src/main/java/io/trino/operator/project/PageProcessor.java
@@ -14,6 +14,7 @@
 package io.trino.operator.project;
 
 import com.google.common.annotations.VisibleForTesting;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.array.ReferenceCountMap;
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.operator.DriverYieldSignal;
@@ -27,8 +28,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.sql.gen.ExpressionProfiler;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -53,8 +52,8 @@
 public class PageProcessor
 {
     public static final int MAX_BATCH_SIZE = 8 * 1024;
-    static final int MAX_PAGE_SIZE_IN_BYTES = 4 * 1024 * 1024;
-    static final int MIN_PAGE_SIZE_IN_BYTES = 1024 * 1024;
+    static final int MAX_PAGE_SIZE_IN_BYTES = 16 * 1024 * 1024;
+    static final int MIN_PAGE_SIZE_IN_BYTES = 4 * 1024 * 1024;
 
     private final ExpressionProfiler expressionProfiler;
     private final DictionarySourceIdFunction dictionarySourceIdFunction = new DictionarySourceIdFunction();
@@ -323,7 +322,7 @@ private ProcessBatchResult processBatch(int batchSize)
         {
             Block[] blocks = new Block[projections.size()];
 
-            int pageSize = 0;
+            long pageSize = 0;
             SelectedPositions positionsBatch = selectedPositions.subRange(0, batchSize);
             for (int i = 0; i < projections.size(); i++) {
                 if (yieldSignal.isSet()) {
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/AbstractGreatestLeast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/AbstractGreatestLeast.java
index 057779be9e66..b7639b4dee02 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/AbstractGreatestLeast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/AbstractGreatestLeast.java
@@ -76,9 +76,8 @@ public abstract class AbstractGreatestLeast
 
     protected AbstractGreatestLeast(boolean min, String description)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(min ? "least" : "greatest")
                 .signature(Signature.builder()
-                        .name(min ? "least" : "greatest")
                         .orderableTypeParameter("E")
                         .returnType(new TypeSignature("E"))
                         .argumentType(new TypeSignature("E"))
@@ -109,8 +108,7 @@ public SpecializedSqlScalarFunction specialize(BoundSignature boundSignature, Fu
                 .mapToObj(i -> wrap(type.getJavaType()))
                 .collect(toImmutableList());
 
-        Class<?> clazz = generate(javaTypes, compareMethod);
-        MethodHandle methodHandle = methodHandle(clazz, getFunctionMetadata().getSignature().getName(), javaTypes.toArray(new Class<?>[0]));
+        MethodHandle methodHandle = generate(boundSignature.getName().getFunctionName(), javaTypes, compareMethod);
 
         return new ChoicesSpecializedSqlScalarFunction(
                 boundSignature,
@@ -119,17 +117,16 @@ public SpecializedSqlScalarFunction specialize(BoundSignature boundSignature, Fu
                 methodHandle);
     }
 
-    private Class<?> generate(List<Class<?>> javaTypes, MethodHandle compareMethod)
+    private MethodHandle generate(String functionName, List<Class<?>> javaTypes, MethodHandle compareMethod)
     {
-        Signature signature = getFunctionMetadata().getSignature();
-        checkCondition(javaTypes.size() <= 127, NOT_SUPPORTED, "Too many arguments for function call %s()", signature.getName());
+        checkCondition(javaTypes.size() <= 127, NOT_SUPPORTED, "Too many arguments for function call %s()", functionName);
         String javaTypeName = javaTypes.stream()
                 .map(Class::getSimpleName)
                 .collect(joining());
 
         ClassDefinition definition = new ClassDefinition(
                 a(PUBLIC, FINAL),
-                makeClassName(javaTypeName + "$" + signature.getName()),
+                makeClassName(javaTypeName + "$" + functionName),
                 type(Object.class));
 
         definition.declareDefaultConstructor(a(PRIVATE));
@@ -140,7 +137,7 @@ private Class<?> generate(List<Class<?>> javaTypes, MethodHandle compareMethod)
 
         MethodDefinition method = definition.declareMethod(
                 a(PUBLIC, STATIC),
-                signature.getName(),
+                functionName,
                 type(wrap(javaTypes.get(0))),
                 parameters);
 
@@ -180,6 +177,7 @@ private Class<?> generate(List<Class<?>> javaTypes, MethodHandle compareMethod)
 
         body.append(value.ret());
 
-        return defineClass(definition, Object.class, binder.getBindings(), new DynamicClassLoader(getClass().getClassLoader()));
+        Class<?> clazz = defineClass(definition, Object.class, binder.getBindings(), new DynamicClassLoader(getClass().getClassLoader()));
+        return methodHandle(clazz, method.getName(), javaTypes.toArray(new Class<?>[0]));
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ApplyFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ApplyFunction.java
index 6ffc64c3b3c8..e8541a63abcd 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ApplyFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ApplyFunction.java
@@ -45,9 +45,8 @@ public final class ApplyFunction
 
     private ApplyFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("apply")
                 .signature(Signature.builder()
-                        .name("apply")
                         .typeVariable("T")
                         .typeVariable("U")
                         .returnType(new TypeSignature("U"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayAllMatchFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayAllMatchFunction.java
index ef4194b2ff18..0f0efb57aa80 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayAllMatchFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayAllMatchFunction.java
@@ -14,15 +14,20 @@
 package io.trino.operator.scalar;
 
 import io.trino.spi.block.Block;
+import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
+import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
-import io.trino.spi.function.TypeParameterSpecialization;
 import io.trino.spi.type.StandardTypes;
-import io.trino.spi.type.Type;
 
+import java.lang.invoke.MethodHandle;
+
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static java.lang.Boolean.FALSE;
 
 @Description("Returns true if all elements of the array match the given predicate")
@@ -32,110 +37,20 @@ public final class ArrayAllMatchFunction
     private ArrayAllMatchFunction() {}
 
     @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = Object.class)
     @SqlType(StandardTypes.BOOLEAN)
     @SqlNullable
-    public static Boolean allMatchObject(
-            @TypeParameter("T") Type elementType,
+    public static Boolean allMatch(
+            @OperatorDependency(operator = READ_VALUE, argumentTypes = "T", convention = @Convention(arguments = BLOCK_POSITION_NOT_NULL, result = FAIL_ON_NULL)) MethodHandle readValue,
             @SqlType("array(T)") Block arrayBlock,
             @SqlType("function(T, boolean)") ObjectToBooleanFunction function)
+            throws Throwable
     {
         boolean hasNullResult = false;
         int positionCount = arrayBlock.getPositionCount();
         for (int i = 0; i < positionCount; i++) {
             Object element = null;
             if (!arrayBlock.isNull(i)) {
-                element = elementType.getObject(arrayBlock, i);
-            }
-            Boolean match = function.apply(element);
-            if (FALSE.equals(match)) {
-                return false;
-            }
-            if (match == null) {
-                hasNullResult = true;
-            }
-        }
-        if (hasNullResult) {
-            return null;
-        }
-        return true;
-    }
-
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = long.class)
-    @SqlType(StandardTypes.BOOLEAN)
-    @SqlNullable
-    public static Boolean allMatchLong(
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block arrayBlock,
-            @SqlType("function(T, boolean)") LongToBooleanFunction function)
-    {
-        boolean hasNullResult = false;
-        int positionCount = arrayBlock.getPositionCount();
-        for (int i = 0; i < positionCount; i++) {
-            Long element = null;
-            if (!arrayBlock.isNull(i)) {
-                element = elementType.getLong(arrayBlock, i);
-            }
-            Boolean match = function.apply(element);
-            if (FALSE.equals(match)) {
-                return false;
-            }
-            if (match == null) {
-                hasNullResult = true;
-            }
-        }
-        if (hasNullResult) {
-            return null;
-        }
-        return true;
-    }
-
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = double.class)
-    @SqlType(StandardTypes.BOOLEAN)
-    @SqlNullable
-    public static Boolean allMatchDouble(
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block arrayBlock,
-            @SqlType("function(T, boolean)") DoubleToBooleanFunction function)
-    {
-        boolean hasNullResult = false;
-        int positionCount = arrayBlock.getPositionCount();
-        for (int i = 0; i < positionCount; i++) {
-            Double element = null;
-            if (!arrayBlock.isNull(i)) {
-                element = elementType.getDouble(arrayBlock, i);
-            }
-            Boolean match = function.apply(element);
-            if (FALSE.equals(match)) {
-                return false;
-            }
-            if (match == null) {
-                hasNullResult = true;
-            }
-        }
-        if (hasNullResult) {
-            return null;
-        }
-        return true;
-    }
-
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = boolean.class)
-    @SqlType(StandardTypes.BOOLEAN)
-    @SqlNullable
-    public static Boolean allMatchBoolean(
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block arrayBlock,
-            @SqlType("function(T, boolean)") BooleanToBooleanFunction function)
-    {
-        boolean hasNullResult = false;
-        int positionCount = arrayBlock.getPositionCount();
-        for (int i = 0; i < positionCount; i++) {
-            Boolean element = null;
-            if (!arrayBlock.isNull(i)) {
-                element = elementType.getBoolean(arrayBlock, i);
+                element = readValue.invoke(arrayBlock, i);
             }
             Boolean match = function.apply(element);
             if (FALSE.equals(match)) {
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayAnyMatchFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayAnyMatchFunction.java
index dfb72414f15d..7e45b1faa261 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayAnyMatchFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayAnyMatchFunction.java
@@ -14,15 +14,20 @@
 package io.trino.operator.scalar;
 
 import io.trino.spi.block.Block;
+import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
+import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
-import io.trino.spi.function.TypeParameterSpecialization;
 import io.trino.spi.type.StandardTypes;
-import io.trino.spi.type.Type;
 
+import java.lang.invoke.MethodHandle;
+
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static java.lang.Boolean.TRUE;
 
 @Description("Returns true if the array contains one or more elements that match the given predicate")
@@ -32,110 +37,20 @@ public final class ArrayAnyMatchFunction
     private ArrayAnyMatchFunction() {}
 
     @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = Object.class)
     @SqlType(StandardTypes.BOOLEAN)
     @SqlNullable
-    public static Boolean anyMatchObject(
-            @TypeParameter("T") Type elementType,
+    public static Boolean anyMatch(
+            @OperatorDependency(operator = READ_VALUE, argumentTypes = "T", convention = @Convention(arguments = BLOCK_POSITION_NOT_NULL, result = FAIL_ON_NULL)) MethodHandle readValue,
             @SqlType("array(T)") Block arrayBlock,
             @SqlType("function(T, boolean)") ObjectToBooleanFunction function)
+            throws Throwable
     {
         boolean hasNullResult = false;
         int positionCount = arrayBlock.getPositionCount();
         for (int i = 0; i < positionCount; i++) {
             Object element = null;
             if (!arrayBlock.isNull(i)) {
-                element = elementType.getObject(arrayBlock, i);
-            }
-            Boolean match = function.apply(element);
-            if (TRUE.equals(match)) {
-                return true;
-            }
-            if (match == null) {
-                hasNullResult = true;
-            }
-        }
-        if (hasNullResult) {
-            return null;
-        }
-        return false;
-    }
-
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = long.class)
-    @SqlType(StandardTypes.BOOLEAN)
-    @SqlNullable
-    public static Boolean anyMatchLong(
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block arrayBlock,
-            @SqlType("function(T, boolean)") LongToBooleanFunction function)
-    {
-        boolean hasNullResult = false;
-        int positionCount = arrayBlock.getPositionCount();
-        for (int i = 0; i < positionCount; i++) {
-            Long element = null;
-            if (!arrayBlock.isNull(i)) {
-                element = elementType.getLong(arrayBlock, i);
-            }
-            Boolean match = function.apply(element);
-            if (TRUE.equals(match)) {
-                return true;
-            }
-            if (match == null) {
-                hasNullResult = true;
-            }
-        }
-        if (hasNullResult) {
-            return null;
-        }
-        return false;
-    }
-
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = double.class)
-    @SqlType(StandardTypes.BOOLEAN)
-    @SqlNullable
-    public static Boolean anyMatchDouble(
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block arrayBlock,
-            @SqlType("function(T, boolean)") DoubleToBooleanFunction function)
-    {
-        boolean hasNullResult = false;
-        int positionCount = arrayBlock.getPositionCount();
-        for (int i = 0; i < positionCount; i++) {
-            Double element = null;
-            if (!arrayBlock.isNull(i)) {
-                element = elementType.getDouble(arrayBlock, i);
-            }
-            Boolean match = function.apply(element);
-            if (TRUE.equals(match)) {
-                return true;
-            }
-            if (match == null) {
-                hasNullResult = true;
-            }
-        }
-        if (hasNullResult) {
-            return null;
-        }
-        return false;
-    }
-
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = boolean.class)
-    @SqlType(StandardTypes.BOOLEAN)
-    @SqlNullable
-    public static Boolean anyMatchBoolean(
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block arrayBlock,
-            @SqlType("function(T, boolean)") BooleanToBooleanFunction function)
-    {
-        boolean hasNullResult = false;
-        int positionCount = arrayBlock.getPositionCount();
-        for (int i = 0; i < positionCount; i++) {
-            Boolean element = null;
-            if (!arrayBlock.isNull(i)) {
-                element = elementType.getBoolean(arrayBlock, i);
+                element = readValue.invoke(arrayBlock, i);
             }
             Boolean match = function.apply(element);
             if (TRUE.equals(match)) {
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayConcatFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayConcatFunction.java
index 86d42d8b0501..91d154b250f9 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayConcatFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayConcatFunction.java
@@ -13,13 +13,11 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
@@ -29,6 +27,7 @@
 import io.trino.sql.gen.VarArgsToArrayAdapterGenerator;
 
 import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
 import java.util.Optional;
 
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
@@ -36,7 +35,8 @@
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.type.TypeSignature.arrayType;
 import static io.trino.sql.gen.VarArgsToArrayAdapterGenerator.generateVarArgsToArrayAdapter;
-import static io.trino.util.Reflection.methodHandle;
+import static java.lang.invoke.MethodHandles.lookup;
+import static java.lang.invoke.MethodType.methodType;
 import static java.util.Collections.nCopies;
 
 public final class ArrayConcatFunction
@@ -47,14 +47,24 @@ public final class ArrayConcatFunction
     private static final String FUNCTION_NAME = "concat";
     private static final String DESCRIPTION = "Concatenates given arrays";
 
-    private static final MethodHandle METHOD_HANDLE = methodHandle(ArrayConcatFunction.class, "concat", Type.class, Object.class, Block[].class);
-    private static final MethodHandle USER_STATE_FACTORY = methodHandle(ArrayConcatFunction.class, "createState", Type.class);
+    private static final MethodHandle METHOD_HANDLE;
+    private static final MethodHandle USER_STATE_FACTORY;
+
+    static {
+        try {
+            MethodHandles.Lookup lookup = lookup();
+            METHOD_HANDLE = lookup.findStatic(ArrayConcatFunction.class, "concat", methodType(Block.class, Type.class, Object.class, Block[].class));
+            USER_STATE_FACTORY = lookup.findStatic(ArrayConcatFunction.class, "createState", methodType(Object.class, ArrayType.class));
+        }
+        catch (ReflectiveOperationException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
 
     private ArrayConcatFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(FUNCTION_NAME)
                 .signature(Signature.builder()
-                        .name(FUNCTION_NAME)
                         .typeVariable("E")
                         .returnType(arrayType(new TypeSignature("E")))
                         .argumentType(arrayType(new TypeSignature("E")))
@@ -78,7 +88,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
                 Block.class,
                 boundSignature.getArity(),
                 METHOD_HANDLE.bindTo(arrayType.getElementType()),
-                USER_STATE_FACTORY.bindTo(arrayType.getElementType()));
+                USER_STATE_FACTORY.bindTo(arrayType));
 
         return new ChoicesSpecializedSqlScalarFunction(
                 boundSignature,
@@ -89,9 +99,9 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
     }
 
     @UsedByGeneratedCode
-    public static Object createState(Type elementType)
+    public static Object createState(ArrayType arrayType)
     {
-        return new PageBuilder(ImmutableList.of(elementType));
+        return BufferedArrayValueBuilder.createBuffered(arrayType);
     }
 
     @UsedByGeneratedCode
@@ -99,12 +109,12 @@ public static Block concat(Type elementType, Object state, Block[] blocks)
     {
         int resultPositionCount = 0;
 
-        // fast path when there is at most one non empty block
+        // fast path when there is at most one non-empty block
         Block nonEmptyBlock = null;
-        for (int i = 0; i < blocks.length; i++) {
-            resultPositionCount += blocks[i].getPositionCount();
-            if (blocks[i].getPositionCount() > 0) {
-                nonEmptyBlock = blocks[i];
+        for (Block value : blocks) {
+            resultPositionCount += value.getPositionCount();
+            if (value.getPositionCount() > 0) {
+                nonEmptyBlock = value;
             }
         }
         if (nonEmptyBlock == null) {
@@ -114,19 +124,12 @@ public static Block concat(Type elementType, Object state, Block[] blocks)
             return nonEmptyBlock;
         }
 
-        PageBuilder pageBuilder = (PageBuilder) state;
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-        for (int blockIndex = 0; blockIndex < blocks.length; blockIndex++) {
-            Block block = blocks[blockIndex];
-            for (int i = 0; i < block.getPositionCount(); i++) {
-                elementType.appendTo(block, i, blockBuilder);
+        return ((BufferedArrayValueBuilder) state).build(resultPositionCount, elementBuilder -> {
+            for (Block block : blocks) {
+                for (int i = 0; i < block.getPositionCount(); i++) {
+                    elementType.appendTo(block, i, elementBuilder);
+                }
             }
-        }
-        pageBuilder.declarePositions(resultPositionCount);
-        return blockBuilder.getRegion(blockBuilder.getPositionCount() - resultPositionCount, resultPositionCount);
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayConstructor.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayConstructor.java
index add8df570d16..2861b3289edb 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayConstructor.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayConstructor.java
@@ -37,7 +37,6 @@
 import io.trino.sql.gen.CallSiteBinder;
 
 import java.lang.invoke.MethodHandle;
-import java.lang.reflect.Method;
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -59,7 +58,7 @@
 import static io.trino.util.CompilerUtils.defineClass;
 import static io.trino.util.CompilerUtils.makeClassName;
 import static io.trino.util.Failures.checkCondition;
-import static java.lang.invoke.MethodHandles.lookup;
+import static io.trino.util.Reflection.methodHandle;
 import static java.util.Collections.nCopies;
 
 public final class ArrayConstructor
@@ -71,9 +70,8 @@ public final class ArrayConstructor
 
     public ArrayConstructor()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(NAME)
                 .signature(Signature.builder()
-                        .name(NAME)
                         .typeVariable("E")
                         .returnType(arrayType(new TypeSignature("E")))
                         .argumentType(new TypeSignature("E"))
@@ -102,14 +100,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
         }
         ImmutableList<Class<?>> stackTypes = builder.build();
         Class<?> clazz = generateArrayConstructor(stackTypes, type);
-        MethodHandle methodHandle;
-        try {
-            Method method = clazz.getMethod("arrayConstructor", stackTypes.toArray(new Class<?>[stackTypes.size()]));
-            methodHandle = lookup().unreflect(method);
-        }
-        catch (ReflectiveOperationException e) {
-            throw new RuntimeException(e);
-        }
+        MethodHandle methodHandle = methodHandle(clazz, "arrayConstructor", stackTypes.toArray(new Class<?>[stackTypes.size()]));
         return new ChoicesSpecializedSqlScalarFunction(
                 boundSignature,
                 FAIL_ON_NULL,
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayContains.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayContains.java
index 6d2a274d7e9a..9884030cf3b1 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayContains.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayContains.java
@@ -27,7 +27,7 @@
 import java.lang.invoke.MethodHandle;
 
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.OperatorType.EQUAL;
@@ -46,7 +46,7 @@ public static Boolean contains(
             @OperatorDependency(
                     operator = EQUAL,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, NEVER_NULL}, result = NULLABLE_RETURN))
+                    convention = @Convention(arguments = {BLOCK_POSITION_NOT_NULL, NEVER_NULL}, result = NULLABLE_RETURN))
                     MethodHandle equals,
             @SqlType("array(T)") Block arrayBlock,
             @SqlType("T") Object value)
@@ -81,7 +81,7 @@ public static Boolean contains(
             @OperatorDependency(
                     operator = EQUAL,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, NEVER_NULL}, result = NULLABLE_RETURN))
+                    convention = @Convention(arguments = {BLOCK_POSITION_NOT_NULL, NEVER_NULL}, result = NULLABLE_RETURN))
                     MethodHandle equals,
             @SqlType("array(T)") Block arrayBlock,
             @SqlType("T") long value)
@@ -116,7 +116,7 @@ public static Boolean contains(
             @OperatorDependency(
                     operator = EQUAL,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, NEVER_NULL}, result = NULLABLE_RETURN))
+                    convention = @Convention(arguments = {BLOCK_POSITION_NOT_NULL, NEVER_NULL}, result = NULLABLE_RETURN))
                     MethodHandle equals,
             @SqlType("array(T)") Block arrayBlock,
             @SqlType("T") boolean value)
@@ -151,7 +151,7 @@ public static Boolean contains(
             @OperatorDependency(
                     operator = EQUAL,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, NEVER_NULL}, result = NULLABLE_RETURN))
+                    convention = @Convention(arguments = {BLOCK_POSITION_NOT_NULL, NEVER_NULL}, result = NULLABLE_RETURN))
                     MethodHandle equals,
             @SqlType("array(T)") Block arrayBlock,
             @SqlType("T") double value)
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayDistinctFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayDistinctFunction.java
index 2d3a22ec0408..3f0e991023d8 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayDistinctFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayDistinctFunction.java
@@ -13,24 +13,22 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
-import io.trino.operator.aggregation.TypedSet;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
 import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
 import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
 import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import it.unimi.dsi.fastutil.longs.LongSet;
 
-import static io.trino.operator.aggregation.TypedSet.createDistinctTypedSet;
+import static io.trino.operator.scalar.BlockSet.MAX_FUNCTION_MEMORY;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
@@ -42,12 +40,12 @@
 public final class ArrayDistinctFunction
 {
     public static final String NAME = "array_distinct";
-    private final PageBuilder pageBuilder;
+    private final BufferedArrayValueBuilder arrayValueBuilder;
 
     @TypeParameter("E")
     public ArrayDistinctFunction(@TypeParameter("E") Type elementType)
     {
-        pageBuilder = new PageBuilder(ImmutableList.of(elementType));
+        arrayValueBuilder = BufferedArrayValueBuilder.createBuffered(new ArrayType(elementType));
     }
 
     @TypeParameter("E")
@@ -76,27 +74,19 @@ public Block distinct(
             return array.getSingleValueBlock(0);
         }
 
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
-        BlockBuilder distinctElementsBlockBuilder = pageBuilder.getBlockBuilder(0);
-        TypedSet distinctElements = createDistinctTypedSet(
+        BlockSet distinctElements = new BlockSet(
                 type,
                 elementIsDistinctFrom,
                 elementHashCode,
-                distinctElementsBlockBuilder,
-                array.getPositionCount(),
-                "array_distinct");
+                array.getPositionCount());
 
         for (int i = 0; i < array.getPositionCount(); i++) {
             distinctElements.add(array, i);
         }
 
-        pageBuilder.declarePositions(distinctElements.size());
-        return distinctElementsBlockBuilder.getRegion(
-                distinctElementsBlockBuilder.getPositionCount() - distinctElements.size(),
-                distinctElements.size());
+        return arrayValueBuilder.build(
+                distinctElements.size(),
+                blockBuilder -> distinctElements.getAllWithSizeLimit(blockBuilder, "array_distinct", MAX_FUNCTION_MEMORY));
     }
 
     @SqlType("array(bigint)")
@@ -106,36 +96,23 @@ public Block bigintDistinct(@SqlType("array(bigint)") Block array)
             return array;
         }
 
-        boolean containsNull = false;
-        LongSet set = new LongOpenHashSet(array.getPositionCount());
-        int distinctCount = 0;
-
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
-        BlockBuilder distinctElementBlockBuilder = pageBuilder.getBlockBuilder(0);
-        for (int i = 0; i < array.getPositionCount(); i++) {
-            if (array.isNull(i)) {
-                if (!containsNull) {
-                    containsNull = true;
-                    distinctElementBlockBuilder.appendNull();
-                    distinctCount++;
+        return arrayValueBuilder.build(array.getPositionCount(), distinctElementBlockBuilder -> {
+            boolean containsNull = false;
+            LongSet set = new LongOpenHashSet(array.getPositionCount());
+
+            for (int i = 0; i < array.getPositionCount(); i++) {
+                if (array.isNull(i)) {
+                    if (!containsNull) {
+                        containsNull = true;
+                        distinctElementBlockBuilder.appendNull();
+                    }
+                    continue;
+                }
+                long value = BIGINT.getLong(array, i);
+                if (set.add(value)) {
+                    BIGINT.writeLong(distinctElementBlockBuilder, value);
                 }
-                continue;
-            }
-            long value = BIGINT.getLong(array, i);
-            if (!set.contains(value)) {
-                set.add(value);
-                distinctCount++;
-                BIGINT.appendTo(array, i, distinctElementBlockBuilder);
             }
-        }
-
-        pageBuilder.declarePositions(distinctCount);
-
-        return distinctElementBlockBuilder.getRegion(
-                distinctElementBlockBuilder.getPositionCount() - distinctCount,
-                distinctCount);
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayElementAtFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayElementAtFunction.java
index ba0ccebe94b2..4dbcc6e3cce7 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayElementAtFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayElementAtFunction.java
@@ -15,14 +15,21 @@
 
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
+import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.Type;
 
+import java.lang.invoke.MethodHandle;
+
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static java.lang.Math.toIntExact;
 
 @ScalarFunction("element_at")
@@ -34,55 +41,12 @@ private ArrayElementAtFunction() {}
     @TypeParameter("E")
     @SqlNullable
     @SqlType("E")
-    public static Long longElementAt(@TypeParameter("E") Type elementType, @SqlType("array(E)") Block array, @SqlType("bigint") long index)
-    {
-        int position = checkedIndexToBlockPosition(array, index);
-        if (position == -1) {
-            return null;
-        }
-        if (array.isNull(position)) {
-            return null;
-        }
-
-        return elementType.getLong(array, position);
-    }
-
-    @TypeParameter("E")
-    @SqlNullable
-    @SqlType("E")
-    public static Boolean booleanElementAt(@TypeParameter("E") Type elementType, @SqlType("array(E)") Block array, @SqlType("bigint") long index)
-    {
-        int position = checkedIndexToBlockPosition(array, index);
-        if (position == -1) {
-            return null;
-        }
-        if (array.isNull(position)) {
-            return null;
-        }
-
-        return elementType.getBoolean(array, position);
-    }
-
-    @TypeParameter("E")
-    @SqlNullable
-    @SqlType("E")
-    public static Double doubleElementAt(@TypeParameter("E") Type elementType, @SqlType("array(E)") Block array, @SqlType("bigint") long index)
-    {
-        int position = checkedIndexToBlockPosition(array, index);
-        if (position == -1) {
-            return null;
-        }
-        if (array.isNull(position)) {
-            return null;
-        }
-
-        return elementType.getDouble(array, position);
-    }
-
-    @TypeParameter("E")
-    @SqlNullable
-    @SqlType("E")
-    public static Object sliceElementAt(@TypeParameter("E") Type elementType, @SqlType("array(E)") Block array, @SqlType("bigint") long index)
+    public static Object elementAt(
+            @TypeParameter("E") Type elementType,
+            @OperatorDependency(operator = READ_VALUE, argumentTypes = "E", convention = @Convention(arguments = BLOCK_POSITION_NOT_NULL, result = FAIL_ON_NULL)) MethodHandle readValue,
+            @SqlType("array(E)") Block array,
+            @SqlType("bigint") long index)
+            throws Throwable
     {
         int position = checkedIndexToBlockPosition(array, index);
         if (position == -1) {
@@ -92,7 +56,7 @@ public static Object sliceElementAt(@TypeParameter("E") Type elementType, @SqlTy
             return null;
         }
 
-        return elementType.getObject(array, position);
+        return readValue.invoke(array, position);
     }
 
     /**
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayExceptFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayExceptFunction.java
index 54d7e5afa385..ba9ad4842e19 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayExceptFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayExceptFunction.java
@@ -13,7 +13,6 @@
  */
 package io.trino.operator.scalar;
 
-import io.trino.operator.aggregation.TypedSet;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.Convention;
@@ -26,7 +25,6 @@
 import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
 import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
 
-import static io.trino.operator.aggregation.TypedSet.createDistinctTypedSet;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
@@ -60,13 +58,13 @@ public static Block except(
             return leftArray;
         }
 
-        TypedSet typedSet = createDistinctTypedSet(type, isDistinctOperator, elementHashCode, leftPositionCount, "array_except");
-        BlockBuilder distinctElementBlockBuilder = type.createBlockBuilder(null, leftPositionCount);
+        BlockSet set = new BlockSet(type, isDistinctOperator, elementHashCode, rightPositionCount + leftPositionCount);
         for (int i = 0; i < rightPositionCount; i++) {
-            typedSet.add(rightArray, i);
+            set.add(rightArray, i);
         }
+        BlockBuilder distinctElementBlockBuilder = type.createBlockBuilder(null, leftPositionCount);
         for (int i = 0; i < leftPositionCount; i++) {
-            if (typedSet.add(leftArray, i)) {
+            if (set.add(leftArray, i)) {
                 type.appendTo(leftArray, i, distinctElementBlockBuilder);
             }
         }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayFlattenFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayFlattenFunction.java
index 323212978b73..811908fadf56 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayFlattenFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayFlattenFunction.java
@@ -41,9 +41,8 @@ public class ArrayFlattenFunction
 
     private ArrayFlattenFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(FUNCTION_NAME)
                 .signature(Signature.builder()
-                        .name(FUNCTION_NAME)
                         .typeVariable("E")
                         .returnType(arrayType(new TypeSignature("E")))
                         .argumentType(arrayType(arrayType(new TypeSignature("E"))))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayHistogramFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayHistogramFunction.java
new file mode 100644
index 000000000000..e0332a537189
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayHistogramFunction.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed 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 io.trino.operator.scalar;
+
+import io.trino.operator.aggregation.histogram.TypedHistogram;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.MapBlock;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.function.Convention;
+import io.trino.spi.function.Description;
+import io.trino.spi.function.OperatorDependency;
+import io.trino.spi.function.OperatorType;
+import io.trino.spi.function.ScalarFunction;
+import io.trino.spi.function.SqlType;
+import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.Type;
+
+import java.lang.invoke.MethodHandle;
+
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
+
+@Description("Return a map containing the counts of the elements in the array")
+@ScalarFunction(value = "array_histogram")
+public final class ArrayHistogramFunction
+{
+    private ArrayHistogramFunction() {}
+
+    @TypeParameter("T")
+    @SqlType("map(T, bigint)")
+    public static SqlMap arrayHistogram(
+            @TypeParameter("T") Type elementType,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = FLAT, result = BLOCK_BUILDER)) MethodHandle readFlat,
+            @OperatorDependency(
+                    operator = OperatorType.READ_VALUE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FLAT_RETURN)) MethodHandle writeFlat,
+            @OperatorDependency(
+                    operator = OperatorType.HASH_CODE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = FLAT, result = FAIL_ON_NULL)) MethodHandle hashFlat,
+            @OperatorDependency(
+                    operator = OperatorType.IS_DISTINCT_FROM,
+                    argumentTypes = {"T", "T"},
+                    convention = @Convention(arguments = {FLAT, VALUE_BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL)) MethodHandle distinctFlatBlock,
+            @OperatorDependency(
+                    operator = OperatorType.HASH_CODE,
+                    argumentTypes = "T",
+                    convention = @Convention(arguments = VALUE_BLOCK_POSITION_NOT_NULL, result = FAIL_ON_NULL)) MethodHandle hashBlock,
+            @TypeParameter("map(T, bigint)") MapType mapType,
+            @SqlType("array(T)") Block arrayBlock)
+    {
+        TypedHistogram histogram = new TypedHistogram(elementType, readFlat, writeFlat, hashFlat, distinctFlatBlock, hashBlock, false);
+        ValueBlock valueBlock = arrayBlock.getUnderlyingValueBlock();
+        for (int i = 0; i < arrayBlock.getPositionCount(); i++) {
+            int position = arrayBlock.getUnderlyingValuePosition(i);
+            if (!arrayBlock.isNull(position)) {
+                histogram.add(0, valueBlock, position, 1L);
+            }
+        }
+        MapBlockBuilder blockBuilder = mapType.createBlockBuilder(null, histogram.size());
+        histogram.serialize(0, blockBuilder);
+        MapBlock mapBlock = (MapBlock) blockBuilder.build();
+        return mapType.getObject(mapBlock, 0);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayIntersectFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayIntersectFunction.java
index fd113424c56c..4c18f3d2a877 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayIntersectFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayIntersectFunction.java
@@ -13,22 +13,20 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
-import io.trino.operator.aggregation.TypedSet;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
 import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
 import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
 import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
 
-import static io.trino.operator.aggregation.TypedSet.createDistinctTypedSet;
+import static io.trino.operator.scalar.BlockSet.MAX_FUNCTION_MEMORY;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
@@ -38,12 +36,12 @@
 @Description("Intersects elements of the two given arrays")
 public final class ArrayIntersectFunction
 {
-    private final PageBuilder pageBuilder;
+    private final BufferedArrayValueBuilder arrayValueBuilder;
 
     @TypeParameter("E")
     public ArrayIntersectFunction(@TypeParameter("E") Type elementType)
     {
-        pageBuilder = new PageBuilder(ImmutableList.of(elementType));
+        arrayValueBuilder = BufferedArrayValueBuilder.createBuffered(new ArrayType(elementType));
     }
 
     @TypeParameter("E")
@@ -74,27 +72,21 @@ public Block intersect(
             return rightArray;
         }
 
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
-        TypedSet rightTypedSet = createDistinctTypedSet(type, elementIsDistinctFrom, elementHashCode, rightPositionCount, "array_intersect");
+        BlockSet rightSet = new BlockSet(type, elementIsDistinctFrom, elementHashCode, rightPositionCount);
         for (int i = 0; i < rightPositionCount; i++) {
-            rightTypedSet.add(rightArray, i);
+            rightSet.add(rightArray, i);
         }
 
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-
         // The intersected set can have at most rightPositionCount elements
-        TypedSet intersectTypedSet = createDistinctTypedSet(type, elementIsDistinctFrom, elementHashCode, blockBuilder, rightPositionCount, "array_intersect");
+        BlockSet intersectSet = new BlockSet(type, elementIsDistinctFrom, elementHashCode, rightSet.size());
         for (int i = 0; i < leftPositionCount; i++) {
-            if (rightTypedSet.contains(leftArray, i)) {
-                intersectTypedSet.add(leftArray, i);
+            if (rightSet.contains(leftArray, i)) {
+                intersectSet.add(leftArray, i);
             }
         }
 
-        pageBuilder.declarePositions(intersectTypedSet.size());
-
-        return blockBuilder.getRegion(blockBuilder.getPositionCount() - intersectTypedSet.size(), intersectTypedSet.size());
+        return arrayValueBuilder.build(
+                intersectSet.size(),
+                blockBuilder -> intersectSet.getAllWithSizeLimit(blockBuilder, "array_intersect", MAX_FUNCTION_MEMORY));
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayJoin.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayJoin.java
index 9abc95f268dd..a970db937ba9 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayJoin.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayJoin.java
@@ -13,239 +13,103 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slice;
-import io.trino.annotation.UsedByGeneratedCode;
-import io.trino.metadata.SqlScalarFunction;
-import io.trino.spi.PageBuilder;
+import io.airlift.slice.Slices;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.function.BoundSignature;
-import io.trino.spi.function.FunctionDependencies;
-import io.trino.spi.function.FunctionDependencyDeclaration;
-import io.trino.spi.function.FunctionMetadata;
-import io.trino.spi.function.InvocationConvention;
-import io.trino.spi.function.InvocationConvention.InvocationArgumentConvention;
-import io.trino.spi.function.Signature;
-import io.trino.spi.type.ArrayType;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeSignature;
-import io.trino.type.UnknownType;
+import io.trino.spi.function.CastDependency;
+import io.trino.spi.function.Convention;
+import io.trino.spi.function.Description;
+import io.trino.spi.function.ScalarFunction;
+import io.trino.spi.function.SqlNullable;
+import io.trino.spi.function.SqlType;
+import io.trino.spi.function.TypeParameter;
 
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
 
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
-import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
-import static io.trino.spi.type.TypeSignature.arrayType;
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.util.Reflection.methodHandle;
-import static java.lang.String.format;
 
 public final class ArrayJoin
-        extends SqlScalarFunction
 {
-    public static final ArrayJoin ARRAY_JOIN = new ArrayJoin();
-    public static final ArrayJoinWithNullReplacement ARRAY_JOIN_WITH_NULL_REPLACEMENT = new ArrayJoinWithNullReplacement();
-
-    private static final String FUNCTION_NAME = "array_join";
+    private static final String NAME = "array_join";
     private static final String DESCRIPTION = "Concatenates the elements of the given array using a delimiter and an optional string to replace nulls";
-    private static final MethodHandle METHOD_HANDLE = methodHandle(
-            ArrayJoin.class,
-            "arrayJoin",
-            MethodHandle.class,
-            Object.class,
-            ConnectorSession.class,
-            Block.class,
-            Slice.class);
-
-    private static final MethodHandle STATE_FACTORY = methodHandle(ArrayJoin.class, "createState");
-
-    public static class ArrayJoinWithNullReplacement
-            extends SqlScalarFunction
-    {
-        private static final MethodHandle METHOD_HANDLE = methodHandle(
-                ArrayJoin.class,
-                "arrayJoin",
-                MethodHandle.class,
-                Object.class,
-                ConnectorSession.class,
-                Block.class,
-                Slice.class,
-                Slice.class);
-
-        public ArrayJoinWithNullReplacement()
-        {
-            super(FunctionMetadata.scalarBuilder()
-                    .signature(Signature.builder()
-                            .name(FUNCTION_NAME)
-                            .typeVariable("T")
-                            .returnType(VARCHAR)
-                            .argumentType(arrayType(new TypeSignature("T")))
-                            .argumentType(VARCHAR)
-                            .argumentType(VARCHAR)
-                            .build())
-                    .description(DESCRIPTION)
-                    .build());
-        }
-
-        @Override
-        public FunctionDependencyDeclaration getFunctionDependencies()
-        {
-            return arrayJoinFunctionDependencies();
-        }
-
-        @Override
-        public SpecializedSqlScalarFunction specialize(BoundSignature boundSignature, FunctionDependencies functionDependencies)
-        {
-            return specializeArrayJoin(boundSignature, functionDependencies, METHOD_HANDLE);
-        }
-    }
 
-    private ArrayJoin()
-    {
-        super(FunctionMetadata.scalarBuilder()
-                .signature(Signature.builder()
-                        .name(FUNCTION_NAME)
-                        .castableToTypeParameter("T", VARCHAR.getTypeSignature())
-                        .returnType(VARCHAR)
-                        .argumentType(arrayType(new TypeSignature("T")))
-                        .argumentType(VARCHAR)
-                        .build())
-                .description(DESCRIPTION)
-                .build());
-    }
-
-    @UsedByGeneratedCode
-    public static Object createState()
-    {
-        return new PageBuilder(ImmutableList.of(VARCHAR));
-    }
-
-    @Override
-    public FunctionDependencyDeclaration getFunctionDependencies()
-    {
-        return arrayJoinFunctionDependencies();
-    }
-
-    private static FunctionDependencyDeclaration arrayJoinFunctionDependencies()
-    {
-        return FunctionDependencyDeclaration.builder()
-                .addCastSignature(new TypeSignature("T"), VARCHAR.getTypeSignature())
-                .build();
-    }
+    private ArrayJoin() {}
 
-    @Override
-    public SpecializedSqlScalarFunction specialize(BoundSignature boundSignature, FunctionDependencies functionDependencies)
-    {
-        return specializeArrayJoin(boundSignature, functionDependencies, METHOD_HANDLE);
-    }
-
-    private static ChoicesSpecializedSqlScalarFunction specializeArrayJoin(
-            BoundSignature boundSignature,
-            FunctionDependencies functionDependencies,
-            MethodHandle methodHandle)
-    {
-        List<InvocationArgumentConvention> argumentConventions = Collections.nCopies(boundSignature.getArity(), NEVER_NULL);
-
-        Type type = ((ArrayType) boundSignature.getArgumentTypes().get(0)).getElementType();
-        if (type instanceof UnknownType) {
-            return new ChoicesSpecializedSqlScalarFunction(
-                    boundSignature,
-                    FAIL_ON_NULL,
-                    argumentConventions,
-                    methodHandle.bindTo(null),
-                    Optional.of(STATE_FACTORY));
-        }
-        try {
-            InvocationConvention convention = new InvocationConvention(ImmutableList.of(BLOCK_POSITION), NULLABLE_RETURN, true, false);
-            MethodHandle cast = functionDependencies.getCastImplementation(type, VARCHAR, convention).getMethodHandle();
-
-            // if the cast doesn't take a ConnectorSession, create an adapter that drops the provided session
-            if (cast.type().parameterArray()[0] != ConnectorSession.class) {
-                cast = MethodHandles.dropArguments(cast, 0, ConnectorSession.class);
-            }
-
-            MethodHandle target = MethodHandles.insertArguments(methodHandle, 0, cast);
-            return new ChoicesSpecializedSqlScalarFunction(
-                    boundSignature,
-                    FAIL_ON_NULL,
-                    argumentConventions,
-                    target,
-                    Optional.of(STATE_FACTORY));
-        }
-        catch (TrinoException e) {
-            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format("Input type %s not supported", type), e);
-        }
-    }
-
-    @UsedByGeneratedCode
+    @ScalarFunction(NAME)
+    @Description(DESCRIPTION)
+    @TypeParameter("E")
+    @SqlNullable
+    @SqlType("varchar")
     public static Slice arrayJoin(
-            MethodHandle castFunction,
-            Object state,
+            @CastDependency(fromType = "E", toType = "varchar", convention = @Convention(arguments = BLOCK_POSITION_NOT_NULL, result = NULLABLE_RETURN, session = true)) MethodHandle castFunction,
             ConnectorSession session,
-            Block arrayBlock,
-            Slice delimiter)
+            @SqlType("array(E)") Block array,
+            @SqlType("varchar") Slice delimiter)
     {
-        return arrayJoin(castFunction, state, session, arrayBlock, delimiter, null);
+        return arrayJoin(castFunction, session, array, delimiter, null);
     }
 
-    @UsedByGeneratedCode
+    @ScalarFunction(NAME)
+    @Description(DESCRIPTION)
+    @TypeParameter("E")
+    @SqlNullable
+    @SqlType("varchar")
     public static Slice arrayJoin(
-            MethodHandle castFunction,
-            Object state,
+            @CastDependency(fromType = "E", toType = "varchar", convention = @Convention(arguments = BLOCK_POSITION_NOT_NULL, result = NULLABLE_RETURN, session = true)) MethodHandle castFunction,
             ConnectorSession session,
-            Block arrayBlock,
-            Slice delimiter,
-            Slice nullReplacement)
+            @SqlType("array(E)") Block array,
+            @SqlType("varchar") Slice delimiter,
+            @SqlType("varchar") Slice nullReplacement)
     {
-        PageBuilder pageBuilder = (PageBuilder) state;
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-        int numElements = arrayBlock.getPositionCount();
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
+        int numElements = array.getPositionCount();
 
-        boolean needsDelimiter = false;
-        for (int i = 0; i < numElements; i++) {
+        Slice[] slices = new Slice[numElements * 2];
+        int sliceIndex = 0;
+        for (int arrayIndex = 0; arrayIndex < numElements; arrayIndex++) {
             Slice value = null;
-            if (!arrayBlock.isNull(i)) {
+            if (!array.isNull(arrayIndex)) {
                 try {
-                    value = (Slice) castFunction.invokeExact(session, arrayBlock, i);
+                    value = (Slice) castFunction.invokeExact(session, array, arrayIndex);
                 }
                 catch (Throwable throwable) {
-                    // Restore pageBuilder into a consistent state
-                    blockBuilder.closeEntry();
-                    pageBuilder.declarePosition();
                     throw new TrinoException(GENERIC_INTERNAL_ERROR, "Error casting array element to VARCHAR", throwable);
                 }
             }
 
             if (value == null) {
-                value = nullReplacement;
-                if (value == null) {
+                if (nullReplacement == null) {
                     continue;
                 }
+                value = nullReplacement;
             }
 
-            if (needsDelimiter) {
-                blockBuilder.writeBytes(delimiter, 0, delimiter.length());
+            if (sliceIndex > 0) {
+                slices[sliceIndex++] = delimiter;
             }
-            blockBuilder.writeBytes(value, 0, value.length());
-            needsDelimiter = true;
+            slices[sliceIndex++] = value;
         }
 
-        blockBuilder.closeEntry();
-        pageBuilder.declarePosition();
-        return VARCHAR.getSlice(blockBuilder, blockBuilder.getPositionCount() - 1);
+        int totalSize = 0;
+        for (Slice slice : slices) {
+            if (slice == null) {
+                break;
+            }
+            totalSize += slice.length();
+        }
+
+        Slice result = Slices.allocate(totalSize);
+        int offset = 0;
+        for (Slice slice : slices) {
+            if (slice == null) {
+                break;
+            }
+            result.setBytes(offset, slice);
+            offset += slice.length();
+        }
+        return result;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayMaxFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayMaxFunction.java
index b5dd6607f028..68dab4ac6b79 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayMaxFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayMaxFunction.java
@@ -21,17 +21,13 @@
 import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
-import io.trino.spi.type.Type;
 
 import java.lang.invoke.MethodHandle;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_FIRST;
-import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.RealType.REAL;
-import static io.trino.util.Failures.internalError;
-import static java.lang.Float.intBitsToFloat;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 
 @ScalarFunction("array_max")
 @Description("Get maximum value of array")
@@ -42,145 +38,28 @@ private ArrayMaxFunction() {}
     @TypeParameter("T")
     @SqlType("T")
     @SqlNullable
-    public static Long longArrayMax(
+    public static Object arrayMax(
             @OperatorDependency(
                     operator = COMPARISON_UNORDERED_FIRST,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL)) MethodHandle compareMethodHandle,
-            @TypeParameter("T") Type elementType,
+                    convention = @Convention(arguments = {BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL)) MethodHandle compareMethodHandle,
+            @OperatorDependency(operator = READ_VALUE, argumentTypes = "T", convention = @Convention(arguments = BLOCK_POSITION_NOT_NULL, result = FAIL_ON_NULL)) MethodHandle readValue,
             @SqlType("array(T)") Block block)
+            throws Throwable
     {
-        int selectedPosition = findMaxArrayElement(compareMethodHandle, block);
-        if (selectedPosition < 0) {
-            return null;
-        }
-        return elementType.getLong(block, selectedPosition);
-    }
-
-    @TypeParameter("T")
-    @SqlType("T")
-    @SqlNullable
-    public static Boolean booleanArrayMax(
-            @OperatorDependency(
-                    operator = COMPARISON_UNORDERED_FIRST,
-                    argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL)) MethodHandle compareMethodHandle,
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block block)
-    {
-        int selectedPosition = findMaxArrayElement(compareMethodHandle, block);
-        if (selectedPosition < 0) {
-            return null;
-        }
-        return elementType.getBoolean(block, selectedPosition);
-    }
-
-    @TypeParameter("T")
-    @SqlType("T")
-    @SqlNullable
-    public static Double doubleArrayMax(
-            @OperatorDependency(
-                    operator = COMPARISON_UNORDERED_FIRST,
-                    argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL)) MethodHandle compareMethodHandle,
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block block)
-    {
-        int selectedPosition = findMaxArrayElement(compareMethodHandle, block);
-        if (selectedPosition < 0) {
-            return null;
-        }
-        return elementType.getDouble(block, selectedPosition);
-    }
-
-    @TypeParameter("T")
-    @SqlType("T")
-    @SqlNullable
-    public static Object objectArrayMax(
-            @OperatorDependency(
-                    operator = COMPARISON_UNORDERED_FIRST,
-                    argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL)) MethodHandle compareMethodHandle,
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block block)
-    {
-        int selectedPosition = findMaxArrayElement(compareMethodHandle, block);
-        if (selectedPosition < 0) {
-            return null;
-        }
-        return elementType.getObject(block, selectedPosition);
-    }
-
-    private static int findMaxArrayElement(MethodHandle compareMethodHandle, Block block)
-    {
-        try {
-            int selectedPosition = -1;
-            for (int position = 0; position < block.getPositionCount(); position++) {
-                if (block.isNull(position)) {
-                    return -1;
-                }
-                if (selectedPosition < 0 || ((long) compareMethodHandle.invokeExact(block, position, block, selectedPosition)) > 0) {
-                    selectedPosition = position;
-                }
-            }
-            return selectedPosition;
-        }
-        catch (Throwable t) {
-            throw internalError(t);
-        }
-    }
-
-    @SqlType("double")
-    @SqlNullable
-    public static Double doubleTypeArrayMax(@SqlType("array(double)") Block block)
-    {
-        if (block.getPositionCount() == 0) {
-            return null;
-        }
         int selectedPosition = -1;
         for (int position = 0; position < block.getPositionCount(); position++) {
             if (block.isNull(position)) {
                 return null;
             }
-            if (selectedPosition < 0 || doubleGreater(DOUBLE.getDouble(block, position), DOUBLE.getDouble(block, selectedPosition))) {
+            if (selectedPosition < 0 || ((long) compareMethodHandle.invokeExact(block, position, block, selectedPosition)) > 0) {
                 selectedPosition = position;
             }
         }
-        return DOUBLE.getDouble(block, selectedPosition);
-    }
 
-    private static boolean doubleGreater(double left, double right)
-    {
-        return (left > right) || Double.isNaN(right);
-    }
-
-    @SqlType("real")
-    @SqlNullable
-    public static Long realTypeArrayMax(@SqlType("array(real)") Block block)
-    {
-        if (block.getPositionCount() == 0) {
+        if (selectedPosition < 0) {
             return null;
         }
-        int selectedPosition = -1;
-        for (int position = 0; position < block.getPositionCount(); position++) {
-            if (block.isNull(position)) {
-                return null;
-            }
-            if (selectedPosition < 0 || floatGreater(getReal(block, position), getReal(block, selectedPosition))) {
-                selectedPosition = position;
-            }
-        }
-        return REAL.getLong(block, selectedPosition);
-    }
-
-    @SuppressWarnings("NumericCastThatLosesPrecision")
-    private static float getReal(Block block, int position)
-    {
-        return intBitsToFloat((int) REAL.getLong(block, position));
-    }
-
-    private static boolean floatGreater(float left, float right)
-    {
-        return (left > right) || Float.isNaN(right);
+        return readValue.invoke(block, selectedPosition);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayMinFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayMinFunction.java
index 16e92a442a3d..375aceeee61e 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayMinFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayMinFunction.java
@@ -21,14 +21,13 @@
 import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
-import io.trino.spi.type.Type;
 
 import java.lang.invoke.MethodHandle;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
-import static io.trino.util.Failures.internalError;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 
 @ScalarFunction("array_min")
 @Description("Get minimum value of array")
@@ -39,91 +38,28 @@ private ArrayMinFunction() {}
     @TypeParameter("T")
     @SqlType("T")
     @SqlNullable
-    public static Long longArrayMin(
+    public static Object arrayMin(
             @OperatorDependency(
                     operator = COMPARISON_UNORDERED_LAST,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL)) MethodHandle compareMethodHandle,
-            @TypeParameter("T") Type elementType,
+                    convention = @Convention(arguments = {BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL)) MethodHandle compareMethodHandle,
+            @OperatorDependency(operator = READ_VALUE, argumentTypes = "T", convention = @Convention(arguments = BLOCK_POSITION_NOT_NULL, result = FAIL_ON_NULL)) MethodHandle readValue,
             @SqlType("array(T)") Block block)
+            throws Throwable
     {
-        int selectedPosition = findMinArrayElement(compareMethodHandle, block);
-        if (selectedPosition < 0) {
-            return null;
-        }
-        return elementType.getLong(block, selectedPosition);
-    }
-
-    @TypeParameter("T")
-    @SqlType("T")
-    @SqlNullable
-    public static Boolean booleanArrayMin(
-            @OperatorDependency(
-                    operator = COMPARISON_UNORDERED_LAST,
-                    argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL)) MethodHandle compareMethodHandle,
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block block)
-    {
-        int selectedPosition = findMinArrayElement(compareMethodHandle, block);
-        if (selectedPosition < 0) {
-            return null;
-        }
-        return elementType.getBoolean(block, selectedPosition);
-    }
-
-    @TypeParameter("T")
-    @SqlType("T")
-    @SqlNullable
-    public static Double doubleArrayMin(
-            @OperatorDependency(
-                    operator = COMPARISON_UNORDERED_LAST,
-                    argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL)) MethodHandle compareMethodHandle,
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block block)
-    {
-        int selectedPosition = findMinArrayElement(compareMethodHandle, block);
-        if (selectedPosition < 0) {
-            return null;
+        int selectedPosition = -1;
+        for (int position = 0; position < block.getPositionCount(); position++) {
+            if (block.isNull(position)) {
+                return null;
+            }
+            if (selectedPosition < 0 || ((long) compareMethodHandle.invokeExact(block, position, block, selectedPosition)) < 0) {
+                selectedPosition = position;
+            }
         }
-        return elementType.getDouble(block, selectedPosition);
-    }
-
-    @TypeParameter("T")
-    @SqlType("T")
-    @SqlNullable
-    public static Object objectArrayMin(
-            @OperatorDependency(
-                    operator = COMPARISON_UNORDERED_LAST,
-                    argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL)) MethodHandle compareMethodHandle,
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block block)
-    {
-        int selectedPosition = findMinArrayElement(compareMethodHandle, block);
         if (selectedPosition < 0) {
             return null;
         }
-        return elementType.getObject(block, selectedPosition);
-    }
 
-    private static int findMinArrayElement(MethodHandle compareMethodHandle, Block block)
-    {
-        try {
-            int selectedPosition = -1;
-            for (int position = 0; position < block.getPositionCount(); position++) {
-                if (block.isNull(position)) {
-                    return -1;
-                }
-                if (selectedPosition < 0 || ((long) compareMethodHandle.invokeExact(block, position, block, selectedPosition)) < 0) {
-                    selectedPosition = position;
-                }
-            }
-            return selectedPosition;
-        }
-        catch (Throwable t) {
-            throw internalError(t);
-        }
+        return readValue.invoke(block, selectedPosition);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayNoneMatchFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayNoneMatchFunction.java
index 51b39e5f351a..01b815356570 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayNoneMatchFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayNoneMatchFunction.java
@@ -14,14 +14,20 @@
 package io.trino.operator.scalar;
 
 import io.trino.spi.block.Block;
+import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
+import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
-import io.trino.spi.function.TypeParameterSpecialization;
 import io.trino.spi.type.StandardTypes;
-import io.trino.spi.type.Type;
+
+import java.lang.invoke.MethodHandle;
+
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 
 @Description("Returns true if all elements of the array don't match the given predicate")
 @ScalarFunction("none_match")
@@ -30,63 +36,15 @@ public final class ArrayNoneMatchFunction
     private ArrayNoneMatchFunction() {}
 
     @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = Object.class)
     @SqlType(StandardTypes.BOOLEAN)
     @SqlNullable
-    public static Boolean noneMatchObject(
-            @TypeParameter("T") Type elementType,
+    public static Boolean noneMatch(
+            @OperatorDependency(operator = READ_VALUE, argumentTypes = "T", convention = @Convention(arguments = BLOCK_POSITION_NOT_NULL, result = FAIL_ON_NULL)) MethodHandle readValue,
             @SqlType("array(T)") Block arrayBlock,
             @SqlType("function(T, boolean)") ObjectToBooleanFunction function)
+            throws Throwable
     {
-        Boolean anyMatchResult = ArrayAnyMatchFunction.anyMatchObject(elementType, arrayBlock, function);
-        if (anyMatchResult == null) {
-            return null;
-        }
-        return !anyMatchResult;
-    }
-
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = long.class)
-    @SqlType(StandardTypes.BOOLEAN)
-    @SqlNullable
-    public static Boolean noneMatchLong(
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block arrayBlock,
-            @SqlType("function(T, boolean)") LongToBooleanFunction function)
-    {
-        Boolean anyMatchResult = ArrayAnyMatchFunction.anyMatchLong(elementType, arrayBlock, function);
-        if (anyMatchResult == null) {
-            return null;
-        }
-        return !anyMatchResult;
-    }
-
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = double.class)
-    @SqlType(StandardTypes.BOOLEAN)
-    @SqlNullable
-    public static Boolean noneMatchDouble(
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block arrayBlock,
-            @SqlType("function(T, boolean)") DoubleToBooleanFunction function)
-    {
-        Boolean anyMatchResult = ArrayAnyMatchFunction.anyMatchDouble(elementType, arrayBlock, function);
-        if (anyMatchResult == null) {
-            return null;
-        }
-        return !anyMatchResult;
-    }
-
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = boolean.class)
-    @SqlType(StandardTypes.BOOLEAN)
-    @SqlNullable
-    public static Boolean noneMatchBoolean(
-            @TypeParameter("T") Type elementType,
-            @SqlType("array(T)") Block arrayBlock,
-            @SqlType("function(T, boolean)") BooleanToBooleanFunction function)
-    {
-        Boolean anyMatchResult = ArrayAnyMatchFunction.anyMatchBoolean(elementType, arrayBlock, function);
+        Boolean anyMatchResult = ArrayAnyMatchFunction.anyMatch(readValue, arrayBlock, function);
         if (anyMatchResult == null) {
             return null;
         }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayPositionFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayPositionFunction.java
index 3682d8b9b2d8..8f927bcf4140 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayPositionFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayPositionFunction.java
@@ -27,7 +27,7 @@
 import java.lang.invoke.MethodHandle;
 
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.OperatorType.EQUAL;
@@ -46,7 +46,7 @@ public static long arrayPosition(
             @OperatorDependency(
                     operator = EQUAL,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, NEVER_NULL}, result = NULLABLE_RETURN))
+                    convention = @Convention(arguments = {BLOCK_POSITION_NOT_NULL, NEVER_NULL}, result = NULLABLE_RETURN))
                     MethodHandle equalMethodHandle,
             @SqlType("array(T)") Block array,
             @SqlType("T") boolean element)
@@ -76,7 +76,7 @@ public static long arrayPosition(
             @OperatorDependency(
                     operator = EQUAL,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, NEVER_NULL}, result = NULLABLE_RETURN))
+                    convention = @Convention(arguments = {BLOCK_POSITION_NOT_NULL, NEVER_NULL}, result = NULLABLE_RETURN))
                     MethodHandle equalMethodHandle,
             @SqlType("array(T)") Block array,
             @SqlType("T") long element)
@@ -106,7 +106,7 @@ public static long arrayPosition(
             @OperatorDependency(
                     operator = EQUAL,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, NEVER_NULL}, result = NULLABLE_RETURN))
+                    convention = @Convention(arguments = {BLOCK_POSITION_NOT_NULL, NEVER_NULL}, result = NULLABLE_RETURN))
                     MethodHandle equalMethodHandle,
             @SqlType("array(T)") Block array,
             @SqlType("T") double element)
@@ -136,7 +136,7 @@ public static long arrayPosition(
             @OperatorDependency(
                     operator = EQUAL,
                     argumentTypes = {"T", "T"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, NEVER_NULL}, result = NULLABLE_RETURN))
+                    convention = @Convention(arguments = {BLOCK_POSITION_NOT_NULL, NEVER_NULL}, result = NULLABLE_RETURN))
                     MethodHandle equalMethodHandle,
             @SqlType("array(T)") Block array,
             @SqlType("T") Object element)
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayReduceFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayReduceFunction.java
index 685d1be86576..58b331cc5aa7 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayReduceFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayReduceFunction.java
@@ -47,9 +47,8 @@ public final class ArrayReduceFunction
 
     private ArrayReduceFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("reduce")
                 .signature(Signature.builder()
-                        .name("reduce")
                         .typeVariable("T")
                         .typeVariable("S")
                         .typeVariable("R")
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayRemoveFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayRemoveFunction.java
index b8b6134e4f13..879a6c86e1ca 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayRemoveFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayRemoveFunction.java
@@ -13,17 +13,16 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
 import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
 
 import java.lang.invoke.MethodHandle;
@@ -41,12 +40,12 @@
 @Description("Remove specified values from the given array")
 public final class ArrayRemoveFunction
 {
-    private final PageBuilder pageBuilder;
+    private final BufferedArrayValueBuilder arrayValueBuilder;
 
     @TypeParameter("E")
     public ArrayRemoveFunction(@TypeParameter("E") Type elementType)
     {
-        pageBuilder = new PageBuilder(ImmutableList.of(elementType));
+        arrayValueBuilder = BufferedArrayValueBuilder.createBuffered(new ArrayType(elementType));
     }
 
     @TypeParameter("E")
@@ -56,52 +55,7 @@ public Block remove(
                     operator = EQUAL,
                     argumentTypes = {"E", "E"},
                     convention = @Convention(arguments = {NEVER_NULL, NEVER_NULL}, result = NULLABLE_RETURN))
-                    MethodHandle equalsFunction,
-            @TypeParameter("E") Type type,
-            @SqlType("array(E)") Block array,
-            @SqlType("E") long value)
-    {
-        return remove(equalsFunction, type, array, (Object) value);
-    }
-
-    @TypeParameter("E")
-    @SqlType("array(E)")
-    public Block remove(
-            @OperatorDependency(
-                    operator = EQUAL,
-                    argumentTypes = {"E", "E"},
-                    convention = @Convention(arguments = {NEVER_NULL, NEVER_NULL}, result = NULLABLE_RETURN))
-                    MethodHandle equalsFunction,
-            @TypeParameter("E") Type type,
-            @SqlType("array(E)") Block array,
-            @SqlType("E") double value)
-    {
-        return remove(equalsFunction, type, array, (Object) value);
-    }
-
-    @TypeParameter("E")
-    @SqlType("array(E)")
-    public Block remove(
-            @OperatorDependency(
-                    operator = EQUAL,
-                    argumentTypes = {"E", "E"},
-                    convention = @Convention(arguments = {NEVER_NULL, NEVER_NULL}, result = NULLABLE_RETURN))
-                    MethodHandle equalsFunction,
-            @TypeParameter("E") Type type,
-            @SqlType("array(E)") Block array,
-            @SqlType("E") boolean value)
-    {
-        return remove(equalsFunction, type, array, (Object) value);
-    }
-
-    @TypeParameter("E")
-    @SqlType("array(E)")
-    public Block remove(
-            @OperatorDependency(
-                    operator = EQUAL,
-                    argumentTypes = {"E", "E"},
-                    convention = @Convention(arguments = {NEVER_NULL, NEVER_NULL}, result = NULLABLE_RETURN))
-                    MethodHandle equalsFunction,
+                    MethodHandle equalFunction,
             @TypeParameter("E") Type type,
             @SqlType("array(E)") Block array,
             @SqlType("E") Object value)
@@ -116,7 +70,7 @@ public Block remove(
                     positions.add(i);
                     continue;
                 }
-                Boolean result = (Boolean) equalsFunction.invoke(element, value);
+                Boolean result = (Boolean) equalFunction.invoke(element, value);
                 if (result == null) {
                     throw new TrinoException(NOT_SUPPORTED, "array_remove does not support arrays with elements that are null or contain null");
                 }
@@ -133,16 +87,10 @@ public Block remove(
             return array;
         }
 
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-
-        for (int position : positions) {
-            type.appendTo(array, position, blockBuilder);
-        }
-
-        pageBuilder.declarePositions(positions.size());
-        return blockBuilder.getRegion(blockBuilder.getPositionCount() - positions.size(), positions.size());
+        return arrayValueBuilder.build(positions.size(), elementBuilder -> {
+            for (int position : positions) {
+                type.appendTo(array, position, elementBuilder);
+            }
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayReverseFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayReverseFunction.java
index e916539cf045..365e1b5a44e8 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayReverseFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayReverseFunction.java
@@ -13,26 +13,25 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
 
 @ScalarFunction("reverse")
 @Description("Returns an array which has the reversed order of the given array.")
 public final class ArrayReverseFunction
 {
-    private final PageBuilder pageBuilder;
+    private final BufferedArrayValueBuilder arrayValueBuilder;
 
     @TypeParameter("E")
     public ArrayReverseFunction(@TypeParameter("E") Type elementType)
     {
-        pageBuilder = new PageBuilder(ImmutableList.of(elementType));
+        arrayValueBuilder = BufferedArrayValueBuilder.createBuffered(new ArrayType(elementType));
     }
 
     @TypeParameter("E")
@@ -47,16 +46,10 @@ public Block reverse(
             return block;
         }
 
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-        for (int i = arrayLength - 1; i >= 0; i--) {
-            type.appendTo(block, i, blockBuilder);
-        }
-        pageBuilder.declarePositions(arrayLength);
-
-        return blockBuilder.getRegion(blockBuilder.getPositionCount() - arrayLength, arrayLength);
+        return arrayValueBuilder.build(arrayLength, elementBuilder -> {
+            for (int i = arrayLength - 1; i >= 0; i--) {
+                type.appendTo(block, i, elementBuilder);
+            }
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayShuffleFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayShuffleFunction.java
index 81fecc20580f..ffce6ef37a5c 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayShuffleFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayShuffleFunction.java
@@ -13,14 +13,13 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
 
 import java.util.concurrent.ThreadLocalRandom;
@@ -29,14 +28,14 @@
 @Description("Generates a random permutation of the given array.")
 public final class ArrayShuffleFunction
 {
-    private final PageBuilder pageBuilder;
+    private final BufferedArrayValueBuilder arrayValueBuilder;
     private static final int INITIAL_LENGTH = 128;
     private int[] positions = new int[INITIAL_LENGTH];
 
     @TypeParameter("E")
     public ArrayShuffleFunction(@TypeParameter("E") Type elementType)
     {
-        pageBuilder = new PageBuilder(ImmutableList.of(elementType));
+        arrayValueBuilder = BufferedArrayValueBuilder.createBuffered(new ArrayType(elementType));
     }
 
     @TypeParameter("E")
@@ -62,17 +61,10 @@ public Block shuffle(
             positions[index] = swap;
         }
 
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-
-        for (int i = 0; i < length; i++) {
-            type.appendTo(block, positions[i], blockBuilder);
-        }
-        pageBuilder.declarePositions(length);
-
-        return blockBuilder.getRegion(blockBuilder.getPositionCount() - length, length);
+        return arrayValueBuilder.build(length, elementBuilder -> {
+            for (int i = 0; i < length; i++) {
+                type.appendTo(block, positions[i], elementBuilder);
+            }
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArraySortComparatorFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArraySortComparatorFunction.java
index 4d900e0b7caf..b27fca5b36c1 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArraySortComparatorFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArraySortComparatorFunction.java
@@ -13,118 +13,75 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
+import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
+import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
-import io.trino.spi.function.TypeParameterSpecialization;
+import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.lambda.LambdaFunctionInterface;
 
+import java.lang.invoke.MethodHandle;
 import java.util.Comparator;
 import java.util.List;
 
+import static com.google.common.base.Throwables.throwIfUnchecked;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.util.Failures.checkCondition;
 
 @ScalarFunction("array_sort")
 @Description("Sorts the given array with a lambda comparator.")
 public final class ArraySortComparatorFunction
 {
-    private final PageBuilder pageBuilder;
+    private final BufferedArrayValueBuilder arrayValueBuilder;
     private static final int INITIAL_LENGTH = 128;
     private List<Integer> positions = Ints.asList(new int[INITIAL_LENGTH]);
 
     @TypeParameter("T")
     public ArraySortComparatorFunction(@TypeParameter("T") Type elementType)
     {
-        pageBuilder = new PageBuilder(ImmutableList.of(elementType));
+        arrayValueBuilder = BufferedArrayValueBuilder.createBuffered(new ArrayType(elementType));
     }
 
     @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = long.class)
     @SqlType("array(T)")
-    public Block sortLong(
-            @TypeParameter("T") Type type,
-            @SqlType("array(T)") Block block,
-            @SqlType("function(T, T, integer)") ComparatorLongLambda function)
-    {
-        int arrayLength = block.getPositionCount();
-        initPositionsList(arrayLength);
-
-        Comparator<Integer> comparator = (x, y) -> comparatorResult(function.apply(
-                block.isNull(x) ? null : type.getLong(block, x),
-                block.isNull(y) ? null : type.getLong(block, y)));
-
-        sortPositions(arrayLength, comparator);
-
-        return computeResultBlock(type, block, arrayLength);
-    }
-
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = double.class)
-    @SqlType("array(T)")
-    public Block sortDouble(
-            @TypeParameter("T") Type type,
-            @SqlType("array(T)") Block block,
-            @SqlType("function(T, T, integer)") ComparatorDoubleLambda function)
-    {
-        int arrayLength = block.getPositionCount();
-        initPositionsList(arrayLength);
-
-        Comparator<Integer> comparator = (x, y) -> comparatorResult(function.apply(
-                block.isNull(x) ? null : type.getDouble(block, x),
-                block.isNull(y) ? null : type.getDouble(block, y)));
-
-        sortPositions(arrayLength, comparator);
-
-        return computeResultBlock(type, block, arrayLength);
-    }
-
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = boolean.class)
-    @SqlType("array(T)")
-    public Block sortBoolean(
-            @TypeParameter("T") Type type,
-            @SqlType("array(T)") Block block,
-            @SqlType("function(T, T, integer)") ComparatorBooleanLambda function)
-    {
-        int arrayLength = block.getPositionCount();
-        initPositionsList(arrayLength);
-
-        Comparator<Integer> comparator = (x, y) -> comparatorResult(function.apply(
-                block.isNull(x) ? null : type.getBoolean(block, x),
-                block.isNull(y) ? null : type.getBoolean(block, y)));
-
-        sortPositions(arrayLength, comparator);
-
-        return computeResultBlock(type, block, arrayLength);
-    }
-
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = Object.class)
-    @SqlType("array(T)")
-    public Block sortObject(
+    public Block sort(
             @TypeParameter("T") Type type,
+            @OperatorDependency(operator = READ_VALUE, argumentTypes = "T", convention = @Convention(arguments = BLOCK_POSITION_NOT_NULL, result = FAIL_ON_NULL)) MethodHandle readValue,
             @SqlType("array(T)") Block block,
             @SqlType("function(T, T, integer)") ComparatorObjectLambda function)
     {
         int arrayLength = block.getPositionCount();
         initPositionsList(arrayLength);
 
-        Comparator<Integer> comparator = (x, y) -> comparatorResult(function.apply(
-                block.isNull(x) ? null : type.getObject(block, x),
-                block.isNull(y) ? null : type.getObject(block, y)));
+        Comparator<Integer> comparator = (x, y) -> {
+            try {
+                return comparatorResult(function.apply(
+                        block.isNull(x) ? null : readValue.invoke(block, x),
+                        block.isNull(y) ? null : readValue.invoke(block, y)));
+            }
+            catch (Throwable e) {
+                throwIfUnchecked(e);
+                throw new RuntimeException(e);
+            }
+        };
 
         sortPositions(arrayLength, comparator);
 
-        return computeResultBlock(type, block, arrayLength);
+        return arrayValueBuilder.build(arrayLength, elementBuilder -> {
+            for (int i = 0; i < arrayLength; i++) {
+                type.appendTo(block, positions.get(i), elementBuilder);
+            }
+        });
     }
 
     private void initPositionsList(int arrayLength)
@@ -149,22 +106,6 @@ private void sortPositions(int arrayLength, Comparator<Integer> comparator)
         }
     }
 
-    private Block computeResultBlock(Type type, Block block, int arrayLength)
-    {
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-
-        for (int i = 0; i < arrayLength; ++i) {
-            type.appendTo(block, positions.get(i), blockBuilder);
-        }
-        pageBuilder.declarePositions(arrayLength);
-
-        return blockBuilder.getRegion(blockBuilder.getPositionCount() - arrayLength, arrayLength);
-    }
-
     private static int comparatorResult(Long result)
     {
         checkCondition(
@@ -174,27 +115,6 @@ private static int comparatorResult(Long result)
         return result.intValue();
     }
 
-    @FunctionalInterface
-    public interface ComparatorLongLambda
-            extends LambdaFunctionInterface
-    {
-        Long apply(Long x, Long y);
-    }
-
-    @FunctionalInterface
-    public interface ComparatorDoubleLambda
-            extends LambdaFunctionInterface
-    {
-        Long apply(Double x, Double y);
-    }
-
-    @FunctionalInterface
-    public interface ComparatorBooleanLambda
-            extends LambdaFunctionInterface
-    {
-        Long apply(Boolean x, Boolean y);
-    }
-
     @FunctionalInterface
     public interface ComparatorObjectLambda
             extends LambdaFunctionInterface
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArraySortFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArraySortFunction.java
index c81824f8acba..4a279f1268ad 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArraySortFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArraySortFunction.java
@@ -13,21 +13,20 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
 import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
 import io.trino.type.BlockTypeOperators.BlockPositionComparison;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 
@@ -36,14 +35,14 @@
 public final class ArraySortFunction
 {
     public static final String NAME = "array_sort";
-    private final PageBuilder pageBuilder;
+    private final BufferedArrayValueBuilder arrayValueBuilder;
     private static final int INITIAL_LENGTH = 128;
     private final IntArrayList positions = new IntArrayList(INITIAL_LENGTH);
 
     @TypeParameter("E")
     public ArraySortFunction(@TypeParameter("E") Type elementType)
     {
-        pageBuilder = new PageBuilder(ImmutableList.of(elementType));
+        arrayValueBuilder = BufferedArrayValueBuilder.createBuffered(new ArrayType(elementType));
     }
 
     @TypeParameter("E")
@@ -52,7 +51,7 @@ public Block sort(
             @OperatorDependency(
                     operator = COMPARISON_UNORDERED_LAST,
                     argumentTypes = {"E", "E"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL)) BlockPositionComparison comparisonOperator,
+                    convention = @Convention(arguments = {BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL)) BlockPositionComparison comparisonOperator,
             @TypeParameter("E") Type type,
             @SqlType("array(E)") Block block)
     {
@@ -78,17 +77,10 @@ public Block sort(
             return (int) comparisonOperator.compare(block, left, block, right);
         });
 
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-
-        for (int i = 0; i < arrayLength; i++) {
-            type.appendTo(block, positions.getInt(i), blockBuilder);
-        }
-        pageBuilder.declarePositions(arrayLength);
-
-        return blockBuilder.getRegion(blockBuilder.getPositionCount() - arrayLength, arrayLength);
+        return arrayValueBuilder.build(arrayLength, elementBuilder -> {
+            for (int i = 0; i < arrayLength; i++) {
+                type.appendTo(block, positions.getInt(i), elementBuilder);
+            }
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArraySubscriptOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArraySubscriptOperator.java
index 07019bfff6ee..ca31511d1d55 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArraySubscriptOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArraySubscriptOperator.java
@@ -14,12 +14,12 @@
 package io.trino.operator.scalar;
 
 import com.google.common.collect.ImmutableList;
-import io.airlift.slice.Slice;
-import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.FunctionDependencies;
+import io.trino.spi.function.FunctionDependencyDeclaration;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
 import io.trino.spi.type.Type;
@@ -28,32 +28,47 @@
 import java.lang.invoke.MethodHandle;
 
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
+import static io.trino.spi.function.InvocationConvention.simpleConvention;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.SUBSCRIPT;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.TypeSignature.arrayType;
-import static io.trino.util.Reflection.methodHandle;
 import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
+import static java.lang.invoke.MethodHandles.collectArguments;
+import static java.lang.invoke.MethodHandles.empty;
+import static java.lang.invoke.MethodHandles.explicitCastArguments;
+import static java.lang.invoke.MethodHandles.guardWithTest;
+import static java.lang.invoke.MethodHandles.lookup;
+import static java.lang.invoke.MethodHandles.permuteArguments;
+import static java.lang.invoke.MethodType.methodType;
 
 public class ArraySubscriptOperator
         extends SqlScalarFunction
 {
     public static final ArraySubscriptOperator ARRAY_SUBSCRIPT = new ArraySubscriptOperator();
 
-    private static final MethodHandle METHOD_HANDLE_BOOLEAN = methodHandle(ArraySubscriptOperator.class, "booleanSubscript", Type.class, Block.class, long.class);
-    private static final MethodHandle METHOD_HANDLE_LONG = methodHandle(ArraySubscriptOperator.class, "longSubscript", Type.class, Block.class, long.class);
-    private static final MethodHandle METHOD_HANDLE_DOUBLE = methodHandle(ArraySubscriptOperator.class, "doubleSubscript", Type.class, Block.class, long.class);
-    private static final MethodHandle METHOD_HANDLE_SLICE = methodHandle(ArraySubscriptOperator.class, "sliceSubscript", Type.class, Block.class, long.class);
-    private static final MethodHandle METHOD_HANDLE_OBJECT = methodHandle(ArraySubscriptOperator.class, "objectSubscript", Type.class, Block.class, long.class);
+    private static final MethodHandle GET_POSITION;
+    private static final MethodHandle IS_POSITION_NULL;
 
-    protected ArraySubscriptOperator()
+    static {
+        try {
+            GET_POSITION = lookup().findStatic(ArraySubscriptOperator.class, "getPosition", methodType(int.class, Block.class, long.class));
+            IS_POSITION_NULL = lookup().findVirtual(Block.class, "isNull", methodType(boolean.class, int.class));
+        }
+        catch (ReflectiveOperationException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    private ArraySubscriptOperator()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(SUBSCRIPT)
                 .signature(Signature.builder()
-                        .operatorType(SUBSCRIPT)
                         .typeVariable("E")
                         .returnType(new TypeSignature("E"))
                         .argumentType(arrayType(new TypeSignature("E")))
@@ -64,29 +79,31 @@ protected ArraySubscriptOperator()
     }
 
     @Override
-    protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
+    public FunctionDependencyDeclaration getFunctionDependencies()
+    {
+        return FunctionDependencyDeclaration.builder()
+                .addOperatorSignature(READ_VALUE, ImmutableList.of(new TypeSignature("E")))
+                .build();
+    }
+
+    @Override
+    public SpecializedSqlScalarFunction specialize(BoundSignature boundSignature, FunctionDependencies functionDependencies)
     {
         Type elementType = boundSignature.getReturnType();
+        MethodHandle methodHandle = functionDependencies.getOperatorImplementation(
+                READ_VALUE,
+                ImmutableList.of(elementType),
+                simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL))
+                .getMethodHandle();
+        Class<?> expectedReturnType = methodType(elementType.getJavaType()).wrap().returnType();
+        methodHandle = explicitCastArguments(methodHandle, methodHandle.type().changeReturnType(expectedReturnType));
+        methodHandle = guardWithTest(
+                IS_POSITION_NULL,
+                empty(methodHandle.type()),
+                methodHandle);
+        methodHandle = collectArguments(methodHandle, 1, GET_POSITION);
+        methodHandle = permuteArguments(methodHandle, methodHandle.type().dropParameterTypes(1, 2), 0, 0, 1);
 
-        MethodHandle methodHandle;
-        if (elementType.getJavaType() == boolean.class) {
-            methodHandle = METHOD_HANDLE_BOOLEAN;
-        }
-        else if (elementType.getJavaType() == long.class) {
-            methodHandle = METHOD_HANDLE_LONG;
-        }
-        else if (elementType.getJavaType() == double.class) {
-            methodHandle = METHOD_HANDLE_DOUBLE;
-        }
-        else if (elementType.getJavaType() == Slice.class) {
-            methodHandle = METHOD_HANDLE_SLICE;
-        }
-        else {
-            methodHandle = METHOD_HANDLE_OBJECT.asType(
-                    METHOD_HANDLE_OBJECT.type().changeReturnType(elementType.getJavaType()));
-        }
-        methodHandle = methodHandle.bindTo(elementType);
-        requireNonNull(methodHandle, "methodHandle is null");
         return new ChoicesSpecializedSqlScalarFunction(
                 boundSignature,
                 NULLABLE_RETURN,
@@ -94,64 +111,14 @@ else if (elementType.getJavaType() == Slice.class) {
                 methodHandle);
     }
 
-    @UsedByGeneratedCode
-    public static Long longSubscript(Type elementType, Block array, long index)
-    {
-        checkIndex(array, index);
-        int position = toIntExact(index - 1);
-        if (array.isNull(position)) {
-            return null;
-        }
-
-        return elementType.getLong(array, position);
-    }
-
-    @UsedByGeneratedCode
-    public static Boolean booleanSubscript(Type elementType, Block array, long index)
+    private static int getPosition(Block array, long index)
     {
-        checkIndex(array, index);
-        int position = toIntExact(index - 1);
-        if (array.isNull(position)) {
-            return null;
-        }
-
-        return elementType.getBoolean(array, position);
-    }
-
-    @UsedByGeneratedCode
-    public static Double doubleSubscript(Type elementType, Block array, long index)
-    {
-        checkIndex(array, index);
-        int position = toIntExact(index - 1);
-        if (array.isNull(position)) {
-            return null;
-        }
-
-        return elementType.getDouble(array, position);
-    }
-
-    @UsedByGeneratedCode
-    public static Slice sliceSubscript(Type elementType, Block array, long index)
-    {
-        checkIndex(array, index);
-        int position = toIntExact(index - 1);
-        if (array.isNull(position)) {
-            return null;
+        checkArrayIndex(index);
+        if (index > array.getPositionCount()) {
+            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format("Array subscript must be less than or equal to array length: %s > %s", index, array.getPositionCount()));
         }
-
-        return elementType.getSlice(array, position);
-    }
-
-    @UsedByGeneratedCode
-    public static Object objectSubscript(Type elementType, Block array, long index)
-    {
-        checkIndex(array, index);
         int position = toIntExact(index - 1);
-        if (array.isNull(position)) {
-            return null;
-        }
-
-        return elementType.getObject(array, position);
+        return position;
     }
 
     public static void checkArrayIndex(long index)
@@ -163,12 +130,4 @@ public static void checkArrayIndex(long index)
             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Array subscript is negative: " + index);
         }
     }
-
-    public static void checkIndex(Block array, long index)
-    {
-        checkArrayIndex(index);
-        if (index > array.getPositionCount()) {
-            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format("Array subscript must be less than or equal to array length: %s > %s", index, array.getPositionCount()));
-        }
-    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToArrayCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToArrayCast.java
index 6200f5a1ef39..60e6125a62fb 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToArrayCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToArrayCast.java
@@ -21,13 +21,12 @@
 import io.trino.spi.function.ScalarOperator;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
-import io.trino.spi.function.TypeParameterSpecialization;
 import io.trino.spi.type.Type;
 
 import java.lang.invoke.MethodHandle;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.OperatorType.CAST;
 
 @ScalarOperator(CAST)
@@ -37,11 +36,10 @@ private ArrayToArrayCast() {}
 
     @TypeParameter("F")
     @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = long.class)
     @SqlType("array(T)")
-    public static Block filterLong(
+    public static Block filter(
             @TypeParameter("T") Type resultType,
-            @CastDependency(fromType = "F", toType = "T", convention = @Convention(arguments = BLOCK_POSITION, result = NULLABLE_RETURN, session = true)) MethodHandle cast,
+            @CastDependency(fromType = "F", toType = "T", convention = @Convention(arguments = BLOCK_POSITION_NOT_NULL, result = BLOCK_BUILDER, session = true)) MethodHandle cast,
             ConnectorSession session,
             @SqlType("array(F)") Block array)
             throws Throwable
@@ -49,92 +47,12 @@ public static Block filterLong(
         int positionCount = array.getPositionCount();
         BlockBuilder resultBuilder = resultType.createBlockBuilder(null, positionCount);
         for (int position = 0; position < positionCount; position++) {
-            if (!array.isNull(position)) {
-                Long value = (Long) cast.invokeExact(session, array, position);
-                if (value != null) {
-                    resultType.writeLong(resultBuilder, value);
-                    continue;
-                }
+            if (array.isNull(position)) {
+                resultBuilder.appendNull();
             }
-            resultBuilder.appendNull();
-        }
-        return resultBuilder.build();
-    }
-
-    @TypeParameter("F")
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = double.class)
-    @SqlType("array(T)")
-    public static Block filterDouble(
-            @TypeParameter("T") Type resultType,
-            @CastDependency(fromType = "F", toType = "T", convention = @Convention(arguments = BLOCK_POSITION, result = NULLABLE_RETURN, session = true)) MethodHandle cast,
-            ConnectorSession session,
-            @SqlType("array(F)") Block array)
-            throws Throwable
-    {
-        int positionCount = array.getPositionCount();
-        BlockBuilder resultBuilder = resultType.createBlockBuilder(null, positionCount);
-        for (int position = 0; position < positionCount; position++) {
-            if (!array.isNull(position)) {
-                Double value = (Double) cast.invokeExact(session, array, position);
-                if (value != null) {
-                    resultType.writeDouble(resultBuilder, value);
-                    continue;
-                }
-            }
-            resultBuilder.appendNull();
-        }
-        return resultBuilder.build();
-    }
-
-    @TypeParameter("F")
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = boolean.class)
-    @SqlType("array(T)")
-    public static Block filterBoolean(
-            @TypeParameter("T") Type resultType,
-            @CastDependency(fromType = "F", toType = "T", convention = @Convention(arguments = BLOCK_POSITION, result = NULLABLE_RETURN, session = true)) MethodHandle cast,
-            ConnectorSession session,
-            @SqlType("array(F)") Block array)
-            throws Throwable
-    {
-        int positionCount = array.getPositionCount();
-        BlockBuilder resultBuilder = resultType.createBlockBuilder(null, positionCount);
-        for (int position = 0; position < positionCount; position++) {
-            if (!array.isNull(position)) {
-                Boolean value = (Boolean) cast.invokeExact(session, array, position);
-                if (value != null) {
-                    resultType.writeBoolean(resultBuilder, value);
-                    continue;
-                }
-            }
-            resultBuilder.appendNull();
-        }
-        return resultBuilder.build();
-    }
-
-    @TypeParameter("F")
-    @TypeParameter("T")
-    @TypeParameterSpecialization(name = "T", nativeContainerType = Object.class)
-    @SqlType("array(T)")
-    public static Block filterObject(
-            @TypeParameter("T") Type resultType,
-            @CastDependency(fromType = "F", toType = "T", convention = @Convention(arguments = BLOCK_POSITION, result = NULLABLE_RETURN, session = true)) MethodHandle cast,
-            ConnectorSession session,
-            @SqlType("array(F)") Block array)
-            throws Throwable
-    {
-        int positionCount = array.getPositionCount();
-        BlockBuilder resultBuilder = resultType.createBlockBuilder(null, positionCount);
-        for (int position = 0; position < positionCount; position++) {
-            if (!array.isNull(position)) {
-                Object value = (Object) cast.invoke(session, array, position);
-                if (value != null) {
-                    resultType.writeObject(resultBuilder, value);
-                    continue;
-                }
+            else {
+                cast.invokeExact(session, array, position, resultBuilder);
             }
-            resultBuilder.appendNull();
         }
         return resultBuilder.build();
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToElementConcatFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToElementConcatFunction.java
index 2ab487ee2fad..f5e85aff94b4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToElementConcatFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToElementConcatFunction.java
@@ -44,9 +44,8 @@ public class ArrayToElementConcatFunction
 
     public ArrayToElementConcatFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(FUNCTION_NAME)
                 .signature(Signature.builder()
-                        .name(FUNCTION_NAME)
                         .typeVariable("E")
                         .returnType(arrayType(new TypeSignature("E")))
                         .argumentType(arrayType(new TypeSignature("E")))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToJsonCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToJsonCast.java
index 5696be0c237d..da7dfda0327c 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToJsonCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToJsonCast.java
@@ -13,6 +13,7 @@
  */
 package io.trino.operator.scalar;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.DynamicSliceOutput;
@@ -30,7 +31,6 @@
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 
-import static io.trino.operator.scalar.JsonOperators.JSON_FACTORY;
 import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
@@ -39,6 +39,7 @@
 import static io.trino.type.JsonType.JSON;
 import static io.trino.util.Failures.checkCondition;
 import static io.trino.util.JsonUtil.canCastToJson;
+import static io.trino.util.JsonUtil.createJsonFactory;
 import static io.trino.util.JsonUtil.createJsonGenerator;
 import static io.trino.util.Reflection.methodHandle;
 
@@ -49,11 +50,12 @@ public class ArrayToJsonCast
 
     private static final MethodHandle METHOD_HANDLE = methodHandle(ArrayToJsonCast.class, "toJson", JsonGeneratorWriter.class, Block.class);
 
+    private static final JsonFactory JSON_FACTORY = createJsonFactory();
+
     private ArrayToJsonCast()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(CAST)
                 .signature(Signature.builder()
-                        .operatorType(CAST)
                         .castableToTypeParameter("T", JSON.getTypeSignature())
                         .returnType(JSON)
                         .argumentType(arrayType(new TypeSignature("T")))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayTransformFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayTransformFunction.java
index 710b532a2574..30cf4fd04573 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayTransformFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayTransformFunction.java
@@ -24,10 +24,13 @@
 import io.airlift.bytecode.Variable;
 import io.airlift.bytecode.control.ForLoop;
 import io.airlift.bytecode.control.IfStatement;
+import io.airlift.bytecode.expression.BytecodeExpression;
 import io.trino.metadata.SqlScalarFunction;
-import io.trino.spi.PageBuilder;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayValueBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
@@ -37,7 +40,8 @@
 import io.trino.sql.gen.CallSiteBinder;
 import io.trino.sql.gen.lambda.UnaryFunctionInterface;
 
-import java.util.List;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
 import java.util.Optional;
 
 import static io.airlift.bytecode.Access.FINAL;
@@ -51,30 +55,40 @@
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantNull;
 import static io.airlift.bytecode.expression.BytecodeExpressions.equal;
 import static io.airlift.bytecode.expression.BytecodeExpressions.lessThan;
-import static io.airlift.bytecode.expression.BytecodeExpressions.newInstance;
-import static io.airlift.bytecode.expression.BytecodeExpressions.subtract;
 import static io.airlift.bytecode.instruction.VariableInstruction.incrementVariable;
+import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FUNCTION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.type.TypeSignature.arrayType;
 import static io.trino.spi.type.TypeSignature.functionType;
+import static io.trino.sql.gen.LambdaMetafactoryGenerator.generateMetafactory;
 import static io.trino.sql.gen.SqlTypeBytecodeExpression.constantType;
 import static io.trino.type.UnknownType.UNKNOWN;
 import static io.trino.util.CompilerUtils.defineClass;
 import static io.trino.util.CompilerUtils.makeClassName;
-import static io.trino.util.Reflection.methodHandle;
+import static java.lang.invoke.MethodHandles.lookup;
 
 public final class ArrayTransformFunction
         extends SqlScalarFunction
 {
+    private static final MethodHandle CREATE_STATE;
+
+    static {
+        try {
+            CREATE_STATE = lookup().findStatic(BufferedArrayValueBuilder.class, "createBuffered", MethodType.methodType(BufferedArrayValueBuilder.class, ArrayType.class));
+        }
+        catch (ReflectiveOperationException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
     public static final ArrayTransformFunction ARRAY_TRANSFORM_FUNCTION = new ArrayTransformFunction();
 
     private ArrayTransformFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("transform")
                 .signature(Signature.builder()
-                        .name("transform")
                         .typeVariable("T")
                         .typeVariable("U")
                         .returnType(arrayType(new TypeSignature("U")))
@@ -90,64 +104,76 @@ private ArrayTransformFunction()
     protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
     {
         Type inputType = ((ArrayType) boundSignature.getArgumentTypes().get(0)).getElementType();
-        Type outputType = ((ArrayType) boundSignature.getReturnType()).getElementType();
-        Class<?> generatedClass = generateTransform(inputType, outputType);
+        ArrayType returnType = (ArrayType) boundSignature.getReturnType();
+        Type outputType = returnType.getElementType();
         return new ChoicesSpecializedSqlScalarFunction(
                 boundSignature,
                 FAIL_ON_NULL,
                 ImmutableList.of(NEVER_NULL, FUNCTION),
                 ImmutableList.of(UnaryFunctionInterface.class),
-                methodHandle(generatedClass, "transform", PageBuilder.class, Block.class, UnaryFunctionInterface.class),
-                Optional.of(methodHandle(generatedClass, "createPageBuilder")));
+                generateTransform(inputType, outputType),
+                Optional.of(CREATE_STATE.bindTo(returnType)));
     }
 
-    private static Class<?> generateTransform(Type inputType, Type outputType)
+    private static MethodHandle generateTransform(Type inputType, Type outputType)
     {
         CallSiteBinder binder = new CallSiteBinder();
-        Class<?> inputJavaType = Primitives.wrap(inputType.getJavaType());
-        Class<?> outputJavaType = Primitives.wrap(outputType.getJavaType());
-
         ClassDefinition definition = new ClassDefinition(
                 a(PUBLIC, FINAL),
                 makeClassName("ArrayTransform"),
                 type(Object.class));
         definition.declareDefaultConstructor(a(PRIVATE));
 
-        // define createPageBuilder
-        MethodDefinition createPageBuilderMethod = definition.declareMethod(a(PUBLIC, STATIC), "createPageBuilder", type(PageBuilder.class));
-        createPageBuilderMethod.getBody()
-                .append(newInstance(PageBuilder.class, constantType(binder, new ArrayType(outputType)).invoke("getTypeParameters", List.class)).ret());
+        MethodDefinition transformValue = generateTransformValueInner(definition, binder, inputType, outputType);
 
-        // define transform method
-        Parameter pageBuilder = arg("pageBuilder", PageBuilder.class);
+        Parameter arrayValueBuilder = arg("arrayValueBuilder", BufferedArrayValueBuilder.class);
         Parameter block = arg("block", Block.class);
         Parameter function = arg("function", UnaryFunctionInterface.class);
-
         MethodDefinition method = definition.declareMethod(
                 a(PUBLIC, STATIC),
                 "transform",
                 type(Block.class),
-                ImmutableList.of(pageBuilder, block, function));
+                ImmutableList.of(arrayValueBuilder, block, function));
+
+        BytecodeExpression arrayBuilder = generateMetafactory(ArrayValueBuilder.class, transformValue, ImmutableList.of(block, function));
+        BytecodeExpression entryCount = block.invoke("getPositionCount", int.class);
+
+        method.getBody().append(arrayValueBuilder.invoke("build", Block.class, entryCount, arrayBuilder).ret());
+
+        Class<?> generatedClass = defineClass(definition, Object.class, binder.getBindings(), ArrayTransformFunction.class.getClassLoader());
+        try {
+            return lookup().findStatic(generatedClass, "transform", MethodType.methodType(Block.class, BufferedArrayValueBuilder.class, Block.class, UnaryFunctionInterface.class));
+        }
+        catch (ReflectiveOperationException e) {
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, e);
+        }
+    }
+
+    private static MethodDefinition generateTransformValueInner(ClassDefinition definition, CallSiteBinder binder, Type inputType, Type outputType)
+    {
+        Class<?> inputJavaType = Primitives.wrap(inputType.getJavaType());
+        Class<?> outputJavaType = Primitives.wrap(outputType.getJavaType());
+
+        Parameter block = arg("block", Block.class);
+        Parameter function = arg("function", UnaryFunctionInterface.class);
+        Parameter elementBuilder = arg("elementBuilder", BlockBuilder.class);
+        MethodDefinition method = definition.declareMethod(
+                a(PRIVATE, STATIC),
+                "transformValue",
+                type(void.class),
+                ImmutableList.of(block, function, elementBuilder));
 
         BytecodeBlock body = method.getBody();
         Scope scope = method.getScope();
+
         Variable positionCount = scope.declareVariable(int.class, "positionCount");
         Variable position = scope.declareVariable(int.class, "position");
-        Variable blockBuilder = scope.declareVariable(BlockBuilder.class, "blockBuilder");
         Variable inputElement = scope.declareVariable(inputJavaType, "inputElement");
         Variable outputElement = scope.declareVariable(outputJavaType, "outputElement");
 
         // invoke block.getPositionCount()
         body.append(positionCount.set(block.invoke("getPositionCount", int.class)));
 
-        // reset page builder if it is full
-        body.append(new IfStatement()
-                .condition(pageBuilder.invoke("isFull", boolean.class))
-                .ifTrue(pageBuilder.invoke("reset", void.class)));
-
-        // get block builder
-        body.append(blockBuilder.set(pageBuilder.invoke("getBlockBuilder", BlockBuilder.class, constantInt(0))));
-
         BytecodeNode loadInputElement;
         if (!inputType.equals(UNKNOWN)) {
             loadInputElement = new IfStatement()
@@ -163,11 +189,11 @@ private static Class<?> generateTransform(Type inputType, Type outputType)
         if (!outputType.equals(UNKNOWN)) {
             writeOutputElement = new IfStatement()
                     .condition(equal(outputElement, constantNull(outputJavaType)))
-                    .ifTrue(blockBuilder.invoke("appendNull", BlockBuilder.class).pop())
-                    .ifFalse(constantType(binder, outputType).writeValue(blockBuilder, outputElement.cast(outputType.getJavaType())));
+                    .ifTrue(elementBuilder.invoke("appendNull", BlockBuilder.class).pop())
+                    .ifFalse(constantType(binder, outputType).writeValue(elementBuilder, outputElement.cast(outputType.getJavaType())));
         }
         else {
-            writeOutputElement = new BytecodeBlock().append(blockBuilder.invoke("appendNull", BlockBuilder.class).pop());
+            writeOutputElement = new BytecodeBlock().append(elementBuilder.invoke("appendNull", BlockBuilder.class).pop());
         }
 
         body.append(new ForLoop()
@@ -179,10 +205,7 @@ private static Class<?> generateTransform(Type inputType, Type outputType)
                         .append(outputElement.set(function.invoke("apply", Object.class, inputElement.cast(Object.class)).cast(outputJavaType)))
                         .append(writeOutputElement)));
 
-        body.append(pageBuilder.invoke("declarePositions", void.class, positionCount));
-
-        body.append(blockBuilder.invoke("getRegion", Block.class, subtract(blockBuilder.invoke("getPositionCount", int.class), positionCount), positionCount).ret());
-
-        return defineClass(definition, Object.class, binder.getBindings(), ArrayTransformFunction.class.getClassLoader());
+        body.ret();
+        return method;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayUnionFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayUnionFunction.java
index ac21673bce25..3741ea9c9ab2 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayUnionFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArrayUnionFunction.java
@@ -13,7 +13,6 @@
  */
 package io.trino.operator.scalar;
 
-import io.trino.operator.aggregation.TypedSet;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.Convention;
@@ -30,7 +29,7 @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static io.trino.operator.aggregation.TypedSet.createDistinctTypedSet;
+import static io.trino.operator.scalar.BlockSet.MAX_FUNCTION_MEMORY;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
@@ -58,26 +57,23 @@ public static Block union(
             @SqlType("array(E)") Block leftArray,
             @SqlType("array(E)") Block rightArray)
     {
-        int leftArrayCount = leftArray.getPositionCount();
-        int rightArrayCount = rightArray.getPositionCount();
-        BlockBuilder distinctElementBlockBuilder = type.createBlockBuilder(null, leftArrayCount + rightArrayCount);
-        TypedSet typedSet = createDistinctTypedSet(
+        BlockSet set = new BlockSet(
                 type,
                 isDistinctOperator,
                 elementHashCode,
-                distinctElementBlockBuilder,
-                leftArrayCount + rightArrayCount,
-                "array_union");
+                leftArray.getPositionCount() + rightArray.getPositionCount());
 
         for (int i = 0; i < leftArray.getPositionCount(); i++) {
-            typedSet.add(leftArray, i);
+            set.add(leftArray, i);
         }
 
         for (int i = 0; i < rightArray.getPositionCount(); i++) {
-            typedSet.add(rightArray, i);
+            set.add(rightArray, i);
         }
 
-        return distinctElementBlockBuilder.build();
+        BlockBuilder blockBuilder = type.createBlockBuilder(null, set.size());
+        set.getAllWithSizeLimit(blockBuilder, "array_union", MAX_FUNCTION_MEMORY);
+        return blockBuilder.build();
     }
 
     @SqlType("array(bigint)")
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ArraysOverlapFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ArraysOverlapFunction.java
index db5373a1e699..0de29e4b1d79 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ArraysOverlapFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ArraysOverlapFunction.java
@@ -29,7 +29,7 @@
 import it.unimi.dsi.fastutil.ints.IntComparator;
 import it.unimi.dsi.fastutil.longs.LongArrays;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
@@ -117,7 +117,7 @@ public Boolean arraysOverlap(
             @OperatorDependency(
                     operator = COMPARISON_UNORDERED_LAST,
                     argumentTypes = {"E", "E"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = FAIL_ON_NULL)) BlockPositionComparison comparisonOperator,
+                    convention = @Convention(arguments = {BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL)) BlockPositionComparison comparisonOperator,
             @TypeParameter("E") Type type,
             @SqlType("array(E)") Block leftArray,
             @SqlType("array(E)") Block rightArray)
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/BlockSet.java b/core/trino-main/src/main/java/io/trino/operator/scalar/BlockSet.java
new file mode 100644
index 000000000000..c595dabcca7c
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/BlockSet.java
@@ -0,0 +1,213 @@
+/*
+ * Licensed 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 io.trino.operator.scalar;
+
+import io.airlift.units.DataSize;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.Type;
+import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
+import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
+
+import java.util.Arrays;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static io.airlift.units.DataSize.Unit.MEGABYTE;
+import static io.trino.spi.StandardErrorCode.EXCEEDED_FUNCTION_MEMORY_LIMIT;
+import static it.unimi.dsi.fastutil.HashCommon.arraySize;
+import static java.lang.Math.toIntExact;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * A set of values stored in preexisting blocks. The data is not copied out of the
+ * blocks, and instead a direct reference is kept. This means that all data in a block
+ * is retained (including non-distinct values), so this works best when processing
+ * preexisting blocks in a single code block. Care should be taken when using this
+ * across multiple calls, as the memory will not be freed until the BlockSet is freed.
+ * <p>
+ * BlockSet does not support rehashing, so the maximum size must be known up front.
+ */
+public class BlockSet
+{
+    public static final DataSize MAX_FUNCTION_MEMORY = DataSize.of(4, MEGABYTE);
+
+    private static final float FILL_RATIO = 0.75f;
+    private static final int EMPTY_SLOT = -1;
+
+    private final Type elementType;
+    private final BlockPositionIsDistinctFrom elementDistinctFromOperator;
+    private final BlockPositionHashCode elementHashCodeOperator;
+
+    private final int[] blockPositionByHash;
+
+    private final Block[] elementBlocks;
+    private final int[] elementPositions;
+
+    private int size;
+
+    private final int maximumSize;
+    private final int hashMask;
+
+    private boolean containsNullElement;
+
+    public BlockSet(
+            Type elementType,
+            BlockPositionIsDistinctFrom elementDistinctFromOperator,
+            BlockPositionHashCode elementHashCodeOperator,
+            int maximumSize)
+    {
+        checkArgument(maximumSize >= 0, "maximumSize must not be negative");
+        this.elementType = requireNonNull(elementType, "elementType is null");
+        this.elementDistinctFromOperator = requireNonNull(elementDistinctFromOperator, "elementDistinctFromOperator is null");
+        this.elementHashCodeOperator = requireNonNull(elementHashCodeOperator, "elementHashCodeOperator is null");
+        this.maximumSize = maximumSize;
+
+        int hashCapacity = arraySize(maximumSize, FILL_RATIO);
+        this.hashMask = hashCapacity - 1;
+
+        blockPositionByHash = new int[hashCapacity];
+        Arrays.fill(blockPositionByHash, EMPTY_SLOT);
+
+        this.elementBlocks = new Block[maximumSize];
+        this.elementPositions = new int[maximumSize];
+
+        this.containsNullElement = false;
+    }
+
+    /**
+     * Does this set contain the value?
+     */
+    public boolean contains(Block block, int position)
+    {
+        requireNonNull(block, "block must not be null");
+        checkArgument(position >= 0, "position must be >= 0");
+
+        if (block.isNull(position)) {
+            return containsNullElement;
+        }
+        return positionOf(block, position) != EMPTY_SLOT;
+    }
+
+    /**
+     * Add the value to this set.
+     *
+     * @return {@code true} if the value was added, or {@code false} if it was
+     * already in this set.
+     */
+    public boolean add(Block block, int position)
+    {
+        requireNonNull(block, "block must not be null");
+        checkArgument(position >= 0, "position must be >= 0");
+
+        // containsNullElement flag is maintained so contains() method can have a shortcut for null value
+        if (block.isNull(position)) {
+            if (containsNullElement) {
+                return false;
+            }
+            containsNullElement = true;
+        }
+
+        int hashPosition = getHashPositionOfElement(block, position);
+        if (blockPositionByHash[hashPosition] == EMPTY_SLOT) {
+            addNewElement(hashPosition, block, position);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Returns the number of elements in this set.
+     */
+    public int size()
+    {
+        return size;
+    }
+
+    /**
+     * Return the position of the value within this set, or -1 if the value is not in this set.
+     * This method can not get the position of a null value, and an exception will be thrown in that case.
+     *
+     * @throws IllegalArgumentException if the position is null
+     */
+    public int positionOf(Block block, int position)
+    {
+        return blockPositionByHash[getHashPositionOfElement(block, position)];
+    }
+
+    /**
+     * Writes all values to the block builder checking the memory limit after each element is added.
+     */
+    public void getAllWithSizeLimit(BlockBuilder blockBuilder, String functionName, DataSize maxFunctionMemory)
+    {
+        long initialSize = blockBuilder.getSizeInBytes();
+        long maxBlockMemoryInBytes = toIntExact(maxFunctionMemory.toBytes());
+        for (int i = 0; i < size; i++) {
+            elementType.appendTo(elementBlocks[i], elementPositions[i], blockBuilder);
+            if (blockBuilder.getSizeInBytes() - initialSize > maxBlockMemoryInBytes) {
+                throw new TrinoException(
+                        EXCEEDED_FUNCTION_MEMORY_LIMIT,
+                        "The input to %s is too large. More than %s of memory is needed to hold the output hash set.".formatted(functionName, maxFunctionMemory));
+            }
+        }
+    }
+
+    /**
+     * Get hash slot position of the element. If the element is not in the set, return the position
+     * where the element should be inserted.
+     */
+    private int getHashPositionOfElement(Block block, int position)
+    {
+        int hashPosition = getMaskedHash(elementHashCodeOperator.hashCodeNullSafe(block, position));
+        while (true) {
+            int blockPosition = blockPositionByHash[hashPosition];
+            if (blockPosition == EMPTY_SLOT) {
+                // Doesn't have this element
+                return hashPosition;
+            }
+            if (isNotDistinct(blockPosition, block, position)) {
+                // Already has this element
+                return hashPosition;
+            }
+
+            hashPosition = getMaskedHash(hashPosition + 1);
+        }
+    }
+
+    private void addNewElement(int hashPosition, Block block, int position)
+    {
+        checkState(size < maximumSize, "BlockSet is full");
+
+        elementBlocks[size] = block;
+        elementPositions[size] = position;
+
+        blockPositionByHash[hashPosition] = size;
+        size++;
+    }
+
+    private boolean isNotDistinct(int leftPosition, Block rightBlock, int rightPosition)
+    {
+        return !elementDistinctFromOperator.isDistinctFrom(
+                elementBlocks[leftPosition],
+                elementPositions[leftPosition],
+                rightBlock,
+                rightPosition);
+    }
+
+    private int getMaskedHash(long rawHash)
+    {
+        return (int) (rawHash & hashMask);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/CastFromUnknownOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/CastFromUnknownOperator.java
index 007c74406a66..680cbf6f1ea8 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/CastFromUnknownOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/CastFromUnknownOperator.java
@@ -38,9 +38,8 @@ public final class CastFromUnknownOperator
 
     public CastFromUnknownOperator()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(CAST)
                 .signature(Signature.builder()
-                        .operatorType(CAST)
                         .typeVariable("E")
                         .returnType(new TypeSignature("E"))
                         .argumentType(UNKNOWN)
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ChoicesSpecializedSqlScalarFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ChoicesSpecializedSqlScalarFunction.java
index 2b33f7058311..daf0bd6f29fc 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ChoicesSpecializedSqlScalarFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ChoicesSpecializedSqlScalarFunction.java
@@ -32,7 +32,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.spi.StandardErrorCode.FUNCTION_NOT_FOUND;
-import static io.trino.spi.function.ScalarFunctionAdapter.NullAdaptationPolicy.RETURN_NULL_ON_NULL;
 import static java.lang.String.format;
 import static java.util.Comparator.comparingInt;
 import static java.util.Objects.requireNonNull;
@@ -40,8 +39,6 @@
 public final class ChoicesSpecializedSqlScalarFunction
         implements SpecializedSqlScalarFunction
 {
-    private final ScalarFunctionAdapter functionAdapter = new ScalarFunctionAdapter(RETURN_NULL_ON_NULL);
-
     private final BoundSignature boundSignature;
     private final List<ScalarImplementationChoice> choices;
 
@@ -103,7 +100,7 @@ public ScalarFunctionImplementation getScalarFunctionImplementation(InvocationCo
         List<ScalarImplementationChoice> choices = new ArrayList<>();
         for (ScalarImplementationChoice choice : this.choices) {
             InvocationConvention callingConvention = choice.getInvocationConvention();
-            if (functionAdapter.canAdapt(callingConvention, invocationConvention)) {
+            if (ScalarFunctionAdapter.canAdapt(callingConvention, invocationConvention)) {
                 choices.add(choice);
             }
         }
@@ -113,8 +110,9 @@ public ScalarFunctionImplementation getScalarFunctionImplementation(InvocationCo
         }
 
         ScalarImplementationChoice bestChoice = Collections.max(choices, comparingInt(ScalarImplementationChoice::getScore));
-        MethodHandle methodHandle = functionAdapter.adapt(
+        MethodHandle methodHandle = ScalarFunctionAdapter.adapt(
                 bestChoice.getMethodHandle(),
+                boundSignature.getReturnType(),
                 boundSignature.getArgumentTypes(),
                 bestChoice.getInvocationConvention(),
                 invocationConvention);
@@ -206,9 +204,14 @@ private static int computeScore(InvocationConvention callingConvention)
                     case NULL_FLAG:
                         score += 1;
                         break;
+                    case BLOCK_POSITION_NOT_NULL:
                     case BLOCK_POSITION:
                         score += 1000;
                         break;
+                    case VALUE_BLOCK_POSITION_NOT_NULL:
+                    case VALUE_BLOCK_POSITION:
+                        score += 2000;
+                        break;
                     case IN_OUT:
                         score += 10_000;
                         break;
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ConcatFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ConcatFunction.java
index 1f05a7651430..2567f80beae4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ConcatFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ConcatFunction.java
@@ -25,7 +25,6 @@
 import java.lang.invoke.MethodHandle;
 
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
@@ -43,14 +42,12 @@ public final class ConcatFunction
 
     public static final ConcatFunction VARBINARY_CONCAT = new ConcatFunction(VARBINARY.getTypeSignature(), "concatenates given varbinary values");
 
-    private static final int MAX_INPUT_VALUES = 254;
     private static final int MAX_OUTPUT_LENGTH = DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
 
     private ConcatFunction(TypeSignature type, String description)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("concat")
                 .signature(Signature.builder()
-                        .name("concat")
                         .returnType(type)
                         .argumentType(type)
                         .variableArity()
@@ -68,10 +65,6 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "There must be two or more concatenation arguments");
         }
 
-        if (arity > MAX_INPUT_VALUES) {
-            throw new TrinoException(NOT_SUPPORTED, "Too many arguments for string concatenation");
-        }
-
         MethodHandle arrayMethodHandle = methodHandle(ConcatFunction.class, "concat", Slice[].class);
         MethodHandle customMethodHandle = arrayMethodHandle.asCollector(Slice[].class, arity);
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ConcatWsFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ConcatWsFunction.java
index f81c688d2693..19668b107179 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ConcatWsFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ConcatWsFunction.java
@@ -31,7 +31,6 @@
 import java.util.Collections;
 
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
@@ -55,7 +54,6 @@ public final class ConcatWsFunction
         extends SqlScalarFunction
 {
     public static final ConcatWsFunction CONCAT_WS = new ConcatWsFunction();
-    private static final int MAX_INPUT_VALUES = 254;
     private static final int MAX_OUTPUT_LENGTH = DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
 
     @ScalarFunction("concat_ws")
@@ -89,9 +87,8 @@ public int getCount()
 
     public ConcatWsFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("concat_ws")
                 .signature(Signature.builder()
-                        .name("concat_ws")
                         .returnType(VARCHAR)
                         .argumentType(VARCHAR)
                         .argumentType(VARCHAR)
@@ -146,10 +143,6 @@ public int getCount()
 
     private static Slice concatWs(Slice separator, SliceArray values)
     {
-        if (values.getCount() > MAX_INPUT_VALUES) {
-            throw new TrinoException(NOT_SUPPORTED, "Too many arguments for string concatenation");
-        }
-
         // Validate size of output
         int length = 0;
         boolean requiresSeparator = false;
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/DateTimeFunctions.java b/core/trino-main/src/main/java/io/trino/operator/scalar/DateTimeFunctions.java
index c4e5f38c0b09..34708653f848 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/DateTimeFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/DateTimeFunctions.java
@@ -329,7 +329,7 @@ public static DateTimeField getTimestampField(ISOChronology chronology, Slice un
             case "year":
                 return chronology.year();
         }
-        throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid Timestamp field");
+        throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid TIMESTAMP field");
     }
 
     @Description("Parses the specified date/time by the given format")
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ElementToArrayConcatFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ElementToArrayConcatFunction.java
index 495adc56091d..af2d5595ad87 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ElementToArrayConcatFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ElementToArrayConcatFunction.java
@@ -44,9 +44,8 @@ public class ElementToArrayConcatFunction
 
     public ElementToArrayConcatFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(FUNCTION_NAME)
                 .signature(Signature.builder()
-                        .name(FUNCTION_NAME)
                         .typeVariable("E")
                         .returnType(arrayType(new TypeSignature("E")))
                         .argumentType(new TypeSignature("E"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/EmptyMapConstructor.java b/core/trino-main/src/main/java/io/trino/operator/scalar/EmptyMapConstructor.java
index d40c6b5cabaa..b18ae7502424 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/EmptyMapConstructor.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/EmptyMapConstructor.java
@@ -13,8 +13,7 @@
  */
 package io.trino.operator.scalar;
 
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
@@ -22,22 +21,21 @@
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.Type;
 
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
+
 @Description("Creates an empty map")
 @ScalarFunction("map")
 public final class EmptyMapConstructor
 {
-    private final Block emptyMap;
+    private final SqlMap emptyMap;
 
     public EmptyMapConstructor(@TypeParameter("map(unknown,unknown)") Type mapType)
     {
-        BlockBuilder mapBlockBuilder = mapType.createBlockBuilder(null, 1);
-        mapBlockBuilder.beginBlockEntry();
-        mapBlockBuilder.closeEntry();
-        emptyMap = ((MapType) mapType).getObject(mapBlockBuilder.build(), 0);
+        emptyMap = buildMapValue(((MapType) mapType), 0, (keyBuilder, valueBuilder) -> {});
     }
 
     @SqlType("map(unknown,unknown)")
-    public Block map()
+    public SqlMap map()
     {
         return emptyMap;
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/FormatFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/FormatFunction.java
index c63d3ed1803e..0cbd49fce8b3 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/FormatFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/FormatFunction.java
@@ -19,13 +19,14 @@
 import io.trino.metadata.SqlScalarFunction;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.function.FunctionDependencies;
 import io.trino.spi.function.FunctionDependencyDeclaration;
 import io.trino.spi.function.FunctionDependencyDeclaration.FunctionDependencyDeclarationBuilder;
 import io.trino.spi.function.FunctionMetadata;
-import io.trino.spi.function.QualifiedFunctionName;
 import io.trino.spi.function.Signature;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
@@ -46,8 +47,8 @@
 import java.util.function.BiFunction;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.Streams.mapWithIndex;
 import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
@@ -70,8 +71,6 @@
 import static io.trino.type.UnknownType.UNKNOWN;
 import static io.trino.util.Failures.internalError;
 import static io.trino.util.Reflection.methodHandle;
-import static java.lang.Float.intBitsToFloat;
-import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 
 public final class FormatFunction
@@ -80,13 +79,13 @@ public final class FormatFunction
     public static final String NAME = "$format";
 
     public static final FormatFunction FORMAT_FUNCTION = new FormatFunction();
-    private static final MethodHandle METHOD_HANDLE = methodHandle(FormatFunction.class, "sqlFormat", List.class, ConnectorSession.class, Slice.class, Block.class);
+    private static final MethodHandle METHOD_HANDLE = methodHandle(FormatFunction.class, "sqlFormat", List.class, ConnectorSession.class, Slice.class, SqlRow.class);
+    private static final CatalogSchemaFunctionName JSON_FORMAT_NAME = builtinFunctionName("json_format");
 
     private FormatFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(NAME)
                 .signature(Signature.builder()
-                        .name(NAME)
                         .variadicTypeParameter("T", "row")
                         .argumentType(VARCHAR.getTypeSignature())
                         .argumentType(new TypeSignature("T"))
@@ -127,7 +126,7 @@ private static void addDependencies(FunctionDependencyDeclarationBuilder builder
         }
 
         if (type.equals(JSON)) {
-            builder.addFunction(QualifiedFunctionName.of("json_format"), ImmutableList.of(JSON));
+            builder.addFunction(JSON_FORMAT_NAME, ImmutableList.of(JSON));
             return;
         }
         builder.addCast(type, VARCHAR);
@@ -138,9 +137,8 @@ public SpecializedSqlScalarFunction specialize(BoundSignature boundSignature, Fu
     {
         Type rowType = boundSignature.getArgumentType(1);
 
-        List<BiFunction<ConnectorSession, Block, Object>> converters = mapWithIndex(
-                rowType.getTypeParameters().stream(),
-                (type, index) -> converter(functionDependencies, type, toIntExact(index)))
+        List<BiFunction<Block, Integer, Object>> converters = rowType.getTypeParameters().stream()
+                .map(type -> converter(functionDependencies, type))
                 .collect(toImmutableList());
 
         return new ChoicesSpecializedSqlScalarFunction(
@@ -151,11 +149,12 @@ public SpecializedSqlScalarFunction specialize(BoundSignature boundSignature, Fu
     }
 
     @UsedByGeneratedCode
-    public static Slice sqlFormat(List<BiFunction<ConnectorSession, Block, Object>> converters, ConnectorSession session, Slice slice, Block row)
+    public static Slice sqlFormat(List<BiFunction<Block, Integer, Object>> converters, ConnectorSession session, Slice slice, SqlRow row)
     {
+        int rawIndex = row.getRawIndex();
         Object[] args = new Object[converters.size()];
         for (int i = 0; i < args.length; i++) {
-            args[i] = converters.get(i).apply(session, row);
+            args[i] = converters.get(i).apply(row.getRawFieldBlock(i), rawIndex);
         }
 
         return sqlFormat(session, slice.toStringUtf8(), args);
@@ -172,79 +171,88 @@ private static Slice sqlFormat(ConnectorSession session, String format, Object[]
         }
     }
 
-    private static BiFunction<ConnectorSession, Block, Object> converter(FunctionDependencies functionDependencies, Type type, int position)
+    private static BiFunction<Block, Integer, Object> converter(FunctionDependencies functionDependencies, Type type)
     {
-        BiFunction<ConnectorSession, Block, Object> converter = valueConverter(functionDependencies, type, position);
-        return (session, block) -> block.isNull(position) ? null : converter.apply(session, block);
+        BiFunction<Block, Integer, Object> converter = valueConverter(functionDependencies, type);
+        return (block, position) -> block.isNull(position) ? null : converter.apply(block, position);
     }
 
-    private static BiFunction<ConnectorSession, Block, Object> valueConverter(FunctionDependencies functionDependencies, Type type, int position)
+    private static BiFunction<Block, Integer, Object> valueConverter(FunctionDependencies functionDependencies, Type type)
     {
         if (type.equals(UNKNOWN)) {
-            return (session, block) -> null;
+            return (block, position) -> null;
         }
         if (type.equals(BOOLEAN)) {
-            return (session, block) -> type.getBoolean(block, position);
+            return BOOLEAN::getBoolean;
         }
-        if (type.equals(TINYINT) || type.equals(SMALLINT) || type.equals(INTEGER) || type.equals(BIGINT)) {
-            return (session, block) -> type.getLong(block, position);
+        if (type.equals(TINYINT)) {
+            return (block, position) -> (long) TINYINT.getByte(block, position);
+        }
+        if (type.equals(SMALLINT)) {
+            return (block, position) -> (long) SMALLINT.getShort(block, position);
+        }
+        if (type.equals(INTEGER)) {
+            return (block, position) -> (long) INTEGER.getInt(block, position);
+        }
+        if (type.equals(BIGINT)) {
+            return BIGINT::getLong;
         }
         if (type.equals(REAL)) {
-            return (session, block) -> intBitsToFloat(toIntExact(type.getLong(block, position)));
+            return REAL::getFloat;
         }
         if (type.equals(DOUBLE)) {
-            return (session, block) -> type.getDouble(block, position);
+            return DOUBLE::getDouble;
         }
         if (type.equals(DATE)) {
-            return (session, block) -> LocalDate.ofEpochDay(type.getLong(block, position));
+            return (block, position) -> LocalDate.ofEpochDay(DATE.getInt(block, position));
         }
         if (type instanceof TimestampWithTimeZoneType timestampWithTimeZoneType) {
-            return (session, block) -> toZonedDateTime(timestampWithTimeZoneType, block, position);
+            return (block, position) -> toZonedDateTime(timestampWithTimeZoneType, block, position);
         }
         if (type instanceof TimestampType timestampType) {
-            return (session, block) -> toLocalDateTime(timestampType, block, position);
+            return (block, position) -> toLocalDateTime(timestampType, block, position);
         }
-        if (type instanceof TimeType) {
-            return (session, block) -> toLocalTime(type.getLong(block, position));
+        if (type instanceof TimeType timeType) {
+            return (block, position) -> toLocalTime(timeType.getLong(block, position));
         }
         // TODO: support TIME WITH TIME ZONE by https://github.com/trinodb/trino/issues/191 + mapping to java.time.OffsetTime
         if (type.equals(JSON)) {
-            MethodHandle handle = functionDependencies.getScalarFunctionImplementation(QualifiedFunctionName.of("json_format"), ImmutableList.of(JSON), simpleConvention(FAIL_ON_NULL, NEVER_NULL)).getMethodHandle();
-            return (session, block) -> convertToString(handle, type.getSlice(block, position));
+            MethodHandle handle = functionDependencies.getScalarFunctionImplementation(JSON_FORMAT_NAME, ImmutableList.of(JSON), simpleConvention(FAIL_ON_NULL, NEVER_NULL)).getMethodHandle();
+            return (block, position) -> convertToString(handle, type.getSlice(block, position));
         }
         if (type instanceof DecimalType decimalType) {
             int scale = decimalType.getScale();
             if (decimalType.isShort()) {
-                return (session, block) -> BigDecimal.valueOf(type.getLong(block, position), scale);
+                return (block, position) -> BigDecimal.valueOf(decimalType.getLong(block, position), scale);
             }
-            return (session, block) -> new BigDecimal(((Int128) type.getObject(block, position)).toBigInteger(), scale);
+            return (block, position) -> new BigDecimal(((Int128) decimalType.getObject(block, position)).toBigInteger(), scale);
         }
-        if (type instanceof VarcharType) {
-            return (session, block) -> type.getSlice(block, position).toStringUtf8();
+        if (type instanceof VarcharType varcharType) {
+            return (block, position) -> varcharType.getSlice(block, position).toStringUtf8();
         }
         if (type instanceof CharType charType) {
-            return (session, block) -> padSpaces(type.getSlice(block, position), charType).toStringUtf8();
+            return (block, position) -> padSpaces(charType.getSlice(block, position), charType).toStringUtf8();
         }
 
-        BiFunction<ConnectorSession, Block, Object> function;
+        BiFunction<Block, Integer, Object> function;
         if (type.getJavaType() == long.class) {
-            function = (session, block) -> type.getLong(block, position);
+            function = type::getLong;
         }
         else if (type.getJavaType() == double.class) {
-            function = (session, block) -> type.getDouble(block, position);
+            function = type::getDouble;
         }
         else if (type.getJavaType() == boolean.class) {
-            function = (session, block) -> type.getBoolean(block, position);
+            function = type::getBoolean;
         }
         else if (type.getJavaType() == Slice.class) {
-            function = (session, block) -> type.getSlice(block, position);
+            function = type::getSlice;
         }
         else {
-            function = (session, block) -> type.getObject(block, position);
+            function = type::getObject;
         }
 
         MethodHandle handle = functionDependencies.getCastImplementation(type, VARCHAR, simpleConvention(FAIL_ON_NULL, NEVER_NULL)).getMethodHandle();
-        return (session, block) -> convertToString(handle, function.apply(session, block));
+        return (block, position) -> convertToString(handle, function.apply(block, position));
     }
 
     private static LocalTime toLocalTime(long value)
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericComparisonUnorderedFirstOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericComparisonUnorderedFirstOperator.java
index da529a8cba97..cfd6c4d518b3 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericComparisonUnorderedFirstOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericComparisonUnorderedFirstOperator.java
@@ -35,9 +35,8 @@ public class GenericComparisonUnorderedFirstOperator
 
     public GenericComparisonUnorderedFirstOperator(TypeOperators typeOperators)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(COMPARISON_UNORDERED_FIRST)
                 .signature(Signature.builder()
-                        .operatorType(COMPARISON_UNORDERED_FIRST)
                         .orderableTypeParameter("T")
                         .returnType(INTEGER)
                         .argumentType(new TypeSignature("T"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericComparisonUnorderedLastOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericComparisonUnorderedLastOperator.java
index a520558fc8c0..d1c4f49ad5b4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericComparisonUnorderedLastOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericComparisonUnorderedLastOperator.java
@@ -35,9 +35,8 @@ public class GenericComparisonUnorderedLastOperator
 
     public GenericComparisonUnorderedLastOperator(TypeOperators typeOperators)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(COMPARISON_UNORDERED_LAST)
                 .signature(Signature.builder()
-                        .operatorType(COMPARISON_UNORDERED_LAST)
                         .orderableTypeParameter("T")
                         .returnType(INTEGER)
                         .argumentType(new TypeSignature("T"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericDistinctFromOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericDistinctFromOperator.java
index 1b142e6d7645..4614223759ee 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericDistinctFromOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericDistinctFromOperator.java
@@ -35,9 +35,8 @@ public class GenericDistinctFromOperator
 
     public GenericDistinctFromOperator(TypeOperators typeOperators)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(IS_DISTINCT_FROM)
                 .signature(Signature.builder()
-                        .operatorType(IS_DISTINCT_FROM)
                         .comparableTypeParameter("T")
                         .returnType(BOOLEAN)
                         .argumentType(new TypeSignature("T"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericEqualOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericEqualOperator.java
index ecd21fa1858c..099ca7482f3e 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericEqualOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericEqualOperator.java
@@ -35,9 +35,8 @@ public class GenericEqualOperator
 
     public GenericEqualOperator(TypeOperators typeOperators)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(EQUAL)
                 .signature(Signature.builder()
-                        .operatorType(EQUAL)
                         .comparableTypeParameter("T")
                         .returnType(BOOLEAN)
                         .argumentType(new TypeSignature("T"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericHashCodeOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericHashCodeOperator.java
index e6b5e114777c..bc66266fa8ef 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericHashCodeOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericHashCodeOperator.java
@@ -35,9 +35,8 @@ public class GenericHashCodeOperator
 
     public GenericHashCodeOperator(TypeOperators typeOperators)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(HASH_CODE)
                 .signature(Signature.builder()
-                        .operatorType(HASH_CODE)
                         .comparableTypeParameter("T")
                         .returnType(BIGINT)
                         .argumentType(new TypeSignature("T"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericIndeterminateOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericIndeterminateOperator.java
index e57b35e16e6e..ff2ad5f91618 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericIndeterminateOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericIndeterminateOperator.java
@@ -35,9 +35,8 @@ public class GenericIndeterminateOperator
 
     public GenericIndeterminateOperator(TypeOperators typeOperators)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(INDETERMINATE)
                 .signature(Signature.builder()
-                        .operatorType(INDETERMINATE)
                         .comparableTypeParameter("T")
                         .returnType(BOOLEAN)
                         .argumentType(new TypeSignature("T"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericLessThanOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericLessThanOperator.java
index 24ce2f45512e..ebf66328a281 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericLessThanOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericLessThanOperator.java
@@ -35,9 +35,8 @@ public class GenericLessThanOperator
 
     public GenericLessThanOperator(TypeOperators typeOperators)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(LESS_THAN)
                 .signature(Signature.builder()
-                        .operatorType(LESS_THAN)
                         .orderableTypeParameter("T")
                         .returnType(BOOLEAN)
                         .argumentType(new TypeSignature("T"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericLessThanOrEqualOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericLessThanOrEqualOperator.java
index 3535d0167d73..e890739c0aca 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericLessThanOrEqualOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericLessThanOrEqualOperator.java
@@ -35,9 +35,8 @@ public class GenericLessThanOrEqualOperator
 
     public GenericLessThanOrEqualOperator(TypeOperators typeOperators)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(LESS_THAN_OR_EQUAL)
                 .signature(Signature.builder()
-                        .operatorType(LESS_THAN_OR_EQUAL)
                         .orderableTypeParameter("T")
                         .returnType(BOOLEAN)
                         .argumentType(new TypeSignature("T"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericReadValueOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericReadValueOperator.java
new file mode 100644
index 000000000000..9567dc51f4a3
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericReadValueOperator.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed 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 io.trino.operator.scalar;
+
+import io.trino.metadata.SqlScalarFunction;
+import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.ScalarFunctionImplementation;
+import io.trino.spi.function.Signature;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
+import io.trino.spi.type.TypeSignature;
+
+import java.lang.invoke.MethodHandle;
+
+import static io.trino.spi.function.OperatorType.READ_VALUE;
+import static java.util.Objects.requireNonNull;
+
+public class GenericReadValueOperator
+        extends SqlScalarFunction
+{
+    private final TypeOperators typeOperators;
+
+    public GenericReadValueOperator(TypeOperators typeOperators)
+    {
+        super(FunctionMetadata.operatorBuilder(READ_VALUE)
+                .signature(Signature.builder()
+                        .typeVariable("T")
+                        .returnType(new TypeSignature("T"))
+                        .argumentType(new TypeSignature("T"))
+                        .build())
+                .build());
+        this.typeOperators = requireNonNull(typeOperators, "typeOperators is null");
+    }
+
+    @Override
+    protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
+    {
+        Type type = boundSignature.getArgumentType(0);
+        return invocationConvention -> {
+            MethodHandle methodHandle = typeOperators.getReadValueOperator(type, invocationConvention);
+            return ScalarFunctionImplementation.builder()
+                    .methodHandle(methodHandle)
+                    .build();
+        };
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericXxHash64Operator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericXxHash64Operator.java
index 5343fc5c883e..4225f8fe2cba 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericXxHash64Operator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericXxHash64Operator.java
@@ -35,9 +35,8 @@ public class GenericXxHash64Operator
 
     public GenericXxHash64Operator(TypeOperators typeOperators)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(XX_HASH_64)
                 .signature(Signature.builder()
-                        .operatorType(XX_HASH_64)
                         .comparableTypeParameter("T")
                         .returnType(BIGINT)
                         .argumentType(new TypeSignature("T"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/HmacFunctions.java b/core/trino-main/src/main/java/io/trino/operator/scalar/HmacFunctions.java
index 7c9da375a35d..8adef10025f5 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/HmacFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/HmacFunctions.java
@@ -62,13 +62,7 @@ public static Slice hmacSha512(@SqlType(StandardTypes.VARBINARY) Slice slice, @S
 
     static Slice computeHash(HashFunction hash, Slice data)
     {
-        HashCode result;
-        if (data.hasByteArray()) {
-            result = hash.hashBytes(data.byteArray(), data.byteArrayOffset(), data.length());
-        }
-        else {
-            result = hash.hashBytes(data.getBytes());
-        }
+        HashCode result = hash.hashBytes(data.byteArray(), data.byteArrayOffset(), data.length());
         return wrappedBuffer(result.asBytes());
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/IdentityCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/IdentityCast.java
index f2c600045aa4..778065cf5308 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/IdentityCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/IdentityCast.java
@@ -35,9 +35,8 @@ public class IdentityCast
 
     private IdentityCast()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(CAST)
                 .signature(Signature.builder()
-                        .operatorType(CAST)
                         .typeVariable("T")
                         .returnType(new TypeSignature("T"))
                         .argumentType(new TypeSignature("T"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/InvokeFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/InvokeFunction.java
index 6be43122c69b..5d35745da567 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/InvokeFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/InvokeFunction.java
@@ -43,9 +43,8 @@ public final class InvokeFunction
 
     private InvokeFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("invoke")
                 .signature(Signature.builder()
-                        .name("invoke")
                         .typeVariable("T")
                         .returnType(new TypeSignature("T"))
                         .argumentType(functionType(new TypeSignature("T")))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/IpAddressFunctions.java b/core/trino-main/src/main/java/io/trino/operator/scalar/IpAddressFunctions.java
index 6722ca5b0ddf..5fcd0218c5a8 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/IpAddressFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/IpAddressFunctions.java
@@ -25,12 +25,14 @@
 import java.math.BigInteger;
 import java.net.Inet4Address;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.util.regex.Pattern;
 
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 
 public final class IpAddressFunctions
 {
+    private static final Pattern IPV4_PATTERN = Pattern.compile("^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$");
+
     private IpAddressFunctions() {}
 
     @Description("Determines whether given IP address exists in the CIDR")
@@ -45,55 +47,42 @@ public static boolean contains(@SqlType(StandardTypes.VARCHAR) Slice network, @S
             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Invalid CIDR");
         }
 
-        byte[] base;
-        boolean isIpv4;
+        String cidrBase = cidr.substring(0, separator);
+        InetAddress cidrAddress;
         try {
-            InetAddress inetAddress = InetAddresses.forString(cidr.substring(0, separator));
-            base = inetAddress.getAddress();
-            isIpv4 = inetAddress instanceof Inet4Address;
+            cidrAddress = InetAddresses.forString(cidrBase);
         }
         catch (IllegalArgumentException e) {
             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Invalid network IP address");
         }
 
-        int prefixLength = Integer.parseInt(cidr.substring(separator + 1));
+        byte[] cidrBytes = toBytes(cidrAddress);
 
+        int prefixLength = Integer.parseInt(cidr.substring(separator + 1));
         if (prefixLength < 0) {
             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Invalid prefix length");
         }
 
-        int baseLength = base.length * Byte.SIZE;
-
-        if (prefixLength > baseLength) {
-            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Prefix length exceeds address length");
-        }
-
-        if (isIpv4 && !isValidIpV4Cidr(base, prefixLength)) {
-            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Invalid CIDR");
+        // We do regex match instead of instanceof Inet4Address because InetAddresses.forString() normalizes
+        // IPv4 mapped IPv6 addresses (e.g., ::ffff:0102:0304) to Inet4Address. We need to be able to
+        // distinguish between the two formats in the CIDR string to be able to interpret the prefix length correctly.
+        if (IPV4_PATTERN.matcher(cidrBase).matches()) {
+            if (!isValidIpV4Cidr(cidrBytes, 12, prefixLength)) {
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Invalid CIDR");
+            }
+            prefixLength += 96;
         }
-
-        if (!isIpv4 && !isValidIpV6Cidr(prefixLength)) {
+        else if (!isValidIpV6Cidr(prefixLength)) {
             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Invalid CIDR");
         }
 
-        byte[] ipAddress;
-        try {
-            ipAddress = InetAddress.getByAddress(address.getBytes()).getAddress();
-        }
-        catch (UnknownHostException e) {
-            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Invalid IP address");
-        }
-
-        if (base.length != ipAddress.length) {
-            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "IP address version should be the same");
-        }
-
         if (prefixLength == 0) {
             return true;
         }
 
-        BigInteger cidrPrefix = new BigInteger(base).shiftRight(baseLength - prefixLength);
-        BigInteger addressPrefix = new BigInteger(ipAddress).shiftRight(baseLength - prefixLength);
+        byte[] ipAddress = address.getBytes();
+        BigInteger cidrPrefix = new BigInteger(cidrBytes).shiftRight(cidrBytes.length * Byte.SIZE - prefixLength);
+        BigInteger addressPrefix = new BigInteger(ipAddress).shiftRight(ipAddress.length * Byte.SIZE - prefixLength);
 
         return cidrPrefix.equals(addressPrefix);
     }
@@ -103,9 +92,30 @@ private static boolean isValidIpV6Cidr(int prefixLength)
         return prefixLength >= 0 && prefixLength <= 128;
     }
 
-    private static boolean isValidIpV4Cidr(byte[] address, int prefix)
+    private static boolean isValidIpV4Cidr(byte[] address, int offset, int prefix)
     {
+        if (prefix < 0 || prefix > 32) {
+            return false;
+        }
+
         long mask = 0xFFFFFFFFL >>> prefix;
-        return (Ints.fromByteArray(address) & mask) == 0;
+        return (Ints.fromBytes(address[offset], address[offset + 1], address[offset + 2], address[offset + 3]) & mask) == 0;
+    }
+
+    private static byte[] toBytes(InetAddress address)
+    {
+        byte[] bytes = address.getAddress();
+
+        if (address instanceof Inet4Address) {
+            byte[] temp = new byte[16];
+            // IPv4 mapped addresses are encoded as ::ffff:<address>
+            temp[10] = (byte) 0xFF;
+            temp[11] = (byte) 0xFF;
+            System.arraycopy(bytes, 0, temp, 12, 4);
+
+            bytes = temp;
+        }
+
+        return bytes;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/JoniRegexpFunctions.java b/core/trino-main/src/main/java/io/trino/operator/scalar/JoniRegexpFunctions.java
index 2eabd99b2587..53f2ee83c8f2 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/JoniRegexpFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/JoniRegexpFunctions.java
@@ -55,16 +55,8 @@ private JoniRegexpFunctions() {}
     @SqlType(StandardTypes.BOOLEAN)
     public static boolean regexpLike(@SqlType("varchar(x)") Slice source, @SqlType(JoniRegexpType.NAME) JoniRegexp pattern)
     {
-        Matcher matcher;
-        int offset;
-        if (source.hasByteArray()) {
-            offset = source.byteArrayOffset();
-            matcher = pattern.regex().matcher(source.byteArray(), offset, offset + source.length());
-        }
-        else {
-            offset = 0;
-            matcher = pattern.matcher(source.getBytes());
-        }
+        int offset = source.byteArrayOffset();
+        Matcher matcher = pattern.regex().matcher(source.byteArray(), offset, offset + source.length());
         return getSearchingOffset(matcher, offset, offset + source.length()) != -1;
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/JoniRegexpReplaceLambdaFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/JoniRegexpReplaceLambdaFunction.java
index 57ec4bc86a45..51b8d11d3e03 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/JoniRegexpReplaceLambdaFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/JoniRegexpReplaceLambdaFunction.java
@@ -13,20 +13,19 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
 import io.airlift.joni.Matcher;
 import io.airlift.joni.Region;
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.LiteralParameters;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
+import io.trino.spi.type.ArrayType;
 import io.trino.sql.gen.lambda.UnaryFunctionInterface;
 import io.trino.type.JoniRegexp;
 import io.trino.type.JoniRegexpType;
@@ -39,7 +38,7 @@
 @Description("Replaces substrings matching a regular expression using a lambda function")
 public final class JoniRegexpReplaceLambdaFunction
 {
-    private final PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(VARCHAR));
+    private final BufferedArrayValueBuilder arrayValueBuilder = BufferedArrayValueBuilder.createBuffered(new ArrayType(VARCHAR));
 
     @LiteralParameters("x")
     @SqlType("varchar")
@@ -57,13 +56,6 @@ public Slice regexpReplace(
 
         SliceOutput output = new DynamicSliceOutput(source.length());
 
-        // Prepare a BlockBuilder that will be used to create the target block
-        // that will be passed to the lambda function.
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-
         int groupCount = pattern.regex().numberOfCaptures();
         int appendPosition = 0;
         int nextStart;
@@ -90,17 +82,17 @@ public Slice regexpReplace(
 
             // Append the capturing groups to the target block that will be passed to lambda
             Region matchedRegion = matcher.getEagerRegion();
-            for (int i = 1; i <= groupCount; i++) {
-                // Add to the block builder if the matched region is not null. In Joni null is represented as [-1, -1]
-                if (matchedRegion.beg[i] >= 0 && matchedRegion.end[i] >= 0) {
-                    VARCHAR.writeSlice(blockBuilder, source, matchedRegion.beg[i], matchedRegion.end[i] - matchedRegion.beg[i]);
+            Block target = arrayValueBuilder.build(groupCount, elementBuilder -> {
+                for (int i = 1; i <= groupCount; i++) {
+                    // Add to the block builder if the matched region is not null. In Joni null is represented as [-1, -1]
+                    if (matchedRegion.beg[i] >= 0 && matchedRegion.end[i] >= 0) {
+                        VARCHAR.writeSlice(elementBuilder, source, matchedRegion.beg[i], matchedRegion.end[i] - matchedRegion.beg[i]);
+                    }
+                    else {
+                        elementBuilder.appendNull();
+                    }
                 }
-                else {
-                    blockBuilder.appendNull();
-                }
-            }
-            pageBuilder.declarePositions(groupCount);
-            Block target = blockBuilder.getRegion(blockBuilder.getPositionCount() - groupCount, groupCount);
+            });
 
             // Call the lambda function to replace the block, and append the result to output
             Slice replaced = (Slice) replaceFunction.apply(target);
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonExtract.java b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonExtract.java
index b65e12129007..7aa3d1885f30 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonExtract.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonExtract.java
@@ -14,7 +14,6 @@
 package io.trino.operator.scalar;
 
 import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
@@ -36,6 +35,7 @@
 import static com.fasterxml.jackson.core.JsonToken.START_OBJECT;
 import static com.fasterxml.jackson.core.JsonToken.VALUE_NULL;
 import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.plugin.base.util.JsonUtils.jsonFactoryBuilder;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.util.JsonUtil.createJsonGenerator;
 import static io.trino.util.JsonUtil.createJsonParser;
@@ -118,7 +118,7 @@ public final class JsonExtract
 {
     private static final int ESTIMATED_JSON_OUTPUT_SIZE = 512;
 
-    private static final JsonFactory JSON_FACTORY = new JsonFactoryBuilder()
+    private static final JsonFactory JSON_FACTORY = jsonFactoryBuilder()
             .disable(CANONICALIZE_FIELD_NAMES)
             .build();
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonFunctions.java b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonFunctions.java
index 0e33c6b9e205..0bcda5aa9254 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonFunctions.java
@@ -14,7 +14,6 @@
 package io.trino.operator.scalar;
 
 import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.MappingJsonFactory;
@@ -47,6 +46,7 @@
 import static com.fasterxml.jackson.core.JsonToken.VALUE_STRING;
 import static com.fasterxml.jackson.core.JsonToken.VALUE_TRUE;
 import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.plugin.base.util.JsonUtils.jsonFactoryBuilder;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.type.Chars.padSpaces;
 import static io.trino.util.JsonUtil.createJsonParser;
@@ -54,7 +54,7 @@
 
 public final class JsonFunctions
 {
-    private static final JsonFactory JSON_FACTORY = new JsonFactoryBuilder()
+    private static final JsonFactory JSON_FACTORY = jsonFactoryBuilder()
             .disable(CANONICALIZE_FIELD_NAMES)
             .build();
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonOperators.java b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonOperators.java
index da44bc1e5e1b..a513c09478d5 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonOperators.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonOperators.java
@@ -14,7 +14,6 @@
 package io.trino.operator.scalar;
 
 import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import io.airlift.slice.DynamicSliceOutput;
@@ -30,7 +29,6 @@
 
 import java.io.IOException;
 
-import static com.fasterxml.jackson.core.JsonFactory.Feature.CANONICALIZE_FIELD_NAMES;
 import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
 import static io.trino.spi.StandardErrorCode.NUMERIC_VALUE_OUT_OF_RANGE;
 import static io.trino.spi.function.OperatorType.CAST;
@@ -46,6 +44,7 @@
 import static io.trino.spi.type.StandardTypes.VARCHAR;
 import static io.trino.util.DateTimeUtils.printDate;
 import static io.trino.util.Failures.checkCondition;
+import static io.trino.util.JsonUtil.createJsonFactory;
 import static io.trino.util.JsonUtil.createJsonGenerator;
 import static io.trino.util.JsonUtil.createJsonParser;
 import static io.trino.util.JsonUtil.currentTokenAsBigint;
@@ -61,7 +60,7 @@
 
 public final class JsonOperators
 {
-    public static final JsonFactory JSON_FACTORY = new JsonFactoryBuilder().disable(CANONICALIZE_FIELD_NAMES).build();
+    private static final JsonFactory JSON_FACTORY = createJsonFactory();
 
     private JsonOperators()
     {
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonStringToArrayCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonStringToArrayCast.java
index 14cb658660b5..625d5d146b60 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonStringToArrayCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonStringToArrayCast.java
@@ -31,9 +31,8 @@ public final class JsonStringToArrayCast
 
     private JsonStringToArrayCast()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(JSON_STRING_TO_ARRAY_NAME)
                 .signature(Signature.builder()
-                        .name(JSON_STRING_TO_ARRAY_NAME)
                         .typeVariable("T")
                         .returnType(arrayType(new TypeSignature("T")))
                         .argumentType(VARCHAR)
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonStringToMapCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonStringToMapCast.java
index 0cc8d99181ca..60ade35810fb 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonStringToMapCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonStringToMapCast.java
@@ -31,9 +31,8 @@ public final class JsonStringToMapCast
 
     private JsonStringToMapCast()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(JSON_STRING_TO_MAP_NAME)
                 .signature(Signature.builder()
-                        .name(JSON_STRING_TO_MAP_NAME)
                         .comparableTypeParameter("K")
                         .typeVariable("V")
                         .returnType(mapType(new TypeSignature("K"), new TypeSignature("V")))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonStringToRowCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonStringToRowCast.java
index 45131229a6f7..20a323223fcd 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonStringToRowCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonStringToRowCast.java
@@ -30,9 +30,8 @@ public final class JsonStringToRowCast
 
     private JsonStringToRowCast()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(JSON_STRING_TO_ROW_NAME)
                 .signature(Signature.builder()
-                        .name(JSON_STRING_TO_ROW_NAME)
                         .variadicTypeParameter("T", "row")
                         .returnType(new TypeSignature("T"))
                         .argumentType(VARCHAR)
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonToArrayCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonToArrayCast.java
index 7c69e63d9431..2e940d2f79bc 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonToArrayCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonToArrayCast.java
@@ -13,8 +13,10 @@
  */
 package io.trino.operator.scalar;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slice;
 import io.trino.annotation.UsedByGeneratedCode;
@@ -41,8 +43,8 @@
 import static io.trino.spi.type.TypeSignature.arrayType;
 import static io.trino.type.JsonType.JSON;
 import static io.trino.util.Failures.checkCondition;
-import static io.trino.util.JsonUtil.JSON_FACTORY;
 import static io.trino.util.JsonUtil.canCastFromJson;
+import static io.trino.util.JsonUtil.createJsonFactory;
 import static io.trino.util.JsonUtil.createJsonParser;
 import static io.trino.util.JsonUtil.truncateIfNecessaryForErrorMessage;
 import static io.trino.util.Reflection.methodHandle;
@@ -54,11 +56,17 @@ public class JsonToArrayCast
     public static final JsonToArrayCast JSON_TO_ARRAY = new JsonToArrayCast();
     private static final MethodHandle METHOD_HANDLE = methodHandle(JsonToArrayCast.class, "toArray", ArrayType.class, BlockBuilderAppender.class, ConnectorSession.class, Slice.class);
 
+    private static final JsonFactory JSON_FACTORY = createJsonFactory();
+
+    static {
+        // Changes factory. Necessary for JsonParser.readValueAsTree to work.
+        new ObjectMapper(JSON_FACTORY);
+    }
+
     private JsonToArrayCast()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(CAST)
                 .signature(Signature.builder()
-                        .operatorType(CAST)
                         .castableFromTypeParameter("T", JSON.getTypeSignature())
                         .returnType(arrayType(new TypeSignature("T")))
                         .argumentType(JSON)
@@ -97,7 +105,8 @@ public static Block toArray(ArrayType arrayType, BlockBuilderAppender arrayAppen
             if (jsonParser.nextToken() != null) {
                 throw new JsonCastException(format("Unexpected trailing token: %s", jsonParser.getText()));
             }
-            return arrayType.getObject(blockBuilder, blockBuilder.getPositionCount() - 1);
+            Block block = blockBuilder.build();
+            return arrayType.getObject(block, 0);
         }
         catch (TrinoException | JsonCastException e) {
             throw new TrinoException(INVALID_CAST_ARGUMENT, format("Cannot cast to %s. %s\n%s", arrayType, e.getMessage(), truncateIfNecessaryForErrorMessage(json)), e);
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonToMapCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonToMapCast.java
index db8898fc6d60..d69d10a3794d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonToMapCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonToMapCast.java
@@ -13,8 +13,10 @@
  */
 package io.trino.operator.scalar;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slice;
 import io.trino.annotation.UsedByGeneratedCode;
@@ -22,6 +24,7 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
@@ -43,8 +46,8 @@
 import static io.trino.type.JsonType.JSON;
 import static io.trino.util.Failures.checkCondition;
 import static io.trino.util.JsonUtil.BlockBuilderAppender.createBlockBuilderAppender;
-import static io.trino.util.JsonUtil.JSON_FACTORY;
 import static io.trino.util.JsonUtil.canCastFromJson;
+import static io.trino.util.JsonUtil.createJsonFactory;
 import static io.trino.util.JsonUtil.createJsonParser;
 import static io.trino.util.JsonUtil.truncateIfNecessaryForErrorMessage;
 import static io.trino.util.Reflection.methodHandle;
@@ -56,11 +59,17 @@ public class JsonToMapCast
     public static final JsonToMapCast JSON_TO_MAP = new JsonToMapCast();
     private static final MethodHandle METHOD_HANDLE = methodHandle(JsonToMapCast.class, "toMap", MapType.class, BlockBuilderAppender.class, ConnectorSession.class, Slice.class);
 
+    private static final JsonFactory JSON_FACTORY = createJsonFactory();
+
+    static {
+        // Changes factory. Necessary for JsonParser.readValueAsTree to work.
+        new ObjectMapper(JSON_FACTORY);
+    }
+
     private JsonToMapCast()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(CAST)
                 .signature(Signature.builder()
-                        .operatorType(CAST)
                         .castableFromTypeParameter("K", VARCHAR.getTypeSignature())
                         .castableFromTypeParameter("V", JSON.getTypeSignature())
                         .returnType(mapType(new TypeSignature("K"), new TypeSignature("V")))
@@ -87,7 +96,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
     }
 
     @UsedByGeneratedCode
-    public static Block toMap(MapType mapType, BlockBuilderAppender mapAppender, ConnectorSession connectorSession, Slice json)
+    public static SqlMap toMap(MapType mapType, BlockBuilderAppender mapAppender, ConnectorSession connectorSession, Slice json)
     {
         try (JsonParser jsonParser = createJsonParser(JSON_FACTORY, json)) {
             jsonParser.nextToken();
@@ -100,7 +109,8 @@ public static Block toMap(MapType mapType, BlockBuilderAppender mapAppender, Con
             if (jsonParser.nextToken() != null) {
                 throw new JsonCastException(format("Unexpected trailing token: %s", jsonParser.getText()));
             }
-            return mapType.getObject(blockBuilder, blockBuilder.getPositionCount() - 1);
+            Block block = blockBuilder.build();
+            return mapType.getObject(block, 0);
         }
         catch (TrinoException | JsonCastException e) {
             throw new TrinoException(INVALID_CAST_ARGUMENT, format("Cannot cast to %s. %s\n%s", mapType, e.getMessage(), truncateIfNecessaryForErrorMessage(json)), e);
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonToRowCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonToRowCast.java
index b4cd9d809fa7..81de2460a155 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/JsonToRowCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/JsonToRowCast.java
@@ -13,8 +13,10 @@
  */
 package io.trino.operator.scalar;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slice;
 import io.trino.annotation.UsedByGeneratedCode;
@@ -22,6 +24,7 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
@@ -41,8 +44,8 @@
 import static io.trino.type.JsonType.JSON;
 import static io.trino.util.Failures.checkCondition;
 import static io.trino.util.JsonUtil.BlockBuilderAppender.createBlockBuilderAppender;
-import static io.trino.util.JsonUtil.JSON_FACTORY;
 import static io.trino.util.JsonUtil.canCastFromJson;
+import static io.trino.util.JsonUtil.createJsonFactory;
 import static io.trino.util.JsonUtil.createJsonParser;
 import static io.trino.util.JsonUtil.truncateIfNecessaryForErrorMessage;
 import static io.trino.util.Reflection.methodHandle;
@@ -54,11 +57,17 @@ public class JsonToRowCast
     public static final JsonToRowCast JSON_TO_ROW = new JsonToRowCast();
     private static final MethodHandle METHOD_HANDLE = methodHandle(JsonToRowCast.class, "toRow", RowType.class, BlockBuilderAppender.class, ConnectorSession.class, Slice.class);
 
+    private static final JsonFactory JSON_FACTORY = createJsonFactory();
+
+    static {
+        // Changes factory. Necessary for JsonParser.readValueAsTree to work.
+        new ObjectMapper(JSON_FACTORY);
+    }
+
     private JsonToRowCast()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(CAST)
                 .signature(Signature.builder()
-                        .operatorType(CAST)
                         .typeVariableConstraint(
                                 // this is technically a recursive constraint for cast, but TypeRegistry.canCast has explicit handling for json to row cast
                                 TypeVariableConstraint.builder("T")
@@ -88,7 +97,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
     }
 
     @UsedByGeneratedCode
-    public static Block toRow(
+    public static SqlRow toRow(
             RowType rowType,
             BlockBuilderAppender rowAppender,
             ConnectorSession connectorSession,
@@ -100,12 +109,13 @@ public static Block toRow(
                 return null;
             }
 
-            BlockBuilder rowBlockBuilder = rowType.createBlockBuilder(null, 1);
-            rowAppender.append(jsonParser, rowBlockBuilder);
+            BlockBuilder blockBuilder = rowType.createBlockBuilder(null, 1);
+            rowAppender.append(jsonParser, blockBuilder);
             if (jsonParser.nextToken() != null) {
                 throw new JsonCastException(format("Unexpected trailing token: %s", jsonParser.getText()));
             }
-            return rowType.getObject(rowBlockBuilder, 0);
+            Block block = blockBuilder.build();
+            return rowType.getObject(block, 0);
         }
         catch (TrinoException | JsonCastException e) {
             throw new TrinoException(INVALID_CAST_ARGUMENT, format("Cannot cast to %s. %s\n%s", rowType, e.getMessage(), truncateIfNecessaryForErrorMessage(json)), e);
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapCardinalityFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapCardinalityFunction.java
index 686038866dd5..86b58f4b7e7f 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapCardinalityFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapCardinalityFunction.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.scalar;
 
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
@@ -29,8 +29,8 @@ private MapCardinalityFunction() {}
     @TypeParameter("K")
     @TypeParameter("V")
     @SqlType(StandardTypes.BIGINT)
-    public static long mapCardinality(@SqlType("map(K,V)") Block block)
+    public static long mapCardinality(@SqlType("map(K,V)") SqlMap sqlMap)
     {
-        return block.getPositionCount() / 2;
+        return sqlMap.getSize();
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapConcatFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapConcatFunction.java
index fc8744523208..35b5e780b720 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapConcatFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapConcatFunction.java
@@ -13,14 +13,13 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
-import io.trino.operator.aggregation.TypedSet;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedMapValueBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
@@ -36,7 +35,6 @@
 import java.lang.invoke.MethodHandles;
 import java.util.Optional;
 
-import static io.trino.operator.aggregation.TypedSet.createDistinctTypedSet;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
@@ -61,15 +59,14 @@ public final class MapConcatFunction
             BlockPositionIsDistinctFrom.class,
             BlockPositionHashCode.class,
             Object.class,
-            Block[].class);
+            SqlMap[].class);
 
     private final BlockTypeOperators blockTypeOperators;
 
     public MapConcatFunction(BlockTypeOperators blockTypeOperators)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(FUNCTION_NAME)
                 .signature(Signature.builder()
-                        .name(FUNCTION_NAME)
                         .typeVariable("K")
                         .typeVariable("V")
                         .returnType(mapType(new TypeSignature("K"), new TypeSignature("V")))
@@ -94,8 +91,8 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
         BlockPositionHashCode keyHashCode = blockTypeOperators.getHashCodeOperator(keyType);
 
         MethodHandleAndConstructor methodHandleAndConstructor = generateVarArgsToArrayAdapter(
-                Block.class,
-                Block.class,
+                SqlMap.class,
+                SqlMap.class,
                 boundSignature.getArity(),
                 MethodHandles.insertArguments(METHOD_HANDLE, 0, mapType, keysDistinctOperator, keyHashCode),
                 USER_STATE_FACTORY.bindTo(mapType));
@@ -111,18 +108,19 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
     @UsedByGeneratedCode
     public static Object createMapState(MapType mapType)
     {
-        return new PageBuilder(ImmutableList.of(mapType));
+        return BufferedMapValueBuilder.createBuffered(mapType);
     }
 
     @UsedByGeneratedCode
-    public static Block mapConcat(MapType mapType, BlockPositionIsDistinctFrom keysDistinctOperator, BlockPositionHashCode keyHashCode, Object state, Block[] maps)
+    public static SqlMap mapConcat(MapType mapType, BlockPositionIsDistinctFrom keysDistinctOperator, BlockPositionHashCode keyHashCode, Object state, SqlMap[] maps)
     {
-        int entries = 0;
+        int maxEntries = 0;
         int lastMapIndex = maps.length - 1;
         int firstMapIndex = lastMapIndex;
         for (int i = 0; i < maps.length; i++) {
-            entries += maps[i].getPositionCount();
-            if (maps[i].getPositionCount() > 0) {
+            int size = maps[i].getSize();
+            if (size > 0) {
+                maxEntries += size;
                 lastMapIndex = i;
                 firstMapIndex = min(firstMapIndex, i);
             }
@@ -130,47 +128,54 @@ public static Block mapConcat(MapType mapType, BlockPositionIsDistinctFrom keysD
         if (lastMapIndex == firstMapIndex) {
             return maps[lastMapIndex];
         }
+        int last = lastMapIndex;
+        int first = firstMapIndex;
 
-        PageBuilder pageBuilder = (PageBuilder) state;
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
+        BufferedMapValueBuilder mapValueBuilder = (BufferedMapValueBuilder) state;
 
-        // TODO: we should move TypedSet into user state as well
         Type keyType = mapType.getKeyType();
         Type valueType = mapType.getValueType();
-        TypedSet typedSet = createDistinctTypedSet(keyType, keysDistinctOperator, keyHashCode, entries / 2, FUNCTION_NAME);
-        BlockBuilder mapBlockBuilder = pageBuilder.getBlockBuilder(0);
-        BlockBuilder blockBuilder = mapBlockBuilder.beginBlockEntry();
-
-        // the last map
-        Block map = maps[lastMapIndex];
-        for (int i = 0; i < map.getPositionCount(); i += 2) {
-            typedSet.add(map, i);
-            keyType.appendTo(map, i, blockBuilder);
-            valueType.appendTo(map, i + 1, blockBuilder);
-        }
-        // the map between the last and the first
-        for (int idx = lastMapIndex - 1; idx > firstMapIndex; idx--) {
-            map = maps[idx];
-            for (int i = 0; i < map.getPositionCount(); i += 2) {
-                if (typedSet.add(map, i)) {
-                    keyType.appendTo(map, i, blockBuilder);
-                    valueType.appendTo(map, i + 1, blockBuilder);
+        BlockSet set = new BlockSet(keyType, keysDistinctOperator, keyHashCode, maxEntries);
+        return mapValueBuilder.build(maxEntries, (keyBuilder, valueBuilder) -> {
+            // the last map
+            SqlMap map = maps[last];
+            int rawOffset = map.getRawOffset();
+            Block rawKeyBlock = map.getRawKeyBlock();
+            Block rawValueBlock = map.getRawValueBlock();
+            for (int i = 0; i < map.getSize(); i++) {
+                set.add(rawKeyBlock, rawOffset + i);
+                writeEntry(keyType, valueType, keyBuilder, valueBuilder, rawKeyBlock, rawValueBlock, rawOffset + i);
+            }
+
+            // the map between the last and the first
+            for (int idx = last - 1; idx > first; idx--) {
+                map = maps[idx];
+                rawOffset = map.getRawOffset();
+                rawKeyBlock = map.getRawKeyBlock();
+                rawValueBlock = map.getRawValueBlock();
+                for (int i = 0; i < map.getSize(); i++) {
+                    if (set.add(rawKeyBlock, rawOffset + i)) {
+                        writeEntry(keyType, valueType, keyBuilder, valueBuilder, rawKeyBlock, rawValueBlock, rawOffset + i);
+                    }
                 }
             }
-        }
-        // the first map
-        map = maps[firstMapIndex];
-        for (int i = 0; i < map.getPositionCount(); i += 2) {
-            if (!typedSet.contains(map, i)) {
-                keyType.appendTo(map, i, blockBuilder);
-                valueType.appendTo(map, i + 1, blockBuilder);
+
+            // the first map
+            map = maps[first];
+            rawOffset = map.getRawOffset();
+            rawKeyBlock = map.getRawKeyBlock();
+            rawValueBlock = map.getRawValueBlock();
+            for (int i = 0; i < map.getSize(); i++) {
+                if (!set.contains(rawKeyBlock, rawOffset + i)) {
+                    writeEntry(keyType, valueType, keyBuilder, valueBuilder, rawKeyBlock, rawValueBlock, rawOffset + i);
+                }
             }
-        }
+        });
+    }
 
-        mapBlockBuilder.closeEntry();
-        pageBuilder.declarePosition();
-        return mapType.getObject(mapBlockBuilder, mapBlockBuilder.getPositionCount() - 1);
+    private static void writeEntry(Type keyType, Type valueType, BlockBuilder keyBuilder, BlockBuilder valueBuilder, Block rawKeyBlock, Block rawValueBlock, int rawIndex)
+    {
+        keyType.appendTo(rawKeyBlock, rawIndex, keyBuilder);
+        valueType.appendTo(rawValueBlock, rawIndex, valueBuilder);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapConstructor.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapConstructor.java
index 2f522a9da9d8..593c3146dba1 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapConstructor.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapConstructor.java
@@ -16,12 +16,11 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedMapValueBuilder;
 import io.trino.spi.block.DuplicateMapKeyException;
-import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionDependencies;
@@ -35,6 +34,8 @@
 import java.util.Optional;
 
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
+import static io.trino.spi.block.MapHashTables.HashBuildMode.STRICT_NOT_DISTINCT_FROM;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
@@ -43,7 +44,6 @@
 import static io.trino.spi.function.OperatorType.INDETERMINATE;
 import static io.trino.spi.type.TypeSignature.arrayType;
 import static io.trino.spi.type.TypeSignature.mapType;
-import static io.trino.spi.type.TypeUtils.readNativeValue;
 import static io.trino.util.Failures.checkCondition;
 import static io.trino.util.Failures.internalError;
 import static io.trino.util.Reflection.constructorMethodHandle;
@@ -68,9 +68,8 @@ public final class MapConstructor
 
     public MapConstructor()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("map")
                 .signature(Signature.builder()
-                        .name("map")
                         .comparableTypeParameter("K")
                         .typeVariable("V")
                         .returnType(mapType(new TypeSignature("K"), new TypeSignature("V")))
@@ -98,19 +97,20 @@ public SpecializedSqlScalarFunction specialize(BoundSignature boundSignature, Fu
         MethodHandle keyIndeterminate = functionDependencies.getOperatorImplementation(
                 INDETERMINATE,
                 ImmutableList.of(mapType.getKeyType()),
-                simpleConvention(FAIL_ON_NULL, NEVER_NULL)).getMethodHandle();
+                simpleConvention(FAIL_ON_NULL, BLOCK_POSITION)).getMethodHandle();
         MethodHandle instanceFactory = constructorMethodHandle(State.class, MapType.class).bindTo(mapType);
 
+        MethodHandle methodHandle = METHOD_HANDLE.bindTo(mapType).bindTo(keyIndeterminate);
         return new ChoicesSpecializedSqlScalarFunction(
                 boundSignature,
                 FAIL_ON_NULL,
                 ImmutableList.of(NEVER_NULL, NEVER_NULL),
-                METHOD_HANDLE.bindTo(mapType).bindTo(keyIndeterminate),
+                methodHandle,
                 Optional.of(instanceFactory));
     }
 
     @UsedByGeneratedCode
-    public static Block createMap(
+    public static SqlMap createMap(
             MapType mapType,
             MethodHandle keyIndeterminate,
             State state,
@@ -119,59 +119,40 @@ public static Block createMap(
             Block valueBlock)
     {
         checkCondition(keyBlock.getPositionCount() == valueBlock.getPositionCount(), INVALID_FUNCTION_ARGUMENT, "Key and value arrays must be the same length");
-        PageBuilder pageBuilder = state.getPageBuilder();
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
-        MapBlockBuilder mapBlockBuilder = (MapBlockBuilder) pageBuilder.getBlockBuilder(0);
-        mapBlockBuilder.strict();
-        BlockBuilder blockBuilder = mapBlockBuilder.beginBlockEntry();
         for (int i = 0; i < keyBlock.getPositionCount(); i++) {
             if (keyBlock.isNull(i)) {
-                // close block builder before throwing as we may be in a TRY() call
-                // so that subsequent calls do not find it in an inconsistent state
-                mapBlockBuilder.closeEntry();
                 throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "map key cannot be null");
             }
-            Object keyObject = readNativeValue(mapType.getKeyType(), keyBlock, i);
             try {
-                if ((boolean) keyIndeterminate.invoke(keyObject)) {
+                if ((boolean) keyIndeterminate.invoke(keyBlock, i)) {
                     throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "map key cannot be indeterminate: " + mapType.getKeyType().getObjectValue(session, keyBlock, i));
                 }
             }
             catch (Throwable t) {
-                mapBlockBuilder.closeEntry();
                 throw internalError(t);
             }
-            mapType.getKeyType().appendTo(keyBlock, i, blockBuilder);
-            mapType.getValueType().appendTo(valueBlock, i, blockBuilder);
         }
+
         try {
-            mapBlockBuilder.closeEntry();
+            return new SqlMap(mapType, STRICT_NOT_DISTINCT_FROM, keyBlock, valueBlock);
         }
         catch (DuplicateMapKeyException e) {
             throw e.withDetailedMessage(mapType.getKeyType(), session);
         }
-        finally {
-            pageBuilder.declarePosition();
-        }
-
-        return mapType.getObject(mapBlockBuilder, mapBlockBuilder.getPositionCount() - 1);
     }
 
     public static final class State
     {
-        private final PageBuilder pageBuilder;
+        private final BufferedMapValueBuilder mapValueBuilder;
 
         public State(MapType mapType)
         {
-            pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+            mapValueBuilder = BufferedMapValueBuilder.createBufferedStrict(mapType);
         }
 
-        public PageBuilder getPageBuilder()
+        public BufferedMapValueBuilder getMapValueBuilder()
         {
-            return pageBuilder;
+            return mapValueBuilder;
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapElementAtFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapElementAtFunction.java
index df0acca55dec..24573e3eb58c 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapElementAtFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapElementAtFunction.java
@@ -17,8 +17,7 @@
 import com.google.common.primitives.Primitives;
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.SingleMapBlock;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionDependencies;
 import io.trino.spi.function.FunctionDependencyDeclaration;
@@ -42,16 +41,15 @@ public class MapElementAtFunction
 {
     public static final MapElementAtFunction MAP_ELEMENT_AT = new MapElementAtFunction();
 
-    private static final MethodHandle METHOD_HANDLE_BOOLEAN = methodHandle(MapElementAtFunction.class, "elementAt", Type.class, Block.class, boolean.class);
-    private static final MethodHandle METHOD_HANDLE_LONG = methodHandle(MapElementAtFunction.class, "elementAt", Type.class, Block.class, long.class);
-    private static final MethodHandle METHOD_HANDLE_DOUBLE = methodHandle(MapElementAtFunction.class, "elementAt", Type.class, Block.class, double.class);
-    private static final MethodHandle METHOD_HANDLE_OBJECT = methodHandle(MapElementAtFunction.class, "elementAt", Type.class, Block.class, Object.class);
+    private static final MethodHandle METHOD_HANDLE_BOOLEAN = methodHandle(MapElementAtFunction.class, "elementAt", Type.class, SqlMap.class, boolean.class);
+    private static final MethodHandle METHOD_HANDLE_LONG = methodHandle(MapElementAtFunction.class, "elementAt", Type.class, SqlMap.class, long.class);
+    private static final MethodHandle METHOD_HANDLE_DOUBLE = methodHandle(MapElementAtFunction.class, "elementAt", Type.class, SqlMap.class, double.class);
+    private static final MethodHandle METHOD_HANDLE_OBJECT = methodHandle(MapElementAtFunction.class, "elementAt", Type.class, SqlMap.class, Object.class);
 
     protected MapElementAtFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("element_at")
                 .signature(Signature.builder()
-                        .name("element_at")
                         .typeVariable("K")
                         .typeVariable("V")
                         .returnType(new TypeSignature("V"))
@@ -102,46 +100,42 @@ else if (keyType.getJavaType() == double.class) {
     }
 
     @UsedByGeneratedCode
-    public static Object elementAt(Type valueType, Block map, boolean key)
+    public static Object elementAt(Type valueType, SqlMap sqlMap, boolean key)
     {
-        SingleMapBlock mapBlock = (SingleMapBlock) map;
-        int valuePosition = mapBlock.seekKeyExact(key);
-        if (valuePosition == -1) {
+        int index = sqlMap.seekKeyExact(key);
+        if (index == -1) {
             return null;
         }
-        return readNativeValue(valueType, mapBlock, valuePosition);
+        return readNativeValue(valueType, sqlMap.getRawValueBlock(), sqlMap.getRawOffset() + index);
     }
 
     @UsedByGeneratedCode
-    public static Object elementAt(Type valueType, Block map, long key)
+    public static Object elementAt(Type valueType, SqlMap sqlMap, long key)
     {
-        SingleMapBlock mapBlock = (SingleMapBlock) map;
-        int valuePosition = mapBlock.seekKeyExact(key);
-        if (valuePosition == -1) {
+        int index = sqlMap.seekKeyExact(key);
+        if (index == -1) {
             return null;
         }
-        return readNativeValue(valueType, mapBlock, valuePosition);
+        return readNativeValue(valueType, sqlMap.getRawValueBlock(), sqlMap.getRawOffset() + index);
     }
 
     @UsedByGeneratedCode
-    public static Object elementAt(Type valueType, Block map, double key)
+    public static Object elementAt(Type valueType, SqlMap sqlMap, double key)
     {
-        SingleMapBlock mapBlock = (SingleMapBlock) map;
-        int valuePosition = mapBlock.seekKeyExact(key);
-        if (valuePosition == -1) {
+        int index = sqlMap.seekKeyExact(key);
+        if (index == -1) {
             return null;
         }
-        return readNativeValue(valueType, mapBlock, valuePosition);
+        return readNativeValue(valueType, sqlMap.getRawValueBlock(), sqlMap.getRawOffset() + index);
     }
 
     @UsedByGeneratedCode
-    public static Object elementAt(Type valueType, Block map, Object key)
+    public static Object elementAt(Type valueType, SqlMap sqlMap, Object key)
     {
-        SingleMapBlock mapBlock = (SingleMapBlock) map;
-        int valuePosition = mapBlock.seekKeyExact(key);
-        if (valuePosition == -1) {
+        int index = sqlMap.seekKeyExact(key);
+        if (index == -1) {
             return null;
         }
-        return readNativeValue(valueType, mapBlock, valuePosition);
+        return readNativeValue(valueType, sqlMap.getRawValueBlock(), sqlMap.getRawOffset() + index);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapEntriesFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapEntriesFunction.java
index 46281427fd76..e1a1272b9f11 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapEntriesFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapEntriesFunction.java
@@ -13,10 +13,10 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
@@ -31,13 +31,13 @@
 @Description("Construct an array of entries from a given map")
 public class MapEntriesFunction
 {
-    private final PageBuilder pageBuilder;
+    private final BufferedArrayValueBuilder arrayValueBuilder;
 
     @TypeParameter("K")
     @TypeParameter("V")
     public MapEntriesFunction(@TypeParameter("array(row(K,V))") Type arrayType)
     {
-        pageBuilder = new PageBuilder(ImmutableList.of(arrayType));
+        arrayValueBuilder = BufferedArrayValueBuilder.createBuffered((ArrayType) arrayType);
     }
 
     @TypeParameter("K")
@@ -45,31 +45,26 @@ public MapEntriesFunction(@TypeParameter("array(row(K,V))") Type arrayType)
     @SqlType("array(row(K,V))")
     public Block mapFromEntries(
             @TypeParameter("row(K,V)") RowType rowType,
-            @SqlType("map(K,V)") Block block)
+            @SqlType("map(K,V)") SqlMap sqlMap)
     {
         verify(rowType.getTypeParameters().size() == 2);
-        verify(block.getPositionCount() % 2 == 0);
 
         Type keyType = rowType.getTypeParameters().get(0);
         Type valueType = rowType.getTypeParameters().get(1);
-        ArrayType arrayType = new ArrayType(rowType);
 
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
+        int size = sqlMap.getSize();
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
 
-        int entryCount = block.getPositionCount() / 2;
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-        BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-        for (int i = 0; i < entryCount; i++) {
-            BlockBuilder rowBuilder = entryBuilder.beginBlockEntry();
-            keyType.appendTo(block, 2 * i, rowBuilder);
-            valueType.appendTo(block, 2 * i + 1, rowBuilder);
-            entryBuilder.closeEntry();
-        }
-
-        blockBuilder.closeEntry();
-        pageBuilder.declarePosition();
-        return arrayType.getObject(blockBuilder, blockBuilder.getPositionCount() - 1);
+        return arrayValueBuilder.build(size, valueBuilder -> {
+            for (int i = 0; i < size; i++) {
+                int offset = rawOffset + i;
+                ((RowBlockBuilder) valueBuilder).buildEntry(fieldBuilders -> {
+                    keyType.appendTo(rawKeyBlock, offset, fieldBuilders.get(0));
+                    valueType.appendTo(rawValueBlock, offset, fieldBuilders.get(1));
+                });
+            }
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapFilterFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapFilterFunction.java
index 88a2095ae2fd..86eea769d592 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapFilterFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapFilterFunction.java
@@ -24,11 +24,14 @@
 import io.airlift.bytecode.Variable;
 import io.airlift.bytecode.control.ForLoop;
 import io.airlift.bytecode.control.IfStatement;
+import io.airlift.bytecode.expression.BytecodeExpression;
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedMapValueBuilder;
+import io.trino.spi.block.MapValueBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
@@ -55,14 +58,13 @@
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantNull;
 import static io.airlift.bytecode.expression.BytecodeExpressions.lessThan;
 import static io.airlift.bytecode.expression.BytecodeExpressions.notEqual;
-import static io.airlift.bytecode.expression.BytecodeExpressions.subtract;
-import static io.airlift.bytecode.instruction.VariableInstruction.incrementVariable;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FUNCTION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.TypeSignature.functionType;
 import static io.trino.spi.type.TypeSignature.mapType;
+import static io.trino.sql.gen.LambdaMetafactoryGenerator.generateMetafactory;
 import static io.trino.sql.gen.SqlTypeBytecodeExpression.constantType;
 import static io.trino.type.UnknownType.UNKNOWN;
 import static io.trino.util.CompilerUtils.defineClass;
@@ -77,9 +79,8 @@ public final class MapFilterFunction
 
     private MapFilterFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("map_filter")
                 .signature(Signature.builder()
-                        .name("map_filter")
                         .typeVariable("K")
                         .typeVariable("V")
                         .returnType(mapType(new TypeSignature("K"), new TypeSignature("V")))
@@ -107,59 +108,77 @@ public SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
     @UsedByGeneratedCode
     public static Object createState(MapType mapType)
     {
-        return new PageBuilder(ImmutableList.of(mapType));
+        return BufferedMapValueBuilder.createBuffered(mapType);
     }
 
     private static MethodHandle generateFilter(MapType mapType)
     {
         CallSiteBinder binder = new CallSiteBinder();
-        Type keyType = mapType.getKeyType();
-        Type valueType = mapType.getValueType();
-        Class<?> keyJavaType = Primitives.wrap(keyType.getJavaType());
-        Class<?> valueJavaType = Primitives.wrap(valueType.getJavaType());
-
         ClassDefinition definition = new ClassDefinition(
                 a(PUBLIC, FINAL),
                 makeClassName("MapFilter"),
                 type(Object.class));
         definition.declareDefaultConstructor(a(PRIVATE));
 
+        MethodDefinition filterKeyValue = generateFilterInner(definition, binder, mapType);
+
         Parameter state = arg("state", Object.class);
-        Parameter block = arg("block", Block.class);
+        Parameter map = arg("map", SqlMap.class);
         Parameter function = arg("function", BinaryFunctionInterface.class);
         MethodDefinition method = definition.declareMethod(
                 a(PUBLIC, STATIC),
                 "filter",
-                type(Block.class),
-                ImmutableList.of(state, block, function));
+                type(SqlMap.class),
+                ImmutableList.of(state, map, function));
 
         BytecodeBlock body = method.getBody();
         Scope scope = method.getScope();
-        Variable positionCount = scope.declareVariable(int.class, "positionCount");
-        Variable position = scope.declareVariable(int.class, "position");
-        Variable pageBuilder = scope.declareVariable(PageBuilder.class, "pageBuilder");
-        Variable mapBlockBuilder = scope.declareVariable(BlockBuilder.class, "mapBlockBuilder");
-        Variable singleMapBlockWriter = scope.declareVariable(BlockBuilder.class, "singleMapBlockWriter");
+
+        Variable mapValueBuilder = scope.declareVariable(BufferedMapValueBuilder.class, "mapValueBuilder");
+        body.append(mapValueBuilder.set(state.cast(BufferedMapValueBuilder.class)));
+
+        BytecodeExpression mapEntryBuilder = generateMetafactory(MapValueBuilder.class, filterKeyValue, ImmutableList.of(map, function));
+        body.append(mapValueBuilder.invoke("build", SqlMap.class, map.invoke("getSize", int.class), mapEntryBuilder).ret());
+
+        Class<?> generatedClass = defineClass(definition, Object.class, binder.getBindings(), MapFilterFunction.class.getClassLoader());
+        return methodHandle(generatedClass, "filter", Object.class, SqlMap.class, BinaryFunctionInterface.class);
+    }
+
+    private static MethodDefinition generateFilterInner(ClassDefinition definition, CallSiteBinder binder, MapType mapType)
+    {
+        Parameter map = arg("map", SqlMap.class);
+        Parameter function = arg("function", BinaryFunctionInterface.class);
+        Parameter keyBuilder = arg("keyBuilder", BlockBuilder.class);
+        Parameter valueBuilder = arg("valueBuilder", BlockBuilder.class);
+        MethodDefinition method = definition.declareMethod(
+                a(PRIVATE, STATIC),
+                "filter",
+                type(void.class),
+                ImmutableList.of(map, function, keyBuilder, valueBuilder));
+
+        BytecodeBlock body = method.getBody();
+        Scope scope = method.getScope();
+
+        Type keyType = mapType.getKeyType();
+        Type valueType = mapType.getValueType();
+        Class<?> keyJavaType = Primitives.wrap(keyType.getJavaType());
+        Class<?> valueJavaType = Primitives.wrap(valueType.getJavaType());
+
+        Variable size = scope.declareVariable("size", body, map.invoke("getSize", int.class));
+        Variable rawOffset = scope.declareVariable("rawOffset", body, map.invoke("getRawOffset", int.class));
+        Variable rawKeyBlock = scope.declareVariable("rawKeyBlock", body, map.invoke("getRawKeyBlock", Block.class));
+        Variable rawValueBlock = scope.declareVariable("rawValueBlock", body, map.invoke("getRawValueBlock", Block.class));
+
+        Variable index = scope.declareVariable(int.class, "index");
         Variable keyElement = scope.declareVariable(keyJavaType, "keyElement");
         Variable valueElement = scope.declareVariable(valueJavaType, "valueElement");
         Variable keep = scope.declareVariable(Boolean.class, "keep");
 
-        // invoke block.getPositionCount()
-        body.append(positionCount.set(block.invoke("getPositionCount", int.class)));
-
-        // prepare the single map block builder
-        body.append(pageBuilder.set(state.cast(PageBuilder.class)));
-        body.append(new IfStatement()
-                .condition(pageBuilder.invoke("isFull", boolean.class))
-                .ifTrue(pageBuilder.invoke("reset", void.class)));
-        body.append(mapBlockBuilder.set(pageBuilder.invoke("getBlockBuilder", BlockBuilder.class, constantInt(0))));
-        body.append(singleMapBlockWriter.set(mapBlockBuilder.invoke("beginBlockEntry", BlockBuilder.class)));
-
         SqlTypeBytecodeExpression keySqlType = constantType(binder, keyType);
         BytecodeNode loadKeyElement;
         if (!keyType.equals(UNKNOWN)) {
             // key element must be non-null
-            loadKeyElement = new BytecodeBlock().append(keyElement.set(keySqlType.getValue(block, position).cast(keyJavaType)));
+            loadKeyElement = keyElement.set(keySqlType.getValue(rawKeyBlock, add(index, rawOffset)).cast(keyJavaType));
         }
         else {
             loadKeyElement = new BytecodeBlock().append(keyElement.set(constantNull(keyJavaType)));
@@ -169,18 +188,18 @@ private static MethodHandle generateFilter(MapType mapType)
         BytecodeNode loadValueElement;
         if (!valueType.equals(UNKNOWN)) {
             loadValueElement = new IfStatement()
-                    .condition(block.invoke("isNull", boolean.class, add(position, constantInt(1))))
+                    .condition(rawValueBlock.invoke("isNull", boolean.class, add(index, rawOffset)))
                     .ifTrue(valueElement.set(constantNull(valueJavaType)))
-                    .ifFalse(valueElement.set(valueSqlType.getValue(block, add(position, constantInt(1))).cast(valueJavaType)));
+                    .ifFalse(valueElement.set(valueSqlType.getValue(rawValueBlock, add(index, rawOffset)).cast(valueJavaType)));
         }
         else {
             loadValueElement = new BytecodeBlock().append(valueElement.set(constantNull(valueJavaType)));
         }
 
         body.append(new ForLoop()
-                .initialize(position.set(constantInt(0)))
-                .condition(lessThan(position, positionCount))
-                .update(incrementVariable(position, (byte) 2))
+                .initialize(index.set(constantInt(0)))
+                .condition(lessThan(index, size))
+                .update(index.increment())
                 .body(new BytecodeBlock()
                         .append(loadKeyElement)
                         .append(loadValueElement)
@@ -188,22 +207,10 @@ private static MethodHandle generateFilter(MapType mapType)
                         .append(new IfStatement("if (keep != null && keep) ...")
                                 .condition(and(notEqual(keep, constantNull(Boolean.class)), keep.cast(boolean.class)))
                                 .ifTrue(new BytecodeBlock()
-                                        .append(keySqlType.invoke("appendTo", void.class, block, position, singleMapBlockWriter))
-                                        .append(valueSqlType.invoke("appendTo", void.class, block, add(position, constantInt(1)), singleMapBlockWriter))))));
-
-        body.append(mapBlockBuilder
-                .invoke("closeEntry", BlockBuilder.class)
-                .pop());
-        body.append(pageBuilder.invoke("declarePosition", void.class));
-        body.append(constantType(binder, mapType)
-                .invoke(
-                        "getObject",
-                        Object.class,
-                        mapBlockBuilder.cast(Block.class),
-                        subtract(mapBlockBuilder.invoke("getPositionCount", int.class), constantInt(1)))
-                .ret());
+                                        .append(keySqlType.invoke("appendTo", void.class, rawKeyBlock, add(index, rawOffset), keyBuilder))
+                                        .append(valueSqlType.invoke("appendTo", void.class, rawValueBlock, add(index, rawOffset), valueBuilder))))));
+        body.ret();
 
-        Class<?> generatedClass = defineClass(definition, Object.class, binder.getBindings(), MapFilterFunction.class.getClassLoader());
-        return methodHandle(generatedClass, "filter", Object.class, Block.class, BinaryFunctionInterface.class);
+        return method;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapFromEntriesFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapFromEntriesFunction.java
index f4131c3d5ac6..a7fc7361a7bd 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapFromEntriesFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapFromEntriesFunction.java
@@ -14,11 +14,12 @@
 package io.trino.operator.scalar;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.operator.aggregation.TypedSet;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedMapValueBuilder;
+import io.trino.spi.block.DuplicateMapKeyException;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
@@ -33,32 +34,30 @@
 import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
 import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
 
-import static io.trino.operator.aggregation.TypedSet.createDistinctTypedSet;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.function.OperatorType.IS_DISTINCT_FROM;
-import static java.lang.String.format;
 
 @ScalarFunction("map_from_entries")
 @Description("Construct a map from an array of entries")
 public final class MapFromEntriesFunction
 {
-    private final PageBuilder pageBuilder;
+    private final BufferedMapValueBuilder mapValueBuilder;
 
     @TypeParameter("K")
     @TypeParameter("V")
     public MapFromEntriesFunction(@TypeParameter("map(K,V)") Type mapType)
     {
-        pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+        mapValueBuilder = BufferedMapValueBuilder.createBufferedDistinctStrict((MapType) mapType);
     }
 
     @TypeParameter("K")
     @TypeParameter("V")
     @SqlType("map(K,V)")
     @SqlNullable
-    public Block mapFromEntries(
+    public SqlMap mapFromEntries(
             @OperatorDependency(
                     operator = IS_DISTINCT_FROM,
                     argumentTypes = {"K", "K"},
@@ -75,42 +74,29 @@ public Block mapFromEntries(
         Type valueType = mapType.getValueType();
         RowType mapEntryType = RowType.anonymous(ImmutableList.of(keyType, valueType));
 
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
         int entryCount = mapEntries.getPositionCount();
 
-        BlockBuilder mapBlockBuilder = pageBuilder.getBlockBuilder(0);
-        BlockBuilder resultBuilder = mapBlockBuilder.beginBlockEntry();
-        TypedSet uniqueKeys = createDistinctTypedSet(keyType, keysDistinctOperator, keyHashCode, entryCount, "map_from_entries");
-
-        for (int i = 0; i < entryCount; i++) {
-            if (mapEntries.isNull(i)) {
-                mapBlockBuilder.closeEntry();
-                pageBuilder.declarePosition();
-                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "map entry cannot be null");
-            }
-            Block mapEntryBlock = mapEntryType.getObject(mapEntries, i);
+        try {
+            return mapValueBuilder.build(entryCount, (keyBuilder, valueBuilder) -> {
+                for (int i = 0; i < entryCount; i++) {
+                    if (mapEntries.isNull(i)) {
+                        throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "map entry cannot be null");
+                    }
+                    SqlRow entry = mapEntryType.getObject(mapEntries, i);
+                    int rawIndex = entry.getRawIndex();
 
-            if (mapEntryBlock.isNull(0)) {
-                mapBlockBuilder.closeEntry();
-                pageBuilder.declarePosition();
-                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "map key cannot be null");
-            }
+                    Block keyBlock = entry.getRawFieldBlock(0);
+                    if (keyBlock.isNull(rawIndex)) {
+                        throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "map key cannot be null");
+                    }
+                    keyType.appendTo(keyBlock, rawIndex, keyBuilder);
 
-            if (!uniqueKeys.add(mapEntryBlock, 0)) {
-                mapBlockBuilder.closeEntry();
-                pageBuilder.declarePosition();
-                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format("Duplicate keys (%s) are not allowed", keyType.getObjectValue(session, mapEntryBlock, 0)));
-            }
-
-            keyType.appendTo(mapEntryBlock, 0, resultBuilder);
-            valueType.appendTo(mapEntryBlock, 1, resultBuilder);
+                    valueType.appendTo(entry.getRawFieldBlock(1), rawIndex, valueBuilder);
+                }
+            });
+        }
+        catch (DuplicateMapKeyException e) {
+            throw e.withDetailedMessage(mapType.getKeyType(), session);
         }
-
-        mapBlockBuilder.closeEntry();
-        pageBuilder.declarePosition();
-        return mapType.getObject(mapBlockBuilder, mapBlockBuilder.getPositionCount() - 1);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapKeys.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapKeys.java
index b48e6c97a775..77c1dc1aa04e 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapKeys.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapKeys.java
@@ -14,7 +14,7 @@
 package io.trino.operator.scalar;
 
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
@@ -32,12 +32,8 @@ private MapKeys() {}
     @SqlType("array(K)")
     public static Block getKeys(
             @TypeParameter("K") Type keyType,
-            @SqlType("map(K,V)") Block block)
+            @SqlType("map(K,V)") SqlMap sqlMap)
     {
-        BlockBuilder blockBuilder = keyType.createBlockBuilder(null, block.getPositionCount() / 2);
-        for (int i = 0; i < block.getPositionCount(); i += 2) {
-            keyType.appendTo(block, i, blockBuilder);
-        }
-        return blockBuilder.build();
+        return sqlMap.getRawKeyBlock().getRegion(sqlMap.getRawOffset(), sqlMap.getSize());
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapSubscriptOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapSubscriptOperator.java
index 282deda32aa9..5934ed7a031d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapSubscriptOperator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapSubscriptOperator.java
@@ -19,8 +19,7 @@
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.SingleMapBlock;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionDependencies;
@@ -48,16 +47,15 @@
 public class MapSubscriptOperator
         extends SqlScalarFunction
 {
-    private static final MethodHandle METHOD_HANDLE_BOOLEAN = methodHandle(MapSubscriptOperator.class, "subscript", MissingKeyExceptionFactory.class, Type.class, Type.class, ConnectorSession.class, Block.class, boolean.class);
-    private static final MethodHandle METHOD_HANDLE_LONG = methodHandle(MapSubscriptOperator.class, "subscript", MissingKeyExceptionFactory.class, Type.class, Type.class, ConnectorSession.class, Block.class, long.class);
-    private static final MethodHandle METHOD_HANDLE_DOUBLE = methodHandle(MapSubscriptOperator.class, "subscript", MissingKeyExceptionFactory.class, Type.class, Type.class, ConnectorSession.class, Block.class, double.class);
-    private static final MethodHandle METHOD_HANDLE_OBJECT = methodHandle(MapSubscriptOperator.class, "subscript", MissingKeyExceptionFactory.class, Type.class, Type.class, ConnectorSession.class, Block.class, Object.class);
+    private static final MethodHandle METHOD_HANDLE_BOOLEAN = methodHandle(MapSubscriptOperator.class, "subscript", MissingKeyExceptionFactory.class, Type.class, Type.class, ConnectorSession.class, SqlMap.class, boolean.class);
+    private static final MethodHandle METHOD_HANDLE_LONG = methodHandle(MapSubscriptOperator.class, "subscript", MissingKeyExceptionFactory.class, Type.class, Type.class, ConnectorSession.class, SqlMap.class, long.class);
+    private static final MethodHandle METHOD_HANDLE_DOUBLE = methodHandle(MapSubscriptOperator.class, "subscript", MissingKeyExceptionFactory.class, Type.class, Type.class, ConnectorSession.class, SqlMap.class, double.class);
+    private static final MethodHandle METHOD_HANDLE_OBJECT = methodHandle(MapSubscriptOperator.class, "subscript", MissingKeyExceptionFactory.class, Type.class, Type.class, ConnectorSession.class, SqlMap.class, Object.class);
 
     public MapSubscriptOperator()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(SUBSCRIPT)
                 .signature(Signature.builder()
-                        .operatorType(SUBSCRIPT)
                         .typeVariable("K")
                         .typeVariable("V")
                         .returnType(new TypeSignature("V"))
@@ -108,47 +106,43 @@ else if (keyType.getJavaType() == double.class) {
     }
 
     @UsedByGeneratedCode
-    public static Object subscript(MissingKeyExceptionFactory missingKeyExceptionFactory, Type keyType, Type valueType, ConnectorSession session, Block map, boolean key)
+    public static Object subscript(MissingKeyExceptionFactory missingKeyExceptionFactory, Type keyType, Type valueType, ConnectorSession session, SqlMap sqlMap, boolean key)
     {
-        SingleMapBlock mapBlock = (SingleMapBlock) map;
-        int valuePosition = mapBlock.seekKeyExact(key);
-        if (valuePosition == -1) {
+        int index = sqlMap.seekKeyExact(key);
+        if (index == -1) {
             throw missingKeyExceptionFactory.create(session, key);
         }
-        return readNativeValue(valueType, mapBlock, valuePosition);
+        return readNativeValue(valueType, sqlMap.getRawValueBlock(), sqlMap.getRawOffset() + index);
     }
 
     @UsedByGeneratedCode
-    public static Object subscript(MissingKeyExceptionFactory missingKeyExceptionFactory, Type keyType, Type valueType, ConnectorSession session, Block map, long key)
+    public static Object subscript(MissingKeyExceptionFactory missingKeyExceptionFactory, Type keyType, Type valueType, ConnectorSession session, SqlMap sqlMap, long key)
     {
-        SingleMapBlock mapBlock = (SingleMapBlock) map;
-        int valuePosition = mapBlock.seekKeyExact(key);
-        if (valuePosition == -1) {
+        int index = sqlMap.seekKeyExact(key);
+        if (index == -1) {
             throw missingKeyExceptionFactory.create(session, key);
         }
-        return readNativeValue(valueType, mapBlock, valuePosition);
+        return readNativeValue(valueType, sqlMap.getRawValueBlock(), sqlMap.getRawOffset() + index);
     }
 
     @UsedByGeneratedCode
-    public static Object subscript(MissingKeyExceptionFactory missingKeyExceptionFactory, Type keyType, Type valueType, ConnectorSession session, Block map, double key)
+    public static Object subscript(MissingKeyExceptionFactory missingKeyExceptionFactory, Type keyType, Type valueType, ConnectorSession session, SqlMap sqlMap, double key)
     {
-        SingleMapBlock mapBlock = (SingleMapBlock) map;
-        int valuePosition = mapBlock.seekKeyExact(key);
-        if (valuePosition == -1) {
+        int index = sqlMap.seekKeyExact(key);
+        if (index == -1) {
             throw missingKeyExceptionFactory.create(session, key);
         }
-        return readNativeValue(valueType, mapBlock, valuePosition);
+        return readNativeValue(valueType, sqlMap.getRawValueBlock(), sqlMap.getRawOffset() + index);
     }
 
     @UsedByGeneratedCode
-    public static Object subscript(MissingKeyExceptionFactory missingKeyExceptionFactory, Type keyType, Type valueType, ConnectorSession session, Block map, Object key)
+    public static Object subscript(MissingKeyExceptionFactory missingKeyExceptionFactory, Type keyType, Type valueType, ConnectorSession session, SqlMap sqlMap, Object key)
     {
-        SingleMapBlock mapBlock = (SingleMapBlock) map;
-        int valuePosition = mapBlock.seekKeyExact(key);
-        if (valuePosition == -1) {
+        int index = sqlMap.seekKeyExact(key);
+        if (index == -1) {
             throw missingKeyExceptionFactory.create(session, key);
         }
-        return readNativeValue(valueType, mapBlock, valuePosition);
+        return readNativeValue(valueType, sqlMap.getRawValueBlock(), sqlMap.getRawOffset() + index);
     }
 
     private static class MissingKeyExceptionFactory
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapToJsonCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapToJsonCast.java
index 948f2c4fa63c..29c04aab56a8 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapToJsonCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapToJsonCast.java
@@ -13,6 +13,7 @@
  */
 package io.trino.operator.scalar;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.DynamicSliceOutput;
@@ -21,6 +22,7 @@
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
@@ -33,7 +35,6 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import static io.trino.operator.scalar.JsonOperators.JSON_FACTORY;
 import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
@@ -45,6 +46,7 @@
 import static io.trino.util.JsonUtil.JsonGeneratorWriter;
 import static io.trino.util.JsonUtil.ObjectKeyProvider;
 import static io.trino.util.JsonUtil.canCastToJson;
+import static io.trino.util.JsonUtil.createJsonFactory;
 import static io.trino.util.JsonUtil.createJsonGenerator;
 import static io.trino.util.Reflection.methodHandle;
 
@@ -52,13 +54,14 @@ public class MapToJsonCast
         extends SqlScalarFunction
 {
     public static final MapToJsonCast MAP_TO_JSON = new MapToJsonCast();
-    private static final MethodHandle METHOD_HANDLE = methodHandle(MapToJsonCast.class, "toJson", ObjectKeyProvider.class, JsonGeneratorWriter.class, Block.class);
+    private static final MethodHandle METHOD_HANDLE = methodHandle(MapToJsonCast.class, "toJson", ObjectKeyProvider.class, JsonGeneratorWriter.class, SqlMap.class);
+
+    private static final JsonFactory JSON_FACTORY = createJsonFactory();
 
     private MapToJsonCast()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(CAST)
                 .signature(Signature.builder()
-                        .operatorType(CAST)
                         .castableToTypeParameter("K", VARCHAR.getTypeSignature())
                         .castableToTypeParameter("V", JSON.getTypeSignature())
                         .returnType(JSON)
@@ -87,13 +90,17 @@ public SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
     }
 
     @UsedByGeneratedCode
-    public static Slice toJson(ObjectKeyProvider provider, JsonGeneratorWriter writer, Block block)
+    public static Slice toJson(ObjectKeyProvider provider, JsonGeneratorWriter writer, SqlMap map)
     {
         try {
+            int rawOffset = map.getRawOffset();
+            Block rawKeyBlock = map.getRawKeyBlock();
+            Block rawValueBlock = map.getRawValueBlock();
+
             Map<String, Integer> orderedKeyToValuePosition = new TreeMap<>();
-            for (int i = 0; i < block.getPositionCount(); i += 2) {
-                String objectKey = provider.getObjectKey(block, i);
-                orderedKeyToValuePosition.put(objectKey, i + 1);
+            for (int i = 0; i < map.getSize(); i++) {
+                String objectKey = provider.getObjectKey(rawKeyBlock, rawOffset + i);
+                orderedKeyToValuePosition.put(objectKey, i);
             }
 
             SliceOutput output = new DynamicSliceOutput(40);
@@ -101,7 +108,7 @@ public static Slice toJson(ObjectKeyProvider provider, JsonGeneratorWriter write
                 jsonGenerator.writeStartObject();
                 for (Map.Entry<String, Integer> entry : orderedKeyToValuePosition.entrySet()) {
                     jsonGenerator.writeFieldName(entry.getKey());
-                    writer.writeJsonValue(jsonGenerator, block, entry.getValue());
+                    writer.writeJsonValue(jsonGenerator, rawValueBlock, rawOffset + entry.getValue());
                 }
                 jsonGenerator.writeEndObject();
             }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapToMapCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapToMapCast.java
index ece2aae99f0b..4ab1a0cd44c4 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapToMapCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapToMapCast.java
@@ -17,10 +17,11 @@
 import io.airlift.slice.Slice;
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
-import io.trino.operator.aggregation.TypedSet;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.DuplicateMapKeyException;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionDependencies;
@@ -40,9 +41,8 @@
 import java.lang.invoke.MethodHandles;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-import static io.trino.operator.aggregation.TypedSet.createDistinctTypedSet;
 import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
+import static io.trino.spi.block.MapHashTables.HashBuildMode.STRICT_NOT_DISTINCT_FROM;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
@@ -65,11 +65,11 @@ public final class MapToMapCast
             "mapCast",
             MethodHandle.class,
             MethodHandle.class,
-            Type.class,
+            MapType.class,
             BlockPositionIsDistinctFrom.class,
             BlockPositionHashCode.class,
             ConnectorSession.class,
-            Block.class);
+            SqlMap.class);
 
     private static final MethodHandle CHECK_LONG_IS_NOT_NULL = methodHandle(MapToMapCast.class, "checkLongIsNotNull", Long.class);
     private static final MethodHandle CHECK_DOUBLE_IS_NOT_NULL = methodHandle(MapToMapCast.class, "checkDoubleIsNotNull", Double.class);
@@ -86,9 +86,8 @@ public final class MapToMapCast
 
     public MapToMapCast(BlockTypeOperators blockTypeOperators)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(CAST)
                 .signature(Signature.builder()
-                        .operatorType(CAST)
                         .castableToTypeParameter("FK", new TypeSignature("TK"))
                         .castableToTypeParameter("FV", new TypeSignature("TV"))
                         .typeVariable("TK")
@@ -133,7 +132,7 @@ public SpecializedSqlScalarFunction specialize(BoundSignature boundSignature, Fu
      * The signature of the returned MethodHandle is (Block fromMap, int position, ConnectorSession session, BlockBuilder mapBlockBuilder)void.
      * The processor will get the value from fromMap, cast it and write to toBlock.
      */
-    private MethodHandle buildProcessor(FunctionDependencies functionDependencies, Type fromType, Type toType, boolean isKey)
+    private static MethodHandle buildProcessor(FunctionDependencies functionDependencies, Type fromType, Type toType, boolean isKey)
     {
         // Get block position cast, with optional connector session
         FunctionNullability functionNullability = functionDependencies.getCastNullability(fromType, toType);
@@ -156,7 +155,7 @@ private MethodHandle buildProcessor(FunctionDependencies functionDependencies, T
         MethodHandle writer = nativeValueWriter(toType);
         writer = permuteArguments(writer, methodType(void.class, writer.type().parameterArray()[1], BlockBuilder.class), 1, 0);
 
-        // ensure cast returns type expected by the writer
+        // ensure cast function returns the type expected by the writer
         cast = cast.asType(methodType(writer.type().parameterType(0), cast.type().parameterArray()));
 
         return foldArguments(dropArguments(writer, 1, cast.type().parameterList()), cast);
@@ -174,7 +173,7 @@ private MethodHandle buildProcessor(FunctionDependencies functionDependencies, T
      * <li>(Block value)Block
      * </ul>
      */
-    private MethodHandle nullChecker(Class<?> javaType)
+    private static MethodHandle nullChecker(Class<?> javaType)
     {
         if (javaType == Long.class) {
             return CHECK_LONG_IS_NOT_NULL;
@@ -240,24 +239,26 @@ public static Block checkBlockIsNotNull(Block value)
     }
 
     @UsedByGeneratedCode
-    public static Block mapCast(
+    public static SqlMap mapCast(
             MethodHandle keyProcessFunction,
             MethodHandle valueProcessFunction,
-            Type targetType,
+            MapType toType,
             BlockPositionIsDistinctFrom keyDistinctOperator,
             BlockPositionHashCode keyHashCode,
             ConnectorSession session,
-            Block fromMap)
+            SqlMap fromMap)
     {
-        checkState(targetType.getTypeParameters().size() == 2, "Expect two type parameters for targetType");
-        Type toKeyType = targetType.getTypeParameters().get(0);
-        TypedSet resultKeys = createDistinctTypedSet(toKeyType, keyDistinctOperator, keyHashCode, fromMap.getPositionCount() / 2, "map-to-map cast");
+        int size = fromMap.getSize();
+        int rawOffset = fromMap.getRawOffset();
+        Block rawKeyBlock = fromMap.getRawKeyBlock();
+        Block rawValueBlock = fromMap.getRawValueBlock();
 
         // Cast the keys into a new block
-        BlockBuilder keyBlockBuilder = toKeyType.createBlockBuilder(null, fromMap.getPositionCount() / 2);
-        for (int i = 0; i < fromMap.getPositionCount(); i += 2) {
+        Type toKeyType = toType.getKeyType();
+        BlockBuilder keyBlockBuilder = toKeyType.createBlockBuilder(null, size);
+        for (int i = 0; i < size; i++) {
             try {
-                keyProcessFunction.invokeExact(fromMap, i, session, keyBlockBuilder);
+                keyProcessFunction.invokeExact(rawKeyBlock, rawOffset + i, session, keyBlockBuilder);
             }
             catch (Throwable t) {
                 throw internalError(t);
@@ -265,34 +266,32 @@ public static Block mapCast(
         }
         Block keyBlock = keyBlockBuilder.build();
 
-        BlockBuilder mapBlockBuilder = targetType.createBlockBuilder(null, 1);
-        BlockBuilder blockBuilder = mapBlockBuilder.beginBlockEntry();
-        for (int i = 0; i < fromMap.getPositionCount(); i += 2) {
-            if (resultKeys.add(keyBlock, i / 2)) {
-                toKeyType.appendTo(keyBlock, i / 2, blockBuilder);
-                if (fromMap.isNull(i + 1)) {
-                    blockBuilder.appendNull();
-                    continue;
-                }
-
-                try {
-                    valueProcessFunction.invokeExact(fromMap, i + 1, session, blockBuilder);
-                }
-                catch (Throwable t) {
-                    throw internalError(t);
-                }
+        // Cast the values into a new block
+        Type toValueType = toType.getValueType();
+        BlockBuilder valueBlockBuilder = toValueType.createBlockBuilder(null, size);
+        for (int i = 0; i < size; i++) {
+            if (rawValueBlock.isNull(rawOffset + i)) {
+                valueBlockBuilder.appendNull();
+                continue;
             }
-            else {
-                // if there are duplicated keys, fail it!
-                throw new TrinoException(INVALID_CAST_ARGUMENT, "duplicate keys");
+            try {
+                valueProcessFunction.invokeExact(rawValueBlock, rawOffset + i, session, valueBlockBuilder);
+            }
+            catch (Throwable t) {
+                throw internalError(t);
             }
         }
+        Block valueBlock = valueBlockBuilder.build();
 
-        mapBlockBuilder.closeEntry();
-        return (Block) targetType.getObject(mapBlockBuilder, mapBlockBuilder.getPositionCount() - 1);
+        try {
+            return new SqlMap(toType, STRICT_NOT_DISTINCT_FROM, keyBlock, valueBlock);
+        }
+        catch (DuplicateMapKeyException e) {
+            throw new TrinoException(INVALID_CAST_ARGUMENT, "duplicate keys");
+        }
     }
 
-    public static MethodHandle nativeValueWriter(Type type)
+    private static MethodHandle nativeValueWriter(Type type)
     {
         Class<?> javaType = type.getJavaType();
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapTransformKeysFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapTransformKeysFunction.java
index 4e01c7d22e16..0283a0608514 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapTransformKeysFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapTransformKeysFunction.java
@@ -24,14 +24,18 @@
 import io.airlift.bytecode.Variable;
 import io.airlift.bytecode.control.ForLoop;
 import io.airlift.bytecode.control.IfStatement;
+import io.airlift.bytecode.control.TryCatch;
+import io.airlift.bytecode.expression.BytecodeExpression;
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
-import io.trino.operator.aggregation.TypedSet;
 import io.trino.spi.ErrorCodeSupplier;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedMapValueBuilder;
+import io.trino.spi.block.DuplicateMapKeyException;
+import io.trino.spi.block.MapValueBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
@@ -43,8 +47,6 @@
 import io.trino.sql.gen.SqlTypeBytecodeExpression;
 import io.trino.sql.gen.lambda.BinaryFunctionInterface;
 import io.trino.type.BlockTypeOperators;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Optional;
@@ -60,28 +62,22 @@
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantInt;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantNull;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantString;
-import static io.airlift.bytecode.expression.BytecodeExpressions.divide;
 import static io.airlift.bytecode.expression.BytecodeExpressions.equal;
 import static io.airlift.bytecode.expression.BytecodeExpressions.getStatic;
-import static io.airlift.bytecode.expression.BytecodeExpressions.invokeStatic;
 import static io.airlift.bytecode.expression.BytecodeExpressions.lessThan;
-import static io.airlift.bytecode.expression.BytecodeExpressions.newArray;
 import static io.airlift.bytecode.expression.BytecodeExpressions.newInstance;
-import static io.airlift.bytecode.expression.BytecodeExpressions.subtract;
-import static io.airlift.bytecode.instruction.VariableInstruction.incrementVariable;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FUNCTION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.type.TypeSignature.functionType;
 import static io.trino.spi.type.TypeSignature.mapType;
-import static io.trino.sql.gen.BytecodeUtils.loadConstant;
+import static io.trino.sql.gen.LambdaMetafactoryGenerator.generateMetafactory;
 import static io.trino.sql.gen.SqlTypeBytecodeExpression.constantType;
 import static io.trino.type.UnknownType.UNKNOWN;
 import static io.trino.util.CompilerUtils.defineClass;
 import static io.trino.util.CompilerUtils.makeClassName;
 import static io.trino.util.Reflection.methodHandle;
-import static java.util.Objects.requireNonNull;
 
 public final class MapTransformKeysFunction
         extends SqlScalarFunction
@@ -89,13 +85,10 @@ public final class MapTransformKeysFunction
     public static final String NAME = "transform_keys";
     private static final MethodHandle STATE_FACTORY = methodHandle(MapTransformKeysFunction.class, "createState", MapType.class);
 
-    private final BlockTypeOperators blockTypeOperators;
-
     public MapTransformKeysFunction(BlockTypeOperators blockTypeOperators)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(NAME)
                 .signature(Signature.builder()
-                        .name(NAME)
                         .typeVariable("K1")
                         .typeVariable("K2")
                         .typeVariable("V")
@@ -106,7 +99,6 @@ public MapTransformKeysFunction(BlockTypeOperators blockTypeOperators)
                 .nondeterministic()
                 .description("Apply lambda to each entry of the map and transform the key")
                 .build());
-        this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
     }
 
     @Override
@@ -123,72 +115,89 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
                 FAIL_ON_NULL,
                 ImmutableList.of(NEVER_NULL, FUNCTION),
                 ImmutableList.of(BinaryFunctionInterface.class),
-                generateTransformKey(inputKeyType, outputKeyType, valueType, outputMapType),
+                generateTransformKey(inputKeyType, outputKeyType, valueType),
                 Optional.of(STATE_FACTORY.bindTo(outputMapType)));
     }
 
     @UsedByGeneratedCode
     public static Object createState(MapType mapType)
     {
-        return new PageBuilder(ImmutableList.of(mapType));
+        return BufferedMapValueBuilder.createBufferedDistinctStrict(mapType);
     }
 
-    private MethodHandle generateTransformKey(Type keyType, Type transformedKeyType, Type valueType, Type resultMapType)
+    private static MethodHandle generateTransformKey(Type keyType, Type transformedKeyType, Type valueType)
     {
         CallSiteBinder binder = new CallSiteBinder();
-        Class<?> keyJavaType = Primitives.wrap(keyType.getJavaType());
-        Class<?> transformedKeyJavaType = Primitives.wrap(transformedKeyType.getJavaType());
-        Class<?> valueJavaType = Primitives.wrap(valueType.getJavaType());
-
         ClassDefinition definition = new ClassDefinition(
                 a(PUBLIC, FINAL),
                 makeClassName("MapTransformKey"),
                 type(Object.class));
         definition.declareDefaultConstructor(a(PRIVATE));
 
+        MethodDefinition transformMap = generateTransformKeyInner(definition, binder, keyType, transformedKeyType, valueType);
+
         Parameter state = arg("state", Object.class);
         Parameter session = arg("session", ConnectorSession.class);
-        Parameter block = arg("block", Block.class);
+        Parameter map = arg("map", SqlMap.class);
         Parameter function = arg("function", BinaryFunctionInterface.class);
         MethodDefinition method = definition.declareMethod(
                 a(PUBLIC, STATIC),
                 "transform",
-                type(Block.class),
-                ImmutableList.of(state, session, block, function));
+                type(SqlMap.class),
+                ImmutableList.of(state, session, map, function));
 
         BytecodeBlock body = method.getBody();
         Scope scope = method.getScope();
-        Variable positionCount = scope.declareVariable(int.class, "positionCount");
-        Variable position = scope.declareVariable(int.class, "position");
-        Variable pageBuilder = scope.declareVariable(PageBuilder.class, "pageBuilder");
-        Variable mapBlockBuilder = scope.declareVariable(BlockBuilder.class, "mapBlockBuilder");
-        Variable blockBuilder = scope.declareVariable(BlockBuilder.class, "blockBuilder");
-        Variable typedSet = scope.declareVariable(TypedSet.class, "typeSet");
-        Variable keyElement = scope.declareVariable(keyJavaType, "keyElement");
-        Variable transformedKeyElement = scope.declareVariable(transformedKeyJavaType, "transformedKeyElement");
-        Variable valueElement = scope.declareVariable(valueJavaType, "valueElement");
 
-        // invoke block.getPositionCount()
-        body.append(positionCount.set(block.invoke("getPositionCount", int.class)));
+        Variable mapValueBuilder = scope.declareVariable(BufferedMapValueBuilder.class, "mapValueBuilder");
+        body.append(mapValueBuilder.set(state.cast(BufferedMapValueBuilder.class)));
+
+        BytecodeExpression mapEntryBuilder = generateMetafactory(MapValueBuilder.class, transformMap, ImmutableList.of(session, map, function));
+
+        Variable duplicateKeyException = scope.declareVariable(DuplicateMapKeyException.class, "e");
+        body.append(new TryCatch(
+                mapValueBuilder.invoke("build", SqlMap.class, map.invoke("getSize", int.class), mapEntryBuilder).ret(),
+                ImmutableList.of(
+                        new TryCatch.CatchBlock(
+                                new BytecodeBlock()
+                                        .putVariable(duplicateKeyException)
+                                        .append(duplicateKeyException.invoke("withDetailedMessage", DuplicateMapKeyException.class, constantType(binder, transformedKeyType), session))
+                                        .throwObject(),
+                                ImmutableList.of(type(DuplicateMapKeyException.class))))));
+
+        Class<?> generatedClass = defineClass(definition, Object.class, binder.getBindings(), MapTransformKeysFunction.class.getClassLoader());
+        return methodHandle(generatedClass, "transform", Object.class, ConnectorSession.class, SqlMap.class, BinaryFunctionInterface.class);
+    }
+
+    private static MethodDefinition generateTransformKeyInner(ClassDefinition definition, CallSiteBinder binder, Type keyType, Type transformedKeyType, Type valueType)
+    {
+        Parameter session = arg("session", ConnectorSession.class);
+        Parameter map = arg("map", SqlMap.class);
+        Parameter function = arg("function", BinaryFunctionInterface.class);
+        Parameter keyBuilder = arg("keyBuilder", BlockBuilder.class);
+        Parameter valueBuilder = arg("valueBuilder", BlockBuilder.class);
+        MethodDefinition method = definition.declareMethod(
+                a(PRIVATE, STATIC),
+                "transform",
+                type(void.class),
+                ImmutableList.of(session, map, function, keyBuilder, valueBuilder));
+
+        BytecodeBlock body = method.getBody();
+        Scope scope = method.getScope();
+
+        Class<?> keyJavaType = Primitives.wrap(keyType.getJavaType());
+        Class<?> transformedKeyJavaType = Primitives.wrap(transformedKeyType.getJavaType());
+        Class<?> valueJavaType = Primitives.wrap(valueType.getJavaType());
 
-        // prepare the single map block builder
-        body.append(pageBuilder.set(state.cast(PageBuilder.class)));
-        body.append(new IfStatement()
-                .condition(pageBuilder.invoke("isFull", boolean.class))
-                .ifTrue(pageBuilder.invoke("reset", void.class)));
-        body.append(mapBlockBuilder.set(pageBuilder.invoke("getBlockBuilder", BlockBuilder.class, constantInt(0))));
-        body.append(blockBuilder.set(mapBlockBuilder.invoke("beginBlockEntry", BlockBuilder.class)));
+        Variable size = scope.declareVariable("size", body, map.invoke("getSize", int.class));
+        Variable rawOffset = scope.declareVariable("rawOffset", body, map.invoke("getRawOffset", int.class));
+        Variable rawKeyBlock = scope.declareVariable("rawKeyBlock", body, map.invoke("getRawKeyBlock", Block.class));
+        Variable rawValueBlock = scope.declareVariable("rawValueBlock", body, map.invoke("getRawValueBlock", Block.class));
 
-        // create typed set
-        body.append(typedSet.set(invokeStatic(
-                TypedSet.class,
-                "createEqualityTypedSet",
-                TypedSet.class,
-                constantType(binder, transformedKeyType),
-                loadConstant(binder, blockTypeOperators.getEqualOperator(transformedKeyType), BlockPositionEqual.class),
-                loadConstant(binder, blockTypeOperators.getHashCodeOperator(transformedKeyType), BlockPositionHashCode.class),
-                divide(positionCount, constantInt(2)),
-                constantString(NAME))));
+        Variable index = scope.declareVariable(int.class, "index");
+        Variable keyElement = scope.declareVariable(keyJavaType, "keyElement");
+        Variable transformedKeyElement = scope.declareVariable(transformedKeyJavaType, "transformedKeyElement");
+        Variable valueElement = scope.declareVariable(valueJavaType, "valueElement");
 
         // throw null key exception block
         BytecodeNode throwNullKeyException = new BytecodeBlock()
@@ -201,15 +210,14 @@ private MethodHandle generateTransformKey(Type keyType, Type transformedKeyType,
         SqlTypeBytecodeExpression keySqlType = constantType(binder, keyType);
         BytecodeNode loadKeyElement;
         if (!keyType.equals(UNKNOWN)) {
-            loadKeyElement = new BytecodeBlock().append(keyElement.set(keySqlType.getValue(block, position).cast(keyJavaType)));
+            loadKeyElement = keyElement.set(keySqlType.getValue(rawKeyBlock, add(index, rawOffset)).cast(keyJavaType));
         }
         else {
-            // make sure invokeExact will not take uninitialized keys during compile time
-            // but if we reach this point during runtime, it is an exception
+            // make sure invokeExact will not take uninitialized keys during compile time but,
+            // if we reach this point during runtime, it is an exception
             // also close the block builder before throwing as we may be in a TRY() call
             // so that subsequent calls do not find it in an inconsistent state
             loadKeyElement = new BytecodeBlock()
-                    .append(mapBlockBuilder.invoke("closeEntry", BlockBuilder.class).pop())
                     .append(keyElement.set(constantNull(keyJavaType)))
                     .append(throwNullKeyException);
         }
@@ -218,18 +226,16 @@ private MethodHandle generateTransformKey(Type keyType, Type transformedKeyType,
         BytecodeNode loadValueElement;
         if (!valueType.equals(UNKNOWN)) {
             loadValueElement = new IfStatement()
-                    .condition(block.invoke("isNull", boolean.class, add(position, constantInt(1))))
+                    .condition(rawValueBlock.invoke("isNull", boolean.class, add(index, rawOffset)))
                     .ifTrue(valueElement.set(constantNull(valueJavaType)))
-                    .ifFalse(valueElement.set(valueSqlType.getValue(block, add(position, constantInt(1))).cast(valueJavaType)));
+                    .ifFalse(valueElement.set(valueSqlType.getValue(rawValueBlock, add(index, rawOffset)).cast(valueJavaType)));
         }
         else {
             // make sure invokeExact will not take uninitialized keys during compile time
-            loadValueElement = new BytecodeBlock().append(valueElement.set(constantNull(valueJavaType)));
+            loadValueElement = valueElement.set(constantNull(valueJavaType));
         }
 
-        SqlTypeBytecodeExpression transformedKeySqlType = constantType(binder, transformedKeyType);
         BytecodeNode writeKeyElement;
-        BytecodeNode throwDuplicatedKeyException;
         if (!transformedKeyType.equals(UNKNOWN)) {
             writeKeyElement = new BytecodeBlock()
                     .append(transformedKeyElement.set(function.invoke("apply", Object.class, keyElement.cast(Object.class), valueElement.cast(Object.class)).cast(transformedKeyJavaType)))
@@ -237,55 +243,24 @@ private MethodHandle generateTransformKey(Type keyType, Type transformedKeyType,
                             .condition(equal(transformedKeyElement, constantNull(transformedKeyJavaType)))
                             .ifTrue(throwNullKeyException)
                             .ifFalse(new BytecodeBlock()
-                                    .append(constantType(binder, transformedKeyType).writeValue(blockBuilder, transformedKeyElement.cast(transformedKeyType.getJavaType())))
-                                    .append(valueSqlType.invoke("appendTo", void.class, block, add(position, constantInt(1)), blockBuilder))));
-
-            // make sure getObjectValue takes a known key type
-            throwDuplicatedKeyException = new BytecodeBlock()
-                    .append(mapBlockBuilder.invoke("closeEntry", BlockBuilder.class).pop())
-                    .append(newInstance(
-                            TrinoException.class,
-                            getStatic(INVALID_FUNCTION_ARGUMENT.getDeclaringClass(), "INVALID_FUNCTION_ARGUMENT").cast(ErrorCodeSupplier.class),
-                            invokeStatic(
-                                    String.class,
-                                    "format",
-                                    String.class,
-                                    constantString("Duplicate keys (%s) are not allowed"),
-                                    newArray(type(Object[].class), ImmutableList.of(transformedKeySqlType.invoke("getObjectValue", Object.class, session, blockBuilder.cast(Block.class), position))))))
-                    .throwObject();
+                                    .append(constantType(binder, transformedKeyType).writeValue(keyBuilder, transformedKeyElement.cast(transformedKeyType.getJavaType())))
+                                    .append(valueSqlType.invoke("appendTo", void.class, rawValueBlock, add(index, rawOffset), valueBuilder))));
         }
         else {
             // key cannot be unknown
             // if we reach this point during runtime, it is an exception
             writeKeyElement = throwNullKeyException;
-            throwDuplicatedKeyException = throwNullKeyException;
         }
 
         body.append(new ForLoop()
-                .initialize(position.set(constantInt(0)))
-                .condition(lessThan(position, positionCount))
-                .update(incrementVariable(position, (byte) 2))
+                .initialize(index.set(constantInt(0)))
+                .condition(lessThan(index, size))
+                .update(index.increment())
                 .body(new BytecodeBlock()
                         .append(loadKeyElement)
                         .append(loadValueElement)
-                        .append(writeKeyElement)
-                        .append(new IfStatement()
-                                .condition(typedSet.invoke("add", boolean.class, blockBuilder.cast(Block.class), position))
-                                .ifFalse(throwDuplicatedKeyException))));
-
-        body.append(mapBlockBuilder
-                .invoke("closeEntry", BlockBuilder.class)
-                .pop());
-        body.append(pageBuilder.invoke("declarePosition", void.class));
-        body.append(constantType(binder, resultMapType)
-                .invoke(
-                        "getObject",
-                        Object.class,
-                        mapBlockBuilder.cast(Block.class),
-                        subtract(mapBlockBuilder.invoke("getPositionCount", int.class), constantInt(1)))
-                .ret());
-
-        Class<?> generatedClass = defineClass(definition, Object.class, binder.getBindings(), MapTransformKeysFunction.class.getClassLoader());
-        return methodHandle(generatedClass, "transform", Object.class, ConnectorSession.class, Block.class, BinaryFunctionInterface.class);
+                        .append(writeKeyElement)));
+        body.ret();
+        return method;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapTransformValuesFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapTransformValuesFunction.java
index 2b0cbfde1833..5e30f54a2ebd 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapTransformValuesFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapTransformValuesFunction.java
@@ -26,13 +26,16 @@
 import io.airlift.bytecode.control.ForLoop;
 import io.airlift.bytecode.control.IfStatement;
 import io.airlift.bytecode.control.TryCatch;
+import io.airlift.bytecode.expression.BytecodeExpression;
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
 import io.trino.spi.ErrorCodeSupplier;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedMapValueBuilder;
+import io.trino.spi.block.MapValueBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
@@ -62,14 +65,13 @@
 import static io.airlift.bytecode.expression.BytecodeExpressions.invokeStatic;
 import static io.airlift.bytecode.expression.BytecodeExpressions.lessThan;
 import static io.airlift.bytecode.expression.BytecodeExpressions.newInstance;
-import static io.airlift.bytecode.expression.BytecodeExpressions.subtract;
-import static io.airlift.bytecode.instruction.VariableInstruction.incrementVariable;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FUNCTION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.type.TypeSignature.functionType;
 import static io.trino.spi.type.TypeSignature.mapType;
+import static io.trino.sql.gen.LambdaMetafactoryGenerator.generateMetafactory;
 import static io.trino.sql.gen.SqlTypeBytecodeExpression.constantType;
 import static io.trino.type.UnknownType.UNKNOWN;
 import static io.trino.util.CompilerUtils.defineClass;
@@ -84,9 +86,8 @@ public final class MapTransformValuesFunction
 
     private MapTransformValuesFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("transform_values")
                 .signature(Signature.builder()
-                        .name("transform_values")
                         .typeVariable("K")
                         .typeVariable("V1")
                         .typeVariable("V2")
@@ -113,61 +114,79 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
                 FAIL_ON_NULL,
                 ImmutableList.of(NEVER_NULL, FUNCTION),
                 ImmutableList.of(BinaryFunctionInterface.class),
-                generateTransform(keyType, inputValueType, outputValueType, outputMapType),
+                generateTransform(keyType, inputValueType, outputValueType),
                 Optional.of(STATE_FACTORY.bindTo(outputMapType)));
     }
 
     @UsedByGeneratedCode
     public static Object createState(MapType mapType)
     {
-        return new PageBuilder(ImmutableList.of(mapType));
+        return BufferedMapValueBuilder.createBuffered(mapType);
     }
 
-    private static MethodHandle generateTransform(Type keyType, Type valueType, Type transformedValueType, Type resultMapType)
+    private static MethodHandle generateTransform(Type keyType, Type valueType, Type transformedValueType)
     {
         CallSiteBinder binder = new CallSiteBinder();
-        Class<?> keyJavaType = Primitives.wrap(keyType.getJavaType());
-        Class<?> valueJavaType = Primitives.wrap(valueType.getJavaType());
-        Class<?> transformedValueJavaType = Primitives.wrap(transformedValueType.getJavaType());
-
         ClassDefinition definition = new ClassDefinition(
                 a(PUBLIC, FINAL),
                 makeClassName("MapTransformValue"),
                 type(Object.class));
         definition.declareDefaultConstructor(a(PRIVATE));
 
+        MethodDefinition transformMap = generateTransformInner(definition, binder, keyType, valueType, transformedValueType);
+
         // define transform method
         Parameter state = arg("state", Object.class);
-        Parameter block = arg("block", Block.class);
+        Parameter map = arg("map", SqlMap.class);
         Parameter function = arg("function", BinaryFunctionInterface.class);
         MethodDefinition method = definition.declareMethod(
                 a(PUBLIC, STATIC),
                 "transform",
-                type(Block.class),
-                ImmutableList.of(state, block, function));
+                type(SqlMap.class),
+                ImmutableList.of(state, map, function));
+
+        BytecodeBlock body = method.getBody();
+        Scope scope = method.getScope();
+
+        Variable mapValueBuilder = scope.declareVariable(BufferedMapValueBuilder.class, "mapValueBuilder");
+        body.append(mapValueBuilder.set(state.cast(BufferedMapValueBuilder.class)));
+
+        BytecodeExpression mapEntryBuilder = generateMetafactory(MapValueBuilder.class, transformMap, ImmutableList.of(map, function));
+        body.append(mapValueBuilder.invoke("build", SqlMap.class, map.invoke("getSize", int.class), mapEntryBuilder).ret());
+
+        Class<?> generatedClass = defineClass(definition, Object.class, binder.getBindings(), MapTransformValuesFunction.class.getClassLoader());
+        return methodHandle(generatedClass, "transform", Object.class, SqlMap.class, BinaryFunctionInterface.class);
+    }
+
+    private static MethodDefinition generateTransformInner(ClassDefinition definition, CallSiteBinder binder, Type keyType, Type valueType, Type transformedValueType)
+    {
+        Parameter map = arg("map", SqlMap.class);
+        Parameter function = arg("function", BinaryFunctionInterface.class);
+        Parameter keyBuilder = arg("keyBuilder", BlockBuilder.class);
+        Parameter valueBuilder = arg("valueBuilder", BlockBuilder.class);
+        MethodDefinition method = definition.declareMethod(
+                a(PRIVATE, STATIC),
+                "transform",
+                type(void.class),
+                ImmutableList.of(map, function, keyBuilder, valueBuilder));
 
         BytecodeBlock body = method.getBody();
         Scope scope = method.getScope();
-        Variable positionCount = scope.declareVariable(int.class, "positionCount");
-        Variable position = scope.declareVariable(int.class, "position");
-        Variable pageBuilder = scope.declareVariable(PageBuilder.class, "pageBuilder");
-        Variable mapBlockBuilder = scope.declareVariable(BlockBuilder.class, "mapBlockBuilder");
-        Variable blockBuilder = scope.declareVariable(BlockBuilder.class, "blockBuilder");
+
+        Class<?> keyJavaType = Primitives.wrap(keyType.getJavaType());
+        Class<?> valueJavaType = Primitives.wrap(valueType.getJavaType());
+        Class<?> transformedValueJavaType = Primitives.wrap(transformedValueType.getJavaType());
+
+        Variable size = scope.declareVariable("size", body, map.invoke("getSize", int.class));
+        Variable rawOffset = scope.declareVariable("rawOffset", body, map.invoke("getRawOffset", int.class));
+        Variable rawKeyBlock = scope.declareVariable("rawKeyBlock", body, map.invoke("getRawKeyBlock", Block.class));
+        Variable rawValueBlock = scope.declareVariable("rawValueBlock", body, map.invoke("getRawValueBlock", Block.class));
+
+        Variable index = scope.declareVariable(int.class, "index");
         Variable keyElement = scope.declareVariable(keyJavaType, "keyElement");
         Variable valueElement = scope.declareVariable(valueJavaType, "valueElement");
         Variable transformedValueElement = scope.declareVariable(transformedValueJavaType, "transformedValueElement");
 
-        // invoke block.getPositionCount()
-        body.append(positionCount.set(block.invoke("getPositionCount", int.class)));
-
-        // prepare the single map block builder
-        body.append(pageBuilder.set(state.cast(PageBuilder.class)));
-        body.append(new IfStatement()
-                .condition(pageBuilder.invoke("isFull", boolean.class))
-                .ifTrue(pageBuilder.invoke("reset", void.class)));
-        body.append(mapBlockBuilder.set(pageBuilder.invoke("getBlockBuilder", BlockBuilder.class, constantInt(0))));
-        body.append(blockBuilder.set(mapBlockBuilder.invoke("beginBlockEntry", BlockBuilder.class)));
-
         // throw null key exception block
         BytecodeNode throwNullKeyException = new BytecodeBlock()
                 .append(newInstance(
@@ -179,15 +198,14 @@ private static MethodHandle generateTransform(Type keyType, Type valueType, Type
         SqlTypeBytecodeExpression keySqlType = constantType(binder, keyType);
         BytecodeNode loadKeyElement;
         if (!keyType.equals(UNKNOWN)) {
-            loadKeyElement = new BytecodeBlock().append(keyElement.set(keySqlType.getValue(block, position).cast(keyJavaType)));
+            loadKeyElement = keyElement.set(keySqlType.getValue(rawKeyBlock, add(index, rawOffset)).cast(keyJavaType));
         }
         else {
-            // make sure invokeExact will not take uninitialized keys during compile time
+            // make sure invokeExact will not take uninitialized keys during compile time,
             // but if we reach this point during runtime, it is an exception
             // also close the block builder before throwing as we may be in a TRY() call
             // so that subsequent calls do not find it in an inconsistent state
             loadKeyElement = new BytecodeBlock()
-                    .append(mapBlockBuilder.invoke("closeEntry", BlockBuilder.class).pop())
                     .append(keyElement.set(constantNull(keyJavaType)))
                     .append(throwNullKeyException);
         }
@@ -196,30 +214,30 @@ private static MethodHandle generateTransform(Type keyType, Type valueType, Type
         BytecodeNode loadValueElement;
         if (!valueType.equals(UNKNOWN)) {
             loadValueElement = new IfStatement()
-                    .condition(block.invoke("isNull", boolean.class, add(position, constantInt(1))))
+                    .condition(rawValueBlock.invoke("isNull", boolean.class, add(index, rawOffset)))
                     .ifTrue(valueElement.set(constantNull(valueJavaType)))
-                    .ifFalse(valueElement.set(valueSqlType.getValue(block, add(position, constantInt(1))).cast(valueJavaType)));
+                    .ifFalse(valueElement.set(valueSqlType.getValue(rawValueBlock, add(index, rawOffset)).cast(valueJavaType)));
         }
         else {
-            loadValueElement = new BytecodeBlock().append(valueElement.set(constantNull(valueJavaType)));
+            loadValueElement = valueElement.set(constantNull(valueJavaType));
         }
 
         BytecodeNode writeTransformedValueElement;
         if (!transformedValueType.equals(UNKNOWN)) {
             writeTransformedValueElement = new IfStatement()
                     .condition(equal(transformedValueElement, constantNull(transformedValueJavaType)))
-                    .ifTrue(blockBuilder.invoke("appendNull", BlockBuilder.class).pop())
-                    .ifFalse(constantType(binder, transformedValueType).writeValue(blockBuilder, transformedValueElement.cast(transformedValueType.getJavaType())));
+                    .ifTrue(valueBuilder.invoke("appendNull", BlockBuilder.class).pop())
+                    .ifFalse(constantType(binder, transformedValueType).writeValue(valueBuilder, transformedValueElement.cast(transformedValueType.getJavaType())));
         }
         else {
-            writeTransformedValueElement = new BytecodeBlock().append(blockBuilder.invoke("appendNull", BlockBuilder.class).pop());
+            writeTransformedValueElement = valueBuilder.invoke("appendNull", BlockBuilder.class).pop();
         }
 
         Variable transformationException = scope.declareVariable(Throwable.class, "transformationException");
         body.append(new ForLoop()
-                .initialize(position.set(constantInt(0)))
-                .condition(lessThan(position, positionCount))
-                .update(incrementVariable(position, (byte) 2))
+                .initialize(index.set(constantInt(0)))
+                .condition(lessThan(index, size))
+                .update(index.increment())
                 .body(new BytecodeBlock()
                         .append(loadKeyElement)
                         .append(loadValueElement)
@@ -231,29 +249,15 @@ private static MethodHandle generateTransform(Type keyType, Type valueType, Type
                                         ImmutableList.of(
                                                 new TryCatch.CatchBlock(
                                                         new BytecodeBlock()
-                                                                .append(mapBlockBuilder.invoke("closeEntry", BlockBuilder.class).pop())
-                                                                .append(pageBuilder.invoke("declarePosition", void.class))
                                                                 .putVariable(transformationException)
                                                                 .append(invokeStatic(Throwables.class, "throwIfUnchecked", void.class, transformationException))
                                                                 .append(newInstance(RuntimeException.class, transformationException))
                                                                 .throwObject(),
                                                         ImmutableList.of(type(Throwable.class))))))
-                        .append(keySqlType.invoke("appendTo", void.class, block, position, blockBuilder))
+                        .append(keySqlType.invoke("appendTo", void.class, rawKeyBlock, add(index, rawOffset), keyBuilder))
                         .append(writeTransformedValueElement)));
 
-        body.append(mapBlockBuilder
-                .invoke("closeEntry", BlockBuilder.class)
-                .pop());
-        body.append(pageBuilder.invoke("declarePosition", void.class));
-        body.append(constantType(binder, resultMapType)
-                .invoke(
-                        "getObject",
-                        Object.class,
-                        mapBlockBuilder.cast(Block.class),
-                        subtract(mapBlockBuilder.invoke("getPositionCount", int.class), constantInt(1)))
-                .ret());
-
-        Class<?> generatedClass = defineClass(definition, Object.class, binder.getBindings(), MapTransformValuesFunction.class.getClassLoader());
-        return methodHandle(generatedClass, "transform", Object.class, Block.class, BinaryFunctionInterface.class);
+        body.ret();
+        return method;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapValues.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapValues.java
index d68e598d9cde..8c5be5f4cc8b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapValues.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapValues.java
@@ -14,7 +14,7 @@
 package io.trino.operator.scalar;
 
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
@@ -32,12 +32,8 @@ private MapValues() {}
     @SqlType("array(V)")
     public static Block getValues(
             @TypeParameter("V") Type valueType,
-            @SqlType("map(K,V)") Block block)
+            @SqlType("map(K,V)") SqlMap sqlMap)
     {
-        BlockBuilder blockBuilder = valueType.createBlockBuilder(null, block.getPositionCount() / 2);
-        for (int i = 0; i < block.getPositionCount(); i += 2) {
-            valueType.appendTo(block, i + 1, blockBuilder);
-        }
-        return blockBuilder.build();
+        return sqlMap.getRawValueBlock().getRegion(sqlMap.getRawOffset(), sqlMap.getSize());
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MapZipWithFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MapZipWithFunction.java
index 4c5b3165e52b..237e581547d1 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MapZipWithFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MapZipWithFunction.java
@@ -15,10 +15,9 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.metadata.SqlScalarFunction;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.SingleMapBlock;
+import io.trino.spi.block.BufferedMapValueBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
@@ -30,7 +29,6 @@
 import java.lang.invoke.MethodHandle;
 import java.util.Optional;
 
-import static com.google.common.base.Throwables.throwIfUnchecked;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FUNCTION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
@@ -45,14 +43,13 @@ public final class MapZipWithFunction
 {
     public static final MapZipWithFunction MAP_ZIP_WITH_FUNCTION = new MapZipWithFunction();
 
-    private static final MethodHandle METHOD_HANDLE = methodHandle(MapZipWithFunction.class, "mapZipWith", Type.class, Type.class, Type.class, MapType.class, Object.class, Block.class, Block.class, MapZipWithLambda.class);
+    private static final MethodHandle METHOD_HANDLE = methodHandle(MapZipWithFunction.class, "mapZipWith", Type.class, Type.class, Type.class, MapType.class, Object.class, SqlMap.class, SqlMap.class, MapZipWithLambda.class);
     private static final MethodHandle STATE_FACTORY = methodHandle(MapZipWithFunction.class, "createState", MapType.class);
 
     private MapZipWithFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("map_zip_with")
                 .signature(Signature.builder()
-                        .name("map_zip_with")
                         .typeVariable("K")
                         .typeVariable("V1")
                         .typeVariable("V2")
@@ -85,87 +82,66 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
 
     public static Object createState(MapType mapType)
     {
-        return new PageBuilder(ImmutableList.of(mapType));
+        return BufferedMapValueBuilder.createBuffered(mapType);
     }
 
-    public static Block mapZipWith(
+    public static SqlMap mapZipWith(
             Type keyType,
             Type leftValueType,
             Type rightValueType,
             MapType outputMapType,
             Object state,
-            Block leftBlock,
-            Block rightBlock,
+            SqlMap leftMap,
+            SqlMap rightMap,
             MapZipWithLambda function)
     {
-        SingleMapBlock leftMapBlock = (SingleMapBlock) leftBlock;
-        SingleMapBlock rightMapBlock = (SingleMapBlock) rightBlock;
         Type outputValueType = outputMapType.getValueType();
 
-        PageBuilder pageBuilder = (PageBuilder) state;
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-        BlockBuilder mapBlockBuilder = pageBuilder.getBlockBuilder(0);
-        BlockBuilder blockBuilder = mapBlockBuilder.beginBlockEntry();
-
-        // seekKey() can take non-trivial time when key is complicated value, such as a long VARCHAR or ROW.
-        boolean[] keyFound = new boolean[rightMapBlock.getPositionCount()];
-        for (int leftKeyPosition = 0; leftKeyPosition < leftMapBlock.getPositionCount(); leftKeyPosition += 2) {
-            Object key = readNativeValue(keyType, leftMapBlock, leftKeyPosition);
-            Object leftValue = readNativeValue(leftValueType, leftMapBlock, leftKeyPosition + 1);
-
-            int rightValuePosition = rightMapBlock.seekKey(key);
-            Object rightValue = null;
-            if (rightValuePosition != -1) {
-                rightValue = readNativeValue(rightValueType, rightMapBlock, rightValuePosition);
-                keyFound[rightValuePosition / 2] = true;
-            }
+        int leftSize = leftMap.getSize();
+        int leftRawOffset = leftMap.getRawOffset();
+        Block leftRawKeyBlock = leftMap.getRawKeyBlock();
+        Block leftRawValueBlock = leftMap.getRawValueBlock();
+
+        int rightSize = rightMap.getSize();
+        int rightRawOffset = rightMap.getRawOffset();
+        Block rightRawKeyBlock = rightMap.getRawKeyBlock();
+        Block rightRawValueBlock = rightMap.getRawValueBlock();
+
+        int maxOutputSize = (leftSize + rightSize);
+        BufferedMapValueBuilder mapValueBuilder = (BufferedMapValueBuilder) state;
+        return mapValueBuilder.build(maxOutputSize, (keyBuilder, valueBuilder) -> {
+            // seekKey() can take non-trivial time when key is a complicated value, such as a long VARCHAR or ROW.
+            boolean[] keyFound = new boolean[rightSize];
+            for (int leftIndex = 0; leftIndex < leftSize; leftIndex++) {
+                Object key = readNativeValue(keyType, leftRawKeyBlock, leftRawOffset + leftIndex);
+                Object leftValue = readNativeValue(leftValueType, leftRawValueBlock, leftRawOffset + leftIndex);
+
+                int rightIndex = rightMap.seekKey(key);
+                Object rightValue = null;
+                if (rightIndex != -1) {
+                    rightValue = readNativeValue(rightValueType, rightRawValueBlock, rightRawOffset + rightIndex);
+                    keyFound[rightIndex] = true;
+                }
 
-            Object outputValue;
-            try {
-                outputValue = function.apply(key, leftValue, rightValue);
-            }
-            catch (Throwable throwable) {
-                // Restore pageBuilder into a consistent state.
-                mapBlockBuilder.closeEntry();
-                pageBuilder.declarePosition();
+                Object outputValue = function.apply(key, leftValue, rightValue);
 
-                throwIfUnchecked(throwable);
-                throw new RuntimeException(throwable);
+                keyType.appendTo(leftRawKeyBlock, leftRawOffset + leftIndex, keyBuilder);
+                writeNativeValue(outputValueType, valueBuilder, outputValue);
             }
 
-            keyType.appendTo(leftMapBlock, leftKeyPosition, blockBuilder);
-            writeNativeValue(outputValueType, blockBuilder, outputValue);
-        }
+            // iterate over keys that only exists in rightMap
+            for (int rightIndex = 0; rightIndex < rightSize; rightIndex++) {
+                if (!keyFound[rightIndex]) {
+                    Object key = readNativeValue(keyType, rightRawKeyBlock, rightRawOffset + rightIndex);
+                    Object rightValue = readNativeValue(rightValueType, rightRawValueBlock, rightRawOffset + rightIndex);
 
-        // iterate over keys that only exists in rightMapBlock
-        for (int rightKeyPosition = 0; rightKeyPosition < rightMapBlock.getPositionCount(); rightKeyPosition += 2) {
-            if (!keyFound[rightKeyPosition / 2]) {
-                Object key = readNativeValue(keyType, rightMapBlock, rightKeyPosition);
-                Object rightValue = readNativeValue(rightValueType, rightMapBlock, rightKeyPosition + 1);
+                    Object outputValue = function.apply(key, null, rightValue);
 
-                Object outputValue;
-                try {
-                    outputValue = function.apply(key, null, rightValue);
+                    keyType.appendTo(rightRawKeyBlock, rightRawOffset + rightIndex, keyBuilder);
+                    writeNativeValue(outputValueType, valueBuilder, outputValue);
                 }
-                catch (Throwable throwable) {
-                    // Restore pageBuilder into a consistent state.
-                    mapBlockBuilder.closeEntry();
-                    pageBuilder.declarePosition();
-
-                    throwIfUnchecked(throwable);
-                    throw new RuntimeException(throwable);
-                }
-
-                keyType.appendTo(rightMapBlock, rightKeyPosition, blockBuilder);
-                writeNativeValue(outputValueType, blockBuilder, outputValue);
             }
-        }
-
-        mapBlockBuilder.closeEntry();
-        pageBuilder.declarePosition();
-        return outputMapType.getObject(mapBlockBuilder, mapBlockBuilder.getPositionCount() - 1);
+        });
     }
 
     @FunctionalInterface
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MathFunctions.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MathFunctions.java
index 05b8470f16a2..a427da713631 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MathFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MathFunctions.java
@@ -20,23 +20,22 @@
 import com.google.common.primitives.SignedBytes;
 import io.airlift.slice.Slice;
 import io.trino.metadata.SqlScalarFunction;
-import io.trino.operator.aggregation.TypedSet;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.LiteralParameter;
 import io.trino.spi.function.LiteralParameters;
 import io.trino.spi.function.OperatorDependency;
 import io.trino.spi.function.ScalarFunction;
-import io.trino.spi.function.Signature;
 import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.type.Decimals;
 import io.trino.spi.type.Int128;
 import io.trino.spi.type.StandardTypes;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
 import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
+import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
 import io.trino.type.Constraint;
 import org.apache.commons.math3.distribution.BetaDistribution;
 import org.apache.commons.math3.special.Erf;
@@ -46,14 +45,13 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 import static io.airlift.slice.Slices.utf8Slice;
-import static io.trino.operator.aggregation.TypedSet.createEqualityTypedSet;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.StandardErrorCode.NUMERIC_VALUE_OUT_OF_RANGE;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
-import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
+import static io.trino.spi.function.OperatorType.IS_DISTINCT_FROM;
 import static io.trino.spi.type.Decimals.longTenToNth;
 import static io.trino.spi.type.Decimals.overflows;
 import static io.trino.spi.type.DoubleType.DOUBLE;
@@ -64,7 +62,6 @@
 import static io.trino.spi.type.Int128Math.subtract;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.type.DecimalOperators.modulusScalarFunction;
-import static io.trino.type.DecimalOperators.modulusSignatureBuilder;
 import static io.trino.util.Failures.checkCondition;
 import static java.lang.Character.MAX_RADIX;
 import static java.lang.Character.MIN_RADIX;
@@ -75,7 +72,7 @@
 
 public final class MathFunctions
 {
-    public static final SqlScalarFunction DECIMAL_MOD_FUNCTION = decimalModFunction();
+    public static final SqlScalarFunction DECIMAL_MOD_FUNCTION = modulusScalarFunction();
 
     private static final Int128[] DECIMAL_HALF_UNSCALED_FOR_SCALE;
     private static final Int128[] DECIMAL_ALMOST_HALF_UNSCALED_FOR_SCALE;
@@ -539,10 +536,7 @@ public static double mod(@SqlType(StandardTypes.DOUBLE) double num1, @SqlType(St
 
     private static SqlScalarFunction decimalModFunction()
     {
-        Signature signature = modulusSignatureBuilder()
-                .name("mod")
-                .build();
-        return modulusScalarFunction(signature);
+        return modulusScalarFunction();
     }
 
     @Description("Remainder of given quotient")
@@ -837,6 +831,13 @@ public static double round(@SqlType(StandardTypes.DOUBLE) double num, @SqlType(S
         if (rescaledRound != Long.MAX_VALUE) {
             return sign * (rescaledRound / factor);
         }
+        if (Double.isInfinite(rescaled)) {
+            // num has max 17 precisions, so to make round actually do something, decimals must be smaller than 17.
+            // then factor must be smaller than 10^17
+            // then in order for rescaled to be greater than Double.MAX_VALUE, num must be greater than 1.8E291 with many trailing zeros
+            // in which case, rounding is no op anyway
+            return num;
+        }
         return sign * DoubleMath.roundToBigInteger(rescaled, RoundingMode.HALF_UP).doubleValue() / factor;
     }
 
@@ -858,6 +859,11 @@ public static long roundReal(@SqlType(StandardTypes.REAL) long num, @SqlType(Sta
         if (rescaledRound != Long.MAX_VALUE) {
             result = sign * (rescaledRound / factor);
         }
+        else if (Double.isInfinite(rescaled)) {
+            // numInFloat is max at 3.4028235e+38f, to make rescale greater than Double.MAX_VALUE, decimals must be greater than 270
+            // but numInFloat has max 8 precision, so rounding is no op
+            return num;
+        }
         else {
             result = sign * (DoubleMath.roundToBigInteger(rescaled, RoundingMode.HALF_UP).doubleValue() / factor);
         }
@@ -1349,15 +1355,15 @@ public static long widthBucket(@SqlType(StandardTypes.DOUBLE) double operand, @S
     @SqlType(StandardTypes.DOUBLE)
     public static Double cosineSimilarity(
             @OperatorDependency(
-                    operator = EQUAL,
+                    operator = IS_DISTINCT_FROM,
                     argumentTypes = {"varchar", "varchar"},
-                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = NULLABLE_RETURN)) BlockPositionEqual varcharEqual,
+                    convention = @Convention(arguments = {BLOCK_POSITION, BLOCK_POSITION}, result = NULLABLE_RETURN)) BlockPositionIsDistinctFrom varcharDistinct,
             @OperatorDependency(
                     operator = HASH_CODE,
                     argumentTypes = "varchar",
                     convention = @Convention(arguments = BLOCK_POSITION, result = FAIL_ON_NULL)) BlockPositionHashCode varcharHashCode,
-            @SqlType("map(varchar,double)") Block leftMap,
-            @SqlType("map(varchar,double)") Block rightMap)
+            @SqlType("map(varchar,double)") SqlMap leftMap,
+            @SqlType("map(varchar,double)") SqlMap rightMap)
     {
         Double normLeftMap = mapL2Norm(leftMap);
         Double normRightMap = mapL2Norm(rightMap);
@@ -1366,42 +1372,52 @@ public static Double cosineSimilarity(
             return null;
         }
 
-        double dotProduct = mapDotProduct(varcharEqual, varcharHashCode, leftMap, rightMap);
+        double dotProduct = mapDotProduct(varcharDistinct, varcharHashCode, leftMap, rightMap);
 
         return dotProduct / (normLeftMap * normRightMap);
     }
 
-    private static double mapDotProduct(BlockPositionEqual varcharEqual, BlockPositionHashCode varcharHashCode, Block leftMap, Block rightMap)
+    private static double mapDotProduct(BlockPositionIsDistinctFrom varcharDistinct, BlockPositionHashCode varcharHashCode, SqlMap leftMap, SqlMap rightMap)
     {
-        TypedSet rightMapKeys = createEqualityTypedSet(VARCHAR, varcharEqual, varcharHashCode, rightMap.getPositionCount(), "cosine_similarity");
+        int leftRawOffset = leftMap.getRawOffset();
+        Block leftRawKeyBlock = leftMap.getRawKeyBlock();
+        Block leftRawValueBlock = leftMap.getRawValueBlock();
+        int rightRawOffset = rightMap.getRawOffset();
+        Block rightRawKeyBlock = rightMap.getRawKeyBlock();
+        Block rightRawValueBlock = rightMap.getRawValueBlock();
+
+        BlockSet rightMapKeys = new BlockSet(VARCHAR, varcharDistinct, varcharHashCode, rightMap.getSize());
 
-        for (int i = 0; i < rightMap.getPositionCount(); i += 2) {
-            rightMapKeys.add(rightMap, i);
+        for (int i = 0; i < rightMap.getSize(); i++) {
+            rightMapKeys.add(rightRawKeyBlock, rightRawOffset + i);
         }
 
         double result = 0.0;
 
-        for (int i = 0; i < leftMap.getPositionCount(); i += 2) {
-            int position = rightMapKeys.positionOf(leftMap, i);
+        for (int leftIndex = 0; leftIndex < leftMap.getSize(); leftIndex++) {
+            int rightIndex = rightMapKeys.positionOf(leftRawKeyBlock, leftRawOffset + leftIndex);
 
-            if (position != -1) {
-                result += DOUBLE.getDouble(leftMap, i + 1) *
-                        DOUBLE.getDouble(rightMap, 2 * position + 1);
+            if (rightIndex != -1) {
+                result += DOUBLE.getDouble(leftRawValueBlock, leftRawOffset + leftIndex) *
+                        DOUBLE.getDouble(rightRawValueBlock, rightRawOffset + rightIndex);
             }
         }
 
         return result;
     }
 
-    private static Double mapL2Norm(Block map)
+    private static Double mapL2Norm(SqlMap map)
     {
+        int rawOffset = map.getRawOffset();
+        Block rawValueBlock = map.getRawValueBlock();
+
         double norm = 0.0;
 
-        for (int i = 1; i < map.getPositionCount(); i += 2) {
-            if (map.isNull(i)) {
+        for (int i = 0; i < map.getSize(); i++) {
+            if (rawValueBlock.isNull(rawOffset + i)) {
                 return null;
             }
-            norm += DOUBLE.getDouble(map, i) * DOUBLE.getDouble(map, i);
+            norm += DOUBLE.getDouble(rawValueBlock, rawOffset + i) * DOUBLE.getDouble(rawValueBlock, rawOffset + i);
         }
 
         return Math.sqrt(norm);
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/MultimapFromEntriesFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/MultimapFromEntriesFunction.java
index cda225e87a3a..e41c736917f8 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/MultimapFromEntriesFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/MultimapFromEntriesFunction.java
@@ -14,11 +14,12 @@
 package io.trino.operator.scalar;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.operator.aggregation.TypedSet;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedMapValueBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.OperatorDependency;
@@ -36,7 +37,6 @@
 import it.unimi.dsi.fastutil.ints.IntList;
 
 import static com.google.common.base.Verify.verify;
-import static io.trino.operator.aggregation.TypedSet.createDistinctTypedSet;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
@@ -47,17 +47,16 @@
 @Description("Construct a multimap from an array of entries")
 public final class MultimapFromEntriesFunction
 {
-    private static final String NAME = "multimap_from_entries";
     private static final int INITIAL_ENTRY_COUNT = 128;
 
-    private final PageBuilder pageBuilder;
+    private final BufferedMapValueBuilder mapValueBuilder;
     private IntList[] entryIndicesList;
 
     @TypeParameter("K")
     @TypeParameter("V")
     public MultimapFromEntriesFunction(@TypeParameter("map(K,array(V))") Type mapType)
     {
-        pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+        mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
         initializeEntryIndicesList(INITIAL_ENTRY_COUNT);
     }
 
@@ -65,7 +64,7 @@ public MultimapFromEntriesFunction(@TypeParameter("map(K,array(V))") Type mapTyp
     @TypeParameter("V")
     @SqlType("map(K,array(V))")
     @SqlNullable
-    public Block multimapFromEntries(
+    public SqlMap multimapFromEntries(
             @TypeParameter("map(K,array(V))") MapType mapType,
             @OperatorDependency(
                     operator = IS_DISTINCT_FROM,
@@ -81,51 +80,50 @@ public Block multimapFromEntries(
         Type valueType = ((ArrayType) mapType.getValueType()).getElementType();
         RowType mapEntryType = RowType.anonymous(ImmutableList.of(keyType, valueType));
 
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
         int entryCount = mapEntries.getPositionCount();
         if (entryCount > entryIndicesList.length) {
             initializeEntryIndicesList(entryCount);
         }
-        TypedSet keySet = createDistinctTypedSet(keyType, keysDistinctOperator, keyHashCode, entryCount, NAME);
+        BlockSet keySet = new BlockSet(keyType, keysDistinctOperator, keyHashCode, entryCount);
 
         for (int i = 0; i < entryCount; i++) {
             if (mapEntries.isNull(i)) {
                 clearEntryIndices(keySet.size());
                 throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "map entry cannot be null");
             }
-            Block mapEntryBlock = mapEntryType.getObject(mapEntries, i);
+            SqlRow entry = mapEntryType.getObject(mapEntries, i);
+            int rawIndex = entry.getRawIndex();
 
-            if (mapEntryBlock.isNull(0)) {
+            Block keyBlock = entry.getRawFieldBlock(0);
+            if (keyBlock.isNull(rawIndex)) {
                 clearEntryIndices(keySet.size());
                 throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "map key cannot be null");
             }
 
-            if (keySet.add(mapEntryBlock, 0)) {
+            if (keySet.add(keyBlock, rawIndex)) {
                 entryIndicesList[keySet.size() - 1].add(i);
             }
             else {
-                entryIndicesList[keySet.positionOf(mapEntryBlock, 0)].add(i);
+                entryIndicesList[keySet.positionOf(keyBlock, rawIndex)].add(i);
             }
         }
 
-        BlockBuilder multimapBlockBuilder = pageBuilder.getBlockBuilder(0);
-        BlockBuilder mapWriter = multimapBlockBuilder.beginBlockEntry();
-        for (int i = 0; i < keySet.size(); i++) {
-            keyType.appendTo(mapEntryType.getObject(mapEntries, entryIndicesList[i].getInt(0)), 0, mapWriter);
-            BlockBuilder valuesArray = mapWriter.beginBlockEntry();
-            for (int entryIndex : entryIndicesList[i]) {
-                valueType.appendTo(mapEntryType.getObject(mapEntries, entryIndex), 1, valuesArray);
-            }
-            mapWriter.closeEntry();
-        }
+        SqlMap resultMap = mapValueBuilder.build(keySet.size(), (keyBuilder, valueBuilder) -> {
+            for (int i = 0; i < keySet.size(); i++) {
+                IntList indexList = entryIndicesList[i];
 
-        multimapBlockBuilder.closeEntry();
-        pageBuilder.declarePosition();
+                SqlRow keyEntry = mapEntryType.getObject(mapEntries, indexList.getInt(0));
+                keyType.appendTo(keyEntry.getRawFieldBlock(0), keyEntry.getRawIndex(), keyBuilder);
+                ((ArrayBlockBuilder) valueBuilder).buildEntry(elementBuilder -> {
+                    for (int entryIndex : indexList) {
+                        SqlRow valueEntry = mapEntryType.getObject(mapEntries, entryIndex);
+                        valueType.appendTo(valueEntry.getRawFieldBlock(1), valueEntry.getRawIndex(), elementBuilder);
+                    }
+                });
+            }
+        });
         clearEntryIndices(keySet.size());
-        return mapType.getObject(multimapBlockBuilder, multimapBlockBuilder.getPositionCount() - 1);
+        return resultMap;
     }
 
     private void clearEntryIndices(int entryCount)
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ParametricScalar.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ParametricScalar.java
index 1651fb71a69c..8f5fa61d026c 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ParametricScalar.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ParametricScalar.java
@@ -57,9 +57,11 @@ public ParametricScalar(
 
     private static FunctionMetadata createFunctionMetadata(Signature signature, ScalarHeader details, boolean deprecated, FunctionNullability functionNullability)
     {
-        FunctionMetadata.Builder functionMetadata = FunctionMetadata.scalarBuilder()
+        FunctionMetadata.Builder functionMetadata = FunctionMetadata.scalarBuilder(details.getName())
                 .signature(signature);
 
+        details.getAliases().forEach(functionMetadata::alias);
+
         if (details.getDescription().isPresent()) {
             functionMetadata.description(details.getDescription().get());
         }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/Re2JCastToRegexpFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/Re2JCastToRegexpFunction.java
index d5c212a5a387..c91286481eba 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/Re2JCastToRegexpFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/Re2JCastToRegexpFunction.java
@@ -58,9 +58,8 @@ public static SqlScalarFunction castCharToRe2JRegexp(int dfaStatesLimit, int dfa
 
     private Re2JCastToRegexpFunction(String sourceType, int dfaStatesLimit, int dfaRetries, boolean padSpaces)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(CAST)
                 .signature(Signature.builder()
-                        .operatorType(CAST)
                         .returnType(RE2J_REGEXP_SIGNATURE)
                         .argumentType(parseTypeSignature(sourceType, ImmutableSet.of("x")))
                         .build())
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/Re2JRegexpReplaceLambdaFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/Re2JRegexpReplaceLambdaFunction.java
index 7cd6274fa6e1..2e5a09be21e2 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/Re2JRegexpReplaceLambdaFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/Re2JRegexpReplaceLambdaFunction.java
@@ -13,19 +13,18 @@
  */
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
 import com.google.re2j.Matcher;
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.LiteralParameters;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
+import io.trino.spi.type.ArrayType;
 import io.trino.sql.gen.lambda.UnaryFunctionInterface;
 import io.trino.type.Re2JRegexp;
 import io.trino.type.Re2JRegexpType;
@@ -36,7 +35,7 @@
 @Description("Replaces substrings matching a regular expression using a lambda function")
 public final class Re2JRegexpReplaceLambdaFunction
 {
-    private final PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(VARCHAR));
+    private final BufferedArrayValueBuilder arrayValueBuilder = BufferedArrayValueBuilder.createBuffered(new ArrayType(VARCHAR));
 
     @LiteralParameters("x")
     @SqlType("varchar")
@@ -54,13 +53,6 @@ public Slice regexpReplace(
 
         SliceOutput output = new DynamicSliceOutput(source.length());
 
-        // Prepare a BlockBuilder that will be used to create the target block
-        // that will be passed to the lambda function.
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-
         int groupCount = matcher.groupCount();
         int appendPosition = 0;
 
@@ -75,17 +67,17 @@ public Slice regexpReplace(
             appendPosition = end;
 
             // Append the capturing groups to the target block that will be passed to lambda
-            for (int i = 1; i <= groupCount; i++) {
-                Slice matchedGroupSlice = matcher.group(i);
-                if (matchedGroupSlice != null) {
-                    VARCHAR.writeSlice(blockBuilder, matchedGroupSlice);
+            Block target = arrayValueBuilder.build(groupCount, elementBuilder -> {
+                for (int i = 1; i <= groupCount; i++) {
+                    Slice matchedGroupSlice = matcher.group(i);
+                    if (matchedGroupSlice != null) {
+                        VARCHAR.writeSlice(elementBuilder, matchedGroupSlice);
+                    }
+                    else {
+                        elementBuilder.appendNull();
+                    }
                 }
-                else {
-                    blockBuilder.appendNull();
-                }
-            }
-            pageBuilder.declarePositions(groupCount);
-            Block target = blockBuilder.getRegion(blockBuilder.getPositionCount() - groupCount, groupCount);
+            });
 
             // Call the lambda function to replace the block, and append the result to output
             Slice replaced = (Slice) replaceFunction.apply(target);
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/RowToJsonCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/RowToJsonCast.java
index 1bed7637a86c..716fee7a3fb7 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/RowToJsonCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/RowToJsonCast.java
@@ -13,6 +13,7 @@
  */
 package io.trino.operator.scalar;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.DynamicSliceOutput;
@@ -21,6 +22,7 @@
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
@@ -35,7 +37,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static io.trino.operator.scalar.JsonOperators.JSON_FACTORY;
 import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
@@ -44,6 +45,7 @@
 import static io.trino.util.Failures.checkCondition;
 import static io.trino.util.JsonUtil.JsonGeneratorWriter.createJsonGeneratorWriter;
 import static io.trino.util.JsonUtil.canCastToJson;
+import static io.trino.util.JsonUtil.createJsonFactory;
 import static io.trino.util.JsonUtil.createJsonGenerator;
 import static io.trino.util.Reflection.methodHandle;
 
@@ -52,13 +54,14 @@ public class RowToJsonCast
 {
     public static final RowToJsonCast ROW_TO_JSON = new RowToJsonCast();
 
-    private static final MethodHandle METHOD_HANDLE = methodHandle(RowToJsonCast.class, "toJsonObject", List.class, List.class, Block.class);
+    private static final MethodHandle METHOD_HANDLE = methodHandle(RowToJsonCast.class, "toJsonObject", List.class, List.class, SqlRow.class);
+
+    private static final JsonFactory JSON_FACTORY = createJsonFactory();
 
     private RowToJsonCast()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(CAST)
                 .signature(Signature.builder()
-                        .operatorType(CAST)
                         .typeVariableConstraint(
                                 // this is technically a recursive constraint for cast, but TypeRegistry.canCast has explicit handling for row to json cast
                                 TypeVariableConstraint.builder("T")
@@ -96,15 +99,17 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
     }
 
     @UsedByGeneratedCode
-    public static Slice toJsonObject(List<String> fieldNames, List<JsonGeneratorWriter> fieldWriters, Block block)
+    public static Slice toJsonObject(List<String> fieldNames, List<JsonGeneratorWriter> fieldWriters, SqlRow sqlRow)
     {
         try {
+            int rawIndex = sqlRow.getRawIndex();
             SliceOutput output = new DynamicSliceOutput(40);
             try (JsonGenerator jsonGenerator = createJsonGenerator(JSON_FACTORY, output)) {
                 jsonGenerator.writeStartObject();
-                for (int i = 0; i < block.getPositionCount(); i++) {
+                for (int i = 0; i < sqlRow.getFieldCount(); i++) {
                     jsonGenerator.writeFieldName(fieldNames.get(i));
-                    fieldWriters.get(i).writeJsonValue(jsonGenerator, block, i);
+                    Block fieldBlock = sqlRow.getRawFieldBlock(i);
+                    fieldWriters.get(i).writeJsonValue(jsonGenerator, fieldBlock, rawIndex);
                 }
                 jsonGenerator.writeEndObject();
             }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/RowToRowCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/RowToRowCast.java
index d96baba6fe64..46156341f3c6 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/RowToRowCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/RowToRowCast.java
@@ -29,6 +29,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionDependencies;
@@ -40,7 +41,6 @@
 import io.trino.spi.function.TypeVariableConstraint;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignature;
-import io.trino.sql.gen.CachedInstanceBinder;
 import io.trino.sql.gen.CallSiteBinder;
 
 import java.lang.invoke.MethodHandle;
@@ -48,16 +48,18 @@
 import java.util.Objects;
 
 import static io.airlift.bytecode.Access.FINAL;
+import static io.airlift.bytecode.Access.PRIVATE;
 import static io.airlift.bytecode.Access.PUBLIC;
 import static io.airlift.bytecode.Access.STATIC;
 import static io.airlift.bytecode.Access.a;
 import static io.airlift.bytecode.Parameter.arg;
 import static io.airlift.bytecode.ParameterizedType.type;
-import static io.airlift.bytecode.expression.BytecodeExpressions.constantBoolean;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantInt;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantNull;
 import static io.airlift.bytecode.expression.BytecodeExpressions.invokeDynamic;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.airlift.bytecode.expression.BytecodeExpressions.newArray;
+import static io.airlift.bytecode.expression.BytecodeExpressions.newInstance;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
@@ -108,11 +110,10 @@ public class RowToRowCast
 
     private RowToRowCast()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.operatorBuilder(CAST)
                 .signature(Signature.builder()
-                        .operatorType(CAST)
                         .typeVariableConstraint(
-                                // this is technically a recursive constraint for cast, but TypeRegistry.canCast has explicit handling for row to row cast
+                                // this is technically a recursive constraint for cast, but SignatureBinder has explicit handling for row-to-row cast
                                 TypeVariableConstraint.builder("F")
                                         .variadicBound("row")
                                         .castableTo(new TypeSignature("T"))
@@ -148,7 +149,7 @@ public SpecializedSqlScalarFunction specialize(BoundSignature boundSignature, Fu
             throw new TrinoException(StandardErrorCode.INVALID_FUNCTION_ARGUMENT, "the size of fromType and toType must match");
         }
         Class<?> castOperatorClass = generateRowCast(fromType, toType, functionDependencies);
-        MethodHandle methodHandle = methodHandle(castOperatorClass, "castRow", ConnectorSession.class, Block.class);
+        MethodHandle methodHandle = methodHandle(castOperatorClass, "castRow", ConnectorSession.class, SqlRow.class);
         return new ChoicesSpecializedSqlScalarFunction(
                 boundSignature,
                 FAIL_ON_NULL,
@@ -171,79 +172,56 @@ private static Class<?> generateRowCast(Type fromType, Type toType, FunctionDepe
                 a(PUBLIC, FINAL),
                 makeClassName(Joiner.on("$").join("RowCast", BaseEncoding.base16().encode(hashSuffix))),
                 type(Object.class));
+        definition.declareDefaultConstructor(a(PRIVATE));
 
         Parameter session = arg("session", ConnectorSession.class);
-        Parameter row = arg("row", Block.class);
+        Parameter row = arg("row", SqlRow.class);
 
         MethodDefinition method = definition.declareMethod(
                 a(PUBLIC, STATIC),
                 "castRow",
-                type(Block.class),
+                type(SqlRow.class),
                 session,
                 row);
 
         Scope scope = method.getScope();
         BytecodeBlock body = method.getBody();
 
-        Variable wasNull = scope.declareVariable(boolean.class, "wasNull");
-        Variable blockBuilder = scope.createTempVariable(BlockBuilder.class);
-        Variable singleRowBlockWriter = scope.createTempVariable(BlockBuilder.class);
+        Variable fieldBlocks = scope.declareVariable("fieldBlocks", body, newArray(type(Block[].class), toTypes.size()));
+        Variable rawIndex = scope.declareVariable("rawIndex", body, row.invoke("getRawIndex", int.class));
 
-        body.append(wasNull.set(constantBoolean(false)));
-
-        CachedInstanceBinder cachedInstanceBinder = new CachedInstanceBinder(definition, binder);
-
-        // create the row block builder
-        body.append(blockBuilder.set(
-                constantType(binder, toType).invoke(
-                        "createBlockBuilder",
-                        BlockBuilder.class,
-                        constantNull(BlockBuilderStatus.class),
-                        constantInt(1))));
-        body.append(singleRowBlockWriter.set(blockBuilder.invoke("beginBlockEntry", BlockBuilder.class)));
-
-        // loop through to append member blocks
+        Variable fieldBuilder = scope.declareVariable(BlockBuilder.class, "fieldBuilder");
         for (int i = 0; i < toTypes.size(); i++) {
             Type fromElementType = fromTypes.get(i);
             Type toElementType = toTypes.get(i);
 
-            Type currentFromType = fromElementType;
-            if (currentFromType.equals(UNKNOWN)) {
-                body.append(singleRowBlockWriter.invoke("appendNull", BlockBuilder.class).pop());
-                continue;
-            }
+            body.append(fieldBuilder.set(constantType(binder, toElementType).invoke(
+                    "createBlockBuilder",
+                    BlockBuilder.class,
+                    constantNull(BlockBuilderStatus.class),
+                    constantInt(1))));
 
-            MethodHandle castMethod = getNullSafeCast(functionDependencies, fromElementType, toElementType);
-            MethodHandle writeMethod = getNullSafeWrite(toElementType);
-            MethodHandle castAndWrite = collectArguments(writeMethod, 1, castMethod);
-            body.append(invokeDynamic(
-                    BOOTSTRAP_METHOD,
-                    ImmutableList.of(binder.bind(castAndWrite).getBindingId()),
-                    "castAndWriteField",
-                    castAndWrite.type(),
-                    singleRowBlockWriter,
-                    scope.getVariable("session"),
-                    row,
-                    constantInt(i)));
+            if (fromElementType.equals(UNKNOWN)) {
+                body.append(fieldBuilder.invoke("appendNull", BlockBuilder.class).pop());
+            }
+            else {
+                MethodHandle castMethod = getNullSafeCast(functionDependencies, fromElementType, toElementType);
+                MethodHandle writeMethod = getNullSafeWrite(toElementType);
+                MethodHandle castAndWrite = collectArguments(writeMethod, 1, castMethod);
+                body.append(invokeDynamic(
+                        BOOTSTRAP_METHOD,
+                        ImmutableList.of(binder.bind(castAndWrite).getBindingId()),
+                        "castAndWriteField",
+                        castAndWrite.type(),
+                        fieldBuilder,
+                        session,
+                        row.invoke("getRawFieldBlock", Block.class, constantInt(i)),
+                        rawIndex));
+            }
+            body.append(fieldBlocks.setElement(i, fieldBuilder.invoke("build", Block.class)));
         }
 
-        // call blockBuilder.closeEntry() and return the single row block
-        body.append(blockBuilder.invoke("closeEntry", BlockBuilder.class).pop());
-        body.append(constantType(binder, toType)
-                .invoke("getObject", Object.class, blockBuilder.cast(Block.class), constantInt(0))
-                .cast(Block.class)
-                .ret());
-
-        // create constructor
-        MethodDefinition constructorDefinition = definition.declareConstructor(a(PUBLIC));
-        BytecodeBlock constructorBody = constructorDefinition.getBody();
-        Variable thisVariable = constructorDefinition.getThis();
-        constructorBody.comment("super();")
-                .append(thisVariable)
-                .invokeConstructor(Object.class);
-        cachedInstanceBinder.generateInitializations(thisVariable, constructorBody);
-        constructorBody.ret();
-
+        body.append(newInstance(SqlRow.class, constantInt(0), fieldBlocks).ret());
         return defineClass(definition, Object.class, binder.getBindings(), RowToRowCast.class.getClassLoader());
     }
 
@@ -274,7 +252,7 @@ private static MethodHandle getNullSafeCast(FunctionDependencies functionDepende
         MethodHandle castMethod = functionDependencies.getCastImplementation(
                 fromElementType,
                 toElementType,
-                new InvocationConvention(ImmutableList.of(BLOCK_POSITION), NULLABLE_RETURN, true, false))
+                new InvocationConvention(ImmutableList.of(BLOCK_POSITION_NOT_NULL), NULLABLE_RETURN, true, false))
                 .getMethodHandle();
 
         // normalize so cast always has a session
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ScalarHeader.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ScalarHeader.java
index 45229f2c8a43..93e8f3d3c37b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ScalarHeader.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ScalarHeader.java
@@ -13,21 +13,110 @@
  */
 package io.trino.operator.scalar;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import io.trino.spi.function.OperatorType;
+import io.trino.spi.function.ScalarFunction;
+import io.trino.spi.function.ScalarOperator;
+
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
+import java.util.List;
 import java.util.Optional;
+import java.util.Set;
+
+import static com.google.common.base.CaseFormat.LOWER_CAMEL;
+import static com.google.common.base.CaseFormat.LOWER_UNDERSCORE;
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
+import static io.trino.operator.annotations.FunctionsParserHelper.parseDescription;
+import static java.util.Objects.requireNonNull;
 
 public class ScalarHeader
 {
+    private final String name;
+    private final Optional<OperatorType> operatorType;
+    private final Set<String> aliases;
     private final Optional<String> description;
     private final boolean hidden;
     private final boolean deterministic;
 
-    public ScalarHeader(Optional<String> description, boolean hidden, boolean deterministic)
+    public ScalarHeader(String name, Set<String> aliases, Optional<String> description, boolean hidden, boolean deterministic)
     {
-        this.description = description;
+        this.name = requireNonNull(name, "name is null");
+        checkArgument(!name.isEmpty());
+        this.operatorType = Optional.empty();
+        this.aliases = ImmutableSet.copyOf(aliases);
+        aliases.forEach(alias -> checkArgument(!alias.isEmpty()));
+        this.description = requireNonNull(description, "description is null");
         this.hidden = hidden;
         this.deterministic = deterministic;
     }
 
+    public ScalarHeader(OperatorType operatorType, Optional<String> description)
+    {
+        this.name = mangleOperatorName(operatorType);
+        this.operatorType = Optional.of(operatorType);
+        this.description = requireNonNull(description, "description is null");
+        this.aliases = ImmutableSet.of();
+        this.hidden = true;
+        this.deterministic = true;
+    }
+
+    public static List<ScalarHeader> fromAnnotatedElement(AnnotatedElement annotated)
+    {
+        ScalarFunction scalarFunction = annotated.getAnnotation(ScalarFunction.class);
+        ScalarOperator scalarOperator = annotated.getAnnotation(ScalarOperator.class);
+        Optional<String> description = parseDescription(annotated);
+
+        ImmutableList.Builder<ScalarHeader> builder = ImmutableList.builder();
+
+        if (scalarFunction != null) {
+            String baseName = scalarFunction.value().isEmpty() ? camelToSnake(annotatedName(annotated)) : scalarFunction.value();
+            builder.add(new ScalarHeader(baseName, ImmutableSet.copyOf(scalarFunction.alias()), description, scalarFunction.hidden(), scalarFunction.deterministic()));
+        }
+
+        if (scalarOperator != null) {
+            builder.add(new ScalarHeader(scalarOperator.value(), description));
+        }
+
+        List<ScalarHeader> result = builder.build();
+        checkArgument(!result.isEmpty());
+        return result;
+    }
+
+    private static String camelToSnake(String name)
+    {
+        return LOWER_CAMEL.to(LOWER_UNDERSCORE, name);
+    }
+
+    private static String annotatedName(AnnotatedElement annotatedElement)
+    {
+        if (annotatedElement instanceof Class<?> clazz) {
+            return clazz.getSimpleName();
+        }
+        if (annotatedElement instanceof Method method) {
+            return method.getName();
+        }
+
+        throw new IllegalArgumentException("Only Classes and Methods are supported as annotated elements.");
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public Optional<OperatorType> getOperatorType()
+    {
+        return operatorType;
+    }
+
+    public Set<String> getAliases()
+    {
+        return aliases;
+    }
+
     public Optional<String> getDescription()
     {
         return description;
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/SequenceFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/SequenceFunction.java
index 851fae0c8848..49b9b086149a 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/SequenceFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/SequenceFunction.java
@@ -31,6 +31,7 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DateType.DATE;
 import static io.trino.util.Failures.checkCondition;
+import static java.lang.Math.abs;
 import static java.lang.Math.toIntExact;
 
 public final class SequenceFunction
@@ -92,12 +93,11 @@ public static Block sequenceDateYearToMonth(
     {
         checkValidStep(start, stop, step);
 
-        int length = toIntExact(diffDate(MONTH, start, stop) / step + 1);
-        checkMaxEntry(length);
+        int length = checkMaxEntry(diffDate(MONTH, start, stop) / step + 1);
 
         BlockBuilder blockBuilder = DATE.createBlockBuilder(null, length);
 
-        int value = 0;
+        long value = 0;
         for (int i = 0; i < length; ++i) {
             DATE.writeLong(blockBuilder, DateTimeOperators.datePlusIntervalYearToMonth(start, value));
             value += step;
@@ -110,8 +110,7 @@ private static Block fixedWidthSequence(long start, long stop, long step, FixedW
     {
         checkValidStep(start, stop, step);
 
-        int length = toIntExact((stop - start) / step + 1L);
-        checkMaxEntry(length);
+        int length = getLength(start, stop, step);
 
         BlockBuilder blockBuilder = type.createBlockBuilder(null, length);
         for (long i = 0, value = start; i < length; ++i, value += step) {
@@ -120,6 +119,36 @@ private static Block fixedWidthSequence(long start, long stop, long step, FixedW
         return blockBuilder.build();
     }
 
+    private static int getLength(long start, long stop, long step)
+    {
+        // handle the case when start and stop are either both positive, or both negative
+        if ((start > 0 && stop > 0) || (start < 0 && stop < 0)) {
+            int length = checkMaxEntry((stop - start) / step);
+            return checkMaxEntry(length + 1);
+        }
+
+        // handle small step
+        if (step == -1 || step == 1) {
+            checkMaxEntry(start);
+            checkMaxEntry(stop);
+            return checkMaxEntry((stop - start) / step + 1);
+        }
+
+        // handle the remaining cases: start and step are of different sign or zero; step absolute value is greater than 1
+        int startLength = abs(checkMaxEntry(start / step));
+        int stopLength = abs(checkMaxEntry(stop / step));
+        long startRemain = start % step;
+        long stopRemain = stop % step;
+        int remainLength;
+        if (step > 0) {
+            remainLength = startRemain + step <= stopRemain ? 2 : 1;
+        }
+        else {
+            remainLength = startRemain + step >= stopRemain ? 2 : 1;
+        }
+        return checkMaxEntry(startLength + stopLength + remainLength);
+    }
+
     public static void checkValidStep(long start, long stop, long step)
     {
         checkCondition(
@@ -132,11 +161,13 @@ public static void checkValidStep(long start, long stop, long step)
                 "sequence stop value should be greater than or equal to start value if step is greater than zero otherwise stop should be less than or equal to start");
     }
 
-    public static void checkMaxEntry(int length)
+    public static int checkMaxEntry(long length)
     {
         checkCondition(
-                length <= MAX_RESULT_ENTRIES,
+                -MAX_RESULT_ENTRIES <= length && length <= MAX_RESULT_ENTRIES,
                 INVALID_FUNCTION_ARGUMENT,
-                "result of sequence function must not have more than 10000 entries");
+                "result of sequence function must not have more than %d entries".formatted(MAX_RESULT_ENTRIES));
+
+        return toIntExact(length);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/SplitToMapFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/SplitToMapFunction.java
index ccb5b63adfb0..99e2c59fa25e 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/SplitToMapFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/SplitToMapFunction.java
@@ -14,16 +14,15 @@
 
 package io.trino.operator.scalar;
 
-import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slice;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedMapValueBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.MapType;
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.Type;
 
@@ -39,15 +38,15 @@
 @ScalarFunction("split_to_map")
 public class SplitToMapFunction
 {
-    private final PageBuilder pageBuilder;
+    private final BufferedMapValueBuilder mapValueBuilder;
 
     public SplitToMapFunction(@TypeParameter("map(varchar,varchar)") Type mapType)
     {
-        pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+        mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
     }
 
     @SqlType("map(varchar,varchar)")
-    public Block splitToMap(@TypeParameter("map(varchar,varchar)") Type mapType, @SqlType(StandardTypes.VARCHAR) Slice string, @SqlType(StandardTypes.VARCHAR) Slice entryDelimiter, @SqlType(StandardTypes.VARCHAR) Slice keyValueDelimiter)
+    public SqlMap splitToMap(@TypeParameter("map(varchar,varchar)") Type mapType, @SqlType(StandardTypes.VARCHAR) Slice string, @SqlType(StandardTypes.VARCHAR) Slice entryDelimiter, @SqlType(StandardTypes.VARCHAR) Slice keyValueDelimiter)
     {
         checkCondition(entryDelimiter.length() > 0, INVALID_FUNCTION_ARGUMENT, "entryDelimiter is empty");
         checkCondition(keyValueDelimiter.length() > 0, INVALID_FUNCTION_ARGUMENT, "keyValueDelimiter is empty");
@@ -95,18 +94,11 @@ public Block splitToMap(@TypeParameter("map(varchar,varchar)") Type mapType, @Sq
             entryStart = entryEnd + entryDelimiter.length();
         }
 
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-        BlockBuilder singleMapBlockBuilder = blockBuilder.beginBlockEntry();
-        for (Map.Entry<Slice, Slice> entry : map.entrySet()) {
-            VARCHAR.writeSlice(singleMapBlockBuilder, entry.getKey());
-            VARCHAR.writeSlice(singleMapBlockBuilder, entry.getValue());
-        }
-        blockBuilder.closeEntry();
-        pageBuilder.declarePosition();
-
-        return (Block) mapType.getObject(blockBuilder, blockBuilder.getPositionCount() - 1);
+        return mapValueBuilder.build(map.size(), (keyBuilder, valueBuilder) -> {
+            map.forEach((key, value) -> {
+                VARCHAR.writeSlice(keyBuilder, key);
+                VARCHAR.writeSlice(valueBuilder, value);
+            });
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/SplitToMultimapFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/SplitToMultimapFunction.java
index 38b6c7a16cc3..551ebd765935 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/SplitToMultimapFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/SplitToMultimapFunction.java
@@ -15,23 +15,20 @@
 package io.trino.operator.scalar;
 
 import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multimap;
 import io.airlift.slice.Slice;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ArrayBlockBuilder;
+import io.trino.spi.block.BufferedMapValueBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.MapType;
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.Type;
 
-import java.util.Collection;
-import java.util.Map;
-
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.util.Failures.checkCondition;
@@ -40,15 +37,15 @@
 @ScalarFunction("split_to_multimap")
 public class SplitToMultimapFunction
 {
-    private final PageBuilder pageBuilder;
+    private final BufferedMapValueBuilder mapValueBuilder;
 
     public SplitToMultimapFunction(@TypeParameter("map(varchar,array(varchar))") Type mapType)
     {
-        pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+        mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
     }
 
     @SqlType("map(varchar,array(varchar))")
-    public Block splitToMultimap(
+    public SqlMap splitToMultimap(
             @TypeParameter("map(varchar,array(varchar))") Type mapType,
             @SqlType(StandardTypes.VARCHAR) Slice string,
             @SqlType(StandardTypes.VARCHAR) Slice entryDelimiter,
@@ -95,24 +92,15 @@ public Block splitToMultimap(
             entryStart = entryEnd + entryDelimiter.length();
         }
 
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
-        pageBuilder.declarePosition();
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-        BlockBuilder singleMapBlockBuilder = blockBuilder.beginBlockEntry();
-        for (Map.Entry<Slice, Collection<Slice>> entry : multimap.asMap().entrySet()) {
-            VARCHAR.writeSlice(singleMapBlockBuilder, entry.getKey());
-            Collection<Slice> values = entry.getValue();
-            BlockBuilder valueBlockBuilder = singleMapBlockBuilder.beginBlockEntry();
-            for (Slice value : values) {
-                VARCHAR.writeSlice(valueBlockBuilder, value);
-            }
-            singleMapBlockBuilder.closeEntry();
-        }
-        blockBuilder.closeEntry();
-
-        return (Block) mapType.getObject(blockBuilder, blockBuilder.getPositionCount() - 1);
+        return mapValueBuilder.build(multimap.size(), (keyBuilder, valueBuilder) -> {
+            multimap.asMap().forEach((key, values) -> {
+                VARCHAR.writeSlice(keyBuilder, key);
+                ((ArrayBlockBuilder) valueBuilder).buildEntry(elementBuilder -> {
+                    for (Slice value : values) {
+                        VARCHAR.writeSlice(elementBuilder, value);
+                    }
+                });
+            });
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/TDigestFunctions.java b/core/trino-main/src/main/java/io/trino/operator/scalar/TDigestFunctions.java
index 18816962c4ae..b07ced731c52 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/TDigestFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/TDigestFunctions.java
@@ -14,6 +14,7 @@
 package io.trino.operator.scalar;
 
 import com.google.common.collect.Ordering;
+import com.google.common.primitives.Doubles;
 import io.airlift.stats.TDigest;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
@@ -22,10 +23,6 @@
 import io.trino.spi.function.SqlType;
 import io.trino.spi.type.StandardTypes;
 
-import java.util.List;
-import java.util.stream.IntStream;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.util.Failures.checkCondition;
@@ -49,13 +46,13 @@ public static double valueAtQuantile(@SqlType(StandardTypes.TDIGEST) TDigest inp
     @SqlType("array(double)")
     public static Block valuesAtQuantiles(@SqlType(StandardTypes.TDIGEST) TDigest input, @SqlType("array(double)") Block percentilesArrayBlock)
     {
-        List<Double> percentiles = IntStream.range(0, percentilesArrayBlock.getPositionCount())
-                .mapToDouble(i -> DOUBLE.getDouble(percentilesArrayBlock, i))
-                .boxed()
-                .collect(toImmutableList());
-        checkCondition(Ordering.natural().isOrdered(percentiles), INVALID_FUNCTION_ARGUMENT, "percentiles must be sorted in increasing order");
+        double[] percentiles = new double[percentilesArrayBlock.getPositionCount()];
+        for (int i = 0; i < percentiles.length; i++) {
+            percentiles[i] = DOUBLE.getDouble(percentilesArrayBlock, i);
+        }
+        checkCondition(Ordering.natural().isOrdered(Doubles.asList(percentiles)), INVALID_FUNCTION_ARGUMENT, "percentiles must be sorted in increasing order");
         BlockBuilder output = DOUBLE.createBlockBuilder(null, percentilesArrayBlock.getPositionCount());
-        List<Double> valuesAtPercentiles = input.valuesAt(percentiles);
+        double[] valuesAtPercentiles = input.valuesAt(percentiles);
         for (Double value : valuesAtPercentiles) {
             DOUBLE.writeDouble(output, value);
         }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/TryCastFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/TryCastFunction.java
index 6fcb5c21e19a..e2d580aa75ff 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/TryCastFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/TryCastFunction.java
@@ -41,9 +41,8 @@ public class TryCastFunction
 
     public TryCastFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("TRY_CAST")
                 .signature(Signature.builder()
-                        .name("TRY_CAST")
                         .castableToTypeParameter("F", new TypeSignature("T"))
                         .typeVariable("T")
                         .returnType(new TypeSignature("T"))
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/UrlFunctions.java b/core/trino-main/src/main/java/io/trino/operator/scalar/UrlFunctions.java
index 46a09c5cdd4d..6c84b6c42425 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/UrlFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/UrlFunctions.java
@@ -26,8 +26,7 @@
 import io.trino.spi.function.SqlType;
 import io.trino.spi.type.StandardTypes;
 import io.trino.type.Constraint;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/VarbinaryFunctions.java b/core/trino-main/src/main/java/io/trino/operator/scalar/VarbinaryFunctions.java
index 5569dc77fca9..81e6761d93f1 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/VarbinaryFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/VarbinaryFunctions.java
@@ -60,10 +60,7 @@ public static long length(@SqlType(StandardTypes.VARBINARY) Slice slice)
     @SqlType(StandardTypes.VARCHAR)
     public static Slice toBase64(@SqlType(StandardTypes.VARBINARY) Slice slice)
     {
-        if (slice.hasByteArray()) {
-            return Slices.wrappedBuffer(Base64.getEncoder().encode(slice.toByteBuffer()));
-        }
-        return Slices.wrappedBuffer(Base64.getEncoder().encode(slice.getBytes()));
+        return Slices.wrappedHeapBuffer(Base64.getEncoder().encode(slice.toByteBuffer()));
     }
 
     @Description("Decode base64 encoded binary data")
@@ -73,10 +70,7 @@ public static Slice toBase64(@SqlType(StandardTypes.VARBINARY) Slice slice)
     public static Slice fromBase64Varchar(@SqlType("varchar(x)") Slice slice)
     {
         try {
-            if (slice.hasByteArray()) {
-                return Slices.wrappedBuffer(Base64.getDecoder().decode(slice.toByteBuffer()));
-            }
-            return Slices.wrappedBuffer(Base64.getDecoder().decode(slice.getBytes()));
+            return Slices.wrappedHeapBuffer(Base64.getDecoder().decode(slice.toByteBuffer()));
         }
         catch (IllegalArgumentException e) {
             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, e);
@@ -89,10 +83,7 @@ public static Slice fromBase64Varchar(@SqlType("varchar(x)") Slice slice)
     public static Slice fromBase64Varbinary(@SqlType(StandardTypes.VARBINARY) Slice slice)
     {
         try {
-            if (slice.hasByteArray()) {
-                return Slices.wrappedBuffer(Base64.getDecoder().decode(slice.toByteBuffer()));
-            }
-            return Slices.wrappedBuffer(Base64.getDecoder().decode(slice.getBytes()));
+            return Slices.wrappedHeapBuffer(Base64.getDecoder().decode(slice.toByteBuffer()));
         }
         catch (IllegalArgumentException e) {
             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, e);
@@ -104,10 +95,7 @@ public static Slice fromBase64Varbinary(@SqlType(StandardTypes.VARBINARY) Slice
     @SqlType(StandardTypes.VARCHAR)
     public static Slice toBase64Url(@SqlType(StandardTypes.VARBINARY) Slice slice)
     {
-        if (slice.hasByteArray()) {
-            return Slices.wrappedBuffer(Base64.getUrlEncoder().encode(slice.toByteBuffer()));
-        }
-        return Slices.wrappedBuffer(Base64.getUrlEncoder().encode(slice.getBytes()));
+        return Slices.wrappedHeapBuffer(Base64.getUrlEncoder().encode(slice.toByteBuffer()));
     }
 
     @Description("Decode URL safe base64 encoded binary data")
@@ -117,10 +105,7 @@ public static Slice toBase64Url(@SqlType(StandardTypes.VARBINARY) Slice slice)
     public static Slice fromBase64UrlVarchar(@SqlType("varchar(x)") Slice slice)
     {
         try {
-            if (slice.hasByteArray()) {
-                return Slices.wrappedBuffer(Base64.getUrlDecoder().decode(slice.toByteBuffer()));
-            }
-            return Slices.wrappedBuffer(Base64.getUrlDecoder().decode(slice.getBytes()));
+            return Slices.wrappedHeapBuffer(Base64.getUrlDecoder().decode(slice.toByteBuffer()));
         }
         catch (IllegalArgumentException e) {
             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, e);
@@ -133,10 +118,7 @@ public static Slice fromBase64UrlVarchar(@SqlType("varchar(x)") Slice slice)
     public static Slice fromBase64UrlVarbinary(@SqlType(StandardTypes.VARBINARY) Slice slice)
     {
         try {
-            if (slice.hasByteArray()) {
-                return Slices.wrappedBuffer(Base64.getUrlDecoder().decode(slice.toByteBuffer()));
-            }
-            return Slices.wrappedBuffer(Base64.getUrlDecoder().decode(slice.getBytes()));
+            return Slices.wrappedHeapBuffer(Base64.getUrlDecoder().decode(slice.toByteBuffer()));
         }
         catch (IllegalArgumentException e) {
             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, e);
@@ -148,13 +130,7 @@ public static Slice fromBase64UrlVarbinary(@SqlType(StandardTypes.VARBINARY) Sli
     @SqlType(StandardTypes.VARCHAR)
     public static Slice toBase32(@SqlType(StandardTypes.VARBINARY) Slice slice)
     {
-        String encoded;
-        if (slice.hasByteArray()) {
-            encoded = BaseEncoding.base32().encode(slice.byteArray(), slice.byteArrayOffset(), slice.length());
-        }
-        else {
-            encoded = BaseEncoding.base32().encode(slice.getBytes());
-        }
+        String encoded = BaseEncoding.base32().encode(slice.byteArray(), slice.byteArrayOffset(), slice.length());
         return Slices.utf8Slice(encoded);
     }
 
@@ -196,20 +172,11 @@ private static Slice decodeBase32(Slice slice)
     public static Slice toHex(@SqlType(StandardTypes.VARBINARY) Slice slice)
     {
         byte[] result = new byte[slice.length() * 2];
-        if (slice.hasByteArray()) {
-            byte[] source = slice.byteArray();
-            for (int sourceIndex = slice.byteArrayOffset(), resultIndex = 0; resultIndex < result.length; sourceIndex++, resultIndex += 2) {
-                int value = source[sourceIndex] & 0xFF;
-                result[resultIndex] = UPPERCASE_HEX_DIGITS[(value & 0xF0) >>> 4];
-                result[resultIndex + 1] = UPPERCASE_HEX_DIGITS[(value & 0x0F)];
-            }
-        }
-        else {
-            for (int sourceIndex = 0, resultIndex = 0; resultIndex < result.length; sourceIndex++, resultIndex += 2) {
-                int value = slice.getByte(sourceIndex) & 0xFF;
-                result[resultIndex] = UPPERCASE_HEX_DIGITS[(value & 0xF0) >>> 4];
-                result[resultIndex + 1] = UPPERCASE_HEX_DIGITS[(value & 0x0F)];
-            }
+        byte[] source = slice.byteArray();
+        for (int sourceIndex = slice.byteArrayOffset(), resultIndex = 0; resultIndex < result.length; sourceIndex++, resultIndex += 2) {
+            int value = source[sourceIndex] & 0xFF;
+            result[resultIndex] = UPPERCASE_HEX_DIGITS[(value & 0xF0) >>> 4];
+            result[resultIndex + 1] = UPPERCASE_HEX_DIGITS[(value & 0x0F)];
         }
         return Slices.wrappedBuffer(result);
     }
@@ -227,20 +194,11 @@ public static Slice fromHexVarchar(@SqlType("varchar(x)") Slice slice)
 
         try {
             byte[] result = new byte[resultLength];
-            if (slice.hasByteArray()) {
-                byte[] source = slice.byteArray();
-                for (int sourceIndex = slice.byteArrayOffset(), resultIndex = 0; resultIndex < result.length; resultIndex++, sourceIndex += 2) {
-                    int high = HexFormat.fromHexDigit(source[sourceIndex]);
-                    int low = HexFormat.fromHexDigit(source[sourceIndex + 1]);
-                    result[resultIndex] = (byte) ((high << 4) | low);
-                }
-            }
-            else {
-                for (int sourceIndex = 0, resultIndex = 0; resultIndex < result.length; resultIndex++, sourceIndex += 2) {
-                    int high = HexFormat.fromHexDigit(slice.getByte(sourceIndex));
-                    int low = HexFormat.fromHexDigit(slice.getByte(sourceIndex + 1));
-                    result[resultIndex] = (byte) ((high << 4) | low);
-                }
+            byte[] source = slice.byteArray();
+            for (int sourceIndex = slice.byteArrayOffset(), resultIndex = 0; resultIndex < result.length; resultIndex++, sourceIndex += 2) {
+                int high = HexFormat.fromHexDigit(source[sourceIndex]);
+                int low = HexFormat.fromHexDigit(source[sourceIndex + 1]);
+                result[resultIndex] = (byte) ((high << 4) | low);
             }
             return Slices.wrappedBuffer(result);
         }
@@ -417,12 +375,7 @@ public static Slice fromHexVarbinary(@SqlType(StandardTypes.VARBINARY) Slice sli
     public static long crc32(@SqlType(StandardTypes.VARBINARY) Slice slice)
     {
         CRC32 crc32 = new CRC32();
-        if (slice.hasByteArray()) {
-            crc32.update(slice.byteArray(), slice.byteArrayOffset(), slice.length());
-        }
-        else {
-            crc32.update(slice.toByteBuffer());
-        }
+        crc32.update(slice.byteArray(), slice.byteArrayOffset(), slice.length());
         return crc32.getValue();
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/VersionFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/VersionFunction.java
index 5b4ef6c6cac9..10e61a57bc44 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/VersionFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/VersionFunction.java
@@ -36,9 +36,8 @@ public final class VersionFunction
 
     public VersionFunction(String nodeVersion)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("version")
                 .signature(Signature.builder()
-                        .name("version")
                         .returnType(VARCHAR)
                         .build())
                 .hidden()
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ZipFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ZipFunction.java
index e792ffc75ac5..34bbd56057ad 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ZipFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ZipFunction.java
@@ -16,7 +16,7 @@
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.metadata.SqlScalarFunction;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
@@ -63,9 +63,8 @@ private ZipFunction(int arity)
 
     private ZipFunction(List<String> typeParameters)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("zip")
                 .signature(Signature.builder()
-                        .name("zip")
                         .typeVariableConstraints(typeParameters.stream().map(TypeVariableConstraint::typeVariable).collect(toImmutableList()))
                         .returnType(arrayType(rowType(typeParameters.stream()
                                 .map(TypeSignature::new)
@@ -103,19 +102,24 @@ public static Block zip(List<Type> types, Block... arrays)
             biggestCardinality = Math.max(biggestCardinality, array.getPositionCount());
         }
         RowType rowType = RowType.anonymous(types);
-        BlockBuilder outputBuilder = rowType.createBlockBuilder(null, biggestCardinality);
+        RowBlockBuilder outputBuilder = rowType.createBlockBuilder(null, biggestCardinality);
         for (int outputPosition = 0; outputPosition < biggestCardinality; outputPosition++) {
-            BlockBuilder rowBuilder = outputBuilder.beginBlockEntry();
+            buildRow(types, outputBuilder, outputPosition, arrays);
+        }
+        return outputBuilder.build();
+    }
+
+    private static void buildRow(List<Type> types, RowBlockBuilder outputBuilder, int outputPosition, Block[] arrays)
+    {
+        outputBuilder.buildEntry(fieldBuilders -> {
             for (int fieldIndex = 0; fieldIndex < arrays.length; fieldIndex++) {
                 if (arrays[fieldIndex].getPositionCount() <= outputPosition) {
-                    rowBuilder.appendNull();
+                    fieldBuilders.get(fieldIndex).appendNull();
                 }
                 else {
-                    types.get(fieldIndex).appendTo(arrays[fieldIndex], outputPosition, rowBuilder);
+                    types.get(fieldIndex).appendTo(arrays[fieldIndex], outputPosition, fieldBuilders.get(fieldIndex));
                 }
             }
-            outputBuilder.closeEntry();
-        }
-        return outputBuilder.build();
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/ZipWithFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/ZipWithFunction.java
index 9c686c7c68fa..8a1dd6873861 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/ZipWithFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/ZipWithFunction.java
@@ -15,9 +15,8 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.metadata.SqlScalarFunction;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedArrayValueBuilder;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
@@ -29,7 +28,6 @@
 import java.lang.invoke.MethodHandle;
 import java.util.Optional;
 
-import static com.google.common.base.Throwables.throwIfUnchecked;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FUNCTION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
@@ -50,9 +48,8 @@ public final class ZipWithFunction
 
     private ZipWithFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("zip_with")
                 .signature(Signature.builder()
-                        .name("zip_with")
                         .typeVariable("T")
                         .typeVariable("U")
                         .typeVariable("R")
@@ -84,7 +81,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
 
     public static Object createState(ArrayType arrayType)
     {
-        return new PageBuilder(ImmutableList.of(arrayType));
+        return BufferedArrayValueBuilder.createBuffered(arrayType);
     }
 
     public static Block zipWith(
@@ -101,33 +98,14 @@ public static Block zipWith(
         int rightPositionCount = rightBlock.getPositionCount();
         int outputPositionCount = max(leftPositionCount, rightPositionCount);
 
-        PageBuilder pageBuilder = (PageBuilder) state;
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-        BlockBuilder arrayBlockBuilder = pageBuilder.getBlockBuilder(0);
-        BlockBuilder blockBuilder = arrayBlockBuilder.beginBlockEntry();
-
-        for (int position = 0; position < outputPositionCount; position++) {
-            Object left = position < leftPositionCount ? readNativeValue(leftElementType, leftBlock, position) : null;
-            Object right = position < rightPositionCount ? readNativeValue(rightElementType, rightBlock, position) : null;
-            Object output;
-            try {
-                output = function.apply(left, right);
-            }
-            catch (Throwable throwable) {
-                // Restore pageBuilder into a consistent state.
-                arrayBlockBuilder.closeEntry();
-                pageBuilder.declarePosition();
-
-                throwIfUnchecked(throwable);
-                throw new RuntimeException(throwable);
+        BufferedArrayValueBuilder arrayValueBuilder = (BufferedArrayValueBuilder) state;
+        return arrayValueBuilder.build(outputPositionCount, valueBuilder -> {
+            for (int position = 0; position < outputPositionCount; position++) {
+                Object left = position < leftPositionCount ? readNativeValue(leftElementType, leftBlock, position) : null;
+                Object right = position < rightPositionCount ? readNativeValue(rightElementType, rightBlock, position) : null;
+                Object output = function.apply(left, right);
+                writeNativeValue(outputElementType, valueBuilder, output);
             }
-            writeNativeValue(outputElementType, blockBuilder, output);
-        }
-
-        arrayBlockBuilder.closeEntry();
-        pageBuilder.declarePosition();
-        return outputArrayType.getObject(arrayBlockBuilder, arrayBlockBuilder.getPositionCount() - 1);
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/OperatorValidator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/OperatorValidator.java
index dd3a5d71da26..4fc039614e7b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/OperatorValidator.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/OperatorValidator.java
@@ -73,6 +73,7 @@ public static void validateOperator(OperatorType operatorType, TypeSignature ret
             case IS_DISTINCT_FROM:
             case XX_HASH_64:
             case INDETERMINATE:
+            case READ_VALUE:
                 // TODO
         }
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/ParametricScalarImplementation.java b/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/ParametricScalarImplementation.java
index 827061ca2f66..2ced4b20154c 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/ParametricScalarImplementation.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/ParametricScalarImplementation.java
@@ -26,6 +26,7 @@
 import io.trino.operator.scalar.ChoicesSpecializedSqlScalarFunction.ScalarImplementationChoice;
 import io.trino.operator.scalar.SpecializedSqlScalarFunction;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BlockIndex;
 import io.trino.spi.function.BlockPosition;
@@ -59,7 +60,7 @@
 import java.util.stream.Stream;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
@@ -76,11 +77,14 @@
 import static io.trino.operator.annotations.ImplementationDependency.validateImplementationDependencyAnnotation;
 import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_ERROR;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FUNCTION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.IN_OUT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NULL_FLAG;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.parseTypeSignature;
@@ -122,9 +126,9 @@ private ParametricScalarImplementation(
         }
 
         ParametricScalarImplementationChoice defaultChoice = choices.get(0);
-        boolean expression = defaultChoice.getArgumentConventions().stream()
-                .noneMatch(BLOCK_POSITION::equals);
-        checkArgument(expression, "default choice can not use the BLOCK_AND_POSITION calling convention: %s", signature);
+        boolean hasBlockPositionArgument = defaultChoice.getArgumentConventions().stream()
+                .noneMatch(argumentConvention -> BLOCK_POSITION == argumentConvention || BLOCK_POSITION_NOT_NULL == argumentConvention);
+        checkArgument(hasBlockPositionArgument, "default choice can not use the block and position calling convention: %s", signature);
 
         boolean returnNullability = defaultChoice.getReturnConvention().isNullable();
         checkArgument(choices.stream().allMatch(choice -> choice.getReturnConvention().isNullable() == returnNullability), "all choices must have the same nullable flag: %s", signature);
@@ -219,17 +223,6 @@ public List<ParametricScalarImplementationChoice> getChoices()
         return choices;
     }
 
-    @Override
-    public ParametricScalarImplementation withAlias(String alias)
-    {
-        return new ParametricScalarImplementation(
-                signature.withName(alias),
-                argumentNativeContainerTypes,
-                specializedTypeParameters,
-                choices,
-                returnNativeContainerType);
-    }
-
     private static MethodType javaMethodType(ParametricScalarImplementationChoice choice, BoundSignature signature)
     {
         // This method accomplishes two purposes:
@@ -260,10 +253,16 @@ private static MethodType javaMethodType(ParametricScalarImplementationChoice ch
                 case BOXED_NULLABLE:
                     methodHandleParameterTypes.add(Primitives.wrap(signatureType.getJavaType()));
                     break;
+                case BLOCK_POSITION_NOT_NULL:
                 case BLOCK_POSITION:
                     methodHandleParameterTypes.add(Block.class);
                     methodHandleParameterTypes.add(int.class);
                     break;
+                case VALUE_BLOCK_POSITION:
+                case VALUE_BLOCK_POSITION_NOT_NULL:
+                    methodHandleParameterTypes.add(ValueBlock.class);
+                    methodHandleParameterTypes.add(int.class);
+                    break;
                 case IN_OUT:
                     methodHandleParameterTypes.add(InOut.class);
                     break;
@@ -298,13 +297,8 @@ private static boolean matches(List<Boolean> argumentNullability, List<Invocatio
                     return false;
                 }
             }
-            else {
-                // block and position can be nullable or not
-                if (argumentConvention != BLOCK_POSITION) {
-                    if (expectedNullable != argumentConvention.isNullable()) {
-                        return false;
-                    }
-                }
+            else if (expectedNullable != argumentConvention.isNullable()) {
+                return false;
             }
         }
         return true;
@@ -376,7 +370,7 @@ private ParametricScalarImplementationChoice(
             this.constructorDependencies = ImmutableList.copyOf(requireNonNull(constructorDependencies, "constructorDependencies is null"));
 
             this.numberOfBlockPositionArguments = (int) argumentConventions.stream()
-                    .filter(BLOCK_POSITION::equals)
+                    .filter(argumentConvention -> BLOCK_POSITION == argumentConvention || BLOCK_POSITION_NOT_NULL == argumentConvention)
                     .count();
         }
 
@@ -500,10 +494,9 @@ public static final class Parser
 
         private final ParametricScalarImplementationChoice choice;
 
-        Parser(String functionName, Method method, Optional<Constructor<?>> constructor)
+        Parser(Method method, Optional<Constructor<?>> constructor)
         {
             Signature.Builder signatureBuilder = Signature.builder();
-            signatureBuilder.name(requireNonNull(functionName, "functionName is null"));
             boolean nullable = method.getAnnotation(SqlNullable.class) != null;
             checkArgument(nullable || !containsLegacyNullable(method.getAnnotations()), "Method [%s] is annotated with @Nullable but not @SqlNullable", method);
 
@@ -614,18 +607,24 @@ private void parseArguments(Method method, Signature.Builder signatureBuilder, L
                     else {
                         // value type
                         InvocationArgumentConvention argumentConvention;
-                        if (Stream.of(annotations).anyMatch(SqlNullable.class::isInstance)) {
-                            checkCondition(!parameterType.isPrimitive(), FUNCTION_IMPLEMENTATION_ERROR, "Method [%s] has parameter with primitive type %s annotated with @SqlNullable", method, parameterType.getSimpleName());
+                        boolean nullable = Stream.of(annotations).anyMatch(SqlNullable.class::isInstance);
+                        if (Stream.of(annotations).anyMatch(BlockPosition.class::isInstance)) {
+                            verify(method.getParameterCount() > (parameterIndex + 1));
 
-                            argumentConvention = BOXED_NULLABLE;
+                            if (parameterType == Block.class) {
+                                argumentConvention = nullable ? BLOCK_POSITION : BLOCK_POSITION_NOT_NULL;
+                            }
+                            else {
+                                verify(ValueBlock.class.isAssignableFrom(parameterType));
+                                argumentConvention = nullable ? VALUE_BLOCK_POSITION : VALUE_BLOCK_POSITION_NOT_NULL;
+                            }
+                            Annotation[] parameterAnnotations = method.getParameterAnnotations()[parameterIndex + 1];
+                            verify(Stream.of(parameterAnnotations).anyMatch(BlockIndex.class::isInstance));
                         }
-                        else if (Stream.of(annotations).anyMatch(BlockPosition.class::isInstance)) {
-                            checkState(method.getParameterCount() > (parameterIndex + 1));
-                            checkState(parameterType == Block.class);
+                        else if (nullable) {
+                            checkCondition(!parameterType.isPrimitive(), FUNCTION_IMPLEMENTATION_ERROR, "Method [%s] has parameter with primitive type %s annotated with @SqlNullable", method, parameterType.getSimpleName());
 
-                            argumentConvention = BLOCK_POSITION;
-                            Annotation[] parameterAnnotations = method.getParameterAnnotations()[parameterIndex + 1];
-                            checkState(Stream.of(parameterAnnotations).anyMatch(BlockIndex.class::isInstance));
+                            argumentConvention = BOXED_NULLABLE;
                         }
                         else if (parameterType.equals(InOut.class)) {
                             argumentConvention = IN_OUT;
@@ -656,7 +655,7 @@ else if (parameterType.equals(InOut.class)) {
                             }
                         }
 
-                        if (argumentConvention == BLOCK_POSITION) {
+                        if (argumentConvention == BLOCK_POSITION || argumentConvention == BLOCK_POSITION_NOT_NULL || argumentConvention == VALUE_BLOCK_POSITION || argumentConvention == VALUE_BLOCK_POSITION_NOT_NULL) {
                             argumentNativeContainerTypes.add(Optional.of(type.nativeContainerType()));
                         }
                         else {
@@ -667,10 +666,7 @@ else if (parameterType.equals(InOut.class)) {
                         }
 
                         argumentConventions.add(argumentConvention);
-                        parameterIndex++;
-                        if (argumentConvention == NULL_FLAG || argumentConvention == BLOCK_POSITION) {
-                            parameterIndex++;
-                        }
+                        parameterIndex += argumentConvention.getParameterCount();
                     }
                 }
             }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/ScalarFromAnnotationsParser.java b/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/ScalarFromAnnotationsParser.java
index 886e9b40b268..c8ba2d18ce1b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/ScalarFromAnnotationsParser.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/ScalarFromAnnotationsParser.java
@@ -19,6 +19,7 @@
 import io.trino.operator.ParametricImplementationsGroup;
 import io.trino.operator.annotations.FunctionsParserHelper;
 import io.trino.operator.scalar.ParametricScalar;
+import io.trino.operator.scalar.ScalarHeader;
 import io.trino.operator.scalar.annotations.ParametricScalarImplementation.SpecializedSignature;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.ScalarOperator;
@@ -57,7 +58,7 @@ public static List<SqlScalarFunction> parseFunctionDefinitions(Class<?> clazz)
     {
         ImmutableList.Builder<SqlScalarFunction> builder = ImmutableList.builder();
         for (ScalarHeaderAndMethods methods : findScalarsInFunctionSetClass(clazz)) {
-            boolean deprecated = methods.getMethods().iterator().next().getAnnotationsByType(Deprecated.class).length > 0;
+            boolean deprecated = methods.methods().iterator().next().getAnnotationsByType(Deprecated.class).length > 0;
             // Non-static function only makes sense in classes annotated with @ScalarFunction or @ScalarOperator.
             builder.add(parseParametricScalar(methods, FunctionsParserHelper.findConstructor(clazz), deprecated));
         }
@@ -67,10 +68,10 @@ public static List<SqlScalarFunction> parseFunctionDefinitions(Class<?> clazz)
     private static List<ScalarHeaderAndMethods> findScalarsInFunctionDefinitionClass(Class<?> annotated)
     {
         ImmutableList.Builder<ScalarHeaderAndMethods> builder = ImmutableList.builder();
-        List<ScalarImplementationHeader> classHeaders = ScalarImplementationHeader.fromAnnotatedElement(annotated);
+        List<ScalarHeader> classHeaders = ScalarHeader.fromAnnotatedElement(annotated);
         checkArgument(!classHeaders.isEmpty(), "Class [%s] that defines function must be annotated with @ScalarFunction or @ScalarOperator", annotated.getName());
 
-        for (ScalarImplementationHeader header : classHeaders) {
+        for (ScalarHeader header : classHeaders) {
             Set<Method> methods = FunctionsParserHelper.findPublicMethodsWithAnnotation(annotated, SqlType.class, ScalarFunction.class, ScalarOperator.class);
             checkCondition(!methods.isEmpty(), FUNCTION_IMPLEMENTATION_ERROR, "Parametric class [%s] does not have any annotated methods", annotated.getName());
             for (Method method : methods) {
@@ -89,7 +90,7 @@ private static List<ScalarHeaderAndMethods> findScalarsInFunctionSetClass(Class<
         for (Method method : FunctionsParserHelper.findPublicMethodsWithAnnotation(annotated, SqlType.class, ScalarFunction.class, ScalarOperator.class)) {
             checkCondition((method.getAnnotation(ScalarFunction.class) != null) || (method.getAnnotation(ScalarOperator.class) != null),
                     FUNCTION_IMPLEMENTATION_ERROR, "Method [%s] annotated with @SqlType is missing @ScalarFunction or @ScalarOperator", method);
-            for (ScalarImplementationHeader header : ScalarImplementationHeader.fromAnnotatedElement(method)) {
+            for (ScalarHeader header : ScalarHeader.fromAnnotatedElement(method)) {
                 builder.add(new ScalarHeaderAndMethods(header, ImmutableSet.of(method)));
             }
         }
@@ -100,12 +101,9 @@ private static List<ScalarHeaderAndMethods> findScalarsInFunctionSetClass(Class<
 
     private static SqlScalarFunction parseParametricScalar(ScalarHeaderAndMethods scalar, Optional<Constructor<?>> constructor, boolean deprecated)
     {
-        ScalarImplementationHeader header = scalar.getHeader();
-        checkArgument(!header.getName().isEmpty());
-
         Map<SpecializedSignature, ParametricScalarImplementation.Builder> signatures = new HashMap<>();
-        for (Method method : scalar.getMethods()) {
-            ParametricScalarImplementation.Parser implementation = new ParametricScalarImplementation.Parser(header.getName(), method, constructor);
+        for (Method method : scalar.methods()) {
+            ParametricScalarImplementation.Parser implementation = new ParametricScalarImplementation.Parser(method, constructor);
             if (!signatures.containsKey(implementation.getSpecializedSignature())) {
                 ParametricScalarImplementation.Builder builder = new ParametricScalarImplementation.Builder(
                         implementation.getSignature(),
@@ -128,31 +126,18 @@ private static SqlScalarFunction parseParametricScalar(ScalarHeaderAndMethods sc
         ParametricImplementationsGroup<ParametricScalarImplementation> implementations = implementationsBuilder.build();
         Signature scalarSignature = implementations.getSignature();
 
-        header.getOperatorType().ifPresent(operatorType ->
+        scalar.header().getOperatorType().ifPresent(operatorType ->
                 validateOperator(operatorType, scalarSignature.getReturnType(), scalarSignature.getArgumentTypes()));
 
-        return new ParametricScalar(scalarSignature, header.getHeader(), implementations, deprecated);
+        return new ParametricScalar(scalarSignature, scalar.header(), implementations, deprecated);
     }
 
-    private static class ScalarHeaderAndMethods
+    private record ScalarHeaderAndMethods(ScalarHeader header, Set<Method> methods)
     {
-        private final ScalarImplementationHeader header;
-        private final Set<Method> methods;
-
-        public ScalarHeaderAndMethods(ScalarImplementationHeader header, Set<Method> methods)
-        {
-            this.header = requireNonNull(header);
-            this.methods = requireNonNull(methods);
-        }
-
-        public ScalarImplementationHeader getHeader()
-        {
-            return header;
-        }
-
-        public Set<Method> getMethods()
+        private ScalarHeaderAndMethods
         {
-            return methods;
+            requireNonNull(header);
+            requireNonNull(methods);
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/ScalarImplementationHeader.java b/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/ScalarImplementationHeader.java
deleted file mode 100644
index 57712a2a7740..000000000000
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/annotations/ScalarImplementationHeader.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.scalar.annotations;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.operator.scalar.ScalarHeader;
-import io.trino.spi.function.OperatorType;
-import io.trino.spi.function.ScalarFunction;
-import io.trino.spi.function.ScalarOperator;
-
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Optional;
-
-import static com.google.common.base.CaseFormat.LOWER_CAMEL;
-import static com.google.common.base.CaseFormat.LOWER_UNDERSCORE;
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
-import static io.trino.operator.annotations.FunctionsParserHelper.parseDescription;
-import static java.util.Objects.requireNonNull;
-
-public class ScalarImplementationHeader
-{
-    private final String name;
-    private final Optional<OperatorType> operatorType;
-    private final ScalarHeader header;
-
-    private ScalarImplementationHeader(String name, ScalarHeader header)
-    {
-        this.name = requireNonNull(name);
-        this.operatorType = Optional.empty();
-        this.header = requireNonNull(header);
-    }
-
-    private ScalarImplementationHeader(OperatorType operatorType, ScalarHeader header)
-    {
-        this.name = mangleOperatorName(operatorType);
-        this.operatorType = Optional.of(operatorType);
-        this.header = requireNonNull(header);
-    }
-
-    private static String annotatedName(AnnotatedElement annotatedElement)
-    {
-        if (annotatedElement instanceof Class<?>) {
-            return ((Class<?>) annotatedElement).getSimpleName();
-        }
-        if (annotatedElement instanceof Method) {
-            return ((Method) annotatedElement).getName();
-        }
-
-        checkArgument(false, "Only Classes and Methods are supported as annotated elements.");
-        return null;
-    }
-
-    private static String camelToSnake(String name)
-    {
-        return LOWER_CAMEL.to(LOWER_UNDERSCORE, name);
-    }
-
-    public static List<ScalarImplementationHeader> fromAnnotatedElement(AnnotatedElement annotated)
-    {
-        ScalarFunction scalarFunction = annotated.getAnnotation(ScalarFunction.class);
-        ScalarOperator scalarOperator = annotated.getAnnotation(ScalarOperator.class);
-        Optional<String> description = parseDescription(annotated);
-
-        ImmutableList.Builder<ScalarImplementationHeader> builder = ImmutableList.builder();
-
-        if (scalarFunction != null) {
-            String baseName = scalarFunction.value().isEmpty() ? camelToSnake(annotatedName(annotated)) : scalarFunction.value();
-            builder.add(new ScalarImplementationHeader(baseName, new ScalarHeader(description, scalarFunction.hidden(), scalarFunction.deterministic())));
-
-            for (String alias : scalarFunction.alias()) {
-                builder.add(new ScalarImplementationHeader(alias, new ScalarHeader(description, scalarFunction.hidden(), scalarFunction.deterministic())));
-            }
-        }
-
-        if (scalarOperator != null) {
-            builder.add(new ScalarImplementationHeader(scalarOperator.value(), new ScalarHeader(description, true, true)));
-        }
-
-        List<ScalarImplementationHeader> result = builder.build();
-        checkArgument(!result.isEmpty());
-        return result;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public Optional<OperatorType> getOperatorType()
-    {
-        return operatorType;
-    }
-
-    public Optional<String> getDescription()
-    {
-        return header.getDescription();
-    }
-
-    public boolean isHidden()
-    {
-        return header.isHidden();
-    }
-
-    public boolean isDeterministic()
-    {
-        return header.isDeterministic();
-    }
-
-    public ScalarHeader getHeader()
-    {
-        return header;
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonArrayFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonArrayFunction.java
index 07cf06316ae3..9362fc88989f 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonArrayFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonArrayFunction.java
@@ -24,7 +24,7 @@
 import io.trino.operator.scalar.ChoicesSpecializedSqlScalarFunction;
 import io.trino.operator.scalar.SpecializedSqlScalarFunction;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
@@ -34,7 +34,6 @@
 import io.trino.type.Json2016Type;
 
 import java.lang.invoke.MethodHandle;
-import java.util.List;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.json.JsonInputErrorNode.JSON_ERROR;
@@ -54,14 +53,13 @@ public class JsonArrayFunction
 {
     public static final JsonArrayFunction JSON_ARRAY_FUNCTION = new JsonArrayFunction();
     public static final String JSON_ARRAY_FUNCTION_NAME = "$json_array";
-    private static final MethodHandle METHOD_HANDLE = methodHandle(JsonArrayFunction.class, "jsonArray", RowType.class, Block.class, boolean.class);
+    private static final MethodHandle METHOD_HANDLE = methodHandle(JsonArrayFunction.class, "jsonArray", RowType.class, SqlRow.class, boolean.class);
     private static final JsonNode EMPTY_ARRAY = new ArrayNode(JsonNodeFactory.instance);
 
     private JsonArrayFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(JSON_ARRAY_FUNCTION_NAME)
                 .signature(Signature.builder()
-                        .name(JSON_ARRAY_FUNCTION_NAME)
                         .typeVariable("E")
                         .returnType(new TypeSignature(JSON_2016))
                         .argumentTypes(ImmutableList.of(new TypeSignature("E"), new TypeSignature(BOOLEAN)))
@@ -86,18 +84,18 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
     }
 
     @UsedByGeneratedCode
-    public static JsonNode jsonArray(RowType elementsRowType, Block elementsRow, boolean nullOnNull)
+    public static JsonNode jsonArray(RowType elementsRowType, SqlRow elementsRow, boolean nullOnNull)
     {
         if (JSON_NO_PARAMETERS_ROW_TYPE.equals(elementsRowType)) {
             return EMPTY_ARRAY;
         }
 
-        List<Block> elements = elementsRow.getChildren();
+        int rawIndex = elementsRow.getRawIndex();
         ImmutableList.Builder<JsonNode> arrayElements = ImmutableList.builder();
 
         for (int i = 0; i < elementsRowType.getFields().size(); i++) {
             Type elementType = elementsRowType.getFields().get(i).getType();
-            Object element = readNativeValue(elementType, elements.get(i), 0);
+            Object element = readNativeValue(elementType, elementsRow.getRawFieldBlock(i), rawIndex);
             checkState(!JSON_ERROR.equals(element), "malformed JSON error suppressed in the input function");
 
             JsonNode elementNode;
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonExistsFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonExistsFunction.java
index f11acf049410..341ff0557f05 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonExistsFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonExistsFunction.java
@@ -26,7 +26,7 @@
 import io.trino.operator.scalar.ChoicesSpecializedSqlScalarFunction;
 import io.trino.operator.scalar.SpecializedSqlScalarFunction;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
@@ -40,6 +40,7 @@
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import static io.trino.json.JsonInputErrorNode.JSON_ERROR;
 import static io.trino.operator.scalar.json.ParameterUtil.getParametersArray;
@@ -57,9 +58,7 @@ public class JsonExistsFunction
         extends SqlScalarFunction
 {
     public static final String JSON_EXISTS_FUNCTION_NAME = "$json_exists";
-    private static final MethodHandle METHOD_HANDLE = methodHandle(JsonExistsFunction.class, "jsonExists", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, Block.class, long.class);
-    private static final TrinoException INPUT_ARGUMENT_ERROR = new JsonInputConversionError("malformed input argument to JSON_EXISTS function");
-    private static final TrinoException PATH_PARAMETER_ERROR = new JsonInputConversionError("malformed JSON path parameter to JSON_EXISTS function");
+    private static final MethodHandle METHOD_HANDLE = methodHandle(JsonExistsFunction.class, "jsonExists", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, SqlRow.class, long.class);
 
     private final FunctionManager functionManager;
     private final Metadata metadata;
@@ -67,9 +66,8 @@ public class JsonExistsFunction
 
     public JsonExistsFunction(FunctionManager functionManager, Metadata metadata, TypeManager typeManager)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(JSON_EXISTS_FUNCTION_NAME)
                 .signature(Signature.builder()
-                        .name(JSON_EXISTS_FUNCTION_NAME)
                         .typeVariable("T")
                         .returnType(BOOLEAN)
                         .argumentTypes(ImmutableList.of(new TypeSignature(JSON_2016), new TypeSignature(JsonPath2016Type.NAME), new TypeSignature("T"), new TypeSignature(TINYINT)))
@@ -113,16 +111,16 @@ public static Boolean jsonExists(
             ConnectorSession session,
             JsonNode inputExpression,
             IrJsonPath jsonPath,
-            Block parametersRow,
+            SqlRow parametersRow,
             long errorBehavior)
     {
         if (inputExpression.equals(JSON_ERROR)) {
-            return handleError(errorBehavior, INPUT_ARGUMENT_ERROR); // ERROR ON ERROR was already handled by the input function
+            return handleError(errorBehavior, () -> new JsonInputConversionError("malformed input argument to JSON_EXISTS function")); // ERROR ON ERROR was already handled by the input function
         }
         Object[] parameters = getParametersArray(parametersRowType, parametersRow);
         for (Object parameter : parameters) {
             if (parameter.equals(JSON_ERROR)) {
-                return handleError(errorBehavior, PATH_PARAMETER_ERROR); // ERROR ON ERROR was already handled by the input function
+                return handleError(errorBehavior, () -> new JsonInputConversionError("malformed JSON path parameter to JSON_EXISTS function")); // ERROR ON ERROR was already handled by the input function
             }
         }
         // The jsonPath argument is constant for every row. We use the first incoming jsonPath argument to initialize
@@ -138,13 +136,13 @@ public static Boolean jsonExists(
             pathResult = evaluator.evaluate(inputExpression, parameters);
         }
         catch (PathEvaluationError e) {
-            return handleError(errorBehavior, e);
+            return handleError(errorBehavior, () -> e);
         }
 
         return !pathResult.isEmpty();
     }
 
-    private static Boolean handleError(long errorBehavior, TrinoException error)
+    private static Boolean handleError(long errorBehavior, Supplier<TrinoException> error)
     {
         switch (ErrorBehavior.values()[(int) errorBehavior]) {
             case FALSE:
@@ -154,7 +152,7 @@ private static Boolean handleError(long errorBehavior, TrinoException error)
             case UNKNOWN:
                 return null;
             case ERROR:
-                throw error;
+                throw error.get();
         }
         throw new IllegalStateException("unexpected error behavior");
     }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonObjectFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonObjectFunction.java
index b42a9aeb9e09..f6f5a6e4f862 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonObjectFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonObjectFunction.java
@@ -25,7 +25,7 @@
 import io.trino.operator.scalar.ChoicesSpecializedSqlScalarFunction;
 import io.trino.operator.scalar.SpecializedSqlScalarFunction;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.Signature;
@@ -36,7 +36,6 @@
 
 import java.lang.invoke.MethodHandle;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -59,14 +58,13 @@ public class JsonObjectFunction
 {
     public static final JsonObjectFunction JSON_OBJECT_FUNCTION = new JsonObjectFunction();
     public static final String JSON_OBJECT_FUNCTION_NAME = "$json_object";
-    private static final MethodHandle METHOD_HANDLE = methodHandle(JsonObjectFunction.class, "jsonObject", RowType.class, RowType.class, Block.class, Block.class, boolean.class, boolean.class);
+    private static final MethodHandle METHOD_HANDLE = methodHandle(JsonObjectFunction.class, "jsonObject", RowType.class, RowType.class, SqlRow.class, SqlRow.class, boolean.class, boolean.class);
     private static final JsonNode EMPTY_OBJECT = new ObjectNode(JsonNodeFactory.instance);
 
     private JsonObjectFunction()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(JSON_OBJECT_FUNCTION_NAME)
                 .signature(Signature.builder()
-                        .name(JSON_OBJECT_FUNCTION_NAME)
                         .typeVariable("K")
                         .typeVariable("V")
                         .returnType(new TypeSignature(JSON_2016))
@@ -95,26 +93,26 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
     }
 
     @UsedByGeneratedCode
-    public static JsonNode jsonObject(RowType keysRowType, RowType valuesRowType, Block keysRow, Block valuesRow, boolean nullOnNull, boolean uniqueKeys)
+    public static JsonNode jsonObject(RowType keysRowType, RowType valuesRowType, SqlRow keysRow, SqlRow valuesRow, boolean nullOnNull, boolean uniqueKeys)
     {
         if (JSON_NO_PARAMETERS_ROW_TYPE.equals(keysRowType)) {
             return EMPTY_OBJECT;
         }
 
         Map<String, JsonNode> members = new HashMap<>();
-        List<Block> keys = keysRow.getChildren();
-        List<Block> values = valuesRow.getChildren();
+        int keysRawIndex = keysRow.getRawIndex();
+        int valuesRawIndex = valuesRow.getRawIndex();
 
         for (int i = 0; i < keysRowType.getFields().size(); i++) {
             Type keyType = keysRowType.getFields().get(i).getType();
-            Object key = readNativeValue(keyType, keys.get(i), 0);
+            Object key = readNativeValue(keyType, keysRow.getRawFieldBlock(i), keysRawIndex);
             if (key == null) {
                 throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "null value passed for JSON object key to JSON_OBJECT function");
             }
             String keyName = ((Slice) key).toStringUtf8();
 
             Type valueType = valuesRowType.getFields().get(i).getType();
-            Object value = readNativeValue(valueType, values.get(i), 0);
+            Object value = readNativeValue(valueType, valuesRow.getRawFieldBlock(i), valuesRawIndex);
             checkState(!JSON_ERROR.equals(value), "malformed JSON error suppressed in the input function");
 
             JsonNode valueNode;
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonQueryFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonQueryFunction.java
index f21a3678aa7d..b0329137ff25 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonQueryFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonQueryFunction.java
@@ -30,7 +30,7 @@
 import io.trino.operator.scalar.ChoicesSpecializedSqlScalarFunction;
 import io.trino.operator.scalar.SpecializedSqlScalarFunction;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
@@ -45,6 +45,7 @@
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import static io.trino.json.JsonInputErrorNode.JSON_ERROR;
 import static io.trino.json.ir.SqlJsonLiteralConverter.getJsonNode;
@@ -63,13 +64,9 @@ public class JsonQueryFunction
         extends SqlScalarFunction
 {
     public static final String JSON_QUERY_FUNCTION_NAME = "$json_query";
-    private static final MethodHandle METHOD_HANDLE = methodHandle(JsonQueryFunction.class, "jsonQuery", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, Block.class, long.class, long.class, long.class);
+    private static final MethodHandle METHOD_HANDLE = methodHandle(JsonQueryFunction.class, "jsonQuery", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, SqlRow.class, long.class, long.class, long.class);
     private static final JsonNode EMPTY_ARRAY_RESULT = new ArrayNode(JsonNodeFactory.instance);
     private static final JsonNode EMPTY_OBJECT_RESULT = new ObjectNode(JsonNodeFactory.instance);
-    private static final TrinoException INPUT_ARGUMENT_ERROR = new JsonInputConversionError("malformed input argument to JSON_QUERY function");
-    private static final TrinoException PATH_PARAMETER_ERROR = new JsonInputConversionError("malformed JSON path parameter to JSON_QUERY function");
-    private static final TrinoException NO_ITEMS = new JsonOutputConversionError("JSON path found no items");
-    private static final TrinoException MULTIPLE_ITEMS = new JsonOutputConversionError("JSON path found multiple items");
 
     private final FunctionManager functionManager;
     private final Metadata metadata;
@@ -77,9 +74,8 @@ public class JsonQueryFunction
 
     public JsonQueryFunction(FunctionManager functionManager, Metadata metadata, TypeManager typeManager)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(JSON_QUERY_FUNCTION_NAME)
                 .signature(Signature.builder()
-                        .name(JSON_QUERY_FUNCTION_NAME)
                         .typeVariable("T")
                         .returnType(new TypeSignature(JSON_2016))
                         .argumentTypes(ImmutableList.of(
@@ -129,18 +125,18 @@ public static JsonNode jsonQuery(
             ConnectorSession session,
             JsonNode inputExpression,
             IrJsonPath jsonPath,
-            Block parametersRow,
+            SqlRow parametersRow,
             long wrapperBehavior,
             long emptyBehavior,
             long errorBehavior)
     {
         if (inputExpression.equals(JSON_ERROR)) {
-            return handleSpecialCase(errorBehavior, INPUT_ARGUMENT_ERROR); // ERROR ON ERROR was already handled by the input function
+            return handleSpecialCase(errorBehavior, () -> new JsonInputConversionError("malformed input argument to JSON_QUERY function")); // ERROR ON ERROR was already handled by the input function
         }
         Object[] parameters = getParametersArray(parametersRowType, parametersRow);
         for (Object parameter : parameters) {
             if (parameter.equals(JSON_ERROR)) {
-                return handleSpecialCase(errorBehavior, PATH_PARAMETER_ERROR); // ERROR ON ERROR was already handled by the input function
+                return handleSpecialCase(errorBehavior, () -> new JsonInputConversionError("malformed JSON path parameter to JSON_QUERY function")); // ERROR ON ERROR was already handled by the input function
             }
         }
         // The jsonPath argument is constant for every row. We use the first incoming jsonPath argument to initialize
@@ -156,12 +152,12 @@ public static JsonNode jsonQuery(
             pathResult = evaluator.evaluate(inputExpression, parameters);
         }
         catch (PathEvaluationError e) {
-            return handleSpecialCase(errorBehavior, e);
+            return handleSpecialCase(errorBehavior, () -> e);
         }
 
         // handle empty sequence
         if (pathResult.isEmpty()) {
-            return handleSpecialCase(emptyBehavior, NO_ITEMS);
+            return handleSpecialCase(emptyBehavior, () -> new JsonOutputConversionError("JSON path found no items"));
         }
 
         // translate sequence to JSON items
@@ -170,7 +166,7 @@ public static JsonNode jsonQuery(
             if (item instanceof TypedValue) {
                 Optional<JsonNode> jsonNode = getJsonNode((TypedValue) item);
                 if (jsonNode.isEmpty()) {
-                    return handleSpecialCase(errorBehavior, new JsonOutputConversionError(format(
+                    return handleSpecialCase(errorBehavior, () -> new JsonOutputConversionError(format(
                             "JSON path returned a scalar SQL value of type %s that cannot be represented as JSON",
                             ((TypedValue) item).getType())));
                 }
@@ -205,16 +201,16 @@ public static JsonNode jsonQuery(
             // if the only item is a TextNode, need to apply the KEEP / OMIT QUOTES behavior. this is done by the JSON output function
         }
 
-        return handleSpecialCase(errorBehavior, MULTIPLE_ITEMS);
+        return handleSpecialCase(errorBehavior, () -> new JsonOutputConversionError("JSON path found multiple items"));
     }
 
-    private static JsonNode handleSpecialCase(long behavior, TrinoException error)
+    private static JsonNode handleSpecialCase(long behavior, Supplier<TrinoException> error)
     {
         switch (EmptyOrErrorBehavior.values()[(int) behavior]) {
             case NULL:
                 return null;
             case ERROR:
-                throw error;
+                throw error.get();
             case EMPTY_ARRAY:
                 return EMPTY_ARRAY_RESULT;
             case EMPTY_OBJECT:
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonValueFunction.java b/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonValueFunction.java
index a2f848f434de..ca2985ff1b85 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonValueFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonValueFunction.java
@@ -17,7 +17,6 @@
 import com.fasterxml.jackson.databind.node.NullNode;
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slice;
-import io.trino.FullConnectorSession;
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.json.JsonPathEvaluator;
 import io.trino.json.JsonPathInvocationContext;
@@ -33,7 +32,7 @@
 import io.trino.operator.scalar.ChoicesSpecializedSqlScalarFunction;
 import io.trino.operator.scalar.SpecializedSqlScalarFunction;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionMetadata;
@@ -48,6 +47,7 @@
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.json.JsonInputErrorNode.JSON_ERROR;
@@ -68,16 +68,11 @@ public class JsonValueFunction
         extends SqlScalarFunction
 {
     public static final String JSON_VALUE_FUNCTION_NAME = "$json_value";
-    private static final MethodHandle METHOD_HANDLE_LONG = methodHandle(JsonValueFunction.class, "jsonValueLong", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, Block.class, long.class, Long.class, long.class, Long.class);
-    private static final MethodHandle METHOD_HANDLE_DOUBLE = methodHandle(JsonValueFunction.class, "jsonValueDouble", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, Block.class, long.class, Double.class, long.class, Double.class);
-    private static final MethodHandle METHOD_HANDLE_BOOLEAN = methodHandle(JsonValueFunction.class, "jsonValueBoolean", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, Block.class, long.class, Boolean.class, long.class, Boolean.class);
-    private static final MethodHandle METHOD_HANDLE_SLICE = methodHandle(JsonValueFunction.class, "jsonValueSlice", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, Block.class, long.class, Slice.class, long.class, Slice.class);
-    private static final MethodHandle METHOD_HANDLE = methodHandle(JsonValueFunction.class, "jsonValue", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, Block.class, long.class, Object.class, long.class, Object.class);
-    private static final TrinoException INPUT_ARGUMENT_ERROR = new JsonInputConversionError("malformed input argument to JSON_VALUE function");
-    private static final TrinoException PATH_PARAMETER_ERROR = new JsonInputConversionError("malformed JSON path parameter to JSON_VALUE function");
-    private static final TrinoException NO_ITEMS = new JsonValueResultError("JSON path found no items");
-    private static final TrinoException MULTIPLE_ITEMS = new JsonValueResultError("JSON path found multiple items");
-    private static final TrinoException INCONVERTIBLE_ITEM = new JsonValueResultError("JSON path found an item that cannot be converted to an SQL value");
+    private static final MethodHandle METHOD_HANDLE_LONG = methodHandle(JsonValueFunction.class, "jsonValueLong", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, SqlRow.class, long.class, Long.class, long.class, Long.class);
+    private static final MethodHandle METHOD_HANDLE_DOUBLE = methodHandle(JsonValueFunction.class, "jsonValueDouble", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, SqlRow.class, long.class, Double.class, long.class, Double.class);
+    private static final MethodHandle METHOD_HANDLE_BOOLEAN = methodHandle(JsonValueFunction.class, "jsonValueBoolean", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, SqlRow.class, long.class, Boolean.class, long.class, Boolean.class);
+    private static final MethodHandle METHOD_HANDLE_SLICE = methodHandle(JsonValueFunction.class, "jsonValueSlice", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, SqlRow.class, long.class, Slice.class, long.class, Slice.class);
+    private static final MethodHandle METHOD_HANDLE = methodHandle(JsonValueFunction.class, "jsonValue", FunctionManager.class, Metadata.class, TypeManager.class, Type.class, Type.class, JsonPathInvocationContext.class, ConnectorSession.class, JsonNode.class, IrJsonPath.class, SqlRow.class, long.class, Object.class, long.class, Object.class);
 
     private final FunctionManager functionManager;
     private final Metadata metadata;
@@ -85,9 +80,8 @@ public class JsonValueFunction
 
     public JsonValueFunction(FunctionManager functionManager, Metadata metadata, TypeManager typeManager)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder(JSON_VALUE_FUNCTION_NAME)
                 .signature(Signature.builder()
-                        .name(JSON_VALUE_FUNCTION_NAME)
                         .typeVariable("R")
                         .typeVariable("T")
                         .returnType(new TypeSignature("R"))
@@ -159,7 +153,7 @@ public static Long jsonValueLong(
             ConnectorSession session,
             JsonNode inputExpression,
             IrJsonPath jsonPath,
-            Block parametersRow,
+            SqlRow parametersRow,
             long emptyBehavior,
             Long emptyDefault,
             long errorBehavior,
@@ -179,7 +173,7 @@ public static Double jsonValueDouble(
             ConnectorSession session,
             JsonNode inputExpression,
             IrJsonPath jsonPath,
-            Block parametersRow,
+            SqlRow parametersRow,
             long emptyBehavior,
             Double emptyDefault,
             long errorBehavior,
@@ -199,7 +193,7 @@ public static Boolean jsonValueBoolean(
             ConnectorSession session,
             JsonNode inputExpression,
             IrJsonPath jsonPath,
-            Block parametersRow,
+            SqlRow parametersRow,
             long emptyBehavior,
             Boolean emptyDefault,
             long errorBehavior,
@@ -219,7 +213,7 @@ public static Slice jsonValueSlice(
             ConnectorSession session,
             JsonNode inputExpression,
             IrJsonPath jsonPath,
-            Block parametersRow,
+            SqlRow parametersRow,
             long emptyBehavior,
             Slice emptyDefault,
             long errorBehavior,
@@ -239,19 +233,19 @@ public static Object jsonValue(
             ConnectorSession session,
             JsonNode inputExpression,
             IrJsonPath jsonPath,
-            Block parametersRow,
+            SqlRow parametersRow,
             long emptyBehavior,
             Object emptyDefault,
             long errorBehavior,
             Object errorDefault)
     {
         if (inputExpression.equals(JSON_ERROR)) {
-            return handleSpecialCase(errorBehavior, errorDefault, INPUT_ARGUMENT_ERROR); // ERROR ON ERROR was already handled by the input function
+            return handleSpecialCase(errorBehavior, errorDefault, () -> new JsonInputConversionError("malformed input argument to JSON_VALUE function")); // ERROR ON ERROR was already handled by the input function
         }
         Object[] parameters = getParametersArray(parametersRowType, parametersRow);
         for (Object parameter : parameters) {
             if (parameter.equals(JSON_ERROR)) {
-                return handleSpecialCase(errorBehavior, errorDefault, PATH_PARAMETER_ERROR); // ERROR ON ERROR was already handled by the input function
+                return handleSpecialCase(errorBehavior, errorDefault, () -> new JsonInputConversionError("malformed JSON path parameter to JSON_VALUE function")); // ERROR ON ERROR was already handled by the input function
             }
         }
         // The jsonPath argument is constant for every row. We use the first incoming jsonPath argument to initialize
@@ -267,15 +261,15 @@ public static Object jsonValue(
             pathResult = evaluator.evaluate(inputExpression, parameters);
         }
         catch (PathEvaluationError e) {
-            return handleSpecialCase(errorBehavior, errorDefault, e); // TODO by spec, we should cast the defaults only if they are used
+            return handleSpecialCase(errorBehavior, errorDefault, () -> e); // TODO by spec, we should cast the defaults only if they are used
         }
 
         if (pathResult.isEmpty()) {
-            return handleSpecialCase(emptyBehavior, emptyDefault, NO_ITEMS);
+            return handleSpecialCase(emptyBehavior, emptyDefault, () -> new JsonValueResultError("JSON path found no items"));
         }
 
         if (pathResult.size() > 1) {
-            return handleSpecialCase(errorBehavior, errorDefault, MULTIPLE_ITEMS);
+            return handleSpecialCase(errorBehavior, errorDefault, () -> new JsonValueResultError("JSON path found multiple items"));
         }
 
         Object item = getOnlyElement(pathResult);
@@ -289,10 +283,10 @@ public static Object jsonValue(
                 itemValue = getTypedValue((JsonNode) item);
             }
             catch (JsonLiteralConversionError e) {
-                return handleSpecialCase(errorBehavior, errorDefault, new JsonValueResultError("JSON path found an item that cannot be converted to an SQL value", e));
+                return handleSpecialCase(errorBehavior, errorDefault, () -> new JsonValueResultError("JSON path found an item that cannot be converted to an SQL value", e));
             }
             if (itemValue.isEmpty()) {
-                return handleSpecialCase(errorBehavior, errorDefault, INCONVERTIBLE_ITEM);
+                return handleSpecialCase(errorBehavior, errorDefault, () -> new JsonValueResultError("JSON path found an item that cannot be converted to an SQL value"));
             }
             typedValue = itemValue.get();
         }
@@ -304,10 +298,10 @@ public static Object jsonValue(
         }
         ResolvedFunction coercion;
         try {
-            coercion = metadata.getCoercion(((FullConnectorSession) session).getSession(), typedValue.getType(), returnType);
+            coercion = metadata.getCoercion(typedValue.getType(), returnType);
         }
         catch (OperatorNotFoundException e) {
-            return handleSpecialCase(errorBehavior, errorDefault, new JsonValueResultError(format(
+            return handleSpecialCase(errorBehavior, errorDefault, () -> new JsonValueResultError(format(
                     "Cannot cast value of type %s to declared return type of function JSON_VALUE: %s",
                     typedValue.getType(),
                     returnType)));
@@ -316,20 +310,20 @@ public static Object jsonValue(
             return new InterpretedFunctionInvoker(functionManager).invoke(coercion, session, ImmutableList.of(typedValue.getValueAsObject()));
         }
         catch (RuntimeException e) {
-            return handleSpecialCase(errorBehavior, errorDefault, new JsonValueResultError(format(
+            return handleSpecialCase(errorBehavior, errorDefault, () -> new JsonValueResultError(format(
                     "Cannot cast value of type %s to declared return type of function JSON_VALUE: %s",
                     typedValue.getType(),
                     returnType)));
         }
     }
 
-    private static Object handleSpecialCase(long behavior, Object defaultValue, TrinoException error)
+    private static Object handleSpecialCase(long behavior, Object defaultValue, Supplier<TrinoException> error)
     {
         switch (EmptyOrErrorBehavior.values()[(int) behavior]) {
             case NULL:
                 return null;
             case ERROR:
-                throw error;
+                throw error.get();
             case DEFAULT:
                 return defaultValue;
         }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/json/ParameterUtil.java b/core/trino-main/src/main/java/io/trino/operator/scalar/json/ParameterUtil.java
index 3275a2a6a534..cdd7e97d7060 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/json/ParameterUtil.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/json/ParameterUtil.java
@@ -15,13 +15,11 @@
 
 import com.fasterxml.jackson.databind.node.NullNode;
 import io.trino.json.ir.TypedValue;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.type.Json2016Type;
 
-import java.util.List;
-
 import static io.trino.json.JsonEmptySequenceNode.EMPTY_SEQUENCE;
 import static io.trino.spi.type.TypeUtils.readNativeValue;
 import static io.trino.sql.analyzer.ExpressionAnalyzer.JSON_NO_PARAMETERS_ROW_TYPE;
@@ -40,22 +38,22 @@ private ParameterUtil() {}
      * - null value without FORMAT option is converted into a JSON null.
      *
      * @param parametersRowType type of the Block containing parameters
-     * @param parametersRow a Block containing parameters
+     * @param parametersRow a row containing parameters
      * @return an array containing the converted values
      */
-    public static Object[] getParametersArray(Type parametersRowType, Block parametersRow)
+    public static Object[] getParametersArray(Type parametersRowType, SqlRow parametersRow)
     {
         if (JSON_NO_PARAMETERS_ROW_TYPE.equals(parametersRowType)) {
             return new Object[] {};
         }
 
         RowType rowType = (RowType) parametersRowType;
-        List<Block> parameterBlocks = parametersRow.getChildren();
+        int rawIndex = parametersRow.getRawIndex();
 
         Object[] array = new Object[rowType.getFields().size()];
         for (int i = 0; i < rowType.getFields().size(); i++) {
             Type type = rowType.getFields().get(i).getType();
-            Object value = readNativeValue(type, parameterBlocks.get(i), 0);
+            Object value = readNativeValue(type, parametersRow.getRawFieldBlock(i), rawIndex);
             if (type.equals(Json2016Type.JSON_2016)) {
                 if (value == null) {
                     array[i] = EMPTY_SEQUENCE; // null as JSON value shall produce an empty sequence
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/time/TimeFunctions.java b/core/trino-main/src/main/java/io/trino/operator/scalar/time/TimeFunctions.java
index f645963e5e2a..802773fae534 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/time/TimeFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/time/TimeFunctions.java
@@ -97,7 +97,7 @@ public static long truncate(@SqlType("varchar(x)") Slice unit, @SqlType("time(p)
             case "hour":
                 return time / PICOSECONDS_PER_HOUR * PICOSECONDS_PER_HOUR;
             default:
-                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid Time field");
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid TIME field");
         }
     }
 
@@ -127,7 +127,7 @@ public static long dateAdd(
                 delta = (delta % HOURS_PER_DAY) * PICOSECONDS_PER_HOUR;
                 break;
             default:
-                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid Time field");
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid TIME field");
         }
 
         long result = TimeOperators.add(time, delta);
@@ -147,7 +147,6 @@ public static long dateAdd(
     public static long dateDiff(@SqlType("varchar(x)") Slice unit, @SqlType("time(p)") long time1, @SqlType("time(p)") long time2)
     {
         long delta = time2 - time1;
-
         String unitString = unit.toStringUtf8().toLowerCase(ENGLISH);
         switch (unitString) {
             case "millisecond":
@@ -159,7 +158,7 @@ public static long dateDiff(@SqlType("varchar(x)") Slice unit, @SqlType("time(p)
             case "hour":
                 return delta / PICOSECONDS_PER_HOUR;
             default:
-                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid Time field");
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid TIME field");
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/time/TimeToTimestampWithTimeZoneCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/time/TimeToTimestampWithTimeZoneCast.java
index c82cfcf271db..0ed3f507ce8d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/time/TimeToTimestampWithTimeZoneCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/time/TimeToTimestampWithTimeZoneCast.java
@@ -93,7 +93,7 @@ private static long computeEpochMillis(ConnectorSession session, ZoneId zoneId,
     {
         long milliFraction = rescale(picoFraction, TimeType.MAX_PRECISION, 3);
         long epochMillis = multiplyExact(epochSeconds, MILLISECONDS_PER_SECOND) + milliFraction;
-        epochMillis -= zoneId.getRules().getOffset(session.getStart()).getTotalSeconds() * MILLISECONDS_PER_SECOND;
+        epochMillis -= zoneId.getRules().getOffset(session.getStart()).getTotalSeconds() * (long) MILLISECONDS_PER_SECOND;
         return epochMillis;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/DateAdd.java b/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/DateAdd.java
index eab2af4c8fbe..684575aa7981 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/DateAdd.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/DateAdd.java
@@ -15,6 +15,7 @@
 
 import io.airlift.slice.Slice;
 import io.trino.operator.scalar.DateTimeFunctions;
+import io.trino.spi.TrinoException;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.LiteralParameter;
 import io.trino.spi.function.LiteralParameters;
@@ -24,6 +25,7 @@
 import io.trino.spi.type.StandardTypes;
 import org.joda.time.chrono.ISOChronology;
 
+import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.type.DateTimes.getMicrosOfMilli;
 import static io.trino.type.DateTimes.round;
 import static io.trino.type.DateTimes.scaleEpochMicrosToMillis;
@@ -44,16 +46,21 @@ public static long add(
             @SqlType(StandardTypes.BIGINT) long value,
             @SqlType("timestamp(p)") long timestamp)
     {
-        long epochMillis = scaleEpochMicrosToMillis(timestamp);
-        int microsOfMilli = getMicrosOfMilli(timestamp);
+        try {
+            long epochMillis = scaleEpochMicrosToMillis(timestamp);
+            int microsOfMilli = getMicrosOfMilli(timestamp);
 
-        epochMillis = DateTimeFunctions.getTimestampField(ISOChronology.getInstanceUTC(), unit).add(epochMillis, toIntExact(value));
+            epochMillis = DateTimeFunctions.getTimestampField(ISOChronology.getInstanceUTC(), unit).add(epochMillis, toIntExact(value));
 
-        if (precision <= 3) {
-            epochMillis = round(epochMillis, (int) (3 - precision));
-        }
+            if (precision <= 3) {
+                epochMillis = round(epochMillis, (int) (3 - precision));
+            }
 
-        return scaleEpochMillisToMicros(epochMillis) + microsOfMilli;
+            return scaleEpochMillisToMicros(epochMillis) + microsOfMilli;
+        }
+        catch (IllegalArgumentException | ArithmeticException e) {
+            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, e.getMessage());
+        }
     }
 
     @LiteralParameters({"x", "p"})
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/SequenceIntervalDayToSecond.java b/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/SequenceIntervalDayToSecond.java
index a2fcdd0c3e7c..bbf5f91457d9 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/SequenceIntervalDayToSecond.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/SequenceIntervalDayToSecond.java
@@ -29,7 +29,6 @@
 import static io.trino.spi.type.TimestampTypes.writeLongTimestamp;
 import static io.trino.type.DateTimes.MICROSECONDS_PER_MILLISECOND;
 import static java.lang.Math.multiplyExact;
-import static java.lang.Math.toIntExact;
 
 @ScalarFunction("sequence")
 public final class SequenceIntervalDayToSecond
@@ -52,8 +51,7 @@ public static Block sequence(
 
         checkValidStep(start, stop, step);
 
-        int length = toIntExact((stop - start) / step + 1L);
-        checkMaxEntry(length);
+        int length = checkMaxEntry((stop - start) / step + 1L);
 
         BlockBuilder blockBuilder = SHORT_TYPE.createBlockBuilder(null, length);
         for (long i = 0, value = start; i < length; ++i, value += step) {
@@ -75,8 +73,7 @@ public static Block sequence(
         long stopMicros = stop.getEpochMicros();
         checkValidStep(startMicros, stopMicros, step);
 
-        int length = toIntExact((stopMicros - startMicros) / step + 1L);
-        checkMaxEntry(length);
+        int length = checkMaxEntry((stopMicros - startMicros) / step + 1L);
 
         BlockBuilder blockBuilder = LONG_TYPE.createBlockBuilder(null, length);
         for (long i = 0, epochMicros = startMicros; i < length; ++i, epochMicros += step) {
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/SequenceIntervalYearToMonth.java b/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/SequenceIntervalYearToMonth.java
index 67830d83d169..83625e893871 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/SequenceIntervalYearToMonth.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/SequenceIntervalYearToMonth.java
@@ -30,7 +30,6 @@
 import static io.trino.operator.scalar.SequenceFunction.checkValidStep;
 import static io.trino.spi.type.TimestampType.MAX_SHORT_PRECISION;
 import static io.trino.spi.type.TimestampType.createTimestampType;
-import static java.lang.Math.toIntExact;
 
 @ScalarFunction("sequence")
 public final class SequenceIntervalYearToMonth
@@ -52,12 +51,11 @@ public static Block sequence(
     {
         checkValidStep(start, stop, step);
 
-        int length = toIntExact(DateDiff.diff(MONTH, start, stop) / step + 1);
-        checkMaxEntry(length);
+        int length = checkMaxEntry(DateDiff.diff(MONTH, start, stop) / step + 1);
 
         BlockBuilder blockBuilder = SHORT_TYPE.createBlockBuilder(null, length);
 
-        int offset = 0;
+        long offset = 0;
         for (int i = 0; i < length; ++i) {
             long value = TimestampPlusIntervalYearToMonth.add(start, offset);
             SHORT_TYPE.writeLong(blockBuilder, value);
@@ -77,12 +75,11 @@ public static Block sequence(
     {
         checkValidStep(start.getEpochMicros(), stop.getEpochMicros(), step);
 
-        int length = toIntExact(DateDiff.diff(MONTH, start, stop) / step + 1);
-        checkMaxEntry(length);
+        int length = checkMaxEntry(DateDiff.diff(MONTH, start, stop) / step + 1);
 
         BlockBuilder blockBuilder = LONG_TYPE.createBlockBuilder(null, length);
 
-        int offset = 0;
+        long offset = 0;
         for (int i = 0; i < length; ++i) {
             LongTimestamp value = TimestampPlusIntervalYearToMonth.add(start, offset);
             LONG_TYPE.writeObject(blockBuilder, value);
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/TimestampToJsonCast.java b/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/TimestampToJsonCast.java
index dd7cbf327d25..1d5c4e79da8b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/TimestampToJsonCast.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/timestamp/TimestampToJsonCast.java
@@ -13,6 +13,7 @@
  */
 package io.trino.operator.scalar.timestamp;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
@@ -32,7 +33,7 @@
 import static io.trino.spi.function.OperatorType.CAST;
 import static io.trino.spi.type.StandardTypes.JSON;
 import static io.trino.type.DateTimes.formatTimestamp;
-import static io.trino.util.JsonUtil.JSON_FACTORY;
+import static io.trino.util.JsonUtil.createJsonFactory;
 import static io.trino.util.JsonUtil.createJsonGenerator;
 import static java.lang.String.format;
 import static java.time.ZoneOffset.UTC;
@@ -41,6 +42,7 @@
 public final class TimestampToJsonCast
 {
     private static final DateTimeFormatter TIMESTAMP_FORMATTER = DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss");
+    private static final JsonFactory JSON_FACTORY = createJsonFactory();
 
     private TimestampToJsonCast() {}
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/timestamptz/DateAdd.java b/core/trino-main/src/main/java/io/trino/operator/scalar/timestamptz/DateAdd.java
index 15ce4dcb50c2..061a8d598e7c 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/timestamptz/DateAdd.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/timestamptz/DateAdd.java
@@ -14,6 +14,7 @@
 package io.trino.operator.scalar.timestamptz;
 
 import io.airlift.slice.Slice;
+import io.trino.spi.TrinoException;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.LiteralParameter;
 import io.trino.spi.function.LiteralParameters;
@@ -23,6 +24,7 @@
 import io.trino.spi.type.StandardTypes;
 
 import static io.trino.operator.scalar.DateTimeFunctions.getTimestampField;
+import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
 import static io.trino.spi.type.DateTimeEncoding.updateMillisUtc;
 import static io.trino.type.DateTimes.round;
@@ -43,12 +45,17 @@ public static long add(
             @SqlType(StandardTypes.BIGINT) long value,
             @SqlType("timestamp(p) with time zone") long packedEpochMillis)
     {
-        long epochMillis = unpackMillisUtc(packedEpochMillis);
+        try {
+            long epochMillis = unpackMillisUtc(packedEpochMillis);
 
-        epochMillis = getTimestampField(unpackChronology(packedEpochMillis), unit).add(epochMillis, toIntExact(value));
-        epochMillis = round(epochMillis, (int) (3 - precision));
+            epochMillis = getTimestampField(unpackChronology(packedEpochMillis), unit).add(epochMillis, toIntExact(value));
+            epochMillis = round(epochMillis, (int) (3 - precision));
 
-        return updateMillisUtc(epochMillis, packedEpochMillis);
+            return updateMillisUtc(epochMillis, packedEpochMillis);
+        }
+        catch (IllegalArgumentException | ArithmeticException e) {
+            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, e.getMessage());
+        }
     }
 
     @LiteralParameters({"x", "p"})
@@ -58,8 +65,13 @@ public static LongTimestampWithTimeZone add(
             @SqlType(StandardTypes.BIGINT) long value,
             @SqlType("timestamp(p) with time zone") LongTimestampWithTimeZone timestamp)
     {
-        long epochMillis = getTimestampField(unpackChronology(timestamp.getTimeZoneKey()), unit).add(timestamp.getEpochMillis(), toIntExact(value));
+        try {
+            long epochMillis = getTimestampField(unpackChronology(timestamp.getTimeZoneKey()), unit).add(timestamp.getEpochMillis(), toIntExact(value));
 
-        return LongTimestampWithTimeZone.fromEpochMillisAndFraction(epochMillis, timestamp.getPicosOfMilli(), timestamp.getTimeZoneKey());
+            return LongTimestampWithTimeZone.fromEpochMillisAndFraction(epochMillis, timestamp.getPicosOfMilli(), timestamp.getTimeZoneKey());
+        }
+        catch (IllegalArgumentException | ArithmeticException e) {
+            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, e.getMessage());
+        }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/timetz/DateAdd.java b/core/trino-main/src/main/java/io/trino/operator/scalar/timetz/DateAdd.java
index 865b1c6dffb4..9f9a9cb16f94 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/timetz/DateAdd.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/timetz/DateAdd.java
@@ -96,9 +96,8 @@ private static long add(long picos, Slice unit, long value)
                 delta = (delta % HOURS_PER_DAY) * PICOSECONDS_PER_HOUR;
                 break;
             default:
-                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid Time field");
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid TIME field");
         }
-
         return TimeOperators.add(picos, delta);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/timetz/DateDiff.java b/core/trino-main/src/main/java/io/trino/operator/scalar/timetz/DateDiff.java
index 40267ee9140c..ac9152feaa05 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/timetz/DateDiff.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/timetz/DateDiff.java
@@ -48,7 +48,6 @@ public static long diff(
             @SqlType("time(p) with time zone") long right)
     {
         long nanos = normalize(right) - normalize(left);
-
         String unitString = unit.toStringUtf8().toLowerCase(ENGLISH);
         switch (unitString) {
             case "millisecond":
@@ -60,7 +59,7 @@ public static long diff(
             case "hour":
                 return nanos / NANOSECONDS_PER_HOUR;
             default:
-                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid Time field");
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid TIME field");
         }
     }
 
@@ -72,7 +71,6 @@ public static long diff(
             @SqlType("time(p) with time zone") LongTimeWithTimeZone right)
     {
         long picos = normalize(right) - normalize(left);
-
         String unitString = unit.toStringUtf8().toLowerCase(ENGLISH);
         switch (unitString) {
             case "millisecond":
@@ -84,7 +82,7 @@ public static long diff(
             case "hour":
                 return picos / PICOSECONDS_PER_HOUR;
             default:
-                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid Time field");
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a TIME field");
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/timetz/DateTrunc.java b/core/trino-main/src/main/java/io/trino/operator/scalar/timetz/DateTrunc.java
index 22540adb105f..29ebb5673afb 100644
--- a/core/trino-main/src/main/java/io/trino/operator/scalar/timetz/DateTrunc.java
+++ b/core/trino-main/src/main/java/io/trino/operator/scalar/timetz/DateTrunc.java
@@ -71,7 +71,7 @@ private static long truncate(long picos, Slice unit)
             case "hour":
                 return picos / PICOSECONDS_PER_HOUR * PICOSECONDS_PER_HOUR;
             default:
-                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid Time field");
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "'" + unitString + "' is not a valid TIME field");
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/table/ExcludeColumns.java b/core/trino-main/src/main/java/io/trino/operator/table/ExcludeColumns.java
index a05ec926c65c..2ef635f3a946 100644
--- a/core/trino-main/src/main/java/io/trino/operator/table/ExcludeColumns.java
+++ b/core/trino-main/src/main/java/io/trino/operator/table/ExcludeColumns.java
@@ -15,26 +15,26 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
+import com.google.inject.Provider;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorTableFunction;
 import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.ptf.AbstractConnectorTableFunction;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-import io.trino.spi.ptf.Descriptor;
-import io.trino.spi.ptf.DescriptorArgument;
-import io.trino.spi.ptf.DescriptorArgumentSpecification;
-import io.trino.spi.ptf.TableArgument;
-import io.trino.spi.ptf.TableArgumentSpecification;
-import io.trino.spi.ptf.TableFunctionAnalysis;
-import io.trino.spi.ptf.TableFunctionDataProcessor;
-import io.trino.spi.ptf.TableFunctionProcessorProvider;
+import io.trino.spi.function.table.AbstractConnectorTableFunction;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.DescriptorArgument;
+import io.trino.spi.function.table.DescriptorArgumentSpecification;
+import io.trino.spi.function.table.TableArgument;
+import io.trino.spi.function.table.TableArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
+import io.trino.spi.function.table.TableFunctionDataProcessor;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
 import io.trino.spi.type.RowType;
 
-import javax.inject.Provider;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -44,10 +44,10 @@
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.metadata.GlobalFunctionCatalog.BUILTIN_SCHEMA;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
-import static io.trino.spi.ptf.DescriptorArgument.NULL_DESCRIPTOR;
-import static io.trino.spi.ptf.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
-import static io.trino.spi.ptf.TableFunctionProcessorState.Finished.FINISHED;
-import static io.trino.spi.ptf.TableFunctionProcessorState.Processed.usedInputAndProduced;
+import static io.trino.spi.function.table.DescriptorArgument.NULL_DESCRIPTOR;
+import static io.trino.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Finished.FINISHED;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Processed.usedInputAndProduced;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static java.util.stream.Collectors.joining;
@@ -86,7 +86,11 @@ public ExcludeColumnsFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             DescriptorArgument excludedColumns = (DescriptorArgument) arguments.get(DESCRIPTOR_ARGUMENT_NAME);
             if (excludedColumns.equals(NULL_DESCRIPTOR)) {
@@ -140,7 +144,7 @@ public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransact
             return TableFunctionAnalysis.builder()
                     .requiredColumns(TABLE_ARGUMENT_NAME, requiredColumns.build())
                     .returnedType(new Descriptor(returnedType))
-                    // there's no information to remember. All logic is effectively delegated to the engine via `requiredColumns`. We do not pass a ConnectorTableHandle. EMPTY_HANDLE will be used.
+                    .handle(new ExcludeColumnsFunctionHandle())
                     .build();
         }
     }
@@ -161,4 +165,10 @@ public TableFunctionDataProcessor getDataProcessor(ConnectorTableFunctionHandle
             }
         };
     }
+
+    public record ExcludeColumnsFunctionHandle()
+            implements ConnectorTableFunctionHandle
+    {
+        // there's no information to remember. All logic is effectively delegated to the engine via `requiredColumns`.
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/table/Sequence.java b/core/trino-main/src/main/java/io/trino/operator/table/Sequence.java
new file mode 100644
index 000000000000..bb713debf17b
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/operator/table/Sequence.java
@@ -0,0 +1,292 @@
+/*
+ * Licensed 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 io.trino.operator.table;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.Provider;
+import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorTableFunction;
+import io.trino.spi.HostAddress;
+import io.trino.spi.Page;
+import io.trino.spi.PageBuilder;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.connector.ConnectorAccessControl;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorSplit;
+import io.trino.spi.connector.ConnectorSplitSource;
+import io.trino.spi.connector.ConnectorTransactionHandle;
+import io.trino.spi.connector.FixedSplitSource;
+import io.trino.spi.function.table.AbstractConnectorTableFunction;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.ReturnTypeSpecification.DescribedTable;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.ScalarArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
+import io.trino.spi.function.table.TableFunctionProcessorState;
+import io.trino.spi.function.table.TableFunctionSplitProcessor;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.trino.metadata.GlobalFunctionCatalog.BUILTIN_SCHEMA;
+import static io.trino.operator.table.Sequence.SequenceFunctionSplit.MAX_SPLIT_SIZE;
+import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
+import static io.trino.spi.function.table.Descriptor.descriptor;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Finished.FINISHED;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Processed.produced;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static java.lang.String.format;
+
+public class Sequence
+        implements Provider<ConnectorTableFunction>
+{
+    public static final String NAME = "sequence";
+
+    @Override
+    public ConnectorTableFunction get()
+    {
+        return new ClassLoaderSafeConnectorTableFunction(new SequenceFunction(), getClass().getClassLoader());
+    }
+
+    public static class SequenceFunction
+            extends AbstractConnectorTableFunction
+    {
+        private static final String START_ARGUMENT_NAME = "START";
+        private static final String STOP_ARGUMENT_NAME = "STOP";
+        private static final String STEP_ARGUMENT_NAME = "STEP";
+
+        public SequenceFunction()
+        {
+            super(
+                    BUILTIN_SCHEMA,
+                    NAME,
+                    ImmutableList.of(
+                            ScalarArgumentSpecification.builder()
+                                    .name(START_ARGUMENT_NAME)
+                                    .type(BIGINT)
+                                    .defaultValue(0L)
+                                    .build(),
+                            ScalarArgumentSpecification.builder()
+                                    .name(STOP_ARGUMENT_NAME)
+                                    .type(BIGINT)
+                                    .build(),
+                            ScalarArgumentSpecification.builder()
+                                    .name(STEP_ARGUMENT_NAME)
+                                    .type(BIGINT)
+                                    .defaultValue(1L)
+                                    .build()),
+                    new DescribedTable(descriptor(ImmutableList.of("sequential_number"), ImmutableList.of(BIGINT))));
+        }
+
+        @Override
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
+        {
+            Object startValue = ((ScalarArgument) arguments.get(START_ARGUMENT_NAME)).getValue();
+            if (startValue == null) {
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Start is null");
+            }
+
+            Object stopValue = ((ScalarArgument) arguments.get(STOP_ARGUMENT_NAME)).getValue();
+            if (stopValue == null) {
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Stop is null");
+            }
+
+            Object stepValue = ((ScalarArgument) arguments.get(STEP_ARGUMENT_NAME)).getValue();
+            if (stepValue == null) {
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Step is null");
+            }
+
+            long start = (long) startValue;
+            long stop = (long) stopValue;
+            long step = (long) stepValue;
+
+            if (start < stop && step <= 0) {
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format("Step must be positive for sequence [%s, %s]", start, stop));
+            }
+
+            if (start > stop && step >= 0) {
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format("Step must be negative for sequence [%s, %s]", start, stop));
+            }
+
+            return TableFunctionAnalysis.builder()
+                    .handle(new SequenceFunctionHandle(start, stop, start == stop ? 0 : step))
+                    .build();
+        }
+    }
+
+    public record SequenceFunctionHandle(long start, long stop, long step)
+            implements ConnectorTableFunctionHandle
+    {}
+
+    public static ConnectorSplitSource getSequenceFunctionSplitSource(SequenceFunctionHandle handle)
+    {
+        // using BigInteger to avoid long overflow since it's not in the main data processing loop
+        BigInteger start = BigInteger.valueOf(handle.start());
+        BigInteger stop = BigInteger.valueOf(handle.stop());
+        BigInteger step = BigInteger.valueOf(handle.step());
+
+        if (step.equals(BigInteger.ZERO)) {
+            checkArgument(start.equals(stop), "start is not equal to stop for step = 0");
+            return new FixedSplitSource(ImmutableList.of(new SequenceFunctionSplit(start.longValueExact(), stop.longValueExact())));
+        }
+
+        ImmutableList.Builder<SequenceFunctionSplit> splits = ImmutableList.builder();
+
+        BigInteger totalSteps = stop.subtract(start).divide(step).add(BigInteger.ONE);
+        BigInteger totalSplits = totalSteps.divide(BigInteger.valueOf(MAX_SPLIT_SIZE)).add(BigInteger.ONE);
+        BigInteger[] stepsPerSplit = totalSteps.divideAndRemainder(totalSplits);
+        BigInteger splitJump = stepsPerSplit[0].subtract(BigInteger.ONE).multiply(step);
+
+        BigInteger splitStart = start;
+        for (BigInteger i = BigInteger.ZERO; i.compareTo(totalSplits) < 0; i = i.add(BigInteger.ONE)) {
+            BigInteger splitStop = splitStart.add(splitJump);
+            // distribute the remaining steps between the initial splits, one step per split
+            if (i.compareTo(stepsPerSplit[1]) < 0) {
+                splitStop = splitStop.add(step);
+            }
+            splits.add(new SequenceFunctionSplit(splitStart.longValueExact(), splitStop.longValueExact()));
+            splitStart = splitStop.add(step);
+        }
+
+        return new FixedSplitSource(splits.build());
+    }
+
+    public static class SequenceFunctionSplit
+            implements ConnectorSplit
+    {
+        private static final int INSTANCE_SIZE = instanceSize(SequenceFunctionSplit.class);
+        public static final int DEFAULT_SPLIT_SIZE = 1000000;
+        public static final int MAX_SPLIT_SIZE = 1000000;
+
+        // the first value of sub-sequence
+        private final long start;
+
+        // the last value of sub-sequence. this value is aligned so that it belongs to the sequence.
+        private final long stop;
+
+        @JsonCreator
+        public SequenceFunctionSplit(@JsonProperty("start") long start, @JsonProperty("stop") long stop)
+        {
+            this.start = start;
+            this.stop = stop;
+        }
+
+        @JsonProperty
+        public long getStart()
+        {
+            return start;
+        }
+
+        @JsonProperty
+        public long getStop()
+        {
+            return stop;
+        }
+
+        @Override
+        public boolean isRemotelyAccessible()
+        {
+            return true;
+        }
+
+        @Override
+        public List<HostAddress> getAddresses()
+        {
+            return ImmutableList.of();
+        }
+
+        @Override
+        public Object getInfo()
+        {
+            return ImmutableMap.builder()
+                    .put("start", start)
+                    .put("stop", stop)
+                    .buildOrThrow();
+        }
+
+        @Override
+        public long getRetainedSizeInBytes()
+        {
+            return INSTANCE_SIZE;
+        }
+    }
+
+    public static TableFunctionProcessorProvider getSequenceFunctionProcessorProvider()
+    {
+        return new TableFunctionProcessorProvider()
+        {
+            @Override
+            public TableFunctionSplitProcessor getSplitProcessor(ConnectorSession session, ConnectorTableFunctionHandle handle, ConnectorSplit split)
+            {
+                return new SequenceFunctionProcessor(((SequenceFunctionHandle) handle).step(), (SequenceFunctionSplit) split);
+            }
+        };
+    }
+
+    public static class SequenceFunctionProcessor
+            implements TableFunctionSplitProcessor
+    {
+        private final PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(BIGINT));
+        private final long step;
+        private long start;
+        private final long stop;
+        private boolean finished;
+
+        public SequenceFunctionProcessor(long step, SequenceFunctionSplit split)
+        {
+            this.step = step;
+            this.start = split.getStart();
+            this.stop = split.getStop();
+        }
+
+        @Override
+        public TableFunctionProcessorState process()
+        {
+            checkState(pageBuilder.isEmpty(), "page builder not empty");
+
+            if (finished) {
+                return FINISHED;
+            }
+
+            BlockBuilder block = pageBuilder.getBlockBuilder(0);
+            while (start != stop && !pageBuilder.isFull()) {
+                pageBuilder.declarePosition();
+                BIGINT.writeLong(block, start);
+                start += step;
+            }
+            if (!pageBuilder.isFull()) {
+                pageBuilder.declarePosition();
+                BIGINT.writeLong(block, start);
+                finished = true;
+            }
+            Page page = pageBuilder.build();
+            pageBuilder.reset();
+            return produced(page);
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/operator/unnest/ArrayOfRowsUnnester.java b/core/trino-main/src/main/java/io/trino/operator/unnest/ArrayOfRowsUnnester.java
index 45a67ac36a74..d515a2208bf5 100644
--- a/core/trino-main/src/main/java/io/trino/operator/unnest/ArrayOfRowsUnnester.java
+++ b/core/trino-main/src/main/java/io/trino/operator/unnest/ArrayOfRowsUnnester.java
@@ -15,13 +15,14 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.ColumnarArray;
-import io.trino.spi.block.ColumnarRow;
+import io.trino.spi.block.RowBlock;
+
+import java.util.List;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.trino.operator.unnest.UnnestOperator.ensureCapacity;
 import static io.trino.spi.block.ColumnarArray.toColumnarArray;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
 import static java.util.Objects.requireNonNull;
 
 public class ArrayOfRowsUnnester
@@ -29,32 +30,22 @@ public class ArrayOfRowsUnnester
 {
     private static final int INSTANCE_SIZE = instanceSize(ArrayOfRowsUnnester.class);
 
-    private final int fieldCount;
     private final UnnestBlockBuilder[] blockBuilders;
-
     private int[] arrayLengths = new int[0];
     private ColumnarArray columnarArray;
-    private ColumnarRow columnarRow;
 
     public ArrayOfRowsUnnester(int fieldCount)
     {
-        blockBuilders = createUnnestBlockBuilders(fieldCount);
-        this.fieldCount = fieldCount;
-    }
-
-    private static UnnestBlockBuilder[] createUnnestBlockBuilders(int fieldCount)
-    {
-        UnnestBlockBuilder[] builders = new UnnestBlockBuilder[fieldCount];
+        blockBuilders = new UnnestBlockBuilder[fieldCount];
         for (int i = 0; i < fieldCount; i++) {
-            builders[i] = new UnnestBlockBuilder();
+            blockBuilders[i] = new UnnestBlockBuilder();
         }
-        return builders;
     }
 
     @Override
     public int getChannelCount()
     {
-        return fieldCount;
+        return blockBuilders.length;
     }
 
     @Override
@@ -62,16 +53,16 @@ public void resetInput(Block block)
     {
         requireNonNull(block, "block is null");
         columnarArray = toColumnarArray(block);
-        columnarRow = toColumnarRow(columnarArray.getElementsBlock());
 
-        for (int i = 0; i < fieldCount; i++) {
-            blockBuilders[i].resetInputBlock(columnarRow.getField(i), columnarRow.getNullCheckBlock());
+        List<Block> fields = RowBlock.getRowFieldsFromBlock(columnarArray.getElementsBlock());
+        for (int i = 0; i < blockBuilders.length; i++) {
+            blockBuilders[i].resetInputBlock(fields.get(i));
         }
 
         int positionCount = block.getPositionCount();
         arrayLengths = ensureCapacity(arrayLengths, positionCount, false);
-        for (int j = 0; j < positionCount; j++) {
-            arrayLengths[j] = columnarArray.getLength(j);
+        for (int i = 0; i < positionCount; i++) {
+            arrayLengths[i] = columnarArray.getLength(i);
         }
     }
 
@@ -82,14 +73,15 @@ public int[] getOutputEntriesPerPosition()
     }
 
     @Override
-    public Block[] buildOutputBlocks(int[] outputEntriesPerPosition, int startPosition, int batchSize, int outputRowCount)
+    public Block[] buildOutputBlocks(int[] outputEntriesPerPosition, int startPosition, int inputBatchSize, int outputRowCount)
     {
-        boolean nullRequired = needToInsertNulls(startPosition, batchSize, outputRowCount);
+        int unnestLength = columnarArray.getOffset(startPosition + inputBatchSize) - columnarArray.getOffset(startPosition);
+        boolean nullRequired = unnestLength < outputRowCount;
 
-        Block[] outputBlocks = new Block[fieldCount];
-        for (int i = 0; i < fieldCount; i++) {
+        Block[] outputBlocks = new Block[blockBuilders.length];
+        for (int i = 0; i < blockBuilders.length; i++) {
             if (nullRequired) {
-                outputBlocks[i] = blockBuilders[i].buildWithNulls(outputEntriesPerPosition, startPosition, batchSize, outputRowCount, arrayLengths);
+                outputBlocks[i] = blockBuilders[i].buildWithNulls(outputEntriesPerPosition, startPosition, inputBatchSize, outputRowCount, arrayLengths);
             }
             else {
                 outputBlocks[i] = blockBuilders[i].buildWithoutNulls(outputRowCount);
@@ -99,31 +91,10 @@ public Block[] buildOutputBlocks(int[] outputEntriesPerPosition, int startPositi
         return outputBlocks;
     }
 
-    private boolean needToInsertNulls(int offset, int inputBatchSize, int outputRowCount)
-    {
-        int start = columnarArray.getOffset(offset);
-        int end = columnarArray.getOffset(offset + inputBatchSize);
-        int totalLength = end - start;
-
-        if (totalLength < outputRowCount) {
-            return true;
-        }
-
-        if (columnarRow.mayHaveNull()) {
-            for (int i = start; i < end; i++) {
-                if (columnarRow.isNull(i)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
     @Override
     public long getRetainedSizeInBytes()
     {
-        // The lengths array in blockBuilders is the same object as in the unnester and doesn't need to be counted again.
+        // The lengths array in blockBuilders is the same object as in the unnester and does not need to be counted again.
         return INSTANCE_SIZE + sizeOf(arrayLengths);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/unnest/ArrayUnnester.java b/core/trino-main/src/main/java/io/trino/operator/unnest/ArrayUnnester.java
index 66090aa76a5c..cca484d18a2d 100644
--- a/core/trino-main/src/main/java/io/trino/operator/unnest/ArrayUnnester.java
+++ b/core/trino-main/src/main/java/io/trino/operator/unnest/ArrayUnnester.java
@@ -61,8 +61,8 @@ public int[] getOutputEntriesPerPosition()
     @Override
     public Block[] buildOutputBlocks(int[] outputEntriesPerPosition, int startPosition, int inputBatchSize, int outputRowCount)
     {
-        int unnestedLength = columnarArray.getOffset(startPosition + inputBatchSize) - columnarArray.getOffset(startPosition);
-        boolean nullRequired = unnestedLength < outputRowCount;
+        int unnestLength = columnarArray.getOffset(startPosition + inputBatchSize) - columnarArray.getOffset(startPosition);
+        boolean nullRequired = unnestLength < outputRowCount;
 
         Block[] outputBlocks = new Block[1];
         if (nullRequired) {
diff --git a/core/trino-main/src/main/java/io/trino/operator/unnest/UnnestBlockBuilder.java b/core/trino-main/src/main/java/io/trino/operator/unnest/UnnestBlockBuilder.java
index ddf7cd8b0070..a01e63bda8e5 100644
--- a/core/trino-main/src/main/java/io/trino/operator/unnest/UnnestBlockBuilder.java
+++ b/core/trino-main/src/main/java/io/trino/operator/unnest/UnnestBlockBuilder.java
@@ -16,47 +16,33 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.DictionaryBlock;
 
-import javax.annotation.Nullable;
-
 import static com.google.common.base.Verify.verify;
 import static io.trino.operator.unnest.UnnestBlockBuilder.NullElementFinder.NULL_NOT_FOUND;
 import static java.util.Objects.requireNonNull;
 
 public class UnnestBlockBuilder
 {
-    // checks for existence of null element in the source when required
+    // checks for the existence of a null element in the source when required
     private final NullElementFinder nullFinder = new NullElementFinder();
 
     private Block source;
     private int sourcePosition;
-    private Block nullCheckBlock;
-    private int nullCheckBlockPosition;
-
-    public void resetInputBlock(Block block)
-    {
-        resetInputBlock(block, null);
-    }
 
     /**
      * Replaces input source block with {@code block}. The old data structures for output have to be
      * reset as well, because they are based on the source.
      */
-    public void resetInputBlock(Block block, @Nullable Block nullCheckBlock)
+    public void resetInputBlock(Block block)
     {
         this.source = requireNonNull(block, "block is null");
         this.nullFinder.resetCheck(block);
         this.sourcePosition = 0;
-        this.nullCheckBlock = nullCheckBlock;
-        this.nullCheckBlockPosition = 0;
     }
 
     public Block buildWithoutNulls(int outputPositionCount)
     {
         Block output = source.getRegion(sourcePosition, outputPositionCount);
         sourcePosition += outputPositionCount;
-        if (nullCheckBlock != null) {
-            nullCheckBlockPosition += outputPositionCount;
-        }
         return output;
     }
 
@@ -92,20 +78,8 @@ private Block buildWithNullsByDictionary(
         for (int i = 0; i < inputBatchSize; i++) {
             int entryCount = lengths[offset + i];
 
-            if (nullCheckBlock == null) {
-                for (int j = 0; j < entryCount; j++) {
-                    ids[position++] = sourcePosition++;
-                }
-            }
-            else {
-                for (int j = 0; j < entryCount; j++) {
-                    if (nullCheckBlock.isNull(nullCheckBlockPosition++)) {
-                        ids[position++] = nullIndex;
-                    }
-                    else {
-                        ids[position++] = sourcePosition++;
-                    }
-                }
+            for (int j = 0; j < entryCount; j++) {
+                ids[position++] = sourcePosition++;
             }
 
             int maxEntryCount = requiredOutputEntries[offset + i];
diff --git a/core/trino-main/src/main/java/io/trino/operator/window/LagFunction.java b/core/trino-main/src/main/java/io/trino/operator/window/LagFunction.java
index 1d6f2ca1c3e2..11b0942ebd5b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/window/LagFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/window/LagFunction.java
@@ -45,41 +45,38 @@ public LagFunction(List<Integer> argumentChannels, boolean ignoreNulls)
     @Override
     public void processRow(BlockBuilder output, int frameStart, int frameEnd, int currentPosition)
     {
-        if ((offsetChannel >= 0) && windowIndex.isNull(offsetChannel, currentPosition)) {
-            output.appendNull();
-        }
-        else {
-            long offset = (offsetChannel < 0) ? 1 : windowIndex.getLong(offsetChannel, currentPosition);
-            checkCondition(offset >= 0, INVALID_FUNCTION_ARGUMENT, "Offset must be at least 0");
+        checkCondition(offsetChannel < 0 || !windowIndex.isNull(offsetChannel, currentPosition), INVALID_FUNCTION_ARGUMENT, "Offset must not be null");
+
+        long offset = (offsetChannel < 0) ? 1 : windowIndex.getLong(offsetChannel, currentPosition);
+        checkCondition(offset >= 0, INVALID_FUNCTION_ARGUMENT, "Offset must be at least 0");
 
-            long valuePosition;
+        long valuePosition;
 
-            if (ignoreNulls && (offset > 0)) {
-                long count = 0;
-                valuePosition = currentPosition - 1;
-                while (withinPartition(valuePosition, currentPosition)) {
-                    if (!windowIndex.isNull(valueChannel, toIntExact(valuePosition))) {
-                        count++;
-                        if (count == offset) {
-                            break;
-                        }
+        if (ignoreNulls && (offset > 0)) {
+            long count = 0;
+            valuePosition = currentPosition - 1;
+            while (withinPartition(valuePosition, currentPosition)) {
+                if (!windowIndex.isNull(valueChannel, toIntExact(valuePosition))) {
+                    count++;
+                    if (count == offset) {
+                        break;
                     }
-                    valuePosition--;
                 }
+                valuePosition--;
             }
-            else {
-                valuePosition = currentPosition - offset;
-            }
+        }
+        else {
+            valuePosition = currentPosition - offset;
+        }
 
-            if (withinPartition(valuePosition, currentPosition)) {
-                windowIndex.appendTo(valueChannel, toIntExact(valuePosition), output);
-            }
-            else if (defaultChannel >= 0) {
-                windowIndex.appendTo(defaultChannel, currentPosition, output);
-            }
-            else {
-                output.appendNull();
-            }
+        if (withinPartition(valuePosition, currentPosition)) {
+            windowIndex.appendTo(valueChannel, toIntExact(valuePosition), output);
+        }
+        else if (defaultChannel >= 0) {
+            windowIndex.appendTo(defaultChannel, currentPosition, output);
+        }
+        else {
+            output.appendNull();
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/window/LeadFunction.java b/core/trino-main/src/main/java/io/trino/operator/window/LeadFunction.java
index a4a6716b8824..2dcb79b29beb 100644
--- a/core/trino-main/src/main/java/io/trino/operator/window/LeadFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/window/LeadFunction.java
@@ -45,41 +45,38 @@ public LeadFunction(List<Integer> argumentChannels, boolean ignoreNulls)
     @Override
     public void processRow(BlockBuilder output, int frameStart, int frameEnd, int currentPosition)
     {
-        if ((offsetChannel >= 0) && windowIndex.isNull(offsetChannel, currentPosition)) {
-            output.appendNull();
-        }
-        else {
-            long offset = (offsetChannel < 0) ? 1 : windowIndex.getLong(offsetChannel, currentPosition);
-            checkCondition(offset >= 0, INVALID_FUNCTION_ARGUMENT, "Offset must be at least 0");
+        checkCondition(offsetChannel < 0 || !windowIndex.isNull(offsetChannel, currentPosition), INVALID_FUNCTION_ARGUMENT, "Offset must not be null");
+
+        long offset = (offsetChannel < 0) ? 1 : windowIndex.getLong(offsetChannel, currentPosition);
+        checkCondition(offset >= 0, INVALID_FUNCTION_ARGUMENT, "Offset must be at least 0");
 
-            long valuePosition;
+        long valuePosition;
 
-            if (ignoreNulls && (offset > 0)) {
-                long count = 0;
-                valuePosition = currentPosition + 1;
-                while (withinPartition(valuePosition)) {
-                    if (!windowIndex.isNull(valueChannel, toIntExact(valuePosition))) {
-                        count++;
-                        if (count == offset) {
-                            break;
-                        }
+        if (ignoreNulls && (offset > 0)) {
+            long count = 0;
+            valuePosition = currentPosition + 1;
+            while (withinPartition(valuePosition)) {
+                if (!windowIndex.isNull(valueChannel, toIntExact(valuePosition))) {
+                    count++;
+                    if (count == offset) {
+                        break;
                     }
-                    valuePosition++;
                 }
+                valuePosition++;
             }
-            else {
-                valuePosition = currentPosition + offset;
-            }
+        }
+        else {
+            valuePosition = currentPosition + offset;
+        }
 
-            if (withinPartition(valuePosition)) {
-                windowIndex.appendTo(valueChannel, toIntExact(valuePosition), output);
-            }
-            else if (defaultChannel >= 0) {
-                windowIndex.appendTo(defaultChannel, currentPosition, output);
-            }
-            else {
-                output.appendNull();
-            }
+        if (withinPartition(valuePosition)) {
+            windowIndex.appendTo(valueChannel, toIntExact(valuePosition), output);
+        }
+        else if (defaultChannel >= 0) {
+            windowIndex.appendTo(defaultChannel, currentPosition, output);
+        }
+        else {
+            output.appendNull();
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/operator/window/SqlWindowFunction.java b/core/trino-main/src/main/java/io/trino/operator/window/SqlWindowFunction.java
index f69f9dd9728f..fac1ba2ba5fe 100644
--- a/core/trino-main/src/main/java/io/trino/operator/window/SqlWindowFunction.java
+++ b/core/trino-main/src/main/java/io/trino/operator/window/SqlWindowFunction.java
@@ -30,10 +30,10 @@ public class SqlWindowFunction
     private final WindowFunctionSupplier supplier;
     private final FunctionMetadata functionMetadata;
 
-    public SqlWindowFunction(Signature signature, Optional<String> description, boolean deprecated, WindowFunctionSupplier supplier)
+    public SqlWindowFunction(String name, Signature signature, Optional<String> description, boolean deprecated, WindowFunctionSupplier supplier)
     {
         this.supplier = requireNonNull(supplier, "supplier is null");
-        FunctionMetadata.Builder functionMetadata = FunctionMetadata.windowBuilder()
+        FunctionMetadata.Builder functionMetadata = FunctionMetadata.windowBuilder(name)
                 .signature(signature);
         if (description.isPresent()) {
             functionMetadata.description(description.get());
diff --git a/core/trino-main/src/main/java/io/trino/operator/window/WindowAnnotationsParser.java b/core/trino-main/src/main/java/io/trino/operator/window/WindowAnnotationsParser.java
index 652d2288b05a..a44d50b2278b 100644
--- a/core/trino-main/src/main/java/io/trino/operator/window/WindowAnnotationsParser.java
+++ b/core/trino-main/src/main/java/io/trino/operator/window/WindowAnnotationsParser.java
@@ -42,9 +42,7 @@ public static List<SqlWindowFunction> parseFunctionDefinition(Class<? extends Wi
 
     private static SqlWindowFunction parse(Class<? extends WindowFunction> clazz, WindowFunctionSignature window)
     {
-        Signature.Builder signatureBuilder = Signature.builder()
-                .name(window.name());
-
+        Signature.Builder signatureBuilder = Signature.builder();
         if (!window.typeVariable().isEmpty()) {
             signatureBuilder.typeVariable(window.typeVariable());
         }
@@ -59,6 +57,11 @@ private static SqlWindowFunction parse(Class<? extends WindowFunction> clazz, Wi
 
         boolean deprecated = clazz.getAnnotationsByType(Deprecated.class).length > 0;
 
-        return new SqlWindowFunction(signatureBuilder.build(), description, deprecated, new ReflectionWindowFunctionSupplier(window.argumentTypes().length, clazz));
+        return new SqlWindowFunction(
+                window.name(),
+                signatureBuilder.build(),
+                description,
+                deprecated,
+                new ReflectionWindowFunctionSupplier(window.argumentTypes().length, clazz));
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/security/AccessControl.java b/core/trino-main/src/main/java/io/trino/security/AccessControl.java
index 1fa8d0db01cb..2602e4dddee1 100644
--- a/core/trino-main/src/main/java/io/trino/security/AccessControl.java
+++ b/core/trino-main/src/main/java/io/trino/security/AccessControl.java
@@ -18,7 +18,7 @@
 import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
@@ -254,9 +254,17 @@ public interface AccessControl
 
     /**
      * Filter the list of columns to those visible to the identity.
+     *
+     * @deprecated Use {@link #filterColumns(SecurityContext, String, Map)}
      */
+    @Deprecated
     Set<String> filterColumns(SecurityContext context, CatalogSchemaTableName tableName, Set<String> columns);
 
+    /**
+     * Filter lists of columns of multiple tables to those visible to the identity.
+     */
+    Map<SchemaTableName, Set<String>> filterColumns(SecurityContext context, String catalogName, Map<SchemaTableName, Set<String>> tableColumns);
+
     /**
      * Check if identity is allowed to add columns to the specified table.
      *
@@ -393,20 +401,6 @@ default void checkCanSetViewAuthorization(SecurityContext context, QualifiedObje
      */
     void checkCanSetMaterializedViewProperties(SecurityContext context, QualifiedObjectName materializedViewName, Map<String, Optional<Object>> properties);
 
-    /**
-     * Check if identity is allowed to create a view that executes the function.
-     *
-     * @throws AccessDeniedException if not allowed
-     */
-    void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, String functionName, Identity grantee, boolean grantOption);
-
-    /**
-     * Check if identity is allowed to create a view that executes the function.
-     *
-     * @throws AccessDeniedException if not allowed
-     */
-    void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName, Identity grantee, boolean grantOption);
-
     /**
      * Check if identity is allowed to grant a privilege to the grantee on the specified schema.
      *
@@ -515,14 +509,6 @@ void checkCanRevokeRoles(SecurityContext context,
      */
     void checkCanSetCatalogRole(SecurityContext context, String role, String catalogName);
 
-    /**
-     * Check if identity is allowed to show role authorization descriptors (i.e. RoleGrants).
-     *
-     * @param catalogName if present, the role catalog; otherwise the role is a system role
-     * @throws AccessDeniedException if not allowed
-     */
-    void checkCanShowRoleAuthorizationDescriptors(SecurityContext context, Optional<String> catalogName);
-
     /**
      * Check if identity is allowed to show roles on the specified catalog.
      *
@@ -555,25 +541,51 @@ void checkCanRevokeRoles(SecurityContext context,
     void checkCanExecuteProcedure(SecurityContext context, QualifiedObjectName procedureName);
 
     /**
-     * Check if identity is allowed to execute function
+     * Is the identity allowed to execute function?
+     */
+    boolean canExecuteFunction(SecurityContext context, QualifiedObjectName functionName);
+
+    /**
+     * Is the identity allowed to create a view that executes the specified function?
+     */
+    boolean canCreateViewWithExecuteFunction(SecurityContext context, QualifiedObjectName functionName);
+
+    /**
+     * Check if identity is allowed to execute given table procedure on given table
+     *
+     * @throws AccessDeniedException if not allowed
+     */
+    void checkCanExecuteTableProcedure(SecurityContext context, QualifiedObjectName tableName, String procedureName);
+
+    /**
+     * Check if identity is allowed to show functions by executing SHOW FUNCTIONS in a catalog schema.
+     * <p>
+     * NOTE: This method is only present to give users an error message when listing is not allowed.
+     * The {@link #filterFunctions} method must filter all results for unauthorized users,
+     * since there are multiple ways to list functions.
      *
      * @throws AccessDeniedException if not allowed
      */
-    void checkCanExecuteFunction(SecurityContext context, String functionName);
+    void checkCanShowFunctions(SecurityContext context, CatalogSchemaName schema);
 
     /**
-     * Check if identity is allowed to execute function
+     * Filter the list of functions to those visible to the identity.
+     */
+    Set<SchemaFunctionName> filterFunctions(SecurityContext context, String catalogName, Set<SchemaFunctionName> functionNames);
+
+    /**
+     * Check if identity is allowed to create the specified function.
      *
      * @throws AccessDeniedException if not allowed
      */
-    void checkCanExecuteFunction(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName);
+    void checkCanCreateFunction(SecurityContext context, QualifiedObjectName functionName);
 
     /**
-     * Check if identity is allowed to execute given table procedure on given table
+     * Check if identity is allowed to drop the specified function.
      *
      * @throws AccessDeniedException if not allowed
      */
-    void checkCanExecuteTableProcedure(SecurityContext context, QualifiedObjectName tableName, String procedureName);
+    void checkCanDropFunction(SecurityContext context, QualifiedObjectName functionName);
 
     default List<ViewExpression> getRowFilters(SecurityContext context, QualifiedObjectName tableName)
     {
diff --git a/core/trino-main/src/main/java/io/trino/security/AccessControlConfig.java b/core/trino-main/src/main/java/io/trino/security/AccessControlConfig.java
index 09c3c322739b..6879ee330db3 100644
--- a/core/trino-main/src/main/java/io/trino/security/AccessControlConfig.java
+++ b/core/trino-main/src/main/java/io/trino/security/AccessControlConfig.java
@@ -17,8 +17,7 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/security/AccessControlManager.java b/core/trino-main/src/main/java/io/trino/security/AccessControlManager.java
index 5e9324b25c19..fa6df5f2bcbd 100644
--- a/core/trino-main/src/main/java/io/trino/security/AccessControlManager.java
+++ b/core/trino-main/src/main/java/io/trino/security/AccessControlManager.java
@@ -17,8 +17,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.stats.CounterStat;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.eventlistener.EventListenerManager;
 import io.trino.metadata.QualifiedObjectName;
@@ -32,16 +36,18 @@
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.CatalogHandle.CatalogHandleType;
 import io.trino.spi.connector.CatalogSchemaName;
+import io.trino.spi.connector.CatalogSchemaRoutineName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Identity;
-import io.trino.spi.security.PrincipalType;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.SystemAccessControl;
 import io.trino.spi.security.SystemAccessControlFactory;
+import io.trino.spi.security.SystemAccessControlFactory.SystemAccessControlContext;
 import io.trino.spi.security.SystemSecurityContext;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.security.ViewExpression;
@@ -51,12 +57,11 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.security.Principal;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -66,7 +71,10 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
+import java.util.function.BiPredicate;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.isNullOrEmpty;
@@ -75,6 +83,7 @@
 import static io.trino.spi.StandardErrorCode.INVALID_COLUMN_MASK;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.SERVER_STARTING_UP;
+import static io.trino.spi.security.AccessDeniedException.denyCatalogAccess;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
@@ -89,6 +98,7 @@ public class AccessControlManager
     private final TransactionManager transactionManager;
     private final EventListenerManager eventListenerManager;
     private final List<File> configFiles;
+    private final OpenTelemetry openTelemetry;
     private final String defaultAccessControlName;
     private final Map<String, SystemAccessControlFactory> systemAccessControlFactories = new ConcurrentHashMap<>();
     private final AtomicReference<CatalogServiceProvider<Optional<ConnectorAccessControl>>> connectorAccessControlProvider = new AtomicReference<>();
@@ -103,11 +113,13 @@ public AccessControlManager(
             TransactionManager transactionManager,
             EventListenerManager eventListenerManager,
             AccessControlConfig config,
+            OpenTelemetry openTelemetry,
             @DefaultSystemAccessControlName String defaultAccessControlName)
     {
         this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
         this.eventListenerManager = requireNonNull(eventListenerManager, "eventListenerManager is null");
         this.configFiles = ImmutableList.copyOf(config.getAccessControlFiles());
+        this.openTelemetry = requireNonNull(openTelemetry, "openTelemetry is null");
         this.defaultAccessControlName = requireNonNull(defaultAccessControlName, "defaultAccessControl is null");
         addSystemAccessControlFactory(new DefaultSystemAccessControl.Factory());
         addSystemAccessControlFactory(new AllowAllSystemAccessControl.Factory());
@@ -179,7 +191,7 @@ private SystemAccessControl createSystemAccessControl(File configFile)
 
         SystemAccessControl systemAccessControl;
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(factory.getClass().getClassLoader())) {
-            systemAccessControl = factory.create(ImmutableMap.copyOf(properties));
+            systemAccessControl = factory.create(ImmutableMap.copyOf(properties), createContext(name));
         }
 
         log.info("-- Loaded system access control %s --", name);
@@ -197,7 +209,7 @@ public void loadSystemAccessControl(String name, Map<String, String> properties)
 
         SystemAccessControl systemAccessControl;
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(factory.getClass().getClassLoader())) {
-            systemAccessControl = factory.create(ImmutableMap.copyOf(properties));
+            systemAccessControl = factory.create(ImmutableMap.copyOf(properties), createContext(name));
         }
 
         systemAccessControl.getEventListeners()
@@ -206,19 +218,29 @@ public void loadSystemAccessControl(String name, Map<String, String> properties)
         setSystemAccessControls(ImmutableList.of(systemAccessControl));
     }
 
-    @VisibleForTesting
-    public void addSystemAccessControl(SystemAccessControl systemAccessControl)
+    private SystemAccessControlContext createContext(String systemAccessControlName)
     {
-        systemAccessControls.updateAndGet(currentControls ->
-                ImmutableList.<SystemAccessControl>builder()
-                        .addAll(currentControls)
-                        .add(systemAccessControl)
-                        .build());
+        return new SystemAccessControlContext()
+        {
+            private final Tracer tracer = openTelemetry.getTracer("trino.system-access-control." + systemAccessControlName);
+
+            @Override
+            public OpenTelemetry getOpenTelemetry()
+            {
+                return openTelemetry;
+            }
+
+            @Override
+            public Tracer getTracer()
+            {
+                return tracer;
+            }
+        };
     }
 
-    @VisibleForTesting
     public void setSystemAccessControls(List<SystemAccessControl> systemAccessControls)
     {
+        systemAccessControls.forEach(AccessControlManager::verifySystemAccessControl);
         checkState(this.systemAccessControls.compareAndSet(null, systemAccessControls), "System access control already initialized");
     }
 
@@ -228,7 +250,7 @@ public void checkCanImpersonateUser(Identity identity, String userName)
         requireNonNull(identity, "identity is null");
         requireNonNull(userName, "userName is null");
 
-        systemAuthorizationCheck(control -> control.checkCanImpersonateUser(new SystemSecurityContext(identity, Optional.empty()), userName));
+        systemAuthorizationCheck(control -> control.checkCanImpersonateUser(identity, userName));
     }
 
     @Override
@@ -246,7 +268,7 @@ public void checkCanReadSystemInformation(Identity identity)
     {
         requireNonNull(identity, "identity is null");
 
-        systemAuthorizationCheck(control -> control.checkCanReadSystemInformation(new SystemSecurityContext(identity, Optional.empty())));
+        systemAuthorizationCheck(control -> control.checkCanReadSystemInformation(identity));
     }
 
     @Override
@@ -254,7 +276,7 @@ public void checkCanWriteSystemInformation(Identity identity)
     {
         requireNonNull(identity, "identity is null");
 
-        systemAuthorizationCheck(control -> control.checkCanWriteSystemInformation(new SystemSecurityContext(identity, Optional.empty())));
+        systemAuthorizationCheck(control -> control.checkCanWriteSystemInformation(identity));
     }
 
     @Override
@@ -262,7 +284,7 @@ public void checkCanExecuteQuery(Identity identity)
     {
         requireNonNull(identity, "identity is null");
 
-        systemAuthorizationCheck(control -> control.checkCanExecuteQuery(new SystemSecurityContext(identity, Optional.empty())));
+        systemAuthorizationCheck(control -> control.checkCanExecuteQuery(identity));
     }
 
     @Override
@@ -270,14 +292,18 @@ public void checkCanViewQueryOwnedBy(Identity identity, Identity queryOwner)
     {
         requireNonNull(identity, "identity is null");
 
-        systemAuthorizationCheck(control -> control.checkCanViewQueryOwnedBy(new SystemSecurityContext(identity, Optional.empty()), queryOwner));
+        systemAuthorizationCheck(control -> control.checkCanViewQueryOwnedBy(identity, queryOwner));
     }
 
     @Override
     public Collection<Identity> filterQueriesOwnedBy(Identity identity, Collection<Identity> queryOwners)
     {
+        if (queryOwners.isEmpty()) {
+            // Do not call plugin-provided implementation unnecessarily.
+            return ImmutableSet.of();
+        }
         for (SystemAccessControl systemAccessControl : getSystemAccessControls()) {
-            queryOwners = systemAccessControl.filterViewQueryOwnedBy(new SystemSecurityContext(identity, Optional.empty()), queryOwners);
+            queryOwners = systemAccessControl.filterViewQueryOwnedBy(identity, queryOwners);
         }
         return queryOwners;
     }
@@ -288,7 +314,7 @@ public void checkCanKillQueryOwnedBy(Identity identity, Identity queryOwner)
         requireNonNull(identity, "identity is null");
         requireNonNull(queryOwner, "queryOwner is null");
 
-        systemAuthorizationCheck(control -> control.checkCanKillQueryOwnedBy(new SystemSecurityContext(identity, Optional.empty()), queryOwner));
+        systemAuthorizationCheck(control -> control.checkCanKillQueryOwnedBy(identity, queryOwner));
     }
 
     @Override
@@ -315,6 +341,11 @@ public Set<String> filterCatalogs(SecurityContext securityContext, Set<String> c
         requireNonNull(securityContext, "securityContext is null");
         requireNonNull(catalogs, "catalogs is null");
 
+        if (catalogs.isEmpty()) {
+            // Do not call plugin-provided implementation unnecessarily.
+            return ImmutableSet.of();
+        }
+
         for (SystemAccessControl systemAccessControl : getSystemAccessControls()) {
             catalogs = systemAccessControl.filterCatalogs(securityContext.toSystemSecurityContext(), catalogs);
         }
@@ -393,6 +424,11 @@ public Set<String> filterSchemas(SecurityContext securityContext, String catalog
         requireNonNull(catalogName, "catalogName is null");
         requireNonNull(schemaNames, "schemaNames is null");
 
+        if (schemaNames.isEmpty()) {
+            // Do not call plugin-provided implementation unnecessarily.
+            return ImmutableSet.of();
+        }
+
         if (filterCatalogs(securityContext, ImmutableSet.of(catalogName)).isEmpty()) {
             return ImmutableSet.of();
         }
@@ -547,6 +583,11 @@ public Set<SchemaTableName> filterTables(SecurityContext securityContext, String
         requireNonNull(catalogName, "catalogName is null");
         requireNonNull(tableNames, "tableNames is null");
 
+        if (tableNames.isEmpty()) {
+            // Do not call plugin-provided implementation unnecessarily.
+            return ImmutableSet.of();
+        }
+
         if (filterCatalogs(securityContext, ImmutableSet.of(catalogName)).isEmpty()) {
             return ImmutableSet.of();
         }
@@ -581,6 +622,11 @@ public Set<String> filterColumns(SecurityContext securityContext, CatalogSchemaT
         requireNonNull(securityContext, "securityContext is null");
         requireNonNull(table, "tableName is null");
 
+        if (columns.isEmpty()) {
+            // Do not call plugin-provided implementation unnecessarily.
+            return ImmutableSet.of();
+        }
+
         if (filterTables(securityContext, table.getCatalogName(), ImmutableSet.of(table.getSchemaTableName())).isEmpty()) {
             return ImmutableSet.of();
         }
@@ -596,6 +642,34 @@ public Set<String> filterColumns(SecurityContext securityContext, CatalogSchemaT
         return columns;
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(SecurityContext securityContext, String catalogName, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        requireNonNull(securityContext, "securityContext is null");
+        requireNonNull(catalogName, "catalogName is null");
+        requireNonNull(tableColumns, "tableColumns is null");
+
+        Set<SchemaTableName> filteredTables = filterTables(securityContext, catalogName, tableColumns.keySet());
+        if (!filteredTables.equals(tableColumns.keySet())) {
+            tableColumns = Maps.filterKeys(tableColumns, filteredTables::contains);
+        }
+
+        if (tableColumns.isEmpty()) {
+            // Do not call plugin-provided implementation unnecessarily.
+            return ImmutableMap.of();
+        }
+
+        for (SystemAccessControl systemAccessControl : getSystemAccessControls()) {
+            tableColumns = systemAccessControl.filterColumns(securityContext.toSystemSecurityContext(), catalogName, tableColumns);
+        }
+
+        ConnectorAccessControl connectorAccessControl = getConnectorAccessControl(securityContext.getTransactionId(), catalogName);
+        if (connectorAccessControl != null) {
+            tableColumns = connectorAccessControl.filterColumns(toConnectorSecurityContext(catalogName, securityContext), tableColumns);
+        }
+        return tableColumns;
+    }
+
     @Override
     public void checkCanAddColumns(SecurityContext securityContext, QualifiedObjectName tableName)
     {
@@ -862,44 +936,6 @@ public void checkCanSetMaterializedViewProperties(SecurityContext securityContex
                 (control, context) -> control.checkCanSetMaterializedViewProperties(context, materializedViewName.asSchemaTableName(), properties));
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext securityContext, String functionName, Identity grantee, boolean grantOption)
-    {
-        requireNonNull(securityContext, "securityContext is null");
-        requireNonNull(functionName, "functionName is null");
-
-        systemAuthorizationCheck(control -> control.checkCanGrantExecuteFunctionPrivilege(
-                securityContext.toSystemSecurityContext(),
-                functionName,
-                new TrinoPrincipal(PrincipalType.USER, grantee.getUser()),
-                grantOption));
-    }
-
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext securityContext, FunctionKind functionKind, QualifiedObjectName functionName, Identity grantee, boolean grantOption)
-    {
-        requireNonNull(securityContext, "securityContext is null");
-        requireNonNull(functionKind, "functionKind is null");
-        requireNonNull(functionName, "functionName is null");
-
-        systemAuthorizationCheck(control -> control.checkCanGrantExecuteFunctionPrivilege(
-                securityContext.toSystemSecurityContext(),
-                functionKind,
-                functionName.asCatalogSchemaRoutineName(),
-                new TrinoPrincipal(PrincipalType.USER, grantee.getUser()),
-                grantOption));
-
-        catalogAuthorizationCheck(
-                functionName.getCatalogName(),
-                securityContext,
-                (control, context) -> control.checkCanGrantExecuteFunctionPrivilege(
-                        context,
-                        functionKind,
-                        functionName.asSchemaRoutineName(),
-                        new TrinoPrincipal(PrincipalType.USER, grantee.getUser()),
-                        grantOption));
-    }
-
     @Override
     public void checkCanGrantSchemaPrivilege(SecurityContext securityContext, Privilege privilege, CatalogSchemaName schemaName, TrinoPrincipal grantee, boolean grantOption)
     {
@@ -999,7 +1035,7 @@ public void checkCanSetSystemSessionProperty(Identity identity, String propertyN
         requireNonNull(identity, "identity is null");
         requireNonNull(propertyName, "propertyName is null");
 
-        systemAuthorizationCheck(control -> control.checkCanSetSystemSessionProperty(new SystemSecurityContext(identity, Optional.empty()), propertyName));
+        systemAuthorizationCheck(control -> control.checkCanSetSystemSessionProperty(identity, propertyName));
     }
 
     @Override
@@ -1114,22 +1150,6 @@ public void checkCanSetCatalogRole(SecurityContext securityContext, String role,
         catalogAuthorizationCheck(catalogName, securityContext, (control, context) -> control.checkCanSetRole(context, role));
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(SecurityContext securityContext, Optional<String> catalogName)
-    {
-        requireNonNull(securityContext, "securityContext is null");
-        requireNonNull(catalogName, "catalogName is null");
-
-        if (catalogName.isPresent()) {
-            checkCanAccessCatalog(securityContext, catalogName.get());
-            checkCatalogRoles(securityContext, catalogName.get());
-            catalogAuthorizationCheck(catalogName.get(), securityContext, ConnectorAccessControl::checkCanShowRoleAuthorizationDescriptors);
-        }
-        else {
-            systemAuthorizationCheck(control -> control.checkCanShowRoleAuthorizationDescriptors(securityContext.toSystemSecurityContext()));
-        }
-    }
-
     @Override
     public void checkCanShowRoles(SecurityContext securityContext, Optional<String> catalogName)
     {
@@ -1195,32 +1215,43 @@ public void checkCanExecuteProcedure(SecurityContext securityContext, QualifiedO
     }
 
     @Override
-    public void checkCanExecuteFunction(SecurityContext context, String functionName)
+    public boolean canExecuteFunction(SecurityContext securityContext, QualifiedObjectName functionName)
     {
-        requireNonNull(context, "context is null");
+        requireNonNull(securityContext, "securityContext is null");
         requireNonNull(functionName, "functionName is null");
 
-        systemAuthorizationCheck(control -> control.checkCanExecuteFunction(context.toSystemSecurityContext(), functionName));
+        if (!canAccessCatalog(securityContext, functionName.getCatalogName())) {
+            return false;
+        }
+
+        if (!systemAuthorizationTest(control -> control.canExecuteFunction(securityContext.toSystemSecurityContext(), functionName.asCatalogSchemaRoutineName()))) {
+            return false;
+        }
+
+        return catalogAuthorizationTest(
+                functionName.getCatalogName(),
+                securityContext,
+                (control, context) -> control.canExecuteFunction(context, functionName.asSchemaRoutineName()));
     }
 
     @Override
-    public void checkCanExecuteFunction(SecurityContext securityContext, FunctionKind functionKind, QualifiedObjectName functionName)
+    public boolean canCreateViewWithExecuteFunction(SecurityContext securityContext, QualifiedObjectName functionName)
     {
         requireNonNull(securityContext, "securityContext is null");
-        requireNonNull(functionKind, "functionKind is null");
         requireNonNull(functionName, "functionName is null");
 
-        checkCanAccessCatalog(securityContext, functionName.getCatalogName());
+        if (!canAccessCatalog(securityContext, functionName.getCatalogName())) {
+            return false;
+        }
 
-        systemAuthorizationCheck(control -> control.checkCanExecuteFunction(
-                securityContext.toSystemSecurityContext(),
-                functionKind,
-                functionName.asCatalogSchemaRoutineName()));
+        if (!systemAuthorizationTest(control -> control.canCreateViewWithExecuteFunction(securityContext.toSystemSecurityContext(), functionName.asCatalogSchemaRoutineName()))) {
+            return false;
+        }
 
-        catalogAuthorizationCheck(
+        return catalogAuthorizationTest(
                 functionName.getCatalogName(),
                 securityContext,
-                (control, context) -> control.checkCanExecuteFunction(context, functionKind, functionName.asSchemaRoutineName()));
+                (control, context) -> control.canCreateViewWithExecuteFunction(context, functionName.asSchemaRoutineName()));
     }
 
     @Override
@@ -1244,6 +1275,72 @@ public void checkCanExecuteTableProcedure(SecurityContext securityContext, Quali
                         procedureName));
     }
 
+    @Override
+    public void checkCanShowFunctions(SecurityContext securityContext, CatalogSchemaName schema)
+    {
+        requireNonNull(securityContext, "securityContext is null");
+        requireNonNull(schema, "schema is null");
+
+        checkCanAccessCatalog(securityContext, schema.getCatalogName());
+
+        systemAuthorizationCheck(control -> control.checkCanShowFunctions(securityContext.toSystemSecurityContext(), schema));
+
+        catalogAuthorizationCheck(schema.getCatalogName(), securityContext, (control, context) -> control.checkCanShowFunctions(context, schema.getSchemaName()));
+    }
+
+    @Override
+    public Set<SchemaFunctionName> filterFunctions(SecurityContext securityContext, String catalogName, Set<SchemaFunctionName> functionNames)
+    {
+        requireNonNull(securityContext, "securityContext is null");
+        requireNonNull(catalogName, "catalogName is null");
+        requireNonNull(functionNames, "functionNames is null");
+
+        if (functionNames.isEmpty()) {
+            return ImmutableSet.of();
+        }
+
+        if (filterCatalogs(securityContext, ImmutableSet.of(catalogName)).isEmpty()) {
+            return ImmutableSet.of();
+        }
+
+        for (SystemAccessControl systemAccessControl : getSystemAccessControls()) {
+            functionNames = systemAccessControl.filterFunctions(securityContext.toSystemSecurityContext(), catalogName, functionNames);
+        }
+
+        ConnectorAccessControl connectorAccessControl = getConnectorAccessControl(securityContext.getTransactionId(), catalogName);
+        if (connectorAccessControl != null) {
+            functionNames = connectorAccessControl.filterFunctions(toConnectorSecurityContext(catalogName, securityContext), functionNames);
+        }
+
+        return functionNames;
+    }
+
+    @Override
+    public void checkCanCreateFunction(SecurityContext securityContext, QualifiedObjectName functionName)
+    {
+        requireNonNull(securityContext, "securityContext is null");
+        requireNonNull(functionName, "functionName is null");
+
+        checkCanAccessCatalog(securityContext, functionName.getCatalogName());
+
+        systemAuthorizationCheck(control -> control.checkCanCreateFunction(securityContext.toSystemSecurityContext(), functionName.asCatalogSchemaRoutineName()));
+
+        catalogAuthorizationCheck(functionName.getCatalogName(), securityContext, (control, context) -> control.checkCanCreateFunction(context, functionName.asSchemaRoutineName()));
+    }
+
+    @Override
+    public void checkCanDropFunction(SecurityContext securityContext, QualifiedObjectName functionName)
+    {
+        requireNonNull(securityContext, "securityContext is null");
+        requireNonNull(functionName, "functionName is null");
+
+        checkCanAccessCatalog(securityContext, functionName.getCatalogName());
+
+        systemAuthorizationCheck(control -> control.checkCanDropFunction(securityContext.toSystemSecurityContext(), functionName.asCatalogSchemaRoutineName()));
+
+        catalogAuthorizationCheck(functionName.getCatalogName(), securityContext, (control, context) -> control.checkCanDropFunction(context, functionName.asSchemaRoutineName()));
+    }
+
     @Override
     public List<ViewExpression> getRowFilters(SecurityContext context, QualifiedObjectName tableName)
     {
@@ -1300,9 +1397,11 @@ private ConnectorAccessControl getConnectorAccessControl(TransactionId transacti
             return null;
         }
 
-        return transactionManager.getCatalogHandle(transactionId, catalogName)
+        ConnectorAccessControl connectorAccessControl = transactionManager.getCatalogHandle(transactionId, catalogName)
                 .flatMap(connectorAccessControlProvider::getService)
                 .orElse(null);
+
+        return connectorAccessControl;
     }
 
     @Managed
@@ -1321,16 +1420,33 @@ public CounterStat getAuthorizationFail()
 
     private void checkCanAccessCatalog(SecurityContext securityContext, String catalogName)
     {
-        try {
-            for (SystemAccessControl systemAccessControl : getSystemAccessControls()) {
-                systemAccessControl.checkCanAccessCatalog(securityContext.toSystemSecurityContext(), catalogName);
+        if (!canAccessCatalog(securityContext, catalogName)) {
+            denyCatalogAccess(catalogName);
+        }
+    }
+
+    private boolean canAccessCatalog(SecurityContext securityContext, String catalogName)
+    {
+        for (SystemAccessControl systemAccessControl : getSystemAccessControls()) {
+            if (!systemAccessControl.canAccessCatalog(securityContext.toSystemSecurityContext(), catalogName)) {
+                authorizationFail.update(1);
+                return false;
             }
-            authorizationSuccess.update(1);
         }
-        catch (TrinoException e) {
-            authorizationFail.update(1);
-            throw e;
+        authorizationSuccess.update(1);
+        return true;
+    }
+
+    private boolean systemAuthorizationTest(Predicate<SystemAccessControl> check)
+    {
+        for (SystemAccessControl systemAccessControl : getSystemAccessControls()) {
+            if (!check.test(systemAccessControl)) {
+                authorizationFail.update(1);
+                return false;
+            }
         }
+        authorizationSuccess.update(1);
+        return true;
     }
 
     private void systemAuthorizationCheck(Consumer<SystemAccessControl> check)
@@ -1347,6 +1463,23 @@ private void systemAuthorizationCheck(Consumer<SystemAccessControl> check)
         }
     }
 
+    private boolean catalogAuthorizationTest(String catalogName, SecurityContext securityContext, BiPredicate<ConnectorAccessControl, ConnectorSecurityContext> check)
+    {
+        ConnectorAccessControl connectorAccessControl = getConnectorAccessControl(securityContext.getTransactionId(), catalogName);
+        if (connectorAccessControl == null) {
+            return true;
+        }
+
+        boolean result = check.test(connectorAccessControl, toConnectorSecurityContext(catalogName, securityContext));
+        if (result) {
+            authorizationSuccess.update(1);
+        }
+        else {
+            authorizationFail.update(1);
+        }
+        return result;
+    }
+
     private void catalogAuthorizationCheck(String catalogName, SecurityContext securityContext, BiConsumer<ConnectorAccessControl, ConnectorSecurityContext> check)
     {
         ConnectorAccessControl connectorAccessControl = getConnectorAccessControl(securityContext.getTransactionId(), catalogName);
@@ -1394,6 +1527,28 @@ private ConnectorSecurityContext toConnectorSecurityContext(String catalogName,
                 queryId);
     }
 
+    private static void verifySystemAccessControl(SystemAccessControl systemAccessControl)
+    {
+        Class<?> clazz = systemAccessControl.getClass();
+        mustNotDeclareMethod(clazz, "checkCanAccessCatalog", SystemSecurityContext.class, String.class);
+        mustNotDeclareMethod(clazz, "checkCanGrantExecuteFunctionPrivilege", SystemSecurityContext.class, String.class, TrinoPrincipal.class, boolean.class);
+        mustNotDeclareMethod(clazz, "checkCanExecuteFunction", SystemSecurityContext.class, String.class);
+        mustNotDeclareMethod(clazz, "checkCanExecuteFunction", SystemSecurityContext.class, FunctionKind.class, CatalogSchemaRoutineName.class);
+        mustNotDeclareMethod(clazz, "checkCanGrantExecuteFunctionPrivilege", SystemSecurityContext.class, FunctionKind.class, CatalogSchemaRoutineName.class, TrinoPrincipal.class, boolean.class);
+    }
+
+    private static void mustNotDeclareMethod(Class<?> clazz, String name, Class<?>... parameterTypes)
+    {
+        try {
+            clazz.getMethod(name, parameterTypes);
+            throw new IllegalArgumentException(format("Access control %s must not implement removed method %s(%s)",
+                    clazz.getName(),
+                    name, Arrays.stream(parameterTypes).map(Class::getName).collect(Collectors.joining(", "))));
+        }
+        catch (ReflectiveOperationException ignored) {
+        }
+    }
+
     private static class InitializingSystemAccessControl
             extends ForwardingSystemAccessControl
     {
diff --git a/core/trino-main/src/main/java/io/trino/security/AccessControlModule.java b/core/trino-main/src/main/java/io/trino/security/AccessControlModule.java
index eb97145b5af5..e3e2d971e9e1 100644
--- a/core/trino-main/src/main/java/io/trino/security/AccessControlModule.java
+++ b/core/trino-main/src/main/java/io/trino/security/AccessControlModule.java
@@ -23,6 +23,8 @@
 import io.trino.plugin.base.security.DefaultSystemAccessControl;
 import io.trino.plugin.base.util.LoggingInvocationHandler;
 import io.trino.spi.security.GroupProvider;
+import io.trino.tracing.ForTracing;
+import io.trino.tracing.TracingAccessControl;
 
 import static com.google.common.reflect.Reflection.newProxy;
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
@@ -38,6 +40,7 @@ public void configure(Binder binder)
         configBinder(binder).bindConfig(AccessControlConfig.class);
         newOptionalBinder(binder, Key.get(String.class, DefaultSystemAccessControlName.class)).setDefault().toInstance(DefaultSystemAccessControl.NAME);
         binder.bind(AccessControlManager.class).in(Scopes.SINGLETON);
+        binder.bind(AccessControl.class).to(TracingAccessControl.class);
         binder.bind(GroupProviderManager.class).in(Scopes.SINGLETON);
         binder.bind(GroupProvider.class).to(GroupProviderManager.class).in(Scopes.SINGLETON);
         newExporter(binder).export(AccessControlManager.class).withGeneratedName();
@@ -45,6 +48,7 @@ public void configure(Binder binder)
 
     @Provides
     @Singleton
+    @ForTracing
     public AccessControl createAccessControl(AccessControlManager accessControlManager)
     {
         Logger logger = Logger.get(AccessControl.class);
diff --git a/core/trino-main/src/main/java/io/trino/security/AllowAllAccessControl.java b/core/trino-main/src/main/java/io/trino/security/AllowAllAccessControl.java
index 9323a5bc3067..15d393af9232 100644
--- a/core/trino-main/src/main/java/io/trino/security/AllowAllAccessControl.java
+++ b/core/trino-main/src/main/java/io/trino/security/AllowAllAccessControl.java
@@ -17,7 +17,7 @@
 import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.TrinoPrincipal;
@@ -186,6 +186,12 @@ public Set<String> filterColumns(SecurityContext context, CatalogSchemaTableName
         return columns;
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(SecurityContext context, String catalogName, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        return tableColumns;
+    }
+
     @Override
     public void checkCanAddColumns(SecurityContext context, QualifiedObjectName tableName)
     {
@@ -282,13 +288,15 @@ public void checkCanSetMaterializedViewProperties(SecurityContext context, Quali
     }
 
     @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, String functionName, Identity grantee, boolean grantOption)
+    public boolean canExecuteFunction(SecurityContext context, QualifiedObjectName functionName)
     {
+        return true;
     }
 
     @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName, Identity grantee, boolean grantOption)
+    public boolean canCreateViewWithExecuteFunction(SecurityContext context, QualifiedObjectName functionName)
     {
+        return true;
     }
 
     @Override
@@ -361,11 +369,6 @@ public void checkCanSetCatalogRole(SecurityContext context, String role, String
     {
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(SecurityContext context, Optional<String> catalogName)
-    {
-    }
-
     @Override
     public void checkCanShowRoles(SecurityContext context, Optional<String> catalogName)
     {
@@ -387,17 +390,28 @@ public void checkCanExecuteProcedure(SecurityContext context, QualifiedObjectNam
     }
 
     @Override
-    public void checkCanExecuteFunction(SecurityContext context, String functionName)
+    public void checkCanExecuteTableProcedure(SecurityContext context, QualifiedObjectName tableName, String procedureName)
+    {
+    }
+
+    @Override
+    public void checkCanShowFunctions(SecurityContext context, CatalogSchemaName schema)
     {
     }
 
     @Override
-    public void checkCanExecuteFunction(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName)
+    public Set<SchemaFunctionName> filterFunctions(SecurityContext context, String catalogName, Set<SchemaFunctionName> functionNames)
     {
+        return functionNames;
     }
 
     @Override
-    public void checkCanExecuteTableProcedure(SecurityContext context, QualifiedObjectName tableName, String procedureName)
+    public void checkCanCreateFunction(SecurityContext context, QualifiedObjectName functionName)
+    {
+    }
+
+    @Override
+    public void checkCanDropFunction(SecurityContext context, QualifiedObjectName functionName)
     {
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/security/DefaultSystemAccessControlName.java b/core/trino-main/src/main/java/io/trino/security/DefaultSystemAccessControlName.java
index 855817ab6362..93756b28ec66 100644
--- a/core/trino-main/src/main/java/io/trino/security/DefaultSystemAccessControlName.java
+++ b/core/trino-main/src/main/java/io/trino/security/DefaultSystemAccessControlName.java
@@ -13,7 +13,7 @@
  */
 package io.trino.security;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface DefaultSystemAccessControlName
 {
 }
diff --git a/core/trino-main/src/main/java/io/trino/security/DenyAllAccessControl.java b/core/trino-main/src/main/java/io/trino/security/DenyAllAccessControl.java
index 7105592fcbd0..7d9fa4c2e78a 100644
--- a/core/trino-main/src/main/java/io/trino/security/DenyAllAccessControl.java
+++ b/core/trino-main/src/main/java/io/trino/security/DenyAllAccessControl.java
@@ -14,12 +14,13 @@
 package io.trino.security;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.TrinoPrincipal;
@@ -36,6 +37,7 @@
 import static io.trino.spi.security.AccessDeniedException.denyCommentTable;
 import static io.trino.spi.security.AccessDeniedException.denyCommentView;
 import static io.trino.spi.security.AccessDeniedException.denyCreateCatalog;
+import static io.trino.spi.security.AccessDeniedException.denyCreateFunction;
 import static io.trino.spi.security.AccessDeniedException.denyCreateMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyCreateRole;
 import static io.trino.spi.security.AccessDeniedException.denyCreateSchema;
@@ -47,16 +49,15 @@
 import static io.trino.spi.security.AccessDeniedException.denyDenyTablePrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyDropCatalog;
 import static io.trino.spi.security.AccessDeniedException.denyDropColumn;
+import static io.trino.spi.security.AccessDeniedException.denyDropFunction;
 import static io.trino.spi.security.AccessDeniedException.denyDropMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyDropRole;
 import static io.trino.spi.security.AccessDeniedException.denyDropSchema;
 import static io.trino.spi.security.AccessDeniedException.denyDropTable;
 import static io.trino.spi.security.AccessDeniedException.denyDropView;
-import static io.trino.spi.security.AccessDeniedException.denyExecuteFunction;
 import static io.trino.spi.security.AccessDeniedException.denyExecuteProcedure;
 import static io.trino.spi.security.AccessDeniedException.denyExecuteQuery;
 import static io.trino.spi.security.AccessDeniedException.denyExecuteTableProcedure;
-import static io.trino.spi.security.AccessDeniedException.denyGrantExecuteFunctionPrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyGrantRoles;
 import static io.trino.spi.security.AccessDeniedException.denyGrantSchemaPrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyGrantTablePrivilege;
@@ -87,7 +88,7 @@
 import static io.trino.spi.security.AccessDeniedException.denyShowCreateSchema;
 import static io.trino.spi.security.AccessDeniedException.denyShowCreateTable;
 import static io.trino.spi.security.AccessDeniedException.denyShowCurrentRoles;
-import static io.trino.spi.security.AccessDeniedException.denyShowRoleAuthorizationDescriptors;
+import static io.trino.spi.security.AccessDeniedException.denyShowFunctions;
 import static io.trino.spi.security.AccessDeniedException.denyShowRoleGrants;
 import static io.trino.spi.security.AccessDeniedException.denyShowRoles;
 import static io.trino.spi.security.AccessDeniedException.denyShowSchemas;
@@ -268,6 +269,12 @@ public Set<String> filterColumns(SecurityContext context, CatalogSchemaTableName
         return ImmutableSet.of();
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(SecurityContext context, String catalogName, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        return ImmutableMap.of();
+    }
+
     @Override
     public void checkCanShowSchemas(SecurityContext context, String catalogName)
     {
@@ -394,18 +401,6 @@ public void checkCanSetMaterializedViewProperties(SecurityContext context, Quali
         denySetMaterializedViewProperties(materializedViewName.toString());
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, String functionName, Identity grantee, boolean grantOption)
-    {
-        denyGrantExecuteFunctionPrivilege(functionName, context.getIdentity(), grantee);
-    }
-
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName, Identity grantee, boolean grantOption)
-    {
-        denyGrantExecuteFunctionPrivilege(functionName.toString(), context.getIdentity(), grantee);
-    }
-
     @Override
     public void checkCanGrantSchemaPrivilege(SecurityContext context, Privilege privilege, CatalogSchemaName schemaName, TrinoPrincipal grantee, boolean grantOption)
     {
@@ -490,12 +485,6 @@ public void checkCanSetCatalogRole(SecurityContext context, String role, String
         denySetRole(role);
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(SecurityContext context, Optional<String> catalogName)
-    {
-        denyShowRoleAuthorizationDescriptors();
-    }
-
     @Override
     public void checkCanShowRoles(SecurityContext context, Optional<String> catalogName)
     {
@@ -521,15 +510,15 @@ public void checkCanExecuteProcedure(SecurityContext context, QualifiedObjectNam
     }
 
     @Override
-    public void checkCanExecuteFunction(SecurityContext context, String functionName)
+    public boolean canExecuteFunction(SecurityContext context, QualifiedObjectName functionName)
     {
-        denyExecuteFunction(functionName);
+        return false;
     }
 
     @Override
-    public void checkCanExecuteFunction(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName)
+    public boolean canCreateViewWithExecuteFunction(SecurityContext context, QualifiedObjectName functionName)
     {
-        denyExecuteFunction(functionName.toString());
+        return false;
     }
 
     @Override
@@ -537,4 +526,28 @@ public void checkCanExecuteTableProcedure(SecurityContext context, QualifiedObje
     {
         denyExecuteTableProcedure(tableName.toString(), procedureName);
     }
+
+    @Override
+    public void checkCanShowFunctions(SecurityContext context, CatalogSchemaName schema)
+    {
+        denyShowFunctions(schema.toString());
+    }
+
+    @Override
+    public Set<SchemaFunctionName> filterFunctions(SecurityContext context, String catalogName, Set<SchemaFunctionName> functionNames)
+    {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public void checkCanCreateFunction(SecurityContext context, QualifiedObjectName functionName)
+    {
+        denyCreateFunction(functionName.toString());
+    }
+
+    @Override
+    public void checkCanDropFunction(SecurityContext context, QualifiedObjectName functionName)
+    {
+        denyDropFunction(functionName.toString());
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/security/ForwardingAccessControl.java b/core/trino-main/src/main/java/io/trino/security/ForwardingAccessControl.java
index 2cd340bdfae5..e6ae8161cdb2 100644
--- a/core/trino-main/src/main/java/io/trino/security/ForwardingAccessControl.java
+++ b/core/trino-main/src/main/java/io/trino/security/ForwardingAccessControl.java
@@ -17,7 +17,7 @@
 import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.TrinoPrincipal;
@@ -239,6 +239,12 @@ public Set<String> filterColumns(SecurityContext context, CatalogSchemaTableName
         return delegate().filterColumns(context, tableName, columns);
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(SecurityContext context, String catalogName, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        return delegate().filterColumns(context, catalogName, tableColumns);
+    }
+
     @Override
     public void checkCanAddColumns(SecurityContext context, QualifiedObjectName tableName)
     {
@@ -347,18 +353,6 @@ public void checkCanSetMaterializedViewProperties(SecurityContext context, Quali
         delegate().checkCanSetMaterializedViewProperties(context, materializedViewName, properties);
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, String functionName, Identity grantee, boolean grantOption)
-    {
-        delegate().checkCanGrantExecuteFunctionPrivilege(context, functionName, grantee, grantOption);
-    }
-
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName, Identity grantee, boolean grantOption)
-    {
-        delegate().checkCanGrantExecuteFunctionPrivilege(context, functionKind, functionName, grantee, grantOption);
-    }
-
     @Override
     public void checkCanGrantSchemaPrivilege(SecurityContext context, Privilege privilege, CatalogSchemaName schemaName, TrinoPrincipal grantee, boolean grantOption)
     {
@@ -443,12 +437,6 @@ public void checkCanSetCatalogRole(SecurityContext context, String role, String
         delegate().checkCanSetCatalogRole(context, role, catalogName);
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(SecurityContext context, Optional<String> catalogName)
-    {
-        delegate().checkCanShowRoleAuthorizationDescriptors(context, catalogName);
-    }
-
     @Override
     public void checkCanShowRoles(SecurityContext context, Optional<String> catalogName)
     {
@@ -474,15 +462,15 @@ public void checkCanExecuteProcedure(SecurityContext context, QualifiedObjectNam
     }
 
     @Override
-    public void checkCanExecuteFunction(SecurityContext context, String functionName)
+    public boolean canExecuteFunction(SecurityContext context, QualifiedObjectName functionName)
     {
-        delegate().checkCanExecuteFunction(context, functionName);
+        return delegate().canExecuteFunction(context, functionName);
     }
 
     @Override
-    public void checkCanExecuteFunction(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName)
+    public boolean canCreateViewWithExecuteFunction(SecurityContext context, QualifiedObjectName functionName)
     {
-        delegate().checkCanExecuteFunction(context, functionKind, functionName);
+        return delegate().canCreateViewWithExecuteFunction(context, functionName);
     }
 
     @Override
@@ -491,6 +479,30 @@ public void checkCanExecuteTableProcedure(SecurityContext context, QualifiedObje
         delegate().checkCanExecuteTableProcedure(context, tableName, procedureName);
     }
 
+    @Override
+    public void checkCanShowFunctions(SecurityContext context, CatalogSchemaName schema)
+    {
+        delegate().checkCanShowFunctions(context, schema);
+    }
+
+    @Override
+    public Set<SchemaFunctionName> filterFunctions(SecurityContext context, String catalogName, Set<SchemaFunctionName> functionNames)
+    {
+        return delegate().filterFunctions(context, catalogName, functionNames);
+    }
+
+    @Override
+    public void checkCanCreateFunction(SecurityContext context, QualifiedObjectName functionName)
+    {
+        delegate().checkCanCreateFunction(context, functionName);
+    }
+
+    @Override
+    public void checkCanDropFunction(SecurityContext context, QualifiedObjectName functionName)
+    {
+        delegate().checkCanDropFunction(context, functionName);
+    }
+
     @Override
     public List<ViewExpression> getRowFilters(SecurityContext context, QualifiedObjectName tableName)
     {
diff --git a/core/trino-main/src/main/java/io/trino/security/InjectedConnectorAccessControl.java b/core/trino-main/src/main/java/io/trino/security/InjectedConnectorAccessControl.java
index 890a3276dfdf..7da3441b45ed 100644
--- a/core/trino-main/src/main/java/io/trino/security/InjectedConnectorAccessControl.java
+++ b/core/trino-main/src/main/java/io/trino/security/InjectedConnectorAccessControl.java
@@ -22,8 +22,7 @@
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.SchemaRoutineName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
-import io.trino.spi.security.Identity;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.security.ViewExpression;
@@ -192,6 +191,13 @@ public Set<String> filterColumns(ConnectorSecurityContext context, SchemaTableNa
         return accessControl.filterColumns(securityContext, new CatalogSchemaTableName(catalogName, tableName), columns);
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(ConnectorSecurityContext context, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        checkArgument(context == null, "context must be null");
+        return accessControl.filterColumns(securityContext, catalogName, tableColumns);
+    }
+
     @Override
     public void checkCanAddColumn(ConnectorSecurityContext context, SchemaTableName tableName)
     {
@@ -318,18 +324,6 @@ public void checkCanRenameMaterializedView(ConnectorSecurityContext context, Sch
         accessControl.checkCanRenameMaterializedView(securityContext, getQualifiedObjectName(viewName), getQualifiedObjectName(newViewName));
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-        checkArgument(context == null, "context must be null");
-        accessControl.checkCanGrantExecuteFunctionPrivilege(
-                securityContext,
-                functionKind,
-                getQualifiedObjectName(functionName),
-                Identity.ofUser(grantee.getName()),
-                grantOption);
-    }
-
     @Override
     public void checkCanSetMaterializedViewProperties(ConnectorSecurityContext context, SchemaTableName materializedViewName, Map<String, Optional<Object>> properties)
     {
@@ -429,13 +423,6 @@ public void checkCanSetRole(ConnectorSecurityContext context, String role)
         accessControl.checkCanSetCatalogRole(securityContext, role, catalogName);
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(ConnectorSecurityContext context)
-    {
-        checkArgument(context == null, "context must be null");
-        accessControl.checkCanShowRoleAuthorizationDescriptors(securityContext, Optional.of(catalogName));
-    }
-
     @Override
     public void checkCanShowRoles(ConnectorSecurityContext context)
     {
@@ -475,10 +462,44 @@ public void checkCanExecuteTableProcedure(ConnectorSecurityContext context, Sche
     }
 
     @Override
-    public void checkCanExecuteFunction(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName function)
+    public boolean canExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        checkArgument(context == null, "context must be null");
+        return accessControl.canExecuteFunction(securityContext, new QualifiedObjectName(catalogName, function.getSchemaName(), function.getRoutineName()));
+    }
+
+    @Override
+    public boolean canCreateViewWithExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        checkArgument(context == null, "context must be null");
+        return accessControl.canCreateViewWithExecuteFunction(securityContext, new QualifiedObjectName(catalogName, function.getSchemaName(), function.getRoutineName()));
+    }
+
+    @Override
+    public void checkCanShowFunctions(ConnectorSecurityContext context, String schemaName)
+    {
+        checkArgument(context == null, "context must be null");
+        accessControl.checkCanShowFunctions(securityContext, getCatalogSchemaName(schemaName));
+    }
+
+    @Override
+    public Set<SchemaFunctionName> filterFunctions(ConnectorSecurityContext context, Set<SchemaFunctionName> functionNames)
+    {
+        checkArgument(context == null, "context must be null");
+        return accessControl.filterFunctions(securityContext, catalogName, functionNames);
+    }
+
+    @Override
+    public void checkCanCreateFunction(ConnectorSecurityContext context, SchemaRoutineName function)
     {
         checkArgument(context == null, "context must be null");
-        accessControl.checkCanExecuteFunction(securityContext, functionKind, new QualifiedObjectName(catalogName, function.getSchemaName(), function.getRoutineName()));
+        accessControl.checkCanCreateFunction(securityContext, new QualifiedObjectName(catalogName, function.getSchemaName(), function.getRoutineName()));
+    }
+
+    @Override
+    public void checkCanDropFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        accessControl.checkCanDropFunction(securityContext, new QualifiedObjectName(catalogName, function.getSchemaName(), function.getRoutineName()));
     }
 
     @Override
@@ -501,12 +522,6 @@ public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context,
         throw new TrinoException(NOT_SUPPORTED, "Column masking not supported");
     }
 
-    @Override
-    public List<ViewExpression> getColumnMasks(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
-    {
-        throw new UnsupportedOperationException();
-    }
-
     private QualifiedObjectName getQualifiedObjectName(SchemaTableName schemaTableName)
     {
         return new QualifiedObjectName(catalogName, schemaTableName.getSchemaName(), schemaTableName.getTableName());
diff --git a/core/trino-main/src/main/java/io/trino/security/SecurityContext.java b/core/trino-main/src/main/java/io/trino/security/SecurityContext.java
index 6cdf8706a038..9e618d296e43 100644
--- a/core/trino-main/src/main/java/io/trino/security/SecurityContext.java
+++ b/core/trino-main/src/main/java/io/trino/security/SecurityContext.java
@@ -19,8 +19,8 @@
 import io.trino.spi.security.SystemSecurityContext;
 import io.trino.transaction.TransactionId;
 
+import java.time.Instant;
 import java.util.Objects;
-import java.util.Optional;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static java.util.Objects.requireNonNull;
@@ -30,18 +30,20 @@ public class SecurityContext
     public static SecurityContext of(Session session)
     {
         requireNonNull(session, "session is null");
-        return new SecurityContext(session.getRequiredTransactionId(), session.getIdentity(), session.getQueryId());
+        return new SecurityContext(session.getRequiredTransactionId(), session.getIdentity(), session.getQueryId(), session.getStart());
     }
 
     private final TransactionId transactionId;
     private final Identity identity;
     private final QueryId queryId;
+    private final Instant queryStart;
 
-    public SecurityContext(TransactionId transactionId, Identity identity, QueryId queryId)
+    public SecurityContext(TransactionId transactionId, Identity identity, QueryId queryId, Instant queryStart)
     {
         this.transactionId = requireNonNull(transactionId, "transactionId is null");
         this.identity = requireNonNull(identity, "identity is null");
         this.queryId = requireNonNull(queryId, "queryId is null");
+        this.queryStart = requireNonNull(queryStart, "queryStart is null");
     }
 
     public TransactionId getTransactionId()
@@ -61,7 +63,7 @@ public QueryId getQueryId()
 
     public SystemSecurityContext toSystemSecurityContext()
     {
-        return new SystemSecurityContext(identity, Optional.of(queryId));
+        return new SystemSecurityContext(identity, queryId, queryStart);
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/security/ViewAccessControl.java b/core/trino-main/src/main/java/io/trino/security/ViewAccessControl.java
index 6e61a5a950cd..195298d6024c 100644
--- a/core/trino-main/src/main/java/io/trino/security/ViewAccessControl.java
+++ b/core/trino-main/src/main/java/io/trino/security/ViewAccessControl.java
@@ -15,13 +15,13 @@
 
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.spi.connector.CatalogSchemaTableName;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.security.AccessDeniedException;
-import io.trino.spi.security.Identity;
 import io.trino.spi.security.ViewExpression;
 import io.trino.spi.type.Type;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
@@ -32,12 +32,10 @@ public class ViewAccessControl
         extends ForwardingAccessControl
 {
     private final AccessControl delegate;
-    private final Identity invoker;
 
-    public ViewAccessControl(AccessControl delegate, Identity invoker)
+    public ViewAccessControl(AccessControl delegate)
     {
         this.delegate = requireNonNull(delegate, "delegate is null");
-        this.invoker = requireNonNull(invoker, "invoker is null");
     }
 
     @Override
@@ -63,27 +61,27 @@ public Set<String> filterColumns(SecurityContext context, CatalogSchemaTableName
     }
 
     @Override
-    public void checkCanCreateViewWithSelectFromColumns(SecurityContext context, QualifiedObjectName tableName, Set<String> columnNames)
+    public Map<SchemaTableName, Set<String>> filterColumns(SecurityContext context, String catalogName, Map<SchemaTableName, Set<String>> tableColumns)
     {
-        wrapAccessDeniedException(() -> delegate.checkCanCreateViewWithSelectFromColumns(context, tableName, columnNames));
+        return delegate.filterColumns(context, catalogName, tableColumns);
     }
 
     @Override
-    public void checkCanExecuteFunction(SecurityContext context, String functionName)
+    public void checkCanCreateViewWithSelectFromColumns(SecurityContext context, QualifiedObjectName tableName, Set<String> columnNames)
     {
-        wrapAccessDeniedException(() -> delegate.checkCanGrantExecuteFunctionPrivilege(context, functionName, invoker, false));
+        wrapAccessDeniedException(() -> delegate.checkCanCreateViewWithSelectFromColumns(context, tableName, columnNames));
     }
 
     @Override
-    public void checkCanExecuteFunction(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName)
+    public boolean canExecuteFunction(SecurityContext context, QualifiedObjectName functionName)
     {
-        wrapAccessDeniedException(() -> delegate.checkCanGrantExecuteFunctionPrivilege(context, functionKind, functionName, invoker, false));
+        return delegate.canCreateViewWithExecuteFunction(context, functionName);
     }
 
     @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, String functionName, Identity grantee, boolean grantOption)
+    public boolean canCreateViewWithExecuteFunction(SecurityContext context, QualifiedObjectName functionName)
     {
-        wrapAccessDeniedException(() -> delegate.checkCanGrantExecuteFunctionPrivilege(context, functionName, grantee, grantOption));
+        return delegate.canCreateViewWithExecuteFunction(context, functionName);
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/server/AsyncHttpExecutionMBean.java b/core/trino-main/src/main/java/io/trino/server/AsyncHttpExecutionMBean.java
index 0a96321ed586..ffa782600d81 100644
--- a/core/trino-main/src/main/java/io/trino/server/AsyncHttpExecutionMBean.java
+++ b/core/trino-main/src/main/java/io/trino/server/AsyncHttpExecutionMBean.java
@@ -13,12 +13,11 @@
  */
 package io.trino.server;
 
+import com.google.inject.Inject;
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
diff --git a/core/trino-main/src/main/java/io/trino/server/BasicQueryInfo.java b/core/trino-main/src/main/java/io/trino/server/BasicQueryInfo.java
index ca03b2b54392..c445a58b30b4 100644
--- a/core/trino-main/src/main/java/io/trino/server/BasicQueryInfo.java
+++ b/core/trino-main/src/main/java/io/trino/server/BasicQueryInfo.java
@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.SessionRepresentation;
 import io.trino.execution.QueryInfo;
 import io.trino.execution.QueryState;
@@ -24,9 +25,7 @@
 import io.trino.spi.QueryId;
 import io.trino.spi.resourcegroups.QueryType;
 import io.trino.spi.resourcegroups.ResourceGroupId;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.net.URI;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/server/BasicQueryStats.java b/core/trino-main/src/main/java/io/trino/server/BasicQueryStats.java
index 41b59e9175ae..945db0d93f59 100644
--- a/core/trino-main/src/main/java/io/trino/server/BasicQueryStats.java
+++ b/core/trino-main/src/main/java/io/trino/server/BasicQueryStats.java
@@ -16,14 +16,13 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.execution.QueryStats;
 import io.trino.operator.BlockedReason;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.OptionalDouble;
 import java.util.Set;
 
@@ -71,6 +70,7 @@ public class BasicQueryStats
     private final Set<BlockedReason> blockedReasons;
 
     private final OptionalDouble progressPercentage;
+    private final OptionalDouble runningPercentage;
 
     @JsonCreator
     public BasicQueryStats(
@@ -99,7 +99,8 @@ public BasicQueryStats(
             @JsonProperty("failedScheduledTime") Duration failedScheduledTime,
             @JsonProperty("fullyBlocked") boolean fullyBlocked,
             @JsonProperty("blockedReasons") Set<BlockedReason> blockedReasons,
-            @JsonProperty("progressPercentage") OptionalDouble progressPercentage)
+            @JsonProperty("progressPercentage") OptionalDouble progressPercentage,
+            @JsonProperty("runningPercentage") OptionalDouble runningPercentage)
     {
         this.createTime = createTime;
         this.endTime = endTime;
@@ -139,6 +140,7 @@ public BasicQueryStats(
         this.blockedReasons = ImmutableSet.copyOf(requireNonNull(blockedReasons, "blockedReasons is null"));
 
         this.progressPercentage = requireNonNull(progressPercentage, "progressPercentage is null");
+        this.runningPercentage = requireNonNull(runningPercentage, "runningPercentage is null");
     }
 
     public BasicQueryStats(QueryStats queryStats)
@@ -168,7 +170,8 @@ public BasicQueryStats(QueryStats queryStats)
                 queryStats.getFailedScheduledTime(),
                 queryStats.isFullyBlocked(),
                 queryStats.getBlockedReasons(),
-                queryStats.getProgressPercentage());
+                queryStats.getProgressPercentage(),
+                queryStats.getRunningPercentage());
     }
 
     public static BasicQueryStats immediateFailureQueryStats()
@@ -200,6 +203,7 @@ public static BasicQueryStats immediateFailureQueryStats()
                 new Duration(0, MILLISECONDS),
                 false,
                 ImmutableSet.of(),
+                OptionalDouble.empty(),
                 OptionalDouble.empty());
     }
 
@@ -358,4 +362,10 @@ public OptionalDouble getProgressPercentage()
     {
         return progressPercentage;
     }
+
+    @JsonProperty
+    public OptionalDouble getRunningPercentage()
+    {
+        return runningPercentage;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java b/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java
index 7a4076566372..613edeb3335e 100644
--- a/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java
+++ b/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java
@@ -15,8 +15,10 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import com.google.inject.multibindings.MapBinder;
 import com.google.inject.multibindings.Multibinder;
 import io.airlift.concurrent.BoundedExecutor;
@@ -61,16 +63,21 @@
 import io.trino.execution.resourcegroups.InternalResourceGroupManager;
 import io.trino.execution.resourcegroups.LegacyResourceGroupConfigurationManager;
 import io.trino.execution.resourcegroups.ResourceGroupManager;
-import io.trino.execution.scheduler.BinPackingNodeAllocatorService;
-import io.trino.execution.scheduler.ConstantPartitionMemoryEstimator;
-import io.trino.execution.scheduler.EventDrivenTaskSourceFactory;
-import io.trino.execution.scheduler.FixedCountNodeAllocatorService;
-import io.trino.execution.scheduler.NodeAllocatorService;
-import io.trino.execution.scheduler.NodeSchedulerConfig;
-import io.trino.execution.scheduler.PartitionMemoryEstimatorFactory;
 import io.trino.execution.scheduler.SplitSchedulerStats;
-import io.trino.execution.scheduler.TaskDescriptorStorage;
 import io.trino.execution.scheduler.TaskExecutionStats;
+import io.trino.execution.scheduler.faulttolerant.BinPackingNodeAllocatorService;
+import io.trino.execution.scheduler.faulttolerant.ByEagerParentOutputDataSizeEstimator;
+import io.trino.execution.scheduler.faulttolerant.BySmallStageOutputDataSizeEstimator;
+import io.trino.execution.scheduler.faulttolerant.ByTaskProgressOutputDataSizeEstimator;
+import io.trino.execution.scheduler.faulttolerant.CompositeOutputDataSizeEstimator;
+import io.trino.execution.scheduler.faulttolerant.EventDrivenTaskSourceFactory;
+import io.trino.execution.scheduler.faulttolerant.ExponentialGrowthPartitionMemoryEstimator;
+import io.trino.execution.scheduler.faulttolerant.NoMemoryAwarePartitionMemoryEstimator;
+import io.trino.execution.scheduler.faulttolerant.NoMemoryAwarePartitionMemoryEstimator.ForNoMemoryAwarePartitionMemoryEstimator;
+import io.trino.execution.scheduler.faulttolerant.NodeAllocatorService;
+import io.trino.execution.scheduler.faulttolerant.OutputDataSizeEstimatorFactory;
+import io.trino.execution.scheduler.faulttolerant.PartitionMemoryEstimatorFactory;
+import io.trino.execution.scheduler.faulttolerant.TaskDescriptorStorage;
 import io.trino.execution.scheduler.policy.AllAtOnceExecutionPolicy;
 import io.trino.execution.scheduler.policy.ExecutionPolicy;
 import io.trino.execution.scheduler.policy.PhasedExecutionPolicy;
@@ -88,6 +95,9 @@
 import io.trino.memory.TotalReservationLowMemoryKiller;
 import io.trino.memory.TotalReservationOnBlockedNodesQueryLowMemoryKiller;
 import io.trino.memory.TotalReservationOnBlockedNodesTaskLowMemoryKiller;
+import io.trino.metadata.LanguageFunctionManager;
+import io.trino.metadata.LanguageFunctionProvider;
+import io.trino.metadata.Split;
 import io.trino.operator.ForScheduler;
 import io.trino.operator.OperatorStats;
 import io.trino.server.protocol.ExecutingStatementResource;
@@ -96,6 +106,7 @@
 import io.trino.server.ui.WebUiModule;
 import io.trino.server.ui.WorkerResource;
 import io.trino.spi.memory.ClusterMemoryPoolManager;
+import io.trino.sql.PlannerContext;
 import io.trino.sql.analyzer.AnalyzerFactory;
 import io.trino.sql.analyzer.QueryExplainerFactory;
 import io.trino.sql.planner.OptimizerStatsMBeanExporter;
@@ -111,10 +122,7 @@
 import io.trino.sql.rewrite.ShowStatsRewrite;
 import io.trino.sql.rewrite.StatementRewrite;
 import io.trino.sql.rewrite.StatementRewrite.Rewrite;
-
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.annotation.PreDestroy;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -129,12 +137,10 @@
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static io.airlift.discovery.client.DiscoveryBinder.discoveryBinder;
-import static io.airlift.http.client.HttpClientBinder.httpClientBinder;
 import static io.airlift.jaxrs.JaxrsBinder.jaxrsBinder;
 import static io.airlift.json.JsonCodecBinder.jsonCodecBinder;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
-import static io.trino.execution.scheduler.NodeSchedulerConfig.NodeAllocatorType.BIN_PACKING;
-import static io.trino.execution.scheduler.NodeSchedulerConfig.NodeAllocatorType.FIXED_COUNT;
+import static io.trino.server.InternalCommunicationHttpClientModule.internalHttpClientModule;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
@@ -167,10 +173,10 @@ protected void setup(Binder binder)
         });
 
         // failure detector
-        binder.install(new FailureDetectorModule());
+        install(new FailureDetectorModule());
         jaxrsBinder(binder).bind(NodeResource.class);
         jaxrsBinder(binder).bind(WorkerResource.class);
-        httpClientBinder(binder).bindHttpClient("workerInfo", ForWorkerInfo.class);
+        install(internalHttpClientModule("workerInfo", ForWorkerInfo.class).build());
 
         // query monitor
         jsonCodecBinder(binder).bindJsonCodec(ExecutionFailureInfo.class);
@@ -206,12 +212,12 @@ protected void setup(Binder binder)
         // cluster memory manager
         binder.bind(ClusterMemoryManager.class).in(Scopes.SINGLETON);
         binder.bind(ClusterMemoryPoolManager.class).to(ClusterMemoryManager.class).in(Scopes.SINGLETON);
-        httpClientBinder(binder).bindHttpClient("memoryManager", ForMemoryManager.class)
+        install(internalHttpClientModule("memoryManager", ForMemoryManager.class)
                 .withTracing()
                 .withConfigDefaults(config -> {
                     config.setIdleTimeout(new Duration(30, SECONDS));
                     config.setRequestTimeout(new Duration(10, SECONDS));
-                });
+                }).build());
 
         bindLowMemoryTaskKiller(LowMemoryTaskKillerPolicy.NONE, NoneLowMemoryKiller.class);
         bindLowMemoryTaskKiller(LowMemoryTaskKillerPolicy.TOTAL_RESERVATION_ON_BLOCKED_NODES, TotalReservationOnBlockedNodesTaskLowMemoryKiller.class);
@@ -223,21 +229,37 @@ protected void setup(Binder binder)
         newExporter(binder).export(ClusterMemoryManager.class).withGeneratedName();
 
         // node allocator
-        install(conditionalModule(
-                NodeSchedulerConfig.class,
-                config -> FIXED_COUNT == config.getNodeAllocatorType(),
-                innerBinder -> {
-                    innerBinder.bind(NodeAllocatorService.class).to(FixedCountNodeAllocatorService.class).in(Scopes.SINGLETON);
-                    innerBinder.bind(PartitionMemoryEstimatorFactory.class).toInstance(ConstantPartitionMemoryEstimator::new);
-                }));
-        install(conditionalModule(
-                NodeSchedulerConfig.class,
-                config -> BIN_PACKING == config.getNodeAllocatorType(),
-                innerBinder -> {
-                    innerBinder.bind(BinPackingNodeAllocatorService.class).in(Scopes.SINGLETON);
-                    innerBinder.bind(NodeAllocatorService.class).to(BinPackingNodeAllocatorService.class);
-                    innerBinder.bind(PartitionMemoryEstimatorFactory.class).to(BinPackingNodeAllocatorService.class);
-                }));
+        binder.bind(BinPackingNodeAllocatorService.class).in(Scopes.SINGLETON);
+        binder.bind(NodeAllocatorService.class).to(BinPackingNodeAllocatorService.class);
+        binder.bind(PartitionMemoryEstimatorFactory.class).to(NoMemoryAwarePartitionMemoryEstimator.Factory.class).in(Scopes.SINGLETON);
+        binder.bind(PartitionMemoryEstimatorFactory.class)
+                .annotatedWith(ForNoMemoryAwarePartitionMemoryEstimator.class)
+                .to(ExponentialGrowthPartitionMemoryEstimator.Factory.class).in(Scopes.SINGLETON);
+
+        // output data size estimator
+        binder.bind(OutputDataSizeEstimatorFactory.class)
+                .to(CompositeOutputDataSizeEstimator.Factory.class)
+                .in(Scopes.SINGLETON);
+        binder.bind(ByTaskProgressOutputDataSizeEstimator.Factory.class).in(Scopes.SINGLETON);
+        binder.bind(BySmallStageOutputDataSizeEstimator.Factory.class).in(Scopes.SINGLETON);
+        binder.bind(ByEagerParentOutputDataSizeEstimator.Factory.class).in(Scopes.SINGLETON);
+        // use provider method returning list to ensure ordering
+        // OutputDataSizeEstimator factories are ordered starting from most accurate
+        install(new AbstractConfigurationAwareModule() {
+            @Override
+            protected void setup(Binder binder) {}
+
+            @Provides
+            @Singleton
+            @CompositeOutputDataSizeEstimator.ForCompositeOutputDataSizeEstimator
+            List<OutputDataSizeEstimatorFactory> getCompositeOutputDataSizeEstimatorDelegateFactories(
+                    ByTaskProgressOutputDataSizeEstimator.Factory byTaskProgressOutputDataSizeEstimatorFactory,
+                    BySmallStageOutputDataSizeEstimator.Factory bySmallStageOutputDataSizeEstimatorFactory,
+                    ByEagerParentOutputDataSizeEstimator.Factory byEagerParentOutputDataSizeEstimatorFactoryy)
+            {
+                return ImmutableList.of(byTaskProgressOutputDataSizeEstimatorFactory, bySmallStageOutputDataSizeEstimatorFactory, byEagerParentOutputDataSizeEstimatorFactoryy);
+            }
+        });
 
         // node monitor
         binder.bind(ClusterSizeMonitor.class).in(Scopes.SINGLETON);
@@ -255,6 +277,11 @@ protected void setup(Binder binder)
         // dynamic filtering service
         binder.bind(DynamicFilterService.class).in(Scopes.SINGLETON);
 
+        // language functions
+        binder.bind(LanguageFunctionManager.class).in(Scopes.SINGLETON);
+        binder.bind(InitializeLanguageFunctionManager.class).asEagerSingleton();
+        binder.bind(LanguageFunctionProvider.class).to(LanguageFunctionManager.class).in(Scopes.SINGLETON);
+
         // analyzer
         binder.bind(AnalyzerFactory.class).in(Scopes.SINGLETON);
 
@@ -293,14 +320,14 @@ protected void setup(Binder binder)
         binder.bind(RemoteTaskStats.class).in(Scopes.SINGLETON);
         newExporter(binder).export(RemoteTaskStats.class).withGeneratedName();
 
-        httpClientBinder(binder).bindHttpClient("scheduler", ForScheduler.class)
+        install(internalHttpClientModule("scheduler", ForScheduler.class)
                 .withTracing()
                 .withFilter(GenerateTraceTokenRequestFilter.class)
                 .withConfigDefaults(config -> {
                     config.setIdleTimeout(new Duration(30, SECONDS));
                     config.setRequestTimeout(new Duration(10, SECONDS));
                     config.setMaxConnectionsPerServer(250);
-                });
+                }).build());
 
         binder.bind(ScheduledExecutorService.class).annotatedWith(ForScheduler.class)
                 .toInstance(newSingleThreadScheduledExecutor(threadsNamed("stage-scheduler")));
@@ -325,6 +352,7 @@ protected void setup(Binder binder)
 
         binder.bind(EventDrivenTaskSourceFactory.class).in(Scopes.SINGLETON);
         binder.bind(TaskDescriptorStorage.class).in(Scopes.SINGLETON);
+        jsonCodecBinder(binder).bindJsonCodec(Split.class);
         newExporter(binder).export(TaskDescriptorStorage.class).withGeneratedName();
 
         binder.bind(TaskExecutionStats.class).in(Scopes.SINGLETON);
@@ -340,6 +368,16 @@ protected void setup(Binder binder)
         binder.bind(ExecutorCleanup.class).asEagerSingleton();
     }
 
+    // working around circular dependency Metadata <-> PlannerContext
+    private static class InitializeLanguageFunctionManager
+    {
+        @Inject
+        public InitializeLanguageFunctionManager(LanguageFunctionManager languageFunctionManager, PlannerContext plannerContext)
+        {
+            languageFunctionManager.setPlannerContext(plannerContext);
+        }
+    }
+
     @Provides
     @Singleton
     public static ResourceGroupManager<?> getResourceGroupManager(@SuppressWarnings("rawtypes") ResourceGroupManager manager)
diff --git a/core/trino-main/src/main/java/io/trino/server/DynamicFilterService.java b/core/trino-main/src/main/java/io/trino/server/DynamicFilterService.java
index 5d9d362401d4..c8d91598de9e 100644
--- a/core/trino-main/src/main/java/io/trino/server/DynamicFilterService.java
+++ b/core/trino-main/src/main/java/io/trino/server/DynamicFilterService.java
@@ -22,6 +22,8 @@
 import com.google.common.collect.Multimap;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
@@ -55,9 +57,6 @@
 import io.trino.sql.planner.plan.SemiJoinNode;
 import org.roaringbitmap.RoaringBitmap;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -328,7 +327,7 @@ public CompletableFuture<?> isBlocked()
             public boolean isComplete()
             {
                 return dynamicFilters.stream()
-                        .allMatch(context.getDynamicFilterSummaries()::containsKey);
+                        .allMatch(filterId -> context.getDynamicFilterSummary(filterId).isPresent());
             }
 
             @Override
@@ -341,9 +340,12 @@ public boolean isAwaitable()
             @Override
             public TupleDomain<ColumnHandle> getCurrentPredicate()
             {
-                Set<DynamicFilterId> completedDynamicFilters = dynamicFilters.stream()
-                        .filter(filter -> context.getDynamicFilterSummaries().containsKey(filter))
-                        .collect(toImmutableSet());
+                ImmutableMap.Builder<DynamicFilterId, Domain> completedFiltersBuilder = ImmutableMap.builder();
+                for (DynamicFilterId filterId : dynamicFilters) {
+                    Optional<Domain> summary = context.getDynamicFilterSummary(filterId);
+                    summary.ifPresent(domain -> completedFiltersBuilder.put(filterId, domain));
+                }
+                Map<DynamicFilterId, Domain> completedDynamicFilters = completedFiltersBuilder.buildOrThrow();
 
                 CurrentDynamicFilter currentFilter = currentDynamicFilter.get();
                 if (currentFilter.getCompletedDynamicFiltersCount() >= completedDynamicFilters.size()) {
@@ -352,8 +354,8 @@ public TupleDomain<ColumnHandle> getCurrentPredicate()
                 }
 
                 TupleDomain<ColumnHandle> dynamicFilter = TupleDomain.intersect(
-                        completedDynamicFilters.stream()
-                                .map(filter -> translateSummaryToTupleDomain(filter, context, symbolsMap, columnHandles, typeProvider))
+                        completedDynamicFilters.entrySet().stream()
+                                .map(filter -> translateSummaryToTupleDomain(context.getSession(), filter.getKey(), filter.getValue(), symbolsMap, columnHandles, typeProvider))
                                 .collect(toImmutableList()));
 
                 // It could happen that two threads update currentDynamicFilter concurrently.
@@ -425,18 +427,18 @@ public static Set<DynamicFilterId> getOutboundDynamicFilters(PlanFragment plan)
     @VisibleForTesting
     Optional<Domain> getSummary(QueryId queryId, DynamicFilterId filterId)
     {
-        return Optional.ofNullable(dynamicFilterContexts.get(queryId).getDynamicFilterSummaries().get(filterId));
+        return dynamicFilterContexts.get(queryId).getDynamicFilterSummary(filterId);
     }
 
     private TupleDomain<ColumnHandle> translateSummaryToTupleDomain(
+            Session session,
             DynamicFilterId filterId,
-            DynamicFilterContext dynamicFilterContext,
+            Domain summary,
             Multimap<DynamicFilterId, DynamicFilters.Descriptor> descriptorMultimap,
             Map<Symbol, ColumnHandle> columnHandles,
             TypeProvider typeProvider)
     {
         Collection<DynamicFilters.Descriptor> descriptors = descriptorMultimap.get(filterId);
-        Domain summary = dynamicFilterContext.getDynamicFilterSummaries().get(filterId);
         return TupleDomain.withColumnDomains(descriptors.stream()
                 .collect(toImmutableMap(
                         descriptor -> {
@@ -447,7 +449,7 @@ private TupleDomain<ColumnHandle> translateSummaryToTupleDomain(
                             Type targetType = typeProvider.get(Symbol.from(descriptor.getInput()));
                             Domain updatedSummary = descriptor.applyComparison(summary);
                             if (!updatedSummary.getType().equals(targetType)) {
-                                return applySaturatedCasts(metadata, functionManager, typeOperators, dynamicFilterContext.getSession(), updatedSummary, targetType);
+                                return applySaturatedCasts(metadata, functionManager, typeOperators, session, updatedSummary, targetType);
                             }
                             return updatedSummary;
                         })));
@@ -1005,6 +1007,15 @@ private Map<DynamicFilterId, Domain> getDynamicFilterSummaries()
                     .collect(toImmutableMap(Map.Entry::getKey, entry -> getFutureValue(entry.getValue().getCollectedDomainFuture())));
         }
 
+        private Optional<Domain> getDynamicFilterSummary(DynamicFilterId filterId)
+        {
+            DynamicFilterCollectionContext context = dynamicFilterCollectionContexts.get(filterId);
+            if (context == null || !context.getCollectedDomainFuture().isDone()) {
+                return Optional.empty();
+            }
+            return Optional.of(getFutureValue(context.getCollectedDomainFuture()));
+        }
+
         private Map<DynamicFilterId, SettableFuture<Void>> getLazyDynamicFilters()
         {
             return lazyDynamicFilters;
diff --git a/core/trino-main/src/main/java/io/trino/server/ExchangeExecutionMBean.java b/core/trino-main/src/main/java/io/trino/server/ExchangeExecutionMBean.java
index b1fa486518a8..3d8d954574e2 100644
--- a/core/trino-main/src/main/java/io/trino/server/ExchangeExecutionMBean.java
+++ b/core/trino-main/src/main/java/io/trino/server/ExchangeExecutionMBean.java
@@ -13,13 +13,12 @@
  */
 package io.trino.server;
 
+import com.google.inject.Inject;
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
 import io.trino.operator.ForExchange;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 
diff --git a/core/trino-main/src/main/java/io/trino/server/ExpressionSerialization.java b/core/trino-main/src/main/java/io/trino/server/ExpressionSerialization.java
index e2149a34ce3f..c6d2a4aabace 100644
--- a/core/trino-main/src/main/java/io/trino/server/ExpressionSerialization.java
+++ b/core/trino-main/src/main/java/io/trino/server/ExpressionSerialization.java
@@ -19,13 +19,11 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.google.inject.Inject;
 import io.trino.sql.ExpressionFormatter;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.Expression;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 
 import static io.trino.sql.ExpressionUtils.rewriteIdentifiersToSymbolReferences;
@@ -60,7 +58,7 @@ public ExpressionDeserializer(SqlParser sqlParser)
         public Expression deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException
         {
-            return rewriteIdentifiersToSymbolReferences(sqlParser.createExpression(jsonParser.readValueAs(String.class), new ParsingOptions()));
+            return rewriteIdentifiersToSymbolReferences(sqlParser.createExpression(jsonParser.readValueAs(String.class)));
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/ForAsyncHttp.java b/core/trino-main/src/main/java/io/trino/server/ForAsyncHttp.java
index aca831700b5a..9a6f723aaa1d 100644
--- a/core/trino-main/src/main/java/io/trino/server/ForAsyncHttp.java
+++ b/core/trino-main/src/main/java/io/trino/server/ForAsyncHttp.java
@@ -13,7 +13,7 @@
  */
 package io.trino.server;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForAsyncHttp
 {
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/ForStartup.java b/core/trino-main/src/main/java/io/trino/server/ForStartup.java
index 9ae0b34890d3..4cc82f020536 100644
--- a/core/trino-main/src/main/java/io/trino/server/ForStartup.java
+++ b/core/trino-main/src/main/java/io/trino/server/ForStartup.java
@@ -13,7 +13,7 @@
  */
 package io.trino.server;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,5 +25,5 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForStartup {}
diff --git a/core/trino-main/src/main/java/io/trino/server/ForStatementResource.java b/core/trino-main/src/main/java/io/trino/server/ForStatementResource.java
index cbf8e10f1c4d..e5601e1bb220 100644
--- a/core/trino-main/src/main/java/io/trino/server/ForStatementResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/ForStatementResource.java
@@ -13,7 +13,7 @@
  */
 package io.trino.server;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForStatementResource
 {
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/ForWorkerInfo.java b/core/trino-main/src/main/java/io/trino/server/ForWorkerInfo.java
index 95fa4e70245e..7f710a771a59 100644
--- a/core/trino-main/src/main/java/io/trino/server/ForWorkerInfo.java
+++ b/core/trino-main/src/main/java/io/trino/server/ForWorkerInfo.java
@@ -13,7 +13,7 @@
  */
 package io.trino.server;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForWorkerInfo
 {
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/GracefulShutdownHandler.java b/core/trino-main/src/main/java/io/trino/server/GracefulShutdownHandler.java
index 1d23f9cb2b21..94ae49fcf044 100644
--- a/core/trino-main/src/main/java/io/trino/server/GracefulShutdownHandler.java
+++ b/core/trino-main/src/main/java/io/trino/server/GracefulShutdownHandler.java
@@ -13,15 +13,14 @@
  */
 package io.trino.server;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.execution.SqlTaskManager;
 import io.trino.execution.TaskInfo;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
diff --git a/core/trino-main/src/main/java/io/trino/server/HttpRemoteTaskFactory.java b/core/trino-main/src/main/java/io/trino/server/HttpRemoteTaskFactory.java
index 974084c7aaab..31c7916576b0 100644
--- a/core/trino-main/src/main/java/io/trino/server/HttpRemoteTaskFactory.java
+++ b/core/trino-main/src/main/java/io/trino/server/HttpRemoteTaskFactory.java
@@ -14,12 +14,15 @@
 package io.trino.server;
 
 import com.google.common.collect.Multimap;
+import com.google.inject.Inject;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
 import io.airlift.http.client.HttpClient;
 import io.airlift.json.JsonCodec;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.Session;
 import io.trino.execution.DynamicFiltersCollector.VersionedDynamicFilterDomains;
 import io.trino.execution.LocationFactory;
@@ -40,12 +43,10 @@
 import io.trino.sql.planner.PlanFragment;
 import io.trino.sql.planner.plan.DynamicFilterId;
 import io.trino.sql.planner.plan.PlanNodeId;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Executor;
@@ -77,6 +78,7 @@ public class HttpRemoteTaskFactory
     private final ThreadPoolExecutorMBean executorMBean;
     private final ScheduledExecutorService updateScheduledExecutor;
     private final ScheduledExecutorService errorScheduledExecutor;
+    private final Tracer tracer;
     private final RemoteTaskStats stats;
     private final DynamicFilterService dynamicFilterService;
 
@@ -91,6 +93,7 @@ public HttpRemoteTaskFactory(
             JsonCodec<TaskInfo> taskInfoCodec,
             JsonCodec<TaskUpdateRequest> taskUpdateRequestCodec,
             JsonCodec<FailTaskRequest> failTaskRequestCoded,
+            Tracer tracer,
             RemoteTaskStats stats,
             DynamicFilterService dynamicFilterService)
     {
@@ -108,6 +111,7 @@ public HttpRemoteTaskFactory(
         this.coreExecutor = newCachedThreadPool(daemonThreadsNamed("remote-task-callback-%s"));
         this.executor = new BoundedExecutor(coreExecutor, config.getRemoteTaskMaxCallbackThreads());
         this.executorMBean = new ThreadPoolExecutorMBean((ThreadPoolExecutor) coreExecutor);
+        this.tracer = requireNonNull(tracer, "tracer is null");
         this.stats = requireNonNull(stats, "stats is null");
         this.dynamicFilterService = requireNonNull(dynamicFilterService, "dynamicFilterService is null");
 
@@ -133,8 +137,10 @@ public void stop()
     @Override
     public RemoteTask createRemoteTask(
             Session session,
+            Span stageSpan,
             TaskId taskId,
             InternalNode node,
+            boolean speculative,
             PlanFragment fragment,
             Multimap<PlanNodeId, Split> initialSplits,
             OutputBuffers outputBuffers,
@@ -143,9 +149,12 @@ public RemoteTask createRemoteTask(
             Optional<DataSize> estimatedMemory,
             boolean summarizeTaskInfo)
     {
-        return new HttpRemoteTask(session,
+        return new HttpRemoteTask(
+                session,
+                stageSpan,
                 taskId,
                 node.getNodeIdentifier(),
+                speculative,
                 locationFactory.createTaskLocation(node, taskId),
                 fragment,
                 initialSplits,
@@ -165,6 +174,7 @@ public RemoteTask createRemoteTask(
                 taskUpdateRequestCodec,
                 failTaskRequestCoded,
                 partitionedSplitCountTracker,
+                tracer,
                 stats,
                 dynamicFilterService,
                 outboundDynamicFilterIds,
diff --git a/core/trino-main/src/main/java/io/trino/server/HttpRequestSessionContextFactory.java b/core/trino-main/src/main/java/io/trino/server/HttpRequestSessionContextFactory.java
index f8c84b1c23ba..be3c0b7ceb76 100644
--- a/core/trino-main/src/main/java/io/trino/server/HttpRequestSessionContextFactory.java
+++ b/core/trino-main/src/main/java/io/trino/server/HttpRequestSessionContextFactory.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.Session.ResourceEstimateBuilder;
@@ -32,18 +33,15 @@
 import io.trino.spi.security.SelectedRole.Type;
 import io.trino.spi.session.ResourceEstimates;
 import io.trino.sql.parser.ParsingException;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.transaction.TransactionId;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 import java.net.URLDecoder;
 import java.util.Collection;
@@ -62,7 +60,6 @@
 import static com.google.common.net.HttpHeaders.USER_AGENT;
 import static io.trino.client.ProtocolHeaders.detectProtocol;
 import static io.trino.spi.security.AccessDeniedException.denySetRole;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DOUBLE;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Locale.ENGLISH;
@@ -108,6 +105,7 @@ public SessionContext createSessionContext(
 
         requireNonNull(authenticatedIdentity, "authenticatedIdentity is null");
         Identity identity = buildSessionIdentity(authenticatedIdentity, protocolHeaders, headers);
+        Identity originalIdentity = buildSessionOriginalIdentity(identity, protocolHeaders, headers);
         SelectedRole selectedRole = parseSystemRoleHeaders(protocolHeaders, headers);
 
         Optional<String> source = Optional.ofNullable(headers.getFirst(protocolHeaders.requestSource()));
@@ -166,6 +164,7 @@ else if (nameParts.size() == 2) {
                 path,
                 authenticatedIdentity,
                 identity,
+                originalIdentity,
                 selectedRole,
                 source,
                 traceToken,
@@ -210,21 +209,27 @@ public Identity extractAuthorizedIdentity(
         }
 
         Identity identity = buildSessionIdentity(optionalAuthenticatedIdentity, protocolHeaders, headers);
+        Identity originalIdentity = buildSessionOriginalIdentity(identity, protocolHeaders, headers);
 
-        accessControl.checkCanSetUser(identity.getPrincipal(), identity.getUser());
+        accessControl.checkCanSetUser(originalIdentity.getPrincipal(), originalIdentity.getUser());
 
         // authenticated may not present for HTTP or if authentication is not setup
         optionalAuthenticatedIdentity.ifPresent(authenticatedIdentity -> {
             // only check impersonation if authenticated user is not the same as the explicitly set user
-            if (!authenticatedIdentity.getUser().equals(identity.getUser())) {
+            if (!authenticatedIdentity.getUser().equals(originalIdentity.getUser())) {
                 // load enabled roles for authenticated identity, so impersonation permissions can be assigned to roles
                 authenticatedIdentity = Identity.from(authenticatedIdentity)
                         .withEnabledRoles(metadata.listEnabledRoles(authenticatedIdentity))
                         .build();
-                accessControl.checkCanImpersonateUser(authenticatedIdentity, identity.getUser());
+                accessControl.checkCanImpersonateUser(authenticatedIdentity, originalIdentity.getUser());
             }
         });
 
+        if (!originalIdentity.getUser().equals(identity.getUser())) {
+            accessControl.checkCanSetUser(originalIdentity.getPrincipal(), identity.getUser());
+            accessControl.checkCanImpersonateUser(originalIdentity, identity.getUser());
+        }
+
         return addEnabledRoles(identity, parseSystemRoleHeaders(protocolHeaders, headers), metadata);
     }
 
@@ -266,6 +271,20 @@ private Identity buildSessionIdentity(Optional<Identity> authenticatedIdentity,
                 .build();
     }
 
+    private Identity buildSessionOriginalIdentity(Identity identity, ProtocolHeaders protocolHeaders, MultivaluedMap<String, String> headers)
+    {
+        // We derive original identity using this header, but older clients will not send it, so fall back to identity
+        Optional<String> optionalOriginalUser = Optional
+                .ofNullable(trimEmptyToNull(headers.getFirst(protocolHeaders.requestOriginalUser())));
+        Identity originalIdentity = optionalOriginalUser.map(originalUser -> Identity.from(identity)
+                        .withUser(originalUser)
+                        .withExtraCredentials(new HashMap<>())
+                        .withGroups(groupProvider.getGroups(originalUser))
+                        .build())
+                .orElse(identity);
+        return originalIdentity;
+    }
+
     private static List<String> splitHttpHeader(MultivaluedMap<String, String> headers, String name)
     {
         List<String> values = firstNonNull(headers.get(name), ImmutableList.of());
@@ -397,7 +416,7 @@ private Map<String, String> parsePreparedStatementsHeaders(ProtocolHeaders proto
             // Validate statement
             SqlParser sqlParser = new SqlParser();
             try {
-                sqlParser.createStatement(sqlString, new ParsingOptions(AS_DOUBLE /* anything */));
+                sqlParser.createStatement(sqlString);
             }
             catch (ParsingException e) {
                 throw badRequest(format("Invalid %s header: %s", protocolHeaders.requestPreparedStatement(), e.getMessage()));
diff --git a/core/trino-main/src/main/java/io/trino/server/InternalAuthenticationManager.java b/core/trino-main/src/main/java/io/trino/server/InternalAuthenticationManager.java
index 689c49ae289f..1b8748964cdc 100644
--- a/core/trino-main/src/main/java/io/trino/server/InternalAuthenticationManager.java
+++ b/core/trino-main/src/main/java/io/trino/server/InternalAuthenticationManager.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.hash.Hashing;
+import com.google.inject.Inject;
 import io.airlift.http.client.HttpRequestFilter;
 import io.airlift.http.client.Request;
 import io.airlift.log.Logger;
@@ -24,10 +25,8 @@
 import io.trino.server.security.InternalPrincipal;
 import io.trino.server.security.SecurityConfig;
 import io.trino.spi.security.Identity;
-
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Response;
 
 import java.security.Key;
 import java.time.ZonedDateTime;
@@ -38,10 +37,10 @@
 import static io.trino.server.ServletSecurityUtils.setAuthenticatedIdentity;
 import static io.trino.server.security.jwt.JwtUtil.newJwtBuilder;
 import static io.trino.server.security.jwt.JwtUtil.newJwtParserBuilder;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
 
 public class InternalAuthenticationManager
         implements HttpRequestFilter
diff --git a/core/trino-main/src/main/java/io/trino/server/InternalCommunicationConfig.java b/core/trino-main/src/main/java/io/trino/server/InternalCommunicationConfig.java
index dd63efdc38e2..e067caedceb6 100644
--- a/core/trino-main/src/main/java/io/trino/server/InternalCommunicationConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/InternalCommunicationConfig.java
@@ -18,9 +18,8 @@
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.configuration.DefunctConfig;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/server/InternalCommunicationHttpClientModule.java b/core/trino-main/src/main/java/io/trino/server/InternalCommunicationHttpClientModule.java
new file mode 100644
index 000000000000..632231c648e6
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/server/InternalCommunicationHttpClientModule.java
@@ -0,0 +1,142 @@
+/*
+ * Licensed 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 io.trino.server;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Binder;
+import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.airlift.http.client.HttpClientBinder.HttpClientBindingBuilder;
+import io.airlift.http.client.HttpClientConfig;
+import io.airlift.http.client.HttpRequestFilter;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import static io.airlift.http.client.HttpClientBinder.httpClientBinder;
+import static java.util.Objects.requireNonNull;
+
+public class InternalCommunicationHttpClientModule
+        extends AbstractConfigurationAwareModule
+{
+    private final String clientName;
+    private final Class<? extends Annotation> annotation;
+    private final boolean withTracing;
+    private final Consumer<HttpClientConfig> configDefaults;
+    private final List<Class<? extends HttpRequestFilter>> filters;
+
+    private InternalCommunicationHttpClientModule(
+            String clientName,
+            Class<? extends Annotation> annotation,
+            boolean withTracing,
+            Consumer<HttpClientConfig> configDefaults,
+            List<Class<? extends HttpRequestFilter>> filters)
+    {
+        this.clientName = requireNonNull(clientName, "clientName is null");
+        this.annotation = requireNonNull(annotation, "annotation is null");
+        this.withTracing = withTracing;
+        this.configDefaults = requireNonNull(configDefaults, "configDefaults is null");
+        this.filters = ImmutableList.copyOf(requireNonNull(filters, "filters is null"));
+    }
+
+    @Override
+    protected void setup(Binder binder)
+    {
+        HttpClientBindingBuilder httpClientBindingBuilder = httpClientBinder(binder).bindHttpClient(clientName, annotation);
+        InternalCommunicationConfig internalCommunicationConfig = buildConfigObject(InternalCommunicationConfig.class);
+        httpClientBindingBuilder.withConfigDefaults(httpConfig -> {
+            configureClient(httpConfig, internalCommunicationConfig);
+            configDefaults.accept(httpConfig);
+        });
+
+        httpClientBindingBuilder.addFilterBinding().to(InternalAuthenticationManager.class);
+
+        if (withTracing) {
+            httpClientBindingBuilder.withTracing();
+        }
+
+        filters.forEach(httpClientBindingBuilder::withFilter);
+    }
+
+    static void configureClient(HttpClientConfig httpConfig, InternalCommunicationConfig internalCommunicationConfig)
+    {
+        httpConfig.setHttp2Enabled(internalCommunicationConfig.isHttp2Enabled());
+        if (internalCommunicationConfig.isHttpsRequired() && internalCommunicationConfig.getKeyStorePath() == null && internalCommunicationConfig.getTrustStorePath() == null) {
+            configureClientForAutomaticHttps(httpConfig, internalCommunicationConfig);
+        }
+        else {
+            configureClientForManualHttps(httpConfig, internalCommunicationConfig);
+        }
+    }
+
+    private static void configureClientForAutomaticHttps(HttpClientConfig httpConfig, InternalCommunicationConfig internalCommunicationConfig)
+    {
+        String sharedSecret = internalCommunicationConfig.getSharedSecret()
+                .orElseThrow(() -> new IllegalArgumentException("Internal shared secret must be set when internal HTTPS is enabled"));
+        httpConfig.setAutomaticHttpsSharedSecret(sharedSecret);
+    }
+
+    private static void configureClientForManualHttps(HttpClientConfig httpConfig, InternalCommunicationConfig internalCommunicationConfig)
+    {
+        httpConfig.setKeyStorePath(internalCommunicationConfig.getKeyStorePath());
+        httpConfig.setKeyStorePassword(internalCommunicationConfig.getKeyStorePassword());
+        httpConfig.setTrustStorePath(internalCommunicationConfig.getTrustStorePath());
+        httpConfig.setTrustStorePassword(internalCommunicationConfig.getTrustStorePassword());
+        httpConfig.setAutomaticHttpsSharedSecret(null);
+    }
+
+    public static class Builder
+    {
+        private final String clientName;
+        private final Class<? extends Annotation> annotation;
+        private boolean withTracing;
+        private Consumer<HttpClientConfig> configDefaults = config -> {};
+        private final List<Class<? extends HttpRequestFilter>> filters = new ArrayList<>();
+
+        private Builder(String clientName, Class<? extends Annotation> annotation)
+        {
+            this.clientName = requireNonNull(clientName, "clientName is null");
+            this.annotation = requireNonNull(annotation, "annotation is null");
+        }
+
+        public Builder withTracing()
+        {
+            this.withTracing = true;
+            return this;
+        }
+
+        public Builder withConfigDefaults(Consumer<HttpClientConfig> configDefaults)
+        {
+            this.configDefaults = requireNonNull(configDefaults, "configDefaults is null");
+            return this;
+        }
+
+        public Builder withFilter(Class<? extends HttpRequestFilter> requestFilter)
+        {
+            this.filters.add(requestFilter);
+            return this;
+        }
+
+        public InternalCommunicationHttpClientModule build()
+        {
+            return new InternalCommunicationHttpClientModule(clientName, annotation, withTracing, configDefaults, filters);
+        }
+    }
+
+    public static InternalCommunicationHttpClientModule.Builder internalHttpClientModule(String clientName, Class<? extends Annotation> annotation)
+    {
+        return new Builder(clientName, annotation);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/server/InternalCommunicationModule.java b/core/trino-main/src/main/java/io/trino/server/InternalCommunicationModule.java
index d71bd5dfee5b..604776496603 100644
--- a/core/trino-main/src/main/java/io/trino/server/InternalCommunicationModule.java
+++ b/core/trino-main/src/main/java/io/trino/server/InternalCommunicationModule.java
@@ -14,6 +14,7 @@
 package io.trino.server;
 
 import com.google.inject.Binder;
+import com.google.inject.multibindings.Multibinder;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.airlift.discovery.client.ForDiscoveryClient;
 import io.airlift.http.client.HttpClientConfig;
@@ -30,9 +31,9 @@
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static io.airlift.configuration.ConfigBinder.configBinder;
-import static io.airlift.http.client.HttpClientBinder.httpClientBinder;
 import static io.airlift.node.AddressToHostname.encodeAddressAsHostname;
 import static io.airlift.node.NodeConfig.AddressSource.IP_ENCODED_AS_HOSTNAME;
+import static io.trino.server.InternalCommunicationHttpClientModule.configureClient;
 
 public class InternalCommunicationModule
         extends AbstractConfigurationAwareModule
@@ -40,59 +41,48 @@ public class InternalCommunicationModule
     @Override
     protected void setup(Binder binder)
     {
-        // Set defaults for all HttpClients in the same guice context
-        // so in case of any additions or alternations here an update in:
-        //   io.trino.server.security.jwt.JwtAuthenticatorSupportModule.JwkModule.configure
-        // and
-        //   io.trino.server.security.oauth2.OAuth2ServiceModule.setup
-        // may also be required.
         InternalCommunicationConfig internalCommunicationConfig = buildConfigObject(InternalCommunicationConfig.class);
+        Multibinder<HttpRequestFilter> discoveryFilterBinder = newSetBinder(binder, HttpRequestFilter.class, ForDiscoveryClient.class);
         if (internalCommunicationConfig.isHttpsRequired() && internalCommunicationConfig.getKeyStorePath() == null && internalCommunicationConfig.getTrustStorePath() == null) {
             String sharedSecret = internalCommunicationConfig.getSharedSecret()
                     .orElseThrow(() -> new IllegalArgumentException("Internal shared secret must be set when internal HTTPS is enabled"));
             configBinder(binder).bindConfigDefaults(HttpsConfig.class, config -> config.setAutomaticHttpsSharedSecret(sharedSecret));
-            configBinder(binder).bindConfigGlobalDefaults(HttpClientConfig.class, config -> {
-                config.setHttp2Enabled(internalCommunicationConfig.isHttp2Enabled());
-                config.setAutomaticHttpsSharedSecret(sharedSecret);
-            });
             configBinder(binder).bindConfigGlobalDefaults(NodeConfig.class, config -> config.setInternalAddressSource(IP_ENCODED_AS_HOSTNAME));
-            // rewrite discovery client requests to use IP encoded as hostname
-            newSetBinder(binder, HttpRequestFilter.class, ForDiscoveryClient.class).addBinding()
-                    .toInstance(request -> Request.Builder.fromRequest(request)
-                            .setUri(toIpEncodedAsHostnameUri(request.getUri()))
-                            .build());
+            discoveryFilterBinder.addBinding().to(DiscoveryEncodeAddressAsHostname.class);
         }
-        else {
-            configBinder(binder).bindConfigGlobalDefaults(HttpClientConfig.class, config -> {
-                config.setHttp2Enabled(internalCommunicationConfig.isHttp2Enabled());
-                config.setKeyStorePath(internalCommunicationConfig.getKeyStorePath());
-                config.setKeyStorePassword(internalCommunicationConfig.getKeyStorePassword());
-                config.setTrustStorePath(internalCommunicationConfig.getTrustStorePath());
-                config.setTrustStorePassword(internalCommunicationConfig.getTrustStorePassword());
-                config.setAutomaticHttpsSharedSecret(null);
-            });
-        }
-
+        discoveryFilterBinder.addBinding().to(InternalAuthenticationManager.class);
+        configBinder(binder).bindConfigDefaults(HttpClientConfig.class, ForDiscoveryClient.class, config -> configureClient(config, internalCommunicationConfig));
         binder.bind(InternalAuthenticationManager.class);
-        httpClientBinder(binder).bindGlobalFilter(InternalAuthenticationManager.class);
     }
 
-    private static URI toIpEncodedAsHostnameUri(URI uri)
+    private static class DiscoveryEncodeAddressAsHostname
+            implements HttpRequestFilter
     {
-        if (!uri.getScheme().equals("https")) {
-            return uri;
-        }
-        try {
-            String host = uri.getHost();
-            InetAddress inetAddress = InetAddress.getByName(host);
-            String addressAsHostname = encodeAddressAsHostname(inetAddress);
-            return new URI(uri.getScheme(), uri.getUserInfo(), addressAsHostname, uri.getPort(), uri.getPath(), uri.getQuery(), uri.getFragment());
+        @Override
+        public Request filterRequest(Request request)
+        {
+            return Request.Builder.fromRequest(request)
+                    .setUri(toIpEncodedAsHostnameUri(request.getUri()))
+                    .build();
         }
-        catch (UnknownHostException e) {
-            throw new UncheckedIOException(e);
-        }
-        catch (URISyntaxException e) {
-            throw new RuntimeException(e);
+
+        private static URI toIpEncodedAsHostnameUri(URI uri)
+        {
+            if (!uri.getScheme().equals("https")) {
+                return uri;
+            }
+            try {
+                String host = uri.getHost();
+                InetAddress inetAddress = InetAddress.getByName(host);
+                String addressAsHostname = encodeAddressAsHostname(inetAddress);
+                return new URI(uri.getScheme(), uri.getUserInfo(), addressAsHostname, uri.getPort(), uri.getPath(), uri.getQuery(), uri.getFragment());
+            }
+            catch (UnknownHostException e) {
+                throw new UncheckedIOException(e);
+            }
+            catch (URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/NoOpSessionSupplier.java b/core/trino-main/src/main/java/io/trino/server/NoOpSessionSupplier.java
index 291c6e0ba3f7..723ccf4c4ea7 100644
--- a/core/trino-main/src/main/java/io/trino/server/NoOpSessionSupplier.java
+++ b/core/trino-main/src/main/java/io/trino/server/NoOpSessionSupplier.java
@@ -13,6 +13,7 @@
  */
 package io.trino.server;
 
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.spi.QueryId;
 
@@ -23,7 +24,7 @@ public class NoOpSessionSupplier
         implements SessionSupplier
 {
     @Override
-    public Session createSession(QueryId queryId, SessionContext context)
+    public Session createSession(QueryId queryId, Span querySpan, SessionContext context)
     {
         throw new UnsupportedOperationException();
     }
diff --git a/core/trino-main/src/main/java/io/trino/server/NodeResource.java b/core/trino-main/src/main/java/io/trino/server/NodeResource.java
index 7a0807b41626..06244e74b208 100644
--- a/core/trino-main/src/main/java/io/trino/server/NodeResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/NodeResource.java
@@ -14,12 +14,11 @@
 package io.trino.server;
 
 import com.google.common.collect.Maps;
+import com.google.inject.Inject;
 import io.trino.failuredetector.HeartbeatFailureDetector;
 import io.trino.server.security.ResourceSecurity;
-
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
 
 import java.util.Collection;
 
diff --git a/core/trino-main/src/main/java/io/trino/server/PagesResponseWriter.java b/core/trino-main/src/main/java/io/trino/server/PagesResponseWriter.java
index 00a640a2d9ca..396ff3976203 100644
--- a/core/trino-main/src/main/java/io/trino/server/PagesResponseWriter.java
+++ b/core/trino-main/src/main/java/io/trino/server/PagesResponseWriter.java
@@ -14,19 +14,18 @@
 package io.trino.server;
 
 import com.google.common.reflect.TypeToken;
+import com.google.inject.Inject;
 import io.airlift.slice.OutputStreamSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
 import io.trino.FeaturesConfig;
 import io.trino.FeaturesConfig.DataIntegrityVerification;
-
-import javax.inject.Inject;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Provider;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/core/trino-main/src/main/java/io/trino/server/PluginClassLoader.java b/core/trino-main/src/main/java/io/trino/server/PluginClassLoader.java
index 1cc512978477..3311346378e3 100644
--- a/core/trino-main/src/main/java/io/trino/server/PluginClassLoader.java
+++ b/core/trino-main/src/main/java/io/trino/server/PluginClassLoader.java
@@ -32,6 +32,7 @@
 public class PluginClassLoader
         extends URLClassLoader
 {
+    private final String id;
     private final String pluginName;
     private final Optional<CatalogHandle> catalogHandle;
     private final ClassLoader spiClassLoader;
@@ -69,6 +70,7 @@ private PluginClassLoader(
         this.spiClassLoader = requireNonNull(spiClassLoader, "spiClassLoader is null");
         this.spiPackages = ImmutableList.copyOf(spiPackages);
         this.spiResources = ImmutableList.copyOf(spiResources);
+        this.id = pluginName + catalogHandle.map(name -> ":%s:%s".formatted(name.getCatalogName(), name.getVersion())).orElse("");
     }
 
     public PluginClassLoader duplicate(CatalogHandle catalogHandle)
@@ -91,7 +93,7 @@ public PluginClassLoader withUrl(URL url)
 
     public String getId()
     {
-        return pluginName + catalogHandle.map(name -> ":" + name).orElse("");
+        return id;
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/server/PluginManager.java b/core/trino-main/src/main/java/io/trino/server/PluginManager.java
index 92052fcd1d6b..c3d7cd866f80 100644
--- a/core/trino-main/src/main/java/io/trino/server/PluginManager.java
+++ b/core/trino-main/src/main/java/io/trino/server/PluginManager.java
@@ -14,6 +14,8 @@
 package io.trino.server;
 
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.connector.CatalogFactory;
 import io.trino.eventlistener.EventListenerManager;
@@ -47,9 +49,6 @@
 import io.trino.spi.type.ParametricType;
 import io.trino.spi.type.Type;
 
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.net.URL;
 import java.util.List;
 import java.util.Optional;
@@ -72,6 +71,8 @@ public class PluginManager
             .add("com.fasterxml.jackson.annotation.")
             .add("io.airlift.slice.")
             .add("org.openjdk.jol.")
+            .add("io.opentelemetry.api.")
+            .add("io.opentelemetry.context.")
             .build();
 
     private static final Logger log = Logger.get(PluginManager.class);
diff --git a/core/trino-main/src/main/java/io/trino/server/ProtocolConfig.java b/core/trino-main/src/main/java/io/trino/server/ProtocolConfig.java
index 7cab2d398426..329a86001c55 100644
--- a/core/trino-main/src/main/java/io/trino/server/ProtocolConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/ProtocolConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.Pattern;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/server/QueryExecutionFactoryModule.java b/core/trino-main/src/main/java/io/trino/server/QueryExecutionFactoryModule.java
index 54d77391ce64..8492b247f957 100644
--- a/core/trino-main/src/main/java/io/trino/server/QueryExecutionFactoryModule.java
+++ b/core/trino-main/src/main/java/io/trino/server/QueryExecutionFactoryModule.java
@@ -23,6 +23,7 @@
 import io.trino.execution.CommentTask;
 import io.trino.execution.CommitTask;
 import io.trino.execution.CreateCatalogTask;
+import io.trino.execution.CreateFunctionTask;
 import io.trino.execution.CreateMaterializedViewTask;
 import io.trino.execution.CreateRoleTask;
 import io.trino.execution.CreateSchemaTask;
@@ -34,6 +35,7 @@
 import io.trino.execution.DenyTask;
 import io.trino.execution.DropCatalogTask;
 import io.trino.execution.DropColumnTask;
+import io.trino.execution.DropFunctionTask;
 import io.trino.execution.DropMaterializedViewTask;
 import io.trino.execution.DropRoleTask;
 import io.trino.execution.DropSchemaTask;
@@ -48,6 +50,7 @@
 import io.trino.execution.RenameSchemaTask;
 import io.trino.execution.RenameTableTask;
 import io.trino.execution.RenameViewTask;
+import io.trino.execution.ResetSessionAuthorizationTask;
 import io.trino.execution.ResetSessionTask;
 import io.trino.execution.RevokeRolesTask;
 import io.trino.execution.RevokeTask;
@@ -57,6 +60,7 @@
 import io.trino.execution.SetPropertiesTask;
 import io.trino.execution.SetRoleTask;
 import io.trino.execution.SetSchemaAuthorizationTask;
+import io.trino.execution.SetSessionAuthorizationTask;
 import io.trino.execution.SetSessionTask;
 import io.trino.execution.SetTableAuthorizationTask;
 import io.trino.execution.SetTimeZoneTask;
@@ -70,6 +74,7 @@
 import io.trino.sql.tree.Comment;
 import io.trino.sql.tree.Commit;
 import io.trino.sql.tree.CreateCatalog;
+import io.trino.sql.tree.CreateFunction;
 import io.trino.sql.tree.CreateMaterializedView;
 import io.trino.sql.tree.CreateRole;
 import io.trino.sql.tree.CreateSchema;
@@ -79,6 +84,7 @@
 import io.trino.sql.tree.Deny;
 import io.trino.sql.tree.DropCatalog;
 import io.trino.sql.tree.DropColumn;
+import io.trino.sql.tree.DropFunction;
 import io.trino.sql.tree.DropMaterializedView;
 import io.trino.sql.tree.DropRole;
 import io.trino.sql.tree.DropSchema;
@@ -93,6 +99,7 @@
 import io.trino.sql.tree.RenameTable;
 import io.trino.sql.tree.RenameView;
 import io.trino.sql.tree.ResetSession;
+import io.trino.sql.tree.ResetSessionAuthorization;
 import io.trino.sql.tree.Revoke;
 import io.trino.sql.tree.RevokeRoles;
 import io.trino.sql.tree.Rollback;
@@ -102,6 +109,7 @@
 import io.trino.sql.tree.SetRole;
 import io.trino.sql.tree.SetSchemaAuthorization;
 import io.trino.sql.tree.SetSession;
+import io.trino.sql.tree.SetSessionAuthorization;
 import io.trino.sql.tree.SetTableAuthorization;
 import io.trino.sql.tree.SetTimeZone;
 import io.trino.sql.tree.SetViewAuthorization;
@@ -135,6 +143,7 @@ public void configure(Binder binder)
         bindDataDefinitionTask(binder, executionBinder, Comment.class, CommentTask.class);
         bindDataDefinitionTask(binder, executionBinder, Commit.class, CommitTask.class);
         bindDataDefinitionTask(binder, executionBinder, CreateCatalog.class, CreateCatalogTask.class);
+        bindDataDefinitionTask(binder, executionBinder, CreateFunction.class, CreateFunctionTask.class);
         bindDataDefinitionTask(binder, executionBinder, CreateRole.class, CreateRoleTask.class);
         bindDataDefinitionTask(binder, executionBinder, CreateSchema.class, CreateSchemaTask.class);
         bindDataDefinitionTask(binder, executionBinder, CreateTable.class, CreateTableTask.class);
@@ -143,6 +152,7 @@ public void configure(Binder binder)
         bindDataDefinitionTask(binder, executionBinder, Deny.class, DenyTask.class);
         bindDataDefinitionTask(binder, executionBinder, DropCatalog.class, DropCatalogTask.class);
         bindDataDefinitionTask(binder, executionBinder, DropColumn.class, DropColumnTask.class);
+        bindDataDefinitionTask(binder, executionBinder, DropFunction.class, DropFunctionTask.class);
         bindDataDefinitionTask(binder, executionBinder, DropRole.class, DropRoleTask.class);
         bindDataDefinitionTask(binder, executionBinder, DropSchema.class, DropSchemaTask.class);
         bindDataDefinitionTask(binder, executionBinder, DropTable.class, DropTableTask.class);
@@ -159,6 +169,7 @@ public void configure(Binder binder)
         bindDataDefinitionTask(binder, executionBinder, RenameTable.class, RenameTableTask.class);
         bindDataDefinitionTask(binder, executionBinder, RenameView.class, RenameViewTask.class);
         bindDataDefinitionTask(binder, executionBinder, ResetSession.class, ResetSessionTask.class);
+        bindDataDefinitionTask(binder, executionBinder, ResetSessionAuthorization.class, ResetSessionAuthorizationTask.class);
         bindDataDefinitionTask(binder, executionBinder, Revoke.class, RevokeTask.class);
         bindDataDefinitionTask(binder, executionBinder, RevokeRoles.class, RevokeRolesTask.class);
         bindDataDefinitionTask(binder, executionBinder, Rollback.class, RollbackTask.class);
@@ -169,6 +180,7 @@ public void configure(Binder binder)
         bindDataDefinitionTask(binder, executionBinder, SetRole.class, SetRoleTask.class);
         bindDataDefinitionTask(binder, executionBinder, SetSchemaAuthorization.class, SetSchemaAuthorizationTask.class);
         bindDataDefinitionTask(binder, executionBinder, SetSession.class, SetSessionTask.class);
+        bindDataDefinitionTask(binder, executionBinder, SetSessionAuthorization.class, SetSessionAuthorizationTask.class);
         bindDataDefinitionTask(binder, executionBinder, SetTableAuthorization.class, SetTableAuthorizationTask.class);
         bindDataDefinitionTask(binder, executionBinder, SetViewAuthorization.class, SetViewAuthorizationTask.class);
         bindDataDefinitionTask(binder, executionBinder, StartTransaction.class, StartTransactionTask.class);
diff --git a/core/trino-main/src/main/java/io/trino/server/QueryResource.java b/core/trino-main/src/main/java/io/trino/server/QueryResource.java
index 77073dda812f..0640059d2536 100644
--- a/core/trino-main/src/main/java/io/trino/server/QueryResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/QueryResource.java
@@ -14,6 +14,7 @@
 package io.trino.server;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.dispatcher.DispatchManager;
 import io.trino.execution.QueryInfo;
 import io.trino.execution.QueryState;
@@ -22,20 +23,18 @@
 import io.trino.spi.QueryId;
 import io.trino.spi.TrinoException;
 import io.trino.spi.security.AccessDeniedException;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 import java.util.List;
 import java.util.Locale;
diff --git a/core/trino-main/src/main/java/io/trino/server/QuerySessionSupplier.java b/core/trino-main/src/main/java/io/trino/server/QuerySessionSupplier.java
index 58fe9b468a19..f62ef94b76e7 100644
--- a/core/trino-main/src/main/java/io/trino/server/QuerySessionSupplier.java
+++ b/core/trino-main/src/main/java/io/trino/server/QuerySessionSupplier.java
@@ -13,6 +13,9 @@
  */
 package io.trino.server;
 
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.inject.Inject;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.SessionPropertyManager;
@@ -23,9 +26,6 @@
 import io.trino.sql.SqlEnvironmentConfig;
 import io.trino.sql.SqlPath;
 
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
@@ -45,7 +45,7 @@ public class QuerySessionSupplier
     private final Metadata metadata;
     private final AccessControl accessControl;
     private final SessionPropertyManager sessionPropertyManager;
-    private final Optional<String> defaultPath;
+    private final String defaultPath;
     private final Optional<TimeZoneKey> forcedSessionTimeZone;
     private final Optional<String> defaultCatalog;
     private final Optional<String> defaultSchema;
@@ -69,29 +69,41 @@ public QuerySessionSupplier(
     }
 
     @Override
-    public Session createSession(QueryId queryId, SessionContext context)
+    public Session createSession(QueryId queryId, Span querySpan, SessionContext context)
     {
-        Identity identity = context.getIdentity();
-        accessControl.checkCanSetUser(identity.getPrincipal(), identity.getUser());
+        Identity originalIdentity = context.getOriginalIdentity();
+        accessControl.checkCanSetUser(originalIdentity.getPrincipal(), originalIdentity.getUser());
 
         // authenticated identity is not present for HTTP or if authentication is not setup
         if (context.getAuthenticatedIdentity().isPresent()) {
             Identity authenticatedIdentity = context.getAuthenticatedIdentity().get();
             // only check impersonation if authenticated user is not the same as the explicitly set user
-            if (!authenticatedIdentity.getUser().equals(identity.getUser())) {
+            if (!authenticatedIdentity.getUser().equals(originalIdentity.getUser())) {
                 // add enabled roles for authenticated identity, so impersonation permissions can be assigned to roles
                 authenticatedIdentity = addEnabledRoles(authenticatedIdentity, context.getSelectedRole(), metadata);
-                accessControl.checkCanImpersonateUser(authenticatedIdentity, identity.getUser());
+                accessControl.checkCanImpersonateUser(authenticatedIdentity, originalIdentity.getUser());
             }
         }
 
+        Identity identity = context.getIdentity();
+        if (!originalIdentity.getUser().equals(identity.getUser())) {
+            // When the current user (user) and the original user are different, we check if the original user can impersonate current user.
+            // We preserve the information of original user in the originalIdentity,
+            // and it will be used for the impersonation checks and be used as the source of audit information.
+            accessControl.checkCanSetUser(originalIdentity.getPrincipal(), identity.getUser());
+            accessControl.checkCanImpersonateUser(originalIdentity, identity.getUser());
+        }
+
         // add the enabled roles
         identity = addEnabledRoles(identity, context.getSelectedRole(), metadata);
 
+        SqlPath path = SqlPath.buildPath(context.getPath().orElse(defaultPath), context.getCatalog());
         SessionBuilder sessionBuilder = Session.builder(sessionPropertyManager)
                 .setQueryId(queryId)
+                .setQuerySpan(querySpan)
                 .setIdentity(identity)
-                .setPath(context.getPath().or(() -> defaultPath).map(SqlPath::new))
+                .setOriginalIdentity(originalIdentity)
+                .setPath(path)
                 .setSource(context.getSource())
                 .setRemoteUserAddress(context.getRemoteUserAddress())
                 .setUserAgent(context.getUserAgent())
diff --git a/core/trino-main/src/main/java/io/trino/server/QueryStateInfoResource.java b/core/trino-main/src/main/java/io/trino/server/QueryStateInfoResource.java
index e3781f5505e8..63997ff0e8c7 100644
--- a/core/trino-main/src/main/java/io/trino/server/QueryStateInfoResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/QueryStateInfoResource.java
@@ -13,6 +13,7 @@
  */
 package io.trino.server;
 
+import com.google.inject.Inject;
 import io.trino.dispatcher.DispatchManager;
 import io.trino.execution.resourcegroups.ResourceGroupManager;
 import io.trino.security.AccessControl;
@@ -20,19 +21,17 @@
 import io.trino.spi.QueryId;
 import io.trino.spi.resourcegroups.ResourceGroupId;
 import io.trino.spi.security.AccessDeniedException;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
 
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -47,8 +46,8 @@
 import static io.trino.server.QueryStateInfo.createQueryStateInfo;
 import static io.trino.server.QueryStateInfo.createQueuedQueryStateInfo;
 import static io.trino.server.security.ResourceSecurity.AccessType.AUTHENTICATED_USER;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 
 @Path("/v1/queryState")
 public class QueryStateInfoResource
diff --git a/core/trino-main/src/main/java/io/trino/server/ResourceGroupInfo.java b/core/trino-main/src/main/java/io/trino/server/ResourceGroupInfo.java
index 6e9bf6be8549..7c86a7bb3e77 100644
--- a/core/trino-main/src/main/java/io/trino/server/ResourceGroupInfo.java
+++ b/core/trino-main/src/main/java/io/trino/server/ResourceGroupInfo.java
@@ -21,8 +21,6 @@
 import io.trino.spi.resourcegroups.ResourceGroupState;
 import io.trino.spi.resourcegroups.SchedulingPolicy;
 
-import javax.annotation.Nullable;
-
 import java.util.List;
 import java.util.Optional;
 
@@ -182,7 +180,6 @@ public Optional<List<ResourceGroupInfo>> getSubGroups()
     }
 
     @JsonProperty
-    @Nullable
     public Optional<List<QueryStateInfo>> getRunningQueries()
     {
         return runningQueries;
diff --git a/core/trino-main/src/main/java/io/trino/server/ResourceGroupStateInfoResource.java b/core/trino-main/src/main/java/io/trino/server/ResourceGroupStateInfoResource.java
index a35e70e11c4d..dc31935bd058 100644
--- a/core/trino-main/src/main/java/io/trino/server/ResourceGroupStateInfoResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/ResourceGroupStateInfoResource.java
@@ -13,18 +13,17 @@
  */
 package io.trino.server;
 
+import com.google.inject.Inject;
 import io.trino.execution.resourcegroups.ResourceGroupManager;
 import io.trino.server.security.ResourceSecurity;
 import io.trino.spi.resourcegroups.ResourceGroupId;
-
-import javax.inject.Inject;
-import javax.ws.rs.Encoded;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Encoded;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
 
 import java.net.URLDecoder;
 import java.util.Arrays;
@@ -32,9 +31,9 @@
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.server.security.ResourceSecurity.AccessType.MANAGEMENT_READ;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 
 @Path("/v1/resourceGroupState")
 public class ResourceGroupStateInfoResource
diff --git a/core/trino-main/src/main/java/io/trino/server/Server.java b/core/trino-main/src/main/java/io/trino/server/Server.java
index 8318dc1f26e2..c90c1221af69 100644
--- a/core/trino-main/src/main/java/io/trino/server/Server.java
+++ b/core/trino-main/src/main/java/io/trino/server/Server.java
@@ -38,6 +38,7 @@
 import io.airlift.node.NodeModule;
 import io.airlift.openmetrics.JmxOpenMetricsModule;
 import io.airlift.tracetoken.TraceTokenModule;
+import io.airlift.tracing.TracingModule;
 import io.trino.client.NodeVersion;
 import io.trino.connector.CatalogManagerConfig;
 import io.trino.connector.CatalogManagerConfig.CatalogMangerKind;
@@ -112,6 +113,7 @@ private void doStart(String trinoVersion)
                 new JmxOpenMetricsModule(),
                 new LogJmxModule(),
                 new TraceTokenModule(),
+                new TracingModule("trino", trinoVersion),
                 new EventModule(),
                 new JsonEventModule(),
                 new ServerSecurityModule(),
diff --git a/core/trino-main/src/main/java/io/trino/server/ServerConfig.java b/core/trino-main/src/main/java/io/trino/server/ServerConfig.java
index 7f16d1a9c95c..7f9c3dff449d 100644
--- a/core/trino-main/src/main/java/io/trino/server/ServerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/ServerConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/server/ServerInfoResource.java b/core/trino-main/src/main/java/io/trino/server/ServerInfoResource.java
index 525cf192bf4f..ce54259d016d 100644
--- a/core/trino-main/src/main/java/io/trino/server/ServerInfoResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/ServerInfoResource.java
@@ -13,21 +13,20 @@
  */
 package io.trino.server;
 
+import com.google.inject.Inject;
 import io.airlift.node.NodeInfo;
 import io.trino.client.NodeVersion;
 import io.trino.client.ServerInfo;
 import io.trino.metadata.NodeState;
 import io.trino.server.security.ResourceSecurity;
-
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import java.util.Optional;
 
@@ -36,11 +35,11 @@
 import static io.trino.metadata.NodeState.SHUTTING_DOWN;
 import static io.trino.server.security.ResourceSecurity.AccessType.MANAGEMENT_WRITE;
 import static io.trino.server.security.ResourceSecurity.AccessType.PUBLIC;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
 
 @Path("/v1/info")
 public class ServerInfoResource
diff --git a/core/trino-main/src/main/java/io/trino/server/ServerMainModule.java b/core/trino-main/src/main/java/io/trino/server/ServerMainModule.java
index 5e768f344bd8..ad76199fe4b1 100644
--- a/core/trino-main/src/main/java/io/trino/server/ServerMainModule.java
+++ b/core/trino-main/src/main/java/io/trino/server/ServerMainModule.java
@@ -15,8 +15,10 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import com.google.inject.multibindings.ProvidesIntoSet;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
@@ -47,8 +49,10 @@
 import io.trino.execution.TableExecuteContextManager;
 import io.trino.execution.TaskManagementExecutor;
 import io.trino.execution.TaskManagerConfig;
-import io.trino.execution.executor.MultilevelSplitQueue;
 import io.trino.execution.executor.TaskExecutor;
+import io.trino.execution.executor.dedicated.ThreadPerDriverTaskExecutor;
+import io.trino.execution.executor.timesharing.MultilevelSplitQueue;
+import io.trino.execution.executor.timesharing.TimeSharingTaskExecutor;
 import io.trino.execution.scheduler.NodeScheduler;
 import io.trino.execution.scheduler.NodeSchedulerConfig;
 import io.trino.execution.scheduler.TopologyAwareNodeSelectorModule;
@@ -71,6 +75,7 @@
 import io.trino.metadata.InternalBlockEncodingSerde;
 import io.trino.metadata.InternalFunctionBundle;
 import io.trino.metadata.InternalNodeManager;
+import io.trino.metadata.LanguageFunctionManager;
 import io.trino.metadata.LiteralFunction;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.MetadataManager;
@@ -85,11 +90,9 @@
 import io.trino.operator.DirectExchangeClientSupplier;
 import io.trino.operator.ForExchange;
 import io.trino.operator.GroupByHashPageIndexerFactory;
-import io.trino.operator.OperatorFactories;
 import io.trino.operator.PagesIndex;
 import io.trino.operator.PagesIndexPageSorter;
 import io.trino.operator.RetryPolicy;
-import io.trino.operator.TrinoOperatorFactories;
 import io.trino.operator.index.IndexJoinLookupStats;
 import io.trino.operator.scalar.json.JsonExistsFunction;
 import io.trino.operator.scalar.json.JsonQueryFunction;
@@ -141,6 +144,8 @@
 import io.trino.sql.planner.RuleStatsRecorder;
 import io.trino.sql.planner.TypeAnalyzer;
 import io.trino.sql.tree.Expression;
+import io.trino.tracing.ForTracing;
+import io.trino.tracing.TracingMetadata;
 import io.trino.type.BlockTypeOperators;
 import io.trino.type.InternalTypeManager;
 import io.trino.type.JsonPath2016Type;
@@ -150,10 +155,7 @@
 import io.trino.type.TypeSignatureKeyDeserializer;
 import io.trino.util.FinalizerService;
 import io.trino.version.EmbedVersion;
-
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.annotation.PreDestroy;
 
 import java.util.List;
 import java.util.Set;
@@ -168,7 +170,6 @@
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static io.airlift.discovery.client.DiscoveryBinder.discoveryBinder;
-import static io.airlift.http.client.HttpClientBinder.httpClientBinder;
 import static io.airlift.jaxrs.JaxrsBinder.jaxrsBinder;
 import static io.airlift.json.JsonBinder.jsonBinder;
 import static io.airlift.json.JsonCodecBinder.jsonCodecBinder;
@@ -176,6 +177,7 @@
 import static io.trino.execution.scheduler.NodeSchedulerConfig.NodeSchedulerPolicy.TOPOLOGY;
 import static io.trino.execution.scheduler.NodeSchedulerConfig.NodeSchedulerPolicy.UNIFORM;
 import static io.trino.operator.RetryPolicy.TASK;
+import static io.trino.server.InternalCommunicationHttpClientModule.internalHttpClientModule;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
@@ -253,12 +255,12 @@ protected void setup(Binder binder)
         binder.bind(DiscoveryNodeManager.class).in(Scopes.SINGLETON);
         binder.bind(InternalNodeManager.class).to(DiscoveryNodeManager.class).in(Scopes.SINGLETON);
         newExporter(binder).export(DiscoveryNodeManager.class).withGeneratedName();
-        httpClientBinder(binder).bindHttpClient("node-manager", ForNodeManager.class)
+        install(internalHttpClientModule("node-manager", ForNodeManager.class)
                 .withTracing()
                 .withConfigDefaults(config -> {
                     config.setIdleTimeout(new Duration(30, SECONDS));
                     config.setRequestTimeout(new Duration(10, SECONDS));
-                });
+                }).build());
 
         // node scheduler
         // TODO: remove from NodePartitioningManager and move to CoordinatorModule
@@ -283,8 +285,6 @@ protected void setup(Binder binder)
         binder.bind(FailureInjector.class).in(Scopes.SINGLETON);
         jaxrsBinder(binder).bind(TaskResource.class);
         newExporter(binder).export(TaskResource.class).withGeneratedName();
-        jaxrsBinder(binder).bind(TaskExecutorResource.class);
-        newExporter(binder).export(TaskExecutorResource.class).withGeneratedName();
         binder.bind(TaskManagementExecutor.class).in(Scopes.SINGLETON);
         binder.bind(SqlTaskManager.class).in(Scopes.SINGLETON);
         binder.bind(TableExecuteContextManager.class).in(Scopes.SINGLETON);
@@ -306,7 +306,7 @@ protected void setup(Binder binder)
         binder.bind(LocalMemoryManagerExporter.class).in(Scopes.SINGLETON);
         newOptionalBinder(binder, VersionEmbedder.class).setDefault().to(EmbedVersion.class).in(Scopes.SINGLETON);
         newExporter(binder).export(SqlTaskManager.class).withGeneratedName();
-        binder.bind(TaskExecutor.class).in(Scopes.SINGLETON);
+
         newExporter(binder).export(TaskExecutor.class).withGeneratedName();
         binder.bind(MultilevelSplitQueue.class).in(Scopes.SINGLETON);
         newExporter(binder).export(MultilevelSplitQueue.class).withGeneratedName();
@@ -317,6 +317,24 @@ protected void setup(Binder binder)
         binder.bind(PageFunctionCompiler.class).in(Scopes.SINGLETON);
         newExporter(binder).export(PageFunctionCompiler.class).withGeneratedName();
         configBinder(binder).bindConfig(TaskManagerConfig.class);
+
+        // TODO: use conditional module
+        TaskManagerConfig taskManagerConfig = buildConfigObject(TaskManagerConfig.class);
+        if (taskManagerConfig.isThreadPerDriverSchedulerEnabled()) {
+            binder.bind(TaskExecutor.class)
+                    .to(ThreadPerDriverTaskExecutor.class)
+                    .in(Scopes.SINGLETON);
+        }
+        else {
+            jaxrsBinder(binder).bind(TaskExecutorResource.class);
+            newExporter(binder).export(TaskExecutorResource.class).withGeneratedName();
+
+            binder.bind(TaskExecutor.class)
+                    .to(TimeSharingTaskExecutor.class)
+                    .in(Scopes.SINGLETON);
+            binder.bind(TimeSharingTaskExecutor.class).in(Scopes.SINGLETON);
+        }
+
         if (retryPolicy == TASK) {
             configBinder(binder).bindConfigDefaults(TaskManagerConfig.class, TaskManagerConfig::applyFaultTolerantExecutionDefaults);
         }
@@ -331,13 +349,12 @@ protected void setup(Binder binder)
         binder.bind(OrderingCompiler.class).in(Scopes.SINGLETON);
         newExporter(binder).export(OrderingCompiler.class).withGeneratedName();
         binder.bind(PagesIndex.Factory.class).to(PagesIndex.DefaultFactory.class);
-        newOptionalBinder(binder, OperatorFactories.class).setDefault().to(TrinoOperatorFactories.class).in(Scopes.SINGLETON);
 
         jaxrsBinder(binder).bind(PagesResponseWriter.class);
 
         // exchange client
         binder.bind(DirectExchangeClientSupplier.class).to(DirectExchangeClientFactory.class).in(Scopes.SINGLETON);
-        httpClientBinder(binder).bindHttpClient("exchange", ForExchange.class)
+        install(internalHttpClientModule("exchange", ForExchange.class)
                 .withTracing()
                 .withFilter(GenerateTraceTokenRequestFilter.class)
                 .withConfigDefaults(config -> {
@@ -345,7 +362,7 @@ protected void setup(Binder binder)
                     config.setRequestTimeout(new Duration(10, SECONDS));
                     config.setMaxConnectionsPerServer(250);
                     config.setMaxContentLength(DataSize.of(32, MEGABYTE));
-                });
+                }).build());
 
         configBinder(binder).bindConfig(DirectExchangeClientConfig.class);
         binder.bind(ExchangeExecutionMBean.class).in(Scopes.SINGLETON);
@@ -368,7 +385,8 @@ protected void setup(Binder binder)
 
         // metadata
         binder.bind(MetadataManager.class).in(Scopes.SINGLETON);
-        binder.bind(Metadata.class).to(MetadataManager.class).in(Scopes.SINGLETON);
+        binder.bind(Metadata.class).annotatedWith(ForTracing.class).to(MetadataManager.class).in(Scopes.SINGLETON);
+        binder.bind(Metadata.class).to(TracingMetadata.class).in(Scopes.SINGLETON);
         newOptionalBinder(binder, SystemSecurityMetadata.class)
                 .setDefault()
                 .to(DisabledSystemSecurityMetadata.class)
@@ -382,6 +400,7 @@ protected void setup(Binder binder)
         binder.bind(TableProceduresRegistry.class).in(Scopes.SINGLETON);
         binder.bind(TableFunctionRegistry.class).in(Scopes.SINGLETON);
         binder.bind(PlannerContext.class).in(Scopes.SINGLETON);
+        binder.bind(LanguageFunctionManager.class).in(Scopes.SINGLETON);
 
         // function
         binder.bind(FunctionManager.class).in(Scopes.SINGLETON);
diff --git a/core/trino-main/src/main/java/io/trino/server/ServerPluginsProvider.java b/core/trino-main/src/main/java/io/trino/server/ServerPluginsProvider.java
index 2c54bba60b24..c1ef3d897f36 100644
--- a/core/trino-main/src/main/java/io/trino/server/ServerPluginsProvider.java
+++ b/core/trino-main/src/main/java/io/trino/server/ServerPluginsProvider.java
@@ -13,10 +13,9 @@
  */
 package io.trino.server;
 
+import com.google.inject.Inject;
 import io.trino.server.PluginManager.PluginsProvider;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/core/trino-main/src/main/java/io/trino/server/ServletSecurityUtils.java b/core/trino-main/src/main/java/io/trino/server/ServletSecurityUtils.java
index f90041163d10..e25e3be88760 100644
--- a/core/trino-main/src/main/java/io/trino/server/ServletSecurityUtils.java
+++ b/core/trino-main/src/main/java/io/trino/server/ServletSecurityUtils.java
@@ -15,20 +15,19 @@
 
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.Identity;
-
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.SecurityContext;
 
 import java.security.Principal;
 import java.util.Collection;
 
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
 import static io.trino.server.HttpRequestSessionContextFactory.AUTHENTICATED_IDENTITY;
-import static javax.ws.rs.core.HttpHeaders.WWW_AUTHENTICATE;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static jakarta.ws.rs.core.HttpHeaders.WWW_AUTHENTICATE;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
 
 public final class ServletSecurityUtils
 {
diff --git a/core/trino-main/src/main/java/io/trino/server/SessionContext.java b/core/trino-main/src/main/java/io/trino/server/SessionContext.java
index 318548129e65..6db911268af1 100644
--- a/core/trino-main/src/main/java/io/trino/server/SessionContext.java
+++ b/core/trino-main/src/main/java/io/trino/server/SessionContext.java
@@ -39,6 +39,7 @@ public class SessionContext
 
     private final Optional<Identity> authenticatedIdentity;
     private final Identity identity;
+    private final Identity originalIdentity;
     private final SelectedRole selectedRole;
 
     private final Optional<String> source;
@@ -67,6 +68,7 @@ public SessionContext(
             Optional<String> path,
             Optional<Identity> authenticatedIdentity,
             Identity identity,
+            Identity originalIdentity,
             SelectedRole selectedRole,
             Optional<String> source,
             Optional<String> traceToken,
@@ -90,6 +92,7 @@ public SessionContext(
         this.path = requireNonNull(path, "path is null");
         this.authenticatedIdentity = requireNonNull(authenticatedIdentity, "authenticatedIdentity is null");
         this.identity = requireNonNull(identity, "identity is null");
+        this.originalIdentity = requireNonNull(originalIdentity, "originalIdentity is null");
         this.selectedRole = requireNonNull(selectedRole, "selectedRole is null");
         this.source = requireNonNull(source, "source is null");
         this.traceToken = requireNonNull(traceToken, "traceToken is null");
@@ -125,6 +128,11 @@ public Identity getIdentity()
         return identity;
     }
 
+    public Identity getOriginalIdentity()
+    {
+        return originalIdentity;
+    }
+
     public SelectedRole getSelectedRole()
     {
         return selectedRole;
diff --git a/core/trino-main/src/main/java/io/trino/server/SessionPropertyDefaults.java b/core/trino-main/src/main/java/io/trino/server/SessionPropertyDefaults.java
index 0e11a5067c42..14cc45086231 100644
--- a/core/trino-main/src/main/java/io/trino/server/SessionPropertyDefaults.java
+++ b/core/trino-main/src/main/java/io/trino/server/SessionPropertyDefaults.java
@@ -14,6 +14,7 @@
 package io.trino.server;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.node.NodeInfo;
 import io.trino.Session;
@@ -25,8 +26,6 @@
 import io.trino.spi.session.SessionPropertyConfigurationManager;
 import io.trino.spi.session.SessionPropertyConfigurationManagerFactory;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/core/trino-main/src/main/java/io/trino/server/SessionSupplier.java b/core/trino-main/src/main/java/io/trino/server/SessionSupplier.java
index 9837b8a9c24d..2ff7e3a4672e 100644
--- a/core/trino-main/src/main/java/io/trino/server/SessionSupplier.java
+++ b/core/trino-main/src/main/java/io/trino/server/SessionSupplier.java
@@ -13,10 +13,11 @@
  */
 package io.trino.server;
 
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.spi.QueryId;
 
 public interface SessionSupplier
 {
-    Session createSession(QueryId queryId, SessionContext context);
+    Session createSession(QueryId queryId, Span querySpan, SessionContext context);
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/SliceSerialization.java b/core/trino-main/src/main/java/io/trino/server/SliceSerialization.java
index 29631d6586fb..ca19baff4468 100644
--- a/core/trino-main/src/main/java/io/trino/server/SliceSerialization.java
+++ b/core/trino-main/src/main/java/io/trino/server/SliceSerialization.java
@@ -36,12 +36,7 @@ public static class SliceSerializer
         public void serialize(Slice slice, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
                 throws IOException
         {
-            if (slice.hasByteArray()) {
-                jsonGenerator.writeBinary(Base64Variants.MIME_NO_LINEFEEDS, slice.byteArray(), slice.byteArrayOffset(), slice.length());
-            }
-            else {
-                jsonGenerator.writeBinary(Base64Variants.MIME_NO_LINEFEEDS, slice.getInput(), slice.length());
-            }
+            jsonGenerator.writeBinary(Base64Variants.MIME_NO_LINEFEEDS, slice.byteArray(), slice.byteArrayOffset(), slice.length());
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/server/StatementHttpExecutionMBean.java b/core/trino-main/src/main/java/io/trino/server/StatementHttpExecutionMBean.java
index 662e81caa9fb..b1369bfa6e83 100644
--- a/core/trino-main/src/main/java/io/trino/server/StatementHttpExecutionMBean.java
+++ b/core/trino-main/src/main/java/io/trino/server/StatementHttpExecutionMBean.java
@@ -13,12 +13,11 @@
  */
 package io.trino.server;
 
+import com.google.inject.Inject;
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
diff --git a/core/trino-main/src/main/java/io/trino/server/StatusResource.java b/core/trino-main/src/main/java/io/trino/server/StatusResource.java
index ea2d39d0b1aa..25a640f8b4ae 100644
--- a/core/trino-main/src/main/java/io/trino/server/StatusResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/StatusResource.java
@@ -13,26 +13,25 @@
  */
 package io.trino.server;
 
+import com.google.inject.Inject;
 import com.sun.management.OperatingSystemMXBean;
 import io.airlift.node.NodeInfo;
 import io.trino.client.NodeVersion;
 import io.trino.memory.LocalMemoryManager;
 import io.trino.server.security.ResourceSecurity;
-
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.HEAD;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HEAD;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 
 import static io.airlift.units.Duration.nanosSince;
 import static io.trino.server.security.ResourceSecurity.AccessType.PUBLIC;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 
 @Path("/v1/status")
 public class StatusResource
diff --git a/core/trino-main/src/main/java/io/trino/server/TaskExecutorResource.java b/core/trino-main/src/main/java/io/trino/server/TaskExecutorResource.java
index 11ff77eafe01..0f8d19d52fba 100644
--- a/core/trino-main/src/main/java/io/trino/server/TaskExecutorResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/TaskExecutorResource.java
@@ -13,14 +13,13 @@
  */
 package io.trino.server;
 
-import io.trino.execution.executor.TaskExecutor;
+import com.google.inject.Inject;
+import io.trino.execution.executor.timesharing.TimeSharingTaskExecutor;
 import io.trino.server.security.ResourceSecurity;
-
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import static io.trino.server.security.ResourceSecurity.AccessType.MANAGEMENT_READ;
 import static java.util.Objects.requireNonNull;
@@ -28,11 +27,11 @@
 @Path("/v1/maxActiveSplits")
 public class TaskExecutorResource
 {
-    private final TaskExecutor taskExecutor;
+    private final TimeSharingTaskExecutor taskExecutor;
 
     @Inject
     public TaskExecutorResource(
-            TaskExecutor taskExecutor)
+            TimeSharingTaskExecutor taskExecutor)
     {
         this.taskExecutor = requireNonNull(taskExecutor, "taskExecutor is null");
     }
diff --git a/core/trino-main/src/main/java/io/trino/server/TaskResource.java b/core/trino-main/src/main/java/io/trino/server/TaskResource.java
index 007f7a4909f8..b97dfd0c479c 100644
--- a/core/trino-main/src/main/java/io/trino/server/TaskResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/TaskResource.java
@@ -17,6 +17,7 @@
 import com.google.common.reflect.TypeToken;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
@@ -36,30 +37,28 @@
 import io.trino.metadata.SessionPropertyManager;
 import io.trino.server.security.ResourceSecurity;
 import io.trino.spi.connector.CatalogHandle;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.CompletionCallback;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.GenericEntity;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.CompletionCallback;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.GenericEntity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -151,12 +150,15 @@ public void createOrUpdateTask(
             return;
         }
 
-        TaskInfo taskInfo = taskManager.updateTask(session,
+        TaskInfo taskInfo = taskManager.updateTask(
+                session,
                 taskId,
+                taskUpdateRequest.getStageSpan(),
                 taskUpdateRequest.getFragment(),
                 taskUpdateRequest.getSplitAssignments(),
                 taskUpdateRequest.getOutputIds(),
-                taskUpdateRequest.getDynamicFilterDomains());
+                taskUpdateRequest.getDynamicFilterDomains(),
+                taskUpdateRequest.isSpeculative());
 
         if (shouldSummarize(uriInfo)) {
             taskInfo = taskInfo.summarize();
diff --git a/core/trino-main/src/main/java/io/trino/server/TaskUpdateRequest.java b/core/trino-main/src/main/java/io/trino/server/TaskUpdateRequest.java
index 08a3b8807a40..8f2a65bbe5f5 100644
--- a/core/trino-main/src/main/java/io/trino/server/TaskUpdateRequest.java
+++ b/core/trino-main/src/main/java/io/trino/server/TaskUpdateRequest.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slice;
+import io.opentelemetry.api.trace.Span;
 import io.trino.SessionRepresentation;
 import io.trino.execution.SplitAssignment;
 import io.trino.execution.buffer.OutputBuffers;
@@ -36,24 +37,29 @@ public class TaskUpdateRequest
     private final SessionRepresentation session;
     // extraCredentials is stored separately from SessionRepresentation to avoid being leaked
     private final Map<String, String> extraCredentials;
+    private final Span stageSpan;
     private final Optional<PlanFragment> fragment;
     private final List<SplitAssignment> splitAssignments;
     private final OutputBuffers outputIds;
     private final Map<DynamicFilterId, Domain> dynamicFilterDomains;
     private final Optional<Slice> exchangeEncryptionKey;
+    private final boolean speculative;
 
     @JsonCreator
     public TaskUpdateRequest(
             @JsonProperty("session") SessionRepresentation session,
             @JsonProperty("extraCredentials") Map<String, String> extraCredentials,
+            @JsonProperty("stageSpan") Span stageSpan,
             @JsonProperty("fragment") Optional<PlanFragment> fragment,
             @JsonProperty("splitAssignments") List<SplitAssignment> splitAssignments,
             @JsonProperty("outputIds") OutputBuffers outputIds,
             @JsonProperty("dynamicFilterDomains") Map<DynamicFilterId, Domain> dynamicFilterDomains,
-            @JsonProperty("exchangeEncryptionKey") Optional<Slice> exchangeEncryptionKey)
+            @JsonProperty("exchangeEncryptionKey") Optional<Slice> exchangeEncryptionKey,
+            @JsonProperty("speculative") boolean speculative)
     {
         requireNonNull(session, "session is null");
         requireNonNull(extraCredentials, "extraCredentials is null");
+        requireNonNull(stageSpan, "stageSpan is null");
         requireNonNull(fragment, "fragment is null");
         requireNonNull(splitAssignments, "splitAssignments is null");
         requireNonNull(outputIds, "outputIds is null");
@@ -62,11 +68,13 @@ public TaskUpdateRequest(
 
         this.session = session;
         this.extraCredentials = extraCredentials;
+        this.stageSpan = stageSpan;
         this.fragment = fragment;
         this.splitAssignments = ImmutableList.copyOf(splitAssignments);
         this.outputIds = outputIds;
         this.dynamicFilterDomains = dynamicFilterDomains;
         this.exchangeEncryptionKey = exchangeEncryptionKey;
+        this.speculative = speculative;
     }
 
     @JsonProperty
@@ -81,6 +89,12 @@ public Map<String, String> getExtraCredentials()
         return extraCredentials;
     }
 
+    @JsonProperty
+    public Span getStageSpan()
+    {
+        return stageSpan;
+    }
+
     @JsonProperty
     public Optional<PlanFragment> getFragment()
     {
@@ -111,6 +125,12 @@ public Optional<Slice> getExchangeEncryptionKey()
         return exchangeEncryptionKey;
     }
 
+    @JsonProperty
+    public boolean isSpeculative()
+    {
+        return speculative;
+    }
+
     @Override
     public String toString()
     {
diff --git a/core/trino-main/src/main/java/io/trino/server/ThreadResource.java b/core/trino-main/src/main/java/io/trino/server/ThreadResource.java
index 713ea89dfee2..9a540e9f2bef 100644
--- a/core/trino-main/src/main/java/io/trino/server/ThreadResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/ThreadResource.java
@@ -18,11 +18,10 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Ordering;
 import io.trino.server.security.ResourceSecurity;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
diff --git a/core/trino-main/src/main/java/io/trino/server/ThrowableMapper.java b/core/trino-main/src/main/java/io/trino/server/ThrowableMapper.java
index 3c3e886ffd85..dbebebd62b0f 100644
--- a/core/trino-main/src/main/java/io/trino/server/ThrowableMapper.java
+++ b/core/trino-main/src/main/java/io/trino/server/ThrowableMapper.java
@@ -14,18 +14,17 @@
 package io.trino.server;
 
 import com.google.common.base.Throwables;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.ext.ExceptionMapper;
 
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.ext.ExceptionMapper;
-
-import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
-import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
+import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
 
 public class ThrowableMapper
         implements ExceptionMapper<Throwable>
diff --git a/core/trino-main/src/main/java/io/trino/server/TrinoSystemRequirements.java b/core/trino-main/src/main/java/io/trino/server/TrinoSystemRequirements.java
index a9c59538dd2d..0a6ebf2dadb6 100644
--- a/core/trino-main/src/main/java/io/trino/server/TrinoSystemRequirements.java
+++ b/core/trino-main/src/main/java/io/trino/server/TrinoSystemRequirements.java
@@ -24,6 +24,8 @@
 import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
 import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Locale;
 import java.util.OptionalLong;
@@ -48,6 +50,7 @@ public static void verifyJvmRequirements()
         verifyUsingG1Gc();
         verifyFileDescriptor();
         verifySlice();
+        verifyUtf8();
     }
 
     private static void verify64BitJvm()
@@ -74,9 +77,6 @@ private static void verifyOsArchitecture()
             if (!ImmutableSet.of("amd64", "aarch64", "ppc64le").contains(osArch)) {
                 failRequirement("Trino requires amd64, aarch64, or ppc64le on Linux (found %s)", osArch);
             }
-            if ("aarch64".equals(osArch)) {
-                warnRequirement("Support for the ARM architecture is experimental");
-            }
             else if ("ppc64le".equals(osArch)) {
                 warnRequirement("Support for the POWER architecture is experimental");
             }
@@ -153,6 +153,14 @@ private static void verifySlice()
         }
     }
 
+    private static void verifyUtf8()
+    {
+        Charset defaultCharset = Charset.defaultCharset();
+        if (!defaultCharset.equals(StandardCharsets.UTF_8)) {
+            failRequirement("Trino requires that the default charset is UTF-8 (found %s). This can be set with the JVM command line option -Dfile.encoding=UTF-8", defaultCharset.name());
+        }
+    }
+
     /**
      * Perform a sanity check to make sure that the year is reasonably current, to guard against
      * issues in third party libraries.
diff --git a/core/trino-main/src/main/java/io/trino/server/WorkerModule.java b/core/trino-main/src/main/java/io/trino/server/WorkerModule.java
index 445634da0c5d..fbfb98632297 100644
--- a/core/trino-main/src/main/java/io/trino/server/WorkerModule.java
+++ b/core/trino-main/src/main/java/io/trino/server/WorkerModule.java
@@ -17,16 +17,17 @@
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import io.trino.execution.QueryManager;
 import io.trino.execution.resourcegroups.NoOpResourceGroupManager;
 import io.trino.execution.resourcegroups.ResourceGroupManager;
 import io.trino.failuredetector.FailureDetector;
 import io.trino.failuredetector.NoOpFailureDetector;
+import io.trino.metadata.LanguageFunctionProvider;
+import io.trino.metadata.WorkerLanguageFunctionProvider;
 import io.trino.server.ui.NoWebUiAuthenticationFilter;
 import io.trino.server.ui.WebUiAuthenticationFilter;
 
-import javax.inject.Singleton;
-
 import static com.google.common.reflect.Reflection.newProxy;
 
 public class WorkerModule
@@ -49,6 +50,10 @@ public void configure(Binder binder)
             throw new UnsupportedOperationException();
         }));
 
+        // language functions
+        binder.bind(WorkerLanguageFunctionProvider.class).in(Scopes.SINGLETON);
+        binder.bind(LanguageFunctionProvider.class).to(WorkerLanguageFunctionProvider.class).in(Scopes.SINGLETON);
+
         binder.bind(WebUiAuthenticationFilter.class).to(NoWebUiAuthenticationFilter.class).in(Scopes.SINGLETON);
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/ExecutingStatementResource.java b/core/trino-main/src/main/java/io/trino/server/protocol/ExecutingStatementResource.java
index 307a76d97ce3..2053385cd538 100644
--- a/core/trino-main/src/main/java/io/trino/server/protocol/ExecutingStatementResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/protocol/ExecutingStatementResource.java
@@ -16,13 +16,13 @@
 import com.google.common.collect.Ordering;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.log.Logger;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.Session;
 import io.trino.client.ProtocolHeaders;
-import io.trino.client.QueryResults;
 import io.trino.exchange.ExchangeManagerRegistry;
 import io.trino.execution.QueryManager;
 import io.trino.operator.DirectExchangeClientSupplier;
@@ -31,23 +31,21 @@
 import io.trino.server.security.ResourceSecurity;
 import io.trino.spi.QueryId;
 import io.trino.spi.block.BlockEncodingSerde;
-
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriInfo;
+import jakarta.annotation.PreDestroy;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.UriInfo;
 
 import java.net.URLEncoder;
 import java.util.Map.Entry;
@@ -62,13 +60,13 @@
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.server.protocol.Slug.Context.EXECUTING_QUERY;
 import static io.trino.server.security.ResourceSecurity.AccessType.PUBLIC;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 
 @Path("/v1/statement/executing")
 public class ExecutingStatementResource
@@ -120,11 +118,7 @@ public ExecutingStatementResource(
                     try {
                         for (QueryId queryId : queries.keySet()) {
                             // forget about this query if the query manager is no longer tracking it
-                            try {
-                                queryManager.getQueryState(queryId);
-                            }
-                            catch (NoSuchElementException e) {
-                                // query is no longer registered
+                            if (!queryManager.hasQuery(queryId)) {
                                 Query query = queries.remove(queryId);
                                 if (query != null) {
                                     query.dispose();
@@ -225,52 +219,56 @@ private void asyncQueryResults(
         else {
             targetResultSize = Ordering.natural().min(targetResultSize, MAX_TARGET_RESULT_SIZE);
         }
-        ListenableFuture<QueryResults> queryResultsFuture = query.waitForResults(token, uriInfo, wait, targetResultSize);
+        ListenableFuture<QueryResultsResponse> queryResultsFuture = query.waitForResults(token, uriInfo, wait, targetResultSize);
 
-        ListenableFuture<Response> response = Futures.transform(queryResultsFuture, queryResults -> toResponse(query, queryResults), directExecutor());
+        ListenableFuture<Response> response = Futures.transform(queryResultsFuture, this::toResponse, directExecutor());
 
         bindAsyncResponse(asyncResponse, response, responseExecutor);
     }
 
-    private Response toResponse(Query query, QueryResults queryResults)
+    private Response toResponse(QueryResultsResponse resultsResponse)
     {
-        ResponseBuilder response = Response.ok(queryResults);
-
-        ProtocolHeaders protocolHeaders = query.getProtocolHeaders();
-        query.getSetCatalog().ifPresent(catalog -> response.header(protocolHeaders.responseSetCatalog(), catalog));
-        query.getSetSchema().ifPresent(schema -> response.header(protocolHeaders.responseSetSchema(), schema));
-        query.getSetPath().ifPresent(path -> response.header(protocolHeaders.responseSetPath(), path));
+        ResponseBuilder response = Response.ok(resultsResponse.queryResults());
+
+        ProtocolHeaders protocolHeaders = resultsResponse.protocolHeaders();
+        resultsResponse.setCatalog().ifPresent(catalog -> response.header(protocolHeaders.responseSetCatalog(), catalog));
+        resultsResponse.setSchema().ifPresent(schema -> response.header(protocolHeaders.responseSetSchema(), schema));
+        resultsResponse.setPath().ifPresent(path -> response.header(protocolHeaders.responseSetPath(), path));
+        resultsResponse.setAuthorizationUser().ifPresent(authorizationUser -> response.header(protocolHeaders.responseSetAuthorizationUser(), authorizationUser));
+        if (resultsResponse.resetAuthorizationUser()) {
+            response.header(protocolHeaders.responseResetAuthorizationUser(), true);
+        }
 
         // add set session properties
-        query.getSetSessionProperties()
+        resultsResponse.setSessionProperties()
                 .forEach((key, value) -> response.header(protocolHeaders.responseSetSession(), key + '=' + urlEncode(value)));
 
         // add clear session properties
-        query.getResetSessionProperties()
+        resultsResponse.resetSessionProperties()
                 .forEach(name -> response.header(protocolHeaders.responseClearSession(), name));
 
         // add set roles
-        query.getSetRoles()
+        resultsResponse.setRoles()
                 .forEach((key, value) -> response.header(protocolHeaders.responseSetRole(), key + '=' + urlEncode(value.toString())));
 
         // add added prepare statements
-        for (Entry<String, String> entry : query.getAddedPreparedStatements().entrySet()) {
+        for (Entry<String, String> entry : resultsResponse.addedPreparedStatements().entrySet()) {
             String encodedKey = urlEncode(entry.getKey());
             String encodedValue = urlEncode(preparedStatementEncoder.encodePreparedStatementForHeader(entry.getValue()));
             response.header(protocolHeaders.responseAddedPrepare(), encodedKey + '=' + encodedValue);
         }
 
         // add deallocated prepare statements
-        for (String name : query.getDeallocatedPreparedStatements()) {
+        for (String name : resultsResponse.deallocatedPreparedStatements()) {
             response.header(protocolHeaders.responseDeallocatedPrepare(), urlEncode(name));
         }
 
         // add new transaction ID
-        query.getStartedTransactionId()
+        resultsResponse.startedTransactionId()
                 .ifPresent(transactionId -> response.header(protocolHeaders.responseStartedTransactionId(), transactionId));
 
         // add clear transaction ID directive
-        if (query.isClearTransactionId()) {
+        if (resultsResponse.clearTransactionId()) {
             response.header(protocolHeaders.responseClearTransactionId(), true);
         }
 
diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/PreparedStatementEncoder.java b/core/trino-main/src/main/java/io/trino/server/protocol/PreparedStatementEncoder.java
index 51f57e3d5ba1..2d7cb3741c56 100644
--- a/core/trino-main/src/main/java/io/trino/server/protocol/PreparedStatementEncoder.java
+++ b/core/trino-main/src/main/java/io/trino/server/protocol/PreparedStatementEncoder.java
@@ -13,12 +13,11 @@
  */
 package io.trino.server.protocol;
 
+import com.google.inject.Inject;
 import io.airlift.compress.zstd.ZstdCompressor;
 import io.airlift.compress.zstd.ZstdDecompressor;
 import io.trino.server.ProtocolConfig;
 
-import javax.inject.Inject;
-
 import static com.google.common.io.BaseEncoding.base64Url;
 import static java.lang.Math.toIntExact;
 import static java.nio.charset.StandardCharsets.UTF_8;
diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/ProtocolUtil.java b/core/trino-main/src/main/java/io/trino/server/protocol/ProtocolUtil.java
index a372bd3502c3..3ebda5abdee1 100644
--- a/core/trino-main/src/main/java/io/trino/server/protocol/ProtocolUtil.java
+++ b/core/trino-main/src/main/java/io/trino/server/protocol/ProtocolUtil.java
@@ -179,6 +179,8 @@ public static StatementStats toStatementStats(QueryInfo queryInfo)
                 .setState(queryInfo.getState().toString())
                 .setQueued(queryInfo.getState() == QueryState.QUEUED)
                 .setScheduled(queryInfo.isScheduled())
+                .setProgressPercentage(queryInfo.getProgressPercentage())
+                .setRunningPercentage(queryInfo.getRunningPercentage())
                 .setNodes(globalUniqueNodes.size())
                 .setTotalSplits(queryStats.getTotalDrivers())
                 .setQueuedSplits(queryStats.getQueuedDrivers())
@@ -191,6 +193,7 @@ public static StatementStats toStatementStats(QueryInfo queryInfo)
                 .setProcessedRows(queryStats.getRawInputPositions())
                 .setProcessedBytes(queryStats.getRawInputDataSize().toBytes())
                 .setPhysicalInputBytes(queryStats.getPhysicalInputDataSize().toBytes())
+                .setPhysicalWrittenBytes(queryStats.getPhysicalWrittenDataSize().toBytes())
                 .setPeakMemoryBytes(queryStats.getPeakUserMemoryReservation().toBytes())
                 .setSpilledBytes(queryStats.getSpilledDataSize().toBytes())
                 .setRootStage(rootStageStats)
diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/Query.java b/core/trino-main/src/main/java/io/trino/server/protocol/Query.java
index 344e4816d350..385cd0dc05c0 100644
--- a/core/trino-main/src/main/java/io/trino/server/protocol/Query.java
+++ b/core/trino-main/src/main/java/io/trino/server/protocol/Query.java
@@ -20,6 +20,8 @@
 import com.google.common.util.concurrent.AbstractFuture;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
 import io.airlift.units.DataSize;
@@ -28,7 +30,6 @@
 import io.trino.client.ClientCapabilities;
 import io.trino.client.Column;
 import io.trino.client.FailureInfo;
-import io.trino.client.ProtocolHeaders;
 import io.trino.client.QueryError;
 import io.trino.client.QueryResults;
 import io.trino.exchange.ExchangeDataSource;
@@ -53,12 +54,9 @@
 import io.trino.spi.type.Type;
 import io.trino.transaction.TransactionId;
 import io.trino.util.Ciphers;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
 
 import java.net.URI;
 import java.util.List;
@@ -141,6 +139,12 @@ class Query
     @GuardedBy("this")
     private Optional<String> setPath = Optional.empty();
 
+    @GuardedBy("this")
+    private Optional<String> setAuthorizationUser = Optional.empty();
+
+    @GuardedBy("this")
+    private boolean resetAuthorizationUser;
+
     @GuardedBy("this")
     private Map<String, String> setSessionProperties = ImmutableMap.of();
 
@@ -273,76 +277,23 @@ public QueryInfo getQueryInfo()
         return queryManager.getFullQueryInfo(queryId);
     }
 
-    public ProtocolHeaders getProtocolHeaders()
+    public ListenableFuture<QueryResultsResponse> waitForResults(long token, UriInfo uriInfo, Duration wait, DataSize targetResultSize)
     {
-        return session.getProtocolHeaders();
-    }
-
-    public synchronized Optional<String> getSetCatalog()
-    {
-        return setCatalog;
-    }
-
-    public synchronized Optional<String> getSetSchema()
-    {
-        return setSchema;
-    }
-
-    public synchronized Optional<String> getSetPath()
-    {
-        return setPath;
-    }
-
-    public synchronized Map<String, String> getSetSessionProperties()
-    {
-        return setSessionProperties;
-    }
-
-    public synchronized Set<String> getResetSessionProperties()
-    {
-        return resetSessionProperties;
-    }
-
-    public synchronized Map<String, SelectedRole> getSetRoles()
-    {
-        return setRoles;
-    }
-
-    public synchronized Map<String, String> getAddedPreparedStatements()
-    {
-        return addedPreparedStatements;
-    }
-
-    public synchronized Set<String> getDeallocatedPreparedStatements()
-    {
-        return deallocatedPreparedStatements;
-    }
-
-    public synchronized Optional<TransactionId> getStartedTransactionId()
-    {
-        return startedTransactionId;
-    }
-
-    public synchronized boolean isClearTransactionId()
-    {
-        return clearTransactionId;
-    }
-
-    public synchronized ListenableFuture<QueryResults> waitForResults(long token, UriInfo uriInfo, Duration wait, DataSize targetResultSize)
-    {
-        // before waiting, check if this request has already been processed and cached
-        Optional<QueryResults> cachedResult = getCachedResult(token);
-        if (cachedResult.isPresent()) {
-            return immediateFuture(cachedResult.get());
+        ListenableFuture<Void> futureStateChange;
+        synchronized (this) {
+            // before waiting, check if this request has already been processed and cached
+            Optional<QueryResults> cachedResult = getCachedResult(token);
+            if (cachedResult.isPresent()) {
+                return immediateFuture(toResultsResponse(cachedResult.get()));
+            }
+            // release the lock eagerly after acquiring the future to avoid contending with callback threads
+            futureStateChange = getFutureStateChange();
         }
 
         // wait for a results data or query to finish, up to the wait timeout
-        ListenableFuture<Void> futureStateChange = addTimeout(
-                getFutureStateChange(),
-                () -> null,
-                wait,
-                timeoutExecutor);
-
+        if (!futureStateChange.isDone()) {
+            futureStateChange = addTimeout(futureStateChange, () -> null, wait, timeoutExecutor);
+        }
         // when state changes, fetch the next result
         return Futures.transform(futureStateChange, ignored -> getNextResult(token, uriInfo, targetResultSize), resultsProcessorExecutor);
     }
@@ -447,12 +398,12 @@ private synchronized Optional<QueryResults> getCachedResult(long token)
         return Optional.empty();
     }
 
-    private synchronized QueryResults getNextResult(long token, UriInfo uriInfo, DataSize targetResultSize)
+    private synchronized QueryResultsResponse getNextResult(long token, UriInfo uriInfo, DataSize targetResultSize)
     {
         // check if the result for the token have already been created
         Optional<QueryResults> cachedResult = getCachedResult(token);
         if (cachedResult.isPresent()) {
-            return cachedResult.get();
+            return toResultsResponse(cachedResult.get());
         }
 
         verify(nextToken.isPresent(), "Cannot generate next result when next token is not present");
@@ -463,10 +414,16 @@ private synchronized QueryResults getNextResult(long token, UriInfo uriInfo, Dat
         QueryInfo queryInfo = queryManager.getFullQueryInfo(queryId);
         queryManager.recordHeartbeat(queryId);
 
-        closeExchangeIfNecessary(queryInfo);
-
-        // fetch result data from exchange
-        QueryResultRows resultRows = removePagesFromExchange(queryInfo, targetResultSize.toBytes());
+        boolean isStarted = queryInfo.getState().ordinal() > QueryState.STARTING.ordinal();
+        QueryResultRows resultRows;
+        if (isStarted) {
+            closeExchangeIfNecessary(queryInfo);
+            // fetch result data from exchange
+            resultRows = removePagesFromExchange(queryInfo, targetResultSize.toBytes());
+        }
+        else {
+            resultRows = queryResultRowsBuilder(session).build();
+        }
 
         if ((queryInfo.getUpdateType() != null) && (updateCount == null)) {
             // grab the update count for non-queries
@@ -474,7 +431,7 @@ private synchronized QueryResults getNextResult(long token, UriInfo uriInfo, Dat
             updateCount = updatedRowsCount.orElse(null);
         }
 
-        if (queryInfo.getOutputStage().isEmpty() || exchangeDataSource.isFinished()) {
+        if (isStarted && (queryInfo.getOutputStage().isEmpty() || exchangeDataSource.isFinished())) {
             queryManager.resultsConsumed(queryId);
             resultsConsumed = true;
             // update query since the query might have been transitioned to the FINISHED state
@@ -512,6 +469,10 @@ private synchronized QueryResults getNextResult(long token, UriInfo uriInfo, Dat
         setSchema = queryInfo.getSetSchema();
         setPath = queryInfo.getSetPath();
 
+        // update setAuthorizationUser
+        setAuthorizationUser = queryInfo.getSetAuthorizationUser();
+        resetAuthorizationUser = queryInfo.isResetAuthorizationUser();
+
         // update setSessionProperties
         setSessionProperties = queryInfo.getSetSessionProperties();
         resetSessionProperties = queryInfo.getResetSessionProperties();
@@ -545,7 +506,26 @@ private synchronized QueryResults getNextResult(long token, UriInfo uriInfo, Dat
         lastToken = token;
         lastResult = queryResults;
 
-        return queryResults;
+        return toResultsResponse(queryResults);
+    }
+
+    private synchronized QueryResultsResponse toResultsResponse(QueryResults queryResults)
+    {
+        return new QueryResultsResponse(
+                setCatalog,
+                setSchema,
+                setPath,
+                setAuthorizationUser,
+                resetAuthorizationUser,
+                setSessionProperties,
+                resetSessionProperties,
+                setRoles,
+                addedPreparedStatements,
+                deallocatedPreparedStatements,
+                startedTransactionId,
+                clearTransactionId,
+                session.getProtocolHeaders(),
+                queryResults);
     }
 
     private synchronized QueryResultRows removePagesFromExchange(QueryInfo queryInfo, long targetResultBytes)
diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/QueryInfoUrlFactory.java b/core/trino-main/src/main/java/io/trino/server/protocol/QueryInfoUrlFactory.java
index 531620d36058..6cfbb2c4f330 100644
--- a/core/trino-main/src/main/java/io/trino/server/protocol/QueryInfoUrlFactory.java
+++ b/core/trino-main/src/main/java/io/trino/server/protocol/QueryInfoUrlFactory.java
@@ -13,11 +13,10 @@
  */
 package io.trino.server.protocol;
 
+import com.google.inject.Inject;
 import io.trino.server.ServerConfig;
 import io.trino.spi.QueryId;
-
-import javax.inject.Inject;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriInfo;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/QueryResultRows.java b/core/trino-main/src/main/java/io/trino/server/protocol/QueryResultRows.java
index 9de1ffaa3c4c..2fcaab646aa2 100644
--- a/core/trino-main/src/main/java/io/trino/server/protocol/QueryResultRows.java
+++ b/core/trino-main/src/main/java/io/trino/server/protocol/QueryResultRows.java
@@ -37,8 +37,7 @@
 import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.TimestampWithTimeZoneType;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/QueryResultsResponse.java b/core/trino-main/src/main/java/io/trino/server/protocol/QueryResultsResponse.java
new file mode 100644
index 000000000000..4387fd9f405b
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/server/protocol/QueryResultsResponse.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed 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 io.trino.server.protocol;
+
+import io.trino.client.ProtocolHeaders;
+import io.trino.client.QueryResults;
+import io.trino.spi.security.SelectedRole;
+import io.trino.transaction.TransactionId;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static java.util.Objects.requireNonNull;
+
+record QueryResultsResponse(
+        Optional<String> setCatalog,
+        Optional<String> setSchema,
+        Optional<String> setPath,
+        Optional<String> setAuthorizationUser,
+        boolean resetAuthorizationUser,
+        Map<String, String> setSessionProperties,
+        Set<String> resetSessionProperties,
+        Map<String, SelectedRole> setRoles,
+        Map<String, String> addedPreparedStatements,
+        Set<String> deallocatedPreparedStatements,
+        Optional<TransactionId> startedTransactionId,
+        boolean clearTransactionId,
+        ProtocolHeaders protocolHeaders,
+        QueryResults queryResults)
+{
+    QueryResultsResponse {
+        requireNonNull(setCatalog, "setCatalog is null");
+        requireNonNull(setSchema, "setSchema is null");
+        requireNonNull(setPath, "setPath is null");
+        requireNonNull(setAuthorizationUser, "setAuthorizationUser is null");
+        requireNonNull(setSessionProperties, "setSessionProperties is null");
+        requireNonNull(resetSessionProperties, "resetSessionProperties is null");
+        requireNonNull(setRoles, "setRoles is null");
+        requireNonNull(addedPreparedStatements, "addedPreparedStatements is null");
+        requireNonNull(deallocatedPreparedStatements, "deallocatedPreparedStatements is null");
+        requireNonNull(startedTransactionId, "startedTransactionId is null");
+        requireNonNull(protocolHeaders, "protocolHeaders is null");
+        requireNonNull(queryResults, "queryResults is null");
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/server/remotetask/Backoff.java b/core/trino-main/src/main/java/io/trino/server/remotetask/Backoff.java
index e56faa687804..92981049b971 100644
--- a/core/trino-main/src/main/java/io/trino/server/remotetask/Backoff.java
+++ b/core/trino-main/src/main/java/io/trino/server/remotetask/Backoff.java
@@ -16,10 +16,9 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.units.Duration;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/server/remotetask/ContinuousTaskStatusFetcher.java b/core/trino-main/src/main/java/io/trino/server/remotetask/ContinuousTaskStatusFetcher.java
index 22994843ab40..0f44d41c442f 100644
--- a/core/trino-main/src/main/java/io/trino/server/remotetask/ContinuousTaskStatusFetcher.java
+++ b/core/trino-main/src/main/java/io/trino/server/remotetask/ContinuousTaskStatusFetcher.java
@@ -15,6 +15,7 @@
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.concurrent.SetThreadName;
 import io.airlift.http.client.FullJsonResponseHandler;
 import io.airlift.http.client.HttpClient;
@@ -22,18 +23,18 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.SpanBuilder;
 import io.trino.execution.StateMachine;
 import io.trino.execution.TaskId;
 import io.trino.execution.TaskStatus;
 import io.trino.spi.HostAddress;
 import io.trino.spi.TrinoException;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
@@ -62,6 +63,7 @@ class ContinuousTaskStatusFetcher
     private final Duration refreshMaxWait;
     private final Executor executor;
     private final HttpClient httpClient;
+    private final Supplier<SpanBuilder> spanBuilderFactory;
     private final RequestErrorTracker errorTracker;
     private final RemoteTaskStats stats;
 
@@ -79,6 +81,7 @@ public ContinuousTaskStatusFetcher(
             DynamicFiltersFetcher dynamicFiltersFetcher,
             Executor executor,
             HttpClient httpClient,
+            Supplier<SpanBuilder> spanBuilderFactory,
             Duration maxErrorDuration,
             ScheduledExecutorService errorScheduledExecutor,
             RemoteTaskStats stats)
@@ -95,6 +98,7 @@ public ContinuousTaskStatusFetcher(
 
         this.executor = requireNonNull(executor, "executor is null");
         this.httpClient = requireNonNull(httpClient, "httpClient is null");
+        this.spanBuilderFactory = requireNonNull(spanBuilderFactory, "spanBuilderFactory is null");
 
         this.errorTracker = new RequestErrorTracker(taskId, initialTaskStatus.getSelf(), maxErrorDuration, errorScheduledExecutor, "getting task status");
         this.stats = requireNonNull(stats, "stats is null");
@@ -146,6 +150,7 @@ private synchronized void scheduleNextRequest()
                 .setHeader(CONTENT_TYPE, JSON_UTF_8.toString())
                 .setHeader(TRINO_CURRENT_VERSION, Long.toString(taskStatus.getVersion()))
                 .setHeader(TRINO_MAX_WAIT, refreshMaxWait.toString())
+                .setSpanBuilder(spanBuilderFactory.get())
                 .build();
 
         errorTracker.startRequest();
diff --git a/core/trino-main/src/main/java/io/trino/server/remotetask/DynamicFiltersFetcher.java b/core/trino-main/src/main/java/io/trino/server/remotetask/DynamicFiltersFetcher.java
index cdb88244b289..940f4d448a8e 100644
--- a/core/trino-main/src/main/java/io/trino/server/remotetask/DynamicFiltersFetcher.java
+++ b/core/trino-main/src/main/java/io/trino/server/remotetask/DynamicFiltersFetcher.java
@@ -14,22 +14,23 @@
 package io.trino.server.remotetask;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.concurrent.SetThreadName;
 import io.airlift.http.client.FullJsonResponseHandler.JsonResponse;
 import io.airlift.http.client.HttpClient;
 import io.airlift.http.client.Request;
 import io.airlift.json.JsonCodec;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.SpanBuilder;
 import io.trino.execution.DynamicFiltersCollector.VersionedDynamicFilterDomains;
 import io.trino.execution.TaskId;
 import io.trino.server.DynamicFilterService;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.net.URI;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
 import static com.google.common.net.MediaType.JSON_UTF_8;
@@ -52,6 +53,7 @@ class DynamicFiltersFetcher
     private final Duration refreshMaxWait;
     private final Executor executor;
     private final HttpClient httpClient;
+    private final Supplier<SpanBuilder> spanBuilderFactory;
     private final RequestErrorTracker errorTracker;
     private final RemoteTaskStats stats;
     private final DynamicFilterService dynamicFilterService;
@@ -73,6 +75,7 @@ public DynamicFiltersFetcher(
             JsonCodec<VersionedDynamicFilterDomains> dynamicFilterDomainsCodec,
             Executor executor,
             HttpClient httpClient,
+            Supplier<SpanBuilder> spanBuilderFactory,
             Duration maxErrorDuration,
             ScheduledExecutorService errorScheduledExecutor,
             RemoteTaskStats stats,
@@ -87,6 +90,7 @@ public DynamicFiltersFetcher(
 
         this.executor = requireNonNull(executor, "executor is null");
         this.httpClient = requireNonNull(httpClient, "httpClient is null");
+        this.spanBuilderFactory = requireNonNull(spanBuilderFactory, "spanBuilderFactory is null");
 
         this.errorTracker = new RequestErrorTracker(taskId, taskUri, maxErrorDuration, errorScheduledExecutor, "getting dynamic filter domains");
         this.stats = requireNonNull(stats, "stats is null");
@@ -142,6 +146,7 @@ private synchronized void fetchDynamicFiltersIfNecessary()
                 .setHeader(CONTENT_TYPE, JSON_UTF_8.toString())
                 .setHeader(TRINO_CURRENT_VERSION, Long.toString(localDynamicFiltersVersion))
                 .setHeader(TRINO_MAX_WAIT, refreshMaxWait.toString())
+                .setSpanBuilder(spanBuilderFactory.get())
                 .build();
 
         errorTracker.startRequest();
diff --git a/core/trino-main/src/main/java/io/trino/server/remotetask/HttpLocationFactory.java b/core/trino-main/src/main/java/io/trino/server/remotetask/HttpLocationFactory.java
index 20f0ea40a37e..6e68a36bc5a3 100644
--- a/core/trino-main/src/main/java/io/trino/server/remotetask/HttpLocationFactory.java
+++ b/core/trino-main/src/main/java/io/trino/server/remotetask/HttpLocationFactory.java
@@ -13,6 +13,7 @@
  */
 package io.trino.server.remotetask;
 
+import com.google.inject.Inject;
 import io.airlift.http.server.HttpServerInfo;
 import io.trino.execution.LocationFactory;
 import io.trino.execution.TaskId;
@@ -21,8 +22,6 @@
 import io.trino.server.InternalCommunicationConfig;
 import io.trino.spi.QueryId;
 
-import javax.inject.Inject;
-
 import java.net.URI;
 
 import static io.airlift.http.client.HttpUriBuilder.uriBuilderFrom;
diff --git a/core/trino-main/src/main/java/io/trino/server/remotetask/HttpRemoteTask.java b/core/trino-main/src/main/java/io/trino/server/remotetask/HttpRemoteTask.java
index 9e59b6bec98d..371f83e67d31 100644
--- a/core/trino-main/src/main/java/io/trino/server/remotetask/HttpRemoteTask.java
+++ b/core/trino-main/src/main/java/io/trino/server/remotetask/HttpRemoteTask.java
@@ -24,6 +24,7 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.concurrent.SetThreadName;
 import io.airlift.http.client.FullJsonResponseHandler.JsonResponse;
 import io.airlift.http.client.HttpClient;
@@ -33,6 +34,10 @@
 import io.airlift.log.Logger;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
 import io.trino.Session;
 import io.trino.execution.DynamicFiltersCollector;
 import io.trino.execution.DynamicFiltersCollector.VersionedDynamicFilterDomains;
@@ -64,10 +69,9 @@
 import io.trino.sql.planner.plan.DynamicFilterId;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.PlanNodeId;
+import io.trino.tracing.TrinoAttributes;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.net.URI;
 import java.util.Collection;
 import java.util.Comparator;
@@ -128,12 +132,16 @@ public final class HttpRemoteTask
     private final TaskId taskId;
 
     private final Session session;
+    private final Span stageSpan;
     private final String nodeId;
+    private final AtomicBoolean speculative;
     private final PlanFragment planFragment;
 
     private final AtomicLong nextSplitId = new AtomicLong();
 
     private final RemoteTaskStats stats;
+    private final Tracer tracer;
+    private final Span span;
     private final TaskInfoFetcher taskInfoFetcher;
     private final ContinuousTaskStatusFetcher taskStatusFetcher;
     private final DynamicFiltersFetcher dynamicFiltersFetcher;
@@ -196,8 +204,10 @@ public final class HttpRemoteTask
 
     public HttpRemoteTask(
             Session session,
+            Span stageSpan,
             TaskId taskId,
             String nodeId,
+            boolean speculative,
             URI location,
             PlanFragment planFragment,
             Multimap<PlanNodeId, Split> initialSplits,
@@ -217,12 +227,14 @@ public HttpRemoteTask(
             JsonCodec<TaskUpdateRequest> taskUpdateRequestCodec,
             JsonCodec<FailTaskRequest> failTaskRequestCodec,
             PartitionedSplitCountTracker partitionedSplitCountTracker,
+            Tracer tracer,
             RemoteTaskStats stats,
             DynamicFilterService dynamicFilterService,
             Set<DynamicFilterId> outboundDynamicFilterIds,
             Optional<DataSize> estimatedMemory)
     {
         requireNonNull(session, "session is null");
+        requireNonNull(stageSpan, "stageSpan is null");
         requireNonNull(taskId, "taskId is null");
         requireNonNull(nodeId, "nodeId is null");
         requireNonNull(location, "location is null");
@@ -241,7 +253,9 @@ public HttpRemoteTask(
         try (SetThreadName ignored = new SetThreadName("HttpRemoteTask-%s", taskId)) {
             this.taskId = taskId;
             this.session = session;
+            this.stageSpan = stageSpan;
             this.nodeId = nodeId;
+            this.speculative = new AtomicBoolean(speculative);
             this.planFragment = planFragment;
             this.outputBuffers.set(outputBuffers);
             this.httpClient = httpClient;
@@ -255,6 +269,8 @@ public HttpRemoteTask(
             this.failTaskRequestCodec = failTaskRequestCodec;
             this.updateErrorTracker = new RequestErrorTracker(taskId, location, maxErrorDuration, errorScheduledExecutor, "updating task");
             this.partitionedSplitCountTracker = requireNonNull(partitionedSplitCountTracker, "partitionedSplitCountTracker is null");
+            this.tracer = requireNonNull(tracer, "tracer is null");
+            this.span = createSpanBuilder("remote-task", stageSpan).startSpan();
             this.stats = stats;
 
             for (Entry<PlanNodeId, Split> entry : initialSplits.entries()) {
@@ -297,7 +313,7 @@ public HttpRemoteTask(
                                 .collect(toImmutableList()));
             }
 
-            TaskInfo initialTask = createInitialTask(taskId, location, nodeId, pipelinedBufferStates, new TaskStats(DateTime.now(), null));
+            TaskInfo initialTask = createInitialTask(taskId, location, nodeId, this.speculative.get(), pipelinedBufferStates, new TaskStats(DateTime.now(), null));
 
             this.dynamicFiltersFetcher = new DynamicFiltersFetcher(
                     this::fatalUnacknowledgedFailure,
@@ -307,6 +323,7 @@ public HttpRemoteTask(
                     dynamicFilterDomainsCodec,
                     executor,
                     httpClient,
+                    () -> createSpanBuilder("task-dynamic-filters", span),
                     maxErrorDuration,
                     errorScheduledExecutor,
                     stats,
@@ -320,6 +337,7 @@ public HttpRemoteTask(
                     dynamicFiltersFetcher,
                     executor,
                     httpClient,
+                    () -> createSpanBuilder("task-status", span),
                     maxErrorDuration,
                     errorScheduledExecutor,
                     stats);
@@ -329,6 +347,7 @@ public HttpRemoteTask(
                     taskStatusFetcher,
                     initialTask,
                     httpClient,
+                    () -> createSpanBuilder("task-info", span),
                     taskInfoUpdateInterval,
                     taskInfoCodec,
                     maxErrorDuration,
@@ -349,6 +368,9 @@ public HttpRemoteTask(
                     partitionedSplitCountTracker.setPartitionedSplits(getPartitionedSplitsInfo());
                     updateSplitQueueSpace();
                 }
+                if (state.isDone()) {
+                    span.end();
+                }
             });
 
             this.outboundDynamicFiltersCollector = new DynamicFiltersCollector(this::triggerUpdate);
@@ -473,6 +495,16 @@ public void setOutputBuffers(OutputBuffers newOutputBuffers)
         }
     }
 
+    @Override
+    public void setSpeculative(boolean speculative)
+    {
+        checkArgument(!speculative, "we can only move task from speculative to non-speculative");
+        if (this.speculative.compareAndSet(true, speculative)) {
+            // versioning should be not needed here as we can only migrate task from speculative to non-speculative; so out of order requests do not matter
+            triggerUpdate();
+        }
+    }
+
     @Override
     public PartitionedSplitsInfo getPartitionedSplitsInfo()
     {
@@ -709,11 +741,13 @@ private void sendUpdate()
         TaskUpdateRequest updateRequest = new TaskUpdateRequest(
                 session.toSessionRepresentation(),
                 session.getIdentity().getExtraCredentials(),
+                stageSpan,
                 fragment,
                 splitAssignments,
                 outputBuffers.get(),
                 dynamicFilterDomains.getDynamicFilterDomains(),
-                session.getExchangeEncryptionKey());
+                session.getExchangeEncryptionKey(),
+                speculative.get());
         byte[] taskUpdateRequestJson = taskUpdateRequestCodec.toJsonBytes(updateRequest);
 
         // try to adjust batch size to meet expected request size
@@ -734,6 +768,7 @@ private void sendUpdate()
                 .setUri(uriBuilder.build())
                 .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.JSON_UTF_8.toString())
                 .setBodyGenerator(createStaticBodyGenerator(taskUpdateRequestJson))
+                .setSpanBuilder(createSpanBuilder("task-update", span))
                 .build();
 
         updateErrorTracker.startRequest();
@@ -895,6 +930,7 @@ private Request buildDeleteTaskRequest(boolean abort)
         HttpUriBuilder uriBuilder = getHttpUriBuilder(getTaskStatus()).addParameter("abort", "" + abort);
         return prepareDelete()
                 .setUri(uriBuilder.build())
+                .setSpanBuilder(createSpanBuilder("task-delete", span))
                 .build();
     }
 
@@ -906,6 +942,7 @@ private Request buildFailTaskRequest(FailTaskRequest failTaskRequest)
                 .setUri(uriBuilder.build())
                 .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.JSON_UTF_8.toString())
                 .setBodyGenerator(createStaticBodyGenerator(failTaskRequestCodec.toJsonBytes(failTaskRequest)))
+                .setSpanBuilder(createSpanBuilder("task-fail", span))
                 .build();
     }
 
@@ -923,7 +960,7 @@ public void onSuccess(JsonResponse<TaskInfo> result)
                     // if cleanup operation has not at least started task termination, mark the task failed
                     TaskState taskState = getTaskInfo().getTaskStatus().getState();
                     if (!taskState.isTerminatingOrDone()) {
-                        fatalUnacknowledgedFailure(new TrinoTransportException(REMOTE_TASK_ERROR, fromUri(request.getUri()), format("Unable to %s task at %s, last known state was: %s", action, request.getUri(), taskState)));
+                        fatalAsyncCleanupFailure(new TrinoTransportException(REMOTE_TASK_ERROR, fromUri(request.getUri()), format("Unable to %s task at %s, last known state was: %s", action, request.getUri(), taskState)));
                     }
                 }
             }
@@ -940,7 +977,7 @@ public void onFailure(Throwable t)
                 if (t instanceof RejectedExecutionException && httpClient.isClosed()) {
                     String message = format("Unable to %s task at %s. HTTP client is closed.", action, request.getUri());
                     logError(t, message);
-                    fatalUnacknowledgedFailure(new TrinoTransportException(REMOTE_TASK_ERROR, fromUri(request.getUri()), message));
+                    fatalAsyncCleanupFailure(new TrinoTransportException(REMOTE_TASK_ERROR, fromUri(request.getUri()), message));
                     return;
                 }
 
@@ -948,7 +985,7 @@ public void onFailure(Throwable t)
                 if (cleanupBackoff.failure()) {
                     String message = format("Unable to %s task at %s. Back off depleted.", action, request.getUri());
                     logError(t, message);
-                    fatalUnacknowledgedFailure(new TrinoTransportException(REMOTE_TASK_ERROR, fromUri(request.getUri()), message));
+                    fatalAsyncCleanupFailure(new TrinoTransportException(REMOTE_TASK_ERROR, fromUri(request.getUri()), message));
                     return;
                 }
 
@@ -961,6 +998,29 @@ public void onFailure(Throwable t)
                     errorScheduledExecutor.schedule(() -> doScheduleAsyncCleanupRequest(cleanupBackoff, request, action), delayNanos, NANOSECONDS);
                 }
             }
+
+            private void fatalAsyncCleanupFailure(TrinoTransportException cause)
+            {
+                synchronized (HttpRemoteTask.this) {
+                    try (SetThreadName ignored = new SetThreadName("HttpRemoteTask-%s", taskId)) {
+                        TaskStatus taskStatus = getTaskStatus();
+                        if (taskStatus.getState().isDone()) {
+                            log.warn("Task %s already in terminal state %s; cannot overwrite with FAILED due to %s",
+                                    taskStatus.getTaskId(),
+                                    taskStatus.getState(),
+                                    cause);
+                        }
+                        else {
+                            List<ExecutionFailureInfo> failures = ImmutableList.<ExecutionFailureInfo>builderWithExpectedSize(taskStatus.getFailures().size() + 1)
+                                    .add(toFailure(cause))
+                                    .addAll(taskStatus.getFailures())
+                                    .build();
+                            taskStatus = failWith(taskStatus, FAILED, failures);
+                        }
+                        updateTaskInfo(getTaskInfo().withTaskStatus(taskStatus));
+                    }
+                }
+            }
         }, executor);
     }
 
@@ -1052,6 +1112,15 @@ private HttpUriBuilder getHttpUriBuilder(TaskStatus taskStatus)
         return uriBuilder;
     }
 
+    private SpanBuilder createSpanBuilder(String name, Span parent)
+    {
+        return tracer.spanBuilder(name)
+                .setParent(Context.current().with(parent))
+                .setAttribute(TrinoAttributes.QUERY_ID, taskId.getQueryId().toString())
+                .setAttribute(TrinoAttributes.STAGE_ID, taskId.getStageId().toString())
+                .setAttribute(TrinoAttributes.TASK_ID, taskId.toString());
+    }
+
     @Override
     public String toString()
     {
diff --git a/core/trino-main/src/main/java/io/trino/server/remotetask/RemoteTaskStats.java b/core/trino-main/src/main/java/io/trino/server/remotetask/RemoteTaskStats.java
index 11dc62f62293..b8694558bf2c 100644
--- a/core/trino-main/src/main/java/io/trino/server/remotetask/RemoteTaskStats.java
+++ b/core/trino-main/src/main/java/io/trino/server/remotetask/RemoteTaskStats.java
@@ -14,12 +14,11 @@
 package io.trino.server.remotetask;
 
 import com.google.common.util.concurrent.AtomicDouble;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.stats.DistributionStat;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 public class RemoteTaskStats
 {
     private final IncrementalAverage updateRoundTripMillis = new IncrementalAverage();
diff --git a/core/trino-main/src/main/java/io/trino/server/remotetask/RequestErrorTracker.java b/core/trino-main/src/main/java/io/trino/server/remotetask/RequestErrorTracker.java
index d8cb573c3a94..4a287d097394 100644
--- a/core/trino-main/src/main/java/io/trino/server/remotetask/RequestErrorTracker.java
+++ b/core/trino-main/src/main/java/io/trino/server/remotetask/RequestErrorTracker.java
@@ -15,6 +15,7 @@
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.event.client.ServiceUnavailableException;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
@@ -22,8 +23,6 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.TrinoTransportException;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.io.EOFException;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
diff --git a/core/trino-main/src/main/java/io/trino/server/remotetask/TaskInfoFetcher.java b/core/trino-main/src/main/java/io/trino/server/remotetask/TaskInfoFetcher.java
index 2b446fd0b991..2f71e1a61dc3 100644
--- a/core/trino-main/src/main/java/io/trino/server/remotetask/TaskInfoFetcher.java
+++ b/core/trino-main/src/main/java/io/trino/server/remotetask/TaskInfoFetcher.java
@@ -15,14 +15,17 @@
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.concurrent.SetThreadName;
 import io.airlift.http.client.FullJsonResponseHandler;
 import io.airlift.http.client.HttpClient;
 import io.airlift.http.client.HttpUriBuilder;
 import io.airlift.http.client.Request;
 import io.airlift.json.JsonCodec;
+import io.airlift.log.Logger;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.SpanBuilder;
 import io.trino.execution.StateMachine;
 import io.trino.execution.StateMachine.StateChangeListener;
 import io.trino.execution.TaskId;
@@ -31,8 +34,6 @@
 import io.trino.execution.TaskStatus;
 import io.trino.execution.buffer.SpoolingOutputStats;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.net.URI;
 import java.util.Optional;
 import java.util.concurrent.Executor;
@@ -42,6 +43,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
@@ -55,6 +57,8 @@
 
 public class TaskInfoFetcher
 {
+    private static final Logger log = Logger.get(TaskInfoFetcher.class);
+
     private final TaskId taskId;
     private final Consumer<Throwable> onFail;
     private final ContinuousTaskStatusFetcher taskStatusFetcher;
@@ -68,6 +72,7 @@ public class TaskInfoFetcher
 
     private final Executor executor;
     private final HttpClient httpClient;
+    private final Supplier<SpanBuilder> spanBuilderFactory;
     private final RequestErrorTracker errorTracker;
 
     private final boolean summarizeTaskInfo;
@@ -90,6 +95,7 @@ public TaskInfoFetcher(
             ContinuousTaskStatusFetcher taskStatusFetcher,
             TaskInfo initialTask,
             HttpClient httpClient,
+            Supplier<SpanBuilder> spanBuilderFactory,
             Duration updateInterval,
             JsonCodec<TaskInfo> taskInfoCodec,
             Duration maxErrorDuration,
@@ -118,6 +124,7 @@ public TaskInfoFetcher(
 
         this.executor = requireNonNull(executor, "executor is null");
         this.httpClient = requireNonNull(httpClient, "httpClient is null");
+        this.spanBuilderFactory = requireNonNull(spanBuilderFactory, "spanBuilderFactory is null");
         this.stats = requireNonNull(stats, "stats is null");
         this.estimatedMemory = requireNonNull(estimatedMemory, "estimatedMemory is null");
     }
@@ -181,14 +188,20 @@ public SpoolingOutputStats.Snapshot retrieveAndDropSpoolingOutputStats()
     private synchronized void scheduleUpdate()
     {
         scheduledFuture = updateScheduledExecutor.scheduleWithFixedDelay(() -> {
-            synchronized (this) {
-                // if the previous request still running, don't schedule a new request
-                if (future != null && !future.isDone()) {
-                    return;
+            try {
+                synchronized (this) {
+                    // if the previous request still running, don't schedule a new request
+                    if (future != null && !future.isDone()) {
+                        return;
+                    }
+                }
+                if (nanosSince(lastUpdateNanos.get()).toMillis() >= updateIntervalMillis) {
+                    sendNextRequest();
                 }
             }
-            if (nanosSince(lastUpdateNanos.get()).toMillis() >= updateIntervalMillis) {
-                sendNextRequest();
+            catch (Throwable e) {
+                // ignore to avoid getting unscheduled
+                log.error(e, "Unexpected error while getting task info");
             }
         }, 0, 100, MILLISECONDS);
     }
@@ -224,6 +237,7 @@ private synchronized void sendNextRequest()
         Request request = prepareGet()
                 .setUri(uri)
                 .setHeader(CONTENT_TYPE, JSON_UTF_8.toString())
+                .setSpanBuilder(spanBuilderFactory.get())
                 .build();
 
         errorTracker.startRequest();
diff --git a/core/trino-main/src/main/java/io/trino/server/security/AbstractBearerAuthenticator.java b/core/trino-main/src/main/java/io/trino/server/security/AbstractBearerAuthenticator.java
index 5317a120d1d7..72b9624f7ee7 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/AbstractBearerAuthenticator.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/AbstractBearerAuthenticator.java
@@ -15,8 +15,7 @@
 
 import io.jsonwebtoken.JwtException;
 import io.trino.spi.security.Identity;
-
-import javax.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/AuthenticationFilter.java b/core/trino-main/src/main/java/io/trino/server/security/AuthenticationFilter.java
index 52c51d572488..56c8abe0f6f0 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/AuthenticationFilter.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/AuthenticationFilter.java
@@ -15,14 +15,13 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.server.InternalAuthenticationManager;
 import io.trino.spi.security.Identity;
-
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
+import jakarta.annotation.Priority;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
 
 import java.util.Arrays;
 import java.util.LinkedHashSet;
@@ -33,8 +32,8 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.server.ServletSecurityUtils.sendWwwAuthenticate;
 import static io.trino.server.ServletSecurityUtils.setAuthenticatedIdentity;
+import static jakarta.ws.rs.Priorities.AUTHENTICATION;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.Priorities.AUTHENTICATION;
 
 @Priority(AUTHENTICATION)
 public class AuthenticationFilter
diff --git a/core/trino-main/src/main/java/io/trino/server/security/Authenticator.java b/core/trino-main/src/main/java/io/trino/server/security/Authenticator.java
index 9052e9bffed0..b0bc12b560cd 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/Authenticator.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/Authenticator.java
@@ -14,8 +14,7 @@
 package io.trino.server.security;
 
 import io.trino.spi.security.Identity;
-
-import javax.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
 
 public interface Authenticator
 {
diff --git a/core/trino-main/src/main/java/io/trino/server/security/BasicAuthCredentials.java b/core/trino-main/src/main/java/io/trino/server/security/BasicAuthCredentials.java
index fbab95b83ebf..58b969329b22 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/BasicAuthCredentials.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/BasicAuthCredentials.java
@@ -14,8 +14,7 @@
 package io.trino.server.security;
 
 import com.google.common.base.Splitter;
-
-import javax.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
 
 import java.util.Base64;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/CertificateAuthenticator.java b/core/trino-main/src/main/java/io/trino/server/security/CertificateAuthenticator.java
index 6c169699aa63..7d32eeafa3ed 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/CertificateAuthenticator.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/CertificateAuthenticator.java
@@ -14,10 +14,9 @@
 package io.trino.server.security;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.security.Identity;
-
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
 
 import java.security.Principal;
 import java.security.cert.X509Certificate;
@@ -29,7 +28,7 @@
 public class CertificateAuthenticator
         implements Authenticator
 {
-    private static final String X509_ATTRIBUTE = "javax.servlet.request.X509Certificate";
+    private static final String X509_ATTRIBUTE = "jakarta.servlet.request.X509Certificate";
 
     private final CertificateAuthenticatorManager authenticatorManager;
     private final UserMapping userMapping;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/HeaderAuthenticator.java b/core/trino-main/src/main/java/io/trino/server/security/HeaderAuthenticator.java
index 085966b9e036..ccfd12635b3f 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/HeaderAuthenticator.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/HeaderAuthenticator.java
@@ -16,8 +16,7 @@
 import com.google.inject.Inject;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.Identity;
-
-import javax.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
 
 import java.security.Principal;
 import java.util.List;
@@ -46,7 +45,8 @@ public HeaderAuthenticator(HeaderAuthenticatorConfig authenticatorConfig, Header
     }
 
     @Override
-    public Identity authenticate(ContainerRequestContext request) throws AuthenticationException
+    public Identity authenticate(ContainerRequestContext request)
+            throws AuthenticationException
     {
         AuthenticationException exception = null;
         Map<String, List<String>> lowerCasedHeaders = request.getHeaders().entrySet().stream()
diff --git a/core/trino-main/src/main/java/io/trino/server/security/HeaderAuthenticatorConfig.java b/core/trino-main/src/main/java/io/trino/server/security/HeaderAuthenticatorConfig.java
index d07284392d62..eb77187e683f 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/HeaderAuthenticatorConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/HeaderAuthenticatorConfig.java
@@ -17,9 +17,8 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/InsecureAuthenticator.java b/core/trino-main/src/main/java/io/trino/server/security/InsecureAuthenticator.java
index eae696b276c6..9b10d40b0206 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/InsecureAuthenticator.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/InsecureAuthenticator.java
@@ -13,14 +13,13 @@
  */
 package io.trino.server.security;
 
+import com.google.inject.Inject;
 import io.trino.client.ProtocolDetectionException;
 import io.trino.client.ProtocolHeaders;
 import io.trino.server.ProtocolConfig;
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.Identity;
-
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
 
 import java.util.Optional;
 
@@ -59,7 +58,10 @@ public Identity authenticate(ContainerRequestContext request)
         else {
             try {
                 ProtocolHeaders protocolHeaders = detectProtocol(alternateHeaderName, request.getHeaders().keySet());
-                user = emptyToNull(request.getHeaders().getFirst(protocolHeaders.requestUser()));
+                user = emptyToNull(request.getHeaders().getFirst(protocolHeaders.requestOriginalUser()));
+                if (user == null) {
+                    user = emptyToNull(request.getHeaders().getFirst(protocolHeaders.requestUser()));
+                }
             }
             catch (ProtocolDetectionException e) {
                 // ignored
@@ -68,7 +70,7 @@ public Identity authenticate(ContainerRequestContext request)
         }
 
         if (user == null) {
-            throw new AuthenticationException("Basic authentication or " + TRINO_HEADERS.requestUser() + " must be sent", BasicAuthCredentials.AUTHENTICATE_HEADER);
+            throw new AuthenticationException("Basic authentication or " + TRINO_HEADERS.requestOriginalUser() + " or " + TRINO_HEADERS.requestUser() + " must be sent", BasicAuthCredentials.AUTHENTICATE_HEADER);
         }
 
         try {
diff --git a/core/trino-main/src/main/java/io/trino/server/security/KerberosAuthenticator.java b/core/trino-main/src/main/java/io/trino/server/security/KerberosAuthenticator.java
index 3c34e71e4b08..783caecd516a 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/KerberosAuthenticator.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/KerberosAuthenticator.java
@@ -13,9 +13,12 @@
  */
 package io.trino.server.security;
 
+import com.google.inject.Inject;
 import com.sun.security.auth.module.Krb5LoginModule;
 import io.airlift.log.Logger;
 import io.trino.spi.security.Identity;
+import jakarta.annotation.PreDestroy;
+import jakarta.ws.rs.container.ContainerRequestContext;
 import org.ietf.jgss.GSSContext;
 import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSException;
@@ -23,15 +26,12 @@
 import org.ietf.jgss.GSSName;
 import org.ietf.jgss.Oid;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
 import javax.security.auth.Subject;
 import javax.security.auth.kerberos.KerberosPrincipal;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
-import javax.ws.rs.container.ContainerRequestContext;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/KerberosConfig.java b/core/trino-main/src/main/java/io/trino/server/security/KerberosConfig.java
index 1ccb0f942127..45a09ae1dc0c 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/KerberosConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/KerberosConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/PasswordAuthenticator.java b/core/trino-main/src/main/java/io/trino/server/security/PasswordAuthenticator.java
index fbd05896b474..9af26fbbfef7 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/PasswordAuthenticator.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/PasswordAuthenticator.java
@@ -13,14 +13,13 @@
  */
 package io.trino.server.security;
 
+import com.google.inject.Inject;
 import io.trino.client.ProtocolDetectionException;
 import io.trino.server.ProtocolConfig;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.Identity;
-
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.MultivaluedMap;
 
 import java.security.Principal;
 import java.util.Optional;
@@ -95,7 +94,7 @@ private void rewriteUserHeaderToMappedUser(BasicAuthCredentials basicAuthCredent
     {
         String userHeader;
         try {
-            userHeader = detectProtocol(alternateHeaderName, headers.keySet()).requestUser();
+            userHeader = getUserHeader(headers);
         }
         catch (ProtocolDetectionException ignored) {
             // this shouldn't fail here, but ignore and it will be handled elsewhere
@@ -106,6 +105,17 @@ private void rewriteUserHeaderToMappedUser(BasicAuthCredentials basicAuthCredent
         }
     }
 
+    // Extract this out in a method so that the logic of preferring originalUser and fallback on user remains in one place
+    private String getUserHeader(MultivaluedMap<String, String> headers)
+            throws ProtocolDetectionException
+    {
+        String userHeader = detectProtocol(alternateHeaderName, headers.keySet()).requestOriginalUser();
+        if (headers.getFirst(userHeader) == null || headers.getFirst(userHeader).isEmpty()) {
+            userHeader = detectProtocol(alternateHeaderName, headers.keySet()).requestUser();
+        }
+        return userHeader;
+    }
+
     private static AuthenticationException needAuthentication(String message)
     {
         return new AuthenticationException(message, BasicAuthCredentials.AUTHENTICATE_HEADER);
diff --git a/core/trino-main/src/main/java/io/trino/server/security/PasswordAuthenticatorConfig.java b/core/trino-main/src/main/java/io/trino/server/security/PasswordAuthenticatorConfig.java
index 6fb163eb1575..08632a23bc4f 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/PasswordAuthenticatorConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/PasswordAuthenticatorConfig.java
@@ -18,9 +18,8 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/ResourceAccessType.java b/core/trino-main/src/main/java/io/trino/server/security/ResourceAccessType.java
index 0d9c7e9b1e71..9fe79418b358 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/ResourceAccessType.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/ResourceAccessType.java
@@ -14,11 +14,10 @@
 package io.trino.server.security;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.server.security.ResourceSecurity.AccessType;
 import io.trino.server.security.ResourceSecurityBinder.StaticResourceAccessTypeLoader;
-
-import javax.inject.Inject;
-import javax.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.container.ResourceInfo;
 
 import java.lang.reflect.Method;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/ResourceSecurityBinder.java b/core/trino-main/src/main/java/io/trino/server/security/ResourceSecurityBinder.java
index 0fd7b151d894..995ea346bb8f 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/ResourceSecurityBinder.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/ResourceSecurityBinder.java
@@ -15,11 +15,10 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.multibindings.MapBinder;
 import io.trino.server.security.ResourceSecurity.AccessType;
 
-import javax.inject.Inject;
-
 import java.lang.reflect.AnnotatedElement;
 import java.util.Map;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/ResourceSecurityDynamicFeature.java b/core/trino-main/src/main/java/io/trino/server/security/ResourceSecurityDynamicFeature.java
index 02721d5c23d2..2ffe53bdd71a 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/ResourceSecurityDynamicFeature.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/ResourceSecurityDynamicFeature.java
@@ -13,6 +13,7 @@
  */
 package io.trino.server.security;
 
+import com.google.inject.Inject;
 import io.trino.security.AccessControl;
 import io.trino.server.HttpRequestSessionContextFactory;
 import io.trino.server.InternalAuthenticationManager;
@@ -22,19 +23,17 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.Identity;
-
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.Priorities;
-import javax.ws.rs.ServiceUnavailableException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.container.DynamicFeature;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.FeatureContext;
+import jakarta.annotation.Priority;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.Priorities;
+import jakarta.ws.rs.ServiceUnavailableException;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.container.DynamicFeature;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.FeatureContext;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/server/security/SecurityConfig.java b/core/trino-main/src/main/java/io/trino/server/security/SecurityConfig.java
index d438e262a3f8..c547ebb78029 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/SecurityConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/SecurityConfig.java
@@ -18,9 +18,8 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.DefunctConfig;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/jwt/FileSigningKeyResolver.java b/core/trino-main/src/main/java/io/trino/server/security/jwt/FileSigningKeyResolver.java
index 4a866a166c04..60b9c8885bb7 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/jwt/FileSigningKeyResolver.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/jwt/FileSigningKeyResolver.java
@@ -14,6 +14,7 @@
 package io.trino.server.security.jwt;
 
 import com.google.common.base.CharMatcher;
+import com.google.inject.Inject;
 import io.airlift.security.pem.PemReader;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwsHeader;
@@ -23,7 +24,6 @@
 import io.jsonwebtoken.security.SecurityException;
 
 import javax.crypto.spec.SecretKeySpec;
-import javax.inject.Inject;
 
 import java.io.File;
 import java.io.IOException;
@@ -75,12 +75,12 @@ public Key resolveSigningKey(JwsHeader header, Claims claims)
     }
 
     @Override
-    public Key resolveSigningKey(JwsHeader header, String plaintext)
+    public Key resolveSigningKey(JwsHeader header, byte[] plaintext)
     {
         return getKey(header);
     }
 
-    private Key getKey(JwsHeader<?> header)
+    private Key getKey(JwsHeader header)
     {
         SignatureAlgorithm algorithm = SignatureAlgorithm.forName(header.getAlgorithm());
 
@@ -93,7 +93,7 @@ private Key getKey(JwsHeader<?> header)
         return key.getKey(algorithm);
     }
 
-    private static String getKeyId(JwsHeader<?> header)
+    private static String getKeyId(JwsHeader header)
     {
         String keyId = header.getKeyId();
         if (keyId == null) {
@@ -109,7 +109,7 @@ private LoadedKey loadKey(String keyId)
         return loadKeyFile(new File(keyFile.replace(KEY_ID_VARIABLE, keyId)));
     }
 
-    public static LoadedKey loadKeyFile(File file)
+    private static LoadedKey loadKeyFile(File file)
     {
         if (!file.canRead()) {
             throw new SecurityException("Unknown signing key ID");
diff --git a/core/trino-main/src/main/java/io/trino/server/security/jwt/JwkService.java b/core/trino-main/src/main/java/io/trino/server/security/jwt/JwkService.java
index 61880221bbb9..dbc05bb3cdb1 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/jwt/JwkService.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/jwt/JwkService.java
@@ -21,9 +21,9 @@
 import io.airlift.http.client.StringResponseHandler.StringResponse;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import javax.annotation.processing.Generated;
 
 import java.io.IOException;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/jwt/JwkSigningKeyResolver.java b/core/trino-main/src/main/java/io/trino/server/security/jwt/JwkSigningKeyResolver.java
index 51ca571913c8..eda07f2e2aa9 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/jwt/JwkSigningKeyResolver.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/jwt/JwkSigningKeyResolver.java
@@ -39,12 +39,12 @@ public Key resolveSigningKey(JwsHeader header, Claims claims)
     }
 
     @Override
-    public Key resolveSigningKey(JwsHeader header, String plaintext)
+    public Key resolveSigningKey(JwsHeader header, byte[] plaintext)
     {
         return getKey(header);
     }
 
-    private Key getKey(JwsHeader<?> header)
+    private Key getKey(JwsHeader header)
     {
         String keyId = header.getKeyId();
         if (keyId == null) {
diff --git a/core/trino-main/src/main/java/io/trino/server/security/jwt/JwtAuthenticator.java b/core/trino-main/src/main/java/io/trino/server/security/jwt/JwtAuthenticator.java
index d1cda022b68a..2feb792ac7d5 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/jwt/JwtAuthenticator.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/jwt/JwtAuthenticator.java
@@ -13,6 +13,7 @@
  */
 package io.trino.server.security.jwt;
 
+import com.google.inject.Inject;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwtParser;
 import io.jsonwebtoken.JwtParserBuilder;
@@ -23,9 +24,7 @@
 import io.trino.server.security.UserMappingException;
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.Identity;
-
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
 
 import java.util.Collection;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/jwt/JwtAuthenticatorConfig.java b/core/trino-main/src/main/java/io/trino/server/security/jwt/JwtAuthenticatorConfig.java
index 71cf93f186a5..ddd32366bae4 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/jwt/JwtAuthenticatorConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/jwt/JwtAuthenticatorConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/jwt/JwtAuthenticatorSupportModule.java b/core/trino-main/src/main/java/io/trino/server/security/jwt/JwtAuthenticatorSupportModule.java
index bf4801d74aba..79b613d682e6 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/jwt/JwtAuthenticatorSupportModule.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/jwt/JwtAuthenticatorSupportModule.java
@@ -17,12 +17,11 @@
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.airlift.http.client.HttpClient;
 import io.jsonwebtoken.SigningKeyResolver;
 
-import javax.inject.Singleton;
-
 import java.net.URI;
 
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
@@ -54,19 +53,7 @@ private static class JwkModule
         @Override
         public void configure(Binder binder)
         {
-            httpClientBinder(binder)
-                    .bindHttpClient("jwk", ForJwt.class)
-                    // Reset HttpClient default configuration to override InternalCommunicationModule changes.
-                    // Setting a keystore and/or a truststore for internal communication changes the default SSL configuration
-                    // for all clients in the same guice context. This, however, does not make sense for this client which will
-                    // very rarely use the same SSL setup as internal communication, so using the system default truststore
-                    // makes more sense.
-                    .withConfigDefaults(config -> config
-                            .setKeyStorePath(null)
-                            .setKeyStorePassword(null)
-                            .setTrustStorePath(null)
-                            .setTrustStorePassword(null)
-                            .setAutomaticHttpsSharedSecret(null));
+            httpClientBinder(binder).bindHttpClient("jwk", ForJwt.class);
         }
 
         @Provides
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/JweTokenSerializer.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/JweTokenSerializer.java
index 68469303c613..61914aa9a0db 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/JweTokenSerializer.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/JweTokenSerializer.java
@@ -25,11 +25,9 @@
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.CompressionCodec;
-import io.jsonwebtoken.CompressionException;
-import io.jsonwebtoken.Header;
 import io.jsonwebtoken.JwtBuilder;
 import io.jsonwebtoken.JwtParser;
+import io.jsonwebtoken.io.CompressionAlgorithm;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
@@ -40,7 +38,6 @@
 import java.util.Date;
 import java.util.Map;
 
-import static com.google.common.base.Preconditions.checkState;
 import static io.trino.server.security.jwt.JwtUtil.newJwtBuilder;
 import static io.trino.server.security.jwt.JwtUtil.newJwtParserBuilder;
 import static java.lang.String.format;
@@ -49,21 +46,19 @@
 public class JweTokenSerializer
         implements TokenPairSerializer
 {
+    private static final CompressionAlgorithm COMPRESSION_ALGORITHM = new ZstdCodec();
+
     private static final Logger LOG = Logger.get(JweTokenSerializer.class);
-    private static final JWEAlgorithm ALGORITHM = JWEAlgorithm.A256KW;
-    private static final EncryptionMethod ENCRYPTION_METHOD = EncryptionMethod.A256CBC_HS512;
-    private static final CompressionCodec COMPRESSION_CODEC = new ZstdCodec();
     private static final String ACCESS_TOKEN_KEY = "access_token";
     private static final String EXPIRATION_TIME_KEY = "expiration_time";
     private static final String REFRESH_TOKEN_KEY = "refresh_token";
+    private final JweEncryptedSerializer jweSerializer;
     private final OAuth2Client client;
     private final Clock clock;
     private final String issuer;
     private final String audience;
     private final Duration tokenExpiration;
     private final JwtParser parser;
-    private final AESEncrypter jweEncrypter;
-    private final AESDecrypter jweDecrypter;
     private final String principalField;
 
     public JweTokenSerializer(
@@ -74,11 +69,8 @@ public JweTokenSerializer(
             String principalField,
             Clock clock,
             Duration tokenExpiration)
-            throws KeyLengthException, NoSuchAlgorithmException
     {
-        SecretKey secretKey = createKey(config);
-        this.jweEncrypter = new AESEncrypter(secretKey);
-        this.jweDecrypter = new AESDecrypter(secretKey);
+        this.jweSerializer = new JweEncryptedSerializer(getOrGenerateKey(config));
         this.client = requireNonNull(client, "client is null");
         this.issuer = requireNonNull(issuer, "issuer is null");
         this.principalField = requireNonNull(principalField, "principalField is null");
@@ -87,10 +79,14 @@ public JweTokenSerializer(
         this.tokenExpiration = requireNonNull(tokenExpiration, "tokenExpiration is null");
 
         this.parser = newJwtParserBuilder()
-                .setClock(() -> Date.from(clock.instant()))
+                .clock(() -> Date.from(clock.instant()))
                 .requireIssuer(this.issuer)
                 .requireAudience(this.audience)
-                .setCompressionCodecResolver(JweTokenSerializer::resolveCompressionCodec)
+                .zip()
+                .add(COMPRESSION_ALGORITHM)
+                .and()
+                .unsecuredDecompression()
+                .unsecured()
                 .build();
     }
 
@@ -100,19 +96,14 @@ public TokenPair deserialize(String token)
         requireNonNull(token, "token is null");
 
         try {
-            JWEObject jwe = JWEObject.parse(token);
-            jwe.decrypt(jweDecrypter);
-            Claims claims = parser.parseClaimsJwt(jwe.getPayload().toString()).getBody();
-            return TokenPair.accessAndRefreshTokens(
+            Claims claims = parser.parseUnsecuredClaims(jweSerializer.deserialize(token)).getBody();
+            return TokenPair.withAccessAndRefreshTokens(
                     claims.get(ACCESS_TOKEN_KEY, String.class),
                     claims.get(EXPIRATION_TIME_KEY, Date.class),
                     claims.get(REFRESH_TOKEN_KEY, String.class));
         }
         catch (ParseException ex) {
-            return TokenPair.accessToken(token);
-        }
-        catch (JOSEException ex) {
-            throw new IllegalArgumentException("Decryption failed", ex);
+            return TokenPair.withAccessToken(token);
         }
     }
 
@@ -121,57 +112,96 @@ public String serialize(TokenPair tokenPair)
     {
         requireNonNull(tokenPair, "tokenPair is null");
 
-        Map<String, Object> claims = client.getClaims(tokenPair.getAccessToken()).orElseThrow(() -> new IllegalArgumentException("Claims are missing"));
+        Map<String, Object> claims = client.getClaims(tokenPair.accessToken()).orElseThrow(() -> new IllegalArgumentException("Claims are missing"));
         if (!claims.containsKey(principalField)) {
             throw new IllegalArgumentException(format("%s field is missing", principalField));
         }
         JwtBuilder jwt = newJwtBuilder()
-                .setExpiration(Date.from(clock.instant().plusMillis(tokenExpiration.toMillis())))
+                .expiration(Date.from(clock.instant().plusMillis(tokenExpiration.toMillis())))
                 .claim(principalField, claims.get(principalField).toString())
-                .setAudience(audience)
-                .setIssuer(issuer)
-                .claim(ACCESS_TOKEN_KEY, tokenPair.getAccessToken())
-                .claim(EXPIRATION_TIME_KEY, tokenPair.getExpiration())
-                .compressWith(COMPRESSION_CODEC);
-
-        if (tokenPair.getRefreshToken().isPresent()) {
-            jwt.claim(REFRESH_TOKEN_KEY, tokenPair.getRefreshToken().orElseThrow());
+                .audience().add(audience).and()
+                .issuer(issuer)
+                .claim(ACCESS_TOKEN_KEY, tokenPair.accessToken())
+                .claim(EXPIRATION_TIME_KEY, tokenPair.expiration())
+                .compressWith(COMPRESSION_ALGORITHM);
+
+        if (tokenPair.refreshToken().isPresent()) {
+            jwt.claim(REFRESH_TOKEN_KEY, tokenPair.refreshToken().orElseThrow());
         }
         else {
             LOG.info("No refresh token has been issued, although coordinator expects one. Please check your IdP whether that is correct behaviour");
         }
-
-        try {
-            JWEObject jwe = new JWEObject(
-                    new JWEHeader(ALGORITHM, ENCRYPTION_METHOD),
-                    new Payload(jwt.compact()));
-            jwe.encrypt(jweEncrypter);
-            return jwe.serialize();
-        }
-        catch (JOSEException ex) {
-            throw new IllegalStateException("Encryption failed", ex);
-        }
+        return jweSerializer.serialize(jwt.compact());
     }
 
-    private static SecretKey createKey(RefreshTokensConfig config)
-            throws NoSuchAlgorithmException
+    private static SecretKey getOrGenerateKey(RefreshTokensConfig config)
     {
         SecretKey signingKey = config.getSecretKey();
         if (signingKey == null) {
-            KeyGenerator generator = KeyGenerator.getInstance("AES");
-            generator.init(256);
-            return generator.generateKey();
+            try {
+                KeyGenerator generator = KeyGenerator.getInstance("AES");
+                generator.init(256);
+                return generator.generateKey();
+            }
+            catch (NoSuchAlgorithmException e) {
+                throw new RuntimeException(e);
+            }
         }
         return signingKey;
     }
 
-    private static CompressionCodec resolveCompressionCodec(Header header)
-            throws CompressionException
+    private static class JweEncryptedSerializer
     {
-        if (header.getCompressionAlgorithm() != null) {
-            checkState(header.getCompressionAlgorithm().equals(ZstdCodec.CODEC_NAME), "Unknown codec '%s' used for token compression", header.getCompressionAlgorithm());
-            return COMPRESSION_CODEC;
+        private final AESEncrypter jweEncrypter;
+        private final AESDecrypter jweDecrypter;
+        private final JWEHeader encryptionHeader;
+
+        private JweEncryptedSerializer(SecretKey secretKey)
+        {
+            try {
+                this.encryptionHeader = createEncryptionHeader(secretKey);
+                this.jweEncrypter = new AESEncrypter(secretKey);
+                this.jweDecrypter = new AESDecrypter(secretKey);
+            }
+            catch (KeyLengthException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        private JWEHeader createEncryptionHeader(SecretKey key)
+        {
+            int keyLength = key.getEncoded().length;
+            return switch (keyLength) {
+                case 16 -> new JWEHeader(JWEAlgorithm.A128GCMKW, EncryptionMethod.A128GCM);
+                case 24 -> new JWEHeader(JWEAlgorithm.A192GCMKW, EncryptionMethod.A192GCM);
+                case 32 -> new JWEHeader(JWEAlgorithm.A256GCMKW, EncryptionMethod.A256GCM);
+                default -> throw new IllegalArgumentException("Secret key size must be either 16, 24 or 32 bytes but was %d".formatted(keyLength));
+            };
+        }
+
+        private String serialize(String payload)
+        {
+            try {
+                JWEObject jwe = new JWEObject(encryptionHeader, new Payload(payload));
+                jwe.encrypt(jweEncrypter);
+                return jwe.serialize();
+            }
+            catch (JOSEException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        private String deserialize(String token)
+                throws ParseException
+        {
+            try {
+                JWEObject jwe = JWEObject.parse(token);
+                jwe.decrypt(jweDecrypter);
+                return jwe.getPayload().toString();
+            }
+            catch (JOSEException e) {
+                throw new RuntimeException(e);
+            }
         }
-        return null;
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/NimbusAirliftHttpClient.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/NimbusAirliftHttpClient.java
index f00d343dfb49..2df497264a9f 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/NimbusAirliftHttpClient.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/NimbusAirliftHttpClient.java
@@ -14,6 +14,7 @@
 package io.trino.server.security.oauth2;
 
 import com.google.common.collect.ImmutableMultimap;
+import com.google.inject.Inject;
 import com.nimbusds.jose.util.Resource;
 import com.nimbusds.oauth2.sdk.ParseException;
 import com.nimbusds.oauth2.sdk.http.HTTPRequest;
@@ -24,9 +25,7 @@
 import io.airlift.http.client.ResponseHandler;
 import io.airlift.http.client.ResponseHandlerUtils;
 import io.airlift.http.client.StringResponseHandler;
-
-import javax.inject.Inject;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -82,10 +81,10 @@ public <T> T execute(com.nimbusds.oauth2.sdk.Request nimbusRequest, Parser<T> pa
 
         UriBuilder url = UriBuilder.fromUri(httpRequest.getURI());
         if (method.equals(GET) || method.equals(DELETE)) {
-            httpRequest.getQueryParameters().forEach((key, value) -> url.queryParam(key, value.toArray()));
+            httpRequest.getQueryStringParameters().forEach((key, value) -> url.queryParam(key, value.toArray()));
         }
 
-        url.fragment(httpRequest.getFragment());
+        url.fragment(httpRequest.getURL().getRef());
 
         request.setUri(url.build());
 
@@ -94,9 +93,9 @@ public <T> T execute(com.nimbusds.oauth2.sdk.Request nimbusRequest, Parser<T> pa
         request.addHeaders(headers.build());
 
         if (method.equals(POST) || method.equals(PUT)) {
-            String query = httpRequest.getQuery();
+            String query = httpRequest.getBody();
             if (query != null) {
-                request.setBodyGenerator(createStaticBodyGenerator(httpRequest.getQuery(), UTF_8));
+                request.setBodyGenerator(createStaticBodyGenerator(query, UTF_8));
             }
         }
         return httpClient.execute(request.build(), new NimbusResponseHandler<>(parser));
@@ -125,7 +124,7 @@ public T handle(Request request, Response response)
             StringResponseHandler.StringResponse stringResponse = handler.handle(request, response);
             HTTPResponse nimbusResponse = new HTTPResponse(response.getStatusCode());
             response.getHeaders().asMap().forEach((name, values) -> nimbusResponse.setHeader(name.toString(), values.toArray(new String[0])));
-            nimbusResponse.setContent(stringResponse.getBody());
+            nimbusResponse.setBody(stringResponse.getBody());
             try {
                 return parser.parse(nimbusResponse);
             }
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/NimbusOAuth2Client.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/NimbusOAuth2Client.java
index fcb985d60223..a7aa69efab77 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/NimbusOAuth2Client.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/NimbusOAuth2Client.java
@@ -15,11 +15,14 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Ordering;
+import com.google.inject.Inject;
 import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jose.JOSEObjectType;
 import com.nimbusds.jose.JWSAlgorithm;
 import com.nimbusds.jose.JWSHeader;
-import com.nimbusds.jose.jwk.source.RemoteJWKSet;
+import com.nimbusds.jose.jwk.source.JWKSourceBuilder;
 import com.nimbusds.jose.proc.BadJOSEException;
+import com.nimbusds.jose.proc.DefaultJOSEObjectTypeVerifier;
 import com.nimbusds.jose.proc.JWSKeySelector;
 import com.nimbusds.jose.proc.JWSVerificationKeySelector;
 import com.nimbusds.jose.proc.SecurityContext;
@@ -58,8 +61,7 @@
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.server.security.oauth2.OAuth2ServerConfigProvider.OAuth2ServerConfig;
-
-import javax.inject.Inject;
+import jakarta.ws.rs.core.UriBuilder;
 
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -93,12 +95,14 @@ public class NimbusOAuth2Client
     private final String principalField;
     private final Set<String> accessTokenAudiences;
     private final Duration maxClockSkew;
+    private final Optional<String> jwtType;
     private final NimbusHttpClient httpClient;
     private final OAuth2ServerConfigProvider serverConfigurationProvider;
     private volatile boolean loaded;
     private URI authUrl;
     private URI tokenUrl;
     private Optional<URI> userinfoUrl;
+    private Optional<URI> endSessionUrl;
     private JWSKeySelector<SecurityContext> jwsKeySelector;
     private JWTProcessor<SecurityContext> accessTokenProcessor;
     private AuthorizationCodeFlow flow;
@@ -112,6 +116,7 @@ public NimbusOAuth2Client(OAuth2Config oauthConfig, OAuth2ServerConfigProvider s
         scope = Scope.parse(oauthConfig.getScopes());
         principalField = oauthConfig.getPrincipalField();
         maxClockSkew = oauthConfig.getMaxClockSkew();
+        jwtType = oauthConfig.getJwtType();
 
         accessTokenAudiences = new HashSet<>(oauthConfig.getAdditionalAudiences());
         accessTokenAudiences.add(clientId.getValue());
@@ -125,24 +130,28 @@ public NimbusOAuth2Client(OAuth2Config oauthConfig, OAuth2ServerConfigProvider s
     public void load()
     {
         OAuth2ServerConfig config = serverConfigurationProvider.get();
-        this.authUrl = config.getAuthUrl();
-        this.tokenUrl = config.getTokenUrl();
-        this.userinfoUrl = config.getUserinfoUrl();
+        this.authUrl = config.authUrl();
+        this.tokenUrl = config.tokenUrl();
+        this.userinfoUrl = config.userinfoUrl();
+        this.endSessionUrl = config.endSessionUrl();
         try {
             jwsKeySelector = new JWSVerificationKeySelector<>(
                     Stream.concat(JWSAlgorithm.Family.RSA.stream(), JWSAlgorithm.Family.EC.stream()).collect(toImmutableSet()),
-                    new RemoteJWKSet<>(config.getJwksUrl().toURL(), httpClient));
+                    JWKSourceBuilder.create(config.jwksUrl().toURL(), httpClient).build());
         }
         catch (MalformedURLException e) {
             throw new RuntimeException(e);
         }
 
         DefaultJWTProcessor<SecurityContext> processor = new DefaultJWTProcessor<>();
+        if (jwtType.isPresent()) {
+            processor.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType(jwtType.get())));
+        }
         processor.setJWSKeySelector(jwsKeySelector);
         DefaultJWTClaimsVerifier<SecurityContext> accessTokenVerifier = new DefaultJWTClaimsVerifier<>(
                 accessTokenAudiences,
                 new JWTClaimsSet.Builder()
-                        .issuer(config.getAccessTokenIssuer().orElse(issuer.getValue()))
+                        .issuer(config.accessTokenIssuer().orElse(issuer.getValue()))
                         .build(),
                 ImmutableSet.of(principalField),
                 ImmutableSet.of());
@@ -183,6 +192,18 @@ public Response refreshTokens(String refreshToken)
         return flow.refreshTokens(refreshToken);
     }
 
+    @Override
+    public Optional<URI> getLogoutEndpoint(Optional<String> idToken, URI callbackUrl)
+    {
+        if (endSessionUrl.isPresent()) {
+            UriBuilder builder = UriBuilder.fromUri(endSessionUrl.get());
+            idToken.ifPresent(token -> builder.queryParam("id_token_hint", token));
+            builder.queryParam("post_logout_redirect_uri", callbackUrl);
+            return Optional.of(builder.build());
+        }
+        return Optional.empty();
+    }
+
     private interface AuthorizationCodeFlow
     {
         Request createAuthorizationRequest(String state, URI callbackUri);
@@ -360,7 +381,7 @@ private <T extends AccessTokenResponse> T getTokenResponse(TokenRequest tokenReq
     {
         T tokenResponse = httpClient.execute(tokenRequest, parser);
         if (!tokenResponse.indicatesSuccess()) {
-            throw new ChallengeFailedException("Error while fetching access token: " + tokenResponse.toErrorResponse().toJSONObject());
+            throw new ChallengeFailedException("Error while fetching access token: " + tokenResponse.toErrorResponse().toHTTPResponse().getBody());
         }
         return tokenResponse;
     }
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/NonceCookie.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/NonceCookie.java
index 4813527d5864..750c0c3fa5c9 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/NonceCookie.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/NonceCookie.java
@@ -13,17 +13,17 @@
  */
 package io.trino.server.security.oauth2;
 
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.NewCookie;
 
 import java.time.Instant;
 import java.util.Date;
 import java.util.Optional;
 
 import static io.trino.server.security.oauth2.OAuth2CallbackResource.CALLBACK_ENDPOINT;
+import static jakarta.ws.rs.core.Cookie.DEFAULT_VERSION;
+import static jakarta.ws.rs.core.NewCookie.DEFAULT_MAX_AGE;
 import static java.util.function.Predicate.not;
-import static javax.ws.rs.core.Cookie.DEFAULT_VERSION;
-import static javax.ws.rs.core.NewCookie.DEFAULT_MAX_AGE;
 
 public final class NonceCookie
 {
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Authenticator.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Authenticator.java
index 60cd65e021ee..7a38ce775174 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Authenticator.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Authenticator.java
@@ -14,6 +14,7 @@
 package io.trino.server.security.oauth2;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.server.security.AbstractBearerAuthenticator;
 import io.trino.server.security.AuthenticationException;
@@ -22,9 +23,7 @@
 import io.trino.server.security.oauth2.TokenPairSerializer.TokenPair;
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.Identity;
-
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
 
 import java.net.URI;
 import java.sql.Date;
@@ -72,16 +71,19 @@ protected Optional<Identity> createIdentity(String token)
         }
 
         TokenPair tokenPair = deserializeToken.get();
-        if (tokenPair.getExpiration().before(Date.from(Instant.now()))) {
+        if (tokenPair.expiration().before(Date.from(Instant.now()))) {
             return Optional.empty();
         }
-        Optional<Map<String, Object>> claims = client.getClaims(tokenPair.getAccessToken());
+        Optional<Map<String, Object>> claims = client.getClaims(tokenPair.accessToken());
         if (claims.isEmpty()) {
             return Optional.empty();
         }
-        String principal = (String) claims.get().get(principalField);
-        Identity.Builder builder = Identity.forUser(userMapping.mapUser(principal));
-        builder.withPrincipal(new BasicPrincipal(principal));
+        Optional<String> principal = Optional.ofNullable((String) claims.get().get(principalField));
+        if (principal.isEmpty()) {
+            return Optional.empty();
+        }
+        Identity.Builder builder = Identity.forUser(userMapping.mapUser(principal.get()));
+        builder.withPrincipal(new BasicPrincipal(principal.get()));
         groupsField.flatMap(field -> Optional.ofNullable((List<String>) claims.get().get(field)))
                 .ifPresent(groups -> builder.withGroups(ImmutableSet.copyOf(groups)));
         return Optional.of(builder.build());
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2CallbackResource.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2CallbackResource.java
index 6ac48b4cbffb..11206d65e6b2 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2CallbackResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2CallbackResource.java
@@ -13,26 +13,25 @@
  */
 package io.trino.server.security.oauth2;
 
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.server.security.ResourceSecurity;
-
-import javax.inject.Inject;
-import javax.ws.rs.CookieParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.CookieParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
 
 import static io.trino.server.security.ResourceSecurity.AccessType.PUBLIC;
 import static io.trino.server.security.oauth2.NonceCookie.NONCE_COOKIE;
 import static io.trino.server.security.oauth2.OAuth2CallbackResource.CALLBACK_ENDPOINT;
+import static jakarta.ws.rs.core.MediaType.TEXT_HTML;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.MediaType.TEXT_HTML;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
 
 @Path(CALLBACK_ENDPOINT)
 public class OAuth2CallbackResource
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Client.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Client.java
index d51d60817c9d..ad2c94bb0be0 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Client.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Client.java
@@ -34,6 +34,8 @@ Response getOAuth2Response(String code, URI callbackUri, Optional<String> nonce)
     Response refreshTokens(String refreshToken)
             throws ChallengeFailedException;
 
+    Optional<URI> getLogoutEndpoint(Optional<String> idToken, URI callbackUrl);
+
     class Request
     {
         private final URI authorizationUri;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Config.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Config.java
index c5a88f798194..f0c575290076 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Config.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Config.java
@@ -23,8 +23,7 @@
 import io.airlift.configuration.validation.FileExists;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.Collections;
@@ -48,6 +47,7 @@ public class OAuth2Config
     private List<String> additionalAudiences = Collections.emptyList();
     private Duration challengeTimeout = new Duration(15, TimeUnit.MINUTES);
     private Duration maxClockSkew = new Duration(1, TimeUnit.MINUTES);
+    private Optional<String> jwtType = Optional.empty();
     private Optional<String> userMappingPattern = Optional.empty();
     private Optional<File> userMappingFile = Optional.empty();
     private boolean enableRefreshTokens;
@@ -195,6 +195,19 @@ public OAuth2Config setMaxClockSkew(Duration maxClockSkew)
         return this;
     }
 
+    public Optional<String> getJwtType()
+    {
+        return jwtType;
+    }
+
+    @Config("http-server.authentication.oauth2.jwt-type")
+    @ConfigDescription("Custom JWT type for server to use")
+    public OAuth2Config setJwtType(String jwtType)
+    {
+        this.jwtType = Optional.ofNullable(jwtType);
+        return this;
+    }
+
     public Optional<String> getUserMappingPattern()
     {
         return userMappingPattern;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2ServerConfigProvider.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2ServerConfigProvider.java
index 5860909508b1..c47d9adf219a 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2ServerConfigProvider.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2ServerConfigProvider.java
@@ -22,46 +22,16 @@ public interface OAuth2ServerConfigProvider
 {
     OAuth2ServerConfig get();
 
-    class OAuth2ServerConfig
+    record OAuth2ServerConfig(Optional<String> accessTokenIssuer, URI authUrl, URI tokenUrl, URI jwksUrl, Optional<URI> userinfoUrl, Optional<URI> endSessionUrl)
     {
-        private final Optional<String> accessTokenIssuer;
-        private final URI authUrl;
-        private final URI tokenUrl;
-        private final URI jwksUrl;
-        private final Optional<URI> userinfoUrl;
-
-        public OAuth2ServerConfig(Optional<String> accessTokenIssuer, URI authUrl, URI tokenUrl, URI jwksUrl, Optional<URI> userinfoUrl)
-        {
-            this.accessTokenIssuer = requireNonNull(accessTokenIssuer, "accessTokenIssuer is null");
-            this.authUrl = requireNonNull(authUrl, "authUrl is null");
-            this.tokenUrl = requireNonNull(tokenUrl, "tokenUrl is null");
-            this.jwksUrl = requireNonNull(jwksUrl, "jwksUrl is null");
-            this.userinfoUrl = requireNonNull(userinfoUrl, "userinfoUrl is null");
-        }
-
-        public Optional<String> getAccessTokenIssuer()
-        {
-            return accessTokenIssuer;
-        }
-
-        public URI getAuthUrl()
-        {
-            return authUrl;
-        }
-
-        public URI getTokenUrl()
-        {
-            return tokenUrl;
-        }
-
-        public URI getJwksUrl()
-        {
-            return jwksUrl;
-        }
-
-        public Optional<URI> getUserinfoUrl()
+        public OAuth2ServerConfig
         {
-            return userinfoUrl;
+            requireNonNull(accessTokenIssuer, "accessTokenIssuer is null");
+            requireNonNull(authUrl, "authUrl is null");
+            requireNonNull(tokenUrl, "tokenUrl is null");
+            requireNonNull(jwksUrl, "jwksUrl is null");
+            requireNonNull(userinfoUrl, "userinfoUrl is null");
+            requireNonNull(endSessionUrl, "endSessionUrl is null");
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Service.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Service.java
index d38be116b893..86e060ac032b 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Service.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2Service.java
@@ -14,14 +14,14 @@
 package io.trino.server.security.oauth2;
 
 import com.google.common.io.Resources;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwtParser;
 import io.trino.server.ui.OAuth2WebUiInstalled;
+import io.trino.server.ui.OAuthIdTokenCookie;
 import io.trino.server.ui.OAuthWebUiCookie;
-
-import javax.inject.Inject;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import java.io.IOException;
 import java.net.URI;
@@ -42,11 +42,11 @@
 import static io.trino.server.security.jwt.JwtUtil.newJwtParserBuilder;
 import static io.trino.server.security.oauth2.TokenPairSerializer.TokenPair.fromOAuth2Response;
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.UI_LOCATION;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.time.Instant.now;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
 
 public class OAuth2Service
 {
@@ -168,18 +168,19 @@ public Response finishOAuth2Challenge(String state, String code, URI callbackUri
             // fetch access token
             OAuth2Client.Response oauth2Response = client.getOAuth2Response(code, callbackUri, nonce);
 
+            Instant cookieExpirationTime = tokenExpiration
+                    .map(expiration -> Instant.now().plus(expiration))
+                    .orElse(oauth2Response.getExpiration());
             if (handlerState.isEmpty()) {
-                return Response
+                Response.ResponseBuilder builder = Response
                         .seeOther(URI.create(UI_LOCATION))
                         .cookie(
-                                OAuthWebUiCookie.create(
-                                        tokenPairSerializer.serialize(
-                                                fromOAuth2Response(oauth2Response)),
-                                                tokenExpiration
-                                                        .map(expiration -> Instant.now().plus(expiration))
-                                                        .orElse(oauth2Response.getExpiration())),
-                                NonceCookie.delete())
-                        .build();
+                                OAuthWebUiCookie.create(tokenPairSerializer.serialize(fromOAuth2Response(oauth2Response)), cookieExpirationTime),
+                                NonceCookie.delete());
+                if (oauth2Response.getIdToken().isPresent()) {
+                    builder.cookie(OAuthIdTokenCookie.create(oauth2Response.getIdToken().get(), cookieExpirationTime));
+                }
+                return builder.build();
             }
 
             tokenHandler.setAccessToken(handlerState.get(), tokenPairSerializer.serialize(fromOAuth2Response(oauth2Response)));
@@ -187,10 +188,11 @@ public Response finishOAuth2Challenge(String state, String code, URI callbackUri
             Response.ResponseBuilder builder = Response.ok(getSuccessHtml());
             if (webUiOAuthEnabled) {
                 builder.cookie(
-                        OAuthWebUiCookie.create(
-                                tokenPairSerializer.serialize(fromOAuth2Response(oauth2Response)),
-                                tokenExpiration.map(expiration -> Instant.now().plus(expiration))
-                                        .orElse(oauth2Response.getExpiration())));
+                        OAuthWebUiCookie.create(tokenPairSerializer.serialize(fromOAuth2Response(oauth2Response)), cookieExpirationTime));
+
+                if (oauth2Response.getIdToken().isPresent()) {
+                    builder.cookie(OAuthIdTokenCookie.create(oauth2Response.getIdToken().get(), cookieExpirationTime));
+                }
             }
             return builder.cookie(NonceCookie.delete()).build();
         }
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2ServiceModule.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2ServiceModule.java
index c6dbbdd0181d..6f4ad3b36fae 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2ServiceModule.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2ServiceModule.java
@@ -20,6 +20,7 @@
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.airlift.units.DataSize;
 import io.trino.server.ui.OAuth2WebUiInstalled;
 
 import java.time.Duration;
@@ -29,6 +30,7 @@
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static io.airlift.http.client.HttpClientBinder.httpClientBinder;
 import static io.airlift.jaxrs.JaxrsBinder.jaxrsBinder;
+import static io.airlift.units.DataSize.Unit.KILOBYTE;
 import static io.trino.server.security.oauth2.TokenPairSerializer.ACCESS_TOKEN_ONLY_SERIALIZER;
 
 public class OAuth2ServiceModule
@@ -52,16 +54,9 @@ protected void setup(Binder binder)
         install(conditionalModule(OAuth2Config.class, OAuth2Config::isEnableRefreshTokens, this::enableRefreshTokens, this::disableRefreshTokens));
         httpClientBinder(binder)
                 .bindHttpClient("oauth2-jwk", ForOAuth2.class)
-                // Reset to defaults to override InternalCommunicationModule changes to this client default configuration.
-                // Setting a keystore and/or a truststore for internal communication changes the default SSL configuration
-                // for all clients in this guice context. This does not make sense for this client which will very rarely
-                // use the same SSL configuration, so using the system default truststore makes more sense.
-                .withConfigDefaults(config -> config
-                        .setKeyStorePath(null)
-                        .setKeyStorePassword(null)
-                        .setTrustStorePath(null)
-                        .setTrustStorePassword(null)
-                        .setAutomaticHttpsSharedSecret(null));
+                .withConfigDefaults(clientConfig -> clientConfig
+                        .setRequestBufferSize(DataSize.of(32, KILOBYTE))
+                        .setResponseBufferSize(DataSize.of(32, KILOBYTE)));
     }
 
     private void enableRefreshTokens(Binder binder)
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchange.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchange.java
index 36c873d0ee7e..c55976a46916 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchange.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchange.java
@@ -19,12 +19,11 @@
 import com.google.common.hash.Hashing;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
+import jakarta.annotation.PreDestroy;
 import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import java.util.UUID;
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchangeResource.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchangeResource.java
index eb8eb10f497e..af8657e8cd0d 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchangeResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchangeResource.java
@@ -18,26 +18,25 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
 import io.trino.dispatcher.DispatchExecutor;
 import io.trino.server.security.ResourceSecurity;
 import io.trino.server.security.oauth2.OAuth2TokenExchange.TokenPoll;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
 
 import java.util.Map;
 import java.util.Optional;
@@ -48,8 +47,8 @@
 import static io.trino.server.security.oauth2.OAuth2CallbackResource.CALLBACK_ENDPOINT;
 import static io.trino.server.security.oauth2.OAuth2TokenExchange.MAX_POLL_TIME;
 import static io.trino.server.security.oauth2.OAuth2TokenExchange.hashAuthId;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
 
 @Path(OAuth2TokenExchangeResource.TOKEN_ENDPOINT)
 public class OAuth2TokenExchangeResource
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OidcDiscovery.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OidcDiscovery.java
index 200def4a3791..d0e23338dd0d 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OidcDiscovery.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OidcDiscovery.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.inject.Inject;
 import com.nimbusds.oauth2.sdk.ParseException;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import com.nimbusds.oauth2.sdk.id.Issuer;
@@ -26,8 +27,6 @@
 import io.airlift.json.ObjectMapperProvider;
 import io.airlift.log.Logger;
 
-import javax.inject.Inject;
-
 import java.net.URI;
 import java.time.Duration;
 import java.util.Optional;
@@ -38,6 +37,7 @@
 import static io.airlift.http.client.HttpStatus.TOO_MANY_REQUESTS;
 import static io.trino.server.security.oauth2.StaticOAuth2ServerConfiguration.ACCESS_TOKEN_ISSUER;
 import static io.trino.server.security.oauth2.StaticOAuth2ServerConfiguration.AUTH_URL;
+import static io.trino.server.security.oauth2.StaticOAuth2ServerConfiguration.END_SESSION_URL;
 import static io.trino.server.security.oauth2.StaticOAuth2ServerConfiguration.JWKS_URL;
 import static io.trino.server.security.oauth2.StaticOAuth2ServerConfiguration.TOKEN_URL;
 import static io.trino.server.security.oauth2.StaticOAuth2ServerConfiguration.USERINFO_URL;
@@ -98,7 +98,7 @@ private OAuth2ServerConfig parseConfigurationResponse(HTTPResponse response)
             }
             throw new IllegalStateException(format("Invalid response from OpenID Metadata endpoint. Expected response code to be %s, but was %s", OK.code(), statusCode));
         }
-        return readConfiguration(response.getContent());
+        return readConfiguration(response.getBody());
     }
 
     private OAuth2ServerConfig readConfiguration(String body)
@@ -115,6 +115,7 @@ private OAuth2ServerConfig readConfiguration(String body)
             else {
                 userinfoEndpoint = Optional.empty();
             }
+            Optional<URI> endSessionEndpoint = Optional.of(getRequiredField("end_session_endpoint", metadata.getEndSessionEndpointURI(), END_SESSION_URL, Optional.empty()));
             return new OAuth2ServerConfig(
                     // AD FS server can include "access_token_issuer" field in OpenID Provider Metadata.
                     // It's not a part of the OIDC standard thus have to be handled separately.
@@ -123,7 +124,8 @@ private OAuth2ServerConfig readConfiguration(String body)
                     getRequiredField("authorization_endpoint", metadata.getAuthorizationEndpointURI(), AUTH_URL, authUrl),
                     getRequiredField("token_endpoint", metadata.getTokenEndpointURI(), TOKEN_URL, tokenUrl),
                     getRequiredField("jwks_uri", metadata.getJWKSetURI(), JWKS_URL, jwksUrl),
-                    userinfoEndpoint.map(URI::create));
+                    userinfoEndpoint.map(URI::create),
+                    endSessionEndpoint);
         }
         catch (JsonProcessingException e) {
             throw new ParseException("Invalid JSON value", e);
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OidcDiscoveryConfig.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OidcDiscoveryConfig.java
index 8ea0ab96d617..ac343f842a42 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OidcDiscoveryConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OidcDiscoveryConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/RefreshTokensConfig.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/RefreshTokensConfig.java
index 77f6449cefa4..10cc82d11c4c 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/RefreshTokensConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/RefreshTokensConfig.java
@@ -17,11 +17,12 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.units.Duration;
-import io.jsonwebtoken.io.Decoders;
-import io.jsonwebtoken.security.Keys;
+import jakarta.validation.constraints.NotEmpty;
 
 import javax.crypto.SecretKey;
-import javax.validation.constraints.NotEmpty;
+import javax.crypto.spec.SecretKeySpec;
+
+import java.util.Base64;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static java.util.concurrent.TimeUnit.HOURS;
@@ -82,8 +83,7 @@ public RefreshTokensConfig setSecretKey(String key)
         if (isNullOrEmpty(key)) {
             return this;
         }
-
-        secretKey = Keys.hmacShaKeyFor(Decoders.BASE64.decode(key));
+        secretKey = new SecretKeySpec(Base64.getDecoder().decode(key), "AES");
         return this;
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/StaticConfigurationProvider.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/StaticConfigurationProvider.java
index f4b3dbd8603a..263f60dd26f3 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/StaticConfigurationProvider.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/StaticConfigurationProvider.java
@@ -13,7 +13,7 @@
  */
 package io.trino.server.security.oauth2;
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 
 import java.net.URI;
 
@@ -30,7 +30,8 @@ public class StaticConfigurationProvider
                 URI.create(config.getAuthUrl()),
                 URI.create(config.getTokenUrl()),
                 URI.create(config.getJwksUrl()),
-                config.getUserinfoUrl().map(URI::create));
+                config.getUserinfoUrl().map(URI::create),
+                config.getEndSessionUrl().map(URI::create));
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/StaticOAuth2ServerConfiguration.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/StaticOAuth2ServerConfiguration.java
index 46e5e07c83c9..ebc3c71d7b43 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/StaticOAuth2ServerConfiguration.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/StaticOAuth2ServerConfiguration.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
@@ -27,12 +26,14 @@ public class StaticOAuth2ServerConfiguration
     public static final String TOKEN_URL = "http-server.authentication.oauth2.token-url";
     public static final String JWKS_URL = "http-server.authentication.oauth2.jwks-url";
     public static final String USERINFO_URL = "http-server.authentication.oauth2.userinfo-url";
+    public static final String END_SESSION_URL = "http-server.authentication.oauth2.end-session-url";
 
     private Optional<String> accessTokenIssuer = Optional.empty();
     private String authUrl;
     private String tokenUrl;
     private String jwksUrl;
     private Optional<String> userinfoUrl = Optional.empty();
+    private Optional<String> endSessionUrl = Optional.empty();
 
     @NotNull
     public Optional<String> getAccessTokenIssuer()
@@ -102,4 +103,17 @@ public StaticOAuth2ServerConfiguration setUserinfoUrl(String userinfoUrl)
         this.userinfoUrl = Optional.ofNullable(userinfoUrl);
         return this;
     }
+
+    public Optional<String> getEndSessionUrl()
+    {
+        return endSessionUrl;
+    }
+
+    @Config(END_SESSION_URL)
+    @ConfigDescription("URL of the end session endpoint")
+    public StaticOAuth2ServerConfiguration setEndSessionUrl(String endSessionUrl)
+    {
+        this.endSessionUrl = Optional.ofNullable(endSessionUrl);
+        return this;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/TokenPairSerializer.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/TokenPairSerializer.java
index 3798f9e339f4..9f8307eb562d 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/TokenPairSerializer.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/TokenPairSerializer.java
@@ -15,8 +15,7 @@
 package io.trino.server.security.oauth2;
 
 import io.trino.server.security.oauth2.OAuth2Client.Response;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Date;
 import java.util.Optional;
@@ -31,13 +30,13 @@ public interface TokenPairSerializer
         @Override
         public TokenPair deserialize(String token)
         {
-            return TokenPair.accessToken(token);
+            return TokenPair.withAccessToken(token);
         }
 
         @Override
         public String serialize(TokenPair tokenPair)
         {
-            return tokenPair.getAccessToken();
+            return tokenPair.accessToken();
         }
     };
 
@@ -45,20 +44,16 @@ public String serialize(TokenPair tokenPair)
 
     String serialize(TokenPair tokenPair);
 
-    class TokenPair
+    record TokenPair(String accessToken, Date expiration, Optional<String> refreshToken)
     {
-        private final String accessToken;
-        private final Date expiration;
-        private final Optional<String> refreshToken;
-
-        private TokenPair(String accessToken, Date expiration, Optional<String> refreshToken)
+        public TokenPair
         {
-            this.accessToken = requireNonNull(accessToken, "accessToken is nul");
-            this.expiration = requireNonNull(expiration, "expiration is null");
-            this.refreshToken = requireNonNull(refreshToken, "refreshToken is null");
+            requireNonNull(accessToken, "accessToken is nul");
+            requireNonNull(expiration, "expiration is null");
+            requireNonNull(refreshToken, "refreshToken is null");
         }
 
-        public static TokenPair accessToken(String accessToken)
+        public static TokenPair withAccessToken(String accessToken)
         {
             return new TokenPair(accessToken, new Date(MAX_VALUE), Optional.empty());
         }
@@ -69,24 +64,9 @@ public static TokenPair fromOAuth2Response(Response tokens)
             return new TokenPair(tokens.getAccessToken(), Date.from(tokens.getExpiration()), tokens.getRefreshToken());
         }
 
-        public static TokenPair accessAndRefreshTokens(String accessToken, Date expiration, @Nullable String refreshToken)
+        public static TokenPair withAccessAndRefreshTokens(String accessToken, Date expiration, @Nullable String refreshToken)
         {
             return new TokenPair(accessToken, expiration, Optional.ofNullable(refreshToken));
         }
-
-        public String getAccessToken()
-        {
-            return accessToken;
-        }
-
-        public Date getExpiration()
-        {
-            return expiration;
-        }
-
-        public Optional<String> getRefreshToken()
-        {
-            return refreshToken;
-        }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/TokenRefresher.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/TokenRefresher.java
index 755af27a6465..1c02138ce568 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/TokenRefresher.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/TokenRefresher.java
@@ -39,7 +39,7 @@ public Optional<UUID> refreshToken(TokenPair tokenPair)
     {
         requireNonNull(tokenPair, "tokenPair is null");
 
-        Optional<String> refreshToken = tokenPair.getRefreshToken();
+        Optional<String> refreshToken = tokenPair.refreshToken();
         if (refreshToken.isPresent()) {
             UUID refreshingId = UUID.randomUUID();
             try {
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/ZstdCodec.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/ZstdCodec.java
index 3b4f64562853..8173946f5cb0 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/ZstdCodec.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/ZstdCodec.java
@@ -15,9 +15,16 @@
 
 import io.airlift.compress.zstd.ZstdCompressor;
 import io.airlift.compress.zstd.ZstdDecompressor;
+import io.airlift.compress.zstd.ZstdInputStream;
+import io.airlift.compress.zstd.ZstdOutputStream;
 import io.jsonwebtoken.CompressionCodec;
 import io.jsonwebtoken.CompressionException;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+
 import static java.lang.Math.toIntExact;
 import static java.util.Arrays.copyOfRange;
 
@@ -50,4 +57,27 @@ public byte[] decompress(byte[] bytes)
         new ZstdDecompressor().decompress(bytes, 0, bytes.length, output, 0, output.length);
         return output;
     }
+
+    @Override
+    public OutputStream compress(OutputStream out)
+    {
+        try {
+            return new ZstdOutputStream(out);
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @Override
+    public InputStream decompress(InputStream in)
+    {
+        return new ZstdInputStream(in);
+    }
+
+    @Override
+    public String getId()
+    {
+        return CODEC_NAME;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/testing/FactoryConfiguration.java b/core/trino-main/src/main/java/io/trino/server/testing/FactoryConfiguration.java
new file mode 100644
index 000000000000..a1d34fa8649b
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/server/testing/FactoryConfiguration.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed 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 io.trino.server.testing;
+
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Map;
+
+import static java.util.Objects.requireNonNull;
+
+public record FactoryConfiguration(String factoryName, Map<String, String> configuration)
+{
+    public FactoryConfiguration
+    {
+        requireNonNull(factoryName, "factoryName is null");
+        configuration = ImmutableMap.copyOf(requireNonNull(configuration, "configuration is null"));
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/server/testing/TestingTrinoServer.java b/core/trino-main/src/main/java/io/trino/server/testing/TestingTrinoServer.java
index d3830d3f77b7..9486c0181b97 100644
--- a/core/trino-main/src/main/java/io/trino/server/testing/TestingTrinoServer.java
+++ b/core/trino-main/src/main/java/io/trino/server/testing/TestingTrinoServer.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Closer;
 import com.google.common.net.HostAndPort;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
@@ -36,6 +37,7 @@
 import io.airlift.node.testing.TestingNodeModule;
 import io.airlift.openmetrics.JmxOpenMetricsModule;
 import io.airlift.tracetoken.TraceTokenModule;
+import io.airlift.tracing.TracingModule;
 import io.trino.connector.CatalogManagerModule;
 import io.trino.connector.ConnectorName;
 import io.trino.connector.ConnectorServicesProvider;
@@ -60,15 +62,18 @@
 import io.trino.metadata.FunctionManager;
 import io.trino.metadata.GlobalFunctionCatalog;
 import io.trino.metadata.InternalNodeManager;
+import io.trino.metadata.LanguageFunctionManager;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.ProcedureRegistry;
 import io.trino.metadata.SessionPropertyManager;
+import io.trino.metadata.TablePropertyManager;
 import io.trino.security.AccessControl;
 import io.trino.security.AccessControlConfig;
 import io.trino.security.AccessControlManager;
 import io.trino.security.GroupProviderManager;
 import io.trino.server.GracefulShutdownHandler;
 import io.trino.server.PluginInstaller;
+import io.trino.server.PrefixObjectNameGeneratorModule;
 import io.trino.server.Server;
 import io.trino.server.ServerMainModule;
 import io.trino.server.SessionPropertyDefaults;
@@ -78,6 +83,8 @@
 import io.trino.spi.ErrorType;
 import io.trino.spi.Plugin;
 import io.trino.spi.QueryId;
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.connector.Connector;
 import io.trino.spi.eventlistener.EventListener;
 import io.trino.spi.exchange.ExchangeManager;
 import io.trino.spi.security.GroupProvider;
@@ -96,11 +103,12 @@
 import io.trino.testing.TestingGroupProvider;
 import io.trino.testing.TestingGroupProviderManager;
 import io.trino.testing.TestingWarningCollectorModule;
+import io.trino.tracing.ForTracing;
+import io.trino.tracing.TracingAccessControl;
 import io.trino.transaction.TransactionManager;
 import io.trino.transaction.TransactionManagerModule;
 import org.weakref.jmx.guice.MBeanModule;
 
-import javax.annotation.concurrent.GuardedBy;
 import javax.management.MBeanServer;
 
 import java.io.Closeable;
@@ -117,6 +125,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeoutException;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
@@ -130,6 +139,8 @@
 public class TestingTrinoServer
         implements Closeable
 {
+    private static final String VERSION = "testversion";
+
     public static TestingTrinoServer create()
     {
         return builder().build();
@@ -148,11 +159,13 @@ public static Builder builder()
     private final Optional<CatalogManager> catalogManager;
     private final TestingHttpServer server;
     private final TransactionManager transactionManager;
+    private final TablePropertyManager tablePropertyManager;
     private final Metadata metadata;
     private final TypeManager typeManager;
     private final QueryExplainer queryExplainer;
     private final SessionPropertyManager sessionPropertyManager;
     private final FunctionManager functionManager;
+    private final LanguageFunctionManager languageFunctionManager;
     private final GlobalFunctionCatalog globalFunctionCatalog;
     private final StatsCalculator statsCalculator;
     private final ProcedureRegistry procedureRegistry;
@@ -212,7 +225,8 @@ private TestingTrinoServer(
             Optional<URI> discoveryUri,
             Module additionalModule,
             Optional<Path> baseDataDir,
-            List<SystemAccessControl> systemAccessControls,
+            Optional<FactoryConfiguration> systemAccessControlConfiguration,
+            Optional<List<SystemAccessControl>> systemAccessControls,
             List<EventListener> eventListeners)
     {
         this.coordinator = coordinator;
@@ -232,16 +246,14 @@ private TestingTrinoServer(
                 .put("catalog.management", "dynamic")
                 .put("task.concurrency", "4")
                 .put("task.max-worker-threads", "4")
-                // Use task.writer-count > 1, as this allows to expose writer-concurrency related bugs.
-                .put("task.writer-count", "2")
+                // Use task.min-writer-count > 1, as this allows to expose writer-concurrency related bugs.
+                .put("task.min-writer-count", "2")
                 .put("exchange.client-threads", "4")
                 // Reduce memory footprint in tests
                 .put("exchange.max-buffer-size", "4MB")
                 .put("internal-communication.shared-secret", "internal-shared-secret");
 
         if (coordinator) {
-            // TODO: enable failure detector
-            serverProperties.put("failure-detector.enabled", "false");
             serverProperties.put("catalog.store", "memory");
 
             // Reduce memory footprint in tests
@@ -256,14 +268,16 @@ private TestingTrinoServer(
                 .add(new JsonModule())
                 .add(new JaxrsModule())
                 .add(new MBeanModule())
+                .add(new PrefixObjectNameGeneratorModule("io.trino"))
                 .add(new TestingJmxModule())
                 .add(new JmxOpenMetricsModule())
                 .add(new EventModule())
                 .add(new TraceTokenModule())
+                .add(new TracingModule("trino", VERSION))
                 .add(new ServerSecurityModule())
                 .add(new CatalogManagerModule())
                 .add(new TransactionManagerModule())
-                .add(new ServerMainModule("testversion"))
+                .add(new ServerMainModule(VERSION))
                 .add(new TestingWarningCollectorModule())
                 .add(binder -> {
                     binder.bind(EventListenerConfig.class).in(Scopes.SINGLETON);
@@ -276,7 +290,8 @@ private TestingTrinoServer(
                     binder.bind(TestingGroupProviderManager.class).in(Scopes.SINGLETON);
                     binder.bind(GroupProvider.class).to(TestingGroupProviderManager.class).in(Scopes.SINGLETON);
                     binder.bind(GroupProviderManager.class).to(TestingGroupProviderManager.class).in(Scopes.SINGLETON);
-                    binder.bind(AccessControl.class).to(AccessControlManager.class).in(Scopes.SINGLETON);
+                    binder.bind(AccessControl.class).annotatedWith(ForTracing.class).to(AccessControlManager.class).in(Scopes.SINGLETON);
+                    binder.bind(AccessControl.class).to(TracingAccessControl.class).in(Scopes.SINGLETON);
                     binder.bind(ShutdownAction.class).to(TestShutdownAction.class).in(Scopes.SINGLETON);
                     binder.bind(GracefulShutdownHandler.class).in(Scopes.SINGLETON);
                     binder.bind(ProcedureTester.class).in(Scopes.SINGLETON);
@@ -324,6 +339,7 @@ private TestingTrinoServer(
 
         server = injector.getInstance(TestingHttpServer.class);
         transactionManager = injector.getInstance(TransactionManager.class);
+        tablePropertyManager = injector.getInstance(TablePropertyManager.class);
         globalFunctionCatalog = injector.getInstance(GlobalFunctionCatalog.class);
         metadata = injector.getInstance(Metadata.class);
         typeManager = injector.getInstance(TypeManager.class);
@@ -343,6 +359,7 @@ private TestingTrinoServer(
             sessionPropertyDefaults = injector.getInstance(SessionPropertyDefaults.class);
             nodePartitioningManager = injector.getInstance(NodePartitioningManager.class);
             clusterMemoryManager = injector.getInstance(ClusterMemoryManager.class);
+            languageFunctionManager = injector.getInstance(LanguageFunctionManager.class);
             statsCalculator = injector.getInstance(StatsCalculator.class);
             procedureRegistry = injector.getInstance(ProcedureRegistry.class);
             injector.getInstance(CertificateAuthenticatorManager.class).useDefaultAuthenticator();
@@ -355,6 +372,7 @@ private TestingTrinoServer(
             sessionPropertyDefaults = null;
             nodePartitioningManager = null;
             clusterMemoryManager = null;
+            languageFunctionManager = null;
             statsCalculator = null;
             procedureRegistry = null;
         }
@@ -368,7 +386,12 @@ private TestingTrinoServer(
         failureInjector = injector.getInstance(FailureInjector.class);
         exchangeManagerRegistry = injector.getInstance(ExchangeManagerRegistry.class);
 
-        accessControl.setSystemAccessControls(systemAccessControls);
+        systemAccessControlConfiguration.ifPresentOrElse(
+                configuration -> {
+                    checkArgument(systemAccessControls.isEmpty(), "systemAccessControlConfiguration and systemAccessControls cannot be both present");
+                    accessControl.loadSystemAccessControl(configuration.factoryName(), configuration.configuration());
+                },
+                () -> accessControl.setSystemAccessControls(systemAccessControls.orElseThrow()));
 
         EventListenerManager eventListenerManager = injector.getInstance(EventListenerManager.class);
         eventListeners.forEach(eventListenerManager::addEventListener);
@@ -496,6 +519,11 @@ public TransactionManager getTransactionManager()
         return transactionManager;
     }
 
+    public TablePropertyManager getTablePropertyManager()
+    {
+        return tablePropertyManager;
+    }
+
     public Metadata getMetadata()
     {
         return metadata;
@@ -521,6 +549,12 @@ public FunctionManager getFunctionManager()
         return functionManager;
     }
 
+    public LanguageFunctionManager getLanguageFunctionManager()
+    {
+        checkState(coordinator, "not a coordinator");
+        return languageFunctionManager;
+    }
+
     public void addFunctions(FunctionBundle functionBundle)
     {
         globalFunctionCatalog.addFunctions(functionBundle);
@@ -613,6 +647,17 @@ public ShutdownAction getShutdownAction()
         return shutdownAction;
     }
 
+    public Connector getConnector(String catalogName)
+    {
+        checkState(coordinator, "not a coordinator");
+        CatalogHandle catalogHandle = catalogManager.orElseThrow().getCatalog(catalogName)
+                .orElseThrow(() -> new IllegalArgumentException("Catalog does not exist: " + catalogName))
+                .getCatalogHandle();
+        return injector.getInstance(ConnectorServicesProvider.class)
+                .getConnectorServices(catalogHandle)
+                .getConnector();
+    }
+
     public boolean isCoordinator()
     {
         return coordinator;
@@ -677,7 +722,8 @@ public static class Builder
         private Optional<URI> discoveryUri = Optional.empty();
         private Module additionalModule = EMPTY_MODULE;
         private Optional<Path> baseDataDir = Optional.empty();
-        private List<SystemAccessControl> systemAccessControls = ImmutableList.of();
+        private Optional<FactoryConfiguration> systemAccessControlConfiguration = Optional.empty();
+        private Optional<List<SystemAccessControl>> systemAccessControls = Optional.of(ImmutableList.of());
         private List<EventListener> eventListeners = ImmutableList.of();
 
         public Builder setCoordinator(boolean coordinator)
@@ -716,9 +762,20 @@ public Builder setBaseDataDir(Optional<Path> baseDataDir)
             return this;
         }
 
-        public Builder setSystemAccessControls(List<SystemAccessControl> systemAccessControls)
+        public Builder setSystemAccessControlConfiguration(Optional<FactoryConfiguration> systemAccessControlConfiguration)
+        {
+            this.systemAccessControlConfiguration = requireNonNull(systemAccessControlConfiguration, "systemAccessControlConfiguration is null");
+            return this;
+        }
+
+        public Builder setSystemAccessControl(SystemAccessControl systemAccessControl)
+        {
+            return setSystemAccessControls(Optional.of(ImmutableList.of(requireNonNull(systemAccessControl, "systemAccessControl is null"))));
+        }
+
+        public Builder setSystemAccessControls(Optional<List<SystemAccessControl>> systemAccessControls)
         {
-            this.systemAccessControls = ImmutableList.copyOf(requireNonNull(systemAccessControls, "systemAccessControls is null"));
+            this.systemAccessControls = systemAccessControls.map(ImmutableList::copyOf);
             return this;
         }
 
@@ -737,6 +794,7 @@ public TestingTrinoServer build()
                     discoveryUri,
                     additionalModule,
                     baseDataDir,
+                    systemAccessControlConfiguration,
                     systemAccessControls,
                     eventListeners);
         }
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/ClusterResource.java b/core/trino-main/src/main/java/io/trino/server/ui/ClusterResource.java
index 57dd199be341..4056dfe42484 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/ClusterResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/ClusterResource.java
@@ -14,21 +14,20 @@
 package io.trino.server.ui;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.Immutable;
+import com.google.inject.Inject;
 import io.airlift.node.NodeInfo;
 import io.airlift.units.Duration;
 import io.trino.client.NodeVersion;
 import io.trino.server.security.ResourceSecurity;
-
-import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
 
 import static io.airlift.units.Duration.nanosSince;
 import static io.trino.server.security.ResourceSecurity.AccessType.WEB_UI;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 
 @Path("/ui/api/cluster")
 public class ClusterResource
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/ClusterStatsResource.java b/core/trino-main/src/main/java/io/trino/server/ui/ClusterStatsResource.java
index 83b0c2434b75..cb2a1cfa4da6 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/ClusterStatsResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/ClusterStatsResource.java
@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.inject.Inject;
 import io.trino.dispatcher.DispatchManager;
 import io.trino.execution.QueryState;
 import io.trino.execution.scheduler.NodeSchedulerConfig;
@@ -24,14 +25,14 @@
 import io.trino.metadata.NodeState;
 import io.trino.server.BasicQueryInfo;
 import io.trino.server.security.ResourceSecurity;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
+import static com.google.common.math.DoubleMath.roundToLong;
 import static io.trino.server.security.ResourceSecurity.AccessType.WEB_UI;
+import static java.math.RoundingMode.HALF_UP;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
@@ -92,7 +93,7 @@ else if (query.getState() == QueryState.RUNNING) {
             if (!query.getState().isDone()) {
                 totalInputBytes += query.getQueryStats().getRawInputDataSize().toBytes();
                 totalInputRows += query.getQueryStats().getRawInputPositions();
-                totalCpuTimeSecs += query.getQueryStats().getTotalCpuTime().getValue(SECONDS);
+                totalCpuTimeSecs += roundToLong(query.getQueryStats().getTotalCpuTime().getValue(SECONDS), HALF_UP);
 
                 memoryReservation += query.getQueryStats().getUserMemoryReservation().toBytes();
                 runningDrivers += query.getQueryStats().getRunningDrivers();
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/DisabledWebUiAuthenticationFilter.java b/core/trino-main/src/main/java/io/trino/server/ui/DisabledWebUiAuthenticationFilter.java
index 80316fc9ada9..58dcc20a37d2 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/DisabledWebUiAuthenticationFilter.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/DisabledWebUiAuthenticationFilter.java
@@ -13,11 +13,11 @@
  */
 package io.trino.server.ui;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Response;
 
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.DISABLED_LOCATION_URI;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
 
 public class DisabledWebUiAuthenticationFilter
         implements WebUiAuthenticationFilter
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/FixedUserWebUiAuthenticationFilter.java b/core/trino-main/src/main/java/io/trino/server/ui/FixedUserWebUiAuthenticationFilter.java
index 5e146bb2df67..fff613027251 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/FixedUserWebUiAuthenticationFilter.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/FixedUserWebUiAuthenticationFilter.java
@@ -13,11 +13,10 @@
  */
 package io.trino.server.ui;
 
+import com.google.inject.Inject;
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.Identity;
-
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
 
 import static io.trino.server.ServletSecurityUtils.setAuthenticatedIdentity;
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.redirectAllFormLoginToUi;
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/FixedUserWebUiConfig.java b/core/trino-main/src/main/java/io/trino/server/ui/FixedUserWebUiConfig.java
index 861578b20ad1..0fb008b4d76e 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/FixedUserWebUiConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/FixedUserWebUiConfig.java
@@ -14,8 +14,7 @@
 package io.trino.server.ui;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class FixedUserWebUiConfig
 {
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/ForWebUi.java b/core/trino-main/src/main/java/io/trino/server/ui/ForWebUi.java
index d0d6bc430f74..f04802d0fe18 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/ForWebUi.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/ForWebUi.java
@@ -13,7 +13,7 @@
  */
 package io.trino.server.ui;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,5 +25,5 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForWebUi {}
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/FormWebUiAuthenticationFilter.java b/core/trino-main/src/main/java/io/trino/server/ui/FormWebUiAuthenticationFilter.java
index 9eaa294ce13d..20e571e72206 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/FormWebUiAuthenticationFilter.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/FormWebUiAuthenticationFilter.java
@@ -15,20 +15,19 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.hash.Hashing;
+import com.google.inject.Inject;
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.JwtParser;
 import io.trino.server.security.AuthenticationException;
 import io.trino.server.security.Authenticator;
 import io.trino.spi.security.Identity;
-
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/FormWebUiConfig.java b/core/trino-main/src/main/java/io/trino/server/ui/FormWebUiConfig.java
index 20180d8d80f9..dacfcb3393fb 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/FormWebUiConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/FormWebUiConfig.java
@@ -14,9 +14,9 @@
 package io.trino.server.ui;
 
 import io.airlift.configuration.Config;
+import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
@@ -34,6 +34,7 @@ public Optional<String> getSharedSecret()
     }
 
     @Config("web-ui.shared-secret")
+    @ConfigSecuritySensitive
     public FormWebUiConfig setSharedSecret(String sharedSecret)
     {
         this.sharedSecret = Optional.ofNullable(sharedSecret);
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/InsecureFormAuthenticator.java b/core/trino-main/src/main/java/io/trino/server/ui/InsecureFormAuthenticator.java
index 9307985245a8..470d080e8f6c 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/InsecureFormAuthenticator.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/InsecureFormAuthenticator.java
@@ -13,13 +13,12 @@
  */
 package io.trino.server.ui;
 
+import com.google.inject.Inject;
 import io.trino.server.security.InsecureAuthenticatorConfig;
 import io.trino.server.security.SecurityConfig;
 import io.trino.server.security.UserMapping;
 import io.trino.server.security.UserMappingException;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static io.trino.server.security.UserMapping.createUserMapping;
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/LoginResource.java b/core/trino-main/src/main/java/io/trino/server/ui/LoginResource.java
index be785189f301..c09fd8845f1a 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/LoginResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/LoginResource.java
@@ -14,19 +14,18 @@
 package io.trino.server.ui;
 
 import com.google.common.io.Resources;
+import com.google.inject.Inject;
 import io.trino.server.security.ResourceSecurity;
-
-import javax.inject.Inject;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.core.UriInfo;
 
 import java.io.IOException;
 import java.net.URI;
@@ -42,9 +41,9 @@
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.UI_LOGOUT;
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.getDeleteCookie;
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.redirectFromSuccessfulLoginResponse;
+import static jakarta.ws.rs.core.MediaType.TEXT_HTML;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.MediaType.TEXT_HTML;
 
 @Path("")
 public class LoginResource
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/NoWebUiAuthenticationFilter.java b/core/trino-main/src/main/java/io/trino/server/ui/NoWebUiAuthenticationFilter.java
index c1d6e5ed5829..62fea8e9de37 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/NoWebUiAuthenticationFilter.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/NoWebUiAuthenticationFilter.java
@@ -13,10 +13,10 @@
  */
 package io.trino.server.ui;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Response;
 
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 
 public class NoWebUiAuthenticationFilter
         implements WebUiAuthenticationFilter
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/OAuth2WebUiAuthenticationFilter.java b/core/trino-main/src/main/java/io/trino/server/ui/OAuth2WebUiAuthenticationFilter.java
index 24b66c563f24..a0afec3683d6 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/OAuth2WebUiAuthenticationFilter.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/OAuth2WebUiAuthenticationFilter.java
@@ -14,6 +14,7 @@
 package io.trino.server.ui;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.server.security.UserMapping;
 import io.trino.server.security.UserMappingException;
@@ -26,10 +27,8 @@
 import io.trino.server.security.oauth2.TokenPairSerializer.TokenPair;
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.Identity;
-
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Response;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -46,9 +45,10 @@
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.DISABLED_LOCATION;
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.DISABLED_LOCATION_URI;
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.TRINO_FORM_LOGIN;
+import static io.trino.server.ui.OAuthIdTokenCookie.ID_TOKEN_COOKIE;
 import static io.trino.server.ui.OAuthWebUiCookie.OAUTH2_COOKIE;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
 
 public class OAuth2WebUiAuthenticationFilter
         implements WebUiAuthenticationFilter
@@ -136,17 +136,17 @@ private Optional<TokenPair> getTokenPair(ContainerRequestContext request)
 
     private boolean tokenNotExpired(TokenPair tokenPair)
     {
-        return tokenPair.getExpiration().after(Date.from(Instant.now()));
+        return tokenPair.expiration().after(Date.from(Instant.now()));
     }
 
     private Optional<Map<String, Object>> getAccessTokenClaims(TokenPair tokenPair)
     {
-        return client.getClaims(tokenPair.getAccessToken());
+        return client.getClaims(tokenPair.accessToken());
     }
 
     private void needAuthentication(ContainerRequestContext request, Optional<TokenPair> tokenPair)
     {
-        Optional<String> refreshToken = tokenPair.flatMap(TokenPair::getRefreshToken);
+        Optional<String> refreshToken = tokenPair.flatMap(TokenPair::refreshToken);
         if (refreshToken.isPresent()) {
             try {
                 redirectForNewToken(request, refreshToken.get());
@@ -164,9 +164,14 @@ private void redirectForNewToken(ContainerRequestContext request, String refresh
     {
         OAuth2Client.Response response = client.refreshTokens(refreshToken);
         String serializedToken = tokenPairSerializer.serialize(TokenPair.fromOAuth2Response(response));
-        request.abortWith(Response.temporaryRedirect(request.getUriInfo().getRequestUri())
-                .cookie(OAuthWebUiCookie.create(serializedToken, tokenExpiration.map(expiration -> Instant.now().plus(expiration)).orElse(response.getExpiration())))
-                .build());
+        Instant newExpirationTime = tokenExpiration.map(expiration -> Instant.now().plus(expiration)).orElse(response.getExpiration());
+        Response.ResponseBuilder builder = Response.temporaryRedirect(request.getUriInfo().getRequestUri())
+                .cookie(OAuthWebUiCookie.create(serializedToken, newExpirationTime));
+
+        OAuthIdTokenCookie.read(request.getCookies().get(ID_TOKEN_COOKIE))
+                .ifPresent(idToken -> builder.cookie(OAuthIdTokenCookie.create(idToken, newExpirationTime)));
+
+        request.abortWith(builder.build());
     }
 
     private void handleAuthenticationFailure(ContainerRequestContext request)
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/OAuth2WebUiLogoutResource.java b/core/trino-main/src/main/java/io/trino/server/ui/OAuth2WebUiLogoutResource.java
index b461fa884b38..4101ded289a3 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/OAuth2WebUiLogoutResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/OAuth2WebUiLogoutResource.java
@@ -14,33 +14,63 @@
 package io.trino.server.ui;
 
 import com.google.common.io.Resources;
+import com.google.inject.Inject;
 import io.trino.server.security.ResourceSecurity;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriInfo;
+import io.trino.server.security.oauth2.OAuth2Client;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
 
 import java.io.IOException;
+import java.net.URI;
+import java.util.Optional;
 
+import static io.trino.server.security.ResourceSecurity.AccessType.PUBLIC;
 import static io.trino.server.security.ResourceSecurity.AccessType.WEB_UI;
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.UI_LOGOUT;
+import static io.trino.server.ui.OAuthIdTokenCookie.ID_TOKEN_COOKIE;
 import static io.trino.server.ui.OAuthWebUiCookie.delete;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
 
 @Path(UI_LOGOUT)
 public class OAuth2WebUiLogoutResource
 {
+    private final OAuth2Client auth2Client;
+
+    @Inject
+    public OAuth2WebUiLogoutResource(OAuth2Client auth2Client)
+    {
+        this.auth2Client = requireNonNull(auth2Client, "auth2Client is null");
+    }
+
     @ResourceSecurity(WEB_UI)
     @GET
     public Response logout(@Context HttpHeaders httpHeaders, @Context UriInfo uriInfo, @Context SecurityContext securityContext)
             throws IOException
+    {
+        Optional<String> idToken = OAuthIdTokenCookie.read(httpHeaders.getCookies().get(ID_TOKEN_COOKIE));
+        URI callBackUri = UriBuilder.fromUri(uriInfo.getAbsolutePath())
+                .path("logout.html")
+                .build();
+
+        return Response.seeOther(auth2Client.getLogoutEndpoint(idToken, callBackUri).orElse(callBackUri))
+                .cookie(delete(), OAuthIdTokenCookie.delete())
+                .build();
+    }
+
+    @ResourceSecurity(PUBLIC)
+    @GET
+    @Path("/logout.html")
+    public Response logoutPage(@Context HttpHeaders httpHeaders, @Context UriInfo uriInfo, @Context SecurityContext securityContext)
+            throws IOException
     {
         return Response.ok(Resources.toString(Resources.getResource(getClass(), "/oauth2/logout.html"), UTF_8))
-                .cookie(delete())
                 .build();
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/OAuthIdTokenCookie.java b/core/trino-main/src/main/java/io/trino/server/ui/OAuthIdTokenCookie.java
new file mode 100644
index 000000000000..3ee038b6188b
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/server/ui/OAuthIdTokenCookie.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed 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 io.trino.server.ui;
+
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.NewCookie;
+
+import java.time.Instant;
+import java.util.Date;
+import java.util.Optional;
+
+import static io.trino.server.ui.FormWebUiAuthenticationFilter.UI_LOCATION;
+import static jakarta.ws.rs.core.Cookie.DEFAULT_VERSION;
+import static jakarta.ws.rs.core.NewCookie.DEFAULT_MAX_AGE;
+import static java.util.function.Predicate.not;
+
+public final class OAuthIdTokenCookie
+{
+    // prefix according to: https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-05#section-4.1.3.1
+    public static final String ID_TOKEN_COOKIE = "__Secure-Trino-ID-Token";
+
+    private OAuthIdTokenCookie() {}
+
+    public static NewCookie create(String token, Instant tokenExpiration)
+    {
+        return new NewCookie(
+                ID_TOKEN_COOKIE,
+                token,
+                UI_LOCATION,
+                null,
+                DEFAULT_VERSION,
+                null,
+                DEFAULT_MAX_AGE,
+                Date.from(tokenExpiration),
+                true,
+                true);
+    }
+
+    public static Optional<String> read(Cookie cookie)
+    {
+        return Optional.ofNullable(cookie)
+                .map(Cookie::getValue)
+                .filter(not(String::isBlank));
+    }
+
+    public static NewCookie delete()
+    {
+        return new NewCookie(
+                ID_TOKEN_COOKIE,
+                "delete",
+                UI_LOCATION,
+                null,
+                DEFAULT_VERSION,
+                null,
+                0,
+                null,
+                true,
+                true);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/OAuthWebUiCookie.java b/core/trino-main/src/main/java/io/trino/server/ui/OAuthWebUiCookie.java
index 70ae45ca9b96..31a15bee269b 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/OAuthWebUiCookie.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/OAuthWebUiCookie.java
@@ -13,17 +13,17 @@
  */
 package io.trino.server.ui;
 
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.NewCookie;
 
 import java.time.Instant;
 import java.util.Date;
 import java.util.Optional;
 
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.UI_LOCATION;
+import static jakarta.ws.rs.core.Cookie.DEFAULT_VERSION;
+import static jakarta.ws.rs.core.NewCookie.DEFAULT_MAX_AGE;
 import static java.util.function.Predicate.not;
-import static javax.ws.rs.core.Cookie.DEFAULT_VERSION;
-import static javax.ws.rs.core.NewCookie.DEFAULT_MAX_AGE;
 
 public final class OAuthWebUiCookie
 {
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/PasswordManagerFormAuthenticator.java b/core/trino-main/src/main/java/io/trino/server/ui/PasswordManagerFormAuthenticator.java
index f54ea23c37b9..dd3b38ea3fa8 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/PasswordManagerFormAuthenticator.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/PasswordManagerFormAuthenticator.java
@@ -13,6 +13,7 @@
  */
 package io.trino.server.ui;
 
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.server.security.PasswordAuthenticatorConfig;
 import io.trino.server.security.PasswordAuthenticatorManager;
@@ -22,8 +23,6 @@
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.PasswordAuthenticator;
 
-import javax.inject.Inject;
-
 import java.security.Principal;
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/TrimmedBasicQueryInfo.java b/core/trino-main/src/main/java/io/trino/server/ui/TrimmedBasicQueryInfo.java
index f33036675318..5de9fcc587d6 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/TrimmedBasicQueryInfo.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/TrimmedBasicQueryInfo.java
@@ -14,6 +14,7 @@
 package io.trino.server.ui;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.execution.QueryState;
 import io.trino.operator.RetryPolicy;
 import io.trino.server.BasicQueryInfo;
@@ -24,8 +25,6 @@
 import io.trino.spi.resourcegroups.QueryType;
 import io.trino.spi.resourcegroups.ResourceGroupId;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.net.URI;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/UiQueryResource.java b/core/trino-main/src/main/java/io/trino/server/ui/UiQueryResource.java
index b0cb7eed37a6..40531ed22803 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/UiQueryResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/UiQueryResource.java
@@ -14,6 +14,7 @@
 package io.trino.server.ui;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.dispatcher.DispatchManager;
 import io.trino.execution.QueryInfo;
 import io.trino.execution.QueryState;
@@ -25,19 +26,17 @@
 import io.trino.spi.QueryId;
 import io.trino.spi.TrinoException;
 import io.trino.spi.security.AccessDeniedException;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 import java.util.List;
 import java.util.Locale;
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/WebUiAuthenticationFilter.java b/core/trino-main/src/main/java/io/trino/server/ui/WebUiAuthenticationFilter.java
index 895fade1a860..07ab2daf408c 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/WebUiAuthenticationFilter.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/WebUiAuthenticationFilter.java
@@ -13,9 +13,9 @@
  */
 package io.trino.server.ui;
 
-import javax.annotation.Priority;
-import javax.ws.rs.Priorities;
-import javax.ws.rs.container.ContainerRequestFilter;
+import jakarta.annotation.Priority;
+import jakarta.ws.rs.Priorities;
+import jakarta.ws.rs.container.ContainerRequestFilter;
 
 @Priority(Priorities.AUTHENTICATION)
 public interface WebUiAuthenticationFilter
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/WebUiAuthenticationModule.java b/core/trino-main/src/main/java/io/trino/server/ui/WebUiAuthenticationModule.java
index 4ad6971d917a..9ecd1d1f0fd5 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/WebUiAuthenticationModule.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/WebUiAuthenticationModule.java
@@ -109,7 +109,7 @@ private String getAuthenticationType()
         {
             String authentication = buildConfigObject(WebUiAuthenticationConfig.class).getAuthentication();
             if (authentication != null) {
-                return authentication;
+                return authentication.toLowerCase(ENGLISH);
             }
 
             // no authenticator explicitly set for the web ui, so choose a default:
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/WebUiStaticResource.java b/core/trino-main/src/main/java/io/trino/server/ui/WebUiStaticResource.java
index 8711e9238444..8c9f54995800 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/WebUiStaticResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/WebUiStaticResource.java
@@ -14,14 +14,13 @@
 package io.trino.server.ui;
 
 import io.trino.server.security.ResourceSecurity;
-
-import javax.servlet.ServletContext;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.ServletContext;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
 
 import java.io.IOException;
 import java.net.URI;
@@ -30,14 +29,13 @@
 
 import static io.trino.server.security.ResourceSecurity.AccessType.PUBLIC;
 import static io.trino.server.security.ResourceSecurity.AccessType.WEB_UI;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 
 @Path("")
 public class WebUiStaticResource
 {
     @ResourceSecurity(PUBLIC)
     @GET
-    @Path("/")
     public Response getRoot()
     {
         return Response.seeOther(URI.create("/ui/")).build();
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/WorkerResource.java b/core/trino-main/src/main/java/io/trino/server/ui/WorkerResource.java
index b68da908fead..bf03403eed12 100644
--- a/core/trino-main/src/main/java/io/trino/server/ui/WorkerResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/ui/WorkerResource.java
@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.inject.Inject;
 import io.airlift.http.client.HttpClient;
 import io.airlift.http.client.Request;
 import io.airlift.http.client.ResponseHandler;
@@ -32,18 +33,16 @@
 import io.trino.spi.Node;
 import io.trino.spi.QueryId;
 import io.trino.spi.security.AccessDeniedException;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -59,10 +58,10 @@
 import static io.trino.metadata.NodeState.INACTIVE;
 import static io.trino.security.AccessControlUtil.checkCanViewQueryOwnedBy;
 import static io.trino.server.security.ResourceSecurity.AccessType.WEB_UI;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 
 @Path("/ui/api/worker")
 public class WorkerResource
diff --git a/core/trino-main/src/main/java/io/trino/spiller/FileHolder.java b/core/trino-main/src/main/java/io/trino/spiller/FileHolder.java
index 629a08df50fa..06771b60e32a 100644
--- a/core/trino-main/src/main/java/io/trino/spiller/FileHolder.java
+++ b/core/trino-main/src/main/java/io/trino/spiller/FileHolder.java
@@ -13,8 +13,8 @@
  */
 package io.trino.spiller;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/core/trino-main/src/main/java/io/trino/spiller/FileSingleStreamSpiller.java b/core/trino-main/src/main/java/io/trino/spiller/FileSingleStreamSpiller.java
index cf34c6b2892c..d8859002e1cf 100644
--- a/core/trino-main/src/main/java/io/trino/spiller/FileSingleStreamSpiller.java
+++ b/core/trino-main/src/main/java/io/trino/spiller/FileSingleStreamSpiller.java
@@ -23,6 +23,7 @@
 import io.airlift.slice.OutputStreamSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.execution.buffer.PageDeserializer;
 import io.trino.execution.buffer.PageSerializer;
 import io.trino.execution.buffer.PagesSerdeFactory;
@@ -32,7 +33,6 @@
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
 
-import javax.annotation.concurrent.NotThreadSafe;
 import javax.crypto.SecretKey;
 
 import java.io.Closeable;
diff --git a/core/trino-main/src/main/java/io/trino/spiller/FileSingleStreamSpillerFactory.java b/core/trino-main/src/main/java/io/trino/spiller/FileSingleStreamSpillerFactory.java
index 91e5caa4e4f7..8a2c49057204 100644
--- a/core/trino-main/src/main/java/io/trino/spiller/FileSingleStreamSpillerFactory.java
+++ b/core/trino-main/src/main/java/io/trino/spiller/FileSingleStreamSpillerFactory.java
@@ -21,16 +21,16 @@
 import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.FeaturesConfig;
-import io.trino.collect.cache.NonKeyEvictableLoadingCache;
+import io.trino.cache.NonKeyEvictableLoadingCache;
 import io.trino.execution.buffer.PagesSerdeFactory;
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.operator.SpillContext;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.BlockEncodingSerde;
 import io.trino.spi.type.Type;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import javax.crypto.SecretKey;
 
 import java.io.IOException;
@@ -44,7 +44,7 @@
 import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static io.trino.FeaturesConfig.SPILLER_SPILL_PATH;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
+import static io.trino.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
 import static io.trino.spi.StandardErrorCode.OUT_OF_SPILL_SPACE;
 import static io.trino.util.Ciphers.createRandomAesEncryptionKey;
 import static java.lang.String.format;
diff --git a/core/trino-main/src/main/java/io/trino/spiller/GenericPartitioningSpiller.java b/core/trino-main/src/main/java/io/trino/spiller/GenericPartitioningSpiller.java
index b0bc9fc7d22e..eb56a954aeaf 100644
--- a/core/trino-main/src/main/java/io/trino/spiller/GenericPartitioningSpiller.java
+++ b/core/trino-main/src/main/java/io/trino/spiller/GenericPartitioningSpiller.java
@@ -18,6 +18,7 @@
 import com.google.common.io.Closer;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.operator.PartitionFunction;
 import io.trino.operator.SpillContext;
@@ -26,8 +27,6 @@
 import io.trino.spi.type.Type;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -80,7 +79,7 @@ public GenericPartitioningSpiller(
         requireNonNull(memoryContext, "memoryContext is null");
         closer.register(memoryContext::close);
         this.memoryContext = memoryContext;
-        int partitionCount = partitionFunction.getPartitionCount();
+        int partitionCount = partitionFunction.partitionCount();
 
         ImmutableList.Builder<PageBuilder> pageBuilders = ImmutableList.builder();
         spillers = new ArrayList<>(partitionCount);
diff --git a/core/trino-main/src/main/java/io/trino/spiller/GenericSpiller.java b/core/trino-main/src/main/java/io/trino/spiller/GenericSpiller.java
index 1721ba71a20c..719311863e95 100644
--- a/core/trino-main/src/main/java/io/trino/spiller/GenericSpiller.java
+++ b/core/trino-main/src/main/java/io/trino/spiller/GenericSpiller.java
@@ -15,13 +15,12 @@
 
 import com.google.common.io.Closer;
 import com.google.common.util.concurrent.ListenableFuture;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.operator.SpillContext;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/core/trino-main/src/main/java/io/trino/spiller/LocalSpillContext.java b/core/trino-main/src/main/java/io/trino/spiller/LocalSpillContext.java
index 115799c3ed3a..72d7781d97cb 100644
--- a/core/trino-main/src/main/java/io/trino/spiller/LocalSpillContext.java
+++ b/core/trino-main/src/main/java/io/trino/spiller/LocalSpillContext.java
@@ -13,10 +13,9 @@
  */
 package io.trino.spiller;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.operator.SpillContext;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import static com.google.common.base.Preconditions.checkState;
 
 @ThreadSafe
diff --git a/core/trino-main/src/main/java/io/trino/spiller/NodeSpillConfig.java b/core/trino-main/src/main/java/io/trino/spiller/NodeSpillConfig.java
index 09643ea1f1e6..c46f8c97f23f 100644
--- a/core/trino-main/src/main/java/io/trino/spiller/NodeSpillConfig.java
+++ b/core/trino-main/src/main/java/io/trino/spiller/NodeSpillConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.units.DataSize;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class NodeSpillConfig
 {
diff --git a/core/trino-main/src/main/java/io/trino/spiller/SpillSpaceTracker.java b/core/trino-main/src/main/java/io/trino/spiller/SpillSpaceTracker.java
index 4979cbaa47d6..8ffaceaec685 100644
--- a/core/trino-main/src/main/java/io/trino/spiller/SpillSpaceTracker.java
+++ b/core/trino-main/src/main/java/io/trino/spiller/SpillSpaceTracker.java
@@ -14,12 +14,11 @@
 package io.trino.spiller;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.units.DataSize;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.units.DataSize.succinctBytes;
diff --git a/core/trino-main/src/main/java/io/trino/split/BufferingSplitSource.java b/core/trino-main/src/main/java/io/trino/split/BufferingSplitSource.java
index 41248cf928e6..084d6722fa99 100644
--- a/core/trino-main/src/main/java/io/trino/split/BufferingSplitSource.java
+++ b/core/trino-main/src/main/java/io/trino/split/BufferingSplitSource.java
@@ -15,6 +15,7 @@
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import io.opentelemetry.context.Context;
 import io.trino.metadata.Split;
 import io.trino.spi.connector.CatalogHandle;
 
@@ -72,6 +73,7 @@ public Optional<List<Object>> getTableExecuteSplitsInfo()
 
     private static class GetNextBatch
     {
+        private final Context context = Context.current();
         private final SplitSource splitSource;
         private final int min;
         private final int max;
@@ -102,7 +104,10 @@ private ListenableFuture<Void> fetchSplits()
             if (splits.size() >= min) {
                 return immediateVoidFuture();
             }
-            ListenableFuture<SplitBatch> future = splitSource.getNextBatch(max - splits.size());
+            ListenableFuture<SplitBatch> future;
+            try (var ignored = context.makeCurrent()) {
+                future = splitSource.getNextBatch(max - splits.size());
+            }
             return Futures.transformAsync(future, splitBatch -> {
                 splits.addAll(splitBatch.getSplits());
                 if (splitBatch.isLastBatch()) {
diff --git a/core/trino-main/src/main/java/io/trino/split/ConnectorAwareSplitSource.java b/core/trino-main/src/main/java/io/trino/split/ConnectorAwareSplitSource.java
index d11a3be30dd8..3979f2149498 100644
--- a/core/trino-main/src/main/java/io/trino/split/ConnectorAwareSplitSource.java
+++ b/core/trino-main/src/main/java/io/trino/split/ConnectorAwareSplitSource.java
@@ -16,29 +16,48 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.metadata.Split;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.connector.ConnectorSplitSource;
 import io.trino.spi.connector.ConnectorSplitSource.ConnectorSplitBatch;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Optional;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static io.airlift.concurrent.MoreFutures.toListenableFuture;
 import static java.util.Objects.requireNonNull;
 
+/**
+ * Adapts {@link ConnectorSplitSource} to {@link SplitSource} interface.
+ * <p>
+ * Thread-safety: the implementations is not thread-safe
+ *
+ * @implNote The implementation is internally not thread-safe but also {@link ConnectorSplitSource} is
+ * not required to be thread-safe.
+ */
+@NotThreadSafe
 public class ConnectorAwareSplitSource
         implements SplitSource
 {
     private final CatalogHandle catalogHandle;
-    private final ConnectorSplitSource source;
+    private final String sourceToString;
+
+    @Nullable
+    private ConnectorSplitSource source;
+    private boolean finished;
+    private Optional<Optional<List<Object>>> tableExecuteSplitsInfo = Optional.empty();
 
     public ConnectorAwareSplitSource(CatalogHandle catalogHandle, ConnectorSplitSource source)
     {
         this.catalogHandle = requireNonNull(catalogHandle, "catalogHandle is null");
         this.source = requireNonNull(source, "source is null");
+        this.sourceToString = source.toString();
     }
 
     @Override
@@ -50,37 +69,65 @@ public CatalogHandle getCatalogHandle()
     @Override
     public ListenableFuture<SplitBatch> getNextBatch(int maxSize)
     {
+        checkState(source != null, "Already finished or closed");
         ListenableFuture<ConnectorSplitBatch> nextBatch = toListenableFuture(source.getNextBatch(maxSize));
         return Futures.transform(nextBatch, splitBatch -> {
-            ImmutableList.Builder<Split> result = ImmutableList.builder();
-            for (ConnectorSplit connectorSplit : splitBatch.getSplits()) {
+            List<ConnectorSplit> connectorSplits = splitBatch.getSplits();
+            ImmutableList.Builder<Split> result = ImmutableList.builderWithExpectedSize(connectorSplits.size());
+            for (ConnectorSplit connectorSplit : connectorSplits) {
                 result.add(new Split(catalogHandle, connectorSplit));
             }
-            return new SplitBatch(result.build(), splitBatch.isNoMoreSplits());
+            boolean noMoreSplits = splitBatch.isNoMoreSplits();
+            if (noMoreSplits) {
+                finished = true;
+                tableExecuteSplitsInfo = Optional.of(source.getTableExecuteSplitsInfo());
+                closeSource();
+            }
+            return new SplitBatch(result.build(), noMoreSplits);
         }, directExecutor());
     }
 
     @Override
     public void close()
     {
-        source.close();
+        closeSource();
+    }
+
+    private void closeSource()
+    {
+        if (source != null) {
+            try {
+                source.close();
+            }
+            finally {
+                source = null;
+            }
+        }
     }
 
     @Override
     public boolean isFinished()
     {
-        return source.isFinished();
+        if (!finished) {
+            checkState(source != null, "Already closed");
+            if (source.isFinished()) {
+                finished = true;
+                tableExecuteSplitsInfo = Optional.of(source.getTableExecuteSplitsInfo());
+                closeSource();
+            }
+        }
+        return finished;
     }
 
     @Override
     public Optional<List<Object>> getTableExecuteSplitsInfo()
     {
-        return source.getTableExecuteSplitsInfo();
+        return tableExecuteSplitsInfo.orElseThrow(() -> new IllegalStateException("Not finished yet"));
     }
 
     @Override
     public String toString()
     {
-        return catalogHandle + ":" + source;
+        return catalogHandle + ":" + firstNonNull(source, sourceToString);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/split/PageSinkManager.java b/core/trino-main/src/main/java/io/trino/split/PageSinkManager.java
index b5db21d03fcc..512aae433232 100644
--- a/core/trino-main/src/main/java/io/trino/split/PageSinkManager.java
+++ b/core/trino-main/src/main/java/io/trino/split/PageSinkManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.split;
 
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.metadata.InsertTableHandle;
@@ -27,8 +28,6 @@
 import io.trino.spi.connector.ConnectorPageSinkProvider;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 public class PageSinkManager
diff --git a/core/trino-main/src/main/java/io/trino/split/PageSourceManager.java b/core/trino-main/src/main/java/io/trino/split/PageSourceManager.java
index cbc7778fbae1..b985551cfee5 100644
--- a/core/trino-main/src/main/java/io/trino/split/PageSourceManager.java
+++ b/core/trino-main/src/main/java/io/trino/split/PageSourceManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.split;
 
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.metadata.Split;
@@ -25,8 +26,6 @@
 import io.trino.spi.connector.EmptyPageSource;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/split/SampledSplitSource.java b/core/trino-main/src/main/java/io/trino/split/SampledSplitSource.java
index f23920903618..b7b575135807 100644
--- a/core/trino-main/src/main/java/io/trino/split/SampledSplitSource.java
+++ b/core/trino-main/src/main/java/io/trino/split/SampledSplitSource.java
@@ -16,8 +16,7 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.trino.spi.connector.CatalogHandle;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/split/SplitManager.java b/core/trino-main/src/main/java/io/trino/split/SplitManager.java
index b5ed757ec6f6..b6bc7a9c1544 100644
--- a/core/trino-main/src/main/java/io/trino/split/SplitManager.java
+++ b/core/trino-main/src/main/java/io/trino/split/SplitManager.java
@@ -13,6 +13,10 @@
  */
 package io.trino.split;
 
+import com.google.inject.Inject;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
 import io.trino.Session;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.execution.QueryManagerConfig;
@@ -24,8 +28,9 @@
 import io.trino.spi.connector.ConnectorSplitSource;
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.DynamicFilter;
+import io.trino.tracing.TrinoAttributes;
 
-import javax.inject.Inject;
+import java.util.Optional;
 
 import static io.trino.SystemSessionProperties.isAllowPushdownIntoConnectors;
 import static java.util.Objects.requireNonNull;
@@ -33,17 +38,20 @@
 public class SplitManager
 {
     private final CatalogServiceProvider<ConnectorSplitManager> splitManagerProvider;
+    private final Tracer tracer;
     private final int minScheduleSplitBatchSize;
 
     @Inject
-    public SplitManager(CatalogServiceProvider<ConnectorSplitManager> splitManagerProvider, QueryManagerConfig config)
+    public SplitManager(CatalogServiceProvider<ConnectorSplitManager> splitManagerProvider, Tracer tracer, QueryManagerConfig config)
     {
         this.splitManagerProvider = requireNonNull(splitManagerProvider, "splitManagerProvider is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
         this.minScheduleSplitBatchSize = config.getMinScheduleSplitBatchSize();
     }
 
     public SplitSource getSplits(
             Session session,
+            Span parentSpan,
             TableHandle table,
             DynamicFilter dynamicFilter,
             Constraint constraint)
@@ -64,13 +72,22 @@ public SplitSource getSplits(
                 constraint);
 
         SplitSource splitSource = new ConnectorAwareSplitSource(catalogHandle, source);
+
+        Span span = splitSourceSpan(parentSpan, catalogHandle);
+
         if (minScheduleSplitBatchSize > 1) {
+            splitSource = new TracingSplitSource(splitSource, tracer, Optional.empty(), "split-batch");
             splitSource = new BufferingSplitSource(splitSource, minScheduleSplitBatchSize);
+            splitSource = new TracingSplitSource(splitSource, tracer, Optional.of(span), "split-buffer");
+        }
+        else {
+            splitSource = new TracingSplitSource(splitSource, tracer, Optional.of(span), "split-batch");
         }
+
         return splitSource;
     }
 
-    public SplitSource getSplits(Session session, TableFunctionHandle function)
+    public SplitSource getSplits(Session session, Span parentSpan, TableFunctionHandle function)
     {
         CatalogHandle catalogHandle = function.getCatalogHandle();
         ConnectorSplitManager splitManager = splitManagerProvider.getService(catalogHandle);
@@ -78,9 +95,19 @@ public SplitSource getSplits(Session session, TableFunctionHandle function)
         ConnectorSplitSource source = splitManager.getSplits(
                 function.getTransactionHandle(),
                 session.toConnectorSession(catalogHandle),
-                function.getSchemaFunctionName(),
                 function.getFunctionHandle());
 
-        return new ConnectorAwareSplitSource(catalogHandle, source);
+        SplitSource splitSource = new ConnectorAwareSplitSource(catalogHandle, source);
+
+        Span span = splitSourceSpan(parentSpan, catalogHandle);
+        return new TracingSplitSource(splitSource, tracer, Optional.of(span), "split-buffer");
+    }
+
+    private Span splitSourceSpan(Span querySpan, CatalogHandle catalogHandle)
+    {
+        return tracer.spanBuilder("split-source")
+                .setParent(Context.current().with(querySpan))
+                .setAttribute(TrinoAttributes.CATALOG, catalogHandle.getCatalogName())
+                .startSpan();
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/split/TracingSplitSource.java b/core/trino-main/src/main/java/io/trino/split/TracingSplitSource.java
new file mode 100644
index 000000000000..8df2cc09b5b1
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/split/TracingSplitSource.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed 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 io.trino.split;
+
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.tracing.TrinoAttributes;
+
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static java.util.Objects.requireNonNull;
+
+public class TracingSplitSource
+        implements SplitSource
+{
+    private final SplitSource source;
+    private final Tracer tracer;
+    private final Optional<Span> parentSpan;
+    private final String spanName;
+
+    public TracingSplitSource(SplitSource source, Tracer tracer, Optional<Span> parentSpan, String spanName)
+    {
+        this.source = requireNonNull(source, "source is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
+        this.parentSpan = requireNonNull(parentSpan, "parentSpan is null");
+        this.spanName = requireNonNull(spanName, "spanName is null");
+    }
+
+    @Override
+    public CatalogHandle getCatalogHandle()
+    {
+        return source.getCatalogHandle();
+    }
+
+    @Override
+    public ListenableFuture<SplitBatch> getNextBatch(int maxSize)
+    {
+        Span span = tracer.spanBuilder(spanName)
+                .setParent(parentSpan.map(Context.current()::with).orElse(Context.current()))
+                .setAttribute(TrinoAttributes.SPLIT_BATCH_MAX_SIZE, (long) maxSize)
+                .startSpan();
+
+        ListenableFuture<SplitBatch> future;
+        try (var ignored = span.makeCurrent()) {
+            future = source.getNextBatch(maxSize);
+        }
+        catch (Throwable t) {
+            span.end();
+            throw t;
+        }
+
+        Futures.addCallback(future, new FutureCallback<>()
+        {
+            @Override
+            public void onSuccess(SplitBatch batch)
+            {
+                span.setAttribute(TrinoAttributes.SPLIT_BATCH_RESULT_SIZE, batch.getSplits().size());
+                span.end();
+            }
+
+            @Override
+            public void onFailure(Throwable t)
+            {
+                span.end();
+            }
+        }, directExecutor());
+
+        return future;
+    }
+
+    @Override
+    public void close()
+    {
+        try (source) {
+            parentSpan.ifPresent(Span::end);
+        }
+    }
+
+    @Override
+    public boolean isFinished()
+    {
+        return source.isFinished();
+    }
+
+    @Override
+    public Optional<List<Object>> getTableExecuteSplitsInfo()
+    {
+        return source.getTableExecuteSplitsInfo();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/DynamicFilters.java b/core/trino-main/src/main/java/io/trino/sql/DynamicFilters.java
index b62a07255350..db7f5c8f94fc 100644
--- a/core/trino-main/src/main/java/io/trino/sql/DynamicFilters.java
+++ b/core/trino-main/src/main/java/io/trino/sql/DynamicFilters.java
@@ -17,9 +17,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multimap;
 import io.airlift.slice.Slice;
-import io.trino.Session;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.ResolvedFunction;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.function.IsNull;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
@@ -30,7 +30,7 @@
 import io.trino.spi.type.BooleanType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
-import io.trino.sql.planner.FunctionCallBuilder;
+import io.trino.sql.planner.BuiltinFunctionCallBuilder;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.DynamicFilterId;
 import io.trino.sql.tree.BooleanLiteral;
@@ -38,7 +38,6 @@
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FunctionCall;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.sql.tree.SymbolReference;
 
@@ -50,6 +49,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableListMultimap.toImmutableListMultimap;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.spi.type.StandardTypes.BOOLEAN;
 import static io.trino.spi.type.StandardTypes.VARCHAR;
 import static io.trino.sql.ExpressionUtils.extractConjuncts;
@@ -63,32 +63,16 @@ public final class DynamicFilters
     private DynamicFilters() {}
 
     public static Expression createDynamicFilterExpression(
-            Session session,
-            Metadata metadata,
-            DynamicFilterId id,
-            Type inputType,
-            SymbolReference input,
-            ComparisonExpression.Operator operator,
-            boolean nullAllowed)
-    {
-        return createDynamicFilterExpression(session, metadata, id, inputType, (Expression) input, operator, nullAllowed);
-    }
-
-    @VisibleForTesting
-    public static Expression createDynamicFilterExpression(
-            Session session,
             Metadata metadata,
             DynamicFilterId id,
             Type inputType,
             Expression input,
             ComparisonExpression.Operator operator)
     {
-        return createDynamicFilterExpression(session, metadata, id, inputType, input, operator, false);
+        return createDynamicFilterExpression(metadata, id, inputType, input, operator, false);
     }
 
-    @VisibleForTesting
     public static Expression createDynamicFilterExpression(
-            Session session,
             Metadata metadata,
             DynamicFilterId id,
             Type inputType,
@@ -96,8 +80,8 @@ public static Expression createDynamicFilterExpression(
             ComparisonExpression.Operator operator,
             boolean nullAllowed)
     {
-        return FunctionCallBuilder.resolve(session, metadata)
-                .setName(QualifiedName.of(nullAllowed ? NullableFunction.NAME : Function.NAME))
+        return BuiltinFunctionCallBuilder.resolve(metadata)
+                .setName(nullAllowed ? NullableFunction.NAME : Function.NAME)
                 .addArgument(inputType, input)
                 .addArgument(VarcharType.VARCHAR, new StringLiteral(operator.toString()))
                 .addArgument(VarcharType.VARCHAR, new StringLiteral(id.toString()))
@@ -106,9 +90,9 @@ public static Expression createDynamicFilterExpression(
     }
 
     @VisibleForTesting
-    public static Expression createDynamicFilterExpression(Session session, Metadata metadata, DynamicFilterId id, Type inputType, Expression input)
+    public static Expression createDynamicFilterExpression(Metadata metadata, DynamicFilterId id, Type inputType, Expression input)
     {
-        return createDynamicFilterExpression(session, metadata, id, inputType, input, EQUAL);
+        return createDynamicFilterExpression(metadata, id, inputType, input, EQUAL);
     }
 
     public static ExtractResult extractDynamicFilters(Expression expression)
@@ -209,8 +193,8 @@ public static Optional<Descriptor> getDescriptor(Expression expression)
 
     private static boolean isDynamicFilterFunction(FunctionCall functionCall)
     {
-        String functionName = ResolvedFunction.extractFunctionName(functionCall.getName());
-        return functionName.equals(Function.NAME) || functionName.equals(NullableFunction.NAME);
+        CatalogSchemaFunctionName functionName = ResolvedFunction.extractFunctionName(functionCall.getName());
+        return functionName.equals(builtinFunctionName(Function.NAME)) || functionName.equals(builtinFunctionName(NullableFunction.NAME));
     }
 
     public static class ExtractResult
diff --git a/core/trino-main/src/main/java/io/trino/sql/ExpressionUtils.java b/core/trino-main/src/main/java/io/trino/sql/ExpressionUtils.java
index 58eb7d3917aa..091e3a70793d 100644
--- a/core/trino-main/src/main/java/io/trino/sql/ExpressionUtils.java
+++ b/core/trino-main/src/main/java/io/trino/sql/ExpressionUtils.java
@@ -293,7 +293,7 @@ public static boolean isEffectivelyLiteral(PlannerContext plannerContext, Sessio
             QualifiedName functionName = ((FunctionCall) expression).getName();
             if (isResolved(functionName)) {
                 ResolvedFunction resolvedFunction = plannerContext.getMetadata().decodeFunction(functionName);
-                return LITERAL_FUNCTION_NAME.equals(resolvedFunction.getSignature().getName());
+                return LITERAL_FUNCTION_NAME.equals(resolvedFunction.getSignature().getName().getFunctionName());
             }
         }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/ParsingUtil.java b/core/trino-main/src/main/java/io/trino/sql/ParsingUtil.java
deleted file mode 100644
index 0a46e0854387..000000000000
--- a/core/trino-main/src/main/java/io/trino/sql/ParsingUtil.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed 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 io.trino.sql;
-
-import io.trino.Session;
-import io.trino.sql.parser.ParsingOptions;
-
-import static io.trino.SystemSessionProperties.isParseDecimalLiteralsAsDouble;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DECIMAL;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DOUBLE;
-
-public final class ParsingUtil
-{
-    public static ParsingOptions createParsingOptions(Session session)
-    {
-        return new ParsingOptions(isParseDecimalLiteralsAsDouble(session) ? AS_DOUBLE : AS_DECIMAL);
-    }
-
-    private ParsingUtil() {}
-}
diff --git a/core/trino-main/src/main/java/io/trino/sql/PlannerContext.java b/core/trino-main/src/main/java/io/trino/sql/PlannerContext.java
index 5bf90f91e5fb..afb23f58186b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/PlannerContext.java
+++ b/core/trino-main/src/main/java/io/trino/sql/PlannerContext.java
@@ -13,14 +13,18 @@
  */
 package io.trino.sql;
 
+import com.google.inject.Inject;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.FunctionManager;
+import io.trino.metadata.FunctionResolver;
+import io.trino.metadata.LanguageFunctionManager;
 import io.trino.metadata.Metadata;
+import io.trino.metadata.ResolvedFunction.ResolvedFunctionDecoder;
 import io.trino.spi.block.BlockEncodingSerde;
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeOperators;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -39,19 +43,28 @@ public class PlannerContext
     private final BlockEncodingSerde blockEncodingSerde;
     private final TypeManager typeManager;
     private final FunctionManager functionManager;
+    private final LanguageFunctionManager languageFunctionManager;
+    private final Tracer tracer;
+    private final ResolvedFunctionDecoder functionDecoder;
 
     @Inject
     public PlannerContext(Metadata metadata,
             TypeOperators typeOperators,
             BlockEncodingSerde blockEncodingSerde,
             TypeManager typeManager,
-            FunctionManager functionManager)
+            FunctionManager functionManager,
+            LanguageFunctionManager languageFunctionManager,
+            Tracer tracer)
     {
         this.metadata = requireNonNull(metadata, "metadata is null");
         this.typeOperators = requireNonNull(typeOperators, "typeOperators is null");
         this.blockEncodingSerde = requireNonNull(blockEncodingSerde, "blockEncodingSerde is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         this.functionManager = requireNonNull(functionManager, "functionManager is null");
+        this.languageFunctionManager = requireNonNull(languageFunctionManager, "languageFunctionManager is null");
+        // the function decoder contains caches that are critical for planner performance so this must be shared
+        this.functionDecoder = new ResolvedFunctionDecoder(typeManager::getType);
+        this.tracer = requireNonNull(tracer, "tracer is null");
     }
 
     public Metadata getMetadata()
@@ -78,4 +91,29 @@ public FunctionManager getFunctionManager()
     {
         return functionManager;
     }
+
+    public ResolvedFunctionDecoder getFunctionDecoder()
+    {
+        return functionDecoder;
+    }
+
+    public FunctionResolver getFunctionResolver()
+    {
+        return getFunctionResolver(WarningCollector.NOOP);
+    }
+
+    public FunctionResolver getFunctionResolver(WarningCollector warningCollector)
+    {
+        return new FunctionResolver(metadata, typeManager, languageFunctionManager, functionDecoder, warningCollector);
+    }
+
+    public LanguageFunctionManager getLanguageFunctionManager()
+    {
+        return languageFunctionManager;
+    }
+
+    public Tracer getTracer()
+    {
+        return tracer;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/SqlEnvironmentConfig.java b/core/trino-main/src/main/java/io/trino/sql/SqlEnvironmentConfig.java
index 382d2263c445..6c67d1c72a69 100644
--- a/core/trino-main/src/main/java/io/trino/sql/SqlEnvironmentConfig.java
+++ b/core/trino-main/src/main/java/io/trino/sql/SqlEnvironmentConfig.java
@@ -16,21 +16,26 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.trino.spi.type.TimeZoneKey;
+import io.trino.sql.parser.ParsingException;
+import io.trino.sql.tree.Identifier;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotNull;
 
-import javax.annotation.Nullable;
-import javax.validation.constraints.NotNull;
-
+import java.util.List;
 import java.util.Optional;
 
 public class SqlEnvironmentConfig
 {
-    private Optional<String> path = Optional.empty();
+    private String path = "";
     private Optional<String> defaultCatalog = Optional.empty();
     private Optional<String> defaultSchema = Optional.empty();
+    private Optional<String> defaultFunctionCatalog = Optional.empty();
+    private Optional<String> defaultFunctionSchema = Optional.empty();
     private Optional<TimeZoneKey> forcedSessionTimeZone = Optional.empty();
 
     @NotNull
-    public Optional<String> getPath()
+    public String getPath()
     {
         return path;
     }
@@ -38,7 +43,7 @@ public Optional<String> getPath()
     @Config("sql.path")
     public SqlEnvironmentConfig setPath(String path)
     {
-        this.path = Optional.ofNullable(path);
+        this.path = path;
         return this;
     }
 
@@ -68,6 +73,32 @@ public SqlEnvironmentConfig setDefaultSchema(String schema)
         return this;
     }
 
+    @NotNull
+    public Optional<String> getDefaultFunctionCatalog()
+    {
+        return defaultFunctionCatalog;
+    }
+
+    @Config("sql.default-function-catalog")
+    public SqlEnvironmentConfig setDefaultFunctionCatalog(String catalog)
+    {
+        this.defaultFunctionCatalog = Optional.ofNullable(catalog);
+        return this;
+    }
+
+    @NotNull
+    public Optional<String> getDefaultFunctionSchema()
+    {
+        return defaultFunctionSchema;
+    }
+
+    @Config("sql.default-function-schema")
+    public SqlEnvironmentConfig setDefaultFunctionSchema(String schema)
+    {
+        this.defaultFunctionSchema = Optional.ofNullable(schema);
+        return this;
+    }
+
     @NotNull
     public Optional<TimeZoneKey> getForcedSessionTimeZone()
     {
@@ -82,4 +113,39 @@ public SqlEnvironmentConfig setForcedSessionTimeZone(@Nullable String timeZoneId
                 .map(TimeZoneKey::getTimeZoneKey);
         return this;
     }
+
+    @AssertTrue(message = "sql.path must be a valid SQL path")
+    public boolean isSqlPathValid()
+    {
+        return path.isEmpty() || validParsedSqlPath().isPresent();
+    }
+
+    @AssertTrue(message = "sql.default-function-catalog and sql.default-function-schema must be set together")
+    public boolean isBothFunctionCatalogAndSchemaSet()
+    {
+        return defaultFunctionCatalog.isPresent() == defaultFunctionSchema.isPresent();
+    }
+
+    @AssertTrue(message = "default function schema must be in the default SQL path")
+    public boolean isFunctionSchemaInSqlPath()
+    {
+        if (defaultFunctionCatalog.isEmpty() || defaultFunctionSchema.isEmpty()) {
+            return true;
+        }
+
+        SqlPathElement function = new SqlPathElement(
+                defaultFunctionCatalog.map(Identifier::new),
+                defaultFunctionSchema.map(Identifier::new).orElseThrow());
+        return validParsedSqlPath().map(path -> path.contains(function)).orElse(false);
+    }
+
+    private Optional<List<SqlPathElement>> validParsedSqlPath()
+    {
+        try {
+            return Optional.of(SqlPath.parsePath(path));
+        }
+        catch (ParsingException e) {
+            return Optional.empty();
+        }
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/SqlFormatterUtil.java b/core/trino-main/src/main/java/io/trino/sql/SqlFormatterUtil.java
index 488b3ba6dd34..a63af0155fdd 100644
--- a/core/trino-main/src/main/java/io/trino/sql/SqlFormatterUtil.java
+++ b/core/trino-main/src/main/java/io/trino/sql/SqlFormatterUtil.java
@@ -15,14 +15,11 @@
 
 import io.trino.spi.TrinoException;
 import io.trino.sql.parser.ParsingException;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.Statement;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.REJECT;
 import static java.lang.String.format;
 
 public final class SqlFormatterUtil
@@ -36,8 +33,7 @@ public static String getFormattedSql(Statement statement, SqlParser sqlParser)
         // verify round-trip
         Statement parsed;
         try {
-            ParsingOptions parsingOptions = new ParsingOptions(REJECT /* formatted SQL should be unambiguous */);
-            parsed = sqlParser.createStatement(sql, parsingOptions);
+            parsed = sqlParser.createStatement(sql);
         }
         catch (ParsingException e) {
             throw formattingFailure(e, "Formatted query does not parse", statement, sql);
diff --git a/core/trino-main/src/main/java/io/trino/sql/SqlPath.java b/core/trino-main/src/main/java/io/trino/sql/SqlPath.java
index 8ef62d1b574d..711a3e3f3ff2 100644
--- a/core/trino-main/src/main/java/io/trino/sql/SqlPath.java
+++ b/core/trino-main/src/main/java/io/trino/sql/SqlPath.java
@@ -15,65 +15,75 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
+import io.trino.connector.system.GlobalSystemConnector;
+import io.trino.metadata.GlobalFunctionCatalog;
+import io.trino.metadata.LanguageFunctionManager;
+import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.sql.parser.SqlParser;
+import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.PathElement;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.metadata.GlobalFunctionCatalog.BUILTIN_SCHEMA;
 import static java.util.Objects.requireNonNull;
 
 public final class SqlPath
 {
-    private List<SqlPathElement> parsedPath;
-    private final Optional<String> rawPath;
+    public static final SqlPath EMPTY_PATH = buildPath("", Optional.empty());
 
-    public SqlPath(String path)
+    private final List<CatalogSchemaName> path;
+    private final String rawPath;
+
+    public static SqlPath buildPath(String rawPath, Optional<String> defaultCatalog)
     {
-        requireNonNull(path, "path is null");
-        this.rawPath = Optional.of(path);
+        ImmutableList.Builder<CatalogSchemaName> path = ImmutableList.builder();
+        path.add(new CatalogSchemaName(GlobalSystemConnector.NAME, LanguageFunctionManager.QUERY_LOCAL_SCHEMA));
+        path.add(new CatalogSchemaName(GlobalSystemConnector.NAME, GlobalFunctionCatalog.BUILTIN_SCHEMA));
+        for (SqlPathElement pathElement : parsePath(rawPath)) {
+            pathElement.getCatalog()
+                    .map(Identifier::getValue).or(() -> defaultCatalog)
+                    .ifPresent(catalog -> path.add(new CatalogSchemaName(catalog, pathElement.getSchema().getValue())));
+        }
+        return new SqlPath(path.build(), rawPath);
     }
 
     @JsonCreator
-    public SqlPath(@JsonProperty("rawPath") Optional<String> path)
+    public SqlPath(@JsonProperty List<CatalogSchemaName> path, @JsonProperty String rawPath)
     {
-        requireNonNull(path, "path is null");
-        this.rawPath = path;
-        if (rawPath.isEmpty()) {
-            parsedPath = ImmutableList.of();
-        }
+        this.path = ImmutableList.copyOf(path);
+        this.rawPath = requireNonNull(rawPath, "rawPath is null");
     }
 
     @JsonProperty
-    public Optional<String> getRawPath()
+    public String getRawPath()
     {
         return rawPath;
     }
 
-    public List<SqlPathElement> getParsedPath()
+    @JsonProperty
+    public List<CatalogSchemaName> getPath()
     {
-        if (parsedPath == null) {
-            parsePath();
-        }
-
-        return parsedPath;
+        return path;
     }
 
-    private void parsePath()
+    public static List<SqlPathElement> parsePath(String rawPath)
     {
-        checkState(rawPath.isPresent(), "rawPath must be present to parse");
+        if (rawPath.isBlank()) {
+            return ImmutableList.of();
+        }
 
         SqlParser parser = new SqlParser();
-        List<PathElement> pathSpecification = parser.createPathSpecification(rawPath.get()).getPath();
+        List<PathElement> pathSpecification = parser.createPathSpecification(rawPath).getPath();
 
-        this.parsedPath = pathSpecification.stream()
+        List<SqlPathElement> pathElements = pathSpecification.stream()
                 .map(pathElement -> new SqlPathElement(pathElement.getCatalog(), pathElement.getSchema()))
                 .collect(toImmutableList());
+        return pathElements;
     }
 
     @Override
@@ -86,22 +96,30 @@ public boolean equals(Object obj)
             return false;
         }
         SqlPath that = (SqlPath) obj;
-        return Objects.equals(parsedPath, that.parsedPath);
+        return Objects.equals(path, that.path);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(parsedPath);
+        return Objects.hash(path);
     }
 
     @Override
     public String toString()
     {
-        if (rawPath.isPresent()) {
-            return Joiner.on(", ").join(getParsedPath());
-        }
-        //empty string is only used for an uninitialized path, as an empty path would be \"\"
-        return "";
+        return rawPath;
+    }
+
+    public SqlPath forView(List<CatalogSchemaName> storedPath)
+    {
+        // For a view, we prepend the global function schema to the path, as the
+        // global function schema should not be in the path that is stored for the view.
+        // We do not change the raw path, as that is used for the current_path function.
+        List<CatalogSchemaName> viewPath = ImmutableList.<CatalogSchemaName>builder()
+                .add(new CatalogSchemaName(GlobalSystemConnector.NAME, BUILTIN_SCHEMA))
+                .addAll(storedPath)
+                .build();
+        return new SqlPath(viewPath, rawPath);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/AggregationAnalyzer.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/AggregationAnalyzer.java
index d37e5a93dd7e..4e68a3a1a593 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/AggregationAnalyzer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/AggregationAnalyzer.java
@@ -15,8 +15,10 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.Session;
-import io.trino.metadata.Metadata;
+import io.trino.metadata.FunctionResolver;
+import io.trino.security.AccessControl;
 import io.trino.spi.StandardErrorCode;
+import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.ScopeAware;
 import io.trino.sql.tree.ArithmeticBinaryExpression;
 import io.trino.sql.tree.ArithmeticUnaryExpression;
@@ -76,8 +78,7 @@
 import io.trino.sql.tree.WindowOperation;
 import io.trino.sql.tree.WindowReference;
 import io.trino.sql.tree.WindowSpecification;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Map;
@@ -119,8 +120,9 @@ class AggregationAnalyzer
     private final Map<NodeRef<Expression>, ResolvedField> columnReferences;
 
     private final Session session;
-    private final Metadata metadata;
     private final Analysis analysis;
+    private final FunctionResolver functionResolver;
+    private final AccessControl accessControl;
 
     private final Scope sourceScope;
     private final Optional<Scope> orderByScope;
@@ -130,10 +132,11 @@ public static void verifySourceAggregations(
             Scope sourceScope,
             List<Expression> expressions,
             Session session,
-            Metadata metadata,
+            PlannerContext plannerContext,
+            AccessControl accessControl,
             Analysis analysis)
     {
-        AggregationAnalyzer analyzer = new AggregationAnalyzer(groupByExpressions, sourceScope, Optional.empty(), session, metadata, analysis);
+        AggregationAnalyzer analyzer = new AggregationAnalyzer(groupByExpressions, sourceScope, Optional.empty(), session, plannerContext, accessControl, analysis);
         for (Expression expression : expressions) {
             analyzer.analyze(expression);
         }
@@ -145,10 +148,11 @@ public static void verifyOrderByAggregations(
             Scope orderByScope,
             List<Expression> expressions,
             Session session,
-            Metadata metadata,
+            PlannerContext plannerContext,
+            AccessControl accessControl,
             Analysis analysis)
     {
-        AggregationAnalyzer analyzer = new AggregationAnalyzer(groupByExpressions, sourceScope, Optional.of(orderByScope), session, metadata, analysis);
+        AggregationAnalyzer analyzer = new AggregationAnalyzer(groupByExpressions, sourceScope, Optional.of(orderByScope), session, plannerContext, accessControl, analysis);
         for (Expression expression : expressions) {
             analyzer.analyze(expression);
         }
@@ -159,24 +163,27 @@ private AggregationAnalyzer(
             Scope sourceScope,
             Optional<Scope> orderByScope,
             Session session,
-            Metadata metadata,
+            PlannerContext plannerContext,
+            AccessControl accessControl,
             Analysis analysis)
     {
         requireNonNull(groupByExpressions, "groupByExpressions is null");
         requireNonNull(sourceScope, "sourceScope is null");
         requireNonNull(orderByScope, "orderByScope is null");
         requireNonNull(session, "session is null");
-        requireNonNull(metadata, "metadata is null");
+        requireNonNull(plannerContext, "metadata is null");
+        requireNonNull(accessControl, "accessControl is null");
         requireNonNull(analysis, "analysis is null");
 
         this.sourceScope = sourceScope;
         this.orderByScope = orderByScope;
         this.session = session;
-        this.metadata = metadata;
         this.analysis = analysis;
+        this.accessControl = accessControl;
         this.expressions = groupByExpressions.stream()
                 .map(expression -> scopeAwareKey(expression, analysis, sourceScope))
                 .collect(toImmutableSet());
+        functionResolver = plannerContext.getFunctionResolver();
 
         // No defensive copy here for performance reasons.
         // Copying this map may lead to quadratic time complexity
@@ -367,9 +374,9 @@ protected Boolean visitFormat(Format node, Void context)
         @Override
         protected Boolean visitFunctionCall(FunctionCall node, Void context)
         {
-            if (metadata.isAggregationFunction(session, node.getName())) {
+            if (functionResolver.isAggregationFunction(session, node.getName(), accessControl)) {
                 if (node.getWindow().isEmpty()) {
-                    List<FunctionCall> aggregateFunctions = extractAggregateFunctions(node.getArguments(), session, metadata);
+                    List<FunctionCall> aggregateFunctions = extractAggregateFunctions(node.getArguments(), session, functionResolver, accessControl);
                     List<Expression> windowExpressions = extractWindowExpressions(node.getArguments());
 
                     if (!aggregateFunctions.isEmpty()) {
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/Analysis.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/Analysis.java
index 8f47959127fc..6e8df1cf50a8 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/Analysis.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/Analysis.java
@@ -23,6 +23,8 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multiset;
 import com.google.common.collect.Streams;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.metadata.AnalyzeMetadata;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.ResolvedFunction;
@@ -33,6 +35,7 @@
 import io.trino.security.SecurityContext;
 import io.trino.spi.QueryId;
 import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.connector.CatalogHandle.CatalogVersion;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnSchema;
 import io.trino.spi.connector.ConnectorTableMetadata;
@@ -41,8 +44,8 @@
 import io.trino.spi.eventlistener.ColumnInfo;
 import io.trino.spi.eventlistener.RoutineInfo;
 import io.trino.spi.eventlistener.TableInfo;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.security.Identity;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
@@ -82,10 +85,9 @@
 import io.trino.sql.tree.WindowFrame;
 import io.trino.sql.tree.WindowOperation;
 import io.trino.transaction.TransactionId;
+import jakarta.annotation.Nullable;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
+import java.time.Instant;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -265,7 +267,7 @@ public Optional<Output> getTarget()
     {
         return target.map(target -> {
             QualifiedObjectName name = target.getName();
-            return new Output(name.getCatalogName(), name.getSchemaName(), name.getObjectName(), target.getColumns());
+            return new Output(name.getCatalogName(), target.getCatalogVersion(), name.getSchemaName(), name.getObjectName(), target.getColumns());
         });
     }
 
@@ -276,9 +278,9 @@ public void setUpdateType(String updateType)
         }
     }
 
-    public void setUpdateTarget(QualifiedObjectName targetName, Optional<Table> targetTable, Optional<List<OutputColumn>> targetColumns)
+    public void setUpdateTarget(CatalogVersion catalogVersion, QualifiedObjectName targetName, Optional<Table> targetTable, Optional<List<OutputColumn>> targetColumns)
     {
-        this.target = Optional.of(new UpdateTarget(targetName, targetTable, targetColumns));
+        this.target = Optional.of(new UpdateTarget(catalogVersion, targetName, targetTable, targetColumns));
     }
 
     public boolean isUpdateTarget(Table table)
@@ -646,6 +648,13 @@ public void registerTable(
                                 columnMaskScopes.isEmpty()));
     }
 
+    public Set<ResolvedFunction> getResolvedFunctions()
+    {
+        return resolvedFunctions.values().stream()
+                .map(RoutineEntry::getFunction)
+                .collect(toImmutableSet());
+    }
+
     public ResolvedFunction getResolvedFunction(Expression node)
     {
         return resolvedFunctions.get(NodeRef.of(node)).getFunction();
@@ -678,6 +687,11 @@ public boolean isColumnReference(Expression expression)
         return columnReferences.containsKey(NodeRef.of(expression));
     }
 
+    public void addType(Expression expression, Type type)
+    {
+        this.types.put(NodeRef.of(expression), type);
+    }
+
     public void addTypes(Map<NodeRef<Expression>, Type> types)
     {
         this.types.putAll(types);
@@ -1153,7 +1167,7 @@ public List<TableInfo> getReferencedTables()
     public List<RoutineInfo> getRoutines()
     {
         return resolvedFunctions.values().stream()
-                .map(value -> new RoutineInfo(value.function.getSignature().getName(), value.getAuthorization()))
+                .map(value -> new RoutineInfo(value.function.getSignature().getName().getFunctionName(), value.getAuthorization()))
                 .collect(toImmutableList());
     }
 
@@ -1314,19 +1328,22 @@ public static final class Create
         private final Optional<TableLayout> layout;
         private final boolean createTableAsSelectWithData;
         private final boolean createTableAsSelectNoOp;
+        private final boolean replace;
 
         public Create(
                 Optional<QualifiedObjectName> destination,
                 Optional<ConnectorTableMetadata> metadata,
                 Optional<TableLayout> layout,
                 boolean createTableAsSelectWithData,
-                boolean createTableAsSelectNoOp)
+                boolean createTableAsSelectNoOp,
+                boolean replace)
         {
             this.destination = requireNonNull(destination, "destination is null");
             this.metadata = requireNonNull(metadata, "metadata is null");
             this.layout = requireNonNull(layout, "layout is null");
             this.createTableAsSelectWithData = createTableAsSelectWithData;
             this.createTableAsSelectNoOp = createTableAsSelectNoOp;
+            this.replace = replace;
         }
 
         public Optional<QualifiedObjectName> getDestination()
@@ -1353,6 +1370,11 @@ public boolean isCreateTableAsSelectNoOp()
         {
             return createTableAsSelectNoOp;
         }
+
+        public boolean isReplace()
+        {
+            return replace;
+        }
     }
 
     @Immutable
@@ -1473,15 +1495,15 @@ public static class GroupingSetAnalysis
     {
         private final List<Expression> originalExpressions;
 
-        private final List<Set<FieldId>> cubes;
-        private final List<List<FieldId>> rollups;
+        private final List<List<Set<FieldId>>> cubes;
+        private final List<List<Set<FieldId>>> rollups;
         private final List<List<Set<FieldId>>> ordinarySets;
         private final List<Expression> complexExpressions;
 
         public GroupingSetAnalysis(
                 List<Expression> originalExpressions,
-                List<Set<FieldId>> cubes,
-                List<List<FieldId>> rollups,
+                List<List<Set<FieldId>>> cubes,
+                List<List<Set<FieldId>>> rollups,
                 List<List<Set<FieldId>>> ordinarySets,
                 List<Expression> complexExpressions)
         {
@@ -1497,12 +1519,12 @@ public List<Expression> getOriginalExpressions()
             return originalExpressions;
         }
 
-        public List<Set<FieldId>> getCubes()
+        public List<List<Set<FieldId>>> getCubes()
         {
             return cubes;
         }
 
-        public List<List<FieldId>> getRollups()
+        public List<List<Set<FieldId>>> getRollups()
         {
             return rollups;
         }
@@ -1520,8 +1542,12 @@ public List<Expression> getComplexExpressions()
         public Set<FieldId> getAllFields()
         {
             return Streams.concat(
-                    cubes.stream().flatMap(Collection::stream),
-                    rollups.stream().flatMap(Collection::stream),
+                    cubes.stream()
+                            .flatMap(Collection::stream)
+                            .flatMap(Collection::stream),
+                    rollups.stream()
+                            .flatMap(Collection::stream)
+                            .flatMap(Collection::stream),
                     ordinarySets.stream()
                             .flatMap(Collection::stream)
                             .flatMap(Collection::stream))
@@ -1682,6 +1708,30 @@ public boolean isFrameInherited()
         {
             return frameInherited;
         }
+
+        @Override
+        public boolean equals(Object o)
+        {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            ResolvedWindow that = (ResolvedWindow) o;
+            return partitionByInherited == that.partitionByInherited &&
+                    orderByInherited == that.orderByInherited &&
+                    frameInherited == that.frameInherited &&
+                    partitionBy.equals(that.partitionBy) &&
+                    orderBy.equals(that.orderBy) &&
+                    frame.equals(that.frame);
+        }
+
+        @Override
+        public int hashCode()
+        {
+            return Objects.hash(partitionBy, orderBy, frame, partitionByInherited, orderByInherited, frameInherited);
+        }
     }
 
     public static class MergeAnalysis
@@ -1812,9 +1862,9 @@ public AccessControl getAccessControl()
             return accessControl;
         }
 
-        public SecurityContext getSecurityContext(TransactionId transactionId, QueryId queryId)
+        public SecurityContext getSecurityContext(TransactionId transactionId, QueryId queryId, Instant queryStart)
         {
-            return new SecurityContext(transactionId, identity, queryId);
+            return new SecurityContext(transactionId, identity, queryId, queryStart);
         }
 
         @Override
@@ -2034,17 +2084,24 @@ public String getAuthorization()
 
     private static class UpdateTarget
     {
+        private final CatalogVersion catalogVersion;
         private final QualifiedObjectName name;
         private final Optional<Table> table;
         private final Optional<List<OutputColumn>> columns;
 
-        public UpdateTarget(QualifiedObjectName name, Optional<Table> table, Optional<List<OutputColumn>> columns)
+        public UpdateTarget(CatalogVersion catalogVersion, QualifiedObjectName name, Optional<Table> table, Optional<List<OutputColumn>> columns)
         {
+            this.catalogVersion = requireNonNull(catalogVersion, "catalogVersion is null");
             this.name = requireNonNull(name, "name is null");
             this.table = requireNonNull(table, "table is null");
             this.columns = columns.map(ImmutableList::copyOf);
         }
 
+        private CatalogVersion getCatalogVersion()
+        {
+            return catalogVersion;
+        }
+
         public QualifiedObjectName getName()
         {
             return name;
@@ -2172,48 +2229,56 @@ public static final class Builder
 
             private Builder() {}
 
+            @CanIgnoreReturnValue
             public Builder withArgumentName(String argumentName)
             {
                 this.argumentName = argumentName;
                 return this;
             }
 
+            @CanIgnoreReturnValue
             public Builder withName(QualifiedName name)
             {
                 this.name = Optional.of(name);
                 return this;
             }
 
+            @CanIgnoreReturnValue
             public Builder withRelation(Relation relation)
             {
                 this.relation = relation;
                 return this;
             }
 
+            @CanIgnoreReturnValue
             public Builder withPartitionBy(List<Expression> partitionBy)
             {
                 this.partitionBy = Optional.of(partitionBy);
                 return this;
             }
 
+            @CanIgnoreReturnValue
             public Builder withOrderBy(OrderBy orderBy)
             {
                 this.orderBy = Optional.of(orderBy);
                 return this;
             }
 
+            @CanIgnoreReturnValue
             public Builder withPruneWhenEmpty(boolean pruneWhenEmpty)
             {
                 this.pruneWhenEmpty = pruneWhenEmpty;
                 return this;
             }
 
+            @CanIgnoreReturnValue
             public Builder withRowSemantics(boolean rowSemantics)
             {
                 this.rowSemantics = rowSemantics;
                 return this;
             }
 
+            @CanIgnoreReturnValue
             public Builder withPassThroughColumns(boolean passThroughColumns)
             {
                 this.passThroughColumns = passThroughColumns;
@@ -2230,7 +2295,6 @@ public TableArgumentAnalysis build()
     public static class TableFunctionInvocationAnalysis
     {
         private final CatalogHandle catalogHandle;
-        private final String schemaName;
         private final String functionName;
         private final Map<String, Argument> arguments;
         private final List<TableArgumentAnalysis> tableArgumentAnalyses;
@@ -2242,7 +2306,6 @@ public static class TableFunctionInvocationAnalysis
 
         public TableFunctionInvocationAnalysis(
                 CatalogHandle catalogHandle,
-                String schemaName,
                 String functionName,
                 Map<String, Argument> arguments,
                 List<TableArgumentAnalysis> tableArgumentAnalyses,
@@ -2253,7 +2316,6 @@ public TableFunctionInvocationAnalysis(
                 ConnectorTransactionHandle transactionHandle)
         {
             this.catalogHandle = requireNonNull(catalogHandle, "catalogHandle is null");
-            this.schemaName = requireNonNull(schemaName, "schemaName is null");
             this.functionName = requireNonNull(functionName, "functionName is null");
             this.arguments = ImmutableMap.copyOf(arguments);
             this.tableArgumentAnalyses = ImmutableList.copyOf(tableArgumentAnalyses);
@@ -2270,11 +2332,6 @@ public CatalogHandle getCatalogHandle()
             return catalogHandle;
         }
 
-        public String getSchemaName()
-        {
-            return schemaName;
-        }
-
         public String getFunctionName()
         {
             return functionName;
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/Analyzer.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/Analyzer.java
index 8ba49b09fe8d..35dc0685020b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/Analyzer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/Analyzer.java
@@ -15,10 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
 import io.trino.Session;
 import io.trino.execution.querystats.PlanOptimizersStatsCollector;
 import io.trino.execution.warnings.WarningCollector;
-import io.trino.metadata.Metadata;
+import io.trino.metadata.FunctionResolver;
+import io.trino.security.AccessControl;
 import io.trino.sql.rewrite.StatementRewrite;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FunctionCall;
@@ -29,7 +33,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import static io.trino.spi.StandardErrorCode.EXPRESSION_NOT_SCALAR;
 import static io.trino.sql.analyzer.ExpressionTreeUtils.extractAggregateFunctions;
@@ -37,6 +40,7 @@
 import static io.trino.sql.analyzer.ExpressionTreeUtils.extractWindowExpressions;
 import static io.trino.sql.analyzer.QueryType.OTHERS;
 import static io.trino.sql.analyzer.SemanticExceptions.semanticException;
+import static io.trino.tracing.ScopedSpan.scopedSpan;
 import static java.util.Objects.requireNonNull;
 
 public class Analyzer
@@ -47,7 +51,8 @@ public class Analyzer
     private final List<Expression> parameters;
     private final Map<NodeRef<Parameter>, Expression> parameterLookup;
     private final WarningCollector warningCollector;
-    private PlanOptimizersStatsCollector planOptimizersStatsCollector;
+    private final PlanOptimizersStatsCollector planOptimizersStatsCollector;
+    private final Tracer tracer;
     private final StatementRewrite statementRewrite;
 
     Analyzer(
@@ -58,6 +63,7 @@ public class Analyzer
             Map<NodeRef<Parameter>, Expression> parameterLookup,
             WarningCollector warningCollector,
             PlanOptimizersStatsCollector planOptimizersStatsCollector,
+            Tracer tracer,
             StatementRewrite statementRewrite)
     {
         this.session = requireNonNull(session, "session is null");
@@ -66,13 +72,19 @@ public class Analyzer
         this.parameters = parameters;
         this.parameterLookup = parameterLookup;
         this.warningCollector = requireNonNull(warningCollector, "warningCollector is null");
-        this.planOptimizersStatsCollector = requireNonNull(planOptimizersStatsCollector, "queryStatsCollector is null");
+        this.planOptimizersStatsCollector = requireNonNull(planOptimizersStatsCollector, "planOptimizersStatsCollector is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
         this.statementRewrite = requireNonNull(statementRewrite, "statementRewrite is null");
     }
 
     public Analysis analyze(Statement statement)
     {
-        return analyze(statement, OTHERS);
+        Span span = tracer.spanBuilder("analyzer")
+                .setParent(Context.current().with(session.getQuerySpan()))
+                .startSpan();
+        try (var ignored = scopedSpan(span)) {
+            return analyze(statement, OTHERS);
+        }
     }
 
     public Analysis analyze(Statement statement, QueryType queryType)
@@ -80,23 +92,29 @@ public Analysis analyze(Statement statement, QueryType queryType)
         Statement rewrittenStatement = statementRewrite.rewrite(analyzerFactory, session, statement, parameters, parameterLookup, warningCollector, planOptimizersStatsCollector);
         Analysis analysis = new Analysis(rewrittenStatement, parameterLookup, queryType);
         StatementAnalyzer analyzer = statementAnalyzerFactory.createStatementAnalyzer(analysis, session, warningCollector, CorrelationSupport.ALLOWED);
-        analyzer.analyze(rewrittenStatement, Optional.empty());
 
-        // check column access permissions for each table
-        analysis.getTableColumnReferences().forEach((accessControlInfo, tableColumnReferences) ->
-                tableColumnReferences.forEach((tableName, columns) ->
-                        accessControlInfo.getAccessControl().checkCanSelectFromColumns(
-                                accessControlInfo.getSecurityContext(session.getRequiredTransactionId(), session.getQueryId()),
-                                tableName,
-                                columns)));
+        try (var ignored = scopedSpan(tracer, "analyze")) {
+            analyzer.analyze(rewrittenStatement);
+        }
+
+        try (var ignored = scopedSpan(tracer, "access-control")) {
+            // check column access permissions for each table
+            analysis.getTableColumnReferences().forEach((accessControlInfo, tableColumnReferences) ->
+                    tableColumnReferences.forEach((tableName, columns) ->
+                            accessControlInfo.getAccessControl().checkCanSelectFromColumns(
+                                    accessControlInfo.getSecurityContext(session.getRequiredTransactionId(), session.getQueryId(), session.getStart()),
+                                    tableName,
+                                    columns)));
+        }
+
         return analysis;
     }
 
-    static void verifyNoAggregateWindowOrGroupingFunctions(Session session, Metadata metadata, Expression predicate, String clause)
+    static void verifyNoAggregateWindowOrGroupingFunctions(Session session, FunctionResolver functionResolver, AccessControl accessControl, Expression predicate, String clause)
     {
-        List<FunctionCall> aggregates = extractAggregateFunctions(ImmutableList.of(predicate), session, metadata);
+        List<FunctionCall> aggregates = extractAggregateFunctions(ImmutableList.of(predicate), session, functionResolver, accessControl);
 
-        List<Expression> windowExpressions = extractWindowExpressions(ImmutableList.of(predicate));
+        List<Expression> windowExpressions = extractWindowExpressions(ImmutableList.of(predicate), session, functionResolver, accessControl);
 
         List<GroupingOperation> groupingOperations = extractExpressions(ImmutableList.of(predicate), GroupingOperation.class);
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/AnalyzerFactory.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/AnalyzerFactory.java
index 354605386e8c..424bac0dcd92 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/AnalyzerFactory.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/AnalyzerFactory.java
@@ -13,6 +13,8 @@
  */
 package io.trino.sql.analyzer;
 
+import com.google.inject.Inject;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.Session;
 import io.trino.execution.querystats.PlanOptimizersStatsCollector;
 import io.trino.execution.warnings.WarningCollector;
@@ -21,8 +23,6 @@
 import io.trino.sql.tree.NodeRef;
 import io.trino.sql.tree.Parameter;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 
@@ -32,12 +32,14 @@ public class AnalyzerFactory
 {
     private final StatementAnalyzerFactory statementAnalyzerFactory;
     private final StatementRewrite statementRewrite;
+    private final Tracer tracer;
 
     @Inject
-    public AnalyzerFactory(StatementAnalyzerFactory statementAnalyzerFactory, StatementRewrite statementRewrite)
+    public AnalyzerFactory(StatementAnalyzerFactory statementAnalyzerFactory, StatementRewrite statementRewrite, Tracer tracer)
     {
         this.statementAnalyzerFactory = requireNonNull(statementAnalyzerFactory, "statementAnalyzerFactory is null");
         this.statementRewrite = requireNonNull(statementRewrite, "statementRewrite is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
     }
 
     public Analyzer createAnalyzer(
@@ -55,6 +57,7 @@ public Analyzer createAnalyzer(
                 parameterLookup,
                 warningCollector,
                 planOptimizersStatsCollector,
+                tracer,
                 statementRewrite);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/ExpressionAnalyzer.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/ExpressionAnalyzer.java
index bdc7b4bd0d91..16c53150c043 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/ExpressionAnalyzer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/ExpressionAnalyzer.java
@@ -24,19 +24,18 @@
 import com.google.common.collect.Streams;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
+import io.trino.metadata.FunctionResolver;
 import io.trino.metadata.OperatorNotFoundException;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.operator.scalar.ArrayConstructor;
 import io.trino.operator.scalar.FormatFunction;
 import io.trino.security.AccessControl;
-import io.trino.security.SecurityContext;
 import io.trino.spi.ErrorCode;
 import io.trino.spi.ErrorCodeSupplier;
 import io.trino.spi.TrinoException;
-import io.trino.spi.TrinoWarning;
 import io.trino.spi.function.BoundSignature;
-import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.function.OperatorType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DateType;
@@ -148,8 +147,7 @@
 import io.trino.type.JsonPath2016Type;
 import io.trino.type.TypeCoercion;
 import io.trino.type.UnknownType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -170,8 +168,9 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.operator.scalar.json.JsonArrayFunction.JSON_ARRAY_FUNCTION_NAME;
 import static io.trino.operator.scalar.json.JsonExistsFunction.JSON_EXISTS_FUNCTION_NAME;
 import static io.trino.operator.scalar.json.JsonInputFunctions.VARBINARY_TO_JSON;
@@ -198,6 +197,7 @@
 import static io.trino.spi.StandardErrorCode.INVALID_NAVIGATION_NESTING;
 import static io.trino.spi.StandardErrorCode.INVALID_ORDER_BY;
 import static io.trino.spi.StandardErrorCode.INVALID_PARAMETER_USAGE;
+import static io.trino.spi.StandardErrorCode.INVALID_PATH;
 import static io.trino.spi.StandardErrorCode.INVALID_PATTERN_RECOGNITION_FUNCTION;
 import static io.trino.spi.StandardErrorCode.INVALID_PROCESSING_MODE;
 import static io.trino.spi.StandardErrorCode.INVALID_WINDOW_FRAME;
@@ -213,7 +213,6 @@
 import static io.trino.spi.StandardErrorCode.TOO_MANY_ARGUMENTS;
 import static io.trino.spi.StandardErrorCode.TYPE_MISMATCH;
 import static io.trino.spi.StandardErrorCode.TYPE_NOT_FOUND;
-import static io.trino.spi.connector.StandardWarningCode.DEPRECATED_FUNCTION;
 import static io.trino.spi.function.OperatorType.ADD;
 import static io.trino.spi.function.OperatorType.SUBSCRIPT;
 import static io.trino.spi.function.OperatorType.SUBTRACT;
@@ -284,6 +283,8 @@ public class ExpressionAnalyzer
     private static final int MAX_NUMBER_GROUPING_ARGUMENTS_BIGINT = 63;
     private static final int MAX_NUMBER_GROUPING_ARGUMENTS_INTEGER = 31;
 
+    private static final CatalogSchemaFunctionName ARRAY_CONSTRUCTOR_NAME = builtinFunctionName(ArrayConstructor.NAME);
+
     public static final RowType JSON_NO_PARAMETERS_ROW_TYPE = RowType.anonymous(ImmutableList.of(UNKNOWN));
 
     private final PlannerContext plannerContext;
@@ -346,6 +347,7 @@ public class ExpressionAnalyzer
     private final Function<Expression, Type> getPreanalyzedType;
     private final Function<Node, ResolvedWindow> getResolvedWindow;
     private final List<Field> sourceFields = new ArrayList<>();
+    private final FunctionResolver functionResolver;
 
     private ExpressionAnalyzer(
             PlannerContext plannerContext,
@@ -397,6 +399,7 @@ private ExpressionAnalyzer(
         this.typeCoercion = new TypeCoercion(plannerContext.getTypeManager()::getType);
         this.getPreanalyzedType = requireNonNull(getPreanalyzedType, "getPreanalyzedType is null");
         this.getResolvedWindow = requireNonNull(getResolvedWindow, "getResolvedWindow is null");
+        this.functionResolver = plannerContext.getFunctionResolver(warningCollector);
     }
 
     public Map<NodeRef<Expression>, ResolvedFunction> getResolvedFunctions()
@@ -996,7 +999,7 @@ protected Type visitSubscriptExpression(SubscriptExpression node, StackableAstVi
                 if (!indexType.equals(INTEGER)) {
                     throw semanticException(TYPE_MISMATCH, node.getIndex(), "Subscript expression on ROW requires integer index, found %s", indexType);
                 }
-                int indexValue = toIntExact(((LongLiteral) node.getIndex()).getValue());
+                int indexValue = toIntExact(((LongLiteral) node.getIndex()).getParsedValue());
                 if (indexValue <= 0) {
                     throw semanticException(INVALID_FUNCTION_ARGUMENT, node.getIndex(), "Invalid subscript index: %s. ROW indices start at 1", indexValue);
                 }
@@ -1042,7 +1045,7 @@ protected Type visitBinaryLiteral(BinaryLiteral node, StackableAstVisitorContext
         @Override
         protected Type visitLongLiteral(LongLiteral node, StackableAstVisitorContext<Context> context)
         {
-            if (node.getValue() >= Integer.MIN_VALUE && node.getValue() <= Integer.MAX_VALUE) {
+            if (node.getParsedValue() >= Integer.MIN_VALUE && node.getParsedValue() <= Integer.MAX_VALUE) {
                 return setExpressionType(node, INTEGER);
             }
 
@@ -1063,7 +1066,7 @@ protected Type visitDecimalLiteral(DecimalLiteral node, StackableAstVisitorConte
                 parseResult = Decimals.parse(node.getValue());
             }
             catch (RuntimeException e) {
-                throw semanticException(INVALID_LITERAL, node, e, "'%s' is not a valid decimal literal", node.getValue());
+                throw semanticException(INVALID_LITERAL, node, e, "'%s' is not a valid DECIMAL literal", node.getValue());
             }
             return setExpressionType(node, parseResult.getType());
         }
@@ -1088,7 +1091,7 @@ protected Type visitGenericLiteral(GenericLiteral node, StackableAstVisitorConte
 
                 if (!JSON.equals(resolvedType)) {
                     try {
-                        plannerContext.getMetadata().getCoercion(session, VARCHAR, resolvedType);
+                        plannerContext.getMetadata().getCoercion(VARCHAR, resolvedType);
                     }
                     catch (IllegalArgumentException e) {
                         throw semanticException(INVALID_LITERAL, node, "No literal form for resolvedType %s", resolvedType);
@@ -1100,7 +1103,7 @@ protected Type visitGenericLiteral(GenericLiteral node, StackableAstVisitorConte
                 literalInterpreter.evaluate(node, type);
             }
             catch (RuntimeException e) {
-                throw semanticException(INVALID_LITERAL, node, e, "'%s' is not a valid %s literal", node.getValue(), type.getDisplayName());
+                throw semanticException(INVALID_LITERAL, node, e, "'%s' is not a valid %s literal", node.getValue(), type.getDisplayName().toUpperCase(ENGLISH));
             }
 
             return setExpressionType(node, type);
@@ -1126,7 +1129,7 @@ protected Type visitTimeLiteral(TimeLiteral node, StackableAstVisitorContext<Con
                 throw new TrinoException(e::getErrorCode, extractLocation(node), e.getMessage(), e);
             }
             catch (IllegalArgumentException e) {
-                throw semanticException(INVALID_LITERAL, node, "'%s' is not a valid time literal", node.getValue());
+                throw semanticException(INVALID_LITERAL, node, "'%s' is not a valid TIME literal", node.getValue());
             }
 
             return setExpressionType(node, type);
@@ -1152,7 +1155,7 @@ protected Type visitTimestampLiteral(TimestampLiteral node, StackableAstVisitorC
                 throw new TrinoException(e::getErrorCode, extractLocation(node), e.getMessage(), e);
             }
             catch (Exception e) {
-                throw semanticException(INVALID_LITERAL, node, e, "'%s' is not a valid timestamp literal", node.getValue());
+                throw semanticException(INVALID_LITERAL, node, e, "'%s' is not a valid TIMESTAMP literal", node.getValue());
             }
 
             return setExpressionType(node, type);
@@ -1172,7 +1175,7 @@ protected Type visitIntervalLiteral(IntervalLiteral node, StackableAstVisitorCon
                 literalInterpreter.evaluate(node, type);
             }
             catch (RuntimeException e) {
-                throw semanticException(INVALID_LITERAL, node, e, "'%s' is not a valid interval literal", node.getValue());
+                throw semanticException(INVALID_LITERAL, node, e, "'%s' is not a valid INTERVAL literal", node.getValue());
             }
             return setExpressionType(node, type);
         }
@@ -1186,8 +1189,9 @@ protected Type visitNullLiteral(NullLiteral node, StackableAstVisitorContext<Con
         @Override
         protected Type visitFunctionCall(FunctionCall node, StackableAstVisitorContext<Context> context)
         {
+            boolean isAggregation = functionResolver.isAggregationFunction(session, node.getName(), accessControl);
             boolean isRowPatternCount = context.getContext().isPatternRecognition() &&
-                    plannerContext.getMetadata().isAggregationFunction(session, node.getName()) &&
+                    isAggregation &&
                     node.getName().getSuffix().equalsIgnoreCase("count");
             // argument of the form `label.*` is only allowed for row pattern count function
             node.getArguments().stream()
@@ -1201,7 +1205,7 @@ protected Type visitFunctionCall(FunctionCall node, StackableAstVisitorContext<C
             if (context.getContext().isPatternRecognition() && isPatternRecognitionFunction(node)) {
                 return analyzePatternRecognitionFunction(node, context);
             }
-            if (context.getContext().isPatternRecognition() && plannerContext.getMetadata().isAggregationFunction(session, node.getName())) {
+            if (context.getContext().isPatternRecognition() && isAggregation) {
                 analyzePatternAggregation(node);
                 patternAggregations.add(NodeRef.of(node));
             }
@@ -1210,7 +1214,7 @@ protected Type visitFunctionCall(FunctionCall node, StackableAstVisitorContext<C
                 if (!context.getContext().isPatternRecognition()) {
                     throw semanticException(INVALID_PROCESSING_MODE, processingMode, "%s semantics is not supported out of pattern recognition context", processingMode.getMode());
                 }
-                if (!plannerContext.getMetadata().isAggregationFunction(session, node.getName())) {
+                if (!isAggregation) {
                     throw semanticException(INVALID_PROCESSING_MODE, processingMode, "%s semantics is supported only for FIRST(), LAST() and aggregation functions. Actual: %s", processingMode.getMode(), node.getName());
                 }
             }
@@ -1223,14 +1227,15 @@ protected Type visitFunctionCall(FunctionCall node, StackableAstVisitorContext<C
                 windowFunctions.add(NodeRef.of(node));
             }
             else {
-                if (node.isDistinct() && !plannerContext.getMetadata().isAggregationFunction(session, node.getName())) {
+                if (node.isDistinct() && !isAggregation) {
                     throw semanticException(FUNCTION_NOT_AGGREGATE, node, "DISTINCT is not supported for non-aggregation functions");
                 }
             }
 
             if (node.getFilter().isPresent()) {
                 Expression expression = node.getFilter().get();
-                process(expression, context);
+                Type type = process(expression, context);
+                coerceType(expression, type, BOOLEAN, "Filter expression");
             }
 
             List<TypeSignatureProvider> argumentTypes = getCallArgumentTypes(node.getArguments(), context);
@@ -1248,13 +1253,13 @@ protected Type visitFunctionCall(FunctionCall node, StackableAstVisitorContext<C
             }
 
             // must run after arguments are processed and labels are recorded
-            if (context.getContext().isPatternRecognition() && plannerContext.getMetadata().isAggregationFunction(session, node.getName())) {
+            if (context.getContext().isPatternRecognition() && isAggregation) {
                 validateAggregationLabelConsistency(node);
             }
 
             ResolvedFunction function;
             try {
-                function = plannerContext.getMetadata().resolveFunction(session, node.getName(), argumentTypes);
+                function = functionResolver.resolveFunction(session, node.getName(), argumentTypes, accessControl);
             }
             catch (TrinoException e) {
                 if (e.getLocation().isPresent()) {
@@ -1269,15 +1274,15 @@ protected Type visitFunctionCall(FunctionCall node, StackableAstVisitorContext<C
                 throw new TrinoException(e::getErrorCode, extractLocation(node), e.getMessage(), e);
             }
 
-            if (function.getSignature().getName().equalsIgnoreCase(ArrayConstructor.NAME)) {
+            if (function.getSignature().getName().equals(ARRAY_CONSTRUCTOR_NAME)) {
                 // After optimization, array constructor is rewritten to a function call.
                 // For historic reasons array constructor is allowed to have 254 arguments
                 if (node.getArguments().size() > 254) {
-                    throw semanticException(TOO_MANY_ARGUMENTS, node, "Too many arguments for array constructor", function.getSignature().getName());
+                    throw semanticException(TOO_MANY_ARGUMENTS, node, "Too many arguments for array constructor");
                 }
             }
             else if (node.getArguments().size() > 127) {
-                throw semanticException(TOO_MANY_ARGUMENTS, node, "Too many arguments for function call %s()", function.getSignature().getName());
+                throw semanticException(TOO_MANY_ARGUMENTS, node, "Too many arguments for function call %s()", function.getSignature().getName().getFunctionName());
             }
 
             if (node.getOrderBy().isPresent()) {
@@ -1308,18 +1313,8 @@ else if (node.getArguments().size() > 127) {
                     coerceType(expression, actualType, expectedType, format("Function %s argument %d", function, i));
                 }
             }
-            accessControl.checkCanExecuteFunction(SecurityContext.of(session), node.getName().toString());
-
             resolvedFunctions.put(NodeRef.of(node), function);
 
-            FunctionMetadata functionMetadata = plannerContext.getMetadata().getFunctionMetadata(session, function);
-            if (functionMetadata.isDeprecated()) {
-                warningCollector.add(new TrinoWarning(DEPRECATED_FUNCTION,
-                        format("Use of deprecated function: %s: %s",
-                                functionMetadata.getSignature().getName(),
-                                functionMetadata.getDescription())));
-            }
-
             Type type = signature.getReturnType();
             return setExpressionType(node, type);
         }
@@ -1541,7 +1536,7 @@ private void analyzeFrameRangeOffset(Expression offsetValue, FrameBound.Type bou
                 operatorType = ADD;
             }
             try {
-                function = plannerContext.getMetadata().resolveOperator(session, operatorType, ImmutableList.of(sortKeyType, offsetValueType));
+                function = plannerContext.getMetadata().resolveOperator(operatorType, ImmutableList.of(sortKeyType, offsetValueType));
             }
             catch (TrinoException e) {
                 ErrorCode errorCode = e.getErrorCode();
@@ -1685,7 +1680,7 @@ private Type analyzePatternRecognitionFunction(FunctionCall node, StackableAstVi
                         if (!(node.getArguments().get(1) instanceof LongLiteral)) {
                             throw semanticException(INVALID_FUNCTION_ARGUMENT, node, "%s pattern recognition navigation function requires a number as the second argument", node.getName());
                         }
-                        long offset = ((LongLiteral) node.getArguments().get(1)).getValue();
+                        long offset = ((LongLiteral) node.getArguments().get(1)).getParsedValue();
                         if (offset < 0) {
                             throw semanticException(NUMERIC_VALUE_OUT_OF_RANGE, node, "%s pattern recognition navigation function requires a non-negative number as the second argument (actual: %s)", node.getName(), offset);
                         }
@@ -1932,7 +1927,7 @@ private void analyzePatternAggregation(FunctionCall node)
         private void checkNoNestedAggregations(FunctionCall node)
         {
             extractExpressions(node.getArguments(), FunctionCall.class).stream()
-                    .filter(function -> plannerContext.getMetadata().isAggregationFunction(session, function.getName()))
+                    .filter(function -> functionResolver.isAggregationFunction(session, function.getName(), accessControl))
                     .findFirst()
                     .ifPresent(aggregation -> {
                         throw semanticException(
@@ -2012,7 +2007,7 @@ protected Type visitTrim(Trim node, StackableAstVisitorContext<Context> context)
             List<Type> actualTypes = argumentTypes.build();
 
             String functionName = node.getSpecification().getFunctionName();
-            ResolvedFunction function = plannerContext.getMetadata().resolveFunction(session, QualifiedName.of(functionName), fromTypes(actualTypes));
+            ResolvedFunction function = plannerContext.getMetadata().resolveBuiltinFunction(functionName, fromTypes(actualTypes));
 
             List<Type> expectedTypes = function.getSignature().getArgumentTypes();
             checkState(expectedTypes.size() == actualTypes.size(), "wrong argument number in the resolved signature");
@@ -2026,9 +2021,6 @@ protected Type visitTrim(Trim node, StackableAstVisitorContext<Context> context)
                 Type expectedTrimCharType = expectedTypes.get(1);
                 coerceType(node.getTrimCharacter().get(), actualTrimCharType, expectedTrimCharType, "trim character argument of trim function");
             }
-
-            accessControl.checkCanExecuteFunction(SecurityContext.of(session), functionName);
-
             resolvedFunctions.put(NodeRef.of(node), function);
 
             return setExpressionType(node, function.getSignature().getReturnType());
@@ -2047,7 +2039,7 @@ protected Type visitFormat(Format node, StackableAstVisitorContext<Context> cont
 
             for (int i = 1; i < arguments.size(); i++) {
                 try {
-                    plannerContext.getMetadata().resolveFunction(session, QualifiedName.of(FormatFunction.NAME), fromTypes(arguments.get(0), RowType.anonymous(arguments.subList(1, arguments.size()))));
+                    plannerContext.getMetadata().resolveBuiltinFunction(FormatFunction.NAME, fromTypes(arguments.get(0), RowType.anonymous(arguments.subList(1, arguments.size()))));
                 }
                 catch (TrinoException e) {
                     ErrorCode errorCode = e.getErrorCode();
@@ -2205,7 +2197,7 @@ public Type visitCast(Cast node, StackableAstVisitorContext<Context> context)
             Type value = process(node.getExpression(), context);
             if (!value.equals(UNKNOWN) && !node.isTypeOnly()) {
                 try {
-                    plannerContext.getMetadata().getCoercion(session, value, type);
+                    plannerContext.getMetadata().getCoercion(value, type);
                 }
                 catch (OperatorNotFoundException e) {
                     throw semanticException(TYPE_MISMATCH, node, "Cannot cast %s to %s", value, type);
@@ -2413,7 +2405,7 @@ protected Type visitLambdaExpression(LambdaExpression node, StackableAstVisitorC
                 throw semanticException(NOT_SUPPORTED, node, "Lambda expression in pattern recognition context is not yet supported");
             }
 
-            verifyNoAggregateWindowOrGroupingFunctions(session, plannerContext.getMetadata(), node.getBody(), "Lambda expression");
+            verifyNoAggregateWindowOrGroupingFunctions(session, functionResolver, accessControl, node.getBody(), "Lambda expression");
             if (!context.getContext().isExpectingLambda()) {
                 throw semanticException(TYPE_MISMATCH, node, "Lambda expression should always be used inside a function");
             }
@@ -2522,7 +2514,7 @@ public Type visitJsonExists(JsonExists node, StackableAstVisitorContext<Context>
             // resolve function
             ResolvedFunction function;
             try {
-                function = plannerContext.getMetadata().resolveFunction(session, QualifiedName.of(JSON_EXISTS_FUNCTION_NAME), fromTypes(argumentTypes));
+                function = plannerContext.getMetadata().resolveBuiltinFunction(JSON_EXISTS_FUNCTION_NAME, fromTypes(argumentTypes));
             }
             catch (TrinoException e) {
                 if (e.getLocation().isPresent()) {
@@ -2530,7 +2522,6 @@ public Type visitJsonExists(JsonExists node, StackableAstVisitorContext<Context>
                 }
                 throw new TrinoException(e::getErrorCode, extractLocation(node), e.getMessage(), e);
             }
-            accessControl.checkCanExecuteFunction(SecurityContext.of(session), JSON_EXISTS_FUNCTION_NAME);
             resolvedFunctions.put(NodeRef.of(node), function);
             Type type = function.getSignature().getReturnType();
 
@@ -2566,7 +2557,7 @@ public Type visitJsonValue(JsonValue node, StackableAstVisitorContext<Context> c
             Type resultType = pathAnalysis.getType(pathAnalysis.getPath());
             if (resultType != null && !resultType.equals(returnedType)) {
                 try {
-                    plannerContext.getMetadata().getCoercion(session, resultType, returnedType);
+                    plannerContext.getMetadata().getCoercion(resultType, returnedType);
                 }
                 catch (OperatorNotFoundException e) {
                     throw semanticException(TYPE_MISMATCH, node, "Return type of JSON path: %s incompatible with return type of function JSON_VALUE: %s", resultType, returnedType);
@@ -2606,7 +2597,7 @@ public Type visitJsonValue(JsonValue node, StackableAstVisitorContext<Context> c
             // resolve function
             ResolvedFunction function;
             try {
-                function = plannerContext.getMetadata().resolveFunction(session, QualifiedName.of(JSON_VALUE_FUNCTION_NAME), fromTypes(argumentTypes));
+                function = plannerContext.getMetadata().resolveBuiltinFunction(JSON_VALUE_FUNCTION_NAME, fromTypes(argumentTypes));
             }
             catch (TrinoException e) {
                 if (e.getLocation().isPresent()) {
@@ -2614,8 +2605,6 @@ public Type visitJsonValue(JsonValue node, StackableAstVisitorContext<Context> c
                 }
                 throw new TrinoException(e::getErrorCode, extractLocation(node), e.getMessage(), e);
             }
-
-            accessControl.checkCanExecuteFunction(SecurityContext.of(session), JSON_VALUE_FUNCTION_NAME);
             resolvedFunctions.put(NodeRef.of(node), function);
             Type type = function.getSignature().getReturnType();
 
@@ -2644,7 +2633,7 @@ public Type visitJsonQuery(JsonQuery node, StackableAstVisitorContext<Context> c
             // resolve function
             ResolvedFunction function;
             try {
-                function = plannerContext.getMetadata().resolveFunction(session, QualifiedName.of(JSON_QUERY_FUNCTION_NAME), fromTypes(argumentTypes));
+                function = plannerContext.getMetadata().resolveBuiltinFunction(JSON_QUERY_FUNCTION_NAME, fromTypes(argumentTypes));
             }
             catch (TrinoException e) {
                 if (e.getLocation().isPresent()) {
@@ -2652,7 +2641,6 @@ public Type visitJsonQuery(JsonQuery node, StackableAstVisitorContext<Context> c
                 }
                 throw new TrinoException(e::getErrorCode, extractLocation(node), e.getMessage(), e);
             }
-            accessControl.checkCanExecuteFunction(SecurityContext.of(session), JSON_QUERY_FUNCTION_NAME);
             resolvedFunctions.put(NodeRef.of(node), function);
 
             // analyze returned type and format
@@ -2675,7 +2663,7 @@ public Type visitJsonQuery(JsonQuery node, StackableAstVisitorContext<Context> c
             Type outputType = outputFunction.getSignature().getReturnType();
             if (!outputType.equals(returnedType)) {
                 try {
-                    plannerContext.getMetadata().getCoercion(session, outputType, returnedType);
+                    plannerContext.getMetadata().getCoercion(outputType, returnedType);
                 }
                 catch (OperatorNotFoundException e) {
                     throw semanticException(TYPE_MISMATCH, node, "Cannot cast %s to %s", outputType, returnedType);
@@ -2687,6 +2675,10 @@ public Type visitJsonQuery(JsonQuery node, StackableAstVisitorContext<Context> c
 
         private List<Type> analyzeJsonPathInvocation(String functionName, Expression node, JsonPathInvocation jsonPathInvocation, StackableAstVisitorContext<Context> context)
         {
+            jsonPathInvocation.getPathName().ifPresent(pathName -> {
+                throw semanticException(INVALID_PATH, pathName, "JSON path name is not allowed in %s function", functionName);
+            });
+
             // ANALYZE THE CONTEXT ITEM
             // analyze context item type
             Expression inputExpression = jsonPathInvocation.getInputExpression();
@@ -2761,7 +2753,7 @@ else if (isDateTimeType(parameterType) && !parameterType.equals(INTERVAL_DAY_TIM
                     }
                     else {
                         try {
-                            plannerContext.getMetadata().getCoercion(session, parameterType, VARCHAR);
+                            plannerContext.getMetadata().getCoercion(parameterType, VARCHAR);
                         }
                         catch (OperatorNotFoundException e) {
                             throw semanticException(NOT_SUPPORTED, node, "Unsupported type of JSON path parameter: %s", parameterType.getDisplayName());
@@ -2797,23 +2789,23 @@ else if (isDateTimeType(parameterType) && !parameterType.equals(INTERVAL_DAY_TIM
 
         private ResolvedFunction getInputFunction(Type type, JsonFormat format, Node node)
         {
-            QualifiedName name = switch (format) {
+            String name = switch (format) {
                 case JSON -> {
                     if (UNKNOWN.equals(type) || isCharacterStringType(type)) {
-                        yield QualifiedName.of(VARCHAR_TO_JSON);
+                        yield VARCHAR_TO_JSON;
                     }
                     if (isStringType(type)) {
-                        yield QualifiedName.of(VARBINARY_TO_JSON);
+                        yield VARBINARY_TO_JSON;
                     }
                     throw semanticException(TYPE_MISMATCH, node, format("Cannot read input of type %s as JSON using formatting %s", type, format));
                 }
-                case UTF8 -> QualifiedName.of(VARBINARY_UTF8_TO_JSON);
-                case UTF16 -> QualifiedName.of(VARBINARY_UTF16_TO_JSON);
-                case UTF32 -> QualifiedName.of(VARBINARY_UTF32_TO_JSON);
+                case UTF8 -> VARBINARY_UTF8_TO_JSON;
+                case UTF16 -> VARBINARY_UTF16_TO_JSON;
+                case UTF32 -> VARBINARY_UTF32_TO_JSON;
             };
 
             try {
-                return plannerContext.getMetadata().resolveFunction(session, name, fromTypes(type, BOOLEAN));
+                return plannerContext.getMetadata().resolveBuiltinFunction(name, fromTypes(type, BOOLEAN));
             }
             catch (TrinoException e) {
                 throw new TrinoException(TYPE_MISMATCH, extractLocation(node), format("Cannot read input of type %s as JSON using formatting %s", type, format), e);
@@ -2822,13 +2814,13 @@ private ResolvedFunction getInputFunction(Type type, JsonFormat format, Node nod
 
         private ResolvedFunction getOutputFunction(Type type, JsonFormat format, Node node)
         {
-            QualifiedName name = switch (format) {
+            String name = switch (format) {
                 case JSON -> {
                     if (isCharacterStringType(type)) {
-                        yield QualifiedName.of(JSON_TO_VARCHAR);
+                        yield JSON_TO_VARCHAR;
                     }
                     if (isStringType(type)) {
-                        yield QualifiedName.of(JSON_TO_VARBINARY);
+                        yield JSON_TO_VARBINARY;
                     }
                     throw semanticException(TYPE_MISMATCH, node, format("Cannot output JSON value as %s using formatting %s", type, format));
                 }
@@ -2836,24 +2828,24 @@ private ResolvedFunction getOutputFunction(Type type, JsonFormat format, Node no
                     if (!VARBINARY.equals(type)) {
                         throw semanticException(TYPE_MISMATCH, node, format("Cannot output JSON value as %s using formatting %s", type, format));
                     }
-                    yield QualifiedName.of(JSON_TO_VARBINARY_UTF8);
+                    yield JSON_TO_VARBINARY_UTF8;
                 }
                 case UTF16 -> {
                     if (!VARBINARY.equals(type)) {
                         throw semanticException(TYPE_MISMATCH, node, format("Cannot output JSON value as %s using formatting %s", type, format));
                     }
-                    yield QualifiedName.of(JSON_TO_VARBINARY_UTF16);
+                    yield JSON_TO_VARBINARY_UTF16;
                 }
                 case UTF32 -> {
                     if (!VARBINARY.equals(type)) {
                         throw semanticException(TYPE_MISMATCH, node, format("Cannot output JSON value as %s using formatting %s", type, format));
                     }
-                    yield QualifiedName.of(JSON_TO_VARBINARY_UTF32);
+                    yield JSON_TO_VARBINARY_UTF32;
                 }
             };
 
             try {
-                return plannerContext.getMetadata().resolveFunction(session, name, fromTypes(JSON_2016, TINYINT, BOOLEAN));
+                return plannerContext.getMetadata().resolveBuiltinFunction(name, fromTypes(JSON_2016, TINYINT, BOOLEAN));
             }
             catch (TrinoException e) {
                 throw new TrinoException(TYPE_MISMATCH, extractLocation(node), format("Cannot output JSON value as %s using formatting %s", type, format), e);
@@ -2922,7 +2914,7 @@ protected Type visitJsonObject(JsonObject node, StackableAstVisitorContext<Conte
 
                     if (!isStringType(valueType) && !isNumericType(valueType) && !valueType.equals(BOOLEAN)) {
                         try {
-                            plannerContext.getMetadata().getCoercion(session, valueType, VARCHAR);
+                            plannerContext.getMetadata().getCoercion(valueType, VARCHAR);
                         }
                         catch (OperatorNotFoundException e) {
                             throw semanticException(NOT_SUPPORTED, node, "Unsupported type of value passed to JSON_OBJECT function: %s", valueType.getDisplayName());
@@ -2946,7 +2938,7 @@ protected Type visitJsonObject(JsonObject node, StackableAstVisitorContext<Conte
             List<Type> argumentTypes = ImmutableList.of(keysRowType, valuesRowType, BOOLEAN, BOOLEAN);
             ResolvedFunction function;
             try {
-                function = plannerContext.getMetadata().resolveFunction(session, QualifiedName.of(JSON_OBJECT_FUNCTION_NAME), fromTypes(argumentTypes));
+                function = plannerContext.getMetadata().resolveBuiltinFunction(JSON_OBJECT_FUNCTION_NAME, fromTypes(argumentTypes));
             }
             catch (TrinoException e) {
                 if (e.getLocation().isPresent()) {
@@ -2954,7 +2946,6 @@ protected Type visitJsonObject(JsonObject node, StackableAstVisitorContext<Conte
                 }
                 throw new TrinoException(e::getErrorCode, extractLocation(node), e.getMessage(), e);
             }
-            accessControl.checkCanExecuteFunction(SecurityContext.of(session), JSON_OBJECT_FUNCTION_NAME);
             resolvedFunctions.put(NodeRef.of(node), function);
 
             // analyze returned type and format
@@ -2977,7 +2968,7 @@ protected Type visitJsonObject(JsonObject node, StackableAstVisitorContext<Conte
             Type outputType = outputFunction.getSignature().getReturnType();
             if (!outputType.equals(returnedType)) {
                 try {
-                    plannerContext.getMetadata().getCoercion(session, outputType, returnedType);
+                    plannerContext.getMetadata().getCoercion(outputType, returnedType);
                 }
                 catch (OperatorNotFoundException e) {
                     throw semanticException(TYPE_MISMATCH, node, "Cannot return type %s from JSON_OBJECT function", returnedType);
@@ -3035,7 +3026,7 @@ protected Type visitJsonArray(JsonArray node, StackableAstVisitorContext<Context
 
                     if (!isStringType(elementType) && !isNumericType(elementType) && !elementType.equals(BOOLEAN)) {
                         try {
-                            plannerContext.getMetadata().getCoercion(session, elementType, VARCHAR);
+                            plannerContext.getMetadata().getCoercion(elementType, VARCHAR);
                         }
                         catch (OperatorNotFoundException e) {
                             throw semanticException(NOT_SUPPORTED, node, "Unsupported type of value passed to JSON_ARRAY function: %s", elementType.getDisplayName());
@@ -3057,7 +3048,7 @@ protected Type visitJsonArray(JsonArray node, StackableAstVisitorContext<Context
             List<Type> argumentTypes = ImmutableList.of(elementsRowType, BOOLEAN);
             ResolvedFunction function;
             try {
-                function = plannerContext.getMetadata().resolveFunction(session, QualifiedName.of(JSON_ARRAY_FUNCTION_NAME), fromTypes(argumentTypes));
+                function = plannerContext.getMetadata().resolveBuiltinFunction(JSON_ARRAY_FUNCTION_NAME, fromTypes(argumentTypes));
             }
             catch (TrinoException e) {
                 if (e.getLocation().isPresent()) {
@@ -3065,7 +3056,6 @@ protected Type visitJsonArray(JsonArray node, StackableAstVisitorContext<Context
                 }
                 throw new TrinoException(e::getErrorCode, extractLocation(node), e.getMessage(), e);
             }
-            accessControl.checkCanExecuteFunction(SecurityContext.of(session), JSON_ARRAY_FUNCTION_NAME);
             resolvedFunctions.put(NodeRef.of(node), function);
 
             // analyze returned type and format
@@ -3088,7 +3078,7 @@ protected Type visitJsonArray(JsonArray node, StackableAstVisitorContext<Context
             Type outputType = outputFunction.getSignature().getReturnType();
             if (!outputType.equals(returnedType)) {
                 try {
-                    plannerContext.getMetadata().getCoercion(session, outputType, returnedType);
+                    plannerContext.getMetadata().getCoercion(outputType, returnedType);
                 }
                 catch (OperatorNotFoundException e) {
                     throw semanticException(TYPE_MISMATCH, node, "Cannot return type %s from JSON_ARRAY function", returnedType);
@@ -3107,7 +3097,7 @@ private Type getOperator(StackableAstVisitorContext<Context> context, Expression
 
             BoundSignature operatorSignature;
             try {
-                operatorSignature = plannerContext.getMetadata().resolveOperator(session, operatorType, argumentTypes.build()).getSignature();
+                operatorSignature = plannerContext.getMetadata().resolveOperator(operatorType, argumentTypes.build()).getSignature();
             }
             catch (OperatorNotFoundException e) {
                 throw semanticException(TYPE_MISMATCH, node, e, "%s", e.getMessage());
@@ -3454,6 +3444,37 @@ public static ExpressionAnalysis analyzeExpression(
                 analyzer.getWindowFunctions());
     }
 
+    public static void analyzeExpressionWithoutSubqueries(
+            Session session,
+            PlannerContext plannerContext,
+            AccessControl accessControl,
+            Scope scope,
+            Analysis analysis,
+            Expression expression,
+            ErrorCodeSupplier errorCode,
+            String message,
+            WarningCollector warningCollector,
+            CorrelationSupport correlationSupport)
+    {
+        ExpressionAnalyzer analyzer = new ExpressionAnalyzer(
+                plannerContext,
+                accessControl,
+                (node, ignored) -> {
+                    throw semanticException(errorCode, node, message);
+                },
+                session,
+                TypeProvider.empty(),
+                analysis.getParameters(),
+                warningCollector,
+                analysis.isDescribe(),
+                analysis::getType,
+                analysis::getWindow);
+        analyzer.analyze(expression, scope, correlationSupport);
+
+        updateAnalysis(analysis, analyzer, session, accessControl);
+        analysis.addExpressionFields(expression, analyzer.getSourceFields());
+    }
+
     public static ExpressionAnalysis analyzeWindow(
             Session session,
             PlannerContext plannerContext,
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/ExpressionTreeUtils.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/ExpressionTreeUtils.java
index 2aaf76b8e517..b7a115f80f50 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/ExpressionTreeUtils.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/ExpressionTreeUtils.java
@@ -15,7 +15,8 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.Session;
-import io.trino.metadata.Metadata;
+import io.trino.metadata.FunctionResolver;
+import io.trino.security.AccessControl;
 import io.trino.spi.Location;
 import io.trino.sql.tree.DefaultExpressionTraversalVisitor;
 import io.trino.sql.tree.DereferenceExpression;
@@ -39,9 +40,9 @@ public final class ExpressionTreeUtils
 {
     private ExpressionTreeUtils() {}
 
-    static List<FunctionCall> extractAggregateFunctions(Iterable<? extends Node> nodes, Session session, Metadata metadata)
+    static List<FunctionCall> extractAggregateFunctions(Iterable<? extends Node> nodes, Session session, FunctionResolver functionResolver, AccessControl accessControl)
     {
-        return extractExpressions(nodes, FunctionCall.class, function -> isAggregation(function, session, metadata));
+        return extractExpressions(nodes, FunctionCall.class, function -> isAggregation(function, session, functionResolver, accessControl));
     }
 
     static List<Expression> extractWindowExpressions(Iterable<? extends Node> nodes)
@@ -52,11 +53,24 @@ static List<Expression> extractWindowExpressions(Iterable<? extends Node> nodes)
                 .build();
     }
 
+    static List<Expression> extractWindowExpressions(Iterable<? extends Node> nodes, Session session, FunctionResolver functionResolver, AccessControl accessControl)
+    {
+        return ImmutableList.<Expression>builder()
+                .addAll(extractWindowFunctions(nodes, session, functionResolver, accessControl))
+                .addAll(extractWindowMeasures(nodes))
+                .build();
+    }
+
     static List<FunctionCall> extractWindowFunctions(Iterable<? extends Node> nodes)
     {
         return extractExpressions(nodes, FunctionCall.class, ExpressionTreeUtils::isWindowFunction);
     }
 
+    static List<FunctionCall> extractWindowFunctions(Iterable<? extends Node> nodes, Session session, FunctionResolver functionResolver, AccessControl accessControl)
+    {
+        return extractExpressions(nodes, FunctionCall.class, function -> isWindow(function, session, functionResolver, accessControl));
+    }
+
     static List<WindowOperation> extractWindowMeasures(Iterable<? extends Node> nodes)
     {
         return extractExpressions(nodes, WindowOperation.class);
@@ -69,13 +83,19 @@ public static <T extends Expression> List<T> extractExpressions(
         return extractExpressions(nodes, clazz, alwaysTrue());
     }
 
-    private static boolean isAggregation(FunctionCall functionCall, Session session, Metadata metadata)
+    private static boolean isAggregation(FunctionCall functionCall, Session session, FunctionResolver functionResolver, AccessControl accessControl)
     {
-        return ((metadata.isAggregationFunction(session, functionCall.getName()) || functionCall.getFilter().isPresent())
+        return ((functionResolver.isAggregationFunction(session, functionCall.getName(), accessControl) || functionCall.getFilter().isPresent())
                 && functionCall.getWindow().isEmpty())
                 || functionCall.getOrderBy().isPresent();
     }
 
+    private static boolean isWindow(FunctionCall functionCall, Session session, FunctionResolver functionResolver, AccessControl accessControl)
+    {
+        return functionCall.getWindow().isPresent()
+                || functionResolver.isWindowFunction(session, functionCall.getName(), accessControl);
+    }
+
     private static boolean isWindowFunction(FunctionCall functionCall)
     {
         return functionCall.getWindow().isPresent();
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/JsonPathAnalyzer.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/JsonPathAnalyzer.java
index bbd78e82c233..edabd1f19bfe 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/JsonPathAnalyzer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/JsonPathAnalyzer.java
@@ -36,6 +36,7 @@
 import io.trino.sql.jsonpath.tree.ConjunctionPredicate;
 import io.trino.sql.jsonpath.tree.ContextVariable;
 import io.trino.sql.jsonpath.tree.DatetimeMethod;
+import io.trino.sql.jsonpath.tree.DescendantMemberAccessor;
 import io.trino.sql.jsonpath.tree.DisjunctionPredicate;
 import io.trino.sql.jsonpath.tree.DoubleMethod;
 import io.trino.sql.jsonpath.tree.ExistsPredicate;
@@ -58,7 +59,6 @@
 import io.trino.sql.jsonpath.tree.StartsWithPredicate;
 import io.trino.sql.jsonpath.tree.TypeMethod;
 import io.trino.sql.tree.Node;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.StringLiteral;
 
 import java.util.LinkedHashMap;
@@ -147,7 +147,7 @@ protected Type visitAbsMethod(AbsMethod node, Void context)
             if (sourceType != null) {
                 Type resultType;
                 try {
-                    resultType = metadata.resolveFunction(session, QualifiedName.of("abs"), fromTypes(sourceType)).getSignature().getReturnType();
+                    resultType = metadata.resolveBuiltinFunction("abs", fromTypes(sourceType)).getSignature().getReturnType();
                 }
                 catch (TrinoException e) {
                     throw semanticException(INVALID_PATH, pathNode, e, "cannot perform JSON path abs() method with %s argument: %s", sourceType.getDisplayName(), e.getMessage());
@@ -167,7 +167,7 @@ protected Type visitArithmeticBinary(ArithmeticBinary node, Void context)
             if (leftType != null && rightType != null) {
                 BoundSignature signature;
                 try {
-                    signature = metadata.resolveOperator(session, OperatorType.valueOf(node.getOperator().name()), ImmutableList.of(leftType, rightType)).getSignature();
+                    signature = metadata.resolveOperator(OperatorType.valueOf(node.getOperator().name()), ImmutableList.of(leftType, rightType)).getSignature();
                 }
                 catch (OperatorNotFoundException e) {
                     throw semanticException(INVALID_PATH, pathNode, e, "invalid operand types (%s and %s) in JSON path arithmetic binary expression: %s", leftType.getDisplayName(), rightType.getDisplayName(), e.getMessage());
@@ -194,7 +194,7 @@ protected Type visitArithmeticUnary(ArithmeticUnary node, Void context)
                 }
                 Type resultType;
                 try {
-                    resultType = metadata.resolveOperator(session, NEGATION, ImmutableList.of(sourceType)).getSignature().getReturnType();
+                    resultType = metadata.resolveOperator(NEGATION, ImmutableList.of(sourceType)).getSignature().getReturnType();
                 }
                 catch (OperatorNotFoundException e) {
                     throw semanticException(INVALID_PATH, pathNode, e, "invalid operand type (%s) in JSON path arithmetic unary expression: %s", sourceType.getDisplayName(), e.getMessage());
@@ -225,7 +225,7 @@ protected Type visitCeilingMethod(CeilingMethod node, Void context)
             if (sourceType != null) {
                 Type resultType;
                 try {
-                    resultType = metadata.resolveFunction(session, QualifiedName.of("ceiling"), fromTypes(sourceType)).getSignature().getReturnType();
+                    resultType = metadata.resolveBuiltinFunction("ceiling", fromTypes(sourceType)).getSignature().getReturnType();
                 }
                 catch (TrinoException e) {
                     throw semanticException(INVALID_PATH, pathNode, e, "cannot perform JSON path ceiling() method with %s argument: %s", sourceType.getDisplayName(), e.getMessage());
@@ -254,6 +254,13 @@ protected Type visitDatetimeMethod(DatetimeMethod node, Void context)
             throw semanticException(NOT_SUPPORTED, pathNode, "datetime method in JSON path is not yet supported");
         }
 
+        @Override
+        protected Type visitDescendantMemberAccessor(DescendantMemberAccessor node, Void context)
+        {
+            process(node.getBase());
+            return null;
+        }
+
         @Override
         protected Type visitDoubleMethod(DoubleMethod node, Void context)
         {
@@ -263,7 +270,7 @@ protected Type visitDoubleMethod(DoubleMethod node, Void context)
                     throw semanticException(INVALID_PATH, pathNode, "cannot perform JSON path double() method with %s argument", sourceType.getDisplayName());
                 }
                 try {
-                    metadata.getCoercion(session, sourceType, DOUBLE);
+                    metadata.getCoercion(sourceType, DOUBLE);
                 }
                 catch (OperatorNotFoundException e) {
                     throw semanticException(INVALID_PATH, pathNode, e, "cannot perform JSON path double() method with %s argument: %s", sourceType.getDisplayName(), e.getMessage());
@@ -298,7 +305,7 @@ protected Type visitFloorMethod(FloorMethod node, Void context)
             if (sourceType != null) {
                 Type resultType;
                 try {
-                    resultType = metadata.resolveFunction(session, QualifiedName.of("floor"), fromTypes(sourceType)).getSignature().getReturnType();
+                    resultType = metadata.resolveBuiltinFunction("floor", fromTypes(sourceType)).getSignature().getReturnType();
                 }
                 catch (TrinoException e) {
                     throw semanticException(INVALID_PATH, pathNode, e, "cannot perform JSON path floor() method with %s argument: %s", sourceType.getDisplayName(), e.getMessage());
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/Output.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/Output.java
index e603971d2cd7..513badadde18 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/Output.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/Output.java
@@ -16,8 +16,8 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
+import io.trino.spi.connector.CatalogHandle.CatalogVersion;
 
 import java.util.List;
 import java.util.Objects;
@@ -29,6 +29,7 @@
 public final class Output
 {
     private final String catalogName;
+    private final CatalogVersion catalogVersion;
     private final String schema;
     private final String table;
     private final Optional<List<OutputColumn>> columns;
@@ -36,11 +37,13 @@ public final class Output
     @JsonCreator
     public Output(
             @JsonProperty("catalogName") String catalogName,
+            @JsonProperty("catalogVersion") CatalogVersion catalogVersion,
             @JsonProperty("schema") String schema,
             @JsonProperty("table") String table,
             @JsonProperty("columns") Optional<List<OutputColumn>> columns)
     {
         this.catalogName = requireNonNull(catalogName, "catalogName is null");
+        this.catalogVersion = requireNonNull(catalogVersion, "catalogVersion is null");
         this.schema = requireNonNull(schema, "schema is null");
         this.table = requireNonNull(table, "table is null");
         this.columns = columns.map(ImmutableList::copyOf);
@@ -52,6 +55,12 @@ public String getCatalogName()
         return catalogName;
     }
 
+    @JsonProperty
+    public CatalogVersion getCatalogVersion()
+    {
+        return catalogVersion;
+    }
+
     @JsonProperty
     public String getSchema()
     {
@@ -81,6 +90,7 @@ public boolean equals(Object o)
         }
         Output output = (Output) o;
         return Objects.equals(catalogName, output.catalogName) &&
+                Objects.equals(catalogVersion, output.catalogVersion) &&
                 Objects.equals(schema, output.schema) &&
                 Objects.equals(table, output.table) &&
                 Objects.equals(columns, output.columns);
@@ -89,6 +99,6 @@ public boolean equals(Object o)
     @Override
     public int hashCode()
     {
-        return Objects.hash(catalogName, schema, table, columns);
+        return Objects.hash(catalogName, catalogVersion, schema, table, columns);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/OutputColumn.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/OutputColumn.java
index 7682e79be713..c3fd926be3b3 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/OutputColumn.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/OutputColumn.java
@@ -16,11 +16,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.execution.Column;
 import io.trino.sql.analyzer.Analysis.SourceColumn;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Objects;
 import java.util.Set;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/PatternRecognitionAnalyzer.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/PatternRecognitionAnalyzer.java
index 51cf4750bfc9..623f76f4911f 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/PatternRecognitionAnalyzer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/PatternRecognitionAnalyzer.java
@@ -124,7 +124,7 @@ public static PatternRecognitionAnalysis analyze(
                 .filter(RangeQuantifier.class::isInstance)
                 .map(RangeQuantifier.class::cast)
                 .forEach(quantifier -> {
-                    Optional<Long> atLeast = quantifier.getAtLeast().map(LongLiteral::getValue);
+                    Optional<Long> atLeast = quantifier.getAtLeast().map(LongLiteral::getParsedValue);
                     atLeast.ifPresent(value -> {
                         if (value < 0) {
                             throw semanticException(NUMERIC_VALUE_OUT_OF_RANGE, quantifier, "Pattern quantifier lower bound must be greater than or equal to 0");
@@ -133,7 +133,7 @@ public static PatternRecognitionAnalysis analyze(
                             throw semanticException(NUMERIC_VALUE_OUT_OF_RANGE, quantifier, "Pattern quantifier lower bound must not exceed " + Integer.MAX_VALUE);
                         }
                     });
-                    Optional<Long> atMost = quantifier.getAtMost().map(LongLiteral::getValue);
+                    Optional<Long> atMost = quantifier.getAtMost().map(LongLiteral::getParsedValue);
                     atMost.ifPresent(value -> {
                         if (value < 1) {
                             throw semanticException(NUMERIC_VALUE_OUT_OF_RANGE, quantifier, "Pattern quantifier upper bound must be greater than or equal to 1");
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/QueryExplainerFactory.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/QueryExplainerFactory.java
index eba1a44dee5d..e4be96c4460a 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/QueryExplainerFactory.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/QueryExplainerFactory.java
@@ -13,6 +13,7 @@
  */
 package io.trino.sql.analyzer;
 
+import com.google.inject.Inject;
 import io.trino.client.NodeVersion;
 import io.trino.cost.CostCalculator;
 import io.trino.cost.StatsCalculator;
@@ -20,8 +21,6 @@
 import io.trino.sql.planner.PlanFragmenter;
 import io.trino.sql.planner.PlanOptimizersFactory;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 public class QueryExplainerFactory
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/RelationType.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/RelationType.java
index ab67909c6bb8..633a0ef06f6b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/RelationType.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/RelationType.java
@@ -16,10 +16,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.tree.QualifiedName;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/ResolvedField.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/ResolvedField.java
index 72f7621b2891..c211e82a7309 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/ResolvedField.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/ResolvedField.java
@@ -13,10 +13,9 @@
  */
 package io.trino.sql.analyzer;
 
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.type.Type;
 
-import javax.annotation.concurrent.Immutable;
-
 import static java.util.Objects.requireNonNull;
 
 @Immutable
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/Scope.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/Scope.java
index 138299100875..1abee9ad37b5 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/Scope.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/Scope.java
@@ -14,14 +14,13 @@
 package io.trino.sql.analyzer;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.type.RowType;
 import io.trino.sql.tree.AllColumns;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.WithQuery;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java
index 027e823c492c..e6771a68affb 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java
@@ -31,14 +31,13 @@
 import io.trino.execution.Column;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.AnalyzePropertyManager;
-import io.trino.metadata.CatalogSchemaFunctionName;
+import io.trino.metadata.FunctionResolver;
 import io.trino.metadata.MaterializedViewDefinition;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.OperatorNotFoundException;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.RedirectionAwareTableHandle;
 import io.trino.metadata.ResolvedFunction;
-import io.trino.metadata.SessionPropertyManager;
 import io.trino.metadata.TableExecuteHandle;
 import io.trino.metadata.TableFunctionMetadata;
 import io.trino.metadata.TableFunctionRegistry;
@@ -54,6 +53,7 @@
 import io.trino.metadata.ViewDefinition;
 import io.trino.security.AccessControl;
 import io.trino.security.AllowAllAccessControl;
+import io.trino.security.InjectedConnectorAccessControl;
 import io.trino.security.SecurityContext;
 import io.trino.security.ViewAccessControl;
 import io.trino.spi.TrinoException;
@@ -70,21 +70,22 @@
 import io.trino.spi.connector.PointerType;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableProcedureMetadata;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.function.FunctionKind;
 import io.trino.spi.function.OperatorType;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.ArgumentSpecification;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.Descriptor;
-import io.trino.spi.ptf.DescriptorArgument;
-import io.trino.spi.ptf.DescriptorArgumentSpecification;
-import io.trino.spi.ptf.ReturnTypeSpecification;
-import io.trino.spi.ptf.ReturnTypeSpecification.DescribedTable;
-import io.trino.spi.ptf.ScalarArgument;
-import io.trino.spi.ptf.ScalarArgumentSpecification;
-import io.trino.spi.ptf.TableArgument;
-import io.trino.spi.ptf.TableArgumentSpecification;
-import io.trino.spi.ptf.TableFunctionAnalysis;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ArgumentSpecification;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.DescriptorArgument;
+import io.trino.spi.function.table.DescriptorArgumentSpecification;
+import io.trino.spi.function.table.ReturnTypeSpecification;
+import io.trino.spi.function.table.ReturnTypeSpecification.DescribedTable;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.ScalarArgumentSpecification;
+import io.trino.spi.function.table.TableArgument;
+import io.trino.spi.function.table.TableArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.GroupProvider;
 import io.trino.spi.security.Identity;
@@ -102,7 +103,6 @@
 import io.trino.spi.type.VarcharType;
 import io.trino.sql.InterpretedFunctionInvoker;
 import io.trino.sql.PlannerContext;
-import io.trino.sql.SqlPath;
 import io.trino.sql.analyzer.Analysis.GroupingSetAnalysis;
 import io.trino.sql.analyzer.Analysis.MergeAnalysis;
 import io.trino.sql.analyzer.Analysis.ResolvedWindow;
@@ -128,6 +128,7 @@
 import io.trino.sql.tree.AstVisitor;
 import io.trino.sql.tree.Call;
 import io.trino.sql.tree.CallArgument;
+import io.trino.sql.tree.ColumnDefinition;
 import io.trino.sql.tree.Comment;
 import io.trino.sql.tree.Commit;
 import io.trino.sql.tree.CreateCatalog;
@@ -136,7 +137,6 @@
 import io.trino.sql.tree.CreateTable;
 import io.trino.sql.tree.CreateTableAsSelect;
 import io.trino.sql.tree.CreateView;
-import io.trino.sql.tree.Cube;
 import io.trino.sql.tree.Deallocate;
 import io.trino.sql.tree.Delete;
 import io.trino.sql.tree.Deny;
@@ -150,6 +150,7 @@
 import io.trino.sql.tree.EmptyTableTreatment;
 import io.trino.sql.tree.Except;
 import io.trino.sql.tree.Execute;
+import io.trino.sql.tree.ExecuteImmediate;
 import io.trino.sql.tree.Explain;
 import io.trino.sql.tree.ExplainAnalyze;
 import io.trino.sql.tree.Expression;
@@ -159,6 +160,7 @@
 import io.trino.sql.tree.FieldReference;
 import io.trino.sql.tree.FrameBound;
 import io.trino.sql.tree.FunctionCall;
+import io.trino.sql.tree.FunctionSpecification;
 import io.trino.sql.tree.Grant;
 import io.trino.sql.tree.GroupBy;
 import io.trino.sql.tree.GroupingElement;
@@ -171,6 +173,7 @@
 import io.trino.sql.tree.JoinCriteria;
 import io.trino.sql.tree.JoinOn;
 import io.trino.sql.tree.JoinUsing;
+import io.trino.sql.tree.JsonTable;
 import io.trino.sql.tree.Lateral;
 import io.trino.sql.tree.Limit;
 import io.trino.sql.tree.LongLiteral;
@@ -201,12 +204,13 @@
 import io.trino.sql.tree.RenameTable;
 import io.trino.sql.tree.RenameView;
 import io.trino.sql.tree.ResetSession;
+import io.trino.sql.tree.ResetSessionAuthorization;
 import io.trino.sql.tree.Revoke;
 import io.trino.sql.tree.Rollback;
-import io.trino.sql.tree.Rollup;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.RowPattern;
 import io.trino.sql.tree.SampledRelation;
+import io.trino.sql.tree.SecurityCharacteristic;
 import io.trino.sql.tree.Select;
 import io.trino.sql.tree.SelectItem;
 import io.trino.sql.tree.SetColumnType;
@@ -214,6 +218,7 @@
 import io.trino.sql.tree.SetProperties;
 import io.trino.sql.tree.SetSchemaAuthorization;
 import io.trino.sql.tree.SetSession;
+import io.trino.sql.tree.SetSessionAuthorization;
 import io.trino.sql.tree.SetTableAuthorization;
 import io.trino.sql.tree.SetTimeZone;
 import io.trino.sql.tree.SetViewAuthorization;
@@ -281,7 +286,7 @@
 import static io.trino.SystemSessionProperties.getMaxGroupingSets;
 import static io.trino.SystemSessionProperties.isLegacyMaterializedViewGracePeriod;
 import static io.trino.metadata.FunctionResolver.toPath;
-import static io.trino.metadata.MetadataManager.toQualifiedFunctionName;
+import static io.trino.metadata.GlobalFunctionCatalog.isBuiltinFunctionName;
 import static io.trino.metadata.MetadataUtil.createQualifiedObjectName;
 import static io.trino.metadata.MetadataUtil.getRequiredCatalogHandle;
 import static io.trino.spi.StandardErrorCode.AMBIGUOUS_NAME;
@@ -327,6 +332,7 @@
 import static io.trino.spi.StandardErrorCode.NULL_TREATMENT_NOT_ALLOWED;
 import static io.trino.spi.StandardErrorCode.NUMERIC_VALUE_OUT_OF_RANGE;
 import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_FOUND;
+import static io.trino.spi.StandardErrorCode.SYNTAX_ERROR;
 import static io.trino.spi.StandardErrorCode.TABLE_ALREADY_EXISTS;
 import static io.trino.spi.StandardErrorCode.TABLE_HAS_NO_COLUMNS;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
@@ -338,9 +344,10 @@
 import static io.trino.spi.connector.StandardWarningCode.REDUNDANT_ORDER_BY;
 import static io.trino.spi.function.FunctionKind.AGGREGATE;
 import static io.trino.spi.function.FunctionKind.WINDOW;
-import static io.trino.spi.ptf.DescriptorArgument.NULL_DESCRIPTOR;
-import static io.trino.spi.ptf.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
-import static io.trino.spi.ptf.ReturnTypeSpecification.OnlyPassThrough.ONLY_PASS_THROUGH;
+import static io.trino.spi.function.table.DescriptorArgument.NULL_DESCRIPTOR;
+import static io.trino.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
+import static io.trino.spi.function.table.ReturnTypeSpecification.OnlyPassThrough.ONLY_PASS_THROUGH;
+import static io.trino.spi.security.AccessDeniedException.denyExecuteFunction;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DoubleType.DOUBLE;
@@ -351,7 +358,7 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.sql.NodeUtils.getSortItemsFromOrderBy;
-import static io.trino.sql.ParsingUtil.createParsingOptions;
+import static io.trino.sql.SqlFormatter.formatSql;
 import static io.trino.sql.analyzer.AggregationAnalyzer.verifyOrderByAggregations;
 import static io.trino.sql.analyzer.AggregationAnalyzer.verifySourceAggregations;
 import static io.trino.sql.analyzer.Analyzer.verifyNoAggregateWindowOrGroupingFunctions;
@@ -378,6 +385,8 @@
 import static io.trino.sql.tree.Join.Type.INNER;
 import static io.trino.sql.tree.Join.Type.LEFT;
 import static io.trino.sql.tree.Join.Type.RIGHT;
+import static io.trino.sql.tree.SaveMode.IGNORE;
+import static io.trino.sql.tree.SaveMode.REPLACE;
 import static io.trino.sql.util.AstUtils.preOrder;
 import static io.trino.type.UnknownType.UNKNOWN;
 import static io.trino.util.MoreLists.mappedCopy;
@@ -404,10 +413,10 @@ class StatementAnalyzer
     private final TransactionManager transactionManager;
     private final TableProceduresRegistry tableProceduresRegistry;
     private final TableFunctionRegistry tableFunctionRegistry;
-    private final SessionPropertyManager sessionPropertyManager;
     private final TablePropertyManager tablePropertyManager;
     private final AnalyzePropertyManager analyzePropertyManager;
     private final TableProceduresPropertyManager tableProceduresPropertyManager;
+    private final FunctionResolver functionResolver;
 
     private final WarningCollector warningCollector;
     private final CorrelationSupport correlationSupport;
@@ -424,7 +433,6 @@ class StatementAnalyzer
             Session session,
             TableProceduresRegistry tableProceduresRegistry,
             TableFunctionRegistry tableFunctionRegistry,
-            SessionPropertyManager sessionPropertyManager,
             TablePropertyManager tablePropertyManager,
             AnalyzePropertyManager analyzePropertyManager,
             TableProceduresPropertyManager tableProceduresPropertyManager,
@@ -444,28 +452,33 @@ class StatementAnalyzer
         this.session = requireNonNull(session, "session is null");
         this.tableProceduresRegistry = requireNonNull(tableProceduresRegistry, "tableProceduresRegistry is null");
         this.tableFunctionRegistry = requireNonNull(tableFunctionRegistry, "tableFunctionRegistry is null");
-        this.sessionPropertyManager = requireNonNull(sessionPropertyManager, "sessionPropertyManager is null");
         this.tablePropertyManager = requireNonNull(tablePropertyManager, "tablePropertyManager is null");
         this.analyzePropertyManager = requireNonNull(analyzePropertyManager, "analyzePropertyManager is null");
         this.tableProceduresPropertyManager = tableProceduresPropertyManager;
         this.warningCollector = requireNonNull(warningCollector, "warningCollector is null");
         this.correlationSupport = requireNonNull(correlationSupport, "correlationSupport is null");
+        this.functionResolver = plannerContext.getFunctionResolver(warningCollector);
+    }
+
+    public Scope analyze(Node node)
+    {
+        return analyze(node, Optional.empty(), true);
     }
 
     public Scope analyze(Node node, Scope outerQueryScope)
     {
-        return analyze(node, Optional.of(outerQueryScope));
+        return analyze(node, Optional.of(outerQueryScope), false);
     }
 
-    public Scope analyze(Node node, Optional<Scope> outerQueryScope)
+    private Scope analyze(Node node, Optional<Scope> outerQueryScope, boolean isTopLevel)
     {
-        return new Visitor(outerQueryScope, warningCollector, Optional.empty())
+        return new Visitor(outerQueryScope, warningCollector, Optional.empty(), isTopLevel)
                 .process(node, Optional.empty());
     }
 
     public Scope analyzeForUpdate(Relation relation, Optional<Scope> outerQueryScope, UpdateKind updateKind)
     {
-        return new Visitor(outerQueryScope, warningCollector, Optional.of(updateKind))
+        return new Visitor(outerQueryScope, warningCollector, Optional.of(updateKind), true)
                 .process(relation, Optional.empty());
     }
 
@@ -484,15 +497,17 @@ private enum UpdateKind
     private final class Visitor
             extends AstVisitor<Scope, Optional<Scope>>
     {
+        private final boolean isTopLevel;
         private final Optional<Scope> outerQueryScope;
         private final WarningCollector warningCollector;
         private final Optional<UpdateKind> updateKind;
 
-        private Visitor(Optional<Scope> outerQueryScope, WarningCollector warningCollector, Optional<UpdateKind> updateKind)
+        private Visitor(Optional<Scope> outerQueryScope, WarningCollector warningCollector, Optional<UpdateKind> updateKind, boolean isTopLevel)
         {
             this.outerQueryScope = requireNonNull(outerQueryScope, "outerQueryScope is null");
             this.warningCollector = requireNonNull(warningCollector, "warningCollector is null");
             this.updateKind = requireNonNull(updateKind, "updateKind is null");
+            this.isTopLevel = isTopLevel;
         }
 
         @Override
@@ -535,12 +550,12 @@ protected Scope visitInsert(Insert insert, Optional<Scope> scope)
             }
 
             // analyze the query that creates the data
-            Scope queryScope = analyze(insert.getQuery(), createScope(scope));
+            Scope queryScope = analyze(insert.getQuery());
 
             // verify the insert destination columns match the query
             RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, targetTable);
-            Optional<TableHandle> targetTableHandle = redirection.getTableHandle();
-            targetTable = redirection.getRedirectedTableName().orElse(targetTable);
+            Optional<TableHandle> targetTableHandle = redirection.tableHandle();
+            targetTable = redirection.redirectedTableName().orElse(targetTable);
             if (targetTableHandle.isEmpty()) {
                 throw semanticException(TABLE_NOT_FOUND, insert, "Table '%s' does not exist", targetTable);
             }
@@ -631,6 +646,7 @@ protected Scope visitInsert(Insert insert, Optional<Scope> scope)
 
             analysis.setUpdateType("INSERT");
             analysis.setUpdateTarget(
+                    targetTableHandle.get().getCatalogHandle().getVersion(),
                     targetTable,
                     Optional.empty(),
                     Optional.of(Streams.zip(
@@ -653,8 +669,10 @@ protected Scope visitRefreshMaterializedView(RefreshMaterializedView refreshMate
             analysis.setUpdateType("REFRESH MATERIALIZED VIEW");
 
             if (metadata.delegateMaterializedViewRefreshToConnector(session, name)) {
+                CatalogHandle catalogHandle = getRequiredCatalogHandle(metadata, session, refreshMaterializedView, name.getCatalogName());
                 analysis.setDelegatedRefreshMaterializedView(name);
                 analysis.setUpdateTarget(
+                        catalogHandle.getVersion(),
                         name,
                         Optional.empty(),
                         Optional.empty());
@@ -701,6 +719,7 @@ protected Scope visitRefreshMaterializedView(RefreshMaterializedView refreshMate
                     Column::new);
 
             analysis.setUpdateTarget(
+                    targetTableHandle.getCatalogHandle().getVersion(),
                     targetTable,
                     Optional.empty(),
                     Optional.of(Streams.zip(
@@ -779,8 +798,8 @@ protected Scope visitDelete(Delete node, Optional<Scope> scope)
             }
 
             RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, originalName);
-            QualifiedObjectName tableName = redirection.getRedirectedTableName().orElse(originalName);
-            TableHandle handle = redirection.getTableHandle()
+            QualifiedObjectName tableName = redirection.redirectedTableName().orElse(originalName);
+            TableHandle handle = redirection.tableHandle()
                     .orElseThrow(() -> semanticException(TABLE_NOT_FOUND, table, "Table '%s' does not exist", tableName));
 
             accessControl.checkCanDeleteFromTable(session.toSecurityContext(), tableName);
@@ -802,7 +821,7 @@ protected Scope visitDelete(Delete node, Optional<Scope> scope)
             node.getWhere().ifPresent(where -> analyzeWhere(node, tableScope, where));
 
             analysis.setUpdateType("DELETE");
-            analysis.setUpdateTarget(tableName, Optional.of(table), Optional.empty());
+            analysis.setUpdateTarget(handle.getCatalogHandle().getVersion(), tableName, Optional.of(table), Optional.empty());
             Scope accessControlScope = Scope.builder()
                     .withRelationType(RelationId.anonymous(), analysis.getScope(table).getRelationType())
                     .build();
@@ -819,9 +838,6 @@ protected Scope visitDelete(Delete node, Optional<Scope> scope)
         protected Scope visitAnalyze(Analyze node, Optional<Scope> scope)
         {
             QualifiedObjectName tableName = createQualifiedObjectName(session, node, node.getTableName());
-            analysis.setUpdateType("ANALYZE");
-            analysis.setUpdateTarget(tableName, Optional.empty(), Optional.empty());
-
             if (metadata.isView(session, tableName)) {
                 throw semanticException(NOT_SUPPORTED, node, "Analyzing views is not supported");
             }
@@ -829,6 +845,9 @@ protected Scope visitAnalyze(Analyze node, Optional<Scope> scope)
             TableHandle tableHandle = metadata.getTableHandle(session, tableName)
                     .orElseThrow(() -> semanticException(TABLE_NOT_FOUND, node, "Table '%s' does not exist", tableName));
 
+            analysis.setUpdateType("ANALYZE");
+            analysis.setUpdateTarget(tableHandle.getCatalogHandle().getVersion(), tableName, Optional.empty(), Optional.empty());
+
             validateProperties(node.getProperties(), scope);
             String catalogName = tableName.getCatalogName();
             CatalogHandle catalogHandle = getRequiredCatalogHandle(metadata, session, node, catalogName);
@@ -869,16 +888,17 @@ protected Scope visitCreateTableAsSelect(CreateTableAsSelect node, Optional<Scop
             QualifiedObjectName targetTable = createQualifiedObjectName(session, node, node.getName());
 
             Optional<TableHandle> targetTableHandle = metadata.getTableHandle(session, targetTable);
-            if (targetTableHandle.isPresent()) {
-                if (node.isNotExists()) {
+            if (targetTableHandle.isPresent() && node.getSaveMode() != REPLACE) {
+                if (node.getSaveMode() == IGNORE) {
                     analysis.setCreate(new Analysis.Create(
                             Optional.of(targetTable),
                             Optional.empty(),
                             Optional.empty(),
                             node.isWithData(),
-                            true));
+                            true,
+                            false));
                     analysis.setUpdateType("CREATE TABLE");
-                    analysis.setUpdateTarget(targetTable, Optional.empty(), Optional.of(ImmutableList.of()));
+                    analysis.setUpdateTarget(targetTableHandle.get().getCatalogHandle().getVersion(), targetTable, Optional.empty(), Optional.of(ImmutableList.of()));
                     return createAndAssignScope(node, scope, Field.newUnqualified("rows", BIGINT));
                 }
                 throw semanticException(TABLE_ALREADY_EXISTS, node, "Destination table '%s' already exists", targetTable);
@@ -908,9 +928,9 @@ protected Scope visitCreateTableAsSelect(CreateTableAsSelect node, Optional<Scop
             accessControl.checkCanCreateTable(session.toSecurityContext(), targetTable, explicitlySetProperties);
 
             // analyze the query that creates the table
-            Scope queryScope = analyze(node.getQuery(), createScope(scope));
+            Scope queryScope = analyze(node.getQuery());
 
-            ImmutableList.Builder<ColumnMetadata> columns = ImmutableList.builder();
+            ImmutableList.Builder<ColumnMetadata> columnsBuilder = ImmutableList.builder();
 
             // analyze target table columns and column aliases
             ImmutableList.Builder<OutputColumn> outputColumns = ImmutableList.builder();
@@ -923,15 +943,15 @@ protected Scope visitCreateTableAsSelect(CreateTableAsSelect node, Optional<Scop
                         throw semanticException(COLUMN_TYPE_UNKNOWN, node, "Column type is unknown at position %s", queryScope.getRelationType().indexOf(field) + 1);
                     }
                     String columnName = node.getColumnAliases().get().get(aliasPosition).getValue();
-                    columns.add(new ColumnMetadata(columnName, field.getType()));
+                    columnsBuilder.add(new ColumnMetadata(columnName, metadata.getSupportedType(session, catalogHandle, properties, field.getType()).orElse(field.getType())));
                     outputColumns.add(new OutputColumn(new Column(columnName, field.getType().toString()), analysis.getSourceColumns(field)));
                     aliasPosition++;
                 }
             }
             else {
                 validateColumns(node, queryScope.getRelationType());
-                columns.addAll(queryScope.getRelationType().getVisibleFields().stream()
-                        .map(field -> new ColumnMetadata(field.getName().orElseThrow(), field.getType()))
+                columnsBuilder.addAll(queryScope.getRelationType().getVisibleFields().stream()
+                        .map(field -> new ColumnMetadata(field.getName().orElseThrow(), metadata.getSupportedType(session, catalogHandle, properties, field.getType()).orElse(field.getType())))
                         .collect(toImmutableList()));
                 queryScope.getRelationType().getVisibleFields().stream()
                         .map(this::createOutputColumn)
@@ -939,12 +959,13 @@ protected Scope visitCreateTableAsSelect(CreateTableAsSelect node, Optional<Scop
             }
 
             // create target table metadata
-            ConnectorTableMetadata tableMetadata = new ConnectorTableMetadata(targetTable.asSchemaTableName(), columns.build(), properties, node.getComment());
+            List<ColumnMetadata> columns = columnsBuilder.build();
+            ConnectorTableMetadata tableMetadata = new ConnectorTableMetadata(targetTable.asSchemaTableName(), columns, properties, node.getComment());
 
             // analyze target table layout
             Optional<TableLayout> newTableLayout = metadata.getNewTableLayout(session, catalogName, tableMetadata);
 
-            Set<String> columnNames = columns.build().stream()
+            Set<String> columnNames = columns.stream()
                     .map(ColumnMetadata::getName)
                     .collect(toImmutableSet());
 
@@ -964,10 +985,12 @@ protected Scope visitCreateTableAsSelect(CreateTableAsSelect node, Optional<Scop
                     Optional.of(tableMetadata),
                     newTableLayout,
                     node.isWithData(),
-                    false));
+                    false,
+                    node.getSaveMode() == REPLACE));
 
             analysis.setUpdateType("CREATE TABLE");
             analysis.setUpdateTarget(
+                    catalogHandle.getVersion(),
                     targetTable,
                     Optional.empty(),
                     Optional.of(outputColumns.build()));
@@ -980,17 +1003,23 @@ protected Scope visitCreateView(CreateView node, Optional<Scope> scope)
         {
             QualifiedObjectName viewName = createQualifiedObjectName(session, node, node.getName());
 
+            node.getQuery().getFunctions().stream().findFirst().ifPresent(function -> {
+                throw semanticException(NOT_SUPPORTED, function, "Views cannot contain inline functions");
+            });
+
             // analyze the query that creates the view
             StatementAnalyzer analyzer = statementAnalyzerFactory.createStatementAnalyzer(analysis, session, warningCollector, CorrelationSupport.ALLOWED);
 
-            Scope queryScope = analyzer.analyze(node.getQuery(), scope);
+            Scope queryScope = analyzer.analyze(node.getQuery());
 
             accessControl.checkCanCreateView(session.toSecurityContext(), viewName);
 
             validateColumns(node, queryScope.getRelationType());
 
+            CatalogHandle catalogHandle = getRequiredCatalogHandle(metadata, session, node, viewName.getCatalogName());
             analysis.setUpdateType("CREATE VIEW");
             analysis.setUpdateTarget(
+                    catalogHandle.getVersion(),
                     viewName,
                     Optional.empty(),
                     Optional.of(queryScope.getRelationType().getVisibleFields().stream()
@@ -1012,9 +1041,33 @@ protected Scope visitResetSession(ResetSession node, Optional<Scope> scope)
             return createAndAssignScope(node, scope);
         }
 
+        @Override
+        protected Scope visitSetSessionAuthorization(SetSessionAuthorization node, Optional<Scope> scope)
+        {
+            return createAndAssignScope(node, scope);
+        }
+
+        @Override
+        protected Scope visitResetSessionAuthorization(ResetSessionAuthorization node, Optional<Scope> scope)
+        {
+            return createAndAssignScope(node, scope);
+        }
+
         @Override
         protected Scope visitAddColumn(AddColumn node, Optional<Scope> scope)
         {
+            ColumnDefinition element = node.getColumn();
+            if (element.getName().getParts().size() > 1) {
+                if (!element.isNullable()) {
+                    throw semanticException(NOT_SUPPORTED, node, "Adding fields with NOT NULL constraint is unsupported");
+                }
+                if (!element.getProperties().isEmpty()) {
+                    throw semanticException(NOT_SUPPORTED, node, "Adding fields with column properties is unsupported");
+                }
+                if (element.getComment().isPresent()) {
+                    throw semanticException(NOT_SUPPORTED, node, "Adding fields with COMMENT is unsupported");
+                }
+            }
             return createAndAssignScope(node, scope);
         }
 
@@ -1159,8 +1212,8 @@ protected Scope visitTableExecute(TableExecute node, Optional<Scope> scope)
             }
 
             RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, originalName);
-            QualifiedObjectName tableName = redirection.getRedirectedTableName().orElse(originalName);
-            TableHandle tableHandle = redirection.getTableHandle()
+            QualifiedObjectName tableName = redirection.redirectedTableName().orElse(originalName);
+            TableHandle tableHandle = redirection.tableHandle()
                     .orElseThrow(() -> semanticException(TABLE_NOT_FOUND, table, "Table '%s' does not exist", tableName));
 
             accessControl.checkCanExecuteTableProcedure(
@@ -1179,7 +1232,7 @@ protected Scope visitTableExecute(TableExecute node, Optional<Scope> scope)
                 }
             }
 
-            Scope tableScope = analyze(table, scope);
+            Scope tableScope = analyze(table);
 
             String catalogName = tableName.getCatalogName();
             CatalogHandle catalogHandle = getRequiredCatalogHandle(metadata, session, node, catalogName);
@@ -1216,7 +1269,7 @@ protected Scope visitTableExecute(TableExecute node, Optional<Scope> scope)
             analysis.setTableExecuteHandle(executeHandle);
 
             analysis.setUpdateType("ALTER TABLE EXECUTE");
-            analysis.setUpdateTarget(tableName, Optional.of(table), Optional.empty());
+            analysis.setUpdateTarget(executeHandle.getCatalogHandle().getVersion(), tableName, Optional.of(table), Optional.empty());
 
             return createAndAssignScope(node, scope, Field.newUnqualified("rows", BIGINT));
         }
@@ -1320,6 +1373,12 @@ protected Scope visitExecute(Execute node, Optional<Scope> scope)
             return createAndAssignScope(node, scope);
         }
 
+        @Override
+        protected Scope visitExecuteImmediate(ExecuteImmediate node, Optional<Scope> scope)
+        {
+            return createAndAssignScope(node, scope);
+        }
+
         @Override
         protected Scope visitGrant(Grant node, Optional<Scope> scope)
         {
@@ -1357,12 +1416,14 @@ protected Scope visitCreateMaterializedView(CreateMaterializedView node, Optiona
             // analyze the query that creates the view
             StatementAnalyzer analyzer = statementAnalyzerFactory.createStatementAnalyzer(analysis, session, warningCollector, CorrelationSupport.ALLOWED);
 
-            Scope queryScope = analyzer.analyze(node.getQuery(), scope);
+            Scope queryScope = analyzer.analyze(node.getQuery());
 
             validateColumns(node, queryScope.getRelationType());
 
+            CatalogHandle catalogHandle = getRequiredCatalogHandle(metadata, session, node, viewName.getCatalogName());
             analysis.setUpdateType("CREATE MATERIALIZED VIEW");
             analysis.setUpdateTarget(
+                    catalogHandle.getVersion(),
                     viewName,
                     Optional.empty(),
                     Optional.of(
@@ -1456,6 +1517,20 @@ protected Scope visitExplainAnalyze(ExplainAnalyze node, Optional<Scope> scope)
         @Override
         protected Scope visitQuery(Query node, Optional<Scope> scope)
         {
+            verify(isTopLevel || node.getFunctions().isEmpty(), "Inline functions must be at the top level");
+            for (FunctionSpecification function : node.getFunctions()) {
+                if (function.getName().getPrefix().isPresent()) {
+                    throw semanticException(SYNTAX_ERROR, function, "Inline function names cannot be qualified: " + function.getName());
+                }
+                function.getRoutineCharacteristics().stream()
+                        .filter(SecurityCharacteristic.class::isInstance)
+                        .findFirst()
+                        .ifPresent(security -> {
+                            throw semanticException(NOT_SUPPORTED, security, "Security mode not supported for inline functions");
+                        });
+                plannerContext.getLanguageFunctionManager().addInlineFunction(session, formatSql(function), accessControl);
+            }
+
             Scope withScope = analyzeWith(node, scope);
             Scope queryBodyScope = process(node.getQueryBody(), withScope);
 
@@ -1463,7 +1538,7 @@ protected Scope visitQuery(Query node, Optional<Scope> scope)
             if (node.getOrderBy().isPresent()) {
                 orderByExpressions = analyzeOrderBy(node, getSortItemsFromOrderBy(node.getOrderBy()), queryBodyScope);
 
-                if (queryBodyScope.getOuterQueryParent().isPresent() && node.getLimit().isEmpty() && node.getOffset().isEmpty()) {
+                if ((queryBodyScope.getOuterQueryParent().isPresent() || !isTopLevel) && node.getLimit().isEmpty() && node.getOffset().isEmpty()) {
                     // not the root scope and ORDER BY is ineffective
                     analysis.markRedundantOrderBy(node.getOrderBy().get());
                     warningCollector.add(new TrinoWarning(REDUNDANT_ORDER_BY, "ORDER BY in subquery may have no effect"));
@@ -1505,6 +1580,7 @@ protected Scope visitUnnest(Unnest node, Optional<Scope> scope)
 
             ImmutableList.Builder<Field> outputFields = ImmutableList.builder();
             for (Expression expression : node.getExpressions()) {
+                verifyNoAggregateWindowOrGroupingFunctions(session, functionResolver, accessControl, expression, "UNNEST");
                 List<Field> expressionOutputs = new ArrayList<>();
 
                 ExpressionAnalysis expressionAnalysis = analyzeExpression(expression, createScope(scope));
@@ -1548,7 +1624,7 @@ else if (expressionType instanceof MapType) {
         protected Scope visitLateral(Lateral node, Optional<Scope> scope)
         {
             StatementAnalyzer analyzer = statementAnalyzerFactory.createStatementAnalyzer(analysis, session, warningCollector, CorrelationSupport.ALLOWED);
-            Scope queryScope = analyzer.analyze(node.getQuery(), scope);
+            Scope queryScope = analyzer.analyze(node.getQuery(), scope.orElseThrow());
             return createAndAssignScope(node, scope, queryScope.getRelationType());
         }
 
@@ -1556,7 +1632,7 @@ protected Scope visitLateral(Lateral node, Optional<Scope> scope)
         protected Scope visitTableFunctionInvocation(TableFunctionInvocation node, Optional<Scope> scope)
         {
             TableFunctionMetadata tableFunctionMetadata = resolveTableFunction(node)
-                    .orElseThrow(() -> semanticException(FUNCTION_NOT_FOUND, node, "Table function %s not registered", node.getName()));
+                    .orElseThrow(() -> semanticException(FUNCTION_NOT_FOUND, node, "Table function '%s' not registered", node.getName()));
 
             ConnectorTableFunction function = tableFunctionMetadata.getFunction();
             CatalogHandle catalogHandle = tableFunctionMetadata.getCatalogHandle();
@@ -1569,7 +1645,11 @@ protected Scope visitTableFunctionInvocation(TableFunctionInvocation node, Optio
             ArgumentsAnalysis argumentsAnalysis = analyzeArguments(function.getArguments(), node.getArguments(), scope, errorLocation);
 
             ConnectorTransactionHandle transactionHandle = transactionManager.getConnectorTransaction(session.getRequiredTransactionId(), catalogHandle);
-            TableFunctionAnalysis functionAnalysis = function.analyze(session.toConnectorSession(catalogHandle), transactionHandle, argumentsAnalysis.getPassedArguments());
+            TableFunctionAnalysis functionAnalysis = function.analyze(
+                    session.toConnectorSession(catalogHandle),
+                    transactionHandle,
+                    argumentsAnalysis.getPassedArguments(),
+                    new InjectedConnectorAccessControl(accessControl, session.toSecurityContext(), catalogHandle.getCatalogName()));
 
             List<List<String>> copartitioningLists = analyzeCopartitioning(node.getCopartitioning(), argumentsAnalysis.getTableArgumentAnalyses());
 
@@ -1642,6 +1722,10 @@ else if (returnTypeSpecification == GENERIC_TABLE) {
                         .ifPresent(column -> {
                             throw new TrinoException(FUNCTION_IMPLEMENTATION_ERROR, format("Invalid index: %s of required column from table argument %s", column, name));
                         });
+                // record the required columns for access control
+                columns.stream()
+                        .map(inputScope.getRelationType()::getFieldByIndex)
+                        .forEach(this::recordColumnAccess);
             });
             Set<String> requiredInputs = ImmutableSet.copyOf(requiredColumns.keySet());
             allInputs.stream()
@@ -1692,7 +1776,6 @@ else if (argument.getPartitionBy().isPresent()) {
 
             analysis.setTableFunctionAnalysis(node, new TableFunctionInvocationAnalysis(
                     catalogHandle,
-                    function.getSchema(),
                     function.getName(),
                     argumentsAnalysis.getPassedArguments(),
                     orderedTableArguments.build(),
@@ -1707,17 +1790,20 @@ else if (argument.getPartitionBy().isPresent()) {
 
         private Optional<TableFunctionMetadata> resolveTableFunction(TableFunctionInvocation node)
         {
-            for (CatalogSchemaFunctionName name : toPath(session, toQualifiedFunctionName(node.getName()))) {
+            boolean unauthorized = false;
+            for (CatalogSchemaFunctionName name : toPath(session, node.getName(), accessControl)) {
                 CatalogHandle catalogHandle = getRequiredCatalogHandle(metadata, session, node, name.getCatalogName());
                 Optional<ConnectorTableFunction> resolved = tableFunctionRegistry.resolve(catalogHandle, name.getSchemaFunctionName());
                 if (resolved.isPresent()) {
-                    accessControl.checkCanExecuteFunction(SecurityContext.of(session), FunctionKind.TABLE, new QualifiedObjectName(
-                            name.getCatalogName(),
-                            name.getSchemaFunctionName().getSchemaName(),
-                            name.getSchemaFunctionName().getFunctionName()));
-                    return Optional.of(new TableFunctionMetadata(catalogHandle, resolved.get()));
+                    if (isBuiltinFunctionName(name) || accessControl.canExecuteFunction(SecurityContext.of(session), new QualifiedObjectName(name.getCatalogName(), name.getSchemaName(), name.getFunctionName()))) {
+                        return Optional.of(new TableFunctionMetadata(catalogHandle, resolved.get()));
+                    }
+                    unauthorized = true;
                 }
             }
+            if (unauthorized) {
+                denyExecuteFunction(node.getName().toString());
+            }
             return Optional.empty();
         }
 
@@ -2144,6 +2230,7 @@ protected Scope visitTable(Table table, Optional<Scope> scope)
             Optional<MaterializedViewDefinition> optionalMaterializedView = metadata.getMaterializedView(session, name);
             if (optionalMaterializedView.isPresent()) {
                 MaterializedViewDefinition materializedViewDefinition = optionalMaterializedView.get();
+                analysis.addEmptyColumnReferencesForTable(accessControl, session.getIdentity(), name);
                 if (isMaterializedViewSufficientlyFresh(session, name, materializedViewDefinition)) {
                     // If materialized view is sufficiently fresh with respect to its grace period, answer the query using the storage table
                     QualifiedName storageName = getMaterializedViewStorageTableName(materializedViewDefinition)
@@ -2167,8 +2254,8 @@ protected Scope visitTable(Table table, Optional<Scope> scope)
 
             // This can only be a table
             RedirectionAwareTableHandle redirection = getTableHandle(table, name, scope);
-            Optional<TableHandle> tableHandle = redirection.getTableHandle();
-            QualifiedObjectName targetTableName = redirection.getRedirectedTableName().orElse(name);
+            Optional<TableHandle> tableHandle = redirection.tableHandle();
+            QualifiedObjectName targetTableName = redirection.redirectedTableName().orElse(name);
             analysis.addEmptyColumnReferencesForTable(accessControl, session.getIdentity(), targetTableName);
 
             if (tableHandle.isEmpty()) {
@@ -2201,7 +2288,6 @@ protected Scope visitTable(Table table, Optional<Scope> scope)
                     .withRelationType(RelationId.anonymous(), new RelationType(outputFields))
                     .build();
             analyzeFiltersAndMasks(table, targetTableName, new RelationType(outputFields), accessControlScope);
-            analyzeCheckConstraints(table, targetTableName, accessControlScope, tableSchema.getTableSchema().getCheckConstraints());
             analysis.registerTable(table, tableHandle, targetTableName, session.getIdentity().getUser(), accessControlScope);
 
             Scope tableScope = createAndAssignScope(table, scope, outputFields);
@@ -2254,7 +2340,7 @@ private boolean isMaterializedViewSufficientlyFresh(Session session, QualifiedOb
 
         private void checkStorageTableNotRedirected(QualifiedObjectName source)
         {
-            metadata.getRedirectionAwareTableHandle(session, source).getRedirectedTableName().ifPresent(name -> {
+            metadata.getRedirectionAwareTableHandle(session, source).redirectedTableName().ifPresent(name -> {
                 throw new TrinoException(NOT_SUPPORTED, format("Redirection of materialized view storage table '%s' to '%s' is not supported", source, name));
             });
         }
@@ -2279,7 +2365,11 @@ private void analyzeFiltersAndMasks(Table table, QualifiedObjectName name, Relat
         private void analyzeCheckConstraints(Table table, QualifiedObjectName name, Scope accessControlScope, List<String> constraints)
         {
             for (String constraint : constraints) {
-                ViewExpression expression = new ViewExpression(Optional.empty(), Optional.of(name.getCatalogName()), Optional.of(name.getSchemaName()), constraint);
+                ViewExpression expression = ViewExpression.builder()
+                        .catalog(name.getCatalogName())
+                        .schema(name.getSchemaName())
+                        .expression(constraint)
+                        .build();
                 analyzeCheckConstraint(table, name, accessControlScope, expression);
             }
         }
@@ -2360,13 +2450,23 @@ private Scope createScopeForMaterializedView(Table table, QualifiedObjectName na
                     view.getCatalog(),
                     view.getSchema(),
                     view.getRunAsIdentity(),
+                    view.getPath(),
                     view.getColumns(),
                     storageTable);
         }
 
         private Scope createScopeForView(Table table, QualifiedObjectName name, Optional<Scope> scope, ViewDefinition view)
         {
-            return createScopeForView(table, name, scope, view.getOriginalSql(), view.getCatalog(), view.getSchema(), view.getRunAsIdentity(), view.getColumns(), Optional.empty());
+            return createScopeForView(table,
+                    name,
+                    scope,
+                    view.getOriginalSql(),
+                    view.getCatalog(),
+                    view.getSchema(),
+                    view.getRunAsIdentity(),
+                    view.getPath(),
+                    view.getColumns(),
+                    Optional.empty());
         }
 
         private Scope createScopeForView(
@@ -2377,6 +2477,7 @@ private Scope createScopeForView(
                 Optional<String> catalog,
                 Optional<String> schema,
                 Optional<Identity> owner,
+                List<CatalogSchemaName> path,
                 List<ViewColumn> columns,
                 Optional<TableHandle> storageTable)
         {
@@ -2398,8 +2499,13 @@ private Scope createScopeForView(
             }
 
             Query query = parseView(originalSql, name, table);
+
+            if (!query.getFunctions().isEmpty()) {
+                throw semanticException(NOT_SUPPORTED, table, "View contains inline function: " + name);
+            }
+
             analysis.registerTableForView(table);
-            RelationType descriptor = analyzeView(query, name, catalog, schema, owner, table);
+            RelationType descriptor = analyzeView(query, name, catalog, schema, owner, path, table);
             analysis.unregisterTableForView();
 
             checkViewStaleness(columns, descriptor.getVisibleFields(), name, table)
@@ -2491,7 +2597,7 @@ private List<Field> analyzeStorageTable(Table table, List<Field> viewFields, Tab
 
                 if (!tableField.getType().equals(viewField.getType())) {
                     try {
-                        metadata.getCoercion(session, viewField.getType(), tableField.getType());
+                        metadata.getCoercion(viewField.getType(), tableField.getType());
                     }
                     catch (TrinoException e) {
                         throw semanticException(
@@ -2920,7 +3026,7 @@ else if (base instanceof AliasedRelation aliasedRelation &&
         protected Scope visitTableSubquery(TableSubquery node, Optional<Scope> scope)
         {
             StatementAnalyzer analyzer = statementAnalyzerFactory.createStatementAnalyzer(analysis, session, warningCollector, CorrelationSupport.ALLOWED);
-            Scope queryScope = analyzer.analyze(node.getQuery(), scope);
+            Scope queryScope = analyzer.analyze(node.getQuery(), scope.orElseThrow());
             return createAndAssignScope(node, scope, queryScope.getRelationType());
         }
 
@@ -2951,7 +3057,7 @@ protected Scope visitQuerySpecification(QuerySpecification node, Optional<Scope>
 
                 orderByExpressions = analyzeOrderBy(node, orderBy.getSortItems(), orderByScope.get());
 
-                if (sourceScope.getOuterQueryParent().isPresent() && node.getLimit().isEmpty() && node.getOffset().isEmpty()) {
+                if ((sourceScope.getOuterQueryParent().isPresent() || !isTopLevel) && node.getLimit().isEmpty() && node.getOffset().isEmpty()) {
                     // not the root scope and ORDER BY is ineffective
                     analysis.markRedundantOrderBy(orderBy);
                     warningCollector.add(new TrinoWarning(REDUNDANT_ORDER_BY, "ORDER BY in subquery may have no effect"));
@@ -3004,7 +3110,7 @@ protected Scope visitQuerySpecification(QuerySpecification node, Optional<Scope>
             if (analysis.isAggregation(node) && node.getOrderBy().isPresent()) {
                 ImmutableList.Builder<Expression> aggregates = ImmutableList.<Expression>builder()
                         .addAll(groupByAnalysis.getOriginalExpressions())
-                        .addAll(extractAggregateFunctions(orderByExpressions, session, metadata))
+                        .addAll(extractAggregateFunctions(orderByExpressions, session, functionResolver, accessControl))
                         .addAll(extractExpressions(orderByExpressions, GroupingOperation.class));
 
                 analysis.setOrderByAggregates(node.getOrderBy().get(), aggregates.build());
@@ -3166,7 +3272,7 @@ else if (node.getType() == FULL) {
             }
             if (criteria instanceof JoinOn) {
                 Expression expression = ((JoinOn) criteria).getExpression();
-                verifyNoAggregateWindowOrGroupingFunctions(session, metadata, expression, "JOIN clause");
+                verifyNoAggregateWindowOrGroupingFunctions(session, functionResolver, accessControl, expression, "JOIN clause");
 
                 // Need to register coercions in case when join criteria requires coercion (e.g. join on char(1) = char(2))
                 // Correlations are only currently support in the join criteria for INNER joins
@@ -3203,8 +3309,8 @@ protected Scope visitUpdate(Update update, Optional<Scope> scope)
             }
 
             RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, originalName);
-            QualifiedObjectName tableName = redirection.getRedirectedTableName().orElse(originalName);
-            TableHandle handle = redirection.getTableHandle()
+            QualifiedObjectName tableName = redirection.redirectedTableName().orElse(originalName);
+            TableHandle handle = redirection.tableHandle()
                     .orElseThrow(() -> semanticException(TABLE_NOT_FOUND, table, "Table '%s' does not exist", tableName));
 
             TableSchema tableSchema = metadata.getTableSchema(session, handle);
@@ -3228,10 +3334,6 @@ protected Scope visitUpdate(Update update, Optional<Scope> scope)
             if (!accessControl.getRowFilters(session.toSecurityContext(), tableName).isEmpty()) {
                 throw semanticException(NOT_SUPPORTED, update, "Updating a table with a row filter is not supported");
             }
-            if (!tableSchema.getTableSchema().getCheckConstraints().isEmpty()) {
-                // TODO https://github.com/trinodb/trino/issues/15411 Add support for CHECK constraint to UPDATE statement
-                throw semanticException(NOT_SUPPORTED, update, "Updating a table with a check constraint is not supported");
-            }
 
             // TODO: how to deal with connectors that need to see the pre-image of rows to perform the update without
             //       flowing that data through the masking logic
@@ -3258,17 +3360,29 @@ protected Scope visitUpdate(Update update, Optional<Scope> scope)
 
             Scope tableScope = analyzer.analyzeForUpdate(table, scope, UpdateKind.UPDATE);
             update.getWhere().ifPresent(where -> analyzeWhere(update, tableScope, where));
+            analyzeCheckConstraints(table, tableName, tableScope, tableSchema.getTableSchema().getCheckConstraints());
+            analysis.registerTable(table, redirection.tableHandle(), tableName, session.getIdentity().getUser(), tableScope);
 
             ImmutableList.Builder<ExpressionAnalysis> analysesBuilder = ImmutableList.builder();
             ImmutableList.Builder<Type> expressionTypesBuilder = ImmutableList.builder();
+            ImmutableMap.Builder<String, Set<SourceColumn>> sourceColumnsByColumnNameBuilder = ImmutableMap.builder();
             for (UpdateAssignment assignment : update.getAssignments()) {
+                String targetColumnName = assignment.getName().getValue();
                 Expression expression = assignment.getValue();
-                ExpressionAnalysis analysis = analyzeExpression(expression, tableScope);
-                analysesBuilder.add(analysis);
-                expressionTypesBuilder.add(analysis.getType(expression));
+                ExpressionAnalysis expressionAnalysis = analyzeExpression(expression, tableScope);
+                analysesBuilder.add(expressionAnalysis);
+                expressionTypesBuilder.add(expressionAnalysis.getType(expression));
+
+                Set<SourceColumn> sourceColumns = expressionAnalysis.getSubqueries().stream()
+                        .map(query -> analyze(query.getNode(), tableScope))
+                        .flatMap(subqueryScope -> subqueryScope.getRelationType().getVisibleFields().stream())
+                        .flatMap(field -> analysis.getSourceColumns(field).stream())
+                        .collect(toImmutableSet());
+                sourceColumnsByColumnNameBuilder.put(targetColumnName, sourceColumns);
             }
             List<ExpressionAnalysis> analyses = analysesBuilder.build();
             List<Type> expressionTypes = expressionTypesBuilder.build();
+            Map<String, Set<SourceColumn>> sourceColumnsByColumnName = sourceColumnsByColumnNameBuilder.buildOrThrow();
 
             List<Type> tableTypes = update.getAssignments().stream()
                     .map(assignment -> requireNonNull(columns.get(assignment.getName().getValue())))
@@ -3295,10 +3409,13 @@ protected Scope visitUpdate(Update update, Optional<Scope> scope)
 
             analysis.setUpdateType("UPDATE");
             analysis.setUpdateTarget(
+                    handle.getCatalogHandle().getVersion(),
                     tableName,
                     Optional.of(table),
                     Optional.of(updatedColumnSchemas.stream()
-                            .map(column -> new OutputColumn(new Column(column.getName(), column.getType().toString()), ImmutableSet.of()))
+                            .map(column -> new OutputColumn(
+                                    new Column(column.getName(), column.getType().toString()),
+                                    sourceColumnsByColumnName.getOrDefault(column.getName(), ImmutableSet.of())))
                             .collect(toImmutableList())));
 
             createMergeAnalysis(table, handle, tableSchema, tableScope, tableScope, ImmutableList.of(updatedColumnHandles));
@@ -3320,8 +3437,8 @@ protected Scope visitMerge(Merge merge, Optional<Scope> scope)
             }
 
             RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, originalTableName);
-            QualifiedObjectName tableName = redirection.getRedirectedTableName().orElse(originalTableName);
-            TableHandle targetTableHandle = redirection.getTableHandle()
+            QualifiedObjectName tableName = redirection.redirectedTableName().orElse(originalTableName);
+            TableHandle targetTableHandle = redirection.tableHandle()
                     .orElseThrow(() -> semanticException(TABLE_NOT_FOUND, table, "Table '%s' does not exist", tableName));
 
             StatementAnalyzer analyzer = statementAnalyzerFactory
@@ -3359,14 +3476,12 @@ protected Scope visitMerge(Merge merge, Optional<Scope> scope)
             if (!accessControl.getRowFilters(session.toSecurityContext(), tableName).isEmpty()) {
                 throw semanticException(NOT_SUPPORTED, merge, "Cannot merge into a table with row filters");
             }
-            if (!tableSchema.getTableSchema().getCheckConstraints().isEmpty()) {
-                // TODO https://github.com/trinodb/trino/issues/15411 Add support for CHECK constraint to MERGE statement
-                throw semanticException(NOT_SUPPORTED, merge, "Cannot merge into a table with check constraints");
-            }
-
-            Scope targetTableScope = analyzer.analyzeForUpdate(relation, scope, UpdateKind.MERGE);
-            Scope sourceTableScope = process(merge.getSource(), scope);
-            Scope joinScope = createAndAssignScope(merge, scope, targetTableScope.getRelationType().joinWith(sourceTableScope.getRelationType()));
+            Scope mergeScope = createScope(scope);
+            Scope targetTableScope = analyzer.analyzeForUpdate(relation, Optional.of(mergeScope), UpdateKind.MERGE);
+            Scope sourceTableScope = process(merge.getSource(), mergeScope);
+            Scope joinScope = createAndAssignScope(merge, Optional.of(mergeScope), targetTableScope.getRelationType().joinWith(sourceTableScope.getRelationType()));
+            analyzeCheckConstraints(table, tableName, targetTableScope, tableSchema.getTableSchema().getCheckConstraints());
+            analysis.registerTable(table, redirection.tableHandle(), tableName, session.getIdentity().getUser(), targetTableScope);
 
             for (ColumnSchema column : dataColumnSchemas) {
                 if (accessControl.getColumnMask(session.toSecurityContext(), tableName, column.getName(), column.getType()).isPresent()) {
@@ -3464,7 +3579,7 @@ else if (operation instanceof MergeInsert && caseColumnNames.isEmpty()) {
                     .collect(toImmutableList());
 
             analysis.setUpdateType("MERGE");
-            analysis.setUpdateTarget(tableName, Optional.of(table), Optional.of(updatedColumns));
+            analysis.setUpdateTarget(targetTableHandle.getCatalogHandle().getVersion(), tableName, Optional.of(table), Optional.of(updatedColumns));
             List<List<ColumnHandle>> mergeCaseColumnHandles = buildCaseColumnLists(merge, dataColumnSchemas, allColumnHandles);
 
             createMergeAnalysis(table, targetTableHandle, tableSchema, targetTableScope, joinScope, mergeCaseColumnHandles);
@@ -3604,7 +3719,7 @@ private Scope analyzeJoinUsing(Join node, List<Identifier> columns, Optional<Sco
 
                 // ensure a comparison operator exists for the given types (applying coercions if necessary)
                 try {
-                    metadata.resolveOperator(session, OperatorType.EQUAL, ImmutableList.of(
+                    metadata.resolveOperator(OperatorType.EQUAL, ImmutableList.of(
                             leftField.getType(), rightField.getType()));
                 }
                 catch (OperatorNotFoundException e) {
@@ -3747,6 +3862,12 @@ else if (actualType instanceof RowType) {
             return createAndAssignScope(node, scope, fields);
         }
 
+        @Override
+        protected Scope visitJsonTable(JsonTable node, Optional<Scope> context)
+        {
+            throw semanticException(NOT_SUPPORTED, node, "JSON_TABLE is not yet supported");
+        }
+
         private void analyzeWindowDefinitions(QuerySpecification node, Scope scope)
         {
             for (WindowDefinition windowDefinition : node.getWindows()) {
@@ -3933,8 +4054,8 @@ private List<FunctionCall> analyzeWindowFunctions(QuerySpecification node, List<
 
                 List<Type> argumentTypes = mappedCopy(windowFunction.getArguments(), analysis::getType);
 
-                ResolvedFunction resolvedFunction = metadata.resolveFunction(session, windowFunction.getName(), fromTypes(argumentTypes));
-                FunctionKind kind = metadata.getFunctionMetadata(session, resolvedFunction).getKind();
+                ResolvedFunction resolvedFunction = functionResolver.resolveFunction(session, windowFunction.getName(), fromTypes(argumentTypes), accessControl);
+                FunctionKind kind = resolvedFunction.getFunctionKind();
                 if (kind != AGGREGATE && kind != WINDOW) {
                     throw semanticException(FUNCTION_NOT_WINDOW, node, "Not a window function: %s", windowFunction.getName());
                 }
@@ -3948,7 +4069,7 @@ private void analyzeHaving(QuerySpecification node, Scope scope)
             if (node.getHaving().isPresent()) {
                 Expression predicate = node.getHaving().get();
 
-                List<Expression> windowExpressions = extractWindowExpressions(ImmutableList.of(predicate));
+                List<Expression> windowExpressions = extractWindowExpressions(ImmutableList.of(predicate), session, functionResolver, accessControl);
                 if (!windowExpressions.isEmpty()) {
                     throw semanticException(NESTED_WINDOW, windowExpressions.get(0), "HAVING clause cannot contain window functions or row pattern measures");
                 }
@@ -3975,18 +4096,18 @@ private void checkGroupingSetsCount(GroupBy node)
                     if (element instanceof SimpleGroupBy) {
                         product = 1;
                     }
-                    else if (element instanceof Cube) {
-                        int exponent = element.getExpressions().size();
-                        if (exponent > 30) {
-                            throw new ArithmeticException();
-                        }
-                        product = 1 << exponent;
-                    }
-                    else if (element instanceof Rollup) {
-                        product = element.getExpressions().size() + 1;
-                    }
-                    else if (element instanceof GroupingSets) {
-                        product = ((GroupingSets) element).getSets().size();
+                    else if (element instanceof GroupingSets groupingSets) {
+                        product = switch (groupingSets.getType()) {
+                            case CUBE -> {
+                                int exponent = ((GroupingSets) element).getSets().size();
+                                if (exponent > 30) {
+                                    throw new ArithmeticException();
+                                }
+                                yield 1 << exponent;
+                            }
+                            case ROLLUP -> groupingSets.getSets().size() + 1;
+                            case EXPLICIT -> groupingSets.getSets().size();
+                        };
                     }
                     else {
                         throw new UnsupportedOperationException("Unsupported grouping element type: " + element.getClass().getName());
@@ -4007,8 +4128,8 @@ else if (element instanceof GroupingSets) {
         private GroupingSetAnalysis analyzeGroupBy(QuerySpecification node, Scope scope, List<Expression> outputExpressions)
         {
             if (node.getGroupBy().isPresent()) {
-                ImmutableList.Builder<Set<FieldId>> cubes = ImmutableList.builder();
-                ImmutableList.Builder<List<FieldId>> rollups = ImmutableList.builder();
+                ImmutableList.Builder<List<Set<FieldId>>> cubes = ImmutableList.builder();
+                ImmutableList.Builder<List<Set<FieldId>>> rollups = ImmutableList.builder();
                 ImmutableList.Builder<List<Set<FieldId>>> sets = ImmutableList.builder();
                 ImmutableList.Builder<Expression> complexExpressions = ImmutableList.builder();
                 ImmutableList.Builder<Expression> groupingExpressions = ImmutableList.builder();
@@ -4019,16 +4140,16 @@ private GroupingSetAnalysis analyzeGroupBy(QuerySpecification node, Scope scope,
                         for (Expression column : groupingElement.getExpressions()) {
                             // simple GROUP BY expressions allow ordinals or arbitrary expressions
                             if (column instanceof LongLiteral) {
-                                long ordinal = ((LongLiteral) column).getValue();
+                                long ordinal = ((LongLiteral) column).getParsedValue();
                                 if (ordinal < 1 || ordinal > outputExpressions.size()) {
                                     throw semanticException(INVALID_COLUMN_REFERENCE, column, "GROUP BY position %s is not in select list", ordinal);
                                 }
 
                                 column = outputExpressions.get(toIntExact(ordinal - 1));
-                                verifyNoAggregateWindowOrGroupingFunctions(session, metadata, column, "GROUP BY clause");
+                                verifyNoAggregateWindowOrGroupingFunctions(session, functionResolver, accessControl, column, "GROUP BY clause");
                             }
                             else {
-                                verifyNoAggregateWindowOrGroupingFunctions(session, metadata, column, "GROUP BY clause");
+                                verifyNoAggregateWindowOrGroupingFunctions(session, functionResolver, accessControl, column, "GROUP BY clause");
                                 analyzeExpression(column, scope);
                             }
 
@@ -4044,7 +4165,7 @@ private GroupingSetAnalysis analyzeGroupBy(QuerySpecification node, Scope scope,
                             groupingExpressions.add(column);
                         }
                     }
-                    else {
+                    else if (groupingElement instanceof GroupingSets element) {
                         for (Expression column : groupingElement.getExpressions()) {
                             analyzeExpression(column, scope);
                             if (!analysis.getColumnReferences().contains(NodeRef.of(column))) {
@@ -4054,34 +4175,18 @@ private GroupingSetAnalysis analyzeGroupBy(QuerySpecification node, Scope scope,
                             groupingExpressions.add(column);
                         }
 
-                        if (groupingElement instanceof Cube) {
-                            Set<FieldId> cube = groupingElement.getExpressions().stream()
-                                    .map(NodeRef::of)
-                                    .map(analysis.getColumnReferenceFields()::get)
-                                    .map(ResolvedField::getFieldId)
-                                    .collect(toImmutableSet());
-
-                            cubes.add(cube);
-                        }
-                        else if (groupingElement instanceof Rollup) {
-                            List<FieldId> rollup = groupingElement.getExpressions().stream()
-                                    .map(NodeRef::of)
-                                    .map(analysis.getColumnReferenceFields()::get)
-                                    .map(ResolvedField::getFieldId)
-                                    .collect(toImmutableList());
-
-                            rollups.add(rollup);
-                        }
-                        else if (groupingElement instanceof GroupingSets) {
-                            List<Set<FieldId>> groupingSets = ((GroupingSets) groupingElement).getSets().stream()
-                                    .map(set -> set.stream()
-                                            .map(NodeRef::of)
-                                            .map(analysis.getColumnReferenceFields()::get)
-                                            .map(ResolvedField::getFieldId)
-                                            .collect(toImmutableSet()))
-                                    .collect(toImmutableList());
-
-                            sets.add(groupingSets);
+                        List<Set<FieldId>> groupingSets = element.getSets().stream()
+                                .map(set -> set.stream()
+                                        .map(NodeRef::of)
+                                        .map(analysis.getColumnReferenceFields()::get)
+                                        .map(ResolvedField::getFieldId)
+                                        .collect(toImmutableSet()))
+                                .collect(toImmutableList());
+
+                        switch (element.getType()) {
+                            case CUBE -> cubes.add(groupingSets);
+                            case ROLLUP -> rollups.add(groupingSets);
+                            case EXPLICIT -> sets.add(groupingSets);
                         }
                     }
                 }
@@ -4116,7 +4221,7 @@ private boolean hasAggregates(QuerySpecification node)
                     .addAll(getSortItemsFromOrderBy(node.getOrderBy()))
                     .build();
 
-            List<FunctionCall> aggregates = extractAggregateFunctions(toExtract, session, metadata);
+            List<FunctionCall> aggregates = extractAggregateFunctions(toExtract, session, functionResolver, accessControl);
 
             return !aggregates.isEmpty();
         }
@@ -4242,8 +4347,12 @@ private void analyzeSelectAllColumns(
                             .orElseThrow(() -> semanticException(TABLE_NOT_FOUND, allColumns, "Unable to resolve reference %s", prefix));
                     if (identifierChainBasis.getBasisType() == TABLE) {
                         RelationType relationType = identifierChainBasis.getRelationType().orElseThrow();
-                        List<Field> fields = filterInaccessibleFields(relationType.resolveVisibleFieldsWithRelationPrefix(Optional.of(prefix)));
+                        List<Field> requestedFields = relationType.resolveVisibleFieldsWithRelationPrefix(Optional.of(prefix));
+                        List<Field> fields = filterInaccessibleFields(requestedFields);
                         if (fields.isEmpty()) {
+                            if (!requestedFields.isEmpty()) {
+                                throw semanticException(TABLE_NOT_FOUND, allColumns, "Relation not found or not allowed");
+                            }
                             throw semanticException(COLUMN_NOT_FOUND, allColumns, "SELECT * not allowed from relation that has no columns");
                         }
                         boolean local = scope.isLocalScope(identifierChainBasis.getScope().orElseThrow());
@@ -4268,11 +4377,15 @@ private void analyzeSelectAllColumns(
                     throw semanticException(NOT_SUPPORTED, allColumns, "Column aliases not supported");
                 }
 
-                List<Field> fields = filterInaccessibleFields((List<Field>) scope.getRelationType().getVisibleFields());
+                List<Field> requestedFields = (List<Field>) scope.getRelationType().getVisibleFields();
+                List<Field> fields = filterInaccessibleFields(requestedFields);
                 if (fields.isEmpty()) {
                     if (node.getFrom().isEmpty()) {
                         throw semanticException(COLUMN_NOT_FOUND, allColumns, "SELECT * not allowed in queries without FROM clause");
                     }
+                    if (!requestedFields.isEmpty()) {
+                        throw semanticException(TABLE_NOT_FOUND, allColumns, "Relation not found or not allowed");
+                    }
                     throw semanticException(COLUMN_NOT_FOUND, allColumns, "SELECT * not allowed from relation that has no columns");
                 }
 
@@ -4286,7 +4399,7 @@ private List<Field> filterInaccessibleFields(List<Field> fields)
                 return fields;
             }
 
-            List<Field> accessibleFields = new ArrayList<>();
+            ImmutableSet.Builder<Field> accessibleFields = ImmutableSet.builder();
 
             //collect fields by table
             ListMultimap<QualifiedObjectName, Field> tableFieldsMap = ArrayListMultimap.create();
@@ -4314,7 +4427,7 @@ private List<Field> filterInaccessibleFields(List<Field> fields)
             });
 
             return fields.stream()
-                    .filter(field -> accessibleFields.contains(field))
+                    .filter(accessibleFields.build()::contains)
                     .collect(toImmutableList());
         }
 
@@ -4443,7 +4556,7 @@ private void analyzeSelectSingleColumn(
 
         private void analyzeWhere(Node node, Scope scope, Expression predicate)
         {
-            verifyNoAggregateWindowOrGroupingFunctions(session, metadata, predicate, "WHERE clause");
+            verifyNoAggregateWindowOrGroupingFunctions(session, functionResolver, accessControl, predicate, "WHERE clause");
 
             ExpressionAnalysis expressionAnalysis = analyzeExpression(predicate, scope);
             analysis.recordSubqueries(node, expressionAnalysis);
@@ -4496,7 +4609,7 @@ private void analyzeAggregations(
         {
             checkState(orderByExpressions.isEmpty() || orderByScope.isPresent(), "non-empty orderByExpressions list without orderByScope provided");
 
-            List<FunctionCall> aggregates = extractAggregateFunctions(Iterables.concat(outputExpressions, orderByExpressions), session, metadata);
+            List<FunctionCall> aggregates = extractAggregateFunctions(Iterables.concat(outputExpressions, orderByExpressions), session, functionResolver, accessControl);
             analysis.setAggregates(node, aggregates);
 
             if (analysis.isAggregation(node)) {
@@ -4507,14 +4620,21 @@ private void analyzeAggregations(
                 //     SELECT a + sum(b) GROUP BY a
                 List<Expression> distinctGroupingColumns = ImmutableSet.copyOf(groupByAnalysis.getOriginalExpressions()).asList();
 
-                verifySourceAggregations(distinctGroupingColumns, sourceScope, outputExpressions, session, metadata, analysis);
+                verifySourceAggregations(distinctGroupingColumns, sourceScope, outputExpressions, session, plannerContext, accessControl, analysis);
                 if (!orderByExpressions.isEmpty()) {
-                    verifyOrderByAggregations(distinctGroupingColumns, sourceScope, orderByScope.orElseThrow(), orderByExpressions, session, metadata, analysis);
+                    verifyOrderByAggregations(distinctGroupingColumns, sourceScope, orderByScope.orElseThrow(), orderByExpressions, session, plannerContext, accessControl, analysis);
                 }
             }
         }
 
-        private RelationType analyzeView(Query query, QualifiedObjectName name, Optional<String> catalog, Optional<String> schema, Optional<Identity> owner, Table node)
+        private RelationType analyzeView(
+                Query query,
+                QualifiedObjectName name,
+                Optional<String> catalog,
+                Optional<String> schema,
+                Optional<Identity> owner,
+                List<CatalogSchemaName> path,
+                Table node)
         {
             try {
                 // run view as view owner if set; otherwise, run as session user
@@ -4529,7 +4649,7 @@ private RelationType analyzeView(Query query, QualifiedObjectName name, Optional
                         viewAccessControl = accessControl;
                     }
                     else {
-                        viewAccessControl = new ViewAccessControl(accessControl, session.getIdentity());
+                        viewAccessControl = new ViewAccessControl(accessControl);
                     }
                 }
                 else {
@@ -4537,13 +4657,12 @@ private RelationType analyzeView(Query query, QualifiedObjectName name, Optional
                     viewAccessControl = accessControl;
                 }
 
-                // TODO: record path in view definition (?) (check spec) and feed it into the session object we use to evaluate the query defined by the view
-                Session viewSession = createViewSession(catalog, schema, identity, session.getPath());
+                Session viewSession = session.createViewSession(catalog, schema, identity, path);
 
                 StatementAnalyzer analyzer = statementAnalyzerFactory
                         .withSpecializedAccessControl(viewAccessControl)
                         .createStatementAnalyzer(analysis, viewSession, warningCollector, CorrelationSupport.ALLOWED);
-                Scope queryScope = analyzer.analyze(query, Scope.create());
+                Scope queryScope = analyzer.analyze(query);
                 return queryScope.getRelationType().withAlias(name.getObjectName(), null);
             }
             catch (RuntimeException e) {
@@ -4554,7 +4673,7 @@ private RelationType analyzeView(Query query, QualifiedObjectName name, Optional
         private Query parseView(String view, QualifiedObjectName name, Node node)
         {
             try {
-                return (Query) sqlParser.createStatement(view, createParsingOptions(session));
+                return (Query) sqlParser.createStatement(view);
             }
             catch (ParsingException e) {
                 throw semanticException(INVALID_VIEW, node, e, "Failed parsing stored view '%s': %s", name, e.getMessage());
@@ -4651,7 +4770,7 @@ private void analyzeRowFilter(String currentIdentity, Table table, QualifiedObje
 
             Expression expression;
             try {
-                expression = sqlParser.createExpression(filter.getExpression(), createParsingOptions(session));
+                expression = sqlParser.createExpression(filter.getExpression());
             }
             catch (ParsingException e) {
                 throw new TrinoException(INVALID_ROW_FILTER, extractLocation(table), format("Invalid row filter for '%s': %s", name, e.getErrorMessage()), e);
@@ -4659,7 +4778,7 @@ private void analyzeRowFilter(String currentIdentity, Table table, QualifiedObje
 
             analysis.registerTableForRowFiltering(name, currentIdentity);
 
-            verifyNoAggregateWindowOrGroupingFunctions(session, metadata, expression, format("Row filter for '%s'", name));
+            verifyNoAggregateWindowOrGroupingFunctions(session, functionResolver, accessControl, expression, format("Row filter for '%s'", name));
 
             ExpressionAnalysis expressionAnalysis;
             try {
@@ -4669,7 +4788,7 @@ private void analyzeRowFilter(String currentIdentity, Table table, QualifiedObje
                                 .build())
                         .orElseGet(session::getIdentity);
                 expressionAnalysis = ExpressionAnalyzer.analyzeExpression(
-                        createViewSession(filter.getCatalog(), filter.getSchema(), filterIdentity, session.getPath()), // TODO: path should be included in row filter
+                        session.createViewSession(filter.getCatalog(), filter.getSchema(), filterIdentity, filter.getPath()),
                         plannerContext,
                         statementAnalyzerFactory,
                         accessControl,
@@ -4706,13 +4825,13 @@ private void analyzeCheckConstraint(Table table, QualifiedObjectName name, Scope
         {
             Expression expression;
             try {
-                expression = sqlParser.createExpression(constraint.getExpression(), createParsingOptions(session));
+                expression = sqlParser.createExpression(constraint.getExpression());
             }
             catch (ParsingException e) {
                 throw new TrinoException(INVALID_CHECK_CONSTRAINT, extractLocation(table), format("Invalid check constraint for '%s': %s", name, e.getErrorMessage()), e);
             }
 
-            verifyNoAggregateWindowOrGroupingFunctions(session, metadata, expression, format("Check constraint for '%s'", name));
+            verifyNoAggregateWindowOrGroupingFunctions(session, functionResolver, accessControl, expression, format("Check constraint for '%s'", name));
 
             ExpressionAnalysis expressionAnalysis;
             try {
@@ -4722,7 +4841,7 @@ private void analyzeCheckConstraint(Table table, QualifiedObjectName name, Scope
                             .build())
                         .orElseGet(session::getIdentity);
                 expressionAnalysis = ExpressionAnalyzer.analyzeExpression(
-                        createViewSession(constraint.getCatalog(), constraint.getSchema(), constraintIdentity, session.getPath()),
+                        session.createViewSession(constraint.getCatalog(), constraint.getSchema(), constraintIdentity, constraint.getPath()),
                         plannerContext,
                         statementAnalyzerFactory,
                         accessControl,
@@ -4769,7 +4888,7 @@ private void analyzeColumnMask(String currentIdentity, Table table, QualifiedObj
 
             Expression expression;
             try {
-                expression = sqlParser.createExpression(mask.getExpression(), createParsingOptions(session));
+                expression = sqlParser.createExpression(mask.getExpression());
             }
             catch (ParsingException e) {
                 throw new TrinoException(INVALID_ROW_FILTER, extractLocation(table), format("Invalid column mask for '%s.%s': %s", tableName, column, e.getErrorMessage()), e);
@@ -4778,7 +4897,7 @@ private void analyzeColumnMask(String currentIdentity, Table table, QualifiedObj
             ExpressionAnalysis expressionAnalysis;
             analysis.registerTableForColumnMasking(tableName, column, currentIdentity);
 
-            verifyNoAggregateWindowOrGroupingFunctions(session, metadata, expression, format("Column mask for '%s.%s'", table.getName(), column));
+            verifyNoAggregateWindowOrGroupingFunctions(session, functionResolver, accessControl, expression, format("Column mask for '%s.%s'", table.getName(), column));
 
             try {
                 Identity maskIdentity = mask.getSecurityIdentity()
@@ -4787,7 +4906,7 @@ private void analyzeColumnMask(String currentIdentity, Table table, QualifiedObj
                                 .build())
                         .orElseGet(session::getIdentity);
                 expressionAnalysis = ExpressionAnalyzer.analyzeExpression(
-                        createViewSession(mask.getCatalog(), mask.getSchema(), maskIdentity, session.getPath()), // TODO: path should be included in row filter
+                        session.createViewSession(mask.getCatalog(), mask.getSchema(), maskIdentity, mask.getPath()),
                         plannerContext,
                         statementAnalyzerFactory,
                         accessControl,
@@ -4874,7 +4993,7 @@ private Scope analyzeWith(Query node, Optional<Scope> scope)
 
                 if (!isRecursive) {
                     Query query = withQuery.getQuery();
-                    process(query, withScopeBuilder.build());
+                    analyze(query, withScopeBuilder.build());
 
                     // check if all or none of the columns are explicitly alias
                     if (withQuery.getColumnNames().isPresent()) {
@@ -5202,7 +5321,7 @@ private List<Expression> analyzeOrderBy(Node node, List<SortItem> sortItems, Sco
                 if (expression instanceof LongLiteral) {
                     // this is an ordinal in the output tuple
 
-                    long ordinal = ((LongLiteral) expression).getValue();
+                    long ordinal = ((LongLiteral) expression).getParsedValue();
                     if (ordinal < 1 || ordinal > orderByScope.getRelationType().getVisibleFieldCount()) {
                         throw semanticException(INVALID_COLUMN_REFERENCE, expression, "ORDER BY position %s is not in select list", ordinal);
                     }
@@ -5237,7 +5356,7 @@ private void analyzeOffset(Offset node, Scope scope)
         {
             long rowCount;
             if (node.getRowCount() instanceof LongLiteral) {
-                rowCount = ((LongLiteral) node.getRowCount()).getValue();
+                rowCount = ((LongLiteral) node.getRowCount()).getParsedValue();
             }
             else {
                 checkState(node.getRowCount() instanceof Parameter, "unexpected OFFSET rowCount: " + node.getRowCount().getClass().getSimpleName());
@@ -5271,7 +5390,7 @@ private boolean analyzeLimit(FetchFirst node, Scope scope)
             if (node.getRowCount().isPresent()) {
                 Expression count = node.getRowCount().get();
                 if (count instanceof LongLiteral) {
-                    rowCount = ((LongLiteral) count).getValue();
+                    rowCount = ((LongLiteral) count).getParsedValue();
                 }
                 else {
                     checkState(count instanceof Parameter, "unexpected FETCH FIRST rowCount: " + count.getClass().getSimpleName());
@@ -5296,7 +5415,7 @@ private boolean analyzeLimit(Limit node, Scope scope)
                 rowCount = OptionalLong.empty();
             }
             else if (node.getRowCount() instanceof LongLiteral) {
-                rowCount = OptionalLong.of(((LongLiteral) node.getRowCount()).getValue());
+                rowCount = OptionalLong.of(((LongLiteral) node.getRowCount()).getParsedValue());
             }
             else {
                 checkState(node.getRowCount() instanceof Parameter, "unexpected LIMIT rowCount: " + node.getRowCount().getClass().getSimpleName());
@@ -5483,31 +5602,12 @@ private Object coerce(Type sourceType, Object value, Type targetType)
             if (sourceType.equals(targetType)) {
                 return value;
             }
-            ResolvedFunction coercion = metadata.getCoercion(session, sourceType, targetType);
+            ResolvedFunction coercion = metadata.getCoercion(sourceType, targetType);
             InterpretedFunctionInvoker functionInvoker = new InterpretedFunctionInvoker(plannerContext.getFunctionManager());
             return functionInvoker.invoke(coercion, session.toConnectorSession(), value);
         }
     }
 
-    private Session createViewSession(Optional<String> catalog, Optional<String> schema, Identity identity, SqlPath path)
-    {
-        return Session.builder(sessionPropertyManager)
-                .setQueryId(session.getQueryId())
-                .setTransactionId(session.getTransactionId().orElse(null))
-                .setIdentity(identity)
-                .setSource(session.getSource().orElse(null))
-                .setCatalog(catalog)
-                .setSchema(schema)
-                .setPath(path)
-                .setTimeZoneKey(session.getTimeZoneKey())
-                .setLocale(session.getLocale())
-                .setRemoteUserAddress(session.getRemoteUserAddress().orElse(null))
-                .setUserAgent(session.getUserAgent().orElse(null))
-                .setClientInfo(session.getClientInfo().orElse(null))
-                .setStart(session.getStart())
-                .build();
-    }
-
     private static boolean hasScopeAsLocalParent(Scope root, Scope parent)
     {
         Scope scope = root;
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzerFactory.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzerFactory.java
index 634fa74febb7..f1002bf519fb 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzerFactory.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzerFactory.java
@@ -14,11 +14,11 @@
 package io.trino.sql.analyzer;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.AnalyzePropertyManager;
-import io.trino.metadata.SessionPropertyManager;
 import io.trino.metadata.TableFunctionRegistry;
 import io.trino.metadata.TableProceduresPropertyManager;
 import io.trino.metadata.TableProceduresRegistry;
@@ -30,8 +30,6 @@
 import io.trino.transaction.NoOpTransactionManager;
 import io.trino.transaction.TransactionManager;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 public class StatementAnalyzerFactory
@@ -44,7 +42,6 @@ public class StatementAnalyzerFactory
     private final GroupProvider groupProvider;
     private final TableProceduresRegistry tableProceduresRegistry;
     private final TableFunctionRegistry tableFunctionRegistry;
-    private final SessionPropertyManager sessionPropertyManager;
     private final TablePropertyManager tablePropertyManager;
     private final AnalyzePropertyManager analyzePropertyManager;
     private final TableProceduresPropertyManager tableProceduresPropertyManager;
@@ -59,7 +56,6 @@ public StatementAnalyzerFactory(
             GroupProvider groupProvider,
             TableProceduresRegistry tableProceduresRegistry,
             TableFunctionRegistry tableFunctionRegistry,
-            SessionPropertyManager sessionPropertyManager,
             TablePropertyManager tablePropertyManager,
             AnalyzePropertyManager analyzePropertyManager,
             TableProceduresPropertyManager tableProceduresPropertyManager)
@@ -72,7 +68,6 @@ public StatementAnalyzerFactory(
         this.groupProvider = requireNonNull(groupProvider, "groupProvider is null");
         this.tableProceduresRegistry = requireNonNull(tableProceduresRegistry, "tableProceduresRegistry is null");
         this.tableFunctionRegistry = requireNonNull(tableFunctionRegistry, "tableFunctionRegistry is null");
-        this.sessionPropertyManager = requireNonNull(sessionPropertyManager, "sessionPropertyManager is null");
         this.tablePropertyManager = requireNonNull(tablePropertyManager, "tablePropertyManager is null");
         this.analyzePropertyManager = requireNonNull(analyzePropertyManager, "analyzePropertyManager is null");
         this.tableProceduresPropertyManager = requireNonNull(tableProceduresPropertyManager, "tableProceduresPropertyManager is null");
@@ -89,7 +84,6 @@ public StatementAnalyzerFactory withSpecializedAccessControl(AccessControl acces
                 groupProvider,
                 tableProceduresRegistry,
                 tableFunctionRegistry,
-                sessionPropertyManager,
                 tablePropertyManager,
                 analyzePropertyManager,
                 tableProceduresPropertyManager);
@@ -113,7 +107,6 @@ public StatementAnalyzer createStatementAnalyzer(
                 session,
                 tableProceduresRegistry,
                 tableFunctionRegistry,
-                sessionPropertyManager,
                 tablePropertyManager,
                 analyzePropertyManager,
                 tableProceduresPropertyManager,
@@ -136,7 +129,6 @@ public static StatementAnalyzerFactory createTestingStatementAnalyzerFactory(
                 user -> ImmutableSet.of(),
                 new TableProceduresRegistry(CatalogServiceProvider.fail("procedures are not supported in testing analyzer")),
                 new TableFunctionRegistry(CatalogServiceProvider.fail("table functions are not supported in testing analyzer")),
-                new SessionPropertyManager(),
                 tablePropertyManager,
                 analyzePropertyManager,
                 new TableProceduresPropertyManager(CatalogServiceProvider.fail("procedures are not supported in testing analyzer")));
diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/WindowFunctionValidator.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/WindowFunctionValidator.java
index 0409e3ea9bfc..93330925243b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/WindowFunctionValidator.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/WindowFunctionValidator.java
@@ -44,7 +44,7 @@ protected Void visitFunctionCall(FunctionCall functionCall, Analysis analysis)
         // pattern recognition functions are not resolved
         if (!analysis.isPatternRecognitionFunction(functionCall)) {
             ResolvedFunction resolvedFunction = analysis.getResolvedFunction(functionCall);
-            if (resolvedFunction != null && functionCall.getWindow().isEmpty() && metadata.getFunctionMetadata(session, resolvedFunction).getKind() == WINDOW) {
+            if (resolvedFunction != null && functionCall.getWindow().isEmpty() && resolvedFunction.getFunctionKind() == WINDOW) {
                 throw semanticException(MISSING_OVER, functionCall, "Window function %s requires an OVER clause", resolvedFunction.getSignature().getName());
             }
         }
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/BytecodeUtils.java b/core/trino-main/src/main/java/io/trino/sql/gen/BytecodeUtils.java
index 4fbec1780de0..e348062705d7 100644
--- a/core/trino-main/src/main/java/io/trino/sql/gen/BytecodeUtils.java
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/BytecodeUtils.java
@@ -164,7 +164,7 @@ public static BytecodeNode generateInvocation(
     {
         return generateInvocation(
                 scope,
-                resolvedFunction.getSignature().getName(),
+                resolvedFunction.getSignature().getName().getFunctionName(),
                 resolvedFunction.getFunctionNullability(),
                 invocationConvention -> functionManager.getScalarFunctionImplementation(resolvedFunction, invocationConvention),
                 arguments,
@@ -212,7 +212,7 @@ public static BytecodeNode generateFullInvocation(
     {
         return generateFullInvocation(
                 scope,
-                resolvedFunction.getSignature().getName(),
+                resolvedFunction.getSignature().getName().getFunctionName(),
                 resolvedFunction.getFunctionNullability(),
                 resolvedFunction.getSignature().getArgumentTypes().stream()
                         .map(FunctionType.class::isInstance)
@@ -445,7 +445,7 @@ public static BytecodeExpression invoke(Binding binding, String name, List<Bytec
 
     public static BytecodeExpression invoke(Binding binding, BoundSignature signature)
     {
-        return invoke(binding, signature.getName());
+        return invoke(binding, signature.getName().getFunctionName());
     }
 
     /**
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/CompilerOperations.java b/core/trino-main/src/main/java/io/trino/sql/gen/CompilerOperations.java
index bdadded203aa..730a34279310 100644
--- a/core/trino-main/src/main/java/io/trino/sql/gen/CompilerOperations.java
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/CompilerOperations.java
@@ -14,8 +14,7 @@
 package io.trino.sql.gen;
 
 import io.trino.spi.block.Block;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/DereferenceCodeGenerator.java b/core/trino-main/src/main/java/io/trino/sql/gen/DereferenceCodeGenerator.java
index 9b66e3a8abcd..6f5736356791 100644
--- a/core/trino-main/src/main/java/io/trino/sql/gen/DereferenceCodeGenerator.java
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/DereferenceCodeGenerator.java
@@ -20,6 +20,7 @@
 import io.airlift.bytecode.expression.BytecodeExpression;
 import io.airlift.bytecode.instruction.LabelNode;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.Type;
 import io.trino.sql.relational.ConstantExpression;
 import io.trino.sql.relational.RowExpression;
@@ -53,11 +54,11 @@ public BytecodeNode generateExpression(BytecodeGeneratorContext generator)
 
         BytecodeBlock block = new BytecodeBlock().comment("DEREFERENCE").setDescription("DEREFERENCE");
         Variable wasNull = generator.wasNull();
-        Variable rowBlock = generator.getScope().createTempVariable(Block.class);
+        Variable row = generator.getScope().createTempVariable(SqlRow.class);
 
         // clear the wasNull flag before evaluating the row value
         block.putVariable(wasNull, false);
-        block.append(generator.generate(base)).putVariable(rowBlock);
+        block.append(generator.generate(base)).putVariable(row);
 
         IfStatement ifRowBlockIsNull = new IfStatement("if row block is null...")
                 .condition(wasNull);
@@ -73,21 +74,17 @@ public BytecodeNode generateExpression(BytecodeGeneratorContext generator)
         block.append(ifRowBlockIsNull);
 
         IfStatement ifFieldIsNull = new IfStatement("if row field is null...");
-        ifFieldIsNull.condition()
-                .comment("call rowBlock.isNull(index)")
-                .append(rowBlock)
-                .push(index)
-                .invokeInterface(Block.class, "isNull", boolean.class, int.class);
+        ifFieldIsNull.condition(row.invoke("getRawFieldBlock", Block.class, constantInt(index)).invoke("isNull", boolean.class, row.invoke("getRawIndex", int.class)));
 
         ifFieldIsNull.ifTrue()
                 .comment("if the field is null, push null to stack")
                 .putVariable(wasNull, true)
                 .pushJavaDefault(javaType);
 
-        BytecodeExpression value = constantType(callSiteBinder, returnType).getValue(rowBlock, constantInt(index));
+        BytecodeExpression value = constantType(callSiteBinder, returnType).getValue(row.invoke("getRawFieldBlock", Block.class, constantInt(index)), row.invoke("getRawIndex", int.class));
 
         ifFieldIsNull.ifFalse()
-                .comment("otherwise call type.getTYPE(rowBlock, index)")
+                .comment("otherwise call type.getTYPE(row, index)")
                 .append(value)
                 .putVariable(wasNull, false);
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/ExpressionCompiler.java b/core/trino-main/src/main/java/io/trino/sql/gen/ExpressionCompiler.java
index 7db28635d10c..d258710165cc 100644
--- a/core/trino-main/src/main/java/io/trino/sql/gen/ExpressionCompiler.java
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/ExpressionCompiler.java
@@ -18,9 +18,10 @@
 import com.google.common.cache.CacheLoader;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.inject.Inject;
 import io.airlift.bytecode.ClassDefinition;
 import io.airlift.jmx.CacheStatsMBean;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.metadata.FunctionManager;
 import io.trino.operator.project.CursorProcessor;
 import io.trino.operator.project.PageFilter;
@@ -31,8 +32,6 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -46,7 +45,7 @@
 import static io.airlift.bytecode.Access.PUBLIC;
 import static io.airlift.bytecode.Access.a;
 import static io.airlift.bytecode.ParameterizedType.type;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.sql.gen.BytecodeUtils.invoke;
 import static io.trino.sql.relational.Expressions.constant;
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/ExpressionProfiler.java b/core/trino-main/src/main/java/io/trino/sql/gen/ExpressionProfiler.java
index 7839d49b2d30..49f635be2ff4 100644
--- a/core/trino-main/src/main/java/io/trino/sql/gen/ExpressionProfiler.java
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/ExpressionProfiler.java
@@ -19,7 +19,7 @@
 
 import static com.google.common.base.Ticker.systemTicker;
 import static com.google.common.base.Verify.verify;
-import static io.trino.execution.executor.PrioritizedSplitRunner.SPLIT_RUN_QUANTA;
+import static io.trino.execution.executor.timesharing.PrioritizedSplitRunner.SPLIT_RUN_QUANTA;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/JoinCompiler.java b/core/trino-main/src/main/java/io/trino/sql/gen/JoinCompiler.java
index 9e34d7973fce..12030ab0de59 100644
--- a/core/trino-main/src/main/java/io/trino/sql/gen/JoinCompiler.java
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/JoinCompiler.java
@@ -16,6 +16,7 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.bytecode.BytecodeBlock;
 import io.airlift.bytecode.BytecodeNode;
 import io.airlift.bytecode.ClassDefinition;
@@ -34,7 +35,8 @@
 import io.airlift.jmx.CacheStatsMBean;
 import io.airlift.slice.SizeOf;
 import io.trino.Session;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
+import io.trino.operator.FlatHashStrategy;
 import io.trino.operator.HashArraySizeSupplier;
 import io.trino.operator.PagesHashStrategy;
 import io.trino.operator.join.BigintPagesHash;
@@ -57,8 +59,6 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -88,11 +88,13 @@
 import static io.airlift.bytecode.expression.BytecodeExpressions.newInstance;
 import static io.airlift.bytecode.expression.BytecodeExpressions.notEqual;
 import static io.airlift.bytecode.expression.BytecodeExpressions.setStatic;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.operator.FlatHashStrategyCompiler.compileFlatHashStrategy;
 import static io.trino.operator.join.JoinUtils.getSingleBigintJoinChannel;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.DEFAULT_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.gen.Bootstrap.BOOTSTRAP_METHOD;
@@ -120,6 +122,8 @@ public class JoinCompiler
             CacheLoader.from(key ->
                     internalCompileHashStrategy(key.getTypes(), key.getOutputChannels(), key.getJoinChannels(), key.getSortChannel())));
 
+    private final NonEvictableLoadingCache<List<Type>, FlatHashStrategy> flatHashStrategies;
+
     @Inject
     public JoinCompiler(TypeOperators typeOperators)
     {
@@ -131,6 +135,11 @@ public JoinCompiler(TypeOperators typeOperators, boolean enableSingleChannelBigi
     {
         this.typeOperators = requireNonNull(typeOperators, "typeOperators is null");
         this.enableSingleChannelBigintLookupSource = enableSingleChannelBigintLookupSource;
+        this.flatHashStrategies = buildNonEvictableCache(
+                    CacheBuilder.newBuilder()
+                            .recordStats()
+                            .maximumSize(1000),
+                    CacheLoader.from(key -> compileFlatHashStrategy(key, typeOperators)));
     }
 
     @Managed
@@ -147,6 +156,12 @@ public CacheStatsMBean getHashStrategiesStats()
         return new CacheStatsMBean(hashStrategies);
     }
 
+    // This should be in a separate cache, but it is convenient during the transition to keep this in the join compiler
+    public FlatHashStrategy getFlatHashStrategy(List<Type> types)
+    {
+        return flatHashStrategies.getUnchecked(ImmutableList.copyOf(types));
+    }
+
     public LookupSourceSupplierFactory compileLookupSourceFactory(List<? extends Type> types, List<Integer> joinChannels, Optional<Integer> sortChannel, Optional<List<Integer>> outputChannels)
     {
         return lookupSourceFactories.getUnchecked(new CacheKey(
@@ -521,7 +536,7 @@ private void generateHashRowMethod(ClassDefinition classDefinition, CallSiteBind
 
     private BytecodeNode typeHashCode(CallSiteBinder callSiteBinder, Type type, BytecodeExpression blockRef, BytecodeExpression blockPosition)
     {
-        MethodHandle hashCodeOperator = typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
+        MethodHandle hashCodeOperator = typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL));
         return new IfStatement()
                 .condition(blockRef.invoke("isNull", boolean.class, blockPosition))
                 .ifTrue(constantLong(0L))
@@ -1031,14 +1046,13 @@ private BytecodeNode typeEqualsIgnoreNulls(
             BytecodeExpression rightBlock,
             BytecodeExpression rightBlockPosition)
     {
-        MethodHandle equalOperator = typeOperators.getEqualOperator(type, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION));
-        BytecodeExpression equalInvocation = invokeDynamic(
+        MethodHandle equalOperator = typeOperators.getEqualOperator(type, simpleConvention(DEFAULT_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
+        return invokeDynamic(
                 BOOTSTRAP_METHOD,
                 ImmutableList.of(callSiteBinder.bind(equalOperator).getBindingId()),
                 "equal",
                 equalOperator.type(),
                 leftBlock, leftBlockPosition, rightBlock, rightBlockPosition);
-        return BytecodeExpressions.equal(equalInvocation, getStatic(Boolean.class, "TRUE"));
     }
 
     public static class LookupSourceSupplierFactory
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/JoinFilterFunctionCompiler.java b/core/trino-main/src/main/java/io/trino/sql/gen/JoinFilterFunctionCompiler.java
index b80de9514f6c..5e765f09897b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/gen/JoinFilterFunctionCompiler.java
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/JoinFilterFunctionCompiler.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.bytecode.BytecodeBlock;
 import io.airlift.bytecode.BytecodeNode;
 import io.airlift.bytecode.ClassDefinition;
@@ -29,7 +30,7 @@
 import io.airlift.bytecode.Variable;
 import io.airlift.bytecode.control.IfStatement;
 import io.airlift.jmx.CacheStatsMBean;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.metadata.FunctionManager;
 import io.trino.operator.join.InternalJoinFilterFunction;
 import io.trino.operator.join.JoinFilterFunction;
@@ -45,8 +46,6 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-
 import java.lang.reflect.Constructor;
 import java.util.List;
 import java.util.Map;
@@ -62,7 +61,7 @@
 import static io.airlift.bytecode.ParameterizedType.type;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantFalse;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantInt;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.sql.gen.BytecodeUtils.invoke;
 import static io.trino.sql.gen.LambdaExpressionExtractor.extractLambdaExpressions;
 import static io.trino.util.CompilerUtils.defineClass;
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/LambdaBytecodeGenerator.java b/core/trino-main/src/main/java/io/trino/sql/gen/LambdaBytecodeGenerator.java
index 2cb355d0523a..55b0cc4ab935 100644
--- a/core/trino-main/src/main/java/io/trino/sql/gen/LambdaBytecodeGenerator.java
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/LambdaBytecodeGenerator.java
@@ -359,7 +359,7 @@ public BytecodeNode visitVariableReference(VariableReferenceExpression reference
         };
     }
 
-    static class CompiledLambda
+    public static class CompiledLambda
     {
         // lambda method information
         private final Handle lambdaAsmHandle;
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/LambdaMetafactoryGenerator.java b/core/trino-main/src/main/java/io/trino/sql/gen/LambdaMetafactoryGenerator.java
new file mode 100644
index 000000000000..cafd610f861a
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/LambdaMetafactoryGenerator.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed 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 io.trino.sql.gen;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.bytecode.Access;
+import io.airlift.bytecode.MethodDefinition;
+import io.airlift.bytecode.ParameterizedType;
+import io.airlift.bytecode.expression.BytecodeExpression;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+import java.lang.invoke.LambdaMetafactory;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.airlift.bytecode.ParameterizedType.type;
+import static io.airlift.bytecode.expression.BytecodeExpressions.invokeDynamic;
+import static org.objectweb.asm.Type.getMethodType;
+import static org.objectweb.asm.Type.getType;
+
+public final class LambdaMetafactoryGenerator
+{
+    private static final Method METAFACTORY;
+
+    static {
+        try {
+            METAFACTORY = LambdaMetafactory.class.getMethod("metafactory", MethodHandles.Lookup.class, String.class, MethodType.class, MethodType.class, MethodHandle.class, MethodType.class);
+        }
+        catch (NoSuchMethodException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private LambdaMetafactoryGenerator() {}
+
+    public static <T> BytecodeExpression generateMetafactory(Class<T> interfaceType, MethodDefinition targetMethod, List<BytecodeExpression> additionalArguments)
+    {
+        Method interfaceMethod = getSingleAbstractMethod(interfaceType);
+
+        // verify target method has signature of additionalArguments + interfaceMethod
+        List<ParameterizedType> expectedTypes = new ArrayList<>();
+        if (targetMethod.getAccess().contains(Access.STATIC)) {
+            additionalArguments.forEach(argument -> expectedTypes.add(argument.getType()));
+        }
+        else {
+            checkArgument(!additionalArguments.isEmpty() && additionalArguments.get(0).getType().equals(targetMethod.getDeclaringClass().getType()),
+                    "Expected first additional argument to be 'this' for non-static method");
+            additionalArguments
+                    .subList(1, additionalArguments.size())
+                    .forEach(argument -> expectedTypes.add(argument.getType()));
+        }
+        Arrays.stream(interfaceMethod.getParameterTypes()).forEach(type -> expectedTypes.add(type(type)));
+        checkArgument(expectedTypes.equals(targetMethod.getParameterTypes()),
+                "Expected target method to have parameter types %s, but has %s", expectedTypes, targetMethod.getParameterTypes());
+
+        Type interfaceMethodType = toMethodType(interfaceMethod);
+        return invokeDynamic(
+                METAFACTORY,
+                ImmutableList.of(
+                        interfaceMethodType,
+                        new Handle(
+                                targetMethod.getAccess().contains(Access.STATIC) ? Opcodes.H_INVOKESTATIC : Opcodes.H_INVOKEVIRTUAL,
+                                targetMethod.getDeclaringClass().getName(),
+                                targetMethod.getName(),
+                                targetMethod.getMethodDescriptor(),
+                                false),
+                        interfaceMethodType),
+                "build",
+                type(interfaceType),
+                additionalArguments);
+    }
+
+    private static Type toMethodType(Method interfaceMethod)
+    {
+        return getMethodType(
+                getType(interfaceMethod.getReturnType()),
+                Arrays.stream(interfaceMethod.getParameterTypes()).map(Type::getType).toArray(Type[]::new));
+    }
+
+    private static <T> Method getSingleAbstractMethod(Class<T> interfaceType)
+    {
+        List<Method> interfaceMethods = Arrays.stream(interfaceType.getMethods())
+                .filter(m -> Modifier.isAbstract(m.getModifiers()))
+                .filter(m -> Modifier.isPublic(m.getModifiers()))
+                .filter(LambdaMetafactoryGenerator::notJavaObjectMethod)
+                .collect(toImmutableList());
+        if (interfaceMethods.size() != 1) {
+            throw new IllegalArgumentException(interfaceType.getSimpleName() + "  does not have a single abstract method");
+        }
+        return interfaceMethods.get(0);
+    }
+
+    private static boolean notJavaObjectMethod(Method method)
+    {
+        return !methodMatches(method, "toString", String.class) &&
+                !methodMatches(method, "hashCode", int.class) &&
+                !methodMatches(method, "equals", boolean.class, Object.class);
+    }
+
+    private static boolean methodMatches(Method method, String name, Class<?> returnType, Class<?>... parameterTypes)
+    {
+        return method.getParameterCount() == parameterTypes.length &&
+                method.getReturnType() == returnType &&
+                name.equals(method.getName()) &&
+                Arrays.equals(method.getParameterTypes(), parameterTypes);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/OrderingCompiler.java b/core/trino-main/src/main/java/io/trino/sql/gen/OrderingCompiler.java
index 4642dee394fa..d2bcb243d42f 100644
--- a/core/trino-main/src/main/java/io/trino/sql/gen/OrderingCompiler.java
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/OrderingCompiler.java
@@ -17,6 +17,7 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.bytecode.BytecodeBlock;
 import io.airlift.bytecode.ClassDefinition;
 import io.airlift.bytecode.MethodDefinition;
@@ -27,7 +28,7 @@
 import io.airlift.bytecode.instruction.LabelNode;
 import io.airlift.jmx.CacheStatsMBean;
 import io.airlift.log.Logger;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.operator.PageWithPositionComparator;
 import io.trino.operator.PagesIndex;
 import io.trino.operator.PagesIndexComparator;
@@ -45,8 +46,6 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 import java.util.Objects;
@@ -59,7 +58,7 @@
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantInt;
 import static io.airlift.bytecode.expression.BytecodeExpressions.invokeDynamic;
 import static io.airlift.bytecode.expression.BytecodeExpressions.invokeStatic;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/PageFunctionCompiler.java b/core/trino-main/src/main/java/io/trino/sql/gen/PageFunctionCompiler.java
index 791b726cd688..5e1a826ba6f6 100644
--- a/core/trino-main/src/main/java/io/trino/sql/gen/PageFunctionCompiler.java
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/PageFunctionCompiler.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.bytecode.BytecodeBlock;
 import io.airlift.bytecode.BytecodeNode;
 import io.airlift.bytecode.ClassDefinition;
@@ -31,7 +32,7 @@
 import io.airlift.bytecode.control.ForLoop;
 import io.airlift.bytecode.control.IfStatement;
 import io.airlift.jmx.CacheStatsMBean;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.metadata.FunctionManager;
 import io.trino.operator.Work;
 import io.trino.operator.project.ConstantPageProjection;
@@ -55,13 +56,12 @@
 import io.trino.sql.relational.LambdaDefinitionExpression;
 import io.trino.sql.relational.RowExpression;
 import io.trino.sql.relational.RowExpressionVisitor;
+import jakarta.annotation.Nullable;
 import org.objectweb.asm.MethodTooLargeException;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
+import java.lang.invoke.MethodHandle;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -87,7 +87,7 @@
 import static io.airlift.bytecode.expression.BytecodeExpressions.lessThan;
 import static io.airlift.bytecode.expression.BytecodeExpressions.newArray;
 import static io.airlift.bytecode.expression.BytecodeExpressions.not;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.operator.project.PageFieldsToInputParametersRewriter.rewritePageFieldsToInputParameters;
 import static io.trino.spi.StandardErrorCode.COMPILER_ERROR;
 import static io.trino.sql.gen.BytecodeUtils.generateWrite;
@@ -185,6 +185,7 @@ private Supplier<PageProjection> compileProjectionInternal(RowExpression project
         }
 
         PageFieldsToInputParametersRewriter.Result result = rewritePageFieldsToInputParameters(projection);
+        boolean isExpressionDeterministic = isDeterministic(result.getRewrittenExpression());
 
         CallSiteBinder callSiteBinder = new CallSiteBinder();
 
@@ -203,11 +204,12 @@ private Supplier<PageProjection> compileProjectionInternal(RowExpression project
             throw new TrinoException(COMPILER_ERROR, e);
         }
 
+        MethodHandle pageProjectionConstructor = constructorMethodHandle(pageProjectionWorkClass, BlockBuilder.class, ConnectorSession.class, Page.class, SelectedPositions.class);
         return () -> new GeneratedPageProjection(
                 result.getRewrittenExpression(),
-                isDeterministic(result.getRewrittenExpression()),
+                isExpressionDeterministic,
                 result.getInputChannels(),
-                constructorMethodHandle(pageProjectionWorkClass, BlockBuilder.class, ConnectorSession.class, Page.class, SelectedPositions.class));
+                pageProjectionConstructor);
     }
 
     private static ParameterizedType generateProjectionWorkClassName(Optional<String> classNameSuffix)
@@ -225,7 +227,6 @@ private ClassDefinition definePageProjectWorkClass(RowExpression projection, Cal
 
         FieldDefinition blockBuilderField = classDefinition.declareField(a(PRIVATE), "blockBuilder", BlockBuilder.class);
         FieldDefinition sessionField = classDefinition.declareField(a(PRIVATE), "session", ConnectorSession.class);
-        FieldDefinition pageField = classDefinition.declareField(a(PRIVATE), "page", Page.class);
         FieldDefinition selectedPositionsField = classDefinition.declareField(a(PRIVATE), "selectedPositions", SelectedPositions.class);
         FieldDefinition nextIndexOrPositionField = classDefinition.declareField(a(PRIVATE), "nextIndexOrPosition", int.class);
         FieldDefinition resultField = classDefinition.declareField(a(PRIVATE), "result", Block.class);
@@ -233,7 +234,7 @@ private ClassDefinition definePageProjectWorkClass(RowExpression projection, Cal
         CachedInstanceBinder cachedInstanceBinder = new CachedInstanceBinder(classDefinition, callSiteBinder);
 
         // process
-        generateProcessMethod(classDefinition, blockBuilderField, sessionField, pageField, selectedPositionsField, nextIndexOrPositionField, resultField);
+        generateProcessMethod(classDefinition, blockBuilderField, sessionField, selectedPositionsField, nextIndexOrPositionField, resultField);
 
         // getResult
         MethodDefinition method = classDefinition.declareMethod(a(PUBLIC), "getResult", type(Object.class), ImmutableList.of());
@@ -259,11 +260,15 @@ private ClassDefinition definePageProjectWorkClass(RowExpression projection, Cal
                 .invokeConstructor(Object.class)
                 .append(thisVariable.setField(blockBuilderField, blockBuilder))
                 .append(thisVariable.setField(sessionField, session))
-                .append(thisVariable.setField(pageField, page))
                 .append(thisVariable.setField(selectedPositionsField, selectedPositions))
                 .append(thisVariable.setField(nextIndexOrPositionField, selectedPositions.invoke("getOffset", int.class)))
                 .append(thisVariable.setField(resultField, constantNull(Block.class)));
 
+        for (int channel : getInputChannels(projection)) {
+            FieldDefinition blockField = classDefinition.declareField(a(PRIVATE, FINAL), "block_" + channel, Block.class);
+            body.append(thisVariable.setField(blockField, page.invoke("getBlock", Block.class, constantInt(channel))));
+        }
+
         cachedInstanceBinder.generateInitializations(thisVariable, body);
         body.ret();
 
@@ -274,7 +279,6 @@ private static MethodDefinition generateProcessMethod(
             ClassDefinition classDefinition,
             FieldDefinition blockBuilder,
             FieldDefinition session,
-            FieldDefinition page,
             FieldDefinition selectedPositions,
             FieldDefinition nextIndexOrPosition,
             FieldDefinition result)
@@ -301,14 +305,14 @@ private static MethodDefinition generateProcessMethod(
                         .condition(lessThan(index, to))
                         .update(index.increment())
                         .body(new BytecodeBlock()
-                                .append(thisVariable.invoke("evaluate", void.class, thisVariable.getField(session), thisVariable.getField(page), positions.getElement(index))))));
+                                .append(thisVariable.invoke("evaluate", void.class, thisVariable.getField(session), positions.getElement(index))))));
 
         ifStatement.ifFalse(new ForLoop("range based loop")
                 .initialize(index.set(from))
                 .condition(lessThan(index, to))
                 .update(index.increment())
                 .body(new BytecodeBlock()
-                        .append(thisVariable.invoke("evaluate", void.class, thisVariable.getField(session), thisVariable.getField(page), index))));
+                        .append(thisVariable.invoke("evaluate", void.class, thisVariable.getField(session), index))));
 
         body.comment("result = this.blockBuilder.build(); return true;")
                 .append(thisVariable.setField(result, thisVariable.getField(blockBuilder).invoke("build", Block.class)))
@@ -327,7 +331,6 @@ private MethodDefinition generateEvaluateMethod(
             FieldDefinition blockBuilder)
     {
         Parameter session = arg("session", ConnectorSession.class);
-        Parameter page = arg("page", Page.class);
         Parameter position = arg("position", int.class);
 
         MethodDefinition method = classDefinition.declareMethod(
@@ -336,7 +339,6 @@ private MethodDefinition generateEvaluateMethod(
                 type(void.class),
                 ImmutableList.<Parameter>builder()
                         .add(session)
-                        .add(page)
                         .add(position)
                         .build());
 
@@ -346,13 +348,11 @@ private MethodDefinition generateEvaluateMethod(
         BytecodeBlock body = method.getBody();
         Variable thisVariable = method.getThis();
 
-        declareBlockVariables(projection, page, scope, body);
-
         Variable wasNullVariable = scope.declareVariable("wasNull", body, constantFalse());
         RowExpressionCompiler compiler = new RowExpressionCompiler(
                 callSiteBinder,
                 cachedInstanceBinder,
-                fieldReferenceCompiler(callSiteBinder),
+                fieldReferenceCompilerProjection(callSiteBinder),
                 functionManager,
                 compiledLambdaMap);
 
@@ -611,6 +611,14 @@ private static List<Integer> getInputChannels(RowExpression expression)
         return getInputChannels(ImmutableList.of(expression));
     }
 
+    private static RowExpressionVisitor<BytecodeNode, Scope> fieldReferenceCompilerProjection(CallSiteBinder callSiteBinder)
+    {
+        return new InputReferenceCompiler(
+                (scope, field) -> scope.getThis().getField("block_" + field, Block.class),
+                (scope, field) -> scope.getVariable("position"),
+                callSiteBinder);
+    }
+
     private static RowExpressionVisitor<BytecodeNode, Scope> fieldReferenceCompiler(CallSiteBinder callSiteBinder)
     {
         return new InputReferenceCompiler(
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/RowConstructorCodeGenerator.java b/core/trino-main/src/main/java/io/trino/sql/gen/RowConstructorCodeGenerator.java
index 124a04a78bbd..85ce4646ed93 100644
--- a/core/trino-main/src/main/java/io/trino/sql/gen/RowConstructorCodeGenerator.java
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/RowConstructorCodeGenerator.java
@@ -21,15 +21,19 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.Type;
 import io.trino.sql.relational.RowExpression;
 import io.trino.sql.relational.SpecialForm;
 
 import java.util.List;
 
+import static io.airlift.bytecode.ParameterizedType.type;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantFalse;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantInt;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantNull;
+import static io.airlift.bytecode.expression.BytecodeExpressions.newArray;
+import static io.airlift.bytecode.expression.BytecodeExpressions.newInstance;
 import static io.trino.sql.gen.SqlTypeBytecodeExpression.constantType;
 import static java.util.Objects.requireNonNull;
 
@@ -54,33 +58,33 @@ public BytecodeNode generateExpression(BytecodeGeneratorContext context)
         Scope scope = context.getScope();
         List<Type> types = rowType.getTypeParameters();
 
-        block.comment("Create new RowBlockBuilder; beginBlockEntry;");
-        Variable blockBuilder = scope.createTempVariable(BlockBuilder.class);
-        Variable singleRowBlockWriter = scope.createTempVariable(BlockBuilder.class);
-        block.append(blockBuilder.set(
-                constantType(binder, rowType).invoke(
-                        "createBlockBuilder",
-                        BlockBuilder.class,
-                        constantNull(BlockBuilderStatus.class),
-                        constantInt(1))));
-        block.append(singleRowBlockWriter.set(blockBuilder.invoke("beginBlockEntry", BlockBuilder.class)));
+        Variable fieldBlocks = scope.createTempVariable(Block[].class);
+        block.append(fieldBlocks.set(newArray(type(Block[].class), arguments.size())));
 
+        Variable blockBuilder = scope.createTempVariable(BlockBuilder.class);
         for (int i = 0; i < arguments.size(); ++i) {
             Type fieldType = types.get(i);
             Variable field = scope.createTempVariable(fieldType.getJavaType());
+
+            block.append(blockBuilder.set(constantType(binder, fieldType).invoke(
+                    "createBlockBuilder",
+                    BlockBuilder.class,
+                    constantNull(BlockBuilderStatus.class),
+                    constantInt(1))));
+
             block.comment("Clean wasNull and Generate + " + i + "-th field of row");
             block.append(context.wasNull().set(constantFalse()));
             block.append(context.generate(arguments.get(i)));
             block.putVariable(field);
             block.append(new IfStatement()
                     .condition(context.wasNull())
-                    .ifTrue(singleRowBlockWriter.invoke("appendNull", BlockBuilder.class).pop())
-                    .ifFalse(constantType(binder, fieldType).writeValue(singleRowBlockWriter, field).pop()));
+                    .ifTrue(blockBuilder.invoke("appendNull", BlockBuilder.class).pop())
+                    .ifFalse(constantType(binder, fieldType).writeValue(blockBuilder, field).pop()));
+
+            block.append(fieldBlocks.setElement(i, blockBuilder.invoke("build", Block.class)));
         }
-        block.comment("closeEntry; slice the SingleRowBlock; wasNull = false;");
-        block.append(blockBuilder.invoke("closeEntry", BlockBuilder.class).pop());
-        block.append(constantType(binder, rowType).invoke("getObject", Object.class, blockBuilder.cast(Block.class), constantInt(0))
-                .cast(Block.class));
+
+        block.append(newInstance(SqlRow.class, constantInt(0), fieldBlocks));
         block.append(context.wasNull().set(constantFalse()));
         return block;
     }
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/RowExpressionCompiler.java b/core/trino-main/src/main/java/io/trino/sql/gen/RowExpressionCompiler.java
index 5c58fdf2045f..13845182a816 100644
--- a/core/trino-main/src/main/java/io/trino/sql/gen/RowExpressionCompiler.java
+++ b/core/trino-main/src/main/java/io/trino/sql/gen/RowExpressionCompiler.java
@@ -51,7 +51,7 @@ public class RowExpressionCompiler
     private final FunctionManager functionManager;
     private final Map<LambdaDefinitionExpression, CompiledLambda> compiledLambdaMap;
 
-    RowExpressionCompiler(
+    public RowExpressionCompiler(
             CallSiteBinder callSiteBinder,
             CachedInstanceBinder cachedInstanceBinder,
             RowExpressionVisitor<BytecodeNode, Scope> fieldReferenceCompiler,
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/BuildSideJoinPlanVisitor.java b/core/trino-main/src/main/java/io/trino/sql/planner/BuildSideJoinPlanVisitor.java
new file mode 100644
index 000000000000..b0a29254bfaf
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/BuildSideJoinPlanVisitor.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed 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 io.trino.sql.planner;
+
+import io.trino.sql.planner.plan.IndexJoinNode;
+import io.trino.sql.planner.plan.JoinNode;
+import io.trino.sql.planner.plan.SemiJoinNode;
+import io.trino.sql.planner.plan.SpatialJoinNode;
+
+public class BuildSideJoinPlanVisitor<C>
+        extends SimplePlanVisitor<C>
+{
+    @Override
+    public Void visitJoin(JoinNode node, C context)
+    {
+        node.getRight().accept(this, context);
+        node.getLeft().accept(this, context);
+        return null;
+    }
+
+    @Override
+    public Void visitSemiJoin(SemiJoinNode node, C context)
+    {
+        node.getFilteringSource().accept(this, context);
+        node.getSource().accept(this, context);
+        return null;
+    }
+
+    @Override
+    public Void visitSpatialJoin(SpatialJoinNode node, C context)
+    {
+        node.getRight().accept(this, context);
+        node.getLeft().accept(this, context);
+        return null;
+    }
+
+    @Override
+    public Void visitIndexJoin(IndexJoinNode node, C context)
+    {
+        node.getIndexSource().accept(this, context);
+        node.getProbeSource().accept(this, context);
+        return null;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/BuiltinFunctionCallBuilder.java b/core/trino-main/src/main/java/io/trino/sql/planner/BuiltinFunctionCallBuilder.java
new file mode 100644
index 000000000000..8882f93a1d04
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/BuiltinFunctionCallBuilder.java
@@ -0,0 +1,150 @@
+/*
+ * Licensed 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 io.trino.sql.planner;
+
+import io.trino.metadata.Metadata;
+import io.trino.metadata.ResolvedFunction;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeSignature;
+import io.trino.sql.analyzer.TypeSignatureProvider;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.FunctionCall;
+import io.trino.sql.tree.NodeLocation;
+import io.trino.sql.tree.OrderBy;
+import io.trino.sql.tree.Window;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import static java.util.Objects.requireNonNull;
+
+public class BuiltinFunctionCallBuilder
+{
+    private final Metadata metadata;
+    private String name;
+    private List<TypeSignature> argumentTypes = new ArrayList<>();
+    private List<Expression> argumentValues = new ArrayList<>();
+    private Optional<NodeLocation> location = Optional.empty();
+    private Optional<Window> window = Optional.empty();
+    private Optional<Expression> filter = Optional.empty();
+    private Optional<OrderBy> orderBy = Optional.empty();
+    private boolean distinct;
+
+    public static BuiltinFunctionCallBuilder resolve(Metadata metadata)
+    {
+        return new BuiltinFunctionCallBuilder(metadata);
+    }
+
+    private BuiltinFunctionCallBuilder(Metadata metadata)
+    {
+        this.metadata = requireNonNull(metadata, "metadata is null");
+    }
+
+    public BuiltinFunctionCallBuilder setName(String name)
+    {
+        this.name = requireNonNull(name, "name is null");
+        return this;
+    }
+
+    public BuiltinFunctionCallBuilder addArgument(Type type, Expression value)
+    {
+        requireNonNull(type, "type is null");
+        return addArgument(type.getTypeSignature(), value);
+    }
+
+    public BuiltinFunctionCallBuilder addArgument(TypeSignature typeSignature, Expression value)
+    {
+        requireNonNull(typeSignature, "typeSignature is null");
+        requireNonNull(value, "value is null");
+        argumentTypes.add(typeSignature);
+        argumentValues.add(value);
+        return this;
+    }
+
+    public BuiltinFunctionCallBuilder setArguments(List<Type> types, List<Expression> values)
+    {
+        requireNonNull(types, "types is null");
+        requireNonNull(values, "values is null");
+        argumentTypes = types.stream()
+                .map(Type::getTypeSignature)
+                .collect(Collectors.toList());
+        argumentValues = new ArrayList<>(values);
+        return this;
+    }
+
+    public BuiltinFunctionCallBuilder setLocation(NodeLocation location)
+    {
+        this.location = Optional.of(requireNonNull(location, "location is null"));
+        return this;
+    }
+
+    public BuiltinFunctionCallBuilder setWindow(Window window)
+    {
+        this.window = Optional.of(requireNonNull(window, "window is null"));
+        return this;
+    }
+
+    public BuiltinFunctionCallBuilder setWindow(Optional<Window> window)
+    {
+        this.window = requireNonNull(window, "window is null");
+        return this;
+    }
+
+    public BuiltinFunctionCallBuilder setFilter(Expression filter)
+    {
+        this.filter = Optional.of(requireNonNull(filter, "filter is null"));
+        return this;
+    }
+
+    public BuiltinFunctionCallBuilder setFilter(Optional<Expression> filter)
+    {
+        this.filter = requireNonNull(filter, "filter is null");
+        return this;
+    }
+
+    public BuiltinFunctionCallBuilder setOrderBy(OrderBy orderBy)
+    {
+        this.orderBy = Optional.of(requireNonNull(orderBy, "orderBy is null"));
+        return this;
+    }
+
+    public BuiltinFunctionCallBuilder setOrderBy(Optional<OrderBy> orderBy)
+    {
+        this.orderBy = requireNonNull(orderBy, "orderBy is null");
+        return this;
+    }
+
+    public BuiltinFunctionCallBuilder setDistinct(boolean distinct)
+    {
+        this.distinct = distinct;
+        return this;
+    }
+
+    public FunctionCall build()
+    {
+        ResolvedFunction resolvedFunction = metadata.resolveBuiltinFunction(name, TypeSignatureProvider.fromTypeSignatures(argumentTypes));
+        return new FunctionCall(
+                location,
+                resolvedFunction.toQualifiedName(),
+                window,
+                filter,
+                orderBy,
+                distinct,
+                Optional.empty(),
+                Optional.empty(),
+                argumentValues);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/CompilerConfig.java b/core/trino-main/src/main/java/io/trino/sql/planner/CompilerConfig.java
index 1ec2a07db8ea..da90def6a9a7 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/CompilerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/CompilerConfig.java
@@ -16,13 +16,13 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.DefunctConfig;
-
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Min;
 
 @DefunctConfig("compiler.interpreter-enabled")
 public class CompilerConfig
 {
     private int expressionCacheSize = 10_000;
+    private boolean specializeAggregationLoops = true;
 
     @Min(0)
     public int getExpressionCacheSize()
@@ -37,4 +37,16 @@ public CompilerConfig setExpressionCacheSize(int expressionCacheSize)
         this.expressionCacheSize = expressionCacheSize;
         return this;
     }
+
+    public boolean isSpecializeAggregationLoops()
+    {
+        return specializeAggregationLoops;
+    }
+
+    @Config("compiler.specialized-aggregation-loops")
+    public CompilerConfig setSpecializeAggregationLoops(boolean specializeAggregationLoops)
+    {
+        this.specializeAggregationLoops = specializeAggregationLoops;
+        return this;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/ConnectorExpressionTranslator.java b/core/trino-main/src/main/java/io/trino/sql/planner/ConnectorExpressionTranslator.java
index dbf208db4d90..3e2bb5093b91 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/ConnectorExpressionTranslator.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/ConnectorExpressionTranslator.java
@@ -19,25 +19,25 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.trino.Session;
-import io.trino.likematcher.LikeMatcher;
-import io.trino.metadata.LiteralFunction;
+import io.trino.connector.system.GlobalSystemConnector;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.plugin.base.expression.ConnectorExpressions;
 import io.trino.security.AllowAllAccessControl;
+import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.expression.Call;
 import io.trino.spi.expression.ConnectorExpression;
 import io.trino.spi.expression.Constant;
 import io.trino.spi.expression.FieldDereference;
 import io.trino.spi.expression.FunctionName;
+import io.trino.spi.expression.StandardFunctions;
 import io.trino.spi.expression.Variable;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.VarcharType;
 import io.trino.sql.DynamicFilters;
 import io.trino.sql.PlannerContext;
-import io.trino.sql.analyzer.TypeSignatureProvider;
 import io.trino.sql.tree.ArithmeticBinaryExpression;
 import io.trino.sql.tree.ArithmeticUnaryExpression;
 import io.trino.sql.tree.AstVisitor;
@@ -63,7 +63,7 @@
 import io.trino.sql.tree.SubscriptExpression;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.type.JoniRegexp;
-import io.trino.type.LikeFunctions;
+import io.trino.type.LikePattern;
 import io.trino.type.Re2JRegexp;
 import io.trino.type.Re2JRegexpType;
 
@@ -77,6 +77,10 @@
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.airlift.slice.SliceUtf8.countCodePoints;
 import static io.trino.SystemSessionProperties.isComplexExpressionPushdown;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
+import static io.trino.metadata.GlobalFunctionCatalog.isBuiltinFunctionName;
+import static io.trino.metadata.LanguageFunctionManager.isInlineFunction;
+import static io.trino.metadata.LiteralFunction.LITERAL_FUNCTION_NAME;
 import static io.trino.spi.expression.StandardFunctions.ADD_FUNCTION_NAME;
 import static io.trino.spi.expression.StandardFunctions.AND_FUNCTION_NAME;
 import static io.trino.spi.expression.StandardFunctions.ARRAY_CONSTRUCTOR_FUNCTION_NAME;
@@ -90,7 +94,6 @@
 import static io.trino.spi.expression.StandardFunctions.IS_NULL_FUNCTION_NAME;
 import static io.trino.spi.expression.StandardFunctions.LESS_THAN_OPERATOR_FUNCTION_NAME;
 import static io.trino.spi.expression.StandardFunctions.LESS_THAN_OR_EQUAL_OPERATOR_FUNCTION_NAME;
-import static io.trino.spi.expression.StandardFunctions.LIKE_FUNCTION_NAME;
 import static io.trino.spi.expression.StandardFunctions.MODULUS_FUNCTION_NAME;
 import static io.trino.spi.expression.StandardFunctions.MULTIPLY_FUNCTION_NAME;
 import static io.trino.spi.expression.StandardFunctions.NEGATE_FUNCTION_NAME;
@@ -104,14 +107,15 @@
 import static io.trino.sql.ExpressionUtils.combineConjuncts;
 import static io.trino.sql.ExpressionUtils.extractConjuncts;
 import static io.trino.sql.ExpressionUtils.isEffectivelyLiteral;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toTypeSignature;
 import static io.trino.sql.planner.ExpressionInterpreter.evaluateConstantExpression;
 import static io.trino.type.JoniRegexpType.JONI_REGEXP;
+import static io.trino.type.LikeFunctions.LIKE_FUNCTION_NAME;
 import static io.trino.type.LikeFunctions.LIKE_PATTERN_FUNCTION_NAME;
 import static io.trino.type.LikePatternType.LIKE_PATTERN;
 import static java.lang.Math.toIntExact;
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public final class ConnectorExpressionTranslator
@@ -219,7 +223,7 @@ public Optional<Expression> translate(ConnectorExpression expression)
             }
 
             if (expression instanceof Constant) {
-                return Optional.of(literalEncoder.toExpression(session, ((Constant) expression).getValue(), expression.getType()));
+                return Optional.of(literalEncoder.toExpression(((Constant) expression).getValue(), expression.getType()));
             }
 
             if (expression instanceof FieldDereference dereference) {
@@ -237,7 +241,16 @@ public Optional<Expression> translate(ConnectorExpression expression)
         protected Optional<Expression> translateCall(Call call)
         {
             if (call.getFunctionName().getCatalogSchema().isPresent()) {
-                return Optional.empty();
+                CatalogSchemaName catalogSchemaName = call.getFunctionName().getCatalogSchema().get();
+                checkArgument(!catalogSchemaName.getCatalogName().equals(GlobalSystemConnector.NAME), "System functions must not be fully qualified");
+                // this uses allow allow all access control because connector expressions are not allowed access any function
+                ResolvedFunction resolved = plannerContext.getFunctionResolver().resolveFunction(
+                        session,
+                        QualifiedName.of(catalogSchemaName.getCatalogName(), catalogSchemaName.getSchemaName(), call.getFunctionName().getName()),
+                        fromTypes(call.getArguments().stream().map(ConnectorExpression::getType).collect(toImmutableList())),
+                        new AllowAllAccessControl());
+
+                return translateCall(call.getFunctionName().getName(), resolved, call.getArguments());
             }
 
             if (AND_FUNCTION_NAME.equals(call.getFunctionName())) {
@@ -289,7 +302,7 @@ protected Optional<Expression> translateCall(Call call)
                 return translate(getOnlyElement(call.getArguments())).map(argument -> new ArithmeticUnaryExpression(ArithmeticUnaryExpression.Sign.MINUS, argument));
             }
 
-            if (LIKE_FUNCTION_NAME.equals(call.getFunctionName())) {
+            if (StandardFunctions.LIKE_FUNCTION_NAME.equals(call.getFunctionName())) {
                 return switch (call.getArguments().size()) {
                     case 2 -> translateLike(call.getArguments().get(0), call.getArguments().get(1), Optional.empty());
                     case 3 -> translateLike(call.getArguments().get(0), call.getArguments().get(1), Optional.of(call.getArguments().get(2)));
@@ -301,16 +314,18 @@ protected Optional<Expression> translateCall(Call call)
                 return translateInPredicate(call.getArguments().get(0), call.getArguments().get(1));
             }
 
-            QualifiedName name = QualifiedName.of(call.getFunctionName().getName());
-            List<TypeSignature> argumentTypes = call.getArguments().stream()
-                    .map(argument -> argument.getType().getTypeSignature())
-                    .collect(toImmutableList());
-            ResolvedFunction resolved = plannerContext.getMetadata().resolveFunction(session, name, TypeSignatureProvider.fromTypeSignatures(argumentTypes));
+            ResolvedFunction resolved = plannerContext.getMetadata().resolveBuiltinFunction(
+                    call.getFunctionName().getName(),
+                    fromTypes(call.getArguments().stream().map(ConnectorExpression::getType).collect(toImmutableList())));
+
+            return translateCall(call.getFunctionName().getName(), resolved, call.getArguments());
+        }
 
-            FunctionCallBuilder builder = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                    .setName(name);
-            for (int i = 0; i < call.getArguments().size(); i++) {
-                ConnectorExpression argument = call.getArguments().get(i);
+        private Optional<Expression> translateCall(String functionName, ResolvedFunction resolved, List<ConnectorExpression> arguments)
+        {
+            ResolvedFunctionCallBuilder builder = ResolvedFunctionCallBuilder.builder(resolved);
+            for (int i = 0; i < arguments.size(); i++) {
+                ConnectorExpression argument = arguments.get(i);
                 Type formalType = resolved.getSignature().getArgumentTypes().get(i);
                 Type argumentType = argument.getType();
                 Optional<Expression> translated = translate(argument);
@@ -324,9 +339,9 @@ protected Optional<Expression> translateCall(Call call)
                 }
                 else if (!argumentType.equals(formalType)) {
                     // There are no implicit coercions in connector expressions except for engine types that are not exposed in connector expressions.
-                    throw new IllegalArgumentException(format("Unexpected type %s for argument %s of type %s of %s", argumentType, formalType, i, name));
+                    throw new IllegalArgumentException("Unexpected type %s for argument %s of type %s of %s".formatted(argumentType, formalType, i, functionName));
                 }
-                builder.addArgument(formalType, expression);
+                builder.addArgument(expression);
             }
             return Optional.of(builder.build());
         }
@@ -461,21 +476,21 @@ protected Optional<Expression> translateLike(ConnectorExpression value, Connecto
                         return Optional.empty();
                     }
 
-                    patternCall = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of(LIKE_PATTERN_FUNCTION_NAME))
+                    patternCall = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName(LIKE_PATTERN_FUNCTION_NAME)
                             .addArgument(pattern.getType(), translatedPattern.get())
                             .addArgument(escape.get().getType(), translatedEscape.get())
                             .build();
                 }
                 else {
-                    patternCall = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of(LIKE_PATTERN_FUNCTION_NAME))
+                    patternCall = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName(LIKE_PATTERN_FUNCTION_NAME)
                             .addArgument(pattern.getType(), translatedPattern.get())
                             .build();
                 }
 
-                FunctionCall call = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                        .setName(QualifiedName.of(LikeFunctions.LIKE_FUNCTION_NAME))
+                FunctionCall call = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                        .setName(LIKE_FUNCTION_NAME)
                         .addArgument(value.getType(), translatedValue.get())
                         .addArgument(LIKE_PATTERN, patternCall)
                         .build();
@@ -666,12 +681,12 @@ protected Optional<ConnectorExpression> visitFunctionCall(FunctionCall node, Voi
                 return Optional.empty();
             }
 
-            String functionName = ResolvedFunction.extractFunctionName(node.getName());
-            checkArgument(!DynamicFilters.Function.NAME.equals(functionName), "Dynamic filter has no meaning for a connector, it should not be translated into ConnectorExpression");
+            CatalogSchemaFunctionName functionName = ResolvedFunction.extractFunctionName(node.getName());
+            checkArgument(!builtinFunctionName(DynamicFilters.Function.NAME).equals(functionName), "Dynamic filter has no meaning for a connector, it should not be translated into ConnectorExpression");
             // literals should be handled by isEffectivelyLiteral case above
-            checkArgument(!LiteralFunction.LITERAL_FUNCTION_NAME.equalsIgnoreCase(functionName), "Unexpected literal function");
+            checkArgument(!builtinFunctionName(LITERAL_FUNCTION_NAME).equals(functionName), "Unexpected literal function");
 
-            if (functionName.equals(LikeFunctions.LIKE_FUNCTION_NAME)) {
+            if (functionName.equals(builtinFunctionName(LIKE_FUNCTION_NAME))) {
                 return translateLike(node);
             }
 
@@ -684,9 +699,16 @@ protected Optional<ConnectorExpression> visitFunctionCall(FunctionCall node, Voi
                 arguments.add(argument.get());
             }
 
-            // Currently, plugin-provided and runtime-added functions doesn't have a catalog/schema qualifier.
-            // TODO Translate catalog/schema qualifier when available.
-            FunctionName name = new FunctionName(functionName);
+            FunctionName name;
+            if (isInlineFunction(functionName)) {
+                throw new IllegalArgumentException("Connector expressions cannot reference inline functions: " + functionName);
+            }
+            else if (isBuiltinFunctionName(functionName)) {
+                name = new FunctionName(functionName.getFunctionName());
+            }
+            else {
+                name = new FunctionName(Optional.of(new CatalogSchemaName(functionName.getCatalogName(), functionName.getSchemaName())), functionName.getFunctionName());
+            }
             return Optional.of(new Call(typeOf(node), name, arguments.build()));
         }
 
@@ -706,7 +728,7 @@ private Optional<ConnectorExpression> translateLike(FunctionCall node)
             Expression patternArgument = node.getArguments().get(1);
             if (isEffectivelyLiteral(plannerContext, session, patternArgument)) {
                 // the pattern argument has been constant folded, so extract the underlying pattern and escape
-                LikeMatcher matcher = (LikeMatcher) evaluateConstantExpression(
+                LikePattern matcher = (LikePattern) evaluateConstantExpression(
                         patternArgument,
                         typeOf(patternArgument),
                         plannerContext,
@@ -719,7 +741,7 @@ private Optional<ConnectorExpression> translateLike(FunctionCall node)
                     arguments.add(new Constant(Slices.utf8Slice(matcher.getEscape().get().toString()), createVarcharType(1)));
                 }
             }
-            else if (patternArgument instanceof FunctionCall call && ResolvedFunction.extractFunctionName(call.getName()).equals(LIKE_PATTERN_FUNCTION_NAME)) {
+            else if (patternArgument instanceof FunctionCall call && ResolvedFunction.extractFunctionName(call.getName()).equals(builtinFunctionName(LIKE_PATTERN_FUNCTION_NAME))) {
                 Optional<ConnectorExpression> translatedPattern = process(call.getArguments().get(0));
                 if (translatedPattern.isEmpty()) {
                     return Optional.empty();
@@ -738,7 +760,7 @@ else if (patternArgument instanceof FunctionCall call && ResolvedFunction.extrac
                 return Optional.empty();
             }
 
-            return Optional.of(new Call(typeOf(node), LIKE_FUNCTION_NAME, arguments.build()));
+            return Optional.of(new Call(typeOf(node), StandardFunctions.LIKE_FUNCTION_NAME, arguments.build()));
         }
 
         @Override
@@ -802,12 +824,12 @@ protected Optional<ConnectorExpression> visitLikePredicate(LikePredicate node, V
             Optional<ConnectorExpression> pattern = process(node.getPattern());
             if (value.isPresent() && pattern.isPresent()) {
                 if (node.getEscape().isEmpty()) {
-                    return Optional.of(new Call(typeOf(node), LIKE_FUNCTION_NAME, List.of(value.get(), pattern.get())));
+                    return Optional.of(new Call(typeOf(node), StandardFunctions.LIKE_FUNCTION_NAME, List.of(value.get(), pattern.get())));
                 }
 
                 Optional<ConnectorExpression> escape = process(node.getEscape().get());
                 if (escape.isPresent()) {
-                    return Optional.of(new Call(typeOf(node), LIKE_FUNCTION_NAME, List.of(value.get(), pattern.get(), escape.get())));
+                    return Optional.of(new Call(typeOf(node), StandardFunctions.LIKE_FUNCTION_NAME, List.of(value.get(), pattern.get(), escape.get())));
                 }
             }
             return Optional.empty();
@@ -836,7 +858,7 @@ protected Optional<ConnectorExpression> visitSubscriptExpression(SubscriptExpres
                 return Optional.empty();
             }
 
-            return Optional.of(new FieldDereference(typeOf(node), translatedBase.get(), toIntExact(((LongLiteral) node.getIndex()).getValue() - 1)));
+            return Optional.of(new FieldDereference(typeOf(node), translatedBase.get(), toIntExact(((LongLiteral) node.getIndex()).getParsedValue() - 1)));
         }
 
         @Override
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/DeterminismEvaluator.java b/core/trino-main/src/main/java/io/trino/sql/planner/DeterminismEvaluator.java
index ef00948c3acc..336ac2110b0b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/DeterminismEvaluator.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/DeterminismEvaluator.java
@@ -62,6 +62,7 @@ protected Void visitFunctionCall(FunctionCall node, AtomicBoolean deterministic)
         {
             if (!resolvedFunctionSupplier.apply(node).isDeterministic()) {
                 deterministic.set(false);
+                return null;
             }
             return super.visitFunctionCall(node, deterministic);
         }
@@ -83,7 +84,7 @@ private static class CurrentTimeVisitor
         protected Void visitCurrentTime(CurrentTime node, AtomicBoolean currentTime)
         {
             currentTime.set(true);
-            return super.visitCurrentTime(node, currentTime);
+            return null;
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/DomainCoercer.java b/core/trino-main/src/main/java/io/trino/sql/planner/DomainCoercer.java
index e1e30fc9cf08..22d67e1d2d68 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/DomainCoercer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/DomainCoercer.java
@@ -87,13 +87,13 @@ private ImplicitCoercer(
             this.coercedValueType = requireNonNull(coercedValueType, "coercedValueType is null");
             Type originalValueType = domain.getType();
             try {
-                this.saturatedFloorCastOperator = metadata.getCoercion(session, SATURATED_FLOOR_CAST, originalValueType, coercedValueType);
+                this.saturatedFloorCastOperator = metadata.getCoercion(SATURATED_FLOOR_CAST, originalValueType, coercedValueType);
             }
             catch (OperatorNotFoundException e) {
                 throw new IllegalStateException(
                         format("Saturated floor cast operator not found for coercion from %s to %s", originalValueType, coercedValueType));
             }
-            this.castToOriginalTypeOperator = metadata.getCoercion(session, coercedValueType, originalValueType);
+            this.castToOriginalTypeOperator = metadata.getCoercion(coercedValueType, originalValueType);
             // choice of placing unordered values first or last does not matter for this code
             this.comparisonOperator = typeOperators.getComparisonUnorderedLastOperator(originalValueType, InvocationConvention.simpleConvention(FAIL_ON_NULL, NEVER_NULL, NEVER_NULL));
         }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/DomainTranslator.java b/core/trino-main/src/main/java/io/trino/sql/planner/DomainTranslator.java
index 6c18d4aeee64..f9bdb00f37c1 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/DomainTranslator.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/DomainTranslator.java
@@ -22,17 +22,17 @@
 import io.airlift.slice.Slices;
 import io.trino.Session;
 import io.trino.connector.CatalogServiceProvider;
-import io.trino.likematcher.LikeMatcher;
 import io.trino.metadata.AnalyzePropertyManager;
 import io.trino.metadata.OperatorNotFoundException;
 import io.trino.metadata.ResolvedFunction;
-import io.trino.metadata.SessionPropertyManager;
 import io.trino.metadata.TableFunctionRegistry;
 import io.trino.metadata.TableProceduresPropertyManager;
 import io.trino.metadata.TableProceduresRegistry;
 import io.trino.metadata.TablePropertyManager;
 import io.trino.security.AllowAllAccessControl;
+import io.trino.spi.ErrorCode;
 import io.trino.spi.TrinoException;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.predicate.DiscreteValues;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
@@ -69,10 +69,10 @@
 import io.trino.sql.tree.SymbolReference;
 import io.trino.transaction.NoOpTransactionManager;
 import io.trino.type.LikeFunctions;
+import io.trino.type.LikePattern;
 import io.trino.type.LikePatternType;
 import io.trino.type.TypeCoercion;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.lang.invoke.MethodHandle;
 import java.time.LocalDate;
@@ -93,7 +93,9 @@
 import static io.airlift.slice.SliceUtf8.lengthOfCodePoint;
 import static io.airlift.slice.SliceUtf8.setCodePointAt;
 import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
@@ -131,7 +133,7 @@ public DomainTranslator(PlannerContext plannerContext)
         this.literalEncoder = new LiteralEncoder(plannerContext);
     }
 
-    public Expression toPredicate(Session session, TupleDomain<Symbol> tupleDomain)
+    public Expression toPredicate(TupleDomain<Symbol> tupleDomain)
     {
         if (tupleDomain.isNone()) {
             return FALSE_LITERAL;
@@ -139,11 +141,11 @@ public Expression toPredicate(Session session, TupleDomain<Symbol> tupleDomain)
 
         Map<Symbol, Domain> domains = tupleDomain.getDomains().get();
         return domains.entrySet().stream()
-                .map(entry -> toPredicate(session, entry.getValue(), entry.getKey().toSymbolReference()))
+                .map(entry -> toPredicate(entry.getValue(), entry.getKey().toSymbolReference()))
                 .collect(collectingAndThen(toImmutableList(), expressions -> combineConjuncts(plannerContext.getMetadata(), expressions)));
     }
 
-    private Expression toPredicate(Session session, Domain domain, SymbolReference reference)
+    private Expression toPredicate(Domain domain, SymbolReference reference)
     {
         if (domain.getValues().isNone()) {
             return domain.isNullAllowed() ? new IsNullPredicate(reference) : FALSE_LITERAL;
@@ -156,8 +158,8 @@ private Expression toPredicate(Session session, Domain domain, SymbolReference r
         List<Expression> disjuncts = new ArrayList<>();
 
         disjuncts.addAll(domain.getValues().getValuesProcessor().transform(
-                ranges -> extractDisjuncts(session, domain.getType(), ranges, reference),
-                discreteValues -> extractDisjuncts(session, domain.getType(), discreteValues, reference),
+                ranges -> extractDisjuncts(domain.getType(), ranges, reference),
+                discreteValues -> extractDisjuncts(domain.getType(), discreteValues, reference),
                 allOrNone -> {
                     throw new IllegalStateException("Case should not be reachable");
                 }));
@@ -170,7 +172,7 @@ private Expression toPredicate(Session session, Domain domain, SymbolReference r
         return combineDisjunctsWithDefault(plannerContext.getMetadata(), disjuncts, TRUE_LITERAL);
     }
 
-    private Expression processRange(Session session, Type type, Range range, SymbolReference reference)
+    private Expression processRange(Type type, Range range, SymbolReference reference)
     {
         if (range.isAll()) {
             return TRUE_LITERAL;
@@ -180,8 +182,8 @@ private Expression processRange(Session session, Type type, Range range, SymbolR
             // specialize the range with BETWEEN expression if possible b/c it is currently more efficient
             return new BetweenPredicate(
                     reference,
-                    literalEncoder.toExpression(session, range.getLowBoundedValue(), type),
-                    literalEncoder.toExpression(session, range.getHighBoundedValue(), type));
+                    literalEncoder.toExpression(range.getLowBoundedValue(), type),
+                    literalEncoder.toExpression(range.getHighBoundedValue(), type));
         }
 
         List<Expression> rangeConjuncts = new ArrayList<>();
@@ -189,23 +191,23 @@ private Expression processRange(Session session, Type type, Range range, SymbolR
             rangeConjuncts.add(new ComparisonExpression(
                     range.isLowInclusive() ? GREATER_THAN_OR_EQUAL : GREATER_THAN,
                     reference,
-                    literalEncoder.toExpression(session, range.getLowBoundedValue(), type)));
+                    literalEncoder.toExpression(range.getLowBoundedValue(), type)));
         }
         if (!range.isHighUnbounded()) {
             rangeConjuncts.add(new ComparisonExpression(
                     range.isHighInclusive() ? LESS_THAN_OR_EQUAL : LESS_THAN,
                     reference,
-                    literalEncoder.toExpression(session, range.getHighBoundedValue(), type)));
+                    literalEncoder.toExpression(range.getHighBoundedValue(), type)));
         }
         // If rangeConjuncts is null, then the range was ALL, which should already have been checked for
         checkState(!rangeConjuncts.isEmpty());
         return combineConjuncts(plannerContext.getMetadata(), rangeConjuncts);
     }
 
-    private Expression combineRangeWithExcludedPoints(Session session, Type type, SymbolReference reference, Range range, List<Expression> excludedPoints)
+    private Expression combineRangeWithExcludedPoints(Type type, SymbolReference reference, Range range, List<Expression> excludedPoints)
     {
         if (excludedPoints.isEmpty()) {
-            return processRange(session, type, range, reference);
+            return processRange(type, range, reference);
         }
 
         Expression excludedPointsExpression = new NotExpression(new InPredicate(reference, new InListExpression(excludedPoints)));
@@ -213,10 +215,10 @@ private Expression combineRangeWithExcludedPoints(Session session, Type type, Sy
             excludedPointsExpression = new ComparisonExpression(NOT_EQUAL, reference, getOnlyElement(excludedPoints));
         }
 
-        return combineConjuncts(plannerContext.getMetadata(), processRange(session, type, range, reference), excludedPointsExpression);
+        return combineConjuncts(plannerContext.getMetadata(), processRange(type, range, reference), excludedPointsExpression);
     }
 
-    private List<Expression> extractDisjuncts(Session session, Type type, Ranges ranges, SymbolReference reference)
+    private List<Expression> extractDisjuncts(Type type, Ranges ranges, SymbolReference reference)
     {
         List<Expression> disjuncts = new ArrayList<>();
         List<Expression> singleValues = new ArrayList<>();
@@ -242,7 +244,7 @@ private List<Expression> extractDisjuncts(Session session, Type type, Ranges ran
             boolean coalescedRangeIsAll = originalUnionSingleValues.stream().anyMatch(Range::isAll);
             if (!originalRangeIsAll && coalescedRangeIsAll) {
                 for (Range range : orderedRanges) {
-                    disjuncts.add(processRange(session, type, range, reference));
+                    disjuncts.add(processRange(type, range, reference));
                 }
                 return disjuncts;
             }
@@ -250,22 +252,22 @@ private List<Expression> extractDisjuncts(Session session, Type type, Ranges ran
 
         for (Range range : originalUnionSingleValues) {
             if (range.isSingleValue()) {
-                singleValues.add(literalEncoder.toExpression(session, range.getSingleValue(), type));
+                singleValues.add(literalEncoder.toExpression(range.getSingleValue(), type));
                 continue;
             }
 
             // attempt to optimize ranges that can be coalesced as long as single value points are excluded
             List<Expression> singleValuesInRange = new ArrayList<>();
             while (singleValueExclusions.hasNext() && range.contains(singleValueExclusions.peek())) {
-                singleValuesInRange.add(literalEncoder.toExpression(session, singleValueExclusions.next().getSingleValue(), type));
+                singleValuesInRange.add(literalEncoder.toExpression(singleValueExclusions.next().getSingleValue(), type));
             }
 
             if (!singleValuesInRange.isEmpty()) {
-                disjuncts.add(combineRangeWithExcludedPoints(session, type, reference, range, singleValuesInRange));
+                disjuncts.add(combineRangeWithExcludedPoints(type, reference, range, singleValuesInRange));
                 continue;
             }
 
-            disjuncts.add(processRange(session, type, range, reference));
+            disjuncts.add(processRange(type, range, reference));
         }
 
         // Add back all of the possible single values either as an equality or an IN predicate
@@ -278,10 +280,10 @@ else if (singleValues.size() > 1) {
         return disjuncts;
     }
 
-    private List<Expression> extractDisjuncts(Session session, Type type, DiscreteValues discreteValues, SymbolReference reference)
+    private List<Expression> extractDisjuncts(Type type, DiscreteValues discreteValues, SymbolReference reference)
     {
         List<Expression> values = discreteValues.getValues().stream()
-                .map(object -> literalEncoder.toExpression(session, object, type))
+                .map(object -> literalEncoder.toExpression(object, type))
                 .collect(toList());
 
         // If values is empty, then the equatableValues was either ALL or NONE, both of which should already have been checked for
@@ -327,7 +329,6 @@ public static ExtractionResult getExtractionResult(PlannerContext plannerContext
                         user -> ImmutableSet.of(),
                         new TableProceduresRegistry(CatalogServiceProvider.fail("procedures are not supported in domain translator")),
                         new TableFunctionRegistry(CatalogServiceProvider.fail("table functions are not supported in domain translator")),
-                        new SessionPropertyManager(),
                         new TablePropertyManager(CatalogServiceProvider.fail("table properties not supported in domain translator")),
                         new AnalyzePropertyManager(CatalogServiceProvider.fail("analyze properties not supported in domain translator")),
                         new TableProceduresPropertyManager(CatalogServiceProvider.fail("procedures are not supported in domain translator"))));
@@ -475,6 +476,15 @@ else if (matchingSingleSymbolDomains) {
             throw new AssertionError("Unknown operator: " + node.getOperator());
         }
 
+        @Override
+        protected ExtractionResult visitCast(Cast node, Boolean context)
+        {
+            if (node.getExpression() instanceof NullLiteral) {
+                return new ExtractionResult(TupleDomain.none(), TRUE_LITERAL);
+            }
+            return super.visitCast(node, context);
+        }
+
         @Override
         protected ExtractionResult visitNotExpression(NotExpression node, Boolean complement)
         {
@@ -835,8 +845,19 @@ private Optional<Expression> coerceComparisonWithRounding(
             }
             Type valueType = nullableValue.getType();
             Object value = nullableValue.getValue();
-            return floorValue(valueType, symbolExpressionType, value)
-                    .map(floorValue -> rewriteComparisonExpression(symbolExpressionType, symbolExpression, valueType, value, floorValue, comparisonOperator));
+            Optional<Object> floorValueOptional;
+            try {
+                floorValueOptional = floorValue(valueType, symbolExpressionType, value);
+            }
+            catch (TrinoException e) {
+                ErrorCode errorCode = e.getErrorCode();
+                if (INVALID_CAST_ARGUMENT.toErrorCode().equals(errorCode)) {
+                    // There's no such value at symbolExpressionType
+                    return Optional.of(FALSE_LITERAL);
+                }
+                throw e;
+            }
+            return floorValueOptional.map(floorValue -> rewriteComparisonExpression(symbolExpressionType, symbolExpression, valueType, value, floorValue, comparisonOperator));
         }
 
         private Expression rewriteComparisonExpression(
@@ -851,7 +872,7 @@ private Expression rewriteComparisonExpression(
             boolean coercedValueIsEqualToOriginal = originalComparedToCoerced == 0;
             boolean coercedValueIsLessThanOriginal = originalComparedToCoerced > 0;
             boolean coercedValueIsGreaterThanOriginal = originalComparedToCoerced < 0;
-            Expression coercedLiteral = literalEncoder.toExpression(session, coercedValue, symbolExpressionType);
+            Expression coercedLiteral = literalEncoder.toExpression(coercedValue, symbolExpressionType);
 
             return switch (comparisonOperator) {
                 case GREATER_THAN_OR_EQUAL, GREATER_THAN -> {
@@ -909,7 +930,7 @@ private Optional<Object> floorValue(Type fromType, Type toType, Object value)
         private Optional<ResolvedFunction> getSaturatedFloorCastOperator(Type fromType, Type toType)
         {
             try {
-                return Optional.of(plannerContext.getMetadata().getCoercion(session, SATURATED_FLOOR_CAST, fromType, toType));
+                return Optional.of(plannerContext.getMetadata().getCoercion(SATURATED_FLOOR_CAST, fromType, toType));
             }
             catch (OperatorNotFoundException e) {
                 return Optional.empty();
@@ -920,7 +941,7 @@ private int compareOriginalValueToCoerced(Type originalValueType, Object origina
         {
             requireNonNull(originalValueType, "originalValueType is null");
             requireNonNull(coercedValue, "coercedValue is null");
-            ResolvedFunction castToOriginalTypeOperator = plannerContext.getMetadata().getCoercion(session, coercedValueType, originalValueType);
+            ResolvedFunction castToOriginalTypeOperator = plannerContext.getMetadata().getCoercion(coercedValueType, originalValueType);
             Object coercedValueInOriginalType = functionInvoker.invoke(castToOriginalTypeOperator, session.toConnectorSession(), coercedValue);
             // choice of placing unordered values first or last does not matter for this code
             MethodHandle comparisonOperator = plannerContext.getTypeOperators().getComparisonUnorderedLastOperator(originalValueType, simpleConvention(FAIL_ON_NULL, NEVER_NULL, NEVER_NULL));
@@ -1065,7 +1086,7 @@ private Optional<ExtractionResult> tryVisitLikeFunction(FunctionCall node, Boole
                 return Optional.empty();
             }
 
-            LikeMatcher matcher = (LikeMatcher) evaluateConstantExpression(
+            LikePattern matcher = (LikePattern) evaluateConstantExpression(
                     patternArgument,
                     typeAnalyzer.getType(session, types, patternArgument),
                     plannerContext,
@@ -1106,14 +1127,14 @@ private Optional<ExtractionResult> tryVisitLikeFunction(FunctionCall node, Boole
         @Override
         protected ExtractionResult visitFunctionCall(FunctionCall node, Boolean complement)
         {
-            String name = ResolvedFunction.extractFunctionName(node.getName());
-            if (name.equals("starts_with")) {
+            CatalogSchemaFunctionName name = ResolvedFunction.extractFunctionName(node.getName());
+            if (name.equals(builtinFunctionName("starts_with"))) {
                 Optional<ExtractionResult> result = tryVisitStartsWithFunction(node, complement);
                 if (result.isPresent()) {
                     return result.get();
                 }
             }
-            else if (name.equals(LIKE_FUNCTION_NAME)) {
+            else if (name.equals(builtinFunctionName(LIKE_FUNCTION_NAME))) {
                 Optional<ExtractionResult> result = tryVisitLikeFunction(node, complement);
                 if (result.isPresent()) {
                     return result.get();
@@ -1173,7 +1194,7 @@ private Optional<Domain> createRangeDomain(Type type, Slice constantPrefix)
             }
 
             Slice lowerBound = constantPrefix;
-            Slice upperBound = Slices.copyOf(constantPrefix.slice(0, lastIncrementable + lengthOfCodePoint(constantPrefix, lastIncrementable)));
+            Slice upperBound = constantPrefix.slice(0, lastIncrementable + lengthOfCodePoint(constantPrefix, lastIncrementable)).copy();
             setCodePointAt(getCodePointAt(constantPrefix, lastIncrementable) + 1, upperBound, lastIncrementable);
 
             Domain domain = Domain.create(ValueSet.ofRanges(Range.range(type, lowerBound, true, upperBound, false)), false);
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/EffectivePredicateExtractor.java b/core/trino-main/src/main/java/io/trino/sql/planner/EffectivePredicateExtractor.java
index 93c34290d3a6..e19bf62b379b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/EffectivePredicateExtractor.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/EffectivePredicateExtractor.java
@@ -21,7 +21,7 @@
 import io.trino.Session;
 import io.trino.metadata.Metadata;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.SingleRowBlock;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
@@ -259,7 +259,7 @@ public Expression visitTableScan(TableScanNode node, Void context)
             }
 
             // TODO: replace with metadata.getTableProperties() when table layouts are fully removed
-            return domainTranslator.toPredicate(session, predicate.simplify()
+            return domainTranslator.toPredicate(predicate.simplify()
                     .filter((columnHandle, domain) -> assignments.containsKey(columnHandle))
                     .transformKeys(assignments::get));
         }
@@ -411,9 +411,12 @@ public Expression visitValues(ValuesNode node, Void context)
                     if (evaluated instanceof Expression) {
                         return TRUE_LITERAL;
                     }
+                    SqlRow sqlRow = (SqlRow) evaluated;
+                    int rawIndex = sqlRow.getRawIndex();
                     for (int i = 0; i < node.getOutputSymbols().size(); i++) {
                         Type type = types.get(node.getOutputSymbols().get(i));
-                        Object item = readNativeValue(type, (SingleRowBlock) evaluated, i);
+                        Block fieldBlock = sqlRow.getRawFieldBlock(i);
+                        Object item = readNativeValue(type, fieldBlock, rawIndex);
                         if (item == null) {
                             hasNull[i] = true;
                         }
@@ -467,17 +470,18 @@ else if (hasNaN[i]) {
             }
 
             // simplify to avoid a large expression if there are many rows in ValuesNode
-            return domainTranslator.toPredicate(session, TupleDomain.withColumnDomains(domains.buildOrThrow()).simplify());
+            return domainTranslator.toPredicate(TupleDomain.withColumnDomains(domains.buildOrThrow()).simplify());
         }
 
         private boolean hasNestedNulls(Type type, Object value)
         {
             if (type instanceof RowType rowType) {
-                Block container = (Block) value;
+                SqlRow sqlRow = (SqlRow) value;
+                int rawIndex = sqlRow.getRawIndex();
                 for (int i = 0; i < rowType.getFields().size(); i++) {
                     Type elementType = rowType.getFields().get(i).getType();
-
-                    if (container.isNull(i) || elementHasNulls(elementType, container, i)) {
+                    Block fieldBlock = sqlRow.getRawFieldBlock(i);
+                    if (fieldBlock.isNull(rawIndex) || elementHasNulls(elementType, fieldBlock, rawIndex)) {
                         return true;
                     }
                 }
@@ -498,7 +502,11 @@ else if (type instanceof ArrayType arrayType) {
 
         private boolean elementHasNulls(Type elementType, Block container, int position)
         {
-            if (elementType instanceof RowType || elementType instanceof ArrayType) {
+            if (elementType instanceof RowType rowType) {
+                SqlRow element = rowType.getObject(container, position);
+                return hasNestedNulls(elementType, element);
+            }
+            if (elementType instanceof ArrayType) {
                 Block element = (Block) elementType.getObject(container, position);
                 return hasNestedNulls(elementType, element);
             }
@@ -576,7 +584,7 @@ private Expression deriveCommonPredicates(PlanNode node, Function<Integer, Colle
 
         private Expression pullExpressionThroughSymbols(Expression expression, Collection<Symbol> symbols)
         {
-            EqualityInference equalityInference = EqualityInference.newInstance(metadata, expression);
+            EqualityInference equalityInference = new EqualityInference(metadata, expression);
 
             ImmutableList.Builder<Expression> effectiveConjuncts = ImmutableList.builder();
             Set<Symbol> scope = ImmutableSet.copyOf(symbols);
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/EqualityInference.java b/core/trino-main/src/main/java/io/trino/sql/planner/EqualityInference.java
index 39da9663a0b6..18ce357056ab 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/EqualityInference.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/EqualityInference.java
@@ -41,6 +41,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.sql.ExpressionUtils.extractConjuncts;
 import static io.trino.sql.planner.DeterminismEvaluator.isDeterministic;
 import static io.trino.sql.planner.ExpressionNodeInliner.replaceExpression;
@@ -53,25 +54,85 @@
 public class EqualityInference
 {
     // Comparator used to determine Expression preference when determining canonicals
-    private static final Comparator<Expression> CANONICAL_COMPARATOR = Comparator
-            // Current cost heuristic:
-            // 1) Prefer fewer input symbols
-            // 2) Prefer smaller expression trees
-            // 3) Sort the expressions alphabetically - creates a stable consistent ordering (extremely useful for unit testing)
-            // TODO: be more precise in determining the cost of an expression
-            .comparingInt((ToIntFunction<Expression>) (expression -> SymbolsExtractor.extractAll(expression).size()))
-            .thenComparingLong(expression -> SubExpressionExtractor.extract(expression).count())
-            .thenComparing(Expression::toString);
-
+    private final Comparator<Expression> canonicalComparator;
     private final Multimap<Expression, Expression> equalitySets; // Indexed by canonical expression
     private final Map<Expression, Expression> canonicalMap; // Map each known expression to canonical expression
     private final Set<Expression> derivedExpressions;
+    private final Map<Expression, List<Expression>> expressionCache = new HashMap<>();
+    private final Map<Expression, List<Symbol>> symbolsCache = new HashMap<>();
+    private final Map<Expression, Set<Symbol>> uniqueSymbolsCache = new HashMap<>();
+
+    public EqualityInference(Metadata metadata, Expression... expressions)
+    {
+        this(metadata, Arrays.asList(expressions));
+    }
 
-    private EqualityInference(Multimap<Expression, Expression> equalitySets, Map<Expression, Expression> canonicalMap, Set<Expression> derivedExpressions)
+    public EqualityInference(Metadata metadata, Collection<Expression> expressions)
     {
+        DisjointSet<Expression> equalities = new DisjointSet<>();
+        expressions.stream()
+                .flatMap(expression -> extractConjuncts(expression).stream())
+                .filter(expression -> isInferenceCandidate(metadata, expression))
+                .forEach(expression -> {
+                    ComparisonExpression comparison = (ComparisonExpression) expression;
+                    Expression expression1 = comparison.getLeft();
+                    Expression expression2 = comparison.getRight();
+
+                    equalities.findAndUnion(expression1, expression2);
+                });
+
+        Collection<Set<Expression>> equivalentClasses = equalities.getEquivalentClasses();
+
+        // Map every expression to the set of equivalent expressions
+        Map<Expression, Set<Expression>> byExpression = new LinkedHashMap<>();
+        for (Set<Expression> equivalence : equivalentClasses) {
+            equivalence.forEach(expression -> byExpression.put(expression, equivalence));
+        }
+
+        // For every non-derived expression, extract the sub-expressions and see if they can be rewritten as other expressions. If so,
+        // use this new information to update the known equalities.
+        Set<Expression> derivedExpressions = new LinkedHashSet<>();
+        for (Expression expression : byExpression.keySet()) {
+            if (derivedExpressions.contains(expression)) {
+                continue;
+            }
+
+            extractSubExpressions(expression)
+                    .stream()
+                    .filter(e -> !e.equals(expression))
+                    .forEach(subExpression -> byExpression.getOrDefault(subExpression, ImmutableSet.of())
+                            .stream()
+                            .filter(e -> !e.equals(subExpression))
+                            .forEach(equivalentSubExpression -> {
+                                Expression rewritten = replaceExpression(expression, ImmutableMap.of(subExpression, equivalentSubExpression));
+                                equalities.findAndUnion(expression, rewritten);
+                                derivedExpressions.add(rewritten);
+                            }));
+        }
+
+        Comparator<Expression> canonicalComparator = Comparator
+                // Current cost heuristic:
+                // 1) Prefer fewer input symbols
+                // 2) Prefer smaller expression trees
+                // 3) Sort the expressions alphabetically - creates a stable consistent ordering (extremely useful for unit testing)
+                // TODO: be more precise in determining the cost of an expression
+                .comparingInt((ToIntFunction<Expression>) (expression -> extractAllSymbols(expression).size()))
+                .thenComparingLong(expression -> extractSubExpressions(expression).size())
+                .thenComparing(Expression::toString);
+
+        Multimap<Expression, Expression> equalitySets = makeEqualitySets(equalities, canonicalComparator);
+
+        ImmutableMap.Builder<Expression, Expression> canonicalMappings = ImmutableMap.builder();
+        for (Map.Entry<Expression, Expression> entry : equalitySets.entries()) {
+            Expression canonical = entry.getKey();
+            Expression expression = entry.getValue();
+            canonicalMappings.put(expression, canonical);
+        }
+
         this.equalitySets = equalitySets;
-        this.canonicalMap = canonicalMap;
+        this.canonicalMap = canonicalMappings.buildOrThrow();
         this.derivedExpressions = derivedExpressions;
+        this.canonicalComparator = canonicalComparator;
     }
 
     /**
@@ -190,65 +251,6 @@ public static boolean isInferenceCandidate(Metadata metadata, Expression express
         return false;
     }
 
-    public static EqualityInference newInstance(Metadata metadata, Expression... expressions)
-    {
-        return newInstance(metadata, Arrays.asList(expressions));
-    }
-
-    public static EqualityInference newInstance(Metadata metadata, Collection<Expression> expressions)
-    {
-        DisjointSet<Expression> equalities = new DisjointSet<>();
-        expressions.stream()
-                .flatMap(expression -> extractConjuncts(expression).stream())
-                .filter(expression -> isInferenceCandidate(metadata, expression))
-                .forEach(expression -> {
-                    ComparisonExpression comparison = (ComparisonExpression) expression;
-                    Expression expression1 = comparison.getLeft();
-                    Expression expression2 = comparison.getRight();
-
-                    equalities.findAndUnion(expression1, expression2);
-                });
-
-        Collection<Set<Expression>> equivalentClasses = equalities.getEquivalentClasses();
-
-        // Map every expression to the set of equivalent expressions
-        Map<Expression, Set<Expression>> byExpression = new LinkedHashMap<>();
-        for (Set<Expression> equivalence : equivalentClasses) {
-            equivalence.forEach(expression -> byExpression.put(expression, equivalence));
-        }
-
-        // For every non-derived expression, extract the sub-expressions and see if they can be rewritten as other expressions. If so,
-        // use this new information to update the known equalities.
-        Set<Expression> derivedExpressions = new LinkedHashSet<>();
-        for (Expression expression : byExpression.keySet()) {
-            if (derivedExpressions.contains(expression)) {
-                continue;
-            }
-
-            SubExpressionExtractor.extract(expression)
-                    .filter(e -> !e.equals(expression))
-                    .forEach(subExpression -> byExpression.getOrDefault(subExpression, ImmutableSet.of())
-                            .stream()
-                            .filter(e -> !e.equals(subExpression))
-                            .forEach(equivalentSubExpression -> {
-                                Expression rewritten = replaceExpression(expression, ImmutableMap.of(subExpression, equivalentSubExpression));
-                                equalities.findAndUnion(expression, rewritten);
-                                derivedExpressions.add(rewritten);
-                            }));
-        }
-
-        Multimap<Expression, Expression> equalitySets = makeEqualitySets(equalities);
-
-        ImmutableMap.Builder<Expression, Expression> canonicalMappings = ImmutableMap.builder();
-        for (Map.Entry<Expression, Expression> entry : equalitySets.entries()) {
-            Expression canonical = entry.getKey();
-            Expression expression = entry.getValue();
-            canonicalMappings.put(expression, canonical);
-        }
-
-        return new EqualityInference(equalitySets, canonicalMappings.buildOrThrow(), derivedExpressions);
-    }
-
     /**
      * Provides a convenience Stream of Expression conjuncts which have not been added to the inference
      */
@@ -261,7 +263,8 @@ public static Stream<Expression> nonInferrableConjuncts(Metadata metadata, Expre
     private Expression rewrite(Expression expression, Predicate<Symbol> symbolScope, boolean allowFullReplacement)
     {
         Map<Expression, Expression> expressionRemap = new HashMap<>();
-        SubExpressionExtractor.extract(expression)
+        extractSubExpressions(expression)
+                .stream()
                 .filter(allowFullReplacement
                         ? subExpression -> true
                         : subExpression -> !subExpression.equals(expression))
@@ -286,9 +289,9 @@ private Expression rewrite(Expression expression, Predicate<Symbol> symbolScope,
     /**
      * Returns the most preferrable expression to be used as the canonical expression
      */
-    private static Expression getCanonical(Stream<Expression> expressions)
+    private Expression getCanonical(Stream<Expression> expressions)
     {
-        return expressions.min(CANONICAL_COMPARATOR).orElse(null);
+        return expressions.min(canonicalComparator).orElse(null);
     }
 
     /**
@@ -320,22 +323,37 @@ Expression getScopedCanonical(Expression expression, Predicate<Symbol> symbolSco
                         .filter(e -> isScoped(e, symbolScope)));
     }
 
-    private static boolean isScoped(Expression expression, Predicate<Symbol> symbolScope)
+    private boolean isScoped(Expression expression, Predicate<Symbol> symbolScope)
     {
-        return SymbolsExtractor.extractUnique(expression).stream().allMatch(symbolScope);
+        return extractUniqueSymbols(expression).stream().allMatch(symbolScope);
     }
 
-    private static Multimap<Expression, Expression> makeEqualitySets(DisjointSet<Expression> equalities)
+    private static Multimap<Expression, Expression> makeEqualitySets(DisjointSet<Expression> equalities, Comparator<Expression> canonicalComparator)
     {
         ImmutableSetMultimap.Builder<Expression, Expression> builder = ImmutableSetMultimap.builder();
         for (Set<Expression> equalityGroup : equalities.getEquivalentClasses()) {
             if (!equalityGroup.isEmpty()) {
-                builder.putAll(equalityGroup.stream().min(CANONICAL_COMPARATOR).get(), equalityGroup);
+                builder.putAll(equalityGroup.stream().min(canonicalComparator).get(), equalityGroup);
             }
         }
         return builder.build();
     }
 
+    private List<Expression> extractSubExpressions(Expression expression)
+    {
+        return expressionCache.computeIfAbsent(expression, e -> SubExpressionExtractor.extract(e).collect(toImmutableList()));
+    }
+
+    private Set<Symbol> extractUniqueSymbols(Expression expression)
+    {
+        return uniqueSymbolsCache.computeIfAbsent(expression, e -> ImmutableSet.copyOf(extractAllSymbols(expression)));
+    }
+
+    private List<Symbol> extractAllSymbols(Expression expression)
+    {
+        return symbolsCache.computeIfAbsent(expression, SymbolsExtractor::extractAll);
+    }
+
     public static class EqualityPartition
     {
         private final List<Expression> scopeEqualities;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/ExpressionInterpreter.java b/core/trino-main/src/main/java/io/trino/sql/planner/ExpressionInterpreter.java
index f1e930368788..9ef8e33ce66a 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/ExpressionInterpreter.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/ExpressionInterpreter.java
@@ -21,7 +21,6 @@
 import io.airlift.slice.Slices;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
-import io.trino.likematcher.LikeMatcher;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.operator.scalar.ArrayConstructor;
@@ -31,9 +30,9 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.RowBlockBuilder;
-import io.trino.spi.block.SingleRowBlock;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.function.FunctionNullability;
 import io.trino.spi.function.InvocationConvention;
 import io.trino.spi.function.OperatorType;
@@ -49,7 +48,10 @@
 import io.trino.spi.type.VarcharType;
 import io.trino.sql.InterpretedFunctionInvoker;
 import io.trino.sql.PlannerContext;
+import io.trino.sql.analyzer.Analysis;
+import io.trino.sql.analyzer.CorrelationSupport;
 import io.trino.sql.analyzer.ExpressionAnalyzer;
+import io.trino.sql.analyzer.QueryType;
 import io.trino.sql.analyzer.Scope;
 import io.trino.sql.analyzer.TypeSignatureProvider;
 import io.trino.sql.tree.ArithmeticBinaryExpression;
@@ -93,7 +95,6 @@
 import io.trino.sql.tree.NullIfExpression;
 import io.trino.sql.tree.NullLiteral;
 import io.trino.sql.tree.Parameter;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.QuantifiedComparisonExpression;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.SearchedCaseExpression;
@@ -105,6 +106,7 @@
 import io.trino.sql.tree.WhenClause;
 import io.trino.type.FunctionType;
 import io.trino.type.LikeFunctions;
+import io.trino.type.LikePattern;
 import io.trino.type.TypeCoercion;
 import io.trino.util.FastutilSetHelper;
 
@@ -130,9 +132,12 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.airlift.slice.SliceUtf8.countCodePoints;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
+import static io.trino.spi.StandardErrorCode.EXPRESSION_NOT_CONSTANT;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.TYPE_MISMATCH;
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
@@ -156,12 +161,13 @@
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toTypeSignature;
 import static io.trino.sql.gen.VarArgsToMapAdapterGenerator.generateVarArgsToMapAdapter;
 import static io.trino.sql.planner.DeterminismEvaluator.isDeterministic;
-import static io.trino.sql.planner.FunctionCallBuilder.resolve;
+import static io.trino.sql.planner.QueryPlanner.coerceIfNecessary;
 import static io.trino.sql.planner.ResolvedFunctionCallRewriter.rewriteResolvedFunctions;
 import static io.trino.sql.planner.iterative.rule.CanonicalizeExpressionRewriter.canonicalizeExpression;
 import static io.trino.sql.tree.ArithmeticUnaryExpression.Sign.MINUS;
 import static io.trino.sql.tree.DereferenceExpression.isQualifiedAllFieldsReference;
 import static io.trino.type.LikeFunctions.isLikePattern;
+import static io.trino.type.LikeFunctions.isMatchAllPattern;
 import static io.trino.type.LikeFunctions.unescapeLiteralLikePattern;
 import static io.trino.util.Failures.checkCondition;
 import static java.lang.Math.toIntExact;
@@ -171,6 +177,8 @@
 
 public class ExpressionInterpreter
 {
+    private static final CatalogSchemaFunctionName FAIL_NAME = builtinFunctionName("fail");
+
     private final Expression expression;
     private final PlannerContext plannerContext;
     private final Metadata metadata;
@@ -183,7 +191,7 @@ public class ExpressionInterpreter
     private final TypeCoercion typeCoercion;
 
     // identity-based cache for LIKE expressions with constant pattern and escape char
-    private final IdentityHashMap<LikePredicate, LikeMatcher> likePatternCache = new IdentityHashMap<>();
+    private final IdentityHashMap<LikePredicate, LikePattern> likePatternCache = new IdentityHashMap<>();
     private final IdentityHashMap<InListExpression, Set<?>> inListCache = new IdentityHashMap<>();
 
     public ExpressionInterpreter(Expression expression, PlannerContext plannerContext, Session session, Map<NodeRef<Expression>, Type> expressionTypes)
@@ -209,8 +217,28 @@ public static Object evaluateConstantExpression(
             AccessControl accessControl,
             Map<NodeRef<Parameter>, Expression> parameters)
     {
+        Analysis analysis = new Analysis(null, ImmutableMap.of(), QueryType.OTHERS);
+        Scope scope = Scope.create();
+        ExpressionAnalyzer.analyzeExpressionWithoutSubqueries(
+                session,
+                plannerContext,
+                accessControl,
+                scope,
+                analysis,
+                expression,
+                EXPRESSION_NOT_CONSTANT,
+                "Constant expression cannot contain a subquery",
+                WarningCollector.NOOP,
+                CorrelationSupport.DISALLOWED);
+
+        // Apply casts, desugar expression, and preform other rewrites
+        TranslationMap translationMap = new TranslationMap(Optional.empty(), scope, analysis, ImmutableMap.of(), ImmutableList.of(), session, plannerContext);
+        expression = coerceIfNecessary(analysis, expression, translationMap.rewrite(expression));
+
+        // The expression tree has been rewritten which breaks all the identity maps, so redo the analysis
+        // to re-analyze coercions that might be necessary
         ExpressionAnalyzer analyzer = createConstantAnalyzer(plannerContext, accessControl, session, parameters, WarningCollector.NOOP);
-        analyzer.analyze(expression, Scope.create());
+        analyzer.analyze(expression, scope);
 
         Type actualType = analyzer.getExpressionTypes().get(NodeRef.of(expression));
         if (!new TypeCoercion(plannerContext.getTypeManager()::getType).canCoerce(actualType, expectedType)) {
@@ -357,7 +385,7 @@ protected Object visitDereferenceExpression(DereferenceExpression node, Object c
             }
 
             RowType rowType = (RowType) type;
-            Block row = (Block) base;
+            SqlRow row = (SqlRow) base;
             Type returnType = type(node);
             String fieldName = fieldIdentifier.getValue();
             List<Field> fields = rowType.getFields();
@@ -371,7 +399,7 @@ protected Object visitDereferenceExpression(DereferenceExpression node, Object c
             }
 
             checkState(index >= 0, "could not find field name: %s", fieldName);
-            return readNativeValue(returnType, row, index);
+            return readNativeValue(returnType, row.getRawFieldBlock(index), row.getRawIndex());
         }
 
         @Override
@@ -627,8 +655,8 @@ protected Object visitInPredicate(InPredicate node, Object context)
                         set = FastutilSetHelper.toFastutilHashSet(
                                 objectSet,
                                 type,
-                                plannerContext.getFunctionManager().getScalarFunctionImplementation(metadata.resolveOperator(session, HASH_CODE, ImmutableList.of(type)), simpleConvention(FAIL_ON_NULL, NEVER_NULL)).getMethodHandle(),
-                                plannerContext.getFunctionManager().getScalarFunctionImplementation(metadata.resolveOperator(session, EQUAL, ImmutableList.of(type, type)), simpleConvention(NULLABLE_RETURN, NEVER_NULL, NEVER_NULL)).getMethodHandle());
+                                plannerContext.getFunctionManager().getScalarFunctionImplementation(metadata.resolveOperator(HASH_CODE, ImmutableList.of(type)), simpleConvention(FAIL_ON_NULL, NEVER_NULL)).getMethodHandle(),
+                                plannerContext.getFunctionManager().getScalarFunctionImplementation(metadata.resolveOperator(EQUAL, ImmutableList.of(type, type)), simpleConvention(NULLABLE_RETURN, NEVER_NULL, NEVER_NULL)).getMethodHandle());
                     }
                     inListCache.put(valueList, set);
                 }
@@ -644,7 +672,7 @@ protected Object visitInPredicate(InPredicate node, Object context)
             List<Object> values = new ArrayList<>(valueList.getValues().size());
             List<Type> types = new ArrayList<>(valueList.getValues().size());
 
-            ResolvedFunction equalsOperator = metadata.resolveOperator(session, OperatorType.EQUAL, types(node.getValue(), valueList));
+            ResolvedFunction equalsOperator = metadata.resolveOperator(OperatorType.EQUAL, types(node.getValue(), valueList));
             for (Expression expression : valueList.getValues()) {
                 if (value instanceof Expression && expression instanceof Literal) {
                     // skip interpreting of literal IN term since it cannot be compared
@@ -749,7 +777,7 @@ protected Object visitArithmeticUnary(ArithmeticUnaryExpression node, Object con
             return switch (node.getSign()) {
                 case PLUS -> value;
                 case MINUS -> {
-                    ResolvedFunction resolvedOperator = metadata.resolveOperator(session, OperatorType.NEGATION, types(node.getValue()));
+                    ResolvedFunction resolvedOperator = metadata.resolveOperator(OperatorType.NEGATION, types(node.getValue()));
                     InvocationConvention invocationConvention = new InvocationConvention(ImmutableList.of(NEVER_NULL), FAIL_ON_NULL, true, false);
                     MethodHandle handle = plannerContext.getFunctionManager().getScalarFunctionImplementation(resolvedOperator, invocationConvention).getMethodHandle();
 
@@ -930,8 +958,8 @@ protected Object visitNullIfExpression(NullIfExpression node, Object context)
 
             Type commonType = typeCoercion.getCommonSuperType(firstType, secondType).get();
 
-            ResolvedFunction firstCast = metadata.getCoercion(session, firstType, commonType);
-            ResolvedFunction secondCast = metadata.getCoercion(session, secondType, commonType);
+            ResolvedFunction firstCast = metadata.getCoercion(firstType, commonType);
+            ResolvedFunction secondCast = metadata.getCoercion(secondType, commonType);
 
             // cast(first as <common type>) == cast(second as <common type>)
             boolean equal = Boolean.TRUE.equals(invokeOperator(
@@ -1043,17 +1071,16 @@ protected Object visitFunctionCall(FunctionCall node, Object context)
             }
 
             // do not optimize non-deterministic functions
-            if (optimize && (!metadata.getFunctionMetadata(session, resolvedFunction).isDeterministic() ||
+            if (optimize && (!resolvedFunction.isDeterministic() ||
                     hasUnresolvedValue(argumentValues) ||
                     isDynamicFilter(node) ||
-                    resolvedFunction.getSignature().getName().equals("fail"))) {
+                    resolvedFunction.getSignature().getName().equals(FAIL_NAME))) {
                 verify(!node.isDistinct(), "distinct not supported");
                 verify(node.getOrderBy().isEmpty(), "order by not supported");
                 verify(node.getFilter().isEmpty(), "filter not supported");
-                return FunctionCallBuilder.resolve(session, metadata)
-                        .setName(node.getName())
+                return ResolvedFunctionCallBuilder.builder(resolvedFunction)
                         .setWindow(node.getWindow())
-                        .setArguments(argumentTypes, toExpressions(argumentValues, argumentTypes))
+                        .setArguments(toExpressions(argumentValues, argumentTypes))
                         .build();
             }
             return functionInvoker.invoke(resolvedFunction, connectorSession, argumentValues);
@@ -1065,7 +1092,18 @@ protected Object visitLambdaExpression(LambdaExpression node, Object context)
             if (optimize) {
                 // TODO: enable optimization related to lambda expression
                 // A mechanism to convert function type back into lambda expression need to exist to enable optimization
-                return node;
+                Object value = processWithExceptionHandling(node.getBody(), context);
+                Expression optimizedBody;
+
+                // value may be null, converted to an expression by toExpression(value, type)
+                if (value instanceof Expression) {
+                    optimizedBody = (Expression) value;
+                }
+                else {
+                    Type type = type(node.getBody());
+                    optimizedBody = toExpression(value, type);
+                }
+                return new LambdaExpression(node.getArguments(), optimizedBody);
             }
 
             Expression body = node.getBody();
@@ -1142,45 +1180,54 @@ protected Object visitLikePredicate(LikePredicate node, Object context)
             if (value instanceof Slice &&
                     pattern instanceof Slice &&
                     (escape == null || escape instanceof Slice)) {
-                LikeMatcher matcher;
+                LikePattern likePattern;
                 if (escape == null) {
-                    matcher = LikeMatcher.compile(((Slice) pattern).toStringUtf8(), Optional.empty());
+                    likePattern = LikePattern.compile(((Slice) pattern).toStringUtf8(), Optional.empty());
                 }
                 else {
-                    matcher = LikeFunctions.likePattern((Slice) pattern, (Slice) escape);
+                    likePattern = LikeFunctions.likePattern((Slice) pattern, (Slice) escape);
                 }
 
-                return evaluateLikePredicate(node, (Slice) value, matcher);
+                return evaluateLikePredicate(node, (Slice) value, likePattern);
             }
 
-            // if pattern is a constant without % or _ replace with a comparison
-            if (pattern instanceof Slice && (escape == null || escape instanceof Slice) && !isLikePattern((Slice) pattern, Optional.ofNullable((Slice) escape))) {
+            if (pattern instanceof Slice && (escape == null || escape instanceof Slice)) {
                 Type valueType = type(node.getValue());
-                Slice unescapedPattern = unescapeLiteralLikePattern((Slice) pattern, Optional.ofNullable((Slice) escape));
-                VarcharType patternType = createVarcharType(countCodePoints(unescapedPattern));
-
-                Expression valueExpression;
-                Expression patternExpression;
-                if (valueType instanceof CharType) {
-                    if (((CharType) valueType).getLength() != patternType.getBoundedLength()) {
-                        return false;
+                // if pattern is a constant without % or _ replace with a comparison
+                if (!isLikePattern((Slice) pattern, Optional.ofNullable((Slice) escape))) {
+                    Slice unescapedPattern = unescapeLiteralLikePattern((Slice) pattern, Optional.ofNullable((Slice) escape));
+                    VarcharType patternType = createVarcharType(countCodePoints(unescapedPattern));
+
+                    Expression valueExpression;
+                    Expression patternExpression;
+                    if (valueType instanceof CharType) {
+                        if (((CharType) valueType).getLength() != patternType.getBoundedLength()) {
+                            return false;
+                        }
+                        valueExpression = toExpression(value, valueType);
+                        patternExpression = toExpression(trimTrailingSpaces(unescapedPattern), valueType);
                     }
-                    valueExpression = toExpression(value, valueType);
-                    patternExpression = toExpression(trimTrailingSpaces(unescapedPattern), valueType);
-                }
-                else if (valueType instanceof VarcharType) {
-                    Type superType = typeCoercion.getCommonSuperType(valueType, patternType)
-                            .orElseThrow(() -> new IllegalArgumentException("Missing super type when optimizing " + node));
-                    valueExpression = toExpression(value, valueType);
-                    if (!valueType.equals(superType)) {
-                        valueExpression = new Cast(valueExpression, toSqlType(superType), false, typeCoercion.isTypeOnlyCoercion(valueType, superType));
+                    else if (valueType instanceof VarcharType) {
+                        Type superType = typeCoercion.getCommonSuperType(valueType, patternType)
+                                .orElseThrow(() -> new IllegalArgumentException("Missing super type when optimizing " + node));
+                        valueExpression = toExpression(value, valueType);
+                        if (!valueType.equals(superType)) {
+                            valueExpression = new Cast(valueExpression, toSqlType(superType), false, typeCoercion.isTypeOnlyCoercion(valueType, superType));
+                        }
+                        patternExpression = toExpression(unescapedPattern, superType);
+                    }
+                    else {
+                        throw new IllegalStateException("Unsupported valueType for LIKE: " + valueType);
                     }
-                    patternExpression = toExpression(unescapedPattern, superType);
+                    return new ComparisonExpression(ComparisonExpression.Operator.EQUAL, valueExpression, patternExpression);
                 }
-                else {
-                    throw new IllegalStateException("Unsupported valueType for LIKE: " + valueType);
+                else if (isMatchAllPattern((Slice) pattern)) {
+                    if (!(valueType instanceof CharType) && !(valueType instanceof VarcharType)) {
+                        throw new IllegalStateException("Unsupported valueType for LIKE: " + valueType);
+                    }
+                    // if pattern matches all
+                    return new IsNotNullPredicate(toExpression(value, valueType));
                 }
-                return new ComparisonExpression(ComparisonExpression.Operator.EQUAL, valueExpression, patternExpression);
             }
 
             Optional<Expression> optimizedEscape = Optional.empty();
@@ -1194,20 +1241,20 @@ else if (valueType instanceof VarcharType) {
                     optimizedEscape);
         }
 
-        private boolean evaluateLikePredicate(LikePredicate node, Slice value, LikeMatcher matcher)
+        private boolean evaluateLikePredicate(LikePredicate node, Slice value, LikePattern pattern)
         {
             if (type(node.getValue()) instanceof VarcharType) {
-                return LikeFunctions.likeVarchar(value, matcher);
+                return LikeFunctions.likeVarchar(value, pattern);
             }
 
             Type type = type(node.getValue());
             checkState(type instanceof CharType, "LIKE value is neither VARCHAR or CHAR");
-            return LikeFunctions.likeChar((long) ((CharType) type).getLength(), value, matcher);
+            return LikeFunctions.likeChar((long) ((CharType) type).getLength(), value, pattern);
         }
 
-        private LikeMatcher getConstantPattern(LikePredicate node)
+        private LikePattern getConstantPattern(LikePredicate node)
         {
-            LikeMatcher result = likePatternCache.get(node);
+            LikePattern result = likePatternCache.get(node);
 
             if (result == null) {
                 StringLiteral pattern = (StringLiteral) node.getPattern();
@@ -1217,7 +1264,7 @@ private LikeMatcher getConstantPattern(LikePredicate node)
                     result = LikeFunctions.likePattern(Slices.utf8Slice(pattern.getValue()), escape);
                 }
                 else {
-                    result = LikeMatcher.compile(pattern.getValue(), Optional.empty());
+                    result = LikePattern.compile(pattern.getValue(), Optional.empty());
                 }
 
                 likePatternCache.put(node, result);
@@ -1248,7 +1295,7 @@ public Object visitCast(Cast node, Object context)
                 return null;
             }
 
-            ResolvedFunction operator = metadata.getCoercion(session, sourceType, targetType);
+            ResolvedFunction operator = metadata.getCoercion(sourceType, targetType);
 
             try {
                 return functionInvoker.invoke(operator, connectorSession, ImmutableList.of(value));
@@ -1272,8 +1319,8 @@ protected Object visitArray(Array node, Object context)
                 if (value instanceof Expression) {
                     checkCondition(node.getValues().size() <= 254, NOT_SUPPORTED, "Too many arguments for array constructor");
                     return visitFunctionCall(
-                            FunctionCallBuilder.resolve(session, metadata)
-                                    .setName(QualifiedName.of(ArrayConstructor.NAME))
+                            BuiltinFunctionCallBuilder.resolve(metadata)
+                                    .setName(ArrayConstructor.NAME)
                                     .setArguments(types(node.getValues()), node.getValues())
                                     .build(),
                             context);
@@ -1287,8 +1334,8 @@ protected Object visitArray(Array node, Object context)
         @Override
         protected Object visitCurrentCatalog(CurrentCatalog node, Object context)
         {
-            FunctionCall function = resolve(session, metadata)
-                    .setName(QualifiedName.of("$current_catalog"))
+            FunctionCall function = BuiltinFunctionCallBuilder.resolve(metadata)
+                    .setName("$current_catalog")
                     .build();
 
             return visitFunctionCall(function, context);
@@ -1297,8 +1344,8 @@ protected Object visitCurrentCatalog(CurrentCatalog node, Object context)
         @Override
         protected Object visitCurrentSchema(CurrentSchema node, Object context)
         {
-            FunctionCall function = resolve(session, metadata)
-                    .setName(QualifiedName.of("$current_schema"))
+            FunctionCall function = BuiltinFunctionCallBuilder.resolve(metadata)
+                    .setName("$current_schema")
                     .build();
 
             return visitFunctionCall(function, context);
@@ -1307,8 +1354,8 @@ protected Object visitCurrentSchema(CurrentSchema node, Object context)
         @Override
         protected Object visitCurrentUser(CurrentUser node, Object context)
         {
-            FunctionCall function = resolve(session, metadata)
-                    .setName(QualifiedName.of("$current_user"))
+            FunctionCall function = BuiltinFunctionCallBuilder.resolve(metadata)
+                    .setName("$current_user")
                     .build();
 
             return visitFunctionCall(function, context);
@@ -1317,8 +1364,8 @@ protected Object visitCurrentUser(CurrentUser node, Object context)
         @Override
         protected Object visitCurrentPath(CurrentPath node, Object context)
         {
-            FunctionCall function = resolve(session, metadata)
-                    .setName(QualifiedName.of("$current_path"))
+            FunctionCall function = BuiltinFunctionCallBuilder.resolve(metadata)
+                    .setName("$current_path")
                     .build();
 
             return visitFunctionCall(function, context);
@@ -1349,9 +1396,9 @@ protected Object visitAtTimeZone(AtTimeZone node, Object context)
                 TimeWithTimeZoneType timeWithTimeZoneType = createTimeWithTimeZoneType(type.getPrecision());
 
                 ResolvedFunction function = plannerContext.getMetadata()
-                        .resolveFunction(session, QualifiedName.of("$at_timezone"), TypeSignatureProvider.fromTypes(timeWithTimeZoneType, timeZoneType));
+                        .resolveBuiltinFunction("$at_timezone", TypeSignatureProvider.fromTypes(timeWithTimeZoneType, timeZoneType));
 
-                ResolvedFunction cast = metadata.getCoercion(session, valueType, timeWithTimeZoneType);
+                ResolvedFunction cast = metadata.getCoercion(valueType, timeWithTimeZoneType);
                 return functionInvoker.invoke(function, connectorSession, ImmutableList.of(
                         functionInvoker.invoke(cast, connectorSession, ImmutableList.of(value)),
                         timeZone));
@@ -1359,7 +1406,7 @@ protected Object visitAtTimeZone(AtTimeZone node, Object context)
 
             if (valueType instanceof TimeWithTimeZoneType) {
                 ResolvedFunction function = plannerContext.getMetadata()
-                        .resolveFunction(session, QualifiedName.of("$at_timezone"), TypeSignatureProvider.fromTypes(valueType, timeZoneType));
+                        .resolveBuiltinFunction("$at_timezone", TypeSignatureProvider.fromTypes(valueType, timeZoneType));
 
                 return functionInvoker.invoke(function, connectorSession, ImmutableList.of(value, timeZone));
             }
@@ -1369,9 +1416,9 @@ protected Object visitAtTimeZone(AtTimeZone node, Object context)
                 TimestampWithTimeZoneType timestampWithTimeZoneType = createTimestampWithTimeZoneType(type.getPrecision());
 
                 ResolvedFunction function = plannerContext.getMetadata()
-                        .resolveFunction(session, QualifiedName.of("at_timezone"), TypeSignatureProvider.fromTypes(timestampWithTimeZoneType, timeZoneType));
+                        .resolveBuiltinFunction("at_timezone", TypeSignatureProvider.fromTypes(timestampWithTimeZoneType, timeZoneType));
 
-                ResolvedFunction cast = metadata.getCoercion(session, valueType, timestampWithTimeZoneType);
+                ResolvedFunction cast = metadata.getCoercion(valueType, timestampWithTimeZoneType);
                 return functionInvoker.invoke(function, connectorSession, ImmutableList.of(
                         functionInvoker.invoke(cast, connectorSession, ImmutableList.of(value)),
                         timeZone));
@@ -1379,7 +1426,7 @@ protected Object visitAtTimeZone(AtTimeZone node, Object context)
 
             if (valueType instanceof TimestampWithTimeZoneType) {
                 ResolvedFunction function = plannerContext.getMetadata()
-                        .resolveFunction(session, QualifiedName.of("at_timezone"), TypeSignatureProvider.fromTypes(valueType, timeZoneType));
+                        .resolveBuiltinFunction("at_timezone", TypeSignatureProvider.fromTypes(valueType, timeZoneType));
 
                 return functionInvoker.invoke(function, connectorSession, ImmutableList.of(value, timeZone));
             }
@@ -1393,27 +1440,27 @@ protected Object visitCurrentTime(CurrentTime node, Object context)
             return switch (node.getFunction()) {
                 case DATE -> functionInvoker.invoke(
                         plannerContext.getMetadata()
-                                .resolveFunction(session, QualifiedName.of("current_date"), ImmutableList.of()),
+                                .resolveBuiltinFunction("current_date", ImmutableList.of()),
                         connectorSession,
                         ImmutableList.of());
                 case TIME -> functionInvoker.invoke(
                         plannerContext.getMetadata()
-                                .resolveFunction(session, QualifiedName.of("$current_time"), TypeSignatureProvider.fromTypes(type(node))),
+                                .resolveBuiltinFunction("$current_time", TypeSignatureProvider.fromTypes(type(node))),
                         connectorSession,
                         singletonList(null));
                 case LOCALTIME -> functionInvoker.invoke(
                         plannerContext.getMetadata()
-                                .resolveFunction(session, QualifiedName.of("$localtime"), TypeSignatureProvider.fromTypes(type(node))),
+                                .resolveBuiltinFunction("$localtime", TypeSignatureProvider.fromTypes(type(node))),
                         connectorSession,
                         singletonList(null));
                 case TIMESTAMP -> functionInvoker.invoke(
                         plannerContext.getMetadata()
-                                .resolveFunction(session, QualifiedName.of("$current_timestamp"), TypeSignatureProvider.fromTypes(type(node))),
+                                .resolveBuiltinFunction("$current_timestamp", TypeSignatureProvider.fromTypes(type(node))),
                         connectorSession,
                         singletonList(null));
                 case LOCALTIMESTAMP -> functionInvoker.invoke(
                         plannerContext.getMetadata()
-                                .resolveFunction(session, QualifiedName.of("$localtimestamp"), TypeSignatureProvider.fromTypes(type(node))),
+                                .resolveBuiltinFunction("$localtimestamp", TypeSignatureProvider.fromTypes(type(node))),
                         connectorSession,
                         singletonList(null));
             };
@@ -1434,13 +1481,11 @@ protected Object visitRow(Row node, Object context)
             if (hasUnresolvedValue(values)) {
                 return new Row(toExpressions(values, parameterTypes));
             }
-            BlockBuilder blockBuilder = new RowBlockBuilder(parameterTypes, null, 1);
-            BlockBuilder singleRowBlockWriter = blockBuilder.beginBlockEntry();
-            for (int i = 0; i < cardinality; ++i) {
-                writeNativeValue(parameterTypes.get(i), singleRowBlockWriter, values.get(i));
-            }
-            blockBuilder.closeEntry();
-            return rowType.getObject(blockBuilder, 0);
+            return buildRowValue(rowType, fields -> {
+                for (int i = 0; i < cardinality; ++i) {
+                    writeNativeValue(parameterTypes.get(i), fields.get(i), values.get(i));
+                }
+            });
         }
 
         @Override
@@ -1470,20 +1515,18 @@ protected Object visitFormat(Format node, Object context)
 
             RowType rowType = anonymous(argumentTypes);
             ResolvedFunction function = plannerContext.getMetadata()
-                    .resolveFunction(session, QualifiedName.of(FormatFunction.NAME), TypeSignatureProvider.fromTypes(VARCHAR, rowType));
+                    .resolveBuiltinFunction(FormatFunction.NAME, TypeSignatureProvider.fromTypes(VARCHAR, rowType));
 
             // Construct a row with arguments [1..n] and invoke the underlying function
-            BlockBuilder rowBuilder = new RowBlockBuilder(argumentTypes, null, 1);
-            BlockBuilder singleRowBlockWriter = rowBuilder.beginBlockEntry();
-            for (int i = 0; i < arguments.size(); ++i) {
-                writeNativeValue(argumentTypes.get(i), singleRowBlockWriter, processedArguments.get(i));
-            }
-            rowBuilder.closeEntry();
-
+            SqlRow row = buildRowValue(rowType, fields -> {
+                for (int i = 0; i < arguments.size(); ++i) {
+                    writeNativeValue(argumentTypes.get(i), fields.get(i), processedArguments.get(i));
+                }
+            });
             return functionInvoker.invoke(
                     function,
                     connectorSession,
-                    ImmutableList.of(format, rowType.getObject(rowBuilder, 0)));
+                    ImmutableList.of(format, row));
         }
 
         @Override
@@ -1506,13 +1549,13 @@ protected Object visitSubscriptExpression(SubscriptExpression node, Object conte
             }
 
             // Subscript on Row hasn't got a dedicated operator. It is interpreted by hand.
-            if (base instanceof SingleRowBlock row) {
-                int position = toIntExact((long) index - 1);
-                if (position < 0 || position >= row.getPositionCount()) {
-                    throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "ROW index out of bounds: " + (position + 1));
+            if (base instanceof SqlRow row) {
+                int fieldIndex = toIntExact((long) index - 1);
+                if (fieldIndex < 0 || fieldIndex >= row.getFieldCount()) {
+                    throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "ROW index out of bounds: " + (fieldIndex + 1));
                 }
-                Type returnType = type(node.getBase()).getTypeParameters().get(position);
-                return readNativeValue(returnType, row, position);
+                Type returnType = type(node.getBase()).getTypeParameters().get(fieldIndex);
+                return readNativeValue(returnType, row.getRawFieldBlock(fieldIndex), row.getRawIndex());
             }
 
             // Subscript on Array or Map is interpreted using operator.
@@ -1549,7 +1592,7 @@ protected Object visitExtract(Extract node, Object context)
 
             return functionInvoker.invoke(
                     plannerContext.getMetadata()
-                            .resolveFunction(session, QualifiedName.of(name), TypeSignatureProvider.fromTypes(type(node.getExpression()))),
+                            .resolveBuiltinFunction(name, TypeSignatureProvider.fromTypes(type(node.getExpression()))),
                     connectorSession,
                     ImmutableList.of(value));
         }
@@ -1603,18 +1646,18 @@ private boolean hasUnresolvedValue(List<Object> values)
 
         private Object invokeOperator(OperatorType operatorType, List<? extends Type> argumentTypes, List<Object> argumentValues)
         {
-            ResolvedFunction operator = metadata.resolveOperator(session, operatorType, argumentTypes);
+            ResolvedFunction operator = metadata.resolveOperator(operatorType, argumentTypes);
             return functionInvoker.invoke(operator, connectorSession, argumentValues);
         }
 
         private Expression toExpression(Object base, Type type)
         {
-            return literalEncoder.toExpression(session, base, type);
+            return literalEncoder.toExpression(base, type);
         }
 
         private List<Expression> toExpressions(List<Object> values, List<Type> types)
         {
-            return literalEncoder.toExpressions(session, values, types);
+            return literalEncoder.toExpressions(values, types);
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/FragmentTableScanCounter.java b/core/trino-main/src/main/java/io/trino/sql/planner/FragmentTableScanCounter.java
deleted file mode 100644
index 100ed982ebe2..000000000000
--- a/core/trino-main/src/main/java/io/trino/sql/planner/FragmentTableScanCounter.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed 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 io.trino.sql.planner;
-
-import io.trino.sql.planner.plan.ExchangeNode;
-import io.trino.sql.planner.plan.PlanNode;
-import io.trino.sql.planner.plan.PlanVisitor;
-import io.trino.sql.planner.plan.TableScanNode;
-
-import java.util.List;
-
-/**
- * Visitor to count number of tables scanned in the current fragment
- * (fragments separated by ExchangeNodes).
- * <p>
- * TODO: remove this class after we make colocated_join always true
- */
-public final class FragmentTableScanCounter
-{
-    private FragmentTableScanCounter() {}
-
-    public static int countSources(List<PlanNode> nodes)
-    {
-        int count = 0;
-        for (PlanNode node : nodes) {
-            count += node.accept(new Visitor(), null);
-        }
-        return count;
-    }
-
-    public static boolean hasMultipleSources(PlanNode... nodes)
-    {
-        int count = 0;
-        for (PlanNode node : nodes) {
-            count += node.accept(new Visitor(), null);
-        }
-        return count > 1;
-    }
-
-    private static class Visitor
-            extends PlanVisitor<Integer, Void>
-    {
-        @Override
-        public Integer visitTableScan(TableScanNode node, Void context)
-        {
-            return 1;
-        }
-
-        @Override
-        public Integer visitExchange(ExchangeNode node, Void context)
-        {
-            if (node.getScope() == ExchangeNode.Scope.REMOTE) {
-                return 0;
-            }
-            return visitPlan(node, context);
-        }
-
-        @Override
-        protected Integer visitPlan(PlanNode node, Void context)
-        {
-            int count = 0;
-            for (PlanNode source : node.getSources()) {
-                count += source.accept(this, context);
-            }
-            return count;
-        }
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/FunctionCallBuilder.java b/core/trino-main/src/main/java/io/trino/sql/planner/FunctionCallBuilder.java
deleted file mode 100644
index 603dc06c38dd..000000000000
--- a/core/trino-main/src/main/java/io/trino/sql/planner/FunctionCallBuilder.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed 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 io.trino.sql.planner;
-
-import io.trino.Session;
-import io.trino.metadata.Metadata;
-import io.trino.metadata.ResolvedFunction;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeSignature;
-import io.trino.sql.analyzer.TypeSignatureProvider;
-import io.trino.sql.tree.Expression;
-import io.trino.sql.tree.FunctionCall;
-import io.trino.sql.tree.NodeLocation;
-import io.trino.sql.tree.OrderBy;
-import io.trino.sql.tree.QualifiedName;
-import io.trino.sql.tree.Window;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static java.util.Objects.requireNonNull;
-
-public class FunctionCallBuilder
-{
-    private final Session session;
-    private final Metadata metadata;
-    private QualifiedName name;
-    private List<TypeSignature> argumentTypes = new ArrayList<>();
-    private List<Expression> argumentValues = new ArrayList<>();
-    private Optional<NodeLocation> location = Optional.empty();
-    private Optional<Window> window = Optional.empty();
-    private Optional<Expression> filter = Optional.empty();
-    private Optional<OrderBy> orderBy = Optional.empty();
-    private boolean distinct;
-
-    public static FunctionCallBuilder resolve(Session session, Metadata metadata)
-    {
-        return new FunctionCallBuilder(session, metadata);
-    }
-
-    private FunctionCallBuilder(Session session, Metadata metadata)
-    {
-        this.session = requireNonNull(session, "session is null");
-        this.metadata = requireNonNull(metadata, "metadata is null");
-    }
-
-    public FunctionCallBuilder setName(QualifiedName name)
-    {
-        this.name = requireNonNull(name, "name is null");
-        return this;
-    }
-
-    public FunctionCallBuilder addArgument(Type type, Expression value)
-    {
-        requireNonNull(type, "type is null");
-        return addArgument(type.getTypeSignature(), value);
-    }
-
-    public FunctionCallBuilder addArgument(TypeSignature typeSignature, Expression value)
-    {
-        requireNonNull(typeSignature, "typeSignature is null");
-        requireNonNull(value, "value is null");
-        argumentTypes.add(typeSignature);
-        argumentValues.add(value);
-        return this;
-    }
-
-    public FunctionCallBuilder setArguments(List<Type> types, List<Expression> values)
-    {
-        requireNonNull(types, "types is null");
-        requireNonNull(values, "values is null");
-        argumentTypes = types.stream()
-                .map(Type::getTypeSignature)
-                .collect(Collectors.toList());
-        argumentValues = new ArrayList<>(values);
-        return this;
-    }
-
-    public FunctionCallBuilder setLocation(NodeLocation location)
-    {
-        this.location = Optional.of(requireNonNull(location, "location is null"));
-        return this;
-    }
-
-    public FunctionCallBuilder setWindow(Window window)
-    {
-        this.window = Optional.of(requireNonNull(window, "window is null"));
-        return this;
-    }
-
-    public FunctionCallBuilder setWindow(Optional<Window> window)
-    {
-        this.window = requireNonNull(window, "window is null");
-        return this;
-    }
-
-    public FunctionCallBuilder setFilter(Expression filter)
-    {
-        this.filter = Optional.of(requireNonNull(filter, "filter is null"));
-        return this;
-    }
-
-    public FunctionCallBuilder setFilter(Optional<Expression> filter)
-    {
-        this.filter = requireNonNull(filter, "filter is null");
-        return this;
-    }
-
-    public FunctionCallBuilder setOrderBy(OrderBy orderBy)
-    {
-        this.orderBy = Optional.of(requireNonNull(orderBy, "orderBy is null"));
-        return this;
-    }
-
-    public FunctionCallBuilder setOrderBy(Optional<OrderBy> orderBy)
-    {
-        this.orderBy = requireNonNull(orderBy, "orderBy is null");
-        return this;
-    }
-
-    public FunctionCallBuilder setDistinct(boolean distinct)
-    {
-        this.distinct = distinct;
-        return this;
-    }
-
-    public FunctionCall build()
-    {
-        ResolvedFunction resolvedFunction = metadata.resolveFunction(session, name, TypeSignatureProvider.fromTypeSignatures(argumentTypes));
-        return new FunctionCall(
-                location,
-                resolvedFunction.toQualifiedName(),
-                window,
-                filter,
-                orderBy,
-                distinct,
-                Optional.empty(),
-                Optional.empty(),
-                argumentValues);
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/InputExtractor.java b/core/trino-main/src/main/java/io/trino/sql/planner/InputExtractor.java
index e6549b72f46f..5f8a9b82c1ce 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/InputExtractor.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/InputExtractor.java
@@ -20,7 +20,7 @@
 import io.trino.execution.Input;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.TableHandle;
-import io.trino.metadata.TableSchema;
+import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.SchemaTableName;
@@ -64,10 +64,18 @@ private static Column createColumn(ColumnMetadata columnMetadata)
 
     private Input createInput(Session session, TableHandle table, Set<Column> columns, PlanFragmentId fragmentId, PlanNodeId planNodeId)
     {
-        TableSchema tableSchema = metadata.getTableSchema(session, table);
-        SchemaTableName schemaTable = tableSchema.getTable();
+        CatalogSchemaTableName tableName = metadata.getTableName(session, table);
+        SchemaTableName schemaTable = tableName.getSchemaTableName();
         Optional<Object> inputMetadata = metadata.getInfo(session, table);
-        return new Input(tableSchema.getCatalogName(), schemaTable.getSchemaName(), schemaTable.getTableName(), inputMetadata, ImmutableList.copyOf(columns), fragmentId, planNodeId);
+        return new Input(
+                tableName.getCatalogName(),
+                table.getCatalogHandle().getVersion(),
+                schemaTable.getSchemaName(),
+                schemaTable.getTableName(),
+                inputMetadata,
+                ImmutableList.copyOf(columns),
+                fragmentId,
+                planNodeId);
     }
 
     private class Visitor
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/JsonPathTranslator.java b/core/trino-main/src/main/java/io/trino/sql/planner/JsonPathTranslator.java
index 7cdef1a74624..82f5cb7ee181 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/JsonPathTranslator.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/JsonPathTranslator.java
@@ -25,13 +25,13 @@
 import io.trino.json.ir.IrComparisonPredicate;
 import io.trino.json.ir.IrConjunctionPredicate;
 import io.trino.json.ir.IrContextVariable;
+import io.trino.json.ir.IrDescendantMemberAccessor;
 import io.trino.json.ir.IrDisjunctionPredicate;
 import io.trino.json.ir.IrDoubleMethod;
 import io.trino.json.ir.IrExistsPredicate;
 import io.trino.json.ir.IrFilter;
 import io.trino.json.ir.IrFloorMethod;
 import io.trino.json.ir.IrIsUnknownPredicate;
-import io.trino.json.ir.IrJsonNull;
 import io.trino.json.ir.IrJsonPath;
 import io.trino.json.ir.IrKeyValueMethod;
 import io.trino.json.ir.IrLastIndexVariable;
@@ -59,6 +59,7 @@
 import io.trino.sql.jsonpath.tree.ConjunctionPredicate;
 import io.trino.sql.jsonpath.tree.ContextVariable;
 import io.trino.sql.jsonpath.tree.DatetimeMethod;
+import io.trino.sql.jsonpath.tree.DescendantMemberAccessor;
 import io.trino.sql.jsonpath.tree.DisjunctionPredicate;
 import io.trino.sql.jsonpath.tree.DoubleMethod;
 import io.trino.sql.jsonpath.tree.ExistsPredicate;
@@ -101,6 +102,7 @@
 import static io.trino.json.ir.IrComparisonPredicate.Operator.LESS_THAN;
 import static io.trino.json.ir.IrComparisonPredicate.Operator.LESS_THAN_OR_EQUAL;
 import static io.trino.json.ir.IrComparisonPredicate.Operator.NOT_EQUAL;
+import static io.trino.json.ir.IrJsonNull.JSON_NULL;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static java.util.Objects.requireNonNull;
 
@@ -226,6 +228,13 @@ protected IrPathNode visitDatetimeMethod(DatetimeMethod node, Void context)
 //            return new IrDatetimeMethod(base, /*parsed format*/, Optional.ofNullable(types.get(PathNodeRef.of(node))));
         }
 
+        @Override
+        protected IrPathNode visitDescendantMemberAccessor(DescendantMemberAccessor node, Void context)
+        {
+            IrPathNode base = process(node.getBase());
+            return new IrDescendantMemberAccessor(base, node.getKey(), Optional.ofNullable(types.get(PathNodeRef.of(node))));
+        }
+
         @Override
         protected IrPathNode visitDoubleMethod(DoubleMethod node, Void context)
         {
@@ -251,7 +260,7 @@ protected IrPathNode visitFloorMethod(FloorMethod node, Void context)
         @Override
         protected IrPathNode visitJsonNullLiteral(JsonNullLiteral node, Void context)
         {
-            return new IrJsonNull();
+            return JSON_NULL;
         }
 
         @Override
@@ -300,7 +309,7 @@ protected IrPathNode visitSizeMethod(SizeMethod node, Void context)
         protected IrPathNode visitSqlValueLiteral(SqlValueLiteral node, Void context)
         {
             Expression value = node.getValue();
-            return new IrLiteral(types.get(PathNodeRef.of(node)), literalInterpreter.evaluate(value, types.get(PathNodeRef.of(node))));
+            return new IrLiteral(Optional.of(types.get(PathNodeRef.of(node))), literalInterpreter.evaluate(value, types.get(PathNodeRef.of(node))));
         }
 
         @Override
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/LiteralEncoder.java b/core/trino-main/src/main/java/io/trino/sql/planner/LiteralEncoder.java
index 9457a97dcc6d..87071ee58954 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/LiteralEncoder.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/LiteralEncoder.java
@@ -19,7 +19,6 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
 import io.airlift.slice.SliceUtf8;
-import io.trino.Session;
 import io.trino.block.BlockSerdeUtil;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.operator.scalar.VarbinaryFunctions;
@@ -47,15 +46,14 @@
 import io.trino.sql.tree.GenericLiteral;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.sql.tree.TimestampLiteral;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.metadata.LiteralFunction.LITERAL_FUNCTION_NAME;
 import static io.trino.metadata.LiteralFunction.typeForMagicLiteral;
 import static io.trino.spi.predicate.Utils.nativeValueToBlock;
@@ -85,7 +83,7 @@ public LiteralEncoder(PlannerContext plannerContext)
         this.plannerContext = requireNonNull(plannerContext, "plannerContext is null");
     }
 
-    public List<Expression> toExpressions(Session session, List<?> objects, List<? extends Type> types)
+    public List<Expression> toExpressions(List<?> objects, List<? extends Type> types)
     {
         requireNonNull(objects, "objects is null");
         requireNonNull(types, "types is null");
@@ -95,12 +93,12 @@ public List<Expression> toExpressions(Session session, List<?> objects, List<? e
         for (int i = 0; i < objects.size(); i++) {
             Object object = objects.get(i);
             Type type = types.get(i);
-            expressions.add(toExpression(session, object, type));
+            expressions.add(toExpression(object, type));
         }
         return expressions.build();
     }
 
-    public Expression toExpression(Session session, @Nullable Object object, Type type)
+    public Expression toExpression(@Nullable Object object, Type type)
     {
         requireNonNull(type, "type is null");
 
@@ -131,7 +129,7 @@ public Expression toExpression(Session session, @Nullable Object object, Type ty
 
         if (type.equals(BIGINT)) {
             LongLiteral expression = new LongLiteral(object.toString());
-            if (expression.getValue() >= Integer.MIN_VALUE && expression.getValue() <= Integer.MAX_VALUE) {
+            if (expression.getParsedValue() >= Integer.MIN_VALUE && expression.getParsedValue() <= Integer.MAX_VALUE) {
                 return new GenericLiteral("BIGINT", object.toString());
             }
             return new LongLiteral(object.toString());
@@ -140,18 +138,18 @@ public Expression toExpression(Session session, @Nullable Object object, Type ty
         if (type.equals(DOUBLE)) {
             Double value = (Double) object;
             if (value.isNaN()) {
-                return FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                        .setName(QualifiedName.of("nan"))
+                return BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                        .setName("nan")
                         .build();
             }
             if (value.equals(Double.NEGATIVE_INFINITY)) {
-                return ArithmeticUnaryExpression.negative(FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                        .setName(QualifiedName.of("infinity"))
+                return ArithmeticUnaryExpression.negative(BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                        .setName("infinity")
                         .build());
             }
             if (value.equals(Double.POSITIVE_INFINITY)) {
-                return FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                        .setName(QualifiedName.of("infinity"))
+                return BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                        .setName("infinity")
                         .build();
             }
             return new DoubleLiteral(object.toString());
@@ -161,22 +159,22 @@ public Expression toExpression(Session session, @Nullable Object object, Type ty
             Float value = intBitsToFloat(((Long) object).intValue());
             if (value.isNaN()) {
                 return new Cast(
-                        FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                                .setName(QualifiedName.of("nan"))
+                        BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                                .setName("nan")
                                 .build(),
                         toSqlType(REAL));
             }
             if (value.equals(Float.NEGATIVE_INFINITY)) {
                 return ArithmeticUnaryExpression.negative(new Cast(
-                        FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                                .setName(QualifiedName.of("infinity"))
+                        BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                                .setName("infinity")
                                 .build(),
                         toSqlType(REAL)));
             }
             if (value.equals(Float.POSITIVE_INFINITY)) {
                 return new Cast(
-                        FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                                .setName(QualifiedName.of("infinity"))
+                        BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                                .setName("infinity")
                                 .build(),
                         toSqlType(REAL));
             }
@@ -276,19 +274,18 @@ public Expression toExpression(Session session, @Nullable Object object, Type ty
             // able to encode it in the plan that gets sent to workers.
             // We do this by transforming the in-memory varbinary into a call to from_base64(<base64-encoded value>)
             Slice encoded = VarbinaryFunctions.toBase64(slice);
-            argument = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                    .setName(QualifiedName.of("from_base64"))
+            argument = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                    .setName("from_base64")
                     .addArgument(VARCHAR, new StringLiteral(encoded.toStringUtf8()))
                     .build();
         }
         else {
-            argument = toExpression(session, object, argumentType);
+            argument = toExpression(object, argumentType);
         }
 
-        ResolvedFunction resolvedFunction = plannerContext.getMetadata().getCoercion(session, QualifiedName.of(LITERAL_FUNCTION_NAME), argumentType, type);
-        return FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                .setName(resolvedFunction.toQualifiedName())
-                .addArgument(argumentType, argument)
+        ResolvedFunction resolvedFunction = plannerContext.getMetadata().getCoercion(builtinFunctionName(LITERAL_FUNCTION_NAME), argumentType, type);
+        return ResolvedFunctionCallBuilder.builder(resolvedFunction)
+                .addArgument(argument)
                 .build();
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/LiteralInterpreter.java b/core/trino-main/src/main/java/io/trino/sql/planner/LiteralInterpreter.java
index 183d2cc045d2..c42d4b78bbaa 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/LiteralInterpreter.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/LiteralInterpreter.java
@@ -19,7 +19,7 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.trino.Session;
-import io.trino.collect.cache.CacheUtils;
+import io.trino.cache.CacheUtils;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Decimals;
@@ -42,7 +42,6 @@
 import io.trino.sql.tree.Literal;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.sql.tree.TimeLiteral;
 import io.trino.sql.tree.TimestampLiteral;
@@ -50,7 +49,7 @@
 import java.util.function.Function;
 
 import static io.airlift.slice.Slices.utf8Slice;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.spi.StandardErrorCode.INVALID_LITERAL;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.analyzer.SemanticExceptions.semanticException;
@@ -114,7 +113,7 @@ protected Object visitBooleanLiteral(BooleanLiteral node, Void context)
         @Override
         protected Long visitLongLiteral(LongLiteral node, Void context)
         {
-            return node.getValue();
+            return node.getParsedValue();
         }
 
         @Override
@@ -154,10 +153,10 @@ protected Object visitGenericLiteral(GenericLiteral node, Void context)
                 boolean isJson = JSON.equals(type);
                 ResolvedFunction resolvedFunction;
                 if (isJson) {
-                    resolvedFunction = plannerContext.getMetadata().resolveFunction(session, QualifiedName.of("json_parse"), fromTypes(VARCHAR));
+                    resolvedFunction = plannerContext.getMetadata().resolveBuiltinFunction("json_parse", fromTypes(VARCHAR));
                 }
                 else {
-                    resolvedFunction = plannerContext.getMetadata().getCoercion(session, VARCHAR, type);
+                    resolvedFunction = plannerContext.getMetadata().getCoercion(VARCHAR, type);
                 }
                 return evaluatedNode -> {
                     try {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/LocalDynamicFilterConsumer.java b/core/trino-main/src/main/java/io/trino/sql/planner/LocalDynamicFilterConsumer.java
index 4867ef87a2f1..aacc1691608c 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/LocalDynamicFilterConsumer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/LocalDynamicFilterConsumer.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.units.DataSize;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
@@ -23,8 +24,6 @@
 import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.PlanNode;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/LocalDynamicFiltersCollector.java b/core/trino-main/src/main/java/io/trino/sql/planner/LocalDynamicFiltersCollector.java
index 8c76813f780d..296f2b1f702c 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/LocalDynamicFiltersCollector.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/LocalDynamicFiltersCollector.java
@@ -18,6 +18,8 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.Session;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.DynamicFilter;
@@ -27,9 +29,6 @@
 import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.plan.DynamicFilterId;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/LocalExecutionPlanner.java b/core/trino-main/src/main/java/io/trino/sql/planner/LocalExecutionPlanner.java
index 1b4a60db51b5..f0286d52289e 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/LocalExecutionPlanner.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/LocalExecutionPlanner.java
@@ -27,12 +27,13 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.SetMultimap;
 import com.google.common.primitives.Ints;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.DataSize;
 import io.trino.Session;
 import io.trino.SystemSessionProperties;
+import io.trino.cache.NonEvictableCache;
 import io.trino.client.NodeVersion;
-import io.trino.collect.cache.NonEvictableCache;
 import io.trino.exchange.ExchangeManagerRegistry;
 import io.trino.execution.DynamicFilterConfig;
 import io.trino.execution.ExplainAnalyzeContext;
@@ -62,6 +63,7 @@
 import io.trino.operator.GroupIdOperator;
 import io.trino.operator.HashAggregationOperator.HashAggregationOperatorFactory;
 import io.trino.operator.HashSemiJoinOperator;
+import io.trino.operator.JoinOperatorType;
 import io.trino.operator.LeafTableFunctionOperator.LeafTableFunctionOperatorFactory;
 import io.trino.operator.LimitOperator.LimitOperatorFactory;
 import io.trino.operator.LocalPlannerAware;
@@ -69,8 +71,6 @@
 import io.trino.operator.MergeOperator.MergeOperatorFactory;
 import io.trino.operator.MergeProcessorOperator;
 import io.trino.operator.MergeWriterOperator.MergeWriterOperatorFactory;
-import io.trino.operator.OperatorFactories;
-import io.trino.operator.OperatorFactories.JoinOperatorType;
 import io.trino.operator.OperatorFactory;
 import io.trino.operator.OrderByOperator.OrderByOperatorFactory;
 import io.trino.operator.OutputFactory;
@@ -91,8 +91,8 @@
 import io.trino.operator.SpatialJoinOperator.SpatialJoinOperatorFactory;
 import io.trino.operator.StatisticsWriterOperator.StatisticsWriterOperatorFactory;
 import io.trino.operator.StreamingAggregationOperator;
-import io.trino.operator.TableDeleteOperator.TableDeleteOperatorFactory;
 import io.trino.operator.TableFunctionOperator.TableFunctionOperatorFactory;
+import io.trino.operator.TableMutationOperator.TableMutationOperatorFactory;
 import io.trino.operator.TableScanOperator.TableScanOperatorFactory;
 import io.trino.operator.TaskContext;
 import io.trino.operator.TopNOperator;
@@ -127,6 +127,7 @@
 import io.trino.operator.join.unspilled.HashBuilderOperator;
 import io.trino.operator.output.PartitionedOutputOperator.PartitionedOutputFactory;
 import io.trino.operator.output.PositionsAppenderFactory;
+import io.trino.operator.output.SkewedPartitionRebalancer;
 import io.trino.operator.output.TaskOutputOperator.TaskOutputFactory;
 import io.trino.operator.project.CursorProcessor;
 import io.trino.operator.project.PageProcessor;
@@ -153,23 +154,27 @@
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.SingleRowBlock;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorIndex;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.connector.SortOrder;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.function.AggregationImplementation;
 import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.function.FunctionId;
 import io.trino.spi.function.FunctionKind;
 import io.trino.spi.function.WindowFunctionSupplier;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
-import io.trino.spi.ptf.TableFunctionProcessorProvider;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.spiller.PartitioningSpillerFactory;
 import io.trino.spiller.SingleStreamSpillerFactory;
 import io.trino.spiller.SpillerFactory;
@@ -230,6 +235,7 @@
 import io.trino.sql.planner.plan.TableFunctionNode.PassThroughSpecification;
 import io.trino.sql.planner.plan.TableFunctionProcessorNode;
 import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.TableUpdateNode;
 import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.sql.planner.plan.TableWriterNode.MergeTarget;
 import io.trino.sql.planner.plan.TableWriterNode.TableExecuteTarget;
@@ -260,8 +266,6 @@
 import io.trino.type.BlockTypeOperators;
 import io.trino.type.FunctionType;
 
-import javax.inject.Inject;
-
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -269,7 +273,6 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -279,7 +282,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import static com.google.common.base.Functions.forMap;
@@ -295,17 +297,16 @@
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.collect.Range.closedOpen;
 import static com.google.common.collect.Sets.difference;
-import static io.trino.SystemSessionProperties.getAdaptivePartialAggregationMinRows;
 import static io.trino.SystemSessionProperties.getAdaptivePartialAggregationUniqueRowsRatioThreshold;
 import static io.trino.SystemSessionProperties.getAggregationOperatorUnspillMemoryLimit;
 import static io.trino.SystemSessionProperties.getFilterAndProjectMinOutputPageRowCount;
 import static io.trino.SystemSessionProperties.getFilterAndProjectMinOutputPageSize;
 import static io.trino.SystemSessionProperties.getPagePartitioningBufferPoolSize;
+import static io.trino.SystemSessionProperties.getSkewedPartitionMinDataProcessedRebalanceThreshold;
 import static io.trino.SystemSessionProperties.getTaskConcurrency;
-import static io.trino.SystemSessionProperties.getTaskPartitionedWriterCount;
-import static io.trino.SystemSessionProperties.getTaskScaleWritersMaxWriterCount;
-import static io.trino.SystemSessionProperties.getTaskWriterCount;
-import static io.trino.SystemSessionProperties.getWriterMinSize;
+import static io.trino.SystemSessionProperties.getTaskMaxWriterCount;
+import static io.trino.SystemSessionProperties.getTaskMinWriterCount;
+import static io.trino.SystemSessionProperties.getWriterScalingMinDataProcessed;
 import static io.trino.SystemSessionProperties.isAdaptivePartialAggregationEnabled;
 import static io.trino.SystemSessionProperties.isEnableCoordinatorDynamicFiltersDistribution;
 import static io.trino.SystemSessionProperties.isEnableLargeDynamicFilters;
@@ -313,10 +314,13 @@
 import static io.trino.SystemSessionProperties.isForceSpillingOperator;
 import static io.trino.SystemSessionProperties.isLateMaterializationEnabled;
 import static io.trino.SystemSessionProperties.isSpillEnabled;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.operator.DistinctLimitOperator.DistinctLimitOperatorFactory;
 import static io.trino.operator.HashArraySizeSupplier.incrementalLoadFactorHashArraySizeSupplier;
+import static io.trino.operator.OperatorFactories.join;
+import static io.trino.operator.OperatorFactories.spillingJoin;
 import static io.trino.operator.TableFinishOperator.TableFinishOperatorFactory;
 import static io.trino.operator.TableFinishOperator.TableFinisher;
 import static io.trino.operator.TableWriterOperator.FRAGMENT_CHANNEL;
@@ -329,6 +333,11 @@
 import static io.trino.operator.join.JoinUtils.isBuildSideReplicated;
 import static io.trino.operator.join.NestedLoopBuildOperator.NestedLoopBuildOperatorFactory;
 import static io.trino.operator.join.NestedLoopJoinOperator.NestedLoopJoinOperatorFactory;
+import static io.trino.operator.output.SkewedPartitionRebalancer.checkCanScalePartitionsRemotely;
+import static io.trino.operator.output.SkewedPartitionRebalancer.createPartitionFunction;
+import static io.trino.operator.output.SkewedPartitionRebalancer.getMaxWritersBasedOnMemory;
+import static io.trino.operator.output.SkewedPartitionRebalancer.getScaleWritersMaxSkewedPartitions;
+import static io.trino.operator.output.SkewedPartitionRebalancer.getTaskCount;
 import static io.trino.operator.window.pattern.PhysicalValuePointer.CLASSIFIER;
 import static io.trino.operator.window.pattern.PhysicalValuePointer.MATCH_NUMBER;
 import static io.trino.spi.StandardErrorCode.COMPILER_ERROR;
@@ -368,12 +377,16 @@
 import static io.trino.sql.tree.SortItem.Ordering.ASCENDING;
 import static io.trino.sql.tree.SortItem.Ordering.DESCENDING;
 import static io.trino.sql.tree.WindowFrame.Type.ROWS;
+import static io.trino.util.MoreMath.previousPowerOfTwo;
 import static io.trino.util.SpatialJoinUtils.ST_CONTAINS;
 import static io.trino.util.SpatialJoinUtils.ST_DISTANCE;
 import static io.trino.util.SpatialJoinUtils.ST_INTERSECTS;
 import static io.trino.util.SpatialJoinUtils.ST_WITHIN;
 import static io.trino.util.SpatialJoinUtils.extractSupportedSpatialComparisons;
 import static io.trino.util.SpatialJoinUtils.extractSupportedSpatialFunctions;
+import static java.lang.Math.ceil;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
 import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
@@ -407,36 +420,37 @@ public class LocalExecutionPlanner
     private final PartitioningSpillerFactory partitioningSpillerFactory;
     private final PagesIndex.Factory pagesIndexFactory;
     private final JoinCompiler joinCompiler;
-    private final OperatorFactories operatorFactories;
     private final OrderingCompiler orderingCompiler;
-    private final int largeBroadcastMaxDistinctValuesPerDriver;
+    private final int largeMaxDistinctValuesPerDriver;
     private final int largePartitionedMaxDistinctValuesPerDriver;
-    private final int smallBroadcastMaxDistinctValuesPerDriver;
+    private final int smallMaxDistinctValuesPerDriver;
     private final int smallPartitionedMaxDistinctValuesPerDriver;
-    private final DataSize largeBroadcastMaxSizePerDriver;
+    private final DataSize largeMaxSizePerDriver;
     private final DataSize largePartitionedMaxSizePerDriver;
-    private final DataSize smallBroadcastMaxSizePerDriver;
+    private final DataSize smallMaxSizePerDriver;
     private final DataSize smallPartitionedMaxSizePerDriver;
-    private final int largeBroadcastRangeRowLimitPerDriver;
+    private final int largeRangeRowLimitPerDriver;
     private final int largePartitionedRangeRowLimitPerDriver;
-    private final int smallBroadcastRangeRowLimitPerDriver;
+    private final int smallRangeRowLimitPerDriver;
     private final int smallPartitionedRangeRowLimitPerDriver;
-    private final DataSize largeBroadcastMaxSizePerOperator;
+    private final DataSize largeMaxSizePerOperator;
     private final DataSize largePartitionedMaxSizePerOperator;
-    private final DataSize smallBroadcastMaxSizePerOperator;
+    private final DataSize smallMaxSizePerOperator;
     private final DataSize smallPartitionedMaxSizePerOperator;
     private final BlockTypeOperators blockTypeOperators;
+    private final TypeOperators typeOperators;
     private final TableExecuteContextManager tableExecuteContextManager;
     private final ExchangeManagerRegistry exchangeManagerRegistry;
     private final PositionsAppenderFactory positionsAppenderFactory;
     private final NodeVersion version;
+    private final boolean specializeAggregationLoops;
 
     private final NonEvictableCache<FunctionKey, AccumulatorFactory> accumulatorFactoryCache = buildNonEvictableCache(CacheBuilder.newBuilder()
             .maximumSize(1000)
-            .expireAfterWrite(1, HOURS));
+            .expireAfterAccess(1, HOURS));
     private final NonEvictableCache<FunctionKey, AggregationWindowFunctionSupplier> aggregationWindowFunctionSupplierCache = buildNonEvictableCache(CacheBuilder.newBuilder()
             .maximumSize(1000)
-            .expireAfterWrite(1, HOURS));
+            .expireAfterAccess(1, HOURS));
 
     @Inject
     public LocalExecutionPlanner(
@@ -458,13 +472,14 @@ public LocalExecutionPlanner(
             PartitioningSpillerFactory partitioningSpillerFactory,
             PagesIndex.Factory pagesIndexFactory,
             JoinCompiler joinCompiler,
-            OperatorFactories operatorFactories,
             OrderingCompiler orderingCompiler,
             DynamicFilterConfig dynamicFilterConfig,
             BlockTypeOperators blockTypeOperators,
+            TypeOperators typeOperators,
             TableExecuteContextManager tableExecuteContextManager,
             ExchangeManagerRegistry exchangeManagerRegistry,
-            NodeVersion version)
+            NodeVersion version,
+            CompilerConfig compilerConfig)
     {
         this.plannerContext = requireNonNull(plannerContext, "plannerContext is null");
         this.metadata = plannerContext.getMetadata();
@@ -488,29 +503,30 @@ public LocalExecutionPlanner(
         this.maxLocalExchangeBufferSize = taskManagerConfig.getMaxLocalExchangeBufferSize();
         this.pagesIndexFactory = requireNonNull(pagesIndexFactory, "pagesIndexFactory is null");
         this.joinCompiler = requireNonNull(joinCompiler, "joinCompiler is null");
-        this.operatorFactories = requireNonNull(operatorFactories, "operatorFactories is null");
         this.orderingCompiler = requireNonNull(orderingCompiler, "orderingCompiler is null");
-        this.largeBroadcastMaxDistinctValuesPerDriver = dynamicFilterConfig.getLargeBroadcastMaxDistinctValuesPerDriver();
-        this.smallBroadcastMaxDistinctValuesPerDriver = dynamicFilterConfig.getSmallBroadcastMaxDistinctValuesPerDriver();
+        this.largeMaxDistinctValuesPerDriver = dynamicFilterConfig.getLargeMaxDistinctValuesPerDriver();
+        this.smallMaxDistinctValuesPerDriver = dynamicFilterConfig.getSmallMaxDistinctValuesPerDriver();
         this.smallPartitionedMaxDistinctValuesPerDriver = dynamicFilterConfig.getSmallPartitionedMaxDistinctValuesPerDriver();
-        this.largeBroadcastMaxSizePerDriver = dynamicFilterConfig.getLargeBroadcastMaxSizePerDriver();
+        this.largeMaxSizePerDriver = dynamicFilterConfig.getLargeMaxSizePerDriver();
         this.largePartitionedMaxSizePerDriver = dynamicFilterConfig.getLargePartitionedMaxSizePerDriver();
-        this.smallBroadcastMaxSizePerDriver = dynamicFilterConfig.getSmallBroadcastMaxSizePerDriver();
+        this.smallMaxSizePerDriver = dynamicFilterConfig.getSmallMaxSizePerDriver();
         this.smallPartitionedMaxSizePerDriver = dynamicFilterConfig.getSmallPartitionedMaxSizePerDriver();
-        this.largeBroadcastRangeRowLimitPerDriver = dynamicFilterConfig.getLargeBroadcastRangeRowLimitPerDriver();
+        this.largeRangeRowLimitPerDriver = dynamicFilterConfig.getLargeRangeRowLimitPerDriver();
         this.largePartitionedRangeRowLimitPerDriver = dynamicFilterConfig.getLargePartitionedRangeRowLimitPerDriver();
-        this.smallBroadcastRangeRowLimitPerDriver = dynamicFilterConfig.getSmallBroadcastRangeRowLimitPerDriver();
+        this.smallRangeRowLimitPerDriver = dynamicFilterConfig.getSmallRangeRowLimitPerDriver();
         this.smallPartitionedRangeRowLimitPerDriver = dynamicFilterConfig.getSmallPartitionedRangeRowLimitPerDriver();
-        this.largeBroadcastMaxSizePerOperator = dynamicFilterConfig.getLargeBroadcastMaxSizePerOperator();
+        this.largeMaxSizePerOperator = dynamicFilterConfig.getLargeMaxSizePerOperator();
         this.largePartitionedMaxSizePerOperator = dynamicFilterConfig.getLargePartitionedMaxSizePerOperator();
-        this.smallBroadcastMaxSizePerOperator = dynamicFilterConfig.getSmallBroadcastMaxSizePerOperator();
+        this.smallMaxSizePerOperator = dynamicFilterConfig.getSmallMaxSizePerOperator();
         this.smallPartitionedMaxSizePerOperator = dynamicFilterConfig.getSmallPartitionedMaxSizePerOperator();
         this.largePartitionedMaxDistinctValuesPerDriver = dynamicFilterConfig.getLargePartitionedMaxDistinctValuesPerDriver();
         this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
+        this.typeOperators = requireNonNull(typeOperators, "typeOperators is null");
         this.tableExecuteContextManager = requireNonNull(tableExecuteContextManager, "tableExecuteContextManager is null");
         this.exchangeManagerRegistry = requireNonNull(exchangeManagerRegistry, "exchangeManagerRegistry is null");
         this.positionsAppenderFactory = new PositionsAppenderFactory(blockTypeOperators);
         this.version = requireNonNull(version, "version is null");
+        this.specializeAggregationLoops = compilerConfig.isSpecializeAggregationLoops();
     }
 
     public LocalExecutionPlan plan(
@@ -567,7 +583,27 @@ public LocalExecutionPlan plan(
                     .collect(toImmutableList());
         }
 
-        PartitionFunction partitionFunction = nodePartitioningManager.getPartitionFunction(taskContext.getSession(), partitioningScheme, partitionChannelTypes);
+        PartitionFunction partitionFunction;
+        Optional<SkewedPartitionRebalancer> skewedPartitionRebalancer = Optional.empty();
+        int taskCount = getTaskCount(partitioningScheme);
+        if (checkCanScalePartitionsRemotely(taskContext.getSession(), taskCount, partitioningScheme.getPartitioning().getHandle(), nodePartitioningManager)) {
+            partitionFunction = createPartitionFunction(taskContext.getSession(), nodePartitioningManager, partitioningScheme, partitionChannelTypes);
+            int partitionedWriterCount = getPartitionedWriterCountBasedOnMemory(taskContext.getSession());
+            // Keep the task bucket count to 50% of total local writers
+            int taskBucketCount = (int) ceil(0.5 * partitionedWriterCount);
+            skewedPartitionRebalancer = Optional.of(new SkewedPartitionRebalancer(
+                    partitionFunction.partitionCount(),
+                    taskCount,
+                    taskBucketCount,
+                    getWriterScalingMinDataProcessed(taskContext.getSession()).toBytes(),
+                    getSkewedPartitionMinDataProcessedRebalanceThreshold(taskContext.getSession()).toBytes(),
+                    // Keep the maxPartitionsToRebalance to atleast task count such that single partition writes do
+                    // not suffer from skewness and can scale uniformly across all tasks.
+                    max(getScaleWritersMaxSkewedPartitions(taskContext.getSession()), taskCount)));
+        }
+        else {
+            partitionFunction = nodePartitioningManager.getPartitionFunction(taskContext.getSession(), partitioningScheme, partitionChannelTypes);
+        }
         OptionalInt nullChannel = OptionalInt.empty();
         Set<Symbol> partitioningColumns = partitioningScheme.getPartitioning().getColumns();
 
@@ -594,7 +630,8 @@ public LocalExecutionPlan plan(
                         positionsAppenderFactory,
                         taskContext.getSession().getExchangeEncryptionKey(),
                         taskContext.newAggregateMemoryContext(),
-                        getPagePartitioningBufferPoolSize(taskContext.getSession())));
+                        getPagePartitioningBufferPoolSize(taskContext.getSession()),
+                        skewedPartitionRebalancer));
     }
 
     public LocalExecutionPlan plan(
@@ -617,7 +654,6 @@ public LocalExecutionPlan plan(
                 .collect(toImmutableList());
 
         context.addDriverFactory(
-                context.isInputDriver(),
                 true,
                 new PhysicalOperation(
                         outputOperatorFactory.createOutputOperator(
@@ -627,7 +663,7 @@ public LocalExecutionPlan plan(
                                 pagePreprocessor,
                                 new PagesSerdeFactory(plannerContext.getBlockEncodingSerde(), isExchangeCompressionEnabled(session))),
                         physicalOperation),
-                context.getDriverInstanceCount());
+                context);
 
         // notify operator factories that planning has completed
         context.getDriverFactories().stream()
@@ -678,8 +714,10 @@ private LocalExecutionPlanContext(
             this.nextPipelineId = nextPipelineId;
         }
 
-        public void addDriverFactory(boolean inputDriver, boolean outputDriver, PhysicalOperation physicalOperation, OptionalInt driverInstances)
+        public void addDriverFactory(boolean outputDriver, PhysicalOperation physicalOperation, LocalExecutionPlanContext context)
         {
+            boolean inputDriver = context.isInputDriver();
+            OptionalInt driverInstances = context.getDriverInstanceCount();
             List<OperatorFactoryWithTypes> operatorFactoriesWithTypes = physicalOperation.getOperatorFactoriesWithTypes();
             addLookupOuterDrivers(outputDriver, toOperatorFactories(operatorFactoriesWithTypes));
             List<OperatorFactory> operatorFactories;
@@ -689,7 +727,7 @@ public void addDriverFactory(boolean inputDriver, boolean outputDriver, Physical
             else {
                 operatorFactories = toOperatorFactories(operatorFactoriesWithTypes);
             }
-            driverFactories.add(new DriverFactory(getNextPipelineId(), inputDriver, outputDriver, operatorFactories, driverInstances));
+            addDriverFactory(inputDriver, outputDriver, operatorFactories, driverInstances);
         }
 
         private List<OperatorFactory> handleLateMaterialization(List<OperatorFactoryWithTypes> operatorFactories)
@@ -1013,8 +1051,7 @@ public PhysicalOperation visitRowNumber(RowNumberNode node, LocalExecutionPlanCo
                     node.getMaxRowCountPerPartition(),
                     hashChannel,
                     10_000,
-                    joinCompiler,
-                    blockTypeOperators);
+                    joinCompiler);
             return new PhysicalOperation(operatorFactory, outputMappings.buildOrThrow(), context, source);
         }
 
@@ -1849,8 +1886,7 @@ public PhysicalOperation visitDistinctLimit(DistinctLimitNode node, LocalExecuti
                     distinctChannels,
                     node.getLimit(),
                     hashChannel,
-                    joinCompiler,
-                    blockTypeOperators);
+                    joinCompiler);
             return new PhysicalOperation(operatorFactory, makeLayout(node), context, source);
         }
 
@@ -1863,7 +1899,7 @@ public PhysicalOperation visitGroupId(GroupIdNode node, LocalExecutionPlanContex
 
             int outputChannel = 0;
 
-            for (Symbol output : node.getGroupingSets().stream().flatMap(Collection::stream).collect(Collectors.toSet())) {
+            for (Symbol output : node.getDistinctGroupingSetSymbols()) {
                 newLayout.put(output, outputChannel++);
                 outputTypes.add(source.getTypes().get(source.getLayout().get(node.getGroupingColumns().get(output))));
             }
@@ -1926,7 +1962,7 @@ public PhysicalOperation visitMarkDistinct(MarkDistinctNode node, LocalExecution
 
             List<Integer> channels = getChannelsForSymbols(node.getDistinctSymbols(), source.getLayout());
             Optional<Integer> hashChannel = node.getHashSymbol().map(channelGetter(source));
-            MarkDistinctOperatorFactory operator = new MarkDistinctOperatorFactory(context.getNextOperatorId(), node.getId(), source.getTypes(), channels, hashChannel, joinCompiler, blockTypeOperators);
+            MarkDistinctOperatorFactory operator = new MarkDistinctOperatorFactory(context.getNextOperatorId(), node.getId(), source.getTypes(), channels, hashChannel, joinCompiler);
             return new PhysicalOperation(operator, makeLayout(node), context, source);
         }
 
@@ -1948,7 +1984,7 @@ public PhysicalOperation visitFilter(FilterNode node, LocalExecutionPlanContext
 
             if (node.getSource() instanceof TableScanNode && getStaticFilter(node.getPredicate()).isEmpty()) {
                 // filter node contains only dynamic filter, fallback to normal table scan
-                return visitTableScan((TableScanNode) node.getSource(), node.getPredicate(), context);
+                return visitTableScan(node.getId(), (TableScanNode) node.getSource(), node.getPredicate(), context);
             }
 
             Expression filterExpression = node.getPredicate();
@@ -2105,10 +2141,10 @@ private RowExpression toRowExpression(Expression expression, Map<NodeRef<Express
         @Override
         public PhysicalOperation visitTableScan(TableScanNode node, LocalExecutionPlanContext context)
         {
-            return visitTableScan(node, TRUE_LITERAL, context);
+            return visitTableScan(node.getId(), node, TRUE_LITERAL, context);
         }
 
-        private PhysicalOperation visitTableScan(TableScanNode node, Expression filterExpression, LocalExecutionPlanContext context)
+        private PhysicalOperation visitTableScan(PlanNodeId planNodeId, TableScanNode node, Expression filterExpression, LocalExecutionPlanContext context)
         {
             List<ColumnHandle> columns = new ArrayList<>();
             for (Symbol symbol : node.getOutputSymbols()) {
@@ -2116,7 +2152,7 @@ private PhysicalOperation visitTableScan(TableScanNode node, Expression filterEx
             }
 
             DynamicFilter dynamicFilter = getDynamicFilter(node, filterExpression, context);
-            OperatorFactory operatorFactory = new TableScanOperatorFactory(context.getNextOperatorId(), node.getId(), pageSourceProvider, node.getTable(), columns, dynamicFilter);
+            OperatorFactory operatorFactory = new TableScanOperatorFactory(context.getNextOperatorId(), planNodeId, node.getId(), pageSourceProvider, node.getTable(), columns, dynamicFilter);
             return new PhysicalOperation(operatorFactory, makeLayout(node), context);
         }
 
@@ -2172,10 +2208,12 @@ public PhysicalOperation visitValues(ValuesNode node, LocalExecutionPlanContext
                     Map<NodeRef<Expression>, Type> types = typeAnalyzer.getTypes(session, TypeProvider.empty(), row);
                     checkState(types.get(NodeRef.of(row)) instanceof RowType, "unexpected type of Values row: %s", types);
                     // evaluate the literal value
-                    Object result = new ExpressionInterpreter(row, plannerContext, session, types).evaluate();
+                    SqlRow result = (SqlRow) new ExpressionInterpreter(row, plannerContext, session, types).evaluate();
+                    int rawIndex = result.getRawIndex();
                     for (int j = 0; j < outputTypes.size(); j++) {
                         // divide row into fields
-                        writeNativeValue(outputTypes.get(j), pageBuilder.getBlockBuilder(j), readNativeValue(outputTypes.get(j), (SingleRowBlock) result, j));
+                        Block fieldBlock = result.getRawFieldBlock(j);
+                        writeNativeValue(outputTypes.get(j), pageBuilder.getBlockBuilder(j), readNativeValue(outputTypes.get(j), fieldBlock, rawIndex));
                     }
                 }
             }
@@ -2435,7 +2473,7 @@ public PhysicalOperation visitIndexJoin(IndexJoinNode node, LocalExecutionPlanCo
             OptionalInt totalOperatorsCount = context.getDriverInstanceCount();
             // We use spilling operator since Non-spilling one does not support index lookup sources
             lookupJoinOperatorFactory = switch (node.getType()) {
-                case INNER -> operatorFactories.spillingJoin(
+                case INNER -> spillingJoin(
                         JoinOperatorType.innerJoin(false, false),
                         context.getNextOperatorId(),
                         node.getId(),
@@ -2447,8 +2485,8 @@ public PhysicalOperation visitIndexJoin(IndexJoinNode node, LocalExecutionPlanCo
                         Optional.empty(),
                         totalOperatorsCount,
                         unsupportedPartitioningSpillerFactory(),
-                        blockTypeOperators);
-                case SOURCE_OUTER -> operatorFactories.spillingJoin(
+                        typeOperators);
+                case SOURCE_OUTER -> spillingJoin(
                         JoinOperatorType.probeOuterJoin(false),
                         context.getNextOperatorId(),
                         node.getId(),
@@ -2460,7 +2498,7 @@ public PhysicalOperation visitIndexJoin(IndexJoinNode node, LocalExecutionPlanCo
                         Optional.empty(),
                         totalOperatorsCount,
                         unsupportedPartitioningSpillerFactory(),
-                        blockTypeOperators);
+                        typeOperators);
             };
             return new PhysicalOperation(lookupJoinOperatorFactory, outputMappings.buildOrThrow(), context, probeSource);
         }
@@ -2576,31 +2614,32 @@ private Optional<Expression> removeExpressionFromFilter(Expression filter, Expre
 
         private SpatialPredicate spatialTest(FunctionCall functionCall, boolean probeFirst, Optional<ComparisonExpression.Operator> comparisonOperator)
         {
-            String functionName = ResolvedFunction.extractFunctionName(functionCall.getName()).toLowerCase(Locale.ENGLISH);
-            switch (functionName) {
-                case ST_CONTAINS:
-                    if (probeFirst) {
-                        return (buildGeometry, probeGeometry, radius) -> probeGeometry.contains(buildGeometry);
-                    }
-                    return (buildGeometry, probeGeometry, radius) -> buildGeometry.contains(probeGeometry);
-                case ST_WITHIN:
-                    if (probeFirst) {
-                        return (buildGeometry, probeGeometry, radius) -> probeGeometry.within(buildGeometry);
-                    }
-                    return (buildGeometry, probeGeometry, radius) -> buildGeometry.within(probeGeometry);
-                case ST_INTERSECTS:
-                    return (buildGeometry, probeGeometry, radius) -> buildGeometry.intersects(probeGeometry);
-                case ST_DISTANCE:
-                    if (comparisonOperator.get() == LESS_THAN) {
-                        return (buildGeometry, probeGeometry, radius) -> buildGeometry.distance(probeGeometry) < radius.getAsDouble();
-                    }
-                    if (comparisonOperator.get() == LESS_THAN_OR_EQUAL) {
-                        return (buildGeometry, probeGeometry, radius) -> buildGeometry.distance(probeGeometry) <= radius.getAsDouble();
-                    }
-                    throw new UnsupportedOperationException("Unsupported comparison operator: " + comparisonOperator.get());
-                default:
-                    throw new UnsupportedOperationException("Unsupported spatial function: " + functionName);
+            CatalogSchemaFunctionName functionName = ResolvedFunction.extractFunctionName(functionCall.getName());
+            if (functionName.equals(builtinFunctionName(ST_CONTAINS))) {
+                if (probeFirst) {
+                    return (buildGeometry, probeGeometry, radius) -> probeGeometry.contains(buildGeometry);
+                }
+                return (buildGeometry, probeGeometry, radius) -> buildGeometry.contains(probeGeometry);
+            }
+            else if (functionName.equals(builtinFunctionName(ST_WITHIN))) {
+                if (probeFirst) {
+                    return (buildGeometry, probeGeometry, radius) -> probeGeometry.within(buildGeometry);
+                }
+                return (buildGeometry, probeGeometry, radius) -> buildGeometry.within(probeGeometry);
             }
+            else if (functionName.equals(builtinFunctionName(ST_INTERSECTS))) {
+                return (buildGeometry, probeGeometry, radius) -> buildGeometry.intersects(probeGeometry);
+            }
+            else if (functionName.equals(builtinFunctionName(ST_DISTANCE))) {
+                if (comparisonOperator.orElseThrow() == LESS_THAN) {
+                    return (buildGeometry, probeGeometry, radius) -> buildGeometry.distance(probeGeometry) < radius.getAsDouble();
+                }
+                if (comparisonOperator.get() == LESS_THAN_OR_EQUAL) {
+                    return (buildGeometry, probeGeometry, radius) -> buildGeometry.distance(probeGeometry) <= radius.getAsDouble();
+                }
+                throw new UnsupportedOperationException("Unsupported comparison operator: " + comparisonOperator.get());
+            }
+            throw new UnsupportedOperationException("Unsupported spatial function: " + functionName);
         }
 
         private Set<SymbolReference> getSymbolReferences(Collection<Symbol> symbols)
@@ -2630,24 +2669,23 @@ private PhysicalOperation createNestedLoopJoin(JoinNode node, Set<DynamicFilterI
             checkArgument(partitionCount == 1, "Expected local execution to not be parallel");
 
             int operatorId = buildContext.getNextOperatorId();
-            boolean isReplicatedJoin = isBuildSideReplicated(node);
-            Optional<LocalDynamicFilterConsumer> localDynamicFilter = createDynamicFilter(buildSource, node, context, localDynamicFilters, isReplicatedJoin);
+            boolean partitioned = !isBuildSideReplicated(node);
+            Optional<LocalDynamicFilterConsumer> localDynamicFilter = createDynamicFilter(buildSource, node, context, localDynamicFilters, partitioned);
             if (localDynamicFilter.isPresent()) {
                 buildSource = createDynamicFilterSourceOperatorFactory(
                         operatorId,
                         localDynamicFilter.get(),
                         node,
-                        isReplicatedJoin,
+                        partitioned,
                         buildContext.getDriverInstanceCount().orElse(1) == 1,
                         buildSource,
                         buildContext);
             }
 
             context.addDriverFactory(
-                    buildContext.isInputDriver(),
                     false,
                     new PhysicalOperation(nestedLoopBuildOperatorFactory, buildSource),
-                    buildContext.getDriverInstanceCount());
+                    buildContext);
 
             // build output mapping
             ImmutableMap.Builder<Symbol, Integer> outputMappings = ImmutableMap.builder();
@@ -2775,10 +2813,9 @@ private PagesSpatialIndexFactory createPagesSpatialIndexFactory(
                     pagesIndexFactory);
 
             context.addDriverFactory(
-                    buildContext.isInputDriver(),
                     false,
                     new PhysicalOperation(builderOperatorFactory, buildSource),
-                    buildContext.getDriverInstanceCount());
+                    buildContext);
 
             return builderOperatorFactory.getPagesSpatialIndexFactory();
         }
@@ -2869,14 +2906,14 @@ private PhysicalOperation createLookupJoin(
                     .collect(toImmutableList());
             List<Type> buildTypes = buildSource.getTypes();
             int operatorId = buildContext.getNextOperatorId();
-            boolean isReplicatedJoin = isBuildSideReplicated(node);
-            Optional<LocalDynamicFilterConsumer> localDynamicFilter = createDynamicFilter(buildSource, node, context, localDynamicFilters, isReplicatedJoin);
+            boolean partitioned = !isBuildSideReplicated(node);
+            Optional<LocalDynamicFilterConsumer> localDynamicFilter = createDynamicFilter(buildSource, node, context, localDynamicFilters, partitioned);
             if (localDynamicFilter.isPresent()) {
                 buildSource = createDynamicFilterSourceOperatorFactory(
                         operatorId,
                         localDynamicFilter.get(),
                         node,
-                        isReplicatedJoin,
+                        partitioned,
                         buildContext.getDriverInstanceCount().orElse(1) == 1,
                         buildSource,
                         buildContext);
@@ -2899,7 +2936,7 @@ private PhysicalOperation createLookupJoin(
                                         .collect(toImmutableList()),
                                 partitionCount,
                                 buildOuter,
-                                blockTypeOperators),
+                                typeOperators),
                         buildOutputTypes);
 
                 OperatorFactory hashBuilderOperatorFactory = new HashBuilderOperatorFactory(
@@ -2923,13 +2960,12 @@ private PhysicalOperation createLookupJoin(
                                 taskConcurrency / partitionCount));
 
                 context.addDriverFactory(
-                        buildContext.isInputDriver(),
                         false,
                         new PhysicalOperation(hashBuilderOperatorFactory, buildSource),
-                        buildContext.getDriverInstanceCount());
+                        buildContext);
 
                 JoinOperatorType joinType = JoinOperatorType.ofJoinNodeType(node.getType(), outputSingleMatch, waitForBuild);
-                operator = operatorFactories.spillingJoin(
+                operator = spillingJoin(
                         joinType,
                         context.getNextOperatorId(),
                         node.getId(),
@@ -2941,7 +2977,7 @@ private PhysicalOperation createLookupJoin(
                         Optional.of(probeOutputChannels),
                         totalOperatorsCount,
                         partitioningSpillerFactory,
-                        blockTypeOperators);
+                        typeOperators);
             }
             else {
                 JoinBridgeManager<io.trino.operator.join.unspilled.PartitionedLookupSourceFactory> lookupSourceFactory = new JoinBridgeManager<>(
@@ -2954,7 +2990,7 @@ private PhysicalOperation createLookupJoin(
                                         .collect(toImmutableList()),
                                 partitionCount,
                                 buildOuter,
-                                blockTypeOperators),
+                                typeOperators),
                         buildOutputTypes);
 
                 OperatorFactory hashBuilderOperatorFactory = new HashBuilderOperator.HashBuilderOperatorFactory(
@@ -2976,13 +3012,12 @@ private PhysicalOperation createLookupJoin(
                                 taskConcurrency / partitionCount));
 
                 context.addDriverFactory(
-                        buildContext.isInputDriver(),
                         false,
                         new PhysicalOperation(hashBuilderOperatorFactory, buildSource),
-                        buildContext.getDriverInstanceCount());
+                        buildContext);
 
                 JoinOperatorType joinType = JoinOperatorType.ofJoinNodeType(node.getType(), outputSingleMatch, waitForBuild);
-                operator = operatorFactories.join(
+                operator = join(
                         joinType,
                         context.getNextOperatorId(),
                         node.getId(),
@@ -2992,7 +3027,7 @@ private PhysicalOperation createLookupJoin(
                         probeJoinChannels,
                         probeHashChannel,
                         Optional.of(probeOutputChannels),
-                        blockTypeOperators);
+                        typeOperators);
             }
 
             ImmutableMap.Builder<Symbol, Integer> outputMappings = ImmutableMap.builder();
@@ -3052,7 +3087,7 @@ private PhysicalOperation createDynamicFilterSourceOperatorFactory(
                 int operatorId,
                 LocalDynamicFilterConsumer dynamicFilter,
                 PlanNode node,
-                boolean isReplicatedJoin,
+                boolean partitioned,
                 boolean isBuildSideSingle,
                 PhysicalOperation buildSource,
                 LocalExecutionPlanContext context)
@@ -3072,10 +3107,10 @@ private PhysicalOperation createDynamicFilterSourceOperatorFactory(
                             node.getId(),
                             dynamicFilter,
                             filterBuildChannels,
-                            multipleIf(getDynamicFilteringMaxDistinctValuesPerDriver(session, isReplicatedJoin), taskConcurrency, isBuildSideSingle),
-                            multipleIf(getDynamicFilteringMaxSizePerDriver(session, isReplicatedJoin), taskConcurrency, isBuildSideSingle),
-                            multipleIf(getDynamicFilteringRangeRowLimitPerDriver(session, isReplicatedJoin), taskConcurrency, isBuildSideSingle),
-                            blockTypeOperators),
+                            multipleIf(getDynamicFilteringMaxDistinctValuesPerDriver(session, partitioned), taskConcurrency, isBuildSideSingle),
+                            multipleIf(getDynamicFilteringMaxSizePerDriver(session, partitioned), taskConcurrency, isBuildSideSingle),
+                            multipleIf(getDynamicFilteringRangeRowLimitPerDriver(session, partitioned), taskConcurrency, isBuildSideSingle),
+                            typeOperators),
                     buildSource.getLayout(),
                     context,
                     buildSource);
@@ -3096,7 +3131,7 @@ private Optional<LocalDynamicFilterConsumer> createDynamicFilter(
                 JoinNode node,
                 LocalExecutionPlanContext context,
                 Set<DynamicFilterId> localDynamicFilters,
-                boolean isReplicatedJoin)
+                boolean partitioned)
         {
             Set<DynamicFilterId> coordinatorDynamicFilters = getCoordinatorDynamicFilters(node.getDynamicFilters().keySet(), node, context.getTaskId());
             Set<DynamicFilterId> collectedDynamicFilters = ImmutableSet.<DynamicFilterId>builder()
@@ -3120,7 +3155,7 @@ private Optional<LocalDynamicFilterConsumer> createDynamicFilter(
                     buildSource.getTypes(),
                     collectedDynamicFilters,
                     collectors.build(),
-                    getDynamicFilteringMaxSizePerOperator(session, isReplicatedJoin));
+                    getDynamicFilteringMaxSizePerOperator(session, partitioned));
 
             return Optional.of(filterConsumer);
         }
@@ -3187,22 +3222,22 @@ public PhysicalOperation visitSemiJoin(SemiJoinNode node, LocalExecutionPlanCont
                 if (isCoordinatorDynamicFilter) {
                     collectors.add(getCoordinatorDynamicFilterDomainsCollector(taskContext, ImmutableSet.of(filterId)));
                 }
-                boolean isReplicatedJoin = isBuildSideReplicated(node);
+                boolean partitioned = !isBuildSideReplicated(node);
                 LocalDynamicFilterConsumer filterConsumer = new LocalDynamicFilterConsumer(
                         ImmutableMap.of(filterId, buildChannel),
                         ImmutableMap.of(filterId, buildSource.getTypes().get(buildChannel)),
                         collectors.build(),
-                        getDynamicFilteringMaxSizePerOperator(session, isReplicatedJoin));
+                        getDynamicFilteringMaxSizePerOperator(session, partitioned));
                 buildSource = new PhysicalOperation(
                         new DynamicFilterSourceOperatorFactory(
                                 operatorId,
                                 node.getId(),
                                 filterConsumer,
                                 ImmutableList.of(new DynamicFilterSourceOperator.Channel(filterId, buildSource.getTypes().get(buildChannel), buildChannel)),
-                                getDynamicFilteringMaxDistinctValuesPerDriver(session, isReplicatedJoin),
-                                getDynamicFilteringMaxSizePerDriver(session, isReplicatedJoin),
-                                getDynamicFilteringRangeRowLimitPerDriver(session, isReplicatedJoin),
-                                blockTypeOperators),
+                                getDynamicFilteringMaxDistinctValuesPerDriver(session, partitioned),
+                                getDynamicFilteringMaxSizePerDriver(session, partitioned),
+                                getDynamicFilteringRangeRowLimitPerDriver(session, partitioned),
+                                typeOperators),
                         buildSource.getLayout(),
                         buildContext,
                         buildSource);
@@ -3219,13 +3254,12 @@ public PhysicalOperation visitSemiJoin(SemiJoinNode node, LocalExecutionPlanCont
                     buildHashChannel,
                     10_000,
                     joinCompiler,
-                    blockTypeOperators);
+                    typeOperators);
             SetSupplier setProvider = setBuilderOperatorFactory.getSetProvider();
             context.addDriverFactory(
-                    buildContext.isInputDriver(),
                     false,
                     new PhysicalOperation(setBuilderOperatorFactory, buildSource),
-                    buildContext.getDriverInstanceCount());
+                    buildContext);
 
             // Source channels are always laid out first, followed by the boolean output symbol
             Map<Symbol, Integer> outputMappings = ImmutableMap.<Symbol, Integer>builder()
@@ -3267,7 +3301,11 @@ public PhysicalOperation visitRefreshMaterializedView(RefreshMaterializedViewNod
         public PhysicalOperation visitTableWriter(TableWriterNode node, LocalExecutionPlanContext context)
         {
             // Set table writer count
-            int maxWriterCount = getWriterCount(session, node.getPartitioningScheme(), node.getPreferredPartitioningScheme(), node.getSource());
+            int maxWriterCount = getWriterCount(
+                    session,
+                    node.getTarget().getWriterScalingOptions(metadata, session),
+                    node.getPartitioningScheme(),
+                    node.getSource());
             context.setDriverInstanceCount(maxWriterCount);
             context.taskContext.setMaxWriterCount(maxWriterCount);
 
@@ -3425,7 +3463,11 @@ public PhysicalOperation visitSimpleTableExecuteNode(SimpleTableExecuteNode node
         public PhysicalOperation visitTableExecute(TableExecuteNode node, LocalExecutionPlanContext context)
         {
             // Set table writer count
-            int maxWriterCount = getWriterCount(session, node.getPartitioningScheme(), node.getPreferredPartitioningScheme(), node.getSource());
+            int maxWriterCount = getWriterCount(
+                    session,
+                    node.getTarget().getWriterScalingOptions(metadata, session),
+                    node.getPartitioningScheme(),
+                    node.getSource());
             context.setDriverInstanceCount(maxWriterCount);
             context.taskContext.setMaxWriterCount(maxWriterCount);
 
@@ -3452,28 +3494,38 @@ public PhysicalOperation visitTableExecute(TableExecuteNode node, LocalExecution
             return new PhysicalOperation(operatorFactory, outputMapping.buildOrThrow(), context, source);
         }
 
-        private int getWriterCount(Session session, Optional<PartitioningScheme> partitioningScheme, Optional<PartitioningScheme> preferredPartitioningScheme, PlanNode source)
+        private int getWriterCount(Session session, WriterScalingOptions connectorScalingOptions, Optional<PartitioningScheme> partitioningScheme, PlanNode source)
         {
             // This check is required because we don't know which writer count to use when exchange is
             // single distribution. It could be possible that when scaling is enabled, a single distribution is
-            // selected for partitioned write using "task_partitioned_writer_count". However, we can't say for sure
+            // selected for partitioned write using "task_max_writer_count". However, we can't say for sure
             // whether this single distribution comes from unpartitioned or partitioned writer count.
             if (isSingleGatheringExchange(source)) {
                 return 1;
             }
 
-            if (isLocalScaledWriterExchange(source)) {
-                return partitioningScheme.or(() -> preferredPartitioningScheme)
-                        // The default value of partitioned writer count is 32 which is high enough to use it
-                        // for both cases when scaling is enabled or not. Additionally, it doesn't lead to too many
-                        // small files since when scaling is disabled only single writer will handle a single partition.
-                        .map(scheme -> getTaskPartitionedWriterCount(session))
-                        .orElseGet(() -> getTaskScaleWritersMaxWriterCount(session));
+            if (partitioningScheme.isPresent()) {
+                // The default value of partitioned writer count is 2 * number_of_cores (capped to 64) which is high
+                // enough to use it for cases with or without scaling enabled. Additionally, it doesn't lead
+                // to too many small files when scaling is disabled because single partition will be written by
+                // a single writer only.
+                int partitionedWriterCount = getTaskMaxWriterCount(session);
+                if (isLocalScaledWriterExchange(source)) {
+                    partitionedWriterCount = connectorScalingOptions.perTaskMaxScaledWriterCount()
+                            .map(writerCount -> min(writerCount, getTaskMaxWriterCount(session)))
+                            .orElse(getTaskMaxWriterCount(session));
+                }
+                return getPartitionedWriterCountBasedOnMemory(partitionedWriterCount, session);
             }
 
-            return partitioningScheme
-                    .map(scheme -> getTaskPartitionedWriterCount(session))
-                    .orElseGet(() -> getTaskWriterCount(session));
+            int unpartitionedWriterCount = getTaskMinWriterCount(session);
+            if (isLocalScaledWriterExchange(source)) {
+                unpartitionedWriterCount = connectorScalingOptions.perTaskMaxScaledWriterCount()
+                        .map(writerCount -> min(writerCount, getTaskMaxWriterCount(session)))
+                        .orElse(getTaskMaxWriterCount(session));
+            }
+            // Consider memory while calculating writer count.
+            return min(unpartitionedWriterCount, getMaxWritersBasedOnMemory(session));
         }
 
         private boolean isSingleGatheringExchange(PlanNode node)
@@ -3492,8 +3544,8 @@ public PhysicalOperation visitMergeWriter(MergeWriterNode node, LocalExecutionPl
         {
             // Todo: Implement writer scaling for merge. https://github.com/trinodb/trino/issues/14622
             int writerCount = node.getPartitioningScheme()
-                    .map(scheme -> getTaskPartitionedWriterCount(session))
-                    .orElseGet(() -> getTaskWriterCount(session));
+                    .map(scheme -> getTaskMaxWriterCount(session))
+                    .orElseGet(() -> getTaskMinWriterCount(session));
             context.setDriverInstanceCount(writerCount);
 
             PhysicalOperation source = node.getSource().accept(this, context);
@@ -3539,7 +3591,15 @@ public PhysicalOperation visitMergeProcessor(MergeProcessorNode node, LocalExecu
         @Override
         public PhysicalOperation visitTableDelete(TableDeleteNode node, LocalExecutionPlanContext context)
         {
-            OperatorFactory operatorFactory = new TableDeleteOperatorFactory(context.getNextOperatorId(), node.getId(), metadata, session, node.getTarget());
+            OperatorFactory operatorFactory = new TableMutationOperatorFactory(context.getNextOperatorId(), node.getId(), () -> metadata.executeDelete(session, node.getTarget()));
+
+            return new PhysicalOperation(operatorFactory, makeLayout(node), context);
+        }
+
+        @Override
+        public PhysicalOperation visitTableUpdate(TableUpdateNode node, LocalExecutionPlanContext context)
+        {
+            OperatorFactory operatorFactory = new TableMutationOperatorFactory(context.getNextOperatorId(), node.getId(), () -> metadata.executeUpdate(session, node.getTarget()));
 
             return new PhysicalOperation(operatorFactory, makeLayout(node), context);
         }
@@ -3616,13 +3676,13 @@ private PhysicalOperation createLocalMerge(ExchangeNode node, LocalExecutionPlan
                     ImmutableList.of(),
                     Optional.empty(),
                     maxLocalExchangeBufferSize,
-                    blockTypeOperators,
-                    getWriterMinSize(session));
+                    typeOperators,
+                    getWriterScalingMinDataProcessed(session),
+                    () -> context.getTaskContext().getQueryMemoryReservation().toBytes());
 
             List<Symbol> expectedLayout = node.getInputs().get(0);
             Function<Page, Page> pagePreprocessor = enforceLoadedLayoutProcessor(expectedLayout, source.getLayout());
             context.addDriverFactory(
-                    subContext.isInputDriver(),
                     false,
                     new PhysicalOperation(
                             new LocalExchangeSinkOperatorFactory(
@@ -3631,7 +3691,7 @@ private PhysicalOperation createLocalMerge(ExchangeNode node, LocalExecutionPlan
                                     node.getId(),
                                     pagePreprocessor),
                             source),
-                    subContext.getDriverInstanceCount());
+                    subContext);
             // the main driver is not an input... the exchange sources are the input for the plan
             context.setInputDriver(false);
 
@@ -3693,8 +3753,9 @@ else if (context.getDriverInstanceCount().isPresent()) {
                     partitionChannelTypes,
                     hashChannel,
                     maxLocalExchangeBufferSize,
-                    blockTypeOperators,
-                    getWriterMinSize(session));
+                    typeOperators,
+                    getWriterScalingMinDataProcessed(session),
+                    () -> context.getTaskContext().getQueryMemoryReservation().toBytes());
             for (int i = 0; i < node.getSources().size(); i++) {
                 DriverFactoryParameters driverFactoryParameters = driverFactoryParametersList.get(i);
                 PhysicalOperation source = driverFactoryParameters.getSource();
@@ -3704,7 +3765,6 @@ else if (context.getDriverInstanceCount().isPresent()) {
                 Function<Page, Page> pagePreprocessor = enforceLoadedLayoutProcessor(expectedLayout, source.getLayout());
 
                 context.addDriverFactory(
-                        subContext.isInputDriver(),
                         false,
                         new PhysicalOperation(
                                 new LocalExchangeSinkOperatorFactory(
@@ -3713,7 +3773,7 @@ else if (context.getDriverInstanceCount().isPresent()) {
                                         node.getId(),
                                         pagePreprocessor),
                                 source),
-                        subContext.getDriverInstanceCount());
+                        subContext);
             }
 
             // the main driver is not an input... the exchange sources are the input for the plan
@@ -3765,7 +3825,8 @@ private AggregatorFactory buildAggregatorFactory(
                     () -> generateAccumulatorFactory(
                             resolvedFunction.getSignature(),
                             aggregationImplementation,
-                            resolvedFunction.getFunctionNullability()));
+                            resolvedFunction.getFunctionNullability(),
+                            specializeAggregationLoops));
 
             if (aggregation.isDistinct()) {
                 accumulatorFactory = new DistinctAccumulatorFactory(
@@ -3774,7 +3835,6 @@ private AggregatorFactory buildAggregatorFactory(
                                 .map(channel -> source.getTypes().get(channel))
                                 .collect(toImmutableList()),
                         joinCompiler,
-                        blockTypeOperators,
                         session);
             }
 
@@ -4044,74 +4104,84 @@ private OperatorFactory createHashAggregationOperatorFactory(
                     unspillMemoryLimit,
                     spillerFactory,
                     joinCompiler,
-                    blockTypeOperators,
-                    createPartialAggregationController(step, session));
+                    typeOperators,
+                    createPartialAggregationController(maxPartialAggregationMemorySize, step, session));
         }
     }
 
-    private static Optional<PartialAggregationController> createPartialAggregationController(AggregationNode.Step step, Session session)
+    private int getPartitionedWriterCountBasedOnMemory(Session session)
+    {
+        return getPartitionedWriterCountBasedOnMemory(getTaskMaxWriterCount(session), session);
+    }
+
+    private int getPartitionedWriterCountBasedOnMemory(int partitionedWriterCount, Session session)
+    {
+        return min(partitionedWriterCount, previousPowerOfTwo(getMaxWritersBasedOnMemory(session)));
+    }
+
+    private static Optional<PartialAggregationController> createPartialAggregationController(Optional<DataSize> maxPartialAggregationMemorySize, AggregationNode.Step step, Session session)
     {
-        return step.isOutputPartial() && isAdaptivePartialAggregationEnabled(session) ?
+        return maxPartialAggregationMemorySize.isPresent() && step.isOutputPartial() && isAdaptivePartialAggregationEnabled(session) ?
                 Optional.of(new PartialAggregationController(
-                        getAdaptivePartialAggregationMinRows(session),
+                        maxPartialAggregationMemorySize.get(),
                         getAdaptivePartialAggregationUniqueRowsRatioThreshold(session))) :
                 Optional.empty();
     }
 
-    private int getDynamicFilteringMaxDistinctValuesPerDriver(Session session, boolean isReplicatedJoin)
+    private int getDynamicFilteringMaxDistinctValuesPerDriver(Session session, boolean partitioned)
     {
         if (isEnableLargeDynamicFilters(session)) {
-            if (isReplicatedJoin) {
-                return largeBroadcastMaxDistinctValuesPerDriver;
+            if (partitioned) {
+                return largePartitionedMaxDistinctValuesPerDriver;
             }
-            return largePartitionedMaxDistinctValuesPerDriver;
+            return largeMaxDistinctValuesPerDriver;
         }
-        if (isReplicatedJoin) {
-            return smallBroadcastMaxDistinctValuesPerDriver;
+        if (partitioned) {
+            return smallPartitionedMaxDistinctValuesPerDriver;
         }
-        return smallPartitionedMaxDistinctValuesPerDriver;
+        return smallMaxDistinctValuesPerDriver;
     }
 
-    private DataSize getDynamicFilteringMaxSizePerDriver(Session session, boolean isReplicatedJoin)
+    private DataSize getDynamicFilteringMaxSizePerDriver(Session session, boolean partitioned)
     {
         if (isEnableLargeDynamicFilters(session)) {
-            if (isReplicatedJoin) {
-                return largeBroadcastMaxSizePerDriver;
+            if (partitioned) {
+                return largePartitionedMaxSizePerDriver;
             }
-            return largePartitionedMaxSizePerDriver;
+            return largeMaxSizePerDriver;
         }
-        if (isReplicatedJoin) {
-            return smallBroadcastMaxSizePerDriver;
+        if (partitioned) {
+            return smallPartitionedMaxSizePerDriver;
         }
-        return smallPartitionedMaxSizePerDriver;
+        return smallMaxSizePerDriver;
     }
 
-    private int getDynamicFilteringRangeRowLimitPerDriver(Session session, boolean isReplicatedJoin)
+    private int getDynamicFilteringRangeRowLimitPerDriver(Session session, boolean partitioned)
     {
         if (isEnableLargeDynamicFilters(session)) {
-            if (isReplicatedJoin) {
-                return largeBroadcastRangeRowLimitPerDriver;
+            if (partitioned) {
+                return largePartitionedRangeRowLimitPerDriver;
             }
-            return largePartitionedRangeRowLimitPerDriver;
+            return largeRangeRowLimitPerDriver;
         }
-        if (isReplicatedJoin) {
-            return smallBroadcastRangeRowLimitPerDriver;
+        if (partitioned) {
+            return smallPartitionedRangeRowLimitPerDriver;
         }
-        return smallPartitionedRangeRowLimitPerDriver;
+        return smallRangeRowLimitPerDriver;
     }
 
-    private DataSize getDynamicFilteringMaxSizePerOperator(Session session, boolean isReplicatedJoin)
+    private DataSize getDynamicFilteringMaxSizePerOperator(Session session, boolean partitioned)
     {
         if (isEnableLargeDynamicFilters(session)) {
-            if (isReplicatedJoin) {
-                return largeBroadcastMaxSizePerOperator;
+            if (partitioned) {
+                return largePartitionedMaxSizePerOperator;
             }
-            return largePartitionedMaxSizePerOperator;
+            return largeMaxSizePerOperator;
         }
-        if (isReplicatedJoin) {
-            return smallBroadcastMaxSizePerOperator;
+        if (partitioned) {
+            return smallPartitionedMaxSizePerOperator;
         }
-        return smallPartitionedMaxSizePerOperator;
+        return smallMaxSizePerOperator;
     }
 
     private static List<Type> getTypes(List<Expression> expressions, Map<NodeRef<Expression>, Type> expressionTypes)
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/LogicalPlanner.java b/core/trino-main/src/main/java/io/trino/sql/planner/LogicalPlanner.java
index 10df69ecf35d..9ca8a04c0cc3 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/LogicalPlanner.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/LogicalPlanner.java
@@ -15,7 +15,11 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.MustBeClosed;
 import io.airlift.log.Logger;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.context.Context;
 import io.trino.Session;
 import io.trino.cost.CachingCostProvider;
 import io.trino.cost.CachingStatsProvider;
@@ -55,6 +59,7 @@
 import io.trino.sql.analyzer.RelationType;
 import io.trino.sql.analyzer.Scope;
 import io.trino.sql.planner.StatisticsAggregationPlanner.TableStatisticAggregation;
+import io.trino.sql.planner.iterative.IterativeOptimizer;
 import io.trino.sql.planner.optimizations.PlanOptimizer;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.ExplainAnalyzeNode;
@@ -91,7 +96,6 @@
 import io.trino.sql.tree.Merge;
 import io.trino.sql.tree.NodeRef;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Query;
 import io.trino.sql.tree.RefreshMaterializedView;
 import io.trino.sql.tree.Row;
@@ -99,8 +103,11 @@
 import io.trino.sql.tree.Table;
 import io.trino.sql.tree.TableExecute;
 import io.trino.sql.tree.Update;
+import io.trino.tracing.ScopedSpan;
+import io.trino.tracing.TrinoAttributes;
 import io.trino.type.TypeCoercion;
 import io.trino.type.UnknownType;
+import jakarta.annotation.Nonnull;
 
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.ArrayList;
@@ -117,10 +124,12 @@
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static com.google.common.collect.Streams.forEachPair;
 import static com.google.common.collect.Streams.zip;
 import static io.trino.SystemSessionProperties.getMaxWriterTaskCount;
 import static io.trino.SystemSessionProperties.getRetryPolicy;
 import static io.trino.SystemSessionProperties.isCollectPlanStatisticsForAllQueries;
+import static io.trino.SystemSessionProperties.isUsePreferredWritePartitioning;
 import static io.trino.metadata.MetadataUtil.createQualifiedObjectName;
 import static io.trino.spi.StandardErrorCode.CATALOG_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.CONSTRAINT_VIOLATION;
@@ -149,6 +158,7 @@
 import static io.trino.sql.planner.sanity.PlanSanityChecker.DISTRIBUTED_PLAN_SANITY_CHECKER;
 import static io.trino.sql.tree.BooleanLiteral.TRUE_LITERAL;
 import static io.trino.sql.tree.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL;
+import static io.trino.tracing.ScopedSpan.scopedSpan;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
@@ -211,11 +221,11 @@ public LogicalPlanner(
         this.metadata = plannerContext.getMetadata();
         this.typeCoercion = new TypeCoercion(plannerContext.getTypeManager()::getType);
         this.typeAnalyzer = requireNonNull(typeAnalyzer, "typeAnalyzer is null");
-        this.statisticsAggregationPlanner = new StatisticsAggregationPlanner(symbolAllocator, metadata, session);
+        this.statisticsAggregationPlanner = new StatisticsAggregationPlanner(symbolAllocator, plannerContext, session);
         this.statsCalculator = requireNonNull(statsCalculator, "statsCalculator is null");
         this.costCalculator = requireNonNull(costCalculator, "costCalculator is null");
         this.warningCollector = requireNonNull(warningCollector, "warningCollector is null");
-        this.planOptimizersStatsCollector = requireNonNull(planOptimizersStatsCollector, "queryStatsCollector is null");
+        this.planOptimizersStatsCollector = requireNonNull(planOptimizersStatsCollector, "planOptimizersStatsCollector is null");
     }
 
     public Plan plan(Analysis analysis)
@@ -230,7 +240,10 @@ public Plan plan(Analysis analysis, Stage stage)
 
     public Plan plan(Analysis analysis, Stage stage, boolean collectPlanStatistics)
     {
-        PlanNode root = planStatement(analysis, analysis.getStatement());
+        PlanNode root;
+        try (var ignored = scopedSpan(plannerContext.getTracer(), "plan")) {
+            root = planStatement(analysis, analysis.getStatement());
+        }
 
         if (LOG.isDebugEnabled()) {
             LOG.debug("Initial plan:\n%s", PlanPrinter.textLogicalPlan(
@@ -244,34 +257,25 @@ public Plan plan(Analysis analysis, Stage stage, boolean collectPlanStatistics)
                     false));
         }
 
-        planSanityChecker.validateIntermediatePlan(root, session, plannerContext, typeAnalyzer, symbolAllocator.getTypes(), warningCollector);
+        try (var ignored = scopedSpan(plannerContext.getTracer(), "validate-intermediate")) {
+            planSanityChecker.validateIntermediatePlan(root, session, plannerContext, typeAnalyzer, symbolAllocator.getTypes(), warningCollector);
+        }
 
         TableStatsProvider tableStatsProvider = new CachingTableStatsProvider(metadata, session);
 
         if (stage.ordinal() >= OPTIMIZED.ordinal()) {
-            for (PlanOptimizer optimizer : planOptimizers) {
-                root = optimizer.optimize(root, session, symbolAllocator.getTypes(), symbolAllocator, idAllocator, warningCollector, planOptimizersStatsCollector, tableStatsProvider);
-                if (root == null) {
-                    throw new NullPointerException(optimizer.getClass().getName() + " returned a null plan");
-                }
-
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("%s:\n%s", optimizer.getClass().getName(), PlanPrinter.textLogicalPlan(
-                            root,
-                            symbolAllocator.getTypes(),
-                            metadata,
-                            plannerContext.getFunctionManager(),
-                            StatsAndCosts.empty(),
-                            session,
-                            0,
-                            false));
+            try (var ignored = scopedSpan(plannerContext.getTracer(), "optimizer")) {
+                for (PlanOptimizer optimizer : planOptimizers) {
+                    root = runOptimizer(root, tableStatsProvider, optimizer);
                 }
             }
         }
 
         if (stage.ordinal() >= OPTIMIZED_AND_VALIDATED.ordinal()) {
             // make sure we produce a valid plan after optimizations run. This is mainly to catch programming errors
-            planSanityChecker.validateFinalPlan(root, session, plannerContext, typeAnalyzer, symbolAllocator.getTypes(), warningCollector);
+            try (var ignored = scopedSpan(plannerContext.getTracer(), "validate-final")) {
+                planSanityChecker.validateFinalPlan(root, session, plannerContext, typeAnalyzer, symbolAllocator.getTypes(), warningCollector);
+            }
         }
 
         TypeProvider types = symbolAllocator.getTypes();
@@ -280,11 +284,55 @@ public Plan plan(Analysis analysis, Stage stage, boolean collectPlanStatistics)
         if (collectPlanStatistics) {
             StatsProvider statsProvider = new CachingStatsProvider(statsCalculator, session, types, tableStatsProvider);
             CostProvider costProvider = new CachingCostProvider(costCalculator, statsProvider, Optional.empty(), session, types);
-            statsAndCosts = StatsAndCosts.create(root, statsProvider, costProvider);
+            try (var ignored = scopedSpan(plannerContext.getTracer(), "plan-stats")) {
+                statsAndCosts = StatsAndCosts.create(root, statsProvider, costProvider);
+            }
         }
         return new Plan(root, types, statsAndCosts);
     }
 
+    @Nonnull
+    private PlanNode runOptimizer(PlanNode root, TableStatsProvider tableStatsProvider, PlanOptimizer optimizer)
+    {
+        PlanNode result;
+        try (var ignored = optimizerSpan(optimizer)) {
+            result = optimizer.optimize(root, session, symbolAllocator.getTypes(), symbolAllocator, idAllocator, warningCollector, planOptimizersStatsCollector, tableStatsProvider);
+        }
+        if (result == null) {
+            throw new NullPointerException(optimizer.getClass().getName() + " returned a null plan");
+        }
+
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("%s:\n%s", optimizer.getClass().getName(), PlanPrinter.textLogicalPlan(
+                    result,
+                    symbolAllocator.getTypes(),
+                    metadata,
+                    plannerContext.getFunctionManager(),
+                    StatsAndCosts.empty(),
+                    session,
+                    0,
+                    false));
+        }
+
+        return result;
+    }
+
+    @MustBeClosed
+    private ScopedSpan optimizerSpan(PlanOptimizer optimizer)
+    {
+        if (!Span.fromContext(Context.current()).isRecording()) {
+            return null;
+        }
+        SpanBuilder builder = plannerContext.getTracer().spanBuilder("optimize")
+                .setAttribute(TrinoAttributes.OPTIMIZER_NAME, optimizer.getClass().getSimpleName());
+        if (optimizer instanceof IterativeOptimizer iterative) {
+            builder.setAttribute(TrinoAttributes.OPTIMIZER_RULES, iterative.getRules().stream()
+                    .map(x -> x.getClass().getSimpleName())
+                    .toList());
+        }
+        return scopedSpan(builder.startSpan());
+    }
+
     public PlanNode planStatement(Analysis analysis, Statement statement)
     {
         if ((statement instanceof CreateTableAsSelect && analysis.getCreate().orElseThrow().isCreateTableAsSelectNoOp()) ||
@@ -405,20 +453,47 @@ private RelationPlan createTableCreationPlan(Analysis analysis, Query query)
 
         Optional<TableLayout> newTableLayout = create.getLayout();
 
-        List<String> columnNames = tableMetadata.getColumns().stream()
-                .filter(column -> !column.isHidden()) // todo this filter is redundant
-                .map(ColumnMetadata::getName)
-                .collect(toImmutableList());
+        List<Symbol> visibleFieldMappings = visibleFields(plan);
 
         String catalogName = destination.getCatalogName();
         CatalogHandle catalogHandle = metadata.getCatalogHandle(session, catalogName)
                 .orElseThrow(() -> semanticException(CATALOG_NOT_FOUND, query, "Destination catalog '%s' does not exist", catalogName));
+
+        Assignments.Builder assignmentsBuilder = Assignments.builder();
+        ImmutableList.Builder<ColumnMetadata> finalColumnsBuilder = ImmutableList.builder();
+
+        checkState(tableMetadata.getColumns().size() == visibleFieldMappings.size(), "Table and visible field count doesn't match");
+
+        forEachPair(tableMetadata.getColumns().stream(), visibleFieldMappings.stream(), (column, fieldMapping) -> {
+            assignmentsBuilder.put(
+                    symbolAllocator.newSymbol(column.getName(), column.getType()),
+                    coerceOrCastToTableType(fieldMapping, column.getType(), symbolAllocator.getTypes().get(fieldMapping)));
+            finalColumnsBuilder.add(column);
+        });
+
+        List<ColumnMetadata> finalColumns = finalColumnsBuilder.build();
+        Assignments assignments = assignmentsBuilder.build();
+
+        checkState(assignments.size() == finalColumns.size(), "Assignment and column count must match");
+        List<Field> fields = finalColumns.stream()
+                .map(column -> Field.newUnqualified(column.getName(), column.getType()))
+                .collect(toImmutableList());
+
+        ProjectNode projectNode = new ProjectNode(idAllocator.getNextId(), plan.getRoot(), assignments);
+        Scope scope = Scope.builder().withRelationType(RelationId.anonymous(), new RelationType(fields)).build();
+        plan = new RelationPlan(projectNode, scope, projectNode.getOutputSymbols(), Optional.empty());
+
+        List<String> columnNames = finalColumns.stream()
+                .map(ColumnMetadata::getName)
+                .collect(toImmutableList());
+
         TableStatisticsMetadata statisticsMetadata = metadata.getStatisticsCollectionMetadataForWrite(session, catalogHandle, tableMetadata);
+
         return createTableWriterPlan(
                 analysis,
                 plan.getRoot(),
                 visibleFields(plan),
-                new CreateReference(catalogName, tableMetadata, newTableLayout),
+                new CreateReference(catalogName, tableMetadata, newTableLayout, create.isReplace()),
                 columnNames,
                 newTableLayout,
                 statisticsMetadata);
@@ -439,13 +514,7 @@ private RelationPlan getInsertPlan(
         RelationPlanner planner = new RelationPlanner(analysis, symbolAllocator, idAllocator, lambdaDeclarationToSymbolMap, plannerContext, Optional.empty(), session, ImmutableMap.of());
         RelationPlan plan = planner.process(query, null);
 
-        ImmutableList.Builder<Symbol> builder = ImmutableList.builder();
-        for (int i = 0; i < plan.getFieldMappings().size(); i++) {
-            if (!plan.getDescriptor().getFieldByIndex(i).isHidden()) {
-                builder.add(plan.getFieldMappings().get(i));
-            }
-        }
-        List<Symbol> visibleFieldMappings = builder.build();
+        List<Symbol> visibleFieldMappings = visibleFields(plan);
 
         Map<String, ColumnHandle> columns = metadata.getColumnHandles(session, tableHandle);
         Assignments.Builder assignments = Assignments.builder();
@@ -470,12 +539,7 @@ private RelationPlan getInsertPlan(
                 Symbol input = visibleFieldMappings.get(index);
                 Type queryType = symbolAllocator.getTypes().get(input);
 
-                if (queryType.equals(tableType) || typeCoercion.isTypeOnlyCoercion(queryType, tableType)) {
-                    expression = input.toSymbolReference();
-                }
-                else {
-                    expression = noTruncationCast(input.toSymbolReference(), queryType, tableType);
-                }
+                expression = coerceOrCastToTableType(input, tableType, queryType);
             }
             if (!column.isNullable()) {
                 expression = new CoalesceExpression(expression, createNullNotAllowedFailExpression(column.getName(), tableType));
@@ -497,7 +561,7 @@ private RelationPlan getInsertPlan(
         plan = planner.addRowFilters(
                 table,
                 plan,
-                failIfPredicateIsNotMet(metadata, session, PERMISSION_DENIED, AccessDeniedException.PREFIX + "Cannot insert row that does not match a row filter"),
+                failIfPredicateIsNotMet(metadata, PERMISSION_DENIED, AccessDeniedException.PREFIX + "Cannot insert row that does not match a row filter"),
                 node -> {
                     Scope accessControlScope = analysis.getAccessControlScope(table);
                     // hidden fields are not accessible in insert
@@ -550,21 +614,29 @@ private RelationPlan getInsertPlan(
                 statisticsMetadata);
     }
 
+    private Expression coerceOrCastToTableType(Symbol fieldMapping, Type tableType, Type queryType)
+    {
+        if (queryType.equals(tableType) || typeCoercion.isTypeOnlyCoercion(queryType, tableType)) {
+            return fieldMapping.toSymbolReference();
+        }
+        return noTruncationCast(fieldMapping.toSymbolReference(), queryType, tableType);
+    }
+
     private Expression createNullNotAllowedFailExpression(String columnName, Type type)
     {
-        return new Cast(failFunction(metadata, session, CONSTRAINT_VIOLATION, "NULL value not allowed for NOT NULL column: " + columnName), toSqlType(type));
+        return new Cast(failFunction(metadata, CONSTRAINT_VIOLATION, "NULL value not allowed for NOT NULL column: " + columnName), toSqlType(type));
     }
 
-    private static Function<Expression, Expression> failIfPredicateIsNotMet(Metadata metadata, Session session, ErrorCodeSupplier errorCode, String errorMessage)
+    private static Function<Expression, Expression> failIfPredicateIsNotMet(Metadata metadata, ErrorCodeSupplier errorCode, String errorMessage)
     {
-        FunctionCall fail = failFunction(metadata, session, errorCode, errorMessage);
+        FunctionCall fail = failFunction(metadata, errorCode, errorMessage);
         return predicate -> new IfExpression(predicate, TRUE_LITERAL, new Cast(fail, toSqlType(BOOLEAN)));
     }
 
-    public static FunctionCall failFunction(Metadata metadata, Session session, ErrorCodeSupplier errorCode, String errorMessage)
+    public static FunctionCall failFunction(Metadata metadata, ErrorCodeSupplier errorCode, String errorMessage)
     {
-        return FunctionCallBuilder.resolve(session, metadata)
-                .setName(QualifiedName.of("fail"))
+        return BuiltinFunctionCallBuilder.resolve(metadata)
+                .setName("fail")
                 .addArgument(INTEGER, new GenericLiteral("INTEGER", Integer.toString(errorCode.toErrorCode().getCode())))
                 .addArgument(VARCHAR, new GenericLiteral("VARCHAR", errorMessage))
                 .build();
@@ -612,7 +684,6 @@ private RelationPlan createTableWriterPlan(
             TableStatisticsMetadata statisticsMetadata)
     {
         Optional<PartitioningScheme> partitioningScheme = Optional.empty();
-        Optional<PartitioningScheme> preferredPartitioningScheme = Optional.empty();
 
         int maxWriterTasks = target.getMaxWriterTasks(plannerContext.getMetadata(), session).orElse(getMaxWriterTaskCount(session));
         Optional<Integer> maxWritersNodesCount = getRetryPolicy(session) != RetryPolicy.TASK
@@ -635,9 +706,9 @@ private RelationPlan createTableWriterPlan(
                         Partitioning.create(partitioningHandle.get(), partitionFunctionArguments),
                         outputLayout));
             }
-            else {
+            else if (isUsePreferredWritePartitioning(session)) {
                 // empty connector partitioning handle means evenly partitioning on partitioning columns
-                preferredPartitioningScheme = Optional.of(new PartitioningScheme(
+                partitioningScheme = Optional.of(new PartitioningScheme(
                         Partitioning.create(FIXED_HASH_DISTRIBUTION, partitionFunctionArguments),
                         outputLayout,
                         Optional.empty(),
@@ -673,7 +744,6 @@ private RelationPlan createTableWriterPlan(
                             symbols,
                             columnNames,
                             partitioningScheme,
-                            preferredPartitioningScheme,
                             Optional.of(partialAggregation),
                             Optional.of(result.getDescriptor().map(aggregations.getMappings()::get))),
                     target,
@@ -695,7 +765,6 @@ private RelationPlan createTableWriterPlan(
                         symbols,
                         columnNames,
                         partitioningScheme,
-                        preferredPartitioningScheme,
                         Optional.empty(),
                         Optional.empty()),
                 target,
@@ -733,7 +802,7 @@ private Expression noTruncationCast(Expression expression, Type fromType, Type t
         }
 
         checkState(fromType instanceof VarcharType || fromType instanceof CharType, "inserting non-character value to column of character type");
-        ResolvedFunction spaceTrimmedLength = metadata.resolveFunction(session, QualifiedName.of("$space_trimmed_length"), fromTypes(VARCHAR));
+        ResolvedFunction spaceTrimmedLength = metadata.resolveBuiltinFunction("$space_trimmed_length", fromTypes(VARCHAR));
 
         return new IfExpression(
                 // check if the trimmed value fits in the target type
@@ -747,7 +816,7 @@ private Expression noTruncationCast(Expression expression, Type fromType, Type t
                                 new GenericLiteral("BIGINT", "0"))),
                 new Cast(expression, toSqlType(toType)),
                 new Cast(
-                        failFunction(metadata, session, INVALID_CAST_ARGUMENT, format(
+                        failFunction(metadata, INVALID_CAST_ARGUMENT, format(
                                 "Cannot truncate non-space characters when casting from %s to %s on INSERT",
                                 fromType.getDisplayName(),
                                 toType.getDisplayName())),
@@ -840,7 +909,7 @@ private RelationPlanner getRelationPlanner(Analysis analysis)
         return new RelationPlanner(analysis, symbolAllocator, idAllocator, buildLambdaDeclarationToSymbolMap(analysis, symbolAllocator), plannerContext, Optional.empty(), session, ImmutableMap.of());
     }
 
-    private static Map<NodeRef<LambdaArgumentDeclaration>, Symbol> buildLambdaDeclarationToSymbolMap(Analysis analysis, SymbolAllocator symbolAllocator)
+    public static Map<NodeRef<LambdaArgumentDeclaration>, Symbol> buildLambdaDeclarationToSymbolMap(Analysis analysis, SymbolAllocator symbolAllocator)
     {
         Map<Key, Symbol> allocations = new HashMap<>();
         Map<NodeRef<LambdaArgumentDeclaration>, Symbol> result = new LinkedHashMap<>();
@@ -899,8 +968,11 @@ private RelationPlan createTableExecutePlan(Analysis analysis, TableExecute stat
                 .map(ColumnMetadata::getName)
                 .collect(toImmutableList());
 
-        boolean supportsReportingWrittenBytes = metadata.supportsReportingWrittenBytes(session, tableHandle);
-        TableWriterNode.TableExecuteTarget tableExecuteTarget = new TableWriterNode.TableExecuteTarget(executeHandle, Optional.empty(), tableName.asSchemaTableName(), supportsReportingWrittenBytes);
+        TableWriterNode.TableExecuteTarget tableExecuteTarget = new TableWriterNode.TableExecuteTarget(
+                executeHandle,
+                Optional.empty(),
+                tableName.asSchemaTableName(),
+                metadata.getInsertWriterScalingOptions(session, tableHandle));
 
         Optional<TableLayout> layout = metadata.getLayoutForTableExecute(session, executeHandle);
 
@@ -908,7 +980,6 @@ private RelationPlan createTableExecutePlan(Analysis analysis, TableExecute stat
 
         // todo extract common method to be used here and in createTableWriterPlan()
         Optional<PartitioningScheme> partitioningScheme = Optional.empty();
-        Optional<PartitioningScheme> preferredPartitioningScheme = Optional.empty();
         if (layout.isPresent()) {
             List<Symbol> partitionFunctionArguments = new ArrayList<>();
             layout.get().getPartitionColumns().stream()
@@ -925,13 +996,13 @@ private RelationPlan createTableExecutePlan(Analysis analysis, TableExecute stat
                         Partitioning.create(partitioningHandle.get(), partitionFunctionArguments),
                         outputLayout));
             }
-            else {
+            else if (isUsePreferredWritePartitioning(session)) {
                 // empty connector partitioning handle means evenly partitioning on partitioning columns
                 int maxWriterTasks = tableExecuteTarget.getMaxWriterTasks(plannerContext.getMetadata(), session).orElse(getMaxWriterTaskCount(session));
                 Optional<Integer> maxWritersNodesCount = getRetryPolicy(session) != RetryPolicy.TASK
                         ? Optional.of(Math.min(maxWriterTasks, getMaxWriterTaskCount(session)))
                         : Optional.empty();
-                preferredPartitioningScheme = Optional.of(new PartitioningScheme(
+                partitioningScheme = Optional.of(new PartitioningScheme(
                         Partitioning.create(FIXED_HASH_DISTRIBUTION, partitionFunctionArguments),
                         outputLayout,
                         Optional.empty(),
@@ -952,8 +1023,7 @@ private RelationPlan createTableExecutePlan(Analysis analysis, TableExecute stat
                         symbolAllocator.newSymbol("fragment", VARBINARY),
                         symbols,
                         columnNames,
-                        partitioningScheme,
-                        preferredPartitioningScheme),
+                        partitioningScheme),
                 tableExecuteTarget,
                 symbolAllocator.newSymbol("rows", BIGINT),
                 Optional.empty(),
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/LookupSymbolResolver.java b/core/trino-main/src/main/java/io/trino/sql/planner/LookupSymbolResolver.java
index e640385799a5..e2f0b1c65953 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/LookupSymbolResolver.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/LookupSymbolResolver.java
@@ -19,7 +19,6 @@
 
 import java.util.Map;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 public class LookupSymbolResolver
@@ -41,9 +40,8 @@ public LookupSymbolResolver(Map<Symbol, ColumnHandle> assignments, Map<ColumnHan
     public Object getValue(Symbol symbol)
     {
         ColumnHandle column = assignments.get(symbol);
-        checkArgument(column != null, "Missing column assignment for %s", symbol);
 
-        if (!bindings.containsKey(column)) {
+        if (column == null || !bindings.containsKey(column)) {
             return symbol.toSymbolReference();
         }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/MergePartitioningHandle.java b/core/trino-main/src/main/java/io/trino/sql/planner/MergePartitioningHandle.java
index e00f7bccf34e..95f522c66606 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/MergePartitioningHandle.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/MergePartitioningHandle.java
@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.google.common.base.VerifyException;
-import io.trino.execution.scheduler.FaultTolerantPartitioningScheme;
+import io.trino.execution.scheduler.faulttolerant.FaultTolerantPartitioningScheme;
 import io.trino.operator.BucketPartitionFunction;
 import io.trino.operator.PartitionFunction;
 import io.trino.spi.Page;
@@ -43,7 +43,6 @@
 import static io.trino.spi.connector.ConnectorMergeSink.UPDATE_INSERT_OPERATION_NUMBER;
 import static io.trino.spi.connector.ConnectorMergeSink.UPDATE_OPERATION_NUMBER;
 import static io.trino.spi.type.TinyintType.TINYINT;
-import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
 public final class MergePartitioningHandle
@@ -200,20 +199,20 @@ public MergePartitionFunction(PartitionFunction insertFunction, PartitionFunctio
             this.updateFunction = requireNonNull(updateFunction, "updateFunction is null");
             this.insertColumns = requireNonNull(insertColumns, "insertColumns is null");
             this.updateColumns = requireNonNull(updateColumns, "updateColumns is null");
-            checkArgument(insertFunction.getPartitionCount() == updateFunction.getPartitionCount(), "partition counts must match");
+            checkArgument(insertFunction.partitionCount() == updateFunction.partitionCount(), "partition counts must match");
         }
 
         @Override
-        public int getPartitionCount()
+        public int partitionCount()
         {
-            return insertFunction.getPartitionCount();
+            return insertFunction.partitionCount();
         }
 
         @Override
         public int getPartition(Page page, int position)
         {
             Block operationBlock = page.getBlock(0);
-            int operation = toIntExact(TINYINT.getLong(operationBlock, position));
+            byte operation = TINYINT.getByte(operationBlock, position);
             return switch (operation) {
                 case INSERT_OPERATION_NUMBER, UPDATE_INSERT_OPERATION_NUMBER -> insertFunction.getPartition(page.getColumns(insertColumns), position);
                 case UPDATE_OPERATION_NUMBER, DELETE_OPERATION_NUMBER, UPDATE_DELETE_OPERATION_NUMBER -> updateFunction.getPartition(page.getColumns(updateColumns), position);
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/NodePartitioningManager.java b/core/trino-main/src/main/java/io/trino/sql/planner/NodePartitioningManager.java
index 7fd019e203ea..07238eaca246 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/NodePartitioningManager.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/NodePartitioningManager.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.execution.scheduler.BucketNodeMap;
@@ -31,11 +32,9 @@
 import io.trino.spi.connector.ConnectorNodePartitioningProvider;
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.split.EmptySplit;
 import io.trino.sql.planner.SystemPartitioningHandle.SystemPartitioning;
-import io.trino.type.BlockTypeOperators;
-
-import javax.inject.Inject;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -60,17 +59,17 @@
 public class NodePartitioningManager
 {
     private final NodeScheduler nodeScheduler;
-    private final BlockTypeOperators blockTypeOperators;
+    private final TypeOperators typeOperators;
     private final CatalogServiceProvider<ConnectorNodePartitioningProvider> partitioningProvider;
 
     @Inject
     public NodePartitioningManager(
             NodeScheduler nodeScheduler,
-            BlockTypeOperators blockTypeOperators,
+            TypeOperators typeOperators,
             CatalogServiceProvider<ConnectorNodePartitioningProvider> partitioningProvider)
     {
         this.nodeScheduler = requireNonNull(nodeScheduler, "nodeScheduler is null");
-        this.blockTypeOperators = requireNonNull(blockTypeOperators, "blockTypeOperators is null");
+        this.typeOperators = requireNonNull(typeOperators, "typeOperators is null");
         this.partitioningProvider = requireNonNull(partitioningProvider, "partitioningProvider is null");
     }
 
@@ -88,7 +87,7 @@ public PartitionFunction getPartitionFunction(
                     partitionChannelTypes,
                     partitioningScheme.getHashColumn().isPresent(),
                     bucketToPartition,
-                    blockTypeOperators);
+                    typeOperators);
         }
 
         if (partitioningHandle.getConnectorHandle() instanceof MergePartitioningHandle handle) {
@@ -110,7 +109,7 @@ public PartitionFunction getPartitionFunction(Session session, PartitioningSchem
                     partitionChannelTypes,
                     partitioningScheme.getHashColumn().isPresent(),
                     bucketToPartition,
-                    blockTypeOperators);
+                    typeOperators);
         }
 
         BucketFunction bucketFunction = getBucketFunction(session, partitioningHandle, partitionChannelTypes, bucketToPartition.length);
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/OptimizerConfig.java b/core/trino-main/src/main/java/io/trino/sql/planner/OptimizerConfig.java
index d770761cb75f..46f5971c65c5 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/OptimizerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/OptimizerConfig.java
@@ -15,20 +15,22 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
+import io.airlift.configuration.ConfigHidden;
+import io.airlift.configuration.DefunctConfig;
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
-
-import javax.annotation.Nullable;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import static io.airlift.units.DataSize.Unit.GIGABYTE;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MINUTES;
 
+@DefunctConfig({"adaptive-partial-aggregation.min-rows", "preferred-write-partitioning-min-number-of-partitions", "optimizer.use-mark-distinct"})
 public class OptimizerConfig
 {
     private double cpuCostWeight = 75;
@@ -41,6 +43,7 @@ public class OptimizerConfig
 
     private JoinReorderingStrategy joinReorderingStrategy = JoinReorderingStrategy.AUTOMATIC;
     private int maxReorderedJoins = 9;
+    private int maxPrefetchedInformationSchemaPrefixes = 100;
 
     private boolean enableStatsCalculator = true;
     private boolean statisticsPrecalculationForPushdownEnabled = true;
@@ -55,18 +58,14 @@ public class OptimizerConfig
     private boolean distributedSort = true;
 
     private boolean usePreferredWritePartitioning = true;
-    private int preferredWritePartitioningMinNumberOfPartitions = 50;
 
     private Duration iterativeOptimizerTimeout = new Duration(3, MINUTES); // by default let optimizer wait a long time in case it retrieves some data from ConnectorMetadata
 
     private boolean optimizeMetadataQueries;
-    private boolean optimizeHashGeneration = true;
+    private boolean optimizeHashGeneration;
     private boolean pushTableWriteThroughUnion = true;
     private boolean dictionaryAggregation;
-    @Nullable
-    private Boolean useMarkDistinct;
-    @Nullable
-    private MarkDistinctStrategy markDistinctStrategy;
+    private MarkDistinctStrategy markDistinctStrategy = MarkDistinctStrategy.AUTOMATIC;
     private boolean preferPartialAggregation = true;
     private boolean pushAggregationThroughOuterJoin = true;
     private boolean enableIntermediateAggregations;
@@ -90,7 +89,6 @@ public class OptimizerConfig
     private boolean useCostBasedPartitioning = true;
     // adaptive partial aggregation
     private boolean adaptivePartialAggregationEnabled = true;
-    private long adaptivePartialAggregationMinRows = 100_000;
     private double adaptivePartialAggregationUniqueRowsRatioThreshold = 0.8;
     private long joinPartitionedBuildMinRowCount = 1_000_000L;
     private DataSize minInputSizePerTask = DataSize.of(5, GIGABYTE);
@@ -231,6 +229,21 @@ public OptimizerConfig setMaxReorderedJoins(int maxReorderedJoins)
         return this;
     }
 
+    @Min(1)
+    public int getMaxPrefetchedInformationSchemaPrefixes()
+    {
+        return maxPrefetchedInformationSchemaPrefixes;
+    }
+
+    @Config("optimizer.experimental-max-prefetched-information-schema-prefixes")
+    @ConfigHidden
+    @ConfigDescription("Experimental: maximum number of internal \"prefixes\" to be prefetched when optimizing information_schema queries")
+    public OptimizerConfig setMaxPrefetchedInformationSchemaPrefixes(int maxPrefetchedInformationSchemaPrefixes)
+    {
+        this.maxPrefetchedInformationSchemaPrefixes = maxPrefetchedInformationSchemaPrefixes;
+        return this;
+    }
+
     public boolean isEnableStatsCalculator()
     {
         return enableStatsCalculator;
@@ -372,20 +385,6 @@ public OptimizerConfig setUsePreferredWritePartitioning(boolean usePreferredWrit
         return this;
     }
 
-    @Min(1)
-    public int getPreferredWritePartitioningMinNumberOfPartitions()
-    {
-        return preferredWritePartitioningMinNumberOfPartitions;
-    }
-
-    @Config("preferred-write-partitioning-min-number-of-partitions")
-    @ConfigDescription("Use preferred write partitioning when the number of written partitions exceeds the configured threshold")
-    public OptimizerConfig setPreferredWritePartitioningMinNumberOfPartitions(int preferredWritePartitioningMinNumberOfPartitions)
-    {
-        this.preferredWritePartitioningMinNumberOfPartitions = preferredWritePartitioningMinNumberOfPartitions;
-        return this;
-    }
-
     public Duration getIterativeOptimizerTimeout()
     {
         return iterativeOptimizerTimeout;
@@ -473,21 +472,6 @@ public OptimizerConfig setOptimizeMetadataQueries(boolean optimizeMetadataQuerie
         return this;
     }
 
-    @Deprecated
-    @Nullable
-    public Boolean isUseMarkDistinct()
-    {
-        return useMarkDistinct;
-    }
-
-    @Deprecated
-    @LegacyConfig(value = "optimizer.use-mark-distinct", replacedBy = "optimizer.mark-distinct-strategy")
-    public OptimizerConfig setUseMarkDistinct(Boolean value)
-    {
-        this.useMarkDistinct = value;
-        return this;
-    }
-
     @Nullable
     public MarkDistinctStrategy getMarkDistinctStrategy()
     {
@@ -723,19 +707,6 @@ public OptimizerConfig setAdaptivePartialAggregationEnabled(boolean adaptivePart
         return this;
     }
 
-    public long getAdaptivePartialAggregationMinRows()
-    {
-        return adaptivePartialAggregationMinRows;
-    }
-
-    @Config("adaptive-partial-aggregation.min-rows")
-    @ConfigDescription("Minimum number of processed rows before partial aggregation might be adaptively turned off")
-    public OptimizerConfig setAdaptivePartialAggregationMinRows(long adaptivePartialAggregationMinRows)
-    {
-        this.adaptivePartialAggregationMinRows = adaptivePartialAggregationMinRows;
-        return this;
-    }
-
     public double getAdaptivePartialAggregationUniqueRowsRatioThreshold()
     {
         return adaptivePartialAggregationUniqueRowsRatioThreshold;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/OptimizerStatsMBeanExporter.java b/core/trino-main/src/main/java/io/trino/sql/planner/OptimizerStatsMBeanExporter.java
index 7344ca1e32f4..e1bd37e2891c 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/OptimizerStatsMBeanExporter.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/OptimizerStatsMBeanExporter.java
@@ -14,19 +14,18 @@
 package io.trino.sql.planner;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.trino.sql.planner.iterative.IterativeOptimizer;
 import io.trino.sql.planner.iterative.RuleStats;
 import io.trino.sql.planner.optimizations.OptimizerStats;
 import io.trino.sql.planner.optimizations.PlanOptimizer;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.MBeanExport;
 import org.weakref.jmx.MBeanExporter;
 import org.weakref.jmx.ObjectNames;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/Partitioning.java b/core/trino-main/src/main/java/io/trino/sql/planner/Partitioning.java
index 78977f68e400..44bf49249a69 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/Partitioning.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/Partitioning.java
@@ -17,14 +17,13 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.Session;
 import io.trino.metadata.Metadata;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.SymbolReference;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -200,19 +199,6 @@ public boolean isEffectivelySinglePartition(Set<Symbol> knownConstants)
         return isPartitionedOn(ImmutableSet.of(), knownConstants);
     }
 
-    public boolean isRepartitionEffective(Collection<Symbol> keys, Set<Symbol> knownConstants)
-    {
-        Set<Symbol> keysWithoutConstants = keys.stream()
-                .filter(symbol -> !knownConstants.contains(symbol))
-                .collect(toImmutableSet());
-        Set<Symbol> nonConstantArgs = arguments.stream()
-                .filter(ArgumentBinding::isVariable)
-                .map(ArgumentBinding::getColumn)
-                .filter(symbol -> !knownConstants.contains(symbol))
-                .collect(toImmutableSet());
-        return !nonConstantArgs.equals(keysWithoutConstants);
-    }
-
     public Partitioning translate(Function<Symbol, Symbol> translator)
     {
         return new Partitioning(handle, arguments.stream()
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/PlanFragment.java b/core/trino-main/src/main/java/io/trino/sql/planner/PlanFragment.java
index da1c27ac7e39..4b51a8edff02 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/PlanFragment.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/PlanFragment.java
@@ -17,16 +17,16 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.connector.CatalogProperties;
 import io.trino.cost.StatsAndCosts;
+import io.trino.metadata.LanguageScalarFunctionData;
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.plan.PlanFragmentId;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.planner.plan.RemoteSourceNode;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -53,6 +53,7 @@ public class PlanFragment
     private final PartitioningScheme outputPartitioningScheme;
     private final StatsAndCosts statsAndCosts;
     private final List<CatalogProperties> activeCatalogs;
+    private final List<LanguageScalarFunctionData> languageFunctions;
     private final Optional<String> jsonRepresentation;
 
     // Only for creating instances without the JSON representation embedded
@@ -69,7 +70,8 @@ private PlanFragment(
             List<RemoteSourceNode> remoteSourceNodes,
             PartitioningScheme outputPartitioningScheme,
             StatsAndCosts statsAndCosts,
-            List<CatalogProperties> activeCatalogs)
+            List<CatalogProperties> activeCatalogs,
+            List<LanguageScalarFunctionData> languageFunctions)
     {
         this.id = requireNonNull(id, "id is null");
         this.root = requireNonNull(root, "root is null");
@@ -84,6 +86,7 @@ private PlanFragment(
         this.outputPartitioningScheme = requireNonNull(outputPartitioningScheme, "outputPartitioningScheme is null");
         this.statsAndCosts = requireNonNull(statsAndCosts, "statsAndCosts is null");
         this.activeCatalogs = requireNonNull(activeCatalogs, "activeCatalogs is null");
+        this.languageFunctions = requireNonNull(languageFunctions, "languageFunctions is null");
         this.jsonRepresentation = Optional.empty();
     }
 
@@ -98,6 +101,7 @@ public PlanFragment(
             @JsonProperty("outputPartitioningScheme") PartitioningScheme outputPartitioningScheme,
             @JsonProperty("statsAndCosts") StatsAndCosts statsAndCosts,
             @JsonProperty("activeCatalogs") List<CatalogProperties> activeCatalogs,
+            @JsonProperty("languageFunctions") List<LanguageScalarFunctionData> languageFunctions,
             @JsonProperty("jsonRepresentation") Optional<String> jsonRepresentation)
     {
         this.id = requireNonNull(id, "id is null");
@@ -109,6 +113,7 @@ public PlanFragment(
         this.partitionedSourcesSet = ImmutableSet.copyOf(partitionedSources);
         this.statsAndCosts = requireNonNull(statsAndCosts, "statsAndCosts is null");
         this.activeCatalogs = requireNonNull(activeCatalogs, "activeCatalogs is null");
+        this.languageFunctions = requireNonNull(languageFunctions, "languageFunctions is null");
         this.jsonRepresentation = requireNonNull(jsonRepresentation, "jsonRepresentation is null");
 
         checkArgument(
@@ -191,6 +196,12 @@ public List<CatalogProperties> getActiveCatalogs()
         return activeCatalogs;
     }
 
+    @JsonProperty
+    public List<LanguageScalarFunctionData> getLanguageFunctions()
+    {
+        return languageFunctions;
+    }
+
     @JsonProperty
     public Optional<String> getJsonRepresentation()
     {
@@ -217,7 +228,8 @@ public PlanFragment withoutEmbeddedJsonRepresentation()
                 this.remoteSourceNodes,
                 this.outputPartitioningScheme,
                 this.statsAndCosts,
-                this.activeCatalogs);
+                this.activeCatalogs,
+                this.languageFunctions);
     }
 
     public List<Type> getTypes()
@@ -271,7 +283,18 @@ private static void findRemoteSourceNodes(PlanNode node, ImmutableList.Builder<R
 
     public PlanFragment withBucketToPartition(Optional<int[]> bucketToPartition)
     {
-        return new PlanFragment(id, root, symbols, partitioning, partitionCount, partitionedSources, outputPartitioningScheme.withBucketToPartition(bucketToPartition), statsAndCosts, activeCatalogs, jsonRepresentation);
+        return new PlanFragment(
+                id,
+                root,
+                symbols,
+                partitioning,
+                partitionCount,
+                partitionedSources,
+                outputPartitioningScheme.withBucketToPartition(bucketToPartition),
+                statsAndCosts,
+                activeCatalogs,
+                languageFunctions,
+                jsonRepresentation);
     }
 
     @Override
@@ -285,4 +308,52 @@ public String toString()
                 .add("outputPartitioningScheme", outputPartitioningScheme)
                 .toString();
     }
+
+    public PlanFragment withPartitionCount(Optional<Integer> partitionCount)
+    {
+        return new PlanFragment(
+                this.id,
+                this.root,
+                this.symbols,
+                this.partitioning,
+                partitionCount,
+                this.partitionedSources,
+                this.outputPartitioningScheme,
+                this.statsAndCosts,
+                this.activeCatalogs,
+                this.languageFunctions,
+                this.jsonRepresentation);
+    }
+
+    public PlanFragment withOutputPartitioningScheme(PartitioningScheme outputPartitioningScheme)
+    {
+        return new PlanFragment(
+                this.id,
+                this.root,
+                this.symbols,
+                this.partitioning,
+                this.partitionCount,
+                this.partitionedSources,
+                outputPartitioningScheme,
+                this.statsAndCosts,
+                this.activeCatalogs,
+                this.languageFunctions,
+                this.jsonRepresentation);
+    }
+
+    public PlanFragment withRoot(PlanNode root)
+    {
+        return new PlanFragment(
+                this.id,
+                root,
+                this.symbols,
+                this.partitioning,
+                this.partitionCount,
+                this.partitionedSources,
+                this.outputPartitioningScheme,
+                this.statsAndCosts,
+                this.activeCatalogs,
+                this.languageFunctions,
+                this.jsonRepresentation);
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/PlanFragmentIdAllocator.java b/core/trino-main/src/main/java/io/trino/sql/planner/PlanFragmentIdAllocator.java
new file mode 100644
index 000000000000..66baf1b7f702
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/PlanFragmentIdAllocator.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.sql.planner;
+
+import io.trino.sql.planner.plan.PlanFragmentId;
+
+public class PlanFragmentIdAllocator
+{
+    private int nextId;
+
+    public PlanFragmentIdAllocator(int startId)
+    {
+        this.nextId = startId;
+    }
+
+    public PlanFragmentId getNextId()
+    {
+        return new PlanFragmentId(Integer.toString(nextId++));
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/PlanFragmenter.java b/core/trino-main/src/main/java/io/trino/sql/planner/PlanFragmenter.java
index 6f164e14cdf4..48ccb73292b3 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/PlanFragmenter.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/PlanFragmenter.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.connector.CatalogProperties;
 import io.trino.cost.StatsAndCosts;
@@ -24,6 +25,8 @@
 import io.trino.metadata.CatalogInfo;
 import io.trino.metadata.CatalogManager;
 import io.trino.metadata.FunctionManager;
+import io.trino.metadata.LanguageFunctionManager;
+import io.trino.metadata.LanguageScalarFunctionData;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.TableHandle;
 import io.trino.metadata.TableProperties.TablePartitioning;
@@ -50,12 +53,11 @@
 import io.trino.sql.planner.plan.TableFunctionNode;
 import io.trino.sql.planner.plan.TableFunctionProcessorNode;
 import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.TableUpdateNode;
 import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.sql.planner.plan.ValuesNode;
 import io.trino.transaction.TransactionManager;
 
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -89,13 +91,14 @@
 public class PlanFragmenter
 {
     private static final String TOO_MANY_STAGES_MESSAGE = "" +
-            "If the query contains multiple aggregates with DISTINCT over different columns, please set the 'use_mark_distinct' session property to false. " +
+            "If the query contains multiple aggregates with DISTINCT over different columns, please set the 'mark_distinct_strategy' session property to 'none'. " +
             "If the query contains WITH clauses that are referenced more than once, please create temporary table(s) for the queries in those clauses.";
 
     private final Metadata metadata;
     private final FunctionManager functionManager;
     private final TransactionManager transactionManager;
     private final CatalogManager catalogManager;
+    private final LanguageFunctionManager languageFunctionManager;
     private final int stageCountWarningThreshold;
 
     @Inject
@@ -104,6 +107,7 @@ public PlanFragmenter(
             FunctionManager functionManager,
             TransactionManager transactionManager,
             CatalogManager catalogManager,
+            LanguageFunctionManager languageFunctionManager,
             QueryManagerConfig queryManagerConfig)
     {
         this.metadata = requireNonNull(metadata, "metadata is null");
@@ -111,6 +115,7 @@ public PlanFragmenter(
         this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
         this.catalogManager = requireNonNull(catalogManager, "catalogManager is null");
         this.stageCountWarningThreshold = requireNonNull(queryManagerConfig, "queryManagerConfig is null").getStageCountWarningThreshold();
+        this.languageFunctionManager = requireNonNull(languageFunctionManager, "languageFunctionManager is null");
     }
 
     public SubPlan createSubPlans(Session session, Plan plan, boolean forceSingleNode, WarningCollector warningCollector)
@@ -119,7 +124,8 @@ public SubPlan createSubPlans(Session session, Plan plan, boolean forceSingleNod
                 .map(CatalogInfo::getCatalogHandle)
                 .flatMap(catalogHandle -> catalogManager.getCatalogProperties(catalogHandle).stream())
                 .collect(toImmutableList());
-        Fragmenter fragmenter = new Fragmenter(session, metadata, functionManager, plan.getTypes(), plan.getStatsAndCosts(), activeCatalogs);
+        List<LanguageScalarFunctionData> languageScalarFunctions = languageFunctionManager.serializeFunctionsForWorkers(session);
+        Fragmenter fragmenter = new Fragmenter(session, metadata, functionManager, plan.getTypes(), plan.getStatsAndCosts(), activeCatalogs, languageScalarFunctions);
 
         FragmentProperties properties = new FragmentProperties(new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), plan.getRoot().getOutputSymbols()));
         if (forceSingleNode || isForceSingleNodeOutput(session)) {
@@ -195,6 +201,7 @@ private SubPlan reassignPartitioningHandleIfNecessaryHelper(Session session, Sub
                         outputPartitioningScheme.getPartitionCount()),
                 fragment.getStatsAndCosts(),
                 fragment.getActiveCatalogs(),
+                fragment.getLanguageFunctions(),
                 fragment.getJsonRepresentation());
 
         ImmutableList.Builder<SubPlan> childrenBuilder = ImmutableList.builder();
@@ -215,9 +222,17 @@ private static class Fragmenter
         private final TypeProvider types;
         private final StatsAndCosts statsAndCosts;
         private final List<CatalogProperties> activeCatalogs;
-        private int nextFragmentId = ROOT_FRAGMENT_ID + 1;
+        private final List<LanguageScalarFunctionData> languageFunctions;
+        private final PlanFragmentIdAllocator idAllocator = new PlanFragmentIdAllocator(ROOT_FRAGMENT_ID + 1);
 
-        public Fragmenter(Session session, Metadata metadata, FunctionManager functionManager, TypeProvider types, StatsAndCosts statsAndCosts, List<CatalogProperties> activeCatalogs)
+        public Fragmenter(
+                Session session,
+                Metadata metadata,
+                FunctionManager functionManager,
+                TypeProvider types,
+                StatsAndCosts statsAndCosts,
+                List<CatalogProperties> activeCatalogs,
+                List<LanguageScalarFunctionData> languageFunctions)
         {
             this.session = requireNonNull(session, "session is null");
             this.metadata = requireNonNull(metadata, "metadata is null");
@@ -225,6 +240,7 @@ public Fragmenter(Session session, Metadata metadata, FunctionManager functionMa
             this.types = requireNonNull(types, "types is null");
             this.statsAndCosts = requireNonNull(statsAndCosts, "statsAndCosts is null");
             this.activeCatalogs = requireNonNull(activeCatalogs, "activeCatalogs is null");
+            this.languageFunctions = requireNonNull(languageFunctions, "languageFunctions is null");
         }
 
         public SubPlan buildRootFragment(PlanNode root, FragmentProperties properties)
@@ -232,11 +248,6 @@ public SubPlan buildRootFragment(PlanNode root, FragmentProperties properties)
             return buildFragment(root, properties, new PlanFragmentId(String.valueOf(ROOT_FRAGMENT_ID)));
         }
 
-        private PlanFragmentId nextFragmentId()
-        {
-            return new PlanFragmentId(String.valueOf(nextFragmentId++));
-        }
-
         private SubPlan buildFragment(PlanNode root, FragmentProperties properties, PlanFragmentId fragmentId)
         {
             Set<Symbol> dependencies = SymbolsExtractor.extractOutputSymbols(root);
@@ -257,6 +268,7 @@ private SubPlan buildFragment(PlanNode root, FragmentProperties properties, Plan
                     properties.getPartitioningScheme(),
                     statsAndCosts.getForSubplan(root),
                     activeCatalogs,
+                    languageFunctions,
                     Optional.of(jsonFragmentPlan(root, symbols, metadata, functionManager, session)));
 
             return new SubPlan(fragment, properties.getChildren());
@@ -307,6 +319,13 @@ public PlanNode visitTableDelete(TableDeleteNode node, RewriteContext<FragmentPr
             return context.defaultRewrite(node, context.get());
         }
 
+        @Override
+        public PlanNode visitTableUpdate(TableUpdateNode node, RewriteContext<FragmentProperties> context)
+        {
+            context.get().setCoordinatorOnlyDistribution();
+            return context.defaultRewrite(node, context.get());
+        }
+
         @Override
         public PlanNode visitTableScan(TableScanNode node, RewriteContext<FragmentProperties> context)
         {
@@ -434,7 +453,7 @@ else if (exchange.getType() == ExchangeNode.Type.REPARTITION) {
 
         private SubPlan buildSubPlan(PlanNode node, FragmentProperties properties, RewriteContext<FragmentProperties> context)
         {
-            PlanFragmentId planFragmentId = nextFragmentId();
+            PlanFragmentId planFragmentId = idAllocator.getNextId();
             PlanNode child = context.rewrite(node, properties);
             return buildFragment(child, properties, planFragmentId);
         }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/PlanNodeIdAllocator.java b/core/trino-main/src/main/java/io/trino/sql/planner/PlanNodeIdAllocator.java
index 8dc20992d65d..330e0e60a44f 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/PlanNodeIdAllocator.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/PlanNodeIdAllocator.java
@@ -19,6 +19,16 @@ public class PlanNodeIdAllocator
 {
     private int nextId;
 
+    public PlanNodeIdAllocator()
+    {
+        this(0);
+    }
+
+    public PlanNodeIdAllocator(int startId)
+    {
+        this.nextId = startId;
+    }
+
     public PlanNodeId getNextId()
     {
         return new PlanNodeId(Integer.toString(nextId++));
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/PlanOptimizers.java b/core/trino-main/src/main/java/io/trino/sql/planner/PlanOptimizers.java
index ca534c4a696c..3a1b8ba82e7d 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/PlanOptimizers.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/PlanOptimizers.java
@@ -16,6 +16,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.SystemSessionProperties;
 import io.trino.cost.CostCalculator;
 import io.trino.cost.CostCalculator.EstimatedExchanges;
@@ -34,8 +35,6 @@
 import io.trino.sql.planner.iterative.rule.AddDynamicFilterSource;
 import io.trino.sql.planner.iterative.rule.AddExchangesBelowPartialAggregationOverGroupIdRuleSet;
 import io.trino.sql.planner.iterative.rule.AddIntermediateAggregations;
-import io.trino.sql.planner.iterative.rule.ApplyPreferredTableExecutePartitioning;
-import io.trino.sql.planner.iterative.rule.ApplyPreferredTableWriterPartitioning;
 import io.trino.sql.planner.iterative.rule.ApplyTableScanRedirection;
 import io.trino.sql.planner.iterative.rule.ArraySortAfterArrayDistinct;
 import io.trino.sql.planner.iterative.rule.CanonicalizeExpressions;
@@ -161,6 +160,7 @@
 import io.trino.sql.planner.iterative.rule.PushLimitThroughSemiJoin;
 import io.trino.sql.planner.iterative.rule.PushLimitThroughUnion;
 import io.trino.sql.planner.iterative.rule.PushMergeWriterDeleteIntoConnector;
+import io.trino.sql.planner.iterative.rule.PushMergeWriterUpdateIntoConnector;
 import io.trino.sql.planner.iterative.rule.PushOffsetThroughProject;
 import io.trino.sql.planner.iterative.rule.PushPartialAggregationThroughExchange;
 import io.trino.sql.planner.iterative.rule.PushPartialAggregationThroughJoin;
@@ -256,8 +256,6 @@
 import io.trino.sql.planner.optimizations.UnaliasSymbolReferences;
 import io.trino.sql.planner.optimizations.WindowFilterPushDown;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -757,16 +755,6 @@ public PlanOptimizers(
                         statsCalculator,
                         costCalculator,
                         ImmutableSet.of(new RemoveRedundantIdentityProjections())),
-                // Prefer write partitioning rule requires accurate stats.
-                // Run it before reorder joins which also depends on accurate stats.
-                new IterativeOptimizer(
-                        plannerContext,
-                        ruleStats,
-                        statsCalculator,
-                        costCalculator,
-                        ImmutableSet.of(
-                                new ApplyPreferredTableWriterPartitioning(),
-                                new ApplyPreferredTableExecutePartitioning())),
                 // Because ReorderJoins runs only once,
                 // PredicatePushDown, columnPruningOptimizer and RemoveRedundantIdentityProjections
                 // need to run beforehand in order to produce an optimal join order
@@ -809,6 +797,7 @@ public PlanOptimizers(
                 ImmutableSet.of(
                         // Must run before AddExchanges
                         new PushMergeWriterDeleteIntoConnector(metadata),
+                        new PushMergeWriterUpdateIntoConnector(plannerContext, typeAnalyzer, metadata),
                         new DetermineTableScanNodePartitioning(metadata, nodePartitioningManager, taskCountEstimator),
                         // Must run after join reordering because join reordering creates
                         // new join nodes without JoinNode.maySkipOutputDuplicates flag set
@@ -868,7 +857,7 @@ public PlanOptimizers(
             builder.add(new UnaliasSymbolReferences(metadata));
             builder.add(new StatsRecordingPlanOptimizer(optimizerStats, new AddExchanges(plannerContext, typeAnalyzer, statsCalculator, taskCountEstimator)));
             // It can only run after AddExchanges since it estimates the hash partition count for all remote exchanges
-            builder.add(new StatsRecordingPlanOptimizer(optimizerStats, new DeterminePartitionCount(statsCalculator)));
+            builder.add(new StatsRecordingPlanOptimizer(optimizerStats, new DeterminePartitionCount(statsCalculator, taskCountEstimator)));
         }
 
         // use cost calculator without estimated exchanges after AddExchanges
@@ -910,7 +899,6 @@ public PlanOptimizers(
         // pushdown into the connectors. Invoke PredicatePushdown and PushPredicateIntoTableScan after this
         // to leverage predicate pushdown on projected columns and to pushdown dynamic filters.
         builder.add(new StatsRecordingPlanOptimizer(optimizerStats, new PredicatePushDown(plannerContext, typeAnalyzer, true, true)));
-        builder.add(new RemoveUnsupportedDynamicFilters(plannerContext)); // Remove unsupported dynamic filters introduced by PredicatePushdown
         builder.add(new IterativeOptimizer(
                 plannerContext,
                 ruleStats,
@@ -921,6 +909,9 @@ public PlanOptimizers(
                         .add(new PushPredicateIntoTableScan(plannerContext, typeAnalyzer, false))
                         .add(new RemoveRedundantPredicateAboveTableScan(plannerContext, typeAnalyzer))
                         .build()));
+        // Remove unsupported dynamic filters introduced by PredicatePushdown. Also, cleanup dynamic filters removed by
+        // PushPredicateIntoTableScan and RemoveRedundantPredicateAboveTableScan due to those rules replacing table scans with empty ValuesNode
+        builder.add(new RemoveUnsupportedDynamicFilters(plannerContext));
         builder.add(inlineProjections);
         builder.add(new UnaliasSymbolReferences(metadata)); // Run unalias after merging projections to simplify projections more efficiently
         builder.add(columnPruningOptimizer);
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/QueryPlanner.java b/core/trino-main/src/main/java/io/trino/sql/planner/QueryPlanner.java
index 70bc48c193ff..bee7e1aba871 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/QueryPlanner.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/QueryPlanner.java
@@ -98,7 +98,6 @@
 import io.trino.sql.tree.Offset;
 import io.trino.sql.tree.OrderBy;
 import io.trino.sql.tree.PatternRecognitionRelation.RowsPerMatch;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Query;
 import io.trino.sql.tree.QuerySpecification;
 import io.trino.sql.tree.Relation;
@@ -117,6 +116,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -137,6 +137,7 @@
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.SystemSessionProperties.getMaxRecursionDepth;
 import static io.trino.SystemSessionProperties.isSkipRedundantSort;
+import static io.trino.spi.StandardErrorCode.CONSTRAINT_VIOLATION;
 import static io.trino.spi.StandardErrorCode.INVALID_ARGUMENTS;
 import static io.trino.spi.StandardErrorCode.INVALID_WINDOW_FRAME;
 import static io.trino.spi.StandardErrorCode.MERGE_TARGET_ROW_MULTIPLE_MATCHES;
@@ -149,6 +150,7 @@
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
+import static io.trino.sql.ExpressionUtils.and;
 import static io.trino.sql.NodeUtils.getSortItemsFromOrderBy;
 import static io.trino.sql.analyzer.ExpressionAnalyzer.isNumericType;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
@@ -314,7 +316,7 @@ public RelationPlan planExpand(Query query)
         // 1. append window to count rows
         NodeAndMappings checkConvergenceStep = copy(recursionStep, mappings);
         Symbol countSymbol = symbolAllocator.newSymbol("count", BIGINT);
-        ResolvedFunction function = plannerContext.getMetadata().resolveFunction(session, QualifiedName.of("count"), ImmutableList.of());
+        ResolvedFunction function = plannerContext.getMetadata().resolveBuiltinFunction("count", ImmutableList.of());
         WindowNode.Function countFunction = new WindowNode.Function(function, ImmutableList.of(), DEFAULT_FRAME, false);
 
         WindowNode windowNode = new WindowNode(
@@ -334,7 +336,7 @@ public RelationPlan planExpand(Query query)
                         countSymbol.toSymbolReference(),
                         new GenericLiteral("BIGINT", "0")),
                 new Cast(
-                        failFunction(plannerContext.getMetadata(), session, NOT_SUPPORTED, recursionLimitExceededMessage),
+                        failFunction(plannerContext.getMetadata(), NOT_SUPPORTED, recursionLimitExceededMessage),
                         toSqlType(BOOLEAN)),
                 TRUE_LITERAL);
         FilterNode filterNode = new FilterNode(idAllocator.getNextId(), windowNode, predicate);
@@ -544,10 +546,10 @@ public PlanNode plan(Delete node)
             Symbol symbol = relationPlan.getFieldMappings().get(fieldIndex);
             columnSymbolsBuilder.add(symbol);
             if (mergeAnalysis.getRedistributionColumnHandles().contains(columnHandle)) {
-                assignmentsBuilder.put(symbol, symbol.toSymbolReference());
+                assignmentsBuilder.putIdentity(symbol);
             }
             else {
-                assignmentsBuilder.put(symbol, new NullLiteral());
+                assignmentsBuilder.put(symbol, new Cast(new NullLiteral(), toSqlType(symbolAllocator.getTypes().get(symbol))));
             }
         }
         List<Symbol> columnSymbols = columnSymbolsBuilder.build();
@@ -627,12 +629,15 @@ public PlanNode plan(Update node)
         // The integer merge case number, always 0 for update
         Metadata metadata = plannerContext.getMetadata();
         ImmutableList.Builder<Expression> rowBuilder = ImmutableList.builder();
+        Assignments.Builder assignments = Assignments.builder();
 
         // Add column values to the rowBuilder - - the SET expression value for updated
         // columns, and the existing column value for non-updated columns
         for (int columnIndex = 0; columnIndex < mergeAnalysis.getDataColumnHandles().size(); columnIndex++) {
             ColumnHandle dataColumnHandle = mergeAnalysis.getDataColumnHandles().get(columnIndex);
             ColumnSchema columnSchema = mergeAnalysis.getDataColumnSchemas().get(columnIndex);
+            int fieldNumber = mergeAnalysis.getColumnHandleFieldNumbers().get(dataColumnHandle);
+            Symbol field = relationPlan.getFieldMappings().get(fieldNumber);
             int index = updatedColumnHandles.indexOf(dataColumnHandle);
             if (index >= 0) {
                 // This column is updated...
@@ -644,17 +649,21 @@ public PlanNode plan(Update node)
                 // If the updated column is non-null, check that the value is not null
                 if (mergeAnalysis.getNonNullableColumnHandles().contains(dataColumnHandle)) {
                     String columnName = columnSchema.getName();
-                    rewritten = new CoalesceExpression(rewritten, new Cast(failFunction(metadata, session, INVALID_ARGUMENTS, "NULL value not allowed for NOT NULL column: " + columnName), toSqlType(columnSchema.getType())));
+                    rewritten = new CoalesceExpression(rewritten, new Cast(failFunction(metadata, INVALID_ARGUMENTS, "NULL value not allowed for NOT NULL column: " + columnName), toSqlType(columnSchema.getType())));
                 }
                 rowBuilder.add(rewritten);
+                assignments.put(field, rewritten);
             }
             else {
                 // Get the non-updated column value from the table
-                Integer fieldNumber = requireNonNull(mergeAnalysis.getColumnHandleFieldNumbers().get(dataColumnHandle), "Field number for ColumnHandle is null");
-                rowBuilder.add(relationPlan.getFieldMappings().get(fieldNumber).toSymbolReference());
+                rowBuilder.add(field.toSymbolReference());
+                assignments.putIdentity(field);
             }
         }
 
+        FieldReference rowIdReference = analysis.getRowIdField(mergeAnalysis.getTargetTable());
+        assignments.putIdentity(relationPlan.getFieldMappings().get(rowIdReference.getFieldIndex()));
+
         // Add the "present" field
         rowBuilder.add(new GenericLiteral("BOOLEAN", "TRUE"));
 
@@ -667,6 +676,15 @@ public PlanNode plan(Update node)
         // Finally, the merge row is complete
         Expression mergeRow = new Row(rowBuilder.build());
 
+        List<Expression> constraints = analysis.getCheckConstraints(table);
+        if (!constraints.isEmpty()) {
+            subPlanBuilder = subPlanBuilder.withNewRoot(new ProjectNode(
+                    idAllocator.getNextId(),
+                    subPlanBuilder.getRoot(),
+                    assignments.build()));
+            subPlanBuilder = addCheckConstraints(constraints, subPlanBuilder);
+        }
+
         // Build the page, containing:
         // The write redistribution columns if any
         // For partitioned or bucketed tables, a long hash value column.
@@ -674,7 +692,6 @@ public PlanNode plan(Update node)
         // The merge case RowBlock
         // The integer case number block, always 0 for update
         // The byte is_distinct block, always true for update
-        FieldReference rowIdReference = analysis.getRowIdField(mergeAnalysis.getTargetTable());
         Symbol rowIdSymbol = relationPlan.getFieldMappings().get(rowIdReference.getFieldIndex());
         Symbol mergeRowSymbol = symbolAllocator.newSymbol("merge_row", mergeAnalysis.getMergeRowType());
         Symbol caseNumberSymbol = symbolAllocator.newSymbol("case_number", INTEGER);
@@ -686,11 +703,11 @@ public PlanNode plan(Update node)
         for (ColumnHandle column : mergeAnalysis.getRedistributionColumnHandles()) {
             int fieldIndex = requireNonNull(mergeAnalysis.getColumnHandleFieldNumbers().get(column), "Could not find fieldIndex for redistribution column");
             Symbol symbol = relationPlan.getFieldMappings().get(fieldIndex);
-            projectionAssignmentsBuilder.put(symbol, symbol.toSymbolReference());
+            projectionAssignmentsBuilder.putIdentity(symbol);
         }
 
         // Add the rest of the page columns: rowId, merge row, case number and is_distinct
-        projectionAssignmentsBuilder.put(rowIdSymbol, rowIdSymbol.toSymbolReference());
+        projectionAssignmentsBuilder.putIdentity(rowIdSymbol);
         projectionAssignmentsBuilder.put(mergeRowSymbol, mergeRow);
         projectionAssignmentsBuilder.put(caseNumberSymbol, new GenericLiteral("INTEGER", "0"));
         projectionAssignmentsBuilder.put(isDistinctSymbol, TRUE_LITERAL);
@@ -700,6 +717,26 @@ public PlanNode plan(Update node)
         return createMergePipeline(table, relationPlan, projectNode, rowIdSymbol, mergeRowSymbol);
     }
 
+    private PlanBuilder addCheckConstraints(List<Expression> constraints, PlanBuilder subPlanBuilder)
+    {
+        PlanBuilder constraintBuilder = subPlanBuilder.appendProjections(constraints, symbolAllocator, idAllocator);
+
+        List<Expression> predicates = new ArrayList<>();
+        for (Expression constraint : constraints) {
+            Expression symbol = constraintBuilder.translate(constraint).toSymbolReference();
+
+            Expression predicate = new IfExpression(
+                    // When predicate evaluates to UNKNOWN (e.g. NULL > 100), it should not violate the check constraint.
+                    new CoalesceExpression(coerceIfNecessary(analysis, symbol, symbol), TRUE_LITERAL),
+                    TRUE_LITERAL,
+                    new Cast(failFunction(plannerContext.getMetadata(), CONSTRAINT_VIOLATION, "Check constraint violation: " + constraint), toSqlType(BOOLEAN)));
+
+            predicates.add(predicate);
+        }
+
+        return subPlanBuilder.withNewRoot(new FilterNode(idAllocator.getNextId(), constraintBuilder.getRoot(), and(predicates)));
+    }
+
     public MergeWriterNode plan(Merge merge)
     {
         MergeAnalysis mergeAnalysis = analysis.getMergeAnalysis().orElseThrow(() -> new IllegalArgumentException("analysis.getMergeAnalysis() isn't present"));
@@ -739,6 +776,9 @@ public MergeWriterNode plan(Merge merge)
 
         PlanBuilder subPlan = newPlanBuilder(joinPlan, analysis, lambdaDeclarationToSymbolMap, session, plannerContext);
 
+        FieldReference rowIdReference = analysis.getRowIdField(mergeAnalysis.getTargetTable());
+        Symbol rowIdSymbol = planWithPresentColumn.getFieldMappings().get(rowIdReference.getFieldIndex());
+
         // Build the SearchedCaseExpression that creates the project merge_row
         Metadata metadata = plannerContext.getMetadata();
         List<ColumnSchema> dataColumnSchemas = mergeAnalysis.getDataColumnSchemas();
@@ -756,25 +796,28 @@ public MergeWriterNode plan(Merge merge)
             }
 
             ImmutableList.Builder<Expression> rowBuilder = ImmutableList.builder();
+            Assignments.Builder assignments = Assignments.builder();
             List<ColumnHandle> mergeCaseSetColumns = mergeCaseColumnsHandles.get(caseNumber);
             for (ColumnHandle dataColumnHandle : mergeAnalysis.getDataColumnHandles()) {
                 int index = mergeCaseSetColumns.indexOf(dataColumnHandle);
+                int fieldNumber = mergeAnalysis.getColumnHandleFieldNumbers().get(dataColumnHandle);
+                Symbol field = planWithPresentColumn.getFieldMappings().get(fieldNumber);
                 if (index >= 0) {
                     Expression setExpression = mergeCase.getSetExpressions().get(index);
                     subPlan = subqueryPlanner.handleSubqueries(subPlan, setExpression, analysis.getSubqueries(merge));
                     Expression rewritten = subPlan.rewrite(setExpression);
                     rewritten = coerceIfNecessary(analysis, setExpression, rewritten);
                     if (nonNullableColumnHandles.contains(dataColumnHandle)) {
-                        int fieldIndex = requireNonNull(mergeAnalysis.getColumnHandleFieldNumbers().get(dataColumnHandle), "Could not find fieldIndex for non nullable column");
-                        ColumnSchema columnSchema = dataColumnSchemas.get(fieldIndex);
+                        ColumnSchema columnSchema = dataColumnSchemas.get(fieldNumber);
                         String columnName = columnSchema.getName();
-                        rewritten = new CoalesceExpression(rewritten, new Cast(failFunction(metadata, session, INVALID_ARGUMENTS, "Assigning NULL to non-null MERGE target table column " + columnName), toSqlType(columnSchema.getType())));
+                        rewritten = new CoalesceExpression(rewritten, new Cast(failFunction(metadata, INVALID_ARGUMENTS, "Assigning NULL to non-null MERGE target table column " + columnName), toSqlType(columnSchema.getType())));
                     }
                     rowBuilder.add(rewritten);
+                    assignments.put(field, rewritten);
                 }
                 else {
-                    Integer fieldNumber = requireNonNull(mergeAnalysis.getColumnHandleFieldNumbers().get(dataColumnHandle), "Field number for ColumnHandle is null");
-                    rowBuilder.add(planWithPresentColumn.getFieldMappings().get(fieldNumber).toSymbolReference());
+                    rowBuilder.add(field.toSymbolReference());
+                    assignments.putIdentity(field);
                 }
             }
 
@@ -800,6 +843,19 @@ public MergeWriterNode plan(Merge merge)
             }
 
             whenClauses.add(new WhenClause(condition, new Row(rowBuilder.build())));
+
+            List<Expression> constraints = analysis.getCheckConstraints(mergeAnalysis.getTargetTable());
+            if (!constraints.isEmpty()) {
+                assignments.putIdentity(uniqueIdSymbol);
+                assignments.putIdentity(presentColumn);
+                assignments.putIdentity(rowIdSymbol);
+                assignments.putIdentities(source.getFieldMappings());
+                subPlan = subPlan.withNewRoot(new ProjectNode(
+                        idAllocator.getNextId(),
+                        subPlan.getRoot(),
+                        assignments.build()));
+                subPlan = addCheckConstraints(constraints, subPlan.withScope(targetTablePlan.getScope(), targetTablePlan.getFieldMappings()));
+            }
         }
 
         // Build the "else" clause for the SearchedCaseExpression
@@ -814,8 +870,6 @@ public MergeWriterNode plan(Merge merge)
 
         SearchedCaseExpression caseExpression = new SearchedCaseExpression(whenClauses.build(), Optional.of(new Row(rowBuilder.build())));
 
-        FieldReference rowIdReference = analysis.getRowIdField(mergeAnalysis.getTargetTable());
-        Symbol rowIdSymbol = planWithPresentColumn.getFieldMappings().get(rowIdReference.getFieldIndex());
         Symbol mergeRowSymbol = symbolAllocator.newSymbol("merge_row", mergeAnalysis.getMergeRowType());
         Symbol caseNumberSymbol = symbolAllocator.newSymbol("case_number", INTEGER);
 
@@ -824,10 +878,10 @@ public MergeWriterNode plan(Merge merge)
         for (ColumnHandle column : mergeAnalysis.getRedistributionColumnHandles()) {
             int fieldIndex = requireNonNull(mergeAnalysis.getColumnHandleFieldNumbers().get(column), "Could not find fieldIndex for redistribution column");
             Symbol symbol = planWithPresentColumn.getFieldMappings().get(fieldIndex);
-            projectionAssignmentsBuilder.put(symbol, symbol.toSymbolReference());
+            projectionAssignmentsBuilder.putIdentity(symbol);
         }
-        projectionAssignmentsBuilder.put(uniqueIdSymbol, uniqueIdSymbol.toSymbolReference());
-        projectionAssignmentsBuilder.put(rowIdSymbol, rowIdSymbol.toSymbolReference());
+        projectionAssignmentsBuilder.putIdentity(uniqueIdSymbol);
+        projectionAssignmentsBuilder.putIdentity(rowIdSymbol);
         projectionAssignmentsBuilder.put(mergeRowSymbol, caseExpression);
 
         ProjectNode subPlanProject = new ProjectNode(
@@ -854,7 +908,7 @@ public MergeWriterNode plan(Merge merge)
                         new NotExpression(isDistinctSymbol.toSymbolReference()),
                         new IsNotNullPredicate(uniqueIdSymbol.toSymbolReference())),
                 new Cast(
-                        failFunction(metadata, session, MERGE_TARGET_ROW_MULTIPLE_MATCHES, "One MERGE target table row matched more than one source row"),
+                        failFunction(metadata, MERGE_TARGET_ROW_MULTIPLE_MATCHES, "One MERGE target table row matched more than one source row"),
                         toSqlType(BOOLEAN)),
                 TRUE_LITERAL);
 
@@ -880,7 +934,7 @@ private MergeWriterNode createMergePipeline(Table table, RelationPlan relationPl
                     columnNamesBuilder.add(columnSchema.getName());
                 });
         MergeParadigmAndTypes mergeParadigmAndTypes = new MergeParadigmAndTypes(Optional.of(paradigm), typesBuilder.build(), columnNamesBuilder.build(), rowIdType);
-        MergeTarget mergeTarget = new MergeTarget(handle, Optional.empty(), metadata.getTableMetadata(session, handle).getTable(), mergeParadigmAndTypes);
+        MergeTarget mergeTarget = new MergeTarget(handle, Optional.empty(), metadata.getTableName(session, handle).getSchemaTableName(), mergeParadigmAndTypes);
 
         ImmutableList.Builder<Symbol> columnSymbolsBuilder = ImmutableList.builder();
         for (ColumnHandle columnHandle : mergeAnalysis.getDataColumnHandles()) {
@@ -1102,7 +1156,7 @@ private GroupingSetsPlan planGroupingSets(PlanBuilder subPlan, QuerySpecificatio
             groupingSetMappings.put(output, input);
         }
 
-        Map<ScopeAware<Expression>, Symbol> complexExpressions = new HashMap<>();
+        Map<ScopeAware<Expression>, Symbol> complexExpressions = new LinkedHashMap<>();
         for (Expression expression : groupingSetAnalysis.getComplexExpressions()) {
             if (!complexExpressions.containsKey(scopeAwareKey(expression, analysis, subPlan.getScope()))) {
                 Symbol input = subPlan.translate(expression);
@@ -1274,13 +1328,21 @@ private static List<Set<FieldId>> enumerateGroupingSets(GroupingSetAnalysis grou
     {
         List<List<Set<FieldId>>> partialSets = new ArrayList<>();
 
-        for (Set<FieldId> cube : groupingSetAnalysis.getCubes()) {
-            partialSets.add(ImmutableList.copyOf(Sets.powerSet(cube)));
+        for (List<Set<FieldId>> cube : groupingSetAnalysis.getCubes()) {
+            List<Set<FieldId>> sets = Sets.powerSet(ImmutableSet.copyOf(cube)).stream()
+                    .map(set -> set.stream()
+                            .flatMap(Collection::stream)
+                            .collect(toImmutableSet()))
+                    .collect(toImmutableList());
+
+            partialSets.add(sets);
         }
 
-        for (List<FieldId> rollup : groupingSetAnalysis.getRollups()) {
+        for (List<Set<FieldId>> rollup : groupingSetAnalysis.getRollups()) {
             List<Set<FieldId>> sets = IntStream.rangeClosed(0, rollup.size())
-                    .mapToObj(i -> ImmutableSet.copyOf(rollup.subList(0, i)))
+                    .mapToObj(prefixLength -> rollup.subList(0, prefixLength).stream()
+                            .flatMap(Collection::stream)
+                            .collect(toImmutableSet()))
                     .collect(toImmutableList());
 
             partialSets.add(sets);
@@ -1343,11 +1405,13 @@ private PlanBuilder planWindowFunctions(Node node, PlanBuilder subPlan, List<Fun
             return subPlan;
         }
 
-        for (FunctionCall windowFunction : scopeAwareDistinct(subPlan, windowFunctions)) {
-            checkArgument(windowFunction.getFilter().isEmpty(), "Window functions cannot have filter");
+        Map<ResolvedWindow, List<FunctionCall>> functions = scopeAwareDistinct(subPlan, windowFunctions)
+                .stream()
+                .collect(Collectors.groupingBy(analysis::getWindow));
 
-            ResolvedWindow window = analysis.getWindow(windowFunction);
-            checkState(window != null, "no resolved window for: " + windowFunction);
+        for (Map.Entry<ResolvedWindow, List<FunctionCall>> entry : functions.entrySet()) {
+            ResolvedWindow window = entry.getKey();
+            List<FunctionCall> functionCalls = entry.getValue();
 
             // Pre-project inputs.
             // Predefined window parts (specified in WINDOW clause) can only use source symbols, and no output symbols.
@@ -1356,9 +1420,6 @@ private PlanBuilder planWindowFunctions(Node node, PlanBuilder subPlan, List<Fun
             // This issue is solved by analyzing window definitions in the source scope. After analysis, the expressions
             // are recorded as belonging to the source scope, and consequentially source symbols will be used to plan them.
             ImmutableList.Builder<Expression> inputsBuilder = ImmutableList.<Expression>builder()
-                    .addAll(windowFunction.getArguments().stream()
-                            .filter(argument -> !(argument instanceof LambdaExpression)) // lambda expression is generated at execution time
-                            .collect(Collectors.toList()))
                     .addAll(window.getPartitionBy())
                     .addAll(getSortItemsFromOrderBy(window.getOrderBy()).stream()
                             .map(SortItem::getSortKey)
@@ -1373,6 +1434,12 @@ private PlanBuilder planWindowFunctions(Node node, PlanBuilder subPlan, List<Fun
                 }
             }
 
+            for (FunctionCall windowFunction : functionCalls) {
+                inputsBuilder.addAll(windowFunction.getArguments().stream()
+                                .filter(argument -> !(argument instanceof LambdaExpression)) // lambda expression is generated at execution time
+                                .collect(Collectors.toList()));
+            }
+
             List<Expression> inputs = inputsBuilder.build();
 
             subPlan = subqueryPlanner.handleSubqueries(subPlan, inputs, analysis.getSubqueries(node));
@@ -1433,10 +1500,10 @@ else if (window.getFrame().isPresent()) {
             if (window.getFrame().isPresent() && window.getFrame().get().getPattern().isPresent()) {
                 WindowFrame frame = window.getFrame().get();
                 subPlan = subqueryPlanner.handleSubqueries(subPlan, extractPatternRecognitionExpressions(frame.getVariableDefinitions(), frame.getMeasures()), analysis.getSubqueries(node));
-                subPlan = planPatternRecognition(subPlan, windowFunction, window, coercions, frameEnd);
+                subPlan = planPatternRecognition(subPlan, functionCalls, window, coercions, frameEnd);
             }
             else {
-                subPlan = planWindow(subPlan, windowFunction, window, coercions, frameStart, sortKeyCoercedForFrameStartComparison, frameEnd, sortKeyCoercedForFrameEndComparison);
+                subPlan = planWindow(subPlan, functionCalls, window, coercions, frameStart, sortKeyCoercedForFrameStartComparison, frameEnd, sortKeyCoercedForFrameEndComparison);
             }
         }
 
@@ -1466,7 +1533,7 @@ private FrameBoundPlanAndSymbols planFrameBound(PlanBuilder subPlan, PlanAndMapp
                         zeroOffset),
                 TRUE_LITERAL,
                 new Cast(
-                        failFunction(plannerContext.getMetadata(), session, INVALID_WINDOW_FRAME, "Window frame offset value must not be negative or null"),
+                        failFunction(plannerContext.getMetadata(), INVALID_WINDOW_FRAME, "Window frame offset value must not be negative or null"),
                         toSqlType(BOOLEAN)));
         subPlan = subPlan.withNewRoot(new FilterNode(
                 idAllocator.getNextId(),
@@ -1566,7 +1633,7 @@ private FrameOffsetPlanAndSymbol planFrameOffset(PlanBuilder subPlan, Optional<S
                 new ComparisonExpression(GREATER_THAN_OR_EQUAL, offsetSymbol.toSymbolReference(), zeroOffset),
                 TRUE_LITERAL,
                 new Cast(
-                        failFunction(plannerContext.getMetadata(), session, INVALID_WINDOW_FRAME, "Window frame offset value must not be negative or null"),
+                        failFunction(plannerContext.getMetadata(), INVALID_WINDOW_FRAME, "Window frame offset value must not be negative or null"),
                         toSqlType(BOOLEAN)));
         subPlan = subPlan.withNewRoot(new FilterNode(
                 idAllocator.getNextId(),
@@ -1636,7 +1703,7 @@ private static Expression zeroOfType(Type type)
 
     private PlanBuilder planWindow(
             PlanBuilder subPlan,
-            FunctionCall windowFunction,
+            List<FunctionCall> windowFunctions,
             ResolvedWindow window,
             PlanAndMappings coercions,
             Optional<Symbol> frameStartSymbol,
@@ -1678,33 +1745,41 @@ private PlanBuilder planWindow(
                 frameStartExpression,
                 frameEndExpression);
 
-        Symbol newSymbol = symbolAllocator.newSymbol(windowFunction, analysis.getType(windowFunction));
+        ImmutableMap.Builder<ScopeAware<Expression>, Symbol> mappings = ImmutableMap.builder();
+        ImmutableMap.Builder<Symbol, WindowNode.Function> functions = ImmutableMap.builder();
 
-        NullTreatment nullTreatment = windowFunction.getNullTreatment()
-                .orElse(NullTreatment.RESPECT);
+        for (FunctionCall windowFunction : windowFunctions) {
+            Symbol newSymbol = symbolAllocator.newSymbol(windowFunction, analysis.getType(windowFunction));
 
-        WindowNode.Function function = new WindowNode.Function(
-                analysis.getResolvedFunction(windowFunction),
-                windowFunction.getArguments().stream()
-                        .map(argument -> {
-                            if (argument instanceof LambdaExpression) {
-                                return subPlan.rewrite(argument);
-                            }
-                            return coercions.get(argument).toSymbolReference();
-                        })
-                        .collect(toImmutableList()),
-                frame,
-                nullTreatment == NullTreatment.IGNORE);
+            NullTreatment nullTreatment = windowFunction.getNullTreatment()
+                    .orElse(NullTreatment.RESPECT);
+
+            WindowNode.Function function = new WindowNode.Function(
+                    analysis.getResolvedFunction(windowFunction),
+                    windowFunction.getArguments().stream()
+                            .map(argument -> {
+                                if (argument instanceof LambdaExpression) {
+                                    return subPlan.rewrite(argument);
+                                }
+                                return coercions.get(argument).toSymbolReference();
+                            })
+                            .collect(toImmutableList()),
+                    frame,
+                    nullTreatment == NullTreatment.IGNORE);
+
+            functions.put(newSymbol, function);
+            mappings.put(scopeAwareKey(windowFunction, analysis, subPlan.getScope()), newSymbol);
+        }
 
         // create window node
         return new PlanBuilder(
                 subPlan.getTranslations()
-                        .withAdditionalMappings(ImmutableMap.of(scopeAwareKey(windowFunction, analysis, subPlan.getScope()), newSymbol)),
+                        .withAdditionalMappings(mappings.buildOrThrow()),
                 new WindowNode(
                         idAllocator.getNextId(),
                         subPlan.getRoot(),
                         specification,
-                        ImmutableMap.of(newSymbol, function),
+                        functions.buildOrThrow(),
                         Optional.empty(),
                         ImmutableSet.of(),
                         0));
@@ -1712,7 +1787,7 @@ private PlanBuilder planWindow(
 
     private PlanBuilder planPatternRecognition(
             PlanBuilder subPlan,
-            FunctionCall windowFunction,
+            List<FunctionCall> windowFunctions,
             ResolvedWindow window,
             PlanAndMappings coercions,
             Optional<Symbol> frameEndSymbol)
@@ -1733,23 +1808,31 @@ private PlanBuilder planPatternRecognition(
                 Optional.empty(),
                 frameEnd.getValue());
 
-        Symbol newSymbol = symbolAllocator.newSymbol(windowFunction, analysis.getType(windowFunction));
+        ImmutableMap.Builder<ScopeAware<Expression>, Symbol> mappings = ImmutableMap.builder();
+        ImmutableMap.Builder<Symbol, WindowNode.Function> functions = ImmutableMap.builder();
 
-        NullTreatment nullTreatment = windowFunction.getNullTreatment()
-                .orElse(NullTreatment.RESPECT);
+        for (FunctionCall windowFunction : windowFunctions) {
+            Symbol newSymbol = symbolAllocator.newSymbol(windowFunction, analysis.getType(windowFunction));
 
-        WindowNode.Function function = new WindowNode.Function(
-                analysis.getResolvedFunction(windowFunction),
-                windowFunction.getArguments().stream()
-                        .map(argument -> {
-                            if (argument instanceof LambdaExpression) {
-                                return subPlan.rewrite(argument);
-                            }
-                            return coercions.get(argument).toSymbolReference();
-                        })
-                        .collect(toImmutableList()),
-                baseFrame,
-                nullTreatment == NullTreatment.IGNORE);
+            NullTreatment nullTreatment = windowFunction.getNullTreatment()
+                    .orElse(NullTreatment.RESPECT);
+
+            WindowNode.Function function = new WindowNode.Function(
+                    analysis.getResolvedFunction(windowFunction),
+                    windowFunction.getArguments().stream()
+                            .map(argument -> {
+                                if (argument instanceof LambdaExpression) {
+                                    return subPlan.rewrite(argument);
+                                }
+                                return coercions.get(argument).toSymbolReference();
+                            })
+                            .collect(toImmutableList()),
+                    baseFrame,
+                    nullTreatment == NullTreatment.IGNORE);
+
+            functions.put(newSymbol, function);
+            mappings.put(scopeAwareKey(windowFunction, analysis, subPlan.getScope()), newSymbol);
+        }
 
         PatternRecognitionComponents components = new RelationPlanner(analysis, symbolAllocator, idAllocator, lambdaDeclarationToSymbolMap, plannerContext, outerContext, session, recursiveSubqueries)
                 .planPatternRecognitionComponents(
@@ -1764,7 +1847,7 @@ private PlanBuilder planPatternRecognition(
         // create pattern recognition node
         return new PlanBuilder(
                 subPlan.getTranslations()
-                        .withAdditionalMappings(ImmutableMap.of(scopeAwareKey(windowFunction, analysis, subPlan.getScope()), newSymbol)),
+                        .withAdditionalMappings(mappings.buildOrThrow()),
                 new PatternRecognitionNode(
                         idAllocator.getNextId(),
                         subPlan.getRoot(),
@@ -1772,7 +1855,7 @@ private PlanBuilder planPatternRecognition(
                         Optional.empty(),
                         ImmutableSet.of(),
                         0,
-                        ImmutableMap.of(newSymbol, function),
+                        functions.buildOrThrow(),
                         components.getMeasures(),
                         Optional.of(baseFrame),
                         RowsPerMatch.WINDOW,
@@ -2064,7 +2147,7 @@ private PlanBuilder distinct(PlanBuilder subPlan, QuerySpecification node, List<
 
     private Optional<OrderingScheme> orderingScheme(PlanBuilder subPlan, Optional<OrderBy> orderBy, List<Expression> orderByExpressions)
     {
-        if (orderBy.isEmpty() || (isSkipRedundantSort(session)) && analysis.isOrderByRedundant(orderBy.get())) {
+        if (orderBy.isEmpty() || (isSkipRedundantSort(session) && analysis.isOrderByRedundant(orderBy.get()))) {
             return Optional.empty();
         }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/RelationPlanner.java b/core/trino-main/src/main/java/io/trino/sql/planner/RelationPlanner.java
index fbe2a093e905..a88fa26caf75 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/RelationPlanner.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/RelationPlanner.java
@@ -22,7 +22,6 @@
 import io.trino.metadata.TableFunctionHandle;
 import io.trino.metadata.TableHandle;
 import io.trino.spi.connector.ColumnHandle;
-import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.sql.ExpressionUtils;
@@ -313,7 +312,7 @@ public RelationPlan addCheckConstraints(List<Expression> constraints, Table node
                     // When predicate evaluates to UNKNOWN (e.g. NULL > 100), it should not violate the check constraint.
                     new CoalesceExpression(coerceIfNecessary(analysis, constraint, planBuilder.rewrite(constraint)), TRUE_LITERAL),
                     TRUE_LITERAL,
-                    new Cast(failFunction(plannerContext.getMetadata(), session, CONSTRAINT_VIOLATION, "Check constraint violation: " + constraint), toSqlType(BOOLEAN)));
+                    new Cast(failFunction(plannerContext.getMetadata(), CONSTRAINT_VIOLATION, "Check constraint violation: " + constraint), toSqlType(BOOLEAN)));
 
             planBuilder = planBuilder.withNewRoot(new FilterNode(
                     idAllocator.getNextId(),
@@ -476,7 +475,6 @@ else if (tableArgument.getPartitionBy().isPresent()) {
                 functionAnalysis.getCopartitioningLists(),
                 new TableFunctionHandle(
                         functionAnalysis.getCatalogHandle(),
-                        new SchemaFunctionName(functionAnalysis.getSchemaName(), functionAnalysis.getFunctionName()),
                         functionAnalysis.getConnectorTableFunctionHandle(),
                         functionAnalysis.getTransactionHandle()));
 
@@ -977,13 +975,13 @@ If casts are redundant (due to column type and common type being equal),
         for (int field : joinAnalysis.getOtherLeftFields()) {
             Symbol symbol = left.getFieldMappings().get(field);
             outputs.add(symbol);
-            assignments.put(symbol, symbol.toSymbolReference());
+            assignments.putIdentity(symbol);
         }
 
         for (int field : joinAnalysis.getOtherRightFields()) {
             Symbol symbol = right.getFieldMappings().get(field);
             outputs.add(symbol);
-            assignments.put(symbol, symbol.toSymbolReference());
+            assignments.putIdentity(symbol);
         }
 
         return new RelationPlan(
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/ResolvedFunctionCallBuilder.java b/core/trino-main/src/main/java/io/trino/sql/planner/ResolvedFunctionCallBuilder.java
new file mode 100644
index 000000000000..2f6781f6e80f
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/ResolvedFunctionCallBuilder.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed 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 io.trino.sql.planner;
+
+import io.trino.metadata.ResolvedFunction;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.FunctionCall;
+import io.trino.sql.tree.NodeLocation;
+import io.trino.sql.tree.OrderBy;
+import io.trino.sql.tree.Window;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public class ResolvedFunctionCallBuilder
+{
+    private final ResolvedFunction resolvedFunction;
+    private List<Expression> argumentValues = new ArrayList<>();
+    private Optional<NodeLocation> location = Optional.empty();
+    private Optional<Window> window = Optional.empty();
+    private Optional<Expression> filter = Optional.empty();
+    private Optional<OrderBy> orderBy = Optional.empty();
+    private boolean distinct;
+
+    public static ResolvedFunctionCallBuilder builder(ResolvedFunction resolvedFunction)
+    {
+        return new ResolvedFunctionCallBuilder(resolvedFunction);
+    }
+
+    private ResolvedFunctionCallBuilder(ResolvedFunction resolvedFunction)
+    {
+        this.resolvedFunction = requireNonNull(resolvedFunction, "resolvedFunction is null");
+    }
+
+    public ResolvedFunctionCallBuilder addArgument(Expression value)
+    {
+        requireNonNull(value, "value is null");
+        argumentValues.add(value);
+        return this;
+    }
+
+    public ResolvedFunctionCallBuilder setArguments(List<Expression> values)
+    {
+        requireNonNull(values, "values is null");
+        argumentValues = new ArrayList<>(values);
+        return this;
+    }
+
+    public ResolvedFunctionCallBuilder setLocation(NodeLocation location)
+    {
+        this.location = Optional.of(requireNonNull(location, "location is null"));
+        return this;
+    }
+
+    public ResolvedFunctionCallBuilder setWindow(Window window)
+    {
+        this.window = Optional.of(requireNonNull(window, "window is null"));
+        return this;
+    }
+
+    public ResolvedFunctionCallBuilder setWindow(Optional<Window> window)
+    {
+        this.window = requireNonNull(window, "window is null");
+        return this;
+    }
+
+    public ResolvedFunctionCallBuilder setFilter(Expression filter)
+    {
+        this.filter = Optional.of(requireNonNull(filter, "filter is null"));
+        return this;
+    }
+
+    public ResolvedFunctionCallBuilder setFilter(Optional<Expression> filter)
+    {
+        this.filter = requireNonNull(filter, "filter is null");
+        return this;
+    }
+
+    public ResolvedFunctionCallBuilder setOrderBy(OrderBy orderBy)
+    {
+        this.orderBy = Optional.of(requireNonNull(orderBy, "orderBy is null"));
+        return this;
+    }
+
+    public ResolvedFunctionCallBuilder setOrderBy(Optional<OrderBy> orderBy)
+    {
+        this.orderBy = requireNonNull(orderBy, "orderBy is null");
+        return this;
+    }
+
+    public ResolvedFunctionCallBuilder setDistinct(boolean distinct)
+    {
+        this.distinct = distinct;
+        return this;
+    }
+
+    public FunctionCall build()
+    {
+        return new FunctionCall(
+                location,
+                resolvedFunction.toQualifiedName(),
+                window,
+                filter,
+                orderBy,
+                distinct,
+                Optional.empty(),
+                Optional.empty(),
+                argumentValues);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/RuntimeAdaptivePartitioningRewriter.java b/core/trino-main/src/main/java/io/trino/sql/planner/RuntimeAdaptivePartitioningRewriter.java
new file mode 100644
index 000000000000..7a88e1b76e48
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/RuntimeAdaptivePartitioningRewriter.java
@@ -0,0 +1,218 @@
+/*
+ * Licensed 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 io.trino.sql.planner;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.graph.Traverser;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import io.trino.sql.planner.plan.PlanNode;
+import io.trino.sql.planner.plan.RemoteSourceNode;
+import io.trino.sql.planner.plan.SimplePlanRewriter;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Iterators.getOnlyElement;
+import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_BROADCAST_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_HASH_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.SCALED_WRITER_HASH_DISTRIBUTION;
+import static io.trino.sql.planner.plan.ExchangeNode.Type.REPLICATE;
+import static io.trino.sql.planner.plan.SimplePlanRewriter.rewriteWith;
+import static java.util.Objects.requireNonNull;
+
+public final class RuntimeAdaptivePartitioningRewriter
+{
+    private RuntimeAdaptivePartitioningRewriter() {}
+
+    public static SubPlan overridePartitionCountRecursively(
+            SubPlan subPlan,
+            int oldPartitionCount,
+            int newPartitionCount,
+            PlanFragmentIdAllocator planFragmentIdAllocator,
+            PlanNodeIdAllocator planNodeIdAllocator,
+            Set<PlanFragmentId> startedFragments)
+    {
+        PlanFragment fragment = subPlan.getFragment();
+        if (startedFragments.contains(fragment.getId())) {
+            // already started, nothing to change for subPlan and its descendants
+            return subPlan;
+        }
+
+        PartitioningScheme outputPartitioningScheme = fragment.getOutputPartitioningScheme();
+        if (outputPartitioningScheme.getPartitioning().getHandle().equals(FIXED_BROADCAST_DISTRIBUTION)) {
+            // the result of the subtree will be broadcast, then no need to change partition count for the subtree
+            // as the planner will only broadcast fragment output if it sees input data is small or filter ratio is high
+            return subPlan;
+        }
+        if (producesHashPartitionedOutput(fragment)) {
+            fragment = fragment.withOutputPartitioningScheme(outputPartitioningScheme.withPartitionCount(Optional.of(newPartitionCount)));
+        }
+
+        if (consumesHashPartitionedInput(fragment)) {
+            fragment = fragment.withPartitionCount(Optional.of(newPartitionCount));
+        }
+        else {
+            // no input partitioning, then no need to insert extra exchanges to sources
+            return new SubPlan(
+                    fragment,
+                    subPlan.getChildren().stream()
+                            .map(child -> overridePartitionCountRecursively(
+                                    child,
+                                    oldPartitionCount,
+                                    newPartitionCount,
+                                    planFragmentIdAllocator,
+                                    planNodeIdAllocator,
+                                    startedFragments))
+                            .collect(toImmutableList()));
+        }
+
+        // insert extra exchanges to sources
+        ImmutableList.Builder<SubPlan> newSources = ImmutableList.builder();
+        ImmutableMap.Builder<PlanFragmentId, PlanFragmentId> runtimeAdaptivePlanFragmentIdMapping = ImmutableMap.builder();
+        for (SubPlan source : subPlan.getChildren()) {
+            PlanFragment sourceFragment = source.getFragment();
+            RemoteSourceNode sourceRemoteSourceNode = getOnlyElement(fragment.getRemoteSourceNodes().stream()
+                    .filter(remoteSourceNode -> remoteSourceNode.getSourceFragmentIds().contains(sourceFragment.getId()))
+                    .iterator());
+            requireNonNull(sourceRemoteSourceNode, "sourceRemoteSourceNode is null");
+            if (sourceRemoteSourceNode.getExchangeType() == REPLICATE) {
+                // since exchange type is REPLICATE, also no need to change partition count for the subtree as the
+                // planner will only broadcast fragment output if it sees input data is small or filter ratio is high
+                newSources.add(source);
+                continue;
+            }
+            if (!startedFragments.contains(sourceFragment.getId())) {
+                // source not started yet, then no need to insert extra exchanges to sources
+                newSources.add(overridePartitionCountRecursively(
+                        source,
+                        oldPartitionCount,
+                        newPartitionCount,
+                        planFragmentIdAllocator,
+                        planNodeIdAllocator,
+                        startedFragments));
+                runtimeAdaptivePlanFragmentIdMapping.put(sourceFragment.getId(), sourceFragment.getId());
+                continue;
+            }
+            RemoteSourceNode runtimeAdaptiveRemoteSourceNode = new RemoteSourceNode(
+                    planNodeIdAllocator.getNextId(),
+                    sourceFragment.getId(),
+                    sourceFragment.getOutputPartitioningScheme().getOutputLayout(),
+                    sourceRemoteSourceNode.getOrderingScheme(),
+                    sourceRemoteSourceNode.getExchangeType(),
+                    sourceRemoteSourceNode.getRetryPolicy());
+            PlanFragment runtimeAdaptivePlanFragment = new PlanFragment(
+                    planFragmentIdAllocator.getNextId(),
+                    runtimeAdaptiveRemoteSourceNode,
+                    sourceFragment.getSymbols(),
+                    FIXED_HASH_DISTRIBUTION,
+                    Optional.of(oldPartitionCount),
+                    ImmutableList.of(), // partitioned sources will be empty as the fragment will only read from `runtimeAdaptiveRemoteSourceNode`
+                    sourceFragment.getOutputPartitioningScheme().withPartitionCount(Optional.of(newPartitionCount)),
+                    sourceFragment.getStatsAndCosts(),
+                    sourceFragment.getActiveCatalogs(),
+                    sourceFragment.getLanguageFunctions(),
+                    sourceFragment.getJsonRepresentation());
+            SubPlan newSource = new SubPlan(
+                    runtimeAdaptivePlanFragment,
+                    ImmutableList.of(overridePartitionCountRecursively(
+                            source,
+                            oldPartitionCount,
+                            newPartitionCount,
+                            planFragmentIdAllocator,
+                            planNodeIdAllocator,
+                            startedFragments)));
+            newSources.add(newSource);
+            runtimeAdaptivePlanFragmentIdMapping.put(sourceFragment.getId(), runtimeAdaptivePlanFragment.getId());
+        }
+
+        return new SubPlan(
+                fragment.withRoot(rewriteWith(
+                        new UpdateRemoteSourceFragmentIdsRewriter(runtimeAdaptivePlanFragmentIdMapping.buildOrThrow()),
+                        fragment.getRoot())),
+                newSources.build());
+    }
+
+    public static boolean consumesHashPartitionedInput(PlanFragment fragment)
+    {
+        return isPartitioned(fragment.getPartitioning());
+    }
+
+    public static boolean producesHashPartitionedOutput(PlanFragment fragment)
+    {
+        return isPartitioned(fragment.getOutputPartitioningScheme().getPartitioning().getHandle());
+    }
+
+    public static int getMaxPlanFragmentId(List<SubPlan> subPlans)
+    {
+        return subPlans.stream()
+                .map(SubPlan::getFragment)
+                .map(PlanFragment::getId)
+                .mapToInt(fragmentId -> Integer.parseInt(fragmentId.toString()))
+                .max()
+                .orElseThrow();
+    }
+
+    public static int getMaxPlanId(List<SubPlan> subPlans)
+    {
+        return subPlans.stream()
+                .map(SubPlan::getFragment)
+                .map(PlanFragment::getRoot)
+                .mapToInt(root -> traverse(root)
+                        .map(PlanNode::getId)
+                        .mapToInt(planNodeId -> Integer.parseInt(planNodeId.toString()))
+                        .max()
+                        .orElseThrow())
+                .max()
+                .orElseThrow();
+    }
+
+    private static boolean isPartitioned(PartitioningHandle partitioningHandle)
+    {
+        return partitioningHandle.equals(FIXED_HASH_DISTRIBUTION) || partitioningHandle.equals(SCALED_WRITER_HASH_DISTRIBUTION);
+    }
+
+    private static Stream<PlanNode> traverse(PlanNode node)
+    {
+        Iterable<PlanNode> iterable = Traverser.forTree(PlanNode::getSources).depthFirstPreOrder(node);
+        return StreamSupport.stream(iterable.spliterator(), false);
+    }
+
+    private static class UpdateRemoteSourceFragmentIdsRewriter
+            extends SimplePlanRewriter<Void>
+    {
+        private final Map<PlanFragmentId, PlanFragmentId> runtimeAdaptivePlanFragmentIdMapping;
+
+        public UpdateRemoteSourceFragmentIdsRewriter(Map<PlanFragmentId, PlanFragmentId> runtimeAdaptivePlanFragmentIdMapping)
+        {
+            this.runtimeAdaptivePlanFragmentIdMapping = requireNonNull(runtimeAdaptivePlanFragmentIdMapping, "runtimeAdaptivePlanFragmentIdMapping is null");
+        }
+
+        @Override
+        public PlanNode visitRemoteSource(RemoteSourceNode node, RewriteContext<Void> context)
+        {
+            if (node.getExchangeType() == REPLICATE) {
+                return node;
+            }
+            return node.withSourceFragmentIds(node.getSourceFragmentIds().stream()
+                    .map(runtimeAdaptivePlanFragmentIdMapping::get)
+                    .collect(toImmutableList()));
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/SchedulingOrderVisitor.java b/core/trino-main/src/main/java/io/trino/sql/planner/SchedulingOrderVisitor.java
index a3887238fb66..2a4275c9fe3e 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/SchedulingOrderVisitor.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/SchedulingOrderVisitor.java
@@ -15,12 +15,8 @@
 package io.trino.sql.planner;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.sql.planner.plan.IndexJoinNode;
-import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.sql.planner.plan.SemiJoinNode;
-import io.trino.sql.planner.plan.SpatialJoinNode;
 import io.trino.sql.planner.plan.TableFunctionProcessorNode;
 import io.trino.sql.planner.plan.TableScanNode;
 
@@ -41,7 +37,7 @@ public static List<PlanNodeId> scheduleOrder(PlanNode root)
     private SchedulingOrderVisitor() {}
 
     private static class Visitor
-            extends SimplePlanVisitor<Void>
+            extends BuildSideJoinPlanVisitor<Void>
     {
         private final Consumer<PlanNodeId> schedulingOrder;
 
@@ -50,38 +46,6 @@ public Visitor(Consumer<PlanNodeId> schedulingOrder)
             this.schedulingOrder = requireNonNull(schedulingOrder, "schedulingOrder is null");
         }
 
-        @Override
-        public Void visitJoin(JoinNode node, Void context)
-        {
-            node.getRight().accept(this, context);
-            node.getLeft().accept(this, context);
-            return null;
-        }
-
-        @Override
-        public Void visitSemiJoin(SemiJoinNode node, Void context)
-        {
-            node.getFilteringSource().accept(this, context);
-            node.getSource().accept(this, context);
-            return null;
-        }
-
-        @Override
-        public Void visitSpatialJoin(SpatialJoinNode node, Void context)
-        {
-            node.getRight().accept(this, context);
-            node.getLeft().accept(this, context);
-            return null;
-        }
-
-        @Override
-        public Void visitIndexJoin(IndexJoinNode node, Void context)
-        {
-            node.getIndexSource().accept(this, context);
-            node.getProbeSource().accept(this, context);
-            return null;
-        }
-
         @Override
         public Void visitTableScan(TableScanNode node, Void context)
         {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/SplitSourceFactory.java b/core/trino-main/src/main/java/io/trino/sql/planner/SplitSourceFactory.java
index e47e2eae0eab..37ce4def5c12 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/SplitSourceFactory.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/SplitSourceFactory.java
@@ -15,9 +15,13 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
+import io.trino.metadata.TableHandle;
 import io.trino.server.DynamicFilterService;
+import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.predicate.TupleDomain;
@@ -61,6 +65,7 @@
 import io.trino.sql.planner.plan.TableFinishNode;
 import io.trino.sql.planner.plan.TableFunctionProcessorNode;
 import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.TableUpdateNode;
 import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.sql.planner.plan.TopNNode;
 import io.trino.sql.planner.plan.TopNRankingNode;
@@ -70,8 +75,6 @@
 import io.trino.sql.planner.plan.WindowNode;
 import io.trino.sql.tree.Expression;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -100,13 +103,13 @@ public SplitSourceFactory(SplitManager splitManager, PlannerContext plannerConte
         this.typeAnalyzer = requireNonNull(typeAnalyzer, "typeAnalyzer is null");
     }
 
-    public Map<PlanNodeId, SplitSource> createSplitSources(Session session, PlanFragment fragment)
+    public Map<PlanNodeId, SplitSource> createSplitSources(Session session, Span stageSpan, PlanFragment fragment)
     {
         ImmutableList.Builder<SplitSource> allSplitSources = ImmutableList.builder();
         try {
             // get splits for this fragment, this is lazy so split assignments aren't actually calculated here
             return fragment.getRoot().accept(
-                    new Visitor(session, TypeProvider.copyOf(fragment.getSymbols()), allSplitSources),
+                    new Visitor(session, stageSpan, TypeProvider.copyOf(fragment.getSymbols()), allSplitSources),
                     null);
         }
         catch (Throwable t) {
@@ -129,15 +132,18 @@ private final class Visitor
             extends PlanVisitor<Map<PlanNodeId, SplitSource>, Void>
     {
         private final Session session;
+        private final Span stageSpan;
         private final TypeProvider typeProvider;
         private final ImmutableList.Builder<SplitSource> splitSources;
 
         private Visitor(
                 Session session,
+                Span stageSpan,
                 TypeProvider typeProvider,
                 ImmutableList.Builder<SplitSource> allSplitSources)
         {
             this.session = session;
+            this.stageSpan = stageSpan;
             this.typeProvider = typeProvider;
             this.splitSources = allSplitSources;
         }
@@ -151,14 +157,15 @@ public Map<PlanNodeId, SplitSource> visitExplainAnalyze(ExplainAnalyzeNode node,
         @Override
         public Map<PlanNodeId, SplitSource> visitTableScan(TableScanNode node, Void context)
         {
-            return visitScanAndFilter(node, Optional.empty());
+            SplitSource splitSource = createSplitSource(node.getTable(), node.getAssignments(), Optional.empty());
+
+            splitSources.add(splitSource);
+
+            return ImmutableMap.of(node.getId(), splitSource);
         }
 
-        private Map<PlanNodeId, SplitSource> visitScanAndFilter(TableScanNode node, Optional<FilterNode> filter)
+        private SplitSource createSplitSource(TableHandle table, Map<Symbol, ColumnHandle> assignments, Optional<Expression> filterPredicate)
         {
-            Optional<Expression> filterPredicate = filter
-                    .map(FilterNode::getPredicate);
-
             List<DynamicFilters.Descriptor> dynamicFilters = filterPredicate
                     .map(DynamicFilters::extractDynamicFilters)
                     .map(DynamicFilters.ExtractResult::getDynamicConjuncts)
@@ -167,25 +174,22 @@ private Map<PlanNodeId, SplitSource> visitScanAndFilter(TableScanNode node, Opti
             DynamicFilter dynamicFilter = EMPTY;
             if (!dynamicFilters.isEmpty()) {
                 log.debug("Dynamic filters: %s", dynamicFilters);
-                dynamicFilter = dynamicFilterService.createDynamicFilter(session.getQueryId(), dynamicFilters, node.getAssignments(), typeProvider);
+                dynamicFilter = dynamicFilterService.createDynamicFilter(session.getQueryId(), dynamicFilters, assignments, typeProvider);
             }
 
             Constraint constraint = filterPredicate
                     .map(predicate -> filterConjuncts(plannerContext.getMetadata(), predicate, expression -> !DynamicFilters.isDynamicFilter(expression)))
-                    .map(predicate -> new LayoutConstraintEvaluator(plannerContext, typeAnalyzer, session, typeProvider, node.getAssignments(), predicate))
+                    .map(predicate -> new LayoutConstraintEvaluator(plannerContext, typeAnalyzer, session, typeProvider, assignments, predicate))
                     .map(evaluator -> new Constraint(TupleDomain.all(), evaluator::isCandidate, evaluator.getArguments())) // we are interested only in functional predicate here, so we set the summary to ALL.
                     .orElse(alwaysTrue());
 
             // get dataSource for table
-            SplitSource splitSource = splitManager.getSplits(
+            return splitManager.getSplits(
                     session,
-                    node.getTable(),
+                    stageSpan,
+                    table,
                     dynamicFilter,
                     constraint);
-
-            splitSources.add(splitSource);
-
-            return ImmutableMap.of(node.getId(), splitSource);
         }
 
         @Override
@@ -251,7 +255,11 @@ public Map<PlanNodeId, SplitSource> visitValues(ValuesNode node, Void context)
         public Map<PlanNodeId, SplitSource> visitFilter(FilterNode node, Void context)
         {
             if (node.getSource() instanceof TableScanNode scan) {
-                return visitScanAndFilter(scan, Optional.of(node));
+                SplitSource splitSource = createSplitSource(scan.getTable(), scan.getAssignments(), Optional.of(node.getPredicate()));
+
+                splitSources.add(splitSource);
+
+                return ImmutableMap.of(scan.getId(), splitSource);
             }
 
             return node.getSource().accept(this, context);
@@ -311,7 +319,7 @@ public Map<PlanNodeId, SplitSource> visitTableFunctionProcessor(TableFunctionPro
         {
             if (node.getSource().isEmpty()) {
                 // this is a source node, so produce splits
-                SplitSource splitSource = splitManager.getSplits(session, node.getHandle());
+                SplitSource splitSource = splitManager.getSplits(session, stageSpan, node.getHandle());
                 splitSources.add(splitSource);
 
                 return ImmutableMap.of(node.getId(), splitSource);
@@ -430,6 +438,13 @@ public Map<PlanNodeId, SplitSource> visitTableDelete(TableDeleteNode node, Void
             return ImmutableMap.of();
         }
 
+        @Override
+        public Map<PlanNodeId, SplitSource> visitTableUpdate(TableUpdateNode node, Void context)
+        {
+            // node does not have splits
+            return ImmutableMap.of();
+        }
+
         @Override
         public Map<PlanNodeId, SplitSource> visitTableExecute(TableExecuteNode node, Void context)
         {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/StatisticsAggregationPlanner.java b/core/trino-main/src/main/java/io/trino/sql/planner/StatisticsAggregationPlanner.java
index 6df4c8722fcf..4dd7ff4e7cb4 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/StatisticsAggregationPlanner.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/StatisticsAggregationPlanner.java
@@ -16,10 +16,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
+import io.trino.metadata.FunctionResolver;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.operator.aggregation.MaxDataSizeForStats;
 import io.trino.operator.aggregation.SumDataSizeForStats;
+import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.TrinoException;
 import io.trino.spi.expression.FunctionName;
 import io.trino.spi.statistics.ColumnStatisticMetadata;
@@ -27,6 +29,7 @@
 import io.trino.spi.statistics.TableStatisticType;
 import io.trino.spi.statistics.TableStatisticsMetadata;
 import io.trino.spi.type.Type;
+import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.StatisticAggregations;
 import io.trino.sql.planner.plan.StatisticAggregationsDescriptor;
@@ -36,7 +39,6 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.base.Verify.verifyNotNull;
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -53,12 +55,14 @@ public class StatisticsAggregationPlanner
     private final SymbolAllocator symbolAllocator;
     private final Metadata metadata;
     private final Session session;
+    private final FunctionResolver functionResolver;
 
-    public StatisticsAggregationPlanner(SymbolAllocator symbolAllocator, Metadata metadata, Session session)
+    public StatisticsAggregationPlanner(SymbolAllocator symbolAllocator, PlannerContext plannerContext, Session session)
     {
         this.symbolAllocator = requireNonNull(symbolAllocator, "symbolAllocator is null");
-        this.metadata = requireNonNull(metadata, "metadata is null");
+        this.metadata = plannerContext.getMetadata();
         this.session = requireNonNull(session, "session is null");
+        this.functionResolver = plannerContext.getFunctionResolver();
     }
 
     public TableStatisticAggregation createStatisticsAggregation(TableStatisticsMetadata statisticsMetadata, Map<String, Symbol> columnToSymbolMap)
@@ -80,7 +84,7 @@ public TableStatisticAggregation createStatisticsAggregation(TableStatisticsMeta
                 throw new TrinoException(NOT_SUPPORTED, "Table-wide statistic type not supported: " + type);
             }
             AggregationNode.Aggregation aggregation = new AggregationNode.Aggregation(
-                    metadata.resolveFunction(session, QualifiedName.of("count"), ImmutableList.of()),
+                    metadata.resolveBuiltinFunction("count", ImmutableList.of()),
                     ImmutableList.of(),
                     false,
                     Optional.empty(),
@@ -121,28 +125,35 @@ public TableStatisticAggregation createStatisticsAggregation(TableStatisticsMeta
     private ColumnStatisticsAggregation createColumnAggregation(ColumnStatisticType statisticType, Symbol input, Type inputType)
     {
         return switch (statisticType) {
-            case MIN_VALUE -> createAggregation(QualifiedName.of("min"), input, inputType);
-            case MAX_VALUE -> createAggregation(QualifiedName.of("max"), input, inputType);
-            case NUMBER_OF_DISTINCT_VALUES -> createAggregation(QualifiedName.of("approx_distinct"), input, inputType);
+            case MIN_VALUE -> createAggregation("min", input, inputType);
+            case MAX_VALUE -> createAggregation("max", input, inputType);
+            case NUMBER_OF_DISTINCT_VALUES -> createAggregation("approx_distinct", input, inputType);
             case NUMBER_OF_DISTINCT_VALUES_SUMMARY ->
                 // we use $approx_set here and not approx_set because latter is not defined for all types supported by Trino
-                    createAggregation(QualifiedName.of("$approx_set"), input, inputType);
-            case NUMBER_OF_NON_NULL_VALUES -> createAggregation(QualifiedName.of("count"), input, inputType);
-            case NUMBER_OF_TRUE_VALUES -> createAggregation(QualifiedName.of("count_if"), input, BOOLEAN);
-            case TOTAL_SIZE_IN_BYTES -> createAggregation(QualifiedName.of(SumDataSizeForStats.NAME), input, inputType);
-            case MAX_VALUE_SIZE_IN_BYTES -> createAggregation(QualifiedName.of(MaxDataSizeForStats.NAME), input, inputType);
+                    createAggregation("$approx_set", input, inputType);
+            case NUMBER_OF_NON_NULL_VALUES -> createAggregation("count", input, inputType);
+            case NUMBER_OF_TRUE_VALUES -> createAggregation("count_if", input, BOOLEAN);
+            case TOTAL_SIZE_IN_BYTES -> createAggregation(SumDataSizeForStats.NAME, input, inputType);
+            case MAX_VALUE_SIZE_IN_BYTES -> createAggregation(MaxDataSizeForStats.NAME, input, inputType);
         };
     }
 
     private ColumnStatisticsAggregation createColumnAggregation(FunctionName aggregation, Symbol input, Type inputType)
     {
-        checkArgument(aggregation.getCatalogSchema().isEmpty(), "Catalog/schema name not supported");
-        return createAggregation(QualifiedName.of(aggregation.getName()), input, inputType);
+        QualifiedName name = aggregation.getCatalogSchema()
+                .map(catalogSchemaName -> QualifiedName.of(catalogSchemaName.getCatalogName(), catalogSchemaName.getSchemaName(), aggregation.getName()))
+                .orElseGet(() -> QualifiedName.of(aggregation.getName()));
+        // Statistics collection is part of the internal system, so it uses allow all access control
+        return createAggregation(functionResolver.resolveFunction(session, name, fromTypes(inputType), new AllowAllAccessControl()), input, inputType);
     }
 
-    private ColumnStatisticsAggregation createAggregation(QualifiedName functionName, Symbol input, Type inputType)
+    private ColumnStatisticsAggregation createAggregation(String functionName, Symbol input, Type inputType)
+    {
+        return createAggregation(metadata.resolveBuiltinFunction(functionName, fromTypes(inputType)), input, inputType);
+    }
+
+    private static ColumnStatisticsAggregation createAggregation(ResolvedFunction resolvedFunction, Symbol input, Type inputType)
     {
-        ResolvedFunction resolvedFunction = metadata.resolveFunction(session, functionName, fromTypes(inputType));
         Type resolvedType = getOnlyElement(resolvedFunction.getSignature().getArgumentTypes());
         verify(resolvedType.equals(inputType), "resolved function input type does not match the input type: %s != %s", resolvedType, inputType);
         return new ColumnStatisticsAggregation(
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/SubPlan.java b/core/trino-main/src/main/java/io/trino/sql/planner/SubPlan.java
index f095e1037d3e..1ed90fcf2658 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/SubPlan.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/SubPlan.java
@@ -15,11 +15,10 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multiset;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.plan.PlanFragmentId;
 import io.trino.sql.planner.plan.RemoteSourceNode;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkState;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/SubqueryPlanner.java b/core/trino-main/src/main/java/io/trino/sql/planner/SubqueryPlanner.java
index 4d9656b37094..3ed9583276f3 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/SubqueryPlanner.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/SubqueryPlanner.java
@@ -268,7 +268,7 @@ private PlanBuilder planScalarSubquery(PlanBuilder subPlan, Cluster<SubqueryExpr
                 subPlan,
                 root,
                 scalarSubquery.getQuery(),
-                CorrelatedJoinNode.Type.INNER,
+                CorrelatedJoinNode.Type.LEFT,
                 TRUE_LITERAL,
                 mapAll(cluster, subPlan.getScope(), column));
     }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/SymbolAllocator.java b/core/trino-main/src/main/java/io/trino/sql/planner/SymbolAllocator.java
index daf0e7dd7d78..5c79ea346e77 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/SymbolAllocator.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/SymbolAllocator.java
@@ -23,8 +23,7 @@
 import io.trino.sql.tree.GroupingOperation;
 import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.SymbolReference;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -114,7 +113,13 @@ public Symbol newSymbol(Expression expression, Type type, String suffix)
             nameHint = identifier.getValue();
         }
         else if (expression instanceof FunctionCall functionCall) {
-            nameHint = ResolvedFunction.extractFunctionName(functionCall.getName());
+            // symbol allocation can happen during planning, before function calls are rewritten
+            if (ResolvedFunction.isResolved(functionCall.getName())) {
+                nameHint = ResolvedFunction.extractFunctionName(functionCall.getName()).getFunctionName();
+            }
+            else {
+                nameHint = functionCall.getName().getSuffix();
+            }
         }
         else if (expression instanceof SymbolReference symbolReference) {
             nameHint = symbolReference.getName();
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/SystemPartitioningHandle.java b/core/trino-main/src/main/java/io/trino/sql/planner/SystemPartitioningHandle.java
index c9cc4897396a..1335edab0085 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/SystemPartitioningHandle.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/SystemPartitioningHandle.java
@@ -16,14 +16,13 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.operator.BucketPartitionFunction;
-import io.trino.operator.InterpretedHashGenerator;
 import io.trino.operator.PartitionFunction;
 import io.trino.operator.PrecomputedHashGenerator;
 import io.trino.spi.Page;
 import io.trino.spi.connector.BucketFunction;
 import io.trino.spi.connector.ConnectorPartitioningHandle;
 import io.trino.spi.type.Type;
-import io.trino.type.BlockTypeOperators;
+import io.trino.spi.type.TypeOperators;
 
 import java.util.List;
 import java.util.Objects;
@@ -31,6 +30,7 @@
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.operator.InterpretedHashGenerator.createPagePrefixHashGenerator;
 import static java.util.Objects.requireNonNull;
 
 public final class SystemPartitioningHandle
@@ -136,12 +136,12 @@ public String toString()
         return partitioning.toString();
     }
 
-    public PartitionFunction getPartitionFunction(List<Type> partitionChannelTypes, boolean isHashPrecomputed, int[] bucketToPartition, BlockTypeOperators blockTypeOperators)
+    public PartitionFunction getPartitionFunction(List<Type> partitionChannelTypes, boolean isHashPrecomputed, int[] bucketToPartition, TypeOperators typeOperators)
     {
         requireNonNull(partitionChannelTypes, "partitionChannelTypes is null");
         requireNonNull(bucketToPartition, "bucketToPartition is null");
 
-        BucketFunction bucketFunction = function.createBucketFunction(partitionChannelTypes, isHashPrecomputed, bucketToPartition.length, blockTypeOperators);
+        BucketFunction bucketFunction = function.createBucketFunction(partitionChannelTypes, isHashPrecomputed, bucketToPartition.length, typeOperators);
         return new BucketPartitionFunction(bucketFunction, bucketToPartition);
     }
 
@@ -149,7 +149,7 @@ public enum SystemPartitionFunction
     {
         SINGLE {
             @Override
-            public BucketFunction createBucketFunction(List<Type> partitionChannelTypes, boolean isHashPrecomputed, int bucketCount, BlockTypeOperators blockTypeOperators)
+            public BucketFunction createBucketFunction(List<Type> partitionChannelTypes, boolean isHashPrecomputed, int bucketCount, TypeOperators typeOperators)
             {
                 checkArgument(bucketCount == 1, "Single partition can only have one bucket");
                 return new SingleBucketFunction();
@@ -157,32 +157,32 @@ public BucketFunction createBucketFunction(List<Type> partitionChannelTypes, boo
         },
         HASH {
             @Override
-            public BucketFunction createBucketFunction(List<Type> partitionChannelTypes, boolean isHashPrecomputed, int bucketCount, BlockTypeOperators blockTypeOperators)
+            public BucketFunction createBucketFunction(List<Type> partitionChannelTypes, boolean isHashPrecomputed, int bucketCount, TypeOperators typeOperators)
             {
                 if (isHashPrecomputed) {
                     return new HashBucketFunction(new PrecomputedHashGenerator(0), bucketCount);
                 }
 
-                return new HashBucketFunction(InterpretedHashGenerator.createPositionalWithTypes(partitionChannelTypes, blockTypeOperators), bucketCount);
+                return new HashBucketFunction(createPagePrefixHashGenerator(partitionChannelTypes, typeOperators), bucketCount);
             }
         },
         ROUND_ROBIN {
             @Override
-            public BucketFunction createBucketFunction(List<Type> partitionChannelTypes, boolean isHashPrecomputed, int bucketCount, BlockTypeOperators blockTypeOperators)
+            public BucketFunction createBucketFunction(List<Type> partitionChannelTypes, boolean isHashPrecomputed, int bucketCount, TypeOperators typeOperators)
             {
                 return new RoundRobinBucketFunction(bucketCount);
             }
         },
         BROADCAST {
             @Override
-            public BucketFunction createBucketFunction(List<Type> partitionChannelTypes, boolean isHashPrecomputed, int bucketCount, BlockTypeOperators blockTypeOperators)
+            public BucketFunction createBucketFunction(List<Type> partitionChannelTypes, boolean isHashPrecomputed, int bucketCount, TypeOperators typeOperators)
             {
                 throw new UnsupportedOperationException();
             }
         },
         UNKNOWN {
             @Override
-            public BucketFunction createBucketFunction(List<Type> partitionChannelTypes, boolean isHashPrecomputed, int bucketCount, BlockTypeOperators blockTypeOperators)
+            public BucketFunction createBucketFunction(List<Type> partitionChannelTypes, boolean isHashPrecomputed, int bucketCount, TypeOperators typeOperators)
             {
                 throw new UnsupportedOperationException();
             }
@@ -191,7 +191,7 @@ public BucketFunction createBucketFunction(List<Type> partitionChannelTypes, boo
         public abstract BucketFunction createBucketFunction(List<Type> partitionChannelTypes,
                 boolean isHashPrecomputed,
                 int bucketCount,
-                BlockTypeOperators blockTypeOperators);
+                TypeOperators typeOperators);
 
         private static class SingleBucketFunction
                 implements BucketFunction
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/TopologicalOrderSubPlanVisitor.java b/core/trino-main/src/main/java/io/trino/sql/planner/TopologicalOrderSubPlanVisitor.java
new file mode 100644
index 000000000000..ab5dc8d1af03
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/TopologicalOrderSubPlanVisitor.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed 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 io.trino.sql.planner;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.graph.SuccessorsFunction;
+import com.google.common.graph.Traverser;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import io.trino.sql.planner.plan.RemoteSourceNode;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toMap;
+
+public final class TopologicalOrderSubPlanVisitor
+{
+    private TopologicalOrderSubPlanVisitor() {}
+
+    public static List<SubPlan> sortPlanInTopologicalOrder(SubPlan subPlan)
+    {
+        return ImmutableList.copyOf(Traverser.forTree(getChildren).depthFirstPostOrder(subPlan));
+    }
+
+    private static final SuccessorsFunction<SubPlan> getChildren = subPlan -> {
+        Visitor visitor = new Visitor(subPlan);
+        subPlan.getFragment().getRoot().accept(visitor, null);
+        checkState(visitor.getSourceSubPlans().isEmpty(),
+                "Some SubNode sources have not been visited: %s",
+                visitor.getSourceSubPlans());
+        return visitor.getChildren();
+    };
+
+    private static class Visitor
+            extends BuildSideJoinPlanVisitor<Void>
+    {
+        private final SubPlan subPlan;
+        private final Map<PlanFragmentId, SubPlan> sourceSubPlans;
+        private final ImmutableList.Builder<SubPlan> children = ImmutableList.builder();
+
+        public Visitor(SubPlan subPlan)
+        {
+            this.subPlan = subPlan;
+            this.sourceSubPlans = subPlan.getChildren().stream()
+                    .collect(toMap(plan -> plan.getFragment().getId(), plan -> plan));
+        }
+
+        public Map<PlanFragmentId, SubPlan> getSourceSubPlans()
+        {
+            return sourceSubPlans;
+        }
+
+        public List<SubPlan> getChildren()
+        {
+            return children.build();
+        }
+
+        @Override
+        public Void visitRemoteSource(RemoteSourceNode node, Void context)
+        {
+            for (PlanFragmentId fragmentId : node.getSourceFragmentIds()) {
+                SubPlan child = sourceSubPlans.remove(fragmentId);
+                requireNonNull(child, "PlanFragmentId %s does not appear in sources of %s".formatted(fragmentId, subPlan));
+                children.add(child);
+            }
+            return null;
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/TranslationMap.java b/core/trino-main/src/main/java/io/trino/sql/planner/TranslationMap.java
index b369aa843fb3..9e5ec42b8aa4 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/TranslationMap.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/TranslationMap.java
@@ -70,7 +70,6 @@
 import io.trino.sql.tree.NodeRef;
 import io.trino.sql.tree.NullLiteral;
 import io.trino.sql.tree.Parameter;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.RowDataType;
 import io.trino.sql.tree.SubscriptExpression;
@@ -118,7 +117,7 @@
  * <li>AST expressions contain Identifiers, while IR expressions contain SymbolReferences</li>
  * <li>FunctionCalls in AST expressions are SQL function names. In IR expressions, they contain an encoded name representing a resolved function</li>
  */
-class TranslationMap
+public class TranslationMap
 {
     // all expressions are rewritten in terms of fields declared by this relation plan
     private final Scope scope;
@@ -387,8 +386,8 @@ public Expression rewriteArray(Array node, Void context, ExpressionTreeRewriter<
                         .map(element -> treeRewriter.rewrite(element, context))
                         .collect(toImmutableList());
 
-                FunctionCall call = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                        .setName(QualifiedName.of(ArrayConstructor.NAME))
+                FunctionCall call = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                        .setName(ArrayConstructor.NAME)
                         .setArguments(types, values)
                         .build();
 
@@ -405,7 +404,7 @@ public Expression rewriteCurrentCatalog(CurrentCatalog node, Void context, Expre
 
                 return coerceIfNecessary(node, new FunctionCall(
                         plannerContext.getMetadata()
-                                .resolveFunction(session, QualifiedName.of("$current_catalog"), ImmutableList.of())
+                                .resolveBuiltinFunction("$current_catalog", ImmutableList.of())
                                 .toQualifiedName(),
                         ImmutableList.of()));
             }
@@ -420,7 +419,7 @@ public Expression rewriteCurrentSchema(CurrentSchema node, Void context, Express
 
                 return coerceIfNecessary(node, new FunctionCall(
                         plannerContext.getMetadata()
-                                .resolveFunction(session, QualifiedName.of("$current_schema"), ImmutableList.of())
+                                .resolveBuiltinFunction("$current_schema", ImmutableList.of())
                                 .toQualifiedName(),
                         ImmutableList.of()));
             }
@@ -435,7 +434,7 @@ public Expression rewriteCurrentPath(CurrentPath node, Void context, ExpressionT
 
                 return coerceIfNecessary(node, new FunctionCall(
                         plannerContext.getMetadata()
-                                .resolveFunction(session, QualifiedName.of("$current_path"), ImmutableList.of())
+                                .resolveBuiltinFunction("$current_path", ImmutableList.of())
                                 .toQualifiedName(),
                         ImmutableList.of()));
             }
@@ -450,7 +449,7 @@ public Expression rewriteCurrentUser(CurrentUser node, Void context, ExpressionT
 
                 return coerceIfNecessary(node, new FunctionCall(
                         plannerContext.getMetadata()
-                                .resolveFunction(session, QualifiedName.of("$current_user"), ImmutableList.of())
+                                .resolveBuiltinFunction("$current_user", ImmutableList.of())
                                 .toQualifiedName(),
                         ImmutableList.of()));
             }
@@ -464,24 +463,24 @@ public Expression rewriteCurrentTime(CurrentTime node, Void context, ExpressionT
                 }
 
                 FunctionCall call = switch (node.getFunction()) {
-                    case DATE -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("current_date"))
+                    case DATE -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("current_date")
                             .build();
-                    case TIME -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("$current_time"))
-                            .setArguments(ImmutableList.of(analysis.getType(node)), ImmutableList.of(new NullLiteral()))
+                    case TIME -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("$current_time")
+                            .setArguments(ImmutableList.of(analysis.getType(node)), ImmutableList.of(new Cast(new NullLiteral(), toSqlType(analysis.getType(node)))))
                             .build();
-                    case LOCALTIME -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("$localtime"))
-                            .setArguments(ImmutableList.of(analysis.getType(node)), ImmutableList.of(new NullLiteral()))
+                    case LOCALTIME -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("$localtime")
+                            .setArguments(ImmutableList.of(analysis.getType(node)), ImmutableList.of(new Cast(new NullLiteral(), toSqlType(analysis.getType(node)))))
                             .build();
-                    case TIMESTAMP -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("$current_timestamp"))
-                            .setArguments(ImmutableList.of(analysis.getType(node)), ImmutableList.of(new NullLiteral()))
+                    case TIMESTAMP -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("$current_timestamp")
+                            .setArguments(ImmutableList.of(analysis.getType(node)), ImmutableList.of(new Cast(new NullLiteral(), toSqlType(analysis.getType(node)))))
                             .build();
-                    case LOCALTIMESTAMP -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("$localtimestamp"))
-                            .setArguments(ImmutableList.of(analysis.getType(node)), ImmutableList.of(new NullLiteral()))
+                    case LOCALTIMESTAMP -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("$localtimestamp")
+                            .setArguments(ImmutableList.of(analysis.getType(node)), ImmutableList.of(new Cast(new NullLiteral(), toSqlType(analysis.getType(node)))))
                             .build();
                 };
 
@@ -500,56 +499,56 @@ public Expression rewriteExtract(Extract node, Void context, ExpressionTreeRewri
                 Type type = analysis.getType(node.getExpression());
 
                 FunctionCall call = switch (node.getField()) {
-                    case YEAR -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("year"))
+                    case YEAR -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("year")
                             .addArgument(type, value)
                             .build();
-                    case QUARTER -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("quarter"))
+                    case QUARTER -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("quarter")
                             .addArgument(type, value)
                             .build();
-                    case MONTH -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("month"))
+                    case MONTH -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("month")
                             .addArgument(type, value)
                             .build();
-                    case WEEK -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("week"))
+                    case WEEK -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("week")
                             .addArgument(type, value)
                             .build();
-                    case DAY, DAY_OF_MONTH -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("day"))
+                    case DAY, DAY_OF_MONTH -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("day")
                             .addArgument(type, value)
                             .build();
-                    case DAY_OF_WEEK, DOW -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("day_of_week"))
+                    case DAY_OF_WEEK, DOW -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("day_of_week")
                             .addArgument(type, value)
                             .build();
-                    case DAY_OF_YEAR, DOY -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("day_of_year"))
+                    case DAY_OF_YEAR, DOY -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("day_of_year")
                             .addArgument(type, value)
                             .build();
-                    case YEAR_OF_WEEK, YOW -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("year_of_week"))
+                    case YEAR_OF_WEEK, YOW -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("year_of_week")
                             .addArgument(type, value)
                             .build();
-                    case HOUR -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("hour"))
+                    case HOUR -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("hour")
                             .addArgument(type, value)
                             .build();
-                    case MINUTE -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("minute"))
+                    case MINUTE -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("minute")
                             .addArgument(type, value)
                             .build();
-                    case SECOND -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("second"))
+                    case SECOND -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("second")
                             .addArgument(type, value)
                             .build();
-                    case TIMEZONE_MINUTE -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("timezone_minute"))
+                    case TIMEZONE_MINUTE -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("timezone_minute")
                             .addArgument(type, value)
                             .build();
-                    case TIMEZONE_HOUR -> FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("timezone_hour"))
+                    case TIMEZONE_HOUR -> BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("timezone_hour")
                             .addArgument(type, value)
                             .build();
                 };
@@ -573,29 +572,29 @@ public Expression rewriteAtTimeZone(AtTimeZone node, Void context, ExpressionTre
 
                 FunctionCall call;
                 if (valueType instanceof TimeType type) {
-                    call = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("$at_timezone"))
+                    call = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("$at_timezone")
                             .addArgument(createTimeWithTimeZoneType(type.getPrecision()), new Cast(value, toSqlType(createTimeWithTimeZoneType(((TimeType) valueType).getPrecision()))))
                             .addArgument(timeZoneType, timeZone)
                             .build();
                 }
                 else if (valueType instanceof TimeWithTimeZoneType) {
-                    call = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("$at_timezone"))
+                    call = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("$at_timezone")
                             .addArgument(valueType, value)
                             .addArgument(timeZoneType, timeZone)
                             .build();
                 }
                 else if (valueType instanceof TimestampType type) {
-                    call = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("at_timezone"))
+                    call = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("at_timezone")
                             .addArgument(createTimestampWithTimeZoneType(type.getPrecision()), new Cast(value, toSqlType(createTimestampWithTimeZoneType(((TimestampType) valueType).getPrecision()))))
                             .addArgument(timeZoneType, timeZone)
                             .build();
                 }
                 else if (valueType instanceof TimestampWithTimeZoneType) {
-                    call = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of("at_timezone"))
+                    call = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("at_timezone")
                             .addArgument(valueType, value)
                             .addArgument(timeZoneType, timeZone)
                             .build();
@@ -622,8 +621,8 @@ public Expression rewriteFormat(Format node, Void context, ExpressionTreeRewrite
                         .map(analysis::getType)
                         .collect(toImmutableList());
 
-                FunctionCall call = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                        .setName(QualifiedName.of(FormatFunction.NAME))
+                FunctionCall call = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                        .setName(FormatFunction.NAME)
                         .addArgument(VARCHAR, arguments.get(0))
                         .addArgument(RowType.anonymous(argumentTypes.subList(1, arguments.size())), new Row(arguments.subList(1, arguments.size())))
                         .build();
@@ -642,8 +641,8 @@ public Expression rewriteTryExpression(TryExpression node, Void context, Express
                 Type type = analysis.getType(node);
                 Expression expression = treeRewriter.rewrite(node.getInnerExpression(), context);
 
-                FunctionCall call = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                        .setName(QualifiedName.of(TryFunction.NAME))
+                FunctionCall call = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                        .setName(TryFunction.NAME)
                         .addArgument(new FunctionType(ImmutableList.of(), type), new LambdaExpression(ImmutableList.of(), expression))
                         .build();
 
@@ -664,21 +663,21 @@ public Expression rewriteLikePredicate(LikePredicate node, Void context, Express
 
                 FunctionCall patternCall;
                 if (escape.isPresent()) {
-                    patternCall = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of(LIKE_PATTERN_FUNCTION_NAME))
+                    patternCall = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName(LIKE_PATTERN_FUNCTION_NAME)
                             .addArgument(analysis.getType(node.getPattern()), pattern)
                             .addArgument(analysis.getType(node.getEscape().get()), escape.get())
                             .build();
                 }
                 else {
-                    patternCall = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                            .setName(QualifiedName.of(LIKE_PATTERN_FUNCTION_NAME))
+                    patternCall = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName(LIKE_PATTERN_FUNCTION_NAME)
                             .addArgument(analysis.getType(node.getPattern()), pattern)
                             .build();
                 }
 
-                FunctionCall call = FunctionCallBuilder.resolve(session, plannerContext.getMetadata())
-                        .setName(QualifiedName.of(LIKE_FUNCTION_NAME))
+                FunctionCall call = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                        .setName(LIKE_FUNCTION_NAME)
                         .addArgument(analysis.getType(node.getValue()), value)
                         .addArgument(LIKE_PATTERN, patternCall)
                         .build();
@@ -795,7 +794,7 @@ public Expression rewriteJsonExists(JsonExists node, Void context, ExpressionTre
                         failOnError);
 
                 IrJsonPath path = new JsonPathTranslator(session, plannerContext).rewriteToIr(analysis.getJsonPathAnalysis(node), orderedParameters.getParametersOrder());
-                Expression pathExpression = new LiteralEncoder(plannerContext).toExpression(session, path, plannerContext.getTypeManager().getType(TypeId.of(JsonPath2016Type.NAME)));
+                Expression pathExpression = new LiteralEncoder(plannerContext).toExpression(path, plannerContext.getTypeManager().getType(TypeId.of(JsonPath2016Type.NAME)));
 
                 ImmutableList.Builder<Expression> arguments = ImmutableList.<Expression>builder()
                         .add(input)
@@ -837,7 +836,7 @@ public Expression rewriteJsonValue(JsonValue node, Void context, ExpressionTreeR
                         failOnError);
 
                 IrJsonPath path = new JsonPathTranslator(session, plannerContext).rewriteToIr(analysis.getJsonPathAnalysis(node), orderedParameters.getParametersOrder());
-                Expression pathExpression = new LiteralEncoder(plannerContext).toExpression(session, path, plannerContext.getTypeManager().getType(TypeId.of(JsonPath2016Type.NAME)));
+                Expression pathExpression = new LiteralEncoder(plannerContext).toExpression(path, plannerContext.getTypeManager().getType(TypeId.of(JsonPath2016Type.NAME)));
 
                 ImmutableList.Builder<Expression> arguments = ImmutableList.<Expression>builder()
                         .add(input)
@@ -882,7 +881,7 @@ public Expression rewriteJsonQuery(JsonQuery node, Void context, ExpressionTreeR
                         failOnError);
 
                 IrJsonPath path = new JsonPathTranslator(session, plannerContext).rewriteToIr(analysis.getJsonPathAnalysis(node), orderedParameters.getParametersOrder());
-                Expression pathExpression = new LiteralEncoder(plannerContext).toExpression(session, path, plannerContext.getTypeManager().getType(TypeId.of(JsonPath2016Type.NAME)));
+                Expression pathExpression = new LiteralEncoder(plannerContext).toExpression(path, plannerContext.getTypeManager().getType(TypeId.of(JsonPath2016Type.NAME)));
 
                 ImmutableList.Builder<Expression> arguments = ImmutableList.<Expression>builder()
                         .add(input)
@@ -1125,9 +1124,7 @@ private Optional<Symbol> getSymbolForColumn(Expression expression)
 
     private static void verifyAstExpression(Expression astExpression)
     {
-        verify(AstUtils.preOrder(astExpression).noneMatch(expression ->
-                expression instanceof SymbolReference ||
-                        expression instanceof FunctionCall && ResolvedFunction.isResolved(((FunctionCall) expression).getName())));
+        verify(AstUtils.preOrder(astExpression).noneMatch(expression -> expression instanceof SymbolReference), "symbol references are not allowed");
     }
 
     public Scope getScope()
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/TypeAnalyzer.java b/core/trino-main/src/main/java/io/trino/sql/planner/TypeAnalyzer.java
index ae83e74e08e7..c42a13a41dfb 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/TypeAnalyzer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/TypeAnalyzer.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.execution.warnings.WarningCollector;
@@ -27,8 +28,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.NodeRef;
 
-import javax.inject.Inject;
-
 import java.util.Map;
 
 import static io.trino.sql.analyzer.ExpressionAnalyzer.analyzeExpressions;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/IterativeOptimizer.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/IterativeOptimizer.java
index 878a3047700e..e3e0853571a7 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/IterativeOptimizer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/IterativeOptimizer.java
@@ -373,7 +373,7 @@ public void checkTimeoutNotExhausted()
                             .map(ruleStats -> format(
                                     "%s: %s ms, %s invocations, %s applications",
                                     ruleStats.rule(),
-                                    ruleStats.totalTime(),
+                                    NANOSECONDS.toMillis(ruleStats.totalTime()),
                                     ruleStats.invocations(),
                                     ruleStats.applied()))
                             .collect(joining(",\n\t\t", "{\n\t\t", " }"));
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/Memo.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/Memo.java
index bef93d2ca804..1668db71692b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/Memo.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/Memo.java
@@ -19,8 +19,7 @@
 import io.trino.cost.PlanNodeStatsEstimate;
 import io.trino.sql.planner.PlanNodeIdAllocator;
 import io.trino.sql.planner.plan.PlanNode;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ApplyPreferredTableExecutePartitioning.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ApplyPreferredTableExecutePartitioning.java
deleted file mode 100644
index f65d7be2f1ca..000000000000
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ApplyPreferredTableExecutePartitioning.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed 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 io.trino.sql.planner.iterative.rule;
-
-import io.trino.Session;
-import io.trino.matching.Captures;
-import io.trino.matching.Pattern;
-import io.trino.operator.RetryPolicy;
-import io.trino.sql.planner.iterative.Rule;
-import io.trino.sql.planner.plan.TableExecuteNode;
-
-import java.util.Optional;
-
-import static io.trino.SystemSessionProperties.getPreferredWritePartitioningMinNumberOfPartitions;
-import static io.trino.SystemSessionProperties.getRetryPolicy;
-import static io.trino.SystemSessionProperties.isFaultTolerantExecutionForcePreferredWritePartitioningEnabled;
-import static io.trino.SystemSessionProperties.isUsePreferredWritePartitioning;
-import static io.trino.cost.AggregationStatsRule.getRowsCount;
-import static io.trino.sql.planner.plan.Patterns.tableExecute;
-import static java.lang.Double.isNaN;
-
-/**
- * Replaces {@link TableExecuteNode} with {@link TableExecuteNode#getPreferredPartitioningScheme()}
- * with a {@link TableExecuteNode} with {@link TableExecuteNode#getPartitioningScheme()} set.
- */
-public class ApplyPreferredTableExecutePartitioning
-        implements Rule<TableExecuteNode>
-{
-    public static final Pattern<TableExecuteNode> TABLE_EXECUTE_NODE_WITH_PREFERRED_PARTITIONING = tableExecute()
-            .matching(node -> node.getPreferredPartitioningScheme().isPresent());
-
-    @Override
-    public Pattern<TableExecuteNode> getPattern()
-    {
-        return TABLE_EXECUTE_NODE_WITH_PREFERRED_PARTITIONING;
-    }
-
-    @Override
-    public boolean isEnabled(Session session)
-    {
-        return isUsePreferredWritePartitioning(session);
-    }
-
-    @Override
-    public Result apply(TableExecuteNode node, Captures captures, Context context)
-    {
-        if (getRetryPolicy(context.getSession()) == RetryPolicy.TASK && isFaultTolerantExecutionForcePreferredWritePartitioningEnabled(context.getSession())) {
-            // Choosing preferred partitioning introduces a risk of running into a skew (for example when writing to only a single partition).
-            // Fault tolerant execution can detect a potential skew automatically (based on runtime statistics) and mitigate it by splitting skewed partitions.
-            return enable(node);
-        }
-
-        int minimumNumberOfPartitions = getPreferredWritePartitioningMinNumberOfPartitions(context.getSession());
-        if (minimumNumberOfPartitions <= 1) {
-            return enable(node);
-        }
-
-        double expectedNumberOfPartitions = getRowsCount(
-                context.getStatsProvider().getStats(node.getSource()),
-                node.getPreferredPartitioningScheme().get().getPartitioning().getColumns());
-        // Disable preferred partitioning at remote exchange level if stats are absent or estimated number of partitions
-        // are less than minimumNumberOfPartitions. This is because at remote exchange we don't have scaling to
-        // mitigate skewness.
-        // TODO - Remove this check after implementing skewness mitigation at remote exchange - https://github.com/trinodb/trino/issues/16178
-        if (isNaN(expectedNumberOfPartitions) || (expectedNumberOfPartitions < minimumNumberOfPartitions)) {
-            return Result.empty();
-        }
-
-        return enable(node);
-    }
-
-    private static Result enable(TableExecuteNode node)
-    {
-        return Result.ofPlanNode(new TableExecuteNode(
-                node.getId(),
-                node.getSource(),
-                node.getTarget(),
-                node.getRowCountSymbol(),
-                node.getFragmentSymbol(),
-                node.getColumns(),
-                node.getColumnNames(),
-                node.getPreferredPartitioningScheme(),
-                Optional.empty()));
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ApplyPreferredTableWriterPartitioning.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ApplyPreferredTableWriterPartitioning.java
deleted file mode 100644
index 2ddcc492059d..000000000000
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ApplyPreferredTableWriterPartitioning.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed 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 io.trino.sql.planner.iterative.rule;
-
-import io.trino.Session;
-import io.trino.matching.Captures;
-import io.trino.matching.Pattern;
-import io.trino.operator.RetryPolicy;
-import io.trino.sql.planner.iterative.Rule;
-import io.trino.sql.planner.plan.TableWriterNode;
-
-import java.util.Optional;
-
-import static io.trino.SystemSessionProperties.getPreferredWritePartitioningMinNumberOfPartitions;
-import static io.trino.SystemSessionProperties.getRetryPolicy;
-import static io.trino.SystemSessionProperties.isFaultTolerantExecutionForcePreferredWritePartitioningEnabled;
-import static io.trino.SystemSessionProperties.isUsePreferredWritePartitioning;
-import static io.trino.cost.AggregationStatsRule.getRowsCount;
-import static io.trino.sql.planner.plan.Patterns.tableWriterNode;
-import static java.lang.Double.isNaN;
-
-/**
- * Rule verifies if preconditions for using preferred write partitioning are met:
- *  - expected number of partitions to be written (based on table stat) is greater
- *    than or equal to preferred_write_partitioning_min_number_of_partitions session property,
- *  - use_preferred_write_partitioning is set to true.
- *
- * If precondition are met the {@link TableWriterNode} is modified to mark the intention to use preferred write partitioning:
- * value of {@link TableWriterNode#getPreferredPartitioningScheme()} is set as result of {@link TableWriterNode#getPartitioningScheme()}.
- */
-public class ApplyPreferredTableWriterPartitioning
-        implements Rule<TableWriterNode>
-{
-    public static final Pattern<TableWriterNode> WRITER_NODE_WITH_PREFERRED_PARTITIONING = tableWriterNode()
-            .matching(node -> node.getPreferredPartitioningScheme().isPresent());
-
-    @Override
-    public Pattern<TableWriterNode> getPattern()
-    {
-        return WRITER_NODE_WITH_PREFERRED_PARTITIONING;
-    }
-
-    @Override
-    public boolean isEnabled(Session session)
-    {
-        return isUsePreferredWritePartitioning(session);
-    }
-
-    @Override
-    public Result apply(TableWriterNode node, Captures captures, Context context)
-    {
-        if (getRetryPolicy(context.getSession()) == RetryPolicy.TASK && isFaultTolerantExecutionForcePreferredWritePartitioningEnabled(context.getSession())) {
-            // Choosing preferred partitioning introduces a risk of running into a skew (for example when writing to only a single partition).
-            // Fault tolerant execution can detect a potential skew automatically (based on runtime statistics) and mitigate it by splitting skewed partitions.
-            return enable(node);
-        }
-
-        int minimumNumberOfPartitions = getPreferredWritePartitioningMinNumberOfPartitions(context.getSession());
-        if (minimumNumberOfPartitions <= 1) {
-            return enable(node);
-        }
-
-        double expectedNumberOfPartitions = getRowsCount(
-                context.getStatsProvider().getStats(node.getSource()),
-                node.getPreferredPartitioningScheme().get().getPartitioning().getColumns());
-        // Disable preferred partitioning at remote exchange level if stats are absent or estimated number of partitions
-        // are less than minimumNumberOfPartitions. This is because at remote exchange we don't have scaling to
-        // mitigate skewness.
-        // TODO - Remove this check after implementing skewness mitigation at remote exchange - https://github.com/trinodb/trino/issues/16178
-        if (isNaN(expectedNumberOfPartitions) || (expectedNumberOfPartitions < minimumNumberOfPartitions)) {
-            return Result.empty();
-        }
-
-        return enable(node);
-    }
-
-    private Result enable(TableWriterNode node)
-    {
-        return Result.ofPlanNode(new TableWriterNode(
-                node.getId(),
-                node.getSource(),
-                node.getTarget(),
-                node.getRowCountSymbol(),
-                node.getFragmentSymbol(),
-                node.getColumns(),
-                node.getColumnNames(),
-                node.getPreferredPartitioningScheme(),
-                Optional.empty(),
-                node.getStatisticsAggregation(),
-                node.getStatisticsAggregationDescriptor()));
-    }
-}
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ApplyTableScanRedirection.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ApplyTableScanRedirection.java
index 38d7f6472bd5..a211696d9f02 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ApplyTableScanRedirection.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ApplyTableScanRedirection.java
@@ -23,7 +23,6 @@
 import io.trino.matching.Pattern;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.TableHandle;
-import io.trino.metadata.TableMetadata;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ColumnHandle;
@@ -89,14 +88,13 @@ public Result apply(TableScanNode scanNode, Captures captures, Context context)
         CatalogSchemaTableName destinationTable = tableScanRedirectApplicationResult.get().getDestinationTable();
 
         QualifiedObjectName destinationObjectName = convertFromSchemaTableName(destinationTable.getCatalogName()).apply(destinationTable.getSchemaTableName());
-        Optional<QualifiedObjectName> redirectedObjectName = plannerContext.getMetadata().getRedirectionAwareTableHandle(context.getSession(), destinationObjectName).getRedirectedTableName();
+        Optional<QualifiedObjectName> redirectedObjectName = plannerContext.getMetadata().getRedirectionAwareTableHandle(context.getSession(), destinationObjectName).redirectedTableName();
 
         redirectedObjectName.ifPresent(name -> {
             throw new TrinoException(NOT_SUPPORTED, format("Further redirection of destination table '%s' to '%s' is not supported", destinationObjectName, name));
         });
 
-        TableMetadata tableMetadata = plannerContext.getMetadata().getTableMetadata(context.getSession(), scanNode.getTable());
-        CatalogSchemaTableName sourceTable = new CatalogSchemaTableName(tableMetadata.getCatalogName(), tableMetadata.getTable());
+        CatalogSchemaTableName sourceTable = plannerContext.getMetadata().getTableName(context.getSession(), scanNode.getTable());
         if (destinationTable.equals(sourceTable)) {
             return Result.empty();
         }
@@ -224,7 +222,7 @@ public Result apply(TableScanNode scanNode, Captures captures, Context context)
                         newAssignments.keySet(),
                         casts.buildOrThrow(),
                         newScanNode),
-                domainTranslator.toPredicate(context.getSession(), transformedConstraint));
+                domainTranslator.toPredicate(transformedConstraint));
 
         return Result.ofPlanNode(applyProjection(
                 context.getIdAllocator(),
@@ -263,7 +261,7 @@ private Cast getCast(
             Type sourceType)
     {
         try {
-            plannerContext.getMetadata().getCoercion(session, destinationType, sourceType);
+            plannerContext.getMetadata().getCoercion(destinationType, sourceType);
         }
         catch (TrinoException e) {
             throw new TrinoException(FUNCTION_NOT_FOUND, format(
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ArraySortAfterArrayDistinct.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ArraySortAfterArrayDistinct.java
index eb65957ba9bf..656cd07b0af6 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ArraySortAfterArrayDistinct.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ArraySortAfterArrayDistinct.java
@@ -15,32 +15,35 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import io.trino.Session;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.operator.scalar.ArrayDistinctFunction;
 import io.trino.operator.scalar.ArraySortFunction;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.type.Type;
 import io.trino.sql.PlannerContext;
-import io.trino.sql.planner.FunctionCallBuilder;
+import io.trino.sql.planner.BuiltinFunctionCallBuilder;
 import io.trino.sql.planner.iterative.Rule;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.ExpressionTreeRewriter;
 import io.trino.sql.tree.FunctionCall;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
 
 import java.util.List;
 import java.util.Set;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 
 public class ArraySortAfterArrayDistinct
         extends ExpressionRewriteRuleSet
 {
+    private static final CatalogSchemaFunctionName ARRAY_DISTINCT_NAME = builtinFunctionName(ArrayDistinctFunction.NAME);
+    private static final CatalogSchemaFunctionName ARRAY_SORT_NAME = builtinFunctionName(ArraySortFunction.NAME);
+
     public ArraySortAfterArrayDistinct(PlannerContext plannerContext)
     {
-        super((expression, context) -> rewrite(expression, context, plannerContext.getMetadata()));
+        super((expression, context) -> rewrite(expression, plannerContext.getMetadata()));
     }
 
     @Override
@@ -54,49 +57,46 @@ public Set<Rule<?>> rules()
                 patternRecognitionExpressionRewrite());
     }
 
-    private static Expression rewrite(Expression expression, Rule.Context context, Metadata metadata)
+    private static Expression rewrite(Expression expression, Metadata metadata)
     {
         if (expression instanceof SymbolReference) {
             return expression;
         }
-        Session session = context.getSession();
-        return ExpressionTreeRewriter.rewriteWith(new Visitor(metadata, session), expression);
+        return ExpressionTreeRewriter.rewriteWith(new Visitor(metadata), expression);
     }
 
     private static class Visitor
             extends io.trino.sql.tree.ExpressionRewriter<Void>
     {
         private final Metadata metadata;
-        private final Session session;
 
-        public Visitor(Metadata metadata, Session session)
+        public Visitor(Metadata metadata)
         {
             this.metadata = metadata;
-            this.session = session;
         }
 
         @Override
         public Expression rewriteFunctionCall(FunctionCall node, Void context, ExpressionTreeRewriter<Void> treeRewriter)
         {
             FunctionCall rewritten = treeRewriter.defaultRewrite(node, context);
-            if (metadata.decodeFunction(rewritten.getName()).getSignature().getName().equals(ArrayDistinctFunction.NAME) &&
+            if (metadata.decodeFunction(rewritten.getName()).getSignature().getName().equals(ARRAY_DISTINCT_NAME) &&
                     getOnlyElement(rewritten.getArguments()) instanceof FunctionCall) {
                 Expression expression = getOnlyElement(rewritten.getArguments());
                 FunctionCall functionCall = (FunctionCall) expression;
                 ResolvedFunction resolvedFunction = metadata.decodeFunction(functionCall.getName());
-                if (resolvedFunction.getSignature().getName().equals(ArraySortFunction.NAME)) {
+                if (resolvedFunction.getSignature().getName().equals(ARRAY_SORT_NAME)) {
                     List<Expression> arraySortArguments = functionCall.getArguments();
                     List<Type> arraySortArgumentsTypes = resolvedFunction.getSignature().getArgumentTypes();
 
-                    FunctionCall arrayDistinctCall = FunctionCallBuilder.resolve(session, metadata)
-                            .setName(QualifiedName.of(ArrayDistinctFunction.NAME))
+                    FunctionCall arrayDistinctCall = BuiltinFunctionCallBuilder.resolve(metadata)
+                            .setName(ArrayDistinctFunction.NAME)
                             .setArguments(
                                     ImmutableList.of(arraySortArgumentsTypes.get(0)),
                                     ImmutableList.of(arraySortArguments.get(0)))
                             .build();
 
-                    FunctionCallBuilder arraySortCallBuilder = FunctionCallBuilder.resolve(session, metadata)
-                            .setName(QualifiedName.of(ArraySortFunction.NAME))
+                    BuiltinFunctionCallBuilder arraySortCallBuilder = BuiltinFunctionCallBuilder.resolve(metadata)
+                            .setName(ArraySortFunction.NAME)
                             .addArgument(arraySortArgumentsTypes.get(0), arrayDistinctCall);
 
                     if (arraySortArguments.size() == 2) {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/CanonicalizeExpressionRewriter.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/CanonicalizeExpressionRewriter.java
index bedcf9a977b2..72469a1a0efc 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/CanonicalizeExpressionRewriter.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/CanonicalizeExpressionRewriter.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.Session;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.type.DateType;
 import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.TimestampWithTimeZoneType;
@@ -42,6 +43,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.metadata.ResolvedFunction.extractFunctionName;
 import static io.trino.sql.ExpressionUtils.isEffectivelyLiteral;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
@@ -132,8 +134,8 @@ public Expression rewriteIfExpression(IfExpression node, Void context, Expressio
         @Override
         public Expression rewriteFunctionCall(FunctionCall node, Void context, ExpressionTreeRewriter<Void> treeRewriter)
         {
-            String functionName = extractFunctionName(node.getName());
-            if (functionName.equals("date") && node.getArguments().size() == 1) {
+            CatalogSchemaFunctionName functionName = extractFunctionName(node.getName());
+            if (functionName.equals(builtinFunctionName("date")) && node.getArguments().size() == 1) {
                 Expression argument = node.getArguments().get(0);
                 Type argumentType = expressionTypes.get(NodeRef.of(argument));
                 if (argumentType instanceof TimestampType
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DecorrelateUnnest.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DecorrelateUnnest.java
index 2cd0ed7ffca5..8d3042ada5e7 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DecorrelateUnnest.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DecorrelateUnnest.java
@@ -49,7 +49,6 @@
 import io.trino.sql.tree.IfExpression;
 import io.trino.sql.tree.IsNullPredicate;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 
 import java.util.List;
 import java.util.Optional;
@@ -411,7 +410,7 @@ public RewriteResult visitEnforceSingleRow(EnforceSingleRowNode node, Void conte
                             rowNumberSymbol.toSymbolReference(),
                             new GenericLiteral("BIGINT", "1")),
                     new Cast(
-                            failFunction(metadata, session, SUBQUERY_MULTIPLE_ROWS, "Scalar sub-query has returned multiple rows"),
+                            failFunction(metadata, SUBQUERY_MULTIPLE_ROWS, "Scalar sub-query has returned multiple rows"),
                             toSqlType(BOOLEAN)),
                     TRUE_LITERAL);
 
@@ -464,7 +463,7 @@ public RewriteResult visitTopN(TopNNode node, Void context)
             // Do not reuse source's rowNumberSymbol, because it might not follow the TopNNode's ordering.
             Symbol rowNumberSymbol = symbolAllocator.newSymbol("row_number", BIGINT);
             WindowNode.Function rowNumberFunction = new WindowNode.Function(
-                    metadata.resolveFunction(session, QualifiedName.of("row_number"), ImmutableList.of()),
+                    metadata.resolveBuiltinFunction("row_number", ImmutableList.of()),
                     ImmutableList.of(),
                     DEFAULT_FRAME,
                     false);
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ExpressionRewriteRuleSet.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ExpressionRewriteRuleSet.java
index ee20ff805798..5e290cd38638 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ExpressionRewriteRuleSet.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ExpressionRewriteRuleSet.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableSet;
 import io.trino.matching.Captures;
 import io.trino.matching.Pattern;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.sql.planner.OrderingScheme;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.SymbolsExtractor;
@@ -39,7 +40,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.OrderBy;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.SortItem;
 import io.trino.sql.tree.SortItem.NullOrdering;
@@ -176,10 +176,11 @@ public Result apply(AggregationNode aggregationNode, Captures captures, Context
             ImmutableMap.Builder<Symbol, Aggregation> aggregations = ImmutableMap.builder();
             for (Map.Entry<Symbol, Aggregation> entry : aggregationNode.getAggregations().entrySet()) {
                 Aggregation aggregation = entry.getValue();
+                CatalogSchemaFunctionName name = aggregation.getResolvedFunction().getSignature().getName();
                 FunctionCall call = (FunctionCall) rewriter.rewrite(
                         new FunctionCall(
                                 Optional.empty(),
-                                QualifiedName.of(aggregation.getResolvedFunction().getSignature().getName()),
+                                aggregation.getResolvedFunction().toQualifiedName(),
                                 Optional.empty(),
                                 aggregation.getFilter().map(symbol -> new SymbolReference(symbol.getName())),
                                 aggregation.getOrderingScheme().map(orderBy -> new OrderBy(orderBy.getOrderBy().stream()
@@ -194,7 +195,7 @@ public Result apply(AggregationNode aggregationNode, Captures captures, Context
                                 aggregation.getArguments()),
                         context);
                 verify(
-                        QualifiedName.of(extractFunctionName(call.getName())).equals(QualifiedName.of(aggregation.getResolvedFunction().getSignature().getName())),
+                        extractFunctionName(call.getName()).equals(name),
                         "Aggregation function name changed");
                 Aggregation newAggregation = new Aggregation(
                         aggregation.getResolvedFunction(),
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ExtractSpatialJoins.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ExtractSpatialJoins.java
index a8c44e663fb0..6d5361e48124 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ExtractSpatialJoins.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ExtractSpatialJoins.java
@@ -27,6 +27,7 @@
 import io.trino.matching.Pattern;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedObjectName;
+import io.trino.metadata.ResolvedFunction;
 import io.trino.metadata.Split;
 import io.trino.metadata.TableHandle;
 import io.trino.spi.Page;
@@ -43,7 +44,8 @@
 import io.trino.split.SplitSource;
 import io.trino.split.SplitSource.SplitBatch;
 import io.trino.sql.PlannerContext;
-import io.trino.sql.planner.FunctionCallBuilder;
+import io.trino.sql.planner.BuiltinFunctionCallBuilder;
+import io.trino.sql.planner.ResolvedFunctionCallBuilder;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.TypeAnalyzer;
 import io.trino.sql.planner.iterative.Rule;
@@ -61,7 +63,6 @@
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FunctionCall;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.sql.tree.SymbolReference;
 
@@ -81,7 +82,6 @@
 import static io.trino.matching.Capture.newCapture;
 import static io.trino.spi.StandardErrorCode.INVALID_SPATIAL_PARTITIONING;
 import static io.trino.spi.connector.Constraint.alwaysTrue;
-import static io.trino.spi.connector.DynamicFilter.EMPTY;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.VarcharType.VARCHAR;
@@ -434,10 +434,12 @@ else if (alignment < 0) {
             }
         }
 
-        Expression newSpatialFunction = FunctionCallBuilder.resolve(context.getSession(), plannerContext.getMetadata())
-                .setName(spatialFunction.getName())
-                .addArgument(GEOMETRY_TYPE_SIGNATURE, newFirstArgument)
-                .addArgument(GEOMETRY_TYPE_SIGNATURE, newSecondArgument)
+        ResolvedFunction resolvedFunction = plannerContext.getFunctionDecoder()
+                .fromQualifiedName(spatialFunction.getName())
+                .orElseThrow(() -> new IllegalArgumentException("function call not resolved"));
+        Expression newSpatialFunction = ResolvedFunctionCallBuilder.builder(resolvedFunction)
+                .addArgument(newFirstArgument)
+                .addArgument(newSecondArgument)
                 .build();
         Expression newFilter = replaceExpression(filter, ImmutableMap.of(spatialFunction, newSpatialFunction));
 
@@ -467,7 +469,7 @@ private static KdbTree loadKdbTree(String tableName, Session session, Metadata m
         ColumnHandle kdbTreeColumn = Iterables.getOnlyElement(visibleColumnHandles);
 
         Optional<KdbTree> kdbTree = Optional.empty();
-        try (SplitSource splitSource = splitManager.getSplits(session, tableHandle, EMPTY, alwaysTrue())) {
+        try (SplitSource splitSource = splitManager.getSplits(session, session.getQuerySpan(), tableHandle, DynamicFilter.EMPTY, alwaysTrue())) {
             while (!Thread.currentThread().isInterrupted()) {
                 SplitBatch splitBatch = getFutureValue(splitSource.getNextBatch(1000));
                 List<Split> splits = splitBatch.getSplits();
@@ -595,8 +597,8 @@ private static PlanNode addPartitioningNodes(PlannerContext plannerContext, Cont
         }
 
         TypeSignature typeSignature = new TypeSignature(KDB_TREE_TYPENAME);
-        FunctionCallBuilder spatialPartitionsCall = FunctionCallBuilder.resolve(context.getSession(), plannerContext.getMetadata())
-                .setName(QualifiedName.of("spatial_partitions"))
+        BuiltinFunctionCallBuilder spatialPartitionsCall = BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                .setName("spatial_partitions")
                 .addArgument(typeSignature, new Cast(new StringLiteral(KdbTreeUtils.toJson(kdbTree)), toSqlType(plannerContext.getTypeManager().getType(typeSignature))))
                 .addArgument(GEOMETRY_TYPE_SIGNATURE, geometry);
         radius.ifPresent(value -> spatialPartitionsCall.addArgument(DOUBLE, value));
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementBernoulliSampleAsFilter.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementBernoulliSampleAsFilter.java
index 8f9bcd4965ba..13f4d623586e 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementBernoulliSampleAsFilter.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementBernoulliSampleAsFilter.java
@@ -16,13 +16,12 @@
 import io.trino.matching.Captures;
 import io.trino.matching.Pattern;
 import io.trino.metadata.Metadata;
-import io.trino.sql.planner.FunctionCallBuilder;
+import io.trino.sql.planner.BuiltinFunctionCallBuilder;
 import io.trino.sql.planner.iterative.Rule;
 import io.trino.sql.planner.plan.FilterNode;
 import io.trino.sql.planner.plan.SampleNode;
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.DoubleLiteral;
-import io.trino.sql.tree.QualifiedName;
 
 import static io.trino.sql.planner.plan.Patterns.Sample.sampleType;
 import static io.trino.sql.planner.plan.Patterns.sample;
@@ -67,8 +66,8 @@ public Result apply(SampleNode sample, Captures captures, Context context)
                 sample.getSource(),
                 new ComparisonExpression(
                         ComparisonExpression.Operator.LESS_THAN,
-                        FunctionCallBuilder.resolve(context.getSession(), metadata)
-                                .setName(QualifiedName.of("rand"))
+                        BuiltinFunctionCallBuilder.resolve(metadata)
+                                .setName("rand")
                                 .build(),
                         new DoubleLiteral(Double.toString(sample.getSampleRatio())))));
     }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementExceptAll.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementExceptAll.java
index 4ab4ee4d73bf..1c61e8bb0b58 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementExceptAll.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementExceptAll.java
@@ -28,7 +28,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.GenericLiteral;
-import io.trino.sql.tree.QualifiedName;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -97,7 +96,7 @@ public Result apply(ExceptNode node, Captures captures, Context context)
 
         // compute expected multiplicity for every row
         checkState(result.getCountSymbols().size() > 0, "ExceptNode translation result has no count symbols");
-        ResolvedFunction greatest = metadata.resolveFunction(context.getSession(), QualifiedName.of("greatest"), fromTypes(BIGINT, BIGINT));
+        ResolvedFunction greatest = metadata.resolveBuiltinFunction("greatest", fromTypes(BIGINT, BIGINT));
 
         Expression count = result.getCountSymbols().get(0).toSymbolReference();
         for (int i = 1; i < result.getCountSymbols().size(); i++) {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementIntersectAll.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementIntersectAll.java
index f8c19e0fd449..73c9b381762a 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementIntersectAll.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementIntersectAll.java
@@ -26,7 +26,6 @@
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FunctionCall;
-import io.trino.sql.tree.QualifiedName;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -94,7 +93,7 @@ public Result apply(IntersectNode node, Captures captures, Context context)
 
         // compute expected multiplicity for every row
         checkState(result.getCountSymbols().size() > 0, "IntersectNode translation result has no count symbols");
-        ResolvedFunction least = metadata.resolveFunction(context.getSession(), QualifiedName.of("least"), fromTypes(BIGINT, BIGINT));
+        ResolvedFunction least = metadata.resolveBuiltinFunction("least", fromTypes(BIGINT, BIGINT));
 
         Expression minCount = result.getCountSymbols().get(0).toSymbolReference();
         for (int i = 1; i < result.getCountSymbols().size(); i++) {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementLimitWithTies.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementLimitWithTies.java
index 5cefff783c9c..3ba80e0daf08 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementLimitWithTies.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementLimitWithTies.java
@@ -34,7 +34,6 @@
 import io.trino.sql.planner.plan.WindowNode;
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.GenericLiteral;
-import io.trino.sql.tree.QualifiedName;
 
 import java.util.List;
 import java.util.Optional;
@@ -121,7 +120,7 @@ public static PlanNode rewriteLimitWithTiesWithPartitioning(LimitNode limitNode,
         Symbol rankSymbol = symbolAllocator.newSymbol("rank_num", BIGINT);
 
         WindowNode.Function rankFunction = new WindowNode.Function(
-                metadata.resolveFunction(session, QualifiedName.of("rank"), ImmutableList.of()),
+                metadata.resolveBuiltinFunction("rank", ImmutableList.of()),
                 ImmutableList.of(),
                 DEFAULT_FRAME,
                 false);
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementTableFunctionSource.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementTableFunctionSource.java
index 4d18d1f03dfd..e7fa463af3fa 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementTableFunctionSource.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementTableFunctionSource.java
@@ -45,7 +45,6 @@
 import io.trino.sql.tree.LogicalExpression;
 import io.trino.sql.tree.NotExpression;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 
 import java.util.Collection;
 import java.util.Comparator;
@@ -197,8 +196,8 @@ public Result apply(TableFunctionNode node, Captures captures, Context context)
         }
         Map<String, SourceWithProperties> sources = mapSourcesByName(node.getSources(), node.getTableArgumentProperties());
         ImmutableList.Builder<NodeWithSymbols> intermediateResultsBuilder = ImmutableList.builder();
-        ResolvedFunction rowNumberFunction = metadata.resolveFunction(context.getSession(), QualifiedName.of("row_number"), ImmutableList.of());
-        ResolvedFunction countFunction = metadata.resolveFunction(context.getSession(), QualifiedName.of("count"), ImmutableList.of());
+        ResolvedFunction rowNumberFunction = metadata.resolveBuiltinFunction("row_number", ImmutableList.of());
+        ResolvedFunction countFunction = metadata.resolveBuiltinFunction("count", ImmutableList.of());
 
         // handle co-partitioned sources
         for (List<String> copartitioningList : node.getCopartitioningLists()) {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/NormalizeOrExpressionRewriter.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/NormalizeOrExpressionRewriter.java
index 1c5f2aaa4e0f..e26b23bf2878 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/NormalizeOrExpressionRewriter.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/NormalizeOrExpressionRewriter.java
@@ -14,6 +14,8 @@
 package io.trino.sql.planner.iterative.rule;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.ImmutableSet;
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.ExpressionRewriter;
@@ -22,19 +24,17 @@
 import io.trino.sql.tree.InPredicate;
 import io.trino.sql.tree.LogicalExpression;
 
-import java.util.LinkedHashMap;
+import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.sql.ExpressionUtils.and;
 import static io.trino.sql.ExpressionUtils.or;
 import static io.trino.sql.tree.ComparisonExpression.Operator.EQUAL;
 import static io.trino.sql.tree.LogicalExpression.Operator.AND;
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.mapping;
 
 public final class NormalizeOrExpressionRewriter
 {
@@ -59,35 +59,70 @@ public Expression rewriteLogicalExpression(LogicalExpression node, Void context,
                 return and(terms);
             }
 
-            List<InPredicate> comparisons = terms.stream()
-                    .filter(NormalizeOrExpressionRewriter::isEqualityComparisonExpression)
-                    .map(ComparisonExpression.class::cast)
-                    .collect(groupingBy(
-                            ComparisonExpression::getLeft,
-                            LinkedHashMap::new,
-                            mapping(ComparisonExpression::getRight, Collectors.toList())))
-                    .entrySet().stream()
-                    .filter(entry -> entry.getValue().size() > 1)
-                    .map(entry -> new InPredicate(entry.getKey(), new InListExpression(entry.getValue())))
-                    .collect(Collectors.toList());
+            ImmutableList.Builder<InPredicate> inPredicateBuilder = ImmutableList.builder();
+            ImmutableSet.Builder<Expression> expressionToSkipBuilder = ImmutableSet.builder();
+            ImmutableList.Builder<Expression> othersExpressionBuilder = ImmutableList.builder();
+            groupComparisonAndInPredicate(terms).forEach((expression, values) -> {
+                if (values.size() > 1) {
+                    inPredicateBuilder.add(new InPredicate(expression, mergeToInListExpression(values)));
+                    expressionToSkipBuilder.add(expression);
+                }
+            });
 
-            Set<Expression> expressionToSkip = comparisons.stream()
-                    .map(InPredicate::getValue)
-                    .collect(toImmutableSet());
-
-            List<Expression> others = terms.stream()
-                    .filter(expression -> !isEqualityComparisonExpression(expression) || !expressionToSkip.contains(((ComparisonExpression) expression).getLeft()))
-                    .collect(Collectors.toList());
+            Set<Expression> expressionToSkip = expressionToSkipBuilder.build();
+            for (Expression expression : terms) {
+                if (expression instanceof ComparisonExpression comparisonExpression && comparisonExpression.getOperator() == EQUAL) {
+                    if (!expressionToSkip.contains(comparisonExpression.getLeft())) {
+                        othersExpressionBuilder.add(expression);
+                    }
+                }
+                else if (expression instanceof InPredicate inPredicate && inPredicate.getValueList() instanceof InListExpression) {
+                    if (!expressionToSkip.contains(inPredicate.getValue())) {
+                        othersExpressionBuilder.add(expression);
+                    }
+                }
+                else {
+                    othersExpressionBuilder.add(expression);
+                }
+            }
 
             return or(ImmutableList.<Expression>builder()
-                    .addAll(others)
-                    .addAll(comparisons)
+                    .addAll(othersExpressionBuilder.build())
+                    .addAll(inPredicateBuilder.build())
                     .build());
         }
-    }
 
-    private static boolean isEqualityComparisonExpression(Expression expression)
-    {
-        return expression instanceof ComparisonExpression && ((ComparisonExpression) expression).getOperator() == EQUAL;
+        private InListExpression mergeToInListExpression(Collection<Expression> expressions)
+        {
+            LinkedHashSet<Expression> expressionValues = new LinkedHashSet<>();
+            for (Expression expression : expressions) {
+                if (expression instanceof ComparisonExpression comparisonExpression && comparisonExpression.getOperator() == EQUAL) {
+                    expressionValues.add(comparisonExpression.getRight());
+                }
+                else if (expression instanceof InPredicate inPredicate && inPredicate.getValueList() instanceof InListExpression valueList) {
+                    expressionValues.addAll(valueList.getValues());
+                }
+                else {
+                    throw new IllegalStateException("Unexpected expression: " + expression);
+                }
+            }
+
+            return new InListExpression(ImmutableList.copyOf(expressionValues));
+        }
+
+        private Map<Expression, Collection<Expression>> groupComparisonAndInPredicate(List<Expression> terms)
+        {
+            ImmutableMultimap.Builder<Expression, Expression> expressionBuilder = ImmutableMultimap.builder();
+            for (Expression expression : terms) {
+                if (expression instanceof ComparisonExpression comparisonExpression && comparisonExpression.getOperator() == EQUAL) {
+                    expressionBuilder.put(comparisonExpression.getLeft(), comparisonExpression);
+                }
+                else if (expression instanceof InPredicate inPredicate && inPredicate.getValueList() instanceof InListExpression) {
+                    expressionBuilder.put(inPredicate.getValue(), inPredicate);
+                }
+            }
+
+            return expressionBuilder.build().asMap();
+        }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PreAggregateCaseAggregations.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PreAggregateCaseAggregations.java
index f7e6684a63ec..51bb39049dbb 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PreAggregateCaseAggregations.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PreAggregateCaseAggregations.java
@@ -22,6 +22,7 @@
 import io.trino.matching.Pattern;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.spi.TrinoException;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Int128;
@@ -40,7 +41,6 @@
 import io.trino.sql.tree.Cast;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.NodeRef;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SearchedCaseExpression;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.sql.tree.WhenClause;
@@ -57,6 +57,7 @@
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.SystemSessionProperties.isPreAggregateCaseAggregationsEnabled;
 import static io.trino.matching.Capture.newCapture;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
@@ -102,7 +103,14 @@ public class PreAggregateCaseAggregations
         implements Rule<AggregationNode>
 {
     private static final int MIN_AGGREGATION_COUNT = 4;
-    private static final Set<String> ALLOWED_FUNCTIONS = ImmutableSet.of("max", "min", "sum");
+
+    // BE EXTREMELY CAREFUL WHEN ADDING NEW FUNCTIONS TO THIS SET
+    // This code appears to be generic, but is not. It only works because the allowed functions have very specific behavior.
+    private static final CatalogSchemaFunctionName MAX = builtinFunctionName("max");
+    private static final CatalogSchemaFunctionName MIN = builtinFunctionName("min");
+    private static final CatalogSchemaFunctionName SUM = builtinFunctionName("sum");
+    private static final Set<CatalogSchemaFunctionName> ALLOWED_FUNCTIONS = ImmutableSet.of(MAX, MIN, SUM);
+
     private static final Capture<ProjectNode> PROJECT_CAPTURE = newCapture();
     private static final Pattern<AggregationNode> PATTERN = aggregation()
             .matching(aggregation -> aggregation.getStep() == SINGLE && aggregation.getGroupingSetCount() == 1)
@@ -329,7 +337,8 @@ private Optional<CaseAggregation> extractCaseAggregation(Symbol aggregationSymbo
             return Optional.empty();
         }
 
-        String name = aggregation.getResolvedFunction().getSignature().getName();
+        ResolvedFunction resolvedFunction = aggregation.getResolvedFunction();
+        CatalogSchemaFunctionName name = resolvedFunction.getSignature().getName();
         if (!ALLOWED_FUNCTIONS.contains(name)) {
             // only cumulative aggregations (e.g. that can be split into aggregation of aggregations) are supported
             return Optional.empty();
@@ -354,10 +363,10 @@ private Optional<CaseAggregation> extractCaseAggregation(Symbol aggregationSymbo
             return Optional.empty();
         }
 
-        Type aggregationType = aggregation.getResolvedFunction().getSignature().getReturnType();
+        Type aggregationType = resolvedFunction.getSignature().getReturnType();
         ResolvedFunction cumulativeFunction;
         try {
-            cumulativeFunction = plannerContext.getMetadata().resolveFunction(context.getSession(), QualifiedName.of(name), fromTypes(aggregationType));
+            cumulativeFunction = plannerContext.getMetadata().resolveBuiltinFunction(name.getFunctionName(), fromTypes(aggregationType));
         }
         catch (TrinoException e) {
             // there is no cumulative aggregation
@@ -374,7 +383,7 @@ private Optional<CaseAggregation> extractCaseAggregation(Symbol aggregationSymbo
             Type defaultType = getType(context, caseExpression.getDefaultValue().get());
             Object defaultValue = optimizeExpression(caseExpression.getDefaultValue().get(), context);
             if (defaultValue != null) {
-                if (!name.equals("sum")) {
+                if (!name.equals(SUM)) {
                     return Optional.empty();
                 }
 
@@ -403,7 +412,7 @@ private Optional<CaseAggregation> extractCaseAggregation(Symbol aggregationSymbo
 
         return Optional.of(new CaseAggregation(
                 aggregationSymbol,
-                aggregation.getResolvedFunction(),
+                resolvedFunction,
                 cumulativeFunction,
                 name,
                 caseExpression.getWhenClauses().get(0).getOperand(),
@@ -432,7 +441,7 @@ private static class CaseAggregation
         // cumulative aggregation function (e.g. aggregation of aggregations)
         private final ResolvedFunction cumulativeFunction;
         // aggregation function name
-        private final String name;
+        private final CatalogSchemaFunctionName name;
         // CASE expression only operand expression
         private final Expression operand;
         // CASE expression only result expression
@@ -444,7 +453,7 @@ public CaseAggregation(
                 Symbol aggregationSymbol,
                 ResolvedFunction function,
                 ResolvedFunction cumulativeFunction,
-                String name,
+                CatalogSchemaFunctionName name,
                 Expression operand,
                 Expression result,
                 Optional<Expression> cumulativeAggregationDefaultValue)
@@ -473,7 +482,7 @@ public ResolvedFunction getCumulativeFunction()
             return cumulativeFunction;
         }
 
-        public String getName()
+        public CatalogSchemaFunctionName getName()
         {
             return name;
         }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PruneCountAggregationOverScalar.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PruneCountAggregationOverScalar.java
index 3a3d4d1d04d6..29d4b46e00c1 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PruneCountAggregationOverScalar.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PruneCountAggregationOverScalar.java
@@ -24,7 +24,6 @@
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.ValuesNode;
 import io.trino.sql.tree.GenericLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Row;
 
 import java.util.Map;
@@ -60,7 +59,7 @@ public Result apply(AggregationNode parent, Captures captures, Context context)
         if (!parent.hasDefaultOutput() || parent.getOutputSymbols().size() != 1) {
             return Result.empty();
         }
-        FunctionId countFunctionId = metadata.resolveFunction(context.getSession(), QualifiedName.of("count"), ImmutableList.of()).getFunctionId();
+        FunctionId countFunctionId = metadata.resolveBuiltinFunction("count", ImmutableList.of()).getFunctionId();
         Map<Symbol, AggregationNode.Aggregation> assignments = parent.getAggregations();
         for (Map.Entry<Symbol, AggregationNode.Aggregation> entry : assignments.entrySet()) {
             AggregationNode.Aggregation aggregation = entry.getValue();
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushAggregationIntoTableScan.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushAggregationIntoTableScan.java
index 06c5c5848907..50aefcbae694 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushAggregationIntoTableScan.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushAggregationIntoTableScan.java
@@ -19,7 +19,6 @@
 import io.trino.matching.Capture;
 import io.trino.matching.Captures;
 import io.trino.matching.Pattern;
-import io.trino.metadata.Metadata;
 import io.trino.metadata.TableHandle;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.AggregationApplicationResult;
@@ -151,7 +150,7 @@ public static Optional<PlanNode> pushAggregationIntoTableScan(
 
         List<AggregateFunction> aggregateFunctions = aggregationsList.stream()
                 .map(Entry::getValue)
-                .map(aggregation -> toAggregateFunction(plannerContext.getMetadata(), context, aggregation))
+                .map(aggregation -> toAggregateFunction(context, aggregation))
                 .collect(toImmutableList());
 
         List<Symbol> aggregationOutputSymbols = aggregationsList.stream()
@@ -199,7 +198,6 @@ public static Optional<PlanNode> pushAggregationIntoTableScan(
                     // by ensuring expression is optimized.
                     Map<NodeRef<Expression>, Type> translatedExpressionTypes = typeAnalyzer.getTypes(session, context.getSymbolAllocator().getTypes(), translated);
                     translated = literalEncoder.toExpression(
-                            session,
                             new ExpressionInterpreter(translated, plannerContext, session, translatedExpressionTypes)
                                     .optimize(NoOpSymbolResolver.INSTANCE),
                             translatedExpressionTypes.get(NodeRef.of(translated)));
@@ -241,9 +239,8 @@ public static Optional<PlanNode> pushAggregationIntoTableScan(
                         assignmentBuilder.build()));
     }
 
-    private static AggregateFunction toAggregateFunction(Metadata metadata, Context context, AggregationNode.Aggregation aggregation)
+    private static AggregateFunction toAggregateFunction(Context context, AggregationNode.Aggregation aggregation)
     {
-        String canonicalName = metadata.getFunctionMetadata(context.getSession(), aggregation.getResolvedFunction()).getCanonicalName();
         BoundSignature signature = aggregation.getResolvedFunction().getSignature();
 
         ImmutableList.Builder<ConnectorExpression> arguments = ImmutableList.builder();
@@ -259,7 +256,7 @@ private static AggregateFunction toAggregateFunction(Metadata metadata, Context
                 .map(symbol -> new Variable(symbol.getName(), context.getSymbolAllocator().getTypes().get(symbol)));
 
         return new AggregateFunction(
-                canonicalName,
+                signature.getName().getFunctionName(),
                 signature.getReturnType(),
                 arguments.build(),
                 sortBy.orElse(ImmutableList.of()),
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushAggregationThroughOuterJoin.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushAggregationThroughOuterJoin.java
index af67662b549f..2cf75ff37cf9 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushAggregationThroughOuterJoin.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushAggregationThroughOuterJoin.java
@@ -264,7 +264,7 @@ private Optional<PlanNode> coalesceWithNullAggregation(AggregationNode aggregati
                 assignmentsBuilder.put(symbol, new CoalesceExpression(symbol.toSymbolReference(), sourceAggregationToOverNullMapping.get(symbol).toSymbolReference()));
             }
             else {
-                assignmentsBuilder.put(symbol, symbol.toSymbolReference());
+                assignmentsBuilder.putIdentity(symbol);
             }
         }
         return Optional.of(new ProjectNode(idAllocator.getNextId(), crossJoin, assignmentsBuilder.build()));
@@ -299,7 +299,7 @@ private MappedAggregationInfo createAggregationOverNull(AggregationNode referenc
         for (Map.Entry<Symbol, AggregationNode.Aggregation> entry : referenceAggregation.getAggregations().entrySet()) {
             Symbol aggregationSymbol = entry.getKey();
             Aggregation overNullAggregation = mapper.map(entry.getValue());
-            Symbol overNullSymbol = symbolAllocator.newSymbol(overNullAggregation.getResolvedFunction().getSignature().getName(), symbolAllocator.getTypes().get(aggregationSymbol));
+            Symbol overNullSymbol = symbolAllocator.newSymbol(overNullAggregation.getResolvedFunction().getSignature().getName().getFunctionName(), symbolAllocator.getTypes().get(aggregationSymbol));
             aggregationsOverNullBuilder.put(overNullSymbol, overNullAggregation);
             aggregationsSymbolMappingBuilder.put(aggregationSymbol, overNullSymbol);
         }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushFilterThroughCountAggregation.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushFilterThroughCountAggregation.java
index e6db9385aa4a..767e58cc7c0f 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushFilterThroughCountAggregation.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushFilterThroughCountAggregation.java
@@ -21,6 +21,7 @@
 import io.trino.matching.Captures;
 import io.trino.matching.Pattern;
 import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.TupleDomain;
@@ -44,6 +45,7 @@
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.matching.Capture.newCapture;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.sql.ExpressionUtils.combineConjuncts;
 import static io.trino.sql.planner.DomainTranslator.getExtractionResult;
 import static io.trino.sql.planner.plan.AggregationNode.Step.SINGLE;
@@ -95,6 +97,8 @@
  */
 public class PushFilterThroughCountAggregation
 {
+    private static final CatalogSchemaFunctionName COUNT_NAME = builtinFunctionName("count");
+
     private final PlannerContext plannerContext;
 
     public PushFilterThroughCountAggregation(PlannerContext plannerContext)
@@ -226,7 +230,7 @@ private static Result pushFilter(FilterNode filterNode, AggregationNode aggregat
             TupleDomain<Symbol> newTupleDomain = tupleDomain.filter((symbol, domain) -> !symbol.equals(countSymbol));
             Expression newPredicate = combineConjuncts(
                     plannerContext.getMetadata(),
-                    new DomainTranslator(plannerContext).toPredicate(context.getSession(), newTupleDomain),
+                    new DomainTranslator(plannerContext).toPredicate(newTupleDomain),
                     extractionResult.getRemainingExpression());
             if (newPredicate.equals(TRUE_LITERAL)) {
                 return Result.ofPlanNode(filterSource);
@@ -253,7 +257,7 @@ private static boolean isGroupedCountWithMask(AggregationNode aggregationNode)
         }
 
         BoundSignature signature = aggregation.getResolvedFunction().getSignature();
-        return signature.getArgumentTypes().isEmpty() && signature.getName().equals("count");
+        return signature.getArgumentTypes().isEmpty() && signature.getName().equals(COUNT_NAME);
     }
 
     private static boolean isGroupedAggregation(AggregationNode aggregationNode)
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushMergeWriterUpdateIntoConnector.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushMergeWriterUpdateIntoConnector.java
new file mode 100644
index 000000000000..0e991a450fe1
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushMergeWriterUpdateIntoConnector.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed 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 io.trino.sql.planner.iterative.rule;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.matching.Capture;
+import io.trino.matching.Captures;
+import io.trino.matching.Pattern;
+import io.trino.metadata.Metadata;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Constant;
+import io.trino.sql.PlannerContext;
+import io.trino.sql.planner.ConnectorExpressionTranslator;
+import io.trino.sql.planner.TypeAnalyzer;
+import io.trino.sql.planner.iterative.Rule;
+import io.trino.sql.planner.plan.MergeProcessorNode;
+import io.trino.sql.planner.plan.MergeWriterNode;
+import io.trino.sql.planner.plan.ProjectNode;
+import io.trino.sql.planner.plan.TableFinishNode;
+import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.TableUpdateNode;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.Node;
+import io.trino.sql.tree.SymbolReference;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.matching.Capture.newCapture;
+import static io.trino.sql.planner.plan.Patterns.mergeProcessor;
+import static io.trino.sql.planner.plan.Patterns.mergeWriter;
+import static io.trino.sql.planner.plan.Patterns.project;
+import static io.trino.sql.planner.plan.Patterns.source;
+import static io.trino.sql.planner.plan.Patterns.tableFinish;
+import static io.trino.sql.planner.plan.Patterns.tableScan;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * This version support only constant updates
+ * and fall back to default behaviour in all other cases
+ */
+public class PushMergeWriterUpdateIntoConnector
+        implements Rule<TableFinishNode>
+{
+    private static final Capture<MergeWriterNode> MERGE_WRITER_NODE_CAPTURE = newCapture();
+    private static final Capture<MergeProcessorNode> MERGE_PROCESSOR_NODE_CAPTURE = newCapture();
+    private static final Capture<TableScanNode> TABLE_SCAN = newCapture();
+    private static final Capture<ProjectNode> PROJECT_NODE_CAPTURE = newCapture();
+
+    private static final Pattern<TableFinishNode> PATTERN =
+            tableFinish().with(source().matching(
+                    mergeWriter().capturedAs(MERGE_WRITER_NODE_CAPTURE).with(source().matching(
+                            mergeProcessor().capturedAs(MERGE_PROCESSOR_NODE_CAPTURE).with(source().matching(
+                                    project().capturedAs(PROJECT_NODE_CAPTURE).with(source().matching(
+                                            tableScan().capturedAs(TABLE_SCAN)))))))));
+
+    public PushMergeWriterUpdateIntoConnector(PlannerContext plannerContext, TypeAnalyzer typeAnalyzer, Metadata metadata)
+    {
+        this.metadata = requireNonNull(metadata, "metadata is null");
+        this.typeAnalyzer = requireNonNull(typeAnalyzer, "typeAnalyzer is null");
+        this.plannerContext = requireNonNull(plannerContext, "plannerContext is null");
+    }
+
+    private final Metadata metadata;
+    private final PlannerContext plannerContext;
+    private final TypeAnalyzer typeAnalyzer;
+
+    @Override
+    public Pattern<TableFinishNode> getPattern()
+    {
+        return PATTERN;
+    }
+
+    @Override
+    public Result apply(TableFinishNode node, Captures captures, Context context)
+    {
+        MergeWriterNode mergeWriter = captures.get(MERGE_WRITER_NODE_CAPTURE);
+        MergeProcessorNode mergeProcessor = captures.get(MERGE_PROCESSOR_NODE_CAPTURE);
+        ProjectNode project = captures.get(PROJECT_NODE_CAPTURE);
+        TableScanNode tableScan = captures.get(TABLE_SCAN);
+
+        Map<String, ColumnHandle> columnHandles = metadata.getColumnHandles(context.getSession(), mergeWriter.getTarget().getHandle());
+        List<String> orderedColumnNames = mergeWriter.getTarget().getMergeParadigmAndTypes().getColumnNames();
+        List<? extends Node> mergeAssignments = project.getAssignments().get(mergeProcessor.getMergeRowSymbol()).getChildren();
+
+        Map<ColumnHandle, Constant> assignments = buildAssignments(orderedColumnNames, mergeAssignments, columnHandles, context);
+        if (assignments.isEmpty()) {
+            return Result.empty();
+        }
+
+        return metadata.applyUpdate(context.getSession(), tableScan.getTable(), assignments)
+                .map(newHandle -> new TableUpdateNode(
+                        context.getIdAllocator().getNextId(),
+                        newHandle,
+                        getOnlyElement(node.getOutputSymbols())))
+                .map(Result::ofPlanNode)
+                .orElseGet(Result::empty);
+    }
+
+    private Map<ColumnHandle, Constant> buildAssignments(
+            List<String> orderedColumnNames,
+            List<? extends Node> mergeAssignments,
+            Map<String, ColumnHandle> columnHandles,
+            Context context)
+    {
+        ImmutableMap.Builder<ColumnHandle, Constant> assignmentsBuilder = ImmutableMap.builder();
+        for (int i = 0; i < orderedColumnNames.size(); i++) {
+            String columnName = orderedColumnNames.get(i);
+            Node assigmentNode = mergeAssignments.get(i);
+            if (assigmentNode instanceof SymbolReference) {
+                // the column is not updated
+                continue;
+            }
+
+            Optional<ConnectorExpression> connectorExpression = ConnectorExpressionTranslator.translate(
+                    context.getSession(),
+                    ((Expression) assigmentNode),
+                    context.getSymbolAllocator().getTypes(),
+                    plannerContext,
+                    typeAnalyzer);
+
+            // we don't support any expressions in update statements yet, only constants
+            if (connectorExpression.isEmpty() || !(connectorExpression.get() instanceof Constant)) {
+                return ImmutableMap.of();
+            }
+            assignmentsBuilder.put(columnHandles.get(columnName), (Constant) connectorExpression.get());
+        }
+
+        return assignmentsBuilder.buildOrThrow();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPartialAggregationThroughExchange.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPartialAggregationThroughExchange.java
index 5fc335b8a6c5..091bac64fdd7 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPartialAggregationThroughExchange.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPartialAggregationThroughExchange.java
@@ -204,7 +204,7 @@ private PlanNode split(AggregationNode node, Context context)
                     .map(plannerContext.getTypeManager()::getType)
                     .collect(toImmutableList());
             Type intermediateType = intermediateTypes.size() == 1 ? intermediateTypes.get(0) : RowType.anonymous(intermediateTypes);
-            Symbol intermediateSymbol = context.getSymbolAllocator().newSymbol(resolvedFunction.getSignature().getName(), intermediateType);
+            Symbol intermediateSymbol = context.getSymbolAllocator().newSymbol(resolvedFunction.getSignature().getName().getFunctionName(), intermediateType);
 
             checkState(originalAggregation.getOrderingScheme().isEmpty(), "Aggregate with ORDER BY does not support partial aggregation");
             intermediateAggregation.put(
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateIntoTableScan.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateIntoTableScan.java
index cb2cbe6c41dc..b0d56e26e1bf 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateIntoTableScan.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateIntoTableScan.java
@@ -206,7 +206,7 @@ public static Optional<PlanNode> pushFilterIntoTableScan(
                             splitExpression.getDeterministicPredicate(),
                             // Simplify the tuple domain to avoid creating an expression with too many nodes,
                             // which would be expensive to evaluate in the call to isCandidate below.
-                            domainTranslator.toPredicate(session, newDomain.simplify().transformKeys(assignments::get))));
+                            domainTranslator.toPredicate(newDomain.simplify().transformKeys(assignments::get))));
             constraint = new Constraint(newDomain, expressionTranslation.connectorExpression(), connectorExpressionAssignments, evaluator::isCandidate, evaluator.getArguments());
         }
         else {
@@ -288,7 +288,6 @@ public static Optional<PlanNode> pushFilterIntoTableScan(
             // by ensuring expression is optimized.
             Map<NodeRef<Expression>, Type> translatedExpressionTypes = typeAnalyzer.getTypes(session, symbolAllocator.getTypes(), translatedExpression);
             translatedExpression = literalEncoder.toExpression(
-                    session,
                     new ExpressionInterpreter(translatedExpression, plannerContext, session, translatedExpressionTypes)
                             .optimize(NoOpSymbolResolver.INSTANCE),
                     translatedExpressionTypes.get(NodeRef.of(translatedExpression)));
@@ -301,7 +300,7 @@ public static Optional<PlanNode> pushFilterIntoTableScan(
                 symbolAllocator,
                 typeAnalyzer,
                 splitExpression.getDynamicFilter(),
-                domainTranslator.toPredicate(session, remainingFilter.transformKeys(assignments::get)),
+                domainTranslator.toPredicate(remainingFilter.transformKeys(assignments::get)),
                 splitExpression.getNonDeterministicPredicate(),
                 remainingDecomposedPredicate);
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateThroughProjectIntoRowNumber.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateThroughProjectIntoRowNumber.java
index 515bf9b5f2d2..cbb507181d92 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateThroughProjectIntoRowNumber.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateThroughProjectIntoRowNumber.java
@@ -141,7 +141,7 @@ public Result apply(FilterNode filter, Captures captures, Context context)
         Expression newPredicate = ExpressionUtils.combineConjuncts(
                 plannerContext.getMetadata(),
                 extractionResult.getRemainingExpression(),
-                new DomainTranslator(plannerContext).toPredicate(context.getSession(), newTupleDomain));
+                new DomainTranslator(plannerContext).toPredicate(newTupleDomain));
         if (newPredicate.equals(TRUE_LITERAL)) {
             return Result.ofPlanNode(project);
         }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateThroughProjectIntoWindow.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateThroughProjectIntoWindow.java
index 2d8b14694065..7f15c6bccc91 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateThroughProjectIntoWindow.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateThroughProjectIntoWindow.java
@@ -147,7 +147,7 @@ public Result apply(FilterNode filter, Captures captures, Context context)
         Expression newPredicate = ExpressionUtils.combineConjuncts(
                 plannerContext.getMetadata(),
                 extractionResult.getRemainingExpression(),
-                new DomainTranslator(plannerContext).toPredicate(context.getSession(), newTupleDomain));
+                new DomainTranslator(plannerContext).toPredicate(newTupleDomain));
         if (newPredicate.equals(TRUE_LITERAL)) {
             return Result.ofPlanNode(project);
         }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionIntoTableScan.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionIntoTableScan.java
index 67f0fa56b94c..16b654753d28 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionIntoTableScan.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionIntoTableScan.java
@@ -157,7 +157,6 @@ public Result apply(ProjectNode project, Captures captures, Context context)
                     // by ensuring expression is optimized.
                     Map<NodeRef<Expression>, Type> translatedExpressionTypes = typeAnalyzer.getTypes(session, context.getSymbolAllocator().getTypes(), translated);
                     translated = literalEncoder.toExpression(
-                            session,
                             new ExpressionInterpreter(translated, plannerContext, session, translatedExpressionTypes)
                                     .optimize(NoOpSymbolResolver.INSTANCE),
                             translatedExpressionTypes.get(NodeRef.of(translated)));
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionThroughExchange.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionThroughExchange.java
index 57d4ff82ea77..0296605344c7 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionThroughExchange.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionThroughExchange.java
@@ -97,7 +97,7 @@ public Result apply(ProjectNode project, Captures captures, Context context)
             partitioningColumns.stream()
                     .map(outputToInputMap::get)
                     .forEach(inputSymbol -> {
-                        projections.put(inputSymbol, inputSymbol.toSymbolReference());
+                        projections.putIdentity(inputSymbol);
                         inputs.add(inputSymbol);
                     });
 
@@ -105,7 +105,7 @@ public Result apply(ProjectNode project, Captures captures, Context context)
             exchange.getPartitioningScheme().getHashColumn()
                     .map(outputToInputMap::get)
                     .ifPresent(inputSymbol -> {
-                        projections.put(inputSymbol, inputSymbol.toSymbolReference());
+                        projections.putIdentity(inputSymbol);
                         inputs.add(inputSymbol);
                     });
 
@@ -116,7 +116,7 @@ public Result apply(ProjectNode project, Captures captures, Context context)
                         .filter(symbol -> !partitioningColumns.contains(symbol))
                         .map(outputToInputMap::get)
                         .forEach(inputSymbol -> {
-                            projections.put(inputSymbol, inputSymbol.toSymbolReference());
+                            projections.putIdentity(inputSymbol);
                             inputs.add(inputSymbol);
                         });
             }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushdownFilterIntoRowNumber.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushdownFilterIntoRowNumber.java
index 3d99f735cf72..1b525a61aaae 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushdownFilterIntoRowNumber.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushdownFilterIntoRowNumber.java
@@ -104,7 +104,7 @@ public Result apply(FilterNode node, Captures captures, Context context)
         Expression newPredicate = ExpressionUtils.combineConjuncts(
                 plannerContext.getMetadata(),
                 extractionResult.getRemainingExpression(),
-                new DomainTranslator(plannerContext).toPredicate(session, newTupleDomain));
+                new DomainTranslator(plannerContext).toPredicate(newTupleDomain));
 
         if (newPredicate.equals(BooleanLiteral.TRUE_LITERAL)) {
             return Result.ofPlanNode(source);
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushdownFilterIntoWindow.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushdownFilterIntoWindow.java
index 7180c332757d..392531923fab 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushdownFilterIntoWindow.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushdownFilterIntoWindow.java
@@ -124,7 +124,7 @@ public Result apply(FilterNode node, Captures captures, Context context)
         Expression newPredicate = ExpressionUtils.combineConjuncts(
                 plannerContext.getMetadata(),
                 extractionResult.getRemainingExpression(),
-                new DomainTranslator(plannerContext).toPredicate(session, newTupleDomain));
+                new DomainTranslator(plannerContext).toPredicate(newTupleDomain));
 
         if (newPredicate.equals(BooleanLiteral.TRUE_LITERAL)) {
             return Result.ofPlanNode(newSource);
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveEmptyMergeWriterRuleSet.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveEmptyMergeWriterRuleSet.java
index 05a953bcd238..e5caec519e63 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveEmptyMergeWriterRuleSet.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveEmptyMergeWriterRuleSet.java
@@ -45,7 +45,8 @@
  *    - Exchange (optional)
  *      - MergeWriter
  *        - Exchange
- *          - empty Values
+ *          - Project
+ *            - empty Values
  * </pre>
  * into
  * <pre>
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveEmptyTableExecute.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveEmptyTableExecute.java
index 9360b029254f..9a16f1256b85 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveEmptyTableExecute.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveEmptyTableExecute.java
@@ -23,12 +23,15 @@
 import io.trino.sql.planner.plan.TableExecuteNode;
 import io.trino.sql.planner.plan.TableFinishNode;
 import io.trino.sql.planner.plan.ValuesNode;
+import io.trino.sql.tree.Cast;
 import io.trino.sql.tree.NullLiteral;
 import io.trino.sql.tree.Row;
 
 import java.util.Optional;
 
 import static com.google.common.base.Verify.verify;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
 import static io.trino.sql.planner.plan.Patterns.Values.rowCount;
 import static io.trino.sql.planner.plan.Patterns.tableFinish;
 import static io.trino.sql.planner.plan.Patterns.values;
@@ -86,7 +89,7 @@ public Result apply(TableFinishNode finishNode, Captures captures, Context conte
                 new ValuesNode(
                         finishNode.getId(),
                         finishNode.getOutputSymbols(),
-                        ImmutableList.of(new Row(ImmutableList.of(new NullLiteral())))));
+                        ImmutableList.of(new Row(ImmutableList.of(new Cast(new NullLiteral(), toSqlType(BIGINT)))))));
     }
 
     private Optional<PlanNode> getSingleSourceSkipExchange(PlanNode node, Lookup lookup)
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveRedundantDateTrunc.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveRedundantDateTrunc.java
index 5a7a08bddc11..9ad37f684196 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveRedundantDateTrunc.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveRedundantDateTrunc.java
@@ -15,6 +15,7 @@
 
 import io.airlift.slice.Slice;
 import io.trino.Session;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
 import io.trino.sql.PlannerContext;
@@ -32,6 +33,7 @@
 import java.util.Map;
 
 import static com.google.common.base.Verify.verifyNotNull;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.metadata.ResolvedFunction.extractFunctionName;
 import static io.trino.spi.type.DateType.DATE;
 import static io.trino.sql.ExpressionUtils.isEffectivelyLiteral;
@@ -74,8 +76,8 @@ public Visitor(Session session, PlannerContext plannerContext, Map<NodeRef<Expre
         @Override
         public Expression rewriteFunctionCall(FunctionCall node, Void context, ExpressionTreeRewriter<Void> treeRewriter)
         {
-            String functionName = extractFunctionName(node.getName());
-            if (functionName.equals("date_trunc") && node.getArguments().size() == 2) {
+            CatalogSchemaFunctionName functionName = extractFunctionName(node.getName());
+            if (functionName.equals(builtinFunctionName("date_trunc")) && node.getArguments().size() == 2) {
                 Expression unitExpression = node.getArguments().get(0);
                 Expression argument = node.getArguments().get(1);
                 if (getType(argument) == DATE && getType(unitExpression) instanceof VarcharType && isEffectivelyLiteral(plannerContext, session, unitExpression)) {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveRedundantPredicateAboveTableScan.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveRedundantPredicateAboveTableScan.java
index f43a8dbd6a65..a6c3f1341bb7 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveRedundantPredicateAboveTableScan.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveRedundantPredicateAboveTableScan.java
@@ -142,7 +142,7 @@ public Result apply(FilterNode filterNode, Captures captures, Context context)
                 context.getSymbolAllocator(),
                 typeAnalyzer,
                 TRUE_LITERAL, // Dynamic filters are included in decomposedPredicate.getRemainingExpression()
-                new DomainTranslator(plannerContext).toPredicate(session, unenforcedDomain.transformKeys(assignments::get)),
+                new DomainTranslator(plannerContext).toPredicate(unenforcedDomain.transformKeys(assignments::get)),
                 nonDeterministicPredicate,
                 decomposedPredicate.getRemainingExpression());
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveUnsupportedDynamicFilters.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveUnsupportedDynamicFilters.java
index 9c497daf66f7..406b7e4fd277 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveUnsupportedDynamicFilters.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RemoveUnsupportedDynamicFilters.java
@@ -23,7 +23,6 @@
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.AnalyzePropertyManager;
 import io.trino.metadata.OperatorNotFoundException;
-import io.trino.metadata.SessionPropertyManager;
 import io.trino.metadata.TableFunctionRegistry;
 import io.trino.metadata.TableProceduresPropertyManager;
 import io.trino.metadata.TableProceduresRegistry;
@@ -109,7 +108,6 @@ public RemoveUnsupportedDynamicFilters(PlannerContext plannerContext)
                         user -> ImmutableSet.of(),
                         new TableProceduresRegistry(CatalogServiceProvider.fail("procedures are not supported in testing analyzer")),
                         new TableFunctionRegistry(CatalogServiceProvider.fail("table functions are not supported in testing analyzer")),
-                        new SessionPropertyManager(),
                         new TablePropertyManager(CatalogServiceProvider.fail("table properties not supported in testing analyzer")),
                         new AnalyzePropertyManager(CatalogServiceProvider.fail("analyze properties not supported in testing analyzer")),
                         new TableProceduresPropertyManager(CatalogServiceProvider.fail("procedures are not supported in testing analyzer"))));
@@ -374,7 +372,7 @@ private boolean isSupportedDynamicFilterExpression(Expression expression)
         private boolean doesSaturatedFloorCastOperatorExist(Type fromType, Type toType)
         {
             try {
-                plannerContext.getMetadata().getCoercion(session, SATURATED_FLOOR_CAST, fromType, toType);
+                plannerContext.getMetadata().getCoercion(SATURATED_FLOOR_CAST, fromType, toType);
             }
             catch (OperatorNotFoundException e) {
                 return false;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ReorderJoins.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ReorderJoins.java
index 1cb423c1be66..3f9755b19a7b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ReorderJoins.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ReorderJoins.java
@@ -193,7 +193,7 @@ static class JoinEnumerator
             this.resultComparator = costComparator.forSession(session).onResultOf(result -> result.cost);
             this.idAllocator = requireNonNull(context.getIdAllocator(), "idAllocator is null");
             this.allFilter = requireNonNull(filter, "filter is null");
-            this.allFilterInference = EqualityInference.newInstance(metadata, filter);
+            this.allFilterInference = new EqualityInference(metadata, filter);
             this.lookup = requireNonNull(context.getLookup(), "lookup is null");
         }
 
@@ -364,7 +364,7 @@ private List<Expression> getJoinPredicates(Set<Symbol> leftSymbols, Set<Symbol>
             // create equality inference on available symbols
             // TODO: make generateEqualitiesPartitionedBy take left and right scope
             List<Expression> joinEqualities = allFilterInference.generateEqualitiesPartitionedBy(Sets.union(leftSymbols, rightSymbols)).getScopeEqualities();
-            EqualityInference joinInference = EqualityInference.newInstance(metadata, joinEqualities);
+            EqualityInference joinInference = new EqualityInference(metadata, joinEqualities);
             joinPredicatesBuilder.addAll(joinInference.generateEqualitiesPartitionedBy(leftSymbols).getScopeStraddlingEqualities());
 
             return joinPredicatesBuilder.build();
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ReplaceWindowWithRowNumber.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ReplaceWindowWithRowNumber.java
index f0df14377fb0..9dca394259a9 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ReplaceWindowWithRowNumber.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ReplaceWindowWithRowNumber.java
@@ -17,6 +17,7 @@
 import io.trino.matching.Pattern;
 import io.trino.metadata.Metadata;
 import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.sql.planner.iterative.Rule;
 import io.trino.sql.planner.plan.RowNumberNode;
 import io.trino.sql.planner.plan.WindowNode;
@@ -24,11 +25,14 @@
 import java.util.Optional;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.sql.planner.plan.Patterns.window;
 
 public class ReplaceWindowWithRowNumber
         implements Rule<WindowNode>
 {
+    private static final CatalogSchemaFunctionName ROW_NUMBER_NAME = builtinFunctionName("row_number");
+
     private final Pattern<WindowNode> pattern;
 
     public ReplaceWindowWithRowNumber(Metadata metadata)
@@ -39,7 +43,7 @@ public ReplaceWindowWithRowNumber(Metadata metadata)
                         return false;
                     }
                     BoundSignature signature = getOnlyElement(window.getWindowFunctions().values()).getResolvedFunction().getSignature();
-                    return signature.getArgumentTypes().isEmpty() && signature.getName().equals("row_number");
+                    return signature.getArgumentTypes().isEmpty() && signature.getName().equals(ROW_NUMBER_NAME);
                 })
                 .matching(window -> window.getOrderingScheme().isEmpty());
     }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RewriteSpatialPartitioningAggregation.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RewriteSpatialPartitioningAggregation.java
index de1a3d1b1c73..813f337ae9f2 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RewriteSpatialPartitioningAggregation.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/RewriteSpatialPartitioningAggregation.java
@@ -19,9 +19,10 @@
 import io.trino.matching.Pattern;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.operator.RetryPolicy;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.type.TypeSignature;
 import io.trino.sql.PlannerContext;
-import io.trino.sql.planner.FunctionCallBuilder;
+import io.trino.sql.planner.BuiltinFunctionCallBuilder;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.Rule;
 import io.trino.sql.planner.plan.AggregationNode;
@@ -31,15 +32,15 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.LongLiteral;
-import io.trino.sql.tree.QualifiedName;
 
 import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.SystemSessionProperties.getFaultTolerantExecutionPartitionCount;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionMaxPartitionCount;
 import static io.trino.SystemSessionProperties.getMaxHashPartitionCount;
 import static io.trino.SystemSessionProperties.getRetryPolicy;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypeSignatures;
 import static io.trino.sql.planner.plan.Patterns.aggregation;
@@ -64,7 +65,7 @@ public class RewriteSpatialPartitioningAggregation
         implements Rule<AggregationNode>
 {
     private static final TypeSignature GEOMETRY_TYPE_SIGNATURE = new TypeSignature("Geometry");
-    private static final String NAME = "spatial_partitioning";
+    private static final CatalogSchemaFunctionName NAME = builtinFunctionName("spatial_partitioning");
     private static final Pattern<AggregationNode> PATTERN = aggregation()
             .matching(RewriteSpatialPartitioningAggregation::hasSpatialPartitioningAggregation);
 
@@ -90,15 +91,15 @@ public Pattern<AggregationNode> getPattern()
     @Override
     public Result apply(AggregationNode node, Captures captures, Context context)
     {
-        ResolvedFunction spatialPartitioningFunction = plannerContext.getMetadata().resolveFunction(context.getSession(), QualifiedName.of(NAME), fromTypeSignatures(GEOMETRY_TYPE_SIGNATURE, INTEGER.getTypeSignature()));
-        ResolvedFunction stEnvelopeFunction = plannerContext.getMetadata().resolveFunction(context.getSession(), QualifiedName.of("ST_Envelope"), fromTypeSignatures(GEOMETRY_TYPE_SIGNATURE));
+        ResolvedFunction spatialPartitioningFunction = plannerContext.getMetadata().resolveBuiltinFunction(NAME.getFunctionName(), fromTypeSignatures(GEOMETRY_TYPE_SIGNATURE, INTEGER.getTypeSignature()));
+        ResolvedFunction stEnvelopeFunction = plannerContext.getMetadata().resolveBuiltinFunction("ST_Envelope", fromTypeSignatures(GEOMETRY_TYPE_SIGNATURE));
 
         ImmutableMap.Builder<Symbol, Aggregation> aggregations = ImmutableMap.builder();
         Symbol partitionCountSymbol = context.getSymbolAllocator().newSymbol("partition_count", INTEGER);
         ImmutableMap.Builder<Symbol, Expression> envelopeAssignments = ImmutableMap.builder();
         for (Map.Entry<Symbol, Aggregation> entry : node.getAggregations().entrySet()) {
             Aggregation aggregation = entry.getValue();
-            String name = aggregation.getResolvedFunction().getSignature().getName();
+            CatalogSchemaFunctionName name = aggregation.getResolvedFunction().getSignature().getName();
             if (name.equals(NAME) && aggregation.getArguments().size() == 1) {
                 Expression geometry = getOnlyElement(aggregation.getArguments());
                 Symbol envelopeSymbol = context.getSymbolAllocator().newSymbol("envelope", plannerContext.getTypeManager().getType(GEOMETRY_TYPE_SIGNATURE));
@@ -106,8 +107,8 @@ public Result apply(AggregationNode node, Captures captures, Context context)
                     envelopeAssignments.put(envelopeSymbol, geometry);
                 }
                 else {
-                    envelopeAssignments.put(envelopeSymbol, FunctionCallBuilder.resolve(context.getSession(), plannerContext.getMetadata())
-                            .setName(QualifiedName.of("ST_Envelope"))
+                    envelopeAssignments.put(envelopeSymbol, BuiltinFunctionCallBuilder.resolve(plannerContext.getMetadata())
+                            .setName("ST_Envelope")
                             .addArgument(GEOMETRY_TYPE_SIGNATURE, geometry)
                             .build());
                 }
@@ -127,7 +128,7 @@ public Result apply(AggregationNode node, Captures captures, Context context)
 
         int partitionCount;
         if (getRetryPolicy(context.getSession()) == RetryPolicy.TASK) {
-            partitionCount = getFaultTolerantExecutionPartitionCount(context.getSession());
+            partitionCount = getFaultTolerantExecutionMaxPartitionCount(context.getSession());
         }
         else {
             partitionCount = getMaxHashPartitionCount(context.getSession());
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SetOperationNodeTranslator.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SetOperationNodeTranslator.java
index ff98e767aecf..2a4092c8ec78 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SetOperationNodeTranslator.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SetOperationNodeTranslator.java
@@ -35,7 +35,6 @@
 import io.trino.sql.tree.Cast;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
 
 import java.util.List;
@@ -70,8 +69,8 @@ public SetOperationNodeTranslator(Session session, Metadata metadata, SymbolAllo
         this.symbolAllocator = requireNonNull(symbolAllocator, "SymbolAllocator is null");
         this.idAllocator = requireNonNull(idAllocator, "idAllocator is null");
         requireNonNull(metadata, "metadata is null");
-        this.countFunction = metadata.resolveFunction(session, QualifiedName.of("count"), fromTypes(BOOLEAN));
-        this.rowNumberFunction = metadata.resolveFunction(session, QualifiedName.of("row_number"), ImmutableList.of());
+        this.countFunction = metadata.resolveBuiltinFunction("count", fromTypes(BOOLEAN));
+        this.rowNumberFunction = metadata.resolveBuiltinFunction("row_number", ImmutableList.of());
     }
 
     public TranslationResult makeSetContainmentPlanForDistinct(SetOperationNode node)
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SimplifyCountOverConstant.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SimplifyCountOverConstant.java
index f5d06f991790..5509bd477f8f 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SimplifyCountOverConstant.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SimplifyCountOverConstant.java
@@ -23,6 +23,7 @@
 import io.trino.metadata.ResolvedFunction;
 import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.Rule;
@@ -30,7 +31,6 @@
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.ProjectNode;
 import io.trino.sql.tree.Expression;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
 
 import java.util.LinkedHashMap;
@@ -40,6 +40,7 @@
 
 import static com.google.common.base.Verify.verify;
 import static io.trino.matching.Capture.newCapture;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.sql.ExpressionUtils.isEffectivelyLiteral;
 import static io.trino.sql.planner.ExpressionInterpreter.evaluateConstantExpression;
 import static io.trino.sql.planner.plan.Patterns.aggregation;
@@ -50,6 +51,7 @@
 public class SimplifyCountOverConstant
         implements Rule<AggregationNode>
 {
+    private static final CatalogSchemaFunctionName COUNT_NAME = builtinFunctionName("count");
     private static final Capture<ProjectNode> CHILD = newCapture();
 
     private static final Pattern<AggregationNode> PATTERN = aggregation()
@@ -76,7 +78,7 @@ public Result apply(AggregationNode parent, Captures captures, Context context)
         boolean changed = false;
         Map<Symbol, AggregationNode.Aggregation> aggregations = new LinkedHashMap<>(parent.getAggregations());
 
-        ResolvedFunction countFunction = plannerContext.getMetadata().resolveFunction(context.getSession(), QualifiedName.of("count"), ImmutableList.of());
+        ResolvedFunction countFunction = plannerContext.getMetadata().resolveBuiltinFunction("count", ImmutableList.of());
 
         for (Entry<Symbol, AggregationNode.Aggregation> entry : parent.getAggregations().entrySet()) {
             Symbol symbol = entry.getKey();
@@ -108,7 +110,7 @@ public Result apply(AggregationNode parent, Captures captures, Context context)
     private boolean isCountOverConstant(Session session, AggregationNode.Aggregation aggregation, Assignments inputs)
     {
         BoundSignature signature = aggregation.getResolvedFunction().getSignature();
-        if (!signature.getName().equals("count") || signature.getArgumentTypes().size() != 1) {
+        if (!signature.getName().equals(COUNT_NAME) || signature.getArgumentTypes().size() != 1) {
             return false;
         }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SimplifyExpressions.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SimplifyExpressions.java
index 33a16fc214fe..978cff84634b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SimplifyExpressions.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SimplifyExpressions.java
@@ -52,7 +52,7 @@ public static Expression rewrite(Expression expression, Session session, SymbolA
         expressionTypes = typeAnalyzer.getTypes(session, symbolAllocator.getTypes(), expression);
         ExpressionInterpreter interpreter = new ExpressionInterpreter(expression, plannerContext, session, expressionTypes);
         Object optimized = interpreter.optimize(NoOpSymbolResolver.INSTANCE);
-        return new LiteralEncoder(plannerContext).toExpression(session, optimized, expressionTypes.get(NodeRef.of(expression)));
+        return new LiteralEncoder(plannerContext).toExpression(optimized, expressionTypes.get(NodeRef.of(expression)));
     }
 
     public SimplifyExpressions(PlannerContext plannerContext, TypeAnalyzer typeAnalyzer)
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformCorrelatedInPredicateToJoin.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformCorrelatedInPredicateToJoin.java
index b50e444fa25b..7cf0d9a452b1 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformCorrelatedInPredicateToJoin.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformCorrelatedInPredicateToJoin.java
@@ -16,7 +16,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import io.trino.Session;
 import io.trino.matching.Captures;
 import io.trino.matching.Pattern;
 import io.trino.metadata.Metadata;
@@ -45,13 +44,11 @@
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NotExpression;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SearchedCaseExpression;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.sql.tree.WhenClause;
 import io.trino.sql.util.AstUtils;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Optional;
@@ -125,7 +122,7 @@ public Result apply(ApplyNode apply, Captures captures, Context context)
 
         Symbol inPredicateOutputSymbol = getOnlyElement(subqueryAssignments.getSymbols());
 
-        return apply(apply, inPredicate, inPredicateOutputSymbol, context.getLookup(), context.getIdAllocator(), context.getSymbolAllocator(), context.getSession());
+        return apply(apply, inPredicate, inPredicateOutputSymbol, context.getLookup(), context.getIdAllocator(), context.getSymbolAllocator());
     }
 
     private Result apply(
@@ -134,8 +131,7 @@ private Result apply(
             Symbol inPredicateOutputSymbol,
             Lookup lookup,
             PlanNodeIdAllocator idAllocator,
-            SymbolAllocator symbolAllocator,
-            Session session)
+            SymbolAllocator symbolAllocator)
     {
         Optional<Decorrelated> decorrelated = new DecorrelatingVisitor(lookup, apply.getCorrelation())
                 .decorrelate(apply.getSubquery());
@@ -150,8 +146,7 @@ private Result apply(
                 inPredicateOutputSymbol,
                 decorrelated.get(),
                 idAllocator,
-                symbolAllocator,
-                session);
+                symbolAllocator);
 
         return Result.ofPlanNode(projection);
     }
@@ -162,8 +157,7 @@ private PlanNode buildInPredicateEquivalent(
             Symbol inPredicateOutputSymbol,
             Decorrelated decorrelated,
             PlanNodeIdAllocator idAllocator,
-            SymbolAllocator symbolAllocator,
-            Session session)
+            SymbolAllocator symbolAllocator)
     {
         Expression correlationCondition = and(decorrelated.getCorrelatedPredicates());
         PlanNode decorrelatedBuildSource = decorrelated.getDecorrelatedNode();
@@ -220,8 +214,8 @@ private PlanNode buildInPredicateEquivalent(
                 idAllocator.getNextId(),
                 preProjection,
                 ImmutableMap.<Symbol, AggregationNode.Aggregation>builder()
-                        .put(countMatchesSymbol, countWithFilter(session, matchConditionSymbol))
-                        .put(countNullMatchesSymbol, countWithFilter(session, nullMatchConditionSymbol))
+                        .put(countMatchesSymbol, countWithFilter(matchConditionSymbol))
+                        .put(countNullMatchesSymbol, countWithFilter(nullMatchConditionSymbol))
                         .buildOrThrow(),
                 singleGroupingSet(probeSide.getOutputSymbols()));
 
@@ -260,10 +254,10 @@ private static JoinNode leftOuterJoin(PlanNodeIdAllocator idAllocator, AssignUni
                 Optional.empty());
     }
 
-    private AggregationNode.Aggregation countWithFilter(Session session, Symbol filter)
+    private AggregationNode.Aggregation countWithFilter(Symbol filter)
     {
         return new AggregationNode.Aggregation(
-                metadata.resolveFunction(session, QualifiedName.of("count"), ImmutableList.of()),
+                metadata.resolveBuiltinFunction("count", ImmutableList.of()),
                 ImmutableList.of(),
                 false,
                 Optional.of(filter),
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformCorrelatedScalarSubquery.java
index b8d9eeb05d35..79d00184f2c0 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformCorrelatedScalarSubquery.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformCorrelatedScalarSubquery.java
@@ -42,6 +42,7 @@
 import static io.trino.sql.planner.LogicalPlanner.failFunction;
 import static io.trino.sql.planner.optimizations.PlanNodeSearcher.searchFrom;
 import static io.trino.sql.planner.optimizations.QueryCardinalityUtil.extractCardinality;
+import static io.trino.sql.planner.plan.CorrelatedJoinNode.Type.INNER;
 import static io.trino.sql.planner.plan.CorrelatedJoinNode.Type.LEFT;
 import static io.trino.sql.planner.plan.Patterns.CorrelatedJoin.correlation;
 import static io.trino.sql.planner.plan.Patterns.CorrelatedJoin.filter;
@@ -123,7 +124,7 @@ public Result apply(CorrelatedJoinNode correlatedJoinNode, Captures captures, Co
                     correlatedJoinNode.getInput(),
                     rewrittenSubquery,
                     correlatedJoinNode.getCorrelation(),
-                    producesSingleRow ? correlatedJoinNode.getType() : LEFT,
+                    producesSingleRow ? INNER : correlatedJoinNode.getType(),
                     correlatedJoinNode.getFilter(),
                     correlatedJoinNode.getOriginSubquery()));
         }
@@ -158,7 +159,7 @@ public Result apply(CorrelatedJoinNode correlatedJoinNode, Captures captures, Co
                         ImmutableList.of(
                                 new WhenClause(TRUE_LITERAL, TRUE_LITERAL)),
                         Optional.of(new Cast(
-                                failFunction(metadata, context.getSession(), SUBQUERY_MULTIPLE_ROWS, "Scalar sub-query has returned multiple rows"),
+                                failFunction(metadata, SUBQUERY_MULTIPLE_ROWS, "Scalar sub-query has returned multiple rows"),
                                 toSqlType(BOOLEAN)))));
 
         return Result.ofPlanNode(new ProjectNode(
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java
index a2e339723706..9327dece775b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java
@@ -36,7 +36,6 @@
 import io.trino.sql.tree.ExistsPredicate;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.LongLiteral;
-import io.trino.sql.tree.QualifiedName;
 
 import java.util.Optional;
 
@@ -79,7 +78,6 @@ public class TransformExistsApplyToCorrelatedJoin
 {
     private static final Pattern<ApplyNode> PATTERN = applyNode();
 
-    private static final QualifiedName COUNT = QualifiedName.of("count");
     private final PlannerContext plannerContext;
 
     public TransformExistsApplyToCorrelatedJoin(PlannerContext plannerContext)
@@ -165,8 +163,8 @@ private Optional<PlanNode> rewriteToNonDefaultAggregation(ApplyNode applyNode, C
 
     private PlanNode rewriteToDefaultAggregation(ApplyNode applyNode, Context context)
     {
-        ResolvedFunction countFunction = plannerContext.getMetadata().resolveFunction(context.getSession(), COUNT, ImmutableList.of());
-        Symbol count = context.getSymbolAllocator().newSymbol(COUNT.toString(), BIGINT);
+        ResolvedFunction countFunction = plannerContext.getMetadata().resolveBuiltinFunction("count", ImmutableList.of());
+        Symbol count = context.getSymbolAllocator().newSymbol("count", BIGINT);
         Symbol exists = getOnlyElement(applyNode.getSubqueryAssignments().getSymbols());
 
         return new CorrelatedJoinNode(
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java
index 896a5a31f785..ea7a5458e893 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java
@@ -19,12 +19,14 @@
 import com.google.common.collect.Sets;
 import io.trino.matching.Captures;
 import io.trino.matching.Pattern;
+import io.trino.spi.type.Type;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.Rule;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.CorrelatedJoinNode;
 import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.ProjectNode;
+import io.trino.sql.tree.Cast;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.IfExpression;
 import io.trino.sql.tree.NullLiteral;
@@ -33,6 +35,7 @@
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.matching.Pattern.empty;
+import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
 import static io.trino.sql.planner.plan.CorrelatedJoinNode.Type.FULL;
 import static io.trino.sql.planner.plan.CorrelatedJoinNode.Type.INNER;
 import static io.trino.sql.planner.plan.CorrelatedJoinNode.Type.LEFT;
@@ -91,7 +94,8 @@ public Result apply(CorrelatedJoinNode correlatedJoinNode, Captures captures, Co
             for (Symbol inputSymbol : Sets.intersection(
                     ImmutableSet.copyOf(correlatedJoinNode.getInput().getOutputSymbols()),
                     ImmutableSet.copyOf(correlatedJoinNode.getOutputSymbols()))) {
-                assignments.put(inputSymbol, new IfExpression(correlatedJoinNode.getFilter(), inputSymbol.toSymbolReference(), new NullLiteral()));
+                Type inputType = context.getSymbolAllocator().getTypes().get(inputSymbol);
+                assignments.put(inputSymbol, new IfExpression(correlatedJoinNode.getFilter(), inputSymbol.toSymbolReference(), new Cast(new NullLiteral(), toSqlType(inputType))));
             }
             ProjectNode projectNode = new ProjectNode(
                     context.getIdAllocator().getNextId(),
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapCastInComparison.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapCastInComparison.java
index 88a051ebe4f7..0053da51b480 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapCastInComparison.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapCastInComparison.java
@@ -168,7 +168,7 @@ public Visitor(PlannerContext plannerContext, TypeAnalyzer typeAnalyzer, Session
         @Override
         public Expression rewriteComparisonExpression(ComparisonExpression node, Void context, ExpressionTreeRewriter<Void> treeRewriter)
         {
-            ComparisonExpression expression = (ComparisonExpression) treeRewriter.defaultRewrite((Expression) node, null);
+            ComparisonExpression expression = treeRewriter.defaultRewrite(node, null);
             return unwrapCast(expression);
         }
 
@@ -199,7 +199,7 @@ private Expression unwrapCast(ComparisonExpression expression)
             Type targetType = typeAnalyzer.getType(session, types, expression.getRight());
 
             if (sourceType instanceof TimestampType && targetType == DATE) {
-                return unwrapTimestampToDateCast(session, (TimestampType) sourceType, operator, cast.getExpression(), (long) right).orElse(expression);
+                return unwrapTimestampToDateCast((TimestampType) sourceType, operator, cast.getExpression(), (long) right).orElse(expression);
             }
 
             if (targetType instanceof TimestampWithTimeZoneType) {
@@ -234,7 +234,7 @@ private Expression unwrapCast(ComparisonExpression expression)
                 }
             }
 
-            ResolvedFunction sourceToTarget = plannerContext.getMetadata().getCoercion(session, sourceType, targetType);
+            ResolvedFunction sourceToTarget = plannerContext.getMetadata().getCoercion(sourceType, targetType);
 
             Optional<Type.Range> sourceRange = sourceType.getRange();
             if (sourceRange.isPresent()) {
@@ -263,10 +263,11 @@ private Expression unwrapCast(ComparisonExpression expression)
                         // equal to max representable value
                         return switch (operator) {
                             case GREATER_THAN -> falseIfNotNull(cast.getExpression());
-                            case GREATER_THAN_OR_EQUAL -> new ComparisonExpression(EQUAL, cast.getExpression(), literalEncoder.toExpression(session, max, sourceType));
+                            case GREATER_THAN_OR_EQUAL -> new ComparisonExpression(EQUAL, cast.getExpression(), literalEncoder.toExpression(max, sourceType));
                             case LESS_THAN_OR_EQUAL -> trueIfNotNull(cast.getExpression());
-                            case LESS_THAN -> new ComparisonExpression(NOT_EQUAL, cast.getExpression(), literalEncoder.toExpression(session, max, sourceType));
-                            case EQUAL, NOT_EQUAL, IS_DISTINCT_FROM -> new ComparisonExpression(operator, cast.getExpression(), literalEncoder.toExpression(session, max, sourceType));
+                            case LESS_THAN -> new ComparisonExpression(NOT_EQUAL, cast.getExpression(), literalEncoder.toExpression(max, sourceType));
+                            case EQUAL, NOT_EQUAL, IS_DISTINCT_FROM ->
+                                    new ComparisonExpression(operator, cast.getExpression(), literalEncoder.toExpression(max, sourceType));
                         };
                     }
 
@@ -287,10 +288,11 @@ private Expression unwrapCast(ComparisonExpression expression)
                         // equal to min representable value
                         return switch (operator) {
                             case LESS_THAN -> falseIfNotNull(cast.getExpression());
-                            case LESS_THAN_OR_EQUAL -> new ComparisonExpression(EQUAL, cast.getExpression(), literalEncoder.toExpression(session, min, sourceType));
+                            case LESS_THAN_OR_EQUAL -> new ComparisonExpression(EQUAL, cast.getExpression(), literalEncoder.toExpression(min, sourceType));
                             case GREATER_THAN_OR_EQUAL -> trueIfNotNull(cast.getExpression());
-                            case GREATER_THAN -> new ComparisonExpression(NOT_EQUAL, cast.getExpression(), literalEncoder.toExpression(session, min, sourceType));
-                            case EQUAL, NOT_EQUAL, IS_DISTINCT_FROM -> new ComparisonExpression(operator, cast.getExpression(), literalEncoder.toExpression(session, min, sourceType));
+                            case GREATER_THAN -> new ComparisonExpression(NOT_EQUAL, cast.getExpression(), literalEncoder.toExpression(min, sourceType));
+                            case EQUAL, NOT_EQUAL, IS_DISTINCT_FROM ->
+                                    new ComparisonExpression(operator, cast.getExpression(), literalEncoder.toExpression(min, sourceType));
                         };
                     }
                 }
@@ -298,7 +300,7 @@ private Expression unwrapCast(ComparisonExpression expression)
 
             ResolvedFunction targetToSource;
             try {
-                targetToSource = plannerContext.getMetadata().getCoercion(session, targetType, sourceType);
+                targetToSource = plannerContext.getMetadata().getCoercion(targetType, sourceType);
             }
             catch (OperatorNotFoundException e) {
                 // Without a cast between target -> source, there's nothing more we can do
@@ -319,60 +321,62 @@ private Expression unwrapCast(ComparisonExpression expression)
                 return expression;
             }
 
-            Object roundtripLiteral = coerce(literalInSourceType, sourceToTarget);
-
-            int literalVsRoundtripped = compare(targetType, right, roundtripLiteral);
-
-            if (literalVsRoundtripped > 0) {
-                // cast rounded down
-                return switch (operator) {
-                    case EQUAL -> falseIfNotNull(cast.getExpression());
-                    case NOT_EQUAL -> trueIfNotNull(cast.getExpression());
-                    case IS_DISTINCT_FROM -> TRUE_LITERAL;
-                    case LESS_THAN, LESS_THAN_OR_EQUAL -> {
-                        if (sourceRange.isPresent() && compare(sourceType, sourceRange.get().getMin(), literalInSourceType) == 0) {
-                            yield new ComparisonExpression(EQUAL, cast.getExpression(), literalEncoder.toExpression(session, literalInSourceType, sourceType));
+            if (targetType.isOrderable()) {
+                Object roundtripLiteral = coerce(literalInSourceType, sourceToTarget);
+
+                int literalVsRoundtripped = compare(targetType, right, roundtripLiteral);
+
+                if (literalVsRoundtripped > 0) {
+                    // cast rounded down
+                    return switch (operator) {
+                        case EQUAL -> falseIfNotNull(cast.getExpression());
+                        case NOT_EQUAL -> trueIfNotNull(cast.getExpression());
+                        case IS_DISTINCT_FROM -> TRUE_LITERAL;
+                        case LESS_THAN, LESS_THAN_OR_EQUAL -> {
+                            if (sourceRange.isPresent() && compare(sourceType, sourceRange.get().getMin(), literalInSourceType) == 0) {
+                                yield new ComparisonExpression(EQUAL, cast.getExpression(), literalEncoder.toExpression(literalInSourceType, sourceType));
+                            }
+                            yield new ComparisonExpression(LESS_THAN_OR_EQUAL, cast.getExpression(), literalEncoder.toExpression(literalInSourceType, sourceType));
                         }
-                        yield new ComparisonExpression(LESS_THAN_OR_EQUAL, cast.getExpression(), literalEncoder.toExpression(session, literalInSourceType, sourceType));
-                    }
-                    case GREATER_THAN, GREATER_THAN_OR_EQUAL ->
-                        // We expect implicit coercions to be order-preserving, so the result of converting back from target -> source cannot produce a value
-                        // larger than the next value in the source type
-                            new ComparisonExpression(GREATER_THAN, cast.getExpression(), literalEncoder.toExpression(session, literalInSourceType, sourceType));
-                };
-            }
+                        case GREATER_THAN, GREATER_THAN_OR_EQUAL ->
+                            // We expect implicit coercions to be order-preserving, so the result of converting back from target -> source cannot produce a value
+                            // larger than the next value in the source type
+                                new ComparisonExpression(GREATER_THAN, cast.getExpression(), literalEncoder.toExpression(literalInSourceType, sourceType));
+                    };
+                }
 
-            if (literalVsRoundtripped < 0) {
-                // cast rounded up
-                return switch (operator) {
-                    case EQUAL -> falseIfNotNull(cast.getExpression());
-                    case NOT_EQUAL -> trueIfNotNull(cast.getExpression());
-                    case IS_DISTINCT_FROM -> TRUE_LITERAL;
-                    case LESS_THAN, LESS_THAN_OR_EQUAL ->
-                        // We expect implicit coercions to be order-preserving, so the result of converting back from target -> source cannot produce a value
-                        // smaller than the next value in the source type
-                            new ComparisonExpression(LESS_THAN, cast.getExpression(), literalEncoder.toExpression(session, literalInSourceType, sourceType));
-                    case GREATER_THAN, GREATER_THAN_OR_EQUAL -> sourceRange.isPresent() && compare(sourceType, sourceRange.get().getMax(), literalInSourceType) == 0 ?
-                            new ComparisonExpression(EQUAL, cast.getExpression(), literalEncoder.toExpression(session, literalInSourceType, sourceType)) :
-                            new ComparisonExpression(GREATER_THAN_OR_EQUAL, cast.getExpression(), literalEncoder.toExpression(session, literalInSourceType, sourceType));
-                };
+                if (literalVsRoundtripped < 0) {
+                    // cast rounded up
+                    return switch (operator) {
+                        case EQUAL -> falseIfNotNull(cast.getExpression());
+                        case NOT_EQUAL -> trueIfNotNull(cast.getExpression());
+                        case IS_DISTINCT_FROM -> TRUE_LITERAL;
+                        case LESS_THAN, LESS_THAN_OR_EQUAL ->
+                            // We expect implicit coercions to be order-preserving, so the result of converting back from target -> source cannot produce a value
+                            // smaller than the next value in the source type
+                                new ComparisonExpression(LESS_THAN, cast.getExpression(), literalEncoder.toExpression(literalInSourceType, sourceType));
+                        case GREATER_THAN, GREATER_THAN_OR_EQUAL -> sourceRange.isPresent() && compare(sourceType, sourceRange.get().getMax(), literalInSourceType) == 0 ?
+                                new ComparisonExpression(EQUAL, cast.getExpression(), literalEncoder.toExpression(literalInSourceType, sourceType)) :
+                                new ComparisonExpression(GREATER_THAN_OR_EQUAL, cast.getExpression(), literalEncoder.toExpression(literalInSourceType, sourceType));
+                    };
+                }
             }
 
-            return new ComparisonExpression(operator, cast.getExpression(), literalEncoder.toExpression(session, literalInSourceType, sourceType));
+            return new ComparisonExpression(operator, cast.getExpression(), literalEncoder.toExpression(literalInSourceType, sourceType));
         }
 
-        private Optional<Expression> unwrapTimestampToDateCast(Session session, TimestampType sourceType, ComparisonExpression.Operator operator, Expression timestampExpression, long date)
+        private Optional<Expression> unwrapTimestampToDateCast(TimestampType sourceType, ComparisonExpression.Operator operator, Expression timestampExpression, long date)
         {
             ResolvedFunction targetToSource;
             try {
-                targetToSource = plannerContext.getMetadata().getCoercion(session, DATE, sourceType);
+                targetToSource = plannerContext.getMetadata().getCoercion(DATE, sourceType);
             }
             catch (OperatorNotFoundException e) {
                 throw new TrinoException(GENERIC_INTERNAL_ERROR, e);
             }
 
-            Expression dateTimestamp = literalEncoder.toExpression(session, coerce(date, targetToSource), sourceType);
-            Expression nextDateTimestamp = literalEncoder.toExpression(session, coerce(date + 1, targetToSource), sourceType);
+            Expression dateTimestamp = literalEncoder.toExpression(coerce(date, targetToSource), sourceType);
+            Expression nextDateTimestamp = literalEncoder.toExpression(coerce(date + 1, targetToSource), sourceType);
 
             return switch (operator) {
                 case EQUAL -> Optional.of(
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapDateTruncInComparison.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapDateTruncInComparison.java
index 0247b3c8db2e..5eab28bd001d 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapDateTruncInComparison.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapDateTruncInComparison.java
@@ -54,6 +54,7 @@
 import java.util.Optional;
 
 import static com.google.common.base.Verify.verify;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.metadata.ResolvedFunction.extractFunctionName;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
@@ -145,7 +146,7 @@ public Visitor(PlannerContext plannerContext, TypeAnalyzer typeAnalyzer, Session
         @Override
         public Expression rewriteComparisonExpression(ComparisonExpression node, Void context, ExpressionTreeRewriter<Void> treeRewriter)
         {
-            ComparisonExpression expression = (ComparisonExpression) treeRewriter.defaultRewrite((Expression) node, null);
+            ComparisonExpression expression = treeRewriter.defaultRewrite(node, null);
             return unwrapDateTrunc(expression);
         }
 
@@ -156,7 +157,7 @@ private Expression unwrapDateTrunc(ComparisonExpression expression)
             // This is provided by CanonicalizeExpressionRewriter.
 
             if (!(expression.getLeft() instanceof FunctionCall call) ||
-                    !extractFunctionName(call.getName()).equals("date_trunc") ||
+                    !extractFunctionName(call.getName()).equals(builtinFunctionName("date_trunc")) ||
                     call.getArguments().size() != 2) {
                 return expression;
             }
@@ -298,7 +299,7 @@ private BetweenPredicate between(Expression argument, Type type, Object minInclu
 
         private Expression toExpression(Object value, Type type)
         {
-            return literalEncoder.toExpression(session, value, type);
+            return literalEncoder.toExpression(value, type);
         }
 
         private int compare(Type type, Object first, Object second)
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapRowSubscript.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapRowSubscript.java
index d467ab9bacd2..a6a0af7029db 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapRowSubscript.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapRowSubscript.java
@@ -59,7 +59,7 @@ public Expression rewriteSubscriptExpression(SubscriptExpression node, Void cont
                     break;
                 }
 
-                int index = (int) ((LongLiteral) node.getIndex()).getValue();
+                int index = (int) ((LongLiteral) node.getIndex()).getParsedValue();
                 DataType type = rowType.getFields().get(index - 1).getType();
                 if (!(type instanceof GenericDataType) || !((GenericDataType) type).getName().getValue().equalsIgnoreCase(UnknownType.NAME)) {
                     coercions.push(new Coercion(type, cast.isTypeOnly(), cast.isSafe()));
@@ -69,7 +69,7 @@ public Expression rewriteSubscriptExpression(SubscriptExpression node, Void cont
             }
 
             if (base instanceof Row row) {
-                int index = (int) ((LongLiteral) node.getIndex()).getValue();
+                int index = (int) ((LongLiteral) node.getIndex()).getParsedValue();
                 Expression result = row.getItems().get(index - 1);
 
                 while (!coercions.isEmpty()) {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapYearInComparison.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapYearInComparison.java
index d57b7d82bdee..0db3283305eb 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapYearInComparison.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/UnwrapYearInComparison.java
@@ -14,6 +14,7 @@
 package io.trino.sql.planner.iterative.rule;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
 import io.trino.Session;
 import io.trino.spi.type.LongTimestamp;
 import io.trino.spi.type.TimestampType;
@@ -31,6 +32,8 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.ExpressionTreeRewriter;
 import io.trino.sql.tree.FunctionCall;
+import io.trino.sql.tree.InListExpression;
+import io.trino.sql.tree.InPredicate;
 import io.trino.sql.tree.IsNotNullPredicate;
 import io.trino.sql.tree.IsNullPredicate;
 import io.trino.sql.tree.NodeRef;
@@ -42,12 +45,14 @@
 import java.util.Map;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.metadata.ResolvedFunction.extractFunctionName;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DateType.DATE;
 import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_SECOND;
 import static io.trino.sql.ExpressionUtils.or;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
+import static io.trino.sql.tree.ComparisonExpression.Operator.EQUAL;
 import static io.trino.sql.tree.ComparisonExpression.Operator.GREATER_THAN;
 import static io.trino.sql.tree.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL;
 import static io.trino.sql.tree.ComparisonExpression.Operator.LESS_THAN;
@@ -120,17 +125,46 @@ public Visitor(PlannerContext plannerContext, TypeAnalyzer typeAnalyzer, Session
         @Override
         public Expression rewriteComparisonExpression(ComparisonExpression node, Void context, ExpressionTreeRewriter<Void> treeRewriter)
         {
-            ComparisonExpression expression = (ComparisonExpression) treeRewriter.defaultRewrite((Expression) node, null);
+            ComparisonExpression expression = treeRewriter.defaultRewrite(node, null);
             return unwrapYear(expression);
         }
 
+        @Override
+        public Expression rewriteInPredicate(InPredicate node, Void context, ExpressionTreeRewriter<Void> treeRewriter)
+        {
+            InPredicate inPredicate = treeRewriter.defaultRewrite(node, null);
+            Expression value = inPredicate.getValue();
+            Expression valueList = inPredicate.getValueList();
+
+            if (!(value instanceof FunctionCall call) ||
+                    !extractFunctionName(call.getName()).equals(builtinFunctionName("year")) ||
+                    call.getArguments().size() != 1 ||
+                    !(valueList instanceof InListExpression inListExpression)) {
+                return inPredicate;
+            }
+
+            // Convert each value to a comparison expression and try to unwrap it.
+            // unwrap the InPredicate only in case we manage to unwrap the entire value list
+            ImmutableList.Builder<Expression> comparisonExpressions = ImmutableList.builderWithExpectedSize(inListExpression.getValues().size());
+            for (Expression rightExpression : inListExpression.getValues()) {
+                ComparisonExpression comparisonExpression = new ComparisonExpression(EQUAL, value, rightExpression);
+                Expression unwrappedExpression = unwrapYear(comparisonExpression);
+                if (unwrappedExpression == comparisonExpression) {
+                    return inPredicate;
+                }
+                comparisonExpressions.add(unwrappedExpression);
+            }
+
+            return or(comparisonExpressions.build());
+        }
+
         // Simplify `year(d) ? value`
         private Expression unwrapYear(ComparisonExpression expression)
         {
             // Expect year on the left side and value on the right side of the comparison.
             // This is provided by CanonicalizeExpressionRewriter.
             if (!(expression.getLeft() instanceof FunctionCall call) ||
-                    !extractFunctionName(call.getName()).equals("year") ||
+                    !extractFunctionName(call.getName()).equals(builtinFunctionName("year")) ||
                     call.getArguments().size() != 1) {
                 return expression;
             }
@@ -187,7 +221,7 @@ private BetweenPredicate between(Expression argument, Type type, Object minInclu
 
         private Expression toExpression(Object value, Type type)
         {
-            return literalEncoder.toExpression(session, value, type);
+            return literalEncoder.toExpression(value, type);
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/Util.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/Util.java
index d3b998c9a82e..c5e909f29d92 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/Util.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/Util.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.sql.planner.PlanNodeIdAllocator;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.SymbolsExtractor;
@@ -35,11 +36,15 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.sql.planner.plan.TopNRankingNode.RankingType.RANK;
 import static io.trino.sql.planner.plan.TopNRankingNode.RankingType.ROW_NUMBER;
 
 final class Util
 {
+    private static final CatalogSchemaFunctionName ROW_NUMBER_NAME = builtinFunctionName("row_number");
+    private static final CatalogSchemaFunctionName RANK_NAME = builtinFunctionName("rank");
+
     private Util()
     {
     }
@@ -132,10 +137,10 @@ public static Optional<RankingType> toTopNRankingType(WindowNode node)
         if (!signature.getArgumentTypes().isEmpty()) {
             return Optional.empty();
         }
-        if (signature.getName().equals("row_number")) {
+        if (signature.getName().equals(ROW_NUMBER_NAME)) {
             return Optional.of(ROW_NUMBER);
         }
-        if (signature.getName().equals("rank")) {
+        if (signature.getName().equals(RANK_NAME)) {
             return Optional.of(RANK);
         }
         return Optional.empty();
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/ActualProperties.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/ActualProperties.java
index af1066506313..6ffac525a390 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/ActualProperties.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/ActualProperties.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.Session;
 import io.trino.metadata.Metadata;
 import io.trino.spi.connector.ConstantProperty;
@@ -26,8 +27,6 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.tree.Expression;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -38,10 +37,8 @@
 import java.util.function.Function;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.sql.planner.SystemPartitioningHandle.COORDINATOR_DISTRIBUTION;
 import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
-import static io.trino.sql.planner.SystemPartitioningHandle.SOURCE_DISTRIBUTION;
 import static io.trino.util.MoreLists.filteredCopy;
 import static java.util.Objects.requireNonNull;
 
@@ -99,19 +96,6 @@ public boolean isNullsAndAnyReplicated()
         return global.isNullsAndAnyReplicated();
     }
 
-    public boolean isStreamPartitionedOn(Collection<Symbol> columns, boolean exactly)
-    {
-        return isStreamPartitionedOn(columns, false, exactly);
-    }
-
-    public boolean isStreamPartitionedOn(Collection<Symbol> columns, boolean nullsAndAnyReplicated, boolean exactly)
-    {
-        if (exactly) {
-            return global.isStreamPartitionedOnExactly(columns, constants.keySet(), nullsAndAnyReplicated);
-        }
-        return global.isStreamPartitionedOn(columns, constants.keySet(), nullsAndAnyReplicated);
-    }
-
     public boolean isNodePartitionedOn(Collection<Symbol> columns, boolean exactly)
     {
         return isNodePartitionedOn(columns, false, exactly);
@@ -141,20 +125,9 @@ public boolean isCompatibleTablePartitioningWith(ActualProperties other, Functio
                 session);
     }
 
-    /**
-     * @return true if all the data will effectively land in a single stream
-     */
-    public boolean isEffectivelySingleStream()
-    {
-        return global.isEffectivelySingleStream(constants.keySet());
-    }
-
-    /**
-     * @return true if repartitioning on the keys will yield some difference
-     */
-    public boolean isStreamRepartitionEffective(Collection<Symbol> keys)
+    public boolean isEffectivelySinglePartition()
     {
-        return global.isStreamRepartitionEffective(keys, constants.keySet());
+        return global.isEffectivelySinglePartition(constants.keySet());
     }
 
     public ActualProperties translate(Function<Symbol, Optional<Symbol>> translator)
@@ -314,8 +287,6 @@ public static final class Global
     {
         // Description of the partitioning of the data across nodes
         private final Optional<Partitioning> nodePartitioning; // if missing => partitioned with some unknown scheme
-        // Description of the partitioning of the data across streams (splits)
-        private final Optional<Partitioning> streamPartitioning; // if missing => partitioned with some unknown scheme
 
         // NOTE: Partitioning on zero columns (or effectively zero columns if the columns are constant) indicates that all
         // the rows will be partitioned into a single node or stream. However, this can still be a partitioned plan in that the plan
@@ -324,66 +295,40 @@ public static final class Global
         // Description of whether rows with nulls in partitioning columns or some arbitrary rows have been replicated to all *nodes*
         private final boolean nullsAndAnyReplicated;
 
-        private Global(Optional<Partitioning> nodePartitioning, Optional<Partitioning> streamPartitioning, boolean nullsAndAnyReplicated)
+        private Global(Optional<Partitioning> nodePartitioning, boolean nullsAndAnyReplicated)
         {
-            checkArgument(nodePartitioning.isEmpty()
-                            || streamPartitioning.isEmpty()
-                            || nodePartitioning.get().getColumns().containsAll(streamPartitioning.get().getColumns())
-                            || streamPartitioning.get().getColumns().containsAll(nodePartitioning.get().getColumns()),
-                    "Global stream partitioning columns should match node partitioning columns");
             this.nodePartitioning = requireNonNull(nodePartitioning, "nodePartitioning is null");
-            this.streamPartitioning = requireNonNull(streamPartitioning, "streamPartitioning is null");
             this.nullsAndAnyReplicated = nullsAndAnyReplicated;
         }
 
-        public static Global coordinatorSingleStreamPartition()
+        public static Global coordinatorSinglePartition()
         {
-            return partitionedOn(
-                    COORDINATOR_DISTRIBUTION,
-                    ImmutableList.of(),
-                    Optional.of(ImmutableList.of()));
+            return partitionedOn(COORDINATOR_DISTRIBUTION, ImmutableList.of());
         }
 
-        public static Global singleStreamPartition()
+        public static Global singlePartition()
         {
-            return partitionedOn(
-                    SINGLE_DISTRIBUTION,
-                    ImmutableList.of(),
-                    Optional.of(ImmutableList.of()));
+            return partitionedOn(SINGLE_DISTRIBUTION, ImmutableList.of());
         }
 
         public static Global arbitraryPartition()
         {
-            return new Global(Optional.empty(), Optional.empty(), false);
+            return new Global(Optional.empty(), false);
         }
 
-        public static Global partitionedOn(PartitioningHandle nodePartitioningHandle, List<Symbol> nodePartitioning, Optional<List<Symbol>> streamPartitioning)
+        public static Global partitionedOn(PartitioningHandle nodePartitioningHandle, List<Symbol> nodePartitioning)
         {
-            return new Global(
-                    Optional.of(Partitioning.create(nodePartitioningHandle, nodePartitioning)),
-                    streamPartitioning.map(columns -> Partitioning.create(SOURCE_DISTRIBUTION, columns)),
-                    false);
+            return new Global(Optional.of(Partitioning.create(nodePartitioningHandle, nodePartitioning)), false);
         }
 
-        public static Global partitionedOn(Partitioning nodePartitioning, Optional<Partitioning> streamPartitioning)
+        public static Global partitionedOn(Partitioning nodePartitioning)
         {
-            return new Global(
-                    Optional.of(nodePartitioning),
-                    streamPartitioning,
-                    false);
-        }
-
-        public static Global streamPartitionedOn(List<Symbol> streamPartitioning)
-        {
-            return new Global(
-                    Optional.empty(),
-                    Optional.of(Partitioning.create(SOURCE_DISTRIBUTION, streamPartitioning)),
-                    false);
+            return new Global(Optional.of(nodePartitioning), false);
         }
 
         public Global withReplicatedNulls(boolean replicatedNulls)
         {
-            return new Global(nodePartitioning, streamPartitioning, replicatedNulls);
+            return new Global(nodePartitioning, replicatedNulls);
         }
 
         private boolean isNullsAndAnyReplicated()
@@ -452,44 +397,20 @@ private Optional<Partitioning> getNodePartitioning()
             return nodePartitioning;
         }
 
-        private boolean isStreamPartitionedOn(Collection<Symbol> columns, Set<Symbol> constants, boolean nullsAndAnyReplicated)
-        {
-            return streamPartitioning.isPresent() && streamPartitioning.get().isPartitionedOn(columns, constants) && this.nullsAndAnyReplicated == nullsAndAnyReplicated;
-        }
-
-        private boolean isStreamPartitionedOnExactly(Collection<Symbol> columns, Set<Symbol> constants, boolean nullsAndAnyReplicated)
-        {
-            return streamPartitioning.isPresent() && streamPartitioning.get().isPartitionedOnExactly(columns, constants) && this.nullsAndAnyReplicated == nullsAndAnyReplicated;
-        }
-
-        /**
-         * @return true if all the data will effectively land in a single stream
-         */
-        private boolean isEffectivelySingleStream(Set<Symbol> constants)
-        {
-            return streamPartitioning.isPresent() && streamPartitioning.get().isEffectivelySinglePartition(constants) && !nullsAndAnyReplicated;
-        }
-
-        /**
-         * @return true if repartitioning on the keys will yield some difference
-         */
-        private boolean isStreamRepartitionEffective(Collection<Symbol> keys, Set<Symbol> constants)
+        private boolean isEffectivelySinglePartition(Set<Symbol> constants)
         {
-            return (streamPartitioning.isEmpty() || streamPartitioning.get().isRepartitionEffective(keys, constants)) && !nullsAndAnyReplicated;
+            return nodePartitioning.isPresent() && nodePartitioning.get().isEffectivelySinglePartition(constants) && !nullsAndAnyReplicated;
         }
 
         private Global translate(Partitioning.Translator translator)
         {
-            return new Global(
-                    nodePartitioning.flatMap(partitioning -> partitioning.translate(translator)),
-                    streamPartitioning.flatMap(partitioning -> partitioning.translate(translator)),
-                    nullsAndAnyReplicated);
+            return new Global(nodePartitioning.flatMap(partitioning -> partitioning.translate(translator)), nullsAndAnyReplicated);
         }
 
         @Override
         public int hashCode()
         {
-            return Objects.hash(nodePartitioning, streamPartitioning, nullsAndAnyReplicated);
+            return Objects.hash(nodePartitioning, nullsAndAnyReplicated);
         }
 
         @Override
@@ -503,7 +424,6 @@ public boolean equals(Object obj)
             }
             Global other = (Global) obj;
             return Objects.equals(this.nodePartitioning, other.nodePartitioning) &&
-                    Objects.equals(this.streamPartitioning, other.streamPartitioning) &&
                     this.nullsAndAnyReplicated == other.nullsAndAnyReplicated;
         }
 
@@ -512,7 +432,6 @@ public String toString()
         {
             return toStringHelper(this)
                     .add("nodePartitioning", nodePartitioning)
-                    .add("streamPartitioning", streamPartitioning)
                     .add("nullsAndAnyReplicated", nullsAndAnyReplicated)
                     .toString();
         }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddExchanges.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddExchanges.java
index b2b4312f3998..aecf89185fc2 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddExchanges.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddExchanges.java
@@ -30,8 +30,10 @@
 import io.trino.execution.querystats.PlanOptimizersStatsCollector;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.operator.RetryPolicy;
+import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.GroupingProperty;
 import io.trino.spi.connector.LocalProperty;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.DomainTranslator;
 import io.trino.sql.planner.Partitioning;
@@ -80,6 +82,7 @@
 import io.trino.sql.planner.plan.TableFunctionNode;
 import io.trino.sql.planner.plan.TableFunctionProcessorNode;
 import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.TableUpdateNode;
 import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.sql.planner.plan.TopNNode;
 import io.trino.sql.planner.plan.TopNRankingNode;
@@ -91,6 +94,7 @@
 import io.trino.sql.tree.SymbolReference;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -98,6 +102,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Stream;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
@@ -113,15 +118,13 @@
 import static io.trino.SystemSessionProperties.isUseCostBasedPartitioning;
 import static io.trino.SystemSessionProperties.isUseExactPartitioning;
 import static io.trino.SystemSessionProperties.isUsePartialDistinctLimit;
-import static io.trino.sql.planner.FragmentTableScanCounter.countSources;
-import static io.trino.sql.planner.FragmentTableScanCounter.hasMultipleSources;
 import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_ARBITRARY_DISTRIBUTION;
 import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_HASH_DISTRIBUTION;
 import static io.trino.sql.planner.SystemPartitioningHandle.SCALED_WRITER_HASH_DISTRIBUTION;
 import static io.trino.sql.planner.SystemPartitioningHandle.SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION;
 import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
 import static io.trino.sql.planner.optimizations.ActualProperties.Global.partitionedOn;
-import static io.trino.sql.planner.optimizations.ActualProperties.Global.singleStreamPartition;
+import static io.trino.sql.planner.optimizations.ActualProperties.Global.singlePartition;
 import static io.trino.sql.planner.optimizations.LocalProperties.grouped;
 import static io.trino.sql.planner.optimizations.PreferredProperties.partitionedWithLocal;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.REMOTE;
@@ -265,8 +268,7 @@ public PlanWithProperties visitAggregation(AggregationNode node, PreferredProper
                         gatheringExchange(idAllocator.getNextId(), REMOTE, child.getNode()),
                         child.getProperties());
             }
-            else if ((!isStreamPartitionedOn(child.getProperties(), partitioningRequirement) && !isNodePartitionedOn(child.getProperties(), partitioningRequirement)) ||
-                    node.hasEmptyGroupingSet()) {
+            else if (!isNodePartitionedOn(child.getProperties(), partitioningRequirement) || node.hasEmptyGroupingSet()) {
                 List<Symbol> partitioningKeys = parentPreferredProperties.getGlobalProperties()
                         .flatMap(PreferredProperties.Global::getPartitioningProperties)
                         .map(PreferredProperties.PartitioningProperties::getPartitioningColumns)
@@ -361,8 +363,7 @@ public PlanWithProperties visitMarkDistinct(MarkDistinctNode node, PreferredProp
 
             PlanWithProperties child = node.getSource().accept(this, preferredChildProperties);
 
-            if (child.getProperties().isSingleNode() ||
-                    !isStreamPartitionedOn(child.getProperties(), node.getDistinctSymbols())) {
+            if (child.getProperties().isSingleNode() || !isNodePartitionedOn(child.getProperties(), node.getDistinctSymbols())) {
                 child = withDerivedProperties(
                         partitionedExchange(
                                 idAllocator.getNextId(),
@@ -391,8 +392,7 @@ public PlanWithProperties visitWindow(WindowNode node, PreferredProperties prefe
                             partitionedWithLocal(ImmutableSet.copyOf(node.getPartitionBy()), desiredProperties),
                             preferredProperties));
 
-            if (!isStreamPartitionedOn(child.getProperties(), node.getPartitionBy()) &&
-                    !isNodePartitionedOn(child.getProperties(), node.getPartitionBy())) {
+            if (!isNodePartitionedOn(child.getProperties(), node.getPartitionBy())) {
                 if (node.getPartitionBy().isEmpty()) {
                     child = withDerivedProperties(
                             gatheringExchange(idAllocator.getNextId(), REMOTE, child.getNode()),
@@ -423,8 +423,7 @@ public PlanWithProperties visitPatternRecognition(PatternRecognitionNode node, P
                             partitionedWithLocal(ImmutableSet.copyOf(node.getPartitionBy()), desiredProperties),
                             preferredProperties));
 
-            if (!isStreamPartitionedOn(child.getProperties(), node.getPartitionBy()) &&
-                    !isNodePartitionedOn(child.getProperties(), node.getPartitionBy())) {
+            if (!isNodePartitionedOn(child.getProperties(), node.getPartitionBy())) {
                 if (node.getPartitionBy().isEmpty()) {
                     child = withDerivedProperties(
                             gatheringExchange(idAllocator.getNextId(), REMOTE, child.getNode()),
@@ -476,8 +475,7 @@ public PlanWithProperties visitTableFunctionProcessor(TableFunctionProcessorNode
                         gatheringExchange(idAllocator.getNextId(), REMOTE, child.getNode()),
                         child.getProperties());
             }
-            else if (!isStreamPartitionedOn(child.getProperties(), partitionBy) &&
-                    !isNodePartitionedOn(child.getProperties(), partitionBy)) {
+            else if (!isNodePartitionedOn(child.getProperties(), partitionBy)) {
                 if (partitionBy.isEmpty()) {
                     child = withDerivedProperties(
                             gatheringExchange(idAllocator.getNextId(), REMOTE, child.getNode()),
@@ -514,8 +512,7 @@ public PlanWithProperties visitRowNumber(RowNumberNode node, PreferredProperties
                             preferredProperties));
 
             // TODO: add config option/session property to force parallel plan if child is unpartitioned and window has a PARTITION BY clause
-            if (!isStreamPartitionedOn(child.getProperties(), node.getPartitionBy())
-                    && !isNodePartitionedOn(child.getProperties(), node.getPartitionBy())) {
+            if (!isNodePartitionedOn(child.getProperties(), node.getPartitionBy())) {
                 child = withDerivedProperties(
                         partitionedExchange(
                                 idAllocator.getNextId(),
@@ -549,8 +546,7 @@ public PlanWithProperties visitTopNRanking(TopNRankingNode node, PreferredProper
             }
 
             PlanWithProperties child = planChild(node, preferredChildProperties);
-            if (!isStreamPartitionedOn(child.getProperties(), node.getPartitionBy())
-                    && !isNodePartitionedOn(child.getProperties(), node.getPartitionBy())) {
+            if (!isNodePartitionedOn(child.getProperties(), node.getPartitionBy())) {
                 // add exchange + push function to child
                 child = withDerivedProperties(
                         new TopNRankingNode(
@@ -612,18 +608,6 @@ public PlanWithProperties visitSort(SortNode node, PreferredProperties preferred
         {
             PlanWithProperties child = planChild(node, PreferredProperties.undistributed());
 
-            if (child.getProperties().isSingleNode()) {
-                // current plan so far is single node, so local properties are effectively global properties
-                // skip the SortNode if the local properties guarantee ordering on Sort keys
-                // TODO: This should be extracted as a separate optimizer once the planner is able to reason about the ordering of each operator
-                List<LocalProperty<Symbol>> desiredProperties = node.getOrderingScheme().toLocalProperties();
-
-                if (LocalProperties.match(child.getProperties().getLocalProperties(), desiredProperties).stream()
-                        .noneMatch(Optional::isPresent)) {
-                    return child;
-                }
-            }
-
             if (isDistributedSortEnabled(session)) {
                 child = planChild(node, PreferredProperties.any());
                 // insert round robin exchange to eliminate skewness issues
@@ -741,7 +725,7 @@ public PlanWithProperties visitSimpleTableExecuteNode(SimpleTableExecuteNode nod
             return new PlanWithProperties(
                     node,
                     ActualProperties.builder()
-                            .global(singleStreamPartition())
+                            .global(singlePartition())
                             .build());
         }
 
@@ -766,13 +750,14 @@ public PlanWithProperties visitMergeWriter(MergeWriterNode node, PreferredProper
 
         private PlanWithProperties getWriterPlanWithProperties(Optional<PartitioningScheme> partitioningScheme, PlanWithProperties newSource, TableWriterNode.WriterTarget writerTarget)
         {
+            WriterScalingOptions scalingOptions = writerTarget.getWriterScalingOptions(plannerContext.getMetadata(), session);
             if (partitioningScheme.isEmpty()) {
                 // use maxWritersTasks to set PartitioningScheme.partitionCount field to limit number of tasks that will take part in executing writing stage
                 int maxWriterTasks = writerTarget.getMaxWriterTasks(plannerContext.getMetadata(), session).orElse(getMaxWriterTaskCount(session));
                 Optional<Integer> maxWritersNodesCount = getRetryPolicy(session) != RetryPolicy.TASK
                         ? Optional.of(Math.min(maxWriterTasks, getMaxWriterTaskCount(session)))
                         : Optional.empty();
-                if (scaleWriters && writerTarget.supportsReportingWrittenBytes(plannerContext.getMetadata(), session)) {
+                if (scaleWriters && scalingOptions.isWriterTasksScalingEnabled()) {
                     partitioningScheme = Optional.of(new PartitioningScheme(Partitioning.create(SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION, ImmutableList.of()), newSource.getNode().getOutputSymbols(), Optional.empty(), false, Optional.empty(), maxWritersNodesCount));
                 }
                 else if (redistributeWrites) {
@@ -780,7 +765,7 @@ else if (redistributeWrites) {
                 }
             }
             else if (scaleWriters
-                    && writerTarget.supportsReportingWrittenBytes(plannerContext.getMetadata(), session)
+                    && scalingOptions.isWriterTasksScalingEnabled()
                     && writerTarget.supportsMultipleWritersPerPartition(plannerContext.getMetadata(), session)
                     // do not insert an exchange if partitioning is compatible
                     && !newSource.getProperties().isCompatibleTablePartitioningWith(partitioningScheme.get().getPartitioning(), false, plannerContext.getMetadata(), session)) {
@@ -819,7 +804,7 @@ public PlanWithProperties visitValues(ValuesNode node, PreferredProperties prefe
             return new PlanWithProperties(
                     node,
                     ActualProperties.builder()
-                            .global(singleStreamPartition())
+                            .global(singlePartition())
                             .build());
         }
 
@@ -829,7 +814,17 @@ public PlanWithProperties visitTableDelete(TableDeleteNode node, PreferredProper
             return new PlanWithProperties(
                     node,
                     ActualProperties.builder()
-                            .global(singleStreamPartition())
+                            .global(singlePartition())
+                            .build());
+        }
+
+        @Override
+        public PlanWithProperties visitTableUpdate(TableUpdateNode node, PreferredProperties context)
+        {
+            return new PlanWithProperties(
+                    node,
+                    ActualProperties.builder()
+                            .global(singlePartition())
                             .build());
         }
 
@@ -1197,7 +1192,7 @@ public PlanWithProperties visitIndexSource(IndexSourceNode node, PreferredProper
             return new PlanWithProperties(
                     node,
                     ActualProperties.builder()
-                            .global(singleStreamPartition())
+                            .global(singlePartition())
                             .build());
         }
 
@@ -1285,7 +1280,7 @@ public PlanWithProperties visitUnion(UnionNode node, PreferredProperties parentP
                 return new PlanWithProperties(
                         newNode,
                         ActualProperties.builder()
-                                .global(partitionedOn(desiredParentPartitioning, Optional.of(desiredParentPartitioning)))
+                                .global(partitionedOn(desiredParentPartitioning))
                                 .build()
                                 .withReplicatedNulls(parentPartitioningPreference.isNullsAndAnyReplicated()));
             }
@@ -1368,12 +1363,12 @@ else if (!unpartitionedChildren.isEmpty()) {
             return new PlanWithProperties(
                     result,
                     ActualProperties.builder()
-                            .global(singleStreamPartition())
+                            .global(singlePartition())
                             .build());
         }
 
         private PlanWithProperties arbitraryDistributeUnion(
-                UnionNode node,
+                UnionNode unionNode,
                 List<PlanNode> partitionedChildren,
                 List<List<Symbol>> partitionedOutputLayouts)
         {
@@ -1382,16 +1377,28 @@ private PlanWithProperties arbitraryDistributeUnion(
                 // No source distributed child, we can use insert LOCAL exchange
                 // TODO: if all children have the same partitioning, pass this partitioning to the parent
                 // instead of "arbitraryPartition".
-                return new PlanWithProperties(node.replaceChildren(partitionedChildren));
+                return new PlanWithProperties(unionNode.replaceChildren(partitionedChildren));
+            }
+
+            int repartitionedRemoteExchangeNodesCount = partitionedChildren.stream().mapToInt(AddExchanges::countRepartitionedRemoteExchangeNodes).sum();
+            int partitionedConnectorSourceCount = partitionedChildren.stream().mapToInt(AddExchanges::countPartitionedConnectorSource).sum();
+            long uniqueSourceCatalogCount = partitionedChildren.stream().flatMap(AddExchanges::collectSourceCatalogs).distinct().count();
+
+            // MultiSourcePartitionedScheduler does not support node partitioning. Both partitioned remote exchanges and
+            // partitioned connector sources require node partitioning.
+            if (repartitionedRemoteExchangeNodesCount == 0
+                    && partitionedConnectorSourceCount == 0
+                    && uniqueSourceCatalogCount == 1) {
+                return new PlanWithProperties(unionNode.replaceChildren(partitionedChildren));
             }
-            // Trino currently cannot execute stage that has multiple table scans, so in that case
+            // If there is at least one not source distributed source or one of sources is connector partitioned
             // we have to insert REMOTE exchange with FIXED_ARBITRARY_DISTRIBUTION instead of local exchange
             return new PlanWithProperties(
                     new ExchangeNode(
                             idAllocator.getNextId(),
                             REPARTITION,
                             REMOTE,
-                            new PartitioningScheme(Partitioning.create(FIXED_ARBITRARY_DISTRIBUTION, ImmutableList.of()), node.getOutputSymbols()),
+                            new PartitioningScheme(Partitioning.create(FIXED_ARBITRARY_DISTRIBUTION, ImmutableList.of()), unionNode.getOutputSymbols()),
                             partitionedChildren,
                             partitionedOutputLayouts,
                             Optional.empty()));
@@ -1474,11 +1481,6 @@ private boolean isNodePartitionedOn(ActualProperties properties, Collection<Symb
         {
             return properties.isNodePartitionedOn(columns, isUseExactPartitioning(session));
         }
-
-        private boolean isStreamPartitionedOn(ActualProperties properties, Collection<Symbol> columns)
-        {
-            return properties.isStreamPartitionedOn(columns, isUseExactPartitioning(session));
-        }
     }
 
     private static Map<Symbol, Symbol> computeIdentityTranslations(Assignments assignments)
@@ -1492,6 +1494,66 @@ private static Map<Symbol, Symbol> computeIdentityTranslations(Assignments assig
         return outputToInput;
     }
 
+    private static int countRepartitionedRemoteExchangeNodes(PlanNode root)
+    {
+        return PlanNodeSearcher
+                .searchFrom(root)
+                .where(node -> node instanceof ExchangeNode exchangeNode && exchangeNode.getScope() == REMOTE && exchangeNode.getType() == REPARTITION)
+                .recurseOnlyWhen(AddExchanges::isNotRemoteExchange)
+                .findAll()
+                .size();
+    }
+
+    private static int countPartitionedConnectorSource(PlanNode root)
+    {
+        return PlanNodeSearcher
+                .searchFrom(root)
+                .where(node -> node instanceof TableScanNode tableScanNode && tableScanNode.getUseConnectorNodePartitioning().orElse(false))
+                .recurseOnlyWhen(AddExchanges::isNotRemoteExchange)
+                .findAll()
+                .size();
+    }
+
+    private static boolean hasMultipleSources(PlanNode... nodes)
+    {
+        return countSources(nodes) > 1;
+    }
+
+    private static int countSources(PlanNode... nodes)
+    {
+        return countSources(Arrays.asList(nodes));
+    }
+
+    private static int countSources(List<PlanNode> nodes)
+    {
+        return nodes
+                .stream()
+                .mapToInt(node -> PlanNodeSearcher
+                        .searchFrom(node)
+                        .where(TableScanNode.class::isInstance)
+                        .recurseOnlyWhen(AddExchanges::isNotRemoteExchange)
+                        .findAll()
+                        .size())
+                .sum();
+    }
+
+    private static Stream<CatalogHandle> collectSourceCatalogs(PlanNode root)
+    {
+        return PlanNodeSearcher
+                .searchFrom(root)
+                .where(node -> node instanceof TableScanNode)
+                .recurseOnlyWhen(AddExchanges::isNotRemoteExchange)
+                .findAll()
+                .stream()
+                .map(TableScanNode.class::cast)
+                .map(node -> node.getTable().getCatalogHandle());
+    }
+
+    private static boolean isNotRemoteExchange(PlanNode node)
+    {
+        return !(node instanceof ExchangeNode exchangeNode && exchangeNode.getScope() == REMOTE);
+    }
+
     @VisibleForTesting
     static class PlanWithProperties
     {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddLocalExchanges.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddLocalExchanges.java
index d99a9eb44d61..efa3ffcd0b17 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddLocalExchanges.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddLocalExchanges.java
@@ -23,6 +23,7 @@
 import io.trino.spi.connector.ConstantProperty;
 import io.trino.spi.connector.GroupingProperty;
 import io.trino.spi.connector.LocalProperty;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.Partitioning;
 import io.trino.sql.planner.PartitioningHandle;
@@ -81,8 +82,8 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.SystemSessionProperties.getTaskConcurrency;
-import static io.trino.SystemSessionProperties.getTaskPartitionedWriterCount;
-import static io.trino.SystemSessionProperties.getTaskWriterCount;
+import static io.trino.SystemSessionProperties.getTaskMaxWriterCount;
+import static io.trino.SystemSessionProperties.getTaskMinWriterCount;
 import static io.trino.SystemSessionProperties.isDistributedSortEnabled;
 import static io.trino.SystemSessionProperties.isSpillEnabled;
 import static io.trino.SystemSessionProperties.isTaskScaleWritersEnabled;
@@ -686,13 +687,14 @@ public PlanWithProperties visitSimpleTableExecuteNode(SimpleTableExecuteNode nod
         @Override
         public PlanWithProperties visitTableWriter(TableWriterNode node, StreamPreferredProperties parentPreferences)
         {
+            WriterScalingOptions scalingOptions = node.getTarget().getWriterScalingOptions(plannerContext.getMetadata(), session);
             return visitTableWriter(
                     node,
                     node.getPartitioningScheme(),
-                    node.getPreferredPartitioningScheme(),
                     node.getSource(),
                     parentPreferences,
-                    node.getTarget());
+                    node.getTarget(),
+                    isTaskScaleWritersEnabled(session) && scalingOptions.isPerTaskWriterScalingEnabled());
         }
 
         @Override
@@ -701,35 +703,36 @@ public PlanWithProperties visitTableExecute(TableExecuteNode node, StreamPreferr
             return visitTableWriter(
                     node,
                     node.getPartitioningScheme(),
-                    node.getPreferredPartitioningScheme(),
                     node.getSource(),
                     parentPreferences,
-                    node.getTarget());
+                    node.getTarget(),
+                    // Disable task writer scaling for TableExecute since it can result in smaller files than
+                    // file_size_threshold, which can be undesirable behaviour.
+                    false);
         }
 
         private PlanWithProperties visitTableWriter(
                 PlanNode node,
                 Optional<PartitioningScheme> partitioningScheme,
-                Optional<PartitioningScheme> preferredPartitionScheme,
                 PlanNode source,
                 StreamPreferredProperties parentPreferences,
-                WriterTarget writerTarget)
+                WriterTarget writerTarget,
+                boolean isTaskScaleWritersEnabled)
         {
-            if (isTaskScaleWritersEnabled(session)
-                    && writerTarget.supportsReportingWrittenBytes(plannerContext.getMetadata(), session)
+            if (isTaskScaleWritersEnabled
                     && writerTarget.supportsMultipleWritersPerPartition(plannerContext.getMetadata(), session)
-                    && (partitioningScheme.isPresent() || preferredPartitionScheme.isPresent())) {
-                return visitScalePartitionedWriter(node, partitioningScheme.orElseGet(preferredPartitionScheme::get), source);
+                    && partitioningScheme.isPresent()) {
+                return visitScalePartitionedWriter(node, partitioningScheme.get(), source);
             }
 
             return partitioningScheme
                     .map(scheme -> visitPartitionedWriter(node, scheme, source, parentPreferences))
-                    .orElseGet(() -> visitUnpartitionedWriter(node, source, writerTarget));
+                    .orElseGet(() -> visitUnpartitionedWriter(node, source, isTaskScaleWritersEnabled));
         }
 
-        private PlanWithProperties visitUnpartitionedWriter(PlanNode node, PlanNode source, WriterTarget writerTarget)
+        private PlanWithProperties visitUnpartitionedWriter(PlanNode node, PlanNode source, boolean isTaskScaleWritersEnabled)
         {
-            if (isTaskScaleWritersEnabled(session) && writerTarget.supportsReportingWrittenBytes(plannerContext.getMetadata(), session)) {
+            if (isTaskScaleWritersEnabled) {
                 PlanWithProperties newSource = source.accept(this, defaultParallelism(session));
                 PlanWithProperties exchange = deriveProperties(
                         partitionedExchange(
@@ -743,7 +746,7 @@ private PlanWithProperties visitUnpartitionedWriter(PlanNode node, PlanNode sour
                 return rebaseAndDeriveProperties(node, ImmutableList.of(exchange));
             }
 
-            if (getTaskWriterCount(session) == 1) {
+            if (getTaskMinWriterCount(session) == 1) {
                 return planAndEnforceChildren(node, singleStream(), defaultParallelism(session));
             }
 
@@ -752,7 +755,7 @@ private PlanWithProperties visitUnpartitionedWriter(PlanNode node, PlanNode sour
 
         private PlanWithProperties visitPartitionedWriter(PlanNode node, PartitioningScheme partitioningScheme, PlanNode source, StreamPreferredProperties parentPreferences)
         {
-            if (getTaskPartitionedWriterCount(session) == 1) {
+            if (getTaskMaxWriterCount(session) == 1) {
                 return planAndEnforceChildren(node, singleStream(), defaultParallelism(session));
             }
 
@@ -781,7 +784,7 @@ private PlanWithProperties visitPartitionedWriter(PlanNode node, PartitioningSch
 
         private PlanWithProperties visitScalePartitionedWriter(PlanNode node, PartitioningScheme partitioningScheme, PlanNode source)
         {
-            if (getTaskPartitionedWriterCount(session) == 1) {
+            if (getTaskMaxWriterCount(session) == 1) {
                 return planAndEnforceChildren(node, singleStream(), defaultParallelism(session));
             }
 
@@ -830,7 +833,7 @@ private PlanWithProperties visitScalePartitionedWriter(PlanNode node, Partitioni
         @Override
         public PlanWithProperties visitMergeWriter(MergeWriterNode node, StreamPreferredProperties parentPreferences)
         {
-            return visitTableWriter(node, node.getPartitioningScheme(), Optional.empty(), node.getSource(), parentPreferences, node.getTarget());
+            return visitTableWriter(node, node.getPartitioningScheme(), node.getSource(), parentPreferences, node.getTarget(), false);
         }
 
         //
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/BeginTableWrite.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/BeginTableWrite.java
index 82445b9065b9..c111a8284537 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/BeginTableWrite.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/BeginTableWrite.java
@@ -129,7 +129,6 @@ public PlanNode visitTableWriter(TableWriterNode node, RewriteContext<Optional<W
                     node.getColumns(),
                     node.getColumnNames(),
                     node.getPartitioningScheme(),
-                    node.getPreferredPartitioningScheme(),
                     node.getStatisticsAggregation(),
                     node.getStatisticsAggregationDescriptor());
         }
@@ -146,8 +145,7 @@ public PlanNode visitTableExecute(TableExecuteNode node, RewriteContext<Optional
                     node.getFragmentSymbol(),
                     node.getColumns(),
                     node.getColumnNames(),
-                    node.getPartitioningScheme(),
-                    node.getPreferredPartitioningScheme());
+                    node.getPartitioningScheme());
         }
 
         @Override
@@ -211,7 +209,7 @@ public WriterTarget getWriterTarget(PlanNode node)
                         target.getExecuteHandle(),
                         findTableScanHandleForTableExecute(((TableExecuteNode) node).getSource()),
                         target.getSchemaTableName(),
-                        target.isReportingWrittenBytesSupported());
+                        target.getWriterScalingOptions());
             }
 
             if (node instanceof MergeWriterNode mergeWriterNode) {
@@ -244,19 +242,20 @@ private WriterTarget createWriterTarget(WriterTarget target)
             // TODO: we shouldn't need to store the schemaTableName in the handles, but there isn't a good way to pass this around with the current architecture
             if (target instanceof CreateReference create) {
                 return new CreateTarget(
-                        metadata.beginCreateTable(session, create.getCatalog(), create.getTableMetadata(), create.getLayout()),
+                        metadata.beginCreateTable(session, create.getCatalog(), create.getTableMetadata(), create.getLayout(), create.isReplace()),
                         create.getTableMetadata().getTable(),
-                        target.supportsReportingWrittenBytes(metadata, session),
                         target.supportsMultipleWritersPerPartition(metadata, session),
-                        target.getMaxWriterTasks(metadata, session));
+                        target.getMaxWriterTasks(metadata, session),
+                        target.getWriterScalingOptions(metadata, session),
+                        create.isReplace());
             }
             if (target instanceof InsertReference insert) {
                 return new InsertTarget(
                         metadata.beginInsert(session, insert.getHandle(), insert.getColumns()),
-                        metadata.getTableMetadata(session, insert.getHandle()).getTable(),
-                        target.supportsReportingWrittenBytes(metadata, session),
+                        metadata.getTableName(session, insert.getHandle()).getSchemaTableName(),
                         target.supportsMultipleWritersPerPartition(metadata, session),
-                        target.getMaxWriterTasks(metadata, session));
+                        target.getMaxWriterTasks(metadata, session),
+                        target.getWriterScalingOptions(metadata, session));
             }
             if (target instanceof MergeTarget merge) {
                 MergeHandle mergeHandle = metadata.beginMerge(session, merge.getHandle());
@@ -270,12 +269,13 @@ private WriterTarget createWriterTarget(WriterTarget target)
                 return new TableWriterNode.RefreshMaterializedViewTarget(
                         refreshMV.getStorageTableHandle(),
                         metadata.beginRefreshMaterializedView(session, refreshMV.getStorageTableHandle(), refreshMV.getSourceTableHandles()),
-                        metadata.getTableMetadata(session, refreshMV.getStorageTableHandle()).getTable(),
-                        refreshMV.getSourceTableHandles());
+                        metadata.getTableName(session, refreshMV.getStorageTableHandle()).getSchemaTableName(),
+                        refreshMV.getSourceTableHandles(),
+                        refreshMV.getWriterScalingOptions(metadata, session));
             }
             if (target instanceof TableExecuteTarget tableExecute) {
                 BeginTableExecuteResult<TableExecuteHandle, TableHandle> result = metadata.beginTableExecute(session, tableExecute.getExecuteHandle(), tableExecute.getMandatorySourceHandle());
-                return new TableExecuteTarget(result.getTableExecuteHandle(), Optional.of(result.getSourceHandle()), tableExecute.getSchemaTableName(), tableExecute.isReportingWrittenBytesSupported());
+                return new TableExecuteTarget(result.getTableExecuteHandle(), Optional.of(result.getSourceHandle()), tableExecute.getSchemaTableName(), tableExecute.getWriterScalingOptions());
             }
             throw new IllegalArgumentException("Unhandled target type: " + target.getClass().getSimpleName());
         }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/DeterminePartitionCount.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/DeterminePartitionCount.java
index 8814d51917fb..c73c9484c940 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/DeterminePartitionCount.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/DeterminePartitionCount.java
@@ -20,10 +20,12 @@
 import io.trino.cost.StatsCalculator;
 import io.trino.cost.StatsProvider;
 import io.trino.cost.TableStatsProvider;
+import io.trino.cost.TaskCountEstimator;
 import io.trino.execution.querystats.PlanOptimizersStatsCollector;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.operator.RetryPolicy;
 import io.trino.sql.planner.PartitioningHandle;
+import io.trino.sql.planner.PartitioningScheme;
 import io.trino.sql.planner.PlanNodeIdAllocator;
 import io.trino.sql.planner.SymbolAllocator;
 import io.trino.sql.planner.SystemPartitioningHandle;
@@ -44,15 +46,22 @@
 import java.util.Optional;
 import java.util.function.ToDoubleFunction;
 
+import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionMaxPartitionCount;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionMinPartitionCount;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionMinPartitionCountForWrite;
 import static io.trino.SystemSessionProperties.getMaxHashPartitionCount;
 import static io.trino.SystemSessionProperties.getMinHashPartitionCount;
+import static io.trino.SystemSessionProperties.getMinHashPartitionCountForWrite;
 import static io.trino.SystemSessionProperties.getMinInputRowsPerTask;
 import static io.trino.SystemSessionProperties.getMinInputSizePerTask;
 import static io.trino.SystemSessionProperties.getQueryMaxMemoryPerNode;
 import static io.trino.SystemSessionProperties.getRetryPolicy;
+import static io.trino.SystemSessionProperties.isDeterminePartitionCountForWriteEnabled;
 import static io.trino.sql.planner.optimizations.QueryCardinalityUtil.isAtMostScalar;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.REMOTE;
+import static io.trino.sql.planner.plan.ExchangeNode.Type.REPARTITION;
 import static io.trino.sql.planner.plan.SimplePlanRewriter.rewriteWith;
 import static java.lang.Double.isNaN;
 import static java.lang.Math.max;
@@ -60,17 +69,17 @@
 
 /**
  * This rule looks at the amount of data read and processed by the query to determine the value of partition count
- * used for remote exchanges. It helps to increase the concurrency of the engine in the case of large cluster.
+ * used for remote partitioned exchanges. It helps to increase the concurrency of the engine in the case of large cluster.
  * This rule is also cautious about lack of or incorrect statistics therefore it skips for input multiplying nodes like
  * CROSS JOIN or UNNEST.
- *
+ * <p>
  * E.g. 1:
- * Given query: SELECT count(column_a) FROM table_with_stats_a
+ * Given query: SELECT count(column_a) FROM table_with_stats_a group by column_b
  * config:
  * MIN_INPUT_SIZE_PER_TASK: 500 MB
  * Input table data size: 1000 MB
  * Estimated partition count: Input table data size / MIN_INPUT_SIZE_PER_TASK => 2
- *
+ * <p>
  * E.g. 2:
  * Given query: SELECT * FROM table_with_stats_a as a JOIN table_with_stats_b as b ON a.column_b = b.column_b
  * config:
@@ -86,10 +95,12 @@ public class DeterminePartitionCount
     private static final List<Class<? extends PlanNode>> INSERT_NODES = ImmutableList.of(TableExecuteNode.class, TableWriterNode.class, MergeWriterNode.class);
 
     private final StatsCalculator statsCalculator;
+    private final TaskCountEstimator taskCountEstimator;
 
-    public DeterminePartitionCount(StatsCalculator statsCalculator)
+    public DeterminePartitionCount(StatsCalculator statsCalculator, TaskCountEstimator taskCountEstimator)
     {
         this.statsCalculator = requireNonNull(statsCalculator, "statsCalculator is null");
+        this.taskCountEstimator = requireNonNull(taskCountEstimator, "taskCountEstimator is null");
     }
 
     @Override
@@ -107,17 +118,22 @@ public PlanNode optimize(
         requireNonNull(session, "session is null");
         requireNonNull(types, "types is null");
         requireNonNull(tableStatsProvider, "tableStatsProvider is null");
+        requireNonNull(taskCountEstimator, "taskCountEstimator is null");
+
+        // Skip partition count determination if no partitioned remote exchanges exist in the plan anyway
+        if (!isEligibleRemoteExchangePresent(plan)) {
+            return plan;
+        }
 
-        // Skip for write nodes since writing partitioned data with small amount of nodes could cause
-        // memory related issues even when the amount of data is small. Additionally, skip for FTE mode since we
-        // are not using estimated partitionCount in FTE scheduler.
-        if (PlanNodeSearcher.searchFrom(plan).whereIsInstanceOfAny(INSERT_NODES).matches()
-                || getRetryPolicy(session) == RetryPolicy.TASK) {
+        // Unless enabled, skip for write nodes since writing partitioned data with small amount of nodes could cause
+        // memory related issues even when the amount of data is small.
+        boolean isWriteQuery = PlanNodeSearcher.searchFrom(plan).whereIsInstanceOfAny(INSERT_NODES).matches();
+        if (isWriteQuery && !isDeterminePartitionCountForWriteEnabled(session)) {
             return plan;
         }
 
         try {
-            return determinePartitionCount(plan, session, types, tableStatsProvider)
+            return determinePartitionCount(plan, session, types, tableStatsProvider, isWriteQuery)
                     .map(partitionCount -> rewriteWith(new Rewriter(partitionCount), plan))
                     .orElse(plan);
         }
@@ -128,7 +144,12 @@ public PlanNode optimize(
         return plan;
     }
 
-    private Optional<Integer> determinePartitionCount(PlanNode plan, Session session, TypeProvider types, TableStatsProvider tableStatsProvider)
+    private Optional<Integer> determinePartitionCount(
+            PlanNode plan,
+            Session session,
+            TypeProvider types,
+            TableStatsProvider tableStatsProvider,
+            boolean isWriteQuery)
     {
         long minInputSizePerTask = getMinInputSizePerTask(session).toBytes();
         long minInputRowsPerTask = getMinInputRowsPerTask(session);
@@ -141,6 +162,29 @@ private Optional<Integer> determinePartitionCount(PlanNode plan, Session session
             return Optional.empty();
         }
 
+        int minPartitionCount;
+        int maxPartitionCount;
+        if (getRetryPolicy(session).equals(RetryPolicy.TASK)) {
+            if (isWriteQuery) {
+                minPartitionCount = getFaultTolerantExecutionMinPartitionCountForWrite(session);
+            }
+            else {
+                minPartitionCount = getFaultTolerantExecutionMinPartitionCount(session);
+            }
+            maxPartitionCount = getFaultTolerantExecutionMaxPartitionCount(session);
+        }
+        else {
+            if (isWriteQuery) {
+                minPartitionCount = getMinHashPartitionCountForWrite(session);
+            }
+            else {
+                minPartitionCount = getMinHashPartitionCount(session);
+            }
+            maxPartitionCount = getMaxHashPartitionCount(session);
+        }
+        verify(minPartitionCount <= maxPartitionCount, "minPartitionCount %s larger than maxPartitionCount %s",
+                minPartitionCount, maxPartitionCount);
+
         StatsProvider statsProvider = new CachingStatsProvider(statsCalculator, session, types, tableStatsProvider);
         long queryMaxMemoryPerNode = getQueryMaxMemoryPerNode(session).toBytes();
 
@@ -162,9 +206,14 @@ private Optional<Integer> determinePartitionCount(PlanNode plan, Session session
                 // because huge number of small size rows can be cpu intensive for some operators. On the other
                 // hand, small number of rows with considerable size in bytes can be memory intensive.
                 max(partitionCountBasedOnOutputSize.get(), partitionCountBasedOnRows.get()),
-                getMinHashPartitionCount(session));
+                minPartitionCount);
 
-        if (partitionCount >= getMaxHashPartitionCount(session)) {
+        if (partitionCount >= maxPartitionCount) {
+            return Optional.empty();
+        }
+
+        if (partitionCount * 2 >= taskCountEstimator.estimateHashedTaskCount(session) && !getRetryPolicy(session).equals(RetryPolicy.TASK)) {
+            // Do not cap partition count if it's already close to the possible number of tasks.
             return Optional.empty();
         }
 
@@ -275,6 +324,24 @@ private static double getSourceNodesOutputStats(PlanNode root, ToDoubleFunction<
                 .sum();
     }
 
+    private static boolean isEligibleRemoteExchangePresent(PlanNode root)
+    {
+        return PlanNodeSearcher.searchFrom(root)
+                .where(node -> node instanceof ExchangeNode exchangeNode && isEligibleRemoteExchange(exchangeNode))
+                .matches();
+    }
+
+    private static boolean isEligibleRemoteExchange(ExchangeNode exchangeNode)
+    {
+        if (exchangeNode.getScope() != REMOTE || exchangeNode.getType() != REPARTITION) {
+            return false;
+        }
+        PartitioningHandle partitioningHandle = exchangeNode.getPartitioningScheme().getPartitioning().getHandle();
+        return !partitioningHandle.isScaleWriters()
+                && !partitioningHandle.isSingleNode()
+                && partitioningHandle.getConnectorHandle() instanceof SystemPartitioningHandle;
+    }
+
     private static class Rewriter
             extends SimplePlanRewriter<Void>
     {
@@ -288,20 +355,20 @@ private Rewriter(int partitionCount)
         @Override
         public PlanNode visitExchange(ExchangeNode node, RewriteContext<Void> context)
         {
-            PartitioningHandle handle = node.getPartitioningScheme().getPartitioning().getHandle();
-            if (!(node.getScope() == REMOTE && handle.getConnectorHandle() instanceof SystemPartitioningHandle)) {
-                return node;
-            }
-
             List<PlanNode> sources = node.getSources().stream()
                     .map(context::rewrite)
                     .collect(toImmutableList());
 
+            PartitioningScheme partitioningScheme = node.getPartitioningScheme();
+            if (isEligibleRemoteExchange(node)) {
+                partitioningScheme = partitioningScheme.withPartitionCount(Optional.of(partitionCount));
+            }
+
             return new ExchangeNode(
                     node.getId(),
                     node.getType(),
                     node.getScope(),
-                    node.getPartitioningScheme().withPartitionCount(Optional.of(partitionCount)),
+                    partitioningScheme,
                     sources,
                     node.getInputs(),
                     node.getOrderingScheme());
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/ExpressionEquivalence.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/ExpressionEquivalence.java
index 03522afffbb9..5d6039405e47 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/ExpressionEquivalence.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/ExpressionEquivalence.java
@@ -21,6 +21,7 @@
 import io.trino.Session;
 import io.trino.metadata.FunctionManager;
 import io.trino.metadata.Metadata;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.TypeAnalyzer;
@@ -45,7 +46,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.IS_DISTINCT_FROM;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -112,9 +113,9 @@ public RowExpression visitCall(CallExpression call, Void context)
                             .map(expression -> expression.accept(this, context))
                             .collect(toImmutableList()));
 
-            String callName = call.getResolvedFunction().getSignature().getName();
+            CatalogSchemaFunctionName callName = call.getResolvedFunction().getSignature().getName();
 
-            if (callName.equals(mangleOperatorName(EQUAL)) || callName.equals(mangleOperatorName(IS_DISTINCT_FROM))) {
+            if (callName.equals(builtinFunctionName(EQUAL)) || callName.equals(builtinFunctionName(IS_DISTINCT_FROM))) {
                 // sort arguments
                 return new CallExpression(
                         call.getResolvedFunction(),
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/HashGenerationOptimizer.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/HashGenerationOptimizer.java
index 365d3ea97243..b27df71823f6 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/HashGenerationOptimizer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/HashGenerationOptimizer.java
@@ -31,7 +31,7 @@
 import io.trino.metadata.Metadata;
 import io.trino.spi.function.OperatorType;
 import io.trino.spi.type.StandardTypes;
-import io.trino.sql.planner.FunctionCallBuilder;
+import io.trino.sql.planner.BuiltinFunctionCallBuilder;
 import io.trino.sql.planner.Partitioning.ArgumentBinding;
 import io.trino.sql.planner.PartitioningHandle;
 import io.trino.sql.planner.PartitioningScheme;
@@ -66,7 +66,6 @@
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.GenericLiteral;
 import io.trino.sql.tree.LongLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
 
 import java.util.Collection;
@@ -121,12 +120,11 @@ public PlanNode optimize(
             TableStatsProvider tableStatsProvider)
     {
         requireNonNull(plan, "plan is null");
-        requireNonNull(session, "session is null");
         requireNonNull(types, "types is null");
         requireNonNull(symbolAllocator, "symbolAllocator is null");
         requireNonNull(idAllocator, "idAllocator is null");
         if (SystemSessionProperties.isOptimizeHashGenerationEnabled(session)) {
-            PlanWithProperties result = plan.accept(new Rewriter(session, metadata, idAllocator, symbolAllocator, types), new HashComputationSet());
+            PlanWithProperties result = plan.accept(new Rewriter(metadata, idAllocator, symbolAllocator, types), new HashComputationSet());
             return result.getNode();
         }
         return plan;
@@ -135,15 +133,13 @@ public PlanNode optimize(
     private static class Rewriter
             extends PlanVisitor<PlanWithProperties, HashComputationSet>
     {
-        private final Session session;
         private final Metadata metadata;
         private final PlanNodeIdAllocator idAllocator;
         private final SymbolAllocator symbolAllocator;
         private final TypeProvider types;
 
-        private Rewriter(Session session, Metadata metadata, PlanNodeIdAllocator idAllocator, SymbolAllocator symbolAllocator, TypeProvider types)
+        private Rewriter(Metadata metadata, PlanNodeIdAllocator idAllocator, SymbolAllocator symbolAllocator, TypeProvider types)
         {
-            this.session = requireNonNull(session, "session is null");
             this.metadata = requireNonNull(metadata, "metadata is null");
             this.idAllocator = requireNonNull(idAllocator, "idAllocator is null");
             this.symbolAllocator = requireNonNull(symbolAllocator, "symbolAllocator is null");
@@ -653,7 +649,7 @@ public PlanWithProperties visitProject(ProjectNode node, HashComputationSet pare
                 Expression hashExpression;
                 if (hashSymbol == null) {
                     hashSymbol = symbolAllocator.newHashSymbol();
-                    hashExpression = hashComputation.getHashExpression(session, metadata, types);
+                    hashExpression = hashComputation.getHashExpression(metadata, types);
                 }
                 else {
                     hashExpression = hashSymbol.toSymbolReference();
@@ -759,7 +755,7 @@ private PlanWithProperties enforce(PlanWithProperties planWithProperties, HashCo
             for (Symbol symbol : planWithProperties.getNode().getOutputSymbols()) {
                 HashComputation partitionSymbols = resultHashSymbols.get(symbol);
                 if (partitionSymbols == null || requiredHashes.getHashes().contains(partitionSymbols)) {
-                    assignments.put(symbol, symbol.toSymbolReference());
+                    assignments.putIdentity(symbol);
 
                     if (partitionSymbols != null) {
                         outputHashSymbols.put(partitionSymbols, symbol);
@@ -770,7 +766,7 @@ private PlanWithProperties enforce(PlanWithProperties planWithProperties, HashCo
             // add new projections for hash symbols needed by the parent
             for (HashComputation hashComputation : requiredHashes.getHashes()) {
                 if (!planWithProperties.getHashSymbols().containsKey(hashComputation)) {
-                    Expression hashExpression = hashComputation.getHashExpression(session, metadata, types);
+                    Expression hashExpression = hashComputation.getHashExpression(metadata, types);
                     Symbol hashSymbol = symbolAllocator.newHashSymbol();
                     assignments.put(hashSymbol, hashExpression);
                     outputHashSymbols.put(hashComputation, hashSymbol);
@@ -877,7 +873,7 @@ private static Optional<HashComputation> computeHash(Iterable<Symbol> fields)
         return Optional.of(new HashComputation(fields));
     }
 
-    public static Optional<Expression> getHashExpression(Session session, Metadata metadata, SymbolAllocator symbolAllocator, List<Symbol> symbols)
+    public static Optional<Expression> getHashExpression(Metadata metadata, SymbolAllocator symbolAllocator, List<Symbol> symbols)
     {
         if (symbols.isEmpty()) {
             return Optional.empty();
@@ -885,15 +881,15 @@ public static Optional<Expression> getHashExpression(Session session, Metadata m
 
         Expression result = new GenericLiteral(StandardTypes.BIGINT, String.valueOf(INITIAL_HASH_VALUE));
         for (Symbol symbol : symbols) {
-            Expression hashField = FunctionCallBuilder.resolve(session, metadata)
-                    .setName(QualifiedName.of(HASH_CODE))
+            Expression hashField = BuiltinFunctionCallBuilder.resolve(metadata)
+                    .setName(HASH_CODE)
                     .addArgument(symbolAllocator.getTypes().get(symbol), new SymbolReference(symbol.getName()))
                     .build();
 
             hashField = new CoalesceExpression(hashField, new LongLiteral(String.valueOf(NULL_HASH_CODE)));
 
-            result = FunctionCallBuilder.resolve(session, metadata)
-                    .setName(QualifiedName.of("combine_hash"))
+            result = BuiltinFunctionCallBuilder.resolve(metadata)
+                    .setName("combine_hash")
                     .addArgument(BIGINT, result)
                     .addArgument(BIGINT, hashField)
                     .build();
@@ -935,24 +931,24 @@ public boolean canComputeWith(Set<Symbol> availableFields)
             return availableFields.containsAll(fields);
         }
 
-        private Expression getHashExpression(Session session, Metadata metadata, TypeProvider types)
+        private Expression getHashExpression(Metadata metadata, TypeProvider types)
         {
             Expression hashExpression = new GenericLiteral(StandardTypes.BIGINT, Integer.toString(INITIAL_HASH_VALUE));
             for (Symbol field : fields) {
-                hashExpression = getHashFunctionCall(session, hashExpression, field, metadata, types);
+                hashExpression = getHashFunctionCall(hashExpression, field, metadata, types);
             }
             return hashExpression;
         }
 
-        private static Expression getHashFunctionCall(Session session, Expression previousHashValue, Symbol symbol, Metadata metadata, TypeProvider types)
+        private static Expression getHashFunctionCall(Expression previousHashValue, Symbol symbol, Metadata metadata, TypeProvider types)
         {
-            FunctionCall functionCall = FunctionCallBuilder.resolve(session, metadata)
-                    .setName(QualifiedName.of(HASH_CODE))
+            FunctionCall functionCall = BuiltinFunctionCallBuilder.resolve(metadata)
+                    .setName(HASH_CODE)
                     .addArgument(types.get(symbol), symbol.toSymbolReference())
                     .build();
 
-            return FunctionCallBuilder.resolve(session, metadata)
-                    .setName(QualifiedName.of("combine_hash"))
+            return BuiltinFunctionCallBuilder.resolve(metadata)
+                    .setName("combine_hash")
                     .addArgument(BIGINT, previousHashValue)
                     .addArgument(BIGINT, orNullHashCode(functionCall))
                     .build();
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/IndexJoinOptimizer.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/IndexJoinOptimizer.java
index 9141e9e87d8e..f0a35e4369b3 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/IndexJoinOptimizer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/IndexJoinOptimizer.java
@@ -27,7 +27,6 @@
 import io.trino.metadata.ResolvedFunction;
 import io.trino.metadata.ResolvedIndex;
 import io.trino.spi.connector.ColumnHandle;
-import io.trino.spi.function.BoundSignature;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.DomainTranslator;
@@ -51,7 +50,6 @@
 import io.trino.sql.planner.plan.WindowNode.Function;
 import io.trino.sql.tree.BooleanLiteral;
 import io.trino.sql.tree.Expression;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.sql.tree.WindowFrame;
 
@@ -66,6 +64,7 @@
 import static com.google.common.base.Predicates.in;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.spi.function.FunctionKind.AGGREGATE;
 import static io.trino.sql.ExpressionUtils.combineConjuncts;
 import static io.trino.sql.tree.BooleanLiteral.TRUE_LITERAL;
 import static java.util.Objects.requireNonNull;
@@ -343,7 +342,7 @@ private PlanNode planTableScan(TableScanNode node, Expression predicate, Context
 
             Expression resultingPredicate = combineConjuncts(
                     plannerContext.getMetadata(),
-                    domainTranslator.toPredicate(session, resolvedIndex.getUnresolvedTupleDomain().transformKeys(inverseAssignments::get)),
+                    domainTranslator.toPredicate(resolvedIndex.getUnresolvedTupleDomain().transformKeys(inverseAssignments::get)),
                     decomposedPredicate.getRemainingExpression());
 
             if (!resultingPredicate.equals(TRUE_LITERAL)) {
@@ -386,10 +385,8 @@ public PlanNode visitWindow(WindowNode node, RewriteContext<Context> context)
         {
             if (!node.getWindowFunctions().values().stream()
                     .map(Function::getResolvedFunction)
-                    .map(ResolvedFunction::getSignature)
-                    .map(BoundSignature::getName)
-                    .map(QualifiedName::of)
-                    .allMatch(name -> plannerContext.getMetadata().isAggregationFunction(session, name))) {
+                    .map(ResolvedFunction::getFunctionKind)
+                    .allMatch(AGGREGATE::equals)) {
                 return node;
             }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/MetadataQueryOptimizer.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/MetadataQueryOptimizer.java
index 315b0c22b345..caf92e5a53e8 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/MetadataQueryOptimizer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/MetadataQueryOptimizer.java
@@ -26,6 +26,7 @@
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.DiscretePredicates;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
@@ -55,6 +56,7 @@
 import java.util.Optional;
 import java.util.Set;
 
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.sql.planner.DeterminismEvaluator.isDeterministic;
 import static java.util.Objects.requireNonNull;
 
@@ -65,7 +67,11 @@
 public class MetadataQueryOptimizer
         implements PlanOptimizer
 {
-    private static final Set<String> ALLOWED_FUNCTIONS = ImmutableSet.of("max", "min", "approx_distinct");
+    private static final Set<CatalogSchemaFunctionName> ALLOWED_FUNCTIONS = ImmutableSet.<CatalogSchemaFunctionName>builder()
+            .add(builtinFunctionName("max"))
+            .add(builtinFunctionName("min"))
+            .add(builtinFunctionName("approx_distinct"))
+            .build();
 
     private final PlannerContext plannerContext;
 
@@ -171,7 +177,7 @@ public PlanNode visitAggregation(AggregationNode node, RewriteContext<Void> cont
                             // partition key does not have a single value, so bail out to be safe
                             return context.defaultRewrite(node);
                         }
-                        rowBuilder.add(literalEncoder.toExpression(session, value.getValue(), type));
+                        rowBuilder.add(literalEncoder.toExpression(value.getValue(), type));
                     }
                     rowsBuilder.add(new Row(rowBuilder.build()));
                 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/OptimizeMixedDistinctAggregations.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/OptimizeMixedDistinctAggregations.java
index 26d52947d242..991ea2f25b8f 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/OptimizeMixedDistinctAggregations.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/OptimizeMixedDistinctAggregations.java
@@ -22,6 +22,7 @@
 import io.trino.execution.querystats.PlanOptimizersStatsCollector;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.Metadata;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.PlanNodeIdAllocator;
 import io.trino.sql.planner.Symbol;
@@ -42,7 +43,6 @@
 import io.trino.sql.tree.IfExpression;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -54,7 +54,9 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.SystemSessionProperties.isOptimizeDistinctAggregationEnabled;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
 import static io.trino.sql.planner.plan.AggregationNode.Step.SINGLE;
@@ -78,6 +80,10 @@
 public class OptimizeMixedDistinctAggregations
         implements PlanOptimizer
 {
+    private static final CatalogSchemaFunctionName COUNT_NAME = builtinFunctionName("count");
+    private static final CatalogSchemaFunctionName COUNT_IF_NAME = builtinFunctionName("count_if");
+    private static final CatalogSchemaFunctionName APPROX_DISTINCT_NAME = builtinFunctionName("approx_distinct");
+
     private final Metadata metadata;
 
     public OptimizeMixedDistinctAggregations(Metadata metadata)
@@ -181,16 +187,15 @@ public PlanNode visitAggregation(AggregationNode node, RewriteContext<Optional<A
                 else {
                     // Aggregations on non-distinct are already done by new node, just extract the non-null value
                     Symbol argument = aggregateInfo.getNewNonDistinctAggregateSymbols().get(entry.getKey());
-                    QualifiedName functionName = QualifiedName.of("arbitrary");
                     Aggregation newAggregation = new Aggregation(
-                            metadata.resolveFunction(session, functionName, fromTypes(symbolAllocator.getTypes().get(argument))),
+                            metadata.resolveBuiltinFunction("arbitrary", fromTypes(symbolAllocator.getTypes().get(argument))),
                             ImmutableList.of(argument.toSymbolReference()),
                             false,
                             Optional.empty(),
                             Optional.empty(),
                             Optional.empty());
-                    String signatureName = aggregation.getResolvedFunction().getSignature().getName();
-                    if (signatureName.equals("count") || signatureName.equals("count_if") || signatureName.equals("approx_distinct")) {
+                    CatalogSchemaFunctionName signatureName = aggregation.getResolvedFunction().getSignature().getName();
+                    if (signatureName.equals(COUNT_NAME) || signatureName.equals(COUNT_IF_NAME) || signatureName.equals(APPROX_DISTINCT_NAME)) {
                         Symbol newSymbol = symbolAllocator.newSymbol("expr", symbolAllocator.getTypes().get(entry.getKey()));
                         aggregations.put(newSymbol, newAggregation);
                         coalesceSymbolsBuilder.put(newSymbol, entry.getKey());
@@ -370,7 +375,7 @@ else if (aggregationOutputSymbolsMap.containsKey(symbol)) {
 
             // add null assignment for mask
             // unused mask will be removed by PruneUnreferencedOutputs
-            outputSymbols.put(aggregateInfo.getMask(), new NullLiteral());
+            outputSymbols.put(aggregateInfo.getMask(), new Cast(new NullLiteral(), toSqlType(BOOLEAN)));
 
             aggregateInfo.setNewNonDistinctAggregateSymbols(outputNonDistinctAggregateSymbols.buildOrThrow());
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PlanNodeSearcher.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PlanNodeSearcher.java
index a04de1f5f41f..0057cd4e5b30 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PlanNodeSearcher.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PlanNodeSearcher.java
@@ -109,16 +109,6 @@ private <T extends PlanNode> Optional<T> findFirstRecursive(PlanNode node)
         return Optional.empty();
     }
 
-    public <T extends PlanNode> Optional<T> findSingle()
-    {
-        List<T> all = findAll();
-        return switch (all.size()) {
-            case 0 -> Optional.empty();
-            case 1 -> Optional.of(all.get(0));
-            default -> throw new IllegalStateException("Multiple nodes found");
-        };
-    }
-
     /**
      * Return a list of matching nodes ordered as in pre-order traversal of the plan tree.
      */
@@ -134,15 +124,6 @@ public <T extends PlanNode> T findOnlyElement()
         return getOnlyElement(findAll());
     }
 
-    public <T extends PlanNode> T findOnlyElement(T defaultValue)
-    {
-        List<T> all = findAll();
-        if (all.size() == 0) {
-            return defaultValue;
-        }
-        return getOnlyElement(all);
-    }
-
     private <T extends PlanNode> void findAllRecursive(PlanNode node, ImmutableList.Builder<T> nodes)
     {
         node = lookup.resolve(node);
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PredicatePushDown.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PredicatePushDown.java
index 7c9b58085c3c..bc4338bf5151 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PredicatePushDown.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PredicatePushDown.java
@@ -610,7 +610,8 @@ private DynamicFiltersResult createDynamicFilters(
                 JoinNode node,
                 List<JoinNode.EquiJoinClause> equiJoinClauses,
                 List<Expression> joinFilterClauses,
-                Session session, PlanNodeIdAllocator idAllocator)
+                Session session,
+                PlanNodeIdAllocator idAllocator)
         {
             if ((node.getType() != INNER && node.getType() != RIGHT) || !isEnableDynamicFiltering(session) || !dynamicFiltering) {
                 return new DynamicFiltersResult(ImmutableMap.of(), ImmutableList.of());
@@ -675,7 +676,7 @@ private DynamicFiltersResult createDynamicFilters(
                         // we can take type of buildSymbol instead probeExpression as comparison expression must have the same type on both sides
                         Type type = symbolAllocator.getTypes().get(buildSymbol);
                         DynamicFilterId id = requireNonNull(buildSymbolToDynamicFilter.get(buildSymbol), () -> "missing dynamic filter for symbol " + buildSymbol);
-                        return createDynamicFilterExpression(session, metadata, id, type, probeExpression, comparison.getOperator(), clause.isNullAllowed());
+                        return createDynamicFilterExpression(metadata, id, type, probeExpression, comparison.getOperator(), clause.isNullAllowed());
                     })
                     .collect(toImmutableList());
             // Return a mapping from build symbols to corresponding dynamic filter IDs:
@@ -872,24 +873,24 @@ private OuterJoinPushDownResult processLimitedOuterJoin(
             joinPredicate = filterDeterministicConjuncts(metadata, joinPredicate);
 
             // Generate equality inferences
-            EqualityInference inheritedInference = EqualityInference.newInstance(metadata, inheritedPredicate);
-            EqualityInference outerInference = EqualityInference.newInstance(metadata, inheritedPredicate, outerEffectivePredicate);
+            EqualityInference inheritedInference = new EqualityInference(metadata, inheritedPredicate);
+            EqualityInference outerInference = new EqualityInference(metadata, inheritedPredicate, outerEffectivePredicate);
 
             Set<Symbol> innerScope = ImmutableSet.copyOf(innerSymbols);
             Set<Symbol> outerScope = ImmutableSet.copyOf(outerSymbols);
 
             EqualityInference.EqualityPartition equalityPartition = inheritedInference.generateEqualitiesPartitionedBy(outerScope);
             Expression outerOnlyInheritedEqualities = combineConjuncts(metadata, equalityPartition.getScopeEqualities());
-            EqualityInference potentialNullSymbolInference = EqualityInference.newInstance(metadata, outerOnlyInheritedEqualities, outerEffectivePredicate, innerEffectivePredicate, joinPredicate);
+            EqualityInference potentialNullSymbolInference = new EqualityInference(metadata, outerOnlyInheritedEqualities, outerEffectivePredicate, innerEffectivePredicate, joinPredicate);
 
             // Push outer and join equalities into the inner side. For example:
             // SELECT * FROM nation LEFT OUTER JOIN region ON nation.regionkey = region.regionkey and nation.name = region.name WHERE nation.name = 'blah'
 
-            EqualityInference potentialNullSymbolInferenceWithoutInnerInferred = EqualityInference.newInstance(metadata, outerOnlyInheritedEqualities, outerEffectivePredicate, joinPredicate);
+            EqualityInference potentialNullSymbolInferenceWithoutInnerInferred = new EqualityInference(metadata, outerOnlyInheritedEqualities, outerEffectivePredicate, joinPredicate);
             innerPushdownConjuncts.addAll(potentialNullSymbolInferenceWithoutInnerInferred.generateEqualitiesPartitionedBy(innerScope).getScopeEqualities());
 
             // TODO: we can further improve simplifying the equalities by considering other relationships from the outer side
-            EqualityInference.EqualityPartition joinEqualityPartition = EqualityInference.newInstance(metadata, joinPredicate).generateEqualitiesPartitionedBy(innerScope);
+            EqualityInference.EqualityPartition joinEqualityPartition = new EqualityInference(metadata, joinPredicate).generateEqualitiesPartitionedBy(innerScope);
             innerPushdownConjuncts.addAll(joinEqualityPartition.getScopeEqualities());
             joinConjuncts.addAll(joinEqualityPartition.getScopeComplementEqualities())
                     .addAll(joinEqualityPartition.getScopeStraddlingEqualities());
@@ -1009,14 +1010,14 @@ private InnerJoinPushDownResult processInnerJoin(
 
             // Attempt to simplify the effective left/right predicates with the predicate we're pushing down
             // This, effectively, inlines any constants derived from such predicate
-            EqualityInference predicateInference = EqualityInference.newInstance(metadata, inheritedPredicate);
+            EqualityInference predicateInference = new EqualityInference(metadata, inheritedPredicate);
             Expression simplifiedLeftEffectivePredicate = predicateInference.rewrite(leftEffectivePredicate, leftScope);
             Expression simplifiedRightEffectivePredicate = predicateInference.rewrite(rightEffectivePredicate, rightScope);
 
             // Generate equality inferences
-            EqualityInference allInference = EqualityInference.newInstance(metadata, inheritedPredicate, leftEffectivePredicate, rightEffectivePredicate, joinPredicate, simplifiedLeftEffectivePredicate, simplifiedRightEffectivePredicate);
-            EqualityInference allInferenceWithoutLeftInferred = EqualityInference.newInstance(metadata, inheritedPredicate, rightEffectivePredicate, joinPredicate, simplifiedRightEffectivePredicate);
-            EqualityInference allInferenceWithoutRightInferred = EqualityInference.newInstance(metadata, inheritedPredicate, leftEffectivePredicate, joinPredicate, simplifiedLeftEffectivePredicate);
+            EqualityInference allInference = new EqualityInference(metadata, inheritedPredicate, leftEffectivePredicate, rightEffectivePredicate, joinPredicate, simplifiedLeftEffectivePredicate, simplifiedRightEffectivePredicate);
+            EqualityInference allInferenceWithoutLeftInferred = new EqualityInference(metadata, inheritedPredicate, rightEffectivePredicate, joinPredicate, simplifiedRightEffectivePredicate);
+            EqualityInference allInferenceWithoutRightInferred = new EqualityInference(metadata, inheritedPredicate, leftEffectivePredicate, joinPredicate, simplifiedLeftEffectivePredicate);
 
             // Add equalities from the inference back in
             leftPushDownConjuncts.addAll(allInferenceWithoutLeftInferred.generateEqualitiesPartitionedBy(leftScope).getScopeEqualities());
@@ -1218,7 +1219,7 @@ private Expression simplifyExpression(Expression expression)
         {
             Map<NodeRef<Expression>, Type> expressionTypes = typeAnalyzer.getTypes(session, symbolAllocator.getTypes(), expression);
             ExpressionInterpreter optimizer = new ExpressionInterpreter(expression, plannerContext, session, expressionTypes);
-            return literalEncoder.toExpression(session, optimizer.optimize(NoOpSymbolResolver.INSTANCE), expressionTypes.get(NodeRef.of(expression)));
+            return literalEncoder.toExpression(optimizer.optimize(NoOpSymbolResolver.INSTANCE), expressionTypes.get(NodeRef.of(expression)));
         }
 
         private boolean areExpressionsEquivalent(Expression leftExpression, Expression rightExpression)
@@ -1309,7 +1310,7 @@ private PlanNode visitNonFilteringSemiJoin(SemiJoinNode node, RewriteContext<Exp
 
             // Push inheritedPredicates down to the source if they don't involve the semi join output
             ImmutableSet<Symbol> sourceScope = ImmutableSet.copyOf(node.getSource().getOutputSymbols());
-            EqualityInference inheritedInference = EqualityInference.newInstance(metadata, inheritedPredicate);
+            EqualityInference inheritedInference = new EqualityInference(metadata, inheritedPredicate);
             EqualityInference.nonInferrableConjuncts(metadata, inheritedPredicate).forEach(conjunct -> {
                 Expression rewrittenConjunct = inheritedInference.rewrite(conjunct, sourceScope);
                 // Since each source row is reflected exactly once in the output, ok to push non-deterministic predicates down
@@ -1368,9 +1369,9 @@ private PlanNode visitFilteringSemiJoin(SemiJoinNode node, RewriteContext<Expres
             List<Expression> postJoinConjuncts = new ArrayList<>();
 
             // Generate equality inferences
-            EqualityInference allInference = EqualityInference.newInstance(metadata, deterministicInheritedPredicate, sourceEffectivePredicate, filteringSourceEffectivePredicate, joinExpression);
-            EqualityInference allInferenceWithoutSourceInferred = EqualityInference.newInstance(metadata, deterministicInheritedPredicate, filteringSourceEffectivePredicate, joinExpression);
-            EqualityInference allInferenceWithoutFilteringSourceInferred = EqualityInference.newInstance(metadata, deterministicInheritedPredicate, sourceEffectivePredicate, joinExpression);
+            EqualityInference allInference = new EqualityInference(metadata, deterministicInheritedPredicate, sourceEffectivePredicate, filteringSourceEffectivePredicate, joinExpression);
+            EqualityInference allInferenceWithoutSourceInferred = new EqualityInference(metadata, deterministicInheritedPredicate, filteringSourceEffectivePredicate, joinExpression);
+            EqualityInference allInferenceWithoutFilteringSourceInferred = new EqualityInference(metadata, deterministicInheritedPredicate, sourceEffectivePredicate, joinExpression);
 
             // Push inheritedPredicates down to the source if they don't involve the semi join output
             Set<Symbol> sourceScope = ImmutableSet.copyOf(sourceSymbols);
@@ -1419,7 +1420,6 @@ private PlanNode visitFilteringSemiJoin(SemiJoinNode node, RewriteContext<Expres
                 dynamicFilterId = Optional.of(new DynamicFilterId("df_" + idAllocator.getNextId().toString()));
                 Symbol sourceSymbol = node.getSourceJoinSymbol();
                 sourceConjuncts.add(createDynamicFilterExpression(
-                        session,
                         metadata,
                         dynamicFilterId.get(),
                         symbolAllocator.getTypes().get(sourceSymbol),
@@ -1461,7 +1461,7 @@ public PlanNode visitAggregation(AggregationNode node, RewriteContext<Expression
 
             Expression inheritedPredicate = context.get();
 
-            EqualityInference equalityInference = EqualityInference.newInstance(metadata, inheritedPredicate);
+            EqualityInference equalityInference = new EqualityInference(metadata, inheritedPredicate);
 
             List<Expression> pushdownConjuncts = new ArrayList<>();
             List<Expression> postAggregationConjuncts = new ArrayList<>();
@@ -1523,7 +1523,7 @@ public PlanNode visitUnnest(UnnestNode node, RewriteContext<Expression> context)
             }
 
             //TODO for LEFT or INNER join type, push down UnnestNode's filter on replicate symbols
-            EqualityInference equalityInference = EqualityInference.newInstance(metadata, inheritedPredicate);
+            EqualityInference equalityInference = new EqualityInference(metadata, inheritedPredicate);
 
             List<Expression> pushdownConjuncts = new ArrayList<>();
             List<Expression> postUnnestConjuncts = new ArrayList<>();
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PreferredProperties.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PreferredProperties.java
index 82758c368e93..5c2126d5a165 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PreferredProperties.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PreferredProperties.java
@@ -16,12 +16,11 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.connector.LocalProperty;
 import io.trino.sql.planner.Partitioning;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -104,14 +103,6 @@ public static PreferredProperties partitionedWithLocal(Set<Symbol> columns, List
                 .build();
     }
 
-    public static PreferredProperties undistributedWithLocal(List<? extends LocalProperty<Symbol>> localProperties)
-    {
-        return builder()
-                .global(Global.undistributed())
-                .local(localProperties)
-                .build();
-    }
-
     public static PreferredProperties local(List<? extends LocalProperty<Symbol>> localProperties)
     {
         return builder()
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PropertyDerivations.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PropertyDerivations.java
index 42c853ade149..5500e3d13dd6 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PropertyDerivations.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PropertyDerivations.java
@@ -76,6 +76,7 @@
 import io.trino.sql.planner.plan.TableFunctionNode;
 import io.trino.sql.planner.plan.TableFunctionProcessorNode;
 import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.TableUpdateNode;
 import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.sql.planner.plan.TopNNode;
 import io.trino.sql.planner.plan.TopNRankingNode;
@@ -99,19 +100,14 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.spi.predicate.TupleDomain.extractFixedValues;
 import static io.trino.sql.planner.SystemPartitioningHandle.ARBITRARY_DISTRIBUTION;
-import static io.trino.sql.planner.SystemPartitioningHandle.COORDINATOR_DISTRIBUTION;
-import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
 import static io.trino.sql.planner.optimizations.ActualProperties.Global.arbitraryPartition;
-import static io.trino.sql.planner.optimizations.ActualProperties.Global.coordinatorSingleStreamPartition;
+import static io.trino.sql.planner.optimizations.ActualProperties.Global.coordinatorSinglePartition;
 import static io.trino.sql.planner.optimizations.ActualProperties.Global.partitionedOn;
-import static io.trino.sql.planner.optimizations.ActualProperties.Global.singleStreamPartition;
-import static io.trino.sql.planner.optimizations.ActualProperties.Global.streamPartitionedOn;
+import static io.trino.sql.planner.optimizations.ActualProperties.Global.singlePartition;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.LOCAL;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.REMOTE;
-import static io.trino.sql.planner.plan.ExchangeNode.Type.GATHER;
 import static io.trino.sql.tree.PatternRecognitionRelation.RowsPerMatch.ONE;
 import static io.trino.sql.tree.PatternRecognitionRelation.RowsPerMatch.WINDOW;
 import static io.trino.sql.tree.SkipTo.Position.PAST_LAST;
@@ -196,7 +192,7 @@ protected ActualProperties visitPlan(PlanNode node, List<ActualProperties> input
         public ActualProperties visitExplainAnalyze(ExplainAnalyzeNode node, List<ActualProperties> inputProperties)
         {
             return ActualProperties.builder()
-                    .global(coordinatorSingleStreamPartition())
+                    .global(coordinatorSinglePartition())
                     .build();
         }
 
@@ -232,7 +228,7 @@ public ActualProperties visitAssignUniqueId(AssignUniqueId node, List<ActualProp
             }
 
             return ActualProperties.builderFrom(properties)
-                    .global(partitionedOn(ARBITRARY_DISTRIBUTION, ImmutableList.of(node.getIdColumn()), Optional.of(ImmutableList.of(node.getIdColumn()))))
+                    .global(partitionedOn(ARBITRARY_DISTRIBUTION, ImmutableList.of(node.getIdColumn())))
                     .local(newLocalProperties.build())
                     .build();
         }
@@ -484,7 +480,7 @@ public ActualProperties visitDistinctLimit(DistinctLimitNode node, List<ActualPr
         public ActualProperties visitStatisticsWriterNode(StatisticsWriterNode node, List<ActualProperties> context)
         {
             return ActualProperties.builder()
-                    .global(coordinatorSingleStreamPartition())
+                    .global(coordinatorSinglePartition())
                     .build();
         }
 
@@ -492,7 +488,7 @@ public ActualProperties visitStatisticsWriterNode(StatisticsWriterNode node, Lis
         public ActualProperties visitTableFinish(TableFinishNode node, List<ActualProperties> inputProperties)
         {
             return ActualProperties.builder()
-                    .global(coordinatorSingleStreamPartition())
+                    .global(coordinatorSinglePartition())
                     .build();
         }
 
@@ -500,7 +496,15 @@ public ActualProperties visitTableFinish(TableFinishNode node, List<ActualProper
         public ActualProperties visitTableDelete(TableDeleteNode node, List<ActualProperties> context)
         {
             return ActualProperties.builder()
-                    .global(coordinatorSingleStreamPartition())
+                    .global(coordinatorSinglePartition())
+                    .build();
+        }
+
+        @Override
+        public ActualProperties visitTableUpdate(TableUpdateNode node, List<ActualProperties> context)
+        {
+            return ActualProperties.builder()
+                    .global(coordinatorSinglePartition())
                     .build();
         }
 
@@ -511,11 +515,11 @@ public ActualProperties visitTableExecute(TableExecuteNode node, List<ActualProp
 
             if (properties.isCoordinatorOnly()) {
                 return ActualProperties.builder()
-                        .global(coordinatorSingleStreamPartition())
+                        .global(coordinatorSinglePartition())
                         .build();
             }
             return ActualProperties.builder()
-                    .global(properties.isSingleNode() ? singleStreamPartition() : arbitraryPartition())
+                    .global(properties.isSingleNode() ? singlePartition() : arbitraryPartition())
                     .build();
         }
 
@@ -524,7 +528,7 @@ public ActualProperties visitSimpleTableExecuteNode(SimpleTableExecuteNode node,
         {
             // metadata operations always run on the coordinator
             return ActualProperties.builder()
-                    .global(coordinatorSingleStreamPartition())
+                    .global(coordinatorSinglePartition())
                     .build();
         }
 
@@ -583,7 +587,7 @@ public ActualProperties visitJoin(JoinNode node, List<ActualProperties> inputPro
                         // We can't say anything about the partitioning scheme because any partition of
                         // a hash-partitioned join can produce nulls in case of a lack of matches
                         ActualProperties.builder()
-                                .global(probeProperties.isSingleNode() ? singleStreamPartition() : arbitraryPartition())
+                                .global(probeProperties.isSingleNode() ? singlePartition() : arbitraryPartition())
                                 .build();
             };
         }
@@ -648,7 +652,7 @@ public ActualProperties visitDynamicFilterSource(DynamicFilterSourceNode node, L
         public ActualProperties visitIndexSource(IndexSourceNode node, List<ActualProperties> context)
         {
             return ActualProperties.builder()
-                    .global(singleStreamPartition())
+                    .global(singlePartition())
                     .build();
         }
 
@@ -692,14 +696,19 @@ public ActualProperties visitExchange(ExchangeNode node, List<ActualProperties>
             if (node.getScope() == LOCAL) {
                 if (inputProperties.size() == 1) {
                     ActualProperties inputProperty = inputProperties.get(0);
-                    if (inputProperty.isEffectivelySingleStream() && node.getOrderingScheme().isEmpty()) {
+                    if (inputProperty.isEffectivelySinglePartition() && node.getOrderingScheme().isEmpty()) {
                         verify(node.getInputs().size() == 1);
-                        Map<Symbol, Symbol> inputToOutput = exchangeInputToOutput(node, 0);
-                        // Single stream input's local sorting and grouping properties are preserved
-                        // In case of merging exchange, it's orderingScheme takes precedence
-                        localProperties.addAll(LocalProperties.translate(
-                                inputProperty.getLocalProperties(),
-                                symbol -> Optional.ofNullable(inputToOutput.get(symbol))));
+                        verify(node.getSources().size() == 1);
+                        PlanNode source = node.getSources().get(0);
+                        StreamPropertyDerivations.StreamProperties streamProperties = StreamPropertyDerivations.derivePropertiesRecursively(source, plannerContext, session, types, typeAnalyzer);
+                        if (streamProperties.isSingleStream()) {
+                            Map<Symbol, Symbol> inputToOutput = exchangeInputToOutput(node, 0);
+                            // Single stream input's local sorting and grouping properties are preserved
+                            // In case of merging exchange, it's orderingScheme takes precedence
+                            localProperties.addAll(LocalProperties.translate(
+                                    inputProperty.getLocalProperties(),
+                                    symbol -> Optional.ofNullable(inputToOutput.get(symbol))));
+                        }
                     }
                 }
 
@@ -708,18 +717,10 @@ public ActualProperties visitExchange(ExchangeNode node, List<ActualProperties>
                 builder.constants(constants);
 
                 if (inputProperties.stream().anyMatch(ActualProperties::isCoordinatorOnly)) {
-                    builder.global(partitionedOn(
-                            COORDINATOR_DISTRIBUTION,
-                            ImmutableList.of(),
-                            // only gathering local exchange preserves single stream property
-                            node.getType() == GATHER ? Optional.of(ImmutableList.of()) : Optional.empty()));
+                    builder.global(coordinatorSinglePartition());
                 }
                 else if (inputProperties.stream().anyMatch(ActualProperties::isSingleNode)) {
-                    builder.global(partitionedOn(
-                            SINGLE_DISTRIBUTION,
-                            ImmutableList.of(),
-                            // only gathering local exchange preserves single stream property
-                            node.getType() == GATHER ? Optional.of(ImmutableList.of()) : Optional.empty()));
+                    builder.global(singlePartition());
                 }
 
                 return builder.build();
@@ -727,14 +728,12 @@ else if (inputProperties.stream().anyMatch(ActualProperties::isSingleNode)) {
 
             return switch (node.getType()) {
                 case GATHER -> ActualProperties.builder()
-                        .global(node.getPartitioningScheme().getPartitioning().getHandle().isCoordinatorOnly() ? coordinatorSingleStreamPartition() : singleStreamPartition())
+                        .global(node.getPartitioningScheme().getPartitioning().getHandle().isCoordinatorOnly() ? coordinatorSinglePartition() : singlePartition())
                         .local(localProperties.build())
                         .constants(constants)
                         .build();
                 case REPARTITION -> ActualProperties.builder()
-                        .global(partitionedOn(
-                                node.getPartitioningScheme().getPartitioning(),
-                                Optional.of(node.getPartitioningScheme().getPartitioning()))
+                        .global(partitionedOn(node.getPartitioningScheme().getPartitioning())
                                 .withReplicatedNulls(node.getPartitioningScheme().isReplicateNullsAndAny()))
                         .constants(constants)
                         .build();
@@ -812,7 +811,7 @@ else if (!(value instanceof Expression)) {
         public ActualProperties visitRefreshMaterializedView(RefreshMaterializedViewNode node, List<ActualProperties> inputProperties)
         {
             return ActualProperties.builder()
-                    .global(coordinatorSingleStreamPartition())
+                    .global(coordinatorSinglePartition())
                     .build();
         }
 
@@ -828,11 +827,11 @@ private ActualProperties visitPartitionedWriter(List<ActualProperties> inputProp
 
             if (properties.isCoordinatorOnly()) {
                 return ActualProperties.builder()
-                        .global(coordinatorSingleStreamPartition())
+                        .global(coordinatorSinglePartition())
                         .build();
             }
             return ActualProperties.builder()
-                    .global(properties.isSingleNode() ? singleStreamPartition() : arbitraryPartition())
+                    .global(properties.isSingleNode() ? singlePartition() : arbitraryPartition())
                     .build();
         }
 
@@ -866,7 +865,7 @@ public ActualProperties visitUnnest(UnnestNode node, List<ActualProperties> inpu
         public ActualProperties visitValues(ValuesNode node, List<ActualProperties> context)
         {
             return ActualProperties.builder()
-                    .global(singleStreamPartition())
+                    .global(singlePartition())
                     .build();
         }
 
@@ -893,7 +892,7 @@ public ActualProperties visitTableScan(TableScanNode node, List<ActualProperties
             properties.constants(symbolConstants);
 
             // Partitioning properties
-            properties.global(deriveGlobalProperties(node, layout, assignments, globalConstants));
+            properties.global(deriveGlobalProperties(node, layout, assignments));
 
             // Append the global constants onto the local properties to maximize their translation potential
             List<LocalProperty<ColumnHandle>> constantAppendedLocalProperties = ImmutableList.<LocalProperty<ColumnHandle>>builder()
@@ -905,11 +904,8 @@ public ActualProperties visitTableScan(TableScanNode node, List<ActualProperties
             return properties.build();
         }
 
-        private Global deriveGlobalProperties(TableScanNode node, TableProperties layout, Map<ColumnHandle, Symbol> assignments, Map<ColumnHandle, NullableValue> constants)
+        private Global deriveGlobalProperties(TableScanNode node, TableProperties layout, Map<ColumnHandle, Symbol> assignments)
         {
-            Optional<List<Symbol>> streamPartitioning = layout.getStreamPartitioningColumns()
-                    .flatMap(columns -> translateToNonConstantSymbols(columns, assignments, constants));
-
             if (layout.getTablePartitioning().isPresent() && node.isUseConnectorNodePartitioning()) {
                 TablePartitioning tablePartitioning = layout.getTablePartitioning().get();
                 if (assignments.keySet().containsAll(tablePartitioning.getPartitioningColumns())) {
@@ -917,38 +913,12 @@ private Global deriveGlobalProperties(TableScanNode node, TableProperties layout
                             .map(assignments::get)
                             .collect(toImmutableList());
 
-                    return partitionedOn(tablePartitioning.getPartitioningHandle(), arguments, streamPartitioning);
+                    return partitionedOn(tablePartitioning.getPartitioningHandle(), arguments);
                 }
             }
-
-            if (streamPartitioning.isPresent()) {
-                return streamPartitionedOn(streamPartitioning.get());
-            }
             return arbitraryPartition();
         }
 
-        private static Optional<List<Symbol>> translateToNonConstantSymbols(
-                Set<ColumnHandle> columnHandles,
-                Map<ColumnHandle, Symbol> assignments,
-                Map<ColumnHandle, NullableValue> globalConstants)
-        {
-            // Strip off the constants from the partitioning columns (since those are not required for translation)
-            Set<ColumnHandle> constantsStrippedColumns = columnHandles.stream()
-                    .filter(column -> !globalConstants.containsKey(column))
-                    .collect(toImmutableSet());
-
-            ImmutableSet.Builder<Symbol> builder = ImmutableSet.builder();
-            for (ColumnHandle column : constantsStrippedColumns) {
-                Symbol translated = assignments.get(column);
-                if (translated == null) {
-                    return Optional.empty();
-                }
-                builder.add(translated);
-            }
-
-            return Optional.of(ImmutableList.copyOf(builder.build()));
-        }
-
         private static Map<Symbol, Symbol> computeIdentityTranslations(Map<Symbol, Expression> assignments)
         {
             Map<Symbol, Symbol> inputToOutput = new HashMap<>();
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/StreamPropertyDerivations.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/StreamPropertyDerivations.java
index 1de255b03b45..a2aab6c4cfa9 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/StreamPropertyDerivations.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/StreamPropertyDerivations.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.Session;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.TableProperties;
@@ -66,6 +67,7 @@
 import io.trino.sql.planner.plan.TableFunctionNode;
 import io.trino.sql.planner.plan.TableFunctionProcessorNode;
 import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.TableUpdateNode;
 import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.sql.planner.plan.TopNNode;
 import io.trino.sql.planner.plan.TopNRankingNode;
@@ -76,8 +78,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.SymbolReference;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -290,19 +290,24 @@ public StreamProperties visitTableScan(TableScanNode node, List<StreamProperties
                     .filter(entry -> !entry.getValue().isNull())  // TODO consider allowing nulls
                     .forEach(entry -> constants.add(entry.getKey()));
 
-            Optional<Set<Symbol>> streamPartitionSymbols = layout.getStreamPartitioningColumns()
-                    .flatMap(columns -> getNonConstantSymbols(columns, assignments, constants));
+            Optional<Set<Symbol>> partitioningSymbols = layout.getTablePartitioning().flatMap(partitioning -> {
+                if (!partitioning.isSingleSplitPerPartition()) {
+                    return Optional.empty();
+                }
+                Optional<Set<Symbol>> symbols = getNonConstantSymbols(partitioning.getPartitioningColumns(), assignments, constants);
+                // if we are partitioned on empty set, we must say multiple of unknown partitioning, because
+                // the connector does not guarantee a single split in this case (since it might not understand
+                // that the value is a constant).
+                if (symbols.isPresent() && symbols.get().isEmpty()) {
+                    return Optional.empty();
+                }
+                return symbols;
+            });
 
-            // if we are partitioned on empty set, we must say multiple of unknown partitioning, because
-            // the connector does not guarantee a single split in this case (since it might not understand
-            // that the value is a constant).
-            if (streamPartitionSymbols.isPresent() && streamPartitionSymbols.get().isEmpty()) {
-                return new StreamProperties(MULTIPLE, Optional.empty(), false);
-            }
-            return new StreamProperties(MULTIPLE, streamPartitionSymbols, false);
+            return new StreamProperties(MULTIPLE, partitioningSymbols, false);
         }
 
-        private static Optional<Set<Symbol>> getNonConstantSymbols(Set<ColumnHandle> columnHandles, Map<ColumnHandle, Symbol> assignments, Set<ColumnHandle> globalConstants)
+        private static Optional<Set<Symbol>> getNonConstantSymbols(List<ColumnHandle> columnHandles, Map<ColumnHandle, Symbol> assignments, Set<ColumnHandle> globalConstants)
         {
             // Strip off the constants from the partitioning columns (since those are not required for translation)
             Set<ColumnHandle> constantsStrippedPartitionColumns = columnHandles.stream()
@@ -425,6 +430,13 @@ public StreamProperties visitTableDelete(TableDeleteNode node, List<StreamProper
             return StreamProperties.singleStream();
         }
 
+        @Override
+        public StreamProperties visitTableUpdate(TableUpdateNode node, List<StreamProperties> inputProperties)
+        {
+            // update only outputs a single row count
+            return StreamProperties.singleStream();
+        }
+
         @Override
         public StreamProperties visitTableExecute(TableExecuteNode node, List<StreamProperties> inputProperties)
         {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/SymbolMapper.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/SymbolMapper.java
index 5b1c5de6a1b9..4d6bcd959fd4 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/SymbolMapper.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/SymbolMapper.java
@@ -56,6 +56,7 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -187,7 +188,7 @@ public GroupIdNode map(GroupIdNode node, PlanNode source)
         ImmutableList.Builder<List<Symbol>> newGroupingSets = ImmutableList.builder();
 
         for (List<Symbol> groupingSet : node.getGroupingSets()) {
-            ImmutableList.Builder<Symbol> newGroupingSet = ImmutableList.builder();
+            Set<Symbol> newGroupingSet = new LinkedHashSet<>();
             for (Symbol output : groupingSet) {
                 Symbol newOutput = map(output);
                 newGroupingMappings.putIfAbsent(
@@ -195,7 +196,7 @@ public GroupIdNode map(GroupIdNode node, PlanNode source)
                         map(node.getGroupingColumns().get(output)));
                 newGroupingSet.add(newOutput);
             }
-            newGroupingSets.add(newGroupingSet.build());
+            newGroupingSets.add(ImmutableList.copyOf(newGroupingSet));
         }
 
         return new GroupIdNode(
@@ -508,7 +509,6 @@ public TableWriterNode map(TableWriterNode node, PlanNode source, PlanNodeId new
                 map(node.getColumns()),
                 node.getColumnNames(),
                 node.getPartitioningScheme().map(partitioningScheme -> map(partitioningScheme, source.getOutputSymbols())),
-                node.getPreferredPartitioningScheme().map(partitioningScheme -> map(partitioningScheme, source.getOutputSymbols())),
                 node.getStatisticsAggregation().map(this::map),
                 node.getStatisticsAggregationDescriptor().map(descriptor -> descriptor.map(this::map)));
     }
@@ -529,8 +529,7 @@ public TableExecuteNode map(TableExecuteNode node, PlanNode source, PlanNodeId n
                 map(node.getFragmentSymbol()),
                 map(node.getColumns()),
                 node.getColumnNames(),
-                node.getPartitioningScheme().map(partitioningScheme -> map(partitioningScheme, source.getOutputSymbols())),
-                node.getPreferredPartitioningScheme().map(partitioningScheme -> map(partitioningScheme, source.getOutputSymbols())));
+                node.getPartitioningScheme().map(partitioningScheme -> map(partitioningScheme, source.getOutputSymbols())));
     }
 
     public MergeWriterNode map(MergeWriterNode node, PlanNode source)
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java
index e1da80813299..6f3e20e76e04 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java
@@ -40,7 +40,6 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.GenericLiteral;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.QuantifiedComparisonExpression;
 import io.trino.sql.tree.SearchedCaseExpression;
 import io.trino.sql.tree.SimpleCaseExpression;
@@ -93,29 +92,23 @@ public PlanNode optimize(
             PlanOptimizersStatsCollector planOptimizersStatsCollector,
             TableStatsProvider tableStatsProvider)
     {
-        return rewriteWith(new Rewriter(idAllocator, types, symbolAllocator, metadata, session), plan, null);
+        return rewriteWith(new Rewriter(idAllocator, types, symbolAllocator, metadata), plan, null);
     }
 
     private static class Rewriter
             extends SimplePlanRewriter<PlanNode>
     {
-        private static final QualifiedName MIN = QualifiedName.of("min");
-        private static final QualifiedName MAX = QualifiedName.of("max");
-        private static final QualifiedName COUNT = QualifiedName.of("count");
-
         private final PlanNodeIdAllocator idAllocator;
         private final TypeProvider types;
         private final SymbolAllocator symbolAllocator;
         private final Metadata metadata;
-        private final Session session;
 
-        public Rewriter(PlanNodeIdAllocator idAllocator, TypeProvider types, SymbolAllocator symbolAllocator, Metadata metadata, Session session)
+        public Rewriter(PlanNodeIdAllocator idAllocator, TypeProvider types, SymbolAllocator symbolAllocator, Metadata metadata)
         {
             this.idAllocator = requireNonNull(idAllocator, "idAllocator is null");
             this.types = requireNonNull(types, "types is null");
             this.symbolAllocator = requireNonNull(symbolAllocator, "symbolAllocator is null");
             this.metadata = requireNonNull(metadata, "metadata is null");
-            this.session = session;
         }
 
         @Override
@@ -141,8 +134,8 @@ private PlanNode rewriteQuantifiedApplyNode(ApplyNode node, QuantifiedComparison
             Type outputColumnType = types.get(outputColumn);
             checkState(outputColumnType.isOrderable(), "Subquery result type must be orderable");
 
-            Symbol minValue = symbolAllocator.newSymbol(MIN.toString(), outputColumnType);
-            Symbol maxValue = symbolAllocator.newSymbol(MAX.toString(), outputColumnType);
+            Symbol minValue = symbolAllocator.newSymbol("min", outputColumnType);
+            Symbol maxValue = symbolAllocator.newSymbol("max", outputColumnType);
             Symbol countAllValue = symbolAllocator.newSymbol("count_all", BigintType.BIGINT);
             Symbol countNonNullValue = symbolAllocator.newSymbol("count_non_null", BigintType.BIGINT);
 
@@ -153,28 +146,28 @@ private PlanNode rewriteQuantifiedApplyNode(ApplyNode node, QuantifiedComparison
                     subqueryPlan,
                     ImmutableMap.of(
                             minValue, new Aggregation(
-                                    metadata.resolveFunction(session, MIN, fromTypes(outputColumnType)),
+                                    metadata.resolveBuiltinFunction("min", fromTypes(outputColumnType)),
                                     outputColumnReferences,
                                     false,
                                     Optional.empty(),
                                     Optional.empty(),
                                     Optional.empty()),
                             maxValue, new Aggregation(
-                                    metadata.resolveFunction(session, MAX, fromTypes(outputColumnType)),
+                                    metadata.resolveBuiltinFunction("max", fromTypes(outputColumnType)),
                                     outputColumnReferences,
                                     false,
                                     Optional.empty(),
                                     Optional.empty(),
                                     Optional.empty()),
                             countAllValue, new Aggregation(
-                                    metadata.resolveFunction(session, COUNT, emptyList()),
+                                    metadata.resolveBuiltinFunction("count", emptyList()),
                                     ImmutableList.of(),
                                     false,
                                     Optional.empty(),
                                     Optional.empty(),
                                     Optional.empty()),
                             countNonNullValue, new Aggregation(
-                                    metadata.resolveFunction(session, COUNT, fromTypes(outputColumnType)),
+                                    metadata.resolveBuiltinFunction("count", fromTypes(outputColumnType)),
                                     outputColumnReferences,
                                     false,
                                     Optional.empty(),
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/UnaliasSymbolReferences.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/UnaliasSymbolReferences.java
index 4baa276e82db..05d8dbe5cc6d 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/UnaliasSymbolReferences.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/UnaliasSymbolReferences.java
@@ -82,6 +82,7 @@
 import io.trino.sql.planner.plan.TableFunctionNode.TableArgumentProperties;
 import io.trino.sql.planner.plan.TableFunctionProcessorNode;
 import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.TableUpdateNode;
 import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.sql.planner.plan.TopNNode;
 import io.trino.sql.planner.plan.TopNRankingNode;
@@ -690,6 +691,19 @@ public PlanAndMappings visitTableDelete(TableDeleteNode node, UnaliasContext con
                     mapping);
         }
 
+        @Override
+        public PlanAndMappings visitTableUpdate(TableUpdateNode node, UnaliasContext context)
+        {
+            Map<Symbol, Symbol> mapping = new HashMap<>(context.getCorrelationMapping());
+            SymbolMapper mapper = symbolMapper(mapping);
+
+            Symbol newOutput = mapper.map(node.getOutput());
+
+            return new PlanAndMappings(
+                    new TableUpdateNode(node.getId(), node.getTarget(), newOutput),
+                    mapping);
+        }
+
         @Override
         public PlanAndMappings visitTableExecute(TableExecuteNode node, UnaliasContext context)
         {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/WindowFilterPushDown.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/WindowFilterPushDown.java
index b506defcc464..d4f4da8de30b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/WindowFilterPushDown.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/WindowFilterPushDown.java
@@ -41,7 +41,6 @@
 import io.trino.sql.planner.plan.WindowNode;
 import io.trino.sql.tree.BooleanLiteral;
 import io.trino.sql.tree.Expression;
-import io.trino.sql.tree.QualifiedName;
 
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -109,8 +108,8 @@ private Rewriter(
             this.plannerContext = requireNonNull(plannerContext, "plannerContext is null");
             this.session = requireNonNull(session, "session is null");
             this.types = requireNonNull(types, "types is null");
-            rowNumberFunctionId = plannerContext.getMetadata().resolveFunction(session, QualifiedName.of("row_number"), ImmutableList.of()).getFunctionId();
-            rankFunctionId = plannerContext.getMetadata().resolveFunction(session, QualifiedName.of("rank"), ImmutableList.of()).getFunctionId();
+            rowNumberFunctionId = plannerContext.getMetadata().resolveBuiltinFunction("row_number", ImmutableList.of()).getFunctionId();
+            rankFunctionId = plannerContext.getMetadata().resolveBuiltinFunction("rank", ImmutableList.of()).getFunctionId();
             domainTranslator = new DomainTranslator(plannerContext);
         }
 
@@ -221,7 +220,7 @@ private PlanNode rewriteFilterSource(FilterNode filterNode, PlanNode source, Sym
             Expression newPredicate = ExpressionUtils.combineConjuncts(
                     plannerContext.getMetadata(),
                     extractionResult.getRemainingExpression(),
-                    domainTranslator.toPredicate(session, newTupleDomain));
+                    domainTranslator.toPredicate(newTupleDomain));
 
             if (newPredicate.equals(BooleanLiteral.TRUE_LITERAL)) {
                 return source;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/AggregationNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/AggregationNode.java
index e44376f09753..348115750c2f 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/AggregationNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/AggregationNode.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.Session;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.ResolvedFunction;
@@ -30,8 +31,6 @@
 import io.trino.sql.tree.SymbolReference;
 import io.trino.type.FunctionType;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ApplyNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ApplyNode.java
index 91ef62bf7083..e019b0857629 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ApplyNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ApplyNode.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.tree.ExistsPredicate;
 import io.trino.sql.tree.Expression;
@@ -23,8 +24,6 @@
 import io.trino.sql.tree.Node;
 import io.trino.sql.tree.QuantifiedComparisonExpression;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/CorrelatedJoinNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/CorrelatedJoinNode.java
index 60441272eacf..57b023b66dba 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/CorrelatedJoinNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/CorrelatedJoinNode.java
@@ -16,14 +16,13 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.Join;
 import io.trino.sql.tree.Node;
 import io.trino.sql.tree.NullLiteral;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/DataOrganizationSpecification.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/DataOrganizationSpecification.java
index 588a83c96967..6bd7b9d953c1 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/DataOrganizationSpecification.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/DataOrganizationSpecification.java
@@ -16,11 +16,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.OrderingScheme;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/DistinctLimitNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/DistinctLimitNode.java
index d434b1fd5f82..5b2e56dfe94b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/DistinctLimitNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/DistinctLimitNode.java
@@ -17,10 +17,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/DynamicFilterId.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/DynamicFilterId.java
index 973171a070be..e0e0fd2c1c59 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/DynamicFilterId.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/DynamicFilterId.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import static io.airlift.slice.SizeOf.estimatedSizeOf;
 import static io.airlift.slice.SizeOf.instanceSize;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/DynamicFilterSourceNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/DynamicFilterSourceNode.java
index 27e126169d28..c3f82c284acd 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/DynamicFilterSourceNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/DynamicFilterSourceNode.java
@@ -18,10 +18,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/EnforceSingleRowNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/EnforceSingleRowNode.java
index f27c3c412832..82f469c070e7 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/EnforceSingleRowNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/EnforceSingleRowNode.java
@@ -17,10 +17,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ExceptNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ExceptNode.java
index 2876eb90fbb5..b9cd2ed2b9e4 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ExceptNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ExceptNode.java
@@ -15,10 +15,9 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ListMultimap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 @Immutable
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ExchangeNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ExchangeNode.java
index 52f7e10432b8..bd0d9ea69f8f 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ExchangeNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ExchangeNode.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.OrderingScheme;
 import io.trino.sql.planner.Partitioning;
 import io.trino.sql.planner.Partitioning.ArgumentBinding;
@@ -24,8 +25,6 @@
 import io.trino.sql.planner.PartitioningScheme;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
@@ -147,7 +146,7 @@ public static ExchangeNode partitionedExchange(PlanNodeId id, Scope scope, PlanN
                 scope,
                 partitioningScheme,
                 ImmutableList.of(child),
-                ImmutableList.of(partitioningScheme.getOutputLayout()).asList(),
+                ImmutableList.of(partitioningScheme.getOutputLayout()),
                 Optional.empty());
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ExplainAnalyzeNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ExplainAnalyzeNode.java
index 8e821758ba49..5f2e9c0289e5 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ExplainAnalyzeNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ExplainAnalyzeNode.java
@@ -18,10 +18,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/FilterNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/FilterNode.java
index e7e8d935829d..7390ea1837c8 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/FilterNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/FilterNode.java
@@ -17,12 +17,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.NullLiteral;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/GroupIdNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/GroupIdNode.java
index ea11a57121ad..29eac2e97676 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/GroupIdNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/GroupIdNode.java
@@ -14,27 +14,25 @@
 package io.trino.sql.planner.plan;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
-import java.util.Collection;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.util.MoreLists.listOfListsCopy;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toSet;
 
 @Immutable
 public class GroupIdNode
@@ -77,10 +75,9 @@ public GroupIdNode(
     @Override
     public List<Symbol> getOutputSymbols()
     {
-        return ImmutableList.<Symbol>builder()
-                .addAll(groupingSets.stream()
-                        .flatMap(Collection::stream)
-                        .collect(toSet()))
+        Set<Symbol> distinctGroupingSetSymbols = getDistinctGroupingSetSymbols();
+        return ImmutableList.<Symbol>builderWithExpectedSize(distinctGroupingSetSymbols.size() + aggregationArguments.size() + 1)
+                .addAll(distinctGroupingSetSymbols)
                 .addAll(aggregationArguments)
                 .add(groupIdSymbol)
                 .build();
@@ -104,6 +101,14 @@ public List<List<Symbol>> getGroupingSets()
         return groupingSets;
     }
 
+    @JsonIgnore
+    public Set<Symbol> getDistinctGroupingSetSymbols()
+    {
+        return groupingSets.stream()
+                .flatMap(List::stream)
+                .collect(toImmutableSet()); // Produce a stable ordering of grouping set symbols in the output
+    }
+
     @JsonProperty
     public Map<Symbol, Symbol> getGroupingColumns()
     {
@@ -130,20 +135,19 @@ public <R, C> R accept(PlanVisitor<R, C> visitor, C context)
 
     public Set<Symbol> getInputSymbols()
     {
-        return ImmutableSet.<Symbol>builder()
-                .addAll(aggregationArguments)
-                .addAll(groupingSets.stream()
-                        .map(set -> set.stream()
-                                .map(groupingColumns::get).collect(Collectors.toList()))
-                        .flatMap(Collection::stream)
-                        .collect(toSet()))
-                .build();
+        Set<Symbol> distinctGroupingSetSymbols = getDistinctGroupingSetSymbols();
+        ImmutableSet.Builder<Symbol> builder = ImmutableSet.builderWithExpectedSize(aggregationArguments.size() + distinctGroupingSetSymbols.size());
+        builder.addAll(aggregationArguments);
+        for (Symbol groupingSetSymbol : distinctGroupingSetSymbols) {
+            builder.add(groupingColumns.get(groupingSetSymbol));
+        }
+        return builder.build();
     }
 
     // returns the common grouping columns in terms of output symbols
     public Set<Symbol> getCommonGroupingColumns()
     {
-        Set<Symbol> intersection = new HashSet<>(groupingSets.get(0));
+        Set<Symbol> intersection = new LinkedHashSet<>(groupingSets.get(0));
         for (int i = 1; i < groupingSets.size(); i++) {
             intersection.retainAll(groupingSets.get(i));
         }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/IndexJoinNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/IndexJoinNode.java
index 67c1452c622b..100f9eae6d96 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/IndexJoinNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/IndexJoinNode.java
@@ -16,10 +16,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/IntersectNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/IntersectNode.java
index 099b5fd9a904..d2fe0b76408a 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/IntersectNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/IntersectNode.java
@@ -16,10 +16,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ListMultimap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 @Immutable
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/JoinNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/JoinNode.java
index 04ff4db45ad2..261798349794 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/JoinNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/JoinNode.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.cost.PlanNodeStatsAndCostSummary;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.tree.ComparisonExpression;
@@ -25,8 +26,6 @@
 import io.trino.sql.tree.Join;
 import io.trino.sql.tree.NullLiteral;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/LimitNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/LimitNode.java
index 009e919cbc30..e984e15f4919 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/LimitNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/LimitNode.java
@@ -17,11 +17,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.OrderingScheme;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/MarkDistinctNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/MarkDistinctNode.java
index 8f95656b9477..4ed269785508 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/MarkDistinctNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/MarkDistinctNode.java
@@ -17,10 +17,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/MergeWriterNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/MergeWriterNode.java
index 2c82e469e109..0d9f89654e84 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/MergeWriterNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/MergeWriterNode.java
@@ -17,12 +17,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.PartitioningScheme;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.TableWriterNode.MergeTarget;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/OffsetNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/OffsetNode.java
index 1579d8727e26..a3aa8fe711fd 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/OffsetNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/OffsetNode.java
@@ -17,10 +17,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/OutputNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/OutputNode.java
index 84fd345a8418..013e830d2311 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/OutputNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/OutputNode.java
@@ -17,10 +17,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/PatternRecognitionNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/PatternRecognitionNode.java
index d3994564efc9..424a72c7b3ad 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/PatternRecognitionNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/PatternRecognitionNode.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.OrderingScheme;
 import io.trino.sql.planner.Symbol;
@@ -29,8 +30,6 @@
 import io.trino.sql.tree.PatternRecognitionRelation.RowsPerMatch;
 import io.trino.sql.tree.SkipTo.Position;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/Patterns.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/Patterns.java
index 209d4860f1b2..3ef95cae0658 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/Patterns.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/Patterns.java
@@ -65,6 +65,11 @@ public static Pattern<MergeWriterNode> mergeWriter()
         return typeOf(MergeWriterNode.class);
     }
 
+    public static Pattern<MergeProcessorNode> mergeProcessor()
+    {
+        return typeOf(MergeProcessorNode.class);
+    }
+
     public static Pattern<ExchangeNode> exchange()
     {
         return typeOf(ExchangeNode.class);
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanFragmentId.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanFragmentId.java
index 645d2b556e02..c5722046bf0d 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanFragmentId.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanFragmentId.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanNode.java
index 013d8fe1f79e..36d2841ae58d 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanNode.java
@@ -55,6 +55,7 @@
         @JsonSubTypes.Type(value = MergeWriterNode.class, name = "mergeWriter"),
         @JsonSubTypes.Type(value = MergeProcessorNode.class, name = "mergeProcessor"),
         @JsonSubTypes.Type(value = TableDeleteNode.class, name = "tableDelete"),
+        @JsonSubTypes.Type(value = TableUpdateNode.class, name = "tableUpdate"),
         @JsonSubTypes.Type(value = TableFinishNode.class, name = "tablecommit"),
         @JsonSubTypes.Type(value = UnnestNode.class, name = "unnest"),
         @JsonSubTypes.Type(value = ExchangeNode.class, name = "exchange"),
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanNodeId.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanNodeId.java
index 2e3c97497360..97fa2138aa6f 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanNodeId.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanNodeId.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import static io.airlift.slice.SizeOf.estimatedSizeOf;
 import static io.airlift.slice.SizeOf.instanceSize;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanVisitor.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanVisitor.java
index 2b4b6bfbcfe5..bd8dbafb45d8 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanVisitor.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/PlanVisitor.java
@@ -159,6 +159,11 @@ public R visitTableDelete(TableDeleteNode node, C context)
         return visitPlan(node, context);
     }
 
+    public R visitTableUpdate(TableUpdateNode node, C context)
+    {
+        return visitPlan(node, context);
+    }
+
     public R visitTableFinish(TableFinishNode node, C context)
     {
         return visitPlan(node, context);
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ProjectNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ProjectNode.java
index 47c7e839f7d5..853a5cf53abd 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ProjectNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ProjectNode.java
@@ -17,10 +17,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/RefreshMaterializedViewNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/RefreshMaterializedViewNode.java
index 2ff6049ebdba..75e7c080066f 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/RefreshMaterializedViewNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/RefreshMaterializedViewNode.java
@@ -16,11 +16,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/RemoteSourceNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/RemoteSourceNode.java
index 46cf21dff1a4..785b78274239 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/RemoteSourceNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/RemoteSourceNode.java
@@ -16,12 +16,11 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.operator.RetryPolicy;
 import io.trino.sql.planner.OrderingScheme;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
@@ -118,4 +117,15 @@ public PlanNode replaceChildren(List<PlanNode> newChildren)
         checkArgument(newChildren.isEmpty(), "newChildren is not empty");
         return this;
     }
+
+    public RemoteSourceNode withSourceFragmentIds(List<PlanFragmentId> sourceFragmentIds)
+    {
+        return new RemoteSourceNode(
+                this.getId(),
+                sourceFragmentIds,
+                this.getOutputSymbols(),
+                this.getOrderingScheme(),
+                this.getExchangeType(),
+                this.getRetryPolicy());
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/RowNumberNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/RowNumberNode.java
index f586a4d67757..4d84f1254210 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/RowNumberNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/RowNumberNode.java
@@ -17,10 +17,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/SampleNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/SampleNode.java
index 8be856dc727f..01bfb64bb730 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/SampleNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/SampleNode.java
@@ -17,11 +17,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.tree.SampledRelation;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/SemiJoinNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/SemiJoinNode.java
index 6aa1828b5e88..45f2fe33a925 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/SemiJoinNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/SemiJoinNode.java
@@ -16,10 +16,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/SetOperationNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/SetOperationNode.java
index 35e84a195201..3312e3a43312 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/SetOperationNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/SetOperationNode.java
@@ -24,11 +24,10 @@
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.tree.SymbolReference;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/SpatialJoinNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/SpatialJoinNode.java
index f944f9d1ad87..c3c4055b2f1d 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/SpatialJoinNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/SpatialJoinNode.java
@@ -17,11 +17,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.tree.Expression;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/StatisticAggregations.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/StatisticAggregations.java
index b2cf2c26786b..85c2367e1a30 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/StatisticAggregations.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/StatisticAggregations.java
@@ -73,7 +73,7 @@ public Parts createPartialAggregations(SymbolAllocator symbolAllocator, Session
                     .map(plannerContext.getTypeManager()::getType)
                     .collect(toImmutableList());
             Type intermediateType = intermediateTypes.size() == 1 ? intermediateTypes.get(0) : RowType.anonymous(intermediateTypes);
-            Symbol partialSymbol = symbolAllocator.newSymbol(resolvedFunction.getSignature().getName(), intermediateType);
+            Symbol partialSymbol = symbolAllocator.newSymbol(resolvedFunction.getSignature().getName().getFunctionName(), intermediateType);
             mappings.put(entry.getKey(), partialSymbol);
             partialAggregation.put(partialSymbol, new Aggregation(
                     resolvedFunction,
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableDeleteNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableDeleteNode.java
index 8a8c8992835b..f0ac34b3455a 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableDeleteNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableDeleteNode.java
@@ -16,11 +16,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.metadata.TableHandle;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableExecuteNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableExecuteNode.java
index f6b4877deb17..1902bf2d7852 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableExecuteNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableExecuteNode.java
@@ -17,12 +17,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.PartitioningScheme;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.TableWriterNode.TableExecuteTarget;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
@@ -40,7 +39,6 @@ public class TableExecuteNode
     private final List<Symbol> columns;
     private final List<String> columnNames;
     private final Optional<PartitioningScheme> partitioningScheme;
-    private final Optional<PartitioningScheme> preferredPartitioningScheme;
     private final List<Symbol> outputs;
 
     @JsonCreator
@@ -52,8 +50,7 @@ public TableExecuteNode(
             @JsonProperty("fragmentSymbol") Symbol fragmentSymbol,
             @JsonProperty("columns") List<Symbol> columns,
             @JsonProperty("columnNames") List<String> columnNames,
-            @JsonProperty("partitioningScheme") Optional<PartitioningScheme> partitioningScheme,
-            @JsonProperty("preferredPartitioningScheme") Optional<PartitioningScheme> preferredPartitioningScheme)
+            @JsonProperty("partitioningScheme") Optional<PartitioningScheme> partitioningScheme)
     {
         super(id);
 
@@ -68,8 +65,6 @@ public TableExecuteNode(
         this.columns = ImmutableList.copyOf(columns);
         this.columnNames = ImmutableList.copyOf(columnNames);
         this.partitioningScheme = requireNonNull(partitioningScheme, "partitioningScheme is null");
-        this.preferredPartitioningScheme = requireNonNull(preferredPartitioningScheme, "preferredPartitioningScheme is null");
-        checkArgument(partitioningScheme.isEmpty() || preferredPartitioningScheme.isEmpty(), "Both partitioningScheme and preferredPartitioningScheme cannot be present");
 
         ImmutableList.Builder<Symbol> outputs = ImmutableList.<Symbol>builder()
                 .add(rowCountSymbol)
@@ -119,12 +114,6 @@ public Optional<PartitioningScheme> getPartitioningScheme()
         return partitioningScheme;
     }
 
-    @JsonProperty
-    public Optional<PartitioningScheme> getPreferredPartitioningScheme()
-    {
-        return preferredPartitioningScheme;
-    }
-
     @Override
     public List<PlanNode> getSources()
     {
@@ -154,7 +143,6 @@ public PlanNode replaceChildren(List<PlanNode> newChildren)
                 fragmentSymbol,
                 columns,
                 columnNames,
-                partitioningScheme,
-                preferredPartitioningScheme);
+                partitioningScheme);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableFinishNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableFinishNode.java
index 6b987cdcae5a..6a9017af8e3d 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableFinishNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableFinishNode.java
@@ -17,10 +17,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableFunctionNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableFunctionNode.java
index f62203291851..4f5b37d13995 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableFunctionNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableFunctionNode.java
@@ -17,13 +17,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.metadata.TableFunctionHandle;
 import io.trino.spi.connector.CatalogHandle;
-import io.trino.spi.ptf.Argument;
+import io.trino.spi.function.table.Argument;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableScanNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableScanNode.java
index cc6436e69140..c63390929100 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableScanNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableScanNode.java
@@ -19,15 +19,14 @@
 import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.cost.PlanNodeStatsEstimate;
 import io.trino.metadata.TableHandle;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.sql.planner.Symbol;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Map;
@@ -52,6 +51,7 @@ public class TableScanNode
 
     @Nullable // null on workers
     private final TupleDomain<ColumnHandle> enforcedConstraint;
+    @SuppressWarnings("NullableOptional")
     @Nullable // null on workers
     private final Optional<PlanNodeStatsEstimate> statistics;
     private final boolean updateTarget;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableUpdateNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableUpdateNode.java
new file mode 100644
index 000000000000..cd81aab38aea
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableUpdateNode.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed 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 io.trino.sql.planner.plan;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
+import io.trino.metadata.TableHandle;
+import io.trino.sql.planner.Symbol;
+
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+@Immutable
+public class TableUpdateNode
+        extends PlanNode
+{
+    private final TableHandle target;
+    private final Symbol output;
+
+    @JsonCreator
+    public TableUpdateNode(
+            @JsonProperty("id") PlanNodeId id,
+            @JsonProperty("target") TableHandle target,
+            @JsonProperty("output") Symbol output)
+    {
+        super(id);
+        this.target = requireNonNull(target, "target is null");
+        this.output = requireNonNull(output, "output is null");
+    }
+
+    @JsonProperty
+    public TableHandle getTarget()
+    {
+        return target;
+    }
+
+    @JsonProperty
+    public Symbol getOutput()
+    {
+        return output;
+    }
+
+    @Override
+    public List<Symbol> getOutputSymbols()
+    {
+        return ImmutableList.of(output);
+    }
+
+    @Override
+    public List<PlanNode> getSources()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public PlanNode replaceChildren(List<PlanNode> newChildren)
+    {
+        checkArgument(newChildren.isEmpty(), "newChildren should be empty");
+        return this;
+    }
+
+    @Override
+    public <R, C> R accept(PlanVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitTableUpdate(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableWriterNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableWriterNode.java
index 3cdb2194e7c3..9a359504cc8a 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableWriterNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableWriterNode.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.Session;
 import io.trino.metadata.InsertTableHandle;
 import io.trino.metadata.MergeHandle;
@@ -33,12 +34,11 @@
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.RowChangeParadigm;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.PartitioningScheme;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -57,7 +57,6 @@ public class TableWriterNode
     private final List<Symbol> columns;
     private final List<String> columnNames;
     private final Optional<PartitioningScheme> partitioningScheme;
-    private final Optional<PartitioningScheme> preferredPartitioningScheme;
     private final Optional<StatisticAggregations> statisticsAggregation;
     private final Optional<StatisticAggregationsDescriptor<Symbol>> statisticsAggregationDescriptor;
     private final List<Symbol> outputs;
@@ -72,7 +71,6 @@ public TableWriterNode(
             @JsonProperty("columns") List<Symbol> columns,
             @JsonProperty("columnNames") List<String> columnNames,
             @JsonProperty("partitioningScheme") Optional<PartitioningScheme> partitioningScheme,
-            @JsonProperty("preferredPartitioningScheme") Optional<PartitioningScheme> preferredPartitioningScheme,
             @JsonProperty("statisticsAggregation") Optional<StatisticAggregations> statisticsAggregation,
             @JsonProperty("statisticsAggregationDescriptor") Optional<StatisticAggregationsDescriptor<Symbol>> statisticsAggregationDescriptor)
     {
@@ -89,11 +87,9 @@ public TableWriterNode(
         this.columns = ImmutableList.copyOf(columns);
         this.columnNames = ImmutableList.copyOf(columnNames);
         this.partitioningScheme = requireNonNull(partitioningScheme, "partitioningScheme is null");
-        this.preferredPartitioningScheme = requireNonNull(preferredPartitioningScheme, "preferredPartitioningScheme is null");
         this.statisticsAggregation = requireNonNull(statisticsAggregation, "statisticsAggregation is null");
         this.statisticsAggregationDescriptor = requireNonNull(statisticsAggregationDescriptor, "statisticsAggregationDescriptor is null");
         checkArgument(statisticsAggregation.isPresent() == statisticsAggregationDescriptor.isPresent(), "statisticsAggregation and statisticsAggregationDescriptor must be either present or absent");
-        checkArgument(partitioningScheme.isEmpty() || preferredPartitioningScheme.isEmpty(), "Both partitioningScheme and preferredPartitioningScheme cannot be present");
 
         ImmutableList.Builder<Symbol> outputs = ImmutableList.<Symbol>builder()
                 .add(rowCountSymbol)
@@ -147,12 +143,6 @@ public Optional<PartitioningScheme> getPartitioningScheme()
         return partitioningScheme;
     }
 
-    @JsonProperty
-    public Optional<PartitioningScheme> getPreferredPartitioningScheme()
-    {
-        return preferredPartitioningScheme;
-    }
-
     @JsonProperty
     public Optional<StatisticAggregations> getStatisticsAggregation()
     {
@@ -186,7 +176,7 @@ public <R, C> R accept(PlanVisitor<R, C> visitor, C context)
     @Override
     public PlanNode replaceChildren(List<PlanNode> newChildren)
     {
-        return new TableWriterNode(getId(), Iterables.getOnlyElement(newChildren), target, rowCountSymbol, fragmentSymbol, columns, columnNames, partitioningScheme, preferredPartitioningScheme, statisticsAggregation, statisticsAggregationDescriptor);
+        return new TableWriterNode(getId(), Iterables.getOnlyElement(newChildren), target, rowCountSymbol, fragmentSymbol, columns, columnNames, partitioningScheme, statisticsAggregation, statisticsAggregationDescriptor);
     }
 
     @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "@type")
@@ -204,11 +194,11 @@ public abstract static class WriterTarget
         @Override
         public abstract String toString();
 
-        public abstract boolean supportsReportingWrittenBytes(Metadata metadata, Session session);
-
         public abstract boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session);
 
         public abstract OptionalInt getMaxWriterTasks(Metadata metadata, Session session);
+
+        public abstract WriterScalingOptions getWriterScalingOptions(Metadata metadata, Session session);
     }
 
     // only used during planning -- will not be serialized
@@ -218,12 +208,14 @@ public static class CreateReference
         private final String catalog;
         private final ConnectorTableMetadata tableMetadata;
         private final Optional<TableLayout> layout;
+        private final boolean replace;
 
-        public CreateReference(String catalog, ConnectorTableMetadata tableMetadata, Optional<TableLayout> layout)
+        public CreateReference(String catalog, ConnectorTableMetadata tableMetadata, Optional<TableLayout> layout, boolean replace)
         {
             this.catalog = requireNonNull(catalog, "catalog is null");
             this.tableMetadata = requireNonNull(tableMetadata, "tableMetadata is null");
             this.layout = requireNonNull(layout, "layout is null");
+            this.replace = replace;
         }
 
         public String getCatalog()
@@ -231,16 +223,6 @@ public String getCatalog()
             return catalog;
         }
 
-        @Override
-        public boolean supportsReportingWrittenBytes(Metadata metadata, Session session)
-        {
-            QualifiedObjectName fullTableName = new QualifiedObjectName(
-                    catalog,
-                    tableMetadata.getTableSchema().getTable().getSchemaName(),
-                    tableMetadata.getTableSchema().getTable().getTableName());
-            return metadata.supportsReportingWrittenBytes(session, fullTableName, tableMetadata.getProperties());
-        }
-
         @Override
         public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
         {
@@ -253,6 +235,16 @@ public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
             return metadata.getMaxWriterTasks(session, catalog);
         }
 
+        @Override
+        public WriterScalingOptions getWriterScalingOptions(Metadata metadata, Session session)
+        {
+            QualifiedObjectName tableName = new QualifiedObjectName(
+                    catalog,
+                    tableMetadata.getTableSchema().getTable().getSchemaName(),
+                    tableMetadata.getTableSchema().getTable().getTableName());
+            return metadata.getNewTableWriterScalingOptions(session, tableName, tableMetadata.getProperties());
+        }
+
         public Optional<TableLayout> getLayout()
         {
             return layout;
@@ -263,6 +255,11 @@ public ConnectorTableMetadata getTableMetadata()
             return tableMetadata;
         }
 
+        public boolean isReplace()
+        {
+            return replace;
+        }
+
         @Override
         public String toString()
         {
@@ -275,23 +272,26 @@ public static class CreateTarget
     {
         private final OutputTableHandle handle;
         private final SchemaTableName schemaTableName;
-        private final boolean reportingWrittenBytesSupported;
         private final boolean multipleWritersPerPartitionSupported;
         private final OptionalInt maxWriterTasks;
+        private final WriterScalingOptions writerScalingOptions;
+        private final boolean replace;
 
         @JsonCreator
         public CreateTarget(
                 @JsonProperty("handle") OutputTableHandle handle,
                 @JsonProperty("schemaTableName") SchemaTableName schemaTableName,
-                @JsonProperty("reportingWrittenBytesSupported") boolean reportingWrittenBytesSupported,
                 @JsonProperty("multipleWritersPerPartitionSupported") boolean multipleWritersPerPartitionSupported,
-                @JsonProperty("maxWriterTasks") OptionalInt maxWriterTasks)
+                @JsonProperty("maxWriterTasks") OptionalInt maxWriterTasks,
+                @JsonProperty("writerScalingOptions") WriterScalingOptions writerScalingOptions,
+                @JsonProperty("replace") boolean replace)
         {
             this.handle = requireNonNull(handle, "handle is null");
             this.schemaTableName = requireNonNull(schemaTableName, "schemaTableName is null");
-            this.reportingWrittenBytesSupported = reportingWrittenBytesSupported;
             this.multipleWritersPerPartitionSupported = multipleWritersPerPartitionSupported;
             this.maxWriterTasks = requireNonNull(maxWriterTasks, "maxWriterTasks is null");
+            this.writerScalingOptions = requireNonNull(writerScalingOptions, "writerScalingOptions is null");
+            this.replace = replace;
         }
 
         @JsonProperty
@@ -307,27 +307,27 @@ public SchemaTableName getSchemaTableName()
         }
 
         @JsonProperty
-        public boolean getReportingWrittenBytesSupported()
+        public boolean isMultipleWritersPerPartitionSupported()
         {
-            return reportingWrittenBytesSupported;
+            return multipleWritersPerPartitionSupported;
         }
 
         @JsonProperty
-        public boolean isMultipleWritersPerPartitionSupported()
+        public WriterScalingOptions getWriterScalingOptions()
         {
-            return multipleWritersPerPartitionSupported;
+            return writerScalingOptions;
         }
 
-        @Override
-        public String toString()
+        @JsonProperty
+        public boolean isReplace()
         {
-            return handle.toString();
+            return replace;
         }
 
         @Override
-        public boolean supportsReportingWrittenBytes(Metadata metadata, Session session)
+        public String toString()
         {
-            return reportingWrittenBytesSupported;
+            return handle.toString();
         }
 
         @Override
@@ -341,6 +341,12 @@ public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
         {
             return maxWriterTasks;
         }
+
+        @Override
+        public WriterScalingOptions getWriterScalingOptions(Metadata metadata, Session session)
+        {
+            return writerScalingOptions;
+        }
     }
 
     // only used during planning -- will not be serialized
@@ -372,12 +378,6 @@ public String toString()
             return handle.toString();
         }
 
-        @Override
-        public boolean supportsReportingWrittenBytes(Metadata metadata, Session session)
-        {
-            return metadata.supportsReportingWrittenBytes(session, handle);
-        }
-
         @Override
         public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
         {
@@ -391,6 +391,12 @@ public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
         {
             return metadata.getMaxWriterTasks(session, handle.getCatalogHandle().getCatalogName());
         }
+
+        @Override
+        public WriterScalingOptions getWriterScalingOptions(Metadata metadata, Session session)
+        {
+            return metadata.getInsertWriterScalingOptions(session, handle);
+        }
     }
 
     public static class InsertTarget
@@ -398,23 +404,23 @@ public static class InsertTarget
     {
         private final InsertTableHandle handle;
         private final SchemaTableName schemaTableName;
-        private final boolean reportingWrittenBytesSupported;
         private final boolean multipleWritersPerPartitionSupported;
         private final OptionalInt maxWriterTasks;
+        private final WriterScalingOptions writerScalingOptions;
 
         @JsonCreator
         public InsertTarget(
                 @JsonProperty("handle") InsertTableHandle handle,
                 @JsonProperty("schemaTableName") SchemaTableName schemaTableName,
-                @JsonProperty("reportingWrittenBytesSupported") boolean reportingWrittenBytesSupported,
                 @JsonProperty("multipleWritersPerPartitionSupported") boolean multipleWritersPerPartitionSupported,
-                @JsonProperty("maxWriterTasks") OptionalInt maxWriterTasks)
+                @JsonProperty("maxWriterTasks") OptionalInt maxWriterTasks,
+                @JsonProperty("writerScalingOptions") WriterScalingOptions writerScalingOptions)
         {
             this.handle = requireNonNull(handle, "handle is null");
             this.schemaTableName = requireNonNull(schemaTableName, "schemaTableName is null");
-            this.reportingWrittenBytesSupported = reportingWrittenBytesSupported;
             this.multipleWritersPerPartitionSupported = multipleWritersPerPartitionSupported;
             this.maxWriterTasks = requireNonNull(maxWriterTasks, "maxWriterTasks is null");
+            this.writerScalingOptions = requireNonNull(writerScalingOptions, "writerScalingOptions is null");
         }
 
         @JsonProperty
@@ -430,15 +436,15 @@ public SchemaTableName getSchemaTableName()
         }
 
         @JsonProperty
-        public boolean getReportingWrittenBytesSupported()
+        public boolean isMultipleWritersPerPartitionSupported()
         {
-            return reportingWrittenBytesSupported;
+            return multipleWritersPerPartitionSupported;
         }
 
         @JsonProperty
-        public boolean isMultipleWritersPerPartitionSupported()
+        public WriterScalingOptions getWriterScalingOptions()
         {
-            return multipleWritersPerPartitionSupported;
+            return writerScalingOptions;
         }
 
         @Override
@@ -447,12 +453,6 @@ public String toString()
             return handle.toString();
         }
 
-        @Override
-        public boolean supportsReportingWrittenBytes(Metadata metadata, Session session)
-        {
-            return reportingWrittenBytesSupported;
-        }
-
         @Override
         public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
         {
@@ -464,6 +464,12 @@ public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
         {
             return maxWriterTasks;
         }
+
+        @Override
+        public WriterScalingOptions getWriterScalingOptions(Metadata metadata, Session session)
+        {
+            return writerScalingOptions;
+        }
     }
 
     public static class RefreshMaterializedViewReference
@@ -496,12 +502,6 @@ public String toString()
             return table;
         }
 
-        @Override
-        public boolean supportsReportingWrittenBytes(Metadata metadata, Session session)
-        {
-            return metadata.supportsReportingWrittenBytes(session, storageTableHandle);
-        }
-
         @Override
         public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
         {
@@ -515,6 +515,12 @@ public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
         {
             return metadata.getMaxWriterTasks(session, storageTableHandle.getCatalogHandle().getCatalogName());
         }
+
+        @Override
+        public WriterScalingOptions getWriterScalingOptions(Metadata metadata, Session session)
+        {
+            return metadata.getInsertWriterScalingOptions(session, storageTableHandle);
+        }
     }
 
     public static class RefreshMaterializedViewTarget
@@ -524,18 +530,21 @@ public static class RefreshMaterializedViewTarget
         private final InsertTableHandle insertHandle;
         private final SchemaTableName schemaTableName;
         private final List<TableHandle> sourceTableHandles;
+        private final WriterScalingOptions writerScalingOptions;
 
         @JsonCreator
         public RefreshMaterializedViewTarget(
                 @JsonProperty("tableHandle") TableHandle tableHandle,
                 @JsonProperty("insertHandle") InsertTableHandle insertHandle,
                 @JsonProperty("schemaTableName") SchemaTableName schemaTableName,
-                @JsonProperty("sourceTableHandles") List<TableHandle> sourceTableHandles)
+                @JsonProperty("sourceTableHandles") List<TableHandle> sourceTableHandles,
+                @JsonProperty("writerScalingOptions") WriterScalingOptions writerScalingOptions)
         {
             this.tableHandle = requireNonNull(tableHandle, "tableHandle is null");
             this.insertHandle = requireNonNull(insertHandle, "insertHandle is null");
             this.schemaTableName = requireNonNull(schemaTableName, "schemaTableName is null");
             this.sourceTableHandles = ImmutableList.copyOf(sourceTableHandles);
+            this.writerScalingOptions = requireNonNull(writerScalingOptions, "writerScalingOptions is null");
         }
 
         @JsonProperty
@@ -562,16 +571,16 @@ public List<TableHandle> getSourceTableHandles()
             return sourceTableHandles;
         }
 
-        @Override
-        public String toString()
+        @JsonProperty
+        public WriterScalingOptions getWriterScalingOptions()
         {
-            return insertHandle.toString();
+            return writerScalingOptions;
         }
 
         @Override
-        public boolean supportsReportingWrittenBytes(Metadata metadata, Session session)
+        public String toString()
         {
-            return metadata.supportsReportingWrittenBytes(session, tableHandle);
+            return insertHandle.toString();
         }
 
         @Override
@@ -587,6 +596,12 @@ public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
         {
             return metadata.getMaxWriterTasks(session, tableHandle.getCatalogHandle().getCatalogName());
         }
+
+        @Override
+        public WriterScalingOptions getWriterScalingOptions(Metadata metadata, Session session)
+        {
+            return writerScalingOptions;
+        }
     }
 
     public static class DeleteTarget
@@ -629,19 +644,19 @@ public String toString()
         }
 
         @Override
-        public boolean supportsReportingWrittenBytes(Metadata metadata, Session session)
+        public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
         {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
+        public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
         {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
+        public WriterScalingOptions getWriterScalingOptions(Metadata metadata, Session session)
         {
             throw new UnsupportedOperationException();
         }
@@ -706,19 +721,19 @@ public String toString()
         }
 
         @Override
-        public boolean supportsReportingWrittenBytes(Metadata metadata, Session session)
+        public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
         {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
+        public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
         {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
+        public WriterScalingOptions getWriterScalingOptions(Metadata metadata, Session session)
         {
             throw new UnsupportedOperationException();
         }
@@ -730,19 +745,19 @@ public static class TableExecuteTarget
         private final TableExecuteHandle executeHandle;
         private final Optional<TableHandle> sourceHandle;
         private final SchemaTableName schemaTableName;
-        private final boolean reportingWrittenBytesSupported;
+        private final WriterScalingOptions writerScalingOptions;
 
         @JsonCreator
         public TableExecuteTarget(
                 @JsonProperty("executeHandle") TableExecuteHandle executeHandle,
                 @JsonProperty("sourceHandle") Optional<TableHandle> sourceHandle,
                 @JsonProperty("schemaTableName") SchemaTableName schemaTableName,
-                @JsonProperty("reportingWrittenBytesSupported") boolean reportingWrittenBytesSupported)
+                @JsonProperty("writerScalingOptions") WriterScalingOptions writerScalingOptions)
         {
             this.executeHandle = requireNonNull(executeHandle, "handle is null");
             this.sourceHandle = requireNonNull(sourceHandle, "sourceHandle is null");
             this.schemaTableName = requireNonNull(schemaTableName, "schemaTableName is null");
-            this.reportingWrittenBytesSupported = reportingWrittenBytesSupported;
+            this.writerScalingOptions = requireNonNull(writerScalingOptions, "writerScalingOptions is null");
         }
 
         @JsonProperty
@@ -769,9 +784,9 @@ public SchemaTableName getSchemaTableName()
         }
 
         @JsonProperty
-        public boolean isReportingWrittenBytesSupported()
+        public WriterScalingOptions getWriterScalingOptions()
         {
-            return reportingWrittenBytesSupported;
+            return writerScalingOptions;
         }
 
         @Override
@@ -780,12 +795,6 @@ public String toString()
             return executeHandle.toString();
         }
 
-        @Override
-        public boolean supportsReportingWrittenBytes(Metadata metadata, Session session)
-        {
-            return sourceHandle.map(tableHandle -> metadata.supportsReportingWrittenBytes(session, tableHandle)).orElse(reportingWrittenBytesSupported);
-        }
-
         @Override
         public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
         {
@@ -799,6 +808,12 @@ public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
         {
             return metadata.getMaxWriterTasks(session, executeHandle.getCatalogHandle().getCatalogName());
         }
+
+        @Override
+        public WriterScalingOptions getWriterScalingOptions(Metadata metadata, Session session)
+        {
+            return writerScalingOptions;
+        }
     }
 
     public static class MergeTarget
@@ -853,21 +868,21 @@ public String toString()
         }
 
         @Override
-        public boolean supportsReportingWrittenBytes(Metadata metadata, Session session)
+        public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
         {
             return false;
         }
 
         @Override
-        public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
+        public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
         {
-            return false;
+            return OptionalInt.empty();
         }
 
         @Override
-        public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
+        public WriterScalingOptions getWriterScalingOptions(Metadata metadata, Session session)
         {
-            return OptionalInt.empty();
+            return WriterScalingOptions.DISABLED;
         }
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TopNNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TopNNode.java
index caeec47c73f6..61f334985487 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TopNNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TopNNode.java
@@ -17,11 +17,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.OrderingScheme;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TopNRankingNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TopNRankingNode.java
index 6183b44a9038..ab00c50436c2 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TopNRankingNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TopNRankingNode.java
@@ -17,11 +17,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.OrderingScheme;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/UnionNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/UnionNode.java
index e56a011d42ab..8cc9212045bb 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/UnionNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/UnionNode.java
@@ -16,10 +16,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ListMultimap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 @Immutable
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/UnnestNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/UnnestNode.java
index 70a77ae74b81..c67916ed2bb9 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/UnnestNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/UnnestNode.java
@@ -18,13 +18,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.SymbolsExtractor;
 import io.trino.sql.planner.plan.JoinNode.Type;
 import io.trino.sql.tree.Expression;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ValuesNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ValuesNode.java
index a00ac5a97489..7425d29a768f 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ValuesNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ValuesNode.java
@@ -16,12 +16,11 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.Row;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/WindowNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/WindowNode.java
index 7b4bd5ee9fbe..78594a3948dd 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/plan/WindowNode.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/plan/WindowNode.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.sql.planner.OrderingScheme;
 import io.trino.sql.planner.Symbol;
@@ -26,8 +27,6 @@
 import io.trino.sql.tree.FrameBound;
 import io.trino.sql.tree.WindowFrame;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/BasicOperatorStats.java b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/BasicOperatorStats.java
index ea8bee223d96..822b224fc17a 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/BasicOperatorStats.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/BasicOperatorStats.java
@@ -15,6 +15,8 @@
 
 import io.trino.spi.metrics.Metrics;
 
+import java.util.List;
+
 import static java.util.Objects.requireNonNull;
 
 class BasicOperatorStats
@@ -73,4 +75,21 @@ public static BasicOperatorStats merge(BasicOperatorStats first, BasicOperatorSt
                 first.metrics.mergeWith(second.metrics),
                 first.connectorMetrics.mergeWith(second.connectorMetrics));
     }
+
+    public static BasicOperatorStats merge(List<BasicOperatorStats> operatorStats)
+    {
+        long totalDrivers = 0;
+        long inputPositions = 0;
+        double sumSquaredInputPositions = 0;
+        Metrics.Accumulator metricsAccumulator = Metrics.accumulator();
+        Metrics.Accumulator connectorMetricsAccumulator = Metrics.accumulator();
+        for (BasicOperatorStats stats : operatorStats) {
+            totalDrivers += stats.totalDrivers;
+            inputPositions += stats.inputPositions;
+            sumSquaredInputPositions += stats.sumSquaredInputPositions;
+            metricsAccumulator.add(stats.metrics);
+            connectorMetricsAccumulator.add(stats.connectorMetrics);
+        }
+        return new BasicOperatorStats(totalDrivers, inputPositions, sumSquaredInputPositions, metricsAccumulator.get(), connectorMetricsAccumulator.get());
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/CounterBasedAnonymizer.java b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/CounterBasedAnonymizer.java
index 27ca7530fbdc..af0e61adb888 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/CounterBasedAnonymizer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/CounterBasedAnonymizer.java
@@ -137,7 +137,7 @@ private String anonymizeLiteral(Literal node)
             return anonymizeLiteral("double", literal.getValue());
         }
         if (node instanceof LongLiteral literal) {
-            return anonymizeLiteral("long", literal.getValue());
+            return anonymizeLiteral("long", literal.getParsedValue());
         }
         if (node instanceof TimestampLiteral literal) {
             return anonymizeLiteral("timestamp", literal.getValue());
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/IoPlanPrinter.java b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/IoPlanPrinter.java
index f1bae73c953d..fb55271ae560 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/IoPlanPrinter.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/IoPlanPrinter.java
@@ -21,7 +21,6 @@
 import io.trino.cost.PlanNodeStatsEstimate;
 import io.trino.cost.StatsAndCosts;
 import io.trino.metadata.TableHandle;
-import io.trino.metadata.TableMetadata;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
@@ -729,15 +728,15 @@ else if (writerTarget instanceof CreateReference || writerTarget instanceof Inse
         private void addInputTableConstraints(TupleDomain<ColumnHandle> filterDomain, TableScanNode tableScan, IoPlanBuilder context)
         {
             TableHandle table = tableScan.getTable();
-            TableMetadata tableMetadata = plannerContext.getMetadata().getTableMetadata(session, table);
+            CatalogSchemaTableName tableName = plannerContext.getMetadata().getTableName(session, table);
             TupleDomain<ColumnHandle> predicateDomain = plannerContext.getMetadata().getTableProperties(session, table).getPredicate();
             EstimatedStatsAndCost estimatedStatsAndCost = getEstimatedStatsAndCost(tableScan);
             context.addInputTableColumnInfo(
                     new IoPlan.TableColumnInfo(
                             new CatalogSchemaTableName(
-                                    tableMetadata.getCatalogName(),
-                                    tableMetadata.getTable().getSchemaName(),
-                                    tableMetadata.getTable().getTableName()),
+                                    tableName.getCatalogName(),
+                                    tableName.getSchemaTableName().getSchemaName(),
+                                    tableName.getSchemaTableName().getTableName()),
                             parseConstraint(table, predicateDomain.intersect(filterDomain)),
                             estimatedStatsAndCost));
         }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanNodeStats.java b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanNodeStats.java
index d83f680a7c4d..1c2e05ab7436 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanNodeStats.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanNodeStats.java
@@ -13,12 +13,15 @@
  */
 package io.trino.sql.planner.planprinter;
 
+import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ListMultimap;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.spi.Mergeable;
 import io.trino.sql.planner.plan.PlanNodeId;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -30,6 +33,7 @@
 import static java.lang.Math.sqrt;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 public class PlanNodeStats
         implements Mergeable<PlanNodeStats>
@@ -194,4 +198,59 @@ public PlanNodeStats mergeWith(PlanNodeStats other)
                 succinctBytes(this.planNodeSpilledDataSize.toBytes() + other.planNodeSpilledDataSize.toBytes()),
                 operatorStats);
     }
+
+    @Override
+    public PlanNodeStats mergeWith(List<PlanNodeStats> others)
+    {
+        long planNodeInputPositions = this.planNodeInputPositions;
+        long planNodeOutputPositions = this.planNodeOutputPositions;
+        long planNodeInputDataSizeBytes = planNodeInputDataSize.toBytes();
+        long planNodeOutputDataSizeBytes = planNodeOutputDataSize.toBytes();
+        long planNodePhysicalInputDataSizeBytes = planNodePhysicalInputDataSize.toBytes();
+        long planNodeSpilledDataSizeBytes = planNodeSpilledDataSize.toBytes();
+        long planNodeScheduledTimeMillis = planNodeScheduledTime.toMillis();
+        long planNodeCpuTimeMillis = planNodeCpuTime.toMillis();
+        long planNodeBlockedTimeMillis = planNodeBlockedTime.toMillis();
+        double planNodePhysicalInputReadNanos = planNodePhysicalInputReadTime.getValue(NANOSECONDS);
+        ListMultimap<String, BasicOperatorStats> groupedOperatorStats = ArrayListMultimap.create();
+        for (Map.Entry<String, BasicOperatorStats> entry : this.operatorStats.entrySet()) {
+            groupedOperatorStats.put(entry.getKey(), entry.getValue());
+        }
+
+        for (PlanNodeStats other : others) {
+            checkArgument(planNodeId.equals(other.getPlanNodeId()), "planNodeIds do not match. %s != %s", planNodeId, other.getPlanNodeId());
+            planNodeInputPositions += other.planNodeInputPositions;
+            planNodeOutputPositions += other.planNodeOutputPositions;
+            planNodeScheduledTimeMillis += other.planNodeScheduledTime.toMillis();
+            planNodeCpuTimeMillis += other.planNodeCpuTime.toMillis();
+            planNodeBlockedTimeMillis += other.planNodeBlockedTime.toMillis();
+            planNodePhysicalInputReadNanos += other.planNodePhysicalInputReadTime.getValue(NANOSECONDS);
+            planNodePhysicalInputDataSizeBytes += other.planNodePhysicalInputDataSize.toBytes();
+            planNodeInputDataSizeBytes += other.planNodeInputDataSize.toBytes();
+            planNodeOutputDataSizeBytes += other.planNodeOutputDataSize.toBytes();
+            planNodeSpilledDataSizeBytes += other.planNodeSpilledDataSize.toBytes();
+            for (Map.Entry<String, BasicOperatorStats> entry : other.operatorStats.entrySet()) {
+                groupedOperatorStats.put(entry.getKey(), entry.getValue());
+            }
+        }
+
+        ImmutableMap.Builder<String, BasicOperatorStats> mergedOperatorStatsBuilder = ImmutableMap.builder();
+        for (String key : groupedOperatorStats.keySet()) {
+            mergedOperatorStatsBuilder.put(key, BasicOperatorStats.merge(groupedOperatorStats.get(key)));
+        }
+
+        return new PlanNodeStats(
+                planNodeId,
+                new Duration(planNodeScheduledTimeMillis, MILLISECONDS),
+                new Duration(planNodeCpuTimeMillis, MILLISECONDS),
+                new Duration(planNodeBlockedTimeMillis, MILLISECONDS),
+                planNodeInputPositions,
+                succinctBytes(planNodeInputDataSizeBytes),
+                succinctBytes(planNodePhysicalInputDataSizeBytes),
+                new Duration(planNodePhysicalInputReadNanos, NANOSECONDS),
+                planNodeOutputPositions,
+                succinctBytes(planNodeOutputDataSizeBytes),
+                succinctBytes(planNodeSpilledDataSizeBytes),
+                mergedOperatorStatsBuilder.buildOrThrow());
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanNodeStatsSummarizer.java b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanNodeStatsSummarizer.java
index 9fdc5aea488c..aeb8376ffa7d 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanNodeStatsSummarizer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanNodeStatsSummarizer.java
@@ -13,7 +13,9 @@
  */
 package io.trino.sql.planner.planprinter;
 
+import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ListMultimap;
 import io.airlift.units.Duration;
 import io.trino.execution.StageInfo;
 import io.trino.execution.TaskInfo;
@@ -51,15 +53,21 @@ public static Map<PlanNodeId, PlanNodeStats> aggregateStageStats(List<StageInfo>
 
     public static Map<PlanNodeId, PlanNodeStats> aggregateTaskStats(List<TaskInfo> taskInfos)
     {
-        Map<PlanNodeId, PlanNodeStats> aggregatedStats = new HashMap<>();
+        ListMultimap<PlanNodeId, PlanNodeStats> groupedStats = ArrayListMultimap.create();
         List<PlanNodeStats> planNodeStats = taskInfos.stream()
                 .map(TaskInfo::getStats)
                 .flatMap(taskStats -> getPlanNodeStats(taskStats).stream())
                 .collect(toList());
         for (PlanNodeStats stats : planNodeStats) {
-            aggregatedStats.merge(stats.getPlanNodeId(), stats, PlanNodeStats::mergeWith);
+            groupedStats.put(stats.getPlanNodeId(), stats);
         }
-        return aggregatedStats;
+
+        ImmutableMap.Builder<PlanNodeId, PlanNodeStats> aggregatedStatsBuilder = ImmutableMap.builder();
+        for (PlanNodeId planNodeId : groupedStats.keySet()) {
+            List<PlanNodeStats> groupedPlanNodeStats = groupedStats.get(planNodeId);
+            aggregatedStatsBuilder.put(planNodeId, groupedPlanNodeStats.get(0).mergeWith(groupedPlanNodeStats.subList(1, groupedPlanNodeStats.size())));
+        }
+        return aggregatedStatsBuilder.buildOrThrow();
     }
 
     private static List<PlanNodeStats> getPlanNodeStats(TaskStats taskStats)
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanPrinter.java b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanPrinter.java
index 58aaaf4a7ce1..f8a070b67c93 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanPrinter.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanPrinter.java
@@ -36,17 +36,19 @@
 import io.trino.execution.TableInfo;
 import io.trino.metadata.FunctionManager;
 import io.trino.metadata.Metadata;
+import io.trino.metadata.ResolvedFunction;
 import io.trino.metadata.TableHandle;
 import io.trino.plugin.base.metrics.TDigestHistogram;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.expression.FunctionName;
+import io.trino.spi.function.CatalogSchemaFunctionName;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.DescriptorArgument;
+import io.trino.spi.function.table.ScalarArgument;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.DescriptorArgument;
-import io.trino.spi.ptf.ScalarArgument;
 import io.trino.spi.statistics.ColumnStatisticMetadata;
 import io.trino.spi.statistics.TableStatisticType;
 import io.trino.spi.type.Type;
@@ -110,6 +112,7 @@
 import io.trino.sql.planner.plan.TableFunctionNode.TableArgumentProperties;
 import io.trino.sql.planner.plan.TableFunctionProcessorNode;
 import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.TableUpdateNode;
 import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.sql.planner.plan.TopNNode;
 import io.trino.sql.planner.plan.TopNRankingNode;
@@ -157,9 +160,12 @@
 import static io.airlift.units.DataSize.succinctBytes;
 import static io.airlift.units.Duration.succinctNanos;
 import static io.trino.execution.StageInfo.getAllStages;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
+import static io.trino.metadata.GlobalFunctionCatalog.isBuiltinFunctionName;
+import static io.trino.metadata.LanguageFunctionManager.isInlineFunction;
 import static io.trino.metadata.ResolvedFunction.extractFunctionName;
 import static io.trino.server.DynamicFilterService.DynamicFilterDomainStats;
-import static io.trino.spi.ptf.DescriptorArgument.NULL_DESCRIPTOR;
+import static io.trino.spi.function.table.DescriptorArgument.NULL_DESCRIPTOR;
 import static io.trino.sql.DynamicFilters.extractDynamicFilters;
 import static io.trino.sql.ExpressionUtils.combineConjunctsWithDuplicates;
 import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
@@ -184,6 +190,7 @@ public class PlanPrinter
 {
     private static final JsonCodec<Map<PlanFragmentId, JsonRenderedNode>> DISTRIBUTED_PLAN_CODEC =
             mapJsonCodec(PlanFragmentId.class, JsonRenderedNode.class);
+    private static final CatalogSchemaFunctionName COUNT_NAME = builtinFunctionName("count");
 
     private final PlanRepresentation representation;
     private final Function<TableScanNode, TableInfo> tableInfoSupplier;
@@ -644,6 +651,7 @@ public static String graphvizLogicalPlan(PlanNode plan, TypeProvider types)
                 new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), plan.getOutputSymbols()),
                 StatsAndCosts.empty(),
                 ImmutableList.of(),
+                ImmutableList.of(),
                 Optional.empty());
         return GraphvizPrinter.printLogical(ImmutableList.of(fragment));
     }
@@ -677,23 +685,21 @@ public Void visitExplainAnalyze(ExplainAnalyzeNode node, Context context)
         @Override
         public Void visitJoin(JoinNode node, Context context)
         {
-            List<Expression> joinExpressions = new ArrayList<>();
-            for (JoinNode.EquiJoinClause clause : node.getCriteria()) {
-                joinExpressions.add(unresolveFunctions(clause.toExpression()));
-            }
-            node.getFilter()
-                    .map(PlanPrinter::unresolveFunctions)
-                    .ifPresent(joinExpressions::add);
+            List<Expression> criteriaExpressions = node.getCriteria().stream()
+                    .map(clause -> unresolveFunctions(clause.toExpression()))
+                    .collect(toImmutableList());
 
             NodeRepresentation nodeOutput;
             if (node.isCrossJoin()) {
-                checkState(joinExpressions.isEmpty());
+                checkState(criteriaExpressions.isEmpty());
+                checkState(node.getFilter().isEmpty());
                 nodeOutput = addNode(node, "CrossJoin", context.tag());
             }
             else {
                 ImmutableMap.Builder<String, String> descriptor = ImmutableMap.<String, String>builder()
-                        .put("criteria", Joiner.on(" AND ").join(anonymizeExpressions(joinExpressions)))
-                        .put("hash", formatHash(node.getLeftHashSymbol(), node.getRightHashSymbol()));
+                        .put("criteria", Joiner.on(" AND ").join(anonymizeExpressions(criteriaExpressions)));
+                node.getFilter().ifPresent(filter -> descriptor.put("filter", formatFilter(unresolveFunctions(filter))));
+                descriptor.put("hash", formatHash(node.getLeftHashSymbol(), node.getRightHashSymbol()));
                 node.getDistributionType().ifPresent(distribution -> descriptor.put("distribution", distribution.name()));
                 nodeOutput = addNode(node, node.getType().getJoinLabel(), descriptor.buildOrThrow(), node.getReorderJoinStatsAndCost(), context.tag());
             }
@@ -939,7 +945,7 @@ public Void visitWindow(WindowNode node, Context context)
                 nodeOutput.appendDetails(
                         "%s := %s(%s) %s",
                         anonymizer.anonymize(entry.getKey()),
-                        function.getResolvedFunction().getSignature().getName(),
+                        formatFunctionName(function.getResolvedFunction()),
                         Joiner.on(", ").join(anonymizeExpressions(function.getArguments())),
                         frameInfo);
             }
@@ -991,7 +997,7 @@ public Void visitPatternRecognition(PatternRecognitionNode node, Context context
                 nodeOutput.appendDetails(
                         "%s := %s(%s)",
                         anonymizer.anonymize(entry.getKey()),
-                        function.getResolvedFunction().getSignature().getName(),
+                        formatFunctionName(function.getResolvedFunction()),
                         Joiner.on(", ").join(anonymizeExpressions(function.getArguments())));
             }
 
@@ -1040,12 +1046,17 @@ private void appendValuePointers(NodeRepresentation nodeOutput, ExpressionAndVal
                 }
                 else if (pointer instanceof AggregationValuePointer aggregationPointer) {
                     String processingMode = aggregationPointer.getSetDescriptor().isRunning() ? "RUNNING " : "FINAL ";
-                    String name = aggregationPointer.getFunction().getSignature().getName();
                     String arguments = Joiner.on(", ").join(anonymizeExpressions(aggregationPointer.getArguments()));
                     String labels = aggregationPointer.getSetDescriptor().getLabels().stream()
                             .map(IrLabel::getName)
                             .collect(joining(", ", "{", "}"));
-                    nodeOutput.appendDetails("%s%s := %s%s(%s)%s", indentString(1), anonymizer.anonymize(symbol), processingMode, name, arguments, labels);
+                    nodeOutput.appendDetails("%s%s := %s%s(%s)%s",
+                            indentString(1),
+                            anonymizer.anonymize(symbol),
+                            processingMode,
+                            formatFunctionName(aggregationPointer.getFunction()),
+                            arguments,
+                            labels);
                 }
                 else {
                     throw new UnsupportedOperationException("unexpected ValuePointer type: " + pointer.getClass().getSimpleName());
@@ -1057,12 +1068,12 @@ private String formatFrame(WindowNode.Frame frame)
         {
             StringBuilder builder = new StringBuilder(frame.getType().toString());
 
-            frame.getOriginalStartValue()
+            frame.getStartValue()
                     .map(anonymizer::anonymize)
                     .ifPresent(value -> builder.append(" ").append(value));
             builder.append(" ").append(frame.getStartType());
 
-            frame.getOriginalEndValue()
+            frame.getEndValue()
                     .map(anonymizer::anonymize)
                     .ifPresent(value -> builder.append(" ").append(value));
             builder.append(" ").append(frame.getEndType());
@@ -1347,11 +1358,11 @@ private static void addPhysicalInputStats(PlanNodeStats nodeStats, StringBuilder
         {
             if (nodeStats.getPlanNodePhysicalInputDataSize().toBytes() > 0) {
                 buildFormatString(inputDetailBuilder, argsBuilder, ", Physical input: %s", nodeStats.getPlanNodePhysicalInputDataSize().toString());
-                buildFormatString(inputDetailBuilder, argsBuilder, ", Physical input time: %s", nodeStats.getPlanNodePhysicalInputReadTime().toString());
+                buildFormatString(inputDetailBuilder, argsBuilder, ", Physical input time: %s", nodeStats.getPlanNodePhysicalInputReadTime().convertToMostSuccinctTimeUnit().toString());
             }
             // Some connectors may report physical input time but not physical input data size
             else if (nodeStats.getPlanNodePhysicalInputReadTime().getValue() > 0) {
-                buildFormatString(inputDetailBuilder, argsBuilder, ", Physical input time: %s", nodeStats.getPlanNodePhysicalInputReadTime().toString());
+                buildFormatString(inputDetailBuilder, argsBuilder, ", Physical input time: %s", nodeStats.getPlanNodePhysicalInputReadTime().convertToMostSuccinctTimeUnit().toString());
             }
         }
 
@@ -1742,6 +1753,17 @@ public Void visitTableDelete(TableDeleteNode node, Context context)
             return processChildren(node, new Context());
         }
 
+        @Override
+        public Void visitTableUpdate(TableUpdateNode node, Context context)
+        {
+            addNode(node,
+                    "TableUpdate",
+                    ImmutableMap.of("target", anonymizer.anonymize(node.getTarget())),
+                    context.tag());
+
+            return processChildren(node, new Context());
+        }
+
         @Override
         public Void visitEnforceSingleRow(EnforceSingleRowNode node, Context context)
         {
@@ -2166,14 +2188,14 @@ public static String formatAggregation(Anonymizer anonymizer, Aggregation aggreg
                 .map(anonymizer::anonymize)
                 .collect(toImmutableList());
         String arguments = Joiner.on(", ").join(anonymizedArguments);
-        if (aggregation.getArguments().isEmpty() && "count".equalsIgnoreCase(aggregation.getResolvedFunction().getSignature().getName())) {
+        if (aggregation.getArguments().isEmpty() && COUNT_NAME.equals(aggregation.getResolvedFunction().getSignature().getName())) {
             arguments = "*";
         }
         if (aggregation.isDistinct()) {
             arguments = "DISTINCT " + arguments;
         }
 
-        builder.append(aggregation.getResolvedFunction().getSignature().getName())
+        builder.append(formatFunctionName(aggregation.getResolvedFunction()))
                 .append('(').append(arguments);
 
         aggregation.getOrderingScheme().ifPresent(orderingScheme -> builder.append(' ').append(orderingScheme.getOrderBy().stream()
@@ -2192,6 +2214,15 @@ public static String formatAggregation(Anonymizer anonymizer, Aggregation aggreg
         return builder.toString();
     }
 
+    private static String formatFunctionName(ResolvedFunction function)
+    {
+        CatalogSchemaFunctionName name = function.getSignature().getName();
+        if (isInlineFunction(name) || isBuiltinFunctionName(name)) {
+            return name.getFunctionName();
+        }
+        return name.toString();
+    }
+
     private static Expression unresolveFunctions(Expression expression)
     {
         return ExpressionTreeRewriter.rewriteWith(new ExpressionRewriter<>()
@@ -2200,10 +2231,17 @@ private static Expression unresolveFunctions(Expression expression)
             public Expression rewriteFunctionCall(FunctionCall node, Void context, ExpressionTreeRewriter<Void> treeRewriter)
             {
                 FunctionCall rewritten = treeRewriter.defaultRewrite(node, context);
-
+                CatalogSchemaFunctionName name = extractFunctionName(node.getName());
+                QualifiedName qualifiedName;
+                if (isInlineFunction(name) || isBuiltinFunctionName(name)) {
+                    qualifiedName = QualifiedName.of(name.getFunctionName());
+                }
+                else {
+                    qualifiedName = QualifiedName.of(name.getCatalogName(), name.getSchemaName(), name.getFunctionName());
+                }
                 return new FunctionCall(
                         rewritten.getLocation(),
-                        QualifiedName.of(extractFunctionName(node.getName())),
+                        qualifiedName,
                         rewritten.getWindow(),
                         rewritten.getFilter(),
                         rewritten.getOrderBy(),
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/TableInfoSupplier.java b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/TableInfoSupplier.java
index 38944433e465..bca6385a0cab 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/TableInfoSupplier.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/TableInfoSupplier.java
@@ -18,8 +18,9 @@
 import io.trino.execution.TableInfo;
 import io.trino.metadata.CatalogInfo;
 import io.trino.metadata.Metadata;
+import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.TableProperties;
-import io.trino.metadata.TableSchema;
+import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.sql.planner.plan.TableScanNode;
 
 import java.util.Optional;
@@ -42,13 +43,14 @@ public TableInfoSupplier(Metadata metadata, Session session)
     @Override
     public TableInfo apply(TableScanNode node)
     {
-        TableSchema tableSchema = metadata.getTableSchema(session, node.getTable());
+        CatalogSchemaTableName tableName = metadata.getTableName(session, node.getTable());
         TableProperties tableProperties = metadata.getTableProperties(session, node.getTable());
         Optional<String> connectorName = metadata.listCatalogs(session).stream()
-                .filter(catalogInfo -> catalogInfo.getCatalogName().equals(tableSchema.getCatalogName()))
+                .filter(catalogInfo -> catalogInfo.getCatalogName().equals(tableName.getCatalogName()))
                 .map(CatalogInfo::getConnectorName)
                 .map(ConnectorName::toString)
                 .findFirst();
-        return new TableInfo(connectorName, tableSchema.getQualifiedName(), tableProperties.getPredicate());
+        QualifiedObjectName objectName = new QualifiedObjectName(tableName.getCatalogName(), tableName.getSchemaTableName().getSchemaName(), tableName.getSchemaTableName().getTableName());
+        return new TableInfo(connectorName, objectName, tableProperties.getPredicate());
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/ValuePrinter.java b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/ValuePrinter.java
index 8c5d54d8dec1..380489ef11cd 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/ValuePrinter.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/ValuePrinter.java
@@ -55,7 +55,7 @@ public String castToVarcharOrFail(Type type, Object value)
             return "NULL";
         }
 
-        ResolvedFunction coercion = metadata.getCoercion(session, type, VARCHAR);
+        ResolvedFunction coercion = metadata.getCoercion(type, VARCHAR);
         Slice coerced = (Slice) new InterpretedFunctionInvoker(functionManager).invoke(coercion, session.toConnectorSession(), value);
         return coerced.toStringUtf8();
     }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/rowpattern/LogicalIndexExtractor.java b/core/trino-main/src/main/java/io/trino/sql/planner/rowpattern/LogicalIndexExtractor.java
index 806e9126be2b..7832eb048192 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/rowpattern/LogicalIndexExtractor.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/rowpattern/LogicalIndexExtractor.java
@@ -20,6 +20,7 @@
 import io.trino.Session;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.ResolvedFunction;
+import io.trino.spi.function.FunctionKind;
 import io.trino.spi.type.Type;
 import io.trino.sql.analyzer.ExpressionAnalyzer;
 import io.trino.sql.planner.Symbol;
@@ -45,7 +46,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.metadata.ResolvedFunction.extractFunctionName;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.analyzer.ExpressionAnalyzer.isPatternRecognitionFunction;
@@ -166,8 +166,8 @@ public Expression rewriteFunctionCall(FunctionCall node, LogicalIndexContext con
                 };
             }
 
-            if (metadata.isAggregationFunction(session, QualifiedName.of(extractFunctionName(node.getName())))) {
-                ResolvedFunction resolvedFunction = metadata.decodeFunction(node.getName());
+            ResolvedFunction resolvedFunction = metadata.decodeFunction(node.getName());
+            if (resolvedFunction.getFunctionKind() == FunctionKind.AGGREGATE) {
                 Type type = resolvedFunction.getSignature().getReturnType();
 
                 Symbol aggregationSymbol = symbolAllocator.newSymbol(node, type);
@@ -244,7 +244,7 @@ private Expression rewritePatternNavigationFunction(FunctionCall node, LogicalIn
             Optional<ProcessingMode> processingMode = node.getProcessingMode();
             OptionalInt offset = OptionalInt.empty();
             if (node.getArguments().size() > 1) {
-                offset = OptionalInt.of(toIntExact(((LongLiteral) node.getArguments().get(1)).getValue()));
+                offset = OptionalInt.of(toIntExact(((LongLiteral) node.getArguments().get(1)).getParsedValue()));
             }
             return switch (functionName) {
                 case "PREV" -> treeRewriter.rewrite(argument, context.withPhysicalOffset(-offset.orElse(1)));
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/rowpattern/ir/IrRowPatternVisitor.java b/core/trino-main/src/main/java/io/trino/sql/planner/rowpattern/ir/IrRowPatternVisitor.java
index 02c7fbbe882a..a5d37254d7ef 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/rowpattern/ir/IrRowPatternVisitor.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/rowpattern/ir/IrRowPatternVisitor.java
@@ -13,7 +13,7 @@
  */
 package io.trino.sql.planner.rowpattern.ir;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 public abstract class IrRowPatternVisitor<R, C>
 {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/sanity/SugarFreeChecker.java b/core/trino-main/src/main/java/io/trino/sql/planner/sanity/SugarFreeChecker.java
index bd5fd4f3056e..f39495c6b0d4 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/sanity/SugarFreeChecker.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/sanity/SugarFreeChecker.java
@@ -57,7 +57,7 @@ public void validate(PlanNode planNode,
         ExpressionExtractor.forEachExpression(planNode, SugarFreeChecker::validate);
     }
 
-    private static void validate(Expression expression)
+    public static void validate(Expression expression)
     {
         VISITOR.process(expression, null);
     }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/sanity/ValidateDependenciesChecker.java b/core/trino-main/src/main/java/io/trino/sql/planner/sanity/ValidateDependenciesChecker.java
index f9475b2f4fd1..bdb5f3d2115d 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/sanity/ValidateDependenciesChecker.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/sanity/ValidateDependenciesChecker.java
@@ -69,6 +69,7 @@
 import io.trino.sql.planner.plan.TableFunctionNode.PassThroughSpecification;
 import io.trino.sql.planner.plan.TableFunctionProcessorNode;
 import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.TableUpdateNode;
 import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.sql.planner.plan.TopNNode;
 import io.trino.sql.planner.plan.TopNRankingNode;
@@ -798,6 +799,12 @@ public Void visitTableDelete(TableDeleteNode node, Set<Symbol> boundSymbols)
             return null;
         }
 
+        @Override
+        public Void visitTableUpdate(TableUpdateNode node, Set<Symbol> boundSymbols)
+        {
+            return null;
+        }
+
         @Override
         public Void visitStatisticsWriterNode(StatisticsWriterNode node, Set<Symbol> boundSymbols)
         {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/sanity/ValidateScaledWritersUsage.java b/core/trino-main/src/main/java/io/trino/sql/planner/sanity/ValidateScaledWritersUsage.java
index 373941855e9a..5bd5938b50b9 100644
--- a/core/trino-main/src/main/java/io/trino/sql/planner/sanity/ValidateScaledWritersUsage.java
+++ b/core/trino-main/src/main/java/io/trino/sql/planner/sanity/ValidateScaledWritersUsage.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.PartitioningHandle;
 import io.trino.sql.planner.TypeAnalyzer;
@@ -55,7 +56,7 @@ public void validate(
     }
 
     private static class Visitor
-            extends PlanVisitor<List<PartitioningHandle>, Void>
+            extends PlanVisitor<List<ExchangeNode>, Void>
     {
         private final Session session;
         private final PlannerContext plannerContext;
@@ -67,42 +68,50 @@ private Visitor(Session session, PlannerContext plannerContext)
         }
 
         @Override
-        protected List<PartitioningHandle> visitPlan(PlanNode node, Void context)
+        protected List<ExchangeNode> visitPlan(PlanNode node, Void context)
         {
-            return collectPartitioningHandles(node.getSources());
+            return collectExchanges(node.getSources());
         }
 
         @Override
-        public List<PartitioningHandle> visitTableWriter(TableWriterNode node, Void context)
+        public List<ExchangeNode> visitTableWriter(TableWriterNode node, Void context)
         {
-            List<PartitioningHandle> children = collectPartitioningHandles(node.getSources());
-            List<PartitioningHandle> scaleWriterPartitioningHandle = children.stream()
-                    .filter(PartitioningHandle::isScaleWriters)
+            List<ExchangeNode> scaleWriterExchanges = collectExchanges(node.getSources()).stream()
+                    .filter(exchangeNode -> exchangeNode.getPartitioningScheme().getPartitioning().getHandle().isScaleWriters())
                     .collect(toImmutableList());
             TableWriterNode.WriterTarget target = node.getTarget();
 
-            scaleWriterPartitioningHandle.forEach(partitioningHandle -> {
-                checkState(target.supportsReportingWrittenBytes(plannerContext.getMetadata(), session),
-                        "The scaled writer partitioning scheme is set but writer target %s doesn't support reporting physical written bytes", target);
+            scaleWriterExchanges.forEach(exchangeNode -> {
+                PartitioningHandle handle = exchangeNode.getPartitioningScheme().getPartitioning().getHandle();
+                WriterScalingOptions scalingOptions = target.getWriterScalingOptions(plannerContext.getMetadata(), session);
+                if (exchangeNode.getScope() == ExchangeNode.Scope.LOCAL) {
+                    checkState(scalingOptions.isPerTaskWriterScalingEnabled(),
+                            "The scaled writer per task partitioning scheme is set but writer target %s doesn't support it", target);
+                }
+
+                if (exchangeNode.getScope() == ExchangeNode.Scope.REMOTE) {
+                    checkState(scalingOptions.isWriterTasksScalingEnabled(),
+                            "The scaled writer across tasks partitioning scheme is set but writer target %s doesn't support it", target);
+                }
 
-                if (isScaledWriterHashDistribution(partitioningHandle)) {
+                if (isScaledWriterHashDistribution(handle)) {
                     checkState(target.supportsMultipleWritersPerPartition(plannerContext.getMetadata(), session),
-                            "The scaled writer partitioning scheme is set for the partitioned write but writer target %s doesn't support multiple writers per partition", target);
+                            "The hash scaled writer partitioning scheme is set for the partitioned write but writer target %s doesn't support multiple writers per partition", target);
                 }
             });
-            return children;
+            return scaleWriterExchanges;
         }
 
         @Override
-        public List<PartitioningHandle> visitExchange(ExchangeNode node, Void context)
+        public List<ExchangeNode> visitExchange(ExchangeNode node, Void context)
         {
-            return ImmutableList.<PartitioningHandle>builder()
-                    .add(node.getPartitioningScheme().getPartitioning().getHandle())
-                    .addAll(collectPartitioningHandles(node.getSources()))
+            return ImmutableList.<ExchangeNode>builder()
+                    .add(node)
+                    .addAll(collectExchanges(node.getSources()))
                     .build();
         }
 
-        private List<PartitioningHandle> collectPartitioningHandles(List<PlanNode> nodes)
+        private List<ExchangeNode> collectExchanges(List<PlanNode> nodes)
         {
             return nodes.stream()
                     .map(node -> node.accept(this, null))
diff --git a/core/trino-main/src/main/java/io/trino/sql/relational/CallExpression.java b/core/trino-main/src/main/java/io/trino/sql/relational/CallExpression.java
index f126ed559f8c..cbd871a62951 100644
--- a/core/trino-main/src/main/java/io/trino/sql/relational/CallExpression.java
+++ b/core/trino-main/src/main/java/io/trino/sql/relational/CallExpression.java
@@ -13,6 +13,8 @@
  */
 package io.trino.sql.relational;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import io.trino.metadata.ResolvedFunction;
@@ -29,7 +31,10 @@ public final class CallExpression
     private final ResolvedFunction resolvedFunction;
     private final List<RowExpression> arguments;
 
-    public CallExpression(ResolvedFunction resolvedFunction, List<RowExpression> arguments)
+    @JsonCreator
+    public CallExpression(
+            @JsonProperty ResolvedFunction resolvedFunction,
+            @JsonProperty List<RowExpression> arguments)
     {
         requireNonNull(resolvedFunction, "resolvedFunction is null");
         requireNonNull(arguments, "arguments is null");
@@ -38,6 +43,7 @@ public CallExpression(ResolvedFunction resolvedFunction, List<RowExpression> arg
         this.arguments = ImmutableList.copyOf(arguments);
     }
 
+    @JsonProperty
     public ResolvedFunction getResolvedFunction()
     {
         return resolvedFunction;
@@ -49,6 +55,7 @@ public Type getType()
         return resolvedFunction.getSignature().getReturnType();
     }
 
+    @JsonProperty
     public List<RowExpression> getArguments()
     {
         return arguments;
diff --git a/core/trino-main/src/main/java/io/trino/sql/relational/ConstantExpression.java b/core/trino-main/src/main/java/io/trino/sql/relational/ConstantExpression.java
index 67e044a6bbcc..9baaf0b88748 100644
--- a/core/trino-main/src/main/java/io/trino/sql/relational/ConstantExpression.java
+++ b/core/trino-main/src/main/java/io/trino/sql/relational/ConstantExpression.java
@@ -13,15 +13,33 @@
  */
 package io.trino.sql.relational;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.airlift.slice.Slice;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.CharType;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.VarcharType;
 
 import java.util.Objects;
 
+import static io.trino.spi.type.TypeUtils.readNativeValue;
+import static io.trino.spi.type.TypeUtils.writeNativeValue;
+import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public final class ConstantExpression
         extends RowExpression
 {
+    @JsonCreator
+    public static ConstantExpression fromJson(
+            @JsonProperty Block value,
+            @JsonProperty Type type)
+    {
+        return new ConstantExpression(readNativeValue(type, value, 0), type);
+    }
+
     private final Object value;
     private final Type type;
 
@@ -38,6 +56,15 @@ public Object getValue()
         return value;
     }
 
+    @JsonProperty("value")
+    public Block getBlockValue()
+    {
+        BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
+        writeNativeValue(type, blockBuilder, value);
+        return blockBuilder.build();
+    }
+
+    @JsonProperty
     @Override
     public Type getType()
     {
@@ -47,6 +74,13 @@ public Type getType()
     @Override
     public String toString()
     {
+        if (value instanceof Slice slice) {
+            if (type instanceof VarcharType || type instanceof CharType) {
+                return slice.toStringUtf8();
+            }
+            return format("Slice(length=%s)", slice.length());
+        }
+
         return String.valueOf(value);
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/relational/InputReferenceExpression.java b/core/trino-main/src/main/java/io/trino/sql/relational/InputReferenceExpression.java
index bcf513637ee1..f090bc5de986 100644
--- a/core/trino-main/src/main/java/io/trino/sql/relational/InputReferenceExpression.java
+++ b/core/trino-main/src/main/java/io/trino/sql/relational/InputReferenceExpression.java
@@ -13,6 +13,7 @@
  */
 package io.trino.sql.relational;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
@@ -26,7 +27,10 @@ public final class InputReferenceExpression
     private final int field;
     private final Type type;
 
-    public InputReferenceExpression(int field, Type type)
+    @JsonCreator
+    public InputReferenceExpression(
+            @JsonProperty int field,
+            @JsonProperty Type type)
     {
         requireNonNull(type, "type is null");
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/relational/LambdaDefinitionExpression.java b/core/trino-main/src/main/java/io/trino/sql/relational/LambdaDefinitionExpression.java
index 0ff3c3c301fc..7069c8d3f407 100644
--- a/core/trino-main/src/main/java/io/trino/sql/relational/LambdaDefinitionExpression.java
+++ b/core/trino-main/src/main/java/io/trino/sql/relational/LambdaDefinitionExpression.java
@@ -13,6 +13,8 @@
  */
 package io.trino.sql.relational;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.type.Type;
@@ -31,7 +33,11 @@ public final class LambdaDefinitionExpression
     private final List<String> arguments;
     private final RowExpression body;
 
-    public LambdaDefinitionExpression(List<Type> argumentTypes, List<String> arguments, RowExpression body)
+    @JsonCreator
+    public LambdaDefinitionExpression(
+            @JsonProperty List<Type> argumentTypes,
+            @JsonProperty List<String> arguments,
+            @JsonProperty RowExpression body)
     {
         this.argumentTypes = ImmutableList.copyOf(requireNonNull(argumentTypes, "argumentTypes is null"));
         this.arguments = ImmutableList.copyOf(requireNonNull(arguments, "arguments is null"));
@@ -39,16 +45,19 @@ public LambdaDefinitionExpression(List<Type> argumentTypes, List<String> argumen
         this.body = requireNonNull(body, "body is null");
     }
 
+    @JsonProperty
     public List<Type> getArgumentTypes()
     {
         return argumentTypes;
     }
 
+    @JsonProperty
     public List<String> getArguments()
     {
         return arguments;
     }
 
+    @JsonProperty
     public RowExpression getBody()
     {
         return body;
diff --git a/core/trino-main/src/main/java/io/trino/sql/relational/RowExpression.java b/core/trino-main/src/main/java/io/trino/sql/relational/RowExpression.java
index 484d79a115ad..cfcadcdf382a 100644
--- a/core/trino-main/src/main/java/io/trino/sql/relational/RowExpression.java
+++ b/core/trino-main/src/main/java/io/trino/sql/relational/RowExpression.java
@@ -13,9 +13,21 @@
  */
 package io.trino.sql.relational;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.trino.spi.type.Type;
 
-public abstract class RowExpression
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
+@JsonSubTypes({
+        @JsonSubTypes.Type(value = CallExpression.class, name = "call"),
+        @JsonSubTypes.Type(value = ConstantExpression.class, name = "constant"),
+        @JsonSubTypes.Type(value = InputReferenceExpression.class, name = "input"),
+        @JsonSubTypes.Type(value = LambdaDefinitionExpression.class, name = "lambda"),
+        @JsonSubTypes.Type(value = SpecialForm.class, name = "special"),
+        @JsonSubTypes.Type(value = VariableReferenceExpression.class, name = "variable"),
+})
+public abstract sealed class RowExpression
+        permits CallExpression, ConstantExpression, InputReferenceExpression, LambdaDefinitionExpression, SpecialForm, VariableReferenceExpression
 {
     public abstract Type getType();
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/relational/SpecialForm.java b/core/trino-main/src/main/java/io/trino/sql/relational/SpecialForm.java
index 4d3b1ae1e53d..9153972060cf 100644
--- a/core/trino-main/src/main/java/io/trino/sql/relational/SpecialForm.java
+++ b/core/trino-main/src/main/java/io/trino/sql/relational/SpecialForm.java
@@ -13,9 +13,10 @@
  */
 package io.trino.sql.relational;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import io.trino.metadata.OperatorNameUtil;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.OperatorType;
@@ -25,10 +26,12 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
+import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
 import static io.trino.spi.function.OperatorType.CAST;
 import static java.util.Objects.requireNonNull;
 
-public class SpecialForm
+public final class SpecialForm
         extends RowExpression
 {
     private final Form form;
@@ -41,7 +44,11 @@ public SpecialForm(Form form, Type returnType, RowExpression... arguments)
         this(form, returnType, ImmutableList.copyOf(arguments));
     }
 
-    public SpecialForm(Form form, Type returnType, List<RowExpression> arguments)
+    @JsonCreator
+    public SpecialForm(
+            @JsonProperty Form form,
+            @JsonProperty Type returnType,
+            @JsonProperty List<RowExpression> arguments)
     {
         this(form, returnType, arguments, ImmutableList.of());
     }
@@ -54,6 +61,7 @@ public SpecialForm(Form form, Type returnType, List<RowExpression> arguments, Li
         this.functionDependencies = ImmutableList.copyOf(requireNonNull(functionDependencies, "functionDependencies is null"));
     }
 
+    @JsonProperty
     public Form getForm()
     {
         return form;
@@ -66,9 +74,9 @@ public List<ResolvedFunction> getFunctionDependencies()
 
     public ResolvedFunction getOperatorDependency(OperatorType operator)
     {
-        String mangleOperatorName = OperatorNameUtil.mangleOperatorName(operator);
+        String mangleOperatorName = mangleOperatorName(operator);
         for (ResolvedFunction function : functionDependencies) {
-            if (function.getSignature().getName().equals(mangleOperatorName)) {
+            if (function.getSignature().getName().getFunctionName().equalsIgnoreCase(mangleOperatorName)) {
                 return function;
             }
         }
@@ -80,7 +88,7 @@ public Optional<ResolvedFunction> getCastDependency(Type fromType, Type toType)
         if (fromType.equals(toType)) {
             return Optional.empty();
         }
-        BoundSignature boundSignature = new BoundSignature(OperatorNameUtil.mangleOperatorName(CAST), toType, ImmutableList.of(fromType));
+        BoundSignature boundSignature = new BoundSignature(builtinFunctionName(CAST), toType, ImmutableList.of(fromType));
         for (ResolvedFunction function : functionDependencies) {
             if (function.getSignature().equals(boundSignature)) {
                 return Optional.of(function);
@@ -90,11 +98,13 @@ public Optional<ResolvedFunction> getCastDependency(Type fromType, Type toType)
     }
 
     @Override
+    @JsonProperty("returnType")
     public Type getType()
     {
         return returnType;
     }
 
+    @JsonProperty
     public List<RowExpression> getArguments()
     {
         return arguments;
diff --git a/core/trino-main/src/main/java/io/trino/sql/relational/SqlToRowExpressionTranslator.java b/core/trino-main/src/main/java/io/trino/sql/relational/SqlToRowExpressionTranslator.java
index 3024b3be1d73..8fd3e2efd5b8 100644
--- a/core/trino-main/src/main/java/io/trino/sql/relational/SqlToRowExpressionTranslator.java
+++ b/core/trino-main/src/main/java/io/trino/sql/relational/SqlToRowExpressionTranslator.java
@@ -63,7 +63,6 @@
 import io.trino.sql.tree.NotExpression;
 import io.trino.sql.tree.NullIfExpression;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.SearchedCaseExpression;
 import io.trino.sql.tree.SimpleCaseExpression;
@@ -81,6 +80,7 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.airlift.slice.Slices.wrappedBuffer;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.function.OperatorType.INDETERMINATE;
@@ -138,8 +138,7 @@ public static RowExpression translate(
         Visitor visitor = new Visitor(
                 metadata,
                 types,
-                layout,
-                session);
+                layout);
         RowExpression result = visitor.process(expression, null);
 
         requireNonNull(result, "result is null");
@@ -152,26 +151,23 @@ public static RowExpression translate(
         return result;
     }
 
-    private static class Visitor
+    public static class Visitor
             extends AstVisitor<RowExpression, Void>
     {
         private final Metadata metadata;
         private final Map<NodeRef<Expression>, Type> types;
         private final Map<Symbol, Integer> layout;
-        private final Session session;
         private final StandardFunctionResolution standardFunctionResolution;
 
-        private Visitor(
+        protected Visitor(
                 Metadata metadata,
                 Map<NodeRef<Expression>, Type> types,
-                Map<Symbol, Integer> layout,
-                Session session)
+                Map<Symbol, Integer> layout)
         {
             this.metadata = metadata;
             this.types = ImmutableMap.copyOf(requireNonNull(types, "types is null"));
             this.layout = layout;
-            this.session = session;
-            standardFunctionResolution = new StandardFunctionResolution(session, metadata);
+            standardFunctionResolution = new StandardFunctionResolution(metadata);
         }
 
         private Type getType(Expression node)
@@ -206,10 +202,10 @@ protected RowExpression visitBooleanLiteral(BooleanLiteral node, Void context)
         @Override
         protected RowExpression visitLongLiteral(LongLiteral node, Void context)
         {
-            if (node.getValue() >= Integer.MIN_VALUE && node.getValue() <= Integer.MAX_VALUE) {
-                return constant(node.getValue(), INTEGER);
+            if (node.getParsedValue() >= Integer.MIN_VALUE && node.getParsedValue() <= Integer.MAX_VALUE) {
+                return constant(node.getParsedValue(), INTEGER);
             }
-            return constant(node.getValue(), BIGINT);
+            return constant(node.getParsedValue(), BIGINT);
         }
 
         @Override
@@ -250,12 +246,12 @@ protected RowExpression visitGenericLiteral(GenericLiteral node, Void context)
 
             if (JSON.equals(type)) {
                 return call(
-                        metadata.resolveFunction(session, QualifiedName.of("json_parse"), fromTypes(VARCHAR)),
+                        metadata.resolveBuiltinFunction("json_parse", fromTypes(VARCHAR)),
                         constant(utf8Slice(node.getValue()), VARCHAR));
             }
 
             return call(
-                    metadata.getCoercion(session, VARCHAR, type),
+                    metadata.getCoercion(VARCHAR, type),
                     constant(utf8Slice(node.getValue()), VARCHAR));
         }
 
@@ -317,7 +313,7 @@ protected RowExpression visitComparisonExpression(ComparisonExpression node, Voi
             switch (node.getOperator()) {
                 case NOT_EQUAL:
                     return new CallExpression(
-                            metadata.resolveFunction(session, QualifiedName.of("not"), fromTypes(BOOLEAN)),
+                            metadata.resolveBuiltinFunction("not", fromTypes(BOOLEAN)),
                             ImmutableList.of(visitComparisonExpression(Operator.EQUAL, left, right)));
                 case GREATER_THAN:
                     return visitComparisonExpression(Operator.LESS_THAN, right, left);
@@ -411,7 +407,7 @@ protected RowExpression visitArithmeticUnary(ArithmeticUnaryExpression node, Voi
                     return expression;
                 case MINUS:
                     return call(
-                            metadata.resolveOperator(session, NEGATION, ImmutableList.of(expression.getType())),
+                            metadata.resolveOperator(NEGATION, ImmutableList.of(expression.getType())),
                             expression);
             }
 
@@ -452,12 +448,12 @@ protected RowExpression visitCast(Cast node, Void context)
 
             if (node.isSafe()) {
                 return call(
-                        metadata.getCoercion(session, QualifiedName.of("TRY_CAST"), value.getType(), returnType),
+                        metadata.getCoercion(builtinFunctionName("TRY_CAST"), value.getType(), returnType),
                         value);
             }
 
             return call(
-                    metadata.getCoercion(session, value.getType(), returnType),
+                    metadata.getCoercion(value.getType(), returnType),
                     value);
         }
 
@@ -537,7 +533,7 @@ protected RowExpression visitSimpleCaseExpression(SimpleCaseExpression node, Voi
                 RowExpression operand = process(clause.getOperand(), context);
                 RowExpression result = process(clause.getResult(), context);
 
-                functionDependencies.add(metadata.resolveOperator(session, EQUAL, ImmutableList.of(value.getType(), operand.getType())));
+                functionDependencies.add(metadata.resolveOperator(EQUAL, ImmutableList.of(value.getType(), operand.getType())));
 
                 arguments.add(new SpecialForm(
                         WHEN,
@@ -624,9 +620,9 @@ protected RowExpression visitInPredicate(InPredicate node, Void context)
             }
 
             List<ResolvedFunction> functionDependencies = ImmutableList.<ResolvedFunction>builder()
-                    .add(metadata.resolveOperator(session, EQUAL, ImmutableList.of(value.getType(), value.getType())))
-                    .add(metadata.resolveOperator(session, HASH_CODE, ImmutableList.of(value.getType())))
-                    .add(metadata.resolveOperator(session, INDETERMINATE, ImmutableList.of(value.getType())))
+                    .add(metadata.resolveOperator(EQUAL, ImmutableList.of(value.getType(), value.getType())))
+                    .add(metadata.resolveOperator(HASH_CODE, ImmutableList.of(value.getType())))
+                    .add(metadata.resolveOperator(INDETERMINATE, ImmutableList.of(value.getType())))
                     .build();
 
             return new SpecialForm(IN, BOOLEAN, arguments.build(), functionDependencies);
@@ -657,7 +653,7 @@ protected RowExpression visitNotExpression(NotExpression node, Void context)
         private RowExpression notExpression(RowExpression value)
         {
             return new CallExpression(
-                    metadata.resolveFunction(session, QualifiedName.of("not"), fromTypes(BOOLEAN)),
+                    metadata.resolveBuiltinFunction("not", fromTypes(BOOLEAN)),
                     ImmutableList.of(value));
         }
 
@@ -667,11 +663,11 @@ protected RowExpression visitNullIfExpression(NullIfExpression node, Void contex
             RowExpression first = process(node.getFirst(), context);
             RowExpression second = process(node.getSecond(), context);
 
-            ResolvedFunction resolvedFunction = metadata.resolveOperator(session, EQUAL, ImmutableList.of(first.getType(), second.getType()));
+            ResolvedFunction resolvedFunction = metadata.resolveOperator(EQUAL, ImmutableList.of(first.getType(), second.getType()));
             List<ResolvedFunction> functionDependencies = ImmutableList.<ResolvedFunction>builder()
                     .add(resolvedFunction)
-                    .add(metadata.getCoercion(session, first.getType(), resolvedFunction.getSignature().getArgumentTypes().get(0)))
-                    .add(metadata.getCoercion(session, second.getType(), resolvedFunction.getSignature().getArgumentTypes().get(0)))
+                    .add(metadata.getCoercion(first.getType(), resolvedFunction.getSignature().getArgumentTypes().get(0)))
+                    .add(metadata.getCoercion(second.getType(), resolvedFunction.getSignature().getArgumentTypes().get(0)))
                     .build();
 
             return new SpecialForm(
@@ -689,7 +685,7 @@ protected RowExpression visitBetweenPredicate(BetweenPredicate node, Void contex
             RowExpression max = process(node.getMax(), context);
 
             List<ResolvedFunction> functionDependencies = ImmutableList.of(
-                    metadata.resolveOperator(session, LESS_THAN_OR_EQUAL, ImmutableList.of(value.getType(), max.getType())));
+                    metadata.resolveOperator(LESS_THAN_OR_EQUAL, ImmutableList.of(value.getType(), max.getType())));
 
             return new SpecialForm(
                     BETWEEN,
@@ -710,7 +706,7 @@ protected RowExpression visitSubscriptExpression(SubscriptExpression node, Void
             }
 
             return call(
-                    metadata.resolveOperator(session, SUBSCRIPT, ImmutableList.of(base.getType(), index.getType())),
+                    metadata.resolveOperator(SUBSCRIPT, ImmutableList.of(base.getType(), index.getType())),
                     base,
                     index);
         }
diff --git a/core/trino-main/src/main/java/io/trino/sql/relational/StandardFunctionResolution.java b/core/trino-main/src/main/java/io/trino/sql/relational/StandardFunctionResolution.java
index e39ae10cdd68..ad557eb54f02 100644
--- a/core/trino-main/src/main/java/io/trino/sql/relational/StandardFunctionResolution.java
+++ b/core/trino-main/src/main/java/io/trino/sql/relational/StandardFunctionResolution.java
@@ -14,7 +14,6 @@
 package io.trino.sql.relational;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.Session;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.spi.function.OperatorType;
@@ -35,12 +34,10 @@
 
 public final class StandardFunctionResolution
 {
-    private final Session session;
     private final Metadata metadata;
 
-    public StandardFunctionResolution(Session session, Metadata metadata)
+    public StandardFunctionResolution(Metadata metadata)
     {
-        this.session = requireNonNull(session, "session is null");
         this.metadata = requireNonNull(metadata, "metadata is null");
     }
 
@@ -66,7 +63,7 @@ public ResolvedFunction arithmeticFunction(Operator operator, Type leftType, Typ
             default:
                 throw new IllegalStateException("Unknown arithmetic operator: " + operator);
         }
-        return metadata.resolveOperator(session, operatorType, ImmutableList.of(leftType, rightType));
+        return metadata.resolveOperator(operatorType, ImmutableList.of(leftType, rightType));
     }
 
     public ResolvedFunction comparisonFunction(ComparisonExpression.Operator operator, Type leftType, Type rightType)
@@ -89,6 +86,6 @@ public ResolvedFunction comparisonFunction(ComparisonExpression.Operator operato
                 throw new IllegalStateException("Unsupported comparison operator type: " + operator);
         }
 
-        return metadata.resolveOperator(session, operatorType, ImmutableList.of(leftType, rightType));
+        return metadata.resolveOperator(operatorType, ImmutableList.of(leftType, rightType));
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/relational/VariableReferenceExpression.java b/core/trino-main/src/main/java/io/trino/sql/relational/VariableReferenceExpression.java
index fd0cd59f8f6d..b333cb4ffe6f 100644
--- a/core/trino-main/src/main/java/io/trino/sql/relational/VariableReferenceExpression.java
+++ b/core/trino-main/src/main/java/io/trino/sql/relational/VariableReferenceExpression.java
@@ -13,6 +13,8 @@
  */
 package io.trino.sql.relational;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.type.Type;
 
 import java.util.Objects;
@@ -25,17 +27,22 @@ public final class VariableReferenceExpression
     private final String name;
     private final Type type;
 
-    public VariableReferenceExpression(String name, Type type)
+    @JsonCreator
+    public VariableReferenceExpression(
+            @JsonProperty String name,
+            @JsonProperty Type type)
     {
         this.name = requireNonNull(name, "name is null");
         this.type = requireNonNull(type, "type is null");
     }
 
+    @JsonProperty
     public String getName()
     {
         return name;
     }
 
+    @JsonProperty
     @Override
     public Type getType()
     {
diff --git a/core/trino-main/src/main/java/io/trino/sql/relational/optimizer/ExpressionOptimizer.java b/core/trino-main/src/main/java/io/trino/sql/relational/optimizer/ExpressionOptimizer.java
index 8b91fae4a505..abc816dd0b66 100644
--- a/core/trino-main/src/main/java/io/trino/sql/relational/optimizer/ExpressionOptimizer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/relational/optimizer/ExpressionOptimizer.java
@@ -17,7 +17,7 @@
 import io.trino.Session;
 import io.trino.metadata.FunctionManager;
 import io.trino.metadata.Metadata;
-import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
@@ -31,7 +31,6 @@
 import io.trino.sql.relational.RowExpressionVisitor;
 import io.trino.sql.relational.SpecialForm;
 import io.trino.sql.relational.VariableReferenceExpression;
-import io.trino.sql.tree.QualifiedName;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -39,7 +38,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.operator.scalar.JsonStringToArrayCast.JSON_STRING_TO_ARRAY_NAME;
 import static io.trino.operator.scalar.JsonStringToMapCast.JSON_STRING_TO_MAP_NAME;
 import static io.trino.operator.scalar.JsonStringToRowCast.JSON_STRING_TO_ROW_NAME;
@@ -53,6 +52,8 @@
 
 public class ExpressionOptimizer
 {
+    private static final CatalogSchemaFunctionName JSON_PARSE_NAME = builtinFunctionName("json_parse");
+
     private final Metadata metadata;
     private final FunctionManager functionManager;
     private final Session session;
@@ -87,7 +88,7 @@ public RowExpression visitConstant(ConstantExpression literal, Void context)
         @Override
         public RowExpression visitCall(CallExpression call, Void context)
         {
-            if (call.getResolvedFunction().getSignature().getName().equals(mangleOperatorName(CAST))) {
+            if (call.getResolvedFunction().getSignature().getName().equals(builtinFunctionName(CAST))) {
                 call = rewriteCast(call);
             }
 
@@ -96,8 +97,7 @@ public RowExpression visitCall(CallExpression call, Void context)
                     .collect(toImmutableList());
 
             // TODO: optimize function calls with lambda arguments. For example, apply(x -> x + 2, 1)
-            FunctionMetadata functionMetadata = metadata.getFunctionMetadata(session, call.getResolvedFunction());
-            if (arguments.stream().allMatch(ConstantExpression.class::isInstance) && functionMetadata.isDeterministic()) {
+            if (arguments.stream().allMatch(ConstantExpression.class::isInstance) && call.getResolvedFunction().isDeterministic()) {
                 List<Object> constantArguments = arguments.stream()
                         .map(ConstantExpression.class::cast)
                         .map(ConstantExpression::getValue)
@@ -191,30 +191,30 @@ private CallExpression rewriteCast(CallExpression call)
         {
             if (call.getArguments().get(0) instanceof CallExpression innerCall) {
                 // Optimization for CAST(JSON_PARSE(...) AS ARRAY/MAP/ROW)
-                if (innerCall.getResolvedFunction().getSignature().getName().equals("json_parse")) {
+                if (innerCall.getResolvedFunction().getSignature().getName().equals(JSON_PARSE_NAME)) {
                     checkArgument(innerCall.getType().equals(JSON));
                     checkArgument(innerCall.getArguments().size() == 1);
                     Type returnType = call.getType();
                     if (returnType instanceof ArrayType) {
                         return call(
-                                metadata.getCoercion(session, QualifiedName.of(JSON_STRING_TO_ARRAY_NAME), VARCHAR, returnType),
+                                metadata.getCoercion(builtinFunctionName(JSON_STRING_TO_ARRAY_NAME), VARCHAR, returnType),
                                 innerCall.getArguments());
                     }
                     if (returnType instanceof MapType) {
                         return call(
-                                metadata.getCoercion(session, QualifiedName.of(JSON_STRING_TO_MAP_NAME), VARCHAR, returnType),
+                                metadata.getCoercion(builtinFunctionName(JSON_STRING_TO_MAP_NAME), VARCHAR, returnType),
                                 innerCall.getArguments());
                     }
                     if (returnType instanceof RowType) {
                         return call(
-                                metadata.getCoercion(session, QualifiedName.of(JSON_STRING_TO_ROW_NAME), VARCHAR, returnType),
+                                metadata.getCoercion(builtinFunctionName(JSON_STRING_TO_ROW_NAME), VARCHAR, returnType),
                                 innerCall.getArguments());
                     }
                 }
             }
 
             return call(
-                    metadata.getCoercion(session, call.getArguments().get(0).getType(), call.getType()),
+                    metadata.getCoercion(call.getArguments().get(0).getType(), call.getType()),
                     call.getArguments());
         }
     }
diff --git a/core/trino-main/src/main/java/io/trino/sql/rewrite/DescribeInputRewrite.java b/core/trino-main/src/main/java/io/trino/sql/rewrite/DescribeInputRewrite.java
index c8c8e2aa1f47..9f917d2e6d44 100644
--- a/core/trino-main/src/main/java/io/trino/sql/rewrite/DescribeInputRewrite.java
+++ b/core/trino-main/src/main/java/io/trino/sql/rewrite/DescribeInputRewrite.java
@@ -14,6 +14,7 @@
 package io.trino.sql.rewrite;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.querystats.PlanOptimizersStatsCollector;
 import io.trino.execution.warnings.WarningCollector;
@@ -23,6 +24,7 @@
 import io.trino.sql.analyzer.AnalyzerFactory;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.AstVisitor;
+import io.trino.sql.tree.Cast;
 import io.trino.sql.tree.DescribeInput;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.Limit;
@@ -31,19 +33,19 @@
 import io.trino.sql.tree.NodeRef;
 import io.trino.sql.tree.NullLiteral;
 import io.trino.sql.tree.Parameter;
+import io.trino.sql.tree.Query;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.Statement;
 import io.trino.sql.tree.StringLiteral;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
 import static io.trino.SystemSessionProperties.isOmitDateTimeTypePrecision;
 import static io.trino.execution.ParameterExtractor.extractParameters;
-import static io.trino.sql.ParsingUtil.createParsingOptions;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.QueryUtil.aliased;
 import static io.trino.sql.QueryUtil.ascending;
 import static io.trino.sql.QueryUtil.identifier;
@@ -53,6 +55,7 @@
 import static io.trino.sql.QueryUtil.simpleQuery;
 import static io.trino.sql.QueryUtil.values;
 import static io.trino.sql.analyzer.QueryType.DESCRIBE;
+import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
 import static io.trino.type.TypeUtils.getDisplayLabel;
 import static io.trino.type.UnknownType.UNKNOWN;
 import static java.util.Objects.requireNonNull;
@@ -84,6 +87,12 @@ public Statement rewrite(
     private static final class Visitor
             extends AstVisitor<Node, Void>
     {
+        private static final Query EMPTY_INPUT = createDesctibeInputQuery(
+                new Row[]{row(
+                        new Cast(new NullLiteral(), toSqlType(BIGINT)),
+                        new Cast(new NullLiteral(), toSqlType(VARCHAR)))},
+                Optional.of(new Limit(new LongLiteral("0"))));
+
         private final Session session;
         private final SqlParser parser;
         private final AnalyzerFactory analyzerFactory;
@@ -107,14 +116,14 @@ public Visitor(
             this.parameters = parameters;
             this.parameterLookup = parameterLookup;
             this.warningCollector = requireNonNull(warningCollector, "warningCollector is null");
-            this.planOptimizersStatsCollector = requireNonNull(planOptimizersStatsCollector, "queryStatsCollector is null");
+            this.planOptimizersStatsCollector = requireNonNull(planOptimizersStatsCollector, "planOptimizersStatsCollector is null");
         }
 
         @Override
         protected Node visitDescribeInput(DescribeInput node, Void context)
         {
             String sqlString = session.getPreparedStatement(node.getName().getValue());
-            Statement statement = parser.createStatement(sqlString, createParsingOptions(session));
+            Statement statement = parser.createStatement(sqlString);
 
             // create  analysis for the query we are describing.
             Analyzer analyzer = analyzerFactory.createAnalyzer(session, parameters, parameterLookup, warningCollector, planOptimizersStatsCollector);
@@ -132,10 +141,14 @@ protected Node visitDescribeInput(DescribeInput node, Void context)
             Row[] rows = builder.build().toArray(Row[]::new);
             Optional<Node> limit = Optional.empty();
             if (rows.length == 0) {
-                rows = new Row[] {row(new NullLiteral(), new NullLiteral())};
-                limit = Optional.of(new Limit(new LongLiteral("0")));
+                return EMPTY_INPUT;
             }
 
+            return createDesctibeInputQuery(rows, limit);
+        }
+
+        private static Query createDesctibeInputQuery(Row[] rows, Optional<Node> limit)
+        {
             return simpleQuery(
                     selectList(identifier("Position"), identifier("Type")),
                     aliased(
diff --git a/core/trino-main/src/main/java/io/trino/sql/rewrite/DescribeOutputRewrite.java b/core/trino-main/src/main/java/io/trino/sql/rewrite/DescribeOutputRewrite.java
index 2a06c52711f0..b8a78d502e29 100644
--- a/core/trino-main/src/main/java/io/trino/sql/rewrite/DescribeOutputRewrite.java
+++ b/core/trino-main/src/main/java/io/trino/sql/rewrite/DescribeOutputRewrite.java
@@ -14,6 +14,7 @@
 package io.trino.sql.rewrite;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.querystats.PlanOptimizersStatsCollector;
 import io.trino.execution.warnings.WarningCollector;
@@ -26,6 +27,7 @@
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.AstVisitor;
 import io.trino.sql.tree.BooleanLiteral;
+import io.trino.sql.tree.Cast;
 import io.trino.sql.tree.DescribeOutput;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.Limit;
@@ -34,18 +36,19 @@
 import io.trino.sql.tree.NodeRef;
 import io.trino.sql.tree.NullLiteral;
 import io.trino.sql.tree.Parameter;
+import io.trino.sql.tree.Query;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.Statement;
 import io.trino.sql.tree.StringLiteral;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
 import static io.trino.SystemSessionProperties.isOmitDateTimeTypePrecision;
-import static io.trino.sql.ParsingUtil.createParsingOptions;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.QueryUtil.aliased;
 import static io.trino.sql.QueryUtil.identifier;
 import static io.trino.sql.QueryUtil.row;
@@ -53,6 +56,7 @@
 import static io.trino.sql.QueryUtil.simpleQuery;
 import static io.trino.sql.QueryUtil.values;
 import static io.trino.sql.analyzer.QueryType.DESCRIBE;
+import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
 import static io.trino.type.TypeUtils.getDisplayLabel;
 import static java.util.Objects.requireNonNull;
 
@@ -83,6 +87,17 @@ public Statement rewrite(
     private static final class Visitor
             extends AstVisitor<Node, Void>
     {
+        private static final Query EMPTY_OUTPUT = createDesctibeOutputQuery(
+                new Row[]{row(
+                        new Cast(new NullLiteral(), toSqlType(VARCHAR)),
+                        new Cast(new NullLiteral(), toSqlType(VARCHAR)),
+                        new Cast(new NullLiteral(), toSqlType(VARCHAR)),
+                        new Cast(new NullLiteral(), toSqlType(VARCHAR)),
+                        new Cast(new NullLiteral(), toSqlType(VARCHAR)),
+                        new Cast(new NullLiteral(), toSqlType(BIGINT)),
+                        new Cast(new NullLiteral(), toSqlType(BOOLEAN)))},
+                Optional.of(new Limit(new LongLiteral("0"))));
+
         private final Session session;
         private final SqlParser parser;
         private final AnalyzerFactory analyzerFactory;
@@ -106,14 +121,14 @@ public Visitor(
             this.parameters = parameters;
             this.parameterLookup = parameterLookup;
             this.warningCollector = requireNonNull(warningCollector, "warningCollector is null");
-            this.planOptimizersStatsCollector = requireNonNull(planOptimizersStatsCollector, "queryStatsCollector is null");
+            this.planOptimizersStatsCollector = requireNonNull(planOptimizersStatsCollector, "planOptimizersStatsCollector is null");
         }
 
         @Override
         protected Node visitDescribeOutput(DescribeOutput node, Void context)
         {
             String sqlString = session.getPreparedStatement(node.getName().getValue());
-            Statement statement = parser.createStatement(sqlString, createParsingOptions(session));
+            Statement statement = parser.createStatement(sqlString);
 
             Analyzer analyzer = analyzerFactory.createAnalyzer(session, parameters, parameterLookup, warningCollector, planOptimizersStatsCollector);
             Analysis analysis = analyzer.analyze(statement, DESCRIBE);
@@ -121,10 +136,13 @@ protected Node visitDescribeOutput(DescribeOutput node, Void context)
             Optional<Node> limit = Optional.empty();
             Row[] rows = analysis.getRootScope().getRelationType().getVisibleFields().stream().map(field -> createDescribeOutputRow(field, analysis)).toArray(Row[]::new);
             if (rows.length == 0) {
-                NullLiteral nullLiteral = new NullLiteral();
-                rows = new Row[] {row(nullLiteral, nullLiteral, nullLiteral, nullLiteral, nullLiteral, nullLiteral, nullLiteral)};
-                limit = Optional.of(new Limit(new LongLiteral("0")));
+                return EMPTY_OUTPUT;
             }
+            return createDesctibeOutputQuery(rows, limit);
+        }
+
+        private static Query createDesctibeOutputQuery(Row[] rows, Optional<Node> limit)
+        {
             return simpleQuery(
                     selectList(
                             identifier("Column Name"),
diff --git a/core/trino-main/src/main/java/io/trino/sql/rewrite/ExplainRewrite.java b/core/trino-main/src/main/java/io/trino/sql/rewrite/ExplainRewrite.java
index 04f484fff2f4..cff25897c29b 100644
--- a/core/trino-main/src/main/java/io/trino/sql/rewrite/ExplainRewrite.java
+++ b/core/trino-main/src/main/java/io/trino/sql/rewrite/ExplainRewrite.java
@@ -13,6 +13,7 @@
  */
 package io.trino.sql.rewrite;
 
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.QueryPreparer;
 import io.trino.execution.QueryPreparer.PreparedQuery;
@@ -33,8 +34,6 @@
 import io.trino.sql.tree.Parameter;
 import io.trino.sql.tree.Statement;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/rewrite/ShowQueriesRewrite.java b/core/trino-main/src/main/java/io/trino/sql/rewrite/ShowQueriesRewrite.java
index d67d10a0e0d9..54c5ddec92f2 100644
--- a/core/trino-main/src/main/java/io/trino/sql/rewrite/ShowQueriesRewrite.java
+++ b/core/trino-main/src/main/java/io/trino/sql/rewrite/ShowQueriesRewrite.java
@@ -19,7 +19,10 @@
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Multimaps;
 import com.google.common.primitives.Primitives;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.querystats.PlanOptimizersStatsCollector;
 import io.trino.execution.warnings.WarningCollector;
@@ -46,9 +49,12 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.function.FunctionKind;
 import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.SchemaFunctionName;
+import io.trino.spi.predicate.Domain;
 import io.trino.spi.security.PrincipalType;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.session.PropertyMetadata;
+import io.trino.spi.type.Type;
 import io.trino.sql.analyzer.AnalyzerFactory;
 import io.trino.sql.parser.ParsingException;
 import io.trino.sql.parser.SqlParser;
@@ -56,6 +62,7 @@
 import io.trino.sql.tree.Array;
 import io.trino.sql.tree.AstVisitor;
 import io.trino.sql.tree.BooleanLiteral;
+import io.trino.sql.tree.Cast;
 import io.trino.sql.tree.ColumnDefinition;
 import io.trino.sql.tree.CreateMaterializedView;
 import io.trino.sql.tree.CreateSchema;
@@ -70,12 +77,16 @@
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.Node;
 import io.trino.sql.tree.NodeRef;
+import io.trino.sql.tree.NullLiteral;
 import io.trino.sql.tree.Parameter;
 import io.trino.sql.tree.PrincipalSpecification;
 import io.trino.sql.tree.Property;
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Query;
+import io.trino.sql.tree.QuerySpecification;
 import io.trino.sql.tree.Relation;
+import io.trino.sql.tree.Row;
+import io.trino.sql.tree.SelectItem;
 import io.trino.sql.tree.ShowCatalogs;
 import io.trino.sql.tree.ShowColumns;
 import io.trino.sql.tree.ShowCreate;
@@ -86,14 +97,13 @@
 import io.trino.sql.tree.ShowSchemas;
 import io.trino.sql.tree.ShowSession;
 import io.trino.sql.tree.ShowTables;
+import io.trino.sql.tree.SingleColumn;
 import io.trino.sql.tree.SortItem;
 import io.trino.sql.tree.Statement;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.sql.tree.TableElement;
 import io.trino.sql.tree.Values;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -124,18 +134,19 @@
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.ExpressionUtils.combineConjuncts;
-import static io.trino.sql.ParsingUtil.createParsingOptions;
 import static io.trino.sql.QueryUtil.aliased;
 import static io.trino.sql.QueryUtil.aliasedName;
 import static io.trino.sql.QueryUtil.aliasedNullToEmpty;
 import static io.trino.sql.QueryUtil.ascending;
-import static io.trino.sql.QueryUtil.emptyQuery;
 import static io.trino.sql.QueryUtil.equal;
 import static io.trino.sql.QueryUtil.functionCall;
 import static io.trino.sql.QueryUtil.identifier;
 import static io.trino.sql.QueryUtil.logicalAnd;
 import static io.trino.sql.QueryUtil.ordering;
+import static io.trino.sql.QueryUtil.query;
 import static io.trino.sql.QueryUtil.row;
 import static io.trino.sql.QueryUtil.selectAll;
 import static io.trino.sql.QueryUtil.selectList;
@@ -150,6 +161,7 @@
 import static io.trino.sql.tree.CreateView.Security.DEFINER;
 import static io.trino.sql.tree.CreateView.Security.INVOKER;
 import static io.trino.sql.tree.LogicalExpression.and;
+import static io.trino.sql.tree.SaveMode.FAIL;
 import static io.trino.sql.tree.ShowCreate.Type.MATERIALIZED_VIEW;
 import static io.trino.sql.tree.ShowCreate.Type.SCHEMA;
 import static io.trino.sql.tree.ShowCreate.Type.TABLE;
@@ -307,11 +319,11 @@ protected Node visitShowGrants(ShowGrants showGrants, Void context)
                 QualifiedObjectName qualifiedTableName = createQualifiedObjectName(session, showGrants, tableName.get());
                 if (!metadata.isView(session, qualifiedTableName)) {
                     RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, qualifiedTableName);
-                    if (redirection.getTableHandle().isEmpty()) {
+                    if (redirection.tableHandle().isEmpty()) {
                         throw semanticException(TABLE_NOT_FOUND, showGrants, "Table '%s' does not exist", tableName);
                     }
-                    if (redirection.getRedirectedTableName().isPresent()) {
-                        throw semanticException(NOT_SUPPORTED, showGrants, "Table %s is redirected to %s and SHOW GRANTS is not supported with table redirections", tableName.get(), redirection.getRedirectedTableName().get());
+                    if (redirection.redirectedTableName().isPresent()) {
+                        throw semanticException(NOT_SUPPORTED, showGrants, "Table %s is redirected to %s and SHOW GRANTS is not supported with table redirections", tableName.get(), redirection.redirectedTableName().get());
                     }
                 }
 
@@ -372,13 +384,13 @@ protected Node visitShowRoles(ShowRoles node, Void context)
                 List<Expression> rows = enabledRoles.stream()
                         .map(role -> row(new StringLiteral(role)))
                         .collect(toList());
-                return singleColumnValues(rows, "Role");
+                return singleColumnValues(rows, "Role", VARCHAR);
             }
             accessControl.checkCanShowRoles(session.toSecurityContext(), catalog);
             List<Expression> rows = metadata.listRoles(session, catalog).stream()
                     .map(role -> row(new StringLiteral(role)))
                     .collect(toList());
-            return singleColumnValues(rows, "Role");
+            return singleColumnValues(rows, "Role", VARCHAR);
         }
 
         @Override
@@ -397,14 +409,14 @@ protected Node visitShowRoleGrants(ShowRoleGrants node, Void context)
                     .map(roleGrant -> row(new StringLiteral(roleGrant.getRoleName())))
                     .collect(toList());
 
-            return singleColumnValues(rows, "Role Grants");
+            return singleColumnValues(rows, "Role Grants", VARCHAR);
         }
 
-        private static Query singleColumnValues(List<Expression> rows, String columnName)
+        private static Query singleColumnValues(List<Expression> rows, String columnName, Type type)
         {
             List<String> columns = ImmutableList.of(columnName);
             if (rows.isEmpty()) {
-                return emptyQuery(columns);
+                return emptyQuery(columns, ImmutableList.of(type));
             }
             return simpleQuery(
                     selectList(new AllColumns()),
@@ -441,7 +453,7 @@ protected Node visitShowSchemas(ShowSchemas node, Void context)
         @Override
         protected Node visitShowCatalogs(ShowCatalogs node, Void context)
         {
-            List<Expression> rows = listCatalogNames(session, metadata, accessControl).stream()
+            List<Expression> rows = listCatalogNames(session, metadata, accessControl, Domain.all(VARCHAR)).stream()
                     .map(name -> row(new StringLiteral(name)))
                     .collect(toImmutableList());
 
@@ -483,11 +495,11 @@ protected Node visitShowColumns(ShowColumns showColumns, Void context)
                 // Check for table if view is not present
                 if (!isView) {
                     RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, tableName);
-                    tableHandle = redirection.getTableHandle();
+                    tableHandle = redirection.tableHandle();
                     if (tableHandle.isEmpty()) {
                         throw semanticException(TABLE_NOT_FOUND, showColumns, "Table '%s' does not exist", tableName);
                     }
-                    targetTableName = redirection.getRedirectedTableName().orElse(tableName);
+                    targetTableName = redirection.redirectedTableName().orElse(tableName);
                 }
             }
 
@@ -658,10 +670,10 @@ protected Node visitShowCreate(ShowCreate node, Void context)
                 }
 
                 RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, objectName);
-                TableHandle tableHandle = redirection.getTableHandle()
+                TableHandle tableHandle = redirection.tableHandle()
                         .orElseThrow(() -> semanticException(TABLE_NOT_FOUND, node, "Table '%s' does not exist", objectName));
 
-                QualifiedObjectName targetTableName = redirection.getRedirectedTableName().orElse(objectName);
+                QualifiedObjectName targetTableName = redirection.redirectedTableName().orElse(objectName);
                 accessControl.checkCanShowCreateTable(session.toSecurityContext(), targetTableName);
                 ConnectorTableMetadata connectorTableMetadata = metadata.getTableMetadata(session, tableHandle).getMetadata();
 
@@ -672,7 +684,7 @@ protected Node visitShowCreate(ShowCreate node, Void context)
                         .map(column -> {
                             List<Property> propertyNodes = buildProperties(targetTableName, Optional.of(column.getName()), INVALID_COLUMN_PROPERTY, column.getProperties(), allColumnProperties);
                             return new ColumnDefinition(
-                                    new Identifier(column.getName()),
+                                    QualifiedName.of(column.getName()),
                                     toSqlType(column.getType()),
                                     column.isNullable(),
                                     propertyNodes,
@@ -687,7 +699,7 @@ protected Node visitShowCreate(ShowCreate node, Void context)
                 CreateTable createTable = new CreateTable(
                         QualifiedName.of(targetTableName.getCatalogName(), targetTableName.getSchemaName(), targetTableName.getObjectName()),
                         columns,
-                        false,
+                        FAIL,
                         propertyNodes,
                         connectorTableMetadata.getComment());
                 return singleValueQuery("Create Table", formatSql(createTable).trim());
@@ -773,15 +785,19 @@ private static String toQualifiedName(Object objectName, Optional<String> column
         @Override
         protected Node visitShowFunctions(ShowFunctions node, Void context)
         {
-            List<Expression> rows = metadata.listFunctions(session).stream()
+            Collection<FunctionMetadata> functions;
+            if (node.getSchema().isPresent()) {
+                CatalogSchemaName schema = createCatalogSchemaName(session, node, node.getSchema());
+                accessControl.checkCanShowFunctions(session.toSecurityContext(), schema);
+                functions = listFunctions(schema);
+            }
+            else {
+                functions = listFunctions();
+            }
+
+            List<Expression> rows = functions.stream()
                     .filter(function -> !function.isHidden())
-                    .map(function -> row(
-                            new StringLiteral(function.getSignature().getName()),
-                            new StringLiteral(function.getSignature().getReturnType().toString()),
-                            new StringLiteral(Joiner.on(", ").join(function.getSignature().getArgumentTypes())),
-                            new StringLiteral(getFunctionType(function)),
-                            function.isDeterministic() ? TRUE_LITERAL : FALSE_LITERAL,
-                            new StringLiteral(nullToEmpty(function.getDescription()))))
+                    .flatMap(metadata -> metadata.getNames().stream().map(alias -> toRow(alias, metadata)))
                     .collect(toImmutableList());
 
             Map<String, String> columns = ImmutableMap.<String, String>builder()
@@ -793,6 +809,10 @@ protected Node visitShowFunctions(ShowFunctions node, Void context)
                     .put("description", "Description")
                     .buildOrThrow();
 
+            if (rows.isEmpty()) {
+                return emptyQuery(ImmutableList.copyOf(columns.values()), ImmutableList.of(VARCHAR, VARCHAR, VARCHAR, VARCHAR, BOOLEAN, VARCHAR));
+            }
+
             return simpleQuery(
                     selectAll(columns.entrySet().stream()
                             .map(entry -> aliasedName(entry.getKey(), entry.getValue()))
@@ -815,6 +835,42 @@ protected Node visitShowFunctions(ShowFunctions node, Void context)
                             ascending("function_type")));
         }
 
+        private static Row toRow(String alias, FunctionMetadata function)
+        {
+            return row(
+                    new StringLiteral(alias),
+                    new StringLiteral(function.getSignature().getReturnType().toString()),
+                    new StringLiteral(Joiner.on(", ").join(function.getSignature().getArgumentTypes())),
+                    new StringLiteral(getFunctionType(function)),
+                    function.isDeterministic() ? TRUE_LITERAL : FALSE_LITERAL,
+                    new StringLiteral(nullToEmpty(function.getDescription())));
+        }
+
+        private Collection<FunctionMetadata> listFunctions()
+        {
+            ImmutableList.Builder<FunctionMetadata> functions = ImmutableList.builder();
+            functions.addAll(metadata.listGlobalFunctions(session));
+            for (CatalogSchemaName name : session.getPath().getPath()) {
+                functions.addAll(metadata.listFunctions(session, name));
+            }
+            return functions.build();
+        }
+
+        private Collection<FunctionMetadata> listFunctions(CatalogSchemaName schema)
+        {
+            return filterFunctions(schema, metadata.listFunctions(session, schema));
+        }
+
+        private Collection<FunctionMetadata> filterFunctions(CatalogSchemaName schema, Iterable<FunctionMetadata> functions)
+        {
+            Multimap<SchemaFunctionName, FunctionMetadata> functionsByName = Multimaps.index(functions, function ->
+                    new SchemaFunctionName(schema.getSchemaName(), function.getCanonicalName()));
+
+            Set<SchemaFunctionName> filtered = accessControl.filterFunctions(session.toSecurityContext(), schema.getCatalogName(), functionsByName.keySet());
+
+            return Multimaps.filterKeys(functionsByName, filtered::contains).values();
+        }
+
         private static String getFunctionType(FunctionMetadata function)
         {
             FunctionKind kind = function.getKind();
@@ -882,7 +938,7 @@ protected Node visitShowSession(ShowSession node, Void context)
         private Query parseView(String view, QualifiedObjectName name, Node node)
         {
             try {
-                Statement statement = sqlParser.createStatement(view, createParsingOptions(session));
+                Statement statement = sqlParser.createStatement(view);
                 return (Query) statement;
             }
             catch (ParsingException e) {
@@ -900,5 +956,24 @@ protected Node visitNode(Node node, Void context)
         {
             return node;
         }
+
+        public static Query emptyQuery(List<String> columns, List<Type> types)
+        {
+            ImmutableList.Builder<SelectItem> items = ImmutableList.builder();
+            for (int i = 0; i < columns.size(); i++) {
+                items.add(new SingleColumn(new Cast(new NullLiteral(), toSqlType(types.get(i))), identifier(columns.get(i))));
+            }
+            Optional<Expression> where = Optional.of(FALSE_LITERAL);
+            return query(new QuerySpecification(
+                    selectAll(items.build()),
+                    Optional.empty(),
+                    where,
+                    Optional.empty(),
+                    Optional.empty(),
+                    ImmutableList.of(),
+                    Optional.empty(),
+                    Optional.empty(),
+                    Optional.empty()));
+        }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/rewrite/ShowStatsRewrite.java b/core/trino-main/src/main/java/io/trino/sql/rewrite/ShowStatsRewrite.java
index d30d46b1b6f2..0946f994aee0 100644
--- a/core/trino-main/src/main/java/io/trino/sql/rewrite/ShowStatsRewrite.java
+++ b/core/trino-main/src/main/java/io/trino/sql/rewrite/ShowStatsRewrite.java
@@ -14,6 +14,7 @@
 package io.trino.sql.rewrite;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.cost.CachingStatsProvider;
 import io.trino.cost.CachingTableStatsProvider;
@@ -60,8 +61,6 @@
 import io.trino.sql.tree.TableSubquery;
 import io.trino.sql.tree.Values;
 
-import javax.inject.Inject;
-
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
@@ -140,7 +139,7 @@ private Visitor(
             this.metadata = requireNonNull(metadata, "metadata is null");
             this.queryExplainer = requireNonNull(queryExplainer, "queryExplainer is null");
             this.warningCollector = requireNonNull(warningCollector, "warningCollector is null");
-            this.planOptimizersStatsCollector = requireNonNull(planOptimizersStatsCollector, "queryStatsCollector is null");
+            this.planOptimizersStatsCollector = requireNonNull(planOptimizersStatsCollector, "planOptimizersStatsCollector is null");
             this.statsCalculator = requireNonNull(statsCalculator, "statsCalculator is null");
         }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/rewrite/StatementRewrite.java b/core/trino-main/src/main/java/io/trino/sql/rewrite/StatementRewrite.java
index 668d100756fa..acaee083f1f1 100644
--- a/core/trino-main/src/main/java/io/trino/sql/rewrite/StatementRewrite.java
+++ b/core/trino-main/src/main/java/io/trino/sql/rewrite/StatementRewrite.java
@@ -14,6 +14,7 @@
 package io.trino.sql.rewrite;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.Session;
 import io.trino.execution.querystats.PlanOptimizersStatsCollector;
 import io.trino.execution.warnings.WarningCollector;
@@ -23,8 +24,6 @@
 import io.trino.sql.tree.Parameter;
 import io.trino.sql.tree.Statement;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutineAnalysis.java b/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutineAnalysis.java
new file mode 100644
index 000000000000..2c27383efd95
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutineAnalysis.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed 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 io.trino.sql.routine;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.spi.type.Type;
+import io.trino.sql.analyzer.Analysis;
+
+import java.util.Map;
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public record SqlRoutineAnalysis(
+        String name,
+        Map<String, Type> arguments,
+        Type returnType,
+        boolean calledOnNull,
+        boolean deterministic,
+        Optional<String> comment,
+        Analysis analysis)
+{
+    public SqlRoutineAnalysis
+    {
+        requireNonNull(name, "name is null");
+        arguments = ImmutableMap.copyOf(requireNonNull(arguments, "arguments is null"));
+        requireNonNull(returnType, "returnType is null");
+        requireNonNull(comment, "comment is null");
+        requireNonNull(analysis, "analysis is null");
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutineAnalyzer.java b/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutineAnalyzer.java
new file mode 100644
index 000000000000..ab6280785dae
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutineAnalyzer.java
@@ -0,0 +1,594 @@
+/*
+ * Licensed 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 io.trino.sql.routine;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.Session;
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.metadata.ResolvedFunction;
+import io.trino.security.AccessControl;
+import io.trino.spi.function.FunctionId;
+import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.Signature;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeNotFoundException;
+import io.trino.sql.PlannerContext;
+import io.trino.sql.analyzer.Analysis;
+import io.trino.sql.analyzer.CorrelationSupport;
+import io.trino.sql.analyzer.ExpressionAnalyzer;
+import io.trino.sql.analyzer.Field;
+import io.trino.sql.analyzer.QueryType;
+import io.trino.sql.analyzer.RelationId;
+import io.trino.sql.analyzer.RelationType;
+import io.trino.sql.analyzer.Scope;
+import io.trino.sql.analyzer.TypeSignatureTranslator;
+import io.trino.sql.tree.AssignmentStatement;
+import io.trino.sql.tree.AstVisitor;
+import io.trino.sql.tree.CaseStatement;
+import io.trino.sql.tree.CaseStatementWhenClause;
+import io.trino.sql.tree.CommentCharacteristic;
+import io.trino.sql.tree.CompoundStatement;
+import io.trino.sql.tree.ControlStatement;
+import io.trino.sql.tree.DataType;
+import io.trino.sql.tree.DeterministicCharacteristic;
+import io.trino.sql.tree.ElseClause;
+import io.trino.sql.tree.ElseIfClause;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.FunctionSpecification;
+import io.trino.sql.tree.Identifier;
+import io.trino.sql.tree.IfStatement;
+import io.trino.sql.tree.IterateStatement;
+import io.trino.sql.tree.LanguageCharacteristic;
+import io.trino.sql.tree.LeaveStatement;
+import io.trino.sql.tree.LoopStatement;
+import io.trino.sql.tree.Node;
+import io.trino.sql.tree.NullInputCharacteristic;
+import io.trino.sql.tree.ParameterDeclaration;
+import io.trino.sql.tree.RepeatStatement;
+import io.trino.sql.tree.ReturnStatement;
+import io.trino.sql.tree.ReturnsClause;
+import io.trino.sql.tree.SecurityCharacteristic;
+import io.trino.sql.tree.SecurityCharacteristic.Security;
+import io.trino.sql.tree.VariableDeclaration;
+import io.trino.sql.tree.WhileStatement;
+import io.trino.type.TypeCoercion;
+
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Iterables.getLast;
+import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
+import static io.trino.spi.StandardErrorCode.INVALID_ARGUMENTS;
+import static io.trino.spi.StandardErrorCode.MISSING_RETURN;
+import static io.trino.spi.StandardErrorCode.NOT_FOUND;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.StandardErrorCode.SYNTAX_ERROR;
+import static io.trino.spi.StandardErrorCode.TYPE_MISMATCH;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.sql.analyzer.SemanticExceptions.semanticException;
+import static io.trino.sql.analyzer.TypeSignatureTranslator.toTypeSignature;
+import static java.lang.String.format;
+import static java.util.Collections.nCopies;
+import static java.util.Objects.requireNonNull;
+import static java.util.function.Predicate.not;
+
+public class SqlRoutineAnalyzer
+{
+    private final PlannerContext plannerContext;
+    private final WarningCollector warningCollector;
+
+    public SqlRoutineAnalyzer(PlannerContext plannerContext, WarningCollector warningCollector)
+    {
+        this.plannerContext = requireNonNull(plannerContext, "plannerContext is null");
+        this.warningCollector = requireNonNull(warningCollector, "warningCollector is null");
+    }
+
+    public static FunctionMetadata extractFunctionMetadata(FunctionId functionId, FunctionSpecification function)
+    {
+        validateLanguage(function);
+        validateReturn(function);
+
+        String functionName = getFunctionName(function);
+        Signature.Builder signatureBuilder = Signature.builder()
+                .returnType(toTypeSignature(function.getReturnsClause().getReturnType()));
+
+        validateArguments(function);
+        function.getParameters().stream()
+                .map(ParameterDeclaration::getType)
+                .map(TypeSignatureTranslator::toTypeSignature)
+                .forEach(signatureBuilder::argumentType);
+        Signature signature = signatureBuilder.build();
+
+        FunctionMetadata.Builder builder = FunctionMetadata.scalarBuilder(functionName)
+                .functionId(functionId)
+                .signature(signature)
+                .nullable()
+                .argumentNullability(nCopies(signature.getArgumentTypes().size(), isCalledOnNull(function)));
+
+        getComment(function)
+                .filter(not(String::isBlank))
+                .ifPresentOrElse(builder::description, builder::noDescription);
+
+        if (!getDeterministic(function).orElse(true)) {
+            builder.nondeterministic();
+        }
+
+        validateSecurity(function);
+
+        return builder.build();
+    }
+
+    public SqlRoutineAnalysis analyze(Session session, AccessControl accessControl, FunctionSpecification function)
+    {
+        String functionName = getFunctionName(function);
+
+        validateLanguage(function);
+
+        boolean calledOnNull = isCalledOnNull(function);
+        Optional<String> comment = getComment(function);
+        validateSecurity(function);
+
+        ReturnsClause returnsClause = function.getReturnsClause();
+        Type returnType = getType(returnsClause, returnsClause.getReturnType());
+
+        Map<String, Type> arguments = getArguments(function);
+
+        validateReturn(function);
+
+        StatementVisitor visitor = new StatementVisitor(session, accessControl, returnType);
+        visitor.process(function.getStatement(), new Context(arguments, Set.of()));
+
+        Analysis analysis = visitor.getAnalysis();
+
+        boolean actuallyDeterministic = analysis.getResolvedFunctions().stream().allMatch(ResolvedFunction::isDeterministic);
+
+        boolean declaredDeterministic = getDeterministic(function).orElse(true);
+        if (!declaredDeterministic && actuallyDeterministic) {
+            throw semanticException(INVALID_ARGUMENTS, function, "Deterministic function declared NOT DETERMINISTIC");
+        }
+        if (declaredDeterministic && !actuallyDeterministic) {
+            throw semanticException(INVALID_ARGUMENTS, function, "Non-deterministic function declared DETERMINISTIC");
+        }
+
+        return new SqlRoutineAnalysis(
+                functionName,
+                arguments,
+                returnType,
+                calledOnNull,
+                actuallyDeterministic,
+                comment,
+                visitor.getAnalysis());
+    }
+
+    private static String getFunctionName(FunctionSpecification function)
+    {
+        String name = function.getName().getSuffix();
+        if (name.contains("@") || name.contains("$")) {
+            throw semanticException(NOT_SUPPORTED, function, "Function name cannot contain '@' or '$'");
+        }
+        return name;
+    }
+
+    private Type getType(Node node, DataType type)
+    {
+        try {
+            return plannerContext.getTypeManager().getType(toTypeSignature(type));
+        }
+        catch (TypeNotFoundException e) {
+            throw semanticException(TYPE_MISMATCH, node, "Unknown type: " + type);
+        }
+    }
+
+    private Map<String, Type> getArguments(FunctionSpecification function)
+    {
+        validateArguments(function);
+
+        Map<String, Type> arguments = new LinkedHashMap<>();
+        for (ParameterDeclaration parameter : function.getParameters()) {
+            arguments.put(
+                    identifierValue(parameter.getName().orElseThrow()),
+                    getType(parameter, parameter.getType()));
+        }
+        return arguments;
+    }
+
+    private static void validateArguments(FunctionSpecification function)
+    {
+        Set<String> argumentNames = new LinkedHashSet<>();
+        for (ParameterDeclaration parameter : function.getParameters()) {
+            if (parameter.getName().isEmpty()) {
+                throw semanticException(INVALID_ARGUMENTS, parameter, "Function parameters must have a name");
+            }
+            String name = identifierValue(parameter.getName().get());
+            if (!argumentNames.add(name)) {
+                throw semanticException(INVALID_ARGUMENTS, parameter, "Duplicate function parameter name: " + name);
+            }
+        }
+    }
+
+    private static Optional<String> getLanguage(FunctionSpecification function)
+    {
+        List<LanguageCharacteristic> language = function.getRoutineCharacteristics().stream()
+                .filter(LanguageCharacteristic.class::isInstance)
+                .map(LanguageCharacteristic.class::cast)
+                .collect(toImmutableList());
+
+        if (language.size() > 1) {
+            throw semanticException(SYNTAX_ERROR, function, "Multiple language clauses specified");
+        }
+
+        return language.stream()
+                .map(LanguageCharacteristic::getLanguage)
+                .map(Identifier::getValue)
+                .findAny();
+    }
+
+    private static void validateLanguage(FunctionSpecification function)
+    {
+        Optional<String> language = getLanguage(function);
+        if (language.isPresent() && !language.get().equalsIgnoreCase("sql")) {
+            throw semanticException(NOT_SUPPORTED, function, "Unsupported language: %s", language.get());
+        }
+    }
+
+    private static Optional<Boolean> getDeterministic(FunctionSpecification function)
+    {
+        List<DeterministicCharacteristic> deterministic = function.getRoutineCharacteristics().stream()
+                .filter(DeterministicCharacteristic.class::isInstance)
+                .map(DeterministicCharacteristic.class::cast)
+                .collect(toImmutableList());
+
+        if (deterministic.size() > 1) {
+            throw semanticException(SYNTAX_ERROR, function, "Multiple deterministic clauses specified");
+        }
+
+        return deterministic.stream()
+                .map(DeterministicCharacteristic::isDeterministic)
+                .findAny();
+    }
+
+    private static boolean isCalledOnNull(FunctionSpecification function)
+    {
+        List<NullInputCharacteristic> nullInput = function.getRoutineCharacteristics().stream()
+                .filter(NullInputCharacteristic.class::isInstance)
+                .map(NullInputCharacteristic.class::cast)
+                .collect(toImmutableList());
+
+        if (nullInput.size() > 1) {
+            throw semanticException(SYNTAX_ERROR, function, "Multiple null-call clauses specified");
+        }
+
+        return nullInput.stream()
+                .map(NullInputCharacteristic::isCalledOnNull)
+                .findAny()
+                .orElse(true);
+    }
+
+    public static boolean isRunAsInvoker(FunctionSpecification function)
+    {
+        List<SecurityCharacteristic> security = function.getRoutineCharacteristics().stream()
+                .filter(SecurityCharacteristic.class::isInstance)
+                .map(SecurityCharacteristic.class::cast)
+                .collect(toImmutableList());
+
+        if (security.size() > 1) {
+            throw semanticException(SYNTAX_ERROR, function, "Multiple security clauses specified");
+        }
+
+        return security.stream()
+                .map(SecurityCharacteristic::getSecurity)
+                .map(Security.INVOKER::equals)
+                .findAny()
+                .orElse(false);
+    }
+
+    private static void validateSecurity(FunctionSpecification function)
+    {
+        isRunAsInvoker(function);
+    }
+
+    private static Optional<String> getComment(FunctionSpecification function)
+    {
+        List<CommentCharacteristic> comment = function.getRoutineCharacteristics().stream()
+                .filter(CommentCharacteristic.class::isInstance)
+                .map(CommentCharacteristic.class::cast)
+                .collect(toImmutableList());
+
+        if (comment.size() > 1) {
+            throw semanticException(SYNTAX_ERROR, function, "Multiple comment clauses specified");
+        }
+
+        return comment.stream()
+                .map(CommentCharacteristic::getComment)
+                .findAny();
+    }
+
+    private static void validateReturn(FunctionSpecification function)
+    {
+        ControlStatement statement = function.getStatement();
+        if (statement instanceof ReturnStatement) {
+            return;
+        }
+
+        checkArgument(statement instanceof CompoundStatement, "invalid function statement: %s", statement);
+        CompoundStatement body = (CompoundStatement) statement;
+        if (!(getLast(body.getStatements(), null) instanceof ReturnStatement)) {
+            throw semanticException(MISSING_RETURN, body, "Function must end in a RETURN statement");
+        }
+    }
+
+    private class StatementVisitor
+            extends AstVisitor<Void, Context>
+    {
+        private final Session session;
+        private final AccessControl accessControl;
+        private final Type returnType;
+
+        private final Analysis analysis = new Analysis(null, ImmutableMap.of(), QueryType.OTHERS);
+        private final TypeCoercion typeCoercion = new TypeCoercion(plannerContext.getTypeManager()::getType);
+
+        public StatementVisitor(Session session, AccessControl accessControl, Type returnType)
+        {
+            this.session = requireNonNull(session, "session is null");
+            this.accessControl = requireNonNull(accessControl, "accessControl is null");
+            this.returnType = requireNonNull(returnType, "returnType is null");
+        }
+
+        public Analysis getAnalysis()
+        {
+            return analysis;
+        }
+
+        @Override
+        protected Void visitNode(Node node, Context context)
+        {
+            throw new UnsupportedOperationException("Analysis not yet implemented: " + node);
+        }
+
+        @Override
+        protected Void visitCompoundStatement(CompoundStatement node, Context context)
+        {
+            Context newContext = context.newScope();
+
+            for (VariableDeclaration declaration : node.getVariableDeclarations()) {
+                Type type = getType(declaration, declaration.getType());
+                analysis.addType(declaration.getType(), type);
+                declaration.getDefaultValue().ifPresent(value ->
+                        analyzeExpression(newContext, value, type, "Value of DEFAULT"));
+
+                for (Identifier name : declaration.getNames()) {
+                    if (newContext.variables().put(identifierValue(name), type) != null) {
+                        throw semanticException(ALREADY_EXISTS, name, "Variable already declared in this scope: %s", name);
+                    }
+                }
+            }
+
+            analyzeNodes(newContext, node.getStatements());
+
+            return null;
+        }
+
+        @Override
+        protected Void visitIfStatement(IfStatement node, Context context)
+        {
+            analyzeExpression(context, node.getExpression(), BOOLEAN, "Condition of IF statement");
+            analyzeNodes(context, node.getStatements());
+            analyzeNodes(context, node.getElseIfClauses());
+            node.getElseClause().ifPresent(statement -> process(statement, context));
+            return null;
+        }
+
+        @Override
+        protected Void visitElseIfClause(ElseIfClause node, Context context)
+        {
+            analyzeExpression(context, node.getExpression(), BOOLEAN, "Condition of ELSEIF clause");
+            analyzeNodes(context, node.getStatements());
+            return null;
+        }
+
+        @Override
+        protected Void visitElseClause(ElseClause node, Context context)
+        {
+            analyzeNodes(context, node.getStatements());
+            return null;
+        }
+
+        @Override
+        protected Void visitCaseStatement(CaseStatement node, Context context)
+        {
+            // when clause condition
+            if (node.getExpression().isPresent()) {
+                Type valueType = analyzeExpression(context, node.getExpression().get());
+                for (CaseStatementWhenClause whenClause : node.getWhenClauses()) {
+                    Type whenType = analyzeExpression(context, whenClause.getExpression());
+                    Optional<Type> superType = typeCoercion.getCommonSuperType(valueType, whenType);
+                    if (superType.isEmpty()) {
+                        throw semanticException(TYPE_MISMATCH, whenClause.getExpression(), "WHEN clause value must evaluate to CASE value type %s (actual: %s)", valueType, whenType);
+                    }
+                    if (!whenType.equals(superType.get())) {
+                        addCoercion(whenClause.getExpression(), whenType, superType.get());
+                    }
+                }
+            }
+            else {
+                for (CaseStatementWhenClause whenClause : node.getWhenClauses()) {
+                    analyzeExpression(context, whenClause.getExpression(), BOOLEAN, "Condition of WHEN clause");
+                }
+            }
+
+            // when clause body
+            for (CaseStatementWhenClause whenClause : node.getWhenClauses()) {
+                analyzeNodes(context, whenClause.getStatements());
+            }
+
+            // else clause body
+            if (node.getElseClause().isPresent()) {
+                process(node.getElseClause().get(), context);
+            }
+            return null;
+        }
+
+        @Override
+        protected Void visitWhileStatement(WhileStatement node, Context context)
+        {
+            Context newContext = context.newScope();
+            node.getLabel().ifPresent(name -> defineLabel(newContext, name));
+            analyzeExpression(newContext, node.getExpression(), BOOLEAN, "Condition of WHILE statement");
+            analyzeNodes(newContext, node.getStatements());
+            return null;
+        }
+
+        @Override
+        protected Void visitRepeatStatement(RepeatStatement node, Context context)
+        {
+            Context newContext = context.newScope();
+            node.getLabel().ifPresent(name -> defineLabel(newContext, name));
+            analyzeExpression(newContext, node.getCondition(), BOOLEAN, "Condition of REPEAT statement");
+            analyzeNodes(newContext, node.getStatements());
+            return null;
+        }
+
+        @Override
+        protected Void visitLoopStatement(LoopStatement node, Context context)
+        {
+            Context newContext = context.newScope();
+            node.getLabel().ifPresent(name -> defineLabel(newContext, name));
+            analyzeNodes(newContext, node.getStatements());
+            return null;
+        }
+
+        @Override
+        protected Void visitReturnStatement(ReturnStatement node, Context context)
+        {
+            analyzeExpression(context, node.getValue(), returnType, "Value of RETURN");
+            return null;
+        }
+
+        @Override
+        protected Void visitAssignmentStatement(AssignmentStatement node, Context context)
+        {
+            Identifier name = node.getTarget();
+            Type targetType = context.variables().get(identifierValue(name));
+            if (targetType == null) {
+                throw semanticException(NOT_FOUND, name, "Variable cannot be resolved: %s", name);
+            }
+            analyzeExpression(context, node.getValue(), targetType, format("Value of SET '%s'", name));
+            return null;
+        }
+
+        @Override
+        protected Void visitIterateStatement(IterateStatement node, Context context)
+        {
+            verifyLabelExists(context, node.getLabel());
+            return null;
+        }
+
+        @Override
+        protected Void visitLeaveStatement(LeaveStatement node, Context context)
+        {
+            verifyLabelExists(context, node.getLabel());
+            return null;
+        }
+
+        private void analyzeExpression(Context context, Expression expression, Type expectedType, String message)
+        {
+            Type actualType = analyzeExpression(context, expression);
+            if (actualType.equals(expectedType)) {
+                return;
+            }
+            if (!typeCoercion.canCoerce(actualType, expectedType)) {
+                throw semanticException(TYPE_MISMATCH, expression, message + " must evaluate to %s (actual: %s)", expectedType, actualType);
+            }
+
+            addCoercion(expression, actualType, expectedType);
+        }
+
+        private Type analyzeExpression(Context context, Expression expression)
+        {
+            List<Field> fields = context.variables().entrySet().stream()
+                    .map(entry -> Field.newUnqualified(entry.getKey(), entry.getValue()))
+                    .collect(toImmutableList());
+
+            Scope scope = Scope.builder()
+                    .withRelationType(RelationId.of(expression), new RelationType(fields))
+                    .build();
+
+            ExpressionAnalyzer.analyzeExpressionWithoutSubqueries(
+                    session,
+                    plannerContext,
+                    accessControl,
+                    scope,
+                    analysis,
+                    expression,
+                    NOT_SUPPORTED,
+                    "Queries are not allowed in functions",
+                    warningCollector,
+                    CorrelationSupport.DISALLOWED);
+
+            return analysis.getType(expression);
+        }
+
+        private void addCoercion(Expression expression, Type actualType, Type expectedType)
+        {
+            analysis.addCoercion(expression, expectedType, typeCoercion.isTypeOnlyCoercion(actualType, expectedType));
+        }
+
+        private void analyzeNodes(Context context, List<? extends Node> statements)
+        {
+            for (Node statement : statements) {
+                process(statement, context);
+            }
+        }
+
+        private static void defineLabel(Context context, Identifier name)
+        {
+            if (!context.labels().add(identifierValue(name))) {
+                throw semanticException(ALREADY_EXISTS, name, "Label already declared in this scope: %s", name);
+            }
+        }
+
+        private static void verifyLabelExists(Context context, Identifier name)
+        {
+            if (!context.labels().contains(identifierValue(name))) {
+                throw semanticException(NOT_FOUND, name, "Label not defined: %s", name);
+            }
+        }
+    }
+
+    private record Context(Map<String, Type> variables, Set<String> labels)
+    {
+        private Context
+        {
+            variables = new LinkedHashMap<>(variables);
+            labels = new LinkedHashSet<>(labels);
+        }
+
+        public Context newScope()
+        {
+            return new Context(variables, labels);
+        }
+    }
+
+    private static String identifierValue(Identifier name)
+    {
+        // TODO: this should use getCanonicalValue()
+        return name.getValue();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutineCompiler.java b/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutineCompiler.java
new file mode 100644
index 000000000000..c6bb848a977c
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutineCompiler.java
@@ -0,0 +1,591 @@
+/*
+ * Licensed 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 io.trino.sql.routine;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.VerifyException;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import io.airlift.bytecode.BytecodeBlock;
+import io.airlift.bytecode.BytecodeNode;
+import io.airlift.bytecode.ClassDefinition;
+import io.airlift.bytecode.DynamicClassLoader;
+import io.airlift.bytecode.MethodDefinition;
+import io.airlift.bytecode.Parameter;
+import io.airlift.bytecode.ParameterizedType;
+import io.airlift.bytecode.Scope;
+import io.airlift.bytecode.Variable;
+import io.airlift.bytecode.control.DoWhileLoop;
+import io.airlift.bytecode.control.IfStatement;
+import io.airlift.bytecode.control.WhileLoop;
+import io.airlift.bytecode.instruction.LabelNode;
+import io.trino.metadata.FunctionManager;
+import io.trino.operator.scalar.SpecializedSqlScalarFunction;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.InvocationConvention;
+import io.trino.spi.function.ScalarFunctionAdapter;
+import io.trino.spi.function.ScalarFunctionImplementation;
+import io.trino.spi.type.BooleanType;
+import io.trino.spi.type.Type;
+import io.trino.sql.gen.CachedInstanceBinder;
+import io.trino.sql.gen.CallSiteBinder;
+import io.trino.sql.gen.LambdaBytecodeGenerator.CompiledLambda;
+import io.trino.sql.gen.RowExpressionCompiler;
+import io.trino.sql.relational.CallExpression;
+import io.trino.sql.relational.ConstantExpression;
+import io.trino.sql.relational.InputReferenceExpression;
+import io.trino.sql.relational.LambdaDefinitionExpression;
+import io.trino.sql.relational.RowExpression;
+import io.trino.sql.relational.RowExpressionVisitor;
+import io.trino.sql.relational.SpecialForm;
+import io.trino.sql.relational.VariableReferenceExpression;
+import io.trino.sql.routine.ir.DefaultIrNodeVisitor;
+import io.trino.sql.routine.ir.IrBlock;
+import io.trino.sql.routine.ir.IrBreak;
+import io.trino.sql.routine.ir.IrContinue;
+import io.trino.sql.routine.ir.IrIf;
+import io.trino.sql.routine.ir.IrLabel;
+import io.trino.sql.routine.ir.IrLoop;
+import io.trino.sql.routine.ir.IrNode;
+import io.trino.sql.routine.ir.IrNodeVisitor;
+import io.trino.sql.routine.ir.IrRepeat;
+import io.trino.sql.routine.ir.IrReturn;
+import io.trino.sql.routine.ir.IrRoutine;
+import io.trino.sql.routine.ir.IrSet;
+import io.trino.sql.routine.ir.IrStatement;
+import io.trino.sql.routine.ir.IrVariable;
+import io.trino.sql.routine.ir.IrWhile;
+import io.trino.util.Reflection;
+
+import java.lang.invoke.MethodHandle;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static com.google.common.collect.MoreCollectors.onlyElement;
+import static com.google.common.primitives.Primitives.wrap;
+import static io.airlift.bytecode.Access.FINAL;
+import static io.airlift.bytecode.Access.PUBLIC;
+import static io.airlift.bytecode.Access.a;
+import static io.airlift.bytecode.Parameter.arg;
+import static io.airlift.bytecode.ParameterizedType.type;
+import static io.airlift.bytecode.expression.BytecodeExpressions.constantInt;
+import static io.airlift.bytecode.expression.BytecodeExpressions.constantString;
+import static io.airlift.bytecode.expression.BytecodeExpressions.greaterThanOrEqual;
+import static io.airlift.bytecode.expression.BytecodeExpressions.invokeStatic;
+import static io.airlift.bytecode.expression.BytecodeExpressions.newInstance;
+import static io.airlift.bytecode.instruction.Constant.loadBoolean;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
+import static io.trino.sql.gen.BytecodeUtils.boxPrimitiveIfNecessary;
+import static io.trino.sql.gen.BytecodeUtils.unboxPrimitiveIfNecessary;
+import static io.trino.sql.gen.LambdaBytecodeGenerator.preGenerateLambdaExpression;
+import static io.trino.sql.gen.LambdaExpressionExtractor.extractLambdaExpressions;
+import static io.trino.util.CompilerUtils.defineClass;
+import static io.trino.util.CompilerUtils.makeClassName;
+import static io.trino.util.Reflection.constructorMethodHandle;
+import static java.util.Arrays.stream;
+import static java.util.Objects.requireNonNull;
+import static java.util.function.Function.identity;
+
+public final class SqlRoutineCompiler
+{
+    private final FunctionManager functionManager;
+
+    public SqlRoutineCompiler(FunctionManager functionManager)
+    {
+        this.functionManager = requireNonNull(functionManager, "functionManager is null");
+    }
+
+    public SpecializedSqlScalarFunction compile(IrRoutine routine)
+    {
+        Type returnType = routine.returnType();
+        List<Type> parameterTypes = routine.parameters().stream()
+                .map(IrVariable::type)
+                .collect(toImmutableList());
+
+        InvocationConvention callingConvention = new InvocationConvention(
+                // todo this should be based on the declared nullability of the parameters
+                Collections.nCopies(parameterTypes.size(), BOXED_NULLABLE),
+                NULLABLE_RETURN,
+                true,
+                true);
+
+        Class<?> clazz = compileClass(routine);
+
+        MethodHandle handle = stream(clazz.getMethods())
+                .filter(method -> method.getName().equals("run"))
+                .map(Reflection::methodHandle)
+                .collect(onlyElement());
+
+        MethodHandle instanceFactory = constructorMethodHandle(clazz);
+
+        MethodHandle objectHandle = handle.asType(handle.type().changeParameterType(0, Object.class));
+        MethodHandle objectInstanceFactory = instanceFactory.asType(instanceFactory.type().changeReturnType(Object.class));
+
+        return invocationConvention -> {
+            MethodHandle adapted = ScalarFunctionAdapter.adapt(
+                    objectHandle,
+                    returnType,
+                    parameterTypes,
+                    callingConvention,
+                    invocationConvention);
+            return ScalarFunctionImplementation.builder()
+                    .methodHandle(adapted)
+                    .instanceFactory(objectInstanceFactory)
+                    .build();
+        };
+    }
+
+    @VisibleForTesting
+    public Class<?> compileClass(IrRoutine routine)
+    {
+        ClassDefinition classDefinition = new ClassDefinition(
+                a(PUBLIC, FINAL),
+                makeClassName("SqlRoutine"),
+                type(Object.class));
+
+        CallSiteBinder callSiteBinder = new CallSiteBinder();
+        CachedInstanceBinder cachedInstanceBinder = new CachedInstanceBinder(classDefinition, callSiteBinder);
+
+        Map<LambdaDefinitionExpression, CompiledLambda> compiledLambdaMap = generateMethodsForLambda(classDefinition, cachedInstanceBinder, routine);
+
+        generateRunMethod(classDefinition, cachedInstanceBinder, compiledLambdaMap, routine);
+
+        declareConstructor(classDefinition, cachedInstanceBinder);
+
+        return defineClass(classDefinition, Object.class, callSiteBinder.getBindings(), new DynamicClassLoader(getClass().getClassLoader()));
+    }
+
+    private Map<LambdaDefinitionExpression, CompiledLambda> generateMethodsForLambda(
+            ClassDefinition containerClassDefinition,
+            CachedInstanceBinder cachedInstanceBinder,
+            IrNode node)
+    {
+        Set<LambdaDefinitionExpression> lambdaExpressions = extractLambda(node);
+        ImmutableMap.Builder<LambdaDefinitionExpression, CompiledLambda> compiledLambdaMap = ImmutableMap.builder();
+        int counter = 0;
+        for (LambdaDefinitionExpression lambdaExpression : lambdaExpressions) {
+            CompiledLambda compiledLambda = preGenerateLambdaExpression(
+                    lambdaExpression,
+                    "lambda_" + counter,
+                    containerClassDefinition,
+                    compiledLambdaMap.buildOrThrow(),
+                    cachedInstanceBinder.getCallSiteBinder(),
+                    cachedInstanceBinder,
+                    functionManager);
+            compiledLambdaMap.put(lambdaExpression, compiledLambda);
+            counter++;
+        }
+        return compiledLambdaMap.buildOrThrow();
+    }
+
+    private void generateRunMethod(
+            ClassDefinition classDefinition,
+            CachedInstanceBinder cachedInstanceBinder,
+            Map<LambdaDefinitionExpression, CompiledLambda> compiledLambdaMap,
+            IrRoutine routine)
+    {
+        ImmutableList.Builder<Parameter> parameterBuilder = ImmutableList.builder();
+        parameterBuilder.add(arg("session", ConnectorSession.class));
+        for (IrVariable sqlVariable : routine.parameters()) {
+            parameterBuilder.add(arg(name(sqlVariable), compilerType(sqlVariable.type())));
+        }
+
+        MethodDefinition method = classDefinition.declareMethod(
+                a(PUBLIC),
+                "run",
+                compilerType(routine.returnType()),
+                parameterBuilder.build());
+
+        Scope scope = method.getScope();
+
+        scope.declareVariable(boolean.class, "wasNull");
+
+        Map<IrVariable, Variable> variables = VariableExtractor.extract(routine).stream().distinct()
+                .collect(toImmutableMap(identity(), variable -> getOrDeclareVariable(scope, variable)));
+
+        BytecodeVisitor visitor = new BytecodeVisitor(cachedInstanceBinder, compiledLambdaMap, variables);
+        method.getBody().append(visitor.process(routine, scope));
+    }
+
+    private static BytecodeNode throwIfInterrupted()
+    {
+        return new IfStatement()
+                .condition(invokeStatic(Thread.class, "currentThread", Thread.class)
+                        .invoke("isInterrupted", boolean.class))
+                .ifTrue(new BytecodeBlock()
+                        .append(newInstance(RuntimeException.class, constantString("Thread interrupted")))
+                        .throwObject());
+    }
+
+    private static void declareConstructor(ClassDefinition classDefinition, CachedInstanceBinder cachedInstanceBinder)
+    {
+        MethodDefinition constructorDefinition = classDefinition.declareConstructor(a(PUBLIC));
+        BytecodeBlock body = constructorDefinition.getBody();
+        body.append(constructorDefinition.getThis())
+                .invokeConstructor(Object.class);
+        cachedInstanceBinder.generateInitializations(constructorDefinition.getThis(), body);
+        body.ret();
+    }
+
+    private static Variable getOrDeclareVariable(Scope scope, IrVariable variable)
+    {
+        return getOrDeclareVariable(scope, compilerType(variable.type()), name(variable));
+    }
+
+    private static Variable getOrDeclareVariable(Scope scope, ParameterizedType type, String name)
+    {
+        try {
+            return scope.getVariable(name);
+        }
+        catch (IllegalArgumentException e) {
+            return scope.declareVariable(type, name);
+        }
+    }
+
+    private static ParameterizedType compilerType(Type type)
+    {
+        return type(wrap(type.getJavaType()));
+    }
+
+    private static String name(IrVariable variable)
+    {
+        return name(variable.field());
+    }
+
+    private static String name(int field)
+    {
+        return "v" + field;
+    }
+
+    private class BytecodeVisitor
+            implements IrNodeVisitor<Scope, BytecodeNode>
+    {
+        private final CachedInstanceBinder cachedInstanceBinder;
+        private final Map<LambdaDefinitionExpression, CompiledLambda> compiledLambdaMap;
+        private final Map<IrVariable, Variable> variables;
+
+        private final Map<IrLabel, LabelNode> continueLabels = new IdentityHashMap<>();
+        private final Map<IrLabel, LabelNode> breakLabels = new IdentityHashMap<>();
+
+        public BytecodeVisitor(
+                CachedInstanceBinder cachedInstanceBinder,
+                Map<LambdaDefinitionExpression, CompiledLambda> compiledLambdaMap,
+                Map<IrVariable, Variable> variables)
+        {
+            this.cachedInstanceBinder = requireNonNull(cachedInstanceBinder, "cachedInstanceBinder is null");
+            this.compiledLambdaMap = requireNonNull(compiledLambdaMap, "compiledLambdaMap is null");
+            this.variables = requireNonNull(variables, "variables is null");
+        }
+
+        @Override
+        public BytecodeNode visitNode(IrNode node, Scope context)
+        {
+            throw new VerifyException("Unsupported node: " + node.getClass().getSimpleName());
+        }
+
+        @Override
+        public BytecodeNode visitRoutine(IrRoutine node, Scope scope)
+        {
+            return process(node.body(), scope);
+        }
+
+        @Override
+        public BytecodeNode visitSet(IrSet node, Scope scope)
+        {
+            return new BytecodeBlock()
+                    .append(compile(node.value(), scope))
+                    .putVariable(variables.get(node.target()));
+        }
+
+        @Override
+        public BytecodeNode visitBlock(IrBlock node, Scope scope)
+        {
+            BytecodeBlock block = new BytecodeBlock();
+
+            for (IrVariable sqlVariable : node.variables()) {
+                block.append(compile(sqlVariable.defaultValue(), scope))
+                        .putVariable(variables.get(sqlVariable));
+            }
+
+            LabelNode continueLabel = new LabelNode("continue");
+            LabelNode breakLabel = new LabelNode("break");
+
+            if (node.label().isPresent()) {
+                continueLabels.put(node.label().get(), continueLabel);
+                breakLabels.put(node.label().get(), breakLabel);
+                block.visitLabel(continueLabel);
+            }
+
+            for (IrStatement statement : node.statements()) {
+                block.append(process(statement, scope));
+            }
+
+            if (node.label().isPresent()) {
+                block.visitLabel(breakLabel);
+            }
+
+            return block;
+        }
+
+        @Override
+        public BytecodeNode visitReturn(IrReturn node, Scope scope)
+        {
+            return new BytecodeBlock()
+                    .append(compile(node.value(), scope))
+                    .ret(wrap(node.value().getType().getJavaType()));
+        }
+
+        @Override
+        public BytecodeNode visitContinue(IrContinue node, Scope scope)
+        {
+            LabelNode label = continueLabels.get(node.target());
+            verify(label != null, "continue target does not exist");
+            return new BytecodeBlock()
+                    .gotoLabel(label);
+        }
+
+        @Override
+        public BytecodeNode visitBreak(IrBreak node, Scope scope)
+        {
+            LabelNode label = breakLabels.get(node.target());
+            verify(label != null, "break target does not exist");
+            return new BytecodeBlock()
+                    .gotoLabel(label);
+        }
+
+        @Override
+        public BytecodeNode visitIf(IrIf node, Scope scope)
+        {
+            IfStatement ifStatement = new IfStatement()
+                    .condition(compileBoolean(node.condition(), scope))
+                    .ifTrue(process(node.ifTrue(), scope));
+
+            if (node.ifFalse().isPresent()) {
+                ifStatement.ifFalse(process(node.ifFalse().get(), scope));
+            }
+
+            return ifStatement;
+        }
+
+        @Override
+        public BytecodeNode visitWhile(IrWhile node, Scope scope)
+        {
+            return compileLoop(scope, node.label(), interruption -> new WhileLoop()
+                    .condition(compileBoolean(node.condition(), scope))
+                    .body(new BytecodeBlock()
+                            .append(interruption)
+                            .append(process(node.body(), scope))));
+        }
+
+        @Override
+        public BytecodeNode visitRepeat(IrRepeat node, Scope scope)
+        {
+            return compileLoop(scope, node.label(), interruption -> new DoWhileLoop()
+                    .condition(not(compileBoolean(node.condition(), scope)))
+                    .body(new BytecodeBlock()
+                            .append(interruption)
+                            .append(process(node.block(), scope))));
+        }
+
+        @Override
+        public BytecodeNode visitLoop(IrLoop node, Scope scope)
+        {
+            return compileLoop(scope, node.label(), interruption -> new WhileLoop()
+                    .condition(loadBoolean(true))
+                    .body(new BytecodeBlock()
+                            .append(interruption)
+                            .append(process(node.block(), scope))));
+        }
+
+        private BytecodeNode compileLoop(Scope scope, Optional<IrLabel> label, Function<BytecodeBlock, BytecodeNode> loop)
+        {
+            BytecodeBlock block = new BytecodeBlock();
+
+            Variable interruption = scope.createTempVariable(int.class);
+            block.putVariable(interruption, 0);
+
+            BytecodeBlock interruptionBlock = new BytecodeBlock()
+                    .append(interruption.increment())
+                    .append(new IfStatement()
+                            .condition(greaterThanOrEqual(interruption, constantInt(1000)))
+                            .ifTrue(new BytecodeBlock()
+                                    .append(interruption.set(constantInt(0)))
+                                    .append(throwIfInterrupted())));
+
+            LabelNode continueLabel = new LabelNode("continue");
+            LabelNode breakLabel = new LabelNode("break");
+
+            if (label.isPresent()) {
+                continueLabels.put(label.get(), continueLabel);
+                breakLabels.put(label.get(), breakLabel);
+                block.visitLabel(continueLabel);
+            }
+
+            block.append(loop.apply(interruptionBlock));
+
+            if (label.isPresent()) {
+                block.visitLabel(breakLabel);
+            }
+
+            return block;
+        }
+
+        private BytecodeNode compile(RowExpression expression, Scope scope)
+        {
+            if (expression instanceof InputReferenceExpression input) {
+                return scope.getVariable(name(input.getField()));
+            }
+
+            RowExpressionCompiler rowExpressionCompiler = new RowExpressionCompiler(
+                    cachedInstanceBinder.getCallSiteBinder(),
+                    cachedInstanceBinder,
+                    FieldReferenceCompiler.INSTANCE,
+                    functionManager,
+                    compiledLambdaMap);
+
+            return new BytecodeBlock()
+                    .comment("boolean wasNull = false;")
+                    .putVariable(scope.getVariable("wasNull"), expression.getType().getJavaType() == void.class)
+                    .comment("expression: " + expression)
+                    .append(rowExpressionCompiler.compile(expression, scope))
+                    .append(boxPrimitiveIfNecessary(scope, wrap(expression.getType().getJavaType())));
+        }
+
+        private BytecodeNode compileBoolean(RowExpression expression, Scope scope)
+        {
+            checkArgument(expression.getType().equals(BooleanType.BOOLEAN), "type must be boolean");
+
+            LabelNode notNull = new LabelNode("notNull");
+            LabelNode done = new LabelNode("done");
+
+            return new BytecodeBlock()
+                    .append(compile(expression, scope))
+                    .comment("if value is null, return false, otherwise unbox")
+                    .dup()
+                    .ifNotNullGoto(notNull)
+                    .pop()
+                    .push(false)
+                    .gotoLabel(done)
+                    .visitLabel(notNull)
+                    .invokeVirtual(Boolean.class, "booleanValue", boolean.class)
+                    .visitLabel(done);
+        }
+
+        private static BytecodeNode not(BytecodeNode node)
+        {
+            LabelNode trueLabel = new LabelNode("true");
+            LabelNode endLabel = new LabelNode("end");
+            return new BytecodeBlock()
+                    .append(node)
+                    .comment("boolean not")
+                    .ifTrueGoto(trueLabel)
+                    .push(true)
+                    .gotoLabel(endLabel)
+                    .visitLabel(trueLabel)
+                    .push(false)
+                    .visitLabel(endLabel);
+        }
+    }
+
+    private static Set<LambdaDefinitionExpression> extractLambda(IrNode node)
+    {
+        ImmutableSet.Builder<LambdaDefinitionExpression> expressions = ImmutableSet.builder();
+        node.accept(new DefaultIrNodeVisitor()
+        {
+            @Override
+            public void visitRowExpression(RowExpression expression)
+            {
+                expressions.addAll(extractLambdaExpressions(expression));
+            }
+        }, null);
+        return expressions.build();
+    }
+
+    private static class FieldReferenceCompiler
+            implements RowExpressionVisitor<BytecodeNode, Scope>
+    {
+        public static final FieldReferenceCompiler INSTANCE = new FieldReferenceCompiler();
+
+        @Override
+        public BytecodeNode visitInputReference(InputReferenceExpression node, Scope scope)
+        {
+            Class<?> boxedType = wrap(node.getType().getJavaType());
+            return new BytecodeBlock()
+                    .append(scope.getVariable(name(node.getField())))
+                    .append(unboxPrimitiveIfNecessary(scope, boxedType));
+        }
+
+        @Override
+        public BytecodeNode visitCall(CallExpression call, Scope scope)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public BytecodeNode visitSpecialForm(SpecialForm specialForm, Scope context)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public BytecodeNode visitConstant(ConstantExpression literal, Scope scope)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public BytecodeNode visitLambda(LambdaDefinitionExpression lambda, Scope context)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public BytecodeNode visitVariableReference(VariableReferenceExpression reference, Scope context)
+        {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    private static class VariableExtractor
+            extends DefaultIrNodeVisitor
+    {
+        private final List<IrVariable> variables = new ArrayList<>();
+
+        @Override
+        public Void visitVariable(IrVariable node, Void context)
+        {
+            variables.add(node);
+            return null;
+        }
+
+        public static List<IrVariable> extract(IrNode node)
+        {
+            VariableExtractor extractor = new VariableExtractor();
+            extractor.process(node, null);
+            return extractor.variables;
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutinePlanner.java b/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutinePlanner.java
new file mode 100644
index 000000000000..1b3518e3e2b3
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/SqlRoutinePlanner.java
@@ -0,0 +1,465 @@
+/*
+ * Licensed 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 io.trino.sql.routine;
+
+import com.google.common.base.VerifyException;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import io.trino.Session;
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.ResolvedFunction;
+import io.trino.security.AllowAllAccessControl;
+import io.trino.spi.type.Type;
+import io.trino.sql.PlannerContext;
+import io.trino.sql.analyzer.Analysis;
+import io.trino.sql.analyzer.ExpressionAnalyzer;
+import io.trino.sql.analyzer.Field;
+import io.trino.sql.analyzer.RelationId;
+import io.trino.sql.analyzer.RelationType;
+import io.trino.sql.analyzer.Scope;
+import io.trino.sql.planner.ExpressionInterpreter;
+import io.trino.sql.planner.LiteralEncoder;
+import io.trino.sql.planner.NoOpSymbolResolver;
+import io.trino.sql.planner.Symbol;
+import io.trino.sql.planner.SymbolAllocator;
+import io.trino.sql.planner.TranslationMap;
+import io.trino.sql.planner.TypeProvider;
+import io.trino.sql.planner.iterative.rule.LambdaCaptureDesugaringRewriter;
+import io.trino.sql.planner.sanity.SugarFreeChecker;
+import io.trino.sql.relational.RowExpression;
+import io.trino.sql.relational.SqlToRowExpressionTranslator;
+import io.trino.sql.relational.StandardFunctionResolution;
+import io.trino.sql.relational.optimizer.ExpressionOptimizer;
+import io.trino.sql.routine.ir.IrBlock;
+import io.trino.sql.routine.ir.IrBreak;
+import io.trino.sql.routine.ir.IrContinue;
+import io.trino.sql.routine.ir.IrIf;
+import io.trino.sql.routine.ir.IrLabel;
+import io.trino.sql.routine.ir.IrLoop;
+import io.trino.sql.routine.ir.IrRepeat;
+import io.trino.sql.routine.ir.IrReturn;
+import io.trino.sql.routine.ir.IrRoutine;
+import io.trino.sql.routine.ir.IrSet;
+import io.trino.sql.routine.ir.IrStatement;
+import io.trino.sql.routine.ir.IrVariable;
+import io.trino.sql.routine.ir.IrWhile;
+import io.trino.sql.tree.AssignmentStatement;
+import io.trino.sql.tree.AstVisitor;
+import io.trino.sql.tree.CaseStatement;
+import io.trino.sql.tree.CaseStatementWhenClause;
+import io.trino.sql.tree.Cast;
+import io.trino.sql.tree.CompoundStatement;
+import io.trino.sql.tree.ControlStatement;
+import io.trino.sql.tree.ElseIfClause;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.FunctionSpecification;
+import io.trino.sql.tree.Identifier;
+import io.trino.sql.tree.IfStatement;
+import io.trino.sql.tree.IterateStatement;
+import io.trino.sql.tree.LambdaArgumentDeclaration;
+import io.trino.sql.tree.LeaveStatement;
+import io.trino.sql.tree.LoopStatement;
+import io.trino.sql.tree.Node;
+import io.trino.sql.tree.NodeRef;
+import io.trino.sql.tree.RepeatStatement;
+import io.trino.sql.tree.ReturnStatement;
+import io.trino.sql.tree.SymbolReference;
+import io.trino.sql.tree.VariableDeclaration;
+import io.trino.sql.tree.WhileStatement;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
+import static io.trino.sql.planner.LogicalPlanner.buildLambdaDeclarationToSymbolMap;
+import static io.trino.sql.relational.Expressions.call;
+import static io.trino.sql.relational.Expressions.constantNull;
+import static io.trino.sql.relational.Expressions.field;
+import static io.trino.sql.tree.ComparisonExpression.Operator.EQUAL;
+import static java.util.Objects.requireNonNull;
+
+public final class SqlRoutinePlanner
+{
+    private final PlannerContext plannerContext;
+    private final WarningCollector warningCollector;
+
+    public SqlRoutinePlanner(PlannerContext plannerContext, WarningCollector warningCollector)
+    {
+        this.plannerContext = requireNonNull(plannerContext, "plannerContext is null");
+        this.warningCollector = requireNonNull(warningCollector, "warningCollector is null");
+    }
+
+    public IrRoutine planSqlFunction(Session session, FunctionSpecification function, SqlRoutineAnalysis routineAnalysis)
+    {
+        List<IrVariable> allVariables = new ArrayList<>();
+        Map<String, IrVariable> scopeVariables = new LinkedHashMap<>();
+
+        ImmutableList.Builder<IrVariable> parameters = ImmutableList.builder();
+        routineAnalysis.arguments().forEach((name, type) -> {
+            IrVariable variable = new IrVariable(allVariables.size(), type, constantNull(type));
+            allVariables.add(variable);
+            scopeVariables.put(name, variable);
+            parameters.add(variable);
+        });
+
+        Analysis analysis = routineAnalysis.analysis();
+        StatementVisitor visitor = new StatementVisitor(session, allVariables, analysis);
+        IrStatement body = visitor.process(function.getStatement(), new Context(scopeVariables, Map.of()));
+
+        return new IrRoutine(routineAnalysis.returnType(), parameters.build(), body);
+    }
+
+    private class StatementVisitor
+            extends AstVisitor<IrStatement, Context>
+    {
+        private final Session session;
+        private final List<IrVariable> allVariables;
+        private final Analysis analysis;
+        private final StandardFunctionResolution resolution;
+
+        public StatementVisitor(
+                Session session,
+                List<IrVariable> allVariables,
+                Analysis analysis)
+        {
+            this.session = requireNonNull(session, "session is null");
+            this.resolution = new StandardFunctionResolution(plannerContext.getMetadata());
+            this.allVariables = requireNonNull(allVariables, "allVariables is null");
+            this.analysis = requireNonNull(analysis, "analysis is null");
+        }
+
+        @Override
+        protected IrStatement visitNode(Node node, Context context)
+        {
+            throw new UnsupportedOperationException("Not implemented: " + node);
+        }
+
+        @Override
+        protected IrStatement visitCompoundStatement(CompoundStatement node, Context context)
+        {
+            Context newContext = context.newScope();
+
+            ImmutableList.Builder<IrVariable> blockVariables = ImmutableList.builder();
+            for (VariableDeclaration declaration : node.getVariableDeclarations()) {
+                Type type = analysis.getType(declaration.getType());
+                RowExpression defaultValue = declaration.getDefaultValue()
+                        .map(expression -> toRowExpression(newContext, expression))
+                        .orElse(constantNull(type));
+
+                for (Identifier name : declaration.getNames()) {
+                    IrVariable variable = new IrVariable(allVariables.size(), type, defaultValue);
+                    allVariables.add(variable);
+                    verify(newContext.variables().put(identifierValue(name), variable) == null, "Variable already declared in scope: %s", name);
+                    blockVariables.add(variable);
+                }
+            }
+
+            List<IrStatement> statements = node.getStatements().stream()
+                    .map(statement -> process(statement, newContext))
+                    .collect(toImmutableList());
+
+            return new IrBlock(blockVariables.build(), statements);
+        }
+
+        @Override
+        protected IrStatement visitIfStatement(IfStatement node, Context context)
+        {
+            IrStatement statement = null;
+
+            List<ElseIfClause> elseIfList = Lists.reverse(node.getElseIfClauses());
+            for (int i = 0; i < elseIfList.size(); i++) {
+                ElseIfClause elseIf = elseIfList.get(i);
+                RowExpression condition = toRowExpression(context, elseIf.getExpression());
+                IrStatement ifTrue = block(statements(elseIf.getStatements(), context));
+
+                Optional<IrStatement> ifFalse = Optional.empty();
+                if ((i == 0) && node.getElseClause().isPresent()) {
+                    List<ControlStatement> elseList = node.getElseClause().get().getStatements();
+                    ifFalse = Optional.of(block(statements(elseList, context)));
+                }
+                else if (statement != null) {
+                    ifFalse = Optional.of(statement);
+                }
+
+                statement = new IrIf(condition, ifTrue, ifFalse);
+            }
+
+            return new IrIf(
+                    toRowExpression(context, node.getExpression()),
+                    block(statements(node.getStatements(), context)),
+                    Optional.ofNullable(statement));
+        }
+
+        @Override
+        protected IrStatement visitCaseStatement(CaseStatement node, Context context)
+        {
+            if (node.getExpression().isPresent()) {
+                RowExpression valueExpression = toRowExpression(context, node.getExpression().get());
+                IrVariable valueVariable = new IrVariable(allVariables.size(), valueExpression.getType(), valueExpression);
+
+                IrStatement statement = node.getElseClause()
+                        .map(elseClause -> block(statements(elseClause.getStatements(), context)))
+                        .orElseGet(() -> new IrBlock(ImmutableList.of(), ImmutableList.of()));
+
+                for (CaseStatementWhenClause whenClause : Lists.reverse(node.getWhenClauses())) {
+                    RowExpression conditionValue = toRowExpression(context, whenClause.getExpression());
+
+                    RowExpression testValue = field(valueVariable.field(), valueVariable.type());
+                    if (!testValue.getType().equals(conditionValue.getType())) {
+                        ResolvedFunction castFunction = plannerContext.getMetadata().getCoercion(testValue.getType(), conditionValue.getType());
+                        testValue = call(castFunction, testValue);
+                    }
+
+                    ResolvedFunction equals = resolution.comparisonFunction(EQUAL, testValue.getType(), conditionValue.getType());
+                    RowExpression condition = call(equals, testValue, conditionValue);
+
+                    IrStatement ifTrue = block(statements(whenClause.getStatements(), context));
+                    statement = new IrIf(condition, ifTrue, Optional.of(statement));
+                }
+                return new IrBlock(ImmutableList.of(valueVariable), ImmutableList.of(statement));
+            }
+
+            IrStatement statement = node.getElseClause()
+                    .map(elseClause -> block(statements(elseClause.getStatements(), context)))
+                    .orElseGet(() -> new IrBlock(ImmutableList.of(), ImmutableList.of()));
+
+            for (CaseStatementWhenClause whenClause : Lists.reverse(node.getWhenClauses())) {
+                RowExpression condition = toRowExpression(context, whenClause.getExpression());
+                IrStatement ifTrue = block(statements(whenClause.getStatements(), context));
+                statement = new IrIf(condition, ifTrue, Optional.of(statement));
+            }
+
+            return statement;
+        }
+
+        @Override
+        protected IrStatement visitWhileStatement(WhileStatement node, Context context)
+        {
+            Context newContext = context.newScope();
+            Optional<IrLabel> label = getSqlLabel(newContext, node.getLabel());
+            RowExpression condition = toRowExpression(newContext, node.getExpression());
+            List<IrStatement> statements = statements(node.getStatements(), newContext);
+            return new IrWhile(label, condition, block(statements));
+        }
+
+        @Override
+        protected IrStatement visitRepeatStatement(RepeatStatement node, Context context)
+        {
+            Context newContext = context.newScope();
+            Optional<IrLabel> label = getSqlLabel(newContext, node.getLabel());
+            RowExpression condition = toRowExpression(newContext, node.getCondition());
+            List<IrStatement> statements = statements(node.getStatements(), newContext);
+            return new IrRepeat(label, condition, block(statements));
+        }
+
+        @Override
+        protected IrStatement visitLoopStatement(LoopStatement node, Context context)
+        {
+            Context newContext = context.newScope();
+            Optional<IrLabel> label = getSqlLabel(newContext, node.getLabel());
+            List<IrStatement> statements = statements(node.getStatements(), newContext);
+            return new IrLoop(label, block(statements));
+        }
+
+        @Override
+        protected IrStatement visitReturnStatement(ReturnStatement node, Context context)
+        {
+            return new IrReturn(toRowExpression(context, node.getValue()));
+        }
+
+        @Override
+        protected IrStatement visitAssignmentStatement(AssignmentStatement node, Context context)
+        {
+            Identifier name = node.getTarget();
+            IrVariable target = context.variables().get(identifierValue(name));
+            checkArgument(target != null, "Variable not declared in scope: %s", name);
+            return new IrSet(target, toRowExpression(context, node.getValue()));
+        }
+
+        @Override
+        protected IrStatement visitIterateStatement(IterateStatement node, Context context)
+        {
+            return new IrContinue(label(context, node.getLabel()));
+        }
+
+        @Override
+        protected IrStatement visitLeaveStatement(LeaveStatement node, Context context)
+        {
+            return new IrBreak(label(context, node.getLabel()));
+        }
+
+        private static Optional<IrLabel> getSqlLabel(Context context, Optional<Identifier> labelName)
+        {
+            return labelName.map(name -> {
+                IrLabel label = new IrLabel(identifierValue(name));
+                verify(context.labels().put(identifierValue(name), label) == null, "Label already declared in this scope: %s", name);
+                return label;
+            });
+        }
+
+        private static IrLabel label(Context context, Identifier name)
+        {
+            IrLabel label = context.labels().get(identifierValue(name));
+            checkArgument(label != null, "Label not defined: %s", name);
+            return label;
+        }
+
+        private RowExpression toRowExpression(Context context, Expression expression)
+        {
+            // build symbol and field indexes for translation
+            TypeProvider typeProvider = TypeProvider.viewOf(
+                    context.variables().entrySet().stream().collect(toImmutableMap(
+                            entry -> new Symbol(entry.getKey()),
+                            entry -> entry.getValue().type())));
+
+            List<Field> fields = context.variables().entrySet().stream()
+                    .map(entry -> Field.newUnqualified(entry.getKey(), entry.getValue().type()))
+                    .collect(toImmutableList());
+
+            Scope scope = Scope.builder()
+                    .withRelationType(RelationId.of(expression), new RelationType(fields))
+                    .build();
+
+            SymbolAllocator symbolAllocator = new SymbolAllocator();
+            List<Symbol> fieldSymbols = fields.stream()
+                    .map(symbolAllocator::newSymbol)
+                    .collect(toImmutableList());
+
+            Map<NodeRef<LambdaArgumentDeclaration>, Symbol> nodeRefSymbolMap = buildLambdaDeclarationToSymbolMap(analysis, symbolAllocator);
+
+            // Apply casts, desugar expression, and preform other rewrites
+            TranslationMap translationMap = new TranslationMap(Optional.empty(), scope, analysis, nodeRefSymbolMap, fieldSymbols, session, plannerContext);
+            Expression translated = coerceIfNecessary(analysis, expression, translationMap.rewrite(expression));
+
+            // desugar the lambda captures
+            Expression lambdaCaptureDesugared = LambdaCaptureDesugaringRewriter.rewrite(translated, typeProvider, symbolAllocator);
+
+            // The expression tree has been rewritten which breaks all the identity maps, so redo the analysis
+            // to re-analyze coercions that might be necessary
+            ExpressionAnalyzer analyzer = createExpressionAnalyzer(session, typeProvider);
+            analyzer.analyze(lambdaCaptureDesugared, scope);
+
+            // optimize the expression
+            ExpressionInterpreter interpreter = new ExpressionInterpreter(lambdaCaptureDesugared, plannerContext, session, analyzer.getExpressionTypes());
+            Expression optimized = new LiteralEncoder(plannerContext)
+                    .toExpression(interpreter.optimize(NoOpSymbolResolver.INSTANCE), analyzer.getExpressionTypes().get(NodeRef.of(lambdaCaptureDesugared)));
+
+            // validate expression
+            SugarFreeChecker.validate(optimized);
+
+            // Analyze again after optimization
+            analyzer = createExpressionAnalyzer(session, typeProvider);
+            analyzer.analyze(optimized, scope);
+
+            // translate to RowExpression
+            TranslationVisitor translator = new TranslationVisitor(plannerContext.getMetadata(), analyzer.getExpressionTypes(), ImmutableMap.of(), context.variables());
+            RowExpression rowExpression = translator.process(optimized, null);
+
+            // optimize RowExpression
+            ExpressionOptimizer optimizer = new ExpressionOptimizer(plannerContext.getMetadata(), plannerContext.getFunctionManager(), session);
+            rowExpression = optimizer.optimize(rowExpression);
+
+            return rowExpression;
+        }
+
+        public static Expression coerceIfNecessary(Analysis analysis, Expression original, Expression rewritten)
+        {
+            Type coercion = analysis.getCoercion(original);
+            if (coercion == null) {
+                return rewritten;
+            }
+            return new Cast(rewritten, toSqlType(coercion), false, analysis.isTypeOnlyCoercion(original));
+        }
+
+        private ExpressionAnalyzer createExpressionAnalyzer(Session session, TypeProvider typeProvider)
+        {
+            return ExpressionAnalyzer.createWithoutSubqueries(
+                    plannerContext,
+                    new AllowAllAccessControl(),
+                    session,
+                    typeProvider,
+                    ImmutableMap.of(),
+                    node -> new VerifyException("Unexpected subquery"),
+                    warningCollector,
+                    false);
+        }
+
+        private List<IrStatement> statements(List<ControlStatement> statements, Context context)
+        {
+            return statements.stream()
+                    .map(statement -> process(statement, context))
+                    .collect(toImmutableList());
+        }
+
+        private static IrBlock block(List<IrStatement> statements)
+        {
+            return new IrBlock(ImmutableList.of(), statements);
+        }
+
+        private static String identifierValue(Identifier name)
+        {
+            // TODO: this should use getCanonicalValue()
+            return name.getValue();
+        }
+    }
+
+    private record Context(Map<String, IrVariable> variables, Map<String, IrLabel> labels)
+    {
+        public Context
+        {
+            variables = new LinkedHashMap<>(variables);
+            labels = new LinkedHashMap<>(labels);
+        }
+
+        public Context newScope()
+        {
+            return new Context(variables, labels);
+        }
+    }
+
+    private static class TranslationVisitor
+            extends SqlToRowExpressionTranslator.Visitor
+    {
+        private final Map<String, IrVariable> variables;
+
+        public TranslationVisitor(
+                Metadata metadata,
+                Map<NodeRef<Expression>, Type> types,
+                Map<Symbol, Integer> layout,
+                Map<String, IrVariable> variables)
+        {
+            super(metadata, types, layout);
+            this.variables = requireNonNull(variables, "variables is null");
+        }
+
+        @Override
+        protected RowExpression visitSymbolReference(SymbolReference node, Void context)
+        {
+            IrVariable variable = variables.get(node.getName());
+            if (variable != null) {
+                return field(variable.field(), variable.type());
+            }
+            return super.visitSymbolReference(node, context);
+        }
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/DefaultIrNodeVisitor.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/DefaultIrNodeVisitor.java
new file mode 100644
index 000000000000..1de92820096e
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/DefaultIrNodeVisitor.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import io.trino.sql.relational.RowExpression;
+
+public class DefaultIrNodeVisitor
+        implements IrNodeVisitor<Void, Void>
+{
+    @Override
+    public Void visitRoutine(IrRoutine node, Void context)
+    {
+        for (IrVariable parameter : node.parameters()) {
+            process(parameter, context);
+        }
+        process(node.body(), context);
+        return null;
+    }
+
+    @Override
+    public Void visitVariable(IrVariable node, Void context)
+    {
+        visitRowExpression(node.defaultValue());
+        return null;
+    }
+
+    @Override
+    public Void visitBlock(IrBlock node, Void context)
+    {
+        for (IrVariable variable : node.variables()) {
+            process(variable, context);
+        }
+        for (IrStatement statement : node.statements()) {
+            process(statement, context);
+        }
+        return null;
+    }
+
+    @Override
+    public Void visitBreak(IrBreak node, Void context)
+    {
+        return null;
+    }
+
+    @Override
+    public Void visitContinue(IrContinue node, Void context)
+    {
+        return null;
+    }
+
+    @Override
+    public Void visitIf(IrIf node, Void context)
+    {
+        visitRowExpression(node.condition());
+        process(node.ifTrue(), context);
+        if (node.ifFalse().isPresent()) {
+            process(node.ifFalse().get(), context);
+        }
+        return null;
+    }
+
+    @Override
+    public Void visitWhile(IrWhile node, Void context)
+    {
+        visitRowExpression(node.condition());
+        process(node.body(), context);
+        return null;
+    }
+
+    @Override
+    public Void visitRepeat(IrRepeat node, Void context)
+    {
+        visitRowExpression(node.condition());
+        process(node.block(), context);
+        return null;
+    }
+
+    @Override
+    public Void visitLoop(IrLoop node, Void context)
+    {
+        process(node.block(), context);
+        return null;
+    }
+
+    @Override
+    public Void visitReturn(IrReturn node, Void context)
+    {
+        visitRowExpression(node.value());
+        return null;
+    }
+
+    @Override
+    public Void visitSet(IrSet node, Void context)
+    {
+        visitRowExpression(node.value());
+        process(node.target(), context);
+        return null;
+    }
+
+    public void visitRowExpression(RowExpression expression) {}
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrBlock.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrBlock.java
new file mode 100644
index 000000000000..6cbe622875dd
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrBlock.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrBlock(Optional<IrLabel> label, List<IrVariable> variables, List<IrStatement> statements)
+        implements IrStatement
+{
+    public IrBlock(List<IrVariable> variables, List<IrStatement> statements)
+    {
+        this(Optional.empty(), variables, statements);
+    }
+
+    public IrBlock
+    {
+        requireNonNull(label, "label is null");
+        variables = ImmutableList.copyOf(requireNonNull(variables, "variables is null"));
+        statements = ImmutableList.copyOf(requireNonNull(statements, "statements is null"));
+    }
+
+    @Override
+    public <C, R> R accept(IrNodeVisitor<C, R> visitor, C context)
+    {
+        return visitor.visitBlock(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrBreak.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrBreak.java
new file mode 100644
index 000000000000..6c23f64f1f11
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrBreak.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrBreak(IrLabel target)
+        implements IrStatement
+{
+    public IrBreak
+    {
+        requireNonNull(target, "target is null");
+    }
+
+    @Override
+    public <C, R> R accept(IrNodeVisitor<C, R> visitor, C context)
+    {
+        return visitor.visitBreak(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrContinue.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrContinue.java
new file mode 100644
index 000000000000..edae2b13e4ce
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrContinue.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrContinue(IrLabel target)
+        implements IrStatement
+{
+    public IrContinue
+    {
+        requireNonNull(target, "target is null");
+    }
+
+    @Override
+    public <C, R> R accept(IrNodeVisitor<C, R> visitor, C context)
+    {
+        return visitor.visitContinue(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrIf.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrIf.java
new file mode 100644
index 000000000000..421e11880b3a
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrIf.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import io.trino.sql.relational.RowExpression;
+
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrIf(RowExpression condition, IrStatement ifTrue, Optional<IrStatement> ifFalse)
+        implements IrStatement
+{
+    public IrIf
+    {
+        requireNonNull(condition, "condition is null");
+        requireNonNull(ifTrue, "ifTrue is null");
+        requireNonNull(ifFalse, "ifFalse is null");
+    }
+
+    @Override
+    public <C, R> R accept(IrNodeVisitor<C, R> visitor, C context)
+    {
+        return visitor.visitIf(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrLabel.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrLabel.java
new file mode 100644
index 000000000000..0d8ae28d6034
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrLabel.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrLabel(String name)
+{
+    public IrLabel
+    {
+        requireNonNull(name, "name is null");
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrLoop.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrLoop.java
new file mode 100644
index 000000000000..c686a365e4c1
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrLoop.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrLoop(Optional<IrLabel> label, IrBlock block)
+        implements IrStatement
+{
+    public IrLoop
+    {
+        requireNonNull(label, "label is null");
+        requireNonNull(block, "body is null");
+    }
+
+    @Override
+    public <C, R> R accept(IrNodeVisitor<C, R> visitor, C context)
+    {
+        return visitor.visitLoop(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrNode.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrNode.java
new file mode 100644
index 000000000000..e7e2b2c58d7f
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrNode.java
@@ -0,0 +1,19 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+public interface IrNode
+{
+    <C, R> R accept(IrNodeVisitor<C, R> visitor, C context);
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrNodeVisitor.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrNodeVisitor.java
new file mode 100644
index 000000000000..3a0b9d1fb209
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrNodeVisitor.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+public interface IrNodeVisitor<C, R>
+{
+    default R process(IrNode node, C context)
+    {
+        return node.accept(this, context);
+    }
+
+    default R visitNode(IrNode node, C context)
+    {
+        return null;
+    }
+
+    default R visitRoutine(IrRoutine node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    default R visitVariable(IrVariable node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    default R visitBlock(IrBlock node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    default R visitBreak(IrBreak node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    default R visitContinue(IrContinue node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    default R visitIf(IrIf node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    default R visitRepeat(IrRepeat node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    default R visitLoop(IrLoop node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    default R visitReturn(IrReturn node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    default R visitSet(IrSet node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    default R visitWhile(IrWhile node, C context)
+    {
+        return visitNode(node, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrRepeat.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrRepeat.java
new file mode 100644
index 000000000000..527e37ea345a
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrRepeat.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import io.trino.sql.relational.RowExpression;
+
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrRepeat(Optional<IrLabel> label, RowExpression condition, IrBlock block)
+        implements IrStatement
+{
+    public IrRepeat
+    {
+        requireNonNull(label, "label is null");
+        requireNonNull(condition, "condition is null");
+        requireNonNull(block, "body is null");
+    }
+
+    @Override
+    public <C, R> R accept(IrNodeVisitor<C, R> visitor, C context)
+    {
+        return visitor.visitRepeat(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrReturn.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrReturn.java
new file mode 100644
index 000000000000..e33b1d3763ae
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrReturn.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import io.trino.sql.relational.RowExpression;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrReturn(RowExpression value)
+        implements IrStatement
+{
+    public IrReturn
+    {
+        requireNonNull(value, "value is null");
+    }
+
+    @Override
+    public <C, R> R accept(IrNodeVisitor<C, R> visitor, C context)
+    {
+        return visitor.visitReturn(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrRoutine.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrRoutine.java
new file mode 100644
index 000000000000..5fb5209cbb42
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrRoutine.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import io.trino.spi.type.Type;
+
+import java.util.List;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrRoutine(Type returnType, List<IrVariable> parameters, IrStatement body)
+        implements IrNode
+{
+    public IrRoutine
+    {
+        requireNonNull(returnType, "returnType is null");
+        requireNonNull(parameters, "parameters is null");
+        requireNonNull(body, "body is null");
+    }
+
+    @Override
+    public <C, R> R accept(IrNodeVisitor<C, R> visitor, C context)
+    {
+        return visitor.visitRoutine(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrSet.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrSet.java
new file mode 100644
index 000000000000..f20dd3e6abfb
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrSet.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import io.trino.sql.relational.RowExpression;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrSet(IrVariable target, RowExpression value)
+        implements IrStatement
+{
+    public IrSet
+    {
+        requireNonNull(target, "target is null");
+        requireNonNull(value, "value is null");
+    }
+
+    @Override
+    public <C, R> R accept(IrNodeVisitor<C, R> visitor, C context)
+    {
+        return visitor.visitSet(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrStatement.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrStatement.java
new file mode 100644
index 000000000000..aa043071eb0c
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrStatement.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
+@JsonSubTypes({
+        @JsonSubTypes.Type(value = IrBlock.class, name = "block"),
+        @JsonSubTypes.Type(value = IrBreak.class, name = "break"),
+        @JsonSubTypes.Type(value = IrContinue.class, name = "continue"),
+        @JsonSubTypes.Type(value = IrIf.class, name = "if"),
+        @JsonSubTypes.Type(value = IrLoop.class, name = "loop"),
+        @JsonSubTypes.Type(value = IrRepeat.class, name = "repeat"),
+        @JsonSubTypes.Type(value = IrReturn.class, name = "return"),
+        @JsonSubTypes.Type(value = IrSet.class, name = "set"),
+        @JsonSubTypes.Type(value = IrWhile.class, name = "while"),
+})
+@SuppressWarnings("MarkerInterface")
+public sealed interface IrStatement
+        extends IrNode
+        permits IrBlock, IrBreak, IrContinue, IrIf, IrLoop, IrRepeat, IrReturn, IrSet, IrWhile {}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrVariable.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrVariable.java
new file mode 100644
index 000000000000..114ac3d55a16
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrVariable.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import io.trino.spi.type.Type;
+import io.trino.sql.relational.RowExpression;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrVariable(int field, Type type, RowExpression defaultValue)
+        implements IrNode
+{
+    public IrVariable
+    {
+        requireNonNull(type, "type is null");
+        requireNonNull(defaultValue, "value is null");
+    }
+
+    @Override
+    public <C, R> R accept(IrNodeVisitor<C, R> visitor, C context)
+    {
+        return visitor.visitVariable(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrWhile.java b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrWhile.java
new file mode 100644
index 000000000000..f563facf3a77
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/sql/routine/ir/IrWhile.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.sql.routine.ir;
+
+import io.trino.sql.relational.RowExpression;
+
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public record IrWhile(Optional<IrLabel> label, RowExpression condition, IrBlock body)
+        implements IrStatement
+{
+    public IrWhile
+    {
+        requireNonNull(label, "label is null");
+        requireNonNull(condition, "condition is null");
+        requireNonNull(body, "body is null");
+    }
+
+    @Override
+    public <C, R> R accept(IrNodeVisitor<C, R> visitor, C context)
+    {
+        return visitor.visitWhile(this, context);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/testing/AllowAllAccessControlManager.java b/core/trino-main/src/main/java/io/trino/testing/AllowAllAccessControlManager.java
deleted file mode 100644
index b2cafd945f26..000000000000
--- a/core/trino-main/src/main/java/io/trino/testing/AllowAllAccessControlManager.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Licensed 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 io.trino.testing;
-
-import io.trino.metadata.QualifiedObjectName;
-import io.trino.security.AccessControl;
-import io.trino.security.SecurityContext;
-import io.trino.spi.connector.CatalogSchemaName;
-import io.trino.spi.connector.CatalogSchemaTableName;
-import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
-import io.trino.spi.security.Identity;
-import io.trino.spi.security.Privilege;
-import io.trino.spi.security.TrinoPrincipal;
-
-import java.security.Principal;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-public class AllowAllAccessControlManager
-        implements AccessControl
-{
-    @Override
-    public void checkCanSetUser(Optional<Principal> principal, String userName) {}
-
-    @Override
-    public void checkCanImpersonateUser(Identity identity, String userName) {}
-
-    @Override
-    public void checkCanReadSystemInformation(Identity identity) {}
-
-    @Override
-    public void checkCanWriteSystemInformation(Identity identity) {}
-
-    @Override
-    public void checkCanExecuteQuery(Identity identity) {}
-
-    @Override
-    public void checkCanViewQueryOwnedBy(Identity identity, Identity queryOwner) {}
-
-    @Override
-    public Collection<Identity> filterQueriesOwnedBy(Identity identity, Collection<Identity> queryOwners)
-    {
-        return queryOwners;
-    }
-
-    @Override
-    public void checkCanKillQueryOwnedBy(Identity identity, Identity queryOwner) {}
-
-    @Override
-    public void checkCanCreateCatalog(SecurityContext context, String catalog) {}
-
-    @Override
-    public void checkCanDropCatalog(SecurityContext context, String catalog) {}
-
-    @Override
-    public Set<String> filterCatalogs(SecurityContext context, Set<String> catalogs)
-    {
-        return catalogs;
-    }
-
-    @Override
-    public void checkCanCreateSchema(SecurityContext context, CatalogSchemaName schemaName, Map<String, Object> properties) {}
-
-    @Override
-    public void checkCanDropSchema(SecurityContext context, CatalogSchemaName schemaName) {}
-
-    @Override
-    public void checkCanRenameSchema(SecurityContext context, CatalogSchemaName schemaName, String newSchemaName) {}
-
-    @Override
-    public void checkCanSetSchemaAuthorization(SecurityContext context, CatalogSchemaName schemaName, TrinoPrincipal principal) {}
-
-    @Override
-    public void checkCanShowSchemas(SecurityContext context, String catalogName) {}
-
-    @Override
-    public Set<String> filterSchemas(SecurityContext context, String catalogName, Set<String> schemaNames)
-    {
-        return schemaNames;
-    }
-
-    @Override
-    public void checkCanShowCreateSchema(SecurityContext context, CatalogSchemaName schemaName) {}
-
-    @Override
-    public void checkCanShowCreateTable(SecurityContext context, QualifiedObjectName tableName) {}
-
-    @Override
-    public void checkCanCreateTable(SecurityContext context, QualifiedObjectName tableName, Map<String, Object> properties) {}
-
-    @Override
-    public void checkCanDropTable(SecurityContext context, QualifiedObjectName tableName) {}
-
-    @Override
-    public void checkCanRenameTable(SecurityContext context, QualifiedObjectName tableName, QualifiedObjectName newTableName) {}
-
-    @Override
-    public void checkCanSetTableProperties(SecurityContext context, QualifiedObjectName tableName, Map<String, Optional<Object>> properties) {}
-
-    @Override
-    public void checkCanSetTableComment(SecurityContext context, QualifiedObjectName tableName) {}
-
-    @Override
-    public void checkCanSetViewComment(SecurityContext context, QualifiedObjectName viewName) {}
-
-    @Override
-    public void checkCanSetColumnComment(SecurityContext context, QualifiedObjectName tableName) {}
-
-    @Override
-    public void checkCanShowTables(SecurityContext context, CatalogSchemaName schema) {}
-
-    @Override
-    public Set<SchemaTableName> filterTables(SecurityContext context, String catalogName, Set<SchemaTableName> tableNames)
-    {
-        return tableNames;
-    }
-
-    @Override
-    public void checkCanShowColumns(SecurityContext context, CatalogSchemaTableName table) {}
-
-    @Override
-    public Set<String> filterColumns(SecurityContext context, CatalogSchemaTableName tableName, Set<String> columns)
-    {
-        return columns;
-    }
-
-    @Override
-    public void checkCanAddColumns(SecurityContext context, QualifiedObjectName tableName) {}
-
-    @Override
-    public void checkCanDropColumn(SecurityContext context, QualifiedObjectName tableName) {}
-
-    @Override
-    public void checkCanAlterColumn(SecurityContext context, QualifiedObjectName tableName) {}
-
-    @Override
-    public void checkCanSetTableAuthorization(SecurityContext context, QualifiedObjectName tableName, TrinoPrincipal principal) {}
-
-    @Override
-    public void checkCanRenameColumn(SecurityContext context, QualifiedObjectName tableName) {}
-
-    @Override
-    public void checkCanInsertIntoTable(SecurityContext context, QualifiedObjectName tableName) {}
-
-    @Override
-    public void checkCanDeleteFromTable(SecurityContext context, QualifiedObjectName tableName) {}
-
-    @Override
-    public void checkCanTruncateTable(SecurityContext context, QualifiedObjectName tableName) {}
-
-    @Override
-    public void checkCanUpdateTableColumns(SecurityContext context, QualifiedObjectName tableName, Set<String> updatedColumnNames) {}
-
-    @Override
-    public void checkCanCreateView(SecurityContext context, QualifiedObjectName viewName) {}
-
-    @Override
-    public void checkCanRenameView(SecurityContext context, QualifiedObjectName viewName, QualifiedObjectName newViewName) {}
-
-    @Override
-    public void checkCanDropView(SecurityContext context, QualifiedObjectName viewName) {}
-
-    @Override
-    public void checkCanCreateViewWithSelectFromColumns(SecurityContext context, QualifiedObjectName tableName, Set<String> columnNames) {}
-
-    @Override
-    public void checkCanCreateMaterializedView(SecurityContext context, QualifiedObjectName materializedViewName, Map<String, Object> properties) {}
-
-    @Override
-    public void checkCanRefreshMaterializedView(SecurityContext context, QualifiedObjectName materializedViewName) {}
-
-    @Override
-    public void checkCanDropMaterializedView(SecurityContext context, QualifiedObjectName materializedViewName) {}
-
-    @Override
-    public void checkCanRenameMaterializedView(SecurityContext context, QualifiedObjectName viewName, QualifiedObjectName newViewName) {}
-
-    @Override
-    public void checkCanSetMaterializedViewProperties(SecurityContext context, QualifiedObjectName materializedViewName, Map<String, Optional<Object>> properties) {}
-
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, String functionName, Identity grantee, boolean grantOption) {}
-
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName, Identity grantee, boolean grantOption) {}
-
-    @Override
-    public void checkCanGrantSchemaPrivilege(SecurityContext context, Privilege privilege, CatalogSchemaName schemaName, TrinoPrincipal grantee, boolean grantOption) {}
-
-    @Override
-    public void checkCanDenySchemaPrivilege(SecurityContext context, Privilege privilege, CatalogSchemaName schemaName, TrinoPrincipal grantee) {}
-
-    @Override
-    public void checkCanRevokeSchemaPrivilege(SecurityContext context, Privilege privilege, CatalogSchemaName schemaName, TrinoPrincipal revokee, boolean grantOption) {}
-
-    @Override
-    public void checkCanGrantTablePrivilege(SecurityContext context, Privilege privilege, QualifiedObjectName tableName, TrinoPrincipal grantee, boolean grantOption) {}
-
-    @Override
-    public void checkCanDenyTablePrivilege(SecurityContext context, Privilege privilege, QualifiedObjectName tableName, TrinoPrincipal grantee) {}
-
-    @Override
-    public void checkCanRevokeTablePrivilege(SecurityContext context, Privilege privilege, QualifiedObjectName tableName, TrinoPrincipal revokee, boolean grantOption) {}
-
-    @Override
-    public void checkCanSetSystemSessionProperty(Identity identity, String propertyName) {}
-
-    @Override
-    public void checkCanSetCatalogSessionProperty(SecurityContext context, String catalogName, String propertyName) {}
-
-    @Override
-    public void checkCanSelectFromColumns(SecurityContext context, QualifiedObjectName tableName, Set<String> columnNames) {}
-
-    @Override
-    public void checkCanCreateRole(SecurityContext context, String role, Optional<TrinoPrincipal> grantor, Optional<String> catalogName) {}
-
-    @Override
-    public void checkCanDropRole(SecurityContext context, String role, Optional<String> catalogName) {}
-
-    @Override
-    public void checkCanGrantRoles(SecurityContext context, Set<String> roles, Set<TrinoPrincipal> grantees, boolean adminOption, Optional<TrinoPrincipal> grantor, Optional<String> catalogName) {}
-
-    @Override
-    public void checkCanRevokeRoles(SecurityContext context, Set<String> roles, Set<TrinoPrincipal> grantees, boolean adminOption, Optional<TrinoPrincipal> grantor, Optional<String> catalogName) {}
-
-    @Override
-    public void checkCanSetCatalogRole(SecurityContext context, String role, String catalogName) {}
-
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(SecurityContext context, Optional<String> catalogName) {}
-
-    @Override
-    public void checkCanShowRoles(SecurityContext context, Optional<String> catalogName) {}
-
-    @Override
-    public void checkCanShowCurrentRoles(SecurityContext context, Optional<String> catalogName) {}
-
-    @Override
-    public void checkCanShowRoleGrants(SecurityContext context, Optional<String> catalogName) {}
-
-    @Override
-    public void checkCanExecuteProcedure(SecurityContext context, QualifiedObjectName procedureName) {}
-
-    @Override
-    public void checkCanExecuteFunction(SecurityContext context, String functionName) {}
-
-    @Override
-    public void checkCanExecuteFunction(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName) {}
-
-    @Override
-    public void checkCanExecuteTableProcedure(SecurityContext context, QualifiedObjectName tableName, String procedureName) {}
-}
diff --git a/core/trino-main/src/main/java/io/trino/testing/LocalQueryRunner.java b/core/trino-main/src/main/java/io/trino/testing/LocalQueryRunner.java
index 4866141e1226..b7cdd40c0839 100644
--- a/core/trino-main/src/main/java/io/trino/testing/LocalQueryRunner.java
+++ b/core/trino-main/src/main/java/io/trino/testing/LocalQueryRunner.java
@@ -20,6 +20,9 @@
 import io.airlift.node.NodeInfo;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.FeaturesConfig;
 import io.trino.Session;
 import io.trino.SystemSessionProperties;
@@ -90,6 +93,7 @@
 import io.trino.metadata.InternalBlockEncodingSerde;
 import io.trino.metadata.InternalFunctionBundle;
 import io.trino.metadata.InternalNodeManager;
+import io.trino.metadata.LanguageFunctionManager;
 import io.trino.metadata.LiteralFunction;
 import io.trino.metadata.MaterializedViewPropertyManager;
 import io.trino.metadata.Metadata;
@@ -101,7 +105,6 @@
 import io.trino.metadata.SessionPropertyManager;
 import io.trino.metadata.Split;
 import io.trino.metadata.SystemFunctionBundle;
-import io.trino.metadata.SystemSecurityMetadata;
 import io.trino.metadata.TableFunctionRegistry;
 import io.trino.metadata.TableHandle;
 import io.trino.metadata.TableProceduresPropertyManager;
@@ -113,12 +116,10 @@
 import io.trino.operator.DriverFactory;
 import io.trino.operator.GroupByHashPageIndexerFactory;
 import io.trino.operator.OperatorContext;
-import io.trino.operator.OperatorFactories;
 import io.trino.operator.OutputFactory;
 import io.trino.operator.PagesIndex;
 import io.trino.operator.PagesIndexPageSorter;
 import io.trino.operator.TaskContext;
-import io.trino.operator.TrinoOperatorFactories;
 import io.trino.operator.index.IndexJoinLookupStats;
 import io.trino.operator.scalar.json.JsonExistsFunction;
 import io.trino.operator.scalar.json.JsonQueryFunction;
@@ -168,6 +169,7 @@
 import io.trino.sql.gen.OrderingCompiler;
 import io.trino.sql.gen.PageFunctionCompiler;
 import io.trino.sql.parser.SqlParser;
+import io.trino.sql.planner.CompilerConfig;
 import io.trino.sql.planner.LocalExecutionPlanner;
 import io.trino.sql.planner.LocalExecutionPlanner.LocalExecutionPlan;
 import io.trino.sql.planner.LogicalPlanner;
@@ -195,7 +197,6 @@
 import io.trino.sql.rewrite.StatementRewrite;
 import io.trino.testing.PageConsumerOperator.PageConsumerOutputFactory;
 import io.trino.transaction.InMemoryTransactionManager;
-import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
 import io.trino.transaction.TransactionManagerConfig;
 import io.trino.type.BlockTypeOperators;
@@ -222,12 +223,12 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Function;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
+import static io.airlift.tracing.Tracing.noopTracer;
 import static io.trino.connector.CatalogServiceProviderModule.createAccessControlProvider;
 import static io.trino.connector.CatalogServiceProviderModule.createAnalyzePropertyManager;
 import static io.trino.connector.CatalogServiceProviderModule.createColumnPropertyManager;
@@ -245,9 +246,9 @@
 import static io.trino.connector.CatalogServiceProviderModule.createTablePropertyManager;
 import static io.trino.execution.ParameterExtractor.bindParameters;
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static io.trino.execution.warnings.WarningCollector.NOOP;
 import static io.trino.spi.connector.Constraint.alwaysTrue;
 import static io.trino.spi.connector.DynamicFilter.EMPTY;
-import static io.trino.sql.ParsingUtil.createParsingOptions;
 import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED;
 import static io.trino.sql.planner.optimizations.PlanNodeSearcher.searchFrom;
 import static io.trino.sql.testing.TreeAssertions.assertFormattedSql;
@@ -270,11 +271,13 @@ public class LocalQueryRunner
     private final SqlParser sqlParser;
     private final PlanFragmenter planFragmenter;
     private final InternalNodeManager nodeManager;
+    private final TypeOperators typeOperators;
     private final BlockTypeOperators blockTypeOperators;
     private final PlannerContext plannerContext;
     private final TypeRegistry typeRegistry;
     private final GlobalFunctionCatalog globalFunctionCatalog;
     private final FunctionManager functionManager;
+    private final LanguageFunctionManager languageFunctionManager;
     private final StatsCalculator statsCalculator;
     private final ScalarStatsCalculator scalarStatsCalculator;
     private final CostCalculator costCalculator;
@@ -312,7 +315,6 @@ public class LocalQueryRunner
     private final DataSize maxSpillPerNode;
     private final DataSize queryMaxSpillPerNode;
     private final OptimizerConfig optimizerConfig;
-    private final OperatorFactories operatorFactories;
     private final StatementAnalyzerFactory statementAnalyzerFactory;
     private boolean printPlan;
 
@@ -333,30 +335,27 @@ private LocalQueryRunner(
             Session defaultSession,
             FeaturesConfig featuresConfig,
             NodeSpillConfig nodeSpillConfig,
-            boolean withInitialTransaction,
             boolean alwaysRevokeMemory,
             int nodeCountForStats,
             Map<String, List<PropertyMetadata<?>>> defaultSessionProperties,
-            MetadataProvider metadataProvider,
-            OperatorFactories operatorFactories,
+            Function<Metadata, Metadata> metadataDecorator,
             Set<SystemSessionPropertiesProvider> extraSessionProperties)
     {
         requireNonNull(defaultSession, "defaultSession is null");
         requireNonNull(defaultSessionProperties, "defaultSessionProperties is null");
-        checkArgument(defaultSession.getTransactionId().isEmpty() || !withInitialTransaction, "Already in transaction");
 
+        Tracer tracer = noopTracer();
         this.taskManagerConfig = new TaskManagerConfig().setTaskConcurrency(4);
         requireNonNull(nodeSpillConfig, "nodeSpillConfig is null");
         this.maxSpillPerNode = nodeSpillConfig.getMaxSpillPerNode();
         this.queryMaxSpillPerNode = nodeSpillConfig.getQueryMaxSpillPerNode();
-        this.operatorFactories = requireNonNull(operatorFactories, "operatorFactories is null");
         this.alwaysRevokeMemory = alwaysRevokeMemory;
         this.notificationExecutor = newCachedThreadPool(daemonThreadsNamed("local-query-runner-executor-%s"));
         this.yieldExecutor = newScheduledThreadPool(2, daemonThreadsNamed("local-query-runner-scheduler-%s"));
         this.finalizerService = new FinalizerService();
         finalizerService.start();
 
-        TypeOperators typeOperators = new TypeOperators();
+        this.typeOperators = new TypeOperators();
         this.blockTypeOperators = new BlockTypeOperators(typeOperators);
         this.sqlParser = new SqlParser();
         this.nodeManager = new InMemoryNodeManager();
@@ -381,15 +380,17 @@ private LocalQueryRunner(
         this.globalFunctionCatalog = new GlobalFunctionCatalog();
         globalFunctionCatalog.addFunctions(new InternalFunctionBundle(new LiteralFunction(blockEncodingSerde)));
         globalFunctionCatalog.addFunctions(SystemFunctionBundle.create(featuresConfig, typeOperators, blockTypeOperators, nodeManager.getCurrentNode().getNodeVersion()));
-        Metadata metadata = metadataProvider.getMetadata(
+        this.groupProvider = new TestingGroupProviderManager();
+        this.languageFunctionManager = new LanguageFunctionManager(sqlParser, typeManager, groupProvider);
+        Metadata metadata = metadataDecorator.apply(new MetadataManager(
                 new DisabledSystemSecurityMetadata(),
                 transactionManager,
                 globalFunctionCatalog,
-                typeManager);
+                languageFunctionManager,
+                typeManager));
         typeRegistry.addType(new JsonPath2016Type(new TypeDeserializer(typeManager), blockEncodingSerde));
         this.joinCompiler = new JoinCompiler(typeOperators);
-        PageIndexerFactory pageIndexerFactory = new GroupByHashPageIndexerFactory(joinCompiler, blockTypeOperators);
-        this.groupProvider = new TestingGroupProviderManager();
+        PageIndexerFactory pageIndexerFactory = new GroupByHashPageIndexerFactory(joinCompiler);
         this.accessControl = new TestingAccessControlManager(transactionManager, eventListenerManager);
         accessControl.loadSystemAccessControl(AllowAllSystemAccessControl.NAME, ImmutableMap.of());
 
@@ -405,18 +406,20 @@ private LocalQueryRunner(
                 pageIndexerFactory,
                 nodeInfo,
                 testingVersionEmbedder(),
+                OpenTelemetry.noop(),
                 transactionManager,
                 typeManager,
-                nodeSchedulerConfig));
-        this.splitManager = new SplitManager(createSplitManagerProvider(catalogManager), new QueryManagerConfig());
+                nodeSchedulerConfig,
+                optimizerConfig));
+        this.splitManager = new SplitManager(createSplitManagerProvider(catalogManager), tracer, new QueryManagerConfig());
         this.pageSourceManager = new PageSourceManager(createPageSourceProvider(catalogManager));
         this.pageSinkManager = new PageSinkManager(createPageSinkProvider(catalogManager));
         this.indexManager = new IndexManager(createIndexProvider(catalogManager));
         NodeScheduler nodeScheduler = new NodeScheduler(new UniformNodeSelectorFactory(nodeManager, nodeSchedulerConfig, new NodeTaskMap(finalizerService)));
         this.sessionPropertyManager = createSessionPropertyManager(catalogManager, extraSessionProperties, taskManagerConfig, featuresConfig, optimizerConfig);
-        this.nodePartitioningManager = new NodePartitioningManager(nodeScheduler, blockTypeOperators, createNodePartitioningProvider(catalogManager));
+        this.nodePartitioningManager = new NodePartitioningManager(nodeScheduler, typeOperators, createNodePartitioningProvider(catalogManager));
         TableProceduresRegistry tableProceduresRegistry = new TableProceduresRegistry(createTableProceduresProvider(catalogManager));
-        this.functionManager = new FunctionManager(createFunctionProvider(catalogManager), globalFunctionCatalog);
+        this.functionManager = new FunctionManager(createFunctionProvider(catalogManager), globalFunctionCatalog, languageFunctionManager);
         TableFunctionRegistry tableFunctionRegistry = new TableFunctionRegistry(createTableFunctionProvider(catalogManager));
         this.schemaPropertyManager = createSchemaPropertyManager(catalogManager);
         this.columnPropertyManager = createColumnPropertyManager(catalogManager);
@@ -432,7 +435,7 @@ private LocalQueryRunner(
                 new JsonValueFunction(functionManager, metadata, typeManager),
                 new JsonQueryFunction(functionManager, metadata, typeManager)));
 
-        this.plannerContext = new PlannerContext(metadata, typeOperators, blockEncodingSerde, typeManager, functionManager);
+        this.plannerContext = new PlannerContext(metadata, typeOperators, blockEncodingSerde, typeManager, functionManager, languageFunctionManager, tracer);
         this.pageFunctionCompiler = new PageFunctionCompiler(functionManager, 0);
         this.expressionCompiler = new ExpressionCompiler(functionManager, pageFunctionCompiler);
         this.joinFilterFunctionCompiler = new JoinFilterFunctionCompiler(functionManager);
@@ -446,7 +449,6 @@ private LocalQueryRunner(
                 groupProvider,
                 tableProceduresRegistry,
                 tableFunctionRegistry,
-                sessionPropertyManager,
                 tablePropertyManager,
                 analyzePropertyManager,
                 tableProceduresPropertyManager);
@@ -457,7 +459,7 @@ private LocalQueryRunner(
         this.costCalculator = new CostCalculatorUsingExchanges(taskCountEstimator);
         this.estimatedExchangesCostCalculator = new CostCalculatorWithEstimatedExchanges(costCalculator, taskCountEstimator);
 
-        this.planFragmenter = new PlanFragmenter(metadata, functionManager, transactionManager, catalogManager, new QueryManagerConfig());
+        this.planFragmenter = new PlanFragmenter(metadata, functionManager, transactionManager, catalogManager, languageFunctionManager, new QueryManagerConfig());
 
         GlobalSystemConnector globalSystemConnector = new GlobalSystemConnector(ImmutableSet.of(
                 new NodeSystemTable(nodeManager),
@@ -492,14 +494,16 @@ private LocalQueryRunner(
                 exchangeManagerRegistry);
 
         catalogManager.registerGlobalSystemConnector(globalSystemConnector);
+        languageFunctionManager.setPlannerContext(plannerContext);
 
         // rewrite session to use managed SessionPropertyMetadata
-        Optional<TransactionId> transactionId = withInitialTransaction ? Optional.of(transactionManager.beginTransaction(true)) : defaultSession.getTransactionId();
         this.defaultSession = new Session(
                 defaultSession.getQueryId(),
-                transactionId,
+                Span.getInvalid(),
+                defaultSession.getTransactionId(),
                 defaultSession.isClientTransactionSupport(),
                 defaultSession.getIdentity(),
+                defaultSession.getOriginalIdentity(),
                 defaultSession.getSource(),
                 defaultSession.getCatalog(),
                 defaultSession.getSchema(),
@@ -657,6 +661,12 @@ public FunctionManager getFunctionManager()
         return functionManager;
     }
 
+    @Override
+    public LanguageFunctionManager getLanguageFunctionManager()
+    {
+        return languageFunctionManager;
+    }
+
     public TypeOperators getTypeOperators()
     {
         return plannerContext.getTypeOperators();
@@ -804,7 +814,7 @@ public List<QualifiedObjectName> listTables(Session session, String catalog, Str
     {
         lock.readLock().lock();
         try {
-            return transaction(transactionManager, accessControl)
+            return transaction(transactionManager, plannerContext.getMetadata(), accessControl)
                     .readOnly()
                     .execute(session, transactionSession -> {
                         return getMetadata().listTables(transactionSession, new QualifiedTablePrefix(catalog, schema));
@@ -820,7 +830,7 @@ public boolean tableExists(Session session, String table)
     {
         lock.readLock().lock();
         try {
-            return transaction(transactionManager, accessControl)
+            return transaction(transactionManager, plannerContext.getMetadata(), accessControl)
                     .readOnly()
                     .execute(session, transactionSession -> {
                         return MetadataUtil.tableExists(getMetadata(), transactionSession, table);
@@ -840,7 +850,7 @@ public MaterializedResult execute(@Language("SQL") String sql)
     @Override
     public MaterializedResult execute(Session session, @Language("SQL") String sql)
     {
-        return executeWithPlan(session, sql, WarningCollector.NOOP).getMaterializedResult();
+        return executeWithPlan(session, sql, NOOP).getMaterializedResult();
     }
 
     @Override
@@ -856,7 +866,7 @@ public <T> T inTransaction(Function<Session, T> transactionSessionConsumer)
 
     public <T> T inTransaction(Session session, Function<Session, T> transactionSessionConsumer)
     {
-        return transaction(transactionManager, accessControl)
+        return transaction(transactionManager, plannerContext.getMetadata(), accessControl)
                 .singleStatement()
                 .execute(session, transactionSessionConsumer);
     }
@@ -866,6 +876,7 @@ private MaterializedResultWithPlan executeInternal(Session session, @Language("S
         lock.readLock().lock();
         try (Closer closer = Closer.create()) {
             accessControl.checkCanExecuteQuery(session.getIdentity());
+
             AtomicReference<MaterializedResult.Builder> builder = new AtomicReference<>();
             PageConsumerOutputFactory outputFactory = new PageConsumerOutputFactory(types -> {
                 builder.compareAndSet(null, MaterializedResult.resultBuilder(session, types));
@@ -877,7 +888,7 @@ private MaterializedResultWithPlan executeInternal(Session session, @Language("S
                     .setQueryMaxSpillSize(queryMaxSpillPerNode)
                     .build();
 
-            Plan plan = createPlan(session, sql, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+            Plan plan = createPlan(session, sql, getPlanOptimizers(true), OPTIMIZED_AND_VALIDATED, NOOP, createPlanOptimizersStatsCollector());
             List<Driver> drivers = createDrivers(session, plan, outputFactory, taskContext);
             drivers.forEach(closer::register);
 
@@ -944,13 +955,16 @@ public void loadExchangeManager(String name, Map<String, String> properties)
 
     public List<Driver> createDrivers(Session session, @Language("SQL") String sql, OutputFactory outputFactory, TaskContext taskContext)
     {
-        Plan plan = createPlan(session, sql, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
-        return createDrivers(session, plan, outputFactory, taskContext);
+        return inTransaction(session, transactionSession -> {
+            Plan plan = createPlan(transactionSession, sql, getPlanOptimizers(true), OPTIMIZED_AND_VALIDATED, NOOP, createPlanOptimizersStatsCollector());
+            return createDrivers(transactionSession, plan, outputFactory, taskContext);
+        });
     }
 
     public SubPlan createSubPlans(Session session, Plan plan, boolean forceSingleNode)
     {
-        return planFragmenter.createSubPlans(session, plan, forceSingleNode, WarningCollector.NOOP);
+        languageFunctionManager.tryRegisterQuery(session);
+        return planFragmenter.createSubPlans(session, plan, forceSingleNode, NOOP);
     }
 
     private List<Driver> createDrivers(Session session, Plan plan, OutputFactory outputFactory, TaskContext taskContext)
@@ -993,13 +1007,14 @@ private List<Driver> createDrivers(Session session, Plan plan, OutputFactory out
                 partitioningSpillerFactory,
                 new PagesIndex.TestingFactory(false),
                 joinCompiler,
-                operatorFactories,
                 new OrderingCompiler(plannerContext.getTypeOperators()),
                 new DynamicFilterConfig(),
                 blockTypeOperators,
+                typeOperators,
                 tableExecuteContextManager,
                 exchangeManagerRegistry,
-                nodeManager.getCurrentNode().getNodeVersion());
+                nodeManager.getCurrentNode().getNodeVersion(),
+                new CompilerConfig());
 
         // plan query
         LocalExecutionPlan localExecutionPlan = executionPlanner.plan(
@@ -1018,6 +1033,7 @@ private List<Driver> createDrivers(Session session, Plan plan, OutputFactory out
 
             SplitSource splitSource = splitManager.getSplits(
                     session,
+                    Span.getInvalid(),
                     table,
                     EMPTY,
                     alwaysTrue());
@@ -1070,19 +1086,9 @@ private List<Driver> createDrivers(Session session, Plan plan, OutputFactory out
     }
 
     @Override
-    public Plan createPlan(Session session, @Language("SQL") String sql, WarningCollector warningCollector, PlanOptimizersStatsCollector planOptimizersStatsCollector)
+    public Plan createPlan(Session session, @Language("SQL") String sql)
     {
-        return createPlan(session, sql, OPTIMIZED_AND_VALIDATED, warningCollector, planOptimizersStatsCollector);
-    }
-
-    public Plan createPlan(Session session, @Language("SQL") String sql, LogicalPlanner.Stage stage, WarningCollector warningCollector, PlanOptimizersStatsCollector planOptimizersStatsCollector)
-    {
-        return createPlan(session, sql, stage, true, warningCollector, planOptimizersStatsCollector);
-    }
-
-    public Plan createPlan(Session session, @Language("SQL") String sql, LogicalPlanner.Stage stage, boolean forceSingleNode, WarningCollector warningCollector, PlanOptimizersStatsCollector planOptimizersStatsCollector)
-    {
-        return createPlan(session, sql, getPlanOptimizers(forceSingleNode), stage, warningCollector, planOptimizersStatsCollector);
+        return createPlan(session, sql, getPlanOptimizers(true), OPTIMIZED_AND_VALIDATED, NOOP, createPlanOptimizersStatsCollector());
     }
 
     public List<PlanOptimizer> getPlanOptimizers(boolean forceSingleNode)
@@ -1104,16 +1110,14 @@ public List<PlanOptimizer> getPlanOptimizers(boolean forceSingleNode)
                 new RuleStatsRecorder()).get();
     }
 
-    public Plan createPlan(Session session, @Language("SQL") String sql, List<PlanOptimizer> optimizers, WarningCollector warningCollector, PlanOptimizersStatsCollector planOptimizersStatsCollector)
-    {
-        return createPlan(session, sql, optimizers, OPTIMIZED_AND_VALIDATED, warningCollector, planOptimizersStatsCollector);
-    }
-
     public Plan createPlan(Session session, @Language("SQL") String sql, List<PlanOptimizer> optimizers, LogicalPlanner.Stage stage, WarningCollector warningCollector, PlanOptimizersStatsCollector planOptimizersStatsCollector)
     {
+        // session must be in a transaction registered with the transaction manager in this query runner
+        transactionManager.getTransactionInfo(session.getRequiredTransactionId());
+
         PreparedQuery preparedQuery = new QueryPreparer(sqlParser).prepareQuery(session, sql);
 
-        assertFormattedSql(sqlParser, createParsingOptions(session), preparedQuery.getStatement());
+        assertFormattedSql(sqlParser, preparedQuery.getStatement());
 
         PlanNodeIdAllocator idAllocator = new PlanNodeIdAllocator();
 
@@ -1171,7 +1175,8 @@ private AnalyzerFactory createAnalyzerFactory(QueryExplainerFactory queryExplain
                                 tablePropertyManager,
                                 materializedViewPropertyManager),
                         new ShowStatsRewrite(plannerContext.getMetadata(), queryExplainerFactory, statsCalculator),
-                        new ExplainRewrite(queryExplainerFactory, new QueryPreparer(sqlParser)))));
+                        new ExplainRewrite(queryExplainerFactory, new QueryPreparer(sqlParser)))),
+                plannerContext.getTracer());
     }
 
     private static List<Split> getNextBatch(SplitSource splitSource)
@@ -1186,15 +1191,6 @@ private static List<TableScanNode> findTableScanNodes(PlanNode node)
                 .findAll();
     }
 
-    public interface MetadataProvider
-    {
-        Metadata getMetadata(
-                SystemSecurityMetadata systemSecurityMetadata,
-                TransactionManager transactionManager,
-                GlobalFunctionCatalog globalFunctionCatalog,
-                TypeManager typeManager);
-    }
-
     public static class Builder
     {
         private final Session defaultSession;
@@ -1205,8 +1201,7 @@ public static class Builder
         private Map<String, List<PropertyMetadata<?>>> defaultSessionProperties = ImmutableMap.of();
         private Set<SystemSessionPropertiesProvider> extraSessionProperties = ImmutableSet.of();
         private int nodeCountForStats;
-        private MetadataProvider metadataProvider = MetadataManager::new;
-        private OperatorFactories operatorFactories = new TrinoOperatorFactories();
+        private Function<Metadata, Metadata> metadataDecorator = Function.identity();
 
         private Builder(Session defaultSession)
         {
@@ -1225,12 +1220,6 @@ public Builder withNodeSpillConfig(NodeSpillConfig nodeSpillConfig)
             return this;
         }
 
-        public Builder withInitialTransaction()
-        {
-            this.initialTransaction = true;
-            return this;
-        }
-
         public Builder withAlwaysRevokeMemory()
         {
             this.alwaysRevokeMemory = true;
@@ -1249,15 +1238,9 @@ public Builder withNodeCountForStats(int nodeCountForStats)
             return this;
         }
 
-        public Builder withMetadataProvider(MetadataProvider metadataProvider)
-        {
-            this.metadataProvider = metadataProvider;
-            return this;
-        }
-
-        public Builder withOperatorFactories(OperatorFactories operatorFactories)
+        public Builder withMetadataDecorator(Function<Metadata, Metadata> metadataDecorator)
         {
-            this.operatorFactories = requireNonNull(operatorFactories, "operatorFactories is null");
+            this.metadataDecorator = requireNonNull(metadataDecorator, "metadataDecorator is null");
             return this;
         }
 
@@ -1278,12 +1261,10 @@ public LocalQueryRunner build()
                     defaultSession,
                     featuresConfig,
                     nodeSpillConfig,
-                    initialTransaction,
                     alwaysRevokeMemory,
                     nodeCountForStats,
                     defaultSessionProperties,
-                    metadataProvider,
-                    operatorFactories,
+                    metadataDecorator,
                     extraSessionProperties);
         }
     }
diff --git a/core/trino-main/src/main/java/io/trino/testing/MaterializedResult.java b/core/trino-main/src/main/java/io/trino/testing/MaterializedResult.java
index 6c39a5cf938c..f3fffd9a1026 100644
--- a/core/trino-main/src/main/java/io/trino/testing/MaterializedResult.java
+++ b/core/trino-main/src/main/java/io/trino/testing/MaterializedResult.java
@@ -22,8 +22,11 @@
 import io.trino.client.Warning;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.ArrayType;
@@ -51,6 +54,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -59,6 +63,7 @@
 import java.util.Optional;
 import java.util.OptionalLong;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
@@ -82,6 +87,7 @@
 import static io.trino.type.JsonType.JSON;
 import static java.lang.Float.floatToRawIntBits;
 import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
 
 public class MaterializedResult
@@ -226,6 +232,53 @@ public String toString()
                 .toString();
     }
 
+    public MaterializedResult exceptColumns(String... columnNamesToExclude)
+    {
+        validateIfColumnsPresent(columnNamesToExclude);
+        checkArgument(columnNamesToExclude.length > 0, "At least one column must be excluded");
+        checkArgument(columnNamesToExclude.length < getColumnNames().size(), "All columns cannot be excluded");
+        return projected(((Predicate<String>) Set.of(columnNamesToExclude)::contains).negate());
+    }
+
+    public MaterializedResult project(String... columnNamesToInclude)
+    {
+        validateIfColumnsPresent(columnNamesToInclude);
+        checkArgument(columnNamesToInclude.length > 0, "At least one column must be projected");
+        return projected(Set.of(columnNamesToInclude)::contains);
+    }
+
+    private void validateIfColumnsPresent(String... columns)
+    {
+        Set<String> columnNames = ImmutableSet.copyOf(getColumnNames());
+        for (String column : columns) {
+            checkArgument(columnNames.contains(column), "[%s] column is not present in %s".formatted(column, columnNames));
+        }
+    }
+
+    private MaterializedResult projected(Predicate<String> columnFilter)
+    {
+        List<String> columnNames = getColumnNames();
+        Map<Integer, String> columnsIndexToNameMap = new HashMap<>();
+        for (int i = 0; i < columnNames.size(); i++) {
+            String columnName = columnNames.get(i);
+            if (columnFilter.test(columnName)) {
+                columnsIndexToNameMap.put(i, columnName);
+            }
+        }
+
+        return new MaterializedResult(
+                getMaterializedRows().stream()
+                        .map(row -> new MaterializedRow(
+                                row.getPrecision(),
+                                columnsIndexToNameMap.keySet().stream()
+                                        .map(row::getField)
+                                        .collect(toList()))) // values are nullable
+                        .collect(toImmutableList()),
+                columnsIndexToNameMap.keySet().stream()
+                        .map(getTypes()::get)
+                        .collect(toImmutableList()));
+    }
+
     public Stream<Object> getOnlyColumn()
     {
         checkState(types.size() == 1, "result set must have exactly one column");
@@ -335,31 +388,31 @@ else if (TIMESTAMP_TZ_MILLIS.equals(type)) {
         else if (type instanceof ArrayType) {
             List<?> list = (List<?>) value;
             Type elementType = ((ArrayType) type).getElementType();
-            BlockBuilder arrayBlockBuilder = blockBuilder.beginBlockEntry();
-            for (Object element : list) {
-                writeValue(elementType, arrayBlockBuilder, element);
-            }
-            blockBuilder.closeEntry();
+            ((ArrayBlockBuilder) blockBuilder).buildEntry(elementBuilder -> {
+                for (Object element : list) {
+                    writeValue(elementType, elementBuilder, element);
+                }
+            });
         }
         else if (type instanceof MapType) {
             Map<?, ?> map = (Map<?, ?>) value;
             Type keyType = ((MapType) type).getKeyType();
             Type valueType = ((MapType) type).getValueType();
-            BlockBuilder mapBlockBuilder = blockBuilder.beginBlockEntry();
-            for (Entry<?, ?> entry : map.entrySet()) {
-                writeValue(keyType, mapBlockBuilder, entry.getKey());
-                writeValue(valueType, mapBlockBuilder, entry.getValue());
-            }
-            blockBuilder.closeEntry();
+            ((MapBlockBuilder) blockBuilder).buildEntry((keyBuilder, valueBuilder) -> {
+                for (Entry<?, ?> entry : map.entrySet()) {
+                    writeValue(keyType, keyBuilder, entry.getKey());
+                    writeValue(valueType, valueBuilder, entry.getValue());
+                }
+            });
         }
         else if (type instanceof RowType) {
             List<?> row = (List<?>) value;
             List<Type> fieldTypes = type.getTypeParameters();
-            BlockBuilder rowBlockBuilder = blockBuilder.beginBlockEntry();
-            for (int field = 0; field < row.size(); field++) {
-                writeValue(fieldTypes.get(field), rowBlockBuilder, row.get(field));
-            }
-            blockBuilder.closeEntry();
+            ((RowBlockBuilder) blockBuilder).buildEntry(fieldBuilders -> {
+                for (int field = 0; field < row.size(); field++) {
+                    writeValue(fieldTypes.get(field), fieldBuilders.get(field), row.get(field));
+                }
+            });
         }
         else {
             throw new IllegalArgumentException("Unsupported type " + type);
diff --git a/core/trino-main/src/main/java/io/trino/testing/QueryRunner.java b/core/trino-main/src/main/java/io/trino/testing/QueryRunner.java
index 85bc3773daba..4d5b6edf9a52 100644
--- a/core/trino-main/src/main/java/io/trino/testing/QueryRunner.java
+++ b/core/trino-main/src/main/java/io/trino/testing/QueryRunner.java
@@ -16,10 +16,10 @@
 import io.trino.Session;
 import io.trino.cost.StatsCalculator;
 import io.trino.execution.FailureInjector.InjectedFailureType;
-import io.trino.execution.querystats.PlanOptimizersStatsCollector;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.FunctionBundle;
 import io.trino.metadata.FunctionManager;
+import io.trino.metadata.LanguageFunctionManager;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.SessionPropertyManager;
@@ -63,6 +63,8 @@ public interface QueryRunner
 
     FunctionManager getFunctionManager();
 
+    LanguageFunctionManager getLanguageFunctionManager();
+
     SplitManager getSplitManager();
 
     ExchangeManager getExchangeManager();
@@ -86,7 +88,7 @@ default MaterializedResultWithPlan executeWithPlan(Session session, @Language("S
         throw new UnsupportedOperationException();
     }
 
-    default Plan createPlan(Session session, @Language("SQL") String sql, WarningCollector warningCollector, PlanOptimizersStatsCollector planOptimizersStatsCollector)
+    default Plan createPlan(Session session, @Language("SQL") String sql)
     {
         throw new UnsupportedOperationException();
     }
diff --git a/core/trino-main/src/main/java/io/trino/testing/TestingAccessControlManager.java b/core/trino-main/src/main/java/io/trino/testing/TestingAccessControlManager.java
index edcccc3ad1c5..4dbe3145aa24 100644
--- a/core/trino-main/src/main/java/io/trino/testing/TestingAccessControlManager.java
+++ b/core/trino-main/src/main/java/io/trino/testing/TestingAccessControlManager.java
@@ -14,6 +14,8 @@
 package io.trino.testing;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.eventlistener.EventListenerManager;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.plugin.base.security.DefaultSystemAccessControl;
@@ -23,14 +25,11 @@
 import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.ViewExpression;
 import io.trino.spi.type.Type;
 import io.trino.transaction.TransactionManager;
 
-import javax.inject.Inject;
-
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -46,6 +45,7 @@
 import java.util.function.Predicate;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.spi.security.AccessDeniedException.denyAddColumn;
 import static io.trino.spi.security.AccessDeniedException.denyAlterColumn;
@@ -63,10 +63,8 @@
 import static io.trino.spi.security.AccessDeniedException.denyDropSchema;
 import static io.trino.spi.security.AccessDeniedException.denyDropTable;
 import static io.trino.spi.security.AccessDeniedException.denyDropView;
-import static io.trino.spi.security.AccessDeniedException.denyExecuteFunction;
 import static io.trino.spi.security.AccessDeniedException.denyExecuteQuery;
 import static io.trino.spi.security.AccessDeniedException.denyExecuteTableProcedure;
-import static io.trino.spi.security.AccessDeniedException.denyGrantExecuteFunctionPrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyImpersonateUser;
 import static io.trino.spi.security.AccessDeniedException.denyInsertTable;
 import static io.trino.spi.security.AccessDeniedException.denyKillQuery;
@@ -142,14 +140,18 @@ public class TestingAccessControlManager
     private BiPredicate<Identity, String> denyIdentityTable = IDENTITY_TABLE_TRUE;
 
     @Inject
-    public TestingAccessControlManager(TransactionManager transactionManager, EventListenerManager eventListenerManager, AccessControlConfig accessControlConfig)
+    public TestingAccessControlManager(
+            TransactionManager transactionManager,
+            EventListenerManager eventListenerManager,
+            AccessControlConfig accessControlConfig,
+            OpenTelemetry openTelemetry)
     {
-        super(transactionManager, eventListenerManager, accessControlConfig, DefaultSystemAccessControl.NAME);
+        super(transactionManager, eventListenerManager, accessControlConfig, openTelemetry, DefaultSystemAccessControl.NAME);
     }
 
     public TestingAccessControlManager(TransactionManager transactionManager, EventListenerManager eventListenerManager)
     {
-        this(transactionManager, eventListenerManager, new AccessControlConfig());
+        this(transactionManager, eventListenerManager, new AccessControlConfig(), OpenTelemetry.noop());
     }
 
     public static TestingPrivilege privilege(String entityName, TestingPrivilegeType type)
@@ -627,48 +629,42 @@ public void checkCanSetMaterializedViewProperties(SecurityContext context, Quali
     }
 
     @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, String functionName, Identity grantee, boolean grantOption)
+    public void checkCanShowColumns(SecurityContext context, CatalogSchemaTableName table)
     {
-        if (shouldDenyPrivilege(context.getIdentity().getUser(), functionName, GRANT_EXECUTE_FUNCTION)) {
-            denyGrantExecuteFunctionPrivilege(functionName, context.getIdentity(), grantee);
+        if (shouldDenyPrivilege(context.getIdentity().getUser(), table.getSchemaTableName().getTableName(), SHOW_COLUMNS)) {
+            denyShowColumns(table.getSchemaTableName().toString());
         }
         if (denyPrivileges.isEmpty()) {
-            super.checkCanGrantExecuteFunctionPrivilege(context, functionName, grantee, grantOption);
+            super.checkCanShowColumns(context, table);
         }
     }
 
     @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName, Identity grantee, boolean grantOption)
+    public Set<String> filterColumns(SecurityContext context, CatalogSchemaTableName table, Set<String> columns)
     {
-        if (shouldDenyPrivilege(context.getIdentity().getUser(), functionName.toString(), GRANT_EXECUTE_FUNCTION)) {
-            denyGrantExecuteFunctionPrivilege(functionName.toString(), context.getIdentity(), grantee);
-        }
-        if (denyPrivileges.isEmpty()) {
-            super.checkCanGrantExecuteFunctionPrivilege(context, functionKind, functionName, grantee, grantOption);
-        }
+        Set<String> visibleColumns = localFilterColumns(context, table.getSchemaTableName(), columns);
+        return super.filterColumns(context, table, visibleColumns);
     }
 
     @Override
-    public void checkCanShowColumns(SecurityContext context, CatalogSchemaTableName table)
+    public Map<SchemaTableName, Set<String>> filterColumns(SecurityContext context, String catalogName, Map<SchemaTableName, Set<String>> tableColumns)
     {
-        if (shouldDenyPrivilege(context.getIdentity().getUser(), table.getSchemaTableName().getTableName(), SHOW_COLUMNS)) {
-            denyShowColumns(table.getSchemaTableName().toString());
-        }
-        if (denyPrivileges.isEmpty()) {
-            super.checkCanShowColumns(context, table);
-        }
+        tableColumns = tableColumns.entrySet().stream()
+                .collect(toImmutableMap(
+                        Map.Entry::getKey,
+                        e -> localFilterColumns(context, e.getKey(), e.getValue())));
+        return super.filterColumns(context, catalogName, tableColumns);
     }
 
-    @Override
-    public Set<String> filterColumns(SecurityContext context, CatalogSchemaTableName table, Set<String> columns)
+    private Set<String> localFilterColumns(SecurityContext context, SchemaTableName table, Set<String> columns)
     {
         ImmutableSet.Builder<String> visibleColumns = ImmutableSet.builder();
         for (String column : columns) {
-            if (!shouldDenyPrivilege(context.getIdentity().getUser(), table.getSchemaTableName().getTableName() + "." + column, SELECT_COLUMN)) {
+            if (!shouldDenyPrivilege(context.getIdentity().getUser(), table.getTableName() + "." + column, SELECT_COLUMN)) {
                 visibleColumns.add(column);
             }
         }
-        return super.filterColumns(context, table, visibleColumns.build());
+        return visibleColumns.build();
     }
 
     @Override
@@ -702,25 +698,27 @@ public void checkCanSelectFromColumns(SecurityContext context, QualifiedObjectNa
     }
 
     @Override
-    public void checkCanExecuteFunction(SecurityContext context, String functionName)
+    public boolean canExecuteFunction(SecurityContext context, QualifiedObjectName functionName)
     {
-        if (shouldDenyPrivilege(context.getIdentity().getUser(), functionName, EXECUTE_FUNCTION)) {
-            denyExecuteFunction(functionName);
+        if (shouldDenyPrivilege(context.getIdentity().getUser(), functionName.toString(), EXECUTE_FUNCTION)) {
+            return false;
         }
         if (denyPrivileges.isEmpty()) {
-            super.checkCanExecuteFunction(context, functionName);
+            return super.canExecuteFunction(context, functionName);
         }
+        return true;
     }
 
     @Override
-    public void checkCanExecuteFunction(SecurityContext context, FunctionKind functionKind, QualifiedObjectName functionName)
+    public boolean canCreateViewWithExecuteFunction(SecurityContext context, QualifiedObjectName functionName)
     {
-        if (shouldDenyPrivilege(context.getIdentity().getUser(), functionName.toString(), EXECUTE_FUNCTION)) {
-            denyExecuteFunction(functionName.toString());
+        if (shouldDenyPrivilege(context.getIdentity().getUser(), functionName.toString(), GRANT_EXECUTE_FUNCTION)) {
+            return false;
         }
         if (denyPrivileges.isEmpty()) {
-            super.checkCanExecuteFunction(context, functionKind, functionName);
+            return super.canCreateViewWithExecuteFunction(context, functionName);
         }
+        return true;
     }
 
     @Override
@@ -804,8 +802,8 @@ public TestingPrivilege(Optional<String> actorName, Predicate<String> entityPred
         public boolean matches(Optional<String> actorName, String entityName, TestingPrivilegeType type)
         {
             return (this.actorName.isEmpty() || this.actorName.equals(actorName)) &&
-                    this.entityPredicate.test(entityName) &&
-                    this.type == type;
+                    this.type == type &&
+                    this.entityPredicate.test(entityName);
         }
 
         @Override
diff --git a/core/trino-main/src/main/java/io/trino/testing/TestingConnectorContext.java b/core/trino-main/src/main/java/io/trino/testing/TestingConnectorContext.java
index 5d6c093c2c85..0d096a44235b 100644
--- a/core/trino-main/src/main/java/io/trino/testing/TestingConnectorContext.java
+++ b/core/trino-main/src/main/java/io/trino/testing/TestingConnectorContext.java
@@ -13,6 +13,9 @@
  */
 package io.trino.testing;
 
+import io.airlift.tracing.Tracing;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.connector.ConnectorAwareNodeManager;
 import io.trino.metadata.InMemoryNodeManager;
 import io.trino.operator.GroupByHashPageIndexerFactory;
@@ -22,12 +25,12 @@
 import io.trino.spi.PageIndexerFactory;
 import io.trino.spi.PageSorter;
 import io.trino.spi.VersionEmbedder;
+import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.MetadataProvider;
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeOperators;
 import io.trino.sql.gen.JoinCompiler;
-import io.trino.type.BlockTypeOperators;
 import io.trino.version.EmbedVersion;
 
 import static io.trino.spi.connector.MetadataProvider.NOOP_METADATA_PROVIDER;
@@ -44,11 +47,28 @@ public final class TestingConnectorContext
 
     public TestingConnectorContext()
     {
-        TypeOperators typeOperators = new TypeOperators();
-        pageIndexerFactory = new GroupByHashPageIndexerFactory(new JoinCompiler(typeOperators), new BlockTypeOperators(typeOperators));
+        pageIndexerFactory = new GroupByHashPageIndexerFactory(new JoinCompiler(new TypeOperators()));
         nodeManager = new ConnectorAwareNodeManager(new InMemoryNodeManager(), "testenv", TEST_CATALOG_HANDLE, true);
     }
 
+    @Override
+    public CatalogHandle getCatalogHandle()
+    {
+        return TEST_CATALOG_HANDLE;
+    }
+
+    @Override
+    public OpenTelemetry getOpenTelemetry()
+    {
+        return OpenTelemetry.noop();
+    }
+
+    @Override
+    public Tracer getTracer()
+    {
+        return Tracing.noopTracer();
+    }
+
     @Override
     public NodeManager getNodeManager()
     {
diff --git a/core/trino-main/src/main/java/io/trino/testing/TestingSession.java b/core/trino-main/src/main/java/io/trino/testing/TestingSession.java
index 9d4f2637a140..025ed3b792e8 100644
--- a/core/trino-main/src/main/java/io/trino/testing/TestingSession.java
+++ b/core/trino-main/src/main/java/io/trino/testing/TestingSession.java
@@ -43,6 +43,16 @@ public final class TestingSession
 
     private TestingSession() {}
 
+    public static Session testSession()
+    {
+        return testSessionBuilder().build();
+    }
+
+    public static Session testSession(Session session)
+    {
+        return testSessionBuilder(session).build();
+    }
+
     public static SessionBuilder testSessionBuilder()
     {
         return testSessionBuilder(new SessionPropertyManager());
@@ -53,6 +63,7 @@ public static SessionBuilder testSessionBuilder(SessionPropertyManager sessionPr
         return Session.builder(sessionPropertyManager)
                 .setQueryId(queryIdGenerator.createNextQueryId())
                 .setIdentity(Identity.ofUser("user"))
+                .setOriginalIdentity(Identity.ofUser("user"))
                 .setSource("test")
                 .setCatalog("catalog")
                 .setSchema("schema")
@@ -63,4 +74,10 @@ public static SessionBuilder testSessionBuilder(SessionPropertyManager sessionPr
                 .setRemoteUserAddress("address")
                 .setUserAgent("agent");
     }
+
+    public static SessionBuilder testSessionBuilder(Session session)
+    {
+        return Session.builder(session)
+                .setQueryId(queryIdGenerator.createNextQueryId());
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/testing/TestingWarningCollector.java b/core/trino-main/src/main/java/io/trino/testing/TestingWarningCollector.java
index 1e8535dd5453..32af75b16494 100644
--- a/core/trino-main/src/main/java/io/trino/testing/TestingWarningCollector.java
+++ b/core/trino-main/src/main/java/io/trino/testing/TestingWarningCollector.java
@@ -15,14 +15,13 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.execution.warnings.WarningCollectorConfig;
 import io.trino.spi.TrinoWarning;
 import io.trino.spi.WarningCode;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/tracing/ForTracing.java b/core/trino-main/src/main/java/io/trino/tracing/ForTracing.java
new file mode 100644
index 000000000000..6fc7bb70542f
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/tracing/ForTracing.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed 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 io.trino.tracing;
+
+import com.google.inject.BindingAnnotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+@Target({FIELD, PARAMETER, METHOD})
+@BindingAnnotation
+public @interface ForTracing {}
diff --git a/core/trino-main/src/main/java/io/trino/tracing/ScopedSpan.java b/core/trino-main/src/main/java/io/trino/tracing/ScopedSpan.java
new file mode 100644
index 000000000000..1b544b2eb99d
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/tracing/ScopedSpan.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed 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 io.trino.tracing;
+
+import com.google.errorprone.annotations.MustBeClosed;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Scope;
+
+import static java.util.Objects.requireNonNull;
+
+public final class ScopedSpan
+        implements AutoCloseable
+{
+    private final Span span;
+    private final Scope scope;
+
+    @SuppressWarnings("MustBeClosedChecker")
+    private ScopedSpan(Span span)
+    {
+        this.span = requireNonNull(span, "span is null");
+        this.scope = span.makeCurrent();
+    }
+
+    @Override
+    public void close()
+    {
+        try {
+            scope.close();
+        }
+        finally {
+            span.end();
+        }
+    }
+
+    @MustBeClosed
+    public static ScopedSpan scopedSpan(Tracer tracer, String name)
+    {
+        return scopedSpan(tracer.spanBuilder(name).startSpan());
+    }
+
+    @MustBeClosed
+    public static ScopedSpan scopedSpan(Span span)
+    {
+        return new ScopedSpan(span);
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/tracing/TracingAccessControl.java b/core/trino-main/src/main/java/io/trino/tracing/TracingAccessControl.java
new file mode 100644
index 000000000000..4c9837fe1e81
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/tracing/TracingAccessControl.java
@@ -0,0 +1,760 @@
+/*
+ * Licensed 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 io.trino.tracing;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.inject.Inject;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.metadata.QualifiedObjectName;
+import io.trino.security.AccessControl;
+import io.trino.security.SecurityContext;
+import io.trino.spi.connector.CatalogSchemaName;
+import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.SchemaFunctionName;
+import io.trino.spi.security.Identity;
+import io.trino.spi.security.Privilege;
+import io.trino.spi.security.TrinoPrincipal;
+import io.trino.spi.security.ViewExpression;
+import io.trino.spi.type.Type;
+
+import java.security.Principal;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static io.trino.tracing.ScopedSpan.scopedSpan;
+import static java.util.Objects.requireNonNull;
+
+public class TracingAccessControl
+        implements AccessControl
+{
+    private final Tracer tracer;
+    private final AccessControl delegate;
+
+    @Inject
+    public TracingAccessControl(Tracer tracer, @ForTracing AccessControl delegate)
+    {
+        this.delegate = requireNonNull(delegate, "delegate is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
+    }
+
+    @VisibleForTesting
+    public AccessControl getDelegate()
+    {
+        return delegate;
+    }
+
+    @Override
+    public void checkCanSetUser(Optional<Principal> principal, String userName)
+    {
+        Span span = startSpan("checkCanSetUser");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSetUser(principal, userName);
+        }
+    }
+
+    @Override
+    public void checkCanImpersonateUser(Identity identity, String userName)
+    {
+        Span span = startSpan("checkCanImpersonateUser");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanImpersonateUser(identity, userName);
+        }
+    }
+
+    @Override
+    public void checkCanReadSystemInformation(Identity identity)
+    {
+        Span span = startSpan("checkCanReadSystemInformation");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanReadSystemInformation(identity);
+        }
+    }
+
+    @Override
+    public void checkCanWriteSystemInformation(Identity identity)
+    {
+        Span span = startSpan("checkCanWriteSystemInformation");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanWriteSystemInformation(identity);
+        }
+    }
+
+    @Override
+    public void checkCanExecuteQuery(Identity identity)
+    {
+        Span span = startSpan("checkCanExecuteQuery");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanExecuteQuery(identity);
+        }
+    }
+
+    @Override
+    public void checkCanViewQueryOwnedBy(Identity identity, Identity queryOwner)
+    {
+        Span span = startSpan("checkCanViewQueryOwnedBy");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanViewQueryOwnedBy(identity, queryOwner);
+        }
+    }
+
+    @Override
+    public Collection<Identity> filterQueriesOwnedBy(Identity identity, Collection<Identity> queryOwners)
+    {
+        Span span = startSpan("filterQueriesOwnedBy");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.filterQueriesOwnedBy(identity, queryOwners);
+        }
+    }
+
+    @Override
+    public void checkCanKillQueryOwnedBy(Identity identity, Identity queryOwner)
+    {
+        Span span = startSpan("checkCanKillQueryOwnedBy");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanKillQueryOwnedBy(identity, queryOwner);
+        }
+    }
+
+    @Override
+    public void checkCanCreateCatalog(SecurityContext context, String catalog)
+    {
+        Span span = startSpan("checkCanCreateCatalog");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanCreateCatalog(context, catalog);
+        }
+    }
+
+    @Override
+    public void checkCanDropCatalog(SecurityContext context, String catalog)
+    {
+        Span span = startSpan("checkCanDropCatalog");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanDropCatalog(context, catalog);
+        }
+    }
+
+    @Override
+    public Set<String> filterCatalogs(SecurityContext context, Set<String> catalogs)
+    {
+        Span span = startSpan("filterCatalogs");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.filterCatalogs(context, catalogs);
+        }
+    }
+
+    @Override
+    public void checkCanCreateSchema(SecurityContext context, CatalogSchemaName schemaName, Map<String, Object> properties)
+    {
+        Span span = startSpan("checkCanCreateSchema");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanCreateSchema(context, schemaName, properties);
+        }
+    }
+
+    @Override
+    public void checkCanDropSchema(SecurityContext context, CatalogSchemaName schemaName)
+    {
+        Span span = startSpan("checkCanDropSchema");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanDropSchema(context, schemaName);
+        }
+    }
+
+    @Override
+    public void checkCanRenameSchema(SecurityContext context, CatalogSchemaName schemaName, String newSchemaName)
+    {
+        Span span = startSpan("checkCanRenameSchema");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanRenameSchema(context, schemaName, newSchemaName);
+        }
+    }
+
+    @Override
+    public void checkCanSetSchemaAuthorization(SecurityContext context, CatalogSchemaName schemaName, TrinoPrincipal principal)
+    {
+        Span span = startSpan("checkCanSetSchemaAuthorization");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSetSchemaAuthorization(context, schemaName, principal);
+        }
+    }
+
+    @Override
+    public void checkCanShowSchemas(SecurityContext context, String catalogName)
+    {
+        Span span = startSpan("checkCanShowSchemas");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanShowSchemas(context, catalogName);
+        }
+    }
+
+    @Override
+    public Set<String> filterSchemas(SecurityContext context, String catalogName, Set<String> schemaNames)
+    {
+        Span span = startSpan("filterSchemas");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.filterSchemas(context, catalogName, schemaNames);
+        }
+    }
+
+    @Override
+    public void checkCanShowCreateSchema(SecurityContext context, CatalogSchemaName schemaName)
+    {
+        Span span = startSpan("checkCanShowCreateSchema");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanShowCreateSchema(context, schemaName);
+        }
+    }
+
+    @Override
+    public void checkCanShowCreateTable(SecurityContext context, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("checkCanShowCreateTable");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanShowCreateTable(context, tableName);
+        }
+    }
+
+    @Override
+    public void checkCanCreateTable(SecurityContext context, QualifiedObjectName tableName, Map<String, Object> properties)
+    {
+        Span span = startSpan("checkCanCreateTable");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanCreateTable(context, tableName, properties);
+        }
+    }
+
+    @Override
+    public void checkCanDropTable(SecurityContext context, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("checkCanDropTable");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanDropTable(context, tableName);
+        }
+    }
+
+    @Override
+    public void checkCanRenameTable(SecurityContext context, QualifiedObjectName tableName, QualifiedObjectName newTableName)
+    {
+        Span span = startSpan("checkCanRenameTable");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanRenameTable(context, tableName, newTableName);
+        }
+    }
+
+    @Override
+    public void checkCanSetTableProperties(SecurityContext context, QualifiedObjectName tableName, Map<String, Optional<Object>> properties)
+    {
+        Span span = startSpan("checkCanSetTableProperties");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSetTableProperties(context, tableName, properties);
+        }
+    }
+
+    @Override
+    public void checkCanSetTableComment(SecurityContext context, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("checkCanSetTableComment");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSetTableComment(context, tableName);
+        }
+    }
+
+    @Override
+    public void checkCanSetViewComment(SecurityContext context, QualifiedObjectName viewName)
+    {
+        Span span = startSpan("checkCanSetViewComment");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSetViewComment(context, viewName);
+        }
+    }
+
+    @Override
+    public void checkCanSetColumnComment(SecurityContext context, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("checkCanSetColumnComment");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSetColumnComment(context, tableName);
+        }
+    }
+
+    @Override
+    public void checkCanShowTables(SecurityContext context, CatalogSchemaName schema)
+    {
+        Span span = startSpan("checkCanShowTables");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanShowTables(context, schema);
+        }
+    }
+
+    @Override
+    public Set<SchemaTableName> filterTables(SecurityContext context, String catalogName, Set<SchemaTableName> tableNames)
+    {
+        Span span = startSpan("filterTables");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.filterTables(context, catalogName, tableNames);
+        }
+    }
+
+    @Override
+    public void checkCanShowColumns(SecurityContext context, CatalogSchemaTableName table)
+    {
+        Span span = startSpan("checkCanShowColumns");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanShowColumns(context, table);
+        }
+    }
+
+    @Override
+    public Set<String> filterColumns(SecurityContext context, CatalogSchemaTableName tableName, Set<String> columns)
+    {
+        Span span = startSpan("filterColumns");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.filterColumns(context, tableName, columns);
+        }
+    }
+
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(SecurityContext context, String catalogName, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        Span span = startSpan("filterColumns bulk");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.filterColumns(context, catalogName, tableColumns);
+        }
+    }
+
+    @Override
+    public void checkCanAddColumns(SecurityContext context, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("checkCanAddColumns");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanAddColumns(context, tableName);
+        }
+    }
+
+    @Override
+    public void checkCanDropColumn(SecurityContext context, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("checkCanDropColumn");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanDropColumn(context, tableName);
+        }
+    }
+
+    @Override
+    public void checkCanAlterColumn(SecurityContext context, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("checkCanAlterColumn");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanAlterColumn(context, tableName);
+        }
+    }
+
+    @Override
+    public void checkCanSetTableAuthorization(SecurityContext context, QualifiedObjectName tableName, TrinoPrincipal principal)
+    {
+        Span span = startSpan("checkCanSetTableAuthorization");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSetTableAuthorization(context, tableName, principal);
+        }
+    }
+
+    @Override
+    public void checkCanRenameColumn(SecurityContext context, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("checkCanRenameColumn");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanRenameColumn(context, tableName);
+        }
+    }
+
+    @Override
+    public void checkCanInsertIntoTable(SecurityContext context, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("checkCanInsertIntoTable");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanInsertIntoTable(context, tableName);
+        }
+    }
+
+    @Override
+    public void checkCanDeleteFromTable(SecurityContext context, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("checkCanDeleteFromTable");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanDeleteFromTable(context, tableName);
+        }
+    }
+
+    @Override
+    public void checkCanTruncateTable(SecurityContext context, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("checkCanTruncateTable");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanTruncateTable(context, tableName);
+        }
+    }
+
+    @Override
+    public void checkCanUpdateTableColumns(SecurityContext context, QualifiedObjectName tableName, Set<String> updatedColumnNames)
+    {
+        Span span = startSpan("checkCanUpdateTableColumns");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanUpdateTableColumns(context, tableName, updatedColumnNames);
+        }
+    }
+
+    @Override
+    public void checkCanCreateView(SecurityContext context, QualifiedObjectName viewName)
+    {
+        Span span = startSpan("checkCanCreateView");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanCreateView(context, viewName);
+        }
+    }
+
+    @Override
+    public void checkCanRenameView(SecurityContext context, QualifiedObjectName viewName, QualifiedObjectName newViewName)
+    {
+        Span span = startSpan("checkCanRenameView");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanRenameView(context, viewName, newViewName);
+        }
+    }
+
+    @Override
+    public void checkCanSetViewAuthorization(SecurityContext context, QualifiedObjectName view, TrinoPrincipal principal)
+    {
+        Span span = startSpan("checkCanSetViewAuthorization");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSetViewAuthorization(context, view, principal);
+        }
+    }
+
+    @Override
+    public void checkCanDropView(SecurityContext context, QualifiedObjectName viewName)
+    {
+        Span span = startSpan("checkCanDropView");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanDropView(context, viewName);
+        }
+    }
+
+    @Override
+    public void checkCanCreateViewWithSelectFromColumns(SecurityContext context, QualifiedObjectName tableName, Set<String> columnNames)
+    {
+        Span span = startSpan("checkCanCreateViewWithSelectFromColumns");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanCreateViewWithSelectFromColumns(context, tableName, columnNames);
+        }
+    }
+
+    @Override
+    public void checkCanCreateMaterializedView(SecurityContext context, QualifiedObjectName materializedViewName, Map<String, Object> properties)
+    {
+        Span span = startSpan("checkCanCreateMaterializedView");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanCreateMaterializedView(context, materializedViewName, properties);
+        }
+    }
+
+    @Override
+    public void checkCanRefreshMaterializedView(SecurityContext context, QualifiedObjectName materializedViewName)
+    {
+        Span span = startSpan("checkCanRefreshMaterializedView");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanRefreshMaterializedView(context, materializedViewName);
+        }
+    }
+
+    @Override
+    public void checkCanDropMaterializedView(SecurityContext context, QualifiedObjectName materializedViewName)
+    {
+        Span span = startSpan("checkCanDropMaterializedView");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanDropMaterializedView(context, materializedViewName);
+        }
+    }
+
+    @Override
+    public void checkCanRenameMaterializedView(SecurityContext context, QualifiedObjectName viewName, QualifiedObjectName newViewName)
+    {
+        Span span = startSpan("checkCanRenameMaterializedView");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanRenameMaterializedView(context, viewName, newViewName);
+        }
+    }
+
+    @Override
+    public void checkCanSetMaterializedViewProperties(SecurityContext context, QualifiedObjectName materializedViewName, Map<String, Optional<Object>> properties)
+    {
+        Span span = startSpan("checkCanSetMaterializedViewProperties");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSetMaterializedViewProperties(context, materializedViewName, properties);
+        }
+    }
+
+    @Override
+    public void checkCanGrantSchemaPrivilege(SecurityContext context, Privilege privilege, CatalogSchemaName schemaName, TrinoPrincipal grantee, boolean grantOption)
+    {
+        Span span = startSpan("checkCanGrantSchemaPrivilege");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanGrantSchemaPrivilege(context, privilege, schemaName, grantee, grantOption);
+        }
+    }
+
+    @Override
+    public void checkCanDenySchemaPrivilege(SecurityContext context, Privilege privilege, CatalogSchemaName schemaName, TrinoPrincipal grantee)
+    {
+        Span span = startSpan("checkCanDenySchemaPrivilege");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanDenySchemaPrivilege(context, privilege, schemaName, grantee);
+        }
+    }
+
+    @Override
+    public void checkCanRevokeSchemaPrivilege(SecurityContext context, Privilege privilege, CatalogSchemaName schemaName, TrinoPrincipal revokee, boolean grantOption)
+    {
+        Span span = startSpan("checkCanRevokeSchemaPrivilege");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanRevokeSchemaPrivilege(context, privilege, schemaName, revokee, grantOption);
+        }
+    }
+
+    @Override
+    public void checkCanGrantTablePrivilege(SecurityContext context, Privilege privilege, QualifiedObjectName tableName, TrinoPrincipal grantee, boolean grantOption)
+    {
+        Span span = startSpan("checkCanGrantTablePrivilege");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanGrantTablePrivilege(context, privilege, tableName, grantee, grantOption);
+        }
+    }
+
+    @Override
+    public void checkCanDenyTablePrivilege(SecurityContext context, Privilege privilege, QualifiedObjectName tableName, TrinoPrincipal grantee)
+    {
+        Span span = startSpan("checkCanDenyTablePrivilege");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanDenyTablePrivilege(context, privilege, tableName, grantee);
+        }
+    }
+
+    @Override
+    public void checkCanRevokeTablePrivilege(SecurityContext context, Privilege privilege, QualifiedObjectName tableName, TrinoPrincipal revokee, boolean grantOption)
+    {
+        Span span = startSpan("checkCanRevokeTablePrivilege");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanRevokeTablePrivilege(context, privilege, tableName, revokee, grantOption);
+        }
+    }
+
+    @Override
+    public void checkCanSetSystemSessionProperty(Identity identity, String propertyName)
+    {
+        Span span = startSpan("checkCanSetSystemSessionProperty");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSetSystemSessionProperty(identity, propertyName);
+        }
+    }
+
+    @Override
+    public void checkCanSetCatalogSessionProperty(SecurityContext context, String catalogName, String propertyName)
+    {
+        Span span = startSpan("checkCanSetCatalogSessionProperty");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSetCatalogSessionProperty(context, catalogName, propertyName);
+        }
+    }
+
+    @Override
+    public void checkCanSelectFromColumns(SecurityContext context, QualifiedObjectName tableName, Set<String> columnNames)
+    {
+        Span span = startSpan("checkCanSelectFromColumns");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSelectFromColumns(context, tableName, columnNames);
+        }
+    }
+
+    @Override
+    public void checkCanCreateRole(SecurityContext context, String role, Optional<TrinoPrincipal> grantor, Optional<String> catalogName)
+    {
+        Span span = startSpan("checkCanCreateRole");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanCreateRole(context, role, grantor, catalogName);
+        }
+    }
+
+    @Override
+    public void checkCanDropRole(SecurityContext context, String role, Optional<String> catalogName)
+    {
+        Span span = startSpan("checkCanDropRole");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanDropRole(context, role, catalogName);
+        }
+    }
+
+    @Override
+    public void checkCanGrantRoles(SecurityContext context, Set<String> roles, Set<TrinoPrincipal> grantees, boolean adminOption, Optional<TrinoPrincipal> grantor, Optional<String> catalogName)
+    {
+        Span span = startSpan("checkCanGrantRoles");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanGrantRoles(context, roles, grantees, adminOption, grantor, catalogName);
+        }
+    }
+
+    @Override
+    public void checkCanRevokeRoles(SecurityContext context, Set<String> roles, Set<TrinoPrincipal> grantees, boolean adminOption, Optional<TrinoPrincipal> grantor, Optional<String> catalogName)
+    {
+        Span span = startSpan("checkCanRevokeRoles");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanRevokeRoles(context, roles, grantees, adminOption, grantor, catalogName);
+        }
+    }
+
+    @Override
+    public void checkCanSetCatalogRole(SecurityContext context, String role, String catalogName)
+    {
+        Span span = startSpan("checkCanSetCatalogRole");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanSetCatalogRole(context, role, catalogName);
+        }
+    }
+
+    @Override
+    public void checkCanShowRoles(SecurityContext context, Optional<String> catalogName)
+    {
+        Span span = startSpan("checkCanShowRoles");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanShowRoles(context, catalogName);
+        }
+    }
+
+    @Override
+    public void checkCanShowCurrentRoles(SecurityContext context, Optional<String> catalogName)
+    {
+        Span span = startSpan("checkCanShowCurrentRoles");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanShowCurrentRoles(context, catalogName);
+        }
+    }
+
+    @Override
+    public void checkCanShowRoleGrants(SecurityContext context, Optional<String> catalogName)
+    {
+        Span span = startSpan("checkCanShowRoleGrants");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanShowRoleGrants(context, catalogName);
+        }
+    }
+
+    @Override
+    public void checkCanExecuteProcedure(SecurityContext context, QualifiedObjectName procedureName)
+    {
+        Span span = startSpan("checkCanExecuteProcedure");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanExecuteProcedure(context, procedureName);
+        }
+    }
+
+    @Override
+    public boolean canExecuteFunction(SecurityContext context, QualifiedObjectName functionName)
+    {
+        Span span = startSpan("canExecuteFunction");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.canExecuteFunction(context, functionName);
+        }
+    }
+
+    @Override
+    public boolean canCreateViewWithExecuteFunction(SecurityContext context, QualifiedObjectName functionName)
+    {
+        Span span = startSpan("canCreateViewWithExecuteFunction");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.canCreateViewWithExecuteFunction(context, functionName);
+        }
+    }
+
+    @Override
+    public void checkCanExecuteTableProcedure(SecurityContext context, QualifiedObjectName tableName, String procedureName)
+    {
+        Span span = startSpan("checkCanExecuteTableProcedure");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanExecuteTableProcedure(context, tableName, procedureName);
+        }
+    }
+
+    @Override
+    public void checkCanShowFunctions(SecurityContext context, CatalogSchemaName schema)
+    {
+        Span span = startSpan("checkCanShowFunctions");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanShowFunctions(context, schema);
+        }
+    }
+
+    @Override
+    public Set<SchemaFunctionName> filterFunctions(SecurityContext context, String catalogName, Set<SchemaFunctionName> functionNames)
+    {
+        Span span = startSpan("filterFunctions");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.filterFunctions(context, catalogName, functionNames);
+        }
+    }
+
+    @Override
+    public void checkCanCreateFunction(SecurityContext context, QualifiedObjectName functionName)
+    {
+        Span span = startSpan("checkCanCreateFunction");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanCreateFunction(context, functionName);
+        }
+    }
+
+    @Override
+    public void checkCanDropFunction(SecurityContext context, QualifiedObjectName functionName)
+    {
+        Span span = startSpan("checkCanDropFunction");
+        try (var ignored = scopedSpan(span)) {
+            delegate.checkCanDropFunction(context, functionName);
+        }
+    }
+
+    @Override
+    public List<ViewExpression> getRowFilters(SecurityContext context, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("getRowFilters");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getRowFilters(context, tableName);
+        }
+    }
+
+    @Override
+    public Optional<ViewExpression> getColumnMask(SecurityContext context, QualifiedObjectName tableName, String columnName, Type type)
+    {
+        Span span = startSpan("getColumnMask");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getColumnMask(context, tableName, columnName, type);
+        }
+    }
+
+    private Span startSpan(String methodName)
+    {
+        return tracer.spanBuilder("AccessControl." + methodName)
+                .startSpan();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/tracing/TracingConnectorMetadata.java b/core/trino-main/src/main/java/io/trino/tracing/TracingConnectorMetadata.java
new file mode 100644
index 000000000000..df84f0eec8bd
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/tracing/TracingConnectorMetadata.java
@@ -0,0 +1,1414 @@
+/*
+ * Licensed 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 io.trino.tracing;
+
+import io.airlift.slice.Slice;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.spi.connector.AggregateFunction;
+import io.trino.spi.connector.AggregationApplicationResult;
+import io.trino.spi.connector.BeginTableExecuteResult;
+import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.ConnectorAnalyzeMetadata;
+import io.trino.spi.connector.ConnectorInsertTableHandle;
+import io.trino.spi.connector.ConnectorMaterializedViewDefinition;
+import io.trino.spi.connector.ConnectorMergeTableHandle;
+import io.trino.spi.connector.ConnectorMetadata;
+import io.trino.spi.connector.ConnectorOutputMetadata;
+import io.trino.spi.connector.ConnectorOutputTableHandle;
+import io.trino.spi.connector.ConnectorPartitioningHandle;
+import io.trino.spi.connector.ConnectorResolvedIndex;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorTableExecuteHandle;
+import io.trino.spi.connector.ConnectorTableHandle;
+import io.trino.spi.connector.ConnectorTableLayout;
+import io.trino.spi.connector.ConnectorTableMetadata;
+import io.trino.spi.connector.ConnectorTableProperties;
+import io.trino.spi.connector.ConnectorTableSchema;
+import io.trino.spi.connector.ConnectorTableVersion;
+import io.trino.spi.connector.ConnectorViewDefinition;
+import io.trino.spi.connector.Constraint;
+import io.trino.spi.connector.ConstraintApplicationResult;
+import io.trino.spi.connector.JoinApplicationResult;
+import io.trino.spi.connector.JoinCondition;
+import io.trino.spi.connector.JoinStatistics;
+import io.trino.spi.connector.JoinType;
+import io.trino.spi.connector.LimitApplicationResult;
+import io.trino.spi.connector.MaterializedViewFreshness;
+import io.trino.spi.connector.ProjectionApplicationResult;
+import io.trino.spi.connector.RelationColumnsMetadata;
+import io.trino.spi.connector.RelationCommentMetadata;
+import io.trino.spi.connector.RetryMode;
+import io.trino.spi.connector.RowChangeParadigm;
+import io.trino.spi.connector.SampleApplicationResult;
+import io.trino.spi.connector.SampleType;
+import io.trino.spi.connector.SaveMode;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.SchemaTablePrefix;
+import io.trino.spi.connector.SortItem;
+import io.trino.spi.connector.SystemTable;
+import io.trino.spi.connector.TableColumnsMetadata;
+import io.trino.spi.connector.TableFunctionApplicationResult;
+import io.trino.spi.connector.TableScanRedirectApplicationResult;
+import io.trino.spi.connector.TopNApplicationResult;
+import io.trino.spi.connector.WriterScalingOptions;
+import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Constant;
+import io.trino.spi.function.AggregationFunctionMetadata;
+import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.FunctionDependencyDeclaration;
+import io.trino.spi.function.FunctionId;
+import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.LanguageFunction;
+import io.trino.spi.function.SchemaFunctionName;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.security.GrantInfo;
+import io.trino.spi.security.Privilege;
+import io.trino.spi.security.RoleGrant;
+import io.trino.spi.security.TrinoPrincipal;
+import io.trino.spi.statistics.ComputedStatistics;
+import io.trino.spi.statistics.TableStatistics;
+import io.trino.spi.statistics.TableStatisticsMetadata;
+import io.trino.spi.type.Type;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.UnaryOperator;
+
+import static io.airlift.tracing.Tracing.attribute;
+import static io.trino.tracing.ScopedSpan.scopedSpan;
+import static java.util.Objects.requireNonNull;
+
+public class TracingConnectorMetadata
+        implements ConnectorMetadata
+{
+    private final Tracer tracer;
+    private final String catalogName;
+    private final ConnectorMetadata delegate;
+
+    public TracingConnectorMetadata(Tracer tracer, String catalogName, ConnectorMetadata delegate)
+    {
+        this.tracer = requireNonNull(tracer, "tracer is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
+        this.delegate = requireNonNull(delegate, "delegate is null");
+    }
+
+    @Override
+    public boolean schemaExists(ConnectorSession session, String schemaName)
+    {
+        Span span = startSpan("schemaExists", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.schemaExists(session, schemaName);
+        }
+    }
+
+    @Override
+    public List<String> listSchemaNames(ConnectorSession session)
+    {
+        Span span = startSpan("listSchemaNames");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listSchemaNames(session);
+        }
+    }
+
+    @Override
+    public ConnectorTableHandle getTableHandle(ConnectorSession session, SchemaTableName tableName)
+    {
+        Span span = startSpan("getTableHandle", tableName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableHandle(session, tableName);
+        }
+    }
+
+    @Override
+    public ConnectorTableHandle getTableHandle(ConnectorSession session, SchemaTableName tableName, Optional<ConnectorTableVersion> startVersion, Optional<ConnectorTableVersion> endVersion)
+    {
+        Span span = startSpan("getTableHandle", tableName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableHandle(session, tableName, startVersion, endVersion);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorTableExecuteHandle> getTableHandleForExecute(ConnectorSession session, ConnectorTableHandle tableHandle, String procedureName, Map<String, Object> executeProperties, RetryMode retryMode)
+    {
+        Span span = startSpan("getTableHandleForExecute", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableHandleForExecute(session, tableHandle, procedureName, executeProperties, retryMode);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorTableLayout> getLayoutForTableExecute(ConnectorSession session, ConnectorTableExecuteHandle tableExecuteHandle)
+    {
+        Span span = startSpan("getLayoutForTableExecute", tableExecuteHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getLayoutForTableExecute(session, tableExecuteHandle);
+        }
+    }
+
+    @Override
+    public BeginTableExecuteResult<ConnectorTableExecuteHandle, ConnectorTableHandle> beginTableExecute(ConnectorSession session, ConnectorTableExecuteHandle tableExecuteHandle, ConnectorTableHandle updatedSourceTableHandle)
+    {
+        Span span = startSpan("beginTableExecute", tableExecuteHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginTableExecute(session, tableExecuteHandle, updatedSourceTableHandle);
+        }
+    }
+
+    @Override
+    public void finishTableExecute(ConnectorSession session, ConnectorTableExecuteHandle tableExecuteHandle, Collection<Slice> fragments, List<Object> tableExecuteState)
+    {
+        Span span = startSpan("finishTableExecute", tableExecuteHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.finishTableExecute(session, tableExecuteHandle, fragments, tableExecuteState);
+        }
+    }
+
+    @Override
+    public void executeTableExecute(ConnectorSession session, ConnectorTableExecuteHandle tableExecuteHandle)
+    {
+        Span span = startSpan("executeTableExecute", tableExecuteHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.executeTableExecute(session, tableExecuteHandle);
+        }
+    }
+
+    @Override
+    public Optional<SystemTable> getSystemTable(ConnectorSession session, SchemaTableName tableName)
+    {
+        Span span = startSpan("getSystemTable", tableName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getSystemTable(session, tableName);
+        }
+    }
+
+    @Override
+    public ConnectorTableHandle makeCompatiblePartitioning(ConnectorSession session, ConnectorTableHandle tableHandle, ConnectorPartitioningHandle partitioningHandle)
+    {
+        Span span = startSpan("makeCompatiblePartitioning", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.makeCompatiblePartitioning(session, tableHandle, partitioningHandle);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorPartitioningHandle> getCommonPartitioningHandle(ConnectorSession session, ConnectorPartitioningHandle left, ConnectorPartitioningHandle right)
+    {
+        Span span = startSpan("getCommonPartitioning");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getCommonPartitioningHandle(session, left, right);
+        }
+    }
+
+    @Override
+    public SchemaTableName getTableName(ConnectorSession session, ConnectorTableHandle table)
+    {
+        Span span = startSpan("getTableName", table);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableName(session, table);
+        }
+    }
+
+    @Override
+    public ConnectorTableSchema getTableSchema(ConnectorSession session, ConnectorTableHandle table)
+    {
+        Span span = startSpan("getTableSchema", table);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableSchema(session, table);
+        }
+    }
+
+    @Override
+    public ConnectorTableMetadata getTableMetadata(ConnectorSession session, ConnectorTableHandle table)
+    {
+        Span span = startSpan("getTableMetadata", table);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableMetadata(session, table);
+        }
+    }
+
+    @Override
+    public Optional<Object> getInfo(ConnectorTableHandle table)
+    {
+        Span span = startSpan("getInfo", table);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getInfo(table);
+        }
+    }
+
+    @Override
+    public List<SchemaTableName> listTables(ConnectorSession session, Optional<String> schemaName)
+    {
+        Span span = startSpan("listTables", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listTables(session, schemaName);
+        }
+    }
+
+    @Override
+    public Map<String, ColumnHandle> getColumnHandles(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        Span span = startSpan("getColumnHandles", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getColumnHandles(session, tableHandle);
+        }
+    }
+
+    @Override
+    public ColumnMetadata getColumnMetadata(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle columnHandle)
+    {
+        Span span = startSpan("getColumnMetadata", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getColumnMetadata(session, tableHandle, columnHandle);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
+    {
+        Span span = startSpan("listTableColumns", prefix);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listTableColumns(session, prefix);
+        }
+    }
+
+    @Override
+    public Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
+    {
+        Span span = startSpan("streamTableColumns", prefix);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.streamTableColumns(session, prefix);
+        }
+    }
+
+    @Override
+    public Iterator<RelationColumnsMetadata> streamRelationColumns(ConnectorSession session, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        Span span = startSpan("streamRelationColumns", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.streamRelationColumns(session, schemaName, relationFilter);
+        }
+    }
+
+    @Override
+    public Iterator<RelationCommentMetadata> streamRelationComments(ConnectorSession session, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        Span span = startSpan("streamRelationComments", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.streamRelationComments(session, schemaName, relationFilter);
+        }
+    }
+
+    @Override
+    public TableStatistics getTableStatistics(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        Span span = startSpan("getTableStatistics", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableStatistics(session, tableHandle);
+        }
+    }
+
+    @Override
+    public void createSchema(ConnectorSession session, String schemaName, Map<String, Object> properties, TrinoPrincipal owner)
+    {
+        Span span = startSpan("createSchema", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.createSchema(session, schemaName, properties, owner);
+        }
+    }
+
+    @Override
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
+    {
+        Span span = startSpan("dropSchema", schemaName)
+                .setAttribute(TrinoAttributes.CASCADE, cascade);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropSchema(session, schemaName, cascade);
+        }
+    }
+
+    @Override
+    public void renameSchema(ConnectorSession session, String source, String target)
+    {
+        Span span = startSpan("renameSchema", source);
+        try (var ignored = scopedSpan(span)) {
+            delegate.renameSchema(session, source, target);
+        }
+    }
+
+    @Override
+    public void setSchemaAuthorization(ConnectorSession session, String schemaName, TrinoPrincipal principal)
+    {
+        Span span = startSpan("setSchemaAuthorization", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setSchemaAuthorization(session, schemaName, principal);
+        }
+    }
+
+    @Override
+    public void createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, boolean ignoreExisting)
+    {
+        Span span = startSpan("createTable", tableMetadata.getTable());
+        try (var ignored = scopedSpan(span)) {
+            delegate.createTable(session, tableMetadata, ignoreExisting);
+        }
+    }
+
+    @Override
+    public void createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, SaveMode saveMode)
+    {
+        Span span = startSpan("createTable", tableMetadata.getTable());
+        try (var ignored = scopedSpan(span)) {
+            delegate.createTable(session, tableMetadata, saveMode);
+        }
+    }
+
+    @Override
+    public void dropTable(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        Span span = startSpan("dropTable", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropTable(session, tableHandle);
+        }
+    }
+
+    @Override
+    public void truncateTable(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        Span span = startSpan("truncateTable", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.truncateTable(session, tableHandle);
+        }
+    }
+
+    @Override
+    public void renameTable(ConnectorSession session, ConnectorTableHandle tableHandle, SchemaTableName newTableName)
+    {
+        Span span = startSpan("renameTable", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.renameTable(session, tableHandle, newTableName);
+        }
+    }
+
+    @Override
+    public void setTableProperties(ConnectorSession session, ConnectorTableHandle tableHandle, Map<String, Optional<Object>> properties)
+    {
+        Span span = startSpan("setTableProperties", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setTableProperties(session, tableHandle, properties);
+        }
+    }
+
+    @Override
+    public void setTableComment(ConnectorSession session, ConnectorTableHandle tableHandle, Optional<String> comment)
+    {
+        Span span = startSpan("setTableComment", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setTableComment(session, tableHandle, comment);
+        }
+    }
+
+    @Override
+    public void setViewComment(ConnectorSession session, SchemaTableName viewName, Optional<String> comment)
+    {
+        Span span = startSpan("setViewComment", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setViewComment(session, viewName, comment);
+        }
+    }
+
+    @Override
+    public void setViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
+    {
+        Span span = startSpan("setViewColumnComment", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setViewColumnComment(session, viewName, columnName, comment);
+        }
+    }
+
+    @Override
+    public void setMaterializedViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
+    {
+        Span span = startSpan("setMaterializedViewColumnComment", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setMaterializedViewColumnComment(session, viewName, columnName, comment);
+        }
+    }
+
+    @Override
+    public void setColumnComment(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column, Optional<String> comment)
+    {
+        Span span = startSpan("setColumnComment", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setColumnComment(session, tableHandle, column, comment);
+        }
+    }
+
+    @Override
+    public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnMetadata column)
+    {
+        Span span = startSpan("addColumn", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.addColumn(session, tableHandle, column);
+        }
+    }
+
+    @Override
+    public void addField(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> parentPath, String fieldName, Type type, boolean ignoreExisting)
+    {
+        Span span = startSpan("addField", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.addField(session, tableHandle, parentPath, fieldName, type, ignoreExisting);
+        }
+    }
+
+    @Override
+    public void setColumnType(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column, Type type)
+    {
+        Span span = startSpan("setColumnType", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setColumnType(session, tableHandle, column, type);
+        }
+    }
+
+    @Override
+    public void setFieldType(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> fieldPath, Type type)
+    {
+        Span span = startSpan("setFieldType", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setFieldType(session, tableHandle, fieldPath, type);
+        }
+    }
+
+    @Override
+    public void setTableAuthorization(ConnectorSession session, SchemaTableName tableName, TrinoPrincipal principal)
+    {
+        Span span = startSpan("setTableAuthorization", tableName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setTableAuthorization(session, tableName, principal);
+        }
+    }
+
+    @Override
+    public void renameColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle source, String target)
+    {
+        Span span = startSpan("renameColumn", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.renameColumn(session, tableHandle, source, target);
+        }
+    }
+
+    @Override
+    public void renameField(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> fieldPath, String target)
+    {
+        Span span = startSpan("renameField", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.renameField(session, tableHandle, fieldPath, target);
+        }
+    }
+
+    @Override
+    public void dropColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column)
+    {
+        Span span = startSpan("dropColumn", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropColumn(session, tableHandle, column);
+        }
+    }
+
+    @Override
+    public void dropField(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column, List<String> fieldPath)
+    {
+        Span span = startSpan("dropField", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropField(session, tableHandle, column, fieldPath);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorTableLayout> getNewTableLayout(ConnectorSession session, ConnectorTableMetadata tableMetadata)
+    {
+        Span span = startSpan("getNewTableLayout", tableMetadata.getTable());
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getNewTableLayout(session, tableMetadata);
+        }
+    }
+
+    @Override
+    public Optional<Type> getSupportedType(ConnectorSession session, Map<String, Object> tableProperties, Type type)
+    {
+        Span span = startSpan("getSupportedType");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getSupportedType(session, tableProperties, type);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorTableLayout> getInsertLayout(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        Span span = startSpan("getInsertLayout", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getInsertLayout(session, tableHandle);
+        }
+    }
+
+    @Override
+    public TableStatisticsMetadata getStatisticsCollectionMetadataForWrite(ConnectorSession session, ConnectorTableMetadata tableMetadata)
+    {
+        Span span = startSpan("getStatisticsCollectionMetadataForWrite", tableMetadata.getTable());
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getStatisticsCollectionMetadataForWrite(session, tableMetadata);
+        }
+    }
+
+    @Override
+    public ConnectorAnalyzeMetadata getStatisticsCollectionMetadata(ConnectorSession session, ConnectorTableHandle tableHandle, Map<String, Object> analyzeProperties)
+    {
+        Span span = startSpan("getStatisticsCollectionMetadata", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getStatisticsCollectionMetadata(session, tableHandle, analyzeProperties);
+        }
+    }
+
+    @Override
+    public ConnectorTableHandle beginStatisticsCollection(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        Span span = startSpan("beginStatisticsCollection", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginStatisticsCollection(session, tableHandle);
+        }
+    }
+
+    @Override
+    public void finishStatisticsCollection(ConnectorSession session, ConnectorTableHandle tableHandle, Collection<ComputedStatistics> computedStatistics)
+    {
+        Span span = startSpan("finishStatisticsCollection", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.finishStatisticsCollection(session, tableHandle, computedStatistics);
+        }
+    }
+
+    @Override
+    public ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, Optional<ConnectorTableLayout> layout, RetryMode retryMode)
+    {
+        Span span = startSpan("beginCreateTable", tableMetadata.getTable());
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginCreateTable(session, tableMetadata, layout, retryMode);
+        }
+    }
+
+    @Override
+    public ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, Optional<ConnectorTableLayout> layout, RetryMode retryMode, boolean replace)
+    {
+        Span span = startSpan("beginCreateTable", tableMetadata.getTable());
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginCreateTable(session, tableMetadata, layout, retryMode, replace);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorOutputMetadata> finishCreateTable(ConnectorSession session, ConnectorOutputTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    {
+        Span span = startSpan("finishCreateTable");
+        if (span.isRecording()) {
+            span.setAttribute(TrinoAttributes.HANDLE, tableHandle.toString());
+        }
+        try (var ignored = scopedSpan(span)) {
+            return delegate.finishCreateTable(session, tableHandle, fragments, computedStatistics);
+        }
+    }
+
+    @Override
+    public void beginQuery(ConnectorSession session)
+    {
+        Span span = startSpan("beginQuery");
+        try (var ignored = scopedSpan(span)) {
+            delegate.beginQuery(session);
+        }
+    }
+
+    @Override
+    public void cleanupQuery(ConnectorSession session)
+    {
+        Span span = startSpan("cleanupQuery");
+        try (var ignored = scopedSpan(span)) {
+            delegate.cleanupQuery(session);
+        }
+    }
+
+    @Override
+    public ConnectorInsertTableHandle beginInsert(ConnectorSession session, ConnectorTableHandle tableHandle, List<ColumnHandle> columns, RetryMode retryMode)
+    {
+        Span span = startSpan("beginInsert", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginInsert(session, tableHandle, columns, retryMode);
+        }
+    }
+
+    @Override
+    public boolean supportsMissingColumnsOnInsert()
+    {
+        Span span = startSpan("supportsMissingColumnsOnInsert");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.supportsMissingColumnsOnInsert();
+        }
+    }
+
+    @Override
+    public Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session, ConnectorInsertTableHandle insertHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    {
+        Span span = startSpan("finishInsert");
+        if (span.isRecording()) {
+            span.setAttribute(TrinoAttributes.HANDLE, insertHandle.toString());
+        }
+        try (var ignored = scopedSpan(span)) {
+            return delegate.finishInsert(session, insertHandle, fragments, computedStatistics);
+        }
+    }
+
+    @Override
+    public boolean delegateMaterializedViewRefreshToConnector(ConnectorSession session, SchemaTableName viewName)
+    {
+        Span span = startSpan("delegateMaterializedViewRefreshToConnector", viewName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.delegateMaterializedViewRefreshToConnector(session, viewName);
+        }
+    }
+
+    @Override
+    public CompletableFuture<?> refreshMaterializedView(ConnectorSession session, SchemaTableName viewName)
+    {
+        Span span = startSpan("refreshMaterializedView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.refreshMaterializedView(session, viewName);
+        }
+    }
+
+    @Override
+    public ConnectorInsertTableHandle beginRefreshMaterializedView(ConnectorSession session, ConnectorTableHandle tableHandle, List<ConnectorTableHandle> sourceTableHandles, RetryMode retryMode)
+    {
+        Span span = startSpan("beginRefreshMaterializedView", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginRefreshMaterializedView(session, tableHandle, sourceTableHandles, retryMode);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorOutputMetadata> finishRefreshMaterializedView(ConnectorSession session, ConnectorTableHandle tableHandle, ConnectorInsertTableHandle insertHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics, List<ConnectorTableHandle> sourceTableHandles)
+    {
+        Span span = startSpan("finishRefreshMaterializedView", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.finishRefreshMaterializedView(session, tableHandle, insertHandle, fragments, computedStatistics, sourceTableHandles);
+        }
+    }
+
+    @Override
+    public RowChangeParadigm getRowChangeParadigm(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        Span span = startSpan("getRowChangeParadigm", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getRowChangeParadigm(session, tableHandle);
+        }
+    }
+
+    @Override
+    public ColumnHandle getMergeRowIdColumnHandle(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        Span span = startSpan("getMergeRowIdColumnHandle", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getMergeRowIdColumnHandle(session, tableHandle);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorPartitioningHandle> getUpdateLayout(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        Span span = startSpan("getUpdateLayout", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getUpdateLayout(session, tableHandle);
+        }
+    }
+
+    @Override
+    public ConnectorMergeTableHandle beginMerge(ConnectorSession session, ConnectorTableHandle tableHandle, RetryMode retryMode)
+    {
+        Span span = startSpan("beginMerge", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginMerge(session, tableHandle, retryMode);
+        }
+    }
+
+    @Override
+    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    {
+        Span span = startSpan("finishMerge", tableHandle.getTableHandle());
+        try (var ignored = scopedSpan(span)) {
+            delegate.finishMerge(session, tableHandle, fragments, computedStatistics);
+        }
+    }
+
+    @Override
+    public void createView(ConnectorSession session, SchemaTableName viewName, ConnectorViewDefinition definition, boolean replace)
+    {
+        Span span = startSpan("createView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.createView(session, viewName, definition, replace);
+        }
+    }
+
+    @Override
+    public void renameView(ConnectorSession session, SchemaTableName source, SchemaTableName target)
+    {
+        Span span = startSpan("renameView", source);
+        try (var ignored = scopedSpan(span)) {
+            delegate.renameView(session, source, target);
+        }
+    }
+
+    @Override
+    public void setViewAuthorization(ConnectorSession session, SchemaTableName viewName, TrinoPrincipal principal)
+    {
+        Span span = startSpan("setViewAuthorization", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setViewAuthorization(session, viewName, principal);
+        }
+    }
+
+    @Override
+    public void dropView(ConnectorSession session, SchemaTableName viewName)
+    {
+        Span span = startSpan("dropView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropView(session, viewName);
+        }
+    }
+
+    @Override
+    public List<SchemaTableName> listViews(ConnectorSession session, Optional<String> schemaName)
+    {
+        Span span = startSpan("listViews", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listViews(session, schemaName);
+        }
+    }
+
+    @Override
+    public Map<SchemaTableName, ConnectorViewDefinition> getViews(ConnectorSession session, Optional<String> schemaName)
+    {
+        Span span = startSpan("getViews", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getViews(session, schemaName);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorViewDefinition> getView(ConnectorSession session, SchemaTableName viewName)
+    {
+        Span span = startSpan("getView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getView(session, viewName);
+        }
+    }
+
+    @Override
+    public Map<String, Object> getSchemaProperties(ConnectorSession session, String schemaName)
+    {
+        Span span = startSpan("getSchemaProperties", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getSchemaProperties(session, schemaName);
+        }
+    }
+
+    @Override
+    public Optional<TrinoPrincipal> getSchemaOwner(ConnectorSession session, String schemaName)
+    {
+        Span span = startSpan("getSchemaOwner", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getSchemaOwner(session, schemaName);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorTableHandle> applyUpdate(ConnectorSession session, ConnectorTableHandle handle, Map<ColumnHandle, Constant> assignments)
+    {
+        Span span = startSpan("applyUpdate", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyUpdate(session, handle, assignments);
+        }
+    }
+
+    @Override
+    public OptionalLong executeUpdate(ConnectorSession session, ConnectorTableHandle handle)
+    {
+        Span span = startSpan("executeUpdate", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.executeUpdate(session, handle);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorTableHandle> applyDelete(ConnectorSession session, ConnectorTableHandle handle)
+    {
+        Span span = startSpan("applyDelete", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyDelete(session, handle);
+        }
+    }
+
+    @Override
+    public OptionalLong executeDelete(ConnectorSession session, ConnectorTableHandle handle)
+    {
+        Span span = startSpan("executeDelete", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.executeDelete(session, handle);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorResolvedIndex> resolveIndex(ConnectorSession session, ConnectorTableHandle tableHandle, Set<ColumnHandle> indexableColumns, Set<ColumnHandle> outputColumns, TupleDomain<ColumnHandle> tupleDomain)
+    {
+        Span span = startSpan("resolveIndex", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.resolveIndex(session, tableHandle, indexableColumns, outputColumns, tupleDomain);
+        }
+    }
+
+    @Override
+    public Collection<FunctionMetadata> listFunctions(ConnectorSession session, String schemaName)
+    {
+        Span span = startSpan("listFunctions", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listFunctions(session, schemaName);
+        }
+    }
+
+    @Override
+    public Collection<FunctionMetadata> getFunctions(ConnectorSession session, SchemaFunctionName name)
+    {
+        Span span = startSpan("getFunctions", name.getSchemaName())
+                .setAttribute(TrinoAttributes.FUNCTION, name.getFunctionName());
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getFunctions(session, name);
+        }
+    }
+
+    @Override
+    public FunctionMetadata getFunctionMetadata(ConnectorSession session, FunctionId functionId)
+    {
+        Span span = startSpan("getFunctionMetadata", functionId);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getFunctionMetadata(session, functionId);
+        }
+    }
+
+    @Override
+    public AggregationFunctionMetadata getAggregationFunctionMetadata(ConnectorSession session, FunctionId functionId)
+    {
+        Span span = startSpan("getAggregationFunctionMetadata", functionId);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getAggregationFunctionMetadata(session, functionId);
+        }
+    }
+
+    @Override
+    public FunctionDependencyDeclaration getFunctionDependencies(ConnectorSession session, FunctionId functionId, BoundSignature boundSignature)
+    {
+        Span span = startSpan("getFunctionDependencies", functionId);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getFunctionDependencies(session, functionId, boundSignature);
+        }
+    }
+
+    @Override
+    public Collection<LanguageFunction> listLanguageFunctions(ConnectorSession session, String schemaName)
+    {
+        Span span = startSpan("listLanguageFunctions", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listLanguageFunctions(session, schemaName);
+        }
+    }
+
+    @Override
+    public Collection<LanguageFunction> getLanguageFunctions(ConnectorSession session, SchemaFunctionName name)
+    {
+        Span span = startSpan("getLanguageFunctions", name.getSchemaName())
+                .setAttribute(TrinoAttributes.FUNCTION, name.getFunctionName());
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getLanguageFunctions(session, name);
+        }
+    }
+
+    @Override
+    public boolean languageFunctionExists(ConnectorSession session, SchemaFunctionName name, String signatureToken)
+    {
+        Span span = startSpan("languageFunctionExists", name.getSchemaName())
+                .setAttribute(TrinoAttributes.FUNCTION, name.getFunctionName());
+        try (var ignored = scopedSpan(span)) {
+            return delegate.languageFunctionExists(session, name, signatureToken);
+        }
+    }
+
+    @Override
+    public void createLanguageFunction(ConnectorSession session, SchemaFunctionName name, LanguageFunction function, boolean replace)
+    {
+        Span span = startSpan("createLanguageFunction", name.getSchemaName())
+                .setAttribute(TrinoAttributes.FUNCTION, name.getFunctionName());
+        try (var ignored = scopedSpan(span)) {
+            delegate.createLanguageFunction(session, name, function, replace);
+        }
+    }
+
+    @Override
+    public void dropLanguageFunction(ConnectorSession session, SchemaFunctionName name, String signatureToken)
+    {
+        Span span = startSpan("dropLanguageFunction", name.getSchemaName())
+                .setAttribute(TrinoAttributes.FUNCTION, name.getFunctionName());
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropLanguageFunction(session, name, signatureToken);
+        }
+    }
+
+    @Override
+    public boolean roleExists(ConnectorSession session, String role)
+    {
+        Span span = startSpan("roleExists");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.roleExists(session, role);
+        }
+    }
+
+    @Override
+    public void createRole(ConnectorSession session, String role, Optional<TrinoPrincipal> grantor)
+    {
+        Span span = startSpan("createRole");
+        try (var ignored = scopedSpan(span)) {
+            delegate.createRole(session, role, grantor);
+        }
+    }
+
+    @Override
+    public void dropRole(ConnectorSession session, String role)
+    {
+        Span span = startSpan("dropRole");
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropRole(session, role);
+        }
+    }
+
+    @Override
+    public Set<String> listRoles(ConnectorSession session)
+    {
+        Span span = startSpan("listRoles");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listRoles(session);
+        }
+    }
+
+    @Override
+    public Set<RoleGrant> listRoleGrants(ConnectorSession session, TrinoPrincipal principal)
+    {
+        Span span = startSpan("listRoleGrants");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listRoleGrants(session, principal);
+        }
+    }
+
+    @Override
+    public void grantRoles(ConnectorSession connectorSession, Set<String> roles, Set<TrinoPrincipal> grantees, boolean adminOption, Optional<TrinoPrincipal> grantor)
+    {
+        Span span = startSpan("grantRoles");
+        try (var ignored = scopedSpan(span)) {
+            delegate.grantRoles(connectorSession, roles, grantees, adminOption, grantor);
+        }
+    }
+
+    @Override
+    public void revokeRoles(ConnectorSession connectorSession, Set<String> roles, Set<TrinoPrincipal> grantees, boolean adminOption, Optional<TrinoPrincipal> grantor)
+    {
+        Span span = startSpan("revokeRoles");
+        try (var ignored = scopedSpan(span)) {
+            delegate.revokeRoles(connectorSession, roles, grantees, adminOption, grantor);
+        }
+    }
+
+    @Override
+    public Set<RoleGrant> listApplicableRoles(ConnectorSession session, TrinoPrincipal principal)
+    {
+        Span span = startSpan("listApplicableRoles");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listApplicableRoles(session, principal);
+        }
+    }
+
+    @Override
+    public Set<String> listEnabledRoles(ConnectorSession session)
+    {
+        Span span = startSpan("listEnabledRoles");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listEnabledRoles(session);
+        }
+    }
+
+    @Override
+    public void grantSchemaPrivileges(ConnectorSession session, String schemaName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
+    {
+        Span span = startSpan("grantSchemaPrivileges", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.grantSchemaPrivileges(session, schemaName, privileges, grantee, grantOption);
+        }
+    }
+
+    @Override
+    public void denySchemaPrivileges(ConnectorSession session, String schemaName, Set<Privilege> privileges, TrinoPrincipal grantee)
+    {
+        Span span = startSpan("denySchemaPrivileges", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.denySchemaPrivileges(session, schemaName, privileges, grantee);
+        }
+    }
+
+    @Override
+    public void revokeSchemaPrivileges(ConnectorSession session, String schemaName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
+    {
+        Span span = startSpan("revokeSchemaPrivileges", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.revokeSchemaPrivileges(session, schemaName, privileges, grantee, grantOption);
+        }
+    }
+
+    @Override
+    public void grantTablePrivileges(ConnectorSession session, SchemaTableName tableName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
+    {
+        Span span = startSpan("grantTablePrivileges", tableName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.grantTablePrivileges(session, tableName, privileges, grantee, grantOption);
+        }
+    }
+
+    @Override
+    public void denyTablePrivileges(ConnectorSession session, SchemaTableName tableName, Set<Privilege> privileges, TrinoPrincipal grantee)
+    {
+        Span span = startSpan("denyTablePrivileges", tableName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.denyTablePrivileges(session, tableName, privileges, grantee);
+        }
+    }
+
+    @Override
+    public void revokeTablePrivileges(ConnectorSession session, SchemaTableName tableName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
+    {
+        Span span = startSpan("revokeTablePrivileges", tableName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.revokeTablePrivileges(session, tableName, privileges, grantee, grantOption);
+        }
+    }
+
+    @Override
+    public List<GrantInfo> listTablePrivileges(ConnectorSession session, SchemaTablePrefix prefix)
+    {
+        Span span = startSpan("listTablePrivileges", prefix);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listTablePrivileges(session, prefix);
+        }
+    }
+
+    @Override
+    public ConnectorTableProperties getTableProperties(ConnectorSession session, ConnectorTableHandle table)
+    {
+        Span span = startSpan("getTableProperties", table);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableProperties(session, table);
+        }
+    }
+
+    @Override
+    public Optional<LimitApplicationResult<ConnectorTableHandle>> applyLimit(ConnectorSession session, ConnectorTableHandle handle, long limit)
+    {
+        Span span = startSpan("applyLimit", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyLimit(session, handle, limit);
+        }
+    }
+
+    @Override
+    public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(ConnectorSession session, ConnectorTableHandle handle, Constraint constraint)
+    {
+        Span span = startSpan("applyFilter", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyFilter(session, handle, constraint);
+        }
+    }
+
+    @Override
+    public Optional<ProjectionApplicationResult<ConnectorTableHandle>> applyProjection(ConnectorSession session, ConnectorTableHandle handle, List<ConnectorExpression> projections, Map<String, ColumnHandle> assignments)
+    {
+        Span span = startSpan("applyProjection", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyProjection(session, handle, projections, assignments);
+        }
+    }
+
+    @Override
+    public Optional<SampleApplicationResult<ConnectorTableHandle>> applySample(ConnectorSession session, ConnectorTableHandle handle, SampleType sampleType, double sampleRatio)
+    {
+        Span span = startSpan("applySample", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applySample(session, handle, sampleType, sampleRatio);
+        }
+    }
+
+    @Override
+    public Optional<AggregationApplicationResult<ConnectorTableHandle>> applyAggregation(ConnectorSession session, ConnectorTableHandle handle, List<AggregateFunction> aggregates, Map<String, ColumnHandle> assignments, List<List<ColumnHandle>> groupingSets)
+    {
+        Span span = startSpan("applyAggregation", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyAggregation(session, handle, aggregates, assignments, groupingSets);
+        }
+    }
+
+    @Override
+    public Optional<JoinApplicationResult<ConnectorTableHandle>> applyJoin(ConnectorSession session, JoinType joinType, ConnectorTableHandle left, ConnectorTableHandle right, ConnectorExpression joinCondition, Map<String, ColumnHandle> leftAssignments, Map<String, ColumnHandle> rightAssignments, JoinStatistics statistics)
+    {
+        Span span = startSpan("applyJoin");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyJoin(session, joinType, left, right, joinCondition, leftAssignments, rightAssignments, statistics);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public Optional<JoinApplicationResult<ConnectorTableHandle>> applyJoin(ConnectorSession session, JoinType joinType, ConnectorTableHandle left, ConnectorTableHandle right, List<JoinCondition> joinConditions, Map<String, ColumnHandle> leftAssignments, Map<String, ColumnHandle> rightAssignments, JoinStatistics statistics)
+    {
+        Span span = startSpan("applyJoin");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyJoin(session, joinType, left, right, joinConditions, leftAssignments, rightAssignments, statistics);
+        }
+    }
+
+    @Override
+    public Optional<TopNApplicationResult<ConnectorTableHandle>> applyTopN(ConnectorSession session, ConnectorTableHandle handle, long topNCount, List<SortItem> sortItems, Map<String, ColumnHandle> assignments)
+    {
+        Span span = startSpan("applyTopN", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyTopN(session, handle, topNCount, sortItems, assignments);
+        }
+    }
+
+    @Override
+    public Optional<TableFunctionApplicationResult<ConnectorTableHandle>> applyTableFunction(ConnectorSession session, ConnectorTableFunctionHandle handle)
+    {
+        Span span = startSpan("applyTableFunction");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyTableFunction(session, handle);
+        }
+    }
+
+    @Override
+    public void validateScan(ConnectorSession session, ConnectorTableHandle handle)
+    {
+        Span span = startSpan("validateScan", handle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.validateScan(session, handle);
+        }
+    }
+
+    @Override
+    public void createMaterializedView(ConnectorSession session, SchemaTableName viewName, ConnectorMaterializedViewDefinition definition, boolean replace, boolean ignoreExisting)
+    {
+        Span span = startSpan("createMaterializedView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.createMaterializedView(session, viewName, definition, replace, ignoreExisting);
+        }
+    }
+
+    @Override
+    public void dropMaterializedView(ConnectorSession session, SchemaTableName viewName)
+    {
+        Span span = startSpan("dropMaterializedView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropMaterializedView(session, viewName);
+        }
+    }
+
+    @Override
+    public List<SchemaTableName> listMaterializedViews(ConnectorSession session, Optional<String> schemaName)
+    {
+        Span span = startSpan("listMaterializedViews", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listMaterializedViews(session, schemaName);
+        }
+    }
+
+    @Override
+    public Map<SchemaTableName, ConnectorMaterializedViewDefinition> getMaterializedViews(ConnectorSession session, Optional<String> schemaName)
+    {
+        Span span = startSpan("getMaterializedViews", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getMaterializedViews(session, schemaName);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorMaterializedViewDefinition> getMaterializedView(ConnectorSession session, SchemaTableName viewName)
+    {
+        Span span = startSpan("getMaterializedView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getMaterializedView(session, viewName);
+        }
+    }
+
+    @Override
+    public MaterializedViewFreshness getMaterializedViewFreshness(ConnectorSession session, SchemaTableName name)
+    {
+        Span span = startSpan("getMaterializedViewFreshness", name);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getMaterializedViewFreshness(session, name);
+        }
+    }
+
+    @Override
+    public void renameMaterializedView(ConnectorSession session, SchemaTableName source, SchemaTableName target)
+    {
+        Span span = startSpan("renameMaterializedView", source);
+        try (var ignored = scopedSpan(span)) {
+            delegate.renameMaterializedView(session, source, target);
+        }
+    }
+
+    @Override
+    public void setMaterializedViewProperties(ConnectorSession session, SchemaTableName viewName, Map<String, Optional<Object>> properties)
+    {
+        Span span = startSpan("setMaterializedViewProperties", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setMaterializedViewProperties(session, viewName, properties);
+        }
+    }
+
+    @Override
+    public Optional<TableScanRedirectApplicationResult> applyTableScanRedirect(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        Span span = startSpan("applyTableScanRedirect", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyTableScanRedirect(session, tableHandle);
+        }
+    }
+
+    @Override
+    public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName)
+    {
+        Span span = startSpan("redirectTable", tableName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.redirectTable(session, tableName);
+        }
+    }
+
+    @Override
+    public OptionalInt getMaxWriterTasks(ConnectorSession session)
+    {
+        Span span = startSpan("getMaxWriterTasks");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getMaxWriterTasks(session);
+        }
+    }
+
+    @Override
+    public WriterScalingOptions getNewTableWriterScalingOptions(ConnectorSession session, SchemaTableName tableName, Map<String, Object> tableProperties)
+    {
+        Span span = startSpan("getNewTableWriterScalingOptions", tableName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getNewTableWriterScalingOptions(session, tableName, tableProperties);
+        }
+    }
+
+    @Override
+    public WriterScalingOptions getInsertWriterScalingOptions(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        Span span = startSpan("getInsertWriterScalingOptions", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getInsertWriterScalingOptions(session, tableHandle);
+        }
+    }
+
+    private Span startSpan(String methodName)
+    {
+        return tracer.spanBuilder("ConnectorMetadata." + methodName)
+                .setAttribute(TrinoAttributes.CATALOG, catalogName)
+                .startSpan();
+    }
+
+    private Span startSpan(String methodName, String schemaName)
+    {
+        return startSpan(methodName)
+                .setAttribute(TrinoAttributes.SCHEMA, schemaName);
+    }
+
+    private Span startSpan(String methodName, Optional<String> schemaName)
+    {
+        return startSpan(methodName)
+                .setAllAttributes(attribute(TrinoAttributes.SCHEMA, schemaName));
+    }
+
+    private Span startSpan(String methodName, SchemaTableName table)
+    {
+        return startSpan(methodName)
+                .setAttribute(TrinoAttributes.SCHEMA, table.getSchemaName())
+                .setAttribute(TrinoAttributes.TABLE, table.getTableName());
+    }
+
+    private Span startSpan(String methodName, SchemaTablePrefix prefix)
+    {
+        return startSpan(methodName)
+                .setAllAttributes(attribute(TrinoAttributes.SCHEMA, prefix.getSchema()))
+                .setAllAttributes(attribute(TrinoAttributes.TABLE, prefix.getTable()));
+    }
+
+    private Span startSpan(String methodName, ConnectorTableHandle handle)
+    {
+        Span span = startSpan(methodName);
+        if (span.isRecording()) {
+            span.setAttribute(TrinoAttributes.HANDLE, handle.toString());
+        }
+        return span;
+    }
+
+    private Span startSpan(String methodName, ConnectorTableExecuteHandle handle)
+    {
+        Span span = startSpan(methodName);
+        if (span.isRecording()) {
+            span.setAttribute(TrinoAttributes.HANDLE, handle.toString());
+        }
+        return span;
+    }
+
+    private Span startSpan(String methodName, FunctionId functionId)
+    {
+        Span span = startSpan(methodName);
+        if (span.isRecording()) {
+            span.setAttribute(TrinoAttributes.FUNCTION, functionId.toString());
+        }
+        return span;
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/tracing/TracingMetadata.java b/core/trino-main/src/main/java/io/trino/tracing/TracingMetadata.java
new file mode 100644
index 000000000000..e629d9524267
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/tracing/TracingMetadata.java
@@ -0,0 +1,1532 @@
+/*
+ * Licensed 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 io.trino.tracing;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
+import io.airlift.slice.Slice;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.Session;
+import io.trino.metadata.AnalyzeMetadata;
+import io.trino.metadata.AnalyzeTableHandle;
+import io.trino.metadata.CatalogFunctionMetadata;
+import io.trino.metadata.CatalogInfo;
+import io.trino.metadata.InsertTableHandle;
+import io.trino.metadata.MaterializedViewDefinition;
+import io.trino.metadata.MergeHandle;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.OperatorNotFoundException;
+import io.trino.metadata.OutputTableHandle;
+import io.trino.metadata.QualifiedObjectName;
+import io.trino.metadata.QualifiedTablePrefix;
+import io.trino.metadata.RedirectionAwareTableHandle;
+import io.trino.metadata.ResolvedFunction;
+import io.trino.metadata.ResolvedIndex;
+import io.trino.metadata.TableExecuteHandle;
+import io.trino.metadata.TableFunctionHandle;
+import io.trino.metadata.TableHandle;
+import io.trino.metadata.TableLayout;
+import io.trino.metadata.TableMetadata;
+import io.trino.metadata.TableProperties;
+import io.trino.metadata.TableSchema;
+import io.trino.metadata.TableVersion;
+import io.trino.metadata.ViewDefinition;
+import io.trino.metadata.ViewInfo;
+import io.trino.spi.connector.AggregateFunction;
+import io.trino.spi.connector.AggregationApplicationResult;
+import io.trino.spi.connector.BeginTableExecuteResult;
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.connector.CatalogSchemaName;
+import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.ConnectorCapabilities;
+import io.trino.spi.connector.ConnectorOutputMetadata;
+import io.trino.spi.connector.ConnectorTableMetadata;
+import io.trino.spi.connector.Constraint;
+import io.trino.spi.connector.ConstraintApplicationResult;
+import io.trino.spi.connector.JoinApplicationResult;
+import io.trino.spi.connector.JoinStatistics;
+import io.trino.spi.connector.JoinType;
+import io.trino.spi.connector.LimitApplicationResult;
+import io.trino.spi.connector.MaterializedViewFreshness;
+import io.trino.spi.connector.ProjectionApplicationResult;
+import io.trino.spi.connector.RelationCommentMetadata;
+import io.trino.spi.connector.RowChangeParadigm;
+import io.trino.spi.connector.SampleApplicationResult;
+import io.trino.spi.connector.SampleType;
+import io.trino.spi.connector.SaveMode;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.SortItem;
+import io.trino.spi.connector.SystemTable;
+import io.trino.spi.connector.TableColumnsMetadata;
+import io.trino.spi.connector.TableFunctionApplicationResult;
+import io.trino.spi.connector.TableScanRedirectApplicationResult;
+import io.trino.spi.connector.TopNApplicationResult;
+import io.trino.spi.connector.WriterScalingOptions;
+import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Constant;
+import io.trino.spi.function.AggregationFunctionMetadata;
+import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
+import io.trino.spi.function.FunctionDependencyDeclaration;
+import io.trino.spi.function.FunctionId;
+import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.LanguageFunction;
+import io.trino.spi.function.OperatorType;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.security.GrantInfo;
+import io.trino.spi.security.Identity;
+import io.trino.spi.security.Privilege;
+import io.trino.spi.security.RoleGrant;
+import io.trino.spi.security.TrinoPrincipal;
+import io.trino.spi.statistics.ComputedStatistics;
+import io.trino.spi.statistics.TableStatistics;
+import io.trino.spi.statistics.TableStatisticsMetadata;
+import io.trino.spi.type.Type;
+import io.trino.sql.analyzer.TypeSignatureProvider;
+import io.trino.sql.planner.PartitioningHandle;
+import io.trino.sql.tree.QualifiedName;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.function.UnaryOperator;
+
+import static io.airlift.tracing.Tracing.attribute;
+import static io.trino.tracing.ScopedSpan.scopedSpan;
+import static java.util.Objects.requireNonNull;
+
+public class TracingMetadata
+        implements Metadata
+{
+    private final Tracer tracer;
+    private final Metadata delegate;
+
+    @Inject
+    public TracingMetadata(Tracer tracer, @ForTracing Metadata delegate)
+    {
+        this.delegate = requireNonNull(delegate, "delegate is null");
+        this.tracer = requireNonNull(tracer, "tracer is null");
+    }
+
+    @VisibleForTesting
+    public Metadata getDelegate()
+    {
+        return delegate;
+    }
+
+    @Override
+    public Set<ConnectorCapabilities> getConnectorCapabilities(Session session, CatalogHandle catalogHandle)
+    {
+        Span span = startSpan("getConnectorCapabilities", catalogHandle.getCatalogName());
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getConnectorCapabilities(session, catalogHandle);
+        }
+    }
+
+    @Override
+    public boolean catalogExists(Session session, String catalogName)
+    {
+        Span span = startSpan("catalogExists", catalogName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.catalogExists(session, catalogName);
+        }
+    }
+
+    @Override
+    public boolean schemaExists(Session session, CatalogSchemaName schema)
+    {
+        Span span = startSpan("schemaExists", schema);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.schemaExists(session, schema);
+        }
+    }
+
+    @Override
+    public List<String> listSchemaNames(Session session, String catalogName)
+    {
+        Span span = startSpan("listSchemaNames", catalogName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listSchemaNames(session, catalogName);
+        }
+    }
+
+    @Override
+    public Optional<TableHandle> getTableHandle(Session session, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("getTableHandle", tableName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableHandle(session, tableName);
+        }
+    }
+
+    @Override
+    public Optional<SystemTable> getSystemTable(Session session, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("getSystemTable", tableName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getSystemTable(session, tableName);
+        }
+    }
+
+    @Override
+    public Optional<TableExecuteHandle> getTableHandleForExecute(Session session, TableHandle tableHandle, String procedureName, Map<String, Object> executeProperties)
+    {
+        Span span = startSpan("getTableHandleForExecute", tableHandle)
+                .setAttribute(TrinoAttributes.PROCEDURE, procedureName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableHandleForExecute(session, tableHandle, procedureName, executeProperties);
+        }
+    }
+
+    @Override
+    public Optional<TableLayout> getLayoutForTableExecute(Session session, TableExecuteHandle tableExecuteHandle)
+    {
+        Span span = startSpan("getLayoutForTableExecute", tableExecuteHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getLayoutForTableExecute(session, tableExecuteHandle);
+        }
+    }
+
+    @Override
+    public BeginTableExecuteResult<TableExecuteHandle, TableHandle> beginTableExecute(Session session, TableExecuteHandle handle, TableHandle updatedSourceTableHandle)
+    {
+        Span span = startSpan("beginTableExecute", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginTableExecute(session, handle, updatedSourceTableHandle);
+        }
+    }
+
+    @Override
+    public void finishTableExecute(Session session, TableExecuteHandle handle, Collection<Slice> fragments, List<Object> tableExecuteState)
+    {
+        Span span = startSpan("finishTableExecute", handle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.finishTableExecute(session, handle, fragments, tableExecuteState);
+        }
+    }
+
+    @Override
+    public void executeTableExecute(Session session, TableExecuteHandle handle)
+    {
+        Span span = startSpan("executeTableExecute", handle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.executeTableExecute(session, handle);
+        }
+    }
+
+    @Override
+    public TableProperties getTableProperties(Session session, TableHandle handle)
+    {
+        Span span = startSpan("getTableProperties", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableProperties(session, handle);
+        }
+    }
+
+    @Override
+    public TableHandle makeCompatiblePartitioning(Session session, TableHandle table, PartitioningHandle partitioningHandle)
+    {
+        Span span = startSpan("makeCompatiblePartitioning", table);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.makeCompatiblePartitioning(session, table, partitioningHandle);
+        }
+    }
+
+    @Override
+    public Optional<PartitioningHandle> getCommonPartitioning(Session session, PartitioningHandle left, PartitioningHandle right)
+    {
+        Span span = startSpan("getCommonPartitioning");
+        if (span.isRecording() && left.getCatalogHandle().equals(right.getCatalogHandle()) && left.getCatalogHandle().isPresent()) {
+            span.setAttribute(TrinoAttributes.CATALOG, left.getCatalogHandle().get().getCatalogName());
+        }
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getCommonPartitioning(session, left, right);
+        }
+    }
+
+    @Override
+    public Optional<Object> getInfo(Session session, TableHandle handle)
+    {
+        Span span = startSpan("getInfo", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getInfo(session, handle);
+        }
+    }
+
+    @Override
+    public CatalogSchemaTableName getTableName(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("getTableName", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableName(session, tableHandle);
+        }
+    }
+
+    @Override
+    public TableSchema getTableSchema(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("getTableSchema", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableSchema(session, tableHandle);
+        }
+    }
+
+    @Override
+    public TableMetadata getTableMetadata(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("getTableMetadata", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableMetadata(session, tableHandle);
+        }
+    }
+
+    @Override
+    public TableStatistics getTableStatistics(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("getTableStatistics", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableStatistics(session, tableHandle);
+        }
+    }
+
+    @Override
+    public List<QualifiedObjectName> listTables(Session session, QualifiedTablePrefix prefix)
+    {
+        Span span = startSpan("listTables", prefix);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listTables(session, prefix);
+        }
+    }
+
+    @Override
+    public Map<String, ColumnHandle> getColumnHandles(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("getColumnHandles", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getColumnHandles(session, tableHandle);
+        }
+    }
+
+    @Override
+    public ColumnMetadata getColumnMetadata(Session session, TableHandle tableHandle, ColumnHandle columnHandle)
+    {
+        Span span = startSpan("getColumnMetadata", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getColumnMetadata(session, tableHandle, columnHandle);
+        }
+    }
+
+    @Override
+    public List<TableColumnsMetadata> listTableColumns(Session session, QualifiedTablePrefix prefix, UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        Span span = startSpan("listTableColumns", prefix);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listTableColumns(session, prefix, relationFilter);
+        }
+    }
+
+    @Override
+    public List<RelationCommentMetadata> listRelationComments(Session session, String catalogName, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        Span span = startSpan("listRelationComments", new QualifiedTablePrefix(catalogName, schemaName, Optional.empty()));
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listRelationComments(session, catalogName, schemaName, relationFilter);
+        }
+    }
+
+    @Override
+    public void createSchema(Session session, CatalogSchemaName schema, Map<String, Object> properties, TrinoPrincipal principal)
+    {
+        Span span = startSpan("createSchema", schema);
+        try (var ignored = scopedSpan(span)) {
+            delegate.createSchema(session, schema, properties, principal);
+        }
+    }
+
+    @Override
+    public void dropSchema(Session session, CatalogSchemaName schema, boolean cascade)
+    {
+        Span span = startSpan("dropSchema", schema);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropSchema(session, schema, cascade);
+        }
+    }
+
+    @Override
+    public void renameSchema(Session session, CatalogSchemaName source, String target)
+    {
+        Span span = startSpan("renameSchema", source);
+        try (var ignored = scopedSpan(span)) {
+            delegate.renameSchema(session, source, target);
+        }
+    }
+
+    @Override
+    public void setSchemaAuthorization(Session session, CatalogSchemaName source, TrinoPrincipal principal)
+    {
+        Span span = startSpan("setSchemaAuthorization", source);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setSchemaAuthorization(session, source, principal);
+        }
+    }
+
+    @Override
+    public void createTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, SaveMode saveMode)
+    {
+        Span span = startSpan("createTable", catalogName, tableMetadata);
+        try (var ignored = scopedSpan(span)) {
+            delegate.createTable(session, catalogName, tableMetadata, saveMode);
+        }
+    }
+
+    @Override
+    public void renameTable(Session session, TableHandle tableHandle, CatalogSchemaTableName currentTableName, QualifiedObjectName newTableName)
+    {
+        Span span = startSpan("renameTable", currentTableName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.renameTable(session, tableHandle, currentTableName, newTableName);
+        }
+    }
+
+    @Override
+    public void setTableProperties(Session session, TableHandle tableHandle, Map<String, Optional<Object>> properties)
+    {
+        Span span = startSpan("setTableProperties", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setTableProperties(session, tableHandle, properties);
+        }
+    }
+
+    @Override
+    public void setTableComment(Session session, TableHandle tableHandle, Optional<String> comment)
+    {
+        Span span = startSpan("setTableComment", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setTableComment(session, tableHandle, comment);
+        }
+    }
+
+    @Override
+    public void setViewComment(Session session, QualifiedObjectName viewName, Optional<String> comment)
+    {
+        Span span = startSpan("setViewComment", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setViewComment(session, viewName, comment);
+        }
+    }
+
+    @Override
+    public void setViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
+    {
+        Span span = startSpan("setViewColumnComment", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setViewColumnComment(session, viewName, columnName, comment);
+        }
+    }
+
+    @Override
+    public void setColumnComment(Session session, TableHandle tableHandle, ColumnHandle column, Optional<String> comment)
+    {
+        Span span = startSpan("setColumnComment", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setColumnComment(session, tableHandle, column, comment);
+        }
+    }
+
+    @Override
+    public void renameColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnHandle source, String target)
+    {
+        Span span = startSpan("renameColumn", table);
+        try (var ignored = scopedSpan(span)) {
+            delegate.renameColumn(session, tableHandle, table, source, target);
+        }
+    }
+
+    @Override
+    public void renameField(Session session, TableHandle tableHandle, List<String> fieldPath, String target)
+    {
+        Span span = startSpan("renameField", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.renameField(session, tableHandle, fieldPath, target);
+        }
+    }
+
+    @Override
+    public void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column)
+    {
+        Span span = startSpan("addColumn", table);
+        try (var ignored = scopedSpan(span)) {
+            delegate.addColumn(session, tableHandle, table, column);
+        }
+    }
+
+    @Override
+    public void addField(Session session, TableHandle tableHandle, List<String> parentPath, String fieldName, Type type, boolean ignoreExisting)
+    {
+        Span span = startSpan("addField", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.addField(session, tableHandle, parentPath, fieldName, type, ignoreExisting);
+        }
+    }
+
+    @Override
+    public void setColumnType(Session session, TableHandle tableHandle, ColumnHandle column, Type type)
+    {
+        Span span = startSpan("setColumnType", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setColumnType(session, tableHandle, column, type);
+        }
+    }
+
+    @Override
+    public void setFieldType(Session session, TableHandle tableHandle, List<String> fieldPath, Type type)
+    {
+        Span span = startSpan("setFieldType", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setFieldType(session, tableHandle, fieldPath, type);
+        }
+    }
+
+    @Override
+    public void setTableAuthorization(Session session, CatalogSchemaTableName table, TrinoPrincipal principal)
+    {
+        Span span = startSpan("setTableAuthorization", table);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setTableAuthorization(session, table, principal);
+        }
+    }
+
+    @Override
+    public void dropColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnHandle column)
+    {
+        Span span = startSpan("dropColumn", table);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropColumn(session, tableHandle, table, column);
+        }
+    }
+
+    @Override
+    public void dropField(Session session, TableHandle tableHandle, ColumnHandle column, List<String> fieldPath)
+    {
+        Span span = startSpan("dropField", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropField(session, tableHandle, column, fieldPath);
+        }
+    }
+
+    @Override
+    public void dropTable(Session session, TableHandle tableHandle, CatalogSchemaTableName tableName)
+    {
+        Span span = startSpan("dropTable", tableName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropTable(session, tableHandle, tableName);
+        }
+    }
+
+    @Override
+    public void truncateTable(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("truncateTable", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            delegate.truncateTable(session, tableHandle);
+        }
+    }
+
+    @Override
+    public Optional<TableLayout> getNewTableLayout(Session session, String catalogName, ConnectorTableMetadata tableMetadata)
+    {
+        Span span = startSpan("getNewTableLayout", catalogName, tableMetadata);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getNewTableLayout(session, catalogName, tableMetadata);
+        }
+    }
+
+    @Override
+    public Optional<Type> getSupportedType(Session session, CatalogHandle catalogHandle, Map<String, Object> tableProperties, Type type)
+    {
+        Span span = startSpan("getSupportedType", catalogHandle.getCatalogName());
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getSupportedType(session, catalogHandle, tableProperties, type);
+        }
+    }
+
+    @Override
+    public OutputTableHandle beginCreateTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, Optional<TableLayout> layout, boolean replace)
+    {
+        Span span = startSpan("beginCreateTable", catalogName, tableMetadata);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginCreateTable(session, catalogName, tableMetadata, layout, replace);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorOutputMetadata> finishCreateTable(Session session, OutputTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    {
+        Span span = startSpan("finishCreateTable", tableHandle.getCatalogHandle().getCatalogName());
+        if (span.isRecording()) {
+            span.setAttribute(TrinoAttributes.TABLE, tableHandle.getConnectorHandle().toString());
+        }
+        try (var ignored = scopedSpan(span)) {
+            return delegate.finishCreateTable(session, tableHandle, fragments, computedStatistics);
+        }
+    }
+
+    @Override
+    public Optional<TableLayout> getInsertLayout(Session session, TableHandle target)
+    {
+        Span span = startSpan("getInsertLayout", target);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getInsertLayout(session, target);
+        }
+    }
+
+    @Override
+    public TableStatisticsMetadata getStatisticsCollectionMetadataForWrite(Session session, CatalogHandle catalogHandle, ConnectorTableMetadata tableMetadata)
+    {
+        Span span = startSpan("getStatisticsCollectionMetadataForWrite", catalogHandle.getCatalogName(), tableMetadata);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getStatisticsCollectionMetadataForWrite(session, catalogHandle, tableMetadata);
+        }
+    }
+
+    @Override
+    public AnalyzeMetadata getStatisticsCollectionMetadata(Session session, TableHandle tableHandle, Map<String, Object> analyzeProperties)
+    {
+        Span span = startSpan("getStatisticsCollectionMetadata", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getStatisticsCollectionMetadata(session, tableHandle, analyzeProperties);
+        }
+    }
+
+    @Override
+    public AnalyzeTableHandle beginStatisticsCollection(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("beginStatisticsCollection", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginStatisticsCollection(session, tableHandle);
+        }
+    }
+
+    @Override
+    public void finishStatisticsCollection(Session session, AnalyzeTableHandle tableHandle, Collection<ComputedStatistics> computedStatistics)
+    {
+        Span span = startSpan("finishStatisticsCollection", tableHandle.getCatalogHandle().getCatalogName());
+        if (span.isRecording()) {
+            span.setAttribute(TrinoAttributes.TABLE, tableHandle.getConnectorHandle().toString());
+        }
+        try (var ignored = scopedSpan(span)) {
+            delegate.finishStatisticsCollection(session, tableHandle, computedStatistics);
+        }
+    }
+
+    @Override
+    public void beginQuery(Session session)
+    {
+        Span span = startSpan("beginQuery");
+        try (var ignored = scopedSpan(span)) {
+            delegate.beginQuery(session);
+        }
+    }
+
+    @Override
+    public void cleanupQuery(Session session)
+    {
+        Span span = startSpan("cleanupQuery");
+        try (var ignored = scopedSpan(span)) {
+            delegate.cleanupQuery(session);
+        }
+    }
+
+    @Override
+    public InsertTableHandle beginInsert(Session session, TableHandle tableHandle, List<ColumnHandle> columns)
+    {
+        Span span = startSpan("beginInsert", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginInsert(session, tableHandle, columns);
+        }
+    }
+
+    @Override
+    public boolean supportsMissingColumnsOnInsert(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("supportsMissingColumnsOnInsert", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.supportsMissingColumnsOnInsert(session, tableHandle);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorOutputMetadata> finishInsert(Session session, InsertTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    {
+        Span span = startSpan("finishInsert", tableHandle.getCatalogHandle().getCatalogName());
+        if (span.isRecording()) {
+            span.setAttribute(TrinoAttributes.TABLE, tableHandle.getConnectorHandle().toString());
+        }
+        try (var ignored = scopedSpan(span)) {
+            return delegate.finishInsert(session, tableHandle, fragments, computedStatistics);
+        }
+    }
+
+    @Override
+    public boolean delegateMaterializedViewRefreshToConnector(Session session, QualifiedObjectName viewName)
+    {
+        Span span = startSpan("delegateMaterializedViewRefreshToConnector", viewName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.delegateMaterializedViewRefreshToConnector(session, viewName);
+        }
+    }
+
+    @Override
+    public ListenableFuture<Void> refreshMaterializedView(Session session, QualifiedObjectName viewName)
+    {
+        Span span = startSpan("refreshMaterializedView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.refreshMaterializedView(session, viewName);
+        }
+    }
+
+    @Override
+    public InsertTableHandle beginRefreshMaterializedView(Session session, TableHandle tableHandle, List<TableHandle> sourceTableHandles)
+    {
+        Span span = startSpan("beginRefreshMaterializedView", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginRefreshMaterializedView(session, tableHandle, sourceTableHandles);
+        }
+    }
+
+    @Override
+    public Optional<ConnectorOutputMetadata> finishRefreshMaterializedView(Session session, TableHandle tableHandle, InsertTableHandle insertTableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics, List<TableHandle> sourceTableHandles)
+    {
+        Span span = startSpan("finishRefreshMaterializedView", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.finishRefreshMaterializedView(session, tableHandle, insertTableHandle, fragments, computedStatistics, sourceTableHandles);
+        }
+    }
+
+    @Override
+    public Optional<TableHandle> applyUpdate(Session session, TableHandle tableHandle, Map<ColumnHandle, Constant> assignments)
+    {
+        Span span = startSpan("applyUpdate", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyUpdate(session, tableHandle, assignments);
+        }
+    }
+
+    @Override
+    public OptionalLong executeUpdate(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("executeUpdate", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.executeUpdate(session, tableHandle);
+        }
+    }
+
+    @Override
+    public Optional<TableHandle> applyDelete(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("applyDelete", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyDelete(session, tableHandle);
+        }
+    }
+
+    @Override
+    public OptionalLong executeDelete(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("executeDelete", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.executeDelete(session, tableHandle);
+        }
+    }
+
+    @Override
+    public RowChangeParadigm getRowChangeParadigm(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("getRowChangeParadigm", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getRowChangeParadigm(session, tableHandle);
+        }
+    }
+
+    @Override
+    public ColumnHandle getMergeRowIdColumnHandle(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("getMergeRowIdColumnHandle", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getMergeRowIdColumnHandle(session, tableHandle);
+        }
+    }
+
+    @Override
+    public Optional<PartitioningHandle> getUpdateLayout(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("getUpdateLayout", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getUpdateLayout(session, tableHandle);
+        }
+    }
+
+    @Override
+    public MergeHandle beginMerge(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("beginMerge", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.beginMerge(session, tableHandle);
+        }
+    }
+
+    @Override
+    public void finishMerge(Session session, MergeHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    {
+        Span span = startSpan("finishMerge", tableHandle.getTableHandle().getCatalogHandle().getCatalogName());
+        if (span.isRecording()) {
+            span.setAttribute(TrinoAttributes.TABLE, tableHandle.getTableHandle().getConnectorHandle().toString());
+        }
+        try (var ignored = scopedSpan(span)) {
+            delegate.finishMerge(session, tableHandle, fragments, computedStatistics);
+        }
+    }
+
+    @Override
+    public Optional<CatalogHandle> getCatalogHandle(Session session, String catalogName)
+    {
+        Span span = startSpan("getCatalogHandle", catalogName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getCatalogHandle(session, catalogName);
+        }
+    }
+
+    @Override
+    public List<CatalogInfo> listCatalogs(Session session)
+    {
+        Span span = startSpan("listCatalogs");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listCatalogs(session);
+        }
+    }
+
+    @Override
+    public List<QualifiedObjectName> listViews(Session session, QualifiedTablePrefix prefix)
+    {
+        Span span = startSpan("listViews", prefix);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listViews(session, prefix);
+        }
+    }
+
+    @Override
+    public Map<QualifiedObjectName, ViewInfo> getViews(Session session, QualifiedTablePrefix prefix)
+    {
+        Span span = startSpan("getViews", prefix);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getViews(session, prefix);
+        }
+    }
+
+    @Override
+    public boolean isView(Session session, QualifiedObjectName viewName)
+    {
+        Span span = startSpan("isView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.isView(session, viewName);
+        }
+    }
+
+    @Override
+    public Optional<ViewDefinition> getView(Session session, QualifiedObjectName viewName)
+    {
+        Span span = startSpan("getView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getView(session, viewName);
+        }
+    }
+
+    @Override
+    public Map<String, Object> getSchemaProperties(Session session, CatalogSchemaName schemaName)
+    {
+        Span span = startSpan("getSchemaProperties", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getSchemaProperties(session, schemaName);
+        }
+    }
+
+    @Override
+    public Optional<TrinoPrincipal> getSchemaOwner(Session session, CatalogSchemaName schemaName)
+    {
+        Span span = startSpan("getSchemaOwner", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getSchemaOwner(session, schemaName);
+        }
+    }
+
+    @Override
+    public void createView(Session session, QualifiedObjectName viewName, ViewDefinition definition, boolean replace)
+    {
+        Span span = startSpan("createView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.createView(session, viewName, definition, replace);
+        }
+    }
+
+    @Override
+    public void renameView(Session session, QualifiedObjectName existingViewName, QualifiedObjectName newViewName)
+    {
+        Span span = startSpan("renameView", existingViewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.renameView(session, existingViewName, newViewName);
+        }
+    }
+
+    @Override
+    public void setViewAuthorization(Session session, CatalogSchemaTableName view, TrinoPrincipal principal)
+    {
+        Span span = startSpan("setViewAuthorization", view);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setViewAuthorization(session, view, principal);
+        }
+    }
+
+    @Override
+    public void dropView(Session session, QualifiedObjectName viewName)
+    {
+        Span span = startSpan("dropView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropView(session, viewName);
+        }
+    }
+
+    @Override
+    public Optional<ResolvedIndex> resolveIndex(Session session, TableHandle tableHandle, Set<ColumnHandle> indexableColumns, Set<ColumnHandle> outputColumns, TupleDomain<ColumnHandle> tupleDomain)
+    {
+        Span span = startSpan("resolveIndex", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.resolveIndex(session, tableHandle, indexableColumns, outputColumns, tupleDomain);
+        }
+    }
+
+    @Override
+    public Optional<LimitApplicationResult<TableHandle>> applyLimit(Session session, TableHandle table, long limit)
+    {
+        Span span = startSpan("applyLimit", table);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyLimit(session, table, limit);
+        }
+    }
+
+    @Override
+    public Optional<ConstraintApplicationResult<TableHandle>> applyFilter(Session session, TableHandle table, Constraint constraint)
+    {
+        Span span = startSpan("applyFilter", table);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyFilter(session, table, constraint);
+        }
+    }
+
+    @Override
+    public Optional<ProjectionApplicationResult<TableHandle>> applyProjection(Session session, TableHandle table, List<ConnectorExpression> projections, Map<String, ColumnHandle> assignments)
+    {
+        Span span = startSpan("applyProjection", table);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyProjection(session, table, projections, assignments);
+        }
+    }
+
+    @Override
+    public Optional<SampleApplicationResult<TableHandle>> applySample(Session session, TableHandle table, SampleType sampleType, double sampleRatio)
+    {
+        Span span = startSpan("applySample", table);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applySample(session, table, sampleType, sampleRatio);
+        }
+    }
+
+    @Override
+    public Optional<AggregationApplicationResult<TableHandle>> applyAggregation(Session session, TableHandle table, List<AggregateFunction> aggregations, Map<String, ColumnHandle> assignments, List<List<ColumnHandle>> groupingSets)
+    {
+        Span span = startSpan("applyAggregation", table);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyAggregation(session, table, aggregations, assignments, groupingSets);
+        }
+    }
+
+    @Override
+    public Optional<JoinApplicationResult<TableHandle>> applyJoin(Session session, JoinType joinType, TableHandle left, TableHandle right, ConnectorExpression joinCondition, Map<String, ColumnHandle> leftAssignments, Map<String, ColumnHandle> rightAssignments, JoinStatistics statistics)
+    {
+        Span span = startSpan("applyJoin");
+        if (span.isRecording() && left.getCatalogHandle().equals(right.getCatalogHandle())) {
+            span.setAttribute(TrinoAttributes.CATALOG, left.getCatalogHandle().getCatalogName());
+        }
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyJoin(session, joinType, left, right, joinCondition, leftAssignments, rightAssignments, statistics);
+        }
+    }
+
+    @Override
+    public Optional<TopNApplicationResult<TableHandle>> applyTopN(Session session, TableHandle handle, long topNCount, List<SortItem> sortItems, Map<String, ColumnHandle> assignments)
+    {
+        Span span = startSpan("applyTopN", handle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyTopN(session, handle, topNCount, sortItems, assignments);
+        }
+    }
+
+    @Override
+    public Optional<TableFunctionApplicationResult<TableHandle>> applyTableFunction(Session session, TableFunctionHandle handle)
+    {
+        Span span = startSpan("applyTableFunction")
+                .setAttribute(TrinoAttributes.CATALOG, handle.getCatalogHandle().getCatalogName())
+                .setAttribute(TrinoAttributes.HANDLE, handle.getFunctionHandle().toString());
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyTableFunction(session, handle);
+        }
+    }
+
+    @Override
+    public void validateScan(Session session, TableHandle table)
+    {
+        Span span = startSpan("validateScan", table);
+        try (var ignored = scopedSpan(span)) {
+            delegate.validateScan(session, table);
+        }
+    }
+
+    @Override
+    public boolean isCatalogManagedSecurity(Session session, String catalog)
+    {
+        Span span = startSpan("isCatalogManagedSecurity", catalog);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.isCatalogManagedSecurity(session, catalog);
+        }
+    }
+
+    @Override
+    public boolean roleExists(Session session, String role, Optional<String> catalog)
+    {
+        Span span = getStartSpan("roleExists", catalog);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.roleExists(session, role, catalog);
+        }
+    }
+
+    @Override
+    public void createRole(Session session, String role, Optional<TrinoPrincipal> grantor, Optional<String> catalog)
+    {
+        Span span = getStartSpan("createRole", catalog);
+        try (var ignored = scopedSpan(span)) {
+            delegate.createRole(session, role, grantor, catalog);
+        }
+    }
+
+    @Override
+    public void dropRole(Session session, String role, Optional<String> catalog)
+    {
+        Span span = getStartSpan("dropRole", catalog);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropRole(session, role, catalog);
+        }
+    }
+
+    @Override
+    public Set<String> listRoles(Session session, Optional<String> catalog)
+    {
+        Span span = getStartSpan("listRoles", catalog);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listRoles(session, catalog);
+        }
+    }
+
+    @Override
+    public Set<RoleGrant> listRoleGrants(Session session, Optional<String> catalog, TrinoPrincipal principal)
+    {
+        Span span = getStartSpan("listRoleGrants", catalog);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listRoleGrants(session, catalog, principal);
+        }
+    }
+
+    @Override
+    public void grantRoles(Session session, Set<String> roles, Set<TrinoPrincipal> grantees, boolean adminOption, Optional<TrinoPrincipal> grantor, Optional<String> catalog)
+    {
+        Span span = getStartSpan("grantRoles", catalog);
+        try (var ignored = scopedSpan(span)) {
+            delegate.grantRoles(session, roles, grantees, adminOption, grantor, catalog);
+        }
+    }
+
+    @Override
+    public void revokeRoles(Session session, Set<String> roles, Set<TrinoPrincipal> grantees, boolean adminOption, Optional<TrinoPrincipal> grantor, Optional<String> catalog)
+    {
+        Span span = getStartSpan("revokeRoles", catalog);
+        try (var ignored = scopedSpan(span)) {
+            delegate.revokeRoles(session, roles, grantees, adminOption, grantor, catalog);
+        }
+    }
+
+    @Override
+    public Set<RoleGrant> listApplicableRoles(Session session, TrinoPrincipal principal, Optional<String> catalog)
+    {
+        Span span = getStartSpan("listApplicableRoles", catalog);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listApplicableRoles(session, principal, catalog);
+        }
+    }
+
+    @Override
+    public Set<String> listEnabledRoles(Identity identity)
+    {
+        Span span = startSpan("listEnabledRoles");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listEnabledRoles(identity);
+        }
+    }
+
+    @Override
+    public Set<String> listEnabledRoles(Session session, String catalog)
+    {
+        Span span = startSpan("listEnabledRoles", catalog);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listEnabledRoles(session, catalog);
+        }
+    }
+
+    @Override
+    public void grantSchemaPrivileges(Session session, CatalogSchemaName schemaName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
+    {
+        Span span = startSpan("grantSchemaPrivileges", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.grantSchemaPrivileges(session, schemaName, privileges, grantee, grantOption);
+        }
+    }
+
+    @Override
+    public void denySchemaPrivileges(Session session, CatalogSchemaName schemaName, Set<Privilege> privileges, TrinoPrincipal grantee)
+    {
+        Span span = startSpan("denySchemaPrivileges", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.denySchemaPrivileges(session, schemaName, privileges, grantee);
+        }
+    }
+
+    @Override
+    public void revokeSchemaPrivileges(Session session, CatalogSchemaName schemaName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
+    {
+        Span span = startSpan("revokeSchemaPrivileges", schemaName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.revokeSchemaPrivileges(session, schemaName, privileges, grantee, grantOption);
+        }
+    }
+
+    @Override
+    public void grantTablePrivileges(Session session, QualifiedObjectName tableName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
+    {
+        Span span = startSpan("grantTablePrivileges", tableName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.grantTablePrivileges(session, tableName, privileges, grantee, grantOption);
+        }
+    }
+
+    @Override
+    public void denyTablePrivileges(Session session, QualifiedObjectName tableName, Set<Privilege> privileges, TrinoPrincipal grantee)
+    {
+        Span span = startSpan("denyTablePrivileges", tableName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.denyTablePrivileges(session, tableName, privileges, grantee);
+        }
+    }
+
+    @Override
+    public void revokeTablePrivileges(Session session, QualifiedObjectName tableName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
+    {
+        Span span = startSpan("revokeTablePrivileges", tableName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.revokeTablePrivileges(session, tableName, privileges, grantee, grantOption);
+        }
+    }
+
+    @Override
+    public List<GrantInfo> listTablePrivileges(Session session, QualifiedTablePrefix prefix)
+    {
+        Span span = startSpan("listTablePrivileges", prefix);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listTablePrivileges(session, prefix);
+        }
+    }
+
+    @Override
+    public Collection<FunctionMetadata> listGlobalFunctions(Session session)
+    {
+        Span span = startSpan("listGlobalFunctions");
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listGlobalFunctions(session);
+        }
+    }
+
+    @Override
+    public Collection<FunctionMetadata> listFunctions(Session session, CatalogSchemaName schema)
+    {
+        Span span = startSpan("listFunctions", schema);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listFunctions(session, schema);
+        }
+    }
+
+    @Override
+    public ResolvedFunction decodeFunction(QualifiedName name)
+    {
+        // no tracing since it doesn't call any connector
+        return delegate.decodeFunction(name);
+    }
+
+    @Override
+    public Collection<CatalogFunctionMetadata> getFunctions(Session session, CatalogSchemaFunctionName catalogSchemaFunctionName)
+    {
+        Span span = startSpan("getFunctions", catalogSchemaFunctionName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getFunctions(session, catalogSchemaFunctionName);
+        }
+    }
+
+    @Override
+    public ResolvedFunction resolveBuiltinFunction(String name, List<TypeSignatureProvider> parameterTypes)
+    {
+        Span span = startSpan("resolveBuiltinFunction")
+                .setAllAttributes(attribute(TrinoAttributes.FUNCTION, name));
+        try (var ignored = scopedSpan(span)) {
+            return delegate.resolveBuiltinFunction(name, parameterTypes);
+        }
+    }
+
+    @Override
+    public ResolvedFunction resolveOperator(OperatorType operatorType, List<? extends Type> argumentTypes)
+            throws OperatorNotFoundException
+    {
+        // no tracing since it doesn't call any connector
+        return delegate.resolveOperator(operatorType, argumentTypes);
+    }
+
+    @Override
+    public ResolvedFunction getCoercion(Type fromType, Type toType)
+    {
+        // no tracing since it doesn't call any connector
+        return delegate.getCoercion(fromType, toType);
+    }
+
+    @Override
+    public ResolvedFunction getCoercion(OperatorType operatorType, Type fromType, Type toType)
+    {
+        // no tracing since it doesn't call any connector
+        return delegate.getCoercion(operatorType, fromType, toType);
+    }
+
+    @Override
+    public ResolvedFunction getCoercion(CatalogSchemaFunctionName name, Type fromType, Type toType)
+    {
+        // no tracing since it doesn't call any connector
+        return delegate.getCoercion(name, fromType, toType);
+    }
+
+    @Override
+    public AggregationFunctionMetadata getAggregationFunctionMetadata(Session session, ResolvedFunction resolvedFunction)
+    {
+        Span span = startSpan("getAggregationFunctionMetadata")
+                .setAttribute(TrinoAttributes.CATALOG, resolvedFunction.getCatalogHandle().getCatalogName())
+                .setAttribute(TrinoAttributes.FUNCTION, resolvedFunction.getSignature().getName().toString());
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getAggregationFunctionMetadata(session, resolvedFunction);
+        }
+    }
+
+    @Override
+    public FunctionDependencyDeclaration getFunctionDependencies(Session session, CatalogHandle catalogHandle, FunctionId functionId, BoundSignature boundSignature)
+    {
+        Span span = startSpan("getFunctionDependencies", catalogHandle.getCatalogName())
+                .setAttribute(TrinoAttributes.FUNCTION, functionId.toString());
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getFunctionDependencies(session, catalogHandle, functionId, boundSignature);
+        }
+    }
+
+    @Override
+    public boolean languageFunctionExists(Session session, QualifiedObjectName name, String signatureToken)
+    {
+        Span span = startSpan("languageFunctionExists", name);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.languageFunctionExists(session, name, signatureToken);
+        }
+    }
+
+    @Override
+    public void createLanguageFunction(Session session, QualifiedObjectName name, LanguageFunction function, boolean replace)
+    {
+        Span span = startSpan("createLanguageFunction", name);
+        try (var ignored = scopedSpan(span)) {
+            delegate.createLanguageFunction(session, name, function, replace);
+        }
+    }
+
+    @Override
+    public void dropLanguageFunction(Session session, QualifiedObjectName name, String signatureToken)
+    {
+        Span span = startSpan("dropLanguageFunction", name);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropLanguageFunction(session, name, signatureToken);
+        }
+    }
+
+    @Override
+    public void createMaterializedView(Session session, QualifiedObjectName viewName, MaterializedViewDefinition definition, boolean replace, boolean ignoreExisting)
+    {
+        Span span = startSpan("createMaterializedView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.createMaterializedView(session, viewName, definition, replace, ignoreExisting);
+        }
+    }
+
+    @Override
+    public void dropMaterializedView(Session session, QualifiedObjectName viewName)
+    {
+        Span span = startSpan("dropMaterializedView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.dropMaterializedView(session, viewName);
+        }
+    }
+
+    @Override
+    public List<QualifiedObjectName> listMaterializedViews(Session session, QualifiedTablePrefix prefix)
+    {
+        Span span = startSpan("listMaterializedViews", prefix);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.listMaterializedViews(session, prefix);
+        }
+    }
+
+    @Override
+    public Map<QualifiedObjectName, ViewInfo> getMaterializedViews(Session session, QualifiedTablePrefix prefix)
+    {
+        Span span = startSpan("getMaterializedViews", prefix);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getMaterializedViews(session, prefix);
+        }
+    }
+
+    @Override
+    public boolean isMaterializedView(Session session, QualifiedObjectName viewName)
+    {
+        Span span = startSpan("isMaterializedView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.isMaterializedView(session, viewName);
+        }
+    }
+
+    @Override
+    public Optional<MaterializedViewDefinition> getMaterializedView(Session session, QualifiedObjectName viewName)
+    {
+        Span span = startSpan("getMaterializedView", viewName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getMaterializedView(session, viewName);
+        }
+    }
+
+    @Override
+    public MaterializedViewFreshness getMaterializedViewFreshness(Session session, QualifiedObjectName name)
+    {
+        Span span = startSpan("getMaterializedViewFreshness", name);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getMaterializedViewFreshness(session, name);
+        }
+    }
+
+    @Override
+    public void renameMaterializedView(Session session, QualifiedObjectName existingViewName, QualifiedObjectName newViewName)
+    {
+        Span span = startSpan("renameMaterializedView", existingViewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.renameMaterializedView(session, existingViewName, newViewName);
+        }
+    }
+
+    @Override
+    public void setMaterializedViewProperties(Session session, QualifiedObjectName viewName, Map<String, Optional<Object>> properties)
+    {
+        Span span = startSpan("setMaterializedViewProperties", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setMaterializedViewProperties(session, viewName, properties);
+        }
+    }
+
+    @Override
+    public void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
+    {
+        Span span = startSpan("setMaterializedViewColumnComment", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setMaterializedViewColumnComment(session, viewName, columnName, comment);
+        }
+    }
+
+    @Override
+    public Optional<TableScanRedirectApplicationResult> applyTableScanRedirect(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("applyTableScanRedirect", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.applyTableScanRedirect(session, tableHandle);
+        }
+    }
+
+    @Override
+    public RedirectionAwareTableHandle getRedirectionAwareTableHandle(Session session, QualifiedObjectName tableName)
+    {
+        Span span = startSpan("getRedirectionAwareTableHandle", tableName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getRedirectionAwareTableHandle(session, tableName);
+        }
+    }
+
+    @Override
+    public RedirectionAwareTableHandle getRedirectionAwareTableHandle(Session session, QualifiedObjectName tableName, Optional<TableVersion> startVersion, Optional<TableVersion> endVersion)
+    {
+        Span span = startSpan("getRedirectionAwareTableHandle", tableName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getRedirectionAwareTableHandle(session, tableName, startVersion, endVersion);
+        }
+    }
+
+    @Override
+    public Optional<TableHandle> getTableHandle(Session session, QualifiedObjectName tableName, Optional<TableVersion> startVersion, Optional<TableVersion> endVersion)
+    {
+        Span span = startSpan("getTableHandle", tableName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getTableHandle(session, tableName, startVersion, endVersion);
+        }
+    }
+
+    @Override
+    public OptionalInt getMaxWriterTasks(Session session, String catalogName)
+    {
+        Span span = startSpan("getMaxWriterTasks", catalogName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getMaxWriterTasks(session, catalogName);
+        }
+    }
+
+    @Override
+    public WriterScalingOptions getNewTableWriterScalingOptions(Session session, QualifiedObjectName tableName, Map<String, Object> tableProperties)
+    {
+        Span span = startSpan("getNewTableWriterScalingOptions", tableName);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getNewTableWriterScalingOptions(session, tableName, tableProperties);
+        }
+    }
+
+    @Override
+    public WriterScalingOptions getInsertWriterScalingOptions(Session session, TableHandle tableHandle)
+    {
+        Span span = startSpan("getInsertWriterScalingOptions", tableHandle);
+        try (var ignored = scopedSpan(span)) {
+            return delegate.getInsertWriterScalingOptions(session, tableHandle);
+        }
+    }
+
+    private Span startSpan(String methodName)
+    {
+        return tracer.spanBuilder("Metadata." + methodName)
+                .startSpan();
+    }
+
+    private Span startSpan(String methodName, String catalogName)
+    {
+        return startSpan(methodName)
+                .setAttribute(TrinoAttributes.CATALOG, catalogName);
+    }
+
+    private Span getStartSpan(String methodName, Optional<String> catalog)
+    {
+        return startSpan(methodName)
+                .setAllAttributes(attribute(TrinoAttributes.CATALOG, catalog));
+    }
+
+    private Span startSpan(String methodName, CatalogSchemaName schema)
+    {
+        return startSpan(methodName)
+                .setAttribute(TrinoAttributes.CATALOG, schema.getCatalogName())
+                .setAttribute(TrinoAttributes.SCHEMA, schema.getSchemaName());
+    }
+
+    private Span startSpan(String methodName, QualifiedObjectName table)
+    {
+        return startSpan(methodName)
+                .setAttribute(TrinoAttributes.CATALOG, table.getCatalogName())
+                .setAttribute(TrinoAttributes.SCHEMA, table.getSchemaName())
+                .setAttribute(TrinoAttributes.TABLE, table.getObjectName());
+    }
+
+    private Span startSpan(String methodName, CatalogSchemaTableName table)
+    {
+        return startSpan(methodName)
+                .setAttribute(TrinoAttributes.CATALOG, table.getCatalogName())
+                .setAttribute(TrinoAttributes.SCHEMA, table.getSchemaTableName().getSchemaName())
+                .setAttribute(TrinoAttributes.TABLE, table.getSchemaTableName().getTableName());
+    }
+
+    private Span startSpan(String methodName, QualifiedTablePrefix prefix)
+    {
+        return startSpan(methodName)
+                .setAttribute(TrinoAttributes.CATALOG, prefix.getCatalogName())
+                .setAllAttributes(attribute(TrinoAttributes.SCHEMA, prefix.getSchemaName()))
+                .setAllAttributes(attribute(TrinoAttributes.TABLE, prefix.getTableName()));
+    }
+
+    private Span startSpan(String methodName, String catalogName, ConnectorTableMetadata tableMetadata)
+    {
+        return startSpan(methodName)
+                .setAttribute(TrinoAttributes.CATALOG, catalogName)
+                .setAttribute(TrinoAttributes.SCHEMA, tableMetadata.getTable().getSchemaName())
+                .setAttribute(TrinoAttributes.TABLE, tableMetadata.getTable().getTableName());
+    }
+
+    private Span startSpan(String methodName, TableHandle handle)
+    {
+        Span span = startSpan(methodName);
+        if (span.isRecording()) {
+            span.setAttribute(TrinoAttributes.CATALOG, handle.getCatalogHandle().getCatalogName());
+            span.setAttribute(TrinoAttributes.HANDLE, handle.getConnectorHandle().toString());
+        }
+        return span;
+    }
+
+    private Span startSpan(String methodName, TableExecuteHandle handle)
+    {
+        Span span = startSpan(methodName);
+        if (span.isRecording()) {
+            span.setAttribute(TrinoAttributes.CATALOG, handle.getCatalogHandle().getCatalogName());
+            span.setAttribute(TrinoAttributes.HANDLE, handle.getConnectorHandle().toString());
+        }
+        return span;
+    }
+
+    private Span startSpan(String methodName, CatalogSchemaFunctionName table)
+    {
+        return startSpan(methodName)
+                .setAttribute(TrinoAttributes.CATALOG, table.getCatalogName())
+                .setAttribute(TrinoAttributes.SCHEMA, table.getSchemaName())
+                .setAttribute(TrinoAttributes.FUNCTION, table.getFunctionName());
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/tracing/TrinoAttributes.java b/core/trino-main/src/main/java/io/trino/tracing/TrinoAttributes.java
new file mode 100644
index 000000000000..d32429a28f16
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/tracing/TrinoAttributes.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed 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 io.trino.tracing;
+
+import io.opentelemetry.api.common.AttributeKey;
+
+import java.util.List;
+
+import static io.opentelemetry.api.common.AttributeKey.booleanKey;
+import static io.opentelemetry.api.common.AttributeKey.longKey;
+import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
+
+public final class TrinoAttributes
+{
+    private TrinoAttributes() {}
+
+    public static final AttributeKey<String> QUERY_ID = stringKey("trino.query_id");
+    public static final AttributeKey<String> STAGE_ID = stringKey("trino.stage_id");
+    public static final AttributeKey<String> TASK_ID = stringKey("trino.task_id");
+    public static final AttributeKey<String> PIPELINE_ID = stringKey("trino.pipeline_id");
+    public static final AttributeKey<String> SPLIT_ID = stringKey("trino.split_id");
+
+    public static final AttributeKey<String> QUERY_TYPE = stringKey("trino.query_type");
+
+    public static final AttributeKey<Long> ERROR_CODE = longKey("trino.error_code");
+    public static final AttributeKey<String> ERROR_NAME = stringKey("trino.error_name");
+    public static final AttributeKey<String> ERROR_TYPE = stringKey("trino.error_type");
+
+    public static final AttributeKey<String> CATALOG = stringKey("trino.catalog");
+    public static final AttributeKey<String> SCHEMA = stringKey("trino.schema");
+    public static final AttributeKey<String> TABLE = stringKey("trino.table");
+    public static final AttributeKey<String> PROCEDURE = stringKey("trino.procedure");
+    public static final AttributeKey<String> FUNCTION = stringKey("trino.function");
+    public static final AttributeKey<String> HANDLE = stringKey("trino.handle");
+    public static final AttributeKey<Boolean> CASCADE = booleanKey("trino.cascade");
+
+    public static final AttributeKey<String> OPTIMIZER_NAME = stringKey("trino.optimizer");
+    public static final AttributeKey<List<String>> OPTIMIZER_RULES = stringArrayKey("trino.optimizer.rules");
+
+    public static final AttributeKey<Long> SPLIT_BATCH_MAX_SIZE = longKey("trino.split_batch.max_size");
+    public static final AttributeKey<Long> SPLIT_BATCH_RESULT_SIZE = longKey("trino.split_batch.result_size");
+
+    public static final AttributeKey<Long> SPLIT_SCHEDULED_TIME_NANOS = longKey("trino.split.scheduled_time_nanos");
+    public static final AttributeKey<Long> SPLIT_CPU_TIME_NANOS = longKey("trino.split.cpu_time_nanos");
+    public static final AttributeKey<Long> SPLIT_WAIT_TIME_NANOS = longKey("trino.split.wait_time_nanos");
+    public static final AttributeKey<Long> SPLIT_START_TIME_NANOS = longKey("trino.split.start_time_nanos");
+    public static final AttributeKey<Long> SPLIT_BLOCK_TIME_NANOS = longKey("trino.split.block_time_nanos");
+    public static final AttributeKey<Boolean> SPLIT_BLOCKED = booleanKey("trino.split.blocked");
+
+    public static final AttributeKey<String> EVENT_STATE = stringKey("state");
+}
diff --git a/core/trino-main/src/main/java/io/trino/transaction/ForTransactionManager.java b/core/trino-main/src/main/java/io/trino/transaction/ForTransactionManager.java
index f715a4c81f5a..b59947a004ed 100644
--- a/core/trino-main/src/main/java/io/trino/transaction/ForTransactionManager.java
+++ b/core/trino-main/src/main/java/io/trino/transaction/ForTransactionManager.java
@@ -13,7 +13,7 @@
  */
 package io.trino.transaction;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForTransactionManager
 {
 }
diff --git a/core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManager.java b/core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManager.java
index fff97d145aa9..b83df6d6212d 100644
--- a/core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManager.java
+++ b/core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManager.java
@@ -16,6 +16,8 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
@@ -30,9 +32,6 @@
 import io.trino.spi.transaction.IsolationLevel;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManagerModule.java b/core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManagerModule.java
index 4b546b5b00ba..21bb9febdee3 100644
--- a/core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManagerModule.java
+++ b/core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManagerModule.java
@@ -15,14 +15,13 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import io.trino.metadata.CatalogManager;
 import io.trino.spi.VersionEmbedder;
-
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.annotation.PreDestroy;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
diff --git a/core/trino-main/src/main/java/io/trino/transaction/TransactionBuilder.java b/core/trino-main/src/main/java/io/trino/transaction/TransactionBuilder.java
index 18d51973c586..d2a1ec3e50fd 100644
--- a/core/trino-main/src/main/java/io/trino/transaction/TransactionBuilder.java
+++ b/core/trino-main/src/main/java/io/trino/transaction/TransactionBuilder.java
@@ -14,6 +14,8 @@
 package io.trino.transaction;
 
 import io.trino.Session;
+import io.trino.execution.QueryIdGenerator;
+import io.trino.metadata.Metadata;
 import io.trino.security.AccessControl;
 import io.trino.spi.transaction.IsolationLevel;
 
@@ -26,21 +28,24 @@
 
 public class TransactionBuilder
 {
+    private static final QueryIdGenerator QUERY_ID_GENERATOR = new QueryIdGenerator();
     private final TransactionManager transactionManager;
+    private final Metadata metadata;
     private final AccessControl accessControl;
     private IsolationLevel isolationLevel = TransactionManager.DEFAULT_ISOLATION;
     private boolean readOnly = TransactionManager.DEFAULT_READ_ONLY;
     private boolean singleStatement;
 
-    private TransactionBuilder(TransactionManager transactionManager, AccessControl accessControl)
+    private TransactionBuilder(TransactionManager transactionManager, Metadata metadata, AccessControl accessControl)
     {
         this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
+        this.metadata = metadata;
         this.accessControl = requireNonNull(accessControl, "accessControl is null");
     }
 
-    public static TransactionBuilder transaction(TransactionManager transactionManager, AccessControl accessControl)
+    public static TransactionBuilder transaction(TransactionManager transactionManager, Metadata metadata, AccessControl accessControl)
     {
-        return new TransactionBuilder(transactionManager, accessControl);
+        return new TransactionBuilder(transactionManager, metadata, accessControl);
     }
 
     public TransactionBuilder withIsolationLevel(IsolationLevel isolationLevel)
@@ -129,6 +134,9 @@ public <T> T execute(Session session, Function<Session, T> callback)
         requireNonNull(session, "session is null");
         requireNonNull(callback, "callback is null");
 
+        session = Session.builder(session)
+                .setQueryId(QUERY_ID_GENERATOR.createNextQueryId())
+                .build();
         boolean managedTransaction = session.getTransactionId().isEmpty();
 
         Session transactionSession;
@@ -144,6 +152,7 @@ public <T> T execute(Session session, Function<Session, T> callback)
             checkState(!transactionInfo.isAutoCommitContext() && !singleStatement, "Cannot combine auto commit transactions");
             transactionSession = session;
         }
+        metadata.beginQuery(transactionSession);
 
         boolean success = false;
         try {
@@ -152,6 +161,7 @@ public <T> T execute(Session session, Function<Session, T> callback)
             return result;
         }
         finally {
+            metadata.cleanupQuery(transactionSession);
             if (managedTransaction && transactionManager.transactionExists(transactionSession.getTransactionId().get())) {
                 if (success) {
                     getFutureValue(transactionManager.asyncCommit(transactionSession.getTransactionId().get()));
diff --git a/core/trino-main/src/main/java/io/trino/transaction/TransactionManagerConfig.java b/core/trino-main/src/main/java/io/trino/transaction/TransactionManagerConfig.java
index fa6556b1cd2e..8091da8ea244 100644
--- a/core/trino-main/src/main/java/io/trino/transaction/TransactionManagerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/transaction/TransactionManagerConfig.java
@@ -17,9 +17,8 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/core/trino-main/src/main/java/io/trino/type/BlockTypeOperators.java b/core/trino-main/src/main/java/io/trino/type/BlockTypeOperators.java
index 8b1a378a2c0d..ea4fcd0d640f 100644
--- a/core/trino-main/src/main/java/io/trino/type/BlockTypeOperators.java
+++ b/core/trino-main/src/main/java/io/trino/type/BlockTypeOperators.java
@@ -15,7 +15,9 @@
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.util.concurrent.UncheckedExecutionException;
-import io.trino.collect.cache.NonKeyEvictableCache;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
+import io.trino.cache.NonKeyEvictableCache;
 import io.trino.spi.block.Block;
 import io.trino.spi.connector.SortOrder;
 import io.trino.spi.function.InvocationConvention;
@@ -23,9 +25,6 @@
 import io.trino.spi.type.TypeOperators;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.lang.invoke.MethodHandle;
 import java.util.Objects;
 import java.util.Optional;
@@ -33,11 +32,11 @@
 import java.util.function.Supplier;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.DEFAULT_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_FIRST;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
@@ -47,7 +46,7 @@
 
 public final class BlockTypeOperators
 {
-    private static final InvocationConvention BLOCK_EQUAL_CONVENTION = simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION);
+    private static final InvocationConvention BLOCK_EQUAL_CONVENTION = simpleConvention(DEFAULT_ON_NULL, BLOCK_POSITION, BLOCK_POSITION);
     private static final InvocationConvention HASH_CODE_CONVENTION = simpleConvention(FAIL_ON_NULL, BLOCK_POSITION);
     private static final InvocationConvention XX_HASH_64_CONVENTION = simpleConvention(FAIL_ON_NULL, BLOCK_POSITION);
     private static final InvocationConvention IS_DISTINCT_FROM_CONVENTION = simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION);
@@ -80,7 +79,7 @@ public BlockPositionEqual getEqualOperator(Type type)
 
     public interface BlockPositionEqual
     {
-        Boolean equal(Block left, int leftPosition, Block right, int rightPosition);
+        boolean equal(Block left, int leftPosition, Block right, int rightPosition);
 
         default boolean equalNullSafe(Block leftBlock, int leftPosition, Block rightBlock, int rightPosition)
         {
diff --git a/core/trino-main/src/main/java/io/trino/type/CodePointsType.java b/core/trino-main/src/main/java/io/trino/type/CodePointsType.java
index 768918af9597..c5c33f9afc92 100644
--- a/core/trino-main/src/main/java/io/trino/type/CodePointsType.java
+++ b/core/trino-main/src/main/java/io/trino/type/CodePointsType.java
@@ -17,6 +17,8 @@
 import io.airlift.slice.Slices;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.TypeSignature;
@@ -38,12 +40,6 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Object getObject(Block block, int position)
     {
@@ -51,16 +47,20 @@ public Object getObject(Block block, int position)
             return null;
         }
 
-        Slice slice = block.getSlice(position, 0, block.getSliceLength(position));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        Slice slice = valueBlock.getSlice(valuePosition);
         int[] codePoints = new int[slice.length() / Integer.BYTES];
-        slice.getBytes(0, Slices.wrappedIntArray(codePoints));
+        slice.getInts(0, codePoints);
         return codePoints;
     }
 
     @Override
     public void writeObject(BlockBuilder blockBuilder, Object value)
     {
-        Slice slice = Slices.wrappedIntArray((int[]) value);
-        blockBuilder.writeBytes(slice, 0, slice.length()).closeEntry();
+        int[] codePoints = (int[]) value;
+        Slice slice = Slices.allocate(codePoints.length * Integer.BYTES);
+        slice.setInts(0, codePoints);
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(slice);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/type/ColorType.java b/core/trino-main/src/main/java/io/trino/type/ColorType.java
index e6329872dcef..cac180fbbc6d 100644
--- a/core/trino-main/src/main/java/io/trino/type/ColorType.java
+++ b/core/trino-main/src/main/java/io/trino/type/ColorType.java
@@ -46,7 +46,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        int color = block.getInt(position, 0);
+        int color = getInt(block, position);
         if (color < 0) {
             return ColorFunctions.SystemColor.valueOf(-(color + 1)).getName();
         }
diff --git a/core/trino-main/src/main/java/io/trino/type/DateTimes.java b/core/trino-main/src/main/java/io/trino/type/DateTimes.java
index aece48e12331..051b004d3e7c 100644
--- a/core/trino-main/src/main/java/io/trino/type/DateTimes.java
+++ b/core/trino-main/src/main/java/io/trino/type/DateTimes.java
@@ -51,8 +51,8 @@ public final class DateTimes
 {
     public static final Pattern DATETIME_PATTERN = Pattern.compile("" +
             "(?<year>[-+]?\\d{4,})-(?<month>\\d{1,2})-(?<day>\\d{1,2})" +
-            "(?: (?<hour>\\d{1,2}):(?<minute>\\d{1,2})(?::(?<second>\\d{1,2})(?:\\.(?<fraction>\\d+))?)?)?" +
-            "\\s*(?<timezone>.+)?");
+            "( (?:(?<hour>\\d{1,2}):(?<minute>\\d{1,2})(?::(?<second>\\d{1,2})(?:\\.(?<fraction>\\d+))?)?)?" +
+            "\\s*(?<timezone>.+)?)?");
     private static final String TIMESTAMP_FORMATTER_PATTERN = "uuuu-MM-dd HH:mm:ss";
     private static final DateTimeFormatter TIMESTAMP_FORMATTER = DateTimeFormatter.ofPattern(TIMESTAMP_FORMATTER_PATTERN);
 
@@ -212,7 +212,7 @@ public static boolean timestampHasTimeZone(String value)
     {
         Matcher matcher = DATETIME_PATTERN.matcher(value);
         if (!matcher.matches()) {
-            throw new IllegalArgumentException(format("Invalid timestamp '%s'", value));
+            throw new IllegalArgumentException(format("Invalid TIMESTAMP '%s'", value));
         }
 
         return matcher.group("timezone") != null;
@@ -222,7 +222,7 @@ public static int extractTimestampPrecision(String value)
     {
         Matcher matcher = DATETIME_PATTERN.matcher(value);
         if (!matcher.matches()) {
-            throw new IllegalArgumentException(format("Invalid timestamp '%s'", value));
+            throw new IllegalArgumentException(format("Invalid TIMESTAMP '%s'", value));
         }
 
         String fraction = matcher.group("fraction");
@@ -371,7 +371,7 @@ private static long parseShortTimestamp(String value)
     {
         Matcher matcher = DATETIME_PATTERN.matcher(value);
         if (!matcher.matches() || matcher.group("timezone") != null) {
-            throw new IllegalArgumentException("Invalid timestamp: " + value);
+            throw new IllegalArgumentException("Invalid TIMESTAMP: " + value);
         }
 
         String year = matcher.group("year");
@@ -403,7 +403,7 @@ private static LongTimestamp parseLongTimestamp(String value)
     {
         Matcher matcher = DATETIME_PATTERN.matcher(value);
         if (!matcher.matches() || matcher.group("timezone") != null) {
-            throw new IllegalArgumentException("Invalid timestamp: " + value);
+            throw new IllegalArgumentException("Invalid TIMESTAMP: " + value);
         }
 
         String year = matcher.group("year");
@@ -429,7 +429,7 @@ private static long parseShortTimestampWithTimeZone(String value)
     {
         Matcher matcher = DATETIME_PATTERN.matcher(value);
         if (!matcher.matches() || matcher.group("timezone") == null) {
-            throw new IllegalArgumentException("Invalid timestamp with time zone: " + value);
+            throw new IllegalArgumentException("Invalid TIMESTAMP WITH TIME ZONE: " + value);
         }
 
         String year = matcher.group("year");
@@ -464,7 +464,7 @@ private static LongTimestampWithTimeZone parseLongTimestampWithTimeZone(String v
     {
         Matcher matcher = DATETIME_PATTERN.matcher(value);
         if (!matcher.matches() || matcher.group("timezone") == null) {
-            throw new IllegalArgumentException("Invalid timestamp: " + value);
+            throw new IllegalArgumentException("Invalid TIMESTAMP: " + value);
         }
 
         String year = matcher.group("year");
@@ -499,7 +499,7 @@ private static long toEpochSecond(String year, String month, String day, String
 
         List<ZoneOffset> offsets = zoneId.getRules().getValidOffsets(timestamp);
         if (offsets.isEmpty()) {
-            throw new IllegalArgumentException("Invalid timestamp due to daylight savings transition");
+            throw new IllegalArgumentException("Invalid TIMESTAMP due to daylight savings transition");
         }
 
         return timestamp.toEpochSecond(offsets.get(0));
@@ -509,7 +509,7 @@ public static boolean timeHasTimeZone(String value)
     {
         Matcher matcher = TIME_PATTERN.matcher(value);
         if (!matcher.matches()) {
-            throw new IllegalArgumentException(format("Invalid time '%s'", value));
+            throw new IllegalArgumentException(format("Invalid TIME '%s'", value));
         }
 
         return matcher.group("offsetHour") != null && matcher.group("offsetMinute") != null;
@@ -519,7 +519,7 @@ public static int extractTimePrecision(String value)
     {
         Matcher matcher = TIME_PATTERN.matcher(value);
         if (!matcher.matches()) {
-            throw new IllegalArgumentException(format("Invalid time '%s'", value));
+            throw new IllegalArgumentException(format("Invalid TIME '%s'", value));
         }
 
         String fraction = matcher.group("fraction");
@@ -534,7 +534,7 @@ public static long parseTime(String value)
     {
         Matcher matcher = TIME_PATTERN.matcher(value);
         if (!matcher.matches() || matcher.group("offsetHour") != null || matcher.group("offsetMinute") != null) {
-            throw new IllegalArgumentException("Invalid time: " + value);
+            throw new IllegalArgumentException("Invalid TIME: " + value);
         }
 
         int hour = Integer.parseInt(matcher.group("hour"));
@@ -542,7 +542,7 @@ public static long parseTime(String value)
         int second = matcher.group("second") == null ? 0 : Integer.parseInt(matcher.group("second"));
 
         if (hour > 23 || minute > 59 || second > 59) {
-            throw new IllegalArgumentException("Invalid time: " + value);
+            throw new IllegalArgumentException("Invalid TIME: " + value);
         }
 
         int precision = 0;
@@ -554,7 +554,7 @@ public static long parseTime(String value)
         }
 
         if (precision > TimeType.MAX_PRECISION) {
-            throw new IllegalArgumentException("Invalid time: " + value);
+            throw new IllegalArgumentException("Invalid TIME: " + value);
         }
 
         return (((hour * 60L) + minute) * 60 + second) * PICOSECONDS_PER_SECOND + rescale(fractionValue, precision, 12);
@@ -573,7 +573,7 @@ public static long parseShortTimeWithTimeZone(String value)
     {
         Matcher matcher = TIME_PATTERN.matcher(value);
         if (!matcher.matches() || matcher.group("offsetHour") == null || matcher.group("offsetMinute") == null) {
-            throw new IllegalArgumentException("Invalid time with time zone: " + value);
+            throw new IllegalArgumentException("Invalid TIME WITH TIME ZONE: " + value);
         }
 
         int hour = Integer.parseInt(matcher.group("hour"));
@@ -584,7 +584,7 @@ public static long parseShortTimeWithTimeZone(String value)
         int offsetMinute = Integer.parseInt((matcher.group("offsetMinute")));
 
         if (hour > 23 || minute > 59 || second > 59 || !isValidOffset(offsetHour, offsetMinute)) {
-            throw new IllegalArgumentException("Invalid time with time zone: " + value);
+            throw new IllegalArgumentException("Invalid TIME WITH TIME ZONE: " + value);
         }
 
         int precision = 0;
@@ -603,7 +603,7 @@ public static LongTimeWithTimeZone parseLongTimeWithTimeZone(String value)
     {
         Matcher matcher = TIME_PATTERN.matcher(value);
         if (!matcher.matches() || matcher.group("offsetHour") == null || matcher.group("offsetMinute") == null) {
-            throw new IllegalArgumentException("Invalid time with time zone: " + value);
+            throw new IllegalArgumentException("Invalid TIME WITH TIME ZONE: " + value);
         }
 
         int hour = Integer.parseInt(matcher.group("hour"));
@@ -614,7 +614,7 @@ public static LongTimeWithTimeZone parseLongTimeWithTimeZone(String value)
         int offsetMinute = Integer.parseInt((matcher.group("offsetMinute")));
 
         if (hour > 23 || minute > 59 || second > 59 || !isValidOffset(offsetHour, offsetMinute)) {
-            throw new IllegalArgumentException("Invalid time with time zone: " + value);
+            throw new IllegalArgumentException("Invalid TIME WITH TIME ZONE: " + value);
         }
 
         int precision = 0;
@@ -634,7 +634,7 @@ public static LongTimestamp longTimestamp(long precision, Instant start)
         checkArgument(precision > MAX_SHORT_PRECISION && precision <= TimestampType.MAX_PRECISION, "Precision is out of range");
         return new LongTimestamp(
                 start.getEpochSecond() * MICROSECONDS_PER_SECOND + start.getLong(MICRO_OF_SECOND),
-                (int) round((start.getNano() % PICOSECONDS_PER_NANOSECOND) * PICOSECONDS_PER_NANOSECOND, (int) (TimestampType.MAX_PRECISION - precision)));
+                (int) round((start.getNano() % PICOSECONDS_PER_NANOSECOND) * (long) PICOSECONDS_PER_NANOSECOND, (int) (TimestampType.MAX_PRECISION - precision)));
     }
 
     public static LongTimestamp longTimestamp(long epochSecond, long fractionInPicos)
@@ -648,10 +648,13 @@ public static LongTimestampWithTimeZone longTimestampWithTimeZone(long precision
     {
         checkArgument(precision <= TimestampWithTimeZoneType.MAX_PRECISION, "Precision is out of range");
 
-        return LongTimestampWithTimeZone.fromEpochMillisAndFraction(
-                start.toEpochMilli(),
-                (int) round((start.getNano() % NANOSECONDS_PER_MILLISECOND) * PICOSECONDS_PER_NANOSECOND, (int) (TimestampWithTimeZoneType.MAX_PRECISION - precision)),
-                timeZoneKey);
+        long epochMilli = start.toEpochMilli();
+        int picosOfMilli = (int) round((start.getNano() % NANOSECONDS_PER_MILLISECOND) * (long) PICOSECONDS_PER_NANOSECOND, (int) (TimestampWithTimeZoneType.MAX_PRECISION - precision));
+        if (picosOfMilli == PICOSECONDS_PER_MILLISECOND) {
+            epochMilli++;
+            picosOfMilli = 0;
+        }
+        return LongTimestampWithTimeZone.fromEpochMillisAndFraction(epochMilli, picosOfMilli, timeZoneKey);
     }
 
     public static LongTimestampWithTimeZone longTimestampWithTimeZone(long epochSecond, long fractionInPicos, ZoneId zoneId)
diff --git a/core/trino-main/src/main/java/io/trino/type/DecimalCasts.java b/core/trino-main/src/main/java/io/trino/type/DecimalCasts.java
index 681385bee464..9ef4358c4fc6 100644
--- a/core/trino-main/src/main/java/io/trino/type/DecimalCasts.java
+++ b/core/trino-main/src/main/java/io/trino/type/DecimalCasts.java
@@ -13,6 +13,7 @@
  */
 package io.trino.type;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.google.common.collect.ImmutableList;
@@ -39,7 +40,6 @@
 import java.math.BigDecimal;
 
 import static io.airlift.slice.Slices.utf8Slice;
-import static io.trino.operator.scalar.JsonOperators.JSON_FACTORY;
 import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
@@ -61,10 +61,12 @@
 import static io.trino.spi.type.VarcharType.UNBOUNDED_LENGTH;
 import static io.trino.type.JsonType.JSON;
 import static io.trino.util.Failures.checkCondition;
+import static io.trino.util.JsonUtil.createJsonFactory;
 import static io.trino.util.JsonUtil.createJsonGenerator;
 import static io.trino.util.JsonUtil.createJsonParser;
 import static io.trino.util.JsonUtil.currentTokenAsLongDecimal;
 import static io.trino.util.JsonUtil.currentTokenAsShortDecimal;
+import static java.lang.Float.intBitsToFloat;
 import static java.lang.Math.multiplyExact;
 import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
@@ -91,14 +93,15 @@ public final class DecimalCasts
     public static final SqlScalarFunction DECIMAL_TO_JSON_CAST = castFunctionFromDecimalTo(JSON.getTypeSignature(), "shortDecimalToJson", "longDecimalToJson");
     public static final SqlScalarFunction JSON_TO_DECIMAL_CAST = castFunctionToDecimalFromBuilder(JSON.getTypeSignature(), true, "jsonToShortDecimal", "jsonToLongDecimal");
 
+    private static final JsonFactory JSON_FACTORY = createJsonFactory();
+
     private static SqlScalarFunction castFunctionFromDecimalTo(TypeSignature to, String... methodNames)
     {
         Signature signature = Signature.builder()
-                .operatorType(CAST)
                 .argumentType(new TypeSignature("decimal", typeVariable("precision"), typeVariable("scale")))
                 .returnType(to)
                 .build();
-        return new PolymorphicScalarFunctionBuilder(DecimalCasts.class)
+        return new PolymorphicScalarFunctionBuilder(CAST, DecimalCasts.class)
                 .signature(signature)
                 .deterministic(true)
                 .choice(choice -> choice
@@ -127,11 +130,10 @@ private static SqlScalarFunction castFunctionToDecimalFrom(TypeSignature from, S
     private static SqlScalarFunction castFunctionToDecimalFromBuilder(TypeSignature from, boolean nullableResult, String... methodNames)
     {
         Signature signature = Signature.builder()
-                .operatorType(CAST)
                 .argumentType(from)
                 .returnType(new TypeSignature("decimal", typeVariable("precision"), typeVariable("scale")))
                 .build();
-        return new PolymorphicScalarFunctionBuilder(DecimalCasts.class)
+        return new PolymorphicScalarFunctionBuilder(CAST, DecimalCasts.class)
                 .signature(signature)
                 .nullableResult(nullableResult)
                 .deterministic(true)
@@ -152,9 +154,8 @@ private static SqlScalarFunction castFunctionToDecimalFromBuilder(TypeSignature
                                 }))).build();
     }
 
-    public static final SqlScalarFunction DECIMAL_TO_VARCHAR_CAST = new PolymorphicScalarFunctionBuilder(DecimalCasts.class)
+    public static final SqlScalarFunction DECIMAL_TO_VARCHAR_CAST = new PolymorphicScalarFunctionBuilder(CAST, DecimalCasts.class)
             .signature(Signature.builder()
-                    .operatorType(CAST)
                     .argumentType(new TypeSignature("decimal", typeVariable("precision"), typeVariable("scale")))
                     .returnType(new TypeSignature("varchar", typeVariable("x")))
                     .build())
@@ -467,13 +468,15 @@ public static Int128 doubleToLongDecimal(double value, long precision, long scal
     @UsedByGeneratedCode
     public static long realToShortDecimal(long value, long precision, long scale, long tenToScale)
     {
-        return DecimalConversions.realToShortDecimal(value, precision, scale);
+        float floatValue = intBitsToFloat((int) value);
+        return DecimalConversions.realToShortDecimal(floatValue, precision, scale);
     }
 
     @UsedByGeneratedCode
     public static Int128 realToLongDecimal(long value, long precision, long scale, Int128 tenToScale)
     {
-        return DecimalConversions.realToLongDecimal(value, precision, scale);
+        float floatValue = intBitsToFloat((int) value);
+        return DecimalConversions.realToLongDecimal(floatValue, precision, scale);
     }
 
     @UsedByGeneratedCode
diff --git a/core/trino-main/src/main/java/io/trino/type/DecimalOperators.java b/core/trino-main/src/main/java/io/trino/type/DecimalOperators.java
index f9932e99fb6c..de6d36137234 100644
--- a/core/trino-main/src/main/java/io/trino/type/DecimalOperators.java
+++ b/core/trino-main/src/main/java/io/trino/type/DecimalOperators.java
@@ -72,14 +72,13 @@ private static SqlScalarFunction decimalAddOperator()
         TypeSignature decimalResultSignature = new TypeSignature("decimal", typeVariable("r_precision"), typeVariable("r_scale"));
 
         Signature signature = Signature.builder()
-                .operatorType(ADD)
                 .longVariable("r_precision", "min(38, max(a_precision - a_scale, b_precision - b_scale) + max(a_scale, b_scale) + 1)")
                 .longVariable("r_scale", "max(a_scale, b_scale)")
                 .argumentType(decimalLeftSignature)
                 .argumentType(decimalRightSignature)
                 .returnType(decimalResultSignature)
                 .build();
-        return new PolymorphicScalarFunctionBuilder(DecimalOperators.class)
+        return new PolymorphicScalarFunctionBuilder(ADD, DecimalOperators.class)
                 .signature(signature)
                 .deterministic(true)
                 .choice(choice -> choice
@@ -154,14 +153,13 @@ private static SqlScalarFunction decimalSubtractOperator()
         TypeSignature decimalResultSignature = new TypeSignature("decimal", typeVariable("r_precision"), typeVariable("r_scale"));
 
         Signature signature = Signature.builder()
-                .operatorType(SUBTRACT)
                 .longVariable("r_precision", "min(38, max(a_precision - a_scale, b_precision - b_scale) + max(a_scale, b_scale) + 1)")
                 .longVariable("r_scale", "max(a_scale, b_scale)")
                 .argumentType(decimalLeftSignature)
                 .argumentType(decimalRightSignature)
                 .returnType(decimalResultSignature)
                 .build();
-        return new PolymorphicScalarFunctionBuilder(DecimalOperators.class)
+        return new PolymorphicScalarFunctionBuilder(SUBTRACT, DecimalOperators.class)
                 .signature(signature)
                 .deterministic(true)
                 .choice(choice -> choice
@@ -235,14 +233,13 @@ private static SqlScalarFunction decimalMultiplyOperator()
         TypeSignature decimalResultSignature = new TypeSignature("decimal", typeVariable("r_precision"), typeVariable("r_scale"));
 
         Signature signature = Signature.builder()
-                .operatorType(MULTIPLY)
                 .longVariable("r_precision", "min(38, a_precision + b_precision)")
                 .longVariable("r_scale", "a_scale + b_scale")
                 .argumentType(decimalLeftSignature)
                 .argumentType(decimalRightSignature)
                 .returnType(decimalResultSignature)
                 .build();
-        return new PolymorphicScalarFunctionBuilder(DecimalOperators.class)
+        return new PolymorphicScalarFunctionBuilder(MULTIPLY, DecimalOperators.class)
                 .signature(signature)
                 .deterministic(true)
                 .choice(choice -> choice
@@ -319,14 +316,13 @@ private static SqlScalarFunction decimalDivideOperator()
         // if scale of divisor is greater than scale of dividend we extend scale further as we
         // want result scale to be maximum of scales of divisor and dividend.
         Signature signature = Signature.builder()
-                .operatorType(DIVIDE)
                 .longVariable("r_precision", "min(38, a_precision + b_scale + max(b_scale - a_scale, 0))")
                 .longVariable("r_scale", "max(a_scale, b_scale)")
                 .argumentType(decimalLeftSignature)
                 .argumentType(decimalRightSignature)
                 .returnType(decimalResultSignature)
                 .build();
-        return new PolymorphicScalarFunctionBuilder(DecimalOperators.class)
+        return new PolymorphicScalarFunctionBuilder(DIVIDE, DecimalOperators.class)
                 .signature(signature)
                 .deterministic(true)
                 .choice(choice -> choice
@@ -475,36 +471,41 @@ public static Int128 divideLongShortLong(Int128 dividend, long divisor, int resc
 
     private static SqlScalarFunction decimalModulusOperator()
     {
-        Signature signature = modulusSignatureBuilder()
-                .operatorType(MODULUS)
-                .build();
-        return modulusScalarFunction(signature);
+        return modulusScalarFunction(new PolymorphicScalarFunctionBuilder(MODULUS, DecimalOperators.class));
     }
 
-    public static SqlScalarFunction modulusScalarFunction(Signature signature)
+    public static SqlScalarFunction modulusScalarFunction()
     {
-        return new PolymorphicScalarFunctionBuilder(DecimalOperators.class)
-                .signature(signature)
-                .deterministic(true)
-                .choice(choice -> choice
-                        .implementation(methodsGroup -> methodsGroup
-                                .methods("modulusShortShortShort", "modulusLongLongLong", "modulusShortLongLong", "modulusShortLongShort", "modulusLongShortShort", "modulusLongShortLong")
-                                .withExtraParameters(DecimalOperators::modulusRescaleParameters)))
-                .build();
+        return modulusScalarFunction(new PolymorphicScalarFunctionBuilder("mod", DecimalOperators.class));
     }
 
-    public static Signature.Builder modulusSignatureBuilder()
+    private static SqlScalarFunction modulusScalarFunction(PolymorphicScalarFunctionBuilder builder)
     {
         TypeSignature decimalLeftSignature = new TypeSignature("decimal", typeVariable("a_precision"), typeVariable("a_scale"));
         TypeSignature decimalRightSignature = new TypeSignature("decimal", typeVariable("b_precision"), typeVariable("b_scale"));
         TypeSignature decimalResultSignature = new TypeSignature("decimal", typeVariable("r_precision"), typeVariable("r_scale"));
 
-        return Signature.builder()
+        Signature signature = Signature.builder()
                 .longVariable("r_precision", "min(b_precision - b_scale, a_precision - a_scale) + max(a_scale, b_scale)")
                 .longVariable("r_scale", "max(a_scale, b_scale)")
                 .argumentType(decimalLeftSignature)
                 .argumentType(decimalRightSignature)
-                .returnType(decimalResultSignature);
+                .returnType(decimalResultSignature)
+                .build();
+
+        return builder.signature(signature)
+                .deterministic(true)
+                .choice(choice -> choice
+                        .implementation(methodsGroup -> methodsGroup
+                                .methods(
+                                        "modulusShortShortShort",
+                                        "modulusLongLongLong",
+                                        "modulusShortLongLong",
+                                        "modulusShortLongShort",
+                                        "modulusLongShortShort",
+                                        "modulusLongShortLong")
+                                .withExtraParameters(DecimalOperators::modulusRescaleParameters)))
+                .build();
     }
 
     private static List<Object> calculateShortRescaleParameters(SpecializeContext context)
diff --git a/core/trino-main/src/main/java/io/trino/type/DecimalSaturatedFloorCasts.java b/core/trino-main/src/main/java/io/trino/type/DecimalSaturatedFloorCasts.java
index 35a4fa66cd17..8478db55c941 100644
--- a/core/trino-main/src/main/java/io/trino/type/DecimalSaturatedFloorCasts.java
+++ b/core/trino-main/src/main/java/io/trino/type/DecimalSaturatedFloorCasts.java
@@ -39,9 +39,8 @@ public final class DecimalSaturatedFloorCasts
 {
     private DecimalSaturatedFloorCasts() {}
 
-    public static final SqlScalarFunction DECIMAL_TO_DECIMAL_SATURATED_FLOOR_CAST = new PolymorphicScalarFunctionBuilder(DecimalSaturatedFloorCasts.class)
+    public static final SqlScalarFunction DECIMAL_TO_DECIMAL_SATURATED_FLOOR_CAST = new PolymorphicScalarFunctionBuilder(SATURATED_FLOOR_CAST, DecimalSaturatedFloorCasts.class)
             .signature(Signature.builder()
-                    .operatorType(SATURATED_FLOOR_CAST)
                     .argumentType(new TypeSignature("decimal", typeVariable("source_precision"), typeVariable("source_scale")))
                     .returnType(new TypeSignature("decimal", typeVariable("result_precision"), typeVariable("result_scale")))
                     .build())
@@ -110,9 +109,8 @@ else if (scale < 0) {
 
     private static SqlScalarFunction decimalToGenericIntegerTypeSaturatedFloorCast(Type type, long minValue, long maxValue)
     {
-        return new PolymorphicScalarFunctionBuilder(DecimalSaturatedFloorCasts.class)
+        return new PolymorphicScalarFunctionBuilder(SATURATED_FLOOR_CAST, DecimalSaturatedFloorCasts.class)
                 .signature(Signature.builder()
-                        .operatorType(SATURATED_FLOOR_CAST)
                         .argumentType(new TypeSignature("decimal", typeVariable("source_precision"), typeVariable("source_scale")))
                         .returnType(type.getTypeSignature())
                         .build())
@@ -161,9 +159,8 @@ private static long saturatedCast(Int128 value, int sourceScale, long minValue,
 
     private static SqlScalarFunction genericIntegerTypeToDecimalSaturatedFloorCast(Type integerType)
     {
-        return new PolymorphicScalarFunctionBuilder(DecimalSaturatedFloorCasts.class)
+        return new PolymorphicScalarFunctionBuilder(SATURATED_FLOOR_CAST, DecimalSaturatedFloorCasts.class)
                 .signature(Signature.builder()
-                        .operatorType(SATURATED_FLOOR_CAST)
                         .argumentType(integerType)
                         .returnType(new TypeSignature("decimal", typeVariable("result_precision"), typeVariable("result_scale")))
                         .build())
diff --git a/core/trino-main/src/main/java/io/trino/type/DecimalToDecimalCasts.java b/core/trino-main/src/main/java/io/trino/type/DecimalToDecimalCasts.java
index d2dea79c9c6f..4bd14a157a4e 100644
--- a/core/trino-main/src/main/java/io/trino/type/DecimalToDecimalCasts.java
+++ b/core/trino-main/src/main/java/io/trino/type/DecimalToDecimalCasts.java
@@ -28,13 +28,12 @@
 public final class DecimalToDecimalCasts
 {
     public static final Signature SIGNATURE = Signature.builder()
-            .operatorType(CAST)
             .argumentType(parseTypeSignature("decimal(from_precision,from_scale)", ImmutableSet.of("from_precision", "from_scale")))
             .returnType(parseTypeSignature("decimal(to_precision,to_scale)", ImmutableSet.of("to_precision", "to_scale")))
             .build();
 
     // TODO: filtering mechanism could be used to return NoOp method when only precision is increased
-    public static final SqlScalarFunction DECIMAL_TO_DECIMAL_CAST = new PolymorphicScalarFunctionBuilder(DecimalConversions.class)
+    public static final SqlScalarFunction DECIMAL_TO_DECIMAL_CAST = new PolymorphicScalarFunctionBuilder(CAST, DecimalConversions.class)
             .signature(SIGNATURE)
             .deterministic(true)
             .choice(choice -> choice
diff --git a/core/trino-main/src/main/java/io/trino/type/FunctionType.java b/core/trino-main/src/main/java/io/trino/type/FunctionType.java
index 35fd362971c1..2a5e6a790f4c 100644
--- a/core/trino-main/src/main/java/io/trino/type/FunctionType.java
+++ b/core/trino-main/src/main/java/io/trino/type/FunctionType.java
@@ -19,6 +19,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignature;
@@ -92,7 +93,13 @@ public String getDisplayName()
     @Override
     public final Class<?> getJavaType()
     {
-        throw new UnsupportedOperationException(getTypeSignature() + " type does not have Java type");
+        throw new UnsupportedOperationException(getTypeSignature() + " type does not have a Java type");
+    }
+
+    @Override
+    public Class<? extends ValueBlock> getValueBlockType()
+    {
+        throw new UnsupportedOperationException(getTypeSignature() + " type does not have a ValueBlock type");
     }
 
     @Override
@@ -196,4 +203,28 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
     {
         throw new UnsupportedOperationException();
     }
+
+    @Override
+    public int getFlatFixedSize()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isFlatVariableWidth()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int getFlatVariableWidthSize(Block block, int position)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int relocateFlatVariableWidthOffsets(byte[] fixedSizeSlice, int fixedSizeOffset, byte[] variableSizeSlice, int variableSizeOffset)
+    {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/type/InternalTypeManager.java b/core/trino-main/src/main/java/io/trino/type/InternalTypeManager.java
index d85e3b0c9923..d870a94c1261 100644
--- a/core/trino-main/src/main/java/io/trino/type/InternalTypeManager.java
+++ b/core/trino-main/src/main/java/io/trino/type/InternalTypeManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.type;
 
+import com.google.inject.Inject;
 import io.trino.FeaturesConfig;
 import io.trino.metadata.TypeRegistry;
 import io.trino.spi.type.Type;
@@ -21,8 +22,6 @@
 import io.trino.spi.type.TypeOperators;
 import io.trino.spi.type.TypeSignature;
 
-import javax.inject.Inject;
-
 public final class InternalTypeManager
         implements TypeManager
 {
diff --git a/core/trino-main/src/main/java/io/trino/type/IntervalYearMonthType.java b/core/trino-main/src/main/java/io/trino/type/IntervalYearMonthType.java
index 0cb9ed359e9d..ebcfe8dea965 100644
--- a/core/trino-main/src/main/java/io/trino/type/IntervalYearMonthType.java
+++ b/core/trino-main/src/main/java/io/trino/type/IntervalYearMonthType.java
@@ -35,7 +35,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         if (block.isNull(position)) {
             return null;
         }
-        return new SqlIntervalYearMonth(block.getInt(position, 0));
+        return new SqlIntervalYearMonth(getInt(block, position));
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/type/IpAddressType.java b/core/trino-main/src/main/java/io/trino/type/IpAddressType.java
index 440e47d09453..c0bff38df5bc 100644
--- a/core/trino-main/src/main/java/io/trino/type/IpAddressType.java
+++ b/core/trino-main/src/main/java/io/trino/type/IpAddressType.java
@@ -20,11 +20,15 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.Int128ArrayBlock;
 import io.trino.spi.block.Int128ArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BlockIndex;
 import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 import io.trino.spi.type.AbstractType;
 import io.trino.spi.type.FixedWidthType;
@@ -33,13 +37,17 @@
 import io.trino.spi.type.TypeOperators;
 import io.trino.spi.type.TypeSignature;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.nio.ByteOrder;
 
 import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
 import static io.trino.spi.block.Int128ArrayBlock.INT128_BYTES;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 import static io.trino.spi.function.OperatorType.EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.Long.reverseBytes;
@@ -50,12 +58,13 @@ public class IpAddressType
         implements FixedWidthType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(IpAddressType.class, lookup(), Slice.class);
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
 
     public static final IpAddressType IPADDRESS = new IpAddressType();
 
     private IpAddressType()
     {
-        super(new TypeSignature(StandardTypes.IPADDRESS), Slice.class);
+        super(new TypeSignature(StandardTypes.IPADDRESS), Slice.class, Int128ArrayBlock.class);
     }
 
     @Override
@@ -130,9 +139,9 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeLong(block.getLong(position, 0));
-            blockBuilder.writeLong(block.getLong(position, SIZE_OF_LONG));
-            blockBuilder.closeEntry();
+            ((Int128ArrayBlockBuilder) blockBuilder).writeInt128(
+                    block.getLong(position, 0),
+                    block.getLong(position, SIZE_OF_LONG));
         }
     }
 
@@ -148,17 +157,56 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int l
         if (length != INT128_BYTES) {
             throw new IllegalStateException("Expected entry size to be exactly " + INT128_BYTES + " but was " + length);
         }
-        blockBuilder.writeLong(value.getLong(offset));
-        blockBuilder.writeLong(value.getLong(offset + SIZE_OF_LONG));
-        blockBuilder.closeEntry();
+        ((Int128ArrayBlockBuilder) blockBuilder).writeInt128(
+                value.getLong(offset),
+                value.getLong(offset + SIZE_OF_LONG));
     }
 
     @Override
     public final Slice getSlice(Block block, int position)
     {
-        return Slices.wrappedLongArray(
-                block.getLong(position, 0),
-                block.getLong(position, SIZE_OF_LONG));
+        Slice value = Slices.allocate(INT128_BYTES);
+        value.setLong(0, block.getLong(position, 0));
+        value.setLong(SIZE_OF_LONG, block.getLong(position, SIZE_OF_LONG));
+        return value;
+    }
+
+    @Override
+    public int getFlatFixedSize()
+    {
+        return INT128_BYTES;
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static Slice readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return Slices.wrappedBuffer(fixedSizeSlice, fixedSizeOffset, INT128_BYTES);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void readFlatToBlock(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice,
+            BlockBuilder blockBuilder)
+    {
+        ((Int128ArrayBlockBuilder) blockBuilder).writeInt128(
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset),
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG));
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            Slice value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        value.getBytes(0, fixedSizeSlice, fixedSizeOffset, INT128_BYTES);
     }
 
     @ScalarOperator(EQUAL)
@@ -172,7 +220,7 @@ private static boolean equalOperator(Slice left, Slice right)
     }
 
     @ScalarOperator(EQUAL)
-    private static boolean equalOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static boolean equalOperator(@BlockPosition Int128ArrayBlock leftBlock, @BlockIndex int leftPosition, @BlockPosition Int128ArrayBlock rightBlock, @BlockIndex int rightPosition)
     {
         return equal(
                 leftBlock.getLong(leftPosition, 0),
@@ -193,7 +241,7 @@ private static long xxHash64Operator(Slice value)
     }
 
     @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(@BlockPosition Block block, @BlockIndex int position)
+    private static long xxHash64Operator(@BlockPosition Int128ArrayBlock block, @BlockIndex int position)
     {
         return xxHash64(block.getLong(position, 0), block.getLong(position, SIZE_OF_LONG));
     }
@@ -214,7 +262,7 @@ private static long comparisonOperator(Slice left, Slice right)
     }
 
     @ScalarOperator(COMPARISON_UNORDERED_LAST)
-    private static long comparisonOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static long comparisonOperator(@BlockPosition Int128ArrayBlock leftBlock, @BlockIndex int leftPosition, @BlockPosition Int128ArrayBlock rightBlock, @BlockIndex int rightPosition)
     {
         return compareBigEndian(
                 leftBlock.getLong(leftPosition, 0),
diff --git a/core/trino-main/src/main/java/io/trino/type/JoniRegexpType.java b/core/trino-main/src/main/java/io/trino/type/JoniRegexpType.java
index 881de477ffae..606639ce4110 100644
--- a/core/trino-main/src/main/java/io/trino/type/JoniRegexpType.java
+++ b/core/trino-main/src/main/java/io/trino/type/JoniRegexpType.java
@@ -16,6 +16,8 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.TypeSignature;
@@ -39,12 +41,6 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Object getObject(Block block, int position)
     {
@@ -52,13 +48,15 @@ public Object getObject(Block block, int position)
             return null;
         }
 
-        return joniRegexp(block.getSlice(position, 0, block.getSliceLength(position)));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return joniRegexp(valueBlock.getSlice(valuePosition));
     }
 
     @Override
     public void writeObject(BlockBuilder blockBuilder, Object value)
     {
         Slice pattern = ((JoniRegexp) value).pattern();
-        blockBuilder.writeBytes(pattern, 0, pattern.length()).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(pattern);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/type/Json2016Type.java b/core/trino-main/src/main/java/io/trino/type/Json2016Type.java
index 3c6468939323..f028551ddc32 100644
--- a/core/trino-main/src/main/java/io/trino/type/Json2016Type.java
+++ b/core/trino-main/src/main/java/io/trino/type/Json2016Type.java
@@ -21,6 +21,8 @@
 import io.trino.operator.scalar.json.JsonOutputConversionError;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.StandardTypes;
@@ -46,12 +48,6 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         return getObject(block, position);
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Object getObject(Block block, int position)
     {
@@ -59,7 +55,9 @@ public Object getObject(Block block, int position)
             return null;
         }
 
-        String json = block.getSlice(position, 0, block.getSliceLength(position)).toStringUtf8();
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        String json = valueBlock.getSlice(valuePosition).toStringUtf8();
         if (json.equals(JSON_ERROR.toString())) {
             return JSON_ERROR;
         }
@@ -87,6 +85,6 @@ public void writeObject(BlockBuilder blockBuilder, Object value)
             }
         }
         Slice bytes = utf8Slice(json);
-        blockBuilder.writeBytes(bytes, 0, bytes.length()).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(bytes);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/type/JsonPath2016Type.java b/core/trino-main/src/main/java/io/trino/type/JsonPath2016Type.java
index 02e54b8757a4..fc7f6ed88dbc 100644
--- a/core/trino-main/src/main/java/io/trino/type/JsonPath2016Type.java
+++ b/core/trino-main/src/main/java/io/trino/type/JsonPath2016Type.java
@@ -23,6 +23,8 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockEncodingSerde;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.Type;
@@ -49,12 +51,6 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Object getObject(Block block, int position)
     {
@@ -62,8 +58,10 @@ public Object getObject(Block block, int position)
             return null;
         }
 
-        Slice bytes = block.getSlice(position, 0, block.getSliceLength(position));
-        return jsonPathCodec.fromJson(bytes.toStringUtf8());
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        String json = valueBlock.getSlice(valuePosition).toStringUtf8();
+        return jsonPathCodec.fromJson(json);
     }
 
     @Override
@@ -71,7 +69,7 @@ public void writeObject(BlockBuilder blockBuilder, Object value)
     {
         String json = jsonPathCodec.toJson((IrJsonPath) value);
         Slice bytes = utf8Slice(json);
-        blockBuilder.writeBytes(bytes, 0, bytes.length()).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(bytes);
     }
 
     private static JsonCodec<IrJsonPath> getCodec(TypeDeserializer typeDeserializer, BlockEncodingSerde blockEncodingSerde)
diff --git a/core/trino-main/src/main/java/io/trino/type/JsonPathType.java b/core/trino-main/src/main/java/io/trino/type/JsonPathType.java
index b7d7eb68225f..addc7a034f4f 100644
--- a/core/trino-main/src/main/java/io/trino/type/JsonPathType.java
+++ b/core/trino-main/src/main/java/io/trino/type/JsonPathType.java
@@ -18,6 +18,8 @@
 import io.trino.operator.scalar.JsonPath;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.TypeSignature;
@@ -39,12 +41,6 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Object getObject(Block block, int position)
     {
@@ -52,13 +48,16 @@ public Object getObject(Block block, int position)
             return null;
         }
 
-        return new JsonPath(block.getSlice(position, 0, block.getSliceLength(position)).toStringUtf8());
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        String pattern = valueBlock.getSlice(valuePosition).toStringUtf8();
+        return new JsonPath(pattern);
     }
 
     @Override
     public void writeObject(BlockBuilder blockBuilder, Object value)
     {
         Slice pattern = Slices.utf8Slice(((JsonPath) value).pattern());
-        blockBuilder.writeBytes(pattern, 0, pattern.length()).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(pattern);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/type/JsonType.java b/core/trino-main/src/main/java/io/trino/type/JsonType.java
index f50aed7f5e4c..f077f2287fb3 100644
--- a/core/trino-main/src/main/java/io/trino/type/JsonType.java
+++ b/core/trino-main/src/main/java/io/trino/type/JsonType.java
@@ -15,31 +15,27 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import io.airlift.slice.XxHash64;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.function.BlockIndex;
-import io.trino.spi.function.BlockPosition;
-import io.trino.spi.function.ScalarOperator;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.TypeOperatorDeclaration;
 import io.trino.spi.type.TypeOperators;
 import io.trino.spi.type.TypeSignature;
 
-import static io.trino.spi.function.OperatorType.EQUAL;
-import static io.trino.spi.function.OperatorType.XX_HASH_64;
-import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
-import static java.lang.invoke.MethodHandles.lookup;
-
 /**
  * The stack representation for JSON objects must have the keys in natural sorted order.
  */
 public class JsonType
         extends AbstractVariableWidthType
 {
-    private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(JsonType.class, lookup(), Slice.class);
+    private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = TypeOperatorDeclaration.builder(Slice.class)
+            .addOperators(DEFAULT_READ_OPERATORS)
+            .addOperators(DEFAULT_COMPARABLE_OPERATORS)
+            .build();
 
     public static final JsonType JSON = new JsonType();
 
@@ -67,25 +63,15 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return block.getSlice(position, 0, block.getSliceLength(position)).toStringUtf8();
-    }
-
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
+        return getSlice(block, position).toStringUtf8();
     }
 
     @Override
     public Slice getSlice(Block block, int position)
     {
-        return block.getSlice(position, 0, block.getSliceLength(position));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return valueBlock.getSlice(valuePosition);
     }
 
     public void writeString(BlockBuilder blockBuilder, String value)
@@ -102,35 +88,6 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value)
     @Override
     public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int length)
     {
-        blockBuilder.writeBytes(value, offset, length).closeEntry();
-    }
-
-    @ScalarOperator(EQUAL)
-    private static boolean equalOperator(Slice left, Slice right)
-    {
-        return left.equals(right);
-    }
-
-    @ScalarOperator(EQUAL)
-    private static boolean equalOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
-    {
-        int leftLength = leftBlock.getSliceLength(leftPosition);
-        int rightLength = rightBlock.getSliceLength(rightPosition);
-        if (leftLength != rightLength) {
-            return false;
-        }
-        return leftBlock.equals(leftPosition, 0, rightBlock, rightPosition, 0, leftLength);
-    }
-
-    @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(Slice value)
-    {
-        return XxHash64.hash(value);
-    }
-
-    @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(@BlockPosition Block block, @BlockIndex int position)
-    {
-        return block.hash(position, 0, block.getSliceLength(position));
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(value, offset, length);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/type/LikeFunctions.java b/core/trino-main/src/main/java/io/trino/type/LikeFunctions.java
index 839bbcedc50d..24eb70d717c6 100644
--- a/core/trino-main/src/main/java/io/trino/type/LikeFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/type/LikeFunctions.java
@@ -15,7 +15,6 @@
 
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
-import io.trino.likematcher.LikeMatcher;
 import io.trino.spi.TrinoException;
 import io.trino.spi.function.LiteralParameter;
 import io.trino.spi.function.LiteralParameters;
@@ -41,7 +40,7 @@ private LikeFunctions() {}
     @ScalarFunction(value = LIKE_FUNCTION_NAME, hidden = true)
     @LiteralParameters("x")
     @SqlType(StandardTypes.BOOLEAN)
-    public static boolean likeChar(@LiteralParameter("x") Long x, @SqlType("char(x)") Slice value, @SqlType(LikePatternType.NAME) LikeMatcher pattern)
+    public static boolean likeChar(@LiteralParameter("x") Long x, @SqlType("char(x)") Slice value, @SqlType(LikePatternType.NAME) LikePattern pattern)
     {
         return likeVarchar(padSpaces(value, x.intValue()), pattern);
     }
@@ -49,33 +48,41 @@ public static boolean likeChar(@LiteralParameter("x") Long x, @SqlType("char(x)"
     // TODO: this should not be callable from SQL
     @ScalarFunction(value = LIKE_FUNCTION_NAME, hidden = true)
     @SqlType(StandardTypes.BOOLEAN)
-    public static boolean likeVarchar(@SqlType("varchar") Slice value, @SqlType(LikePatternType.NAME) LikeMatcher matcher)
+    public static boolean likeVarchar(@SqlType("varchar") Slice value, @SqlType(LikePatternType.NAME) LikePattern pattern)
     {
-        if (value.hasByteArray()) {
-            return matcher.match(value.byteArray(), value.byteArrayOffset(), value.length());
-        }
-        return matcher.match(value.getBytes(), 0, value.length());
+        return pattern.getMatcher().match(value.byteArray(), value.byteArrayOffset(), value.length());
     }
 
     @ScalarFunction(value = LIKE_PATTERN_FUNCTION_NAME, hidden = true)
     @SqlType(LikePatternType.NAME)
-    public static LikeMatcher likePattern(@SqlType("varchar") Slice pattern)
+    public static LikePattern likePattern(@SqlType("varchar") Slice pattern)
     {
-        return LikeMatcher.compile(pattern.toStringUtf8(), Optional.empty(), false);
+        return LikePattern.compile(pattern.toStringUtf8(), Optional.empty(), false);
     }
 
     @ScalarFunction(value = LIKE_PATTERN_FUNCTION_NAME, hidden = true)
     @SqlType(LikePatternType.NAME)
-    public static LikeMatcher likePattern(@SqlType("varchar") Slice pattern, @SqlType("varchar") Slice escape)
+    public static LikePattern likePattern(@SqlType("varchar") Slice pattern, @SqlType("varchar") Slice escape)
     {
         try {
-            return LikeMatcher.compile(pattern.toStringUtf8(), getEscapeCharacter(Optional.of(escape)), false);
+            return LikePattern.compile(pattern.toStringUtf8(), getEscapeCharacter(Optional.of(escape)), false);
         }
         catch (RuntimeException e) {
             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, e);
         }
     }
 
+    public static boolean isMatchAllPattern(Slice pattern)
+    {
+        for (int i = 0; i < pattern.length(); i++) {
+            int current = pattern.getByte(i);
+            if (current != '%') {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public static boolean isLikePattern(Slice pattern, Optional<Slice> escape)
     {
         return patternConstantPrefixBytes(pattern, escape) < pattern.length();
diff --git a/core/trino-main/src/main/java/io/trino/type/LikePattern.java b/core/trino-main/src/main/java/io/trino/type/LikePattern.java
new file mode 100644
index 000000000000..9088f01dc2fd
--- /dev/null
+++ b/core/trino-main/src/main/java/io/trino/type/LikePattern.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed 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 io.trino.type;
+
+import io.trino.likematcher.LikeMatcher;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * LikePattern can be a part of the cache key in projection/filter compiled class caches in ExpressionCompiler.
+ * Equality for this class is dependent on the pattern and escape alone, as the matcher is expected to be derived from those.
+ */
+public class LikePattern
+{
+    private final String pattern;
+    private final Optional<Character> escape;
+    private final LikeMatcher matcher;
+
+    public static LikePattern compile(String pattern, Optional<Character> escape)
+    {
+        return new LikePattern(pattern, escape, LikeMatcher.compile(pattern, escape));
+    }
+
+    public static LikePattern compile(String pattern, Optional<Character> escape, boolean optimize)
+    {
+        return new LikePattern(pattern, escape, LikeMatcher.compile(pattern, escape, optimize));
+    }
+
+    private LikePattern(String pattern, Optional<Character> escape, LikeMatcher matcher)
+    {
+        this.pattern = requireNonNull(pattern, "pattern is null");
+        this.escape = requireNonNull(escape, "escape is null");
+        this.matcher = requireNonNull(matcher, "likeMatcher is null");
+    }
+
+    public String getPattern()
+    {
+        return pattern;
+    }
+
+    public Optional<Character> getEscape()
+    {
+        return escape;
+    }
+
+    public LikeMatcher getMatcher()
+    {
+        return matcher;
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        LikePattern that = (LikePattern) o;
+        return Objects.equals(pattern, that.pattern) && Objects.equals(escape, that.escape);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(pattern, escape);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("pattern", pattern)
+                .add("escape", escape)
+                .toString();
+    }
+}
diff --git a/core/trino-main/src/main/java/io/trino/type/LikePatternType.java b/core/trino-main/src/main/java/io/trino/type/LikePatternType.java
index 5edce0406160..180f9a33fa2a 100644
--- a/core/trino-main/src/main/java/io/trino/type/LikePatternType.java
+++ b/core/trino-main/src/main/java/io/trino/type/LikePatternType.java
@@ -14,17 +14,18 @@
 package io.trino.type;
 
 import io.airlift.slice.Slice;
-import io.trino.likematcher.LikeMatcher;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.TypeSignature;
 
 import java.util.Optional;
 
-import static io.airlift.slice.SizeOf.SIZE_OF_INT;
 import static io.airlift.slice.Slices.utf8Slice;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class LikePatternType
         extends AbstractVariableWidthType
@@ -34,7 +35,7 @@ public class LikePatternType
 
     private LikePatternType()
     {
-        super(new TypeSignature(NAME), LikeMatcher.class);
+        super(new TypeSignature(NAME), LikePattern.class);
     }
 
     @Override
@@ -43,12 +44,6 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Object getObject(Block block, int position)
     {
@@ -56,40 +51,40 @@ public Object getObject(Block block, int position)
             return null;
         }
 
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        Slice slice = valueBlock.getSlice(valuePosition);
+
         // layout is: <pattern length> <pattern> <hasEscape> <escape>?
-        int offset = 0;
-        int length = block.getInt(position, offset);
-        offset += SIZE_OF_INT;
-        String pattern = block.getSlice(position, offset, length).toStringUtf8();
-        offset += length;
+        int length = slice.getInt(0);
+        String pattern = slice.toString(4, length, UTF_8);
 
-        boolean hasEscape = block.getByte(position, offset) != 0;
-        offset++;
+        boolean hasEscape = slice.getByte(4 + length) != 0;
 
         Optional<Character> escape = Optional.empty();
         if (hasEscape) {
-            escape = Optional.of((char) block.getInt(position, offset));
+            escape = Optional.of((char) slice.getInt(4 + length + 1));
         }
 
-        return LikeMatcher.compile(pattern, escape);
+        return LikePattern.compile(pattern, escape);
     }
 
     @Override
     public void writeObject(BlockBuilder blockBuilder, Object value)
     {
-        LikeMatcher matcher = (LikeMatcher) value;
-
-        Slice pattern = utf8Slice(matcher.getPattern());
-        int length = pattern.length();
-        blockBuilder.writeInt(length);
-        blockBuilder.writeBytes(pattern, 0, length);
-        if (matcher.getEscape().isEmpty()) {
-            blockBuilder.writeByte(0);
-        }
-        else {
-            blockBuilder.writeByte(1);
-            blockBuilder.writeInt(matcher.getEscape().get());
-        }
-        blockBuilder.closeEntry();
+        LikePattern likePattern = (LikePattern) value;
+        ((VariableWidthBlockBuilder) blockBuilder).buildEntry(valueWriter -> {
+            Slice pattern = utf8Slice(likePattern.getPattern());
+            int length = pattern.length();
+            valueWriter.writeInt(length);
+            valueWriter.writeBytes(pattern, 0, length);
+            if (likePattern.getEscape().isEmpty()) {
+                valueWriter.writeByte(0);
+            }
+            else {
+                valueWriter.writeByte(1);
+                valueWriter.writeInt(likePattern.getEscape().get());
+            }
+        });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/type/Re2JRegexpType.java b/core/trino-main/src/main/java/io/trino/type/Re2JRegexpType.java
index 639d5553eaa4..1d6807fd4d71 100644
--- a/core/trino-main/src/main/java/io/trino/type/Re2JRegexpType.java
+++ b/core/trino-main/src/main/java/io/trino/type/Re2JRegexpType.java
@@ -18,6 +18,8 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.TypeSignature;
@@ -46,12 +48,6 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Object getObject(Block block, int position)
     {
@@ -59,7 +55,9 @@ public Object getObject(Block block, int position)
             return null;
         }
 
-        Slice pattern = block.getSlice(position, 0, block.getSliceLength(position));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        Slice pattern = valueBlock.getSlice(valuePosition);
         try {
             return new Re2JRegexp(dfaStatesLimit, dfaRetries, pattern);
         }
@@ -72,6 +70,6 @@ public Object getObject(Block block, int position)
     public void writeObject(BlockBuilder blockBuilder, Object value)
     {
         Slice pattern = Slices.utf8Slice(((Re2JRegexp) value).pattern());
-        blockBuilder.writeBytes(pattern, 0, pattern.length()).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(pattern);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/type/TDigestType.java b/core/trino-main/src/main/java/io/trino/type/TDigestType.java
index 5c6a95b8438c..b37130082a3b 100644
--- a/core/trino-main/src/main/java/io/trino/type/TDigestType.java
+++ b/core/trino-main/src/main/java/io/trino/type/TDigestType.java
@@ -17,6 +17,8 @@
 import io.airlift.stats.TDigest;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.SqlVarbinary;
@@ -33,29 +35,19 @@ private TDigestType()
         super(new TypeSignature(StandardTypes.TDIGEST), TDigest.class);
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
-    }
-
     @Override
     public Object getObject(Block block, int position)
     {
-        return TDigest.deserialize(block.getSlice(position, 0, block.getSliceLength(position)));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return TDigest.deserialize(valueBlock.getSlice(valuePosition));
     }
 
     @Override
     public void writeObject(BlockBuilder blockBuilder, Object value)
     {
         Slice serialized = ((TDigest) value).serialize();
-        blockBuilder.writeBytes(serialized, 0, serialized.length()).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(serialized);
     }
 
     @Override
@@ -65,6 +57,8 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return new SqlVarbinary(block.getSlice(position, 0, block.getSliceLength(position)).getBytes());
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return new SqlVarbinary(valueBlock.getSlice(valuePosition).getBytes());
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/type/TypeDeserializer.java b/core/trino-main/src/main/java/io/trino/type/TypeDeserializer.java
index aa5512c4af95..3cd79a4c7915 100644
--- a/core/trino-main/src/main/java/io/trino/type/TypeDeserializer.java
+++ b/core/trino-main/src/main/java/io/trino/type/TypeDeserializer.java
@@ -15,12 +15,11 @@
 
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.FromStringDeserializer;
+import com.google.inject.Inject;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeId;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.util.function.Function;
 
 import static java.util.Objects.requireNonNull;
diff --git a/core/trino-main/src/main/java/io/trino/type/TypeOperatorsCache.java b/core/trino-main/src/main/java/io/trino/type/TypeOperatorsCache.java
index 9d822d53a01a..086b169e4ed3 100644
--- a/core/trino-main/src/main/java/io/trino/type/TypeOperatorsCache.java
+++ b/core/trino-main/src/main/java/io/trino/type/TypeOperatorsCache.java
@@ -15,15 +15,15 @@
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.util.concurrent.UncheckedExecutionException;
-import io.trino.collect.cache.NonKeyEvictableCache;
+import io.trino.cache.NonKeyEvictableCache;
 import org.weakref.jmx.Managed;
 
 import java.util.function.BiFunction;
 import java.util.function.Supplier;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
 
 public class TypeOperatorsCache
         implements BiFunction<Object, Supplier<Object>, Object>
diff --git a/core/trino-main/src/main/java/io/trino/type/TypeSignatureDeserializer.java b/core/trino-main/src/main/java/io/trino/type/TypeSignatureDeserializer.java
index 4ee8e00a8378..076afbdddbdf 100644
--- a/core/trino-main/src/main/java/io/trino/type/TypeSignatureDeserializer.java
+++ b/core/trino-main/src/main/java/io/trino/type/TypeSignatureDeserializer.java
@@ -16,10 +16,9 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.FromStringDeserializer;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.spi.type.TypeSignature;
 
-import javax.inject.Inject;
-
 import static io.trino.sql.analyzer.TypeSignatureTranslator.parseTypeSignature;
 
 public final class TypeSignatureDeserializer
diff --git a/core/trino-main/src/main/java/io/trino/type/UnknownType.java b/core/trino-main/src/main/java/io/trino/type/UnknownType.java
index b7c1f76c0e35..92406f8684f2 100644
--- a/core/trino-main/src/main/java/io/trino/type/UnknownType.java
+++ b/core/trino-main/src/main/java/io/trino/type/UnknownType.java
@@ -16,9 +16,13 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.ByteArrayBlock;
 import io.trino.spi.block.ByteArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 import io.trino.spi.type.AbstractType;
 import io.trino.spi.type.FixedWidthType;
@@ -29,6 +33,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 import static io.trino.spi.function.OperatorType.EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.invoke.MethodHandles.lookup;
@@ -47,7 +52,7 @@ private UnknownType()
         // We never access the native container for UNKNOWN because its null check is always true.
         // The actual native container type does not matter here.
         // We choose boolean to represent UNKNOWN because it's the smallest primitive type.
-        super(new TypeSignature(NAME), boolean.class);
+        super(new TypeSignature(NAME), boolean.class, ByteArrayBlock.class);
     }
 
     @Override
@@ -118,8 +123,8 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
     @Override
     public boolean getBoolean(Block block, int position)
     {
-        // Ideally, this function should never be invoked for unknown type.
-        // However, some logic rely on having a default value before the null check.
+        // Ideally, this function should never be invoked for the unknown type.
+        // However, some logic relies on having a default value before the null check.
         checkArgument(block.isNull(position));
         return false;
     }
@@ -128,12 +133,38 @@ public boolean getBoolean(Block block, int position)
     @Override
     public void writeBoolean(BlockBuilder blockBuilder, boolean value)
     {
-        // Ideally, this function should never be invoked for unknown type.
-        // However, some logic (e.g. AbstractMinMaxBy) rely on writing a default value before the null check.
+        // Ideally, this function should never be invoked for the unknown type.
+        // However, some logic (e.g. AbstractMinMaxBy) relies on writing a default value before the null check.
         checkArgument(!value);
         blockBuilder.appendNull();
     }
 
+    @Override
+    public int getFlatFixedSize()
+    {
+        return 0;
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static boolean readFlat(
+            @FlatFixed byte[] unusedFixedSizeSlice,
+            @FlatFixedOffset int unusedFixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        throw new AssertionError("value of unknown type should all be NULL");
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            boolean unusedValue,
+            byte[] unusedFixedSizeSlice,
+            int unusedFixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        throw new AssertionError("value of unknown type should all be NULL");
+    }
+
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(boolean unusedLeft, boolean unusedRight)
     {
diff --git a/core/trino-main/src/main/java/io/trino/type/setdigest/SetDigestFunctions.java b/core/trino-main/src/main/java/io/trino/type/setdigest/SetDigestFunctions.java
index c7e8e23722e1..a76e21be35fe 100644
--- a/core/trino-main/src/main/java/io/trino/type/setdigest/SetDigestFunctions.java
+++ b/core/trino-main/src/main/java/io/trino/type/setdigest/SetDigestFunctions.java
@@ -15,16 +15,15 @@
 package io.trino.type.setdigest;
 
 import io.airlift.slice.Slice;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
+import io.trino.spi.type.MapType;
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.Type;
 
-import java.util.Map;
-
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.type.setdigest.SetDigest.exactIntersectionCardinality;
@@ -78,19 +77,17 @@ public static double jaccardIndex(@SqlType(SetDigestType.NAME) Slice slice1, @Sq
 
     @ScalarFunction
     @SqlType("map(bigint,smallint)")
-    public static Block hashCounts(@TypeParameter("map(bigint,smallint)") Type mapType, @SqlType(SetDigestType.NAME) Slice slice)
+    public static SqlMap hashCounts(@TypeParameter("map(bigint,smallint)") Type mapType, @SqlType(SetDigestType.NAME) Slice slice)
     {
         SetDigest digest = SetDigest.newInstance(slice);
-
-        // Maybe use static BlockBuilderStatus in order avoid `new`?
-        BlockBuilder blockBuilder = mapType.createBlockBuilder(null, 1);
-        BlockBuilder singleMapBlockBuilder = blockBuilder.beginBlockEntry();
-        for (Map.Entry<Long, Short> entry : digest.getHashCounts().entrySet()) {
-            BIGINT.writeLong(singleMapBlockBuilder, entry.getKey());
-            SMALLINT.writeLong(singleMapBlockBuilder, entry.getValue());
-        }
-        blockBuilder.closeEntry();
-
-        return (Block) mapType.getObject(blockBuilder, 0);
+        return buildMapValue(
+                ((MapType) mapType),
+                digest.getHashCounts().size(),
+                (keyBuilder, valueBuilder) -> {
+                    digest.getHashCounts().forEach((key, value) -> {
+                        BIGINT.writeLong(keyBuilder, key);
+                        SMALLINT.writeLong(valueBuilder, value);
+                    });
+                });
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/type/setdigest/SetDigestType.java b/core/trino-main/src/main/java/io/trino/type/setdigest/SetDigestType.java
index a45b95b5f2b0..7d3195992756 100644
--- a/core/trino-main/src/main/java/io/trino/type/setdigest/SetDigestType.java
+++ b/core/trino-main/src/main/java/io/trino/type/setdigest/SetDigestType.java
@@ -17,6 +17,8 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.SqlVarbinary;
@@ -43,25 +45,15 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return new SqlVarbinary(block.getSlice(position, 0, block.getSliceLength(position)).getBytes());
+        return new SqlVarbinary(getSlice(block, position).getBytes());
     }
 
     @Override
     public Slice getSlice(Block block, int position)
     {
-        return block.getSlice(position, 0, block.getSliceLength(position));
-    }
-
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return valueBlock.getSlice(valuePosition);
     }
 
     @Override
@@ -73,6 +65,6 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value)
     @Override
     public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int length)
     {
-        blockBuilder.writeBytes(value, offset, length).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(value, offset, length);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/util/CompilerUtils.java b/core/trino-main/src/main/java/io/trino/util/CompilerUtils.java
index c4701406e9a1..4b371a5dd8b9 100644
--- a/core/trino-main/src/main/java/io/trino/util/CompilerUtils.java
+++ b/core/trino-main/src/main/java/io/trino/util/CompilerUtils.java
@@ -36,15 +36,33 @@ public final class CompilerUtils
 
     private static final AtomicLong CLASS_ID = new AtomicLong();
     private static final DateTimeFormatter TIMESTAMP_FORMAT = DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss");
+    private static final String PACKAGE_PREFIX = "io.trino.$gen.";
+    // Maximum symbol table entry allowed by the JVM class file format
+    private static final int MAX_SYMBOL_TABLE_ENTRY_LENGTH = 65535;
+    // Leave enough of a buffer between the maximum generated class name length and the symbol table limit
+    // so that method handles and other symbols that embed the class name can be encoded without failing
+    private static final int MAX_CLASS_NAME_LENGTH = MAX_SYMBOL_TABLE_ENTRY_LENGTH - 8192;
 
     private CompilerUtils() {}
 
     public static ParameterizedType makeClassName(String baseName, Optional<String> suffix)
     {
-        String className = baseName
-                + "_" + suffix.orElseGet(() -> Instant.now().atZone(UTC).format(TIMESTAMP_FORMAT))
-                + "_" + CLASS_ID.incrementAndGet();
-        return typeFromJavaClassName("io.trino.$gen." + toJavaIdentifierString(className));
+        String classNameSuffix = suffix.orElseGet(() -> Instant.now().atZone(UTC).format(TIMESTAMP_FORMAT));
+        String classUniqueId = String.valueOf(CLASS_ID.incrementAndGet());
+
+        int addedNameLength = PACKAGE_PREFIX.length() +
+                2 + // underscores
+                classNameSuffix.length() +
+                classUniqueId.length();
+
+        // truncate the baseName to ensure that we don't exceed the bytecode limit on class names, while also ensuring
+        // the class suffix and unique ID are fully preserved to avoid conflicts with other generated class names
+        if (baseName.length() + addedNameLength > MAX_CLASS_NAME_LENGTH) {
+            baseName = baseName.substring(0, MAX_CLASS_NAME_LENGTH - addedNameLength);
+        }
+
+        String className = baseName + "_" + classNameSuffix + "_" + classUniqueId;
+        return typeFromJavaClassName(PACKAGE_PREFIX + toJavaIdentifierString(className));
     }
 
     public static ParameterizedType makeClassName(String baseName)
diff --git a/core/trino-main/src/main/java/io/trino/util/DateTimeUtils.java b/core/trino-main/src/main/java/io/trino/util/DateTimeUtils.java
index 7ee4da4e4cec..7fe88f525dee 100644
--- a/core/trino-main/src/main/java/io/trino/util/DateTimeUtils.java
+++ b/core/trino-main/src/main/java/io/trino/util/DateTimeUtils.java
@@ -20,12 +20,10 @@
 import io.trino.sql.tree.IntervalLiteral.IntervalField;
 import org.assertj.core.util.VisibleForTesting;
 import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.joda.time.DurationFieldType;
 import org.joda.time.MutablePeriod;
 import org.joda.time.Period;
 import org.joda.time.ReadWritablePeriod;
-import org.joda.time.chrono.ISOChronology;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.DateTimeFormatterBuilder;
@@ -48,12 +46,9 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
-import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
 import static io.trino.util.DateTimeZoneIndex.getChronology;
 import static io.trino.util.DateTimeZoneIndex.getDateTimeZone;
 import static io.trino.util.DateTimeZoneIndex.packDateTimeWithZone;
-import static io.trino.util.DateTimeZoneIndex.unpackChronology;
-import static io.trino.util.DateTimeZoneIndex.unpackDateTimeZone;
 import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 
@@ -136,7 +131,6 @@ public static String printDate(int days)
         return DATE_FORMATTER.print(TimeUnit.DAYS.toMillis(days));
     }
 
-    private static final DateTimeFormatter TIMESTAMP_WITH_TIME_ZONE_FORMATTER;
     private static final DateTimeFormatter TIMESTAMP_WITH_OR_WITHOUT_TIME_ZONE_FORMATTER;
 
     static {
@@ -165,10 +159,6 @@ public static String printDate(int days)
                 DateTimeFormat.forPattern("yyyyyy-M-d H:m:s.SSS ZZZ").getParser()};
 
         DateTimePrinter timestampWithTimeZonePrinter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS ZZZ").getPrinter();
-        TIMESTAMP_WITH_TIME_ZONE_FORMATTER = new DateTimeFormatterBuilder()
-                .append(timestampWithTimeZonePrinter, timestampWithTimeZoneParser)
-                .toFormatter()
-                .withOffsetParsed();
 
         DateTimeParser[] timestampWithOrWithoutTimeZoneParser = Stream.concat(Stream.of(timestampWithoutTimeZoneParser), Stream.of(timestampWithTimeZoneParser))
                 .toArray(DateTimeParser[]::new);
@@ -194,15 +184,7 @@ public static long convertToTimestampWithTimeZone(TimeZoneKey timeZoneKey, Strin
         return packDateTimeWithZone(dateTime);
     }
 
-    public static String printTimestampWithTimeZone(long timestampWithTimeZone)
-    {
-        ISOChronology chronology = unpackChronology(timestampWithTimeZone);
-        long millis = unpackMillisUtc(timestampWithTimeZone);
-        return TIMESTAMP_WITH_TIME_ZONE_FORMATTER.withChronology(chronology).print(millis);
-    }
-
     private static final DateTimeFormatter TIME_FORMATTER;
-    private static final DateTimeFormatter TIME_WITH_TIME_ZONE_FORMATTER;
 
     static {
         DateTimeParser[] timeWithoutTimeZoneParser = {
@@ -211,22 +193,6 @@ public static String printTimestampWithTimeZone(long timestampWithTimeZone)
                 DateTimeFormat.forPattern("H:m:s.SSS").getParser()};
         DateTimePrinter timeWithoutTimeZonePrinter = DateTimeFormat.forPattern("HH:mm:ss.SSS").getPrinter();
         TIME_FORMATTER = new DateTimeFormatterBuilder().append(timeWithoutTimeZonePrinter, timeWithoutTimeZoneParser).toFormatter().withZoneUTC();
-
-        DateTimeParser[] timeWithTimeZoneParser = {
-                DateTimeFormat.forPattern("H:mZ").getParser(),
-                DateTimeFormat.forPattern("H:m Z").getParser(),
-                DateTimeFormat.forPattern("H:m:sZ").getParser(),
-                DateTimeFormat.forPattern("H:m:s Z").getParser(),
-                DateTimeFormat.forPattern("H:m:s.SSSZ").getParser(),
-                DateTimeFormat.forPattern("H:m:s.SSS Z").getParser(),
-                DateTimeFormat.forPattern("H:mZZZ").getParser(),
-                DateTimeFormat.forPattern("H:m ZZZ").getParser(),
-                DateTimeFormat.forPattern("H:m:sZZZ").getParser(),
-                DateTimeFormat.forPattern("H:m:s ZZZ").getParser(),
-                DateTimeFormat.forPattern("H:m:s.SSSZZZ").getParser(),
-                DateTimeFormat.forPattern("H:m:s.SSS ZZZ").getParser()};
-        DateTimePrinter timeWithTimeZonePrinter = DateTimeFormat.forPattern("HH:mm:ss.SSS ZZZ").getPrinter();
-        TIME_WITH_TIME_ZONE_FORMATTER = new DateTimeFormatterBuilder().append(timeWithTimeZonePrinter, timeWithTimeZoneParser).toFormatter().withOffsetParsed();
     }
 
     /**
@@ -241,27 +207,6 @@ public static long parseLegacyTime(TimeZoneKey timeZoneKey, String value)
         return TIME_FORMATTER.withZone(getDateTimeZone(timeZoneKey)).parseMillis(value);
     }
 
-    public static String printTimeWithTimeZone(long timeWithTimeZone)
-    {
-        DateTimeZone timeZone = unpackDateTimeZone(timeWithTimeZone);
-        long millis = unpackMillisUtc(timeWithTimeZone);
-        return TIME_WITH_TIME_ZONE_FORMATTER.withZone(timeZone).print(millis);
-    }
-
-    public static String printTimeWithoutTimeZone(long value)
-    {
-        return TIME_FORMATTER.print(value);
-    }
-
-    /**
-     * @deprecated applicable in legacy timestamp semantics only
-     */
-    @Deprecated
-    public static String printTimeWithoutTimeZone(TimeZoneKey timeZoneKey, long value)
-    {
-        return TIME_FORMATTER.withZone(getDateTimeZone(timeZoneKey)).print(value);
-    }
-
     private static final int YEAR_FIELD = 0;
     private static final int MONTH_FIELD = 1;
     private static final int DAY_FIELD = 3;
diff --git a/core/trino-main/src/main/java/io/trino/util/Failures.java b/core/trino-main/src/main/java/io/trino/util/Failures.java
index 43a86fba0c5c..99a330c78b51 100644
--- a/core/trino-main/src/main/java/io/trino/util/Failures.java
+++ b/core/trino-main/src/main/java/io/trino/util/Failures.java
@@ -24,8 +24,7 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.TrinoTransportException;
 import io.trino.sql.parser.ParsingException;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/core/trino-main/src/main/java/io/trino/util/FastutilSetHelper.java b/core/trino-main/src/main/java/io/trino/util/FastutilSetHelper.java
index e6373cc62547..c6a9803a042e 100644
--- a/core/trino-main/src/main/java/io/trino/util/FastutilSetHelper.java
+++ b/core/trino-main/src/main/java/io/trino/util/FastutilSetHelper.java
@@ -15,7 +15,8 @@
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.util.concurrent.UncheckedExecutionException;
-import io.trino.collect.cache.NonEvictableCache;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import io.trino.cache.NonEvictableCache;
 import io.trino.spi.type.Type;
 import it.unimi.dsi.fastutil.Hash;
 import it.unimi.dsi.fastutil.booleans.BooleanOpenHashSet;
@@ -25,8 +26,6 @@
 import it.unimi.dsi.fastutil.longs.LongOpenCustomHashSet;
 import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.lang.invoke.MethodHandle;
 import java.util.Collection;
 import java.util.Objects;
@@ -35,8 +34,8 @@
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
 import static com.google.common.base.Verify.verifyNotNull;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.util.SingleAccessMethodCompiler.compileSingleAccessMethod;
 import static java.lang.Boolean.TRUE;
 import static java.lang.invoke.MethodType.methodType;
diff --git a/core/trino-main/src/main/java/io/trino/util/FinalizerService.java b/core/trino-main/src/main/java/io/trino/util/FinalizerService.java
index 6320c5f82543..1428f137d6b6 100644
--- a/core/trino-main/src/main/java/io/trino/util/FinalizerService.java
+++ b/core/trino-main/src/main/java/io/trino/util/FinalizerService.java
@@ -14,12 +14,11 @@
 package io.trino.util;
 
 import com.google.common.collect.Sets;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 import java.lang.ref.PhantomReference;
 import java.lang.ref.ReferenceQueue;
diff --git a/core/trino-main/src/main/java/io/trino/util/JsonUtil.java b/core/trino-main/src/main/java/io/trino/util/JsonUtil.java
index 90926cf8e918..4fbb95821a96 100644
--- a/core/trino-main/src/main/java/io/trino/util/JsonUtil.java
+++ b/core/trino-main/src/main/java/io/trino/util/JsonUtil.java
@@ -14,7 +14,6 @@
 package io.trino.util;
 
 import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
@@ -25,11 +24,14 @@
 import io.airlift.slice.SliceOutput;
 import io.airlift.slice.Slices;
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.DuplicateMapKeyException;
-import io.trino.spi.block.SingleMapBlockWriter;
-import io.trino.spi.block.SingleRowBlockWriter;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.BooleanType;
@@ -77,6 +79,7 @@
 import static com.fasterxml.jackson.core.JsonToken.START_ARRAY;
 import static com.fasterxml.jackson.core.JsonToken.START_OBJECT;
 import static com.google.common.base.Verify.verify;
+import static io.trino.plugin.base.util.JsonUtils.jsonFactoryBuilder;
 import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -90,10 +93,10 @@
 import static io.trino.spi.type.VarcharType.UNBOUNDED_LENGTH;
 import static io.trino.type.DateTimes.formatTimestamp;
 import static io.trino.type.JsonType.JSON;
+import static io.trino.type.UnknownType.UNKNOWN;
 import static io.trino.util.DateTimeUtils.printDate;
 import static io.trino.util.JsonUtil.ObjectKeyProvider.createObjectKeyProvider;
 import static java.lang.Float.floatToRawIntBits;
-import static java.lang.Float.intBitsToFloat;
 import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.math.RoundingMode.HALF_UP;
@@ -102,16 +105,20 @@
 
 public final class JsonUtil
 {
-    public static final JsonFactory JSON_FACTORY = new JsonFactoryBuilder().disable(CANONICALIZE_FIELD_NAMES).build();
+    private JsonUtil() {}
 
     // This object mapper is constructed without .configure(ORDER_MAP_ENTRIES_BY_KEYS, true) because
     // `OBJECT_MAPPER.writeValueAsString(parser.readValueAsTree());` preserves input order.
     // Be aware. Using it arbitrarily can produce invalid json (ordered by key is required in Trino).
-    private static final ObjectMapper OBJECT_MAPPED_UNORDERED = new ObjectMapper(JSON_FACTORY);
+    private static final ObjectMapper OBJECT_MAPPED_UNORDERED = new ObjectMapper(createJsonFactory());
 
     private static final int MAX_JSON_LENGTH_IN_ERROR_MESSAGE = 10_000;
 
-    private JsonUtil() {}
+    // Note: JsonFactory is mutable, instances cannot be shared openly.
+    public static JsonFactory createJsonFactory()
+    {
+        return jsonFactoryBuilder().disable(CANONICALIZE_FIELD_NAMES).build();
+    }
 
     public static JsonParser createJsonParser(JsonFactory factory, Slice json)
             throws IOException
@@ -212,31 +219,40 @@ public interface ObjectKeyProvider
 
         static ObjectKeyProvider createObjectKeyProvider(Type type)
         {
-            if (type instanceof UnknownType) {
+            if (type.equals(UNKNOWN)) {
                 return (block, position) -> null;
             }
-            if (type instanceof BooleanType) {
-                return (block, position) -> type.getBoolean(block, position) ? "true" : "false";
+            if (type.equals(BOOLEAN)) {
+                return (block, position) -> BOOLEAN.getBoolean(block, position) ? "true" : "false";
             }
-            if (type instanceof TinyintType || type instanceof SmallintType || type instanceof IntegerType || type instanceof BigintType) {
-                return (block, position) -> String.valueOf(type.getLong(block, position));
+            if (type.equals(TINYINT)) {
+                return (block, position) -> String.valueOf(TINYINT.getByte(block, position));
             }
-            if (type instanceof RealType) {
-                return (block, position) -> String.valueOf(intBitsToFloat(toIntExact(type.getLong(block, position))));
+            if (type.equals(SMALLINT)) {
+                return (block, position) -> String.valueOf(SMALLINT.getShort(block, position));
             }
-            if (type instanceof DoubleType) {
-                return (block, position) -> String.valueOf(type.getDouble(block, position));
+            if (type.equals(INTEGER)) {
+                return (block, position) -> String.valueOf(INTEGER.getInt(block, position));
+            }
+            if (type.equals(BIGINT)) {
+                return (block, position) -> String.valueOf(BIGINT.getLong(block, position));
+            }
+            if (type.equals(REAL)) {
+                return (block, position) -> String.valueOf(REAL.getFloat(block, position));
+            }
+            if (type.equals(DOUBLE)) {
+                return (block, position) -> String.valueOf(DOUBLE.getDouble(block, position));
             }
             if (type instanceof DecimalType decimalType) {
                 if (decimalType.isShort()) {
                     return (block, position) -> Decimals.toString(decimalType.getLong(block, position), decimalType.getScale());
                 }
                 return (block, position) -> Decimals.toString(
-                        ((Int128) type.getObject(block, position)).toBigInteger(),
+                        ((Int128) decimalType.getObject(block, position)).toBigInteger(),
                         decimalType.getScale());
             }
-            if (type instanceof VarcharType) {
-                return (block, position) -> type.getSlice(block, position).toStringUtf8();
+            if (type instanceof VarcharType varcharType) {
+                return (block, position) -> varcharType.getSlice(block, position).toStringUtf8();
             }
 
             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format("Unsupported type: %s", type));
@@ -372,7 +388,7 @@ public void writeJsonValue(JsonGenerator jsonGenerator, Block block, int positio
                 jsonGenerator.writeNull();
             }
             else {
-                float value = intBitsToFloat(toIntExact(REAL.getLong(block, position)));
+                float value = REAL.getFloat(block, position);
                 jsonGenerator.writeNumber(value);
             }
         }
@@ -533,7 +549,7 @@ public void writeJsonValue(JsonGenerator jsonGenerator, Block block, int positio
                 jsonGenerator.writeNull();
             }
             else {
-                int value = toIntExact(DATE.getLong(block, position));
+                int value = DATE.getInt(block, position);
                 jsonGenerator.writeString(printDate(value));
             }
         }
@@ -591,17 +607,22 @@ public void writeJsonValue(JsonGenerator jsonGenerator, Block block, int positio
                 jsonGenerator.writeNull();
             }
             else {
-                Block mapBlock = type.getObject(block, position);
+                SqlMap sqlMap = type.getObject(block, position);
+
+                int rawOffset = sqlMap.getRawOffset();
+                Block rawKeyBlock = sqlMap.getRawKeyBlock();
+                Block rawValueBlock = sqlMap.getRawValueBlock();
+
                 Map<String, Integer> orderedKeyToValuePosition = new TreeMap<>();
-                for (int i = 0; i < mapBlock.getPositionCount(); i += 2) {
-                    String objectKey = keyProvider.getObjectKey(mapBlock, i);
-                    orderedKeyToValuePosition.put(objectKey, i + 1);
+                for (int i = 0; i < sqlMap.getSize(); i++) {
+                    String objectKey = keyProvider.getObjectKey(rawKeyBlock, rawOffset + i);
+                    orderedKeyToValuePosition.put(objectKey, i);
                 }
 
                 jsonGenerator.writeStartObject();
                 for (Map.Entry<String, Integer> entry : orderedKeyToValuePosition.entrySet()) {
                     jsonGenerator.writeFieldName(entry.getKey());
-                    valueWriter.writeJsonValue(jsonGenerator, mapBlock, entry.getValue());
+                    valueWriter.writeJsonValue(jsonGenerator, rawValueBlock, rawOffset + entry.getValue());
                 }
                 jsonGenerator.writeEndObject();
             }
@@ -628,13 +649,14 @@ public void writeJsonValue(JsonGenerator jsonGenerator, Block block, int positio
                 jsonGenerator.writeNull();
             }
             else {
-                Block rowBlock = type.getObject(block, position);
+                SqlRow sqlRow = type.getObject(block, position);
+                int rawIndex = sqlRow.getRawIndex();
 
                 List<TypeSignatureParameter> typeSignatureParameters = type.getTypeSignature().getParameters();
                 jsonGenerator.writeStartObject();
-                for (int i = 0; i < rowBlock.getPositionCount(); i++) {
+                for (int i = 0; i < sqlRow.getFieldCount(); i++) {
                     jsonGenerator.writeFieldName(typeSignatureParameters.get(i).getNamedTypeSignature().getName().orElse(""));
-                    fieldWriters.get(i).writeJsonValue(jsonGenerator, rowBlock, i);
+                    fieldWriters.get(i).writeJsonValue(jsonGenerator, sqlRow.getRawFieldBlock(i), rawIndex);
                 }
                 jsonGenerator.writeEndObject();
             }
@@ -1161,11 +1183,11 @@ public void append(JsonParser parser, BlockBuilder blockBuilder)
             if (parser.getCurrentToken() != START_ARRAY) {
                 throw new JsonCastException(format("Expected a json array, but got %s", parser.getText()));
             }
-            BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-            while (parser.nextToken() != END_ARRAY) {
-                elementAppender.append(parser, entryBuilder);
-            }
-            blockBuilder.closeEntry();
+            ((ArrayBlockBuilder) blockBuilder).buildEntry(elementBuilder -> {
+                while (parser.nextToken() != END_ARRAY) {
+                    elementAppender.append(parser, elementBuilder);
+                }
+            });
         }
     }
 
@@ -1193,20 +1215,26 @@ public void append(JsonParser parser, BlockBuilder blockBuilder)
             if (parser.getCurrentToken() != START_OBJECT) {
                 throw new JsonCastException(format("Expected a json object, but got %s", parser.getText()));
             }
-            SingleMapBlockWriter entryBuilder = (SingleMapBlockWriter) blockBuilder.beginBlockEntry();
-            entryBuilder.strict();
-            while (parser.nextToken() != END_OBJECT) {
-                keyAppender.append(parser, entryBuilder);
-                parser.nextToken();
-                valueAppender.append(parser, entryBuilder);
-            }
+
+            MapBlockBuilder mapBlockBuilder = (MapBlockBuilder) blockBuilder;
+            mapBlockBuilder.strict();
             try {
-                blockBuilder.closeEntry();
+                mapBlockBuilder.buildEntry((keyBuilder, valueBuilder) -> appendMap(parser, keyBuilder, valueBuilder));
             }
             catch (DuplicateMapKeyException e) {
                 throw new JsonCastException("Duplicate keys are not allowed");
             }
         }
+
+        private void appendMap(JsonParser parser, BlockBuilder keyBuilder, BlockBuilder valueBuilder)
+                throws IOException
+        {
+            while (parser.nextToken() != END_OBJECT) {
+                keyAppender.append(parser, keyBuilder);
+                parser.nextToken();
+                valueAppender.append(parser, valueBuilder);
+            }
+        }
     }
 
     private static class RowBlockBuilderAppender
@@ -1234,12 +1262,7 @@ public void append(JsonParser parser, BlockBuilder blockBuilder)
                 throw new JsonCastException(format("Expected a json array or object, but got %s", parser.getText()));
             }
 
-            parseJsonToSingleRowBlock(
-                    parser,
-                    (SingleRowBlockWriter) blockBuilder.beginBlockEntry(),
-                    fieldAppenders,
-                    fieldNameToIndex);
-            blockBuilder.closeEntry();
+            ((RowBlockBuilder) blockBuilder).buildEntry(fieldBuilders -> parseJsonToSingleRowBlock(parser, fieldBuilders, fieldAppenders, fieldNameToIndex));
         }
     }
 
@@ -1259,9 +1282,9 @@ public static Optional<Map<String, Integer>> getFieldNameToIndex(List<Field> row
     // TODO: Once CAST function supports cachedInstanceFactory or directly write to BlockBuilder,
     // JsonToRowCast::toRow can use RowBlockBuilderAppender::append to parse JSON and append to the block builder.
     // Thus there will be single call to this method, so this method can be inlined.
-    public static void parseJsonToSingleRowBlock(
+    private static void parseJsonToSingleRowBlock(
             JsonParser parser,
-            SingleRowBlockWriter singleRowBlockWriter,
+            List<BlockBuilder> fieldBuilders,
             BlockBuilderAppender[] fieldAppenders,
             Optional<Map<String, Integer>> fieldNameToIndex)
             throws IOException
@@ -1269,7 +1292,7 @@ public static void parseJsonToSingleRowBlock(
         if (parser.getCurrentToken() == START_ARRAY) {
             for (int i = 0; i < fieldAppenders.length; i++) {
                 parser.nextToken();
-                fieldAppenders[i].append(parser, singleRowBlockWriter);
+                fieldAppenders[i].append(parser, fieldBuilders.get(i));
             }
             if (parser.nextToken() != JsonToken.END_ARRAY) {
                 throw new JsonCastException(format("Expected json array ending, but got %s", parser.getText()));
@@ -1296,7 +1319,7 @@ public static void parseJsonToSingleRowBlock(
                     }
                     fieldWritten[fieldIndex] = true;
                     numFieldsWritten++;
-                    fieldAppenders[fieldIndex].append(parser, singleRowBlockWriter.getFieldBlockBuilder(fieldIndex));
+                    fieldAppenders[fieldIndex].append(parser, fieldBuilders.get(fieldIndex));
                 }
                 else {
                     parser.skipChildren();
@@ -1306,7 +1329,7 @@ public static void parseJsonToSingleRowBlock(
             if (numFieldsWritten != fieldAppenders.length) {
                 for (int i = 0; i < fieldWritten.length; i++) {
                     if (!fieldWritten[i]) {
-                        singleRowBlockWriter.getFieldBlockBuilder(i).appendNull();
+                        fieldBuilders.get(i).appendNull();
                     }
                 }
             }
diff --git a/core/trino-main/src/main/java/io/trino/util/MoreMaps.java b/core/trino-main/src/main/java/io/trino/util/MoreMaps.java
index 420994baa450..081959ae3e92 100644
--- a/core/trino-main/src/main/java/io/trino/util/MoreMaps.java
+++ b/core/trino-main/src/main/java/io/trino/util/MoreMaps.java
@@ -21,7 +21,6 @@
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toMap;
-import static org.testng.Assert.fail;
 
 public final class MoreMaps
 {
@@ -45,12 +44,12 @@ public static <K, V> Map<K, V> mergeMaps(Stream<Map<K, V>> mapStream, BinaryOper
     public static <K, V> Map<K, V> asMap(List<K> keyList, List<V> valueList)
     {
         if (keyList.size() != valueList.size()) {
-            fail("keyList should have same size with valueList");
+            throw new AssertionError("keyList should have same size with valueList");
         }
         Map<K, V> map = new HashMap<>();
         for (int i = 0; i < keyList.size(); i++) {
             if (map.put(keyList.get(i), valueList.get(i)) != null) {
-                fail("keyList should have same size with valueList");
+                throw new AssertionError("keyList should have same size with valueList");
             }
         }
         return map;
diff --git a/core/trino-main/src/main/java/io/trino/util/MoreMath.java b/core/trino-main/src/main/java/io/trino/util/MoreMath.java
index 402e0056108d..e2e3042815b9 100644
--- a/core/trino-main/src/main/java/io/trino/util/MoreMath.java
+++ b/core/trino-main/src/main/java/io/trino/util/MoreMath.java
@@ -140,4 +140,9 @@ public static double maxExcludeNaN(double v1, double v2)
         }
         return max(v1, v2);
     }
+
+    public static int previousPowerOfTwo(int x)
+    {
+        return Math.max(1, 1 << 31 - Integer.numberOfLeadingZeros(x));
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/util/PowerOfTwo.java b/core/trino-main/src/main/java/io/trino/util/PowerOfTwo.java
index 738ac173164d..b2f81d233f26 100644
--- a/core/trino-main/src/main/java/io/trino/util/PowerOfTwo.java
+++ b/core/trino-main/src/main/java/io/trino/util/PowerOfTwo.java
@@ -13,8 +13,8 @@
  */
 package io.trino.util;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
diff --git a/core/trino-main/src/main/java/io/trino/util/PowerOfTwoValidator.java b/core/trino-main/src/main/java/io/trino/util/PowerOfTwoValidator.java
index 0db5bc65ce26..44559702dade 100644
--- a/core/trino-main/src/main/java/io/trino/util/PowerOfTwoValidator.java
+++ b/core/trino-main/src/main/java/io/trino/util/PowerOfTwoValidator.java
@@ -13,8 +13,8 @@
  */
 package io.trino.util;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 public class PowerOfTwoValidator
         implements ConstraintValidator<PowerOfTwo, Integer>
diff --git a/core/trino-main/src/main/java/io/trino/util/SpatialJoinUtils.java b/core/trino-main/src/main/java/io/trino/util/SpatialJoinUtils.java
index 3e748dfc8e5d..6ba38f3619fe 100644
--- a/core/trino-main/src/main/java/io/trino/util/SpatialJoinUtils.java
+++ b/core/trino-main/src/main/java/io/trino/util/SpatialJoinUtils.java
@@ -13,6 +13,7 @@
  */
 package io.trino.util;
 
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FunctionCall;
@@ -20,6 +21,7 @@
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.metadata.ResolvedFunction.extractFunctionName;
 import static io.trino.sql.ExpressionUtils.extractConjuncts;
 
@@ -51,10 +53,10 @@ public static List<FunctionCall> extractSupportedSpatialFunctions(Expression fil
 
     private static boolean isSupportedSpatialFunction(FunctionCall functionCall)
     {
-        String functionName = extractFunctionName(functionCall.getName());
-        return functionName.equalsIgnoreCase(ST_CONTAINS) ||
-                functionName.equalsIgnoreCase(ST_WITHIN) ||
-                functionName.equalsIgnoreCase(ST_INTERSECTS);
+        CatalogSchemaFunctionName functionName = extractFunctionName(functionCall.getName());
+        return functionName.equals(builtinFunctionName(ST_CONTAINS)) ||
+                functionName.equals(builtinFunctionName(ST_WITHIN)) ||
+                functionName.equals(builtinFunctionName(ST_INTERSECTS));
     }
 
     /**
@@ -93,7 +95,7 @@ private static boolean isSupportedSpatialComparison(ComparisonExpression express
     private static boolean isSTDistance(Expression expression)
     {
         if (expression instanceof FunctionCall) {
-            return extractFunctionName(((FunctionCall) expression).getName()).equalsIgnoreCase(ST_DISTANCE);
+            return extractFunctionName(((FunctionCall) expression).getName()).equals(builtinFunctionName(ST_DISTANCE));
         }
 
         return false;
diff --git a/core/trino-main/src/main/java/io/trino/util/StatementUtils.java b/core/trino-main/src/main/java/io/trino/util/StatementUtils.java
index 8f01a60fe12b..cf68c4ab700b 100644
--- a/core/trino-main/src/main/java/io/trino/util/StatementUtils.java
+++ b/core/trino-main/src/main/java/io/trino/util/StatementUtils.java
@@ -20,6 +20,7 @@
 import io.trino.execution.CommentTask;
 import io.trino.execution.CommitTask;
 import io.trino.execution.CreateCatalogTask;
+import io.trino.execution.CreateFunctionTask;
 import io.trino.execution.CreateMaterializedViewTask;
 import io.trino.execution.CreateRoleTask;
 import io.trino.execution.CreateSchemaTask;
@@ -30,6 +31,7 @@
 import io.trino.execution.DenyTask;
 import io.trino.execution.DropCatalogTask;
 import io.trino.execution.DropColumnTask;
+import io.trino.execution.DropFunctionTask;
 import io.trino.execution.DropMaterializedViewTask;
 import io.trino.execution.DropRoleTask;
 import io.trino.execution.DropSchemaTask;
@@ -43,6 +45,7 @@
 import io.trino.execution.RenameSchemaTask;
 import io.trino.execution.RenameTableTask;
 import io.trino.execution.RenameViewTask;
+import io.trino.execution.ResetSessionAuthorizationTask;
 import io.trino.execution.ResetSessionTask;
 import io.trino.execution.RevokeRolesTask;
 import io.trino.execution.RevokeTask;
@@ -52,6 +55,7 @@
 import io.trino.execution.SetPropertiesTask;
 import io.trino.execution.SetRoleTask;
 import io.trino.execution.SetSchemaAuthorizationTask;
+import io.trino.execution.SetSessionAuthorizationTask;
 import io.trino.execution.SetSessionTask;
 import io.trino.execution.SetTableAuthorizationTask;
 import io.trino.execution.SetTimeZoneTask;
@@ -66,6 +70,7 @@
 import io.trino.sql.tree.Comment;
 import io.trino.sql.tree.Commit;
 import io.trino.sql.tree.CreateCatalog;
+import io.trino.sql.tree.CreateFunction;
 import io.trino.sql.tree.CreateMaterializedView;
 import io.trino.sql.tree.CreateRole;
 import io.trino.sql.tree.CreateSchema;
@@ -79,6 +84,7 @@
 import io.trino.sql.tree.DescribeOutput;
 import io.trino.sql.tree.DropCatalog;
 import io.trino.sql.tree.DropColumn;
+import io.trino.sql.tree.DropFunction;
 import io.trino.sql.tree.DropMaterializedView;
 import io.trino.sql.tree.DropRole;
 import io.trino.sql.tree.DropSchema;
@@ -99,6 +105,7 @@
 import io.trino.sql.tree.RenameTable;
 import io.trino.sql.tree.RenameView;
 import io.trino.sql.tree.ResetSession;
+import io.trino.sql.tree.ResetSessionAuthorization;
 import io.trino.sql.tree.Revoke;
 import io.trino.sql.tree.RevokeRoles;
 import io.trino.sql.tree.Rollback;
@@ -108,6 +115,7 @@
 import io.trino.sql.tree.SetRole;
 import io.trino.sql.tree.SetSchemaAuthorization;
 import io.trino.sql.tree.SetSession;
+import io.trino.sql.tree.SetSessionAuthorization;
 import io.trino.sql.tree.SetTableAuthorization;
 import io.trino.sql.tree.SetTimeZone;
 import io.trino.sql.tree.SetViewAuthorization;
@@ -193,6 +201,7 @@ private StatementUtils() {}
             .add(dataDefinitionStatement(Commit.class, CommitTask.class))
             .add(dataDefinitionStatement(CreateMaterializedView.class, CreateMaterializedViewTask.class))
             .add(dataDefinitionStatement(CreateCatalog.class, CreateCatalogTask.class))
+            .add(dataDefinitionStatement(CreateFunction.class, CreateFunctionTask.class))
             .add(dataDefinitionStatement(CreateRole.class, CreateRoleTask.class))
             .add(dataDefinitionStatement(CreateSchema.class, CreateSchemaTask.class))
             .add(dataDefinitionStatement(CreateTable.class, CreateTableTask.class))
@@ -201,6 +210,7 @@ private StatementUtils() {}
             .add(dataDefinitionStatement(Deny.class, DenyTask.class))
             .add(dataDefinitionStatement(DropCatalog.class, DropCatalogTask.class))
             .add(dataDefinitionStatement(DropColumn.class, DropColumnTask.class))
+            .add(dataDefinitionStatement(DropFunction.class, DropFunctionTask.class))
             .add(dataDefinitionStatement(DropMaterializedView.class, DropMaterializedViewTask.class))
             .add(dataDefinitionStatement(DropRole.class, DropRoleTask.class))
             .add(dataDefinitionStatement(DropSchema.class, DropSchemaTask.class))
@@ -216,6 +226,7 @@ private StatementUtils() {}
             .add(dataDefinitionStatement(RenameTable.class, RenameTableTask.class))
             .add(dataDefinitionStatement(RenameView.class, RenameViewTask.class))
             .add(dataDefinitionStatement(ResetSession.class, ResetSessionTask.class))
+            .add(dataDefinitionStatement(ResetSessionAuthorization.class, ResetSessionAuthorizationTask.class))
             .add(dataDefinitionStatement(Revoke.class, RevokeTask.class))
             .add(dataDefinitionStatement(RevokeRoles.class, RevokeRolesTask.class))
             .add(dataDefinitionStatement(Rollback.class, RollbackTask.class))
@@ -224,6 +235,7 @@ private StatementUtils() {}
             .add(dataDefinitionStatement(SetRole.class, SetRoleTask.class))
             .add(dataDefinitionStatement(SetSchemaAuthorization.class, SetSchemaAuthorizationTask.class))
             .add(dataDefinitionStatement(SetSession.class, SetSessionTask.class))
+            .add(dataDefinitionStatement(SetSessionAuthorization.class, SetSessionAuthorizationTask.class))
             .add(dataDefinitionStatement(SetProperties.class, SetPropertiesTask.class))
             .add(dataDefinitionStatement(SetTableAuthorization.class, SetTableAuthorizationTask.class))
             .add(dataDefinitionStatement(SetTimeZone.class, SetTimeZoneTask.class))
diff --git a/core/trino-main/src/main/java/io/trino/version/EmbedVersion.java b/core/trino-main/src/main/java/io/trino/version/EmbedVersion.java
index ea7e02aec00f..07402220f6b3 100644
--- a/core/trino-main/src/main/java/io/trino/version/EmbedVersion.java
+++ b/core/trino-main/src/main/java/io/trino/version/EmbedVersion.java
@@ -14,6 +14,7 @@
 package io.trino.version;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.airlift.bytecode.ClassDefinition;
 import io.airlift.bytecode.FieldDefinition;
 import io.airlift.bytecode.MethodDefinition;
@@ -21,8 +22,6 @@
 import io.trino.client.NodeVersion;
 import io.trino.spi.VersionEmbedder;
 
-import javax.inject.Inject;
-
 import java.lang.invoke.MethodHandle;
 import java.util.concurrent.Callable;
 
diff --git a/core/trino-main/src/main/resources/webapp/dist/query.js b/core/trino-main/src/main/resources/webapp/dist/query.js
index ef3493edff7c..b58c3dd5e30e 100644
--- a/core/trino-main/src/main/resources/webapp/dist/query.js
+++ b/core/trino-main/src/main/resources/webapp/dist/query.js
@@ -27,7 +27,7 @@ eval("\n\nObject.defineProperty(exports, \"__esModule\", ({\n    value: true\n})
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
-eval("\n\nObject.defineProperty(exports, \"__esModule\", ({\n    value: true\n}));\nexports.QueryDetail = undefined;\n\nvar _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();\n\nvar _react = __webpack_require__(/*! react */ \"./node_modules/react/index.js\");\n\nvar _react2 = _interopRequireDefault(_react);\n\nvar _reactable = __webpack_require__(/*! reactable */ \"./node_modules/reactable/lib/reactable.js\");\n\nvar _reactable2 = _interopRequireDefault(_reactable);\n\nvar _utils = __webpack_require__(/*! ../utils */ \"./utils.js\");\n\nvar _QueryHeader = __webpack_require__(/*! ./QueryHeader */ \"./components/QueryHeader.jsx\");\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return call && (typeof call === \"object\" || typeof call === \"function\") ? call : self; }\n\nfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function, not \" + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } /*\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * Licensed under the Apache License, Version 2.0 (the \"License\");\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * you may not use this file except in compliance with the License.\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * You may obtain a copy of the License at\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                *\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                *     http://www.apache.org/licenses/LICENSE-2.0\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                *\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * Unless required by applicable law or agreed to in writing, software\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * distributed under the License is distributed on an \"AS IS\" BASIS,\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * See the License for the specific language governing permissions and\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * limitations under the License.\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                */\n\nvar Table = _reactable2.default.Table,\n    Thead = _reactable2.default.Thead,\n    Th = _reactable2.default.Th,\n    Tr = _reactable2.default.Tr,\n    Td = _reactable2.default.Td;\n\nvar TaskList = function (_React$Component) {\n    _inherits(TaskList, _React$Component);\n\n    function TaskList() {\n        _classCallCheck(this, TaskList);\n\n        return _possibleConstructorReturn(this, (TaskList.__proto__ || Object.getPrototypeOf(TaskList)).apply(this, arguments));\n    }\n\n    _createClass(TaskList, [{\n        key: \"render\",\n        value: function render() {\n            var tasks = this.props.tasks;\n            var taskRetriesEnabled = this.props.taskRetriesEnabled;\n\n            if (tasks === undefined || tasks.length === 0) {\n                return _react2.default.createElement(\n                    \"div\",\n                    { className: \"row error-message\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(\n                            \"h4\",\n                            null,\n                            \"No threads in the selected group\"\n                        )\n                    )\n                );\n            }\n\n            var showPortNumbers = TaskList.showPortNumbers(tasks);\n\n            var renderedTasks = tasks.map(function (task) {\n                var elapsedTime = (0, _utils.parseDuration)(task.stats.elapsedTime);\n                if (elapsedTime === 0) {\n                    elapsedTime = Date.now() - Date.parse(task.stats.createTime);\n                }\n\n                return _react2.default.createElement(\n                    Tr,\n                    { key: task.taskStatus.taskId },\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"id\", value: task.taskStatus.taskId },\n                        _react2.default.createElement(\n                            \"a\",\n                            { href: \"/ui/api/worker/\" + task.taskStatus.nodeId + \"/task/\" + task.taskStatus.taskId + \"?pretty\" },\n                            (0, _utils.getTaskIdSuffix)(task.taskStatus.taskId)\n                        )\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"host\", value: (0, _utils.getHostname)(task.taskStatus.self) },\n                        _react2.default.createElement(\n                            \"a\",\n                            { href: \"worker.html?\" + task.taskStatus.nodeId, className: \"font-light\", target: \"_blank\" },\n                            showPortNumbers ? (0, _utils.getHostAndPort)(task.taskStatus.self) : (0, _utils.getHostname)(task.taskStatus.self)\n                        )\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"state\", value: TaskList.formatState(task.taskStatus.state, task.stats.fullyBlocked) },\n                        TaskList.formatState(task.taskStatus.state, task.stats.fullyBlocked)\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"rows\", value: task.stats.rawInputPositions },\n                        (0, _utils.formatCount)(task.stats.rawInputPositions)\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"rowsSec\", value: (0, _utils.computeRate)(task.stats.rawInputPositions, elapsedTime) },\n                        (0, _utils.formatCount)((0, _utils.computeRate)(task.stats.rawInputPositions, elapsedTime))\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"bytes\", value: (0, _utils.parseDataSize)(task.stats.rawInputDataSize) },\n                        (0, _utils.formatDataSizeBytes)((0, _utils.parseDataSize)(task.stats.rawInputDataSize))\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"bytesSec\", value: (0, _utils.computeRate)((0, _utils.parseDataSize)(task.stats.rawInputDataSize), elapsedTime) },\n                        (0, _utils.formatDataSizeBytes)((0, _utils.computeRate)((0, _utils.parseDataSize)(task.stats.rawInputDataSize), elapsedTime))\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"splitsPending\", value: task.stats.queuedDrivers },\n                        task.stats.queuedDrivers\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"splitsRunning\", value: task.stats.runningDrivers },\n                        task.stats.runningDrivers\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"splitsBlocked\", value: task.stats.blockedDrivers },\n                        task.stats.blockedDrivers\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"splitsDone\", value: task.stats.completedDrivers },\n                        task.stats.completedDrivers\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"elapsedTime\", value: (0, _utils.parseDuration)(task.stats.elapsedTime) },\n                        task.stats.elapsedTime\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"cpuTime\", value: (0, _utils.parseDuration)(task.stats.totalCpuTime) },\n                        task.stats.totalCpuTime\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"bufferedBytes\", value: task.outputBuffers.totalBufferedBytes },\n                        (0, _utils.formatDataSizeBytes)(task.outputBuffers.totalBufferedBytes)\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"memory\", value: (0, _utils.parseDataSize)(task.stats.userMemoryReservation) },\n                        (0, _utils.parseAndFormatDataSize)(task.stats.userMemoryReservation)\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"peakMemory\", value: (0, _utils.parseDataSize)(task.stats.peakUserMemoryReservation) },\n                        (0, _utils.parseAndFormatDataSize)(task.stats.peakUserMemoryReservation)\n                    ),\n                    taskRetriesEnabled && _react2.default.createElement(\n                        Td,\n                        { column: \"estimatedMemory\", value: (0, _utils.parseDataSize)(task.estimatedMemory) },\n                        (0, _utils.parseAndFormatDataSize)(task.estimatedMemory)\n                    )\n                );\n            });\n\n            return _react2.default.createElement(\n                Table,\n                { id: \"tasks\", className: \"table table-striped sortable\", sortable: [{\n                        column: 'id',\n                        sortFunction: TaskList.compareTaskId\n                    }, 'host', 'state', 'splitsPending', 'splitsRunning', 'splitsBlocked', 'splitsDone', 'rows', 'rowsSec', 'bytes', 'bytesSec', 'elapsedTime', 'cpuTime', 'bufferedBytes', 'memory', 'peakMemory', 'estimatedMemory'],\n                    defaultSort: { column: 'id', direction: 'asc' } },\n                _react2.default.createElement(\n                    Thead,\n                    null,\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"id\" },\n                        \"ID\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"host\" },\n                        \"Host\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"state\" },\n                        \"State\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"splitsPending\" },\n                        _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-pause\", style: _utils.GLYPHICON_HIGHLIGHT, \"data-toggle\": \"tooltip\", \"data-placement\": \"top\",\n                            title: \"Pending splits\" })\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"splitsRunning\" },\n                        _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-play\", style: _utils.GLYPHICON_HIGHLIGHT, \"data-toggle\": \"tooltip\", \"data-placement\": \"top\",\n                            title: \"Running splits\" })\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"splitsBlocked\" },\n                        _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-bookmark\", style: _utils.GLYPHICON_HIGHLIGHT, \"data-toggle\": \"tooltip\", \"data-placement\": \"top\",\n                            title: \"Blocked splits\" })\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"splitsDone\" },\n                        _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-ok\", style: _utils.GLYPHICON_HIGHLIGHT, \"data-toggle\": \"tooltip\", \"data-placement\": \"top\",\n                            title: \"Completed splits\" })\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"rows\" },\n                        \"Rows\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"rowsSec\" },\n                        \"Rows/s\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"bytes\" },\n                        \"Bytes\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"bytesSec\" },\n                        \"Bytes/s\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"elapsedTime\" },\n                        \"Elapsed\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"cpuTime\" },\n                        \"CPU Time\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"memory\" },\n                        \"Mem\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"peakMemory\" },\n                        \"Peak Mem\"\n                    ),\n                    taskRetriesEnabled && _react2.default.createElement(\n                        Th,\n                        { column: \"estimatedMemory\" },\n                        \"Est Mem\"\n                    )\n                ),\n                renderedTasks\n            );\n        }\n    }], [{\n        key: \"removeQueryId\",\n        value: function removeQueryId(id) {\n            var pos = id.indexOf('.');\n            if (pos !== -1) {\n                return id.substring(pos + 1);\n            }\n            return id;\n        }\n    }, {\n        key: \"compareTaskId\",\n        value: function compareTaskId(taskA, taskB) {\n            var taskIdArrA = TaskList.removeQueryId(taskA).split(\".\");\n            var taskIdArrB = TaskList.removeQueryId(taskB).split(\".\");\n\n            if (taskIdArrA.length > taskIdArrB.length) {\n                return 1;\n            }\n            for (var i = 0; i < taskIdArrA.length; i++) {\n                var anum = Number.parseInt(taskIdArrA[i]);\n                var bnum = Number.parseInt(taskIdArrB[i]);\n                if (anum !== bnum) {\n                    return anum > bnum ? 1 : -1;\n                }\n            }\n\n            return 0;\n        }\n    }, {\n        key: \"showPortNumbers\",\n        value: function showPortNumbers(tasks) {\n            // check if any host has multiple port numbers\n            var hostToPortNumber = {};\n            for (var i = 0; i < tasks.length; i++) {\n                var taskUri = tasks[i].taskStatus.self;\n                var hostname = (0, _utils.getHostname)(taskUri);\n                var port = (0, _utils.getPort)(taskUri);\n                if (hostname in hostToPortNumber && hostToPortNumber[hostname] !== port) {\n                    return true;\n                }\n                hostToPortNumber[hostname] = port;\n            }\n\n            return false;\n        }\n    }, {\n        key: \"formatState\",\n        value: function formatState(state, fullyBlocked) {\n            if (fullyBlocked && state === \"RUNNING\") {\n                return \"BLOCKED\";\n            } else {\n                return state;\n            }\n        }\n    }]);\n\n    return TaskList;\n}(_react2.default.Component);\n\nvar BAR_CHART_WIDTH = 800;\n\nvar BAR_CHART_PROPERTIES = {\n    type: 'bar',\n    barSpacing: '0',\n    height: '80px',\n    barColor: '#747F96',\n    zeroColor: '#8997B3',\n    chartRangeMin: 0,\n    tooltipClassname: 'sparkline-tooltip',\n    tooltipFormat: 'Task {{offset:offset}} - {{value}}',\n    disableHiddenCheck: true\n};\n\nvar HISTOGRAM_WIDTH = 175;\n\nvar HISTOGRAM_PROPERTIES = {\n    type: 'bar',\n    barSpacing: '0',\n    height: '80px',\n    barColor: '#747F96',\n    zeroColor: '#747F96',\n    zeroAxis: true,\n    chartRangeMin: 0,\n    tooltipClassname: 'sparkline-tooltip',\n    tooltipFormat: '{{offset:offset}} -- {{value}} tasks',\n    disableHiddenCheck: true\n};\n\nvar StageSummary = function (_React$Component2) {\n    _inherits(StageSummary, _React$Component2);\n\n    function StageSummary(props) {\n        _classCallCheck(this, StageSummary);\n\n        var _this2 = _possibleConstructorReturn(this, (StageSummary.__proto__ || Object.getPrototypeOf(StageSummary)).call(this, props));\n\n        _this2.state = {\n            expanded: false,\n            lastRender: null,\n            taskFilter: TASK_FILTER.ALL\n        };\n        return _this2;\n    }\n\n    _createClass(StageSummary, [{\n        key: \"getExpandedIcon\",\n        value: function getExpandedIcon() {\n            return this.state.expanded ? \"glyphicon-chevron-up\" : \"glyphicon-chevron-down\";\n        }\n    }, {\n        key: \"getExpandedStyle\",\n        value: function getExpandedStyle() {\n            return this.state.expanded ? {} : { display: \"none\" };\n        }\n    }, {\n        key: \"toggleExpanded\",\n        value: function toggleExpanded() {\n            this.setState({\n                expanded: !this.state.expanded\n            });\n        }\n    }, {\n        key: \"componentDidUpdate\",\n        value: function componentDidUpdate() {\n            var stage = this.props.stage;\n            var numTasks = stage.tasks.length;\n\n            // sort the x-axis\n            stage.tasks.sort(function (taskA, taskB) {\n                return (0, _utils.getTaskNumber)(taskA.taskStatus.taskId) - (0, _utils.getTaskNumber)(taskB.taskStatus.taskId);\n            });\n\n            var scheduledTimes = stage.tasks.map(function (task) {\n                return (0, _utils.parseDuration)(task.stats.totalScheduledTime);\n            });\n            var cpuTimes = stage.tasks.map(function (task) {\n                return (0, _utils.parseDuration)(task.stats.totalCpuTime);\n            });\n\n            // prevent multiple calls to componentDidUpdate (resulting from calls to setState or otherwise) within the refresh interval from re-rendering sparklines/charts\n            if (this.state.lastRender === null || Date.now() - this.state.lastRender >= 1000) {\n                var renderTimestamp = Date.now();\n                var stageId = (0, _utils.getStageNumber)(stage.stageId);\n\n                StageSummary.renderHistogram('#scheduled-time-histogram-' + stageId, scheduledTimes, _utils.formatDuration);\n                StageSummary.renderHistogram('#cpu-time-histogram-' + stageId, cpuTimes, _utils.formatDuration);\n\n                if (this.state.expanded) {\n                    // this needs to be a string otherwise it will also be passed to numberFormatter\n                    var tooltipValueLookups = { 'offset': {} };\n                    for (var i = 0; i < numTasks; i++) {\n                        tooltipValueLookups['offset'][i] = (0, _utils.getStageNumber)(stage.stageId) + \".\" + i;\n                    }\n\n                    var stageBarChartProperties = $.extend({}, BAR_CHART_PROPERTIES, { barWidth: BAR_CHART_WIDTH / numTasks, tooltipValueLookups: tooltipValueLookups });\n\n                    $('#scheduled-time-bar-chart-' + stageId).sparkline(scheduledTimes, $.extend({}, stageBarChartProperties, { numberFormatter: _utils.formatDuration }));\n                    $('#cpu-time-bar-chart-' + stageId).sparkline(cpuTimes, $.extend({}, stageBarChartProperties, { numberFormatter: _utils.formatDuration }));\n                }\n\n                this.setState({\n                    lastRender: renderTimestamp\n                });\n            }\n        }\n    }, {\n        key: \"renderTaskList\",\n        value: function renderTaskList(taskRetriesEnabled) {\n            var _this3 = this;\n\n            var tasks = this.state.expanded ? this.props.stage.tasks : [];\n            tasks = tasks.filter(function (task) {\n                return _this3.state.taskFilter(task.taskStatus.state);\n            }, this);\n            return _react2.default.createElement(TaskList, { tasks: tasks, taskRetriesEnabled: taskRetriesEnabled });\n        }\n    }, {\n        key: \"handleTaskFilterClick\",\n        value: function handleTaskFilterClick(filter, event) {\n            this.setState({\n                taskFilter: filter\n            });\n            event.preventDefault();\n        }\n    }, {\n        key: \"renderTaskFilterListItem\",\n        value: function renderTaskFilterListItem(taskFilter, taskFilterText) {\n            return _react2.default.createElement(\n                \"li\",\n                null,\n                _react2.default.createElement(\n                    \"a\",\n                    { href: \"#\", className: this.state.taskFilter === taskFilter ? \"selected\" : \"\", onClick: this.handleTaskFilterClick.bind(this, taskFilter) },\n                    taskFilterText\n                )\n            );\n        }\n    }, {\n        key: \"renderTaskFilter\",\n        value: function renderTaskFilter() {\n            return _react2.default.createElement(\n                \"div\",\n                { className: \"row\" },\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"col-xs-6\" },\n                    _react2.default.createElement(\n                        \"h3\",\n                        null,\n                        \"Tasks\"\n                    )\n                ),\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"col-xs-6\" },\n                    _react2.default.createElement(\n                        \"table\",\n                        { className: \"header-inline-links\" },\n                        _react2.default.createElement(\n                            \"tbody\",\n                            null,\n                            _react2.default.createElement(\n                                \"tr\",\n                                null,\n                                _react2.default.createElement(\n                                    \"td\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"div\",\n                                        { className: \"input-group-btn text-right\" },\n                                        _react2.default.createElement(\n                                            \"button\",\n                                            { type: \"button\", className: \"btn btn-default dropdown-toggle pull-right text-right\", \"data-toggle\": \"dropdown\", \"aria-haspopup\": \"true\",\n                                                \"aria-expanded\": \"false\" },\n                                            \"Show \",\n                                            _react2.default.createElement(\"span\", { className: \"caret\" })\n                                        ),\n                                        _react2.default.createElement(\n                                            \"ul\",\n                                            { className: \"dropdown-menu\" },\n                                            this.renderTaskFilterListItem(TASK_FILTER.ALL, \"All\"),\n                                            this.renderTaskFilterListItem(TASK_FILTER.PLANNED, \"Planned\"),\n                                            this.renderTaskFilterListItem(TASK_FILTER.RUNNING, \"Running\"),\n                                            this.renderTaskFilterListItem(TASK_FILTER.FINISHED, \"Finished\"),\n                                            this.renderTaskFilterListItem(TASK_FILTER.FAILED, \"Aborted/Canceled/Failed\")\n                                        )\n                                    )\n                                )\n                            )\n                        )\n                    )\n                )\n            );\n        }\n    }, {\n        key: \"render\",\n        value: function render() {\n            var stage = this.props.stage;\n            var taskRetriesEnabled = this.props.taskRetriesEnabled;\n\n            if (stage === undefined || !stage.hasOwnProperty('plan')) {\n                return _react2.default.createElement(\n                    \"tr\",\n                    null,\n                    _react2.default.createElement(\n                        \"td\",\n                        null,\n                        \"Information about this stage is unavailable.\"\n                    )\n                );\n            }\n\n            var totalBufferedBytes = stage.tasks.map(function (task) {\n                return task.outputBuffers.totalBufferedBytes;\n            }).reduce(function (a, b) {\n                return a + b;\n            }, 0);\n\n            var stageId = (0, _utils.getStageNumber)(stage.stageId);\n\n            return _react2.default.createElement(\n                \"tr\",\n                null,\n                _react2.default.createElement(\n                    \"td\",\n                    { className: \"stage-id\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"stage-state-color\", style: { borderLeftColor: (0, _utils.getStageStateColor)(stage) } },\n                        stageId\n                    )\n                ),\n                _react2.default.createElement(\n                    \"td\",\n                    null,\n                    _react2.default.createElement(\n                        \"table\",\n                        { className: \"table single-stage-table\" },\n                        _react2.default.createElement(\n                            \"tbody\",\n                            null,\n                            _react2.default.createElement(\n                                \"tr\",\n                                null,\n                                _react2.default.createElement(\n                                    \"td\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"stage-table stage-table-time\" },\n                                        _react2.default.createElement(\n                                            \"thead\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"th\",\n                                                    { className: \"stage-table-stat-title stage-table-stat-header\" },\n                                                    \"Time\"\n                                                ),\n                                                _react2.default.createElement(\"th\", null)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Scheduled\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.stageStats.totalScheduledTime\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Blocked\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.stageStats.totalBlockedTime\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"CPU\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.stageStats.totalCpuTime\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Failed\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.stageStats.failedScheduledTime\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"CPU Failed\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.stageStats.failedCpuTime\n                                                )\n                                            )\n                                        )\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"td\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"stage-table stage-table-memory\" },\n                                        _react2.default.createElement(\n                                            \"thead\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"th\",\n                                                    { className: \"stage-table-stat-title stage-table-stat-header\" },\n                                                    \"Memory\"\n                                                ),\n                                                _react2.default.createElement(\"th\", null)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Cumulative\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    (0, _utils.formatDataSizeBytes)(stage.stageStats.cumulativeUserMemory / 1000)\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Current\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    (0, _utils.parseAndFormatDataSize)(stage.stageStats.userMemoryReservation)\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Buffers\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    (0, _utils.formatDataSize)(totalBufferedBytes)\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Peak\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    (0, _utils.parseAndFormatDataSize)(stage.stageStats.peakUserMemoryReservation)\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Failed\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    (0, _utils.formatDataSizeBytes)(stage.stageStats.failedCumulativeUserMemory / 1000)\n                                                )\n                                            )\n                                        )\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"td\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"stage-table stage-table-tasks\" },\n                                        _react2.default.createElement(\n                                            \"thead\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"th\",\n                                                    { className: \"stage-table-stat-title stage-table-stat-header\" },\n                                                    \"Tasks\"\n                                                ),\n                                                _react2.default.createElement(\"th\", null)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Pending\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.tasks.filter(function (task) {\n                                                        return task.taskStatus.state === \"PLANNED\";\n                                                    }).length\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Running\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.tasks.filter(function (task) {\n                                                        return task.taskStatus.state === \"RUNNING\";\n                                                    }).length\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Blocked\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.tasks.filter(function (task) {\n                                                        return task.stats.fullyBlocked;\n                                                    }).length\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Failed\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.tasks.filter(function (task) {\n                                                        return task.taskStatus.state === \"FAILED\";\n                                                    }).length\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Total\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.tasks.length\n                                                )\n                                            )\n                                        )\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"td\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"stage-table histogram-table\" },\n                                        _react2.default.createElement(\n                                            \"thead\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"th\",\n                                                    { className: \"stage-table-stat-title stage-table-chart-header\" },\n                                                    \"Scheduled Time Skew\"\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"histogram-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"histogram\", id: \"scheduled-time-histogram-\" + stageId },\n                                                        _react2.default.createElement(\"div\", { className: \"loader\" })\n                                                    )\n                                                )\n                                            )\n                                        )\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"td\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"stage-table histogram-table\" },\n                                        _react2.default.createElement(\n                                            \"thead\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"th\",\n                                                    { className: \"stage-table-stat-title stage-table-chart-header\" },\n                                                    \"CPU Time Skew\"\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"histogram-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"histogram\", id: \"cpu-time-histogram-\" + stageId },\n                                                        _react2.default.createElement(\"div\", { className: \"loader\" })\n                                                    )\n                                                )\n                                            )\n                                        )\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"td\",\n                                    { className: \"expand-charts-container\" },\n                                    _react2.default.createElement(\n                                        \"a\",\n                                        { onClick: this.toggleExpanded.bind(this), className: \"expand-charts-button\" },\n                                        _react2.default.createElement(\"span\", { className: \"glyphicon \" + this.getExpandedIcon(), style: _utils.GLYPHICON_HIGHLIGHT, \"data-toggle\": \"tooltip\", \"data-placement\": \"top\", title: \"More\" })\n                                    )\n                                )\n                            ),\n                            _react2.default.createElement(\n                                \"tr\",\n                                { style: this.getExpandedStyle() },\n                                _react2.default.createElement(\n                                    \"td\",\n                                    { colSpan: \"6\" },\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"expanded-chart\" },\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title expanded-chart-title\" },\n                                                    \"Task Scheduled Time\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"bar-chart-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"bar-chart\", id: \"scheduled-time-bar-chart-\" + stageId },\n                                                        _react2.default.createElement(\"div\", { className: \"loader\" })\n                                                    )\n                                                )\n                                            )\n                                        )\n                                    )\n                                )\n                            ),\n                            _react2.default.createElement(\n                                \"tr\",\n                                { style: this.getExpandedStyle() },\n                                _react2.default.createElement(\n                                    \"td\",\n                                    { colSpan: \"6\" },\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"expanded-chart\" },\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title expanded-chart-title\" },\n                                                    \"Task CPU Time\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"bar-chart-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"bar-chart\", id: \"cpu-time-bar-chart-\" + stageId },\n                                                        _react2.default.createElement(\"div\", { className: \"loader\" })\n                                                    )\n                                                )\n                                            )\n                                        )\n                                    )\n                                )\n                            ),\n                            _react2.default.createElement(\n                                \"tr\",\n                                { style: this.getExpandedStyle() },\n                                _react2.default.createElement(\n                                    \"td\",\n                                    { colSpan: \"6\" },\n                                    this.renderTaskFilter()\n                                )\n                            ),\n                            _react2.default.createElement(\n                                \"tr\",\n                                { style: this.getExpandedStyle() },\n                                _react2.default.createElement(\n                                    \"td\",\n                                    { colSpan: \"6\" },\n                                    this.renderTaskList(taskRetriesEnabled)\n                                )\n                            )\n                        )\n                    )\n                )\n            );\n        }\n    }], [{\n        key: \"renderHistogram\",\n        value: function renderHistogram(histogramId, inputData, numberFormatter) {\n            var numBuckets = Math.min(HISTOGRAM_WIDTH, Math.sqrt(inputData.length));\n            var dataMin = Math.min.apply(null, inputData);\n            var dataMax = Math.max.apply(null, inputData);\n            var bucketSize = (dataMax - dataMin) / numBuckets;\n\n            var histogramData = [];\n            if (bucketSize === 0) {\n                histogramData = [inputData.length];\n            } else {\n                for (var i = 0; i < numBuckets + 1; i++) {\n                    histogramData.push(0);\n                }\n\n                for (var _i in inputData) {\n                    var dataPoint = inputData[_i];\n                    var bucket = Math.floor((dataPoint - dataMin) / bucketSize);\n                    histogramData[bucket] = histogramData[bucket] + 1;\n                }\n            }\n\n            var tooltipValueLookups = { 'offset': {} };\n            for (var _i2 = 0; _i2 < histogramData.length; _i2++) {\n                tooltipValueLookups['offset'][_i2] = numberFormatter(dataMin + _i2 * bucketSize) + \"-\" + numberFormatter(dataMin + (_i2 + 1) * bucketSize);\n            }\n\n            var stageHistogramProperties = $.extend({}, HISTOGRAM_PROPERTIES, { barWidth: HISTOGRAM_WIDTH / histogramData.length, tooltipValueLookups: tooltipValueLookups });\n            $(histogramId).sparkline(histogramData, stageHistogramProperties);\n        }\n    }]);\n\n    return StageSummary;\n}(_react2.default.Component);\n\nvar StageList = function (_React$Component3) {\n    _inherits(StageList, _React$Component3);\n\n    function StageList() {\n        _classCallCheck(this, StageList);\n\n        return _possibleConstructorReturn(this, (StageList.__proto__ || Object.getPrototypeOf(StageList)).apply(this, arguments));\n    }\n\n    _createClass(StageList, [{\n        key: \"getStages\",\n        value: function getStages(stage) {\n            if (stage === undefined || !stage.hasOwnProperty('subStages')) {\n                return [];\n            }\n\n            return [].concat.apply(stage, stage.subStages.map(this.getStages, this));\n        }\n    }, {\n        key: \"render\",\n        value: function render() {\n            var stages = this.getStages(this.props.outputStage);\n            var taskRetriesEnabled = this.props.taskRetriesEnabled;\n\n            if (stages === undefined || stages.length === 0) {\n                return _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        \"No stage information available.\"\n                    )\n                );\n            }\n\n            var renderedStages = stages.map(function (stage) {\n                return _react2.default.createElement(StageSummary, { key: stage.stageId, stage: stage, taskRetriesEnabled: taskRetriesEnabled });\n            });\n\n            return _react2.default.createElement(\n                \"div\",\n                { className: \"row\" },\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"col-xs-12\" },\n                    _react2.default.createElement(\n                        \"table\",\n                        { className: \"table\", id: \"stage-list\" },\n                        _react2.default.createElement(\n                            \"tbody\",\n                            null,\n                            renderedStages\n                        )\n                    )\n                )\n            );\n        }\n    }]);\n\n    return StageList;\n}(_react2.default.Component);\n\nvar SMALL_SPARKLINE_PROPERTIES = {\n    width: '100%',\n    height: '57px',\n    fillColor: '#3F4552',\n    lineColor: '#747F96',\n    spotColor: '#1EDCFF',\n    tooltipClassname: 'sparkline-tooltip',\n    disableHiddenCheck: true\n};\n\nvar TASK_FILTER = {\n    ALL: function ALL() {\n        return true;\n    },\n    PLANNED: function PLANNED(state) {\n        return state === 'PLANNED';\n    },\n    RUNNING: function RUNNING(state) {\n        return state === 'RUNNING';\n    },\n    FINISHED: function FINISHED(state) {\n        return state === 'FINISHED';\n    },\n    FAILED: function FAILED(state) {\n        return state === 'FAILED' || state === 'ABORTED' || state === 'CANCELED';\n    }\n};\n\nvar QueryDetail = exports.QueryDetail = function (_React$Component4) {\n    _inherits(QueryDetail, _React$Component4);\n\n    function QueryDetail(props) {\n        _classCallCheck(this, QueryDetail);\n\n        var _this5 = _possibleConstructorReturn(this, (QueryDetail.__proto__ || Object.getPrototypeOf(QueryDetail)).call(this, props));\n\n        _this5.state = {\n            query: null,\n            lastSnapshotStages: null,\n            lastSnapshotTasks: null,\n\n            lastScheduledTime: 0,\n            lastCpuTime: 0,\n            lastRowInput: 0,\n            lastByteInput: 0,\n            lastPhysicalInput: 0,\n            lastPhysicalTime: 0,\n\n            scheduledTimeRate: [],\n            cpuTimeRate: [],\n            rowInputRate: [],\n            byteInputRate: [],\n            physicalInputRate: [],\n\n            reservedMemory: [],\n\n            initialized: false,\n            queryEnded: false,\n            renderingEnded: false,\n\n            lastRefresh: null,\n            lastRender: null,\n\n            stageRefresh: true,\n            taskRefresh: true,\n\n            taskFilter: TASK_FILTER.ALL\n        };\n\n        _this5.refreshLoop = _this5.refreshLoop.bind(_this5);\n        return _this5;\n    }\n\n    _createClass(QueryDetail, [{\n        key: \"resetTimer\",\n        value: function resetTimer() {\n            clearTimeout(this.timeoutId);\n            // stop refreshing when query finishes or fails\n            if (this.state.query === null || !this.state.queryEnded) {\n                // task.info-update-interval is set to 3 seconds by default\n                this.timeoutId = setTimeout(this.refreshLoop, 3000);\n            }\n        }\n    }, {\n        key: \"refreshLoop\",\n        value: function refreshLoop() {\n            var _this6 = this;\n\n            clearTimeout(this.timeoutId); // to stop multiple series of refreshLoop from going on simultaneously\n            var queryId = (0, _utils.getFirstParameter)(window.location.search);\n            $.get('/ui/api/query/' + queryId, function (query) {\n                var lastSnapshotStages = this.state.lastSnapshotStage;\n                if (this.state.stageRefresh) {\n                    lastSnapshotStages = query.outputStage;\n                }\n                var lastSnapshotTasks = this.state.lastSnapshotTasks;\n                if (this.state.taskRefresh) {\n                    lastSnapshotTasks = query.outputStage;\n                }\n\n                var lastRefresh = this.state.lastRefresh;\n                var lastScheduledTime = this.state.lastScheduledTime;\n                var lastCpuTime = this.state.lastCpuTime;\n                var lastRowInput = this.state.lastRowInput;\n                var lastByteInput = this.state.lastByteInput;\n                var lastPhysicalInput = this.state.lastPhysicalInput;\n                var lastPhysicalTime = this.state.lastPhysicalTime;\n                var alreadyEnded = this.state.queryEnded;\n                var nowMillis = Date.now();\n\n                this.setState({\n                    query: query,\n                    lastSnapshotStage: lastSnapshotStages,\n                    lastSnapshotTasks: lastSnapshotTasks,\n\n                    lastPhysicalTime: (0, _utils.parseDuration)(query.queryStats.physicalInputReadTime),\n                    lastScheduledTime: (0, _utils.parseDuration)(query.queryStats.totalScheduledTime),\n                    lastCpuTime: (0, _utils.parseDuration)(query.queryStats.totalCpuTime),\n                    lastRowInput: query.queryStats.processedInputPositions,\n                    lastByteInput: (0, _utils.parseDataSize)(query.queryStats.processedInputDataSize),\n                    lastPhysicalInput: (0, _utils.parseDataSize)(query.queryStats.physicalInputDataSize),\n\n                    initialized: true,\n                    queryEnded: !!query.finalQueryInfo,\n\n                    lastRefresh: nowMillis\n                });\n\n                // i.e. don't show sparklines if we've already decided not to update or if we don't have one previous measurement\n                if (alreadyEnded || lastRefresh === null && query.state === \"RUNNING\") {\n                    this.resetTimer();\n                    return;\n                }\n\n                if (lastRefresh === null) {\n                    lastRefresh = nowMillis - (0, _utils.parseDuration)(query.queryStats.elapsedTime);\n                }\n\n                var elapsedSecsSinceLastRefresh = (nowMillis - lastRefresh) / 1000.0;\n                if (elapsedSecsSinceLastRefresh >= 0) {\n                    var currentScheduledTimeRate = ((0, _utils.parseDuration)(query.queryStats.totalScheduledTime) - lastScheduledTime) / (elapsedSecsSinceLastRefresh * 1000);\n                    var currentCpuTimeRate = ((0, _utils.parseDuration)(query.queryStats.totalCpuTime) - lastCpuTime) / (elapsedSecsSinceLastRefresh * 1000);\n                    var currentPhysicalReadTime = ((0, _utils.parseDuration)(query.queryStats.physicalInputReadTime) - lastPhysicalTime) / 1000;\n                    var currentRowInputRate = (query.queryStats.processedInputPositions - lastRowInput) / elapsedSecsSinceLastRefresh;\n                    var currentByteInputRate = ((0, _utils.parseDataSize)(query.queryStats.processedInputDataSize) - lastByteInput) / elapsedSecsSinceLastRefresh;\n                    var currentPhysicalInputRate = currentPhysicalReadTime > 0 ? ((0, _utils.parseDataSize)(query.queryStats.physicalInputDataSize) - lastPhysicalInput) / currentPhysicalReadTime : 0;\n\n                    this.setState({\n                        scheduledTimeRate: (0, _utils.addToHistory)(currentScheduledTimeRate, this.state.scheduledTimeRate),\n                        cpuTimeRate: (0, _utils.addToHistory)(currentCpuTimeRate, this.state.cpuTimeRate),\n                        rowInputRate: (0, _utils.addToHistory)(currentRowInputRate, this.state.rowInputRate),\n                        byteInputRate: (0, _utils.addToHistory)(currentByteInputRate, this.state.byteInputRate),\n                        reservedMemory: (0, _utils.addToHistory)((0, _utils.parseDataSize)(query.queryStats.totalMemoryReservation), this.state.reservedMemory),\n                        physicalInputRate: (0, _utils.addToHistory)(currentPhysicalInputRate, this.state.physicalInputRate)\n                    });\n                }\n                this.resetTimer();\n            }.bind(this)).fail(function () {\n                _this6.setState({\n                    initialized: true\n                });\n                _this6.resetTimer();\n            });\n        }\n    }, {\n        key: \"handleStageRefreshClick\",\n        value: function handleStageRefreshClick() {\n            if (this.state.stageRefresh) {\n                this.setState({\n                    stageRefresh: false,\n                    lastSnapshotStages: this.state.query.outputStage\n                });\n            } else {\n                this.setState({\n                    stageRefresh: true\n                });\n            }\n        }\n    }, {\n        key: \"renderStageRefreshButton\",\n        value: function renderStageRefreshButton() {\n            if (this.state.stageRefresh) {\n                return _react2.default.createElement(\n                    \"button\",\n                    { className: \"btn btn-info live-button\", onClick: this.handleStageRefreshClick.bind(this) },\n                    \"Auto-Refresh: On\"\n                );\n            } else {\n                return _react2.default.createElement(\n                    \"button\",\n                    { className: \"btn btn-info live-button\", onClick: this.handleStageRefreshClick.bind(this) },\n                    \"Auto-Refresh: Off\"\n                );\n            }\n        }\n    }, {\n        key: \"componentDidMount\",\n        value: function componentDidMount() {\n            this.refreshLoop();\n        }\n    }, {\n        key: \"componentDidUpdate\",\n        value: function componentDidUpdate() {\n            // prevent multiple calls to componentDidUpdate (resulting from calls to setState or otherwise) within the refresh interval from re-rendering sparklines/charts\n            if (this.state.lastRender === null || Date.now() - this.state.lastRender >= 1000 || this.state.ended && !this.state.renderingEnded) {\n                var renderTimestamp = Date.now();\n                $('#scheduled-time-rate-sparkline').sparkline(this.state.scheduledTimeRate, $.extend({}, SMALL_SPARKLINE_PROPERTIES, {\n                    chartRangeMin: 0,\n                    numberFormatter: _utils.precisionRound\n                }));\n                $('#cpu-time-rate-sparkline').sparkline(this.state.cpuTimeRate, $.extend({}, SMALL_SPARKLINE_PROPERTIES, { chartRangeMin: 0, numberFormatter: _utils.precisionRound }));\n                $('#row-input-rate-sparkline').sparkline(this.state.rowInputRate, $.extend({}, SMALL_SPARKLINE_PROPERTIES, { numberFormatter: _utils.formatCount }));\n                $('#byte-input-rate-sparkline').sparkline(this.state.byteInputRate, $.extend({}, SMALL_SPARKLINE_PROPERTIES, { numberFormatter: _utils.formatDataSize }));\n                $('#reserved-memory-sparkline').sparkline(this.state.reservedMemory, $.extend({}, SMALL_SPARKLINE_PROPERTIES, { numberFormatter: _utils.formatDataSize }));\n                $('#physical-input-rate-sparkline').sparkline(this.state.physicalInputRate, $.extend({}, SMALL_SPARKLINE_PROPERTIES, { numberFormatter: _utils.formatDataSize }));\n\n                if (this.state.lastRender === null) {\n                    $('#query').each(function (i, block) {\n                        hljs.highlightBlock(block);\n                    });\n\n                    $('#prepared-query').each(function (i, block) {\n                        hljs.highlightBlock(block);\n                    });\n                }\n\n                this.setState({\n                    renderingEnded: this.state.ended,\n                    lastRender: renderTimestamp\n                });\n            }\n\n            $('[data-toggle=\"tooltip\"]').tooltip();\n            new window.ClipboardJS('.copy-button');\n        }\n    }, {\n        key: \"renderStages\",\n        value: function renderStages(taskRetriesEnabled) {\n            if (this.state.lastSnapshotStage === null) {\n                return;\n            }\n\n            return _react2.default.createElement(\n                \"div\",\n                null,\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-9\" },\n                        _react2.default.createElement(\n                            \"h3\",\n                            null,\n                            \"Stages\"\n                        )\n                    ),\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-3\" },\n                        _react2.default.createElement(\n                            \"table\",\n                            { className: \"header-inline-links\" },\n                            _react2.default.createElement(\n                                \"tbody\",\n                                null,\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        null,\n                                        this.renderStageRefreshButton()\n                                    )\n                                )\n                            )\n                        )\n                    )\n                ),\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(StageList, { key: this.state.query.queryId, outputStage: this.state.lastSnapshotStage, taskRetriesEnabled: taskRetriesEnabled })\n                    )\n                )\n            );\n        }\n    }, {\n        key: \"renderPreparedQuery\",\n        value: function renderPreparedQuery() {\n            var query = this.state.query;\n            if (!query.hasOwnProperty('preparedQuery') || query.preparedQuery === null) {\n                return;\n            }\n\n            return _react2.default.createElement(\n                \"div\",\n                { className: \"col-xs-12\" },\n                _react2.default.createElement(\n                    \"h3\",\n                    null,\n                    \"Prepared Query\",\n                    _react2.default.createElement(\n                        \"a\",\n                        { className: \"btn copy-button\", \"data-clipboard-target\": \"#prepared-query-text\", \"data-toggle\": \"tooltip\", \"data-placement\": \"right\", title: \"Copy to clipboard\" },\n                        _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-copy\", \"aria-hidden\": \"true\", alt: \"Copy to clipboard\" })\n                    )\n                ),\n                _react2.default.createElement(\n                    \"pre\",\n                    { id: \"prepared-query\" },\n                    _react2.default.createElement(\n                        \"code\",\n                        { className: \"lang-sql\", id: \"prepared-query-text\" },\n                        query.preparedQuery\n                    )\n                )\n            );\n        }\n    }, {\n        key: \"renderSessionProperties\",\n        value: function renderSessionProperties() {\n            var query = this.state.query;\n\n            var properties = [];\n            for (var property in query.session.systemProperties) {\n                if (query.session.systemProperties.hasOwnProperty(property)) {\n                    properties.push(_react2.default.createElement(\n                        \"span\",\n                        null,\n                        \"- \",\n                        property + \"=\" + query.session.systemProperties[property],\n                        \" \",\n                        _react2.default.createElement(\"br\", null)\n                    ));\n                }\n            }\n\n            for (var catalog in query.session.catalogProperties) {\n                if (query.session.catalogProperties.hasOwnProperty(catalog)) {\n                    for (var _property in query.session.catalogProperties[catalog]) {\n                        if (query.session.catalogProperties[catalog].hasOwnProperty(_property)) {\n                            properties.push(_react2.default.createElement(\n                                \"span\",\n                                null,\n                                \"- \",\n                                catalog + \".\" + _property + \"=\" + query.session.catalogProperties[catalog][_property],\n                                \" \",\n                                _react2.default.createElement(\"br\", null)\n                            ));\n                        }\n                    }\n                }\n            }\n\n            return properties;\n        }\n    }, {\n        key: \"renderResourceEstimates\",\n        value: function renderResourceEstimates() {\n            var query = this.state.query;\n            var estimates = query.session.resourceEstimates;\n            var renderedEstimates = [];\n\n            for (var resource in estimates) {\n                if (estimates.hasOwnProperty(resource)) {\n                    var upperChars = resource.match(/([A-Z])/g) || [];\n                    var snakeCased = resource;\n                    for (var i = 0, n = upperChars.length; i < n; i++) {\n                        snakeCased = snakeCased.replace(new RegExp(upperChars[i]), '_' + upperChars[i].toLowerCase());\n                    }\n\n                    renderedEstimates.push(_react2.default.createElement(\n                        \"span\",\n                        null,\n                        \"- \",\n                        snakeCased + \"=\" + query.session.resourceEstimates[resource],\n                        \" \",\n                        _react2.default.createElement(\"br\", null)\n                    ));\n                }\n            }\n\n            return renderedEstimates;\n        }\n    }, {\n        key: \"renderWarningInfo\",\n        value: function renderWarningInfo() {\n            var query = this.state.query;\n            if (query.warnings.length > 0) {\n                return _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(\n                            \"h3\",\n                            null,\n                            \"Warnings\"\n                        ),\n                        _react2.default.createElement(\"hr\", { className: \"h3-hr\" }),\n                        _react2.default.createElement(\n                            \"table\",\n                            { className: \"table\", id: \"warnings-table\" },\n                            query.warnings.map(function (warning) {\n                                return _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        null,\n                                        warning.warningCode.name\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        null,\n                                        warning.message\n                                    )\n                                );\n                            })\n                        )\n                    )\n                );\n            } else {\n                return null;\n            }\n        }\n    }, {\n        key: \"renderFailureInfo\",\n        value: function renderFailureInfo() {\n            var query = this.state.query;\n            if (query.failureInfo) {\n                return _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(\n                            \"h3\",\n                            null,\n                            \"Error Information\"\n                        ),\n                        _react2.default.createElement(\"hr\", { className: \"h3-hr\" }),\n                        _react2.default.createElement(\n                            \"table\",\n                            { className: \"table\" },\n                            _react2.default.createElement(\n                                \"tbody\",\n                                null,\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Error Type\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.errorType\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Error Code\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.errorCode.name + \" (\" + this.state.query.errorCode.code + \")\"\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Stack Trace\",\n                                        _react2.default.createElement(\n                                            \"a\",\n                                            { className: \"btn copy-button\", \"data-clipboard-target\": \"#stack-trace\", \"data-toggle\": \"tooltip\", \"data-placement\": \"right\", title: \"Copy to clipboard\" },\n                                            _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-copy\", \"aria-hidden\": \"true\", alt: \"Copy to clipboard\" })\n                                        )\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        _react2.default.createElement(\n                                            \"pre\",\n                                            { id: \"stack-trace\" },\n                                            QueryDetail.formatStackTrace(query.failureInfo)\n                                        )\n                                    )\n                                )\n                            )\n                        )\n                    )\n                );\n            } else {\n                return \"\";\n            }\n        }\n    }, {\n        key: \"render\",\n        value: function render() {\n            var query = this.state.query;\n            if (query === null || this.state.initialized === false) {\n                var label = _react2.default.createElement(\n                    \"div\",\n                    { className: \"loader\" },\n                    \"Loading...\"\n                );\n                if (this.state.initialized) {\n                    label = \"Query not found\";\n                }\n                return _react2.default.createElement(\n                    \"div\",\n                    { className: \"row error-message\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(\n                            \"h4\",\n                            null,\n                            label\n                        )\n                    )\n                );\n            }\n\n            var taskRetriesEnabled = query.retryPolicy == \"TASK\";\n\n            return _react2.default.createElement(\n                \"div\",\n                null,\n                _react2.default.createElement(_QueryHeader.QueryHeader, { query: query }),\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-6\" },\n                        _react2.default.createElement(\n                            \"h3\",\n                            null,\n                            \"Session\"\n                        ),\n                        _react2.default.createElement(\"hr\", { className: \"h3-hr\" }),\n                        _react2.default.createElement(\n                            \"table\",\n                            { className: \"table\" },\n                            _react2.default.createElement(\n                                \"tbody\",\n                                null,\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"User\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text wrap-text\" },\n                                        _react2.default.createElement(\n                                            \"span\",\n                                            { id: \"query-user\" },\n                                            query.session.user\n                                        ),\n                                        \"\\xA0\\xA0\",\n                                        _react2.default.createElement(\n                                            \"a\",\n                                            { href: \"#\", className: \"copy-button\", \"data-clipboard-target\": \"#query-user\", \"data-toggle\": \"tooltip\", \"data-placement\": \"right\", title: \"Copy to clipboard\" },\n                                            _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-copy\", \"aria-hidden\": \"true\", alt: \"Copy to clipboard\" })\n                                        )\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Principal\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text wrap-text\" },\n                                        query.session.principal\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Source\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text wrap-text\" },\n                                        query.session.source\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Catalog\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.session.catalog\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Schema\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.session.schema\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Time zone\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.session.timeZone\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Client Address\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.session.remoteUserAddress\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Client Tags\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.session.clientTags.join(\", \")\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Session Properties\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text wrap-text\" },\n                                        this.renderSessionProperties()\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Resource Estimates\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text wrap-text\" },\n                                        this.renderResourceEstimates()\n                                    )\n                                )\n                            )\n                        )\n                    ),\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-6\" },\n                        _react2.default.createElement(\n                            \"h3\",\n                            null,\n                            \"Execution\"\n                        ),\n                        _react2.default.createElement(\"hr\", { className: \"h3-hr\" }),\n                        _react2.default.createElement(\n                            \"table\",\n                            { className: \"table\" },\n                            _react2.default.createElement(\n                                \"tbody\",\n                                null,\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Resource Group\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text wrap-text\" },\n                                        query.resourceGroupId ? query.resourceGroupId.join(\".\") : \"n/a\"\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Submission Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        (0, _utils.formatShortDateTime)(new Date(query.queryStats.createTime))\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Completion Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.queryStats.endTime ? (0, _utils.formatShortDateTime)(new Date(query.queryStats.endTime)) : \"\"\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Elapsed Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.queryStats.elapsedTime\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Queued Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.queryStats.queuedTime\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Analysis Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.queryStats.analysisTime\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Planning Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.queryStats.planningTime\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Execution Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.queryStats.executionTime\n                                    )\n                                )\n                            )\n                        )\n                    )\n                ),\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(\n                            \"div\",\n                            { className: \"row\" },\n                            _react2.default.createElement(\n                                \"div\",\n                                { className: \"col-xs-6\" },\n                                _react2.default.createElement(\n                                    \"h3\",\n                                    null,\n                                    \"Resource Utilization Summary\"\n                                ),\n                                _react2.default.createElement(\"hr\", { className: \"h3-hr\" }),\n                                _react2.default.createElement(\n                                    \"table\",\n                                    { className: \"table\" },\n                                    _react2.default.createElement(\n                                        \"tbody\",\n                                        null,\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"CPU Time\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                query.queryStats.totalCpuTime\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                query.queryStats.failedCpuTime\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Scheduled Time\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                query.queryStats.totalScheduledTime\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                query.queryStats.failedScheduledTime\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Input Rows\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.formatCount)(query.queryStats.processedInputPositions)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                query.queryStats.failedProcessedInputPositions\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Input Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.processedInputDataSize)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                query.queryStats.failedProcessedInputDataSize\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Physical Input Rows\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.formatCount)(query.queryStats.physicalInputPositions)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.formatCount)(query.queryStats.failedPhysicalInputPositions)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Physical Input Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.physicalInputDataSize)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.failedPhysicalInputDataSize)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Physical Input Read Time\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                query.queryStats.physicalInputReadTime\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                query.queryStats.failedPhysicalInputReadTime\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Internal Network Rows\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.formatCount)(query.queryStats.internalNetworkInputPositions)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.formatCount)(query.queryStats.failedInternalNetworkInputPositions)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Internal Network Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.internalNetworkInputDataSize)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.failedInternalNetworkInputDataSize)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Peak User Memory\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.peakUserMemoryReservation)\n                                            )\n                                        ),\n                                        (0, _utils.parseDataSize)(query.queryStats.peakRevocableMemoryReservation) > 0 && _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Peak Revocable Memory\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.peakRevocableMemoryReservation)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Peak Total Memory\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.peakTotalMemoryReservation)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Cumulative User Memory\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.formatDataSize)(query.queryStats.cumulativeUserMemory / 1000.0) + \"*seconds\"\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.formatDataSize)(query.queryStats.failedCumulativeUserMemory / 1000.0) + \"*seconds\"\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Output Rows\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.formatCount)(query.queryStats.outputPositions)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.formatCount)(query.queryStats.failedOutputPositions)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Output Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.outputDataSize)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.failedOutputDataSize)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Written Rows\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.formatCount)(query.queryStats.writtenPositions)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Logical Written Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.logicalWrittenDataSize)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Physical Written Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.physicalWrittenDataSize)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.failedPhysicalWrittenDataSize)\n                                            )\n                                        ),\n                                        (0, _utils.parseDataSize)(query.queryStats.spilledDataSize) > 0 && _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Spilled Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.spilledDataSize)\n                                            )\n                                        )\n                                    )\n                                )\n                            ),\n                            _react2.default.createElement(\n                                \"div\",\n                                { className: \"col-xs-6\" },\n                                _react2.default.createElement(\n                                    \"h3\",\n                                    null,\n                                    \"Timeline\"\n                                ),\n                                _react2.default.createElement(\"hr\", { className: \"h3-hr\" }),\n                                _react2.default.createElement(\n                                    \"table\",\n                                    { className: \"table\" },\n                                    _react2.default.createElement(\n                                        \"tbody\",\n                                        null,\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Parallelism\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { rowSpan: \"2\" },\n                                                _react2.default.createElement(\n                                                    \"div\",\n                                                    { className: \"query-stats-sparkline-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"sparkline\", id: \"cpu-time-rate-sparkline\" },\n                                                        _react2.default.createElement(\n                                                            \"div\",\n                                                            { className: \"loader\" },\n                                                            \"Loading ...\"\n                                                        )\n                                                    )\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            { className: \"tr-noborder\" },\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-sparkline-text\" },\n                                                (0, _utils.formatCount)(this.state.cpuTimeRate[this.state.cpuTimeRate.length - 1])\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Scheduled Time/s\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { rowSpan: \"2\" },\n                                                _react2.default.createElement(\n                                                    \"div\",\n                                                    { className: \"query-stats-sparkline-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"sparkline\", id: \"scheduled-time-rate-sparkline\" },\n                                                        _react2.default.createElement(\n                                                            \"div\",\n                                                            { className: \"loader\" },\n                                                            \"Loading ...\"\n                                                        )\n                                                    )\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            { className: \"tr-noborder\" },\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-sparkline-text\" },\n                                                (0, _utils.formatCount)(this.state.scheduledTimeRate[this.state.scheduledTimeRate.length - 1])\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Input Rows/s\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { rowSpan: \"2\" },\n                                                _react2.default.createElement(\n                                                    \"div\",\n                                                    { className: \"query-stats-sparkline-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"sparkline\", id: \"row-input-rate-sparkline\" },\n                                                        _react2.default.createElement(\n                                                            \"div\",\n                                                            { className: \"loader\" },\n                                                            \"Loading ...\"\n                                                        )\n                                                    )\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            { className: \"tr-noborder\" },\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-sparkline-text\" },\n                                                (0, _utils.formatCount)(this.state.rowInputRate[this.state.rowInputRate.length - 1])\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Input Bytes/s\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { rowSpan: \"2\" },\n                                                _react2.default.createElement(\n                                                    \"div\",\n                                                    { className: \"query-stats-sparkline-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"sparkline\", id: \"byte-input-rate-sparkline\" },\n                                                        _react2.default.createElement(\n                                                            \"div\",\n                                                            { className: \"loader\" },\n                                                            \"Loading ...\"\n                                                        )\n                                                    )\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            { className: \"tr-noborder\" },\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-sparkline-text\" },\n                                                (0, _utils.formatDataSize)(this.state.byteInputRate[this.state.byteInputRate.length - 1])\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Physical Input Bytes/s\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { rowSpan: \"2\" },\n                                                _react2.default.createElement(\n                                                    \"div\",\n                                                    { className: \"query-stats-sparkline-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"sparkline\", id: \"physical-input-rate-sparkline\" },\n                                                        _react2.default.createElement(\n                                                            \"div\",\n                                                            { className: \"loader\" },\n                                                            \"Loading ...\"\n                                                        )\n                                                    )\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            { className: \"tr-noborder\" },\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-sparkline-text\" },\n                                                (0, _utils.formatDataSize)(this.state.physicalInputRate[this.state.physicalInputRate.length - 1])\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Memory Utilization\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { rowSpan: \"2\" },\n                                                _react2.default.createElement(\n                                                    \"div\",\n                                                    { className: \"query-stats-sparkline-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"sparkline\", id: \"reserved-memory-sparkline\" },\n                                                        _react2.default.createElement(\n                                                            \"div\",\n                                                            { className: \"loader\" },\n                                                            \"Loading ...\"\n                                                        )\n                                                    )\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            { className: \"tr-noborder\" },\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-sparkline-text\" },\n                                                (0, _utils.formatDataSize)(this.state.reservedMemory[this.state.reservedMemory.length - 1])\n                                            )\n                                        )\n                                    )\n                                )\n                            )\n                        )\n                    )\n                ),\n                this.renderWarningInfo(),\n                this.renderFailureInfo(),\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(\n                            \"h3\",\n                            null,\n                            \"Query\",\n                            _react2.default.createElement(\n                                \"a\",\n                                { className: \"btn copy-button\", \"data-clipboard-target\": \"#query-text\", \"data-toggle\": \"tooltip\", \"data-placement\": \"right\", title: \"Copy to clipboard\" },\n                                _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-copy\", \"aria-hidden\": \"true\", alt: \"Copy to clipboard\" })\n                            )\n                        ),\n                        _react2.default.createElement(\n                            \"pre\",\n                            { id: \"query\" },\n                            _react2.default.createElement(\n                                \"code\",\n                                { className: \"lang-sql\", id: \"query-text\" },\n                                query.query\n                            )\n                        )\n                    ),\n                    this.renderPreparedQuery()\n                ),\n                this.renderStages(taskRetriesEnabled)\n            );\n        }\n    }], [{\n        key: \"formatStackTrace\",\n        value: function formatStackTrace(info) {\n            return QueryDetail.formatStackTraceHelper(info, [], \"\", \"\");\n        }\n    }, {\n        key: \"formatStackTraceHelper\",\n        value: function formatStackTraceHelper(info, parentStack, prefix, linePrefix) {\n            var s = linePrefix + prefix + QueryDetail.failureInfoToString(info) + \"\\n\";\n\n            if (info.stack) {\n                var sharedStackFrames = 0;\n                if (parentStack !== null) {\n                    sharedStackFrames = QueryDetail.countSharedStackFrames(info.stack, parentStack);\n                }\n\n                for (var i = 0; i < info.stack.length - sharedStackFrames; i++) {\n                    s += linePrefix + \"\\tat \" + info.stack[i] + \"\\n\";\n                }\n                if (sharedStackFrames !== 0) {\n                    s += linePrefix + \"\\t... \" + sharedStackFrames + \" more\" + \"\\n\";\n                }\n            }\n\n            if (info.suppressed) {\n                for (var _i3 = 0; _i3 < info.suppressed.length; _i3++) {\n                    s += QueryDetail.formatStackTraceHelper(info.suppressed[_i3], info.stack, \"Suppressed: \", linePrefix + \"\\t\");\n                }\n            }\n\n            if (info.cause) {\n                s += QueryDetail.formatStackTraceHelper(info.cause, info.stack, \"Caused by: \", linePrefix);\n            }\n\n            return s;\n        }\n    }, {\n        key: \"countSharedStackFrames\",\n        value: function countSharedStackFrames(stack, parentStack) {\n            var n = 0;\n            var minStackLength = Math.min(stack.length, parentStack.length);\n            while (n < minStackLength && stack[stack.length - 1 - n] === parentStack[parentStack.length - 1 - n]) {\n                n++;\n            }\n            return n;\n        }\n    }, {\n        key: \"failureInfoToString\",\n        value: function failureInfoToString(t) {\n            return t.message !== null ? t.type + \": \" + t.message : t.type;\n        }\n    }]);\n\n    return QueryDetail;\n}(_react2.default.Component);\n\n//# sourceURL=webpack://trino-webui/./components/QueryDetail.jsx?");
+eval("\n\nObject.defineProperty(exports, \"__esModule\", ({\n    value: true\n}));\nexports.QueryDetail = undefined;\n\nvar _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();\n\nvar _react = __webpack_require__(/*! react */ \"./node_modules/react/index.js\");\n\nvar _react2 = _interopRequireDefault(_react);\n\nvar _reactable = __webpack_require__(/*! reactable */ \"./node_modules/reactable/lib/reactable.js\");\n\nvar _reactable2 = _interopRequireDefault(_reactable);\n\nvar _utils = __webpack_require__(/*! ../utils */ \"./utils.js\");\n\nvar _QueryHeader = __webpack_require__(/*! ./QueryHeader */ \"./components/QueryHeader.jsx\");\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return call && (typeof call === \"object\" || typeof call === \"function\") ? call : self; }\n\nfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function, not \" + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } /*\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * Licensed under the Apache License, Version 2.0 (the \"License\");\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * you may not use this file except in compliance with the License.\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * You may obtain a copy of the License at\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                *\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                *     http://www.apache.org/licenses/LICENSE-2.0\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                *\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * Unless required by applicable law or agreed to in writing, software\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * distributed under the License is distributed on an \"AS IS\" BASIS,\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * See the License for the specific language governing permissions and\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * limitations under the License.\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                */\n\nvar Table = _reactable2.default.Table,\n    Thead = _reactable2.default.Thead,\n    Th = _reactable2.default.Th,\n    Tr = _reactable2.default.Tr,\n    Td = _reactable2.default.Td;\n\nvar TaskList = function (_React$Component) {\n    _inherits(TaskList, _React$Component);\n\n    function TaskList() {\n        _classCallCheck(this, TaskList);\n\n        return _possibleConstructorReturn(this, (TaskList.__proto__ || Object.getPrototypeOf(TaskList)).apply(this, arguments));\n    }\n\n    _createClass(TaskList, [{\n        key: \"render\",\n        value: function render() {\n            var tasks = this.props.tasks;\n            var taskRetriesEnabled = this.props.taskRetriesEnabled;\n\n            if (tasks === undefined || tasks.length === 0) {\n                return _react2.default.createElement(\n                    \"div\",\n                    { className: \"row error-message\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(\n                            \"h4\",\n                            null,\n                            \"No threads in the selected group\"\n                        )\n                    )\n                );\n            }\n\n            var showPortNumbers = TaskList.showPortNumbers(tasks);\n\n            var renderedTasks = tasks.map(function (task) {\n                var elapsedTime = (0, _utils.parseDuration)(task.stats.elapsedTime);\n                if (elapsedTime === 0) {\n                    elapsedTime = Date.now() - Date.parse(task.stats.createTime);\n                }\n\n                return _react2.default.createElement(\n                    Tr,\n                    { key: task.taskStatus.taskId },\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"id\", value: task.taskStatus.taskId },\n                        _react2.default.createElement(\n                            \"a\",\n                            { href: \"/ui/api/worker/\" + task.taskStatus.nodeId + \"/task/\" + task.taskStatus.taskId + \"?pretty\" },\n                            (0, _utils.getTaskIdSuffix)(task.taskStatus.taskId)\n                        )\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"host\", value: (0, _utils.getHostname)(task.taskStatus.self) },\n                        _react2.default.createElement(\n                            \"a\",\n                            { href: \"worker.html?\" + task.taskStatus.nodeId, className: \"font-light\", target: \"_blank\" },\n                            showPortNumbers ? (0, _utils.getHostAndPort)(task.taskStatus.self) : (0, _utils.getHostname)(task.taskStatus.self)\n                        )\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"state\", value: TaskList.formatState(task.taskStatus.state, task.stats.fullyBlocked) },\n                        TaskList.formatState(task.taskStatus.state, task.stats.fullyBlocked)\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"rows\", value: task.stats.rawInputPositions },\n                        (0, _utils.formatCount)(task.stats.rawInputPositions)\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"rowsSec\", value: (0, _utils.computeRate)(task.stats.rawInputPositions, elapsedTime) },\n                        (0, _utils.formatCount)((0, _utils.computeRate)(task.stats.rawInputPositions, elapsedTime))\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"bytes\", value: (0, _utils.parseDataSize)(task.stats.rawInputDataSize) },\n                        (0, _utils.formatDataSizeBytes)((0, _utils.parseDataSize)(task.stats.rawInputDataSize))\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"bytesSec\", value: (0, _utils.computeRate)((0, _utils.parseDataSize)(task.stats.rawInputDataSize), elapsedTime) },\n                        (0, _utils.formatDataSizeBytes)((0, _utils.computeRate)((0, _utils.parseDataSize)(task.stats.rawInputDataSize), elapsedTime))\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"splitsPending\", value: task.stats.queuedDrivers },\n                        task.stats.queuedDrivers\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"splitsRunning\", value: task.stats.runningDrivers },\n                        task.stats.runningDrivers\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"splitsBlocked\", value: task.stats.blockedDrivers },\n                        task.stats.blockedDrivers\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"splitsDone\", value: task.stats.completedDrivers },\n                        task.stats.completedDrivers\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"elapsedTime\", value: (0, _utils.parseDuration)(task.stats.elapsedTime) },\n                        task.stats.elapsedTime\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"cpuTime\", value: (0, _utils.parseDuration)(task.stats.totalCpuTime) },\n                        task.stats.totalCpuTime\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"bufferedBytes\", value: task.outputBuffers.totalBufferedBytes },\n                        (0, _utils.formatDataSizeBytes)(task.outputBuffers.totalBufferedBytes)\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"memory\", value: (0, _utils.parseDataSize)(task.stats.userMemoryReservation) },\n                        (0, _utils.parseAndFormatDataSize)(task.stats.userMemoryReservation)\n                    ),\n                    _react2.default.createElement(\n                        Td,\n                        { column: \"peakMemory\", value: (0, _utils.parseDataSize)(task.stats.peakUserMemoryReservation) },\n                        (0, _utils.parseAndFormatDataSize)(task.stats.peakUserMemoryReservation)\n                    ),\n                    taskRetriesEnabled && _react2.default.createElement(\n                        Td,\n                        { column: \"estimatedMemory\", value: (0, _utils.parseDataSize)(task.estimatedMemory) },\n                        (0, _utils.parseAndFormatDataSize)(task.estimatedMemory)\n                    )\n                );\n            });\n\n            return _react2.default.createElement(\n                Table,\n                { id: \"tasks\", className: \"table table-striped sortable\", sortable: [{\n                        column: 'id',\n                        sortFunction: TaskList.compareTaskId\n                    }, 'host', 'state', 'splitsPending', 'splitsRunning', 'splitsBlocked', 'splitsDone', 'rows', 'rowsSec', 'bytes', 'bytesSec', 'elapsedTime', 'cpuTime', 'bufferedBytes', 'memory', 'peakMemory', 'estimatedMemory'],\n                    defaultSort: { column: 'id', direction: 'asc' } },\n                _react2.default.createElement(\n                    Thead,\n                    null,\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"id\" },\n                        \"ID\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"host\" },\n                        \"Host\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"state\" },\n                        \"State\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"splitsPending\" },\n                        _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-pause\", style: _utils.GLYPHICON_HIGHLIGHT, \"data-toggle\": \"tooltip\", \"data-placement\": \"top\",\n                            title: \"Pending splits\" })\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"splitsRunning\" },\n                        _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-play\", style: _utils.GLYPHICON_HIGHLIGHT, \"data-toggle\": \"tooltip\", \"data-placement\": \"top\",\n                            title: \"Running splits\" })\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"splitsBlocked\" },\n                        _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-bookmark\", style: _utils.GLYPHICON_HIGHLIGHT, \"data-toggle\": \"tooltip\", \"data-placement\": \"top\",\n                            title: \"Blocked splits\" })\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"splitsDone\" },\n                        _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-ok\", style: _utils.GLYPHICON_HIGHLIGHT, \"data-toggle\": \"tooltip\", \"data-placement\": \"top\",\n                            title: \"Completed splits\" })\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"rows\" },\n                        \"Rows\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"rowsSec\" },\n                        \"Rows/s\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"bytes\" },\n                        \"Bytes\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"bytesSec\" },\n                        \"Bytes/s\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"elapsedTime\" },\n                        \"Elapsed\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"cpuTime\" },\n                        \"CPU Time\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"memory\" },\n                        \"Mem\"\n                    ),\n                    _react2.default.createElement(\n                        Th,\n                        { column: \"peakMemory\" },\n                        \"Peak Mem\"\n                    ),\n                    taskRetriesEnabled && _react2.default.createElement(\n                        Th,\n                        { column: \"estimatedMemory\" },\n                        \"Est Mem\"\n                    )\n                ),\n                renderedTasks\n            );\n        }\n    }], [{\n        key: \"removeQueryId\",\n        value: function removeQueryId(id) {\n            var pos = id.indexOf('.');\n            if (pos !== -1) {\n                return id.substring(pos + 1);\n            }\n            return id;\n        }\n    }, {\n        key: \"compareTaskId\",\n        value: function compareTaskId(taskA, taskB) {\n            var taskIdArrA = TaskList.removeQueryId(taskA).split(\".\");\n            var taskIdArrB = TaskList.removeQueryId(taskB).split(\".\");\n\n            if (taskIdArrA.length > taskIdArrB.length) {\n                return 1;\n            }\n            for (var i = 0; i < taskIdArrA.length; i++) {\n                var anum = Number.parseInt(taskIdArrA[i]);\n                var bnum = Number.parseInt(taskIdArrB[i]);\n                if (anum !== bnum) {\n                    return anum > bnum ? 1 : -1;\n                }\n            }\n\n            return 0;\n        }\n    }, {\n        key: \"showPortNumbers\",\n        value: function showPortNumbers(tasks) {\n            // check if any host has multiple port numbers\n            var hostToPortNumber = {};\n            for (var i = 0; i < tasks.length; i++) {\n                var taskUri = tasks[i].taskStatus.self;\n                var hostname = (0, _utils.getHostname)(taskUri);\n                var port = (0, _utils.getPort)(taskUri);\n                if (hostname in hostToPortNumber && hostToPortNumber[hostname] !== port) {\n                    return true;\n                }\n                hostToPortNumber[hostname] = port;\n            }\n\n            return false;\n        }\n    }, {\n        key: \"formatState\",\n        value: function formatState(state, fullyBlocked) {\n            if (fullyBlocked && state === \"RUNNING\") {\n                return \"BLOCKED\";\n            } else {\n                return state;\n            }\n        }\n    }]);\n\n    return TaskList;\n}(_react2.default.Component);\n\nvar BAR_CHART_WIDTH = 800;\n\nvar BAR_CHART_PROPERTIES = {\n    type: 'bar',\n    barSpacing: '0',\n    height: '80px',\n    barColor: '#747F96',\n    zeroColor: '#8997B3',\n    chartRangeMin: 0,\n    tooltipClassname: 'sparkline-tooltip',\n    tooltipFormat: 'Task {{offset:offset}} - {{value}}',\n    disableHiddenCheck: true\n};\n\nvar HISTOGRAM_WIDTH = 175;\n\nvar HISTOGRAM_PROPERTIES = {\n    type: 'bar',\n    barSpacing: '0',\n    height: '80px',\n    barColor: '#747F96',\n    zeroColor: '#747F96',\n    zeroAxis: true,\n    chartRangeMin: 0,\n    tooltipClassname: 'sparkline-tooltip',\n    tooltipFormat: '{{offset:offset}} -- {{value}} tasks',\n    disableHiddenCheck: true\n};\n\nvar StageSummary = function (_React$Component2) {\n    _inherits(StageSummary, _React$Component2);\n\n    function StageSummary(props) {\n        _classCallCheck(this, StageSummary);\n\n        var _this2 = _possibleConstructorReturn(this, (StageSummary.__proto__ || Object.getPrototypeOf(StageSummary)).call(this, props));\n\n        _this2.state = {\n            expanded: false,\n            lastRender: null,\n            taskFilter: TASK_FILTER.ALL\n        };\n        return _this2;\n    }\n\n    _createClass(StageSummary, [{\n        key: \"getExpandedIcon\",\n        value: function getExpandedIcon() {\n            return this.state.expanded ? \"glyphicon-chevron-up\" : \"glyphicon-chevron-down\";\n        }\n    }, {\n        key: \"getExpandedStyle\",\n        value: function getExpandedStyle() {\n            return this.state.expanded ? {} : { display: \"none\" };\n        }\n    }, {\n        key: \"toggleExpanded\",\n        value: function toggleExpanded() {\n            this.setState({\n                expanded: !this.state.expanded\n            });\n        }\n    }, {\n        key: \"componentDidUpdate\",\n        value: function componentDidUpdate() {\n            var stage = this.props.stage;\n            var numTasks = stage.tasks.length;\n\n            // sort the x-axis\n            stage.tasks.sort(function (taskA, taskB) {\n                return (0, _utils.getTaskNumber)(taskA.taskStatus.taskId) - (0, _utils.getTaskNumber)(taskB.taskStatus.taskId);\n            });\n\n            var scheduledTimes = stage.tasks.map(function (task) {\n                return (0, _utils.parseDuration)(task.stats.totalScheduledTime);\n            });\n            var cpuTimes = stage.tasks.map(function (task) {\n                return (0, _utils.parseDuration)(task.stats.totalCpuTime);\n            });\n\n            // prevent multiple calls to componentDidUpdate (resulting from calls to setState or otherwise) within the refresh interval from re-rendering sparklines/charts\n            if (this.state.lastRender === null || Date.now() - this.state.lastRender >= 1000) {\n                var renderTimestamp = Date.now();\n                var stageId = (0, _utils.getStageNumber)(stage.stageId);\n\n                StageSummary.renderHistogram('#scheduled-time-histogram-' + stageId, scheduledTimes, _utils.formatDuration);\n                StageSummary.renderHistogram('#cpu-time-histogram-' + stageId, cpuTimes, _utils.formatDuration);\n\n                if (this.state.expanded) {\n                    // this needs to be a string otherwise it will also be passed to numberFormatter\n                    var tooltipValueLookups = { 'offset': {} };\n                    for (var i = 0; i < numTasks; i++) {\n                        tooltipValueLookups['offset'][i] = (0, _utils.getStageNumber)(stage.stageId) + \".\" + i;\n                    }\n\n                    var stageBarChartProperties = $.extend({}, BAR_CHART_PROPERTIES, { barWidth: BAR_CHART_WIDTH / numTasks, tooltipValueLookups: tooltipValueLookups });\n\n                    $('#scheduled-time-bar-chart-' + stageId).sparkline(scheduledTimes, $.extend({}, stageBarChartProperties, { numberFormatter: _utils.formatDuration }));\n                    $('#cpu-time-bar-chart-' + stageId).sparkline(cpuTimes, $.extend({}, stageBarChartProperties, { numberFormatter: _utils.formatDuration }));\n                }\n\n                this.setState({\n                    lastRender: renderTimestamp\n                });\n            }\n        }\n    }, {\n        key: \"renderTaskList\",\n        value: function renderTaskList(taskRetriesEnabled) {\n            var _this3 = this;\n\n            var tasks = this.state.expanded ? this.props.stage.tasks : [];\n            tasks = tasks.filter(function (task) {\n                return _this3.state.taskFilter(task.taskStatus.state);\n            }, this);\n            return _react2.default.createElement(TaskList, { tasks: tasks, taskRetriesEnabled: taskRetriesEnabled });\n        }\n    }, {\n        key: \"handleTaskFilterClick\",\n        value: function handleTaskFilterClick(filter, event) {\n            this.setState({\n                taskFilter: filter\n            });\n            event.preventDefault();\n        }\n    }, {\n        key: \"renderTaskFilterListItem\",\n        value: function renderTaskFilterListItem(taskFilter, taskFilterText) {\n            return _react2.default.createElement(\n                \"li\",\n                null,\n                _react2.default.createElement(\n                    \"a\",\n                    { href: \"#\", className: this.state.taskFilter === taskFilter ? \"selected\" : \"\", onClick: this.handleTaskFilterClick.bind(this, taskFilter) },\n                    taskFilterText\n                )\n            );\n        }\n    }, {\n        key: \"renderTaskFilter\",\n        value: function renderTaskFilter() {\n            return _react2.default.createElement(\n                \"div\",\n                { className: \"row\" },\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"col-xs-6\" },\n                    _react2.default.createElement(\n                        \"h3\",\n                        null,\n                        \"Tasks\"\n                    )\n                ),\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"col-xs-6\" },\n                    _react2.default.createElement(\n                        \"table\",\n                        { className: \"header-inline-links\" },\n                        _react2.default.createElement(\n                            \"tbody\",\n                            null,\n                            _react2.default.createElement(\n                                \"tr\",\n                                null,\n                                _react2.default.createElement(\n                                    \"td\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"div\",\n                                        { className: \"input-group-btn text-right\" },\n                                        _react2.default.createElement(\n                                            \"button\",\n                                            { type: \"button\", className: \"btn btn-default dropdown-toggle pull-right text-right\", \"data-toggle\": \"dropdown\", \"aria-haspopup\": \"true\",\n                                                \"aria-expanded\": \"false\" },\n                                            \"Show \",\n                                            _react2.default.createElement(\"span\", { className: \"caret\" })\n                                        ),\n                                        _react2.default.createElement(\n                                            \"ul\",\n                                            { className: \"dropdown-menu\" },\n                                            this.renderTaskFilterListItem(TASK_FILTER.ALL, \"All\"),\n                                            this.renderTaskFilterListItem(TASK_FILTER.PLANNED, \"Planned\"),\n                                            this.renderTaskFilterListItem(TASK_FILTER.RUNNING, \"Running\"),\n                                            this.renderTaskFilterListItem(TASK_FILTER.FINISHED, \"Finished\"),\n                                            this.renderTaskFilterListItem(TASK_FILTER.FAILED, \"Aborted/Canceled/Failed\")\n                                        )\n                                    )\n                                )\n                            )\n                        )\n                    )\n                )\n            );\n        }\n    }, {\n        key: \"render\",\n        value: function render() {\n            var stage = this.props.stage;\n            var taskRetriesEnabled = this.props.taskRetriesEnabled;\n\n            if (stage === undefined || !stage.hasOwnProperty('plan')) {\n                return _react2.default.createElement(\n                    \"tr\",\n                    null,\n                    _react2.default.createElement(\n                        \"td\",\n                        null,\n                        \"Information about this stage is unavailable.\"\n                    )\n                );\n            }\n\n            var totalBufferedBytes = stage.tasks.map(function (task) {\n                return task.outputBuffers.totalBufferedBytes;\n            }).reduce(function (a, b) {\n                return a + b;\n            }, 0);\n\n            var stageId = (0, _utils.getStageNumber)(stage.stageId);\n\n            return _react2.default.createElement(\n                \"tr\",\n                null,\n                _react2.default.createElement(\n                    \"td\",\n                    { className: \"stage-id\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"stage-state-color\", style: { borderLeftColor: (0, _utils.getStageStateColor)(stage) } },\n                        stageId\n                    )\n                ),\n                _react2.default.createElement(\n                    \"td\",\n                    null,\n                    _react2.default.createElement(\n                        \"table\",\n                        { className: \"table single-stage-table\" },\n                        _react2.default.createElement(\n                            \"tbody\",\n                            null,\n                            _react2.default.createElement(\n                                \"tr\",\n                                null,\n                                _react2.default.createElement(\n                                    \"td\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"stage-table stage-table-time\" },\n                                        _react2.default.createElement(\n                                            \"thead\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"th\",\n                                                    { className: \"stage-table-stat-title stage-table-stat-header\" },\n                                                    \"Time\"\n                                                ),\n                                                _react2.default.createElement(\"th\", null)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Scheduled\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.stageStats.totalScheduledTime\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Blocked\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.stageStats.totalBlockedTime\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"CPU\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.stageStats.totalCpuTime\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Failed\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.stageStats.failedScheduledTime\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"CPU Failed\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.stageStats.failedCpuTime\n                                                )\n                                            )\n                                        )\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"td\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"stage-table stage-table-memory\" },\n                                        _react2.default.createElement(\n                                            \"thead\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"th\",\n                                                    { className: \"stage-table-stat-title stage-table-stat-header\" },\n                                                    \"Memory\"\n                                                ),\n                                                _react2.default.createElement(\"th\", null)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Cumulative\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    (0, _utils.formatDataSizeBytes)(stage.stageStats.cumulativeUserMemory / 1000)\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Current\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    (0, _utils.parseAndFormatDataSize)(stage.stageStats.userMemoryReservation)\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Buffers\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    (0, _utils.formatDataSize)(totalBufferedBytes)\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Peak\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    (0, _utils.parseAndFormatDataSize)(stage.stageStats.peakUserMemoryReservation)\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Failed\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    (0, _utils.formatDataSizeBytes)(stage.stageStats.failedCumulativeUserMemory / 1000)\n                                                )\n                                            )\n                                        )\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"td\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"stage-table stage-table-tasks\" },\n                                        _react2.default.createElement(\n                                            \"thead\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"th\",\n                                                    { className: \"stage-table-stat-title stage-table-stat-header\" },\n                                                    \"Tasks\"\n                                                ),\n                                                _react2.default.createElement(\"th\", null)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Pending\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.tasks.filter(function (task) {\n                                                        return task.taskStatus.state === \"PLANNED\";\n                                                    }).length\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Running\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.tasks.filter(function (task) {\n                                                        return task.taskStatus.state === \"RUNNING\";\n                                                    }).length\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Blocked\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.tasks.filter(function (task) {\n                                                        return task.stats.fullyBlocked;\n                                                    }).length\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Failed\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.tasks.filter(function (task) {\n                                                        return task.taskStatus.state === \"FAILED\";\n                                                    }).length\n                                                )\n                                            ),\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title\" },\n                                                    \"Total\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-text\" },\n                                                    stage.tasks.length\n                                                )\n                                            )\n                                        )\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"td\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"stage-table histogram-table\" },\n                                        _react2.default.createElement(\n                                            \"thead\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"th\",\n                                                    { className: \"stage-table-stat-title stage-table-chart-header\" },\n                                                    \"Scheduled Time Skew\"\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"histogram-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"histogram\", id: \"scheduled-time-histogram-\" + stageId },\n                                                        _react2.default.createElement(\"div\", { className: \"loader\" })\n                                                    )\n                                                )\n                                            )\n                                        )\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"td\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"stage-table histogram-table\" },\n                                        _react2.default.createElement(\n                                            \"thead\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"th\",\n                                                    { className: \"stage-table-stat-title stage-table-chart-header\" },\n                                                    \"CPU Time Skew\"\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"histogram-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"histogram\", id: \"cpu-time-histogram-\" + stageId },\n                                                        _react2.default.createElement(\"div\", { className: \"loader\" })\n                                                    )\n                                                )\n                                            )\n                                        )\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"td\",\n                                    { className: \"expand-charts-container\" },\n                                    _react2.default.createElement(\n                                        \"a\",\n                                        { onClick: this.toggleExpanded.bind(this), className: \"expand-charts-button\" },\n                                        _react2.default.createElement(\"span\", { className: \"glyphicon \" + this.getExpandedIcon(), style: _utils.GLYPHICON_HIGHLIGHT, \"data-toggle\": \"tooltip\", \"data-placement\": \"top\", title: \"More\" })\n                                    )\n                                )\n                            ),\n                            _react2.default.createElement(\n                                \"tr\",\n                                { style: this.getExpandedStyle() },\n                                _react2.default.createElement(\n                                    \"td\",\n                                    { colSpan: \"6\" },\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"expanded-chart\" },\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title expanded-chart-title\" },\n                                                    \"Task Scheduled Time\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"bar-chart-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"bar-chart\", id: \"scheduled-time-bar-chart-\" + stageId },\n                                                        _react2.default.createElement(\"div\", { className: \"loader\" })\n                                                    )\n                                                )\n                                            )\n                                        )\n                                    )\n                                )\n                            ),\n                            _react2.default.createElement(\n                                \"tr\",\n                                { style: this.getExpandedStyle() },\n                                _react2.default.createElement(\n                                    \"td\",\n                                    { colSpan: \"6\" },\n                                    _react2.default.createElement(\n                                        \"table\",\n                                        { className: \"expanded-chart\" },\n                                        _react2.default.createElement(\n                                            \"tbody\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"tr\",\n                                                null,\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"stage-table-stat-title expanded-chart-title\" },\n                                                    \"Task CPU Time\"\n                                                ),\n                                                _react2.default.createElement(\n                                                    \"td\",\n                                                    { className: \"bar-chart-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"bar-chart\", id: \"cpu-time-bar-chart-\" + stageId },\n                                                        _react2.default.createElement(\"div\", { className: \"loader\" })\n                                                    )\n                                                )\n                                            )\n                                        )\n                                    )\n                                )\n                            ),\n                            _react2.default.createElement(\n                                \"tr\",\n                                { style: this.getExpandedStyle() },\n                                _react2.default.createElement(\n                                    \"td\",\n                                    { colSpan: \"6\" },\n                                    this.renderTaskFilter()\n                                )\n                            ),\n                            _react2.default.createElement(\n                                \"tr\",\n                                { style: this.getExpandedStyle() },\n                                _react2.default.createElement(\n                                    \"td\",\n                                    { colSpan: \"6\" },\n                                    this.renderTaskList(taskRetriesEnabled)\n                                )\n                            )\n                        )\n                    )\n                )\n            );\n        }\n    }], [{\n        key: \"renderHistogram\",\n        value: function renderHistogram(histogramId, inputData, numberFormatter) {\n            var numBuckets = Math.min(HISTOGRAM_WIDTH, Math.sqrt(inputData.length));\n            var dataMin = Math.min.apply(null, inputData);\n            var dataMax = Math.max.apply(null, inputData);\n            var bucketSize = (dataMax - dataMin) / numBuckets;\n\n            var histogramData = [];\n            if (bucketSize === 0) {\n                histogramData = [inputData.length];\n            } else {\n                for (var i = 0; i < numBuckets + 1; i++) {\n                    histogramData.push(0);\n                }\n\n                for (var _i in inputData) {\n                    var dataPoint = inputData[_i];\n                    var bucket = Math.floor((dataPoint - dataMin) / bucketSize);\n                    histogramData[bucket] = histogramData[bucket] + 1;\n                }\n            }\n\n            var tooltipValueLookups = { 'offset': {} };\n            for (var _i2 = 0; _i2 < histogramData.length; _i2++) {\n                tooltipValueLookups['offset'][_i2] = numberFormatter(dataMin + _i2 * bucketSize) + \"-\" + numberFormatter(dataMin + (_i2 + 1) * bucketSize);\n            }\n\n            var stageHistogramProperties = $.extend({}, HISTOGRAM_PROPERTIES, { barWidth: HISTOGRAM_WIDTH / histogramData.length, tooltipValueLookups: tooltipValueLookups });\n            $(histogramId).sparkline(histogramData, stageHistogramProperties);\n        }\n    }]);\n\n    return StageSummary;\n}(_react2.default.Component);\n\nvar StageList = function (_React$Component3) {\n    _inherits(StageList, _React$Component3);\n\n    function StageList() {\n        _classCallCheck(this, StageList);\n\n        return _possibleConstructorReturn(this, (StageList.__proto__ || Object.getPrototypeOf(StageList)).apply(this, arguments));\n    }\n\n    _createClass(StageList, [{\n        key: \"getStages\",\n        value: function getStages(stage) {\n            if (stage === undefined || !stage.hasOwnProperty('subStages')) {\n                return [];\n            }\n\n            return [].concat.apply(stage, stage.subStages.map(this.getStages, this));\n        }\n    }, {\n        key: \"render\",\n        value: function render() {\n            var stages = this.getStages(this.props.outputStage);\n            var taskRetriesEnabled = this.props.taskRetriesEnabled;\n\n            if (stages === undefined || stages.length === 0) {\n                return _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        \"No stage information available.\"\n                    )\n                );\n            }\n\n            var renderedStages = stages.map(function (stage) {\n                return _react2.default.createElement(StageSummary, { key: stage.stageId, stage: stage, taskRetriesEnabled: taskRetriesEnabled });\n            });\n\n            return _react2.default.createElement(\n                \"div\",\n                { className: \"row\" },\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"col-xs-12\" },\n                    _react2.default.createElement(\n                        \"table\",\n                        { className: \"table\", id: \"stage-list\" },\n                        _react2.default.createElement(\n                            \"tbody\",\n                            null,\n                            renderedStages\n                        )\n                    )\n                )\n            );\n        }\n    }]);\n\n    return StageList;\n}(_react2.default.Component);\n\nvar SMALL_SPARKLINE_PROPERTIES = {\n    width: '100%',\n    height: '57px',\n    fillColor: '#3F4552',\n    lineColor: '#747F96',\n    spotColor: '#1EDCFF',\n    tooltipClassname: 'sparkline-tooltip',\n    disableHiddenCheck: true\n};\n\nvar TASK_FILTER = {\n    ALL: function ALL() {\n        return true;\n    },\n    PLANNED: function PLANNED(state) {\n        return state === 'PLANNED';\n    },\n    RUNNING: function RUNNING(state) {\n        return state === 'RUNNING';\n    },\n    FINISHED: function FINISHED(state) {\n        return state === 'FINISHED';\n    },\n    FAILED: function FAILED(state) {\n        return state === 'FAILED' || state === 'ABORTED' || state === 'CANCELED';\n    }\n};\n\nvar QueryDetail = exports.QueryDetail = function (_React$Component4) {\n    _inherits(QueryDetail, _React$Component4);\n\n    function QueryDetail(props) {\n        _classCallCheck(this, QueryDetail);\n\n        var _this5 = _possibleConstructorReturn(this, (QueryDetail.__proto__ || Object.getPrototypeOf(QueryDetail)).call(this, props));\n\n        _this5.state = {\n            query: null,\n            lastSnapshotStages: null,\n            lastSnapshotTasks: null,\n\n            lastScheduledTime: 0,\n            lastCpuTime: 0,\n            lastRowInput: 0,\n            lastByteInput: 0,\n            lastPhysicalInput: 0,\n            lastPhysicalTime: 0,\n\n            scheduledTimeRate: [],\n            cpuTimeRate: [],\n            rowInputRate: [],\n            byteInputRate: [],\n            physicalInputRate: [],\n\n            reservedMemory: [],\n\n            initialized: false,\n            queryEnded: false,\n            renderingEnded: false,\n\n            lastRefresh: null,\n            lastRender: null,\n\n            stageRefresh: true,\n            taskRefresh: true,\n\n            taskFilter: TASK_FILTER.ALL\n        };\n\n        _this5.refreshLoop = _this5.refreshLoop.bind(_this5);\n        return _this5;\n    }\n\n    _createClass(QueryDetail, [{\n        key: \"resetTimer\",\n        value: function resetTimer() {\n            clearTimeout(this.timeoutId);\n            // stop refreshing when query finishes or fails\n            if (this.state.query === null || !this.state.queryEnded) {\n                // task.info-update-interval is set to 3 seconds by default\n                this.timeoutId = setTimeout(this.refreshLoop, 3000);\n            }\n        }\n    }, {\n        key: \"refreshLoop\",\n        value: function refreshLoop() {\n            var _this6 = this;\n\n            clearTimeout(this.timeoutId); // to stop multiple series of refreshLoop from going on simultaneously\n            var queryId = (0, _utils.getFirstParameter)(window.location.search);\n            $.get('/ui/api/query/' + queryId, function (query) {\n                var lastSnapshotStages = this.state.lastSnapshotStage;\n                if (this.state.stageRefresh) {\n                    lastSnapshotStages = query.outputStage;\n                }\n                var lastSnapshotTasks = this.state.lastSnapshotTasks;\n                if (this.state.taskRefresh) {\n                    lastSnapshotTasks = query.outputStage;\n                }\n\n                var lastRefresh = this.state.lastRefresh;\n                var lastScheduledTime = this.state.lastScheduledTime;\n                var lastCpuTime = this.state.lastCpuTime;\n                var lastRowInput = this.state.lastRowInput;\n                var lastByteInput = this.state.lastByteInput;\n                var lastPhysicalInput = this.state.lastPhysicalInput;\n                var lastPhysicalTime = this.state.lastPhysicalTime;\n                var alreadyEnded = this.state.queryEnded;\n                var nowMillis = Date.now();\n\n                this.setState({\n                    query: query,\n                    lastSnapshotStage: lastSnapshotStages,\n                    lastSnapshotTasks: lastSnapshotTasks,\n\n                    lastPhysicalTime: (0, _utils.parseDuration)(query.queryStats.physicalInputReadTime),\n                    lastScheduledTime: (0, _utils.parseDuration)(query.queryStats.totalScheduledTime),\n                    lastCpuTime: (0, _utils.parseDuration)(query.queryStats.totalCpuTime),\n                    lastRowInput: query.queryStats.processedInputPositions,\n                    lastByteInput: (0, _utils.parseDataSize)(query.queryStats.processedInputDataSize),\n                    lastPhysicalInput: (0, _utils.parseDataSize)(query.queryStats.physicalInputDataSize),\n\n                    initialized: true,\n                    queryEnded: !!query.finalQueryInfo,\n\n                    lastRefresh: nowMillis\n                });\n\n                // i.e. don't show sparklines if we've already decided not to update or if we don't have one previous measurement\n                if (alreadyEnded || lastRefresh === null && query.state === \"RUNNING\") {\n                    this.resetTimer();\n                    return;\n                }\n\n                if (lastRefresh === null) {\n                    lastRefresh = nowMillis - (0, _utils.parseDuration)(query.queryStats.elapsedTime);\n                }\n\n                var elapsedSecsSinceLastRefresh = (nowMillis - lastRefresh) / 1000.0;\n                if (elapsedSecsSinceLastRefresh >= 0) {\n                    var currentScheduledTimeRate = ((0, _utils.parseDuration)(query.queryStats.totalScheduledTime) - lastScheduledTime) / (elapsedSecsSinceLastRefresh * 1000);\n                    var currentCpuTimeRate = ((0, _utils.parseDuration)(query.queryStats.totalCpuTime) - lastCpuTime) / (elapsedSecsSinceLastRefresh * 1000);\n                    var currentPhysicalReadTime = ((0, _utils.parseDuration)(query.queryStats.physicalInputReadTime) - lastPhysicalTime) / 1000;\n                    var currentRowInputRate = (query.queryStats.processedInputPositions - lastRowInput) / elapsedSecsSinceLastRefresh;\n                    var currentByteInputRate = ((0, _utils.parseDataSize)(query.queryStats.processedInputDataSize) - lastByteInput) / elapsedSecsSinceLastRefresh;\n                    var currentPhysicalInputRate = currentPhysicalReadTime > 0 ? ((0, _utils.parseDataSize)(query.queryStats.physicalInputDataSize) - lastPhysicalInput) / currentPhysicalReadTime : 0;\n\n                    this.setState({\n                        scheduledTimeRate: (0, _utils.addToHistory)(currentScheduledTimeRate, this.state.scheduledTimeRate),\n                        cpuTimeRate: (0, _utils.addToHistory)(currentCpuTimeRate, this.state.cpuTimeRate),\n                        rowInputRate: (0, _utils.addToHistory)(currentRowInputRate, this.state.rowInputRate),\n                        byteInputRate: (0, _utils.addToHistory)(currentByteInputRate, this.state.byteInputRate),\n                        reservedMemory: (0, _utils.addToHistory)((0, _utils.parseDataSize)(query.queryStats.totalMemoryReservation), this.state.reservedMemory),\n                        physicalInputRate: (0, _utils.addToHistory)(currentPhysicalInputRate, this.state.physicalInputRate)\n                    });\n                }\n                this.resetTimer();\n            }.bind(this)).fail(function () {\n                _this6.setState({\n                    initialized: true\n                });\n                _this6.resetTimer();\n            });\n        }\n    }, {\n        key: \"handleStageRefreshClick\",\n        value: function handleStageRefreshClick() {\n            if (this.state.stageRefresh) {\n                this.setState({\n                    stageRefresh: false,\n                    lastSnapshotStages: this.state.query.outputStage\n                });\n            } else {\n                this.setState({\n                    stageRefresh: true\n                });\n            }\n        }\n    }, {\n        key: \"renderStageRefreshButton\",\n        value: function renderStageRefreshButton() {\n            if (this.state.stageRefresh) {\n                return _react2.default.createElement(\n                    \"button\",\n                    { className: \"btn btn-info live-button\", onClick: this.handleStageRefreshClick.bind(this) },\n                    \"Auto-Refresh: On\"\n                );\n            } else {\n                return _react2.default.createElement(\n                    \"button\",\n                    { className: \"btn btn-info live-button\", onClick: this.handleStageRefreshClick.bind(this) },\n                    \"Auto-Refresh: Off\"\n                );\n            }\n        }\n    }, {\n        key: \"componentDidMount\",\n        value: function componentDidMount() {\n            this.refreshLoop();\n        }\n    }, {\n        key: \"componentDidUpdate\",\n        value: function componentDidUpdate() {\n            // prevent multiple calls to componentDidUpdate (resulting from calls to setState or otherwise) within the refresh interval from re-rendering sparklines/charts\n            if (this.state.lastRender === null || Date.now() - this.state.lastRender >= 1000 || this.state.ended && !this.state.renderingEnded) {\n                var renderTimestamp = Date.now();\n                $('#scheduled-time-rate-sparkline').sparkline(this.state.scheduledTimeRate, $.extend({}, SMALL_SPARKLINE_PROPERTIES, {\n                    chartRangeMin: 0,\n                    numberFormatter: _utils.precisionRound\n                }));\n                $('#cpu-time-rate-sparkline').sparkline(this.state.cpuTimeRate, $.extend({}, SMALL_SPARKLINE_PROPERTIES, { chartRangeMin: 0, numberFormatter: _utils.precisionRound }));\n                $('#row-input-rate-sparkline').sparkline(this.state.rowInputRate, $.extend({}, SMALL_SPARKLINE_PROPERTIES, { numberFormatter: _utils.formatCount }));\n                $('#byte-input-rate-sparkline').sparkline(this.state.byteInputRate, $.extend({}, SMALL_SPARKLINE_PROPERTIES, { numberFormatter: _utils.formatDataSize }));\n                $('#reserved-memory-sparkline').sparkline(this.state.reservedMemory, $.extend({}, SMALL_SPARKLINE_PROPERTIES, { numberFormatter: _utils.formatDataSize }));\n                $('#physical-input-rate-sparkline').sparkline(this.state.physicalInputRate, $.extend({}, SMALL_SPARKLINE_PROPERTIES, { numberFormatter: _utils.formatDataSize }));\n\n                if (this.state.lastRender === null) {\n                    $('#query').each(function (i, block) {\n                        hljs.highlightBlock(block);\n                    });\n\n                    $('#prepared-query').each(function (i, block) {\n                        hljs.highlightBlock(block);\n                    });\n                }\n\n                this.setState({\n                    renderingEnded: this.state.ended,\n                    lastRender: renderTimestamp\n                });\n            }\n\n            $('[data-toggle=\"tooltip\"]').tooltip();\n            new window.ClipboardJS('.copy-button');\n        }\n    }, {\n        key: \"renderStages\",\n        value: function renderStages(taskRetriesEnabled) {\n            if (this.state.lastSnapshotStage === null) {\n                return;\n            }\n\n            return _react2.default.createElement(\n                \"div\",\n                null,\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-9\" },\n                        _react2.default.createElement(\n                            \"h3\",\n                            null,\n                            \"Stages\"\n                        )\n                    ),\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-3\" },\n                        _react2.default.createElement(\n                            \"table\",\n                            { className: \"header-inline-links\" },\n                            _react2.default.createElement(\n                                \"tbody\",\n                                null,\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        null,\n                                        this.renderStageRefreshButton()\n                                    )\n                                )\n                            )\n                        )\n                    )\n                ),\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(StageList, { key: this.state.query.queryId, outputStage: this.state.lastSnapshotStage, taskRetriesEnabled: taskRetriesEnabled })\n                    )\n                )\n            );\n        }\n    }, {\n        key: \"renderPreparedQuery\",\n        value: function renderPreparedQuery() {\n            var query = this.state.query;\n            if (!query.hasOwnProperty('preparedQuery') || query.preparedQuery === null) {\n                return;\n            }\n\n            return _react2.default.createElement(\n                \"div\",\n                { className: \"col-xs-12\" },\n                _react2.default.createElement(\n                    \"h3\",\n                    null,\n                    \"Prepared Query\",\n                    _react2.default.createElement(\n                        \"a\",\n                        { className: \"btn copy-button\", \"data-clipboard-target\": \"#prepared-query-text\", \"data-toggle\": \"tooltip\", \"data-placement\": \"right\", title: \"Copy to clipboard\" },\n                        _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-copy\", \"aria-hidden\": \"true\", alt: \"Copy to clipboard\" })\n                    )\n                ),\n                _react2.default.createElement(\n                    \"pre\",\n                    { id: \"prepared-query\" },\n                    _react2.default.createElement(\n                        \"code\",\n                        { className: \"lang-sql\", id: \"prepared-query-text\" },\n                        query.preparedQuery\n                    )\n                )\n            );\n        }\n    }, {\n        key: \"renderSessionProperties\",\n        value: function renderSessionProperties() {\n            var query = this.state.query;\n\n            var properties = [];\n            for (var property in query.session.systemProperties) {\n                if (query.session.systemProperties.hasOwnProperty(property)) {\n                    properties.push(_react2.default.createElement(\n                        \"span\",\n                        null,\n                        \"- \",\n                        property + \"=\" + query.session.systemProperties[property],\n                        \" \",\n                        _react2.default.createElement(\"br\", null)\n                    ));\n                }\n            }\n\n            for (var catalog in query.session.catalogProperties) {\n                if (query.session.catalogProperties.hasOwnProperty(catalog)) {\n                    for (var _property in query.session.catalogProperties[catalog]) {\n                        if (query.session.catalogProperties[catalog].hasOwnProperty(_property)) {\n                            properties.push(_react2.default.createElement(\n                                \"span\",\n                                null,\n                                \"- \",\n                                catalog + \".\" + _property + \"=\" + query.session.catalogProperties[catalog][_property],\n                                \" \",\n                                _react2.default.createElement(\"br\", null)\n                            ));\n                        }\n                    }\n                }\n            }\n\n            return properties;\n        }\n    }, {\n        key: \"renderResourceEstimates\",\n        value: function renderResourceEstimates() {\n            var query = this.state.query;\n            var estimates = query.session.resourceEstimates;\n            var renderedEstimates = [];\n\n            for (var resource in estimates) {\n                if (estimates.hasOwnProperty(resource)) {\n                    var upperChars = resource.match(/([A-Z])/g) || [];\n                    var snakeCased = resource;\n                    for (var i = 0, n = upperChars.length; i < n; i++) {\n                        snakeCased = snakeCased.replace(new RegExp(upperChars[i]), '_' + upperChars[i].toLowerCase());\n                    }\n\n                    renderedEstimates.push(_react2.default.createElement(\n                        \"span\",\n                        null,\n                        \"- \",\n                        snakeCased + \"=\" + query.session.resourceEstimates[resource],\n                        \" \",\n                        _react2.default.createElement(\"br\", null)\n                    ));\n                }\n            }\n\n            return renderedEstimates;\n        }\n    }, {\n        key: \"renderWarningInfo\",\n        value: function renderWarningInfo() {\n            var query = this.state.query;\n            if (query.warnings.length > 0) {\n                return _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(\n                            \"h3\",\n                            null,\n                            \"Warnings\"\n                        ),\n                        _react2.default.createElement(\"hr\", { className: \"h3-hr\" }),\n                        _react2.default.createElement(\n                            \"table\",\n                            { className: \"table\", id: \"warnings-table\" },\n                            query.warnings.map(function (warning) {\n                                return _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        null,\n                                        warning.warningCode.name\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        null,\n                                        warning.message\n                                    )\n                                );\n                            })\n                        )\n                    )\n                );\n            } else {\n                return null;\n            }\n        }\n    }, {\n        key: \"renderFailureInfo\",\n        value: function renderFailureInfo() {\n            var query = this.state.query;\n            if (query.failureInfo) {\n                return _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(\n                            \"h3\",\n                            null,\n                            \"Error Information\"\n                        ),\n                        _react2.default.createElement(\"hr\", { className: \"h3-hr\" }),\n                        _react2.default.createElement(\n                            \"table\",\n                            { className: \"table\" },\n                            _react2.default.createElement(\n                                \"tbody\",\n                                null,\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Error Type\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.errorType\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Error Code\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.errorCode.name + \" (\" + this.state.query.errorCode.code + \")\"\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Stack Trace\",\n                                        _react2.default.createElement(\n                                            \"a\",\n                                            { className: \"btn copy-button\", \"data-clipboard-target\": \"#stack-trace\", \"data-toggle\": \"tooltip\", \"data-placement\": \"right\", title: \"Copy to clipboard\" },\n                                            _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-copy\", \"aria-hidden\": \"true\", alt: \"Copy to clipboard\" })\n                                        )\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        _react2.default.createElement(\n                                            \"pre\",\n                                            { id: \"stack-trace\" },\n                                            QueryDetail.formatStackTrace(query.failureInfo)\n                                        )\n                                    )\n                                )\n                            )\n                        )\n                    )\n                );\n            } else {\n                return \"\";\n            }\n        }\n    }, {\n        key: \"render\",\n        value: function render() {\n            var query = this.state.query;\n            if (query === null || this.state.initialized === false) {\n                var label = _react2.default.createElement(\n                    \"div\",\n                    { className: \"loader\" },\n                    \"Loading...\"\n                );\n                if (this.state.initialized) {\n                    label = \"Query not found\";\n                }\n                return _react2.default.createElement(\n                    \"div\",\n                    { className: \"row error-message\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(\n                            \"h4\",\n                            null,\n                            label\n                        )\n                    )\n                );\n            }\n\n            var taskRetriesEnabled = query.retryPolicy == \"TASK\";\n\n            return _react2.default.createElement(\n                \"div\",\n                null,\n                _react2.default.createElement(_QueryHeader.QueryHeader, { query: query }),\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-6\" },\n                        _react2.default.createElement(\n                            \"h3\",\n                            null,\n                            \"Session\"\n                        ),\n                        _react2.default.createElement(\"hr\", { className: \"h3-hr\" }),\n                        _react2.default.createElement(\n                            \"table\",\n                            { className: \"table\" },\n                            _react2.default.createElement(\n                                \"tbody\",\n                                null,\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"User\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text wrap-text\" },\n                                        _react2.default.createElement(\n                                            \"span\",\n                                            { id: \"query-user\" },\n                                            query.session.user\n                                        ),\n                                        \"\\xA0\\xA0\",\n                                        _react2.default.createElement(\n                                            \"a\",\n                                            { href: \"#\", className: \"copy-button\", \"data-clipboard-target\": \"#query-user\", \"data-toggle\": \"tooltip\", \"data-placement\": \"right\", title: \"Copy to clipboard\" },\n                                            _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-copy\", \"aria-hidden\": \"true\", alt: \"Copy to clipboard\" })\n                                        )\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Principal\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text wrap-text\" },\n                                        query.session.principal\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Source\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text wrap-text\" },\n                                        query.session.source\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Catalog\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.session.catalog\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Schema\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.session.schema\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Time zone\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.session.timeZone\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Client Address\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.session.remoteUserAddress\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Client Tags\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.session.clientTags.join(\", \")\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Session Properties\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text wrap-text\" },\n                                        this.renderSessionProperties()\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Resource Estimates\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text wrap-text\" },\n                                        this.renderResourceEstimates()\n                                    )\n                                )\n                            )\n                        )\n                    ),\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-6\" },\n                        _react2.default.createElement(\n                            \"h3\",\n                            null,\n                            \"Execution\"\n                        ),\n                        _react2.default.createElement(\"hr\", { className: \"h3-hr\" }),\n                        _react2.default.createElement(\n                            \"table\",\n                            { className: \"table\" },\n                            _react2.default.createElement(\n                                \"tbody\",\n                                null,\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Resource Group\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text wrap-text\" },\n                                        query.resourceGroupId ? query.resourceGroupId.join(\".\") : \"n/a\"\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Submission Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        (0, _utils.formatShortDateTime)(new Date(query.queryStats.createTime))\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Completion Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.queryStats.endTime ? (0, _utils.formatShortDateTime)(new Date(query.queryStats.endTime)) : \"\"\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Elapsed Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.queryStats.elapsedTime\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Queued Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.queryStats.queuedTime\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Analysis Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.queryStats.analysisTime\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Planning Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.queryStats.planningTime\n                                    )\n                                ),\n                                _react2.default.createElement(\n                                    \"tr\",\n                                    null,\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-title\" },\n                                        \"Execution Time\"\n                                    ),\n                                    _react2.default.createElement(\n                                        \"td\",\n                                        { className: \"info-text\" },\n                                        query.queryStats.executionTime\n                                    )\n                                )\n                            )\n                        )\n                    )\n                ),\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(\n                            \"div\",\n                            { className: \"row\" },\n                            _react2.default.createElement(\n                                \"div\",\n                                { className: \"col-xs-6\" },\n                                _react2.default.createElement(\n                                    \"h3\",\n                                    null,\n                                    \"Resource Utilization Summary\"\n                                ),\n                                _react2.default.createElement(\"hr\", { className: \"h3-hr\" }),\n                                _react2.default.createElement(\n                                    \"table\",\n                                    { className: \"table\" },\n                                    _react2.default.createElement(\n                                        \"tbody\",\n                                        null,\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"CPU Time\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                query.queryStats.totalCpuTime\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                query.queryStats.failedCpuTime\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Planning CPU Time\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                query.queryStats.planningCpuTime\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Scheduled Time\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                query.queryStats.totalScheduledTime\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                query.queryStats.failedScheduledTime\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Input Rows\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.formatCount)(query.queryStats.processedInputPositions)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                query.queryStats.failedProcessedInputPositions\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Input Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.processedInputDataSize)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                query.queryStats.failedProcessedInputDataSize\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Physical Input Rows\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.formatCount)(query.queryStats.physicalInputPositions)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.formatCount)(query.queryStats.failedPhysicalInputPositions)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Physical Input Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.physicalInputDataSize)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.failedPhysicalInputDataSize)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Physical Input Read Time\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                query.queryStats.physicalInputReadTime\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                query.queryStats.failedPhysicalInputReadTime\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Internal Network Rows\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.formatCount)(query.queryStats.internalNetworkInputPositions)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.formatCount)(query.queryStats.failedInternalNetworkInputPositions)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Internal Network Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.internalNetworkInputDataSize)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.failedInternalNetworkInputDataSize)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Peak User Memory\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.peakUserMemoryReservation)\n                                            )\n                                        ),\n                                        (0, _utils.parseDataSize)(query.queryStats.peakRevocableMemoryReservation) > 0 && _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Peak Revocable Memory\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.peakRevocableMemoryReservation)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Peak Total Memory\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.peakTotalMemoryReservation)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Cumulative User Memory\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.formatDataSize)(query.queryStats.cumulativeUserMemory / 1000.0) + \"*seconds\"\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.formatDataSize)(query.queryStats.failedCumulativeUserMemory / 1000.0) + \"*seconds\"\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Output Rows\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.formatCount)(query.queryStats.outputPositions)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.formatCount)(query.queryStats.failedOutputPositions)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Output Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.outputDataSize)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.failedOutputDataSize)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Written Rows\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.formatCount)(query.queryStats.writtenPositions)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Logical Written Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.logicalWrittenDataSize)\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Physical Written Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.physicalWrittenDataSize)\n                                            ),\n                                            taskRetriesEnabled && _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-failed\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.failedPhysicalWrittenDataSize)\n                                            )\n                                        ),\n                                        (0, _utils.parseDataSize)(query.queryStats.spilledDataSize) > 0 && _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Spilled Data\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-text\" },\n                                                (0, _utils.parseAndFormatDataSize)(query.queryStats.spilledDataSize)\n                                            )\n                                        )\n                                    )\n                                )\n                            ),\n                            _react2.default.createElement(\n                                \"div\",\n                                { className: \"col-xs-6\" },\n                                _react2.default.createElement(\n                                    \"h3\",\n                                    null,\n                                    \"Timeline\"\n                                ),\n                                _react2.default.createElement(\"hr\", { className: \"h3-hr\" }),\n                                _react2.default.createElement(\n                                    \"table\",\n                                    { className: \"table\" },\n                                    _react2.default.createElement(\n                                        \"tbody\",\n                                        null,\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Parallelism\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { rowSpan: \"2\" },\n                                                _react2.default.createElement(\n                                                    \"div\",\n                                                    { className: \"query-stats-sparkline-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"sparkline\", id: \"cpu-time-rate-sparkline\" },\n                                                        _react2.default.createElement(\n                                                            \"div\",\n                                                            { className: \"loader\" },\n                                                            \"Loading ...\"\n                                                        )\n                                                    )\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            { className: \"tr-noborder\" },\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-sparkline-text\" },\n                                                (0, _utils.formatCount)(this.state.cpuTimeRate[this.state.cpuTimeRate.length - 1])\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Scheduled Time/s\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { rowSpan: \"2\" },\n                                                _react2.default.createElement(\n                                                    \"div\",\n                                                    { className: \"query-stats-sparkline-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"sparkline\", id: \"scheduled-time-rate-sparkline\" },\n                                                        _react2.default.createElement(\n                                                            \"div\",\n                                                            { className: \"loader\" },\n                                                            \"Loading ...\"\n                                                        )\n                                                    )\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            { className: \"tr-noborder\" },\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-sparkline-text\" },\n                                                (0, _utils.formatCount)(this.state.scheduledTimeRate[this.state.scheduledTimeRate.length - 1])\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Input Rows/s\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { rowSpan: \"2\" },\n                                                _react2.default.createElement(\n                                                    \"div\",\n                                                    { className: \"query-stats-sparkline-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"sparkline\", id: \"row-input-rate-sparkline\" },\n                                                        _react2.default.createElement(\n                                                            \"div\",\n                                                            { className: \"loader\" },\n                                                            \"Loading ...\"\n                                                        )\n                                                    )\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            { className: \"tr-noborder\" },\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-sparkline-text\" },\n                                                (0, _utils.formatCount)(this.state.rowInputRate[this.state.rowInputRate.length - 1])\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Input Bytes/s\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { rowSpan: \"2\" },\n                                                _react2.default.createElement(\n                                                    \"div\",\n                                                    { className: \"query-stats-sparkline-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"sparkline\", id: \"byte-input-rate-sparkline\" },\n                                                        _react2.default.createElement(\n                                                            \"div\",\n                                                            { className: \"loader\" },\n                                                            \"Loading ...\"\n                                                        )\n                                                    )\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            { className: \"tr-noborder\" },\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-sparkline-text\" },\n                                                (0, _utils.formatDataSize)(this.state.byteInputRate[this.state.byteInputRate.length - 1])\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Physical Input Bytes/s\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { rowSpan: \"2\" },\n                                                _react2.default.createElement(\n                                                    \"div\",\n                                                    { className: \"query-stats-sparkline-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"sparkline\", id: \"physical-input-rate-sparkline\" },\n                                                        _react2.default.createElement(\n                                                            \"div\",\n                                                            { className: \"loader\" },\n                                                            \"Loading ...\"\n                                                        )\n                                                    )\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            { className: \"tr-noborder\" },\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-sparkline-text\" },\n                                                (0, _utils.formatDataSize)(this.state.physicalInputRate[this.state.physicalInputRate.length - 1])\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            null,\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-title\" },\n                                                \"Memory Utilization\"\n                                            ),\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { rowSpan: \"2\" },\n                                                _react2.default.createElement(\n                                                    \"div\",\n                                                    { className: \"query-stats-sparkline-container\" },\n                                                    _react2.default.createElement(\n                                                        \"span\",\n                                                        { className: \"sparkline\", id: \"reserved-memory-sparkline\" },\n                                                        _react2.default.createElement(\n                                                            \"div\",\n                                                            { className: \"loader\" },\n                                                            \"Loading ...\"\n                                                        )\n                                                    )\n                                                )\n                                            )\n                                        ),\n                                        _react2.default.createElement(\n                                            \"tr\",\n                                            { className: \"tr-noborder\" },\n                                            _react2.default.createElement(\n                                                \"td\",\n                                                { className: \"info-sparkline-text\" },\n                                                (0, _utils.formatDataSize)(this.state.reservedMemory[this.state.reservedMemory.length - 1])\n                                            )\n                                        )\n                                    )\n                                )\n                            )\n                        )\n                    )\n                ),\n                this.renderWarningInfo(),\n                this.renderFailureInfo(),\n                _react2.default.createElement(\n                    \"div\",\n                    { className: \"row\" },\n                    _react2.default.createElement(\n                        \"div\",\n                        { className: \"col-xs-12\" },\n                        _react2.default.createElement(\n                            \"h3\",\n                            null,\n                            \"Query\",\n                            _react2.default.createElement(\n                                \"a\",\n                                { className: \"btn copy-button\", \"data-clipboard-target\": \"#query-text\", \"data-toggle\": \"tooltip\", \"data-placement\": \"right\", title: \"Copy to clipboard\" },\n                                _react2.default.createElement(\"span\", { className: \"glyphicon glyphicon-copy\", \"aria-hidden\": \"true\", alt: \"Copy to clipboard\" })\n                            )\n                        ),\n                        _react2.default.createElement(\n                            \"pre\",\n                            { id: \"query\" },\n                            _react2.default.createElement(\n                                \"code\",\n                                { className: \"lang-sql\", id: \"query-text\" },\n                                query.query\n                            )\n                        )\n                    ),\n                    this.renderPreparedQuery()\n                ),\n                this.renderStages(taskRetriesEnabled)\n            );\n        }\n    }], [{\n        key: \"formatStackTrace\",\n        value: function formatStackTrace(info) {\n            return QueryDetail.formatStackTraceHelper(info, [], \"\", \"\");\n        }\n    }, {\n        key: \"formatStackTraceHelper\",\n        value: function formatStackTraceHelper(info, parentStack, prefix, linePrefix) {\n            var s = linePrefix + prefix + QueryDetail.failureInfoToString(info) + \"\\n\";\n\n            if (info.stack) {\n                var sharedStackFrames = 0;\n                if (parentStack !== null) {\n                    sharedStackFrames = QueryDetail.countSharedStackFrames(info.stack, parentStack);\n                }\n\n                for (var i = 0; i < info.stack.length - sharedStackFrames; i++) {\n                    s += linePrefix + \"\\tat \" + info.stack[i] + \"\\n\";\n                }\n                if (sharedStackFrames !== 0) {\n                    s += linePrefix + \"\\t... \" + sharedStackFrames + \" more\" + \"\\n\";\n                }\n            }\n\n            if (info.suppressed) {\n                for (var _i3 = 0; _i3 < info.suppressed.length; _i3++) {\n                    s += QueryDetail.formatStackTraceHelper(info.suppressed[_i3], info.stack, \"Suppressed: \", linePrefix + \"\\t\");\n                }\n            }\n\n            if (info.cause) {\n                s += QueryDetail.formatStackTraceHelper(info.cause, info.stack, \"Caused by: \", linePrefix);\n            }\n\n            return s;\n        }\n    }, {\n        key: \"countSharedStackFrames\",\n        value: function countSharedStackFrames(stack, parentStack) {\n            var n = 0;\n            var minStackLength = Math.min(stack.length, parentStack.length);\n            while (n < minStackLength && stack[stack.length - 1 - n] === parentStack[parentStack.length - 1 - n]) {\n                n++;\n            }\n            return n;\n        }\n    }, {\n        key: \"failureInfoToString\",\n        value: function failureInfoToString(t) {\n            return t.message !== null ? t.type + \": \" + t.message : t.type;\n        }\n    }]);\n\n    return QueryDetail;\n}(_react2.default.Component);\n\n//# sourceURL=webpack://trino-webui/./components/QueryDetail.jsx?");
 
 /***/ }),
 
diff --git a/core/trino-main/src/main/resources/webapp/src/components/QueryDetail.jsx b/core/trino-main/src/main/resources/webapp/src/components/QueryDetail.jsx
index 06da008385d6..4e9b7435f358 100644
--- a/core/trino-main/src/main/resources/webapp/src/components/QueryDetail.jsx
+++ b/core/trino-main/src/main/resources/webapp/src/components/QueryDetail.jsx
@@ -1367,6 +1367,14 @@ export class QueryDetail extends React.Component {
                                         </td>
                                         }
                                     </tr>
+                                    <tr>
+                                        <td className="info-title">
+                                            Planning CPU Time
+                                        </td>
+                                        <td className="info-text">
+                                            {query.queryStats.planningCpuTime}
+                                        </td>
+                                    </tr>
                                     <tr>
                                         <td className="info-title">
                                             Scheduled Time
diff --git a/core/trino-main/src/test/java/io/trino/TestHiddenColumns.java b/core/trino-main/src/test/java/io/trino/TestHiddenColumns.java
index e5e1619fe109..8e3555aa4f64 100644
--- a/core/trino-main/src/test/java/io/trino/TestHiddenColumns.java
+++ b/core/trino-main/src/test/java/io/trino/TestHiddenColumns.java
@@ -17,21 +17,24 @@
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.sql.query.QueryAssertions;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.testing.MaterializedResult.resultBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestHiddenColumns
 {
     private LocalQueryRunner runner;
     private QueryAssertions assertions;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         runner = LocalQueryRunner.create(TEST_SESSION);
@@ -39,7 +42,7 @@ public void setUp()
         assertions = new QueryAssertions(runner);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void destroy()
     {
         if (runner != null) {
diff --git a/core/trino-main/src/test/java/io/trino/TestPagesIndexPageSorter.java b/core/trino-main/src/test/java/io/trino/TestPagesIndexPageSorter.java
index 2ed2c3020ab9..04836e0ceef7 100644
--- a/core/trino-main/src/test/java/io/trino/TestPagesIndexPageSorter.java
+++ b/core/trino-main/src/test/java/io/trino/TestPagesIndexPageSorter.java
@@ -22,7 +22,7 @@
 import io.trino.spi.connector.SortOrder;
 import io.trino.spi.type.Type;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/core/trino-main/src/test/java/io/trino/TestSession.java b/core/trino-main/src/test/java/io/trino/TestSession.java
index 620a8730439f..bafb6b509132 100644
--- a/core/trino-main/src/test/java/io/trino/TestSession.java
+++ b/core/trino-main/src/test/java/io/trino/TestSession.java
@@ -13,7 +13,7 @@
  */
 package io.trino;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/block/AbstractTestBlock.java b/core/trino-main/src/test/java/io/trino/block/AbstractTestBlock.java
index 4669479c9de3..986a5fc8cca9 100644
--- a/core/trino-main/src/test/java/io/trino/block/AbstractTestBlock.java
+++ b/core/trino-main/src/test/java/io/trino/block/AbstractTestBlock.java
@@ -17,7 +17,6 @@
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
-import io.airlift.slice.Slices;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
@@ -25,13 +24,14 @@
 import io.trino.spi.block.DictionaryBlock;
 import io.trino.spi.block.DictionaryId;
 import io.trino.spi.block.MapHashTables;
-import io.trino.spi.block.SingleRowBlockWriter;
 import io.trino.spi.block.TestingBlockEncodingSerde;
-import org.testng.annotations.Test;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.type.Type;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
 import java.util.List;
@@ -56,7 +56,6 @@
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
-@Test
 public abstract class AbstractTestBlock
 {
     private static final BlockEncodingSerde BLOCK_ENCODING_SERDE = new TestingBlockEncodingSerde(TESTING_TYPE_MANAGER::getType);
@@ -85,6 +84,10 @@ protected <T> void assertBlock(Block block, T[] expectedValues)
                     .isInstanceOf(IllegalArgumentException.class)
                     .hasMessage("Invalid position %d in block with %d positions", block.getPositionCount(), block.getPositionCount());
         }
+
+        if (block instanceof ValueBlock valueBlock) {
+            assertBlockClassImplementation(valueBlock.getClass());
+        }
     }
 
     private void assertRetainedSize(Block block)
@@ -97,7 +100,7 @@ private void assertRetainedSize(Block block)
                     continue;
                 }
                 Class<?> type = field.getType();
-                if (type.isPrimitive()) {
+                if (type.isPrimitive() || Type.class.isAssignableFrom(type)) {
                     continue;
                 }
 
@@ -114,10 +117,10 @@ else if (type == BlockBuilderStatus.class) {
                         retainedSize += BlockBuilderStatus.INSTANCE_SIZE;
                     }
                 }
-                else if (type == BlockBuilder.class || type == Block.class) {
+                else if (Block.class.isAssignableFrom(type)) {
                     retainedSize += ((Block) field.get(block)).getRetainedSizeInBytes();
                 }
-                else if (type == BlockBuilder[].class || type == Block[].class) {
+                else if (type == Block[].class) {
                     Block[] blocks = (Block[]) field.get(block);
                     for (Block innerBlock : blocks) {
                         assertRetainedSize(innerBlock);
@@ -127,9 +130,6 @@ else if (type == BlockBuilder[].class || type == Block[].class) {
                 else if (type == SliceOutput.class) {
                     retainedSize += ((SliceOutput) field.get(block)).getRetainedSize();
                 }
-                else if (type == SingleRowBlockWriter.class) {
-                    retainedSize += SingleRowBlockWriter.INSTANCE_SIZE;
-                }
                 else if (type == int[].class) {
                     retainedSize += sizeOf((int[]) field.get(block));
                 }
@@ -152,11 +152,15 @@ else if (type == MapHashTables.class) {
                     retainedSize += ((MapHashTables) field.get(block)).getRetainedSizeInBytes();
                 }
                 else if (type == MethodHandle.class) {
-                    // MethodHandles are only used in MapBlock/MapBlockBuilder,
+                    // MethodHandles are only used in MapBlock
                     // and they are shared among blocks created by the same MapType.
                     // So we don't account for the memory held onto by MethodHandle instances.
                     // Otherwise, we will be counting it multiple times.
                 }
+                else if (field.getName().equals("fieldBlocksList")) {
+                    // RowBlockBuilder fieldBlockBuildersList is a simple wrapper around the
+                    // array already accounted for in the instance
+                }
                 else {
                     throw new IllegalArgumentException(format("Unknown type encountered: %s", type));
                 }
@@ -295,7 +299,13 @@ protected <T> void assertPositionValue(Block block, int position, T expectedValu
 
             if (isSliceAccessSupported()) {
                 assertEquals(block.getSliceLength(position), expectedSliceValue.length());
-                assertSlicePosition(block, position, expectedSliceValue);
+
+                int length = block.getSliceLength(position);
+                assertEquals(length, expectedSliceValue.length());
+
+                for (int offset = 0; offset < length - 3; offset++) {
+                    assertEquals(block.getSlice(position, offset, 3), expectedSliceValue.slice(offset, 3));
+                }
             }
 
             assertPositionEquals(block, position, expectedSliceValue);
@@ -326,35 +336,6 @@ else if (expectedValue instanceof long[][] expected) {
         }
     }
 
-    protected void assertSlicePosition(Block block, int position, Slice expectedSliceValue)
-    {
-        int length = block.getSliceLength(position);
-        assertEquals(length, expectedSliceValue.length());
-
-        Block expectedBlock = toSingeValuedBlock(expectedSliceValue);
-        for (int offset = 0; offset < length - 3; offset++) {
-            assertEquals(block.getSlice(position, offset, 3), expectedSliceValue.slice(offset, 3));
-            assertTrue(block.bytesEqual(position, offset, expectedSliceValue, offset, 3));
-            // if your tests fail here, please change your test to not use this value
-            assertFalse(block.bytesEqual(position, offset, Slices.utf8Slice("XXX"), 0, 3));
-
-            assertEquals(block.bytesCompare(position, offset, 3, expectedSliceValue, offset, 3), 0);
-            assertTrue(block.bytesCompare(position, offset, 3, expectedSliceValue, offset, 2) > 0);
-            Slice greaterSlice = createGreaterValue(expectedSliceValue, offset, 3);
-            assertTrue(block.bytesCompare(position, offset, 3, greaterSlice, 0, greaterSlice.length()) < 0);
-
-            assertTrue(block.equals(position, offset, expectedBlock, 0, offset, 3));
-            assertEquals(block.compareTo(position, offset, 3, expectedBlock, 0, offset, 3), 0);
-
-            BlockBuilder blockBuilder = VARBINARY.createBlockBuilder(null, 1);
-            block.writeBytesTo(position, offset, 3, blockBuilder);
-            blockBuilder.closeEntry();
-            Block segment = blockBuilder.build();
-
-            assertTrue(block.equals(position, offset, segment, 0, 0, 3));
-        }
-    }
-
     protected boolean isByteAccessSupported()
     {
         return true;
@@ -462,13 +443,11 @@ protected static void assertEstimatedDataSizeForStats(BlockBuilder blockBuilder,
         assertEquals(block.getPositionCount(), expectedSliceValues.length);
         for (int i = 0; i < block.getPositionCount(); i++) {
             int expectedSize = expectedSliceValues[i] == null ? 0 : expectedSliceValues[i].length();
-            assertEquals(blockBuilder.getEstimatedDataSizeForStats(i), expectedSize);
             assertEquals(block.getEstimatedDataSizeForStats(i), expectedSize);
         }
 
-        BlockBuilder nullValueBlockBuilder = blockBuilder.newBlockBuilderLike(null).appendNull();
-        assertEquals(nullValueBlockBuilder.getEstimatedDataSizeForStats(0), 0);
-        assertEquals(nullValueBlockBuilder.build().getEstimatedDataSizeForStats(0), 0);
+        Block nullValueBlock = blockBuilder.newBlockBuilderLike(null).appendNull().build();
+        assertEquals(nullValueBlock.getEstimatedDataSizeForStats(0), 0);
     }
 
     protected static void testCopyRegionCompactness(Block block)
@@ -501,4 +480,13 @@ protected static void testIncompactBlock(Block block)
         assertNotCompact(block);
         testCopyRegionCompactness(block);
     }
+
+    private void assertBlockClassImplementation(Class<? extends ValueBlock> clazz)
+    {
+        for (Method method : clazz.getMethods()) {
+            if (method.getReturnType() == ValueBlock.class && !method.isBridge()) {
+                throw new AssertionError(format("ValueBlock method %s should override return type to be %s", method, clazz.getSimpleName()));
+            }
+        }
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/block/BenchmarkMapCopy.java b/core/trino-main/src/test/java/io/trino/block/BenchmarkMapCopy.java
index e3372a74c9d0..9fb639b32cfc 100644
--- a/core/trino-main/src/test/java/io/trino/block/BenchmarkMapCopy.java
+++ b/core/trino-main/src/test/java/io/trino/block/BenchmarkMapCopy.java
@@ -15,7 +15,7 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.MapBlockBuilder;
 import io.trino.spi.type.MapType;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -72,8 +72,7 @@ public static class BenchmarkData
         private int mapSize;
 
         private Block dataBlock;
-        private BlockBuilder blockBuilder;
-        private BlockBuilderStatus status;
+        private MapBlockBuilder blockBuilder;
 
         @Setup
         public void setup()
@@ -81,12 +80,12 @@ public void setup()
             MapType mapType = mapType(VARCHAR, BIGINT);
             blockBuilder = mapType.createBlockBuilder(null, POSITIONS);
             for (int position = 0; position < POSITIONS; position++) {
-                BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-                for (int i = 0; i < mapSize; i++) {
-                    VARCHAR.writeString(entryBuilder, String.valueOf(ThreadLocalRandom.current().nextInt()));
-                    BIGINT.writeLong(entryBuilder, ThreadLocalRandom.current().nextInt());
-                }
-                blockBuilder.closeEntry();
+                blockBuilder.buildEntry((keyBuilder, valueBuilder) -> {
+                    for (int i = 0; i < mapSize; i++) {
+                        VARCHAR.writeString(keyBuilder, String.valueOf(ThreadLocalRandom.current().nextInt()));
+                        BIGINT.writeLong(valueBuilder, ThreadLocalRandom.current().nextInt());
+                    }
+                });
             }
 
             dataBlock = blockBuilder.build();
@@ -99,7 +98,7 @@ public Block getDataBlock()
 
         public BlockBuilder getBlockBuilder()
         {
-            return blockBuilder.newBlockBuilderLike(status);
+            return blockBuilder.newBlockBuilderLike(null);
         }
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/block/BenchmarkRowBlockBuilder.java b/core/trino-main/src/test/java/io/trino/block/BenchmarkRowBlockBuilder.java
index 41e3d88af528..e95bc62247ad 100644
--- a/core/trino-main/src/test/java/io/trino/block/BenchmarkRowBlockBuilder.java
+++ b/core/trino-main/src/test/java/io/trino/block/BenchmarkRowBlockBuilder.java
@@ -14,7 +14,6 @@
 package io.trino.block;
 
 import io.trino.spi.block.RowBlockBuilder;
-import io.trino.spi.block.SingleRowBlockWriter;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -53,12 +52,11 @@ public class BenchmarkRowBlockBuilder
     public void benchmarkBeginBlockEntry(BenchmarkData data, Blackhole blackhole)
     {
         for (int i = 0; i < data.rows; i++) {
-            SingleRowBlockWriter singleRowBlockWriter = data.getBlockBuilder().beginBlockEntry();
-            for (int fieldIndex = 0; fieldIndex < data.getTypes().size(); fieldIndex++) {
-                singleRowBlockWriter.writeLong(data.getRandom().nextLong()).closeEntry();
-            }
-            blackhole.consume(singleRowBlockWriter);
-            data.getBlockBuilder().closeEntry();
+            data.getBlockBuilder().buildEntry(fieldBuilders -> {
+                for (int fieldIndex = 0; fieldIndex < data.getTypes().size(); fieldIndex++) {
+                    BIGINT.writeLong(fieldBuilders.get(fieldIndex), data.getRandom().nextLong());
+                }
+            });
         }
         blackhole.consume(data.getBlockBuilder());
     }
diff --git a/core/trino-main/src/test/java/io/trino/block/BlockAssertions.java b/core/trino-main/src/test/java/io/trino/block/BlockAssertions.java
index 98d1f1f5591d..b6cffe297354 100644
--- a/core/trino-main/src/test/java/io/trino/block/BlockAssertions.java
+++ b/core/trino-main/src/test/java/io/trino/block/BlockAssertions.java
@@ -22,6 +22,7 @@
 import io.trino.spi.block.RowBlock;
 import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
@@ -77,7 +78,7 @@
 import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public final class BlockAssertions
 {
@@ -89,7 +90,9 @@ private BlockAssertions() {}
 
     public static Object getOnlyValue(Type type, Block block)
     {
-        assertEquals(block.getPositionCount(), 1, "Block positions");
+        assertThat(block.getPositionCount())
+                .describedAs("Block positions")
+                .isEqualTo(1);
         return type.getObjectValue(SESSION, block, 0);
     }
 
@@ -115,9 +118,11 @@ public static List<Object> toValues(Type type, Block block)
 
     public static void assertBlockEquals(Type type, Block actual, Block expected)
     {
-        assertEquals(actual.getPositionCount(), expected.getPositionCount());
+        assertThat(actual.getPositionCount()).isEqualTo(expected.getPositionCount());
         for (int position = 0; position < actual.getPositionCount(); position++) {
-            assertEquals(type.getObjectValue(SESSION, actual, position), type.getObjectValue(SESSION, expected, position), "position " + position);
+            assertThat(type.getObjectValue(SESSION, actual, position))
+                    .describedAs("position " + position)
+                    .isEqualTo(type.getObjectValue(SESSION, expected, position));
         }
     }
 
@@ -138,7 +143,7 @@ public static RunLengthEncodedBlock createRandomRleBlock(Block block, int positi
         return (RunLengthEncodedBlock) RunLengthEncodedBlock.create(block.getSingleValueBlock(random().nextInt(block.getPositionCount())), positionCount);
     }
 
-    public static Block createRandomBlockForType(Type type, int positionCount, float nullRate)
+    public static ValueBlock createRandomBlockForType(Type type, int positionCount, float nullRate)
     {
         verifyNullRate(nullRate);
 
@@ -191,12 +196,12 @@ public static Block createRandomBlockForType(Type type, int positionCount, float
         return createRandomBlockForNestedType(type, positionCount, nullRate);
     }
 
-    public static Block createRandomBlockForNestedType(Type type, int positionCount, float nullRate)
+    public static ValueBlock createRandomBlockForNestedType(Type type, int positionCount, float nullRate)
     {
         return createRandomBlockForNestedType(type, positionCount, nullRate, ENTRY_SIZE);
     }
 
-    public static Block createRandomBlockForNestedType(Type type, int positionCount, float nullRate, int maxCardinality)
+    public static ValueBlock createRandomBlockForNestedType(Type type, int positionCount, float nullRate, int maxCardinality)
     {
         // Builds isNull and offsets of size positionCount
         boolean[] isNull = null;
@@ -222,12 +227,12 @@ public static Block createRandomBlockForNestedType(Type type, int positionCount,
 
         // Builds the nested block of size offsets[positionCount].
         if (type instanceof ArrayType) {
-            Block valuesBlock = createRandomBlockForType(((ArrayType) type).getElementType(), offsets[positionCount], nullRate);
+            ValueBlock valuesBlock = createRandomBlockForType(((ArrayType) type).getElementType(), offsets[positionCount], nullRate);
             return fromElementBlock(positionCount, Optional.ofNullable(isNull), offsets, valuesBlock);
         }
         if (type instanceof MapType mapType) {
-            Block keyBlock = createRandomBlockForType(mapType.getKeyType(), offsets[positionCount], 0.0f);
-            Block valueBlock = createRandomBlockForType(mapType.getValueType(), offsets[positionCount], nullRate);
+            ValueBlock keyBlock = createRandomBlockForType(mapType.getKeyType(), offsets[positionCount], 0.0f);
+            ValueBlock valueBlock = createRandomBlockForType(mapType.getValueType(), offsets[positionCount], nullRate);
 
             return mapType.createBlockFromKeyValue(Optional.ofNullable(isNull), offsets, keyBlock, valueBlock);
         }
@@ -239,25 +244,25 @@ public static Block createRandomBlockForNestedType(Type type, int positionCount,
                 fieldBlocks[i] = createRandomBlockForType(fieldTypes.get(i), positionCount, nullRate);
             }
 
-            return RowBlock.fromFieldBlocks(positionCount, Optional.ofNullable(isNull), fieldBlocks);
+            return RowBlock.fromNotNullSuppressedFieldBlocks(positionCount, Optional.ofNullable(isNull), fieldBlocks);
         }
 
         throw new IllegalArgumentException(format("type %s is not supported.", type));
     }
 
-    public static Block createRandomBooleansBlock(int positionCount, float nullRate)
+    public static ValueBlock createRandomBooleansBlock(int positionCount, float nullRate)
     {
         Random random = random();
         return createBooleansBlock(generateListWithNulls(positionCount, nullRate, random::nextBoolean));
     }
 
-    public static Block createRandomIntsBlock(int positionCount, float nullRate)
+    public static ValueBlock createRandomIntsBlock(int positionCount, float nullRate)
     {
         Random random = random();
         return createIntsBlock(generateListWithNulls(positionCount, nullRate, random::nextInt));
     }
 
-    public static Block createRandomLongDecimalsBlock(int positionCount, float nullRate)
+    public static ValueBlock createRandomLongDecimalsBlock(int positionCount, float nullRate)
     {
         Random random = random();
         return createLongDecimalsBlock(generateListWithNulls(
@@ -266,7 +271,7 @@ public static Block createRandomLongDecimalsBlock(int positionCount, float nullR
                 () -> String.valueOf(random.nextLong())));
     }
 
-    public static Block createRandomShortTimestampBlock(TimestampType type, int positionCount, float nullRate)
+    public static ValueBlock createRandomShortTimestampBlock(TimestampType type, int positionCount, float nullRate)
     {
         Random random = random();
         return createLongsBlock(
@@ -276,7 +281,7 @@ public static Block createRandomShortTimestampBlock(TimestampType type, int posi
                         () -> SqlTimestamp.fromMillis(type.getPrecision(), random.nextLong()).getEpochMicros()));
     }
 
-    public static Block createRandomLongTimestampBlock(TimestampType type, int positionCount, float nullRate)
+    public static ValueBlock createRandomLongTimestampBlock(TimestampType type, int positionCount, float nullRate)
     {
         Random random = random();
         return createLongTimestampBlock(
@@ -290,7 +295,7 @@ public static Block createRandomLongTimestampBlock(TimestampType type, int posit
                         }));
     }
 
-    public static Block createRandomLongsBlock(int positionCount, int numberOfUniqueValues)
+    public static ValueBlock createRandomLongsBlock(int positionCount, int numberOfUniqueValues)
     {
         checkArgument(positionCount >= numberOfUniqueValues, "numberOfUniqueValues must be between 1 and positionCount: %s but was %s", positionCount, numberOfUniqueValues);
         int[] uniqueValues = chooseRandomUnique(positionCount, numberOfUniqueValues).stream()
@@ -303,13 +308,13 @@ public static Block createRandomLongsBlock(int positionCount, int numberOfUnique
                 .collect(toImmutableList()));
     }
 
-    public static Block createRandomLongsBlock(int positionCount, float nullRate)
+    public static ValueBlock createRandomLongsBlock(int positionCount, float nullRate)
     {
         Random random = random();
         return createLongsBlock(generateListWithNulls(positionCount, nullRate, random::nextLong));
     }
 
-    public static Block createRandomSmallintsBlock(int positionCount, float nullRate)
+    public static ValueBlock createRandomSmallintsBlock(int positionCount, float nullRate)
     {
         Random random = random();
         return createTypedLongsBlock(
@@ -317,43 +322,43 @@ public static Block createRandomSmallintsBlock(int positionCount, float nullRate
                 generateListWithNulls(positionCount, nullRate, () -> (long) (short) random.nextLong()));
     }
 
-    public static Block createRandomStringBlock(int positionCount, float nullRate, int maxStringLength)
+    public static ValueBlock createRandomStringBlock(int positionCount, float nullRate, int maxStringLength)
     {
         return createStringsBlock(
                 generateListWithNulls(positionCount, nullRate, () -> generateRandomStringWithLength(maxStringLength)));
     }
 
-    private static Block createRandomVarbinariesBlock(int positionCount, float nullRate)
+    private static ValueBlock createRandomVarbinariesBlock(int positionCount, float nullRate)
     {
         Random random = random();
-        return createSlicesBlock(VARBINARY, generateListWithNulls(positionCount, nullRate, () -> Slices.wrappedLongArray(random.nextLong(), random.nextLong())));
+        return createSlicesBlock(VARBINARY, generateListWithNulls(positionCount, nullRate, () -> Slices.random(16, random)));
     }
 
-    private static Block createRandomUUIDsBlock(int positionCount, float nullRate)
+    private static ValueBlock createRandomUUIDsBlock(int positionCount, float nullRate)
     {
         Random random = random();
-        return createSlicesBlock(UUID, generateListWithNulls(positionCount, nullRate, () -> Slices.wrappedLongArray(random.nextLong(), random.nextLong())));
+        return createSlicesBlock(UUID, generateListWithNulls(positionCount, nullRate, () -> Slices.random(16, random)));
     }
 
-    private static Block createRandomIpAddressesBlock(int positionCount, float nullRate)
+    private static ValueBlock createRandomIpAddressesBlock(int positionCount, float nullRate)
     {
         Random random = random();
-        return createSlicesBlock(IPADDRESS, generateListWithNulls(positionCount, nullRate, () -> Slices.wrappedLongArray(random.nextLong(), random.nextLong())));
+        return createSlicesBlock(IPADDRESS, generateListWithNulls(positionCount, nullRate, () -> Slices.random(16, random)));
     }
 
-    private static Block createRandomTinyintsBlock(int positionCount, float nullRate)
+    private static ValueBlock createRandomTinyintsBlock(int positionCount, float nullRate)
     {
         Random random = random();
         return createTypedLongsBlock(TINYINT, generateListWithNulls(positionCount, nullRate, () -> (long) (byte) random.nextLong()));
     }
 
-    public static Block createRandomDoublesBlock(int positionCount, float nullRate)
+    public static ValueBlock createRandomDoublesBlock(int positionCount, float nullRate)
     {
         Random random = random();
         return createDoublesBlock(generateListWithNulls(positionCount, nullRate, random::nextDouble));
     }
 
-    public static Block createRandomCharsBlock(CharType charType, int positionCount, float nullRate)
+    public static ValueBlock createRandomCharsBlock(CharType charType, int positionCount, float nullRate)
     {
         return createCharsBlock(charType, generateListWithNulls(positionCount, nullRate, () -> generateRandomStringWithLength(charType.getLength())));
     }
@@ -379,14 +384,14 @@ public static Set<Integer> chooseNullPositions(int positionCount, float nullRate
         return chooseRandomUnique(positionCount, nullCount);
     }
 
-    public static Block createStringsBlock(String... values)
+    public static ValueBlock createStringsBlock(String... values)
     {
         requireNonNull(values, "values is null");
 
         return createStringsBlock(Arrays.asList(values));
     }
 
-    public static Block createStringsBlock(Iterable<String> values)
+    public static ValueBlock createStringsBlock(Iterable<String> values)
     {
         BlockBuilder builder = VARCHAR.createBlockBuilder(null, 100);
 
@@ -399,26 +404,26 @@ public static Block createStringsBlock(Iterable<String> values)
             }
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createSlicesBlock(Slice... values)
+    public static ValueBlock createSlicesBlock(Slice... values)
     {
         requireNonNull(values, "values is null");
         return createSlicesBlock(Arrays.asList(values));
     }
 
-    public static Block createSlicesBlock(Iterable<Slice> values)
+    public static ValueBlock createSlicesBlock(Iterable<Slice> values)
     {
         return createSlicesBlock(VARBINARY, values);
     }
 
-    public static Block createSlicesBlock(Type type, Iterable<Slice> values)
+    public static ValueBlock createSlicesBlock(Type type, Iterable<Slice> values)
     {
         return createBlock(type, type::writeSlice, values);
     }
 
-    public static Block createStringSequenceBlock(int start, int end)
+    public static ValueBlock createStringSequenceBlock(int start, int end)
     {
         BlockBuilder builder = VARCHAR.createBlockBuilder(null, 100);
 
@@ -426,7 +431,7 @@ public static Block createStringSequenceBlock(int start, int end)
             VARCHAR.writeString(builder, String.valueOf(i));
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
     public static Block createStringDictionaryBlock(int start, int length)
@@ -445,7 +450,7 @@ public static Block createStringDictionaryBlock(int start, int length)
         return DictionaryBlock.create(ids.length, builder.build(), ids);
     }
 
-    public static Block createStringArraysBlock(Iterable<? extends Iterable<String>> values)
+    public static ValueBlock createStringArraysBlock(Iterable<? extends Iterable<String>> values)
     {
         ArrayType arrayType = new ArrayType(VARCHAR);
         BlockBuilder builder = arrayType.createBlockBuilder(null, 100);
@@ -459,22 +464,22 @@ public static Block createStringArraysBlock(Iterable<? extends Iterable<String>>
             }
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createBooleansBlock(Boolean... values)
+    public static ValueBlock createBooleansBlock(Boolean... values)
     {
         requireNonNull(values, "values is null");
 
         return createBooleansBlock(Arrays.asList(values));
     }
 
-    public static Block createBooleansBlock(Boolean value, int count)
+    public static ValueBlock createBooleansBlock(Boolean value, int count)
     {
         return createBooleansBlock(Collections.nCopies(count, value));
     }
 
-    public static Block createBooleansBlock(Iterable<Boolean> values)
+    public static ValueBlock createBooleansBlock(Iterable<Boolean> values)
     {
         BlockBuilder builder = BOOLEAN.createBlockBuilder(null, 100);
 
@@ -487,17 +492,17 @@ public static Block createBooleansBlock(Iterable<Boolean> values)
             }
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createShortDecimalsBlock(String... values)
+    public static ValueBlock createShortDecimalsBlock(String... values)
     {
         requireNonNull(values, "values is null");
 
         return createShortDecimalsBlock(Arrays.asList(values));
     }
 
-    public static Block createShortDecimalsBlock(Iterable<String> values)
+    public static ValueBlock createShortDecimalsBlock(Iterable<String> values)
     {
         DecimalType shortDecimalType = DecimalType.createDecimalType(1);
         BlockBuilder builder = shortDecimalType.createBlockBuilder(null, 100);
@@ -511,17 +516,17 @@ public static Block createShortDecimalsBlock(Iterable<String> values)
             }
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createLongDecimalsBlock(String... values)
+    public static ValueBlock createLongDecimalsBlock(String... values)
     {
         requireNonNull(values, "values is null");
 
         return createLongDecimalsBlock(Arrays.asList(values));
     }
 
-    public static Block createLongDecimalsBlock(Iterable<String> values)
+    public static ValueBlock createLongDecimalsBlock(Iterable<String> values)
     {
         DecimalType longDecimalType = DecimalType.createDecimalType(MAX_SHORT_PRECISION + 1);
         BlockBuilder builder = longDecimalType.createBlockBuilder(null, 100);
@@ -535,16 +540,16 @@ public static Block createLongDecimalsBlock(Iterable<String> values)
             }
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createLongTimestampBlock(TimestampType type, LongTimestamp... values)
+    public static ValueBlock createLongTimestampBlock(TimestampType type, LongTimestamp... values)
     {
         requireNonNull(values, "values is null");
         return createLongTimestampBlock(type, Arrays.asList(values));
     }
 
-    public static Block createLongTimestampBlock(TimestampType type, Iterable<LongTimestamp> values)
+    public static ValueBlock createLongTimestampBlock(TimestampType type, Iterable<LongTimestamp> values)
     {
         BlockBuilder builder = type.createBlockBuilder(null, 100);
 
@@ -557,106 +562,106 @@ public static Block createLongTimestampBlock(TimestampType type, Iterable<LongTi
             }
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createCharsBlock(CharType charType, List<String> values)
+    public static ValueBlock createCharsBlock(CharType charType, List<String> values)
     {
         return createBlock(charType, charType::writeString, values);
     }
 
-    public static Block createTinyintsBlock(Integer... values)
+    public static ValueBlock createTinyintsBlock(Integer... values)
     {
         requireNonNull(values, "values is null");
 
         return createTinyintsBlock(Arrays.asList(values));
     }
 
-    public static Block createTinyintsBlock(Iterable<Integer> values)
+    public static ValueBlock createTinyintsBlock(Iterable<Integer> values)
     {
         return createBlock(TINYINT, (ValueWriter<Integer>) TINYINT::writeLong, values);
     }
 
-    public static Block createSmallintsBlock(Integer... values)
+    public static ValueBlock createSmallintsBlock(Integer... values)
     {
         requireNonNull(values, "values is null");
 
         return createSmallintsBlock(Arrays.asList(values));
     }
 
-    public static Block createSmallintsBlock(Iterable<Integer> values)
+    public static ValueBlock createSmallintsBlock(Iterable<Integer> values)
     {
         return createBlock(SMALLINT, (ValueWriter<Integer>) SMALLINT::writeLong, values);
     }
 
-    public static Block createIntsBlock(Integer... values)
+    public static ValueBlock createIntsBlock(Integer... values)
     {
         requireNonNull(values, "values is null");
 
         return createIntsBlock(Arrays.asList(values));
     }
 
-    public static Block createIntsBlock(Iterable<Integer> values)
+    public static ValueBlock createIntsBlock(Iterable<Integer> values)
     {
         return createBlock(INTEGER, (ValueWriter<Integer>) INTEGER::writeLong, values);
     }
 
-    public static Block createRowBlock(List<Type> fieldTypes, Object[]... rows)
+    public static ValueBlock createRowBlock(List<Type> fieldTypes, Object[]... rows)
     {
-        BlockBuilder rowBlockBuilder = new RowBlockBuilder(fieldTypes, null, 1);
+        RowBlockBuilder rowBlockBuilder = new RowBlockBuilder(fieldTypes, null, 1);
         for (Object[] row : rows) {
             if (row == null) {
                 rowBlockBuilder.appendNull();
                 continue;
             }
             verify(row.length == fieldTypes.size());
-            BlockBuilder singleRowBlockWriter = rowBlockBuilder.beginBlockEntry();
-            for (int fieldIndex = 0; fieldIndex < fieldTypes.size(); fieldIndex++) {
-                Type fieldType = fieldTypes.get(fieldIndex);
-                Object fieldValue = row[fieldIndex];
-                if (fieldValue == null) {
-                    singleRowBlockWriter.appendNull();
-                    continue;
+            rowBlockBuilder.buildEntry(fieldBuilders -> {
+                for (int fieldIndex = 0; fieldIndex < fieldTypes.size(); fieldIndex++) {
+                    Type fieldType = fieldTypes.get(fieldIndex);
+                    Object fieldValue = row[fieldIndex];
+                    if (fieldValue == null) {
+                        fieldBuilders.get(fieldIndex).appendNull();
+                        continue;
+                    }
+
+                    if (fieldValue instanceof String) {
+                        fieldType.writeSlice(fieldBuilders.get(fieldIndex), utf8Slice((String) fieldValue));
+                    }
+                    else if (fieldValue instanceof Slice) {
+                        fieldType.writeSlice(fieldBuilders.get(fieldIndex), (Slice) fieldValue);
+                    }
+                    else if (fieldValue instanceof Double) {
+                        fieldType.writeDouble(fieldBuilders.get(fieldIndex), (Double) fieldValue);
+                    }
+                    else if (fieldValue instanceof Long) {
+                        fieldType.writeLong(fieldBuilders.get(fieldIndex), (Long) fieldValue);
+                    }
+                    else if (fieldValue instanceof Boolean) {
+                        fieldType.writeBoolean(fieldBuilders.get(fieldIndex), (Boolean) fieldValue);
+                    }
+                    else if (fieldValue instanceof Block) {
+                        fieldType.writeObject(fieldBuilders.get(fieldIndex), fieldValue);
+                    }
+                    else if (fieldValue instanceof Integer) {
+                        fieldType.writeLong(fieldBuilders.get(fieldIndex), (Integer) fieldValue);
+                    }
+                    else {
+                        throw new IllegalArgumentException();
+                    }
                 }
-
-                if (fieldValue instanceof String) {
-                    fieldType.writeSlice(singleRowBlockWriter, utf8Slice((String) fieldValue));
-                }
-                else if (fieldValue instanceof Slice) {
-                    fieldType.writeSlice(singleRowBlockWriter, (Slice) fieldValue);
-                }
-                else if (fieldValue instanceof Double) {
-                    fieldType.writeDouble(singleRowBlockWriter, (Double) fieldValue);
-                }
-                else if (fieldValue instanceof Long) {
-                    fieldType.writeLong(singleRowBlockWriter, (Long) fieldValue);
-                }
-                else if (fieldValue instanceof Boolean) {
-                    fieldType.writeBoolean(singleRowBlockWriter, (Boolean) fieldValue);
-                }
-                else if (fieldValue instanceof Block) {
-                    fieldType.writeObject(singleRowBlockWriter, fieldValue);
-                }
-                else if (fieldValue instanceof Integer) {
-                    fieldType.writeLong(singleRowBlockWriter, (Integer) fieldValue);
-                }
-                else {
-                    throw new IllegalArgumentException();
-                }
-            }
-            rowBlockBuilder.closeEntry();
+            });
         }
 
-        return rowBlockBuilder.build();
+        return rowBlockBuilder.buildValueBlock();
     }
 
-    public static Block createEmptyLongsBlock()
+    public static ValueBlock createEmptyLongsBlock()
     {
-        return BIGINT.createFixedSizeBlockBuilder(0).build();
+        return BIGINT.createFixedSizeBlockBuilder(0).buildValueBlock();
     }
 
     // This method makes it easy to create blocks without having to add an L to every value
-    public static Block createLongsBlock(int... values)
+    public static ValueBlock createLongsBlock(int... values)
     {
         BlockBuilder builder = BIGINT.createBlockBuilder(null, 100);
 
@@ -664,27 +669,27 @@ public static Block createLongsBlock(int... values)
             BIGINT.writeLong(builder, value);
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createLongsBlock(Long... values)
+    public static ValueBlock createLongsBlock(Long... values)
     {
         requireNonNull(values, "values is null");
 
         return createLongsBlock(Arrays.asList(values));
     }
 
-    public static Block createLongsBlock(Iterable<Long> values)
+    public static ValueBlock createLongsBlock(Iterable<Long> values)
     {
         return createTypedLongsBlock(BIGINT, values);
     }
 
-    public static Block createTypedLongsBlock(Type type, Iterable<Long> values)
+    public static ValueBlock createTypedLongsBlock(Type type, Iterable<Long> values)
     {
         return createBlock(type, type::writeLong, values);
     }
 
-    public static Block createLongSequenceBlock(int start, int end)
+    public static ValueBlock createLongSequenceBlock(int start, int end)
     {
         BlockBuilder builder = BIGINT.createFixedSizeBlockBuilder(end - start);
 
@@ -692,7 +697,7 @@ public static Block createLongSequenceBlock(int start, int end)
             BIGINT.writeLong(builder, i);
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
     public static Block createLongDictionaryBlock(int start, int length)
@@ -716,34 +721,34 @@ public static Block createLongDictionaryBlock(int start, int length, int diction
         return DictionaryBlock.create(ids.length, builder.build(), ids);
     }
 
-    public static Block createLongRepeatBlock(int value, int length)
+    public static ValueBlock createLongRepeatBlock(int value, int length)
     {
         BlockBuilder builder = BIGINT.createFixedSizeBlockBuilder(length);
         for (int i = 0; i < length; i++) {
             BIGINT.writeLong(builder, value);
         }
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createDoubleRepeatBlock(double value, int length)
+    public static ValueBlock createDoubleRepeatBlock(double value, int length)
     {
         BlockBuilder builder = DOUBLE.createFixedSizeBlockBuilder(length);
         for (int i = 0; i < length; i++) {
             DOUBLE.writeDouble(builder, value);
         }
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createTimestampsWithTimeZoneMillisBlock(Long... values)
+    public static ValueBlock createTimestampsWithTimeZoneMillisBlock(Long... values)
     {
         BlockBuilder builder = TIMESTAMP_TZ_MILLIS.createFixedSizeBlockBuilder(values.length);
         for (long value : values) {
             TIMESTAMP_TZ_MILLIS.writeLong(builder, value);
         }
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createBooleanSequenceBlock(int start, int end)
+    public static ValueBlock createBooleanSequenceBlock(int start, int end)
     {
         BlockBuilder builder = BOOLEAN.createFixedSizeBlockBuilder(end - start);
 
@@ -751,17 +756,17 @@ public static Block createBooleanSequenceBlock(int start, int end)
             BOOLEAN.writeBoolean(builder, i % 2 == 0);
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createBlockOfReals(Float... values)
+    public static ValueBlock createBlockOfReals(Float... values)
     {
         requireNonNull(values, "values is null");
 
         return createBlockOfReals(Arrays.asList(values));
     }
 
-    public static Block createBlockOfReals(Iterable<Float> values)
+    public static ValueBlock createBlockOfReals(Iterable<Float> values)
     {
         BlockBuilder builder = REAL.createBlockBuilder(null, 100);
         for (Float value : values) {
@@ -772,10 +777,10 @@ public static Block createBlockOfReals(Iterable<Float> values)
                 REAL.writeLong(builder, floatToRawIntBits(value));
             }
         }
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createSequenceBlockOfReal(int start, int end)
+    public static ValueBlock createSequenceBlockOfReal(int start, int end)
     {
         BlockBuilder builder = REAL.createFixedSizeBlockBuilder(end - start);
 
@@ -783,22 +788,22 @@ public static Block createSequenceBlockOfReal(int start, int end)
             REAL.writeLong(builder, floatToRawIntBits(i));
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createDoublesBlock(Double... values)
+    public static ValueBlock createDoublesBlock(Double... values)
     {
         requireNonNull(values, "values is null");
 
         return createDoublesBlock(Arrays.asList(values));
     }
 
-    public static Block createDoublesBlock(Iterable<Double> values)
+    public static ValueBlock createDoublesBlock(Iterable<Double> values)
     {
         return createBlock(DOUBLE, DOUBLE::writeDouble, values);
     }
 
-    public static Block createDoubleSequenceBlock(int start, int end)
+    public static ValueBlock createDoubleSequenceBlock(int start, int end)
     {
         BlockBuilder builder = DOUBLE.createFixedSizeBlockBuilder(end - start);
 
@@ -806,10 +811,10 @@ public static Block createDoubleSequenceBlock(int start, int end)
             DOUBLE.writeDouble(builder, i);
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createArrayBigintBlock(Iterable<? extends Iterable<Long>> values)
+    public static ValueBlock createArrayBigintBlock(Iterable<? extends Iterable<Long>> values)
     {
         ArrayType arrayType = new ArrayType(BIGINT);
         BlockBuilder builder = arrayType.createBlockBuilder(null, 100);
@@ -823,10 +828,10 @@ public static Block createArrayBigintBlock(Iterable<? extends Iterable<Long>> va
             }
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createDateSequenceBlock(int start, int end)
+    public static ValueBlock createDateSequenceBlock(int start, int end)
     {
         BlockBuilder builder = DATE.createFixedSizeBlockBuilder(end - start);
 
@@ -834,10 +839,10 @@ public static Block createDateSequenceBlock(int start, int end)
             DATE.writeLong(builder, i);
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createTimestampSequenceBlock(int start, int end)
+    public static ValueBlock createTimestampSequenceBlock(int start, int end)
     {
         BlockBuilder builder = TIMESTAMP_MILLIS.createFixedSizeBlockBuilder(end - start);
 
@@ -845,10 +850,10 @@ public static Block createTimestampSequenceBlock(int start, int end)
             TIMESTAMP_MILLIS.writeLong(builder, multiplyExact(i, MICROSECONDS_PER_MILLISECOND));
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createShortDecimalSequenceBlock(int start, int end, DecimalType type)
+    public static ValueBlock createShortDecimalSequenceBlock(int start, int end, DecimalType type)
     {
         BlockBuilder builder = type.createFixedSizeBlockBuilder(end - start);
         long base = BigInteger.TEN.pow(type.getScale()).longValue();
@@ -857,10 +862,10 @@ public static Block createShortDecimalSequenceBlock(int start, int end, DecimalT
             type.writeLong(builder, base * i);
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createLongDecimalSequenceBlock(int start, int end, DecimalType type)
+    public static ValueBlock createLongDecimalSequenceBlock(int start, int end, DecimalType type)
     {
         BlockBuilder builder = type.createFixedSizeBlockBuilder(end - start);
         BigInteger base = BigInteger.TEN.pow(type.getScale());
@@ -869,25 +874,25 @@ public static Block createLongDecimalSequenceBlock(int start, int end, DecimalTy
             type.writeObject(builder, Int128.valueOf(BigInteger.valueOf(i).multiply(base)));
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createColorRepeatBlock(int value, int length)
+    public static ValueBlock createColorRepeatBlock(int value, int length)
     {
         BlockBuilder builder = COLOR.createFixedSizeBlockBuilder(length);
         for (int i = 0; i < length; i++) {
             COLOR.writeLong(builder, value);
         }
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
-    public static Block createColorSequenceBlock(int start, int end)
+    public static ValueBlock createColorSequenceBlock(int start, int end)
     {
         BlockBuilder builder = COLOR.createBlockBuilder(null, end - start);
         for (int i = start; i < end; ++i) {
             COLOR.writeLong(builder, i);
         }
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
     public static Block createRepeatedValuesBlock(double value, int positionCount)
@@ -904,7 +909,7 @@ public static Block createRepeatedValuesBlock(long value, int positionCount)
         return RunLengthEncodedBlock.create(blockBuilder.build(), positionCount);
     }
 
-    private static <T> Block createBlock(Type type, ValueWriter<T> valueWriter, Iterable<T> values)
+    private static <T> ValueBlock createBlock(Type type, ValueWriter<T> valueWriter, Iterable<T> values)
     {
         BlockBuilder builder = type.createBlockBuilder(null, 100);
 
@@ -917,7 +922,7 @@ private static <T> Block createBlock(Type type, ValueWriter<T> valueWriter, Iter
             }
         }
 
-        return builder.build();
+        return builder.buildValueBlock();
     }
 
     private interface ValueWriter<T>
diff --git a/core/trino-main/src/test/java/io/trino/block/ColumnarTestUtils.java b/core/trino-main/src/test/java/io/trino/block/ColumnarTestUtils.java
deleted file mode 100644
index ec58335bb41d..000000000000
--- a/core/trino-main/src/test/java/io/trino/block/ColumnarTestUtils.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Licensed 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 io.trino.block;
-
-import io.airlift.slice.DynamicSliceOutput;
-import io.airlift.slice.Slice;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockEncodingSerde;
-import io.trino.spi.block.DictionaryBlock;
-import io.trino.spi.block.RunLengthEncodedBlock;
-import io.trino.spi.block.TestingBlockEncodingSerde;
-
-import java.lang.reflect.Array;
-import java.util.Arrays;
-
-import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-public final class ColumnarTestUtils
-{
-    private static final BlockEncodingSerde BLOCK_ENCODING_SERDE = new TestingBlockEncodingSerde(TESTING_TYPE_MANAGER::getType);
-
-    private ColumnarTestUtils() {}
-
-    public static <T> void assertBlock(Block block, T[] expectedValues)
-    {
-        assertBlockPositions(block, expectedValues);
-        assertBlockPositions(copyBlock(block), expectedValues);
-    }
-
-    private static <T> void assertBlockPositions(Block block, T[] expectedValues)
-    {
-        assertEquals(block.getPositionCount(), expectedValues.length);
-        for (int position = 0; position < block.getPositionCount(); position++) {
-            assertBlockPosition(block, position, expectedValues[position]);
-        }
-    }
-
-    public static <T> void assertBlockPosition(Block block, int position, T expectedValue)
-    {
-        assertPositionValue(block, position, expectedValue);
-        assertPositionValue(block.getSingleValueBlock(position), 0, expectedValue);
-    }
-
-    private static <T> void assertPositionValue(Block block, int position, T expectedValue)
-    {
-        if (expectedValue == null) {
-            assertTrue(block.isNull(position));
-            return;
-        }
-        assertFalse(block.isNull(position));
-
-        if (expectedValue instanceof Slice expected) {
-            int length = block.getSliceLength(position);
-            assertEquals(length, expected.length());
-
-            Slice actual = block.getSlice(position, 0, length);
-            assertEquals(actual, expected);
-        }
-        else if (expectedValue instanceof Slice[] expected) {
-            // array or row
-            Block actual = block.getObject(position, Block.class);
-            assertBlock(actual, expected);
-        }
-        else if (expectedValue instanceof Slice[][] expected) {
-            // map
-            Block actual = block.getObject(position, Block.class);
-            // a map is exposed as a block alternating key and value entries, so we need to flatten the expected values array
-            assertBlock(actual, flattenMapEntries(expected));
-        }
-        else {
-            throw new IllegalArgumentException(expectedValue.getClass().getName());
-        }
-    }
-
-    private static Slice[] flattenMapEntries(Slice[][] mapEntries)
-    {
-        Slice[] flattened = new Slice[mapEntries.length * 2];
-        for (int i = 0; i < mapEntries.length; i++) {
-            Slice[] mapEntry = mapEntries[i];
-            assertEquals(mapEntry.length, 2);
-            flattened[i * 2] = mapEntry[0];
-            flattened[i * 2 + 1] = mapEntry[1];
-        }
-        return flattened;
-    }
-
-    public static <T> T[] alternatingNullValues(T[] objects)
-    {
-        @SuppressWarnings("unchecked")
-        T[] objectsWithNulls = (T[]) Array.newInstance(objects.getClass().getComponentType(), objects.length * 2 + 1);
-        for (int i = 0; i < objects.length; i++) {
-            objectsWithNulls[i * 2] = null;
-            objectsWithNulls[i * 2 + 1] = objects[i];
-        }
-        objectsWithNulls[objectsWithNulls.length - 1] = null;
-        return objectsWithNulls;
-    }
-
-    private static Block copyBlock(Block block)
-    {
-        DynamicSliceOutput sliceOutput = new DynamicSliceOutput(1024);
-        BLOCK_ENCODING_SERDE.writeBlock(sliceOutput, block);
-        return BLOCK_ENCODING_SERDE.readBlock(sliceOutput.slice().getInput());
-    }
-
-    public static Block createTestDictionaryBlock(Block block)
-    {
-        int[] dictionaryIndexes = createTestDictionaryIndexes(block.getPositionCount());
-        return DictionaryBlock.create(dictionaryIndexes.length, block, dictionaryIndexes);
-    }
-
-    public static <T> T[] createTestDictionaryExpectedValues(T[] expectedValues)
-    {
-        int[] dictionaryIndexes = createTestDictionaryIndexes(expectedValues.length);
-        T[] expectedDictionaryValues = Arrays.copyOf(expectedValues, dictionaryIndexes.length);
-        for (int i = 0; i < dictionaryIndexes.length; i++) {
-            int dictionaryIndex = dictionaryIndexes[i];
-            T expectedValue = expectedValues[dictionaryIndex];
-            expectedDictionaryValues[i] = expectedValue;
-        }
-        return expectedDictionaryValues;
-    }
-
-    private static int[] createTestDictionaryIndexes(int valueCount)
-    {
-        int[] dictionaryIndexes = new int[valueCount * 2];
-        for (int i = 0; i < valueCount; i++) {
-            dictionaryIndexes[i] = valueCount - i - 1;
-            dictionaryIndexes[i + valueCount] = i;
-        }
-        return dictionaryIndexes;
-    }
-
-    public static <T> T[] createTestRleExpectedValues(T[] expectedValues, int position)
-    {
-        T[] expectedDictionaryValues = Arrays.copyOf(expectedValues, 10);
-        for (int i = 0; i < 10; i++) {
-            expectedDictionaryValues[i] = expectedValues[position];
-        }
-        return expectedDictionaryValues;
-    }
-
-    public static RunLengthEncodedBlock createTestRleBlock(Block block, int position)
-    {
-        return (RunLengthEncodedBlock) RunLengthEncodedBlock.create(block.getRegion(position, 1), 10);
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/block/TestArrayBlock.java b/core/trino-main/src/test/java/io/trino/block/TestArrayBlock.java
index 5ae7957d5580..8d2c861e6af2 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestArrayBlock.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestArrayBlock.java
@@ -19,8 +19,9 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.ByteArrayBlock;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.Random;
 
@@ -45,18 +46,16 @@ public void testWithFixedWidthBlock()
             expectedValues[i] = rand.longs(ARRAY_SIZES[i]).toArray();
         }
 
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        assertBlock(blockBuilder, expectedValues);
-        assertBlock(blockBuilder.build(), expectedValues);
-        assertBlockFilteredPositions(expectedValues, blockBuilder.build(), 0, 1, 3, 4, 7);
-        assertBlockFilteredPositions(expectedValues, blockBuilder.build(), 2, 3, 5, 6);
+        Block block = createBlockBuilderWithValues(expectedValues).build();
+        assertBlock(block, expectedValues);
+        assertBlockFilteredPositions(expectedValues, block, 0, 1, 3, 4, 7);
+        assertBlockFilteredPositions(expectedValues, block, 2, 3, 5, 6);
 
         long[][] expectedValuesWithNull = alternatingNullValues(expectedValues);
-        BlockBuilder blockBuilderWithNull = createBlockBuilderWithValues(expectedValuesWithNull);
-        assertBlock(blockBuilderWithNull, expectedValuesWithNull);
-        assertBlock(blockBuilderWithNull.build(), expectedValuesWithNull);
-        assertBlockFilteredPositions(expectedValuesWithNull, blockBuilderWithNull.build(), 0, 1, 5, 6, 7, 10, 11, 12, 15);
-        assertBlockFilteredPositions(expectedValuesWithNull, blockBuilderWithNull.build(), 2, 3, 4, 9, 13, 14);
+        Block blockWithNull = createBlockBuilderWithValues(expectedValuesWithNull).build();
+        assertBlock(blockWithNull, expectedValuesWithNull);
+        assertBlockFilteredPositions(expectedValuesWithNull, blockWithNull, 0, 1, 5, 6, 7, 10, 11, 12, 15);
+        assertBlockFilteredPositions(expectedValuesWithNull, blockWithNull, 2, 3, 4, 9, 13, 14);
     }
 
     @Test
@@ -70,19 +69,16 @@ public void testWithVariableWidthBlock()
             }
         }
 
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-
-        assertBlock(blockBuilder, expectedValues);
-        assertBlock(blockBuilder.build(), expectedValues);
-        assertBlockFilteredPositions(expectedValues, blockBuilder.build(), 0, 1, 3, 4, 7);
-        assertBlockFilteredPositions(expectedValues, blockBuilder.build(), 2, 3, 5, 6);
+        Block block = createBlockBuilderWithValues(expectedValues).build();
+        assertBlock(block, expectedValues);
+        assertBlockFilteredPositions(expectedValues, block, 0, 1, 3, 4, 7);
+        assertBlockFilteredPositions(expectedValues, block, 2, 3, 5, 6);
 
         Slice[][] expectedValuesWithNull = alternatingNullValues(expectedValues);
-        BlockBuilder blockBuilderWithNull = createBlockBuilderWithValues(expectedValuesWithNull);
-        assertBlock(blockBuilderWithNull, expectedValuesWithNull);
-        assertBlock(blockBuilderWithNull.build(), expectedValuesWithNull);
-        assertBlockFilteredPositions(expectedValuesWithNull, blockBuilderWithNull.build(), 0, 1, 5, 6, 7, 10, 11, 12, 15);
-        assertBlockFilteredPositions(expectedValuesWithNull, blockBuilderWithNull.build(), 2, 3, 4, 9, 13, 14);
+        Block blockWithNull = createBlockBuilderWithValues(expectedValuesWithNull).build();
+        assertBlock(blockWithNull, expectedValuesWithNull);
+        assertBlockFilteredPositions(expectedValuesWithNull, blockWithNull, 0, 1, 5, 6, 7, 10, 11, 12, 15);
+        assertBlockFilteredPositions(expectedValuesWithNull, blockWithNull, 2, 3, 4, 9, 13, 14);
     }
 
     @Test
@@ -90,19 +86,16 @@ public void testWithArrayBlock()
     {
         long[][][] expectedValues = createExpectedValues();
 
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-
-        assertBlock(blockBuilder, expectedValues);
-        assertBlock(blockBuilder.build(), expectedValues);
-        assertBlockFilteredPositions(expectedValues, blockBuilder.build(), 0, 1, 3, 4, 7);
-        assertBlockFilteredPositions(expectedValues, blockBuilder.build(), 2, 3, 5, 6);
+        Block block = createBlockBuilderWithValues(expectedValues).build();
+        assertBlock(block, expectedValues);
+        assertBlockFilteredPositions(expectedValues, block, 0, 1, 3, 4, 7);
+        assertBlockFilteredPositions(expectedValues, block, 2, 3, 5, 6);
 
         long[][][] expectedValuesWithNull = alternatingNullValues(expectedValues);
-        BlockBuilder blockBuilderWithNull = createBlockBuilderWithValues(expectedValuesWithNull);
-        assertBlock(blockBuilderWithNull, expectedValuesWithNull);
-        assertBlock(blockBuilderWithNull.build(), expectedValuesWithNull);
-        assertBlockFilteredPositions(expectedValuesWithNull, blockBuilderWithNull.build(), 0, 1, 5, 6, 7, 10, 11, 12, 15);
-        assertBlockFilteredPositions(expectedValuesWithNull, blockBuilderWithNull.build(), 2, 3, 4, 9, 13, 14);
+        Block blockWithNull = createBlockBuilderWithValues(expectedValuesWithNull).build();
+        assertBlock(blockWithNull, expectedValuesWithNull);
+        assertBlockFilteredPositions(expectedValuesWithNull, blockWithNull, 0, 1, 5, 6, 7, 10, 11, 12, 15);
+        assertBlockFilteredPositions(expectedValuesWithNull, blockWithNull, 2, 3, 4, 9, 13, 14);
     }
 
     private static long[][][] createExpectedValues()
@@ -130,7 +123,7 @@ public void testLazyBlockBuilderInitialization()
         for (int i = 0; i < ARRAY_SIZES.length; i++) {
             expectedValues[i] = rand.longs(ARRAY_SIZES[i]).toArray();
         }
-        BlockBuilder emptyBlockBuilder = new ArrayBlockBuilder(BIGINT, null, 0, 0);
+        ArrayBlockBuilder emptyBlockBuilder = new ArrayBlockBuilder(BIGINT, null, 0, 0);
 
         BlockBuilder blockBuilder = new ArrayBlockBuilder(BIGINT, null, 100, 100);
         assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
@@ -149,12 +142,10 @@ public void testLazyBlockBuilderInitialization()
     public void testEstimatedDataSizeForStats()
     {
         long[][][] expectedValues = alternatingNullValues(createExpectedValues());
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        Block block = blockBuilder.build();
+        Block block = createBlockBuilderWithValues(expectedValues).build();
         assertEquals(block.getPositionCount(), expectedValues.length);
         for (int i = 0; i < block.getPositionCount(); i++) {
             int expectedSize = getExpectedEstimatedDataSize(expectedValues[i]);
-            assertEquals(blockBuilder.getEstimatedDataSizeForStats(i), expectedSize);
             assertEquals(block.getEstimatedDataSizeForStats(i), expectedSize);
         }
     }
@@ -191,26 +182,22 @@ public void testCompactBlock()
 
     private static BlockBuilder createBlockBuilderWithValues(long[][][] expectedValues)
     {
-        BlockBuilder blockBuilder = new ArrayBlockBuilder(new ArrayBlockBuilder(BIGINT, null, 100, 100), null, 100);
+        ArrayBlockBuilder blockBuilder = new ArrayBlockBuilder(new ArrayBlockBuilder(BIGINT, null, 100, 100), null, 100);
         for (long[][] expectedValue : expectedValues) {
             if (expectedValue == null) {
                 blockBuilder.appendNull();
             }
             else {
-                BlockBuilder intermediateBlockBuilder = blockBuilder.beginBlockEntry();
-                for (int j = 0; j < expectedValue.length; j++) {
-                    if (expectedValue[j] == null) {
-                        intermediateBlockBuilder.appendNull();
-                    }
-                    else {
-                        BlockBuilder innerMostBlockBuilder = intermediateBlockBuilder.beginBlockEntry();
-                        for (long v : expectedValue[j]) {
-                            BIGINT.writeLong(innerMostBlockBuilder, v);
+                blockBuilder.buildEntry(elementBuilder -> {
+                    for (long[] values : expectedValue) {
+                        if (values == null) {
+                            elementBuilder.appendNull();
+                        }
+                        else {
+                            ((ArrayBlockBuilder) elementBuilder).buildEntry(innerBuilder -> Arrays.stream(values).forEach(value -> BIGINT.writeLong(innerBuilder, value)));
                         }
-                        intermediateBlockBuilder.closeEntry();
                     }
-                }
-                blockBuilder.closeEntry();
+                });
             }
         }
         return blockBuilder;
@@ -218,7 +205,7 @@ private static BlockBuilder createBlockBuilderWithValues(long[][][] expectedValu
 
     private static BlockBuilder createBlockBuilderWithValues(long[][] expectedValues)
     {
-        BlockBuilder blockBuilder = new ArrayBlockBuilder(BIGINT, null, 100, 100);
+        ArrayBlockBuilder blockBuilder = new ArrayBlockBuilder(BIGINT, null, 100, 100);
         return writeValues(expectedValues, blockBuilder);
     }
 
@@ -229,11 +216,11 @@ private static BlockBuilder writeValues(long[][] expectedValues, BlockBuilder bl
                 blockBuilder.appendNull();
             }
             else {
-                BlockBuilder elementBlockBuilder = blockBuilder.beginBlockEntry();
-                for (long v : expectedValue) {
-                    BIGINT.writeLong(elementBlockBuilder, v);
-                }
-                blockBuilder.closeEntry();
+                ((ArrayBlockBuilder) blockBuilder).buildEntry(elementBuilder -> {
+                    for (long v : expectedValue) {
+                        BIGINT.writeLong(elementBuilder, v);
+                    }
+                });
             }
         }
         return blockBuilder;
@@ -241,17 +228,17 @@ private static BlockBuilder writeValues(long[][] expectedValues, BlockBuilder bl
 
     private static BlockBuilder createBlockBuilderWithValues(Slice[][] expectedValues)
     {
-        BlockBuilder blockBuilder = new ArrayBlockBuilder(VARCHAR, null, 100, 100);
+        ArrayBlockBuilder blockBuilder = new ArrayBlockBuilder(VARCHAR, null, 100, 100);
         for (Slice[] expectedValue : expectedValues) {
             if (expectedValue == null) {
                 blockBuilder.appendNull();
             }
             else {
-                BlockBuilder elementBlockBuilder = blockBuilder.beginBlockEntry();
-                for (Slice v : expectedValue) {
-                    VARCHAR.writeSlice(elementBlockBuilder, v);
-                }
-                blockBuilder.closeEntry();
+                blockBuilder.buildEntry(elementBuilder -> {
+                    for (Slice v : expectedValue) {
+                        VARCHAR.writeSlice(elementBuilder, v);
+                    }
+                });
             }
         }
         return blockBuilder;
diff --git a/core/trino-main/src/test/java/io/trino/block/TestBlockAssertions.java b/core/trino-main/src/test/java/io/trino/block/TestBlockAssertions.java
index 07758b9a3016..6695611fecdb 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestBlockAssertions.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestBlockAssertions.java
@@ -14,7 +14,7 @@
 package io.trino.block;
 
 import com.google.common.base.VerifyException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Objects;
 
diff --git a/core/trino-main/src/test/java/io/trino/block/TestBlockBuilder.java b/core/trino-main/src/test/java/io/trino/block/TestBlockBuilder.java
index 75b08ccb4ec5..7eb0dac72e12 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestBlockBuilder.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestBlockBuilder.java
@@ -16,11 +16,12 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slices;
 import io.trino.spi.PageBuilder;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -55,20 +56,21 @@ public void testMultipleValuesWithNull()
     @Test
     public void testNewBlockBuilderLike()
     {
-        ArrayType longArrayType = new ArrayType(BIGINT);
-        ArrayType arrayType = new ArrayType(longArrayType);
-        List<Type> channels = ImmutableList.of(BIGINT, VARCHAR, arrayType);
+        List<Type> channels = ImmutableList.of(BIGINT, VARCHAR, new ArrayType(new ArrayType(BIGINT)));
         PageBuilder pageBuilder = new PageBuilder(channels);
         BlockBuilder bigintBlockBuilder = pageBuilder.getBlockBuilder(0);
         BlockBuilder varcharBlockBuilder = pageBuilder.getBlockBuilder(1);
-        BlockBuilder arrayBlockBuilder = pageBuilder.getBlockBuilder(2);
+        ArrayBlockBuilder arrayBlockBuilder = (ArrayBlockBuilder) pageBuilder.getBlockBuilder(2);
 
         for (int i = 0; i < 100; i++) {
-            BIGINT.writeLong(bigintBlockBuilder, i);
-            VARCHAR.writeSlice(varcharBlockBuilder, Slices.utf8Slice("test" + i));
-            BlockBuilder blockBuilder = longArrayType.createBlockBuilder(null, 1);
-            longArrayType.writeObject(blockBuilder, BIGINT.createBlockBuilder(null, 2).writeLong(i).writeLong(i * 2).build());
-            arrayType.writeObject(arrayBlockBuilder, blockBuilder);
+            int value = i;
+            BIGINT.writeLong(bigintBlockBuilder, value);
+            VARCHAR.writeSlice(varcharBlockBuilder, Slices.utf8Slice("test" + value));
+            arrayBlockBuilder.buildEntry(elementBuilder -> {
+                ArrayBlockBuilder nestedArrayBuilder = (ArrayBlockBuilder) elementBuilder;
+                nestedArrayBuilder.buildEntry(valueBuilder -> BIGINT.writeLong(valueBuilder, value));
+                nestedArrayBuilder.buildEntry(valueBuilder -> BIGINT.writeLong(valueBuilder, value * 2L));
+            });
             pageBuilder.declarePosition();
         }
 
@@ -85,30 +87,21 @@ public void testNewBlockBuilderLike()
     @Test
     public void testGetPositions()
     {
-        BlockBuilder blockBuilder = BIGINT.createFixedSizeBlockBuilder(5).appendNull().writeLong(42L).appendNull().writeLong(43L).appendNull();
+        BlockBuilder blockBuilder = BIGINT.createFixedSizeBlockBuilder(5);
+        blockBuilder.appendNull();
+        BIGINT.writeLong(blockBuilder, 42L);
+        blockBuilder.appendNull();
+        BIGINT.writeLong(blockBuilder, 43L);
+        blockBuilder.appendNull();
         int[] positions = new int[] {0, 1, 1, 1, 4};
 
-        // test getPositions for block builder
-        assertBlockEquals(BIGINT, blockBuilder.getPositions(positions, 0, positions.length), BIGINT.createFixedSizeBlockBuilder(5).appendNull().writeLong(42).writeLong(42).writeLong(42).appendNull().build());
-        assertBlockEquals(BIGINT, blockBuilder.getPositions(positions, 1, 4), BIGINT.createFixedSizeBlockBuilder(5).writeLong(42).writeLong(42).writeLong(42).appendNull().build());
-        assertBlockEquals(BIGINT, blockBuilder.getPositions(positions, 2, 1), BIGINT.createFixedSizeBlockBuilder(5).writeLong(42).build());
-        assertBlockEquals(BIGINT, blockBuilder.getPositions(positions, 0, 0), BIGINT.createFixedSizeBlockBuilder(5).build());
-        assertBlockEquals(BIGINT, blockBuilder.getPositions(positions, 1, 0), BIGINT.createFixedSizeBlockBuilder(5).build());
-
-        // out of range
-        assertInvalidPosition(blockBuilder, new int[] {-1}, 0, 1);
-        assertInvalidPosition(blockBuilder, new int[] {6}, 0, 1);
-        assertInvalidOffset(blockBuilder, new int[] {6}, 1, 1);
-        assertInvalidOffset(blockBuilder, new int[] {6}, -1, 1);
-        assertInvalidOffset(blockBuilder, new int[] {6}, 2, -1);
-
         // test getPositions for block
         Block block = blockBuilder.build();
-        assertBlockEquals(BIGINT, block.getPositions(positions, 0, positions.length), BIGINT.createFixedSizeBlockBuilder(5).appendNull().writeLong(42).writeLong(42).writeLong(42).appendNull().build());
-        assertBlockEquals(BIGINT, block.getPositions(positions, 1, 4), BIGINT.createFixedSizeBlockBuilder(5).writeLong(42).writeLong(42).writeLong(42).appendNull().build());
-        assertBlockEquals(BIGINT, block.getPositions(positions, 2, 1), BIGINT.createFixedSizeBlockBuilder(5).writeLong(42).build());
-        assertBlockEquals(BIGINT, block.getPositions(positions, 0, 0), BIGINT.createFixedSizeBlockBuilder(5).build());
-        assertBlockEquals(BIGINT, block.getPositions(positions, 1, 0), BIGINT.createFixedSizeBlockBuilder(5).build());
+        assertBlockEquals(BIGINT, block.getPositions(positions, 0, positions.length), buildBigintBlock(null, 42, 42, 42, null));
+        assertBlockEquals(BIGINT, block.getPositions(positions, 1, 4), buildBigintBlock(42, 42, 42, null));
+        assertBlockEquals(BIGINT, block.getPositions(positions, 2, 1), buildBigintBlock(42));
+        assertBlockEquals(BIGINT, block.getPositions(positions, 0, 0), buildBigintBlock());
+        assertBlockEquals(BIGINT, block.getPositions(positions, 1, 0), buildBigintBlock());
 
         // out of range
         assertInvalidPosition(block, new int[] {-1}, 0, 1);
@@ -127,11 +120,25 @@ public void testGetPositions()
         assertTrue(isIdentical.get());
     }
 
+    private static Block buildBigintBlock(Integer... values)
+    {
+        BlockBuilder blockBuilder = BIGINT.createFixedSizeBlockBuilder(5);
+        for (Integer value : values) {
+            if (value == null) {
+                blockBuilder.appendNull();
+            }
+            else {
+                BIGINT.writeLong(blockBuilder, value);
+            }
+        }
+        return blockBuilder.build();
+    }
+
     private static void assertInvalidPosition(Block block, int[] positions, int offset, int length)
     {
         assertThatThrownBy(() -> block.getPositions(positions, offset, length).getLong(0, 0))
                 .isInstanceOfAny(IllegalArgumentException.class, IndexOutOfBoundsException.class)
-                .hasMessage("Invalid position %d in block with %d positions", positions[0], block.getPositionCount());
+                .hasMessage("Invalid position %d and length 1 in block with %d positions", positions[0], block.getPositionCount());
     }
 
     private static void assertInvalidOffset(Block block, int[] positions, int offset, int length)
diff --git a/core/trino-main/src/test/java/io/trino/block/TestByteArrayBlock.java b/core/trino-main/src/test/java/io/trino/block/TestByteArrayBlock.java
index 8a6d42c55043..799ac8d5ca82 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestByteArrayBlock.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestByteArrayBlock.java
@@ -15,10 +15,11 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
+import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.ByteArrayBlock;
 import io.trino.spi.block.ByteArrayBlockBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -50,7 +51,7 @@ public void testLazyBlockBuilderInitialization()
         Slice[] expectedValues = createTestValue(100);
         BlockBuilder emptyBlockBuilder = new ByteArrayBlockBuilder(null, 0);
 
-        BlockBuilder blockBuilder = new ByteArrayBlockBuilder(null, expectedValues.length);
+        ByteArrayBlockBuilder blockBuilder = new ByteArrayBlockBuilder(null, expectedValues.length);
         assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
         assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
 
@@ -58,7 +59,7 @@ public void testLazyBlockBuilderInitialization()
         assertTrue(blockBuilder.getSizeInBytes() > emptyBlockBuilder.getSizeInBytes());
         assertTrue(blockBuilder.getRetainedSizeInBytes() > emptyBlockBuilder.getRetainedSizeInBytes());
 
-        blockBuilder = blockBuilder.newBlockBuilderLike(null);
+        blockBuilder = (ByteArrayBlockBuilder) blockBuilder.newBlockBuilderLike(null);
         assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
         assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
     }
@@ -83,9 +84,8 @@ public void testCompactBlock()
 
     private void assertFixedWithValues(Slice[] expectedValues)
     {
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        assertBlock(blockBuilder, expectedValues);
-        assertBlock(blockBuilder.build(), expectedValues);
+        Block block = createBlockBuilderWithValues(expectedValues).build();
+        assertBlock(block, expectedValues);
     }
 
     private static BlockBuilder createBlockBuilderWithValues(Slice[] expectedValues)
@@ -95,14 +95,14 @@ private static BlockBuilder createBlockBuilderWithValues(Slice[] expectedValues)
         return blockBuilder;
     }
 
-    private static void writeValues(Slice[] expectedValues, BlockBuilder blockBuilder)
+    private static void writeValues(Slice[] expectedValues, ByteArrayBlockBuilder blockBuilder)
     {
         for (Slice expectedValue : expectedValues) {
             if (expectedValue == null) {
                 blockBuilder.appendNull();
             }
             else {
-                blockBuilder.writeByte(expectedValue.getByte(0)).closeEntry();
+                blockBuilder.writeByte(expectedValue.getByte(0));
             }
         }
     }
diff --git a/core/trino-main/src/test/java/io/trino/block/TestColumnarArray.java b/core/trino-main/src/test/java/io/trino/block/TestColumnarArray.java
deleted file mode 100644
index de11862d45f1..000000000000
--- a/core/trino-main/src/test/java/io/trino/block/TestColumnarArray.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed 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 io.trino.block;
-
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.ColumnarArray;
-import io.trino.spi.block.RunLengthEncodedBlock;
-import io.trino.spi.type.ArrayType;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Array;
-import java.util.Arrays;
-
-import static io.trino.block.ColumnarTestUtils.alternatingNullValues;
-import static io.trino.block.ColumnarTestUtils.assertBlock;
-import static io.trino.block.ColumnarTestUtils.assertBlockPosition;
-import static io.trino.block.ColumnarTestUtils.createTestDictionaryBlock;
-import static io.trino.block.ColumnarTestUtils.createTestDictionaryExpectedValues;
-import static io.trino.block.ColumnarTestUtils.createTestRleBlock;
-import static io.trino.block.ColumnarTestUtils.createTestRleExpectedValues;
-import static io.trino.spi.block.ColumnarArray.toColumnarArray;
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static java.lang.String.format;
-import static org.testng.Assert.assertEquals;
-
-public class TestColumnarArray
-{
-    private static final int[] ARRAY_SIZES = new int[] {16, 0, 13, 1, 2, 11, 4, 7};
-
-    @Test
-    public void test()
-    {
-        Slice[][] expectedValues = new Slice[ARRAY_SIZES.length][];
-        for (int i = 0; i < ARRAY_SIZES.length; i++) {
-            expectedValues[i] = new Slice[ARRAY_SIZES[i]];
-            for (int j = 0; j < ARRAY_SIZES[i]; j++) {
-                if (j % 3 != 1) {
-                    expectedValues[i][j] = Slices.utf8Slice(format("%d.%d", i, j));
-                }
-            }
-        }
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        verifyBlock(blockBuilder, expectedValues);
-        verifyBlock(blockBuilder.build(), expectedValues);
-
-        Slice[][] expectedValuesWithNull = alternatingNullValues(expectedValues);
-        BlockBuilder blockBuilderWithNull = createBlockBuilderWithValues(expectedValuesWithNull);
-        verifyBlock(blockBuilderWithNull, expectedValuesWithNull);
-        verifyBlock(blockBuilderWithNull.build(), expectedValuesWithNull);
-    }
-
-    private static <T> void verifyBlock(Block block, T[] expectedValues)
-    {
-        assertBlock(block, expectedValues);
-
-        assertColumnarArray(block, expectedValues);
-        assertDictionaryBlock(block, expectedValues);
-        assertRunLengthEncodedBlock(block, expectedValues);
-
-        int offset = 1;
-        int length = expectedValues.length - 2;
-        Block blockRegion = block.getRegion(offset, length);
-        T[] expectedValuesRegion = Arrays.copyOfRange(expectedValues, offset, offset + length);
-
-        assertBlock(blockRegion, expectedValuesRegion);
-
-        assertColumnarArray(blockRegion, expectedValuesRegion);
-        assertDictionaryBlock(blockRegion, expectedValuesRegion);
-        assertRunLengthEncodedBlock(blockRegion, expectedValuesRegion);
-    }
-
-    private static <T> void assertDictionaryBlock(Block block, T[] expectedValues)
-    {
-        Block dictionaryBlock = createTestDictionaryBlock(block);
-        T[] expectedDictionaryValues = createTestDictionaryExpectedValues(expectedValues);
-
-        assertBlock(dictionaryBlock, expectedDictionaryValues);
-        assertColumnarArray(dictionaryBlock, expectedDictionaryValues);
-        assertRunLengthEncodedBlock(dictionaryBlock, expectedDictionaryValues);
-    }
-
-    private static <T> void assertRunLengthEncodedBlock(Block block, T[] expectedValues)
-    {
-        for (int position = 0; position < block.getPositionCount(); position++) {
-            RunLengthEncodedBlock runLengthEncodedBlock = createTestRleBlock(block, position);
-            T[] expectedDictionaryValues = createTestRleExpectedValues(expectedValues, position);
-
-            assertBlock(runLengthEncodedBlock, expectedDictionaryValues);
-            assertColumnarArray(runLengthEncodedBlock, expectedDictionaryValues);
-        }
-    }
-
-    private static <T> void assertColumnarArray(Block block, T[] expectedValues)
-    {
-        ColumnarArray columnarArray = toColumnarArray(block);
-        assertEquals(columnarArray.getPositionCount(), expectedValues.length);
-
-        Block elementsBlock = columnarArray.getElementsBlock();
-        int elementsPosition = 0;
-        for (int position = 0; position < expectedValues.length; position++) {
-            T expectedArray = expectedValues[position];
-            assertEquals(columnarArray.isNull(position), expectedArray == null);
-            assertEquals(columnarArray.getLength(position), expectedArray == null ? 0 : Array.getLength(expectedArray));
-            assertEquals(elementsPosition, columnarArray.getOffset(position));
-
-            for (int i = 0; i < columnarArray.getLength(position); i++) {
-                Object expectedElement = Array.get(expectedArray, i);
-                assertBlockPosition(elementsBlock, elementsPosition, expectedElement);
-                elementsPosition++;
-            }
-        }
-    }
-
-    public static BlockBuilder createBlockBuilderWithValues(Slice[][] expectedValues)
-    {
-        ArrayType arrayType = new ArrayType(VARCHAR);
-        BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, 100, 100);
-        for (Slice[] expectedValue : expectedValues) {
-            if (expectedValue == null) {
-                blockBuilder.appendNull();
-            }
-            else {
-                BlockBuilder elementBlockBuilder = VARCHAR.createBlockBuilder(null, expectedValue.length);
-                for (Slice v : expectedValue) {
-                    if (v == null) {
-                        elementBlockBuilder.appendNull();
-                    }
-                    else {
-                        VARCHAR.writeSlice(elementBlockBuilder, v);
-                    }
-                }
-                arrayType.writeObject(blockBuilder, elementBlockBuilder.build());
-            }
-        }
-        return blockBuilder;
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/block/TestColumnarMap.java b/core/trino-main/src/test/java/io/trino/block/TestColumnarMap.java
deleted file mode 100644
index 2d316822f463..000000000000
--- a/core/trino-main/src/test/java/io/trino/block/TestColumnarMap.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Licensed 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 io.trino.block;
-
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.ColumnarMap;
-import io.trino.spi.block.MapBlockBuilder;
-import io.trino.spi.block.RunLengthEncodedBlock;
-import io.trino.spi.type.MapType;
-import io.trino.spi.type.TypeSignature;
-import io.trino.spi.type.TypeSignatureParameter;
-import org.testng.annotations.Test;
-
-import java.util.Arrays;
-
-import static io.trino.block.ColumnarTestUtils.alternatingNullValues;
-import static io.trino.block.ColumnarTestUtils.assertBlock;
-import static io.trino.block.ColumnarTestUtils.assertBlockPosition;
-import static io.trino.block.ColumnarTestUtils.createTestDictionaryBlock;
-import static io.trino.block.ColumnarTestUtils.createTestDictionaryExpectedValues;
-import static io.trino.block.ColumnarTestUtils.createTestRleBlock;
-import static io.trino.block.ColumnarTestUtils.createTestRleExpectedValues;
-import static io.trino.spi.block.ColumnarMap.toColumnarMap;
-import static io.trino.spi.type.StandardTypes.MAP;
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
-import static java.lang.String.format;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-public class TestColumnarMap
-{
-    private static final int[] MAP_SIZES = new int[] {16, 0, 13, 1, 2, 11, 4, 7};
-
-    @Test
-    public void test()
-    {
-        Slice[][][] expectedValues = new Slice[MAP_SIZES.length][][];
-        for (int mapIndex = 0; mapIndex < MAP_SIZES.length; mapIndex++) {
-            expectedValues[mapIndex] = new Slice[MAP_SIZES[mapIndex]][];
-            for (int entryIndex = 0; entryIndex < MAP_SIZES[mapIndex]; entryIndex++) {
-                Slice[] entry = new Slice[2];
-                entry[0] = Slices.utf8Slice(format("key.%d.%d", mapIndex, entryIndex));
-                if (entryIndex % 3 != 1) {
-                    entry[1] = Slices.utf8Slice(format("value.%d.%d", mapIndex, entryIndex));
-                }
-                expectedValues[mapIndex][entryIndex] = entry;
-            }
-        }
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        verifyBlock(blockBuilder, expectedValues);
-        verifyBlock(blockBuilder.build(), expectedValues);
-
-        Slice[][][] expectedValuesWithNull = alternatingNullValues(expectedValues);
-        BlockBuilder blockBuilderWithNull = createBlockBuilderWithValues(expectedValuesWithNull);
-        verifyBlock(blockBuilderWithNull, expectedValuesWithNull);
-        verifyBlock(blockBuilderWithNull.build(), expectedValuesWithNull);
-    }
-
-    private static void verifyBlock(Block block, Slice[][][] expectedValues)
-    {
-        assertBlock(block, expectedValues);
-
-        assertColumnarMap(block, expectedValues);
-        assertDictionaryBlock(block, expectedValues);
-        assertRunLengthEncodedBlock(block, expectedValues);
-
-        int offset = 1;
-        int length = expectedValues.length - 2;
-        Block blockRegion = block.getRegion(offset, length);
-        Slice[][][] expectedValuesRegion = Arrays.copyOfRange(expectedValues, offset, offset + length);
-
-        assertBlock(blockRegion, expectedValuesRegion);
-
-        assertColumnarMap(blockRegion, expectedValuesRegion);
-        assertDictionaryBlock(blockRegion, expectedValuesRegion);
-        assertRunLengthEncodedBlock(blockRegion, expectedValuesRegion);
-    }
-
-    private static void assertDictionaryBlock(Block block, Slice[][][] expectedValues)
-    {
-        Block dictionaryBlock = createTestDictionaryBlock(block);
-        Slice[][][] expectedDictionaryValues = createTestDictionaryExpectedValues(expectedValues);
-
-        assertBlock(dictionaryBlock, expectedDictionaryValues);
-        assertColumnarMap(dictionaryBlock, expectedDictionaryValues);
-        assertRunLengthEncodedBlock(dictionaryBlock, expectedDictionaryValues);
-    }
-
-    private static void assertRunLengthEncodedBlock(Block block, Slice[][][] expectedValues)
-    {
-        for (int position = 0; position < block.getPositionCount(); position++) {
-            RunLengthEncodedBlock runLengthEncodedBlock = createTestRleBlock(block, position);
-            Slice[][][] expectedDictionaryValues = createTestRleExpectedValues(expectedValues, position);
-
-            assertBlock(runLengthEncodedBlock, expectedDictionaryValues);
-            assertColumnarMap(runLengthEncodedBlock, expectedDictionaryValues);
-        }
-    }
-
-    private static void assertColumnarMap(Block block, Slice[][][] expectedValues)
-    {
-        ColumnarMap columnarMap = toColumnarMap(block);
-        assertEquals(columnarMap.getPositionCount(), expectedValues.length);
-
-        Block keysBlock = columnarMap.getKeysBlock();
-        Block valuesBlock = columnarMap.getValuesBlock();
-        int elementsPosition = 0;
-        for (int position = 0; position < expectedValues.length; position++) {
-            Slice[][] expectedMap = expectedValues[position];
-            assertEquals(columnarMap.isNull(position), expectedMap == null);
-            if (expectedMap == null) {
-                assertEquals(columnarMap.getEntryCount(position), 0);
-                continue;
-            }
-
-            assertEquals(columnarMap.getEntryCount(position), expectedMap.length);
-            assertEquals(columnarMap.getOffset(position), elementsPosition);
-
-            for (int i = 0; i < columnarMap.getEntryCount(position); i++) {
-                Slice[] expectedEntry = expectedMap[i];
-
-                Slice expectedKey = expectedEntry[0];
-                assertBlockPosition(keysBlock, elementsPosition, expectedKey);
-
-                Slice expectedValue = expectedEntry[1];
-                assertBlockPosition(valuesBlock, elementsPosition, expectedValue);
-
-                elementsPosition++;
-            }
-        }
-    }
-
-    public static BlockBuilder createBlockBuilderWithValues(Slice[][][] expectedValues)
-    {
-        BlockBuilder blockBuilder = createMapBuilder(100);
-        for (Slice[][] expectedMap : expectedValues) {
-            if (expectedMap == null) {
-                blockBuilder.appendNull();
-            }
-            else {
-                BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-                VARCHAR.createBlockBuilder(null, expectedMap.length);
-                for (Slice[] entry : expectedMap) {
-                    Slice key = entry[0];
-                    assertNotNull(key);
-                    VARCHAR.writeSlice(entryBuilder, key);
-
-                    Slice value = entry[1];
-                    if (value == null) {
-                        entryBuilder.appendNull();
-                    }
-                    else {
-                        VARCHAR.writeSlice(entryBuilder, value);
-                    }
-                }
-                blockBuilder.closeEntry();
-            }
-        }
-        return blockBuilder;
-    }
-
-    private static BlockBuilder createMapBuilder(int expectedEntries)
-    {
-        MapType mapType = (MapType) TESTING_TYPE_MANAGER.getType(new TypeSignature(MAP, TypeSignatureParameter.typeParameter(VARCHAR.getTypeSignature()), TypeSignatureParameter.typeParameter(VARCHAR.getTypeSignature())));
-        return new MapBlockBuilder(mapType, null, expectedEntries);
-    }
-
-    @SuppressWarnings("unused")
-    public static long blockVarcharHashCode(Block block, int position)
-    {
-        return block.hash(position, 0, block.getSliceLength(position));
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/block/TestColumnarRow.java b/core/trino-main/src/test/java/io/trino/block/TestColumnarRow.java
deleted file mode 100644
index 6c39000aef6e..000000000000
--- a/core/trino-main/src/test/java/io/trino/block/TestColumnarRow.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed 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 io.trino.block;
-
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.BlockBuilderStatus;
-import io.trino.spi.block.ColumnarRow;
-import io.trino.spi.block.RowBlockBuilder;
-import io.trino.spi.block.RunLengthEncodedBlock;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.Collections;
-
-import static io.trino.block.ColumnarTestUtils.alternatingNullValues;
-import static io.trino.block.ColumnarTestUtils.assertBlock;
-import static io.trino.block.ColumnarTestUtils.assertBlockPosition;
-import static io.trino.block.ColumnarTestUtils.createTestDictionaryBlock;
-import static io.trino.block.ColumnarTestUtils.createTestDictionaryExpectedValues;
-import static io.trino.block.ColumnarTestUtils.createTestRleBlock;
-import static io.trino.block.ColumnarTestUtils.createTestRleExpectedValues;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static java.lang.String.format;
-import static org.testng.Assert.assertEquals;
-
-public class TestColumnarRow
-{
-    private static final int POSITION_COUNT = 5;
-    private static final int FIELD_COUNT = 5;
-
-    @Test
-    public void test()
-    {
-        Slice[][] expectedValues = new Slice[POSITION_COUNT][];
-        for (int i = 0; i < POSITION_COUNT; i++) {
-            expectedValues[i] = new Slice[FIELD_COUNT];
-            for (int j = 0; j < FIELD_COUNT; j++) {
-                if (j % 3 != 1) {
-                    expectedValues[i][j] = Slices.utf8Slice(format("%d.%d", i, j));
-                }
-            }
-        }
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        verifyBlock(blockBuilder, expectedValues);
-        verifyBlock(blockBuilder.build(), expectedValues);
-
-        Slice[][] expectedValuesWithNull = alternatingNullValues(expectedValues);
-        BlockBuilder blockBuilderWithNull = createBlockBuilderWithValues(expectedValuesWithNull);
-        verifyBlock(blockBuilderWithNull, expectedValuesWithNull);
-        verifyBlock(blockBuilderWithNull.build(), expectedValuesWithNull);
-    }
-
-    private static <T> void verifyBlock(Block block, T[] expectedValues)
-    {
-        assertBlock(block, expectedValues);
-
-        assertColumnarRow(block, expectedValues);
-        assertDictionaryBlock(block, expectedValues);
-        assertRunLengthEncodedBlock(block, expectedValues);
-
-        int offset = 1;
-        int length = expectedValues.length - 2;
-        Block blockRegion = block.getRegion(offset, length);
-        T[] expectedValuesRegion = Arrays.copyOfRange(expectedValues, offset, offset + length);
-
-        assertBlock(blockRegion, expectedValuesRegion);
-
-        assertColumnarRow(blockRegion, expectedValuesRegion);
-        assertDictionaryBlock(blockRegion, expectedValuesRegion);
-        assertRunLengthEncodedBlock(blockRegion, expectedValuesRegion);
-    }
-
-    private static <T> void assertDictionaryBlock(Block block, T[] expectedValues)
-    {
-        Block dictionaryBlock = createTestDictionaryBlock(block);
-        T[] expectedDictionaryValues = createTestDictionaryExpectedValues(expectedValues);
-
-        assertBlock(dictionaryBlock, expectedDictionaryValues);
-        assertColumnarRow(dictionaryBlock, expectedDictionaryValues);
-        assertRunLengthEncodedBlock(dictionaryBlock, expectedDictionaryValues);
-    }
-
-    private static <T> void assertRunLengthEncodedBlock(Block block, T[] expectedValues)
-    {
-        for (int position = 0; position < block.getPositionCount(); position++) {
-            RunLengthEncodedBlock runLengthEncodedBlock = createTestRleBlock(block, position);
-            T[] expectedDictionaryValues = createTestRleExpectedValues(expectedValues, position);
-
-            assertBlock(runLengthEncodedBlock, expectedDictionaryValues);
-            assertColumnarRow(runLengthEncodedBlock, expectedDictionaryValues);
-        }
-    }
-
-    private static <T> void assertColumnarRow(Block block, T[] expectedValues)
-    {
-        ColumnarRow columnarRow = toColumnarRow(block);
-        assertEquals(columnarRow.getPositionCount(), expectedValues.length);
-
-        for (int fieldId = 0; fieldId < FIELD_COUNT; fieldId++) {
-            Block fieldBlock = columnarRow.getField(fieldId);
-            int elementsPosition = 0;
-            for (int position = 0; position < expectedValues.length; position++) {
-                T expectedRow = expectedValues[position];
-                assertEquals(columnarRow.isNull(position), expectedRow == null);
-                if (expectedRow == null) {
-                    continue;
-                }
-
-                Object expectedElement = Array.get(expectedRow, fieldId);
-                assertBlockPosition(fieldBlock, elementsPosition, expectedElement);
-                elementsPosition++;
-            }
-        }
-    }
-
-    public static BlockBuilder createBlockBuilderWithValues(Slice[][] expectedValues)
-    {
-        BlockBuilder blockBuilder = createBlockBuilder(null, 100);
-        for (Slice[] expectedValue : expectedValues) {
-            if (expectedValue == null) {
-                blockBuilder.appendNull();
-            }
-            else {
-                BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-                for (Slice v : expectedValue) {
-                    if (v == null) {
-                        entryBuilder.appendNull();
-                    }
-                    else {
-                        VARCHAR.writeSlice(entryBuilder, v);
-                    }
-                }
-                blockBuilder.closeEntry();
-            }
-        }
-        return blockBuilder;
-    }
-
-    private static BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        return new RowBlockBuilder(Collections.nCopies(FIELD_COUNT, VARCHAR), blockBuilderStatus, expectedEntries);
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/block/TestDictionaryBlock.java b/core/trino-main/src/test/java/io/trino/block/TestDictionaryBlock.java
index ff005c128a6c..012caad797f0 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestDictionaryBlock.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestDictionaryBlock.java
@@ -22,7 +22,7 @@
 import io.trino.spi.block.IntArrayBlock;
 import io.trino.spi.block.VariableWidthBlock;
 import io.trino.spi.block.VariableWidthBlockBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/block/TestFixed12Block.java b/core/trino-main/src/test/java/io/trino/block/TestFixed12Block.java
new file mode 100644
index 000000000000..e8db36527c0b
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/block/TestFixed12Block.java
@@ -0,0 +1,169 @@
+/*
+ * Licensed 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 io.trino.block;
+
+import io.airlift.slice.Slice;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.Fixed12Block;
+import io.trino.spi.block.Fixed12BlockBuilder;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
+import static io.trino.spi.block.Fixed12Block.FIXED12_BYTES;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class TestFixed12Block
+        extends AbstractTestBlock
+{
+    @Test
+    public void test()
+    {
+        Slice[] expectedValues = createTestValue(17);
+        assertFixedWithValues(expectedValues);
+        assertFixedWithValues(alternatingNullValues(expectedValues));
+    }
+
+    @Test
+    public void testCopyPositions()
+    {
+        Slice[] expectedValues = alternatingNullValues(createTestValue(17));
+        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
+        assertBlockFilteredPositions(expectedValues, blockBuilder.build(), 0, 2, 4, 6, 7, 9, 10, 16);
+    }
+
+    @Test
+    public void testLazyBlockBuilderInitialization()
+    {
+        Slice[] expectedValues = createTestValue(100);
+        Fixed12BlockBuilder emptyBlockBuilder = new Fixed12BlockBuilder(null, 0);
+
+        Fixed12BlockBuilder blockBuilder = new Fixed12BlockBuilder(null, expectedValues.length);
+        assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
+        assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
+
+        writeValues(expectedValues, blockBuilder);
+        assertTrue(blockBuilder.getSizeInBytes() > emptyBlockBuilder.getSizeInBytes());
+        assertTrue(blockBuilder.getRetainedSizeInBytes() > emptyBlockBuilder.getRetainedSizeInBytes());
+
+        blockBuilder = (Fixed12BlockBuilder) blockBuilder.newBlockBuilderLike(null);
+        assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
+        assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
+    }
+
+    @Test
+    public void testEstimatedDataSizeForStats()
+    {
+        Slice[] expectedValues = createTestValue(100);
+        assertEstimatedDataSizeForStats(createBlockBuilderWithValues(expectedValues), expectedValues);
+    }
+
+    @Test
+    public void testCompactBlock()
+    {
+        int[] intArray = {
+                0, 0, 0,
+                0, 0, 0,
+                0, 0, 1,
+                0, 0, 2,
+                0, 0, 3,
+                0, 0, 4};
+        boolean[] valueIsNull = {false, true, false, false, false, false};
+
+        testCompactBlock(new Fixed12Block(0, Optional.empty(), new int[0]));
+        testCompactBlock(new Fixed12Block(valueIsNull.length, Optional.of(valueIsNull), intArray));
+        testIncompactBlock(new Fixed12Block(valueIsNull.length - 2, Optional.of(valueIsNull), intArray));
+    }
+
+    private void assertFixedWithValues(Slice[] expectedValues)
+    {
+        Block block = createBlockBuilderWithValues(expectedValues).build();
+        assertBlock(block, expectedValues);
+    }
+
+    private static BlockBuilder createBlockBuilderWithValues(Slice[] expectedValues)
+    {
+        Fixed12BlockBuilder blockBuilder = new Fixed12BlockBuilder(null, expectedValues.length);
+        writeValues(expectedValues, blockBuilder);
+        return blockBuilder;
+    }
+
+    private static void writeValues(Slice[] expectedValues, Fixed12BlockBuilder blockBuilder)
+    {
+        for (Slice expectedValue : expectedValues) {
+            if (expectedValue == null) {
+                blockBuilder.appendNull();
+            }
+            else {
+                blockBuilder.writeFixed12(
+                        expectedValue.getLong(0),
+                        expectedValue.getInt(8));
+            }
+        }
+    }
+
+    private static Slice[] createTestValue(int positionCount)
+    {
+        Slice[] expectedValues = new Slice[positionCount];
+        for (int position = 0; position < positionCount; position++) {
+            expectedValues[position] = createExpectedValue(FIXED12_BYTES);
+        }
+        return expectedValues;
+    }
+
+    @Override
+    protected void assertPositionEquals(Block block, int position, Slice expectedBytes)
+    {
+        assertEquals(block.getLong(position, 0), expectedBytes.getLong(0));
+        assertEquals(block.getInt(position, 8), expectedBytes.getInt(8));
+    }
+
+    @Override
+    protected boolean isByteAccessSupported()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean isShortAccessSupported()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean isIntAccessSupported()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean isLongAccessSupported()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean isAlignedLongAccessSupported()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean isSliceAccessSupported()
+    {
+        return false;
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/block/TestInt128ArrayBlock.java b/core/trino-main/src/test/java/io/trino/block/TestInt128ArrayBlock.java
index 7c7e44429d82..c58a77b46bbc 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestInt128ArrayBlock.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestInt128ArrayBlock.java
@@ -14,11 +14,11 @@
 package io.trino.block;
 
 import io.airlift.slice.Slice;
+import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.Int128ArrayBlock;
 import io.trino.spi.block.Int128ArrayBlockBuilder;
-import io.trino.spi.block.VariableWidthBlockBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -49,9 +49,9 @@ public void testCopyPositions()
     public void testLazyBlockBuilderInitialization()
     {
         Slice[] expectedValues = createTestValue(100);
-        BlockBuilder emptyBlockBuilder = new VariableWidthBlockBuilder(null, 0, 0);
+        BlockBuilder emptyBlockBuilder = new Int128ArrayBlockBuilder(null, 0);
 
-        BlockBuilder blockBuilder = new VariableWidthBlockBuilder(null, expectedValues.length, 32 * expectedValues.length);
+        BlockBuilder blockBuilder = new Int128ArrayBlockBuilder(null, expectedValues.length);
         assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
         assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
 
@@ -84,9 +84,8 @@ public void testCompactBlock()
 
     private void assertFixedWithValues(Slice[] expectedValues)
     {
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        assertBlock(blockBuilder, expectedValues);
-        assertBlock(blockBuilder.build(), expectedValues);
+        Block block = createBlockBuilderWithValues(expectedValues).build();
+        assertBlock(block, expectedValues);
     }
 
     private static BlockBuilder createBlockBuilderWithValues(Slice[] expectedValues)
@@ -103,9 +102,9 @@ private static void writeValues(Slice[] expectedValues, BlockBuilder blockBuilde
                 blockBuilder.appendNull();
             }
             else {
-                blockBuilder.writeLong(expectedValue.getLong(0));
-                blockBuilder.writeLong(expectedValue.getLong(8));
-                blockBuilder.closeEntry();
+                ((Int128ArrayBlockBuilder) blockBuilder).writeInt128(
+                        expectedValue.getLong(0),
+                        expectedValue.getLong(8));
             }
         }
     }
diff --git a/core/trino-main/src/test/java/io/trino/block/TestInt96ArrayBlock.java b/core/trino-main/src/test/java/io/trino/block/TestInt96ArrayBlock.java
deleted file mode 100644
index c1f82076c121..000000000000
--- a/core/trino-main/src/test/java/io/trino/block/TestInt96ArrayBlock.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Licensed 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 io.trino.block;
-
-import io.airlift.slice.Slice;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.Int96ArrayBlock;
-import io.trino.spi.block.Int96ArrayBlockBuilder;
-import io.trino.spi.block.VariableWidthBlockBuilder;
-import org.testng.annotations.Test;
-
-import java.util.Optional;
-
-import static io.trino.spi.block.Int96ArrayBlock.INT96_BYTES;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-public class TestInt96ArrayBlock
-        extends AbstractTestBlock
-{
-    @Test
-    public void test()
-    {
-        Slice[] expectedValues = createTestValue(17);
-        assertFixedWithValues(expectedValues);
-        assertFixedWithValues(alternatingNullValues(expectedValues));
-    }
-
-    @Test
-    public void testCopyPositions()
-    {
-        Slice[] expectedValues = alternatingNullValues(createTestValue(17));
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        assertBlockFilteredPositions(expectedValues, blockBuilder.build(), 0, 2, 4, 6, 7, 9, 10, 16);
-    }
-
-    @Test
-    public void testLazyBlockBuilderInitialization()
-    {
-        Slice[] expectedValues = createTestValue(100);
-        BlockBuilder emptyBlockBuilder = new VariableWidthBlockBuilder(null, 0, 0);
-
-        BlockBuilder blockBuilder = new VariableWidthBlockBuilder(null, expectedValues.length, 32 * expectedValues.length);
-        assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
-        assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
-
-        writeValues(expectedValues, blockBuilder);
-        assertTrue(blockBuilder.getSizeInBytes() > emptyBlockBuilder.getSizeInBytes());
-        assertTrue(blockBuilder.getRetainedSizeInBytes() > emptyBlockBuilder.getRetainedSizeInBytes());
-
-        blockBuilder = blockBuilder.newBlockBuilderLike(null);
-        assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
-        assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
-    }
-
-    @Test
-    public void testEstimatedDataSizeForStats()
-    {
-        Slice[] expectedValues = createTestValue(100);
-        assertEstimatedDataSizeForStats(createBlockBuilderWithValues(expectedValues), expectedValues);
-    }
-
-    @Test
-    public void testCompactBlock()
-    {
-        long[] high = {0L, 0L, 0L, 0L, 0L, 0L};
-        int[] low = {0, 0, 1, 2, 3, 4};
-        boolean[] valueIsNull = {false, true, false, false, false, false};
-
-        testCompactBlock(new Int96ArrayBlock(0, Optional.empty(), new long[0], new int[0]));
-        testCompactBlock(new Int96ArrayBlock(valueIsNull.length, Optional.of(valueIsNull), high, low));
-        testIncompactBlock(new Int96ArrayBlock(valueIsNull.length - 2, Optional.of(valueIsNull), high, low));
-    }
-
-    private void assertFixedWithValues(Slice[] expectedValues)
-    {
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        assertBlock(blockBuilder, expectedValues);
-        assertBlock(blockBuilder.build(), expectedValues);
-    }
-
-    private static BlockBuilder createBlockBuilderWithValues(Slice[] expectedValues)
-    {
-        Int96ArrayBlockBuilder blockBuilder = new Int96ArrayBlockBuilder(null, expectedValues.length);
-        writeValues(expectedValues, blockBuilder);
-        return blockBuilder;
-    }
-
-    private static void writeValues(Slice[] expectedValues, BlockBuilder blockBuilder)
-    {
-        for (Slice expectedValue : expectedValues) {
-            if (expectedValue == null) {
-                blockBuilder.appendNull();
-            }
-            else {
-                blockBuilder.writeLong(expectedValue.getLong(0));
-                blockBuilder.writeInt(expectedValue.getInt(8));
-                blockBuilder.closeEntry();
-            }
-        }
-    }
-
-    private static Slice[] createTestValue(int positionCount)
-    {
-        Slice[] expectedValues = new Slice[positionCount];
-        for (int position = 0; position < positionCount; position++) {
-            expectedValues[position] = createExpectedValue(INT96_BYTES);
-        }
-        return expectedValues;
-    }
-
-    @Override
-    protected void assertPositionEquals(Block block, int position, Slice expectedBytes)
-    {
-        assertEquals(block.getLong(position, 0), expectedBytes.getLong(0));
-        assertEquals(block.getInt(position, 8), expectedBytes.getInt(8));
-    }
-
-    @Override
-    protected boolean isByteAccessSupported()
-    {
-        return false;
-    }
-
-    @Override
-    protected boolean isShortAccessSupported()
-    {
-        return false;
-    }
-
-    @Override
-    protected boolean isIntAccessSupported()
-    {
-        return false;
-    }
-
-    @Override
-    protected boolean isLongAccessSupported()
-    {
-        return false;
-    }
-
-    @Override
-    protected boolean isAlignedLongAccessSupported()
-    {
-        return false;
-    }
-
-    @Override
-    protected boolean isSliceAccessSupported()
-    {
-        return false;
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/block/TestIntArrayBlock.java b/core/trino-main/src/test/java/io/trino/block/TestIntArrayBlock.java
index c1c6aab457ba..14359b95913f 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestIntArrayBlock.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestIntArrayBlock.java
@@ -14,10 +14,11 @@
 package io.trino.block;
 
 import io.airlift.slice.Slice;
+import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.IntArrayBlock;
 import io.trino.spi.block.IntArrayBlockBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -50,7 +51,7 @@ public void testLazyBlockBuilderInitialization()
         Slice[] expectedValues = createTestValue(100);
         BlockBuilder emptyBlockBuilder = new IntArrayBlockBuilder(null, 0);
 
-        BlockBuilder blockBuilder = new IntArrayBlockBuilder(null, expectedValues.length);
+        IntArrayBlockBuilder blockBuilder = new IntArrayBlockBuilder(null, expectedValues.length);
         assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
         assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
 
@@ -58,7 +59,7 @@ public void testLazyBlockBuilderInitialization()
         assertTrue(blockBuilder.getSizeInBytes() > emptyBlockBuilder.getSizeInBytes());
         assertTrue(blockBuilder.getRetainedSizeInBytes() > emptyBlockBuilder.getRetainedSizeInBytes());
 
-        blockBuilder = blockBuilder.newBlockBuilderLike(null);
+        blockBuilder = (IntArrayBlockBuilder) blockBuilder.newBlockBuilderLike(null);
         assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
         assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
     }
@@ -83,9 +84,8 @@ public void testCompactBlock()
 
     private void assertFixedWithValues(Slice[] expectedValues)
     {
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        assertBlock(blockBuilder, expectedValues);
-        assertBlock(blockBuilder.build(), expectedValues);
+        Block block = createBlockBuilderWithValues(expectedValues).build();
+        assertBlock(block, expectedValues);
     }
 
     private static BlockBuilder createBlockBuilderWithValues(Slice[] expectedValues)
@@ -95,14 +95,14 @@ private static BlockBuilder createBlockBuilderWithValues(Slice[] expectedValues)
         return blockBuilder;
     }
 
-    private static void writeValues(Slice[] expectedValues, BlockBuilder blockBuilder)
+    private static void writeValues(Slice[] expectedValues, IntArrayBlockBuilder blockBuilder)
     {
         for (Slice expectedValue : expectedValues) {
             if (expectedValue == null) {
                 blockBuilder.appendNull();
             }
             else {
-                blockBuilder.writeInt(expectedValue.getInt(0)).closeEntry();
+                blockBuilder.writeInt(expectedValue.getInt(0));
             }
         }
     }
diff --git a/core/trino-main/src/test/java/io/trino/block/TestLongArrayBlock.java b/core/trino-main/src/test/java/io/trino/block/TestLongArrayBlock.java
index c95ad5795ff6..1c8bf099c9a1 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestLongArrayBlock.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestLongArrayBlock.java
@@ -14,11 +14,11 @@
 package io.trino.block;
 
 import io.airlift.slice.Slice;
+import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.LongArrayBlockBuilder;
-import io.trino.spi.block.VariableWidthBlockBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -49,9 +49,9 @@ public void testCopyPositions()
     public void testLazyBlockBuilderInitialization()
     {
         Slice[] expectedValues = createTestValue(100);
-        BlockBuilder emptyBlockBuilder = new VariableWidthBlockBuilder(null, 0, 0);
+        BlockBuilder emptyBlockBuilder = new LongArrayBlockBuilder(null, 0);
 
-        BlockBuilder blockBuilder = new VariableWidthBlockBuilder(null, expectedValues.length, 32 * expectedValues.length);
+        LongArrayBlockBuilder blockBuilder = new LongArrayBlockBuilder(null, expectedValues.length);
         assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
         assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
 
@@ -59,7 +59,7 @@ public void testLazyBlockBuilderInitialization()
         assertTrue(blockBuilder.getSizeInBytes() > emptyBlockBuilder.getSizeInBytes());
         assertTrue(blockBuilder.getRetainedSizeInBytes() > emptyBlockBuilder.getRetainedSizeInBytes());
 
-        blockBuilder = blockBuilder.newBlockBuilderLike(null);
+        blockBuilder = (LongArrayBlockBuilder) blockBuilder.newBlockBuilderLike(null);
         assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
         assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
     }
@@ -84,9 +84,8 @@ public void testCompactBlock()
 
     private void assertFixedWithValues(Slice[] expectedValues)
     {
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        assertBlock(blockBuilder, expectedValues);
-        assertBlock(blockBuilder.build(), expectedValues);
+        Block block = createBlockBuilderWithValues(expectedValues).build();
+        assertBlock(block, expectedValues);
     }
 
     private static BlockBuilder createBlockBuilderWithValues(Slice[] expectedValues)
@@ -96,14 +95,14 @@ private static BlockBuilder createBlockBuilderWithValues(Slice[] expectedValues)
         return blockBuilder;
     }
 
-    private static void writeValues(Slice[] expectedValues, BlockBuilder blockBuilder)
+    private static void writeValues(Slice[] expectedValues, LongArrayBlockBuilder blockBuilder)
     {
         for (Slice expectedValue : expectedValues) {
             if (expectedValue == null) {
                 blockBuilder.appendNull();
             }
             else {
-                blockBuilder.writeLong(expectedValue.getLong(0)).closeEntry();
+                blockBuilder.writeLong(expectedValue.getLong(0));
             }
         }
     }
diff --git a/core/trino-main/src/test/java/io/trino/block/TestMapBlock.java b/core/trino-main/src/test/java/io/trino/block/TestMapBlock.java
index 767dce557022..7f560fd067a1 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestMapBlock.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestMapBlock.java
@@ -20,9 +20,9 @@
 import io.trino.spi.block.DuplicateMapKeyException;
 import io.trino.spi.block.MapBlock;
 import io.trino.spi.block.MapBlockBuilder;
-import io.trino.spi.block.SingleMapBlock;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.type.MapType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -201,13 +201,9 @@ private static Map<String, Long>[] createTestMap(int... entryCounts)
     private void testWith(Map<String, Long>[] expectedValues)
     {
         BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        assertFalse(blockBuilder.mayHaveNull());
 
-        assertBlock(blockBuilder, expectedValues);
         assertBlock(blockBuilder.build(), expectedValues);
-        assertBlockFilteredPositions(expectedValues, blockBuilder, 0, 1, 3, 4, 7);
         assertBlockFilteredPositions(expectedValues, blockBuilder.build(), 0, 1, 3, 4, 7);
-        assertBlockFilteredPositions(expectedValues, blockBuilder, 2, 3, 5, 6);
         assertBlockFilteredPositions(expectedValues, blockBuilder.build(), 2, 3, 5, 6);
 
         Block block = createBlockWithValuesFromKeyValueBlock(expectedValues);
@@ -219,13 +215,9 @@ private void testWith(Map<String, Long>[] expectedValues)
 
         Map<String, Long>[] expectedValuesWithNull = alternatingNullValues(expectedValues);
         BlockBuilder blockBuilderWithNull = createBlockBuilderWithValues(expectedValuesWithNull);
-        assertTrue(blockBuilderWithNull.mayHaveNull());
 
-        assertBlock(blockBuilderWithNull, expectedValuesWithNull);
         assertBlock(blockBuilderWithNull.build(), expectedValuesWithNull);
-        assertBlockFilteredPositions(expectedValuesWithNull, blockBuilderWithNull, 0, 1, 5, 6, 7, 10, 11, 12, 15);
         assertBlockFilteredPositions(expectedValuesWithNull, blockBuilderWithNull.build(), 0, 1, 5, 6, 7, 10, 11, 12, 15);
-        assertBlockFilteredPositions(expectedValuesWithNull, blockBuilderWithNull, 2, 3, 4, 9, 13, 14);
         assertBlockFilteredPositions(expectedValuesWithNull, blockBuilderWithNull.build(), 2, 3, 4, 9, 13, 14);
 
         Block blockWithNull = createBlockWithValuesFromKeyValueBlock(expectedValuesWithNull);
@@ -239,7 +231,7 @@ private void testWith(Map<String, Long>[] expectedValues)
     private BlockBuilder createBlockBuilderWithValues(Map<String, Long>[] maps)
     {
         MapType mapType = mapType(VARCHAR, BIGINT);
-        BlockBuilder mapBlockBuilder = mapType.createBlockBuilder(null, 1);
+        MapBlockBuilder mapBlockBuilder = mapType.createBlockBuilder(null, 1);
         for (Map<String, Long> map : maps) {
             createBlockBuilderWithValues(map, mapBlockBuilder);
         }
@@ -276,23 +268,23 @@ private MapBlock createBlockWithValuesFromKeyValueBlock(Map<String, Long>[] maps
                 createLongsBlock(values));
     }
 
-    private void createBlockBuilderWithValues(Map<String, Long> map, BlockBuilder mapBlockBuilder)
+    private void createBlockBuilderWithValues(Map<String, Long> map, MapBlockBuilder mapBlockBuilder)
     {
         if (map == null) {
             mapBlockBuilder.appendNull();
         }
         else {
-            BlockBuilder elementBlockBuilder = mapBlockBuilder.beginBlockEntry();
-            for (Map.Entry<String, Long> entry : map.entrySet()) {
-                VARCHAR.writeSlice(elementBlockBuilder, utf8Slice(entry.getKey()));
-                if (entry.getValue() == null) {
-                    elementBlockBuilder.appendNull();
-                }
-                else {
-                    BIGINT.writeLong(elementBlockBuilder, entry.getValue());
+            mapBlockBuilder.buildEntry((keyBuilder, valueBuilder) -> {
+                for (Map.Entry<String, Long> entry : map.entrySet()) {
+                    VARCHAR.writeSlice(keyBuilder, utf8Slice(entry.getKey()));
+                    if (entry.getValue() == null) {
+                        valueBuilder.appendNull();
+                    }
+                    else {
+                        BIGINT.writeLong(valueBuilder, entry.getValue());
+                    }
                 }
-            }
-            mapBlockBuilder.closeEntry();
+            });
         }
     }
 
@@ -314,35 +306,38 @@ private void assertValue(Block mapBlock, int position, Map<String, Long> map)
         requireNonNull(map, "map is null");
 
         assertFalse(mapBlock.isNull(position));
-        SingleMapBlock elementBlock = (SingleMapBlock) mapType.getObject(mapBlock, position);
-        assertEquals(elementBlock.getPositionCount(), map.size() * 2);
+        SqlMap sqlMap = mapType.getObject(mapBlock, position);
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+        assertEquals(sqlMap.getSize(), map.size());
 
         // Test new/hash-index access: assert inserted keys
         for (Map.Entry<String, Long> entry : map.entrySet()) {
-            int pos = elementBlock.seekKey(utf8Slice(entry.getKey()));
-            assertNotEquals(pos, -1);
+            int index = sqlMap.seekKey(utf8Slice(entry.getKey()));
+            assertNotEquals(index, -1);
             if (entry.getValue() == null) {
-                assertTrue(elementBlock.isNull(pos));
+                assertTrue(rawValueBlock.isNull(rawOffset + index));
             }
             else {
-                assertFalse(elementBlock.isNull(pos));
-                assertEquals(BIGINT.getLong(elementBlock, pos), (long) entry.getValue());
+                assertFalse(rawValueBlock.isNull(rawOffset + index));
+                assertEquals(BIGINT.getLong(rawValueBlock, rawOffset + index), (long) entry.getValue());
             }
         }
         // Test new/hash-index access: assert non-existent keys
         for (int i = 0; i < 10; i++) {
-            assertEquals(elementBlock.seekKey(utf8Slice("not-inserted-" + i)), -1);
+            assertEquals(sqlMap.seekKey(utf8Slice("not-inserted-" + i)), -1);
         }
 
         // Test legacy/iterative access
-        for (int i = 0; i < elementBlock.getPositionCount(); i += 2) {
-            String actualKey = VARCHAR.getSlice(elementBlock, i).toStringUtf8();
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            String actualKey = VARCHAR.getSlice(rawKeyBlock, rawOffset + i).toStringUtf8();
             Long actualValue;
-            if (elementBlock.isNull(i + 1)) {
+            if (rawValueBlock.isNull(rawOffset + i)) {
                 actualValue = null;
             }
             else {
-                actualValue = BIGINT.getLong(elementBlock, i + 1);
+                actualValue = BIGINT.getLong(rawValueBlock, rawOffset + i);
             }
             assertTrue(map.containsKey(actualKey));
             assertEquals(actualValue, map.get(actualKey));
@@ -353,61 +348,40 @@ private void assertValue(Block mapBlock, int position, Map<String, Long> map)
     public void testStrict()
     {
         MapType mapType = mapType(BIGINT, BIGINT);
-        MapBlockBuilder mapBlockBuilder = (MapBlockBuilder) mapType.createBlockBuilder(null, 1);
+        MapBlockBuilder mapBlockBuilder = mapType.createBlockBuilder(null, 1);
         mapBlockBuilder.strict();
 
         // Add 100 maps with only one entry but the same key
         for (int i = 0; i < 100; i++) {
-            BlockBuilder entryBuilder = mapBlockBuilder.beginBlockEntry();
-            BIGINT.writeLong(entryBuilder, 1);
-            BIGINT.writeLong(entryBuilder, -1);
-            mapBlockBuilder.closeEntry();
-        }
-
-        BlockBuilder entryBuilder = mapBlockBuilder.beginBlockEntry();
-        // Add 50 keys so we get some chance to get hash conflict
-        // The purpose of this test is to make sure offset is calculated correctly in MapBlockBuilder.closeEntryStrict()
-        for (int i = 0; i < 50; i++) {
-            BIGINT.writeLong(entryBuilder, i);
-            BIGINT.writeLong(entryBuilder, -1);
+            mapBlockBuilder.buildEntry((keyBuilder, valueBuilder) -> {
+                BIGINT.writeLong(keyBuilder, 1);
+                BIGINT.writeLong(valueBuilder, -1);
+            });
         }
-        mapBlockBuilder.closeEntry();
-
-        entryBuilder = mapBlockBuilder.beginBlockEntry();
-        for (int i = 0; i < 2; i++) {
-            BIGINT.writeLong(entryBuilder, 99);
-            BIGINT.writeLong(entryBuilder, -1);
-        }
-        assertThatThrownBy(mapBlockBuilder::closeEntry)
+        mapBlockBuilder.build();
+
+        mapBlockBuilder.buildEntry((keyBuilder, valueBuilder) -> {
+            // Add 50 keys so we get some chance to get hash conflict
+            // The purpose of this test is to make sure offset is calculated correctly in MapBlockBuilder.closeEntryStrict()
+            for (int i = 0; i < 50; i++) {
+                BIGINT.writeLong(keyBuilder, i);
+                BIGINT.writeLong(valueBuilder, -1);
+            }
+        });
+        mapBlockBuilder.build();
+
+        // map block builder does not check for problems until the block is built
+        mapBlockBuilder.buildEntry((keyBuilder, valueBuilder) -> {
+            for (int i = 0; i < 2; i++) {
+                BIGINT.writeLong(keyBuilder, 99);
+                BIGINT.writeLong(valueBuilder, -1);
+            }
+        });
+        assertThatThrownBy(mapBlockBuilder::build)
                 .isInstanceOf(DuplicateMapKeyException.class)
                 .hasMessage("Duplicate map keys are not allowed");
     }
 
-    @Test
-    public void testCloseEntryStrict()
-            throws Exception
-    {
-        MapType mapType = mapType(BIGINT, BIGINT);
-        MapBlockBuilder mapBlockBuilder = (MapBlockBuilder) mapType.createBlockBuilder(null, 1);
-
-        // Add 100 maps with only one entry but the same key
-        for (int i = 0; i < 100; i++) {
-            BlockBuilder entryBuilder = mapBlockBuilder.beginBlockEntry();
-            BIGINT.writeLong(entryBuilder, 1);
-            BIGINT.writeLong(entryBuilder, -1);
-            mapBlockBuilder.closeEntry();
-        }
-
-        BlockBuilder entryBuilder = mapBlockBuilder.beginBlockEntry();
-        // Add 50 keys so we get some chance to get hash conflict
-        // The purpose of this test is to make sure offset is calculated correctly in MapBlockBuilder.closeEntryStrict()
-        for (int i = 0; i < 50; i++) {
-            BIGINT.writeLong(entryBuilder, i);
-            BIGINT.writeLong(entryBuilder, -1);
-        }
-        mapBlockBuilder.closeEntryStrict();
-    }
-
     @Test
     public void testEstimatedDataSizeForStats()
     {
@@ -417,7 +391,6 @@ public void testEstimatedDataSizeForStats()
         assertEquals(block.getPositionCount(), expectedValues.length);
         for (int i = 0; i < block.getPositionCount(); i++) {
             int expectedSize = getExpectedEstimatedDataSize(expectedValues[i]);
-            assertEquals(blockBuilder.getEstimatedDataSizeForStats(i), expectedSize);
             assertEquals(block.getEstimatedDataSizeForStats(i), expectedSize);
         }
     }
diff --git a/core/trino-main/src/test/java/io/trino/block/TestRowBlock.java b/core/trino-main/src/test/java/io/trino/block/TestRowBlock.java
index bdc07dd4d62d..839cd9deab76 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestRowBlock.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestRowBlock.java
@@ -19,19 +19,19 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.ByteArrayBlock;
 import io.trino.spi.block.RowBlockBuilder;
-import io.trino.spi.block.SingleRowBlock;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.Type;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.spi.block.RowBlock.fromFieldBlocks;
+import static io.trino.spi.block.RowBlock.fromNotNullSuppressedFieldBlocks;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.String.format;
@@ -58,12 +58,10 @@ public void testEstimatedDataSizeForStats()
     {
         List<Type> fieldTypes = ImmutableList.of(VARCHAR, BIGINT);
         List<Object>[] expectedValues = alternatingNullValues(generateTestRows(fieldTypes, 100));
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(fieldTypes, expectedValues);
-        Block block = blockBuilder.build();
+        Block block = createBlockBuilderWithValues(fieldTypes, expectedValues).build();
         assertEquals(block.getPositionCount(), expectedValues.length);
         for (int i = 0; i < block.getPositionCount(); i++) {
             int expectedSize = getExpectedEstimatedDataSize(expectedValues[i]);
-            assertEquals(blockBuilder.getEstimatedDataSizeForStats(i), expectedSize);
             assertEquals(block.getEstimatedDataSizeForStats(i), expectedSize);
         }
     }
@@ -71,19 +69,14 @@ public void testEstimatedDataSizeForStats()
     @Test
     public void testFromFieldBlocksNoNullsDetection()
     {
-        Block emptyBlock = new ByteArrayBlock(0, Optional.empty(), new byte[0]);
-        Block fieldBlock = new ByteArrayBlock(5, Optional.empty(), createExpectedValue(5).getBytes());
-
-        boolean[] rowIsNull = new boolean[fieldBlock.getPositionCount()];
-        Arrays.fill(rowIsNull, false);
-
-        // Blocks may discard the null mask during creation if no values are null
-        assertFalse(fromFieldBlocks(5, Optional.of(rowIsNull), new Block[]{fieldBlock}).mayHaveNull());
-        // Last position is null must retain the nulls mask
+        // Blocks does not discard the null mask during creation if no values are null
+        boolean[] rowIsNull = new boolean[5];
+        assertTrue(fromNotNullSuppressedFieldBlocks(5, Optional.of(rowIsNull), new Block[]{new ByteArrayBlock(5, Optional.empty(), createExpectedValue(5).getBytes())}).mayHaveNull());
         rowIsNull[rowIsNull.length - 1] = true;
-        assertTrue(fromFieldBlocks(5, Optional.of(rowIsNull), new Block[]{fieldBlock}).mayHaveNull());
+        assertTrue(fromNotNullSuppressedFieldBlocks(5, Optional.of(rowIsNull), new Block[]{new ByteArrayBlock(5, Optional.of(rowIsNull), createExpectedValue(5).getBytes())}).mayHaveNull());
+
         // Empty blocks have no nulls and can also discard their null mask
-        assertFalse(fromFieldBlocks(0, Optional.of(new boolean[0]), new Block[]{emptyBlock}).mayHaveNull());
+        assertFalse(fromNotNullSuppressedFieldBlocks(0, Optional.of(new boolean[0]), new Block[]{new ByteArrayBlock(0, Optional.empty(), new byte[0])}).mayHaveNull());
 
         // Normal blocks should have null masks preserved
         List<Type> fieldTypes = ImmutableList.of(VARCHAR, BIGINT);
@@ -106,59 +99,51 @@ private int getExpectedEstimatedDataSize(List<Object> row)
     public void testCompactBlock()
     {
         Block emptyBlock = new ByteArrayBlock(0, Optional.empty(), new byte[0]);
-        Block compactFieldBlock1 = new ByteArrayBlock(5, Optional.empty(), createExpectedValue(5).getBytes());
-        Block compactFieldBlock2 = new ByteArrayBlock(5, Optional.empty(), createExpectedValue(5).getBytes());
-        Block incompactFieldBlock1 = new ByteArrayBlock(5, Optional.empty(), createExpectedValue(6).getBytes());
-        Block incompactFieldBlock2 = new ByteArrayBlock(5, Optional.empty(), createExpectedValue(6).getBytes());
         boolean[] rowIsNull = {false, true, false, false, false, false};
 
-        assertCompact(fromFieldBlocks(0, Optional.empty(), new Block[] {emptyBlock, emptyBlock}));
-        assertCompact(fromFieldBlocks(rowIsNull.length, Optional.of(rowIsNull), new Block[] {compactFieldBlock1, compactFieldBlock2}));
-        // TODO: add test case for a sliced RowBlock
-
-        // underlying field blocks are not compact
-        testIncompactBlock(fromFieldBlocks(rowIsNull.length, Optional.of(rowIsNull), new Block[] {incompactFieldBlock1, incompactFieldBlock2}));
-        testIncompactBlock(fromFieldBlocks(rowIsNull.length, Optional.of(rowIsNull), new Block[] {incompactFieldBlock1, incompactFieldBlock2}));
+        // NOTE: nested row blocks are required to have the exact same size so they are always compact
+        assertCompact(fromFieldBlocks(0, new Block[] {emptyBlock, emptyBlock}));
+        assertCompact(fromNotNullSuppressedFieldBlocks(rowIsNull.length, Optional.of(rowIsNull), new Block[]{
+                new ByteArrayBlock(6, Optional.of(rowIsNull), createExpectedValue(6).getBytes()),
+                new ByteArrayBlock(6, Optional.of(rowIsNull), createExpectedValue(6).getBytes())}));
     }
 
     private void testWith(List<Type> fieldTypes, List<Object>[] expectedValues)
     {
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(fieldTypes, expectedValues);
-
-        assertBlock(blockBuilder, expectedValues);
-        assertBlock(blockBuilder.build(), expectedValues);
+        Block block = createBlockBuilderWithValues(fieldTypes, expectedValues).build();
+        assertBlock(block, expectedValues);
 
         IntArrayList positionList = generatePositionList(expectedValues.length, expectedValues.length / 2);
-        assertBlockFilteredPositions(expectedValues, blockBuilder, positionList.toIntArray());
-        assertBlockFilteredPositions(expectedValues, blockBuilder.build(), positionList.toIntArray());
+        assertBlockFilteredPositions(expectedValues, block, positionList.toIntArray());
     }
 
     private BlockBuilder createBlockBuilderWithValues(List<Type> fieldTypes, List<Object>[] rows)
     {
-        BlockBuilder rowBlockBuilder = new RowBlockBuilder(fieldTypes, null, 1);
+        RowBlockBuilder rowBlockBuilder = new RowBlockBuilder(fieldTypes, null, 1);
         for (List<Object> row : rows) {
             if (row == null) {
                 rowBlockBuilder.appendNull();
             }
             else {
-                BlockBuilder singleRowBlockWriter = rowBlockBuilder.beginBlockEntry();
-                for (Object fieldValue : row) {
-                    if (fieldValue == null) {
-                        singleRowBlockWriter.appendNull();
-                    }
-                    else {
-                        if (fieldValue instanceof Long) {
-                            BIGINT.writeLong(singleRowBlockWriter, ((Long) fieldValue).longValue());
-                        }
-                        else if (fieldValue instanceof String) {
-                            VARCHAR.writeSlice(singleRowBlockWriter, utf8Slice((String) fieldValue));
+                rowBlockBuilder.buildEntry(fieldBuilders -> {
+                    for (int i = 0; i < row.size(); i++) {
+                        Object fieldValue = row.get(i);
+                        if (fieldValue == null) {
+                            fieldBuilders.get(i).appendNull();
                         }
                         else {
-                            throw new IllegalArgumentException();
+                            if (fieldValue instanceof Long) {
+                                BIGINT.writeLong(fieldBuilders.get(i), ((Long) fieldValue).longValue());
+                            }
+                            else if (fieldValue instanceof String) {
+                                VARCHAR.writeSlice(fieldBuilders.get(i), utf8Slice((String) fieldValue));
+                            }
+                            else {
+                                throw new IllegalArgumentException();
+                            }
                         }
                     }
-                }
-                rowBlockBuilder.closeEntry();
+                });
             }
         }
 
@@ -181,20 +166,22 @@ private void assertValue(Block rowBlock, int position, List<?> row)
         requireNonNull(row, "row is null");
 
         assertFalse(rowBlock.isNull(position));
-        SingleRowBlock singleRowBlock = (SingleRowBlock) rowBlock.getObject(position, Block.class);
-        assertEquals(singleRowBlock.getPositionCount(), row.size());
+        SqlRow sqlRow = rowBlock.getObject(position, SqlRow.class);
+        assertEquals(sqlRow.getFieldCount(), row.size());
 
+        int rawIndex = sqlRow.getRawIndex();
         for (int i = 0; i < row.size(); i++) {
             Object fieldValue = row.get(i);
+            Block rawFieldBlock = sqlRow.getRawFieldBlock(i);
             if (fieldValue == null) {
-                assertTrue(singleRowBlock.isNull(i));
+                assertTrue(rawFieldBlock.isNull(rawIndex));
             }
             else {
                 if (fieldValue instanceof Long) {
-                    assertEquals(BIGINT.getLong(singleRowBlock, i), ((Long) fieldValue).longValue());
+                    assertEquals(BIGINT.getLong(rawFieldBlock, rawIndex), ((Long) fieldValue).longValue());
                 }
                 else if (fieldValue instanceof String) {
-                    assertEquals(VARCHAR.getSlice(singleRowBlock, i), utf8Slice((String) fieldValue));
+                    assertEquals(VARCHAR.getSlice(rawFieldBlock, rawIndex), utf8Slice((String) fieldValue));
                 }
                 else {
                     throw new IllegalArgumentException();
diff --git a/core/trino-main/src/test/java/io/trino/block/TestRunLengthEncodedBlock.java b/core/trino-main/src/test/java/io/trino/block/TestRunLengthEncodedBlock.java
index 9268a96b547d..fc4b869efc94 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestRunLengthEncodedBlock.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestRunLengthEncodedBlock.java
@@ -23,7 +23,7 @@
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.block.ShortArrayBlockBuilder;
 import io.trino.spi.block.VariableWidthBlockBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
@@ -52,8 +52,8 @@ private void assertRleBlock(int positionCount)
 
     private static Block createSingleValueBlock(Slice expectedValue)
     {
-        BlockBuilder blockBuilder = new VariableWidthBlockBuilder(null, 1, expectedValue.length());
-        blockBuilder.writeBytes(expectedValue, 0, expectedValue.length()).closeEntry();
+        VariableWidthBlockBuilder blockBuilder = new VariableWidthBlockBuilder(null, 1, expectedValue.length());
+        blockBuilder.writeEntry(expectedValue);
         return blockBuilder.build();
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/block/TestShortArrayBlock.java b/core/trino-main/src/test/java/io/trino/block/TestShortArrayBlock.java
index 246efd161c80..1bedaf8f905e 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestShortArrayBlock.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestShortArrayBlock.java
@@ -14,10 +14,11 @@
 package io.trino.block;
 
 import io.airlift.slice.Slice;
+import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.ShortArrayBlock;
 import io.trino.spi.block.ShortArrayBlockBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -48,9 +49,9 @@ public void testCopyPositions()
     public void testLazyBlockBuilderInitialization()
     {
         Slice[] expectedValues = createTestValue(100);
-        BlockBuilder emptyBlockBuilder = new ShortArrayBlockBuilder(null, 0);
+        ShortArrayBlockBuilder emptyBlockBuilder = new ShortArrayBlockBuilder(null, 0);
 
-        BlockBuilder blockBuilder = new ShortArrayBlockBuilder(null, expectedValues.length);
+        ShortArrayBlockBuilder blockBuilder = new ShortArrayBlockBuilder(null, expectedValues.length);
         assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
         assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
 
@@ -58,7 +59,7 @@ public void testLazyBlockBuilderInitialization()
         assertTrue(blockBuilder.getSizeInBytes() > emptyBlockBuilder.getSizeInBytes());
         assertTrue(blockBuilder.getRetainedSizeInBytes() > emptyBlockBuilder.getRetainedSizeInBytes());
 
-        blockBuilder = blockBuilder.newBlockBuilderLike(null);
+        blockBuilder = (ShortArrayBlockBuilder) blockBuilder.newBlockBuilderLike(null);
         assertEquals(blockBuilder.getSizeInBytes(), emptyBlockBuilder.getSizeInBytes());
         assertEquals(blockBuilder.getRetainedSizeInBytes(), emptyBlockBuilder.getRetainedSizeInBytes());
     }
@@ -83,9 +84,8 @@ public void testCompactBlock()
 
     private void assertFixedWithValues(Slice[] expectedValues)
     {
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        assertBlock(blockBuilder, expectedValues);
-        assertBlock(blockBuilder.build(), expectedValues);
+        Block block = createBlockBuilderWithValues(expectedValues).build();
+        assertBlock(block, expectedValues);
     }
 
     private static BlockBuilder createBlockBuilderWithValues(Slice[] expectedValues)
@@ -95,14 +95,14 @@ private static BlockBuilder createBlockBuilderWithValues(Slice[] expectedValues)
         return blockBuilder;
     }
 
-    private static void writeValues(Slice[] expectedValues, BlockBuilder blockBuilder)
+    private static void writeValues(Slice[] expectedValues, ShortArrayBlockBuilder blockBuilder)
     {
         for (Slice expectedValue : expectedValues) {
             if (expectedValue == null) {
                 blockBuilder.appendNull();
             }
             else {
-                blockBuilder.writeShort(expectedValue.getShort(0)).closeEntry();
+                blockBuilder.writeShort(expectedValue.getShort(0));
             }
         }
     }
diff --git a/core/trino-main/src/test/java/io/trino/block/TestSingleRowBlockWriter.java b/core/trino-main/src/test/java/io/trino/block/TestSingleRowBlockWriter.java
deleted file mode 100644
index ed1185edf079..000000000000
--- a/core/trino-main/src/test/java/io/trino/block/TestSingleRowBlockWriter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed 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 io.trino.block;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.spi.block.RowBlockBuilder;
-import io.trino.spi.block.SingleRowBlockWriter;
-import io.trino.spi.type.RowType;
-import io.trino.spi.type.Type;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.List;
-
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.BooleanType.BOOLEAN;
-import static org.testng.Assert.assertEquals;
-
-public class TestSingleRowBlockWriter
-{
-    private RowBlockBuilder rowBlockBuilder;
-
-    @BeforeClass
-    public void setup()
-    {
-        List<Type> types = ImmutableList.of(BIGINT, BOOLEAN);
-        rowBlockBuilder = (RowBlockBuilder) RowType.anonymous(types).createBlockBuilder(null, 8);
-    }
-
-    @Test
-    public void testGetSizeInBytes()
-    {
-        SingleRowBlockWriter singleRowBlockWriter = rowBlockBuilder.beginBlockEntry();
-        // Test whether new singleRowBlockWriter has size equal to 0
-        assertEquals(0, singleRowBlockWriter.getSizeInBytes());
-
-        singleRowBlockWriter.writeLong(10).closeEntry();
-        assertEquals(9, singleRowBlockWriter.getSizeInBytes());
-
-        singleRowBlockWriter.writeByte(10).closeEntry();
-        assertEquals(11, singleRowBlockWriter.getSizeInBytes());
-        rowBlockBuilder.closeEntry();
-
-        // Test whether previous entry does not mix to the next entry (for size). Does reset works on size?
-        singleRowBlockWriter = rowBlockBuilder.beginBlockEntry();
-        assertEquals(0, singleRowBlockWriter.getSizeInBytes());
-
-        singleRowBlockWriter.writeLong(10).closeEntry();
-        assertEquals(9, singleRowBlockWriter.getSizeInBytes());
-
-        singleRowBlockWriter.writeByte(10).closeEntry();
-        assertEquals(11, singleRowBlockWriter.getSizeInBytes());
-        rowBlockBuilder.closeEntry();
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/block/TestVariableWidthBlock.java b/core/trino-main/src/test/java/io/trino/block/TestVariableWidthBlock.java
index 3c0b2cb0b3ad..f28baf2a23f9 100644
--- a/core/trino-main/src/test/java/io/trino/block/TestVariableWidthBlock.java
+++ b/core/trino-main/src/test/java/io/trino/block/TestVariableWidthBlock.java
@@ -14,13 +14,12 @@
 package io.trino.block;
 
 import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.VariableWidthBlock;
 import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.type.VarcharType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -121,8 +120,8 @@ public void testEstimatedDataSizeForStats()
     @Test
     public void testCompactBlock()
     {
-        Slice compactSlice = Slices.copyOf(createExpectedValue(16));
-        Slice incompactSlice = Slices.copyOf(createExpectedValue(20)).slice(0, 16);
+        Slice compactSlice = createExpectedValue(16).copy();
+        Slice incompactSlice = createExpectedValue(20).copy().slice(0, 16);
         int[] offsets = {0, 1, 1, 2, 4, 8, 16};
         boolean[] valueIsNull = {false, true, false, false, false, false};
 
@@ -136,9 +135,8 @@ public void testCompactBlock()
 
     private void assertVariableWithValues(Slice[] expectedValues)
     {
-        BlockBuilder blockBuilder = createBlockBuilderWithValues(expectedValues);
-        assertBlock(blockBuilder, expectedValues);
-        assertBlock(blockBuilder.build(), expectedValues);
+        Block block = createBlockBuilderWithValues(expectedValues).build();
+        assertBlock(block, expectedValues);
     }
 
     private static BlockBuilder createBlockBuilderWithValues(Slice[] expectedValues)
@@ -154,7 +152,7 @@ private static BlockBuilder writeValues(Slice[] expectedValues, BlockBuilder blo
                 blockBuilder.appendNull();
             }
             else {
-                blockBuilder.writeBytes(expectedValue, 0, expectedValue.length()).closeEntry();
+                ((VariableWidthBlockBuilder) blockBuilder).writeEntry(expectedValue);
             }
         }
         return blockBuilder;
diff --git a/core/trino-main/src/test/java/io/trino/connector/MockConnector.java b/core/trino-main/src/test/java/io/trino/connector/MockConnector.java
index 7fbe7b4fa551..a7ddc2d04fd1 100644
--- a/core/trino-main/src/test/java/io/trino/connector/MockConnector.java
+++ b/core/trino-main/src/test/java/io/trino/connector/MockConnector.java
@@ -72,6 +72,7 @@
 import io.trino.spi.connector.MaterializedViewFreshness;
 import io.trino.spi.connector.ProjectionApplicationResult;
 import io.trino.spi.connector.RecordPageSource;
+import io.trino.spi.connector.RelationColumnsMetadata;
 import io.trino.spi.connector.RetryMode;
 import io.trino.spi.connector.RowChangeParadigm;
 import io.trino.spi.connector.SchemaTableName;
@@ -82,14 +83,19 @@
 import io.trino.spi.connector.TableProcedureMetadata;
 import io.trino.spi.connector.TableScanRedirectApplicationResult;
 import io.trino.spi.connector.TopNApplicationResult;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.eventlistener.EventListener;
 import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.FunctionDependencyDeclaration;
+import io.trino.spi.function.FunctionId;
+import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.FunctionProvider;
 import io.trino.spi.function.SchemaFunctionName;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.metrics.Metrics;
 import io.trino.spi.procedure.Procedure;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
 import io.trino.spi.security.GrantInfo;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.RoleGrant;
@@ -112,6 +118,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -121,6 +128,7 @@
 import static io.trino.spi.connector.MaterializedViewFreshness.Freshness.FRESH;
 import static io.trino.spi.connector.MaterializedViewFreshness.Freshness.STALE;
 import static io.trino.spi.connector.RowChangeParadigm.DELETE_ROW_AND_INSERT_ROW;
+import static io.trino.spi.function.FunctionDependencyDeclaration.NO_DEPENDENCIES;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.CompletableFuture.completedFuture;
@@ -132,9 +140,11 @@ public class MockConnector
     private static final String UPDATE_ROW_ID = "update_row_id";
     private static final String MERGE_ROW_ID = "merge_row_id";
 
+    private final Function<ConnectorMetadata, ConnectorMetadata> metadataWrapper;
     private final Function<ConnectorSession, List<String>> listSchemaNames;
     private final BiFunction<ConnectorSession, String, List<String>> listTables;
     private final Optional<BiFunction<ConnectorSession, SchemaTablePrefix, Iterator<TableColumnsMetadata>>> streamTableColumns;
+    private final Optional<MockConnectorFactory.StreamRelationColumns> streamRelationColumns;
     private final BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorViewDefinition>> getViews;
     private final Supplier<List<PropertyMetadata<?>>> getMaterializedViewProperties;
     private final BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorMaterializedViewDefinition>> getMaterializedViews;
@@ -142,6 +152,7 @@ public class MockConnector
     private final BiFunction<ConnectorSession, SchemaTableName, CompletableFuture<?>> refreshMaterializedView;
     private final BiFunction<ConnectorSession, SchemaTableName, ConnectorTableHandle> getTableHandle;
     private final Function<SchemaTableName, List<ColumnMetadata>> getColumns;
+    private final Function<SchemaTableName, Optional<String>> getComment;
     private final Function<SchemaTableName, TableStatistics> getTableStatistics;
     private final Function<SchemaTableName, List<String>> checkConstraints;
     private final MockConnectorFactory.ApplyProjection applyProjection;
@@ -154,9 +165,11 @@ public class MockConnector
     private final BiFunction<ConnectorSession, SchemaTableName, Optional<CatalogSchemaTableName>> redirectTable;
     private final BiFunction<ConnectorSession, SchemaTableName, Optional<ConnectorTableLayout>> getInsertLayout;
     private final BiFunction<ConnectorSession, ConnectorTableMetadata, Optional<ConnectorTableLayout>> getNewTableLayout;
+    private final BiFunction<ConnectorSession, Type, Optional<Type>> getSupportedType;
     private final BiFunction<ConnectorSession, ConnectorTableHandle, ConnectorTableProperties> getTableProperties;
     private final BiFunction<ConnectorSession, SchemaTablePrefix, List<GrantInfo>> listTablePrivileges;
     private final Supplier<Iterable<EventListener>> eventListeners;
+    private final Collection<FunctionMetadata> functions;
     private final MockConnectorFactory.ListRoleGrants roleGrants;
     private final Optional<ConnectorNodePartitioningProvider> partitioningProvider;
     private final Optional<ConnectorAccessControl> accessControl;
@@ -166,22 +179,24 @@ public class MockConnector
     private final Set<TableProcedureMetadata> tableProcedures;
     private final Set<ConnectorTableFunction> tableFunctions;
     private final Optional<FunctionProvider> functionProvider;
-    private final boolean supportsReportingWrittenBytes;
     private final boolean allowMissingColumnsOnInsert;
     private final Supplier<List<PropertyMetadata<?>>> analyzeProperties;
     private final Supplier<List<PropertyMetadata<?>>> schemaProperties;
     private final Supplier<List<PropertyMetadata<?>>> tableProperties;
     private final Supplier<List<PropertyMetadata<?>>> columnProperties;
     private final List<PropertyMetadata<?>> sessionProperties;
-    private final Map<SchemaFunctionName, Function<ConnectorTableFunctionHandle, ConnectorSplitSource>> tableFunctionSplitsSources;
+    private final Function<ConnectorTableFunctionHandle, ConnectorSplitSource> tableFunctionSplitsSources;
     private final OptionalInt maxWriterTasks;
     private final BiFunction<ConnectorSession, ConnectorTableExecuteHandle, Optional<ConnectorTableLayout>> getLayoutForTableExecute;
+    private final WriterScalingOptions writerScalingOptions;
 
     MockConnector(
+            Function<ConnectorMetadata, ConnectorMetadata> metadataWrapper,
             List<PropertyMetadata<?>> sessionProperties,
             Function<ConnectorSession, List<String>> listSchemaNames,
             BiFunction<ConnectorSession, String, List<String>> listTables,
             Optional<BiFunction<ConnectorSession, SchemaTablePrefix, Iterator<TableColumnsMetadata>>> streamTableColumns,
+            Optional<MockConnectorFactory.StreamRelationColumns> streamRelationColumns,
             BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorViewDefinition>> getViews,
             Supplier<List<PropertyMetadata<?>>> getMaterializedViewProperties,
             BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorMaterializedViewDefinition>> getMaterializedViews,
@@ -189,6 +204,7 @@ public class MockConnector
             BiFunction<ConnectorSession, SchemaTableName, CompletableFuture<?>> refreshMaterializedView,
             BiFunction<ConnectorSession, SchemaTableName, ConnectorTableHandle> getTableHandle,
             Function<SchemaTableName, List<ColumnMetadata>> getColumns,
+            Function<SchemaTableName, Optional<String>> getComment,
             Function<SchemaTableName, TableStatistics> getTableStatistics,
             Function<SchemaTableName, List<String>> checkConstraints,
             ApplyProjection applyProjection,
@@ -201,9 +217,11 @@ public class MockConnector
             BiFunction<ConnectorSession, SchemaTableName, Optional<CatalogSchemaTableName>> redirectTable,
             BiFunction<ConnectorSession, SchemaTableName, Optional<ConnectorTableLayout>> getInsertLayout,
             BiFunction<ConnectorSession, ConnectorTableMetadata, Optional<ConnectorTableLayout>> getNewTableLayout,
+            BiFunction<ConnectorSession, Type, Optional<Type>> getSupportedType,
             BiFunction<ConnectorSession, ConnectorTableHandle, ConnectorTableProperties> getTableProperties,
             BiFunction<ConnectorSession, SchemaTablePrefix, List<GrantInfo>> listTablePrivileges,
             Supplier<Iterable<EventListener>> eventListeners,
+            Collection<FunctionMetadata> functions,
             ListRoleGrants roleGrants,
             Optional<ConnectorNodePartitioningProvider> partitioningProvider,
             Optional<ConnectorAccessControl> accessControl,
@@ -218,15 +236,17 @@ public class MockConnector
             Supplier<List<PropertyMetadata<?>>> schemaProperties,
             Supplier<List<PropertyMetadata<?>>> tableProperties,
             Supplier<List<PropertyMetadata<?>>> columnProperties,
-            boolean supportsReportingWrittenBytes,
-            Map<SchemaFunctionName, Function<ConnectorTableFunctionHandle, ConnectorSplitSource>> tableFunctionSplitsSources,
+            Function<ConnectorTableFunctionHandle, ConnectorSplitSource> tableFunctionSplitsSources,
             OptionalInt maxWriterTasks,
-            BiFunction<ConnectorSession, ConnectorTableExecuteHandle, Optional<ConnectorTableLayout>> getLayoutForTableExecute)
+            BiFunction<ConnectorSession, ConnectorTableExecuteHandle, Optional<ConnectorTableLayout>> getLayoutForTableExecute,
+            WriterScalingOptions writerScalingOptions)
     {
+        this.metadataWrapper = requireNonNull(metadataWrapper, "metadataWrapper is null");
         this.sessionProperties = ImmutableList.copyOf(requireNonNull(sessionProperties, "sessionProperties is null"));
         this.listSchemaNames = requireNonNull(listSchemaNames, "listSchemaNames is null");
         this.listTables = requireNonNull(listTables, "listTables is null");
         this.streamTableColumns = requireNonNull(streamTableColumns, "streamTableColumns is null");
+        this.streamRelationColumns = requireNonNull(streamRelationColumns, "streamRelationColumns is null");
         this.getViews = requireNonNull(getViews, "getViews is null");
         this.getMaterializedViewProperties = requireNonNull(getMaterializedViewProperties, "getMaterializedViewProperties is null");
         this.getMaterializedViews = requireNonNull(getMaterializedViews, "getMaterializedViews is null");
@@ -234,6 +254,7 @@ public class MockConnector
         this.refreshMaterializedView = requireNonNull(refreshMaterializedView, "refreshMaterializedView is null");
         this.getTableHandle = requireNonNull(getTableHandle, "getTableHandle is null");
         this.getColumns = requireNonNull(getColumns, "getColumns is null");
+        this.getComment = requireNonNull(getComment, "getComment is null");
         this.getTableStatistics = requireNonNull(getTableStatistics, "getTableStatistics is null");
         this.checkConstraints = requireNonNull(checkConstraints, "checkConstraints is null");
         this.applyProjection = requireNonNull(applyProjection, "applyProjection is null");
@@ -246,9 +267,11 @@ public class MockConnector
         this.redirectTable = requireNonNull(redirectTable, "redirectTable is null");
         this.getInsertLayout = requireNonNull(getInsertLayout, "getInsertLayout is null");
         this.getNewTableLayout = requireNonNull(getNewTableLayout, "getNewTableLayout is null");
+        this.getSupportedType = requireNonNull(getSupportedType, "getSupportedType is null");
         this.getTableProperties = requireNonNull(getTableProperties, "getTableProperties is null");
         this.listTablePrivileges = requireNonNull(listTablePrivileges, "listTablePrivileges is null");
         this.eventListeners = requireNonNull(eventListeners, "eventListeners is null");
+        this.functions = ImmutableList.copyOf(functions);
         this.roleGrants = requireNonNull(roleGrants, "roleGrants is null");
         this.partitioningProvider = requireNonNull(partitioningProvider, "partitioningProvider is null");
         this.accessControl = requireNonNull(accessControl, "accessControl is null");
@@ -258,15 +281,15 @@ public class MockConnector
         this.tableProcedures = requireNonNull(tableProcedures, "tableProcedures is null");
         this.tableFunctions = requireNonNull(tableFunctions, "tableFunctions is null");
         this.functionProvider = requireNonNull(functionProvider, "functionProvider is null");
-        this.supportsReportingWrittenBytes = supportsReportingWrittenBytes;
         this.allowMissingColumnsOnInsert = allowMissingColumnsOnInsert;
         this.analyzeProperties = requireNonNull(analyzeProperties, "analyzeProperties is null");
         this.schemaProperties = requireNonNull(schemaProperties, "schemaProperties is null");
         this.tableProperties = requireNonNull(tableProperties, "tableProperties is null");
         this.columnProperties = requireNonNull(columnProperties, "columnProperties is null");
-        this.tableFunctionSplitsSources = ImmutableMap.copyOf(tableFunctionSplitsSources);
+        this.tableFunctionSplitsSources = requireNonNull(tableFunctionSplitsSources, "tableFunctionSplitsSources is null");
         this.maxWriterTasks = requireNonNull(maxWriterTasks, "maxWriterTasks is null");
         this.getLayoutForTableExecute = requireNonNull(getLayoutForTableExecute, "getLayoutForTableExecute is null");
+        this.writerScalingOptions = requireNonNull(writerScalingOptions, "writerScalingOptions is null");
     }
 
     @Override
@@ -284,7 +307,7 @@ public ConnectorTransactionHandle beginTransaction(IsolationLevel isolationLevel
     @Override
     public ConnectorMetadata getMetadata(ConnectorSession session, ConnectorTransactionHandle transaction)
     {
-        return new MockConnectorMetadata();
+        return metadataWrapper.apply(new MockConnectorMetadata());
     }
 
     @Override
@@ -316,11 +339,10 @@ public ConnectorSplitSource getSplits(
             }
 
             @Override
-            public ConnectorSplitSource getSplits(ConnectorTransactionHandle transaction, ConnectorSession session, SchemaFunctionName name, ConnectorTableFunctionHandle functionHandle)
+            public ConnectorSplitSource getSplits(ConnectorTransactionHandle transaction, ConnectorSession session, ConnectorTableFunctionHandle functionHandle)
             {
-                Function<ConnectorTableFunctionHandle, ConnectorSplitSource> splitSourceProvider = tableFunctionSplitsSources.get(name);
-                requireNonNull(splitSourceProvider, "missing ConnectorSplitSource for table function " + name);
-                return splitSourceProvider.apply(functionHandle);
+                ConnectorSplitSource splits = tableFunctionSplitsSources.apply(functionHandle);
+                return requireNonNull(splits, "missing ConnectorSplitSource for table function handle " + functionHandle.getClass().getSimpleName());
             }
         };
     }
@@ -492,7 +514,7 @@ public void renameSchema(ConnectorSession session, String source, String target)
         public void setSchemaAuthorization(ConnectorSession session, String schemaName, TrinoPrincipal principal) {}
 
         @Override
-        public void dropSchema(ConnectorSession session, String schemaName) {}
+        public void dropSchema(ConnectorSession session, String schemaName, boolean cascade) {}
 
         @Override
         public ConnectorTableHandle getTableHandle(ConnectorSession session, SchemaTableName tableName)
@@ -508,7 +530,7 @@ public ConnectorTableMetadata getTableMetadata(ConnectorSession session, Connect
                     table.getTableName(),
                     getColumns.apply(table.getTableName()),
                     ImmutableMap.of(),
-                    Optional.empty(),
+                    getComment.apply(table.getTableName()),
                     checkConstraints.apply(table.getTableName()));
         }
 
@@ -571,6 +593,15 @@ public Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession sessio
                     .iterator();
         }
 
+        @Override
+        public Iterator<RelationColumnsMetadata> streamRelationColumns(ConnectorSession session, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
+        {
+            if (streamRelationColumns.isPresent()) {
+                return streamRelationColumns.get().apply(session, schemaName, relationFilter);
+            }
+            return ConnectorMetadata.super.streamRelationColumns(session, schemaName, relationFilter);
+        }
+
         @Override
         public void createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, boolean ignoreExisting) {}
 
@@ -601,12 +632,24 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
         @Override
         public void setColumnType(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column, Type type) {}
 
+        @Override
+        public void setFieldType(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> fieldPath, Type type)
+        {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public void setTableAuthorization(ConnectorSession session, SchemaTableName tableName, TrinoPrincipal principal) {}
 
         @Override
         public void renameColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle source, String target) {}
 
+        @Override
+        public void renameField(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> fieldPath, String target)
+        {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public void dropColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column) {}
 
@@ -625,6 +668,13 @@ public void dropView(ConnectorSession session, SchemaTableName viewName) {}
         @Override
         public void createMaterializedView(ConnectorSession session, SchemaTableName viewName, ConnectorMaterializedViewDefinition definition, boolean replace, boolean ignoreExisting) {}
 
+        @Override
+        public List<SchemaTableName> listMaterializedViews(ConnectorSession session, Optional<String> schemaName)
+        {
+            return ImmutableList.copyOf(getMaterializedViews.apply(session, schemaName.map(SchemaTablePrefix::new).orElseGet(SchemaTablePrefix::new))
+                    .keySet());
+        }
+
         @Override
         public Optional<ConnectorMaterializedViewDefinition> getMaterializedView(ConnectorSession session, SchemaTableName viewName)
         {
@@ -739,6 +789,12 @@ public Optional<ConnectorTableLayout> getNewTableLayout(ConnectorSession session
             return getNewTableLayout.apply(session, tableMetadata);
         }
 
+        @Override
+        public Optional<Type> getSupportedType(ConnectorSession session, Map<String, Object> tableProperties, Type type)
+        {
+            return getSupportedType.apply(session, type);
+        }
+
         @Override
         public RowChangeParadigm getRowChangeParadigm(ConnectorSession session, ConnectorTableHandle tableHandle)
         {
@@ -758,7 +814,7 @@ public ConnectorMergeTableHandle beginMerge(ConnectorSession session, ConnectorT
         }
 
         @Override
-        public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics) {}
+        public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle mergeTableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics) {}
 
         @Override
         public ConnectorTableProperties getTableProperties(ConnectorSession session, ConnectorTableHandle table)
@@ -779,6 +835,36 @@ public void executeTableExecute(ConnectorSession session, ConnectorTableExecuteH
         @Override
         public void finishTableExecute(ConnectorSession session, ConnectorTableExecuteHandle tableExecuteHandle, Collection<Slice> fragments, List<Object> tableExecuteState) {}
 
+        @Override
+        public Collection<FunctionMetadata> listFunctions(ConnectorSession session, String schemaName)
+        {
+            return functions;
+        }
+
+        @Override
+        public Collection<FunctionMetadata> getFunctions(ConnectorSession session, SchemaFunctionName name)
+        {
+            // assume that functions are in every schema
+            return functions.stream()
+                    .filter(function -> function.getNames().contains(name.getFunctionName()))
+                    .collect(toImmutableList());
+        }
+
+        @Override
+        public FunctionMetadata getFunctionMetadata(ConnectorSession session, FunctionId functionId)
+        {
+            return functions.stream()
+                    .filter(function -> function.getFunctionId().equals(functionId))
+                    .findFirst()
+                    .orElseThrow(() -> new IllegalArgumentException("Function not found: " + functionId));
+        }
+
+        @Override
+        public FunctionDependencyDeclaration getFunctionDependencies(ConnectorSession session, FunctionId functionId, BoundSignature boundSignature)
+        {
+            return NO_DEPENDENCIES;
+        }
+
         @Override
         public Set<String> listRoles(ConnectorSession session)
         {
@@ -837,27 +923,27 @@ public void revokeTablePrivileges(ConnectorSession session, SchemaTableName tabl
         }
 
         @Override
-        public boolean supportsReportingWrittenBytes(ConnectorSession session, SchemaTableName schemaTableName, Map<String, Object> tableProperties)
+        public OptionalInt getMaxWriterTasks(ConnectorSession session)
         {
-            return supportsReportingWrittenBytes;
+            return maxWriterTasks;
         }
 
         @Override
-        public boolean supportsReportingWrittenBytes(ConnectorSession session, ConnectorTableHandle tableHandle)
+        public BeginTableExecuteResult<ConnectorTableExecuteHandle, ConnectorTableHandle> beginTableExecute(ConnectorSession session, ConnectorTableExecuteHandle tableExecuteHandle, ConnectorTableHandle updatedSourceTableHandle)
         {
-            return supportsReportingWrittenBytes;
+            return new BeginTableExecuteResult<>(tableExecuteHandle, updatedSourceTableHandle);
         }
 
         @Override
-        public OptionalInt getMaxWriterTasks(ConnectorSession session)
+        public WriterScalingOptions getNewTableWriterScalingOptions(ConnectorSession session, SchemaTableName tableName, Map<String, Object> tableProperties)
         {
-            return maxWriterTasks;
+            return writerScalingOptions;
         }
 
         @Override
-        public BeginTableExecuteResult<ConnectorTableExecuteHandle, ConnectorTableHandle> beginTableExecute(ConnectorSession session, ConnectorTableExecuteHandle tableExecuteHandle, ConnectorTableHandle updatedSourceTableHandle)
+        public WriterScalingOptions getInsertWriterScalingOptions(ConnectorSession session, ConnectorTableHandle tableHandle)
         {
-            return new BeginTableExecuteResult<>(tableExecuteHandle, updatedSourceTableHandle);
+            return writerScalingOptions;
         }
 
         private MockConnectorAccessControl getMockAccessControl()
diff --git a/core/trino-main/src/test/java/io/trino/connector/MockConnectorAccessControl.java b/core/trino-main/src/test/java/io/trino/connector/MockConnectorAccessControl.java
index bc763bcbd88d..93faae00fd1a 100644
--- a/core/trino-main/src/test/java/io/trino/connector/MockConnectorAccessControl.java
+++ b/core/trino-main/src/test/java/io/trino/connector/MockConnectorAccessControl.java
@@ -135,12 +135,6 @@ public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context,
         return Optional.ofNullable(columnMasks.apply(tableName, columnName));
     }
 
-    @Override
-    public List<ViewExpression> getColumnMasks(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
-    {
-        throw new UnsupportedOperationException();
-    }
-
     public void grantSchemaPrivileges(String schemaName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
     {
         schemaGrants.grant(grantee, schemaName, privileges, grantOption);
diff --git a/core/trino-main/src/test/java/io/trino/connector/MockConnectorFactory.java b/core/trino-main/src/test/java/io/trino/connector/MockConnectorFactory.java
index f079b91c3206..52d98475fb46 100644
--- a/core/trino-main/src/test/java/io/trino/connector/MockConnectorFactory.java
+++ b/core/trino-main/src/test/java/io/trino/connector/MockConnectorFactory.java
@@ -26,6 +26,7 @@
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.spi.connector.ConnectorMaterializedViewDefinition;
+import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorNodePartitioningProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitSource;
@@ -41,6 +42,7 @@
 import io.trino.spi.connector.JoinCondition;
 import io.trino.spi.connector.JoinType;
 import io.trino.spi.connector.ProjectionApplicationResult;
+import io.trino.spi.connector.RelationColumnsMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.connector.SortItem;
@@ -49,22 +51,24 @@
 import io.trino.spi.connector.TableProcedureMetadata;
 import io.trino.spi.connector.TableScanRedirectApplicationResult;
 import io.trino.spi.connector.TopNApplicationResult;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.eventlistener.EventListener;
 import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.FunctionProvider;
-import io.trino.spi.function.SchemaFunctionName;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.metrics.Metrics;
 import io.trino.spi.procedure.Procedure;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
 import io.trino.spi.security.GrantInfo;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.security.ViewExpression;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.statistics.TableStatistics;
+import io.trino.spi.type.Type;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -76,6 +80,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 import java.util.stream.IntStream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -83,15 +88,18 @@
 import static io.trino.spi.statistics.TableStatistics.empty;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static java.util.Objects.requireNonNull;
+import static java.util.function.Function.identity;
 
 public class MockConnectorFactory
         implements ConnectorFactory
 {
     private final String name;
     private final List<PropertyMetadata<?>> sessionProperty;
+    private final Function<ConnectorMetadata, ConnectorMetadata> metadataWrapper;
     private final Function<ConnectorSession, List<String>> listSchemaNames;
     private final BiFunction<ConnectorSession, String, List<String>> listTables;
     private final Optional<BiFunction<ConnectorSession, SchemaTablePrefix, Iterator<TableColumnsMetadata>>> streamTableColumns;
+    private final Optional<MockConnectorFactory.StreamRelationColumns> streamRelationColumns;
     private final BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorViewDefinition>> getViews;
     private final Supplier<List<PropertyMetadata<?>>> getMaterializedViewProperties;
     private final BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorMaterializedViewDefinition>> getMaterializedViews;
@@ -99,6 +107,7 @@ public class MockConnectorFactory
     private final BiFunction<ConnectorSession, SchemaTableName, CompletableFuture<?>> refreshMaterializedView;
     private final BiFunction<ConnectorSession, SchemaTableName, ConnectorTableHandle> getTableHandle;
     private final Function<SchemaTableName, List<ColumnMetadata>> getColumns;
+    private final Function<SchemaTableName, Optional<String>> getComment;
     private final Function<SchemaTableName, TableStatistics> getTableStatistics;
     private final Function<SchemaTableName, List<String>> checkConstraints;
     private final ApplyProjection applyProjection;
@@ -111,9 +120,11 @@ public class MockConnectorFactory
     private final BiFunction<ConnectorSession, SchemaTableName, Optional<CatalogSchemaTableName>> redirectTable;
     private final BiFunction<ConnectorSession, SchemaTableName, Optional<ConnectorTableLayout>> getInsertLayout;
     private final BiFunction<ConnectorSession, ConnectorTableMetadata, Optional<ConnectorTableLayout>> getNewTableLayout;
+    private final BiFunction<ConnectorSession, Type, Optional<Type>> getSupportedType;
     private final BiFunction<ConnectorSession, ConnectorTableHandle, ConnectorTableProperties> getTableProperties;
     private final BiFunction<ConnectorSession, SchemaTablePrefix, List<GrantInfo>> listTablePrivileges;
     private final Supplier<Iterable<EventListener>> eventListeners;
+    private final Collection<FunctionMetadata> functions;
     private final Function<SchemaTableName, List<List<?>>> data;
     private final Function<SchemaTableName, Metrics> metrics;
     private final Set<Procedure> procedures;
@@ -126,21 +137,24 @@ public class MockConnectorFactory
     private final Supplier<List<PropertyMetadata<?>>> tableProperties;
     private final Supplier<List<PropertyMetadata<?>>> columnProperties;
     private final Optional<ConnectorNodePartitioningProvider> partitioningProvider;
-    private final Map<SchemaFunctionName, Function<ConnectorTableFunctionHandle, ConnectorSplitSource>> tableFunctionSplitsSources;
+    private final Function<ConnectorTableFunctionHandle, ConnectorSplitSource> tableFunctionSplitsSources;
 
     // access control
     private final ListRoleGrants roleGrants;
     private final Optional<ConnectorAccessControl> accessControl;
-    private final boolean supportsReportingWrittenBytes;
     private final OptionalInt maxWriterTasks;
     private final BiFunction<ConnectorSession, ConnectorTableExecuteHandle, Optional<ConnectorTableLayout>> getLayoutForTableExecute;
 
+    private final WriterScalingOptions writerScalingOptions;
+
     private MockConnectorFactory(
             String name,
             List<PropertyMetadata<?>> sessionProperty,
+            Function<ConnectorMetadata, ConnectorMetadata> metadataWrapper,
             Function<ConnectorSession, List<String>> listSchemaNames,
             BiFunction<ConnectorSession, String, List<String>> listTables,
             Optional<BiFunction<ConnectorSession, SchemaTablePrefix, Iterator<TableColumnsMetadata>>> streamTableColumns,
+            Optional<MockConnectorFactory.StreamRelationColumns> streamRelationColumns,
             BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorViewDefinition>> getViews,
             Supplier<List<PropertyMetadata<?>>> getMaterializedViewProperties,
             BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorMaterializedViewDefinition>> getMaterializedViews,
@@ -148,6 +162,7 @@ private MockConnectorFactory(
             BiFunction<ConnectorSession, SchemaTableName, CompletableFuture<?>> refreshMaterializedView,
             BiFunction<ConnectorSession, SchemaTableName, ConnectorTableHandle> getTableHandle,
             Function<SchemaTableName, List<ColumnMetadata>> getColumns,
+            Function<SchemaTableName, Optional<String>> getComment,
             Function<SchemaTableName, TableStatistics> getTableStatistics,
             Function<SchemaTableName, List<String>> checkConstraints,
             ApplyProjection applyProjection,
@@ -160,9 +175,11 @@ private MockConnectorFactory(
             BiFunction<ConnectorSession, SchemaTableName, Optional<CatalogSchemaTableName>> redirectTable,
             BiFunction<ConnectorSession, SchemaTableName, Optional<ConnectorTableLayout>> getInsertLayout,
             BiFunction<ConnectorSession, ConnectorTableMetadata, Optional<ConnectorTableLayout>> getNewTableLayout,
+            BiFunction<ConnectorSession, Type, Optional<Type>> getSupportedType,
             BiFunction<ConnectorSession, ConnectorTableHandle, ConnectorTableProperties> getTableProperties,
             BiFunction<ConnectorSession, SchemaTablePrefix, List<GrantInfo>> listTablePrivileges,
             Supplier<Iterable<EventListener>> eventListeners,
+            Collection<FunctionMetadata> functions,
             Function<SchemaTableName, List<List<?>>> data,
             Function<SchemaTableName, Metrics> metrics,
             Set<Procedure> procedures,
@@ -175,18 +192,20 @@ private MockConnectorFactory(
             Supplier<List<PropertyMetadata<?>>> columnProperties,
             Optional<ConnectorNodePartitioningProvider> partitioningProvider,
             ListRoleGrants roleGrants,
-            boolean supportsReportingWrittenBytes,
             Optional<ConnectorAccessControl> accessControl,
             boolean allowMissingColumnsOnInsert,
-            Map<SchemaFunctionName, Function<ConnectorTableFunctionHandle, ConnectorSplitSource>> tableFunctionSplitsSources,
+            Function<ConnectorTableFunctionHandle, ConnectorSplitSource> tableFunctionSplitsSources,
             OptionalInt maxWriterTasks,
-            BiFunction<ConnectorSession, ConnectorTableExecuteHandle, Optional<ConnectorTableLayout>> getLayoutForTableExecute)
+            BiFunction<ConnectorSession, ConnectorTableExecuteHandle, Optional<ConnectorTableLayout>> getLayoutForTableExecute,
+            WriterScalingOptions writerScalingOptions)
     {
         this.name = requireNonNull(name, "name is null");
         this.sessionProperty = ImmutableList.copyOf(requireNonNull(sessionProperty, "sessionProperty is null"));
+        this.metadataWrapper = requireNonNull(metadataWrapper, "metadataWrapper is null");
         this.listSchemaNames = requireNonNull(listSchemaNames, "listSchemaNames is null");
         this.listTables = requireNonNull(listTables, "listTables is null");
         this.streamTableColumns = requireNonNull(streamTableColumns, "streamTableColumns is null");
+        this.streamRelationColumns = requireNonNull(streamRelationColumns, "streamRelationColumns is null");
         this.getViews = requireNonNull(getViews, "getViews is null");
         this.getMaterializedViewProperties = requireNonNull(getMaterializedViewProperties, "getMaterializedViewProperties is null");
         this.getMaterializedViews = requireNonNull(getMaterializedViews, "getMaterializedViews is null");
@@ -194,6 +213,7 @@ private MockConnectorFactory(
         this.refreshMaterializedView = requireNonNull(refreshMaterializedView, "refreshMaterializedView is null");
         this.getTableHandle = requireNonNull(getTableHandle, "getTableHandle is null");
         this.getColumns = requireNonNull(getColumns, "getColumns is null");
+        this.getComment = requireNonNull(getComment, "getComment is null");
         this.getTableStatistics = requireNonNull(getTableStatistics, "getTableStatistics is null");
         this.checkConstraints = requireNonNull(checkConstraints, "checkConstraints is null");
         this.applyProjection = requireNonNull(applyProjection, "applyProjection is null");
@@ -206,9 +226,11 @@ private MockConnectorFactory(
         this.redirectTable = requireNonNull(redirectTable, "redirectTable is null");
         this.getInsertLayout = requireNonNull(getInsertLayout, "getInsertLayout is null");
         this.getNewTableLayout = requireNonNull(getNewTableLayout, "getNewTableLayout is null");
+        this.getSupportedType = requireNonNull(getSupportedType, "getSupportedType is null");
         this.getTableProperties = requireNonNull(getTableProperties, "getTableProperties is null");
         this.listTablePrivileges = requireNonNull(listTablePrivileges, "listTablePrivileges is null");
         this.eventListeners = requireNonNull(eventListeners, "eventListeners is null");
+        this.functions = ImmutableList.copyOf(functions);
         this.analyzeProperties = requireNonNull(analyzeProperties, "analyzeProperties is null");
         this.schemaProperties = requireNonNull(schemaProperties, "schemaProperties is null");
         this.tableProperties = requireNonNull(tableProperties, "tableProperties is null");
@@ -223,10 +245,10 @@ private MockConnectorFactory(
         this.tableFunctions = requireNonNull(tableFunctions, "tableFunctions is null");
         this.functionProvider = requireNonNull(functionProvider, "functionProvider is null");
         this.allowMissingColumnsOnInsert = allowMissingColumnsOnInsert;
-        this.supportsReportingWrittenBytes = supportsReportingWrittenBytes;
-        this.tableFunctionSplitsSources = ImmutableMap.copyOf(tableFunctionSplitsSources);
+        this.tableFunctionSplitsSources = requireNonNull(tableFunctionSplitsSources, "tableFunctionSplitsSources is null");
         this.maxWriterTasks = maxWriterTasks;
         this.getLayoutForTableExecute = requireNonNull(getLayoutForTableExecute, "getLayoutForTableExecute is null");
+        this.writerScalingOptions = requireNonNull(writerScalingOptions, "writerScalingOptions is null");
     }
 
     @Override
@@ -239,10 +261,12 @@ public String getName()
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
         return new MockConnector(
+                metadataWrapper,
                 sessionProperty,
                 listSchemaNames,
                 listTables,
                 streamTableColumns,
+                streamRelationColumns,
                 getViews,
                 getMaterializedViewProperties,
                 getMaterializedViews,
@@ -250,6 +274,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
                 refreshMaterializedView,
                 getTableHandle,
                 getColumns,
+                getComment,
                 getTableStatistics,
                 checkConstraints,
                 applyProjection,
@@ -262,9 +287,11 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
                 redirectTable,
                 getInsertLayout,
                 getNewTableLayout,
+                getSupportedType,
                 getTableProperties,
                 listTablePrivileges,
                 eventListeners,
+                functions,
                 roleGrants,
                 partitioningProvider,
                 accessControl,
@@ -279,10 +306,10 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
                 schemaProperties,
                 tableProperties,
                 columnProperties,
-                supportsReportingWrittenBytes,
                 tableFunctionSplitsSources,
                 maxWriterTasks,
-                getLayoutForTableExecute);
+                getLayoutForTableExecute,
+                writerScalingOptions);
     }
 
     public static MockConnectorFactory create()
@@ -300,6 +327,15 @@ public static Builder builder()
         return new Builder();
     }
 
+    @FunctionalInterface
+    public interface StreamRelationColumns
+    {
+        Iterator<RelationColumnsMetadata> apply(
+                ConnectorSession session,
+                Optional<String> schemaName,
+                UnaryOperator<Set<SchemaTableName>> tablesFilter);
+    }
+
     @FunctionalInterface
     public interface ApplyProjection
     {
@@ -373,9 +409,11 @@ public static final class Builder
     {
         private String name = "mock";
         private final List<PropertyMetadata<?>> sessionProperties = new ArrayList<>();
+        private Function<ConnectorMetadata, ConnectorMetadata> metadataWrapper = identity();
         private Function<ConnectorSession, List<String>> listSchemaNames = defaultListSchemaNames();
         private BiFunction<ConnectorSession, String, List<String>> listTables = defaultListTables();
         private Optional<BiFunction<ConnectorSession, SchemaTablePrefix, Iterator<TableColumnsMetadata>>> streamTableColumns = Optional.empty();
+        private Optional<MockConnectorFactory.StreamRelationColumns> streamRelationColumns = Optional.empty();
         private BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorViewDefinition>> getViews = defaultGetViews();
         private Supplier<List<PropertyMetadata<?>>> getMaterializedViewProperties = defaultGetMaterializedViewProperties();
         private BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorMaterializedViewDefinition>> getMaterializedViews = defaultGetMaterializedViews();
@@ -383,6 +421,7 @@ public static final class Builder
         private BiFunction<ConnectorSession, SchemaTableName, CompletableFuture<?>> refreshMaterializedView = (session, viewName) -> CompletableFuture.completedFuture(null);
         private BiFunction<ConnectorSession, SchemaTableName, ConnectorTableHandle> getTableHandle = defaultGetTableHandle();
         private Function<SchemaTableName, List<ColumnMetadata>> getColumns = defaultGetColumns();
+        private Function<SchemaTableName, Optional<String>> getComment = schemaTableName -> Optional.empty();
         private Function<SchemaTableName, TableStatistics> getTableStatistics = schemaTableName -> empty();
         private Function<SchemaTableName, List<String>> checkConstraints = (schemaTableName -> ImmutableList.of());
         private ApplyProjection applyProjection = (session, handle, projections, assignments) -> Optional.empty();
@@ -390,9 +429,11 @@ public static final class Builder
         private ApplyJoin applyJoin = (session, joinType, left, right, joinConditions, leftAssignments, rightAssignments) -> Optional.empty();
         private BiFunction<ConnectorSession, SchemaTableName, Optional<ConnectorTableLayout>> getInsertLayout = defaultGetInsertLayout();
         private BiFunction<ConnectorSession, ConnectorTableMetadata, Optional<ConnectorTableLayout>> getNewTableLayout = defaultGetNewTableLayout();
+        private BiFunction<ConnectorSession, Type, Optional<Type>> getSupportedType = (session, type) -> Optional.empty();
         private BiFunction<ConnectorSession, ConnectorTableHandle, ConnectorTableProperties> getTableProperties = defaultGetTableProperties();
         private BiFunction<ConnectorSession, SchemaTablePrefix, List<GrantInfo>> listTablePrivileges = defaultListTablePrivileges();
         private Supplier<Iterable<EventListener>> eventListeners = ImmutableList::of;
+        private Collection<FunctionMetadata> functions = ImmutableList.of();
         private ApplyTopN applyTopN = (session, handle, topNCount, sortItems, assignments) -> Optional.empty();
         private ApplyFilter applyFilter = (session, handle, constraint) -> Optional.empty();
         private ApplyTableFunction applyTableFunction = (session, handle) -> Optional.empty();
@@ -409,7 +450,7 @@ public static final class Builder
         private Supplier<List<PropertyMetadata<?>>> tableProperties = ImmutableList::of;
         private Supplier<List<PropertyMetadata<?>>> columnProperties = ImmutableList::of;
         private Optional<ConnectorNodePartitioningProvider> partitioningProvider = Optional.empty();
-        private final Map<SchemaFunctionName, Function<ConnectorTableFunctionHandle, ConnectorSplitSource>> tableFunctionSplitsSources = new HashMap<>();
+        private Function<ConnectorTableFunctionHandle, ConnectorSplitSource> tableFunctionSplitsSources = handle -> null;
 
         // access control
         private boolean provideAccessControl;
@@ -418,10 +459,10 @@ public static final class Builder
         private Grants<SchemaTableName> tableGrants = new AllowAllGrants<>();
         private Function<SchemaTableName, ViewExpression> rowFilter = tableName -> null;
         private BiFunction<SchemaTableName, String, ViewExpression> columnMask = (tableName, columnName) -> null;
-        private boolean supportsReportingWrittenBytes;
         private boolean allowMissingColumnsOnInsert;
         private OptionalInt maxWriterTasks = OptionalInt.empty();
         private BiFunction<ConnectorSession, ConnectorTableExecuteHandle, Optional<ConnectorTableLayout>> getLayoutForTableExecute = (session, handle) -> Optional.empty();
+        private WriterScalingOptions writerScalingOptions = WriterScalingOptions.DISABLED;
 
         private Builder() {}
 
@@ -445,6 +486,12 @@ public Builder withSessionProperties(Iterable<PropertyMetadata<?>> sessionProper
             return this;
         }
 
+        public Builder withMetadataWrapper(Function<ConnectorMetadata, ConnectorMetadata> metadataWrapper)
+        {
+            this.metadataWrapper = requireNonNull(metadataWrapper, "metadataWrapper is null");
+            return this;
+        }
+
         public Builder withListSchemaNames(Function<ConnectorSession, List<String>> listSchemaNames)
         {
             this.listSchemaNames = requireNonNull(listSchemaNames, "listSchemaNames is null");
@@ -463,6 +510,12 @@ public Builder withStreamTableColumns(BiFunction<ConnectorSession, SchemaTablePr
             return this;
         }
 
+        public Builder withStreamRelationColumns(StreamRelationColumns streamRelationColumns)
+        {
+            this.streamRelationColumns = Optional.of(streamRelationColumns);
+            return this;
+        }
+
         public Builder withGetViews(BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorViewDefinition>> getViews)
         {
             this.getViews = requireNonNull(getViews, "getViews is null");
@@ -505,6 +558,12 @@ public Builder withGetColumns(Function<SchemaTableName, List<ColumnMetadata>> ge
             return this;
         }
 
+        public Builder withGetComment(Function<SchemaTableName, Optional<String>> getComment)
+        {
+            this.getComment = requireNonNull(getComment, "getComment is null");
+            return this;
+        }
+
         public Builder withGetTableStatistics(Function<SchemaTableName, TableStatistics> getTableStatistics)
         {
             this.getTableStatistics = requireNonNull(getTableStatistics, "getColumns is null");
@@ -577,6 +636,12 @@ public Builder withGetNewTableLayout(BiFunction<ConnectorSession, ConnectorTable
             return this;
         }
 
+        public Builder withGetSupportedType(BiFunction<ConnectorSession, Type, Optional<Type>> getSupportedType)
+        {
+            this.getSupportedType = requireNonNull(getSupportedType, "getSupportedType is null");
+            return this;
+        }
+
         public Builder withGetLayoutForTableExecute(BiFunction<ConnectorSession, ConnectorTableExecuteHandle, Optional<ConnectorTableLayout>> getLayoutForTableExecute)
         {
             this.getLayoutForTableExecute = requireNonNull(getLayoutForTableExecute, "getLayoutForTableExecute is null");
@@ -612,6 +677,14 @@ public Builder withEventListener(Supplier<EventListener> listenerFactory)
             return this;
         }
 
+        public Builder withFunctions(Collection<FunctionMetadata> functions)
+        {
+            requireNonNull(functions, "functions is null");
+
+            this.functions = ImmutableList.copyOf(functions);
+            return this;
+        }
+
         public Builder withData(Function<SchemaTableName, List<List<?>>> data)
         {
             this.data = requireNonNull(data, "data is null");
@@ -678,9 +751,9 @@ public Builder withPartitionProvider(ConnectorNodePartitioningProvider partition
             return this;
         }
 
-        public Builder withTableFunctionSplitSource(SchemaFunctionName name, Function<ConnectorTableFunctionHandle, ConnectorSplitSource> sourceProvider)
+        public Builder withTableFunctionSplitSources(Function<ConnectorTableFunctionHandle, ConnectorSplitSource> sourceProvider)
         {
-            tableFunctionSplitsSources.put(name, sourceProvider);
+            tableFunctionSplitsSources = requireNonNull(sourceProvider, "sourceProvider is null");
             return this;
         }
 
@@ -719,12 +792,6 @@ public Builder withColumnMask(BiFunction<SchemaTableName, String, ViewExpression
             return this;
         }
 
-        public Builder withSupportsReportingWrittenBytes(boolean supportsReportingWrittenBytes)
-        {
-            this.supportsReportingWrittenBytes = supportsReportingWrittenBytes;
-            return this;
-        }
-
         public Builder withMaxWriterTasks(OptionalInt maxWriterTasks)
         {
             this.maxWriterTasks = maxWriterTasks;
@@ -737,6 +804,12 @@ public Builder withAllowMissingColumnsOnInsert(boolean allowMissingColumnsOnInse
             return this;
         }
 
+        public Builder withWriterScalingOptions(WriterScalingOptions writerScalingOptions)
+        {
+            this.writerScalingOptions = writerScalingOptions;
+            return this;
+        }
+
         public MockConnectorFactory build()
         {
             Optional<ConnectorAccessControl> accessControl = Optional.empty();
@@ -746,9 +819,11 @@ public MockConnectorFactory build()
             return new MockConnectorFactory(
                     name,
                     sessionProperties,
+                    metadataWrapper,
                     listSchemaNames,
                     listTables,
                     streamTableColumns,
+                    streamRelationColumns,
                     getViews,
                     getMaterializedViewProperties,
                     getMaterializedViews,
@@ -756,6 +831,7 @@ public MockConnectorFactory build()
                     refreshMaterializedView,
                     getTableHandle,
                     getColumns,
+                    getComment,
                     getTableStatistics,
                     checkConstraints,
                     applyProjection,
@@ -768,9 +844,11 @@ public MockConnectorFactory build()
                     redirectTable,
                     getInsertLayout,
                     getNewTableLayout,
+                    getSupportedType,
                     getTableProperties,
                     listTablePrivileges,
                     eventListeners,
+                    functions,
                     data,
                     metrics,
                     procedures,
@@ -783,12 +861,12 @@ public MockConnectorFactory build()
                     columnProperties,
                     partitioningProvider,
                     roleGrants,
-                    supportsReportingWrittenBytes,
                     accessControl,
                     allowMissingColumnsOnInsert,
                     tableFunctionSplitsSources,
                     maxWriterTasks,
-                    getLayoutForTableExecute);
+                    getLayoutForTableExecute,
+                    writerScalingOptions);
         }
 
         public static Function<ConnectorSession, List<String>> defaultListSchemaNames()
diff --git a/core/trino-main/src/test/java/io/trino/connector/MockConnectorTableHandle.java b/core/trino-main/src/test/java/io/trino/connector/MockConnectorTableHandle.java
index 058672d3aa30..632e235c4849 100644
--- a/core/trino-main/src/test/java/io/trino/connector/MockConnectorTableHandle.java
+++ b/core/trino-main/src/test/java/io/trino/connector/MockConnectorTableHandle.java
@@ -89,4 +89,10 @@ public int hashCode()
     {
         return Objects.hash(tableName, constraint, columns);
     }
+
+    @Override
+    public String toString()
+    {
+        return tableName.toString();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/connector/TestCatalogManagerConfig.java b/core/trino-main/src/test/java/io/trino/connector/TestCatalogManagerConfig.java
index 818573e853b8..ed6a4624eed3 100644
--- a/core/trino-main/src/test/java/io/trino/connector/TestCatalogManagerConfig.java
+++ b/core/trino-main/src/test/java/io/trino/connector/TestCatalogManagerConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.connector.CatalogManagerConfig.CatalogMangerKind;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/connector/TestCatalogPruneTaskConfig.java b/core/trino-main/src/test/java/io/trino/connector/TestCatalogPruneTaskConfig.java
index 436bb858e0e8..eb6ac9e893be 100644
--- a/core/trino-main/src/test/java/io/trino/connector/TestCatalogPruneTaskConfig.java
+++ b/core/trino-main/src/test/java/io/trino/connector/TestCatalogPruneTaskConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/connector/TestCatalogStoreConfig.java b/core/trino-main/src/test/java/io/trino/connector/TestCatalogStoreConfig.java
index fe920c12f9f6..b1e8ef297f87 100644
--- a/core/trino-main/src/test/java/io/trino/connector/TestCatalogStoreConfig.java
+++ b/core/trino-main/src/test/java/io/trino/connector/TestCatalogStoreConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.connector.CatalogStoreConfig.CatalogStoreKind;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/connector/TestFileCatalogStoreConfig.java b/core/trino-main/src/test/java/io/trino/connector/TestFileCatalogStoreConfig.java
index 5749ffb7a83c..92a123ca26cf 100644
--- a/core/trino-main/src/test/java/io/trino/connector/TestFileCatalogStoreConfig.java
+++ b/core/trino-main/src/test/java/io/trino/connector/TestFileCatalogStoreConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.Map;
diff --git a/core/trino-main/src/test/java/io/trino/connector/TestMockConnectorPageSource.java b/core/trino-main/src/test/java/io/trino/connector/TestMockConnectorPageSource.java
index 9e32a6632927..3d57f367fe0d 100644
--- a/core/trino-main/src/test/java/io/trino/connector/TestMockConnectorPageSource.java
+++ b/core/trino-main/src/test/java/io/trino/connector/TestMockConnectorPageSource.java
@@ -14,7 +14,7 @@
 package io.trino.connector;
 
 import io.trino.spi.connector.ConnectorPageSource;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 
diff --git a/core/trino-main/src/test/java/io/trino/connector/TestStaticCatalogManagerConfig.java b/core/trino-main/src/test/java/io/trino/connector/TestStaticCatalogManagerConfig.java
index e99e5623c4ed..66b83e2ac0b5 100644
--- a/core/trino-main/src/test/java/io/trino/connector/TestStaticCatalogManagerConfig.java
+++ b/core/trino-main/src/test/java/io/trino/connector/TestStaticCatalogManagerConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.Map;
diff --git a/core/trino-main/src/test/java/io/trino/connector/TestingTableFunctions.java b/core/trino-main/src/test/java/io/trino/connector/TestingTableFunctions.java
index 5b197f010721..f00edbfaf7df 100644
--- a/core/trino-main/src/test/java/io/trino/connector/TestingTableFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/connector/TestingTableFunctions.java
@@ -16,34 +16,38 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import io.airlift.slice.Slice;
 import io.trino.spi.HostAddress;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.connector.ConnectorSplitSource;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.FixedSplitSource;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.SchemaFunctionName;
+import io.trino.spi.function.table.AbstractConnectorTableFunction;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.DescriptorArgumentSpecification;
+import io.trino.spi.function.table.ReturnTypeSpecification.DescribedTable;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.ScalarArgumentSpecification;
+import io.trino.spi.function.table.TableArgument;
+import io.trino.spi.function.table.TableArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
+import io.trino.spi.function.table.TableFunctionDataProcessor;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
+import io.trino.spi.function.table.TableFunctionProcessorState;
+import io.trino.spi.function.table.TableFunctionProcessorState.Processed;
+import io.trino.spi.function.table.TableFunctionSplitProcessor;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.ptf.AbstractConnectorTableFunction;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-import io.trino.spi.ptf.Descriptor;
-import io.trino.spi.ptf.DescriptorArgumentSpecification;
-import io.trino.spi.ptf.ReturnTypeSpecification.DescribedTable;
-import io.trino.spi.ptf.ScalarArgument;
-import io.trino.spi.ptf.ScalarArgumentSpecification;
-import io.trino.spi.ptf.TableArgument;
-import io.trino.spi.ptf.TableArgumentSpecification;
-import io.trino.spi.ptf.TableFunctionAnalysis;
-import io.trino.spi.ptf.TableFunctionDataProcessor;
-import io.trino.spi.ptf.TableFunctionProcessorProvider;
-import io.trino.spi.ptf.TableFunctionProcessorState;
-import io.trino.spi.ptf.TableFunctionProcessorState.Processed;
-import io.trino.spi.ptf.TableFunctionSplitProcessor;
 import io.trino.spi.type.RowType;
 
 import java.util.List;
@@ -57,12 +61,13 @@
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.connector.TestingTableFunctions.ConstantFunction.ConstantFunctionSplit.DEFAULT_SPLIT_SIZE;
-import static io.trino.spi.ptf.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
-import static io.trino.spi.ptf.ReturnTypeSpecification.OnlyPassThrough.ONLY_PASS_THROUGH;
-import static io.trino.spi.ptf.TableFunctionProcessorState.Finished.FINISHED;
-import static io.trino.spi.ptf.TableFunctionProcessorState.Processed.produced;
-import static io.trino.spi.ptf.TableFunctionProcessorState.Processed.usedInput;
-import static io.trino.spi.ptf.TableFunctionProcessorState.Processed.usedInputAndProduced;
+import static io.trino.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
+import static io.trino.spi.function.table.ReturnTypeSpecification.OnlyPassThrough.ONLY_PASS_THROUGH;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Finished.FINISHED;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Processed.produced;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Processed.usedInput;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Processed.usedInputAndProduced;
+import static io.trino.spi.predicate.Utils.nativeValueToBlock;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.IntegerType.INTEGER;
@@ -75,7 +80,7 @@ public class TestingTableFunctions
     private static final String SCHEMA_NAME = "system";
     private static final String TABLE_NAME = "table";
     private static final String COLUMN_NAME = "column";
-    private static final ConnectorTableFunctionHandle HANDLE = new TestingTableFunctionHandle();
+    private static final ConnectorTableFunctionHandle HANDLE = new TestingTableFunctionPushdownHandle();
     private static final TableFunctionAnalysis ANALYSIS = TableFunctionAnalysis.builder()
             .handle(HANDLE)
             .returnedType(new Descriptor(ImmutableList.of(new Descriptor.Field(COLUMN_NAME, Optional.of(BOOLEAN)))))
@@ -116,13 +121,19 @@ public SimpleTableFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             ScalarArgument argument = (ScalarArgument) arguments.get("COLUMN");
             String columnName = ((Slice) argument.getValue()).toStringUtf8();
 
+            String schema = getSchema();
+
             return TableFunctionAnalysis.builder()
-                    .handle(new SimpleTableFunctionHandle(getSchema(), TABLE_NAME, columnName))
+                    .handle(new SimpleTableFunctionHandle(schema, TABLE_NAME, columnName))
                     .returnedType(new Descriptor(ImmutableList.of(new Descriptor.Field(columnName, Optional.of(BOOLEAN)))))
                     .build();
         }
@@ -131,6 +142,7 @@ public static class SimpleTableFunctionHandle
                 implements ConnectorTableFunctionHandle
         {
             private final MockConnectorTableHandle tableHandle;
+            private final String columnName;
 
             public SimpleTableFunctionHandle(String schema, String table, String column)
             {
@@ -138,12 +150,43 @@ public SimpleTableFunctionHandle(String schema, String table, String column)
                         new SchemaTableName(schema, table),
                         TupleDomain.all(),
                         Optional.of(ImmutableList.of(new MockConnectorColumnHandle(column, BOOLEAN))));
+                this.columnName = requireNonNull(column, "column is null");
             }
 
             public MockConnectorTableHandle getTableHandle()
             {
                 return tableHandle;
             }
+
+            public String getColumnName()
+            {
+                return columnName;
+            }
+        }
+    }
+
+    /**
+     * A table function returning a table with single empty column of type BOOLEAN.
+     * The argument `COLUMN` is the column name.
+     * The argument `IGNORED` is ignored.
+     * Both arguments are optional.
+     * Performs access control checks
+     */
+    public static class SimpleTableFunctionWithAccessControl
+            extends SimpleTableFunction
+    {
+        @Override
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
+        {
+            TableFunctionAnalysis analyzeResult = super.analyze(session, transaction, arguments, accessControl);
+            SimpleTableFunction.SimpleTableFunctionHandle handle = (SimpleTableFunction.SimpleTableFunctionHandle) analyzeResult.getHandle();
+            accessControl.checkCanSelectFromColumns(null, handle.getTableHandle().getTableName(), ImmutableSet.of(handle.getColumnName()));
+
+            return analyzeResult;
         }
     }
 
@@ -169,7 +212,11 @@ public TwoScalarArgumentsFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return ANALYSIS;
         }
@@ -178,11 +225,13 @@ public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransact
     public static class TableArgumentFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "table_argument_function";
+
         public TableArgumentFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "table_argument_function",
+                    FUNCTION_NAME,
                     ImmutableList.of(
                             TableArgumentSpecification.builder()
                                     .name("INPUT")
@@ -192,10 +241,14 @@ public TableArgumentFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(HANDLE)
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .returnedType(new Descriptor(ImmutableList.of(new Descriptor.Field(COLUMN_NAME, Optional.of(BOOLEAN)))))
                     .requiredColumns("INPUT", ImmutableList.of(0))
                     .build();
@@ -205,11 +258,13 @@ public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransact
     public static class TableArgumentRowSemanticsFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "table_argument_row_semantics_function";
+
         public TableArgumentRowSemanticsFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "table_argument_row_semantics_function",
+                    FUNCTION_NAME,
                     ImmutableList.of(
                             TableArgumentSpecification.builder()
                                     .name("INPUT")
@@ -219,10 +274,14 @@ public TableArgumentRowSemanticsFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(HANDLE)
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .returnedType(new Descriptor(ImmutableList.of(new Descriptor.Field(COLUMN_NAME, Optional.of(BOOLEAN)))))
                     .requiredColumns("INPUT", ImmutableList.of(0))
                     .build();
@@ -246,7 +305,11 @@ public DescriptorArgumentFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return ANALYSIS;
         }
@@ -255,11 +318,13 @@ public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransact
     public static class TwoTableArgumentsFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "two_table_arguments_function";
+
         public TwoTableArgumentsFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "two_table_arguments_function",
+                    FUNCTION_NAME,
                     ImmutableList.of(
                             TableArgumentSpecification.builder()
                                     .name("INPUT1")
@@ -273,10 +338,14 @@ public TwoTableArgumentsFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(HANDLE)
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .returnedType(new Descriptor(ImmutableList.of(new Descriptor.Field(COLUMN_NAME, Optional.of(BOOLEAN)))))
                     .requiredColumns("INPUT1", ImmutableList.of(0))
                     .requiredColumns("INPUT2", ImmutableList.of(0))
@@ -302,7 +371,11 @@ public OnlyPassThroughFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return NO_DESCRIPTOR_ANALYSIS;
         }
@@ -323,7 +396,11 @@ public MonomorphicStaticReturnTypeFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
                     .handle(HANDLE)
@@ -349,7 +426,11 @@ public PolymorphicStaticReturnTypeFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return NO_DESCRIPTOR_ANALYSIS;
         }
@@ -374,7 +455,11 @@ public PassThroughFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return NO_DESCRIPTOR_ANALYSIS;
         }
@@ -383,11 +468,13 @@ public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransact
     public static class DifferentArgumentTypesFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "different_arguments_function";
+
         public DifferentArgumentTypesFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "different_arguments_function",
+                    FUNCTION_NAME,
                     ImmutableList.of(
                             TableArgumentSpecification.builder()
                                     .name("INPUT_1")
@@ -414,10 +501,14 @@ public DifferentArgumentTypesFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(HANDLE)
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .returnedType(new Descriptor(ImmutableList.of(new Descriptor.Field(COLUMN_NAME, Optional.of(BOOLEAN)))))
                     .requiredColumns("INPUT_1", ImmutableList.of(0))
                     .requiredColumns("INPUT_2", ImmutableList.of(0))
@@ -429,11 +520,13 @@ public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransact
     public static class RequiredColumnsFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "required_columns_function";
+
         public RequiredColumnsFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "required_columns_function",
+                    FUNCTION_NAME,
                     ImmutableList.of(
                             TableArgumentSpecification.builder()
                                     .name("INPUT")
@@ -443,22 +536,26 @@ public RequiredColumnsFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(HANDLE)
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .returnedType(new Descriptor(ImmutableList.of(new Descriptor.Field("column", Optional.of(BOOLEAN)))))
                     .requiredColumns("INPUT", ImmutableList.of(0, 1))
                     .build();
         }
     }
 
-    public static class TestingTableFunctionHandle
+    public static class TestingTableFunctionPushdownHandle
             implements ConnectorTableFunctionHandle
     {
         private final MockConnectorTableHandle tableHandle;
 
-        public TestingTableFunctionHandle()
+        public TestingTableFunctionPushdownHandle()
         {
             this.tableHandle = new MockConnectorTableHandle(
                     new SchemaTableName(SCHEMA_NAME, TABLE_NAME),
@@ -477,11 +574,13 @@ public MockConnectorTableHandle getTableHandle()
     public static class IdentityFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "identity_function";
+
         public IdentityFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "identity_function",
+                    FUNCTION_NAME,
                     ImmutableList.of(
                             TableArgumentSpecification.builder()
                                     .name("INPUT")
@@ -491,14 +590,18 @@ public IdentityFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             List<RowType.Field> inputColumns = ((TableArgument) arguments.get("INPUT")).getRowType().getFields();
             Descriptor returnedType = new Descriptor(inputColumns.stream()
                     .map(field -> new Descriptor.Field(field.getName().orElse("anonymous_column"), Optional.of(field.getType())))
                     .collect(toImmutableList()));
             return TableFunctionAnalysis.builder()
-                    .handle(new EmptyTableFunctionHandle())
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .returnedType(returnedType)
                     .requiredColumns("INPUT", IntStream.range(0, inputColumns.size()).boxed().collect(toImmutableList()))
                     .build();
@@ -524,11 +627,13 @@ public TableFunctionDataProcessor getDataProcessor(ConnectorTableFunctionHandle
     public static class IdentityPassThroughFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "identity_pass_through_function";
+
         public IdentityPassThroughFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "identity_pass_through_function",
+                    FUNCTION_NAME,
                     ImmutableList.of(
                             TableArgumentSpecification.builder()
                                     .name("INPUT")
@@ -539,10 +644,14 @@ public IdentityPassThroughFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(new EmptyTableFunctionHandle())
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .requiredColumns("INPUT", ImmutableList.of(0)) // per spec, function must require at least one column
                     .build();
         }
@@ -573,7 +682,7 @@ public TableFunctionProcessorState process(List<Optional<Page>> input)
                 BlockBuilder builder = BIGINT.createBlockBuilder(null, page.getPositionCount());
                 for (long index = processedPositions; index < processedPositions + page.getPositionCount(); index++) {
                     // TODO check for long overflow
-                    builder.writeLong(index);
+                    BIGINT.writeLong(builder, index);
                 }
                 processedPositions = processedPositions + page.getPositionCount();
                 return usedInputAndProduced(new Page(builder.build()));
@@ -604,7 +713,11 @@ public RepeatFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             ScalarArgument count = (ScalarArgument) arguments.get("N");
             requireNonNull(count.getValue(), "count value for function repeat() is null");
@@ -676,7 +789,7 @@ public TableFunctionProcessorState process(List<Optional<Page>> input)
                     BlockBuilder builder = BIGINT.createBlockBuilder(null, page.getPositionCount());
                     for (long index = processedPositions; index < processedPositions + page.getPositionCount(); index++) {
                         // TODO check for long overflow
-                        builder.writeLong(index);
+                        BIGINT.writeLong(builder, index);
                     }
                     processedPositions = processedPositions + page.getPositionCount();
                     indexes = builder.build();
@@ -705,11 +818,13 @@ public TableFunctionProcessorState process(List<Optional<Page>> input)
     public static class EmptyOutputFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "empty_output";
+
         public EmptyOutputFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "empty_output",
+                    FUNCTION_NAME,
                     ImmutableList.of(TableArgumentSpecification.builder()
                             .name("INPUT")
                             .keepWhenEmpty()
@@ -718,10 +833,14 @@ public EmptyOutputFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(new EmptyTableFunctionHandle())
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .requiredColumns("INPUT", IntStream.range(0, ((TableArgument) arguments.get("INPUT")).getRowType().getFields().size()).boxed().collect(toImmutableList()))
                     .build();
         }
@@ -756,11 +875,13 @@ public TableFunctionProcessorState process(List<Optional<Page>> input)
     public static class EmptyOutputWithPassThroughFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "empty_output_with_pass_through";
+
         public EmptyOutputWithPassThroughFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "empty_output_with_pass_through",
+                    FUNCTION_NAME,
                     ImmutableList.of(TableArgumentSpecification.builder()
                             .name("INPUT")
                             .keepWhenEmpty()
@@ -770,10 +891,14 @@ public EmptyOutputWithPassThroughFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(new EmptyTableFunctionHandle())
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .requiredColumns("INPUT", IntStream.range(0, ((TableArgument) arguments.get("INPUT")).getRowType().getFields().size()).boxed().collect(toImmutableList()))
                     .build();
         }
@@ -811,11 +936,13 @@ public TableFunctionProcessorState process(List<Optional<Page>> input)
     public static class TestInputsFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "test_inputs_function";
+
         public TestInputsFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "test_inputs_function",
+                    FUNCTION_NAME,
                     ImmutableList.of(
                             TableArgumentSpecification.builder()
                                     .rowSemantics()
@@ -837,10 +964,14 @@ public TestInputsFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(new EmptyTableFunctionHandle())
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .requiredColumns("INPUT_1", IntStream.range(0, ((TableArgument) arguments.get("INPUT_1")).getRowType().getFields().size()).boxed().collect(toImmutableList()))
                     .requiredColumns("INPUT_2", IntStream.range(0, ((TableArgument) arguments.get("INPUT_2")).getRowType().getFields().size()).boxed().collect(toImmutableList()))
                     .requiredColumns("INPUT_3", IntStream.range(0, ((TableArgument) arguments.get("INPUT_3")).getRowType().getFields().size()).boxed().collect(toImmutableList()))
@@ -872,11 +1003,13 @@ public TableFunctionDataProcessor getDataProcessor(ConnectorTableFunctionHandle
     public static class PassThroughInputFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "pass_through";
+
         public PassThroughInputFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "pass_through",
+                    FUNCTION_NAME,
                     ImmutableList.of(
                             TableArgumentSpecification.builder()
                                     .name("INPUT_1")
@@ -894,10 +1027,14 @@ public PassThroughInputFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(new EmptyTableFunctionHandle())
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .requiredColumns("INPUT_1", ImmutableList.of(0))
                     .requiredColumns("INPUT_2", ImmutableList.of(0))
                     .build();
@@ -942,7 +1079,7 @@ public TableFunctionProcessorState process(List<Optional<Page>> input)
                     // pass-through index for input_1
                     BlockBuilder input1PassThroughBuilder = BIGINT.createBlockBuilder(null, 1);
                     if (input1Present) {
-                        input1PassThroughBuilder.writeLong(input1EndIndex - 1);
+                        BIGINT.writeLong(input1PassThroughBuilder, input1EndIndex - 1);
                     }
                     else {
                         input1PassThroughBuilder.appendNull();
@@ -951,7 +1088,7 @@ public TableFunctionProcessorState process(List<Optional<Page>> input)
                     // pass-through index for input_2
                     BlockBuilder input2PassThroughBuilder = BIGINT.createBlockBuilder(null, 1);
                     if (input2Present) {
-                        input2PassThroughBuilder.writeLong(input2EndIndex - 1);
+                        BIGINT.writeLong(input2PassThroughBuilder, input2EndIndex - 1);
                     }
                     else {
                         input2PassThroughBuilder.appendNull();
@@ -975,11 +1112,13 @@ public TableFunctionProcessorState process(List<Optional<Page>> input)
     public static class TestInputFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "test_input";
+
         public TestInputFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "test_input",
+                    FUNCTION_NAME,
                     ImmutableList.of(TableArgumentSpecification.builder()
                             .name("INPUT")
                             .keepWhenEmpty()
@@ -988,10 +1127,14 @@ public TestInputFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(new EmptyTableFunctionHandle())
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .requiredColumns("INPUT", IntStream.range(0, ((TableArgument) arguments.get("INPUT")).getRowType().getFields().size()).boxed().collect(toImmutableList()))
                     .build();
         }
@@ -1033,11 +1176,13 @@ public TableFunctionProcessorState process(List<Optional<Page>> input)
     public static class TestSingleInputRowSemanticsFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "test_single_input_function";
+
         public TestSingleInputRowSemanticsFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "test_single_input_function",
+                    FUNCTION_NAME,
                     ImmutableList.of(TableArgumentSpecification.builder()
                             .rowSemantics()
                             .name("INPUT")
@@ -1046,10 +1191,14 @@ public TestSingleInputRowSemanticsFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(new EmptyTableFunctionHandle())
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .requiredColumns("INPUT", IntStream.range(0, ((TableArgument) arguments.get("INPUT")).getRowType().getFields().size()).boxed().collect(toImmutableList()))
                     .build();
         }
@@ -1098,7 +1247,11 @@ public ConstantFunction()
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             ScalarArgument count = (ScalarArgument) arguments.get("N");
             requireNonNull(count.getValue(), "count value for function repeat() is null");
@@ -1139,9 +1292,9 @@ public static class ConstantFunctionProcessorProvider
                 implements TableFunctionProcessorProvider
         {
             @Override
-            public TableFunctionSplitProcessor getSplitProcessor(ConnectorSession session, ConnectorTableFunctionHandle handle)
+            public TableFunctionSplitProcessor getSplitProcessor(ConnectorSession session, ConnectorTableFunctionHandle handle, ConnectorSplit split)
             {
-                return new ConstantFunctionProcessor(((ConstantFunctionHandle) handle).getValue());
+                return new ConstantFunctionProcessor(((ConstantFunctionHandle) handle).getValue(), (ConstantFunctionSplit) split);
             }
         }
 
@@ -1150,73 +1303,31 @@ public static class ConstantFunctionProcessor
         {
             private static final int PAGE_SIZE = 1000;
 
-            private final Long value;
-
+            private final Block value;
             private long fullPagesCount;
             private long processedPages;
             private int reminder;
-            private Block block;
 
-            public ConstantFunctionProcessor(Long value)
+            public ConstantFunctionProcessor(Long value, ConstantFunctionSplit split)
             {
-                this.value = value;
+                this.value = nativeValueToBlock(INTEGER, value);
+                long count = split.getCount();
+                this.fullPagesCount = count / PAGE_SIZE;
+                this.reminder = toIntExact(count % PAGE_SIZE);
             }
 
             @Override
-            public TableFunctionProcessorState process(ConnectorSplit split)
+            public TableFunctionProcessorState process()
             {
-                boolean usedData = false;
-
-                if (split != null) {
-                    long count = ((ConstantFunctionSplit) split).getCount();
-                    this.fullPagesCount = count / PAGE_SIZE;
-                    this.reminder = toIntExact(count % PAGE_SIZE);
-                    if (fullPagesCount > 0) {
-                        BlockBuilder builder = INTEGER.createBlockBuilder(null, PAGE_SIZE);
-                        if (value == null) {
-                            for (int i = 0; i < PAGE_SIZE; i++) {
-                                builder.appendNull();
-                            }
-                        }
-                        else {
-                            for (int i = 0; i < PAGE_SIZE; i++) {
-                                builder.writeInt(toIntExact(value));
-                            }
-                        }
-                        this.block = builder.build();
-                    }
-                    else {
-                        BlockBuilder builder = INTEGER.createBlockBuilder(null, reminder);
-                        if (value == null) {
-                            for (int i = 0; i < reminder; i++) {
-                                builder.appendNull();
-                            }
-                        }
-                        else {
-                            for (int i = 0; i < reminder; i++) {
-                                builder.writeInt(toIntExact(value));
-                            }
-                        }
-                        this.block = builder.build();
-                    }
-                    usedData = true;
-                }
-
                 if (processedPages < fullPagesCount) {
                     processedPages++;
-                    Page result = new Page(block);
-                    if (usedData) {
-                        return usedInputAndProduced(result);
-                    }
+                    Page result = new Page(RunLengthEncodedBlock.create(value, PAGE_SIZE));
                     return produced(result);
                 }
 
                 if (reminder > 0) {
-                    Page result = new Page(block.getRegion(0, toIntExact(reminder)));
+                    Page result = new Page(RunLengthEncodedBlock.create(value, reminder));
                     reminder = 0;
-                    if (usedData) {
-                        return usedInputAndProduced(result);
-                    }
                     return produced(result);
                 }
 
@@ -1287,20 +1398,26 @@ public long getRetainedSizeInBytes()
     public static class EmptySourceFunction
             extends AbstractConnectorTableFunction
     {
+        public static final String FUNCTION_NAME = "empty_source";
+
         public EmptySourceFunction()
         {
             super(
                     SCHEMA_NAME,
-                    "empty_source",
+                    FUNCTION_NAME,
                     ImmutableList.of(),
                     new DescribedTable(new Descriptor(ImmutableList.of(new Descriptor.Field("column", Optional.of(BOOLEAN))))));
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             return TableFunctionAnalysis.builder()
-                    .handle(new EmptyTableFunctionHandle())
+                    .handle(new TestingTableFunctionHandle(new SchemaFunctionName(SCHEMA_NAME, FUNCTION_NAME)))
                     .build();
         }
 
@@ -1308,7 +1425,7 @@ public static class EmptySourceFunctionProcessorProvider
                 implements TableFunctionProcessorProvider
         {
             @Override
-            public TableFunctionSplitProcessor getSplitProcessor(ConnectorSession session, ConnectorTableFunctionHandle handle)
+            public TableFunctionSplitProcessor getSplitProcessor(ConnectorSession session, ConnectorTableFunctionHandle handle, ConnectorSplit split)
             {
                 return new EmptySourceFunctionProcessor();
             }
@@ -1319,20 +1436,26 @@ public static class EmptySourceFunctionProcessor
         {
             private static final Page EMPTY_PAGE = new Page(BOOLEAN.createBlockBuilder(null, 0).build());
 
+            private boolean produced;
+
             @Override
-            public TableFunctionProcessorState process(ConnectorSplit split)
+            public TableFunctionProcessorState process()
             {
-                if (split == null) {
-                    return FINISHED;
+                if (!produced) {
+                    produced = true;
+                    return produced(EMPTY_PAGE);
                 }
-
-                return usedInputAndProduced(EMPTY_PAGE);
+                return FINISHED;
             }
         }
     }
 
-    public static class EmptyTableFunctionHandle
+    public record TestingTableFunctionHandle(SchemaFunctionName name)
             implements ConnectorTableFunctionHandle
     {
+        public TestingTableFunctionHandle
+        {
+            requireNonNull(name, "name is null");
+        }
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/connector/system/TestSystemSplit.java b/core/trino-main/src/test/java/io/trino/connector/system/TestSystemSplit.java
index 9ba0bf4a5198..ae09476aae2c 100644
--- a/core/trino-main/src/test/java/io/trino/connector/system/TestSystemSplit.java
+++ b/core/trino-main/src/test/java/io/trino/connector/system/TestSystemSplit.java
@@ -16,7 +16,7 @@
 import io.airlift.json.JsonCodec;
 import io.trino.spi.HostAddress;
 import io.trino.spi.predicate.TupleDomain;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.json.JsonCodec.jsonCodec;
 import static org.testng.Assert.assertEquals;
diff --git a/core/trino-main/src/test/java/io/trino/cost/BaseStatsCalculatorTest.java b/core/trino-main/src/test/java/io/trino/cost/BaseStatsCalculatorTest.java
index 0ea9c0039281..15a007abb95c 100644
--- a/core/trino-main/src/test/java/io/trino/cost/BaseStatsCalculatorTest.java
+++ b/core/trino-main/src/test/java/io/trino/cost/BaseStatsCalculatorTest.java
@@ -13,20 +13,24 @@
  */
 package io.trino.cost;
 
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
 public abstract class BaseStatsCalculatorTest
 {
     private StatsCalculatorTester tester;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         tester = new StatsCalculatorTester();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         tester.close();
diff --git a/core/trino-main/src/test/java/io/trino/cost/StatsCalculatorAssertion.java b/core/trino-main/src/test/java/io/trino/cost/StatsCalculatorAssertion.java
index 04845d03facd..4be16369d0f8 100644
--- a/core/trino-main/src/test/java/io/trino/cost/StatsCalculatorAssertion.java
+++ b/core/trino-main/src/test/java/io/trino/cost/StatsCalculatorAssertion.java
@@ -15,14 +15,12 @@
 
 import io.trino.Session;
 import io.trino.cost.ComposableStatsCalculator.Rule;
-import io.trino.metadata.Metadata;
-import io.trino.security.AllowAllAccessControl;
 import io.trino.sql.planner.TypeProvider;
 import io.trino.sql.planner.iterative.Lookup;
 import io.trino.sql.planner.optimizations.PlanNodeSearcher;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.transaction.TestingTransactionManager;
+import io.trino.testing.QueryRunner;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -32,13 +30,11 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.sql.planner.iterative.Lookup.noLookup;
-import static io.trino.transaction.TransactionBuilder.transaction;
 import static java.util.Objects.requireNonNull;
 
 public class StatsCalculatorAssertion
 {
-    private final Metadata metadata;
-    private final StatsCalculator statsCalculator;
+    private final QueryRunner queryRunner;
     private final Session session;
     private final PlanNode planNode;
     private final TypeProvider types;
@@ -47,10 +43,9 @@ public class StatsCalculatorAssertion
 
     private Optional<TableStatsProvider> tableStatsProvider = Optional.empty();
 
-    public StatsCalculatorAssertion(Metadata metadata, StatsCalculator statsCalculator, Session session, PlanNode planNode, TypeProvider types)
+    StatsCalculatorAssertion(QueryRunner queryRunner, Session session, PlanNode planNode, TypeProvider types)
     {
-        this.metadata = requireNonNull(metadata, "metadata cannot be null");
-        this.statsCalculator = requireNonNull(statsCalculator, "statsCalculator cannot be null");
+        this.queryRunner = requireNonNull(queryRunner, "queryRunner is null");
         this.session = requireNonNull(session, "session cannot be null");
         this.planNode = requireNonNull(planNode, "planNode is null");
         this.types = requireNonNull(types, "types is null");
@@ -93,16 +88,13 @@ public StatsCalculatorAssertion withTableStatisticsProvider(TableStatsProvider t
 
     public StatsCalculatorAssertion check(Consumer<PlanNodeStatsAssertion> statisticsAssertionConsumer)
     {
-        PlanNodeStatsEstimate statsEstimate = transaction(new TestingTransactionManager(), new AllowAllAccessControl())
-                .execute(session, transactionSession -> {
-                    return statsCalculator.calculateStats(
-                            planNode,
-                            this::getSourceStats,
-                            noLookup(),
-                            transactionSession,
-                            types,
-                            tableStatsProvider.orElseGet(() -> new CachingTableStatsProvider(metadata, session)));
-                });
+        PlanNodeStatsEstimate statsEstimate = queryRunner.getStatsCalculator().calculateStats(
+                planNode,
+                this::getSourceStats,
+                noLookup(),
+                session,
+                types,
+                tableStatsProvider.orElseGet(() -> new CachingTableStatsProvider(queryRunner.getMetadata(), session)));
         statisticsAssertionConsumer.accept(PlanNodeStatsAssertion.assertThat(statsEstimate));
         return this;
     }
@@ -116,7 +108,7 @@ public StatsCalculatorAssertion check(Rule<?> rule, Consumer<PlanNodeStatsAssert
                 noLookup(),
                 session,
                 types,
-                tableStatsProvider.orElseGet(() -> new CachingTableStatsProvider(metadata, session)));
+                tableStatsProvider.orElseGet(() -> new CachingTableStatsProvider(queryRunner.getMetadata(), session)));
         checkState(statsEstimate.isPresent(), "Expected stats estimates to be present");
         statisticsAssertionConsumer.accept(PlanNodeStatsAssertion.assertThat(statsEstimate.get()));
         return this;
diff --git a/core/trino-main/src/test/java/io/trino/cost/StatsCalculatorTester.java b/core/trino-main/src/test/java/io/trino/cost/StatsCalculatorTester.java
index 13fc22d32421..fb7061265f81 100644
--- a/core/trino-main/src/test/java/io/trino/cost/StatsCalculatorTester.java
+++ b/core/trino-main/src/test/java/io/trino/cost/StatsCalculatorTester.java
@@ -15,23 +15,22 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
-import io.trino.metadata.Metadata;
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.sql.planner.PlanNodeIdAllocator;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.testing.LocalQueryRunner;
+import io.trino.transaction.TransactionId;
 
 import java.util.function.Function;
 
+import static io.trino.spi.transaction.IsolationLevel.READ_UNCOMMITTED;
+import static io.trino.testing.TestingSession.testSession;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 
 public class StatsCalculatorTester
         implements AutoCloseable
 {
-    private final StatsCalculator statsCalculator;
-    private final Metadata metadata;
-    private final Session session;
     private final LocalQueryRunner queryRunner;
 
     public StatsCalculatorTester()
@@ -46,17 +45,9 @@ public StatsCalculatorTester(Session session)
 
     private StatsCalculatorTester(LocalQueryRunner queryRunner)
     {
-        this.statsCalculator = queryRunner.getStatsCalculator();
-        this.session = queryRunner.getDefaultSession();
-        this.metadata = queryRunner.getMetadata();
         this.queryRunner = queryRunner;
     }
 
-    public Metadata getMetadata()
-    {
-        return metadata;
-    }
-
     private static LocalQueryRunner createQueryRunner(Session session)
     {
         LocalQueryRunner queryRunner = LocalQueryRunner.create(session);
@@ -68,14 +59,27 @@ private static LocalQueryRunner createQueryRunner(Session session)
 
     public StatsCalculatorAssertion assertStatsFor(Function<PlanBuilder, PlanNode> planProvider)
     {
-        return assertStatsFor(session, planProvider);
+        return assertStatsFor(queryRunner.getDefaultSession(), planProvider);
     }
 
     public StatsCalculatorAssertion assertStatsFor(Session session, Function<PlanBuilder, PlanNode> planProvider)
     {
-        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), metadata, session);
-        PlanNode planNode = planProvider.apply(planBuilder);
-        return new StatsCalculatorAssertion(metadata, statsCalculator, session, planNode, planBuilder.getTypes());
+        // Unlike RuleTester, this class uses multiple final check statements, so there is no way to actually clean up transactions.
+        // Generate a new query id for each test to avoid collisions due to the leak
+        session = testSession(session);
+        // start a transaction to allow catalog access
+        TransactionId transactionId = queryRunner.getTransactionManager().beginTransaction(READ_UNCOMMITTED, false, false);
+        Session transactionSession = session.beginTransactionId(transactionId, queryRunner.getTransactionManager(), queryRunner.getAccessControl());
+        queryRunner.getMetadata().beginQuery(transactionSession);
+        try {
+            PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), queryRunner.getPlannerContext(), transactionSession);
+            PlanNode planNode = planProvider.apply(planBuilder);
+            return new StatsCalculatorAssertion(queryRunner, transactionSession, planNode, planBuilder.getTypes());
+        }
+        catch (Throwable t) {
+            queryRunner.getTransactionManager().asyncAbort(transactionId);
+            throw t;
+        }
     }
 
     @Override
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestAggregationStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestAggregationStatsRule.java
index e71c0b549ee6..af357f2f37ab 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestAggregationStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestAggregationStatsRule.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableSet;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.AggregationNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Consumer;
 
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestComparisonStatsCalculator.java b/core/trino-main/src/test/java/io/trino/cost/TestComparisonStatsCalculator.java
index 8ac103ff9cb5..cd3f354b0553 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestComparisonStatsCalculator.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestComparisonStatsCalculator.java
@@ -27,8 +27,7 @@
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -59,134 +58,113 @@
 
 public class TestComparisonStatsCalculator
 {
-    private FilterStatsCalculator filterStatsCalculator;
-    private Session session;
-    private PlanNodeStatsEstimate standardInputStatistics;
-    private TypeProvider types;
-    private SymbolStatsEstimate uStats;
-    private SymbolStatsEstimate wStats;
-    private SymbolStatsEstimate xStats;
-    private SymbolStatsEstimate yStats;
-    private SymbolStatsEstimate zStats;
-    private SymbolStatsEstimate leftOpenStats;
-    private SymbolStatsEstimate rightOpenStats;
-    private SymbolStatsEstimate unknownRangeStats;
-    private SymbolStatsEstimate emptyRangeStats;
-    private SymbolStatsEstimate unknownNdvRangeStats;
-    private SymbolStatsEstimate varcharStats;
-
-    @BeforeClass
-    public void setUp()
-    {
-        session = testSessionBuilder().build();
-        filterStatsCalculator = new FilterStatsCalculator(PLANNER_CONTEXT, new ScalarStatsCalculator(PLANNER_CONTEXT, createTestingTypeAnalyzer(PLANNER_CONTEXT)), new StatsNormalizer());
-
-        uStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(8.0)
-                .setDistinctValuesCount(300)
-                .setLowValue(0)
-                .setHighValue(20)
-                .setNullsFraction(0.1)
-                .build();
-        wStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(8.0)
-                .setDistinctValuesCount(30)
-                .setLowValue(0)
-                .setHighValue(20)
-                .setNullsFraction(0.1)
-                .build();
-        xStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(40.0)
-                .setLowValue(-10.0)
-                .setHighValue(10.0)
-                .setNullsFraction(0.25)
-                .build();
-        yStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(20.0)
-                .setLowValue(0.0)
-                .setHighValue(5.0)
-                .setNullsFraction(0.5)
-                .build();
-        zStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(5.0)
-                .setLowValue(-100.0)
-                .setHighValue(100.0)
-                .setNullsFraction(0.1)
-                .build();
-        leftOpenStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(50.0)
-                .setLowValue(NEGATIVE_INFINITY)
-                .setHighValue(15.0)
-                .setNullsFraction(0.1)
-                .build();
-        rightOpenStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(50.0)
-                .setLowValue(-15.0)
-                .setHighValue(POSITIVE_INFINITY)
-                .setNullsFraction(0.1)
-                .build();
-        unknownRangeStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(50.0)
-                .setLowValue(NEGATIVE_INFINITY)
-                .setHighValue(POSITIVE_INFINITY)
-                .setNullsFraction(0.1)
-                .build();
-        emptyRangeStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(0.0)
-                .setDistinctValuesCount(0.0)
-                .setLowValue(NaN)
-                .setHighValue(NaN)
-                .setNullsFraction(1.0)
-                .build();
-        unknownNdvRangeStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(NaN)
-                .setLowValue(0)
-                .setHighValue(10)
-                .setNullsFraction(0.1)
-                .build();
-        varcharStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(50.0)
-                .setLowValue(NEGATIVE_INFINITY)
-                .setHighValue(POSITIVE_INFINITY)
-                .setNullsFraction(0.1)
-                .build();
-        standardInputStatistics = PlanNodeStatsEstimate.builder()
-                .addSymbolStatistics(new Symbol("u"), uStats)
-                .addSymbolStatistics(new Symbol("w"), wStats)
-                .addSymbolStatistics(new Symbol("x"), xStats)
-                .addSymbolStatistics(new Symbol("y"), yStats)
-                .addSymbolStatistics(new Symbol("z"), zStats)
-                .addSymbolStatistics(new Symbol("leftOpen"), leftOpenStats)
-                .addSymbolStatistics(new Symbol("rightOpen"), rightOpenStats)
-                .addSymbolStatistics(new Symbol("unknownRange"), unknownRangeStats)
-                .addSymbolStatistics(new Symbol("emptyRange"), emptyRangeStats)
-                .addSymbolStatistics(new Symbol("unknownNdvRange"), unknownNdvRangeStats)
-                .addSymbolStatistics(new Symbol("varchar"), varcharStats)
-                .setOutputRowCount(1000.0)
-                .build();
-
-        types = TypeProvider.copyOf(ImmutableMap.<Symbol, Type>builder()
-                .put(new Symbol("u"), DoubleType.DOUBLE)
-                .put(new Symbol("w"), DoubleType.DOUBLE)
-                .put(new Symbol("x"), DoubleType.DOUBLE)
-                .put(new Symbol("y"), DoubleType.DOUBLE)
-                .put(new Symbol("z"), DoubleType.DOUBLE)
-                .put(new Symbol("leftOpen"), DoubleType.DOUBLE)
-                .put(new Symbol("rightOpen"), DoubleType.DOUBLE)
-                .put(new Symbol("unknownRange"), DoubleType.DOUBLE)
-                .put(new Symbol("emptyRange"), DoubleType.DOUBLE)
-                .put(new Symbol("unknownNdvRange"), DoubleType.DOUBLE)
-                .put(new Symbol("varchar"), VarcharType.createVarcharType(10))
-                .buildOrThrow());
-    }
+    private final FilterStatsCalculator filterStatsCalculator = new FilterStatsCalculator(PLANNER_CONTEXT, new ScalarStatsCalculator(PLANNER_CONTEXT, createTestingTypeAnalyzer(PLANNER_CONTEXT)), new StatsNormalizer());
+    private final Session session = testSessionBuilder().build();
+    private final TypeProvider types = TypeProvider.copyOf(ImmutableMap.<Symbol, Type>builder()
+            .put(new Symbol("u"), DoubleType.DOUBLE)
+            .put(new Symbol("w"), DoubleType.DOUBLE)
+            .put(new Symbol("x"), DoubleType.DOUBLE)
+            .put(new Symbol("y"), DoubleType.DOUBLE)
+            .put(new Symbol("z"), DoubleType.DOUBLE)
+            .put(new Symbol("leftOpen"), DoubleType.DOUBLE)
+            .put(new Symbol("rightOpen"), DoubleType.DOUBLE)
+            .put(new Symbol("unknownRange"), DoubleType.DOUBLE)
+            .put(new Symbol("emptyRange"), DoubleType.DOUBLE)
+            .put(new Symbol("unknownNdvRange"), DoubleType.DOUBLE)
+            .put(new Symbol("varchar"), VarcharType.createVarcharType(10))
+            .buildOrThrow());
+    private final SymbolStatsEstimate uStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(8.0)
+            .setDistinctValuesCount(300)
+            .setLowValue(0)
+            .setHighValue(20)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate wStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(8.0)
+            .setDistinctValuesCount(30)
+            .setLowValue(0)
+            .setHighValue(20)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate xStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(40.0)
+            .setLowValue(-10.0)
+            .setHighValue(10.0)
+            .setNullsFraction(0.25)
+            .build();
+    private final SymbolStatsEstimate yStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(20.0)
+            .setLowValue(0.0)
+            .setHighValue(5.0)
+            .setNullsFraction(0.5)
+            .build();
+    private final SymbolStatsEstimate zStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(5.0)
+            .setLowValue(-100.0)
+            .setHighValue(100.0)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate leftOpenStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(50.0)
+            .setLowValue(NEGATIVE_INFINITY)
+            .setHighValue(15.0)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate rightOpenStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(50.0)
+            .setLowValue(-15.0)
+            .setHighValue(POSITIVE_INFINITY)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate unknownRangeStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(50.0)
+            .setLowValue(NEGATIVE_INFINITY)
+            .setHighValue(POSITIVE_INFINITY)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate emptyRangeStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(0.0)
+            .setDistinctValuesCount(0.0)
+            .setLowValue(NaN)
+            .setHighValue(NaN)
+            .setNullsFraction(1.0)
+            .build();
+    private final SymbolStatsEstimate unknownNdvRangeStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(NaN)
+            .setLowValue(0)
+            .setHighValue(10)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate varcharStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(50.0)
+            .setLowValue(NEGATIVE_INFINITY)
+            .setHighValue(POSITIVE_INFINITY)
+            .setNullsFraction(0.1)
+            .build();
+
+    private final PlanNodeStatsEstimate standardInputStatistics = PlanNodeStatsEstimate.builder()
+            .addSymbolStatistics(new Symbol("u"), uStats)
+            .addSymbolStatistics(new Symbol("w"), wStats)
+            .addSymbolStatistics(new Symbol("x"), xStats)
+            .addSymbolStatistics(new Symbol("y"), yStats)
+            .addSymbolStatistics(new Symbol("z"), zStats)
+            .addSymbolStatistics(new Symbol("leftOpen"), leftOpenStats)
+            .addSymbolStatistics(new Symbol("rightOpen"), rightOpenStats)
+            .addSymbolStatistics(new Symbol("unknownRange"), unknownRangeStats)
+            .addSymbolStatistics(new Symbol("emptyRange"), emptyRangeStats)
+            .addSymbolStatistics(new Symbol("unknownNdvRange"), unknownNdvRangeStats)
+            .addSymbolStatistics(new Symbol("varchar"), varcharStats)
+            .setOutputRowCount(1000.0)
+            .build();
 
     private Consumer<SymbolStatsAssertion> equalTo(SymbolStatsEstimate estimate)
     {
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestCostCalculator.java b/core/trino-main/src/test/java/io/trino/cost/TestCostCalculator.java
index f932359b2920..bdaa49f19b60 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestCostCalculator.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestCostCalculator.java
@@ -47,12 +47,12 @@
 import io.trino.sql.tree.Cast;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.IsNullPredicate;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -78,9 +78,11 @@
 import static io.trino.transaction.TransactionBuilder.transaction;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestCostCalculator
 {
     private static final int NUMBER_OF_NODES = 10;
@@ -93,7 +95,7 @@ public class TestCostCalculator
     private Session session;
     private LocalQueryRunner localQueryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         TaskCountEstimator taskCountEstimator = new TaskCountEstimator(() -> NUMBER_OF_NODES);
@@ -103,6 +105,7 @@ public void setUp()
         session = testSessionBuilder().setCatalog(TEST_CATALOG_NAME).build();
 
         localQueryRunner = LocalQueryRunner.create(session);
+        localQueryRunner.getLanguageFunctionManager().registerQuery(session);
         localQueryRunner.createCatalog(TEST_CATALOG_NAME, new TpchConnectorFactory(), ImmutableMap.of());
 
         planFragmenter = new PlanFragmenter(
@@ -110,10 +113,11 @@ public void setUp()
                 localQueryRunner.getFunctionManager(),
                 localQueryRunner.getTransactionManager(),
                 localQueryRunner.getCatalogManager(),
+                localQueryRunner.getLanguageFunctionManager(),
                 new QueryManagerConfig());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         costCalculatorUsingExchanges = null;
@@ -815,7 +819,7 @@ private PlanNode project(String id, PlanNode source, String symbol, Expression e
     private AggregationNode aggregation(String id, PlanNode source)
     {
         AggregationNode.Aggregation aggregation = new AggregationNode.Aggregation(
-                new TestingFunctionResolution(localQueryRunner).resolveFunction(QualifiedName.of("count"), ImmutableList.of()),
+                new TestingFunctionResolution(localQueryRunner).resolveFunction("count", ImmutableList.of()),
                 ImmutableList.of(),
                 false,
                 Optional.empty(),
@@ -867,7 +871,7 @@ private SubPlan fragment(Plan plan)
 
     private <T> T inTransaction(Function<Session, T> transactionSessionConsumer)
     {
-        return transaction(localQueryRunner.getTransactionManager(), new AllowAllAccessControl())
+        return transaction(localQueryRunner.getTransactionManager(), localQueryRunner.getMetadata(), new AllowAllAccessControl())
                 .singleStatement()
                 .execute(session, session -> {
                     // metadata.getCatalogHandle() registers the catalog for the transaction
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestCostComparator.java b/core/trino-main/src/test/java/io/trino/cost/TestCostComparator.java
index 392f6148feab..d60625d68d15 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestCostComparator.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestCostComparator.java
@@ -14,7 +14,7 @@
 package io.trino.cost;
 
 import io.trino.Session;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.testing.TestingSession.testSessionBuilder;
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestExchangeStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestExchangeStatsRule.java
index 7ccd25a44fc7..7c38910e9d9b 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestExchangeStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestExchangeStatsRule.java
@@ -16,7 +16,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.Symbol;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static java.util.Collections.emptyList;
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestFilterProjectAggregationStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestFilterProjectAggregationStatsRule.java
index 2fbbc9240618..53cae963b27f 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestFilterProjectAggregationStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestFilterProjectAggregationStatsRule.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Function;
 
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestFilterStatsCalculator.java b/core/trino-main/src/test/java/io/trino/cost/TestFilterStatsCalculator.java
index 679f8e2e775a..bddaa92e48b1 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestFilterStatsCalculator.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestFilterStatsCalculator.java
@@ -16,22 +16,25 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.MetadataManager;
 import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.type.DoubleType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
+import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.TypeProvider;
 import io.trino.sql.tree.Expression;
 import io.trino.transaction.TestingTransactionManager;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import io.trino.transaction.TransactionManager;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Consumer;
 
 import static io.trino.SystemSessionProperties.FILTER_CONJUNCTION_INDEPENDENCE_FACTOR;
 import static io.trino.sql.ExpressionTestUtils.planExpression;
-import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
+import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
 import static io.trino.sql.planner.iterative.rule.test.PlanBuilder.expression;
 import static io.trino.testing.TestingSession.testSessionBuilder;
@@ -43,118 +46,102 @@
 
 public class TestFilterStatsCalculator
 {
+    private static final TestingTransactionManager TRANSACTION_MANAGER = new TestingTransactionManager();
+    private static final PlannerContext PLANNER_CONTEXT = plannerContextBuilder()
+            .withTransactionManager(TRANSACTION_MANAGER)
+            .build();
     private static final VarcharType MEDIUM_VARCHAR_TYPE = VarcharType.createVarcharType(100);
 
-    private SymbolStatsEstimate xStats;
-    private SymbolStatsEstimate yStats;
-    private SymbolStatsEstimate zStats;
-    private SymbolStatsEstimate leftOpenStats;
-    private SymbolStatsEstimate rightOpenStats;
-    private SymbolStatsEstimate unknownRangeStats;
-    private SymbolStatsEstimate emptyRangeStats;
-    private SymbolStatsEstimate mediumVarcharStats;
-    private FilterStatsCalculator statsCalculator;
-    private PlanNodeStatsEstimate standardInputStatistics;
-    private PlanNodeStatsEstimate zeroStatistics;
-    private TypeProvider standardTypes;
-    private Session session;
-
-    @BeforeClass
-    public void setUp()
-    {
-        xStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(40.0)
-                .setLowValue(-10.0)
-                .setHighValue(10.0)
-                .setNullsFraction(0.25)
-                .build();
-        yStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(20.0)
-                .setLowValue(0.0)
-                .setHighValue(5.0)
-                .setNullsFraction(0.5)
-                .build();
-        zStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(5.0)
-                .setLowValue(-100.0)
-                .setHighValue(100.0)
-                .setNullsFraction(0.1)
-                .build();
-        leftOpenStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(50.0)
-                .setLowValue(NEGATIVE_INFINITY)
-                .setHighValue(15.0)
-                .setNullsFraction(0.1)
-                .build();
-        rightOpenStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(50.0)
-                .setLowValue(-15.0)
-                .setHighValue(POSITIVE_INFINITY)
-                .setNullsFraction(0.1)
-                .build();
-        unknownRangeStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(50.0)
-                .setLowValue(NEGATIVE_INFINITY)
-                .setHighValue(POSITIVE_INFINITY)
-                .setNullsFraction(0.1)
-                .build();
-        emptyRangeStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(0.0)
-                .setDistinctValuesCount(0.0)
-                .setLowValue(NaN)
-                .setHighValue(NaN)
-                .setNullsFraction(NaN)
-                .build();
-        mediumVarcharStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(85.0)
-                .setDistinctValuesCount(165)
-                .setLowValue(NEGATIVE_INFINITY)
-                .setHighValue(POSITIVE_INFINITY)
-                .setNullsFraction(0.34)
-                .build();
-        standardInputStatistics = PlanNodeStatsEstimate.builder()
-                .addSymbolStatistics(new Symbol("x"), xStats)
-                .addSymbolStatistics(new Symbol("y"), yStats)
-                .addSymbolStatistics(new Symbol("z"), zStats)
-                .addSymbolStatistics(new Symbol("leftOpen"), leftOpenStats)
-                .addSymbolStatistics(new Symbol("rightOpen"), rightOpenStats)
-                .addSymbolStatistics(new Symbol("unknownRange"), unknownRangeStats)
-                .addSymbolStatistics(new Symbol("emptyRange"), emptyRangeStats)
-                .addSymbolStatistics(new Symbol("mediumVarchar"), mediumVarcharStats)
-                .setOutputRowCount(1000.0)
-                .build();
-        zeroStatistics = PlanNodeStatsEstimate.builder()
-                .addSymbolStatistics(new Symbol("x"), SymbolStatsEstimate.zero())
-                .addSymbolStatistics(new Symbol("y"), SymbolStatsEstimate.zero())
-                .addSymbolStatistics(new Symbol("z"), SymbolStatsEstimate.zero())
-                .addSymbolStatistics(new Symbol("leftOpen"), SymbolStatsEstimate.zero())
-                .addSymbolStatistics(new Symbol("rightOpen"), SymbolStatsEstimate.zero())
-                .addSymbolStatistics(new Symbol("unknownRange"), SymbolStatsEstimate.zero())
-                .addSymbolStatistics(new Symbol("emptyRange"), SymbolStatsEstimate.zero())
-                .addSymbolStatistics(new Symbol("mediumVarchar"), SymbolStatsEstimate.zero())
-                .setOutputRowCount(0)
-                .build();
-
-        standardTypes = TypeProvider.copyOf(ImmutableMap.<Symbol, Type>builder()
-                .put(new Symbol("x"), DoubleType.DOUBLE)
-                .put(new Symbol("y"), DoubleType.DOUBLE)
-                .put(new Symbol("z"), DoubleType.DOUBLE)
-                .put(new Symbol("leftOpen"), DoubleType.DOUBLE)
-                .put(new Symbol("rightOpen"), DoubleType.DOUBLE)
-                .put(new Symbol("unknownRange"), DoubleType.DOUBLE)
-                .put(new Symbol("emptyRange"), DoubleType.DOUBLE)
-                .put(new Symbol("mediumVarchar"), MEDIUM_VARCHAR_TYPE)
-                .buildOrThrow());
-
-        session = testSessionBuilder().build();
-        statsCalculator = new FilterStatsCalculator(PLANNER_CONTEXT, new ScalarStatsCalculator(PLANNER_CONTEXT, createTestingTypeAnalyzer(PLANNER_CONTEXT)), new StatsNormalizer());
-    }
+    private final SymbolStatsEstimate xStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(40.0)
+            .setLowValue(-10.0)
+            .setHighValue(10.0)
+            .setNullsFraction(0.25)
+            .build();
+    private final SymbolStatsEstimate yStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(20.0)
+            .setLowValue(0.0)
+            .setHighValue(5.0)
+            .setNullsFraction(0.5)
+            .build();
+    private final SymbolStatsEstimate zStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(5.0)
+            .setLowValue(-100.0)
+            .setHighValue(100.0)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate leftOpenStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(50.0)
+            .setLowValue(NEGATIVE_INFINITY)
+            .setHighValue(15.0)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate rightOpenStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(50.0)
+            .setLowValue(-15.0)
+            .setHighValue(POSITIVE_INFINITY)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate unknownRangeStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(50.0)
+            .setLowValue(NEGATIVE_INFINITY)
+            .setHighValue(POSITIVE_INFINITY)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate emptyRangeStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(0.0)
+            .setDistinctValuesCount(0.0)
+            .setLowValue(NaN)
+            .setHighValue(NaN)
+            .setNullsFraction(NaN)
+            .build();
+    private final SymbolStatsEstimate mediumVarcharStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(85.0)
+            .setDistinctValuesCount(165)
+            .setLowValue(NEGATIVE_INFINITY)
+            .setHighValue(POSITIVE_INFINITY)
+            .setNullsFraction(0.34)
+            .build();
+    private final FilterStatsCalculator statsCalculator = new FilterStatsCalculator(PLANNER_CONTEXT, new ScalarStatsCalculator(PLANNER_CONTEXT, createTestingTypeAnalyzer(PLANNER_CONTEXT)), new StatsNormalizer());
+    private final PlanNodeStatsEstimate standardInputStatistics = PlanNodeStatsEstimate.builder()
+            .addSymbolStatistics(new Symbol("x"), xStats)
+            .addSymbolStatistics(new Symbol("y"), yStats)
+            .addSymbolStatistics(new Symbol("z"), zStats)
+            .addSymbolStatistics(new Symbol("leftOpen"), leftOpenStats)
+            .addSymbolStatistics(new Symbol("rightOpen"), rightOpenStats)
+            .addSymbolStatistics(new Symbol("unknownRange"), unknownRangeStats)
+            .addSymbolStatistics(new Symbol("emptyRange"), emptyRangeStats)
+            .addSymbolStatistics(new Symbol("mediumVarchar"), mediumVarcharStats)
+            .setOutputRowCount(1000.0)
+            .build();
+    private final PlanNodeStatsEstimate zeroStatistics = PlanNodeStatsEstimate.builder()
+            .addSymbolStatistics(new Symbol("x"), SymbolStatsEstimate.zero())
+            .addSymbolStatistics(new Symbol("y"), SymbolStatsEstimate.zero())
+            .addSymbolStatistics(new Symbol("z"), SymbolStatsEstimate.zero())
+            .addSymbolStatistics(new Symbol("leftOpen"), SymbolStatsEstimate.zero())
+            .addSymbolStatistics(new Symbol("rightOpen"), SymbolStatsEstimate.zero())
+            .addSymbolStatistics(new Symbol("unknownRange"), SymbolStatsEstimate.zero())
+            .addSymbolStatistics(new Symbol("emptyRange"), SymbolStatsEstimate.zero())
+            .addSymbolStatistics(new Symbol("mediumVarchar"), SymbolStatsEstimate.zero())
+            .setOutputRowCount(0)
+            .build();
+    private final TypeProvider standardTypes = TypeProvider.copyOf(ImmutableMap.<Symbol, Type>builder()
+            .put(new Symbol("x"), DoubleType.DOUBLE)
+            .put(new Symbol("y"), DoubleType.DOUBLE)
+            .put(new Symbol("z"), DoubleType.DOUBLE)
+            .put(new Symbol("leftOpen"), DoubleType.DOUBLE)
+            .put(new Symbol("rightOpen"), DoubleType.DOUBLE)
+            .put(new Symbol("unknownRange"), DoubleType.DOUBLE)
+            .put(new Symbol("emptyRange"), DoubleType.DOUBLE)
+            .put(new Symbol("mediumVarchar"), MEDIUM_VARCHAR_TYPE)
+            .buildOrThrow());
+    private final Session session = testSessionBuilder().build();
 
     @Test
     public void testBooleanLiteralStats()
@@ -608,8 +595,20 @@ public void testBetweenOperatorFilter()
                                 .highValue(100.0)
                                 .nullsFraction(0.0));
 
+        // Expression as value. CAST from DOUBLE to DECIMAL(7,2)
+        // Produces row count estimate without updating symbol stats
+        assertExpression("CAST(x AS DECIMAL(7,2)) BETWEEN CAST(DECIMAL '-2.50' AS DECIMAL(7, 2)) AND CAST(DECIMAL '2.50' AS DECIMAL(7, 2))")
+                .outputRowsCount(219.726563)
+                .symbolStats("x", symbolStats ->
+                        symbolStats.distinctValuesCount(xStats.getDistinctValuesCount())
+                                .lowValue(xStats.getLowValue())
+                                .highValue(xStats.getHighValue())
+                                .nullsFraction(xStats.getNullsFraction()));
+
         assertExpression("'a' IN ('a', 'b')").equalTo(standardInputStatistics);
+        assertExpression("'a' IN ('a', 'b', NULL)").equalTo(standardInputStatistics);
         assertExpression("'a' IN ('b', 'c')").outputRowsCount(0);
+        assertExpression("'a' IN ('b', 'c', NULL)").outputRowsCount(0);
         assertExpression("CAST('b' AS VARCHAR(3)) IN (CAST('a' AS VARCHAR(3)), CAST('b' AS VARCHAR(3)))").equalTo(standardInputStatistics);
         assertExpression("CAST('c' AS VARCHAR(3)) IN (CAST('a' AS VARCHAR(3)), CAST('b' AS VARCHAR(3)))").outputRowsCount(0);
     }
@@ -685,6 +684,15 @@ public void testInPredicateFilter()
                                 .highValue(7.5)
                                 .nullsFraction(0.0));
 
+        // Multiple values some including NULL
+        assertExpression("x IN (DOUBLE '-42', 1.5e0, 2.5e0, 7.5e0, 314e0, CAST(NULL AS double))")
+                .outputRowsCount(56.25)
+                .symbolStats("x", symbolStats ->
+                        symbolStats.distinctValuesCount(3.0)
+                                .lowValue(1.5)
+                                .highValue(7.5)
+                                .nullsFraction(0.0));
+
         // Multiple values in unknown range
         assertExpression("unknownRange IN (DOUBLE '-42', 1.5e0, 2.5e0, 7.5e0, 314e0)")
                 .outputRowsCount(90.0)
@@ -738,17 +746,19 @@ private PlanNodeStatsAssertion assertExpression(String expression)
 
     private PlanNodeStatsAssertion assertExpression(String expression, PlanNodeStatsEstimate inputStatistics)
     {
-        return assertExpression(planExpression(PLANNER_CONTEXT, session, standardTypes, expression(expression)), session, inputStatistics);
+        return assertExpression(planExpression(TRANSACTION_MANAGER, PLANNER_CONTEXT, session, standardTypes, expression(expression)), session, inputStatistics);
     }
 
     private PlanNodeStatsAssertion assertExpression(String expression, Session session)
     {
-        return assertExpression(planExpression(PLANNER_CONTEXT, session, standardTypes, expression(expression)), session, standardInputStatistics);
+        return assertExpression(planExpression(TRANSACTION_MANAGER, PLANNER_CONTEXT, session, standardTypes, expression(expression)), session, standardInputStatistics);
     }
 
     private PlanNodeStatsAssertion assertExpression(Expression expression, Session session, PlanNodeStatsEstimate inputStatistics)
     {
-        return transaction(new TestingTransactionManager(), new AllowAllAccessControl())
+        TransactionManager transactionManager = new TestingTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
+        return transaction(transactionManager, metadata, new AllowAllAccessControl())
                 .singleStatement()
                 .execute(session, transactionSession -> {
                     return PlanNodeStatsAssertion.assertThat(statsCalculator.filterStats(
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestFilterStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestFilterStatsRule.java
index 8a2ccd343f7e..94583ea0e683 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestFilterStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestFilterStatsRule.java
@@ -19,22 +19,24 @@
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.ComparisonExpression.Operator;
 import io.trino.sql.tree.DoubleLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.sql.planner.iterative.rule.test.PlanBuilder.expression;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestFilterStatsRule
         extends BaseStatsCalculatorTest
 {
     public StatsCalculatorTester defaultFilterTester;
 
-    @BeforeClass
+    @BeforeAll
     public void setupClass()
     {
         defaultFilterTester = new StatsCalculatorTester(
@@ -43,7 +45,7 @@ public void setupClass()
                         .build());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDownClass()
     {
         defaultFilterTester.close();
@@ -151,7 +153,7 @@ public void testUnestimatableFunction()
         ComparisonExpression unestimatableExpression = new ComparisonExpression(
                 Operator.EQUAL,
                 new TestingFunctionResolution()
-                        .functionCallBuilder(QualifiedName.of("sin"))
+                        .functionCallBuilder("sin")
                         .addArgument(DOUBLE, new SymbolReference("i1"))
                         .build(),
                 new DoubleLiteral("1"));
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestJoinStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestJoinStatsRule.java
index 5bf42da51c7b..372a7aa71004 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestJoinStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestJoinStatsRule.java
@@ -24,7 +24,7 @@
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.LongLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.function.Function;
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestOptimizerConfig.java b/core/trino-main/src/test/java/io/trino/cost/TestOptimizerConfig.java
index 3749a199eb0b..5d779fa0c87c 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestOptimizerConfig.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestOptimizerConfig.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.OptimizerConfig;
 import io.trino.sql.planner.OptimizerConfig.JoinDistributionType;
 import io.trino.sql.planner.OptimizerConfig.JoinReorderingStrategy;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -48,10 +48,10 @@ public void testDefaults()
                 .setJoinMultiClauseIndependenceFactor(0.25)
                 .setJoinReorderingStrategy(JoinReorderingStrategy.AUTOMATIC)
                 .setMaxReorderedJoins(9)
+                .setMaxPrefetchedInformationSchemaPrefixes(100)
                 .setColocatedJoinsEnabled(true)
                 .setSpatialJoinsEnabled(true)
                 .setUsePreferredWritePartitioning(true)
-                .setPreferredWritePartitioningMinNumberOfPartitions(50)
                 .setEnableStatsCalculator(true)
                 .setStatisticsPrecalculationForPushdownEnabled(true)
                 .setCollectPlanStatisticsForAllQueries(false)
@@ -60,7 +60,7 @@ public void testDefaults()
                 .setFilterConjunctionIndependenceFactor(0.75)
                 .setNonEstimatablePredicateApproximationEnabled(true)
                 .setOptimizeMetadataQueries(false)
-                .setOptimizeHashGeneration(true)
+                .setOptimizeHashGeneration(false)
                 .setPushTableWriteThroughUnion(true)
                 .setDictionaryAggregation(false)
                 .setOptimizeMixedDistinctAggregations(false)
@@ -70,7 +70,7 @@ public void testDefaults()
                 .setPushAggregationThroughOuterJoin(true)
                 .setPushPartialAggregationThroughJoin(false)
                 .setPreAggregateCaseAggregationsEnabled(true)
-                .setMarkDistinctStrategy(null)
+                .setMarkDistinctStrategy(OptimizerConfig.MarkDistinctStrategy.AUTOMATIC)
                 .setPreferPartialAggregation(true)
                 .setOptimizeTopNRanking(true)
                 .setDistributedSortEnabled(true)
@@ -86,7 +86,6 @@ public void testDefaults()
                 .setMergeProjectWithValues(true)
                 .setForceSingleNodeOutput(false)
                 .setAdaptivePartialAggregationEnabled(true)
-                .setAdaptivePartialAggregationMinRows(100_000)
                 .setAdaptivePartialAggregationUniqueRowsRatioThreshold(0.8)
                 .setJoinPartitionedBuildMinRowCount(1_000_000)
                 .setMinInputSizePerTask(DataSize.of(5, GIGABYTE))
@@ -114,15 +113,15 @@ public void testExplicitPropertyMappings()
                 .put("optimizer.join-multi-clause-independence-factor", "0.75")
                 .put("optimizer.join-reordering-strategy", "NONE")
                 .put("optimizer.max-reordered-joins", "5")
+                .put("optimizer.experimental-max-prefetched-information-schema-prefixes", "10")
                 .put("iterative-optimizer-timeout", "10s")
                 .put("enable-forced-exchange-below-group-id", "false")
                 .put("colocated-joins-enabled", "false")
                 .put("spatial-joins-enabled", "false")
                 .put("distributed-sort", "false")
                 .put("use-preferred-write-partitioning", "false")
-                .put("preferred-write-partitioning-min-number-of-partitions", "10")
                 .put("optimizer.optimize-metadata-queries", "true")
-                .put("optimizer.optimize-hash-generation", "false")
+                .put("optimizer.optimize-hash-generation", "true")
                 .put("optimizer.optimize-mixed-distinct-aggregations", "true")
                 .put("optimizer.push-table-write-through-union", "false")
                 .put("optimizer.dictionary-aggregation", "true")
@@ -145,7 +144,6 @@ public void testExplicitPropertyMappings()
                 .put("optimizer.table-scan-node-partitioning-min-bucket-to-task-ratio", "0.0")
                 .put("optimizer.merge-project-with-values", "false")
                 .put("adaptive-partial-aggregation.enabled", "false")
-                .put("adaptive-partial-aggregation.min-rows", "1")
                 .put("adaptive-partial-aggregation.unique-rows-ratio-threshold", "0.99")
                 .put("optimizer.join-partitioned-build-min-row-count", "1")
                 .put("optimizer.min-input-size-per-task", "1MB")
@@ -167,17 +165,17 @@ public void testExplicitPropertyMappings()
                 .setJoinMultiClauseIndependenceFactor(0.75)
                 .setJoinReorderingStrategy(NONE)
                 .setMaxReorderedJoins(5)
+                .setMaxPrefetchedInformationSchemaPrefixes(10)
                 .setIterativeOptimizerTimeout(new Duration(10, SECONDS))
                 .setEnableForcedExchangeBelowGroupId(false)
                 .setColocatedJoinsEnabled(false)
                 .setSpatialJoinsEnabled(false)
                 .setUsePreferredWritePartitioning(false)
-                .setPreferredWritePartitioningMinNumberOfPartitions(10)
                 .setDefaultFilterFactorEnabled(true)
                 .setFilterConjunctionIndependenceFactor(1.0)
                 .setNonEstimatablePredicateApproximationEnabled(false)
                 .setOptimizeMetadataQueries(true)
-                .setOptimizeHashGeneration(false)
+                .setOptimizeHashGeneration(true)
                 .setOptimizeMixedDistinctAggregations(true)
                 .setPushTableWriteThroughUnion(false)
                 .setDictionaryAggregation(true)
@@ -201,7 +199,6 @@ public void testExplicitPropertyMappings()
                 .setMergeProjectWithValues(false)
                 .setForceSingleNodeOutput(true)
                 .setAdaptivePartialAggregationEnabled(false)
-                .setAdaptivePartialAggregationMinRows(1)
                 .setAdaptivePartialAggregationUniqueRowsRatioThreshold(0.99)
                 .setJoinPartitionedBuildMinRowCount(1)
                 .setMinInputSizePerTask(DataSize.of(1, MEGABYTE))
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestOutputNodeStats.java b/core/trino-main/src/test/java/io/trino/cost/TestOutputNodeStats.java
index 82b453a8f1e7..139f274e6063 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestOutputNodeStats.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestOutputNodeStats.java
@@ -14,7 +14,7 @@
 package io.trino.cost;
 
 import io.trino.sql.planner.Symbol;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestPlanNodeStatsEstimateMath.java b/core/trino-main/src/test/java/io/trino/cost/TestPlanNodeStatsEstimateMath.java
index 83f406e8ca6f..829bcb02b231 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestPlanNodeStatsEstimateMath.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestPlanNodeStatsEstimateMath.java
@@ -14,7 +14,7 @@
 package io.trino.cost;
 
 import io.trino.sql.planner.Symbol;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.cost.PlanNodeStatsEstimateMath.addStatsAndMaxDistinctValues;
 import static io.trino.cost.PlanNodeStatsEstimateMath.addStatsAndSumDistinctValues;
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestRowNumberStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestRowNumberStatsRule.java
index 5ac7cb34678f..a5be1357b28a 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestRowNumberStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestRowNumberStatsRule.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.Symbol;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestSampleStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestSampleStatsRule.java
index 9c996d2b3ba4..20ced6b89e5e 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestSampleStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestSampleStatsRule.java
@@ -15,7 +15,7 @@
 
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.SampleNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestScalarStatsCalculator.java b/core/trino-main/src/test/java/io/trino/cost/TestScalarStatsCalculator.java
index 2e9a104da20e..c2dac31de5ec 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestScalarStatsCalculator.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestScalarStatsCalculator.java
@@ -16,9 +16,10 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.slice.Slices;
 import io.trino.Session;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.MetadataManager;
 import io.trino.metadata.TestingFunctionResolution;
 import io.trino.security.AllowAllAccessControl;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.planner.LiteralEncoder;
 import io.trino.sql.planner.Symbol;
@@ -29,12 +30,11 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.GenericLiteral;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.transaction.TestingTransactionManager;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import io.trino.transaction.TransactionManager;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
@@ -50,19 +50,11 @@
 
 public class TestScalarStatsCalculator
 {
-    private TestingFunctionResolution functionResolution;
-    private ScalarStatsCalculator calculator;
-    private Session session;
+    private final TestingFunctionResolution functionResolution = new TestingFunctionResolution();
+    private final ScalarStatsCalculator calculator = new ScalarStatsCalculator(functionResolution.getPlannerContext(), createTestingTypeAnalyzer(functionResolution.getPlannerContext()));
+    private final Session session = testSessionBuilder().build();
     private final SqlParser sqlParser = new SqlParser();
 
-    @BeforeClass
-    public void setUp()
-    {
-        functionResolution = new TestingFunctionResolution();
-        calculator = new ScalarStatsCalculator(functionResolution.getPlannerContext(), createTestingTypeAnalyzer(functionResolution.getPlannerContext()));
-        session = testSessionBuilder().build();
-    }
-
     @Test
     public void testLiteral()
     {
@@ -120,7 +112,7 @@ public void testFunctionCall()
     {
         assertCalculate(
                 functionResolution
-                        .functionCallBuilder(QualifiedName.of("length"))
+                        .functionCallBuilder("length")
                         .addArgument(createVarcharType(10), new Cast(new NullLiteral(), toSqlType(createVarcharType(10))))
                         .build())
                 .distinctValuesCount(0.0)
@@ -130,7 +122,7 @@ public void testFunctionCall()
 
         assertCalculate(
                 functionResolution
-                        .functionCallBuilder(QualifiedName.of("length"))
+                        .functionCallBuilder("length")
                         .addArgument(createVarcharType(2), new SymbolReference("x"))
                         .build(),
                 PlanNodeStatsEstimate.unknown(),
@@ -145,7 +137,7 @@ public void testFunctionCall()
     public void testVarbinaryConstant()
     {
         LiteralEncoder literalEncoder = new LiteralEncoder(functionResolution.getPlannerContext());
-        Expression expression = literalEncoder.toExpression(session, Slices.utf8Slice("ala ma kota"), VARBINARY);
+        Expression expression = literalEncoder.toExpression(Slices.utf8Slice("ala ma kota"), VARBINARY);
 
         assertCalculate(expression)
                 .distinctValuesCount(1.0)
@@ -293,7 +285,9 @@ private SymbolStatsAssertion assertCalculate(Expression scalarExpression, PlanNo
 
     private SymbolStatsAssertion assertCalculate(Expression scalarExpression, PlanNodeStatsEstimate inputStatistics, TypeProvider types)
     {
-        return transaction(new TestingTransactionManager(), new AllowAllAccessControl())
+        TransactionManager transactionManager = new TestingTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
+        return transaction(transactionManager, metadata, new AllowAllAccessControl())
                 .singleStatement()
                 .execute(session, transactionSession -> {
                     return SymbolStatsAssertion.assertThat(calculator.calculate(scalarExpression, inputStatistics, transactionSession, types));
@@ -508,6 +502,6 @@ public void testCoalesceExpression()
 
     private Expression expression(String sqlExpression)
     {
-        return rewriteIdentifiersToSymbolReferences(sqlParser.createExpression(sqlExpression, new ParsingOptions()));
+        return rewriteIdentifiersToSymbolReferences(sqlParser.createExpression(sqlExpression));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestSemiJoinStatsCalculator.java b/core/trino-main/src/test/java/io/trino/cost/TestSemiJoinStatsCalculator.java
index 1c18eaea3c62..86661ce46175 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestSemiJoinStatsCalculator.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestSemiJoinStatsCalculator.java
@@ -15,8 +15,7 @@
 package io.trino.cost;
 
 import io.trino.sql.planner.Symbol;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.cost.PlanNodeStatsAssertion.assertThat;
 import static io.trino.cost.SemiJoinStatsCalculator.computeAntiJoin;
@@ -27,116 +26,100 @@
 
 public class TestSemiJoinStatsCalculator
 {
-    private PlanNodeStatsEstimate inputStatistics;
-    private SymbolStatsEstimate uStats;
-    private SymbolStatsEstimate wStats;
-    private SymbolStatsEstimate xStats;
-    private SymbolStatsEstimate yStats;
-    private SymbolStatsEstimate zStats;
-    private SymbolStatsEstimate leftOpenStats;
-    private SymbolStatsEstimate rightOpenStats;
-    private SymbolStatsEstimate unknownRangeStats;
-    private SymbolStatsEstimate emptyRangeStats;
-    private SymbolStatsEstimate fractionalNdvStats;
-
-    private Symbol u = new Symbol("u");
-    private Symbol w = new Symbol("w");
-    private Symbol x = new Symbol("x");
-    private Symbol y = new Symbol("y");
-    private Symbol z = new Symbol("z");
-    private Symbol leftOpen = new Symbol("leftOpen");
-    private Symbol rightOpen = new Symbol("rightOpen");
-    private Symbol unknownRange = new Symbol("unknownRange");
-    private Symbol emptyRange = new Symbol("emptyRange");
-    private Symbol unknown = new Symbol("unknown");
-    private Symbol fractionalNdv = new Symbol("fractionalNdv");
-
-    @BeforeClass
-    public void setUp()
-    {
-        uStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(8.0)
-                .setDistinctValuesCount(300)
-                .setLowValue(0)
-                .setHighValue(20)
-                .setNullsFraction(0.1)
-                .build();
-        wStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(8.0)
-                .setDistinctValuesCount(30)
-                .setLowValue(0)
-                .setHighValue(20)
-                .setNullsFraction(0.1)
-                .build();
-        xStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(40.0)
-                .setLowValue(-10.0)
-                .setHighValue(10.0)
-                .setNullsFraction(0.25)
-                .build();
-        yStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(20.0)
-                .setLowValue(0.0)
-                .setHighValue(5.0)
-                .setNullsFraction(0.5)
-                .build();
-        zStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(5.0)
-                .setLowValue(-100.0)
-                .setHighValue(100.0)
-                .setNullsFraction(0.1)
-                .build();
-        leftOpenStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(50.0)
-                .setLowValue(NEGATIVE_INFINITY)
-                .setHighValue(15.0)
-                .setNullsFraction(0.1)
-                .build();
-        rightOpenStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(50.0)
-                .setLowValue(-15.0)
-                .setHighValue(POSITIVE_INFINITY)
-                .setNullsFraction(0.1)
-                .build();
-        unknownRangeStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(50.0)
-                .setLowValue(NEGATIVE_INFINITY)
-                .setHighValue(POSITIVE_INFINITY)
-                .setNullsFraction(0.1)
-                .build();
-        emptyRangeStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(4.0)
-                .setDistinctValuesCount(0.0)
-                .setLowValue(NaN)
-                .setHighValue(NaN)
-                .setNullsFraction(NaN)
-                .build();
-        fractionalNdvStats = SymbolStatsEstimate.builder()
-                .setAverageRowSize(NaN)
-                .setDistinctValuesCount(0.1)
-                .setNullsFraction(0)
-                .build();
-        inputStatistics = PlanNodeStatsEstimate.builder()
-                .addSymbolStatistics(u, uStats)
-                .addSymbolStatistics(w, wStats)
-                .addSymbolStatistics(x, xStats)
-                .addSymbolStatistics(y, yStats)
-                .addSymbolStatistics(z, zStats)
-                .addSymbolStatistics(leftOpen, leftOpenStats)
-                .addSymbolStatistics(rightOpen, rightOpenStats)
-                .addSymbolStatistics(unknownRange, unknownRangeStats)
-                .addSymbolStatistics(emptyRange, emptyRangeStats)
-                .addSymbolStatistics(unknown, SymbolStatsEstimate.unknown())
-                .addSymbolStatistics(fractionalNdv, fractionalNdvStats)
-                .setOutputRowCount(1000.0)
-                .build();
-    }
+    private final SymbolStatsEstimate uStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(8.0)
+            .setDistinctValuesCount(300)
+            .setLowValue(0)
+            .setHighValue(20)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate wStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(8.0)
+            .setDistinctValuesCount(30)
+            .setLowValue(0)
+            .setHighValue(20)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate xStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(40.0)
+            .setLowValue(-10.0)
+            .setHighValue(10.0)
+            .setNullsFraction(0.25)
+            .build();
+    private final SymbolStatsEstimate yStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(20.0)
+            .setLowValue(0.0)
+            .setHighValue(5.0)
+            .setNullsFraction(0.5)
+            .build();
+    private final SymbolStatsEstimate zStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(5.0)
+            .setLowValue(-100.0)
+            .setHighValue(100.0)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate leftOpenStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(50.0)
+            .setLowValue(NEGATIVE_INFINITY)
+            .setHighValue(15.0)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate rightOpenStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(50.0)
+            .setLowValue(-15.0)
+            .setHighValue(POSITIVE_INFINITY)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate unknownRangeStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(50.0)
+            .setLowValue(NEGATIVE_INFINITY)
+            .setHighValue(POSITIVE_INFINITY)
+            .setNullsFraction(0.1)
+            .build();
+    private final SymbolStatsEstimate emptyRangeStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(4.0)
+            .setDistinctValuesCount(0.0)
+            .setLowValue(NaN)
+            .setHighValue(NaN)
+            .setNullsFraction(NaN)
+            .build();
+    private final SymbolStatsEstimate fractionalNdvStats = SymbolStatsEstimate.builder()
+            .setAverageRowSize(NaN)
+            .setDistinctValuesCount(0.1)
+            .setNullsFraction(0)
+            .build();
+
+    private final Symbol u = new Symbol("u");
+    private final Symbol w = new Symbol("w");
+    private final Symbol x = new Symbol("x");
+    private final Symbol y = new Symbol("y");
+    private final Symbol z = new Symbol("z");
+    private final Symbol leftOpen = new Symbol("leftOpen");
+    private final Symbol rightOpen = new Symbol("rightOpen");
+    private final Symbol unknownRange = new Symbol("unknownRange");
+    private final Symbol emptyRange = new Symbol("emptyRange");
+    private final Symbol unknown = new Symbol("unknown");
+    private final Symbol fractionalNdv = new Symbol("fractionalNdv");
+    private final PlanNodeStatsEstimate inputStatistics = PlanNodeStatsEstimate.builder()
+            .addSymbolStatistics(u, uStats)
+            .addSymbolStatistics(w, wStats)
+            .addSymbolStatistics(x, xStats)
+            .addSymbolStatistics(y, yStats)
+            .addSymbolStatistics(z, zStats)
+            .addSymbolStatistics(leftOpen, leftOpenStats)
+            .addSymbolStatistics(rightOpen, rightOpenStats)
+            .addSymbolStatistics(unknownRange, unknownRangeStats)
+            .addSymbolStatistics(emptyRange, emptyRangeStats)
+            .addSymbolStatistics(unknown, SymbolStatsEstimate.unknown())
+            .addSymbolStatistics(fractionalNdv, fractionalNdvStats)
+            .setOutputRowCount(1000.0)
+            .build();
 
     @Test
     public void testSemiJoin()
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestSemiJoinStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestSemiJoinStatsRule.java
index 886f9c527863..479f6fb9f70f 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestSemiJoinStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestSemiJoinStatsRule.java
@@ -14,7 +14,7 @@
 package io.trino.cost;
 
 import io.trino.sql.planner.Symbol;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestSimpleFilterProjectSemiJoinStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestSimpleFilterProjectSemiJoinStatsRule.java
index df06685af746..add2b03c21c2 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestSimpleFilterProjectSemiJoinStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestSimpleFilterProjectSemiJoinStatsRule.java
@@ -16,7 +16,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestSortStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestSortStatsRule.java
index f8b262655d17..4fd0298daae8 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestSortStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestSortStatsRule.java
@@ -14,7 +14,7 @@
 package io.trino.cost;
 
 import io.trino.sql.planner.Symbol;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestStatisticRange.java b/core/trino-main/src/test/java/io/trino/cost/TestStatisticRange.java
index c4681f778d0b..89946ed0981d 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestStatisticRange.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestStatisticRange.java
@@ -13,7 +13,7 @@
  */
 package io.trino.cost;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.cost.EstimateAssertion.assertEstimateEquals;
 import static java.lang.Double.NEGATIVE_INFINITY;
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestStatsCalculator.java b/core/trino-main/src/test/java/io/trino/cost/TestStatsCalculator.java
index 7b6496d1dce7..9076170da0b7 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestStatsCalculator.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestStatsCalculator.java
@@ -14,7 +14,6 @@
 package io.trino.cost;
 
 import com.google.common.collect.ImmutableMap;
-import io.trino.execution.warnings.WarningCollector;
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.sql.planner.LogicalPlanner;
 import io.trino.sql.planner.Plan;
@@ -22,22 +21,26 @@
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static io.trino.execution.warnings.WarningCollector.NOOP;
 import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestStatsCalculator
 {
     private LocalQueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         queryRunner = LocalQueryRunner.create(testSessionBuilder()
@@ -52,7 +55,7 @@ public void setUp()
                 ImmutableMap.of());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
@@ -77,7 +80,7 @@ private void assertPlan(String sql, PlanMatchPattern pattern)
     private void assertPlan(String sql, LogicalPlanner.Stage stage, PlanMatchPattern pattern)
     {
         queryRunner.inTransaction(transactionSession -> {
-            Plan actualPlan = queryRunner.createPlan(transactionSession, sql, stage, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+            Plan actualPlan = queryRunner.createPlan(transactionSession, sql, queryRunner.getPlanOptimizers(true), stage, NOOP, createPlanOptimizersStatsCollector());
             PlanAssert.assertPlan(
                     transactionSession,
                     queryRunner.getMetadata(),
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestStatsNormalizer.java b/core/trino-main/src/test/java/io/trino/cost/TestStatsNormalizer.java
index bb2cb092f0c9..a371c05ab2a3 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestStatsNormalizer.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestStatsNormalizer.java
@@ -19,7 +19,7 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.TypeProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestTableScanStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestTableScanStatsRule.java
index 83c4ed7b4e41..98c0fa5e81a7 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestTableScanStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestTableScanStatsRule.java
@@ -22,7 +22,7 @@
 import io.trino.spi.statistics.Estimate;
 import io.trino.spi.statistics.TableStatistics;
 import io.trino.sql.planner.Symbol;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestTopNStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestTopNStatsRule.java
index 1c7df19c8deb..2c147361f64d 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestTopNStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestTopNStatsRule.java
@@ -18,7 +18,7 @@
 import io.trino.spi.connector.SortOrder;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.TopNNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestTopNStatsRule
         extends BaseStatsCalculatorTest
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestUnionStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestUnionStatsRule.java
index 9ee39aaa3758..2b910b7e799a 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestUnionStatsRule.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestUnionStatsRule.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;
 import io.trino.sql.planner.Symbol;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static java.lang.Double.NEGATIVE_INFINITY;
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestValuesNodeStats.java b/core/trino-main/src/test/java/io/trino/cost/TestValuesNodeStats.java
index a7d96b9b0658..d5311555591a 100644
--- a/core/trino-main/src/test/java/io/trino/cost/TestValuesNodeStats.java
+++ b/core/trino-main/src/test/java/io/trino/cost/TestValuesNodeStats.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.Symbol;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
diff --git a/core/trino-main/src/test/java/io/trino/dispatcher/TestDecoratingListeningExecutorService.java b/core/trino-main/src/test/java/io/trino/dispatcher/TestDecoratingListeningExecutorService.java
index 9a46c9516566..f942a64f7310 100644
--- a/core/trino-main/src/test/java/io/trino/dispatcher/TestDecoratingListeningExecutorService.java
+++ b/core/trino-main/src/test/java/io/trino/dispatcher/TestDecoratingListeningExecutorService.java
@@ -14,7 +14,7 @@
 package io.trino.dispatcher;
 
 import com.google.common.util.concurrent.ListeningExecutorService;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 
diff --git a/core/trino-main/src/test/java/io/trino/dispatcher/TestLocalDispatchQuery.java b/core/trino-main/src/test/java/io/trino/dispatcher/TestLocalDispatchQuery.java
new file mode 100644
index 000000000000..77de01cfb286
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/dispatcher/TestLocalDispatchQuery.java
@@ -0,0 +1,229 @@
+/*
+ * Licensed 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 io.trino.dispatcher;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import io.airlift.json.JsonCodec;
+import io.airlift.node.NodeInfo;
+import io.airlift.units.Duration;
+import io.opentelemetry.api.OpenTelemetry;
+import io.trino.Session;
+import io.trino.client.NodeVersion;
+import io.trino.connector.CatalogProperties;
+import io.trino.connector.ConnectorCatalogServiceProvider;
+import io.trino.connector.ConnectorServices;
+import io.trino.connector.ConnectorServicesProvider;
+import io.trino.cost.StatsAndCosts;
+import io.trino.event.QueryMonitor;
+import io.trino.event.QueryMonitorConfig;
+import io.trino.eventlistener.EventListenerConfig;
+import io.trino.eventlistener.EventListenerManager;
+import io.trino.execution.ClusterSizeMonitor;
+import io.trino.execution.DataDefinitionExecution;
+import io.trino.execution.DataDefinitionTask;
+import io.trino.execution.ExecutionFailureInfo;
+import io.trino.execution.QueryPreparer;
+import io.trino.execution.QueryState;
+import io.trino.execution.QueryStateMachine;
+import io.trino.execution.StageInfo;
+import io.trino.execution.scheduler.NodeSchedulerConfig;
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.metadata.FunctionManager;
+import io.trino.metadata.GlobalFunctionCatalog;
+import io.trino.metadata.InMemoryNodeManager;
+import io.trino.metadata.InternalNodeManager;
+import io.trino.metadata.LanguageFunctionProvider;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.SessionPropertyManager;
+import io.trino.operator.OperatorStats;
+import io.trino.plugin.base.security.AllowAllSystemAccessControl;
+import io.trino.plugin.base.security.DefaultSystemAccessControl;
+import io.trino.security.AccessControlConfig;
+import io.trino.security.AccessControlManager;
+import io.trino.server.protocol.Slug;
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.resourcegroups.QueryType;
+import io.trino.spi.resourcegroups.ResourceGroupId;
+import io.trino.sql.tree.CreateTable;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.QualifiedName;
+import io.trino.sql.tree.Statement;
+import io.trino.transaction.TransactionManager;
+import org.junit.jupiter.api.Test;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
+
+import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
+import static io.airlift.concurrent.Threads.daemonThreadsNamed;
+import static io.trino.SessionTestUtils.TEST_SESSION;
+import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static io.trino.metadata.MetadataManager.createTestMetadataManager;
+import static io.trino.sql.tree.SaveMode.FAIL;
+import static io.trino.testing.TestingEventListenerManager.emptyEventListenerManager;
+import static io.trino.transaction.InMemoryTransactionManager.createTestTransactionManager;
+import static java.util.concurrent.Executors.newCachedThreadPool;
+import static org.testng.Assert.assertTrue;
+
+public class TestLocalDispatchQuery
+{
+    private CountDownLatch countDownLatch;
+
+    @Test
+    public void testSubmittedForDispatchedQuery()
+            throws InterruptedException
+    {
+        countDownLatch = new CountDownLatch(1);
+        Executor executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
+        Metadata metadata = createTestMetadataManager();
+        TransactionManager transactionManager = createTestTransactionManager();
+        AccessControlManager accessControl = new AccessControlManager(
+                transactionManager,
+                emptyEventListenerManager(),
+                new AccessControlConfig(),
+                OpenTelemetry.noop(),
+                DefaultSystemAccessControl.NAME);
+        accessControl.setSystemAccessControls(List.of(AllowAllSystemAccessControl.INSTANCE));
+        QueryStateMachine queryStateMachine = QueryStateMachine.begin(
+                Optional.empty(),
+                "sql",
+                Optional.empty(),
+                TEST_SESSION,
+                URI.create("fake://fake-query"),
+                new ResourceGroupId("test"),
+                false,
+                transactionManager,
+                accessControl,
+                executor,
+                metadata,
+                WarningCollector.NOOP,
+                createPlanOptimizersStatsCollector(),
+                Optional.of(QueryType.DATA_DEFINITION),
+                true,
+                new NodeVersion("test"));
+        QueryMonitor queryMonitor = new QueryMonitor(
+                JsonCodec.jsonCodec(StageInfo.class),
+                JsonCodec.jsonCodec(OperatorStats.class),
+                JsonCodec.jsonCodec(ExecutionFailureInfo.class),
+                JsonCodec.jsonCodec(StatsAndCosts.class),
+                new EventListenerManager(new EventListenerConfig()),
+                new NodeInfo("node"),
+                new NodeVersion("version"),
+                new SessionPropertyManager(),
+                metadata,
+                new FunctionManager(
+                        new ConnectorCatalogServiceProvider<>("function provider", new NoConnectorServicesProvider(), ConnectorServices::getFunctionProvider),
+                        new GlobalFunctionCatalog(),
+                        LanguageFunctionProvider.DISABLED),
+                new QueryMonitorConfig());
+        CreateTable createTable = new CreateTable(QualifiedName.of("table"), ImmutableList.of(), FAIL, ImmutableList.of(), Optional.empty());
+        QueryPreparer.PreparedQuery preparedQuery = new QueryPreparer.PreparedQuery(createTable, ImmutableList.of(), Optional.empty());
+        DataDefinitionExecution.DataDefinitionExecutionFactory dataDefinitionExecutionFactory = new DataDefinitionExecution.DataDefinitionExecutionFactory(
+                ImmutableMap.<Class<? extends Statement>, DataDefinitionTask<?>>of(CreateTable.class, new TestCreateTableTask()));
+        DataDefinitionExecution dataDefinitionExecution = dataDefinitionExecutionFactory.createQueryExecution(
+                preparedQuery,
+                queryStateMachine,
+                Slug.createNew(),
+                WarningCollector.NOOP,
+                null);
+        LocalDispatchQuery localDispatchQuery = new LocalDispatchQuery(
+                queryStateMachine,
+                Futures.immediateFuture(dataDefinitionExecution),
+                queryMonitor,
+                new TestClusterSizeMonitor(new InMemoryNodeManager(ImmutableSet.of()), new NodeSchedulerConfig()),
+                executor,
+                (queryExecution -> dataDefinitionExecution.start()));
+        queryStateMachine.addStateChangeListener(state -> {
+            if (state.ordinal() >= QueryState.PLANNING.ordinal()) {
+                countDownLatch.countDown();
+            }
+        });
+        localDispatchQuery.startWaitingForResources();
+        countDownLatch.await();
+        assertTrue(localDispatchQuery.getDispatchInfo().getCoordinatorLocation().isPresent());
+    }
+
+    private static class NoConnectorServicesProvider
+            implements ConnectorServicesProvider
+    {
+        @Override
+        public void loadInitialCatalogs() {}
+
+        @Override
+        public void ensureCatalogsLoaded(Session session, List<CatalogProperties> catalogs) {}
+
+        @Override
+        public void pruneCatalogs(Set<CatalogHandle> catalogsInUse)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ConnectorServices getConnectorServices(CatalogHandle catalogHandle)
+        {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    private static class TestCreateTableTask
+            implements DataDefinitionTask<CreateTable>
+    {
+        @Override
+        public String getName()
+        {
+            return "test";
+        }
+
+        @Override
+        public ListenableFuture<Void> execute(
+                CreateTable statement,
+                QueryStateMachine stateMachine,
+                List<Expression> parameters,
+                WarningCollector warningCollector)
+        {
+            while (true) {
+                try {
+                    Thread.sleep(10_000L);
+                }
+                catch (InterruptedException e) {
+                    break;
+                }
+            }
+            return null;
+        }
+    }
+
+    private static class TestClusterSizeMonitor
+            extends ClusterSizeMonitor
+    {
+        public TestClusterSizeMonitor(InternalNodeManager nodeManager, NodeSchedulerConfig nodeSchedulerConfig)
+        {
+            super(nodeManager, nodeSchedulerConfig);
+        }
+
+        @Override
+        public synchronized ListenableFuture<Void> waitForMinimumWorkers(int executionMinCount, Duration executionMaxWait)
+        {
+            return immediateVoidFuture();
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/event/TestQueryMonitorConfig.java b/core/trino-main/src/test/java/io/trino/event/TestQueryMonitorConfig.java
index b534f0732571..05f5a67a0018 100644
--- a/core/trino-main/src/test/java/io/trino/event/TestQueryMonitorConfig.java
+++ b/core/trino-main/src/test/java/io/trino/event/TestQueryMonitorConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/eventlistener/TestConnectorEventListener.java b/core/trino-main/src/test/java/io/trino/eventlistener/TestConnectorEventListener.java
index 2de220e59ad6..83b7dfa6e783 100644
--- a/core/trino-main/src/test/java/io/trino/eventlistener/TestConnectorEventListener.java
+++ b/core/trino-main/src/test/java/io/trino/eventlistener/TestConnectorEventListener.java
@@ -17,7 +17,7 @@
 import io.trino.connector.MockConnectorFactory;
 import io.trino.spi.eventlistener.EventListener;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
diff --git a/core/trino-main/src/test/java/io/trino/eventlistener/TestEventListenerConfig.java b/core/trino-main/src/test/java/io/trino/eventlistener/TestEventListenerConfig.java
index cd8f845a75c0..eb4e56a9aadd 100644
--- a/core/trino-main/src/test/java/io/trino/eventlistener/TestEventListenerConfig.java
+++ b/core/trino-main/src/test/java/io/trino/eventlistener/TestEventListenerConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.configuration.testing.ConfigAssertions;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/core/trino-main/src/test/java/io/trino/exchange/TestExchangeSourceOutputSelector.java b/core/trino-main/src/test/java/io/trino/exchange/TestExchangeSourceOutputSelector.java
index 7e9a2a5a3a2c..06988af9a568 100644
--- a/core/trino-main/src/test/java/io/trino/exchange/TestExchangeSourceOutputSelector.java
+++ b/core/trino-main/src/test/java/io/trino/exchange/TestExchangeSourceOutputSelector.java
@@ -23,18 +23,21 @@
 import io.trino.server.SliceSerialization.SliceSerializer;
 import io.trino.spi.exchange.ExchangeId;
 import io.trino.spi.exchange.ExchangeSourceOutputSelector;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.spi.exchange.ExchangeSourceOutputSelector.Selection.EXCLUDED;
 import static io.trino.spi.exchange.ExchangeSourceOutputSelector.Selection.INCLUDED;
 import static io.trino.spi.exchange.ExchangeSourceOutputSelector.Selection.UNKNOWN;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestExchangeSourceOutputSelector
 {
     private static final ExchangeId EXCHANGE_ID_1 = new ExchangeId("exchange_1");
@@ -42,7 +45,7 @@ public class TestExchangeSourceOutputSelector
 
     private JsonCodec<ExchangeSourceOutputSelector> codec;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         ObjectMapperProvider objectMapperProvider = new ObjectMapperProvider();
@@ -51,7 +54,7 @@ public void setup()
         codec = new JsonCodecFactory(objectMapperProvider).jsonCodec(ExchangeSourceOutputSelector.class);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         codec = null;
diff --git a/core/trino-main/src/test/java/io/trino/exchange/TestLazyExchangeDataSource.java b/core/trino-main/src/test/java/io/trino/exchange/TestLazyExchangeDataSource.java
index 97a6a41814c4..e2aa2dbc57b6 100644
--- a/core/trino-main/src/test/java/io/trino/exchange/TestLazyExchangeDataSource.java
+++ b/core/trino-main/src/test/java/io/trino/exchange/TestLazyExchangeDataSource.java
@@ -18,7 +18,7 @@
 import io.trino.operator.RetryPolicy;
 import io.trino.spi.QueryId;
 import io.trino.spi.exchange.ExchangeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/trino-main/src/test/java/io/trino/execution/BaseDataDefinitionTaskTest.java b/core/trino-main/src/test/java/io/trino/execution/BaseDataDefinitionTaskTest.java
index 6f51cc93f3db..8357a4d93a30 100644
--- a/core/trino-main/src/test/java/io/trino/execution/BaseDataDefinitionTaskTest.java
+++ b/core/trino-main/src/test/java/io/trino/execution/BaseDataDefinitionTaskTest.java
@@ -26,6 +26,7 @@
 import io.trino.metadata.MaterializedViewPropertyManager;
 import io.trino.metadata.MetadataManager;
 import io.trino.metadata.QualifiedObjectName;
+import io.trino.metadata.QualifiedTablePrefix;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.metadata.TableHandle;
 import io.trino.metadata.TableMetadata;
@@ -42,6 +43,7 @@
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.MaterializedViewNotFoundException;
+import io.trino.spi.connector.SaveMode;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TestingColumnHandle;
 import io.trino.spi.function.OperatorType;
@@ -56,9 +58,9 @@
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.TestingMetadata.TestingTableHandle;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.HashMap;
@@ -81,6 +83,8 @@
 import static io.trino.metadata.MetadataManager.createTestMetadataManager;
 import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
 import static io.trino.spi.StandardErrorCode.DIVISION_BY_ZERO;
+import static io.trino.spi.connector.SaveMode.IGNORE;
+import static io.trino.spi.connector.SaveMode.REPLACE;
 import static io.trino.spi.session.PropertyMetadata.longProperty;
 import static io.trino.spi.session.PropertyMetadata.stringProperty;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -89,8 +93,9 @@
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test
+@TestInstance(PER_METHOD)
 public abstract class BaseDataDefinitionTaskTest
 {
     public static final String SCHEMA = "schema";
@@ -113,7 +118,7 @@ public abstract class BaseDataDefinitionTaskTest
     protected TransactionManager transactionManager;
     protected QueryStateMachine queryStateMachine;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         testSession = testSessionBuilder()
@@ -135,7 +140,7 @@ MATERIALIZED_VIEW_PROPERTY_1_NAME, longProperty(MATERIALIZED_VIEW_PROPERTY_1_NAM
         queryStateMachine = stateMachine(transactionManager, createTestMetadataManager(), new AllowAllAccessControl(), testSession);
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         if (queryRunner != null) {
@@ -190,6 +195,7 @@ protected MaterializedViewDefinition someMaterializedView(String sql, List<ViewC
                 Optional.empty(),
                 Optional.empty(),
                 Identity.ofUser("owner"),
+                ImmutableList.of(),
                 Optional.empty(),
                 ImmutableMap.of(MATERIALIZED_VIEW_PROPERTY_2_NAME, MATERIALIZED_VIEW_PROPERTY_2_DEFAULT_VALUE));
     }
@@ -212,7 +218,8 @@ protected static ViewDefinition viewDefinition(String sql, ImmutableList<ViewCol
                 Optional.empty(),
                 columns,
                 Optional.empty(),
-                Optional.empty());
+                Optional.empty(),
+                ImmutableList.of());
     }
 
     private static QueryStateMachine stateMachine(TransactionManager transactionManager, MetadataManager metadata, AccessControl accessControl, Session session)
@@ -285,6 +292,34 @@ public void createSchema(Session session, CatalogSchemaName schema, Map<String,
             schemas.add(schema);
         }
 
+        @Override
+        public void dropSchema(Session session, CatalogSchemaName schema, boolean cascade)
+        {
+            if (cascade) {
+                tables.keySet().stream()
+                        .filter(table -> schema.getSchemaName().equals(table.getSchemaName()))
+                        .forEach(tables::remove);
+                views.keySet().stream()
+                        .filter(view -> schema.getSchemaName().equals(view.getSchemaName()))
+                        .forEach(tables::remove);
+                materializedViews.keySet().stream()
+                        .filter(materializedView -> schema.getSchemaName().equals(materializedView.getSchemaName()))
+                        .forEach(tables::remove);
+            }
+            schemas.remove(schema);
+        }
+
+        @Override
+        public List<QualifiedObjectName> listTables(Session session, QualifiedTablePrefix prefix)
+        {
+            List<QualifiedObjectName> tables = ImmutableList.<QualifiedObjectName>builder()
+                    .addAll(this.tables.keySet().stream().map(table -> new QualifiedObjectName(catalogName, table.getSchemaName(), table.getTableName())).collect(toImmutableList()))
+                    .addAll(this.views.keySet().stream().map(view -> new QualifiedObjectName(catalogName, view.getSchemaName(), view.getTableName())).collect(toImmutableList()))
+                    .addAll(this.materializedViews.keySet().stream().map(mv -> new QualifiedObjectName(catalogName, mv.getSchemaName(), mv.getTableName())).collect(toImmutableList()))
+                    .build();
+            return tables.stream().filter(prefix::matches).collect(toImmutableList());
+        }
+
         @Override
         public TableSchema getTableSchema(Session session, TableHandle tableHandle)
         {
@@ -308,9 +343,9 @@ public TableMetadata getTableMetadata(Session session, TableHandle tableHandle)
         }
 
         @Override
-        public void createTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, boolean ignoreExisting)
+        public void createTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, SaveMode saveMode)
         {
-            checkArgument(ignoreExisting || !tables.containsKey(tableMetadata.getTable()));
+            checkArgument(saveMode == REPLACE || saveMode == IGNORE || !tables.containsKey(tableMetadata.getTable()));
             tables.put(tableMetadata.getTable(), tableMetadata);
         }
 
@@ -329,9 +364,9 @@ public void renameTable(Session session, TableHandle tableHandle, CatalogSchemaT
         }
 
         @Override
-        public void addColumn(Session session, TableHandle tableHandle, ColumnMetadata column)
+        public void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column)
         {
-            SchemaTableName tableName = getTableName(tableHandle);
+            SchemaTableName tableName = table.getSchemaTableName();
             ConnectorTableMetadata metadata = tables.get(tableName);
 
             ImmutableList.Builder<ColumnMetadata> columns = ImmutableList.builderWithExpectedSize(metadata.getColumns().size() + 1);
@@ -341,9 +376,9 @@ public void addColumn(Session session, TableHandle tableHandle, ColumnMetadata c
         }
 
         @Override
-        public void dropColumn(Session session, TableHandle tableHandle, ColumnHandle columnHandle)
+        public void dropColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnHandle columnHandle)
         {
-            SchemaTableName tableName = getTableName(tableHandle);
+            SchemaTableName tableName = table.getSchemaTableName();
             ConnectorTableMetadata metadata = tables.get(tableName);
             String columnName = ((TestingColumnHandle) columnHandle).getName();
 
@@ -354,9 +389,9 @@ public void dropColumn(Session session, TableHandle tableHandle, ColumnHandle co
         }
 
         @Override
-        public void renameColumn(Session session, TableHandle tableHandle, ColumnHandle source, String target)
+        public void renameColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnHandle source, String target)
         {
-            SchemaTableName tableName = getTableName(tableHandle);
+            SchemaTableName tableName = table.getSchemaTableName();
             ConnectorTableMetadata metadata = tables.get(tableName);
             String columnName = ((TestingColumnHandle) source).getName();
 
@@ -453,10 +488,32 @@ public synchronized void setMaterializedViewProperties(
                             existingDefinition.getGracePeriod(),
                             existingDefinition.getComment(),
                             existingDefinition.getRunAsIdentity().get(),
+                            existingDefinition.getPath(),
                             existingDefinition.getStorageTable(),
                             newProperties));
         }
 
+        @Override
+        public void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
+        {
+            MaterializedViewDefinition view = materializedViews.get(viewName.asSchemaTableName());
+            materializedViews.put(
+                    viewName.asSchemaTableName(),
+                    new MaterializedViewDefinition(
+                            view.getOriginalSql(),
+                            view.getCatalog(),
+                            view.getSchema(),
+                            view.getColumns().stream()
+                                    .map(currentViewColumn -> columnName.equals(currentViewColumn.getName()) ? new ViewColumn(currentViewColumn.getName(), currentViewColumn.getType(), comment) : currentViewColumn)
+                                    .collect(toImmutableList()),
+                            view.getGracePeriod(),
+                            view.getComment(),
+                            view.getRunAsIdentity().get(),
+                            view.getPath(),
+                            view.getStorageTable(),
+                            view.getProperties()));
+        }
+
         @Override
         public void dropMaterializedView(Session session, QualifiedObjectName viewName)
         {
@@ -514,7 +571,8 @@ public void setViewComment(Session session, QualifiedObjectName viewName, Option
                             view.getSchema(),
                             view.getColumns(),
                             comment,
-                            view.getRunAsIdentity()));
+                            view.getRunAsIdentity(),
+                            view.getPath()));
         }
 
         @Override
@@ -546,7 +604,8 @@ public void setViewColumnComment(Session session, QualifiedObjectName viewName,
                                     .map(currentViewColumn -> columnName.equals(currentViewColumn.getName()) ? new ViewColumn(currentViewColumn.getName(), currentViewColumn.getType(), comment) : currentViewColumn)
                                     .collect(toImmutableList()),
                             view.getComment(),
-                            view.getRunAsIdentity()));
+                            view.getRunAsIdentity(),
+                            view.getPath()));
         }
 
         @Override
@@ -558,9 +617,9 @@ public void renameMaterializedView(Session session, QualifiedObjectName source,
         }
 
         @Override
-        public ResolvedFunction getCoercion(Session session, OperatorType operatorType, Type fromType, Type toType)
+        public ResolvedFunction getCoercion(OperatorType operatorType, Type fromType, Type toType)
         {
-            return delegate.getCoercion(session, operatorType, fromType, toType);
+            return delegate.getCoercion(operatorType, fromType, toType);
         }
 
         private static ColumnMetadata withComment(ColumnMetadata tableColumn, Optional<String> comment)
diff --git a/core/trino-main/src/test/java/io/trino/execution/BaseTestSqlTaskManager.java b/core/trino-main/src/test/java/io/trino/execution/BaseTestSqlTaskManager.java
new file mode 100644
index 000000000000..95e7d392277d
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/BaseTestSqlTaskManager.java
@@ -0,0 +1,449 @@
+/*
+ * Licensed 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 io.trino.execution;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import io.airlift.node.NodeInfo;
+import io.airlift.stats.TestingGcMonitor;
+import io.airlift.units.DataSize;
+import io.airlift.units.DataSize.Unit;
+import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.trino.Session;
+import io.trino.connector.CatalogProperties;
+import io.trino.connector.ConnectorServices;
+import io.trino.connector.ConnectorServicesProvider;
+import io.trino.exchange.ExchangeManagerRegistry;
+import io.trino.execution.buffer.BufferResult;
+import io.trino.execution.buffer.BufferState;
+import io.trino.execution.buffer.OutputBuffers;
+import io.trino.execution.buffer.PipelinedOutputBuffers;
+import io.trino.execution.buffer.PipelinedOutputBuffers.OutputBufferId;
+import io.trino.execution.executor.TaskExecutor;
+import io.trino.memory.LocalMemoryManager;
+import io.trino.memory.NodeMemoryConfig;
+import io.trino.memory.QueryContext;
+import io.trino.memory.context.LocalMemoryContext;
+import io.trino.metadata.InternalNode;
+import io.trino.metadata.WorkerLanguageFunctionProvider;
+import io.trino.operator.DirectExchangeClient;
+import io.trino.operator.DirectExchangeClientSupplier;
+import io.trino.operator.RetryPolicy;
+import io.trino.spi.QueryId;
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.exchange.ExchangeId;
+import io.trino.spiller.LocalSpillManager;
+import io.trino.spiller.NodeSpillConfig;
+import io.trino.version.EmbedVersion;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static io.airlift.tracing.Tracing.noopTracer;
+import static io.trino.SessionTestUtils.TEST_SESSION;
+import static io.trino.SystemSessionProperties.QUERY_MAX_MEMORY_PER_NODE;
+import static io.trino.execution.TaskTestUtils.PLAN_FRAGMENT;
+import static io.trino.execution.TaskTestUtils.SPLIT;
+import static io.trino.execution.TaskTestUtils.TABLE_SCAN_NODE_ID;
+import static io.trino.execution.TaskTestUtils.createTestSplitMonitor;
+import static io.trino.execution.TaskTestUtils.createTestingPlanner;
+import static io.trino.execution.buffer.PagesSerdeUtil.getSerializedPagePositionCount;
+import static io.trino.execution.buffer.PipelinedOutputBuffers.BufferType.PARTITIONED;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
+@TestInstance(PER_CLASS)
+public abstract class BaseTestSqlTaskManager
+{
+    public static final OutputBufferId OUT = new OutputBufferId(0);
+    private final AtomicInteger sequence = new AtomicInteger();
+
+    private TaskExecutor taskExecutor;
+    private TaskManagementExecutor taskManagementExecutor;
+
+    protected abstract TaskExecutor createTaskExecutor();
+
+    @BeforeAll
+    public void setUp()
+    {
+        taskExecutor = createTaskExecutor();
+        taskExecutor.start();
+        taskManagementExecutor = new TaskManagementExecutor();
+    }
+
+    @AfterAll
+    public void tearDown()
+    {
+        taskExecutor.stop();
+        taskExecutor = null;
+        taskManagementExecutor.close();
+        taskManagementExecutor = null;
+    }
+
+    @Test
+    public void testEmptyQuery()
+    {
+        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig())) {
+            TaskId taskId = newTaskId();
+            TaskInfo taskInfo = createTask(sqlTaskManager, taskId, PipelinedOutputBuffers.createInitial(PARTITIONED).withNoMoreBufferIds());
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
+
+            taskInfo = sqlTaskManager.getTaskInfo(taskId);
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
+
+            taskInfo = createTask(sqlTaskManager, taskId, ImmutableSet.of(), PipelinedOutputBuffers.createInitial(PARTITIONED).withNoMoreBufferIds());
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
+
+            taskInfo = sqlTaskManager.getTaskInfo(taskId);
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
+        }
+    }
+
+    @Test
+    @Timeout(30)
+    public void testSimpleQuery()
+            throws Exception
+    {
+        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig())) {
+            TaskId taskId = newTaskId();
+            createTask(sqlTaskManager, taskId, ImmutableSet.of(SPLIT), PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds());
+
+            TaskInfo taskInfo = sqlTaskManager.getTaskInfo(taskId, TaskStatus.STARTING_VERSION).get();
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FLUSHING);
+
+            BufferResult results = sqlTaskManager.getTaskResults(taskId, OUT, 0, DataSize.of(1, Unit.MEGABYTE)).getResultsFuture().get();
+            assertFalse(results.isBufferComplete());
+            assertEquals(results.getSerializedPages().size(), 1);
+            assertEquals(getSerializedPagePositionCount(results.getSerializedPages().get(0)), 1);
+
+            for (boolean moreResults = true; moreResults; moreResults = !results.isBufferComplete()) {
+                results = sqlTaskManager.getTaskResults(taskId, OUT, results.getToken() + results.getSerializedPages().size(), DataSize.of(1, Unit.MEGABYTE)).getResultsFuture().get();
+            }
+            assertTrue(results.isBufferComplete());
+            assertEquals(results.getSerializedPages().size(), 0);
+
+            // complete the task by calling destroy on it
+            TaskInfo info = sqlTaskManager.destroyTaskResults(taskId, OUT);
+            assertEquals(info.getOutputBuffers().getState(), BufferState.FINISHED);
+
+            taskInfo = sqlTaskManager.getTaskInfo(taskId, taskInfo.getTaskStatus().getVersion()).get();
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
+            taskInfo = sqlTaskManager.getTaskInfo(taskId);
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
+        }
+    }
+
+    @Test
+    public void testCancel()
+            throws InterruptedException, ExecutionException, TimeoutException
+    {
+        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig())) {
+            TaskId taskId = newTaskId();
+            TaskInfo taskInfo = createTask(sqlTaskManager, taskId, PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds());
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
+            assertNull(taskInfo.getStats().getEndTime());
+
+            taskInfo = sqlTaskManager.getTaskInfo(taskId);
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
+            assertNull(taskInfo.getStats().getEndTime());
+
+            taskInfo = pollTerminatingTaskInfoUntilDone(sqlTaskManager, sqlTaskManager.cancelTask(taskId));
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.CANCELED);
+            assertNotNull(taskInfo.getStats().getEndTime());
+
+            taskInfo = sqlTaskManager.getTaskInfo(taskId);
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.CANCELED);
+            assertNotNull(taskInfo.getStats().getEndTime());
+        }
+    }
+
+    @Test
+    public void testAbort()
+            throws InterruptedException, ExecutionException, TimeoutException
+    {
+        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig())) {
+            TaskId taskId = newTaskId();
+            TaskInfo taskInfo = createTask(sqlTaskManager, taskId, PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds());
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
+            assertNull(taskInfo.getStats().getEndTime());
+
+            taskInfo = sqlTaskManager.getTaskInfo(taskId);
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
+            assertNull(taskInfo.getStats().getEndTime());
+
+            taskInfo = pollTerminatingTaskInfoUntilDone(sqlTaskManager, sqlTaskManager.abortTask(taskId));
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.ABORTED);
+            assertNotNull(taskInfo.getStats().getEndTime());
+
+            taskInfo = sqlTaskManager.getTaskInfo(taskId);
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.ABORTED);
+            assertNotNull(taskInfo.getStats().getEndTime());
+        }
+    }
+
+    @Test
+    @Timeout(30)
+    public void testAbortResults()
+            throws Exception
+    {
+        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig())) {
+            TaskId taskId = newTaskId();
+            createTask(sqlTaskManager, taskId, ImmutableSet.of(SPLIT), PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds());
+
+            TaskInfo taskInfo = sqlTaskManager.getTaskInfo(taskId, TaskStatus.STARTING_VERSION).get();
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FLUSHING);
+
+            sqlTaskManager.destroyTaskResults(taskId, OUT);
+
+            taskInfo = sqlTaskManager.getTaskInfo(taskId, taskInfo.getTaskStatus().getVersion()).get();
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
+
+            taskInfo = sqlTaskManager.getTaskInfo(taskId);
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
+        }
+    }
+
+    @Test
+    public void testRemoveOldTasks()
+            throws InterruptedException, ExecutionException, TimeoutException
+    {
+        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig().setInfoMaxAge(new Duration(5, TimeUnit.MILLISECONDS)))) {
+            TaskId taskId = newTaskId();
+
+            TaskInfo taskInfo = createTask(sqlTaskManager, taskId, PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds());
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
+
+            taskInfo = pollTerminatingTaskInfoUntilDone(sqlTaskManager, sqlTaskManager.cancelTask(taskId));
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.CANCELED);
+
+            taskInfo = sqlTaskManager.getTaskInfo(taskId);
+            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.CANCELED);
+
+            Thread.sleep(100);
+            sqlTaskManager.removeOldTasks();
+
+            for (TaskInfo info : sqlTaskManager.getAllTaskInfo()) {
+                assertNotEquals(info.getTaskStatus().getTaskId(), taskId);
+            }
+        }
+    }
+
+    @Test
+    public void testSessionPropertyMemoryLimitOverride()
+    {
+        NodeMemoryConfig memoryConfig = new NodeMemoryConfig()
+                .setMaxQueryMemoryPerNode(DataSize.ofBytes(3));
+
+        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig(), memoryConfig)) {
+            TaskId reduceLimitsId = new TaskId(new StageId("q1", 0), 1, 0);
+            TaskId increaseLimitsId = new TaskId(new StageId("q2", 0), 1, 0);
+
+            QueryContext reducesLimitsContext = sqlTaskManager.getQueryContext(reduceLimitsId.getQueryId());
+            QueryContext attemptsIncreaseContext = sqlTaskManager.getQueryContext(increaseLimitsId.getQueryId());
+
+            // not initialized with a task update yet
+            assertFalse(reducesLimitsContext.isMemoryLimitsInitialized());
+            assertEquals(reducesLimitsContext.getMaxUserMemory(), memoryConfig.getMaxQueryMemoryPerNode().toBytes());
+
+            assertFalse(attemptsIncreaseContext.isMemoryLimitsInitialized());
+            assertEquals(attemptsIncreaseContext.getMaxUserMemory(), memoryConfig.getMaxQueryMemoryPerNode().toBytes());
+
+            // memory limits reduced by session properties
+            sqlTaskManager.updateTask(
+                    testSessionBuilder()
+                            .setSystemProperty(QUERY_MAX_MEMORY_PER_NODE, "1B")
+                            .build(),
+                    reduceLimitsId,
+                    Span.getInvalid(),
+                    Optional.of(PLAN_FRAGMENT),
+                    ImmutableList.of(new SplitAssignment(TABLE_SCAN_NODE_ID, ImmutableSet.of(SPLIT), true)),
+                    PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds(),
+                    ImmutableMap.of(),
+                    false);
+            assertTrue(reducesLimitsContext.isMemoryLimitsInitialized());
+            assertEquals(reducesLimitsContext.getMaxUserMemory(), 1);
+
+            // memory limits not increased by session properties
+            sqlTaskManager.updateTask(
+                    testSessionBuilder()
+                            .setSystemProperty(QUERY_MAX_MEMORY_PER_NODE, "10B")
+                            .build(),
+                    increaseLimitsId,
+                    Span.getInvalid(),
+                    Optional.of(PLAN_FRAGMENT),
+                    ImmutableList.of(new SplitAssignment(TABLE_SCAN_NODE_ID, ImmutableSet.of(SPLIT), true)),
+                    PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds(),
+                    ImmutableMap.of(),
+                    false);
+            assertTrue(attemptsIncreaseContext.isMemoryLimitsInitialized());
+            assertEquals(attemptsIncreaseContext.getMaxUserMemory(), memoryConfig.getMaxQueryMemoryPerNode().toBytes());
+        }
+    }
+
+    private SqlTaskManager createSqlTaskManager(TaskManagerConfig config)
+    {
+        return createSqlTaskManager(config, new NodeMemoryConfig());
+    }
+
+    private SqlTaskManager createSqlTaskManager(TaskManagerConfig taskManagerConfig, NodeMemoryConfig nodeMemoryConfig)
+    {
+        return new SqlTaskManager(
+                new EmbedVersion("testversion"),
+                new NoConnectorServicesProvider(),
+                createTestingPlanner(),
+                new WorkerLanguageFunctionProvider(),
+                new MockLocationFactory(),
+                taskExecutor,
+                createTestSplitMonitor(),
+                new NodeInfo("test"),
+                new LocalMemoryManager(nodeMemoryConfig),
+                taskManagementExecutor,
+                taskManagerConfig,
+                nodeMemoryConfig,
+                new LocalSpillManager(new NodeSpillConfig()),
+                new NodeSpillConfig(),
+                new TestingGcMonitor(),
+                noopTracer(),
+                new ExchangeManagerRegistry());
+    }
+
+    private TaskInfo createTask(SqlTaskManager sqlTaskManager, TaskId taskId, ImmutableSet<ScheduledSplit> splits, OutputBuffers outputBuffers)
+    {
+        return sqlTaskManager.updateTask(TEST_SESSION,
+                taskId,
+                Span.getInvalid(),
+                Optional.of(PLAN_FRAGMENT),
+                ImmutableList.of(new SplitAssignment(TABLE_SCAN_NODE_ID, splits, true)),
+                outputBuffers,
+                ImmutableMap.of(),
+                false);
+    }
+
+    private TaskInfo createTask(SqlTaskManager sqlTaskManager, TaskId taskId, OutputBuffers outputBuffers)
+    {
+        sqlTaskManager.getQueryContext(taskId.getQueryId())
+                .addTaskContext(new TaskStateMachine(taskId, directExecutor()), testSessionBuilder().build(), () -> {}, false, false);
+        return sqlTaskManager.updateTask(TEST_SESSION,
+                taskId,
+                Span.getInvalid(),
+                Optional.of(PLAN_FRAGMENT),
+                ImmutableList.of(),
+                outputBuffers,
+                ImmutableMap.of(),
+                false);
+    }
+
+    private static TaskInfo pollTerminatingTaskInfoUntilDone(SqlTaskManager taskManager, TaskInfo taskInfo)
+            throws InterruptedException, ExecutionException, TimeoutException
+    {
+        assertTrue(taskInfo.getTaskStatus().getState().isTerminatingOrDone());
+        int attempts = 3;
+        while (attempts > 0 && taskInfo.getTaskStatus().getState().isTerminating()) {
+            taskInfo = taskManager.getTaskInfo(taskInfo.getTaskStatus().getTaskId(), taskInfo.getTaskStatus().getVersion()).get(5, SECONDS);
+            attempts--;
+        }
+        return taskInfo;
+    }
+
+    public static class MockDirectExchangeClientSupplier
+            implements DirectExchangeClientSupplier
+    {
+        @Override
+        public DirectExchangeClient get(
+                QueryId queryId,
+                ExchangeId exchangeId,
+                LocalMemoryContext memoryContext,
+                TaskFailureListener taskFailureListener,
+                RetryPolicy retryPolicy)
+        {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    public static class MockLocationFactory
+            implements LocationFactory
+    {
+        @Override
+        public URI createQueryLocation(QueryId queryId)
+        {
+            return URI.create("http://fake.invalid/query/" + queryId);
+        }
+
+        @Override
+        public URI createLocalTaskLocation(TaskId taskId)
+        {
+            return URI.create("http://fake.invalid/task/" + taskId);
+        }
+
+        @Override
+        public URI createTaskLocation(InternalNode node, TaskId taskId)
+        {
+            return URI.create("http://fake.invalid/task/" + node.getNodeIdentifier() + "/" + taskId);
+        }
+
+        @Override
+        public URI createMemoryInfoLocation(InternalNode node)
+        {
+            return URI.create("http://fake.invalid/" + node.getNodeIdentifier() + "/memory");
+        }
+    }
+
+    private static class NoConnectorServicesProvider
+            implements ConnectorServicesProvider
+    {
+        @Override
+        public void loadInitialCatalogs() {}
+
+        @Override
+        public void ensureCatalogsLoaded(Session session, List<CatalogProperties> catalogs) {}
+
+        @Override
+        public void pruneCatalogs(Set<CatalogHandle> catalogsInUse)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ConnectorServices getConnectorServices(CatalogHandle catalogHandle)
+        {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    private TaskId newTaskId()
+    {
+        return new TaskId(new StageId("query" + sequence.incrementAndGet(), 0), 1, 0);
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/MockManagedQueryExecution.java b/core/trino-main/src/test/java/io/trino/execution/MockManagedQueryExecution.java
index 639e7fffe0be..8e4502fa0fe8 100644
--- a/core/trino-main/src/test/java/io/trino/execution/MockManagedQueryExecution.java
+++ b/core/trino-main/src/test/java/io/trino/execution/MockManagedQueryExecution.java
@@ -145,6 +145,7 @@ public BasicQueryInfo getBasicQueryInfo()
                         new Duration(23, NANOSECONDS),
                         false,
                         ImmutableSet.of(),
+                        OptionalDouble.empty(),
                         OptionalDouble.empty()),
                 null,
                 null,
@@ -176,6 +177,7 @@ public QueryInfo getFullQueryInfo()
                         new Duration(8, NANOSECONDS),
 
                         new Duration(100, NANOSECONDS),
+                        new Duration(150, NANOSECONDS),
                         new Duration(200, NANOSECONDS),
 
                         9,
@@ -202,6 +204,8 @@ public QueryInfo getFullQueryInfo()
                         DataSize.ofBytes(26),
 
                         !state.isDone(),
+                        state.isDone() ? OptionalDouble.empty() : OptionalDouble.of(8.88),
+                        state.isDone() ? OptionalDouble.empty() : OptionalDouble.of(0),
                         new Duration(20, NANOSECONDS),
                         new Duration(21, NANOSECONDS),
                         new Duration(22, NANOSECONDS),
@@ -253,6 +257,8 @@ public QueryInfo getFullQueryInfo()
                 Optional.empty(),
                 Optional.empty(),
                 Optional.empty(),
+                Optional.empty(),
+                false,
                 ImmutableMap.of(),
                 ImmutableSet.of(),
                 ImmutableMap.of(),
diff --git a/core/trino-main/src/test/java/io/trino/execution/MockRemoteTaskFactory.java b/core/trino-main/src/test/java/io/trino/execution/MockRemoteTaskFactory.java
index c8f97cfe6fc1..681afda39efe 100644
--- a/core/trino-main/src/test/java/io/trino/execution/MockRemoteTaskFactory.java
+++ b/core/trino-main/src/test/java/io/trino/execution/MockRemoteTaskFactory.java
@@ -21,9 +21,11 @@
 import com.google.common.collect.Multimap;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.stats.TestingGcMonitor;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.cost.StatsAndCosts;
 import io.trino.exchange.ExchangeManagerRegistry;
@@ -53,8 +55,6 @@
 import io.trino.testing.TestingMetadata.TestingColumnHandle;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -121,20 +121,35 @@ public MockRemoteTask createTableScanTask(TaskId taskId, InternalNode newNode, L
                 new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)),
                 StatsAndCosts.empty(),
                 ImmutableList.of(),
+                ImmutableList.of(),
                 Optional.empty());
 
         ImmutableMultimap.Builder<PlanNodeId, Split> initialSplits = ImmutableMultimap.builder();
         for (Split sourceSplit : splits) {
             initialSplits.put(sourceId, sourceSplit);
         }
-        return createRemoteTask(TEST_SESSION, taskId, newNode, testFragment, initialSplits.build(), PipelinedOutputBuffers.createInitial(BROADCAST), partitionedSplitCountTracker, ImmutableSet.of(), Optional.empty(), true);
+        return createRemoteTask(
+                TEST_SESSION,
+                Span.getInvalid(),
+                taskId,
+                newNode,
+                false,
+                testFragment,
+                initialSplits.build(),
+                PipelinedOutputBuffers.createInitial(BROADCAST),
+                partitionedSplitCountTracker,
+                ImmutableSet.of(),
+                Optional.empty(),
+                true);
     }
 
     @Override
     public MockRemoteTask createRemoteTask(
             Session session,
+            Span stageSpan,
             TaskId taskId,
             InternalNode node,
+            boolean speculative,
             PlanFragment fragment,
             Multimap<PlanNodeId, Split> initialSplits,
             OutputBuffers outputBuffers,
@@ -264,11 +279,13 @@ public synchronized TaskStatus getTaskStatus()
                     state,
                     location,
                     nodeId,
+                    false,
                     failures,
                     queuedSplitsInfo.getCount(),
                     combinedSplitsInfo.getCount() - queuedSplitsInfo.getCount(),
                     outputBuffer.getStatus(),
                     stats.getOutputDataSize(),
+                    stats.getWriterInputDataSize(),
                     stats.getPhysicalWrittenDataSize(),
                     stats.getMaxWriterCount(),
                     stats.getUserMemoryReservation(),
@@ -386,6 +403,12 @@ public void setOutputBuffers(OutputBuffers outputBuffers)
             outputBuffer.setOutputBuffers(outputBuffers);
         }
 
+        @Override
+        public void setSpeculative(boolean speculative)
+        {
+            // ignore
+        }
+
         @Override
         public void addStateChangeListener(StateChangeListener<TaskStatus> stateChangeListener)
         {
diff --git a/core/trino-main/src/test/java/io/trino/execution/TaskTestUtils.java b/core/trino-main/src/test/java/io/trino/execution/TaskTestUtils.java
index c3c8cc8b2b57..321a32999821 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TaskTestUtils.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TaskTestUtils.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.json.ObjectMapperProvider;
+import io.opentelemetry.api.trace.Span;
 import io.trino.client.NodeVersion;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.cost.StatsAndCosts;
@@ -23,7 +24,7 @@
 import io.trino.eventlistener.EventListenerConfig;
 import io.trino.eventlistener.EventListenerManager;
 import io.trino.exchange.ExchangeManagerRegistry;
-import io.trino.execution.TestSqlTaskManager.MockDirectExchangeClientSupplier;
+import io.trino.execution.BaseTestSqlTaskManager.MockDirectExchangeClientSupplier;
 import io.trino.execution.buffer.OutputBuffers;
 import io.trino.execution.scheduler.NodeScheduler;
 import io.trino.execution.scheduler.NodeSchedulerConfig;
@@ -32,7 +33,6 @@
 import io.trino.metadata.InMemoryNodeManager;
 import io.trino.metadata.Split;
 import io.trino.operator.PagesIndex;
-import io.trino.operator.TrinoOperatorFactories;
 import io.trino.operator.index.IndexJoinLookupStats;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spiller.GenericSpillerFactory;
@@ -43,6 +43,7 @@
 import io.trino.sql.gen.JoinFilterFunctionCompiler;
 import io.trino.sql.gen.OrderingCompiler;
 import io.trino.sql.gen.PageFunctionCompiler;
+import io.trino.sql.planner.CompilerConfig;
 import io.trino.sql.planner.LocalExecutionPlanner;
 import io.trino.sql.planner.NodePartitioningManager;
 import io.trino.sql.planner.Partitioning;
@@ -102,6 +103,7 @@ private TaskTestUtils() {}
                     .withBucketToPartition(Optional.of(new int[1])),
             StatsAndCosts.empty(),
             ImmutableList.of(),
+            ImmutableList.of(),
             Optional.empty());
 
     public static final DynamicFilterId DYNAMIC_FILTER_SOURCE_ID = new DynamicFilterId("filter");
@@ -126,6 +128,7 @@ private TaskTestUtils() {}
                     .withBucketToPartition(Optional.of(new int[1])),
             StatsAndCosts.empty(),
             ImmutableList.of(),
+            ImmutableList.of(),
             Optional.empty());
 
     public static LocalExecutionPlanner createTestingPlanner()
@@ -142,7 +145,7 @@ public static LocalExecutionPlanner createTestingPlanner()
                 new NodeTaskMap(finalizerService)));
         NodePartitioningManager nodePartitioningManager = new NodePartitioningManager(
                 nodeScheduler,
-                blockTypeOperators,
+                PLANNER_CONTEXT.getTypeOperators(),
                 CatalogServiceProvider.fail());
 
         PageFunctionCompiler pageFunctionCompiler = new PageFunctionCompiler(PLANNER_CONTEXT.getFunctionManager(), 0);
@@ -171,18 +174,19 @@ public static LocalExecutionPlanner createTestingPlanner()
                 },
                 new PagesIndex.TestingFactory(false),
                 new JoinCompiler(PLANNER_CONTEXT.getTypeOperators()),
-                new TrinoOperatorFactories(),
                 new OrderingCompiler(PLANNER_CONTEXT.getTypeOperators()),
                 new DynamicFilterConfig(),
                 blockTypeOperators,
+                PLANNER_CONTEXT.getTypeOperators(),
                 new TableExecuteContextManager(),
                 new ExchangeManagerRegistry(),
-                new NodeVersion("test"));
+                new NodeVersion("test"),
+                new CompilerConfig());
     }
 
     public static TaskInfo updateTask(SqlTask sqlTask, List<SplitAssignment> splitAssignments, OutputBuffers outputBuffers)
     {
-        return sqlTask.updateTask(TEST_SESSION, Optional.of(PLAN_FRAGMENT), splitAssignments, outputBuffers, ImmutableMap.of());
+        return sqlTask.updateTask(TEST_SESSION, Span.getInvalid(), Optional.of(PLAN_FRAGMENT), splitAssignments, outputBuffers, ImmutableMap.of(), false);
     }
 
     public static SplitMonitor createTestSplitMonitor()
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestAddColumnTask.java b/core/trino-main/src/test/java/io/trino/execution/TestAddColumnTask.java
index 3bae379398bb..5b497a1cc2f6 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestAddColumnTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestAddColumnTask.java
@@ -20,14 +20,19 @@
 import io.trino.metadata.TableHandle;
 import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.ConnectorTableMetadata;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.sql.tree.AddColumn;
 import io.trino.sql.tree.ColumnDefinition;
 import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.Property;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -35,16 +40,20 @@
 
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
+import static io.trino.spi.StandardErrorCode.AMBIGUOUS_NAME;
 import static io.trino.spi.StandardErrorCode.COLUMN_ALREADY_EXISTS;
+import static io.trino.spi.StandardErrorCode.COLUMN_NOT_FOUND;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RowType.rowType;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestAddColumnTask
         extends BaseDataDefinitionTaskTest
 {
@@ -52,12 +61,12 @@ public class TestAddColumnTask
     public void testAddColumn()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
         TableHandle table = metadata.getTableHandle(testSession, tableName).get();
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .containsExactly(new ColumnMetadata("test", BIGINT));
 
-        getFutureValue(executeAddColumn(asQualifiedName(tableName), new Identifier("new_col"), INTEGER, Optional.empty(), false, false));
+        getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("new_col"), INTEGER, Optional.empty(), false, false));
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .containsExactly(new ColumnMetadata("test", BIGINT), new ColumnMetadata("new_col", INTEGER));
     }
@@ -66,10 +75,10 @@ public void testAddColumn()
     public void testAddColumnWithComment()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
         TableHandle table = metadata.getTableHandle(testSession, tableName).get();
 
-        getFutureValue(executeAddColumn(asQualifiedName(tableName), new Identifier("new_col"), INTEGER, Optional.of("test comment"), false, false));
+        getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("new_col"), INTEGER, Optional.of("test comment"), false, false));
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .containsExactly(
                         new ColumnMetadata("test", BIGINT),
@@ -84,11 +93,11 @@ public void testAddColumnWithComment()
     public void testAddColumnWithColumnProperty()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
         TableHandle table = metadata.getTableHandle(testSession, tableName).get();
         Property columnProperty = new Property(new Identifier("column_property"), new LongLiteral("111"));
 
-        getFutureValue(executeAddColumn(asQualifiedName(tableName), new Identifier("new_col"), INTEGER, ImmutableList.of(columnProperty), false, false));
+        getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("new_col"), INTEGER, ImmutableList.of(columnProperty), false, false));
         ColumnMetadata columnMetadata = metadata.getTableMetadata(testSession, table).getColumns().stream()
                 .filter(column -> column.getName().equals("new_col"))
                 .collect(onlyElement());
@@ -100,7 +109,7 @@ public void testAddColumnNotExistingTable()
     {
         QualifiedObjectName tableName = qualifiedObjectName("not_existing_table");
 
-        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), new Identifier("test"), INTEGER, Optional.empty(), false, false)))
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("test"), INTEGER, Optional.empty(), false, false)))
                 .hasErrorCode(TABLE_NOT_FOUND)
                 .hasMessageContaining("Table '%s' does not exist", tableName);
     }
@@ -110,7 +119,7 @@ public void testAddColumnNotExistingTableIfExists()
     {
         QualifiedName tableName = qualifiedName("not_existing_table");
 
-        getFutureValue(executeAddColumn(tableName, new Identifier("test"), INTEGER, Optional.empty(), true, false));
+        getFutureValue(executeAddColumn(tableName, QualifiedName.of("test"), INTEGER, Optional.empty(), true, false));
         // no exception
     }
 
@@ -118,12 +127,12 @@ public void testAddColumnNotExistingTableIfExists()
     public void testAddColumnNotExists()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
         TableHandle table = metadata.getTableHandle(testSession, tableName).get();
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .containsExactly(new ColumnMetadata("test", BIGINT));
 
-        getFutureValue(executeAddColumn(asQualifiedName(tableName), new Identifier("test"), INTEGER, Optional.empty(), false, true));
+        getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("test"), INTEGER, Optional.empty(), false, true));
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .containsExactly(new ColumnMetadata("test", BIGINT));
     }
@@ -132,9 +141,9 @@ public void testAddColumnNotExists()
     public void testAddColumnAlreadyExist()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
-        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), new Identifier("test"), INTEGER, Optional.empty(), false, false)))
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("test"), INTEGER, Optional.empty(), false, false)))
                 .hasErrorCode(COLUMN_ALREADY_EXISTS)
                 .hasMessage("Column 'test' already exists");
     }
@@ -145,7 +154,7 @@ public void testAddColumnOnView()
         QualifiedObjectName viewName = qualifiedObjectName("existing_view");
         metadata.createView(testSession, viewName, someView(), false);
 
-        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(viewName), new Identifier("test"), INTEGER, Optional.empty(), false, false)))
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(viewName), QualifiedName.of("test"), INTEGER, Optional.empty(), false, false)))
                 .hasErrorCode(TABLE_NOT_FOUND)
                 .hasMessageContaining("Table '%s' does not exist", viewName);
     }
@@ -156,18 +165,130 @@ public void testAddColumnOnMaterializedView()
         QualifiedObjectName materializedViewName = qualifiedObjectName("existing_materialized_view");
         metadata.createMaterializedView(testSession, QualifiedObjectName.valueOf(materializedViewName.toString()), someMaterializedView(), false, false);
 
-        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(materializedViewName), new Identifier("test"), INTEGER, Optional.empty(), false, false)))
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(materializedViewName), QualifiedName.of("test"), INTEGER, Optional.empty(), false, false)))
                 .hasErrorCode(TABLE_NOT_FOUND)
                 .hasMessageContaining("Table '%s' does not exist", materializedViewName);
     }
 
-    private ListenableFuture<Void> executeAddColumn(QualifiedName table, Identifier column, Type type, Optional<String> comment, boolean tableExists, boolean columnNotExists)
+    @Test
+    public void testAddFieldWithNotExists()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new RowType.Field(Optional.of("a"), BIGINT)), FAIL);
+        TableHandle table = metadata.getTableHandle(testSession, tableName).get();
+        assertThat(metadata.getTableMetadata(testSession, table).getColumns())
+                .containsExactly(new ColumnMetadata("col", rowType(new RowType.Field(Optional.of("a"), BIGINT))));
+
+        getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("col", "a"), INTEGER, false, true));
+        assertThat(metadata.getTableMetadata(testSession, table).getColumns())
+                .containsExactly(new ColumnMetadata("col", rowType(new RowType.Field(Optional.of("a"), BIGINT))));
+    }
+
+    @Test
+    public void testAddFieldToNotExistingField()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(
+                testSession,
+                TEST_CATALOG_NAME,
+                rowTable(tableName, new RowType.Field(Optional.of("a"), rowType(new RowType.Field(Optional.of("b"), INTEGER)))),
+                FAIL);
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("col", "x", "c"), INTEGER, false, false)))
+                .hasErrorCode(COLUMN_NOT_FOUND)
+                .hasMessage("Field 'x' does not exist within row(a row(b integer))");
+    }
+
+    @Test
+    public void testUnsupportedArrayTypeInRowField()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(
+                testSession,
+                TEST_CATALOG_NAME,
+                rowTable(tableName, new RowType.Field(Optional.of("a"), new ArrayType(rowType(new RowType.Field(Optional.of("element"), INTEGER))))),
+                FAIL);
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("col", "a", "c"), INTEGER, false, false)))
+                .hasErrorCode(NOT_SUPPORTED)
+                .hasMessage("Unsupported type: array(row(element integer))");
+    }
+
+    @Test
+    public void testUnsupportedMapTypeInRowField()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(
+                testSession,
+                TEST_CATALOG_NAME,
+                rowTable(tableName, new RowType.Field(Optional.of("a"), new MapType(
+                        rowType(new RowType.Field(Optional.of("key"), INTEGER)),
+                        rowType(new RowType.Field(Optional.of("key"), INTEGER)),
+                        new TypeOperators()))),
+                FAIL);
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("col", "a", "c"), INTEGER, false, false)))
+                .hasErrorCode(NOT_SUPPORTED)
+                .hasMessage("Unsupported type: map(row(key integer), row(key integer))");
+    }
+
+    @Test
+    public void testUnsupportedAddDuplicatedField()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new RowType.Field(Optional.of("a"), BIGINT)), FAIL);
+        TableHandle table = metadata.getTableHandle(testSession, tableName).orElseThrow();
+        assertThat(metadata.getTableMetadata(testSession, table).getColumns())
+                .containsExactly(new ColumnMetadata("col", rowType(new RowType.Field(Optional.of("a"), BIGINT))));
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("col", "a"), INTEGER, false, false)))
+                .hasErrorCode(COLUMN_ALREADY_EXISTS)
+                .hasMessage("Field 'a' already exists");
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("col", "A"), INTEGER, false, false)))
+                .hasErrorCode(COLUMN_ALREADY_EXISTS)
+                .hasMessage("Field 'a' already exists");
+        assertThat(metadata.getTableMetadata(testSession, table).getColumns())
+                .containsExactly(new ColumnMetadata("col", rowType(new RowType.Field(Optional.of("a"), BIGINT))));
+    }
+
+    @Test
+    public void testUnsupportedAddAmbiguousField()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(
+                testSession,
+                TEST_CATALOG_NAME,
+                rowTable(tableName,
+                        new RowType.Field(Optional.of("a"), rowType(new RowType.Field(Optional.of("x"), INTEGER))),
+                        new RowType.Field(Optional.of("A"), rowType(new RowType.Field(Optional.of("y"), INTEGER)))),
+                FAIL);
+        TableHandle table = metadata.getTableHandle(testSession, tableName).get();
+        assertThat(metadata.getTableMetadata(testSession, table).getColumns())
+                .containsExactly(new ColumnMetadata("col", rowType(
+                        new RowType.Field(Optional.of("a"), rowType(new RowType.Field(Optional.of("x"), INTEGER))),
+                        new RowType.Field(Optional.of("A"), rowType(new RowType.Field(Optional.of("y"), INTEGER))))));
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("col", "a", "z"), INTEGER, false, false)))
+                .hasErrorCode(AMBIGUOUS_NAME)
+                .hasMessage("Field path [a, z] within row(a row(x integer), A row(y integer)) is ambiguous");
+        assertThat(metadata.getTableMetadata(testSession, table).getColumns())
+                .containsExactly(new ColumnMetadata("col", rowType(
+                        new RowType.Field(Optional.of("a"), rowType(new RowType.Field(Optional.of("x"), INTEGER))),
+                        new RowType.Field(Optional.of("A"), rowType(new RowType.Field(Optional.of("y"), INTEGER))))));
+    }
+
+    private ListenableFuture<Void> executeAddColumn(QualifiedName table, QualifiedName column, Type type, boolean tableExists, boolean columnNotExists)
+    {
+        return executeAddColumn(table, column, type, Optional.empty(), tableExists, columnNotExists);
+    }
+
+    private ListenableFuture<Void> executeAddColumn(QualifiedName table, QualifiedName column, Type type, Optional<String> comment, boolean tableExists, boolean columnNotExists)
     {
         ColumnDefinition columnDefinition = new ColumnDefinition(column, toSqlType(type), true, ImmutableList.of(), comment);
         return executeAddColumn(table, columnDefinition, tableExists, columnNotExists);
     }
 
-    private ListenableFuture<Void> executeAddColumn(QualifiedName table, Identifier column, Type type, List<Property> properties, boolean tableExists, boolean columnNotExists)
+    private ListenableFuture<Void> executeAddColumn(QualifiedName table, QualifiedName column, Type type, List<Property> properties, boolean tableExists, boolean columnNotExists)
     {
         ColumnDefinition columnDefinition = new ColumnDefinition(column, toSqlType(type), true, properties, Optional.empty());
         return executeAddColumn(table, columnDefinition, tableExists, columnNotExists);
@@ -178,4 +299,10 @@ private ListenableFuture<Void> executeAddColumn(QualifiedName table, ColumnDefin
         return new AddColumnTask(plannerContext, new AllowAllAccessControl(), columnPropertyManager)
                 .execute(new AddColumn(table, columnDefinition, tableExists, columnNotExists), queryStateMachine, ImmutableList.of(), WarningCollector.NOOP);
     }
+
+    private static ConnectorTableMetadata rowTable(QualifiedObjectName tableName, RowType.Field... fields)
+    {
+        return new ConnectorTableMetadata(tableName.asSchemaTableName(), ImmutableList.of(
+                new ColumnMetadata("col", rowType(fields))));
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestCallTask.java b/core/trino-main/src/test/java/io/trino/execution/TestCallTask.java
index d87f307f75e4..abcada15cc3d 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestCallTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestCallTask.java
@@ -37,10 +37,10 @@
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.TestingAccessControlManager;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.lang.invoke.MethodHandle;
 import java.net.URI;
@@ -61,16 +61,16 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestCallTask
 {
+    private static final MethodHandle PROCEDURE_METHOD_HANDLE = methodHandle(TestingProcedure.class, "testingMethod", Target.class, ConnectorAccessControl.class);
     private ExecutorService executor;
-
-    private static boolean invoked;
     private LocalQueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void init()
     {
         queryRunner = LocalQueryRunner.builder(TEST_SESSION).build();
@@ -78,7 +78,7 @@ public void init()
         executor = newCachedThreadPool(daemonThreadsNamed("call-task-test-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void close()
     {
         if (queryRunner != null) {
@@ -89,28 +89,23 @@ public void close()
         executor = null;
     }
 
-    @BeforeMethod
-    public void cleanup()
-    {
-        invoked = false;
-    }
-
     @Test
     public void testExecute()
     {
-        executeCallTask(methodHandle(TestCallTask.class, "testingMethod"), transactionManager -> new AllowAllAccessControl());
-        assertThat(invoked).isTrue();
+        Target target = new Target();
+        executeCallTask(PROCEDURE_METHOD_HANDLE.bindTo(target), transactionManager -> new AllowAllAccessControl());
+        assertThat(target.invoked).isTrue();
     }
 
     @Test
     public void testExecuteNoPermission()
     {
+        Target target = new Target();
         assertThatThrownBy(
-                () -> executeCallTask(methodHandle(TestCallTask.class, "testingMethod"), transactionManager -> new DenyAllAccessControl()))
+                () -> executeCallTask(PROCEDURE_METHOD_HANDLE.bindTo(target), transactionManager -> new DenyAllAccessControl()))
                 .isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot execute procedure test-catalog.test.testing_procedure");
-
-        assertThat(invoked).isFalse();
+        assertThat(target.invoked).isFalse();
     }
 
     @Test
@@ -118,7 +113,7 @@ public void testExecuteNoPermissionOnInsert()
     {
         assertThatThrownBy(
                 () -> executeCallTask(
-                        methodHandle(TestingProcedure.class, "testingMethod", ConnectorAccessControl.class),
+                        PROCEDURE_METHOD_HANDLE.bindTo(new Target()),
                         transactionManager -> {
                             TestingAccessControlManager accessControl = new TestingAccessControlManager(transactionManager, emptyEventListenerManager());
                             accessControl.loadSystemAccessControl(AllowAllSystemAccessControl.NAME, ImmutableMap.of());
@@ -176,15 +171,16 @@ private QueryStateMachine stateMachine(TransactionManager transactionManager, Me
                 new NodeVersion("test"));
     }
 
-    public static void testingMethod()
+    private static class Target
     {
-        invoked = true;
+        public boolean invoked;
     }
 
     public static class TestingProcedure
     {
-        public static void testingMethod(ConnectorAccessControl connectorAccessControl)
+        public static void testingMethod(Target target, ConnectorAccessControl connectorAccessControl)
         {
+            target.invoked = true;
             connectorAccessControl.checkCanInsertIntoTable(null, new SchemaTableName("test", "testing_table"));
         }
     }
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestColumn.java b/core/trino-main/src/test/java/io/trino/execution/TestColumn.java
index b7e1673de91d..6ff79c9c72ad 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestColumn.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestColumn.java
@@ -14,7 +14,7 @@
 package io.trino.execution;
 
 import io.airlift.json.JsonCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestCommentTask.java b/core/trino-main/src/test/java/io/trino/execution/TestCommentTask.java
index 6fa791b935e1..bca446767f66 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestCommentTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestCommentTask.java
@@ -22,7 +22,7 @@
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.sql.tree.Comment;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -30,6 +30,7 @@
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.spi.StandardErrorCode.COLUMN_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.sql.tree.Comment.Type.COLUMN;
 import static io.trino.sql.tree.Comment.Type.TABLE;
 import static io.trino.sql.tree.Comment.Type.VIEW;
@@ -37,7 +38,6 @@
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestCommentTask
         extends BaseDataDefinitionTaskTest
 {
@@ -45,7 +45,7 @@ public class TestCommentTask
     public void testCommentTable()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
         assertThat(metadata.getTableMetadata(testSession, metadata.getTableHandle(testSession, tableName).get()).getMetadata().getComment())
                 .isEmpty();
 
@@ -91,7 +91,7 @@ public void testCommentView()
     public void testCommentViewOnTable()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(setComment(VIEW, asQualifiedName(tableName), Optional.of("new comment"))))
                 .hasErrorCode(TABLE_NOT_FOUND)
@@ -114,7 +114,7 @@ public void testCommentTableColumn()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
         QualifiedName columnName = qualifiedColumnName("existing_table", "test");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         getFutureValue(setComment(COLUMN, columnName, Optional.of("new test column comment")));
         TableHandle tableHandle = metadata.getTableHandle(testSession, tableName).get();
@@ -141,6 +141,25 @@ public void testCommentViewColumn()
                 .hasMessage("Column does not exist: %s", missingColumnName.getSuffix());
     }
 
+    @Test
+    public void testCommentMaterializedViewColumn()
+    {
+        QualifiedObjectName materializedViewName = qualifiedObjectName("existing_materialized_view");
+        metadata.createMaterializedView(testSession, QualifiedObjectName.valueOf(materializedViewName.toString()), someMaterializedView(), false, false);
+        assertThat(metadata.isMaterializedView(testSession, materializedViewName)).isTrue();
+
+        QualifiedName columnName = qualifiedColumnName("existing_materialized_view", "test");
+        QualifiedName missingColumnName = qualifiedColumnName("existing_materialized_view", "missing");
+
+        getFutureValue(setComment(COLUMN, columnName, Optional.of("new test column comment")));
+        assertThat(metadata.getMaterializedView(testSession, materializedViewName).get().getColumns().stream().filter(column -> "test".equals(column.getName())).collect(onlyElement()).getComment())
+                .isEqualTo(Optional.of("new test column comment"));
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(setComment(COLUMN, missingColumnName, Optional.of("comment for missing column"))))
+                .hasErrorCode(COLUMN_NOT_FOUND)
+                .hasMessage("Column does not exist: %s", missingColumnName.getSuffix());
+    }
+
     private ListenableFuture<Void> setComment(Comment.Type type, QualifiedName viewName, Optional<String> comment)
     {
         return new CommentTask(metadata, new AllowAllAccessControl()).execute(new Comment(type, viewName, comment), queryStateMachine, ImmutableList.of(), WarningCollector.NOOP);
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestCommitTask.java b/core/trino-main/src/test/java/io/trino/execution/TestCommitTask.java
index 5281ff4ecd89..130a1b2e5450 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestCommitTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestCommitTask.java
@@ -14,6 +14,7 @@
  */
 package io.trino.execution;
 
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.Session;
 import io.trino.Session.SessionBuilder;
 import io.trino.client.NodeVersion;
@@ -26,8 +27,9 @@
 import io.trino.sql.tree.Commit;
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.Optional;
@@ -47,16 +49,18 @@
 import static io.trino.transaction.InMemoryTransactionManager.createTestTransactionManager;
 import static java.util.Collections.emptyList;
 import static java.util.concurrent.Executors.newCachedThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestCommitTask
 {
     private final Metadata metadata = createTestMetadataManager();
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
@@ -132,7 +136,7 @@ private QueryStateMachine createQueryStateMachine(String query, Session session,
                 new ResourceGroupId("test"),
                 true,
                 transactionManager,
-                new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), DefaultSystemAccessControl.NAME),
+                new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), OpenTelemetry.noop(), DefaultSystemAccessControl.NAME),
                 executor,
                 metadata,
                 WarningCollector.NOOP,
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestCreateCatalogTask.java b/core/trino-main/src/test/java/io/trino/execution/TestCreateCatalogTask.java
index a07f76a17454..330257852c3c 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestCreateCatalogTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestCreateCatalogTask.java
@@ -28,9 +28,10 @@
 import io.trino.sql.tree.Property;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.Map;
@@ -44,7 +45,7 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
 public class TestCreateCatalogTask
 {
     private static final String TEST_CATALOG = "test_catalog";
@@ -53,7 +54,7 @@ public class TestCreateCatalogTask
     protected LocalQueryRunner queryRunner;
     private QueryStateMachine queryStateMachine;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         queryRunner = LocalQueryRunner.create(TEST_SESSION);
@@ -78,7 +79,7 @@ public void setUp()
                 new NodeVersion("test"));
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         if (queryRunner != null) {
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestCreateMaterializedViewTask.java b/core/trino-main/src/test/java/io/trino/execution/TestCreateMaterializedViewTask.java
index 7bbdae3f7c84..5c9f18747183 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestCreateMaterializedViewTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestCreateMaterializedViewTask.java
@@ -62,9 +62,10 @@
 import io.trino.testing.TestingAccessControlManager;
 import io.trino.testing.TestingMetadata.TestingTableHandle;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.List;
@@ -96,9 +97,10 @@
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestCreateMaterializedViewTask
 {
     private static final String DEFAULT_MATERIALIZED_VIEW_FOO_PROPERTY_VALUE = null;
@@ -120,7 +122,7 @@ public class TestCreateMaterializedViewTask
     private LocalQueryRunner queryRunner;
     private CatalogHandle testCatalogHandle;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         testSession = testSessionBuilder()
@@ -148,11 +150,12 @@ public void setUp()
                 new AllowAllAccessControl(),
                 queryRunner.getTablePropertyManager(),
                 queryRunner.getAnalyzePropertyManager()),
-                new StatementRewrite(ImmutableSet.of()));
+                new StatementRewrite(ImmutableSet.of()),
+                plannerContext.getTracer());
         queryStateMachine = stateMachine(transactionManager, createTestMetadataManager(), new AllowAllAccessControl());
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         if (queryRunner != null) {
@@ -276,7 +279,7 @@ public void testCreateDenyPermission()
                 accessControl,
                 new TablePropertyManager(CatalogServiceProvider.fail()),
                 new AnalyzePropertyManager(CatalogServiceProvider.fail()));
-        AnalyzerFactory analyzerFactory = new AnalyzerFactory(statementAnalyzerFactory, new StatementRewrite(ImmutableSet.of()));
+        AnalyzerFactory analyzerFactory = new AnalyzerFactory(statementAnalyzerFactory, new StatementRewrite(ImmutableSet.of()), plannerContext.getTracer());
         assertThatThrownBy(() -> getFutureValue(new CreateMaterializedViewTask(plannerContext, accessControl, parser, analyzerFactory, materializedViewPropertyManager)
                 .execute(statement, queryStateMachine, ImmutableList.of(), WarningCollector.NOOP)))
                 .isInstanceOf(AccessDeniedException.class)
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestCreateSchemaTask.java b/core/trino-main/src/test/java/io/trino/execution/TestCreateSchemaTask.java
index 17da9997d618..28e7abd70f6e 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestCreateSchemaTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestCreateSchemaTask.java
@@ -23,7 +23,7 @@
 import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.sql.tree.CreateSchema;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_HANDLE;
@@ -32,7 +32,6 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
 public class TestCreateSchemaTask
         extends BaseDataDefinitionTaskTest
 {
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestCreateTableColumnTypeCoercion.java b/core/trino-main/src/test/java/io/trino/execution/TestCreateTableColumnTypeCoercion.java
new file mode 100644
index 000000000000..fef95cc72dcc
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/TestCreateTableColumnTypeCoercion.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed 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 io.trino.execution;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.Session;
+import io.trino.connector.MockConnectorFactory;
+import io.trino.spi.type.TimestampType;
+import io.trino.testing.LocalQueryRunner;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.Optional;
+
+import static io.airlift.testing.Closeables.closeAllRuntimeException;
+import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_ERROR;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestCreateTableColumnTypeCoercion
+{
+    private static final String catalogName = "mock";
+    private LocalQueryRunner queryRunner;
+
+    private LocalQueryRunner createLocalQueryRunner()
+    {
+        Session session = testSessionBuilder()
+                .setCatalog(catalogName)
+                .setSchema("default")
+                .build();
+        LocalQueryRunner queryRunner = LocalQueryRunner.create(session);
+        queryRunner.createCatalog(
+                catalogName,
+                prepareConnectorFactory(catalogName),
+                ImmutableMap.of());
+        return queryRunner;
+    }
+
+    private MockConnectorFactory prepareConnectorFactory(String catalogName)
+    {
+        return MockConnectorFactory.builder()
+                .withName(catalogName)
+                .withGetTableHandle(((session, schemaTableName) -> null))
+                .withGetSupportedType((session, type) -> {
+                    if (type instanceof TimestampType) {
+                        return Optional.of(VARCHAR);
+                    }
+                    return Optional.empty();
+                })
+                .build();
+    }
+
+    @Test
+    public void testIncompatibleTypeForCreateTableAsSelect()
+    {
+        assertTrinoExceptionThrownBy(() -> queryRunner.execute("CREATE TABLE test_incompatible_type AS SELECT TIMESTAMP '2020-09-27 12:34:56.999' a"))
+                .hasErrorCode(FUNCTION_IMPLEMENTATION_ERROR)
+                .hasMessage("Type 'timestamp(3)' is not compatible with the supplied type 'varchar' in getSupportedType");
+    }
+
+    @Test
+    public void testIncompatibleTypeForCreateTableAsSelectWithNoData()
+    {
+        assertTrinoExceptionThrownBy(() -> queryRunner.execute("CREATE TABLE test_incompatible_type AS SELECT TIMESTAMP '2020-09-27 12:34:56.999' a WITH NO DATA"))
+                .hasErrorCode(FUNCTION_IMPLEMENTATION_ERROR)
+                .hasMessage("Type 'timestamp(3)' is not compatible with the supplied type 'varchar' in getSupportedType");
+    }
+
+    @BeforeAll
+    public final void initQueryRunner()
+    {
+        this.queryRunner = createLocalQueryRunner();
+    }
+
+    @AfterAll
+    public final void destroyQueryRunner()
+    {
+        closeAllRuntimeException(queryRunner);
+        queryRunner = null;
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestCreateTableTask.java b/core/trino-main/src/test/java/io/trino/execution/TestCreateTableTask.java
index 7ebc335cad2b..ef413f26905e 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestCreateTableTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestCreateTableTask.java
@@ -33,8 +33,11 @@
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorCapabilities;
 import io.trino.spi.connector.ConnectorTableMetadata;
+import io.trino.spi.connector.SaveMode;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.security.AccessDeniedException;
+import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.Type;
 import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.TestingConnectorTransactionHandle;
 import io.trino.sql.tree.ColumnDefinition;
@@ -49,9 +52,10 @@
 import io.trino.testing.TestingAccessControlManager;
 import io.trino.testing.TestingMetadata.TestingTableHandle;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Map;
@@ -69,12 +73,16 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DateType.DATE;
 import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.sql.QueryUtil.identifier;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
 import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
 import static io.trino.sql.tree.LikeClause.PropertiesOption.INCLUDING;
+import static io.trino.sql.tree.SaveMode.FAIL;
+import static io.trino.sql.tree.SaveMode.IGNORE;
+import static io.trino.sql.tree.SaveMode.REPLACE;
 import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.SELECT_COLUMN;
 import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.SHOW_CREATE_TABLE;
 import static io.trino.testing.TestingAccessControlManager.privilege;
@@ -86,11 +94,12 @@
 import static java.util.Locale.ENGLISH;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestCreateTableTask
 {
     private static final String OTHER_CATALOG_NAME = "other_catalog";
@@ -99,6 +108,10 @@ public class TestCreateTableTask
             List.of(new ColumnMetadata("a", SMALLINT), new ColumnMetadata("b", BIGINT)),
             Map.of("baz", "property_value"));
 
+    private static final ConnectorTableMetadata PARENT_TABLE_WITH_COERCED_TYPE = new ConnectorTableMetadata(
+            new SchemaTableName("schema", "parent_table_with_coerced_type"),
+            List.of(new ColumnMetadata("a", TIMESTAMP_NANOS)));
+
     private LocalQueryRunner queryRunner;
     private Session testSession;
     private MockMetadata metadata;
@@ -109,7 +122,7 @@ public class TestCreateTableTask
     private CatalogHandle testCatalogHandle;
     private CatalogHandle otherCatalogHandle;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         queryRunner = LocalQueryRunner.create(testSessionBuilder()
@@ -138,7 +151,7 @@ public void setUp()
         plannerContext = plannerContextBuilder().withMetadata(metadata).build();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         if (queryRunner != null) {
@@ -156,8 +169,8 @@ public void tearDown()
     public void testCreateTableNotExistsTrue()
     {
         CreateTable statement = new CreateTable(QualifiedName.of("test_table"),
-                ImmutableList.of(new ColumnDefinition(identifier("a"), toSqlType(BIGINT), true, emptyList(), Optional.empty())),
-                true,
+                ImmutableList.of(new ColumnDefinition(QualifiedName.of("a"), toSqlType(BIGINT), true, emptyList(), Optional.empty())),
+                IGNORE,
                 ImmutableList.of(),
                 Optional.empty());
 
@@ -170,8 +183,8 @@ public void testCreateTableNotExistsTrue()
     public void testCreateTableNotExistsFalse()
     {
         CreateTable statement = new CreateTable(QualifiedName.of("test_table"),
-                ImmutableList.of(new ColumnDefinition(identifier("a"), toSqlType(BIGINT), true, emptyList(), Optional.empty())),
-                false,
+                ImmutableList.of(new ColumnDefinition(QualifiedName.of("a"), toSqlType(BIGINT), true, emptyList(), Optional.empty())),
+                FAIL,
                 ImmutableList.of(),
                 Optional.empty());
 
@@ -183,12 +196,28 @@ public void testCreateTableNotExistsFalse()
         assertEquals(metadata.getCreateTableCallCount(), 1);
     }
 
+    @Test
+    public void testReplaceTable()
+    {
+        CreateTable statement = new CreateTable(QualifiedName.of("test_table"),
+                ImmutableList.of(new ColumnDefinition(QualifiedName.of("a"), toSqlType(BIGINT), true, emptyList(), Optional.empty())),
+                REPLACE,
+                ImmutableList.of(),
+                Optional.empty());
+
+        CreateTableTask createTableTask = new CreateTableTask(plannerContext, new AllowAllAccessControl(), columnPropertyManager, tablePropertyManager);
+        getFutureValue(createTableTask.internalExecute(statement, testSession, emptyList(), output -> {}));
+        assertEquals(metadata.getCreateTableCallCount(), 1);
+        assertThat(metadata.getReceivedTableMetadata().get(0).getColumns())
+                .isEqualTo(ImmutableList.of(new ColumnMetadata("a", BIGINT)));
+    }
+
     @Test
     public void testCreateTableWithMaterializedViewPropertyFails()
     {
         CreateTable statement = new CreateTable(QualifiedName.of("test_table"),
-                ImmutableList.of(new ColumnDefinition(identifier("a"), toSqlType(BIGINT), true, emptyList(), Optional.empty())),
-                false,
+                ImmutableList.of(new ColumnDefinition(QualifiedName.of("a"), toSqlType(BIGINT), true, emptyList(), Optional.empty())),
+                FAIL,
                 ImmutableList.of(new Property(new Identifier("foo"), new StringLiteral("bar"))),
                 Optional.empty());
 
@@ -205,10 +234,10 @@ public void testCreateWithNotNullColumns()
     {
         metadata.setConnectorCapabilities(NOT_NULL_COLUMN_CONSTRAINT);
         List<TableElement> inputColumns = ImmutableList.of(
-                new ColumnDefinition(identifier("a"), toSqlType(DATE), true, emptyList(), Optional.empty()),
-                new ColumnDefinition(identifier("b"), toSqlType(VARCHAR), false, emptyList(), Optional.empty()),
-                new ColumnDefinition(identifier("c"), toSqlType(VARBINARY), false, emptyList(), Optional.empty()));
-        CreateTable statement = new CreateTable(QualifiedName.of("test_table"), inputColumns, true, ImmutableList.of(), Optional.empty());
+                new ColumnDefinition(QualifiedName.of("a"), toSqlType(DATE), true, emptyList(), Optional.empty()),
+                new ColumnDefinition(QualifiedName.of("b"), toSqlType(VARCHAR), false, emptyList(), Optional.empty()),
+                new ColumnDefinition(QualifiedName.of("c"), toSqlType(VARBINARY), false, emptyList(), Optional.empty()));
+        CreateTable statement = new CreateTable(QualifiedName.of("test_table"), inputColumns, IGNORE, ImmutableList.of(), Optional.empty());
 
         CreateTableTask createTableTask = new CreateTableTask(plannerContext, new AllowAllAccessControl(), columnPropertyManager, tablePropertyManager);
         getFutureValue(createTableTask.internalExecute(statement, testSession, emptyList(), output -> {}));
@@ -233,13 +262,13 @@ public void testCreateWithNotNullColumns()
     public void testCreateWithUnsupportedConnectorThrowsWhenNotNull()
     {
         List<TableElement> inputColumns = ImmutableList.of(
-                new ColumnDefinition(identifier("a"), toSqlType(DATE), true, emptyList(), Optional.empty()),
-                new ColumnDefinition(identifier("b"), toSqlType(VARCHAR), false, emptyList(), Optional.empty()),
-                new ColumnDefinition(identifier("c"), toSqlType(VARBINARY), false, emptyList(), Optional.empty()));
+                new ColumnDefinition(QualifiedName.of("a"), toSqlType(DATE), true, emptyList(), Optional.empty()),
+                new ColumnDefinition(QualifiedName.of("b"), toSqlType(VARCHAR), false, emptyList(), Optional.empty()),
+                new ColumnDefinition(QualifiedName.of("c"), toSqlType(VARBINARY), false, emptyList(), Optional.empty()));
         CreateTable statement = new CreateTable(
                 QualifiedName.of("test_table"),
                 inputColumns,
-                true,
+                IGNORE,
                 ImmutableList.of(),
                 Optional.empty());
 
@@ -331,6 +360,64 @@ public void testCreateLikeIncludingPropertiesDenyPermission()
                 .hasMessageContaining("Cannot reference properties of table");
     }
 
+    @Test
+    public void testUnsupportedCreateTableWithField()
+    {
+        CreateTable statement = new CreateTable(
+                QualifiedName.of("test_table"),
+                ImmutableList.of(new ColumnDefinition(QualifiedName.of("a", "b"), toSqlType(DATE), true, emptyList(), Optional.empty())),
+                FAIL,
+                ImmutableList.of(),
+                Optional.empty());
+
+        CreateTableTask createTableTask = new CreateTableTask(plannerContext, new AllowAllAccessControl(), columnPropertyManager, tablePropertyManager);
+        assertTrinoExceptionThrownBy(() ->
+                getFutureValue(createTableTask.internalExecute(statement, testSession, emptyList(), output -> {})))
+                .hasErrorCode(NOT_SUPPORTED)
+                .hasMessage("Column name 'a.b' must not be qualified");
+    }
+
+    @Test
+    public void testCreateTableWithCoercedType()
+    {
+        CreateTable statement = new CreateTable(QualifiedName.of("test_table"),
+                ImmutableList.of(
+                        new ColumnDefinition(
+                                QualifiedName.of("a"),
+                                toSqlType(TIMESTAMP_NANOS),
+                                true,
+                                emptyList(),
+                                Optional.empty())),
+                IGNORE,
+                ImmutableList.of(),
+                Optional.empty());
+        CreateTableTask createTableTask = new CreateTableTask(plannerContext, new AllowAllAccessControl(), columnPropertyManager, tablePropertyManager);
+        getFutureValue(createTableTask.internalExecute(statement, testSession, List.of(), output -> {}));
+        assertThat(metadata.getReceivedTableMetadata().get(0).getColumns().get(0).getType()).isEqualTo(TIMESTAMP_MILLIS);
+    }
+
+    @Test
+    public void testCreateTableLikeWithCoercedType()
+    {
+        CreateTable statement = new CreateTable(
+                QualifiedName.of("test_table"),
+                List.of(
+                        new LikeClause(
+                                QualifiedName.of(PARENT_TABLE_WITH_COERCED_TYPE.getTable().getTableName()),
+                                Optional.of(INCLUDING))),
+                IGNORE,
+                ImmutableList.of(),
+                Optional.empty());
+
+        CreateTableTask createTableTask = new CreateTableTask(plannerContext, new AllowAllAccessControl(), columnPropertyManager, tablePropertyManager);
+        getFutureValue(createTableTask.internalExecute(statement, testSession, List.of(), output -> {}));
+        assertEquals(metadata.getCreateTableCallCount(), 1);
+
+        assertThat(metadata.getReceivedTableMetadata().get(0).getColumns())
+                .isEqualTo(ImmutableList.of(new ColumnMetadata("a", TIMESTAMP_MILLIS)));
+        assertThat(metadata.getReceivedTableMetadata().get(0).getProperties()).isEmpty();
+    }
+
     private static CreateTable getCreateLikeStatement(boolean includingProperties)
     {
         return getCreateLikeStatement(QualifiedName.of("test_table"), includingProperties);
@@ -341,7 +428,7 @@ private static CreateTable getCreateLikeStatement(QualifiedName name, boolean in
         return new CreateTable(
                 name,
                 List.of(new LikeClause(QualifiedName.of(PARENT_TABLE.getTable().getTableName()), includingProperties ? Optional.of(INCLUDING) : Optional.empty())),
-                true,
+                IGNORE,
                 ImmutableList.of(),
                 Optional.empty());
     }
@@ -353,10 +440,13 @@ private class MockMetadata
         private Set<ConnectorCapabilities> connectorCapabilities = ImmutableSet.of();
 
         @Override
-        public void createTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, boolean ignoreExisting)
+        public void createTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, SaveMode saveMode)
         {
+            if (saveMode == SaveMode.REPLACE) {
+                tables.removeIf(table -> table.getTable().equals(tableMetadata.getTable()));
+            }
             tables.add(tableMetadata);
-            if (!ignoreExisting) {
+            if (saveMode == SaveMode.FAIL) {
                 throw new TrinoException(ALREADY_EXISTS, "Table already exists");
             }
         }
@@ -383,6 +473,22 @@ public Optional<TableHandle> getTableHandle(Session session, QualifiedObjectName
                                 new TestingTableHandle(tableName.asSchemaTableName()),
                                 TestingConnectorTransactionHandle.INSTANCE));
             }
+            if (tableName.asSchemaTableName().equals(PARENT_TABLE_WITH_COERCED_TYPE.getTable())) {
+                return Optional.of(
+                        new TableHandle(
+                                TEST_CATALOG_HANDLE,
+                                new TestingTableHandle(tableName.asSchemaTableName()),
+                                TestingConnectorTransactionHandle.INSTANCE));
+            }
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<Type> getSupportedType(Session session, CatalogHandle catalogHandle, Map<String, Object> tableProperties, Type type)
+        {
+            if (type instanceof TimestampType) {
+                return Optional.of(TIMESTAMP_MILLIS);
+            }
             return Optional.empty();
         }
 
@@ -393,6 +499,9 @@ public TableMetadata getTableMetadata(Session session, TableHandle tableHandle)
                 if (((TestingTableHandle) tableHandle.getConnectorHandle()).getTableName().equals(PARENT_TABLE.getTable())) {
                     return new TableMetadata(TEST_CATALOG_NAME, PARENT_TABLE);
                 }
+                if (((TestingTableHandle) tableHandle.getConnectorHandle()).getTableName().equals(PARENT_TABLE_WITH_COERCED_TYPE.getTable())) {
+                    return new TableMetadata(TEST_CATALOG_NAME, PARENT_TABLE_WITH_COERCED_TYPE);
+                }
             }
 
             return super.getTableMetadata(session, tableHandle);
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestCreateViewTask.java b/core/trino-main/src/test/java/io/trino/execution/TestCreateViewTask.java
index 45987b926acc..77c2c8240384 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestCreateViewTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestCreateViewTask.java
@@ -29,21 +29,24 @@
 import io.trino.sql.tree.CreateView;
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Query;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Optional;
 
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.spi.StandardErrorCode.TABLE_ALREADY_EXISTS;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.sql.QueryUtil.selectList;
 import static io.trino.sql.QueryUtil.simpleQuery;
 import static io.trino.sql.QueryUtil.table;
 import static io.trino.sql.analyzer.StatementAnalyzerFactory.createTestingStatementAnalyzerFactory;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestCreateViewTask
         extends BaseDataDefinitionTaskTest
 {
@@ -52,7 +55,7 @@ public class TestCreateViewTask
     private AnalyzerFactory analyzerFactory;
 
     @Override
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         super.setUp();
@@ -63,9 +66,10 @@ public void setUp()
                         new AllowAllAccessControl(),
                         new TablePropertyManager(CatalogServiceProvider.fail()),
                         new AnalyzePropertyManager(CatalogServiceProvider.fail())),
-                new StatementRewrite(ImmutableSet.of()));
+                new StatementRewrite(ImmutableSet.of()),
+                plannerContext.getTracer());
         QualifiedObjectName tableName = qualifiedObjectName("mock_table");
-        metadata.createTable(testSession, CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, CATALOG_NAME, someTable(tableName), FAIL);
     }
 
     @Test
@@ -101,7 +105,7 @@ public void testReplaceViewOnViewIfExists()
     public void testCreateViewOnTableIfExists()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeCreateView(asQualifiedName(tableName), false)))
                 .hasErrorCode(TABLE_ALREADY_EXISTS)
@@ -112,7 +116,7 @@ public void testCreateViewOnTableIfExists()
     public void testReplaceViewOnTableIfExists()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeCreateView(asQualifiedName(tableName), true)))
                 .hasErrorCode(TABLE_ALREADY_EXISTS)
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestDeallocateTask.java b/core/trino-main/src/test/java/io/trino/execution/TestDeallocateTask.java
index b6e1b2579769..edc5b2e56aeb 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestDeallocateTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestDeallocateTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.collect.ImmutableSet;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.Session;
 import io.trino.client.NodeVersion;
 import io.trino.execution.warnings.WarningCollector;
@@ -26,8 +27,9 @@
 import io.trino.sql.tree.Deallocate;
 import io.trino.sql.tree.Identifier;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.List;
@@ -46,14 +48,16 @@
 import static io.trino.transaction.InMemoryTransactionManager.createTestTransactionManager;
 import static java.util.Collections.emptyList;
 import static java.util.concurrent.Executors.newCachedThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestDeallocateTask
 {
     private final Metadata metadata = createTestMetadataManager();
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
@@ -81,7 +85,7 @@ public void testDeallocateNoSuchStatement()
     private Set<String> executeDeallocate(String statementName, String sqlString, Session session)
     {
         TransactionManager transactionManager = createTestTransactionManager();
-        AccessControlManager accessControl = new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), DefaultSystemAccessControl.NAME);
+        AccessControlManager accessControl = new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), OpenTelemetry.noop(), DefaultSystemAccessControl.NAME);
         accessControl.setSystemAccessControls(List.of(AllowAllSystemAccessControl.INSTANCE));
         QueryStateMachine stateMachine = QueryStateMachine.begin(
                 Optional.empty(),
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestDropCatalogTask.java b/core/trino-main/src/test/java/io/trino/execution/TestDropCatalogTask.java
index ebb6fa4498dd..e25fc66dc660 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestDropCatalogTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestDropCatalogTask.java
@@ -23,9 +23,10 @@
 import io.trino.sql.tree.DropCatalog;
 import io.trino.sql.tree.Identifier;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.Optional;
@@ -34,26 +35,28 @@
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static io.trino.testing.TestingSession.testSession;
 import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestDropCatalogTask
 {
     private static final String TEST_CATALOG = "test_catalog";
 
     protected LocalQueryRunner queryRunner;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         queryRunner = LocalQueryRunner.create(TEST_SESSION);
         queryRunner.registerCatalogFactory(new TpchConnectorFactory());
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         if (queryRunner != null) {
@@ -102,7 +105,7 @@ private QueryStateMachine createNewQuery()
                 Optional.empty(),
                 "test",
                 Optional.empty(),
-                queryRunner.getDefaultSession(),
+                testSession(queryRunner.getDefaultSession()),
                 URI.create("fake://uri"),
                 new ResourceGroupId("test"),
                 false,
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestDropColumnTask.java b/core/trino-main/src/test/java/io/trino/execution/TestDropColumnTask.java
index b1492f1a93eb..a443dc529e80 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestDropColumnTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestDropColumnTask.java
@@ -25,7 +25,7 @@
 import io.trino.spi.type.RowType.Field;
 import io.trino.sql.tree.DropColumn;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -33,12 +33,12 @@
 import static io.trino.spi.StandardErrorCode.COLUMN_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestDropColumnTask
         extends BaseDataDefinitionTaskTest
 {
@@ -46,7 +46,7 @@ public class TestDropColumnTask
     public void testDropColumn()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), FAIL);
         TableHandle table = metadata.getTableHandle(testSession, tableName).get();
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .containsExactly(new ColumnMetadata("a", BIGINT), new ColumnMetadata("b", BIGINT));
@@ -60,7 +60,7 @@ public void testDropColumn()
     public void testDropOnlyColumn()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
         TableHandle table = metadata.getTableHandle(testSession, tableName).get();
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .containsExactly(new ColumnMetadata("test", BIGINT));
@@ -93,7 +93,7 @@ public void testDropColumnNotExistingTableIfExists()
     public void testDropMissingColumn()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeDropColumn(asQualifiedName(tableName), QualifiedName.of("missing_column"), false, false)))
                 .hasErrorCode(COLUMN_NOT_FOUND)
@@ -104,7 +104,7 @@ public void testDropMissingColumn()
     public void testDropColumnIfExists()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), FAIL);
         TableHandle table = metadata.getTableHandle(testSession, tableName).get();
 
         getFutureValue(executeDropColumn(asQualifiedName(tableName), QualifiedName.of("c"), false, true));
@@ -116,7 +116,7 @@ public void testDropColumnIfExists()
     public void testUnsupportedDropDuplicatedField()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new Field(Optional.of("a"), BIGINT), new Field(Optional.of("a"), BIGINT)), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new Field(Optional.of("a"), BIGINT), new Field(Optional.of("a"), BIGINT)), FAIL);
         TableHandle table = metadata.getTableHandle(testSession, tableName).get();
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .isEqualTo(ImmutableList.of(new ColumnMetadata("col", RowType.rowType(
@@ -131,7 +131,7 @@ public void testUnsupportedDropDuplicatedField()
     public void testUnsupportedDropOnlyField()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new Field(Optional.of("a"), BIGINT)), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new Field(Optional.of("a"), BIGINT)), FAIL);
         TableHandle table = metadata.getTableHandle(testSession, tableName).get();
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .containsExactly(new ColumnMetadata("col", RowType.rowType(new Field(Optional.of("a"), BIGINT))));
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestDropMaterializedViewTask.java b/core/trino-main/src/test/java/io/trino/execution/TestDropMaterializedViewTask.java
index 750e973a809b..bfbd422399b9 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestDropMaterializedViewTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestDropMaterializedViewTask.java
@@ -20,15 +20,15 @@
 import io.trino.security.AllowAllAccessControl;
 import io.trino.sql.tree.DropMaterializedView;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestDropMaterializedViewTask
         extends BaseDataDefinitionTaskTest
 {
@@ -66,7 +66,7 @@ public void testDropNotExistingMaterializedViewIfExists()
     public void testDropMaterializedViewOnTable()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeDropMaterializedView(asQualifiedName(tableName), true)))
                 .hasErrorCode(GENERIC_USER_ERROR)
@@ -77,7 +77,7 @@ public void testDropMaterializedViewOnTable()
     public void testDropMaterializedViewOnTableIfExists()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeDropMaterializedView(asQualifiedName(tableName), true)))
                 .hasErrorCode(GENERIC_USER_ERROR)
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestDropSchemaTask.java b/core/trino-main/src/test/java/io/trino/execution/TestDropSchemaTask.java
new file mode 100644
index 000000000000..57118ccb4631
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/TestDropSchemaTask.java
@@ -0,0 +1,147 @@
+/*
+ * Licensed 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 io.trino.execution;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.trino.connector.CatalogServiceProvider;
+import io.trino.metadata.QualifiedObjectName;
+import io.trino.metadata.SchemaPropertyManager;
+import io.trino.security.AllowAllAccessControl;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.CatalogSchemaName;
+import io.trino.sql.tree.CreateSchema;
+import io.trino.sql.tree.DropSchema;
+import io.trino.sql.tree.QualifiedName;
+import org.junit.jupiter.api.Test;
+
+import static io.airlift.concurrent.MoreFutures.getFutureValue;
+import static io.trino.execution.warnings.WarningCollector.NOOP;
+import static io.trino.spi.connector.SaveMode.FAIL;
+import static io.trino.testing.TestingHandles.TEST_CATALOG_HANDLE;
+import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+public class TestDropSchemaTask
+        extends BaseDataDefinitionTaskTest
+{
+    private static final CatalogSchemaName CATALOG_SCHEMA_NAME = new CatalogSchemaName(TEST_CATALOG_NAME, "test_db");
+
+    @Test
+    public void testDropSchemaRestrict()
+    {
+        CreateSchemaTask createSchemaTask = getCreateSchemaTask();
+        CreateSchema createSchema = new CreateSchema(QualifiedName.of(CATALOG_SCHEMA_NAME.getSchemaName()), false, ImmutableList.of());
+        getFutureValue(createSchemaTask.execute(createSchema, queryStateMachine, emptyList(), NOOP));
+        assertTrue(metadata.schemaExists(testSession, CATALOG_SCHEMA_NAME));
+
+        DropSchemaTask dropSchemaTask = getDropSchemaTask();
+        DropSchema dropSchema = new DropSchema(QualifiedName.of(CATALOG_SCHEMA_NAME.getSchemaName()), false, false);
+        getFutureValue(dropSchemaTask.execute(dropSchema, queryStateMachine, emptyList(), NOOP));
+        assertFalse(metadata.schemaExists(testSession, CATALOG_SCHEMA_NAME));
+
+        assertThatExceptionOfType(TrinoException.class)
+                .isThrownBy(() -> getFutureValue(dropSchemaTask.execute(dropSchema, queryStateMachine, emptyList(), NOOP)))
+                .withMessage("Schema 'test-catalog.test_db' does not exist");
+    }
+
+    @Test
+    public void testDropNonEmptySchemaRestrict()
+    {
+        CreateSchemaTask createSchemaTask = getCreateSchemaTask();
+        CreateSchema createSchema = new CreateSchema(QualifiedName.of(CATALOG_SCHEMA_NAME.getSchemaName()), false, ImmutableList.of());
+        getFutureValue(createSchemaTask.execute(createSchema, queryStateMachine, emptyList(), NOOP));
+
+        DropSchemaTask dropSchemaTask = getDropSchemaTask();
+        DropSchema dropSchema = new DropSchema(QualifiedName.of(CATALOG_SCHEMA_NAME.getSchemaName()), false, false);
+
+        QualifiedObjectName tableName = new QualifiedObjectName(CATALOG_SCHEMA_NAME.getCatalogName(), CATALOG_SCHEMA_NAME.getSchemaName(), "test_table");
+        metadata.createTable(testSession, CATALOG_SCHEMA_NAME.getCatalogName(), someTable(tableName), FAIL);
+
+        assertThatExceptionOfType(TrinoException.class)
+                .isThrownBy(() -> getFutureValue(dropSchemaTask.execute(dropSchema, queryStateMachine, emptyList(), NOOP)))
+                .withMessage("Cannot drop non-empty schema 'test_db'");
+        assertTrue(metadata.schemaExists(testSession, CATALOG_SCHEMA_NAME));
+    }
+
+    @Test
+    public void testDropSchemaIfExistsRestrict()
+    {
+        CatalogSchemaName schema = new CatalogSchemaName(CATALOG_SCHEMA_NAME.getCatalogName(), "test_if_exists_restrict");
+
+        assertFalse(metadata.schemaExists(testSession, schema));
+        DropSchemaTask dropSchemaTask = getDropSchemaTask();
+
+        DropSchema dropSchema = new DropSchema(QualifiedName.of("test_if_exists_restrict"), true, false);
+        getFutureValue(dropSchemaTask.execute(dropSchema, queryStateMachine, emptyList(), NOOP));
+    }
+
+    @Test
+    public void testDropSchemaCascade()
+    {
+        CreateSchemaTask createSchemaTask = getCreateSchemaTask();
+        CreateSchema createSchema = new CreateSchema(QualifiedName.of(CATALOG_SCHEMA_NAME.getSchemaName()), false, ImmutableList.of());
+        getFutureValue(createSchemaTask.execute(createSchema, queryStateMachine, emptyList(), NOOP));
+        assertTrue(metadata.schemaExists(testSession, CATALOG_SCHEMA_NAME));
+
+        DropSchemaTask dropSchemaTask = getDropSchemaTask();
+        DropSchema dropSchema = new DropSchema(QualifiedName.of(CATALOG_SCHEMA_NAME.getSchemaName()), false, true);
+
+        getFutureValue(dropSchemaTask.execute(dropSchema, queryStateMachine, emptyList(), NOOP));
+        assertFalse(metadata.schemaExists(testSession, CATALOG_SCHEMA_NAME));
+    }
+
+    @Test
+    public void testDropNonEmptySchemaCascade()
+    {
+        CreateSchemaTask createSchemaTask = getCreateSchemaTask();
+        CreateSchema createSchema = new CreateSchema(QualifiedName.of(CATALOG_SCHEMA_NAME.getSchemaName()), false, ImmutableList.of());
+        getFutureValue(createSchemaTask.execute(createSchema, queryStateMachine, emptyList(), NOOP));
+
+        DropSchemaTask dropSchemaTask = getDropSchemaTask();
+        DropSchema dropSchema = new DropSchema(QualifiedName.of(CATALOG_SCHEMA_NAME.getSchemaName()), false, true);
+
+        QualifiedObjectName tableName = new QualifiedObjectName(CATALOG_SCHEMA_NAME.getCatalogName(), CATALOG_SCHEMA_NAME.getSchemaName(), "test_table");
+        metadata.createTable(testSession, CATALOG_SCHEMA_NAME.getCatalogName(), someTable(tableName), FAIL);
+
+        getFutureValue(dropSchemaTask.execute(dropSchema, queryStateMachine, emptyList(), NOOP));
+        assertFalse(metadata.schemaExists(testSession, CATALOG_SCHEMA_NAME));
+    }
+
+    @Test
+    public void testDropSchemaIfExistsCascade()
+    {
+        CatalogSchemaName schema = new CatalogSchemaName(CATALOG_SCHEMA_NAME.getCatalogName(), "test_if_exists_cascade");
+
+        assertFalse(metadata.schemaExists(testSession, schema));
+        DropSchemaTask dropSchemaTask = getDropSchemaTask();
+
+        DropSchema dropSchema = new DropSchema(QualifiedName.of("test_if_exists_cascade"), true, false);
+        getFutureValue(dropSchemaTask.execute(dropSchema, queryStateMachine, emptyList(), NOOP));
+    }
+
+    private CreateSchemaTask getCreateSchemaTask()
+    {
+        SchemaPropertyManager schemaPropertyManager = new SchemaPropertyManager(CatalogServiceProvider.singleton(TEST_CATALOG_HANDLE, ImmutableMap.of()));
+        return new CreateSchemaTask(plannerContext, new AllowAllAccessControl(), schemaPropertyManager);
+    }
+
+    private DropSchemaTask getDropSchemaTask()
+    {
+        return new DropSchemaTask(metadata, new AllowAllAccessControl());
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestDropTableTask.java b/core/trino-main/src/test/java/io/trino/execution/TestDropTableTask.java
index e41288a21b04..79fcb4237689 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestDropTableTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestDropTableTask.java
@@ -20,16 +20,16 @@
 import io.trino.security.AllowAllAccessControl;
 import io.trino.sql.tree.DropTable;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestDropTableTask
         extends BaseDataDefinitionTaskTest
 {
@@ -37,7 +37,7 @@ public class TestDropTableTask
     public void testDropExistingTable()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
         assertThat(metadata.getTableHandle(testSession, tableName)).isPresent();
 
         getFutureValue(executeDropTable(asQualifiedName(tableName), false));
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestDropViewTask.java b/core/trino-main/src/test/java/io/trino/execution/TestDropViewTask.java
index 7566df0cd105..88af3f3802ee 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestDropViewTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestDropViewTask.java
@@ -20,15 +20,15 @@
 import io.trino.security.AllowAllAccessControl;
 import io.trino.sql.tree.DropView;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestDropViewTask
         extends BaseDataDefinitionTaskTest
 {
@@ -66,7 +66,7 @@ public void testDropNotExistingViewIfExists()
     public void testDropViewOnTable()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeDropView(asQualifiedName(tableName), false)))
                 .hasErrorCode(GENERIC_USER_ERROR)
@@ -77,7 +77,7 @@ public void testDropViewOnTable()
     public void testDropViewOnTableIfExists()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeDropView(asQualifiedName(tableName), true)))
                 .hasErrorCode(GENERIC_USER_ERROR)
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestDynamicFilterConfig.java b/core/trino-main/src/test/java/io/trino/execution/TestDynamicFilterConfig.java
index 33c927229952..73b287d78c50 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestDynamicFilterConfig.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestDynamicFilterConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -34,23 +34,23 @@ public void testDefaults()
                 .setEnableDynamicFiltering(true)
                 .setEnableCoordinatorDynamicFiltersDistribution(true)
                 .setEnableLargeDynamicFilters(false)
-                .setSmallBroadcastMaxDistinctValuesPerDriver(200)
-                .setSmallBroadcastMaxSizePerDriver(DataSize.of(20, KILOBYTE))
-                .setSmallBroadcastRangeRowLimitPerDriver(400)
-                .setSmallPartitionedMaxDistinctValuesPerDriver(20)
-                .setSmallBroadcastMaxSizePerOperator(DataSize.of(200, KILOBYTE))
-                .setSmallPartitionedMaxSizePerDriver(DataSize.of(10, KILOBYTE))
-                .setSmallPartitionedRangeRowLimitPerDriver(100)
-                .setSmallPartitionedMaxSizePerOperator(DataSize.of(100, KILOBYTE))
-                .setSmallMaxSizePerFilter(DataSize.of(1, MEGABYTE))
-                .setLargeBroadcastMaxDistinctValuesPerDriver(5000)
-                .setLargeBroadcastMaxSizePerDriver(DataSize.of(500, KILOBYTE))
-                .setLargeBroadcastRangeRowLimitPerDriver(10_000)
-                .setLargeBroadcastMaxSizePerOperator(DataSize.of(5, MEGABYTE))
-                .setLargePartitionedMaxDistinctValuesPerDriver(500)
-                .setLargePartitionedMaxSizePerDriver(DataSize.of(50, KILOBYTE))
-                .setLargePartitionedRangeRowLimitPerDriver(1_000)
-                .setLargePartitionedMaxSizePerOperator(DataSize.of(500, KILOBYTE))
+                .setSmallMaxDistinctValuesPerDriver(1_000)
+                .setSmallMaxSizePerDriver(DataSize.of(100, KILOBYTE))
+                .setSmallRangeRowLimitPerDriver(2_000)
+                .setSmallPartitionedMaxDistinctValuesPerDriver(100)
+                .setSmallMaxSizePerOperator(DataSize.of(1, MEGABYTE))
+                .setSmallPartitionedMaxSizePerDriver(DataSize.of(50, KILOBYTE))
+                .setSmallPartitionedRangeRowLimitPerDriver(500)
+                .setSmallPartitionedMaxSizePerOperator(DataSize.of(500, KILOBYTE))
+                .setSmallMaxSizePerFilter(DataSize.of(5, MEGABYTE))
+                .setLargeMaxDistinctValuesPerDriver(10_000)
+                .setLargeMaxSizePerDriver(DataSize.of(2, MEGABYTE))
+                .setLargeRangeRowLimitPerDriver(20_000)
+                .setLargeMaxSizePerOperator(DataSize.of(5, MEGABYTE))
+                .setLargePartitionedMaxDistinctValuesPerDriver(1_000)
+                .setLargePartitionedMaxSizePerDriver(DataSize.of(200, KILOBYTE))
+                .setLargePartitionedRangeRowLimitPerDriver(2_000)
+                .setLargePartitionedMaxSizePerOperator(DataSize.of(2, MEGABYTE))
                 .setLargeMaxSizePerFilter(DataSize.of(5, MEGABYTE)));
     }
 
@@ -61,22 +61,22 @@ public void testExplicitPropertyMappings()
                 .put("enable-dynamic-filtering", "false")
                 .put("enable-coordinator-dynamic-filters-distribution", "false")
                 .put("enable-large-dynamic-filters", "true")
-                .put("dynamic-filtering.small-broadcast.max-distinct-values-per-driver", "256")
-                .put("dynamic-filtering.small-broadcast.max-size-per-driver", "64kB")
-                .put("dynamic-filtering.small-broadcast.range-row-limit-per-driver", "10000")
-                .put("dynamic-filtering.small-broadcast.max-size-per-operator", "640kB")
+                .put("dynamic-filtering.small.max-distinct-values-per-driver", "256")
+                .put("dynamic-filtering.small.max-size-per-driver", "64kB")
+                .put("dynamic-filtering.small.range-row-limit-per-driver", "20000")
+                .put("dynamic-filtering.small.max-size-per-operator", "640kB")
                 .put("dynamic-filtering.small-partitioned.max-distinct-values-per-driver", "256")
                 .put("dynamic-filtering.small-partitioned.max-size-per-driver", "64kB")
-                .put("dynamic-filtering.small-partitioned.range-row-limit-per-driver", "10000")
+                .put("dynamic-filtering.small-partitioned.range-row-limit-per-driver", "20000")
                 .put("dynamic-filtering.small-partitioned.max-size-per-operator", "641kB")
                 .put("dynamic-filtering.small.max-size-per-filter", "341kB")
-                .put("dynamic-filtering.large-broadcast.max-distinct-values-per-driver", "256")
-                .put("dynamic-filtering.large-broadcast.max-size-per-driver", "64kB")
-                .put("dynamic-filtering.large-broadcast.range-row-limit-per-driver", "100000")
-                .put("dynamic-filtering.large-broadcast.max-size-per-operator", "642kB")
+                .put("dynamic-filtering.large.max-distinct-values-per-driver", "256")
+                .put("dynamic-filtering.large.max-size-per-driver", "64kB")
+                .put("dynamic-filtering.large.range-row-limit-per-driver", "200000")
+                .put("dynamic-filtering.large.max-size-per-operator", "642kB")
                 .put("dynamic-filtering.large-partitioned.max-distinct-values-per-driver", "256")
                 .put("dynamic-filtering.large-partitioned.max-size-per-driver", "64kB")
-                .put("dynamic-filtering.large-partitioned.range-row-limit-per-driver", "100000")
+                .put("dynamic-filtering.large-partitioned.range-row-limit-per-driver", "200000")
                 .put("dynamic-filtering.large-partitioned.max-size-per-operator", "643kB")
                 .put("dynamic-filtering.large.max-size-per-filter", "3411kB")
                 .buildOrThrow();
@@ -85,22 +85,22 @@ public void testExplicitPropertyMappings()
                 .setEnableDynamicFiltering(false)
                 .setEnableCoordinatorDynamicFiltersDistribution(false)
                 .setEnableLargeDynamicFilters(true)
-                .setSmallBroadcastMaxDistinctValuesPerDriver(256)
-                .setSmallBroadcastMaxSizePerDriver(DataSize.of(64, KILOBYTE))
-                .setSmallBroadcastRangeRowLimitPerDriver(10000)
-                .setSmallBroadcastMaxSizePerOperator(DataSize.of(640, KILOBYTE))
+                .setSmallMaxDistinctValuesPerDriver(256)
+                .setSmallMaxSizePerDriver(DataSize.of(64, KILOBYTE))
+                .setSmallRangeRowLimitPerDriver(20000)
+                .setSmallMaxSizePerOperator(DataSize.of(640, KILOBYTE))
                 .setSmallPartitionedMaxDistinctValuesPerDriver(256)
                 .setSmallPartitionedMaxSizePerDriver(DataSize.of(64, KILOBYTE))
-                .setSmallPartitionedRangeRowLimitPerDriver(10000)
+                .setSmallPartitionedRangeRowLimitPerDriver(20000)
                 .setSmallPartitionedMaxSizePerOperator(DataSize.of(641, KILOBYTE))
                 .setSmallMaxSizePerFilter(DataSize.of(341, KILOBYTE))
-                .setLargeBroadcastMaxDistinctValuesPerDriver(256)
-                .setLargeBroadcastMaxSizePerDriver(DataSize.of(64, KILOBYTE))
-                .setLargeBroadcastRangeRowLimitPerDriver(100000)
-                .setLargeBroadcastMaxSizePerOperator(DataSize.of(642, KILOBYTE))
+                .setLargeMaxDistinctValuesPerDriver(256)
+                .setLargeMaxSizePerDriver(DataSize.of(64, KILOBYTE))
+                .setLargeRangeRowLimitPerDriver(200000)
+                .setLargeMaxSizePerOperator(DataSize.of(642, KILOBYTE))
                 .setLargePartitionedMaxDistinctValuesPerDriver(256)
                 .setLargePartitionedMaxSizePerDriver(DataSize.of(64, KILOBYTE))
-                .setLargePartitionedRangeRowLimitPerDriver(100000)
+                .setLargePartitionedRangeRowLimitPerDriver(200000)
                 .setLargePartitionedMaxSizePerOperator(DataSize.of(643, KILOBYTE))
                 .setLargeMaxSizePerFilter(DataSize.of(3411, KILOBYTE));
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestDynamicFiltersCollector.java b/core/trino-main/src/test/java/io/trino/execution/TestDynamicFiltersCollector.java
index 2dca9179a948..08b79933782e 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestDynamicFiltersCollector.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestDynamicFiltersCollector.java
@@ -18,7 +18,7 @@
 import io.trino.execution.DynamicFiltersCollector.VersionedDynamicFilterDomains;
 import io.trino.spi.predicate.Domain;
 import io.trino.sql.planner.plan.DynamicFilterId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.execution.DynamicFiltersCollector.INITIAL_DYNAMIC_FILTERS_VERSION;
 import static io.trino.spi.predicate.Domain.multipleValues;
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestFailureInjectionConfig.java b/core/trino-main/src/test/java/io/trino/execution/TestFailureInjectionConfig.java
index 434ccbaf950b..adbd68df38ba 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestFailureInjectionConfig.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestFailureInjectionConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestInput.java b/core/trino-main/src/test/java/io/trino/execution/TestInput.java
index 44ef3f261717..be3d024fb142 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestInput.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestInput.java
@@ -15,9 +15,10 @@
 
 import com.google.common.collect.ImmutableList;
 import io.airlift.json.JsonCodec;
+import io.trino.spi.connector.CatalogHandle.CatalogVersion;
 import io.trino.sql.planner.plan.PlanFragmentId;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -32,6 +33,7 @@ public void testRoundTrip()
     {
         Input expected = new Input(
                 "connectorId",
+                new CatalogVersion("default"),
                 "schema",
                 "table",
                 Optional.empty(),
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestMemoryRevokingScheduler.java b/core/trino-main/src/test/java/io/trino/execution/TestMemoryRevokingScheduler.java
index 8b9986c4e508..982efea623fb 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestMemoryRevokingScheduler.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestMemoryRevokingScheduler.java
@@ -24,6 +24,7 @@
 import io.trino.exchange.ExchangeManagerRegistry;
 import io.trino.execution.buffer.PipelinedOutputBuffers;
 import io.trino.execution.executor.TaskExecutor;
+import io.trino.execution.executor.timesharing.TimeSharingTaskExecutor;
 import io.trino.memory.MemoryPool;
 import io.trino.memory.QueryContext;
 import io.trino.memory.context.LocalMemoryContext;
@@ -35,9 +36,10 @@
 import io.trino.spiller.SpillSpaceTracker;
 import io.trino.sql.planner.LocalExecutionPlanner;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.Collection;
@@ -50,6 +52,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static io.airlift.concurrent.Threads.threadsNamed;
+import static io.airlift.tracing.Tracing.noopTracer;
 import static io.airlift.units.DataSize.Unit.GIGABYTE;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.execution.SqlTask.createSqlTask;
@@ -60,11 +63,12 @@
 import static io.trino.execution.buffer.PipelinedOutputBuffers.BufferType.PARTITIONED;
 import static java.util.Collections.singletonList;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestMemoryRevokingScheduler
 {
     private final AtomicInteger idGenerator = new AtomicInteger();
@@ -79,12 +83,12 @@ public class TestMemoryRevokingScheduler
 
     private Set<OperatorContext> allOperatorContexts;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         memoryPool = new MemoryPool(DataSize.ofBytes(10));
 
-        taskExecutor = new TaskExecutor(8, 16, 3, 4, Ticker.systemTicker());
+        taskExecutor = new TimeSharingTaskExecutor(8, 16, 3, 4, Ticker.systemTicker());
         taskExecutor.start();
 
         // Must be single threaded
@@ -98,12 +102,13 @@ public void setUp()
                 taskExecutor,
                 planner,
                 createTestSplitMonitor(),
+                noopTracer(),
                 new TaskManagerConfig());
 
         allOperatorContexts = null;
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         queryContexts.clear();
@@ -267,6 +272,7 @@ private SqlTask newSqlTask(QueryId queryId)
                 location,
                 "fake",
                 queryContext,
+                noopTracer(),
                 sqlTaskExecutionFactory,
                 executor,
                 sqlTask -> {},
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestNodeSchedulerConfig.java b/core/trino-main/src/test/java/io/trino/execution/TestNodeSchedulerConfig.java
index ad718fef56b4..ffcb3abead06 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestNodeSchedulerConfig.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestNodeSchedulerConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
 import io.trino.execution.scheduler.NodeSchedulerConfig;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -35,15 +35,14 @@ public void testDefaults()
         assertRecordedDefaults(recordDefaults(NodeSchedulerConfig.class)
                 .setNodeSchedulerPolicy(UNIFORM.name())
                 .setMinCandidates(10)
-                .setMaxSplitsPerNode(100)
-                .setMinPendingSplitsPerTask(10)
+                .setMaxSplitsPerNode(256)
+                .setMinPendingSplitsPerTask(16)
                 .setMaxAdjustedPendingSplitsWeightPerTask(2000)
                 .setMaxUnacknowledgedSplitsPerTask(2000)
                 .setIncludeCoordinator(true)
                 .setSplitsBalancingPolicy(NodeSchedulerConfig.SplitsBalancingPolicy.STAGE)
                 .setOptimizedLocalScheduling(true)
-                .setAllowedNoMatchingNodePeriod(new Duration(2, MINUTES))
-                .setNodeAllocatorType("bin_packing"));
+                .setAllowedNoMatchingNodePeriod(new Duration(2, MINUTES)));
     }
 
     @Test
@@ -60,7 +59,6 @@ public void testExplicitPropertyMappings()
                 .put("node-scheduler.splits-balancing-policy", "node")
                 .put("node-scheduler.optimized-local-scheduling", "false")
                 .put("node-scheduler.allowed-no-matching-node-period", "1m")
-                .put("node-scheduler.allocator-type", "fixed_count")
                 .buildOrThrow();
 
         NodeSchedulerConfig expected = new NodeSchedulerConfig()
@@ -73,8 +71,7 @@ public void testExplicitPropertyMappings()
                 .setMinCandidates(11)
                 .setSplitsBalancingPolicy(NODE)
                 .setOptimizedLocalScheduling(false)
-                .setAllowedNoMatchingNodePeriod(new Duration(1, MINUTES))
-                .setNodeAllocatorType("fixed_count");
+                .setAllowedNoMatchingNodePeriod(new Duration(1, MINUTES));
 
         assertFullMapping(properties, expected);
     }
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestPageSplitterUtil.java b/core/trino-main/src/test/java/io/trino/execution/TestPageSplitterUtil.java
index 873eeec05600..b20beb08c69e 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestPageSplitterUtil.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestPageSplitterUtil.java
@@ -17,11 +17,11 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.type.Type;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -82,8 +82,8 @@ public void testSplitPageNonDecreasingPageSize()
         List<Type> types = ImmutableList.of(VARCHAR);
 
         Slice expectedValue = wrappedBuffer("test".getBytes(UTF_8));
-        BlockBuilder blockBuilder = VARCHAR.createBlockBuilder(null, 1, expectedValue.length());
-        blockBuilder.writeBytes(expectedValue, 0, expectedValue.length()).closeEntry();
+        VariableWidthBlockBuilder blockBuilder = VARCHAR.createBlockBuilder(null, 1, expectedValue.length());
+        blockBuilder.writeEntry(expectedValue);
         Block rleBlock = RunLengthEncodedBlock.create(blockBuilder.build(), positionCount);
         Page initialPage = new Page(rleBlock);
         List<Page> pages = splitPage(initialPage, maxPageSizeInBytes);
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestParameterExtractor.java b/core/trino-main/src/test/java/io/trino/execution/TestParameterExtractor.java
index 70cdc9711625..6964f346e44f 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestParameterExtractor.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestParameterExtractor.java
@@ -13,12 +13,11 @@
  */
 package io.trino.execution;
 
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.NodeLocation;
 import io.trino.sql.tree.Parameter;
 import io.trino.sql.tree.Statement;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -29,7 +28,7 @@ public class TestParameterExtractor
     @Test
     public void testNoParameter()
     {
-        Statement statement = sqlParser.createStatement("SELECT c1, c2 FROM test_table WHERE c1 = 1 AND c2 > 2", new ParsingOptions());
+        Statement statement = sqlParser.createStatement("SELECT c1, c2 FROM test_table WHERE c1 = 1 AND c2 > 2");
         assertThat(ParameterExtractor.extractParameters(statement)).isEmpty();
         assertThat(ParameterExtractor.getParameterCount(statement)).isEqualTo(0);
     }
@@ -37,7 +36,7 @@ public void testNoParameter()
     @Test
     public void testParameterCount()
     {
-        Statement statement = sqlParser.createStatement("SELECT c1, c2 FROM test_table WHERE c1 = ? AND c2 > ?", new ParsingOptions());
+        Statement statement = sqlParser.createStatement("SELECT c1, c2 FROM test_table WHERE c1 = ? AND c2 > ?");
         assertThat(ParameterExtractor.extractParameters(statement))
                 .containsExactly(
                         new Parameter(new NodeLocation(1, 41), 0),
@@ -48,7 +47,7 @@ public void testParameterCount()
     @Test
     public void testShowStats()
     {
-        Statement statement = sqlParser.createStatement("SHOW STATS FOR (SELECT c1, c2 FROM test_table WHERE c1 = ? AND c2 > ?)", new ParsingOptions());
+        Statement statement = sqlParser.createStatement("SHOW STATS FOR (SELECT c1, c2 FROM test_table WHERE c1 = ? AND c2 > ?)");
         assertThat(ParameterExtractor.extractParameters(statement))
                 .containsExactly(
                         new Parameter(new NodeLocation(1, 57), 0),
@@ -59,7 +58,7 @@ public void testShowStats()
     @Test
     public void testLambda()
     {
-        Statement statement = sqlParser.createStatement("SELECT * FROM test_table WHERE any_match(items, x -> x > ?)", new ParsingOptions());
+        Statement statement = sqlParser.createStatement("SELECT * FROM test_table WHERE any_match(items, x -> x > ?)");
         assertThat(ParameterExtractor.extractParameters(statement))
                 .containsExactly(new Parameter(new NodeLocation(1, 58), 0));
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestPlannerWarnings.java b/core/trino-main/src/test/java/io/trino/execution/TestPlannerWarnings.java
index 37303e630b6e..1cccdef2d1aa 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestPlannerWarnings.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestPlannerWarnings.java
@@ -27,7 +27,6 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.TrinoWarning;
 import io.trino.spi.WarningCode;
-import io.trino.sql.planner.Plan;
 import io.trino.sql.planner.RuleStatsRecorder;
 import io.trino.sql.planner.iterative.IterativeOptimizer;
 import io.trino.sql.planner.iterative.Rule;
@@ -35,9 +34,10 @@
 import io.trino.sql.planner.plan.ProjectNode;
 import io.trino.testing.LocalQueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Map;
@@ -53,13 +53,15 @@
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.IntStream.range;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.fail;
 
+@TestInstance(PER_CLASS)
 public class TestPlannerWarnings
 {
     private LocalQueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         queryRunner = LocalQueryRunner.create(testSessionBuilder()
@@ -73,7 +75,7 @@ public void setUp()
                 ImmutableMap.of());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
@@ -100,12 +102,20 @@ public static void assertPlannerWarnings(LocalQueryRunner queryRunner, @Language
         PlanOptimizersStatsCollector planOptimizersStatsCollector = new PlanOptimizersStatsCollector(5);
         try {
             queryRunner.inTransaction(sessionBuilder.build(), transactionSession -> {
+                List<PlanOptimizer> planOptimizers;
                 if (rules.isPresent()) {
-                    createPlan(queryRunner, transactionSession, sql, warningCollector, planOptimizersStatsCollector, rules.get());
+                    // Warnings from testing rules will be added
+                    planOptimizers = ImmutableList.of(new IterativeOptimizer(
+                            queryRunner.getPlannerContext(),
+                            new RuleStatsRecorder(),
+                            queryRunner.getStatsCalculator(),
+                            queryRunner.getCostCalculator(),
+                            ImmutableSet.copyOf(rules.get())));
                 }
                 else {
-                    queryRunner.createPlan(transactionSession, sql, OPTIMIZED, false, warningCollector, planOptimizersStatsCollector);
+                    planOptimizers = queryRunner.getPlanOptimizers(false);
                 }
+                queryRunner.createPlan(transactionSession, sql, planOptimizers, OPTIMIZED, warningCollector, planOptimizersStatsCollector);
                 return null;
             });
         }
@@ -122,19 +132,6 @@ public static void assertPlannerWarnings(LocalQueryRunner queryRunner, @Language
         }
     }
 
-    private static Plan createPlan(LocalQueryRunner queryRunner, Session session, String sql, WarningCollector warningCollector, PlanOptimizersStatsCollector planOptimizersStatsCollector, List<Rule<?>> rules)
-    {
-        // Warnings from testing rules will be added
-        PlanOptimizer optimizer = new IterativeOptimizer(
-                queryRunner.getPlannerContext(),
-                new RuleStatsRecorder(),
-                queryRunner.getStatsCalculator(),
-                queryRunner.getCostCalculator(),
-                ImmutableSet.copyOf(rules));
-
-        return queryRunner.createPlan(session, sql, ImmutableList.of(optimizer), OPTIMIZED, warningCollector, planOptimizersStatsCollector);
-    }
-
     public static List<TrinoWarning> createTestWarnings(int numberOfWarnings)
     {
         checkArgument(numberOfWarnings > 0, "numberOfWarnings must be > 0");
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestPrepareTask.java b/core/trino-main/src/test/java/io/trino/execution/TestPrepareTask.java
index bb90e4f4ff30..19a31d93a484 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestPrepareTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestPrepareTask.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.collect.ImmutableMap;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.Session;
 import io.trino.client.NodeVersion;
 import io.trino.execution.warnings.WarningCollector;
@@ -31,8 +32,9 @@
 import io.trino.sql.tree.Query;
 import io.trino.sql.tree.Statement;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.List;
@@ -50,19 +52,22 @@
 import static io.trino.sql.QueryUtil.simpleQuery;
 import static io.trino.sql.QueryUtil.table;
 import static io.trino.testing.TestingEventListenerManager.emptyEventListenerManager;
+import static io.trino.testing.TestingSession.testSession;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static io.trino.transaction.InMemoryTransactionManager.createTestTransactionManager;
 import static java.util.Collections.emptyList;
 import static java.util.concurrent.Executors.newCachedThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestPrepareTask
 {
     private final Metadata metadata = createTestMetadataManager();
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
@@ -104,13 +109,13 @@ public void testPrepareInvalidStatement()
     private Map<String, String> executePrepare(String statementName, Statement statement, String sqlString, Session session)
     {
         TransactionManager transactionManager = createTestTransactionManager();
-        AccessControlManager accessControl = new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), DefaultSystemAccessControl.NAME);
+        AccessControlManager accessControl = new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), OpenTelemetry.noop(), DefaultSystemAccessControl.NAME);
         accessControl.setSystemAccessControls(List.of(AllowAllSystemAccessControl.INSTANCE));
         QueryStateMachine stateMachine = QueryStateMachine.begin(
                 Optional.empty(),
                 sqlString,
                 Optional.empty(),
-                session,
+                testSession(session),
                 URI.create("fake://uri"),
                 new ResourceGroupId("test"),
                 false,
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestQueryIdGenerator.java b/core/trino-main/src/test/java/io/trino/execution/TestQueryIdGenerator.java
index 695ed161bc57..473a41bef3b5 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestQueryIdGenerator.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestQueryIdGenerator.java
@@ -14,7 +14,7 @@
 package io.trino.execution;
 
 import io.trino.spi.QueryId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestQueryInfo.java b/core/trino-main/src/test/java/io/trino/execution/TestQueryInfo.java
index 20ccfa17e1ee..d55420bafa5f 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestQueryInfo.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestQueryInfo.java
@@ -17,20 +17,31 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.json.JsonCodec;
+import io.airlift.json.JsonCodecFactory;
+import io.airlift.json.ObjectMapperProvider;
+import io.airlift.tracing.SpanSerialization.SpanDeserializer;
+import io.airlift.tracing.SpanSerialization.SpanSerializer;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Span;
 import io.trino.client.NodeVersion;
 import io.trino.operator.RetryPolicy;
 import io.trino.spi.QueryId;
 import io.trino.spi.TrinoWarning;
 import io.trino.spi.WarningCode;
+import io.trino.spi.connector.CatalogHandle.CatalogVersion;
 import io.trino.spi.resourcegroups.QueryType;
 import io.trino.spi.resourcegroups.ResourceGroupId;
 import io.trino.spi.security.SelectedRole;
+import io.trino.spi.type.TypeSignature;
 import io.trino.sql.planner.plan.PlanFragmentId;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.transaction.TransactionId;
-import org.testng.annotations.Test;
+import io.trino.type.TypeSignatureDeserializer;
+import io.trino.type.TypeSignatureKeyDeserializer;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
+import java.util.Map;
 import java.util.Optional;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
@@ -42,7 +53,17 @@ public class TestQueryInfo
     @Test
     public void testQueryInfoRoundTrip()
     {
-        JsonCodec<QueryInfo> codec = JsonCodec.jsonCodec(QueryInfo.class);
+        JsonCodec<QueryInfo> codec = new JsonCodecFactory(
+                new ObjectMapperProvider()
+                        .withJsonSerializers(Map.of(
+                                Span.class, new SpanSerializer(OpenTelemetry.noop())))
+                        .withJsonDeserializers(Map.of(
+                                Span.class, new SpanDeserializer(OpenTelemetry.noop()),
+                                TypeSignature.class, new TypeSignatureDeserializer()))
+                        .withKeyDeserializers(Map.of(
+                                TypeSignature.class, new TypeSignatureKeyDeserializer())))
+                .jsonCodec(QueryInfo.class);
+
         QueryInfo expected = createQueryInfo();
         QueryInfo actual = codec.fromJson(codec.toJsonBytes(expected));
 
@@ -50,6 +71,8 @@ public void testQueryInfoRoundTrip()
         // Note: SessionRepresentation.equals?
         assertEquals(actual.getState(), expected.getState());
         assertEquals(actual.isScheduled(), expected.isScheduled());
+        assertEquals(actual.getProgressPercentage(), expected.getProgressPercentage());
+        assertEquals(actual.getRunningPercentage(), expected.getRunningPercentage());
 
         assertEquals(actual.getSelf(), expected.getSelf());
         assertEquals(actual.getFieldNames(), expected.getFieldNames());
@@ -104,6 +127,8 @@ private static QueryInfo createQueryInfo()
                 Optional.of("set_catalog"),
                 Optional.of("set_schema"),
                 Optional.of("set_path"),
+                Optional.of("set_authorization_user"),
+                false,
                 ImmutableMap.of("set_property", "set_value"),
                 ImmutableSet.of("reset_property"),
                 ImmutableMap.of("set_roles", new SelectedRole(SelectedRole.Type.ROLE, Optional.of("role"))),
@@ -116,7 +141,7 @@ private static QueryInfo createQueryInfo()
                 null,
                 null,
                 ImmutableList.of(new TrinoWarning(new WarningCode(1, "name"), "message")),
-                ImmutableSet.of(new Input("catalog", "schema", "talble", Optional.empty(), ImmutableList.of(new Column("name", "type")), new PlanFragmentId("id"), new PlanNodeId("1"))),
+                ImmutableSet.of(new Input("catalog", new CatalogVersion("default"), "schema", "talble", Optional.empty(), ImmutableList.of(new Column("name", "type")), new PlanFragmentId("id"), new PlanNodeId("1"))),
                 Optional.empty(),
                 ImmutableList.of(),
                 ImmutableList.of(),
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java b/core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java
index 382b0bda6fd1..b0958cb8db6c 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java
@@ -17,7 +17,7 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.operator.RetryPolicy;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -28,6 +28,7 @@
 import static io.airlift.units.DataSize.Unit.KILOBYTE;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.execution.QueryManagerConfig.AVAILABLE_HEAP_MEMORY;
+import static io.trino.execution.QueryManagerConfig.FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.MINUTES;
@@ -49,12 +50,13 @@ public void testDefaults()
                 .setMinScheduleSplitBatchSize(100)
                 .setMaxConcurrentQueries(1000)
                 .setMaxQueuedQueries(5000)
+                .setDeterminePartitionCountForWriteEnabled(false)
                 .setMaxHashPartitionCount(100)
                 .setMinHashPartitionCount(4)
+                .setMinHashPartitionCountForWrite(50)
                 .setQueryManagerExecutorPoolSize(5)
                 .setQueryExecutorPoolSize(1000)
                 .setMaxStateMachineCallbackThreads(5)
-                .setRemoteTaskMinErrorDuration(new Duration(5, MINUTES))
                 .setRemoteTaskMaxErrorDuration(new Duration(5, MINUTES))
                 .setRemoteTaskMaxCallbackThreads(1000)
                 .setQueryExecutionPolicy("phased")
@@ -79,21 +81,33 @@ public void testDefaults()
                 .setRemoteTaskRequestSizeHeadroom(DataSize.of(2, DataSize.Unit.MEGABYTE))
                 .setRemoteTaskGuaranteedSplitPerTask(3)
                 .setFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthPeriod(64)
-                .setFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthFactor(1.2)
+                .setFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthFactor(1.26)
                 .setFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeMin(DataSize.of(512, MEGABYTE))
                 .setFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeMax(DataSize.of(50, GIGABYTE))
                 .setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthPeriod(64)
-                .setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthFactor(1.2)
+                .setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthFactor(1.26)
                 .setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeMin(DataSize.of(4, GIGABYTE))
                 .setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeMax(DataSize.of(50, GIGABYTE))
                 .setFaultTolerantExecutionHashDistributionComputeTaskTargetSize(DataSize.of(512, MEGABYTE))
+                .setFaultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio(2.0)
                 .setFaultTolerantExecutionHashDistributionWriteTaskTargetSize(DataSize.of(4, GIGABYTE))
+                .setFaultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio(2.0)
                 .setFaultTolerantExecutionHashDistributionWriteTaskTargetMaxCount(2000)
                 .setFaultTolerantExecutionStandardSplitSize(DataSize.of(64, MEGABYTE))
                 .setFaultTolerantExecutionMaxTaskSplitCount(256)
                 .setFaultTolerantExecutionTaskDescriptorStorageMaxMemory(DataSize.ofBytes(Math.round(AVAILABLE_HEAP_MEMORY * 0.15)))
-                .setFaultTolerantExecutionPartitionCount(50)
-                .setFaultTolerantExecutionForcePreferredWritePartitioningEnabled(true)
+                .setFaultTolerantExecutionMaxPartitionCount(50)
+                .setFaultTolerantExecutionMinPartitionCount(4)
+                .setFaultTolerantExecutionMinPartitionCountForWrite(50)
+                .setFaultTolerantExecutionRuntimeAdaptivePartitioningEnabled(false)
+                .setFaultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize(DataSize.of(12, GIGABYTE))
+                .setFaultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount(FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT)
+                .setFaultTolerantExecutionMinSourceStageProgress(0.2)
+                .setFaultTolerantExecutionSmallStageEstimationEnabled(true)
+                .setFaultTolerantExecutionSmallStageEstimationThreshold(DataSize.of(20, GIGABYTE))
+                .setFaultTolerantExecutionSmallStageSourceSizeMultiplier(1.2)
+                .setFaultTolerantExecutionSmallStageRequireNoMorePartitions(false)
+                .setFaultTolerantExecutionStageEstimationForEagerParentEnabled(true)
                 .setMaxWriterTasksCount(100));
     }
 
@@ -111,12 +125,13 @@ public void testExplicitPropertyMappings()
                 .put("query.min-schedule-split-batch-size", "9")
                 .put("query.max-concurrent-queries", "10")
                 .put("query.max-queued-queries", "15")
+                .put("query.determine-partition-count-for-write-enabled", "true")
                 .put("query.max-hash-partition-count", "16")
                 .put("query.min-hash-partition-count", "2")
+                .put("query.min-hash-partition-count-for-write", "88")
                 .put("query.manager-executor-pool-size", "11")
                 .put("query.executor-pool-size", "111")
                 .put("query.max-state-machine-callback-threads", "112")
-                .put("query.remote-task.min-error-duration", "30s")
                 .put("query.remote-task.max-error-duration", "60s")
                 .put("query.remote-task.max-callback-threads", "10")
                 .put("query.execution-policy", "foo-bar-execution-policy")
@@ -149,14 +164,26 @@ public void testExplicitPropertyMappings()
                 .put("fault-tolerant-execution-arbitrary-distribution-write-task-target-size-min", "6GB")
                 .put("fault-tolerant-execution-arbitrary-distribution-write-task-target-size-max", "10GB")
                 .put("fault-tolerant-execution-hash-distribution-compute-task-target-size", "1GB")
+                .put("fault-tolerant-execution-hash-distribution-compute-task-to-node-min-ratio", "1.1")
                 .put("fault-tolerant-execution-hash-distribution-write-task-target-size", "7GB")
+                .put("fault-tolerant-execution-hash-distribution-write-task-to-node-min-ratio", "1.2")
                 .put("fault-tolerant-execution-hash-distribution-write-task-target-max-count", "5000")
                 .put("fault-tolerant-execution-standard-split-size", "33MB")
                 .put("fault-tolerant-execution-max-task-split-count", "22")
                 .put("fault-tolerant-execution-task-descriptor-storage-max-memory", "3GB")
-                .put("fault-tolerant-execution-partition-count", "123")
-                .put("experimental.fault-tolerant-execution-force-preferred-write-partitioning-enabled", "false")
+                .put("fault-tolerant-execution-max-partition-count", "123")
+                .put("fault-tolerant-execution-min-partition-count", "12")
+                .put("fault-tolerant-execution-min-partition-count-for-write", "99")
+                .put("fault-tolerant-execution-runtime-adaptive-partitioning-enabled", "true")
+                .put("fault-tolerant-execution-runtime-adaptive-partitioning-partition-count", "888")
+                .put("fault-tolerant-execution-runtime-adaptive-partitioning-max-task-size", "18GB")
+                .put("fault-tolerant-execution-min-source-stage-progress", "0.3")
                 .put("query.max-writer-task-count", "101")
+                .put("fault-tolerant-execution-small-stage-estimation-enabled", "false")
+                .put("fault-tolerant-execution-small-stage-estimation-threshold", "6GB")
+                .put("fault-tolerant-execution-small-stage-source-size-multiplier", "1.6")
+                .put("fault-tolerant-execution-small-stage-require-no-more-partitions", "true")
+                .put("fault-tolerant-execution-stage-estimation-for-eager-parent-enabled", "false")
                 .buildOrThrow();
 
         QueryManagerConfig expected = new QueryManagerConfig()
@@ -170,12 +197,13 @@ public void testExplicitPropertyMappings()
                 .setMinScheduleSplitBatchSize(9)
                 .setMaxConcurrentQueries(10)
                 .setMaxQueuedQueries(15)
+                .setDeterminePartitionCountForWriteEnabled(true)
                 .setMaxHashPartitionCount(16)
                 .setMinHashPartitionCount(2)
+                .setMinHashPartitionCountForWrite(88)
                 .setQueryManagerExecutorPoolSize(11)
                 .setQueryExecutorPoolSize(111)
                 .setMaxStateMachineCallbackThreads(112)
-                .setRemoteTaskMinErrorDuration(new Duration(60, SECONDS))
                 .setRemoteTaskMaxErrorDuration(new Duration(60, SECONDS))
                 .setRemoteTaskMaxCallbackThreads(10)
                 .setQueryExecutionPolicy("foo-bar-execution-policy")
@@ -208,13 +236,25 @@ public void testExplicitPropertyMappings()
                 .setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeMin(DataSize.of(6, GIGABYTE))
                 .setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeMax(DataSize.of(10, GIGABYTE))
                 .setFaultTolerantExecutionHashDistributionComputeTaskTargetSize(DataSize.of(1, GIGABYTE))
+                .setFaultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio(1.1)
                 .setFaultTolerantExecutionHashDistributionWriteTaskTargetSize(DataSize.of(7, GIGABYTE))
+                .setFaultTolerantExecutionHashDistributionWriteTasksToNodesMinRatio(1.2)
                 .setFaultTolerantExecutionHashDistributionWriteTaskTargetMaxCount(5000)
                 .setFaultTolerantExecutionStandardSplitSize(DataSize.of(33, MEGABYTE))
                 .setFaultTolerantExecutionMaxTaskSplitCount(22)
                 .setFaultTolerantExecutionTaskDescriptorStorageMaxMemory(DataSize.of(3, GIGABYTE))
-                .setFaultTolerantExecutionPartitionCount(123)
-                .setFaultTolerantExecutionForcePreferredWritePartitioningEnabled(false)
+                .setFaultTolerantExecutionMaxPartitionCount(123)
+                .setFaultTolerantExecutionMinPartitionCount(12)
+                .setFaultTolerantExecutionMinPartitionCountForWrite(99)
+                .setFaultTolerantExecutionRuntimeAdaptivePartitioningEnabled(true)
+                .setFaultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount(888)
+                .setFaultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize(DataSize.of(18, GIGABYTE))
+                .setFaultTolerantExecutionMinSourceStageProgress(0.3)
+                .setFaultTolerantExecutionSmallStageEstimationEnabled(false)
+                .setFaultTolerantExecutionSmallStageEstimationThreshold(DataSize.of(6, GIGABYTE))
+                .setFaultTolerantExecutionSmallStageSourceSizeMultiplier(1.6)
+                .setFaultTolerantExecutionSmallStageRequireNoMorePartitions(true)
+                .setFaultTolerantExecutionStageEstimationForEagerParentEnabled(false)
                 .setMaxWriterTasksCount(101);
 
         assertFullMapping(properties, expected);
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestQueryPreparer.java b/core/trino-main/src/test/java/io/trino/execution/TestQueryPreparer.java
index 0aed66424341..e7fac59e069c 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestQueryPreparer.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestQueryPreparer.java
@@ -15,10 +15,11 @@
 
 import io.trino.Session;
 import io.trino.execution.QueryPreparer.PreparedQuery;
+import io.trino.sql.parser.ParsingException;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.AllColumns;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.StandardErrorCode.INVALID_PARAMETER_USAGE;
@@ -28,6 +29,7 @@
 import static io.trino.sql.QueryUtil.table;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestQueryPreparer
@@ -54,6 +56,14 @@ public void testExecuteStatement()
                 simpleQuery(selectList(new AllColumns()), table(QualifiedName.of("foo"))));
     }
 
+    @Test
+    public void testExecuteImmediateStatement()
+    {
+        PreparedQuery preparedQuery = QUERY_PREPARER.prepareQuery(TEST_SESSION, "EXECUTE IMMEDIATE 'SELECT * FROM foo'");
+        assertEquals(preparedQuery.getStatement(),
+                simpleQuery(selectList(new AllColumns()), table(QualifiedName.of("foo"))));
+    }
+
     @Test
     public void testExecuteStatementDoesNotExist()
     {
@@ -61,6 +71,22 @@ public void testExecuteStatementDoesNotExist()
                 .hasErrorCode(NOT_FOUND);
     }
 
+    @Test
+    public void testExecuteImmediateInvalidStatement()
+    {
+        assertThatThrownBy(() -> QUERY_PREPARER.prepareQuery(TEST_SESSION, "EXECUTE IMMEDIATE 'SELECT FROM'"))
+                .isInstanceOf(ParsingException.class)
+                .hasMessageMatching("line 1:27: mismatched input 'FROM'. Expecting: .*");
+    }
+
+    @Test
+    public void testExecuteImmediateInvalidMultilineStatement()
+    {
+        assertThatThrownBy(() -> QUERY_PREPARER.prepareQuery(TEST_SESSION, "EXECUTE\nIMMEDIATE 'SELECT\n FROM'"))
+                .isInstanceOf(ParsingException.class)
+                .hasMessageMatching("line 3:2: mismatched input 'FROM'. Expecting: .*");
+    }
+
     @Test
     public void testTooManyParameters()
     {
@@ -69,6 +95,8 @@ public void testTooManyParameters()
                 .build();
         assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(session, "EXECUTE my_query USING 1,2"))
                 .hasErrorCode(INVALID_PARAMETER_USAGE);
+        assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(TEST_SESSION, "EXECUTE IMMEDIATE 'SELECT * FROM foo where col1 = ?' USING 1,2"))
+                .hasErrorCode(INVALID_PARAMETER_USAGE);
     }
 
     @Test
@@ -79,6 +107,8 @@ public void testTooFewParameters()
                 .build();
         assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(session, "EXECUTE my_query USING 1"))
                 .hasErrorCode(INVALID_PARAMETER_USAGE);
+        assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(TEST_SESSION, "EXECUTE IMMEDIATE 'SELECT ? FROM foo where col1 = ?' USING 1"))
+                .hasErrorCode(INVALID_PARAMETER_USAGE);
     }
 
     @Test
@@ -89,8 +119,13 @@ public void testParameterMismatchWithOffset()
                 .build();
         assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(session, "EXECUTE my_query USING 1"))
                 .hasErrorCode(INVALID_PARAMETER_USAGE);
+        assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(TEST_SESSION, "EXECUTE IMMEDIATE 'SELECT ? FROM foo OFFSET ? ROWS' USING 1"))
+                .hasErrorCode(INVALID_PARAMETER_USAGE);
+
         assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(session, "EXECUTE my_query USING 1, 2, 3, 4, 5, 6"))
                 .hasErrorCode(INVALID_PARAMETER_USAGE);
+        assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(TEST_SESSION, "EXECUTE IMMEDIATE 'SELECT ? FROM foo OFFSET ? ROWS' USING 1, 2, 3, 4, 5, 6"))
+                .hasErrorCode(INVALID_PARAMETER_USAGE);
     }
 
     @Test
@@ -101,8 +136,13 @@ public void testParameterMismatchWithLimit()
                 .build();
         assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(session, "EXECUTE my_query USING 1"))
                 .hasErrorCode(INVALID_PARAMETER_USAGE);
+        assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(TEST_SESSION, "EXECUTE IMMEDIATE 'SELECT ? FROM foo LIMIT ?' USING 1"))
+                .hasErrorCode(INVALID_PARAMETER_USAGE);
+
         assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(session, "EXECUTE my_query USING 1, 2, 3, 4, 5, 6"))
                 .hasErrorCode(INVALID_PARAMETER_USAGE);
+        assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(TEST_SESSION, "EXECUTE IMMEDIATE 'SELECT ? FROM foo LIMIT ?' USING 1, 2, 3, 4, 5, 6"))
+                .hasErrorCode(INVALID_PARAMETER_USAGE);
     }
 
     @Test
@@ -111,9 +151,15 @@ public void testParameterMismatchWithFetchFirst()
         Session session = testSessionBuilder()
                 .addPreparedStatement("my_query", "SELECT ? FROM foo FETCH FIRST ? ROWS ONLY")
                 .build();
+
         assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(session, "EXECUTE my_query USING 1"))
                 .hasErrorCode(INVALID_PARAMETER_USAGE);
+        assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(TEST_SESSION, "EXECUTE IMMEDIATE 'SELECT ? FROM foo FETCH FIRST ? ROWS ONLY' USING 1"))
+                .hasErrorCode(INVALID_PARAMETER_USAGE);
+
         assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(session, "EXECUTE my_query USING 1, 2, 3, 4, 5, 6"))
                 .hasErrorCode(INVALID_PARAMETER_USAGE);
+        assertTrinoExceptionThrownBy(() -> QUERY_PREPARER.prepareQuery(TEST_SESSION, "EXECUTE IMMEDIATE 'SELECT ? FROM foo FETCH FIRST ? ROWS ONLY' USING 1, 2, 3, 4, 5, 6"))
+                .hasErrorCode(INVALID_PARAMETER_USAGE);
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestQueryStateMachine.java b/core/trino-main/src/test/java/io/trino/execution/TestQueryStateMachine.java
index fed51fac459f..d4ef655915a5 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestQueryStateMachine.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestQueryStateMachine.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.testing.TestingTicker;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.Session;
 import io.trino.client.FailureInfo;
 import io.trino.client.NodeVersion;
@@ -28,6 +29,7 @@
 import io.trino.security.AccessControlConfig;
 import io.trino.security.AccessControlManager;
 import io.trino.spi.TrinoException;
+import io.trino.spi.connector.CatalogHandle.CatalogVersion;
 import io.trino.spi.resourcegroups.QueryType;
 import io.trino.spi.resourcegroups.ResourceGroupId;
 import io.trino.spi.type.Type;
@@ -35,8 +37,9 @@
 import io.trino.sql.planner.plan.PlanFragmentId;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.net.URI;
@@ -70,19 +73,21 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestQueryStateMachine
 {
     private static final String QUERY = "sql";
     private static final URI LOCATION = URI.create("fake://fake-query");
-    private static final SQLException FAILED_CAUSE = new SQLException("FAILED");
     private static final List<Input> INPUTS = ImmutableList.of(new Input(
             "connector",
+            new CatalogVersion("default"),
             "schema",
             "table",
             Optional.empty(),
@@ -102,7 +107,7 @@ public class TestQueryStateMachine
 
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "=%s"));
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
@@ -179,7 +184,7 @@ public void testQueued()
             tryGetFutureValue(stateMachine.getStateChange(FINISHING), 2, SECONDS);
         });
 
-        assertAllTimeSpentInQueueing(FAILED, stateMachine -> stateMachine.transitionToFailed(FAILED_CAUSE));
+        assertAllTimeSpentInQueueing(FAILED, stateMachine -> stateMachine.transitionToFailed(newFailedCause()));
     }
 
     private void assertAllTimeSpentInQueueing(QueryState expectedState, Consumer<QueryStateMachine> stateTransition)
@@ -230,8 +235,8 @@ public void testPlanning()
 
         stateMachine = createQueryStateMachine();
         stateMachine.transitionToPlanning();
-        assertTrue(stateMachine.transitionToFailed(FAILED_CAUSE));
-        assertState(stateMachine, FAILED, FAILED_CAUSE);
+        assertTrue(stateMachine.transitionToFailed(newFailedCause()));
+        assertState(stateMachine, FAILED, newFailedCause());
     }
 
     @Test
@@ -262,8 +267,8 @@ public void testStarting()
 
         stateMachine = createQueryStateMachine();
         stateMachine.transitionToStarting();
-        assertTrue(stateMachine.transitionToFailed(FAILED_CAUSE));
-        assertState(stateMachine, FAILED, FAILED_CAUSE);
+        assertTrue(stateMachine.transitionToFailed(newFailedCause()));
+        assertState(stateMachine, FAILED, newFailedCause());
     }
 
     @Test
@@ -292,8 +297,8 @@ public void testRunning()
 
         stateMachine = createQueryStateMachine();
         stateMachine.transitionToRunning();
-        assertTrue(stateMachine.transitionToFailed(FAILED_CAUSE));
-        assertState(stateMachine, FAILED, FAILED_CAUSE);
+        assertTrue(stateMachine.transitionToFailed(newFailedCause()));
+        assertState(stateMachine, FAILED, newFailedCause());
     }
 
     @Test
@@ -311,8 +316,8 @@ public void testFinished()
     public void testFailed()
     {
         QueryStateMachine stateMachine = createQueryStateMachine();
-        assertTrue(stateMachine.transitionToFailed(FAILED_CAUSE));
-        assertFinalState(stateMachine, FAILED, FAILED_CAUSE);
+        assertTrue(stateMachine.transitionToFailed(newFailedCause()));
+        assertFinalState(stateMachine, FAILED, newFailedCause());
     }
 
     @Test
@@ -431,7 +436,7 @@ private static void assertFinalState(QueryStateMachine stateMachine, QueryState
         assertFalse(stateMachine.transitionToFinishing());
         assertState(stateMachine, expectedState, expectedException);
 
-        assertFalse(stateMachine.transitionToFailed(FAILED_CAUSE));
+        assertFalse(stateMachine.transitionToFailed(newFailedCause()));
         assertState(stateMachine, expectedState, expectedException);
 
         // attempt to fail with another exception, which will fail
@@ -470,6 +475,7 @@ private static void assertState(QueryStateMachine stateMachine, QueryState expec
         assertNotNull(queryStats.getDispatchingTime());
         assertNotNull(queryStats.getExecutionTime());
         assertNotNull(queryStats.getPlanningTime());
+        assertNotNull(queryStats.getPlanningCpuTime());
         assertNotNull(queryStats.getFinishingTime());
 
         assertNotNull(queryStats.getCreateTime());
@@ -520,6 +526,7 @@ private QueryStateMachine createQueryStateMachineWithTicker(Ticker ticker)
                 transactionManager,
                 emptyEventListenerManager(),
                 new AccessControlConfig(),
+                OpenTelemetry.noop(),
                 DefaultSystemAccessControl.NAME);
         accessControl.setSystemAccessControls(List.of(AllowAllSystemAccessControl.INSTANCE));
         QueryStateMachine stateMachine = QueryStateMachine.beginWithTicker(
@@ -566,4 +573,9 @@ private static void assertEqualSessionsWithoutTransactionId(Session actual, Sess
         assertEquals(actual.getSystemProperties(), expected.getSystemProperties());
         assertEquals(actual.getCatalogProperties(), expected.getCatalogProperties());
     }
+
+    private static SQLException newFailedCause()
+    {
+        return new SQLException("FAILED");
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestQueryStats.java b/core/trino-main/src/test/java/io/trino/execution/TestQueryStats.java
index 25894d2905a1..fb0c515a5eaa 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestQueryStats.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestQueryStats.java
@@ -26,10 +26,11 @@
 import io.trino.spi.metrics.Metrics;
 import io.trino.sql.planner.plan.PlanNodeId;
 import org.joda.time.DateTime;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.OptionalDouble;
 
 import static io.airlift.units.DataSize.succinctBytes;
 import static io.trino.server.DynamicFilterService.DynamicFiltersStats;
@@ -187,6 +188,7 @@ public class TestQueryStats
             new Duration(33, NANOSECONDS),
 
             new Duration(100, NANOSECONDS),
+            new Duration(150, NANOSECONDS),
             new Duration(200, NANOSECONDS),
 
             9,
@@ -213,6 +215,8 @@ public class TestQueryStats
             DataSize.ofBytes(27),
 
             true,
+            OptionalDouble.of(8.88),
+            OptionalDouble.of(0),
             new Duration(28, NANOSECONDS),
             new Duration(29, NANOSECONDS),
             new Duration(30, NANOSECONDS),
@@ -297,6 +301,7 @@ public static void assertExpectedQueryStats(QueryStats actual)
         assertEquals(actual.getAnalysisTime(), new Duration(33, NANOSECONDS));
 
         assertEquals(actual.getPlanningTime(), new Duration(100, NANOSECONDS));
+        assertEquals(actual.getPlanningCpuTime(), new Duration(150, NANOSECONDS));
         assertEquals(actual.getFinishingTime(), new Duration(200, NANOSECONDS));
 
         assertEquals(actual.getTotalTasks(), 9);
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestRenameColumnTask.java b/core/trino-main/src/test/java/io/trino/execution/TestRenameColumnTask.java
index 6a485e257fdc..7441dc996980 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestRenameColumnTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestRenameColumnTask.java
@@ -21,22 +21,28 @@
 import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorTableMetadata;
+import io.trino.spi.type.RowType;
 import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.NodeLocation;
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.RenameColumn;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
 
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
+import static io.trino.spi.StandardErrorCode.AMBIGUOUS_NAME;
+import static io.trino.spi.StandardErrorCode.COLUMN_ALREADY_EXISTS;
 import static io.trino.spi.StandardErrorCode.COLUMN_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.RowType.rowType;
 import static io.trino.sql.QueryUtil.identifier;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestRenameColumnTask
         extends BaseDataDefinitionTaskTest
 {
@@ -44,12 +50,12 @@ public class TestRenameColumnTask
     public void testRenameColumn()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), FAIL);
         TableHandle table = metadata.getTableHandle(testSession, tableName).get();
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .containsExactly(new ColumnMetadata("a", BIGINT), new ColumnMetadata("b", BIGINT));
 
-        getFutureValue(executeRenameColumn(asQualifiedName(tableName), identifier("a"), identifier("a_renamed"), false, false));
+        getFutureValue(executeRenameColumn(asQualifiedName(tableName), QualifiedName.of("a"), identifier("a_renamed"), false, false));
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .containsExactly(new ColumnMetadata("a_renamed", BIGINT), new ColumnMetadata("b", BIGINT));
     }
@@ -59,7 +65,7 @@ public void testRenameColumnNotExistingTable()
     {
         QualifiedObjectName tableName = qualifiedObjectName("not_existing_table");
 
-        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(tableName), identifier("a"), identifier("a_renamed"), false, false)))
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(tableName), QualifiedName.of("a"), identifier("a_renamed"), false, false)))
                 .hasErrorCode(TABLE_NOT_FOUND)
                 .hasMessageContaining("Table '%s' does not exist", tableName);
     }
@@ -69,7 +75,7 @@ public void testRenameColumnNotExistingTableIfExists()
     {
         QualifiedName tableName = qualifiedName("not_existing_table");
 
-        getFutureValue(executeRenameColumn(tableName, identifier("a"), identifier("a_renamed"), true, false));
+        getFutureValue(executeRenameColumn(tableName, QualifiedName.of("a"), identifier("a_renamed"), true, false));
         // no exception
     }
 
@@ -77,9 +83,9 @@ public void testRenameColumnNotExistingTableIfExists()
     public void testRenameMissingColumn()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), FAIL);
 
-        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(tableName), identifier("missing_column"), identifier("test"), false, false)))
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(tableName), QualifiedName.of("missing_column"), identifier("test"), false, false)))
                 .hasErrorCode(COLUMN_NOT_FOUND)
                 .hasMessageContaining("Column 'missing_column' does not exist");
     }
@@ -88,10 +94,10 @@ public void testRenameMissingColumn()
     public void testRenameColumnIfExists()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), FAIL);
         TableHandle table = metadata.getTableHandle(testSession, tableName).get();
 
-        getFutureValue(executeRenameColumn(asQualifiedName(tableName), identifier("missing_column"), identifier("test"), false, true));
+        getFutureValue(executeRenameColumn(asQualifiedName(tableName), QualifiedName.of("missing_column"), identifier("test"), false, true));
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .containsExactly(new ColumnMetadata("a", BIGINT), new ColumnMetadata("b", BIGINT));
     }
@@ -102,7 +108,7 @@ public void testRenameColumnOnView()
         QualifiedObjectName viewName = qualifiedObjectName("existing_view");
         metadata.createView(testSession, viewName, someView(), false);
 
-        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(viewName), identifier("a"), identifier("a_renamed"), false, false)))
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(viewName), QualifiedName.of("a"), identifier("a_renamed"), false, false)))
                 .hasErrorCode(TABLE_NOT_FOUND)
                 .hasMessageContaining("Table '%s' does not exist", viewName);
     }
@@ -113,12 +119,106 @@ public void testRenameColumnOnMaterializedView()
         QualifiedObjectName materializedViewName = qualifiedObjectName("existing_materialized_view");
         metadata.createMaterializedView(testSession, QualifiedObjectName.valueOf(materializedViewName.toString()), someMaterializedView(), false, false);
 
-        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(materializedViewName), identifier("a"), identifier("a_renamed"), false, false)))
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(materializedViewName), QualifiedName.of("a"), identifier("a_renamed"), false, false)))
+                .hasErrorCode(TABLE_NOT_FOUND)
+                .hasMessageContaining("Table '%s' does not exist", materializedViewName);
+    }
+
+    @Test
+    public void testRenameFieldNotExistingTable()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("not_existing_table");
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(tableName), QualifiedName.of("test"), identifier("x"), false, false)))
+                .hasErrorCode(TABLE_NOT_FOUND)
+                .hasMessageContaining("Table '%s' does not exist", tableName);
+    }
+
+    @Test
+    public void testRenameFieldNotExistingTableIfExists()
+    {
+        QualifiedName tableName = qualifiedName("not_existing_table");
+
+        getFutureValue(executeRenameColumn(tableName, QualifiedName.of("test"), identifier("x"), true, false));
+        // no exception
+    }
+
+    @Test
+    public void testRenameMissingField()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), FAIL);
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(tableName), QualifiedName.of("missing_column"), identifier("x"), false, false)))
+                .hasErrorCode(COLUMN_NOT_FOUND)
+                .hasMessageContaining("Column 'missing_column' does not exist");
+    }
+
+    @Test
+    public void testRenameFieldIfExists()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), FAIL);
+        TableHandle table = metadata.getTableHandle(testSession, tableName).get();
+
+        getFutureValue(executeRenameColumn(asQualifiedName(tableName), QualifiedName.of("c"), identifier("x"), false, true));
+        assertThat(metadata.getTableMetadata(testSession, table).getColumns())
+                .containsExactly(new ColumnMetadata("a", BIGINT), new ColumnMetadata("b", BIGINT));
+    }
+
+    @Test
+    public void testUnsupportedRenameDuplicatedField()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new RowType.Field(Optional.of("a"), BIGINT), new RowType.Field(Optional.of("a"), BIGINT)), FAIL);
+        TableHandle table = metadata.getTableHandle(testSession, tableName).get();
+        assertThat(metadata.getTableMetadata(testSession, table).getColumns())
+                .isEqualTo(ImmutableList.of(new ColumnMetadata("col", RowType.rowType(
+                        new RowType.Field(Optional.of("a"), BIGINT), new RowType.Field(Optional.of("a"), BIGINT)))));
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(tableName), QualifiedName.of("col", "a"), identifier("x"), false, false)))
+                .hasErrorCode(AMBIGUOUS_NAME)
+                .hasMessageContaining("Field path [col, a] within row(a bigint, a bigint) is ambiguous");
+    }
+
+    @Test
+    public void testUnsupportedRenameToExistingField()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new RowType.Field(Optional.of("a"), BIGINT), new RowType.Field(Optional.of("b"), BIGINT)), FAIL);
+        TableHandle table = metadata.getTableHandle(testSession, tableName).get();
+        assertThat(metadata.getTableMetadata(testSession, table).getColumns())
+                .isEqualTo(ImmutableList.of(new ColumnMetadata("col", RowType.rowType(
+                        new RowType.Field(Optional.of("a"), BIGINT), new RowType.Field(Optional.of("b"), BIGINT)))));
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(tableName), QualifiedName.of("col", "a"), identifier("b"), false, false)))
+                .hasErrorCode(COLUMN_ALREADY_EXISTS)
+                .hasMessageContaining("Field 'b' already exists");
+    }
+
+    @Test
+    public void testRenameFieldOnView()
+    {
+        QualifiedObjectName viewName = qualifiedObjectName("existing_view");
+        metadata.createView(testSession, viewName, someView(), false);
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(viewName), QualifiedName.of("test"), identifier("x"), false, false)))
+                .hasErrorCode(TABLE_NOT_FOUND)
+                .hasMessageContaining("Table '%s' does not exist", viewName);
+    }
+
+    @Test
+    public void testRenameFieldOnMaterializedView()
+    {
+        QualifiedObjectName materializedViewName = qualifiedObjectName("existing_materialized_view");
+        metadata.createMaterializedView(testSession, QualifiedObjectName.valueOf(materializedViewName.toString()), someMaterializedView(), false, false);
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameColumn(asQualifiedName(materializedViewName), QualifiedName.of("test"), identifier("x"), false, false)))
                 .hasErrorCode(TABLE_NOT_FOUND)
                 .hasMessageContaining("Table '%s' does not exist", materializedViewName);
     }
 
-    private ListenableFuture<Void> executeRenameColumn(QualifiedName table, Identifier source, Identifier target, boolean tableExists, boolean columnExists)
+    private ListenableFuture<Void> executeRenameColumn(QualifiedName table, QualifiedName source, Identifier target, boolean tableExists, boolean columnExists)
     {
         return new RenameColumnTask(plannerContext.getMetadata(), new AllowAllAccessControl())
                 .execute(new RenameColumn(new NodeLocation(1, 1), table, source, target, tableExists, columnExists), queryStateMachine, ImmutableList.of(), WarningCollector.NOOP);
@@ -128,4 +228,10 @@ private static ConnectorTableMetadata simpleTable(QualifiedObjectName tableName)
     {
         return new ConnectorTableMetadata(tableName.asSchemaTableName(), ImmutableList.of(new ColumnMetadata("a", BIGINT), new ColumnMetadata("b", BIGINT)));
     }
+
+    private static ConnectorTableMetadata rowTable(QualifiedObjectName tableName, RowType.Field... fields)
+    {
+        return new ConnectorTableMetadata(tableName.asSchemaTableName(), ImmutableList.of(
+                new ColumnMetadata("col", rowType(fields))));
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestRenameMaterializedViewTask.java b/core/trino-main/src/test/java/io/trino/execution/TestRenameMaterializedViewTask.java
index 8309e35c22e2..6189b34633bc 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestRenameMaterializedViewTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestRenameMaterializedViewTask.java
@@ -20,16 +20,16 @@
 import io.trino.security.AllowAllAccessControl;
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.RenameMaterializedView;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.spi.StandardErrorCode.TABLE_ALREADY_EXISTS;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestRenameMaterializedViewTask
         extends BaseDataDefinitionTaskTest
 {
@@ -68,7 +68,7 @@ public void testRenameNotExistingMaterializedViewIfExists()
     public void testRenameMaterializedViewOnTable()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameMaterializedView(asQualifiedName(tableName), qualifiedName("existing_table_new"))))
                 .hasErrorCode(TABLE_NOT_FOUND)
@@ -79,7 +79,7 @@ public void testRenameMaterializedViewOnTable()
     public void testRenameMaterializedViewOnTableIfExists()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameMaterializedView(asQualifiedName(tableName), qualifiedName("existing_table_new"), true)))
                 .hasErrorCode(TABLE_NOT_FOUND)
@@ -92,7 +92,7 @@ public void testRenameMaterializedViewTargetTableExists()
         QualifiedObjectName materializedViewName = qualifiedObjectName("existing_materialized_view");
         metadata.createMaterializedView(testSession, materializedViewName, someMaterializedView(), false, false);
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameMaterializedView(asQualifiedName(materializedViewName), asQualifiedName(tableName))))
                 .hasErrorCode(TABLE_ALREADY_EXISTS)
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestRenameTableTask.java b/core/trino-main/src/test/java/io/trino/execution/TestRenameTableTask.java
index 91eb101978ef..1ab35e7a1239 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestRenameTableTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestRenameTableTask.java
@@ -20,16 +20,16 @@
 import io.trino.security.AllowAllAccessControl;
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.RenameTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestRenameTableTask
         extends BaseDataDefinitionTaskTest
 {
@@ -38,7 +38,7 @@ public void testRenameExistingTable()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
         QualifiedObjectName newTableName = qualifiedObjectName("existing_view_new");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         getFutureValue(executeRenameTable(asQualifiedName(tableName), asQualifiedName(newTableName), false));
         assertThat(metadata.getTableHandle(testSession, tableName)).isEmpty();
@@ -112,7 +112,7 @@ public void testRenameTableOnMaterializedViewIfExists()
     public void testRenameTableTargetViewExists()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
         QualifiedName viewName = qualifiedName("existing_view");
         metadata.createView(testSession, QualifiedObjectName.valueOf(viewName.toString()), someView(), false);
 
@@ -125,7 +125,7 @@ public void testRenameTableTargetViewExists()
     public void testRenameTableTargetMaterializedViewExists()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
         QualifiedObjectName materializedViewName = qualifiedObjectName("existing_materialized_view");
         metadata.createMaterializedView(testSession, materializedViewName, someMaterializedView(), false, false);
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestRenameViewTask.java b/core/trino-main/src/test/java/io/trino/execution/TestRenameViewTask.java
index c7696e0183d5..2bee2d32cbd0 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestRenameViewTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestRenameViewTask.java
@@ -20,17 +20,17 @@
 import io.trino.security.AllowAllAccessControl;
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.RenameView;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
 import static io.trino.spi.StandardErrorCode.TABLE_ALREADY_EXISTS;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestRenameViewTask
         extends BaseDataDefinitionTaskTest
 {
@@ -60,7 +60,7 @@ public void testRenameNotExistingView()
     public void testRenameViewOnTable()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameView(asQualifiedName(tableName), qualifiedName("existing_table_new"))))
                 .hasErrorCode(TABLE_NOT_FOUND)
@@ -84,7 +84,7 @@ public void testRenameViewTargetTableExists()
         QualifiedName viewName = qualifiedName("existing_view");
         metadata.createView(testSession, QualifiedObjectName.valueOf(viewName.toString()), someView(), false);
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeRenameView(viewName, asQualifiedName(tableName))))
                 .hasErrorCode(TABLE_ALREADY_EXISTS)
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestResetSessionTask.java b/core/trino-main/src/test/java/io/trino/execution/TestResetSessionTask.java
index 16dc97e001bf..5d4b87d8a58f 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestResetSessionTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestResetSessionTask.java
@@ -28,9 +28,10 @@
 import io.trino.sql.tree.ResetSession;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.Optional;
@@ -45,8 +46,10 @@
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.util.Collections.emptyList;
 import static java.util.concurrent.Executors.newCachedThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestResetSessionTask
 {
     private static final String CATALOG_NAME = "my_catalog";
@@ -57,7 +60,7 @@ public class TestResetSessionTask
     private Metadata metadata;
     private SessionPropertyManager sessionPropertyManager;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         queryRunner = LocalQueryRunner.builder(TEST_SESSION)
@@ -86,7 +89,7 @@ public void setUp()
         sessionPropertyManager = queryRunner.getSessionPropertyManager();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestResettableRandomizedIterator.java b/core/trino-main/src/test/java/io/trino/execution/TestResettableRandomizedIterator.java
index fc38769dbc3b..c3525dc4c8d1 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestResettableRandomizedIterator.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestResettableRandomizedIterator.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import io.trino.execution.scheduler.ResettableRandomizedIterator;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestRollbackTask.java b/core/trino-main/src/test/java/io/trino/execution/TestRollbackTask.java
index 0b121f18e7c1..0ae43cb1e8a0 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestRollbackTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestRollbackTask.java
@@ -24,8 +24,9 @@
 import io.trino.sql.tree.Rollback;
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.Optional;
@@ -43,16 +44,18 @@
 import static io.trino.transaction.InMemoryTransactionManager.createTestTransactionManager;
 import static java.util.Collections.emptyList;
 import static java.util.concurrent.Executors.newCachedThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestRollbackTask
 {
     private final Metadata metadata = createTestMetadataManager();
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSetColumnTypeTask.java b/core/trino-main/src/test/java/io/trino/execution/TestSetColumnTypeTask.java
index 338effaaf319..8de522663eeb 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestSetColumnTypeTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSetColumnTypeTask.java
@@ -20,24 +20,30 @@
 import io.trino.metadata.TableHandle;
 import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.ConnectorTableMetadata;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.RowType.Field;
 import io.trino.sql.tree.DataType;
-import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.NodeLocation;
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SetColumnType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
 
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
+import static io.trino.spi.StandardErrorCode.AMBIGUOUS_NAME;
 import static io.trino.spi.StandardErrorCode.COLUMN_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RowType.rowType;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestSetColumnTypeTask
         extends BaseDataDefinitionTaskTest
 {
@@ -45,18 +51,18 @@ public class TestSetColumnTypeTask
     public void testSetDataType()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
         TableHandle table = metadata.getTableHandle(testSession, tableName).get();
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .isEqualTo(ImmutableList.of(new ColumnMetadata("test", BIGINT)));
 
         // Change the column type to integer from bigint
-        getFutureValue(executeSetColumnType(asQualifiedName(tableName), new Identifier("test"), toSqlType(INTEGER), false));
+        getFutureValue(executeSetColumnType(asQualifiedName(tableName), QualifiedName.of("test"), toSqlType(INTEGER), false));
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .isEqualTo(ImmutableList.of(new ColumnMetadata("test", INTEGER)));
 
         // Specify the same column type
-        getFutureValue(executeSetColumnType(asQualifiedName(tableName), new Identifier("test"), toSqlType(INTEGER), false));
+        getFutureValue(executeSetColumnType(asQualifiedName(tableName), QualifiedName.of("test"), toSqlType(INTEGER), false));
         assertThat(metadata.getTableMetadata(testSession, table).getColumns())
                 .isEqualTo(ImmutableList.of(new ColumnMetadata("test", INTEGER)));
     }
@@ -66,7 +72,7 @@ public void testSetDataTypeNotExistingTable()
     {
         QualifiedObjectName tableName = qualifiedObjectName("not_existing_table");
 
-        assertTrinoExceptionThrownBy(() -> getFutureValue(executeSetColumnType(asQualifiedName(tableName), new Identifier("test"), toSqlType(INTEGER), false)))
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeSetColumnType(asQualifiedName(tableName), QualifiedName.of("test"), toSqlType(INTEGER), false)))
                 .hasErrorCode(TABLE_NOT_FOUND)
                 .hasMessageContaining("Table '%s' does not exist", tableName);
     }
@@ -76,7 +82,7 @@ public void testSetDataTypeNotExistingTableIfExists()
     {
         QualifiedName tableName = qualifiedName("not_existing_table");
 
-        getFutureValue(executeSetColumnType(tableName, new Identifier("test"), toSqlType(INTEGER), true));
+        getFutureValue(executeSetColumnType(tableName, QualifiedName.of("test"), toSqlType(INTEGER), true));
         // no exception
     }
 
@@ -84,8 +90,8 @@ public void testSetDataTypeNotExistingTableIfExists()
     public void testSetDataTypeNotExistingColumn()
     {
         QualifiedObjectName tableName = qualifiedObjectName("existing_table");
-        Identifier columnName = new Identifier("not_existing_column");
-        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);
+        QualifiedName columnName = QualifiedName.of("not_existing_column");
+        metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL);
 
         assertTrinoExceptionThrownBy(() -> getFutureValue(executeSetColumnType(asQualifiedName(tableName), columnName, toSqlType(INTEGER), false)))
                 .hasErrorCode(COLUMN_NOT_FOUND)
@@ -98,7 +104,7 @@ public void testSetDataTypeOnView()
         QualifiedObjectName viewName = qualifiedObjectName("existing_view");
         metadata.createView(testSession, viewName, someView(), false);
 
-        assertTrinoExceptionThrownBy(() -> getFutureValue(executeSetColumnType(asQualifiedName(viewName), new Identifier("test"), toSqlType(INTEGER), false)))
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeSetColumnType(asQualifiedName(viewName), QualifiedName.of("test"), toSqlType(INTEGER), false)))
                 .hasErrorCode(TABLE_NOT_FOUND)
                 .hasMessageContaining("Table '%s' does not exist, but a view with that name exists.", viewName);
     }
@@ -109,12 +115,55 @@ public void testSetDataTypeOnMaterializedView()
         QualifiedObjectName materializedViewName = qualifiedObjectName("existing_materialized_view");
         metadata.createMaterializedView(testSession, QualifiedObjectName.valueOf(materializedViewName.toString()), someMaterializedView(), false, false);
 
-        assertTrinoExceptionThrownBy(() -> getFutureValue(executeSetColumnType(asQualifiedName(materializedViewName), new Identifier("test"), toSqlType(INTEGER), false)))
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeSetColumnType(asQualifiedName(materializedViewName), QualifiedName.of("test"), toSqlType(INTEGER), false)))
                 .hasErrorCode(TABLE_NOT_FOUND)
                 .hasMessageContaining("Table '%s' does not exist, but a materialized view with that name exists.", materializedViewName);
     }
 
-    private ListenableFuture<Void> executeSetColumnType(QualifiedName table, Identifier column, DataType type, boolean exists)
+    @Test
+    public void testSetFieldDataTypeNotExistingColumn()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new Field(Optional.of("a"), BIGINT)), FAIL);
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeSetColumnType(asQualifiedName(tableName), QualifiedName.of("test", "a"), toSqlType(INTEGER), false)))
+                .hasErrorCode(COLUMN_NOT_FOUND)
+                .hasMessageContaining("Column 'test.a' does not exist");
+    }
+
+    @Test
+    public void testSetFieldDataTypeNotExistingField()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new Field(Optional.of("a"), BIGINT)), FAIL);
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeSetColumnType(asQualifiedName(tableName), QualifiedName.of("col", "b"), toSqlType(INTEGER), false)))
+                .hasErrorCode(COLUMN_NOT_FOUND)
+                .hasMessageContaining("Field 'b' does not exist within row(a bigint)");
+    }
+
+    @Test
+    public void testUnsupportedSetDataTypeDuplicatedField()
+    {
+        QualifiedObjectName tableName = qualifiedObjectName("existing_table");
+        metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new RowType.Field(Optional.of("a"), BIGINT), new RowType.Field(Optional.of("a"), BIGINT)), FAIL);
+        TableHandle table = metadata.getTableHandle(testSession, tableName).get();
+        assertThat(metadata.getTableMetadata(testSession, table).getColumns())
+                .isEqualTo(ImmutableList.of(new ColumnMetadata("col", RowType.rowType(
+                        new RowType.Field(Optional.of("a"), BIGINT), new RowType.Field(Optional.of("a"), BIGINT)))));
+
+        assertTrinoExceptionThrownBy(() -> getFutureValue(executeSetColumnType(asQualifiedName(tableName), QualifiedName.of("col", "a"), toSqlType(INTEGER), false)))
+                .hasErrorCode(AMBIGUOUS_NAME)
+                .hasMessageContaining("Field path [col, a] within row(a bigint, a bigint) is ambiguous");
+    }
+
+    private static ConnectorTableMetadata rowTable(QualifiedObjectName tableName, Field... fields)
+    {
+        return new ConnectorTableMetadata(tableName.asSchemaTableName(), ImmutableList.of(
+                new ColumnMetadata("col", rowType(fields))));
+    }
+
+    private ListenableFuture<Void> executeSetColumnType(QualifiedName table, QualifiedName column, DataType type, boolean exists)
     {
         return new SetColumnTypeTask(metadata, plannerContext.getTypeManager(), new AllowAllAccessControl())
                 .execute(new SetColumnType(new NodeLocation(1, 1), table, column, type, exists), queryStateMachine, ImmutableList.of(), WarningCollector.NOOP);
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSetPathTask.java b/core/trino-main/src/test/java/io/trino/execution/TestSetPathTask.java
index 874e61cecea9..6c3e3b006f35 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestSetPathTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSetPathTask.java
@@ -26,9 +26,10 @@
 import io.trino.sql.tree.PathSpecification;
 import io.trino.sql.tree.SetPath;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.Optional;
@@ -36,15 +37,17 @@
 
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
-import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
 import static io.trino.metadata.MetadataManager.testMetadataManagerBuilder;
+import static io.trino.testing.TestingSession.testSession;
 import static io.trino.transaction.InMemoryTransactionManager.createTestTransactionManager;
 import static java.util.Collections.emptyList;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestSetPathTask
 {
     private TransactionManager transactionManager;
@@ -53,7 +56,7 @@ public class TestSetPathTask
 
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         transactionManager = createTestTransactionManager();
@@ -64,7 +67,7 @@ public void setUp()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
@@ -105,7 +108,7 @@ private QueryStateMachine createQueryStateMachine(String query)
                 Optional.empty(),
                 query,
                 Optional.empty(),
-                TEST_SESSION,
+                testSession(),
                 URI.create("fake://uri"),
                 new ResourceGroupId("test"),
                 false,
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSetPropertiesTask.java b/core/trino-main/src/test/java/io/trino/execution/TestSetPropertiesTask.java
index 382953acfa2f..e351361d8d69 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestSetPropertiesTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSetPropertiesTask.java
@@ -25,12 +25,11 @@
 import io.trino.sql.tree.Property;
 import io.trino.sql.tree.SetProperties;
 import io.trino.sql.tree.StringLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.tree.SetProperties.Type.MATERIALIZED_VIEW;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestSetPropertiesTask
         extends BaseDataDefinitionTaskTest
 {
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSetRoleTask.java b/core/trino-main/src/test/java/io/trino/execution/TestSetRoleTask.java
index bb8ccb4037a4..6359ce4760cc 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestSetRoleTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSetRoleTask.java
@@ -26,14 +26,14 @@
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.security.SelectedRole;
 import io.trino.spi.security.TrinoPrincipal;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.SetRole;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.Map;
@@ -50,8 +50,10 @@
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static java.util.concurrent.Executors.newCachedThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestSetRoleTask
 {
     private static final String CATALOG_NAME = "foo";
@@ -66,7 +68,7 @@ public class TestSetRoleTask
     private ExecutorService executor;
     private SqlParser parser;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         queryRunner = LocalQueryRunner.create(TEST_SESSION);
@@ -87,7 +89,7 @@ public void setUp()
         executor = newCachedThreadPool(daemonThreadsNamed("test-set-role-task-executor-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (queryRunner != null) {
@@ -146,7 +148,7 @@ private void assertSetRole(String statement, Map<String, SelectedRole> expected)
 
     private QueryStateMachine executeSetRole(String statement)
     {
-        SetRole setRole = (SetRole) parser.createStatement(statement, new ParsingOptions());
+        SetRole setRole = (SetRole) parser.createStatement(statement);
         QueryStateMachine stateMachine = QueryStateMachine.begin(
                 Optional.empty(),
                 statement,
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSetSessionAuthorizationTask.java b/core/trino-main/src/test/java/io/trino/execution/TestSetSessionAuthorizationTask.java
new file mode 100644
index 000000000000..6a4bc822b752
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSetSessionAuthorizationTask.java
@@ -0,0 +1,127 @@
+/*
+ * Licensed 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 io.trino.execution;
+
+import io.trino.client.NodeVersion;
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.metadata.Metadata;
+import io.trino.security.AccessControl;
+import io.trino.security.AllowAllAccessControl;
+import io.trino.spi.TrinoException;
+import io.trino.spi.resourcegroups.ResourceGroupId;
+import io.trino.sql.parser.SqlParser;
+import io.trino.sql.tree.SetSessionAuthorization;
+import io.trino.transaction.TransactionId;
+import io.trino.transaction.TransactionManager;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.net.URI;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+
+import static io.airlift.concurrent.Threads.daemonThreadsNamed;
+import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static io.trino.metadata.MetadataManager.testMetadataManagerBuilder;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static io.trino.transaction.InMemoryTransactionManager.createTestTransactionManager;
+import static java.util.Collections.emptyList;
+import static java.util.concurrent.Executors.newCachedThreadPool;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.testng.Assert.assertEquals;
+
+@TestInstance(PER_CLASS)
+public class TestSetSessionAuthorizationTask
+{
+    private TransactionManager transactionManager;
+    private AccessControl accessControl;
+    private Metadata metadata;
+    private SqlParser parser;
+    private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
+
+    @BeforeAll
+    public void setUp()
+    {
+        transactionManager = createTestTransactionManager();
+        accessControl = new AllowAllAccessControl();
+        metadata = testMetadataManagerBuilder()
+                .withTransactionManager(transactionManager)
+                .build();
+        parser = new SqlParser();
+    }
+
+    @AfterAll
+    public void tearDown()
+    {
+        executor.shutdownNow();
+        executor = null;
+        transactionManager = null;
+        accessControl = null;
+        metadata = null;
+    }
+
+    @Test
+    public void testSetSessionAuthorization()
+    {
+        assertSetSessionAuthorization("SET SESSION AUTHORIZATION otheruser", Optional.of("otheruser"));
+        assertSetSessionAuthorization("SET SESSION AUTHORIZATION 'otheruser'", Optional.of("otheruser"));
+        assertSetSessionAuthorization("SET SESSION AUTHORIZATION \"otheruser\"", Optional.of("otheruser"));
+    }
+
+    @Test
+    public void testSetSessionAuthorizationInTransaction()
+    {
+        String query = "SET SESSION AUTHORIZATION user";
+        SetSessionAuthorization statement = (SetSessionAuthorization) parser.createStatement(query);
+        TransactionId transactionId = transactionManager.beginTransaction(false);
+        QueryStateMachine stateMachine = createStateMachine(Optional.of(transactionId), query);
+        assertThatThrownBy(() -> new SetSessionAuthorizationTask(accessControl, transactionManager).execute(statement, stateMachine, emptyList(), WarningCollector.NOOP))
+                .isInstanceOf(TrinoException.class)
+                .hasMessageContaining("Can't set authorization user in the middle of a transaction");
+    }
+
+    private void assertSetSessionAuthorization(String query, Optional<String> expected)
+    {
+        SetSessionAuthorization statement = (SetSessionAuthorization) parser.createStatement(query);
+        QueryStateMachine stateMachine = createStateMachine(Optional.empty(), query);
+        new SetSessionAuthorizationTask(accessControl, transactionManager).execute(statement, stateMachine, emptyList(), WarningCollector.NOOP);
+        QueryInfo queryInfo = stateMachine.getQueryInfo(Optional.empty());
+        assertEquals(queryInfo.getSetAuthorizationUser(), expected);
+    }
+
+    private QueryStateMachine createStateMachine(Optional<TransactionId> transactionId, String query)
+    {
+        QueryStateMachine stateMachine = QueryStateMachine.begin(
+                transactionId,
+                query,
+                Optional.empty(),
+                testSessionBuilder().build(),
+                URI.create("fake://uri"),
+                new ResourceGroupId("test"),
+                false,
+                transactionManager,
+                accessControl,
+                executor,
+                metadata,
+                WarningCollector.NOOP,
+                createPlanOptimizersStatsCollector(),
+                Optional.empty(),
+                true,
+                new NodeVersion("test"));
+        return stateMachine;
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSetSessionTask.java b/core/trino-main/src/test/java/io/trino/execution/TestSetSessionTask.java
index b711cb457bce..f00380ce2289 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestSetSessionTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSetSessionTask.java
@@ -35,9 +35,10 @@
 import io.trino.sql.tree.StringLiteral;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.List;
@@ -54,12 +55,15 @@
 import static io.trino.spi.session.PropertyMetadata.integerProperty;
 import static io.trino.spi.session.PropertyMetadata.stringProperty;
 import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.testing.TestingSession.testSession;
 import static java.lang.String.format;
 import static java.util.Collections.emptyList;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestSetSessionTask
 {
     private static final String CATALOG_NAME = "my_catalog";
@@ -80,7 +84,7 @@ private enum Size
     private SessionPropertyManager sessionPropertyManager;
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         queryRunner = LocalQueryRunner.builder(TEST_SESSION)
@@ -130,7 +134,7 @@ private static void validatePositive(Object value)
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
@@ -150,7 +154,7 @@ public void testSetSession()
         testSetSession("bar", new StringLiteral("baz"), "baz");
         testSetSession("bar",
                 new TestingFunctionResolution(transactionManager, plannerContext)
-                        .functionCallBuilder(QualifiedName.of("concat"))
+                        .functionCallBuilder("concat")
                         .addArgument(VARCHAR, new StringLiteral("ban"))
                         .addArgument(VARCHAR, new StringLiteral("ana"))
                         .build(),
@@ -181,7 +185,7 @@ public void testSetSessionWithInvalidEnum()
     public void testSetSessionWithParameters()
     {
         FunctionCall functionCall = new TestingFunctionResolution(transactionManager, plannerContext)
-                .functionCallBuilder(QualifiedName.of("concat"))
+                .functionCallBuilder("concat")
                 .addArgument(VARCHAR, new StringLiteral("ban"))
                 .addArgument(VARCHAR, new Parameter(0))
                 .build();
@@ -200,7 +204,7 @@ private void testSetSessionWithParameters(String property, Expression expression
                 Optional.empty(),
                 format("set %s = 'old_value'", qualifiedPropName),
                 Optional.empty(),
-                TEST_SESSION,
+                testSession(),
                 URI.create("fake://uri"),
                 new ResourceGroupId("test"),
                 false,
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSetTimeZoneTask.java b/core/trino-main/src/test/java/io/trino/execution/TestSetTimeZoneTask.java
index 89aad47cf923..d7ed438a8338 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestSetTimeZoneTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSetTimeZoneTask.java
@@ -27,9 +27,10 @@
 import io.trino.sql.tree.SetTimeZone;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.Map;
@@ -41,28 +42,33 @@
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.SystemSessionProperties.TIME_ZONE_ID;
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.tree.IntervalLiteral.IntervalField.HOUR;
 import static io.trino.sql.tree.IntervalLiteral.IntervalField.MINUTE;
 import static io.trino.sql.tree.IntervalLiteral.Sign.NEGATIVE;
 import static io.trino.sql.tree.IntervalLiteral.Sign.POSITIVE;
+import static io.trino.testing.TestingSession.testSession;
 import static java.util.Collections.emptyList;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestSetTimeZoneTask
 {
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
     private LocalQueryRunner localQueryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         localQueryRunner = LocalQueryRunner.create(TEST_SESSION);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
@@ -106,7 +112,7 @@ public void testSetTimeZoneVarcharFunctionCall()
                 new NodeLocation(1, 1),
                 Optional.of(new FunctionCall(
                         new NodeLocation(1, 15),
-                        QualifiedName.of(ImmutableList.of(new Identifier(new NodeLocation(1, 15), "concat_ws", false))),
+                        localQueryRunner.getMetadata().resolveBuiltinFunction("concat_ws", fromTypes(VARCHAR, VARCHAR, VARCHAR)).toQualifiedName(),
                         ImmutableList.of(
                                 new StringLiteral(
                                         new NodeLocation(1, 25),
@@ -173,7 +179,7 @@ public void testSetTimeZoneIntervalDayTimeTypeFunctionCall()
                 new NodeLocation(1, 1),
                 Optional.of(new FunctionCall(
                         new NodeLocation(1, 24),
-                        QualifiedName.of(ImmutableList.of(new Identifier(new NodeLocation(1, 24), "parse_duration", false))),
+                        localQueryRunner.getMetadata().resolveBuiltinFunction("parse_duration", fromTypes(VARCHAR)).toQualifiedName(),
                         ImmutableList.of(
                                 new StringLiteral(
                                         new NodeLocation(1, 39),
@@ -193,14 +199,14 @@ public void testSetTimeZoneIntervalDayTimeTypeInvalidFunctionCall()
                 new NodeLocation(1, 1),
                 Optional.of(new FunctionCall(
                         new NodeLocation(1, 24),
-                        QualifiedName.of(ImmutableList.of(new Identifier(new NodeLocation(1, 24), "parse_duration", false))),
+                        localQueryRunner.getMetadata().resolveBuiltinFunction("parse_duration", fromTypes(VARCHAR)).toQualifiedName(),
                         ImmutableList.of(
                                 new StringLiteral(
                                         new NodeLocation(1, 39),
                                         "3601s")))));
         assertThatThrownBy(() -> executeSetTimeZone(setTimeZone, stateMachine))
                 .isInstanceOf(TrinoException.class)
-                .hasMessage("Invalid time zone offset interval: interval contains seconds");
+                .hasMessage("Invalid TIME ZONE offset interval: interval contains seconds");
     }
 
     @Test
@@ -247,7 +253,7 @@ private QueryStateMachine createQueryStateMachine(String query)
                 Optional.empty(),
                 query,
                 Optional.empty(),
-                TEST_SESSION,
+                testSession(),
                 URI.create("fake://uri"),
                 new ResourceGroupId("test"),
                 false,
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSplitConcurrencyController.java b/core/trino-main/src/test/java/io/trino/execution/TestSplitConcurrencyController.java
index 3d710183f11e..792e7b28ce87 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestSplitConcurrencyController.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSplitConcurrencyController.java
@@ -14,7 +14,7 @@
 package io.trino.execution;
 
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSqlStage.java b/core/trino-main/src/test/java/io/trino/execution/TestSqlStage.java
index 17122a41da3b..44e4dab8b735 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestSqlStage.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSqlStage.java
@@ -37,9 +37,11 @@
 import io.trino.sql.planner.plan.RemoteSourceNode;
 import io.trino.testing.TestingSplit;
 import io.trino.util.FinalizerService;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -53,6 +55,7 @@
 import java.util.concurrent.ScheduledExecutorService;
 
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
+import static io.airlift.tracing.Tracing.noopTracer;
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.execution.SqlStage.createSqlStage;
 import static io.trino.execution.buffer.PipelinedOutputBuffers.BufferType.ARBITRARY;
@@ -64,25 +67,27 @@
 import static java.util.concurrent.Executors.newFixedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
+@TestInstance(PER_CLASS)
 public class TestSqlStage
 {
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         executor = newFixedThreadPool(100, daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
         scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
@@ -91,7 +96,8 @@ public void tearDown()
         scheduledExecutor = null;
     }
 
-    @Test(timeOut = 2 * 60 * 1000)
+    @Test
+    @Timeout(2 * 60)
     public void testFinalStageInfo()
             throws Exception
     {
@@ -117,6 +123,7 @@ private void testFinalStageInfoInternal()
                 true,
                 nodeTaskMap,
                 executor,
+                noopTracer(),
                 new SplitSchedulerStats());
 
         // add listener that fetches stage info when the final status is available
@@ -148,7 +155,8 @@ private void testFinalStageInfoInternal()
                             PipelinedOutputBuffers.createInitial(ARBITRARY),
                             initialSplits,
                             ImmutableSet.of(),
-                            Optional.empty());
+                            Optional.empty(),
+                            false);
                     if (created.isPresent()) {
                         if (created.get() instanceof MockRemoteTaskFactory.MockRemoteTask mockTask) {
                             mockTask.start();
@@ -237,6 +245,7 @@ private static PlanFragment createExchangePlanFragment()
                 new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), planNode.getOutputSymbols()),
                 StatsAndCosts.empty(),
                 ImmutableList.of(),
+                ImmutableList.of(),
                 Optional.empty());
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSqlTask.java b/core/trino-main/src/test/java/io/trino/execution/TestSqlTask.java
index 86917ef94f29..735c9b5813c3 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestSqlTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSqlTask.java
@@ -23,6 +23,7 @@
 import io.airlift.stats.TestingGcMonitor;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
 import io.trino.exchange.ExchangeManagerRegistry;
 import io.trino.execution.buffer.BufferResult;
 import io.trino.execution.buffer.BufferState;
@@ -30,6 +31,7 @@
 import io.trino.execution.buffer.PipelinedOutputBuffers;
 import io.trino.execution.buffer.PipelinedOutputBuffers.OutputBufferId;
 import io.trino.execution.executor.TaskExecutor;
+import io.trino.execution.executor.timesharing.TimeSharingTaskExecutor;
 import io.trino.memory.MemoryPool;
 import io.trino.memory.QueryContext;
 import io.trino.operator.TaskContext;
@@ -37,9 +39,11 @@
 import io.trino.spi.predicate.Domain;
 import io.trino.spiller.SpillSpaceTracker;
 import io.trino.sql.planner.LocalExecutionPlanner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.net.URI;
 import java.util.Optional;
@@ -48,6 +52,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static io.airlift.concurrent.Threads.threadsNamed;
+import static io.airlift.tracing.Tracing.noopTracer;
 import static io.airlift.units.DataSize.Unit.GIGABYTE;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.SessionTestUtils.TEST_SESSION;
@@ -73,13 +78,14 @@
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestSqlTask
 {
     public static final OutputBufferId OUT = new OutputBufferId(0);
@@ -91,10 +97,10 @@ public class TestSqlTask
 
     private final AtomicInteger nextTaskId = new AtomicInteger();
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
-        taskExecutor = new TaskExecutor(8, 16, 3, 4, Ticker.systemTicker());
+        taskExecutor = new TimeSharingTaskExecutor(8, 16, 3, 4, Ticker.systemTicker());
         taskExecutor.start();
 
         taskNotificationExecutor = newScheduledThreadPool(10, threadsNamed("task-notification-%s"));
@@ -107,10 +113,11 @@ public void setUp()
                 taskExecutor,
                 planner,
                 createTestSplitMonitor(),
+                noopTracer(),
                 new TaskManagerConfig());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void destroy()
     {
         taskExecutor.stop();
@@ -120,18 +127,21 @@ public void destroy()
         sqlTaskExecutionFactory = null;
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testEmptyQuery()
             throws Exception
     {
         SqlTask sqlTask = createInitialTask();
 
         TaskInfo taskInfo = sqlTask.updateTask(TEST_SESSION,
+                Span.getInvalid(),
                 Optional.of(PLAN_FRAGMENT),
                 ImmutableList.of(),
                 PipelinedOutputBuffers.createInitial(PARTITIONED)
                         .withNoMoreBufferIds(),
-                ImmutableMap.of());
+                ImmutableMap.of(),
+                false);
         assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
         assertEquals(taskInfo.getTaskStatus().getVersion(), STARTING_VERSION);
 
@@ -140,18 +150,21 @@ public void testEmptyQuery()
         assertEquals(taskInfo.getTaskStatus().getVersion(), STARTING_VERSION);
 
         taskInfo = sqlTask.updateTask(TEST_SESSION,
+                Span.getInvalid(),
                 Optional.of(PLAN_FRAGMENT),
                 ImmutableList.of(new SplitAssignment(TABLE_SCAN_NODE_ID, ImmutableSet.of(), true)),
                 PipelinedOutputBuffers.createInitial(PARTITIONED)
                         .withNoMoreBufferIds(),
-                ImmutableMap.of());
+                ImmutableMap.of(),
+                false);
         assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
 
         taskInfo = sqlTask.getTaskInfo(STARTING_VERSION).get();
         assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testSimpleQuery()
             throws Exception
     {
@@ -160,10 +173,12 @@ public void testSimpleQuery()
         assertEquals(sqlTask.getTaskStatus().getState(), TaskState.RUNNING);
         assertEquals(sqlTask.getTaskStatus().getVersion(), STARTING_VERSION);
         sqlTask.updateTask(TEST_SESSION,
+                Span.getInvalid(),
                 Optional.of(PLAN_FRAGMENT),
                 ImmutableList.of(new SplitAssignment(TABLE_SCAN_NODE_ID, ImmutableSet.of(SPLIT), true)),
                 PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds(),
-                ImmutableMap.of());
+                ImmutableMap.of(),
+                false);
 
         TaskInfo taskInfo = sqlTask.getTaskInfo(STARTING_VERSION).get();
         assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FLUSHING);
@@ -202,12 +217,14 @@ public void testCancel()
         SqlTask sqlTask = createInitialTask();
 
         TaskInfo taskInfo = sqlTask.updateTask(TEST_SESSION,
+                Span.getInvalid(),
                 Optional.of(PLAN_FRAGMENT),
                 ImmutableList.of(),
                 PipelinedOutputBuffers.createInitial(PARTITIONED)
                         .withBuffer(OUT, 0)
                         .withNoMoreBufferIds(),
-                ImmutableMap.of());
+                ImmutableMap.of(),
+                false);
         assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
         assertNull(taskInfo.getStats().getEndTime());
 
@@ -232,7 +249,8 @@ public void testCancel()
         assertNotNull(taskInfo.getStats().getEndTime());
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testAbort()
             throws Exception
     {
@@ -241,10 +259,12 @@ public void testAbort()
         assertEquals(sqlTask.getTaskStatus().getState(), TaskState.RUNNING);
         assertEquals(sqlTask.getTaskStatus().getVersion(), STARTING_VERSION);
         sqlTask.updateTask(TEST_SESSION,
+                Span.getInvalid(),
                 Optional.of(PLAN_FRAGMENT),
                 ImmutableList.of(new SplitAssignment(TABLE_SCAN_NODE_ID, ImmutableSet.of(SPLIT), true)),
                 PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds(),
-                ImmutableMap.of());
+                ImmutableMap.of(),
+                false);
 
         TaskInfo taskInfo = sqlTask.getTaskInfo(STARTING_VERSION).get();
         assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FLUSHING);
@@ -308,7 +328,8 @@ public void testBufferCloseOnCancel()
         assertTrue(bufferResult.get().isBufferComplete());
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testBufferNotCloseOnFail()
             throws Exception
     {
@@ -336,19 +357,22 @@ public void testBufferNotCloseOnFail()
         assertFalse(sqlTask.getTaskResults(OUT, 0, DataSize.of(1, MEGABYTE)).isDone());
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testDynamicFilters()
             throws Exception
     {
         SqlTask sqlTask = createInitialTask();
         sqlTask.updateTask(
                 TEST_SESSION,
+                Span.getInvalid(),
                 Optional.of(PLAN_FRAGMENT_WITH_DYNAMIC_FILTER_SOURCE),
                 ImmutableList.of(new SplitAssignment(TABLE_SCAN_NODE_ID, ImmutableSet.of(SPLIT), false)),
                 PipelinedOutputBuffers.createInitial(PARTITIONED)
                         .withBuffer(OUT, 0)
                         .withNoMoreBufferIds(),
-                ImmutableMap.of());
+                ImmutableMap.of(),
+                false);
 
         assertEquals(sqlTask.getTaskStatus().getDynamicFiltersVersion(), INITIAL_DYNAMIC_FILTERS_VERSION);
 
@@ -364,7 +388,8 @@ public void testDynamicFilters()
         future.get();
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testDynamicFilterFetchAfterTaskDone()
             throws Exception
     {
@@ -372,10 +397,12 @@ public void testDynamicFilterFetchAfterTaskDone()
         OutputBuffers outputBuffers = PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds();
         sqlTask.updateTask(
                 TEST_SESSION,
+                Span.getInvalid(),
                 Optional.of(PLAN_FRAGMENT_WITH_DYNAMIC_FILTER_SOURCE),
                 ImmutableList.of(new SplitAssignment(TABLE_SCAN_NODE_ID, ImmutableSet.of(), false)),
                 outputBuffers,
-                ImmutableMap.of());
+                ImmutableMap.of(),
+                false);
 
         assertEquals(sqlTask.getTaskStatus().getDynamicFiltersVersion(), INITIAL_DYNAMIC_FILTERS_VERSION);
 
@@ -419,6 +446,7 @@ private SqlTask createInitialTask()
                 location,
                 "fake",
                 queryContext,
+                noopTracer(),
                 sqlTaskExecutionFactory,
                 taskNotificationExecutor,
                 sqlTask -> {},
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskExecution.java b/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskExecution.java
index 0af9054d98fc..a61537db9ffa 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskExecution.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskExecution.java
@@ -24,6 +24,7 @@
 import io.airlift.stats.TestingGcMonitor;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
 import io.trino.execution.buffer.BufferResult;
 import io.trino.execution.buffer.BufferState;
 import io.trino.execution.buffer.OutputBuffer;
@@ -33,6 +34,7 @@
 import io.trino.execution.buffer.PipelinedOutputBuffers;
 import io.trino.execution.buffer.PipelinedOutputBuffers.OutputBufferId;
 import io.trino.execution.executor.TaskExecutor;
+import io.trino.execution.executor.timesharing.TimeSharingTaskExecutor;
 import io.trino.memory.MemoryPool;
 import io.trino.memory.QueryContext;
 import io.trino.memory.context.SimpleLocalMemoryContext;
@@ -52,7 +54,7 @@
 import io.trino.spiller.SpillSpaceTracker;
 import io.trino.sql.planner.LocalExecutionPlanner.LocalExecutionPlan;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.OptionalInt;
@@ -66,6 +68,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.concurrent.Threads.threadsNamed;
 import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.tracing.Tracing.noopTracer;
 import static io.airlift.units.DataSize.Unit.GIGABYTE;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.SessionTestUtils.TEST_SESSION;
@@ -86,7 +89,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 
-@Test(singleThreaded = true)
 public class TestSqlTaskExecution
 {
     private static final OutputBufferId OUTPUT_BUFFER_ID = new OutputBufferId(0);
@@ -99,7 +101,7 @@ public void testSimple()
     {
         ScheduledExecutorService taskNotificationExecutor = newScheduledThreadPool(10, threadsNamed("task-notification-%s"));
         ScheduledExecutorService driverYieldExecutor = newScheduledThreadPool(2, threadsNamed("driver-yield-%s"));
-        TaskExecutor taskExecutor = new TaskExecutor(5, 10, 3, 4, Ticker.systemTicker());
+        TaskExecutor taskExecutor = new TimeSharingTaskExecutor(5, 10, 3, 4, Ticker.systemTicker());
 
         taskExecutor.start();
         try {
@@ -136,10 +138,12 @@ public void testSimple()
             SqlTaskExecution sqlTaskExecution = new SqlTaskExecution(
                     taskStateMachine,
                     taskContext,
+                    Span.getInvalid(),
                     outputBuffer,
                     localExecutionPlan,
                     taskExecutor,
                     createTestSplitMonitor(),
+                    noopTracer(),
                     taskNotificationExecutor);
             sqlTaskExecution.start();
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskManager.java b/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskManager.java
deleted file mode 100644
index 039872c61ea9..000000000000
--- a/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskManager.java
+++ /dev/null
@@ -1,589 +0,0 @@
-/*
- * Licensed 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 io.trino.execution;
-
-import com.google.common.base.Ticker;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
-import io.airlift.node.NodeInfo;
-import io.airlift.stats.TestingGcMonitor;
-import io.airlift.testing.TestingTicker;
-import io.airlift.units.DataSize;
-import io.airlift.units.DataSize.Unit;
-import io.airlift.units.Duration;
-import io.trino.Session;
-import io.trino.connector.CatalogProperties;
-import io.trino.connector.ConnectorServices;
-import io.trino.connector.ConnectorServicesProvider;
-import io.trino.exchange.ExchangeManagerRegistry;
-import io.trino.execution.buffer.BufferResult;
-import io.trino.execution.buffer.BufferState;
-import io.trino.execution.buffer.OutputBuffers;
-import io.trino.execution.buffer.PipelinedOutputBuffers;
-import io.trino.execution.buffer.PipelinedOutputBuffers.OutputBufferId;
-import io.trino.execution.executor.TaskExecutor;
-import io.trino.execution.executor.TaskHandle;
-import io.trino.memory.LocalMemoryManager;
-import io.trino.memory.NodeMemoryConfig;
-import io.trino.memory.QueryContext;
-import io.trino.memory.context.LocalMemoryContext;
-import io.trino.metadata.InternalNode;
-import io.trino.operator.DirectExchangeClient;
-import io.trino.operator.DirectExchangeClientSupplier;
-import io.trino.operator.RetryPolicy;
-import io.trino.spi.QueryId;
-import io.trino.spi.connector.CatalogHandle;
-import io.trino.spi.exchange.ExchangeId;
-import io.trino.spiller.LocalSpillManager;
-import io.trino.spiller.NodeSpillConfig;
-import io.trino.version.EmbedVersion;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import javax.annotation.concurrent.GuardedBy;
-
-import java.net.URI;
-import java.util.List;
-import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Predicate;
-
-import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
-import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
-import static io.trino.SessionTestUtils.TEST_SESSION;
-import static io.trino.SystemSessionProperties.QUERY_MAX_MEMORY_PER_NODE;
-import static io.trino.execution.TaskTestUtils.PLAN_FRAGMENT;
-import static io.trino.execution.TaskTestUtils.SPLIT;
-import static io.trino.execution.TaskTestUtils.TABLE_SCAN_NODE_ID;
-import static io.trino.execution.TaskTestUtils.createTestSplitMonitor;
-import static io.trino.execution.TaskTestUtils.createTestingPlanner;
-import static io.trino.execution.buffer.PagesSerdeUtil.getSerializedPagePositionCount;
-import static io.trino.execution.buffer.PipelinedOutputBuffers.BufferType.PARTITIONED;
-import static io.trino.testing.TestingSession.testSessionBuilder;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-public class TestSqlTaskManager
-{
-    private static final TaskId TASK_ID = new TaskId(new StageId("query", 0), 1, 0);
-    public static final OutputBufferId OUT = new OutputBufferId(0);
-
-    private TaskExecutor taskExecutor;
-    private TaskManagementExecutor taskManagementExecutor;
-    private LocalMemoryManager localMemoryManager;
-    private LocalSpillManager localSpillManager;
-
-    @BeforeClass
-    public void setUp()
-    {
-        localMemoryManager = new LocalMemoryManager(new NodeMemoryConfig());
-        localSpillManager = new LocalSpillManager(new NodeSpillConfig());
-        taskExecutor = new TaskExecutor(8, 16, 3, 4, Ticker.systemTicker());
-        taskExecutor.start();
-        taskManagementExecutor = new TaskManagementExecutor();
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-    {
-        taskExecutor.stop();
-        taskExecutor = null;
-        taskManagementExecutor.close();
-        taskManagementExecutor = null;
-    }
-
-    @Test
-    public void testEmptyQuery()
-    {
-        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig())) {
-            TaskId taskId = TASK_ID;
-            TaskInfo taskInfo = createTask(sqlTaskManager, taskId, PipelinedOutputBuffers.createInitial(PARTITIONED).withNoMoreBufferIds());
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
-
-            taskInfo = sqlTaskManager.getTaskInfo(taskId);
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
-
-            taskInfo = createTask(sqlTaskManager, taskId, ImmutableSet.of(), PipelinedOutputBuffers.createInitial(PARTITIONED).withNoMoreBufferIds());
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
-
-            taskInfo = sqlTaskManager.getTaskInfo(taskId);
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
-        }
-    }
-
-    @Test(timeOut = 30_000)
-    public void testSimpleQuery()
-            throws Exception
-    {
-        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig())) {
-            TaskId taskId = TASK_ID;
-            createTask(sqlTaskManager, taskId, ImmutableSet.of(SPLIT), PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds());
-
-            TaskInfo taskInfo = sqlTaskManager.getTaskInfo(taskId, TaskStatus.STARTING_VERSION).get();
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FLUSHING);
-
-            BufferResult results = sqlTaskManager.getTaskResults(taskId, OUT, 0, DataSize.of(1, Unit.MEGABYTE)).getResultsFuture().get();
-            assertFalse(results.isBufferComplete());
-            assertEquals(results.getSerializedPages().size(), 1);
-            assertEquals(getSerializedPagePositionCount(results.getSerializedPages().get(0)), 1);
-
-            for (boolean moreResults = true; moreResults; moreResults = !results.isBufferComplete()) {
-                results = sqlTaskManager.getTaskResults(taskId, OUT, results.getToken() + results.getSerializedPages().size(), DataSize.of(1, Unit.MEGABYTE)).getResultsFuture().get();
-            }
-            assertTrue(results.isBufferComplete());
-            assertEquals(results.getSerializedPages().size(), 0);
-
-            // complete the task by calling destroy on it
-            TaskInfo info = sqlTaskManager.destroyTaskResults(taskId, OUT);
-            assertEquals(info.getOutputBuffers().getState(), BufferState.FINISHED);
-
-            taskInfo = sqlTaskManager.getTaskInfo(taskId, taskInfo.getTaskStatus().getVersion()).get();
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
-            taskInfo = sqlTaskManager.getTaskInfo(taskId);
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
-        }
-    }
-
-    @Test
-    public void testCancel()
-            throws InterruptedException, ExecutionException, TimeoutException
-    {
-        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig())) {
-            TaskId taskId = TASK_ID;
-            TaskInfo taskInfo = createTask(sqlTaskManager, taskId, PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds());
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
-            assertNull(taskInfo.getStats().getEndTime());
-
-            taskInfo = sqlTaskManager.getTaskInfo(taskId);
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
-            assertNull(taskInfo.getStats().getEndTime());
-
-            taskInfo = pollTerminatingTaskInfoUntilDone(sqlTaskManager, sqlTaskManager.cancelTask(taskId));
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.CANCELED);
-            assertNotNull(taskInfo.getStats().getEndTime());
-
-            taskInfo = sqlTaskManager.getTaskInfo(taskId);
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.CANCELED);
-            assertNotNull(taskInfo.getStats().getEndTime());
-        }
-    }
-
-    @Test
-    public void testAbort()
-            throws InterruptedException, ExecutionException, TimeoutException
-    {
-        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig())) {
-            TaskId taskId = TASK_ID;
-            TaskInfo taskInfo = createTask(sqlTaskManager, taskId, PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds());
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
-            assertNull(taskInfo.getStats().getEndTime());
-
-            taskInfo = sqlTaskManager.getTaskInfo(taskId);
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
-            assertNull(taskInfo.getStats().getEndTime());
-
-            taskInfo = pollTerminatingTaskInfoUntilDone(sqlTaskManager, sqlTaskManager.abortTask(taskId));
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.ABORTED);
-            assertNotNull(taskInfo.getStats().getEndTime());
-
-            taskInfo = sqlTaskManager.getTaskInfo(taskId);
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.ABORTED);
-            assertNotNull(taskInfo.getStats().getEndTime());
-        }
-    }
-
-    @Test(timeOut = 30_000)
-    public void testAbortResults()
-            throws Exception
-    {
-        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig())) {
-            TaskId taskId = TASK_ID;
-            createTask(sqlTaskManager, taskId, ImmutableSet.of(SPLIT), PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds());
-
-            TaskInfo taskInfo = sqlTaskManager.getTaskInfo(taskId, TaskStatus.STARTING_VERSION).get();
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FLUSHING);
-
-            sqlTaskManager.destroyTaskResults(taskId, OUT);
-
-            taskInfo = sqlTaskManager.getTaskInfo(taskId, taskInfo.getTaskStatus().getVersion()).get();
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
-
-            taskInfo = sqlTaskManager.getTaskInfo(taskId);
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FINISHED);
-        }
-    }
-
-    @Test
-    public void testRemoveOldTasks()
-            throws InterruptedException, ExecutionException, TimeoutException
-    {
-        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig().setInfoMaxAge(new Duration(5, TimeUnit.MILLISECONDS)))) {
-            TaskId taskId = TASK_ID;
-
-            TaskInfo taskInfo = createTask(sqlTaskManager, taskId, PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds());
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.RUNNING);
-
-            taskInfo = pollTerminatingTaskInfoUntilDone(sqlTaskManager, sqlTaskManager.cancelTask(taskId));
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.CANCELED);
-
-            taskInfo = sqlTaskManager.getTaskInfo(taskId);
-            assertEquals(taskInfo.getTaskStatus().getState(), TaskState.CANCELED);
-
-            Thread.sleep(100);
-            sqlTaskManager.removeOldTasks();
-
-            for (TaskInfo info : sqlTaskManager.getAllTaskInfo()) {
-                assertNotEquals(info.getTaskStatus().getTaskId(), taskId);
-            }
-        }
-    }
-
-    @Test
-    public void testFailStuckSplitTasks()
-            throws InterruptedException, ExecutionException, TimeoutException
-    {
-        TestingTicker ticker = new TestingTicker();
-
-        TaskHandle taskHandle = taskExecutor.addTask(
-                TASK_ID,
-                () -> 1.0,
-                1,
-                new Duration(1, SECONDS),
-                OptionalInt.of(1));
-        MockSplitRunner mockSplitRunner = new MockSplitRunner();
-
-        TaskExecutor taskExecutor = new TaskExecutor(4, 8, 3, 4, ticker);
-        // Here we explicitly enqueue an indefinite running split runner
-        taskExecutor.enqueueSplits(taskHandle, false, ImmutableList.of(mockSplitRunner));
-
-        taskExecutor.start();
-        try {
-            // wait for the task executor to start processing the split
-            mockSplitRunner.waitForStart();
-
-            TaskManagerConfig taskManagerConfig = new TaskManagerConfig()
-                    .setInterruptStuckSplitTasksEnabled(true)
-                    .setInterruptStuckSplitTasksDetectionInterval(new Duration(10, SECONDS))
-                    .setInterruptStuckSplitTasksWarningThreshold(new Duration(10, SECONDS))
-                    .setInterruptStuckSplitTasksTimeout(new Duration(10, SECONDS));
-
-            try (SqlTaskManager sqlTaskManager = createSqlTaskManager(taskManagerConfig, new NodeMemoryConfig(), taskExecutor, stackTraceElements -> true)) {
-                sqlTaskManager.addStateChangeListener(TASK_ID, (state) -> {
-                    if (state.isTerminatingOrDone() && !taskHandle.isDestroyed()) {
-                        taskExecutor.removeTask(taskHandle);
-                    }
-                });
-
-                ticker.increment(30, SECONDS);
-                sqlTaskManager.failStuckSplitTasks();
-
-                mockSplitRunner.waitForFinish();
-                List<TaskInfo> taskInfos = sqlTaskManager.getAllTaskInfo();
-                assertEquals(taskInfos.size(), 1);
-
-                TaskInfo taskInfo = pollTerminatingTaskInfoUntilDone(sqlTaskManager, taskInfos.get(0));
-                assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FAILED);
-            }
-        }
-        finally {
-            taskExecutor.stop();
-        }
-    }
-
-    @Test
-    public void testSessionPropertyMemoryLimitOverride()
-    {
-        NodeMemoryConfig memoryConfig = new NodeMemoryConfig()
-                .setMaxQueryMemoryPerNode(DataSize.ofBytes(3));
-
-        try (SqlTaskManager sqlTaskManager = createSqlTaskManager(new TaskManagerConfig(), memoryConfig)) {
-            TaskId reduceLimitsId = new TaskId(new StageId("q1", 0), 1, 0);
-            TaskId increaseLimitsId = new TaskId(new StageId("q2", 0), 1, 0);
-
-            QueryContext reducesLimitsContext = sqlTaskManager.getQueryContext(reduceLimitsId.getQueryId());
-            QueryContext attemptsIncreaseContext = sqlTaskManager.getQueryContext(increaseLimitsId.getQueryId());
-
-            // not initialized with a task update yet
-            assertFalse(reducesLimitsContext.isMemoryLimitsInitialized());
-            assertEquals(reducesLimitsContext.getMaxUserMemory(), memoryConfig.getMaxQueryMemoryPerNode().toBytes());
-
-            assertFalse(attemptsIncreaseContext.isMemoryLimitsInitialized());
-            assertEquals(attemptsIncreaseContext.getMaxUserMemory(), memoryConfig.getMaxQueryMemoryPerNode().toBytes());
-
-            // memory limits reduced by session properties
-            sqlTaskManager.updateTask(
-                    testSessionBuilder()
-                            .setSystemProperty(QUERY_MAX_MEMORY_PER_NODE, "1B")
-                            .build(),
-                    reduceLimitsId,
-                    Optional.of(PLAN_FRAGMENT),
-                    ImmutableList.of(new SplitAssignment(TABLE_SCAN_NODE_ID, ImmutableSet.of(SPLIT), true)),
-                    PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds(),
-                    ImmutableMap.of());
-            assertTrue(reducesLimitsContext.isMemoryLimitsInitialized());
-            assertEquals(reducesLimitsContext.getMaxUserMemory(), 1);
-
-            // memory limits not increased by session properties
-            sqlTaskManager.updateTask(
-                    testSessionBuilder()
-                            .setSystemProperty(QUERY_MAX_MEMORY_PER_NODE, "10B")
-                            .build(),
-                    increaseLimitsId,
-                    Optional.of(PLAN_FRAGMENT),
-                    ImmutableList.of(new SplitAssignment(TABLE_SCAN_NODE_ID, ImmutableSet.of(SPLIT), true)),
-                    PipelinedOutputBuffers.createInitial(PARTITIONED).withBuffer(OUT, 0).withNoMoreBufferIds(),
-                    ImmutableMap.of());
-            assertTrue(attemptsIncreaseContext.isMemoryLimitsInitialized());
-            assertEquals(attemptsIncreaseContext.getMaxUserMemory(), memoryConfig.getMaxQueryMemoryPerNode().toBytes());
-        }
-    }
-
-    private SqlTaskManager createSqlTaskManager(TaskManagerConfig config)
-    {
-        return createSqlTaskManager(config, new NodeMemoryConfig());
-    }
-
-    private SqlTaskManager createSqlTaskManager(TaskManagerConfig taskManagerConfig, NodeMemoryConfig nodeMemoryConfig)
-    {
-        return new SqlTaskManager(
-                new EmbedVersion("testversion"),
-                new NoConnectorServicesProvider(),
-                createTestingPlanner(),
-                new MockLocationFactory(),
-                taskExecutor,
-                createTestSplitMonitor(),
-                new NodeInfo("test"),
-                localMemoryManager,
-                taskManagementExecutor,
-                taskManagerConfig,
-                nodeMemoryConfig,
-                localSpillManager,
-                new NodeSpillConfig(),
-                new TestingGcMonitor(),
-                new ExchangeManagerRegistry());
-    }
-
-    private SqlTaskManager createSqlTaskManager(
-            TaskManagerConfig taskManagerConfig,
-            NodeMemoryConfig nodeMemoryConfig,
-            TaskExecutor taskExecutor,
-            Predicate<List<StackTraceElement>> stuckSplitStackTracePredicate)
-    {
-        return new SqlTaskManager(
-                new EmbedVersion("testversion"),
-                new NoConnectorServicesProvider(),
-                createTestingPlanner(),
-                new MockLocationFactory(),
-                taskExecutor,
-                createTestSplitMonitor(),
-                new NodeInfo("test"),
-                localMemoryManager,
-                taskManagementExecutor,
-                taskManagerConfig,
-                nodeMemoryConfig,
-                localSpillManager,
-                new NodeSpillConfig(),
-                new TestingGcMonitor(),
-                new ExchangeManagerRegistry(),
-                stuckSplitStackTracePredicate);
-    }
-
-    private TaskInfo createTask(SqlTaskManager sqlTaskManager, TaskId taskId, ImmutableSet<ScheduledSplit> splits, OutputBuffers outputBuffers)
-    {
-        return sqlTaskManager.updateTask(TEST_SESSION,
-                taskId,
-                Optional.of(PLAN_FRAGMENT),
-                ImmutableList.of(new SplitAssignment(TABLE_SCAN_NODE_ID, splits, true)),
-                outputBuffers,
-                ImmutableMap.of());
-    }
-
-    private TaskInfo createTask(SqlTaskManager sqlTaskManager, TaskId taskId, OutputBuffers outputBuffers)
-    {
-        sqlTaskManager.getQueryContext(taskId.getQueryId())
-                .addTaskContext(new TaskStateMachine(taskId, directExecutor()), testSessionBuilder().build(), () -> {}, false, false);
-        return sqlTaskManager.updateTask(TEST_SESSION,
-                taskId,
-                Optional.of(PLAN_FRAGMENT),
-                ImmutableList.of(),
-                outputBuffers,
-                ImmutableMap.of());
-    }
-
-    private static TaskInfo pollTerminatingTaskInfoUntilDone(SqlTaskManager taskManager, TaskInfo taskInfo)
-            throws InterruptedException, ExecutionException, TimeoutException
-    {
-        assertTrue(taskInfo.getTaskStatus().getState().isTerminatingOrDone());
-        int attempts = 3;
-        while (attempts > 0 && taskInfo.getTaskStatus().getState().isTerminating()) {
-            taskInfo = taskManager.getTaskInfo(taskInfo.getTaskStatus().getTaskId(), taskInfo.getTaskStatus().getVersion()).get(5, SECONDS);
-            attempts--;
-        }
-        return taskInfo;
-    }
-
-    public static class MockDirectExchangeClientSupplier
-            implements DirectExchangeClientSupplier
-    {
-        @Override
-        public DirectExchangeClient get(
-                QueryId queryId,
-                ExchangeId exchangeId,
-                LocalMemoryContext memoryContext,
-                TaskFailureListener taskFailureListener,
-                RetryPolicy retryPolicy)
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    public static class MockLocationFactory
-            implements LocationFactory
-    {
-        @Override
-        public URI createQueryLocation(QueryId queryId)
-        {
-            return URI.create("http://fake.invalid/query/" + queryId);
-        }
-
-        @Override
-        public URI createLocalTaskLocation(TaskId taskId)
-        {
-            return URI.create("http://fake.invalid/task/" + taskId);
-        }
-
-        @Override
-        public URI createTaskLocation(InternalNode node, TaskId taskId)
-        {
-            return URI.create("http://fake.invalid/task/" + node.getNodeIdentifier() + "/" + taskId);
-        }
-
-        @Override
-        public URI createMemoryInfoLocation(InternalNode node)
-        {
-            return URI.create("http://fake.invalid/" + node.getNodeIdentifier() + "/memory");
-        }
-    }
-
-    private static class MockSplitRunner
-            implements SplitRunner
-    {
-        private final SettableFuture<Void> startedFuture = SettableFuture.create();
-        private final SettableFuture<Void> finishedFuture = SettableFuture.create();
-
-        @GuardedBy("this")
-        private Thread runnerThread;
-        @GuardedBy("this")
-        private boolean closed;
-
-        public void waitForStart()
-                throws ExecutionException, InterruptedException, TimeoutException
-        {
-            startedFuture.get(10, SECONDS);
-        }
-
-        public void waitForFinish()
-                throws ExecutionException, InterruptedException, TimeoutException
-        {
-            finishedFuture.get(10, SECONDS);
-        }
-
-        @Override
-        public synchronized boolean isFinished()
-        {
-            return closed;
-        }
-
-        @Override
-        public ListenableFuture<Void> processFor(Duration duration)
-        {
-            startedFuture.set(null);
-            synchronized (this) {
-                runnerThread = Thread.currentThread();
-
-                if (closed) {
-                    finishedFuture.set(null);
-                    return immediateVoidFuture();
-                }
-            }
-
-            while (true) {
-                try {
-                    Thread.sleep(100000);
-                }
-                catch (InterruptedException e) {
-                    break;
-                }
-            }
-
-            synchronized (this) {
-                closed = true;
-            }
-            finishedFuture.set(null);
-
-            return immediateVoidFuture();
-        }
-
-        @Override
-        public String getInfo()
-        {
-            return "MockSplitRunner";
-        }
-
-        @Override
-        public synchronized void close()
-        {
-            closed = true;
-
-            if (runnerThread != null) {
-                runnerThread.interrupt();
-            }
-        }
-    }
-
-    private static class NoConnectorServicesProvider
-            implements ConnectorServicesProvider
-    {
-        @Override
-        public void loadInitialCatalogs() {}
-
-        @Override
-        public void ensureCatalogsLoaded(Session session, List<CatalogProperties> catalogs) {}
-
-        @Override
-        public void pruneCatalogs(Set<CatalogHandle> catalogsInUse)
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public ConnectorServices getConnectorServices(CatalogHandle catalogHandle)
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskManagerThreadPerDriver.java b/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskManagerThreadPerDriver.java
new file mode 100644
index 000000000000..bbec2769cdc5
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskManagerThreadPerDriver.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed 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 io.trino.execution;
+
+import com.google.common.base.Ticker;
+import io.airlift.tracing.Tracing;
+import io.trino.execution.executor.TaskExecutor;
+import io.trino.execution.executor.dedicated.ThreadPerDriverTaskExecutor;
+import io.trino.execution.executor.scheduler.FairScheduler;
+
+import static io.trino.version.EmbedVersion.testingVersionEmbedder;
+
+public class TestSqlTaskManagerThreadPerDriver
+        extends BaseTestSqlTaskManager
+{
+    @Override
+    protected TaskExecutor createTaskExecutor()
+    {
+        return new ThreadPerDriverTaskExecutor(
+                Tracing.noopTracer(),
+                testingVersionEmbedder(),
+                new FairScheduler(8, "Runner-%d", Ticker.systemTicker()));
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskManagerTimeSharing.java b/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskManagerTimeSharing.java
new file mode 100644
index 000000000000..aab4c2fdd704
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskManagerTimeSharing.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed 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 io.trino.execution;
+
+import com.google.common.base.Ticker;
+import io.trino.execution.executor.TaskExecutor;
+import io.trino.execution.executor.timesharing.TimeSharingTaskExecutor;
+
+public class TestSqlTaskManagerTimeSharing
+        extends BaseTestSqlTaskManager
+{
+    @Override
+    protected TaskExecutor createTaskExecutor()
+    {
+        return new TimeSharingTaskExecutor(8, 16, 3, 4, Ticker.systemTicker());
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestStageStateMachine.java b/core/trino-main/src/test/java/io/trino/execution/TestStageStateMachine.java
index 195036d70b8c..7f06895cb334 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestStageStateMachine.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestStageStateMachine.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.opentelemetry.api.trace.Span;
 import io.trino.cost.StatsAndCosts;
 import io.trino.execution.scheduler.SplitSchedulerStats;
 import io.trino.sql.planner.Partitioning;
@@ -26,8 +27,9 @@
 import io.trino.sql.planner.plan.ValuesNode;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.StringLiteral;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -35,16 +37,19 @@
 import java.util.concurrent.ExecutorService;
 
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
+import static io.airlift.tracing.Tracing.noopTracer;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
 import static io.trino.sql.planner.SystemPartitioningHandle.SOURCE_DISTRIBUTION;
 import static java.util.concurrent.Executors.newCachedThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestStageStateMachine
 {
     private static final StageId STAGE_ID = new StageId("query", 0);
@@ -58,7 +63,7 @@ public class TestStageStateMachine
 
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
@@ -236,7 +241,14 @@ private static void assertState(StageStateMachine stateMachine, StageState expec
 
     private StageStateMachine createStageStateMachine()
     {
-        return new StageStateMachine(STAGE_ID, PLAN_FRAGMENT, ImmutableMap.of(), executor, new SplitSchedulerStats());
+        return new StageStateMachine(
+                STAGE_ID,
+                PLAN_FRAGMENT,
+                ImmutableMap.of(),
+                executor,
+                noopTracer(),
+                Span.getInvalid(),
+                new SplitSchedulerStats());
     }
 
     private static PlanFragment createValuesPlan()
@@ -255,6 +267,7 @@ private static PlanFragment createValuesPlan()
                 new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)),
                 StatsAndCosts.empty(),
                 ImmutableList.of(),
+                ImmutableList.of(),
                 Optional.empty());
 
         return planFragment;
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestStageStats.java b/core/trino-main/src/test/java/io/trino/execution/TestStageStats.java
index c2ecc8ca631a..38bbe36d5d0c 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestStageStats.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestStageStats.java
@@ -24,7 +24,7 @@
 import io.trino.plugin.base.metrics.TDigestHistogram;
 import io.trino.spi.eventlistener.StageGcStatistics;
 import org.joda.time.DateTime;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestStartTransactionTask.java b/core/trino-main/src/test/java/io/trino/execution/TestStartTransactionTask.java
index 94634cb4bc86..fe912aae7404 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestStartTransactionTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestStartTransactionTask.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.Session;
 import io.trino.Session.SessionBuilder;
 import io.trino.client.NodeVersion;
@@ -33,8 +34,9 @@
 import io.trino.transaction.TransactionInfo;
 import io.trino.transaction.TransactionManager;
 import io.trino.transaction.TransactionManagerConfig;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.Optional;
@@ -58,18 +60,20 @@
 import static java.util.Collections.emptyList;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
+@TestInstance(PER_CLASS)
 public class TestStartTransactionTask
 {
     private final Metadata metadata = createTestMetadataManager();
     private final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
     private final ScheduledExecutorService scheduledExecutor = newSingleThreadScheduledExecutor(daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
@@ -253,7 +257,7 @@ private QueryStateMachine createQueryStateMachine(String query, Session session,
                 new ResourceGroupId("test"),
                 true,
                 transactionManager,
-                new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), DefaultSystemAccessControl.NAME),
+                new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), OpenTelemetry.noop(), DefaultSystemAccessControl.NAME),
                 executor,
                 metadata,
                 WarningCollector.NOOP,
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestStateMachine.java b/core/trino-main/src/test/java/io/trino/execution/TestStateMachine.java
index 32c0439b7238..11e2ea7e0c7a 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestStateMachine.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestStateMachine.java
@@ -16,8 +16,9 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.concurrent.ExecutorService;
 
@@ -26,10 +27,12 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestStateMachine
 {
     private enum State
@@ -39,7 +42,7 @@ private enum State
 
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestTaskExecutorStuckSplits.java b/core/trino-main/src/test/java/io/trino/execution/TestTaskExecutorStuckSplits.java
new file mode 100644
index 000000000000..7a36521c9303
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/TestTaskExecutorStuckSplits.java
@@ -0,0 +1,264 @@
+/*
+ * Licensed 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 io.trino.execution;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import io.airlift.node.NodeInfo;
+import io.airlift.stats.TestingGcMonitor;
+import io.airlift.testing.TestingTicker;
+import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.trino.Session;
+import io.trino.connector.CatalogProperties;
+import io.trino.connector.ConnectorServices;
+import io.trino.connector.ConnectorServicesProvider;
+import io.trino.exchange.ExchangeManagerRegistry;
+import io.trino.execution.executor.TaskExecutor;
+import io.trino.execution.executor.TaskHandle;
+import io.trino.execution.executor.timesharing.TimeSharingTaskExecutor;
+import io.trino.memory.LocalMemoryManager;
+import io.trino.memory.NodeMemoryConfig;
+import io.trino.metadata.WorkerLanguageFunctionProvider;
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.spiller.LocalSpillManager;
+import io.trino.spiller.NodeSpillConfig;
+import io.trino.version.EmbedVersion;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.OptionalInt;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Predicate;
+
+import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
+import static io.airlift.tracing.Tracing.noopTracer;
+import static io.trino.execution.TaskTestUtils.createTestSplitMonitor;
+import static io.trino.execution.TaskTestUtils.createTestingPlanner;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class TestTaskExecutorStuckSplits
+{
+    @Test
+    public void testFailStuckSplitTasks()
+            throws InterruptedException, ExecutionException, TimeoutException
+    {
+        TestingTicker ticker = new TestingTicker();
+        TaskManagementExecutor taskManagementExecutor = new TaskManagementExecutor();
+
+        TaskId taskId = new TaskId(new StageId("query", 0), 1, 0);
+
+        TaskExecutor taskExecutor = new TimeSharingTaskExecutor(4, 8, 3, 4, ticker);
+        TaskHandle taskHandle = taskExecutor.addTask(
+                taskId,
+                () -> 1.0,
+                1,
+                new Duration(1, SECONDS),
+                OptionalInt.of(1));
+
+        // Here we explicitly enqueue an indefinite running split runner
+        MockSplitRunner mockSplitRunner = new MockSplitRunner();
+        taskExecutor.enqueueSplits(taskHandle, false, ImmutableList.of(mockSplitRunner));
+
+        taskExecutor.start();
+        try {
+            // wait for the task executor to start processing the split
+            mockSplitRunner.waitForStart();
+
+            TaskManagerConfig taskManagerConfig = new TaskManagerConfig()
+                    .setInterruptStuckSplitTasksEnabled(true)
+                    .setInterruptStuckSplitTasksDetectionInterval(new Duration(10, SECONDS))
+                    .setInterruptStuckSplitTasksWarningThreshold(new Duration(10, SECONDS))
+                    .setInterruptStuckSplitTasksTimeout(new Duration(10, SECONDS));
+
+            try (SqlTaskManager sqlTaskManager = createSqlTaskManager(taskManagerConfig, new NodeMemoryConfig(), taskExecutor, taskManagementExecutor, stackTraceElements -> true)) {
+                sqlTaskManager.addStateChangeListener(taskId, (state) -> {
+                    if (state.isTerminatingOrDone() && !taskHandle.isDestroyed()) {
+                        taskExecutor.removeTask(taskHandle);
+                    }
+                });
+
+                ticker.increment(30, SECONDS);
+                sqlTaskManager.failStuckSplitTasks();
+
+                mockSplitRunner.waitForFinish();
+                List<TaskInfo> taskInfos = sqlTaskManager.getAllTaskInfo();
+                assertEquals(taskInfos.size(), 1);
+
+                TaskInfo taskInfo = pollTerminatingTaskInfoUntilDone(sqlTaskManager, taskInfos.get(0));
+                assertEquals(taskInfo.getTaskStatus().getState(), TaskState.FAILED);
+            }
+        }
+        finally {
+            taskExecutor.stop();
+            taskManagementExecutor.close();
+        }
+    }
+
+    private SqlTaskManager createSqlTaskManager(
+            TaskManagerConfig taskManagerConfig,
+            NodeMemoryConfig nodeMemoryConfig,
+            TaskExecutor taskExecutor,
+            TaskManagementExecutor taskManagementExecutor,
+            Predicate<List<StackTraceElement>> stuckSplitStackTracePredicate)
+    {
+        return new SqlTaskManager(
+                new EmbedVersion("testversion"),
+                new NoConnectorServicesProvider(),
+                createTestingPlanner(),
+                new WorkerLanguageFunctionProvider(),
+                new BaseTestSqlTaskManager.MockLocationFactory(),
+                taskExecutor,
+                createTestSplitMonitor(),
+                new NodeInfo("test"),
+                new LocalMemoryManager(new NodeMemoryConfig()),
+                taskManagementExecutor,
+                taskManagerConfig,
+                nodeMemoryConfig,
+                new LocalSpillManager(new NodeSpillConfig()),
+                new NodeSpillConfig(),
+                new TestingGcMonitor(),
+                noopTracer(),
+                new ExchangeManagerRegistry(),
+                stuckSplitStackTracePredicate);
+    }
+
+    private static TaskInfo pollTerminatingTaskInfoUntilDone(SqlTaskManager taskManager, TaskInfo taskInfo)
+            throws InterruptedException, ExecutionException, TimeoutException
+    {
+        assertTrue(taskInfo.getTaskStatus().getState().isTerminatingOrDone());
+        int attempts = 3;
+        while (attempts > 0 && taskInfo.getTaskStatus().getState().isTerminating()) {
+            taskInfo = taskManager.getTaskInfo(taskInfo.getTaskStatus().getTaskId(), taskInfo.getTaskStatus().getVersion()).get(5, SECONDS);
+            attempts--;
+        }
+        return taskInfo;
+    }
+
+    private static class NoConnectorServicesProvider
+            implements ConnectorServicesProvider
+    {
+        @Override
+        public void loadInitialCatalogs() {}
+
+        @Override
+        public void ensureCatalogsLoaded(Session session, List<CatalogProperties> catalogs) {}
+
+        @Override
+        public void pruneCatalogs(Set<CatalogHandle> catalogsInUse)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ConnectorServices getConnectorServices(CatalogHandle catalogHandle)
+        {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    private static class MockSplitRunner
+            implements SplitRunner
+    {
+        private final SettableFuture<Void> startedFuture = SettableFuture.create();
+        private final SettableFuture<Void> finishedFuture = SettableFuture.create();
+
+        @GuardedBy("this")
+        private Thread runnerThread;
+        @GuardedBy("this")
+        private boolean closed;
+
+        public void waitForStart()
+                throws ExecutionException, InterruptedException, TimeoutException
+        {
+            startedFuture.get(10, SECONDS);
+        }
+
+        public void waitForFinish()
+                throws ExecutionException, InterruptedException, TimeoutException
+        {
+            finishedFuture.get(10, SECONDS);
+        }
+
+        @Override
+        public int getPipelineId()
+        {
+            return 0;
+        }
+
+        @Override
+        public Span getPipelineSpan()
+        {
+            return Span.getInvalid();
+        }
+
+        @Override
+        public synchronized boolean isFinished()
+        {
+            return closed;
+        }
+
+        @Override
+        public ListenableFuture<Void> processFor(Duration duration)
+        {
+            startedFuture.set(null);
+            synchronized (this) {
+                runnerThread = Thread.currentThread();
+
+                if (closed) {
+                    finishedFuture.set(null);
+                    return immediateVoidFuture();
+                }
+            }
+
+            while (true) {
+                try {
+                    Thread.sleep(100000);
+                }
+                catch (InterruptedException e) {
+                    break;
+                }
+            }
+
+            synchronized (this) {
+                closed = true;
+            }
+            finishedFuture.set(null);
+
+            return immediateVoidFuture();
+        }
+
+        @Override
+        public String getInfo()
+        {
+            return "MockSplitRunner";
+        }
+
+        @Override
+        public synchronized void close()
+        {
+            closed = true;
+
+            if (runnerThread != null) {
+                runnerThread.interrupt();
+            }
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestTaskManagerConfig.java b/core/trino-main/src/test/java/io/trino/execution/TestTaskManagerConfig.java
index 6afeccbf15e0..d48d2fde1082 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestTaskManagerConfig.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestTaskManagerConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.util.Map;
@@ -34,14 +34,15 @@
 public class TestTaskManagerConfig
 {
     private static final int DEFAULT_PROCESSOR_COUNT = min(max(nextPowerOfTwo(getAvailablePhysicalProcessorCount()), 2), 32);
-    private static final int DEFAULT_SCALE_WRITERS_MAX_WRITER_COUNT = min(getAvailablePhysicalProcessorCount(), 32);
+    private static final int DEFAULT_MAX_WRITER_COUNT = min(max(nextPowerOfTwo(getAvailablePhysicalProcessorCount() * 2), 2), 64);
 
     @Test
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(TaskManagerConfig.class)
-                .setInitialSplitsPerNode(Runtime.getRuntime().availableProcessors() * 2)
-                .setSplitConcurrencyAdjustmentInterval(new Duration(100, TimeUnit.MILLISECONDS))
+                .setThreadPerDriverSchedulerEnabled(false)
+                .setInitialSplitsPerNode(Runtime.getRuntime().availableProcessors() * 4)
+                .setSplitConcurrencyAdjustmentInterval(new Duration(1, TimeUnit.SECONDS))
                 .setStatusRefreshMaxWait(new Duration(1, TimeUnit.SECONDS))
                 .setInfoUpdateInterval(new Duration(3, TimeUnit.SECONDS))
                 .setTaskTerminationTimeout(new Duration(1, TimeUnit.MINUTES))
@@ -57,15 +58,14 @@ public void testDefaults()
                 .setShareIndexLoading(false)
                 .setMaxPartialAggregationMemoryUsage(DataSize.of(16, Unit.MEGABYTE))
                 .setMaxPartialTopNMemory(DataSize.of(16, Unit.MEGABYTE))
-                .setMaxLocalExchangeBufferSize(DataSize.of(32, Unit.MEGABYTE))
+                .setMaxLocalExchangeBufferSize(DataSize.of(128, Unit.MEGABYTE))
                 .setSinkMaxBufferSize(DataSize.of(32, Unit.MEGABYTE))
                 .setSinkMaxBroadcastBufferSize(DataSize.of(200, Unit.MEGABYTE))
                 .setMaxPagePartitioningBufferSize(DataSize.of(32, Unit.MEGABYTE))
                 .setPagePartitioningBufferPoolSize(8)
                 .setScaleWritersEnabled(true)
-                .setScaleWritersMaxWriterCount(DEFAULT_SCALE_WRITERS_MAX_WRITER_COUNT)
-                .setWriterCount(1)
-                .setPartitionedWriterCount(DEFAULT_PROCESSOR_COUNT)
+                .setMinWriterCount(1)
+                .setMaxWriterCount(DEFAULT_MAX_WRITER_COUNT)
                 .setTaskConcurrency(DEFAULT_PROCESSOR_COUNT)
                 .setHttpResponseThreads(100)
                 .setHttpTimeoutThreads(3)
@@ -83,10 +83,11 @@ public void testDefaults()
     public void testExplicitPropertyMappings()
     {
         int processorCount = DEFAULT_PROCESSOR_COUNT == 32 ? 16 : 32;
-        int maxWriterCount = DEFAULT_SCALE_WRITERS_MAX_WRITER_COUNT == 32 ? 16 : 32;
+        int maxWriterCount = DEFAULT_MAX_WRITER_COUNT == 32 ? 16 : 32;
         Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("experimental.thread-per-driver-scheduler-enabled", "true")
                 .put("task.initial-splits-per-node", "1")
-                .put("task.split-concurrency-adjustment-interval", "1s")
+                .put("task.split-concurrency-adjustment-interval", "3s")
                 .put("task.status-refresh-max-wait", "2s")
                 .put("task.info-update-interval", "2s")
                 .put("task.termination-timeout", "15s")
@@ -108,9 +109,8 @@ public void testExplicitPropertyMappings()
                 .put("driver.max-page-partitioning-buffer-size", "40MB")
                 .put("driver.page-partitioning-buffer-pool-size", "0")
                 .put("task.scale-writers.enabled", "false")
-                .put("task.scale-writers.max-writer-count", Integer.toString(maxWriterCount))
-                .put("task.writer-count", "4")
-                .put("task.partitioned-writer-count", Integer.toString(processorCount))
+                .put("task.min-writer-count", "4")
+                .put("task.max-writer-count", Integer.toString(maxWriterCount))
                 .put("task.concurrency", Integer.toString(processorCount))
                 .put("task.http-response-threads", "4")
                 .put("task.http-timeout-threads", "10")
@@ -125,8 +125,9 @@ public void testExplicitPropertyMappings()
                 .buildOrThrow();
 
         TaskManagerConfig expected = new TaskManagerConfig()
+                .setThreadPerDriverSchedulerEnabled(true)
                 .setInitialSplitsPerNode(1)
-                .setSplitConcurrencyAdjustmentInterval(new Duration(1, TimeUnit.SECONDS))
+                .setSplitConcurrencyAdjustmentInterval(new Duration(3, TimeUnit.SECONDS))
                 .setStatusRefreshMaxWait(new Duration(2, TimeUnit.SECONDS))
                 .setInfoUpdateInterval(new Duration(2, TimeUnit.SECONDS))
                 .setTaskTerminationTimeout(new Duration(15, TimeUnit.SECONDS))
@@ -148,9 +149,8 @@ public void testExplicitPropertyMappings()
                 .setMaxPagePartitioningBufferSize(DataSize.of(40, Unit.MEGABYTE))
                 .setPagePartitioningBufferPoolSize(0)
                 .setScaleWritersEnabled(false)
-                .setScaleWritersMaxWriterCount(maxWriterCount)
-                .setWriterCount(4)
-                .setPartitionedWriterCount(processorCount)
+                .setMinWriterCount(4)
+                .setMaxWriterCount(maxWriterCount)
                 .setTaskConcurrency(processorCount)
                 .setHttpResponseThreads(4)
                 .setHttpTimeoutThreads(10)
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestingRemoteTaskFactory.java b/core/trino-main/src/test/java/io/trino/execution/TestingRemoteTaskFactory.java
index 0423053a8492..5f8125c66403 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestingRemoteTaskFactory.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestingRemoteTaskFactory.java
@@ -20,9 +20,11 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.stats.TDigest;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.execution.NodeTaskMap.PartitionedSplitCountTracker;
 import io.trino.execution.StateMachine.StateChangeListener;
@@ -40,8 +42,6 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import org.joda.time.DateTime;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
@@ -71,8 +71,10 @@ public class TestingRemoteTaskFactory
     @Override
     public synchronized RemoteTask createRemoteTask(
             Session session,
+            Span stageSpan,
             TaskId taskId,
             InternalNode node,
+            boolean speculative,
             PlanFragment fragment,
             Multimap<PlanNodeId, Split> initialSplits,
             OutputBuffers outputBuffers,
@@ -174,12 +176,14 @@ public TaskStatus getTaskStatus()
                     state,
                     location,
                     nodeId,
+                    false,
                     failures,
                     0,
                     0,
                     OutputBufferStatus.initial(),
                     DataSize.of(0, BYTE),
                     DataSize.of(0, BYTE),
+                    DataSize.of(0, BYTE),
                     Optional.empty(),
                     DataSize.of(0, BYTE),
                     DataSize.of(0, BYTE),
@@ -230,6 +234,12 @@ public synchronized void setOutputBuffers(OutputBuffers outputBuffers)
             this.outputBuffers = outputBuffers;
         }
 
+        @Override
+        public void setSpeculative(boolean speculative)
+        {
+           // ignore
+        }
+
         public synchronized OutputBuffers getOutputBuffers()
         {
             return outputBuffers;
diff --git a/core/trino-main/src/test/java/io/trino/execution/buffer/BenchmarkBlockSerde.java b/core/trino-main/src/test/java/io/trino/execution/buffer/BenchmarkBlockSerde.java
index e96573992e77..a54bdaf5d848 100644
--- a/core/trino-main/src/test/java/io/trino/execution/buffer/BenchmarkBlockSerde.java
+++ b/core/trino-main/src/test/java/io/trino/execution/buffer/BenchmarkBlockSerde.java
@@ -22,6 +22,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.block.TestingBlockEncodingSerde;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Int128;
@@ -29,6 +30,7 @@
 import io.trino.spi.type.SqlDecimal;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -40,7 +42,6 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
-import org.testng.annotations.Test;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
@@ -95,7 +96,7 @@ public Object deserializeLongDecimal(LongDecimalBenchmarkData data)
     }
 
     @Benchmark
-    public Object serializeInt96(LongTimestampBenchmarkData data)
+    public Object serializeFixed12(LongTimestampBenchmarkData data)
     {
         return serializePages(data);
     }
@@ -252,26 +253,29 @@ else if (TIMESTAMP_PICOS.equals(type)) {
                 TIMESTAMP_PICOS.writeObject(blockBuilder, value);
             }
             else if (INTEGER.equals(type)) {
-                blockBuilder.writeInt((int) value);
+                INTEGER.writeInt(blockBuilder, (int) value);
             }
             else if (SMALLINT.equals(type)) {
-                blockBuilder.writeShort((short) value);
+                SMALLINT.writeShort(blockBuilder, (short) value);
             }
             else if (TINYINT.equals(type)) {
-                blockBuilder.writeByte((byte) value);
+                TINYINT.writeByte(blockBuilder, (byte) value);
             }
             else if (type instanceof RowType) {
-                BlockBuilder row = blockBuilder.beginBlockEntry();
                 List<?> values = (List<?>) value;
                 if (values.size() != type.getTypeParameters().size()) {
                     throw new IllegalArgumentException("Size of types and values must have the same size");
                 }
-                List<SimpleEntry<Type, Object>> pairs = new ArrayList<>();
-                for (int i = 0; i < type.getTypeParameters().size(); i++) {
-                    pairs.add(new SimpleEntry<>(type.getTypeParameters().get(i), ((List<?>) value).get(i)));
-                }
-                pairs.forEach(p -> writeValue(p.getKey(), p.getValue(), row));
-                blockBuilder.closeEntry();
+                ((RowBlockBuilder) blockBuilder).buildEntry(fieldBuilders -> {
+                    List<SimpleEntry<Type, Object>> pairs = new ArrayList<>();
+                    for (int i = 0; i < type.getTypeParameters().size(); i++) {
+                        pairs.add(new SimpleEntry<>(type.getTypeParameters().get(i), ((List<?>) value).get(i)));
+                    }
+                    for (int i = 0; i < pairs.size(); i++) {
+                        SimpleEntry<Type, Object> p = pairs.get(i);
+                        writeValue(p.getKey(), p.getValue(), fieldBuilders.get(i));
+                    }
+                });
             }
             else {
                 throw new IllegalArgumentException("Unsupported type " + type);
diff --git a/core/trino-main/src/test/java/io/trino/execution/buffer/BenchmarkPagesSerde.java b/core/trino-main/src/test/java/io/trino/execution/buffer/BenchmarkPagesSerde.java
index 78ce940d604a..ea4fc3b395d0 100644
--- a/core/trino-main/src/test/java/io/trino/execution/buffer/BenchmarkPagesSerde.java
+++ b/core/trino-main/src/test/java/io/trino/execution/buffer/BenchmarkPagesSerde.java
@@ -20,6 +20,7 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.TestingBlockEncodingSerde;
 import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -33,7 +34,6 @@
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import javax.crypto.SecretKey;
 
@@ -170,7 +170,6 @@ else if (fieldValue instanceof String) {
             }
         }
 
-        // copied & modifed from TestRowBlock
         private List<Object>[] generateTestRows(Random random, List<Type> fieldTypes, int numRows)
         {
             @SuppressWarnings("unchecked")
diff --git a/core/trino-main/src/test/java/io/trino/execution/buffer/TestArbitraryOutputBuffer.java b/core/trino-main/src/test/java/io/trino/execution/buffer/TestArbitraryOutputBuffer.java
index eeb17cadfed7..da6da6cc64c7 100644
--- a/core/trino-main/src/test/java/io/trino/execution/buffer/TestArbitraryOutputBuffer.java
+++ b/core/trino-main/src/test/java/io/trino/execution/buffer/TestArbitraryOutputBuffer.java
@@ -24,9 +24,10 @@
 import io.trino.spi.Page;
 import io.trino.spi.QueryId;
 import io.trino.spi.type.BigintType;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -62,10 +63,12 @@
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestArbitraryOutputBuffer
 {
     private static final String TASK_INSTANCE_ID = "task-instance-id";
@@ -76,13 +79,13 @@ public class TestArbitraryOutputBuffer
 
     private ScheduledExecutorService stateNotificationExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         stateNotificationExecutor = newScheduledThreadPool(5, daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (stateNotificationExecutor != null) {
diff --git a/core/trino-main/src/test/java/io/trino/execution/buffer/TestBroadcastOutputBuffer.java b/core/trino-main/src/test/java/io/trino/execution/buffer/TestBroadcastOutputBuffer.java
index 7d6a49d982ce..d4cd9f8da586 100644
--- a/core/trino-main/src/test/java/io/trino/execution/buffer/TestBroadcastOutputBuffer.java
+++ b/core/trino-main/src/test/java/io/trino/execution/buffer/TestBroadcastOutputBuffer.java
@@ -26,9 +26,10 @@
 import io.trino.spi.Page;
 import io.trino.spi.QueryId;
 import io.trino.spi.type.BigintType;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -68,10 +69,12 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestBroadcastOutputBuffer
 {
     private static final String TASK_INSTANCE_ID = "task-instance-id";
@@ -83,13 +86,13 @@ public class TestBroadcastOutputBuffer
 
     private ScheduledExecutorService stateNotificationExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         stateNotificationExecutor = newScheduledThreadPool(5, daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (stateNotificationExecutor != null) {
diff --git a/core/trino-main/src/test/java/io/trino/execution/buffer/TestClientBuffer.java b/core/trino-main/src/test/java/io/trino/execution/buffer/TestClientBuffer.java
index c93dd792c2f2..92f2297d8370 100644
--- a/core/trino-main/src/test/java/io/trino/execution/buffer/TestClientBuffer.java
+++ b/core/trino-main/src/test/java/io/trino/execution/buffer/TestClientBuffer.java
@@ -15,6 +15,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.execution.buffer.ClientBuffer.PagesSupplier;
@@ -22,10 +24,7 @@
 import io.trino.execution.buffer.SerializedPageReference.PagesReleasedListener;
 import io.trino.spi.Page;
 import io.trino.spi.type.BigintType;
-import org.testng.annotations.Test;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
diff --git a/core/trino-main/src/test/java/io/trino/execution/buffer/TestPageCodecMarker.java b/core/trino-main/src/test/java/io/trino/execution/buffer/TestPageCodecMarker.java
index 126e0d4bb247..94e3cc148cb8 100644
--- a/core/trino-main/src/test/java/io/trino/execution/buffer/TestPageCodecMarker.java
+++ b/core/trino-main/src/test/java/io/trino/execution/buffer/TestPageCodecMarker.java
@@ -13,7 +13,7 @@
  */
 package io.trino.execution.buffer;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.execution.buffer.PageCodecMarker.COMPRESSED;
 import static io.trino.execution.buffer.PageCodecMarker.ENCRYPTED;
diff --git a/core/trino-main/src/test/java/io/trino/execution/buffer/TestPagesSerde.java b/core/trino-main/src/test/java/io/trino/execution/buffer/TestPagesSerde.java
index 744ccee92c78..5abb631e5b19 100644
--- a/core/trino-main/src/test/java/io/trino/execution/buffer/TestPagesSerde.java
+++ b/core/trino-main/src/test/java/io/trino/execution/buffer/TestPagesSerde.java
@@ -30,10 +30,10 @@
 import io.trino.spi.type.Type;
 import io.trino.tpch.LineItem;
 import io.trino.tpch.LineItemGenerator;
-import org.assertj.core.api.Assertions;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import javax.crypto.SecretKey;
 
@@ -51,20 +51,23 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static io.trino.util.Ciphers.createRandomAesEncryptionKey;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 
+@TestInstance(PER_CLASS)
 public class TestPagesSerde
 {
     private BlockEncodingSerde blockEncodingSerde;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         blockEncodingSerde = new InternalBlockEncodingSerde(new BlockEncodingManager(), TESTING_TYPE_MANAGER);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
     {
         blockEncodingSerde = null;
@@ -277,17 +280,18 @@ private void testDeserializationWithRollover(boolean encryptionEnabled, boolean
         VariableWidthBlock expected = (VariableWidthBlock) page.getBlock(0);
         VariableWidthBlock actual = (VariableWidthBlock) deserialized.getBlock(0);
 
-        Assertions.assertThat(actual.getRawSlice().getBytes()).isEqualTo(expected.getRawSlice().getBytes());
+        assertThat(actual.getRawSlice().getBytes()).isEqualTo(expected.getRawSlice().getBytes());
     }
 
     private static Page createTestPage(int numberOfEntries)
     {
         VariableWidthBlockBuilder blockBuilder = new VariableWidthBlockBuilder(null, 1, 1000);
-        blockBuilder.writeInt(numberOfEntries);
-        for (int i = 0; i < numberOfEntries; i++) {
-            blockBuilder.writeLong(i);
-        }
-        blockBuilder.closeEntry();
+        blockBuilder.buildEntry(value -> {
+            value.writeInt(numberOfEntries);
+            for (int i = 0; i < numberOfEntries; i++) {
+                value.writeLong(i);
+            }
+        });
         return new Page(blockBuilder.build());
     }
 
@@ -299,12 +303,13 @@ public Block readBlock(SliceInput input)
         {
             int numberOfEntries = input.readInt();
             VariableWidthBlockBuilder blockBuilder = new VariableWidthBlockBuilder(null, 1, 1000);
-            blockBuilder.writeInt(numberOfEntries);
-            for (int i = 0; i < numberOfEntries; ++i) {
-                // read 8 bytes at a time
-                blockBuilder.writeLong(input.readLong());
-            }
-            blockBuilder.closeEntry();
+            blockBuilder.buildEntry(value -> {
+                value.writeInt(numberOfEntries);
+                for (int i = 0; i < numberOfEntries; ++i) {
+                    // read 8 bytes at a time
+                    value.writeLong(input.readLong());
+                }
+            });
             return blockBuilder.build();
         }
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/buffer/TestPartitionedOutputBuffer.java b/core/trino-main/src/test/java/io/trino/execution/buffer/TestPartitionedOutputBuffer.java
index c83086fa8b7e..f8af1edc8bc2 100644
--- a/core/trino-main/src/test/java/io/trino/execution/buffer/TestPartitionedOutputBuffer.java
+++ b/core/trino-main/src/test/java/io/trino/execution/buffer/TestPartitionedOutputBuffer.java
@@ -23,9 +23,10 @@
 import io.trino.spi.Page;
 import io.trino.spi.QueryId;
 import io.trino.spi.type.BigintType;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,10 +59,12 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestPartitionedOutputBuffer
 {
     private static final String TASK_INSTANCE_ID = "task-instance-id";
@@ -72,13 +75,13 @@ public class TestPartitionedOutputBuffer
 
     private ScheduledExecutorService stateNotificationExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         stateNotificationExecutor = newScheduledThreadPool(5, daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (stateNotificationExecutor != null) {
diff --git a/core/trino-main/src/test/java/io/trino/execution/buffer/TestSpoolingExchangeOutputBuffer.java b/core/trino-main/src/test/java/io/trino/execution/buffer/TestSpoolingExchangeOutputBuffer.java
index 9073e4d31641..a453146ce3fe 100644
--- a/core/trino-main/src/test/java/io/trino/execution/buffer/TestSpoolingExchangeOutputBuffer.java
+++ b/core/trino-main/src/test/java/io/trino/execution/buffer/TestSpoolingExchangeOutputBuffer.java
@@ -25,11 +25,11 @@
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.QueryId;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.TestingBlockEncodingSerde;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.exchange.ExchangeSink;
 import io.trino.spi.exchange.ExchangeSinkInstanceHandle;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -309,9 +309,8 @@ private static Slice createPage(String value)
         PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(VARCHAR));
         pageBuilder.declarePosition();
         Slice valueSlice = utf8Slice(value);
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-        blockBuilder.writeBytes(valueSlice, 0, valueSlice.length());
-        blockBuilder.closeEntry();
+        VariableWidthBlockBuilder blockBuilder = (VariableWidthBlockBuilder) pageBuilder.getBlockBuilder(0);
+        blockBuilder.writeEntry(valueSlice);
         Page page = pageBuilder.build();
         PageSerializer serializer = new PagesSerdeFactory(new TestingBlockEncodingSerde(), false).createSerializer(Optional.empty());
         return serializer.serialize(page);
diff --git a/core/trino-main/src/test/java/io/trino/execution/buffer/TestSpoolingOutputStats.java b/core/trino-main/src/test/java/io/trino/execution/buffer/TestSpoolingOutputStats.java
index bc2055210e7b..48f5d98b2af2 100644
--- a/core/trino-main/src/test/java/io/trino/execution/buffer/TestSpoolingOutputStats.java
+++ b/core/trino-main/src/test/java/io/trino/execution/buffer/TestSpoolingOutputStats.java
@@ -13,7 +13,7 @@
  */
 package io.trino.execution.buffer;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.Percentage.withPercentage;
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/TaskExecutorSimulator.java b/core/trino-main/src/test/java/io/trino/execution/executor/TaskExecutorSimulator.java
deleted file mode 100644
index 115fa3588dad..000000000000
--- a/core/trino-main/src/test/java/io/trino/execution/executor/TaskExecutorSimulator.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.executor;
-
-import com.google.common.base.Ticker;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ListMultimap;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import io.airlift.units.Duration;
-import io.trino.execution.executor.SimulationController.TaskSpecification;
-import io.trino.execution.executor.SplitGenerators.AggregatedLeafSplitGenerator;
-import io.trino.execution.executor.SplitGenerators.FastLeafSplitGenerator;
-import io.trino.execution.executor.SplitGenerators.IntermediateSplitGenerator;
-import io.trino.execution.executor.SplitGenerators.L4LeafSplitGenerator;
-import io.trino.execution.executor.SplitGenerators.QuantaExceedingSplitGenerator;
-import io.trino.execution.executor.SplitGenerators.SimpleLeafSplitGenerator;
-import io.trino.execution.executor.SplitGenerators.SlowLeafSplitGenerator;
-import org.joda.time.DateTime;
-
-import java.io.Closeable;
-import java.util.List;
-import java.util.LongSummaryStatistics;
-import java.util.Map;
-import java.util.OptionalInt;
-import java.util.Set;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.stream.Collectors;
-
-import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator;
-import static io.airlift.concurrent.Threads.threadsNamed;
-import static io.airlift.units.Duration.nanosSince;
-import static io.airlift.units.Duration.succinctNanos;
-import static io.trino.execution.executor.Histogram.fromContinuous;
-import static io.trino.execution.executor.Histogram.fromDiscrete;
-import static io.trino.execution.executor.SimulationController.TaskSpecification.Type.INTERMEDIATE;
-import static io.trino.execution.executor.SimulationController.TaskSpecification.Type.LEAF;
-import static java.lang.String.format;
-import static java.util.concurrent.Executors.newCachedThreadPool;
-import static java.util.concurrent.Executors.newScheduledThreadPool;
-import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
-import static java.util.concurrent.TimeUnit.DAYS;
-import static java.util.concurrent.TimeUnit.HOURS;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.MINUTES;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static java.util.function.Function.identity;
-
-public class TaskExecutorSimulator
-        implements Closeable
-{
-    public static void main(String[] args)
-            throws Exception
-    {
-        try (TaskExecutorSimulator simulator = new TaskExecutorSimulator()) {
-            simulator.run();
-        }
-    }
-
-    private final ListeningExecutorService submissionExecutor = listeningDecorator(newCachedThreadPool(threadsNamed(getClass().getSimpleName() + "-%s")));
-    private final ScheduledExecutorService overallStatusPrintExecutor = newSingleThreadScheduledExecutor();
-    private final ScheduledExecutorService runningSplitsPrintExecutor = newSingleThreadScheduledExecutor();
-    private final ScheduledExecutorService wakeupExecutor = newScheduledThreadPool(32);
-
-    private final TaskExecutor taskExecutor;
-    private final MultilevelSplitQueue splitQueue;
-
-    private TaskExecutorSimulator()
-    {
-        splitQueue = new MultilevelSplitQueue(2);
-        taskExecutor = new TaskExecutor(36, 72, 3, 8, splitQueue, Ticker.systemTicker());
-        taskExecutor.start();
-    }
-
-    @Override
-    public void close()
-    {
-        submissionExecutor.shutdownNow();
-        overallStatusPrintExecutor.shutdownNow();
-        runningSplitsPrintExecutor.shutdownNow();
-        wakeupExecutor.shutdownNow();
-        taskExecutor.stop();
-    }
-
-    public void run()
-            throws Exception
-    {
-        long start = System.nanoTime();
-        scheduleStatusPrinter(start);
-
-        SimulationController controller = new SimulationController(taskExecutor, TaskExecutorSimulator::printSummaryStats);
-
-        // Uncomment one of these:
-        // runExperimentOverloadedCluster(controller);
-        // runExperimentMisbehavingQuanta(controller);
-        // runExperimentStarveSlowSplits(controller);
-        runExperimentWithinLevelFairness(controller);
-
-        System.out.println("Stopped scheduling new tasks. Ending simulation..");
-        controller.stop();
-        close();
-
-        SECONDS.sleep(5);
-
-        System.out.println();
-        System.out.println("Simulation finished at " + DateTime.now() + ". Runtime: " + nanosSince(start));
-        System.out.println();
-
-        printSummaryStats(controller, taskExecutor);
-    }
-
-    private void runExperimentOverloadedCluster(SimulationController controller)
-            throws InterruptedException
-    {
-        /*
-        Designed to simulate a somewhat overloaded Hive cluster.
-        The following data is a point-in-time snapshot representative production cluster:
-            - 60 running queries => 45 queries/node
-            - 80 tasks/node
-            - 600 splits scheduled/node (80% intermediate => ~480, 20% leaf => 120)
-            - Only 60% intermediate splits will ever get data (~300)
-
-        Desired result:
-        This experiment should demonstrate the trade-offs that will be made during periods when a
-        node is under heavy load. Ideally, the different classes of tasks should each accumulate
-        scheduled time, and not spend disproportionately long waiting.
-        */
-
-        System.out.println("Overload experiment started.");
-        TaskSpecification leafSpec = new TaskSpecification(LEAF, "leaf", OptionalInt.empty(), 16, 30, new AggregatedLeafSplitGenerator());
-        controller.addTaskSpecification(leafSpec);
-
-        TaskSpecification slowLeafSpec = new TaskSpecification(LEAF, "slow_leaf", OptionalInt.empty(), 16, 10, new SlowLeafSplitGenerator());
-        controller.addTaskSpecification(slowLeafSpec);
-
-        TaskSpecification intermediateSpec = new TaskSpecification(INTERMEDIATE, "intermediate", OptionalInt.empty(), 8, 40, new IntermediateSplitGenerator(wakeupExecutor));
-        controller.addTaskSpecification(intermediateSpec);
-
-        controller.enableSpecification(leafSpec);
-        controller.enableSpecification(slowLeafSpec);
-        controller.enableSpecification(intermediateSpec);
-        controller.run();
-
-        SECONDS.sleep(30);
-
-        // this gets the executor into a more realistic point-in-time state, where long-running tasks start to make progress
-        for (int i = 0; i < 20; i++) {
-            controller.clearPendingQueue();
-            MINUTES.sleep(1);
-        }
-
-        System.out.println("Overload experiment completed.");
-    }
-
-    private void runExperimentStarveSlowSplits(SimulationController controller)
-            throws InterruptedException
-    {
-        /*
-        Designed to simulate how higher level admission control affects short-term scheduling decisions.
-        A fixed, large number of tasks (120) are submitted at approximately the same time.
-
-        Desired result:
-        Trino is designed to prioritize fast, short tasks at the expense of longer slower tasks.
-        This experiment allows us to quantify exactly how this preference manifests itself. It is
-        expected that shorter tasks will complete faster, however, longer tasks should not starve
-        for more than a couple of minutes at a time.
-        */
-
-        System.out.println("Starvation experiment started.");
-        TaskSpecification slowLeafSpec = new TaskSpecification(LEAF, "slow_leaf", OptionalInt.of(600), 40, 4, new SlowLeafSplitGenerator());
-        controller.addTaskSpecification(slowLeafSpec);
-
-        TaskSpecification intermediateSpec = new TaskSpecification(INTERMEDIATE, "intermediate", OptionalInt.of(400), 40, 8, new IntermediateSplitGenerator(wakeupExecutor));
-        controller.addTaskSpecification(intermediateSpec);
-
-        TaskSpecification fastLeafSpec = new TaskSpecification(LEAF, "fast_leaf", OptionalInt.of(600), 40, 4, new FastLeafSplitGenerator());
-        controller.addTaskSpecification(fastLeafSpec);
-
-        controller.enableSpecification(slowLeafSpec);
-        controller.enableSpecification(fastLeafSpec);
-        controller.enableSpecification(intermediateSpec);
-
-        controller.run();
-
-        for (int i = 0; i < 60; i++) {
-            SECONDS.sleep(20);
-            controller.clearPendingQueue();
-        }
-
-        System.out.println("Starvation experiment completed.");
-    }
-
-    private void runExperimentMisbehavingQuanta(SimulationController controller)
-            throws InterruptedException
-    {
-        /*
-        Designed to simulate how Trino allocates resources in scenarios where there is variance in
-        quanta run-time between tasks.
-
-        Desired result:
-        Variance in quanta run time should not affect total accrued scheduled time. It is
-        acceptable, however, to penalize tasks that use extremely short quanta, as each quanta
-        incurs scheduling overhead.
-        */
-
-        System.out.println("Misbehaving quanta experiment started.");
-
-        TaskSpecification slowLeafSpec = new TaskSpecification(LEAF, "good_leaf", OptionalInt.empty(), 16, 4, new L4LeafSplitGenerator());
-        controller.addTaskSpecification(slowLeafSpec);
-
-        TaskSpecification misbehavingLeafSpec = new TaskSpecification(LEAF, "bad_leaf", OptionalInt.empty(), 16, 4, new QuantaExceedingSplitGenerator());
-        controller.addTaskSpecification(misbehavingLeafSpec);
-
-        controller.enableSpecification(slowLeafSpec);
-        controller.enableSpecification(misbehavingLeafSpec);
-
-        controller.run();
-
-        for (int i = 0; i < 120; i++) {
-            controller.clearPendingQueue();
-            SECONDS.sleep(20);
-        }
-
-        System.out.println("Misbehaving quanta experiment completed.");
-    }
-
-    private void runExperimentWithinLevelFairness(SimulationController controller)
-            throws InterruptedException
-    {
-        /*
-        Designed to simulate how Trino allocates resources to tasks at the same level of the
-        feedback queue when there is large variance in accrued scheduled time.
-
-        Desired result:
-        Scheduling within levels should be fair - total accrued time should not affect what
-        fraction of resources tasks are allocated as long as they are in the same level.
-        */
-
-        System.out.println("Level fairness experiment started.");
-
-        TaskSpecification longLeafSpec = new TaskSpecification(INTERMEDIATE, "l4_long", OptionalInt.empty(), 2, 16, new SimpleLeafSplitGenerator(MINUTES.toNanos(4), SECONDS.toNanos(1)));
-        controller.addTaskSpecification(longLeafSpec);
-
-        TaskSpecification shortLeafSpec = new TaskSpecification(INTERMEDIATE, "l4_short", OptionalInt.empty(), 2, 16, new SimpleLeafSplitGenerator(MINUTES.toNanos(2), SECONDS.toNanos(1)));
-        controller.addTaskSpecification(shortLeafSpec);
-
-        controller.enableSpecification(longLeafSpec);
-        controller.run();
-
-        // wait until long tasks are all well into L4
-        MINUTES.sleep(1);
-        controller.runCallback();
-
-        // start short leaf tasks
-        controller.enableSpecification(shortLeafSpec);
-
-        // wait until short tasks hit L4
-        SECONDS.sleep(25);
-        controller.runCallback();
-
-        // now watch for L4 fairness at this point
-        MINUTES.sleep(2);
-
-        System.out.println("Level fairness experiment completed.");
-    }
-
-    private void scheduleStatusPrinter(long start)
-    {
-        overallStatusPrintExecutor.scheduleAtFixedRate(() -> {
-            try {
-                System.out.printf(
-                        "%6s -- %4s splits (R: %2s  L: %3s  I: %3s  B: %3s  W: %3s  C: %5s)  |  %3s tasks (%3s %3s %3s %3s %3s)  |  Selections: %4s %4s %4s %4s %3s\n",
-                        nanosSince(start),
-                        taskExecutor.getTotalSplits(),
-                        taskExecutor.getRunningSplits(),
-                        taskExecutor.getTotalSplits() - taskExecutor.getIntermediateSplits(),
-                        taskExecutor.getIntermediateSplits(),
-                        taskExecutor.getBlockedSplits(),
-                        taskExecutor.getWaitingSplits(),
-                        taskExecutor.getCompletedSplitsLevel0() + taskExecutor.getCompletedSplitsLevel1() + taskExecutor.getCompletedSplitsLevel2() + taskExecutor.getCompletedSplitsLevel3() + taskExecutor.getCompletedSplitsLevel4(),
-                        taskExecutor.getTasks(),
-                        taskExecutor.getRunningTasksLevel0(),
-                        taskExecutor.getRunningTasksLevel1(),
-                        taskExecutor.getRunningTasksLevel2(),
-                        taskExecutor.getRunningTasksLevel3(),
-                        taskExecutor.getRunningTasksLevel4(),
-                        (int) splitQueue.getSelectedCountLevel0().getOneMinute().getRate(),
-                        (int) splitQueue.getSelectedCountLevel1().getOneMinute().getRate(),
-                        (int) splitQueue.getSelectedCountLevel2().getOneMinute().getRate(),
-                        (int) splitQueue.getSelectedCountLevel3().getOneMinute().getRate(),
-                        (int) splitQueue.getSelectedCountLevel4().getOneMinute().getRate());
-            }
-            catch (Exception ignored) {
-            }
-        }, 1, 1, SECONDS);
-    }
-
-    private static void printSummaryStats(SimulationController controller, TaskExecutor taskExecutor)
-    {
-        Map<TaskSpecification, Boolean> specEnabled = controller.getSpecificationEnabled();
-
-        ListMultimap<TaskSpecification, SimulationTask> completedTasks = controller.getCompletedTasks();
-        ListMultimap<TaskSpecification, SimulationTask> runningTasks = controller.getRunningTasks();
-        Set<SimulationTask> allTasks = ImmutableSet.<SimulationTask>builder().addAll(completedTasks.values()).addAll(runningTasks.values()).build();
-
-        long completedSplits = completedTasks.values().stream().mapToInt(t -> t.getCompletedSplits().size()).sum();
-        long runningSplits = runningTasks.values().stream().mapToInt(t -> t.getCompletedSplits().size()).sum();
-
-        System.out.println("Completed tasks : " + completedTasks.size());
-        System.out.println("Remaining tasks : " + runningTasks.size());
-        System.out.println("Completed splits: " + completedSplits);
-        System.out.println("Remaining splits: " + runningSplits);
-        System.out.println();
-        System.out.println("Completed tasks  L0: " + taskExecutor.getCompletedTasksLevel0());
-        System.out.println("Completed tasks  L1: " + taskExecutor.getCompletedTasksLevel1());
-        System.out.println("Completed tasks  L2: " + taskExecutor.getCompletedTasksLevel2());
-        System.out.println("Completed tasks  L3: " + taskExecutor.getCompletedTasksLevel3());
-        System.out.println("Completed tasks  L4: " + taskExecutor.getCompletedTasksLevel4());
-        System.out.println();
-        System.out.println("Completed splits L0: " + taskExecutor.getCompletedSplitsLevel0());
-        System.out.println("Completed splits L1: " + taskExecutor.getCompletedSplitsLevel1());
-        System.out.println("Completed splits L2: " + taskExecutor.getCompletedSplitsLevel2());
-        System.out.println("Completed splits L3: " + taskExecutor.getCompletedSplitsLevel3());
-        System.out.println("Completed splits L4: " + taskExecutor.getCompletedSplitsLevel4());
-
-        Histogram<Long> levelsHistogram = fromContinuous(ImmutableList.of(
-                MILLISECONDS.toNanos(0L),
-                MILLISECONDS.toNanos(1_000),
-                MILLISECONDS.toNanos(10_000L),
-                MILLISECONDS.toNanos(60_000L),
-                MILLISECONDS.toNanos(300_000L),
-                HOURS.toNanos(1),
-                DAYS.toNanos(1)));
-
-        System.out.println();
-        System.out.println("Levels - Completed Task Processed Time");
-        levelsHistogram.printDistribution(
-                completedTasks.values().stream().filter(t -> t.getSpecification().getType() == LEAF).collect(Collectors.toList()),
-                SimulationTask::getScheduledTimeNanos,
-                SimulationTask::getProcessedTimeNanos,
-                Duration::succinctNanos,
-                TaskExecutorSimulator::formatNanos);
-
-        System.out.println();
-        System.out.println("Levels - Running Task Processed Time");
-        levelsHistogram.printDistribution(
-                runningTasks.values().stream().filter(t -> t.getSpecification().getType() == LEAF).collect(Collectors.toList()),
-                SimulationTask::getScheduledTimeNanos,
-                SimulationTask::getProcessedTimeNanos,
-                Duration::succinctNanos,
-                TaskExecutorSimulator::formatNanos);
-
-        System.out.println();
-        System.out.println("Levels - All Task Wait Time");
-        levelsHistogram.printDistribution(
-                runningTasks.values().stream().filter(t -> t.getSpecification().getType() == LEAF).collect(Collectors.toList()),
-                SimulationTask::getScheduledTimeNanos,
-                SimulationTask::getTotalWaitTimeNanos,
-                Duration::succinctNanos,
-                TaskExecutorSimulator::formatNanos);
-
-        System.out.println();
-        System.out.println("Specification - Processed time");
-        Set<String> specifications = runningTasks.values().stream().map(t -> t.getSpecification().getName()).collect(Collectors.toSet());
-        fromDiscrete(specifications).printDistribution(
-                allTasks,
-                t -> t.getSpecification().getName(),
-                SimulationTask::getProcessedTimeNanos,
-                identity(),
-                TaskExecutorSimulator::formatNanos);
-
-        System.out.println();
-        System.out.println("Specification - Wait time");
-        fromDiscrete(specifications).printDistribution(
-                allTasks,
-                t -> t.getSpecification().getName(),
-                SimulationTask::getTotalWaitTimeNanos,
-                identity(),
-                TaskExecutorSimulator::formatNanos);
-
-        System.out.println();
-        System.out.println("Breakdown by specification");
-        System.out.println("##########################");
-        for (TaskSpecification specification : specEnabled.keySet()) {
-            List<SimulationTask> allSpecificationTasks = ImmutableList.<SimulationTask>builder()
-                    .addAll(completedTasks.get(specification))
-                    .addAll(runningTasks.get(specification))
-                    .build();
-
-            System.out.println(specification.getName());
-            System.out.println("=============================");
-            System.out.println("Completed tasks           : " + completedTasks.get(specification).size());
-            System.out.println("In-progress tasks         : " + runningTasks.get(specification).size());
-            System.out.println("Total tasks               : " + specification.getTotalTasks());
-            System.out.println("Splits/task               : " + specification.getNumSplitsPerTask());
-            System.out.println("Current required time     : " + succinctNanos(allSpecificationTasks.stream().mapToLong(SimulationTask::getScheduledTimeNanos).sum()));
-            System.out.println("Completed scheduled time  : " + succinctNanos(allSpecificationTasks.stream().mapToLong(SimulationTask::getProcessedTimeNanos).sum()));
-            System.out.println("Total wait time           : " + succinctNanos(allSpecificationTasks.stream().mapToLong(SimulationTask::getTotalWaitTimeNanos).sum()));
-
-            System.out.println();
-            System.out.println("All Tasks by Scheduled time - Processed Time");
-            levelsHistogram.printDistribution(
-                    allSpecificationTasks,
-                    SimulationTask::getScheduledTimeNanos,
-                    SimulationTask::getProcessedTimeNanos,
-                    Duration::succinctNanos,
-                    TaskExecutorSimulator::formatNanos);
-
-            System.out.println();
-            System.out.println("All Tasks by Scheduled time - Wait Time");
-            levelsHistogram.printDistribution(
-                    allSpecificationTasks,
-                    SimulationTask::getScheduledTimeNanos,
-                    SimulationTask::getTotalWaitTimeNanos,
-                    Duration::succinctNanos,
-                    TaskExecutorSimulator::formatNanos);
-
-            System.out.println();
-            System.out.println("Complete Tasks by Scheduled time - Wait Time");
-            levelsHistogram.printDistribution(
-                    completedTasks.get(specification),
-                    SimulationTask::getScheduledTimeNanos,
-                    SimulationTask::getTotalWaitTimeNanos,
-                    Duration::succinctNanos,
-                    TaskExecutorSimulator::formatNanos);
-        }
-    }
-
-    private static String formatNanos(List<Long> list)
-    {
-        LongSummaryStatistics stats = list.stream().mapToLong(Long::new).summaryStatistics();
-        return format(
-                "Min: %8s  Max: %8s  Avg: %8s  Sum: %8s",
-                succinctNanos(stats.getMin() == Long.MAX_VALUE ? 0 : stats.getMin()),
-                succinctNanos(stats.getMax() == Long.MIN_VALUE ? 0 : stats.getMax()),
-                succinctNanos((long) stats.getAverage()),
-                succinctNanos(stats.getSum()));
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/TestTaskExecutor.java b/core/trino-main/src/test/java/io/trino/execution/executor/TestTaskExecutor.java
deleted file mode 100644
index 888d30c0231a..000000000000
--- a/core/trino-main/src/test/java/io/trino/execution/executor/TestTaskExecutor.java
+++ /dev/null
@@ -1,651 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.executor;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
-import io.airlift.testing.TestingTicker;
-import io.airlift.units.Duration;
-import io.trino.execution.SplitRunner;
-import io.trino.execution.StageId;
-import io.trino.execution.TaskId;
-import io.trino.spi.QueryId;
-import org.testng.annotations.Test;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.OptionalInt;
-import java.util.concurrent.Future;
-import java.util.concurrent.Phaser;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
-import static io.airlift.testing.Assertions.assertGreaterThan;
-import static io.airlift.testing.Assertions.assertLessThan;
-import static io.trino.execution.executor.MultilevelSplitQueue.LEVEL_CONTRIBUTION_CAP;
-import static io.trino.execution.executor.MultilevelSplitQueue.LEVEL_THRESHOLD_SECONDS;
-import static java.lang.Double.isNaN;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.MINUTES;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-public class TestTaskExecutor
-{
-    @Test(invocationCount = 100)
-    public void testTasksComplete()
-            throws Exception
-    {
-        TestingTicker ticker = new TestingTicker();
-        Duration splitProcessingDurationThreshold = new Duration(10, MINUTES);
-
-        TaskExecutor taskExecutor = new TaskExecutor(4, 8, 3, 4, ticker);
-
-        taskExecutor.start();
-        try {
-            ticker.increment(20, MILLISECONDS);
-            TaskId taskId = new TaskId(new StageId("test", 0), 0, 0);
-            TaskHandle taskHandle = taskExecutor.addTask(taskId, () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
-
-            Phaser beginPhase = new Phaser();
-            beginPhase.register();
-            Phaser verificationComplete = new Phaser();
-            verificationComplete.register();
-
-            // add two jobs
-            TestingJob driver1 = new TestingJob(ticker, new Phaser(), beginPhase, verificationComplete, 10, 0);
-            ListenableFuture<Void> future1 = getOnlyElement(taskExecutor.enqueueSplits(taskHandle, true, ImmutableList.of(driver1)));
-            TestingJob driver2 = new TestingJob(ticker, new Phaser(), beginPhase, verificationComplete, 10, 0);
-            ListenableFuture<Void> future2 = getOnlyElement(taskExecutor.enqueueSplits(taskHandle, true, ImmutableList.of(driver2)));
-            assertEquals(driver1.getCompletedPhases(), 0);
-            assertEquals(driver2.getCompletedPhases(), 0);
-
-            // verify worker have arrived but haven't processed yet
-            beginPhase.arriveAndAwaitAdvance();
-            assertEquals(driver1.getCompletedPhases(), 0);
-            assertEquals(driver2.getCompletedPhases(), 0);
-            ticker.increment(60, SECONDS);
-            assertTrue(taskExecutor.getStuckSplitTaskIds(splitProcessingDurationThreshold, runningSplitInfo -> true).isEmpty());
-            assertEquals(taskExecutor.getRunAwaySplitCount(), 0);
-            ticker.increment(600, SECONDS);
-            assertEquals(taskExecutor.getRunAwaySplitCount(), 2);
-            assertEquals(taskExecutor.getStuckSplitTaskIds(splitProcessingDurationThreshold, runningSplitInfo -> true), ImmutableSet.of(taskId));
-
-            verificationComplete.arriveAndAwaitAdvance();
-
-            // advance one phase and verify
-            beginPhase.arriveAndAwaitAdvance();
-            assertEquals(driver1.getCompletedPhases(), 1);
-            assertEquals(driver2.getCompletedPhases(), 1);
-
-            verificationComplete.arriveAndAwaitAdvance();
-
-            // add one more job
-            TestingJob driver3 = new TestingJob(ticker, new Phaser(), beginPhase, verificationComplete, 10, 0);
-            ListenableFuture<Void> future3 = getOnlyElement(taskExecutor.enqueueSplits(taskHandle, false, ImmutableList.of(driver3)));
-
-            // advance one phase and verify
-            beginPhase.arriveAndAwaitAdvance();
-            assertEquals(driver1.getCompletedPhases(), 2);
-            assertEquals(driver2.getCompletedPhases(), 2);
-            assertEquals(driver3.getCompletedPhases(), 0);
-            verificationComplete.arriveAndAwaitAdvance();
-
-            // advance to the end of the first two task and verify
-            beginPhase.arriveAndAwaitAdvance();
-            for (int i = 0; i < 7; i++) {
-                verificationComplete.arriveAndAwaitAdvance();
-                beginPhase.arriveAndAwaitAdvance();
-                assertEquals(beginPhase.getPhase(), verificationComplete.getPhase() + 1);
-            }
-            assertEquals(driver1.getCompletedPhases(), 10);
-            assertEquals(driver2.getCompletedPhases(), 10);
-            assertEquals(driver3.getCompletedPhases(), 8);
-            future1.get(1, SECONDS);
-            future2.get(1, SECONDS);
-            verificationComplete.arriveAndAwaitAdvance();
-
-            // advance two more times and verify
-            beginPhase.arriveAndAwaitAdvance();
-            verificationComplete.arriveAndAwaitAdvance();
-            beginPhase.arriveAndAwaitAdvance();
-            assertEquals(driver1.getCompletedPhases(), 10);
-            assertEquals(driver2.getCompletedPhases(), 10);
-            assertEquals(driver3.getCompletedPhases(), 10);
-            future3.get(1, SECONDS);
-            verificationComplete.arriveAndAwaitAdvance();
-
-            assertEquals(driver1.getFirstPhase(), 0);
-            assertEquals(driver2.getFirstPhase(), 0);
-            assertEquals(driver3.getFirstPhase(), 2);
-
-            assertEquals(driver1.getLastPhase(), 10);
-            assertEquals(driver2.getLastPhase(), 10);
-            assertEquals(driver3.getLastPhase(), 12);
-
-            // no splits remaining
-            ticker.increment(610, SECONDS);
-            assertTrue(taskExecutor.getStuckSplitTaskIds(splitProcessingDurationThreshold, runningSplitInfo -> true).isEmpty());
-            assertEquals(taskExecutor.getRunAwaySplitCount(), 0);
-        }
-        finally {
-            taskExecutor.stop();
-        }
-    }
-
-    @Test(invocationCount = 100)
-    public void testQuantaFairness()
-    {
-        TestingTicker ticker = new TestingTicker();
-        TaskExecutor taskExecutor = new TaskExecutor(1, 2, 3, 4, ticker);
-
-        taskExecutor.start();
-        try {
-            ticker.increment(20, MILLISECONDS);
-            TaskHandle shortQuantaTaskHandle = taskExecutor.addTask(new TaskId(new StageId("short_quanta", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
-            TaskHandle longQuantaTaskHandle = taskExecutor.addTask(new TaskId(new StageId("long_quanta", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
-
-            Phaser endQuantaPhaser = new Phaser();
-
-            TestingJob shortQuantaDriver = new TestingJob(ticker, new Phaser(), new Phaser(), endQuantaPhaser, 10, 10);
-            TestingJob longQuantaDriver = new TestingJob(ticker, new Phaser(), new Phaser(), endQuantaPhaser, 10, 20);
-
-            taskExecutor.enqueueSplits(shortQuantaTaskHandle, true, ImmutableList.of(shortQuantaDriver));
-            taskExecutor.enqueueSplits(longQuantaTaskHandle, true, ImmutableList.of(longQuantaDriver));
-
-            for (int i = 0; i < 11; i++) {
-                endQuantaPhaser.arriveAndAwaitAdvance();
-            }
-
-            assertTrue(shortQuantaDriver.getCompletedPhases() >= 7 && shortQuantaDriver.getCompletedPhases() <= 8);
-            assertTrue(longQuantaDriver.getCompletedPhases() >= 3 && longQuantaDriver.getCompletedPhases() <= 4);
-
-            endQuantaPhaser.arriveAndDeregister();
-        }
-        finally {
-            taskExecutor.stop();
-        }
-    }
-
-    @Test(invocationCount = 100)
-    public void testLevelMovement()
-    {
-        TestingTicker ticker = new TestingTicker();
-        TaskExecutor taskExecutor = new TaskExecutor(2, 2, 3, 4, ticker);
-
-        taskExecutor.start();
-        try {
-            ticker.increment(20, MILLISECONDS);
-            TaskHandle testTaskHandle = taskExecutor.addTask(new TaskId(new StageId("test", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
-
-            Phaser globalPhaser = new Phaser();
-            globalPhaser.bulkRegister(3); // 2 taskExecutor threads + test thread
-
-            int quantaTimeMills = 500;
-            int phasesPerSecond = 1000 / quantaTimeMills;
-            int totalPhases = LEVEL_THRESHOLD_SECONDS[LEVEL_THRESHOLD_SECONDS.length - 1] * phasesPerSecond;
-            TestingJob driver1 = new TestingJob(ticker, globalPhaser, new Phaser(), new Phaser(), totalPhases, quantaTimeMills);
-            TestingJob driver2 = new TestingJob(ticker, globalPhaser, new Phaser(), new Phaser(), totalPhases, quantaTimeMills);
-
-            taskExecutor.enqueueSplits(testTaskHandle, true, ImmutableList.of(driver1, driver2));
-
-            int completedPhases = 0;
-            for (int i = 0; i < (LEVEL_THRESHOLD_SECONDS.length - 1); i++) {
-                for (; (completedPhases / phasesPerSecond) < LEVEL_THRESHOLD_SECONDS[i + 1]; completedPhases++) {
-                    globalPhaser.arriveAndAwaitAdvance();
-                }
-
-                assertEquals(testTaskHandle.getPriority().getLevel(), i + 1);
-            }
-
-            globalPhaser.arriveAndDeregister();
-        }
-        finally {
-            taskExecutor.stop();
-        }
-    }
-
-    @Test(invocationCount = 100)
-    public void testLevelMultipliers()
-            throws Exception
-    {
-        TestingTicker ticker = new TestingTicker();
-        TaskExecutor taskExecutor = new TaskExecutor(6, 3, 3, 4, new MultilevelSplitQueue(2), ticker);
-
-        taskExecutor.start();
-        try {
-            ticker.increment(20, MILLISECONDS);
-            for (int i = 0; i < (LEVEL_THRESHOLD_SECONDS.length - 1); i++) {
-                TaskHandle[] taskHandles = {
-                        taskExecutor.addTask(new TaskId(new StageId("test1", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty()),
-                        taskExecutor.addTask(new TaskId(new StageId("test2", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty()),
-                        taskExecutor.addTask(new TaskId(new StageId("test3", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty())
-                };
-
-                // move task 0 to next level
-                TestingJob task0Job = new TestingJob(ticker, new Phaser(), new Phaser(), new Phaser(), 1, LEVEL_THRESHOLD_SECONDS[i + 1] * 1000);
-                taskExecutor.enqueueSplits(
-                        taskHandles[0],
-                        true,
-                        ImmutableList.of(task0Job));
-                // move tasks 1 and 2 to this level
-                TestingJob task1Job = new TestingJob(ticker, new Phaser(), new Phaser(), new Phaser(), 1, LEVEL_THRESHOLD_SECONDS[i] * 1000);
-                taskExecutor.enqueueSplits(
-                        taskHandles[1],
-                        true,
-                        ImmutableList.of(task1Job));
-                TestingJob task2Job = new TestingJob(ticker, new Phaser(), new Phaser(), new Phaser(), 1, LEVEL_THRESHOLD_SECONDS[i] * 1000);
-                taskExecutor.enqueueSplits(
-                        taskHandles[2],
-                        true,
-                        ImmutableList.of(task2Job));
-
-                task0Job.getCompletedFuture().get();
-                task1Job.getCompletedFuture().get();
-                task2Job.getCompletedFuture().get();
-
-                // then, start new drivers for all tasks
-                Phaser globalPhaser = new Phaser(7); // 6 taskExecutor threads + test thread
-                int phasesForNextLevel = LEVEL_THRESHOLD_SECONDS[i + 1] - LEVEL_THRESHOLD_SECONDS[i];
-                TestingJob[] drivers = new TestingJob[6];
-                for (int j = 0; j < 6; j++) {
-                    drivers[j] = new TestingJob(ticker, globalPhaser, new Phaser(), new Phaser(), phasesForNextLevel, 1000);
-                }
-
-                taskExecutor.enqueueSplits(taskHandles[0], true, ImmutableList.of(drivers[0], drivers[1]));
-                taskExecutor.enqueueSplits(taskHandles[1], true, ImmutableList.of(drivers[2], drivers[3]));
-                taskExecutor.enqueueSplits(taskHandles[2], true, ImmutableList.of(drivers[4], drivers[5]));
-
-                // run all three drivers
-                int lowerLevelStart = drivers[2].getCompletedPhases() + drivers[3].getCompletedPhases() + drivers[4].getCompletedPhases() + drivers[5].getCompletedPhases();
-                int higherLevelStart = drivers[0].getCompletedPhases() + drivers[1].getCompletedPhases();
-                while (Arrays.stream(drivers).noneMatch(TestingJob::isFinished)) {
-                    globalPhaser.arriveAndAwaitAdvance();
-
-                    int lowerLevelEnd = drivers[2].getCompletedPhases() + drivers[3].getCompletedPhases() + drivers[4].getCompletedPhases() + drivers[5].getCompletedPhases();
-                    int lowerLevelTime = lowerLevelEnd - lowerLevelStart;
-                    int higherLevelEnd = drivers[0].getCompletedPhases() + drivers[1].getCompletedPhases();
-                    int higherLevelTime = higherLevelEnd - higherLevelStart;
-
-                    if (higherLevelTime > 20) {
-                        assertGreaterThan(lowerLevelTime, (higherLevelTime * 2) - 10);
-                        assertLessThan(higherLevelTime, (lowerLevelTime * 2) + 10);
-                    }
-                }
-
-                globalPhaser.arriveAndDeregister();
-                taskExecutor.removeTask(taskHandles[0]);
-                taskExecutor.removeTask(taskHandles[1]);
-                taskExecutor.removeTask(taskHandles[2]);
-            }
-        }
-        finally {
-            taskExecutor.stop();
-        }
-    }
-
-    @Test
-    public void testTaskHandle()
-    {
-        TestingTicker ticker = new TestingTicker();
-        TaskExecutor taskExecutor = new TaskExecutor(4, 8, 3, 4, ticker);
-
-        taskExecutor.start();
-        try {
-            TaskId taskId = new TaskId(new StageId("test", 0), 0, 0);
-            TaskHandle taskHandle = taskExecutor.addTask(taskId, () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
-
-            Phaser beginPhase = new Phaser();
-            beginPhase.register();
-            Phaser verificationComplete = new Phaser();
-            verificationComplete.register();
-
-            TestingJob driver1 = new TestingJob(ticker, new Phaser(), beginPhase, verificationComplete, 10, 0);
-            TestingJob driver2 = new TestingJob(ticker, new Phaser(), beginPhase, verificationComplete, 10, 0);
-
-            // force enqueue a split
-            taskExecutor.enqueueSplits(taskHandle, true, ImmutableList.of(driver1));
-            assertEquals(taskHandle.getRunningLeafSplits(), 0);
-
-            // normal enqueue a split
-            taskExecutor.enqueueSplits(taskHandle, false, ImmutableList.of(driver2));
-            assertEquals(taskHandle.getRunningLeafSplits(), 1);
-
-            // let the split continue to run
-            beginPhase.arriveAndDeregister();
-            verificationComplete.arriveAndDeregister();
-        }
-        finally {
-            taskExecutor.stop();
-        }
-    }
-
-    @Test
-    public void testLevelContributionCap()
-    {
-        MultilevelSplitQueue splitQueue = new MultilevelSplitQueue(2);
-        TaskHandle handle0 = new TaskHandle(new TaskId(new StageId("test0", 0), 0, 0), splitQueue, () -> 1, 1, new Duration(1, SECONDS), OptionalInt.empty());
-        TaskHandle handle1 = new TaskHandle(new TaskId(new StageId("test1", 0), 0, 0), splitQueue, () -> 1, 1, new Duration(1, SECONDS), OptionalInt.empty());
-
-        for (int i = 0; i < (LEVEL_THRESHOLD_SECONDS.length - 1); i++) {
-            long levelAdvanceTime = SECONDS.toNanos(LEVEL_THRESHOLD_SECONDS[i + 1] - LEVEL_THRESHOLD_SECONDS[i]);
-            handle0.addScheduledNanos(levelAdvanceTime);
-            assertEquals(handle0.getPriority().getLevel(), i + 1);
-
-            handle1.addScheduledNanos(levelAdvanceTime);
-            assertEquals(handle1.getPriority().getLevel(), i + 1);
-
-            assertEquals(splitQueue.getLevelScheduledTime(i), 2 * Math.min(levelAdvanceTime, LEVEL_CONTRIBUTION_CAP));
-            assertEquals(splitQueue.getLevelScheduledTime(i + 1), 0);
-        }
-    }
-
-    @Test
-    public void testUpdateLevelWithCap()
-    {
-        MultilevelSplitQueue splitQueue = new MultilevelSplitQueue(2);
-        TaskHandle handle0 = new TaskHandle(new TaskId(new StageId("test0", 0), 0, 0), splitQueue, () -> 1, 1, new Duration(1, SECONDS), OptionalInt.empty());
-
-        long quantaNanos = MINUTES.toNanos(10);
-        handle0.addScheduledNanos(quantaNanos);
-        long cappedNanos = Math.min(quantaNanos, LEVEL_CONTRIBUTION_CAP);
-
-        for (int i = 0; i < (LEVEL_THRESHOLD_SECONDS.length - 1); i++) {
-            long thisLevelTime = Math.min(SECONDS.toNanos(LEVEL_THRESHOLD_SECONDS[i + 1] - LEVEL_THRESHOLD_SECONDS[i]), cappedNanos);
-            assertEquals(splitQueue.getLevelScheduledTime(i), thisLevelTime);
-            cappedNanos -= thisLevelTime;
-        }
-    }
-
-    @Test(timeOut = 30_000)
-    public void testMinMaxDriversPerTask()
-    {
-        int maxDriversPerTask = 2;
-        MultilevelSplitQueue splitQueue = new MultilevelSplitQueue(2);
-        TestingTicker ticker = new TestingTicker();
-        TaskExecutor taskExecutor = new TaskExecutor(4, 16, 1, maxDriversPerTask, splitQueue, ticker);
-
-        taskExecutor.start();
-        try {
-            TaskHandle testTaskHandle = taskExecutor.addTask(new TaskId(new StageId("test", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
-
-            // enqueue all batches of splits
-            int batchCount = 4;
-            TestingJob[] splits = new TestingJob[8];
-            Phaser[] phasers = new Phaser[batchCount];
-            for (int batch = 0; batch < batchCount; batch++) {
-                phasers[batch] = new Phaser();
-                phasers[batch].register();
-                TestingJob split1 = new TestingJob(ticker, new Phaser(), new Phaser(), phasers[batch], 1, 0);
-                TestingJob split2 = new TestingJob(ticker, new Phaser(), new Phaser(), phasers[batch], 1, 0);
-                splits[2 * batch] = split1;
-                splits[2 * batch + 1] = split2;
-                taskExecutor.enqueueSplits(testTaskHandle, false, ImmutableList.of(split1, split2));
-            }
-
-            // assert that the splits are processed in batches as expected
-            for (int batch = 0; batch < batchCount; batch++) {
-                // wait until the current batch starts
-                waitUntilSplitsStart(ImmutableList.of(splits[2 * batch], splits[2 * batch + 1]));
-                // assert that only the splits including and up to the current batch are running and the rest haven't started yet
-                assertSplitStates(2 * batch + 1, splits);
-                // complete the current batch
-                phasers[batch].arriveAndDeregister();
-            }
-        }
-        finally {
-            taskExecutor.stop();
-        }
-    }
-
-    @Test(timeOut = 30_000)
-    public void testUserSpecifiedMaxDriversPerTask()
-    {
-        MultilevelSplitQueue splitQueue = new MultilevelSplitQueue(2);
-        TestingTicker ticker = new TestingTicker();
-        // create a task executor with min/max drivers per task to be 2 and 4
-        TaskExecutor taskExecutor = new TaskExecutor(4, 16, 2, 4, splitQueue, ticker);
-
-        taskExecutor.start();
-        try {
-            // overwrite the max drivers per task to be 1
-            TaskHandle testTaskHandle = taskExecutor.addTask(new TaskId(new StageId("test", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.of(1));
-
-            // enqueue all batches of splits
-            int batchCount = 4;
-            TestingJob[] splits = new TestingJob[4];
-            Phaser[] phasers = new Phaser[batchCount];
-            for (int batch = 0; batch < batchCount; batch++) {
-                phasers[batch] = new Phaser();
-                phasers[batch].register();
-                TestingJob split = new TestingJob(ticker, new Phaser(), new Phaser(), phasers[batch], 1, 0);
-                splits[batch] = split;
-                taskExecutor.enqueueSplits(testTaskHandle, false, ImmutableList.of(split));
-            }
-
-            // assert that the splits are processed in batches as expected
-            for (int batch = 0; batch < batchCount; batch++) {
-                // wait until the current batch starts
-                waitUntilSplitsStart(ImmutableList.of(splits[batch]));
-                // assert that only the splits including and up to the current batch are running and the rest haven't started yet
-                assertSplitStates(batch, splits);
-                // complete the current batch
-                phasers[batch].arriveAndDeregister();
-            }
-        }
-        finally {
-            taskExecutor.stop();
-        }
-    }
-
-    @Test
-    public void testMinDriversPerTaskWhenTargetConcurrencyIncreases()
-    {
-        MultilevelSplitQueue splitQueue = new MultilevelSplitQueue(2);
-        TestingTicker ticker = new TestingTicker();
-        // create a task executor with min/max drivers per task to be 2
-        TaskExecutor taskExecutor = new TaskExecutor(4, 1, 2, 2, splitQueue, ticker);
-
-        taskExecutor.start();
-        try {
-            TaskHandle testTaskHandle = taskExecutor.addTask(
-                    new TaskId(new StageId(new QueryId("test"), 0), 0, 0),
-                    // make sure buffer is underutilized
-                    () -> 0,
-                    1,
-                    new Duration(1, MILLISECONDS),
-                    OptionalInt.of(2));
-
-            // create 3 splits
-            int batchCount = 3;
-            TestingJob[] splits = new TestingJob[3];
-            Phaser[] phasers = new Phaser[batchCount];
-            for (int batch = 0; batch < batchCount; batch++) {
-                phasers[batch] = new Phaser();
-                phasers[batch].register();
-                TestingJob split = new TestingJob(ticker, new Phaser(), new Phaser(), phasers[batch], 1, 0);
-                splits[batch] = split;
-            }
-
-            taskExecutor.enqueueSplits(testTaskHandle, false, ImmutableList.copyOf(splits));
-            // wait until first split starts
-            waitUntilSplitsStart(ImmutableList.of(splits[0]));
-            // remaining splits shouldn't start because initial split concurrency is 1
-            assertSplitStates(0, splits);
-
-            // complete first split (SplitConcurrencyController for TaskHandle should increase concurrency since buffer is underutilized)
-            phasers[0].arriveAndDeregister();
-
-            // 2 remaining splits should be started
-            waitUntilSplitsStart(ImmutableList.of(splits[1], splits[2]));
-        }
-        finally {
-            taskExecutor.stop();
-        }
-    }
-
-    @Test
-    public void testLeafSplitsSize()
-    {
-        MultilevelSplitQueue splitQueue = new MultilevelSplitQueue(2);
-        TestingTicker ticker = new TestingTicker();
-        TaskExecutor taskExecutor = new TaskExecutor(4, 1, 2, 2, splitQueue, ticker);
-
-        TaskHandle testTaskHandle = taskExecutor.addTask(new TaskId(new StageId("test", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
-        TestingJob driver1 = new TestingJob(ticker, new Phaser(), new Phaser(), new Phaser(), 1, 500);
-        TestingJob driver2 = new TestingJob(ticker, new Phaser(), new Phaser(), new Phaser(), 1, 1000 / 500);
-
-        ticker.increment(0, TimeUnit.SECONDS);
-        taskExecutor.enqueueSplits(testTaskHandle, false, ImmutableList.of(driver1, driver2));
-        assertTrue(isNaN(taskExecutor.getLeafSplitsSize().getAllTime().getMax()));
-
-        ticker.increment(1, TimeUnit.SECONDS);
-        taskExecutor.enqueueSplits(testTaskHandle, false, ImmutableList.of(driver1));
-        assertEquals(taskExecutor.getLeafSplitsSize().getAllTime().getMax(), 2.0);
-
-        ticker.increment(1, TimeUnit.SECONDS);
-        taskExecutor.enqueueSplits(testTaskHandle, true, ImmutableList.of(driver1));
-        assertEquals(taskExecutor.getLeafSplitsSize().getAllTime().getMax(), 2.0);
-    }
-
-    private void assertSplitStates(int endIndex, TestingJob[] splits)
-    {
-        // assert that splits up to and including endIndex are all started
-        for (int i = 0; i <= endIndex; i++) {
-            assertTrue(splits[i].isStarted());
-        }
-
-        // assert that splits starting from endIndex haven't started yet
-        for (int i = endIndex + 1; i < splits.length; i++) {
-            assertFalse(splits[i].isStarted());
-        }
-    }
-
-    private static void waitUntilSplitsStart(List<TestingJob> splits)
-    {
-        while (splits.stream().anyMatch(split -> !split.isStarted())) {
-            try {
-                Thread.sleep(200);
-            }
-            catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    private static class TestingJob
-            implements SplitRunner
-    {
-        private final TestingTicker ticker;
-        private final Phaser globalPhaser;
-        private final Phaser beginQuantaPhaser;
-        private final Phaser endQuantaPhaser;
-        private final int requiredPhases;
-        private final int quantaTimeMillis;
-        private final AtomicInteger completedPhases = new AtomicInteger();
-
-        private final AtomicInteger firstPhase = new AtomicInteger(-1);
-        private final AtomicInteger lastPhase = new AtomicInteger(-1);
-
-        private final AtomicBoolean started = new AtomicBoolean();
-        private final SettableFuture<Void> completed = SettableFuture.create();
-
-        public TestingJob(TestingTicker ticker, Phaser globalPhaser, Phaser beginQuantaPhaser, Phaser endQuantaPhaser, int requiredPhases, int quantaTimeMillis)
-        {
-            this.ticker = ticker;
-            this.globalPhaser = globalPhaser;
-            this.beginQuantaPhaser = beginQuantaPhaser;
-            this.endQuantaPhaser = endQuantaPhaser;
-            this.requiredPhases = requiredPhases;
-            this.quantaTimeMillis = quantaTimeMillis;
-
-            beginQuantaPhaser.register();
-            endQuantaPhaser.register();
-
-            if (globalPhaser.getRegisteredParties() == 0) {
-                globalPhaser.register();
-            }
-        }
-
-        private int getFirstPhase()
-        {
-            return firstPhase.get();
-        }
-
-        private int getLastPhase()
-        {
-            return lastPhase.get();
-        }
-
-        private int getCompletedPhases()
-        {
-            return completedPhases.get();
-        }
-
-        @Override
-        public ListenableFuture<Void> processFor(Duration duration)
-        {
-            started.set(true);
-            ticker.increment(quantaTimeMillis, MILLISECONDS);
-            globalPhaser.arriveAndAwaitAdvance();
-            int phase = beginQuantaPhaser.arriveAndAwaitAdvance();
-            firstPhase.compareAndSet(-1, phase - 1);
-            lastPhase.set(phase);
-            endQuantaPhaser.arriveAndAwaitAdvance();
-            if (completedPhases.incrementAndGet() >= requiredPhases) {
-                endQuantaPhaser.arriveAndDeregister();
-                beginQuantaPhaser.arriveAndDeregister();
-                globalPhaser.arriveAndDeregister();
-                completed.set(null);
-            }
-
-            return immediateVoidFuture();
-        }
-
-        @Override
-        public String getInfo()
-        {
-            return "testing-split";
-        }
-
-        @Override
-        public boolean isFinished()
-        {
-            return completed.isDone();
-        }
-
-        public boolean isStarted()
-        {
-            return started.get();
-        }
-
-        @Override
-        public void close()
-        {
-        }
-
-        public Future<Void> getCompletedFuture()
-        {
-            return completed;
-        }
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/dedicated/TestThreadPerDriverTaskExecutor.java b/core/trino-main/src/test/java/io/trino/execution/executor/dedicated/TestThreadPerDriverTaskExecutor.java
new file mode 100644
index 000000000000..2648bfbc581b
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/executor/dedicated/TestThreadPerDriverTaskExecutor.java
@@ -0,0 +1,258 @@
+/*
+ * Licensed 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 io.trino.execution.executor.dedicated;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.AbstractFuture;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import io.airlift.testing.TestingTicker;
+import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.trino.execution.SplitRunner;
+import io.trino.execution.StageId;
+import io.trino.execution.TaskId;
+import io.trino.execution.TaskManagerConfig;
+import io.trino.execution.executor.TaskHandle;
+import io.trino.execution.executor.scheduler.FairScheduler;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import java.util.List;
+import java.util.OptionalInt;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+import static io.airlift.tracing.Tracing.noopTracer;
+import static io.trino.version.EmbedVersion.testingVersionEmbedder;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestThreadPerDriverTaskExecutor
+{
+    @Test
+    @Timeout(10)
+    public void testCancellationWhileProcessing()
+            throws ExecutionException, InterruptedException
+    {
+        ThreadPerDriverTaskExecutor executor = new ThreadPerDriverTaskExecutor(new TaskManagerConfig(), noopTracer(), testingVersionEmbedder());
+        executor.start();
+        try {
+            TaskId taskId = new TaskId(new StageId("query", 1), 1, 1);
+            TaskHandle task = executor.addTask(taskId, () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
+
+            CountDownLatch started = new CountDownLatch(1);
+
+            SplitRunner split = new TestingSplitRunner(ImmutableList.of(duration -> {
+                started.countDown();
+                try {
+                    Thread.currentThread().join();
+                }
+                catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+
+                return Futures.immediateVoidFuture();
+            }));
+
+            ListenableFuture<Void> splitDone = executor.enqueueSplits(task, false, ImmutableList.of(split)).get(0);
+
+            started.await();
+            executor.removeTask(task);
+
+            splitDone.get();
+            assertThat(split.isFinished()).isTrue();
+        }
+        finally {
+            executor.stop();
+        }
+    }
+
+    @Test
+    @Timeout(10)
+    public void testBlocking()
+            throws ExecutionException, InterruptedException
+    {
+        ThreadPerDriverTaskExecutor executor = new ThreadPerDriverTaskExecutor(new TaskManagerConfig(), noopTracer(), testingVersionEmbedder());
+        executor.start();
+
+        try {
+            TaskId taskId = new TaskId(new StageId("query", 1), 1, 1);
+            TaskHandle task = executor.addTask(taskId, () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
+
+            TestFuture blocked = new TestFuture();
+
+            SplitRunner split = new TestingSplitRunner(ImmutableList.of(
+                    duration -> blocked,
+                    duration -> Futures.immediateVoidFuture()));
+
+            ListenableFuture<Void> splitDone = executor.enqueueSplits(task, false, ImmutableList.of(split)).get(0);
+
+            blocked.awaitListenerAdded();
+            blocked.set(null); // unblock the split
+
+            splitDone.get();
+            assertThat(split.isFinished()).isTrue();
+        }
+        finally {
+            executor.stop();
+        }
+    }
+
+    @Test
+    @Timeout(10)
+    public void testYielding()
+            throws ExecutionException, InterruptedException
+    {
+        TestingTicker ticker = new TestingTicker();
+        FairScheduler scheduler = new FairScheduler(1, "Runner-%d", ticker);
+        ThreadPerDriverTaskExecutor executor = new ThreadPerDriverTaskExecutor(noopTracer(), testingVersionEmbedder(), scheduler);
+        executor.start();
+
+        try {
+            TaskId taskId = new TaskId(new StageId("query", 1), 1, 1);
+            TaskHandle task = executor.addTask(taskId, () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
+
+            Phaser phaser = new Phaser(2);
+            SplitRunner split = new TestingSplitRunner(ImmutableList.of(
+                    duration -> {
+                        phaser.arriveAndAwaitAdvance(); // wait to start
+                        phaser.arriveAndAwaitAdvance(); // wait to advance time
+                        return Futures.immediateVoidFuture();
+                    },
+                    duration -> {
+                        phaser.arriveAndAwaitAdvance();
+                        return Futures.immediateVoidFuture();
+                    }));
+
+            ListenableFuture<Void> splitDone = executor.enqueueSplits(task, false, ImmutableList.of(split)).get(0);
+
+            phaser.arriveAndAwaitAdvance(); // wait for split to start
+
+            // cause the task to yield
+            ticker.increment(FairScheduler.QUANTUM_NANOS * 2, TimeUnit.NANOSECONDS);
+            phaser.arriveAndAwaitAdvance();
+
+            // wait for reschedule
+            assertThat(phaser.arriveAndAwaitAdvance()).isEqualTo(3); // wait for reschedule
+
+            splitDone.get();
+            assertThat(split.isFinished()).isTrue();
+        }
+        finally {
+            executor.stop();
+        }
+    }
+
+    private static class TestFuture
+            extends AbstractFuture<Void>
+    {
+        private final CountDownLatch listenerAdded = new CountDownLatch(1);
+
+        @Override
+        public void addListener(Runnable listener, Executor executor)
+        {
+            super.addListener(listener, executor);
+            listenerAdded.countDown();
+        }
+
+        @Override
+        public boolean set(Void value)
+        {
+            return super.set(value);
+        }
+
+        public void awaitListenerAdded()
+                throws InterruptedException
+        {
+            listenerAdded.await();
+        }
+    }
+
+    private static class TestingSplitRunner
+            implements SplitRunner
+    {
+        private final List<Function<Duration, ListenableFuture<Void>>> invocations;
+        private int invocation;
+        private volatile boolean finished;
+        private volatile Thread runnerThread;
+
+        public TestingSplitRunner(List<Function<Duration, ListenableFuture<Void>>> invocations)
+        {
+            this.invocations = invocations;
+        }
+
+        @Override
+        public final int getPipelineId()
+        {
+            return 0;
+        }
+
+        @Override
+        public final Span getPipelineSpan()
+        {
+            return Span.getInvalid();
+        }
+
+        @Override
+        public final boolean isFinished()
+        {
+            return finished;
+        }
+
+        @Override
+        public final ListenableFuture<Void> processFor(Duration duration)
+        {
+            ListenableFuture<Void> blocked;
+
+            runnerThread = Thread.currentThread();
+            try {
+                blocked = invocations.get(invocation).apply(duration);
+            }
+            finally {
+                runnerThread = null;
+            }
+
+            invocation++;
+
+            if (invocation == invocations.size()) {
+                finished = true;
+            }
+
+            return blocked;
+        }
+
+        @Override
+        public final String getInfo()
+        {
+            return "";
+        }
+
+        @Override
+        public final void close()
+        {
+            finished = true;
+
+            Thread runnerThread = this.runnerThread;
+
+            if (runnerThread != null) {
+                runnerThread.interrupt();
+            }
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/scheduler/TestFairScheduler.java b/core/trino-main/src/test/java/io/trino/execution/executor/scheduler/TestFairScheduler.java
new file mode 100644
index 000000000000..a7feb8fcc00c
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/executor/scheduler/TestFairScheduler.java
@@ -0,0 +1,247 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import com.google.common.util.concurrent.AbstractFuture;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
+import io.airlift.testing.TestingTicker;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestFairScheduler
+{
+    @Test
+    public void testBasic()
+            throws ExecutionException, InterruptedException
+    {
+        try (FairScheduler scheduler = FairScheduler.newInstance(1)) {
+            Group group = scheduler.createGroup("G1");
+
+            AtomicBoolean ran = new AtomicBoolean();
+            ListenableFuture<Void> done = scheduler.submit(group, 1, context -> ran.set(true));
+
+            done.get();
+            assertThat(ran.get())
+                    .describedAs("Ran task")
+                    .isTrue();
+        }
+    }
+
+    @Test
+    @Timeout(5)
+    public void testYield()
+            throws ExecutionException, InterruptedException
+    {
+        TestingTicker ticker = new TestingTicker();
+        try (FairScheduler scheduler = FairScheduler.newInstance(1, ticker)) {
+            Group group = scheduler.createGroup("G");
+
+            CountDownLatch task1Started = new CountDownLatch(1);
+            AtomicBoolean task2Ran = new AtomicBoolean();
+
+            ListenableFuture<Void> task1 = scheduler.submit(group, 1, context -> {
+                task1Started.countDown();
+                while (!task2Ran.get()) {
+                    if (!context.maybeYield()) {
+                        return;
+                    }
+                }
+            });
+
+            task1Started.await();
+
+            ListenableFuture<Void> task2 = scheduler.submit(group, 2, context -> {
+                task2Ran.set(true);
+            });
+
+            while (!task2.isDone()) {
+                ticker.increment(FairScheduler.QUANTUM_NANOS * 2, TimeUnit.NANOSECONDS);
+            }
+
+            task1.get();
+        }
+    }
+
+    @Test
+    public void testBlocking()
+            throws InterruptedException, ExecutionException
+    {
+        try (FairScheduler scheduler = FairScheduler.newInstance(1)) {
+            Group group = scheduler.createGroup("G");
+
+            CountDownLatch task1Started = new CountDownLatch(1);
+            CountDownLatch task2Submitted = new CountDownLatch(1);
+            CountDownLatch task2Started = new CountDownLatch(1);
+            AtomicBoolean task2Ran = new AtomicBoolean();
+
+            SettableFuture<Void> task1Blocked = SettableFuture.create();
+
+            ListenableFuture<Void> task1 = scheduler.submit(group, 1, context -> {
+                try {
+                    task1Started.countDown();
+                    task2Submitted.await();
+
+                    assertThat(task2Ran.get())
+                            .describedAs("Task 2 run")
+                            .isFalse();
+
+                    context.block(task1Blocked);
+
+                    assertThat(task2Ran.get())
+                            .describedAs("Task 2 run")
+                            .isTrue();
+                }
+                catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    throw new RuntimeException(e);
+                }
+            });
+
+            task1Started.await();
+
+            ListenableFuture<Void> task2 = scheduler.submit(group, 2, context -> {
+                task2Started.countDown();
+                task2Ran.set(true);
+            });
+
+            task2Submitted.countDown();
+            task2Started.await();
+
+            // unblock task 1
+            task1Blocked.set(null);
+
+            task1.get();
+            task2.get();
+        }
+    }
+
+    @Test
+    public void testCancelWhileYielding()
+            throws InterruptedException, ExecutionException
+    {
+        TestingTicker ticker = new TestingTicker();
+        try (FairScheduler scheduler = FairScheduler.newInstance(1, ticker)) {
+            Group group = scheduler.createGroup("G");
+
+            CountDownLatch task1Started = new CountDownLatch(1);
+            CountDownLatch task1TimeAdvanced = new CountDownLatch(1);
+
+            ListenableFuture<Void> task1 = scheduler.submit(group, 1, context -> {
+                try {
+                    task1Started.countDown();
+                    task1TimeAdvanced.await();
+
+                    assertThat(context.maybeYield())
+                            .describedAs("Cancelled while yielding")
+                            .isFalse();
+                }
+                catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    throw new RuntimeException(e);
+                }
+            });
+
+            task1Started.await();
+            scheduler.pause(); // prevent rescheduling after yield
+
+            ticker.increment(FairScheduler.QUANTUM_NANOS * 2, TimeUnit.NANOSECONDS);
+            task1TimeAdvanced.countDown();
+
+            scheduler.removeGroup(group);
+            task1.get();
+        }
+    }
+
+    @Test
+    public void testCancelWhileBlocking()
+            throws InterruptedException, ExecutionException
+    {
+        TestingTicker ticker = new TestingTicker();
+        try (FairScheduler scheduler = FairScheduler.newInstance(1, ticker)) {
+            Group group = scheduler.createGroup("G");
+
+            CountDownLatch task1Started = new CountDownLatch(1);
+            TestFuture task1Blocked = new TestFuture();
+
+            ListenableFuture<Void> task1 = scheduler.submit(group, 1, context -> {
+                task1Started.countDown();
+
+                assertThat(context.block(task1Blocked))
+                        .describedAs("Cancelled while blocking")
+                        .isFalse();
+            });
+
+            task1Started.await();
+
+            task1Blocked.awaitListenerAdded(); // When the listener is added, we know the task is blocked
+
+            scheduler.removeGroup(group);
+            task1.get();
+        }
+    }
+
+    @Test
+    public void testCleanupAfterFinish()
+            throws InterruptedException, ExecutionException
+    {
+        TestingTicker ticker = new TestingTicker();
+        try (FairScheduler scheduler = FairScheduler.newInstance(1, ticker)) {
+            Group group = scheduler.createGroup("G");
+
+            AtomicInteger counter = new AtomicInteger();
+            ListenableFuture<Void> task1 = scheduler.submit(group, 1, context -> {
+                counter.incrementAndGet();
+            });
+
+            task1.get();
+            assertThat(counter.get()).isEqualTo(1);
+            assertThat(scheduler.getTasks(group)).isEmpty();
+        }
+    }
+
+    private static class TestFuture
+            extends AbstractFuture<Void>
+    {
+        private final CountDownLatch listenerAdded = new CountDownLatch(1);
+
+        @Override
+        public void addListener(Runnable listener, Executor executor)
+        {
+            super.addListener(listener, executor);
+            listenerAdded.countDown();
+        }
+
+        @Override
+        public boolean set(Void value)
+        {
+            return super.set(value);
+        }
+
+        public void awaitListenerAdded()
+                throws InterruptedException
+        {
+            listenerAdded.await();
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/scheduler/TestPriorityQueue.java b/core/trino-main/src/test/java/io/trino/execution/executor/scheduler/TestPriorityQueue.java
new file mode 100644
index 000000000000..d4f799e1a5e3
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/executor/scheduler/TestPriorityQueue.java
@@ -0,0 +1,210 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import com.google.common.collect.ImmutableSet;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestPriorityQueue
+{
+    @Test
+    public void testEmpty()
+    {
+        PriorityQueue<String> queue = new PriorityQueue<>();
+
+        assertThat(queue.poll()).isNull();
+        assertThat(queue.isEmpty()).isTrue();
+    }
+
+    @Test
+    public void testNotEmpty()
+    {
+        PriorityQueue<String> queue = new PriorityQueue<>();
+
+        queue.add("hello", 1);
+        assertThat(queue.isEmpty()).isFalse();
+    }
+
+    @Test
+    public void testDuplicate()
+    {
+        PriorityQueue<String> queue = new PriorityQueue<>();
+
+        queue.add("hello", 1);
+        assertThatThrownBy(() -> queue.add("hello", 2))
+                .isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    public void testOrder()
+    {
+        PriorityQueue<String> queue = new PriorityQueue<>();
+
+        queue.add("jumps", 5);
+        queue.add("fox", 4);
+        queue.add("over", 6);
+        queue.add("brown", 3);
+        queue.add("dog", 8);
+        queue.add("the", 1);
+        queue.add("lazy", 7);
+        queue.add("quick", 2);
+
+        assertThat(queue.poll()).isEqualTo("the");
+        assertThat(queue.poll()).isEqualTo("quick");
+        assertThat(queue.poll()).isEqualTo("brown");
+        assertThat(queue.poll()).isEqualTo("fox");
+        assertThat(queue.poll()).isEqualTo("jumps");
+        assertThat(queue.poll()).isEqualTo("over");
+        assertThat(queue.poll()).isEqualTo("lazy");
+        assertThat(queue.poll()).isEqualTo("dog");
+        assertThat(queue.poll()).isNull();
+    }
+
+    @Test
+    public void testInterleaved()
+    {
+        PriorityQueue<String> queue = new PriorityQueue<>();
+
+        queue.add("jumps", 5);
+        queue.add("over", 6);
+        queue.add("fox", 4);
+
+        assertThat(queue.poll()).isEqualTo("fox");
+        assertThat(queue.poll()).isEqualTo("jumps");
+
+        queue.add("brown", 3);
+        queue.add("dog", 8);
+        queue.add("the", 1);
+
+        assertThat(queue.poll()).isEqualTo("the");
+        assertThat(queue.poll()).isEqualTo("brown");
+        assertThat(queue.poll()).isEqualTo("over");
+
+        queue.add("lazy", 7);
+        queue.add("quick", 2);
+
+        assertThat(queue.poll()).isEqualTo("quick");
+        assertThat(queue.poll()).isEqualTo("lazy");
+        assertThat(queue.poll()).isEqualTo("dog");
+        assertThat(queue.poll()).isNull();
+    }
+
+    @Test
+    public void testRemove()
+    {
+        PriorityQueue<String> queue = new PriorityQueue<>();
+
+        queue.add("fox", 4);
+        queue.add("brown", 3);
+        queue.add("the", 1);
+        queue.add("quick", 2);
+
+        queue.remove("brown");
+
+        assertThat(queue.poll()).isEqualTo("the");
+        assertThat(queue.poll()).isEqualTo("quick");
+        assertThat(queue.poll()).isEqualTo("fox");
+        assertThat(queue.poll()).isNull();
+    }
+
+    @Test
+    public void testRemoveMissing()
+    {
+        PriorityQueue<String> queue = new PriorityQueue<>();
+
+        queue.add("the", 1);
+        queue.add("quick", 2);
+        queue.add("brown", 3);
+
+        assertThatThrownBy(() -> queue.remove("fox"))
+                .isInstanceOf(IllegalArgumentException.class);
+
+        queue.removeIfPresent("fox");
+    }
+
+    @Test
+    public void testContains()
+    {
+        PriorityQueue<String> queue = new PriorityQueue<>();
+
+        queue.add("the", 1);
+        queue.add("quick", 2);
+        queue.add("brown", 3);
+
+        assertThat(queue.contains("quick")).isTrue();
+        assertThat(queue.contains("fox")).isFalse();
+    }
+
+    @Test
+    public void testRecycle()
+    {
+        PriorityQueue<String> queue = new PriorityQueue<>();
+
+        queue.add("hello", 1);
+        assertThat(queue.poll()).isEqualTo("hello");
+
+        queue.add("hello", 2);
+        assertThat(queue.poll()).isEqualTo("hello");
+    }
+
+    @Test
+    public void testValues()
+    {
+        PriorityQueue<String> queue = new PriorityQueue<>();
+
+        assertThat(queue.values()).isEmpty();
+
+        queue.add("hello", 1);
+        queue.add("world", 2);
+
+        assertThat(queue.values())
+                .isEqualTo(ImmutableSet.of("hello", "world"));
+    }
+
+    @Test
+    public void testNextPriority()
+    {
+        PriorityQueue<String> queue = new PriorityQueue<>();
+
+        assertThatThrownBy(queue::nextPriority)
+                .isInstanceOf(IllegalStateException.class);
+
+        queue.add("hello", 10);
+        queue.add("world", 20);
+
+        assertThat(queue.nextPriority()).isEqualTo(10);
+
+        queue.poll();
+        assertThat(queue.nextPriority()).isEqualTo(20);
+
+        queue.poll();
+        assertThatThrownBy(queue::nextPriority)
+                .isInstanceOf(IllegalStateException.class);
+    }
+
+    @Test
+    public void testSamePriority()
+    {
+        PriorityQueue<String> queue = new PriorityQueue<>();
+
+        queue.add("hello", 1);
+        queue.add("world", 1);
+
+        assertThat(queue.poll()).isEqualTo("hello");
+        assertThat(queue.poll()).isEqualTo("world");
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/scheduler/TestSchedulingQueue.java b/core/trino-main/src/test/java/io/trino/execution/executor/scheduler/TestSchedulingQueue.java
new file mode 100644
index 000000000000..cc31c9db2d86
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/executor/scheduler/TestSchedulingQueue.java
@@ -0,0 +1,323 @@
+/*
+ * Licensed 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 io.trino.execution.executor.scheduler;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestSchedulingQueue
+{
+    @Test
+    public void testEmpty()
+    {
+        SchedulingQueue<String, Integer> queue = new SchedulingQueue<>();
+
+        assertThat(queue.dequeue(1)).isNull();
+    }
+
+    @Test
+    public void testSingleGroup()
+    {
+        SchedulingQueue<String, String> queue = new SchedulingQueue<>();
+
+        queue.startGroup("G1");
+
+        queue.enqueue("G1", "T1", 1);
+        queue.enqueue("G1", "T2", 3);
+        queue.enqueue("G1", "T3", 5);
+        queue.enqueue("G1", "T4", 7);
+
+        assertThat(queue.dequeue(1)).isEqualTo("T1");
+        assertThat(queue.dequeue(1)).isEqualTo("T2");
+        assertThat(queue.dequeue(1)).isEqualTo("T3");
+        assertThat(queue.dequeue(1)).isEqualTo("T4");
+
+        queue.enqueue("G1", "T1", 10);
+        queue.enqueue("G1", "T2", 10);
+        queue.enqueue("G1", "T3", 10);
+        queue.enqueue("G1", "T4", 10);
+
+        assertThat(queue.dequeue(1)).isEqualTo("T1");
+        assertThat(queue.dequeue(1)).isEqualTo("T2");
+        assertThat(queue.dequeue(1)).isEqualTo("T3");
+        assertThat(queue.dequeue(1)).isEqualTo("T4");
+
+        queue.enqueue("G1", "T1", 16);
+        queue.enqueue("G1", "T2", 12);
+        queue.enqueue("G1", "T3", 8);
+        queue.enqueue("G1", "T4", 4);
+
+        assertThat(queue.dequeue(1)).isEqualTo("T4");
+        assertThat(queue.dequeue(1)).isEqualTo("T3");
+        assertThat(queue.dequeue(1)).isEqualTo("T2");
+        assertThat(queue.dequeue(1)).isEqualTo("T1");
+
+        queue.finish("G1", "T1");
+        queue.finish("G1", "T2");
+        queue.finish("G1", "T3");
+        queue.finish("G1", "T4");
+
+        assertThat(queue.state("G1")).isEqualTo(State.BLOCKED);
+    }
+
+    @Test
+    public void testBasic()
+    {
+        SchedulingQueue<String, String> queue = new SchedulingQueue<>();
+
+        queue.startGroup("G1");
+        queue.startGroup("G2");
+
+        queue.enqueue("G1", "T1.0", 1);
+        queue.enqueue("G1", "T1.1", 2);
+        queue.enqueue("G2", "T2.0", 3);
+        queue.enqueue("G2", "T2.1", 4);
+
+        assertThat(queue.dequeue(1)).isEqualTo("T1.0");
+        assertThat(queue.dequeue(1)).isEqualTo("T1.1");
+        assertThat(queue.dequeue(1)).isEqualTo("T2.0");
+        assertThat(queue.dequeue(1)).isEqualTo("T2.1");
+
+        queue.enqueue("G1", "T1.0", 10);
+        queue.enqueue("G1", "T1.1", 20);
+        queue.enqueue("G2", "T2.0", 15);
+        queue.enqueue("G2", "T2.1", 5);
+
+        assertThat(queue.dequeue(1)).isEqualTo("T2.1");
+        assertThat(queue.dequeue(1)).isEqualTo("T2.0");
+        assertThat(queue.dequeue(1)).isEqualTo("T1.0");
+        assertThat(queue.dequeue(1)).isEqualTo("T1.1");
+
+        queue.enqueue("G1", "T1.0", 100);
+        queue.enqueue("G2", "T2.0", 90);
+        assertThat(queue.dequeue(1)).isEqualTo("T2.0");
+        assertThat(queue.dequeue(1)).isEqualTo("T1.0");
+    }
+
+    @Test
+    public void testSomeEmptyGroups()
+    {
+        SchedulingQueue<String, String> queue = new SchedulingQueue<>();
+
+        queue.startGroup("G1");
+        queue.startGroup("G2");
+
+        queue.enqueue("G2", "T1", 0);
+
+        assertThat(queue.dequeue(1)).isEqualTo("T1");
+    }
+
+    @Test
+    public void testDelayedCreation()
+    {
+        SchedulingQueue<String, String> queue = new SchedulingQueue<>();
+
+        queue.startGroup("G1");
+        queue.startGroup("G2");
+
+        queue.enqueue("G1", "T1.0", 100);
+        queue.enqueue("G2", "T2.0", 200);
+
+        queue.startGroup("G3"); // new group gets a priority baseline equal to the minimum current priority
+        queue.enqueue("G3", "T3.0", 50);
+
+        assertThat(queue.dequeue(1)).isEqualTo("T1.0");
+        assertThat(queue.dequeue(1)).isEqualTo("T3.0");
+        assertThat(queue.dequeue(1)).isEqualTo("T2.0");
+    }
+
+    @Test
+    public void testDelayedCreationWhileAllRunning()
+    {
+        SchedulingQueue<String, String> queue = new SchedulingQueue<>();
+
+        queue.startGroup("G1");
+        queue.startGroup("G2");
+
+        queue.enqueue("G1", "T1.0", 0);
+
+        queue.enqueue("G2", "T2.0", 100);
+        queue.dequeue(50);
+        queue.dequeue(50);
+
+        queue.startGroup("G3"); // new group gets a priority baseline equal to the minimum current priority
+        queue.enqueue("G3", "T3.0", 10);
+
+        queue.enqueue("G1", "T1.0", 50);
+        queue.enqueue("G2", "T2.0", 50);
+
+        assertThat(queue.dequeue(1)).isEqualTo("T1.0");
+        assertThat(queue.dequeue(1)).isEqualTo("T3.0");
+        assertThat(queue.dequeue(1)).isEqualTo("T2.0");
+    }
+
+    @Test
+    public void testGroupState()
+    {
+        SchedulingQueue<String, String> queue = new SchedulingQueue<>();
+
+        // initial state with no tasks
+        queue.startGroup("G1");
+        assertThat(queue.state("G1")).isEqualTo(State.BLOCKED);
+
+        // after adding a task, it should be runnable
+        queue.enqueue("G1", "T1", 0);
+        assertThat(queue.state("G1")).isEqualTo(State.RUNNABLE);
+        queue.enqueue("G1", "T2", 0);
+        assertThat(queue.state("G1")).isEqualTo(State.RUNNABLE);
+
+        // after dequeueing, still runnable if there's at least one runnable task
+        queue.dequeue(1);
+        assertThat(queue.state("G1")).isEqualTo(State.RUNNABLE);
+
+        // after all tasks are dequeued, it should be running
+        queue.dequeue(1);
+        assertThat(queue.state("G1")).isEqualTo(State.RUNNING);
+
+        // still running while at least one task is running and there are no runnable tasks
+        queue.block("G1", "T1", 1);
+        assertThat(queue.state("G1")).isEqualTo(State.RUNNING);
+
+        // runnable after blocking when there are still runnable tasks
+        queue.enqueue("G1", "T1", 1);
+        queue.block("G1", "T2", 1);
+        assertThat(queue.state("G1")).isEqualTo(State.RUNNABLE);
+
+        // blocked when all tasks are blocked
+        queue.dequeue(1);
+        queue.block("G1", "T1", 1);
+        assertThat(queue.state("G1")).isEqualTo(State.BLOCKED);
+
+        // back to runnable after unblocking
+        queue.enqueue("G1", "T1", 1);
+        assertThat(queue.state("G1")).isEqualTo(State.RUNNABLE);
+    }
+
+    @Test
+    public void testNonGreedyDeque()
+    {
+        SchedulingQueue<String, String> queue = new SchedulingQueue<>();
+
+        queue.startGroup("G1");
+        queue.startGroup("G2");
+
+        queue.enqueue("G1", "T1.0", 0);
+        queue.enqueue("G2", "T2.0", 1);
+
+        queue.enqueue("G1", "T1.1", 2);
+        queue.enqueue("G1", "T1.2", 3);
+
+        queue.enqueue("G2", "T2.1", 2);
+        queue.enqueue("G2", "T2.2", 3);
+
+        assertThat(queue.dequeue(2)).isEqualTo("T1.0");
+        assertThat(queue.dequeue(2)).isEqualTo("T2.0");
+        assertThat(queue.dequeue(2)).isEqualTo("T1.1");
+        assertThat(queue.dequeue(2)).isEqualTo("T2.1");
+        assertThat(queue.dequeue(2)).isEqualTo("T1.2");
+        assertThat(queue.dequeue(2)).isEqualTo("T2.2");
+        assertThat(queue.dequeue(2)).isNull();
+    }
+
+    @Test
+    public void testFinishTask()
+    {
+        SchedulingQueue<String, String> queue = new SchedulingQueue<>();
+
+        queue.startGroup("G1");
+        queue.enqueue("G1", "T1", 0);
+        queue.enqueue("G1", "T2", 1);
+        queue.enqueue("G1", "T3", 2);
+
+        assertThat(queue.peek()).isEqualTo("T1");
+        queue.finish("G1", "T1");
+        assertThat(queue.peek()).isEqualTo("T2");
+        assertThat(queue.state("G1")).isEqualTo(State.RUNNABLE);
+
+        // check that the group becomes not-runnable
+        queue.finish("G1", "T2");
+        queue.finish("G1", "T3");
+        assertThat(queue.peek()).isNull();
+        assertThat(queue.state("G1")).isEqualTo(State.BLOCKED);
+
+        // check that the group becomes runnable again
+        queue.enqueue("G1", "T4", 0);
+        assertThat(queue.peek()).isEqualTo("T4");
+        assertThat(queue.state("G1")).isEqualTo(State.RUNNABLE);
+    }
+
+    @Test
+    public void testFinishTaskWhileRunning()
+    {
+        SchedulingQueue<String, String> queue = new SchedulingQueue<>();
+        queue.startGroup("G1");
+
+        queue.enqueue("G1", "T1", 0);
+        queue.enqueue("G1", "T2", 1);
+        queue.enqueue("G1", "T3", 2);
+        assertThat(queue.dequeue(0)).isEqualTo("T1");
+        assertThat(queue.dequeue(0)).isEqualTo("T2");
+        assertThat(queue.peek()).isEqualTo("T3");
+        assertThat(queue.state("G1")).isEqualTo(State.RUNNABLE);
+
+        queue.finish("G1", "T3");
+        assertThat(queue.state("G1")).isEqualTo(State.RUNNING);
+
+        queue.finish("G1", "T1");
+        assertThat(queue.state("G1")).isEqualTo(State.RUNNING);
+
+        queue.finish("G1", "T2");
+        assertThat(queue.state("G1")).isEqualTo(State.BLOCKED);
+    }
+
+    @Test
+    public void testFinishTaskWhileBlocked()
+    {
+        SchedulingQueue<String, String> queue = new SchedulingQueue<>();
+        queue.startGroup("G1");
+
+        queue.enqueue("G1", "T1", 0);
+        queue.enqueue("G1", "T2", 1);
+        assertThat(queue.dequeue(0)).isEqualTo("T1");
+        assertThat(queue.dequeue(0)).isEqualTo("T2");
+        queue.block("G1", "T1", 0);
+        queue.block("G1", "T2", 0);
+        assertThat(queue.state("G1")).isEqualTo(State.BLOCKED);
+
+        queue.finish("G1", "T1");
+        assertThat(queue.state("G1")).isEqualTo(State.BLOCKED);
+
+        queue.finish("G1", "T2");
+        assertThat(queue.state("G1")).isEqualTo(State.BLOCKED);
+    }
+
+    @Test
+    public void testFinishGroup()
+    {
+        SchedulingQueue<String, String> queue = new SchedulingQueue<>();
+
+        queue.startGroup("G1");
+        queue.enqueue("G1", "T1.1", 0);
+        assertThat(queue.peek()).isEqualTo("T1.1");
+
+        queue.startGroup("G2");
+        queue.enqueue("G2", "T2.1", 1);
+        assertThat(queue.peek()).isEqualTo("T1.1");
+
+        queue.finishGroup("G1");
+        assertThat(queue.containsGroup("G1")).isFalse();
+        assertThat(queue.peek()).isEqualTo("T2.1");
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/Histogram.java b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/Histogram.java
similarity index 99%
rename from core/trino-main/src/test/java/io/trino/execution/executor/Histogram.java
rename to core/trino-main/src/test/java/io/trino/execution/executor/timesharing/Histogram.java
index 343f02c30607..8262c14d95aa 100644
--- a/core/trino-main/src/test/java/io/trino/execution/executor/Histogram.java
+++ b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/Histogram.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.executor;
+package io.trino.execution.executor.timesharing;
 
 import com.google.common.collect.ImmutableList;
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/SimulationController.java b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SimulationController.java
similarity index 93%
rename from core/trino-main/src/test/java/io/trino/execution/executor/SimulationController.java
rename to core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SimulationController.java
index d8771580b4da..990a351170e9 100644
--- a/core/trino-main/src/test/java/io/trino/execution/executor/SimulationController.java
+++ b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SimulationController.java
@@ -11,16 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.executor;
+package io.trino.execution.executor.timesharing;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Multimaps;
 import io.trino.execution.StageId;
 import io.trino.execution.TaskId;
-import io.trino.execution.executor.SimulationTask.IntermediateTask;
-import io.trino.execution.executor.SimulationTask.LeafTask;
-import io.trino.execution.executor.SplitGenerators.SplitGenerator;
+import io.trino.execution.executor.timesharing.SimulationTask.IntermediateTask;
+import io.trino.execution.executor.timesharing.SimulationTask.LeafTask;
+import io.trino.execution.executor.timesharing.SplitGenerators.SplitGenerator;
 
 import java.util.Map;
 import java.util.OptionalInt;
@@ -29,7 +29,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
 
-import static io.trino.execution.executor.SimulationController.TaskSpecification.Type.LEAF;
+import static io.trino.execution.executor.timesharing.SimulationController.TaskSpecification.Type.LEAF;
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
@@ -37,8 +37,8 @@ class SimulationController
 {
     private static final int DEFAULT_MIN_SPLITS_PER_TASK = 3;
 
-    private final TaskExecutor taskExecutor;
-    private final BiConsumer<SimulationController, TaskExecutor> callback;
+    private final TimeSharingTaskExecutor taskExecutor;
+    private final BiConsumer<SimulationController, TimeSharingTaskExecutor> callback;
 
     private final ExecutorService controllerExecutor = newSingleThreadExecutor();
 
@@ -50,7 +50,7 @@ class SimulationController
 
     private final AtomicBoolean stopped = new AtomicBoolean();
 
-    public SimulationController(TaskExecutor taskExecutor, BiConsumer<SimulationController, TaskExecutor> callback)
+    public SimulationController(TimeSharingTaskExecutor taskExecutor, BiConsumer<SimulationController, TimeSharingTaskExecutor> callback)
     {
         this.taskExecutor = taskExecutor;
         this.callback = callback;
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/SimulationSplit.java b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SimulationSplit.java
similarity index 97%
rename from core/trino-main/src/test/java/io/trino/execution/executor/SimulationSplit.java
rename to core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SimulationSplit.java
index c80d8e7a33e6..9cf452655c07 100644
--- a/core/trino-main/src/test/java/io/trino/execution/executor/SimulationSplit.java
+++ b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SimulationSplit.java
@@ -11,11 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.executor;
+package io.trino.execution.executor.timesharing;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
 import io.trino.execution.SplitRunner;
 
 import java.util.concurrent.RejectedExecutionException;
@@ -111,6 +112,18 @@ void setKilled()
         task.setKilled();
     }
 
+    @Override
+    public int getPipelineId()
+    {
+        return 0;
+    }
+
+    @Override
+    public Span getPipelineSpan()
+    {
+        return Span.getInvalid();
+    }
+
     @Override
     public boolean isFinished()
     {
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/SimulationTask.java b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SimulationTask.java
similarity index 86%
rename from core/trino-main/src/test/java/io/trino/execution/executor/SimulationTask.java
rename to core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SimulationTask.java
index ed2ae7c1790c..e42314723244 100644
--- a/core/trino-main/src/test/java/io/trino/execution/executor/SimulationTask.java
+++ b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SimulationTask.java
@@ -11,13 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.executor;
+package io.trino.execution.executor.timesharing;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
 import io.airlift.units.Duration;
 import io.trino.execution.TaskId;
-import io.trino.execution.executor.SimulationController.TaskSpecification;
+import io.trino.execution.executor.TaskHandle;
+import io.trino.execution.executor.timesharing.SimulationController.TaskSpecification;
 
 import java.util.OptionalInt;
 import java.util.Set;
@@ -36,7 +37,7 @@ abstract class SimulationTask
     private final TaskHandle taskHandle;
     private final AtomicBoolean killed = new AtomicBoolean();
 
-    public SimulationTask(TaskExecutor taskExecutor, TaskSpecification specification, TaskId taskId)
+    public SimulationTask(TimeSharingTaskExecutor taskExecutor, TaskSpecification specification, TaskId taskId)
     {
         this.specification = specification;
         this.taskId = taskId;
@@ -123,21 +124,21 @@ public long getScheduledTimeNanos()
         return runningWallTime + completedWallTime;
     }
 
-    public abstract void schedule(TaskExecutor taskExecutor, int numSplits);
+    public abstract void schedule(TimeSharingTaskExecutor taskExecutor, int numSplits);
 
     public static class LeafTask
             extends SimulationTask
     {
         private final TaskSpecification taskSpecification;
 
-        public LeafTask(TaskExecutor taskExecutor, TaskSpecification specification, TaskId taskId)
+        public LeafTask(TimeSharingTaskExecutor taskExecutor, TaskSpecification specification, TaskId taskId)
         {
             super(taskExecutor, specification, taskId);
             this.taskSpecification = specification;
         }
 
         @Override
-        public void schedule(TaskExecutor taskExecutor, int numSplits)
+        public void schedule(TimeSharingTaskExecutor taskExecutor, int numSplits)
         {
             ImmutableList.Builder<SimulationSplit> splits = ImmutableList.builder();
             for (int i = 0; i < numSplits; i++) {
@@ -153,14 +154,14 @@ public static class IntermediateTask
     {
         private final SplitSpecification splitSpecification;
 
-        public IntermediateTask(TaskExecutor taskExecutor, TaskSpecification specification, TaskId taskId)
+        public IntermediateTask(TimeSharingTaskExecutor taskExecutor, TaskSpecification specification, TaskId taskId)
         {
             super(taskExecutor, specification, taskId);
             this.splitSpecification = specification.nextSpecification();
         }
 
         @Override
-        public void schedule(TaskExecutor taskExecutor, int numSplits)
+        public void schedule(TimeSharingTaskExecutor taskExecutor, int numSplits)
         {
             ImmutableList.Builder<SimulationSplit> splits = ImmutableList.builderWithExpectedSize(numSplits);
             for (int i = 0; i < numSplits; i++) {
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/SplitGenerators.java b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SplitGenerators.java
similarity index 97%
rename from core/trino-main/src/test/java/io/trino/execution/executor/SplitGenerators.java
rename to core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SplitGenerators.java
index 9a4aebdd0895..ebcd33f40450 100644
--- a/core/trino-main/src/test/java/io/trino/execution/executor/SplitGenerators.java
+++ b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SplitGenerators.java
@@ -11,19 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.executor;
+package io.trino.execution.executor.timesharing;
 
 import com.google.common.collect.ImmutableList;
 import io.airlift.units.Duration;
-import io.trino.execution.executor.SplitSpecification.IntermediateSplitSpecification;
-import io.trino.execution.executor.SplitSpecification.LeafSplitSpecification;
+import io.trino.execution.executor.timesharing.SplitSpecification.IntermediateSplitSpecification;
+import io.trino.execution.executor.timesharing.SplitSpecification.LeafSplitSpecification;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadLocalRandom;
 
-import static io.trino.execution.executor.Histogram.fromContinuous;
+import static io.trino.execution.executor.timesharing.Histogram.fromContinuous;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static java.util.concurrent.TimeUnit.MICROSECONDS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/SplitSpecification.java b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SplitSpecification.java
similarity index 93%
rename from core/trino-main/src/test/java/io/trino/execution/executor/SplitSpecification.java
rename to core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SplitSpecification.java
index f998ea8f7a7c..f88b63a893f2 100644
--- a/core/trino-main/src/test/java/io/trino/execution/executor/SplitSpecification.java
+++ b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/SplitSpecification.java
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.executor;
+package io.trino.execution.executor.timesharing;
 
-import io.trino.execution.executor.SimulationSplit.IntermediateSplit;
-import io.trino.execution.executor.SimulationSplit.LeafSplit;
+import io.trino.execution.executor.timesharing.SimulationSplit.IntermediateSplit;
+import io.trino.execution.executor.timesharing.SimulationSplit.LeafSplit;
 
 import java.util.concurrent.ScheduledExecutorService;
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/TestTimeSharingTaskExecutor.java b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/TestTimeSharingTaskExecutor.java
new file mode 100644
index 000000000000..02b62831d0e5
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/TestTimeSharingTaskExecutor.java
@@ -0,0 +1,670 @@
+/*
+ * Licensed 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 io.trino.execution.executor.timesharing;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
+import io.airlift.testing.TestingTicker;
+import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
+import io.trino.execution.SplitRunner;
+import io.trino.execution.StageId;
+import io.trino.execution.TaskId;
+import io.trino.execution.executor.TaskExecutor;
+import io.trino.execution.executor.TaskHandle;
+import io.trino.spi.QueryId;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.OptionalInt;
+import java.util.concurrent.Future;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
+import static io.airlift.testing.Assertions.assertGreaterThan;
+import static io.airlift.testing.Assertions.assertLessThan;
+import static io.trino.execution.executor.timesharing.MultilevelSplitQueue.LEVEL_CONTRIBUTION_CAP;
+import static io.trino.execution.executor.timesharing.MultilevelSplitQueue.LEVEL_THRESHOLD_SECONDS;
+import static java.lang.Double.isNaN;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+public class TestTimeSharingTaskExecutor
+{
+    @RepeatedTest(100)
+    public void testTasksComplete()
+            throws Exception
+    {
+        TestingTicker ticker = new TestingTicker();
+        Duration splitProcessingDurationThreshold = new Duration(10, MINUTES);
+
+        TimeSharingTaskExecutor taskExecutor = new TimeSharingTaskExecutor(4, 8, 3, 4, ticker);
+
+        taskExecutor.start();
+        try {
+            ticker.increment(20, MILLISECONDS);
+            TaskId taskId = new TaskId(new StageId("test", 0), 0, 0);
+            TaskHandle taskHandle = taskExecutor.addTask(taskId, () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
+
+            Phaser beginPhase = new Phaser();
+            beginPhase.register();
+            Phaser verificationComplete = new Phaser();
+            verificationComplete.register();
+
+            // add two jobs
+            TestingJob driver1 = new TestingJob(ticker, new Phaser(), beginPhase, verificationComplete, 10, 0);
+            ListenableFuture<Void> future1 = getOnlyElement(taskExecutor.enqueueSplits(taskHandle, true, ImmutableList.of(driver1)));
+            TestingJob driver2 = new TestingJob(ticker, new Phaser(), beginPhase, verificationComplete, 10, 0);
+            ListenableFuture<Void> future2 = getOnlyElement(taskExecutor.enqueueSplits(taskHandle, true, ImmutableList.of(driver2)));
+            assertEquals(driver1.getCompletedPhases(), 0);
+            assertEquals(driver2.getCompletedPhases(), 0);
+
+            // verify worker have arrived but haven't processed yet
+            beginPhase.arriveAndAwaitAdvance();
+            assertEquals(driver1.getCompletedPhases(), 0);
+            assertEquals(driver2.getCompletedPhases(), 0);
+            ticker.increment(60, SECONDS);
+            assertTrue(taskExecutor.getStuckSplitTaskIds(splitProcessingDurationThreshold, runningSplitInfo -> true).isEmpty());
+            assertEquals(taskExecutor.getRunAwaySplitCount(), 0);
+            ticker.increment(600, SECONDS);
+            assertEquals(taskExecutor.getRunAwaySplitCount(), 2);
+            assertEquals(taskExecutor.getStuckSplitTaskIds(splitProcessingDurationThreshold, runningSplitInfo -> true), ImmutableSet.of(taskId));
+
+            verificationComplete.arriveAndAwaitAdvance();
+
+            // advance one phase and verify
+            beginPhase.arriveAndAwaitAdvance();
+            assertEquals(driver1.getCompletedPhases(), 1);
+            assertEquals(driver2.getCompletedPhases(), 1);
+
+            verificationComplete.arriveAndAwaitAdvance();
+
+            // add one more job
+            TestingJob driver3 = new TestingJob(ticker, new Phaser(), beginPhase, verificationComplete, 10, 0);
+            ListenableFuture<Void> future3 = getOnlyElement(taskExecutor.enqueueSplits(taskHandle, false, ImmutableList.of(driver3)));
+
+            // advance one phase and verify
+            beginPhase.arriveAndAwaitAdvance();
+            assertEquals(driver1.getCompletedPhases(), 2);
+            assertEquals(driver2.getCompletedPhases(), 2);
+            assertEquals(driver3.getCompletedPhases(), 0);
+            verificationComplete.arriveAndAwaitAdvance();
+
+            // advance to the end of the first two task and verify
+            beginPhase.arriveAndAwaitAdvance();
+            for (int i = 0; i < 7; i++) {
+                verificationComplete.arriveAndAwaitAdvance();
+                beginPhase.arriveAndAwaitAdvance();
+                assertEquals(beginPhase.getPhase(), verificationComplete.getPhase() + 1);
+            }
+            assertEquals(driver1.getCompletedPhases(), 10);
+            assertEquals(driver2.getCompletedPhases(), 10);
+            assertEquals(driver3.getCompletedPhases(), 8);
+            future1.get(1, SECONDS);
+            future2.get(1, SECONDS);
+            verificationComplete.arriveAndAwaitAdvance();
+
+            // advance two more times and verify
+            beginPhase.arriveAndAwaitAdvance();
+            verificationComplete.arriveAndAwaitAdvance();
+            beginPhase.arriveAndAwaitAdvance();
+            assertEquals(driver1.getCompletedPhases(), 10);
+            assertEquals(driver2.getCompletedPhases(), 10);
+            assertEquals(driver3.getCompletedPhases(), 10);
+            future3.get(1, SECONDS);
+            verificationComplete.arriveAndAwaitAdvance();
+
+            assertEquals(driver1.getFirstPhase(), 0);
+            assertEquals(driver2.getFirstPhase(), 0);
+            assertEquals(driver3.getFirstPhase(), 2);
+
+            assertEquals(driver1.getLastPhase(), 10);
+            assertEquals(driver2.getLastPhase(), 10);
+            assertEquals(driver3.getLastPhase(), 12);
+
+            // no splits remaining
+            ticker.increment(610, SECONDS);
+            assertTrue(taskExecutor.getStuckSplitTaskIds(splitProcessingDurationThreshold, runningSplitInfo -> true).isEmpty());
+            assertEquals(taskExecutor.getRunAwaySplitCount(), 0);
+        }
+        finally {
+            taskExecutor.stop();
+        }
+    }
+
+    @RepeatedTest(100)
+    public void testQuantaFairness()
+    {
+        TestingTicker ticker = new TestingTicker();
+        TaskExecutor taskExecutor = new TimeSharingTaskExecutor(1, 2, 3, 4, ticker);
+
+        taskExecutor.start();
+        try {
+            ticker.increment(20, MILLISECONDS);
+            TaskHandle shortQuantaTaskHandle = taskExecutor.addTask(new TaskId(new StageId("short_quanta", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
+            TaskHandle longQuantaTaskHandle = taskExecutor.addTask(new TaskId(new StageId("long_quanta", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
+
+            Phaser endQuantaPhaser = new Phaser();
+
+            TestingJob shortQuantaDriver = new TestingJob(ticker, new Phaser(), new Phaser(), endQuantaPhaser, 10, 10);
+            TestingJob longQuantaDriver = new TestingJob(ticker, new Phaser(), new Phaser(), endQuantaPhaser, 10, 20);
+
+            taskExecutor.enqueueSplits(shortQuantaTaskHandle, true, ImmutableList.of(shortQuantaDriver));
+            taskExecutor.enqueueSplits(longQuantaTaskHandle, true, ImmutableList.of(longQuantaDriver));
+
+            for (int i = 0; i < 11; i++) {
+                endQuantaPhaser.arriveAndAwaitAdvance();
+            }
+
+            assertTrue(shortQuantaDriver.getCompletedPhases() >= 7 && shortQuantaDriver.getCompletedPhases() <= 8);
+            assertTrue(longQuantaDriver.getCompletedPhases() >= 3 && longQuantaDriver.getCompletedPhases() <= 4);
+
+            endQuantaPhaser.arriveAndDeregister();
+        }
+        finally {
+            taskExecutor.stop();
+        }
+    }
+
+    @RepeatedTest(100)
+    public void testLevelMovement()
+    {
+        TestingTicker ticker = new TestingTicker();
+        TimeSharingTaskExecutor taskExecutor = new TimeSharingTaskExecutor(2, 2, 3, 4, ticker);
+
+        taskExecutor.start();
+        try {
+            ticker.increment(20, MILLISECONDS);
+            TimeSharingTaskHandle testTaskHandle = taskExecutor.addTask(new TaskId(new StageId("test", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
+
+            Phaser globalPhaser = new Phaser();
+            globalPhaser.bulkRegister(3); // 2 taskExecutor threads + test thread
+
+            int quantaTimeMills = 500;
+            int phasesPerSecond = 1000 / quantaTimeMills;
+            int totalPhases = LEVEL_THRESHOLD_SECONDS[LEVEL_THRESHOLD_SECONDS.length - 1] * phasesPerSecond;
+            TestingJob driver1 = new TestingJob(ticker, globalPhaser, new Phaser(), new Phaser(), totalPhases, quantaTimeMills);
+            TestingJob driver2 = new TestingJob(ticker, globalPhaser, new Phaser(), new Phaser(), totalPhases, quantaTimeMills);
+
+            taskExecutor.enqueueSplits(testTaskHandle, true, ImmutableList.of(driver1, driver2));
+
+            int completedPhases = 0;
+            for (int i = 0; i < (LEVEL_THRESHOLD_SECONDS.length - 1); i++) {
+                for (; (completedPhases / phasesPerSecond) < LEVEL_THRESHOLD_SECONDS[i + 1]; completedPhases++) {
+                    globalPhaser.arriveAndAwaitAdvance();
+                }
+
+                assertEquals(testTaskHandle.getPriority().getLevel(), i + 1);
+            }
+
+            globalPhaser.arriveAndDeregister();
+        }
+        finally {
+            taskExecutor.stop();
+        }
+    }
+
+    @RepeatedTest(100)
+    public void testLevelMultipliers()
+            throws Exception
+    {
+        TestingTicker ticker = new TestingTicker();
+        TimeSharingTaskExecutor taskExecutor = new TimeSharingTaskExecutor(6, 3, 3, 4, new MultilevelSplitQueue(2), ticker);
+
+        taskExecutor.start();
+        try {
+            ticker.increment(20, MILLISECONDS);
+            for (int i = 0; i < (LEVEL_THRESHOLD_SECONDS.length - 1); i++) {
+                TaskHandle[] taskHandles = {
+                        taskExecutor.addTask(new TaskId(new StageId("test1", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty()),
+                        taskExecutor.addTask(new TaskId(new StageId("test2", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty()),
+                        taskExecutor.addTask(new TaskId(new StageId("test3", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty())
+                };
+
+                // move task 0 to next level
+                TestingJob task0Job = new TestingJob(ticker, new Phaser(), new Phaser(), new Phaser(), 1, LEVEL_THRESHOLD_SECONDS[i + 1] * 1000);
+                taskExecutor.enqueueSplits(
+                        taskHandles[0],
+                        true,
+                        ImmutableList.of(task0Job));
+                // move tasks 1 and 2 to this level
+                TestingJob task1Job = new TestingJob(ticker, new Phaser(), new Phaser(), new Phaser(), 1, LEVEL_THRESHOLD_SECONDS[i] * 1000);
+                taskExecutor.enqueueSplits(
+                        taskHandles[1],
+                        true,
+                        ImmutableList.of(task1Job));
+                TestingJob task2Job = new TestingJob(ticker, new Phaser(), new Phaser(), new Phaser(), 1, LEVEL_THRESHOLD_SECONDS[i] * 1000);
+                taskExecutor.enqueueSplits(
+                        taskHandles[2],
+                        true,
+                        ImmutableList.of(task2Job));
+
+                task0Job.getCompletedFuture().get();
+                task1Job.getCompletedFuture().get();
+                task2Job.getCompletedFuture().get();
+
+                // then, start new drivers for all tasks
+                Phaser globalPhaser = new Phaser(7); // 6 taskExecutor threads + test thread
+                int phasesForNextLevel = LEVEL_THRESHOLD_SECONDS[i + 1] - LEVEL_THRESHOLD_SECONDS[i];
+                TestingJob[] drivers = new TestingJob[6];
+                for (int j = 0; j < 6; j++) {
+                    drivers[j] = new TestingJob(ticker, globalPhaser, new Phaser(), new Phaser(), phasesForNextLevel, 1000);
+                }
+
+                taskExecutor.enqueueSplits(taskHandles[0], true, ImmutableList.of(drivers[0], drivers[1]));
+                taskExecutor.enqueueSplits(taskHandles[1], true, ImmutableList.of(drivers[2], drivers[3]));
+                taskExecutor.enqueueSplits(taskHandles[2], true, ImmutableList.of(drivers[4], drivers[5]));
+
+                // run all three drivers
+                int lowerLevelStart = drivers[2].getCompletedPhases() + drivers[3].getCompletedPhases() + drivers[4].getCompletedPhases() + drivers[5].getCompletedPhases();
+                int higherLevelStart = drivers[0].getCompletedPhases() + drivers[1].getCompletedPhases();
+                while (Arrays.stream(drivers).noneMatch(TestingJob::isFinished)) {
+                    globalPhaser.arriveAndAwaitAdvance();
+
+                    int lowerLevelEnd = drivers[2].getCompletedPhases() + drivers[3].getCompletedPhases() + drivers[4].getCompletedPhases() + drivers[5].getCompletedPhases();
+                    int lowerLevelTime = lowerLevelEnd - lowerLevelStart;
+                    int higherLevelEnd = drivers[0].getCompletedPhases() + drivers[1].getCompletedPhases();
+                    int higherLevelTime = higherLevelEnd - higherLevelStart;
+
+                    if (higherLevelTime > 20) {
+                        assertGreaterThan(lowerLevelTime, (higherLevelTime * 2) - 10);
+                        assertLessThan(higherLevelTime, (lowerLevelTime * 2) + 10);
+                    }
+                }
+
+                globalPhaser.arriveAndDeregister();
+                taskExecutor.removeTask(taskHandles[0]);
+                taskExecutor.removeTask(taskHandles[1]);
+                taskExecutor.removeTask(taskHandles[2]);
+            }
+        }
+        finally {
+            taskExecutor.stop();
+        }
+    }
+
+    @Test
+    public void testTaskHandle()
+    {
+        TestingTicker ticker = new TestingTicker();
+        TimeSharingTaskExecutor taskExecutor = new TimeSharingTaskExecutor(4, 8, 3, 4, ticker);
+
+        taskExecutor.start();
+        try {
+            TaskId taskId = new TaskId(new StageId("test", 0), 0, 0);
+            TimeSharingTaskHandle taskHandle = taskExecutor.addTask(taskId, () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
+
+            Phaser beginPhase = new Phaser();
+            beginPhase.register();
+            Phaser verificationComplete = new Phaser();
+            verificationComplete.register();
+
+            TestingJob driver1 = new TestingJob(ticker, new Phaser(), beginPhase, verificationComplete, 10, 0);
+            TestingJob driver2 = new TestingJob(ticker, new Phaser(), beginPhase, verificationComplete, 10, 0);
+
+            // force enqueue a split
+            taskExecutor.enqueueSplits(taskHandle, true, ImmutableList.of(driver1));
+            assertEquals(taskHandle.getRunningLeafSplits(), 0);
+
+            // normal enqueue a split
+            taskExecutor.enqueueSplits(taskHandle, false, ImmutableList.of(driver2));
+            assertEquals(taskHandle.getRunningLeafSplits(), 1);
+
+            // let the split continue to run
+            beginPhase.arriveAndDeregister();
+            verificationComplete.arriveAndDeregister();
+        }
+        finally {
+            taskExecutor.stop();
+        }
+    }
+
+    @Test
+    public void testLevelContributionCap()
+    {
+        MultilevelSplitQueue splitQueue = new MultilevelSplitQueue(2);
+        TimeSharingTaskHandle handle0 = new TimeSharingTaskHandle(new TaskId(new StageId("test0", 0), 0, 0), splitQueue, () -> 1, 1, new Duration(1, SECONDS), OptionalInt.empty());
+        TimeSharingTaskHandle handle1 = new TimeSharingTaskHandle(new TaskId(new StageId("test1", 0), 0, 0), splitQueue, () -> 1, 1, new Duration(1, SECONDS), OptionalInt.empty());
+
+        for (int i = 0; i < (LEVEL_THRESHOLD_SECONDS.length - 1); i++) {
+            long levelAdvanceTime = SECONDS.toNanos(LEVEL_THRESHOLD_SECONDS[i + 1] - LEVEL_THRESHOLD_SECONDS[i]);
+            handle0.addScheduledNanos(levelAdvanceTime);
+            assertEquals(handle0.getPriority().getLevel(), i + 1);
+
+            handle1.addScheduledNanos(levelAdvanceTime);
+            assertEquals(handle1.getPriority().getLevel(), i + 1);
+
+            assertEquals(splitQueue.getLevelScheduledTime(i), 2 * Math.min(levelAdvanceTime, LEVEL_CONTRIBUTION_CAP));
+            assertEquals(splitQueue.getLevelScheduledTime(i + 1), 0);
+        }
+    }
+
+    @Test
+    public void testUpdateLevelWithCap()
+    {
+        MultilevelSplitQueue splitQueue = new MultilevelSplitQueue(2);
+        TimeSharingTaskHandle handle0 = new TimeSharingTaskHandle(new TaskId(new StageId("test0", 0), 0, 0), splitQueue, () -> 1, 1, new Duration(1, SECONDS), OptionalInt.empty());
+
+        long quantaNanos = MINUTES.toNanos(10);
+        handle0.addScheduledNanos(quantaNanos);
+        long cappedNanos = Math.min(quantaNanos, LEVEL_CONTRIBUTION_CAP);
+
+        for (int i = 0; i < (LEVEL_THRESHOLD_SECONDS.length - 1); i++) {
+            long thisLevelTime = Math.min(SECONDS.toNanos(LEVEL_THRESHOLD_SECONDS[i + 1] - LEVEL_THRESHOLD_SECONDS[i]), cappedNanos);
+            assertEquals(splitQueue.getLevelScheduledTime(i), thisLevelTime);
+            cappedNanos -= thisLevelTime;
+        }
+    }
+
+    @Test
+    @Timeout(30)
+    public void testMinMaxDriversPerTask()
+    {
+        int maxDriversPerTask = 2;
+        MultilevelSplitQueue splitQueue = new MultilevelSplitQueue(2);
+        TestingTicker ticker = new TestingTicker();
+        TimeSharingTaskExecutor taskExecutor = new TimeSharingTaskExecutor(4, 16, 1, maxDriversPerTask, splitQueue, ticker);
+
+        taskExecutor.start();
+        try {
+            TaskHandle testTaskHandle = taskExecutor.addTask(new TaskId(new StageId("test", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
+
+            // enqueue all batches of splits
+            int batchCount = 4;
+            TestingJob[] splits = new TestingJob[8];
+            Phaser[] phasers = new Phaser[batchCount];
+            for (int batch = 0; batch < batchCount; batch++) {
+                phasers[batch] = new Phaser();
+                phasers[batch].register();
+                TestingJob split1 = new TestingJob(ticker, new Phaser(), new Phaser(), phasers[batch], 1, 0);
+                TestingJob split2 = new TestingJob(ticker, new Phaser(), new Phaser(), phasers[batch], 1, 0);
+                splits[2 * batch] = split1;
+                splits[2 * batch + 1] = split2;
+                taskExecutor.enqueueSplits(testTaskHandle, false, ImmutableList.of(split1, split2));
+            }
+
+            // assert that the splits are processed in batches as expected
+            for (int batch = 0; batch < batchCount; batch++) {
+                // wait until the current batch starts
+                waitUntilSplitsStart(ImmutableList.of(splits[2 * batch], splits[2 * batch + 1]));
+                // assert that only the splits including and up to the current batch are running and the rest haven't started yet
+                assertSplitStates(2 * batch + 1, splits);
+                // complete the current batch
+                phasers[batch].arriveAndDeregister();
+            }
+        }
+        finally {
+            taskExecutor.stop();
+        }
+    }
+
+    @Test
+    @Timeout(30)
+    public void testUserSpecifiedMaxDriversPerTask()
+    {
+        MultilevelSplitQueue splitQueue = new MultilevelSplitQueue(2);
+        TestingTicker ticker = new TestingTicker();
+        // create a task executor with min/max drivers per task to be 2 and 4
+        TimeSharingTaskExecutor taskExecutor = new TimeSharingTaskExecutor(4, 16, 2, 4, splitQueue, ticker);
+
+        taskExecutor.start();
+        try {
+            // overwrite the max drivers per task to be 1
+            TaskHandle testTaskHandle = taskExecutor.addTask(new TaskId(new StageId("test", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.of(1));
+
+            // enqueue all batches of splits
+            int batchCount = 4;
+            TestingJob[] splits = new TestingJob[4];
+            Phaser[] phasers = new Phaser[batchCount];
+            for (int batch = 0; batch < batchCount; batch++) {
+                phasers[batch] = new Phaser();
+                phasers[batch].register();
+                TestingJob split = new TestingJob(ticker, new Phaser(), new Phaser(), phasers[batch], 1, 0);
+                splits[batch] = split;
+                taskExecutor.enqueueSplits(testTaskHandle, false, ImmutableList.of(split));
+            }
+
+            // assert that the splits are processed in batches as expected
+            for (int batch = 0; batch < batchCount; batch++) {
+                // wait until the current batch starts
+                waitUntilSplitsStart(ImmutableList.of(splits[batch]));
+                // assert that only the splits including and up to the current batch are running and the rest haven't started yet
+                assertSplitStates(batch, splits);
+                // complete the current batch
+                phasers[batch].arriveAndDeregister();
+            }
+        }
+        finally {
+            taskExecutor.stop();
+        }
+    }
+
+    @Test
+    public void testMinDriversPerTaskWhenTargetConcurrencyIncreases()
+    {
+        MultilevelSplitQueue splitQueue = new MultilevelSplitQueue(2);
+        TestingTicker ticker = new TestingTicker();
+        // create a task executor with min/max drivers per task to be 2
+        TimeSharingTaskExecutor taskExecutor = new TimeSharingTaskExecutor(4, 1, 2, 2, splitQueue, ticker);
+
+        taskExecutor.start();
+        try {
+            TaskHandle testTaskHandle = taskExecutor.addTask(
+                    new TaskId(new StageId(new QueryId("test"), 0), 0, 0),
+                    // make sure buffer is underutilized
+                    () -> 0,
+                    1,
+                    new Duration(1, MILLISECONDS),
+                    OptionalInt.of(2));
+
+            // create 3 splits
+            int batchCount = 3;
+            TestingJob[] splits = new TestingJob[3];
+            Phaser[] phasers = new Phaser[batchCount];
+            for (int batch = 0; batch < batchCount; batch++) {
+                phasers[batch] = new Phaser();
+                phasers[batch].register();
+                TestingJob split = new TestingJob(ticker, new Phaser(), new Phaser(), phasers[batch], 1, 0);
+                splits[batch] = split;
+            }
+
+            taskExecutor.enqueueSplits(testTaskHandle, false, ImmutableList.copyOf(splits));
+            // wait until first split starts
+            waitUntilSplitsStart(ImmutableList.of(splits[0]));
+            // remaining splits shouldn't start because initial split concurrency is 1
+            assertSplitStates(0, splits);
+
+            // complete first split (SplitConcurrencyController for TaskHandle should increase concurrency since buffer is underutilized)
+            phasers[0].arriveAndDeregister();
+
+            // 2 remaining splits should be started
+            waitUntilSplitsStart(ImmutableList.of(splits[1], splits[2]));
+        }
+        finally {
+            taskExecutor.stop();
+        }
+    }
+
+    @Test
+    public void testLeafSplitsSize()
+    {
+        MultilevelSplitQueue splitQueue = new MultilevelSplitQueue(2);
+        TestingTicker ticker = new TestingTicker();
+        TimeSharingTaskExecutor taskExecutor = new TimeSharingTaskExecutor(4, 1, 2, 2, splitQueue, ticker);
+
+        TaskHandle testTaskHandle = taskExecutor.addTask(new TaskId(new StageId("test", 0), 0, 0), () -> 0, 10, new Duration(1, MILLISECONDS), OptionalInt.empty());
+        TestingJob driver1 = new TestingJob(ticker, new Phaser(), new Phaser(), new Phaser(), 1, 500);
+        TestingJob driver2 = new TestingJob(ticker, new Phaser(), new Phaser(), new Phaser(), 1, 1000 / 500);
+
+        ticker.increment(0, TimeUnit.SECONDS);
+        taskExecutor.enqueueSplits(testTaskHandle, false, ImmutableList.of(driver1, driver2));
+        assertTrue(isNaN(taskExecutor.getLeafSplitsSize().getAllTime().getMax()));
+
+        ticker.increment(1, TimeUnit.SECONDS);
+        taskExecutor.enqueueSplits(testTaskHandle, false, ImmutableList.of(driver1));
+        assertEquals(taskExecutor.getLeafSplitsSize().getAllTime().getMax(), 2.0);
+
+        ticker.increment(1, TimeUnit.SECONDS);
+        taskExecutor.enqueueSplits(testTaskHandle, true, ImmutableList.of(driver1));
+        assertEquals(taskExecutor.getLeafSplitsSize().getAllTime().getMax(), 2.0);
+    }
+
+    private void assertSplitStates(int endIndex, TestingJob[] splits)
+    {
+        // assert that splits up to and including endIndex are all started
+        for (int i = 0; i <= endIndex; i++) {
+            assertTrue(splits[i].isStarted());
+        }
+
+        // assert that splits starting from endIndex haven't started yet
+        for (int i = endIndex + 1; i < splits.length; i++) {
+            assertFalse(splits[i].isStarted());
+        }
+    }
+
+    private static void waitUntilSplitsStart(List<TestingJob> splits)
+    {
+        while (splits.stream().anyMatch(split -> !split.isStarted())) {
+            try {
+                Thread.sleep(200);
+            }
+            catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private static class TestingJob
+            implements SplitRunner
+    {
+        private final TestingTicker ticker;
+        private final Phaser globalPhaser;
+        private final Phaser beginQuantaPhaser;
+        private final Phaser endQuantaPhaser;
+        private final int requiredPhases;
+        private final int quantaTimeMillis;
+        private final AtomicInteger completedPhases = new AtomicInteger();
+
+        private final AtomicInteger firstPhase = new AtomicInteger(-1);
+        private final AtomicInteger lastPhase = new AtomicInteger(-1);
+
+        private final AtomicBoolean started = new AtomicBoolean();
+        private final SettableFuture<Void> completed = SettableFuture.create();
+
+        public TestingJob(TestingTicker ticker, Phaser globalPhaser, Phaser beginQuantaPhaser, Phaser endQuantaPhaser, int requiredPhases, int quantaTimeMillis)
+        {
+            this.ticker = ticker;
+            this.globalPhaser = globalPhaser;
+            this.beginQuantaPhaser = beginQuantaPhaser;
+            this.endQuantaPhaser = endQuantaPhaser;
+            this.requiredPhases = requiredPhases;
+            this.quantaTimeMillis = quantaTimeMillis;
+
+            beginQuantaPhaser.register();
+            endQuantaPhaser.register();
+
+            if (globalPhaser.getRegisteredParties() == 0) {
+                globalPhaser.register();
+            }
+        }
+
+        private int getFirstPhase()
+        {
+            return firstPhase.get();
+        }
+
+        private int getLastPhase()
+        {
+            return lastPhase.get();
+        }
+
+        private int getCompletedPhases()
+        {
+            return completedPhases.get();
+        }
+
+        @Override
+        public ListenableFuture<Void> processFor(Duration duration)
+        {
+            started.set(true);
+            ticker.increment(quantaTimeMillis, MILLISECONDS);
+            globalPhaser.arriveAndAwaitAdvance();
+            int phase = beginQuantaPhaser.arriveAndAwaitAdvance();
+            firstPhase.compareAndSet(-1, phase - 1);
+            lastPhase.set(phase);
+            endQuantaPhaser.arriveAndAwaitAdvance();
+            if (completedPhases.incrementAndGet() >= requiredPhases) {
+                endQuantaPhaser.arriveAndDeregister();
+                beginQuantaPhaser.arriveAndDeregister();
+                globalPhaser.arriveAndDeregister();
+                completed.set(null);
+            }
+
+            return immediateVoidFuture();
+        }
+
+        @Override
+        public String getInfo()
+        {
+            return "testing-split";
+        }
+
+        @Override
+        public int getPipelineId()
+        {
+            return 0;
+        }
+
+        @Override
+        public Span getPipelineSpan()
+        {
+            return Span.getInvalid();
+        }
+
+        @Override
+        public boolean isFinished()
+        {
+            return completed.isDone();
+        }
+
+        public boolean isStarted()
+        {
+            return started.get();
+        }
+
+        @Override
+        public void close()
+        {
+        }
+
+        public Future<Void> getCompletedFuture()
+        {
+            return completed;
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/TimeSharingTaskExecutorSimulation.java b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/TimeSharingTaskExecutorSimulation.java
new file mode 100644
index 000000000000..91942d567e62
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/executor/timesharing/TimeSharingTaskExecutorSimulation.java
@@ -0,0 +1,450 @@
+/*
+ * Licensed 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 io.trino.execution.executor.timesharing;
+
+import com.google.common.base.Ticker;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ListMultimap;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import io.airlift.units.Duration;
+import io.trino.execution.executor.timesharing.SimulationController.TaskSpecification;
+import io.trino.execution.executor.timesharing.SplitGenerators.AggregatedLeafSplitGenerator;
+import io.trino.execution.executor.timesharing.SplitGenerators.FastLeafSplitGenerator;
+import io.trino.execution.executor.timesharing.SplitGenerators.IntermediateSplitGenerator;
+import io.trino.execution.executor.timesharing.SplitGenerators.L4LeafSplitGenerator;
+import io.trino.execution.executor.timesharing.SplitGenerators.QuantaExceedingSplitGenerator;
+import io.trino.execution.executor.timesharing.SplitGenerators.SimpleLeafSplitGenerator;
+import io.trino.execution.executor.timesharing.SplitGenerators.SlowLeafSplitGenerator;
+import org.joda.time.DateTime;
+
+import java.io.Closeable;
+import java.util.List;
+import java.util.LongSummaryStatistics;
+import java.util.Map;
+import java.util.OptionalInt;
+import java.util.Set;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.stream.Collectors;
+
+import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator;
+import static io.airlift.concurrent.Threads.threadsNamed;
+import static io.airlift.units.Duration.nanosSince;
+import static io.airlift.units.Duration.succinctNanos;
+import static io.trino.execution.executor.timesharing.Histogram.fromContinuous;
+import static io.trino.execution.executor.timesharing.Histogram.fromDiscrete;
+import static io.trino.execution.executor.timesharing.SimulationController.TaskSpecification.Type.INTERMEDIATE;
+import static io.trino.execution.executor.timesharing.SimulationController.TaskSpecification.Type.LEAF;
+import static java.lang.String.format;
+import static java.util.concurrent.Executors.newCachedThreadPool;
+import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.HOURS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.function.Function.identity;
+
+public class TimeSharingTaskExecutorSimulation
+        implements Closeable
+{
+    public static void main(String[] args)
+            throws Exception
+    {
+        try (TimeSharingTaskExecutorSimulation simulator = new TimeSharingTaskExecutorSimulation()) {
+            simulator.run();
+        }
+    }
+
+    private final ListeningExecutorService submissionExecutor = listeningDecorator(newCachedThreadPool(threadsNamed(getClass().getSimpleName() + "-%s")));
+    private final ScheduledExecutorService overallStatusPrintExecutor = newSingleThreadScheduledExecutor();
+    private final ScheduledExecutorService runningSplitsPrintExecutor = newSingleThreadScheduledExecutor();
+    private final ScheduledExecutorService wakeupExecutor = newScheduledThreadPool(32);
+
+    private final TimeSharingTaskExecutor taskExecutor;
+    private final MultilevelSplitQueue splitQueue;
+
+    private TimeSharingTaskExecutorSimulation()
+    {
+        splitQueue = new MultilevelSplitQueue(2);
+        taskExecutor = new TimeSharingTaskExecutor(36, 72, 3, 8, splitQueue, Ticker.systemTicker());
+        taskExecutor.start();
+    }
+
+    @Override
+    public void close()
+    {
+        submissionExecutor.shutdownNow();
+        overallStatusPrintExecutor.shutdownNow();
+        runningSplitsPrintExecutor.shutdownNow();
+        wakeupExecutor.shutdownNow();
+        taskExecutor.stop();
+    }
+
+    public void run()
+            throws Exception
+    {
+        long start = System.nanoTime();
+        scheduleStatusPrinter(start);
+
+        SimulationController controller = new SimulationController(taskExecutor, TimeSharingTaskExecutorSimulation::printSummaryStats);
+
+        // Uncomment one of these:
+        // runExperimentOverloadedCluster(controller);
+        // runExperimentMisbehavingQuanta(controller);
+        // runExperimentStarveSlowSplits(controller);
+        runExperimentWithinLevelFairness(controller);
+
+        System.out.println("Stopped scheduling new tasks. Ending simulation..");
+        controller.stop();
+        close();
+
+        SECONDS.sleep(5);
+
+        System.out.println();
+        System.out.println("Simulation finished at " + DateTime.now() + ". Runtime: " + nanosSince(start));
+        System.out.println();
+
+        printSummaryStats(controller, taskExecutor);
+    }
+
+    private void runExperimentOverloadedCluster(SimulationController controller)
+            throws InterruptedException
+    {
+        /*
+        Designed to simulate a somewhat overloaded Hive cluster.
+        The following data is a point-in-time snapshot representative production cluster:
+            - 60 running queries => 45 queries/node
+            - 80 tasks/node
+            - 600 splits scheduled/node (80% intermediate => ~480, 20% leaf => 120)
+            - Only 60% intermediate splits will ever get data (~300)
+
+        Desired result:
+        This experiment should demonstrate the trade-offs that will be made during periods when a
+        node is under heavy load. Ideally, the different classes of tasks should each accumulate
+        scheduled time, and not spend disproportionately long waiting.
+        */
+
+        System.out.println("Overload experiment started.");
+        TaskSpecification leafSpec = new TaskSpecification(LEAF, "leaf", OptionalInt.empty(), 16, 30, new AggregatedLeafSplitGenerator());
+        controller.addTaskSpecification(leafSpec);
+
+        TaskSpecification slowLeafSpec = new TaskSpecification(LEAF, "slow_leaf", OptionalInt.empty(), 16, 10, new SlowLeafSplitGenerator());
+        controller.addTaskSpecification(slowLeafSpec);
+
+        TaskSpecification intermediateSpec = new TaskSpecification(INTERMEDIATE, "intermediate", OptionalInt.empty(), 8, 40, new IntermediateSplitGenerator(wakeupExecutor));
+        controller.addTaskSpecification(intermediateSpec);
+
+        controller.enableSpecification(leafSpec);
+        controller.enableSpecification(slowLeafSpec);
+        controller.enableSpecification(intermediateSpec);
+        controller.run();
+
+        SECONDS.sleep(30);
+
+        // this gets the executor into a more realistic point-in-time state, where long-running tasks start to make progress
+        for (int i = 0; i < 20; i++) {
+            controller.clearPendingQueue();
+            MINUTES.sleep(1);
+        }
+
+        System.out.println("Overload experiment completed.");
+    }
+
+    private void runExperimentStarveSlowSplits(SimulationController controller)
+            throws InterruptedException
+    {
+        /*
+        Designed to simulate how higher level admission control affects short-term scheduling decisions.
+        A fixed, large number of tasks (120) are submitted at approximately the same time.
+
+        Desired result:
+        Trino is designed to prioritize fast, short tasks at the expense of longer slower tasks.
+        This experiment allows us to quantify exactly how this preference manifests itself. It is
+        expected that shorter tasks will complete faster, however, longer tasks should not starve
+        for more than a couple of minutes at a time.
+        */
+
+        System.out.println("Starvation experiment started.");
+        TaskSpecification slowLeafSpec = new TaskSpecification(LEAF, "slow_leaf", OptionalInt.of(600), 40, 4, new SlowLeafSplitGenerator());
+        controller.addTaskSpecification(slowLeafSpec);
+
+        TaskSpecification intermediateSpec = new TaskSpecification(INTERMEDIATE, "intermediate", OptionalInt.of(400), 40, 8, new IntermediateSplitGenerator(wakeupExecutor));
+        controller.addTaskSpecification(intermediateSpec);
+
+        TaskSpecification fastLeafSpec = new TaskSpecification(LEAF, "fast_leaf", OptionalInt.of(600), 40, 4, new FastLeafSplitGenerator());
+        controller.addTaskSpecification(fastLeafSpec);
+
+        controller.enableSpecification(slowLeafSpec);
+        controller.enableSpecification(fastLeafSpec);
+        controller.enableSpecification(intermediateSpec);
+
+        controller.run();
+
+        for (int i = 0; i < 60; i++) {
+            SECONDS.sleep(20);
+            controller.clearPendingQueue();
+        }
+
+        System.out.println("Starvation experiment completed.");
+    }
+
+    private void runExperimentMisbehavingQuanta(SimulationController controller)
+            throws InterruptedException
+    {
+        /*
+        Designed to simulate how Trino allocates resources in scenarios where there is variance in
+        quanta run-time between tasks.
+
+        Desired result:
+        Variance in quanta run time should not affect total accrued scheduled time. It is
+        acceptable, however, to penalize tasks that use extremely short quanta, as each quanta
+        incurs scheduling overhead.
+        */
+
+        System.out.println("Misbehaving quanta experiment started.");
+
+        TaskSpecification slowLeafSpec = new TaskSpecification(LEAF, "good_leaf", OptionalInt.empty(), 16, 4, new L4LeafSplitGenerator());
+        controller.addTaskSpecification(slowLeafSpec);
+
+        TaskSpecification misbehavingLeafSpec = new TaskSpecification(LEAF, "bad_leaf", OptionalInt.empty(), 16, 4, new QuantaExceedingSplitGenerator());
+        controller.addTaskSpecification(misbehavingLeafSpec);
+
+        controller.enableSpecification(slowLeafSpec);
+        controller.enableSpecification(misbehavingLeafSpec);
+
+        controller.run();
+
+        for (int i = 0; i < 120; i++) {
+            controller.clearPendingQueue();
+            SECONDS.sleep(20);
+        }
+
+        System.out.println("Misbehaving quanta experiment completed.");
+    }
+
+    private void runExperimentWithinLevelFairness(SimulationController controller)
+            throws InterruptedException
+    {
+        /*
+        Designed to simulate how Trino allocates resources to tasks at the same level of the
+        feedback queue when there is large variance in accrued scheduled time.
+
+        Desired result:
+        Scheduling within levels should be fair - total accrued time should not affect what
+        fraction of resources tasks are allocated as long as they are in the same level.
+        */
+
+        System.out.println("Level fairness experiment started.");
+
+        TaskSpecification longLeafSpec = new TaskSpecification(INTERMEDIATE, "l4_long", OptionalInt.empty(), 2, 16, new SimpleLeafSplitGenerator(MINUTES.toNanos(4), SECONDS.toNanos(1)));
+        controller.addTaskSpecification(longLeafSpec);
+
+        TaskSpecification shortLeafSpec = new TaskSpecification(INTERMEDIATE, "l4_short", OptionalInt.empty(), 2, 16, new SimpleLeafSplitGenerator(MINUTES.toNanos(2), SECONDS.toNanos(1)));
+        controller.addTaskSpecification(shortLeafSpec);
+
+        controller.enableSpecification(longLeafSpec);
+        controller.run();
+
+        // wait until long tasks are all well into L4
+        MINUTES.sleep(1);
+        controller.runCallback();
+
+        // start short leaf tasks
+        controller.enableSpecification(shortLeafSpec);
+
+        // wait until short tasks hit L4
+        SECONDS.sleep(25);
+        controller.runCallback();
+
+        // now watch for L4 fairness at this point
+        MINUTES.sleep(2);
+
+        System.out.println("Level fairness experiment completed.");
+    }
+
+    private void scheduleStatusPrinter(long start)
+    {
+        overallStatusPrintExecutor.scheduleAtFixedRate(() -> {
+            try {
+                System.out.printf(
+                        "%6s -- %4s splits (R: %2s  L: %3s  I: %3s  B: %3s  W: %3s  C: %5s)  |  %3s tasks (%3s %3s %3s %3s %3s)  |  Selections: %4s %4s %4s %4s %3s\n",
+                        nanosSince(start),
+                        taskExecutor.getTotalSplits(),
+                        taskExecutor.getRunningSplits(),
+                        taskExecutor.getTotalSplits() - taskExecutor.getIntermediateSplits(),
+                        taskExecutor.getIntermediateSplits(),
+                        taskExecutor.getBlockedSplits(),
+                        taskExecutor.getWaitingSplits(),
+                        taskExecutor.getCompletedSplitsLevel0() + taskExecutor.getCompletedSplitsLevel1() + taskExecutor.getCompletedSplitsLevel2() + taskExecutor.getCompletedSplitsLevel3() + taskExecutor.getCompletedSplitsLevel4(),
+                        taskExecutor.getTasks(),
+                        taskExecutor.getRunningTasksLevel0(),
+                        taskExecutor.getRunningTasksLevel1(),
+                        taskExecutor.getRunningTasksLevel2(),
+                        taskExecutor.getRunningTasksLevel3(),
+                        taskExecutor.getRunningTasksLevel4(),
+                        (int) splitQueue.getSelectedCountLevel0().getOneMinute().getRate(),
+                        (int) splitQueue.getSelectedCountLevel1().getOneMinute().getRate(),
+                        (int) splitQueue.getSelectedCountLevel2().getOneMinute().getRate(),
+                        (int) splitQueue.getSelectedCountLevel3().getOneMinute().getRate(),
+                        (int) splitQueue.getSelectedCountLevel4().getOneMinute().getRate());
+            }
+            catch (Exception ignored) {
+            }
+        }, 1, 1, SECONDS);
+    }
+
+    private static void printSummaryStats(SimulationController controller, TimeSharingTaskExecutor taskExecutor)
+    {
+        Map<TaskSpecification, Boolean> specEnabled = controller.getSpecificationEnabled();
+
+        ListMultimap<TaskSpecification, SimulationTask> completedTasks = controller.getCompletedTasks();
+        ListMultimap<TaskSpecification, SimulationTask> runningTasks = controller.getRunningTasks();
+        Set<SimulationTask> allTasks = ImmutableSet.<SimulationTask>builder().addAll(completedTasks.values()).addAll(runningTasks.values()).build();
+
+        long completedSplits = completedTasks.values().stream().mapToInt(t -> t.getCompletedSplits().size()).sum();
+        long runningSplits = runningTasks.values().stream().mapToInt(t -> t.getCompletedSplits().size()).sum();
+
+        System.out.println("Completed tasks : " + completedTasks.size());
+        System.out.println("Remaining tasks : " + runningTasks.size());
+        System.out.println("Completed splits: " + completedSplits);
+        System.out.println("Remaining splits: " + runningSplits);
+        System.out.println();
+        System.out.println("Completed tasks  L0: " + taskExecutor.getCompletedTasksLevel0());
+        System.out.println("Completed tasks  L1: " + taskExecutor.getCompletedTasksLevel1());
+        System.out.println("Completed tasks  L2: " + taskExecutor.getCompletedTasksLevel2());
+        System.out.println("Completed tasks  L3: " + taskExecutor.getCompletedTasksLevel3());
+        System.out.println("Completed tasks  L4: " + taskExecutor.getCompletedTasksLevel4());
+        System.out.println();
+        System.out.println("Completed splits L0: " + taskExecutor.getCompletedSplitsLevel0());
+        System.out.println("Completed splits L1: " + taskExecutor.getCompletedSplitsLevel1());
+        System.out.println("Completed splits L2: " + taskExecutor.getCompletedSplitsLevel2());
+        System.out.println("Completed splits L3: " + taskExecutor.getCompletedSplitsLevel3());
+        System.out.println("Completed splits L4: " + taskExecutor.getCompletedSplitsLevel4());
+
+        Histogram<Long> levelsHistogram = fromContinuous(ImmutableList.of(
+                MILLISECONDS.toNanos(0L),
+                MILLISECONDS.toNanos(1_000),
+                MILLISECONDS.toNanos(10_000L),
+                MILLISECONDS.toNanos(60_000L),
+                MILLISECONDS.toNanos(300_000L),
+                HOURS.toNanos(1),
+                DAYS.toNanos(1)));
+
+        System.out.println();
+        System.out.println("Levels - Completed Task Processed Time");
+        levelsHistogram.printDistribution(
+                completedTasks.values().stream().filter(t -> t.getSpecification().getType() == LEAF).collect(Collectors.toList()),
+                SimulationTask::getScheduledTimeNanos,
+                SimulationTask::getProcessedTimeNanos,
+                Duration::succinctNanos,
+                TimeSharingTaskExecutorSimulation::formatNanos);
+
+        System.out.println();
+        System.out.println("Levels - Running Task Processed Time");
+        levelsHistogram.printDistribution(
+                runningTasks.values().stream().filter(t -> t.getSpecification().getType() == LEAF).collect(Collectors.toList()),
+                SimulationTask::getScheduledTimeNanos,
+                SimulationTask::getProcessedTimeNanos,
+                Duration::succinctNanos,
+                TimeSharingTaskExecutorSimulation::formatNanos);
+
+        System.out.println();
+        System.out.println("Levels - All Task Wait Time");
+        levelsHistogram.printDistribution(
+                runningTasks.values().stream().filter(t -> t.getSpecification().getType() == LEAF).collect(Collectors.toList()),
+                SimulationTask::getScheduledTimeNanos,
+                SimulationTask::getTotalWaitTimeNanos,
+                Duration::succinctNanos,
+                TimeSharingTaskExecutorSimulation::formatNanos);
+
+        System.out.println();
+        System.out.println("Specification - Processed time");
+        Set<String> specifications = runningTasks.values().stream().map(t -> t.getSpecification().getName()).collect(Collectors.toSet());
+        fromDiscrete(specifications).printDistribution(
+                allTasks,
+                t -> t.getSpecification().getName(),
+                SimulationTask::getProcessedTimeNanos,
+                identity(),
+                TimeSharingTaskExecutorSimulation::formatNanos);
+
+        System.out.println();
+        System.out.println("Specification - Wait time");
+        fromDiscrete(specifications).printDistribution(
+                allTasks,
+                t -> t.getSpecification().getName(),
+                SimulationTask::getTotalWaitTimeNanos,
+                identity(),
+                TimeSharingTaskExecutorSimulation::formatNanos);
+
+        System.out.println();
+        System.out.println("Breakdown by specification");
+        System.out.println("##########################");
+        for (TaskSpecification specification : specEnabled.keySet()) {
+            List<SimulationTask> allSpecificationTasks = ImmutableList.<SimulationTask>builder()
+                    .addAll(completedTasks.get(specification))
+                    .addAll(runningTasks.get(specification))
+                    .build();
+
+            System.out.println(specification.getName());
+            System.out.println("=============================");
+            System.out.println("Completed tasks           : " + completedTasks.get(specification).size());
+            System.out.println("In-progress tasks         : " + runningTasks.get(specification).size());
+            System.out.println("Total tasks               : " + specification.getTotalTasks());
+            System.out.println("Splits/task               : " + specification.getNumSplitsPerTask());
+            System.out.println("Current required time     : " + succinctNanos(allSpecificationTasks.stream().mapToLong(SimulationTask::getScheduledTimeNanos).sum()));
+            System.out.println("Completed scheduled time  : " + succinctNanos(allSpecificationTasks.stream().mapToLong(SimulationTask::getProcessedTimeNanos).sum()));
+            System.out.println("Total wait time           : " + succinctNanos(allSpecificationTasks.stream().mapToLong(SimulationTask::getTotalWaitTimeNanos).sum()));
+
+            System.out.println();
+            System.out.println("All Tasks by Scheduled time - Processed Time");
+            levelsHistogram.printDistribution(
+                    allSpecificationTasks,
+                    SimulationTask::getScheduledTimeNanos,
+                    SimulationTask::getProcessedTimeNanos,
+                    Duration::succinctNanos,
+                    TimeSharingTaskExecutorSimulation::formatNanos);
+
+            System.out.println();
+            System.out.println("All Tasks by Scheduled time - Wait Time");
+            levelsHistogram.printDistribution(
+                    allSpecificationTasks,
+                    SimulationTask::getScheduledTimeNanos,
+                    SimulationTask::getTotalWaitTimeNanos,
+                    Duration::succinctNanos,
+                    TimeSharingTaskExecutorSimulation::formatNanos);
+
+            System.out.println();
+            System.out.println("Complete Tasks by Scheduled time - Wait Time");
+            levelsHistogram.printDistribution(
+                    completedTasks.get(specification),
+                    SimulationTask::getScheduledTimeNanos,
+                    SimulationTask::getTotalWaitTimeNanos,
+                    Duration::succinctNanos,
+                    TimeSharingTaskExecutorSimulation::formatNanos);
+        }
+    }
+
+    private static String formatNanos(List<Long> list)
+    {
+        LongSummaryStatistics stats = list.stream().mapToLong(Long::new).summaryStatistics();
+        return format(
+                "Min: %8s  Max: %8s  Avg: %8s  Sum: %8s",
+                succinctNanos(stats.getMin() == Long.MAX_VALUE ? 0 : stats.getMin()),
+                succinctNanos(stats.getMax() == Long.MIN_VALUE ? 0 : stats.getMax()),
+                succinctNanos((long) stats.getAverage()),
+                succinctNanos(stats.getSum()));
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestResourceGroups.java b/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestResourceGroups.java
index 3ac0a8bc5a94..c669a9a79098 100644
--- a/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestResourceGroups.java
+++ b/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestResourceGroups.java
@@ -20,7 +20,8 @@
 import io.trino.server.QueryStateInfo;
 import io.trino.server.ResourceGroupInfo;
 import org.apache.commons.math3.distribution.BinomialDistribution;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -57,7 +58,8 @@
 
 public class TestResourceGroups
 {
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testQueueFull()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor());
@@ -76,7 +78,8 @@ public void testQueueFull()
         assertEquals(query3.getThrowable().getMessage(), "Too many queued queries for \"root\"");
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testFairEligibility()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor());
@@ -170,7 +173,8 @@ public void testSetSchedulingPolicy()
         assertEquals(root.getOrCreateSubGroup("2").getSchedulingPolicy(), QUERY_PRIORITY);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testFairQueuing()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor());
@@ -210,7 +214,8 @@ public void testFairQueuing()
         assertEquals(query1c.getState(), QUEUED);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testMemoryLimit()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor());
@@ -263,7 +268,8 @@ public void testSubgroupMemoryLimit()
         assertEquals(query3.getState(), RUNNING);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testSoftCpuLimit()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor());
@@ -301,7 +307,8 @@ public void testSoftCpuLimit()
         assertEquals(query3.getState(), RUNNING);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testHardCpuLimit()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor());
@@ -336,7 +343,8 @@ public void testHardCpuLimit()
      * Test resource group CPU usage update by manually invoking the CPU quota regeneration and queue processing methods
      * that are invoked periodically by the resource group manager
      */
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testCpuUsageUpdateForRunningQuery()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor());
@@ -378,7 +386,8 @@ public void testCpuUsageUpdateForRunningQuery()
         assertEquals(q2.getState(), RUNNING);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testCpuUsageUpdateAtQueryCompletion()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor());
@@ -418,7 +427,8 @@ public void testCpuUsageUpdateAtQueryCompletion()
         assertEquals(q2.getState(), RUNNING);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testMemoryUsageUpdateForRunningQuery()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor());
@@ -458,7 +468,8 @@ public void testMemoryUsageUpdateForRunningQuery()
         assertEquals(q3.getState(), RUNNING);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testMemoryUsageUpdateAtQueryCompletion()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor());
@@ -493,7 +504,8 @@ public void testMemoryUsageUpdateAtQueryCompletion()
      * A test for correct CPU usage update aggregation and propagation in non-leaf nodes. It uses in a multi
      * level resource group tree, with non-leaf resource groups having more than one child.
      */
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testRecursiveCpuUsageUpdate()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor());
@@ -606,7 +618,8 @@ public void testRecursiveCpuUsageUpdate()
      * A test for correct memory usage update aggregation and propagation in non-leaf nodes. It uses in a multi
      * level resource group tree, with non-leaf resource groups having more than one child.
      */
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testMemoryUpdateRecursively()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor())
@@ -697,7 +710,8 @@ public void triggerProcessQueuedQueries()
         assertEquals(q5.getState(), RUNNING);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testPriorityScheduling()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor());
@@ -751,7 +765,8 @@ public void testPriorityScheduling()
         }
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testWeightedScheduling()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor())
@@ -807,7 +822,8 @@ public void triggerProcessQueuedQueries()
         assertGreaterThan(group2Ran, lowerBound);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testWeightedFairScheduling()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor())
@@ -857,7 +873,8 @@ public void triggerProcessQueuedQueries()
         assertBetweenInclusive(group2Ran, 1995, 2000);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testWeightedFairSchedulingEqualWeights()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor())
@@ -923,7 +940,8 @@ public void triggerProcessQueuedQueries()
         assertBetweenInclusive(group3Ran, 2 * lowerBound, 2 * upperBound);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testWeightedFairSchedulingNoStarvation()
     {
         InternalResourceGroup root = new InternalResourceGroup("root", (group, export) -> {}, directExecutor())
diff --git a/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestStochasticPriorityQueue.java b/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestStochasticPriorityQueue.java
index 171e7c9d92d6..a3664b51979c 100644
--- a/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestStochasticPriorityQueue.java
+++ b/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestStochasticPriorityQueue.java
@@ -14,7 +14,7 @@
 package io.trino.execution.resourcegroups;
 
 import org.apache.commons.math3.distribution.BinomialDistribution;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.testing.Assertions.assertGreaterThan;
 import static io.airlift.testing.Assertions.assertLessThan;
diff --git a/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestUpdateablePriorityQueue.java b/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestUpdateablePriorityQueue.java
index 9ee154221f25..42d9bf9cf3e3 100644
--- a/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestUpdateablePriorityQueue.java
+++ b/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestUpdateablePriorityQueue.java
@@ -14,10 +14,13 @@
 package io.trino.execution.resourcegroups;
 
 import com.google.common.collect.ImmutableList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
+import static io.trino.execution.resourcegroups.IndexedPriorityQueue.PriorityOrdering.HIGH_TO_LOW;
+import static io.trino.execution.resourcegroups.IndexedPriorityQueue.PriorityOrdering.LOW_TO_HIGH;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
@@ -33,6 +36,41 @@ public void testFifoQueue()
     public void testIndexedPriorityQueue()
     {
         assertEquals(populateAndExtract(new IndexedPriorityQueue<>()), ImmutableList.of(3, 2, 1));
+        assertEquals(populateAndExtract(new IndexedPriorityQueue<>(HIGH_TO_LOW)), ImmutableList.of(3, 2, 1));
+        assertEquals(populateAndExtract(new IndexedPriorityQueue<>(LOW_TO_HIGH)), ImmutableList.of(1, 2, 3));
+    }
+
+    @Test
+    public void testPrioritizedPeekPollIndexedPriorityQueue()
+    {
+        IndexedPriorityQueue<Object> queue = new IndexedPriorityQueue<>();
+        queue.addOrUpdate("a", 1);
+        queue.addOrUpdate("b", 3);
+        queue.addOrUpdate("c", 2);
+
+        IndexedPriorityQueue.Prioritized<Object> peek1 = queue.peekPrioritized();
+        assertThat(peek1.getValue()).isEqualTo("b");
+        assertThat(peek1.getPriority()).isEqualTo(3);
+        IndexedPriorityQueue.Prioritized<Object> poll1 = queue.pollPrioritized();
+        assertThat(poll1.getValue()).isEqualTo("b");
+        assertThat(poll1.getPriority()).isEqualTo(3);
+
+        IndexedPriorityQueue.Prioritized<Object> peek2 = queue.peekPrioritized();
+        assertThat(peek2.getValue()).isEqualTo("c");
+        assertThat(peek2.getPriority()).isEqualTo(2);
+        IndexedPriorityQueue.Prioritized<Object> poll2 = queue.pollPrioritized();
+        assertThat(poll2.getValue()).isEqualTo("c");
+        assertThat(poll2.getPriority()).isEqualTo(2);
+
+        IndexedPriorityQueue.Prioritized<Object> peek3 = queue.peekPrioritized();
+        assertThat(peek3.getValue()).isEqualTo("a");
+        assertThat(peek3.getPriority()).isEqualTo(1);
+        IndexedPriorityQueue.Prioritized<Object> poll3 = queue.pollPrioritized();
+        assertThat(poll3.getValue()).isEqualTo("a");
+        assertThat(poll3.getPriority()).isEqualTo(1);
+
+        assertThat(queue.peekPrioritized()).isNull();
+        assertThat(queue.pollPrioritized()).isNull();
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestWeightedFairQueue.java b/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestWeightedFairQueue.java
index 34bb932a9bf3..b4d72311d3c7 100644
--- a/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestWeightedFairQueue.java
+++ b/core/trino-main/src/test/java/io/trino/execution/resourcegroups/TestWeightedFairQueue.java
@@ -14,7 +14,7 @@
 package io.trino.execution.resourcegroups;
 
 import io.trino.execution.resourcegroups.WeightedFairQueue.Usage;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/SplitAssignerTester.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/SplitAssignerTester.java
deleted file mode 100644
index f2a4602e71d2..000000000000
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/SplitAssignerTester.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.scheduler;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableListMultimap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.SetMultimap;
-import com.google.common.collect.Sets;
-import io.trino.execution.scheduler.SplitAssigner.AssignmentResult;
-import io.trino.execution.scheduler.SplitAssigner.Partition;
-import io.trino.execution.scheduler.SplitAssigner.PartitionUpdate;
-import io.trino.metadata.Split;
-import io.trino.sql.planner.plan.PlanNodeId;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Verify.verify;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static org.assertj.core.api.Assertions.assertThat;
-
-class SplitAssignerTester
-{
-    private final Map<Integer, NodeRequirements> nodeRequirements = new HashMap<>();
-    private final Map<Integer, ListMultimap<PlanNodeId, Split>> splits = new HashMap<>();
-    private final SetMultimap<Integer, PlanNodeId> noMoreSplits = HashMultimap.create();
-    private final Set<Integer> sealedPartitions = new HashSet<>();
-    private boolean noMorePartitions;
-    private Optional<List<TaskDescriptor>> taskDescriptors = Optional.empty();
-
-    public Optional<List<TaskDescriptor>> getTaskDescriptors()
-    {
-        return taskDescriptors;
-    }
-
-    public synchronized int getPartitionCount()
-    {
-        return nodeRequirements.size();
-    }
-
-    public synchronized NodeRequirements getNodeRequirements(int partition)
-    {
-        NodeRequirements result = nodeRequirements.get(partition);
-        checkArgument(result != null, "partition not found: %s", partition);
-        return result;
-    }
-
-    public synchronized Set<Integer> getSplitIds(int partition, PlanNodeId planNodeId)
-    {
-        ListMultimap<PlanNodeId, Split> partitionSplits = splits.getOrDefault(partition, ImmutableListMultimap.of());
-        return partitionSplits.get(planNodeId).stream()
-                .map(split -> (TestingConnectorSplit) split.getConnectorSplit())
-                .map(TestingConnectorSplit::getId)
-                .collect(toImmutableSet());
-    }
-
-    public synchronized boolean isNoMoreSplits(int partition, PlanNodeId planNodeId)
-    {
-        return noMoreSplits.get(partition).contains(planNodeId);
-    }
-
-    public synchronized boolean isSealed(int partition)
-    {
-        return sealedPartitions.contains(partition);
-    }
-
-    public synchronized boolean isNoMorePartitions()
-    {
-        return noMorePartitions;
-    }
-
-    public void checkContainsSplits(PlanNodeId planNodeId, Collection<Split> splits, boolean replicated)
-    {
-        Set<Integer> expectedSplitIds = splits.stream()
-                .map(TestingConnectorSplit::getSplitId)
-                .collect(Collectors.toSet());
-        for (int partitionId = 0; partitionId < getPartitionCount(); partitionId++) {
-            Set<Integer> partitionSplitIds = getSplitIds(partitionId, planNodeId);
-            if (replicated) {
-                assertThat(partitionSplitIds).containsAll(expectedSplitIds);
-            }
-            else {
-                expectedSplitIds.removeAll(partitionSplitIds);
-            }
-        }
-        if (!replicated) {
-            assertThat(expectedSplitIds).isEmpty();
-        }
-    }
-
-    public void update(AssignmentResult assignment)
-    {
-        for (Partition partition : assignment.partitionsAdded()) {
-            verify(!noMorePartitions, "noMorePartitions is set");
-            verify(nodeRequirements.put(partition.partitionId(), partition.nodeRequirements()) == null, "partition already exist: %s", partition.partitionId());
-        }
-        for (PartitionUpdate partitionUpdate : assignment.partitionUpdates()) {
-            int partitionId = partitionUpdate.partitionId();
-            verify(nodeRequirements.get(partitionId) != null, "partition does not exist: %s", partitionId);
-            verify(!sealedPartitions.contains(partitionId), "partition is sealed: %s", partitionId);
-            PlanNodeId planNodeId = partitionUpdate.planNodeId();
-            if (!partitionUpdate.splits().isEmpty()) {
-                verify(!noMoreSplits.get(partitionId).contains(planNodeId), "noMoreSplits is set for partition %s and plan node %s", partitionId, planNodeId);
-                splits.computeIfAbsent(partitionId, (key) -> ArrayListMultimap.create()).putAll(planNodeId, partitionUpdate.splits());
-            }
-            if (partitionUpdate.noMoreSplits()) {
-                noMoreSplits.put(partitionId, planNodeId);
-            }
-        }
-        assignment.sealedPartitions().forEach(sealedPartitions::add);
-        if (assignment.noMorePartitions()) {
-            noMorePartitions = true;
-        }
-        checkFinished();
-    }
-
-    private synchronized void checkFinished()
-    {
-        if (noMorePartitions && sealedPartitions.containsAll(nodeRequirements.keySet())) {
-            verify(sealedPartitions.equals(nodeRequirements.keySet()), "unknown sealed partitions: %s", Sets.difference(sealedPartitions, nodeRequirements.keySet()));
-            ImmutableList.Builder<TaskDescriptor> result = ImmutableList.builder();
-            for (Integer partitionId : sealedPartitions) {
-                ListMultimap<PlanNodeId, Split> taskSplits = splits.getOrDefault(partitionId, ImmutableListMultimap.of());
-                verify(
-                        noMoreSplits.get(partitionId).containsAll(taskSplits.keySet()),
-                        "no more split is missing for partition %s: %s",
-                        partitionId,
-                        Sets.difference(taskSplits.keySet(), noMoreSplits.get(partitionId)));
-                result.add(new TaskDescriptor(
-                        partitionId,
-                        taskSplits,
-                        nodeRequirements.get(partitionId)));
-            }
-            taskDescriptors = Optional.of(result.build());
-        }
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestBinPackingNodeAllocator.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestBinPackingNodeAllocator.java
deleted file mode 100644
index f86bb81b33d4..000000000000
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestBinPackingNodeAllocator.java
+++ /dev/null
@@ -1,704 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.scheduler;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.util.concurrent.Futures;
-import io.airlift.testing.TestingTicker;
-import io.airlift.units.DataSize;
-import io.trino.Session;
-import io.trino.client.NodeVersion;
-import io.trino.execution.StageId;
-import io.trino.execution.TaskId;
-import io.trino.memory.MemoryInfo;
-import io.trino.metadata.InMemoryNodeManager;
-import io.trino.metadata.InternalNode;
-import io.trino.spi.HostAddress;
-import io.trino.spi.connector.CatalogHandle;
-import io.trino.spi.memory.MemoryPoolInfo;
-import io.trino.testing.assertions.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Test;
-
-import java.net.URI;
-import java.time.Duration;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static io.airlift.concurrent.MoreFutures.getFutureValue;
-import static io.airlift.units.DataSize.Unit.GIGABYTE;
-import static io.trino.testing.TestingHandles.createTestCatalogHandle;
-import static io.trino.testing.TestingSession.testSessionBuilder;
-import static java.time.temporal.ChronoUnit.MINUTES;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-// uses mutable state
-@Test(singleThreaded = true)
-public class TestBinPackingNodeAllocator
-{
-    private static final Session SESSION = testSessionBuilder().build();
-
-    private static final HostAddress NODE_1_ADDRESS = HostAddress.fromParts("127.0.0.1", 8080);
-    private static final HostAddress NODE_2_ADDRESS = HostAddress.fromParts("127.0.0.1", 8081);
-    private static final HostAddress NODE_3_ADDRESS = HostAddress.fromParts("127.0.0.1", 8082);
-    private static final HostAddress NODE_4_ADDRESS = HostAddress.fromParts("127.0.0.1", 8083);
-
-    private static final InternalNode NODE_1 = new InternalNode("node-1", URI.create("local://" + NODE_1_ADDRESS), NodeVersion.UNKNOWN, false);
-    private static final InternalNode NODE_2 = new InternalNode("node-2", URI.create("local://" + NODE_2_ADDRESS), NodeVersion.UNKNOWN, false);
-    private static final InternalNode NODE_3 = new InternalNode("node-3", URI.create("local://" + NODE_3_ADDRESS), NodeVersion.UNKNOWN, false);
-    private static final InternalNode NODE_4 = new InternalNode("node-4", URI.create("local://" + NODE_4_ADDRESS), NodeVersion.UNKNOWN, false);
-
-    private static final CatalogHandle CATALOG_1 = createTestCatalogHandle("catalog1");
-
-    private static final NodeRequirements REQ_NONE = new NodeRequirements(Optional.empty(), Set.of());
-    private static final NodeRequirements REQ_NODE_1 = new NodeRequirements(Optional.empty(), Set.of(NODE_1_ADDRESS));
-    private static final NodeRequirements REQ_NODE_2 = new NodeRequirements(Optional.empty(), Set.of(NODE_2_ADDRESS));
-    private static final NodeRequirements REQ_CATALOG_1 = new NodeRequirements(Optional.of(CATALOG_1), Set.of());
-
-    // none of the tests should require periodic execution of routine which processes pending acquisitions
-    private static final long TEST_TIMEOUT = BinPackingNodeAllocatorService.PROCESS_PENDING_ACQUIRES_DELAY_SECONDS * 1000 / 2;
-
-    private BinPackingNodeAllocatorService nodeAllocatorService;
-    private ConcurrentHashMap<String, Optional<MemoryInfo>> workerMemoryInfos;
-    private final TestingTicker ticker = new TestingTicker();
-
-    private void setupNodeAllocatorService(InMemoryNodeManager nodeManager)
-    {
-        setupNodeAllocatorService(nodeManager, DataSize.ofBytes(0));
-    }
-
-    private void setupNodeAllocatorService(InMemoryNodeManager nodeManager, DataSize taskRuntimeMemoryEstimationOverhead)
-    {
-        shutdownNodeAllocatorService(); // just in case
-
-        workerMemoryInfos = new ConcurrentHashMap<>();
-        MemoryInfo memoryInfo = buildWorkerMemoryInfo(DataSize.ofBytes(0), ImmutableMap.of());
-        workerMemoryInfos.put(NODE_1.getNodeIdentifier(), Optional.of(memoryInfo));
-        workerMemoryInfos.put(NODE_2.getNodeIdentifier(), Optional.of(memoryInfo));
-        workerMemoryInfos.put(NODE_3.getNodeIdentifier(), Optional.of(memoryInfo));
-        workerMemoryInfos.put(NODE_4.getNodeIdentifier(), Optional.of(memoryInfo));
-
-        nodeAllocatorService = new BinPackingNodeAllocatorService(
-                nodeManager,
-                () -> workerMemoryInfos,
-                false,
-                false,
-                Duration.of(1, MINUTES),
-                taskRuntimeMemoryEstimationOverhead,
-                ticker);
-        nodeAllocatorService.start();
-    }
-
-    private void updateWorkerUsedMemory(InternalNode node, DataSize usedMemory, Map<TaskId, DataSize> taskMemoryUsage)
-    {
-        workerMemoryInfos.put(node.getNodeIdentifier(), Optional.of(buildWorkerMemoryInfo(usedMemory, taskMemoryUsage)));
-    }
-
-    private MemoryInfo buildWorkerMemoryInfo(DataSize usedMemory, Map<TaskId, DataSize> taskMemoryUsage)
-    {
-        return new MemoryInfo(
-                4,
-                new MemoryPoolInfo(
-                        DataSize.of(64, GIGABYTE).toBytes(),
-                        usedMemory.toBytes(),
-                        0,
-                        ImmutableMap.of(),
-                        ImmutableMap.of(),
-                        ImmutableMap.of(),
-                        taskMemoryUsage.entrySet().stream()
-                                .collect(toImmutableMap(
-                                        entry -> entry.getKey().toString(),
-                                        entry -> entry.getValue().toBytes())),
-                        ImmutableMap.of()));
-    }
-
-    @AfterMethod(alwaysRun = true)
-    public void shutdownNodeAllocatorService()
-    {
-        if (nodeAllocatorService != null) {
-            nodeAllocatorService.stop();
-        }
-        nodeAllocatorService = null;
-    }
-
-    @Test(timeOut = TEST_TIMEOUT)
-    public void testAllocateSimple()
-            throws Exception
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
-        setupNodeAllocatorService(nodeManager);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            // first two allocations should not block
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire1, NODE_1);
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire2, NODE_2);
-
-            // same for subsequent two allocation (each task requires 32GB and we have 2 nodes with 64GB each)
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire3, NODE_1);
-            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire4, NODE_2);
-
-            // 5th allocation should block
-            NodeAllocator.NodeLease acquire5 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertNotAcquired(acquire5);
-
-            // release acquire2 which uses
-            acquire2.release();
-            assertEventually(() -> {
-                // we need to wait as pending acquires are processed asynchronously
-                assertAcquired(acquire5);
-                assertEquals(acquire5.getNode().get(), NODE_2);
-            });
-
-            // try to acquire one more node (should block)
-            NodeAllocator.NodeLease acquire6 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertNotAcquired(acquire6);
-
-            // add new node
-            nodeManager.addNodes(NODE_3);
-            // TODO: make BinPackingNodeAllocatorService react on new node added automatically
-            nodeAllocatorService.processPendingAcquires();
-
-            // new node should be assigned
-            assertEventually(() -> {
-                assertAcquired(acquire6);
-                assertEquals(acquire6.getNode().get(), NODE_3);
-            });
-        }
-    }
-
-    @Test(timeOut = TEST_TIMEOUT)
-    public void testAllocateDifferentSizes()
-            throws Exception
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
-        setupNodeAllocatorService(nodeManager);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire1, NODE_1);
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire2, NODE_2);
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertAcquired(acquire3, NODE_1);
-            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertAcquired(acquire4, NODE_2);
-            NodeAllocator.NodeLease acquire5 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertAcquired(acquire5, NODE_1);
-            NodeAllocator.NodeLease acquire6 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertAcquired(acquire6, NODE_2);
-            // each of the nodes is filled in with 32+16+16
-
-            // try allocate 32 and 16
-            NodeAllocator.NodeLease acquire7 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertNotAcquired(acquire7);
-
-            NodeAllocator.NodeLease acquire8 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertNotAcquired(acquire8);
-
-            // free 16MB on NODE_1;
-            acquire3.release();
-            // none of the pending allocations should be unblocked as NODE_1 is reserved for 32MB allocation which came first
-            assertNotAcquired(acquire7);
-            assertNotAcquired(acquire8);
-
-            // release 16MB on NODE_2
-            acquire4.release();
-            // pending 16MB should be unblocked now
-            assertAcquired(acquire8);
-
-            // unblock another 16MB on NODE_1
-            acquire5.release();
-            // pending 32MB should be unblocked now
-            assertAcquired(acquire7);
-        }
-    }
-
-    @Test(timeOut = TEST_TIMEOUT)
-    public void testAllocateDifferentSizesOpportunisticAcquisition()
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
-        setupNodeAllocatorService(nodeManager);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire1, NODE_1);
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire2, NODE_2);
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertAcquired(acquire3, NODE_1);
-            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertAcquired(acquire4, NODE_2);
-            NodeAllocator.NodeLease acquire5 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertAcquired(acquire5, NODE_1);
-            NodeAllocator.NodeLease acquire6 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertAcquired(acquire6, NODE_2);
-            // each of the nodes is filled in with 32+16+16
-
-            // try to allocate 32 and 16
-            NodeAllocator.NodeLease acquire7 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertNotAcquired(acquire7);
-
-            NodeAllocator.NodeLease acquire8 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertNotAcquired(acquire8);
-
-            // free 32MB on NODE_2;
-            acquire2.release();
-            // even though pending 32MB was reserving space on NODE_1 it will still use free space on NODE_2 when it got available (it has higher priority than 16MB request which came later)
-            assertAcquired(acquire7);
-
-            // release 16MB on NODE_1
-            acquire1.release();
-            // pending 16MB request should be unblocked now
-            assertAcquired(acquire8);
-        }
-    }
-
-    @Test(timeOut = TEST_TIMEOUT)
-    public void testAllocateReleaseBeforeAcquired()
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1);
-        setupNodeAllocatorService(nodeManager);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            // first two allocations should not block
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire1, NODE_1);
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire2, NODE_1);
-
-            // another two should block
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertNotAcquired(acquire3);
-            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertNotAcquired(acquire4);
-
-            // releasing a blocked one should not unblock anything
-            acquire3.release();
-            assertNotAcquired(acquire4);
-
-            // releasing an acquired one should unblock one which is still blocked
-            acquire2.release();
-            assertEventually(() -> assertAcquired(acquire4, NODE_1));
-        }
-    }
-
-    @Test(timeOut = TEST_TIMEOUT)
-    public void testNoMatchingNodeAvailable()
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager();
-        setupNodeAllocatorService(nodeManager);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            // request a node with specific catalog (not present)
-            NodeAllocator.NodeLease acquireNoMatching = nodeAllocator.acquire(REQ_CATALOG_1, DataSize.of(64, GIGABYTE));
-            assertNotAcquired(acquireNoMatching);
-            ticker.increment(59, TimeUnit.SECONDS); // still below timeout
-            nodeAllocatorService.processPendingAcquires();
-            assertNotAcquired(acquireNoMatching);
-            ticker.increment(2, TimeUnit.SECONDS); // past 1 minute timeout
-            nodeAllocatorService.processPendingAcquires();
-            assertThatThrownBy(() -> Futures.getUnchecked(acquireNoMatching.getNode()))
-                    .hasMessageContaining("No nodes available to run query");
-
-            // add node with specific catalog
-            nodeManager.addNodes(NODE_2);
-
-            // we should be able to acquire the node now
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_CATALOG_1, DataSize.of(64, GIGABYTE));
-            assertAcquired(acquire1, NODE_2);
-
-            // acquiring one more should block (only one acquire fits a node as we request 64GB)
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_CATALOG_1, DataSize.of(64, GIGABYTE));
-            assertNotAcquired(acquire2);
-
-            // remove node with catalog
-            nodeManager.removeNode(NODE_2);
-            // TODO: make BinPackingNodeAllocatorService react on node removed automatically
-            nodeAllocatorService.processPendingAcquires();
-            ticker.increment(61, TimeUnit.SECONDS); // wait past the timeout
-            nodeAllocatorService.processPendingAcquires();
-
-            // pending acquire2 should be completed now but with an exception
-            assertEventually(() -> {
-                assertFalse(acquire2.getNode().isCancelled());
-                assertTrue(acquire2.getNode().isDone());
-                assertThatThrownBy(() -> getFutureValue(acquire2.getNode()))
-                        .hasMessage("No nodes available to run query");
-            });
-        }
-    }
-
-    @Test(timeOut = TEST_TIMEOUT)
-    public void testNoMatchingNodeAvailableTimeoutReset()
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager();
-        setupNodeAllocatorService(nodeManager);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            // request a node with specific catalog (not present)
-            NodeAllocator.NodeLease acquireNoMatching1 = nodeAllocator.acquire(REQ_CATALOG_1, DataSize.of(64, GIGABYTE));
-            NodeAllocator.NodeLease acquireNoMatching2 = nodeAllocator.acquire(REQ_CATALOG_1, DataSize.of(64, GIGABYTE));
-            assertNotAcquired(acquireNoMatching1);
-            assertNotAcquired(acquireNoMatching2);
-
-            // wait for a while and add a node
-            ticker.increment(30, TimeUnit.SECONDS); // past 1 minute timeout
-            nodeManager.addNodes(NODE_2);
-
-            // only one of the leases should be completed but timeout counter for period where no nodes
-            // are available should be reset for the other one
-            nodeAllocatorService.processPendingAcquires();
-            assertThat(acquireNoMatching1.getNode().isDone() != acquireNoMatching2.getNode().isDone())
-                    .describedAs("exactly one of pending acquires should be completed")
-                    .isTrue();
-
-            NodeAllocator.NodeLease theAcquireLease = acquireNoMatching1.getNode().isDone() ? acquireNoMatching1 : acquireNoMatching2;
-            NodeAllocator.NodeLease theNotAcquireLease = acquireNoMatching1.getNode().isDone() ? acquireNoMatching2 : acquireNoMatching1;
-
-            // remove the node - we are again in situation where no matching nodes exist in cluster
-            nodeManager.removeNode(NODE_2);
-            theAcquireLease.release();
-            nodeAllocatorService.processPendingAcquires();
-            assertNotAcquired(theNotAcquireLease);
-
-            ticker.increment(59, TimeUnit.SECONDS); // still below 1m timeout as the reset happened in previous step
-            nodeAllocatorService.processPendingAcquires();
-            assertNotAcquired(theNotAcquireLease);
-
-            ticker.increment(2, TimeUnit.SECONDS);
-            nodeAllocatorService.processPendingAcquires();
-            assertThatThrownBy(() -> Futures.getUnchecked(theNotAcquireLease.getNode()))
-                    .hasMessageContaining("No nodes available to run query");
-        }
-    }
-
-    @Test(timeOut = TEST_TIMEOUT)
-    public void testRemoveAcquiredNode()
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1);
-        setupNodeAllocatorService(nodeManager);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire1, NODE_1);
-
-            // remove acquired node
-            nodeManager.removeNode(NODE_1);
-
-            // we should still be able to release lease for removed node
-            acquire1.release();
-        }
-    }
-
-    @Test(timeOut = TEST_TIMEOUT)
-    public void testAllocateNodeWithAddressRequirements()
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
-
-        setupNodeAllocatorService(nodeManager);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NODE_2, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire1, NODE_2);
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NODE_2, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire2, NODE_2);
-
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NODE_2, DataSize.of(32, GIGABYTE));
-            // no more place on NODE_2
-            assertNotAcquired(acquire3);
-
-            // requests for other node are still good
-            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NODE_1, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire4, NODE_1);
-
-            // release some space on NODE_2
-            acquire1.release();
-            // pending acquisition should be unblocked
-            assertEventually(() -> assertAcquired(acquire3));
-        }
-    }
-
-    @Test(timeOut = TEST_TIMEOUT)
-    public void testAllocateNotEnoughRuntimeMemory()
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
-        setupNodeAllocatorService(nodeManager);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            // first allocation is fine
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire1, NODE_1);
-            acquire1.attachTaskId(taskId(1));
-
-            // bump memory usage on NODE_1
-            updateWorkerUsedMemory(NODE_1,
-                    DataSize.of(33, GIGABYTE),
-                    ImmutableMap.of(taskId(1), DataSize.of(33, GIGABYTE)));
-            nodeAllocatorService.refreshNodePoolMemoryInfos();
-
-            // second allocation of 32GB should go to another node
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire2, NODE_2);
-            acquire2.attachTaskId(taskId(2));
-
-            // third allocation of 32GB should also use NODE_2 as there is not enough runtime memory on NODE_1
-            // second allocation of 32GB should go to another node
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire3, NODE_2);
-            acquire3.attachTaskId(taskId(3));
-
-            // fourth allocation of 16 should fit on NODE_1
-            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertAcquired(acquire4, NODE_1);
-            acquire4.attachTaskId(taskId(4));
-
-            // fifth allocation of 16 should no longer fit on NODE_1. There is 16GB unreserved but only 15GB taking runtime usage into account
-            NodeAllocator.NodeLease acquire5 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertNotAcquired(acquire5);
-
-            // even tiny allocations should not fit now
-            NodeAllocator.NodeLease acquire6 = nodeAllocator.acquire(REQ_NONE, DataSize.of(1, GIGABYTE));
-            assertNotAcquired(acquire6);
-
-            // if memory usage decreases on NODE_1 the pending 16GB allocation should complete
-            updateWorkerUsedMemory(NODE_1,
-                    DataSize.of(32, GIGABYTE),
-                    ImmutableMap.of(taskId(1), DataSize.of(32, GIGABYTE)));
-            nodeAllocatorService.refreshNodePoolMemoryInfos();
-            nodeAllocatorService.processPendingAcquires();
-            assertAcquired(acquire5, NODE_1);
-            acquire5.attachTaskId(taskId(5));
-
-            //  acquire6 should still be pending
-            assertNotAcquired(acquire6);
-        }
-    }
-
-    @Test(timeOut = TEST_TIMEOUT)
-    public void testAllocateRuntimeMemoryDiscrepancies()
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1);
-
-        setupNodeAllocatorService(nodeManager);
-        // test when global memory usage on node is greater than per task usage
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            // first allocation is fine
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire1, NODE_1);
-            acquire1.attachTaskId(taskId(1));
-
-            // bump memory usage on NODE_1; per-task usage is kept small
-            updateWorkerUsedMemory(NODE_1,
-                    DataSize.of(33, GIGABYTE),
-                    ImmutableMap.of(taskId(1), DataSize.of(4, GIGABYTE)));
-            nodeAllocatorService.refreshNodePoolMemoryInfos();
-
-            // global (greater) memory usage should take precedence
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertNotAcquired(acquire2);
-        }
-
-        setupNodeAllocatorService(nodeManager);
-        // test when global memory usage on node is smaller than per task usage
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            // first allocation is fine
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire1, NODE_1);
-            acquire1.attachTaskId(taskId(1));
-
-            // bump memory usage on NODE_1; per-task usage is 33GB and global is 4GB
-            updateWorkerUsedMemory(NODE_1,
-                    DataSize.of(4, GIGABYTE),
-                    ImmutableMap.of(taskId(1), DataSize.of(33, GIGABYTE)));
-            nodeAllocatorService.refreshNodePoolMemoryInfos();
-
-            // per-task (greater) memory usage should take precedence
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertNotAcquired(acquire2);
-        }
-
-        setupNodeAllocatorService(nodeManager);
-        // test when per-task memory usage not present at all
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            // first allocation is fine
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire1, NODE_1);
-            acquire1.attachTaskId(taskId(1));
-
-            // bump memory usage on NODE_1; per-task usage is 33GB and global is 4GB
-            updateWorkerUsedMemory(NODE_1, DataSize.of(33, GIGABYTE), ImmutableMap.of());
-            nodeAllocatorService.refreshNodePoolMemoryInfos();
-
-            // global memory usage should be used (not per-task usage)
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertNotAcquired(acquire2);
-        }
-    }
-
-    @Test(timeOut = TEST_TIMEOUT)
-    public void testSpaceReservedOnPrimaryNodeIfNoNodeWithEnoughRuntimeMemoryAvailable()
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
-        setupNodeAllocatorService(nodeManager);
-
-        // test when global memory usage on node is greater than per task usage
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            // reserve 32GB on NODE_1 and 16GB on NODE_2
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire1, NODE_1);
-            acquire1.attachTaskId(taskId(1));
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE));
-            assertAcquired(acquire2, NODE_2);
-            acquire2.attachTaskId(taskId(2));
-
-            // make actual usage on NODE_2 greater than on NODE_1
-            updateWorkerUsedMemory(NODE_1,
-                    DataSize.of(40, GIGABYTE),
-                    ImmutableMap.of(taskId(1), DataSize.of(40, GIGABYTE)));
-            updateWorkerUsedMemory(NODE_2,
-                    DataSize.of(41, GIGABYTE),
-                    ImmutableMap.of(taskId(2), DataSize.of(41, GIGABYTE)));
-            nodeAllocatorService.refreshNodePoolMemoryInfos();
-
-            // try to allocate 32GB task
-            // it will not fit on neither of nodes. space should be reserved on NODE_2 as it has more memory available
-            // when you do not take runtime memory into account
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertNotAcquired(acquire3);
-
-            // to check that is the case try to allocate 20GB; NODE_1 should be picked
-            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(20, GIGABYTE));
-            assertAcquired(acquire4, NODE_1);
-            acquire4.attachTaskId(taskId(2));
-        }
-    }
-
-    @Test(timeOut = TEST_TIMEOUT)
-    public void testAllocateWithRuntimeMemoryEstimateOverhead()
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1);
-        setupNodeAllocatorService(nodeManager, DataSize.of(4, GIGABYTE));
-
-        // test when global memory usage on node is greater than per task usage
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            // allocated 32GB
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertAcquired(acquire1, NODE_1);
-            acquire1.attachTaskId(taskId(1));
-
-            // set runtime usage of task1 to 30GB
-            updateWorkerUsedMemory(NODE_1,
-                    DataSize.of(30, GIGABYTE),
-                    ImmutableMap.of(taskId(1), DataSize.of(30, GIGABYTE)));
-            nodeAllocatorService.refreshNodePoolMemoryInfos();
-
-            // including overhead node runtime usage is 30+4 = 34GB so another 32GB task will not fit
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-            assertNotAcquired(acquire2);
-
-            // decrease runtime usage to 28GB
-            // set runtime usage of task1 to 30GB
-            updateWorkerUsedMemory(NODE_1,
-                    DataSize.of(28, GIGABYTE),
-                    ImmutableMap.of(taskId(1), DataSize.of(28, GIGABYTE)));
-            nodeAllocatorService.refreshNodePoolMemoryInfos();
-
-            // now pending acquire should be fulfilled
-            nodeAllocatorService.processPendingAcquires();
-            assertAcquired(acquire2, NODE_1);
-        }
-    }
-
-    @Test
-    public void testStressAcquireRelease()
-    {
-        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1);
-        setupNodeAllocatorService(nodeManager, DataSize.of(4, GIGABYTE));
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
-            for (int i = 0; i < 10_000_000; ++i) {
-                NodeAllocator.NodeLease lease = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE));
-                lease.release();
-            }
-        }
-    }
-
-    private TaskId taskId(int partition)
-    {
-        return new TaskId(new StageId("test_query", 0), partition, 0);
-    }
-
-    private void assertAcquired(NodeAllocator.NodeLease lease, InternalNode node)
-    {
-        assertAcquired(lease, Optional.of(node));
-    }
-
-    private void assertAcquired(NodeAllocator.NodeLease lease)
-    {
-        assertAcquired(lease, Optional.empty());
-    }
-
-    private void assertAcquired(NodeAllocator.NodeLease lease, Optional<InternalNode> expectedNode)
-    {
-        assertEventually(() -> {
-            assertFalse(lease.getNode().isCancelled(), "node lease cancelled");
-            assertTrue(lease.getNode().isDone(), "node lease not acquired");
-            if (expectedNode.isPresent()) {
-                assertEquals(lease.getNode().get(), expectedNode.get());
-            }
-        });
-    }
-
-    private void assertNotAcquired(NodeAllocator.NodeLease lease)
-    {
-        assertFalse(lease.getNode().isCancelled(), "node lease cancelled");
-        assertFalse(lease.getNode().isDone(), "node lease acquired");
-        // enforce pending acquires processing and check again
-        nodeAllocatorService.processPendingAcquires();
-        assertFalse(lease.getNode().isCancelled(), "node lease cancelled");
-        assertFalse(lease.getNode().isDone(), "node lease acquired");
-    }
-
-    private static void assertEventually(ThrowingRunnable assertion)
-    {
-        Assert.assertEventually(
-                new io.airlift.units.Duration(TEST_TIMEOUT, TimeUnit.MILLISECONDS),
-                new io.airlift.units.Duration(10, TimeUnit.MILLISECONDS),
-                () -> {
-                    try {
-                        assertion.run();
-                    }
-                    catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
-                });
-    }
-
-    interface ThrowingRunnable
-    {
-        void run() throws Exception;
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestBroadcastPipelinedOutputBufferManager.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestBroadcastPipelinedOutputBufferManager.java
index 2a5bb157f26e..88b16bf8e7a9 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestBroadcastPipelinedOutputBufferManager.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestBroadcastPipelinedOutputBufferManager.java
@@ -15,7 +15,7 @@
 
 import io.trino.execution.buffer.PipelinedOutputBuffers;
 import io.trino.execution.buffer.PipelinedOutputBuffers.OutputBufferId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.execution.buffer.PipelinedOutputBuffers.BROADCAST_PARTITION_ID;
 import static io.trino.execution.buffer.PipelinedOutputBuffers.BufferType.BROADCAST;
@@ -54,7 +54,7 @@ public void test()
 
         // try to set no more buffers again, which should not result in an error
         // and output buffers should not change
-        hashOutputBufferManager.addOutputBuffer(new OutputBufferId(6));
+        hashOutputBufferManager.noMoreBuffers();
         assertEquals(hashOutputBufferManager.getOutputBuffers(), expectedOutputBuffers);
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestExponentialGrowthPartitionMemoryEstimator.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestExponentialGrowthPartitionMemoryEstimator.java
deleted file mode 100644
index 7c4dc1b2a4e7..000000000000
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestExponentialGrowthPartitionMemoryEstimator.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.scheduler;
-
-import com.google.common.base.Ticker;
-import com.google.common.collect.ImmutableMap;
-import io.airlift.units.DataSize;
-import io.trino.Session;
-import io.trino.client.NodeVersion;
-import io.trino.execution.scheduler.PartitionMemoryEstimator.MemoryRequirements;
-import io.trino.memory.MemoryInfo;
-import io.trino.metadata.InMemoryNodeManager;
-import io.trino.metadata.InternalNode;
-import io.trino.metadata.InternalNodeManager;
-import io.trino.spi.StandardErrorCode;
-import io.trino.spi.memory.MemoryPoolInfo;
-import io.trino.testing.TestingSession;
-import org.testng.annotations.Test;
-
-import java.net.URI;
-import java.time.Duration;
-import java.util.Optional;
-
-import static io.airlift.units.DataSize.Unit.GIGABYTE;
-import static io.airlift.units.DataSize.Unit.MEGABYTE;
-import static io.trino.spi.StandardErrorCode.ADMINISTRATIVELY_PREEMPTED;
-import static io.trino.spi.StandardErrorCode.CLUSTER_OUT_OF_MEMORY;
-import static io.trino.spi.StandardErrorCode.EXCEEDED_LOCAL_MEMORY_LIMIT;
-import static java.time.temporal.ChronoUnit.MINUTES;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TestExponentialGrowthPartitionMemoryEstimator
-{
-    @Test
-    public void testEstimator()
-            throws Exception
-    {
-        InternalNodeManager nodeManager = new InMemoryNodeManager(new InternalNode("a-node", URI.create("local://blah"), NodeVersion.UNKNOWN, false));
-        BinPackingNodeAllocatorService nodeAllocatorService = new BinPackingNodeAllocatorService(
-                nodeManager,
-                () -> ImmutableMap.of(new InternalNode("a-node", URI.create("local://blah"), NodeVersion.UNKNOWN, false).getNodeIdentifier(), Optional.of(buildWorkerMemoryInfo(DataSize.ofBytes(0)))),
-                false,
-                true,
-                Duration.of(1, MINUTES),
-                DataSize.ofBytes(0),
-                Ticker.systemTicker());
-        nodeAllocatorService.refreshNodePoolMemoryInfos();
-        PartitionMemoryEstimator estimator = nodeAllocatorService.createPartitionMemoryEstimator();
-
-        Session session = TestingSession.testSessionBuilder().build();
-
-        assertThat(estimator.getInitialMemoryRequirements(session, DataSize.of(107, MEGABYTE)))
-                .isEqualTo(new MemoryRequirements(DataSize.of(107, MEGABYTE)));
-
-        // peak memory of failed task 10MB
-        assertThat(
-                estimator.getNextRetryMemoryRequirements(
-                        session,
-                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
-                        DataSize.of(10, MEGABYTE),
-                        StandardErrorCode.CORRUPT_PAGE.toErrorCode()))
-                .isEqualTo(new MemoryRequirements(DataSize.of(50, MEGABYTE)));
-
-        assertThat(
-                estimator.getNextRetryMemoryRequirements(
-                        session,
-                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
-                        DataSize.of(10, MEGABYTE),
-                        StandardErrorCode.CLUSTER_OUT_OF_MEMORY.toErrorCode()))
-                .isEqualTo(new MemoryRequirements(DataSize.of(150, MEGABYTE)));
-
-        assertThat(
-                estimator.getNextRetryMemoryRequirements(
-                        session,
-                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
-                        DataSize.of(10, MEGABYTE),
-                        StandardErrorCode.TOO_MANY_REQUESTS_FAILED.toErrorCode()))
-                .isEqualTo(new MemoryRequirements(DataSize.of(150, MEGABYTE)));
-
-        assertThat(
-                estimator.getNextRetryMemoryRequirements(
-                        session,
-                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
-                        DataSize.of(10, MEGABYTE),
-                        EXCEEDED_LOCAL_MEMORY_LIMIT.toErrorCode()))
-                .isEqualTo(new MemoryRequirements(DataSize.of(150, MEGABYTE)));
-
-        // peak memory of failed task 70MB
-        assertThat(
-                estimator.getNextRetryMemoryRequirements(
-                        session,
-                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
-                        DataSize.of(70, MEGABYTE),
-                        StandardErrorCode.CORRUPT_PAGE.toErrorCode()))
-                .isEqualTo(new MemoryRequirements(DataSize.of(70, MEGABYTE)));
-
-        assertThat(
-                estimator.getNextRetryMemoryRequirements(
-                        session,
-                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
-                        DataSize.of(70, MEGABYTE),
-                        EXCEEDED_LOCAL_MEMORY_LIMIT.toErrorCode()))
-                .isEqualTo(new MemoryRequirements(DataSize.of(210, MEGABYTE)));
-
-        // register a couple successful attempts; 90th percentile is at 300MB
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(1000, MEGABYTE), true, Optional.empty());
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(100, MEGABYTE), true, Optional.empty());
-
-        // for initial we should pick estimate if greater than default
-        assertThat(estimator.getInitialMemoryRequirements(session, DataSize.of(100, MEGABYTE)))
-                .isEqualTo(new MemoryRequirements(DataSize.of(300, MEGABYTE)));
-
-        // if default memory requirements is greater than estimate it should be picked still
-        assertThat(estimator.getInitialMemoryRequirements(session, DataSize.of(500, MEGABYTE)))
-                .isEqualTo(new MemoryRequirements(DataSize.of(500, MEGABYTE)));
-
-        // for next we should still pick current initial if greater
-        assertThat(
-                estimator.getNextRetryMemoryRequirements(
-                        session,
-                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
-                        DataSize.of(70, MEGABYTE),
-                        EXCEEDED_LOCAL_MEMORY_LIMIT.toErrorCode()))
-                .isEqualTo(new MemoryRequirements(DataSize.of(300, MEGABYTE)));
-
-        // a couple oom errors are registered
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(200, MEGABYTE), false, Optional.of(EXCEEDED_LOCAL_MEMORY_LIMIT.toErrorCode()));
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(200, MEGABYTE), true, Optional.of(CLUSTER_OUT_OF_MEMORY.toErrorCode()));
-
-        // 90th percentile should be now at 200*3 (600)
-        assertThat(estimator.getInitialMemoryRequirements(session, DataSize.of(100, MEGABYTE)))
-                .isEqualTo(new MemoryRequirements(DataSize.of(600, MEGABYTE)));
-
-        // a couple oom errors are registered with requested memory greater than peak
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(300, MEGABYTE)), DataSize.of(200, MEGABYTE), false, Optional.of(EXCEEDED_LOCAL_MEMORY_LIMIT.toErrorCode()));
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(300, MEGABYTE)), DataSize.of(200, MEGABYTE), false, Optional.of(EXCEEDED_LOCAL_MEMORY_LIMIT.toErrorCode()));
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(300, MEGABYTE)), DataSize.of(200, MEGABYTE), true, Optional.of(CLUSTER_OUT_OF_MEMORY.toErrorCode()));
-
-        // 90th percentile should be now at 300*3 (900)
-        assertThat(estimator.getInitialMemoryRequirements(session, DataSize.of(100, MEGABYTE)))
-                .isEqualTo(new MemoryRequirements(DataSize.of(900, MEGABYTE)));
-
-        // other errors should not change estimate
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(500, MEGABYTE), false, Optional.of(ADMINISTRATIVELY_PREEMPTED.toErrorCode()));
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(500, MEGABYTE), false, Optional.of(ADMINISTRATIVELY_PREEMPTED.toErrorCode()));
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(500, MEGABYTE), false, Optional.of(ADMINISTRATIVELY_PREEMPTED.toErrorCode()));
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(500, MEGABYTE), false, Optional.of(ADMINISTRATIVELY_PREEMPTED.toErrorCode()));
-        estimator.registerPartitionFinished(session, new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(500, MEGABYTE), false, Optional.of(ADMINISTRATIVELY_PREEMPTED.toErrorCode()));
-
-        assertThat(estimator.getInitialMemoryRequirements(session, DataSize.of(100, MEGABYTE)))
-                .isEqualTo(new MemoryRequirements(DataSize.of(900, MEGABYTE)));
-    }
-
-    private MemoryInfo buildWorkerMemoryInfo(DataSize usedMemory)
-    {
-        return new MemoryInfo(
-                4,
-                new MemoryPoolInfo(
-                        DataSize.of(64, GIGABYTE).toBytes(),
-                        usedMemory.toBytes(),
-                        0,
-                        ImmutableMap.of(),
-                        ImmutableMap.of(),
-                        ImmutableMap.of(),
-                        ImmutableMap.of(),
-                        ImmutableMap.of()));
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestFileBasedNetworkTopology.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestFileBasedNetworkTopology.java
index d656f1f07d20..b893b0946742 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestFileBasedNetworkTopology.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestFileBasedNetworkTopology.java
@@ -19,10 +19,10 @@
 import io.airlift.testing.TestingTicker;
 import io.airlift.units.Duration;
 import io.trino.spi.HostAddress;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
+import java.net.URISyntaxException;
 import java.util.concurrent.TimeUnit;
 
 import static java.util.concurrent.TimeUnit.DAYS;
@@ -30,12 +30,11 @@
 
 public class TestFileBasedNetworkTopology
 {
-    private File topologyFile;
-    private File topologyNewFile;
+    private final File topologyFile;
+    private final File topologyNewFile;
 
-    @BeforeClass
-    public void setup()
-            throws Exception
+    public TestFileBasedNetworkTopology()
+            throws URISyntaxException
     {
         topologyFile = new File(Resources.getResource(getClass(), "topology.txt").toURI());
         topologyNewFile = new File(Resources.getResource(getClass(), "topology-new.txt").toURI());
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestFixedCountNodeAllocator.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestFixedCountNodeAllocator.java
deleted file mode 100644
index 52e075db4859..000000000000
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestFixedCountNodeAllocator.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * Licensed 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 io.trino.execution.scheduler;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import io.airlift.units.DataSize;
-import io.trino.Session;
-import io.trino.client.NodeVersion;
-import io.trino.execution.scheduler.TestingNodeSelectorFactory.TestingNodeSupplier;
-import io.trino.metadata.InternalNode;
-import io.trino.spi.HostAddress;
-import io.trino.spi.connector.CatalogHandle;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Test;
-
-import java.net.URI;
-import java.util.Optional;
-
-import static io.airlift.units.DataSize.Unit.GIGABYTE;
-import static io.trino.testing.TestingHandles.createTestCatalogHandle;
-import static io.trino.testing.TestingSession.testSessionBuilder;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-// uses mutable state
-@Test(singleThreaded = true)
-public class TestFixedCountNodeAllocator
-{
-    private static final Session SESSION = testSessionBuilder().build();
-
-    private static final HostAddress NODE_1_ADDRESS = HostAddress.fromParts("127.0.0.1", 8080);
-    private static final HostAddress NODE_2_ADDRESS = HostAddress.fromParts("127.0.0.1", 8081);
-    private static final HostAddress NODE_3_ADDRESS = HostAddress.fromParts("127.0.0.1", 8082);
-
-    private static final InternalNode NODE_1 = new InternalNode("node-1", URI.create("local://" + NODE_1_ADDRESS), NodeVersion.UNKNOWN, false);
-    private static final InternalNode NODE_2 = new InternalNode("node-2", URI.create("local://" + NODE_2_ADDRESS), NodeVersion.UNKNOWN, false);
-    private static final InternalNode NODE_3 = new InternalNode("node-3", URI.create("local://" + NODE_3_ADDRESS), NodeVersion.UNKNOWN, false);
-
-    private static final CatalogHandle CATALOG_1 = createTestCatalogHandle("catalog1");
-    private static final CatalogHandle CATALOG_2 = createTestCatalogHandle("catalog2");
-
-    private FixedCountNodeAllocatorService nodeAllocatorService;
-
-    private void setupNodeAllocatorService(TestingNodeSupplier testingNodeSupplier)
-    {
-        shutdownNodeAllocatorService(); // just in case
-        nodeAllocatorService = new FixedCountNodeAllocatorService(new NodeScheduler(new TestingNodeSelectorFactory(NODE_1, testingNodeSupplier)));
-    }
-
-    @AfterMethod(alwaysRun = true)
-    public void shutdownNodeAllocatorService()
-    {
-        if (nodeAllocatorService != null) {
-            nodeAllocatorService.stop();
-        }
-        nodeAllocatorService = null;
-    }
-
-    @Test
-    public void testSingleNode()
-            throws Exception
-    {
-        TestingNodeSupplier nodeSupplier = TestingNodeSupplier.create(ImmutableMap.of(NODE_1, ImmutableList.of()));
-        setupNodeAllocatorService(nodeSupplier);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION, 1)) {
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire1.getNode().isDone());
-            assertEquals(acquire1.getNode().get(), NODE_1);
-
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire2.getNode().isDone());
-
-            acquire1.release();
-
-            assertTrue(acquire2.getNode().isDone());
-            assertEquals(acquire2.getNode().get(), NODE_1);
-        }
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION, 2)) {
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire1.getNode().isDone());
-            assertEquals(acquire1.getNode().get(), NODE_1);
-
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire2.getNode().isDone());
-            assertEquals(acquire2.getNode().get(), NODE_1);
-
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire3.getNode().isDone());
-
-            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire4.getNode().isDone());
-
-            acquire2.release(); // NODE_1
-            assertTrue(acquire3.getNode().isDone());
-            assertEquals(acquire3.getNode().get(), NODE_1);
-
-            acquire3.release(); // NODE_1
-            assertTrue(acquire4.getNode().isDone());
-            assertEquals(acquire4.getNode().get(), NODE_1);
-        }
-    }
-
-    @Test
-    public void testMultipleNodes()
-            throws Exception
-    {
-        TestingNodeSupplier nodeSupplier = TestingNodeSupplier.create(ImmutableMap.of(NODE_1, ImmutableList.of(), NODE_2, ImmutableList.of()));
-        setupNodeAllocatorService(nodeSupplier);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION, 1)) {
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire1.getNode().isDone());
-            assertEquals(acquire1.getNode().get(), NODE_1);
-
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire2.getNode().isDone());
-            assertEquals(acquire2.getNode().get(), NODE_2);
-
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire3.getNode().isDone());
-
-            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire4.getNode().isDone());
-
-            NodeAllocator.NodeLease acquire5 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire5.getNode().isDone());
-
-            acquire2.release(); // NODE_2
-            assertTrue(acquire3.getNode().isDone());
-            assertEquals(acquire3.getNode().get(), NODE_2);
-
-            acquire1.release(); // NODE_1
-            assertTrue(acquire4.getNode().isDone());
-            assertEquals(acquire4.getNode().get(), NODE_1);
-
-            acquire4.release(); //NODE_1
-            assertTrue(acquire5.getNode().isDone());
-            assertEquals(acquire5.getNode().get(), NODE_1);
-        }
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION, 2)) {
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire1.getNode().isDone());
-            assertEquals(acquire1.getNode().get(), NODE_1);
-
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire2.getNode().isDone());
-            assertEquals(acquire2.getNode().get(), NODE_2);
-
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire3.getNode().isDone());
-            assertEquals(acquire3.getNode().get(), NODE_1);
-
-            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire4.getNode().isDone());
-            assertEquals(acquire4.getNode().get(), NODE_2);
-
-            NodeAllocator.NodeLease acquire5 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire5.getNode().isDone());
-
-            NodeAllocator.NodeLease acquire6 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire6.getNode().isDone());
-
-            acquire4.release(); // NODE_2
-            assertTrue(acquire5.getNode().isDone());
-            assertEquals(acquire5.getNode().get(), NODE_2);
-
-            acquire3.release(); // NODE_1
-            assertTrue(acquire6.getNode().isDone());
-            assertEquals(acquire6.getNode().get(), NODE_1);
-
-            NodeAllocator.NodeLease acquire7 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire7.getNode().isDone());
-
-            acquire6.release(); // NODE_1
-            assertTrue(acquire7.getNode().isDone());
-            assertEquals(acquire7.getNode().get(), NODE_1);
-
-            acquire7.release(); // NODE_1
-            acquire5.release(); // NODE_2
-            acquire2.release(); // NODE_2
-
-            NodeAllocator.NodeLease acquire8 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire8.getNode().isDone());
-            assertEquals(acquire8.getNode().get(), NODE_2);
-        }
-    }
-
-    @Test
-    public void testCatalogRequirement()
-            throws Exception
-    {
-        TestingNodeSupplier nodeSupplier = TestingNodeSupplier.create(ImmutableMap.of(
-                NODE_1, ImmutableList.of(CATALOG_1),
-                NODE_2, ImmutableList.of(CATALOG_2),
-                NODE_3, ImmutableList.of(CATALOG_1, CATALOG_2)));
-
-        setupNodeAllocatorService(nodeSupplier);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION, 1)) {
-            NodeAllocator.NodeLease catalog1acquire1 = nodeAllocator.acquire(new NodeRequirements(Optional.of(CATALOG_1), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(catalog1acquire1.getNode().isDone());
-            assertEquals(catalog1acquire1.getNode().get(), NODE_1);
-
-            NodeAllocator.NodeLease catalog1acquire2 = nodeAllocator.acquire(new NodeRequirements(Optional.of(CATALOG_1), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(catalog1acquire2.getNode().isDone());
-            assertEquals(catalog1acquire2.getNode().get(), NODE_3);
-
-            NodeAllocator.NodeLease catalog1acquire3 = nodeAllocator.acquire(new NodeRequirements(Optional.of(CATALOG_1), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(catalog1acquire3.getNode().isDone());
-
-            NodeAllocator.NodeLease catalog2acquire1 = nodeAllocator.acquire(new NodeRequirements(Optional.of(CATALOG_2), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(catalog2acquire1.getNode().isDone());
-            assertEquals(catalog2acquire1.getNode().get(), NODE_2);
-
-            NodeAllocator.NodeLease catalog2acquire2 = nodeAllocator.acquire(new NodeRequirements(Optional.of(CATALOG_2), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(catalog2acquire2.getNode().isDone());
-
-            catalog2acquire1.release(); // NODE_2
-            assertFalse(catalog1acquire3.getNode().isDone());
-            assertTrue(catalog2acquire2.getNode().isDone());
-            assertEquals(catalog2acquire2.getNode().get(), NODE_2);
-
-            catalog1acquire1.release(); // NODE_1
-            assertTrue(catalog1acquire3.getNode().isDone());
-            assertEquals(catalog1acquire3.getNode().get(), NODE_1);
-
-            NodeAllocator.NodeLease catalog1acquire4 = nodeAllocator.acquire(new NodeRequirements(Optional.of(CATALOG_1), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(catalog1acquire4.getNode().isDone());
-
-            NodeAllocator.NodeLease catalog2acquire4 = nodeAllocator.acquire(new NodeRequirements(Optional.of(CATALOG_2), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(catalog2acquire4.getNode().isDone());
-
-            catalog1acquire2.release(); // NODE_3
-            assertFalse(catalog2acquire4.getNode().isDone());
-            assertTrue(catalog1acquire4.getNode().isDone());
-            assertEquals(catalog1acquire4.getNode().get(), NODE_3);
-
-            catalog1acquire4.release(); // NODE_3
-            assertTrue(catalog2acquire4.getNode().isDone());
-            assertEquals(catalog2acquire4.getNode().get(), NODE_3);
-        }
-    }
-
-    @Test
-    public void testReleaseBeforeAcquired()
-            throws Exception
-    {
-        TestingNodeSupplier nodeSupplier = TestingNodeSupplier.create(ImmutableMap.of(NODE_1, ImmutableList.of()));
-        setupNodeAllocatorService(nodeSupplier);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION, 1)) {
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire1.getNode().isDone());
-            assertEquals(acquire1.getNode().get(), NODE_1);
-
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire2.getNode().isDone());
-
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire3.getNode().isDone());
-
-            acquire2.release();
-
-            acquire1.release(); // NODE_1
-            assertTrue(acquire3.getNode().isDone());
-            assertEquals(acquire3.getNode().get(), NODE_1);
-        }
-    }
-
-    @Test
-    public void testAddNode()
-            throws Exception
-    {
-        TestingNodeSupplier nodeSupplier = TestingNodeSupplier.create(ImmutableMap.of(NODE_1, ImmutableList.of()));
-        setupNodeAllocatorService(nodeSupplier);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION, 1)) {
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire1.getNode().isDone());
-            assertEquals(acquire1.getNode().get(), NODE_1);
-
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire2.getNode().isDone());
-
-            nodeSupplier.addNode(NODE_2, ImmutableList.of());
-            nodeAllocatorService.updateNodes();
-
-            assertEquals(acquire2.getNode().get(10, SECONDS), NODE_2);
-        }
-    }
-
-    @Test
-    public void testRemoveNode()
-            throws Exception
-    {
-        TestingNodeSupplier nodeSupplier = TestingNodeSupplier.create(ImmutableMap.of(NODE_1, ImmutableList.of()));
-        setupNodeAllocatorService(nodeSupplier);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION, 1)) {
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire1.getNode().isDone());
-            assertEquals(acquire1.getNode().get(), NODE_1);
-
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire2.getNode().isDone());
-
-            nodeSupplier.removeNode(NODE_1);
-            nodeSupplier.addNode(NODE_2, ImmutableList.of());
-            nodeAllocatorService.updateNodes();
-
-            assertEquals(acquire2.getNode().get(10, SECONDS), NODE_2);
-
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of()), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire3.getNode().isDone());
-
-            acquire1.release(); // NODE_1
-            assertFalse(acquire3.getNode().isDone());
-        }
-    }
-
-    @Test
-    public void testAddressRequirement()
-            throws Exception
-    {
-        TestingNodeSupplier nodeSupplier = TestingNodeSupplier.create(ImmutableMap.of(NODE_1, ImmutableList.of(), NODE_2, ImmutableList.of()));
-        setupNodeAllocatorService(nodeSupplier);
-
-        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION, 1)) {
-            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of(NODE_2_ADDRESS)), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire1.getNode().isDone());
-            assertEquals(acquire1.getNode().get(), NODE_2);
-
-            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of(NODE_2_ADDRESS)), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire2.getNode().isDone());
-
-            acquire1.release(); // NODE_2
-
-            assertTrue(acquire2.getNode().isDone());
-            assertEquals(acquire2.getNode().get(), NODE_2);
-
-            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of(NODE_3_ADDRESS)), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire3.getNode().isDone());
-            assertThatThrownBy(() -> acquire3.getNode().get())
-                    .hasMessageContaining("No nodes available to run query");
-
-            nodeSupplier.addNode(NODE_3, ImmutableList.of());
-            nodeAllocatorService.updateNodes();
-
-            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of(NODE_3_ADDRESS)), DataSize.of(1, GIGABYTE));
-            assertTrue(acquire4.getNode().isDone());
-            assertEquals(acquire4.getNode().get(), NODE_3);
-
-            NodeAllocator.NodeLease acquire5 = nodeAllocator.acquire(new NodeRequirements(Optional.empty(), ImmutableSet.of(NODE_3_ADDRESS)), DataSize.of(1, GIGABYTE));
-            assertFalse(acquire5.getNode().isDone());
-
-            nodeSupplier.removeNode(NODE_3);
-            nodeAllocatorService.updateNodes();
-
-            assertTrue(acquire5.getNode().isDone());
-            assertThatThrownBy(() -> acquire5.getNode().get())
-                    .hasMessageContaining("No nodes available to run query");
-        }
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestFixedCountScheduler.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestFixedCountScheduler.java
index 393204445b43..7c05e37976b1 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestFixedCountScheduler.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestFixedCountScheduler.java
@@ -21,8 +21,9 @@
 import io.trino.execution.StageId;
 import io.trino.execution.TaskId;
 import io.trino.metadata.InternalNode;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.List;
@@ -36,9 +37,11 @@
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestFixedCountScheduler
 {
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "executor-%s"));
@@ -50,7 +53,7 @@ public TestFixedCountScheduler()
         taskFactory = new MockRemoteTaskFactory(executor, scheduledExecutor);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void destroyExecutor()
     {
         executor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestMultiSourcePartitionedScheduler.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestMultiSourcePartitionedScheduler.java
new file mode 100644
index 000000000000..8c3a2bc28541
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestMultiSourcePartitionedScheduler.java
@@ -0,0 +1,729 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import io.airlift.units.Duration;
+import io.trino.Session;
+import io.trino.client.NodeVersion;
+import io.trino.cost.StatsAndCosts;
+import io.trino.execution.DynamicFilterConfig;
+import io.trino.execution.MockRemoteTaskFactory;
+import io.trino.execution.NodeTaskMap;
+import io.trino.execution.PartitionedSplitsInfo;
+import io.trino.execution.RemoteTask;
+import io.trino.execution.SqlStage;
+import io.trino.execution.StageId;
+import io.trino.execution.TableExecuteContextManager;
+import io.trino.execution.TableInfo;
+import io.trino.failuredetector.NoOpFailureDetector;
+import io.trino.metadata.FunctionManager;
+import io.trino.metadata.InMemoryNodeManager;
+import io.trino.metadata.InternalNode;
+import io.trino.metadata.InternalNodeManager;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.QualifiedObjectName;
+import io.trino.metadata.TableHandle;
+import io.trino.operator.RetryPolicy;
+import io.trino.server.DynamicFilterService;
+import io.trino.spi.QueryId;
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.connector.ConnectorSplit;
+import io.trino.spi.connector.ConnectorSplitSource;
+import io.trino.spi.connector.DynamicFilter;
+import io.trino.spi.connector.FixedSplitSource;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.type.TypeOperators;
+import io.trino.split.ConnectorAwareSplitSource;
+import io.trino.split.SplitSource;
+import io.trino.sql.DynamicFilters;
+import io.trino.sql.planner.Partitioning;
+import io.trino.sql.planner.PartitioningScheme;
+import io.trino.sql.planner.PlanFragment;
+import io.trino.sql.planner.PlanNodeIdAllocator;
+import io.trino.sql.planner.Symbol;
+import io.trino.sql.planner.SymbolAllocator;
+import io.trino.sql.planner.plan.DynamicFilterId;
+import io.trino.sql.planner.plan.ExchangeNode;
+import io.trino.sql.planner.plan.FilterNode;
+import io.trino.sql.planner.plan.JoinNode;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import io.trino.sql.planner.plan.PlanNodeId;
+import io.trino.sql.planner.plan.RemoteSourceNode;
+import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.testing.TestingMetadata.TestingColumnHandle;
+import io.trino.testing.TestingSession;
+import io.trino.testing.TestingSplit;
+import io.trino.util.FinalizerService;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.BooleanSupplier;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static io.airlift.concurrent.Threads.daemonThreadsNamed;
+import static io.airlift.tracing.Tracing.noopTracer;
+import static io.trino.SessionTestUtils.TEST_SESSION;
+import static io.trino.execution.scheduler.NodeSchedulerConfig.SplitsBalancingPolicy.STAGE;
+import static io.trino.execution.scheduler.PipelinedStageExecution.createPipelinedStageExecution;
+import static io.trino.execution.scheduler.ScheduleResult.BlockedReason.SPLIT_QUEUES_FULL;
+import static io.trino.execution.scheduler.ScheduleResult.BlockedReason.WAITING_FOR_SOURCE;
+import static io.trino.execution.scheduler.StageExecution.State.PLANNED;
+import static io.trino.execution.scheduler.StageExecution.State.SCHEDULING;
+import static io.trino.metadata.FunctionManager.createTestingFunctionManager;
+import static io.trino.metadata.MetadataManager.createTestMetadataManager;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.DynamicFilters.createDynamicFilterExpression;
+import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_ARBITRARY_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_HASH_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.SOURCE_DISTRIBUTION;
+import static io.trino.sql.planner.plan.ExchangeNode.Scope.LOCAL;
+import static io.trino.sql.planner.plan.ExchangeNode.Type.REPARTITION;
+import static io.trino.sql.planner.plan.ExchangeNode.Type.REPLICATE;
+import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
+import static io.trino.testing.TestingHandles.TEST_CATALOG_HANDLE;
+import static io.trino.testing.TestingHandles.TEST_TABLE_HANDLE;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.Executors.newCachedThreadPool;
+import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+@TestInstance(PER_CLASS)
+public class TestMultiSourcePartitionedScheduler
+{
+    private static final PlanNodeId TABLE_SCAN_1_NODE_ID = new PlanNodeId("1");
+    private static final PlanNodeId TABLE_SCAN_2_NODE_ID = new PlanNodeId("2");
+    private static final QueryId QUERY_ID = new QueryId("query");
+    private static final DynamicFilterId DYNAMIC_FILTER_ID = new DynamicFilterId("filter1");
+
+    private final ExecutorService queryExecutor = newCachedThreadPool(daemonThreadsNamed("stageExecutor-%s"));
+    private final ScheduledExecutorService scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed("stageScheduledExecutor-%s"));
+    private final InMemoryNodeManager nodeManager = new InMemoryNodeManager();
+    private final FinalizerService finalizerService = new FinalizerService();
+    private final Metadata metadata = createTestMetadataManager();
+    private final FunctionManager functionManager = createTestingFunctionManager();
+    private final TypeOperators typeOperators = new TypeOperators();
+    private final Session session = TestingSession.testSessionBuilder().build();
+    private final PlanNodeIdAllocator planNodeIdAllocator = new PlanNodeIdAllocator();
+
+    public TestMultiSourcePartitionedScheduler()
+    {
+        nodeManager.addNodes(
+                new InternalNode("other1", URI.create("http://127.0.0.1:11"), NodeVersion.UNKNOWN, false),
+                new InternalNode("other2", URI.create("http://127.0.0.1:12"), NodeVersion.UNKNOWN, false),
+                new InternalNode("other3", URI.create("http://127.0.0.1:13"), NodeVersion.UNKNOWN, false));
+    }
+
+    @BeforeAll
+    public void setUp()
+    {
+        finalizerService.start();
+    }
+
+    @AfterAll
+    public void destroyExecutor()
+    {
+        queryExecutor.shutdownNow();
+        scheduledExecutor.shutdownNow();
+        finalizerService.destroy();
+    }
+
+    @Test
+    public void testScheduleSplitsBatchedNoBlocking()
+    {
+        // Test whether two internal schedulers were completely scheduled - no blocking case
+        PlanFragment plan = createFragment();
+        NodeTaskMap nodeTaskMap = new NodeTaskMap(finalizerService);
+        StageExecution stage = createStageExecution(plan, nodeTaskMap);
+
+        StageScheduler scheduler = prepareScheduler(
+                ImmutableMap.of(TABLE_SCAN_1_NODE_ID, createFixedSplitSource(60), TABLE_SCAN_2_NODE_ID, createFixedSplitSource(60)),
+                createSplitPlacementPolicies(session, stage, nodeTaskMap, nodeManager),
+                stage,
+                7);
+
+        for (int i = 0; i <= (60 / 7) * 2; i++) {
+            ScheduleResult scheduleResult = scheduler.schedule();
+
+            // finishes when last split is fetched
+            if (i == (60 / 7) * 2) {
+                assertEffectivelyFinished(scheduleResult, scheduler);
+            }
+            else {
+                assertFalse(scheduleResult.isFinished());
+            }
+
+            // never blocks
+            assertTrue(scheduleResult.getBlocked().isDone());
+
+            // first three splits create new tasks
+            assertEquals(scheduleResult.getNewTasks().size(), i == 0 ? 3 : 0);
+        }
+
+        for (RemoteTask remoteTask : stage.getAllTasks()) {
+            PartitionedSplitsInfo splitsInfo = remoteTask.getPartitionedSplitsInfo();
+            assertEquals(splitsInfo.getCount(), 40);
+        }
+        stage.abort();
+    }
+
+    @Test
+    public void testScheduleSplitsBatchedBlockingSplitSource()
+    {
+        // Test case when one internal scheduler has blocking split source and finally is blocked
+        PlanFragment plan = createFragment();
+        NodeTaskMap nodeTaskMap = new NodeTaskMap(finalizerService);
+        StageExecution stage = createStageExecution(plan, nodeTaskMap);
+        QueuedSplitSource blockingSplitSource = new QueuedSplitSource(TestingSplit::createRemoteSplit);
+
+        StageScheduler scheduler = prepareScheduler(
+                ImmutableMap.of(TABLE_SCAN_1_NODE_ID, createFixedSplitSource(10), TABLE_SCAN_2_NODE_ID, blockingSplitSource),
+                createSplitPlacementPolicies(session, stage, nodeTaskMap, nodeManager),
+                stage,
+                5);
+
+        ScheduleResult scheduleResult = scheduler.schedule();
+        assertFalse(scheduleResult.isFinished());
+        assertTrue(scheduleResult.getBlocked().isDone());
+        assertEquals(scheduleResult.getNewTasks().size(), 3);
+
+        scheduleResult = scheduler.schedule();
+        assertFalse(scheduleResult.isFinished());
+        assertFalse(scheduleResult.getBlocked().isDone());
+        assertEquals(scheduleResult.getNewTasks().size(), 0);
+        assertEquals(scheduleResult.getBlockedReason(), Optional.of(WAITING_FOR_SOURCE));
+
+        blockingSplitSource.addSplits(2, true);
+
+        scheduleResult = scheduler.schedule();
+        assertTrue(scheduleResult.getBlocked().isDone());
+        assertEquals(scheduleResult.getSplitsScheduled(), 2);
+        assertEquals(scheduleResult.getNewTasks().size(), 0);
+        assertEquals(scheduleResult.getBlockedReason(), Optional.empty());
+        assertTrue(scheduleResult.isFinished());
+
+        assertPartitionedSplitCount(stage, 12);
+        assertEffectivelyFinished(scheduleResult, scheduler);
+
+        for (RemoteTask remoteTask : stage.getAllTasks()) {
+            PartitionedSplitsInfo splitsInfo = remoteTask.getPartitionedSplitsInfo();
+            assertEquals(splitsInfo.getCount(), 4);
+        }
+        stage.abort();
+    }
+
+    @Test
+    public void testScheduleSplitsTasksAreFull()
+    {
+        // Test the case when tasks are full
+        PlanFragment plan = createFragment();
+        NodeTaskMap nodeTaskMap = new NodeTaskMap(finalizerService);
+        StageExecution stage = createStageExecution(plan, nodeTaskMap);
+
+        StageScheduler scheduler = prepareScheduler(
+                ImmutableMap.of(TABLE_SCAN_1_NODE_ID, createFixedSplitSource(200), TABLE_SCAN_2_NODE_ID, createFixedSplitSource(200)),
+                createSplitPlacementPolicies(session, stage, nodeTaskMap, nodeManager),
+                stage,
+                200);
+
+        ScheduleResult scheduleResult = scheduler.schedule();
+        assertEquals(scheduleResult.getSplitsScheduled(), 300);
+        assertFalse(scheduleResult.isFinished());
+        assertFalse(scheduleResult.getBlocked().isDone());
+        assertEquals(scheduleResult.getNewTasks().size(), 3);
+        assertEquals(scheduleResult.getBlockedReason(), Optional.of(SPLIT_QUEUES_FULL));
+
+        assertEquals(stage.getAllTasks().stream().mapToInt(task -> task.getPartitionedSplitsInfo().getCount()).sum(), 300);
+        stage.abort();
+    }
+
+    @Test
+    public void testBalancedSplitAssignment()
+    {
+        // use private node manager so we can add a node later
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(
+                new InternalNode("other1", URI.create("http://127.0.0.1:11"), NodeVersion.UNKNOWN, false),
+                new InternalNode("other2", URI.create("http://127.0.0.1:12"), NodeVersion.UNKNOWN, false),
+                new InternalNode("other3", URI.create("http://127.0.0.1:13"), NodeVersion.UNKNOWN, false));
+        NodeTaskMap nodeTaskMap = new NodeTaskMap(finalizerService);
+
+        // Schedule 15 splits - there are 3 nodes, each node should get 5 splits
+        PlanFragment firstPlan = createFragment();
+        StageExecution firstStage = createStageExecution(firstPlan, nodeTaskMap);
+
+        QueuedSplitSource firstSplitSource = new QueuedSplitSource(TestingSplit::createRemoteSplit);
+        QueuedSplitSource secondSplitSource = new QueuedSplitSource(TestingSplit::createRemoteSplit);
+
+        StageScheduler scheduler = prepareScheduler(
+                ImmutableMap.of(TABLE_SCAN_1_NODE_ID, firstSplitSource, TABLE_SCAN_2_NODE_ID, secondSplitSource),
+                createSplitPlacementPolicies(session, firstStage, nodeTaskMap, nodeManager),
+                firstStage,
+                15);
+
+        // Only first split source produces splits at that moment
+        firstSplitSource.addSplits(15, true);
+
+        ScheduleResult scheduleResult = scheduler.schedule();
+        assertFalse(scheduleResult.getBlocked().isDone());
+        assertEquals(scheduleResult.getNewTasks().size(), 3);
+        assertEquals(firstStage.getAllTasks().size(), 3);
+        for (RemoteTask remoteTask : firstStage.getAllTasks()) {
+            PartitionedSplitsInfo splitsInfo = remoteTask.getPartitionedSplitsInfo();
+            // All splits were balanced between nodes
+            assertEquals(splitsInfo.getCount(), 5);
+        }
+
+        // Add new node
+        InternalNode additionalNode = new InternalNode("other4", URI.create("http://127.0.0.1:14"), NodeVersion.UNKNOWN, false);
+        nodeManager.addNodes(additionalNode);
+
+        // Second source produced splits now
+        secondSplitSource.addSplits(3, true);
+
+        scheduleResult = scheduler.schedule();
+
+        assertEffectivelyFinished(scheduleResult, scheduler);
+        assertTrue(scheduleResult.getBlocked().isDone());
+        assertTrue(scheduleResult.isFinished());
+        assertEquals(scheduleResult.getNewTasks().size(), 1);
+        assertEquals(firstStage.getAllTasks().size(), 4);
+
+        assertEquals(firstStage.getAllTasks().get(0).getPartitionedSplitsInfo().getCount(), 5);
+        assertEquals(firstStage.getAllTasks().get(1).getPartitionedSplitsInfo().getCount(), 5);
+        assertEquals(firstStage.getAllTasks().get(2).getPartitionedSplitsInfo().getCount(), 5);
+        assertEquals(firstStage.getAllTasks().get(3).getPartitionedSplitsInfo().getCount(), 3);
+
+        // Second source produces
+        PlanFragment secondPlan = createFragment();
+        StageExecution secondStage = createStageExecution(secondPlan, nodeTaskMap);
+        StageScheduler secondScheduler = prepareScheduler(
+                ImmutableMap.of(TABLE_SCAN_1_NODE_ID, createFixedSplitSource(10), TABLE_SCAN_2_NODE_ID, createFixedSplitSource(10)),
+                createSplitPlacementPolicies(session, secondStage, nodeTaskMap, nodeManager),
+                secondStage,
+                10);
+
+        scheduleResult = secondScheduler.schedule();
+        assertEffectivelyFinished(scheduleResult, secondScheduler);
+        assertTrue(scheduleResult.getBlocked().isDone());
+        assertTrue(scheduleResult.isFinished());
+        assertEquals(scheduleResult.getNewTasks().size(), 4);
+        assertEquals(secondStage.getAllTasks().size(), 4);
+
+        for (RemoteTask task : secondStage.getAllTasks()) {
+            assertEquals(task.getPartitionedSplitsInfo().getCount(), 5);
+        }
+        firstStage.abort();
+        secondStage.abort();
+    }
+
+    @Test
+    public void testScheduleEmptySources()
+    {
+        PlanFragment plan = createFragment();
+        NodeTaskMap nodeTaskMap = new NodeTaskMap(finalizerService);
+        StageExecution stage = createStageExecution(plan, nodeTaskMap);
+
+        StageScheduler scheduler = prepareScheduler(
+                ImmutableMap.of(TABLE_SCAN_1_NODE_ID, createFixedSplitSource(0), TABLE_SCAN_2_NODE_ID, createFixedSplitSource(0)),
+                createSplitPlacementPolicies(session, stage, nodeTaskMap, nodeManager),
+                stage,
+                15);
+
+        ScheduleResult scheduleResult = scheduler.schedule();
+
+        // If both split sources produce no splits then internal schedulers add one split - it can be expected by some operators e.g. AggregationOperator
+        assertEquals(scheduleResult.getNewTasks().size(), 2);
+        assertEffectivelyFinished(scheduleResult, scheduler);
+
+        stage.abort();
+    }
+
+    @Test
+    public void testDynamicFiltersUnblockedOnBlockedBuildSource()
+    {
+        PlanFragment plan = createFragment();
+        NodeTaskMap nodeTaskMap = new NodeTaskMap(finalizerService);
+        StageExecution stage = createStageExecution(plan, nodeTaskMap);
+        DynamicFilterService dynamicFilterService = new DynamicFilterService(metadata, functionManager, typeOperators, new DynamicFilterConfig());
+        dynamicFilterService.registerQuery(
+                QUERY_ID,
+                TEST_SESSION,
+                ImmutableSet.of(DYNAMIC_FILTER_ID),
+                ImmutableSet.of(DYNAMIC_FILTER_ID),
+                ImmutableSet.of(DYNAMIC_FILTER_ID));
+
+        StageScheduler scheduler = prepareScheduler(
+                ImmutableMap.of(TABLE_SCAN_1_NODE_ID, new QueuedSplitSource(), TABLE_SCAN_2_NODE_ID, new QueuedSplitSource()),
+                createSplitPlacementPolicies(session, stage, nodeTaskMap, nodeManager),
+                stage,
+                dynamicFilterService,
+                () -> true,
+                15);
+
+        SymbolAllocator symbolAllocator = new SymbolAllocator();
+        Symbol symbol = symbolAllocator.newSymbol("DF_SYMBOL1", BIGINT);
+        DynamicFilter dynamicFilter = dynamicFilterService.createDynamicFilter(
+                QUERY_ID,
+                ImmutableList.of(new DynamicFilters.Descriptor(DYNAMIC_FILTER_ID, symbol.toSymbolReference())),
+                ImmutableMap.of(symbol, new TestingColumnHandle("probeColumnA")),
+                symbolAllocator.getTypes());
+
+        // make sure dynamic filtering collecting task was created immediately
+        assertEquals(stage.getState(), PLANNED);
+        scheduler.start();
+        assertEquals(stage.getAllTasks().size(), 1);
+        assertEquals(stage.getState(), SCHEDULING);
+
+        // make sure dynamic filter is initially blocked
+        assertFalse(dynamicFilter.isBlocked().isDone());
+
+        // make sure dynamic filter is unblocked due to build side source tasks being blocked
+        ScheduleResult scheduleResult = scheduler.schedule();
+        assertTrue(dynamicFilter.isBlocked().isDone());
+
+        // no new probe splits should be scheduled
+        assertEquals(scheduleResult.getSplitsScheduled(), 0);
+    }
+
+    @Test
+    public void testNoNewTaskScheduledWhenChildStageBufferIsOverUtilized()
+    {
+        NodeTaskMap nodeTaskMap = new NodeTaskMap(finalizerService);
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(
+                new InternalNode("other1", URI.create("http://127.0.0.1:11"), NodeVersion.UNKNOWN, false),
+                new InternalNode("other2", URI.create("http://127.0.0.1:12"), NodeVersion.UNKNOWN, false),
+                new InternalNode("other3", URI.create("http://127.0.0.1:13"), NodeVersion.UNKNOWN, false));
+        PlanFragment plan = createFragment();
+        StageExecution stage = createStageExecution(plan, nodeTaskMap);
+
+        // setting over utilized child output buffer
+        StageScheduler scheduler = prepareScheduler(
+                ImmutableMap.of(TABLE_SCAN_1_NODE_ID, createFixedSplitSource(200), TABLE_SCAN_2_NODE_ID, createFixedSplitSource(200)),
+                createSplitPlacementPolicies(session, stage, nodeTaskMap, nodeManager),
+                stage,
+                new DynamicFilterService(metadata, functionManager, typeOperators, new DynamicFilterConfig()),
+                () -> true,
+                200);
+        // the queues of 3 running nodes should be full
+        ScheduleResult scheduleResult = scheduler.schedule();
+        assertEquals(scheduleResult.getBlockedReason(), Optional.of(SPLIT_QUEUES_FULL));
+        assertEquals(scheduleResult.getNewTasks().size(), 3);
+        assertEquals(scheduleResult.getSplitsScheduled(), 300);
+        for (RemoteTask remoteTask : scheduleResult.getNewTasks()) {
+            PartitionedSplitsInfo splitsInfo = remoteTask.getPartitionedSplitsInfo();
+            assertEquals(splitsInfo.getCount(), 100);
+        }
+
+        // new node added but 1 child's output buffer is overutilized - so lockdown the tasks
+        nodeManager.addNodes(new InternalNode("other4", URI.create("http://127.0.0.4:14"), NodeVersion.UNKNOWN, false));
+        scheduleResult = scheduler.schedule();
+        assertEquals(scheduleResult.getBlockedReason(), Optional.of(SPLIT_QUEUES_FULL));
+        assertEquals(scheduleResult.getNewTasks().size(), 0);
+        assertEquals(scheduleResult.getSplitsScheduled(), 0);
+    }
+
+    private static void assertPartitionedSplitCount(StageExecution stage, int expectedPartitionedSplitCount)
+    {
+        assertEquals(stage.getAllTasks().stream().mapToInt(remoteTask -> remoteTask.getPartitionedSplitsInfo().getCount()).sum(), expectedPartitionedSplitCount);
+    }
+
+    private static void assertEffectivelyFinished(ScheduleResult scheduleResult, StageScheduler scheduler)
+    {
+        if (scheduleResult.isFinished()) {
+            assertTrue(scheduleResult.getBlocked().isDone());
+            return;
+        }
+
+        assertTrue(scheduleResult.getBlocked().isDone());
+        ScheduleResult nextScheduleResult = scheduler.schedule();
+        assertTrue(nextScheduleResult.isFinished());
+        assertTrue(nextScheduleResult.getBlocked().isDone());
+        assertEquals(nextScheduleResult.getNewTasks().size(), 0);
+        assertEquals(nextScheduleResult.getSplitsScheduled(), 0);
+    }
+
+    private StageScheduler prepareScheduler(
+            Map<PlanNodeId, ConnectorSplitSource> splitSources,
+            SplitPlacementPolicy splitPlacementPolicy,
+            StageExecution stage,
+            int splitBatchSize)
+    {
+        return prepareScheduler(
+                splitSources,
+                splitPlacementPolicy,
+                stage,
+                new DynamicFilterService(metadata, functionManager, typeOperators, new DynamicFilterConfig()),
+                () -> false,
+                splitBatchSize);
+    }
+
+    private StageScheduler prepareScheduler(
+            Map<PlanNodeId, ConnectorSplitSource> splitSources,
+            SplitPlacementPolicy splitPlacementPolicy,
+            StageExecution stage,
+            DynamicFilterService dynamicFilterService,
+            BooleanSupplier anySourceTaskBlocked,
+            int splitBatchSize)
+    {
+        Map<PlanNodeId, SplitSource> sources = splitSources.entrySet()
+                .stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, e -> new ConnectorAwareSplitSource(TEST_CATALOG_HANDLE, e.getValue())));
+        return new MultiSourcePartitionedScheduler(
+                stage,
+                sources,
+                splitPlacementPolicy,
+                splitBatchSize,
+                dynamicFilterService,
+                new TableExecuteContextManager(),
+                anySourceTaskBlocked);
+    }
+
+    private PlanFragment createFragment()
+    {
+        return createFragment(TEST_TABLE_HANDLE, TEST_TABLE_HANDLE);
+    }
+
+    private PlanFragment createFragment(TableHandle firstTableHandle, TableHandle secondTableHandle)
+    {
+        Symbol symbol = new Symbol("column");
+        Symbol buildSymbol = new Symbol("buildColumn");
+
+        TableScanNode tableScanOne = new TableScanNode(
+                TABLE_SCAN_1_NODE_ID,
+                firstTableHandle,
+                ImmutableList.of(symbol),
+                ImmutableMap.of(symbol, new TestingColumnHandle("column")),
+                false,
+                Optional.empty());
+        FilterNode filterNodeOne = new FilterNode(
+                new PlanNodeId("filter_node_id"),
+                tableScanOne,
+                createDynamicFilterExpression(createTestMetadataManager(), DYNAMIC_FILTER_ID, VARCHAR, symbol.toSymbolReference()));
+        TableScanNode tableScanTwo = new TableScanNode(
+                TABLE_SCAN_2_NODE_ID,
+                secondTableHandle,
+                ImmutableList.of(symbol),
+                ImmutableMap.of(symbol, new TestingColumnHandle("column")),
+                false,
+                Optional.empty());
+        FilterNode filterNodeTwo = new FilterNode(
+                new PlanNodeId("filter_node_id"),
+                tableScanTwo,
+                createDynamicFilterExpression(createTestMetadataManager(), DYNAMIC_FILTER_ID, VARCHAR, symbol.toSymbolReference()));
+
+        RemoteSourceNode remote = new RemoteSourceNode(new PlanNodeId("remote_id"), new PlanFragmentId("plan_fragment_id"), ImmutableList.of(buildSymbol), Optional.empty(), REPLICATE, RetryPolicy.NONE);
+
+        return new PlanFragment(
+                new PlanFragmentId("plan_id"),
+                new JoinNode(
+                        new PlanNodeId("join_id"),
+                        INNER,
+                        new ExchangeNode(
+                                planNodeIdAllocator.getNextId(),
+                                REPARTITION,
+                                LOCAL,
+                                new PartitioningScheme(
+                                        Partitioning.create(FIXED_ARBITRARY_DISTRIBUTION, ImmutableList.of()),
+                                        tableScanOne.getOutputSymbols()),
+                                ImmutableList.of(
+                                        filterNodeOne,
+                                        filterNodeTwo),
+                                ImmutableList.of(tableScanOne.getOutputSymbols(), tableScanTwo.getOutputSymbols()),
+                                Optional.empty()),
+                        remote,
+                        ImmutableList.of(),
+                        tableScanOne.getOutputSymbols(),
+                        remote.getOutputSymbols(),
+                        false,
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        ImmutableMap.of(DYNAMIC_FILTER_ID, buildSymbol),
+                        Optional.empty()),
+                ImmutableMap.of(symbol, VARCHAR),
+                SOURCE_DISTRIBUTION,
+                Optional.empty(),
+                ImmutableList.of(TABLE_SCAN_1_NODE_ID, TABLE_SCAN_2_NODE_ID),
+                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)),
+                StatsAndCosts.empty(),
+                ImmutableList.of(),
+                ImmutableList.of(),
+                Optional.empty());
+    }
+
+    private static ConnectorSplitSource createFixedSplitSource(int splitCount)
+    {
+        return new FixedSplitSource(IntStream.range(0, splitCount).mapToObj(ix -> new TestingSplit(true, ImmutableList.of())).toList());
+    }
+
+    private SplitPlacementPolicy createSplitPlacementPolicies(Session session, StageExecution stage, NodeTaskMap nodeTaskMap, InternalNodeManager nodeManager)
+    {
+        return createSplitPlacementPolicies(session, stage, nodeTaskMap, nodeManager, TEST_CATALOG_HANDLE);
+    }
+
+    private SplitPlacementPolicy createSplitPlacementPolicies(Session session, StageExecution stage, NodeTaskMap nodeTaskMap, InternalNodeManager nodeManager, CatalogHandle catalog)
+    {
+        NodeSchedulerConfig nodeSchedulerConfig = new NodeSchedulerConfig()
+                .setIncludeCoordinator(false)
+                .setMaxSplitsPerNode(100)
+                .setMinPendingSplitsPerTask(0)
+                .setSplitsBalancingPolicy(STAGE);
+        NodeScheduler nodeScheduler = new NodeScheduler(new UniformNodeSelectorFactory(nodeManager, nodeSchedulerConfig, nodeTaskMap, new Duration(0, SECONDS)));
+        return new DynamicSplitPlacementPolicy(nodeScheduler.createNodeSelector(session, Optional.of(catalog)), stage::getAllTasks);
+    }
+
+    private StageExecution createStageExecution(PlanFragment fragment, NodeTaskMap nodeTaskMap)
+    {
+        StageId stageId = new StageId(QUERY_ID, 0);
+        SqlStage stage = SqlStage.createSqlStage(
+                stageId,
+                fragment,
+                ImmutableMap.of(
+                        TABLE_SCAN_1_NODE_ID, new TableInfo(Optional.of("test"), new QualifiedObjectName("test", "test", "test"), TupleDomain.all()),
+                        TABLE_SCAN_2_NODE_ID, new TableInfo(Optional.of("test"), new QualifiedObjectName("test", "test", "test"), TupleDomain.all())),
+                new MockRemoteTaskFactory(queryExecutor, scheduledExecutor),
+                TEST_SESSION,
+                true,
+                nodeTaskMap,
+                queryExecutor,
+                noopTracer(),
+                new SplitSchedulerStats());
+        ImmutableMap.Builder<PlanFragmentId, PipelinedOutputBufferManager> outputBuffers = ImmutableMap.builder();
+        outputBuffers.put(fragment.getId(), new PartitionedPipelinedOutputBufferManager(FIXED_HASH_DISTRIBUTION, 1));
+        fragment.getRemoteSourceNodes().stream()
+                .flatMap(node -> node.getSourceFragmentIds().stream())
+                .forEach(fragmentId -> outputBuffers.put(fragmentId, new PartitionedPipelinedOutputBufferManager(FIXED_HASH_DISTRIBUTION, 10)));
+        return createPipelinedStageExecution(
+                stage,
+                outputBuffers.buildOrThrow(),
+                TaskLifecycleListener.NO_OP,
+                new NoOpFailureDetector(),
+                queryExecutor,
+                Optional.of(new int[] {0}),
+                0);
+    }
+
+    private static class InMemoryNodeManagerByCatalog
+            extends InMemoryNodeManager
+    {
+        private final Function<CatalogHandle, Set<InternalNode>> nodesByCatalogs;
+
+        public InMemoryNodeManagerByCatalog(Set<InternalNode> nodes, Function<CatalogHandle, Set<InternalNode>> nodesByCatalogs)
+        {
+            super(nodes);
+            this.nodesByCatalogs = nodesByCatalogs;
+        }
+
+        @Override
+        public Set<InternalNode> getActiveCatalogNodes(CatalogHandle catalogHandle)
+        {
+            return nodesByCatalogs.apply(catalogHandle);
+        }
+    }
+
+    private static class QueuedSplitSource
+            implements ConnectorSplitSource
+    {
+        private final Supplier<ConnectorSplit> splitFactory;
+        private final LinkedBlockingQueue<ConnectorSplit> queue = new LinkedBlockingQueue<>();
+        private CompletableFuture<?> notEmptyFuture = new CompletableFuture<>();
+        private boolean closed;
+
+        public QueuedSplitSource(Supplier<ConnectorSplit> splitFactory)
+        {
+            this.splitFactory = requireNonNull(splitFactory, "splitFactory is null");
+        }
+
+        public QueuedSplitSource()
+        {
+            this.splitFactory = TestingSplit::createRemoteSplit;
+        }
+
+        synchronized void addSplits(int count, boolean lastSplits)
+        {
+            if (closed) {
+                return;
+            }
+            for (int i = 0; i < count; i++) {
+                queue.add(splitFactory.get());
+            }
+            if (lastSplits) {
+                close();
+            }
+            notEmptyFuture.complete(null);
+        }
+
+        @Override
+        public CompletableFuture<ConnectorSplitBatch> getNextBatch(int maxSize)
+        {
+            return notEmptyFuture
+                    .thenApply(x -> getBatch(maxSize))
+                    .thenApply(splits -> new ConnectorSplitBatch(splits, isFinished()));
+        }
+
+        private synchronized List<ConnectorSplit> getBatch(int maxSize)
+        {
+            // take up to maxSize elements from the queue
+            List<ConnectorSplit> elements = new ArrayList<>(maxSize);
+            queue.drainTo(elements, maxSize);
+
+            // if the queue is empty and the current future is finished, create a new one so
+            // a new readers can be notified when the queue has elements to read
+            if (queue.isEmpty() && !closed) {
+                if (notEmptyFuture.isDone()) {
+                    notEmptyFuture = new CompletableFuture<>();
+                }
+            }
+
+            return ImmutableList.copyOf(elements);
+        }
+
+        @Override
+        public synchronized boolean isFinished()
+        {
+            return closed && queue.isEmpty();
+        }
+
+        @Override
+        public synchronized void close()
+        {
+            closed = true;
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestPartitionedPipelinedOutputBufferManager.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestPartitionedPipelinedOutputBufferManager.java
index 84099652dcb5..0f90ef1223ed 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestPartitionedPipelinedOutputBufferManager.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestPartitionedPipelinedOutputBufferManager.java
@@ -15,7 +15,7 @@
 
 import io.trino.execution.buffer.PipelinedOutputBuffers;
 import io.trino.execution.buffer.PipelinedOutputBuffers.OutputBufferId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -47,10 +47,9 @@ public void test()
                 .hasMessage("Unexpected new output buffer 5");
         assertOutputBuffers(hashOutputBufferManager.getOutputBuffers());
 
-        // try to a buffer out side of the partition range, which should result in an error
-        assertThatThrownBy(() -> hashOutputBufferManager.addOutputBuffer(new OutputBufferId(6)))
-                .isInstanceOf(IllegalStateException.class)
-                .hasMessage("Unexpected new output buffer 6");
+        // try to set no more buffers again, which should not result in an error
+        // and output buffers should not change
+        hashOutputBufferManager.noMoreBuffers();
         assertOutputBuffers(hashOutputBufferManager.getOutputBuffers());
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestScaledPipelinedOutputBufferManager.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestScaledPipelinedOutputBufferManager.java
new file mode 100644
index 000000000000..fba2599dea50
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestScaledPipelinedOutputBufferManager.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler;
+
+import io.trino.execution.buffer.PipelinedOutputBuffers;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.execution.buffer.PipelinedOutputBuffers.BufferType.ARBITRARY;
+import static org.testng.Assert.assertEquals;
+
+/**
+ * Tests for {@link ScaledPipelinedOutputBufferManager}.
+ */
+public class TestScaledPipelinedOutputBufferManager
+{
+    @Test
+    public void test()
+    {
+        ScaledPipelinedOutputBufferManager scaledPipelinedOutputBufferManager = new ScaledPipelinedOutputBufferManager();
+        assertEquals(scaledPipelinedOutputBufferManager.getOutputBuffers(), PipelinedOutputBuffers.createInitial(ARBITRARY));
+
+        scaledPipelinedOutputBufferManager.addOutputBuffer(new PipelinedOutputBuffers.OutputBufferId(0));
+        PipelinedOutputBuffers expectedOutputBuffers = PipelinedOutputBuffers.createInitial(ARBITRARY).withBuffer(new PipelinedOutputBuffers.OutputBufferId(0), 0);
+        assertEquals(scaledPipelinedOutputBufferManager.getOutputBuffers(), expectedOutputBuffers);
+
+        scaledPipelinedOutputBufferManager.addOutputBuffer(new PipelinedOutputBuffers.OutputBufferId(1));
+        scaledPipelinedOutputBufferManager.addOutputBuffer(new PipelinedOutputBuffers.OutputBufferId(2));
+
+        expectedOutputBuffers = expectedOutputBuffers.withBuffer(new PipelinedOutputBuffers.OutputBufferId(1), 1);
+        expectedOutputBuffers = expectedOutputBuffers.withBuffer(new PipelinedOutputBuffers.OutputBufferId(2), 2);
+        assertEquals(scaledPipelinedOutputBufferManager.getOutputBuffers(), expectedOutputBuffers);
+
+        // set no more buffers
+        scaledPipelinedOutputBufferManager.addOutputBuffer(new PipelinedOutputBuffers.OutputBufferId(3));
+        scaledPipelinedOutputBufferManager.noMoreBuffers();
+        expectedOutputBuffers = expectedOutputBuffers.withBuffer(new PipelinedOutputBuffers.OutputBufferId(3), 3);
+        expectedOutputBuffers = expectedOutputBuffers.withNoMoreBufferIds();
+        assertEquals(scaledPipelinedOutputBufferManager.getOutputBuffers(), expectedOutputBuffers);
+
+        // try to add another buffer, which should not result in an error
+        // and output buffers should not change
+        scaledPipelinedOutputBufferManager.addOutputBuffer(new PipelinedOutputBuffers.OutputBufferId(5));
+        assertEquals(scaledPipelinedOutputBufferManager.getOutputBuffers(), expectedOutputBuffers);
+
+        // try to set no more buffers again, which should not result in an error
+        // and output buffers should not change
+        scaledPipelinedOutputBufferManager.noMoreBuffers();
+        assertEquals(scaledPipelinedOutputBufferManager.getOutputBuffers(), expectedOutputBuffers);
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestScaledWriterScheduler.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestScaledWriterScheduler.java
index bcc4cd70162e..441f3c2c4ebf 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestScaledWriterScheduler.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestScaledWriterScheduler.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.Multimap;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.trace.Span;
 import io.trino.client.NodeVersion;
 import io.trino.cost.StatsAndCosts;
 import io.trino.execution.ExecutionFailureInfo;
@@ -41,7 +42,7 @@
 import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.testing.TestingMetadata;
 import io.trino.util.FinalizerService;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.util.List;
@@ -112,7 +113,7 @@ public void testGetNewTaskCountWithUnderutilizedSkewedTaskAndOverutilizedNonSkew
     }
 
     @Test
-    public void testGetNewTaskCountWhenWrittenBytesIsGreaterThanMinWrittenBytesForScaleUp()
+    public void testGetNewTaskCountWhenWriterDataProcessedIsGreaterThanMinForScaleUp()
     {
         TaskStatus taskStatus1 = buildTaskStatus(1, DataSize.of(32, DataSize.Unit.MEGABYTE));
         TaskStatus taskStatus2 = buildTaskStatus(1, DataSize.of(32, DataSize.Unit.MEGABYTE));
@@ -124,7 +125,7 @@ public void testGetNewTaskCountWhenWrittenBytesIsGreaterThanMinWrittenBytesForSc
     }
 
     @Test
-    public void testGetNewTaskCountWhenWrittenBytesIsLessThanMinWrittenBytesForScaleUp()
+    public void testGetNewTaskCountWhenWriterDataProcessedIsLessThanMinForScaleUp()
     {
         TaskStatus taskStatus1 = buildTaskStatus(1, DataSize.of(32, DataSize.Unit.MEGABYTE));
         TaskStatus taskStatus2 = buildTaskStatus(1, DataSize.of(32, DataSize.Unit.MEGABYTE));
@@ -132,7 +133,7 @@ public void testGetNewTaskCountWhenWrittenBytesIsLessThanMinWrittenBytesForScale
 
         ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3);
         // Scale up will not happen because for one of the task there are two local writers which makes the
-        // minWrittenBytes for scaling up to (2 * writerMinSizeBytes) that is greater than physicalWrittenBytes.
+        // minWrittenBytes for scaling up to (2 * writerScalingMinDataProcessed) that is greater than writerInputDataSize.
         assertEquals(scaledWriterScheduler.schedule().getNewTasks().size(), 0);
     }
 
@@ -207,35 +208,37 @@ private static TaskStatus buildTaskStatus(boolean isOutputBufferOverUtilized, lo
         return buildTaskStatus(isOutputBufferOverUtilized, outputDataSize, Optional.of(1), DataSize.of(32, DataSize.Unit.MEGABYTE));
     }
 
-    private static TaskStatus buildTaskStatus(int maxWriterCount, DataSize physicalWrittenDataSize)
+    private static TaskStatus buildTaskStatus(int maxWriterCount, DataSize writerInputDataSize)
     {
-        return buildTaskStatus(true, 12345L, Optional.of(maxWriterCount), physicalWrittenDataSize);
+        return buildTaskStatus(true, 12345L, Optional.of(maxWriterCount), writerInputDataSize);
     }
 
-    private static TaskStatus buildTaskStatus(boolean isOutputBufferOverUtilized, long outputDataSize, Optional<Integer> maxWriterCount, DataSize physicalWrittenDataSize)
+    private static TaskStatus buildTaskStatus(boolean isOutputBufferOverUtilized, long outputDataSize, Optional<Integer> maxWriterCount, DataSize writerInputDataSize)
     {
         return new TaskStatus(
-                        TaskId.valueOf("taskId"),
-                        "task-instance-id",
-                        0,
-                        TaskState.RUNNING,
-                        URI.create("fake://task/" + "taskId" + "/node/some_node"),
-                        "some_node",
-                        ImmutableList.of(),
-                        0,
-                        0,
-                        new OutputBufferStatus(OptionalLong.empty(), isOutputBufferOverUtilized, false),
-                        DataSize.ofBytes(outputDataSize),
-                        physicalWrittenDataSize,
-                        maxWriterCount,
-                        DataSize.of(1, DataSize.Unit.MEGABYTE),
-                        DataSize.of(1, DataSize.Unit.MEGABYTE),
-                        DataSize.of(0, DataSize.Unit.MEGABYTE),
-                        0,
-                        Duration.valueOf("0s"),
-                        0,
-                        1,
-                        1);
+                TaskId.valueOf("taskId"),
+                "task-instance-id",
+                0,
+                TaskState.RUNNING,
+                URI.create("fake://task/" + "taskId" + "/node/some_node"),
+                "some_node",
+                false,
+                ImmutableList.of(),
+                0,
+                0,
+                new OutputBufferStatus(OptionalLong.empty(), isOutputBufferOverUtilized, false),
+                DataSize.ofBytes(outputDataSize),
+                writerInputDataSize,
+                DataSize.of(1, DataSize.Unit.MEGABYTE),
+                maxWriterCount,
+                DataSize.of(1, DataSize.Unit.MEGABYTE),
+                DataSize.of(1, DataSize.Unit.MEGABYTE),
+                DataSize.of(0, DataSize.Unit.MEGABYTE),
+                0,
+                Duration.valueOf("0s"),
+                0,
+                1,
+                1);
     }
 
     private static class TestingStageExecution
@@ -284,6 +287,12 @@ public int getAttemptId()
             throw new UnsupportedOperationException();
         }
 
+        @Override
+        public Span getStageSpan()
+        {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public void beginScheduling()
         {
@@ -386,6 +395,7 @@ private static PlanFragment createFragment()
                 new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)),
                 StatsAndCosts.empty(),
                 ImmutableList.of(),
+                ImmutableList.of(),
                 Optional.empty());
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSchedulingUtils.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSchedulingUtils.java
new file mode 100644
index 000000000000..528e8b15d051
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSchedulingUtils.java
@@ -0,0 +1,373 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.ImmutableMap;
+import io.trino.cost.StatsAndCosts;
+import io.trino.operator.RetryPolicy;
+import io.trino.sql.planner.Partitioning;
+import io.trino.sql.planner.PartitioningScheme;
+import io.trino.sql.planner.PlanFragment;
+import io.trino.sql.planner.SubPlan;
+import io.trino.sql.planner.Symbol;
+import io.trino.sql.planner.plan.IndexJoinNode;
+import io.trino.sql.planner.plan.JoinNode;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import io.trino.sql.planner.plan.PlanNode;
+import io.trino.sql.planner.plan.PlanNodeId;
+import io.trino.sql.planner.plan.RemoteSourceNode;
+import io.trino.sql.planner.plan.SemiJoinNode;
+import io.trino.sql.planner.plan.SpatialJoinNode;
+import io.trino.sql.planner.plan.UnionNode;
+import io.trino.sql.planner.plan.ValuesNode;
+import io.trino.sql.tree.BooleanLiteral;
+import io.trino.sql.tree.Row;
+import io.trino.sql.tree.StringLiteral;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.SOURCE_DISTRIBUTION;
+import static io.trino.sql.planner.plan.ExchangeNode.Type.REPARTITION;
+import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestSchedulingUtils
+{
+    @Test
+    public void testCanStreamNoJoin()
+    {
+        /*
+                  parent(remote)
+                     |
+     -------------------------------------- stage boundary
+                     a
+         */
+        SubPlan parentSubPlan = createSubPlan(
+                "parent",
+                remoteSource("a"),
+                ImmutableList.of(valuesSubPlan("a")));
+
+        assertThat(SchedulingUtils.canStream(parentSubPlan, valuesSubPlan("a"))).isTrue();
+    }
+
+    @Test
+    public void testCanStreamJoin()
+    {
+        /*
+                  parent(join)
+                   /   \
+     -------------------------------------- stage boundary
+                  a     b
+         */
+        SubPlan aSubPlan = valuesSubPlan("a");
+        RemoteSourceNode remoteSourceA = remoteSource("a");
+
+        SubPlan bSubPlan = valuesSubPlan("b");
+        RemoteSourceNode remoteSourceB = remoteSource("b");
+
+        SubPlan parentSubPlan = createSubPlan(
+                "parent",
+                join("join", remoteSourceA, remoteSourceB),
+                ImmutableList.of(aSubPlan, bSubPlan));
+
+        assertThat(SchedulingUtils.canStream(parentSubPlan, aSubPlan)).isTrue();
+        assertThat(SchedulingUtils.canStream(parentSubPlan, bSubPlan)).isFalse();
+    }
+
+    @Test
+    public void testCanStreamTwoJoins()
+    {
+        /*
+                  parent(join1)
+                   /   \
+                  /     join2
+                 /       /   \
+     -------------------------------------- stage boundary
+                a       b     c
+
+         */
+        SubPlan aSubPlan = valuesSubPlan("a");
+        RemoteSourceNode remoteSourceA = remoteSource("a");
+
+        SubPlan bSubPlan = valuesSubPlan("b");
+        RemoteSourceNode remoteSourceB = remoteSource("b");
+
+        SubPlan cSubPlan = valuesSubPlan("c");
+        RemoteSourceNode remoteSourceC = remoteSource("c");
+
+        SubPlan parentSubPlan = createSubPlan(
+                "parent",
+                join("join1", remoteSourceA, join("join2", remoteSourceB, remoteSourceC)),
+                ImmutableList.of(bSubPlan, cSubPlan, aSubPlan));
+
+        assertThat(SchedulingUtils.canStream(parentSubPlan, aSubPlan)).isTrue();
+        assertThat(SchedulingUtils.canStream(parentSubPlan, bSubPlan)).isFalse();
+        assertThat(SchedulingUtils.canStream(parentSubPlan, cSubPlan)).isFalse();
+    }
+
+    @Test
+    public void testCanStreamJoinWithUnion()
+    {
+        /*
+                  parent(join)
+                   /       \
+                union1     union2
+                /   \      /   \
+     -------------------------------------- stage boundary
+               a     b    c     d
+         */
+        SubPlan aSubPlan = valuesSubPlan("a");
+        RemoteSourceNode remoteSourceA = remoteSource("a");
+
+        SubPlan bSubPlan = valuesSubPlan("b");
+        RemoteSourceNode remoteSourceB = remoteSource("b");
+
+        SubPlan cSubPlan = valuesSubPlan("c");
+        RemoteSourceNode remoteSourceC = remoteSource("c");
+
+        SubPlan dSubPlan = valuesSubPlan("d");
+        RemoteSourceNode remoteSourceD = remoteSource("d");
+
+        UnionNode union1 = union("union1", ImmutableList.of(remoteSourceA, remoteSourceB));
+        UnionNode union2 = union("union2", ImmutableList.of(remoteSourceC, remoteSourceD));
+
+        SubPlan parentSubPlan = createSubPlan(
+                "parent",
+                join("join", union1, union2),
+                ImmutableList.of(bSubPlan, cSubPlan, aSubPlan, dSubPlan));
+
+        assertThat(SchedulingUtils.canStream(parentSubPlan, aSubPlan)).isTrue();
+        assertThat(SchedulingUtils.canStream(parentSubPlan, bSubPlan)).isTrue();
+        assertThat(SchedulingUtils.canStream(parentSubPlan, cSubPlan)).isFalse();
+        assertThat(SchedulingUtils.canStream(parentSubPlan, dSubPlan)).isFalse();
+    }
+
+    @Test
+    public void testCanStreamJoinMultipleSubPlanPerRemoteSource()
+    {
+        /*
+                  parent(join)
+                   /      \
+     -------------------------------------- stage boundary
+                 a+b      c+d  (each side of join reads from two remote sources)
+         */
+        SubPlan aSubPlan = valuesSubPlan("a");
+        SubPlan bSubPlan = valuesSubPlan("b");
+        RemoteSourceNode remoteSourceAB = remoteSource(ImmutableList.of("a", "b"));
+
+        SubPlan cSubPlan = valuesSubPlan("c");
+        SubPlan dSubPlan = valuesSubPlan("d");
+        RemoteSourceNode remoteSourceCD = remoteSource(ImmutableList.of("c", "d"));
+
+        SubPlan parentSubPlan = createSubPlan(
+                "parent",
+                join("join", remoteSourceAB, remoteSourceCD),
+                ImmutableList.of(bSubPlan, cSubPlan, aSubPlan, dSubPlan));
+
+        assertThat(SchedulingUtils.canStream(parentSubPlan, aSubPlan)).isTrue();
+        assertThat(SchedulingUtils.canStream(parentSubPlan, bSubPlan)).isTrue();
+        assertThat(SchedulingUtils.canStream(parentSubPlan, cSubPlan)).isFalse();
+        assertThat(SchedulingUtils.canStream(parentSubPlan, dSubPlan)).isFalse();
+    }
+
+    @Test
+    public void testCanStreamSemiJoin()
+    {
+        /*
+                  parent(semijoin)
+                   /   \
+     -------------------------------------- stage boundary
+                  a     b
+         */
+        SubPlan aSubPlan = valuesSubPlan("a");
+        RemoteSourceNode remoteSourceA = remoteSource("a");
+
+        SubPlan bSubPlan = valuesSubPlan("b");
+        RemoteSourceNode remoteSourceB = remoteSource("b");
+
+        SubPlan parentSubPlan = createSubPlan(
+                "parent",
+                semiJoin("semijoin", remoteSourceA, remoteSourceB),
+                ImmutableList.of(aSubPlan, bSubPlan));
+
+        assertThat(SchedulingUtils.canStream(parentSubPlan, aSubPlan)).isTrue();
+        assertThat(SchedulingUtils.canStream(parentSubPlan, bSubPlan)).isFalse();
+    }
+
+    @Test
+    public void testCanStreamIndexJoin()
+    {
+        /*
+                  parent(indexjoin)
+                   /   \
+     -------------------------------------- stage boundary
+                  a     b
+         */
+        SubPlan aSubPlan = valuesSubPlan("a");
+        RemoteSourceNode remoteSourceA = remoteSource("a");
+
+        SubPlan bSubPlan = valuesSubPlan("b");
+        RemoteSourceNode remoteSourceB = remoteSource("b");
+
+        SubPlan parentSubPlan = createSubPlan(
+                "parent",
+                indexJoin("indexjoin", remoteSourceA, remoteSourceB),
+                ImmutableList.of(aSubPlan, bSubPlan));
+
+        assertThat(SchedulingUtils.canStream(parentSubPlan, aSubPlan)).isTrue();
+        assertThat(SchedulingUtils.canStream(parentSubPlan, bSubPlan)).isFalse();
+    }
+
+    @Test
+    public void testCanStreamSpatialJoin()
+    {
+        /*
+                  parent(spatialjoin)
+                   /   \
+     -------------------------------------- stage boundary
+                  a     b
+         */
+        SubPlan aSubPlan = valuesSubPlan("a");
+        RemoteSourceNode remoteSourceA = remoteSource("a");
+
+        SubPlan bSubPlan = valuesSubPlan("b");
+        RemoteSourceNode remoteSourceB = remoteSource("b");
+
+        SubPlan parentSubPlan = createSubPlan(
+                "parent",
+                spatialJoin("spatialjoin", remoteSourceA, remoteSourceB),
+                ImmutableList.of(aSubPlan, bSubPlan));
+
+        assertThat(SchedulingUtils.canStream(parentSubPlan, aSubPlan)).isTrue();
+        assertThat(SchedulingUtils.canStream(parentSubPlan, bSubPlan)).isFalse();
+    }
+
+    private static RemoteSourceNode remoteSource(String fragmentId)
+    {
+        return remoteSource(ImmutableList.of(fragmentId));
+    }
+
+    private static RemoteSourceNode remoteSource(List<String> fragmentIds)
+    {
+        return new RemoteSourceNode(
+                new PlanNodeId(fragmentIds.get(0)),
+                fragmentIds.stream().map(PlanFragmentId::new).collect(toImmutableList()),
+                ImmutableList.of(new Symbol("blah")),
+                Optional.empty(),
+                REPARTITION,
+                RetryPolicy.TASK);
+    }
+
+    private static JoinNode join(String id, PlanNode left, PlanNode right)
+    {
+        return new JoinNode(
+                new PlanNodeId(id),
+                INNER,
+                left,
+                right,
+                ImmutableList.of(),
+                left.getOutputSymbols(),
+                right.getOutputSymbols(),
+                false,
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                ImmutableMap.of(),
+                Optional.empty());
+    }
+
+    private static SemiJoinNode semiJoin(String id, PlanNode left, PlanNode right)
+    {
+        return new SemiJoinNode(
+                new PlanNodeId(id),
+                left,
+                right,
+                left.getOutputSymbols().get(0),
+                right.getOutputSymbols().get(0),
+                new Symbol(id),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty());
+    }
+
+    private static IndexJoinNode indexJoin(String id, PlanNode left, PlanNode right)
+    {
+        return new IndexJoinNode(
+                new PlanNodeId(id),
+                IndexJoinNode.Type.INNER,
+                left,
+                right,
+                ImmutableList.of(),
+                Optional.empty(),
+                Optional.empty());
+    }
+
+    private static SpatialJoinNode spatialJoin(String id, PlanNode left, PlanNode right)
+    {
+        return new SpatialJoinNode(
+                new PlanNodeId(id),
+                SpatialJoinNode.Type.INNER,
+                left,
+                right,
+                left.getOutputSymbols(),
+                BooleanLiteral.TRUE_LITERAL,
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty());
+    }
+
+    private static UnionNode union(String id, List<PlanNode> sources)
+    {
+        Symbol symbol = new Symbol(id);
+        return new UnionNode(new PlanNodeId(id), sources, ImmutableListMultimap.of(), ImmutableList.of(symbol));
+    }
+
+    private static SubPlan valuesSubPlan(String fragmentId)
+    {
+        Symbol symbol = new Symbol("column");
+        return createSubPlan(fragmentId, new ValuesNode(new PlanNodeId(fragmentId + "Values"),
+                        ImmutableList.of(symbol),
+                        ImmutableList.of(new Row(ImmutableList.of(new StringLiteral("foo"))))),
+                ImmutableList.of());
+    }
+
+    private static SubPlan createSubPlan(String fragmentId, PlanNode plan, List<SubPlan> children)
+    {
+        Symbol symbol = plan.getOutputSymbols().get(0);
+        PlanNodeId valuesNodeId = new PlanNodeId("plan");
+        PlanFragment planFragment = new PlanFragment(
+                new PlanFragmentId(fragmentId),
+                plan,
+                ImmutableMap.of(symbol, VARCHAR),
+                SOURCE_DISTRIBUTION,
+                Optional.empty(),
+                ImmutableList.of(valuesNodeId),
+                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)),
+                StatsAndCosts.empty(),
+                ImmutableList.of(),
+                ImmutableList.of(),
+                Optional.empty());
+        return new SubPlan(planFragment, children);
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSourcePartitionedScheduler.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSourcePartitionedScheduler.java
index bdf008a1b559..1cd9b6b8d46e 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSourcePartitionedScheduler.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSourcePartitionedScheduler.java
@@ -65,9 +65,10 @@
 import io.trino.testing.TestingSession;
 import io.trino.testing.TestingSplit;
 import io.trino.util.FinalizerService;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -80,6 +81,7 @@
 import java.util.function.Supplier;
 
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
+import static io.airlift.tracing.Tracing.noopTracer;
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.execution.scheduler.NodeSchedulerConfig.SplitsBalancingPolicy.NODE;
 import static io.trino.execution.scheduler.NodeSchedulerConfig.SplitsBalancingPolicy.STAGE;
@@ -107,10 +109,12 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestSourcePartitionedScheduler
 {
     private static final PlanNodeId TABLE_SCAN_NODE_ID = new PlanNodeId("plan_id");
@@ -134,13 +138,13 @@ public TestSourcePartitionedScheduler()
                 new InternalNode("other3", URI.create("http://127.0.0.1:13"), NodeVersion.UNKNOWN, false));
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         finalizerService.start();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void destroyExecutor()
     {
         queryExecutor.shutdownNow();
@@ -503,9 +507,9 @@ public void testNewTaskScheduledWhenChildStageBufferIsUnderutilized()
         StageScheduler scheduler = newSourcePartitionedSchedulerAsStageScheduler(
                 stage,
                 TABLE_SCAN_NODE_ID,
-                new ConnectorAwareSplitSource(TEST_CATALOG_HANDLE, createFixedSplitSource(500, TestingSplit::createRemoteSplit)),
+                new ConnectorAwareSplitSource(TEST_CATALOG_HANDLE, createFixedSplitSource(4 * 300, TestingSplit::createRemoteSplit)),
                 new DynamicSplitPlacementPolicy(nodeScheduler.createNodeSelector(session, Optional.of(TEST_CATALOG_HANDLE)), stage::getAllTasks),
-                500,
+                4 * 300,
                 new DynamicFilterService(metadata, functionManager, typeOperators, new DynamicFilterConfig()),
                 new TableExecuteContextManager(),
                 () -> false);
@@ -514,18 +518,18 @@ public void testNewTaskScheduledWhenChildStageBufferIsUnderutilized()
         ScheduleResult scheduleResult = scheduler.schedule();
         assertEquals(scheduleResult.getBlockedReason().get(), SPLIT_QUEUES_FULL);
         assertEquals(scheduleResult.getNewTasks().size(), 3);
-        assertEquals(scheduleResult.getSplitsScheduled(), 300);
+        assertEquals(scheduleResult.getSplitsScheduled(), 3 * 256);
         for (RemoteTask remoteTask : scheduleResult.getNewTasks()) {
             PartitionedSplitsInfo splitsInfo = remoteTask.getPartitionedSplitsInfo();
-            assertEquals(splitsInfo.getCount(), 100);
+            assertEquals(splitsInfo.getCount(), 256);
         }
 
         // new node added - the pending splits should go to it since the child tasks are not blocked
         nodeManager.addNodes(new InternalNode("other4", URI.create("http://127.0.0.4:14"), NodeVersion.UNKNOWN, false));
         scheduleResult = scheduler.schedule();
-        assertEquals(scheduleResult.getBlockedReason().get(), SPLIT_QUEUES_FULL); // split queue is full but still the source task creation isn't blocked
         assertEquals(scheduleResult.getNewTasks().size(), 1);
-        assertEquals(scheduleResult.getSplitsScheduled(), 100);
+        assertEquals(scheduleResult.getBlockedReason().get(), SPLIT_QUEUES_FULL); // split queue is full but still the source task creation isn't blocked
+        assertEquals(scheduleResult.getSplitsScheduled(), 256);
     }
 
     @Test
@@ -546,9 +550,9 @@ public void testNoNewTaskScheduledWhenChildStageBufferIsOverutilized()
         StageScheduler scheduler = newSourcePartitionedSchedulerAsStageScheduler(
                 stage,
                 TABLE_SCAN_NODE_ID,
-                new ConnectorAwareSplitSource(TEST_CATALOG_HANDLE, createFixedSplitSource(400, TestingSplit::createRemoteSplit)),
+                new ConnectorAwareSplitSource(TEST_CATALOG_HANDLE, createFixedSplitSource(3 * 300, TestingSplit::createRemoteSplit)),
                 new DynamicSplitPlacementPolicy(nodeScheduler.createNodeSelector(session, Optional.of(TEST_CATALOG_HANDLE)), stage::getAllTasks),
-                400,
+                3 * 300,
                 new DynamicFilterService(metadata, functionManager, typeOperators, new DynamicFilterConfig()),
                 new TableExecuteContextManager(),
                 () -> true);
@@ -557,10 +561,10 @@ public void testNoNewTaskScheduledWhenChildStageBufferIsOverutilized()
         ScheduleResult scheduleResult = scheduler.schedule();
         assertEquals(scheduleResult.getBlockedReason().get(), SPLIT_QUEUES_FULL);
         assertEquals(scheduleResult.getNewTasks().size(), 3);
-        assertEquals(scheduleResult.getSplitsScheduled(), 300);
+        assertEquals(scheduleResult.getSplitsScheduled(), 768);
         for (RemoteTask remoteTask : scheduleResult.getNewTasks()) {
             PartitionedSplitsInfo splitsInfo = remoteTask.getPartitionedSplitsInfo();
-            assertEquals(splitsInfo.getCount(), 100);
+            assertEquals(splitsInfo.getCount(), 256);
         }
 
         // new node added but 1 child's output buffer is overutilized - so lockdown the tasks
@@ -683,7 +687,7 @@ private static PlanFragment createFragment()
         FilterNode filterNode = new FilterNode(
                 new PlanNodeId("filter_node_id"),
                 tableScan,
-                createDynamicFilterExpression(TEST_SESSION, createTestMetadataManager(), DYNAMIC_FILTER_ID, VARCHAR, symbol.toSymbolReference()));
+                createDynamicFilterExpression(createTestMetadataManager(), DYNAMIC_FILTER_ID, VARCHAR, symbol.toSymbolReference()));
 
         RemoteSourceNode remote = new RemoteSourceNode(new PlanNodeId("remote_id"), new PlanFragmentId("plan_fragment_id"), ImmutableList.of(buildSymbol), Optional.empty(), REPLICATE, RetryPolicy.NONE);
         return new PlanFragment(
@@ -710,6 +714,7 @@ private static PlanFragment createFragment()
                 new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)),
                 StatsAndCosts.empty(),
                 ImmutableList.of(),
+                ImmutableList.of(),
                 Optional.empty());
     }
 
@@ -757,6 +762,7 @@ private StageExecution createStageExecution(PlanFragment fragment, NodeTaskMap n
                 true,
                 nodeTaskMap,
                 queryExecutor,
+                noopTracer(),
                 new SplitSchedulerStats());
         ImmutableMap.Builder<PlanFragmentId, PipelinedOutputBufferManager> outputBuffers = ImmutableMap.builder();
         outputBuffers.put(fragment.getId(), new PartitionedPipelinedOutputBufferManager(FIXED_HASH_DISTRIBUTION, 1));
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSubnetTopology.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSubnetTopology.java
index c2d75776b499..cff00aba12d0 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSubnetTopology.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSubnetTopology.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.HostAddress;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.execution.scheduler.NetworkLocation.ROOT_LOCATION;
 import static io.trino.execution.scheduler.SubnetBasedTopology.AddressProtocol.IPv4;
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSubnetTopologyConfig.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSubnetTopologyConfig.java
index 5935c9bec376..681f7caf5089 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSubnetTopologyConfig.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSubnetTopologyConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.configuration.testing.ConfigAssertions;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.Map;
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestTopologyAwareNodeSelectorConfig.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestTopologyAwareNodeSelectorConfig.java
index 2e719236fe91..ba50998a1d93 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestTopologyAwareNodeSelectorConfig.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestTopologyAwareNodeSelectorConfig.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.configuration.testing.ConfigAssertions;
 import io.trino.execution.scheduler.TopologyAwareNodeSelectorConfig.TopologyType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestTopologyFileConfig.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestTopologyFileConfig.java
index 56eb3b9e3ddc..ab8e840d06d6 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestTopologyFileConfig.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestTopologyFileConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.configuration.testing.ConfigAssertions;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestUniformNodeSelector.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestUniformNodeSelector.java
index 1b6708729e0a..822371aacc34 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestUniformNodeSelector.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/TestUniformNodeSelector.java
@@ -35,9 +35,10 @@
 import io.trino.testing.TestingSession;
 import io.trino.testing.TestingSplit;
 import io.trino.util.FinalizerService;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.InetAddress;
 import java.net.URI;
@@ -57,10 +58,11 @@
 import static io.trino.testing.TestingHandles.TEST_CATALOG_HANDLE;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestUniformNodeSelector
 {
     private FinalizerService finalizerService;
@@ -74,7 +76,7 @@ public class TestUniformNodeSelector
     private ScheduledExecutorService remoteTaskScheduledExecutor;
     private Session session;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         session = TestingSession.testSessionBuilder().build();
@@ -98,7 +100,7 @@ public void setUp()
         finalizerService.start();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         remoteTaskExecutor.shutdown();
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/SplitAssignerTester.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/SplitAssignerTester.java
new file mode 100644
index 000000000000..92bef3ff0890
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/SplitAssignerTester.java
@@ -0,0 +1,207 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.SetMultimap;
+import com.google.common.collect.Sets;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.AssignmentResult;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.Partition;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.PartitionUpdate;
+import io.trino.metadata.Split;
+import io.trino.sql.planner.plan.PlanNodeId;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.execution.scheduler.faulttolerant.SplitAssigner.SINGLE_SOURCE_PARTITION_ID;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.guava.api.Assertions.assertThat;
+
+class SplitAssignerTester
+{
+    private final Map<Integer, NodeRequirements> nodeRequirements = new HashMap<>();
+    private final Map<Integer, SplitsMapping> splits = new HashMap<>();
+    private final SetMultimap<Integer, PlanNodeId> noMoreSplits = HashMultimap.create();
+    private final Set<Integer> sealedTaskPartitions = new HashSet<>();
+    private boolean noMoreTaskPartitions;
+    private Optional<List<TaskDescriptor>> taskDescriptors = Optional.empty();
+
+    public Optional<List<TaskDescriptor>> getTaskDescriptors()
+    {
+        return taskDescriptors;
+    }
+
+    public synchronized int getTaskPartitionCount()
+    {
+        return nodeRequirements.size();
+    }
+
+    public synchronized NodeRequirements getNodeRequirements(int taskPartition)
+    {
+        NodeRequirements result = nodeRequirements.get(taskPartition);
+        checkArgument(result != null, "task partition not found: %s", taskPartition);
+        return result;
+    }
+
+    public synchronized Set<Integer> getSplitIds(int taskPartition, PlanNodeId planNodeId)
+    {
+        SplitsMapping taskPartitionSplits = splits.getOrDefault(taskPartition, SplitsMapping.EMPTY);
+        List<Split> splitsFlat = taskPartitionSplits.getSplitsFlat(planNodeId);
+        return splitsFlat.stream()
+                .map(split -> (TestingConnectorSplit) split.getConnectorSplit())
+                .map(TestingConnectorSplit::getId)
+                .collect(toImmutableSet());
+    }
+
+    public synchronized ListMultimap<Integer, Integer> getSplitIdsBySourcePartition(int taskPartition, PlanNodeId planNodeId)
+    {
+        SplitsMapping taskPartitionSplits = splits.getOrDefault(taskPartition, SplitsMapping.EMPTY);
+        ImmutableListMultimap.Builder<Integer, Integer> builder = ImmutableListMultimap.builder();
+        taskPartitionSplits.getSplits(planNodeId).forEach((sourcePartition, split) -> builder.put(sourcePartition, TestingConnectorSplit.getSplitId(split)));
+        return builder.build();
+    }
+
+    public synchronized boolean isNoMoreSplits(int taskPartition, PlanNodeId planNodeId)
+    {
+        return noMoreSplits.get(taskPartition).contains(planNodeId);
+    }
+
+    public synchronized boolean isSealed(int taskPartition)
+    {
+        return sealedTaskPartitions.contains(taskPartition);
+    }
+
+    public synchronized boolean isNoMoreTaskPartitions()
+    {
+        return noMoreTaskPartitions;
+    }
+
+    public void checkContainsSplits(PlanNodeId planNodeId, Collection<Split> splits, boolean replicated)
+    {
+        Set<Integer> expectedSplitIds = splits.stream()
+                .map(TestingConnectorSplit::getSplitId)
+                .collect(Collectors.toSet());
+        for (int taskPartitionId = 0; taskPartitionId < getTaskPartitionCount(); taskPartitionId++) {
+            Set<Integer> taskPartitionSplitIds = getSplitIds(taskPartitionId, planNodeId);
+            if (replicated) {
+                assertThat(taskPartitionSplitIds).containsAll(expectedSplitIds);
+            }
+            else {
+                expectedSplitIds.removeAll(taskPartitionSplitIds);
+            }
+        }
+        if (!replicated) {
+            assertThat(expectedSplitIds).isEmpty();
+        }
+    }
+
+    public void checkContainsSplits(PlanNodeId planNodeId, ListMultimap<Integer, Split> splitsBySourcePartition, boolean replicated)
+    {
+        ListMultimap<Integer, Integer> expectedSplitIds;
+        if (replicated) {
+            expectedSplitIds = ArrayListMultimap.create();
+            expectedSplitIds.putAll(SINGLE_SOURCE_PARTITION_ID, buildSplitIds(splitsBySourcePartition).values());
+        }
+        else {
+            expectedSplitIds = ArrayListMultimap.create(buildSplitIds(splitsBySourcePartition));
+        }
+
+        for (int taskPartitionId = 0; taskPartitionId < getTaskPartitionCount(); taskPartitionId++) {
+            ListMultimap<Integer, Integer> taskPartitionSplitIds = getSplitIdsBySourcePartition(taskPartitionId, planNodeId);
+            if (replicated) {
+                assertThat(taskPartitionSplitIds).containsAllEntriesOf(expectedSplitIds);
+            }
+            else {
+                taskPartitionSplitIds.forEach(expectedSplitIds::remove);
+            }
+        }
+        if (!replicated) {
+            assertThat(expectedSplitIds).isEmpty();
+        }
+    }
+
+    private ListMultimap<Integer, Integer> buildSplitIds(ListMultimap<Integer, Split> splitsBySourcePartition)
+    {
+        ImmutableListMultimap.Builder<Integer, Integer> builder = ImmutableListMultimap.builder();
+        splitsBySourcePartition.forEach((sourcePartition, split) -> builder.put(sourcePartition, TestingConnectorSplit.getSplitId(split)));
+        return builder.build();
+    }
+
+    public void update(AssignmentResult assignment)
+    {
+        for (Partition taskPartition : assignment.partitionsAdded()) {
+            verify(!noMoreTaskPartitions, "noMoreTaskPartitions is set");
+            verify(nodeRequirements.put(taskPartition.partitionId(), taskPartition.nodeRequirements()) == null, "task partition already exist: %s", taskPartition.partitionId());
+        }
+        for (PartitionUpdate taskPartitionUpdate : assignment.partitionUpdates()) {
+            int taskPartitionId = taskPartitionUpdate.partitionId();
+            verify(nodeRequirements.get(taskPartitionId) != null, "task partition does not exist: %s", taskPartitionId);
+            verify(!sealedTaskPartitions.contains(taskPartitionId), "task partition is sealed: %s", taskPartitionId);
+            PlanNodeId planNodeId = taskPartitionUpdate.planNodeId();
+            if (!taskPartitionUpdate.splits().isEmpty()) {
+                verify(!noMoreSplits.get(taskPartitionId).contains(planNodeId), "noMoreSplits is set for task partition %s and plan node %s", taskPartitionId, planNodeId);
+                splits.merge(
+                        taskPartitionId,
+                        SplitsMapping.builder().addSplits(planNodeId, taskPartitionUpdate.splits()).build(),
+                        (originalMapping, updatedMapping) ->
+                                SplitsMapping.builder(originalMapping)
+                                        .addMapping(updatedMapping)
+                                        .build());
+            }
+            if (taskPartitionUpdate.noMoreSplits()) {
+                noMoreSplits.put(taskPartitionId, planNodeId);
+            }
+        }
+        assignment.sealedPartitions().forEach(sealedTaskPartitions::add);
+        if (assignment.noMorePartitions()) {
+            noMoreTaskPartitions = true;
+        }
+        checkFinished();
+    }
+
+    private synchronized void checkFinished()
+    {
+        if (noMoreTaskPartitions && sealedTaskPartitions.containsAll(nodeRequirements.keySet())) {
+            verify(sealedTaskPartitions.equals(nodeRequirements.keySet()), "unknown sealed partitions: %s", Sets.difference(sealedTaskPartitions, nodeRequirements.keySet()));
+            ImmutableList.Builder<TaskDescriptor> result = ImmutableList.builder();
+            for (Integer taskPartitionId : sealedTaskPartitions) {
+                SplitsMapping taskSplits = splits.getOrDefault(taskPartitionId, SplitsMapping.EMPTY);
+                verify(
+                        noMoreSplits.get(taskPartitionId).containsAll(taskSplits.getPlanNodeIds()),
+                        "no more split is missing for task partition %s: %s",
+                        taskPartitionId,
+                        Sets.difference(taskSplits.getPlanNodeIds(), noMoreSplits.get(taskPartitionId)));
+                result.add(new TaskDescriptor(
+                        taskPartitionId,
+                        taskSplits,
+                        nodeRequirements.get(taskPartitionId)));
+            }
+            taskDescriptors = Optional.of(result.build());
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestArbitraryDistributionSplitAssigner.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestArbitraryDistributionSplitAssigner.java
similarity index 90%
rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestArbitraryDistributionSplitAssigner.java
rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestArbitraryDistributionSplitAssigner.java
index 2aa6744174b9..51d605dc674b 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestArbitraryDistributionSplitAssigner.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestArbitraryDistributionSplitAssigner.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
@@ -25,7 +25,7 @@
 import io.trino.metadata.Split;
 import io.trino.spi.HostAddress;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -43,6 +43,7 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.execution.scheduler.faulttolerant.SplitAssigner.SINGLE_SOURCE_PARTITION_ID;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_HANDLE;
 import static java.util.Collections.shuffle;
 import static java.util.Objects.requireNonNull;
@@ -55,7 +56,7 @@ public class TestArbitraryDistributionSplitAssigner
 {
     private static final int FUZZ_TESTING_INVOCATION_COUNT = 100;
 
-    private static final int STANDARD_SPLIT_SIZE_IN_BYTES = 1;
+    private static final long STANDARD_SPLIT_SIZE_IN_BYTES = 1;
 
     private static final PlanNodeId PARTITIONED_1 = new PlanNodeId("partitioned-1");
     private static final PlanNodeId PARTITIONED_2 = new PlanNodeId("partitioned-2");
@@ -512,6 +513,86 @@ public void testAdaptiveTaskSizing()
                         .build());
     }
 
+    @Test
+    public void testAdaptiveTaskSizingRounding()
+    {
+        Set<PlanNodeId> partitionedSources = ImmutableSet.of(PARTITIONED_1);
+        List<SplitBatch> batches = ImmutableList.of(
+                new SplitBatch(PARTITIONED_1, ImmutableList.of(createSplit(1), createSplit(2), createSplit(3)), false),
+                new SplitBatch(PARTITIONED_1, ImmutableList.of(createSplit(4), createSplit(5), createSplit(6)), false),
+                new SplitBatch(PARTITIONED_1, ImmutableList.of(createSplit(7), createSplit(8), createSplit(9)), true));
+        SplitAssigner splitAssigner = new ArbitraryDistributionSplitAssigner(
+                Optional.of(TEST_CATALOG_HANDLE),
+                partitionedSources,
+                ImmutableSet.of(),
+                1,
+                1.3,
+                100,
+                400,
+                100,
+                5);
+        SplitAssignerTester tester = new SplitAssignerTester();
+        for (SplitBatch batch : batches) {
+            PlanNodeId planNodeId = batch.getPlanNodeId();
+            List<Split> splits = batch.getSplits();
+            boolean noMoreSplits = batch.isNoMoreSplits();
+            tester.update(splitAssigner.assign(planNodeId, createSplitsMultimap(splits), noMoreSplits));
+            tester.checkContainsSplits(planNodeId, splits, false);
+        }
+        tester.update(splitAssigner.finish());
+        List<TaskDescriptor> taskDescriptors = tester.getTaskDescriptors().orElseThrow();
+        assertThat(taskDescriptors).hasSize(5);
+
+        // target size 100, round to 100
+        TaskDescriptor taskDescriptor0 = taskDescriptors.get(0);
+        assertTaskDescriptor(
+                taskDescriptor0,
+                taskDescriptor0.getPartitionId(),
+                ImmutableListMultimap.<PlanNodeId, Split>builder()
+                        .put(PARTITIONED_1, createSplit(1))
+                        .build());
+
+        // target size 130, round to 100
+        TaskDescriptor taskDescriptor1 = taskDescriptors.get(1);
+        assertTaskDescriptor(
+                taskDescriptor1,
+                taskDescriptor1.getPartitionId(),
+                ImmutableListMultimap.<PlanNodeId, Split>builder()
+                        .put(PARTITIONED_1, createSplit(2))
+                        .build());
+
+        // target size 169, round to 200
+        TaskDescriptor taskDescriptor2 = taskDescriptors.get(2);
+        assertTaskDescriptor(
+                taskDescriptor2,
+                taskDescriptor2.getPartitionId(),
+                ImmutableListMultimap.<PlanNodeId, Split>builder()
+                        .put(PARTITIONED_1, createSplit(3))
+                        .put(PARTITIONED_1, createSplit(4))
+                        .build());
+
+        // target size 220, round to 200
+        TaskDescriptor taskDescriptor3 = taskDescriptors.get(3);
+        assertTaskDescriptor(
+                taskDescriptor3,
+                taskDescriptor3.getPartitionId(),
+                ImmutableListMultimap.<PlanNodeId, Split>builder()
+                        .put(PARTITIONED_1, createSplit(5))
+                        .put(PARTITIONED_1, createSplit(6))
+                        .build());
+
+        // target size 286, round to 300
+        TaskDescriptor taskDescriptor4 = taskDescriptors.get(4);
+        assertTaskDescriptor(
+                taskDescriptor4,
+                taskDescriptor4.getPartitionId(),
+                ImmutableListMultimap.<PlanNodeId, Split>builder()
+                        .put(PARTITIONED_1, createSplit(7))
+                        .put(PARTITIONED_1, createSplit(8))
+                        .put(PARTITIONED_1, createSplit(9))
+                        .build());
+    }
+
     private void fuzzTesting(boolean withHostRequirements)
     {
         Set<PlanNodeId> partitionedSources = new HashSet<>();
@@ -690,9 +771,13 @@ private static void assertTaskDescriptor(
             ListMultimap<PlanNodeId, Split> expectedSplits)
     {
         assertEquals(taskDescriptor.getPartitionId(), expectedPartitionId);
-        assertSplitsEqual(taskDescriptor.getSplits(), expectedSplits);
+        taskDescriptor.getSplits().getPlanNodeIds().forEach(planNodeId -> {
+            // we expect single source partition for arbitrary distributed tasks
+            assertThat(taskDescriptor.getSplits().getSplits(planNodeId).keySet()).isEqualTo(ImmutableSet.of(SINGLE_SOURCE_PARTITION_ID));
+        });
+        assertSplitsEqual(taskDescriptor.getSplits().getSplitsFlat(), expectedSplits);
         Set<HostAddress> hostRequirement = null;
-        for (Split split : taskDescriptor.getSplits().values()) {
+        for (Split split : taskDescriptor.getSplits().getSplitsFlat().values()) {
             if (!split.isRemotelyAccessible()) {
                 if (hostRequirement == null) {
                     hostRequirement = ImmutableSet.copyOf(split.getAddresses());
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestBinPackingNodeAllocator.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestBinPackingNodeAllocator.java
new file mode 100644
index 000000000000..b14aea5a8026
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestBinPackingNodeAllocator.java
@@ -0,0 +1,893 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.Futures;
+import io.airlift.testing.TestingTicker;
+import io.airlift.units.DataSize;
+import io.trino.Session;
+import io.trino.client.NodeVersion;
+import io.trino.execution.StageId;
+import io.trino.execution.TaskId;
+import io.trino.memory.MemoryInfo;
+import io.trino.metadata.InMemoryNodeManager;
+import io.trino.metadata.InternalNode;
+import io.trino.spi.HostAddress;
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.memory.MemoryPoolInfo;
+import io.trino.testing.assertions.Assert;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
+
+import java.net.URI;
+import java.time.Duration;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
+import static io.airlift.concurrent.MoreFutures.getFutureValue;
+import static io.airlift.units.DataSize.Unit.GIGABYTE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.EAGER_SPECULATIVE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.SPECULATIVE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.STANDARD;
+import static io.trino.testing.TestingHandles.createTestCatalogHandle;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static java.time.temporal.ChronoUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+// uses mutable state
+@TestInstance(PER_METHOD)
+public class TestBinPackingNodeAllocator
+{
+    private static final Session SESSION = testSessionBuilder().build();
+
+    private static final HostAddress NODE_1_ADDRESS = HostAddress.fromParts("127.0.0.1", 8080);
+    private static final HostAddress NODE_2_ADDRESS = HostAddress.fromParts("127.0.0.1", 8081);
+    private static final HostAddress NODE_3_ADDRESS = HostAddress.fromParts("127.0.0.1", 8082);
+    private static final HostAddress NODE_4_ADDRESS = HostAddress.fromParts("127.0.0.1", 8083);
+
+    private static final InternalNode NODE_1 = new InternalNode("node-1", URI.create("local://" + NODE_1_ADDRESS), NodeVersion.UNKNOWN, false);
+    private static final InternalNode NODE_2 = new InternalNode("node-2", URI.create("local://" + NODE_2_ADDRESS), NodeVersion.UNKNOWN, false);
+    private static final InternalNode NODE_3 = new InternalNode("node-3", URI.create("local://" + NODE_3_ADDRESS), NodeVersion.UNKNOWN, false);
+    private static final InternalNode NODE_4 = new InternalNode("node-4", URI.create("local://" + NODE_4_ADDRESS), NodeVersion.UNKNOWN, false);
+
+    private static final CatalogHandle CATALOG_1 = createTestCatalogHandle("catalog1");
+
+    private static final NodeRequirements REQ_NONE = new NodeRequirements(Optional.empty(), Set.of());
+    private static final NodeRequirements REQ_NODE_1 = new NodeRequirements(Optional.empty(), Set.of(NODE_1_ADDRESS));
+    private static final NodeRequirements REQ_NODE_2 = new NodeRequirements(Optional.empty(), Set.of(NODE_2_ADDRESS));
+    private static final NodeRequirements REQ_CATALOG_1 = new NodeRequirements(Optional.of(CATALOG_1), Set.of());
+
+    // none of the tests should require periodic execution of routine which processes pending acquisitions
+    private static final long TEST_TIMEOUT = BinPackingNodeAllocatorService.PROCESS_PENDING_ACQUIRES_DELAY_SECONDS * 1000 / 2;
+
+    private BinPackingNodeAllocatorService nodeAllocatorService;
+    private ConcurrentHashMap<String, Optional<MemoryInfo>> workerMemoryInfos;
+    private final TestingTicker ticker = new TestingTicker();
+
+    private void setupNodeAllocatorService(InMemoryNodeManager nodeManager)
+    {
+        setupNodeAllocatorService(nodeManager, DataSize.ofBytes(0));
+    }
+
+    private void setupNodeAllocatorService(InMemoryNodeManager nodeManager, DataSize taskRuntimeMemoryEstimationOverhead)
+    {
+        shutdownNodeAllocatorService(); // just in case
+
+        workerMemoryInfos = new ConcurrentHashMap<>();
+        MemoryInfo memoryInfo = buildWorkerMemoryInfo(DataSize.ofBytes(0), ImmutableMap.of());
+        workerMemoryInfos.put(NODE_1.getNodeIdentifier(), Optional.of(memoryInfo));
+        workerMemoryInfos.put(NODE_2.getNodeIdentifier(), Optional.of(memoryInfo));
+        workerMemoryInfos.put(NODE_3.getNodeIdentifier(), Optional.of(memoryInfo));
+        workerMemoryInfos.put(NODE_4.getNodeIdentifier(), Optional.of(memoryInfo));
+
+        nodeAllocatorService = new BinPackingNodeAllocatorService(
+                nodeManager,
+                () -> workerMemoryInfos,
+                false,
+                Duration.of(1, MINUTES),
+                taskRuntimeMemoryEstimationOverhead,
+                DataSize.of(10, GIGABYTE), // allow overcommit of 10GB for EAGER_SPECULATIVE tasks
+                ticker);
+        nodeAllocatorService.start();
+    }
+
+    private void updateWorkerUsedMemory(InternalNode node, DataSize usedMemory, Map<TaskId, DataSize> taskMemoryUsage)
+    {
+        workerMemoryInfos.put(node.getNodeIdentifier(), Optional.of(buildWorkerMemoryInfo(usedMemory, taskMemoryUsage)));
+    }
+
+    private MemoryInfo buildWorkerMemoryInfo(DataSize usedMemory, Map<TaskId, DataSize> taskMemoryUsage)
+    {
+        return new MemoryInfo(
+                4,
+                new MemoryPoolInfo(
+                        DataSize.of(64, GIGABYTE).toBytes(),
+                        usedMemory.toBytes(),
+                        0,
+                        ImmutableMap.of(),
+                        ImmutableMap.of(),
+                        ImmutableMap.of(),
+                        taskMemoryUsage.entrySet().stream()
+                                .collect(toImmutableMap(
+                                        entry -> entry.getKey().toString(),
+                                        entry -> entry.getValue().toBytes())),
+                        ImmutableMap.of()));
+    }
+
+    @AfterEach
+    public void shutdownNodeAllocatorService()
+    {
+        if (nodeAllocatorService != null) {
+            nodeAllocatorService.stop();
+        }
+        nodeAllocatorService = null;
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testAllocateSimple()
+            throws Exception
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // first two allocations should not block
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_1);
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire2, NODE_2);
+
+            // same for subsequent two allocation (each task requires 32GB and we have 2 nodes with 64GB each)
+            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire3, NODE_1);
+            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire4, NODE_2);
+
+            // 5th allocation should block
+            NodeAllocator.NodeLease acquire5 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire5);
+
+            // release acquire2 which uses
+            acquire2.release();
+            assertEventually(() -> {
+                // we need to wait as pending acquires are processed asynchronously
+                assertAcquired(acquire5);
+                assertEquals(acquire5.getNode().get(), NODE_2);
+            });
+
+            // try to acquire one more node (should block)
+            NodeAllocator.NodeLease acquire6 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire6);
+
+            // add new node
+            nodeManager.addNodes(NODE_3);
+            // TODO: make BinPackingNodeAllocatorService react on new node added automatically
+            nodeAllocatorService.processPendingAcquires();
+
+            // new node should be assigned
+            assertEventually(() -> {
+                assertAcquired(acquire6);
+                assertEquals(acquire6.getNode().get(), NODE_3);
+            });
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testAllocateDifferentSizes()
+            throws Exception
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_1);
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire2, NODE_2);
+            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertAcquired(acquire3, NODE_1);
+            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertAcquired(acquire4, NODE_2);
+            NodeAllocator.NodeLease acquire5 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertAcquired(acquire5, NODE_1);
+            NodeAllocator.NodeLease acquire6 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertAcquired(acquire6, NODE_2);
+            // each of the nodes is filled in with 32+16+16
+
+            // try allocate 32 and 16
+            NodeAllocator.NodeLease acquire7 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire7);
+
+            NodeAllocator.NodeLease acquire8 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire8);
+
+            // free 16MB on NODE_1;
+            acquire3.release();
+            // none of the pending allocations should be unblocked as NODE_1 is reserved for 32MB allocation which came first
+            assertNotAcquired(acquire7);
+            assertNotAcquired(acquire8);
+
+            // release 16MB on NODE_2
+            acquire4.release();
+            // pending 16MB should be unblocked now
+            assertAcquired(acquire8);
+
+            // unblock another 16MB on NODE_1
+            acquire5.release();
+            // pending 32MB should be unblocked now
+            assertAcquired(acquire7);
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testAllocateDifferentSizesOpportunisticAcquisition()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_1);
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire2, NODE_2);
+            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertAcquired(acquire3, NODE_1);
+            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertAcquired(acquire4, NODE_2);
+            NodeAllocator.NodeLease acquire5 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertAcquired(acquire5, NODE_1);
+            NodeAllocator.NodeLease acquire6 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertAcquired(acquire6, NODE_2);
+            // each of the nodes is filled in with 32+16+16
+
+            // try to allocate 32 and 16
+            NodeAllocator.NodeLease acquire7 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire7);
+
+            NodeAllocator.NodeLease acquire8 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire8);
+
+            // free 32MB on NODE_2;
+            acquire2.release();
+            // even though pending 32MB was reserving space on NODE_1 it will still use free space on NODE_2 when it got available (it has higher priority than 16MB request which came later)
+            assertAcquired(acquire7);
+
+            // release 16MB on NODE_1
+            acquire1.release();
+            // pending 16MB request should be unblocked now
+            assertAcquired(acquire8);
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testAllocateReleaseBeforeAcquired()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1);
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // first two allocations should not block
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_1);
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire2, NODE_1);
+
+            // another two should block
+            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire3);
+            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire4);
+
+            // releasing a blocked one should not unblock anything
+            acquire3.release();
+            assertNotAcquired(acquire4);
+
+            // releasing an acquired one should unblock one which is still blocked
+            acquire2.release();
+            assertEventually(() -> assertAcquired(acquire4, NODE_1));
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testNoMatchingNodeAvailable()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager();
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // request a node with specific catalog (not present)
+            NodeAllocator.NodeLease acquireNoMatching = nodeAllocator.acquire(REQ_CATALOG_1, DataSize.of(64, GIGABYTE), STANDARD);
+            assertNotAcquired(acquireNoMatching);
+            ticker.increment(59, TimeUnit.SECONDS); // still below timeout
+            nodeAllocatorService.processPendingAcquires();
+            assertNotAcquired(acquireNoMatching);
+            ticker.increment(2, TimeUnit.SECONDS); // past 1 minute timeout
+            nodeAllocatorService.processPendingAcquires();
+            assertThatThrownBy(() -> Futures.getUnchecked(acquireNoMatching.getNode()))
+                    .hasMessageContaining("No nodes available to run query");
+
+            // add node with specific catalog
+            nodeManager.addNodes(NODE_2);
+
+            // we should be able to acquire the node now
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_CATALOG_1, DataSize.of(64, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_2);
+
+            // acquiring one more should block (only one acquire fits a node as we request 64GB)
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_CATALOG_1, DataSize.of(64, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire2);
+
+            // remove node with catalog
+            nodeManager.removeNode(NODE_2);
+            // TODO: make BinPackingNodeAllocatorService react on node removed automatically
+            nodeAllocatorService.processPendingAcquires();
+            ticker.increment(61, TimeUnit.SECONDS); // wait past the timeout
+            nodeAllocatorService.processPendingAcquires();
+
+            // pending acquire2 should be completed now but with an exception
+            assertEventually(() -> {
+                assertFalse(acquire2.getNode().isCancelled());
+                assertTrue(acquire2.getNode().isDone());
+                assertThatThrownBy(() -> getFutureValue(acquire2.getNode()))
+                        .hasMessage("No nodes available to run query");
+            });
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testNoMatchingNodeAvailableTimeoutReset()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager();
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // request a node with specific catalog (not present)
+            NodeAllocator.NodeLease acquireNoMatching1 = nodeAllocator.acquire(REQ_CATALOG_1, DataSize.of(64, GIGABYTE), STANDARD);
+            NodeAllocator.NodeLease acquireNoMatching2 = nodeAllocator.acquire(REQ_CATALOG_1, DataSize.of(64, GIGABYTE), STANDARD);
+            assertNotAcquired(acquireNoMatching1);
+            assertNotAcquired(acquireNoMatching2);
+
+            // wait for a while and add a node
+            ticker.increment(30, TimeUnit.SECONDS); // past 1 minute timeout
+            nodeManager.addNodes(NODE_2);
+
+            // only one of the leases should be completed but timeout counter for period where no nodes
+            // are available should be reset for the other one
+            nodeAllocatorService.processPendingAcquires();
+            assertThat(acquireNoMatching1.getNode().isDone() != acquireNoMatching2.getNode().isDone())
+                    .describedAs("exactly one of pending acquires should be completed")
+                    .isTrue();
+
+            NodeAllocator.NodeLease theAcquireLease = acquireNoMatching1.getNode().isDone() ? acquireNoMatching1 : acquireNoMatching2;
+            NodeAllocator.NodeLease theNotAcquireLease = acquireNoMatching1.getNode().isDone() ? acquireNoMatching2 : acquireNoMatching1;
+
+            // remove the node - we are again in situation where no matching nodes exist in cluster
+            nodeManager.removeNode(NODE_2);
+
+            // sleep for a while before releasing lease, as background processPendingAcquires may be still running with old snapshot
+            // containing NODE_2, and theNotAcquireLease could be fulfilled when theAcquireLease is released
+            sleepUninterruptibly(10, MILLISECONDS);
+            theAcquireLease.release();
+            nodeAllocatorService.processPendingAcquires();
+            assertNotAcquired(theNotAcquireLease);
+
+            ticker.increment(59, TimeUnit.SECONDS); // still below 1m timeout as the reset happened in previous step
+            nodeAllocatorService.processPendingAcquires();
+            assertNotAcquired(theNotAcquireLease);
+
+            ticker.increment(2, TimeUnit.SECONDS);
+            nodeAllocatorService.processPendingAcquires();
+            assertThatThrownBy(() -> Futures.getUnchecked(theNotAcquireLease.getNode()))
+                    .hasMessageContaining("No nodes available to run query");
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testRemoveAcquiredNode()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1);
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_1);
+
+            // remove acquired node
+            nodeManager.removeNode(NODE_1);
+
+            // we should still be able to release lease for removed node
+            acquire1.release();
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testAllocateNodeWithAddressRequirements()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
+
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NODE_2, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_2);
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NODE_2, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire2, NODE_2);
+
+            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NODE_2, DataSize.of(32, GIGABYTE), STANDARD);
+            // no more place on NODE_2
+            assertNotAcquired(acquire3);
+
+            // requests for other node are still good
+            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NODE_1, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire4, NODE_1);
+
+            // release some space on NODE_2
+            acquire1.release();
+            // pending acquisition should be unblocked
+            assertEventually(() -> assertAcquired(acquire3));
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testAllocateNotEnoughRuntimeMemory()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // first allocation is fine
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_1);
+            acquire1.attachTaskId(taskId(1));
+
+            // bump memory usage on NODE_1
+            updateWorkerUsedMemory(NODE_1,
+                    DataSize.of(33, GIGABYTE),
+                    ImmutableMap.of(taskId(1), DataSize.of(33, GIGABYTE)));
+            nodeAllocatorService.refreshNodePoolMemoryInfos();
+
+            // second allocation of 32GB should go to another node
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire2, NODE_2);
+            acquire2.attachTaskId(taskId(2));
+
+            // third allocation of 32GB should also use NODE_2 as there is not enough runtime memory on NODE_1
+            // second allocation of 32GB should go to another node
+            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire3, NODE_2);
+            acquire3.attachTaskId(taskId(3));
+
+            // fourth allocation of 16 should fit on NODE_1
+            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertAcquired(acquire4, NODE_1);
+            acquire4.attachTaskId(taskId(4));
+
+            // fifth allocation of 16 should no longer fit on NODE_1. There is 16GB unreserved but only 15GB taking runtime usage into account
+            NodeAllocator.NodeLease acquire5 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire5);
+
+            // even tiny allocations should not fit now
+            NodeAllocator.NodeLease acquire6 = nodeAllocator.acquire(REQ_NONE, DataSize.of(1, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire6);
+
+            // if memory usage decreases on NODE_1 the pending 16GB allocation should complete
+            updateWorkerUsedMemory(NODE_1,
+                    DataSize.of(32, GIGABYTE),
+                    ImmutableMap.of(taskId(1), DataSize.of(32, GIGABYTE)));
+            nodeAllocatorService.refreshNodePoolMemoryInfos();
+            nodeAllocatorService.processPendingAcquires();
+            assertAcquired(acquire5, NODE_1);
+            acquire5.attachTaskId(taskId(5));
+
+            //  acquire6 should still be pending
+            assertNotAcquired(acquire6);
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testAllocateRuntimeMemoryDiscrepancies()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1);
+
+        setupNodeAllocatorService(nodeManager);
+        // test when global memory usage on node is greater than per task usage
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // first allocation is fine
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_1);
+            acquire1.attachTaskId(taskId(1));
+
+            // bump memory usage on NODE_1; per-task usage is kept small
+            updateWorkerUsedMemory(NODE_1,
+                    DataSize.of(33, GIGABYTE),
+                    ImmutableMap.of(taskId(1), DataSize.of(4, GIGABYTE)));
+            nodeAllocatorService.refreshNodePoolMemoryInfos();
+
+            // global (greater) memory usage should take precedence
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire2);
+        }
+
+        setupNodeAllocatorService(nodeManager);
+        // test when global memory usage on node is smaller than per task usage
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // first allocation is fine
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_1);
+            acquire1.attachTaskId(taskId(1));
+
+            // bump memory usage on NODE_1; per-task usage is 33GB and global is 4GB
+            updateWorkerUsedMemory(NODE_1,
+                    DataSize.of(4, GIGABYTE),
+                    ImmutableMap.of(taskId(1), DataSize.of(33, GIGABYTE)));
+            nodeAllocatorService.refreshNodePoolMemoryInfos();
+
+            // per-task (greater) memory usage should take precedence
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire2);
+        }
+
+        setupNodeAllocatorService(nodeManager);
+        // test when per-task memory usage not present at all
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // first allocation is fine
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_1);
+            acquire1.attachTaskId(taskId(1));
+
+            // bump memory usage on NODE_1; per-task usage is 33GB and global is 4GB
+            updateWorkerUsedMemory(NODE_1, DataSize.of(33, GIGABYTE), ImmutableMap.of());
+            nodeAllocatorService.refreshNodePoolMemoryInfos();
+
+            // global memory usage should be used (not per-task usage)
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire2);
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testSpaceReservedOnPrimaryNodeIfNoNodeWithEnoughRuntimeMemoryAvailable()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
+        setupNodeAllocatorService(nodeManager);
+
+        // test when global memory usage on node is greater than per task usage
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // reserve 32GB on NODE_1 and 16GB on NODE_2
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_1);
+            acquire1.attachTaskId(taskId(1));
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertAcquired(acquire2, NODE_2);
+            acquire2.attachTaskId(taskId(2));
+
+            // make actual usage on NODE_2 greater than on NODE_1
+            updateWorkerUsedMemory(NODE_1,
+                    DataSize.of(40, GIGABYTE),
+                    ImmutableMap.of(taskId(1), DataSize.of(40, GIGABYTE)));
+            updateWorkerUsedMemory(NODE_2,
+                    DataSize.of(41, GIGABYTE),
+                    ImmutableMap.of(taskId(2), DataSize.of(41, GIGABYTE)));
+            nodeAllocatorService.refreshNodePoolMemoryInfos();
+
+            // try to allocate 32GB task
+            // it will not fit on neither of nodes. space should be reserved on NODE_2 as it has more memory available
+            // when you do not take runtime memory into account
+            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire3);
+
+            // to check that is the case try to allocate 20GB; NODE_1 should be picked
+            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(20, GIGABYTE), STANDARD);
+            assertAcquired(acquire4, NODE_1);
+            acquire4.attachTaskId(taskId(2));
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testAllocateWithRuntimeMemoryEstimateOverhead()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1);
+        setupNodeAllocatorService(nodeManager, DataSize.of(4, GIGABYTE));
+
+        // test when global memory usage on node is greater than per task usage
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // allocated 32GB
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_1);
+            acquire1.attachTaskId(taskId(1));
+
+            // set runtime usage of task1 to 30GB
+            updateWorkerUsedMemory(NODE_1,
+                    DataSize.of(30, GIGABYTE),
+                    ImmutableMap.of(taskId(1), DataSize.of(30, GIGABYTE)));
+            nodeAllocatorService.refreshNodePoolMemoryInfos();
+
+            // including overhead node runtime usage is 30+4 = 34GB so another 32GB task will not fit
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire2);
+
+            // decrease runtime usage to 28GB
+            // set runtime usage of task1 to 30GB
+            updateWorkerUsedMemory(NODE_1,
+                    DataSize.of(28, GIGABYTE),
+                    ImmutableMap.of(taskId(1), DataSize.of(28, GIGABYTE)));
+            nodeAllocatorService.refreshNodePoolMemoryInfos();
+
+            // now pending acquire should be fulfilled
+            nodeAllocatorService.processPendingAcquires();
+            assertAcquired(acquire2, NODE_1);
+        }
+    }
+
+    @Test
+    public void testStressAcquireRelease()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1);
+        setupNodeAllocatorService(nodeManager, DataSize.of(4, GIGABYTE));
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            for (int i = 0; i < 10_000_000; ++i) {
+                NodeAllocator.NodeLease lease = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+                lease.release();
+            }
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testAllocateSpeculative()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // allocate two speculative tasks
+            NodeAllocator.NodeLease acquireSpeculative1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(64, GIGABYTE), SPECULATIVE);
+            assertAcquired(acquireSpeculative1, NODE_1);
+            NodeAllocator.NodeLease acquireSpeculative2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), SPECULATIVE);
+            assertAcquired(acquireSpeculative2, NODE_2);
+
+            // standard tasks should still get node
+            NodeAllocator.NodeLease acquireStandard1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(64, GIGABYTE), STANDARD);
+            assertAcquired(acquireStandard1, NODE_2);
+            NodeAllocator.NodeLease acquireStandard2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquireStandard2, NODE_1);
+
+            // new speculative task will not fit (even tiny one)
+            NodeAllocator.NodeLease acquireSpeculative3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(1, GIGABYTE), SPECULATIVE);
+            assertNotAcquired(acquireSpeculative3);
+
+            // if you switch it to standard it will schedule
+            acquireSpeculative3.setExecutionClass(STANDARD);
+            assertAcquired(acquireSpeculative3, NODE_1);
+
+            // release all speculative tasks
+            acquireSpeculative1.release();
+            acquireSpeculative2.release();
+            acquireSpeculative3.release();
+
+            // we have 32G free on NODE_1 now
+            NodeAllocator.NodeLease acquireStandard4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquireStandard4, NODE_1);
+
+            // no place for speculative task
+            NodeAllocator.NodeLease acquireSpeculative4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(1, GIGABYTE), SPECULATIVE);
+            assertNotAcquired(acquireSpeculative4);
+
+            // no place for another standard task
+            NodeAllocator.NodeLease acquireStandard5 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertNotAcquired(acquireStandard5);
+
+            // release acquireStandard4 - a standard task should be scheduled before speculative one
+            acquireStandard4.release();
+            assertAcquired(acquireStandard5);
+            assertNotAcquired(acquireSpeculative4);
+
+            // on subsequent release speculative task will get node
+            acquireStandard5.release();
+            assertAcquired(acquireSpeculative4);
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testSwitchAcquiredSpeculativeToStandard()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1);
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // allocate speculative task
+            NodeAllocator.NodeLease acquireSpeculative = nodeAllocator.acquire(REQ_NONE, DataSize.of(64, GIGABYTE), SPECULATIVE);
+            assertAcquired(acquireSpeculative, NODE_1);
+
+            // check if standard task can fit and release - it should fit
+            NodeAllocator.NodeLease acquireStandard1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertAcquired(acquireStandard1, NODE_1);
+            acquireStandard1.release();
+
+            // switch acquireSpeculative to standard
+            acquireSpeculative.setExecutionClass(STANDARD);
+
+            // extra standard task should no longer fit
+            NodeAllocator.NodeLease acquireStandard2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(16, GIGABYTE), STANDARD);
+            assertNotAcquired(acquireStandard2);
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testAllocateEagerSpeculative()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            NodeAllocator.NodeLease acquireStandard1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(64, GIGABYTE), STANDARD);
+            assertAcquired(acquireStandard1, NODE_1);
+            NodeAllocator.NodeLease acquireStandard2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquireStandard2, NODE_2);
+
+            // not enough space for acquireStandard3
+            NodeAllocator.NodeLease acquireStandard3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(64, GIGABYTE), STANDARD);
+            assertNotAcquired(acquireStandard3);
+
+            // acquireSpeculative3 cannot be acquired because there is pending acquireStandard3
+            NodeAllocator.NodeLease acquireSpeculative3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), SPECULATIVE);
+            assertNotAcquired(acquireSpeculative3);
+
+            // acquireEagerSpeculative1 can be acquired despite acquireStandard3 pending
+            NodeAllocator.NodeLease acquireEagerSpeculative1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), EAGER_SPECULATIVE);
+            assertAcquired(acquireEagerSpeculative1, NODE_2);
+
+            // cancel acquireStandard3
+            acquireStandard3.release();
+
+            // acquireSpeculative3 still not eligible - all cluster memory used 64+32 STANDARD and 32 SPECULATIVE
+            nodeAllocatorService.processPendingAcquires();
+            assertNotAcquired(acquireSpeculative3);
+
+            // still place for two more 10GB EAGER_SPECULATIVE tasks due to overcommit logic
+            NodeAllocator.NodeLease acquireEagerSpeculative2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(10, GIGABYTE), EAGER_SPECULATIVE);
+            assertAcquired(acquireEagerSpeculative2, NODE_1);
+            NodeAllocator.NodeLease acquireEagerSpeculative3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(10, GIGABYTE), EAGER_SPECULATIVE);
+            assertAcquired(acquireEagerSpeculative3, NODE_2);
+
+            // no place for another one
+            NodeAllocator.NodeLease acquireEagerSpeculative4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(10, GIGABYTE), EAGER_SPECULATIVE);
+            assertNotAcquired(acquireEagerSpeculative4);
+
+            // acquireStandard4 can be acquired despite acquireEagerSpeculative* tasks scheduled
+            NodeAllocator.NodeLease acquireStandard4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquireStandard4, NODE_2);
+        }
+    }
+
+    @Test
+    @Timeout(value = TEST_TIMEOUT, unit = MILLISECONDS)
+    public void testChangeMemoryRequirement()
+    {
+        InMemoryNodeManager nodeManager = new InMemoryNodeManager(NODE_1, NODE_2);
+        setupNodeAllocatorService(nodeManager);
+
+        try (NodeAllocator nodeAllocator = nodeAllocatorService.getNodeAllocator(SESSION)) {
+            // Allocate 32GB on each noe
+            NodeAllocator.NodeLease acquire1 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire1, NODE_1);
+            NodeAllocator.NodeLease acquire2 = nodeAllocator.acquire(REQ_NONE, DataSize.of(32, GIGABYTE), STANDARD);
+            assertAcquired(acquire2, NODE_2);
+
+            // Try to allocate 40GB more - will not fit
+            NodeAllocator.NodeLease acquire3 = nodeAllocator.acquire(REQ_NONE, DataSize.of(40, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire3);
+
+            // lower memory requirements for acquire3 to 32GB; it should fit now
+            acquire3.setMemoryRequirement(DataSize.of(32, GIGABYTE));
+            assertAcquired(acquire3, NODE_1);
+
+            // Try to allocate another 40GB more - will not fit
+            NodeAllocator.NodeLease acquire4 = nodeAllocator.acquire(REQ_NONE, DataSize.of(40, GIGABYTE), STANDARD);
+            assertNotAcquired(acquire4);
+
+            // Lower memory requirements for leases already on NODE_1
+            acquire1.setMemoryRequirement(DataSize.of(10, GIGABYTE));
+            assertNotAcquired(acquire4); //  still not enough
+            acquire3.setMemoryRequirement(DataSize.of(10, GIGABYTE));
+            assertAcquired(acquire4, NODE_1); // we are good
+        }
+    }
+
+    private TaskId taskId(int partition)
+    {
+        return new TaskId(new StageId("test_query", 0), partition, 0);
+    }
+
+    private void assertAcquired(NodeAllocator.NodeLease lease, InternalNode node)
+    {
+        assertAcquired(lease, Optional.of(node));
+    }
+
+    private void assertAcquired(NodeAllocator.NodeLease lease)
+    {
+        assertAcquired(lease, Optional.empty());
+    }
+
+    private void assertAcquired(NodeAllocator.NodeLease lease, Optional<InternalNode> expectedNode)
+    {
+        assertEventually(() -> {
+            assertFalse(lease.getNode().isCancelled(), "node lease cancelled");
+            assertTrue(lease.getNode().isDone(), "node lease not acquired");
+            if (expectedNode.isPresent()) {
+                assertEquals(lease.getNode().get(), expectedNode.get());
+            }
+        });
+    }
+
+    private void assertNotAcquired(NodeAllocator.NodeLease lease)
+    {
+        assertFalse(lease.getNode().isCancelled(), "node lease cancelled");
+        assertFalse(lease.getNode().isDone(), "node lease acquired");
+        // enforce pending acquires processing and check again
+        nodeAllocatorService.processPendingAcquires();
+        assertFalse(lease.getNode().isCancelled(), "node lease cancelled");
+        assertFalse(lease.getNode().isDone(), "node lease acquired");
+    }
+
+    private static void assertEventually(ThrowingRunnable assertion)
+    {
+        Assert.assertEventually(
+                new io.airlift.units.Duration(TEST_TIMEOUT, MILLISECONDS),
+                new io.airlift.units.Duration(10, MILLISECONDS),
+                () -> {
+                    try {
+                        assertion.run();
+                    }
+                    catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                });
+    }
+
+    interface ThrowingRunnable
+    {
+        void run()
+                throws Exception;
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestEventDrivenTaskSource.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestEventDrivenTaskSource.java
similarity index 96%
rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestEventDrivenTaskSource.java
rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestEventDrivenTaskSource.java
index abb16729ead9..ab41210d9f16 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestEventDrivenTaskSource.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestEventDrivenTaskSource.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashMultimap;
@@ -25,9 +25,11 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningScheduledExecutorService;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.exchange.SpoolingExchangeInput;
 import io.trino.execution.TableExecuteContextManager;
-import io.trino.execution.scheduler.SplitAssigner.AssignmentResult;
+import io.trino.execution.scheduler.TestingExchangeSourceHandle;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.AssignmentResult;
 import io.trino.metadata.Split;
 import io.trino.spi.QueryId;
 import io.trino.spi.connector.CatalogHandle;
@@ -42,11 +44,11 @@
 import io.trino.split.SplitSource;
 import io.trino.sql.planner.plan.PlanFragmentId;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import javax.annotation.concurrent.GuardedBy;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -78,14 +80,16 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
+@TestInstance(PER_CLASS)
 public class TestEventDrivenTaskSource
 {
     private static final int INVOCATION_COUNT = 20;
-    private static final long TIMEOUT = 60 * 1000;
+    private static final long TIMEOUT = 60;
 
     private static final PlanNodeId PLAN_NODE_1 = new PlanNodeId("plan-node-1");
     private static final PlanNodeId PLAN_NODE_2 = new PlanNodeId("plan-node-2");
@@ -100,13 +104,13 @@ public class TestEventDrivenTaskSource
 
     private ListeningScheduledExecutorService executor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         executor = listeningDecorator(newScheduledThreadPool(10, daemonThreadsNamed(getClass().getName())));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (executor != null) {
@@ -115,7 +119,8 @@ public void tearDown()
         }
     }
 
-    @Test(invocationCount = INVOCATION_COUNT, timeOut = TIMEOUT)
+    @RepeatedTest(INVOCATION_COUNT)
+    @Timeout(TIMEOUT)
     public void testHappyPath()
             throws Exception
     {
@@ -240,7 +245,8 @@ public void testHappyPath()
                         .build());
     }
 
-    @Test(invocationCount = INVOCATION_COUNT, timeOut = TIMEOUT)
+    @RepeatedTest(INVOCATION_COUNT)
+    @Timeout(TIMEOUT)
     public void stressTest()
             throws Exception
     {
@@ -355,7 +361,7 @@ private void testStageTaskSourceSuccess(
         Map<Integer, SetMultimap<PlanNodeId, TestingConnectorSplit>> actualSplits = new HashMap<>();
         for (TaskDescriptor taskDescriptor : taskDescriptors) {
             int partitionId = taskDescriptor.getPartitionId();
-            for (Map.Entry<PlanNodeId, Split> entry : taskDescriptor.getSplits().entries()) {
+            for (Map.Entry<PlanNodeId, Split> entry : taskDescriptor.getSplits().getSplitsFlat().entries()) {
                 if (entry.getValue().getCatalogHandle().equals(REMOTE_CATALOG_HANDLE)) {
                     RemoteSplit remoteSplit = (RemoteSplit) entry.getValue().getConnectorSplit();
                     SpoolingExchangeInput input = (SpoolingExchangeInput) remoteSplit.getExchangeInput();
@@ -665,15 +671,18 @@ public AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Spli
                 if (partitions.add(partition)) {
                     result.addPartition(new Partition(partition, new NodeRequirements(Optional.empty(), ImmutableSet.of())));
                     for (PlanNodeId finishedSource : finishedSources) {
-                        result.updatePartition(new PartitionUpdate(partition, finishedSource, ImmutableList.of(), true));
+                        result.updatePartition(new PartitionUpdate(partition, finishedSource, false, ImmutableListMultimap.of(), true));
                     }
                 }
-                result.updatePartition(new PartitionUpdate(partition, planNodeId, splits, noMoreSplits));
+
+                // todo - why are mixing source and task partition ids here
+                ListMultimap<Integer, Split> partitionSplits = ImmutableListMultimap.<Integer, Split>builder().putAll(partition, splits).build();
+                result.updatePartition(new PartitionUpdate(partition, planNodeId, true, partitionSplits, noMoreSplits));
             });
             if (noMoreSplits) {
                 finishedSources.add(planNodeId);
                 for (Integer partition : partitions) {
-                    result.updatePartition(new PartitionUpdate(partition, planNodeId, ImmutableList.of(), true));
+                    result.updatePartition(new PartitionUpdate(partition, planNodeId, false, ImmutableListMultimap.of(), true));
                 }
             }
             if (finishedSources.containsAll(allSources)) {
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestExponentialGrowthPartitionMemoryEstimator.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestExponentialGrowthPartitionMemoryEstimator.java
new file mode 100644
index 000000000000..618d88f8c7ed
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestExponentialGrowthPartitionMemoryEstimator.java
@@ -0,0 +1,254 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.airlift.units.DataSize;
+import io.trino.Session;
+import io.trino.client.NodeVersion;
+import io.trino.cost.StatsAndCosts;
+import io.trino.execution.scheduler.faulttolerant.PartitionMemoryEstimator.MemoryRequirements;
+import io.trino.memory.MemoryInfo;
+import io.trino.metadata.InternalNode;
+import io.trino.spi.StandardErrorCode;
+import io.trino.spi.memory.MemoryPoolInfo;
+import io.trino.sql.planner.Partitioning;
+import io.trino.sql.planner.PartitioningHandle;
+import io.trino.sql.planner.PartitioningScheme;
+import io.trino.sql.planner.PlanFragment;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import io.trino.sql.planner.plan.PlanNodeId;
+import io.trino.sql.planner.plan.ValuesNode;
+import io.trino.testing.TestingSession;
+import org.junit.jupiter.api.Test;
+
+import java.net.URI;
+import java.util.Optional;
+import java.util.function.Function;
+
+import static io.airlift.units.DataSize.Unit.GIGABYTE;
+import static io.airlift.units.DataSize.Unit.MEGABYTE;
+import static io.trino.SystemSessionProperties.FAULT_TOLERANT_EXECUTION_COORDINATOR_TASK_MEMORY;
+import static io.trino.SystemSessionProperties.FAULT_TOLERANT_EXECUTION_TASK_MEMORY;
+import static io.trino.spi.StandardErrorCode.ADMINISTRATIVELY_PREEMPTED;
+import static io.trino.spi.StandardErrorCode.CLUSTER_OUT_OF_MEMORY;
+import static io.trino.spi.StandardErrorCode.EXCEEDED_LOCAL_MEMORY_LIMIT;
+import static io.trino.sql.planner.SystemPartitioningHandle.COORDINATOR_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestExponentialGrowthPartitionMemoryEstimator
+{
+    private static final Function<PlanFragmentId, PlanFragment> THROWING_PLAN_FRAGMENT_LOOKUP = planFragmentId -> {
+        throw new RuntimeException("should not be used");
+    };
+
+    @Test
+    public void testDefaultInitialEstimation()
+    {
+        ExponentialGrowthPartitionMemoryEstimator.Factory estimatorFactory = new ExponentialGrowthPartitionMemoryEstimator.Factory(
+                () -> ImmutableMap.of(new InternalNode("a-node", URI.create("local://blah"), NodeVersion.UNKNOWN, false).getNodeIdentifier(), Optional.of(buildWorkerMemoryInfo(DataSize.ofBytes(0)))),
+                true);
+        estimatorFactory.refreshNodePoolMemoryInfos();
+
+        Session session = TestingSession.testSessionBuilder()
+                .setSystemProperty(FAULT_TOLERANT_EXECUTION_COORDINATOR_TASK_MEMORY, "107MB")
+                .setSystemProperty(FAULT_TOLERANT_EXECUTION_TASK_MEMORY, "113MB")
+                .build();
+
+        assertThat(estimatorFactory.createPartitionMemoryEstimator(session, getPlanFragment(COORDINATOR_DISTRIBUTION), THROWING_PLAN_FRAGMENT_LOOKUP).getInitialMemoryRequirements())
+                .isEqualTo(new MemoryRequirements(DataSize.of(107, MEGABYTE)));
+
+        assertThat(estimatorFactory.createPartitionMemoryEstimator(session, getPlanFragment(SINGLE_DISTRIBUTION), THROWING_PLAN_FRAGMENT_LOOKUP).getInitialMemoryRequirements())
+                .isEqualTo(new MemoryRequirements(DataSize.of(113, MEGABYTE)));
+    }
+
+    @Test
+    public void testEstimator()
+    {
+        ExponentialGrowthPartitionMemoryEstimator.Factory estimatorFactory = new ExponentialGrowthPartitionMemoryEstimator.Factory(
+                () -> ImmutableMap.of(new InternalNode("a-node", URI.create("local://blah"), NodeVersion.UNKNOWN, false).getNodeIdentifier(), Optional.of(buildWorkerMemoryInfo(DataSize.ofBytes(0)))),
+                true);
+        estimatorFactory.refreshNodePoolMemoryInfos();
+
+        Session session = TestingSession.testSessionBuilder()
+                .setSystemProperty(FAULT_TOLERANT_EXECUTION_TASK_MEMORY, "107MB")
+                .build();
+
+        PartitionMemoryEstimator estimator = estimatorFactory.createPartitionMemoryEstimator(session, getPlanFragment(SINGLE_DISTRIBUTION), THROWING_PLAN_FRAGMENT_LOOKUP);
+
+        assertThat(estimator.getInitialMemoryRequirements())
+                .isEqualTo(new MemoryRequirements(DataSize.of(107, MEGABYTE)));
+
+        // peak memory of failed task 10MB
+        assertThat(
+                estimator.getNextRetryMemoryRequirements(
+                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
+                        DataSize.of(10, MEGABYTE),
+                        StandardErrorCode.CORRUPT_PAGE.toErrorCode()))
+                .isEqualTo(new MemoryRequirements(DataSize.of(50, MEGABYTE)));
+
+        assertThat(
+                estimator.getNextRetryMemoryRequirements(
+                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
+                        DataSize.of(10, MEGABYTE),
+                        StandardErrorCode.CLUSTER_OUT_OF_MEMORY.toErrorCode()))
+                .isEqualTo(new MemoryRequirements(DataSize.of(150, MEGABYTE)));
+
+        assertThat(
+                estimator.getNextRetryMemoryRequirements(
+                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
+                        DataSize.of(10, MEGABYTE),
+                        StandardErrorCode.TOO_MANY_REQUESTS_FAILED.toErrorCode()))
+                .isEqualTo(new MemoryRequirements(DataSize.of(150, MEGABYTE)));
+
+        assertThat(
+                estimator.getNextRetryMemoryRequirements(
+                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
+                        DataSize.of(10, MEGABYTE),
+                        EXCEEDED_LOCAL_MEMORY_LIMIT.toErrorCode()))
+                .isEqualTo(new MemoryRequirements(DataSize.of(150, MEGABYTE)));
+
+        // peak memory of failed task 70MB
+        assertThat(
+                estimator.getNextRetryMemoryRequirements(
+                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
+                        DataSize.of(70, MEGABYTE),
+                        StandardErrorCode.CORRUPT_PAGE.toErrorCode()))
+                .isEqualTo(new MemoryRequirements(DataSize.of(70, MEGABYTE)));
+
+        assertThat(
+                estimator.getNextRetryMemoryRequirements(
+                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
+                        DataSize.of(70, MEGABYTE),
+                        EXCEEDED_LOCAL_MEMORY_LIMIT.toErrorCode()))
+                .isEqualTo(new MemoryRequirements(DataSize.of(210, MEGABYTE)));
+
+        // register a couple successful attempts; 90th percentile is at 300MB
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(1000, MEGABYTE), true, Optional.empty());
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(300, MEGABYTE), true, Optional.empty());
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(100, MEGABYTE), true, Optional.empty());
+
+        // for initial we should pick estimate if greater than default
+        assertThat(estimator.getInitialMemoryRequirements()) // DataSize.of(100, MEGABYTE)
+                .isEqualTo(new MemoryRequirements(DataSize.of(300, MEGABYTE)));
+
+        // for next we should still pick current initial if greater
+        assertThat(
+                estimator.getNextRetryMemoryRequirements(
+                        new MemoryRequirements(DataSize.of(50, MEGABYTE)),
+                        DataSize.of(70, MEGABYTE),
+                        EXCEEDED_LOCAL_MEMORY_LIMIT.toErrorCode()))
+                .isEqualTo(new MemoryRequirements(DataSize.of(300, MEGABYTE)));
+
+        // a couple oom errors are registered
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(200, MEGABYTE), false, Optional.of(EXCEEDED_LOCAL_MEMORY_LIMIT.toErrorCode()));
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(200, MEGABYTE), true, Optional.of(CLUSTER_OUT_OF_MEMORY.toErrorCode()));
+
+        // 90th percentile should be now at 200*3 (600)
+        assertThat(estimator.getInitialMemoryRequirements()) // DataSize.of(100, MEGABYTE)
+                .isEqualTo(new MemoryRequirements(DataSize.of(600, MEGABYTE)));
+
+        // a couple oom errors are registered with requested memory greater than peak
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(300, MEGABYTE)), DataSize.of(200, MEGABYTE), false, Optional.of(EXCEEDED_LOCAL_MEMORY_LIMIT.toErrorCode()));
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(300, MEGABYTE)), DataSize.of(200, MEGABYTE), false, Optional.of(EXCEEDED_LOCAL_MEMORY_LIMIT.toErrorCode()));
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(300, MEGABYTE)), DataSize.of(200, MEGABYTE), true, Optional.of(CLUSTER_OUT_OF_MEMORY.toErrorCode()));
+
+        // 90th percentile should be now at 300*3 (900)
+        assertThat(estimator.getInitialMemoryRequirements()) // DataSize.of(100, MEGABYTE)
+                .isEqualTo(new MemoryRequirements(DataSize.of(900, MEGABYTE)));
+
+        // other errors should not change estimate
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(500, MEGABYTE), false, Optional.of(ADMINISTRATIVELY_PREEMPTED.toErrorCode()));
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(500, MEGABYTE), false, Optional.of(ADMINISTRATIVELY_PREEMPTED.toErrorCode()));
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(500, MEGABYTE), false, Optional.of(ADMINISTRATIVELY_PREEMPTED.toErrorCode()));
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(500, MEGABYTE), false, Optional.of(ADMINISTRATIVELY_PREEMPTED.toErrorCode()));
+        estimator.registerPartitionFinished(new MemoryRequirements(DataSize.of(100, MEGABYTE)), DataSize.of(500, MEGABYTE), false, Optional.of(ADMINISTRATIVELY_PREEMPTED.toErrorCode()));
+
+        assertThat(estimator.getInitialMemoryRequirements()) // DataSize.of(100, MEGABYTE)
+                .isEqualTo(new MemoryRequirements(DataSize.of(900, MEGABYTE)));
+    }
+
+    @Test
+    public void testDefaultInitialEstimationPickedIfLarge()
+    {
+        ExponentialGrowthPartitionMemoryEstimator.Factory estimatorFactory = new ExponentialGrowthPartitionMemoryEstimator.Factory(
+                () -> ImmutableMap.of(new InternalNode("a-node", URI.create("local://blah"), NodeVersion.UNKNOWN, false).getNodeIdentifier(), Optional.of(buildWorkerMemoryInfo(DataSize.ofBytes(0)))),
+                true);
+        estimatorFactory.refreshNodePoolMemoryInfos();
+
+        testInitialEstimationWithFinishedPartitions(estimatorFactory, DataSize.of(300, MEGABYTE), 10, DataSize.of(500, MEGABYTE), DataSize.of(500, MEGABYTE));
+        testInitialEstimationWithFinishedPartitions(estimatorFactory, DataSize.of(300, MEGABYTE), 10, DataSize.of(100, MEGABYTE), DataSize.of(300, MEGABYTE));
+    }
+
+    private static void testInitialEstimationWithFinishedPartitions(
+            ExponentialGrowthPartitionMemoryEstimator.Factory estimatorFactory,
+            DataSize recordedMemoryUsage,
+            int recordedPartitionsCount,
+            DataSize defaultInitialTaskMemory,
+            DataSize expectedEstimation)
+    {
+        Session session = TestingSession.testSessionBuilder()
+                .setSystemProperty(FAULT_TOLERANT_EXECUTION_TASK_MEMORY, defaultInitialTaskMemory.toString())
+                .build();
+
+        PartitionMemoryEstimator estimator = estimatorFactory.createPartitionMemoryEstimator(session, getPlanFragment(SINGLE_DISTRIBUTION), THROWING_PLAN_FRAGMENT_LOOKUP);
+
+        for (int i = 0; i < recordedPartitionsCount; i++) {
+            estimator.registerPartitionFinished(new MemoryRequirements(recordedMemoryUsage), recordedMemoryUsage, true, Optional.empty());
+        }
+        assertThat(estimator.getInitialMemoryRequirements())
+                .isEqualTo(new MemoryRequirements(expectedEstimation));
+    }
+
+    private static PlanFragment getPlanFragment(PartitioningHandle partitioningHandle)
+    {
+        return new PlanFragment(
+                new PlanFragmentId("exchange_fragment_id"),
+                new ValuesNode(new PlanNodeId("values"), 1),
+                ImmutableMap.of(),
+                partitioningHandle,
+                Optional.empty(),
+                ImmutableList.of(),
+                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of()),
+                StatsAndCosts.empty(),
+                ImmutableList.of(),
+                ImmutableList.of(),
+                Optional.empty());
+    }
+
+    private MemoryInfo buildWorkerMemoryInfo(DataSize usedMemory)
+    {
+        return new MemoryInfo(
+                4,
+                new MemoryPoolInfo(
+                        DataSize.of(64, GIGABYTE).toBytes(),
+                        usedMemory.toBytes(),
+                        0,
+                        ImmutableMap.of(),
+                        ImmutableMap.of(),
+                        ImmutableMap.of(),
+                        ImmutableMap.of(),
+                        ImmutableMap.of()));
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestHashDistributionSplitAssigner.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestHashDistributionSplitAssigner.java
similarity index 78%
rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestHashDistributionSplitAssigner.java
rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestHashDistributionSplitAssigner.java
index e21eb34ad1cc..1a762aa87cd3 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestHashDistributionSplitAssigner.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestHashDistributionSplitAssigner.java
@@ -11,23 +11,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.SetMultimap;
 import com.google.common.primitives.ImmutableLongArray;
 import io.trino.client.NodeVersion;
-import io.trino.execution.scheduler.HashDistributionSplitAssigner.TaskPartition;
+import io.trino.execution.scheduler.OutputDataSizeEstimate;
+import io.trino.execution.scheduler.faulttolerant.HashDistributionSplitAssigner.TaskPartition;
 import io.trino.metadata.InternalNode;
 import io.trino.metadata.Split;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.util.Arrays;
@@ -46,7 +49,9 @@
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.ImmutableSetMultimap.toImmutableSetMultimap;
-import static io.trino.execution.scheduler.HashDistributionSplitAssigner.createOutputPartitionToTaskPartition;
+import static io.trino.execution.scheduler.faulttolerant.HashDistributionSplitAssigner.createSourcePartitionToTaskPartition;
+import static io.trino.execution.scheduler.faulttolerant.SplitAssigner.SINGLE_SOURCE_PARTITION_ID;
+import static io.trino.execution.scheduler.faulttolerant.TestingConnectorSplit.getSplitId;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_HANDLE;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -73,14 +78,14 @@ public void testEmpty()
                 .withSplitPartitionCount(10)
                 .withTargetPartitionSizeInBytes(1024)
                 .withMergeAllowed(true)
-                .withExpectedTaskCount(1)
+                .withExpectedTaskCount(10)
                 .run();
         testAssigner()
                 .withReplicatedSources(REPLICATED_1)
                 .withSplits(new SplitBatch(REPLICATED_1, ImmutableListMultimap.of(), true))
                 .withSplitPartitionCount(1)
                 .withTargetPartitionSizeInBytes(1024)
-                .withOutputDataSizeEstimates(ImmutableMap.of(REPLICATED_1, new OutputDataSizeEstimate(ImmutableLongArray.builder().add(0).build())))
+                .withSourceDataSizeEstimates(ImmutableMap.of(REPLICATED_1, new OutputDataSizeEstimate(ImmutableLongArray.builder().add(0).build())))
                 .withMergeAllowed(true)
                 .withExpectedTaskCount(1)
                 .run();
@@ -93,7 +98,7 @@ public void testEmpty()
                 .withSplitPartitionCount(10)
                 .withTargetPartitionSizeInBytes(1024)
                 .withMergeAllowed(true)
-                .withExpectedTaskCount(1)
+                .withExpectedTaskCount(10)
                 .run();
         testAssigner()
                 .withPartitionedSources(PARTITIONED_1, PARTITIONED_2)
@@ -106,7 +111,7 @@ public void testEmpty()
                 .withSplitPartitionCount(10)
                 .withTargetPartitionSizeInBytes(1024)
                 .withMergeAllowed(true)
-                .withExpectedTaskCount(1)
+                .withExpectedTaskCount(10)
                 .run();
     }
 
@@ -121,7 +126,7 @@ public void testExplicitPartitionToNodeMap()
                 .withSplitPartitionCount(3)
                 .withPartitionToNodeMap(Optional.of(ImmutableList.of(NODE_1, NODE_2, NODE_3)))
                 .withTargetPartitionSizeInBytes(1000)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
                 .withMergeAllowed(true)
                 .withExpectedTaskCount(3)
                 .run();
@@ -133,9 +138,9 @@ public void testExplicitPartitionToNodeMap()
                 .withSplitPartitionCount(3)
                 .withPartitionToNodeMap(Optional.of(ImmutableList.of(NODE_1, NODE_2, NODE_3)))
                 .withTargetPartitionSizeInBytes(1000)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
                 .withMergeAllowed(true)
-                .withExpectedTaskCount(1)
+                .withExpectedTaskCount(3)
                 .run();
         // no splits
         testAssigner()
@@ -145,9 +150,9 @@ public void testExplicitPartitionToNodeMap()
                 .withSplitPartitionCount(3)
                 .withPartitionToNodeMap(Optional.of(ImmutableList.of(NODE_1, NODE_2, NODE_3)))
                 .withTargetPartitionSizeInBytes(1000)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
                 .withMergeAllowed(true)
-                .withExpectedTaskCount(1)
+                .withExpectedTaskCount(3)
                 .run();
     }
 
@@ -161,7 +166,7 @@ public void testMergeNotAllowed()
                         new SplitBatch(PARTITIONED_1, createSplitMap(createSplit(2, 1), createSplit(3, 2)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(1000)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
                 .withMergeAllowed(false)
                 .withExpectedTaskCount(3)
                 .run();
@@ -172,9 +177,9 @@ public void testMergeNotAllowed()
                         new SplitBatch(PARTITIONED_1, createSplitMap(createSplit(0, 0), createSplit(1, 0)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(1000)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
                 .withMergeAllowed(false)
-                .withExpectedTaskCount(1)
+                .withExpectedTaskCount(3)
                 .run();
         // no splits
         testAssigner()
@@ -183,9 +188,9 @@ public void testMergeNotAllowed()
                         new SplitBatch(PARTITIONED_1, ImmutableListMultimap.of(), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(1000)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
                 .withMergeAllowed(false)
-                .withExpectedTaskCount(1)
+                .withExpectedTaskCount(3)
                 .run();
     }
 
@@ -212,7 +217,7 @@ public void testMissingEstimates()
                 .withPartitionToNodeMap(Optional.of(ImmutableList.of(NODE_1, NODE_2, NODE_3)))
                 .withTargetPartitionSizeInBytes(1000)
                 .withMergeAllowed(true)
-                .withExpectedTaskCount(1)
+                .withExpectedTaskCount(3)
                 .run();
         // no splits
         testAssigner()
@@ -223,7 +228,7 @@ public void testMissingEstimates()
                 .withPartitionToNodeMap(Optional.of(ImmutableList.of(NODE_1, NODE_2, NODE_3)))
                 .withTargetPartitionSizeInBytes(1000)
                 .withMergeAllowed(true)
-                .withExpectedTaskCount(1)
+                .withExpectedTaskCount(3)
                 .run();
     }
 
@@ -237,7 +242,7 @@ public void testHappyPath()
                         new SplitBatch(PARTITIONED_1, createSplitMap(createSplit(2, 1), createSplit(3, 2)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(3)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
                 .withMergeAllowed(true)
                 .withExpectedTaskCount(1)
                 .run();
@@ -251,7 +256,7 @@ public void testHappyPath()
                         new SplitBatch(PARTITIONED_1, createSplitMap(createSplit(6, 1), createSplit(7, 2)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(3)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
                 .withMergeAllowed(true)
                 .withExpectedTaskCount(1)
                 .run();
@@ -265,7 +270,7 @@ public void testHappyPath()
                         new SplitBatch(PARTITIONED_1, createSplitMap(createSplit(6, 1), createSplit(7, 2)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(1)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
                 .withMergeAllowed(true)
                 .withExpectedTaskCount(3)
                 .run();
@@ -279,7 +284,7 @@ public void testHappyPath()
                         new SplitBatch(PARTITIONED_1, createSplitMap(createSplit(6, 1), createSplit(7, 2)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(1)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
                 .withMergeAllowed(true)
                 .withExpectedTaskCount(3)
                 .run();
@@ -294,7 +299,7 @@ public void testHappyPath()
                         new SplitBatch(PARTITIONED_1, createSplitMap(createSplit(6, 1), createSplit(7, 2)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(1)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
                 .withMergeAllowed(true)
                 .withExpectedTaskCount(3)
                 .run();
@@ -310,7 +315,7 @@ public void testHappyPath()
                         new SplitBatch(PARTITIONED_1, createSplitMap(createSplit(6, 1), createSplit(7, 2)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(1)
-                .withOutputDataSizeEstimates(ImmutableMap.of(
+                .withSourceDataSizeEstimates(ImmutableMap.of(
                         PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1)),
                         PARTITIONED_2, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 1))))
                 .withMergeAllowed(true)
@@ -329,10 +334,10 @@ public void testPartitionSplitting()
                         new SplitBatch(PARTITIONED_1, createSplitMap(createSplit(2, 0), createSplit(3, 0)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(3)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(5, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(5, 1, 1))))
                 .withSplittableSources(PARTITIONED_1)
                 .withMergeAllowed(true)
-                .withExpectedTaskCount(2)
+                .withExpectedTaskCount(3)
                 .run();
 
         // largest source is not splittable
@@ -343,9 +348,9 @@ public void testPartitionSplitting()
                         new SplitBatch(PARTITIONED_1, createSplitMap(createSplit(2, 0), createSplit(3, 0)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(3)
-                .withOutputDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(5, 1, 1))))
+                .withSourceDataSizeEstimates(ImmutableMap.of(PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(5, 1, 1))))
                 .withMergeAllowed(true)
-                .withExpectedTaskCount(1)
+                .withExpectedTaskCount(2)
                 .run();
 
         // multiple sources
@@ -357,7 +362,7 @@ public void testPartitionSplitting()
                         new SplitBatch(PARTITIONED_2, createSplitMap(createSplit(4, 0), createSplit(5, 1)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(30)
-                .withOutputDataSizeEstimates(ImmutableMap.of(
+                .withSourceDataSizeEstimates(ImmutableMap.of(
                         PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(50, 1, 1)),
                         PARTITIONED_2, new OutputDataSizeEstimate(ImmutableLongArray.of(2, 1, 1))))
                 .withSplittableSources(PARTITIONED_1)
@@ -372,7 +377,7 @@ PARTITIONED_2, new OutputDataSizeEstimate(ImmutableLongArray.of(2, 1, 1))))
                         new SplitBatch(PARTITIONED_2, createSplitMap(createSplit(4, 0), createSplit(5, 1)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(30)
-                .withOutputDataSizeEstimates(ImmutableMap.of(
+                .withSourceDataSizeEstimates(ImmutableMap.of(
                         PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(50, 1, 1)),
                         PARTITIONED_2, new OutputDataSizeEstimate(ImmutableLongArray.of(2, 1, 1))))
                 .withSplittableSources(PARTITIONED_1, PARTITIONED_2)
@@ -387,12 +392,12 @@ PARTITIONED_2, new OutputDataSizeEstimate(ImmutableLongArray.of(2, 1, 1))))
                         new SplitBatch(PARTITIONED_2, createSplitMap(createSplit(4, 0), createSplit(5, 0)), true))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(30)
-                .withOutputDataSizeEstimates(ImmutableMap.of(
+                .withSourceDataSizeEstimates(ImmutableMap.of(
                         PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(50, 1, 1)),
                         PARTITIONED_2, new OutputDataSizeEstimate(ImmutableLongArray.of(2, 1, 1))))
                 .withSplittableSources(PARTITIONED_2)
                 .withMergeAllowed(true)
-                .withExpectedTaskCount(1)
+                .withExpectedTaskCount(2)
                 .run();
 
         // targetPartitionSizeInBytes re-adjustment based on taskTargetMaxCount
@@ -405,7 +410,7 @@ PARTITIONED_2, new OutputDataSizeEstimate(ImmutableLongArray.of(2, 1, 1))))
                 .withSplitPartitionCount(3)
                 .withTargetPartitionSizeInBytes(30)
                 .withTaskTargetMaxCount(10)
-                .withOutputDataSizeEstimates(ImmutableMap.of(
+                .withSourceDataSizeEstimates(ImmutableMap.of(
                         PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1000, 1, 1)),
                         PARTITIONED_2, new OutputDataSizeEstimate(ImmutableLongArray.of(2, 1, 1))))
                 .withSplittableSources(PARTITIONED_1, PARTITIONED_2)
@@ -420,7 +425,7 @@ public void testCreateOutputPartitionToTaskPartition()
         testPartitionMapping()
                 .withSplitPartitionCount(3)
                 .withPartitionedSources(PARTITIONED_1)
-                .withOutputDataSizeEstimates(ImmutableMap.of(
+                .withSourceDataSizeEstimates(ImmutableMap.of(
                         PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(50, 1, 1))))
                 .withTargetPartitionSizeInBytes(25)
                 .withSplittableSources(PARTITIONED_1)
@@ -432,7 +437,7 @@ PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(50, 1, 1))))
         testPartitionMapping()
                 .withSplitPartitionCount(3)
                 .withPartitionedSources(PARTITIONED_1)
-                .withOutputDataSizeEstimates(ImmutableMap.of(
+                .withSourceDataSizeEstimates(ImmutableMap.of(
                         PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(50, 1, 1))))
                 .withTargetPartitionSizeInBytes(25)
                 .withMergeAllowed(true)
@@ -443,7 +448,7 @@ PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(50, 1, 1))))
         testPartitionMapping()
                 .withSplitPartitionCount(3)
                 .withPartitionedSources(PARTITIONED_1)
-                .withOutputDataSizeEstimates(ImmutableMap.of(
+                .withSourceDataSizeEstimates(ImmutableMap.of(
                         PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(50, 1, 1))))
                 .withTargetPartitionSizeInBytes(25)
                 .withMergeAllowed(false)
@@ -455,7 +460,7 @@ PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(50, 1, 1))))
         testPartitionMapping()
                 .withSplitPartitionCount(3)
                 .withPartitionedSources(PARTITIONED_1)
-                .withOutputDataSizeEstimates(ImmutableMap.of(
+                .withSourceDataSizeEstimates(ImmutableMap.of(
                         PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(50, 1, 1))))
                 .withTargetPartitionSizeInBytes(25)
                 .withMergeAllowed(false)
@@ -468,7 +473,7 @@ PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(50, 1, 1))))
         testPartitionMapping()
                 .withSplitPartitionCount(4)
                 .withPartitionedSources(PARTITIONED_1)
-                .withOutputDataSizeEstimates(ImmutableMap.of(
+                .withSourceDataSizeEstimates(ImmutableMap.of(
                         PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(0, 0, 0, 60))))
                 .withTargetPartitionSizeInBytes(25)
                 .withMergeAllowed(false)
@@ -481,6 +486,93 @@ PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(0, 0, 0, 60))))
                 .run();
     }
 
+    @Test
+    public void testCreateOutputPartitionToTaskPartitionWithMinTaskCount()
+    {
+        // without enforcing minTaskCount we should get only 2 tasks
+        testPartitionMapping()
+                .withSplitPartitionCount(8)
+                .withPartitionedSources(PARTITIONED_1)
+                .withSourceDataSizeEstimates(ImmutableMap.of(
+                        PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(10, 10, 10, 10, 10, 10, 10, 10))))
+                .withTargetPartitionSizeInBytes(50)
+                .withMergeAllowed(true)
+                .withExpectedMappings(
+                        new PartitionMapping(ImmutableSet.of(0, 1, 2, 3, 4), 1),
+                        new PartitionMapping(ImmutableSet.of(5, 6, 7), 1))
+                .run();
+
+        // enforce at least 4 tasks
+        testPartitionMapping()
+                .withSplitPartitionCount(8)
+                .withPartitionedSources(PARTITIONED_1)
+                .withSourceDataSizeEstimates(ImmutableMap.of(
+                        PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(10, 10, 10, 10, 10, 10, 10, 10))))
+                .withTargetPartitionSizeInBytes(50)
+                .withMergeAllowed(true)
+                .withTargetMinTaskCount(4)
+                .withExpectedMappings(
+                        new PartitionMapping(ImmutableSet.of(0, 1), 1),
+                        new PartitionMapping(ImmutableSet.of(2, 3), 1),
+                        new PartitionMapping(ImmutableSet.of(4, 5), 1),
+                        new PartitionMapping(ImmutableSet.of(6, 7), 1))
+                .run();
+
+        // skewed partitions sizes - no minTaskCount enforcement
+        testPartitionMapping()
+                .withSplitPartitionCount(8)
+                .withPartitionedSources(PARTITIONED_1)
+                .withSourceDataSizeEstimates(ImmutableMap.of(
+                        PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 10, 1, 1, 1, 1, 1))))
+                .withTargetPartitionSizeInBytes(50)
+                .withMergeAllowed(true)
+                .withExpectedMappings(
+                        new PartitionMapping(ImmutableSet.of(0, 1, 2, 3, 4, 5, 6, 7), 1))
+                .run();
+
+        // skewed partitions sizes - request at least 4 tasks
+        // with skew it is expected that we are getting 3 as minTaskCount is only used to compute target partitionSize
+        testPartitionMapping()
+                .withSplitPartitionCount(8)
+                .withPartitionedSources(PARTITIONED_1)
+                .withSourceDataSizeEstimates(ImmutableMap.of(
+                        PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(1, 1, 10, 1, 1, 1, 1, 1))))
+                .withTargetPartitionSizeInBytes(50)
+                .withMergeAllowed(true)
+                .withTargetMinTaskCount(4)
+                .withExpectedMappings(
+                        new PartitionMapping(ImmutableSet.of(0, 1, 3, 4), 1),
+                        new PartitionMapping(ImmutableSet.of(2), 1),
+                        new PartitionMapping(ImmutableSet.of(5, 6, 7), 1))
+                .run();
+
+        // 2 partitions merged
+        testPartitionMapping()
+                .withSplitPartitionCount(2)
+                .withPartitionedSources(PARTITIONED_1)
+                .withSourceDataSizeEstimates(ImmutableMap.of(
+                        PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(10, 10))))
+                .withTargetPartitionSizeInBytes(50)
+                .withMergeAllowed(true)
+                .withExpectedMappings(
+                        new PartitionMapping(ImmutableSet.of(0, 1), 1))
+                .run();
+
+        // request 4 tasks when we only have 2 partitions only gets us 2 tasks.
+        testPartitionMapping()
+                .withSplitPartitionCount(2)
+                .withPartitionedSources(PARTITIONED_1)
+                .withSourceDataSizeEstimates(ImmutableMap.of(
+                        PARTITIONED_1, new OutputDataSizeEstimate(ImmutableLongArray.of(10, 10))))
+                .withTargetPartitionSizeInBytes(50)
+                .withMergeAllowed(true)
+                .withTargetMinTaskCount(4)
+                .withExpectedMappings(
+                        new PartitionMapping(ImmutableSet.of(0), 1),
+                        new PartitionMapping(ImmutableSet.of(1), 1))
+                .run();
+    }
+
     private static ListMultimap<Integer, Split> createSplitMap(Split... splits)
     {
         return Arrays.stream(splits)
@@ -543,8 +635,9 @@ private static class AssignerTester
         private int splitPartitionCount;
         private Optional<List<InternalNode>> partitionToNodeMap = Optional.empty();
         private long targetPartitionSizeInBytes;
+        private int taskTargetMinCount;
         private int taskTargetMaxCount = Integer.MAX_VALUE;
-        private Map<PlanNodeId, OutputDataSizeEstimate> outputDataSizeEstimates = ImmutableMap.of();
+        private Map<PlanNodeId, OutputDataSizeEstimate> sourceDataSizeEstimates = ImmutableMap.of();
         private Set<PlanNodeId> splittableSources = ImmutableSet.of();
         private boolean mergeAllowed;
         private int expectedTaskCount;
@@ -591,9 +684,9 @@ public AssignerTester withTaskTargetMaxCount(int taskTargetMaxCount)
             return this;
         }
 
-        public AssignerTester withOutputDataSizeEstimates(Map<PlanNodeId, OutputDataSizeEstimate> outputDataSizeEstimates)
+        public AssignerTester withSourceDataSizeEstimates(Map<PlanNodeId, OutputDataSizeEstimate> sourceDataSizeEstimates)
         {
-            this.outputDataSizeEstimates = outputDataSizeEstimates;
+            this.sourceDataSizeEstimates = sourceDataSizeEstimates;
             return this;
         }
 
@@ -618,11 +711,12 @@ public AssignerTester withExpectedTaskCount(int expectedTaskCount)
         public void run()
         {
             FaultTolerantPartitioningScheme partitioningScheme = createPartitioningScheme(splitPartitionCount, partitionToNodeMap);
-            Map<Integer, TaskPartition> outputPartitionToTaskPartition = createOutputPartitionToTaskPartition(
+            Map<Integer, TaskPartition> sourcePartitionToTaskPartition = createSourcePartitionToTaskPartition(
                     partitioningScheme,
                     partitionedSources,
-                    outputDataSizeEstimates,
+                    sourceDataSizeEstimates,
                     targetPartitionSizeInBytes,
+                    taskTargetMinCount,
                     taskTargetMaxCount,
                     splittableSources::contains,
                     mergeAllowed);
@@ -631,19 +725,19 @@ public void run()
                     partitionedSources,
                     replicatedSources,
                     partitioningScheme,
-                    outputPartitionToTaskPartition);
+                    sourcePartitionToTaskPartition);
             SplitAssignerTester tester = new SplitAssignerTester();
             Map<Integer, ListMultimap<PlanNodeId, Integer>> partitionedSplitIds = new HashMap<>();
-            Set<Integer> replicatedSplitIds = new HashSet<>();
+            Multimap<PlanNodeId, Integer> replicatedSplitIds = HashMultimap.create();
             for (SplitBatch batch : splits) {
                 tester.update(assigner.assign(batch.getPlanNodeId(), batch.getSplits(), batch.isNoMoreSplits()));
                 boolean replicated = replicatedSources.contains(batch.getPlanNodeId());
-                tester.checkContainsSplits(batch.getPlanNodeId(), batch.getSplits().values(), replicated);
+                tester.checkContainsSplits(batch.getPlanNodeId(), batch.getSplits(), replicated);
                 for (Map.Entry<Integer, Split> entry : batch.getSplits().entries()) {
-                    int splitId = TestingConnectorSplit.getSplitId(entry.getValue());
+                    int splitId = getSplitId(entry.getValue());
                     if (replicated) {
-                        assertThat(replicatedSplitIds).doesNotContain(splitId);
-                        replicatedSplitIds.add(splitId);
+                        assertThat(replicatedSplitIds.containsValue(splitId)).isFalse();
+                        replicatedSplitIds.put(batch.getPlanNodeId(), splitId);
                     }
                     else {
                         partitionedSplitIds.computeIfAbsent(entry.getKey(), key -> ArrayListMultimap.create()).put(batch.getPlanNodeId(), splitId);
@@ -661,33 +755,39 @@ public void run()
                 NodeRequirements nodeRequirements = taskDescriptor.getNodeRequirements();
                 assertEquals(nodeRequirements.getCatalogHandle(), Optional.of(TEST_CATALOG_HANDLE));
                 partitionToNodeMap.ifPresent(partitionToNode -> {
-                    if (!taskDescriptor.getSplits().isEmpty()) {
+                    if (!taskDescriptor.getSplits().getSplitsFlat().isEmpty()) {
                         InternalNode node = partitionToNode.get(partitionId);
                         assertThat(nodeRequirements.getAddresses()).containsExactly(node.getHostAndPort());
                     }
                 });
-                Set<Integer> taskDescriptorSplitIds = taskDescriptor.getSplits().values().stream()
-                        .map(TestingConnectorSplit::getSplitId)
-                        .collect(toImmutableSet());
-                assertThat(taskDescriptorSplitIds).containsAll(replicatedSplitIds);
+                Set<Integer> taskDescriptorSplitIds = new HashSet<>();
+                replicatedSplitIds.keySet().forEach(planNodeId -> {
+                    // all replicated splits should be assigned to single source partition in task descriptor
+                    taskDescriptor.getSplits().getSplits(planNodeId).get(SINGLE_SOURCE_PARTITION_ID).stream()
+                            .map(TestingConnectorSplit::getSplitId)
+                            .forEach(taskDescriptorSplitIds::add);
+                });
+                assertThat(taskDescriptorSplitIds).containsAll(replicatedSplitIds.values());
             }
 
             // validate partitioned splits
             partitionedSplitIds.forEach((partitionId, sourceSplits) -> {
                 sourceSplits.forEach((source, splitId) -> {
-                    List<TaskDescriptor> descriptors = outputPartitionToTaskPartition.get(partitionId).getSubPartitions().stream()
+                    List<TaskDescriptor> descriptors = sourcePartitionToTaskPartition.get(partitionId).getSubPartitions().stream()
                             .filter(HashDistributionSplitAssigner.SubPartition::isIdAssigned)
                             .map(HashDistributionSplitAssigner.SubPartition::getId)
                             .map(taskDescriptors::get)
                             .collect(toImmutableList());
                     for (TaskDescriptor descriptor : descriptors) {
-                        Set<Integer> taskDescriptorSplitIds = descriptor.getSplits().values().stream()
-                                .map(TestingConnectorSplit::getSplitId)
-                                .collect(toImmutableSet());
-                        if (taskDescriptorSplitIds.contains(splitId) && splittableSources.contains(source)) {
+                        Multimap<Integer, Integer> taskDescriptorSplitIds = descriptor.getSplits().getSplits(source).entries().stream()
+                                .collect(toImmutableListMultimap(
+                                        Map.Entry::getKey,
+                                        entry -> getSplitId(entry.getValue())));
+
+                        if (taskDescriptorSplitIds.get(partitionId).contains(splitId) && splittableSources.contains(source)) {
                             return;
                         }
-                        if (!taskDescriptorSplitIds.contains(splitId) && !splittableSources.contains(source)) {
+                        if (!taskDescriptorSplitIds.get(partitionId).contains(splitId) && !splittableSources.contains(source)) {
                             fail("expected split not found: ." + splitId);
                         }
                     }
@@ -710,7 +810,8 @@ private static class PartitionMappingTester
         private int splitPartitionCount;
         private Optional<List<InternalNode>> partitionToNodeMap = Optional.empty();
         private long targetPartitionSizeInBytes;
-        private Map<PlanNodeId, OutputDataSizeEstimate> outputDataSizeEstimates = ImmutableMap.of();
+        private int targetMinTaskCount;
+        private Map<PlanNodeId, OutputDataSizeEstimate> sourceDataSizeEstimates = ImmutableMap.of();
         private Set<PlanNodeId> splittableSources = ImmutableSet.of();
         private boolean mergeAllowed;
         private Set<PartitionMapping> expectedMappings = ImmutableSet.of();
@@ -739,9 +840,15 @@ public PartitionMappingTester withTargetPartitionSizeInBytes(long targetPartitio
             return this;
         }
 
-        public PartitionMappingTester withOutputDataSizeEstimates(Map<PlanNodeId, OutputDataSizeEstimate> outputDataSizeEstimates)
+        public PartitionMappingTester withTargetMinTaskCount(int targetMinTaskCount)
+        {
+            this.targetMinTaskCount = targetMinTaskCount;
+            return this;
+        }
+
+        public PartitionMappingTester withSourceDataSizeEstimates(Map<PlanNodeId, OutputDataSizeEstimate> sourceDataSizeEstimates)
         {
-            this.outputDataSizeEstimates = outputDataSizeEstimates;
+            this.sourceDataSizeEstimates = sourceDataSizeEstimates;
             return this;
         }
 
@@ -766,11 +873,12 @@ public PartitionMappingTester withExpectedMappings(PartitionMapping... mappings)
         public void run()
         {
             FaultTolerantPartitioningScheme partitioningScheme = createPartitioningScheme(splitPartitionCount, partitionToNodeMap);
-            Map<Integer, TaskPartition> actual = createOutputPartitionToTaskPartition(
+            Map<Integer, TaskPartition> actual = createSourcePartitionToTaskPartition(
                     partitioningScheme,
                     partitionedSources,
-                    outputDataSizeEstimates,
+                    sourceDataSizeEstimates,
                     targetPartitionSizeInBytes,
+                    targetMinTaskCount,
                     Integer.MAX_VALUE,
                     splittableSources::contains,
                     mergeAllowed);
@@ -778,9 +886,9 @@ public void run()
             assertEquals(actualGroups, expectedMappings);
         }
 
-        private static Set<PartitionMapping> extractMappings(Map<Integer, TaskPartition> outputPartitionToTaskPartition)
+        private static Set<PartitionMapping> extractMappings(Map<Integer, TaskPartition> sourcePartitionToTaskPartition)
         {
-            SetMultimap<TaskPartition, Integer> grouped = outputPartitionToTaskPartition.entrySet().stream()
+            SetMultimap<TaskPartition, Integer> grouped = sourcePartitionToTaskPartition.entrySet().stream()
                     .collect(toImmutableSetMultimap(Map.Entry::getValue, Map.Entry::getKey));
             return Multimaps.asMap(grouped).entrySet().stream()
                     .map(entry -> new PartitionMapping(entry.getValue(), entry.getKey().getSubPartitions().size()))
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestNoMemoryAwarePartitionMemoryEstimator.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestNoMemoryAwarePartitionMemoryEstimator.java
new file mode 100644
index 000000000000..122c0101a8e7
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestNoMemoryAwarePartitionMemoryEstimator.java
@@ -0,0 +1,259 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
+import io.airlift.units.DataSize;
+import io.trino.Session;
+import io.trino.connector.informationschema.InformationSchemaTable;
+import io.trino.connector.informationschema.InformationSchemaTableHandle;
+import io.trino.connector.system.GlobalSystemConnector;
+import io.trino.connector.system.SystemTableHandle;
+import io.trino.cost.StatsAndCosts;
+import io.trino.metadata.TableHandle;
+import io.trino.operator.RetryPolicy;
+import io.trino.plugin.tpch.TpchTableHandle;
+import io.trino.spi.ErrorCode;
+import io.trino.spi.StandardErrorCode;
+import io.trino.spi.connector.ConnectorTableHandle;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.sql.planner.Partitioning;
+import io.trino.sql.planner.PartitioningScheme;
+import io.trino.sql.planner.PlanFragment;
+import io.trino.sql.planner.plan.ExchangeNode;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import io.trino.sql.planner.plan.PlanNodeId;
+import io.trino.sql.planner.plan.RemoteSourceNode;
+import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.testing.TestingSession;
+import io.trino.testing.TestingTransactionHandle;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.airlift.units.DataSize.Unit.BYTE;
+import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.SOURCE_DISTRIBUTION;
+import static io.trino.testing.TestingHandles.TEST_CATALOG_HANDLE;
+import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestNoMemoryAwarePartitionMemoryEstimator
+{
+    @Test
+    public void testInformationSchemaScan()
+    {
+        PlanFragment planFragment = tableScanPlanFragment("ts", new InformationSchemaTableHandle(TEST_CATALOG_NAME, InformationSchemaTable.VIEWS, ImmutableSet.of(), OptionalLong.empty()));
+
+        PartitionMemoryEstimator estimator = createEstimator(planFragment);
+        assertThat(estimator).isInstanceOf(NoMemoryPartitionMemoryEstimator.class);
+
+        // test if NoMemoryPartitionMemoryEstimator returns 0 for initial and retry estimates
+        PartitionMemoryEstimator.MemoryRequirements noMemoryRequirements = new PartitionMemoryEstimator.MemoryRequirements(DataSize.ofBytes(0));
+        assertThat(estimator.getInitialMemoryRequirements()).isEqualTo(noMemoryRequirements);
+        assertThat(estimator.getNextRetryMemoryRequirements(
+                new PartitionMemoryEstimator.MemoryRequirements(DataSize.ofBytes(1)),
+                DataSize.of(5, BYTE),
+                StandardErrorCode.NOT_SUPPORTED.toErrorCode()))
+                .isEqualTo(noMemoryRequirements);
+        assertThat(estimator.getNextRetryMemoryRequirements(
+                new PartitionMemoryEstimator.MemoryRequirements(DataSize.ofBytes(1)),
+                DataSize.of(5, BYTE),
+                StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES.toErrorCode()))
+                .isEqualTo(noMemoryRequirements);
+    }
+
+    @Test
+    public void testTpchTableScan()
+    {
+        PlanFragment planFragment = tableScanPlanFragment("ts", new TpchTableHandle(TEST_CATALOG_NAME, "nation", 1.0));
+        PartitionMemoryEstimator estimator = createEstimator(planFragment);
+        assertThat(estimator).isInstanceOf(MockDelegatePatitionMemoryEstimator.class);
+    }
+
+    @Test
+    public void testRemoteFromInformationSchemaScan()
+    {
+        PlanFragment tableScanPlanFragment = tableScanPlanFragment("ts", new InformationSchemaTableHandle(TEST_CATALOG_NAME, InformationSchemaTable.VIEWS, ImmutableSet.of(), OptionalLong.empty()));
+        PlanFragment parentFragment = getParentFragment(tableScanPlanFragment);
+
+        PartitionMemoryEstimator estimator = createEstimator(parentFragment, tableScanPlanFragment);
+        assertThat(estimator).isInstanceOf(NoMemoryPartitionMemoryEstimator.class);
+    }
+
+    @Test
+    public void testRemoteFromTpchScan()
+    {
+        PlanFragment tableScanPlanFragment = tableScanPlanFragment("ts", new TpchTableHandle(TEST_CATALOG_NAME, "nation", 1.0));
+        PlanFragment parentFragment = getParentFragment(tableScanPlanFragment);
+
+        PartitionMemoryEstimator estimator = createEstimator(parentFragment, tableScanPlanFragment);
+        assertThat(estimator).isInstanceOf(MockDelegatePatitionMemoryEstimator.class);
+    }
+
+    @Test
+    public void testRemoteFromTwoInformationSchemaScans()
+    {
+        PlanFragment tableScanPlanFragment1 = tableScanPlanFragment("ts1", new InformationSchemaTableHandle(TEST_CATALOG_NAME, InformationSchemaTable.VIEWS, ImmutableSet.of(), OptionalLong.empty()));
+        PlanFragment tableScanPlanFragment2 = tableScanPlanFragment("ts2", new InformationSchemaTableHandle(TEST_CATALOG_NAME, InformationSchemaTable.COLUMNS, ImmutableSet.of(), OptionalLong.empty()));
+        PlanFragment parentFragment = getParentFragment(tableScanPlanFragment1, tableScanPlanFragment2);
+
+        PartitionMemoryEstimator estimator = createEstimator(parentFragment, tableScanPlanFragment1, tableScanPlanFragment2);
+        assertThat(estimator).isInstanceOf(NoMemoryPartitionMemoryEstimator.class);
+    }
+
+    @Test
+    public void testRemoteFromInformationSchemaAndTpchTableScans()
+    {
+        PlanFragment tableScanPlanFragment1 = tableScanPlanFragment("ts1", new InformationSchemaTableHandle(TEST_CATALOG_NAME, InformationSchemaTable.VIEWS, ImmutableSet.of(), OptionalLong.empty()));
+        PlanFragment tableScanPlanFragment2 = tableScanPlanFragment("ts", new TpchTableHandle(TEST_CATALOG_NAME, "nation", 1.0));
+        PlanFragment parentFragment = getParentFragment(tableScanPlanFragment1, tableScanPlanFragment2);
+
+        PartitionMemoryEstimator estimator = createEstimator(parentFragment, tableScanPlanFragment1, tableScanPlanFragment2);
+        assertThat(estimator).isInstanceOf(MockDelegatePatitionMemoryEstimator.class);
+    }
+
+    @Test
+    public void testSystemJdbcTableScan()
+    {
+        PartitionMemoryEstimator estimator = createEstimator(tableScanPlanFragment(
+                "ts",
+                new TableHandle(
+                        GlobalSystemConnector.CATALOG_HANDLE,
+                        new SystemTableHandle("jdbc", "tables", TupleDomain.all()),
+                        TestingTransactionHandle.create())));
+        assertThat(estimator).isInstanceOf(NoMemoryPartitionMemoryEstimator.class);
+        PartitionMemoryEstimator.MemoryRequirements noMemoryRequirements = new PartitionMemoryEstimator.MemoryRequirements(DataSize.ofBytes(0));
+        assertThat(estimator.getInitialMemoryRequirements()).isEqualTo(noMemoryRequirements);
+    }
+
+    @Test
+    public void testSystemMetadataTableScan()
+    {
+        PartitionMemoryEstimator estimator = createEstimator(tableScanPlanFragment(
+                "ts",
+                new TableHandle(
+                        GlobalSystemConnector.CATALOG_HANDLE,
+                        new SystemTableHandle("metadata", "blah", TupleDomain.all()),
+                        TestingTransactionHandle.create())));
+        assertThat(estimator).isInstanceOf(NoMemoryPartitionMemoryEstimator.class);
+        PartitionMemoryEstimator.MemoryRequirements noMemoryRequirements = new PartitionMemoryEstimator.MemoryRequirements(DataSize.ofBytes(0));
+        assertThat(estimator.getInitialMemoryRequirements()).isEqualTo(noMemoryRequirements);
+    }
+
+    private static PlanFragment getParentFragment(PlanFragment... childFragments)
+    {
+        ImmutableList<PlanFragmentId> childFragmentIds = Stream.of(childFragments)
+                .map(PlanFragment::getId)
+                .collect(toImmutableList());
+        return new PlanFragment(
+                new PlanFragmentId("parent"),
+                new RemoteSourceNode(new PlanNodeId("rsn"), childFragmentIds, ImmutableList.of(), Optional.empty(), ExchangeNode.Type.GATHER, RetryPolicy.TASK),
+                ImmutableMap.of(),
+                SOURCE_DISTRIBUTION,
+                Optional.empty(),
+                ImmutableList.of(),
+                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of()),
+                StatsAndCosts.empty(),
+                ImmutableList.of(),
+                ImmutableList.of(),
+                Optional.empty());
+    }
+
+    private PartitionMemoryEstimator createEstimator(PlanFragment planFragment, PlanFragment... sourceFragments)
+    {
+        NoMemoryAwarePartitionMemoryEstimator.Factory noMemoryAwareEstimatorFactory = new NoMemoryAwarePartitionMemoryEstimator.Factory(new MockDelgatePartitionMemoryEstimatorFactory());
+        Session session = TestingSession.testSessionBuilder().build();
+
+        Function<PlanFragmentId, PlanFragment> sourceFragmentsLookup = Maps.uniqueIndex(Arrays.asList(sourceFragments), PlanFragment::getId)::get;
+        return noMemoryAwareEstimatorFactory.createPartitionMemoryEstimator(
+                session,
+                planFragment,
+                sourceFragmentsLookup);
+    }
+
+    private static PlanFragment tableScanPlanFragment(String fragmentId, ConnectorTableHandle tableHandle)
+    {
+        return tableScanPlanFragment(fragmentId, new TableHandle(
+                TEST_CATALOG_HANDLE,
+                tableHandle,
+                TestingTransactionHandle.create()));
+    }
+
+    private static PlanFragment tableScanPlanFragment(String fragmentId, TableHandle tableHandle)
+    {
+        TableScanNode informationSchemaViewsTableScan = new TableScanNode(
+                new PlanNodeId("tableScan"),
+                tableHandle,
+                ImmutableList.of(),
+                ImmutableMap.of(),
+                TupleDomain.all(),
+                Optional.empty(),
+                false,
+                Optional.empty());
+
+        return new PlanFragment(
+                new PlanFragmentId(fragmentId),
+                informationSchemaViewsTableScan,
+                ImmutableMap.of(),
+                SOURCE_DISTRIBUTION,
+                Optional.empty(),
+                ImmutableList.of(),
+                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of()),
+                StatsAndCosts.empty(),
+                ImmutableList.of(),
+                ImmutableList.of(),
+                Optional.empty());
+    }
+
+    private static class MockDelgatePartitionMemoryEstimatorFactory
+            implements PartitionMemoryEstimatorFactory
+    {
+        @Override
+        public PartitionMemoryEstimator createPartitionMemoryEstimator(Session session, PlanFragment planFragment, Function<PlanFragmentId, PlanFragment> sourceFragmentLookup)
+        {
+            return new MockDelegatePatitionMemoryEstimator();
+        }
+    }
+
+    private static class MockDelegatePatitionMemoryEstimator
+            implements PartitionMemoryEstimator
+    {
+        @Override
+        public MemoryRequirements getInitialMemoryRequirements()
+        {
+            throw new RuntimeException("not implemented");
+        }
+
+        @Override
+        public MemoryRequirements getNextRetryMemoryRequirements(MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, ErrorCode errorCode)
+        {
+            throw new RuntimeException("not implemented");
+        }
+
+        @Override
+        public void registerPartitionFinished(MemoryRequirements previousMemoryRequirements, DataSize peakMemoryUsage, boolean success, Optional<ErrorCode> errorCode)
+        {
+            throw new RuntimeException("not implemented");
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSingleDistributionSplitAssigner.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestSingleDistributionSplitAssigner.java
similarity index 85%
rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestSingleDistributionSplitAssigner.java
rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestSingleDistributionSplitAssigner.java
index 2a8de495cc8e..4da174434ecb 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSingleDistributionSplitAssigner.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestSingleDistributionSplitAssigner.java
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableSet;
 import io.trino.metadata.Split;
 import io.trino.spi.HostAddress;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -43,10 +43,10 @@ public void testNoSources()
 
         tester.update(splitAssigner.finish());
 
-        assertEquals(tester.getPartitionCount(), 1);
+        assertEquals(tester.getTaskPartitionCount(), 1);
         assertEquals(tester.getNodeRequirements(0), new NodeRequirements(Optional.empty(), hostRequirement));
         assertTrue(tester.isSealed(0));
-        assertTrue(tester.isNoMorePartitions());
+        assertTrue(tester.isNoMoreTaskPartitions());
     }
 
     @Test
@@ -61,12 +61,12 @@ public void testEmptySource()
         tester.update(splitAssigner.assign(PLAN_NODE_1, ImmutableListMultimap.of(), true));
         tester.update(splitAssigner.finish());
 
-        assertEquals(tester.getPartitionCount(), 1);
+        assertEquals(tester.getTaskPartitionCount(), 1);
         assertEquals(tester.getNodeRequirements(0), new NodeRequirements(Optional.empty(), hostRequirement));
         assertThat(tester.getSplitIds(0, PLAN_NODE_1)).isEmpty();
         assertTrue(tester.isNoMoreSplits(0, PLAN_NODE_1));
         assertTrue(tester.isSealed(0));
-        assertTrue(tester.isNoMorePartitions());
+        assertTrue(tester.isNoMoreTaskPartitions());
     }
 
     @Test
@@ -77,18 +77,18 @@ public void testSingleSource()
                 ImmutableSet.of(PLAN_NODE_1));
         SplitAssignerTester tester = new SplitAssignerTester();
 
-        assertEquals(tester.getPartitionCount(), 0);
-        assertFalse(tester.isNoMorePartitions());
+        assertEquals(tester.getTaskPartitionCount(), 0);
+        assertFalse(tester.isNoMoreTaskPartitions());
 
         tester.update(splitAssigner.assign(PLAN_NODE_1, ImmutableListMultimap.of(0, createSplit(1)), false));
         tester.update(splitAssigner.finish());
-        assertEquals(tester.getPartitionCount(), 1);
+        assertEquals(tester.getTaskPartitionCount(), 1);
         assertThat(tester.getSplitIds(0, PLAN_NODE_1)).containsExactly(1);
-        assertTrue(tester.isNoMorePartitions());
+        assertTrue(tester.isNoMoreTaskPartitions());
 
         tester.update(splitAssigner.assign(PLAN_NODE_1, ImmutableListMultimap.of(0, createSplit(2), 1, createSplit(3)), false));
         tester.update(splitAssigner.finish());
-        assertEquals(tester.getPartitionCount(), 1);
+        assertEquals(tester.getTaskPartitionCount(), 1);
         assertThat(tester.getSplitIds(0, PLAN_NODE_1)).containsExactly(1, 2, 3);
 
         assertFalse(tester.isNoMoreSplits(0, PLAN_NODE_1));
@@ -107,31 +107,31 @@ public void testMultipleSources()
                 ImmutableSet.of(PLAN_NODE_1, PLAN_NODE_2));
         SplitAssignerTester tester = new SplitAssignerTester();
 
-        assertEquals(tester.getPartitionCount(), 0);
-        assertFalse(tester.isNoMorePartitions());
+        assertEquals(tester.getTaskPartitionCount(), 0);
+        assertFalse(tester.isNoMoreTaskPartitions());
 
         tester.update(splitAssigner.assign(PLAN_NODE_1, ImmutableListMultimap.of(0, createSplit(1)), false));
         tester.update(splitAssigner.finish());
-        assertEquals(tester.getPartitionCount(), 1);
-        assertThat(tester.getSplitIds(0, PLAN_NODE_1)).containsExactly(1);
-        assertTrue(tester.isNoMorePartitions());
+        assertEquals(tester.getTaskPartitionCount(), 1);
+        assertThat(tester.getSplitIds(0, PLAN_NODE_1)).containsExactlyInAnyOrder(1);
+        assertTrue(tester.isNoMoreTaskPartitions());
 
         tester.update(splitAssigner.assign(PLAN_NODE_2, ImmutableListMultimap.of(0, createSplit(2), 1, createSplit(3)), false));
         tester.update(splitAssigner.finish());
-        assertEquals(tester.getPartitionCount(), 1);
-        assertThat(tester.getSplitIds(0, PLAN_NODE_2)).containsExactly(2, 3);
+        assertEquals(tester.getTaskPartitionCount(), 1);
+        assertThat(tester.getSplitIds(0, PLAN_NODE_2)).containsExactlyInAnyOrder(2, 3);
 
         assertFalse(tester.isNoMoreSplits(0, PLAN_NODE_1));
         tester.update(splitAssigner.assign(PLAN_NODE_1, ImmutableListMultimap.of(2, createSplit(4)), true));
         tester.update(splitAssigner.finish());
-        assertThat(tester.getSplitIds(0, PLAN_NODE_1)).containsExactly(1, 4);
+        assertThat(tester.getSplitIds(0, PLAN_NODE_1)).containsExactlyInAnyOrder(1, 4);
         assertTrue(tester.isNoMoreSplits(0, PLAN_NODE_1));
 
         assertFalse(tester.isNoMoreSplits(0, PLAN_NODE_2));
         assertFalse(tester.isSealed(0));
         tester.update(splitAssigner.assign(PLAN_NODE_2, ImmutableListMultimap.of(3, createSplit(5)), true));
         tester.update(splitAssigner.finish());
-        assertThat(tester.getSplitIds(0, PLAN_NODE_2)).containsExactly(2, 3, 5);
+        assertThat(tester.getSplitIds(0, PLAN_NODE_2)).containsExactlyInAnyOrder(2, 3, 5);
         assertTrue(tester.isNoMoreSplits(0, PLAN_NODE_2));
         assertTrue(tester.isSealed(0));
     }
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestSplitsMapping.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestSplitsMapping.java
new file mode 100644
index 000000000000..0c761703140d
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestSplitsMapping.java
@@ -0,0 +1,129 @@
+/*
+ * Licensed 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 io.trino.execution.scheduler.faulttolerant;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.ListMultimap;
+import io.trino.metadata.Split;
+import io.trino.sql.planner.plan.PlanNodeId;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalInt;
+
+import static io.trino.testing.TestingHandles.TEST_CATALOG_HANDLE;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.guava.api.Assertions.assertThat;
+
+public class TestSplitsMapping
+{
+    @Test
+    public void testNewSplitMappingBuilder()
+    {
+        SplitsMapping.Builder newBuilder = SplitsMapping.builder();
+        newBuilder.addSplit(new PlanNodeId("N1"), 0, createSplit(1));
+        newBuilder.addSplit(new PlanNodeId("N1"), 1, createSplit(2));
+        newBuilder.addSplits(new PlanNodeId("N1"), 1, ImmutableList.of(createSplit(3), createSplit(4)));
+        newBuilder.addSplits(new PlanNodeId("N1"), 2, ImmutableList.of(createSplit(5), createSplit(6))); // addSplits(list) creating new source partition
+        newBuilder.addSplits(new PlanNodeId("N1"), ImmutableListMultimap.of(
+                0, createSplit(7),
+                1, createSplit(8),
+                3, createSplit(9))); // create new source partition
+        newBuilder.addSplit(new PlanNodeId("N2"), 0, createSplit(10)); // another plan node
+        newBuilder.addSplit(new PlanNodeId("N2"), 3, createSplit(11));
+        newBuilder.addMapping(SplitsMapping.builder()
+                .addSplit(new PlanNodeId("N1"), 0, createSplit(20))
+                .addSplit(new PlanNodeId("N1"), 4, createSplit(21))
+                .addSplit(new PlanNodeId("N3"), 0, createSplit(22))
+                .build());
+
+        SplitsMapping splitsMapping1 = newBuilder.build();
+
+        assertThat(splitsMapping1.getPlanNodeIds()).containsExactlyInAnyOrder(new PlanNodeId("N1"), new PlanNodeId("N2"), new PlanNodeId("N3"));
+        assertThat(splitIds(splitsMapping1, "N1")).isEqualTo(
+                ImmutableListMultimap.builder()
+                        .putAll(0, 1, 7, 20)
+                        .putAll(1, 2, 3, 4, 8)
+                        .putAll(2, 5, 6)
+                        .putAll(3, 9)
+                        .put(4, 21)
+                        .build());
+        assertThat(splitIds(splitsMapping1, "N2")).isEqualTo(
+                ImmutableListMultimap.builder()
+                        .put(0, 10)
+                        .put(3, 11)
+                        .build());
+        assertThat(splitIds(splitsMapping1, "N3")).isEqualTo(
+                ImmutableListMultimap.builder()
+                        .put(0, 22)
+                        .build());
+    }
+
+    @Test
+    public void testUpdatingSplitMappingBuilder()
+    {
+        SplitsMapping.Builder newBuilder = SplitsMapping.builder(SplitsMapping.builder()
+                .addSplit(new PlanNodeId("N1"), 0, createSplit(20))
+                .addSplit(new PlanNodeId("N1"), 4, createSplit(21))
+                .addSplit(new PlanNodeId("N3"), 0, createSplit(22))
+                .build());
+
+        newBuilder.addSplit(new PlanNodeId("N1"), 0, createSplit(1));
+        newBuilder.addSplit(new PlanNodeId("N1"), 1, createSplit(2));
+        newBuilder.addSplits(new PlanNodeId("N1"), 1, ImmutableList.of(createSplit(3), createSplit(4)));
+        newBuilder.addSplits(new PlanNodeId("N1"), 2, ImmutableList.of(createSplit(5), createSplit(6))); // addSplits(list) creating new source partition
+        newBuilder.addSplits(new PlanNodeId("N1"), ImmutableListMultimap.of(
+                0, createSplit(7),
+                1, createSplit(8),
+                3, createSplit(9))); // create new source partition
+        newBuilder.addSplit(new PlanNodeId("N2"), 0, createSplit(10)); // another plan node
+        newBuilder.addSplit(new PlanNodeId("N2"), 3, createSplit(11));
+
+        SplitsMapping splitsMapping1 = newBuilder.build();
+
+        assertThat(splitsMapping1.getPlanNodeIds()).containsExactlyInAnyOrder(new PlanNodeId("N1"), new PlanNodeId("N2"), new PlanNodeId("N3"));
+        assertThat(splitIds(splitsMapping1, "N1")).isEqualTo(
+                ImmutableListMultimap.builder()
+                        .putAll(0, 20, 1, 7)
+                        .putAll(1, 2, 3, 4, 8)
+                        .putAll(2, 5, 6)
+                        .putAll(3, 9)
+                        .put(4, 21)
+                        .build());
+        assertThat(splitIds(splitsMapping1, "N2")).isEqualTo(
+                ImmutableListMultimap.builder()
+                        .put(0, 10)
+                        .put(3, 11)
+                        .build());
+        assertThat(splitIds(splitsMapping1, "N3")).isEqualTo(
+                ImmutableListMultimap.builder()
+                        .put(0, 22)
+                        .build());
+    }
+
+    private ListMultimap<Integer, Integer> splitIds(SplitsMapping splitsMapping, String planNodeId)
+    {
+        return splitsMapping.getSplits(new PlanNodeId(planNodeId)).entries().stream()
+                .collect(ImmutableListMultimap.toImmutableListMultimap(
+                        Map.Entry::getKey,
+                        entry -> ((TestingConnectorSplit) entry.getValue().getConnectorSplit()).getId()));
+    }
+
+    private static Split createSplit(int id)
+    {
+        return new Split(TEST_CATALOG_HANDLE, new TestingConnectorSplit(id, OptionalInt.empty(), Optional.empty()));
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestTaskDescriptorStorage.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestTaskDescriptorStorage.java
similarity index 94%
rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestTaskDescriptorStorage.java
rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestTaskDescriptorStorage.java
index f709c75d4f36..deede00937fa 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestTaskDescriptorStorage.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestTaskDescriptorStorage.java
@@ -11,10 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.units.DataSize;
 import io.trino.exchange.SpoolingExchangeInput;
@@ -26,10 +25,11 @@
 import io.trino.spi.exchange.ExchangeSourceHandle;
 import io.trino.split.RemoteSplit;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
+import static io.airlift.json.JsonCodec.jsonCodec;
 import static io.airlift.units.DataSize.Unit.KILOBYTE;
 import static io.trino.operator.ExchangeOperator.REMOTE_CATALOG_HANDLE;
 import static io.trino.spi.StandardErrorCode.EXCEEDED_TASK_DESCRIPTOR_STORAGE_CAPACITY;
@@ -51,7 +51,7 @@ public class TestTaskDescriptorStorage
     @Test
     public void testHappyPath()
     {
-        TaskDescriptorStorage manager = new TaskDescriptorStorage(DataSize.of(15, KILOBYTE));
+        TaskDescriptorStorage manager = new TaskDescriptorStorage(DataSize.of(15, KILOBYTE), jsonCodec(Split.class));
         manager.initialize(QUERY_1);
         manager.initialize(QUERY_2);
 
@@ -101,7 +101,7 @@ public void testHappyPath()
     @Test
     public void testDestroy()
     {
-        TaskDescriptorStorage manager = new TaskDescriptorStorage(DataSize.of(5, KILOBYTE));
+        TaskDescriptorStorage manager = new TaskDescriptorStorage(DataSize.of(5, KILOBYTE), jsonCodec(Split.class));
         manager.initialize(QUERY_1);
         manager.initialize(QUERY_2);
 
@@ -128,7 +128,7 @@ public void testDestroy()
     @Test
     public void testCapacityExceeded()
     {
-        TaskDescriptorStorage manager = new TaskDescriptorStorage(DataSize.of(5, KILOBYTE));
+        TaskDescriptorStorage manager = new TaskDescriptorStorage(DataSize.of(5, KILOBYTE), jsonCodec(Split.class));
         manager.initialize(QUERY_1);
         manager.initialize(QUERY_2);
 
@@ -198,9 +198,9 @@ private static TaskDescriptor createTaskDescriptor(int partitionId, DataSize ret
     {
         return new TaskDescriptor(
                 partitionId,
-                ImmutableListMultimap.of(
-                        new PlanNodeId("1"),
-                        new Split(REMOTE_CATALOG_HANDLE, new RemoteSplit(new SpoolingExchangeInput(ImmutableList.of(new TestingExchangeSourceHandle(retainedSize.toBytes())), Optional.empty())))),
+                SplitsMapping.builder()
+                        .addSplit(new PlanNodeId("1"), 1, new Split(REMOTE_CATALOG_HANDLE, new RemoteSplit(new SpoolingExchangeInput(ImmutableList.of(new TestingExchangeSourceHandle(retainedSize.toBytes())), Optional.empty()))))
+                        .build(),
                 new NodeRequirements(catalog, ImmutableSet.of()));
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestingConnectorSplit.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestingConnectorSplit.java
similarity index 98%
rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestingConnectorSplit.java
rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestingConnectorSplit.java
index 92eefa58d7cb..6aba490cc553 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestingConnectorSplit.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestingConnectorSplit.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.collect.ImmutableList;
 import io.trino.metadata.Split;
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/policy/PlanUtils.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/policy/PlanUtils.java
index 423640e5888e..8390fb524af4 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/policy/PlanUtils.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/policy/PlanUtils.java
@@ -200,6 +200,7 @@ private static PlanFragment createFragment(PlanNode planNode)
                 new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), planNode.getOutputSymbols()),
                 StatsAndCosts.empty(),
                 ImmutableList.of(),
+                ImmutableList.of(),
                 Optional.empty());
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/policy/TestPhasedExecutionSchedule.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/policy/TestPhasedExecutionSchedule.java
index 2bdff4245615..7358d31ec9c6 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/policy/TestPhasedExecutionSchedule.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/policy/TestPhasedExecutionSchedule.java
@@ -18,6 +18,7 @@
 import com.google.common.graph.EndpointPair;
 import com.google.common.graph.Graph;
 import com.google.common.util.concurrent.ListenableFuture;
+import io.opentelemetry.api.trace.Span;
 import io.trino.execution.DynamicFilterConfig;
 import io.trino.execution.ExecutionFailureInfo;
 import io.trino.execution.RemoteTask;
@@ -35,7 +36,7 @@
 import io.trino.sql.planner.PlanFragment;
 import io.trino.sql.planner.plan.PlanFragmentId;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -334,6 +335,12 @@ public int getAttemptId()
             throw new UnsupportedOperationException();
         }
 
+        @Override
+        public Span getStageSpan()
+        {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public void beginScheduling()
         {
diff --git a/core/trino-main/src/test/java/io/trino/execution/warnings/TestDefaultWarningCollector.java b/core/trino-main/src/test/java/io/trino/execution/warnings/TestDefaultWarningCollector.java
index 7f747e01be66..438eceea2f62 100644
--- a/core/trino-main/src/test/java/io/trino/execution/warnings/TestDefaultWarningCollector.java
+++ b/core/trino-main/src/test/java/io/trino/execution/warnings/TestDefaultWarningCollector.java
@@ -15,7 +15,7 @@
 
 import io.trino.spi.TrinoWarning;
 import io.trino.spi.WarningCode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/warnings/TestTestingWarningCollector.java b/core/trino-main/src/test/java/io/trino/execution/warnings/TestTestingWarningCollector.java
index bf0e1fccd2d0..58854787148d 100644
--- a/core/trino-main/src/test/java/io/trino/execution/warnings/TestTestingWarningCollector.java
+++ b/core/trino-main/src/test/java/io/trino/execution/warnings/TestTestingWarningCollector.java
@@ -17,7 +17,7 @@
 import io.trino.spi.TrinoWarning;
 import io.trino.testing.TestingWarningCollector;
 import io.trino.testing.TestingWarningCollectorConfig;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.testing.TestingWarningCollector.createTestWarning;
 import static org.testng.Assert.assertEquals;
diff --git a/core/trino-main/src/test/java/io/trino/failuredetector/TestHeartbeatFailureDetector.java b/core/trino-main/src/test/java/io/trino/failuredetector/TestHeartbeatFailureDetector.java
index c83777d1c5ef..3863adc75c1c 100644
--- a/core/trino-main/src/test/java/io/trino/failuredetector/TestHeartbeatFailureDetector.java
+++ b/core/trino-main/src/test/java/io/trino/failuredetector/TestHeartbeatFailureDetector.java
@@ -30,10 +30,10 @@
 import io.trino.execution.QueryManagerConfig;
 import io.trino.failuredetector.HeartbeatFailureDetector.Stats;
 import io.trino.server.InternalCommunicationConfig;
-import org.testng.annotations.Test;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
+import io.trino.server.security.SecurityConfig;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import org.junit.jupiter.api.Test;
 
 import java.net.SocketTimeoutException;
 import java.net.URI;
@@ -61,6 +61,7 @@ public void testExcludesCurrentNode()
                 new JaxrsModule(),
                 new FailureDetectorModule(),
                 binder -> {
+                    configBinder(binder).bindConfig(SecurityConfig.class);
                     configBinder(binder).bindConfig(InternalCommunicationConfig.class);
                     configBinder(binder).bindConfig(QueryManagerConfig.class);
                     discoveryBinder(binder).bindSelector("trino");
diff --git a/core/trino-main/src/test/java/io/trino/json/TestJsonPathEvaluator.java b/core/trino-main/src/test/java/io/trino/json/TestJsonPathEvaluator.java
index ad7861004ea7..d465ea1ed9cf 100644
--- a/core/trino-main/src/test/java/io/trino/json/TestJsonPathEvaluator.java
+++ b/core/trino-main/src/test/java/io/trino/json/TestJsonPathEvaluator.java
@@ -38,7 +38,7 @@
 import org.assertj.core.api.AssertProvider;
 import org.assertj.core.api.RecursiveComparisonAssert;
 import org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -68,6 +68,7 @@
 import static io.trino.sql.planner.PathNodes.conjunction;
 import static io.trino.sql.planner.PathNodes.contextVariable;
 import static io.trino.sql.planner.PathNodes.currentItem;
+import static io.trino.sql.planner.PathNodes.descendantMemberAccessor;
 import static io.trino.sql.planner.PathNodes.disjunction;
 import static io.trino.sql.planner.PathNodes.divide;
 import static io.trino.sql.planner.PathNodes.emptySequence;
@@ -516,6 +517,77 @@ public void testCeilingMethod()
                 .hasMessage("path evaluation failed: invalid item type. Expected: NUMBER, actual: NULL");
     }
 
+    @Test
+    public void testDescendantMemberAccessor()
+    {
+        // non-structural value
+        assertThat(pathResult(
+                BooleanNode.TRUE,
+                path(true, descendantMemberAccessor(contextVariable(), "key1"))))
+                .isEqualTo(emptySequence());
+
+        // array
+        assertThat(pathResult(
+                new ArrayNode(JsonNodeFactory.instance, ImmutableList.of(BooleanNode.TRUE, TextNode.valueOf("foo"))),
+                path(true, descendantMemberAccessor(contextVariable(), "key1"))))
+                .isEqualTo(emptySequence());
+
+        // object
+        assertThat(pathResult(
+                new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of("first", BooleanNode.TRUE, "second", IntNode.valueOf(42))),
+                path(true, descendantMemberAccessor(contextVariable(), "second"))))
+                .isEqualTo(singletonSequence(IntNode.valueOf(42)));
+
+        assertThat(pathResult(
+                new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of("first", BooleanNode.TRUE, "second", IntNode.valueOf(42))),
+                path(true, descendantMemberAccessor(contextVariable(), "third"))))
+                .isEqualTo(emptySequence());
+
+        // deep nesting array(object(array(object)))
+        assertThat(pathResult(
+                new ArrayNode(JsonNodeFactory.instance, ImmutableList.of(
+                        BooleanNode.TRUE,
+                        new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
+                                "key1", IntNode.valueOf(42),
+                                "key2", new ArrayNode(JsonNodeFactory.instance, ImmutableList.of(
+                                        NullNode.instance,
+                                        new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
+                                                "key3", TextNode.valueOf("foo"),
+                                                "key1", BooleanNode.FALSE)))))))),
+                path(true, descendantMemberAccessor(contextVariable(), "key1"))))
+                .isEqualTo(sequence(
+                        IntNode.valueOf(42),
+                        BooleanNode.FALSE));
+
+        // preorder: member from top-level object first
+        assertThat(pathResult(
+                new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
+                        "key1", new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
+                                "key2", BooleanNode.FALSE)),
+                        "key2", IntNode.valueOf(42))),
+                path(true, descendantMemberAccessor(contextVariable(), "key2"))))
+                .isEqualTo(sequence(
+                        IntNode.valueOf(42),
+                        BooleanNode.FALSE));
+
+        // matching a structural value
+        assertThat(pathResult(
+                new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
+                        "key1", new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of(
+                                "key1", BooleanNode.FALSE)),
+                        "key2", IntNode.valueOf(42))),
+                path(true, descendantMemberAccessor(contextVariable(), "key1"))))
+                .isEqualTo(sequence(
+                        new ObjectNode(JsonNodeFactory.instance, ImmutableMap.of("key1", BooleanNode.FALSE)),
+                        BooleanNode.FALSE));
+
+        // strict mode
+        assertThat(pathResult(
+                BooleanNode.TRUE,
+                path(false, descendantMemberAccessor(contextVariable(), "key1"))))
+                .isEqualTo(emptySequence());
+    }
+
     @Test
     public void testDoubleMethod()
     {
@@ -1406,7 +1478,7 @@ private static PathEvaluationVisitor createPathVisitor(JsonNode input, boolean l
                 input,
                 PARAMETERS.values().toArray(),
                 new JsonPathEvaluator.Invoker(testSessionBuilder().build().toConnectorSession(), createTestingFunctionManager()),
-                new CachingResolver(createTestMetadataManager(), testSessionBuilder().build().toConnectorSession(), new TestingTypeManager()));
+                new CachingResolver(createTestMetadataManager(), new TestingTypeManager()));
     }
 
     private static PathPredicateEvaluationVisitor createPredicateVisitor(JsonNode input, boolean lax)
@@ -1415,6 +1487,6 @@ private static PathPredicateEvaluationVisitor createPredicateVisitor(JsonNode in
                 lax,
                 createPathVisitor(input, lax),
                 new JsonPathEvaluator.Invoker(testSessionBuilder().build().toConnectorSession(), createTestingFunctionManager()),
-                new CachingResolver(createTestMetadataManager(), testSessionBuilder().build().toConnectorSession(), new TestingTypeManager()));
+                new CachingResolver(createTestMetadataManager(), new TestingTypeManager()));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/json/ir/TestSqlJsonLiteralConverter.java b/core/trino-main/src/test/java/io/trino/json/ir/TestSqlJsonLiteralConverter.java
index 05009fbe8de6..3d350d7fa3fa 100644
--- a/core/trino-main/src/test/java/io/trino/json/ir/TestSqlJsonLiteralConverter.java
+++ b/core/trino-main/src/test/java/io/trino/json/ir/TestSqlJsonLiteralConverter.java
@@ -34,7 +34,7 @@
 import org.assertj.core.api.AssertProvider;
 import org.assertj.core.api.RecursiveComparisonAssert;
 import org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/core/trino-main/src/test/java/io/trino/likematcher/TestLikeMatcher.java b/core/trino-main/src/test/java/io/trino/likematcher/TestLikeMatcher.java
index a02b21aa0ac3..fa0f9d6c38d2 100644
--- a/core/trino-main/src/test/java/io/trino/likematcher/TestLikeMatcher.java
+++ b/core/trino-main/src/test/java/io/trino/likematcher/TestLikeMatcher.java
@@ -13,7 +13,10 @@
  */
 package io.trino.likematcher;
 
+import com.google.common.base.Strings;
+import io.trino.type.LikePattern;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
@@ -80,11 +83,24 @@ public void test()
         assertTrue(match("%aaaa%bbbb%aaaa%bbbb%aaaa%bbbb%", "aaaabbbbaaaabbbbaaaabbbb"));
         assertTrue(match("%aaaaaaaaaaaaaaaaaaaaaaaaaa%", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
 
+        assertTrue(match("%aab%bba%aab%bba%", "aaaabbbbaaaabbbbaaaa"));
+        assertFalse(match("%aab%bba%aab%bba%", "aaaabbbbaaaabbbbcccc"));
+        assertTrue(match("%abaca%", "abababababacabababa"));
+        assertFalse(match("%bcccccccca%", "bbbbbbbbxax"));
+        assertFalse(match("%bbxxxxxa%", "bbbxxxxaz"));
+        assertFalse(match("%aaaaaaxaaaaaa%", Strings.repeat("a", 20) +
+                                          Strings.repeat("b", 20) +
+                                          Strings.repeat("a", 20) +
+                                          Strings.repeat("b", 20) +
+                                          "the quick brown fox jumps over the lazy dog"));
+
+        assertFalse(match("%abaaa%", "ababaa"));
+
         // utf-8
-        LikeMatcher singleOptimized = LikeMatcher.compile("_", Optional.empty(), true);
-        LikeMatcher multipleOptimized = LikeMatcher.compile("_a%b_", Optional.empty(), true); // prefix and suffix with _a and b_ to avoid optimizations
-        LikeMatcher single = LikeMatcher.compile("_", Optional.empty(), false);
-        LikeMatcher multiple = LikeMatcher.compile("_a%b_", Optional.empty(), false); // prefix and suffix with _a and b_ to avoid optimizations
+        LikeMatcher singleOptimized = LikePattern.compile("_", Optional.empty(), true).getMatcher();
+        LikeMatcher multipleOptimized = LikePattern.compile("_a%b_", Optional.empty(), true).getMatcher(); // prefix and suffix with _a and b_ to avoid optimizations
+        LikeMatcher single = LikePattern.compile("_", Optional.empty(), false).getMatcher();
+        LikeMatcher multiple = LikePattern.compile("_a%b_", Optional.empty(), false).getMatcher(); // prefix and suffix with _a and b_ to avoid optimizations
         for (int i = 0; i < Character.MAX_CODE_POINT; i++) {
             assertTrue(singleOptimized.match(Character.toString(i).getBytes(StandardCharsets.UTF_8)));
             assertTrue(single.match(Character.toString(i).getBytes(StandardCharsets.UTF_8)));
@@ -95,6 +111,13 @@ public void test()
         }
     }
 
+    @Test
+    @Timeout(2)
+    public void testExponentialBehavior()
+    {
+        assertTrue(match("%a________________", "xyza1234567890123456"));
+    }
+
     @Test
     public void testEscape()
     {
diff --git a/core/trino-main/src/test/java/io/trino/memory/TestLeastWastedEffortTaskLowMemoryKiller.java b/core/trino-main/src/test/java/io/trino/memory/TestLeastWastedEffortTaskLowMemoryKiller.java
index f9b7a802765f..afd92525a50e 100644
--- a/core/trino-main/src/test/java/io/trino/memory/TestLeastWastedEffortTaskLowMemoryKiller.java
+++ b/core/trino-main/src/test/java/io/trino/memory/TestLeastWastedEffortTaskLowMemoryKiller.java
@@ -30,7 +30,7 @@
 import io.trino.operator.TaskStats;
 import io.trino.plugin.base.metrics.TDigestHistogram;
 import org.joda.time.DateTime;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.util.Map;
@@ -150,16 +150,16 @@ private void testKillsBiggestTasksIfAllExecuteSameTime(Duration scheduledTime, D
         else {
             taskInfos = ImmutableMap.of(
                     "q_1", ImmutableMap.of(
-                            1, buildTaskInfo(taskId("q_1", 1), TaskState.RUNNING, scheduledTime, blockedTime)),
+                            1, buildTaskInfo(taskId("q_1", 1), TaskState.RUNNING, scheduledTime, blockedTime, false)),
                     "q_2", ImmutableMap.of(
-                            1, buildTaskInfo(taskId("q_2", 1), TaskState.RUNNING, scheduledTime, blockedTime),
-                            2, buildTaskInfo(taskId("q_2", 2), TaskState.RUNNING, scheduledTime, blockedTime),
-                            3, buildTaskInfo(taskId("q_2", 3), TaskState.RUNNING, scheduledTime, blockedTime),
-                            4, buildTaskInfo(taskId("q_2", 4), TaskState.RUNNING, scheduledTime, blockedTime),
-                            5, buildTaskInfo(taskId("q_2", 5), TaskState.RUNNING, scheduledTime, blockedTime),
-                            6, buildTaskInfo(taskId("q_2", 6), TaskState.RUNNING, scheduledTime, blockedTime),
-                            7, buildTaskInfo(taskId("q_2", 7), TaskState.RUNNING, scheduledTime, blockedTime),
-                            8, buildTaskInfo(taskId("q_2", 8), TaskState.RUNNING, scheduledTime, blockedTime)));
+                            1, buildTaskInfo(taskId("q_2", 1), TaskState.RUNNING, scheduledTime, blockedTime, false),
+                            2, buildTaskInfo(taskId("q_2", 2), TaskState.RUNNING, scheduledTime, blockedTime, false),
+                            3, buildTaskInfo(taskId("q_2", 3), TaskState.RUNNING, scheduledTime, blockedTime, false),
+                            4, buildTaskInfo(taskId("q_2", 4), TaskState.RUNNING, scheduledTime, blockedTime, false),
+                            5, buildTaskInfo(taskId("q_2", 5), TaskState.RUNNING, scheduledTime, blockedTime, false),
+                            6, buildTaskInfo(taskId("q_2", 6), TaskState.RUNNING, scheduledTime, blockedTime, false),
+                            7, buildTaskInfo(taskId("q_2", 7), TaskState.RUNNING, scheduledTime, blockedTime, false),
+                            8, buildTaskInfo(taskId("q_2", 8), TaskState.RUNNING, scheduledTime, blockedTime, false)));
         }
 
         assertEquals(
@@ -194,12 +194,12 @@ public void testKillsSmallerTaskIfWastedEffortRatioIsBetter()
 
         Map<String, Map<Integer, TaskInfo>> taskInfos = ImmutableMap.of(
                 "q_1", ImmutableMap.of(
-                        1, buildTaskInfo(taskId("q_1", 1), TaskState.RUNNING, new Duration(30, SECONDS), new Duration(30, SECONDS)),
-                        2, buildTaskInfo(taskId("q_1", 2), TaskState.RUNNING, new Duration(400, SECONDS), new Duration(200, SECONDS))),
+                        1, buildTaskInfo(taskId("q_1", 1), TaskState.RUNNING, new Duration(30, SECONDS), new Duration(30, SECONDS), false),
+                        2, buildTaskInfo(taskId("q_1", 2), TaskState.RUNNING, new Duration(400, SECONDS), new Duration(200, SECONDS), false)),
                 "q_2", ImmutableMap.of(
-                        1, buildTaskInfo(taskId("q_2", 1), TaskState.RUNNING, new Duration(30, SECONDS), new Duration(30, SECONDS)),
-                        2, buildTaskInfo(taskId("q_2", 2), TaskState.RUNNING, new Duration(100, SECONDS), new Duration(100, SECONDS)),
-                        3, buildTaskInfo(taskId("q_2", 3), TaskState.RUNNING, new Duration(30, SECONDS), new Duration(30, SECONDS))));
+                        1, buildTaskInfo(taskId("q_2", 1), TaskState.RUNNING, new Duration(30, SECONDS), new Duration(30, SECONDS), false),
+                        2, buildTaskInfo(taskId("q_2", 2), TaskState.RUNNING, new Duration(100, SECONDS), new Duration(100, SECONDS), false),
+                        3, buildTaskInfo(taskId("q_2", 3), TaskState.RUNNING, new Duration(30, SECONDS), new Duration(30, SECONDS), false)));
 
         // q1_1; n1; walltime 60s;  memory 3; ratio 0.05 (pick for n1)
         // q1_2; n2; walltime 600s; memory 8; ratio 0.0133
@@ -217,7 +217,46 @@ public void testKillsSmallerTaskIfWastedEffortRatioIsBetter()
                                 taskId("q_2", 3)))));
     }
 
-    private static TaskInfo buildTaskInfo(TaskId taskId, TaskState state, Duration scheduledTime, Duration blockedTime)
+    @Test
+    public void testPrefersKillingSpeculativeTasks()
+    {
+        int memoryPool = 8;
+        Map<String, Map<String, Long>> queries = ImmutableMap.<String, Map<String, Long>>builder()
+                .put("q_1", ImmutableMap.of("n1", 3L, "n2", 8L))
+                .put("q_2", ImmutableMap.of("n1", 7L, "n2", 2L))
+                .buildOrThrow();
+
+        Map<String, Map<String, Map<Integer, Long>>> tasks = ImmutableMap.<String, Map<String, Map<Integer, Long>>>builder()
+                .put("q_1", ImmutableMap.of(
+                        "n1", ImmutableMap.of(1, 3L),
+                        "n2", ImmutableMap.of(2, 8L)))
+                .put("q_2", ImmutableMap.of(
+                        "n1", ImmutableMap.of(
+                                1, 1L,
+                                2, 6L),
+                        "n2", ImmutableMap.of(3, 2L)))
+                .buildOrThrow();
+
+        Map<String, Map<Integer, TaskInfo>> taskInfos = ImmutableMap.of(
+                "q_1", ImmutableMap.of(
+                        1, buildTaskInfo(taskId("q_1", 1), TaskState.RUNNING, new Duration(30, SECONDS), new Duration(30, SECONDS), false),
+                        2, buildTaskInfo(taskId("q_1", 2), TaskState.RUNNING, new Duration(400, SECONDS), new Duration(200, SECONDS), false)),
+                "q_2", ImmutableMap.of(
+                        1, buildTaskInfo(taskId("q_2", 1), TaskState.RUNNING, new Duration(30, SECONDS), new Duration(30, SECONDS), true),
+                        2, buildTaskInfo(taskId("q_2", 2), TaskState.RUNNING, new Duration(100, SECONDS), new Duration(100, SECONDS), false),
+                        3, buildTaskInfo(taskId("q_2", 3), TaskState.RUNNING, new Duration(30, SECONDS), new Duration(30, SECONDS), false)));
+
+        assertEquals(
+                lowMemoryKiller.chooseTargetToKill(
+                        toRunningQueryInfoList(queries, ImmutableSet.of("q_1", "q_2"), taskInfos),
+                        toNodeMemoryInfoList(memoryPool, queries, tasks)),
+                Optional.of(KillTarget.selectedTasks(
+                        ImmutableSet.of(
+                                taskId("q_2", 1), // if q_2_1 was not speculative then "q_1_1 would be picked
+                                taskId("q_2", 3)))));
+    }
+
+    private static TaskInfo buildTaskInfo(TaskId taskId, TaskState state, Duration scheduledTime, Duration blockedTime, boolean speculative)
     {
         return new TaskInfo(
                 new TaskStatus(
@@ -227,12 +266,14 @@ private static TaskInfo buildTaskInfo(TaskId taskId, TaskState state, Duration s
                         state,
                         URI.create("fake://task/" + taskId + "/node/some_node"),
                         "some_node",
+                        speculative,
                         ImmutableList.of(),
                         0,
                         0,
                         OutputBufferStatus.initial(),
                         DataSize.of(0, DataSize.Unit.MEGABYTE),
                         DataSize.of(1, DataSize.Unit.MEGABYTE),
+                        DataSize.of(1, DataSize.Unit.MEGABYTE),
                         Optional.of(1),
                         DataSize.of(1, DataSize.Unit.MEGABYTE),
                         DataSize.of(1, DataSize.Unit.MEGABYTE),
@@ -296,6 +337,7 @@ private static TaskInfo buildTaskInfo(TaskId taskId, TaskState state, Duration s
                         0,
                         new Duration(0, MILLISECONDS),
                         DataSize.ofBytes(0),
+                        DataSize.ofBytes(0),
                         Optional.empty(),
                         0,
                         new Duration(0, MILLISECONDS),
diff --git a/core/trino-main/src/test/java/io/trino/memory/TestLocalMemoryManager.java b/core/trino-main/src/test/java/io/trino/memory/TestLocalMemoryManager.java
index b67470e1100f..a228ce0a36d9 100644
--- a/core/trino-main/src/test/java/io/trino/memory/TestLocalMemoryManager.java
+++ b/core/trino-main/src/test/java/io/trino/memory/TestLocalMemoryManager.java
@@ -14,7 +14,7 @@
 package io.trino.memory;
 
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.units.DataSize.Unit.GIGABYTE;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/core/trino-main/src/test/java/io/trino/memory/TestMemoryBlocking.java b/core/trino-main/src/test/java/io/trino/memory/TestMemoryBlocking.java
index 53e6059e4536..212313ef8e9b 100644
--- a/core/trino-main/src/test/java/io/trino/memory/TestMemoryBlocking.java
+++ b/core/trino-main/src/test/java/io/trino/memory/TestMemoryBlocking.java
@@ -37,9 +37,10 @@
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.PageConsumerOperator;
 import io.trino.testing.TestingTaskContext;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -55,11 +56,12 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestMemoryBlocking
 {
     private static final QueryId QUERY_ID = new QueryId("test_query");
@@ -70,7 +72,7 @@ public class TestMemoryBlocking
     private DriverContext driverContext;
     private MemoryPool memoryPool;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
@@ -86,7 +88,7 @@ public void setUp()
                 .addDriverContext();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         executor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/memory/TestMemoryManagerConfig.java b/core/trino-main/src/test/java/io/trino/memory/TestMemoryManagerConfig.java
index a684c8b38a4f..e0005b7fbd87 100644
--- a/core/trino-main/src/test/java/io/trino/memory/TestMemoryManagerConfig.java
+++ b/core/trino-main/src/test/java/io/trino/memory/TestMemoryManagerConfig.java
@@ -18,7 +18,7 @@
 import io.airlift.units.Duration;
 import io.trino.memory.MemoryManagerConfig.LowMemoryQueryKillerPolicy;
 import io.trino.memory.MemoryManagerConfig.LowMemoryTaskKillerPolicy;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -46,7 +46,8 @@ public void testDefaults()
                 .setFaultTolerantExecutionTaskRuntimeMemoryEstimationOverhead(DataSize.of(1, GIGABYTE))
                 .setFaultTolerantExecutionTaskMemoryGrowthFactor(3.0)
                 .setFaultTolerantExecutionTaskMemoryEstimationQuantile(0.9)
-                .setFaultTolerantExecutionMemoryRequirementIncreaseOnWorkerCrashEnabled(true));
+                .setFaultTolerantExecutionMemoryRequirementIncreaseOnWorkerCrashEnabled(true)
+                .setFaultTolerantExecutionEagerSpeculativeTasksNodeMemoryOvercommit(DataSize.of(20, GIGABYTE)));
     }
 
     @Test
@@ -64,6 +65,7 @@ public void testExplicitPropertyMappings()
                 .put("fault-tolerant-execution-task-memory-growth-factor", "17.3")
                 .put("fault-tolerant-execution-task-memory-estimation-quantile", "0.7")
                 .put("fault-tolerant-execution.memory-requirement-increase-on-worker-crash-enabled", "false")
+                .put("fault-tolerant-execution-eager-speculative-tasks-node_memory-overcommit", "21GB")
                 .buildOrThrow();
 
         MemoryManagerConfig expected = new MemoryManagerConfig()
@@ -77,7 +79,8 @@ public void testExplicitPropertyMappings()
                 .setFaultTolerantExecutionTaskRuntimeMemoryEstimationOverhead(DataSize.of(300, MEGABYTE))
                 .setFaultTolerantExecutionTaskMemoryGrowthFactor(17.3)
                 .setFaultTolerantExecutionTaskMemoryEstimationQuantile(0.7)
-                .setFaultTolerantExecutionMemoryRequirementIncreaseOnWorkerCrashEnabled(false);
+                .setFaultTolerantExecutionMemoryRequirementIncreaseOnWorkerCrashEnabled(false)
+                .setFaultTolerantExecutionEagerSpeculativeTasksNodeMemoryOvercommit(DataSize.of(21, GIGABYTE));
 
         assertFullMapping(properties, expected);
     }
diff --git a/core/trino-main/src/test/java/io/trino/memory/TestMemoryPools.java b/core/trino-main/src/test/java/io/trino/memory/TestMemoryPools.java
index 1dadb3e76a97..e06dfad756eb 100644
--- a/core/trino-main/src/test/java/io/trino/memory/TestMemoryPools.java
+++ b/core/trino-main/src/test/java/io/trino/memory/TestMemoryPools.java
@@ -37,8 +37,9 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.PageConsumerOperator.PageConsumerOutputFactory;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Map;
@@ -57,11 +58,12 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestMemoryPools
 {
     private static final DataSize TEN_MEGABYTES = DataSize.of(10, MEGABYTE);
@@ -81,12 +83,9 @@ private void setUp(Supplier<List<Driver>> driversSupplier)
         Session session = testSessionBuilder()
                 .setCatalog("tpch")
                 .setSchema("tiny")
-                .setSystemProperty("task_default_concurrency", "1")
                 .build();
 
-        localQueryRunner = LocalQueryRunner.builder(session)
-                .withInitialTransaction()
-                .build();
+        localQueryRunner = LocalQueryRunner.create(session);
 
         // add tpch
         localQueryRunner.createCatalog("tpch", new TpchConnectorFactory(1), ImmutableMap.of());
@@ -137,7 +136,7 @@ private RevocableMemoryOperator setupConsumeRevocableMemory(DataSize reservedPer
         return createOperator.get();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         if (localQueryRunner != null) {
@@ -146,17 +145,6 @@ public void tearDown()
         }
     }
 
-    @Test
-    public void testBlockingOnUserMemory()
-    {
-        setUpCountStarFromOrdersWithJoin();
-        assertTrue(userPool.tryReserve(fakeTaskId, "test", TEN_MEGABYTES.toBytes()));
-        runDriversUntilBlocked(waitingForUserMemory());
-        assertTrue(userPool.getFreeBytes() <= 0, format("Expected empty pool but got [%d]", userPool.getFreeBytes()));
-        userPool.free(fakeTaskId, "test", TEN_MEGABYTES.toBytes());
-        assertDriversProgress(waitingForUserMemory());
-    }
-
     @Test
     public void testNotifyListenerOnMemoryReserved()
     {
@@ -341,6 +329,33 @@ public void testPerTaskAllocations()
         assertThat(testPool.getTaskMemoryReservation(q2task1)).isEqualTo(9L);
     }
 
+    @Test
+    public void testGlobalRevocableAllocations()
+    {
+        MemoryPool testPool = new MemoryPool(DataSize.ofBytes(1000));
+
+        assertThat(testPool.tryReserveRevocable(999)).isTrue();
+        assertThat(testPool.tryReserveRevocable(2)).isFalse();
+        assertThat(testPool.getReservedBytes()).isEqualTo(0);
+        assertThat(testPool.getReservedRevocableBytes()).isEqualTo(999);
+        assertThat(testPool.getTaskMemoryReservations()).isEmpty();
+        assertThat(testPool.getQueryMemoryReservations()).isEmpty();
+        assertThat(testPool.getTaggedMemoryAllocations()).isEmpty();
+
+        // non-revocable allocation should block
+        QueryId query = new QueryId("test_query1");
+        TaskId task = new TaskId(new StageId(query, 0), 0, 0);
+        ListenableFuture<Void> memoryFuture = testPool.reserve(task, "tag", 2);
+        assertThat(memoryFuture).isNotDone();
+
+        // non-revocable allocation should unblock after global revocable is freed
+        testPool.freeRevocable(999);
+        assertThat(memoryFuture).isDone();
+
+        assertThat(testPool.getReservedBytes()).isEqualTo(2L);
+        assertThat(testPool.getReservedRevocableBytes()).isEqualTo(0);
+    }
+
     @Test
     public void testPerTaskRevocableAllocations()
     {
diff --git a/core/trino-main/src/test/java/io/trino/memory/TestMemoryTracking.java b/core/trino-main/src/test/java/io/trino/memory/TestMemoryTracking.java
index 84ec369fcc55..4aeec8b14afc 100644
--- a/core/trino-main/src/test/java/io/trino/memory/TestMemoryTracking.java
+++ b/core/trino-main/src/test/java/io/trino/memory/TestMemoryTracking.java
@@ -32,10 +32,10 @@
 import io.trino.spi.QueryId;
 import io.trino.spiller.SpillSpaceTracker;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -48,11 +48,12 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestMemoryTracking
 {
     private static final DataSize queryMaxMemory = DataSize.of(1, GIGABYTE);
@@ -70,14 +71,7 @@ public class TestMemoryTracking
     private ExecutorService notificationExecutor;
     private ScheduledExecutorService yieldExecutor;
 
-    @BeforeClass
-    public void setUp()
-    {
-        notificationExecutor = newCachedThreadPool(daemonThreadsNamed("local-query-runner-executor-%s"));
-        yieldExecutor = newScheduledThreadPool(2, daemonThreadsNamed("local-query-runner-scheduler-%s"));
-    }
-
-    @AfterClass(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         notificationExecutor.shutdownNow();
@@ -90,9 +84,12 @@ public void tearDown()
         memoryPool = null;
     }
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpTest()
     {
+        notificationExecutor = newCachedThreadPool(daemonThreadsNamed("local-query-runner-executor-%s"));
+        yieldExecutor = newScheduledThreadPool(2, daemonThreadsNamed("local-query-runner-scheduler-%s"));
+
         memoryPool = new MemoryPool(memoryPoolSize);
         queryContext = new QueryContext(
                 new QueryId("test_query"),
diff --git a/core/trino-main/src/test/java/io/trino/memory/TestNodeMemoryConfig.java b/core/trino-main/src/test/java/io/trino/memory/TestNodeMemoryConfig.java
index 9e1177efb0e8..7fcea75b6d0b 100644
--- a/core/trino-main/src/test/java/io/trino/memory/TestNodeMemoryConfig.java
+++ b/core/trino-main/src/test/java/io/trino/memory/TestNodeMemoryConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/memory/TestTotalReservationLowMemoryKiller.java b/core/trino-main/src/test/java/io/trino/memory/TestTotalReservationLowMemoryKiller.java
index f30acb3335c3..7ec57fabeb03 100644
--- a/core/trino-main/src/test/java/io/trino/memory/TestTotalReservationLowMemoryKiller.java
+++ b/core/trino-main/src/test/java/io/trino/memory/TestTotalReservationLowMemoryKiller.java
@@ -16,7 +16,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.spi.QueryId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/memory/TestTotalReservationOnBlockedNodesQueryLowMemoryKiller.java b/core/trino-main/src/test/java/io/trino/memory/TestTotalReservationOnBlockedNodesQueryLowMemoryKiller.java
index 38325bcb0e08..710bad545510 100644
--- a/core/trino-main/src/test/java/io/trino/memory/TestTotalReservationOnBlockedNodesQueryLowMemoryKiller.java
+++ b/core/trino-main/src/test/java/io/trino/memory/TestTotalReservationOnBlockedNodesQueryLowMemoryKiller.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.trino.spi.QueryId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/memory/TestTotalReservationOnBlockedNodesTaskLowMemoryKiller.java b/core/trino-main/src/test/java/io/trino/memory/TestTotalReservationOnBlockedNodesTaskLowMemoryKiller.java
index 4c2b198bdfd4..82c30466382f 100644
--- a/core/trino-main/src/test/java/io/trino/memory/TestTotalReservationOnBlockedNodesTaskLowMemoryKiller.java
+++ b/core/trino-main/src/test/java/io/trino/memory/TestTotalReservationOnBlockedNodesTaskLowMemoryKiller.java
@@ -14,16 +14,32 @@
 
 package io.trino.memory;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import org.testng.annotations.Test;
+import io.airlift.stats.TDigest;
+import io.airlift.units.DataSize;
+import io.airlift.units.Duration;
+import io.trino.execution.TaskId;
+import io.trino.execution.TaskInfo;
+import io.trino.execution.TaskState;
+import io.trino.execution.TaskStatus;
+import io.trino.execution.buffer.BufferState;
+import io.trino.execution.buffer.OutputBufferInfo;
+import io.trino.execution.buffer.OutputBufferStatus;
+import io.trino.operator.TaskStats;
+import io.trino.plugin.base.metrics.TDigestHistogram;
+import org.joda.time.DateTime;
+import org.junit.jupiter.api.Test;
 
+import java.net.URI;
 import java.util.Map;
 import java.util.Optional;
 
 import static io.trino.memory.LowMemoryKillerTestingUtils.taskId;
 import static io.trino.memory.LowMemoryKillerTestingUtils.toNodeMemoryInfoList;
 import static io.trino.memory.LowMemoryKillerTestingUtils.toRunningQueryInfoList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.testng.Assert.assertEquals;
 
 public class TestTotalReservationOnBlockedNodesTaskLowMemoryKiller
@@ -161,4 +177,147 @@ public void testKillsBiggestTasks()
                                 taskId("q_1", 1),
                                 taskId("q_2", 6)))));
     }
+
+    @Test
+    public void testPrefersKillingSpeculativeTask()
+    {
+        int memoryPool = 12;
+        Map<String, Map<String, Long>> queries = ImmutableMap.<String, Map<String, Long>>builder()
+                .put("q_1", ImmutableMap.of("n1", 0L, "n2", 8L, "n3", 0L, "n4", 0L, "n5", 0L))
+                .put("q_2", ImmutableMap.of("n1", 3L, "n2", 6L, "n3", 2L, "n4", 4L, "n5", 0L))
+                .put("q_3", ImmutableMap.of("n1", 0L, "n2", 0L, "n3", 11L, "n4", 0L, "n5", 0L))
+                .buildOrThrow();
+
+        Map<String, Map<String, Map<Integer, Long>>> tasks = ImmutableMap.<String, Map<String, Map<Integer, Long>>>builder()
+                .put("q_1", ImmutableMap.of(
+                        "n2", ImmutableMap.of(1, 8L)))
+                .put("q_2", ImmutableMap.of(
+                        "n1", ImmutableMap.of(
+                                1, 1L,
+                                2, 3L),
+                        "n2", ImmutableMap.of(
+                                3, 3L,
+                                4, 1L,
+                                5, 2L),
+                        "n3", ImmutableMap.of(6, 2L),
+                        "n4", ImmutableMap.of(
+                                7, 2L,
+                                8, 2L),
+                        "n5", ImmutableMap.of()))
+                .put("q_3", ImmutableMap.of(
+                        "n3", ImmutableMap.of(1, 11L))) // should not be picked as n3 does not have task retries enabled
+                .buildOrThrow();
+
+        Map<String, Map<Integer, TaskInfo>> taskInfos = ImmutableMap.of(
+                "q_1", ImmutableMap.of(
+                        1, buildTaskInfo(taskId("q_1", 1), false)),
+                "q_2", ImmutableMap.of(
+                        1, buildTaskInfo(taskId("q_2", 1), false),
+                        2, buildTaskInfo(taskId("q_2", 2), false),
+                        3, buildTaskInfo(taskId("q_2", 3), false),
+                        4, buildTaskInfo(taskId("q_2", 4), true),
+                        5, buildTaskInfo(taskId("q_2", 5), true),
+                        6, buildTaskInfo(taskId("q_2", 6), false),
+                        7, buildTaskInfo(taskId("q_2", 7), false),
+                        8, buildTaskInfo(taskId("q_2", 8), false)));
+
+        assertEquals(
+                lowMemoryKiller.chooseTargetToKill(
+                        toRunningQueryInfoList(queries, ImmutableSet.of("q_1", "q_2"), taskInfos),
+                        toNodeMemoryInfoList(memoryPool, queries, tasks)),
+                Optional.of(KillTarget.selectedTasks(
+                        ImmutableSet.of(
+                                taskId("q_2", 5), // picks smaller speculative tasks even though bigger tasks exist on
+                                taskId("q_2", 6)))));
+    }
+
+    private static TaskInfo buildTaskInfo(TaskId taskId, boolean speculative)
+    {
+        return new TaskInfo(
+                new TaskStatus(
+                        taskId,
+                        "task-instance-id",
+                        0,
+                        TaskState.RUNNING,
+                        URI.create("fake://task/" + taskId + "/node/some_node"),
+                        "some_node",
+                        speculative,
+                        ImmutableList.of(),
+                        0,
+                        0,
+                        OutputBufferStatus.initial(),
+                        DataSize.of(0, DataSize.Unit.MEGABYTE),
+                        DataSize.of(1, DataSize.Unit.MEGABYTE),
+                        DataSize.of(1, DataSize.Unit.MEGABYTE),
+                        Optional.of(1),
+                        DataSize.of(1, DataSize.Unit.MEGABYTE),
+                        DataSize.of(1, DataSize.Unit.MEGABYTE),
+                        DataSize.of(0, DataSize.Unit.MEGABYTE),
+                        0,
+                        Duration.valueOf("0s"),
+                        0,
+                        1,
+                        1),
+                DateTime.now(),
+                new OutputBufferInfo(
+                        "TESTING",
+                        BufferState.FINISHED,
+                        false,
+                        false,
+                        0,
+                        0,
+                        0,
+                        0,
+                        Optional.empty(),
+                        Optional.of(new TDigestHistogram(new TDigest())),
+                        Optional.empty()),
+                ImmutableSet.of(),
+                new TaskStats(DateTime.now(),
+                        null,
+                        null,
+                        null,
+                        null,
+                        null,
+                        new Duration(0, MILLISECONDS),
+                        new Duration(0, MILLISECONDS),
+                        0,
+                        0,
+                        0,
+                        0L,
+                        0,
+                        0,
+                        0L,
+                        0,
+                        0,
+                        0.0,
+                        DataSize.ofBytes(0),
+                        DataSize.ofBytes(0),
+                        DataSize.ofBytes(0),
+                        new Duration(0, MILLISECONDS),
+                        new Duration(0, MILLISECONDS),
+                        new Duration(0, MILLISECONDS),
+                        false,
+                        ImmutableSet.of(),
+                        DataSize.ofBytes(0),
+                        0,
+                        new Duration(0, MILLISECONDS),
+                        DataSize.ofBytes(0),
+                        0,
+                        DataSize.ofBytes(0),
+                        0,
+                        DataSize.ofBytes(0),
+                        0,
+                        new Duration(0, MILLISECONDS),
+                        DataSize.ofBytes(0),
+                        0,
+                        new Duration(0, MILLISECONDS),
+                        DataSize.ofBytes(0),
+                        DataSize.ofBytes(0),
+                        Optional.empty(),
+                        0,
+                        new Duration(0, MILLISECONDS),
+                        ImmutableList.of()),
+                Optional.empty(),
+                false);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/metadata/AbstractMockMetadata.java b/core/trino-main/src/test/java/io/trino/metadata/AbstractMockMetadata.java
index 29a9a513d2c3..5d9d9f27d32e 100644
--- a/core/trino-main/src/test/java/io/trino/metadata/AbstractMockMetadata.java
+++ b/core/trino-main/src/test/java/io/trino/metadata/AbstractMockMetadata.java
@@ -42,21 +42,31 @@
 import io.trino.spi.connector.LimitApplicationResult;
 import io.trino.spi.connector.MaterializedViewFreshness;
 import io.trino.spi.connector.ProjectionApplicationResult;
+import io.trino.spi.connector.RelationCommentMetadata;
 import io.trino.spi.connector.RowChangeParadigm;
 import io.trino.spi.connector.SampleApplicationResult;
 import io.trino.spi.connector.SampleType;
+import io.trino.spi.connector.SaveMode;
+import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SortItem;
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.connector.TableColumnsMetadata;
 import io.trino.spi.connector.TableFunctionApplicationResult;
 import io.trino.spi.connector.TableScanRedirectApplicationResult;
 import io.trino.spi.connector.TopNApplicationResult;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Constant;
 import io.trino.spi.function.AggregationFunctionMetadata;
 import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
+import io.trino.spi.function.FunctionDependencyDeclaration;
+import io.trino.spi.function.FunctionId;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.FunctionNullability;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.function.OperatorType;
+import io.trino.spi.function.Signature;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.GrantInfo;
 import io.trino.spi.security.Identity;
@@ -78,9 +88,13 @@
 import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Set;
+import java.util.function.UnaryOperator;
 
+import static io.trino.metadata.GlobalFunctionCatalog.BUILTIN_SCHEMA;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.metadata.RedirectionAwareTableHandle.noRedirection;
 import static io.trino.spi.StandardErrorCode.FUNCTION_NOT_FOUND;
+import static io.trino.spi.function.FunctionDependencyDeclaration.NO_DEPENDENCIES;
 import static io.trino.spi.function.FunctionId.toFunctionId;
 import static io.trino.spi.function.FunctionKind.SCALAR;
 import static io.trino.spi.type.DoubleType.DOUBLE;
@@ -89,6 +103,8 @@
 public abstract class AbstractMockMetadata
         implements Metadata
 {
+    private static final CatalogSchemaFunctionName RAND_NAME = builtinFunctionName("rand");
+
     public static Metadata dummyMetadata()
     {
         return new AbstractMockMetadata() {};
@@ -186,6 +202,12 @@ public Optional<Object> getInfo(Session session, TableHandle handle)
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public CatalogSchemaTableName getTableName(Session session, TableHandle tableHandle)
+    {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public TableSchema getTableSchema(Session session, TableHandle tableHandle)
     {
@@ -223,7 +245,13 @@ public ColumnMetadata getColumnMetadata(Session session, TableHandle tableHandle
     }
 
     @Override
-    public List<TableColumnsMetadata> listTableColumns(Session session, QualifiedTablePrefix prefix)
+    public List<TableColumnsMetadata> listTableColumns(Session session, QualifiedTablePrefix prefix, UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public List<RelationCommentMetadata> listRelationComments(Session session, String catalogName, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
     {
         throw new UnsupportedOperationException();
     }
@@ -235,7 +263,7 @@ public void createSchema(Session session, CatalogSchemaName schema, Map<String,
     }
 
     @Override
-    public void dropSchema(Session session, CatalogSchemaName schema)
+    public void dropSchema(Session session, CatalogSchemaName schema, boolean cascade)
     {
         throw new UnsupportedOperationException();
     }
@@ -253,7 +281,7 @@ public void setSchemaAuthorization(Session session, CatalogSchemaName source, Tr
     }
 
     @Override
-    public void createTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, boolean ignoreExisting)
+    public void createTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, SaveMode saveMode)
     {
         throw new UnsupportedOperationException();
     }
@@ -295,19 +323,31 @@ public void setColumnComment(Session session, TableHandle tableHandle, ColumnHan
     }
 
     @Override
-    public void renameColumn(Session session, TableHandle tableHandle, ColumnHandle source, String target)
+    public void renameColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnHandle source, String target)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void renameField(Session session, TableHandle tableHandle, List<String> fieldPath, String target)
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public void addColumn(Session session, TableHandle tableHandle, ColumnMetadata column)
+    public void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column)
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public void dropColumn(Session session, TableHandle tableHandle, ColumnHandle column)
+    public void addField(Session session, TableHandle tableHandle, List<String> parentPath, String fieldName, Type type, boolean ignoreExisting)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void dropColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnHandle column)
     {
         throw new UnsupportedOperationException();
     }
@@ -324,6 +364,12 @@ public void setColumnType(Session session, TableHandle tableHandle, ColumnHandle
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public void setFieldType(Session session, TableHandle tableHandle, List<String> fieldPath, Type type)
+    {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void setTableAuthorization(Session session, CatalogSchemaTableName table, TrinoPrincipal principal)
     {
@@ -349,7 +395,13 @@ public Optional<TableLayout> getNewTableLayout(Session session, String catalogNa
     }
 
     @Override
-    public OutputTableHandle beginCreateTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, Optional<TableLayout> layout)
+    public Optional<Type> getSupportedType(Session session, CatalogHandle catalogHandle, Map<String, Object> tableProperties, Type type)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public OutputTableHandle beginCreateTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, Optional<TableLayout> layout, boolean replace)
     {
         throw new UnsupportedOperationException();
     }
@@ -391,10 +443,10 @@ public void finishStatisticsCollection(Session session, AnalyzeTableHandle table
     }
 
     @Override
-    public void cleanupQuery(Session session)
-    {
-        throw new UnsupportedOperationException();
-    }
+    public void beginQuery(Session session) {}
+
+    @Override
+    public void cleanupQuery(Session session) {}
 
     @Override
     public InsertTableHandle beginInsert(Session session, TableHandle tableHandle, List<ColumnHandle> columns)
@@ -444,6 +496,18 @@ public Optional<ConnectorOutputMetadata> finishRefreshMaterializedView(
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public Optional<TableHandle> applyUpdate(Session session, TableHandle tableHandle, Map<ColumnHandle, Constant> assignments)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public OptionalLong executeUpdate(Session session, TableHandle tableHandle)
+    {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public Optional<TableHandle> applyDelete(Session session, TableHandle tableHandle)
     {
@@ -724,7 +788,13 @@ public List<GrantInfo> listTablePrivileges(Session session, QualifiedTablePrefix
     //
 
     @Override
-    public Collection<FunctionMetadata> listFunctions(Session session)
+    public Collection<FunctionMetadata> listGlobalFunctions(Session session)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Collection<FunctionMetadata> listFunctions(Session session, CatalogSchemaName schema)
     {
         throw new UnsupportedOperationException();
     }
@@ -737,15 +807,14 @@ public ResolvedFunction decodeFunction(QualifiedName name)
     }
 
     @Override
-    public ResolvedFunction resolveFunction(Session session, QualifiedName name, List<TypeSignatureProvider> parameterTypes)
+    public ResolvedFunction resolveBuiltinFunction(String name, List<TypeSignatureProvider> parameterTypes)
     {
-        String nameSuffix = name.getSuffix();
-        if (nameSuffix.equals("rand") && parameterTypes.isEmpty()) {
-            BoundSignature boundSignature = new BoundSignature(nameSuffix, DOUBLE, ImmutableList.of());
+        if (name.equals("rand") && parameterTypes.isEmpty()) {
+            BoundSignature boundSignature = new BoundSignature(builtinFunctionName(name), DOUBLE, ImmutableList.of());
             return new ResolvedFunction(
                     boundSignature,
                     GlobalSystemConnector.CATALOG_HANDLE,
-                    toFunctionId(boundSignature.toSignature()),
+                    toFunctionId(name, boundSignature.toSignature()),
                     SCALAR,
                     true,
                     new FunctionNullability(false, ImmutableList.of()),
@@ -756,46 +825,67 @@ public ResolvedFunction resolveFunction(Session session, QualifiedName name, Lis
     }
 
     @Override
-    public ResolvedFunction resolveOperator(Session session, OperatorType operatorType, List<? extends Type> argumentTypes)
+    public ResolvedFunction resolveOperator(OperatorType operatorType, List<? extends Type> argumentTypes)
             throws OperatorNotFoundException
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public ResolvedFunction getCoercion(Session session, OperatorType operatorType, Type fromType, Type toType)
+    public ResolvedFunction getCoercion(OperatorType operatorType, Type fromType, Type toType)
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public ResolvedFunction getCoercion(Session session, QualifiedName name, Type fromType, Type toType)
+    public ResolvedFunction getCoercion(CatalogSchemaFunctionName name, Type fromType, Type toType)
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public boolean isAggregationFunction(Session session, QualifiedName name)
+    public Collection<CatalogFunctionMetadata> getFunctions(Session session, CatalogSchemaFunctionName catalogSchemaFunctionName)
+    {
+        if (!catalogSchemaFunctionName.equals(RAND_NAME)) {
+            return ImmutableList.of();
+        }
+        return ImmutableList.of(new CatalogFunctionMetadata(
+                GlobalSystemConnector.CATALOG_HANDLE,
+                BUILTIN_SCHEMA,
+                FunctionMetadata.scalarBuilder("random")
+                        .signature(Signature.builder().returnType(DOUBLE).build())
+                        .alias(RAND_NAME.getFunctionName())
+                        .nondeterministic()
+                        .noDescription()
+                        .build()));
+    }
+
+    @Override
+    public AggregationFunctionMetadata getAggregationFunctionMetadata(Session session, ResolvedFunction resolvedFunction)
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public FunctionMetadata getFunctionMetadata(Session session, ResolvedFunction resolvedFunction)
+    public FunctionDependencyDeclaration getFunctionDependencies(Session session, CatalogHandle catalogHandle, FunctionId functionId, BoundSignature boundSignature)
     {
-        BoundSignature signature = resolvedFunction.getSignature();
-        if (signature.getName().equals("rand") && signature.getArgumentTypes().isEmpty()) {
-            return FunctionMetadata.scalarBuilder()
-                    .signature(signature.toSignature())
-                    .nondeterministic()
-                    .noDescription()
-                    .build();
-        }
-        throw new TrinoException(FUNCTION_NOT_FOUND, signature.toString());
+        return NO_DEPENDENCIES;
     }
 
     @Override
-    public AggregationFunctionMetadata getAggregationFunctionMetadata(Session session, ResolvedFunction resolvedFunction)
+    public boolean languageFunctionExists(Session session, QualifiedObjectName name, String signatureToken)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void createLanguageFunction(Session session, QualifiedObjectName name, LanguageFunction function, boolean replace)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void dropLanguageFunction(Session session, QualifiedObjectName name, String signatureToken)
     {
         throw new UnsupportedOperationException();
     }
@@ -860,6 +950,12 @@ public void setMaterializedViewProperties(Session session, QualifiedObjectName v
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
+    {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public Optional<TableScanRedirectApplicationResult> applyTableScanRedirect(Session session, TableHandle tableHandle)
     {
@@ -879,25 +975,25 @@ public RedirectionAwareTableHandle getRedirectionAwareTableHandle(Session sessio
     }
 
     @Override
-    public boolean supportsReportingWrittenBytes(Session session, TableHandle tableHandle)
+    public Optional<TableHandle> getTableHandle(Session session, QualifiedObjectName table, Optional<TableVersion> startVersion, Optional<TableVersion> endVersion)
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public boolean supportsReportingWrittenBytes(Session session, QualifiedObjectName tableName, Map<String, Object> tableProperties)
+    public OptionalInt getMaxWriterTasks(Session session, String catalogName)
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Optional<TableHandle> getTableHandle(Session session, QualifiedObjectName table, Optional<TableVersion> startVersion, Optional<TableVersion> endVersion)
+    public WriterScalingOptions getNewTableWriterScalingOptions(Session session, QualifiedObjectName tableName, Map<String, Object> tableProperties)
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public OptionalInt getMaxWriterTasks(Session session, String catalogName)
+    public WriterScalingOptions getInsertWriterScalingOptions(Session session, TableHandle tableHandle)
     {
         throw new UnsupportedOperationException();
     }
diff --git a/core/trino-main/src/test/java/io/trino/metadata/CountingAccessMetadata.java b/core/trino-main/src/test/java/io/trino/metadata/CountingAccessMetadata.java
deleted file mode 100644
index d296d4034bef..000000000000
--- a/core/trino-main/src/test/java/io/trino/metadata/CountingAccessMetadata.java
+++ /dev/null
@@ -1,883 +0,0 @@
-/*
- * Licensed 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 io.trino.metadata;
-
-import com.google.common.collect.ConcurrentHashMultiset;
-import com.google.common.collect.ImmutableMultiset;
-import com.google.common.collect.Multiset;
-import com.google.common.util.concurrent.ListenableFuture;
-import io.airlift.slice.Slice;
-import io.trino.Session;
-import io.trino.spi.connector.AggregateFunction;
-import io.trino.spi.connector.AggregationApplicationResult;
-import io.trino.spi.connector.BeginTableExecuteResult;
-import io.trino.spi.connector.CatalogHandle;
-import io.trino.spi.connector.CatalogSchemaName;
-import io.trino.spi.connector.CatalogSchemaTableName;
-import io.trino.spi.connector.ColumnHandle;
-import io.trino.spi.connector.ColumnMetadata;
-import io.trino.spi.connector.ConnectorCapabilities;
-import io.trino.spi.connector.ConnectorOutputMetadata;
-import io.trino.spi.connector.ConnectorTableMetadata;
-import io.trino.spi.connector.Constraint;
-import io.trino.spi.connector.ConstraintApplicationResult;
-import io.trino.spi.connector.JoinApplicationResult;
-import io.trino.spi.connector.JoinStatistics;
-import io.trino.spi.connector.JoinType;
-import io.trino.spi.connector.LimitApplicationResult;
-import io.trino.spi.connector.MaterializedViewFreshness;
-import io.trino.spi.connector.ProjectionApplicationResult;
-import io.trino.spi.connector.RowChangeParadigm;
-import io.trino.spi.connector.SampleApplicationResult;
-import io.trino.spi.connector.SampleType;
-import io.trino.spi.connector.SortItem;
-import io.trino.spi.connector.SystemTable;
-import io.trino.spi.connector.TableColumnsMetadata;
-import io.trino.spi.connector.TableFunctionApplicationResult;
-import io.trino.spi.connector.TableScanRedirectApplicationResult;
-import io.trino.spi.connector.TopNApplicationResult;
-import io.trino.spi.expression.ConnectorExpression;
-import io.trino.spi.function.AggregationFunctionMetadata;
-import io.trino.spi.function.FunctionMetadata;
-import io.trino.spi.function.OperatorType;
-import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.security.GrantInfo;
-import io.trino.spi.security.Identity;
-import io.trino.spi.security.Privilege;
-import io.trino.spi.security.RoleGrant;
-import io.trino.spi.security.TrinoPrincipal;
-import io.trino.spi.statistics.ComputedStatistics;
-import io.trino.spi.statistics.TableStatistics;
-import io.trino.spi.statistics.TableStatisticsMetadata;
-import io.trino.spi.type.Type;
-import io.trino.sql.analyzer.TypeSignatureProvider;
-import io.trino.sql.planner.PartitioningHandle;
-import io.trino.sql.tree.QualifiedName;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.OptionalLong;
-import java.util.Set;
-
-public class CountingAccessMetadata
-        implements Metadata
-{
-    public enum Methods
-    {
-        GET_TABLE_STATISTICS,
-    }
-
-    private final Metadata delegate;
-    private final ConcurrentHashMultiset<Methods> methodInvocations = ConcurrentHashMultiset.create();
-
-    public CountingAccessMetadata(Metadata delegate)
-    {
-        this.delegate = delegate;
-    }
-
-    public Multiset<Methods> getMethodInvocations()
-    {
-        return ImmutableMultiset.copyOf(methodInvocations);
-    }
-
-    public void resetCounters()
-    {
-        methodInvocations.clear();
-    }
-
-    @Override
-    public Set<ConnectorCapabilities> getConnectorCapabilities(Session session, CatalogHandle catalogHandle)
-    {
-        return delegate.getConnectorCapabilities(session, catalogHandle);
-    }
-
-    @Override
-    public boolean catalogExists(Session session, String catalogName)
-    {
-        return delegate.catalogExists(session, catalogName);
-    }
-
-    @Override
-    public boolean schemaExists(Session session, CatalogSchemaName schema)
-    {
-        return delegate.schemaExists(session, schema);
-    }
-
-    @Override
-    public List<String> listSchemaNames(Session session, String catalogName)
-    {
-        return delegate.listSchemaNames(session, catalogName);
-    }
-
-    @Override
-    public Optional<TableHandle> getTableHandle(Session session, QualifiedObjectName tableName)
-    {
-        return delegate.getTableHandle(session, tableName);
-    }
-
-    @Override
-    public Optional<SystemTable> getSystemTable(Session session, QualifiedObjectName tableName)
-    {
-        return delegate.getSystemTable(session, tableName);
-    }
-
-    @Override
-    public Optional<TableExecuteHandle> getTableHandleForExecute(Session session, TableHandle tableHandle, String procedureName, Map<String, Object> executeProperties)
-    {
-        return delegate.getTableHandleForExecute(session, tableHandle, procedureName, executeProperties);
-    }
-
-    @Override
-    public Optional<TableLayout> getLayoutForTableExecute(Session session, TableExecuteHandle tableExecuteHandle)
-    {
-        return delegate.getLayoutForTableExecute(session, tableExecuteHandle);
-    }
-
-    @Override
-    public BeginTableExecuteResult<TableExecuteHandle, TableHandle> beginTableExecute(Session session, TableExecuteHandle handle, TableHandle updatedSourceTableHandle)
-    {
-        return delegate.beginTableExecute(session, handle, updatedSourceTableHandle);
-    }
-
-    @Override
-    public void finishTableExecute(Session session, TableExecuteHandle handle, Collection<Slice> fragments, List<Object> tableExecuteState)
-    {
-        delegate.finishTableExecute(session, handle, fragments, tableExecuteState);
-    }
-
-    @Override
-    public void executeTableExecute(Session session, TableExecuteHandle handle)
-    {
-        delegate.executeTableExecute(session, handle);
-    }
-
-    @Override
-    public TableProperties getTableProperties(Session session, TableHandle handle)
-    {
-        return delegate.getTableProperties(session, handle);
-    }
-
-    @Override
-    public TableHandle makeCompatiblePartitioning(Session session, TableHandle table, PartitioningHandle partitioningHandle)
-    {
-        return delegate.makeCompatiblePartitioning(session, table, partitioningHandle);
-    }
-
-    @Override
-    public Optional<PartitioningHandle> getCommonPartitioning(Session session, PartitioningHandle left, PartitioningHandle right)
-    {
-        return delegate.getCommonPartitioning(session, left, right);
-    }
-
-    @Override
-    public Optional<Object> getInfo(Session session, TableHandle handle)
-    {
-        return delegate.getInfo(session, handle);
-    }
-
-    @Override
-    public TableSchema getTableSchema(Session session, TableHandle tableHandle)
-    {
-        return delegate.getTableSchema(session, tableHandle);
-    }
-
-    @Override
-    public TableMetadata getTableMetadata(Session session, TableHandle tableHandle)
-    {
-        return delegate.getTableMetadata(session, tableHandle);
-    }
-
-    @Override
-    public TableStatistics getTableStatistics(Session session, TableHandle tableHandle)
-    {
-        methodInvocations.add(Methods.GET_TABLE_STATISTICS);
-        return delegate.getTableStatistics(session, tableHandle);
-    }
-
-    @Override
-    public List<QualifiedObjectName> listTables(Session session, QualifiedTablePrefix prefix)
-    {
-        return delegate.listTables(session, prefix);
-    }
-
-    @Override
-    public Map<String, ColumnHandle> getColumnHandles(Session session, TableHandle tableHandle)
-    {
-        return delegate.getColumnHandles(session, tableHandle);
-    }
-
-    @Override
-    public ColumnMetadata getColumnMetadata(Session session, TableHandle tableHandle, ColumnHandle columnHandle)
-    {
-        return delegate.getColumnMetadata(session, tableHandle, columnHandle);
-    }
-
-    @Override
-    public List<TableColumnsMetadata> listTableColumns(Session session, QualifiedTablePrefix prefix)
-    {
-        return delegate.listTableColumns(session, prefix);
-    }
-
-    @Override
-    public void createSchema(Session session, CatalogSchemaName schema, Map<String, Object> properties, TrinoPrincipal principal)
-    {
-        delegate.createSchema(session, schema, properties, principal);
-    }
-
-    @Override
-    public void dropSchema(Session session, CatalogSchemaName schema)
-    {
-        delegate.dropSchema(session, schema);
-    }
-
-    @Override
-    public void renameSchema(Session session, CatalogSchemaName source, String target)
-    {
-        delegate.renameSchema(session, source, target);
-    }
-
-    @Override
-    public void setSchemaAuthorization(Session session, CatalogSchemaName source, TrinoPrincipal principal)
-    {
-        delegate.setSchemaAuthorization(session, source, principal);
-    }
-
-    @Override
-    public void createTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, boolean ignoreExisting)
-    {
-        delegate.createTable(session, catalogName, tableMetadata, ignoreExisting);
-    }
-
-    @Override
-    public void renameTable(Session session, TableHandle tableHandle, CatalogSchemaTableName currentTableName, QualifiedObjectName newTableName)
-    {
-        delegate.renameTable(session, tableHandle, currentTableName, newTableName);
-    }
-
-    @Override
-    public void setTableProperties(Session session, TableHandle tableHandle, Map<String, Optional<Object>> properties)
-    {
-        delegate.setTableProperties(session, tableHandle, properties);
-    }
-
-    @Override
-    public void setTableComment(Session session, TableHandle tableHandle, Optional<String> comment)
-    {
-        delegate.setTableComment(session, tableHandle, comment);
-    }
-
-    @Override
-    public void setViewComment(Session session, QualifiedObjectName viewName, Optional<String> comment)
-    {
-        delegate.setViewComment(session, viewName, comment);
-    }
-
-    @Override
-    public void setViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
-    {
-        delegate.setViewColumnComment(session, viewName, columnName, comment);
-    }
-
-    @Override
-    public void setColumnComment(Session session, TableHandle tableHandle, ColumnHandle column, Optional<String> comment)
-    {
-        delegate.setColumnComment(session, tableHandle, column, comment);
-    }
-
-    @Override
-    public void setColumnType(Session session, TableHandle tableHandle, ColumnHandle column, Type type)
-    {
-        delegate.setColumnType(session, tableHandle, column, type);
-    }
-
-    @Override
-    public void renameColumn(Session session, TableHandle tableHandle, ColumnHandle source, String target)
-    {
-        delegate.renameColumn(session, tableHandle, source, target);
-    }
-
-    @Override
-    public void addColumn(Session session, TableHandle tableHandle, ColumnMetadata column)
-    {
-        delegate.addColumn(session, tableHandle, column);
-    }
-
-    @Override
-    public void setTableAuthorization(Session session, CatalogSchemaTableName table, TrinoPrincipal principal)
-    {
-        delegate.setTableAuthorization(session, table, principal);
-    }
-
-    @Override
-    public void dropColumn(Session session, TableHandle tableHandle, ColumnHandle column)
-    {
-        delegate.dropColumn(session, tableHandle, column);
-    }
-
-    @Override
-    public void dropField(Session session, TableHandle tableHandle, ColumnHandle column, List<String> fieldPath)
-    {
-        delegate.dropField(session, tableHandle, column, fieldPath);
-    }
-
-    @Override
-    public void dropTable(Session session, TableHandle tableHandle, CatalogSchemaTableName tableName)
-    {
-        delegate.dropTable(session, tableHandle, tableName);
-    }
-
-    @Override
-    public void truncateTable(Session session, TableHandle tableHandle)
-    {
-        delegate.truncateTable(session, tableHandle);
-    }
-
-    @Override
-    public Optional<TableLayout> getNewTableLayout(Session session, String catalogName, ConnectorTableMetadata tableMetadata)
-    {
-        return delegate.getNewTableLayout(session, catalogName, tableMetadata);
-    }
-
-    @Override
-    public OutputTableHandle beginCreateTable(Session session, String catalogName, ConnectorTableMetadata tableMetadata, Optional<TableLayout> layout)
-    {
-        return delegate.beginCreateTable(session, catalogName, tableMetadata, layout);
-    }
-
-    @Override
-    public Optional<ConnectorOutputMetadata> finishCreateTable(Session session, OutputTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
-    {
-        return delegate.finishCreateTable(session, tableHandle, fragments, computedStatistics);
-    }
-
-    @Override
-    public Optional<TableLayout> getInsertLayout(Session session, TableHandle target)
-    {
-        return delegate.getInsertLayout(session, target);
-    }
-
-    @Override
-    public TableStatisticsMetadata getStatisticsCollectionMetadataForWrite(Session session, CatalogHandle catalogHandle, ConnectorTableMetadata tableMetadata)
-    {
-        return delegate.getStatisticsCollectionMetadataForWrite(session, catalogHandle, tableMetadata);
-    }
-
-    @Override
-    public AnalyzeMetadata getStatisticsCollectionMetadata(Session session, TableHandle tableHandle, Map<String, Object> analyzeProperties)
-    {
-        return delegate.getStatisticsCollectionMetadata(session, tableHandle, analyzeProperties);
-    }
-
-    @Override
-    public AnalyzeTableHandle beginStatisticsCollection(Session session, TableHandle tableHandle)
-    {
-        return delegate.beginStatisticsCollection(session, tableHandle);
-    }
-
-    @Override
-    public void finishStatisticsCollection(Session session, AnalyzeTableHandle tableHandle, Collection<ComputedStatistics> computedStatistics)
-    {
-        delegate.finishStatisticsCollection(session, tableHandle, computedStatistics);
-    }
-
-    @Override
-    public void cleanupQuery(Session session)
-    {
-        delegate.cleanupQuery(session);
-    }
-
-    @Override
-    public InsertTableHandle beginInsert(Session session, TableHandle tableHandle, List<ColumnHandle> columns)
-    {
-        return delegate.beginInsert(session, tableHandle, columns);
-    }
-
-    @Override
-    public boolean supportsMissingColumnsOnInsert(Session session, TableHandle tableHandle)
-    {
-        return delegate.supportsMissingColumnsOnInsert(session, tableHandle);
-    }
-
-    @Override
-    public Optional<ConnectorOutputMetadata> finishInsert(Session session, InsertTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
-    {
-        return delegate.finishInsert(session, tableHandle, fragments, computedStatistics);
-    }
-
-    @Override
-    public boolean delegateMaterializedViewRefreshToConnector(Session session, QualifiedObjectName viewName)
-    {
-        return delegate.delegateMaterializedViewRefreshToConnector(session, viewName);
-    }
-
-    @Override
-    public ListenableFuture<Void> refreshMaterializedView(Session session, QualifiedObjectName viewName)
-    {
-        return delegate.refreshMaterializedView(session, viewName);
-    }
-
-    @Override
-    public InsertTableHandle beginRefreshMaterializedView(Session session, TableHandle tableHandle, List<TableHandle> sourceTableHandles)
-    {
-        return delegate.beginRefreshMaterializedView(session, tableHandle, sourceTableHandles);
-    }
-
-    @Override
-    public Optional<ConnectorOutputMetadata> finishRefreshMaterializedView(Session session, TableHandle tableHandle, InsertTableHandle insertTableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics, List<TableHandle> sourceTableHandles)
-    {
-        return delegate.finishRefreshMaterializedView(session, tableHandle, insertTableHandle, fragments, computedStatistics, sourceTableHandles);
-    }
-
-    @Override
-    public Optional<TableHandle> applyDelete(Session session, TableHandle tableHandle)
-    {
-        return delegate.applyDelete(session, tableHandle);
-    }
-
-    @Override
-    public OptionalLong executeDelete(Session session, TableHandle tableHandle)
-    {
-        return delegate.executeDelete(session, tableHandle);
-    }
-
-    @Override
-    public RowChangeParadigm getRowChangeParadigm(Session session, TableHandle tableHandle)
-    {
-        return delegate.getRowChangeParadigm(session, tableHandle);
-    }
-
-    @Override
-    public ColumnHandle getMergeRowIdColumnHandle(Session session, TableHandle tableHandle)
-    {
-        return delegate.getMergeRowIdColumnHandle(session, tableHandle);
-    }
-
-    @Override
-    public Optional<PartitioningHandle> getUpdateLayout(Session session, TableHandle tableHandle)
-    {
-        return delegate.getUpdateLayout(session, tableHandle);
-    }
-
-    @Override
-    public MergeHandle beginMerge(Session session, TableHandle tableHandle)
-    {
-        return delegate.beginMerge(session, tableHandle);
-    }
-
-    @Override
-    public void finishMerge(Session session, MergeHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
-    {
-        delegate.finishMerge(session, tableHandle, fragments, computedStatistics);
-    }
-
-    @Override
-    public Optional<CatalogHandle> getCatalogHandle(Session session, String catalogName)
-    {
-        return delegate.getCatalogHandle(session, catalogName);
-    }
-
-    @Override
-    public List<CatalogInfo> listCatalogs(Session session)
-    {
-        return delegate.listCatalogs(session);
-    }
-
-    @Override
-    public List<QualifiedObjectName> listViews(Session session, QualifiedTablePrefix prefix)
-    {
-        return delegate.listViews(session, prefix);
-    }
-
-    @Override
-    public Map<QualifiedObjectName, ViewInfo> getViews(Session session, QualifiedTablePrefix prefix)
-    {
-        return delegate.getViews(session, prefix);
-    }
-
-    @Override
-    public boolean isView(Session session, QualifiedObjectName viewName)
-    {
-        return delegate.isView(session, viewName);
-    }
-
-    @Override
-    public Optional<ViewDefinition> getView(Session session, QualifiedObjectName viewName)
-    {
-        return delegate.getView(session, viewName);
-    }
-
-    @Override
-    public Map<String, Object> getSchemaProperties(Session session, CatalogSchemaName schemaName)
-    {
-        return delegate.getSchemaProperties(session, schemaName);
-    }
-
-    @Override
-    public Optional<TrinoPrincipal> getSchemaOwner(Session session, CatalogSchemaName schemaName)
-    {
-        return delegate.getSchemaOwner(session, schemaName);
-    }
-
-    @Override
-    public void createView(Session session, QualifiedObjectName viewName, ViewDefinition definition, boolean replace)
-    {
-        delegate.createView(session, viewName, definition, replace);
-    }
-
-    @Override
-    public void renameView(Session session, QualifiedObjectName existingViewName, QualifiedObjectName newViewName)
-    {
-        delegate.renameView(session, existingViewName, newViewName);
-    }
-
-    @Override
-    public void setViewAuthorization(Session session, CatalogSchemaTableName view, TrinoPrincipal principal)
-    {
-        delegate.setViewAuthorization(session, view, principal);
-    }
-
-    @Override
-    public void dropView(Session session, QualifiedObjectName viewName)
-    {
-        delegate.dropView(session, viewName);
-    }
-
-    @Override
-    public Optional<ResolvedIndex> resolveIndex(Session session, TableHandle tableHandle, Set<ColumnHandle> indexableColumns, Set<ColumnHandle> outputColumns, TupleDomain<ColumnHandle> tupleDomain)
-    {
-        return delegate.resolveIndex(session, tableHandle, indexableColumns, outputColumns, tupleDomain);
-    }
-
-    @Override
-    public Optional<LimitApplicationResult<TableHandle>> applyLimit(Session session, TableHandle table, long limit)
-    {
-        return delegate.applyLimit(session, table, limit);
-    }
-
-    @Override
-    public Optional<ConstraintApplicationResult<TableHandle>> applyFilter(Session session, TableHandle table, Constraint constraint)
-    {
-        return delegate.applyFilter(session, table, constraint);
-    }
-
-    @Override
-    public Optional<ProjectionApplicationResult<TableHandle>> applyProjection(Session session, TableHandle table, List<ConnectorExpression> projections, Map<String, ColumnHandle> assignments)
-    {
-        return delegate.applyProjection(session, table, projections, assignments);
-    }
-
-    @Override
-    public Optional<SampleApplicationResult<TableHandle>> applySample(Session session, TableHandle table, SampleType sampleType, double sampleRatio)
-    {
-        return delegate.applySample(session, table, sampleType, sampleRatio);
-    }
-
-    @Override
-    public Optional<AggregationApplicationResult<TableHandle>> applyAggregation(Session session, TableHandle table, List<AggregateFunction> aggregations, Map<String, ColumnHandle> assignments, List<List<ColumnHandle>> groupingSets)
-    {
-        return delegate.applyAggregation(session, table, aggregations, assignments, groupingSets);
-    }
-
-    @Override
-    public Optional<JoinApplicationResult<TableHandle>> applyJoin(Session session, JoinType joinType, TableHandle left, TableHandle right, ConnectorExpression joinCondition, Map<String, ColumnHandle> leftAssignments, Map<String, ColumnHandle> rightAssignments, JoinStatistics statistics)
-    {
-        return delegate.applyJoin(session, joinType, left, right, joinCondition, leftAssignments, rightAssignments, statistics);
-    }
-
-    @Override
-    public Optional<TopNApplicationResult<TableHandle>> applyTopN(Session session, TableHandle handle, long topNCount, List<SortItem> sortItems, Map<String, ColumnHandle> assignments)
-    {
-        return delegate.applyTopN(session, handle, topNCount, sortItems, assignments);
-    }
-
-    @Override
-    public Optional<TableFunctionApplicationResult<TableHandle>> applyTableFunction(Session session, TableFunctionHandle handle)
-    {
-        return delegate.applyTableFunction(session, handle);
-    }
-
-    @Override
-    public void validateScan(Session session, TableHandle table)
-    {
-        delegate.validateScan(session, table);
-    }
-
-    @Override
-    public boolean isCatalogManagedSecurity(Session session, String catalog)
-    {
-        return delegate.isCatalogManagedSecurity(session, catalog);
-    }
-
-    @Override
-    public boolean roleExists(Session session, String role, Optional<String> catalog)
-    {
-        return delegate.roleExists(session, role, catalog);
-    }
-
-    @Override
-    public void createRole(Session session, String role, Optional<TrinoPrincipal> grantor, Optional<String> catalog)
-    {
-        delegate.createRole(session, role, grantor, catalog);
-    }
-
-    @Override
-    public void dropRole(Session session, String role, Optional<String> catalog)
-    {
-        delegate.dropRole(session, role, catalog);
-    }
-
-    @Override
-    public Set<String> listRoles(Session session, Optional<String> catalog)
-    {
-        return delegate.listRoles(session, catalog);
-    }
-
-    @Override
-    public Set<RoleGrant> listRoleGrants(Session session, Optional<String> catalog, TrinoPrincipal principal)
-    {
-        return delegate.listRoleGrants(session, catalog, principal);
-    }
-
-    @Override
-    public void grantRoles(Session session, Set<String> roles, Set<TrinoPrincipal> grantees, boolean adminOption, Optional<TrinoPrincipal> grantor, Optional<String> catalog)
-    {
-        delegate.grantRoles(session, roles, grantees, adminOption, grantor, catalog);
-    }
-
-    @Override
-    public void revokeRoles(Session session, Set<String> roles, Set<TrinoPrincipal> grantees, boolean adminOption, Optional<TrinoPrincipal> grantor, Optional<String> catalog)
-    {
-        delegate.revokeRoles(session, roles, grantees, adminOption, grantor, catalog);
-    }
-
-    @Override
-    public Set<RoleGrant> listApplicableRoles(Session session, TrinoPrincipal principal, Optional<String> catalog)
-    {
-        return delegate.listApplicableRoles(session, principal, catalog);
-    }
-
-    @Override
-    public Set<String> listEnabledRoles(Identity identity)
-    {
-        return delegate.listEnabledRoles(identity);
-    }
-
-    @Override
-    public Set<String> listEnabledRoles(Session session, String catalog)
-    {
-        return delegate.listEnabledRoles(session, catalog);
-    }
-
-    @Override
-    public void grantSchemaPrivileges(Session session, CatalogSchemaName schemaName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
-    {
-        delegate.grantSchemaPrivileges(session, schemaName, privileges, grantee, grantOption);
-    }
-
-    @Override
-    public void denySchemaPrivileges(Session session, CatalogSchemaName schemaName, Set<Privilege> privileges, TrinoPrincipal grantee)
-    {
-        delegate.denySchemaPrivileges(session, schemaName, privileges, grantee);
-    }
-
-    @Override
-    public void revokeSchemaPrivileges(Session session, CatalogSchemaName schemaName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
-    {
-        delegate.revokeSchemaPrivileges(session, schemaName, privileges, grantee, grantOption);
-    }
-
-    @Override
-    public void grantTablePrivileges(Session session, QualifiedObjectName tableName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
-    {
-        delegate.grantTablePrivileges(session, tableName, privileges, grantee, grantOption);
-    }
-
-    @Override
-    public void denyTablePrivileges(Session session, QualifiedObjectName tableName, Set<Privilege> privileges, TrinoPrincipal grantee)
-    {
-        delegate.denyTablePrivileges(session, tableName, privileges, grantee);
-    }
-
-    @Override
-    public void revokeTablePrivileges(Session session, QualifiedObjectName tableName, Set<Privilege> privileges, TrinoPrincipal grantee, boolean grantOption)
-    {
-        delegate.revokeTablePrivileges(session, tableName, privileges, grantee, grantOption);
-    }
-
-    @Override
-    public List<GrantInfo> listTablePrivileges(Session session, QualifiedTablePrefix prefix)
-    {
-        return delegate.listTablePrivileges(session, prefix);
-    }
-
-    @Override
-    public Collection<FunctionMetadata> listFunctions(Session session)
-    {
-        return delegate.listFunctions(session);
-    }
-
-    @Override
-    public ResolvedFunction decodeFunction(QualifiedName name)
-    {
-        return delegate.decodeFunction(name);
-    }
-
-    @Override
-    public ResolvedFunction resolveFunction(Session session, QualifiedName name, List<TypeSignatureProvider> parameterTypes)
-    {
-        return delegate.resolveFunction(session, name, parameterTypes);
-    }
-
-    @Override
-    public ResolvedFunction resolveOperator(Session session, OperatorType operatorType, List<? extends Type> argumentTypes)
-            throws OperatorNotFoundException
-    {
-        return delegate.resolveOperator(session, operatorType, argumentTypes);
-    }
-
-    @Override
-    public ResolvedFunction getCoercion(Session session, Type fromType, Type toType)
-    {
-        return delegate.getCoercion(session, fromType, toType);
-    }
-
-    @Override
-    public ResolvedFunction getCoercion(Session session, OperatorType operatorType, Type fromType, Type toType)
-    {
-        return delegate.getCoercion(session, operatorType, fromType, toType);
-    }
-
-    @Override
-    public ResolvedFunction getCoercion(Session session, QualifiedName name, Type fromType, Type toType)
-    {
-        return delegate.getCoercion(session, name, fromType, toType);
-    }
-
-    @Override
-    public boolean isAggregationFunction(Session session, QualifiedName name)
-    {
-        return delegate.isAggregationFunction(session, name);
-    }
-
-    @Override
-    public FunctionMetadata getFunctionMetadata(Session session, ResolvedFunction resolvedFunction)
-    {
-        return delegate.getFunctionMetadata(session, resolvedFunction);
-    }
-
-    @Override
-    public AggregationFunctionMetadata getAggregationFunctionMetadata(Session session, ResolvedFunction resolvedFunction)
-    {
-        return delegate.getAggregationFunctionMetadata(session, resolvedFunction);
-    }
-
-    @Override
-    public void createMaterializedView(Session session, QualifiedObjectName viewName, MaterializedViewDefinition definition, boolean replace, boolean ignoreExisting)
-    {
-        delegate.createMaterializedView(session, viewName, definition, replace, ignoreExisting);
-    }
-
-    @Override
-    public void dropMaterializedView(Session session, QualifiedObjectName viewName)
-    {
-        delegate.dropMaterializedView(session, viewName);
-    }
-
-    @Override
-    public List<QualifiedObjectName> listMaterializedViews(Session session, QualifiedTablePrefix prefix)
-    {
-        return delegate.listMaterializedViews(session, prefix);
-    }
-
-    @Override
-    public Map<QualifiedObjectName, ViewInfo> getMaterializedViews(Session session, QualifiedTablePrefix prefix)
-    {
-        return delegate.getMaterializedViews(session, prefix);
-    }
-
-    @Override
-    public boolean isMaterializedView(Session session, QualifiedObjectName viewName)
-    {
-        return delegate.isMaterializedView(session, viewName);
-    }
-
-    @Override
-    public Optional<MaterializedViewDefinition> getMaterializedView(Session session, QualifiedObjectName viewName)
-    {
-        return delegate.getMaterializedView(session, viewName);
-    }
-
-    @Override
-    public MaterializedViewFreshness getMaterializedViewFreshness(Session session, QualifiedObjectName name)
-    {
-        return delegate.getMaterializedViewFreshness(session, name);
-    }
-
-    @Override
-    public void renameMaterializedView(Session session, QualifiedObjectName existingViewName, QualifiedObjectName newViewName)
-    {
-        delegate.renameMaterializedView(session, existingViewName, newViewName);
-    }
-
-    @Override
-    public void setMaterializedViewProperties(Session session, QualifiedObjectName viewName, Map<String, Optional<Object>> properties)
-    {
-        delegate.setMaterializedViewProperties(session, viewName, properties);
-    }
-
-    @Override
-    public Optional<TableScanRedirectApplicationResult> applyTableScanRedirect(Session session, TableHandle tableHandle)
-    {
-        return delegate.applyTableScanRedirect(session, tableHandle);
-    }
-
-    @Override
-    public RedirectionAwareTableHandle getRedirectionAwareTableHandle(Session session, QualifiedObjectName tableName)
-    {
-        return delegate.getRedirectionAwareTableHandle(session, tableName);
-    }
-
-    @Override
-    public RedirectionAwareTableHandle getRedirectionAwareTableHandle(Session session, QualifiedObjectName tableName, Optional<TableVersion> startVersion, Optional<TableVersion> endVersion)
-    {
-        return delegate.getRedirectionAwareTableHandle(session, tableName, startVersion, endVersion);
-    }
-
-    @Override
-    public boolean supportsReportingWrittenBytes(Session session, TableHandle tableHandle)
-    {
-        return false;
-    }
-
-    @Override
-    public boolean supportsReportingWrittenBytes(Session session, QualifiedObjectName tableName, Map<String, Object> tableProperties)
-    {
-        return false;
-    }
-
-    @Override
-    public Optional<TableHandle> getTableHandle(Session session, QualifiedObjectName tableName, Optional<TableVersion> startVersion, Optional<TableVersion> endVersion)
-    {
-        return delegate.getTableHandle(session, tableName, startVersion, endVersion);
-    }
-
-    @Override
-    public OptionalInt getMaxWriterTasks(Session session, String catalogName)
-    {
-        return delegate.getMaxWriterTasks(session, catalogName);
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/metadata/TestDiscoveryNodeManager.java b/core/trino-main/src/test/java/io/trino/metadata/TestDiscoveryNodeManager.java
index 5a29fa90b86d..f2974c16c15f 100644
--- a/core/trino-main/src/test/java/io/trino/metadata/TestDiscoveryNodeManager.java
+++ b/core/trino-main/src/test/java/io/trino/metadata/TestDiscoveryNodeManager.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.discovery.client.ServiceDescriptor;
 import io.airlift.discovery.client.ServiceSelector;
 import io.airlift.http.client.HttpClient;
@@ -30,11 +31,11 @@
 import io.trino.connector.system.GlobalSystemConnector;
 import io.trino.failuredetector.NoOpFailureDetector;
 import io.trino.server.InternalCommunicationConfig;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import javax.annotation.concurrent.GuardedBy;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.net.URI;
 import java.util.List;
@@ -50,11 +51,13 @@
 import static io.trino.metadata.NodeState.ACTIVE;
 import static io.trino.metadata.NodeState.INACTIVE;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotSame;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestDiscoveryNodeManager
 {
     private final NodeInfo nodeInfo = new NodeInfo("test");
@@ -67,7 +70,7 @@ public class TestDiscoveryNodeManager
     private final TrinoNodeServiceSelector selector = new TrinoNodeServiceSelector();
     private HttpClient testHttpClient;
 
-    @BeforeMethod
+    @BeforeEach
     public void setup()
     {
         testHttpClient = new TestingHttpClient(input -> new TestingResponse(OK, ArrayListMultimap.create(), ACTIVE.name().getBytes(UTF_8)));
@@ -88,7 +91,7 @@ public void setup()
         selector.announceNodes(activeNodes, inactiveNodes);
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         testHttpClient.close();
@@ -183,20 +186,23 @@ public void testGetCoordinators()
     }
 
     @SuppressWarnings("ResultOfObjectAllocationIgnored")
-    @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = ".* current node not returned .*")
+    @Test
     public void testGetCurrentNodeRequired()
     {
-        new DiscoveryNodeManager(
+        assertThatThrownBy(() -> new DiscoveryNodeManager(
                 selector,
                 new NodeInfo("test"),
                 new NoOpFailureDetector(),
                 expectedVersion,
                 testHttpClient,
                 internalCommunicationConfig,
-                new CatalogManagerConfig());
+                new CatalogManagerConfig()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining("current node not returned");
     }
 
-    @Test(timeOut = 60000)
+    @Test
+    @Timeout(60)
     public void testNodeChangeListener()
             throws Exception
     {
diff --git a/core/trino-main/src/test/java/io/trino/metadata/TestGlobalFunctionCatalog.java b/core/trino-main/src/test/java/io/trino/metadata/TestGlobalFunctionCatalog.java
index 43bce79e1e7e..cdcb5ed3394a 100644
--- a/core/trino-main/src/test/java/io/trino/metadata/TestGlobalFunctionCatalog.java
+++ b/core/trino-main/src/test/java/io/trino/metadata/TestGlobalFunctionCatalog.java
@@ -31,10 +31,9 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 import io.trino.spi.type.TypeSignature;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.type.BlockTypeOperators;
 import io.trino.type.UnknownType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
@@ -43,12 +42,12 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static io.trino.SessionTestUtils.TEST_SESSION;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.metadata.InternalFunctionBundle.extractFunctions;
-import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
 import static io.trino.metadata.OperatorNameUtil.unmangleOperator;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.OperatorType.CAST;
 import static io.trino.spi.function.TypeVariableConstraint.typeVariable;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DecimalType.createDecimalType;
@@ -67,18 +66,17 @@ public class TestGlobalFunctionCatalog
     public void testIdentityCast()
     {
         BoundSignature exactOperator = new TestingFunctionResolution().getCoercion(HYPER_LOG_LOG, HYPER_LOG_LOG).getSignature();
-        assertEquals(exactOperator, new BoundSignature(mangleOperatorName(OperatorType.CAST), HYPER_LOG_LOG, ImmutableList.of(HYPER_LOG_LOG)));
+        assertEquals(exactOperator, new BoundSignature(builtinFunctionName(CAST), HYPER_LOG_LOG, ImmutableList.of(HYPER_LOG_LOG)));
     }
 
     @Test
     public void testExactMatchBeforeCoercion()
     {
         TestingFunctionResolution functionResolution = new TestingFunctionResolution();
-        Metadata metadata = functionResolution.getMetadata();
         boolean foundOperator = false;
-        for (FunctionMetadata function : listOperators(metadata)) {
-            OperatorType operatorType = unmangleOperator(function.getSignature().getName());
-            if (operatorType == OperatorType.CAST || operatorType == OperatorType.SATURATED_FLOOR_CAST) {
+        for (FunctionMetadata function : listOperators(functionResolution)) {
+            OperatorType operatorType = unmangleOperator(function.getCanonicalName());
+            if (operatorType == CAST || operatorType == OperatorType.SATURATED_FLOOR_CAST) {
                 continue;
             }
             if (!function.getSignature().getTypeVariableConstraints().isEmpty()) {
@@ -266,14 +264,14 @@ public void testResolveFunctionForUnknown()
                 .failsWithMessage("Could not choose a best candidate operator. Explicit type casts must be added.");
     }
 
-    private static List<FunctionMetadata> listOperators(Metadata metadata)
+    private static List<FunctionMetadata> listOperators(TestingFunctionResolution functionResolution)
     {
         Set<String> operatorNames = Arrays.stream(OperatorType.values())
                 .map(OperatorNameUtil::mangleOperatorName)
                 .collect(toImmutableSet());
 
-        return metadata.listFunctions(TEST_SESSION).stream()
-                .filter(function -> operatorNames.contains(function.getSignature().getName()))
+        return functionResolution.listGlobalFunctions().stream()
+                .filter(function -> operatorNames.contains(function.getCanonicalName()))
                 .collect(toImmutableList());
     }
 
@@ -325,7 +323,7 @@ public ResolveFunctionAssertion forParameters(Type... parameters)
 
         public ResolveFunctionAssertion returns(Signature.Builder functionSignature)
         {
-            Signature expectedSignature = functionSignature.name(TEST_FUNCTION_NAME).build();
+            Signature expectedSignature = functionSignature.build();
             Signature actualSignature = resolveSignature().toSignature();
             assertEquals(actualSignature, expectedSignature);
             return this;
@@ -342,7 +340,7 @@ public ResolveFunctionAssertion failsWithMessage(String... messages)
         private BoundSignature resolveSignature()
         {
             return new TestingFunctionResolution(createFunctionsFromSignatures())
-                    .resolveFunction(QualifiedName.of(TEST_FUNCTION_NAME), fromTypeSignatures(parameterTypes))
+                    .resolveFunction(TEST_FUNCTION_NAME, fromTypeSignatures(parameterTypes))
                     .getSignature();
         }
 
@@ -350,9 +348,8 @@ private InternalFunctionBundle createFunctionsFromSignatures()
         {
             ImmutableList.Builder<SqlFunction> functions = ImmutableList.builder();
             for (Signature.Builder functionSignature : functionSignatures) {
-                Signature signature = functionSignature.name(TEST_FUNCTION_NAME).build();
-                FunctionMetadata functionMetadata = FunctionMetadata.scalarBuilder()
-                        .signature(signature)
+                FunctionMetadata functionMetadata = FunctionMetadata.scalarBuilder(TEST_FUNCTION_NAME)
+                        .signature(functionSignature.build())
                         .nondeterministic()
                         .description("testing function that does nothing")
                         .build();
diff --git a/core/trino-main/src/test/java/io/trino/metadata/TestInformationSchemaMetadata.java b/core/trino-main/src/test/java/io/trino/metadata/TestInformationSchemaMetadata.java
index f99560b49f48..336c6a4d8292 100644
--- a/core/trino-main/src/test/java/io/trino/metadata/TestInformationSchemaMetadata.java
+++ b/core/trino-main/src/test/java/io/trino/metadata/TestInformationSchemaMetadata.java
@@ -35,12 +35,14 @@
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.TupleDomain;
+import io.trino.sql.planner.OptimizerConfig;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Map;
 import java.util.Optional;
@@ -52,16 +54,19 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.util.Arrays.stream;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 
+@TestInstance(PER_CLASS)
 public class TestInformationSchemaMetadata
 {
+    private static final int MAX_PREFIXES_COUNT = new OptimizerConfig().getMaxPrefetchedInformationSchemaPrefixes();
     private LocalQueryRunner queryRunner;
     private TransactionManager transactionManager;
     private Metadata metadata;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         queryRunner = LocalQueryRunner.create(TEST_SESSION);
@@ -77,7 +82,8 @@ public void setUp()
                             ImmutableList.of(new ViewColumn("test", BIGINT.getTypeId(), Optional.of("test column comment"))),
                             Optional.of("comment"),
                             Optional.empty(),
-                            true);
+                            true,
+                            ImmutableList.of());
                     SchemaTableName viewName = new SchemaTableName("test_schema", "test_view");
                     return ImmutableMap.of(viewName, definition);
                 })
@@ -87,7 +93,7 @@ public void setUp()
         metadata = queryRunner.getMetadata();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         try {
@@ -116,7 +122,7 @@ public void testInformationSchemaPredicatePushdown()
         Constraint constraint = new Constraint(TupleDomain.withColumnDomains(domains.buildOrThrow()));
 
         ConnectorSession session = createNewSession(transactionId);
-        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata);
+        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata, MAX_PREFIXES_COUNT);
         InformationSchemaTableHandle tableHandle = (InformationSchemaTableHandle)
                 metadata.getTableHandle(session, new SchemaTableName("information_schema", "views"));
         tableHandle = metadata.applyFilter(session, tableHandle, constraint)
@@ -133,7 +139,7 @@ public void testInformationSchemaPredicatePushdownWithConstraintPredicate()
         Constraint constraint = new Constraint(TupleDomain.all(), TestInformationSchemaMetadata::testConstraint, testConstraintColumns());
 
         ConnectorSession session = createNewSession(transactionId);
-        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata);
+        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata, MAX_PREFIXES_COUNT);
         InformationSchemaTableHandle tableHandle = (InformationSchemaTableHandle)
                 metadata.getTableHandle(session, new SchemaTableName("information_schema", "columns"));
         tableHandle = metadata.applyFilter(session, tableHandle, constraint)
@@ -155,7 +161,7 @@ public void testInformationSchemaPredicatePushdownWithoutSchemaPredicate()
         Constraint constraint = new Constraint(TupleDomain.withColumnDomains(domains.buildOrThrow()));
 
         ConnectorSession session = createNewSession(transactionId);
-        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata);
+        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata, MAX_PREFIXES_COUNT);
         InformationSchemaTableHandle tableHandle = (InformationSchemaTableHandle)
                 metadata.getTableHandle(session, new SchemaTableName("information_schema", "views"));
         tableHandle = metadata.applyFilter(session, tableHandle, constraint)
@@ -179,7 +185,7 @@ public void testInformationSchemaPredicatePushdownWithoutTablePredicate()
         Constraint constraint = new Constraint(TupleDomain.withColumnDomains(domains.buildOrThrow()));
 
         ConnectorSession session = createNewSession(transactionId);
-        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata);
+        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata, MAX_PREFIXES_COUNT);
         InformationSchemaTableHandle tableHandle = (InformationSchemaTableHandle)
                 metadata.getTableHandle(session, new SchemaTableName("information_schema", "views"));
         tableHandle = metadata.applyFilter(session, tableHandle, constraint)
@@ -197,7 +203,7 @@ public void testInformationSchemaPredicatePushdownWithConstraintPredicateOnViews
         // predicate on non columns enumerating table should not cause tables to be enumerated
         Constraint constraint = new Constraint(TupleDomain.all(), TestInformationSchemaMetadata::testConstraint, testConstraintColumns());
         ConnectorSession session = createNewSession(transactionId);
-        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata);
+        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata, MAX_PREFIXES_COUNT);
         InformationSchemaTableHandle tableHandle = (InformationSchemaTableHandle)
                 metadata.getTableHandle(session, new SchemaTableName("information_schema", "views"));
         tableHandle = metadata.applyFilter(session, tableHandle, constraint)
@@ -217,7 +223,7 @@ public void testInformationSchemaPredicatePushdownOnCatalogWiseTables()
         // ImmutableSet.of(new QualifiedTablePrefix(catalogName));
         Constraint constraint = new Constraint(TupleDomain.all());
         ConnectorSession session = createNewSession(transactionId);
-        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata);
+        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata, MAX_PREFIXES_COUNT);
         InformationSchemaTableHandle tableHandle = (InformationSchemaTableHandle)
                 metadata.getTableHandle(session, new SchemaTableName("information_schema", "schemata"));
         Optional<ConstraintApplicationResult<ConnectorTableHandle>> result = metadata.applyFilter(session, tableHandle, constraint);
@@ -229,7 +235,7 @@ public void testInformationSchemaPredicatePushdownForEmptyNames()
     {
         TransactionId transactionId = transactionManager.beginTransaction(false);
         ConnectorSession session = createNewSession(transactionId);
-        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata);
+        ConnectorMetadata metadata = new InformationSchemaMetadata("test_catalog", this.metadata, MAX_PREFIXES_COUNT);
         InformationSchemaColumnHandle tableSchemaColumn = new InformationSchemaColumnHandle("table_schema");
         InformationSchemaColumnHandle tableNameColumn = new InformationSchemaColumnHandle("table_name");
         ConnectorTableHandle tableHandle = metadata.getTableHandle(session, new SchemaTableName("information_schema", "tables"));
diff --git a/core/trino-main/src/test/java/io/trino/metadata/TestInternalBlockEncodingSerde.java b/core/trino-main/src/test/java/io/trino/metadata/TestInternalBlockEncodingSerde.java
index 7d926af2e6a9..4f2ef061a948 100644
--- a/core/trino-main/src/test/java/io/trino/metadata/TestInternalBlockEncodingSerde.java
+++ b/core/trino-main/src/test/java/io/trino/metadata/TestInternalBlockEncodingSerde.java
@@ -23,7 +23,7 @@
 import io.trino.spi.block.VariableWidthBlockEncoding;
 import io.trino.spi.type.TestingTypeManager;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/metadata/TestPolymorphicScalarFunction.java b/core/trino-main/src/test/java/io/trino/metadata/TestPolymorphicScalarFunction.java
index d41909c586a7..448550ab53c0 100644
--- a/core/trino-main/src/test/java/io/trino/metadata/TestPolymorphicScalarFunction.java
+++ b/core/trino-main/src/test/java/io/trino/metadata/TestPolymorphicScalarFunction.java
@@ -28,11 +28,13 @@
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Int128;
 import io.trino.spi.type.TypeSignature;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
 import static io.trino.metadata.FunctionManager.createTestingFunctionManager;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
+import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
 import static io.trino.metadata.TestPolymorphicScalarFunction.TestMethods.VARCHAR_TO_BIGINT_RETURN_VALUE;
 import static io.trino.metadata.TestPolymorphicScalarFunction.TestMethods.VARCHAR_TO_VARCHAR_RETURN_VALUE;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
@@ -55,14 +57,18 @@
 public class TestPolymorphicScalarFunction
 {
     private static final FunctionManager FUNCTION_MANAGER = createTestingFunctionManager();
+    private static final String FUNCTION_NAME = "foo";
     private static final Signature SIGNATURE = Signature.builder()
-            .name("foo")
             .returnType(BIGINT)
             .argumentType(new TypeSignature("varchar", typeVariable("x")))
             .build();
     private static final int INPUT_VARCHAR_LENGTH = 10;
     private static final Slice INPUT_SLICE = Slices.allocate(INPUT_VARCHAR_LENGTH);
-    private static final BoundSignature BOUND_SIGNATURE = new BoundSignature(SIGNATURE.getName(), BIGINT, ImmutableList.of(createVarcharType(INPUT_VARCHAR_LENGTH)));
+
+    private static final BoundSignature BOUND_SIGNATURE = new BoundSignature(
+            builtinFunctionName(FUNCTION_NAME),
+            BIGINT,
+            ImmutableList.of(createVarcharType(INPUT_VARCHAR_LENGTH)));
 
     private static final TypeSignature DECIMAL_SIGNATURE = new TypeSignature("decimal", typeVariable("a_precision"), typeVariable("a_scale"));
 
@@ -75,13 +81,12 @@ public void testSelectsMultipleChoiceWithBlockPosition()
             throws Throwable
     {
         Signature signature = Signature.builder()
-                .operatorType(IS_DISTINCT_FROM)
                 .argumentType(DECIMAL_SIGNATURE)
                 .argumentType(DECIMAL_SIGNATURE)
                 .returnType(BOOLEAN)
                 .build();
 
-        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(TestMethods.class)
+        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(IS_DISTINCT_FROM, TestMethods.class)
                 .signature(signature)
                 .argumentNullability(true, true)
                 .deterministic(true)
@@ -98,7 +103,10 @@ public void testSelectsMultipleChoiceWithBlockPosition()
                                         asList(Optional.of(long.class), Optional.of(long.class)))))
                 .build();
 
-        BoundSignature shortDecimalBoundSignature = new BoundSignature(signature.getName(), BOOLEAN, ImmutableList.of(SHORT_DECIMAL_BOUND_TYPE, SHORT_DECIMAL_BOUND_TYPE));
+        BoundSignature shortDecimalBoundSignature = new BoundSignature(
+                builtinFunctionName(mangleOperatorName(IS_DISTINCT_FROM)),
+                BOOLEAN,
+                ImmutableList.of(SHORT_DECIMAL_BOUND_TYPE, SHORT_DECIMAL_BOUND_TYPE));
         ChoicesSpecializedSqlScalarFunction specializedFunction = (ChoicesSpecializedSqlScalarFunction) function.specialize(
                 shortDecimalBoundSignature,
                 new InternalFunctionDependencies(FUNCTION_MANAGER::getScalarFunctionImplementation, ImmutableMap.of(), ImmutableSet.of()));
@@ -114,7 +122,10 @@ public void testSelectsMultipleChoiceWithBlockPosition()
         Block block2 = new LongArrayBlock(0, Optional.empty(), new long[0]);
         assertFalse((boolean) specializedFunction.getChoices().get(1).getMethodHandle().invoke(block1, 0, block2, 0));
 
-        BoundSignature longDecimalBoundSignature = new BoundSignature(signature.getName(), BOOLEAN, ImmutableList.of(LONG_DECIMAL_BOUND_TYPE, LONG_DECIMAL_BOUND_TYPE));
+        BoundSignature longDecimalBoundSignature = new BoundSignature(
+                builtinFunctionName(mangleOperatorName(IS_DISTINCT_FROM)),
+                BOOLEAN,
+                ImmutableList.of(LONG_DECIMAL_BOUND_TYPE, LONG_DECIMAL_BOUND_TYPE));
         specializedFunction = (ChoicesSpecializedSqlScalarFunction) function.specialize(
                 longDecimalBoundSignature,
                 new InternalFunctionDependencies(FUNCTION_MANAGER::getScalarFunctionImplementation, ImmutableMap.of(), ImmutableSet.of()));
@@ -125,7 +136,7 @@ public void testSelectsMultipleChoiceWithBlockPosition()
     public void testSelectsMethodBasedOnArgumentTypes()
             throws Throwable
     {
-        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(TestMethods.class)
+        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(FUNCTION_NAME, TestMethods.class)
                 .signature(SIGNATURE)
                 .deterministic(true)
                 .choice(choice -> choice
@@ -145,7 +156,7 @@ public void testSelectsMethodBasedOnArgumentTypes()
     public void testSelectsMethodBasedOnReturnType()
             throws Throwable
     {
-        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(TestMethods.class)
+        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(FUNCTION_NAME, TestMethods.class)
                 .signature(SIGNATURE)
                 .deterministic(true)
                 .choice(choice -> choice
@@ -167,19 +178,21 @@ public void testSameLiteralInArgumentsAndReturnValue()
             throws Throwable
     {
         Signature signature = Signature.builder()
-                .name("foo")
                 .returnType(new TypeSignature("varchar", typeVariable("x")))
                 .argumentType(new TypeSignature("varchar", typeVariable("x")))
                 .build();
 
-        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(TestMethods.class)
+        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(FUNCTION_NAME, TestMethods.class)
                 .signature(signature)
                 .deterministic(true)
                 .choice(choice -> choice
                         .implementation(methodsGroup -> methodsGroup.methods("varcharToVarchar")))
                 .build();
 
-        BoundSignature boundSignature = new BoundSignature(signature.getName(), createVarcharType(INPUT_VARCHAR_LENGTH), ImmutableList.of(createVarcharType(INPUT_VARCHAR_LENGTH)));
+        BoundSignature boundSignature = new BoundSignature(
+                builtinFunctionName(FUNCTION_NAME),
+                createVarcharType(INPUT_VARCHAR_LENGTH),
+                ImmutableList.of(createVarcharType(INPUT_VARCHAR_LENGTH)));
 
         ChoicesSpecializedSqlScalarFunction specializedFunction = (ChoicesSpecializedSqlScalarFunction) function.specialize(
                 boundSignature,
@@ -193,7 +206,6 @@ public void testTypeParameters()
             throws Throwable
     {
         Signature signature = Signature.builder()
-                .name("foo")
                 .typeVariableConstraint(TypeVariableConstraint.builder("V")
                         .comparableRequired()
                         .variadicBound("ROW")
@@ -202,14 +214,17 @@ public void testTypeParameters()
                 .argumentType(new TypeSignature("V"))
                 .build();
 
-        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(TestMethods.class)
+        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(FUNCTION_NAME, TestMethods.class)
                 .signature(signature)
                 .deterministic(true)
                 .choice(choice -> choice
                         .implementation(methodsGroup -> methodsGroup.methods("varcharToVarchar")))
                 .build();
 
-        BoundSignature boundSignature = new BoundSignature(signature.getName(), VARCHAR, ImmutableList.of(VARCHAR));
+        BoundSignature boundSignature = new BoundSignature(
+                builtinFunctionName(FUNCTION_NAME),
+                VARCHAR,
+                ImmutableList.of(VARCHAR));
 
         ChoicesSpecializedSqlScalarFunction specializedFunction = (ChoicesSpecializedSqlScalarFunction) function.specialize(
                 boundSignature,
@@ -222,31 +237,33 @@ public void testTypeParameters()
     public void testSetsHiddenToTrueForOperators()
     {
         Signature signature = Signature.builder()
-                .operatorType(ADD)
                 .returnType(new TypeSignature("varchar", typeVariable("x")))
                 .argumentType(new TypeSignature("varchar", typeVariable("x")))
                 .build();
 
-        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(TestMethods.class)
+        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(ADD, TestMethods.class)
                 .signature(signature)
                 .deterministic(true)
                 .choice(choice -> choice
                         .implementation(methodsGroup -> methodsGroup.methods("varcharToVarchar")))
                 .build();
 
-        BoundSignature boundSignature = new BoundSignature(signature.getName(), createVarcharType(INPUT_VARCHAR_LENGTH), ImmutableList.of(createVarcharType(INPUT_VARCHAR_LENGTH)));
+        BoundSignature boundSignature = new BoundSignature(
+                builtinFunctionName(mangleOperatorName(ADD)),
+                createVarcharType(INPUT_VARCHAR_LENGTH),
+                ImmutableList.of(createVarcharType(INPUT_VARCHAR_LENGTH)));
         function.specialize(boundSignature, new InternalFunctionDependencies(FUNCTION_MANAGER::getScalarFunctionImplementation, ImmutableMap.of(), ImmutableSet.of()));
     }
 
     @Test
     public void testFailIfNotAllMethodsPresent()
     {
-        assertThatThrownBy(() -> new PolymorphicScalarFunctionBuilder(TestMethods.class)
+        assertThatThrownBy(() -> new PolymorphicScalarFunctionBuilder(FUNCTION_NAME, TestMethods.class)
                 .signature(SIGNATURE)
                 .deterministic(true)
                 .choice(choice -> choice
                         .implementation(methodsGroup -> methodsGroup.methods("bigintToBigintReturnExtraParameter"))
-                        .implementation(methodsGroup -> methodsGroup.methods("foo")))
+                        .implementation(methodsGroup -> methodsGroup.methods(FUNCTION_NAME)))
                 .build())
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessageMatching("method foo was not found in class io.trino.metadata.TestPolymorphicScalarFunction\\$TestMethods");
@@ -255,7 +272,7 @@ public void testFailIfNotAllMethodsPresent()
     @Test
     public void testFailNoMethodsAreSelectedWhenExtraParametersFunctionIsSet()
     {
-        assertThatThrownBy(() -> new PolymorphicScalarFunctionBuilder(TestMethods.class)
+        assertThatThrownBy(() -> new PolymorphicScalarFunctionBuilder(FUNCTION_NAME, TestMethods.class)
                 .signature(SIGNATURE)
                 .deterministic(true)
                 .choice(choice -> choice
@@ -269,7 +286,7 @@ public void testFailNoMethodsAreSelectedWhenExtraParametersFunctionIsSet()
     @Test
     public void testFailIfTwoMethodsWithSameArguments()
     {
-        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(TestMethods.class)
+        SqlScalarFunction function = new PolymorphicScalarFunctionBuilder(FUNCTION_NAME, TestMethods.class)
                 .signature(SIGNATURE)
                 .deterministic(true)
                 .choice(choice -> choice
diff --git a/core/trino-main/src/test/java/io/trino/metadata/TestQualifiedTablePrefix.java b/core/trino-main/src/test/java/io/trino/metadata/TestQualifiedTablePrefix.java
index 05b071acb9f2..691272c28f48 100644
--- a/core/trino-main/src/test/java/io/trino/metadata/TestQualifiedTablePrefix.java
+++ b/core/trino-main/src/test/java/io/trino/metadata/TestQualifiedTablePrefix.java
@@ -14,7 +14,7 @@
 package io.trino.metadata;
 
 import io.airlift.json.JsonCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.json.JsonCodec.jsonCodec;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/core/trino-main/src/test/java/io/trino/metadata/TestResolvedFunction.java b/core/trino-main/src/test/java/io/trino/metadata/TestResolvedFunction.java
index 90c30af43571..5cf46c0633c0 100644
--- a/core/trino-main/src/test/java/io/trino/metadata/TestResolvedFunction.java
+++ b/core/trino-main/src/test/java/io/trino/metadata/TestResolvedFunction.java
@@ -24,7 +24,7 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeId;
 import io.trino.spi.type.TypeSignature;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.function.Function;
@@ -32,6 +32,7 @@
 import java.util.regex.Pattern;
 
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.spi.function.FunctionKind.SCALAR;
 import static io.trino.spi.type.VarcharType.createVarcharType;
 import static java.lang.Integer.parseInt;
@@ -55,14 +56,18 @@ public void test()
     private static ResolvedFunction createResolvedFunction(String name, int depth)
     {
         return new ResolvedFunction(
-                new BoundSignature(name + "_" + depth, createVarcharType(10 + depth), ImmutableList.of(createVarcharType(20 + depth), createVarcharType(30 + depth))),
+                new BoundSignature(
+                        builtinFunctionName(name + "_" + depth),
+                        createVarcharType(10 + depth),
+                        ImmutableList.of(createVarcharType(20 + depth), createVarcharType(30 + depth))),
                 GlobalSystemConnector.CATALOG_HANDLE,
-                FunctionId.toFunctionId(Signature.builder()
-                        .name(name)
-                        .returnType(new TypeSignature("x"))
-                        .argumentType(new TypeSignature("y"))
-                        .argumentType(new TypeSignature("z"))
-                        .build()),
+                FunctionId.toFunctionId(
+                        name,
+                        Signature.builder()
+                                .returnType(new TypeSignature("x"))
+                                .argumentType(new TypeSignature("y"))
+                                .argumentType(new TypeSignature("z"))
+                                .build()),
                 SCALAR,
                 true,
                 new FunctionNullability(false, ImmutableList.of(false, false)),
diff --git a/core/trino-main/src/test/java/io/trino/metadata/TestSignature.java b/core/trino-main/src/test/java/io/trino/metadata/TestSignature.java
index 5517264d1305..bb9594b4a372 100644
--- a/core/trino-main/src/test/java/io/trino/metadata/TestSignature.java
+++ b/core/trino-main/src/test/java/io/trino/metadata/TestSignature.java
@@ -22,7 +22,7 @@
 import io.trino.spi.type.TypeSignature;
 import io.trino.type.TypeDeserializer;
 import io.trino.type.TypeSignatureDeserializer;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -43,7 +43,6 @@ Type.class, new TypeDeserializer(TESTING_TYPE_MANAGER),
         JsonCodec<Signature> codec = new JsonCodecFactory(objectMapperProvider, true).jsonCodec(Signature.class);
 
         Signature expected = Signature.builder()
-                .name("function")
                 .returnType(BIGINT)
                 .argumentType(BOOLEAN)
                 .argumentType(DOUBLE)
@@ -53,7 +52,6 @@ Type.class, new TypeDeserializer(TESTING_TYPE_MANAGER),
         String json = codec.toJson(expected);
         Signature actual = codec.fromJson(json);
 
-        assertEquals(actual.getName(), expected.getName());
         assertEquals(actual.getReturnType(), expected.getReturnType());
         assertEquals(actual.getArgumentTypes(), expected.getArgumentTypes());
     }
diff --git a/core/trino-main/src/test/java/io/trino/metadata/TestSignatureBinder.java b/core/trino-main/src/test/java/io/trino/metadata/TestSignatureBinder.java
index 9cfa25ccb960..beb3ebffea40 100644
--- a/core/trino-main/src/test/java/io/trino/metadata/TestSignatureBinder.java
+++ b/core/trino-main/src/test/java/io/trino/metadata/TestSignatureBinder.java
@@ -24,12 +24,11 @@
 import io.trino.spi.type.TypeSignatureParameter;
 import io.trino.sql.analyzer.TypeSignatureProvider;
 import io.trino.type.FunctionType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
 
-import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DecimalType.createDecimalType;
@@ -1156,7 +1155,7 @@ private static void assertThat(String typeSignature, TypeVariables typeVariables
 
     private static Signature.Builder functionSignature()
     {
-        return Signature.builder().name("function");
+        return Signature.builder();
     }
 
     private Type type(TypeSignature signature)
@@ -1235,7 +1234,7 @@ public BindSignatureAssertion produces(TypeVariables expected)
         private Optional<TypeVariables> bindVariables()
         {
             assertNotNull(argumentTypes);
-            SignatureBinder signatureBinder = new SignatureBinder(TEST_SESSION, PLANNER_CONTEXT.getMetadata(), PLANNER_CONTEXT.getTypeManager(), function, allowCoercion);
+            SignatureBinder signatureBinder = new SignatureBinder(PLANNER_CONTEXT.getMetadata(), PLANNER_CONTEXT.getTypeManager(), function, allowCoercion);
             if (returnType == null) {
                 return signatureBinder.bindVariables(argumentTypes);
             }
diff --git a/core/trino-main/src/test/java/io/trino/metadata/TestingFunctionResolution.java b/core/trino-main/src/test/java/io/trino/metadata/TestingFunctionResolution.java
index 87207e262699..a79adfb3f9b4 100644
--- a/core/trino-main/src/test/java/io/trino/metadata/TestingFunctionResolution.java
+++ b/core/trino-main/src/test/java/io/trino/metadata/TestingFunctionResolution.java
@@ -16,9 +16,9 @@
 import io.trino.Session;
 import io.trino.operator.aggregation.TestingAggregationFunction;
 import io.trino.security.AllowAllAccessControl;
-import io.trino.spi.function.InvocationConvention;
+import io.trino.spi.function.CatalogSchemaFunctionName;
+import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.OperatorType;
-import io.trino.spi.function.ScalarFunctionImplementation;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignature;
 import io.trino.sql.PlannerContext;
@@ -27,11 +27,11 @@
 import io.trino.sql.gen.PageFunctionCompiler;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FunctionCall;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.transaction.TransactionManager;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -101,23 +101,28 @@ public PageFunctionCompiler getPageFunctionCompiler(int expressionCacheSize)
         return new PageFunctionCompiler(plannerContext.getFunctionManager(), expressionCacheSize);
     }
 
+    public Collection<FunctionMetadata> listGlobalFunctions()
+    {
+        return inTransaction(metadata::listGlobalFunctions);
+    }
+
     public ResolvedFunction resolveOperator(OperatorType operatorType, List<? extends Type> argumentTypes)
             throws OperatorNotFoundException
     {
-        return inTransaction(session -> metadata.resolveOperator(session, operatorType, argumentTypes));
+        return inTransaction(session -> metadata.resolveOperator(operatorType, argumentTypes));
     }
 
     public ResolvedFunction getCoercion(Type fromType, Type toType)
     {
-        return inTransaction(session -> metadata.getCoercion(session, fromType, toType));
+        return inTransaction(session -> metadata.getCoercion(fromType, toType));
     }
 
-    public ResolvedFunction getCoercion(QualifiedName name, Type fromType, Type toType)
+    public ResolvedFunction getCoercion(CatalogSchemaFunctionName name, Type fromType, Type toType)
     {
-        return inTransaction(session -> metadata.getCoercion(session, name, fromType, toType));
+        return inTransaction(session -> metadata.getCoercion(name, fromType, toType));
     }
 
-    public TestingFunctionCallBuilder functionCallBuilder(QualifiedName name)
+    public TestingFunctionCallBuilder functionCallBuilder(String name)
     {
         return new TestingFunctionCallBuilder(name);
     }
@@ -127,20 +132,15 @@ public TestingFunctionCallBuilder functionCallBuilder(QualifiedName name)
     // legal, but works for tests
     //
 
-    public ResolvedFunction resolveFunction(QualifiedName name, List<TypeSignatureProvider> parameterTypes)
-    {
-        return inTransaction(session -> metadata.resolveFunction(session, name, parameterTypes));
-    }
-
-    public ScalarFunctionImplementation getScalarFunction(QualifiedName name, List<TypeSignatureProvider> parameterTypes, InvocationConvention invocationConvention)
+    public ResolvedFunction resolveFunction(String name, List<TypeSignatureProvider> parameterTypes)
     {
-        return inTransaction(session -> plannerContext.getFunctionManager().getScalarFunctionImplementation(metadata.resolveFunction(session, name, parameterTypes), invocationConvention));
+        return metadata.resolveBuiltinFunction(name, parameterTypes);
     }
 
-    public TestingAggregationFunction getAggregateFunction(QualifiedName name, List<TypeSignatureProvider> parameterTypes)
+    public TestingAggregationFunction getAggregateFunction(String name, List<TypeSignatureProvider> parameterTypes)
     {
         return inTransaction(session -> {
-            ResolvedFunction resolvedFunction = metadata.resolveFunction(session, name, parameterTypes);
+            ResolvedFunction resolvedFunction = metadata.resolveBuiltinFunction(name, parameterTypes);
             return new TestingAggregationFunction(
                     resolvedFunction.getSignature(),
                     resolvedFunction.getFunctionNullability(),
@@ -150,7 +150,7 @@ public TestingAggregationFunction getAggregateFunction(QualifiedName name, List<
 
     private <T> T inTransaction(Function<Session, T> transactionSessionConsumer)
     {
-        return transaction(transactionManager, new AllowAllAccessControl())
+        return transaction(transactionManager, metadata, new AllowAllAccessControl())
                 .singleStatement()
                 .execute(TEST_SESSION, session -> {
                     // metadata.getCatalogHandle() registers the catalog for the transaction
@@ -161,11 +161,11 @@ private <T> T inTransaction(Function<Session, T> transactionSessionConsumer)
 
     public class TestingFunctionCallBuilder
     {
-        private final QualifiedName name;
+        private final String name;
         private List<TypeSignature> argumentTypes = new ArrayList<>();
         private List<Expression> argumentValues = new ArrayList<>();
 
-        public TestingFunctionCallBuilder(QualifiedName name)
+        public TestingFunctionCallBuilder(String name)
         {
             this.name = name;
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/AnnotationEngineAssertions.java b/core/trino-main/src/test/java/io/trino/operator/AnnotationEngineAssertions.java
new file mode 100644
index 000000000000..7fd382ca82f8
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/operator/AnnotationEngineAssertions.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed 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 io.trino.operator;
+
+import io.trino.operator.aggregation.ParametricAggregationImplementation;
+import io.trino.operator.scalar.ParametricScalar;
+
+import static org.testng.Assert.assertEquals;
+
+class AnnotationEngineAssertions
+{
+    private AnnotationEngineAssertions() {}
+
+    public static void assertImplementationCount(ParametricScalar scalar, int exact, int specialized, int generic)
+    {
+        assertImplementationCount(scalar.getImplementations(), exact, specialized, generic);
+    }
+
+    public static void assertImplementationCount(ParametricImplementationsGroup<?> implementations, int exact, int specialized, int generic)
+    {
+        assertEquals(implementations.getExactImplementations().size(), exact);
+        assertEquals(implementations.getSpecializedImplementations().size(), specialized);
+        assertEquals(implementations.getGenericImplementations().size(), generic);
+    }
+
+    public static void assertDependencyCount(ParametricAggregationImplementation implementation, int input, int combine, int output)
+    {
+        assertEquals(implementation.getInputDependencies().size(), input);
+        assertEquals(implementation.getCombineDependencies().size(), combine);
+        assertEquals(implementation.getOutputDependencies().size(), output);
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/operator/BenchmarkDynamicFilterSourceOperator.java b/core/trino-main/src/test/java/io/trino/operator/BenchmarkDynamicFilterSourceOperator.java
index 9638ff8c6484..8b904fcf3a41 100644
--- a/core/trino-main/src/test/java/io/trino/operator/BenchmarkDynamicFilterSourceOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/BenchmarkDynamicFilterSourceOperator.java
@@ -25,7 +25,7 @@
 import io.trino.testing.TestingTaskContext;
 import io.trino.tpch.LineItem;
 import io.trino.tpch.LineItemGenerator;
-import io.trino.type.BlockTypeOperators;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -39,7 +39,6 @@
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.Iterator;
 import java.util.List;
@@ -92,6 +91,7 @@ public void setup()
             int maxDistinctValuesCount = Integer.parseInt(limits[0]);
             int minMaxCollectionLimit = Integer.parseInt(limits[1]);
 
+            TypeOperators typeOperators = new TypeOperators();
             operatorFactory = new DynamicFilterSourceOperator.DynamicFilterSourceOperatorFactory(
                     1,
                     new PlanNodeId("joinNodeId"),
@@ -115,7 +115,7 @@ public boolean isDomainCollectionComplete()
                     maxDistinctValuesCount,
                     DataSize.ofBytes(Long.MAX_VALUE),
                     minMaxCollectionLimit,
-                    new BlockTypeOperators(new TypeOperators()));
+                    typeOperators);
         }
 
         @TearDown
diff --git a/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupByHash.java b/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupByHash.java
index d5d261a4281a..a46b26c23aaa 100644
--- a/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupByHash.java
+++ b/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupByHash.java
@@ -18,18 +18,15 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.airlift.slice.XxHash64;
-import io.trino.array.LongBigArray;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.DictionaryBlock;
-import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.AbstractLongType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 import io.trino.sql.gen.JoinCompiler;
-import io.trino.type.BlockTypeOperators;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -46,10 +43,11 @@
 import org.openjdk.jmh.runner.RunnerException;
 
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.IntStream;
@@ -58,14 +56,13 @@
 import static io.trino.operator.UpdateMemory.NOOP;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static it.unimi.dsi.fastutil.HashCommon.arraySize;
 
 @SuppressWarnings("MethodMayBeStatic")
 @State(Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(2)
-@Warmup(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
-@Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(1)
+@Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @BenchmarkMode(Mode.AverageTime)
 public class BenchmarkGroupByHash
 {
@@ -74,76 +71,26 @@ public class BenchmarkGroupByHash
     private static final int GROUP_COUNT = Integer.parseInt(GROUP_COUNT_STRING);
     private static final int EXPECTED_SIZE = 10_000;
     private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
-    private static final BlockTypeOperators TYPE_OPERATOR_FACTORY = new BlockTypeOperators(TYPE_OPERATORS);
+    private static final JoinCompiler JOIN_COMPILER = new JoinCompiler(TYPE_OPERATORS);
 
     @Benchmark
     @OperationsPerInvocation(POSITIONS)
-    public Object groupByHashPreCompute(BenchmarkData data)
+    public Object addPages(MultiChannelBenchmarkData data)
     {
-        GroupByHash groupByHash = new MultiChannelGroupByHash(data.getTypes(), data.getChannels(), data.getHashChannel(), EXPECTED_SIZE, false, getJoinCompiler(), TYPE_OPERATOR_FACTORY, NOOP);
+        GroupByHash groupByHash = new FlatGroupByHash(data.getTypes(), data.isHashEnabled(), EXPECTED_SIZE, false, JOIN_COMPILER, NOOP);
         addInputPagesToHash(groupByHash, data.getPages());
-
-        ImmutableList.Builder<Page> pages = ImmutableList.builder();
-        PageBuilder pageBuilder = new PageBuilder(groupByHash.getTypes());
-        for (int groupId = 0; groupId < groupByHash.getGroupCount(); groupId++) {
-            pageBuilder.declarePosition();
-            groupByHash.appendValuesTo(groupId, pageBuilder);
-            if (pageBuilder.isFull()) {
-                pages.add(pageBuilder.build());
-                pageBuilder.reset();
-            }
-        }
-        pages.add(pageBuilder.build());
-        return pageBuilder.build();
-    }
-
-    @Benchmark
-    @OperationsPerInvocation(POSITIONS)
-    public List<Page> benchmarkHashPosition(BenchmarkData data)
-    {
-        InterpretedHashGenerator hashGenerator = new InterpretedHashGenerator(data.getTypes(), data.getChannels(), TYPE_OPERATOR_FACTORY);
-        ImmutableList.Builder<Page> results = ImmutableList.builderWithExpectedSize(data.getPages().size());
-        for (Page page : data.getPages()) {
-            long[] hashes = new long[page.getPositionCount()];
-            for (int position = 0; position < page.getPositionCount(); position++) {
-                hashes[position] = hashGenerator.hashPosition(position, page);
-            }
-            results.add(page.appendColumn(new LongArrayBlock(page.getPositionCount(), Optional.empty(), hashes)));
-        }
-        return results.build();
-    }
-
-    @Benchmark
-    @OperationsPerInvocation(POSITIONS)
-    public Object addPagePreCompute(BenchmarkData data)
-    {
-        GroupByHash groupByHash = new MultiChannelGroupByHash(data.getTypes(), data.getChannels(), data.getHashChannel(), EXPECTED_SIZE, false, getJoinCompiler(), TYPE_OPERATOR_FACTORY, NOOP);
-        addInputPagesToHash(groupByHash, data.getPages());
-
-        ImmutableList.Builder<Page> pages = ImmutableList.builder();
-        PageBuilder pageBuilder = new PageBuilder(groupByHash.getTypes());
-        for (int groupId = 0; groupId < groupByHash.getGroupCount(); groupId++) {
-            pageBuilder.declarePosition();
-            groupByHash.appendValuesTo(groupId, pageBuilder);
-            if (pageBuilder.isFull()) {
-                pages.add(pageBuilder.build());
-                pageBuilder.reset();
-            }
-        }
-        pages.add(pageBuilder.build());
-        return pageBuilder.build();
+        return groupByHash;
     }
 
     @Benchmark
     @OperationsPerInvocation(POSITIONS)
-    public Object bigintGroupByHash(SingleChannelBenchmarkData data)
+    public Object writeData(WriteMultiChannelBenchmarkData data)
     {
-        GroupByHash groupByHash = new BigintGroupByHash(0, data.getHashEnabled(), EXPECTED_SIZE, NOOP);
-        addInputPagesToHash(groupByHash, data.getPages());
-
+        GroupByHash groupByHash = data.getPrefilledHash();
         ImmutableList.Builder<Page> pages = ImmutableList.builder();
-        PageBuilder pageBuilder = new PageBuilder(groupByHash.getTypes());
-        for (int groupId = 0; groupId < groupByHash.getGroupCount(); groupId++) {
+        PageBuilder pageBuilder = new PageBuilder(POSITIONS, data.getOutputTypes());
+        int[] groupIdsByPhysicalOrder = data.getGroupIdsByPhysicalOrder();
+        for (int groupId : groupIdsByPhysicalOrder) {
             pageBuilder.declarePosition();
             groupByHash.appendValuesTo(groupId, pageBuilder);
             if (pageBuilder.isFull()) {
@@ -155,64 +102,6 @@ public Object bigintGroupByHash(SingleChannelBenchmarkData data)
         return pageBuilder.build();
     }
 
-    @Benchmark
-    @OperationsPerInvocation(POSITIONS)
-    public long baseline(BaselinePagesData data)
-    {
-        int hashSize = arraySize(GROUP_COUNT, 0.9f);
-        int mask = hashSize - 1;
-        long[] table = new long[hashSize];
-        Arrays.fill(table, -1);
-
-        long groupIds = 0;
-        for (Page page : data.getPages()) {
-            Block block = page.getBlock(0);
-            int positionCount = block.getPositionCount();
-            for (int position = 0; position < positionCount; position++) {
-                long value = block.getLong(position, 0);
-
-                int tablePosition = (int) (value & mask);
-                while (table[tablePosition] != -1 && table[tablePosition] != value) {
-                    tablePosition++;
-                }
-                if (table[tablePosition] == -1) {
-                    table[tablePosition] = value;
-                    groupIds++;
-                }
-            }
-        }
-        return groupIds;
-    }
-
-    @Benchmark
-    @OperationsPerInvocation(POSITIONS)
-    public long baselineBigArray(BaselinePagesData data)
-    {
-        int hashSize = arraySize(GROUP_COUNT, 0.9f);
-        int mask = hashSize - 1;
-        LongBigArray table = new LongBigArray(-1);
-        table.ensureCapacity(hashSize);
-
-        long groupIds = 0;
-        for (Page page : data.getPages()) {
-            Block block = page.getBlock(0);
-            int positionCount = block.getPositionCount();
-            for (int position = 0; position < positionCount; position++) {
-                long value = BIGINT.getLong(block, position);
-
-                int tablePosition = (int) XxHash64.hash(value) & mask;
-                while (table.get(tablePosition) != -1 && table.get(tablePosition) != value) {
-                    tablePosition++;
-                }
-                if (table.get(tablePosition) == -1) {
-                    table.set(tablePosition, value);
-                    groupIds++;
-                }
-            }
-        }
-        return groupIds;
-    }
-
     private static void addInputPagesToHash(GroupByHash groupByHash, List<Page> pages)
     {
         for (Page page : pages) {
@@ -290,7 +179,7 @@ private static List<Page> createVarcharPages(int positionCount, int groupCount,
         PageBuilder pageBuilder = new PageBuilder(types);
         for (int position = 0; position < positionCount; position++) {
             int rand = ThreadLocalRandom.current().nextInt(groupCount);
-            Slice value = Slices.wrappedBuffer(ByteBuffer.allocate(4).putInt(rand).flip());
+            Slice value = Slices.wrappedHeapBuffer(ByteBuffer.allocate(4).putInt(rand).flip());
             pageBuilder.declarePosition();
             for (int channel = 0; channel < channelCount; channel++) {
                 VARCHAR.writeSlice(pageBuilder.getBlockBuilder(channel), value);
@@ -309,59 +198,43 @@ private static List<Page> createVarcharPages(int positionCount, int groupCount,
 
     @SuppressWarnings("FieldMayBeFinal")
     @State(Scope.Thread)
-    public static class BaselinePagesData
+    public static class MultiChannelBenchmarkData
     {
-        @Param("1")
+        @Param({"1", "5", "10", "15", "20"})
         private int channelCount = 1;
 
-        @Param("false")
-        private boolean hashEnabled;
-
+        // todo add more group counts when JMH support programmatic ability to set OperationsPerInvocation
         @Param(GROUP_COUNT_STRING)
-        private int groupCount;
-
-        private List<Page> pages;
-
-        @Setup
-        public void setup()
-        {
-            pages = createBigintPages(POSITIONS, groupCount, channelCount, hashEnabled, false);
-        }
-
-        public List<Page> getPages()
-        {
-            return pages;
-        }
-    }
-
-    @SuppressWarnings("FieldMayBeFinal")
-    @State(Scope.Thread)
-    public static class SingleChannelBenchmarkData
-    {
-        @Param("1")
-        private int channelCount = 1;
+        private int groupCount = GROUP_COUNT;
 
         @Param({"true", "false"})
-        private boolean hashEnabled = true;
+        private boolean hashEnabled;
+
+        @Param({"VARCHAR", "BIGINT"})
+        private String dataType = "VARCHAR";
 
         private List<Page> pages;
         private List<Type> types;
-        private int[] channels;
 
         @Setup
         public void setup()
         {
-            setup(false);
+            switch (dataType) {
+                case "VARCHAR" -> {
+                    types = Collections.nCopies(channelCount, VARCHAR);
+                    pages = createVarcharPages(POSITIONS, groupCount, channelCount, hashEnabled);
+                }
+                case "BIGINT" -> {
+                    types = Collections.nCopies(channelCount, BIGINT);
+                    pages = createBigintPages(POSITIONS, groupCount, channelCount, hashEnabled, false);
+                }
+                default -> throw new UnsupportedOperationException("Unsupported dataType");
+            }
         }
 
-        public void setup(boolean useMixedBlockTypes)
+        public int getChannelCount()
         {
-            pages = createBigintPages(POSITIONS, GROUP_COUNT, channelCount, hashEnabled, useMixedBlockTypes);
-            types = Collections.nCopies(1, BIGINT);
-            channels = new int[1];
-            for (int i = 0; i < 1; i++) {
-                channels[i] = i;
-            }
+            return channelCount;
         }
 
         public List<Page> getPages()
@@ -369,94 +242,59 @@ public List<Page> getPages()
             return pages;
         }
 
-        public List<Type> getTypes()
+        public boolean isHashEnabled()
         {
-            return types;
+            return hashEnabled;
         }
 
-        public boolean getHashEnabled()
+        public List<Type> getTypes()
         {
-            return hashEnabled;
+            return types;
         }
     }
 
     @SuppressWarnings("FieldMayBeFinal")
     @State(Scope.Thread)
-    public static class BenchmarkData
+    public static class WriteMultiChannelBenchmarkData
     {
-        @Param({"1", "5", "10", "15", "20"})
-        private int channelCount = 1;
-
-        // todo add more group counts when JMH support programmatic ability to set OperationsPerInvocation
-        @Param(GROUP_COUNT_STRING)
-        private int groupCount = GROUP_COUNT;
-
-        @Param({"true", "false"})
-        private boolean hashEnabled;
-
-        @Param({"VARCHAR", "BIGINT"})
-        private String dataType = "VARCHAR";
-
-        private List<Page> pages;
-        private Optional<Integer> hashChannel;
-        private List<Type> types;
-        private int[] channels;
+        private GroupByHash prefilledHash;
+        private int[] groupIdsByPhysicalOrder;
+        private List<Type> outputTypes;
 
         @Setup
-        public void setup()
+        public void setup(MultiChannelBenchmarkData data)
         {
-            switch (dataType) {
-                case "VARCHAR":
-                    types = Collections.nCopies(channelCount, VARCHAR);
-                    pages = createVarcharPages(POSITIONS, groupCount, channelCount, hashEnabled);
-                    break;
-                case "BIGINT":
-                    types = Collections.nCopies(channelCount, BIGINT);
-                    pages = createBigintPages(POSITIONS, groupCount, channelCount, hashEnabled, false);
-                    break;
-                default:
-                    throw new UnsupportedOperationException("Unsupported dataType");
+            prefilledHash = new FlatGroupByHash(data.getTypes(), data.isHashEnabled(), EXPECTED_SIZE, false, JOIN_COMPILER, NOOP);
+            addInputPagesToHash(prefilledHash, data.getPages());
+
+            Integer[] groupIds = new Integer[prefilledHash.getGroupCount()];
+            for (int i = 0; i < groupIds.length; i++) {
+                groupIds[i] = i;
             }
-            hashChannel = hashEnabled ? Optional.of(channelCount) : Optional.empty();
-            channels = new int[channelCount];
-            for (int i = 0; i < channelCount; i++) {
-                channels[i] = i;
+            if (prefilledHash instanceof FlatGroupByHash flatGroupByHash) {
+                Arrays.sort(groupIds, Comparator.comparing(flatGroupByHash::getPhysicalPosition));
             }
-        }
+            groupIdsByPhysicalOrder = Arrays.stream(groupIds).mapToInt(Integer::intValue).toArray();
 
-        public List<Page> getPages()
-        {
-            return pages;
+            outputTypes = new ArrayList<>(data.getTypes());
+            if (data.isHashEnabled()) {
+                outputTypes.add(BIGINT);
+            }
         }
 
-        public Optional<Integer> getHashChannel()
+        public GroupByHash getPrefilledHash()
         {
-            return hashChannel;
+            return prefilledHash;
         }
 
-        public List<Type> getTypes()
+        public int[] getGroupIdsByPhysicalOrder()
         {
-            return types;
+            return groupIdsByPhysicalOrder;
         }
 
-        public int[] getChannels()
+        public List<Type> getOutputTypes()
         {
-            return channels;
-        }
-    }
-
-    private static JoinCompiler getJoinCompiler()
-    {
-        return new JoinCompiler(TYPE_OPERATORS);
-    }
-
-    static {
-        // pollute BigintGroupByHash profile by different block types
-        SingleChannelBenchmarkData singleChannelBenchmarkData = new SingleChannelBenchmarkData();
-        singleChannelBenchmarkData.setup(true);
-        BenchmarkGroupByHash hash = new BenchmarkGroupByHash();
-        for (int i = 0; i < 5; ++i) {
-            hash.bigintGroupByHash(singleChannelBenchmarkData);
+            return outputTypes;
         }
     }
 
@@ -464,14 +302,13 @@ public static void main(String[] args)
             throws RunnerException
     {
         // assure the benchmarks are valid before running
-        BenchmarkData data = new BenchmarkData();
+        MultiChannelBenchmarkData data = new MultiChannelBenchmarkData();
         data.setup();
-        new BenchmarkGroupByHash().groupByHashPreCompute(data);
-        new BenchmarkGroupByHash().addPagePreCompute(data);
+        new BenchmarkGroupByHash().addPages(data);
 
-        SingleChannelBenchmarkData singleChannelBenchmarkData = new SingleChannelBenchmarkData();
-        singleChannelBenchmarkData.setup();
-        new BenchmarkGroupByHash().bigintGroupByHash(singleChannelBenchmarkData);
+        WriteMultiChannelBenchmarkData writeData = new WriteMultiChannelBenchmarkData();
+        writeData.setup(data);
+        new BenchmarkGroupByHash().writeData(writeData);
 
         benchmark(BenchmarkGroupByHash.class)
                 .withOptions(optionsBuilder -> optionsBuilder
diff --git a/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupByHashOnSimulatedData.java b/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupByHashOnSimulatedData.java
index c69f64cb96bc..6d42e748dc50 100644
--- a/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupByHashOnSimulatedData.java
+++ b/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupByHashOnSimulatedData.java
@@ -20,6 +20,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.DictionaryBlock;
+import io.trino.spi.block.LongArrayBlockBuilder;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DoubleType;
@@ -28,7 +29,7 @@
 import io.trino.spi.type.TypeOperators;
 import io.trino.spi.type.VarcharType;
 import io.trino.sql.gen.JoinCompiler;
-import io.trino.type.BlockTypeOperators;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -42,13 +43,11 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Optional;
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -80,10 +79,8 @@ public class BenchmarkGroupByHashOnSimulatedData
     private static final int DEFAULT_POSITIONS = 10_000_000;
     private static final int EXPECTED_GROUP_COUNT = 10_000;
     private static final int DEFAULT_PAGE_SIZE = 8192;
-    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
-    private static final BlockTypeOperators TYPE_OPERATOR_FACTORY = new BlockTypeOperators(TYPE_OPERATORS);
 
-    private final JoinCompiler joinCompiler = new JoinCompiler(TYPE_OPERATORS);
+    private final JoinCompiler joinCompiler = new JoinCompiler(new TypeOperators());
 
     @Benchmark
     @OperationsPerInvocation(DEFAULT_POSITIONS)
@@ -91,17 +88,15 @@ public Object groupBy(BenchmarkContext data)
     {
         GroupByHash groupByHash = GroupByHash.createGroupByHash(
                 data.getTypes(),
-                data.getChannels(),
-                Optional.empty(),
+                false,
                 EXPECTED_GROUP_COUNT,
                 false,
                 joinCompiler,
-                TYPE_OPERATOR_FACTORY,
                 NOOP);
-        List<GroupByIdBlock> results = addInputPages(groupByHash, data.getPages(), data.getWorkType());
+        List<int[]> results = addInputPages(groupByHash, data.getPages(), data.getWorkType());
 
         ImmutableList.Builder<Page> pages = ImmutableList.builder();
-        PageBuilder pageBuilder = new PageBuilder(groupByHash.getTypes());
+        PageBuilder pageBuilder = new PageBuilder(data.getTypes());
         for (int groupId = 0; groupId < groupByHash.getGroupCount(); groupId++) {
             pageBuilder.declarePosition();
             groupByHash.appendValuesTo(groupId, pageBuilder);
@@ -127,12 +122,12 @@ public void testGroupBy()
         }
     }
 
-    private List<GroupByIdBlock> addInputPages(GroupByHash groupByHash, List<Page> pages, WorkType workType)
+    private List<int[]> addInputPages(GroupByHash groupByHash, List<Page> pages, WorkType workType)
     {
-        List<GroupByIdBlock> results = new ArrayList<>();
+        List<int[]> results = new ArrayList<>();
         for (Page page : pages) {
             if (workType == GET_GROUPS) {
-                Work<GroupByIdBlock> work = groupByHash.getGroupIds(page);
+                Work<int[]> work = groupByHash.getGroupIds(page);
                 boolean finished;
                 do {
                     finished = work.process();
@@ -163,19 +158,19 @@ public enum ColumnType
         BIGINT(BigintType.BIGINT, (blockBuilder, positionCount, seed) -> {
             Random r = new Random(seed);
             for (int i = 0; i < positionCount; i++) {
-                blockBuilder.writeLong((r.nextLong() >>> 1)); // Only positives
+                BigintType.BIGINT.writeLong(blockBuilder, r.nextLong() >>> 1); // Only positives
             }
         }),
         INT(IntegerType.INTEGER, (blockBuilder, positionCount, seed) -> {
             Random r = new Random(seed);
             for (int i = 0; i < positionCount; i++) {
-                blockBuilder.writeInt(r.nextInt());
+                IntegerType.INTEGER.writeInt(blockBuilder, r.nextInt());
             }
         }),
         DOUBLE(DoubleType.DOUBLE, (blockBuilder, positionCount, seed) -> {
             Random r = new Random(seed);
             for (int i = 0; i < positionCount; i++) {
-                blockBuilder.writeLong((r.nextLong() >>> 1)); // Only positives
+                ((LongArrayBlockBuilder) blockBuilder).writeLong(r.nextLong() >>> 1); // Only positives
             }
         }),
         VARCHAR_25(VarcharType.VARCHAR, (blockBuilder, positionCount, seed) -> {
@@ -198,13 +193,9 @@ public enum ColumnType
 
         private static void writeVarchar(BlockBuilder blockBuilder, int positionCount, long seed, int maxLength)
         {
-            Random r = new Random(seed);
-
+            Random random = new Random(seed);
             for (int i = 0; i < positionCount; i++) {
-                int length = 1 + r.nextInt(maxLength - 1);
-                byte[] bytes = new byte[length];
-                r.nextBytes(bytes);
-                VarcharType.VARCHAR.writeSlice(blockBuilder, Slices.wrappedBuffer(bytes));
+                VarcharType.VARCHAR.writeSlice(blockBuilder, Slices.random(1 + random.nextInt(maxLength - 1), random));
             }
         }
 
@@ -243,7 +234,6 @@ public static class BenchmarkContext
         private final int positions;
         private List<Page> pages;
         private List<Type> types;
-        private int[] channels;
 
         public BenchmarkContext()
         {
@@ -264,7 +254,6 @@ public void setup()
             types = query.getChannels().stream()
                     .map(channel -> channel.columnType.type)
                     .collect(toImmutableList());
-            channels = IntStream.range(0, query.getChannels().size()).toArray();
             pages = createPages(query);
         }
 
@@ -302,11 +291,6 @@ public List<Type> getTypes()
             return types;
         }
 
-        public int[] getChannels()
-        {
-            return channels;
-        }
-
         public WorkType getWorkType()
         {
             return workType;
@@ -467,11 +451,6 @@ public enum AggregationDefinition
             this.channels = Arrays.stream(requireNonNull(channels, "channels is null")).collect(toImmutableList());
         }
 
-        public int getPageSize()
-        {
-            return pageSize;
-        }
-
         public List<ChannelDefinition> getChannels()
         {
             return channels;
@@ -562,7 +541,7 @@ private void createDictionaryBlock(int blockCount, int positionsPerBlock, int ch
 
         private void createNonDictionaryBlock(int blockCount, int positionsPerBlock, int channel, double nullChance, Block[] blocks)
         {
-            BlockBuilder allValues = generateValues(channel, distinctValuesCountInColumn);
+            Block allValues = generateValues(channel, distinctValuesCountInColumn).build();
             Random r = new Random(channel);
             for (int i = 0; i < blockCount; i++) {
                 BlockBuilder block = columnType.getType().createBlockBuilder(null, positionsPerBlock);
@@ -614,7 +593,7 @@ private Set<Integer> nOutOfM(Random r, int n, int m)
         // Pollute JVM profile
         BenchmarkGroupByHashOnSimulatedData benchmark = new BenchmarkGroupByHashOnSimulatedData();
         for (WorkType workType : WorkType.values()) {
-            for (double nullChance : new double[] {0, .1, .5, .9}) {
+            for (double nullChance : new double[] {0, 0.1, 0.5, 0.9}) {
                 for (AggregationDefinition query : new AggregationDefinition[] {BIGINT_2_GROUPS, BIGINT_1K_GROUPS, BIGINT_1M_GROUPS}) {
                     BenchmarkContext context = new BenchmarkContext(workType, query, nullChance, 8000);
                     context.setup();
diff --git a/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupedTopNRankBuilder.java b/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupedTopNRankBuilder.java
index 7b7777569870..bb586cc7c7f7 100644
--- a/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupedTopNRankBuilder.java
+++ b/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupedTopNRankBuilder.java
@@ -23,7 +23,6 @@
 import io.trino.type.BlockTypeOperators;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Param;
@@ -60,40 +59,46 @@ public class BenchmarkGroupedTopNRankBuilder
     public static class BenchmarkData
     {
         @Param({"1", "10", "100"})
-        private String topN = "1";
+        private int topN = 1;
 
         @Param({"10000", "1000000"})
-        private String positions = "1";
+        private int positions = 1;
 
+        // when positions is evenly divisible by groupCount, each row will end up in the same group on each processPage call,
+        // which means it will stop inserting after topN is saturated which may or may not be desirable for any given benchmark scenario
         @Param({"1", "10000", "1000000"})
-        private String groupCount = "1";
+        private int groupCount = 1;
 
+        @Param("100")
+        private int addPageCalls = 100;
+
+        private List<Type> types;
+        private PageWithPositionComparator comparator;
+        private PageWithPositionEqualsAndHash equalsAndHash;
         private Page page;
-        private GroupedTopNRankBuilder topNBuilder;
 
-        @Setup(value = Level.Invocation)
+        @Setup
         public void setup()
         {
-            List<Type> types = ImmutableList.of(DOUBLE, DOUBLE, VARCHAR, BIGINT);
+            types = ImmutableList.of(DOUBLE, DOUBLE, VARCHAR, BIGINT);
             TypeOperators typeOperators = new TypeOperators();
             BlockTypeOperators blockTypeOperators = new BlockTypeOperators(typeOperators);
-            PageWithPositionComparator comparator = new SimplePageWithPositionComparator(
+            comparator = new SimplePageWithPositionComparator(
                     types,
                     ImmutableList.of(EXTENDED_PRICE, STATUS),
                     ImmutableList.of(DESC_NULLS_LAST, ASC_NULLS_FIRST),
                     typeOperators);
-            PageWithPositionEqualsAndHash equalsAndHash = new SimplePageWithPositionEqualsAndHash(
+            equalsAndHash = new SimplePageWithPositionEqualsAndHash(
                     types,
                     ImmutableList.of(EXTENDED_PRICE, STATUS),
                     blockTypeOperators);
 
-            page = createInputPage(Integer.valueOf(positions), types);
-            topNBuilder = new GroupedTopNRankBuilder(types, comparator, equalsAndHash, Integer.valueOf(topN), true, new CyclingGroupByHash(Integer.valueOf(groupCount)));
+            page = createInputPage(positions, types);
         }
 
-        public GroupedTopNBuilder getTopNBuilder()
+        public GroupedTopNBuilder newTopNBuilder()
         {
-            return topNBuilder;
+            return new GroupedTopNRankBuilder(types, comparator, equalsAndHash, topN, true, new int[0], new CyclingGroupByHash(groupCount));
         }
 
         public Page getPage()
@@ -102,11 +107,30 @@ public Page getPage()
         }
     }
 
+    @Benchmark
+    public long processTopNInput(BenchmarkData data)
+    {
+        GroupedTopNBuilder builder = data.newTopNBuilder();
+        Page inputPage = data.getPage();
+        for (int i = 0; i < data.addPageCalls; i++) {
+            if (!builder.processPage(inputPage).process()) {
+                throw new IllegalStateException("Work did not complete");
+            }
+        }
+        return builder.getEstimatedSizeInBytes();
+    }
+
     @Benchmark
     public List<Page> topN(BenchmarkData data)
     {
-        data.getTopNBuilder().processPage(data.getPage()).process();
-        return ImmutableList.copyOf(data.getTopNBuilder().buildResult());
+        GroupedTopNBuilder builder = data.newTopNBuilder();
+        Page inputPage = data.getPage();
+        for (int i = 0; i < data.addPageCalls; i++) {
+            if (!builder.processPage(inputPage).process()) {
+                throw new IllegalStateException("Work did not complete");
+            }
+        }
+        return ImmutableList.copyOf(builder.buildResult());
     }
 
     public static void main(String[] args)
@@ -114,7 +138,10 @@ public static void main(String[] args)
     {
         BenchmarkData data = new BenchmarkData();
         data.setup();
-        new BenchmarkGroupedTopNRankBuilder().topN(data);
+
+        BenchmarkGroupedTopNRankBuilder benchmark = new BenchmarkGroupedTopNRankBuilder();
+        benchmark.topN(data);
+        benchmark.processTopNInput(data);
 
         benchmark(BenchmarkGroupedTopNRankBuilder.class).run();
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupedTopNRowNumberBuilder.java b/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupedTopNRowNumberBuilder.java
index 66107715875c..9db292171a51 100644
--- a/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupedTopNRowNumberBuilder.java
+++ b/core/trino-main/src/test/java/io/trino/operator/BenchmarkGroupedTopNRowNumberBuilder.java
@@ -22,7 +22,6 @@
 import io.trino.tpch.LineItemGenerator;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Param;
@@ -66,28 +65,30 @@ public static class BenchmarkData
                 new TypeOperators());
 
         @Param({"1", "10", "100"})
-        private String topN = "1";
+        private int topN = 1;
 
         @Param({"10000", "1000000"})
-        private String positions = "1";
+        private int positions = 1000;
 
+        // when positions is evenly divisible by groupCount, each row will end up in the same group on each processPage call,
+        // which means it will stop inserting after topN is saturated which may or may not be desirable for any given benchmark scenario
         @Param({"1", "10000", "1000000"})
-        private String groupCount = "1";
+        private int groupCount = 1;
+
+        @Param("100")
+        private int addPageCalls = 1;
 
         private Page page;
-        private GroupedTopNRowNumberBuilder topNBuilder;
 
-        @Setup(value = Level.Invocation)
+        @Setup
         public void setup()
         {
-            page = createInputPage(Integer.valueOf(positions), types);
-
-            topNBuilder = new GroupedTopNRowNumberBuilder(types, comparator, Integer.valueOf(topN), false, new CyclingGroupByHash(Integer.valueOf(groupCount)));
+            page = createInputPage(positions, types);
         }
 
-        public GroupedTopNBuilder getTopNBuilder()
+        public GroupedTopNRowNumberBuilder newTopNRowNumberBuilder()
         {
-            return topNBuilder;
+            return new GroupedTopNRowNumberBuilder(types, comparator, topN, false, new int[0], new CyclingGroupByHash(groupCount));
         }
 
         public Page getPage()
@@ -96,11 +97,30 @@ public Page getPage()
         }
     }
 
+    @Benchmark
+    public long processTopNInput(BenchmarkData data)
+    {
+        GroupedTopNRowNumberBuilder topNBuilder = data.newTopNRowNumberBuilder();
+        Page inputPage = data.getPage();
+        for (int i = 0; i < data.addPageCalls; i++) {
+            if (!topNBuilder.processPage(inputPage).process()) {
+                throw new IllegalStateException("Work did not complete");
+            }
+        }
+        return topNBuilder.getEstimatedSizeInBytes();
+    }
+
     @Benchmark
     public List<Page> topN(BenchmarkData data)
     {
-        data.getTopNBuilder().processPage(data.getPage()).process();
-        return ImmutableList.copyOf(data.getTopNBuilder().buildResult());
+        GroupedTopNRowNumberBuilder topNBuilder = data.newTopNRowNumberBuilder();
+        Page inputPage = data.getPage();
+        for (int i = 0; i < data.addPageCalls; i++) {
+            if (!topNBuilder.processPage(inputPage).process()) {
+                throw new IllegalStateException("Work did not complete");
+            }
+        }
+        return ImmutableList.copyOf(topNBuilder.buildResult());
     }
 
     public static void main(String[] args)
@@ -108,7 +128,10 @@ public static void main(String[] args)
     {
         BenchmarkData data = new BenchmarkData();
         data.setup();
-        new BenchmarkGroupedTopNRowNumberBuilder().topN(data);
+
+        BenchmarkGroupedTopNRowNumberBuilder benchmark = new BenchmarkGroupedTopNRowNumberBuilder();
+        benchmark.topN(data);
+        benchmark.processTopNInput(data);
 
         benchmark(BenchmarkGroupedTopNRowNumberBuilder.class).run();
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/BenchmarkHashAndStreamingAggregationOperators.java b/core/trino-main/src/test/java/io/trino/operator/BenchmarkHashAndStreamingAggregationOperators.java
index e25f28f029c9..706edf89579a 100644
--- a/core/trino-main/src/test/java/io/trino/operator/BenchmarkHashAndStreamingAggregationOperators.java
+++ b/core/trino-main/src/test/java/io/trino/operator/BenchmarkHashAndStreamingAggregationOperators.java
@@ -28,9 +28,8 @@
 import io.trino.spiller.SpillerFactory;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.testing.TestingTaskContext;
-import io.trino.type.BlockTypeOperators;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -42,7 +41,6 @@
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.Iterator;
 import java.util.List;
@@ -81,12 +79,11 @@
 public class BenchmarkHashAndStreamingAggregationOperators
 {
     private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
-    private static final BlockTypeOperators BLOCK_TYPE_OPERATORS = new BlockTypeOperators(TYPE_OPERATORS);
     private static final JoinCompiler JOIN_COMPILER = new JoinCompiler(TYPE_OPERATORS);
 
     private static final TestingFunctionResolution FUNCTION_RESOLUTION = new TestingFunctionResolution();
-    private static final TestingAggregationFunction LONG_SUM = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("sum"), fromTypes(BIGINT));
-    private static final TestingAggregationFunction COUNT = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("count"), ImmutableList.of());
+    private static final TestingAggregationFunction LONG_SUM = FUNCTION_RESOLUTION.getAggregateFunction("sum", fromTypes(BIGINT));
+    private static final TestingAggregationFunction COUNT = FUNCTION_RESOLUTION.getAggregateFunction("count", ImmutableList.of());
 
     @State(Thread)
     public static class Context
@@ -266,7 +263,7 @@ private OperatorFactory createHashAggregationOperatorFactory(
                     succinctBytes(Integer.MAX_VALUE),
                     spillerFactory,
                     JOIN_COMPILER,
-                    BLOCK_TYPE_OPERATORS,
+                    TYPE_OPERATORS,
                     Optional.empty());
         }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/BenchmarkScanFilterAndProjectOperator.java b/core/trino-main/src/test/java/io/trino/operator/BenchmarkScanFilterAndProjectOperator.java
index 8d3b708b14b7..aa3e639245d3 100644
--- a/core/trino-main/src/test/java/io/trino/operator/BenchmarkScanFilterAndProjectOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/BenchmarkScanFilterAndProjectOperator.java
@@ -27,6 +27,7 @@
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.FixedPageSource;
 import io.trino.spi.type.Type;
+import io.trino.sql.PlannerContext;
 import io.trino.sql.gen.ExpressionCompiler;
 import io.trino.sql.gen.PageFunctionCompiler;
 import io.trino.sql.planner.Symbol;
@@ -38,6 +39,8 @@
 import io.trino.testing.TestingMetadata.TestingColumnHandle;
 import io.trino.testing.TestingSession;
 import io.trino.testing.TestingTaskContext;
+import io.trino.transaction.TestingTransactionManager;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -51,7 +54,6 @@
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.HashMap;
 import java.util.List;
@@ -71,7 +73,7 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.ExpressionTestUtils.createExpression;
 import static io.trino.sql.ExpressionTestUtils.getTypes;
-import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
+import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_HANDLE;
 import static io.trino.testing.TestingHandles.TEST_TABLE_HANDLE;
 import static io.trino.testing.TestingSplit.createLocalSplit;
@@ -90,6 +92,11 @@
 @BenchmarkMode(Mode.AverageTime)
 public class BenchmarkScanFilterAndProjectOperator
 {
+    private static final TestingTransactionManager TRANSACTION_MANAGER = new TestingTransactionManager();
+    private static final PlannerContext PLANNER_CONTEXT = plannerContextBuilder()
+            .withTransactionManager(TRANSACTION_MANAGER)
+            .build();
+
     private static final Map<String, Type> TYPE_MAP = ImmutableMap.of("bigint", BIGINT, "varchar", VARCHAR);
 
     private static final Session TEST_SESSION = TestingSession.testSessionBuilder().build();
@@ -222,7 +229,7 @@ else if (type == VARCHAR) {
 
         private RowExpression rowExpression(String value)
         {
-            Expression expression = createExpression(value, PLANNER_CONTEXT, TypeProvider.copyOf(symbolTypes));
+            Expression expression = createExpression(value, TRANSACTION_MANAGER, PLANNER_CONTEXT, TypeProvider.copyOf(symbolTypes));
 
             return SqlToRowExpressionTranslator.translate(
                     expression,
diff --git a/core/trino-main/src/test/java/io/trino/operator/BenchmarkTopNOperator.java b/core/trino-main/src/test/java/io/trino/operator/BenchmarkTopNOperator.java
index 2303a05e41f3..1b7112d61d8a 100644
--- a/core/trino-main/src/test/java/io/trino/operator/BenchmarkTopNOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/BenchmarkTopNOperator.java
@@ -23,6 +23,7 @@
 import io.trino.testing.TestingTaskContext;
 import io.trino.tpch.LineItem;
 import io.trino.tpch.LineItemGenerator;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
@@ -34,7 +35,6 @@
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.Iterator;
 import java.util.List;
@@ -50,7 +50,6 @@
 import static io.trino.spi.connector.SortOrder.DESC_NULLS_LAST;
 import static io.trino.spi.type.DateType.DATE;
 import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.testng.Assert.assertEquals;
@@ -88,7 +87,7 @@ public void setup()
             executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
             scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
 
-            List<Type> types = ImmutableList.of(DOUBLE, DOUBLE, VARCHAR, DOUBLE);
+            List<Type> types = ImmutableList.of(DOUBLE, DOUBLE, DATE, DOUBLE);
             pages = createInputPages(Integer.valueOf(positionsPerPage), types);
             operatorFactory = TopNOperator.createOperatorFactory(
                     0,
diff --git a/core/trino-main/src/test/java/io/trino/operator/BenchmarkWindowOperator.java b/core/trino-main/src/test/java/io/trino/operator/BenchmarkWindowOperator.java
index ee08482f6be7..08a76eae33d4 100644
--- a/core/trino-main/src/test/java/io/trino/operator/BenchmarkWindowOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/BenchmarkWindowOperator.java
@@ -23,6 +23,7 @@
 import io.trino.spi.connector.SortOrder;
 import io.trino.spi.type.Type;
 import io.trino.testing.TestingTaskContext;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -34,7 +35,6 @@
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -193,8 +193,8 @@ private RowPagesBuilder buildPages(int currentPartitionIdentifier, List<Type> ty
                         currentGroupIdentifier = groupIdentifier++;
                     }
 
-                    firstColumnBlockBuilder.writeLong(currentGroupIdentifier);
-                    secondColumnBlockBuilder.writeLong(currentPartitionIdentifier);
+                    BIGINT.writeLong(firstColumnBlockBuilder, currentGroupIdentifier);
+                    BIGINT.writeLong(secondColumnBlockBuilder, currentPartitionIdentifier);
                     ++currentNumberOfRowsInPartition;
                 }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/CyclingGroupByHash.java b/core/trino-main/src/test/java/io/trino/operator/CyclingGroupByHash.java
index 5db2d2819a0d..77ce46b3a4e7 100644
--- a/core/trino-main/src/test/java/io/trino/operator/CyclingGroupByHash.java
+++ b/core/trino-main/src/test/java/io/trino/operator/CyclingGroupByHash.java
@@ -13,16 +13,10 @@
  */
 package io.trino.operator;
 
-import com.google.common.collect.ImmutableList;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-
-import java.util.List;
 
 import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.spi.type.BigintType.BIGINT;
 
 /**
  * GroupByHash that provides a round robin group ID assignment.
@@ -47,12 +41,6 @@ public long getEstimatedSize()
         return INSTANCE_SIZE;
     }
 
-    @Override
-    public List<Type> getTypes()
-    {
-        return ImmutableList.of();
-    }
-
     @Override
     public int getGroupCount()
     {
@@ -72,25 +60,19 @@ public Work<?> addPage(Page page)
     }
 
     @Override
-    public Work<GroupByIdBlock> getGroupIds(Page page)
+    public Work<int[]> getGroupIds(Page page)
     {
-        BlockBuilder blockBuilder = BIGINT.createBlockBuilder(null, page.getChannelCount());
+        int[] groupIds = new int[page.getPositionCount()];
         for (int i = 0; i < page.getPositionCount(); i++) {
-            BIGINT.writeLong(blockBuilder, currentGroupId);
+            groupIds[i] = currentGroupId;
             maxGroupId = Math.max(currentGroupId, maxGroupId);
             currentGroupId = (currentGroupId + 1) % totalGroupCount;
         }
-        return new CompletedWork<>(new GroupByIdBlock(getGroupCount(), blockBuilder.build()));
-    }
-
-    @Override
-    public boolean contains(int position, Page page, int[] hashChannels)
-    {
-        throw new UnsupportedOperationException("Not yet supported");
+        return new CompletedWork<>(groupIds);
     }
 
     @Override
-    public long getRawHash(int groupyId)
+    public long getRawHash(int groupId)
     {
         throw new UnsupportedOperationException("Not yet supported");
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/GenericLongFunction.java b/core/trino-main/src/test/java/io/trino/operator/GenericLongFunction.java
index ec7bb98c9497..f2400c22342c 100644
--- a/core/trino-main/src/test/java/io/trino/operator/GenericLongFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/GenericLongFunction.java
@@ -39,9 +39,8 @@ public final class GenericLongFunction
 
     GenericLongFunction(String suffix, LongUnaryOperator longUnaryOperator)
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("generic_long_" + requireNonNull(suffix, "suffix is null"))
                 .signature(Signature.builder()
-                        .name("generic_long_" + requireNonNull(suffix, "suffix is null"))
                         .returnType(BIGINT)
                         .argumentType(BIGINT)
                         .build())
diff --git a/core/trino-main/src/test/java/io/trino/operator/GroupByHashYieldAssertion.java b/core/trino-main/src/test/java/io/trino/operator/GroupByHashYieldAssertion.java
index 5fedb4f5cc31..885eb2d94040 100644
--- a/core/trino-main/src/test/java/io/trino/operator/GroupByHashYieldAssertion.java
+++ b/core/trino-main/src/test/java/io/trino/operator/GroupByHashYieldAssertion.java
@@ -42,7 +42,9 @@
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.operator.OperatorAssertion.finishOperator;
 import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.testing.TestingTaskContext.createTaskContext;
+import static java.lang.Math.max;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
@@ -96,16 +98,29 @@ public static GroupByHashYieldResult finishOperatorWithYieldingGroupByHash(List<
                 .addDriverContext();
         Operator operator = operatorFactory.createOperator(driverContext);
 
+        byte[] pointer = new byte[VariableWidthData.POINTER_SIZE];
+        VariableWidthData variableWidthData = new VariableWidthData();
+
         // run operator
         int yieldCount = 0;
-        long expectedReservedExtraBytes = 0;
+        long maxReservedBytes = 0;
         for (Page page : input) {
+            // compute the memory reserved by the variable width data allocator for this page
+            long pageVariableWidthSize = 0;
+            if (hashKeyType == VARCHAR) {
+                long oldVariableWidthSize = variableWidthData.getRetainedSizeBytes();
+                for (int position = 0; position < page.getPositionCount(); position++) {
+                    variableWidthData.allocate(pointer, 0, page.getBlock(0).getSliceLength(position));
+                }
+                pageVariableWidthSize = variableWidthData.getRetainedSizeBytes() - oldVariableWidthSize;
+            }
+
             // unblocked
             assertTrue(operator.needsInput());
 
-            // saturate the pool with a tiny memory left
-            long reservedMemoryInBytes = memoryPool.getFreeBytes() - additionalMemoryInBytes;
-            memoryPool.reserve(anotherTaskId, "test", reservedMemoryInBytes);
+            // reserve the most of the memory pool, except for the space necessary for the variable with data
+            // a small bit of memory is left unallocated for the aggregators
+            memoryPool.reserve(anotherTaskId, "test", memoryPool.getFreeBytes() - additionalMemoryInBytes - pageVariableWidthSize);
 
             long oldMemoryUsage = operator.getOperatorContext().getDriverContext().getMemoryUsage();
             int oldCapacity = getHashCapacity.apply(operator);
@@ -120,12 +135,13 @@ public static GroupByHashYieldResult finishOperatorWithYieldingGroupByHash(List<
             }
 
             long newMemoryUsage = operator.getOperatorContext().getDriverContext().getMemoryUsage();
+            maxReservedBytes = max(maxReservedBytes, newMemoryUsage);
 
             // Skip if the memory usage is not large enough since we cannot distinguish
             // between rehash and memory used by aggregator
             if (newMemoryUsage < DataSize.of(4, MEGABYTE).toBytes()) {
                 // free the pool for the next iteration
-                memoryPool.free(anotherTaskId, "test", reservedMemoryInBytes);
+                memoryPool.free(anotherTaskId, "test", memoryPool.getTaskMemoryReservations().get(anotherTaskId));
                 // this required in case input is blocked
                 output = operator.getOutput();
                 if (output != null) {
@@ -134,10 +150,10 @@ public static GroupByHashYieldResult finishOperatorWithYieldingGroupByHash(List<
                 continue;
             }
 
-            long actualIncreasedMemory = newMemoryUsage - oldMemoryUsage;
+            long actualHashIncreased = newMemoryUsage - oldMemoryUsage - pageVariableWidthSize;
 
             if (operator.needsInput()) {
-                // We have successfully added a page
+                // The page processing completed
 
                 // Assert we are not blocked
                 assertTrue(operator.getOperatorContext().isWaitingForMemory().isDone());
@@ -146,33 +162,37 @@ public static GroupByHashYieldResult finishOperatorWithYieldingGroupByHash(List<
                 assertEquals((int) getHashCapacity.apply(operator), oldCapacity);
 
                 // We are not going to rehash; therefore, assert the memory increase only comes from the aggregator
-                assertLessThan(actualIncreasedMemory, additionalMemoryInBytes);
+                assertLessThan(actualHashIncreased, additionalMemoryInBytes);
 
                 // free the pool for the next iteration
-                memoryPool.free(anotherTaskId, "test", reservedMemoryInBytes);
+                memoryPool.free(anotherTaskId, "test", memoryPool.getTaskMemoryReservations().get(anotherTaskId));
             }
             else {
-                // We failed to finish the page processing i.e. we yielded
+                // Page processing is not completed
                 yieldCount++;
 
-                // Assert we are blocked
+                // Assert we are blocked waiting for memory
                 assertFalse(operator.getOperatorContext().isWaitingForMemory().isDone());
 
-                // Hash table capacity should not change
+                // Hash table capacity should not have changed, because memory must be allocated first
                 assertEquals(oldCapacity, (long) getHashCapacity.apply(operator));
 
-                expectedReservedExtraBytes = getHashTableSizeInBytes(hashKeyType, oldCapacity * 2);
+                long expectedHashBytes;
                 if (hashKeyType == BIGINT) {
-                    expectedReservedExtraBytes += page.getRetainedSizeInBytes();
+                    // The increase in hash memory should be twice the current capacity.
+                    expectedHashBytes = getHashTableSizeInBytes(hashKeyType, oldCapacity * 2);
                 }
-                // Increased memory is no smaller than the hash table size and no greater than the hash table size + the memory used by aggregator
-                assertBetweenInclusive(actualIncreasedMemory, expectedReservedExtraBytes, expectedReservedExtraBytes + additionalMemoryInBytes);
+                else {
+                    // Flat hash uses an incremental rehash, so as new memory is allocated old memory is freed
+                    expectedHashBytes = getHashTableSizeInBytes(hashKeyType, oldCapacity) + oldCapacity;
+                }
+                assertBetweenInclusive(actualHashIncreased, expectedHashBytes, expectedHashBytes + additionalMemoryInBytes);
 
                 // Output should be blocked as well
                 assertNull(operator.getOutput());
 
                 // Free the pool to unblock
-                memoryPool.free(anotherTaskId, "test", reservedMemoryInBytes);
+                memoryPool.free(anotherTaskId, "test", memoryPool.getTaskMemoryReservations().get(anotherTaskId));
 
                 // Trigger a process through getOutput() or needsInput()
                 output = operator.getOutput();
@@ -186,16 +206,15 @@ public static GroupByHashYieldResult finishOperatorWithYieldingGroupByHash(List<
 
                 // Assert the estimated reserved memory after rehash is lower than the one before rehash (extra memory allocation has been released)
                 long rehashedMemoryUsage = operator.getOperatorContext().getDriverContext().getMemoryUsage();
-                long previousHashTableSizeInBytes = getHashTableSizeInBytes(hashKeyType, oldCapacity);
-                long expectedMemoryUsageAfterRehash = newMemoryUsage - previousHashTableSizeInBytes;
+                long expectedMemoryUsageAfterRehash = oldMemoryUsage + getHashTableSizeInBytes(hashKeyType, oldCapacity);
                 double memoryUsageErrorUpperBound = 1.01;
                 double memoryUsageError = rehashedMemoryUsage * 1.0 / expectedMemoryUsageAfterRehash;
                 if (memoryUsageError > memoryUsageErrorUpperBound) {
                     // Usually the error is < 1%, but since MultiChannelGroupByHash.getEstimatedSize
                     // accounts for changes in completedPagesMemorySize, which is increased if new page is
                     // added by addNewGroup (an even that cannot be predicted as it depends on the number of unique groups
-                    // in the current page being processed), the difference includes size of the added new page.
-                    // Lower bound is 1% lower than normal because additionalMemoryInBytes includes also aggregator state.
+                    // in the current page being processed), the difference includes the size of the added new page.
+                    // Lower bound is 1% lower than normal because "additionalMemoryInBytes" includes also aggregator state.
                     assertBetweenInclusive(rehashedMemoryUsage * 1.0 / (expectedMemoryUsageAfterRehash + additionalMemoryInBytes), 0.97, memoryUsageErrorUpperBound,
                             "rehashedMemoryUsage " + rehashedMemoryUsage + ", expectedMemoryUsageAfterRehash: " + expectedMemoryUsageAfterRehash);
                 }
@@ -210,7 +229,7 @@ public static GroupByHashYieldResult finishOperatorWithYieldingGroupByHash(List<
         }
 
         result.addAll(finishOperator(operator));
-        return new GroupByHashYieldResult(yieldCount, expectedReservedExtraBytes, result);
+        return new GroupByHashYieldResult(yieldCount, maxReservedBytes, result);
     }
 
     private static long getHashTableSizeInBytes(Type hashKeyType, int capacity)
@@ -219,8 +238,18 @@ private static long getHashTableSizeInBytes(Type hashKeyType, int capacity)
             // groupIds and values double by hashCapacity; while valuesByGroupId double by maxFill = hashCapacity / 0.75
             return capacity * (long) (Long.BYTES * 1.75 + Integer.BYTES);
         }
-        // groupIdsByHash, and rawHashByHashPosition double by hashCapacity
-        return capacity * (long) (Integer.BYTES + Byte.BYTES);
+
+        @SuppressWarnings("OverlyComplexArithmeticExpression")
+        int sizePerEntry = Byte.BYTES + // control byte
+                Integer.BYTES + // groupId to hashPosition
+                VariableWidthData.POINTER_SIZE + // variable width pointer
+                Integer.BYTES + // groupId
+                Long.BYTES + // rawHash (optional, but present in this test)
+                Byte.BYTES + // field null
+                Integer.BYTES + // field variable length
+                Long.BYTES + // field first 8 bytes
+                Integer.BYTES; // field variable offset (or 4 more field bytes)
+        return (long) capacity * sizePerEntry;
     }
 
     public static final class GroupByHashYieldResult
diff --git a/core/trino-main/src/test/java/io/trino/operator/MockExchangeRequestProcessor.java b/core/trino-main/src/test/java/io/trino/operator/MockExchangeRequestProcessor.java
index a572765ce3f7..fd17bacf99eb 100644
--- a/core/trino-main/src/test/java/io/trino/operator/MockExchangeRequestProcessor.java
+++ b/core/trino-main/src/test/java/io/trino/operator/MockExchangeRequestProcessor.java
@@ -46,7 +46,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
 import static io.trino.TrinoMediaTypes.TRINO_PAGES;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.execution.buffer.PagesSerdeUtil.calculateChecksum;
 import static io.trino.server.InternalHeaders.TRINO_BUFFER_COMPLETE;
 import static io.trino.server.InternalHeaders.TRINO_PAGE_NEXT_TOKEN;
diff --git a/core/trino-main/src/test/java/io/trino/operator/OperatorAssertion.java b/core/trino-main/src/test/java/io/trino/operator/OperatorAssertion.java
index ac664e55cf50..7dacf2105754 100644
--- a/core/trino-main/src/test/java/io/trino/operator/OperatorAssertion.java
+++ b/core/trino-main/src/test/java/io/trino/operator/OperatorAssertion.java
@@ -20,8 +20,7 @@
 import io.trino.Session;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.testing.MaterializedResult;
@@ -44,6 +43,7 @@
 import static io.airlift.concurrent.MoreFutures.tryGetFutureValue;
 import static io.airlift.testing.Assertions.assertEqualsIgnoreOrder;
 import static io.trino.operator.PageAssertions.assertPageEquals;
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
 import static io.trino.util.StructuralTestUtil.appendToBlockBuilder;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -195,18 +195,15 @@ public static MaterializedResult toMaterializedResult(Session session, List<Type
         return resultBuilder.build();
     }
 
-    public static Block toRow(List<Type> parameterTypes, Object... values)
+    public static SqlRow toRow(List<Type> parameterTypes, Object... values)
     {
         checkArgument(parameterTypes.size() == values.length, "parameterTypes.size(" + parameterTypes.size() + ") does not equal to values.length(" + values.length + ")");
 
-        RowType rowType = RowType.anonymous(parameterTypes);
-        BlockBuilder blockBuilder = new RowBlockBuilder(parameterTypes, null, 1);
-        BlockBuilder singleRowBlockWriter = blockBuilder.beginBlockEntry();
-        for (int i = 0; i < values.length; i++) {
-            appendToBlockBuilder(parameterTypes.get(i), values[i], singleRowBlockWriter);
-        }
-        blockBuilder.closeEntry();
-        return rowType.getObject(blockBuilder, 0);
+        return buildRowValue(RowType.anonymous(parameterTypes), fields -> {
+            for (int i = 0; i < values.length; i++) {
+                appendToBlockBuilder(parameterTypes.get(i), values[i], fields.get(i));
+            }
+        });
     }
 
     public static void assertOperatorEquals(OperatorFactory operatorFactory, List<Type> types, DriverContext driverContext, List<Page> input, List<Page> expected)
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestAggregationOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestAggregationOperator.java
index 19f90fb2c0ec..7d852cf6ab84 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestAggregationOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestAggregationOperator.java
@@ -23,11 +23,11 @@
 import io.trino.spi.block.ByteArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Optional;
@@ -55,31 +55,32 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestAggregationOperator
 {
     private static final TestingFunctionResolution FUNCTION_RESOLUTION = new TestingFunctionResolution();
 
-    private static final TestingAggregationFunction LONG_AVERAGE = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("avg"), fromTypes(BIGINT));
-    private static final TestingAggregationFunction DOUBLE_SUM = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("sum"), fromTypes(DOUBLE));
-    private static final TestingAggregationFunction LONG_SUM = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("sum"), fromTypes(BIGINT));
-    private static final TestingAggregationFunction REAL_SUM = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("sum"), fromTypes(REAL));
-    private static final TestingAggregationFunction COUNT = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("count"), ImmutableList.of());
+    private static final TestingAggregationFunction LONG_AVERAGE = FUNCTION_RESOLUTION.getAggregateFunction("avg", fromTypes(BIGINT));
+    private static final TestingAggregationFunction DOUBLE_SUM = FUNCTION_RESOLUTION.getAggregateFunction("sum", fromTypes(DOUBLE));
+    private static final TestingAggregationFunction LONG_SUM = FUNCTION_RESOLUTION.getAggregateFunction("sum", fromTypes(BIGINT));
+    private static final TestingAggregationFunction REAL_SUM = FUNCTION_RESOLUTION.getAggregateFunction("sum", fromTypes(REAL));
+    private static final TestingAggregationFunction COUNT = FUNCTION_RESOLUTION.getAggregateFunction("count", ImmutableList.of());
 
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
         scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         executor.shutdownNow();
@@ -149,8 +150,8 @@ public void testDistinctMaskWithNulls()
     @Test
     public void testAggregation()
     {
-        TestingAggregationFunction countVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("count"), fromTypes(VARCHAR));
-        TestingAggregationFunction maxVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("max"), fromTypes(VARCHAR));
+        TestingAggregationFunction countVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction("count", fromTypes(VARCHAR));
+        TestingAggregationFunction maxVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction("max", fromTypes(VARCHAR));
         List<Page> input = rowPagesBuilder(VARCHAR, BIGINT, VARCHAR, BIGINT, REAL, DOUBLE, VARCHAR)
                 .addSequencePage(100, 0, 0, 300, 500, 400, 500, 500)
                 .build();
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestAnnotationEngine.java b/core/trino-main/src/test/java/io/trino/operator/TestAnnotationEngine.java
deleted file mode 100644
index 4e60a1aee6ff..000000000000
--- a/core/trino-main/src/test/java/io/trino/operator/TestAnnotationEngine.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed 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 io.trino.operator;
-
-import io.trino.operator.aggregation.ParametricAggregationImplementation;
-import io.trino.operator.scalar.ParametricScalar;
-
-import static org.testng.Assert.assertEquals;
-
-abstract class TestAnnotationEngine
-{
-    void assertImplementationCount(ParametricScalar scalar, int exact, int specialized, int generic)
-    {
-        assertImplementationCount(scalar.getImplementations(), exact, specialized, generic);
-    }
-
-    void assertImplementationCount(ParametricImplementationsGroup<?> implementations, int exact, int specialized, int generic)
-    {
-        assertEquals(implementations.getExactImplementations().size(), exact);
-        assertEquals(implementations.getSpecializedImplementations().size(), specialized);
-        assertEquals(implementations.getGenericImplementations().size(), generic);
-    }
-
-    void assertDependencyCount(ParametricAggregationImplementation implementation, int input, int combine, int output)
-    {
-        assertEquals(implementation.getInputDependencies().size(), input);
-        assertEquals(implementation.getCombineDependencies().size(), combine);
-        assertEquals(implementation.getOutputDependencies().size(), output);
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestAnnotationEngineForAggregates.java b/core/trino-main/src/test/java/io/trino/operator/TestAnnotationEngineForAggregates.java
index 5435e3ce5296..174820181ad1 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestAnnotationEngineForAggregates.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestAnnotationEngineForAggregates.java
@@ -23,6 +23,7 @@
 import io.trino.metadata.InternalFunctionDependencies;
 import io.trino.metadata.MetadataManager;
 import io.trino.metadata.ResolvedFunction;
+import io.trino.metadata.SignatureBinder;
 import io.trino.metadata.SqlAggregationFunction;
 import io.trino.operator.aggregation.ParametricAggregation;
 import io.trino.operator.aggregation.ParametricAggregationImplementation;
@@ -34,8 +35,10 @@
 import io.trino.operator.annotations.LiteralImplementationDependency;
 import io.trino.operator.annotations.OperatorImplementationDependency;
 import io.trino.operator.annotations.TypeImplementationDependency;
+import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationFunctionMetadata;
 import io.trino.spi.function.AggregationState;
@@ -46,6 +49,7 @@
 import io.trino.spi.function.Convention;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.FunctionDependencies;
+import io.trino.spi.function.FunctionDependencyDeclaration;
 import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.InputFunction;
 import io.trino.spi.function.LiteralParameter;
@@ -61,18 +65,24 @@
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignature;
+import io.trino.sql.tree.QualifiedName;
 import io.trino.type.Constraint;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.metadata.FunctionManager.createTestingFunctionManager;
+import static io.trino.metadata.GlobalFunctionCatalog.BUILTIN_SCHEMA;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.metadata.MetadataManager.createTestMetadataManager;
+import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
+import static io.trino.operator.AnnotationEngineAssertions.assertDependencyCount;
+import static io.trino.operator.AnnotationEngineAssertions.assertImplementationCount;
 import static io.trino.operator.aggregation.AggregationFromAnnotationsParser.parseFunctionDefinitions;
 import static io.trino.operator.aggregation.AggregationFromAnnotationsParser.toAccumulatorStateDetails;
 import static io.trino.operator.aggregation.AggregationFunctionAdapter.AggregationParameterKind.BLOCK_INDEX;
@@ -86,14 +96,16 @@
 import static io.trino.spi.type.TypeSignature.arrayType;
 import static io.trino.spi.type.TypeSignatureParameter.typeVariable;
 import static io.trino.spi.type.VarcharType.createVarcharType;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypeSignatures;
+import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
 import static java.lang.invoke.MethodType.methodType;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 public class TestAnnotationEngineForAggregates
-        extends TestAnnotationEngine
 {
     private static final MetadataManager METADATA = createTestMetadataManager();
     private static final FunctionManager FUNCTION_MANAGER = createTestingFunctionManager();
@@ -126,7 +138,6 @@ public static void output(@AggregationState NullableDoubleState state, BlockBuil
     public void testSimpleExactAggregationParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("simple_exact_aggregate")
                 .returnType(DoubleType.DOUBLE)
                 .argumentType(DoubleType.DOUBLE)
                 .build();
@@ -143,7 +154,7 @@ public void testSimpleExactAggregationParse()
         assertFalse(implementation.hasSpecializedTypeParameters());
         assertEquals(implementation.getInputParameterKinds(), ImmutableList.of(STATE, INPUT_CHANNEL));
 
-        BoundSignature boundSignature = new BoundSignature(expectedSignature.getName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
+        BoundSignature boundSignature = builtinFunction("simple_exact_aggregate", DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
         AggregationFunctionMetadata aggregationMetadata = aggregation.getAggregationMetadata();
         assertFalse(aggregationMetadata.isOrderSensitive());
         assertFalse(aggregationMetadata.getIntermediateTypes().isEmpty());
@@ -243,7 +254,7 @@ public void testNotAnnotatedAggregateStateAggregationParse()
         ParametricAggregationImplementation implementation = getOnlyElement(aggregation.getImplementations().getExactImplementations().values());
         assertEquals(implementation.getInputParameterKinds(), ImmutableList.of(STATE, INPUT_CHANNEL));
 
-        BoundSignature boundSignature = new BoundSignature(aggregation.getFunctionMetadata().getSignature().getName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
+        BoundSignature boundSignature = builtinFunction(aggregation.getFunctionMetadata().getCanonicalName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
         AggregationFunctionMetadata aggregationMetadata = aggregation.getAggregationMetadata();
         assertFalse(aggregationMetadata.isOrderSensitive());
         assertFalse(aggregationMetadata.getIntermediateTypes().isEmpty());
@@ -275,7 +286,6 @@ public static void output(
     public void testNotDecomposableAggregationParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("custom_decomposable_aggregate")
                 .returnType(DoubleType.DOUBLE)
                 .argumentType(DoubleType.DOUBLE)
                 .build();
@@ -285,7 +295,7 @@ public void testNotDecomposableAggregationParse()
         assertTrue(aggregation.getFunctionMetadata().isDeterministic());
         assertEquals(aggregation.getFunctionMetadata().getSignature(), expectedSignature);
 
-        BoundSignature boundSignature = new BoundSignature(aggregation.getFunctionMetadata().getSignature().getName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
+        BoundSignature boundSignature = builtinFunction(aggregation.getFunctionMetadata().getCanonicalName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
         AggregationFunctionMetadata aggregationMetadata = aggregation.getAggregationMetadata();
         assertFalse(aggregationMetadata.isOrderSensitive());
         assertTrue(aggregationMetadata.getIntermediateTypes().isEmpty());
@@ -335,7 +345,6 @@ public static void output(
     public void testSimpleGenericAggregationFunctionParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("simple_generic_implementations")
                 .typeVariable("T")
                 .returnType(new TypeSignature("T"))
                 .argumentType(new TypeSignature("T"))
@@ -366,7 +375,7 @@ public void testSimpleGenericAggregationFunctionParse()
         assertFalse(implementationLong.hasSpecializedTypeParameters());
         assertEquals(implementationLong.getInputParameterKinds(), ImmutableList.of(STATE, INPUT_CHANNEL));
 
-        BoundSignature boundSignature = new BoundSignature(aggregation.getFunctionMetadata().getSignature().getName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
+        BoundSignature boundSignature = builtinFunction(aggregation.getFunctionMetadata().getCanonicalName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
         AggregationFunctionMetadata aggregationMetadata = aggregation.getAggregationMetadata();
         assertFalse(aggregationMetadata.isOrderSensitive());
         assertFalse(aggregationMetadata.getIntermediateTypes().isEmpty());
@@ -380,7 +389,7 @@ public static final class BlockInputAggregationFunction
         @InputFunction
         public static void input(
                 @AggregationState NullableDoubleState state,
-                @BlockPosition @SqlType(DOUBLE) Block value,
+                @BlockPosition @SqlType(DOUBLE) ValueBlock value,
                 @BlockIndex int id)
         {
             // noop this is only for annotation testing puproses
@@ -407,7 +416,6 @@ public static void output(
     public void testSimpleBlockInputAggregationParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("block_input_aggregate")
                 .returnType(DoubleType.DOUBLE)
                 .argumentType(DoubleType.DOUBLE)
                 .build();
@@ -424,7 +432,7 @@ public void testSimpleBlockInputAggregationParse()
         assertFalse(implementation.hasSpecializedTypeParameters());
         assertEquals(implementation.getInputParameterKinds(), ImmutableList.of(STATE, BLOCK_INPUT_CHANNEL, BLOCK_INDEX));
 
-        BoundSignature boundSignature = new BoundSignature(aggregation.getFunctionMetadata().getSignature().getName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
+        BoundSignature boundSignature = builtinFunction(aggregation.getFunctionMetadata().getCanonicalName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
         AggregationFunctionMetadata aggregationMetadata = aggregation.getAggregationMetadata();
         assertFalse(aggregationMetadata.isOrderSensitive());
         assertFalse(aggregationMetadata.getIntermediateTypes().isEmpty());
@@ -486,11 +494,11 @@ public static void output(
         }
     }
 
-    @Test(enabled = false) // TODO this is not yet supported
+    @Test
+    @Disabled // TODO this is not yet supported
     public void testSimpleImplicitSpecializedAggregationParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("implicit_specialized_aggregate")
                 .typeVariable("T")
                 .returnType(new TypeSignature("T"))
                 .argumentType(arrayType(new TypeSignature("T")))
@@ -514,7 +522,7 @@ public void testSimpleImplicitSpecializedAggregationParse()
         assertFalse(implementation2.hasSpecializedTypeParameters());
         assertEquals(implementation2.getInputParameterKinds(), ImmutableList.of(STATE, INPUT_CHANNEL, INPUT_CHANNEL));
 
-        BoundSignature boundSignature = new BoundSignature(aggregation.getFunctionMetadata().getSignature().getName(), DoubleType.DOUBLE, ImmutableList.of(new ArrayType(DoubleType.DOUBLE)));
+        BoundSignature boundSignature = builtinFunction(aggregation.getFunctionMetadata().getCanonicalName(), DoubleType.DOUBLE, ImmutableList.of(new ArrayType(DoubleType.DOUBLE)));
         AggregationFunctionMetadata aggregationMetadata = aggregation.getAggregationMetadata();
         assertFalse(aggregationMetadata.isOrderSensitive());
         assertFalse(aggregationMetadata.getIntermediateTypes().isEmpty());
@@ -577,11 +585,11 @@ public static void output(
         }
     }
 
-    @Test(enabled = false) // TODO this is not yet supported
+    @Test
+    @Disabled // TODO this is not yet supported
     public void testSimpleExplicitSpecializedAggregationParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("explicit_specialized_aggregate")
                 .typeVariable("T")
                 .returnType(new TypeSignature("T"))
                 .argumentType(arrayType(new TypeSignature("T")))
@@ -603,7 +611,7 @@ public void testSimpleExplicitSpecializedAggregationParse()
         assertFalse(implementation2.hasSpecializedTypeParameters());
         assertEquals(implementation2.getInputParameterKinds(), ImmutableList.of(STATE, INPUT_CHANNEL));
 
-        BoundSignature boundSignature = new BoundSignature(aggregation.getFunctionMetadata().getSignature().getName(), DoubleType.DOUBLE, ImmutableList.of(new ArrayType(DoubleType.DOUBLE)));
+        BoundSignature boundSignature = builtinFunction(aggregation.getFunctionMetadata().getCanonicalName(), DoubleType.DOUBLE, ImmutableList.of(new ArrayType(DoubleType.DOUBLE)));
         AggregationFunctionMetadata aggregationMetadata = aggregation.getAggregationMetadata();
         assertFalse(aggregationMetadata.isOrderSensitive());
         assertFalse(aggregationMetadata.getIntermediateTypes().isEmpty());
@@ -654,13 +662,11 @@ public static void output2(
     public void testMultiOutputAggregationParse()
     {
         Signature expectedSignature1 = Signature.builder()
-                .name("multi_output_aggregate_1")
                 .returnType(DoubleType.DOUBLE)
                 .argumentType(DoubleType.DOUBLE)
                 .build();
 
         Signature expectedSignature2 = Signature.builder()
-                .name("multi_output_aggregate_2")
                 .returnType(DoubleType.DOUBLE)
                 .argumentType(DoubleType.DOUBLE)
                 .build();
@@ -668,11 +674,11 @@ public void testMultiOutputAggregationParse()
         List<ParametricAggregation> aggregations = parseFunctionDefinitions(MultiOutputAggregationFunction.class);
         assertEquals(aggregations.size(), 2);
 
-        ParametricAggregation aggregation1 = aggregations.stream().filter(aggregate -> aggregate.getFunctionMetadata().getSignature().getName().equals("multi_output_aggregate_1")).collect(toImmutableList()).get(0);
+        ParametricAggregation aggregation1 = aggregations.stream().filter(aggregate -> aggregate.getFunctionMetadata().getCanonicalName().equals("multi_output_aggregate_1")).collect(toImmutableList()).get(0);
         assertEquals(aggregation1.getFunctionMetadata().getSignature(), expectedSignature1);
         assertEquals(aggregation1.getFunctionMetadata().getDescription(), "Simple multi output function aggregate specialized description");
 
-        ParametricAggregation aggregation2 = aggregations.stream().filter(aggregate -> aggregate.getFunctionMetadata().getSignature().getName().equals("multi_output_aggregate_2")).collect(toImmutableList()).get(0);
+        ParametricAggregation aggregation2 = aggregations.stream().filter(aggregate -> aggregate.getFunctionMetadata().getCanonicalName().equals("multi_output_aggregate_2")).collect(toImmutableList()).get(0);
         assertEquals(aggregation2.getFunctionMetadata().getSignature(), expectedSignature2);
         assertEquals(aggregation2.getFunctionMetadata().getDescription(), "Simple multi output function aggregate generic description");
 
@@ -688,7 +694,7 @@ public void testMultiOutputAggregationParse()
         assertFalse(implementation.hasSpecializedTypeParameters());
         assertEquals(implementation.getInputParameterKinds(), ImmutableList.of(STATE, INPUT_CHANNEL));
 
-        BoundSignature boundSignature = new BoundSignature(aggregation1.getFunctionMetadata().getSignature().getName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
+        BoundSignature boundSignature = builtinFunction(aggregation1.getFunctionMetadata().getCanonicalName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
         AggregationFunctionMetadata aggregationMetadata = aggregation1.getAggregationMetadata();
         assertFalse(aggregationMetadata.isOrderSensitive());
         assertFalse(aggregationMetadata.getIntermediateTypes().isEmpty());
@@ -743,7 +749,6 @@ public static void output(
     public void testInjectOperatorAggregateParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("inject_operator_aggregate")
                 .returnType(DoubleType.DOUBLE)
                 .argumentType(DoubleType.DOUBLE)
                 .build();
@@ -765,7 +770,7 @@ public void testInjectOperatorAggregateParse()
         assertFalse(implementation.hasSpecializedTypeParameters());
         assertEquals(implementation.getInputParameterKinds(), ImmutableList.of(STATE, INPUT_CHANNEL));
 
-        BoundSignature boundSignature = new BoundSignature(aggregation.getFunctionMetadata().getSignature().getName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
+        BoundSignature boundSignature = builtinFunction(aggregation.getFunctionMetadata().getCanonicalName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
         specializeAggregationFunction(boundSignature, aggregation);
     }
 
@@ -806,7 +811,6 @@ public static void output(
     public void testInjectTypeAggregateParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("inject_type_aggregate")
                 .typeVariable("T")
                 .returnType(new TypeSignature("T"))
                 .argumentType(new TypeSignature("T"))
@@ -830,7 +834,7 @@ public void testInjectTypeAggregateParse()
         assertFalse(implementation.hasSpecializedTypeParameters());
         assertEquals(implementation.getInputParameterKinds(), ImmutableList.of(STATE, INPUT_CHANNEL));
 
-        BoundSignature boundSignature = new BoundSignature(aggregation.getFunctionMetadata().getSignature().getName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
+        BoundSignature boundSignature = builtinFunction(aggregation.getFunctionMetadata().getCanonicalName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE));
         specializeAggregationFunction(boundSignature, aggregation);
     }
 
@@ -871,7 +875,6 @@ public static void output(
     public void testInjectLiteralAggregateParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("inject_literal_aggregate")
                 .returnType(new TypeSignature("varchar", typeVariable("x")))
                 .argumentType(new TypeSignature("varchar", typeVariable("x")))
                 .build();
@@ -894,7 +897,7 @@ public void testInjectLiteralAggregateParse()
         assertFalse(implementation.hasSpecializedTypeParameters());
         assertEquals(implementation.getInputParameterKinds(), ImmutableList.of(STATE, INPUT_CHANNEL));
 
-        BoundSignature boundSignature = new BoundSignature(aggregation.getFunctionMetadata().getSignature().getName(), createVarcharType(17), ImmutableList.of(createVarcharType(17)));
+        BoundSignature boundSignature = builtinFunction(aggregation.getFunctionMetadata().getCanonicalName(), createVarcharType(17), ImmutableList.of(createVarcharType(17)));
         AggregationFunctionMetadata aggregationMetadata = aggregation.getAggregationMetadata();
         assertFalse(aggregationMetadata.isOrderSensitive());
         assertFalse(aggregationMetadata.getIntermediateTypes().isEmpty());
@@ -937,7 +940,6 @@ public static void output(
     public void testLongConstraintAggregateFunctionParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("parametric_aggregate_long_constraint")
                 .longVariable("z", "x + y")
                 .returnType(new TypeSignature("varchar", typeVariable("z")))
                 .argumentType(new TypeSignature("varchar", typeVariable("x")))
@@ -958,7 +960,7 @@ public void testLongConstraintAggregateFunctionParse()
         assertFalse(implementation.hasSpecializedTypeParameters());
         assertEquals(implementation.getInputParameterKinds(), ImmutableList.of(STATE, INPUT_CHANNEL, INPUT_CHANNEL));
 
-        BoundSignature boundSignature = new BoundSignature(aggregation.getFunctionMetadata().getSignature().getName(), createVarcharType(30), ImmutableList.of(createVarcharType(17), createVarcharType(13)));
+        BoundSignature boundSignature = builtinFunction(aggregation.getFunctionMetadata().getCanonicalName(), createVarcharType(30), ImmutableList.of(createVarcharType(17), createVarcharType(13)));
         AggregationFunctionMetadata aggregationMetadata = aggregation.getAggregationMetadata();
         assertFalse(aggregationMetadata.isOrderSensitive());
         assertFalse(aggregationMetadata.getIntermediateTypes().isEmpty());
@@ -1001,7 +1003,6 @@ public static void output(
     public void testFixedTypeParameterInjectionAggregateFunctionParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("fixed_type_parameter_injection")
                 .returnType(DoubleType.DOUBLE.getTypeSignature())
                 .argumentType(DoubleType.DOUBLE.getTypeSignature())
                 .build();
@@ -1062,7 +1063,6 @@ public static void output(
     public void testPartiallyFixedTypeParameterInjectionAggregateFunctionParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("partially_fixed_type_parameter_injection")
                 .typeVariable("T1")
                 .typeVariable("T2")
                 .returnType(DoubleType.DOUBLE)
@@ -1083,7 +1083,7 @@ public void testPartiallyFixedTypeParameterInjectionAggregateFunctionParse()
         assertFalse(implementationDouble.hasSpecializedTypeParameters());
         assertEquals(implementationDouble.getInputParameterKinds(), ImmutableList.of(STATE, INPUT_CHANNEL, INPUT_CHANNEL));
 
-        BoundSignature boundSignature = new BoundSignature(aggregation.getFunctionMetadata().getSignature().getName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE, DoubleType.DOUBLE));
+        BoundSignature boundSignature = builtinFunction(aggregation.getFunctionMetadata().getCanonicalName(), DoubleType.DOUBLE, ImmutableList.of(DoubleType.DOUBLE, DoubleType.DOUBLE));
         specializeAggregationFunction(boundSignature, aggregation);
     }
 
@@ -1137,31 +1137,17 @@ public static void output(@AggregationState TriStateBooleanState state, BlockBui
     @Test
     public void testAggregateFunctionGetCanonicalName()
     {
-        List<ParametricAggregation> aggregationOutputFunctions = parseFunctionDefinitions(AggregationOutputFunctionWithAlias.class);
-        assertEquals(aggregationOutputFunctions.size(), 3);
-        assertEquals(
-                aggregationOutputFunctions.stream()
-                        .map(aggregateFunction -> aggregateFunction.getFunctionMetadata().getSignature().getName())
-                        .collect(toImmutableSet()),
-                ImmutableSet.of("aggregation_output", "aggregation_output_alias_1", "aggregation_output_alias_2"));
-        assertEquals(
-                aggregationOutputFunctions.stream()
-                        .map(aggregateFunction -> aggregateFunction.getFunctionMetadata().getCanonicalName())
-                        .collect(toImmutableSet()),
-                ImmutableSet.of("aggregation_output"));
-
-        List<ParametricAggregation> aggregationFunctions = parseFunctionDefinitions(AggregationFunctionWithAlias.class);
-        assertEquals(aggregationFunctions.size(), 3);
-        assertEquals(
-                aggregationFunctions.stream()
-                        .map(aggregateFunction -> aggregateFunction.getFunctionMetadata().getSignature().getName())
-                        .collect(toImmutableSet()),
-                ImmutableSet.of("aggregation", "aggregation_alias_1", "aggregation_alias_2"));
-        assertEquals(
-                aggregationFunctions.stream()
-                        .map(aggregateFunction -> aggregateFunction.getFunctionMetadata().getCanonicalName())
-                        .collect(toImmutableSet()),
-                ImmutableSet.of("aggregation"));
+        List<ParametricAggregation> aggregationFunctions = parseFunctionDefinitions(AggregationOutputFunctionWithAlias.class);
+        assertEquals(aggregationFunctions.size(), 1);
+        ParametricAggregation aggregation = getOnlyElement(aggregationFunctions);
+        assertThat(aggregation.getFunctionMetadata().getCanonicalName()).isEqualTo("aggregation_output");
+        assertThat(aggregation.getFunctionMetadata().getNames()).containsExactlyInAnyOrder("aggregation_output", "aggregation_output_alias_1", "aggregation_output_alias_2");
+
+        aggregationFunctions = parseFunctionDefinitions(AggregationFunctionWithAlias.class);
+        assertEquals(aggregationFunctions.size(), 1);
+        aggregation = getOnlyElement(aggregationFunctions);
+        assertThat(aggregation.getFunctionMetadata().getCanonicalName()).isEqualTo("aggregation");
+        assertThat(aggregation.getFunctionMetadata().getNames()).containsExactlyInAnyOrder("aggregation", "aggregation_alias_1", "aggregation_alias_2");
     }
 
     private static void specializeAggregationFunction(BoundSignature boundSignature, SqlAggregationFunction aggregation)
@@ -1172,9 +1158,39 @@ private static void specializeAggregationFunction(BoundSignature boundSignature,
         AggregationFunctionMetadata aggregationMetadata = aggregation.getAggregationMetadata();
         assertFalse(aggregationMetadata.isOrderSensitive());
         assertFalse(aggregationMetadata.getIntermediateTypes().isEmpty());
+        FunctionDependencyDeclaration dependencyDeclaration = aggregation.getFunctionDependencies(boundSignature);
+
+        ImmutableMap.Builder<TypeSignature, Type> typeDependencies = ImmutableMap.builder();
+        for (TypeSignature typeSignature : dependencyDeclaration.getTypeDependencies()) {
+            typeSignature = SignatureBinder.applyBoundVariables(typeSignature, functionBinding);
+            typeDependencies.put(typeSignature, PLANNER_CONTEXT.getTypeManager().getType(typeSignature));
+        }
+
+        ImmutableSet.Builder<ResolvedFunction> functionDependencies = ImmutableSet.builder();
+        dependencyDeclaration.getOperatorDependencies().stream()
+                .map(TestAnnotationEngineForAggregates::resolveDependency)
+                .forEach(functionDependencies::add);
+        dependencyDeclaration.getFunctionDependencies().stream()
+                .map(TestAnnotationEngineForAggregates::resolveDependency)
+                .forEach(functionDependencies::add);
+
+        aggregation.specialize(boundSignature, new InternalFunctionDependencies(FUNCTION_MANAGER::getScalarFunctionImplementation, typeDependencies.buildOrThrow(), functionDependencies.build()));
+    }
 
-        ResolvedFunction resolvedFunction = METADATA.resolve(TEST_SESSION, GlobalSystemConnector.CATALOG_HANDLE, functionBinding, functionMetadata, aggregation.getFunctionDependencies(boundSignature));
-        FunctionDependencies functionDependencies = new InternalFunctionDependencies(FUNCTION_MANAGER::getScalarFunctionImplementation, resolvedFunction.getTypeDependencies(), resolvedFunction.getFunctionDependencies());
-        aggregation.specialize(boundSignature, functionDependencies);
+    private static ResolvedFunction resolveDependency(FunctionDependencyDeclaration.OperatorDependency dependency)
+    {
+        QualifiedName name = QualifiedName.of(GlobalSystemConnector.NAME, BUILTIN_SCHEMA, mangleOperatorName(dependency.getOperatorType()));
+        return PLANNER_CONTEXT.getFunctionResolver().resolveFunction(TEST_SESSION, name, fromTypeSignatures(dependency.getArgumentTypes()), new AllowAllAccessControl());
+    }
+
+    private static ResolvedFunction resolveDependency(FunctionDependencyDeclaration.FunctionDependency dependency)
+    {
+        QualifiedName name = QualifiedName.of(dependency.getName().getCatalogName(), dependency.getName().getSchemaName(), dependency.getName().getFunctionName());
+        return PLANNER_CONTEXT.getFunctionResolver().resolveFunction(TEST_SESSION, name, fromTypeSignatures(dependency.getArgumentTypes()), new AllowAllAccessControl());
+    }
+
+    private static BoundSignature builtinFunction(String name, Type returnType, ImmutableList<Type> argumentTypes)
+    {
+        return new BoundSignature(builtinFunctionName(name), returnType, argumentTypes);
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestAnnotationEngineForScalars.java b/core/trino-main/src/test/java/io/trino/operator/TestAnnotationEngineForScalars.java
index 2cd72a178388..78412c918b1e 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestAnnotationEngineForScalars.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestAnnotationEngineForScalars.java
@@ -43,13 +43,15 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.TypeSignatureParameter;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.metadata.FunctionManager.createTestingFunctionManager;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
+import static io.trino.operator.AnnotationEngineAssertions.assertImplementationCount;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DoubleType.DOUBLE;
@@ -60,7 +62,6 @@
 import static org.testng.Assert.assertTrue;
 
 public class TestAnnotationEngineForScalars
-        extends TestAnnotationEngine
 {
     private static final FunctionManager FUNCTION_MANAGER = createTestingFunctionManager();
 
@@ -79,7 +80,6 @@ public static double fun(@SqlType(StandardTypes.DOUBLE) double v)
     public void testSingleImplementationScalarParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("single_implementation_parametric_scalar")
                 .returnType(DOUBLE)
                 .argumentType(DOUBLE)
                 .build();
@@ -97,7 +97,7 @@ public void testSingleImplementationScalarParse()
 
         assertImplementationCount(scalar, 1, 0, 0);
 
-        BoundSignature boundSignature = new BoundSignature(expectedSignature.getName(), DOUBLE, ImmutableList.of(DOUBLE));
+        BoundSignature boundSignature = new BoundSignature(builtinFunctionName("single_implementation_parametric_scalar"), DOUBLE, ImmutableList.of(DOUBLE));
         ChoicesSpecializedSqlScalarFunction specialized = (ChoicesSpecializedSqlScalarFunction) scalar.specialize(
                 boundSignature,
                 new InternalFunctionDependencies(FUNCTION_MANAGER::getScalarFunctionImplementation, ImmutableMap.of(), ImmutableSet.of()));
@@ -168,7 +168,6 @@ public static double fun(
     public void testWithNullablePrimitiveArgScalarParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("scalar_with_nullable")
                 .returnType(DOUBLE)
                 .argumentType(DOUBLE)
                 .argumentType(DOUBLE)
@@ -186,7 +185,7 @@ public void testWithNullablePrimitiveArgScalarParse()
         assertFalse(functionMetadata.getFunctionNullability().isArgumentNullable(0));
         assertTrue(functionMetadata.getFunctionNullability().isArgumentNullable(1));
 
-        BoundSignature boundSignature = new BoundSignature(expectedSignature.getName(), DOUBLE, ImmutableList.of(DOUBLE, DOUBLE));
+        BoundSignature boundSignature = new BoundSignature(builtinFunctionName("scalar_with_nullable"), DOUBLE, ImmutableList.of(DOUBLE, DOUBLE));
         ChoicesSpecializedSqlScalarFunction specialized = (ChoicesSpecializedSqlScalarFunction) scalar.specialize(
                 boundSignature,
                 new InternalFunctionDependencies(FUNCTION_MANAGER::getScalarFunctionImplementation, ImmutableMap.of(), ImmutableSet.of()));
@@ -210,7 +209,6 @@ public static double fun(
     public void testWithNullableComplexArgScalarParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("scalar_with_nullable_complex")
                 .returnType(DOUBLE)
                 .argumentType(DOUBLE)
                 .argumentType(DOUBLE)
@@ -228,7 +226,7 @@ public void testWithNullableComplexArgScalarParse()
         assertFalse(functionMetadata.getFunctionNullability().isArgumentNullable(0));
         assertTrue(functionMetadata.getFunctionNullability().isArgumentNullable(1));
 
-        BoundSignature boundSignature = new BoundSignature(expectedSignature.getName(), DOUBLE, ImmutableList.of(DOUBLE, DOUBLE));
+        BoundSignature boundSignature = new BoundSignature(builtinFunctionName("scalar_with_nullable_complex"), DOUBLE, ImmutableList.of(DOUBLE, DOUBLE));
         ChoicesSpecializedSqlScalarFunction specialized = (ChoicesSpecializedSqlScalarFunction) scalar.specialize(
                 boundSignature,
                 new InternalFunctionDependencies(FUNCTION_MANAGER::getScalarFunctionImplementation, ImmutableMap.of(), ImmutableSet.of()));
@@ -250,7 +248,6 @@ public static double fun(@SqlType(StandardTypes.DOUBLE) double v)
     public void testStaticMethodScalarParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("static_method_scalar")
                 .returnType(DOUBLE)
                 .argumentType(DOUBLE)
                 .build();
@@ -289,13 +286,11 @@ public static long fun2(@SqlType(StandardTypes.BIGINT) long v)
     public void testMultiScalarParse()
     {
         Signature expectedSignature1 = Signature.builder()
-                .name("static_method_scalar_1")
                 .returnType(DOUBLE)
                 .argumentType(DOUBLE)
                 .build();
 
         Signature expectedSignature2 = Signature.builder()
-                .name("static_method_scalar_2")
                 .returnType(BIGINT)
                 .argumentType(BIGINT)
                 .build();
@@ -344,7 +339,6 @@ public static long fun(@SqlType("T") long v)
     public void testParametricScalarParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("parametric_scalar")
                 .typeVariable("T")
                 .returnType(new TypeSignature("T"))
                 .argumentType(new TypeSignature("T"))
@@ -384,13 +378,11 @@ public static boolean fun2(@SqlType("array(varchar(17))") Block array)
     public void testComplexParametricScalarParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("with_exact_scalar")
                 .returnType(BOOLEAN)
                 .argumentType(arrayType(new TypeSignature("varchar", TypeSignatureParameter.typeVariable("x"))))
                 .build();
 
         Signature exactSignature = Signature.builder()
-                .name("with_exact_scalar")
                 .returnType(BOOLEAN)
                 .argumentType(arrayType(createVarcharType(17).getTypeSignature()))
                 .build();
@@ -426,7 +418,6 @@ public static long fun(
     public void testSimpleInjectionScalarParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("parametric_scalar_inject")
                 .returnType(BIGINT)
                 .argumentType(new TypeSignature("varchar", TypeSignatureParameter.typeVariable("x")))
                 .build();
@@ -479,7 +470,6 @@ public long funDouble(@SqlType("array(double)") Block val)
     public void testConstructorInjectionScalarParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("parametric_scalar_inject_constructor")
                 .typeVariable("T")
                 .returnType(BIGINT)
                 .argumentType(arrayType(new TypeSignature("T")))
@@ -521,7 +511,6 @@ public static long fun(
     public void testFixedTypeParameterParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("fixed_type_parameter_scalar_function")
                 .returnType(BIGINT)
                 .argumentType(BIGINT)
                 .build();
@@ -557,7 +546,6 @@ public static long fun(
     public void testPartiallyFixedTypeParameterParse()
     {
         Signature expectedSignature = Signature.builder()
-                .name("partially_fixed_type_parameter_scalar_function")
                 .typeVariable("T1")
                 .typeVariable("T2")
                 .returnType(BIGINT)
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestColumnarPageProcessor.java b/core/trino-main/src/test/java/io/trino/operator/TestColumnarPageProcessor.java
index 499456ca7738..e18f2c901498 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestColumnarPageProcessor.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestColumnarPageProcessor.java
@@ -20,7 +20,7 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.ExpressionCompiler;
 import io.trino.sql.gen.PageFunctionCompiler;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestCyclingGroupByHash.java b/core/trino-main/src/test/java/io/trino/operator/TestCyclingGroupByHash.java
index 08af6388e39a..aca37be1785c 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestCyclingGroupByHash.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestCyclingGroupByHash.java
@@ -16,7 +16,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static org.testng.Assert.assertEquals;
@@ -28,14 +28,14 @@ public void testSingleGroup()
     {
         CyclingGroupByHash groupByHash = new CyclingGroupByHash(1);
         Page page = createPage(1);
-        GroupByIdBlock groupByIdBlock = computeGroupByIdBlock(groupByHash, page);
-        assertGrouping(groupByIdBlock, 0L);
-        assertEquals(groupByIdBlock.getGroupCount(), 1);
+        int[] groupByIds = computeGroupByIdBlock(groupByHash, page);
+        assertGrouping(groupByIds, 0);
+        assertEquals(groupByHash.getGroupCount(), 1);
 
         page = createPage(2);
-        groupByIdBlock = computeGroupByIdBlock(groupByHash, page);
-        assertGrouping(groupByIdBlock, 0L, 0L);
-        assertEquals(groupByIdBlock.getGroupCount(), 1);
+        groupByIds = computeGroupByIdBlock(groupByHash, page);
+        assertGrouping(groupByIds, 0, 0);
+        assertEquals(groupByHash.getGroupCount(), 1);
     }
 
     @Test
@@ -43,14 +43,14 @@ public void testMultipleGroup()
     {
         CyclingGroupByHash groupByHash = new CyclingGroupByHash(2);
         Page page = createPage(3);
-        GroupByIdBlock groupByIdBlock = computeGroupByIdBlock(groupByHash, page);
-        assertGrouping(groupByIdBlock, 0L, 1L, 0L);
-        assertEquals(groupByIdBlock.getGroupCount(), 2);
+        int[] groupByIds = computeGroupByIdBlock(groupByHash, page);
+        assertGrouping(groupByIds, 0, 1, 0);
+        assertEquals(groupByHash.getGroupCount(), 2);
 
         page = createPage(2);
-        groupByIdBlock = computeGroupByIdBlock(groupByHash, page);
-        assertGrouping(groupByIdBlock, 1L, 0L);
-        assertEquals(groupByIdBlock.getGroupCount(), 2);
+        groupByIds = computeGroupByIdBlock(groupByHash, page);
+        assertGrouping(groupByIds, 1, 0);
+        assertEquals(groupByHash.getGroupCount(), 2);
     }
 
     @Test
@@ -58,24 +58,21 @@ public void testPartialGroup()
     {
         CyclingGroupByHash groupByHash = new CyclingGroupByHash(3);
         Page page = createPage(2);
-        GroupByIdBlock groupByIdBlock = computeGroupByIdBlock(groupByHash, page);
-        assertGrouping(groupByIdBlock, 0L, 1L);
+        int[] groupByIds = computeGroupByIdBlock(groupByHash, page);
+        assertGrouping(groupByIds, 0, 1);
 
         // Only 2 groups generated out of max 3
-        assertEquals(groupByIdBlock.getGroupCount(), 2);
+        assertEquals(groupByHash.getGroupCount(), 2);
     }
 
-    private static void assertGrouping(GroupByIdBlock groupByIdBlock, long... groupIds)
+    private static void assertGrouping(int[] groupIds, int... expectedGroupIds)
     {
-        assertEquals(groupByIdBlock.getPositionCount(), groupIds.length);
-        for (int i = 0; i < groupByIdBlock.getPositionCount(); i++) {
-            assertEquals(groupByIdBlock.getGroupId(i), groupIds[i]);
-        }
+        assertEquals(groupIds, expectedGroupIds);
     }
 
-    private static GroupByIdBlock computeGroupByIdBlock(GroupByHash groupByHash, Page page)
+    private static int[] computeGroupByIdBlock(GroupByHash groupByHash, Page page)
     {
-        Work<GroupByIdBlock> groupIds = groupByHash.getGroupIds(page);
+        Work<int[]> groupIds = groupByHash.getGroupIds(page);
         while (!groupIds.process()) {
             // Process until finished
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestDeduplicatingDirectExchangeBuffer.java b/core/trino-main/src/test/java/io/trino/operator/TestDeduplicatingDirectExchangeBuffer.java
index 62f21b60a2ad..9a60ae7dbe99 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestDeduplicatingDirectExchangeBuffer.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestDeduplicatingDirectExchangeBuffer.java
@@ -28,9 +28,10 @@
 import io.trino.plugin.exchange.filesystem.FileSystemExchangeManagerFactory;
 import io.trino.spi.QueryId;
 import io.trino.spi.TrinoException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.HashSet;
 import java.util.List;
@@ -48,19 +49,21 @@
 import static java.lang.Math.toIntExact;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestDeduplicatingDirectExchangeBuffer
 {
     private static final DataSize DEFAULT_BUFFER_CAPACITY = DataSize.of(1, KILOBYTE);
 
     private ExchangeManagerRegistry exchangeManagerRegistry;
 
-    @BeforeClass
+    @BeforeAll
     public void beforeClass()
     {
         exchangeManagerRegistry = new ExchangeManagerRegistry();
@@ -69,7 +72,7 @@ public void beforeClass()
                 "exchange.base-directories", System.getProperty("java.io.tmpdir") + "/trino-local-file-system-exchange-manager"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void afterClass()
     {
         exchangeManagerRegistry = null;
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestDirectExchangeClient.java b/core/trino-main/src/test/java/io/trino/operator/TestDirectExchangeClient.java
index 654d6aa0cabc..179202f29383 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestDirectExchangeClient.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestDirectExchangeClient.java
@@ -41,9 +41,11 @@
 import io.trino.spi.QueryId;
 import io.trino.spi.TrinoException;
 import io.trino.spi.TrinoTransportException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -82,20 +84,21 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestDirectExchangeClient
 {
     private ScheduledExecutorService scheduler;
     private ExecutorService pageBufferClientCallbackExecutor;
     private PagesSerdeFactory serdeFactory;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         scheduler = newScheduledThreadPool(4, daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
@@ -103,7 +106,7 @@ public void setUp()
         serdeFactory = new TestingPagesSerdeFactory();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (scheduler != null) {
@@ -313,7 +316,8 @@ public void testAddLocation()
         assertTrue(exchangeClient.isFinished());
     }
 
-    @Test(timeOut = 10000)
+    @Test
+    @Timeout(10)
     public void testStreamingAddLocation()
             throws Exception
     {
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestDirectExchangeClientConfig.java b/core/trino-main/src/test/java/io/trino/operator/TestDirectExchangeClientConfig.java
index 12630b8b225d..0fb594c3a788 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestDirectExchangeClientConfig.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestDirectExchangeClientConfig.java
@@ -17,7 +17,7 @@
 import io.airlift.http.client.HttpClientConfig;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -35,7 +35,6 @@ public void testDefaults()
         assertRecordedDefaults(recordDefaults(DirectExchangeClientConfig.class)
                 .setMaxBufferSize(DataSize.of(32, Unit.MEGABYTE))
                 .setConcurrentRequestMultiplier(3)
-                .setMinErrorDuration(new Duration(5, TimeUnit.MINUTES))
                 .setMaxErrorDuration(new Duration(5, TimeUnit.MINUTES))
                 .setMaxResponseSize(new HttpClientConfig().getMaxContentLength())
                 .setPageBufferClientMaxCallbackThreads(25)
@@ -50,7 +49,6 @@ public void testExplicitPropertyMappings()
         Map<String, String> properties = ImmutableMap.<String, String>builder()
                 .put("exchange.max-buffer-size", "1GB")
                 .put("exchange.concurrent-request-multiplier", "13")
-                .put("exchange.min-error-duration", "13s")
                 .put("exchange.max-error-duration", "33s")
                 .put("exchange.max-response-size", "1MB")
                 .put("exchange.client-threads", "2")
@@ -62,7 +60,6 @@ public void testExplicitPropertyMappings()
         DirectExchangeClientConfig expected = new DirectExchangeClientConfig()
                 .setMaxBufferSize(DataSize.of(1, Unit.GIGABYTE))
                 .setConcurrentRequestMultiplier(13)
-                .setMinErrorDuration(new Duration(33, TimeUnit.SECONDS))
                 .setMaxErrorDuration(new Duration(33, TimeUnit.SECONDS))
                 .setMaxResponseSize(DataSize.of(1, Unit.MEGABYTE))
                 .setClientThreads(2)
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestDistinctLimitOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestDistinctLimitOperator.java
index c02353d65aee..6856f7e70d84 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestDistinctLimitOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestDistinctLimitOperator.java
@@ -22,11 +22,9 @@
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
-import io.trino.type.BlockTypeOperators;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Optional;
@@ -46,59 +44,47 @@
 import static io.trino.testing.TestingTaskContext.createTaskContext;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestDistinctLimitOperator
 {
-    private ExecutorService executor;
-    private ScheduledExecutorService scheduledExecutor;
-    private DriverContext driverContext;
-    private JoinCompiler joinCompiler;
-    private BlockTypeOperators blockTypeOperators;
-
-    @BeforeMethod
-    public void setUp()
-    {
-        executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
-        scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
-        driverContext = createTaskContext(executor, scheduledExecutor, TEST_SESSION)
-                .addPipelineContext(0, true, true, false)
-                .addDriverContext();
-        TypeOperators typeOperators = new TypeOperators();
-        blockTypeOperators = new BlockTypeOperators(typeOperators);
-        joinCompiler = new JoinCompiler(typeOperators);
-    }
+    private final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
+    private final ScheduledExecutorService scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
+    private final JoinCompiler joinCompiler = new JoinCompiler(new TypeOperators());
 
-    @AfterMethod(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
         scheduledExecutor.shutdownNow();
     }
 
-    @DataProvider
-    public Object[][] dataType()
+    @Test
+    public void testDistinctLimit()
     {
-        return new Object[][] {{VARCHAR}, {BIGINT}};
+        testDistinctLimit(true);
+        testDistinctLimit(false);
     }
 
-    @DataProvider(name = "hashEnabledValues")
-    public static Object[][] hashEnabledValuesProvider()
-    {
-        return new Object[][] {{true}, {false}};
-    }
-
-    @Test(dataProvider = "hashEnabledValues")
     public void testDistinctLimit(boolean hashEnabled)
     {
+        DriverContext driverContext = newDriverContext();
         RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, Ints.asList(0), BIGINT);
         List<Page> input = rowPagesBuilder
                 .addSequencePage(3, 1)
                 .addSequencePage(5, 2)
                 .build();
 
-        OperatorFactory operatorFactory = new DistinctLimitOperator.DistinctLimitOperatorFactory(0, new PlanNodeId("test"), rowPagesBuilder.getTypes(), Ints.asList(0), 5, rowPagesBuilder.getHashChannel(), joinCompiler, blockTypeOperators);
+        OperatorFactory operatorFactory = new DistinctLimitOperator.DistinctLimitOperatorFactory(
+                0,
+                new PlanNodeId("test"),
+                rowPagesBuilder.getTypes(),
+                Ints.asList(0),
+                5,
+                rowPagesBuilder.getHashChannel(),
+                joinCompiler);
 
         MaterializedResult expected = resultBuilder(driverContext.getSession(), BIGINT)
                 .row(1L)
@@ -111,16 +97,30 @@ public void testDistinctLimit(boolean hashEnabled)
         assertOperatorEquals(operatorFactory, driverContext, input, expected, hashEnabled, ImmutableList.of(1));
     }
 
-    @Test(dataProvider = "hashEnabledValues")
+    @Test
+    public void testDistinctLimitWithPageAlignment()
+    {
+        testDistinctLimitWithPageAlignment(true);
+        testDistinctLimitWithPageAlignment(false);
+    }
+
     public void testDistinctLimitWithPageAlignment(boolean hashEnabled)
     {
+        DriverContext driverContext = newDriverContext();
         RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, Ints.asList(0), BIGINT);
         List<Page> input = rowPagesBuilder
                 .addSequencePage(3, 1)
                 .addSequencePage(3, 2)
                 .build();
 
-        OperatorFactory operatorFactory = new DistinctLimitOperator.DistinctLimitOperatorFactory(0, new PlanNodeId("test"), rowPagesBuilder.getTypes(), Ints.asList(0), 3, rowPagesBuilder.getHashChannel(), joinCompiler, blockTypeOperators);
+        OperatorFactory operatorFactory = new DistinctLimitOperator.DistinctLimitOperatorFactory(
+                0,
+                new PlanNodeId("test"),
+                rowPagesBuilder.getTypes(),
+                Ints.asList(0),
+                3,
+                rowPagesBuilder.getHashChannel(),
+                joinCompiler);
 
         MaterializedResult expected = resultBuilder(driverContext.getSession(), BIGINT)
                 .row(1L)
@@ -131,16 +131,31 @@ public void testDistinctLimitWithPageAlignment(boolean hashEnabled)
         assertOperatorEquals(operatorFactory, driverContext, input, expected, hashEnabled, ImmutableList.of(1));
     }
 
-    @Test(dataProvider = "hashEnabledValues")
+    @Test
+    public void testDistinctLimitValuesLessThanLimit()
+    {
+        testDistinctLimitValuesLessThanLimit(true);
+        testDistinctLimitValuesLessThanLimit(false);
+    }
+
     public void testDistinctLimitValuesLessThanLimit(boolean hashEnabled)
     {
+        DriverContext driverContext = newDriverContext();
+
         RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, Ints.asList(0), BIGINT);
         List<Page> input = rowPagesBuilder
                 .addSequencePage(3, 1)
                 .addSequencePage(3, 2)
                 .build();
 
-        OperatorFactory operatorFactory = new DistinctLimitOperator.DistinctLimitOperatorFactory(0, new PlanNodeId("test"), rowPagesBuilder.getTypes(), Ints.asList(0), 5, rowPagesBuilder.getHashChannel(), joinCompiler, blockTypeOperators);
+        OperatorFactory operatorFactory = new DistinctLimitOperator.DistinctLimitOperatorFactory(
+                0,
+                new PlanNodeId("test"),
+                rowPagesBuilder.getTypes(),
+                Ints.asList(0),
+                5,
+                rowPagesBuilder.getHashChannel(),
+                joinCompiler);
 
         MaterializedResult expected = resultBuilder(driverContext.getSession(), BIGINT)
                 .row(1L)
@@ -152,7 +167,13 @@ public void testDistinctLimitValuesLessThanLimit(boolean hashEnabled)
         assertOperatorEquals(operatorFactory, driverContext, input, expected, hashEnabled, ImmutableList.of(1));
     }
 
-    @Test(dataProvider = "dataType")
+    @Test
+    public void testMemoryReservationYield()
+    {
+        testMemoryReservationYield(VARCHAR);
+        testMemoryReservationYield(BIGINT);
+    }
+
     public void testMemoryReservationYield(Type type)
     {
         List<Page> input = createPagesWithDistinctHashKeys(type, 6_000, 600);
@@ -164,12 +185,18 @@ public void testMemoryReservationYield(Type type)
                 ImmutableList.of(0),
                 Integer.MAX_VALUE,
                 Optional.of(1),
-                joinCompiler,
-                blockTypeOperators);
+                joinCompiler);
 
         GroupByHashYieldAssertion.GroupByHashYieldResult result = finishOperatorWithYieldingGroupByHash(input, type, operatorFactory, operator -> ((DistinctLimitOperator) operator).getCapacity(), 450_000);
         assertGreaterThanOrEqual(result.getYieldCount(), 5);
         assertGreaterThanOrEqual(result.getMaxReservedBytes(), 20L << 20);
         assertEquals(result.getOutput().stream().mapToInt(Page::getPositionCount).sum(), 6_000 * 600);
     }
+
+    private DriverContext newDriverContext()
+    {
+        return createTaskContext(executor, scheduledExecutor, TEST_SESSION)
+                .addPipelineContext(0, true, true, false)
+                .addDriverContext();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestDriver.java b/core/trino-main/src/test/java/io/trino/operator/TestDriver.java
index 9880887c871b..a173ce730695 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestDriver.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestDriver.java
@@ -36,9 +36,12 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.PageConsumerOperator;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -63,18 +66,19 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestDriver
 {
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
     private DriverContext driverContext;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
@@ -85,7 +89,7 @@ public void setUp()
                 .addDriverContext();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         executor.shutdownNow();
@@ -115,7 +119,8 @@ public void testNormalFinish()
     }
 
     // The race can be reproduced somewhat reliably when the invocationCount is 10K, but we use 1K iterations to cap the test runtime.
-    @Test(invocationCount = 1_000, timeOut = 10_000)
+    @RepeatedTest(1000)
+    @Timeout(10)
     public void testConcurrentClose()
     {
         List<Type> types = ImmutableList.of(VARCHAR, BIGINT, BIGINT);
@@ -206,7 +211,6 @@ public void testBrokenOperatorCloseWhileProcessing()
 
         driver.close();
         assertTrue(driver.isFinished());
-        assertFalse(driver.getDestroyedFuture().isDone());
 
         assertThatThrownBy(() -> driverProcessFor.get(1, TimeUnit.SECONDS))
                 .isInstanceOf(ExecutionException.class)
@@ -321,7 +325,6 @@ public void testBrokenOperatorAddSource()
 
         driver.close();
         assertTrue(driver.isFinished());
-        assertFalse(driver.getDestroyedFuture().isDone());
 
         assertThatThrownBy(() -> driverProcessFor.get(1, TimeUnit.SECONDS))
                 .isInstanceOf(ExecutionException.class)
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestDriverStats.java b/core/trino-main/src/test/java/io/trino/operator/TestDriverStats.java
index c9db915016cd..cd21adee0090 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestDriverStats.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestDriverStats.java
@@ -19,7 +19,7 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import org.joda.time.DateTime;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.operator.TestOperatorStats.assertExpectedOperatorStats;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestDynamicFilterSourceOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestDynamicFilterSourceOperator.java
index 49d90a3dfcf2..0e5c486c22df 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestDynamicFilterSourceOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestDynamicFilterSourceOperator.java
@@ -28,10 +28,10 @@
 import io.trino.sql.planner.plan.DynamicFilterId;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
-import io.trino.type.BlockTypeOperators;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -53,6 +53,7 @@
 import static io.trino.block.BlockAssertions.createDoubleRepeatBlock;
 import static io.trino.block.BlockAssertions.createDoubleSequenceBlock;
 import static io.trino.block.BlockAssertions.createDoublesBlock;
+import static io.trino.block.BlockAssertions.createIntsBlock;
 import static io.trino.block.BlockAssertions.createLongRepeatBlock;
 import static io.trino.block.BlockAssertions.createLongSequenceBlock;
 import static io.trino.block.BlockAssertions.createLongsBlock;
@@ -79,20 +80,20 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true)
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
 public class TestDynamicFilterSourceOperator
 {
-    private BlockTypeOperators blockTypeOperators;
+    private TypeOperators typeOperators;
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
     private PipelineContext pipelineContext;
 
     private ImmutableList.Builder<TupleDomain<DynamicFilterId>> partitions;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
-        blockTypeOperators = new BlockTypeOperators(new TypeOperators());
+        typeOperators = new TypeOperators();
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
         scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
         pipelineContext = createTaskContext(executor, scheduledExecutor, TEST_SESSION)
@@ -101,7 +102,7 @@ public void setUp()
         partitions = ImmutableList.builder();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         executor.shutdownNow();
@@ -156,7 +157,7 @@ public boolean isDomainCollectionComplete()
                 maxFilterDistinctValues,
                 maxFilterSize,
                 minMaxCollectionLimit,
-                blockTypeOperators);
+                typeOperators);
     }
 
     private Operator createOperator(OperatorFactory operatorFactory)
@@ -271,19 +272,18 @@ public void testCollectOnlyLastColumn()
     @Test
     public void testCollectWithNulls()
     {
-        Block blockWithNulls = INTEGER
-                .createFixedSizeBlockBuilder(0)
-                .writeInt(3)
-                .appendNull()
-                .writeInt(4)
-                .build();
+        BlockBuilder blockBuilder = INTEGER.createFixedSizeBlockBuilder(3);
+        INTEGER.writeInt(blockBuilder, 3);
+        blockBuilder.appendNull();
+        INTEGER.writeInt(blockBuilder, 4);
+        Block blockWithNulls = blockBuilder.build();
 
         OperatorFactory operatorFactory = createOperatorFactory(channel(0, INTEGER));
         verifyPassthrough(createOperator(operatorFactory),
                 ImmutableList.of(INTEGER),
-                new Page(createLongsBlock(1, 2, 3)),
+                new Page(createIntsBlock(1, 2, 3)),
                 new Page(blockWithNulls),
-                new Page(createLongsBlock(4, 5)));
+                new Page(createIntsBlock(4, 5)));
         operatorFactory.noMoreOperators();
 
         assertEquals(partitions.build(), ImmutableList.of(
@@ -607,34 +607,39 @@ public void testMemoryUsage()
     {
         OperatorFactory operatorFactory = createOperatorFactory(channel(0, BIGINT), channel(1, BIGINT));
         Operator operator = createOperator(operatorFactory);
+        final long initialMemoryUsage = operator.getOperatorContext().getOperatorMemoryContext().getUserMemory();
 
         List<Page> inputPages = ImmutableList.of(new Page(
-                createLongSequenceBlock(51, 101),
-                createLongRepeatBlock(200, 50)));
+                createLongSequenceBlock(51, 151),
+                createLongRepeatBlock(200, 100)));
         toPagesPartial(operator, inputPages.iterator());
-        long initialMemoryUsage = operator.getOperatorContext().getOperatorMemoryContext().getUserMemory();
-        assertThat(initialMemoryUsage).isGreaterThan(0);
+        long baseMemoryUsage = operator.getOperatorContext().getOperatorMemoryContext().getUserMemory();
+        // Hashtable for the first channel has grown
+        assertThat(baseMemoryUsage)
+                .isGreaterThan(initialMemoryUsage);
 
         inputPages = ImmutableList.of(new Page(
                 createLongSequenceBlock(0, 51),
                 createLongSequenceBlock(51, 101)));
         toPagesPartial(operator, inputPages.iterator());
-        long currentMemoryUsage = operator.getOperatorContext().getOperatorMemoryContext().getUserMemory();
-        // First channel stops collecting distinct values
-        assertThat(currentMemoryUsage)
+        long firstChannelStoppedMemoryUsage = operator.getOperatorContext().getOperatorMemoryContext().getUserMemory();
+        // First channel stops collecting distinct values, so memory will decrease below the initial value since hashtable is freed
+        assertThat(firstChannelStoppedMemoryUsage)
                 .isGreaterThan(0)
                 .isLessThan(initialMemoryUsage);
 
         toPagesPartial(operator, inputPages.iterator());
         // No change in distinct values
-        assertThat(operator.getOperatorContext().getOperatorMemoryContext().getUserMemory()).isEqualTo(currentMemoryUsage);
+        assertThat(operator.getOperatorContext().getOperatorMemoryContext().getUserMemory()).isEqualTo(firstChannelStoppedMemoryUsage);
 
         inputPages = ImmutableList.of(new Page(
                 createLongSequenceBlock(0, 51),
                 createLongSequenceBlock(0, 51)));
         toPagesPartial(operator, inputPages.iterator());
-        // Second channel stops collecting distinct values
-        assertThat(operator.getOperatorContext().getOperatorMemoryContext().getUserMemory()).isEqualTo(0);
+        // Second channel stops collecting distinct values, so memory will decrease further
+        assertThat(operator.getOperatorContext().getOperatorMemoryContext().getUserMemory())
+                .isGreaterThan(0)
+                .isLessThan(firstChannelStoppedMemoryUsage);
 
         finishOperator(operator);
         operatorFactory.noMoreOperators();
@@ -642,7 +647,7 @@ public void testMemoryUsage()
                 TupleDomain.withColumnDomains(ImmutableMap.of(
                         new DynamicFilterId("0"),
                         Domain.create(
-                                ValueSet.ofRanges(range(BIGINT, 0L, true, 100L, true)),
+                                ValueSet.ofRanges(range(BIGINT, 0L, true, 150L, true)),
                                 false),
                         new DynamicFilterId("1"),
                         Domain.create(
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestExchangeOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestExchangeOperator.java
index 14639fe457b6..6f97e5130ed5 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestExchangeOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestExchangeOperator.java
@@ -34,10 +34,10 @@
 import io.trino.spi.type.Type;
 import io.trino.split.RemoteSplit;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -50,18 +50,19 @@
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.SessionTestUtils.TEST_SESSION;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
+import static io.trino.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
 import static io.trino.operator.ExchangeOperator.REMOTE_CATALOG_HANDLE;
 import static io.trino.operator.PageAssertions.assertPageEquals;
 import static io.trino.operator.TestingTaskBuffer.PAGE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.testing.TestingTaskContext.createTaskContext;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestExchangeOperator
 {
     private static final List<Type> TYPES = ImmutableList.of(VARCHAR);
@@ -81,7 +82,7 @@ public class TestExchangeOperator
     private ExecutorService pageBufferClientCallbackExecutor;
 
     @SuppressWarnings("resource")
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         scheduler = newScheduledThreadPool(4, daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
@@ -104,7 +105,7 @@ public void setUp()
                 taskFailureListener);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         httpClient.close();
@@ -120,17 +121,12 @@ public void tearDown()
         pageBufferClientCallbackExecutor = null;
     }
 
-    @BeforeMethod
-    public void setUpMethod()
-    {
-        // the test class is single-threaded, so there should be no ongoing loads and invalidation should be effective
-        taskBuffers.invalidateAll();
-    }
-
     @Test
     public void testSimple()
             throws Exception
     {
+        taskBuffers.invalidateAll();
+
         SourceOperator operator = createExchangeOperator();
 
         operator.addSplit(newRemoteSplit(TASK_1_ID));
@@ -159,6 +155,8 @@ private static Split newRemoteSplit(TaskId taskId)
     public void testWaitForClose()
             throws Exception
     {
+        taskBuffers.invalidateAll();
+
         SourceOperator operator = createExchangeOperator();
 
         operator.addSplit(newRemoteSplit(TASK_1_ID));
@@ -195,6 +193,8 @@ public void testWaitForClose()
     public void testWaitForNoMoreSplits()
             throws Exception
     {
+        taskBuffers.invalidateAll();
+
         SourceOperator operator = createExchangeOperator();
 
         // add a buffer location containing one page and close the buffer
@@ -228,6 +228,8 @@ public void testWaitForNoMoreSplits()
     public void testFinish()
             throws Exception
     {
+        taskBuffers.invalidateAll();
+
         SourceOperator operator = createExchangeOperator();
 
         operator.addSplit(newRemoteSplit(TASK_1_ID));
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestFilterAndProjectOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestFilterAndProjectOperator.java
index d912588288e3..239082f12ced 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestFilterAndProjectOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestFilterAndProjectOperator.java
@@ -22,9 +22,10 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.relational.RowExpression;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Optional;
@@ -48,15 +49,16 @@
 import static io.trino.testing.TestingTaskContext.createTaskContext;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestFilterAndProjectOperator
 {
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
     private DriverContext driverContext;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
@@ -67,7 +69,7 @@ public void setUp()
                 .addDriverContext();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         executor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestFlatHashStrategy.java b/core/trino-main/src/test/java/io/trino/operator/TestFlatHashStrategy.java
new file mode 100644
index 000000000000..166f8c12ed48
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/operator/TestFlatHashStrategy.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed 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 io.trino.operator;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.spi.block.Block;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
+import io.trino.sql.gen.JoinCompiler;
+import io.trino.testing.TestingSession;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static io.trino.block.BlockAssertions.createRandomBlockForType;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.CharType.createCharType;
+import static io.trino.spi.type.DecimalType.createDecimalType;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_PICOS;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_SECONDS;
+import static io.trino.spi.type.UuidType.UUID;
+import static io.trino.spi.type.VarbinaryType.VARBINARY;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.type.IpAddressType.IPADDRESS;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class TestFlatHashStrategy
+{
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
+    private static final JoinCompiler JOIN_COMPILER = new JoinCompiler(TYPE_OPERATORS);
+
+    @Test
+    public void testBatchedRawHashesMatchSinglePositionHashes()
+    {
+        List<Type> types = createTestingTypes();
+        FlatHashStrategy flatHashStrategy = JOIN_COMPILER.getFlatHashStrategy(types);
+
+        int positionCount = 1024;
+        Block[] blocks = new Block[types.size()];
+        for (int i = 0; i < blocks.length; i++) {
+            blocks[i] = createRandomBlockForType(types.get(i), positionCount, 0.25f);
+        }
+
+        long[] hashes = new long[positionCount];
+        flatHashStrategy.hashBlocksBatched(blocks, hashes, 0, positionCount);
+        for (int position = 0; position < hashes.length; position++) {
+            long singleRowHash = flatHashStrategy.hash(blocks, position);
+            if (hashes[position] != singleRowHash) {
+                fail("Hash mismatch: %s <> %s at position %s - Values: %s".formatted(hashes[position], singleRowHash, position, singleRowTypesAndValues(types, blocks, position)));
+            }
+        }
+        // Ensure the formatting logic produces a real string and doesn't blow up since otherwise this code wouldn't be exercised
+        assertNotNull(singleRowTypesAndValues(types, blocks, 0));
+    }
+
+    private static List<Type> createTestingTypes()
+    {
+        List<Type> baseTypes = List.of(
+                BIGINT,
+                BOOLEAN,
+                createCharType(5),
+                createDecimalType(18),
+                createDecimalType(38),
+                DOUBLE,
+                INTEGER,
+                IPADDRESS,
+                REAL,
+                TIMESTAMP_SECONDS,
+                TIMESTAMP_MILLIS,
+                TIMESTAMP_MICROS,
+                TIMESTAMP_NANOS,
+                TIMESTAMP_PICOS,
+                UUID,
+                VARBINARY,
+                VARCHAR);
+
+        ImmutableList.Builder<Type> builder = ImmutableList.builder();
+        builder.addAll(baseTypes);
+        builder.add(RowType.anonymous(baseTypes));
+        for (Type baseType : baseTypes) {
+            builder.add(new ArrayType(baseType));
+            builder.add(new MapType(baseType, baseType, TYPE_OPERATORS));
+        }
+        return builder.build();
+    }
+
+    private static String singleRowTypesAndValues(List<Type> types, Block[] blocks, int position)
+    {
+        ConnectorSession connectorSession = TestingSession.testSessionBuilder().build().toConnectorSession();
+        StringBuilder builder = new StringBuilder();
+        int column = 0;
+        for (Type type : types) {
+            builder.append("\n\t");
+            builder.append(type);
+            builder.append(": ");
+            builder.append(type.getObjectValue(connectorSession, blocks[column], position));
+            column++;
+        }
+        return builder.toString();
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestGroupByHash.java b/core/trino-main/src/test/java/io/trino/operator/TestGroupByHash.java
index 12eb7310bd66..a0becc743c18 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestGroupByHash.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestGroupByHash.java
@@ -17,7 +17,6 @@
 import io.airlift.slice.Slices;
 import io.trino.Session;
 import io.trino.block.BlockAssertions;
-import io.trino.operator.MultiChannelGroupByHash.GetLowCardinalityDictionaryGroupIdsWork;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
@@ -30,57 +29,39 @@
 import io.trino.spi.type.TypeOperators;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.testing.TestingSession;
-import io.trino.type.BlockTypeOperators;
-import io.trino.type.TypeTestUtils;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.IntStream;
 
-import static com.google.common.math.DoubleMath.log2;
 import static io.trino.block.BlockAssertions.createLongSequenceBlock;
 import static io.trino.block.BlockAssertions.createLongsBlock;
 import static io.trino.block.BlockAssertions.createStringSequenceBlock;
 import static io.trino.operator.GroupByHash.createGroupByHash;
 import static io.trino.operator.UpdateMemory.NOOP;
 import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.type.TypeTestUtils.getHashBlock;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
 public class TestGroupByHash
 {
     private static final int MAX_GROUP_ID = 500;
-    private static final int[] CONTAINS_CHANNELS = new int[] {0};
     private static final Session TEST_SESSION = TestingSession.testSessionBuilder().build();
-    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
-    private static final BlockTypeOperators TYPE_OPERATOR_FACTORY = new BlockTypeOperators(TYPE_OPERATORS);
-    private static final JoinCompiler JOIN_COMPILER = new JoinCompiler(TYPE_OPERATORS);
-
-    @DataProvider
-    public Object[][] dataType()
-    {
-        return new Object[][] {{VARCHAR}, {BIGINT}};
-    }
-
-    @DataProvider
-    public Object[][] groupByHashType()
-    {
-        return new Object[][] {{GroupByHashType.BIGINT}, {GroupByHashType.MULTI_CHANNEL}};
-    }
+    private static final JoinCompiler JOIN_COMPILER = new JoinCompiler(new TypeOperators());
+    private static final int BIGINT_EXPECTED_REHASH = 20;
+    // first rehash moves from the initial capacity to 1024 (batch size) and last hash moves to 1024 * 1024,
+    // which is 1 initial rehash + 10 additional rehashes
+    private static final int VARCHAR_EXPECTED_REHASH = 11;
 
     private enum GroupByHashType
     {
-        BIGINT, MULTI_CHANNEL;
+        BIGINT, FLAT;
 
         public GroupByHash createGroupByHash()
         {
@@ -89,317 +70,283 @@ public GroupByHash createGroupByHash()
 
         public GroupByHash createGroupByHash(int expectedSize, UpdateMemory updateMemory)
         {
-            switch (this) {
-                case BIGINT:
-                    return new BigintGroupByHash(0, true, expectedSize, updateMemory);
-                case MULTI_CHANNEL:
-                    return new MultiChannelGroupByHash(
-                            ImmutableList.of(BigintType.BIGINT),
-                            new int[] {0},
-                            Optional.of(1),
-                            expectedSize,
-                            true,
-                            JOIN_COMPILER,
-                            TYPE_OPERATOR_FACTORY,
-                            updateMemory);
-            }
-
-            throw new UnsupportedOperationException();
+            return switch (this) {
+                case BIGINT -> new BigintGroupByHash(true, expectedSize, updateMemory);
+                case FLAT -> new FlatGroupByHash(
+                        ImmutableList.of(BigintType.BIGINT),
+                        true,
+                        expectedSize,
+                        true,
+                        JOIN_COMPILER,
+                        updateMemory);
+            };
         }
     }
 
-    @Test(dataProvider = "groupByHashType")
-    public void testAddPage(GroupByHashType groupByHashType)
+    @Test
+    public void testAddPage()
     {
-        GroupByHash groupByHash = groupByHashType.createGroupByHash();
-        for (int tries = 0; tries < 2; tries++) {
-            for (int value = 0; value < MAX_GROUP_ID; value++) {
-                Block block = BlockAssertions.createLongsBlock(value);
-                Block hashBlock = TypeTestUtils.getHashBlock(ImmutableList.of(BIGINT), block);
-                Page page = new Page(block, hashBlock);
-                for (int addValuesTries = 0; addValuesTries < 10; addValuesTries++) {
-                    groupByHash.addPage(page).process();
-                    assertEquals(groupByHash.getGroupCount(), tries == 0 ? value + 1 : MAX_GROUP_ID);
-
-                    // add the page again using get group ids and make sure the group count didn't change
-                    Work<GroupByIdBlock> work = groupByHash.getGroupIds(page);
-                    work.process();
-                    GroupByIdBlock groupIds = work.getResult();
-                    assertEquals(groupByHash.getGroupCount(), tries == 0 ? value + 1 : MAX_GROUP_ID);
-                    assertEquals(groupIds.getGroupCount(), tries == 0 ? value + 1 : MAX_GROUP_ID);
-
-                    // verify the first position
-                    assertEquals(groupIds.getPositionCount(), 1);
-                    long groupId = groupIds.getGroupId(0);
-                    assertEquals(groupId, value);
+        for (GroupByHashType groupByHashType : GroupByHashType.values()) {
+            GroupByHash groupByHash = groupByHashType.createGroupByHash();
+            for (int tries = 0; tries < 2; tries++) {
+                for (int value = 0; value < MAX_GROUP_ID; value++) {
+                    Block block = createLongsBlock(value);
+                    Block hashBlock = getHashBlock(ImmutableList.of(BIGINT), block);
+                    Page page = new Page(block, hashBlock);
+                    for (int addValuesTries = 0; addValuesTries < 10; addValuesTries++) {
+                        groupByHash.addPage(page).process();
+                        assertEquals(groupByHash.getGroupCount(), tries == 0 ? value + 1 : MAX_GROUP_ID);
+
+                        // add the page again using get group ids and make sure the group count didn't change
+                        int[] groupIds = getGroupIds(groupByHash, page);
+                        assertEquals(groupByHash.getGroupCount(), tries == 0 ? value + 1 : MAX_GROUP_ID);
+
+                        // verify the first position
+                        assertEquals(groupIds.length, 1);
+                        int groupId = groupIds[0];
+                        assertEquals(groupId, value);
+                    }
                 }
             }
         }
     }
 
-    @Test(dataProvider = "groupByHashType")
-    public void testRunLengthEncodedInputPage(GroupByHashType groupByHashType)
+    @Test
+    public void testRunLengthEncodedInputPage()
     {
-        GroupByHash groupByHash = groupByHashType.createGroupByHash();
-        Block block = BlockAssertions.createLongsBlock(0L);
-        Block hashBlock = TypeTestUtils.getHashBlock(ImmutableList.of(BIGINT), block);
-        Page page = new Page(
-                RunLengthEncodedBlock.create(block, 2),
-                RunLengthEncodedBlock.create(hashBlock, 2));
+        for (GroupByHashType groupByHashType : GroupByHashType.values()) {
+            GroupByHash groupByHash = groupByHashType.createGroupByHash();
+            Block block = createLongsBlock(0L);
+            Block hashBlock = getHashBlock(ImmutableList.of(BIGINT), block);
+            Page page = new Page(
+                    RunLengthEncodedBlock.create(block, 2),
+                    RunLengthEncodedBlock.create(hashBlock, 2));
 
-        groupByHash.addPage(page).process();
+            groupByHash.addPage(page).process();
 
-        assertEquals(groupByHash.getGroupCount(), 1);
+            assertEquals(groupByHash.getGroupCount(), 1);
 
-        Work<GroupByIdBlock> work = groupByHash.getGroupIds(page);
-        work.process();
-        GroupByIdBlock groupIds = work.getResult();
-
-        assertEquals(groupIds.getGroupCount(), 1);
-        assertEquals(groupIds.getPositionCount(), 2);
-        assertEquals(groupIds.getGroupId(0), 0);
-        assertEquals(groupIds.getGroupId(1), 0);
+            Work<int[]> work = groupByHash.getGroupIds(page);
+            if (groupByHashType == GroupByHashType.FLAT) {
+                assertThat(work).isInstanceOf(FlatGroupByHash.GetRunLengthEncodedGroupIdsWork.class);
+            }
+            else {
+                assertThat(work).isInstanceOf(BigintGroupByHash.GetRunLengthEncodedGroupIdsWork.class);
+            }
+            work.process();
+            int[] groupIds = work.getResult();
 
-        List<Block> children = groupIds.getChildren();
-        assertEquals(children.size(), 1);
-        assertTrue(children.get(0) instanceof RunLengthEncodedBlock);
+            assertEquals(groupByHash.getGroupCount(), 1);
+            assertEquals(groupIds.length, 2);
+            assertEquals(groupIds[0], 0);
+            assertEquals(groupIds[1], 0);
+        }
     }
 
-    @Test(dataProvider = "groupByHashType")
-    public void testDictionaryInputPage(GroupByHashType groupByHashType)
+    @Test
+    public void testDictionaryInputPage()
     {
-        GroupByHash groupByHash = groupByHashType.createGroupByHash();
-        Block block = BlockAssertions.createLongsBlock(0L, 1L);
-        Block hashBlock = TypeTestUtils.getHashBlock(ImmutableList.of(BIGINT), block);
-        int[] ids = new int[] {0, 0, 1, 1};
-        Page page = new Page(
-                DictionaryBlock.create(ids.length, block, ids),
-                DictionaryBlock.create(ids.length, hashBlock, ids));
-
-        groupByHash.addPage(page).process();
-
-        assertEquals(groupByHash.getGroupCount(), 2);
-
-        Work<GroupByIdBlock> work = groupByHash.getGroupIds(page);
-        work.process();
-        GroupByIdBlock groupIds = work.getResult();
-
-        assertEquals(groupIds.getGroupCount(), 2);
-        assertEquals(groupIds.getPositionCount(), 4);
-        assertEquals(groupIds.getGroupId(0), 0);
-        assertEquals(groupIds.getGroupId(1), 0);
-        assertEquals(groupIds.getGroupId(2), 1);
-        assertEquals(groupIds.getGroupId(3), 1);
+        for (GroupByHashType groupByHashType : GroupByHashType.values()) {
+            GroupByHash groupByHash = groupByHashType.createGroupByHash();
+            Block block = createLongsBlock(0L, 1L);
+            Block hashBlock = getHashBlock(ImmutableList.of(BIGINT), block);
+            int[] ids = new int[] {0, 0, 1, 1};
+            Page page = new Page(
+                    DictionaryBlock.create(ids.length, block, ids),
+                    DictionaryBlock.create(ids.length, hashBlock, ids));
+
+            groupByHash.addPage(page).process();
+
+            assertEquals(groupByHash.getGroupCount(), 2);
+
+            int[] groupIds = getGroupIds(groupByHash, page);
+            assertEquals(groupByHash.getGroupCount(), 2);
+            assertEquals(groupIds.length, 4);
+            assertEquals(groupIds[0], 0);
+            assertEquals(groupIds[1], 0);
+            assertEquals(groupIds[2], 1);
+            assertEquals(groupIds[3], 1);
+        }
     }
 
-    @Test(dataProvider = "groupByHashType")
-    public void testNullGroup(GroupByHashType groupByHashType)
+    @Test
+    public void testNullGroup()
     {
-        GroupByHash groupByHash = groupByHashType.createGroupByHash();
-
-        Block block = createLongsBlock((Long) null);
-        Block hashBlock = getHashBlock(ImmutableList.of(BIGINT), block);
-        Page page = new Page(block, hashBlock);
-        groupByHash.addPage(page).process();
-
-        // Add enough values to force a rehash
-        block = createLongSequenceBlock(1, 132748);
-        hashBlock = getHashBlock(ImmutableList.of(BIGINT), block);
-        page = new Page(block, hashBlock);
-        groupByHash.addPage(page).process();
-
-        block = createLongsBlock(0);
-        hashBlock = getHashBlock(ImmutableList.of(BIGINT), block);
-        page = new Page(block, hashBlock);
-        assertFalse(groupByHash.contains(0, page, CONTAINS_CHANNELS));
+        for (GroupByHashType groupByHashType : GroupByHashType.values()) {
+            GroupByHash groupByHash = groupByHashType.createGroupByHash();
+
+            Block block = createLongsBlock(0L, null);
+            Block hashBlock = getHashBlock(ImmutableList.of(BIGINT), block);
+            Page page = new Page(block, hashBlock);
+            // assign null a groupId (which is one since is it the second value added)
+            assertThat(getGroupIds(groupByHash, page))
+                    .containsExactly(0, 1);
+
+            // Add enough values to force a rehash
+            block = createLongSequenceBlock(1, 132748);
+            hashBlock = getHashBlock(ImmutableList.of(BIGINT), block);
+            page = new Page(block, hashBlock);
+            groupByHash.addPage(page).process();
+
+            block = createLongsBlock((Long) null);
+            hashBlock = getHashBlock(ImmutableList.of(BIGINT), block);
+            // null groupId will be 0 (as set above)
+            assertThat(getGroupIds(groupByHash, new Page(block, hashBlock)))
+                    .containsExactly(1);
+        }
     }
 
-    @Test(dataProvider = "groupByHashType")
-    public void testGetGroupIds(GroupByHashType groupByHashType)
+    @Test
+    public void testGetGroupIds()
     {
-        GroupByHash groupByHash = groupByHashType.createGroupByHash();
-        for (int tries = 0; tries < 2; tries++) {
-            for (int value = 0; value < MAX_GROUP_ID; value++) {
-                Block block = BlockAssertions.createLongsBlock(value);
-                Block hashBlock = TypeTestUtils.getHashBlock(ImmutableList.of(BIGINT), block);
-                Page page = new Page(block, hashBlock);
-                for (int addValuesTries = 0; addValuesTries < 10; addValuesTries++) {
-                    Work<GroupByIdBlock> work = groupByHash.getGroupIds(page);
-                    work.process();
-                    GroupByIdBlock groupIds = work.getResult();
-                    assertEquals(groupIds.getGroupCount(), tries == 0 ? value + 1 : MAX_GROUP_ID);
-                    assertEquals(groupIds.getPositionCount(), 1);
-                    long groupId = groupIds.getGroupId(0);
-                    assertEquals(groupId, value);
+        for (GroupByHashType groupByHashType : GroupByHashType.values()) {
+            GroupByHash groupByHash = groupByHashType.createGroupByHash();
+            for (int tries = 0; tries < 2; tries++) {
+                for (int value = 0; value < MAX_GROUP_ID; value++) {
+                    Block block = createLongsBlock(value);
+                    Block hashBlock = getHashBlock(ImmutableList.of(BIGINT), block);
+                    Page page = new Page(block, hashBlock);
+                    for (int addValuesTries = 0; addValuesTries < 10; addValuesTries++) {
+                        int[] groupIds = getGroupIds(groupByHash, page);
+                        assertEquals(groupByHash.getGroupCount(), tries == 0 ? value + 1 : MAX_GROUP_ID);
+                        assertEquals(groupIds.length, 1);
+                        long groupId = groupIds[0];
+                        assertEquals(groupId, value);
+                    }
                 }
             }
         }
     }
 
     @Test
-    public void testTypes()
+    public void testAppendTo()
     {
-        GroupByHash groupByHash = createGroupByHash(TEST_SESSION, ImmutableList.of(VARCHAR), new int[] {0}, Optional.of(1), 100, JOIN_COMPILER, TYPE_OPERATOR_FACTORY, NOOP);
-        // Additional bigint channel for hash
-        assertEquals(groupByHash.getTypes(), ImmutableList.of(VARCHAR, BIGINT));
-    }
-
-    @Test(dataProvider = "groupByHashType")
-    public void testAppendTo(GroupByHashType groupByHashType)
-    {
-        Block valuesBlock = BlockAssertions.createLongSequenceBlock(0, 100);
-        Block hashBlock = TypeTestUtils.getHashBlock(ImmutableList.of(BIGINT), valuesBlock);
-        GroupByHash groupByHash = groupByHashType.createGroupByHash();
-
-        Work<GroupByIdBlock> work = groupByHash.getGroupIds(new Page(valuesBlock, hashBlock));
-        work.process();
-        GroupByIdBlock groupIds = work.getResult();
-        for (int i = 0; i < groupIds.getPositionCount(); i++) {
-            assertEquals(groupIds.getGroupId(i), i);
-        }
-        assertEquals(groupByHash.getGroupCount(), 100);
+        for (GroupByHashType groupByHashType : GroupByHashType.values()) {
+            Block valuesBlock = createLongSequenceBlock(0, 100);
+            Block hashBlock = getHashBlock(ImmutableList.of(BIGINT), valuesBlock);
+            GroupByHash groupByHash = groupByHashType.createGroupByHash();
+
+            int[] groupIds = getGroupIds(groupByHash, new Page(valuesBlock, hashBlock));
+            for (int i = 0; i < valuesBlock.getPositionCount(); i++) {
+                assertEquals(groupIds[i], i);
+            }
+            assertEquals(groupByHash.getGroupCount(), 100);
 
-        PageBuilder pageBuilder = new PageBuilder(groupByHash.getTypes());
-        for (int i = 0; i < groupByHash.getGroupCount(); i++) {
-            pageBuilder.declarePosition();
-            groupByHash.appendValuesTo(i, pageBuilder);
-        }
-        Page page = pageBuilder.build();
-        // Ensure that all blocks have the same positionCount
-        for (int i = 0; i < groupByHash.getTypes().size(); i++) {
-            assertEquals(page.getBlock(i).getPositionCount(), 100);
+            PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(BIGINT, BIGINT));
+            for (int i = 0; i < groupByHash.getGroupCount(); i++) {
+                pageBuilder.declarePosition();
+                groupByHash.appendValuesTo(i, pageBuilder);
+            }
+            Page page = pageBuilder.build();
+            // Ensure that all blocks have the same positionCount
+            for (int i = 0; i < page.getChannelCount(); i++) {
+                assertEquals(page.getBlock(i).getPositionCount(), 100);
+            }
+            assertEquals(page.getPositionCount(), 100);
+            BlockAssertions.assertBlockEquals(BIGINT, page.getBlock(0), valuesBlock);
+            BlockAssertions.assertBlockEquals(BIGINT, page.getBlock(1), hashBlock);
         }
-        assertEquals(page.getPositionCount(), 100);
-        BlockAssertions.assertBlockEquals(BIGINT, page.getBlock(0), valuesBlock);
-        BlockAssertions.assertBlockEquals(BIGINT, page.getBlock(1), hashBlock);
     }
 
-    @Test(dataProvider = "groupByHashType")
-    public void testAppendToMultipleTuplesPerGroup(GroupByHashType groupByHashType)
+    @Test
+    public void testAppendToMultipleTuplesPerGroup()
     {
-        List<Long> values = new ArrayList<>();
-        for (long i = 0; i < 100; i++) {
-            values.add(i % 50);
-        }
-        Block valuesBlock = BlockAssertions.createLongsBlock(values);
-        Block hashBlock = TypeTestUtils.getHashBlock(ImmutableList.of(BIGINT), valuesBlock);
+        for (GroupByHashType groupByHashType : GroupByHashType.values()) {
+            List<Long> values = new ArrayList<>();
+            for (long i = 0; i < 100; i++) {
+                values.add(i % 50);
+            }
+            Block valuesBlock = createLongsBlock(values);
+            Block hashBlock = getHashBlock(ImmutableList.of(BIGINT), valuesBlock);
 
-        GroupByHash groupByHash = groupByHashType.createGroupByHash();
-        groupByHash.getGroupIds(new Page(valuesBlock, hashBlock)).process();
-        assertEquals(groupByHash.getGroupCount(), 50);
+            GroupByHash groupByHash = groupByHashType.createGroupByHash();
+            groupByHash.getGroupIds(new Page(valuesBlock, hashBlock)).process();
+            assertEquals(groupByHash.getGroupCount(), 50);
 
-        PageBuilder pageBuilder = new PageBuilder(groupByHash.getTypes());
-        for (int i = 0; i < groupByHash.getGroupCount(); i++) {
-            pageBuilder.declarePosition();
-            groupByHash.appendValuesTo(i, pageBuilder);
+            PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(BIGINT, BIGINT));
+            for (int i = 0; i < groupByHash.getGroupCount(); i++) {
+                pageBuilder.declarePosition();
+                groupByHash.appendValuesTo(i, pageBuilder);
+            }
+            Page outputPage = pageBuilder.build();
+            assertEquals(outputPage.getPositionCount(), 50);
+            BlockAssertions.assertBlockEquals(BIGINT, outputPage.getBlock(0), createLongSequenceBlock(0, 50));
         }
-        Page outputPage = pageBuilder.build();
-        assertEquals(outputPage.getPositionCount(), 50);
-        BlockAssertions.assertBlockEquals(BIGINT, outputPage.getBlock(0), BlockAssertions.createLongSequenceBlock(0, 50));
     }
 
-    @Test(dataProvider = "groupByHashType")
-    public void testContains(GroupByHashType groupByHashType)
+    @Test
+    public void testForceRehash()
     {
-        Block valuesBlock = BlockAssertions.createLongSequenceBlock(0, 10);
-        Block hashBlock = TypeTestUtils.getHashBlock(ImmutableList.of(BIGINT), valuesBlock);
-        GroupByHash groupByHash = groupByHashType.createGroupByHash();
-        groupByHash.getGroupIds(new Page(valuesBlock, hashBlock)).process();
-
-        Block testBlock = BlockAssertions.createLongsBlock(3);
-        Block testHashBlock = TypeTestUtils.getHashBlock(ImmutableList.of(BIGINT), testBlock);
-        assertTrue(groupByHash.contains(0, new Page(testBlock, testHashBlock), CONTAINS_CHANNELS));
-
-        testBlock = BlockAssertions.createLongsBlock(11);
-        testHashBlock = TypeTestUtils.getHashBlock(ImmutableList.of(BIGINT), testBlock);
-        assertFalse(groupByHash.contains(0, new Page(testBlock, testHashBlock), CONTAINS_CHANNELS));
+        for (GroupByHashType groupByHashType : GroupByHashType.values()) {
+            // Create a page with positionCount >> expected size of groupByHash
+            Block valuesBlock = createLongSequenceBlock(0, 100);
+            Block hashBlock = getHashBlock(ImmutableList.of(BIGINT), valuesBlock);
+
+            // Create GroupByHash with tiny size
+            GroupByHash groupByHash = groupByHashType.createGroupByHash(4, NOOP);
+            groupByHash.getGroupIds(new Page(valuesBlock, hashBlock)).process();
+
+            // Ensure that all groups are present in GroupByHash
+            int groupCount = groupByHash.getGroupCount();
+            for (int groupId : getGroupIds(groupByHash, new Page(valuesBlock, hashBlock))) {
+                assertThat(groupId).isLessThan(groupCount);
+            }
+        }
     }
 
     @Test
-    public void testContainsMultipleColumns()
+    public void testUpdateMemoryVarchar()
     {
-        Block valuesBlock = BlockAssertions.createDoubleSequenceBlock(0, 10);
-        Block stringValuesBlock = BlockAssertions.createStringSequenceBlock(0, 10);
-        Block hashBlock = TypeTestUtils.getHashBlock(ImmutableList.of(DOUBLE, VARCHAR), valuesBlock, stringValuesBlock);
-        int[] hashChannels = {0, 1};
-        GroupByHash groupByHash = createGroupByHash(TEST_SESSION, ImmutableList.of(DOUBLE, VARCHAR), hashChannels, Optional.of(2), 100, JOIN_COMPILER, TYPE_OPERATOR_FACTORY, NOOP);
-        groupByHash.getGroupIds(new Page(valuesBlock, stringValuesBlock, hashBlock)).process();
-
-        Block testValuesBlock = BlockAssertions.createDoublesBlock((double) 3);
-        Block testStringValuesBlock = BlockAssertions.createStringsBlock("3");
-        Block testHashBlock = TypeTestUtils.getHashBlock(ImmutableList.of(DOUBLE, VARCHAR), testValuesBlock, testStringValuesBlock);
-        assertTrue(groupByHash.contains(0, new Page(testValuesBlock, testStringValuesBlock, testHashBlock), hashChannels));
-    }
+        Type type = VARCHAR;
 
-    @Test(dataProvider = "groupByHashType")
-    public void testForceRehash(GroupByHashType groupByHashType)
-    {
         // Create a page with positionCount >> expected size of groupByHash
-        Block valuesBlock = BlockAssertions.createLongSequenceBlock(0, 100);
-        Block hashBlock = TypeTestUtils.getHashBlock(ImmutableList.of(BIGINT), valuesBlock);
+        Block valuesBlock = createStringSequenceBlock(0, 1_000_000);
+        Block hashBlock = getHashBlock(ImmutableList.of(type), valuesBlock);
 
-        // Create group by hash with extremely small size
-        GroupByHash groupByHash = groupByHashType.createGroupByHash(4, NOOP);
-        groupByHash.getGroupIds(new Page(valuesBlock, hashBlock)).process();
+        // Create GroupByHash with tiny size
+        AtomicInteger rehashCount = new AtomicInteger();
+        GroupByHash groupByHash = createGroupByHash(ImmutableList.of(type), true, 1, false, JOIN_COMPILER, () -> {
+            rehashCount.incrementAndGet();
+            return true;
+        });
+        groupByHash.addPage(new Page(valuesBlock, hashBlock)).process();
 
-        // Ensure that all groups are present in group by hash
-        for (int i = 0; i < valuesBlock.getPositionCount(); i++) {
-            assertTrue(groupByHash.contains(i, new Page(valuesBlock, hashBlock), CONTAINS_CHANNELS));
-        }
+        // assert we call update memory twice every time we rehash; the rehash count = log2(length / FILL_RATIO)
+        assertEquals(rehashCount.get(), 2 * VARCHAR_EXPECTED_REHASH);
     }
 
-    @Test(dataProvider = "dataType")
-    public void testUpdateMemory(Type type)
+    @Test
+    public void testUpdateMemoryBigint()
     {
+        Type type = BIGINT;
+
         // Create a page with positionCount >> expected size of groupByHash
-        int length = 1_000_000;
-        Block valuesBlock;
-        if (type == VARCHAR) {
-            valuesBlock = createStringSequenceBlock(0, length);
-        }
-        else if (type == BIGINT) {
-            valuesBlock = createLongSequenceBlock(0, length);
-        }
-        else {
-            throw new IllegalArgumentException("unsupported data type");
-        }
+        Block valuesBlock = createLongSequenceBlock(0, 1_000_000);
         Block hashBlock = getHashBlock(ImmutableList.of(type), valuesBlock);
 
-        // Create group by hash with extremely small size
+        // Create GroupByHash with tiny size
         AtomicInteger rehashCount = new AtomicInteger();
-        GroupByHash groupByHash = createGroupByHash(
-                ImmutableList.of(type),
-                new int[] {0},
-                Optional.of(1),
-                1,
-                false,
-                JOIN_COMPILER,
-                TYPE_OPERATOR_FACTORY,
-                () -> {
-                    rehashCount.incrementAndGet();
-                    return true;
-                });
+        GroupByHash groupByHash = createGroupByHash(ImmutableList.of(type), true, 1, false, JOIN_COMPILER, () -> {
+            rehashCount.incrementAndGet();
+            return true;
+        });
         groupByHash.addPage(new Page(valuesBlock, hashBlock)).process();
 
         // assert we call update memory twice every time we rehash; the rehash count = log2(length / FILL_RATIO)
-        assertEquals(rehashCount.get(), 2 * log2(length / 0.75, RoundingMode.FLOOR));
+        assertEquals(rehashCount.get(), 2 * BIGINT_EXPECTED_REHASH);
     }
 
-    @Test(dataProvider = "dataType")
-    public void testMemoryReservationYield(Type type)
+    @Test
+    public void testMemoryReservationYield()
     {
         // Create a page with positionCount >> expected size of groupByHash
         int length = 1_000_000;
-        Block valuesBlock;
-        if (type == VARCHAR) {
-            valuesBlock = createStringSequenceBlock(0, length);
-        }
-        else if (type == BIGINT) {
-            valuesBlock = createLongSequenceBlock(0, length);
-        }
-        else {
-            throw new IllegalArgumentException("unsupported data type");
-        }
+        testMemoryReservationYield(VARCHAR, createStringSequenceBlock(0, length), length, VARCHAR_EXPECTED_REHASH);
+        testMemoryReservationYield(BIGINT, createLongSequenceBlock(0, length), length, BIGINT_EXPECTED_REHASH);
+    }
+
+    private static void testMemoryReservationYield(Type type, Block valuesBlock, int length, int expectedRehash)
+    {
         Block hashBlock = getHashBlock(ImmutableList.of(type), valuesBlock);
         Page page = new Page(valuesBlock, hashBlock);
         AtomicInteger currentQuota = new AtomicInteger(0);
@@ -414,7 +361,7 @@ else if (type == BIGINT) {
         int yields = 0;
 
         // test addPage
-        GroupByHash groupByHash = createGroupByHash(ImmutableList.of(type), new int[] {0}, Optional.of(1), 1, false, JOIN_COMPILER, TYPE_OPERATOR_FACTORY, updateMemory);
+        GroupByHash groupByHash = createGroupByHash(ImmutableList.of(type), true, 1, false, JOIN_COMPILER, updateMemory);
         boolean finish = false;
         Work<?> addPageWork = groupByHash.addPage(page);
         while (!finish) {
@@ -433,18 +380,17 @@ else if (type == BIGINT) {
         assertEquals(length, groupByHash.getGroupCount());
         // assert we yield for every 3 rehashes
         // currentQuota is essentially the count we have successfully rehashed multiplied by 2 (as updateMemory is called twice per rehash)
-        // the rehash count is 20 = log(1_000_000 / 0.75)
-        assertEquals(currentQuota.get(), 20 * 2);
+        assertEquals(currentQuota.get(), 2 * expectedRehash);
         assertEquals(currentQuota.get() / 3 / 2, yields);
 
         // test getGroupIds
         currentQuota.set(0);
         allowedQuota.set(6);
         yields = 0;
-        groupByHash = createGroupByHash(ImmutableList.of(type), new int[] {0}, Optional.of(1), 1, false, JOIN_COMPILER, TYPE_OPERATOR_FACTORY, updateMemory);
+        groupByHash = createGroupByHash(ImmutableList.of(type), true, 1, false, JOIN_COMPILER, updateMemory);
 
         finish = false;
-        Work<GroupByIdBlock> getGroupIdsWork = groupByHash.getGroupIds(page);
+        Work<int[]> getGroupIdsWork = groupByHash.getGroupIds(page);
         while (!finish) {
             finish = getGroupIdsWork.process();
             if (!finish) {
@@ -458,88 +404,88 @@ else if (type == BIGINT) {
         }
         // assert there is not anything missing
         assertEquals(length, groupByHash.getGroupCount());
-        assertEquals(length, getGroupIdsWork.getResult().getPositionCount());
-        // assert we yield for every 3 rehashes
-        // currentQuota is essentially the count we have successfully rehashed multiplied by 2 (as updateMemory is called twice per rehash)
-        // the rehash count is 20 = log2(1_000_000 / 0.75)
-        assertEquals(currentQuota.get(), 20 * 2);
+        assertEquals(length, getGroupIdsWork.getResult().length);
+        // rehash count is the same as above
+        assertEquals(currentQuota.get(), 2 * expectedRehash);
         assertEquals(currentQuota.get() / 3 / 2, yields);
     }
 
-    @Test(dataProvider = "groupByHashType")
-    public void testMemoryReservationYieldWithDictionary(GroupByHashType groupByHashType)
+    @Test
+    public void testMemoryReservationYieldWithDictionary()
     {
-        // Create a page with positionCount >> expected size of groupByHash
-        int dictionaryLength = 1_000;
-        int length = 2_000_000;
-        int[] ids = IntStream.range(0, dictionaryLength).toArray();
-        Block valuesBlock = DictionaryBlock.create(dictionaryLength, createLongSequenceBlock(0, length), ids);
-        Block hashBlock = DictionaryBlock.create(dictionaryLength, getHashBlock(ImmutableList.of(BIGINT), valuesBlock), ids);
-        Page page = new Page(valuesBlock, hashBlock);
-        AtomicInteger currentQuota = new AtomicInteger(0);
-        AtomicInteger allowedQuota = new AtomicInteger(6);
-        UpdateMemory updateMemory = () -> {
-            if (currentQuota.get() < allowedQuota.get()) {
-                currentQuota.getAndIncrement();
-                return true;
+        for (GroupByHashType groupByHashType : GroupByHashType.values()) {
+            // Create a page with positionCount >> expected size of groupByHash
+            int dictionaryLength = 10_000;
+            int length = 2_000_000;
+            int[] ids = IntStream.range(0, dictionaryLength).toArray();
+            Block valuesBlock = DictionaryBlock.create(dictionaryLength, createLongSequenceBlock(0, length), ids);
+            Block hashBlock = DictionaryBlock.create(dictionaryLength, getHashBlock(ImmutableList.of(BIGINT), valuesBlock), ids);
+            Page page = new Page(valuesBlock, hashBlock);
+            AtomicInteger currentQuota = new AtomicInteger(0);
+            AtomicInteger allowedQuota = new AtomicInteger(6);
+            UpdateMemory updateMemory = () -> {
+                if (currentQuota.get() < allowedQuota.get()) {
+                    currentQuota.getAndIncrement();
+                    return true;
+                }
+                return false;
+            };
+            int yields = 0;
+
+            // test addPage
+            GroupByHash groupByHash = groupByHashType.createGroupByHash(1, updateMemory);
+
+            boolean finish = false;
+            Work<?> addPageWork = groupByHash.addPage(page);
+            while (!finish) {
+                finish = addPageWork.process();
+                if (!finish) {
+                    assertEquals(currentQuota.get(), allowedQuota.get());
+                    // assert if we are blocked, we are going to be blocked again without changing allowedQuota
+                    assertFalse(addPageWork.process());
+                    assertEquals(currentQuota.get(), allowedQuota.get());
+                    yields++;
+                    allowedQuota.getAndAdd(6);
+                }
             }
-            return false;
-        };
-        int yields = 0;
 
-        // test addPage
-        GroupByHash groupByHash = groupByHashType.createGroupByHash(1, updateMemory);
-
-        boolean finish = false;
-        Work<?> addPageWork = groupByHash.addPage(page);
-        while (!finish) {
-            finish = addPageWork.process();
-            if (!finish) {
-                assertEquals(currentQuota.get(), allowedQuota.get());
-                // assert if we are blocked, we are going to be blocked again without changing allowedQuota
-                assertFalse(addPageWork.process());
-                assertEquals(currentQuota.get(), allowedQuota.get());
-                yields++;
-                allowedQuota.getAndAdd(6);
+            // assert there is not anything missing
+            assertEquals(dictionaryLength, groupByHash.getGroupCount());
+            // assert we yield for every 3 rehashes
+            // currentQuota is essentially the count we have successfully rehashed multiplied by 2 (as updateMemory is called twice per rehash)
+            // the rehash count is 10 = log(1_000 / 0.75)
+            assertEquals(currentQuota.get(), 2 * (groupByHashType == GroupByHashType.FLAT ? 4 : 13));
+            assertEquals(currentQuota.get() / 3 / 2, yields);
+
+            // test getGroupIds
+            currentQuota.set(0);
+            allowedQuota.set(6);
+            yields = 0;
+            groupByHash = groupByHashType.createGroupByHash(1, updateMemory);
+
+            finish = false;
+            Work<int[]> getGroupIdsWork = groupByHash.getGroupIds(page);
+            while (!finish) {
+                finish = getGroupIdsWork.process();
+                if (!finish) {
+                    assertEquals(currentQuota.get(), allowedQuota.get());
+                    // assert if we are blocked, we are going to be blocked again without changing allowedQuota
+                    assertFalse(getGroupIdsWork.process());
+                    assertEquals(currentQuota.get(), allowedQuota.get());
+                    yields++;
+                    allowedQuota.getAndAdd(6);
+                }
             }
-        }
 
-        // assert there is not anything missing
-        assertEquals(dictionaryLength, groupByHash.getGroupCount());
-        // assert we yield for every 3 rehashes
-        // currentQuota is essentially the count we have successfully rehashed multiplied by 2 (as updateMemory is called twice per rehash)
-        // the rehash count is 10 = log(1_000 / 0.75)
-        assertEquals(currentQuota.get(), 10 * 2);
-        assertEquals(currentQuota.get() / 3 / 2, yields);
-
-        // test getGroupIds
-        currentQuota.set(0);
-        allowedQuota.set(6);
-        yields = 0;
-        groupByHash = groupByHashType.createGroupByHash(1, updateMemory);
-
-        finish = false;
-        Work<GroupByIdBlock> getGroupIdsWork = groupByHash.getGroupIds(page);
-        while (!finish) {
-            finish = getGroupIdsWork.process();
-            if (!finish) {
-                assertEquals(currentQuota.get(), allowedQuota.get());
-                // assert if we are blocked, we are going to be blocked again without changing allowedQuota
-                assertFalse(getGroupIdsWork.process());
-                assertEquals(currentQuota.get(), allowedQuota.get());
-                yields++;
-                allowedQuota.getAndAdd(6);
-            }
+            // assert there is not anything missing
+            assertEquals(dictionaryLength, groupByHash.getGroupCount());
+            assertEquals(dictionaryLength, getGroupIdsWork.getResult().length);
+            // assert we yield for every 3 rehashes
+            // currentQuota is essentially the count we have successfully rehashed multiplied by 2 (as updateMemory is called twice per rehash)
+            // the rehash count is 10 = log2(1_000 / 0.75)
+            assertEquals(currentQuota.get(), 2 * (groupByHashType == GroupByHashType.FLAT ? 4 : 13));
+            assertEquals(currentQuota.get() / 3 / 2, yields);
         }
-
-        // assert there is not anything missing
-        assertEquals(dictionaryLength, groupByHash.getGroupCount());
-        assertEquals(dictionaryLength, getGroupIdsWork.getResult().getPositionCount());
-        // assert we yield for every 3 rehashes
-        // currentQuota is essentially the count we have successfully rehashed multiplied by 2 (as updateMemory is called twice per rehash)
-        // the rehash count is 10 = log2(1_000 / 0.75)
-        assertEquals(currentQuota.get(), 10 * 2);
-        assertEquals(currentQuota.get() / 3 / 2, yields);
     }
 
     @Test
@@ -548,18 +494,16 @@ public void testLowCardinalityDictionariesAddPage()
         GroupByHash groupByHash = createGroupByHash(
                 TEST_SESSION,
                 ImmutableList.of(BIGINT, BIGINT),
-                new int[] {0, 1},
-                Optional.empty(),
+                false,
                 100,
                 JOIN_COMPILER,
-                TYPE_OPERATOR_FACTORY,
                 NOOP);
         Block firstBlock = BlockAssertions.createLongDictionaryBlock(0, 1000, 10);
         Block secondBlock = BlockAssertions.createLongDictionaryBlock(0, 1000, 10);
         Page page = new Page(firstBlock, secondBlock);
 
         Work<?> work = groupByHash.addPage(page);
-        assertThat(work).isInstanceOf(MultiChannelGroupByHash.AddLowCardinalityDictionaryPageWork.class);
+        assertThat(work).isInstanceOf(FlatGroupByHash.AddLowCardinalityDictionaryPageWork.class);
         work.process();
         assertThat(groupByHash.getGroupCount()).isEqualTo(10); // Blocks are identical so only 10 distinct groups
 
@@ -574,25 +518,21 @@ public void testLowCardinalityDictionariesAddPage()
     @Test
     public void testLowCardinalityDictionariesGetGroupIds()
     {
-        // Compare group id results from page with dictionaries only (processed via low cardinality work) and the same page processed normally
+        // Compare group ids results from page with dictionaries only (processed via low cardinality work) and the same page processed normally
         GroupByHash groupByHash = createGroupByHash(
                 TEST_SESSION,
                 ImmutableList.of(BIGINT, BIGINT, BIGINT, BIGINT, BIGINT),
-                new int[] {0, 1, 2, 3, 4},
-                Optional.empty(),
+                false,
                 100,
                 JOIN_COMPILER,
-                TYPE_OPERATOR_FACTORY,
                 NOOP);
 
         GroupByHash lowCardinalityGroupByHash = createGroupByHash(
                 TEST_SESSION,
                 ImmutableList.of(BIGINT, BIGINT, BIGINT, BIGINT),
-                new int[] {0, 1, 2, 3},
-                Optional.empty(),
+                false,
                 100,
                 JOIN_COMPILER,
-                TYPE_OPERATOR_FACTORY,
                 NOOP);
         Block sameValueBlock = BlockAssertions.createLongRepeatBlock(0, 100);
         Block block1 = BlockAssertions.createLongDictionaryBlock(0, 100, 1);
@@ -604,16 +544,17 @@ public void testLowCardinalityDictionariesGetGroupIds()
         Page lowCardinalityPage = new Page(block1, block2, block3, block4);
         Page page = new Page(block1, block2, block3, block4, sameValueBlock); // sameValueBlock will prevent low cardinality optimization to fire
 
-        Work<GroupByIdBlock> lowCardinalityWork = lowCardinalityGroupByHash.getGroupIds(lowCardinalityPage);
-        assertThat(lowCardinalityWork).isInstanceOf(GetLowCardinalityDictionaryGroupIdsWork.class);
-        Work<GroupByIdBlock> work = groupByHash.getGroupIds(page);
+        Work<int[]> lowCardinalityWork = lowCardinalityGroupByHash.getGroupIds(lowCardinalityPage);
+        assertThat(lowCardinalityWork).isInstanceOf(FlatGroupByHash.GetLowCardinalityDictionaryGroupIdsWork.class);
+        Work<int[]> work = groupByHash.getGroupIds(page);
 
         lowCardinalityWork.process();
         work.process();
-        GroupByIdBlock lowCardinalityResults = lowCardinalityWork.getResult();
-        GroupByIdBlock results = work.getResult();
 
-        assertThat(lowCardinalityResults.getGroupCount()).isEqualTo(results.getGroupCount());
+        assertThat(lowCardinalityGroupByHash.getGroupCount()).isEqualTo(groupByHash.getGroupCount());
+        int[] lowCardinalityResults = lowCardinalityWork.getResult();
+        int[] results = work.getResult();
+        assertThat(lowCardinalityResults).isEqualTo(results);
     }
 
     @Test
@@ -622,11 +563,9 @@ public void testLowCardinalityDictionariesProperGroupIdOrder()
         GroupByHash groupByHash = createGroupByHash(
                 TEST_SESSION,
                 ImmutableList.of(BIGINT, BIGINT),
-                new int[] {0, 1},
-                Optional.empty(),
+                false,
                 100,
                 JOIN_COMPILER,
-                TYPE_OPERATOR_FACTORY,
                 NOOP);
 
         Block dictionary = new LongArrayBlock(2, Optional.empty(), new long[] {0, 1});
@@ -639,24 +578,24 @@ public void testLowCardinalityDictionariesProperGroupIdOrder()
 
         Page page = new Page(block1, block2);
 
-        Work<GroupByIdBlock> work = groupByHash.getGroupIds(page);
-        assertThat(work).isInstanceOf(GetLowCardinalityDictionaryGroupIdsWork.class);
+        Work<int[]> work = groupByHash.getGroupIds(page);
+        assertThat(work).isInstanceOf(FlatGroupByHash.GetLowCardinalityDictionaryGroupIdsWork.class);
 
         work.process();
-        GroupByIdBlock results = work.getResult();
-        // Records with group id '0' should come before '1' despite being in the end of the block
+        int[] results = work.getResult();
+        // Records with group id '0' should come before '1' despite being at the end of the block
         for (int i = 0; i < 16; i++) {
-            assertThat(results.getGroupId(i)).isEqualTo(0);
+            assertThat(results[i]).isEqualTo(0);
         }
         for (int i = 16; i < 32; i++) {
-            assertThat(results.getGroupId(i)).isEqualTo(1);
+            assertThat(results[i]).isEqualTo(1);
         }
     }
 
     @Test
     public void testProperWorkTypesSelected()
     {
-        Block bigintBlock = BlockAssertions.createLongsBlock(1, 2, 3, 4, 5, 6, 7, 8);
+        Block bigintBlock = createLongsBlock(1, 2, 3, 4, 5, 6, 7, 8);
         Block bigintDictionaryBlock = BlockAssertions.createLongDictionaryBlock(0, 8);
         Block bigintRleBlock = BlockAssertions.createRepeatedValuesBlock(42, 8);
         Block varcharBlock = BlockAssertions.createStringsBlock("1", "2", "3", "4", "5", "6", "7", "8");
@@ -673,35 +612,35 @@ public void testProperWorkTypesSelected()
         Page singleBigintRlePage = new Page(bigintRleBlock);
         assertGroupByHashWork(singleBigintRlePage, ImmutableList.of(BIGINT), BigintGroupByHash.GetRunLengthEncodedGroupIdsWork.class);
         Page singleVarcharPage = new Page(varcharBlock);
-        assertGroupByHashWork(singleVarcharPage, ImmutableList.of(VARCHAR), MultiChannelGroupByHash.GetNonDictionaryGroupIdsWork.class);
+        assertGroupByHashWork(singleVarcharPage, ImmutableList.of(VARCHAR), FlatGroupByHash.GetNonDictionaryGroupIdsWork.class);
         Page singleVarcharDictionaryPage = new Page(varcharDictionaryBlock);
-        assertGroupByHashWork(singleVarcharDictionaryPage, ImmutableList.of(VARCHAR), MultiChannelGroupByHash.GetDictionaryGroupIdsWork.class);
+        assertGroupByHashWork(singleVarcharDictionaryPage, ImmutableList.of(VARCHAR), FlatGroupByHash.GetDictionaryGroupIdsWork.class);
         Page singleVarcharRlePage = new Page(varcharRleBlock);
-        assertGroupByHashWork(singleVarcharRlePage, ImmutableList.of(VARCHAR), MultiChannelGroupByHash.GetRunLengthEncodedGroupIdsWork.class);
+        assertGroupByHashWork(singleVarcharRlePage, ImmutableList.of(VARCHAR), FlatGroupByHash.GetRunLengthEncodedGroupIdsWork.class);
 
         Page lowCardinalityDictionaryPage = new Page(bigintDictionaryBlock, varcharDictionaryBlock);
-        assertGroupByHashWork(lowCardinalityDictionaryPage, ImmutableList.of(BIGINT, VARCHAR), MultiChannelGroupByHash.GetLowCardinalityDictionaryGroupIdsWork.class);
+        assertGroupByHashWork(lowCardinalityDictionaryPage, ImmutableList.of(BIGINT, VARCHAR), FlatGroupByHash.GetLowCardinalityDictionaryGroupIdsWork.class);
         Page highCardinalityDictionaryPage = new Page(bigintDictionaryBlock, bigintBigDictionaryBlock);
-        assertGroupByHashWork(highCardinalityDictionaryPage, ImmutableList.of(BIGINT, VARCHAR), MultiChannelGroupByHash.GetNonDictionaryGroupIdsWork.class);
+        assertGroupByHashWork(highCardinalityDictionaryPage, ImmutableList.of(BIGINT, VARCHAR), FlatGroupByHash.GetNonDictionaryGroupIdsWork.class);
 
         // Cardinality above Short.MAX_VALUE
         Page lowCardinalityHugeDictionaryPage = new Page(bigintSingletonDictionaryBlock, bigintHugeDictionaryBlock);
-        assertGroupByHashWork(lowCardinalityHugeDictionaryPage, ImmutableList.of(BIGINT, BIGINT), MultiChannelGroupByHash.GetNonDictionaryGroupIdsWork.class);
+        assertGroupByHashWork(lowCardinalityHugeDictionaryPage, ImmutableList.of(BIGINT, BIGINT), FlatGroupByHash.GetNonDictionaryGroupIdsWork.class);
     }
 
-    private void assertGroupByHashWork(Page page, List<Type> types, Class<?> clazz)
+    private static void assertGroupByHashWork(Page page, List<Type> types, Class<?> clazz)
     {
-        GroupByHash groupByHash = createGroupByHash(
-                types,
-                IntStream.range(0, types.size()).toArray(),
-                Optional.empty(),
-                100,
-                true,
-                JOIN_COMPILER,
-                TYPE_OPERATOR_FACTORY,
-                NOOP);
-        Work<GroupByIdBlock> work = groupByHash.getGroupIds(page);
+        GroupByHash groupByHash = createGroupByHash(types, false, 100, true, JOIN_COMPILER, NOOP);
+        Work<int[]> work = groupByHash.getGroupIds(page);
         // Compare by name since classes are private
         assertThat(work).isInstanceOf(clazz);
     }
+
+    private static int[] getGroupIds(GroupByHash groupByHash, Page page)
+    {
+        Work<int[]> work = groupByHash.getGroupIds(page);
+        work.process();
+        int[] groupIds = work.getResult();
+        return groupIds;
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestGroupIdOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestGroupIdOperator.java
index ea82f2f21d08..3f1f3da03796 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestGroupIdOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestGroupIdOperator.java
@@ -20,9 +20,10 @@
 import io.trino.spi.Page;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -39,15 +40,16 @@
 import static io.trino.testing.TestingTaskContext.createTaskContext;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestGroupIdOperator
 {
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
     private DriverContext driverContext;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
@@ -58,7 +60,7 @@ public void setUp()
                 .addDriverContext();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         executor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestGroupedTopNRankBuilder.java b/core/trino-main/src/test/java/io/trino/operator/TestGroupedTopNRankBuilder.java
index 0ea000007ecd..f095001e38f8 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestGroupedTopNRankBuilder.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestGroupedTopNRankBuilder.java
@@ -14,7 +14,6 @@
 package io.trino.operator;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.primitives.Ints;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
@@ -24,7 +23,6 @@
 import org.testng.annotations.Test;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.IntStream;
 
@@ -73,6 +71,7 @@ public long hashCode(Page page, int position)
                 },
                 5,
                 false,
+                new int[0],
                 new NoChannelGroupByHash());
         assertFalse(groupedTopNBuilder.buildResult().hasNext());
     }
@@ -90,6 +89,7 @@ public void testSingleGroupTopN(boolean produceRanking)
                 new SimplePageWithPositionEqualsAndHash(types, ImmutableList.of(0), blockTypeOperators),
                 3,
                 produceRanking,
+                new int[0],
                 new NoChannelGroupByHash());
 
         // Expected effect: [0.2 x 1 => rank=1, 0.3 x 2 => rank=2]
@@ -142,13 +142,14 @@ public void testMultiGroupTopN(boolean produceRanking)
         BlockTypeOperators blockTypeOperators = new BlockTypeOperators(typeOperators);
         List<Type> types = ImmutableList.of(BIGINT, DOUBLE);
 
-        GroupByHash groupByHash = createGroupByHash(ImmutableList.of(types.get(0)), ImmutableList.of(0), NOOP, typeOperators, blockTypeOperators);
+        GroupByHash groupByHash = createGroupByHash(types.get(0), NOOP, typeOperators);
         GroupedTopNBuilder groupedTopNBuilder = new GroupedTopNRankBuilder(
                 types,
                 new SimplePageWithPositionComparator(types, ImmutableList.of(1), ImmutableList.of(ASC_NULLS_LAST), typeOperators),
                 new SimplePageWithPositionEqualsAndHash(types, ImmutableList.of(1), blockTypeOperators),
                 3,
                 produceRanking,
+                new int[] {0},
                 groupByHash);
 
         // Expected effect:
@@ -223,13 +224,14 @@ public void testYield()
         input.compact();
 
         AtomicBoolean unblock = new AtomicBoolean();
-        GroupByHash groupByHash = createGroupByHash(ImmutableList.of(types.get(0)), ImmutableList.of(0), unblock::get, typeOperators, blockTypeOperators);
+        GroupByHash groupByHash = createGroupByHash(types.get(0), unblock::get, typeOperators);
         GroupedTopNBuilder groupedTopNBuilder = new GroupedTopNRankBuilder(
                 types,
                 new SimplePageWithPositionComparator(types, ImmutableList.of(1), ImmutableList.of(ASC_NULLS_LAST), typeOperators),
                 new SimplePageWithPositionEqualsAndHash(types, ImmutableList.of(1), blockTypeOperators),
                 5,
                 false,
+                new int[] {0},
                 groupByHash);
 
         Work<?> work = groupedTopNBuilder.processPage(input);
@@ -250,16 +252,14 @@ public void testYield()
         assertPageEquals(types, output.get(0), expected);
     }
 
-    private GroupByHash createGroupByHash(List<Type> partitionTypes, List<Integer> partitionChannels, UpdateMemory updateMemory, TypeOperators typeOperators, BlockTypeOperators blockTypeOperators)
+    private GroupByHash createGroupByHash(Type partitionType, UpdateMemory updateMemory, TypeOperators typeOperators)
     {
         return GroupByHash.createGroupByHash(
-                partitionTypes,
-                Ints.toArray(partitionChannels),
-                Optional.empty(),
+                ImmutableList.of(partitionType),
+                false,
                 1,
                 false,
                 new JoinCompiler(typeOperators),
-                blockTypeOperators,
                 updateMemory);
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestGroupedTopNRowNumberAccumulator.java b/core/trino-main/src/test/java/io/trino/operator/TestGroupedTopNRowNumberAccumulator.java
index a4c3e36c89af..2b65b42f0694 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestGroupedTopNRowNumberAccumulator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestGroupedTopNRowNumberAccumulator.java
@@ -16,7 +16,7 @@
 import io.trino.array.LongBigArray;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import it.unimi.dsi.fastutil.longs.LongArraySet;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestGroupedTopNRowNumberBuilder.java b/core/trino-main/src/test/java/io/trino/operator/TestGroupedTopNRowNumberBuilder.java
index 1c5a08c1c379..8c0cbcce633d 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestGroupedTopNRowNumberBuilder.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestGroupedTopNRowNumberBuilder.java
@@ -14,17 +14,14 @@
 package io.trino.operator;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.primitives.Ints;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 import io.trino.sql.gen.JoinCompiler;
-import io.trino.type.BlockTypeOperators;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static io.trino.RowPagesBuilder.rowPagesBuilder;
@@ -64,6 +61,7 @@ public void testEmptyInput()
                 },
                 5,
                 false,
+                new int[0],
                 new NoChannelGroupByHash());
         assertFalse(groupedTopNBuilder.buildResult().hasNext());
     }
@@ -93,12 +91,13 @@ public void testMultiGroupTopN(boolean produceRowNumbers)
             page.compact();
         }
 
-        GroupByHash groupByHash = createGroupByHash(ImmutableList.of(types.get(0)), ImmutableList.of(0), NOOP);
+        GroupByHash groupByHash = createGroupByHash(ImmutableList.of(types.get(0)), NOOP);
         GroupedTopNBuilder groupedTopNBuilder = new GroupedTopNRowNumberBuilder(
                 types,
                 new SimplePageWithPositionComparator(types, ImmutableList.of(1), ImmutableList.of(ASC_NULLS_LAST), TYPE_OPERATORS_CACHE),
                 2,
                 produceRowNumbers,
+                new int[] {0},
                 groupByHash);
 
         // add 4 rows for the first page and created three heaps with 1, 1, 2 rows respectively
@@ -164,6 +163,7 @@ public void testSingleGroupTopN(boolean produceRowNumbers)
                 new SimplePageWithPositionComparator(types, ImmutableList.of(1), ImmutableList.of(ASC_NULLS_LAST), TYPE_OPERATORS_CACHE),
                 5,
                 produceRowNumbers,
+                new int[0],
                 new NoChannelGroupByHash());
 
         // add 4 rows for the first page and created a single heap with 4 rows
@@ -211,12 +211,13 @@ public void testYield()
         input.compact();
 
         AtomicBoolean unblock = new AtomicBoolean();
-        GroupByHash groupByHash = createGroupByHash(ImmutableList.of(types.get(0)), ImmutableList.of(0), unblock::get);
+        GroupByHash groupByHash = createGroupByHash(ImmutableList.of(types.get(0)), unblock::get);
         GroupedTopNBuilder groupedTopNBuilder = new GroupedTopNRowNumberBuilder(
                 types,
                 new SimplePageWithPositionComparator(types, ImmutableList.of(1), ImmutableList.of(ASC_NULLS_LAST), TYPE_OPERATORS_CACHE),
                 5,
                 false,
+                new int[] {0},
                 groupByHash);
 
         Work<?> work = groupedTopNBuilder.processPage(input);
@@ -237,17 +238,14 @@ public void testYield()
         assertPageEquals(types, output.get(0), expected);
     }
 
-    private static GroupByHash createGroupByHash(List<Type> partitionTypes, List<Integer> partitionChannels, UpdateMemory updateMemory)
+    private static GroupByHash createGroupByHash(List<Type> partitionTypes, UpdateMemory updateMemory)
     {
-        TypeOperators typeOperators = new TypeOperators();
         return GroupByHash.createGroupByHash(
                 partitionTypes,
-                Ints.toArray(partitionChannels),
-                Optional.empty(),
+                false,
                 1,
                 false,
-                new JoinCompiler(typeOperators),
-                new BlockTypeOperators(typeOperators),
+                new JoinCompiler(new TypeOperators()),
                 updateMemory);
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestHashAggregationOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestHashAggregationOperator.java
index cbf047b1ebda..0b48e30ae770 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestHashAggregationOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestHashAggregationOperator.java
@@ -28,6 +28,7 @@
 import io.trino.operator.aggregation.builder.HashAggregationBuilder;
 import io.trino.operator.aggregation.builder.InMemoryHashAggregationBuilder;
 import io.trino.operator.aggregation.partial.PartialAggregationController;
+import io.trino.plugin.base.metrics.LongCount;
 import io.trino.spi.Page;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
@@ -37,10 +38,8 @@
 import io.trino.spiller.SpillerFactory;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.TestingTaskContext;
-import io.trino.type.BlockTypeOperators;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
@@ -52,6 +51,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.OptionalLong;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 
@@ -73,6 +73,7 @@
 import static io.trino.operator.GroupByHashYieldAssertion.GroupByHashYieldResult;
 import static io.trino.operator.GroupByHashYieldAssertion.createPagesWithDistinctHashKeys;
 import static io.trino.operator.GroupByHashYieldAssertion.finishOperatorWithYieldingGroupByHash;
+import static io.trino.operator.HashAggregationOperator.INPUT_ROWS_WITH_PARTIAL_AGGREGATION_DISABLED_METRIC_NAME;
 import static io.trino.operator.OperatorAssertion.assertOperatorEqualsIgnoreOrder;
 import static io.trino.operator.OperatorAssertion.assertPagesEqualIgnoreOrder;
 import static io.trino.operator.OperatorAssertion.dropChannel;
@@ -102,17 +103,16 @@ public class TestHashAggregationOperator
 {
     private static final TestingFunctionResolution FUNCTION_RESOLUTION = new TestingFunctionResolution();
 
-    private static final TestingAggregationFunction LONG_AVERAGE = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("avg"), fromTypes(BIGINT));
-    private static final TestingAggregationFunction LONG_SUM = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("sum"), fromTypes(BIGINT));
-    private static final TestingAggregationFunction COUNT = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("count"), ImmutableList.of());
-    private static final TestingAggregationFunction LONG_MIN = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("min"), fromTypes(BIGINT));
+    private static final TestingAggregationFunction LONG_AVERAGE = FUNCTION_RESOLUTION.getAggregateFunction("avg", fromTypes(BIGINT));
+    private static final TestingAggregationFunction LONG_SUM = FUNCTION_RESOLUTION.getAggregateFunction("sum", fromTypes(BIGINT));
+    private static final TestingAggregationFunction COUNT = FUNCTION_RESOLUTION.getAggregateFunction("count", ImmutableList.of());
+    private static final TestingAggregationFunction LONG_MIN = FUNCTION_RESOLUTION.getAggregateFunction("min", fromTypes(BIGINT));
 
     private static final int MAX_BLOCK_SIZE_IN_BYTES = 64 * 1024;
 
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
     private final TypeOperators typeOperators = new TypeOperators();
-    private final BlockTypeOperators blockTypeOperators = new BlockTypeOperators(typeOperators);
     private final JoinCompiler joinCompiler = new JoinCompiler(typeOperators);
     private DummySpillerFactory spillerFactory;
 
@@ -164,9 +164,9 @@ public void testHashAggregation(boolean hashEnabled, boolean spillEnabled, boole
     {
         // make operator produce multiple pages during finish phase
         int numberOfRows = 40_000;
-        TestingAggregationFunction countVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("count"), fromTypes(VARCHAR));
-        TestingAggregationFunction countBooleanColumn = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("count"), fromTypes(BOOLEAN));
-        TestingAggregationFunction maxVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("max"), fromTypes(VARCHAR));
+        TestingAggregationFunction countVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction("count", fromTypes(VARCHAR));
+        TestingAggregationFunction countBooleanColumn = FUNCTION_RESOLUTION.getAggregateFunction("count", fromTypes(BOOLEAN));
+        TestingAggregationFunction maxVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction("max", fromTypes(VARCHAR));
         List<Integer> hashChannels = Ints.asList(1);
         RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, hashChannels, VARCHAR, VARCHAR, VARCHAR, BIGINT, BOOLEAN);
         List<Page> input = rowPagesBuilder
@@ -198,7 +198,7 @@ public void testHashAggregation(boolean hashEnabled, boolean spillEnabled, boole
                 succinctBytes(memoryLimitForMergeWithMemory),
                 spillerFactory,
                 joinCompiler,
-                blockTypeOperators,
+                typeOperators,
                 Optional.empty());
 
         DriverContext driverContext = createDriverContext(memoryLimitForMerge);
@@ -219,9 +219,9 @@ public void testHashAggregation(boolean hashEnabled, boolean spillEnabled, boole
     @Test(dataProvider = "hashEnabledAndMemoryLimitForMergeValues")
     public void testHashAggregationWithGlobals(boolean hashEnabled, boolean spillEnabled, boolean revokeMemoryWhenAddingPages, long memoryLimitForMerge, long memoryLimitForMergeWithMemory)
     {
-        TestingAggregationFunction countVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("count"), fromTypes(VARCHAR));
-        TestingAggregationFunction countBooleanColumn = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("count"), fromTypes(BOOLEAN));
-        TestingAggregationFunction maxVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("max"), fromTypes(VARCHAR));
+        TestingAggregationFunction countVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction("count", fromTypes(VARCHAR));
+        TestingAggregationFunction countBooleanColumn = FUNCTION_RESOLUTION.getAggregateFunction("count", fromTypes(BOOLEAN));
+        TestingAggregationFunction maxVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction("max", fromTypes(VARCHAR));
 
         Optional<Integer> groupIdChannel = Optional.of(1);
         List<Integer> groupByChannels = Ints.asList(1, 2);
@@ -252,7 +252,7 @@ public void testHashAggregationWithGlobals(boolean hashEnabled, boolean spillEna
                 succinctBytes(memoryLimitForMergeWithMemory),
                 spillerFactory,
                 joinCompiler,
-                blockTypeOperators,
+                typeOperators,
                 Optional.empty());
 
         DriverContext driverContext = createDriverContext(memoryLimitForMerge);
@@ -267,7 +267,7 @@ public void testHashAggregationWithGlobals(boolean hashEnabled, boolean spillEna
     @Test(dataProvider = "hashEnabledAndMemoryLimitForMergeValues")
     public void testHashAggregationMemoryReservation(boolean hashEnabled, boolean spillEnabled, boolean revokeMemoryWhenAddingPages, long memoryLimitForMerge, long memoryLimitForMergeWithMemory)
     {
-        TestingAggregationFunction arrayAggColumn = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("array_agg"), fromTypes(BIGINT));
+        TestingAggregationFunction arrayAggColumn = FUNCTION_RESOLUTION.getAggregateFunction("array_agg", fromTypes(BIGINT));
 
         List<Integer> hashChannels = Ints.asList(1);
         RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, hashChannels, BIGINT, BIGINT);
@@ -299,20 +299,20 @@ public void testHashAggregationMemoryReservation(boolean hashEnabled, boolean sp
                 succinctBytes(memoryLimitForMergeWithMemory),
                 spillerFactory,
                 joinCompiler,
-                blockTypeOperators,
+                typeOperators,
                 Optional.empty());
 
         Operator operator = operatorFactory.createOperator(driverContext);
         toPages(operator, input.iterator(), revokeMemoryWhenAddingPages);
         // TODO (https://github.com/trinodb/trino/issues/10596): it should be 0, since operator is finished
-        assertEquals(getOnlyElement(operator.getOperatorContext().getNestedOperatorStats()).getUserMemoryReservation().toBytes(), spillEnabled && revokeMemoryWhenAddingPages ? 4_781_448 : 0);
+        assertEquals(getOnlyElement(operator.getOperatorContext().getNestedOperatorStats()).getUserMemoryReservation().toBytes(), spillEnabled && revokeMemoryWhenAddingPages ? 4752672 : 0);
         assertEquals(getOnlyElement(operator.getOperatorContext().getNestedOperatorStats()).getRevocableMemoryReservation().toBytes(), 0);
     }
 
     @Test(dataProvider = "hashEnabled", expectedExceptions = ExceededMemoryLimitException.class, expectedExceptionsMessageRegExp = "Query exceeded per-node memory limit of 10B.*")
     public void testMemoryLimit(boolean hashEnabled)
     {
-        TestingAggregationFunction maxVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("max"), fromTypes(VARCHAR));
+        TestingAggregationFunction maxVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction("max", fromTypes(VARCHAR));
 
         List<Integer> hashChannels = Ints.asList(1);
         RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, hashChannels, VARCHAR, BIGINT, VARCHAR, BIGINT);
@@ -342,7 +342,7 @@ public void testMemoryLimit(boolean hashEnabled)
                 100_000,
                 Optional.of(DataSize.of(16, MEGABYTE)),
                 joinCompiler,
-                blockTypeOperators,
+                typeOperators,
                 Optional.empty());
 
         toPages(operatorFactory, driverContext, input);
@@ -383,7 +383,7 @@ public void testHashBuilderResize(boolean hashEnabled, boolean spillEnabled, boo
                 succinctBytes(memoryLimitForMergeWithMemory),
                 spillerFactory,
                 joinCompiler,
-                blockTypeOperators,
+                typeOperators,
                 Optional.empty());
 
         toPages(operatorFactory, driverContext, input, revokeMemoryWhenAddingPages);
@@ -406,7 +406,7 @@ public void testMemoryReservationYield(Type type)
                 1,
                 Optional.of(DataSize.of(16, MEGABYTE)),
                 joinCompiler,
-                blockTypeOperators,
+                typeOperators,
                 Optional.empty());
 
         // get result with yield; pick a relatively small buffer for aggregator's memory usage
@@ -459,7 +459,7 @@ public void testHashBuilderResizeLimit(boolean hashEnabled)
                 100_000,
                 Optional.of(DataSize.of(16, MEGABYTE)),
                 joinCompiler,
-                blockTypeOperators,
+                typeOperators,
                 Optional.empty());
 
         toPages(operatorFactory, driverContext, input);
@@ -494,7 +494,7 @@ public void testMultiSliceAggregationOutput(boolean hashEnabled)
                 100_000,
                 Optional.of(DataSize.of(16, MEGABYTE)),
                 joinCompiler,
-                blockTypeOperators,
+                typeOperators,
                 Optional.empty());
 
         assertEquals(toPages(operatorFactory, createDriverContext(), input).size(), 2);
@@ -526,7 +526,7 @@ public void testMultiplePartialFlushes(boolean hashEnabled)
                 100_000,
                 Optional.of(DataSize.of(1, KILOBYTE)),
                 joinCompiler,
-                blockTypeOperators,
+                typeOperators,
                 Optional.empty());
 
         DriverContext driverContext = createDriverContext(1024);
@@ -612,7 +612,7 @@ public void testMergeWithMemorySpill()
                 succinctBytes(Integer.MAX_VALUE),
                 spillerFactory,
                 joinCompiler,
-                blockTypeOperators,
+                typeOperators,
                 Optional.empty());
 
         DriverContext driverContext = createDriverContext(smallPagesSpillThresholdSize);
@@ -628,7 +628,7 @@ public void testMergeWithMemorySpill()
     @Test
     public void testSpillerFailure()
     {
-        TestingAggregationFunction maxVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("max"), fromTypes(VARCHAR));
+        TestingAggregationFunction maxVarcharColumn = FUNCTION_RESOLUTION.getAggregateFunction("max", fromTypes(VARCHAR));
 
         List<Integer> hashChannels = Ints.asList(1);
         ImmutableList<Type> types = ImmutableList.of(VARCHAR, BIGINT, VARCHAR, BIGINT);
@@ -668,7 +668,7 @@ public void testSpillerFailure()
                 succinctBytes(Integer.MAX_VALUE),
                 new FailingSpillerFactory(),
                 joinCompiler,
-                blockTypeOperators,
+                typeOperators,
                 Optional.empty());
 
         assertThatThrownBy(() -> toPages(operatorFactory, driverContext, input))
@@ -698,7 +698,7 @@ public void testMemoryTracking()
                 100_000,
                 Optional.of(DataSize.of(16, MEGABYTE)),
                 joinCompiler,
-                blockTypeOperators,
+                typeOperators,
                 Optional.empty());
 
         DriverContext driverContext = createDriverContext(1024);
@@ -721,7 +721,8 @@ public void testAdaptivePartialAggregation()
     {
         List<Integer> hashChannels = Ints.asList(0);
 
-        PartialAggregationController partialAggregationController = new PartialAggregationController(5, 0.8);
+        DataSize maxPartialMemory = DataSize.ofBytes(1);
+        PartialAggregationController partialAggregationController = new PartialAggregationController(maxPartialMemory, 0.8);
         HashAggregationOperatorFactory operatorFactory = new HashAggregationOperatorFactory(
                 0,
                 new PlanNodeId("test"),
@@ -733,10 +734,10 @@ public void testAdaptivePartialAggregation()
                 Optional.empty(),
                 Optional.empty(),
                 100,
-                Optional.of(DataSize.ofBytes(1)), // this setting makes operator to flush after each page
+                Optional.of(maxPartialMemory), // this setting makes operator to flush after each page
                 joinCompiler,
-                blockTypeOperators,
-                // use 5 rows threshold to trigger adaptive partial aggregation after each page flush
+                typeOperators,
+                // 1 byte maxPartialMemory causes adaptive partial aggregation to be triggered after each page flush
                 Optional.of(partialAggregationController));
 
         // at the start partial aggregation is enabled
@@ -763,8 +764,39 @@ public void testAdaptivePartialAggregation()
                 .addBlocksPage(createRepeatedValuesBlock(1, 10), createRepeatedValuesBlock(1, 10))
                 .addBlocksPage(createRepeatedValuesBlock(2, 10), createRepeatedValuesBlock(2, 10))
                 .build();
-
         assertOperatorEquals(operatorFactory, operator2Input, operator2Expected);
+
+        // partial aggregation should be enabled again after enough data is processed
+        for (int i = 1; i <= 3; ++i) {
+            List<Page> operatorInput = rowPagesBuilder(false, hashChannels, BIGINT)
+                    .addBlocksPage(createLongsBlock(0, 1, 2, 3, 4, 5, 6, 7, 8))
+                    .build();
+            List<Page> operatorExpected = rowPagesBuilder(BIGINT, BIGINT)
+                    .addBlocksPage(createLongsBlock(0, 1, 2, 3, 4, 5, 6, 7, 8), createLongsBlock(0, 1, 2, 3, 4, 5, 6, 7, 8))
+                    .build();
+            assertOperatorEquals(operatorFactory, operatorInput, operatorExpected);
+            if (i <= 2) {
+                assertTrue(partialAggregationController.isPartialAggregationDisabled());
+            }
+            else {
+                assertFalse(partialAggregationController.isPartialAggregationDisabled());
+            }
+        }
+
+        // partial aggregation should still be enabled even after some late flush comes from disabled PA
+        partialAggregationController.onFlush(1_000_000, 1_000_000, OptionalLong.empty());
+
+        // partial aggregation should keep being enabled after good reduction has been observed
+        List<Page> operator3Input = rowPagesBuilder(false, hashChannels, BIGINT)
+                .addBlocksPage(createRepeatedValuesBlock(1, 100))
+                .addBlocksPage(createRepeatedValuesBlock(2, 100))
+                .build();
+        List<Page> operator3Expected = rowPagesBuilder(BIGINT, BIGINT)
+                .addBlocksPage(createRepeatedValuesBlock(1, 1), createRepeatedValuesBlock(1, 1))
+                .addBlocksPage(createRepeatedValuesBlock(2, 1), createRepeatedValuesBlock(2, 1))
+                .build();
+        assertOperatorEquals(operatorFactory, operator3Input, operator3Expected);
+        assertFalse(partialAggregationController.isPartialAggregationDisabled());
     }
 
     @Test
@@ -772,7 +804,7 @@ public void testAdaptivePartialAggregationTriggeredOnlyOnFlush()
     {
         List<Integer> hashChannels = Ints.asList(0);
 
-        PartialAggregationController partialAggregationController = new PartialAggregationController(5, 0.8);
+        PartialAggregationController partialAggregationController = new PartialAggregationController(DataSize.ofBytes(1), 0.8);
         HashAggregationOperatorFactory operatorFactory = new HashAggregationOperatorFactory(
                 0,
                 new PlanNodeId("test"),
@@ -786,10 +818,11 @@ public void testAdaptivePartialAggregationTriggeredOnlyOnFlush()
                 10,
                 Optional.of(DataSize.of(16, MEGABYTE)), // this setting makes operator to flush only after all pages
                 joinCompiler,
-                blockTypeOperators,
-                // use 5 rows threshold to trigger adaptive partial aggregation after each page flush
+                typeOperators,
+                // 1 byte maxPartialMemory causes adaptive partial aggregation to be triggered after each page flush
                 Optional.of(partialAggregationController));
 
+        DriverContext driverContext = createDriverContext(1024);
         List<Page> operator1Input = rowPagesBuilder(false, hashChannels, BIGINT)
                 .addSequencePage(10, 0) // first page are unique values, so it would trigger adaptation, but it won't because flush is not called
                 .addBlocksPage(createRepeatedValuesBlock(1, 2)) // second page will be hashed to existing value 1
@@ -798,10 +831,11 @@ public void testAdaptivePartialAggregationTriggeredOnlyOnFlush()
         List<Page> operator1Expected = rowPagesBuilder(BIGINT, BIGINT)
                 .addSequencePage(10, 0, 0) // we are expecting second page to be squashed with the first
                 .build();
-        assertOperatorEquals(operatorFactory, operator1Input, operator1Expected);
+        assertOperatorEquals(driverContext, operatorFactory, operator1Input, operator1Expected);
 
         // the first operator flush disables partial aggregation
         assertTrue(partialAggregationController.isPartialAggregationDisabled());
+        assertInputRowsWithPartialAggregationDisabled(driverContext, 0);
 
         // second operator using the same factory, reuses PartialAggregationControl, so it will only produce raw pages (partial aggregation is disabled at this point)
         List<Page> operator2Input = rowPagesBuilder(false, hashChannels, BIGINT)
@@ -813,12 +847,29 @@ public void testAdaptivePartialAggregationTriggeredOnlyOnFlush()
                 .addBlocksPage(createRepeatedValuesBlock(2, 10), createRepeatedValuesBlock(2, 10))
                 .build();
 
-        assertOperatorEquals(operatorFactory, operator2Input, operator2Expected);
+        driverContext = createDriverContext(1024);
+        assertOperatorEquals(driverContext, operatorFactory, operator2Input, operator2Expected);
+        assertInputRowsWithPartialAggregationDisabled(driverContext, 20);
+    }
+
+    private void assertInputRowsWithPartialAggregationDisabled(DriverContext context, long expectedRowCount)
+    {
+        LongCount metric = ((LongCount) context.getDriverStats().getOperatorStats().get(0).getMetrics().getMetrics().get(INPUT_ROWS_WITH_PARTIAL_AGGREGATION_DISABLED_METRIC_NAME));
+        if (metric == null) {
+            assertEquals(0, expectedRowCount);
+        }
+        else {
+            assertEquals(metric.getTotal(), expectedRowCount);
+        }
     }
 
     private void assertOperatorEquals(OperatorFactory operatorFactory, List<Page> input, List<Page> expectedPages)
     {
-        DriverContext driverContext = createDriverContext(1024);
+        assertOperatorEquals(createDriverContext(1024), operatorFactory, input, expectedPages);
+    }
+
+    private void assertOperatorEquals(DriverContext driverContext, OperatorFactory operatorFactory, List<Page> input, List<Page> expectedPages)
+    {
         MaterializedResult expected = resultBuilder(driverContext.getSession(), BIGINT, BIGINT)
                 .pages(expectedPages)
                 .build();
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestHashSemiJoinOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestHashSemiJoinOperator.java
index 92697c462537..c43a6c412aa9 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestHashSemiJoinOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestHashSemiJoinOperator.java
@@ -25,7 +25,6 @@
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
-import io.trino.type.BlockTypeOperators;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
@@ -38,11 +37,8 @@
 
 import static com.google.common.collect.Iterables.concat;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
-import static io.airlift.testing.Assertions.assertGreaterThanOrEqual;
 import static io.trino.RowPagesBuilder.rowPagesBuilder;
 import static io.trino.SessionTestUtils.TEST_SESSION;
-import static io.trino.operator.GroupByHashYieldAssertion.createPagesWithDistinctHashKeys;
-import static io.trino.operator.GroupByHashYieldAssertion.finishOperatorWithYieldingGroupByHash;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.VarcharType.VARCHAR;
@@ -50,7 +46,6 @@
 import static io.trino.testing.TestingTaskContext.createTaskContext;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
-import static org.testng.Assert.assertEquals;
 
 @Test(singleThreaded = true)
 public class TestHashSemiJoinOperator
@@ -59,7 +54,6 @@ public class TestHashSemiJoinOperator
     private ScheduledExecutorService scheduledExecutor;
     private TaskContext taskContext;
     private TypeOperators typeOperators;
-    private BlockTypeOperators blockTypeOperators;
 
     @BeforeMethod
     public void setUp()
@@ -68,7 +62,6 @@ public void setUp()
         scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
         taskContext = createTaskContext(executor, scheduledExecutor, TEST_SESSION);
         typeOperators = new TypeOperators();
-        blockTypeOperators = new BlockTypeOperators(typeOperators);
     }
 
     @AfterMethod(alwaysRun = true)
@@ -115,7 +108,7 @@ public void testSemiJoin(boolean hashEnabled)
                 rowPagesBuilder.getHashChannel(),
                 10,
                 new JoinCompiler(typeOperators),
-                blockTypeOperators);
+                typeOperators);
         Operator setBuilderOperator = setBuilderOperatorFactory.createOperator(driverContext);
 
         Driver driver = Driver.createDriver(driverContext, buildOperator, setBuilderOperator);
@@ -180,7 +173,7 @@ public void testSemiJoinOnVarcharType(boolean hashEnabled)
                 rowPagesBuilder.getHashChannel(),
                 10,
                 new JoinCompiler(typeOperators),
-                blockTypeOperators);
+                typeOperators);
         Operator setBuilderOperator = setBuilderOperatorFactory.createOperator(driverContext);
 
         Driver driver = Driver.createDriver(driverContext, buildOperator, setBuilderOperator);
@@ -220,36 +213,6 @@ public void testSemiJoinOnVarcharType(boolean hashEnabled)
         OperatorAssertion.assertOperatorEquals(joinOperatorFactory, driverContext, probeInput, expected, hashEnabled, ImmutableList.of(probeTypes.size()));
     }
 
-    @Test(dataProvider = "dataType")
-    public void testSemiJoinMemoryReservationYield(Type type)
-    {
-        // We only need the first column so we are creating the pages with hashEnabled false
-        List<Page> input = createPagesWithDistinctHashKeys(type, 5_000, 500);
-
-        // create the operator
-        SetBuilderOperatorFactory setBuilderOperatorFactory = new SetBuilderOperatorFactory(
-                1,
-                new PlanNodeId("test"),
-                type,
-                0,
-                Optional.of(1),
-                10,
-                new JoinCompiler(typeOperators),
-                blockTypeOperators);
-
-        // run test
-        GroupByHashYieldAssertion.GroupByHashYieldResult result = finishOperatorWithYieldingGroupByHash(
-                input,
-                type,
-                setBuilderOperatorFactory,
-                operator -> ((SetBuilderOperator) operator).getCapacity(),
-                450_000);
-
-        assertGreaterThanOrEqual(result.getYieldCount(), 4);
-        assertGreaterThanOrEqual(result.getMaxReservedBytes(), 20L << 19);
-        assertEquals(result.getOutput().stream().mapToInt(Page::getPositionCount).sum(), 0);
-    }
-
     @Test(dataProvider = "hashEnabledValues")
     public void testBuildSideNulls(boolean hashEnabled)
     {
@@ -275,7 +238,7 @@ public void testBuildSideNulls(boolean hashEnabled)
                 rowPagesBuilder.getHashChannel(),
                 10,
                 new JoinCompiler(typeOperators),
-                blockTypeOperators);
+                typeOperators);
         Operator setBuilderOperator = setBuilderOperatorFactory.createOperator(driverContext);
 
         Driver driver = Driver.createDriver(driverContext, buildOperator, setBuilderOperator);
@@ -331,7 +294,7 @@ public void testProbeSideNulls(boolean hashEnabled)
                 rowPagesBuilder.getHashChannel(),
                 10,
                 new JoinCompiler(typeOperators),
-                blockTypeOperators);
+                typeOperators);
         Operator setBuilderOperator = setBuilderOperatorFactory.createOperator(driverContext);
 
         Driver driver = Driver.createDriver(driverContext, buildOperator, setBuilderOperator);
@@ -391,7 +354,7 @@ public void testProbeAndBuildNulls(boolean hashEnabled)
                 rowPagesBuilder.getHashChannel(),
                 10,
                 new JoinCompiler(typeOperators),
-                blockTypeOperators);
+                typeOperators);
         Operator setBuilderOperator = setBuilderOperatorFactory.createOperator(driverContext);
 
         Driver driver = Driver.createDriver(driverContext, buildOperator, setBuilderOperator);
@@ -449,7 +412,7 @@ public void testMemoryLimit(boolean hashEnabled)
                 rowPagesBuilder.getHashChannel(),
                 10,
                 new JoinCompiler(typeOperators),
-                blockTypeOperators);
+                typeOperators);
         Operator setBuilderOperator = setBuilderOperatorFactory.createOperator(driverContext);
 
         Driver driver = Driver.createDriver(driverContext, buildOperator, setBuilderOperator);
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestHttpPageBufferClient.java b/core/trino-main/src/test/java/io/trino/operator/TestHttpPageBufferClient.java
index 47ab79c4a4c0..77522edfc4c0 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestHttpPageBufferClient.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestHttpPageBufferClient.java
@@ -35,9 +35,10 @@
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.RunLengthEncodedBlock;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -69,9 +70,11 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.util.Failures.WORKER_NODE_ERROR;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestHttpPageBufferClient
 {
     private ScheduledExecutorService scheduler;
@@ -79,14 +82,14 @@ public class TestHttpPageBufferClient
 
     private static final TaskId TASK_ID = new TaskId(new StageId("query", 0), 0, 0);
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         scheduler = newScheduledThreadPool(4, daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
         pageBufferClientCallbackExecutor = Executors.newSingleThreadExecutor();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (scheduler != null) {
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestIdRegistry.java b/core/trino-main/src/test/java/io/trino/operator/TestIdRegistry.java
index 35cd584bed7f..3ee9d4ec8b20 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestIdRegistry.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestIdRegistry.java
@@ -14,7 +14,7 @@
 package io.trino.operator;
 
 import it.unimi.dsi.fastutil.ints.IntArrayList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 
@@ -24,9 +24,9 @@ public class TestIdRegistry
     public void testAllocateDeallocate()
     {
         IdRegistry<String> registry = new IdRegistry<>();
-        int id1 = registry.allocateId(Integer::toString);
+        int id1 = Integer.parseInt(registry.allocateId(Integer::toString));
         assertEquals(registry.get(id1), Integer.toString(id1));
-        int id2 = registry.allocateId(Integer::toString);
+        int id2 = Integer.parseInt(registry.allocateId(Integer::toString));
         assertEquals(registry.get(id1), Integer.toString(id1));
         assertEquals(registry.get(id2), Integer.toString(id2));
 
@@ -42,7 +42,7 @@ public void testBulkAllocate()
         IntArrayList ids = new IntArrayList();
         // Bulk allocate
         for (int i = 0; i < 100; i++) {
-            ids.add(registry.allocateId(Integer::toString));
+            ids.add(Integer.parseInt(registry.allocateId(Integer::toString)));
         }
         // Get values
         for (int i = 0; i < 100; i++) {
@@ -58,12 +58,12 @@ public void testBulkAllocate()
     public void testIdRecycling()
     {
         IdRegistry<String> registry = new IdRegistry<>();
-        int id1 = registry.allocateId(Integer::toString);
+        int id1 = Integer.parseInt(registry.allocateId(Integer::toString));
         registry.deallocate(id1);
-        int id2 = registry.allocateId(Integer::toString);
+        int id2 = Integer.parseInt(registry.allocateId(Integer::toString));
         assertEquals(id1, id2);
 
-        int id3 = registry.allocateId(Integer::toString);
+        int id3 = Integer.parseInt(registry.allocateId(Integer::toString));
         registry.allocateId(Integer::toString);
         registry.deallocate(id3);
         registry.allocateId(Integer::toString);
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestIncrementalLoadFactorHashArraySizeSupplier.java b/core/trino-main/src/test/java/io/trino/operator/TestIncrementalLoadFactorHashArraySizeSupplier.java
index 186c573a213f..f3b5ff392bdd 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestIncrementalLoadFactorHashArraySizeSupplier.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestIncrementalLoadFactorHashArraySizeSupplier.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.testing.Assertions.assertGreaterThanOrEqual;
 import static io.trino.operator.IncrementalLoadFactorHashArraySizeSupplier.THRESHOLD_25;
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestLimitOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestLimitOperator.java
index c69203efc95c..693b3e248a29 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestLimitOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestLimitOperator.java
@@ -18,9 +18,10 @@
 import io.trino.spi.Page;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -35,15 +36,16 @@
 import static io.trino.testing.TestingTaskContext.createTaskContext;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestLimitOperator
 {
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
     private DriverContext driverContext;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
@@ -53,7 +55,7 @@ public void setUp()
                 .addDriverContext();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         executor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestMarkDistinctOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestMarkDistinctOperator.java
index a5807719e758..87c085c6a603 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestMarkDistinctOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestMarkDistinctOperator.java
@@ -25,7 +25,6 @@
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
-import io.trino.type.BlockTypeOperators;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
@@ -62,7 +61,6 @@ public class TestMarkDistinctOperator
     private ScheduledExecutorService scheduledExecutor;
     private DriverContext driverContext;
     private final TypeOperators typeOperators = new TypeOperators();
-    private final BlockTypeOperators blockTypeOperators = new BlockTypeOperators(typeOperators);
     private final JoinCompiler joinCompiler = new JoinCompiler(typeOperators);
 
     @BeforeMethod
@@ -103,7 +101,13 @@ public void testMarkDistinct(boolean hashEnabled)
                 .addSequencePage(100, 0)
                 .build();
 
-        OperatorFactory operatorFactory = new MarkDistinctOperatorFactory(0, new PlanNodeId("test"), rowPagesBuilder.getTypes(), ImmutableList.of(0), rowPagesBuilder.getHashChannel(), joinCompiler, blockTypeOperators);
+        OperatorFactory operatorFactory = new MarkDistinctOperatorFactory(
+                0,
+                new PlanNodeId("test"),
+                rowPagesBuilder.getTypes(),
+                ImmutableList.of(0),
+                rowPagesBuilder.getHashChannel(),
+                joinCompiler);
 
         MaterializedResult.Builder expected = resultBuilder(driverContext.getSession(), BIGINT, BOOLEAN);
         for (long i = 0; i < 100; i++) {
@@ -128,7 +132,13 @@ public void testRleDistinctMask(boolean hashEnabled)
         Page secondInput = inputs.get(1);
         Page singleDistinctPage = inputs.get(2);
         Page singleNotDistinctPage = inputs.get(3);
-        OperatorFactory operatorFactory = new MarkDistinctOperatorFactory(0, new PlanNodeId("test"), rowPagesBuilder.getTypes(), ImmutableList.of(0), rowPagesBuilder.getHashChannel(), joinCompiler, blockTypeOperators);
+        OperatorFactory operatorFactory = new MarkDistinctOperatorFactory(
+                0,
+                new PlanNodeId("test"),
+                rowPagesBuilder.getTypes(),
+                ImmutableList.of(0),
+                rowPagesBuilder.getHashChannel(),
+                joinCompiler);
 
         int maskChannel = firstInput.getChannelCount(); // mask channel is appended to the input
         try (Operator operator = operatorFactory.createOperator(driverContext)) {
@@ -173,7 +183,7 @@ public void testMemoryReservationYield(Type type)
     {
         List<Page> input = createPagesWithDistinctHashKeys(type, 6_000, 600);
 
-        OperatorFactory operatorFactory = new MarkDistinctOperatorFactory(0, new PlanNodeId("test"), ImmutableList.of(type), ImmutableList.of(0), Optional.of(1), joinCompiler, blockTypeOperators);
+        OperatorFactory operatorFactory = new MarkDistinctOperatorFactory(0, new PlanNodeId("test"), ImmutableList.of(type), ImmutableList.of(0), Optional.of(1), joinCompiler);
 
         // get result with yield; pick a relatively small buffer for partitionRowCount's memory usage
         GroupByHashYieldAssertion.GroupByHashYieldResult result = finishOperatorWithYieldingGroupByHash(input, type, operatorFactory, operator -> ((MarkDistinctOperator) operator).getCapacity(), 450_000);
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestMergeHashSort.java b/core/trino-main/src/test/java/io/trino/operator/TestMergeHashSort.java
index e017fb9c8ac2..111174d4f4a0 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestMergeHashSort.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestMergeHashSort.java
@@ -16,8 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.Page;
 import io.trino.spi.type.TypeOperators;
-import io.trino.type.BlockTypeOperators;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.RowPagesBuilder.rowPagesBuilder;
@@ -29,14 +28,14 @@
 
 public class TestMergeHashSort
 {
-    private final BlockTypeOperators blockTypeOperators = new BlockTypeOperators(new TypeOperators());
+    private final TypeOperators typeOperators = new TypeOperators();
 
     @Test
     public void testBinaryMergeIteratorOverEmptyPage()
     {
         Page emptyPage = new Page(0, BIGINT.createFixedSizeBlockBuilder(0).build());
 
-        WorkProcessor<Page> mergedPage = new MergeHashSort(newSimpleAggregatedMemoryContext(), blockTypeOperators).merge(
+        WorkProcessor<Page> mergedPage = new MergeHashSort(newSimpleAggregatedMemoryContext(), typeOperators).merge(
                 ImmutableList.of(BIGINT),
                 ImmutableList.of(BIGINT),
                 ImmutableList.of(ImmutableList.of(emptyPage).iterator()).stream()
@@ -53,7 +52,7 @@ public void testBinaryMergeIteratorOverEmptyPageAndNonEmptyPage()
         Page emptyPage = new Page(0, BIGINT.createFixedSizeBlockBuilder(0).build());
         Page page = rowPagesBuilder(BIGINT).row(42).build().get(0);
 
-        WorkProcessor<Page> mergedPage = new MergeHashSort(newSimpleAggregatedMemoryContext(), blockTypeOperators).merge(
+        WorkProcessor<Page> mergedPage = new MergeHashSort(newSimpleAggregatedMemoryContext(), typeOperators).merge(
                 ImmutableList.of(BIGINT),
                 ImmutableList.of(BIGINT),
                 ImmutableList.of(ImmutableList.of(emptyPage, page).iterator()).stream()
@@ -76,7 +75,7 @@ public void testBinaryMergeIteratorOverPageWith()
         Page emptyPage = new Page(0, BIGINT.createFixedSizeBlockBuilder(0).build());
         Page page = rowPagesBuilder(BIGINT).row(42).build().get(0);
 
-        WorkProcessor<Page> mergedPage = new MergeHashSort(newSimpleAggregatedMemoryContext(), blockTypeOperators).merge(
+        WorkProcessor<Page> mergedPage = new MergeHashSort(newSimpleAggregatedMemoryContext(), typeOperators).merge(
                 ImmutableList.of(BIGINT),
                 ImmutableList.of(BIGINT),
                 ImmutableList.of(ImmutableList.of(emptyPage, page).iterator()).stream()
@@ -103,7 +102,7 @@ public void testBinaryMergeIteratorOverPageWithDifferentHashes()
                 .row(60)
                 .build().get(0);
 
-        WorkProcessor<Page> mergedPages = new MergeHashSort(newSimpleAggregatedMemoryContext(), blockTypeOperators).merge(
+        WorkProcessor<Page> mergedPages = new MergeHashSort(newSimpleAggregatedMemoryContext(), typeOperators).merge(
                 ImmutableList.of(BIGINT),
                 ImmutableList.of(BIGINT),
                 ImmutableList.of(ImmutableList.of(page).iterator()).stream()
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestMergeOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestMergeOperator.java
index 40319a40a923..c92ca8d5bcd5 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestMergeOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestMergeOperator.java
@@ -35,9 +35,10 @@
 import io.trino.split.RemoteSplit;
 import io.trino.sql.gen.OrderingCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -49,7 +50,7 @@
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static io.trino.RowPagesBuilder.rowPagesBuilder;
 import static io.trino.SessionTestUtils.TEST_SESSION;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.operator.OperatorAssertion.assertOperatorIsBlocked;
 import static io.trino.operator.OperatorAssertion.assertOperatorIsUnblocked;
 import static io.trino.operator.PageAssertions.assertPageEquals;
@@ -59,12 +60,13 @@
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.testing.TestingTaskContext.createTaskContext;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestMergeOperator
 {
     private static final TaskId TASK_1_ID = new TaskId(new StageId("query", 0), 0, 0);
@@ -81,7 +83,7 @@ public class TestMergeOperator
 
     private LoadingCache<TaskId, TestingTaskBuffer> taskBuffers;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         executor = newSingleThreadScheduledExecutor(daemonThreadsNamed("test-merge-operator-%s"));
@@ -99,7 +101,7 @@ public void setUp()
         orderingCompiler = new OrderingCompiler(new TypeOperators());
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         serdeFactory = null;
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestOperationTimer.java b/core/trino-main/src/test/java/io/trino/operator/TestOperationTimer.java
index bd86945a96d6..76f19a01737b 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestOperationTimer.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestOperationTimer.java
@@ -13,15 +13,15 @@
  */
 package io.trino.operator;
 
+import io.airlift.slice.Slices;
 import io.airlift.slice.XxHash64;
 import io.trino.operator.OperationTimer.OperationTiming;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Random;
 import java.util.function.Consumer;
 
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
-import static io.airlift.slice.Slices.wrappedBuffer;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -104,9 +104,7 @@ public void testInvalidConstructorArguments()
 
     private static void doSomething()
     {
-        byte[] data = new byte[10_000];
-        new Random(blackHole).nextBytes(data);
-        blackHole = XxHash64.hash(wrappedBuffer(data));
+        blackHole = XxHash64.hash(Slices.random(10_000, new Random(blackHole)));
         sleepUninterruptibly(50, MILLISECONDS);
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestOperatorAssertion.java b/core/trino-main/src/test/java/io/trino/operator/TestOperatorAssertion.java
index 3f63cb1283af..70e960d745db 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestOperatorAssertion.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestOperatorAssertion.java
@@ -17,9 +17,10 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import io.airlift.units.Duration;
 import io.trino.spi.Page;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
@@ -29,18 +30,20 @@
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestOperatorAssertion
 {
     private ScheduledExecutorService executor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         executor = newSingleThreadScheduledExecutor();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestOperatorMemoryRevocation.java b/core/trino-main/src/test/java/io/trino/operator/TestOperatorMemoryRevocation.java
index 231e46027c33..d24a887dc471 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestOperatorMemoryRevocation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestOperatorMemoryRevocation.java
@@ -14,30 +14,33 @@
 package io.trino.operator;
 
 import io.trino.memory.context.LocalMemoryContext;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestOperatorMemoryRevocation
 {
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         scheduledExecutor = newSingleThreadScheduledExecutor();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         scheduledExecutor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestOperatorStats.java b/core/trino-main/src/test/java/io/trino/operator/TestOperatorStats.java
index 21171a47ce71..3fa52cfe4de9 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestOperatorStats.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestOperatorStats.java
@@ -22,7 +22,7 @@
 import io.trino.plugin.base.metrics.LongCount;
 import io.trino.spi.metrics.Metrics;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestPageUtils.java b/core/trino-main/src/test/java/io/trino/operator/TestPageUtils.java
index 698b7aa0c18c..42f41023daae 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestPageUtils.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestPageUtils.java
@@ -14,11 +14,12 @@
 package io.trino.operator;
 
 import io.trino.spi.Page;
+import io.trino.spi.block.ArrayBlock;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.DictionaryBlock;
 import io.trino.spi.block.LazyBlock;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
 
 import static io.trino.block.BlockAssertions.createIntsBlock;
@@ -50,17 +51,20 @@ public void testRecordMaterializedBytes()
     public void testNestedBlocks()
     {
         Block elements = lazyWrapper(createIntsBlock(1, 2, 3));
-        Block dictBlock = DictionaryBlock.create(2, elements, new int[] {0, 0});
-        Page page = new Page(2, dictBlock);
+        Block arrayBlock = ArrayBlock.fromElementBlock(2, Optional.empty(), new int[] {0, 1, 3}, elements);
+        long initialArraySize = arrayBlock.getSizeInBytes();
+        Page page = new Page(2, arrayBlock);
 
         AtomicLong sizeInBytes = new AtomicLong();
         recordMaterializedBytes(page, sizeInBytes::getAndAdd);
 
-        assertEquals(sizeInBytes.get(), dictBlock.getSizeInBytes());
+        assertEquals(arrayBlock.getSizeInBytes(), initialArraySize);
+        assertEquals(sizeInBytes.get(), arrayBlock.getSizeInBytes());
 
         // dictionary block caches size in bytes
-        dictBlock.getLoadedBlock();
-        assertEquals(sizeInBytes.get(), dictBlock.getSizeInBytes() + elements.getSizeInBytes());
+        arrayBlock.getLoadedBlock();
+        assertEquals(sizeInBytes.get(), arrayBlock.getSizeInBytes());
+        assertEquals(sizeInBytes.get(), initialArraySize + elements.getSizeInBytes());
     }
 
     private static LazyBlock lazyWrapper(Block block)
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestPagesIndex.java b/core/trino-main/src/test/java/io/trino/operator/TestPagesIndex.java
index fa380808228b..94c5c8173889 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestPagesIndex.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestPagesIndex.java
@@ -20,9 +20,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.JoinFilterFunctionCompiler;
-import io.trino.testing.DataProviders;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Iterator;
@@ -123,58 +121,54 @@ public void testGetPagesWithNoColumns()
         assertFalse(pages.hasNext());
     }
 
-    @DataProvider
-    public static Object[][] testGetEstimatedLookupSourceSizeInBytesProvider()
-    {
-        return DataProviders.cartesianProduct(
-                new Object[][] {{Optional.empty()}, {Optional.of(0)}, {Optional.of(1)}},
-                new Object[][] {{0}, {1}});
-    }
-
-    @Test(dataProvider = "testGetEstimatedLookupSourceSizeInBytesProvider")
-    public void testGetEstimatedLookupSourceSizeInBytes(Optional<Integer> sortChannel, int joinChannel)
+    @Test
+    public void testGetEstimatedLookupSourceSizeInBytes()
     {
-        List<Type> types = ImmutableList.of(BIGINT, VARCHAR);
-        PagesIndex pagesIndex = newPagesIndex(types, 50, false);
-        int pageCount = 100;
-        for (int i = 0; i < pageCount; i++) {
-            pagesIndex.addPage(somePage(types));
-        }
-        long pageIndexSize = pagesIndex.getEstimatedSize().toBytes();
-        long estimatedMemoryRequiredToCreateLookupSource = pagesIndex.getEstimatedMemoryRequiredToCreateLookupSource(
-                defaultHashArraySizeSupplier(),
-                sortChannel,
-                ImmutableList.of(joinChannel));
-        assertThat(estimatedMemoryRequiredToCreateLookupSource).isGreaterThan(pageIndexSize);
-        long estimatedLookupSourceSize = estimatedMemoryRequiredToCreateLookupSource -
-                // subtract size of page positions
-                sizeOfIntArray(pageCount);
-        long estimatedAdditionalSize = estimatedMemoryRequiredToCreateLookupSource - pageIndexSize;
-
-        JoinFilterFunctionCompiler.JoinFilterFunctionFactory filterFunctionFactory = (session, addresses, pages) -> (JoinFilterFunction) (leftPosition, rightPosition, rightPage) -> false;
-        LookupSource lookupSource = pagesIndex.createLookupSourceSupplier(
-                TEST_SESSION,
-                ImmutableList.of(joinChannel),
-                OptionalInt.empty(),
-                sortChannel.map(channel -> filterFunctionFactory),
-                sortChannel,
-                ImmutableList.of(filterFunctionFactory),
-                Optional.of(ImmutableList.of(0, 1)),
-                defaultHashArraySizeSupplier()).get();
-        long actualLookupSourceSize = lookupSource.getInMemorySizeInBytes();
-        assertThat(estimatedLookupSourceSize).isGreaterThanOrEqualTo(actualLookupSourceSize);
-        assertThat(estimatedLookupSourceSize).isCloseTo(actualLookupSourceSize, withPercentage(1));
-
-        long addressesSize = sizeOf(pagesIndex.getValueAddresses().elements());
-        long channelsArraySize = sizeOf(pagesIndex.getChannel(0).elements()) * types.size();
-        long blocksSize = 0;
-        for (int channel = 0; channel < 2; channel++) {
-            blocksSize += pagesIndex.getChannel(channel).stream()
-                    .mapToLong(Block::getRetainedSizeInBytes)
-                    .sum();
+        for (Optional<Integer> sortChannel : Arrays.asList(Optional.<Integer>empty(), Optional.of(0), Optional.of(1))) {
+            for (int joinChannel : Arrays.asList(0, 1)) {
+                List<Type> types = ImmutableList.of(BIGINT, VARCHAR);
+                PagesIndex pagesIndex = newPagesIndex(types, 50, false);
+                int pageCount = 100;
+                for (int i = 0; i < pageCount; i++) {
+                    pagesIndex.addPage(somePage(types));
+                }
+                long pageIndexSize = pagesIndex.getEstimatedSize().toBytes();
+                long estimatedMemoryRequiredToCreateLookupSource = pagesIndex.getEstimatedMemoryRequiredToCreateLookupSource(
+                        defaultHashArraySizeSupplier(),
+                        sortChannel,
+                        ImmutableList.of(joinChannel));
+                assertThat(estimatedMemoryRequiredToCreateLookupSource).isGreaterThan(pageIndexSize);
+                long estimatedLookupSourceSize = estimatedMemoryRequiredToCreateLookupSource -
+                        // subtract size of page positions
+                        sizeOfIntArray(pageCount);
+                long estimatedAdditionalSize = estimatedMemoryRequiredToCreateLookupSource - pageIndexSize;
+
+                JoinFilterFunctionCompiler.JoinFilterFunctionFactory filterFunctionFactory = (session, addresses, pages) -> (JoinFilterFunction) (leftPosition, rightPosition, rightPage) -> false;
+                LookupSource lookupSource = pagesIndex.createLookupSourceSupplier(
+                        TEST_SESSION,
+                        ImmutableList.of(joinChannel),
+                        OptionalInt.empty(),
+                        sortChannel.map(channel -> filterFunctionFactory),
+                        sortChannel,
+                        ImmutableList.of(filterFunctionFactory),
+                        Optional.of(ImmutableList.of(0, 1)),
+                        defaultHashArraySizeSupplier()).get();
+                long actualLookupSourceSize = lookupSource.getInMemorySizeInBytes();
+                assertThat(estimatedLookupSourceSize).isGreaterThanOrEqualTo(actualLookupSourceSize);
+                assertThat(estimatedLookupSourceSize).isCloseTo(actualLookupSourceSize, withPercentage(1));
+
+                long addressesSize = sizeOf(pagesIndex.getValueAddresses().elements());
+                long channelsArraySize = sizeOf(pagesIndex.getChannel(0).elements()) * types.size();
+                long blocksSize = 0;
+                for (int channel = 0; channel < 2; channel++) {
+                    blocksSize += pagesIndex.getChannel(channel).stream()
+                            .mapToLong(Block::getRetainedSizeInBytes)
+                            .sum();
+                }
+                long actualAdditionalSize = actualLookupSourceSize - (addressesSize + channelsArraySize + blocksSize);
+                assertThat(estimatedAdditionalSize).isCloseTo(actualAdditionalSize, withPercentage(1));
+            }
         }
-        long actualAdditionalSize = actualLookupSourceSize - (addressesSize + channelsArraySize + blocksSize);
-        assertThat(estimatedAdditionalSize).isCloseTo(actualAdditionalSize, withPercentage(1));
     }
 
     private static PagesIndex newPagesIndex(List<Type> types, int expectedPositions, boolean eagerCompact)
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestPipelineStats.java b/core/trino-main/src/test/java/io/trino/operator/TestPipelineStats.java
index ba773f24402e..b6a45bc8bd4d 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestPipelineStats.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestPipelineStats.java
@@ -21,7 +21,7 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import org.joda.time.DateTime;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.operator.TestDriverStats.assertExpectedDriverStats;
 import static io.trino.operator.TestOperatorStats.assertExpectedOperatorStats;
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestRealAverageAggregation.java b/core/trino-main/src/test/java/io/trino/operator/TestRealAverageAggregation.java
index f82e9b9eeae3..21c72d5a3a61 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestRealAverageAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestRealAverageAggregation.java
@@ -18,8 +18,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.Type;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -29,7 +28,6 @@
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static java.lang.Float.floatToRawIntBits;
 
-@Test(singleThreaded = true)
 public class TestRealAverageAggregation
         extends AbstractTestAggregationFunction
 {
@@ -38,7 +36,7 @@ public void averageOfNullIsNull()
     {
         assertAggregation(
                 functionResolution,
-                QualifiedName.of("avg"),
+                "avg",
                 fromTypes(REAL),
                 null,
                 createBlockOfReals(null, null));
@@ -49,7 +47,7 @@ public void averageOfSingleValueEqualsThatValue()
     {
         assertAggregation(
                 functionResolution,
-                QualifiedName.of("avg"),
+                "avg",
                 fromTypes(REAL),
                 1.23f,
                 createBlockOfReals(1.23f));
@@ -60,7 +58,7 @@ public void averageOfTwoMaxFloatsEqualsMaxFloat()
     {
         assertAggregation(
                 functionResolution,
-                QualifiedName.of("avg"),
+                "avg",
                 fromTypes(REAL),
                 Float.MAX_VALUE,
                 createBlockOfReals(Float.MAX_VALUE, Float.MAX_VALUE));
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestRowNumberOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestRowNumberOperator.java
index 2c8bad1809b4..37de8c8dc2ff 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestRowNumberOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestRowNumberOperator.java
@@ -26,12 +26,12 @@
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
-import io.trino.type.BlockTypeOperators;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
@@ -54,43 +54,31 @@
 import static io.trino.testing.TestingTaskContext.createTaskContext;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestRowNumberOperator
 {
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
-    private final TypeOperators typeOperators = new TypeOperators();
-    private final BlockTypeOperators blockTypeOperators = new BlockTypeOperators(typeOperators);
-    private final JoinCompiler joinCompiler = new JoinCompiler(typeOperators);
+    private final JoinCompiler joinCompiler = new JoinCompiler(new TypeOperators());
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
         scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
         scheduledExecutor.shutdownNow();
     }
 
-    @DataProvider
-    public Object[][] dataType()
-    {
-        return new Object[][] {{VARCHAR}, {BIGINT}};
-    }
-
-    @DataProvider(name = "hashEnabledValues")
-    public static Object[][] hashEnabledValuesProvider()
-    {
-        return new Object[][] {{true}, {false}};
-    }
-
     private DriverContext getDriverContext()
     {
         return createTaskContext(executor, scheduledExecutor, TEST_SESSION)
@@ -127,8 +115,7 @@ public void testRowNumberUnpartitioned()
                 Optional.empty(),
                 Optional.empty(),
                 10,
-                joinCompiler,
-                blockTypeOperators);
+                joinCompiler);
 
         MaterializedResult expectedResult = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
                 .row(0.3, 1L)
@@ -152,176 +139,179 @@ public void testRowNumberUnpartitioned()
         assertEqualsIgnoreOrder(actual.getMaterializedRows(), expectedResult.getMaterializedRows());
     }
 
-    @Test(dataProvider = "dataType")
-    public void testMemoryReservationYield(Type type)
+    @Test
+    public void testMemoryReservationYield()
     {
-        List<Page> input = createPagesWithDistinctHashKeys(type, 6_000, 600);
-
-        OperatorFactory operatorFactory = new RowNumberOperator.RowNumberOperatorFactory(
-                0,
-                new PlanNodeId("test"),
-                ImmutableList.of(type),
-                ImmutableList.of(0),
-                ImmutableList.of(0),
-                ImmutableList.of(type),
-                Optional.empty(),
-                Optional.empty(),
-                1,
-                joinCompiler,
-                blockTypeOperators);
-
-        // get result with yield; pick a relatively small buffer for partitionRowCount's memory usage
-        GroupByHashYieldAssertion.GroupByHashYieldResult result = finishOperatorWithYieldingGroupByHash(input, type, operatorFactory, operator -> ((RowNumberOperator) operator).getCapacity(), 280_000);
-        assertGreaterThanOrEqual(result.getYieldCount(), 5);
-        assertGreaterThanOrEqual(result.getMaxReservedBytes(), 20L << 20);
-
-        int count = 0;
-        for (Page page : result.getOutput()) {
-            assertEquals(page.getChannelCount(), 3);
-            for (int i = 0; i < page.getPositionCount(); i++) {
-                assertEquals(page.getBlock(2).getLong(i, 0), 1);
-                count++;
+        for (Type type : Arrays.asList(VARCHAR, BIGINT)) {
+            List<Page> input = createPagesWithDistinctHashKeys(type, 6_000, 600);
+
+            OperatorFactory operatorFactory = new RowNumberOperator.RowNumberOperatorFactory(
+                    0,
+                    new PlanNodeId("test"),
+                    ImmutableList.of(type),
+                    ImmutableList.of(0),
+                    ImmutableList.of(0),
+                    ImmutableList.of(type),
+                    Optional.empty(),
+                    Optional.of(1),
+                    1,
+                    joinCompiler);
+
+            // get result with yield; pick a relatively small buffer for partitionRowCount's memory usage
+            GroupByHashYieldAssertion.GroupByHashYieldResult result = finishOperatorWithYieldingGroupByHash(input, type, operatorFactory, operator -> ((RowNumberOperator) operator).getCapacity(), 280_000);
+            assertGreaterThanOrEqual(result.getYieldCount(), 5);
+            assertGreaterThanOrEqual(result.getMaxReservedBytes(), 20L << 20);
+
+            int count = 0;
+            for (Page page : result.getOutput()) {
+                assertEquals(page.getChannelCount(), 3);
+                for (int i = 0; i < page.getPositionCount(); i++) {
+                    assertEquals(page.getBlock(2).getLong(i, 0), 1);
+                    count++;
+                }
             }
+            assertEquals(count, 6_000 * 600);
         }
-        assertEquals(count, 6_000 * 600);
     }
 
-    @Test(dataProvider = "hashEnabledValues")
-    public void testRowNumberPartitioned(boolean hashEnabled)
+    @Test
+    public void testRowNumberPartitioned()
     {
-        DriverContext driverContext = getDriverContext();
-        RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, Ints.asList(0), BIGINT, DOUBLE);
-        List<Page> input = rowPagesBuilder
-                .row(1L, 0.3)
-                .row(2L, 0.2)
-                .row(3L, 0.1)
-                .row(3L, 0.19)
-                .pageBreak()
-                .row(1L, 0.4)
-                .pageBreak()
-                .row(1L, 0.5)
-                .row(1L, 0.6)
-                .row(2L, 0.7)
-                .row(2L, 0.8)
-                .row(2L, 0.9)
-                .build();
-
-        RowNumberOperator.RowNumberOperatorFactory operatorFactory = new RowNumberOperator.RowNumberOperatorFactory(
-                0,
-                new PlanNodeId("test"),
-                ImmutableList.of(BIGINT, DOUBLE),
-                Ints.asList(1, 0),
-                Ints.asList(0),
-                ImmutableList.of(BIGINT),
-                Optional.of(10),
-                rowPagesBuilder.getHashChannel(),
-                10,
-                joinCompiler,
-                blockTypeOperators);
-
-        MaterializedResult expectedPartition1 = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
-                .row(0.3, 1L)
-                .row(0.4, 1L)
-                .row(0.5, 1L)
-                .row(0.6, 1L)
-                .build();
-
-        MaterializedResult expectedPartition2 = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
-                .row(0.2, 2L)
-                .row(0.7, 2L)
-                .row(0.8, 2L)
-                .row(0.9, 2L)
-                .build();
-
-        MaterializedResult expectedPartition3 = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
-                .row(0.1, 3L)
-                .row(0.19, 3L)
-                .build();
-
-        List<Page> pages = toPages(operatorFactory, driverContext, input);
-        Block rowNumberColumn = getRowNumberColumn(pages);
-        assertEquals(rowNumberColumn.getPositionCount(), 10);
-
-        pages = stripRowNumberColumn(pages);
-        MaterializedResult actual = toMaterializedResult(driverContext.getSession(), ImmutableList.of(DOUBLE, BIGINT), pages);
-        ImmutableSet<?> actualSet = ImmutableSet.copyOf(actual.getMaterializedRows());
-        ImmutableSet<?> expectedPartition1Set = ImmutableSet.copyOf(expectedPartition1.getMaterializedRows());
-        ImmutableSet<?> expectedPartition2Set = ImmutableSet.copyOf(expectedPartition2.getMaterializedRows());
-        ImmutableSet<?> expectedPartition3Set = ImmutableSet.copyOf(expectedPartition3.getMaterializedRows());
-        assertEquals(Sets.intersection(expectedPartition1Set, actualSet).size(), 4);
-        assertEquals(Sets.intersection(expectedPartition2Set, actualSet).size(), 4);
-        assertEquals(Sets.intersection(expectedPartition3Set, actualSet).size(), 2);
+        for (boolean hashEnabled : Arrays.asList(true, false)) {
+            DriverContext driverContext = getDriverContext();
+            RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, Ints.asList(0), BIGINT, DOUBLE);
+            List<Page> input = rowPagesBuilder
+                    .row(1L, 0.3)
+                    .row(2L, 0.2)
+                    .row(3L, 0.1)
+                    .row(3L, 0.19)
+                    .pageBreak()
+                    .row(1L, 0.4)
+                    .pageBreak()
+                    .row(1L, 0.5)
+                    .row(1L, 0.6)
+                    .row(2L, 0.7)
+                    .row(2L, 0.8)
+                    .row(2L, 0.9)
+                    .build();
+
+            RowNumberOperator.RowNumberOperatorFactory operatorFactory = new RowNumberOperator.RowNumberOperatorFactory(
+                    0,
+                    new PlanNodeId("test"),
+                    ImmutableList.of(BIGINT, DOUBLE),
+                    Ints.asList(1, 0),
+                    Ints.asList(0),
+                    ImmutableList.of(BIGINT),
+                    Optional.of(10),
+                    rowPagesBuilder.getHashChannel(),
+                    10,
+                    joinCompiler);
+
+            MaterializedResult expectedPartition1 = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
+                    .row(0.3, 1L)
+                    .row(0.4, 1L)
+                    .row(0.5, 1L)
+                    .row(0.6, 1L)
+                    .build();
+
+            MaterializedResult expectedPartition2 = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
+                    .row(0.2, 2L)
+                    .row(0.7, 2L)
+                    .row(0.8, 2L)
+                    .row(0.9, 2L)
+                    .build();
+
+            MaterializedResult expectedPartition3 = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
+                    .row(0.1, 3L)
+                    .row(0.19, 3L)
+                    .build();
+
+            List<Page> pages = toPages(operatorFactory, driverContext, input);
+            Block rowNumberColumn = getRowNumberColumn(pages);
+            assertEquals(rowNumberColumn.getPositionCount(), 10);
+
+            pages = stripRowNumberColumn(pages);
+            MaterializedResult actual = toMaterializedResult(driverContext.getSession(), ImmutableList.of(DOUBLE, BIGINT), pages);
+            ImmutableSet<?> actualSet = ImmutableSet.copyOf(actual.getMaterializedRows());
+            ImmutableSet<?> expectedPartition1Set = ImmutableSet.copyOf(expectedPartition1.getMaterializedRows());
+            ImmutableSet<?> expectedPartition2Set = ImmutableSet.copyOf(expectedPartition2.getMaterializedRows());
+            ImmutableSet<?> expectedPartition3Set = ImmutableSet.copyOf(expectedPartition3.getMaterializedRows());
+            assertEquals(Sets.intersection(expectedPartition1Set, actualSet).size(), 4);
+            assertEquals(Sets.intersection(expectedPartition2Set, actualSet).size(), 4);
+            assertEquals(Sets.intersection(expectedPartition3Set, actualSet).size(), 2);
+        }
     }
 
-    @Test(dataProvider = "hashEnabledValues")
-    public void testRowNumberPartitionedLimit(boolean hashEnabled)
+    @Test
+    public void testRowNumberPartitionedLimit()
     {
-        DriverContext driverContext = getDriverContext();
-        RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, Ints.asList(0), BIGINT, DOUBLE);
-        List<Page> input = rowPagesBuilder
-                .row(1L, 0.3)
-                .row(2L, 0.2)
-                .row(3L, 0.1)
-                .row(3L, 0.19)
-                .pageBreak()
-                .row(1L, 0.4)
-                .pageBreak()
-                .row(1L, 0.5)
-                .row(1L, 0.6)
-                .row(2L, 0.7)
-                .row(2L, 0.8)
-                .row(2L, 0.9)
-                .build();
-
-        RowNumberOperator.RowNumberOperatorFactory operatorFactory = new RowNumberOperator.RowNumberOperatorFactory(
-                0,
-                new PlanNodeId("test"),
-                ImmutableList.of(BIGINT, DOUBLE),
-                Ints.asList(1, 0),
-                Ints.asList(0),
-                ImmutableList.of(BIGINT),
-                Optional.of(3),
-                Optional.empty(),
-                10,
-                joinCompiler,
-                blockTypeOperators);
-
-        MaterializedResult expectedPartition1 = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
-                .row(0.3, 1L)
-                .row(0.4, 1L)
-                .row(0.5, 1L)
-                .row(0.6, 1L)
-                .build();
-
-        MaterializedResult expectedPartition2 = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
-                .row(0.2, 2L)
-                .row(0.7, 2L)
-                .row(0.8, 2L)
-                .row(0.9, 2L)
-                .build();
-
-        MaterializedResult expectedPartition3 = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
-                .row(0.1, 3L)
-                .row(0.19, 3L)
-                .build();
+        for (boolean hashEnabled : Arrays.asList(true, false)) {
+            DriverContext driverContext = getDriverContext();
+            RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, Ints.asList(0), BIGINT, DOUBLE);
+            List<Page> input = rowPagesBuilder
+                    .row(1L, 0.3)
+                    .row(2L, 0.2)
+                    .row(3L, 0.1)
+                    .row(3L, 0.19)
+                    .pageBreak()
+                    .row(1L, 0.4)
+                    .pageBreak()
+                    .row(1L, 0.5)
+                    .row(1L, 0.6)
+                    .row(2L, 0.7)
+                    .row(2L, 0.8)
+                    .row(2L, 0.9)
+                    .build();
+
+            RowNumberOperator.RowNumberOperatorFactory operatorFactory = new RowNumberOperator.RowNumberOperatorFactory(
+                    0,
+                    new PlanNodeId("test"),
+                    ImmutableList.of(BIGINT, DOUBLE),
+                    Ints.asList(1, 0),
+                    Ints.asList(0),
+                    ImmutableList.of(BIGINT),
+                    Optional.of(3),
+                    Optional.empty(),
+                    10,
+                    joinCompiler);
+
+            MaterializedResult expectedPartition1 = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
+                    .row(0.3, 1L)
+                    .row(0.4, 1L)
+                    .row(0.5, 1L)
+                    .row(0.6, 1L)
+                    .build();
+
+            MaterializedResult expectedPartition2 = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
+                    .row(0.2, 2L)
+                    .row(0.7, 2L)
+                    .row(0.8, 2L)
+                    .row(0.9, 2L)
+                    .build();
+
+            MaterializedResult expectedPartition3 = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT)
+                    .row(0.1, 3L)
+                    .row(0.19, 3L)
+                    .build();
+
+            List<Page> pages = toPages(operatorFactory, driverContext, input);
+            Block rowNumberColumn = getRowNumberColumn(pages);
+            assertEquals(rowNumberColumn.getPositionCount(), 8);
+            // Check that all row numbers generated are <= 3
+            for (int i = 0; i < rowNumberColumn.getPositionCount(); i++) {
+                assertTrue(rowNumberColumn.getLong(i, 0) <= 3);
+            }
 
-        List<Page> pages = toPages(operatorFactory, driverContext, input);
-        Block rowNumberColumn = getRowNumberColumn(pages);
-        assertEquals(rowNumberColumn.getPositionCount(), 8);
-        // Check that all row numbers generated are <= 3
-        for (int i = 0; i < rowNumberColumn.getPositionCount(); i++) {
-            assertTrue(rowNumberColumn.getLong(i, 0) <= 3);
+            pages = stripRowNumberColumn(pages);
+            MaterializedResult actual = toMaterializedResult(driverContext.getSession(), ImmutableList.of(DOUBLE, BIGINT), pages);
+            ImmutableSet<?> actualSet = ImmutableSet.copyOf(actual.getMaterializedRows());
+            ImmutableSet<?> expectedPartition1Set = ImmutableSet.copyOf(expectedPartition1.getMaterializedRows());
+            ImmutableSet<?> expectedPartition2Set = ImmutableSet.copyOf(expectedPartition2.getMaterializedRows());
+            ImmutableSet<?> expectedPartition3Set = ImmutableSet.copyOf(expectedPartition3.getMaterializedRows());
+            assertEquals(Sets.intersection(expectedPartition1Set, actualSet).size(), 3);
+            assertEquals(Sets.intersection(expectedPartition2Set, actualSet).size(), 3);
+            assertEquals(Sets.intersection(expectedPartition3Set, actualSet).size(), 2);
         }
-
-        pages = stripRowNumberColumn(pages);
-        MaterializedResult actual = toMaterializedResult(driverContext.getSession(), ImmutableList.of(DOUBLE, BIGINT), pages);
-        ImmutableSet<?> actualSet = ImmutableSet.copyOf(actual.getMaterializedRows());
-        ImmutableSet<?> expectedPartition1Set = ImmutableSet.copyOf(expectedPartition1.getMaterializedRows());
-        ImmutableSet<?> expectedPartition2Set = ImmutableSet.copyOf(expectedPartition2.getMaterializedRows());
-        ImmutableSet<?> expectedPartition3Set = ImmutableSet.copyOf(expectedPartition3.getMaterializedRows());
-        assertEquals(Sets.intersection(expectedPartition1Set, actualSet).size(), 3);
-        assertEquals(Sets.intersection(expectedPartition2Set, actualSet).size(), 3);
-        assertEquals(Sets.intersection(expectedPartition3Set, actualSet).size(), 2);
     }
 
     @Test
@@ -353,8 +343,7 @@ public void testRowNumberUnpartitionedLimit()
                 Optional.of(3),
                 Optional.empty(),
                 10,
-                joinCompiler,
-                blockTypeOperators);
+                joinCompiler);
 
         MaterializedResult expectedRows = resultBuilder(driverContext.getSession(), DOUBLE, BIGINT, BIGINT)
                 .row(0.3, 1L)
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestRowReferencePageManager.java b/core/trino-main/src/test/java/io/trino/operator/TestRowReferencePageManager.java
index 2dc69f67ca44..4b16f210e758 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestRowReferencePageManager.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestRowReferencePageManager.java
@@ -16,7 +16,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestScanFilterAndProjectOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestScanFilterAndProjectOperator.java
index bae410f765ce..408495cd547a 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestScanFilterAndProjectOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestScanFilterAndProjectOperator.java
@@ -39,7 +39,6 @@
 import io.trino.sql.gen.PageFunctionCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.relational.RowExpression;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.TestingSplit;
@@ -289,7 +288,7 @@ public void testPageYield()
         ExpressionCompiler expressionCompiler = new ExpressionCompiler(runner.getFunctionManager(), new PageFunctionCompiler(runner.getFunctionManager(), 0));
         ImmutableList.Builder<RowExpression> projections = ImmutableList.builder();
         for (int i = 0; i < totalColumns; i++) {
-            projections.add(call(runner.getMetadata().resolveFunction(session, QualifiedName.of("generic_long_page_col" + i), fromTypes(BIGINT)), field(0, BIGINT)));
+            projections.add(call(runner.getMetadata().resolveBuiltinFunction("generic_long_page_col" + i, fromTypes(BIGINT)), field(0, BIGINT)));
         }
         Supplier<CursorProcessor> cursorProcessor = expressionCompiler.compileCursorProcessor(Optional.empty(), projections.build(), "key");
         Supplier<PageProcessor> pageProcessor = expressionCompiler.compilePageProcessor(Optional.empty(), projections.build(), MAX_BATCH_SIZE);
@@ -354,7 +353,7 @@ public void testRecordCursorYield()
         ExpressionCompiler expressionCompiler = new ExpressionCompiler(functionManager, new PageFunctionCompiler(functionManager, 0));
 
         List<RowExpression> projections = ImmutableList.of(call(
-                runner.getMetadata().resolveFunction(session, QualifiedName.of("generic_long_record_cursor"), fromTypes(BIGINT)),
+                runner.getMetadata().resolveBuiltinFunction("generic_long_record_cursor", fromTypes(BIGINT)),
                 field(0, BIGINT)));
         Supplier<CursorProcessor> cursorProcessor = expressionCompiler.compileCursorProcessor(Optional.empty(), projections, "key");
         Supplier<PageProcessor> pageProcessor = expressionCompiler.compilePageProcessor(Optional.empty(), projections);
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestSimplePagesHashStrategy.java b/core/trino-main/src/test/java/io/trino/operator/TestSimplePagesHashStrategy.java
index a7c6257bdf15..c7b56bb9c453 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestSimplePagesHashStrategy.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestSimplePagesHashStrategy.java
@@ -22,7 +22,7 @@
 import io.trino.spi.type.TypeOperators;
 import io.trino.type.BlockTypeOperators;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestStreamingAggregationOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestStreamingAggregationOperator.java
index 734891d09c42..50e978403bec 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestStreamingAggregationOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestStreamingAggregationOperator.java
@@ -21,11 +21,11 @@
 import io.trino.spi.type.TypeOperators;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.OptionalInt;
@@ -46,20 +46,21 @@
 import static java.lang.String.format;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestStreamingAggregationOperator
 {
     private static final TestingFunctionResolution FUNCTION_RESOLUTION = new TestingFunctionResolution();
-    private static final TestingAggregationFunction LONG_SUM = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("sum"), fromTypes(BIGINT));
-    private static final TestingAggregationFunction COUNT = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("count"), ImmutableList.of());
+    private static final TestingAggregationFunction LONG_SUM = FUNCTION_RESOLUTION.getAggregateFunction("sum", fromTypes(BIGINT));
+    private static final TestingAggregationFunction COUNT = FUNCTION_RESOLUTION.getAggregateFunction("count", ImmutableList.of());
 
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
     private DriverContext driverContext;
     private OperatorFactory operatorFactory;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
@@ -80,7 +81,7 @@ public void setUp()
                 new JoinCompiler(new TypeOperators()));
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         executor.shutdownNow();
@@ -147,11 +148,11 @@ public void testLargeInputPage()
     {
         RowPagesBuilder rowPagesBuilder = RowPagesBuilder.rowPagesBuilder(BOOLEAN, VARCHAR, BIGINT);
         List<Page> input = rowPagesBuilder
-                .addSequencePage(1_000_000, 0, 0, 1)
+                .addSequencePage(50_000, 0, 0, 1)
                 .build();
 
         MaterializedResult.Builder expectedBuilder = resultBuilder(driverContext.getSession(), VARCHAR, BIGINT, BIGINT);
-        for (int i = 0; i < 1_000_000; ++i) {
+        for (int i = 0; i < 50_000; ++i) {
             expectedBuilder.row(String.valueOf(i), 1L, i + 1L);
         }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestStreamingDirectExchangeBuffer.java b/core/trino-main/src/test/java/io/trino/operator/TestStreamingDirectExchangeBuffer.java
index eec605a4da6d..02322e0b98cb 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestStreamingDirectExchangeBuffer.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestStreamingDirectExchangeBuffer.java
@@ -21,7 +21,7 @@
 import io.trino.execution.TaskId;
 import io.trino.spi.QueryId;
 import io.trino.spi.TrinoException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static io.airlift.slice.Slices.utf8Slice;
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestTableFinishOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestTableFinishOperator.java
index 251d393430b1..d5f39614ce86 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestTableFinishOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestTableFinishOperator.java
@@ -24,7 +24,6 @@
 import io.trino.operator.TableFinishOperator.TableFinishOperatorFactory;
 import io.trino.operator.TableFinishOperator.TableFinisher;
 import io.trino.operator.aggregation.TestingAggregationFunction;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.LongArrayBlockBuilder;
 import io.trino.spi.connector.ConnectorOutputMetadata;
 import io.trino.spi.statistics.ColumnStatisticMetadata;
@@ -32,10 +31,10 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.planner.plan.StatisticAggregationsDescriptor;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Collection;
 import java.util.List;
@@ -58,24 +57,26 @@
 import static io.trino.testing.TestingTaskContext.createTaskContext;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestTableFinishOperator
 {
-    private static final TestingAggregationFunction LONG_MAX = new TestingFunctionResolution().getAggregateFunction(QualifiedName.of("max"), fromTypes(BIGINT));
+    private static final TestingAggregationFunction LONG_MAX = new TestingFunctionResolution().getAggregateFunction("max", fromTypes(BIGINT));
 
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         scheduledExecutor.shutdownNow();
@@ -144,11 +145,10 @@ public void testStatisticsAggregation()
         assertEquals(tableFinisher.getFragments(), ImmutableList.of(Slices.wrappedBuffer(new byte[] {1}), Slices.wrappedBuffer(new byte[] {2})));
         assertEquals(tableFinisher.getComputedStatistics().size(), 1);
         assertEquals(getOnlyElement(tableFinisher.getComputedStatistics()).getColumnStatistics().size(), 1);
-        Block expectedStatisticsBlock = new LongArrayBlockBuilder(null, 1)
-                .writeLong(7)
-                .closeEntry()
-                .build();
-        assertBlockEquals(BIGINT, getOnlyElement(tableFinisher.getComputedStatistics()).getColumnStatistics().get(statisticMetadata), expectedStatisticsBlock);
+
+        LongArrayBlockBuilder expectedStatistics = new LongArrayBlockBuilder(null, 1);
+        BIGINT.writeLong(expectedStatistics, 7);
+        assertBlockEquals(BIGINT, getOnlyElement(tableFinisher.getComputedStatistics()).getColumnStatistics().get(statisticMetadata), expectedStatistics.build());
 
         assertEquals(driverContext.getMemoryUsage(), 0, "memoryUsage");
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestTableWriterOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestTableWriterOperator.java
index c85401ea25a8..fa112a6bf0ca 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestTableWriterOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestTableWriterOperator.java
@@ -35,14 +35,15 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.type.Type;
 import io.trino.split.PageSinkManager;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.planner.plan.TableWriterNode.CreateTarget;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -69,25 +70,27 @@
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestTableWriterOperator
 {
-    private static final TestingAggregationFunction LONG_MAX = new TestingFunctionResolution().getAggregateFunction(QualifiedName.of("max"), fromTypes(BIGINT));
+    private static final TestingAggregationFunction LONG_MAX = new TestingFunctionResolution().getAggregateFunction("max", fromTypes(BIGINT));
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
         scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
@@ -298,8 +301,9 @@ private Operator createTableWriterOperator(
                                 new ConnectorOutputTableHandle() {}),
                         schemaTableName,
                         false,
-                        false,
-                        OptionalInt.empty()),
+                        OptionalInt.empty(),
+                        WriterScalingOptions.DISABLED,
+                        false),
                 ImmutableList.of(0),
                 session,
                 statisticsAggregation,
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestTaskStats.java b/core/trino-main/src/test/java/io/trino/operator/TestTaskStats.java
index 1399e0ba7161..a6a27d3b2a01 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestTaskStats.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestTaskStats.java
@@ -19,7 +19,7 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import org.joda.time.DateTime;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -80,6 +80,7 @@ public class TestTaskStats
 
             new Duration(272, NANOSECONDS),
 
+            DataSize.ofBytes(25),
             DataSize.ofBytes(25),
             Optional.of(2),
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestTopNOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestTopNOperator.java
index d6629f1fc34a..ed6cf3efc30a 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestTopNOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestTopNOperator.java
@@ -22,9 +22,10 @@
 import io.trino.spi.type.TypeOperators;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -44,11 +45,12 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestTopNOperator
 {
     private ExecutorService executor;
@@ -56,7 +58,7 @@ public class TestTopNOperator
     private DriverContext driverContext;
     private final TypeOperators typeOperators = new TypeOperators();
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
@@ -66,7 +68,7 @@ public void setUp()
                 .addDriverContext();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         executor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestTopNRankingOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestTopNRankingOperator.java
index 714bdb047c29..6d21525f31a0 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestTopNRankingOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestTopNRankingOperator.java
@@ -26,11 +26,11 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
 import io.trino.type.BlockTypeOperators;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
@@ -54,219 +54,208 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestTopNRankingOperator
 {
-    private ExecutorService executor;
-    private ScheduledExecutorService scheduledExecutor;
-    private DriverContext driverContext;
-    private JoinCompiler joinCompiler;
-    private TypeOperators typeOperators = new TypeOperators();
-    private BlockTypeOperators blockTypeOperators = new BlockTypeOperators(typeOperators);
+    private final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
+    private final ScheduledExecutorService scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
+    private final TypeOperators typeOperators = new TypeOperators();
+    private final JoinCompiler joinCompiler = new JoinCompiler(typeOperators);
+    private final BlockTypeOperators blockTypeOperators = new BlockTypeOperators(typeOperators);
 
-    @BeforeMethod
-    public void setUp()
-    {
-        executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
-        scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
-        driverContext = createTaskContext(executor, scheduledExecutor, TEST_SESSION)
-                .addPipelineContext(0, true, true, false)
-                .addDriverContext();
-        joinCompiler = new JoinCompiler(typeOperators);
-    }
-
-    @AfterMethod(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
         scheduledExecutor.shutdownNow();
     }
 
-    @DataProvider(name = "hashEnabledValues")
-    public static Object[][] hashEnabledValuesProvider()
+    @Test
+    public void testPartitioned()
     {
-        return new Object[][] {{true}, {false}};
-    }
+        for (boolean hashEnabled : Arrays.asList(true, false)) {
+            DriverContext driverContext = newDriverContext();
 
-    @DataProvider
-    public Object[][] partial()
-    {
-        return new Object[][] {{true}, {false}};
-    }
+            RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, Ints.asList(0), VARCHAR, DOUBLE);
+            List<Page> input = rowPagesBuilder
+                    .row("a", 0.3)
+                    .row("b", 0.2)
+                    .row("c", 0.1)
+                    .row("c", 0.91)
+                    .pageBreak()
+                    .row("a", 0.4)
+                    .pageBreak()
+                    .row("a", 0.5)
+                    .row("a", 0.6)
+                    .row("b", 0.7)
+                    .row("b", 0.8)
+                    .pageBreak()
+                    .row("b", 0.9)
+                    .build();
 
-    @Test(dataProvider = "hashEnabledValues")
-    public void testPartitioned(boolean hashEnabled)
-    {
-        RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, Ints.asList(0), VARCHAR, DOUBLE);
-        List<Page> input = rowPagesBuilder
-                .row("a", 0.3)
-                .row("b", 0.2)
-                .row("c", 0.1)
-                .row("c", 0.91)
-                .pageBreak()
-                .row("a", 0.4)
-                .pageBreak()
-                .row("a", 0.5)
-                .row("a", 0.6)
-                .row("b", 0.7)
-                .row("b", 0.8)
-                .pageBreak()
-                .row("b", 0.9)
-                .build();
+            TopNRankingOperatorFactory operatorFactory = new TopNRankingOperatorFactory(
+                    0,
+                    new PlanNodeId("test"),
+                    ROW_NUMBER,
+                    ImmutableList.of(VARCHAR, DOUBLE),
+                    Ints.asList(1, 0),
+                    Ints.asList(0),
+                    ImmutableList.of(VARCHAR),
+                    Ints.asList(1),
+                    ImmutableList.of(SortOrder.ASC_NULLS_LAST),
+                    3,
+                    false,
+                    Optional.empty(),
+                    10,
+                    Optional.empty(),
+                    joinCompiler,
+                    typeOperators,
+                    blockTypeOperators);
 
-        TopNRankingOperatorFactory operatorFactory = new TopNRankingOperatorFactory(
-                0,
-                new PlanNodeId("test"),
-                ROW_NUMBER,
-                ImmutableList.of(VARCHAR, DOUBLE),
-                Ints.asList(1, 0),
-                Ints.asList(0),
-                ImmutableList.of(VARCHAR),
-                Ints.asList(1),
-                ImmutableList.of(SortOrder.ASC_NULLS_LAST),
-                3,
-                false,
-                Optional.empty(),
-                10,
-                Optional.empty(),
-                joinCompiler,
-                typeOperators,
-                blockTypeOperators);
-
-        MaterializedResult expected = resultBuilder(driverContext.getSession(), DOUBLE, VARCHAR, BIGINT)
-                .row(0.3, "a", 1L)
-                .row(0.4, "a", 2L)
-                .row(0.5, "a", 3L)
-                .row(0.2, "b", 1L)
-                .row(0.7, "b", 2L)
-                .row(0.8, "b", 3L)
-                .row(0.1, "c", 1L)
-                .row(0.91, "c", 2L)
-                .build();
+            MaterializedResult expected = resultBuilder(driverContext.getSession(), DOUBLE, VARCHAR, BIGINT)
+                    .row(0.3, "a", 1L)
+                    .row(0.4, "a", 2L)
+                    .row(0.5, "a", 3L)
+                    .row(0.2, "b", 1L)
+                    .row(0.7, "b", 2L)
+                    .row(0.8, "b", 3L)
+                    .row(0.1, "c", 1L)
+                    .row(0.91, "c", 2L)
+                    .build();
 
-        assertOperatorEquals(operatorFactory, driverContext, input, expected);
+            assertOperatorEquals(operatorFactory, driverContext, input, expected);
+        }
     }
 
-    @Test(dataProvider = "partial")
-    public void testUnPartitioned(boolean partial)
+    @Test
+    public void testUnPartitioned()
     {
-        List<Page> input = rowPagesBuilder(VARCHAR, DOUBLE)
-                .row("a", 0.3)
-                .row("b", 0.2)
-                .row("c", 0.1)
-                .row("c", 0.91)
-                .pageBreak()
-                .row("a", 0.4)
-                .pageBreak()
-                .row("a", 0.5)
-                .row("a", 0.6)
-                .row("b", 0.7)
-                .row("b", 0.8)
-                .pageBreak()
-                .row("b", 0.9)
-                .build();
+        for (boolean partial : Arrays.asList(true, false)) {
+            DriverContext driverContext = newDriverContext();
 
-        TopNRankingOperatorFactory operatorFactory = new TopNRankingOperatorFactory(
-                0,
-                new PlanNodeId("test"),
-                ROW_NUMBER,
-                ImmutableList.of(VARCHAR, DOUBLE),
-                Ints.asList(1, 0),
-                Ints.asList(),
-                ImmutableList.of(),
-                Ints.asList(1),
-                ImmutableList.of(SortOrder.ASC_NULLS_LAST),
-                3,
-                partial,
-                Optional.empty(),
-                10,
-                partial ? Optional.of(DataSize.ofBytes(1)) : Optional.empty(),
-                joinCompiler,
-                typeOperators,
-                blockTypeOperators);
-
-        MaterializedResult expected;
-        if (partial) {
-            expected = resultBuilder(driverContext.getSession(), DOUBLE, VARCHAR)
-                    .row(0.1, "c")
-                    .row(0.2, "b")
-                    .row(0.3, "a")
-                    .row(0.4, "a")
-                    .row(0.5, "a")
-                    .row(0.6, "a")
-                    .row(0.7, "b")
-                    .row(0.9, "b")
+            List<Page> input = rowPagesBuilder(VARCHAR, DOUBLE)
+                    .row("a", 0.3)
+                    .row("b", 0.2)
+                    .row("c", 0.1)
+                    .row("c", 0.91)
+                    .pageBreak()
+                    .row("a", 0.4)
+                    .pageBreak()
+                    .row("a", 0.5)
+                    .row("a", 0.6)
+                    .row("b", 0.7)
+                    .row("b", 0.8)
+                    .pageBreak()
+                    .row("b", 0.9)
                     .build();
-        }
-        else {
-            expected = resultBuilder(driverContext.getSession(), DOUBLE, VARCHAR, BIGINT)
-                    .row(0.1, "c", 1L)
-                    .row(0.2, "b", 2L)
-                    .row(0.3, "a", 3L)
-                    .build();
-        }
 
-        assertOperatorEquals(operatorFactory, driverContext, input, expected);
+            TopNRankingOperatorFactory operatorFactory = new TopNRankingOperatorFactory(
+                    0,
+                    new PlanNodeId("test"),
+                    ROW_NUMBER,
+                    ImmutableList.of(VARCHAR, DOUBLE),
+                    Ints.asList(1, 0),
+                    Ints.asList(),
+                    ImmutableList.of(),
+                    Ints.asList(1),
+                    ImmutableList.of(SortOrder.ASC_NULLS_LAST),
+                    3,
+                    partial,
+                    Optional.empty(),
+                    10,
+                    partial ? Optional.of(DataSize.ofBytes(1)) : Optional.empty(),
+                    joinCompiler,
+                    typeOperators,
+                    blockTypeOperators);
+
+            MaterializedResult expected;
+            if (partial) {
+                expected = resultBuilder(driverContext.getSession(), DOUBLE, VARCHAR)
+                        .row(0.1, "c")
+                        .row(0.2, "b")
+                        .row(0.3, "a")
+                        .row(0.4, "a")
+                        .row(0.5, "a")
+                        .row(0.6, "a")
+                        .row(0.7, "b")
+                        .row(0.9, "b")
+                        .build();
+            }
+            else {
+                expected = resultBuilder(driverContext.getSession(), DOUBLE, VARCHAR, BIGINT)
+                        .row(0.1, "c", 1L)
+                        .row(0.2, "b", 2L)
+                        .row(0.3, "a", 3L)
+                        .build();
+            }
+
+            assertOperatorEquals(operatorFactory, driverContext, input, expected);
+        }
     }
 
-    @Test(dataProvider = "partial")
-    public void testPartialFlush(boolean partial)
+    @Test
+    public void testPartialFlush()
     {
-        List<Page> input = rowPagesBuilder(BIGINT, DOUBLE)
-                .row(1L, 0.3)
-                .row(2L, 0.2)
-                .row(3L, 0.1)
-                .row(3L, 0.91)
-                .pageBreak()
-                .row(1L, 0.4)
-                .pageBreak()
-                .row(1L, 0.5)
-                .row(1L, 0.6)
-                .row(2L, 0.7)
-                .row(2L, 0.8)
-                .pageBreak()
-                .row(2L, 0.9)
-                .build();
+        for (boolean partial : Arrays.asList(true, false)) {
+            DriverContext driverContext = newDriverContext();
 
-        TopNRankingOperatorFactory operatorFactory = new TopNRankingOperatorFactory(
-                0,
-                new PlanNodeId("test"),
-                ROW_NUMBER,
-                ImmutableList.of(BIGINT, DOUBLE),
-                Ints.asList(1, 0),
-                Ints.asList(),
-                ImmutableList.of(),
-                Ints.asList(1),
-                ImmutableList.of(SortOrder.ASC_NULLS_LAST),
-                3,
-                partial,
-                Optional.empty(),
-                10,
-                partial ? Optional.of(DataSize.of(1, DataSize.Unit.BYTE)) : Optional.empty(),
-                joinCompiler,
-                typeOperators,
-                blockTypeOperators);
+            List<Page> input = rowPagesBuilder(BIGINT, DOUBLE)
+                    .row(1L, 0.3)
+                    .row(2L, 0.2)
+                    .row(3L, 0.1)
+                    .row(3L, 0.91)
+                    .pageBreak()
+                    .row(1L, 0.4)
+                    .pageBreak()
+                    .row(1L, 0.5)
+                    .row(1L, 0.6)
+                    .row(2L, 0.7)
+                    .row(2L, 0.8)
+                    .pageBreak()
+                    .row(2L, 0.9)
+                    .build();
 
-        TopNRankingOperator operator = (TopNRankingOperator) operatorFactory.createOperator(driverContext);
-        for (Page inputPage : input) {
-            operator.addInput(inputPage);
-            if (partial) {
-                assertFalse(operator.needsInput()); // full
-                assertNotNull(operator.getOutput()); // partial flush
-                assertFalse(operator.isFinished()); // not finished. just partial flushing.
-                assertThatThrownBy(() -> operator.addInput(inputPage)).isInstanceOf(IllegalStateException.class); // while flushing
-                assertNull(operator.getOutput()); // clear flushing
-                assertTrue(operator.needsInput()); // flushing done
-            }
-            else {
-                assertTrue(operator.needsInput());
-                assertNull(operator.getOutput());
+            TopNRankingOperatorFactory operatorFactory = new TopNRankingOperatorFactory(
+                    0,
+                    new PlanNodeId("test"),
+                    ROW_NUMBER,
+                    ImmutableList.of(BIGINT, DOUBLE),
+                    Ints.asList(1, 0),
+                    Ints.asList(),
+                    ImmutableList.of(),
+                    Ints.asList(1),
+                    ImmutableList.of(SortOrder.ASC_NULLS_LAST),
+                    3,
+                    partial,
+                    Optional.empty(),
+                    10,
+                    partial ? Optional.of(DataSize.of(1, DataSize.Unit.BYTE)) : Optional.empty(),
+                    joinCompiler,
+                    typeOperators,
+                    blockTypeOperators);
+
+            TopNRankingOperator operator = (TopNRankingOperator) operatorFactory.createOperator(driverContext);
+            for (Page inputPage : input) {
+                operator.addInput(inputPage);
+                if (partial) {
+                    assertFalse(operator.needsInput()); // full
+                    assertNotNull(operator.getOutput()); // partial flush
+                    assertFalse(operator.isFinished()); // not finished. just partial flushing.
+                    assertThatThrownBy(() -> operator.addInput(inputPage)).isInstanceOf(IllegalStateException.class); // while flushing
+                    assertNull(operator.getOutput()); // clear flushing
+                    assertTrue(operator.needsInput()); // flushing done
+                }
+                else {
+                    assertTrue(operator.needsInput());
+                    assertNull(operator.getOutput());
+                }
             }
         }
     }
@@ -320,6 +309,7 @@ public void testMemoryReservationYield()
     @Test
     public void testRankNullAndNan()
     {
+        DriverContext driverContext = newDriverContext();
         RowPagesBuilder rowPagesBuilder = rowPagesBuilder(VARCHAR, DOUBLE);
         List<Page> input = rowPagesBuilder
                 .row("a", null)
@@ -369,4 +359,11 @@ public void testRankNullAndNan()
 
         assertOperatorEquals(operatorFactory, driverContext, input, expected);
     }
+
+    private DriverContext newDriverContext()
+    {
+        return createTaskContext(executor, scheduledExecutor, TEST_SESSION)
+                .addPipelineContext(0, true, true, false)
+                .addDriverContext();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestTypeSignature.java b/core/trino-main/src/test/java/io/trino/operator/TestTypeSignature.java
index a0f0ffb05744..a064cc7d759c 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestTypeSignature.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestTypeSignature.java
@@ -22,7 +22,7 @@
 import io.trino.spi.type.TypeSignatureParameter;
 import io.trino.spi.type.VarcharType;
 import io.trino.sql.parser.ParsingException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestWindowOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestWindowOperator.java
index 534c43daa604..88adf84a5d48 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestWindowOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestWindowOperator.java
@@ -17,6 +17,7 @@
 import com.google.common.primitives.Ints;
 import io.airlift.units.DataSize;
 import io.trino.ExceededMemoryLimitException;
+import io.trino.RowPagesBuilder;
 import io.trino.operator.WindowOperator.WindowOperatorFactory;
 import io.trino.operator.window.FirstValueFunction;
 import io.trino.operator.window.FrameInfo;
@@ -56,6 +57,7 @@
 import static io.trino.operator.OperatorAssertion.assertOperatorEqualsIgnoreOrder;
 import static io.trino.operator.OperatorAssertion.toMaterializedResult;
 import static io.trino.operator.OperatorAssertion.toPages;
+import static io.trino.operator.PositionSearcher.findEndPosition;
 import static io.trino.operator.WindowFunctionDefinition.window;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -70,6 +72,7 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 @Test(singleThreaded = true)
@@ -431,6 +434,41 @@ public void testFirstValuePartition(boolean spillEnabled, boolean revokeMemoryWh
         assertOperatorEquals(operatorFactory, driverContext, input, expected, revokeMemoryWhenAddingPages);
     }
 
+    @Test
+    public void testClose()
+            throws Exception
+    {
+        RowPagesBuilder pageBuilder = rowPagesBuilder(VARCHAR, BIGINT);
+        for (int i = 0; i < 500_000; ++i) {
+            pageBuilder.row("a", 0L);
+        }
+        for (int i = 0; i < 500_000; ++i) {
+            pageBuilder.row("b", 0L);
+        }
+        List<Page> input = pageBuilder.build();
+
+        WindowOperatorFactory operatorFactory = createFactoryUnbounded(
+                ImmutableList.of(VARCHAR, BIGINT),
+                Ints.asList(0, 1),
+                ROW_NUMBER,
+                Ints.asList(0),
+                Ints.asList(1),
+                ImmutableList.copyOf(new SortOrder[] {SortOrder.ASC_NULLS_LAST}),
+                false);
+
+        DriverContext driverContext = createDriverContext(1000);
+        Operator operator = operatorFactory.createOperator(driverContext);
+        operatorFactory.noMoreOperators();
+        assertFalse(operator.isFinished());
+        assertTrue(operator.needsInput());
+        operator.addInput(input.get(0));
+        operator.finish();
+        operator.getOutput();
+
+        // this should not fail
+        operator.close();
+    }
+
     @Test(dataProvider = "spillEnabled")
     public void testLastValuePartition(boolean spillEnabled, boolean revokeMemoryWhenAddingPages, long memoryLimit)
     {
@@ -796,7 +834,7 @@ public void testFindEndPosition()
     private static void assertFindEndPosition(String values, int expected)
     {
         char[] array = values.toCharArray();
-        assertEquals(WindowOperator.findEndPosition(0, array.length, (first, second) -> array[first] == array[second]), expected);
+        assertEquals(findEndPosition(0, array.length, (first, second) -> array[first] == array[second]), expected);
     }
 
     private WindowOperatorFactory createFactoryUnbounded(
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessor.java b/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessor.java
index c2ed7a9b891d..29fecad7d132 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessor.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessor.java
@@ -18,7 +18,8 @@
 import io.trino.operator.WorkProcessor.ProcessState;
 import io.trino.operator.WorkProcessor.TransformationState;
 import io.trino.operator.WorkProcessorAssertion.Transform;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.Comparator;
 import java.util.Iterator;
@@ -85,7 +86,8 @@ public void testIteratorFailsWhenWorkProcessorIsBlocked()
                 .hasMessage("Cannot iterate over blocking WorkProcessor");
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testMergeSorted()
     {
         List<ProcessState<Integer>> firstStream = ImmutableList.of(
@@ -134,7 +136,8 @@ public void testMergeSorted()
         assertFinishes(mergedStream);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testMergeSortedEmptyStreams()
     {
         SettableFuture<Void> firstFuture = SettableFuture.create();
@@ -174,7 +177,8 @@ public void testMergeSortedEmptyStreams()
         assertFinishes(mergedStream);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testMergeSortedEmptyStreamsWithFinishedOnly()
     {
         List<ProcessState<Integer>> firstStream = ImmutableList.of(
@@ -194,7 +198,8 @@ public void testMergeSortedEmptyStreamsWithFinishedOnly()
         assertFinishes(mergedStream);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testYield()
     {
         SettableFuture<Void> future = SettableFuture.create();
@@ -234,7 +239,8 @@ public void testYield()
         assertFinishes(processor);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testBlock()
     {
         SettableFuture<Void> phase1 = SettableFuture.create();
@@ -269,7 +275,8 @@ public void testBlock()
         assertFinishes(processor);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testProcessStateMonitor()
     {
         SettableFuture<Void> future = SettableFuture.create();
@@ -294,7 +301,8 @@ public void testProcessStateMonitor()
         assertEquals(actions.build(), ImmutableList.of(RESULT, YIELD, BLOCKED, FINISHED));
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testFinished()
     {
         AtomicBoolean finished = new AtomicBoolean();
@@ -320,7 +328,8 @@ public void testFinished()
         assertFinishes(processor);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testFlatMap()
     {
         List<ProcessState<Integer>> baseScenario = ImmutableList.of(
@@ -338,7 +347,8 @@ public void testFlatMap()
         assertFinishes(processor);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testMap()
     {
         List<ProcessState<Integer>> baseScenario = ImmutableList.of(
@@ -354,7 +364,8 @@ public void testMap()
         assertFinishes(processor);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testFlatTransform()
     {
         SettableFuture<Void> baseFuture = SettableFuture.create();
@@ -441,7 +452,8 @@ public void testFlatTransform()
         assertFinishes(processor);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testTransform()
     {
         SettableFuture<Void> baseFuture = SettableFuture.create();
@@ -505,7 +517,8 @@ public void testTransform()
         assertFinishes(processor);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testCreateFrom()
     {
         SettableFuture<Void> future = SettableFuture.create();
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorOperatorAdapter.java b/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorOperatorAdapter.java
index 98cf5ac9f321..03c9e2a2a9ef 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorOperatorAdapter.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorOperatorAdapter.java
@@ -22,9 +22,10 @@
 import io.trino.spi.metrics.Metrics;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.TestingTaskContext;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.concurrent.ScheduledExecutorService;
 
@@ -33,18 +34,20 @@
 import static io.trino.operator.WorkProcessorOperatorAdapter.createAdapterOperatorFactory;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestWorkProcessorOperatorAdapter
 {
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         scheduledExecutor = newSingleThreadScheduledExecutor();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         scheduledExecutor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorPipelineSourceOperator.java b/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorPipelineSourceOperator.java
index ca0426372237..1b8a5d335fc8 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorPipelineSourceOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorPipelineSourceOperator.java
@@ -19,7 +19,6 @@
 import com.google.common.util.concurrent.SettableFuture;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
-import io.trino.Session;
 import io.trino.memory.context.MemoryTrackingContext;
 import io.trino.metadata.Split;
 import io.trino.operator.WorkProcessor.Transformation;
@@ -31,9 +30,11 @@
 import io.trino.sql.planner.LocalExecutionPlanner.OperatorFactoryWithTypes;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.TestingTaskContext;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.List;
 import java.util.Optional;
@@ -49,28 +50,31 @@
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestWorkProcessorPipelineSourceOperator
 {
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         scheduledExecutor = newSingleThreadScheduledExecutor();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         scheduledExecutor.shutdownNow();
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testWorkProcessorPipelineSourceOperator()
             throws InterruptedException
     {
@@ -342,7 +346,7 @@ public String getOperatorType()
         }
 
         @Override
-        public WorkProcessorSourceOperator create(Session session, MemoryTrackingContext memoryTrackingContext, DriverYieldSignal yieldSignal, WorkProcessor<Split> splits)
+        public WorkProcessorSourceOperator create(OperatorContext operatorContext, MemoryTrackingContext memoryTrackingContext, DriverYieldSignal yieldSignal, WorkProcessor<Split> splits)
         {
             assertNull(sourceOperator, "source operator already created");
             sourceOperator = new TestWorkProcessorSourceOperator(
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorSourceOperatorAdapter.java b/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorSourceOperatorAdapter.java
index 07007a7b44c7..5105df05d830 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorSourceOperatorAdapter.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorSourceOperatorAdapter.java
@@ -16,7 +16,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.MoreExecutors;
 import io.airlift.units.Duration;
-import io.trino.Session;
 import io.trino.memory.context.MemoryTrackingContext;
 import io.trino.metadata.Split;
 import io.trino.operator.WorkProcessorSourceOperatorAdapter.AdapterWorkProcessorSourceOperatorFactory;
@@ -25,9 +24,10 @@
 import io.trino.spi.metrics.Metrics;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.TestingTaskContext;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.concurrent.ScheduledExecutorService;
 
@@ -36,18 +36,20 @@
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestWorkProcessorSourceOperatorAdapter
 {
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         scheduledExecutor = newSingleThreadScheduledExecutor();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         scheduledExecutor.shutdownNow();
@@ -93,7 +95,7 @@ private static class TestWorkProcessorOperatorFactory
     {
         @Override
         public WorkProcessorSourceOperator create(
-                Session session,
+                OperatorContext operatorContext,
                 MemoryTrackingContext memoryTrackingContext,
                 DriverYieldSignal yieldSignal,
                 WorkProcessor<Split> splits)
diff --git a/core/trino-main/src/test/java/io/trino/operator/TestingExchangeHttpClientHandler.java b/core/trino-main/src/test/java/io/trino/operator/TestingExchangeHttpClientHandler.java
index c8c4df1b95c2..0095f3e0325b 100644
--- a/core/trino-main/src/test/java/io/trino/operator/TestingExchangeHttpClientHandler.java
+++ b/core/trino-main/src/test/java/io/trino/operator/TestingExchangeHttpClientHandler.java
@@ -38,8 +38,8 @@
 import static io.trino.server.InternalHeaders.TRINO_TASK_FAILED;
 import static io.trino.server.InternalHeaders.TRINO_TASK_INSTANCE_ID;
 import static io.trino.server.PagesResponseWriter.SERIALIZED_PAGES_MAGIC;
+import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
 import static org.testng.Assert.assertEquals;
 
 public class TestingExchangeHttpClientHandler
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/AbstractTestAggregationFunction.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/AbstractTestAggregationFunction.java
index c74e5c7c175f..f75364dad388 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/AbstractTestAggregationFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/AbstractTestAggregationFunction.java
@@ -27,8 +27,7 @@
 import io.trino.spi.function.AggregationImplementation;
 import io.trino.spi.function.WindowIndex;
 import io.trino.spi.type.Type;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Constructor;
 import java.util.List;
@@ -146,7 +145,7 @@ public void testSlidingWindow()
         pagesIndex.addPage(inputPage);
         WindowIndex windowIndex = new PagesWindowIndex(pagesIndex, 0, totalPositions - 1);
 
-        ResolvedFunction resolvedFunction = functionResolution.resolveFunction(QualifiedName.of(getFunctionName()), fromTypes(getFunctionParameterTypes()));
+        ResolvedFunction resolvedFunction = functionResolution.resolveFunction(getFunctionName(), fromTypes(getFunctionParameterTypes()));
         AggregationImplementation aggregationImplementation = functionResolution.getPlannerContext().getFunctionManager().getAggregationImplementation(resolvedFunction);
         WindowAccumulator aggregation = createWindowAccumulator(resolvedFunction, aggregationImplementation);
         int oldStart = 0;
@@ -221,7 +220,7 @@ protected void testAggregation(Object expectedValue, Block... blocks)
     {
         assertAggregation(
                 functionResolution,
-                QualifiedName.of(getFunctionName()),
+                getFunctionName(),
                 fromTypes(getFunctionParameterTypes()),
                 expectedValue,
                 blocks);
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/AbstractTestApproximateCountDistinct.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/AbstractTestApproximateCountDistinct.java
index 6af897c3231f..98634bc52845 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/AbstractTestApproximateCountDistinct.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/AbstractTestApproximateCountDistinct.java
@@ -20,7 +20,6 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.Type;
-import io.trino.sql.tree.QualifiedName;
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -156,7 +155,7 @@ private long estimateCountPartial(List<?> values, double maxStandardError)
 
     private TestingAggregationFunction getAggregationFunction()
     {
-        return FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("approx_distinct"), fromTypes(getValueType(), DOUBLE));
+        return FUNCTION_RESOLUTION.getAggregateFunction("approx_distinct", fromTypes(getValueType(), DOUBLE));
     }
 
     private Page createPage(List<?> values, double maxStandardError)
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/AbstractTestApproximateSetGeneric.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/AbstractTestApproximateSetGeneric.java
index 26a0f2f265b8..673eb6c03e96 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/AbstractTestApproximateSetGeneric.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/AbstractTestApproximateSetGeneric.java
@@ -23,9 +23,8 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.SqlVarbinary;
 import io.trino.spi.type.Type;
-import io.trino.sql.tree.QualifiedName;
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -78,7 +77,7 @@ public void testAllPositionsNull()
         List<Object> justNulls = Collections.nCopies(100, null);
         assertNull(estimateSet(justNulls));
         assertNull(estimateSetPartial(justNulls));
-        assertNull(esitmateSetGrouped(justNulls));
+        assertNull(estimateSetGrouped(justNulls));
     }
 
     @Test
@@ -95,7 +94,7 @@ public void testMixedNullsAndNonNulls()
             mixed.add(ThreadLocalRandom.current().nextBoolean() ? null : iterator.next());
         }
 
-        assertCount(mixed, esitmateSetGrouped(baseline).cardinality());
+        assertCount(mixed, estimateSetGrouped(baseline).cardinality());
     }
 
     @Test
@@ -107,7 +106,7 @@ public void testMultiplePositions()
             int uniques = ThreadLocalRandom.current().nextInt(getUniqueValuesCount()) + 1;
 
             List<Object> values = createRandomSample(uniques, (int) (uniques * 1.5));
-            long actualCount = esitmateSetGrouped(values).cardinality();
+            long actualCount = estimateSetGrouped(values).cardinality();
             double error = (actualCount - uniques) * 1.0 / uniques;
 
             stats.addValue(error);
@@ -123,7 +122,7 @@ public void testMultiplePositionsPartial()
         for (int i = 0; i < 100; ++i) {
             int uniques = ThreadLocalRandom.current().nextInt(getUniqueValuesCount()) + 1;
             List<Object> values = createRandomSample(uniques, (int) (uniques * 1.5));
-            assertEquals(estimateSetPartial(values).cardinality(), esitmateSetGrouped(values).cardinality());
+            assertEquals(estimateSetPartial(values).cardinality(), estimateSetGrouped(values).cardinality());
         }
     }
 
@@ -135,7 +134,7 @@ public void testResultStability()
             shuffle(sample);
             assertEquals(base16().encode(estimateSet(sample).serialize().getBytes()), getResultStabilityExpected());
             assertEquals(base16().encode(estimateSetPartial(sample).serialize().getBytes()), getResultStabilityExpected());
-            assertEquals(base16().encode(esitmateSetGrouped(sample).serialize().getBytes()), getResultStabilityExpected());
+            assertEquals(base16().encode(estimateSetGrouped(sample).serialize().getBytes()), getResultStabilityExpected());
         }
     }
 
@@ -146,14 +145,14 @@ public void testResultStability()
     protected void assertCount(List<?> values, long expectedCount)
     {
         if (!values.isEmpty()) {
-            HyperLogLog actualSet = esitmateSetGrouped(values);
+            HyperLogLog actualSet = estimateSetGrouped(values);
             assertEquals(actualSet.cardinality(), expectedCount);
         }
         assertEquals(estimateSet(values).cardinality(), expectedCount);
         assertEquals(estimateSetPartial(values).cardinality(), expectedCount);
     }
 
-    private HyperLogLog esitmateSetGrouped(List<?> values)
+    private HyperLogLog estimateSetGrouped(List<?> values)
     {
         SqlVarbinary hllSerialized = (SqlVarbinary) AggregationTestUtils.groupedAggregation(getAggregationFunction(), createPage(values));
         if (hllSerialized == null) {
@@ -182,7 +181,7 @@ private HyperLogLog estimateSetPartial(List<?> values)
 
     private TestingAggregationFunction getAggregationFunction()
     {
-        return FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("$approx_set"), fromTypes(getValueType()));
+        return FUNCTION_RESOLUTION.getAggregateFunction("$approx_set", fromTypes(getValueType()));
     }
 
     private Page createPage(List<?> values)
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/AggregationTestUtils.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/AggregationTestUtils.java
index 4a903227c035..d40d0e3c9443 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/AggregationTestUtils.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/AggregationTestUtils.java
@@ -17,7 +17,6 @@
 import com.google.common.primitives.Ints;
 import io.trino.block.BlockAssertions;
 import io.trino.metadata.TestingFunctionResolution;
-import io.trino.operator.GroupByIdBlock;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
@@ -25,9 +24,9 @@
 import io.trino.spi.type.BooleanType;
 import io.trino.spi.type.Type;
 import io.trino.sql.analyzer.TypeSignatureProvider;
-import io.trino.sql.tree.QualifiedName;
 import org.apache.commons.math3.util.Precision;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -35,7 +34,6 @@
 import java.util.function.BiFunction;
 import java.util.stream.IntStream;
 
-import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.sql.planner.plan.AggregationNode.Step.FINAL;
 import static io.trino.sql.planner.plan.AggregationNode.Step.PARTIAL;
@@ -48,12 +46,12 @@ public final class AggregationTestUtils
 {
     private AggregationTestUtils() {}
 
-    public static void assertAggregation(TestingFunctionResolution functionResolution, QualifiedName name, List<TypeSignatureProvider> parameterTypes, Object expectedValue, Block... blocks)
+    public static void assertAggregation(TestingFunctionResolution functionResolution, String name, List<TypeSignatureProvider> parameterTypes, Object expectedValue, Block... blocks)
     {
         assertAggregation(functionResolution, name, parameterTypes, expectedValue, new Page(blocks));
     }
 
-    public static void assertAggregation(TestingFunctionResolution functionResolution, QualifiedName name, List<TypeSignatureProvider> parameterTypes, Object expectedValue, Page page)
+    public static void assertAggregation(TestingFunctionResolution functionResolution, String name, List<TypeSignatureProvider> parameterTypes, Object expectedValue, Page page)
     {
         BiFunction<Object, Object, Boolean> equalAssertion = makeValidityAssertion(expectedValue);
 
@@ -71,7 +69,7 @@ public static BiFunction<Object, Object, Boolean> makeValidityAssertion(Object e
         return Objects::equals;
     }
 
-    public static void assertAggregation(TestingFunctionResolution functionResolution, QualifiedName name, List<TypeSignatureProvider> parameterTypes, BiFunction<Object, Object, Boolean> equalAssertion, String testDescription, Page page, Object expectedValue)
+    public static void assertAggregation(TestingFunctionResolution functionResolution, String name, List<TypeSignatureProvider> parameterTypes, BiFunction<Object, Object, Boolean> equalAssertion, String testDescription, Page page, Object expectedValue)
     {
         TestingAggregationFunction function = functionResolution.getAggregateFunction(name, parameterTypes);
 
@@ -301,12 +299,12 @@ public static Object groupedAggregation(TestingAggregationFunction function, int
     {
         GroupedAggregator groupedAggregator = function.createAggregatorFactory(SINGLE, Ints.asList(args), OptionalInt.empty()).createGroupedAggregator();
         for (Page page : pages) {
-            groupedAggregator.processPage(createGroupByIdBlock(0, page.getPositionCount()), page);
+            groupedAggregator.processPage(0, createGroupByIdBlock(0, page.getPositionCount()), page);
         }
         Object groupValue = getGroupValue(function.getFinalType(), groupedAggregator, 0);
 
         for (Page page : pages) {
-            groupedAggregator.processPage(createGroupByIdBlock(4000, page.getPositionCount()), page);
+            groupedAggregator.processPage(4000, createGroupByIdBlock(4000, page.getPositionCount()), page);
         }
         Object largeGroupValue = getGroupValue(function.getFinalType(), groupedAggregator, 4000);
         assertEquals(largeGroupValue, groupValue, "Inconsistent results with large group id");
@@ -342,27 +340,25 @@ private static Object groupedPartialAggregation(TestingAggregationFunction funct
         AggregatorFactory partialFactory = function.createAggregatorFactory(PARTIAL, Ints.asList(args), OptionalInt.empty());
         Block emptyBlock = getIntermediateBlock(function.getIntermediateType(), partialFactory.createGroupedAggregator());
 
-        finalAggregator.processPage(createGroupByIdBlock(0, emptyBlock.getPositionCount()), new Page(emptyBlock));
+        finalAggregator.processPage(0, createGroupByIdBlock(0, emptyBlock.getPositionCount()), new Page(emptyBlock));
 
         for (Page page : pages) {
             GroupedAggregator partialAggregator = partialFactory.createGroupedAggregator();
-            partialAggregator.processPage(createGroupByIdBlock(0, page.getPositionCount()), page);
+            partialAggregator.processPage(0, createGroupByIdBlock(0, page.getPositionCount()), page);
             Block partialBlock = getIntermediateBlock(function.getIntermediateType(), partialAggregator);
-            finalAggregator.processPage(createGroupByIdBlock(0, partialBlock.getPositionCount()), new Page(partialBlock));
+            finalAggregator.processPage(0, createGroupByIdBlock(0, partialBlock.getPositionCount()), new Page(partialBlock));
         }
 
-        finalAggregator.processPage(createGroupByIdBlock(0, emptyBlock.getPositionCount()), new Page(emptyBlock));
+        finalAggregator.processPage(0, createGroupByIdBlock(0, emptyBlock.getPositionCount()), new Page(emptyBlock));
 
         return getGroupValue(function.getFinalType(), finalAggregator, 0);
     }
 
-    public static GroupByIdBlock createGroupByIdBlock(int groupId, int positions)
+    public static int[] createGroupByIdBlock(int groupId, int positions)
     {
-        BlockBuilder blockBuilder = BIGINT.createBlockBuilder(null, positions);
-        for (int i = 0; i < positions; i++) {
-            BIGINT.writeLong(blockBuilder, groupId);
-        }
-        return new GroupByIdBlock(groupId, blockBuilder.build());
+        int[] groupIds = new int[positions];
+        Arrays.fill(groupIds, groupId);
+        return groupIds;
     }
 
     static int[] createArgs(int parameterCount)
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkAggregationMaskBuilder.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkAggregationMaskBuilder.java
new file mode 100644
index 000000000000..cb606d0fb6ec
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkAggregationMaskBuilder.java
@@ -0,0 +1,387 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.IntArrayBlock;
+import io.trino.spi.block.LongArrayBlock;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ShortArrayBlock;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.util.Optional;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+
+import static io.trino.jmh.Benchmarks.benchmark;
+import static io.trino.operator.aggregation.AggregationMaskCompiler.generateAggregationMaskBuilder;
+
+@State(Scope.Thread)
+@OutputTimeUnit(TimeUnit.SECONDS)
+@Fork(value = 1, jvmArgsAppend = "-XX:+UnlockDiagnosticVMOptions")
+@Warmup(iterations = 10, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 10, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+public class BenchmarkAggregationMaskBuilder
+{
+    private final AggregationMaskBuilder rleNoNullsBuilder = new InterpretedAggregationMaskBuilder(0, 3, 6);
+    private final AggregationMaskBuilder rleNoNullsBuilderCurrent = new CurrentAggregationMaskBuilder(0, 3, 6);
+    private final AggregationMaskBuilder rleNoNullsBuilderHandCoded = new HandCodedAggregationMaskBuilder(0, 3, 6);
+    private final AggregationMaskBuilder rleNoNullsBuilderCompiled = compiledMaskBuilder(0, 3, 6);
+
+    private final AggregationMaskBuilder noNullsBuilder = new InterpretedAggregationMaskBuilder(1, 4, 7);
+    private final AggregationMaskBuilder noNullsBuilderCurrent = new CurrentAggregationMaskBuilder(1, 4, 7);
+    private final AggregationMaskBuilder noNullsBuilderHandCoded = new HandCodedAggregationMaskBuilder(1, 4, 7);
+    private final AggregationMaskBuilder noNullsBuilderCompiled = compiledMaskBuilder(1, 4, 7);
+
+    private final AggregationMaskBuilder someNullsBuilder = new InterpretedAggregationMaskBuilder(2, 5, 8);
+    private final AggregationMaskBuilder someNullsBuilderCurrent = new CurrentAggregationMaskBuilder(2, 5, 8);
+    private final AggregationMaskBuilder someNullsBuilderHandCoded = new HandCodedAggregationMaskBuilder(2, 5, 8);
+    private final AggregationMaskBuilder someNullsBuilderCompiled = compiledMaskBuilder(2, 5, 8);
+
+    private final AggregationMaskBuilder oneBlockSomeNullsBuilder = new InterpretedAggregationMaskBuilder(2);
+    private final AggregationMaskBuilder oneBlockSomeNullsBuilderCurrent = new CurrentAggregationMaskBuilder(2, -1, -1);
+    private final AggregationMaskBuilder oneBlockSomeNullsBuilderHandCoded = new HandCodedAggregationMaskBuilder(2, -1, -1);
+    private final AggregationMaskBuilder oneBlockSomeNullsBuilderCompiled = compiledMaskBuilder(2);
+
+    private final AggregationMaskBuilder allBlocksBuilder = new InterpretedAggregationMaskBuilder(0, 1, 2, 3, 4, 5, 6, 7, 8);
+    private final AggregationMaskBuilder allBlocksBuilderCompiled = compiledMaskBuilder(0, 1, 2, 3, 4, 5, 6, 7, 8);
+
+    private Page arguments;
+
+    @Setup
+    public void setup()
+            throws Throwable
+    {
+        int positions = 10_000;
+
+        Block shortRleNoNulls = RunLengthEncodedBlock.create(new ShortArrayBlock(1, Optional.empty(), new short[] {42}), positions);
+        Block shortNoNulls = new ShortArrayBlock(new long[positions].length, Optional.empty(), new short[positions]);
+        Block shortSomeNulls = new ShortArrayBlock(new long[positions].length, someNulls(positions, 0.3), new short[positions]);
+
+        Block intRleNoNulls = RunLengthEncodedBlock.create(new IntArrayBlock(1, Optional.empty(), new int[] {42}), positions);
+        Block intNoNulls = new IntArrayBlock(new long[positions].length, Optional.empty(), new int[positions]);
+        Block intSomeNulls = new IntArrayBlock(new long[positions].length, someNulls(positions, 0.3), new int[positions]);
+
+        Block longRleNoNulls = RunLengthEncodedBlock.create(new LongArrayBlock(1, Optional.empty(), new long[] {42}), positions);
+        Block longNoNulls = new LongArrayBlock(new long[positions].length, Optional.empty(), new long[positions]);
+        Block longSomeNulls = new LongArrayBlock(new long[positions].length, someNulls(positions, 0.3), new long[positions]);
+
+        Block rleAllNulls = RunLengthEncodedBlock.create(new ShortArrayBlock(1, Optional.of(new boolean[] {true}), new short[] {42}), positions);
+
+        arguments = new Page(
+                shortRleNoNulls,
+                shortNoNulls,
+                shortSomeNulls,
+                intRleNoNulls,
+                intNoNulls,
+                intSomeNulls,
+                longRleNoNulls,
+                longNoNulls,
+                longSomeNulls,
+                rleAllNulls);
+    }
+
+    private static Optional<boolean[]> someNulls(int positions, double nullRatio)
+    {
+        boolean[] nulls = new boolean[positions];
+        for (int i = 0; i < nulls.length; i++) {
+            // 0.7 ^ 3 = 0.343
+            nulls[i] = ThreadLocalRandom.current().nextDouble() < nullRatio;
+        }
+        return Optional.of(nulls);
+    }
+
+    @Benchmark
+    public Object rleNoNullsBlocksInterpreted()
+    {
+        return rleNoNullsBuilder.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object rleNoNullsBlocksCurrent()
+    {
+        return rleNoNullsBuilderCurrent.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object rleNoNullsBlocksHandCoded()
+    {
+        return rleNoNullsBuilderHandCoded.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object rleNoNullsBlocksCompiled()
+    {
+        return rleNoNullsBuilderCompiled.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object noNullsBlocksInterpreted()
+    {
+        return noNullsBuilder.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object noNullsBlocksCurrent()
+    {
+        return noNullsBuilderCurrent.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object noNullsBlocksHandCoded()
+    {
+        return noNullsBuilderHandCoded.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object noNullsBlocksCompiled()
+    {
+        return noNullsBuilderCompiled.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object someNullsBlocksInterpreted()
+    {
+        return someNullsBuilder.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object someNullsBlocksCurrent()
+    {
+        return someNullsBuilderCurrent.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object someNullsBlocksHandCoded()
+    {
+        return someNullsBuilderHandCoded.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object someNullsBlocksCompiled()
+    {
+        return someNullsBuilderCompiled.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object oneBlockSomeNullsInterpreted()
+    {
+        return oneBlockSomeNullsBuilder.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object oneBlockSomeNullsCurrent()
+    {
+        return oneBlockSomeNullsBuilderCurrent.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object oneBlockSomeNullsHandCoded()
+    {
+        return oneBlockSomeNullsBuilderHandCoded.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object oneBlockSomeNullsCompiled()
+    {
+        return oneBlockSomeNullsBuilderCompiled.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object allBlocksInterpreted()
+    {
+        return allBlocksBuilder.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    @Benchmark
+    public Object allBlocksCompiled()
+    {
+        return allBlocksBuilderCompiled.buildAggregationMask(arguments, Optional.empty());
+    }
+
+    public static void main(String[] args)
+            throws Throwable
+    {
+        BenchmarkAggregationMaskBuilder bench = new BenchmarkAggregationMaskBuilder();
+        bench.setup();
+        bench.rleNoNullsBlocksInterpreted();
+        bench.noNullsBlocksInterpreted();
+        bench.someNullsBlocksInterpreted();
+        bench.allBlocksInterpreted();
+        bench.someNullsBlocksCurrent();
+        bench.someNullsBlocksHandCoded();
+        bench.someNullsBlocksCompiled();
+
+        benchmark(BenchmarkAggregationMaskBuilder.class).run();
+    }
+
+    private static class CurrentAggregationMaskBuilder
+            implements AggregationMaskBuilder
+    {
+        private final int first;
+        private final int second;
+        private final int third;
+
+        private final AggregationMask mask = AggregationMask.createSelectAll(0);
+
+        public CurrentAggregationMaskBuilder(int first, int second, int third)
+        {
+            this.first = first;
+            this.second = second;
+            this.third = third;
+        }
+
+        @Override
+        public AggregationMask buildAggregationMask(Page arguments, Optional<Block> optionalMaskBlock)
+        {
+            int positionCount = arguments.getPositionCount();
+            mask.reset(positionCount);
+            mask.applyMaskBlock(optionalMaskBlock.orElse(null));
+            if (first >= 0) {
+                mask.unselectNullPositions(arguments.getBlock(first));
+            }
+            if (second >= 0) {
+                mask.unselectNullPositions(arguments.getBlock(second));
+            }
+            if (third >= 0) {
+                mask.unselectNullPositions(arguments.getBlock(third));
+            }
+            return mask;
+        }
+    }
+
+    private static class HandCodedAggregationMaskBuilder
+            implements AggregationMaskBuilder
+    {
+        private final int first;
+        private final int second;
+        private final int third;
+
+        public HandCodedAggregationMaskBuilder(int first, int second, int third)
+        {
+            this.first = first;
+            this.second = second;
+            this.third = third;
+        }
+
+        private int[] selectedPositions = new int[0];
+
+        @Override
+        public AggregationMask buildAggregationMask(Page arguments, Optional<Block> optionalMaskBlock)
+        {
+            int positionCount = arguments.getPositionCount();
+
+            // if page is empty, we are done
+            if (positionCount == 0) {
+                return AggregationMask.createSelectNone(positionCount);
+            }
+
+            Block maskBlock = optionalMaskBlock.orElse(null);
+            boolean hasMaskBlock = maskBlock != null;
+            boolean maskBlockMayHaveNull = hasMaskBlock && maskBlock.mayHaveNull();
+            if (maskBlock instanceof RunLengthEncodedBlock rle) {
+                Block value = rle.getValue();
+                if (!(value == null ||
+                        ((!maskBlockMayHaveNull || !value.isNull(0)) &&
+                                value.getByte(0, 0) != 0))) {
+                    return AggregationMask.createSelectNone(positionCount);
+                }
+                // mask block is always true, so do not evaluate mask block
+                hasMaskBlock = false;
+                maskBlockMayHaveNull = false;
+            }
+
+            Block nonNullArg0 = first < 0 ? null : arguments.getBlock(first);
+            if (isAlwaysNull(nonNullArg0)) {
+                return AggregationMask.createSelectNone(positionCount);
+            }
+            boolean nonNullArg0MayHaveNull = nonNullArg0 != null && nonNullArg0.mayHaveNull();
+
+            Block nonNullArg1 = third < 0 ? null : arguments.getBlock(second);
+            if (isAlwaysNull(nonNullArg1)) {
+                return AggregationMask.createSelectNone(positionCount);
+            }
+            boolean nonNullArg1MayHaveNull = nonNullArg1 != null && nonNullArg1.mayHaveNull();
+
+            Block nonNullArgN = third < 0 ? null : arguments.getBlock(third);
+            if (isAlwaysNull(nonNullArgN)) {
+                return AggregationMask.createSelectNone(positionCount);
+            }
+            boolean nonNullArgNMayHaveNull = nonNullArgN != null && nonNullArgN.mayHaveNull();
+
+            // if there is no mask block, and all non-null arguments do not have nulls, we are done
+            if (!hasMaskBlock && !nonNullArg0MayHaveNull && !nonNullArg1MayHaveNull && !nonNullArgNMayHaveNull) {
+                return AggregationMask.createSelectAll(positionCount);
+            }
+
+            // grow the selection array if necessary
+            int[] selectedPositions = this.selectedPositions;
+            if (selectedPositions.length < positionCount) {
+                selectedPositions = new int[positionCount];
+                this.selectedPositions = selectedPositions;
+            }
+
+            // add all positions that pass the tests
+            int selectedPositionsIndex = 0;
+            for (int position = 0; position < positionCount; position++) {
+                if ((maskBlock == null || ((!maskBlockMayHaveNull || !maskBlock.isNull(position)) && maskBlock.getByte(position, 0) != 0)) &&
+                        (!nonNullArg0MayHaveNull || !nonNullArg0.isNull(position)) &&
+                        (!nonNullArg1MayHaveNull || !nonNullArg1.isNull(position)) &&
+                        (!nonNullArgNMayHaveNull || !nonNullArgN.isNull(position))) {
+                    selectedPositions[selectedPositionsIndex] = position;
+                    selectedPositionsIndex++;
+                }
+            }
+            return AggregationMask.createSelectedPositions(positionCount, selectedPositions, selectedPositionsIndex);
+        }
+    }
+
+    private static boolean isAlwaysNull(Block block)
+    {
+        if (block instanceof RunLengthEncodedBlock rle) {
+            return rle.getValue().isNull(0);
+        }
+        return false;
+    }
+
+    private static boolean testMaskBlock(Block block, boolean mayHaveNulls, int position)
+    {
+        return block == null ||
+                ((!mayHaveNulls || !block.isNull(position)) &&
+                        block.getByte(position, 0) != 0);
+    }
+
+    private static boolean isNotNull(Block block, boolean mayHaveNulls, int position)
+    {
+        return !mayHaveNulls || !block.isNull(position);
+    }
+
+    private static AggregationMaskBuilder compiledMaskBuilder(int... ints)
+    {
+        try {
+            return generateAggregationMaskBuilder(ints).newInstance();
+        }
+        catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkArrayAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkArrayAggregation.java
index 18230f9820ad..c3c6a37e032f 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkArrayAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkArrayAggregation.java
@@ -20,7 +20,6 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.Type;
-import io.trino.sql.tree.QualifiedName;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -97,7 +96,7 @@ public void setup()
                 default:
                     throw new UnsupportedOperationException();
             }
-            TestingAggregationFunction function = new TestingFunctionResolution().getAggregateFunction(QualifiedName.of("array_agg"), fromTypes(elementType));
+            TestingAggregationFunction function = new TestingFunctionResolution().getAggregateFunction("array_agg", fromTypes(elementType));
             aggregator = function.createAggregatorFactory(SINGLE, ImmutableList.of(0), OptionalInt.empty()).createAggregator();
 
             block = createChannel(ARRAY_SIZE, elementType);
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkDecimalAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkDecimalAggregation.java
index 74f872996c38..a5512eba0ec5 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkDecimalAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkDecimalAggregation.java
@@ -16,13 +16,12 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.jmh.Benchmarks;
 import io.trino.metadata.TestingFunctionResolution;
-import io.trino.operator.GroupByIdBlock;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.Int128;
-import io.trino.sql.tree.QualifiedName;
+import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -36,18 +35,16 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.options.WarmupMode;
-import org.testng.annotations.Test;
 
 import java.util.OptionalInt;
-import java.util.concurrent.ThreadLocalRandom;
+import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
-import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.block.BlockAssertions.createRandomBlockForType;
 import static io.trino.spi.type.DecimalType.createDecimalType;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.planner.plan.AggregationNode.Step.FINAL;
 import static io.trino.sql.planner.plan.AggregationNode.Step.PARTIAL;
-import static java.lang.Math.toIntExact;
 import static org.testng.Assert.assertEquals;
 
 @State(Scope.Thread)
@@ -58,6 +55,7 @@
 @BenchmarkMode(Mode.AverageTime)
 public class BenchmarkDecimalAggregation
 {
+    private static final Random RANDOM = new Random(633969769);
     private static final int ELEMENT_COUNT = 1_000_000;
 
     @Benchmark
@@ -65,7 +63,7 @@ public class BenchmarkDecimalAggregation
     public GroupedAggregator benchmark(BenchmarkData data)
     {
         GroupedAggregator aggregator = data.getPartialAggregatorFactory().createGroupedAggregator();
-        aggregator.processPage(data.getGroupIds(), data.getValues());
+        aggregator.processPage(data.getGroupCount(), data.getGroupIds(), data.getValues());
         return aggregator;
     }
 
@@ -74,7 +72,7 @@ public GroupedAggregator benchmark(BenchmarkData data)
     public Block benchmarkEvaluateIntermediate(BenchmarkData data)
     {
         GroupedAggregator aggregator = data.getPartialAggregatorFactory().createGroupedAggregator();
-        aggregator.processPage(data.getGroupIds(), data.getValues());
+        aggregator.processPage(data.getGroupCount(), data.getGroupIds(), data.getValues());
         BlockBuilder builder = aggregator.getType().createBlockBuilder(null, data.getGroupCount());
         for (int groupId = 0; groupId < data.getGroupCount(); groupId++) {
             aggregator.evaluate(groupId, builder);
@@ -87,8 +85,8 @@ public Block benchmarkEvaluateFinal(BenchmarkData data)
     {
         GroupedAggregator aggregator = data.getFinalAggregatorFactory().createGroupedAggregator();
         // Add the intermediate input multiple times to invoke the combine behavior
-        aggregator.processPage(data.getGroupIds(), data.getIntermediateValues());
-        aggregator.processPage(data.getGroupIds(), data.getIntermediateValues());
+        aggregator.processPage(data.getGroupCount(), data.getGroupIds(), data.getIntermediateValues());
+        aggregator.processPage(data.getGroupCount(), data.getGroupIds(), data.getIntermediateValues());
         BlockBuilder builder = aggregator.getType().createBlockBuilder(null, data.getGroupCount());
         for (int groupId = 0; groupId < data.getGroupCount(); groupId++) {
             aggregator.evaluate(groupId, builder);
@@ -108,9 +106,12 @@ public static class BenchmarkData
         @Param({"10", "1000"})
         private int groupCount = 10;
 
+        @Param({"0.0", "0.05"})
+        private float nullRate;
+
         private AggregatorFactory partialAggregatorFactory;
         private AggregatorFactory finalAggregatorFactory;
-        private GroupByIdBlock groupIds;
+        private int[] groupIds;
         private Page values;
         private Page intermediateValues;
 
@@ -122,45 +123,41 @@ public void setup()
             switch (type) {
                 case "SHORT": {
                     DecimalType type = createDecimalType(14, 3);
-                    values = createValues(functionResolution, type, type::writeLong);
+                    values = createValues(functionResolution, type);
                     break;
                 }
                 case "LONG": {
                     DecimalType type = createDecimalType(30, 10);
-                    values = createValues(functionResolution, type, (builder, value) -> type.writeObject(builder, Int128.valueOf(value)));
+                    values = createValues(functionResolution, type);
                     break;
                 }
             }
 
-            BlockBuilder ids = BIGINT.createBlockBuilder(null, ELEMENT_COUNT);
+            int[] ids = new int[ELEMENT_COUNT];
             for (int i = 0; i < ELEMENT_COUNT; i++) {
-                BIGINT.writeLong(ids, ThreadLocalRandom.current().nextLong(groupCount));
+                ids[i] = RANDOM.nextInt(groupCount);
             }
-            groupIds = new GroupByIdBlock(groupCount, ids.build());
+            groupIds = ids;
             intermediateValues = new Page(createIntermediateValues(partialAggregatorFactory.createGroupedAggregator(), groupIds, values));
         }
 
-        private Block createIntermediateValues(GroupedAggregator aggregator, GroupByIdBlock groupIds, Page inputPage)
+        private Block createIntermediateValues(GroupedAggregator aggregator, int[] groupIds, Page inputPage)
         {
-            aggregator.processPage(groupIds, inputPage);
-            BlockBuilder builder = aggregator.getType().createBlockBuilder(null, toIntExact(groupIds.getGroupCount()));
-            for (int groupId = 0; groupId < groupIds.getGroupCount(); groupId++) {
+            aggregator.processPage(groupCount, groupIds, inputPage);
+            BlockBuilder builder = aggregator.getType().createBlockBuilder(null, groupCount);
+            for (int groupId = 0; groupId < groupCount; groupId++) {
                 aggregator.evaluate(groupId, builder);
             }
             return builder.build();
         }
 
-        private Page createValues(TestingFunctionResolution functionResolution, DecimalType type, ValueWriter writer)
+        private Page createValues(TestingFunctionResolution functionResolution, Type type)
         {
-            TestingAggregationFunction implementation = functionResolution.getAggregateFunction(QualifiedName.of(function), fromTypes(type));
+            TestingAggregationFunction implementation = functionResolution.getAggregateFunction(function, fromTypes(type));
             partialAggregatorFactory = implementation.createAggregatorFactory(PARTIAL, ImmutableList.of(0), OptionalInt.empty());
             finalAggregatorFactory = implementation.createAggregatorFactory(FINAL, ImmutableList.of(0), OptionalInt.empty());
 
-            BlockBuilder builder = type.createBlockBuilder(null, ELEMENT_COUNT);
-            for (int i = 0; i < ELEMENT_COUNT; i++) {
-                writer.write(builder, i);
-            }
-            return new Page(builder.build());
+            return new Page(createRandomBlockForType(type, ELEMENT_COUNT, nullRate));
         }
 
         public AggregatorFactory getPartialAggregatorFactory()
@@ -178,7 +175,7 @@ public Page getValues()
             return values;
         }
 
-        public GroupByIdBlock getGroupIds()
+        public int[] getGroupIds()
         {
             return groupIds;
         }
@@ -192,11 +189,6 @@ public Page getIntermediateValues()
         {
             return intermediateValues;
         }
-
-        interface ValueWriter
-        {
-            void write(BlockBuilder valuesBuilder, int value);
-        }
     }
 
     @Test
@@ -205,7 +197,7 @@ public void verify()
         BenchmarkData data = new BenchmarkData();
         data.setup();
 
-        assertEquals(data.groupIds.getPositionCount(), data.getValues().getPositionCount());
+        assertEquals(data.getGroupIds().length, data.getValues().getPositionCount());
 
         new BenchmarkDecimalAggregation().benchmark(data);
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkGroupedTypedHistogram.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkGroupedTypedHistogram.java
index a0d36e17485f..c7d9421fd122 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkGroupedTypedHistogram.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/BenchmarkGroupedTypedHistogram.java
@@ -15,10 +15,9 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.metadata.TestingFunctionResolution;
-import io.trino.operator.GroupByIdBlock;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.sql.tree.QualifiedName;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
@@ -75,14 +74,16 @@ public static class Data
 
         private final Random random = new Random();
         private Page[] pages;
-        private GroupByIdBlock[] groupByIdBlocks;
+        private int[] groupCounts;
+        private int[][] groupByIdBlocks;
         private GroupedAggregator groupedAggregator;
 
         @Setup
         public void setUp()
         {
             pages = new Page[numGroups];
-            groupByIdBlocks = new GroupByIdBlock[numGroups];
+            groupCounts = new int[numGroups];
+            groupByIdBlocks = new int[numGroups][];
 
             for (int j = 0; j < numGroups; j++) {
                 List<String> valueList = new ArrayList<>();
@@ -104,9 +105,10 @@ public void setUp()
 
                 Block block = createStringsBlock(valueList);
                 Page page = new Page(block);
-                GroupByIdBlock groupByIdBlock = AggregationTestUtils.createGroupByIdBlock(j, page.getPositionCount());
+                int[] groupByIdBlock = AggregationTestUtils.createGroupByIdBlock(j, page.getPositionCount());
 
                 pages[j] = page;
+                groupCounts[j] = j;
                 groupByIdBlocks[j] = groupByIdBlock;
             }
 
@@ -122,9 +124,10 @@ public GroupedAggregator testSharedGroupWithLargeBlocksRunner(Data data)
         GroupedAggregator groupedAggregator = data.groupedAggregator;
 
         for (int i = 0; i < data.numGroups; i++) {
-            GroupByIdBlock groupByIdBlock = data.groupByIdBlocks[i];
+            int groupCount = data.groupCounts[i];
+            int[] groupByIdBlock = data.groupByIdBlocks[i];
             Page page = data.pages[i];
-            groupedAggregator.processPage(groupByIdBlock, page);
+            groupedAggregator.processPage(groupCount, groupByIdBlock, page);
         }
 
         return groupedAggregator;
@@ -133,7 +136,15 @@ public GroupedAggregator testSharedGroupWithLargeBlocksRunner(Data data)
     private static TestingAggregationFunction getInternalAggregationFunctionVarChar()
     {
         TestingFunctionResolution functionResolution = new TestingFunctionResolution();
-        return functionResolution.getAggregateFunction(QualifiedName.of("histogram"), fromTypes(VARCHAR));
+        return functionResolution.getAggregateFunction("histogram", fromTypes(VARCHAR));
+    }
+
+    @Test
+    public void test()
+    {
+        Data data = new Data();
+        data.setUp();
+        testSharedGroupWithLargeBlocksRunner(data);
     }
 
     public static void main(String[] args)
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/InterpretedAggregationMaskBuilder.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/InterpretedAggregationMaskBuilder.java
new file mode 100644
index 000000000000..c6302f21910d
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/InterpretedAggregationMaskBuilder.java
@@ -0,0 +1,138 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.RunLengthEncodedBlock;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+
+public class InterpretedAggregationMaskBuilder
+        implements AggregationMaskBuilder
+{
+    private final List<ChannelNullCheck> nullChecks;
+    private int[] selectedPositions = new int[0];
+
+    public InterpretedAggregationMaskBuilder(int... nonNullArguments)
+    {
+        this.nullChecks = Arrays.stream(nonNullArguments)
+                .mapToObj(ChannelNullCheck::new)
+                .collect(toImmutableList());
+    }
+
+    @Override
+    public AggregationMask buildAggregationMask(Page arguments, Optional<Block> optionalMaskBlock)
+    {
+        int positionCount = arguments.getPositionCount();
+
+        // if page is empty, we are done
+        if (positionCount == 0) {
+            return AggregationMask.createSelectNone(positionCount);
+        }
+
+        Block maskBlock = optionalMaskBlock.orElse(null);
+        boolean hasMaskBlock = maskBlock != null;
+        boolean maskBlockMayHaveNull = hasMaskBlock && maskBlock.mayHaveNull();
+        if (maskBlock instanceof RunLengthEncodedBlock rle) {
+            if (!testMaskBlock(rle.getValue(), maskBlockMayHaveNull, 0)) {
+                return AggregationMask.createSelectNone(positionCount);
+            }
+            // mask block is always true, so do not evaluate mask block
+            hasMaskBlock = false;
+            maskBlockMayHaveNull = false;
+        }
+
+        for (ChannelNullCheck nullCheck : nullChecks) {
+            nullCheck.reset(arguments);
+            if (nullCheck.isAlwaysNull()) {
+                return AggregationMask.createSelectNone(positionCount);
+            }
+        }
+
+        // if there is no mask block, and all non-null arguments do not have nulls, we are done
+        if (!hasMaskBlock && nullChecks.stream().noneMatch(ChannelNullCheck::mayHaveNull)) {
+            return AggregationMask.createSelectAll(positionCount);
+        }
+
+        // grow the selection array if necessary
+        int[] selectedPositions = this.selectedPositions;
+        if (selectedPositions.length < positionCount) {
+            selectedPositions = new int[positionCount];
+            this.selectedPositions = selectedPositions;
+        }
+
+        // add all positions that pass the tests
+        int selectedPositionsIndex = 0;
+        for (int i = 0; i < positionCount; i++) {
+            int position = i;
+            if (testMaskBlock(maskBlock, maskBlockMayHaveNull, position) && nullChecks.stream().allMatch(arg -> arg.isNotNull(position))) {
+                selectedPositions[selectedPositionsIndex] = position;
+                selectedPositionsIndex++;
+            }
+        }
+        return AggregationMask.createSelectedPositions(positionCount, selectedPositions, selectedPositionsIndex);
+    }
+
+    private static boolean testMaskBlock(Block block, boolean mayHaveNulls, int position)
+    {
+        if (block == null) {
+            return true;
+        }
+        if (mayHaveNulls && block.isNull(position)) {
+            return false;
+        }
+        return block.getByte(position, 0) != 0;
+    }
+
+    private static final class ChannelNullCheck
+    {
+        private final int channel;
+        private Block block;
+        private boolean mayHaveNull;
+
+        public ChannelNullCheck(int channel)
+        {
+            this.channel = channel;
+        }
+
+        public void reset(Page arguments)
+        {
+            block = arguments.getBlock(channel);
+            mayHaveNull = block.mayHaveNull();
+        }
+
+        public boolean mayHaveNull()
+        {
+            return mayHaveNull;
+        }
+
+        private boolean isAlwaysNull()
+        {
+            if (block instanceof RunLengthEncodedBlock rle) {
+                return rle.getValue().isNull(0);
+            }
+            return false;
+        }
+
+        private boolean isNotNull(int position)
+        {
+            return !mayHaveNull || !block.isNull(position);
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAccumulatorCompiler.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAccumulatorCompiler.java
index 0722e170e7c5..0d2561864be8 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAccumulatorCompiler.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAccumulatorCompiler.java
@@ -23,7 +23,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.Int96ArrayBlock;
+import io.trino.spi.block.Fixed12Block;
 import io.trino.spi.block.LongArrayBlockBuilder;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateFactory;
@@ -35,12 +35,14 @@
 import io.trino.spi.type.RealType;
 import io.trino.spi.type.TimestampType;
 import io.trino.sql.gen.IsolatedClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Constructor;
 import java.util.Optional;
 
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
+import static io.trino.operator.aggregation.AccumulatorCompiler.generateAccumulatorFactory;
 import static io.trino.operator.aggregation.AggregationFunctionAdapter.AggregationParameterKind.INPUT_CHANNEL;
 import static io.trino.operator.aggregation.AggregationFunctionAdapter.AggregationParameterKind.STATE;
 import static io.trino.operator.aggregation.AggregationFunctionAdapter.normalizeInputMethod;
@@ -53,15 +55,28 @@ public class TestAccumulatorCompiler
 {
     @Test
     public void testAccumulatorCompilerForTypeSpecificObjectParameter()
+    {
+        testAccumulatorCompilerForTypeSpecificObjectParameter(true);
+        testAccumulatorCompilerForTypeSpecificObjectParameter(false);
+    }
+
+    private void testAccumulatorCompilerForTypeSpecificObjectParameter(boolean specializedLoops)
     {
         TimestampType parameterType = TimestampType.TIMESTAMP_NANOS;
         assertThat(parameterType.getJavaType()).isEqualTo(LongTimestamp.class);
-        assertGenerateAccumulator(LongTimestampAggregation.class, LongTimestampAggregationState.class);
+        assertGenerateAccumulator(LongTimestampAggregation.class, LongTimestampAggregationState.class, specializedLoops);
     }
 
     @Test
     public void testAccumulatorCompilerForTypeSpecificObjectParameterSeparateClassLoader()
             throws Exception
+    {
+        testAccumulatorCompilerForTypeSpecificObjectParameterSeparateClassLoader(true);
+        testAccumulatorCompilerForTypeSpecificObjectParameterSeparateClassLoader(false);
+    }
+
+    private void testAccumulatorCompilerForTypeSpecificObjectParameterSeparateClassLoader(boolean specializedLoops)
+            throws Exception
     {
         TimestampType parameterType = TimestampType.TIMESTAMP_NANOS;
         assertThat(parameterType.getJavaType()).isEqualTo(LongTimestamp.class);
@@ -79,15 +94,18 @@ public void testAccumulatorCompilerForTypeSpecificObjectParameterSeparateClassLo
         assertThat(aggregation.getCanonicalName()).isEqualTo(LongTimestampAggregation.class.getCanonicalName());
         assertThat(aggregation).isNotSameAs(LongTimestampAggregation.class);
 
-        assertGenerateAccumulator(aggregation, stateInterface);
+        assertGenerateAccumulator(aggregation, stateInterface, specializedLoops);
     }
 
-    private static <S extends AccumulatorState, A> void assertGenerateAccumulator(Class<A> aggregation, Class<S> stateInterface)
+    private static <S extends AccumulatorState, A> void assertGenerateAccumulator(Class<A> aggregation, Class<S> stateInterface, boolean specializedLoops)
     {
         AccumulatorStateSerializer<S> stateSerializer = StateCompiler.generateStateSerializer(stateInterface);
         AccumulatorStateFactory<S> stateFactory = StateCompiler.generateStateFactory(stateInterface);
 
-        BoundSignature signature = new BoundSignature("longTimestampAggregation", RealType.REAL, ImmutableList.of(TIMESTAMP_PICOS));
+        BoundSignature signature = new BoundSignature(
+                builtinFunctionName("longTimestampAggregation"),
+                RealType.REAL,
+                ImmutableList.of(TIMESTAMP_PICOS));
         MethodHandle inputFunction = methodHandle(aggregation, "input", stateInterface, LongTimestamp.class);
         inputFunction = normalizeInputMethod(inputFunction, signature, STATE, INPUT_CHANNEL);
         MethodHandle combineFunction = methodHandle(aggregation, "combine", stateInterface, stateInterface);
@@ -101,7 +119,7 @@ private static <S extends AccumulatorState, A> void assertGenerateAccumulator(Cl
         FunctionNullability functionNullability = new FunctionNullability(false, ImmutableList.of(false));
 
         // test if we can compile aggregation
-        AccumulatorFactory accumulatorFactory = AccumulatorCompiler.generateAccumulatorFactory(signature, implementation, functionNullability);
+        AccumulatorFactory accumulatorFactory = generateAccumulatorFactory(signature, implementation, functionNullability, specializedLoops);
         assertThat(accumulatorFactory).isNotNull();
 
         // compile window aggregation
@@ -201,7 +219,7 @@ public void appendTo(int channel, int position, BlockBuilder output)
         @Override
         public Block getRawBlock(int channel, int position)
         {
-            return new Int96ArrayBlock(1, Optional.empty(), new long[] {0}, new int[] {0});
+            return new Fixed12Block(1, Optional.empty(), new int[] {0, 0, 0});
         }
 
         @Override
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAggregationLoopBuilder.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAggregationLoopBuilder.java
new file mode 100644
index 000000000000..53d55a59df6d
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAggregationLoopBuilder.java
@@ -0,0 +1,168 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.DictionaryBlock;
+import io.trino.spi.block.IntArrayBlock;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.function.AggregationState;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.SqlNullable;
+import io.trino.spi.function.SqlType;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.lang.invoke.MethodHandle;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import static io.trino.operator.aggregation.AggregationLoopBuilder.buildLoop;
+import static java.lang.invoke.MethodHandles.lookup;
+import static java.lang.invoke.MethodType.methodType;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestAggregationLoopBuilder
+{
+    private static final MethodHandle INPUT_FUNCTION;
+    private static final Object LAMBDA_A = "lambda a";
+    private static final Object LAMBDA_B = 1234L;
+
+    static {
+        try {
+            INPUT_FUNCTION = lookup().findStatic(
+                    TestAggregationLoopBuilder.class,
+                    "input",
+                    methodType(void.class, InvocationList.class, ValueBlock.class, int.class, ValueBlock.class, int.class, Object.class, Object.class));
+        }
+        catch (ReflectiveOperationException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    private MethodHandle loop;
+    private List<TestParameter> keyBlocks;
+    private List<TestParameter> valueBlocks;
+
+    @BeforeClass
+    public void setUp()
+            throws ReflectiveOperationException
+    {
+        loop = buildLoop(INPUT_FUNCTION, 1, 2, false);
+
+        ValueBlock keyBasic = new IntArrayBlock(5, Optional.empty(), new int[] {10, 11, 12, 13, 14});
+        ValueBlock keyRleValue = new IntArrayBlock(1, Optional.empty(), new int[] {33});
+        ValueBlock keyDictionary = new IntArrayBlock(3, Optional.empty(), new int[] {55, 54, 53});
+
+        keyBlocks = ImmutableList.<TestParameter>builder()
+                .add(new TestParameter(keyBasic, keyBasic, new int[] {0, 1, 2, 3, 4}))
+                .add(new TestParameter(RunLengthEncodedBlock.create(keyRleValue, 5), keyRleValue, new int[] {0, 0, 0, 0, 0}))
+                .add(new TestParameter(DictionaryBlock.create(7, keyDictionary, new int[] {9, 9, 2, 1, 0, 1, 2}).getRegion(2, 5), keyDictionary, new int[] {2, 1, 0, 1, 2}))
+                .build();
+
+        ValueBlock valueBasic = new IntArrayBlock(5, Optional.empty(), new int[] {10, 11, 12, 13, 14});
+        ValueBlock valueRleValue = new IntArrayBlock(1, Optional.empty(), new int[] {44});
+        ValueBlock valueDictionary = new IntArrayBlock(3, Optional.empty(), new int[] {66, 65, 64});
+
+        valueBlocks = ImmutableList.<TestParameter>builder()
+                .add(new TestParameter(valueBasic, valueBasic, new int[] {0, 1, 2, 3, 4}))
+                .add(new TestParameter(RunLengthEncodedBlock.create(valueRleValue, 5), valueRleValue, new int[] {0, 0, 0, 0, 0}))
+                .add(new TestParameter(DictionaryBlock.create(7, valueDictionary, new int[] {9, 9, 0, 1, 2, 1, 0}).getRegion(2, 5), valueDictionary, new int[] {0, 1, 2, 1, 0}))
+                .build();
+    }
+
+    @Test
+    public void testSelectAll()
+            throws Throwable
+    {
+        AggregationMask mask = AggregationMask.createSelectAll(5);
+        for (TestParameter keyBlock : keyBlocks) {
+            for (TestParameter valueBlock : valueBlocks) {
+                InvocationList invocationList = new InvocationList();
+                loop.invokeExact(mask, invocationList, keyBlock.inputBlock(), valueBlock.inputBlock(), LAMBDA_A, LAMBDA_B);
+                assertThat(invocationList.getInvocations()).isEqualTo(buildExpectedInvocation(keyBlock, valueBlock, mask).getInvocations());
+            }
+        }
+    }
+
+    @Test
+    public void testMasked()
+            throws Throwable
+    {
+        AggregationMask mask = AggregationMask.createSelectedPositions(5, new int[] {1, 2, 4}, 3);
+        for (TestParameter keyBlock : keyBlocks) {
+            for (TestParameter valueBlock : valueBlocks) {
+                InvocationList invocationList = new InvocationList();
+                loop.invokeExact(mask, invocationList, keyBlock.inputBlock(), valueBlock.inputBlock(), LAMBDA_A, LAMBDA_B);
+                assertThat(invocationList.getInvocations()).isEqualTo(buildExpectedInvocation(keyBlock, valueBlock, mask).getInvocations());
+            }
+        }
+    }
+
+    private static InvocationList buildExpectedInvocation(TestParameter keyBlock, TestParameter valueBlock, AggregationMask mask)
+    {
+        InvocationList invocationList = new InvocationList();
+        int[] keyPositions = keyBlock.invokedPositions();
+        int[] valuePositions = valueBlock.invokedPositions();
+        if (mask.isSelectAll()) {
+            for (int position = 0; position < keyPositions.length; position++) {
+                invocationList.add(keyBlock.invokedBlock(), keyPositions[position], valueBlock.invokedBlock(), valuePositions[position], LAMBDA_A, LAMBDA_B);
+            }
+        }
+        else {
+            int[] selectedPositions = mask.getSelectedPositions();
+            for (int i = 0; i < mask.getSelectedPositionCount(); i++) {
+                int position = selectedPositions[i];
+                invocationList.add(keyBlock.invokedBlock(), keyPositions[position], valueBlock.invokedBlock(), valuePositions[position], LAMBDA_A, LAMBDA_B);
+            }
+        }
+        return invocationList;
+    }
+
+    @SuppressWarnings("UnusedVariable")
+    private record TestParameter(Block inputBlock, ValueBlock invokedBlock, int[] invokedPositions) {}
+
+    public static void input(
+            @AggregationState InvocationList invocationList,
+            @BlockPosition @SqlType("K") ValueBlock keyBlock,
+            @BlockIndex int keyPosition,
+            @SqlNullable @BlockPosition @SqlType("V") ValueBlock valueBlock,
+            @BlockIndex int valuePosition,
+            Object lambdaA,
+            Object lambdaB)
+    {
+        invocationList.add(keyBlock, keyPosition, valueBlock, valuePosition, lambdaA, lambdaB);
+    }
+
+    public static class InvocationList
+    {
+        private final List<Invocation> invocations = new ArrayList<>();
+
+        public void add(ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition, Object lambdaA, Object lambdaB)
+        {
+            invocations.add(new Invocation(keyBlock, keyPosition, valueBlock, valuePosition, lambdaA, lambdaB));
+        }
+
+        public List<Invocation> getInvocations()
+        {
+            return ImmutableList.copyOf(invocations);
+        }
+
+        public record Invocation(ValueBlock keyBlock, int keyPosition, ValueBlock valueBlock, int valuePosition, Object lambdaA, Object lambdaB) {}
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAggregationMask.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAggregationMask.java
new file mode 100644
index 000000000000..0885291d6380
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAggregationMask.java
@@ -0,0 +1,189 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import io.trino.spi.block.ByteArrayBlock;
+import io.trino.spi.block.IntArrayBlock;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestAggregationMask
+{
+    @Test
+    public void testUnsetNulls()
+    {
+        AggregationMask aggregationMask = AggregationMask.createSelectAll(0);
+        assertAggregationMaskAll(aggregationMask, 0);
+
+        for (int positionCount = 7; positionCount < 10; positionCount++) {
+            aggregationMask.reset(positionCount);
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            aggregationMask.unselectNullPositions(new IntArrayBlock(positionCount, Optional.empty(), new int[positionCount]));
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            boolean[] nullFlags = new boolean[positionCount];
+            aggregationMask.unselectNullPositions(new IntArrayBlock(positionCount, Optional.of(nullFlags), new int[positionCount]));
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            Arrays.fill(nullFlags, true);
+            nullFlags[1] = false;
+            nullFlags[3] = false;
+            nullFlags[5] = false;
+            aggregationMask.unselectNullPositions(new IntArrayBlock(positionCount, Optional.of(nullFlags), new int[positionCount]));
+            assertAggregationMaskPositions(aggregationMask, positionCount, 1, 3, 5);
+
+            nullFlags[3] = true;
+            aggregationMask.unselectNullPositions(new IntArrayBlock(positionCount, Optional.of(nullFlags), new int[positionCount]));
+            assertAggregationMaskPositions(aggregationMask, positionCount, 1, 5);
+
+            nullFlags[1] = true;
+            nullFlags[5] = true;
+            aggregationMask.unselectNullPositions(new IntArrayBlock(positionCount, Optional.of(nullFlags), new int[positionCount]));
+            assertAggregationMaskPositions(aggregationMask, positionCount);
+
+            aggregationMask.reset(positionCount);
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            aggregationMask.unselectNullPositions(RunLengthEncodedBlock.create(new IntArrayBlock(1, Optional.empty(), new int[1]), positionCount));
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            aggregationMask.unselectNullPositions(RunLengthEncodedBlock.create(new IntArrayBlock(1, Optional.of(new boolean[] {false}), new int[1]), positionCount));
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            aggregationMask.unselectNullPositions(RunLengthEncodedBlock.create(new IntArrayBlock(1, Optional.of(new boolean[] {true}), new int[1]), positionCount));
+            assertAggregationMaskPositions(aggregationMask, positionCount);
+        }
+    }
+
+    @Test
+    public void testApplyMask()
+    {
+        AggregationMask aggregationMask = AggregationMask.createSelectAll(0);
+        assertAggregationMaskAll(aggregationMask, 0);
+
+        for (int positionCount = 7; positionCount < 10; positionCount++) {
+            aggregationMask.reset(positionCount);
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            byte[] mask = new byte[positionCount];
+            Arrays.fill(mask, (byte) 1);
+
+            aggregationMask.applyMaskBlock(new ByteArrayBlock(positionCount, Optional.empty(), mask));
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            Arrays.fill(mask, (byte) 0);
+            mask[1] = 1;
+            mask[3] = 1;
+            mask[5] = 1;
+            aggregationMask.applyMaskBlock(new ByteArrayBlock(positionCount, Optional.empty(), mask));
+            assertAggregationMaskPositions(aggregationMask, positionCount, 1, 3, 5);
+
+            mask[3] = 0;
+            aggregationMask.applyMaskBlock(new ByteArrayBlock(positionCount, Optional.empty(), mask));
+            assertAggregationMaskPositions(aggregationMask, positionCount, 1, 5);
+
+            mask[1] = 0;
+            mask[5] = 0;
+            aggregationMask.applyMaskBlock(new ByteArrayBlock(positionCount, Optional.empty(), mask));
+            assertAggregationMaskPositions(aggregationMask, positionCount);
+
+            aggregationMask.reset(positionCount);
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            aggregationMask.applyMaskBlock(RunLengthEncodedBlock.create(new ByteArrayBlock(1, Optional.empty(), new byte[] {1}), positionCount));
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            aggregationMask.applyMaskBlock(RunLengthEncodedBlock.create(new ByteArrayBlock(1, Optional.empty(), new byte[] {0}), positionCount));
+            assertAggregationMaskPositions(aggregationMask, positionCount);
+        }
+    }
+
+    @Test
+    public void testApplyMaskNulls()
+    {
+        AggregationMask aggregationMask = AggregationMask.createSelectAll(0);
+        assertAggregationMaskAll(aggregationMask, 0);
+
+        for (int positionCount = 7; positionCount < 10; positionCount++) {
+            aggregationMask.reset(positionCount);
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            byte[] mask = new byte[positionCount];
+            Arrays.fill(mask, (byte) 1);
+
+            aggregationMask.applyMaskBlock(new ByteArrayBlock(positionCount, Optional.empty(), mask));
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            boolean[] nullFlags = new boolean[positionCount];
+            aggregationMask.applyMaskBlock(new ByteArrayBlock(positionCount, Optional.of(nullFlags), mask));
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            Arrays.fill(nullFlags, true);
+            nullFlags[1] = false;
+            nullFlags[3] = false;
+            nullFlags[5] = false;
+            aggregationMask.applyMaskBlock(new ByteArrayBlock(positionCount, Optional.of(nullFlags), mask));
+            assertAggregationMaskPositions(aggregationMask, positionCount, 1, 3, 5);
+
+            nullFlags[3] = true;
+            aggregationMask.applyMaskBlock(new ByteArrayBlock(positionCount, Optional.of(nullFlags), mask));
+            assertAggregationMaskPositions(aggregationMask, positionCount, 1, 5);
+
+            nullFlags[1] = true;
+            nullFlags[5] = true;
+            aggregationMask.applyMaskBlock(new ByteArrayBlock(positionCount, Optional.of(nullFlags), mask));
+            assertAggregationMaskPositions(aggregationMask, positionCount);
+
+            aggregationMask.reset(positionCount);
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            aggregationMask.applyMaskBlock(RunLengthEncodedBlock.create(new ByteArrayBlock(1, Optional.empty(), new byte[] {1}), positionCount));
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            aggregationMask.applyMaskBlock(RunLengthEncodedBlock.create(new ByteArrayBlock(1, Optional.of(new boolean[] {false}), new byte[] {1}), positionCount));
+            assertAggregationMaskAll(aggregationMask, positionCount);
+
+            aggregationMask.applyMaskBlock(RunLengthEncodedBlock.create(new ByteArrayBlock(1, Optional.of(new boolean[] {true}), new byte[] {1}), positionCount));
+            assertAggregationMaskPositions(aggregationMask, positionCount);
+        }
+    }
+
+    private static void assertAggregationMaskAll(AggregationMask aggregationMask, int expectedPositionCount)
+    {
+        assertThat(aggregationMask.isSelectAll()).isTrue();
+        assertThat(aggregationMask.isSelectNone()).isEqualTo(expectedPositionCount == 0);
+        assertThat(aggregationMask.getPositionCount()).isEqualTo(expectedPositionCount);
+        assertThat(aggregationMask.getSelectedPositionCount()).isEqualTo(expectedPositionCount);
+        assertThatThrownBy(aggregationMask::getSelectedPositions).isInstanceOf(IllegalStateException.class);
+    }
+
+    private static void assertAggregationMaskPositions(AggregationMask aggregationMask, int expectedPositionCount, int... expectedPositions)
+    {
+        assertThat(aggregationMask.isSelectAll()).isFalse();
+        assertThat(aggregationMask.isSelectNone()).isEqualTo(expectedPositions.length == 0);
+        assertThat(aggregationMask.getPositionCount()).isEqualTo(expectedPositionCount);
+        assertThat(aggregationMask.getSelectedPositionCount()).isEqualTo(expectedPositions.length);
+        // AssertJ is buggy and does not allow starts with to contain an empty array
+        if (expectedPositions.length > 0) {
+            assertThat(aggregationMask.getSelectedPositions()).startsWith(expectedPositions);
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAggregationMaskCompiler.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAggregationMaskCompiler.java
new file mode 100644
index 000000000000..322028b2075f
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAggregationMaskCompiler.java
@@ -0,0 +1,242 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.ByteArrayBlock;
+import io.trino.spi.block.IntArrayBlock;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ShortArrayBlock;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import static io.trino.operator.aggregation.AggregationMaskCompiler.generateAggregationMaskBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestAggregationMaskCompiler
+{
+    @DataProvider
+    public Object[][] maskBuilderSuppliers()
+    {
+        Supplier<AggregationMaskBuilder> interpretedMaskBuilderSupplier = () -> new InterpretedAggregationMaskBuilder(1);
+        Supplier<AggregationMaskBuilder> compiledMaskBuilderSupplier = () -> {
+            try {
+                return generateAggregationMaskBuilder(1).newInstance();
+            }
+            catch (ReflectiveOperationException e) {
+                throw new RuntimeException(e);
+            }
+        };
+        return new Object[][] {{compiledMaskBuilderSupplier}, {interpretedMaskBuilderSupplier}};
+    }
+
+    @Test(dataProvider = "maskBuilderSuppliers")
+    public void testSupplier(Supplier<AggregationMaskBuilder> maskBuilderSupplier)
+    {
+        // each builder produced from a supplier could be completely independent
+        assertThat(maskBuilderSupplier.get()).isNotSameAs(maskBuilderSupplier.get());
+
+        Page page = buildSingleColumnPage(5);
+        assertThat(maskBuilderSupplier.get().buildAggregationMask(page, Optional.empty()))
+                .isNotSameAs(maskBuilderSupplier.get().buildAggregationMask(page, Optional.empty()));
+
+        boolean[] nullFlags = new boolean[5];
+        nullFlags[1] = true;
+        nullFlags[3] = true;
+        Page pageWithNulls = buildSingleColumnPage(nullFlags);
+        assertThat(maskBuilderSupplier.get().buildAggregationMask(pageWithNulls, Optional.empty()))
+                .isNotSameAs(maskBuilderSupplier.get().buildAggregationMask(pageWithNulls, Optional.empty()));
+        assertThat(maskBuilderSupplier.get().buildAggregationMask(pageWithNulls, Optional.empty()).getSelectedPositions())
+                .isNotSameAs(maskBuilderSupplier.get().buildAggregationMask(pageWithNulls, Optional.empty()).getSelectedPositions());
+        assertThat(maskBuilderSupplier.get().buildAggregationMask(pageWithNulls, Optional.empty()).getSelectedPositions())
+                .isEqualTo(maskBuilderSupplier.get().buildAggregationMask(pageWithNulls, Optional.empty()).getSelectedPositions());
+
+        // a single mask builder is allowed to share arrays across builds
+        AggregationMaskBuilder maskBuilder = maskBuilderSupplier.get();
+        assertThat(maskBuilder.buildAggregationMask(pageWithNulls, Optional.empty()).getSelectedPositions())
+                .isSameAs(maskBuilder.buildAggregationMask(pageWithNulls, Optional.empty()).getSelectedPositions());
+    }
+
+    @Test(dataProvider = "maskBuilderSuppliers")
+    public void testUnsetNulls(Supplier<AggregationMaskBuilder> maskBuilderSupplier)
+    {
+        AggregationMaskBuilder maskBuilder = maskBuilderSupplier.get();
+        AggregationMask aggregationMask = maskBuilder.buildAggregationMask(buildSingleColumnPage(0), Optional.empty());
+        assertAggregationMaskAll(aggregationMask, 0);
+
+        for (int positionCount = 7; positionCount < 10; positionCount++) {
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPageRle(positionCount, Optional.of(true)), Optional.empty()), positionCount);
+
+            assertAggregationMaskAll(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.empty()), positionCount);
+
+            boolean[] nullFlags = new boolean[positionCount];
+            assertAggregationMaskAll(maskBuilder.buildAggregationMask(buildSingleColumnPage(nullFlags), Optional.empty()), positionCount);
+
+            Arrays.fill(nullFlags, true);
+            nullFlags[1] = false;
+            nullFlags[3] = false;
+            nullFlags[5] = false;
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPage(nullFlags), Optional.empty()), positionCount, 1, 3, 5);
+
+            nullFlags[3] = true;
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPage(nullFlags), Optional.empty()), positionCount, 1, 5);
+
+            nullFlags[2] = false;
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPage(nullFlags), Optional.empty()), positionCount, 1, 2, 5);
+
+            assertAggregationMaskAll(maskBuilder.buildAggregationMask(buildSingleColumnPageRle(positionCount, Optional.empty()), Optional.empty()), positionCount);
+            assertAggregationMaskAll(maskBuilder.buildAggregationMask(buildSingleColumnPageRle(positionCount, Optional.of(false)), Optional.empty()), positionCount);
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPageRle(positionCount, Optional.of(true)), Optional.empty()), positionCount);
+        }
+    }
+
+    @Test(dataProvider = "maskBuilderSuppliers")
+    public void testApplyMask(Supplier<AggregationMaskBuilder> maskBuilderSupplier)
+    {
+        AggregationMaskBuilder maskBuilder = maskBuilderSupplier.get();
+
+        for (int positionCount = 7; positionCount < 10; positionCount++) {
+            byte[] mask = new byte[positionCount];
+            Arrays.fill(mask, (byte) 1);
+
+            assertAggregationMaskAll(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlock(positionCount, mask))), positionCount);
+
+            Arrays.fill(mask, (byte) 0);
+            mask[1] = 1;
+            mask[3] = 1;
+            mask[5] = 1;
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlock(positionCount, mask))), positionCount, 1, 3, 5);
+
+            mask[3] = 0;
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlock(positionCount, mask))), positionCount, 1, 5);
+
+            mask[2] = 1;
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlock(positionCount, mask))), positionCount, 1, 2, 5);
+
+            assertAggregationMaskAll(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlockRle(positionCount, (byte) 1))), positionCount);
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlockRle(positionCount, (byte) 0))), positionCount);
+        }
+    }
+
+    @Test(dataProvider = "maskBuilderSuppliers")
+    public void testApplyMaskNulls(Supplier<AggregationMaskBuilder> maskBuilderSupplier)
+    {
+        AggregationMaskBuilder maskBuilder = maskBuilderSupplier.get();
+
+        for (int positionCount = 7; positionCount < 10; positionCount++) {
+            byte[] mask = new byte[positionCount];
+            Arrays.fill(mask, (byte) 1);
+
+            assertAggregationMaskAll(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlock(positionCount, mask))), positionCount);
+
+            boolean[] nullFlags = new boolean[positionCount];
+            assertAggregationMaskAll(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlockNulls(nullFlags))), positionCount);
+
+            Arrays.fill(nullFlags, true);
+            nullFlags[1] = false;
+            nullFlags[3] = false;
+            nullFlags[5] = false;
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlockNulls(nullFlags))), positionCount, 1, 3, 5);
+
+            nullFlags[3] = true;
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlockNulls(nullFlags))), positionCount, 1, 5);
+
+            nullFlags[1] = true;
+            nullFlags[5] = true;
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlockNulls(nullFlags))), positionCount);
+
+            assertAggregationMaskAll(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlockNullsRle(positionCount, false))), positionCount);
+            assertAggregationMaskPositions(maskBuilder.buildAggregationMask(buildSingleColumnPage(positionCount), Optional.of(createMaskBlockNullsRle(positionCount, true))), positionCount);
+        }
+    }
+
+    private static Block createMaskBlock(int positionCount, byte[] mask)
+    {
+        return new ByteArrayBlock(positionCount, Optional.empty(), mask);
+    }
+
+    private static Block createMaskBlockRle(int positionCount, byte mask)
+    {
+        return RunLengthEncodedBlock.create(createMaskBlock(1, new byte[] {mask}), positionCount);
+    }
+
+    private static Block createMaskBlockNulls(boolean[] nulls)
+    {
+        int positionCount = nulls.length;
+        byte[] mask = new byte[positionCount];
+        Arrays.fill(mask, (byte) 1);
+        return new ByteArrayBlock(positionCount, Optional.of(nulls), mask);
+    }
+
+    private static Block createMaskBlockNullsRle(int positionCount, boolean nullValue)
+    {
+        return RunLengthEncodedBlock.create(createMaskBlockNulls(new boolean[] {nullValue}), positionCount);
+    }
+
+    private static Page buildSingleColumnPage(int positionCount)
+    {
+        boolean[] ignoredColumnNulls = new boolean[positionCount];
+        Arrays.fill(ignoredColumnNulls, true);
+        return new Page(
+                new ShortArrayBlock(positionCount, Optional.of(ignoredColumnNulls), new short[positionCount]),
+                new IntArrayBlock(positionCount, Optional.empty(), new int[positionCount]));
+    }
+
+    private static Page buildSingleColumnPage(boolean[] nulls)
+    {
+        int positionCount = nulls.length;
+        boolean[] ignoredColumnNulls = new boolean[positionCount];
+        Arrays.fill(ignoredColumnNulls, true);
+        return new Page(
+                new ShortArrayBlock(positionCount, Optional.of(ignoredColumnNulls), new short[positionCount]),
+                new IntArrayBlock(positionCount, Optional.of(nulls), new int[positionCount]));
+    }
+
+    private static Page buildSingleColumnPageRle(int positionCount, Optional<Boolean> nullValue)
+    {
+        Optional<boolean[]> nulls = nullValue.map(value -> new boolean[] {value});
+        boolean[] ignoredColumnNulls = new boolean[positionCount];
+        Arrays.fill(ignoredColumnNulls, true);
+        return new Page(
+                new ShortArrayBlock(positionCount, Optional.of(ignoredColumnNulls), new short[positionCount]),
+                RunLengthEncodedBlock.create(new IntArrayBlock(1, nulls, new int[positionCount]), positionCount));
+    }
+
+    private static void assertAggregationMaskAll(AggregationMask aggregationMask, int expectedPositionCount)
+    {
+        assertThat(aggregationMask.isSelectAll()).isTrue();
+        assertThat(aggregationMask.isSelectNone()).isEqualTo(expectedPositionCount == 0);
+        assertThat(aggregationMask.getPositionCount()).isEqualTo(expectedPositionCount);
+        assertThat(aggregationMask.getSelectedPositionCount()).isEqualTo(expectedPositionCount);
+        assertThatThrownBy(aggregationMask::getSelectedPositions).isInstanceOf(IllegalStateException.class);
+    }
+
+    private static void assertAggregationMaskPositions(AggregationMask aggregationMask, int expectedPositionCount, int... expectedPositions)
+    {
+        assertThat(aggregationMask.isSelectAll()).isFalse();
+        assertThat(aggregationMask.isSelectNone()).isEqualTo(expectedPositions.length == 0);
+        assertThat(aggregationMask.getPositionCount()).isEqualTo(expectedPositionCount);
+        assertThat(aggregationMask.getSelectedPositionCount()).isEqualTo(expectedPositions.length);
+        // AssertJ is buggy and does not allow starts with to contain an empty array
+        if (expectedPositions.length > 0) {
+            assertThat(aggregationMask.getSelectedPositions()).startsWith(expectedPositions);
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAnyValueAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAnyValueAggregation.java
new file mode 100644
index 000000000000..4724d8b6ec93
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestAnyValueAggregation.java
@@ -0,0 +1,176 @@
+/*
+ * Licensed 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 io.trino.operator.aggregation;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.FeaturesConfig;
+import io.trino.metadata.TestingFunctionResolution;
+import io.trino.metadata.TypeRegistry;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import static io.trino.block.BlockAssertions.createArrayBigintBlock;
+import static io.trino.block.BlockAssertions.createBooleansBlock;
+import static io.trino.block.BlockAssertions.createDoublesBlock;
+import static io.trino.block.BlockAssertions.createIntsBlock;
+import static io.trino.block.BlockAssertions.createLongsBlock;
+import static io.trino.block.BlockAssertions.createStringsBlock;
+import static io.trino.operator.aggregation.AggregationTestUtils.assertAggregation;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
+import static org.testng.Assert.assertNotNull;
+
+public class TestAnyValueAggregation
+{
+    private static final TestingFunctionResolution FUNCTION_RESOLUTION = new TestingFunctionResolution();
+
+    @Test
+    public void testAllRegistered()
+    {
+        Collection<Type> standardTypes = new TypeRegistry(new TypeOperators(), new FeaturesConfig()).getTypes();
+        for (Type valueType : standardTypes) {
+            assertNotNull(FUNCTION_RESOLUTION.getAggregateFunction("any_value", fromTypes(valueType)));
+        }
+    }
+
+    @Test
+    public void testNullBoolean()
+    {
+        assertAggregation(
+                FUNCTION_RESOLUTION,
+                "any_value",
+                fromTypes(BOOLEAN),
+                null,
+                createBooleansBlock((Boolean) null));
+    }
+
+    @Test
+    public void testValidBoolean()
+    {
+        assertAggregation(
+                FUNCTION_RESOLUTION,
+                "any_value",
+                fromTypes(BOOLEAN),
+                true,
+                createBooleansBlock(true, true));
+    }
+
+    @Test
+    public void testNullLong()
+    {
+        assertAggregation(
+                FUNCTION_RESOLUTION,
+                "any_value",
+                fromTypes(BIGINT),
+                null,
+                createLongsBlock(null, null));
+    }
+
+    @Test
+    public void testValidLong()
+    {
+        assertAggregation(
+                FUNCTION_RESOLUTION,
+                "any_value",
+                fromTypes(BIGINT),
+                1L,
+                createLongsBlock(1L, null));
+    }
+
+    @Test
+    public void testNullDouble()
+    {
+        assertAggregation(
+                FUNCTION_RESOLUTION,
+                "any_value",
+                fromTypes(DOUBLE),
+                null,
+                createDoublesBlock(null, null));
+    }
+
+    @Test
+    public void testValidDouble()
+    {
+        assertAggregation(
+                FUNCTION_RESOLUTION,
+                "any_value",
+                fromTypes(DOUBLE),
+                2.0,
+                createDoublesBlock(null, 2.0));
+    }
+
+    @Test
+    public void testNullString()
+    {
+        assertAggregation(
+                FUNCTION_RESOLUTION,
+                "any_value",
+                fromTypes(VARCHAR),
+                null,
+                createStringsBlock(null, null));
+    }
+
+    @Test
+    public void testValidString()
+    {
+        assertAggregation(
+                FUNCTION_RESOLUTION,
+                "any_value",
+                fromTypes(VARCHAR),
+                "a",
+                createStringsBlock("a", "a"));
+    }
+
+    @Test
+    public void testNullArray()
+    {
+        assertAggregation(
+                FUNCTION_RESOLUTION,
+                "any_value",
+                fromTypes(new ArrayType(BIGINT)),
+                null,
+                createArrayBigintBlock(Arrays.asList(null, null, null, null)));
+    }
+
+    @Test
+    public void testValidArray()
+    {
+        assertAggregation(
+                FUNCTION_RESOLUTION,
+                "any_value",
+                fromTypes(new ArrayType(BIGINT)),
+                ImmutableList.of(23L, 45L),
+                createArrayBigintBlock(ImmutableList.of(ImmutableList.of(23L, 45L), ImmutableList.of(23L, 45L), ImmutableList.of(23L, 45L), ImmutableList.of(23L, 45L))));
+    }
+
+    @Test
+    public void testValidInt()
+    {
+        assertAggregation(
+                FUNCTION_RESOLUTION,
+                "any_value",
+                fromTypes(INTEGER),
+                3,
+                createIntsBlock(3, 3, null));
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateCountDistinctAggregations.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateCountDistinctAggregations.java
index a5cf0a5e6285..d57cc4d9898c 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateCountDistinctAggregations.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateCountDistinctAggregations.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.aggregation;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.operator.aggregation.ApproximateCountDistinctAggregation.standardErrorToBuckets;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateCountDistinctIpAddress.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateCountDistinctIpAddress.java
index ab029308f3ca..1bfbae1950ac 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateCountDistinctIpAddress.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateCountDistinctIpAddress.java
@@ -16,8 +16,6 @@
 import io.airlift.slice.Slices;
 import io.trino.spi.type.Type;
 
-import java.util.concurrent.ThreadLocalRandom;
-
 import static io.trino.type.IpAddressType.IPADDRESS;
 
 public class TestApproximateCountDistinctIpAddress
@@ -32,8 +30,6 @@ protected Type getValueType()
     @Override
     protected Object randomValue()
     {
-        byte[] bytes = new byte[16];
-        ThreadLocalRandom.current().nextBytes(bytes);
-        return Slices.wrappedBuffer(bytes);
+        return Slices.random(16);
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateCountDistinctVarchar.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateCountDistinctVarchar.java
index 8e4a56b1fb3b..513ec1d06969 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateCountDistinctVarchar.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateCountDistinctVarchar.java
@@ -16,8 +16,6 @@
 import io.airlift.slice.Slices;
 import io.trino.spi.type.Type;
 
-import java.util.concurrent.ThreadLocalRandom;
-
 import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public class TestApproximateCountDistinctVarchar
@@ -32,10 +30,6 @@ protected Type getValueType()
     @Override
     protected Object randomValue()
     {
-        int length = ThreadLocalRandom.current().nextInt(100);
-        byte[] bytes = new byte[length];
-        ThreadLocalRandom.current().nextBytes(bytes);
-
-        return Slices.wrappedBuffer(bytes);
+        return Slices.random(100);
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateMostFrequentHistogram.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateMostFrequentHistogram.java
index fd07a712aa91..2e0819cff544 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateMostFrequentHistogram.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateMostFrequentHistogram.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximatePercentileAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximatePercentileAggregation.java
index ba207ee9892f..d4baf21a14e4 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximatePercentileAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximatePercentileAggregation.java
@@ -15,13 +15,13 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.metadata.TestingFunctionResolution;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.ArrayType;
 import io.trino.sql.analyzer.TypeSignatureProvider;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -69,7 +69,7 @@ public void testLongPartialStep()
         // regular approx_percentile
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE,
                 null,
                 createLongsBlock(null, null),
@@ -77,7 +77,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE,
                 1L,
                 createLongsBlock(null, 1L),
@@ -85,7 +85,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE,
                 2L,
                 createLongsBlock(null, 1L, 2L, 3L),
@@ -93,7 +93,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE,
                 2L,
                 createLongsBlock(1L, 2L, 3L),
@@ -101,7 +101,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE,
                 3L,
                 createLongsBlock(1L, null, 2L, 2L, null, 2L, 2L, null, 2L, 2L, null, 3L, 3L, null, 3L, null, 3L, 4L, 5L, 6L, 7L),
@@ -110,7 +110,7 @@ public void testLongPartialStep()
         // array of approx_percentile
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_ARRAY,
                 null,
                 createLongsBlock(null, null),
@@ -118,7 +118,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_ARRAY,
                 null,
                 createLongsBlock(null, null),
@@ -126,7 +126,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(1L, 1L),
                 createLongsBlock(null, 1L),
@@ -134,7 +134,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(1L, 2L, 3L),
                 createLongsBlock(null, 1L, 2L, 3L),
@@ -142,7 +142,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(2L, 3L),
                 createLongsBlock(1L, 2L, 3L),
@@ -150,7 +150,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(1L, 3L),
                 createLongsBlock(1L, null, 2L, 2L, null, 2L, 2L, null, 2L, 2L, null, 3L, 3L, null, 3L, null, 3L, 4L, 5L, 6L, 7L),
@@ -159,7 +159,7 @@ public void testLongPartialStep()
         // unsorted percentiles
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(3L, 1L, 2L),
                 createLongsBlock(null, 1L, 2L, 3L),
@@ -168,7 +168,7 @@ public void testLongPartialStep()
         // weighted approx_percentile
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_WEIGHTED,
                 null,
                 createLongsBlock(null, null),
@@ -177,7 +177,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_WEIGHTED,
                 1L,
                 createLongsBlock(null, 1L),
@@ -186,7 +186,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_WEIGHTED,
                 2L,
                 createLongsBlock(null, 1L, 2L, 3L),
@@ -195,7 +195,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_WEIGHTED,
                 2L,
                 createLongsBlock(1L, 2L, 3L),
@@ -204,7 +204,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_WEIGHTED,
                 2L,
                 createLongsBlock(1L, 2L, 3L),
@@ -213,7 +213,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_WEIGHTED,
                 3L,
                 createLongsBlock(1L, null, 2L, null, 2L, null, 2L, null, 3L, null, 3L, null, 3L, 4L, 5L, 6L, 7L),
@@ -222,7 +222,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_WEIGHTED,
                 3L,
                 createLongsBlock(1L, null, 2L, null, 2L, null, 2L, null, 3L, null, 3L, null, 3L, 4L, 5L, 6L, 7L),
@@ -231,7 +231,7 @@ public void testLongPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_WEIGHTED_WITH_ACCURACY,
                 9900L,
                 createLongSequenceBlock(0, 10000),
@@ -242,7 +242,7 @@ public void testLongPartialStep()
         // weighted + array of approx_percentile
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 LONG_APPROXIMATE_PERCENTILE_ARRAY_WEIGHTED,
                 ImmutableList.of(2L, 3L),
                 createLongsBlock(1L, 2L, 3L),
@@ -256,7 +256,7 @@ public void testFloatPartialStep()
         // regular approx_percentile
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE,
                 null,
                 createBlockOfReals(null, null),
@@ -264,7 +264,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE,
                 1.0f,
                 createBlockOfReals(null, 1.0f),
@@ -272,7 +272,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE,
                 2.0f,
                 createBlockOfReals(null, 1.0f, 2.0f, 3.0f),
@@ -280,7 +280,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE,
                 1.0f,
                 createBlockOfReals(-1.0f, 1.0f),
@@ -288,7 +288,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE,
                 -1.0f,
                 createBlockOfReals(-2.0f, 3.0f, -1.0f),
@@ -296,7 +296,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE,
                 2.0f,
                 createBlockOfReals(1.0f, 2.0f, 3.0f),
@@ -304,7 +304,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE,
                 3.0f,
                 createBlockOfReals(1.0f, null, 2.0f, 2.0f, null, 2.0f, 2.0f, null, 2.0f, 2.0f, null, 3.0f, 3.0f, null, 3.0f, null, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f),
@@ -313,7 +313,7 @@ public void testFloatPartialStep()
         // array of approx_percentile
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_ARRAY,
                 null,
                 createBlockOfReals(null, null),
@@ -321,7 +321,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_ARRAY,
                 null,
                 createBlockOfReals(null, null),
@@ -329,7 +329,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(1.0f, 1.0f),
                 createBlockOfReals(null, 1.0f),
@@ -337,7 +337,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(1.0f, 2.0f, 3.0f),
                 createBlockOfReals(null, 1.0f, 2.0f, 3.0f),
@@ -345,7 +345,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(2.0f, 3.0f),
                 createBlockOfReals(1.0f, 2.0f, 3.0f),
@@ -353,7 +353,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(1.0f, 3.0f),
                 createBlockOfReals(1.0f, null, 2.0f, 2.0f, null, 2.0f, 2.0f, null, 2.0f, 2.0f, null, 3.0f, 3.0f, null, 3.0f, null, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f),
@@ -362,7 +362,7 @@ public void testFloatPartialStep()
         // unsorted percentiles
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(3.0f, 1.0f, 2.0f),
                 createBlockOfReals(null, 1.0f, 2.0f, 3.0f),
@@ -371,7 +371,7 @@ public void testFloatPartialStep()
         // weighted approx_percentile
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_WEIGHTED,
                 null,
                 createBlockOfReals(null, null),
@@ -380,7 +380,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_WEIGHTED,
                 1.0f,
                 createBlockOfReals(null, 1.0f),
@@ -389,7 +389,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_WEIGHTED,
                 2.0f,
                 createBlockOfReals(null, 1.0f, 2.0f, 3.0f),
@@ -398,7 +398,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_WEIGHTED,
                 2.0f,
                 createBlockOfReals(1.0f, 2.0f, 3.0f),
@@ -407,7 +407,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_WEIGHTED,
                 2.75f,
                 createBlockOfReals(1.0f, null, 2.0f, null, 2.0f, null, 2.0f, null, 3.0f, null, 3.0f, null, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f),
@@ -416,7 +416,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_WEIGHTED,
                 2.75f,
                 createBlockOfReals(1.0f, null, 2.0f, null, 2.0f, null, 2.0f, null, 3.0f, null, 3.0f, null, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f),
@@ -425,7 +425,7 @@ public void testFloatPartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_WEIGHTED_WITH_ACCURACY,
                 9900.0f,
                 createSequenceBlockOfReal(0, 10000),
@@ -436,7 +436,7 @@ public void testFloatPartialStep()
         // weighted + array of approx_percentile
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 FLOAT_APPROXIMATE_PERCENTILE_ARRAY_WEIGHTED,
                 ImmutableList.of(1.5f, 2.6f),
                 createBlockOfReals(1.0f, 2.0f, 3.0f),
@@ -450,7 +450,7 @@ public void testDoublePartialStep()
         // regular approx_percentile
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE,
                 null,
                 createDoublesBlock(null, null),
@@ -458,7 +458,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE,
                 1.0,
                 createDoublesBlock(null, 1.0),
@@ -466,7 +466,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE,
                 2.0,
                 createDoublesBlock(null, 1.0, 2.0, 3.0),
@@ -474,7 +474,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE,
                 2.0,
                 createDoublesBlock(1.0, 2.0, 3.0),
@@ -482,7 +482,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE,
                 3.0,
                 createDoublesBlock(1.0, null, 2.0, 2.0, null, 2.0, 2.0, null, 2.0, 2.0, null, 3.0, 3.0, null, 3.0, null, 3.0, 4.0, 5.0, 6.0, 7.0),
@@ -491,7 +491,7 @@ public void testDoublePartialStep()
         // array of approx_percentile
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_ARRAY,
                 null,
                 createDoublesBlock(null, null),
@@ -499,7 +499,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_ARRAY,
                 null,
                 createDoublesBlock(null, null),
@@ -507,7 +507,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(1.0, 1.0),
                 createDoublesBlock(null, 1.0),
@@ -515,7 +515,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(1.0, 2.0, 3.0),
                 createDoublesBlock(null, 1.0, 2.0, 3.0),
@@ -523,7 +523,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(2.0, 3.0),
                 createDoublesBlock(1.0, 2.0, 3.0),
@@ -531,7 +531,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(1.0, 3.0),
                 createDoublesBlock(1.0, null, 2.0, 2.0, null, 2.0, 2.0, null, 2.0, 2.0, null, 3.0, 3.0, null, 3.0, null, 3.0, 4.0, 5.0, 6.0, 7.0),
@@ -540,7 +540,7 @@ public void testDoublePartialStep()
         // unsorted percentiles
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_ARRAY,
                 ImmutableList.of(3.0, 1.0, 2.0),
                 createDoublesBlock(null, 1.0, 2.0, 3.0),
@@ -549,7 +549,7 @@ public void testDoublePartialStep()
         // weighted approx_percentile
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_WEIGHTED,
                 null,
                 createDoublesBlock(null, null),
@@ -558,7 +558,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_WEIGHTED,
                 1.0,
                 createDoublesBlock(null, 1.0),
@@ -567,7 +567,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_WEIGHTED,
                 2.0,
                 createDoublesBlock(null, 1.0, 2.0, 3.0),
@@ -576,7 +576,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_WEIGHTED,
                 2.0,
                 createDoublesBlock(1.0, 2.0, 3.0),
@@ -585,7 +585,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_WEIGHTED,
                 2.75,
                 createDoublesBlock(1.0, null, 2.0, null, 2.0, null, 2.0, null, 3.0, null, 3.0, null, 3.0, 4.0, 5.0, 6.0, 7.0),
@@ -594,7 +594,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_WEIGHTED,
                 2.75,
                 createDoublesBlock(1.0, null, 2.0, null, 2.0, null, 2.0, null, 3.0, null, 3.0, null, 3.0, 4.0, 5.0, 6.0, 7.0),
@@ -603,7 +603,7 @@ public void testDoublePartialStep()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_WEIGHTED_WITH_ACCURACY,
                 9900.0,
                 createDoubleSequenceBlock(0, 10000),
@@ -614,7 +614,7 @@ public void testDoublePartialStep()
         // weighted + array of approx_percentile
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("approx_percentile"),
+                "approx_percentile",
                 DOUBLE_APPROXIMATE_PERCENTILE_ARRAY_WEIGHTED,
                 ImmutableList.of(1.5, 2.6000000000000005),
                 createDoublesBlock(1.0, 2.0, 3.0),
@@ -631,15 +631,12 @@ private static Block createRleBlock(double percentile, int positionCount)
 
     private static Block createRleBlock(Iterable<Double> percentiles, int positionCount)
     {
-        BlockBuilder rleBlockBuilder = new ArrayType(DOUBLE).createBlockBuilder(null, 1);
-        BlockBuilder arrayBlockBuilder = rleBlockBuilder.beginBlockEntry();
-
-        for (double percentile : percentiles) {
-            DOUBLE.writeDouble(arrayBlockBuilder, percentile);
-        }
-
-        rleBlockBuilder.closeEntry();
-
-        return RunLengthEncodedBlock.create(rleBlockBuilder.build(), positionCount);
+        ArrayBlockBuilder arrayBuilder = new ArrayType(DOUBLE).createBlockBuilder(null, 1);
+        arrayBuilder.buildEntry(elementBuilder -> {
+            for (double percentile : percentiles) {
+                DOUBLE.writeDouble(elementBuilder, percentile);
+            }
+        });
+        return RunLengthEncodedBlock.create(arrayBuilder.build(), positionCount);
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateSetGenericIpAddress.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateSetGenericIpAddress.java
index 03d0241991df..347c67d21094 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateSetGenericIpAddress.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestApproximateSetGenericIpAddress.java
@@ -18,7 +18,6 @@
 import io.trino.spi.type.Type;
 
 import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
 
 import static io.trino.type.IpAddressType.IPADDRESS;
 import static java.lang.Byte.MAX_VALUE;
@@ -36,9 +35,7 @@ protected Type getValueType()
     @Override
     protected Object randomValue()
     {
-        byte[] bytes = new byte[16];
-        ThreadLocalRandom.current().nextBytes(bytes);
-        return Slices.wrappedBuffer(bytes);
+        return Slices.random(16);
     }
 
     @Override
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestArbitraryAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestArbitraryAggregation.java
index 93581014e5be..2a7b5f83a4de 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestArbitraryAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestArbitraryAggregation.java
@@ -20,8 +20,7 @@
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -50,7 +49,7 @@ public void testAllRegistered()
     {
         Collection<Type> standardTypes = new TypeRegistry(new TypeOperators(), new FeaturesConfig()).getTypes();
         for (Type valueType : standardTypes) {
-            assertNotNull(FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("arbitrary"), fromTypes(valueType)));
+            assertNotNull(FUNCTION_RESOLUTION.getAggregateFunction("arbitrary", fromTypes(valueType)));
         }
     }
 
@@ -59,7 +58,7 @@ public void testNullBoolean()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("arbitrary"),
+                "arbitrary",
                 fromTypes(BOOLEAN),
                 null,
                 createBooleansBlock((Boolean) null));
@@ -70,7 +69,7 @@ public void testValidBoolean()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("arbitrary"),
+                "arbitrary",
                 fromTypes(BOOLEAN),
                 true,
                 createBooleansBlock(true, true));
@@ -81,7 +80,7 @@ public void testNullLong()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("arbitrary"),
+                "arbitrary",
                 fromTypes(BIGINT),
                 null,
                 createLongsBlock(null, null));
@@ -92,7 +91,7 @@ public void testValidLong()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("arbitrary"),
+                "arbitrary",
                 fromTypes(BIGINT),
                 1L,
                 createLongsBlock(1L, null));
@@ -103,7 +102,7 @@ public void testNullDouble()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("arbitrary"),
+                "arbitrary",
                 fromTypes(DOUBLE),
                 null,
                 createDoublesBlock(null, null));
@@ -114,7 +113,7 @@ public void testValidDouble()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("arbitrary"),
+                "arbitrary",
                 fromTypes(DOUBLE),
                 2.0,
                 createDoublesBlock(null, 2.0));
@@ -125,7 +124,7 @@ public void testNullString()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("arbitrary"),
+                "arbitrary",
                 fromTypes(VARCHAR),
                 null,
                 createStringsBlock(null, null));
@@ -136,7 +135,7 @@ public void testValidString()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("arbitrary"),
+                "arbitrary",
                 fromTypes(VARCHAR),
                 "a",
                 createStringsBlock("a", "a"));
@@ -147,7 +146,7 @@ public void testNullArray()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("arbitrary"),
+                "arbitrary",
                 fromTypes(new ArrayType(BIGINT)),
                 null,
                 createArrayBigintBlock(Arrays.asList(null, null, null, null)));
@@ -158,7 +157,7 @@ public void testValidArray()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("arbitrary"),
+                "arbitrary",
                 fromTypes(new ArrayType(BIGINT)),
                 ImmutableList.of(23L, 45L),
                 createArrayBigintBlock(ImmutableList.of(ImmutableList.of(23L, 45L), ImmutableList.of(23L, 45L), ImmutableList.of(23L, 45L), ImmutableList.of(23L, 45L))));
@@ -169,7 +168,7 @@ public void testValidInt()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("arbitrary"),
+                "arbitrary",
                 fromTypes(INTEGER),
                 3,
                 createIntsBlock(3, 3, null));
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestArrayAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestArrayAggregation.java
index 5ca650fa35d2..b5f937984ab5 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestArrayAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestArrayAggregation.java
@@ -22,8 +22,7 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.SqlDate;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -54,7 +53,7 @@ public void testEmpty()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("array_agg"),
+                "array_agg",
                 fromTypes(BIGINT),
                 null,
                 createLongsBlock(new Long[] {}));
@@ -65,7 +64,7 @@ public void testNullOnly()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("array_agg"),
+                "array_agg",
                 fromTypes(BIGINT),
                 Arrays.asList(null, null, null),
                 createLongsBlock(new Long[] {null, null, null}));
@@ -76,7 +75,7 @@ public void testNullPartial()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("array_agg"),
+                "array_agg",
                 fromTypes(BIGINT),
                 Arrays.asList(null, 2L, null, 3L, null),
                 createLongsBlock(new Long[] {null, 2L, null, 3L, null}));
@@ -87,7 +86,7 @@ public void testBoolean()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("array_agg"),
+                "array_agg",
                 fromTypes(BOOLEAN),
                 Arrays.asList(true, false),
                 createBooleansBlock(new Boolean[] {true, false}));
@@ -98,7 +97,7 @@ public void testBigInt()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("array_agg"),
+                "array_agg",
                 fromTypes(BIGINT),
                 Arrays.asList(2L, 1L, 2L),
                 createLongsBlock(new Long[] {2L, 1L, 2L}));
@@ -109,7 +108,7 @@ public void testVarchar()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("array_agg"),
+                "array_agg",
                 fromTypes(VARCHAR),
                 Arrays.asList("hello", "world"),
                 createStringsBlock(new String[] {"hello", "world"}));
@@ -120,7 +119,7 @@ public void testDate()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("array_agg"),
+                "array_agg",
                 fromTypes(DATE),
                 Arrays.asList(new SqlDate(1), new SqlDate(2), new SqlDate(4)),
                 createTypedLongsBlock(DATE, ImmutableList.of(1L, 2L, 4L)));
@@ -131,7 +130,7 @@ public void testArray()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("array_agg"),
+                "array_agg",
                 fromTypes(new ArrayType(BIGINT)),
                 Arrays.asList(Arrays.asList(1L), Arrays.asList(1L, 2L), Arrays.asList(1L, 2L, 3L)),
                 createArrayBigintBlock(ImmutableList.of(ImmutableList.of(1L), ImmutableList.of(1L, 2L), ImmutableList.of(1L, 2L, 3L))));
@@ -140,19 +139,19 @@ public void testArray()
     @Test
     public void testEmptyStateOutputsNull()
     {
-        TestingAggregationFunction bigIntAgg = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("array_agg"), fromTypes(BIGINT));
+        TestingAggregationFunction bigIntAgg = FUNCTION_RESOLUTION.getAggregateFunction("array_agg", fromTypes(BIGINT));
         GroupedAggregator groupedAggregator = bigIntAgg.createAggregatorFactory(SINGLE, ImmutableList.of(), OptionalInt.empty())
                 .createGroupedAggregator();
         BlockBuilder blockBuilder = bigIntAgg.getFinalType().createBlockBuilder(null, 1000);
 
         groupedAggregator.evaluate(0, blockBuilder);
-        assertTrue(blockBuilder.isNull(0));
+        assertTrue(blockBuilder.build().isNull(0));
     }
 
     @Test
     public void testWithMultiplePages()
     {
-        TestingAggregationFunction varcharAgg = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("array_agg"), fromTypes(VARCHAR));
+        TestingAggregationFunction varcharAgg = FUNCTION_RESOLUTION.getAggregateFunction("array_agg", fromTypes(VARCHAR));
 
         AggregationTestInputBuilder testInputBuilder = new AggregationTestInputBuilder(
                 new Block[] {
@@ -161,13 +160,13 @@ public void testWithMultiplePages()
         AggregationTestOutput testOutput = new AggregationTestOutput(ImmutableList.of("hello", "world", "hello2", "world2", "hello3", "world3", "goodbye"));
         AggregationTestInput testInput = testInputBuilder.build();
 
-        testInput.runPagesOnAggregatorWithAssertion(0L, varcharAgg.getFinalType(), testInput.createGroupedAggregator(), testOutput);
+        testInput.runPagesOnAggregatorWithAssertion(0, varcharAgg.getFinalType(), testInput.createGroupedAggregator(), testOutput);
     }
 
     @Test
     public void testMultipleGroupsWithMultiplePages()
     {
-        TestingAggregationFunction varcharAgg = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("array_agg"), fromTypes(VARCHAR));
+        TestingAggregationFunction varcharAgg = FUNCTION_RESOLUTION.getAggregateFunction("array_agg", fromTypes(VARCHAR));
 
         Block block1 = createStringsBlock("a", "b", "c", "d", "e");
         Block block2 = createStringsBlock("f", "g", "h", "i", "j");
@@ -178,21 +177,21 @@ public void testMultipleGroupsWithMultiplePages()
         AggregationTestInput test1 = testInputBuilder1.build();
         GroupedAggregator groupedAggregator = test1.createGroupedAggregator();
 
-        test1.runPagesOnAggregatorWithAssertion(0L, varcharAgg.getFinalType(), groupedAggregator, aggregationTestOutput1);
+        test1.runPagesOnAggregatorWithAssertion(0, varcharAgg.getFinalType(), groupedAggregator, aggregationTestOutput1);
 
         AggregationTestOutput aggregationTestOutput2 = new AggregationTestOutput(ImmutableList.of("f", "g", "h", "i", "j"));
         AggregationTestInputBuilder testBuilder2 = new AggregationTestInputBuilder(
                 new Block[] {block2},
                 varcharAgg);
         AggregationTestInput test2 = testBuilder2.build();
-        test2.runPagesOnAggregatorWithAssertion(255L, varcharAgg.getFinalType(), groupedAggregator, aggregationTestOutput2);
+        test2.runPagesOnAggregatorWithAssertion(255, varcharAgg.getFinalType(), groupedAggregator, aggregationTestOutput2);
     }
 
     @Test
     public void testManyValues()
     {
         // Test many values so multiple BlockBuilders will be used to store group state.
-        TestingAggregationFunction varcharAgg = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("array_agg"), fromTypes(VARCHAR));
+        TestingAggregationFunction varcharAgg = FUNCTION_RESOLUTION.getAggregateFunction("array_agg", fromTypes(VARCHAR));
 
         int numGroups = 50000;
         int arraySize = 30;
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestBitwiseAndAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestBitwiseAndAggregation.java
index 8dc23e06be22..160e145306f3 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestBitwiseAndAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestBitwiseAndAggregation.java
@@ -17,7 +17,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.stream.LongStream;
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestBitwiseOrAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestBitwiseOrAggregation.java
index 96d37ad65a0a..e22e85c857c1 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestBitwiseOrAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestBitwiseOrAggregation.java
@@ -17,7 +17,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.stream.LongStream;
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestChecksumAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestChecksumAggregation.java
index 631639d251ce..e42e4d8d22da 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestChecksumAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestChecksumAggregation.java
@@ -13,18 +13,17 @@
  */
 package io.trino.operator.aggregation;
 
+import com.google.common.primitives.Longs;
 import io.trino.metadata.TestingFunctionResolution;
 import io.trino.spi.block.Block;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.SqlVarbinary;
 import io.trino.spi.type.Type;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.type.BlockTypeOperators;
 import io.trino.type.BlockTypeOperators.BlockPositionXxHash64;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static io.airlift.slice.Slices.wrappedLongArray;
 import static io.trino.block.BlockAssertions.createArrayBigintBlock;
 import static io.trino.block.BlockAssertions.createBooleansBlock;
 import static io.trino.block.BlockAssertions.createDoublesBlock;
@@ -50,35 +49,35 @@ public class TestChecksumAggregation
     @Test
     public void testEmpty()
     {
-        assertAggregation(FUNCTION_RESOLUTION, QualifiedName.of("checksum"), fromTypes(BOOLEAN), null, createBooleansBlock());
+        assertAggregation(FUNCTION_RESOLUTION, "checksum", fromTypes(BOOLEAN), null, createBooleansBlock());
     }
 
     @Test
     public void testBoolean()
     {
         Block block = createBooleansBlock(null, null, true, false, false);
-        assertAggregation(FUNCTION_RESOLUTION, QualifiedName.of("checksum"), fromTypes(BOOLEAN), expectedChecksum(BOOLEAN, block), block);
+        assertAggregation(FUNCTION_RESOLUTION, "checksum", fromTypes(BOOLEAN), expectedChecksum(BOOLEAN, block), block);
     }
 
     @Test
     public void testLong()
     {
         Block block = createLongsBlock(null, 1L, 2L, 100L, null, Long.MAX_VALUE, Long.MIN_VALUE);
-        assertAggregation(FUNCTION_RESOLUTION, QualifiedName.of("checksum"), fromTypes(BIGINT), expectedChecksum(BIGINT, block), block);
+        assertAggregation(FUNCTION_RESOLUTION, "checksum", fromTypes(BIGINT), expectedChecksum(BIGINT, block), block);
     }
 
     @Test
     public void testDouble()
     {
         Block block = createDoublesBlock(null, 2.0, null, 3.0, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Double.NaN);
-        assertAggregation(FUNCTION_RESOLUTION, QualifiedName.of("checksum"), fromTypes(DOUBLE), expectedChecksum(DOUBLE, block), block);
+        assertAggregation(FUNCTION_RESOLUTION, "checksum", fromTypes(DOUBLE), expectedChecksum(DOUBLE, block), block);
     }
 
     @Test
     public void testString()
     {
         Block block = createStringsBlock("a", "a", null, "b", "c");
-        assertAggregation(FUNCTION_RESOLUTION, QualifiedName.of("checksum"), fromTypes(VARCHAR), expectedChecksum(VARCHAR, block), block);
+        assertAggregation(FUNCTION_RESOLUTION, "checksum", fromTypes(VARCHAR), expectedChecksum(VARCHAR, block), block);
     }
 
     @Test
@@ -86,7 +85,7 @@ public void testShortDecimal()
     {
         Block block = createShortDecimalsBlock("11.11", "22.22", null, "33.33", "44.44");
         DecimalType shortDecimalType = createDecimalType(1);
-        assertAggregation(FUNCTION_RESOLUTION, QualifiedName.of("checksum"), fromTypes(createDecimalType(10, 2)), expectedChecksum(shortDecimalType, block), block);
+        assertAggregation(FUNCTION_RESOLUTION, "checksum", fromTypes(createDecimalType(10, 2)), expectedChecksum(shortDecimalType, block), block);
     }
 
     @Test
@@ -94,7 +93,7 @@ public void testLongDecimal()
     {
         Block block = createLongDecimalsBlock("11.11", "22.22", null, "33.33", "44.44");
         DecimalType longDecimalType = createDecimalType(19);
-        assertAggregation(FUNCTION_RESOLUTION, QualifiedName.of("checksum"), fromTypes(createDecimalType(19, 2)), expectedChecksum(longDecimalType, block), block);
+        assertAggregation(FUNCTION_RESOLUTION, "checksum", fromTypes(createDecimalType(19, 2)), expectedChecksum(longDecimalType, block), block);
     }
 
     @Test
@@ -102,7 +101,7 @@ public void testArray()
     {
         ArrayType arrayType = new ArrayType(BIGINT);
         Block block = createArrayBigintBlock(asList(null, asList(1L, 2L), asList(3L, 4L), asList(5L, 6L)));
-        assertAggregation(FUNCTION_RESOLUTION, QualifiedName.of("checksum"), fromTypes(arrayType), expectedChecksum(arrayType, block), block);
+        assertAggregation(FUNCTION_RESOLUTION, "checksum", fromTypes(arrayType), expectedChecksum(arrayType, block), block);
     }
 
     private static SqlVarbinary expectedChecksum(Type type, Block block)
@@ -117,6 +116,6 @@ private static SqlVarbinary expectedChecksum(Type type, Block block)
                 result += xxHash64Operator.xxHash64(block, i) * PRIME64;
             }
         }
-        return new SqlVarbinary(wrappedLongArray(result).getBytes());
+        return new SqlVarbinary(Longs.toByteArray(Long.reverseBytes(result)));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestCountNullAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestCountNullAggregation.java
index 2fceb17b3174..835f0f3fb94e 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestCountNullAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestCountNullAggregation.java
@@ -18,6 +18,7 @@
 import io.trino.operator.aggregation.state.NullableLongState;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -25,6 +26,7 @@
 import io.trino.spi.function.CombineFunction;
 import io.trino.spi.function.InputFunction;
 import io.trino.spi.function.OutputFunction;
+import io.trino.spi.function.SqlNullable;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.Type;
@@ -72,7 +74,7 @@ public static final class CountNull
         private CountNull() {}
 
         @InputFunction
-        public static void input(@AggregationState NullableLongState state, @BlockPosition @NullablePosition @SqlType(StandardTypes.BIGINT) Block block, @BlockIndex int position)
+        public static void input(@AggregationState NullableLongState state, @BlockPosition @SqlNullable @SqlType(StandardTypes.BIGINT) ValueBlock block, @BlockIndex int position)
         {
             if (block.isNull(position)) {
                 state.setValue(state.getValue() + 1);
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDecimalAverageAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDecimalAverageAggregation.java
index c960a3c3462e..4554352ed605 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDecimalAverageAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDecimalAverageAggregation.java
@@ -17,6 +17,7 @@
 import io.trino.operator.aggregation.state.LongDecimalWithOverflowAndLongState;
 import io.trino.operator.aggregation.state.LongDecimalWithOverflowAndLongStateFactory;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.Int128ArrayBlock;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Decimals;
 import io.trino.spi.type.Int128;
@@ -233,7 +234,7 @@ private static void addToState(DecimalType type, LongDecimalWithOverflowAndLongS
         else {
             BlockBuilder blockBuilder = type.createFixedSizeBlockBuilder(1);
             type.writeObject(blockBuilder, Int128.valueOf(value));
-            DecimalAverageAggregation.inputLongDecimal(state, blockBuilder.build(), 0);
+            DecimalAverageAggregation.inputLongDecimal(state, (Int128ArrayBlock) blockBuilder.buildValueBlock(), 0);
         }
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDecimalSumAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDecimalSumAggregation.java
index beaf53e56183..66ead07005fc 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDecimalSumAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDecimalSumAggregation.java
@@ -16,11 +16,11 @@
 import io.trino.operator.aggregation.state.LongDecimalWithOverflowState;
 import io.trino.operator.aggregation.state.LongDecimalWithOverflowStateFactory;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.Int128ArrayBlock;
 import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Int128;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigInteger;
 
@@ -28,23 +28,16 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true)
 public class TestDecimalSumAggregation
 {
     private static final BigInteger TWO = new BigInteger("2");
     private static final DecimalType TYPE = createDecimalType(38, 0);
 
-    private LongDecimalWithOverflowState state;
-
-    @BeforeMethod
-    public void setUp()
-    {
-        state = new LongDecimalWithOverflowStateFactory().createSingleState();
-    }
-
     @Test
     public void testOverflow()
     {
+        LongDecimalWithOverflowState state = new LongDecimalWithOverflowStateFactory().createSingleState();
+
         addToState(state, TWO.pow(126));
 
         assertEquals(state.getOverflow(), 0);
@@ -59,6 +52,8 @@ public void testOverflow()
     @Test
     public void testUnderflow()
     {
+        LongDecimalWithOverflowState state = new LongDecimalWithOverflowStateFactory().createSingleState();
+
         addToState(state, TWO.pow(126).negate());
 
         assertEquals(state.getOverflow(), 0);
@@ -73,6 +68,8 @@ public void testUnderflow()
     @Test
     public void testUnderflowAfterOverflow()
     {
+        LongDecimalWithOverflowState state = new LongDecimalWithOverflowStateFactory().createSingleState();
+
         addToState(state, TWO.pow(126));
         addToState(state, TWO.pow(126));
         addToState(state, TWO.pow(125));
@@ -91,6 +88,8 @@ public void testUnderflowAfterOverflow()
     @Test
     public void testCombineOverflow()
     {
+        LongDecimalWithOverflowState state = new LongDecimalWithOverflowStateFactory().createSingleState();
+
         addToState(state, TWO.pow(125));
         addToState(state, TWO.pow(126));
 
@@ -107,6 +106,8 @@ public void testCombineOverflow()
     @Test
     public void testCombineUnderflow()
     {
+        LongDecimalWithOverflowState state = new LongDecimalWithOverflowStateFactory().createSingleState();
+
         addToState(state, TWO.pow(125).negate());
         addToState(state, TWO.pow(126).negate());
 
@@ -123,11 +124,13 @@ public void testCombineUnderflow()
     @Test
     public void testOverflowOnOutput()
     {
+        LongDecimalWithOverflowState state = new LongDecimalWithOverflowStateFactory().createSingleState();
+
         addToState(state, TWO.pow(126));
         addToState(state, TWO.pow(126));
 
         assertEquals(state.getOverflow(), 1);
-        assertThatThrownBy(() -> DecimalSumAggregation.outputLongDecimal(state, new VariableWidthBlockBuilder(null, 10, 100)))
+        assertThatThrownBy(() -> DecimalSumAggregation.outputDecimal(state, new VariableWidthBlockBuilder(null, 10, 100)))
                 .isInstanceOf(ArithmeticException.class)
                 .hasMessage("Decimal overflow");
     }
@@ -140,7 +143,7 @@ private static void addToState(LongDecimalWithOverflowState state, BigInteger va
         else {
             BlockBuilder blockBuilder = TYPE.createFixedSizeBlockBuilder(1);
             TYPE.writeObject(blockBuilder, Int128.valueOf(value));
-            DecimalSumAggregation.inputLongDecimal(state, blockBuilder.build(), 0);
+            DecimalSumAggregation.inputLongDecimal(state, (Int128ArrayBlock) blockBuilder.buildValueBlock(), 0);
         }
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleCorrelationAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleCorrelationAggregation.java
index 2087ee9013eb..11d50db835a8 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleCorrelationAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleCorrelationAggregation.java
@@ -17,7 +17,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
 import org.apache.commons.math3.stat.correlation.PearsonsCorrelation;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.stream.DoubleStream;
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleHistogramAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleHistogramAggregation.java
index b111ce142e9f..6c6840d4c590 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleHistogramAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleHistogramAggregation.java
@@ -23,8 +23,7 @@
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.plan.AggregationNode.Step;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.OptionalInt;
@@ -51,9 +50,7 @@ public class TestDoubleHistogramAggregation
 
     public TestDoubleHistogramAggregation()
     {
-        function = new TestingFunctionResolution().getAggregateFunction(
-                QualifiedName.of("numeric_histogram"),
-                fromTypes(BIGINT, DOUBLE, DOUBLE));
+        function = new TestingFunctionResolution().getAggregateFunction("numeric_histogram", fromTypes(BIGINT, DOUBLE, DOUBLE));
         intermediateType = function.getIntermediateType();
         finalType = function.getFinalType();
         input = makeInput(10);
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleRegrInterceptAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleRegrInterceptAggregation.java
index d65412f7950a..769b74c33b45 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleRegrInterceptAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleRegrInterceptAggregation.java
@@ -17,7 +17,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
 import org.apache.commons.math3.stat.regression.SimpleRegression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleRegrSlopeAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleRegrSlopeAggregation.java
index d1f9eb5d49a5..6d319c4e6b13 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleRegrSlopeAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestDoubleRegrSlopeAggregation.java
@@ -17,7 +17,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
 import org.apache.commons.math3.stat.regression.SimpleRegression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestHistogram.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestHistogram.java
index 70ac3c0f85b9..4fa033da877e 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestHistogram.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestHistogram.java
@@ -28,10 +28,9 @@
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.SqlTimestampWithTimeZone;
 import io.trino.spi.type.TimeZoneKey;
-import io.trino.sql.tree.QualifiedName;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -61,8 +60,8 @@
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.planner.plan.AggregationNode.Step.SINGLE;
 import static io.trino.util.DateTimeZoneIndex.getDateTimeZone;
-import static io.trino.util.StructuralTestUtil.mapBlockOf;
 import static io.trino.util.StructuralTestUtil.mapType;
+import static io.trino.util.StructuralTestUtil.sqlMapOf;
 import static org.testng.Assert.assertTrue;
 
 public class TestHistogram
@@ -76,28 +75,28 @@ public void testSimpleHistograms()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(VARCHAR),
                 ImmutableMap.of("a", 1L, "b", 1L, "c", 1L),
                 createStringsBlock("a", "b", "c"));
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(BIGINT),
                 ImmutableMap.of(100L, 1L, 200L, 1L, 300L, 1L),
                 createLongsBlock(100L, 200L, 300L));
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(DOUBLE),
                 ImmutableMap.of(0.1, 1L, 0.3, 1L, 0.2, 1L),
                 createDoublesBlock(0.1, 0.3, 0.2));
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(BOOLEAN),
                 ImmutableMap.of(true, 1L, false, 1L),
                 createBooleansBlock(true, false));
@@ -108,27 +107,27 @@ public void testSharedGroupBy()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(VARCHAR),
                 ImmutableMap.of("a", 1L, "b", 1L, "c", 1L),
                 createStringsBlock("a", "b", "c"));
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(BIGINT),
                 ImmutableMap.of(100L, 1L, 200L, 1L, 300L, 1L),
                 createLongsBlock(100L, 200L, 300L));
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"), fromTypes(DOUBLE),
+                "histogram", fromTypes(DOUBLE),
                 ImmutableMap.of(0.1, 1L, 0.3, 1L, 0.2, 1L),
                 createDoublesBlock(0.1, 0.3, 0.2));
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(BOOLEAN),
                 ImmutableMap.of(true, 1L, false, 1L),
                 createBooleansBlock(true, false));
@@ -139,7 +138,7 @@ public void testDuplicateKeysValues()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(VARCHAR),
                 ImmutableMap.of("a", 2L, "b", 1L),
                 createStringsBlock("a", "b", "a"));
@@ -148,7 +147,7 @@ public void testDuplicateKeysValues()
         long timestampWithTimeZone2 = packDateTimeWithZone(new DateTime(2015, 1, 1, 0, 0, 0, 0, DATE_TIME_ZONE).getMillis(), TIME_ZONE_KEY);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(TIMESTAMP_TZ_MILLIS),
                 ImmutableMap.of(SqlTimestampWithTimeZone.newInstance(3, unpackMillisUtc(timestampWithTimeZone1), 0, unpackZoneKey(timestampWithTimeZone1)), 2L, SqlTimestampWithTimeZone.newInstance(3, unpackMillisUtc(timestampWithTimeZone2), 0, unpackZoneKey(timestampWithTimeZone2)), 1L),
                 createLongsBlock(timestampWithTimeZone1, timestampWithTimeZone1, timestampWithTimeZone2));
@@ -159,14 +158,14 @@ public void testWithNulls()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(BIGINT),
                 ImmutableMap.of(1L, 1L, 2L, 1L),
                 createLongsBlock(2L, null, 1L));
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(BIGINT),
                 null,
                 createLongsBlock((Long) null));
@@ -178,7 +177,7 @@ public void testArrayHistograms()
         ArrayType arrayType = new ArrayType(VARCHAR);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(arrayType),
                 ImmutableMap.of(ImmutableList.of("a", "b", "c"), 1L, ImmutableList.of("d", "e", "f"), 1L, ImmutableList.of("c", "b", "a"), 1L),
                 createStringArraysBlock(ImmutableList.of(ImmutableList.of("a", "b", "c"), ImmutableList.of("d", "e", "f"), ImmutableList.of("c", "b", "a"))));
@@ -190,13 +189,13 @@ public void testMapHistograms()
         MapType innerMapType = mapType(VARCHAR, VARCHAR);
 
         BlockBuilder builder = innerMapType.createBlockBuilder(null, 3);
-        innerMapType.writeObject(builder, mapBlockOf(VARCHAR, VARCHAR, ImmutableMap.of("a", "b")));
-        innerMapType.writeObject(builder, mapBlockOf(VARCHAR, VARCHAR, ImmutableMap.of("c", "d")));
-        innerMapType.writeObject(builder, mapBlockOf(VARCHAR, VARCHAR, ImmutableMap.of("e", "f")));
+        innerMapType.writeObject(builder, sqlMapOf(VARCHAR, VARCHAR, ImmutableMap.of("a", "b")));
+        innerMapType.writeObject(builder, sqlMapOf(VARCHAR, VARCHAR, ImmutableMap.of("c", "d")));
+        innerMapType.writeObject(builder, sqlMapOf(VARCHAR, VARCHAR, ImmutableMap.of("e", "f")));
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(innerMapType),
                 ImmutableMap.of(ImmutableMap.of("a", "b"), 1L, ImmutableMap.of("c", "d"), 1L, ImmutableMap.of("e", "f"), 1L),
                 builder.build());
@@ -215,7 +214,7 @@ public void testRowHistograms()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(innerRowType),
                 ImmutableMap.of(ImmutableList.of(1L, 1.0), 1L, ImmutableList.of(2L, 2.0), 1L, ImmutableList.of(3L, 3.0), 1L),
                 builder.build());
@@ -226,7 +225,7 @@ public void testLargerHistograms()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("histogram"),
+                "histogram",
                 fromTypes(VARCHAR),
                 ImmutableMap.of("a", 25L, "b", 10L, "c", 12L, "d", 1L, "e", 2L),
                 createStringsBlock("a", "b", "c", "d", "e", "e", "c", "a", "a", "a", "b", "a", "a", "a", "a", "b", "a", "a", "a", "a", "b", "a", "a", "a", "a", "b", "a", "a", "a", "a", "b", "a", "c", "c", "b", "a", "c", "c", "b", "a", "c", "c", "b", "a", "c", "c", "b", "a", "c", "c"));
@@ -241,7 +240,7 @@ public void testEmptyHistogramOutputsNull()
         BlockBuilder blockBuilder = function.getFinalType().createBlockBuilder(null, 1000);
 
         groupedAggregator.evaluate(0, blockBuilder);
-        assertTrue(blockBuilder.isNull(0));
+        assertTrue(blockBuilder.build().isNull(0));
     }
 
     @Test
@@ -335,14 +334,14 @@ private static void testSharedGroupByWithOverlappingValuesPerGroupRunner(Testing
         AggregationTestInput test1 = testBuilder1.build();
         GroupedAggregator groupedAggregator = test1.createGroupedAggregator();
 
-        test1.runPagesOnAggregatorWithAssertion(0L, aggregationFunction.getFinalType(), groupedAggregator, aggregationTestOutput1);
+        test1.runPagesOnAggregatorWithAssertion(0, aggregationFunction.getFinalType(), groupedAggregator, aggregationTestOutput1);
 
         AggregationTestOutput aggregationTestOutput2 = new AggregationTestOutput(ImmutableMap.of("b", 1L, "c", 1L, "d", 1L));
         AggregationTestInputBuilder testbuilder2 = new AggregationTestInputBuilder(
                 new Block[] {block2},
                 aggregationFunction);
         AggregationTestInput test2 = testbuilder2.build();
-        test2.runPagesOnAggregatorWithAssertion(255L, aggregationFunction.getFinalType(), groupedAggregator, aggregationTestOutput2);
+        test2.runPagesOnAggregatorWithAssertion(255, aggregationFunction.getFinalType(), groupedAggregator, aggregationTestOutput2);
     }
 
     private static void testSharedGroupByWithDistinctValuesPerGroupRunner(TestingAggregationFunction aggregationFunction)
@@ -356,14 +355,14 @@ private static void testSharedGroupByWithDistinctValuesPerGroupRunner(TestingAgg
         AggregationTestInput test1 = testInputBuilder1.build();
         GroupedAggregator groupedAggregator = test1.createGroupedAggregator();
 
-        test1.runPagesOnAggregatorWithAssertion(0L, aggregationFunction.getFinalType(), groupedAggregator, aggregationTestOutput1);
+        test1.runPagesOnAggregatorWithAssertion(0, aggregationFunction.getFinalType(), groupedAggregator, aggregationTestOutput1);
 
         AggregationTestOutput aggregationTestOutput2 = new AggregationTestOutput(ImmutableMap.of("d", 1L, "e", 1L, "f", 1L));
         AggregationTestInputBuilder testBuilder2 = new AggregationTestInputBuilder(
                 new Block[] {block2},
                 aggregationFunction);
         AggregationTestInput test2 = testBuilder2.build();
-        test2.runPagesOnAggregatorWithAssertion(255L, aggregationFunction.getFinalType(), groupedAggregator, aggregationTestOutput2);
+        test2.runPagesOnAggregatorWithAssertion(255, aggregationFunction.getFinalType(), groupedAggregator, aggregationTestOutput2);
     }
 
     private static void testSharedGroupByWithOverlappingValuesRunner(TestingAggregationFunction aggregationFunction)
@@ -386,11 +385,11 @@ private static void testSharedGroupByWithOverlappingValuesRunner(TestingAggregat
                 .buildOrThrow());
         AggregationTestInput test1 = testInputBuilder1.build();
 
-        test1.runPagesOnAggregatorWithAssertion(0L, aggregationFunction.getFinalType(), test1.createGroupedAggregator(), aggregationTestOutput1);
+        test1.runPagesOnAggregatorWithAssertion(0, aggregationFunction.getFinalType(), test1.createGroupedAggregator(), aggregationTestOutput1);
     }
 
     private static TestingAggregationFunction getInternalDefaultVarCharAggregation()
     {
-        return FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("histogram"), fromTypes(VARCHAR));
+        return FUNCTION_RESOLUTION.getAggregateFunction("histogram", fromTypes(VARCHAR));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestIntervalDayToSecondAverageAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestIntervalDayToSecondAverageAggregation.java
index 61e80287b009..843557608a0a 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestIntervalDayToSecondAverageAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestIntervalDayToSecondAverageAggregation.java
@@ -32,7 +32,7 @@ protected Block[] getSequenceBlocks(int start, int length)
     {
         BlockBuilder blockBuilder = INTERVAL_DAY_TIME.createBlockBuilder(null, length);
         for (int i = start; i < start + length; i++) {
-            INTERVAL_DAY_TIME.writeLong(blockBuilder, i * 250);
+            INTERVAL_DAY_TIME.writeLong(blockBuilder, i * 250L);
         }
         return new Block[] {blockBuilder.build()};
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestIntervalDayToSecondSumAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestIntervalDayToSecondSumAggregation.java
index 91e7609d3f6f..a48d7ed01440 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestIntervalDayToSecondSumAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestIntervalDayToSecondSumAggregation.java
@@ -31,7 +31,7 @@ protected Block[] getSequenceBlocks(int start, int length)
     {
         BlockBuilder blockBuilder = INTERVAL_DAY_TIME.createBlockBuilder(null, length);
         for (int i = start; i < start + length; i++) {
-            INTERVAL_DAY_TIME.writeLong(blockBuilder, i * 1000);
+            INTERVAL_DAY_TIME.writeLong(blockBuilder, i * 1000L);
         }
         return new Block[] {blockBuilder.build()};
     }
@@ -45,7 +45,7 @@ protected SqlIntervalDayTime getExpectedValue(int start, int length)
 
         long sum = 0;
         for (int i = start; i < start + length; i++) {
-            sum += i * 1000;
+            sum += i * 1000L;
         }
         return new SqlIntervalDayTime(sum);
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestListagg.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestListagg.java
index edfef818c60e..6a0eebb493fc 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestListagg.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestListagg.java
@@ -14,8 +14,7 @@
 package io.trino.operator.aggregation;
 
 import io.trino.metadata.TestingFunctionResolution;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 
@@ -35,7 +34,7 @@ public void testEmpty()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("listagg"),
+                "listagg",
                 fromTypes(VARCHAR, VARCHAR, BOOLEAN, VARCHAR, BOOLEAN),
                 null,
                 createStringsBlock(new String[] {null}),
@@ -50,7 +49,7 @@ public void testOnlyNullValues()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("listagg"),
+                "listagg",
                 fromTypes(VARCHAR, VARCHAR, BOOLEAN, VARCHAR, BOOLEAN),
                 null,
                 createStringsBlock(null, null, null),
@@ -65,7 +64,7 @@ public void testOneValue()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("listagg"),
+                "listagg",
                 fromTypes(VARCHAR, VARCHAR, BOOLEAN, VARCHAR, BOOLEAN),
                 "value",
                 createStringsBlock("value"),
@@ -80,7 +79,7 @@ public void testTwoValues()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("listagg"),
+                "listagg",
                 fromTypes(VARCHAR, VARCHAR, BOOLEAN, VARCHAR, BOOLEAN),
                 "value1,value2",
                 createStringsBlock("value1", "value2"),
@@ -95,7 +94,7 @@ public void testTwoValuesMixedWithNullValues()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("listagg"),
+                "listagg",
                 fromTypes(VARCHAR, VARCHAR, BOOLEAN, VARCHAR, BOOLEAN),
                 "value1,value2",
                 createStringsBlock(null, "value1", null, "value2", null),
@@ -110,7 +109,7 @@ public void testTwoValuesWithDefaultDelimiter()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("listagg"),
+                "listagg",
                 fromTypes(VARCHAR, VARCHAR, BOOLEAN, VARCHAR, BOOLEAN),
                 "value1value2",
                 createStringsBlock("value1", "value2"),
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMapAggAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMapAggAggregation.java
index 11556b738b18..c24c380ba357 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMapAggAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMapAggAggregation.java
@@ -20,8 +20,7 @@
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -38,8 +37,8 @@
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
-import static io.trino.util.StructuralTestUtil.mapBlockOf;
 import static io.trino.util.StructuralTestUtil.mapType;
+import static io.trino.util.StructuralTestUtil.sqlMapOf;
 
 public class TestMapAggAggregation
 {
@@ -50,7 +49,7 @@ public void testDuplicateKeysValues()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_agg"),
+                "map_agg",
                 fromTypes(DOUBLE, VARCHAR),
                 ImmutableMap.of(1.0, "a"),
                 createDoublesBlock(1.0, 1.0, 1.0),
@@ -58,7 +57,7 @@ public void testDuplicateKeysValues()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_agg"),
+                "map_agg",
                 fromTypes(DOUBLE, INTEGER),
                 ImmutableMap.of(1.0, 99, 2.0, 99, 3.0, 99),
                 createDoublesBlock(1.0, 2.0, 3.0),
@@ -70,7 +69,7 @@ public void testSimpleMaps()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_agg"),
+                "map_agg",
                 fromTypes(DOUBLE, VARCHAR),
                 ImmutableMap.of(1.0, "a", 2.0, "b", 3.0, "c"),
                 createDoublesBlock(1.0, 2.0, 3.0),
@@ -78,7 +77,7 @@ public void testSimpleMaps()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_agg"),
+                "map_agg",
                 fromTypes(DOUBLE, INTEGER),
                 ImmutableMap.of(1.0, 3, 2.0, 2, 3.0, 1),
                 createDoublesBlock(1.0, 2.0, 3.0),
@@ -86,7 +85,7 @@ public void testSimpleMaps()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_agg"),
+                "map_agg",
                 fromTypes(DOUBLE, BOOLEAN),
                 ImmutableMap.of(1.0, true, 2.0, false, 3.0, false),
                 createDoublesBlock(1.0, 2.0, 3.0),
@@ -98,7 +97,7 @@ public void testNull()
     {
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_agg"),
+                "map_agg",
                 fromTypes(DOUBLE, DOUBLE),
                 ImmutableMap.of(1.0, 2.0),
                 createDoublesBlock(1.0, null, null),
@@ -106,7 +105,7 @@ public void testNull()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_agg"),
+                "map_agg",
                 fromTypes(DOUBLE, DOUBLE),
                 null,
                 createDoublesBlock(null, null, null),
@@ -118,7 +117,7 @@ public void testNull()
         expected.put(3.0, null);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_agg"),
+                "map_agg",
                 fromTypes(DOUBLE, DOUBLE),
                 expected,
                 createDoublesBlock(1.0, 2.0, 3.0),
@@ -132,7 +131,7 @@ public void testDoubleArrayMap()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_agg"),
+                "map_agg",
                 fromTypes(DOUBLE, arrayType),
                 ImmutableMap.of(1.0, ImmutableList.of("a", "b"),
                         2.0, ImmutableList.of("c", "d"),
@@ -147,13 +146,13 @@ public void testDoubleMapMap()
         MapType innerMapType = mapType(VARCHAR, VARCHAR);
 
         BlockBuilder builder = innerMapType.createBlockBuilder(null, 3);
-        innerMapType.writeObject(builder, mapBlockOf(VARCHAR, VARCHAR, ImmutableMap.of("a", "b")));
-        innerMapType.writeObject(builder, mapBlockOf(VARCHAR, VARCHAR, ImmutableMap.of("c", "d")));
-        innerMapType.writeObject(builder, mapBlockOf(VARCHAR, VARCHAR, ImmutableMap.of("e", "f")));
+        innerMapType.writeObject(builder, sqlMapOf(VARCHAR, VARCHAR, ImmutableMap.of("a", "b")));
+        innerMapType.writeObject(builder, sqlMapOf(VARCHAR, VARCHAR, ImmutableMap.of("c", "d")));
+        innerMapType.writeObject(builder, sqlMapOf(VARCHAR, VARCHAR, ImmutableMap.of("e", "f")));
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_agg"),
+                "map_agg",
                 fromTypes(DOUBLE, innerMapType),
                 ImmutableMap.of(1.0, ImmutableMap.of("a", "b"),
                         2.0, ImmutableMap.of("c", "d"),
@@ -176,7 +175,7 @@ public void testDoubleRowMap()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_agg"),
+                "map_agg",
                 fromTypes(DOUBLE, innerRowType),
                 ImmutableMap.of(1.0, ImmutableList.of(1, 1.0),
                         2.0, ImmutableList.of(2, 2.0),
@@ -192,7 +191,7 @@ public void testArrayDoubleMap()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_agg"),
+                "map_agg",
                 fromTypes(arrayType, DOUBLE),
                 ImmutableMap.of(
                         ImmutableList.of("a", "b"), 1.0,
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMapUnionAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMapUnionAggregation.java
index 1aedae3ca8cd..1aa585b7e2db 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMapUnionAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMapUnionAggregation.java
@@ -18,8 +18,7 @@
 import io.trino.metadata.TestingFunctionResolution;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.MapType;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -32,8 +31,8 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.util.StructuralTestUtil.arrayBlockOf;
-import static io.trino.util.StructuralTestUtil.mapBlockOf;
 import static io.trino.util.StructuralTestUtil.mapType;
+import static io.trino.util.StructuralTestUtil.sqlMapOf;
 
 public class TestMapUnionAggregation
 {
@@ -45,34 +44,34 @@ public void testSimpleWithDuplicates()
         MapType mapType = mapType(DOUBLE, VARCHAR);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_union"),
+                "map_union",
                 fromTypes(mapType),
                 ImmutableMap.of(23.0, "aaa", 33.0, "bbb", 43.0, "ccc", 53.0, "ddd", 13.0, "eee"),
                 arrayBlockOf(
                         mapType,
-                        mapBlockOf(DOUBLE, VARCHAR, ImmutableMap.of(23.0, "aaa", 33.0, "bbb", 53.0, "ddd")),
-                        mapBlockOf(DOUBLE, VARCHAR, ImmutableMap.of(43.0, "ccc", 53.0, "ddd", 13.0, "eee"))));
+                        sqlMapOf(DOUBLE, VARCHAR, ImmutableMap.of(23.0, "aaa", 33.0, "bbb", 53.0, "ddd")),
+                        sqlMapOf(DOUBLE, VARCHAR, ImmutableMap.of(43.0, "ccc", 53.0, "ddd", 13.0, "eee"))));
 
         mapType = mapType(DOUBLE, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_union"), fromTypes(mapType),
+                "map_union", fromTypes(mapType),
                 ImmutableMap.of(1.0, 99L, 2.0, 99L, 3.0, 99L, 4.0, 44L),
                 arrayBlockOf(
                         mapType,
-                        mapBlockOf(DOUBLE, BIGINT, ImmutableMap.of(1.0, 99L, 2.0, 99L, 3.0, 99L)),
-                        mapBlockOf(DOUBLE, BIGINT, ImmutableMap.of(1.0, 44L, 2.0, 44L, 4.0, 44L))));
+                        sqlMapOf(DOUBLE, BIGINT, ImmutableMap.of(1.0, 99L, 2.0, 99L, 3.0, 99L)),
+                        sqlMapOf(DOUBLE, BIGINT, ImmutableMap.of(1.0, 44L, 2.0, 44L, 4.0, 44L))));
 
         mapType = mapType(BOOLEAN, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_union"),
+                "map_union",
                 fromTypes(mapType),
                 ImmutableMap.of(false, 12L, true, 13L),
                 arrayBlockOf(
                         mapType,
-                        mapBlockOf(BOOLEAN, BIGINT, ImmutableMap.of(false, 12L)),
-                        mapBlockOf(BOOLEAN, BIGINT, ImmutableMap.of(true, 13L, false, 33L))));
+                        sqlMapOf(BOOLEAN, BIGINT, ImmutableMap.of(false, 12L)),
+                        sqlMapOf(BOOLEAN, BIGINT, ImmutableMap.of(true, 13L, false, 33L))));
     }
 
     @Test
@@ -84,14 +83,14 @@ public void testSimpleWithNulls()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_union"),
+                "map_union",
                 fromTypes(mapType),
                 expected,
                 arrayBlockOf(
                         mapType,
-                        mapBlockOf(DOUBLE, VARCHAR, mapOf(23.0, "aaa", 33.0, null, 53.0, "ddd")),
+                        sqlMapOf(DOUBLE, VARCHAR, mapOf(23.0, "aaa", 33.0, null, 53.0, "ddd")),
                         null,
-                        mapBlockOf(DOUBLE, VARCHAR, mapOf(43.0, "ccc", 53.0, "ddd"))));
+                        sqlMapOf(DOUBLE, VARCHAR, mapOf(43.0, "ccc", 53.0, "ddd"))));
     }
 
     @Test
@@ -100,7 +99,7 @@ public void testStructural()
         MapType mapType = mapType(DOUBLE, new ArrayType(VARCHAR));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_union"),
+                "map_union",
                 fromTypes(mapType),
                 ImmutableMap.of(
                         1.0, ImmutableList.of("a", "b"),
@@ -109,7 +108,7 @@ public void testStructural()
                         4.0, ImmutableList.of("r", "s")),
                 arrayBlockOf(
                         mapType,
-                        mapBlockOf(
+                        sqlMapOf(
                                 DOUBLE,
                                 new ArrayType(VARCHAR),
                                 ImmutableMap.of(
@@ -119,7 +118,7 @@ public void testStructural()
                                         ImmutableList.of("c", "d"),
                                         3.0,
                                         ImmutableList.of("e", "f"))),
-                        mapBlockOf(
+                        sqlMapOf(
                                 DOUBLE,
                                 new ArrayType(VARCHAR),
                                 ImmutableMap.of(
@@ -133,7 +132,7 @@ public void testStructural()
         mapType = mapType(DOUBLE, mapType(VARCHAR, VARCHAR));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_union"),
+                "map_union",
                 fromTypes(mapType),
                 ImmutableMap.of(
                         1.0, ImmutableMap.of("a", "b"),
@@ -141,7 +140,7 @@ public void testStructural()
                         3.0, ImmutableMap.of("e", "f")),
                 arrayBlockOf(
                         mapType,
-                        mapBlockOf(
+                        sqlMapOf(
                                 DOUBLE,
                                 mapType(VARCHAR, VARCHAR),
                                 ImmutableMap.of(
@@ -149,7 +148,7 @@ public void testStructural()
                                         ImmutableMap.of("a", "b"),
                                         2.0,
                                         ImmutableMap.of("c", "d"))),
-                        mapBlockOf(
+                        sqlMapOf(
                                 DOUBLE,
                                 mapType(VARCHAR, VARCHAR),
                                 ImmutableMap.of(
@@ -159,7 +158,7 @@ public void testStructural()
         mapType = mapType(new ArrayType(VARCHAR), DOUBLE);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("map_union"),
+                "map_union",
                 fromTypes(mapType),
                 ImmutableMap.of(
                         ImmutableList.of("a", "b"), 1.0,
@@ -167,7 +166,7 @@ public void testStructural()
                         ImmutableList.of("e", "f"), 3.0),
                 arrayBlockOf(
                         mapType,
-                        mapBlockOf(
+                        sqlMapOf(
                                 new ArrayType(VARCHAR),
                                 DOUBLE,
                                 ImmutableMap.of(
@@ -175,7 +174,7 @@ public void testStructural()
                                         1.0,
                                         ImmutableList.of("e", "f"),
                                         3.0)),
-                        mapBlockOf(
+                        sqlMapOf(
                                 new ArrayType(VARCHAR),
                                 DOUBLE,
                                 ImmutableMap.of(
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMergeQuantileDigestFunction.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMergeQuantileDigestFunction.java
index effc2db85069..6a90d3ac5b9d 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMergeQuantileDigestFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMergeQuantileDigestFunction.java
@@ -23,8 +23,7 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.TypeSignatureParameter;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.function.BiFunction;
@@ -103,7 +102,7 @@ public void testMultiplePositions()
     {
         assertAggregation(
                 functionResolution,
-                QualifiedName.of(getFunctionName()),
+                getFunctionName(),
                 fromTypes(getFunctionParameterTypes()),
                 QDIGEST_EQUALITY,
                 "test multiple positions",
@@ -117,7 +116,7 @@ public void testMixedNullAndNonNullPositions()
     {
         assertAggregation(
                 functionResolution,
-                QualifiedName.of(getFunctionName()),
+                getFunctionName(),
                 fromTypes(getFunctionParameterTypes()),
                 QDIGEST_EQUALITY,
                 "test mixed null and nonnull position",
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMinMaxByAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMinMaxByAggregation.java
index 2d4e284e532d..019627a68a78 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMinMaxByAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMinMaxByAggregation.java
@@ -22,8 +22,7 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 import io.trino.sql.analyzer.TypeSignatureProvider;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collection;
 import java.util.List;
@@ -67,8 +66,8 @@ public void testAllRegistered()
 
         for (Type keyType : orderableTypes) {
             for (Type valueType : getTypes()) {
-                assertNotNull(FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("min_by"), fromTypes(valueType, keyType)));
-                assertNotNull(FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("max_by"), fromTypes(valueType, keyType)));
+                assertNotNull(FUNCTION_RESOLUTION.getAggregateFunction("min_by", fromTypes(valueType, keyType)));
+                assertNotNull(FUNCTION_RESOLUTION.getAggregateFunction("max_by", fromTypes(valueType, keyType)));
             }
         }
     }
@@ -89,14 +88,14 @@ public void testMinUnknown()
         List<TypeSignatureProvider> parameterTypes = fromTypes(UNKNOWN, DOUBLE);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 null,
                 createBooleansBlock(null, null),
                 createDoublesBlock(1.0, 2.0));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 null,
                 createDoublesBlock(1.0, 2.0),
@@ -109,14 +108,14 @@ public void testMaxUnknown()
         List<TypeSignatureProvider> parameterTypes = fromTypes(UNKNOWN, DOUBLE);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 null,
                 createBooleansBlock(null, null),
                 createDoublesBlock(1.0, 2.0));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 null,
                 createDoublesBlock(1.0, 2.0),
@@ -129,14 +128,14 @@ public void testMinNull()
         List<TypeSignatureProvider> parameterTypes = fromTypes(DOUBLE, DOUBLE);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 1.0,
                 createDoublesBlock(1.0, null),
                 createDoublesBlock(1.0, 2.0));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 10.0,
                 createDoublesBlock(10.0, 9.0, 8.0, 11.0),
@@ -149,14 +148,14 @@ public void testMaxNull()
         List<TypeSignatureProvider> parameterTypes = fromTypes(DOUBLE, DOUBLE);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 null,
                 createDoublesBlock(1.0, null),
                 createDoublesBlock(1.0, 2.0));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 10.0,
                 createDoublesBlock(8.0, 9.0, 10.0, 11.0),
@@ -169,7 +168,7 @@ public void testMinDoubleDouble()
         List<TypeSignatureProvider> parameterTypes = fromTypes(DOUBLE, DOUBLE);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 null,
                 createDoublesBlock(null, null),
@@ -177,7 +176,7 @@ public void testMinDoubleDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 3.0,
                 createDoublesBlock(3.0, 2.0, 5.0, 3.0),
@@ -190,7 +189,7 @@ public void testMaxDoubleDouble()
         List<TypeSignatureProvider> parameterTypes = fromTypes(DOUBLE, DOUBLE);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 null,
                 createDoublesBlock(null, null),
@@ -198,7 +197,7 @@ public void testMaxDoubleDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 2.0,
                 createDoublesBlock(3.0, 2.0, null),
@@ -211,7 +210,7 @@ public void testMinVarcharDouble()
         List<TypeSignatureProvider> parameterTypes = fromTypes(DOUBLE, VARCHAR);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 100.0,
                 createDoublesBlock(100.0, 1.0, 50.0, 2.0),
@@ -219,7 +218,7 @@ public void testMinVarcharDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 -1.0,
                 createDoublesBlock(100.0, 50.0, 2.0, -1.0),
@@ -232,7 +231,7 @@ public void testMinDoubleVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, DOUBLE);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 "z",
                 createStringsBlock("z", "a", "x", "b"),
@@ -240,7 +239,7 @@ public void testMinDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 "a",
                 createStringsBlock("zz", "hi", "bb", "a"),
@@ -253,7 +252,7 @@ public void testMaxDoubleVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, DOUBLE);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "a",
                 createStringsBlock("z", "a", null),
@@ -261,7 +260,7 @@ public void testMaxDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "hi",
                 createStringsBlock("zz", "hi", null, "a"),
@@ -269,7 +268,7 @@ public void testMaxDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "c",
                 createStringsBlock("a", "b", "c"),
@@ -277,7 +276,7 @@ public void testMaxDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "c",
                 createStringsBlock("a", "b", "c"),
@@ -285,7 +284,7 @@ public void testMaxDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "b",
                 createStringsBlock("a", "b", "c"),
@@ -298,7 +297,7 @@ public void testMinRealVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, REAL);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 "z",
                 createStringsBlock("z", "a", "x", "b"),
@@ -306,7 +305,7 @@ public void testMinRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 "a",
                 createStringsBlock("zz", "hi", "bb", "a"),
@@ -314,7 +313,7 @@ public void testMinRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 "b",
                 createStringsBlock("a", "b", "c"),
@@ -322,7 +321,7 @@ public void testMinRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 "a",
                 createStringsBlock("a", "b", "c"),
@@ -330,7 +329,7 @@ public void testMinRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 "a",
                 createStringsBlock("a", "b", "c"),
@@ -343,7 +342,7 @@ public void testMaxRealVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, REAL);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "a",
                 createStringsBlock("z", "a", null),
@@ -351,7 +350,7 @@ public void testMaxRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "hi",
                 createStringsBlock("zz", "hi", null, "a"),
@@ -359,7 +358,7 @@ public void testMaxRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "c",
                 createStringsBlock("a", "b", "c"),
@@ -367,7 +366,7 @@ public void testMaxRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "c",
                 createStringsBlock("a", "b", "c"),
@@ -375,7 +374,7 @@ public void testMaxRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "b",
                 createStringsBlock("a", "b", "c"),
@@ -388,7 +387,7 @@ public void testMinLongLongArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of(8L, 9L),
                 createArrayBigintBlock(ImmutableList.of(ImmutableList.of(8L, 9L), ImmutableList.of(1L, 2L), ImmutableList.of(6L, 7L), ImmutableList.of(2L, 3L))),
@@ -396,7 +395,7 @@ public void testMinLongLongArray()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of(2L),
                 createArrayBigintBlock(ImmutableList.of(ImmutableList.of(8L, 9L), ImmutableList.of(6L, 7L), ImmutableList.of(2L, 3L), ImmutableList.of(2L))),
@@ -409,7 +408,7 @@ public void testMinLongArrayLong()
         List<TypeSignatureProvider> parameterTypes = fromTypes(BIGINT, new ArrayType(BIGINT));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 3L,
                 createLongsBlock(1L, 2L, 2L, 3L),
@@ -417,7 +416,7 @@ public void testMinLongArrayLong()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 -1L,
                 createLongsBlock(0L, 1L, 2L, -1L),
@@ -430,7 +429,7 @@ public void testMaxLongArrayLong()
         List<TypeSignatureProvider> parameterTypes = fromTypes(BIGINT, new ArrayType(BIGINT));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 1L,
                 createLongsBlock(1L, 2L, 2L, 3L),
@@ -438,7 +437,7 @@ public void testMaxLongArrayLong()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 2L,
                 createLongsBlock(0L, 1L, 2L, -1L),
@@ -451,7 +450,7 @@ public void testMaxLongLongArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of(1L, 2L),
                 createArrayBigintBlock(asList(asList(3L, 4L), asList(1L, 2L), null)),
@@ -459,7 +458,7 @@ public void testMaxLongLongArray()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of(2L, 3L),
                 createArrayBigintBlock(asList(asList(3L, 4L), asList(2L, 3L), null, asList(1L, 2L))),
@@ -472,7 +471,7 @@ public void testMinLongDecimalDecimal()
         List<TypeSignatureProvider> parameterTypes = fromTypes(createDecimalType(19, 1), createDecimalType(19, 1));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 decimal("2.2", createDecimalType(19, 1)),
                 createLongDecimalsBlock("1.1", "2.2", "3.3"),
@@ -485,7 +484,7 @@ public void testMaxLongDecimalDecimal()
         List<TypeSignatureProvider> parameterTypes = fromTypes(createDecimalType(19, 1), createDecimalType(19, 1));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 decimal("3.3", createDecimalType(19, 1)),
                 createLongDecimalsBlock("1.1", "2.2", "3.3", "4.4"),
@@ -498,7 +497,7 @@ public void testMinShortDecimalDecimal()
         List<TypeSignatureProvider> parameterTypes = fromTypes(createDecimalType(10, 1), createDecimalType(10, 1));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 decimal("2.2", createDecimalType(10, 1)),
                 createShortDecimalsBlock("1.1", "2.2", "3.3"),
@@ -511,7 +510,7 @@ public void testMaxShortDecimalDecimal()
         List<TypeSignatureProvider> parameterTypes = fromTypes(createDecimalType(10, 1), createDecimalType(10, 1));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 decimal("3.3", createDecimalType(10, 1)),
                 createShortDecimalsBlock("1.1", "2.2", "3.3", "4.4"),
@@ -524,7 +523,7 @@ public void testMinBooleanVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, BOOLEAN);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 "b",
                 createStringsBlock("a", "b", "c"),
@@ -537,7 +536,7 @@ public void testMaxBooleanVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, BOOLEAN);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "c",
                 createStringsBlock("a", "b", "c"),
@@ -550,7 +549,7 @@ public void testMinIntegerVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, INTEGER);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 "a",
                 createStringsBlock("a", "b", "c"),
@@ -563,7 +562,7 @@ public void testMaxIntegerVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, INTEGER);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "c",
                 createStringsBlock("a", "b", "c"),
@@ -576,7 +575,7 @@ public void testMinBooleanLongArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), BOOLEAN);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 null,
                 createArrayBigintBlock(asList(asList(3L, 4L), null, null)),
@@ -589,7 +588,7 @@ public void testMaxBooleanLongArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), BOOLEAN);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 asList(2L, 2L),
                 createArrayBigintBlock(asList(asList(3L, 4L), null, asList(2L, 2L))),
@@ -602,7 +601,7 @@ public void testMinLongVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 "a",
                 createStringsBlock("a", "b", "c"),
@@ -615,7 +614,7 @@ public void testMaxLongVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "c",
                 createStringsBlock("a", "b", "c"),
@@ -628,7 +627,7 @@ public void testMinDoubleLongArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), DOUBLE);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 asList(3L, 4L),
                 createArrayBigintBlock(asList(asList(3L, 4L), null, asList(2L, 2L))),
@@ -636,7 +635,7 @@ public void testMinDoubleLongArray()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 null,
                 createArrayBigintBlock(asList(null, null, asList(2L, 2L))),
@@ -649,7 +648,7 @@ public void testMaxDoubleLongArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), DOUBLE);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 null,
                 createArrayBigintBlock(asList(asList(3L, 4L), null, asList(2L, 2L))),
@@ -657,7 +656,7 @@ public void testMaxDoubleLongArray()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 asList(2L, 2L),
                 createArrayBigintBlock(asList(asList(3L, 4L), null, asList(2L, 2L))),
@@ -670,7 +669,7 @@ public void testMinSliceLongArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), VARCHAR);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 asList(3L, 4L),
                 createArrayBigintBlock(asList(asList(3L, 4L), null, asList(2L, 2L))),
@@ -678,7 +677,7 @@ public void testMinSliceLongArray()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 null,
                 createArrayBigintBlock(asList(null, null, asList(2L, 2L))),
@@ -691,7 +690,7 @@ public void testMaxSliceLongArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), VARCHAR);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 asList(2L, 2L),
                 createArrayBigintBlock(asList(asList(3L, 4L), null, asList(2L, 2L))),
@@ -699,7 +698,7 @@ public void testMaxSliceLongArray()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 null,
                 createArrayBigintBlock(asList(asList(3L, 4L), null, null)),
@@ -712,7 +711,7 @@ public void testMinLongArrayLongArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), new ArrayType(BIGINT));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 asList(1L, 2L),
                 createArrayBigintBlock(asList(asList(3L, 3L), null, asList(1L, 2L))),
@@ -725,7 +724,7 @@ public void testMaxLongArrayLongArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), new ArrayType(BIGINT));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 asList(3L, 3L),
                 createArrayBigintBlock(asList(asList(3L, 3L), null, asList(1L, 2L))),
@@ -738,7 +737,7 @@ public void testMinLongArraySlice()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, new ArrayType(BIGINT));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 "c",
                 createStringsBlock("a", "b", "c"),
@@ -751,7 +750,7 @@ public void testMaxLongArraySlice()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, new ArrayType(BIGINT));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 "a",
                 createStringsBlock("a", "b", "c"),
@@ -764,7 +763,7 @@ public void testMinUnknownSlice()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, UNKNOWN);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 null,
                 createStringsBlock("a", "b", "c"),
@@ -777,7 +776,7 @@ public void testMaxUnknownSlice()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, UNKNOWN);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 null,
                 createStringsBlock("a", "b", "c"),
@@ -790,7 +789,7 @@ public void testMinUnknownLongArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), UNKNOWN);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 null,
                 createArrayBigintBlock(asList(asList(3L, 3L), null, asList(1L, 2L))),
@@ -803,7 +802,7 @@ public void testMaxUnknownLongArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), UNKNOWN);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 null,
                 createArrayBigintBlock(asList(asList(3L, 3L), null, asList(1L, 2L))),
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMultimapAggAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMultimapAggAggregation.java
index 65b0a13c5906..771e1e2d230c 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMultimapAggAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestMultimapAggAggregation.java
@@ -28,8 +28,7 @@
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -175,17 +174,17 @@ public void testEmptyStateOutputIsNull()
         GroupedAggregator groupedAggregator = aggregationFunction.createAggregatorFactory(SINGLE, Ints.asList(), OptionalInt.empty()).createGroupedAggregator();
         BlockBuilder blockBuilder = aggregationFunction.getFinalType().createBlockBuilder(null, 1);
         groupedAggregator.evaluate(0, blockBuilder);
-        assertTrue(blockBuilder.isNull(0));
+        assertTrue(blockBuilder.build().isNull(0));
     }
 
     private static TestingAggregationFunction getAggregationFunction(Type keyType, Type valueType)
     {
-        return FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("multimap_agg"), fromTypes(keyType, valueType));
+        return FUNCTION_RESOLUTION.getAggregateFunction("multimap_agg", fromTypes(keyType, valueType));
     }
 
     /**
      * Given a list of keys and a list of corresponding values, manually
-     * aggregate them into a map of list and check that Trino's aggregation has
+     * aggregate them into a map of list and check that the aggregation has
      * the same results.
      */
     private static <K, V> void testMultimapAgg(Type keyType, List<K> expectedKeys, Type valueType, List<V> expectedValues)
@@ -206,7 +205,7 @@ private static <K, V> void testMultimapAgg(Type keyType, List<K> expectedKeys, T
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("multimap_agg"),
+                "multimap_agg",
                 fromTypes(keyType, valueType),
                 map.isEmpty() ? null : map,
                 builder.build());
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestNumericHistogram.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestNumericHistogram.java
index e666d00b7945..b3f5854b24ca 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestNumericHistogram.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestNumericHistogram.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import io.airlift.slice.Slice;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashSet;
 import java.util.Map;
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestQuantileDigestAggregationFunction.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestQuantileDigestAggregationFunction.java
index ad61259d098e..6d2bf1a02cec 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestQuantileDigestAggregationFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestQuantileDigestAggregationFunction.java
@@ -25,7 +25,6 @@
 import io.trino.spi.type.StandardTypes;
 import io.trino.sql.analyzer.TypeSignatureProvider;
 import io.trino.sql.query.QueryAssertions;
-import io.trino.sql.tree.QualifiedName;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -66,7 +65,7 @@ public class TestQuantileDigestAggregationFunction
 {
     private static final Joiner ARRAY_JOINER = Joiner.on(",");
     private static final TestingFunctionResolution FUNCTION_RESOLUTION = new TestingFunctionResolution();
-    private static final QualifiedName NAME = QualifiedName.of("qdigest_agg");
+    private static final String NAME = "qdigest_agg";
 
     private QueryAssertions assertions;
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestRealHistogramAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestRealHistogramAggregation.java
index e035aeb98dd0..5bef8be7da9e 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestRealHistogramAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestRealHistogramAggregation.java
@@ -22,8 +22,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.type.MapType;
 import io.trino.sql.planner.plan.AggregationNode.Step;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.OptionalInt;
@@ -49,9 +48,7 @@ public class TestRealHistogramAggregation
 
     public TestRealHistogramAggregation()
     {
-        function = new TestingFunctionResolution().getAggregateFunction(
-                QualifiedName.of("numeric_histogram"),
-                fromTypes(BIGINT, REAL, DOUBLE));
+        function = new TestingFunctionResolution().getAggregateFunction("numeric_histogram", fromTypes(BIGINT, REAL, DOUBLE));
 
         input = makeInput(10);
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestRealRegrInterceptAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestRealRegrInterceptAggregation.java
index 1d64a00b6ece..0f86c72fd9df 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestRealRegrInterceptAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestRealRegrInterceptAggregation.java
@@ -17,7 +17,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
 import org.apache.commons.math3.stat.regression.SimpleRegression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestRealRegrSlopeAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestRealRegrSlopeAggregation.java
index aaa196fffe3d..8255c445870c 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestRealRegrSlopeAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestRealRegrSlopeAggregation.java
@@ -17,7 +17,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
 import org.apache.commons.math3.stat.regression.SimpleRegression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestTDigestAggregationFunction.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestTDigestAggregationFunction.java
index 5427fac34f98..031972d832d5 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestTDigestAggregationFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestTDigestAggregationFunction.java
@@ -20,7 +20,6 @@
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.type.SqlVarbinary;
-import io.trino.sql.tree.QualifiedName;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -106,14 +105,14 @@ private void testAggregation(Block doublesBlock, Block weightsBlock, List<Double
         // Test without weights
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("tdigest_agg"),
+                "tdigest_agg",
                 fromTypes(DOUBLE),
                 getExpectedValue(nCopies(inputs.length, DEFAULT_WEIGHT), inputs),
                 new Page(doublesBlock));
         // Test with weights
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("tdigest_agg"),
+                "tdigest_agg",
                 fromTypes(DOUBLE, DOUBLE),
                 getExpectedValue(weights, inputs),
                 new Page(doublesBlock, weightsBlock));
@@ -124,14 +123,14 @@ private void testAggregation(BiFunction<Object, Object, Boolean> equalAssertion,
         // Test without weights
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("tdigest_agg"),
+                "tdigest_agg",
                 fromTypes(DOUBLE),
                 equalAssertion, "Test multiple values",
                 new Page(doublesBlock), getExpectedValue(nCopies(inputs.length, DEFAULT_WEIGHT), inputs));
         // Test with weights
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("tdigest_agg"),
+                "tdigest_agg",
                 fromTypes(DOUBLE, DOUBLE),
                 equalAssertion,
                 "Test multiple values",
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestTypedHistogram.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestTypedHistogram.java
index a81e9f992098..dcb81d328e2f 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestTypedHistogram.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestTypedHistogram.java
@@ -13,50 +13,93 @@
  */
 package io.trino.operator.aggregation;
 
-import io.trino.operator.aggregation.histogram.SingleTypedHistogram;
 import io.trino.operator.aggregation.histogram.TypedHistogram;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.MapType;
+import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
-import io.trino.type.BlockTypeOperators;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.IntUnaryOperator;
+import java.util.function.ObjIntConsumer;
 import java.util.stream.IntStream;
 
+import static io.trino.block.BlockAssertions.assertBlockEquals;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
+import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.util.StructuralTestUtil.mapType;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 public class TestTypedHistogram
 {
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
+
     @Test
     public void testMassive()
     {
-        BlockBuilder inputBlockBuilder = BIGINT.createBlockBuilder(null, 5000);
-
-        BlockTypeOperators blockTypeOperators = new BlockTypeOperators(new TypeOperators());
-        TypedHistogram typedHistogram = new SingleTypedHistogram(
-                BIGINT,
-                blockTypeOperators.getEqualOperator(BIGINT),
-                blockTypeOperators.getHashCodeOperator(BIGINT),
-                1000);
+        testMassive(false, BIGINT, BIGINT::writeLong);
+        testMassive(false, VARCHAR, (blockBuilder, value) -> VARCHAR.writeString(blockBuilder, String.valueOf(value)));
+        testMassive(true, BIGINT, BIGINT::writeLong);
+        testMassive(true, VARCHAR, (blockBuilder, value) -> VARCHAR.writeString(blockBuilder, String.valueOf(value)));
+    }
+
+    private static void testMassive(boolean grouped, Type type, ObjIntConsumer<BlockBuilder> writeData)
+    {
+        BlockBuilder inputBlockBuilder = type.createBlockBuilder(null, 5000);
         IntStream.range(1, 2000)
-                .flatMap(i -> IntStream.iterate(i, IntUnaryOperator.identity()).limit(i))
-                .forEach(j -> BIGINT.writeLong(inputBlockBuilder, j));
+                .flatMap(value -> IntStream.iterate(value, IntUnaryOperator.identity()).limit(value))
+                .forEach(value -> writeData.accept(inputBlockBuilder, value));
+        ValueBlock inputBlock = inputBlockBuilder.buildValueBlock();
 
-        Block inputBlock = inputBlockBuilder.build();
+        TypedHistogram typedHistogram = new TypedHistogram(
+                type,
+                TYPE_OPERATORS.getReadValueOperator(type, simpleConvention(BLOCK_BUILDER, FLAT)),
+                TYPE_OPERATORS.getReadValueOperator(type, simpleConvention(FLAT_RETURN, VALUE_BLOCK_POSITION_NOT_NULL)),
+                TYPE_OPERATORS.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, FLAT)),
+                TYPE_OPERATORS.getDistinctFromOperator(type, simpleConvention(FAIL_ON_NULL, FLAT, VALUE_BLOCK_POSITION_NOT_NULL)),
+                TYPE_OPERATORS.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, VALUE_BLOCK_POSITION_NOT_NULL)),
+                grouped);
+
+        int groupId = 0;
+        if (grouped) {
+            groupId = 10;
+            typedHistogram.setMaxGroupId(groupId);
+        }
         for (int i = 0; i < inputBlock.getPositionCount(); i++) {
-            typedHistogram.add(i, inputBlock, 1);
+            typedHistogram.add(groupId, inputBlock, i, 1);
         }
 
-        MapType mapType = mapType(BIGINT, BIGINT);
-        BlockBuilder out = mapType.createBlockBuilder(null, 1);
-        typedHistogram.serialize(out);
-        Block outputBlock = mapType.getObject(out, 0);
-        for (int i = 0; i < outputBlock.getPositionCount(); i += 2) {
-            assertEquals(BIGINT.getLong(outputBlock, i + 1), BIGINT.getLong(outputBlock, i));
+        MapType mapType = mapType(type, BIGINT);
+        MapBlockBuilder actualBuilder = mapType.createBlockBuilder(null, 1);
+        typedHistogram.serialize(groupId, actualBuilder);
+        Block actualBlock = actualBuilder.build();
+
+        MapBlockBuilder expectedBuilder = mapType.createBlockBuilder(null, 1);
+        expectedBuilder.buildEntry((keyBuilder, valueBuilder) -> IntStream.range(1, 2000)
+                .forEach(value -> {
+                    writeData.accept(keyBuilder, value);
+                    BIGINT.writeLong(valueBuilder, value);
+                }));
+        Block expectedBlock = expectedBuilder.build();
+        assertBlockEquals(mapType, actualBlock, expectedBlock);
+        assertEquals(typedHistogram.size(), 1999);
+
+        if (grouped) {
+            actualBuilder = mapType.createBlockBuilder(null, 1);
+            typedHistogram.serialize(3, actualBuilder);
+            actualBlock = actualBuilder.build();
+            assertThat(actualBlock.getPositionCount()).isEqualTo(1);
+            assertThat(actualBlock.isNull(0)).isTrue();
         }
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestTypedSet.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestTypedSet.java
deleted file mode 100644
index 39ef00e26fc1..000000000000
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestTypedSet.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.spi.PageBuilder;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeOperators;
-import io.trino.type.BlockTypeOperators;
-import org.testng.annotations.Test;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static io.airlift.slice.Slices.utf8Slice;
-import static io.trino.block.BlockAssertions.createEmptyLongsBlock;
-import static io.trino.block.BlockAssertions.createLongSequenceBlock;
-import static io.trino.block.BlockAssertions.createLongsBlock;
-import static io.trino.spi.StandardErrorCode.EXCEEDED_FUNCTION_MEMORY_LIMIT;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
-import static java.util.Collections.nCopies;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-public class TestTypedSet
-{
-    private static final BlockTypeOperators BLOCK_TYPE_OPERATORS = new BlockTypeOperators(new TypeOperators());
-    private static final String FUNCTION_NAME = "typed_set_test";
-
-    @Test
-    public void testConstructor()
-    {
-        for (int i = -2; i <= -1; i++) {
-            int expectedSize = i;
-            assertThatThrownBy(() -> createEqualityTypedSet(BIGINT, expectedSize))
-                    .isInstanceOf(IllegalArgumentException.class)
-                    .hasMessage("expectedSize must not be negative");
-        }
-
-        assertThatThrownBy(() -> TypedSet.createEqualityTypedSet(null, null, null, 1, FUNCTION_NAME))
-                .isInstanceOfAny(NullPointerException.class, IllegalArgumentException.class);
-    }
-
-    @Test
-    public void testGetElementPosition()
-    {
-        int elementCount = 100;
-        // Set initialTypedSetEntryCount to a small number to trigger rehash()
-        int initialTypedSetEntryCount = 10;
-        TypedSet typedSet = createEqualityTypedSet(BIGINT, initialTypedSetEntryCount);
-        BlockBuilder blockBuilder = BIGINT.createFixedSizeBlockBuilder(elementCount);
-        for (int i = 0; i < elementCount; i++) {
-            BIGINT.writeLong(blockBuilder, i);
-            typedSet.add(blockBuilder, i);
-        }
-
-        assertEquals(typedSet.size(), elementCount);
-
-        for (int j = 0; j < blockBuilder.getPositionCount(); j++) {
-            assertEquals(typedSet.positionOf(blockBuilder, j), j);
-        }
-    }
-
-    @Test
-    public void testGetElementPositionWithNull()
-    {
-        int elementCount = 100;
-        // Set initialTypedSetEntryCount to a small number to trigger rehash()
-        int initialTypedSetEntryCount = 10;
-        TypedSet typedSet = createEqualityTypedSet(BIGINT, initialTypedSetEntryCount);
-        BlockBuilder blockBuilder = BIGINT.createFixedSizeBlockBuilder(elementCount);
-        for (int i = 0; i < elementCount; i++) {
-            if (i % 10 == 0) {
-                blockBuilder.appendNull();
-            }
-            else {
-                BIGINT.writeLong(blockBuilder, i);
-            }
-            typedSet.add(blockBuilder, i);
-        }
-
-        // The internal elementBlock and hashtable of the typedSet should contain
-        // all distinct non-null elements plus one null
-        assertEquals(typedSet.size(), elementCount - elementCount / 10 + 1);
-
-        int nullCount = 0;
-        for (int j = 0; j < blockBuilder.getPositionCount(); j++) {
-            // The null is only added to typedSet once, so the internal elementBlock subscript is shifted by nullCountMinusOne
-            if (!blockBuilder.isNull(j)) {
-                assertEquals(typedSet.positionOf(blockBuilder, j), j - nullCount + 1);
-            }
-            else {
-                // The first null added to typedSet is at position 0
-                assertEquals(typedSet.positionOf(blockBuilder, j), 0);
-                nullCount++;
-            }
-        }
-    }
-
-    @Test
-    public void testGetElementPositionWithProvidedEmptyBlockBuilder()
-    {
-        int elementCount = 100;
-        // Set initialTypedSetEntryCount to a small number to trigger rehash()
-        int initialTypedSetEntryCount = 10;
-
-        BlockBuilder emptyBlockBuilder = BIGINT.createFixedSizeBlockBuilder(elementCount);
-        TypedSet typedSet = createDistinctTypedSet(BIGINT, initialTypedSetEntryCount, emptyBlockBuilder);
-        BlockBuilder externalBlockBuilder = BIGINT.createFixedSizeBlockBuilder(elementCount);
-        for (int i = 0; i < elementCount; i++) {
-            if (i % 10 == 0) {
-                externalBlockBuilder.appendNull();
-            }
-            else {
-                BIGINT.writeLong(externalBlockBuilder, i);
-            }
-            typedSet.add(externalBlockBuilder, i);
-        }
-
-        assertEquals(typedSet.size(), emptyBlockBuilder.getPositionCount());
-        assertEquals(typedSet.size(), elementCount - elementCount / 10 + 1);
-
-        for (int j = 0; j < typedSet.size(); j++) {
-            assertEquals(typedSet.positionOf(emptyBlockBuilder, j), j);
-        }
-    }
-
-    @Test
-    public void testGetElementPositionWithProvidedNonEmptyBlockBuilder()
-    {
-        int elementCount = 100;
-        // Set initialTypedSetEntryCount to a small number to trigger rehash()
-        int initialTypedSetEntryCount = 10;
-
-        PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(BIGINT));
-        BlockBuilder firstBlockBuilder = pageBuilder.getBlockBuilder(0);
-
-        for (int i = 0; i < elementCount; i++) {
-            BIGINT.writeLong(firstBlockBuilder, i);
-        }
-        pageBuilder.declarePositions(elementCount);
-
-        // The secondBlockBuilder should already have elementCount rows.
-        BlockBuilder secondBlockBuilder = pageBuilder.getBlockBuilder(0);
-
-        TypedSet typedSet = createDistinctTypedSet(BIGINT, initialTypedSetEntryCount, secondBlockBuilder);
-        BlockBuilder externalBlockBuilder = BIGINT.createFixedSizeBlockBuilder(elementCount);
-        for (int i = 0; i < elementCount; i++) {
-            if (i % 10 == 0) {
-                externalBlockBuilder.appendNull();
-            }
-            else {
-                BIGINT.writeLong(externalBlockBuilder, i);
-            }
-            typedSet.add(externalBlockBuilder, i);
-        }
-
-        assertEquals(typedSet.size(), secondBlockBuilder.getPositionCount() - elementCount);
-        assertEquals(typedSet.size(), elementCount - elementCount / 10 + 1);
-
-        for (int i = 0; i < typedSet.size(); i++) {
-            int expectedPositionInSecondBlockBuilder = i + elementCount;
-            assertEquals(typedSet.positionOf(secondBlockBuilder, expectedPositionInSecondBlockBuilder), expectedPositionInSecondBlockBuilder);
-        }
-    }
-
-    @Test
-    public void testGetElementPositionRandom()
-    {
-        TypedSet set = createEqualityTypedSet(VARCHAR, 1);
-        testGetElementPositionRandomFor(set);
-
-        BlockBuilder emptyBlockBuilder = VARCHAR.createBlockBuilder(null, 3);
-        TypedSet setWithPassedInBuilder = createDistinctTypedSet(VARCHAR, 1, emptyBlockBuilder);
-        testGetElementPositionRandomFor(setWithPassedInBuilder);
-    }
-
-    @Test
-    public void testBigintSimpleTypedSet()
-    {
-        List<Integer> expectedSetSizes = ImmutableList.of(1, 10, 100, 1000);
-        List<Block> longBlocks =
-                ImmutableList.of(
-                        createEmptyLongsBlock(),
-                        createLongsBlock(1L),
-                        createLongsBlock(1L, 2L, 3L),
-                        createLongsBlock(1L, 2L, 3L, 1L, 2L, 3L),
-                        createLongsBlock(1L, null, 3L),
-                        createLongsBlock(null, null, null),
-                        createLongSequenceBlock(0, 100),
-                        createLongSequenceBlock(-100, 100),
-                        createLongsBlock(nCopies(1, null)),
-                        createLongsBlock(nCopies(100, null)),
-                        createLongsBlock(nCopies(expectedSetSizes.get(expectedSetSizes.size() - 1) * 2, null)),
-                        createLongsBlock(nCopies(expectedSetSizes.get(expectedSetSizes.size() - 1) * 2, 0L)));
-
-        for (int expectedSetSize : expectedSetSizes) {
-            for (Block block : longBlocks) {
-                testBigint(block, expectedSetSize);
-            }
-        }
-    }
-
-    @Test
-    public void testMemoryExceeded()
-    {
-        assertTrinoExceptionThrownBy(() -> {
-            TypedSet typedSet = createEqualityTypedSet(BIGINT, 10);
-            for (int i = 0; i <= TypedSet.MAX_FUNCTION_MEMORY.toBytes() + 1; i++) {
-                Block block = createLongsBlock(nCopies(1, (long) i));
-                typedSet.add(block, 0);
-            }
-        }).hasErrorCode(EXCEEDED_FUNCTION_MEMORY_LIMIT);
-    }
-
-    private void testGetElementPositionRandomFor(TypedSet set)
-    {
-        BlockBuilder keys = VARCHAR.createBlockBuilder(null, 5);
-        VARCHAR.writeSlice(keys, utf8Slice("hello"));
-        VARCHAR.writeSlice(keys, utf8Slice("bye"));
-        VARCHAR.writeSlice(keys, utf8Slice("abc"));
-
-        for (int i = 0; i < keys.getPositionCount(); i++) {
-            set.add(keys, i);
-        }
-
-        BlockBuilder values = VARCHAR.createBlockBuilder(null, 5);
-        VARCHAR.writeSlice(values, utf8Slice("bye"));
-        VARCHAR.writeSlice(values, utf8Slice("abc"));
-        VARCHAR.writeSlice(values, utf8Slice("hello"));
-        VARCHAR.writeSlice(values, utf8Slice("bad"));
-        values.appendNull();
-
-        assertEquals(set.positionOf(values, 4), -1);
-        assertEquals(set.positionOf(values, 2), 0);
-        assertEquals(set.positionOf(values, 1), 2);
-        assertEquals(set.positionOf(values, 0), 1);
-        assertFalse(set.contains(values, 3));
-
-        set.add(values, 4);
-        assertTrue(set.contains(values, 4));
-    }
-
-    private static void testBigint(Block longBlock, int expectedSetSize)
-    {
-        TypedSet typedSet = createEqualityTypedSet(BIGINT, expectedSetSize);
-        testBigintFor(typedSet, longBlock);
-
-        BlockBuilder emptyBlockBuilder = BIGINT.createBlockBuilder(null, expectedSetSize);
-        TypedSet typedSetWithPassedInBuilder = createDistinctTypedSet(BIGINT, expectedSetSize, emptyBlockBuilder);
-        testBigintFor(typedSetWithPassedInBuilder, longBlock);
-    }
-
-    private static TypedSet createEqualityTypedSet(Type type, int expectedSize)
-    {
-        return TypedSet.createEqualityTypedSet(
-                type,
-                BLOCK_TYPE_OPERATORS.getEqualOperator(type),
-                BLOCK_TYPE_OPERATORS.getHashCodeOperator(type),
-                expectedSize,
-                FUNCTION_NAME);
-    }
-
-    private static TypedSet createDistinctTypedSet(Type type, int expectedSize, BlockBuilder blockBuilder)
-    {
-        return TypedSet.createDistinctTypedSet(
-                type,
-                BLOCK_TYPE_OPERATORS.getDistinctFromOperator(type),
-                BLOCK_TYPE_OPERATORS.getHashCodeOperator(type),
-                blockBuilder,
-                expectedSize,
-                FUNCTION_NAME);
-    }
-
-    private static void testBigintFor(TypedSet typedSet, Block longBlock)
-    {
-        Set<Long> set = new HashSet<>();
-        for (int blockPosition = 0; blockPosition < longBlock.getPositionCount(); blockPosition++) {
-            long number = BIGINT.getLong(longBlock, blockPosition);
-            assertEquals(typedSet.contains(longBlock, blockPosition), set.contains(number));
-            assertEquals(typedSet.size(), set.size());
-
-            set.add(number);
-            typedSet.add(longBlock, blockPosition);
-
-            assertEquals(typedSet.contains(longBlock, blockPosition), set.contains(number));
-            assertEquals(typedSet.size(), set.size());
-        }
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestingAggregationFunction.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestingAggregationFunction.java
index 8947bb94ed18..63ce7741b279 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/TestingAggregationFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/TestingAggregationFunction.java
@@ -22,7 +22,6 @@
 import io.trino.spi.type.TypeOperators;
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.sql.planner.plan.AggregationNode.Step;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
 import java.util.OptionalInt;
@@ -52,12 +51,11 @@ public TestingAggregationFunction(BoundSignature signature, FunctionNullability
                 .collect(toImmutableList());
         intermediateType = (intermediateTypes.size() == 1) ? getOnlyElement(intermediateTypes) : RowType.anonymous(intermediateTypes);
         this.finalType = signature.getReturnType();
-        this.factory = generateAccumulatorFactory(signature, aggregationImplementation, functionNullability);
+        this.factory = generateAccumulatorFactory(signature, aggregationImplementation, functionNullability, true);
         distinctFactory = new DistinctAccumulatorFactory(
                 factory,
                 parameterTypes,
                 new JoinCompiler(TYPE_OPERATORS),
-                new BlockTypeOperators(TYPE_OPERATORS),
                 TEST_SESSION);
     }
 
@@ -72,7 +70,6 @@ public TestingAggregationFunction(List<Type> parameterTypes, List<Type> intermed
                 factory,
                 parameterTypes,
                 new JoinCompiler(TYPE_OPERATORS),
-                new BlockTypeOperators(TYPE_OPERATORS),
                 TEST_SESSION);
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/groupby/AggregationTestInput.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/groupby/AggregationTestInput.java
index 4127d7e6892a..592fa0b3ee61 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/groupby/AggregationTestInput.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/groupby/AggregationTestInput.java
@@ -15,7 +15,6 @@
 package io.trino.operator.aggregation.groupby;
 
 import com.google.common.primitives.Ints;
-import io.trino.operator.GroupByIdBlock;
 import io.trino.operator.aggregation.AggregationTestUtils;
 import io.trino.operator.aggregation.GroupedAggregator;
 import io.trino.operator.aggregation.TestingAggregationFunction;
@@ -25,6 +24,7 @@
 import java.util.OptionalInt;
 import java.util.stream.IntStream;
 
+import static io.trino.operator.aggregation.AggregationTestUtils.createGroupByIdBlock;
 import static io.trino.sql.planner.plan.AggregationNode.Step.SINGLE;
 
 public class AggregationTestInput
@@ -43,20 +43,15 @@ public AggregationTestInput(TestingAggregationFunction function, Page[] pages, i
         this.offset = offset;
     }
 
-    public void runPagesOnAggregatorWithAssertion(long groupId, Type finalType, GroupedAggregator groupedAggregator, AggregationTestOutput expectedValue)
+    public void runPagesOnAggregatorWithAssertion(int groupId, Type finalType, GroupedAggregator groupedAggregator, AggregationTestOutput expectedValue)
     {
         for (Page page : getPages()) {
-            groupedAggregator.processPage(getGroupIdBlock(groupId, page), page);
+            groupedAggregator.processPage(groupId, createGroupByIdBlock(groupId, page.getPositionCount()), page);
         }
 
         expectedValue.validateAggregator(finalType, groupedAggregator, groupId);
     }
 
-    private static GroupByIdBlock getGroupIdBlock(long groupId, Page page)
-    {
-        return AggregationTestUtils.createGroupByIdBlock((int) groupId, page.getPositionCount());
-    }
-
     private Page[] getPages()
     {
         Page[] pages = this.pages;
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/histogram/TestValueStore.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/histogram/TestValueStore.java
deleted file mode 100644
index ffa63791ef99..000000000000
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/histogram/TestValueStore.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.aggregation.histogram;
-
-import io.trino.block.BlockAssertions;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.TypeOperators;
-import io.trino.spi.type.VarcharType;
-import io.trino.type.BlockTypeOperators;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
-import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-@Test(singleThreaded = true)
-public class TestValueStore
-{
-    private ValueStore valueStore;
-    private Block block;
-    private BlockPositionHashCode hashCodeOperator;
-    private ValueStore valueStoreSmall;
-
-    @BeforeMethod(alwaysRun = true)
-    public void setUp()
-    {
-        VarcharType type = VarcharType.createVarcharType(100);
-        BlockTypeOperators blockTypeOperators = new BlockTypeOperators(new TypeOperators());
-        BlockPositionEqual equalOperator = blockTypeOperators.getEqualOperator(type);
-        hashCodeOperator = blockTypeOperators.getHashCodeOperator(type);
-        BlockBuilder blockBuilder = type.createBlockBuilder(null, 100, 10);
-        valueStore = new ValueStore(type, equalOperator, 100, blockBuilder);
-        valueStoreSmall = new ValueStore(type, equalOperator, 1, blockBuilder);
-        block = BlockAssertions.createStringsBlock("a", "b", "c", "d");
-    }
-
-    @Test
-    public void testUniqueness()
-    {
-        assertEquals(valueStore.addAndGetPosition(block, 0, hashCodeOperator.hashCode(block, 0)), 0);
-        assertEquals(valueStore.addAndGetPosition(block, 1, hashCodeOperator.hashCode(block, 1)), 1);
-        assertEquals(valueStore.addAndGetPosition(block, 2, hashCodeOperator.hashCode(block, 2)), 2);
-        assertEquals(valueStore.addAndGetPosition(block, 1, hashCodeOperator.hashCode(block, 1)), 1);
-        assertEquals(valueStore.addAndGetPosition(block, 3, hashCodeOperator.hashCode(block, 1)), 3);
-    }
-
-    @Test
-    public void testTriggerRehash()
-    {
-        long hash0 = hashCodeOperator.hashCode(block, 0);
-        long hash1 = hashCodeOperator.hashCode(block, 1);
-        long hash2 = hashCodeOperator.hashCode(block, 2);
-
-        assertEquals(valueStoreSmall.addAndGetPosition(block, 0, hash0), 0);
-        assertEquals(valueStoreSmall.addAndGetPosition(block, 1, hash1), 1);
-
-        // triggers rehash and hash1 will end up in position 3
-        assertEquals(valueStoreSmall.addAndGetPosition(block, 2, hash2), 2);
-
-        // this is just to make sure we trigger rehash code positions should be the same
-        assertTrue(valueStoreSmall.getRehashCount() > 0);
-        assertEquals(valueStoreSmall.addAndGetPosition(block, 0, hash0), 0);
-        assertEquals(valueStoreSmall.addAndGetPosition(block, 1, hash1), 1);
-        assertEquals(valueStoreSmall.addAndGetPosition(block, 2, hash2), 2);
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/listagg/TestListaggAggregationFunction.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/listagg/TestListaggAggregationFunction.java
index 1aabfd0ed015..5cc028271641 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/listagg/TestListaggAggregationFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/listagg/TestListaggAggregationFunction.java
@@ -14,16 +14,14 @@
 package io.trino.operator.aggregation.listagg;
 
 import io.airlift.slice.Slice;
-import io.trino.block.BlockAssertions;
 import io.trino.metadata.TestingFunctionResolution;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.sql.analyzer.TypeSignatureProvider;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import static io.airlift.slice.Slices.utf8Slice;
@@ -37,8 +35,6 @@
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
 public class TestListaggAggregationFunction
 {
@@ -50,31 +46,21 @@ public void testInputEmptyState()
         SingleListaggAggregationState state = new SingleListaggAggregationState();
 
         String s = "value1";
-        Block value = createStringsBlock(s);
+        ValueBlock value = createStringsBlock(s);
         Slice separator = utf8Slice(",");
         Slice overflowFiller = utf8Slice("...");
         ListaggAggregationFunction.input(
                 state,
                 value,
+                0,
                 separator,
                 false,
                 overflowFiller,
-                true,
-                0);
+                true);
 
-        assertFalse(state.isEmpty());
-        assertEquals(state.getSeparator(), separator);
-        assertFalse(state.isOverflowError());
-        assertEquals(state.getOverflowFiller(), overflowFiller);
-        assertTrue(state.showOverflowEntryCount());
-
-        BlockBuilder out = new VariableWidthBlockBuilder(null, 16, 128);
-        state.forEach((block, position) -> {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), out);
-            return true;
-        });
-        out.closeEntry();
-        String result = (String) BlockAssertions.getOnlyValue(VARCHAR, out);
+        VariableWidthBlockBuilder blockBuilder = VARCHAR.createBlockBuilder(null, 1);
+        state.write(blockBuilder);
+        String result = VARCHAR.getSlice(blockBuilder.build(), 0).toString(StandardCharsets.UTF_8);
         assertEquals(result, s);
     }
 
@@ -88,11 +74,11 @@ public void testInputOverflowOverflowFillerTooLong()
         assertThatThrownBy(() -> ListaggAggregationFunction.input(
                 state,
                 createStringsBlock("value1"),
+                0,
                 utf8Slice(","),
                 false,
                 utf8Slice(overflowFillerTooLong),
-                false,
-                0))
+                false))
                 .isInstanceOf(TrinoException.class)
                 .matches(throwable -> ((TrinoException) throwable).getErrorCode() == INVALID_FUNCTION_ARGUMENT.toErrorCode());
     }
@@ -110,9 +96,9 @@ public void testOutputStateWithOverflowError()
     {
         SingleListaggAggregationState state = createListaggAggregationState("", true, "...", false,
                 "overflowvalue1", "overflowvalue2");
+        state.setMaxOutputLength(20);
 
-        BlockBuilder out = new VariableWidthBlockBuilder(null, 16, 128);
-        assertThatThrownBy(() -> ListaggAggregationFunction.outputState(state, out, 20))
+        assertThatThrownBy(() -> state.write(VARCHAR.createBlockBuilder(null, 1)))
                 .isInstanceOf(TrinoException.class)
                 .matches(throwable -> ((TrinoException) throwable).getErrorCode() == EXCEEDED_FUNCTION_MEMORY_LIMIT.toErrorCode());
     }
@@ -222,7 +208,7 @@ public void testExecute()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, VARCHAR, BOOLEAN, VARCHAR, BOOLEAN);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("listagg"),
+                "listagg",
                 parameterTypes,
                 null,
                 createStringsBlock(null, null, null),
@@ -232,7 +218,7 @@ public void testExecute()
                 createBooleansBlock(false, false, false));
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("listagg"),
+                "listagg",
                 parameterTypes,
                 "a,c",
                 createStringsBlock("a", null, "c"),
@@ -244,18 +230,16 @@ public void testExecute()
 
     private static String getOutputStateOnlyValue(SingleListaggAggregationState state, int maxOutputLengthInBytes)
     {
-        BlockBuilder out = new VariableWidthBlockBuilder(null, 32, 256);
-        ListaggAggregationFunction.outputState(state, out, maxOutputLengthInBytes);
-        return (String) BlockAssertions.getOnlyValue(VARCHAR, out);
+        VariableWidthBlockBuilder blockBuilder = VARCHAR.createBlockBuilder(null, 1, maxOutputLengthInBytes + 20);
+        state.setMaxOutputLength(maxOutputLengthInBytes);
+        state.write(blockBuilder);
+        return VARCHAR.getSlice(blockBuilder.build(), 0).toStringUtf8();
     }
 
     private static SingleListaggAggregationState createListaggAggregationState(String separator, boolean overflowError, String overflowFiller, boolean showOverflowEntryCount, String... values)
     {
         SingleListaggAggregationState state = new SingleListaggAggregationState();
-        state.setSeparator(utf8Slice(separator));
-        state.setOverflowError(overflowError);
-        state.setOverflowFiller(utf8Slice(overflowFiller));
-        state.setShowOverflowEntryCount(showOverflowEntryCount);
+        state.initialize(utf8Slice(separator), overflowError, utf8Slice(overflowFiller), showOverflowEntryCount);
         for (String value : values) {
             state.add(createStringsBlock(value), 0);
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxbyn/TestMinMaxByNAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxbyn/TestMinMaxByNAggregation.java
index 94b1bb265ddd..ac7d1deba429 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxbyn/TestMinMaxByNAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxbyn/TestMinMaxByNAggregation.java
@@ -20,8 +20,7 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.ArrayType;
 import io.trino.sql.analyzer.TypeSignatureProvider;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
@@ -51,7 +50,7 @@ public void testMaxDoubleDouble()
         List<TypeSignatureProvider> parameterTypes = fromTypes(DOUBLE, DOUBLE, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 Arrays.asList((Double) null),
                 createDoublesBlock(1.0, null),
@@ -60,7 +59,7 @@ public void testMaxDoubleDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 null,
                 createDoublesBlock(null, null),
@@ -69,7 +68,7 @@ public void testMaxDoubleDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 Arrays.asList(1.0),
                 createDoublesBlock(null, 1.0, null, null),
@@ -78,7 +77,7 @@ public void testMaxDoubleDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 Arrays.asList(1.0),
                 createDoublesBlock(1.0),
@@ -87,7 +86,7 @@ public void testMaxDoubleDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 null,
                 createDoublesBlock(),
@@ -96,7 +95,7 @@ public void testMaxDoubleDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of(2.5),
                 createDoublesBlock(2.5, 2.0, 5.0, 3.0),
@@ -105,7 +104,7 @@ public void testMaxDoubleDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of(2.5, 3.0),
                 createDoublesBlock(2.5, 2.0, 5.0, 3.0),
@@ -119,7 +118,7 @@ public void testMinDoubleDouble()
         List<TypeSignatureProvider> parameterTypes = fromTypes(DOUBLE, DOUBLE, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 Arrays.asList((Double) null),
                 createDoublesBlock(1.0, null),
@@ -128,7 +127,7 @@ public void testMinDoubleDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 null,
                 createDoublesBlock(null, null),
@@ -137,7 +136,7 @@ public void testMinDoubleDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of(2.0),
                 createDoublesBlock(2.5, 2.0, 5.0, 3.0),
@@ -146,7 +145,7 @@ public void testMinDoubleDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of(2.0, 5.0),
                 createDoublesBlock(2.5, 2.0, 5.0, 3.0),
@@ -160,7 +159,7 @@ public void testMinDoubleVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, DOUBLE, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("z", "a"),
                 createStringsBlock("z", "a", "x", "b"),
@@ -169,7 +168,7 @@ public void testMinDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("a", "zz"),
                 createStringsBlock("zz", "hi", "bb", "a"),
@@ -178,7 +177,7 @@ public void testMinDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("a", "zz"),
                 createStringsBlock("zz", "hi", null, "a"),
@@ -187,7 +186,7 @@ public void testMinDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("b", "c"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -196,7 +195,7 @@ public void testMinDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("a", "c"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -205,7 +204,7 @@ public void testMinDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("a", "b"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -214,7 +213,7 @@ public void testMinDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("a", "b"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -223,7 +222,7 @@ public void testMinDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("a", "b"),
                 createStringsBlock("a", "b"),
@@ -237,7 +236,7 @@ public void testMaxDoubleVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, DOUBLE, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("a", "z"),
                 createStringsBlock("z", "a", null),
@@ -246,7 +245,7 @@ public void testMaxDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("bb", "hi"),
                 createStringsBlock("zz", "hi", "bb", "a"),
@@ -255,7 +254,7 @@ public void testMaxDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("hi", "zz"),
                 createStringsBlock("zz", "hi", null, "a"),
@@ -264,7 +263,7 @@ public void testMaxDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("d", "c"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -273,7 +272,7 @@ public void testMaxDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("d", "c"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -282,7 +281,7 @@ public void testMaxDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("d", "b"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -291,7 +290,7 @@ public void testMaxDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("c", "b"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -300,7 +299,7 @@ public void testMaxDoubleVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("a", "b"),
                 createStringsBlock("a", "b"),
@@ -314,7 +313,7 @@ public void testMinRealVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, REAL, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("z", "a"),
                 createStringsBlock("z", "a", "x", "b"),
@@ -323,7 +322,7 @@ public void testMinRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("a", "zz"),
                 createStringsBlock("zz", "hi", "bb", "a"),
@@ -332,7 +331,7 @@ public void testMinRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("a", "zz"),
                 createStringsBlock("zz", "hi", null, "a"),
@@ -341,7 +340,7 @@ public void testMinRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("b", "c"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -350,7 +349,7 @@ public void testMinRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("a", "c"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -359,7 +358,7 @@ public void testMinRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("a", "b"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -368,7 +367,7 @@ public void testMinRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("a", "b"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -377,7 +376,7 @@ public void testMinRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("a", "b"),
                 createStringsBlock("a", "b"),
@@ -391,7 +390,7 @@ public void testMaxRealVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, REAL, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("a", "z"),
                 createStringsBlock("z", "a", null),
@@ -400,7 +399,7 @@ public void testMaxRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("bb", "hi"),
                 createStringsBlock("zz", "hi", "bb", "a"),
@@ -409,7 +408,7 @@ public void testMaxRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("hi", "zz"),
                 createStringsBlock("zz", "hi", null, "a"),
@@ -418,7 +417,7 @@ public void testMaxRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("d", "c"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -427,7 +426,7 @@ public void testMaxRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("d", "c"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -436,7 +435,7 @@ public void testMaxRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("d", "b"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -445,7 +444,7 @@ public void testMaxRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("c", "b"),
                 createStringsBlock("a", "b", "c", "d"),
@@ -454,7 +453,7 @@ public void testMaxRealVarchar()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("a", "b"),
                 createStringsBlock("a", "b"),
@@ -468,7 +467,7 @@ public void testMinVarcharDouble()
         List<TypeSignatureProvider> parameterTypes = fromTypes(DOUBLE, VARCHAR, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of(2.0, 3.0),
                 createDoublesBlock(1.0, 2.0, 2.0, 3.0),
@@ -477,7 +476,7 @@ public void testMinVarcharDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of(-1.0, 2.0),
                 createDoublesBlock(0.0, 1.0, 2.0, -1.0),
@@ -486,7 +485,7 @@ public void testMinVarcharDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of(-1.0, 1.0),
                 createDoublesBlock(0.0, 1.0, null, -1.0),
@@ -500,7 +499,7 @@ public void testMaxVarcharDouble()
         List<TypeSignatureProvider> parameterTypes = fromTypes(DOUBLE, VARCHAR, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of(1.0, 2.0),
                 createDoublesBlock(1.0, 2.0, null),
@@ -509,7 +508,7 @@ public void testMaxVarcharDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of(0.0, 1.0),
                 createDoublesBlock(0.0, 1.0, 2.0, -1.0),
@@ -518,7 +517,7 @@ public void testMaxVarcharDouble()
 
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of(0.0, 1.0),
                 createDoublesBlock(0.0, 1.0, null, -1.0),
@@ -532,7 +531,7 @@ public void testMinVarcharArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), VARCHAR, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of(ImmutableList.of(2L, 3L), ImmutableList.of(4L, 5L)),
                 createArrayBigintBlock(ImmutableList.of(ImmutableList.of(1L, 2L), ImmutableList.of(2L, 3L), ImmutableList.of(3L, 4L), ImmutableList.of(4L, 5L))),
@@ -546,7 +545,7 @@ public void testMaxVarcharArray()
         List<TypeSignatureProvider> parameterTypes = fromTypes(new ArrayType(BIGINT), VARCHAR, BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of(ImmutableList.of(1L, 2L), ImmutableList.of(3L, 4L)),
                 createArrayBigintBlock(ImmutableList.of(ImmutableList.of(1L, 2L), ImmutableList.of(2L, 3L), ImmutableList.of(3L, 4L), ImmutableList.of(4L, 5L))),
@@ -560,7 +559,7 @@ public void testMinArrayVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, new ArrayType(BIGINT), BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("min_by"),
+                "min_by",
                 parameterTypes,
                 ImmutableList.of("b", "x", "z"),
                 createStringsBlock("z", "a", "x", "b"),
@@ -574,7 +573,7 @@ public void testMaxArrayVarchar()
         List<TypeSignatureProvider> parameterTypes = fromTypes(VARCHAR, new ArrayType(BIGINT), BIGINT);
         assertAggregation(
                 FUNCTION_RESOLUTION,
-                QualifiedName.of("max_by"),
+                "max_by",
                 parameterTypes,
                 ImmutableList.of("a", "z", "x"),
                 createStringsBlock("z", "a", "x", "b"),
@@ -585,7 +584,7 @@ public void testMaxArrayVarchar()
     @Test
     public void testOutOfBound()
     {
-        TestingAggregationFunction function = FUNCTION_RESOLUTION.getAggregateFunction(QualifiedName.of("max_by"), fromTypes(VARCHAR, BIGINT, BIGINT));
+        TestingAggregationFunction function = FUNCTION_RESOLUTION.getAggregateFunction("max_by", fromTypes(VARCHAR, BIGINT, BIGINT));
         try {
             groupedAggregation(function, new Page(createStringsBlock("z"), createLongsBlock(0), createLongsBlock(10001)));
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxbyn/TestTypedKeyValueHeap.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxbyn/TestTypedKeyValueHeap.java
index bfef6e07ca53..0e6acb76d8ca 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxbyn/TestTypedKeyValueHeap.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxbyn/TestTypedKeyValueHeap.java
@@ -13,99 +13,223 @@
  */
 package io.trino.operator.aggregation.minmaxbyn;
 
-import io.trino.spi.block.Block;
+import com.google.common.collect.ImmutableList;
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
-import org.testng.annotations.Test;
+import io.trino.spi.type.TypeUtils;
+import org.junit.jupiter.api.Test;
 
 import java.lang.invoke.MethodHandle;
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import java.util.stream.Stream;
+import java.util.stream.LongStream;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.airlift.slice.Slices.EMPTY_SLICE;
+import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.block.BlockAssertions.assertBlockEquals;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static org.testng.Assert.assertEquals;
+import static java.util.Comparator.comparing;
 
 public class TestTypedKeyValueHeap
 {
-    private static final int INPUT_SIZE = 1_000_000; // larger than COMPACT_THRESHOLD_* to guarantee coverage of compact
+    private static final int INPUT_SIZE = 1_000_000;
     private static final int OUTPUT_SIZE = 1_000;
 
-    private static final TypeOperators TYPE_OPERATOR_FACTORY = new TypeOperators();
-    private static final MethodHandle MAX_ELEMENTS_COMPARATOR = TYPE_OPERATOR_FACTORY.getComparisonUnorderedFirstOperator(BIGINT, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
-    private static final MethodHandle MIN_ELEMENTS_COMPARATOR = TYPE_OPERATOR_FACTORY.getComparisonUnorderedLastOperator(BIGINT, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
 
     @Test
     public void testAscending()
     {
-        test(IntStream.range(0, INPUT_SIZE),
-                IntStream.range(0, INPUT_SIZE).mapToObj(key -> Integer.toString(key * 2)),
-                false,
-                MAX_ELEMENTS_COMPARATOR,
-                IntStream.range(INPUT_SIZE - OUTPUT_SIZE, INPUT_SIZE).mapToObj(key -> Integer.toString(key * 2)).iterator());
-        test(IntStream.range(0, INPUT_SIZE),
-                IntStream.range(0, INPUT_SIZE).mapToObj(key -> Integer.toString(key * 2)),
-                true,
-                MIN_ELEMENTS_COMPARATOR,
-                IntStream.range(0, OUTPUT_SIZE).map(x -> OUTPUT_SIZE - 1 - x).mapToObj(key -> Integer.toString(key * 2)).iterator());
+        test(IntStream.range(0, INPUT_SIZE).boxed().toList());
     }
 
     @Test
     public void testDescending()
     {
-        test(IntStream.range(0, INPUT_SIZE).map(x -> INPUT_SIZE - 1 - x),
-                IntStream.range(0, INPUT_SIZE).map(x -> INPUT_SIZE - 1 - x).mapToObj(key -> Integer.toString(key * 2)),
-                false,
-                MAX_ELEMENTS_COMPARATOR,
-                IntStream.range(INPUT_SIZE - OUTPUT_SIZE, INPUT_SIZE).mapToObj(key -> Integer.toString(key * 2)).iterator());
-        test(IntStream.range(0, INPUT_SIZE).map(x -> INPUT_SIZE - 1 - x),
-                IntStream.range(0, INPUT_SIZE).map(x -> INPUT_SIZE - 1 - x).mapToObj(key -> Integer.toString(key * 2)),
-                true,
-                MIN_ELEMENTS_COMPARATOR,
-                IntStream.range(0, OUTPUT_SIZE).map(x -> OUTPUT_SIZE - 1 - x).mapToObj(key -> Integer.toString(key * 2)).iterator());
+        test(IntStream.range(0, INPUT_SIZE).map(x -> INPUT_SIZE - 1 - x).boxed().toList());
     }
 
     @Test
     public void testShuffled()
     {
-        List<Integer> list = IntStream.range(0, INPUT_SIZE).collect(ArrayList::new, ArrayList::add, ArrayList::addAll);
+        List<Integer> list = IntStream.range(0, INPUT_SIZE).boxed().collect(Collectors.toList());
         Collections.shuffle(list);
-        test(list.stream().mapToInt(Integer::intValue),
-                list.stream().mapToInt(Integer::intValue).mapToObj(key -> Integer.toString(key * 2)),
-                false,
-                MAX_ELEMENTS_COMPARATOR,
-                IntStream.range(INPUT_SIZE - OUTPUT_SIZE, INPUT_SIZE).mapToObj(key -> Integer.toString(key * 2)).iterator());
-        test(list.stream().mapToInt(Integer::intValue),
-                list.stream().mapToInt(Integer::intValue).mapToObj(key -> Integer.toString(key * 2)),
-                true,
-                MIN_ELEMENTS_COMPARATOR,
-                IntStream.range(0, OUTPUT_SIZE).map(x -> OUTPUT_SIZE - 1 - x).mapToObj(key -> Integer.toString(key * 2)).iterator());
+        test(list);
     }
 
-    private static void test(IntStream keyInputStream, Stream<String> valueInputStream, boolean min, MethodHandle comparisonMethod, Iterator<String> outputIterator)
+    private static void test(List<Integer> testData)
     {
-        BlockBuilder keysBlockBuilder = BIGINT.createBlockBuilder(null, INPUT_SIZE);
-        BlockBuilder valuesBlockBuilder = VARCHAR.createBlockBuilder(null, INPUT_SIZE);
-        keyInputStream.forEach(x -> BIGINT.writeLong(keysBlockBuilder, x));
-        valueInputStream.forEach(x -> VARCHAR.writeString(valuesBlockBuilder, x));
+        test(BIGINT,
+                BIGINT,
+                testData.stream()
+                        .map(Long::valueOf)
+                        .map(value -> new Entry<>(value, value))
+                        .toList(),
+                Comparator.naturalOrder(), OUTPUT_SIZE);
 
-        TypedKeyValueHeap heap = new TypedKeyValueHeap(min, comparisonMethod, BIGINT, VARCHAR, OUTPUT_SIZE);
-        heap.addAll(keysBlockBuilder, valuesBlockBuilder);
+        test(BIGINT,
+                VARCHAR,
+                testData.stream()
+                        .map(Long::valueOf)
+                        .map(value -> new Entry<>(value, utf8Slice(value.toString())))
+                        .toList(),
+                Comparator.naturalOrder(), OUTPUT_SIZE);
 
-        BlockBuilder resultBlockBuilder = VARCHAR.createBlockBuilder(null, OUTPUT_SIZE);
-        heap.popAll(resultBlockBuilder);
+        test(VARCHAR,
+                BIGINT,
+                testData.stream()
+                        .map(Long::valueOf)
+                        .map(value -> new Entry<>(utf8Slice(value.toString()), value))
+                        .toList(),
+                Comparator.naturalOrder(), OUTPUT_SIZE);
 
-        Block resultBlock = resultBlockBuilder.build();
-        assertEquals(resultBlock.getPositionCount(), OUTPUT_SIZE);
-        for (int i = 0; i < OUTPUT_SIZE; i++) {
-            assertEquals(VARCHAR.getSlice(resultBlock, i).toStringUtf8(), outputIterator.next());
+        test(VARCHAR,
+                VARCHAR,
+                testData.stream()
+                        .map(String::valueOf)
+                        .map(Slices::utf8Slice)
+                        .map(value -> new Entry<>(value, value))
+                        .toList(), Comparator.naturalOrder(), OUTPUT_SIZE);
+    }
+
+    @Test
+    public void testEmptyVariableWidth()
+    {
+        test(VARCHAR,
+                VARCHAR,
+                Collections.nCopies(INPUT_SIZE, new Entry<>(EMPTY_SLICE, EMPTY_SLICE)),
+                Comparator.naturalOrder(), OUTPUT_SIZE);
+    }
+
+    @Test
+    public void testNulls()
+    {
+        test(BIGINT,
+                BIGINT,
+                LongStream.range(0, 10).boxed()
+                        .map(value -> new Entry<>(value, value == 5 ? null : value))
+                        .toList(),
+                Comparator.naturalOrder(), OUTPUT_SIZE);
+    }
+
+    @Test
+    public void testX()
+    {
+        test(VARCHAR,
+                DOUBLE,
+                ImmutableList.<Entry<Slice, Double>>builder()
+                        .add(new Entry<>(utf8Slice("z"), 1.0))
+                        .add(new Entry<>(utf8Slice("a"), 2.0))
+                        .add(new Entry<>(utf8Slice("x"), 2.0))
+                        .add(new Entry<>(utf8Slice("b"), 3.0))
+                        .build(),
+                Comparator.naturalOrder(),
+                2);
+    }
+
+    private static <K, V> void test(Type keyType, Type valueType, List<Entry<K, V>> testData, Comparator<K> comparator, int capacity)
+    {
+        test(keyType, valueType, true, testData, comparator, capacity);
+        test(keyType, valueType, false, testData, comparator, capacity);
+    }
+
+    private static <K, V> void test(Type keyType, Type valueType, boolean min, List<Entry<K, V>> testData, Comparator<K> comparator, int capacity)
+    {
+        MethodHandle keyReadFlat = TYPE_OPERATORS.getReadValueOperator(keyType, simpleConvention(BLOCK_BUILDER, FLAT));
+        MethodHandle keyWriteFlat = TYPE_OPERATORS.getReadValueOperator(keyType, simpleConvention(FLAT_RETURN, VALUE_BLOCK_POSITION_NOT_NULL));
+        MethodHandle valueReadFlat = TYPE_OPERATORS.getReadValueOperator(valueType, simpleConvention(BLOCK_BUILDER, FLAT));
+        MethodHandle valueWriteFlat = TYPE_OPERATORS.getReadValueOperator(valueType, simpleConvention(FLAT_RETURN, VALUE_BLOCK_POSITION_NOT_NULL));
+        MethodHandle comparisonFlatFlat;
+        MethodHandle comparisonFlatBlock;
+        if (min) {
+            comparisonFlatFlat = TYPE_OPERATORS.getComparisonUnorderedLastOperator(keyType, simpleConvention(FAIL_ON_NULL, FLAT, FLAT));
+            comparisonFlatBlock = TYPE_OPERATORS.getComparisonUnorderedLastOperator(keyType, simpleConvention(FAIL_ON_NULL, FLAT, VALUE_BLOCK_POSITION_NOT_NULL));
         }
+        else {
+            comparisonFlatFlat = TYPE_OPERATORS.getComparisonUnorderedFirstOperator(keyType, simpleConvention(FAIL_ON_NULL, FLAT, FLAT));
+            comparisonFlatBlock = TYPE_OPERATORS.getComparisonUnorderedFirstOperator(keyType, simpleConvention(FAIL_ON_NULL, FLAT, VALUE_BLOCK_POSITION_NOT_NULL));
+            comparator = comparator.reversed();
+        }
+
+        ValueBlock expected = toBlock(valueType, testData.stream()
+                .sorted(comparing(Entry::key, comparator))
+                .map(Entry::value)
+                .limit(capacity)
+                .toList());
+        ValueBlock inputKeys = toBlock(keyType, testData.stream().map(Entry::key).toList());
+        ValueBlock inputValues = toBlock(valueType, testData.stream().map(Entry::value).toList());
+
+        // verify basic build
+        TypedKeyValueHeap heap = new TypedKeyValueHeap(min, keyReadFlat, keyWriteFlat, valueReadFlat, valueWriteFlat, comparisonFlatFlat, comparisonFlatBlock, keyType, valueType, capacity);
+        getAddAll(heap, inputKeys, inputValues);
+        assertEqual(heap, valueType, expected);
+
+        // verify copy constructor
+        assertEqual(new TypedKeyValueHeap(heap), valueType, expected);
+
+        // build in two parts and merge together
+        TypedKeyValueHeap part1 = new TypedKeyValueHeap(min, keyReadFlat, keyWriteFlat, valueReadFlat, valueWriteFlat, comparisonFlatFlat, comparisonFlatBlock, keyType, valueType, capacity);
+        int splitPoint = inputKeys.getPositionCount() / 2;
+        getAddAll(part1, inputKeys.getRegion(0, splitPoint), inputValues.getRegion(0, splitPoint));
+        BlockBuilder part1KeyBlockBuilder = keyType.createBlockBuilder(null, part1.getCapacity());
+        BlockBuilder part1ValueBlockBuilder = valueType.createBlockBuilder(null, part1.getCapacity());
+        part1.writeAllUnsorted(part1KeyBlockBuilder, part1ValueBlockBuilder);
+        ValueBlock part1KeyBlock = part1KeyBlockBuilder.buildValueBlock();
+        ValueBlock part1ValueBlock = part1ValueBlockBuilder.buildValueBlock();
+
+        TypedKeyValueHeap part2 = new TypedKeyValueHeap(min, keyReadFlat, keyWriteFlat, valueReadFlat, valueWriteFlat, comparisonFlatFlat, comparisonFlatBlock, keyType, valueType, capacity);
+        getAddAll(part2, inputKeys.getRegion(splitPoint, inputKeys.getPositionCount() - splitPoint), inputValues.getRegion(splitPoint, inputValues.getPositionCount() - splitPoint));
+        BlockBuilder part2KeyBlockBuilder = keyType.createBlockBuilder(null, part2.getCapacity());
+        BlockBuilder part2ValueBlockBuilder = valueType.createBlockBuilder(null, part2.getCapacity());
+        part2.writeAllUnsorted(part2KeyBlockBuilder, part2ValueBlockBuilder);
+        ValueBlock part2KeyBlock = part2KeyBlockBuilder.buildValueBlock();
+        ValueBlock part2ValueBlock = part2ValueBlockBuilder.buildValueBlock();
+
+        TypedKeyValueHeap merged = new TypedKeyValueHeap(min, keyReadFlat, keyWriteFlat, valueReadFlat, valueWriteFlat, comparisonFlatFlat, comparisonFlatBlock, keyType, valueType, capacity);
+        getAddAll(merged, part1KeyBlock, part1ValueBlock);
+        getAddAll(merged, part2KeyBlock, part2ValueBlock);
+        assertEqual(merged, valueType, expected);
+    }
+
+    private static void getAddAll(TypedKeyValueHeap heap, ValueBlock inputKeys, ValueBlock inputValues)
+    {
+        for (int i = 0; i < inputKeys.getPositionCount(); i++) {
+            heap.add(inputKeys, i, inputValues, i);
+        }
+    }
+
+    private static void assertEqual(TypedKeyValueHeap heap, Type valueType, ValueBlock expected)
+    {
+        BlockBuilder resultBlockBuilder = valueType.createBlockBuilder(null, OUTPUT_SIZE);
+        heap.writeValuesSorted(resultBlockBuilder);
+        ValueBlock actual = resultBlockBuilder.buildValueBlock();
+        assertBlockEquals(valueType, actual, expected);
     }
+
+    private static <T> ValueBlock toBlock(Type type, List<T> inputStream)
+    {
+        BlockBuilder blockBuilder = type.createBlockBuilder(null, INPUT_SIZE);
+        inputStream.forEach(value -> TypeUtils.writeNativeValue(type, blockBuilder, value));
+        return blockBuilder.buildValueBlock();
+    }
+
+    // TODO remove this suppression when the error prone checker actually supports records correctly
+    // NOTE: this record supports null values, which is not supported by other Map.Entry implementations
+    @SuppressWarnings("unused")
+    private record Entry<K, V>(K key, V value) {}
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestArrayMaxNAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestArrayMaxNAggregation.java
index 5fea0777d28b..2b984818f79e 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestArrayMaxNAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestArrayMaxNAggregation.java
@@ -16,11 +16,11 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import io.trino.operator.aggregation.AbstractTestAggregationFunction;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
@@ -37,15 +37,13 @@ public class TestArrayMaxNAggregation
     public static Block createLongArraysBlock(Long[] values)
     {
         ArrayType arrayType = new ArrayType(BIGINT);
-        BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, values.length);
+        ArrayBlockBuilder blockBuilder = arrayType.createBlockBuilder(null, values.length);
         for (Long value : values) {
             if (value == null) {
                 blockBuilder.appendNull();
             }
             else {
-                BlockBuilder elementBlockBuilder = blockBuilder.beginBlockEntry();
-                BIGINT.writeLong(elementBlockBuilder, value);
-                blockBuilder.closeEntry();
+                blockBuilder.buildEntry(elementBuilder -> BIGINT.writeLong(elementBuilder, value));
             }
         }
         return blockBuilder.build();
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestDoubleMinNAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestDoubleMinNAggregation.java
index 590af88cb809..ccc832660617 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestDoubleMinNAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestDoubleMinNAggregation.java
@@ -17,7 +17,7 @@
 import io.trino.operator.aggregation.AbstractTestAggregationFunction;
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestLongMaxNAggregation.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestLongMaxNAggregation.java
index 31fe823d3693..ecc7f89225c2 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestLongMaxNAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestLongMaxNAggregation.java
@@ -17,7 +17,7 @@
 import io.trino.operator.aggregation.AbstractTestAggregationFunction;
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestTypedHeap.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestTypedHeap.java
index 8426123033c5..fe5b3995c55a 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestTypedHeap.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/minmaxn/TestTypedHeap.java
@@ -13,96 +13,151 @@
  */
 package io.trino.operator.aggregation.minmaxn;
 
-import io.trino.spi.block.Block;
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
-import org.testng.annotations.Test;
+import io.trino.spi.type.TypeUtils;
+import org.junit.jupiter.api.Test;
 
 import java.lang.invoke.MethodHandle;
-import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
-import java.util.PrimitiveIterator;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.block.BlockAssertions.assertBlockEquals;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.type.BigintType.BIGINT;
-import static org.testng.Assert.assertEquals;
+import static io.trino.spi.type.VarbinaryType.VARBINARY;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public class TestTypedHeap
 {
-    private static final int INPUT_SIZE = 1_000_000; // larger than COMPACT_THRESHOLD_* to guarantee coverage of compact
+    private static final int INPUT_SIZE = 1_000_000;
     private static final int OUTPUT_SIZE = 1_000;
 
-    private static final TypeOperators TYPE_OPERATOR_FACTORY = new TypeOperators();
-    private static final MethodHandle MAX_ELEMENTS_COMPARATOR = TYPE_OPERATOR_FACTORY.getComparisonUnorderedFirstOperator(BIGINT, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
-    private static final MethodHandle MIN_ELEMENTS_COMPARATOR = TYPE_OPERATOR_FACTORY.getComparisonUnorderedLastOperator(BIGINT, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
 
     @Test
     public void testAscending()
     {
-        test(IntStream.range(0, INPUT_SIZE),
-                false,
-                MAX_ELEMENTS_COMPARATOR,
-                BIGINT,
-                IntStream.range(INPUT_SIZE - OUTPUT_SIZE, INPUT_SIZE).iterator());
-        test(IntStream.range(0, INPUT_SIZE),
-                true,
-                MIN_ELEMENTS_COMPARATOR,
-                BIGINT,
-                IntStream.range(0, OUTPUT_SIZE).map(x -> OUTPUT_SIZE - 1 - x).iterator());
+        test(IntStream.range(0, INPUT_SIZE).boxed().toList());
     }
 
     @Test
     public void testDescending()
     {
-        test(IntStream.range(0, INPUT_SIZE).map(x -> INPUT_SIZE - 1 - x),
-                false,
-                MAX_ELEMENTS_COMPARATOR,
-                BIGINT,
-                IntStream.range(INPUT_SIZE - OUTPUT_SIZE, INPUT_SIZE).iterator());
-        test(IntStream.range(0, INPUT_SIZE).map(x -> INPUT_SIZE - 1 - x),
-                true,
-                MIN_ELEMENTS_COMPARATOR,
-                BIGINT,
-                IntStream.range(0, OUTPUT_SIZE).map(x -> OUTPUT_SIZE - 1 - x).iterator());
+        test(IntStream.range(0, INPUT_SIZE).map(x -> INPUT_SIZE - 1 - x).boxed().toList());
     }
 
     @Test
     public void testShuffled()
     {
-        List<Integer> list = IntStream.range(0, INPUT_SIZE).collect(ArrayList::new, ArrayList::add, ArrayList::addAll);
+        List<Integer> list = IntStream.range(0, INPUT_SIZE).boxed().collect(Collectors.toList());
         Collections.shuffle(list);
-        test(list.stream().mapToInt(Integer::intValue),
-                false,
-                MAX_ELEMENTS_COMPARATOR,
-                BIGINT,
-                IntStream.range(INPUT_SIZE - OUTPUT_SIZE, INPUT_SIZE).iterator());
-        test(list.stream().mapToInt(Integer::intValue),
-                true,
-                MIN_ELEMENTS_COMPARATOR,
-                BIGINT,
-                IntStream.range(0, OUTPUT_SIZE).map(x -> OUTPUT_SIZE - 1 - x).iterator());
+        test(list);
     }
 
-    private static void test(IntStream inputStream, boolean min, MethodHandle comparisonMethod, Type elementType, PrimitiveIterator.OfInt outputIterator)
+    private static void test(List<Integer> testData)
     {
-        BlockBuilder blockBuilder = BIGINT.createBlockBuilder(null, INPUT_SIZE);
-        inputStream.forEach(value -> BIGINT.writeLong(blockBuilder, value));
+        test(BIGINT, testData.stream().map(Long::valueOf).toList(), Comparator.naturalOrder());
 
-        TypedHeap heap = new TypedHeap(min, comparisonMethod, elementType, OUTPUT_SIZE);
-        heap.addAll(blockBuilder);
+        // convert data to text numbers, which will not be sorted numerically
+        List<Slice> sliceData = testData.stream()
+                .map(String::valueOf)
+                .map(value -> value + " ".repeat(22) + "x") // ensure value is longer than 12 bytes
+                .map(Slices::utf8Slice)
+                .toList();
+        test(VARCHAR, sliceData, Comparator.naturalOrder());
+    }
+
+    @Test
+    public void testEmptyVariableWidth()
+    {
+        test(VARBINARY, Collections.nCopies(INPUT_SIZE, Slices.EMPTY_SLICE), Comparator.naturalOrder());
+    }
+
+    private static <T> void test(Type type, List<T> testData, Comparator<T> comparator)
+    {
+        test(type, true, testData, comparator);
+        test(type, false, testData, comparator);
+    }
+
+    private static <T> void test(Type type, boolean min, List<T> testData, Comparator<T> comparator)
+    {
+        MethodHandle readFlat = TYPE_OPERATORS.getReadValueOperator(type, simpleConvention(BLOCK_BUILDER, FLAT));
+        MethodHandle writeFlat = TYPE_OPERATORS.getReadValueOperator(type, simpleConvention(FLAT_RETURN, VALUE_BLOCK_POSITION_NOT_NULL));
+
+        MethodHandle comparisonFlatFlat;
+        MethodHandle comparisonFlatBlock;
+        if (min) {
+            comparisonFlatFlat = TYPE_OPERATORS.getComparisonUnorderedLastOperator(type, simpleConvention(FAIL_ON_NULL, FLAT, FLAT));
+            comparisonFlatBlock = TYPE_OPERATORS.getComparisonUnorderedLastOperator(type, simpleConvention(FAIL_ON_NULL, FLAT, VALUE_BLOCK_POSITION_NOT_NULL));
+        }
+        else {
+            comparisonFlatFlat = TYPE_OPERATORS.getComparisonUnorderedFirstOperator(type, simpleConvention(FAIL_ON_NULL, FLAT, FLAT));
+            comparisonFlatBlock = TYPE_OPERATORS.getComparisonUnorderedFirstOperator(type, simpleConvention(FAIL_ON_NULL, FLAT, VALUE_BLOCK_POSITION_NOT_NULL));
+            comparator = comparator.reversed();
+        }
 
-        BlockBuilder resultBlockBuilder = BIGINT.createBlockBuilder(null, OUTPUT_SIZE);
-        heap.writeAll(resultBlockBuilder);
+        ValueBlock expected = toBlock(type, testData.stream().sorted(comparator).limit(OUTPUT_SIZE).toList());
+        ValueBlock inputData = toBlock(type, testData);
 
-        Block resultBlock = resultBlockBuilder.build();
-        assertEquals(resultBlock.getPositionCount(), OUTPUT_SIZE);
-        for (int i = OUTPUT_SIZE - 1; i >= 0; i--) {
-            assertEquals(BIGINT.getLong(resultBlock, i), outputIterator.nextInt());
+        // verify basic build
+        TypedHeap heap = new TypedHeap(min, readFlat, writeFlat, comparisonFlatFlat, comparisonFlatBlock, type, OUTPUT_SIZE);
+        addAll(heap, inputData);
+        assertEqual(heap, type, expected);
+
+        // verify copy constructor
+        assertEqual(new TypedHeap(heap), type, expected);
+
+        // build in two parts and merge together
+        TypedHeap part1 = new TypedHeap(min, readFlat, writeFlat, comparisonFlatFlat, comparisonFlatBlock, type, OUTPUT_SIZE);
+        addAll(part1, inputData.getRegion(0, inputData.getPositionCount() / 2));
+        BlockBuilder part1BlockBuilder = type.createBlockBuilder(null, part1.getCapacity());
+        part1.writeAllUnsorted(part1BlockBuilder);
+        ValueBlock part1Block = part1BlockBuilder.buildValueBlock();
+
+        TypedHeap part2 = new TypedHeap(min, readFlat, writeFlat, comparisonFlatFlat, comparisonFlatBlock, type, OUTPUT_SIZE);
+        addAll(part2, inputData.getRegion(inputData.getPositionCount() / 2, inputData.getPositionCount() - (inputData.getPositionCount() / 2)));
+        BlockBuilder part2BlockBuilder = type.createBlockBuilder(null, part2.getCapacity());
+        part2.writeAllUnsorted(part2BlockBuilder);
+        ValueBlock part2Block = part2BlockBuilder.buildValueBlock();
+
+        TypedHeap merged = new TypedHeap(min, readFlat, writeFlat, comparisonFlatFlat, comparisonFlatBlock, type, OUTPUT_SIZE);
+        addAll(merged, part1Block);
+        addAll(merged, part2Block);
+        assertEqual(merged, type, expected);
+    }
+
+    private static void addAll(TypedHeap heap, ValueBlock inputData)
+    {
+        for (int i = 0; i < inputData.getPositionCount(); i++) {
+            heap.add(inputData, i);
         }
     }
+
+    private static void assertEqual(TypedHeap heap, Type type, ValueBlock expected)
+    {
+        BlockBuilder resultBlockBuilder = type.createBlockBuilder(null, OUTPUT_SIZE);
+        heap.writeAllSorted(resultBlockBuilder);
+        ValueBlock actual = resultBlockBuilder.buildValueBlock();
+        assertBlockEquals(type, actual, expected);
+    }
+
+    private static <T> ValueBlock toBlock(Type type, List<T> inputStream)
+    {
+        BlockBuilder blockBuilder = type.createBlockBuilder(null, INPUT_SIZE);
+        inputStream.forEach(value -> TypeUtils.writeNativeValue(type, blockBuilder, value));
+        return blockBuilder.buildValueBlock();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/state/TestStateCompiler.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/state/TestStateCompiler.java
index ec20e6a236c7..58616b35b273 100644
--- a/core/trino-main/src/test/java/io/trino/operator/aggregation/state/TestStateCompiler.java
+++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/state/TestStateCompiler.java
@@ -16,6 +16,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.slice.Slice;
+import io.airlift.slice.SliceOutput;
+import io.airlift.slice.Slices;
 import io.trino.array.BlockBigArray;
 import io.trino.array.BooleanBigArray;
 import io.trino.array.ByteBigArray;
@@ -24,8 +26,13 @@
 import io.trino.array.LongBigArray;
 import io.trino.array.ReferenceCountMap;
 import io.trino.array.SliceBigArray;
+import io.trino.array.SqlMapBigArray;
+import io.trino.array.SqlRowBigArray;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapValueBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.AccumulatorState;
 import io.trino.spi.function.AccumulatorStateFactory;
 import io.trino.spi.function.AccumulatorStateSerializer;
@@ -34,7 +41,7 @@
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.util.Reflection;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Field;
@@ -42,17 +49,15 @@
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.Slices.utf8Slice;
-import static io.airlift.slice.Slices.wrappedDoubleArray;
 import static io.trino.block.BlockAssertions.createLongsBlock;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.TinyintType.TINYINT;
-import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.util.StructuralTestUtil.mapBlockOf;
 import static io.trino.util.StructuralTestUtil.mapType;
+import static io.trino.util.StructuralTestUtil.sqlMapOf;
+import static io.trino.util.StructuralTestUtil.sqlRowOf;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
@@ -199,7 +204,8 @@ public void testComplexSerialization()
     {
         Type arrayType = new ArrayType(BIGINT);
         Type mapType = mapType(BIGINT, VARCHAR);
-        Map<String, Type> fieldMap = ImmutableMap.of("Block", arrayType, "AnotherBlock", mapType);
+        Type rowType = RowType.anonymousRow(VARCHAR, BIGINT, VARCHAR);
+        Map<String, Type> fieldMap = ImmutableMap.of("Block", arrayType, "SqlMap", mapType, "SqlRow", rowType);
         AccumulatorStateFactory<TestComplexState> factory = StateCompiler.generateStateFactory(TestComplexState.class, fieldMap);
         AccumulatorStateSerializer<TestComplexState> serializer = StateCompiler.generateStateSerializer(TestComplexState.class, fieldMap);
         TestComplexState singleState = factory.createSingleState();
@@ -211,14 +217,14 @@ public void testComplexSerialization()
         singleState.setByte((byte) 3);
         singleState.setInt(4);
         singleState.setSlice(utf8Slice("test"));
-        singleState.setAnotherSlice(wrappedDoubleArray(1.0, 2.0, 3.0));
+        singleState.setAnotherSlice(toSlice(1.0, 2.0, 3.0));
         singleState.setYetAnotherSlice(null);
         Block array = createLongsBlock(45);
         singleState.setBlock(array);
-        singleState.setAnotherBlock(mapBlockOf(BIGINT, VARCHAR, ImmutableMap.of(123L, "testBlock")));
+        singleState.setSqlMap(sqlMapOf(BIGINT, VARCHAR, ImmutableMap.of(123L, "testBlock")));
+        singleState.setSqlRow(sqlRowOf(RowType.anonymousRow(VARCHAR, BIGINT, VARCHAR), "a", 777, "b"));
 
-        BlockBuilder builder = RowType.anonymous(ImmutableList.of(mapType, VARBINARY, arrayType, BOOLEAN, TINYINT, DOUBLE, INTEGER, BIGINT, VARBINARY, VARBINARY))
-                .createBlockBuilder(null, 1);
+        BlockBuilder builder = serializer.getSerializedType().createBlockBuilder(null, 1);
         serializer.serialize(singleState, builder);
 
         Block block = builder.build();
@@ -233,8 +239,22 @@ public void testComplexSerialization()
         assertEquals(deserializedState.getAnotherSlice(), singleState.getAnotherSlice());
         assertEquals(deserializedState.getYetAnotherSlice(), singleState.getYetAnotherSlice());
         assertEquals(deserializedState.getBlock().getLong(0, 0), singleState.getBlock().getLong(0, 0));
-        assertEquals(deserializedState.getAnotherBlock().getLong(0, 0), singleState.getAnotherBlock().getLong(0, 0));
-        assertEquals(deserializedState.getAnotherBlock().getSlice(1, 0, 9), singleState.getAnotherBlock().getSlice(1, 0, 9));
+
+        SqlMap deserializedMap = deserializedState.getSqlMap();
+        SqlMap expectedMap = singleState.getSqlMap();
+        assertEquals(deserializedMap.getRawKeyBlock().getLong(deserializedMap.getRawOffset(), 0),
+                expectedMap.getRawKeyBlock().getLong(expectedMap.getRawOffset(), 0));
+        assertEquals(deserializedMap.getRawValueBlock().getSlice(deserializedMap.getRawOffset(), 0, 9),
+                expectedMap.getRawValueBlock().getSlice(expectedMap.getRawOffset(), 0, 9));
+
+        SqlRow sqlRow = deserializedState.getSqlRow();
+        SqlRow expectedSqlRow = singleState.getSqlRow();
+        assertEquals(VARCHAR.getSlice(sqlRow.getRawFieldBlock(0), sqlRow.getRawIndex()),
+                VARCHAR.getSlice(expectedSqlRow.getRawFieldBlock(0), expectedSqlRow.getRawIndex()));
+        assertEquals(BIGINT.getLong(sqlRow.getRawFieldBlock(1), sqlRow.getRawIndex()),
+                BIGINT.getLong(expectedSqlRow.getRawFieldBlock(1), expectedSqlRow.getRawIndex()));
+        assertEquals(VARCHAR.getSlice(sqlRow.getRawFieldBlock(2), sqlRow.getRawIndex()),
+                VARCHAR.getSlice(expectedSqlRow.getRawFieldBlock(2), expectedSqlRow.getRawIndex()));
     }
 
     private static long getComplexStateRetainedSize(TestComplexState state)
@@ -246,7 +266,7 @@ private static long getComplexStateRetainedSize(TestComplexState state)
             for (Field field : fields) {
                 Class<?> type = field.getType();
                 field.setAccessible(true);
-                if (type == BlockBigArray.class || type == BooleanBigArray.class || type == SliceBigArray.class ||
+                if (type == BlockBigArray.class || type == SqlMapBigArray.class || type == SqlRowBigArray.class || type == BooleanBigArray.class || type == SliceBigArray.class ||
                         type == ByteBigArray.class || type == DoubleBigArray.class || type == LongBigArray.class || type == IntBigArray.class) {
                     MethodHandle sizeOf = Reflection.methodHandle(type, "sizeOf");
                     retainedSize += (long) sizeOf.invokeWithArguments(field.get(state));
@@ -266,7 +286,7 @@ private static long getReferenceCountMapOverhead(TestComplexState state)
         Field[] stateFields = state.getClass().getDeclaredFields();
         try {
             for (Field stateField : stateFields) {
-                if (stateField.getType() != BlockBigArray.class && stateField.getType() != SliceBigArray.class) {
+                if (stateField.getType() != BlockBigArray.class && stateField.getType() != SqlMapBigArray.class && stateField.getType() != SqlRowBigArray.class && stateField.getType() != SliceBigArray.class) {
                     continue;
                 }
                 stateField.setAccessible(true);
@@ -287,10 +307,10 @@ private static long getReferenceCountMapOverhead(TestComplexState state)
         return overhead;
     }
 
-    @Test(invocationCount = 100, successPercentage = 90)
+    @Test
     public void testComplexStateEstimatedSize()
     {
-        Map<String, Type> fieldMap = ImmutableMap.of("Block", new ArrayType(BIGINT), "AnotherBlock", mapType(BIGINT, VARCHAR));
+        Map<String, Type> fieldMap = ImmutableMap.of("Block", new ArrayType(BIGINT), "SqlMap", mapType(BIGINT, VARCHAR));
         AccumulatorStateFactory<TestComplexState> factory = StateCompiler.generateStateFactory(TestComplexState.class, fieldMap);
 
         TestComplexState groupedState = factory.createGroupedState();
@@ -310,21 +330,22 @@ public void testComplexStateEstimatedSize()
             Slice slice = utf8Slice("test");
             retainedSize += slice.getRetainedSize();
             groupedState.setSlice(slice);
-            slice = wrappedDoubleArray(1.0, 2.0, 3.0);
+            slice = toSlice(1.0, 2.0, 3.0);
             retainedSize += slice.getRetainedSize();
             groupedState.setAnotherSlice(slice);
             groupedState.setYetAnotherSlice(null);
             Block array = createLongsBlock(45);
             retainedSize += array.getRetainedSizeInBytes();
             groupedState.setBlock(array);
-            BlockBuilder mapBlockBuilder = mapType(BIGINT, VARCHAR).createBlockBuilder(null, 1);
-            BlockBuilder singleMapBlockWriter = mapBlockBuilder.beginBlockEntry();
-            BIGINT.writeLong(singleMapBlockWriter, 123L);
-            VARCHAR.writeSlice(singleMapBlockWriter, utf8Slice("testBlock"));
-            mapBlockBuilder.closeEntry();
-            Block map = mapBlockBuilder.build();
-            retainedSize += map.getRetainedSizeInBytes();
-            groupedState.setAnotherBlock(map);
+            SqlMap sqlMap = MapValueBuilder.buildMapValue(mapType(BIGINT, VARCHAR), 1, (keyBuilder, valueBuilder) -> {
+                BIGINT.writeLong(keyBuilder, 123L);
+                VARCHAR.writeSlice(valueBuilder, utf8Slice("testBlock"));
+            });
+            retainedSize += sqlMap.getRetainedSizeInBytes();
+            groupedState.setSqlMap(sqlMap);
+            SqlRow sqlRow = sqlRowOf(RowType.anonymousRow(VARCHAR, BIGINT, VARCHAR), "a", 777, "b");
+            retainedSize += sqlRow.getRetainedSizeInBytes();
+            groupedState.setSqlRow(sqlRow);
             assertEquals(groupedState.getEstimatedSize(), initialRetainedSize + retainedSize * (i + 1) + getReferenceCountMapOverhead(groupedState));
         }
 
@@ -339,25 +360,36 @@ public void testComplexStateEstimatedSize()
             Slice slice = utf8Slice("test");
             retainedSize += slice.getRetainedSize();
             groupedState.setSlice(slice);
-            slice = wrappedDoubleArray(1.0, 2.0, 3.0);
+            slice = toSlice(1.0, 2.0, 3.0);
             retainedSize += slice.getRetainedSize();
             groupedState.setAnotherSlice(slice);
             groupedState.setYetAnotherSlice(null);
             Block array = createLongsBlock(45);
             retainedSize += array.getRetainedSizeInBytes();
             groupedState.setBlock(array);
-            BlockBuilder mapBlockBuilder = mapType(BIGINT, VARCHAR).createBlockBuilder(null, 1);
-            BlockBuilder singleMapBlockWriter = mapBlockBuilder.beginBlockEntry();
-            BIGINT.writeLong(singleMapBlockWriter, 123L);
-            VARCHAR.writeSlice(singleMapBlockWriter, utf8Slice("testBlock"));
-            mapBlockBuilder.closeEntry();
-            Block map = mapBlockBuilder.build();
-            retainedSize += map.getRetainedSizeInBytes();
-            groupedState.setAnotherBlock(map);
+            SqlMap sqlMap = MapValueBuilder.buildMapValue(mapType(BIGINT, VARCHAR), 1, (keyBuilder, valueBuilder) -> {
+                BIGINT.writeLong(keyBuilder, 123L);
+                VARCHAR.writeSlice(valueBuilder, utf8Slice("testBlock"));
+            });
+            retainedSize += sqlMap.getRetainedSizeInBytes();
+            groupedState.setSqlMap(sqlMap);
+            SqlRow sqlRow = sqlRowOf(RowType.anonymousRow(VARCHAR, BIGINT, VARCHAR), "a", 777, "b");
+            retainedSize += sqlRow.getRetainedSizeInBytes();
+            groupedState.setSqlRow(sqlRow);
             assertEquals(groupedState.getEstimatedSize(), initialRetainedSize + retainedSize * 1000 + getReferenceCountMapOverhead(groupedState));
         }
     }
 
+    private static Slice toSlice(double... values)
+    {
+        Slice slice = Slices.allocate(values.length * Double.BYTES);
+        SliceOutput output = slice.getOutput();
+        for (double value : values) {
+            output.writeDouble(value);
+        }
+        return slice;
+    }
+
     public interface TestComplexState
             extends AccumulatorState
     {
@@ -397,9 +429,13 @@ public interface TestComplexState
 
         void setBlock(Block block);
 
-        Block getAnotherBlock();
+        SqlMap getSqlMap();
+
+        void setSqlMap(SqlMap sqlMap);
+
+        SqlRow getSqlRow();
 
-        void setAnotherBlock(Block block);
+        void setSqlRow(SqlRow sqlRow);
     }
 
     public interface BooleanState
diff --git a/core/trino-main/src/test/java/io/trino/operator/exchange/TestLocalExchange.java b/core/trino-main/src/test/java/io/trino/operator/exchange/TestLocalExchange.java
index c35bde218531..c1bbbcad7711 100644
--- a/core/trino-main/src/test/java/io/trino/operator/exchange/TestLocalExchange.java
+++ b/core/trino-main/src/test/java/io/trino/operator/exchange/TestLocalExchange.java
@@ -24,7 +24,6 @@
 import io.trino.execution.scheduler.NodeSchedulerConfig;
 import io.trino.execution.scheduler.UniformNodeSelectorFactory;
 import io.trino.metadata.InMemoryNodeManager;
-import io.trino.operator.InterpretedHashGenerator;
 import io.trino.operator.PageAssertions;
 import io.trino.operator.exchange.LocalExchange.LocalExchangeSinkFactory;
 import io.trino.spi.Page;
@@ -41,7 +40,6 @@
 import io.trino.sql.planner.NodePartitioningManager;
 import io.trino.sql.planner.PartitioningHandle;
 import io.trino.testing.TestingTransactionHandle;
-import io.trino.type.BlockTypeOperators;
 import io.trino.util.FinalizerService;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
@@ -53,10 +51,15 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.airlift.units.DataSize.Unit.KILOBYTE;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
+import static io.trino.SystemSessionProperties.QUERY_MAX_MEMORY_PER_NODE;
+import static io.trino.SystemSessionProperties.SKEWED_PARTITION_MIN_DATA_PROCESSED_REBALANCE_THRESHOLD;
+import static io.trino.operator.InterpretedHashGenerator.createChannelsHashGenerator;
 import static io.trino.spi.connector.ConnectorBucketNodeMap.createBucketNodeMap;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
@@ -80,10 +83,12 @@ public class TestLocalExchange
 {
     private static final List<Type> TYPES = ImmutableList.of(BIGINT);
     private static final DataSize RETAINED_PAGE_SIZE = DataSize.ofBytes(createPage(42).getRetainedSizeInBytes());
+    private static final DataSize PAGE_SIZE = DataSize.ofBytes(createPage(42).getSizeInBytes());
     private static final DataSize LOCAL_EXCHANGE_MAX_BUFFERED_BYTES = DataSize.of(32, MEGABYTE);
-    private static final BlockTypeOperators TYPE_OPERATOR_FACTORY = new BlockTypeOperators(new TypeOperators());
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
     private static final Session SESSION = testSessionBuilder().build();
-    private static final DataSize WRITER_MIN_SIZE = DataSize.of(32, MEGABYTE);
+    private static final DataSize WRITER_SCALING_MIN_DATA_PROCESSED = DataSize.of(32, MEGABYTE);
+    private static final Supplier<Long> TOTAL_MEMORY_USED = () -> 0L;
 
     private final ConcurrentMap<CatalogHandle, ConnectorNodePartitioningProvider> partitionManagers = new ConcurrentHashMap<>();
     private NodePartitioningManager nodePartitioningManager;
@@ -97,7 +102,7 @@ public void setUp()
                 new NodeTaskMap(new FinalizerService())));
         nodePartitioningManager = new NodePartitioningManager(
                 nodeScheduler,
-                new BlockTypeOperators(new TypeOperators()),
+                new TypeOperators(),
                 catalogHandle -> {
                     ConnectorNodePartitioningProvider result = partitionManagers.get(catalogHandle);
                     checkArgument(result != null, "No partition manager for catalog handle: %s", catalogHandle);
@@ -117,8 +122,9 @@ public void testGatherSingleWriter()
                 ImmutableList.of(),
                 Optional.empty(),
                 DataSize.ofBytes(retainedSizeOfPages(99)),
-                TYPE_OPERATOR_FACTORY,
-                WRITER_MIN_SIZE);
+                TYPE_OPERATORS,
+                WRITER_SCALING_MIN_DATA_PROCESSED,
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 1);
@@ -127,7 +133,7 @@ public void testGatherSingleWriter()
             LocalExchangeSinkFactory sinkFactory = exchange.createSinkFactory();
             sinkFactory.noMoreSinkFactories();
 
-            LocalExchangeSource source = getNextSource(exchange);
+            LocalExchangeSource source = exchange.getNextSource();
             assertSource(source, 0);
 
             LocalExchangeSink sink = sinkFactory.createSink();
@@ -190,8 +196,9 @@ public void testRandom()
                 ImmutableList.of(),
                 Optional.empty(),
                 LOCAL_EXCHANGE_MAX_BUFFERED_BYTES,
-                TYPE_OPERATOR_FACTORY,
-                WRITER_MIN_SIZE);
+                TYPE_OPERATORS,
+                WRITER_SCALING_MIN_DATA_PROCESSED,
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 2);
@@ -203,10 +210,10 @@ public void testRandom()
             assertSinkCanWrite(sink);
             sinkFactory.close();
 
-            LocalExchangeSource sourceA = getNextSource(exchange);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
-            LocalExchangeSource sourceB = getNextSource(exchange);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
             for (int i = 0; i < 100; i++) {
@@ -239,8 +246,9 @@ public void testScaleWriter()
                 ImmutableList.of(),
                 Optional.empty(),
                 DataSize.ofBytes(retainedSizeOfPages(4)),
-                TYPE_OPERATOR_FACTORY,
-                DataSize.ofBytes(retainedSizeOfPages(2)));
+                TYPE_OPERATORS,
+                DataSize.ofBytes(sizeOfPages(2)),
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 3);
@@ -252,16 +260,13 @@ public void testScaleWriter()
             assertSinkCanWrite(sink);
             sinkFactory.close();
 
-            AtomicLong physicalWrittenBytesA = new AtomicLong(0);
-            LocalExchangeSource sourceA = exchange.getNextSource(physicalWrittenBytesA::get);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
-            AtomicLong physicalWrittenBytesB = new AtomicLong(0);
-            LocalExchangeSource sourceB = exchange.getNextSource(physicalWrittenBytesB::get);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
-            AtomicLong physicalWrittenBytesC = new AtomicLong(0);
-            LocalExchangeSource sourceC = exchange.getNextSource(physicalWrittenBytesC::get);
+            LocalExchangeSource sourceC = exchange.getNextSource();
             assertSource(sourceC, 0);
 
             sink.addPage(createPage(0));
@@ -270,8 +275,7 @@ public void testScaleWriter()
             assertEquals(sourceB.getBufferInfo().getBufferedPages(), 0);
             assertEquals(sourceC.getBufferInfo().getBufferedPages(), 0);
 
-            // writer min file and buffered data size limits are exceeded, so we should see pages in sourceB
-            physicalWrittenBytesA.set(retainedSizeOfPages(2));
+            // writer min output size and buffered data size limits are exceeded, so we should see pages in sourceB
             sink.addPage(createPage(0));
             assertEquals(sourceA.getBufferInfo().getBufferedPages(), 2);
             assertEquals(sourceB.getBufferInfo().getBufferedPages(), 1);
@@ -280,32 +284,12 @@ public void testScaleWriter()
             assertRemovePage(sourceA, createPage(0));
             assertRemovePage(sourceA, createPage(0));
 
-            // no limit is breached, so we should see round-robin distribution across sourceA and sourceB
-            physicalWrittenBytesB.set(retainedSizeOfPages(1));
+            // writer min output size and buffered data size limits are exceeded again,
             sink.addPage(createPage(0));
             sink.addPage(createPage(0));
             sink.addPage(createPage(0));
-            assertEquals(sourceA.getBufferInfo().getBufferedPages(), 2);
+            assertEquals(sourceA.getBufferInfo().getBufferedPages(), 1);
             assertEquals(sourceB.getBufferInfo().getBufferedPages(), 2);
-            assertEquals(sourceC.getBufferInfo().getBufferedPages(), 0);
-
-            // writer min file and buffered data size limits are exceeded again, but according to
-            // round-robin sourceB should receive a page
-            physicalWrittenBytesA.set(retainedSizeOfPages(4));
-            physicalWrittenBytesB.set(retainedSizeOfPages(2));
-            sink.addPage(createPage(0));
-            assertEquals(sourceA.getBufferInfo().getBufferedPages(), 2);
-            assertEquals(sourceB.getBufferInfo().getBufferedPages(), 3);
-            assertEquals(sourceC.getBufferInfo().getBufferedPages(), 0);
-
-            assertSinkWriteBlocked(sink);
-            assertRemoveAllPages(sourceA, createPage(0));
-
-            // sourceC should receive a page
-            physicalWrittenBytesB.set(retainedSizeOfPages(3));
-            sink.addPage(createPage(0));
-            assertEquals(sourceA.getBufferInfo().getBufferedPages(), 0);
-            assertEquals(sourceB.getBufferInfo().getBufferedPages(), 3);
             assertEquals(sourceC.getBufferInfo().getBufferedPages(), 1);
         });
     }
@@ -322,8 +306,54 @@ public void testNoWriterScalingWhenOnlyBufferSizeLimitIsExceeded()
                 ImmutableList.of(),
                 Optional.empty(),
                 DataSize.ofBytes(retainedSizeOfPages(4)),
-                TYPE_OPERATOR_FACTORY,
-                DataSize.ofBytes(retainedSizeOfPages(2)));
+                TYPE_OPERATORS,
+                DataSize.ofBytes(sizeOfPages(10)),
+                TOTAL_MEMORY_USED);
+
+        run(localExchange, exchange -> {
+            assertEquals(exchange.getBufferCount(), 3);
+            assertExchangeTotalBufferedBytes(exchange, 0);
+
+            LocalExchangeSinkFactory sinkFactory = exchange.createSinkFactory();
+            sinkFactory.noMoreSinkFactories();
+            LocalExchangeSink sink = sinkFactory.createSink();
+            assertSinkCanWrite(sink);
+            sinkFactory.close();
+
+            LocalExchangeSource sourceA = exchange.getNextSource();
+            assertSource(sourceA, 0);
+
+            LocalExchangeSource sourceB = exchange.getNextSource();
+            assertSource(sourceB, 0);
+
+            LocalExchangeSource sourceC = exchange.getNextSource();
+            assertSource(sourceC, 0);
+
+            range(0, 6).forEach(i -> sink.addPage(createPage(0)));
+            assertEquals(sourceA.getBufferInfo().getBufferedPages(), 6);
+            assertEquals(sourceB.getBufferInfo().getBufferedPages(), 0);
+            assertEquals(sourceC.getBufferInfo().getBufferedPages(), 0);
+        });
+    }
+
+    @Test
+    public void testScaledWriterRoundRobinExchangerWhenTotalMemoryUsedIsGreaterThanLimit()
+    {
+        AtomicLong totalMemoryUsed = new AtomicLong();
+        LocalExchange localExchange = new LocalExchange(
+                nodePartitioningManager,
+                testSessionBuilder()
+                        .setSystemProperty(QUERY_MAX_MEMORY_PER_NODE, "11MB")
+                        .build(),
+                3,
+                SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION,
+                ImmutableList.of(),
+                ImmutableList.of(),
+                Optional.empty(),
+                DataSize.ofBytes(retainedSizeOfPages(4)),
+                TYPE_OPERATORS,
+                DataSize.ofBytes(sizeOfPages(2)),
+                totalMemoryUsed::get);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 3);
@@ -335,15 +365,17 @@ public void testNoWriterScalingWhenOnlyBufferSizeLimitIsExceeded()
             assertSinkCanWrite(sink);
             sinkFactory.close();
 
-            LocalExchangeSource sourceA = getNextSource(exchange);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
-            LocalExchangeSource sourceB = getNextSource(exchange);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
-            LocalExchangeSource sourceC = getNextSource(exchange);
+            LocalExchangeSource sourceC = exchange.getNextSource();
             assertSource(sourceC, 0);
 
+            totalMemoryUsed.set(DataSize.of(11, MEGABYTE).toBytes());
+
             range(0, 6).forEach(i -> sink.addPage(createPage(0)));
             assertEquals(sourceA.getBufferInfo().getBufferedPages(), 6);
             assertEquals(sourceB.getBufferInfo().getBufferedPages(), 0);
@@ -352,7 +384,7 @@ public void testNoWriterScalingWhenOnlyBufferSizeLimitIsExceeded()
     }
 
     @Test
-    public void testNoWriterScalingWhenOnlyWriterMinSizeLimitIsExceeded()
+    public void testNoWriterScalingWhenOnlyWriterScalingMinDataProcessedLimitIsExceeded()
     {
         LocalExchange localExchange = new LocalExchange(
                 nodePartitioningManager,
@@ -363,8 +395,9 @@ public void testNoWriterScalingWhenOnlyWriterMinSizeLimitIsExceeded()
                 ImmutableList.of(),
                 Optional.empty(),
                 DataSize.ofBytes(retainedSizeOfPages(20)),
-                TYPE_OPERATOR_FACTORY,
-                DataSize.ofBytes(retainedSizeOfPages(2)));
+                TYPE_OPERATORS,
+                DataSize.ofBytes(sizeOfPages(2)),
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 3);
@@ -377,13 +410,13 @@ public void testNoWriterScalingWhenOnlyWriterMinSizeLimitIsExceeded()
             sinkFactory.close();
 
             AtomicLong physicalWrittenBytesA = new AtomicLong(0);
-            LocalExchangeSource sourceA = exchange.getNextSource(physicalWrittenBytesA::get);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
-            LocalExchangeSource sourceB = getNextSource(exchange);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
-            LocalExchangeSource sourceC = getNextSource(exchange);
+            LocalExchangeSource sourceC = exchange.getNextSource();
             assertSource(sourceC, 0);
 
             range(0, 8).forEach(i -> sink.addPage(createPage(0)));
@@ -400,15 +433,18 @@ public void testScalingForSkewedWriters(PartitioningHandle partitioningHandle)
     {
         LocalExchange localExchange = new LocalExchange(
                 nodePartitioningManager,
-                SESSION,
+                testSessionBuilder()
+                        .setSystemProperty(SKEWED_PARTITION_MIN_DATA_PROCESSED_REBALANCE_THRESHOLD, "20kB")
+                        .build(),
                 4,
                 partitioningHandle,
                 ImmutableList.of(0),
                 TYPES,
                 Optional.empty(),
                 DataSize.ofBytes(retainedSizeOfPages(2)),
-                TYPE_OPERATOR_FACTORY,
-                DataSize.of(50, MEGABYTE));
+                TYPE_OPERATORS,
+                DataSize.of(10, KILOBYTE),
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 4);
@@ -420,20 +456,16 @@ public void testScalingForSkewedWriters(PartitioningHandle partitioningHandle)
             assertSinkCanWrite(sink);
             sinkFactory.close();
 
-            AtomicLong physicalWrittenBytesA = new AtomicLong(0);
-            LocalExchangeSource sourceA = exchange.getNextSource(physicalWrittenBytesA::get);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
-            AtomicLong physicalWrittenBytesB = new AtomicLong(0);
-            LocalExchangeSource sourceB = exchange.getNextSource(physicalWrittenBytesB::get);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
-            AtomicLong physicalWrittenBytesC = new AtomicLong(0);
-            LocalExchangeSource sourceC = exchange.getNextSource(physicalWrittenBytesC::get);
+            LocalExchangeSource sourceC = exchange.getNextSource();
             assertSource(sourceC, 0);
 
-            AtomicLong physicalWrittenBytesD = new AtomicLong(0);
-            LocalExchangeSource sourceD = exchange.getNextSource(physicalWrittenBytesD::get);
+            LocalExchangeSource sourceD = exchange.getNextSource();
             assertSource(sourceD, 0);
 
             sink.addPage(createSingleValuePage(0, 1000));
@@ -447,9 +479,6 @@ public void testScalingForSkewedWriters(PartitioningHandle partitioningHandle)
             assertSource(sourceC, 0);
             assertSource(sourceD, 2);
 
-            physicalWrittenBytesA.set(DataSize.of(2, MEGABYTE).toBytes());
-            physicalWrittenBytesD.set(DataSize.of(150, MEGABYTE).toBytes());
-
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(0, 1000));
@@ -461,35 +490,31 @@ public void testScalingForSkewedWriters(PartitioningHandle partitioningHandle)
             assertSource(sourceC, 0);
             assertSource(sourceD, 4);
 
-            physicalWrittenBytesB.set(DataSize.of(100, MEGABYTE).toBytes());
-            physicalWrittenBytesD.set(DataSize.of(250, MEGABYTE).toBytes());
-
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(0, 1000));
 
             // Still there is a skewness across writers since writerA and writerC aren't writing any data.
-            // Hence, scaling will happen for partition in writerD and writerB to writerA.
+            // Hence, scaling will happen for partition in writerD and writerB to writerC.
             assertSource(sourceA, 3);
-            assertSource(sourceB, 3);
+            assertSource(sourceB, 4);
             assertSource(sourceC, 0);
-            assertSource(sourceD, 6);
-
-            physicalWrittenBytesA.set(DataSize.of(52, MEGABYTE).toBytes());
-            physicalWrittenBytesB.set(DataSize.of(150, MEGABYTE).toBytes());
-            physicalWrittenBytesD.set(DataSize.of(300, MEGABYTE).toBytes());
+            assertSource(sourceD, 5);
 
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
 
-            // Now only writerC is unused. So, scaling will happen to all the available writers.
-            assertSource(sourceA, 4);
-            assertSource(sourceB, 4);
-            assertSource(sourceC, 1);
-            assertSource(sourceD, 7);
+            // Still there is a skewness across writers since writerA isn't writing any data.
+            // Hence, scaling will happen for partition in writerD and writerB to writerA.
+            assertSource(sourceA, 5);
+            assertSource(sourceB, 5);
+            assertSource(sourceC, 2);
+            assertSource(sourceD, 6);
         });
     }
 
@@ -498,15 +523,18 @@ public void testNoScalingWhenDataWrittenIsLessThanMinFileSize(PartitioningHandle
     {
         LocalExchange localExchange = new LocalExchange(
                 nodePartitioningManager,
-                SESSION,
+                testSessionBuilder()
+                        .setSystemProperty(SKEWED_PARTITION_MIN_DATA_PROCESSED_REBALANCE_THRESHOLD, "20kB")
+                        .build(),
                 4,
                 partitioningHandle,
                 ImmutableList.of(0),
                 TYPES,
                 Optional.empty(),
                 DataSize.ofBytes(retainedSizeOfPages(2)),
-                TYPE_OPERATOR_FACTORY,
-                DataSize.of(50, MEGABYTE));
+                TYPE_OPERATORS,
+                DataSize.of(50, MEGABYTE),
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 4);
@@ -518,20 +546,16 @@ public void testNoScalingWhenDataWrittenIsLessThanMinFileSize(PartitioningHandle
             assertSinkCanWrite(sink);
             sinkFactory.close();
 
-            AtomicLong physicalWrittenBytesA = new AtomicLong(0);
-            LocalExchangeSource sourceA = exchange.getNextSource(physicalWrittenBytesA::get);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
-            AtomicLong physicalWrittenBytesB = new AtomicLong(0);
-            LocalExchangeSource sourceB = exchange.getNextSource(physicalWrittenBytesB::get);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
-            AtomicLong physicalWrittenBytesC = new AtomicLong(0);
-            LocalExchangeSource sourceC = exchange.getNextSource(physicalWrittenBytesC::get);
+            LocalExchangeSource sourceC = exchange.getNextSource();
             assertSource(sourceC, 0);
 
-            AtomicLong physicalWrittenBytesD = new AtomicLong(0);
-            LocalExchangeSource sourceD = exchange.getNextSource(physicalWrittenBytesD::get);
+            LocalExchangeSource sourceD = exchange.getNextSource();
             assertSource(sourceD, 0);
 
             sink.addPage(createSingleValuePage(0, 1000));
@@ -545,9 +569,6 @@ public void testNoScalingWhenDataWrittenIsLessThanMinFileSize(PartitioningHandle
             assertSource(sourceC, 0);
             assertSource(sourceD, 2);
 
-            physicalWrittenBytesA.set(DataSize.of(2, MEGABYTE).toBytes());
-            physicalWrittenBytesD.set(DataSize.of(40, MEGABYTE).toBytes());
-
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(0, 1000));
@@ -566,15 +587,18 @@ public void testNoScalingWhenBufferUtilizationIsLessThanLimit(PartitioningHandle
     {
         LocalExchange localExchange = new LocalExchange(
                 nodePartitioningManager,
-                SESSION,
+                testSessionBuilder()
+                        .setSystemProperty(SKEWED_PARTITION_MIN_DATA_PROCESSED_REBALANCE_THRESHOLD, "20kB")
+                        .build(),
                 4,
                 partitioningHandle,
                 ImmutableList.of(0),
                 TYPES,
                 Optional.empty(),
                 DataSize.of(50, MEGABYTE),
-                TYPE_OPERATOR_FACTORY,
-                DataSize.of(10, MEGABYTE));
+                TYPE_OPERATORS,
+                DataSize.of(10, KILOBYTE),
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 4);
@@ -586,20 +610,16 @@ public void testNoScalingWhenBufferUtilizationIsLessThanLimit(PartitioningHandle
             assertSinkCanWrite(sink);
             sinkFactory.close();
 
-            AtomicLong physicalWrittenBytesA = new AtomicLong(0);
-            LocalExchangeSource sourceA = exchange.getNextSource(physicalWrittenBytesA::get);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
-            AtomicLong physicalWrittenBytesB = new AtomicLong(0);
-            LocalExchangeSource sourceB = exchange.getNextSource(physicalWrittenBytesB::get);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
-            AtomicLong physicalWrittenBytesC = new AtomicLong(0);
-            LocalExchangeSource sourceC = exchange.getNextSource(physicalWrittenBytesC::get);
+            LocalExchangeSource sourceC = exchange.getNextSource();
             assertSource(sourceC, 0);
 
-            AtomicLong physicalWrittenBytesD = new AtomicLong(0);
-            LocalExchangeSource sourceD = exchange.getNextSource(physicalWrittenBytesD::get);
+            LocalExchangeSource sourceD = exchange.getNextSource();
             assertSource(sourceD, 0);
 
             sink.addPage(createSingleValuePage(0, 1000));
@@ -613,9 +633,6 @@ public void testNoScalingWhenBufferUtilizationIsLessThanLimit(PartitioningHandle
             assertSource(sourceC, 0);
             assertSource(sourceD, 2);
 
-            physicalWrittenBytesA.set(DataSize.of(2, MEGABYTE).toBytes());
-            physicalWrittenBytesD.set(DataSize.of(50, MEGABYTE).toBytes());
-
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(0, 1000));
@@ -629,20 +646,213 @@ public void testNoScalingWhenBufferUtilizationIsLessThanLimit(PartitioningHandle
         });
     }
 
+    @Test(dataProvider = "scalingPartitionHandles")
+    public void testNoScalingWhenTotalMemoryUsedIsGreaterThanLimit(PartitioningHandle partitioningHandle)
+    {
+        AtomicLong totalMemoryUsed = new AtomicLong();
+        LocalExchange localExchange = new LocalExchange(
+                nodePartitioningManager,
+                testSessionBuilder()
+                        .setSystemProperty(SKEWED_PARTITION_MIN_DATA_PROCESSED_REBALANCE_THRESHOLD, "20kB")
+                        .setSystemProperty(QUERY_MAX_MEMORY_PER_NODE, "20MB")
+                        .build(),
+                4,
+                partitioningHandle,
+                ImmutableList.of(0),
+                TYPES,
+                Optional.empty(),
+                DataSize.ofBytes(retainedSizeOfPages(2)),
+                TYPE_OPERATORS,
+                DataSize.of(10, KILOBYTE),
+                totalMemoryUsed::get);
+
+        run(localExchange, exchange -> {
+            assertEquals(exchange.getBufferCount(), 4);
+            assertExchangeTotalBufferedBytes(exchange, 0);
+
+            LocalExchangeSinkFactory sinkFactory = exchange.createSinkFactory();
+            sinkFactory.noMoreSinkFactories();
+            LocalExchangeSink sink = sinkFactory.createSink();
+            assertSinkCanWrite(sink);
+            sinkFactory.close();
+
+            LocalExchangeSource sourceA = exchange.getNextSource();
+            assertSource(sourceA, 0);
+
+            LocalExchangeSource sourceB = exchange.getNextSource();
+            assertSource(sourceB, 0);
+
+            LocalExchangeSource sourceC = exchange.getNextSource();
+            assertSource(sourceC, 0);
+
+            LocalExchangeSource sourceD = exchange.getNextSource();
+            assertSource(sourceD, 0);
+
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(1, 2));
+            sink.addPage(createSingleValuePage(1, 2));
+
+            // Two partitions are assigned to two different writers
+            assertSource(sourceA, 2);
+            assertSource(sourceB, 0);
+            assertSource(sourceC, 0);
+            assertSource(sourceD, 2);
+
+            totalMemoryUsed.set(DataSize.of(5, MEGABYTE).toBytes());
+
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+
+            // Scaling since total memory used is less than 10 MBs
+            assertSource(sourceA, 2);
+            assertSource(sourceB, 2);
+            assertSource(sourceC, 0);
+            assertSource(sourceD, 4);
+
+            totalMemoryUsed.set(DataSize.of(13, MEGABYTE).toBytes());
+
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+
+            // No scaling since total memory used is greater than 10 MBs
+            assertSource(sourceA, 2);
+            assertSource(sourceB, 4);
+            assertSource(sourceC, 0);
+            assertSource(sourceD, 6);
+        });
+    }
+
+    @Test(dataProvider = "scalingPartitionHandles")
+    public void testNoScalingWhenMaxScaledPartitionsPerTaskIsSmall(PartitioningHandle partitioningHandle)
+    {
+        LocalExchange localExchange = new LocalExchange(
+                nodePartitioningManager,
+                testSessionBuilder()
+                        .setSystemProperty(SKEWED_PARTITION_MIN_DATA_PROCESSED_REBALANCE_THRESHOLD, "20kB")
+                        .setSystemProperty(QUERY_MAX_MEMORY_PER_NODE, "256MB")
+                        .build(),
+                4,
+                partitioningHandle,
+                ImmutableList.of(0),
+                TYPES,
+                Optional.empty(),
+                DataSize.ofBytes(retainedSizeOfPages(2)),
+                TYPE_OPERATORS,
+                DataSize.of(10, KILOBYTE),
+                TOTAL_MEMORY_USED);
+
+        run(localExchange, exchange -> {
+            assertEquals(exchange.getBufferCount(), 4);
+            assertExchangeTotalBufferedBytes(exchange, 0);
+
+            LocalExchangeSinkFactory sinkFactory = exchange.createSinkFactory();
+            sinkFactory.noMoreSinkFactories();
+            LocalExchangeSink sink = sinkFactory.createSink();
+            assertSinkCanWrite(sink);
+            sinkFactory.close();
+
+            LocalExchangeSource sourceA = exchange.getNextSource();
+            assertSource(sourceA, 0);
+
+            LocalExchangeSource sourceB = exchange.getNextSource();
+            assertSource(sourceB, 0);
+
+            LocalExchangeSource sourceC = exchange.getNextSource();
+            assertSource(sourceC, 0);
+
+            LocalExchangeSource sourceD = exchange.getNextSource();
+            assertSource(sourceD, 0);
+
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(1, 2));
+            sink.addPage(createSingleValuePage(1, 2));
+
+            // Two partitions are assigned to two different writers
+            assertSource(sourceA, 2);
+            assertSource(sourceB, 0);
+            assertSource(sourceC, 0);
+            assertSource(sourceD, 2);
+
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+
+            // partition 0 is assigned to writer B after scaling.
+            assertSource(sourceA, 2);
+            assertSource(sourceB, 2);
+            assertSource(sourceC, 0);
+            assertSource(sourceD, 4);
+
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+
+            // partition 0 is assigned to writer A after scaling.
+            assertSource(sourceA, 3);
+            assertSource(sourceB, 4);
+            assertSource(sourceC, 0);
+            assertSource(sourceD, 5);
+
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(0, 1000));
+
+            // partition 0 is assigned to writer C after scaling.
+            assertSource(sourceA, 4);
+            assertSource(sourceB, 5);
+            assertSource(sourceC, 1);
+            assertSource(sourceD, 6);
+
+            sink.addPage(createSingleValuePage(1, 10000));
+            sink.addPage(createSingleValuePage(1, 10000));
+            sink.addPage(createSingleValuePage(1, 10000));
+            sink.addPage(createSingleValuePage(1, 10000));
+
+            // partition 1 is assigned to writer B after scaling.
+            assertSource(sourceA, 6);
+            assertSource(sourceB, 7);
+            assertSource(sourceC, 1);
+            assertSource(sourceD, 6);
+
+            sink.addPage(createSingleValuePage(1, 10000));
+            sink.addPage(createSingleValuePage(1, 10000));
+            sink.addPage(createSingleValuePage(1, 10000));
+            sink.addPage(createSingleValuePage(1, 10000));
+
+            // no scaling will happen since we have scaled to maximum limit which is the number of writer count.
+            assertSource(sourceA, 8);
+            assertSource(sourceB, 9);
+            assertSource(sourceC, 1);
+            assertSource(sourceD, 6);
+        });
+    }
+
     @Test
     public void testNoScalingWhenNoWriterSkewness()
     {
         LocalExchange localExchange = new LocalExchange(
                 nodePartitioningManager,
-                SESSION,
+                testSessionBuilder()
+                        .setSystemProperty(SKEWED_PARTITION_MIN_DATA_PROCESSED_REBALANCE_THRESHOLD, "20kB")
+                        .build(),
                 2,
                 SCALED_WRITER_HASH_DISTRIBUTION,
                 ImmutableList.of(0),
                 TYPES,
                 Optional.empty(),
                 DataSize.ofBytes(retainedSizeOfPages(2)),
-                TYPE_OPERATOR_FACTORY,
-                DataSize.of(50, MEGABYTE));
+                TYPE_OPERATORS,
+                DataSize.of(50, KILOBYTE),
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 2);
@@ -654,24 +864,19 @@ public void testNoScalingWhenNoWriterSkewness()
             assertSinkCanWrite(sink);
             sinkFactory.close();
 
-            AtomicLong physicalWrittenBytesA = new AtomicLong(0);
-            LocalExchangeSource sourceA = exchange.getNextSource(physicalWrittenBytesA::get);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
-            AtomicLong physicalWrittenBytesB = new AtomicLong(0);
-            LocalExchangeSource sourceB = exchange.getNextSource(physicalWrittenBytesB::get);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
-            sink.addPage(createSingleValuePage(0, 100));
-            sink.addPage(createSingleValuePage(1, 100));
+            sink.addPage(createSingleValuePage(0, 1000));
+            sink.addPage(createSingleValuePage(1, 1000));
 
             // Two partitions are assigned to two different writers
             assertSource(sourceA, 1);
             assertSource(sourceB, 1);
 
-            physicalWrittenBytesA.set(DataSize.of(50, MEGABYTE).toBytes());
-            physicalWrittenBytesB.set(DataSize.of(50, MEGABYTE).toBytes());
-
             sink.addPage(createSingleValuePage(0, 1000));
             sink.addPage(createSingleValuePage(1, 1000));
 
@@ -693,8 +898,9 @@ public void testPassthrough()
                 ImmutableList.of(),
                 Optional.empty(),
                 DataSize.ofBytes(retainedSizeOfPages(1)),
-                TYPE_OPERATOR_FACTORY,
-                WRITER_MIN_SIZE);
+                TYPE_OPERATORS,
+                WRITER_SCALING_MIN_DATA_PROCESSED,
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 2);
@@ -708,10 +914,10 @@ public void testPassthrough()
             assertSinkCanWrite(sinkB);
             sinkFactory.close();
 
-            LocalExchangeSource sourceA = getNextSource(exchange);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
-            LocalExchangeSource sourceB = getNextSource(exchange);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
             sinkA.addPage(createPage(0));
@@ -760,8 +966,9 @@ public void testPartition()
                 TYPES,
                 Optional.empty(),
                 LOCAL_EXCHANGE_MAX_BUFFERED_BYTES,
-                TYPE_OPERATOR_FACTORY,
-                WRITER_MIN_SIZE);
+                TYPE_OPERATORS,
+                WRITER_SCALING_MIN_DATA_PROCESSED,
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 2);
@@ -773,10 +980,10 @@ public void testPartition()
             assertSinkCanWrite(sink);
             sinkFactory.close();
 
-            LocalExchangeSource sourceA = getNextSource(exchange);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
-            LocalExchangeSource sourceB = getNextSource(exchange);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
             sink.addPage(createPage(0));
@@ -856,8 +1063,9 @@ public BucketFunction getBucketFunction(ConnectorTransactionHandle transactionHa
                 ImmutableList.of(BIGINT),
                 Optional.empty(),
                 LOCAL_EXCHANGE_MAX_BUFFERED_BYTES,
-                TYPE_OPERATOR_FACTORY,
-                WRITER_MIN_SIZE);
+                TYPE_OPERATORS,
+                WRITER_SCALING_MIN_DATA_PROCESSED,
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 2);
@@ -869,10 +1077,10 @@ public BucketFunction getBucketFunction(ConnectorTransactionHandle transactionHa
             assertSinkCanWrite(sink);
             sinkFactory.close();
 
-            LocalExchangeSource sourceB = getNextSource(exchange);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
-            LocalExchangeSource sourceA = getNextSource(exchange);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
             Page pageA = SequencePageBuilder.createSequencePage(types, 1, 100, 42);
@@ -907,8 +1115,9 @@ public void writeUnblockWhenAllReadersFinish()
                 ImmutableList.of(),
                 Optional.empty(),
                 LOCAL_EXCHANGE_MAX_BUFFERED_BYTES,
-                TYPE_OPERATOR_FACTORY,
-                WRITER_MIN_SIZE);
+                TYPE_OPERATORS,
+                WRITER_SCALING_MIN_DATA_PROCESSED,
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 2);
@@ -922,10 +1131,10 @@ public void writeUnblockWhenAllReadersFinish()
             assertSinkCanWrite(sinkB);
             sinkFactory.close();
 
-            LocalExchangeSource sourceA = getNextSource(exchange);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
-            LocalExchangeSource sourceB = getNextSource(exchange);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
             sourceA.finish();
@@ -954,8 +1163,9 @@ public void writeUnblockWhenAllReadersFinishAndPagesConsumed()
                 ImmutableList.of(),
                 Optional.empty(),
                 DataSize.ofBytes(2),
-                TYPE_OPERATOR_FACTORY,
-                WRITER_MIN_SIZE);
+                TYPE_OPERATORS,
+                WRITER_SCALING_MIN_DATA_PROCESSED,
+                TOTAL_MEMORY_USED);
 
         run(localExchange, exchange -> {
             assertEquals(exchange.getBufferCount(), 2);
@@ -975,10 +1185,10 @@ public void writeUnblockWhenAllReadersFinishAndPagesConsumed()
 
             sinkFactory.close();
 
-            LocalExchangeSource sourceA = getNextSource(exchange);
+            LocalExchangeSource sourceA = exchange.getNextSource();
             assertSource(sourceA, 0);
 
-            LocalExchangeSource sourceB = getNextSource(exchange);
+            LocalExchangeSource sourceB = exchange.getNextSource();
             assertSource(sourceB, 0);
 
             sinkA.addPage(createPage(0));
@@ -1059,11 +1269,6 @@ private void run(LocalExchange localExchange, Consumer<LocalExchange> test)
         test.accept(localExchange);
     }
 
-    private LocalExchangeSource getNextSource(LocalExchange exchange)
-    {
-        return exchange.getNextSource(() -> DataSize.of(0, MEGABYTE).toBytes());
-    }
-
     private static void assertSource(LocalExchangeSource source, int pageCount)
     {
         LocalExchangeBufferInfo bufferInfo = source.getBufferInfo();
@@ -1096,11 +1301,6 @@ private static void assertSourceFinished(LocalExchangeSource source)
         assertTrue(source.isFinished());
     }
 
-    private static void assertRemoveAllPages(LocalExchangeSource source, Page expectedPage)
-    {
-        range(0, source.getBufferInfo().getBufferedPages()).forEach(i -> assertRemovePage(source, expectedPage));
-    }
-
     private static void assertRemovePage(LocalExchangeSource source, Page expectedPage)
     {
         assertRemovePage(TYPES, source, expectedPage);
@@ -1122,7 +1322,7 @@ private static void assertPartitionedRemovePage(LocalExchangeSource source, int
         Page page = source.removePage();
         assertNotNull(page);
 
-        LocalPartitionGenerator partitionGenerator = new LocalPartitionGenerator(new InterpretedHashGenerator(TYPES, new int[] {0}, TYPE_OPERATOR_FACTORY), partitionCount);
+        LocalPartitionGenerator partitionGenerator = new LocalPartitionGenerator(createChannelsHashGenerator(TYPES, new int[]{0}, TYPE_OPERATORS), partitionCount);
         for (int position = 0; position < page.getPositionCount(); position++) {
             assertEquals(partitionGenerator.getPartition(page, position), partition);
         }
@@ -1174,6 +1374,11 @@ private static Page createSingleValuePage(int value, int length)
         return new Page(block);
     }
 
+    private static long sizeOfPages(int count)
+    {
+        return PAGE_SIZE.toBytes() * count;
+    }
+
     public static long retainedSizeOfPages(int count)
     {
         return RETAINED_PAGE_SIZE.toBytes() * count;
diff --git a/core/trino-main/src/test/java/io/trino/operator/exchange/TestUniformPartitionRebalancer.java b/core/trino-main/src/test/java/io/trino/operator/exchange/TestUniformPartitionRebalancer.java
deleted file mode 100644
index 819e8473c704..000000000000
--- a/core/trino-main/src/test/java/io/trino/operator/exchange/TestUniformPartitionRebalancer.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.exchange;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import io.airlift.units.DataSize;
-import it.unimi.dsi.fastutil.longs.Long2LongMap;
-import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static io.airlift.units.DataSize.Unit.MEGABYTE;
-import static io.trino.operator.exchange.UniformPartitionRebalancer.WriterPartitionId;
-import static io.trino.operator.exchange.UniformPartitionRebalancer.WriterPartitionId.serialize;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TestUniformPartitionRebalancer
-{
-    @Test
-    public void testRebalanceWithWriterSkewness()
-    {
-        AtomicLong physicalWrittenBytesForWriter0 = new AtomicLong(0);
-        AtomicLong physicalWrittenBytesForWriter1 = new AtomicLong(0);
-        List<Supplier<Long>> writerPhysicalWrittenBytes = ImmutableList.of(
-                physicalWrittenBytesForWriter0::get,
-                physicalWrittenBytesForWriter1::get);
-        AtomicReference<Long2LongMap> partitionRowCounts = new AtomicReference<>(new Long2LongOpenHashMap());
-
-        UniformPartitionRebalancer partitionRebalancer = new UniformPartitionRebalancer(
-                writerPhysicalWrittenBytes,
-                partitionRowCounts::get,
-                4,
-                2,
-                DataSize.of(4, MEGABYTE).toBytes());
-
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 0), 2L,
-                new WriterPartitionId(1, 1), 20000L,
-                new WriterPartitionId(0, 2), 2L,
-                new WriterPartitionId(1, 3), 20000L)));
-
-        physicalWrittenBytesForWriter1.set(DataSize.of(200, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 4))
-                .containsExactly(
-                        ImmutableList.of(0),
-                        ImmutableList.of(1),
-                        ImmutableList.of(0),
-                        ImmutableList.of(1, 0));
-
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 3), 10000L,
-                new WriterPartitionId(1, 3), 10000L,
-                new WriterPartitionId(1, 1), 40000L)));
-
-        physicalWrittenBytesForWriter0.set(DataSize.of(50, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter1.set(DataSize.of(500, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 4))
-                .containsExactly(
-                        ImmutableList.of(0),
-                        ImmutableList.of(1, 0),
-                        ImmutableList.of(0),
-                        ImmutableList.of(1, 0));
-
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 1), 10000L,
-                new WriterPartitionId(1, 1), 10000L,
-                new WriterPartitionId(0, 3), 10000L,
-                new WriterPartitionId(1, 3), 20000L)));
-
-        physicalWrittenBytesForWriter0.set(DataSize.of(100, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter1.set(DataSize.of(100, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 4))
-                .containsExactly(
-                        ImmutableList.of(0),
-                        ImmutableList.of(1, 0),
-                        ImmutableList.of(0),
-                        ImmutableList.of(1, 0));
-    }
-
-    @Test
-    public void testComputeRebalanceThroughputWithAllWritersOfTheSamePartition()
-    {
-        AtomicLong physicalWrittenBytesForWriter0 = new AtomicLong(0);
-        AtomicLong physicalWrittenBytesForWriter1 = new AtomicLong(0);
-        AtomicLong physicalWrittenBytesForWriter2 = new AtomicLong(0);
-        AtomicLong physicalWrittenBytesForWriter3 = new AtomicLong(0);
-        AtomicLong physicalWrittenBytesForWriter4 = new AtomicLong(0);
-        AtomicLong physicalWrittenBytesForWriter5 = new AtomicLong(0);
-        List<Supplier<Long>> writerPhysicalWrittenBytes = ImmutableList.of(
-                physicalWrittenBytesForWriter0::get,
-                physicalWrittenBytesForWriter1::get,
-                physicalWrittenBytesForWriter2::get,
-                physicalWrittenBytesForWriter3::get,
-                physicalWrittenBytesForWriter4::get,
-                physicalWrittenBytesForWriter5::get);
-        AtomicReference<Long2LongMap> partitionRowCounts = new AtomicReference<>(new Long2LongOpenHashMap());
-
-        UniformPartitionRebalancer partitionRebalancer = new UniformPartitionRebalancer(
-                writerPhysicalWrittenBytes,
-                partitionRowCounts::get,
-                2,
-                6,
-                DataSize.of(4, MEGABYTE).toBytes());
-
-        // init 6 writers and 2 partitions, so partition0 -> writer0 and partition1 -> writer1
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 2))
-                .containsExactly(
-                        ImmutableList.of(0),
-                        ImmutableList.of(1));
-
-        // new data, partition0 -> writer0 has 100M, and partition1 -> writer1 has 1M
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 0), 10000L,
-                new WriterPartitionId(1, 1), 100L)));
-
-        physicalWrittenBytesForWriter0.set(DataSize.of(100, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter1.set(DataSize.of(1, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        // check partition0 rebalanced, partition0 -> writer[0, 2]
-        // partition1's data is less than threshold.
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 2))
-                .containsExactly(
-                        ImmutableList.of(0, 2),
-                        ImmutableList.of(1));
-
-        // new data, partition0 -> writer[0, 2] each has 100M, and partition1 -> writer1 has 1M
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 0), 20000L,
-                new WriterPartitionId(1, 1), 200L,
-                new WriterPartitionId(2, 0), 10000L)));
-
-        physicalWrittenBytesForWriter0.set(DataSize.of(200, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter1.set(DataSize.of(2, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter2.set(DataSize.of(100, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        // check partition0 rebalanced, partition0 -> writer[0, 2, 3]
-        // partition1's data is less than threshold.
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 2))
-                .containsExactly(
-                        ImmutableList.of(0, 2, 3),
-                        ImmutableList.of(1));
-
-        // new data, partition0 -> writer[0, 2, 3] each has 100M, and partition1 -> writer1 has 1M
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 0), 30000L,
-                new WriterPartitionId(1, 1), 300L,
-                new WriterPartitionId(2, 0), 20000L,
-                new WriterPartitionId(3, 0), 10000L)));
-
-        physicalWrittenBytesForWriter0.set(DataSize.of(300, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter1.set(DataSize.of(3, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter2.set(DataSize.of(200, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter3.set(DataSize.of(100, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        // check partition0 rebalanced, partition0 -> writer[0, 2, 3, 4]
-        // partition1's data is less than threshold.
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 2))
-                .containsExactly(
-                        ImmutableList.of(0, 2, 3, 4),
-                        ImmutableList.of(1));
-
-        // new data, partition0 -> writer[0, 2, 3, 4] each has 100M, and partition1 -> writer1 has 90M
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 0), 40000L,
-                new WriterPartitionId(1, 1), 9300L,
-                new WriterPartitionId(2, 0), 30000L,
-                new WriterPartitionId(3, 0), 20000L,
-                new WriterPartitionId(4, 0), 10000L)));
-
-        physicalWrittenBytesForWriter0.set(DataSize.of(400, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter1.set(DataSize.of(93, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter2.set(DataSize.of(300, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter3.set(DataSize.of(200, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter4.set(DataSize.of(100, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        // check partition0 be rebalanced, partition0 -> writer[0, 2, 3, 4, 5]
-        // only partition0 rebalanced, because after rebalanced partition0
-        // we estimate 6 writers' throughput are [80, 90, 80, 80, 80, 80],
-        // and data skew is less than threshold.
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 2))
-                .containsExactly(
-                        ImmutableList.of(0, 2, 3, 4, 5),
-                        ImmutableList.of(1));
-    }
-
-    @Test
-    public void testRebalanceAffectAllWritersOfTheSamePartition()
-    {
-        AtomicLong physicalWrittenBytesForWriter0 = new AtomicLong(0);
-        AtomicLong physicalWrittenBytesForWriter1 = new AtomicLong(0);
-        AtomicLong physicalWrittenBytesForWriter2 = new AtomicLong(0);
-        AtomicLong physicalWrittenBytesForWriter3 = new AtomicLong(0);
-        List<Supplier<Long>> writerPhysicalWrittenBytes = ImmutableList.of(
-                physicalWrittenBytesForWriter0::get,
-                physicalWrittenBytesForWriter1::get,
-                physicalWrittenBytesForWriter2::get,
-                physicalWrittenBytesForWriter3::get);
-        AtomicReference<Long2LongMap> partitionRowCounts = new AtomicReference<>(new Long2LongOpenHashMap());
-
-        UniformPartitionRebalancer partitionRebalancer = new UniformPartitionRebalancer(
-                writerPhysicalWrittenBytes,
-                partitionRowCounts::get,
-                3,
-                4,
-                DataSize.of(4, MEGABYTE).toBytes());
-
-        // init 4 writers and 3 partitions, so partition0 -> writer0, partition1 -> writer1 and
-        // partition2 -> writer2
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 3))
-                .containsExactly(
-                        ImmutableList.of(0),
-                        ImmutableList.of(1),
-                        ImmutableList.of(2));
-
-        // new data, partition0 -> writer0 has 100M
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 0), 10000L)));
-
-        physicalWrittenBytesForWriter0.set(DataSize.of(100, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        // check partition0 rebalanced, partition0 -> writer[0, 1]
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 3))
-                .containsExactly(
-                        ImmutableList.of(0, 1),
-                        ImmutableList.of(1),
-                        ImmutableList.of(2));
-
-        // new data, partition1 -> writer1 has 100M
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 0), 10000L,
-                new WriterPartitionId(1, 1), 10000L)));
-
-        physicalWrittenBytesForWriter0.set(DataSize.of(100, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter1.set(DataSize.of(100, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        // check partition1 rebalanced, partition0 -> writer[0, 1], partition1 -> writer[1, 0]
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 3))
-                .containsExactly(
-                        ImmutableList.of(0, 1),
-                        ImmutableList.of(1, 0),
-                        ImmutableList.of(2));
-
-        // new data, partition0 -> wrter0 31M, partition0 -> writer1 30M
-        // partition1 -> writer0 10M, partition1 -> writer1 10M
-        // partition2 -> writer2 10M
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 0), 13000L,
-                new WriterPartitionId(0, 1), 3000L,
-                new WriterPartitionId(1, 0), 1000L,
-                new WriterPartitionId(1, 1), 11000L,
-                new WriterPartitionId(2, 2), 1000L)));
-
-        physicalWrittenBytesForWriter0.set(DataSize.of(141, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter1.set(DataSize.of(140, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter2.set(DataSize.of(10, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        // check partition0 rebalanced, partition0 -> writer[0, 1, 3]
-        // this affect the writer1 and writer3's throughput,
-        // now all writers' throughput is [30, 30, 10, 20] and the skew is less than threshold,
-        // no more rebalance needed.
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 3))
-                .containsExactly(
-                        ImmutableList.of(0, 1, 3),
-                        ImmutableList.of(1, 0),
-                        ImmutableList.of(2));
-    }
-
-    @Test
-    public void testNoRebalanceWhenDataWrittenIsLessThanTheRebalanceLimit()
-    {
-        AtomicLong physicalWrittenBytesForWriter0 = new AtomicLong(0);
-        AtomicLong physicalWrittenBytesForWriter1 = new AtomicLong(0);
-        List<Supplier<Long>> writerPhysicalWrittenBytes = ImmutableList.of(
-                physicalWrittenBytesForWriter0::get,
-                physicalWrittenBytesForWriter1::get);
-        AtomicReference<Long2LongMap> partitionRowCounts = new AtomicReference<>(new Long2LongOpenHashMap());
-
-        UniformPartitionRebalancer partitionRebalancer = new UniformPartitionRebalancer(
-                writerPhysicalWrittenBytes,
-                partitionRowCounts::get,
-                4,
-                2,
-                DataSize.of(4, MEGABYTE).toBytes());
-
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 0), 2L,
-                new WriterPartitionId(1, 1), 20000L,
-                new WriterPartitionId(0, 2), 2L,
-                new WriterPartitionId(1, 3), 20000L)));
-
-        physicalWrittenBytesForWriter1.set(DataSize.of(30, MEGABYTE).toBytes());
-
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 4))
-                .containsExactly(
-                        ImmutableList.of(0),
-                        ImmutableList.of(1),
-                        ImmutableList.of(0),
-                        ImmutableList.of(1));
-
-        partitionRebalancer.rebalancePartitions();
-
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 4))
-                .containsExactly(
-                        ImmutableList.of(0),
-                        ImmutableList.of(1),
-                        ImmutableList.of(0),
-                        ImmutableList.of(1));
-    }
-
-    @Test
-    public void testNoRebalanceWithoutWriterSkewness()
-    {
-        AtomicReference<Long> physicalWrittenBytesForWriter0 = new AtomicReference<>(0L);
-        AtomicReference<Long> physicalWrittenBytesForWriter1 = new AtomicReference<>(0L);
-        List<Supplier<Long>> writerPhysicalWrittenBytes = ImmutableList.of(
-                physicalWrittenBytesForWriter0::get,
-                physicalWrittenBytesForWriter1::get);
-        AtomicReference<Long2LongMap> partitionRowCounts = new AtomicReference<>(new Long2LongOpenHashMap());
-
-        UniformPartitionRebalancer partitionRebalancer = new UniformPartitionRebalancer(
-                writerPhysicalWrittenBytes,
-                partitionRowCounts::get,
-                4,
-                2,
-                DataSize.of(4, MEGABYTE).toBytes());
-
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 0), 20000L,
-                new WriterPartitionId(1, 1), 20000L,
-                new WriterPartitionId(0, 2), 20000L,
-                new WriterPartitionId(1, 3), 20000L)));
-
-        physicalWrittenBytesForWriter0.set(DataSize.of(50, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter1.set(DataSize.of(100, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 4))
-                .containsExactly(
-                        ImmutableList.of(0),
-                        ImmutableList.of(1),
-                        ImmutableList.of(0),
-                        ImmutableList.of(1));
-
-        partitionRebalancer.rebalancePartitions();
-
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 4))
-                .containsExactly(
-                        ImmutableList.of(0),
-                        ImmutableList.of(1),
-                        ImmutableList.of(0),
-                        ImmutableList.of(1));
-    }
-
-    @Test
-    public void testNoRebalanceWhenDataWrittenByThePartitionIsLessThanWriterMinSize()
-    {
-        AtomicReference<Long> physicalWrittenBytesForWriter0 = new AtomicReference<>(0L);
-        AtomicReference<Long> physicalWrittenBytesForWriter1 = new AtomicReference<>(0L);
-        List<Supplier<Long>> writerPhysicalWrittenBytes = ImmutableList.of(
-                physicalWrittenBytesForWriter0::get,
-                physicalWrittenBytesForWriter1::get);
-        AtomicReference<Long2LongMap> partitionRowCounts = new AtomicReference<>(new Long2LongOpenHashMap());
-
-        UniformPartitionRebalancer partitionRebalancer = new UniformPartitionRebalancer(
-                writerPhysicalWrittenBytes,
-                partitionRowCounts::get,
-                4,
-                2,
-                DataSize.of(500, MEGABYTE).toBytes());
-
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 0), 2L,
-                new WriterPartitionId(1, 1), 20000L,
-                new WriterPartitionId(0, 2), 2L,
-                new WriterPartitionId(1, 3), 20000L)));
-
-        physicalWrittenBytesForWriter1.set(DataSize.of(200, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 4))
-                .containsExactly(
-                        ImmutableList.of(0),
-                        ImmutableList.of(1),
-                        ImmutableList.of(0),
-                        ImmutableList.of(1));
-    }
-
-    @Test
-    public void testPartitionShouldNotScaledTwiceInTheSameRebalanceCall()
-    {
-        AtomicReference<Long> physicalWrittenBytesForWriter0 = new AtomicReference<>(0L);
-        AtomicReference<Long> physicalWrittenBytesForWriter1 = new AtomicReference<>(0L);
-        AtomicReference<Long> physicalWrittenBytesForWriter2 = new AtomicReference<>(0L);
-        List<Supplier<Long>> writerPhysicalWrittenBytes = ImmutableList.of(
-                physicalWrittenBytesForWriter0::get,
-                physicalWrittenBytesForWriter1::get,
-                physicalWrittenBytesForWriter2::get);
-        AtomicReference<Long2LongMap> partitionRowCounts = new AtomicReference<>(new Long2LongOpenHashMap());
-
-        UniformPartitionRebalancer partitionRebalancer = new UniformPartitionRebalancer(
-                writerPhysicalWrittenBytes,
-                partitionRowCounts::get,
-                6,
-                3,
-                DataSize.of(32, MEGABYTE).toBytes());
-
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 0), 2L,
-                new WriterPartitionId(1, 1), 2L,
-                new WriterPartitionId(2, 2), 2L,
-                new WriterPartitionId(0, 3), 2L,
-                new WriterPartitionId(1, 4), 2L,
-                new WriterPartitionId(2, 5), 20000L)));
-
-        physicalWrittenBytesForWriter2.set(DataSize.of(200, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 6))
-                .containsExactly(
-                        ImmutableList.of(0),
-                        ImmutableList.of(1),
-                        ImmutableList.of(2),
-                        ImmutableList.of(0),
-                        ImmutableList.of(1),
-                        ImmutableList.of(2, 0));
-
-        partitionRowCounts.set(serializeToLong2LongMap(ImmutableMap.of(
-                new WriterPartitionId(0, 5), 10000L,
-                new WriterPartitionId(2, 5), 10000L)));
-
-        physicalWrittenBytesForWriter0.set(DataSize.of(100, MEGABYTE).toBytes());
-        physicalWrittenBytesForWriter2.set(DataSize.of(300, MEGABYTE).toBytes());
-
-        partitionRebalancer.rebalancePartitions();
-
-        assertThat(getWriterIdsForPartitions(partitionRebalancer, 6))
-                .containsExactly(
-                        ImmutableList.of(0),
-                        ImmutableList.of(1),
-                        ImmutableList.of(2),
-                        ImmutableList.of(0),
-                        ImmutableList.of(1),
-                        ImmutableList.of(2, 0, 1));
-    }
-
-    private Long2LongMap serializeToLong2LongMap(Map<WriterPartitionId, Long> input)
-    {
-        return new Long2LongOpenHashMap(
-                input.entrySet().stream()
-                        .collect(toImmutableMap(
-                                entry -> serialize(entry.getKey()),
-                                Map.Entry::getValue)));
-    }
-
-    private List<List<Integer>> getWriterIdsForPartitions(UniformPartitionRebalancer partitionRebalancer, int partitionCount)
-    {
-        return IntStream.range(0, partitionCount)
-                .mapToObj(partitionRebalancer::getWriterIds)
-                .collect(toImmutableList());
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/operator/index/TestFieldSetFilteringRecordSet.java b/core/trino-main/src/test/java/io/trino/operator/index/TestFieldSetFilteringRecordSet.java
index 197df6af3351..45f95366f22f 100644
--- a/core/trino-main/src/test/java/io/trino/operator/index/TestFieldSetFilteringRecordSet.java
+++ b/core/trino-main/src/test/java/io/trino/operator/index/TestFieldSetFilteringRecordSet.java
@@ -19,7 +19,7 @@
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.TypeOperators;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
diff --git a/core/trino-main/src/test/java/io/trino/operator/index/TestTupleFilterProcessor.java b/core/trino-main/src/test/java/io/trino/operator/index/TestTupleFilterProcessor.java
index a1a85391cf00..d20889b1bf02 100644
--- a/core/trino-main/src/test/java/io/trino/operator/index/TestTupleFilterProcessor.java
+++ b/core/trino-main/src/test/java/io/trino/operator/index/TestTupleFilterProcessor.java
@@ -24,7 +24,7 @@
 import io.trino.sql.gen.PageFunctionCompiler;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.type.BlockTypeOperators;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.OptionalInt;
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/BenchmarkHashBuildAndJoinOperators.java b/core/trino-main/src/test/java/io/trino/operator/join/BenchmarkHashBuildAndJoinOperators.java
index a589d378fe9d..faaf81b1bde6 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/BenchmarkHashBuildAndJoinOperators.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/BenchmarkHashBuildAndJoinOperators.java
@@ -20,14 +20,11 @@
 import io.trino.RowPagesBuilder;
 import io.trino.Session;
 import io.trino.operator.DriverContext;
-import io.trino.operator.InterpretedHashGenerator;
 import io.trino.operator.Operator;
-import io.trino.operator.OperatorFactories;
 import io.trino.operator.OperatorFactory;
 import io.trino.operator.PagesIndex;
 import io.trino.operator.PartitionFunction;
 import io.trino.operator.TaskContext;
-import io.trino.operator.TrinoOperatorFactories;
 import io.trino.operator.exchange.LocalPartitionGenerator;
 import io.trino.operator.join.HashBuilderOperator.HashBuilderOperatorFactory;
 import io.trino.spi.Page;
@@ -37,7 +34,7 @@
 import io.trino.spiller.SingleStreamSpillerFactory;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.TestingTaskContext;
-import io.trino.type.BlockTypeOperators;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -50,7 +47,6 @@
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.Arrays;
 import java.util.Iterator;
@@ -71,7 +67,9 @@
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.jmh.Benchmarks.benchmark;
 import static io.trino.operator.HashArraySizeSupplier.incrementalLoadFactorHashArraySizeSupplier;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.innerJoin;
+import static io.trino.operator.InterpretedHashGenerator.createChannelsHashGenerator;
+import static io.trino.operator.JoinOperatorType.innerJoin;
+import static io.trino.operator.OperatorFactories.spillingJoin;
 import static io.trino.operator.join.JoinBridgeManager.lookupAllAtOnce;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
@@ -96,7 +94,7 @@ public class BenchmarkHashBuildAndJoinOperators
     private static final int HASH_BUILD_OPERATOR_ID = 1;
     private static final int HASH_JOIN_OPERATOR_ID = 2;
     private static final PlanNodeId TEST_PLAN_NODE_ID = new PlanNodeId("test");
-    private static final BlockTypeOperators TYPE_OPERATOR_FACTORY = new BlockTypeOperators(new TypeOperators());
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
 
     @State(Scope.Benchmark)
     public static class BuildContext
@@ -217,11 +215,6 @@ public static class JoinContext
         @Override
         @Setup
         public void setup()
-        {
-            setup(new TrinoOperatorFactories());
-        }
-
-        public void setup(OperatorFactories operatorFactories)
         {
             super.setup();
 
@@ -240,7 +233,7 @@ public void setup(OperatorFactories operatorFactories)
             }
 
             JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactory = getLookupSourceFactoryManager(this, outputChannels, partitionCount);
-            joinOperatorFactory = operatorFactories.spillingJoin(
+            joinOperatorFactory = spillingJoin(
                     innerJoin(false, false),
                     HASH_JOIN_OPERATOR_ID,
                     TEST_PLAN_NODE_ID,
@@ -252,7 +245,7 @@ public void setup(OperatorFactories operatorFactories)
                     Optional.of(outputChannels),
                     OptionalInt.empty(),
                     unsupportedPartitioningSpillerFactory(),
-                    TYPE_OPERATOR_FACTORY);
+                    TYPE_OPERATORS);
             buildHash(this, lookupSourceFactory, outputChannels, partitionCount);
             initializeProbePages();
         }
@@ -336,7 +329,7 @@ private static JoinBridgeManager<PartitionedLookupSourceFactory> getLookupSource
                         .collect(toImmutableList()),
                 partitionCount,
                 false,
-                TYPE_OPERATOR_FACTORY));
+                TYPE_OPERATORS));
     }
 
     private static void buildHash(BuildContext buildContext, JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactoryManager, List<Integer> outputChannels, int partitionCount)
@@ -371,12 +364,12 @@ private static void buildHash(BuildContext buildContext, JoinBridgeManager<Parti
         }
         else {
             PartitionFunction partitionGenerator = new LocalPartitionGenerator(
-                    new InterpretedHashGenerator(
+                    createChannelsHashGenerator(
                             buildContext.getHashChannels().stream()
                                     .map(channel -> buildContext.getTypes().get(channel))
                                     .collect(toImmutableList()),
-                            buildContext.getHashChannels(),
-                            TYPE_OPERATOR_FACTORY),
+                            Ints.toArray(buildContext.getHashChannels()),
+                            TYPE_OPERATORS),
                     partitionCount);
 
             for (Page page : buildContext.getBuildPages()) {
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/JoinTestUtils.java b/core/trino-main/src/test/java/io/trino/operator/join/JoinTestUtils.java
index 97f2c7c5f125..3f119282e95f 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/JoinTestUtils.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/JoinTestUtils.java
@@ -21,7 +21,6 @@
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.operator.Driver;
 import io.trino.operator.DriverContext;
-import io.trino.operator.OperatorFactories;
 import io.trino.operator.OperatorFactory;
 import io.trino.operator.PagesIndex;
 import io.trino.operator.PipelineContext;
@@ -42,7 +41,6 @@
 import io.trino.sql.gen.JoinFilterFunctionCompiler;
 import io.trino.sql.planner.NodePartitioningManager;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -63,7 +61,8 @@
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.operator.HashArraySizeSupplier.incrementalLoadFactorHashArraySizeSupplier;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.innerJoin;
+import static io.trino.operator.JoinOperatorType.innerJoin;
+import static io.trino.operator.OperatorFactories.spillingJoin;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_HASH_DISTRIBUTION;
 import static java.util.Objects.requireNonNull;
@@ -71,29 +70,27 @@
 public final class JoinTestUtils
 {
     private static final int PARTITION_COUNT = 4;
-    private static final BlockTypeOperators TYPE_OPERATOR_FACTORY = new BlockTypeOperators(new TypeOperators());
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
 
     private JoinTestUtils() {}
 
     public static OperatorFactory innerJoinOperatorFactory(
-            OperatorFactories operatorFactories,
             JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactoryManager,
             RowPagesBuilder probePages,
             PartitioningSpillerFactory partitioningSpillerFactory,
             boolean hasFilter)
     {
-        return innerJoinOperatorFactory(operatorFactories, lookupSourceFactoryManager, probePages, partitioningSpillerFactory, false, hasFilter);
+        return innerJoinOperatorFactory(lookupSourceFactoryManager, probePages, partitioningSpillerFactory, false, hasFilter);
     }
 
     public static OperatorFactory innerJoinOperatorFactory(
-            OperatorFactories operatorFactories,
             JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactoryManager,
             RowPagesBuilder probePages,
             PartitioningSpillerFactory partitioningSpillerFactory,
             boolean outputSingleMatch,
             boolean hasFilter)
     {
-        return operatorFactories.spillingJoin(
+        return spillingJoin(
                 innerJoin(outputSingleMatch, false),
                 0,
                 new PlanNodeId("test"),
@@ -105,7 +102,7 @@ public static OperatorFactory innerJoinOperatorFactory(
                 Optional.empty(),
                 OptionalInt.of(1),
                 partitioningSpillerFactory,
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
     }
 
     public static void instantiateBuildDrivers(BuildSideSetup buildSideSetup, TaskContext taskContext)
@@ -154,8 +151,9 @@ public static BuildSideSetup setupBuildSide(
                 hashChannelTypes,
                 buildPages.getHashChannel(),
                 DataSize.of(32, DataSize.Unit.MEGABYTE),
-                TYPE_OPERATOR_FACTORY,
-                DataSize.of(32, DataSize.Unit.MEGABYTE));
+                TYPE_OPERATORS,
+                DataSize.of(32, DataSize.Unit.MEGABYTE),
+                () -> 0L);
 
         // collect input data into the partitioned exchange
         DriverContext collectDriverContext = taskContext.addPipelineContext(0, true, true, false).addDriverContext();
@@ -184,7 +182,7 @@ public static BuildSideSetup setupBuildSide(
                         .collect(toImmutableList()),
                 partitionCount,
                 false,
-                TYPE_OPERATOR_FACTORY));
+                TYPE_OPERATORS));
 
         HashBuilderOperatorFactory buildOperatorFactory = new HashBuilderOperatorFactory(
                 1,
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/TestHashJoinOperator.java b/core/trino-main/src/test/java/io/trino/operator/join/TestHashJoinOperator.java
index a959b2011ac0..b36d6ce7c809 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/TestHashJoinOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/TestHashJoinOperator.java
@@ -37,11 +37,9 @@
 import io.trino.operator.Operator;
 import io.trino.operator.OperatorAssertion;
 import io.trino.operator.OperatorContext;
-import io.trino.operator.OperatorFactories;
 import io.trino.operator.OperatorFactory;
 import io.trino.operator.ProcessorContext;
 import io.trino.operator.TaskContext;
-import io.trino.operator.TrinoOperatorFactories;
 import io.trino.operator.ValuesOperator.ValuesOperatorFactory;
 import io.trino.operator.WorkProcessor;
 import io.trino.operator.WorkProcessorOperator;
@@ -63,7 +61,6 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.TestingTaskContext;
-import io.trino.type.BlockTypeOperators;
 import io.trino.util.FinalizerService;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -90,13 +87,14 @@
 import static io.airlift.testing.Assertions.assertEqualsIgnoreOrder;
 import static io.trino.RowPagesBuilder.rowPagesBuilder;
 import static io.trino.SessionTestUtils.TEST_SESSION;
+import static io.trino.operator.JoinOperatorType.fullOuterJoin;
+import static io.trino.operator.JoinOperatorType.innerJoin;
+import static io.trino.operator.JoinOperatorType.lookupOuterJoin;
+import static io.trino.operator.JoinOperatorType.probeOuterJoin;
 import static io.trino.operator.OperatorAssertion.assertOperatorEquals;
 import static io.trino.operator.OperatorAssertion.dropChannel;
 import static io.trino.operator.OperatorAssertion.without;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.fullOuterJoin;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.innerJoin;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.lookupOuterJoin;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.probeOuterJoin;
+import static io.trino.operator.OperatorFactories.spillingJoin;
 import static io.trino.operator.WorkProcessor.ProcessState.finished;
 import static io.trino.operator.WorkProcessor.ProcessState.ofResult;
 import static io.trino.operator.join.JoinTestUtils.buildLookupSource;
@@ -130,24 +128,12 @@ public class TestHashJoinOperator
     private static final int PARTITION_COUNT = 4;
     private static final SingleStreamSpillerFactory SINGLE_STREAM_SPILLER_FACTORY = new DummySpillerFactory();
     private static final PartitioningSpillerFactory PARTITIONING_SPILLER_FACTORY = new GenericPartitioningSpillerFactory(SINGLE_STREAM_SPILLER_FACTORY);
-    private static final BlockTypeOperators TYPE_OPERATOR_FACTORY = new BlockTypeOperators(new TypeOperators());
-
-    private final OperatorFactories operatorFactories;
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
 
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
     private NodePartitioningManager nodePartitioningManager;
 
-    public TestHashJoinOperator()
-    {
-        this(new TrinoOperatorFactories());
-    }
-
-    protected TestHashJoinOperator(OperatorFactories operatorFactories)
-    {
-        this.operatorFactories = requireNonNull(operatorFactories, "operatorFactories is null");
-    }
-
     @BeforeMethod
     public void setUp()
     {
@@ -173,7 +159,7 @@ public void setUp()
                 new NodeTaskMap(new FinalizerService())));
         nodePartitioningManager = new NodePartitioningManager(
                 nodeScheduler,
-                new BlockTypeOperators(new TypeOperators()),
+                TYPE_OPERATORS,
                 CatalogServiceProvider.fail());
     }
 
@@ -214,7 +200,7 @@ public void testInnerJoin(boolean parallelBuild, boolean probeHashEnabled, boole
         List<Page> probeInput = probePages
                 .addSequencePage(1000, 0, 1000, 2000)
                 .build();
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, false);
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -255,7 +241,7 @@ public void testInnerJoinWithRunLengthEncodedProbe()
                 new Page(RunLengthEncodedBlock.create(VARCHAR, Slices.utf8Slice("20"), 2)),
                 new Page(RunLengthEncodedBlock.create(VARCHAR, Slices.utf8Slice("-1"), 2)),
                 new Page(RunLengthEncodedBlock.create(VARCHAR, Slices.utf8Slice("21"), 2)));
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, false);
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -297,7 +283,7 @@ public void testUnwrapsLazyBlocks()
                 .map(page -> new Page(page.getBlock(0), new LazyBlock(1, () -> page.getBlock(1))))
                 .collect(toImmutableList());
 
-        OperatorFactory joinOperatorFactory = operatorFactories.spillingJoin(
+        OperatorFactory joinOperatorFactory = spillingJoin(
                 innerJoin(false, false),
                 0,
                 new PlanNodeId("test"),
@@ -309,7 +295,7 @@ public void testUnwrapsLazyBlocks()
                 Optional.empty(),
                 OptionalInt.of(1),
                 PARTITIONING_SPILLER_FACTORY,
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         instantiateBuildDrivers(buildSideSetup, taskContext);
         buildLookupSource(executor, buildSideSetup);
@@ -350,7 +336,7 @@ public void testYield()
         // probe matching the above 40 entries
         RowPagesBuilder probePages = rowPagesBuilder(false, Ints.asList(0), ImmutableList.of(BIGINT));
         List<Page> probeInput = probePages.addSequencePage(100, 0).build();
-        OperatorFactory joinOperatorFactory = operatorFactories.spillingJoin(
+        OperatorFactory joinOperatorFactory = spillingJoin(
                 innerJoin(false, false),
                 0,
                 new PlanNodeId("test"),
@@ -362,7 +348,7 @@ public void testYield()
                 Optional.empty(),
                 OptionalInt.of(1),
                 PARTITIONING_SPILLER_FACTORY,
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         instantiateBuildDrivers(buildSideSetup, taskContext);
         buildLookupSource(executor, buildSideSetup);
@@ -518,7 +504,7 @@ private void innerJoinWithSpill(boolean probeHashEnabled, List<WhenSpill> whenSp
                 .pageBreak()
                 .addSequencePage(20, 0, 123_000)
                 .addSequencePage(10, 30, 123_000);
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactoryManager, probePages, joinSpillerFactory, true);
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactoryManager, probePages, joinSpillerFactory, true);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -717,7 +703,7 @@ public void testInnerJoinWithNullProbe(boolean parallelBuild, boolean probeHashE
                 .row("a")
                 .row("b")
                 .build();
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, false);
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -754,7 +740,7 @@ public void testInnerJoinWithOutputSingleMatch(boolean parallelBuild, boolean pr
                 .row("b")
                 .row("c")
                 .build();
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, true, false);
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, true, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -793,7 +779,7 @@ public void testInnerJoinWithNullBuild(boolean parallelBuild, boolean probeHashE
                 .row("b")
                 .row("c")
                 .build();
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, false);
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -834,7 +820,7 @@ public void testInnerJoinWithNullOnBothSides(boolean parallelBuild, boolean prob
                 .row((String) null)
                 .row("c")
                 .build();
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, false);
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1235,7 +1221,7 @@ public void testInnerJoinWithEmptyLookupSource(boolean parallelBuild, boolean pr
         // probe factory
         List<Type> probeTypes = ImmutableList.of(VARCHAR);
         RowPagesBuilder probePages = rowPagesBuilder(probeHashEnabled, Ints.asList(0), probeTypes);
-        OperatorFactory joinOperatorFactory = operatorFactories.spillingJoin(
+        OperatorFactory joinOperatorFactory = spillingJoin(
                 innerJoin(false, false),
                 0,
                 new PlanNodeId("test"),
@@ -1247,7 +1233,7 @@ public void testInnerJoinWithEmptyLookupSource(boolean parallelBuild, boolean pr
                 Optional.empty(),
                 OptionalInt.of(1),
                 PARTITIONING_SPILLER_FACTORY,
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         // drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1274,7 +1260,7 @@ public void testLookupOuterJoinWithEmptyLookupSource(boolean parallelBuild, bool
         // probe factory
         List<Type> probeTypes = ImmutableList.of(VARCHAR);
         RowPagesBuilder probePages = rowPagesBuilder(probeHashEnabled, Ints.asList(0), probeTypes);
-        OperatorFactory joinOperatorFactory = operatorFactories.spillingJoin(
+        OperatorFactory joinOperatorFactory = spillingJoin(
                 lookupOuterJoin(false),
                 0,
                 new PlanNodeId("test"),
@@ -1286,7 +1272,7 @@ public void testLookupOuterJoinWithEmptyLookupSource(boolean parallelBuild, bool
                 Optional.empty(),
                 OptionalInt.of(1),
                 PARTITIONING_SPILLER_FACTORY,
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         // drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1319,7 +1305,7 @@ public void testProbeOuterJoinWithEmptyLookupSource(boolean parallelBuild, boole
                 .row((String) null)
                 .row("c")
                 .build();
-        OperatorFactory joinOperatorFactory = operatorFactories.spillingJoin(
+        OperatorFactory joinOperatorFactory = spillingJoin(
                 probeOuterJoin(false),
                 0,
                 new PlanNodeId("test"),
@@ -1331,7 +1317,7 @@ public void testProbeOuterJoinWithEmptyLookupSource(boolean parallelBuild, boole
                 Optional.empty(),
                 OptionalInt.of(1),
                 PARTITIONING_SPILLER_FACTORY,
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1367,7 +1353,7 @@ public void testFullOuterJoinWithEmptyLookupSource(boolean parallelBuild, boolea
                 .row((String) null)
                 .row("c")
                 .build();
-        OperatorFactory joinOperatorFactory = operatorFactories.spillingJoin(
+        OperatorFactory joinOperatorFactory = spillingJoin(
                 fullOuterJoin(),
                 0,
                 new PlanNodeId("test"),
@@ -1379,7 +1365,7 @@ public void testFullOuterJoinWithEmptyLookupSource(boolean parallelBuild, boolea
                 Optional.empty(),
                 OptionalInt.of(1),
                 PARTITIONING_SPILLER_FACTORY,
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1414,7 +1400,7 @@ public void testInnerJoinWithNonEmptyLookupSourceAndEmptyProbe(boolean parallelB
         List<Type> probeTypes = ImmutableList.of(VARCHAR);
         RowPagesBuilder probePages = rowPagesBuilder(probeHashEnabled, Ints.asList(0), probeTypes);
         List<Page> probeInput = probePages.build();
-        OperatorFactory joinOperatorFactory = operatorFactories.spillingJoin(
+        OperatorFactory joinOperatorFactory = spillingJoin(
                 innerJoin(false, false),
                 0,
                 new PlanNodeId("test"),
@@ -1426,7 +1412,7 @@ public void testInnerJoinWithNonEmptyLookupSourceAndEmptyProbe(boolean parallelB
                 Optional.empty(),
                 OptionalInt.of(1),
                 PARTITIONING_SPILLER_FACTORY,
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1533,7 +1519,7 @@ public void testInnerJoinLoadsPagesInOrder()
         List<Type> probeTypes = ImmutableList.of(VARCHAR, INTEGER, INTEGER);
         RowPagesBuilder probePages = rowPagesBuilder(false, Ints.asList(0), probeTypes);
         probePages.row("a", 1L, 2L);
-        WorkProcessorOperatorFactory joinOperatorFactory = (WorkProcessorOperatorFactory) innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, false);
+        WorkProcessorOperatorFactory joinOperatorFactory = (WorkProcessorOperatorFactory) innerJoinOperatorFactory(lookupSourceFactory, probePages, PARTITIONING_SPILLER_FACTORY, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1606,7 +1592,7 @@ private OperatorFactory createJoinOperatorFactoryWithBlockingLookupSource(TaskCo
         // probe factory
         List<Type> probeTypes = ImmutableList.of(VARCHAR);
         RowPagesBuilder probePages = rowPagesBuilder(probeHashEnabled, Ints.asList(0), probeTypes);
-        OperatorFactory joinOperatorFactory = operatorFactories.spillingJoin(
+        OperatorFactory joinOperatorFactory = spillingJoin(
                 innerJoin(false, waitForBuild),
                 0,
                 new PlanNodeId("test"),
@@ -1618,7 +1604,7 @@ private OperatorFactory createJoinOperatorFactoryWithBlockingLookupSource(TaskCo
                 Optional.empty(),
                 OptionalInt.of(1),
                 PARTITIONING_SPILLER_FACTORY,
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1658,7 +1644,7 @@ private OperatorFactory probeOuterJoinOperatorFactory(
             RowPagesBuilder probePages,
             boolean hasFilter)
     {
-        return operatorFactories.spillingJoin(
+        return spillingJoin(
                 probeOuterJoin(false),
                 0,
                 new PlanNodeId("test"),
@@ -1670,7 +1656,7 @@ private OperatorFactory probeOuterJoinOperatorFactory(
                 Optional.empty(),
                 OptionalInt.of(1),
                 PARTITIONING_SPILLER_FACTORY,
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
     }
 
     private static <T> List<List<T>> product(List<List<T>> left, List<List<T>> right)
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/TestJoinOperatorInfo.java b/core/trino-main/src/test/java/io/trino/operator/join/TestJoinOperatorInfo.java
index a5e04ef5fc55..2733131a41e9 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/TestJoinOperatorInfo.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/TestJoinOperatorInfo.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.join;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -30,17 +30,23 @@ public void testMerge()
                 INNER,
                 makeHistogramArray(10, 20, 30, 40, 50, 60, 70, 80),
                 makeHistogramArray(12, 22, 32, 42, 52, 62, 72, 82),
-                Optional.of(1L));
+                Optional.of(1L),
+                2,
+                3);
         JoinOperatorInfo other = new JoinOperatorInfo(
                 INNER,
                 makeHistogramArray(11, 21, 31, 41, 51, 61, 71, 81),
                 makeHistogramArray(15, 25, 35, 45, 55, 65, 75, 85),
-                Optional.of(2L));
+                Optional.of(2L),
+                4,
+                7);
 
         JoinOperatorInfo merged = base.mergeWith(other);
         assertEquals(makeHistogramArray(21, 41, 61, 81, 101, 121, 141, 161), merged.getLogHistogramProbes());
         assertEquals(makeHistogramArray(27, 47, 67, 87, 107, 127, 147, 167), merged.getLogHistogramOutput());
         assertEquals(merged.getLookupSourcePositions(), Optional.of(3L));
+        assertEquals(merged.getRleProbes(), 6);
+        assertEquals(merged.getTotalProbes(), 10);
     }
 
     private long[] makeHistogramArray(long... longArray)
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/TestJoinStatisticsCounter.java b/core/trino-main/src/test/java/io/trino/operator/join/TestJoinStatisticsCounter.java
index 7d7b952302c2..8bfdcb6c20f1 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/TestJoinStatisticsCounter.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/TestJoinStatisticsCounter.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.join;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.INNER;
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/TestLookupJoinPageBuilder.java b/core/trino-main/src/test/java/io/trino/operator/join/TestLookupJoinPageBuilder.java
index 1ae1e3b526c4..95247484c0f8 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/TestLookupJoinPageBuilder.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/TestLookupJoinPageBuilder.java
@@ -20,8 +20,9 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.DictionaryBlock;
+import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.OptionalInt;
@@ -100,7 +101,7 @@ public void testDifferentPositions()
         JoinProbe probe = joinProbeFactory.createJoinProbe(page);
         Page output = lookupJoinPageBuilder.build(probe);
         assertEquals(output.getChannelCount(), 2);
-        assertTrue(output.getBlock(0) instanceof DictionaryBlock);
+        assertTrue(output.getBlock(0) instanceof LongArrayBlock);
         assertEquals(output.getPositionCount(), 0);
         lookupJoinPageBuilder.reset();
 
@@ -117,8 +118,8 @@ public void testDifferentPositions()
         assertTrue(output.getBlock(0) instanceof DictionaryBlock);
         assertEquals(output.getPositionCount(), entries / 2);
         for (int i = 0; i < entries / 2; i++) {
-            assertEquals(output.getBlock(0).getLong(i, 0), i * 2);
-            assertEquals(output.getBlock(1).getLong(i, 0), i * 2);
+            assertEquals(output.getBlock(0).getLong(i, 0), i * 2L);
+            assertEquals(output.getBlock(1).getLong(i, 0), i * 2L);
         }
         lookupJoinPageBuilder.reset();
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/TestNestedLoopBuildOperator.java b/core/trino-main/src/test/java/io/trino/operator/join/TestNestedLoopBuildOperator.java
index 1fe1a0c5076d..f3e06037a38d 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/TestNestedLoopBuildOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/TestNestedLoopBuildOperator.java
@@ -22,9 +22,10 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.TestingTaskContext;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -36,24 +37,25 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestNestedLoopBuildOperator
 {
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
         scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/TestNestedLoopJoinOperator.java b/core/trino-main/src/test/java/io/trino/operator/join/TestNestedLoopJoinOperator.java
index c6132dfe3737..b4aa766662e1 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/TestNestedLoopJoinOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/TestNestedLoopJoinOperator.java
@@ -27,9 +27,10 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.TestingTaskContext;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -46,23 +47,24 @@
 import static io.trino.testing.MaterializedResult.resultBuilder;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestNestedLoopJoinOperator
 {
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
         scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/TestPositionLinks.java b/core/trino-main/src/test/java/io/trino/operator/join/TestPositionLinks.java
index a6840218029b..d2625febbea4 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/TestPositionLinks.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/TestPositionLinks.java
@@ -22,7 +22,7 @@
 import io.trino.type.BlockTypeOperators;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.OptionalInt;
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/unspilled/BenchmarkHashBuildAndJoinOperators.java b/core/trino-main/src/test/java/io/trino/operator/join/unspilled/BenchmarkHashBuildAndJoinOperators.java
index a388b8cc9997..e66aa5b0e22d 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/unspilled/BenchmarkHashBuildAndJoinOperators.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/unspilled/BenchmarkHashBuildAndJoinOperators.java
@@ -20,14 +20,11 @@
 import io.trino.RowPagesBuilder;
 import io.trino.Session;
 import io.trino.operator.DriverContext;
-import io.trino.operator.InterpretedHashGenerator;
 import io.trino.operator.Operator;
-import io.trino.operator.OperatorFactories;
 import io.trino.operator.OperatorFactory;
 import io.trino.operator.PagesIndex;
 import io.trino.operator.PartitionFunction;
 import io.trino.operator.TaskContext;
-import io.trino.operator.TrinoOperatorFactories;
 import io.trino.operator.exchange.LocalPartitionGenerator;
 import io.trino.operator.join.JoinBridgeManager;
 import io.trino.operator.join.LookupSource;
@@ -38,7 +35,7 @@
 import io.trino.spi.type.TypeOperators;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.TestingTaskContext;
-import io.trino.type.BlockTypeOperators;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -51,7 +48,6 @@
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.Arrays;
 import java.util.Iterator;
@@ -72,7 +68,9 @@
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.jmh.Benchmarks.benchmark;
 import static io.trino.operator.HashArraySizeSupplier.incrementalLoadFactorHashArraySizeSupplier;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.innerJoin;
+import static io.trino.operator.InterpretedHashGenerator.createChannelsHashGenerator;
+import static io.trino.operator.JoinOperatorType.innerJoin;
+import static io.trino.operator.OperatorFactories.join;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.String.format;
@@ -95,7 +93,7 @@ public class BenchmarkHashBuildAndJoinOperators
     private static final int HASH_BUILD_OPERATOR_ID = 1;
     private static final int HASH_JOIN_OPERATOR_ID = 2;
     private static final PlanNodeId TEST_PLAN_NODE_ID = new PlanNodeId("test");
-    private static final BlockTypeOperators TYPE_OPERATOR_FACTORY = new BlockTypeOperators(new TypeOperators());
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
 
     @State(Scope.Benchmark)
     public static class BuildContext
@@ -216,11 +214,6 @@ public static class JoinContext
         @Override
         @Setup
         public void setup()
-        {
-            setup(new TrinoOperatorFactories());
-        }
-
-        public void setup(OperatorFactories operatorFactories)
         {
             super.setup();
 
@@ -239,7 +232,7 @@ public void setup(OperatorFactories operatorFactories)
             }
 
             JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactory = getLookupSourceFactoryManager(this, outputChannels, partitionCount);
-            joinOperatorFactory = operatorFactories.join(
+            joinOperatorFactory = join(
                     innerJoin(false, false),
                     HASH_JOIN_OPERATOR_ID,
                     TEST_PLAN_NODE_ID,
@@ -249,7 +242,7 @@ public void setup(OperatorFactories operatorFactories)
                     hashChannels,
                     hashChannel,
                     Optional.of(outputChannels),
-                    TYPE_OPERATOR_FACTORY);
+                    TYPE_OPERATORS);
             buildHash(this, lookupSourceFactory, outputChannels, partitionCount);
             initializeProbePages();
         }
@@ -333,7 +326,7 @@ private static JoinBridgeManager<PartitionedLookupSourceFactory> getLookupSource
                         .collect(toImmutableList()),
                 partitionCount,
                 false,
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
         return new JoinBridgeManager<>(
                 false,
                 factory,
@@ -370,12 +363,12 @@ private static void buildHash(BuildContext buildContext, JoinBridgeManager<Parti
         }
         else {
             PartitionFunction partitionGenerator = new LocalPartitionGenerator(
-                    new InterpretedHashGenerator(
+                    createChannelsHashGenerator(
                             buildContext.getHashChannels().stream()
                                     .map(channel -> buildContext.getTypes().get(channel))
                                     .collect(toImmutableList()),
-                            buildContext.getHashChannels(),
-                            TYPE_OPERATOR_FACTORY),
+                            Ints.toArray(buildContext.getHashChannels()),
+                            TYPE_OPERATORS),
                     partitionCount);
 
             for (Page page : buildContext.getBuildPages()) {
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/unspilled/JoinTestUtils.java b/core/trino-main/src/test/java/io/trino/operator/join/unspilled/JoinTestUtils.java
index a491399917f0..09d9867794d4 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/unspilled/JoinTestUtils.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/unspilled/JoinTestUtils.java
@@ -18,7 +18,6 @@
 import io.trino.RowPagesBuilder;
 import io.trino.operator.Driver;
 import io.trino.operator.DriverContext;
-import io.trino.operator.OperatorFactories;
 import io.trino.operator.OperatorFactory;
 import io.trino.operator.PagesIndex;
 import io.trino.operator.PipelineContext;
@@ -39,7 +38,6 @@
 import io.trino.sql.gen.JoinFilterFunctionCompiler;
 import io.trino.sql.planner.NodePartitioningManager;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,34 +53,33 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.operator.HashArraySizeSupplier.incrementalLoadFactorHashArraySizeSupplier;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.innerJoin;
+import static io.trino.operator.JoinOperatorType.innerJoin;
+import static io.trino.operator.OperatorFactories.join;
 import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_HASH_DISTRIBUTION;
 import static java.util.Objects.requireNonNull;
 
 public final class JoinTestUtils
 {
     private static final int PARTITION_COUNT = 4;
-    private static final BlockTypeOperators TYPE_OPERATOR_FACTORY = new BlockTypeOperators(new TypeOperators());
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
 
     private JoinTestUtils() {}
 
     public static OperatorFactory innerJoinOperatorFactory(
-            OperatorFactories operatorFactories,
             JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactoryManager,
             RowPagesBuilder probePages,
             boolean hasFilter)
     {
-        return innerJoinOperatorFactory(operatorFactories, lookupSourceFactoryManager, probePages, false, hasFilter);
+        return innerJoinOperatorFactory(lookupSourceFactoryManager, probePages, false, hasFilter);
     }
 
     public static OperatorFactory innerJoinOperatorFactory(
-            OperatorFactories operatorFactories,
             JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactoryManager,
             RowPagesBuilder probePages,
             boolean outputSingleMatch,
             boolean hasFilter)
     {
-        return operatorFactories.join(
+        return join(
                 innerJoin(outputSingleMatch, false),
                 0,
                 new PlanNodeId("test"),
@@ -92,7 +89,7 @@ public static OperatorFactory innerJoinOperatorFactory(
                 probePages.getHashChannels().orElseThrow(),
                 getHashChannelAsInt(probePages),
                 Optional.empty(),
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
     }
 
     public static void instantiateBuildDrivers(BuildSideSetup buildSideSetup, TaskContext taskContext)
@@ -150,8 +147,9 @@ public static BuildSideSetup setupBuildSide(
                 hashChannelTypes,
                 buildPages.getHashChannel(),
                 DataSize.of(32, DataSize.Unit.MEGABYTE),
-                TYPE_OPERATOR_FACTORY,
-                DataSize.of(32, DataSize.Unit.MEGABYTE));
+                TYPE_OPERATORS,
+                DataSize.of(32, DataSize.Unit.MEGABYTE),
+                () -> 0L);
 
         // collect input data into the partitioned exchange
         DriverContext collectDriverContext = taskContext.addPipelineContext(0, true, true, false).addDriverContext();
@@ -180,7 +178,7 @@ public static BuildSideSetup setupBuildSide(
                         .collect(toImmutableList()),
                 partitionCount,
                 false,
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
         JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactoryManager = new JoinBridgeManager<PartitionedLookupSourceFactory>(
                 false,
                 factory,
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/unspilled/TestHashBuilderOperator.java b/core/trino-main/src/test/java/io/trino/operator/join/unspilled/TestHashBuilderOperator.java
index 1e5dfacf1e92..9b84046449ea 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/unspilled/TestHashBuilderOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/unspilled/TestHashBuilderOperator.java
@@ -22,12 +22,13 @@
 import io.trino.operator.TaskContext;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.TestingTaskContext;
-import io.trino.type.BlockTypeOperators;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Arrays;
 import java.util.List;
@@ -48,23 +49,25 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestHashBuilderOperator
 {
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
         scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (executor != null) {
@@ -98,7 +101,7 @@ public void test()
                 ImmutableList.of(BIGINT),
                 1,
                 false,
-                new BlockTypeOperators());
+                new TypeOperators());
         try (HashBuilderOperator operator = new HashBuilderOperator(
                 operatorContext,
                 lookupSourceFactory,
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/unspilled/TestHashJoinOperator.java b/core/trino-main/src/test/java/io/trino/operator/join/unspilled/TestHashJoinOperator.java
index 99ba364b93d4..0e45e952d0f2 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/unspilled/TestHashJoinOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/unspilled/TestHashJoinOperator.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.primitives.Ints;
+import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
 import io.trino.ExceededMemoryLimitException;
 import io.trino.RowPagesBuilder;
@@ -27,23 +28,25 @@
 import io.trino.execution.scheduler.UniformNodeSelectorFactory;
 import io.trino.metadata.InMemoryNodeManager;
 import io.trino.operator.DriverContext;
+import io.trino.operator.JoinOperatorType;
 import io.trino.operator.Operator;
 import io.trino.operator.OperatorContext;
-import io.trino.operator.OperatorFactories;
 import io.trino.operator.OperatorFactory;
 import io.trino.operator.ProcessorContext;
 import io.trino.operator.TaskContext;
-import io.trino.operator.TrinoOperatorFactories;
 import io.trino.operator.WorkProcessor;
 import io.trino.operator.WorkProcessorOperator;
 import io.trino.operator.WorkProcessorOperatorFactory;
 import io.trino.operator.join.InternalJoinFilterFunction;
 import io.trino.operator.join.JoinBridgeManager;
+import io.trino.operator.join.JoinOperatorInfo;
 import io.trino.operator.join.unspilled.JoinTestUtils.BuildSideSetup;
 import io.trino.operator.join.unspilled.JoinTestUtils.TestInternalJoinFilterFunction;
 import io.trino.spi.Page;
 import io.trino.spi.block.LazyBlock;
+import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.VariableWidthBlock;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 import io.trino.sql.planner.NodePartitioningManager;
@@ -51,7 +54,6 @@
 import io.trino.testing.DataProviders;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.TestingTaskContext;
-import io.trino.type.BlockTypeOperators;
 import io.trino.util.FinalizerService;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -71,10 +73,15 @@
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static io.trino.RowPagesBuilder.rowPagesBuilder;
 import static io.trino.SessionTestUtils.TEST_SESSION;
+import static io.trino.block.BlockAssertions.createLongsBlock;
+import static io.trino.operator.JoinOperatorType.fullOuterJoin;
+import static io.trino.operator.JoinOperatorType.innerJoin;
+import static io.trino.operator.JoinOperatorType.probeOuterJoin;
 import static io.trino.operator.OperatorAssertion.assertOperatorEquals;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.fullOuterJoin;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.innerJoin;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.probeOuterJoin;
+import static io.trino.operator.OperatorAssertion.dropChannel;
+import static io.trino.operator.OperatorAssertion.toMaterializedResult;
+import static io.trino.operator.OperatorAssertion.toPages;
+import static io.trino.operator.OperatorFactories.join;
 import static io.trino.operator.WorkProcessor.ProcessState.finished;
 import static io.trino.operator.WorkProcessor.ProcessState.ofResult;
 import static io.trino.operator.join.unspilled.JoinTestUtils.buildLookupSource;
@@ -85,9 +92,11 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static java.util.Objects.requireNonNull;
+import static io.trino.testing.DataProviders.cartesianProduct;
+import static io.trino.testing.DataProviders.trueFalse;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -98,24 +107,12 @@
 @Test(singleThreaded = true)
 public class TestHashJoinOperator
 {
-    private static final BlockTypeOperators TYPE_OPERATOR_FACTORY = new BlockTypeOperators(new TypeOperators());
-
-    private final OperatorFactories operatorFactories;
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
 
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
     private NodePartitioningManager nodePartitioningManager;
 
-    public TestHashJoinOperator()
-    {
-        this(new TrinoOperatorFactories());
-    }
-
-    protected TestHashJoinOperator(OperatorFactories operatorFactories)
-    {
-        this.operatorFactories = requireNonNull(operatorFactories, "operatorFactories is null");
-    }
-
     @BeforeMethod
     public void setUp()
     {
@@ -141,7 +138,7 @@ public void setUp()
                 new NodeTaskMap(new FinalizerService())));
         nodePartitioningManager = new NodePartitioningManager(
                 nodeScheduler,
-                new BlockTypeOperators(new TypeOperators()),
+                TYPE_OPERATORS,
                 CatalogServiceProvider.fail());
     }
 
@@ -168,7 +165,7 @@ public void testInnerJoin(boolean parallelBuild, boolean probeHashEnabled, boole
         List<Page> probeInput = probePages
                 .addSequencePage(1000, 0, 1000, 2000)
                 .build();
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, false);
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactory, probePages, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -191,41 +188,79 @@ public void testInnerJoin(boolean parallelBuild, boolean probeHashEnabled, boole
         assertOperatorEquals(joinOperatorFactory, taskContext.addPipelineContext(0, true, true, false).addDriverContext(), probeInput, expected, true, getHashChannels(probePages, buildPages));
     }
 
-    @Test(dataProvider = "singleBigintLookupSourceProvider")
-    public void testInnerJoinWithRunLengthEncodedProbe(boolean singleBigintLookupSource)
+    @Test(dataProvider = "hashJoinRleProbeTestValues")
+    public void testInnerJoinWithRunLengthEncodedProbe(boolean withFilter, boolean probeHashEnabled, boolean singleBigintLookupSource)
     {
         TaskContext taskContext = createTaskContext();
 
         // build factory
-        RowPagesBuilder buildPages = rowPagesBuilder(false, Ints.asList(0), ImmutableList.of(BIGINT))
-                .addSequencePage(10, 20)
-                .addSequencePage(10, 21);
+        RowPagesBuilder buildPages = rowPagesBuilder(false, Ints.asList(0), ImmutableList.of(VARCHAR, BIGINT))
+                .row("20", 1L)
+                .row("21", 2L)
+                .row("21", 3L);
         BuildSideSetup buildSideSetup = setupBuildSide(nodePartitioningManager, false, taskContext, buildPages, Optional.empty(), singleBigintLookupSource);
         JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactory = buildSideSetup.getLookupSourceFactoryManager();
 
         // probe factory
-        RowPagesBuilder probePages = rowPagesBuilder(false, Ints.asList(0), ImmutableList.of(BIGINT));
-        List<Page> probeInput = ImmutableList.of(
-                new Page(RunLengthEncodedBlock.create(BIGINT, 20L, 2)),
-                new Page(RunLengthEncodedBlock.create(BIGINT, -1L, 2)),
-                new Page(RunLengthEncodedBlock.create(BIGINT, 21L, 2)));
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, false);
+        RowPagesBuilder probePagesBuilder = rowPagesBuilder(probeHashEnabled, Ints.asList(0), ImmutableList.of(VARCHAR, BIGINT))
+                .addBlocksPage(
+                        RunLengthEncodedBlock.create(VARCHAR, Slices.utf8Slice("20"), 2),
+                        createLongsBlock(42, 43))
+                .addBlocksPage(
+                        RunLengthEncodedBlock.create(VARCHAR, Slices.utf8Slice("-1"), 2),
+                        createLongsBlock(52, 53))
+                .addBlocksPage(
+                        RunLengthEncodedBlock.create(VARCHAR, Slices.utf8Slice("21"), 2),
+                        createLongsBlock(62, 63));
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactory, probePagesBuilder, withFilter);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
         buildLookupSource(executor, buildSideSetup);
 
+        DriverContext driverContext = taskContext.addPipelineContext(0, true, true, false).addDriverContext();
+        List<Page> pages = toPages(joinOperatorFactory, driverContext, probePagesBuilder.build(), true, true);
+        if (probeHashEnabled) {
+            // Drop the hashChannel for all pages
+            pages = dropChannel(pages, getHashChannels(probePagesBuilder, buildPages));
+        }
+
+        assertThat(pages.size()).isEqualTo(2);
+        if (withFilter) {
+            assertThat(pages.get(0).getBlock(2)).isInstanceOf(VariableWidthBlock.class);
+            assertThat(pages.get(0).getBlock(3)).isInstanceOf(LongArrayBlock.class);
+        }
+        else {
+            assertThat(pages.get(0).getBlock(2)).isInstanceOf(RunLengthEncodedBlock.class);
+            assertThat(pages.get(0).getBlock(3)).isInstanceOf(RunLengthEncodedBlock.class);
+        }
+        assertThat(pages.get(1).getBlock(2)).isInstanceOf(VariableWidthBlock.class);
+
+        assertThat(getJoinOperatorInfo(driverContext).getRleProbes()).isEqualTo(withFilter ? 0 : 2);
+        assertThat(getJoinOperatorInfo(driverContext).getTotalProbes()).isEqualTo(3);
+
         // expected
-        MaterializedResult expected = MaterializedResult.resultBuilder(taskContext.getSession(), concat(probePages.getTypesWithoutHash(), buildPages.getTypesWithoutHash()))
-                .row(20L, 20L)
-                .row(20L, 20L)
-                .row(21L, 21L)
-                .row(21L, 21L)
-                .row(21L, 21L)
-                .row(21L, 21L)
+        MaterializedResult expected = MaterializedResult.resultBuilder(taskContext.getSession(), concat(probePagesBuilder.getTypesWithoutHash(), buildPages.getTypesWithoutHash()))
+                .row("20", 42L, "20", 1L)
+                .row("20", 43L, "20", 1L)
+                .row("21", 62L, "21", 3L)
+                .row("21", 62L, "21", 2L)
+                .row("21", 63L, "21", 3L)
+                .row("21", 63L, "21", 2L)
                 .build();
+        MaterializedResult actual = toMaterializedResult(driverContext.getSession(), expected.getTypes(), pages);
+        assertThat(actual).containsExactlyElementsOf(expected);
+    }
 
-        assertOperatorEquals(joinOperatorFactory, taskContext.addPipelineContext(0, true, true, false).addDriverContext(), probeInput, expected, true, getHashChannels(probePages, buildPages));
+    private JoinOperatorInfo getJoinOperatorInfo(DriverContext driverContext)
+    {
+        return (JoinOperatorInfo) getOnlyElement(driverContext.getOperatorStats()).getInfo();
+    }
+
+    @DataProvider(name = "hashJoinRleProbeTestValues")
+    public static Object[][] hashJoinRleProbeTestValuesProvider()
+    {
+        return cartesianProduct(trueFalse(), trueFalse(), trueFalse());
     }
 
     @Test(dataProvider = "singleBigintLookupSourceProvider")
@@ -251,7 +286,7 @@ public void testUnwrapsLazyBlocks(boolean singleBigintLookupSource)
                 .map(page -> new Page(page.getBlock(0), new LazyBlock(1, () -> page.getBlock(1))))
                 .collect(toImmutableList());
 
-        OperatorFactory joinOperatorFactory = operatorFactories.join(
+        OperatorFactory joinOperatorFactory = join(
                 innerJoin(false, false),
                 0,
                 new PlanNodeId("test"),
@@ -261,7 +296,7 @@ public void testUnwrapsLazyBlocks(boolean singleBigintLookupSource)
                 Ints.asList(0),
                 getHashChannelAsInt(probePages),
                 Optional.empty(),
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         instantiateBuildDrivers(buildSideSetup, taskContext);
         buildLookupSource(executor, buildSideSetup);
@@ -302,7 +337,7 @@ public void testYield(boolean singleBigintLookupSource)
         // probe matching the above 40 entries
         RowPagesBuilder probePages = rowPagesBuilder(false, Ints.asList(0), ImmutableList.of(BIGINT));
         List<Page> probeInput = probePages.addSequencePage(100, 0).build();
-        OperatorFactory joinOperatorFactory = operatorFactories.join(
+        OperatorFactory joinOperatorFactory = join(
                 innerJoin(false, false),
                 0,
                 new PlanNodeId("test"),
@@ -312,7 +347,7 @@ public void testYield(boolean singleBigintLookupSource)
                 Ints.asList(0),
                 getHashChannelAsInt(probePages),
                 Optional.empty(),
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         instantiateBuildDrivers(buildSideSetup, taskContext);
         buildLookupSource(executor, buildSideSetup);
@@ -367,7 +402,7 @@ public void testInnerJoinWithNullProbe(boolean parallelBuild, boolean probeHashE
                 .row(1L)
                 .row(2L)
                 .build();
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, false);
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactory, probePages, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -404,7 +439,7 @@ public void testInnerJoinWithOutputSingleMatch(boolean parallelBuild, boolean pr
                 .row(2L)
                 .row(3L)
                 .build();
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, true, false);
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactory, probePages, true, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -443,7 +478,7 @@ public void testInnerJoinWithNullBuild(boolean parallelBuild, boolean probeHashE
                 .row(2L)
                 .row(3L)
                 .build();
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, false);
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactory, probePages, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -484,7 +519,7 @@ public void testInnerJoinWithNullOnBothSides(boolean parallelBuild, boolean prob
                 .row((String) null)
                 .row(3L)
                 .build();
-        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, false);
+        OperatorFactory joinOperatorFactory = innerJoinOperatorFactory(lookupSourceFactory, probePages, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -885,7 +920,7 @@ public void testInnerJoinWithEmptyLookupSource(boolean parallelBuild, boolean pr
         // probe factory
         List<Type> probeTypes = ImmutableList.of(BIGINT);
         RowPagesBuilder probePages = rowPagesBuilder(probeHashEnabled, Ints.asList(0), probeTypes);
-        OperatorFactory joinOperatorFactory = operatorFactories.join(
+        OperatorFactory joinOperatorFactory = join(
                 innerJoin(false, false),
                 0,
                 new PlanNodeId("test"),
@@ -895,7 +930,7 @@ public void testInnerJoinWithEmptyLookupSource(boolean parallelBuild, boolean pr
                 Ints.asList(0),
                 getHashChannelAsInt(probePages),
                 Optional.empty(),
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         // drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -922,8 +957,8 @@ public void testLookupOuterJoinWithEmptyLookupSource(boolean parallelBuild, bool
         // probe factory
         List<Type> probeTypes = ImmutableList.of(BIGINT);
         RowPagesBuilder probePages = rowPagesBuilder(probeHashEnabled, Ints.asList(0), probeTypes);
-        OperatorFactory joinOperatorFactory = operatorFactories.join(
-                OperatorFactories.JoinOperatorType.lookupOuterJoin(false),
+        OperatorFactory joinOperatorFactory = join(
+                JoinOperatorType.lookupOuterJoin(false),
                 0,
                 new PlanNodeId("test"),
                 lookupSourceFactoryManager,
@@ -932,7 +967,7 @@ public void testLookupOuterJoinWithEmptyLookupSource(boolean parallelBuild, bool
                 Ints.asList(0),
                 getHashChannelAsInt(probePages),
                 Optional.empty(),
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         // drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -965,7 +1000,7 @@ public void testProbeOuterJoinWithEmptyLookupSource(boolean parallelBuild, boole
                 .row((String) null)
                 .row(3L)
                 .build();
-        OperatorFactory joinOperatorFactory = operatorFactories.join(
+        OperatorFactory joinOperatorFactory = join(
                 probeOuterJoin(false),
                 0,
                 new PlanNodeId("test"),
@@ -975,7 +1010,7 @@ public void testProbeOuterJoinWithEmptyLookupSource(boolean parallelBuild, boole
                 Ints.asList(0),
                 getHashChannelAsInt(probePages),
                 Optional.empty(),
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1011,7 +1046,7 @@ public void testFullOuterJoinWithEmptyLookupSource(boolean parallelBuild, boolea
                 .row((String) null)
                 .row(3L)
                 .build();
-        OperatorFactory joinOperatorFactory = operatorFactories.join(
+        OperatorFactory joinOperatorFactory = join(
                 fullOuterJoin(),
                 0,
                 new PlanNodeId("test"),
@@ -1021,7 +1056,7 @@ public void testFullOuterJoinWithEmptyLookupSource(boolean parallelBuild, boolea
                 Ints.asList(0),
                 getHashChannelAsInt(probePages),
                 Optional.empty(),
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1056,7 +1091,7 @@ public void testInnerJoinWithNonEmptyLookupSourceAndEmptyProbe(boolean parallelB
         List<Type> probeTypes = ImmutableList.of(BIGINT);
         RowPagesBuilder probePages = rowPagesBuilder(probeHashEnabled, Ints.asList(0), probeTypes);
         List<Page> probeInput = probePages.build();
-        OperatorFactory joinOperatorFactory = operatorFactories.join(
+        OperatorFactory joinOperatorFactory = join(
                 innerJoin(false, false),
                 0,
                 new PlanNodeId("test"),
@@ -1066,7 +1101,7 @@ public void testInnerJoinWithNonEmptyLookupSourceAndEmptyProbe(boolean parallelB
                 Ints.asList(0),
                 getHashChannelAsInt(probePages),
                 Optional.empty(),
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1173,7 +1208,7 @@ public void testInnerJoinLoadsPagesInOrder()
         List<Type> probeTypes = ImmutableList.of(VARCHAR, INTEGER, INTEGER);
         RowPagesBuilder probePages = rowPagesBuilder(false, Ints.asList(0), probeTypes);
         probePages.row("a", 1L, 2L);
-        WorkProcessorOperatorFactory joinOperatorFactory = (WorkProcessorOperatorFactory) innerJoinOperatorFactory(operatorFactories, lookupSourceFactory, probePages, false);
+        WorkProcessorOperatorFactory joinOperatorFactory = (WorkProcessorOperatorFactory) innerJoinOperatorFactory(lookupSourceFactory, probePages, false);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1246,7 +1281,7 @@ private OperatorFactory createJoinOperatorFactoryWithBlockingLookupSource(TaskCo
         // probe factory
         List<Type> probeTypes = ImmutableList.of(VARCHAR);
         RowPagesBuilder probePages = rowPagesBuilder(probeHashEnabled, Ints.asList(0), probeTypes);
-        OperatorFactory joinOperatorFactory = operatorFactories.join(
+        OperatorFactory joinOperatorFactory = join(
                 innerJoin(false, waitForBuild),
                 0,
                 new PlanNodeId("test"),
@@ -1256,7 +1291,7 @@ private OperatorFactory createJoinOperatorFactoryWithBlockingLookupSource(TaskCo
                 Ints.asList(0),
                 getHashChannelAsInt(probePages),
                 Optional.empty(),
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
 
         // build drivers and operators
         instantiateBuildDrivers(buildSideSetup, taskContext);
@@ -1319,7 +1354,7 @@ private OperatorFactory probeOuterJoinOperatorFactory(
             RowPagesBuilder probePages,
             boolean hasFilter)
     {
-        return operatorFactories.join(
+        return join(
                 probeOuterJoin(false),
                 0,
                 new PlanNodeId("test"),
@@ -1329,7 +1364,7 @@ private OperatorFactory probeOuterJoinOperatorFactory(
                 Ints.asList(0),
                 getHashChannelAsInt(probePages),
                 Optional.empty(),
-                TYPE_OPERATOR_FACTORY);
+                TYPE_OPERATORS);
     }
 
     private static <T> List<T> concat(List<T> initialElements, List<T> moreElements)
diff --git a/core/trino-main/src/test/java/io/trino/operator/join/unspilled/TestLookupJoinPageBuilder.java b/core/trino-main/src/test/java/io/trino/operator/join/unspilled/TestLookupJoinPageBuilder.java
index 30fb9a5a8a87..d2214565dc7b 100644
--- a/core/trino-main/src/test/java/io/trino/operator/join/unspilled/TestLookupJoinPageBuilder.java
+++ b/core/trino-main/src/test/java/io/trino/operator/join/unspilled/TestLookupJoinPageBuilder.java
@@ -21,8 +21,9 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.DictionaryBlock;
+import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.OptionalInt;
@@ -45,7 +46,7 @@ public void testPageBuilder()
         Block block = blockBuilder.build();
         Page page = new Page(block, block);
 
-        JoinProbeFactory joinProbeFactory = new JoinProbeFactory(ImmutableList.of(0, 1), ImmutableList.of(0, 1), OptionalInt.empty());
+        JoinProbeFactory joinProbeFactory = new JoinProbeFactory(ImmutableList.of(0, 1), ImmutableList.of(0, 1), OptionalInt.empty(), false);
         LookupSource lookupSource = new TestLookupSource(ImmutableList.of(BIGINT, BIGINT), page);
         JoinProbe probe = joinProbeFactory.createJoinProbe(page, lookupSource);
         LookupJoinPageBuilder lookupJoinPageBuilder = new LookupJoinPageBuilder(ImmutableList.of(BIGINT, BIGINT));
@@ -93,7 +94,7 @@ public void testDifferentPositions()
         }
         Block block = blockBuilder.build();
         Page page = new Page(block);
-        JoinProbeFactory joinProbeFactory = new JoinProbeFactory(ImmutableList.of(0), ImmutableList.of(0), OptionalInt.empty());
+        JoinProbeFactory joinProbeFactory = new JoinProbeFactory(ImmutableList.of(0), ImmutableList.of(0), OptionalInt.empty(), false);
         LookupSource lookupSource = new TestLookupSource(ImmutableList.of(BIGINT), page);
         LookupJoinPageBuilder lookupJoinPageBuilder = new LookupJoinPageBuilder(ImmutableList.of(BIGINT));
 
@@ -101,7 +102,7 @@ public void testDifferentPositions()
         JoinProbe probe = joinProbeFactory.createJoinProbe(page, lookupSource);
         Page output = lookupJoinPageBuilder.build(probe);
         assertEquals(output.getChannelCount(), 2);
-        assertTrue(output.getBlock(0) instanceof DictionaryBlock);
+        assertTrue(output.getBlock(0) instanceof LongArrayBlock);
         assertEquals(output.getPositionCount(), 0);
         lookupJoinPageBuilder.reset();
 
@@ -118,8 +119,8 @@ public void testDifferentPositions()
         assertTrue(output.getBlock(0) instanceof DictionaryBlock);
         assertEquals(output.getPositionCount(), entries / 2);
         for (int i = 0; i < entries / 2; i++) {
-            assertEquals(output.getBlock(0).getLong(i, 0), i * 2);
-            assertEquals(output.getBlock(1).getLong(i, 0), i * 2);
+            assertEquals(output.getBlock(0).getLong(i, 0), i * 2L);
+            assertEquals(output.getBlock(1).getLong(i, 0), i * 2L);
         }
         lookupJoinPageBuilder.reset();
 
@@ -165,7 +166,7 @@ public void testCrossJoinWithEmptyBuild()
 
         // nothing on the build side so we don't append anything
         LookupSource lookupSource = new TestLookupSource(ImmutableList.of(), page);
-        JoinProbe probe = (new JoinProbeFactory(ImmutableList.of(0), ImmutableList.of(0), OptionalInt.empty())).createJoinProbe(page, lookupSource);
+        JoinProbe probe = (new JoinProbeFactory(ImmutableList.of(0), ImmutableList.of(0), OptionalInt.empty(), false)).createJoinProbe(page, lookupSource);
         LookupJoinPageBuilder lookupJoinPageBuilder = new LookupJoinPageBuilder(ImmutableList.of(BIGINT));
 
         // append the same row many times should also flush in the end
diff --git a/core/trino-main/src/test/java/io/trino/operator/output/BenchmarkPartitionedOutputOperator.java b/core/trino-main/src/test/java/io/trino/operator/output/BenchmarkPartitionedOutputOperator.java
index 3c5615bc7f71..f8d714857117 100644
--- a/core/trino-main/src/test/java/io/trino/operator/output/BenchmarkPartitionedOutputOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/output/BenchmarkPartitionedOutputOperator.java
@@ -52,6 +52,7 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.TestingTaskContext;
 import io.trino.type.BlockTypeOperators;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -64,7 +65,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
-import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -298,23 +298,20 @@ public enum TestType
                         types.stream()
                                 .map(type -> {
                                     boolean[] isNull = null;
-                                    int nullPositionCount = 0;
                                     if (nullRate > 0) {
                                         isNull = new boolean[positionCount];
                                         Set<Integer> nullPositions = chooseNullPositions(positionCount, nullRate);
                                         for (int nullPosition : nullPositions) {
                                             isNull[nullPosition] = true;
                                         }
-                                        nullPositionCount = nullPositions.size();
                                     }
 
-                                    int notNullPositionsCount = positionCount - nullPositionCount;
-                                    return RowBlock.fromFieldBlocks(
+                                    return RowBlock.fromNotNullSuppressedFieldBlocks(
                                             positionCount,
                                             Optional.ofNullable(isNull),
                                             new Block[] {
-                                                    RunLengthEncodedBlock.create(createLongsBlock(-65128734213L), notNullPositionsCount),
-                                                    createRandomLongsBlock(notNullPositionsCount, nullRate)});
+                                                    RunLengthEncodedBlock.create(createLongsBlock(-65128734213L), positionCount),
+                                                    createRandomLongsBlock(positionCount, nullRate)});
                                 })
                                 .collect(toImmutableList()));
             });
@@ -467,7 +464,8 @@ private PartitionedOutputOperator createPartitionedOutputOperator()
                     POSITIONS_APPENDER_FACTORY,
                     Optional.empty(),
                     newSimpleAggregatedMemoryContext(),
-                    0);
+                    0,
+                    Optional.empty());
             return (PartitionedOutputOperator) operatorFactory
                     .createOutputOperator(0, new PlanNodeId("plan-node-0"), types, Function.identity(), serdeFactory)
                     .createOperator(createDriverContext());
diff --git a/core/trino-main/src/test/java/io/trino/operator/output/TestPagePartitioner.java b/core/trino-main/src/test/java/io/trino/operator/output/TestPagePartitioner.java
index c30bc067358b..7dee87dfe24d 100644
--- a/core/trino-main/src/test/java/io/trino/operator/output/TestPagePartitioner.java
+++ b/core/trino-main/src/test/java/io/trino/operator/output/TestPagePartitioner.java
@@ -459,7 +459,7 @@ private static ImmutableList<AbstractType> getTypes()
                 IPADDRESS);
     }
 
-    private Block createBlockForType(Type type, int positionsPerPage)
+    private static Block createBlockForType(Type type, int positionsPerPage)
     {
         return createRandomBlockForType(type, positionsPerPage, 0.2F);
     }
@@ -634,7 +634,8 @@ public PartitionedOutputOperator buildPartitionedOutputOperator()
                     POSITIONS_APPENDER_FACTORY,
                     Optional.empty(),
                     memoryContext,
-                    1);
+                    1,
+                    Optional.empty());
             OperatorFactory factory = operatorFactory.createOutputOperator(0, new PlanNodeId("plan-node-0"), types, Function.identity(), PAGES_SERDE_FACTORY);
             PartitionedOutputOperator operator = (PartitionedOutputOperator) factory
                     .createOperator(driverContext);
@@ -660,7 +661,8 @@ public PagePartitioner build()
                     PARTITION_MAX_MEMORY,
                     POSITIONS_APPENDER_FACTORY,
                     Optional.empty(),
-                    memoryContext);
+                    memoryContext,
+                    true);
             pagePartitioner.setupOperator(operatorContext);
 
             return pagePartitioner;
@@ -705,7 +707,7 @@ public Stream<Page> getEnqueuedDeserialized(int partition)
         public List<Slice> getEnqueued(int partition)
         {
             Collection<Slice> serializedPages = enqueued.get(partition);
-            return serializedPages == null ? ImmutableList.of() : ImmutableList.copyOf(serializedPages);
+            return ImmutableList.copyOf(serializedPages);
         }
 
         public void throwOnEnqueue(RuntimeException throwOnEnqueue)
@@ -811,31 +813,20 @@ public Optional<Throwable> getFailureCause()
         }
     }
 
-    private static class SumModuloPartitionFunction
+    private record SumModuloPartitionFunction(int partitionCount, int... hashChannels)
             implements PartitionFunction
     {
-        private final int[] hashChannels;
-        private final int partitionCount;
-
-        SumModuloPartitionFunction(int partitionCount, int... hashChannels)
+        private SumModuloPartitionFunction
         {
             checkArgument(partitionCount > 0);
-            this.partitionCount = partitionCount;
-            this.hashChannels = hashChannels;
-        }
-
-        @Override
-        public int getPartitionCount()
-        {
-            return partitionCount;
         }
 
         @Override
         public int getPartition(Page page, int position)
         {
             long value = 0;
-            for (int i = 0; i < hashChannels.length; i++) {
-                value += page.getBlock(hashChannels[i]).getLong(position, 0);
+            for (int hashChannel : hashChannels) {
+                value += page.getBlock(hashChannel).getLong(position, 0);
             }
 
             return toIntExact(Math.abs(value) % partitionCount);
diff --git a/core/trino-main/src/test/java/io/trino/operator/output/TestPagePartitionerPool.java b/core/trino-main/src/test/java/io/trino/operator/output/TestPagePartitionerPool.java
index 032d84a0dbb6..b104283b42de 100644
--- a/core/trino-main/src/test/java/io/trino/operator/output/TestPagePartitionerPool.java
+++ b/core/trino-main/src/test/java/io/trino/operator/output/TestPagePartitionerPool.java
@@ -36,9 +36,10 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.TestingTaskContext;
 import io.trino.type.BlockTypeOperators;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.HashMap;
 import java.util.List;
@@ -58,19 +59,21 @@
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestPagePartitionerPool
 {
     private ScheduledExecutorService driverYieldExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         driverYieldExecutor = newScheduledThreadPool(0, threadsNamed("TestPagePartitionerPool-driver-yield-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void destroy()
     {
         driverYieldExecutor.shutdown();
@@ -176,7 +179,8 @@ private static PartitionedOutputOperatorFactory createFactory(DataSize maxPagePa
                 new PositionsAppenderFactory(new BlockTypeOperators()),
                 Optional.empty(),
                 memoryContext,
-                2);
+                2,
+                Optional.empty());
     }
 
     private long processSplitsConcurrently(PartitionedOutputOperatorFactory factory, AggregatedMemoryContext memoryContext, Page... splits)
diff --git a/core/trino-main/src/test/java/io/trino/operator/output/TestPartitionedOutputOperator.java b/core/trino-main/src/test/java/io/trino/operator/output/TestPartitionedOutputOperator.java
index cb885a485cd1..f633663fe327 100644
--- a/core/trino-main/src/test/java/io/trino/operator/output/TestPartitionedOutputOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/output/TestPartitionedOutputOperator.java
@@ -17,10 +17,10 @@
 import io.trino.operator.output.TestPagePartitioner.PagePartitionerBuilder;
 import io.trino.operator.output.TestPagePartitioner.TestOutputBuffer;
 import io.trino.spi.Page;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
@@ -30,23 +30,23 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestPartitionedOutputOperator
 {
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
-    private TestOutputBuffer outputBuffer;
 
-    @BeforeClass
+    @BeforeAll
     public void setUpClass()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-executor-%s"));
         scheduledExecutor = newScheduledThreadPool(1, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDownClass()
     {
         executor.shutdownNow();
@@ -55,16 +55,10 @@ public void tearDownClass()
         scheduledExecutor = null;
     }
 
-    @BeforeMethod
-    public void setUp()
-    {
-        outputBuffer = new TestOutputBuffer();
-    }
-
     @Test
     public void testOperatorContextStats()
     {
-        PartitionedOutputOperator partitionedOutputOperator = new PagePartitionerBuilder(executor, scheduledExecutor, outputBuffer)
+        PartitionedOutputOperator partitionedOutputOperator = new PagePartitionerBuilder(executor, scheduledExecutor, new TestOutputBuffer())
                 .withTypes(BIGINT).buildPartitionedOutputOperator();
         Page page = new Page(createLongSequenceBlock(0, 8));
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/output/TestPositionsAppender.java b/core/trino-main/src/test/java/io/trino/operator/output/TestPositionsAppender.java
index 98fd492f3ea1..01953f0ff5d2 100644
--- a/core/trino-main/src/test/java/io/trino/operator/output/TestPositionsAppender.java
+++ b/core/trino-main/src/test/java/io/trino/operator/output/TestPositionsAppender.java
@@ -14,10 +14,8 @@
 package io.trino.operator.output;
 
 import com.google.common.collect.ImmutableList;
-import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.trino.block.BlockAssertions;
-import io.trino.spi.block.AbstractVariableWidthBlock;
 import io.trino.spi.block.ArrayBlock;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
@@ -26,6 +24,7 @@
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.block.RowBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.block.VariableWidthBlock;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.BigintType;
@@ -46,14 +45,10 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import javax.annotation.Nullable;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.OptionalInt;
 import java.util.function.Function;
-import java.util.function.ObjLongConsumer;
 import java.util.stream.IntStream;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -96,8 +91,6 @@ public void testMixedBlockTypes(TestType type)
         List<BlockView> input = ImmutableList.of(
                 input(emptyBlock(type)),
                 input(nullBlock(type, 3), 0, 2),
-                input(nullBlock(TestType.UNKNOWN, 3), 0, 2), // a := null projections are handled by UnknownType null block
-                input(nullBlock(TestType.UNKNOWN, 1), 0), // a := null projections are handled by UnknownType null block, 1 position uses non RLE block
                 input(notNullBlock(type, 3), 1, 2),
                 input(partiallyNullBlock(type, 4), 0, 1, 2, 3),
                 input(partiallyNullBlock(type, 4)), // empty position list
@@ -175,22 +168,22 @@ public static Object[][] differentValues()
                         {TestType.INTEGER, createIntsBlock(0), createIntsBlock(1)},
                         {TestType.CHAR_10, createStringsBlock("0"), createStringsBlock("1")},
                         {TestType.VARCHAR, createStringsBlock("0"), createStringsBlock("1")},
-                        {TestType.DOUBLE, createDoublesBlock(0D), createDoublesBlock(1D)},
+                        {TestType.DOUBLE, createDoublesBlock(0.0), createDoublesBlock(1.0)},
                         {TestType.SMALLINT, createSmallintsBlock(0), createSmallintsBlock(1)},
                         {TestType.TINYINT, createTinyintsBlock(0), createTinyintsBlock(1)},
-                        {TestType.VARBINARY, createSlicesBlock(Slices.wrappedLongArray(0)), createSlicesBlock(Slices.wrappedLongArray(1))},
+                        {TestType.VARBINARY, createSlicesBlock(Slices.allocate(Long.BYTES)), createSlicesBlock(Slices.allocate(Long.BYTES).getOutput().appendLong(1).slice())},
                         {TestType.LONG_DECIMAL, createLongDecimalsBlock("0"), createLongDecimalsBlock("1")},
                         {TestType.ARRAY_BIGINT, createArrayBigintBlock(ImmutableList.of(ImmutableList.of(0L))), createArrayBigintBlock(ImmutableList.of(ImmutableList.of(1L)))},
                         {TestType.LONG_TIMESTAMP, createLongTimestampBlock(createTimestampType(9), new LongTimestamp(0, 0)),
                                 createLongTimestampBlock(createTimestampType(9), new LongTimestamp(1, 0))},
-                        {TestType.VARCHAR_WITH_TEST_BLOCK, TestVariableWidthBlock.adapt(createStringsBlock("0")), TestVariableWidthBlock.adapt(createStringsBlock("1"))}
+                        {TestType.VARCHAR_WITH_TEST_BLOCK, adapt(createStringsBlock("0")), adapt(createStringsBlock("1"))}
                 };
     }
 
     @Test(dataProvider = "types")
     public void testMultipleRleWithTheSameValueProduceRle(TestType type)
     {
-        PositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+        UnnestingPositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
 
         Block value = notNullBlock(type, 1);
         positionsAppender.append(allPositions(3), rleBlock(value, 3));
@@ -205,7 +198,7 @@ public void testMultipleRleWithTheSameValueProduceRle(TestType type)
     public void testRleAppendForComplexTypeWithNullElement(TestType type, Block value)
     {
         checkArgument(value.getPositionCount() == 1);
-        PositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+        UnnestingPositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
 
         positionsAppender.append(allPositions(3), rleBlock(value, 3));
         positionsAppender.append(allPositions(2), rleBlock(value, 2));
@@ -219,7 +212,7 @@ public void testRleAppendForComplexTypeWithNullElement(TestType type, Block valu
     @Test(dataProvider = "types")
     public void testRleAppendedWithSinglePositionDoesNotProduceRle(TestType type)
     {
-        PositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+        UnnestingPositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
 
         Block value = notNullBlock(type, 1);
         positionsAppender.append(allPositions(3), rleBlock(value, 3));
@@ -231,10 +224,73 @@ public void testRleAppendedWithSinglePositionDoesNotProduceRle(TestType type)
         assertFalse(actual instanceof RunLengthEncodedBlock, actual.getClass().getSimpleName());
     }
 
+    @Test(dataProvider = "types")
+    public static void testMultipleTheSameDictionariesProduceDictionary(TestType type)
+    {
+        UnnestingPositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+
+        testMultipleTheSameDictionariesProduceDictionary(type, positionsAppender);
+        // test if appender can accept different dictionary after a build
+        testMultipleTheSameDictionariesProduceDictionary(type, positionsAppender);
+    }
+
+    private static void testMultipleTheSameDictionariesProduceDictionary(TestType type, UnnestingPositionsAppender positionsAppender)
+    {
+        Block dictionary = createRandomBlockForType(type, 4, 0);
+        positionsAppender.append(allPositions(3), createRandomDictionaryBlock(dictionary, 3));
+        positionsAppender.append(allPositions(2), createRandomDictionaryBlock(dictionary, 2));
+
+        Block actual = positionsAppender.build();
+        assertEquals(actual.getPositionCount(), 5);
+        assertInstanceOf(actual, DictionaryBlock.class);
+        assertEquals(((DictionaryBlock) actual).getDictionary(), dictionary);
+    }
+
+    @Test(dataProvider = "types")
+    public void testDictionarySwitchToFlat(TestType type)
+    {
+        List<BlockView> inputs = ImmutableList.of(
+                input(dictionaryBlock(type, 3, 4, 0), 0, 1),
+                input(notNullBlock(type, 2), 0, 1));
+        testAppend(type, inputs);
+    }
+
+    @Test(dataProvider = "types")
+    public void testFlatAppendDictionary(TestType type)
+    {
+        List<BlockView> inputs = ImmutableList.of(
+                input(notNullBlock(type, 2), 0, 1),
+                input(dictionaryBlock(type, 3, 4, 0), 0, 1));
+        testAppend(type, inputs);
+    }
+
+    @Test(dataProvider = "types")
+    public void testDictionaryAppendDifferentDictionary(TestType type)
+    {
+        List<BlockView> dictionaryInputs = ImmutableList.of(
+                input(dictionaryBlock(type, 3, 4, 0), 0, 1),
+                input(dictionaryBlock(type, 2, 4, 0), 0, 1));
+        testAppend(type, dictionaryInputs);
+    }
+
+    @Test(dataProvider = "types")
+    public void testDictionarySingleThenFlat(TestType type)
+    {
+        BlockView firstInput = input(dictionaryBlock(type, 1, 4, 0), 0);
+        BlockView secondInput = input(dictionaryBlock(type, 2, 4, 0), 0, 1);
+        UnnestingPositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+        long initialRetainedSize = positionsAppender.getRetainedSizeInBytes();
+
+        firstInput.positions().forEach((int position) -> positionsAppender.append(position, firstInput.block()));
+        positionsAppender.append(secondInput.positions(), secondInput.block());
+
+        assertBuildResult(type, ImmutableList.of(firstInput, secondInput), positionsAppender, initialRetainedSize);
+    }
+
     @Test(dataProvider = "types")
     public void testConsecutiveBuilds(TestType type)
     {
-        PositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+        UnnestingPositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
 
         // empty block
         positionsAppender.append(positions(), emptyBlock(type));
@@ -262,22 +318,27 @@ public void testConsecutiveBuilds(TestType type)
         positionsAppender.append(allPositions(10), nullRleBlock);
         assertBlockEquals(type.getType(), positionsAppender.build(), nullRleBlock);
 
+        // append dictionary
+        Block dictionaryBlock = dictionaryBlock(type, 10, 5, 0);
+        positionsAppender.append(allPositions(10), dictionaryBlock);
+        assertBlockEquals(type.getType(), positionsAppender.build(), dictionaryBlock);
+
         // just build to confirm appender was reset
         assertEquals(positionsAppender.build().getPositionCount(), 0);
     }
 
     // testcase for jit bug described https://github.com/trinodb/trino/issues/12821.
-    // this test needs to be run first (hence lowest priority) as order of tests
-    // influence jit compilation making this problem to not occur if other tests are run first.
+    // this test needs to be run first (hence the lowest priority) as the test order
+    // influences jit compilation, making this problem to not occur if other tests are run first.
     @Test(priority = Integer.MIN_VALUE)
     public void testSliceRle()
     {
-        PositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(VARCHAR, 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+        UnnestingPositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(VARCHAR, 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
 
         // first append some not empty value to avoid RleAwarePositionsAppender for the empty value
         positionsAppender.appendRle(singleValueBlock("some value"), 1);
         // append empty value multiple times to trigger jit compilation
-        Block emptyStringBlock = singleValueBlock("");
+        ValueBlock emptyStringBlock = singleValueBlock("");
         for (int i = 0; i < 1000; i++) {
             positionsAppender.appendRle(emptyStringBlock, 2000);
         }
@@ -287,13 +348,13 @@ public void testSliceRle()
     public void testRowWithNestedFields()
     {
         RowType type = anonymousRow(BIGINT, BIGINT, VARCHAR);
-        Block rowBLock = RowBlock.fromFieldBlocks(2, Optional.empty(), new Block[] {
+        Block rowBLock = RowBlock.fromFieldBlocks(2, new Block[] {
                 notNullBlock(TestType.BIGINT, 2),
                 dictionaryBlock(TestType.BIGINT, 2, 2, 0.5F),
                 rleBlock(TestType.VARCHAR, 2)
         });
 
-        PositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type, 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+        UnnestingPositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type, 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
 
         positionsAppender.append(allPositions(2), rowBLock);
         Block actual = positionsAppender.build();
@@ -305,7 +366,7 @@ public void testRowWithNestedFields()
     public static Object[][] complexTypesWithNullElementBlock()
     {
         return new Object[][] {
-                {TestType.ROW_BIGINT_VARCHAR, RowBlock.fromFieldBlocks(1, Optional.empty(), new Block[] {nullBlock(BIGINT, 1), nullBlock(VARCHAR, 1)})},
+                {TestType.ROW_BIGINT_VARCHAR, RowBlock.fromFieldBlocks(1, new Block[] {nullBlock(BIGINT, 1), nullBlock(VARCHAR, 1)})},
                 {TestType.ARRAY_BIGINT, ArrayBlock.fromElementBlock(1, Optional.empty(), new int[] {0, 1}, nullBlock(BIGINT, 1))}};
     }
 
@@ -313,24 +374,24 @@ public static Object[][] complexTypesWithNullElementBlock()
     public static Object[][] types()
     {
         return Arrays.stream(TestType.values())
-                .filter(testType -> !testType.equals(TestType.UNKNOWN))
+                .filter(testType -> testType != TestType.UNKNOWN)
                 .map(type -> new Object[] {type})
                 .toArray(Object[][]::new);
     }
 
-    private static Block singleValueBlock(String value)
+    private static ValueBlock singleValueBlock(String value)
     {
         BlockBuilder blockBuilder = VARCHAR.createBlockBuilder(null, 1);
         VARCHAR.writeSlice(blockBuilder, Slices.utf8Slice(value));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
-    private IntArrayList allPositions(int count)
+    private static IntArrayList allPositions(int count)
     {
         return new IntArrayList(IntStream.range(0, count).toArray());
     }
 
-    private BlockView input(Block block, int... positions)
+    private static BlockView input(Block block, int... positions)
     {
         return new BlockView(block, new IntArrayList(positions));
     }
@@ -340,53 +401,53 @@ private static IntArrayList positions(int... positions)
         return new IntArrayList(positions);
     }
 
-    private Block dictionaryBlock(Block dictionary, int positionCount)
+    private static Block dictionaryBlock(Block dictionary, int positionCount)
     {
         return createRandomDictionaryBlock(dictionary, positionCount);
     }
 
-    private Block dictionaryBlock(Block dictionary, int[] ids)
+    private static Block dictionaryBlock(Block dictionary, int[] ids)
     {
         return DictionaryBlock.create(ids.length, dictionary, ids);
     }
 
-    private Block dictionaryBlock(TestType type, int positionCount, int dictionarySize, float nullRate)
+    private static Block dictionaryBlock(TestType type, int positionCount, int dictionarySize, float nullRate)
     {
         Block dictionary = createRandomBlockForType(type, dictionarySize, nullRate);
         return createRandomDictionaryBlock(dictionary, positionCount);
     }
 
-    private RunLengthEncodedBlock rleBlock(Block value, int positionCount)
+    private static RunLengthEncodedBlock rleBlock(Block value, int positionCount)
     {
         checkArgument(positionCount >= 2);
         return (RunLengthEncodedBlock) RunLengthEncodedBlock.create(value, positionCount);
     }
 
-    private RunLengthEncodedBlock rleBlock(TestType type, int positionCount)
+    private static RunLengthEncodedBlock rleBlock(TestType type, int positionCount)
     {
         checkArgument(positionCount >= 2);
         Block rleValue = createRandomBlockForType(type, 1, 0);
         return (RunLengthEncodedBlock) RunLengthEncodedBlock.create(rleValue, positionCount);
     }
 
-    private RunLengthEncodedBlock nullRleBlock(TestType type, int positionCount)
+    private static RunLengthEncodedBlock nullRleBlock(TestType type, int positionCount)
     {
         checkArgument(positionCount >= 2);
         Block rleValue = nullBlock(type, 1);
         return (RunLengthEncodedBlock) RunLengthEncodedBlock.create(rleValue, positionCount);
     }
 
-    private Block partiallyNullBlock(TestType type, int positionCount)
+    private static Block partiallyNullBlock(TestType type, int positionCount)
     {
         return createRandomBlockForType(type, positionCount, 0.5F);
     }
 
-    private Block notNullBlock(TestType type, int positionCount)
+    private static Block notNullBlock(TestType type, int positionCount)
     {
         return createRandomBlockForType(type, positionCount, 0);
     }
 
-    private Block nullBlock(TestType type, int positionCount)
+    private static Block nullBlock(TestType type, int positionCount)
     {
         BlockBuilder blockBuilder = type.getType().createBlockBuilder(null, positionCount);
         for (int i = 0; i < positionCount; i++) {
@@ -404,19 +465,19 @@ private static Block nullBlock(Type type, int positionCount)
         return blockBuilder.build();
     }
 
-    private Block emptyBlock(TestType type)
+    private static Block emptyBlock(TestType type)
     {
         return type.adapt(type.getType().createBlockBuilder(null, 0).build());
     }
 
-    private Block createRandomBlockForType(TestType type, int positionCount, float nullRate)
+    private static Block createRandomBlockForType(TestType type, int positionCount, float nullRate)
     {
         return type.adapt(BlockAssertions.createRandomBlockForType(type.getType(), positionCount, nullRate));
     }
 
-    private void testNullRle(Type type, Block source)
+    private static void testNullRle(Type type, Block source)
     {
-        PositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type, 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+        UnnestingPositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type, 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
         // extract null positions
         IntArrayList positions = new IntArrayList(source.getPositionCount());
         for (int i = 0; i < source.getPositionCount(); i++) {
@@ -433,18 +494,23 @@ private void testNullRle(Type type, Block source)
         assertInstanceOf(actual, RunLengthEncodedBlock.class);
     }
 
-    private void testAppend(TestType type, List<BlockView> inputs)
+    private static void testAppend(TestType type, List<BlockView> inputs)
     {
         testAppendBatch(type, inputs);
         testAppendSingle(type, inputs);
     }
 
-    private void testAppendBatch(TestType type, List<BlockView> inputs)
+    private static void testAppendBatch(TestType type, List<BlockView> inputs)
     {
-        PositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+        UnnestingPositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
         long initialRetainedSize = positionsAppender.getRetainedSizeInBytes();
 
-        inputs.forEach(input -> positionsAppender.append(input.getPositions(), input.getBlock()));
+        inputs.forEach(input -> positionsAppender.append(input.positions(), input.block()));
+        assertBuildResult(type, inputs, positionsAppender, initialRetainedSize);
+    }
+
+    private static void assertBuildResult(TestType type, List<BlockView> inputs, UnnestingPositionsAppender positionsAppender, long initialRetainedSize)
+    {
         long sizeInBytes = positionsAppender.getSizeInBytes();
         assertGreaterThanOrEqual(positionsAppender.getRetainedSizeInBytes(), sizeInBytes);
         Block actual = positionsAppender.build();
@@ -457,12 +523,12 @@ private void testAppendBatch(TestType type, List<BlockView> inputs)
         assertEquals(secondBlock.getPositionCount(), 0);
     }
 
-    private void testAppendSingle(TestType type, List<BlockView> inputs)
+    private static void testAppendSingle(TestType type, List<BlockView> inputs)
     {
-        PositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+        UnnestingPositionsAppender positionsAppender = POSITIONS_APPENDER_FACTORY.create(type.getType(), 10, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
         long initialRetainedSize = positionsAppender.getRetainedSizeInBytes();
 
-        inputs.forEach(input -> input.getPositions().forEach((int position) -> positionsAppender.append(position, input.getBlock())));
+        inputs.forEach(input -> input.positions().forEach((int position) -> positionsAppender.append(position, input.block())));
         long sizeInBytes = positionsAppender.getSizeInBytes();
         assertGreaterThanOrEqual(positionsAppender.getRetainedSizeInBytes(), sizeInBytes);
         Block actual = positionsAppender.build();
@@ -475,7 +541,7 @@ private void testAppendSingle(TestType type, List<BlockView> inputs)
         assertEquals(secondBlock.getPositionCount(), 0);
     }
 
-    private void assertBlockIsValid(Block actual, long sizeInBytes, Type type, List<BlockView> inputs)
+    private static void assertBlockIsValid(Block actual, long sizeInBytes, Type type, List<BlockView> inputs)
     {
         PageBuilderStatus pageBuilderStatus = new PageBuilderStatus();
         BlockBuilderStatus blockBuilderStatus = pageBuilderStatus.createBlockBuilderStatus();
@@ -485,12 +551,12 @@ private void assertBlockIsValid(Block actual, long sizeInBytes, Type type, List<
         assertEquals(sizeInBytes, pageBuilderStatus.getSizeInBytes());
     }
 
-    private Block buildBlock(Type type, List<BlockView> inputs, BlockBuilderStatus blockBuilderStatus)
+    private static Block buildBlock(Type type, List<BlockView> inputs, BlockBuilderStatus blockBuilderStatus)
     {
         BlockBuilder blockBuilder = type.createBlockBuilder(blockBuilderStatus, 10);
         for (BlockView input : inputs) {
-            for (int position : input.getPositions()) {
-                type.appendTo(input.getBlock(), position, blockBuilder);
+            for (int position : input.positions()) {
+                type.appendTo(input.block(), position, blockBuilder);
             }
         }
         return blockBuilder.build();
@@ -511,7 +577,7 @@ private enum TestType
         LONG_TIMESTAMP(createTimestampType(9)),
         ROW_BIGINT_VARCHAR(anonymousRow(BigintType.BIGINT, VarcharType.VARCHAR)),
         ARRAY_BIGINT(new ArrayType(BigintType.BIGINT)),
-        VARCHAR_WITH_TEST_BLOCK(VarcharType.VARCHAR, TestVariableWidthBlock.adaptation()),
+        VARCHAR_WITH_TEST_BLOCK(VarcharType.VARCHAR, adaptation()),
         UNKNOWN(UnknownType.UNKNOWN);
 
         private final Type type;
@@ -539,186 +605,41 @@ public Type getType()
         }
     }
 
-    private static class BlockView
+    private record BlockView(Block block, IntArrayList positions)
     {
-        private final Block block;
-        private final IntArrayList positions;
-
-        private BlockView(Block block, IntArrayList positions)
-        {
-            this.block = requireNonNull(block, "block is null");
-            this.positions = requireNonNull(positions, "positions is null");
-        }
-
-        public Block getBlock()
-        {
-            return block;
-        }
-
-        public IntArrayList getPositions()
-        {
-            return positions;
-        }
-
-        public void appendTo(PositionsAppender positionsAppender)
+        private BlockView
         {
-            positionsAppender.append(getPositions(), getBlock());
+            requireNonNull(block, "block is null");
+            requireNonNull(positions, "positions is null");
         }
     }
 
-    private static class TestVariableWidthBlock
-            extends AbstractVariableWidthBlock
+    private static Function<Block, Block> adaptation()
     {
-        private final int arrayOffset;
-        private final int positionCount;
-        private final Slice slice;
-        private final int[] offsets;
-        @Nullable
-        private final boolean[] valueIsNull;
+        return TestPositionsAppender::adapt;
+    }
 
-        private static Function<Block, Block> adaptation()
-        {
-            return TestVariableWidthBlock::adapt;
+    private static Block adapt(Block block)
+    {
+        if (block instanceof RunLengthEncodedBlock) {
+            checkArgument(block.getPositionCount() == 0 || block.isNull(0));
+            return RunLengthEncodedBlock.create(new VariableWidthBlock(1, EMPTY_SLICE, new int[] {0, 0}, Optional.of(new boolean[] {true})), block.getPositionCount());
         }
 
-        private static Block adapt(Block block)
-        {
-            if (block instanceof RunLengthEncodedBlock) {
-                checkArgument(block.getPositionCount() == 0 || block.isNull(0));
-                return RunLengthEncodedBlock.create(new TestVariableWidthBlock(0, 1, EMPTY_SLICE, new int[] {0, 0}, new boolean[] {true}), block.getPositionCount());
+        int[] offsets = new int[block.getPositionCount() + 1];
+        boolean[] valueIsNull = new boolean[block.getPositionCount()];
+        boolean hasNullValue = false;
+        for (int i = 0; i < block.getPositionCount(); i++) {
+            if (block.isNull(i)) {
+                valueIsNull[i] = true;
+                hasNullValue = true;
+                offsets[i + 1] = offsets[i];
             }
-
-            int[] offsets = new int[block.getPositionCount() + 1];
-            boolean[] valueIsNull = new boolean[block.getPositionCount()];
-            boolean hasNullValue = false;
-            for (int i = 0; i < block.getPositionCount(); i++) {
-                if (block.isNull(i)) {
-                    valueIsNull[i] = true;
-                    hasNullValue = true;
-                    offsets[i + 1] = offsets[i];
-                }
-                else {
-                    offsets[i + 1] = offsets[i] + block.getSliceLength(i);
-                }
+            else {
+                offsets[i + 1] = offsets[i] + block.getSliceLength(i);
             }
-
-            return new TestVariableWidthBlock(0, block.getPositionCount(), ((VariableWidthBlock) block).getRawSlice(), offsets, hasNullValue ? valueIsNull : null);
-        }
-
-        private TestVariableWidthBlock(int arrayOffset, int positionCount, Slice slice, int[] offsets, boolean[] valueIsNull)
-        {
-            checkArgument(arrayOffset >= 0);
-            this.arrayOffset = arrayOffset;
-            checkArgument(positionCount >= 0);
-            this.positionCount = positionCount;
-            this.slice = requireNonNull(slice, "slice is null");
-            this.offsets = offsets;
-            this.valueIsNull = valueIsNull;
-        }
-
-        @Override
-        protected Slice getRawSlice(int position)
-        {
-            return slice;
-        }
-
-        @Override
-        protected int getPositionOffset(int position)
-        {
-            return offsets[position + arrayOffset];
-        }
-
-        @Override
-        public int getSliceLength(int position)
-        {
-            return getPositionOffset(position + 1) - getPositionOffset(position);
         }
 
-        @Override
-        protected boolean isEntryNull(int position)
-        {
-            return valueIsNull != null && valueIsNull[position + arrayOffset];
-        }
-
-        @Override
-        public int getPositionCount()
-        {
-            return positionCount;
-        }
-
-        @Override
-        public Block getRegion(int positionOffset, int length)
-        {
-            return new TestVariableWidthBlock(positionOffset + arrayOffset, length, slice, offsets, valueIsNull);
-        }
-
-        @Override
-        public Block getSingleValueBlock(int position)
-        {
-            if (isNull(position)) {
-                return new TestVariableWidthBlock(0, 1, EMPTY_SLICE, new int[] {0, 0}, new boolean[] {true});
-            }
-
-            int offset = getPositionOffset(position);
-            int entrySize = getSliceLength(position);
-
-            Slice copy = Slices.copyOf(getRawSlice(position), offset, entrySize);
-
-            return new TestVariableWidthBlock(0, 1, copy, new int[] {0, copy.length()}, null);
-        }
-
-        @Override
-        public long getSizeInBytes()
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public long getRegionSizeInBytes(int position, int length)
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public OptionalInt fixedSizeInBytesPerPosition()
-        {
-            return OptionalInt.empty();
-        }
-
-        @Override
-        public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionsCount)
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public long getRetainedSizeInBytes()
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public Block copyPositions(int[] positions, int offset, int length)
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public Block copyRegion(int position, int length)
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public Block copyWithAppendedNull()
-        {
-            throw new UnsupportedOperationException();
-        }
+        return new VariableWidthBlock(block.getPositionCount(), ((VariableWidthBlock) block).getRawSlice(), offsets, hasNullValue ? Optional.of(valueIsNull) : Optional.empty());
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/output/TestSkewedPartitionRebalancer.java b/core/trino-main/src/test/java/io/trino/operator/output/TestSkewedPartitionRebalancer.java
new file mode 100644
index 000000000000..5a61bf221287
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/operator/output/TestSkewedPartitionRebalancer.java
@@ -0,0 +1,376 @@
+/*
+ * Licensed 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 io.trino.operator.output;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.units.DataSize;
+import io.trino.SequencePageBuilder;
+import io.trino.operator.PartitionFunction;
+import io.trino.spi.Page;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static io.airlift.units.DataSize.Unit.MEGABYTE;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TestSkewedPartitionRebalancer
+{
+    private static final long MIN_PARTITION_DATA_PROCESSED_REBALANCE_THRESHOLD = DataSize.of(1, MEGABYTE).toBytes();
+    private static final long MIN_DATA_PROCESSED_REBALANCE_THRESHOLD = DataSize.of(50, MEGABYTE).toBytes();
+    private static final int MAX_REBALANCED_PARTITIONS = 30;
+
+    @Test
+    void testRebalanceWithSkewness()
+    {
+        int partitionCount = 3;
+        SkewedPartitionRebalancer rebalancer = new SkewedPartitionRebalancer(
+                partitionCount,
+                3,
+                3,
+                MIN_PARTITION_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                MIN_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                MAX_REBALANCED_PARTITIONS);
+        SkewedPartitionFunction function = new SkewedPartitionFunction(new TestPartitionFunction(partitionCount), rebalancer);
+
+        rebalancer.addPartitionRowCount(0, 1000);
+        rebalancer.addPartitionRowCount(1, 1000);
+        rebalancer.addPartitionRowCount(2, 1000);
+        rebalancer.addDataProcessed(DataSize.of(40, MEGABYTE).toBytes());
+        // No rebalancing will happen since the data processed is less than 50MB
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 17))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 3, 6, 9, 12, 15)),
+                        new IntArrayList(ImmutableList.of(1, 4, 7, 10, 13, 16)),
+                        new IntArrayList(ImmutableList.of(2, 5, 8, 11, 14)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0), ImmutableList.of(1), ImmutableList.of(2));
+
+        rebalancer.addPartitionRowCount(0, 1000);
+        rebalancer.addPartitionRowCount(1, 1000);
+        rebalancer.addPartitionRowCount(2, 1000);
+        rebalancer.addDataProcessed(DataSize.of(20, MEGABYTE).toBytes());
+        // Rebalancing will happen since we crossed the data processed limit.
+        // Part0 -> Task1 (Bucket1), Part1 -> Task0 (Bucket1), Part2 -> Task0 (Bucket2)
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 17))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 2, 4, 6, 8, 10, 12, 14, 16)),
+                        new IntArrayList(ImmutableList.of(1, 3, 7, 9, 13, 15)),
+                        new IntArrayList(ImmutableList.of(5, 11)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0, 1), ImmutableList.of(1, 0), ImmutableList.of(2, 0));
+
+        rebalancer.addPartitionRowCount(0, 1000);
+        rebalancer.addPartitionRowCount(1, 1000);
+        rebalancer.addPartitionRowCount(2, 1000);
+        rebalancer.addDataProcessed(DataSize.of(200, MEGABYTE).toBytes());
+        // Rebalancing will happen
+        // Part0 -> Task2 (Bucket1), Part1 -> Task2 (Bucket2), Part2 -> Task1 (Bucket2)
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 17))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 2, 4, 9, 11, 13)),
+                        new IntArrayList(ImmutableList.of(1, 3, 5, 10, 12, 14)),
+                        new IntArrayList(ImmutableList.of(6, 7, 8, 15, 16)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0, 1, 2), ImmutableList.of(1, 0, 2), ImmutableList.of(2, 0, 1));
+    }
+
+    @Test
+    void testRebalanceWithoutSkewness()
+    {
+        int partitionCount = 6;
+        SkewedPartitionRebalancer rebalancer = new SkewedPartitionRebalancer(
+                partitionCount,
+                3,
+                2,
+                MIN_PARTITION_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                MIN_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                MAX_REBALANCED_PARTITIONS);
+        SkewedPartitionFunction function = new SkewedPartitionFunction(new TestPartitionFunction(partitionCount), rebalancer);
+
+        rebalancer.addPartitionRowCount(0, 1000);
+        rebalancer.addPartitionRowCount(1, 700);
+        rebalancer.addPartitionRowCount(2, 600);
+        rebalancer.addPartitionRowCount(3, 1000);
+        rebalancer.addPartitionRowCount(4, 700);
+        rebalancer.addPartitionRowCount(5, 600);
+        rebalancer.addDataProcessed(DataSize.of(500, MEGABYTE).toBytes());
+        // No rebalancing will happen since there is no skewness across task buckets
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 6))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 3)),
+                        new IntArrayList(ImmutableList.of(1, 4)),
+                        new IntArrayList(ImmutableList.of(2, 5)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0), ImmutableList.of(1), ImmutableList.of(2), ImmutableList.of(0), ImmutableList.of(1), ImmutableList.of(2));
+    }
+
+    @Test
+    void testNoRebalanceWhenDataWrittenIsLessThanTheRebalanceLimit()
+    {
+        int partitionCount = 3;
+        SkewedPartitionRebalancer rebalancer = new SkewedPartitionRebalancer(
+                partitionCount,
+                3,
+                3,
+                MIN_PARTITION_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                MIN_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                MAX_REBALANCED_PARTITIONS);
+        SkewedPartitionFunction function = new SkewedPartitionFunction(new TestPartitionFunction(partitionCount), rebalancer);
+
+        rebalancer.addPartitionRowCount(0, 1000);
+        rebalancer.addPartitionRowCount(1, 0);
+        rebalancer.addPartitionRowCount(2, 0);
+        rebalancer.addDataProcessed(DataSize.of(40, MEGABYTE).toBytes());
+        // No rebalancing will happen since we do not cross the max data processed limit of 50MB
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 6))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 3)),
+                        new IntArrayList(ImmutableList.of(1, 4)),
+                        new IntArrayList(ImmutableList.of(2, 5)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0), ImmutableList.of(1), ImmutableList.of(2));
+    }
+
+    @Test
+    void testNoRebalanceWhenDataWrittenByThePartitionIsLessThanWriterScalingMinDataProcessed()
+    {
+        int partitionCount = 3;
+        long minPartitionDataProcessedRebalanceThreshold = DataSize.of(50, MEGABYTE).toBytes();
+        SkewedPartitionRebalancer rebalancer = new SkewedPartitionRebalancer(
+                partitionCount,
+                3,
+                3,
+                minPartitionDataProcessedRebalanceThreshold,
+                MIN_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                MAX_REBALANCED_PARTITIONS);
+        SkewedPartitionFunction function = new SkewedPartitionFunction(new TestPartitionFunction(partitionCount), rebalancer);
+
+        rebalancer.addPartitionRowCount(0, 1000);
+        rebalancer.addPartitionRowCount(1, 600);
+        rebalancer.addPartitionRowCount(2, 0);
+        rebalancer.addDataProcessed(DataSize.of(60, MEGABYTE).toBytes());
+        // No rebalancing will happen since no partition has crossed the writerScalingMinDataProcessed limit of 50MB
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 6))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 3)),
+                        new IntArrayList(ImmutableList.of(1, 4)),
+                        new IntArrayList(ImmutableList.of(2, 5)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0), ImmutableList.of(1), ImmutableList.of(2));
+    }
+
+    @Test
+    void testRebalancePartitionToSingleTaskInARebalancingLoop()
+    {
+        int partitionCount = 3;
+        SkewedPartitionRebalancer rebalancer = new SkewedPartitionRebalancer(
+                partitionCount,
+                3,
+                3,
+                MIN_PARTITION_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                MIN_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                MAX_REBALANCED_PARTITIONS);
+        SkewedPartitionFunction function = new SkewedPartitionFunction(new TestPartitionFunction(partitionCount), rebalancer);
+
+        rebalancer.addPartitionRowCount(0, 1000);
+        rebalancer.addPartitionRowCount(1, 0);
+        rebalancer.addPartitionRowCount(2, 0);
+
+        rebalancer.addDataProcessed(DataSize.of(60, MEGABYTE).toBytes());
+        // rebalancing will only happen to a single task even though two tasks are available
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 17))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 6, 12)),
+                        new IntArrayList(ImmutableList.of(1, 3, 4, 7, 9, 10, 13, 15, 16)),
+                        new IntArrayList(ImmutableList.of(2, 5, 8, 11, 14)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0, 1), ImmutableList.of(1), ImmutableList.of(2));
+
+        rebalancer.addPartitionRowCount(0, 1000);
+        rebalancer.addPartitionRowCount(1, 0);
+        rebalancer.addPartitionRowCount(2, 0);
+
+        rebalancer.addDataProcessed(DataSize.of(60, MEGABYTE).toBytes());
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 17))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 9)),
+                        new IntArrayList(ImmutableList.of(1, 3, 4, 7, 10, 12, 13, 16)),
+                        new IntArrayList(ImmutableList.of(2, 5, 6, 8, 11, 14, 15)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0, 1, 2), ImmutableList.of(1), ImmutableList.of(2));
+    }
+
+    @Test
+    public void testConsiderSkewedPartitionOnlyWithinACycle()
+    {
+        int partitionCount = 3;
+        SkewedPartitionRebalancer rebalancer = new SkewedPartitionRebalancer(
+                partitionCount,
+                3,
+                1,
+                MIN_PARTITION_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                MIN_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                MAX_REBALANCED_PARTITIONS);
+        SkewedPartitionFunction function = new SkewedPartitionFunction(
+                new TestPartitionFunction(partitionCount),
+                rebalancer);
+
+        rebalancer.addPartitionRowCount(0, 1000);
+        rebalancer.addPartitionRowCount(1, 800);
+        rebalancer.addPartitionRowCount(2, 0);
+
+        rebalancer.addDataProcessed(DataSize.of(60, MEGABYTE).toBytes());
+        // rebalancing will happen for partition 0 to task 2 since partition 0 is skewed.
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 17))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 6, 12)),
+                        new IntArrayList(ImmutableList.of(1, 4, 7, 10, 13, 16)),
+                        new IntArrayList(ImmutableList.of(2, 3, 5, 8, 9, 11, 14, 15)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0, 2), ImmutableList.of(1), ImmutableList.of(2));
+
+        rebalancer.addPartitionRowCount(0, 0);
+        rebalancer.addPartitionRowCount(1, 800);
+        rebalancer.addPartitionRowCount(2, 1000);
+        // rebalancing will happen for partition 2 to task 0 since partition 2 is skewed. Even though partition 1 has
+        // written more amount of data from start, it will not be considered since it is not the most skewed in
+        // this rebalancing cycle.
+        rebalancer.addDataProcessed(DataSize.of(60, MEGABYTE).toBytes());
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 17))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 2, 6, 8, 12, 14)),
+                        new IntArrayList(ImmutableList.of(1, 4, 7, 10, 13, 16)),
+                        new IntArrayList(ImmutableList.of(3, 5, 9, 11, 15)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0, 2), ImmutableList.of(1), ImmutableList.of(2, 0));
+    }
+
+    @Test
+    public void testRebalancePartitionWithMaxRebalancedPartitionsPerTask()
+    {
+        int partitionCount = 3;
+        SkewedPartitionRebalancer rebalancer = new SkewedPartitionRebalancer(
+                partitionCount,
+                3,
+                3,
+                MIN_PARTITION_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                MIN_DATA_PROCESSED_REBALANCE_THRESHOLD,
+                2);
+        SkewedPartitionFunction function = new SkewedPartitionFunction(
+                new TestPartitionFunction(partitionCount),
+                rebalancer);
+
+        rebalancer.addPartitionRowCount(0, 1000);
+        rebalancer.addPartitionRowCount(1, 1000);
+        rebalancer.addPartitionRowCount(2, 1000);
+        rebalancer.addDataProcessed(DataSize.of(40, MEGABYTE).toBytes());
+
+        // rebalancing will only happen to single task even though two tasks are available
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 17))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 3, 6, 9, 12, 15)),
+                        new IntArrayList(ImmutableList.of(1, 4, 7, 10, 13, 16)),
+                        new IntArrayList(ImmutableList.of(2, 5, 8, 11, 14)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0), ImmutableList.of(1), ImmutableList.of(2));
+
+        rebalancer.addPartitionRowCount(0, 1000);
+        rebalancer.addPartitionRowCount(1, 1000);
+        rebalancer.addPartitionRowCount(2, 1000);
+        rebalancer.addDataProcessed(DataSize.of(20, MEGABYTE).toBytes());
+        // Rebalancing will happen since we crossed the data processed limit.
+        // Part0 -> Task1 (Bucket1), Part1 -> Task0 (Bucket1)
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 17))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 4, 6, 10, 12, 16)),
+                        new IntArrayList(ImmutableList.of(1, 3, 7, 9, 13, 15)),
+                        new IntArrayList(ImmutableList.of(2, 5, 8, 11, 14)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0, 1), ImmutableList.of(1, 0), ImmutableList.of(2));
+
+        rebalancer.addPartitionRowCount(0, 1000);
+        rebalancer.addPartitionRowCount(1, 1000);
+        rebalancer.addPartitionRowCount(2, 1000);
+        rebalancer.addDataProcessed(DataSize.of(200, MEGABYTE).toBytes());
+
+        // No rebalancing will happen since we crossed the max rebalanced partitions limit.
+        rebalancer.rebalance();
+
+        assertThat(getPartitionPositions(function, 17))
+                .containsExactly(
+                        new IntArrayList(ImmutableList.of(0, 4, 6, 10, 12, 16)),
+                        new IntArrayList(ImmutableList.of(1, 3, 7, 9, 13, 15)),
+                        new IntArrayList(ImmutableList.of(2, 5, 8, 11, 14)));
+        assertThat(rebalancer.getPartitionAssignments())
+                .containsExactly(ImmutableList.of(0, 1), ImmutableList.of(1, 0), ImmutableList.of(2));
+    }
+
+    private static List<List<Integer>> getPartitionPositions(PartitionFunction function, int maxPosition)
+    {
+        List<List<Integer>> partitionPositions = new ArrayList<>();
+        for (int partition = 0; partition < function.partitionCount(); partition++) {
+            partitionPositions.add(new ArrayList<>());
+        }
+
+        for (int position = 0; position < maxPosition; position++) {
+            int partition = function.getPartition(dummyPage(), position);
+            partitionPositions.get(partition).add(position);
+        }
+
+        return partitionPositions;
+    }
+
+    private static Page dummyPage()
+    {
+        return SequencePageBuilder.createSequencePage(ImmutableList.of(BIGINT), 100, 0);
+    }
+
+    private record TestPartitionFunction(int partitionCount)
+            implements PartitionFunction
+    {
+        @Override
+        public int getPartition(Page page, int position)
+        {
+            return position % partitionCount;
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/operator/output/TestSlicePositionsAppender.java b/core/trino-main/src/test/java/io/trino/operator/output/TestSlicePositionsAppender.java
index fde228c6793d..c90ffe5234b0 100644
--- a/core/trino-main/src/test/java/io/trino/operator/output/TestSlicePositionsAppender.java
+++ b/core/trino-main/src/test/java/io/trino/operator/output/TestSlicePositionsAppender.java
@@ -17,17 +17,14 @@
 import io.airlift.slice.Slices;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.RunLengthEncodedBlock;
-import io.trino.spi.block.VariableWidthBlock;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import org.testng.annotations.Test;
+import io.trino.spi.block.ValueBlock;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
-import java.util.Optional;
 
 import static io.trino.block.BlockAssertions.assertBlockEquals;
 import static io.trino.block.BlockAssertions.createStringsBlock;
 import static io.trino.operator.output.SlicePositionsAppender.duplicateBytes;
-import static io.trino.spi.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
 
@@ -38,7 +35,7 @@ public void testAppendEmptySliceRle()
     {
         // test SlicePositionAppender.appendRle with empty value (Slice with length 0)
         PositionsAppender positionsAppender = new SlicePositionsAppender(1, 100);
-        Block value = createStringsBlock("");
+        ValueBlock value = createStringsBlock("");
         positionsAppender.appendRle(value, 10);
 
         Block actualBlock = positionsAppender.build();
@@ -46,25 +43,6 @@ public void testAppendEmptySliceRle()
         assertBlockEquals(VARCHAR, actualBlock, RunLengthEncodedBlock.create(value, 10));
     }
 
-    // test append with VariableWidthBlock using Slice not backed by byte array
-    // to test special handling in SlicePositionsAppender.copyBytes
-    @Test
-    public void testAppendSliceNotBackedByByteArray()
-    {
-        PositionsAppender positionsAppender = new SlicePositionsAppender(1, DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
-        Block block = new VariableWidthBlock(3, Slices.wrappedLongArray(257, 2), new int[] {0, 1, Long.BYTES, 2 * Long.BYTES}, Optional.empty());
-        positionsAppender.append(IntArrayList.wrap(new int[] {0, 2}), block);
-
-        Block actual = positionsAppender.build();
-
-        Block expected = new VariableWidthBlock(
-                2,
-                Slices.wrappedBuffer(new byte[] {1, 2, 0, 0, 0, 0, 0, 0, 0}),
-                new int[] {0, 1, Long.BYTES + 1},
-                Optional.empty());
-        assertBlockEquals(VARCHAR, actual, expected);
-    }
-
     @Test
     public void testDuplicateZeroLength()
     {
diff --git a/core/trino-main/src/test/java/io/trino/operator/project/BenchmarkDictionaryBlock.java b/core/trino-main/src/test/java/io/trino/operator/project/BenchmarkDictionaryBlock.java
index af04f636eb0e..731267854d97 100644
--- a/core/trino-main/src/test/java/io/trino/operator/project/BenchmarkDictionaryBlock.java
+++ b/core/trino-main/src/test/java/io/trino/operator/project/BenchmarkDictionaryBlock.java
@@ -22,6 +22,7 @@
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.TypeSignatureParameter;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -34,7 +35,6 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
-import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/operator/project/TestDictionaryAwarePageFilter.java b/core/trino-main/src/test/java/io/trino/operator/project/TestDictionaryAwarePageFilter.java
index e35f0105b8c4..ef81dc5d9489 100644
--- a/core/trino-main/src/test/java/io/trino/operator/project/TestDictionaryAwarePageFilter.java
+++ b/core/trino-main/src/test/java/io/trino/operator/project/TestDictionaryAwarePageFilter.java
@@ -24,7 +24,7 @@
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntArraySet;
 import it.unimi.dsi.fastutil.ints.IntSet;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.stream.IntStream;
diff --git a/core/trino-main/src/test/java/io/trino/operator/project/TestDictionaryAwarePageProjection.java b/core/trino-main/src/test/java/io/trino/operator/project/TestDictionaryAwarePageProjection.java
index 945915644caf..293fa9fcb078 100644
--- a/core/trino-main/src/test/java/io/trino/operator/project/TestDictionaryAwarePageProjection.java
+++ b/core/trino-main/src/test/java/io/trino/operator/project/TestDictionaryAwarePageProjection.java
@@ -435,7 +435,7 @@ public boolean process()
                     int offset = selectedPositions.getOffset();
                     int[] positions = selectedPositions.getPositions();
                     for (int index = nextIndexOrPosition + offset; index < offset + selectedPositions.size(); index++) {
-                        blockBuilder.writeLong(verifyPositive(block.getLong(positions[index], 0)));
+                        BIGINT.writeLong(blockBuilder, verifyPositive(block.getLong(positions[index], 0)));
                         if (yieldSignal.isSet()) {
                             nextIndexOrPosition = index + 1 - offset;
                             return false;
@@ -445,7 +445,7 @@ public boolean process()
                 else {
                     int offset = selectedPositions.getOffset();
                     for (int position = nextIndexOrPosition + offset; position < offset + selectedPositions.size(); position++) {
-                        blockBuilder.writeLong(verifyPositive(block.getLong(position, 0)));
+                        BIGINT.writeLong(blockBuilder, verifyPositive(block.getLong(position, 0)));
                         if (yieldSignal.isSet()) {
                             nextIndexOrPosition = position + 1 - offset;
                             return false;
diff --git a/core/trino-main/src/test/java/io/trino/operator/project/TestInputPageProjection.java b/core/trino-main/src/test/java/io/trino/operator/project/TestInputPageProjection.java
index 30764b5dd402..c3dac9685829 100644
--- a/core/trino-main/src/test/java/io/trino/operator/project/TestInputPageProjection.java
+++ b/core/trino-main/src/test/java/io/trino/operator/project/TestInputPageProjection.java
@@ -17,7 +17,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.LazyBlock;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.block.BlockAssertions.createLongSequenceBlock;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/project/TestMergePages.java b/core/trino-main/src/test/java/io/trino/operator/project/TestMergePages.java
index ffdd97c293db..033bbaf8e4ed 100644
--- a/core/trino-main/src/test/java/io/trino/operator/project/TestMergePages.java
+++ b/core/trino-main/src/test/java/io/trino/operator/project/TestMergePages.java
@@ -19,7 +19,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.LazyBlock;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/project/TestPageFieldsToInputParametersRewriter.java b/core/trino-main/src/test/java/io/trino/operator/project/TestPageFieldsToInputParametersRewriter.java
index b527dfb2cd6d..553f30dcf9c0 100644
--- a/core/trino-main/src/test/java/io/trino/operator/project/TestPageFieldsToInputParametersRewriter.java
+++ b/core/trino-main/src/test/java/io/trino/operator/project/TestPageFieldsToInputParametersRewriter.java
@@ -14,21 +14,20 @@
 package io.trino.operator.project;
 
 import com.google.common.collect.ImmutableSet;
-import io.trino.Session;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.LazyBlock;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
+import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.TypeAnalyzer;
 import io.trino.sql.planner.TypeProvider;
 import io.trino.sql.relational.RowExpression;
 import io.trino.sql.relational.SqlToRowExpressionTranslator;
 import io.trino.sql.tree.Expression;
-import io.trino.testing.TestingSession;
-import io.trino.transaction.TransactionId;
-import org.testng.annotations.Test;
+import io.trino.transaction.TestingTransactionManager;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -38,21 +37,23 @@
 import java.util.stream.IntStream;
 
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.block.BlockAssertions.createLongSequenceBlock;
 import static io.trino.operator.project.PageFieldsToInputParametersRewriter.Result;
 import static io.trino.operator.project.PageFieldsToInputParametersRewriter.rewritePageFieldsToInputParameters;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.ExpressionTestUtils.createExpression;
-import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
+import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestPageFieldsToInputParametersRewriter
 {
-    private static final TypeAnalyzer TYPE_ANALYZER = createTestingTypeAnalyzer(PLANNER_CONTEXT);
-    private static final Session TEST_SESSION = TestingSession.testSessionBuilder()
-            .setTransactionId(TransactionId.create())
+    private static final TestingTransactionManager TRANSACTION_MANAGER = new TestingTransactionManager();
+    private static final PlannerContext PLANNER_CONTEXT = plannerContextBuilder()
+            .withTransactionManager(TRANSACTION_MANAGER)
             .build();
+    private static final TypeAnalyzer TYPE_ANALYZER = createTestingTypeAnalyzer(PLANNER_CONTEXT);
 
     @Test
     public void testEagerLoading()
@@ -138,7 +139,7 @@ private RowExpressionBuilder addSymbol(String name, Type type)
 
         private RowExpression buildExpression(String value)
         {
-            Expression expression = createExpression(value, PLANNER_CONTEXT, TypeProvider.copyOf(symbolTypes));
+            Expression expression = createExpression(value, TRANSACTION_MANAGER, PLANNER_CONTEXT, TypeProvider.copyOf(symbolTypes));
 
             return SqlToRowExpressionTranslator.translate(
                     expression,
diff --git a/core/trino-main/src/test/java/io/trino/operator/project/TestPageProcessor.java b/core/trino-main/src/test/java/io/trino/operator/project/TestPageProcessor.java
index 9f707b29bf8e..e8cae580be26 100644
--- a/core/trino-main/src/test/java/io/trino/operator/project/TestPageProcessor.java
+++ b/core/trino-main/src/test/java/io/trino/operator/project/TestPageProcessor.java
@@ -33,8 +33,9 @@
 import io.trino.sql.gen.ExpressionProfiler;
 import io.trino.sql.gen.PageFunctionCompiler;
 import io.trino.sql.relational.CallExpression;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -50,7 +51,7 @@
 import static io.trino.block.BlockAssertions.createLongSequenceBlock;
 import static io.trino.block.BlockAssertions.createSlicesBlock;
 import static io.trino.block.BlockAssertions.createStringsBlock;
-import static io.trino.execution.executor.PrioritizedSplitRunner.SPLIT_RUN_QUANTA;
+import static io.trino.execution.executor.timesharing.PrioritizedSplitRunner.SPLIT_RUN_QUANTA;
 import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
 import static io.trino.operator.PageAssertions.assertPageEquals;
 import static io.trino.operator.project.PageProcessor.MAX_BATCH_SIZE;
@@ -70,17 +71,19 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestPageProcessor
 {
     private final ScheduledExecutorService executor = newSingleThreadScheduledExecutor(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
@@ -274,7 +277,7 @@ public void testAdaptiveBatchSize()
 
         // process large page which will reduce batch size
         Slice[] slices = new Slice[(int) (MAX_BATCH_SIZE * 2.5)];
-        Arrays.fill(slices, Slices.allocate(1024));
+        Arrays.fill(slices, Slices.allocate(4096));
         Page inputPage = new Page(createSlicesBlock(slices));
 
         Iterator<Optional<Page>> output = processAndAssertRetainedPageSize(pageProcessor, new DriverYieldSignal(), inputPage);
@@ -316,7 +319,7 @@ public void testOptimisticProcessing()
 
         // process large page which will reduce batch size
         Slice[] slices = new Slice[(int) (MAX_BATCH_SIZE * 2.5)];
-        Arrays.fill(slices, Slices.allocate(1024));
+        Arrays.fill(slices, Slices.allocate(4096));
         Page inputPage = new Page(createSlicesBlock(slices));
 
         Iterator<Optional<Page>> output = processAndAssertRetainedPageSize(pageProcessor, inputPage);
@@ -356,9 +359,9 @@ public void testRetainedSize()
                 ImmutableList.of(new InputPageProjection(0, VARCHAR), new InputPageProjection(1, VARCHAR)),
                 OptionalInt.of(MAX_BATCH_SIZE));
 
-        // create 2 columns X 800 rows of strings with each string's size = 10KB
-        // this can force previouslyComputedResults to be saved given the page is 16MB in size
-        String value = join("", nCopies(10_000, "a"));
+        // create 2 columns X 800 rows of strings with each string's size = 30KB
+        // this can force previouslyComputedResults to be saved given the page is 48MB in size
+        String value = join("", nCopies(30_000, "a"));
         List<String> values = nCopies(800, value);
         Page inputPage = new Page(createStringsBlock(values), createStringsBlock(values));
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/AbstractTestExtract.java b/core/trino-main/src/test/java/io/trino/operator/scalar/AbstractTestExtract.java
deleted file mode 100644
index e25720198d85..000000000000
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/AbstractTestExtract.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Licensed 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 io.trino.operator.scalar;
-
-import com.google.common.base.CaseFormat;
-import io.trino.spi.TrinoException;
-import io.trino.sql.query.QueryAssertions;
-import io.trino.sql.tree.Extract;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.List;
-
-import static java.lang.String.format;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-public abstract class AbstractTestExtract
-{
-    protected QueryAssertions assertions;
-
-    @BeforeClass
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-    {
-        assertions.close();
-        assertions = null;
-    }
-
-    @Test
-    public void testTestCompleteness()
-            throws NoSuchMethodException
-    {
-        for (Extract.Field value : Extract.Field.values()) {
-            String testMethodName = "test" + CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, value.name());
-            this.getClass().getMethod(testMethodName);
-        }
-    }
-
-    @Test
-    public void testYear()
-    {
-        testUnsupportedExtract("YEAR");
-    }
-
-    @Test
-    public void testQuarter()
-    {
-        testUnsupportedExtract("QUARTER");
-    }
-
-    @Test
-    public void testMonth()
-    {
-        testUnsupportedExtract("MONTH");
-    }
-
-    @Test
-    public void testWeek()
-    {
-        testUnsupportedExtract("WEEK");
-    }
-
-    @Test
-    public void testDay()
-    {
-        testUnsupportedExtract("DAY");
-    }
-
-    @Test
-    public void testDayOfMonth()
-    {
-        testUnsupportedExtract("DAY_OF_MONTH");
-    }
-
-    @Test
-    public void testDayOfWeek()
-    {
-        testUnsupportedExtract("DAY_OF_WEEK");
-    }
-
-    @Test
-    public void testDow()
-    {
-        testUnsupportedExtract("DOW");
-    }
-
-    @Test
-    public void testDayOfYear()
-    {
-        testUnsupportedExtract("DAY_OF_YEAR");
-    }
-
-    @Test
-    public void testDoy()
-    {
-        testUnsupportedExtract("DOY");
-    }
-
-    @Test
-    public void testYearOfWeek()
-    {
-        testUnsupportedExtract("YEAR_OF_WEEK");
-    }
-
-    @Test
-    public void testYow()
-    {
-        testUnsupportedExtract("YOW");
-    }
-
-    @Test
-    public void testHour()
-    {
-        testUnsupportedExtract("HOUR");
-    }
-
-    @Test
-    public void testMinute()
-    {
-        testUnsupportedExtract("MINUTE");
-    }
-
-    @Test
-    public void testSecond()
-    {
-        testUnsupportedExtract("SECOND");
-    }
-
-    @Test
-    public void testTimezoneMinute()
-    {
-        testUnsupportedExtract("TIMEZONE_MINUTE");
-    }
-
-    @Test
-    public void testTimezoneHour()
-    {
-        testUnsupportedExtract("TIMEZONE_HOUR");
-    }
-
-    protected void testUnsupportedExtract(String extractField)
-    {
-        types().forEach(type -> {
-            String expression = format("EXTRACT(%s FROM CAST(NULL AS %s))", extractField, type);
-            assertThatThrownBy(() -> assertions.expression(expression).evaluate(), expression)
-                    .as(expression)
-                    .isInstanceOf(TrinoException.class)
-                    .hasMessageMatching(format("line 1:\\d+:\\Q Cannot extract %s from %s", extractField, type));
-        });
-    }
-
-    protected abstract List<String> types();
-}
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/AbstractTestRegexpFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/AbstractTestRegexpFunctions.java
index 6c532e2752fe..6aa8cec46086 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/AbstractTestRegexpFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/AbstractTestRegexpFunctions.java
@@ -178,7 +178,7 @@ public void testRegexpReplace()
                 .hasType(createVarcharType(7))
                 .isEqualTo("yxyxyxy");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_replace", "'xxx'", "'x'", "'\\'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_replace", "'xxx'", "'x'", "'\\'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
         assertThat(assertions.function("regexp_replace", "'xxx xxx xxx'", "'x'", "'$0'"))
@@ -209,13 +209,13 @@ public void testRegexpReplace()
                 .hasType(createVarcharType(175))
                 .isEqualTo("1a");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_replace", "'xxx'", "'x'", "'$1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_replace", "'xxx'", "'x'", "'$1'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_replace", "'xxx'", "'x'", "'$a'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_replace", "'xxx'", "'x'", "'$a'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_replace", "'xxx'", "'x'", "'$'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_replace", "'xxx'", "'x'", "'$'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
         assertThat(assertions.function("regexp_replace", "'wxyz'", "'(?<xyz>[xyz])'", "'${xyz}${xyz}'"))
@@ -234,13 +234,13 @@ public void testRegexpReplace()
                 .hasType(createVarcharType(39))
                 .isEqualTo("xyz");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_replace", "'xxx'", "'(?<name>x)'", "'${}'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_replace", "'xxx'", "'(?<name>x)'", "'${}'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_replace", "'xxx'", "'(?<name>x)'", "'${0}'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_replace", "'xxx'", "'(?<name>x)'", "'${0}'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_replace", "'xxx'", "'(?<name>x)'", "'${nam}'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_replace", "'xxx'", "'(?<name>x)'", "'${nam}'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
         assertThat(assertions.function("regexp_replace", "VARCHAR 'x'", "'.*'", "'xxxxx'"))
@@ -598,10 +598,10 @@ public void testRegexpExtract()
                 .hasType(createVarcharType(6))
                 .isEqualTo((Object) null);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_extract", "'Hello world bye'", "'\\b[a-z]([a-z]*)'", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_extract", "'Hello world bye'", "'\\b[a-z]([a-z]*)'", "-1")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_extract", "'Hello world bye'", "'\\b[a-z]([a-z]*)'", "2").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_extract", "'Hello world bye'", "'\\b[a-z]([a-z]*)'", "2")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
@@ -632,14 +632,14 @@ public void testRegexpExtractAll()
                 .hasType(new ArrayType(createVarcharType(15)))
                 .isEqualTo(Collections.<String>singletonList(null));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_extract_all", "'hello'", "'(.)'", "2").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_extract_all", "'hello'", "'(.)'", "2")::evaluate)
                 .hasMessage("Pattern has 1 groups. Cannot access group 2");
 
         assertThat(assertions.function("regexp_extract_all", "'12345'", "''"))
                 .hasType(new ArrayType(createVarcharType(5)))
                 .isEqualTo(ImmutableList.of("", "", "", "", "", ""));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_extract_all", "'12345'", "'('").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_extract_all", "'12345'", "'('")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
@@ -911,13 +911,13 @@ public void testRegexpPosition()
         assertThat(assertions.function("regexp_position", "'有朋$%X自9远方9来'", "'来'", "999"))
                 .isEqualTo(-1);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_position", "'有朋$%X自9远方9来'", "'来'", "-1", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_position", "'有朋$%X自9远方9来'", "'来'", "-1", "0")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_position", "'有朋$%X自9远方9来'", "'来'", "1", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_position", "'有朋$%X自9远方9来'", "'来'", "1", "0")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("regexp_position", "'有朋$%X自9远方9来'", "'来'", "1", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("regexp_position", "'有朋$%X自9远方9来'", "'来'", "1", "-1")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
         // sql in document
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayDistinct.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayDistinct.java
index 46ef750afeed..87784759a4f5 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayDistinct.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayDistinct.java
@@ -18,9 +18,9 @@
 import io.trino.metadata.InternalFunctionBundle;
 import io.trino.metadata.TestingFunctionResolution;
 import io.trino.operator.DriverYieldSignal;
-import io.trino.operator.aggregation.TypedSet;
 import io.trino.operator.project.PageProcessor;
 import io.trino.spi.Page;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.ScalarFunction;
@@ -31,10 +31,9 @@
 import io.trino.sql.gen.ExpressionCompiler;
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.RowExpression;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.type.BlockTypeOperators;
-import io.trino.type.BlockTypeOperators.BlockPositionEqual;
 import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
+import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -56,7 +55,6 @@
 import static com.google.common.base.Verify.verify;
 import static io.trino.jmh.Benchmarks.benchmark;
 import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
-import static io.trino.operator.aggregation.TypedSet.createEqualityTypedSet;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.relational.Expressions.field;
@@ -76,7 +74,7 @@ public class BenchmarkArrayDistinct
     private static final int NUM_TYPES = 1;
     private static final List<Type> TYPES = ImmutableList.of(VARCHAR);
     private static final BlockTypeOperators BLOCK_TYPE_OPERATORS = new BlockTypeOperators(new TypeOperators());
-    private static final BlockPositionEqual EQUAL_OPERATOR = BLOCK_TYPE_OPERATORS.getEqualOperator(VARCHAR);
+    private static final BlockPositionIsDistinctFrom DISTINCT_FROM_OPERATOR = BLOCK_TYPE_OPERATORS.getDistinctFromOperator(VARCHAR);
     private static final BlockPositionHashCode HASH_CODE_OPERATOR = BLOCK_TYPE_OPERATORS.getHashCodeOperator(VARCHAR);
 
     static {
@@ -117,7 +115,7 @@ public void setup()
                 Type elementType = TYPES.get(i);
                 ArrayType arrayType = new ArrayType(elementType);
                 projectionsBuilder.add(new CallExpression(
-                        functionResolution.resolveFunction(QualifiedName.of(name), fromTypes(arrayType)),
+                        functionResolution.resolveFunction(name, fromTypes(arrayType)),
                         ImmutableList.of(field(i, arrayType))));
                 blocks[i] = createChannel(POSITIONS, ARRAY_SIZE, arrayType);
             }
@@ -129,21 +127,21 @@ public void setup()
 
         private static Block createChannel(int positionCount, int arraySize, ArrayType arrayType)
         {
-            BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
+            ArrayBlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
             for (int position = 0; position < positionCount; position++) {
-                BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-                for (int i = 0; i < arraySize; i++) {
-                    if (arrayType.getElementType().getJavaType() == long.class) {
-                        arrayType.getElementType().writeLong(entryBuilder, ThreadLocalRandom.current().nextLong());
+                blockBuilder.buildEntry(elementBuilder -> {
+                    for (int i = 0; i < arraySize; i++) {
+                        if (arrayType.getElementType().getJavaType() == long.class) {
+                            arrayType.getElementType().writeLong(elementBuilder, ThreadLocalRandom.current().nextLong());
+                        }
+                        else if (arrayType.getElementType().equals(VARCHAR)) {
+                            arrayType.getElementType().writeSlice(elementBuilder, Slices.utf8Slice("test_string"));
+                        }
+                        else {
+                            throw new UnsupportedOperationException();
+                        }
                     }
-                    else if (arrayType.getElementType().equals(VARCHAR)) {
-                        arrayType.getElementType().writeSlice(entryBuilder, Slices.utf8Slice("test_string"));
-                    }
-                    else {
-                        throw new UnsupportedOperationException();
-                    }
-                }
-                blockBuilder.closeEntry();
+                });
             }
             return blockBuilder.build();
         }
@@ -178,11 +176,10 @@ public static Block oldArrayDistinct(@SqlType("array(varchar)") Block array)
             return array;
         }
 
-        TypedSet typedSet = createEqualityTypedSet(VARCHAR, EQUAL_OPERATOR, HASH_CODE_OPERATOR, array.getPositionCount(), "old_array_distinct");
+        BlockSet set = new BlockSet(VARCHAR, DISTINCT_FROM_OPERATOR, HASH_CODE_OPERATOR, array.getPositionCount());
         BlockBuilder distinctElementBlockBuilder = VARCHAR.createBlockBuilder(null, array.getPositionCount());
         for (int i = 0; i < array.getPositionCount(); i++) {
-            if (!typedSet.contains(array, i)) {
-                typedSet.add(array, i);
+            if (set.add(array, i)) {
                 VARCHAR.appendTo(array, i, distinctElementBlockBuilder);
             }
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayEqualOperator.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayEqualOperator.java
index 7f3fc622af95..ad1b318de708 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayEqualOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayEqualOperator.java
@@ -13,9 +13,10 @@
  */
 package io.trino.operator.scalar;
 
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.ArrayType;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -28,7 +29,6 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
-import org.testng.annotations.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.util.concurrent.ThreadLocalRandom;
@@ -86,18 +86,18 @@ public void setup()
         private static Block[] createChannels(int positionCount, int arraySize, ArrayType arrayType)
         {
             ThreadLocalRandom random = ThreadLocalRandom.current();
-            BlockBuilder leftBlockBuilder = arrayType.createBlockBuilder(null, positionCount);
-            BlockBuilder rightBlockBuilder = arrayType.createBlockBuilder(null, positionCount);
+            ArrayBlockBuilder leftBlockBuilder = arrayType.createBlockBuilder(null, positionCount);
+            ArrayBlockBuilder rightBlockBuilder = arrayType.createBlockBuilder(null, positionCount);
             for (int position = 0; position < positionCount; position++) {
-                BlockBuilder leftEntryBuilder = leftBlockBuilder.beginBlockEntry();
-                BlockBuilder rightEntryBuilder = rightBlockBuilder.beginBlockEntry();
-                for (int i = 0; i < arraySize - 1; i++) {
-                    addElement(arrayType.getElementType(), random, leftEntryBuilder, rightEntryBuilder, true);
-                }
-                // last element has a 50% chance of being equal
-                addElement(arrayType.getElementType(), random, leftEntryBuilder, rightEntryBuilder, random.nextBoolean());
-                leftBlockBuilder.closeEntry();
-                rightBlockBuilder.closeEntry();
+                leftBlockBuilder.buildEntry(leftElementBuilder -> {
+                    rightBlockBuilder.buildEntry(rightElementBuilder -> {
+                        for (int i = 0; i < arraySize - 1; i++) {
+                            addElement(arrayType.getElementType(), random, leftElementBuilder, rightElementBuilder, true);
+                        }
+                        // last element has a 50% chance of being equal
+                        addElement(arrayType.getElementType(), random, leftElementBuilder, rightElementBuilder, random.nextBoolean());
+                    });
+                });
             }
             return new Block[] {leftBlockBuilder.build(), rightBlockBuilder.build()};
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayFilter.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayFilter.java
index f1ad4b805550..c5cc24e2c5e8 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayFilter.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayFilter.java
@@ -22,6 +22,7 @@
 import io.trino.operator.DriverYieldSignal;
 import io.trino.operator.project.PageProcessor;
 import io.trino.spi.Page;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.BoundSignature;
@@ -37,7 +38,6 @@
 import io.trino.sql.relational.RowExpression;
 import io.trino.sql.relational.SpecialForm;
 import io.trino.sql.relational.VariableReferenceExpression;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.type.FunctionType;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -147,7 +147,7 @@ public void setup()
                 Type elementType = TYPES.get(i);
                 ArrayType arrayType = new ArrayType(elementType);
                 ResolvedFunction resolvedFunction = functionResolution.resolveFunction(
-                        QualifiedName.of(name),
+                        name,
                         fromTypes(arrayType, new FunctionType(ImmutableList.of(BIGINT), BOOLEAN)));
                 ResolvedFunction lessThan = functionResolution.resolveOperator(LESS_THAN, ImmutableList.of(BIGINT, BIGINT));
                 projectionsBuilder.add(new CallExpression(resolvedFunction, ImmutableList.of(
@@ -166,18 +166,18 @@ public void setup()
 
         private static Block createChannel(int positionCount, int arraySize, ArrayType arrayType)
         {
-            BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
+            ArrayBlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
             for (int position = 0; position < positionCount; position++) {
-                BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-                for (int i = 0; i < arraySize; i++) {
-                    if (arrayType.getElementType().getJavaType() == long.class) {
-                        arrayType.getElementType().writeLong(entryBuilder, ThreadLocalRandom.current().nextLong());
+                blockBuilder.buildEntry(elementBuilder -> {
+                    for (int i = 0; i < arraySize; i++) {
+                        if (arrayType.getElementType().getJavaType() == long.class) {
+                            arrayType.getElementType().writeLong(elementBuilder, ThreadLocalRandom.current().nextLong());
+                        }
+                        else {
+                            throw new UnsupportedOperationException();
+                        }
                     }
-                    else {
-                        throw new UnsupportedOperationException();
-                    }
-                }
-                blockBuilder.closeEntry();
+                });
             }
             return blockBuilder.build();
         }
@@ -213,9 +213,7 @@ public void setup()
             for (int i = 0; i < ROW_TYPES.size(); i++) {
                 Type elementType = ROW_TYPES.get(i);
                 ArrayType arrayType = new ArrayType(elementType);
-                ResolvedFunction resolvedFunction = functionResolution.resolveFunction(
-                        QualifiedName.of(name),
-                        fromTypes(arrayType, new FunctionType(ROW_TYPES, BOOLEAN)));
+                ResolvedFunction resolvedFunction = functionResolution.resolveFunction(name, fromTypes(arrayType, new FunctionType(ROW_TYPES, BOOLEAN)));
                 ResolvedFunction lessThan = functionResolution.resolveOperator(LESS_THAN, ImmutableList.of(BIGINT, BIGINT));
 
                 projectionsBuilder.add(new CallExpression(resolvedFunction, ImmutableList.of(
@@ -283,9 +281,8 @@ public static final class ExactArrayFilterFunction
 
         private ExactArrayFilterFunction()
         {
-            super(FunctionMetadata.scalarBuilder()
+            super(FunctionMetadata.scalarBuilder("exact_filter")
                     .signature(Signature.builder()
-                            .name("exact_filter")
                             .typeVariable("T")
                             .returnType(arrayType(new TypeSignature("T")))
                             .argumentType(arrayType(new TypeSignature("T")))
@@ -338,9 +335,8 @@ public static final class ExactArrayFilterObjectFunction
 
         private ExactArrayFilterObjectFunction()
         {
-            super(FunctionMetadata.scalarBuilder()
+            super(FunctionMetadata.scalarBuilder("exact_filter")
                     .signature(Signature.builder()
-                            .name("exact_filter")
                             .typeVariable("T")
                             .returnType(arrayType(new TypeSignature("T")))
                             .argumentType(arrayType(new TypeSignature("T")))
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayHashCodeOperator.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayHashCodeOperator.java
index 9d3d32100b70..a1b8d7672db9 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayHashCodeOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayHashCodeOperator.java
@@ -13,9 +13,10 @@
  */
 package io.trino.operator.scalar;
 
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.ArrayType;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -28,7 +29,6 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
-import org.testng.annotations.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.util.concurrent.ThreadLocalRandom;
@@ -81,13 +81,13 @@ public void setup()
 
         private static Block createChannel(int positionCount, int arraySize, ArrayType arrayType)
         {
-            BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
+            ArrayBlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
             for (int position = 0; position < positionCount; position++) {
-                BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-                for (int i = 0; i < arraySize; i++) {
-                    addElement(arrayType.getElementType(), ThreadLocalRandom.current(), entryBuilder);
-                }
-                blockBuilder.closeEntry();
+                blockBuilder.buildEntry(elementBuilder -> {
+                    for (int i = 0; i < arraySize; i++) {
+                        addElement(arrayType.getElementType(), ThreadLocalRandom.current(), elementBuilder);
+                    }
+                });
             }
             return blockBuilder.build();
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayIntersect.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayIntersect.java
index f690efd433e6..351318f6bda2 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayIntersect.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayIntersect.java
@@ -19,14 +19,14 @@
 import io.trino.operator.DriverYieldSignal;
 import io.trino.operator.project.PageProcessor;
 import io.trino.spi.Page;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.ExpressionCompiler;
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.RowExpression;
-import io.trino.sql.tree.QualifiedName;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -39,7 +39,6 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
-import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -117,7 +116,7 @@ public void setup()
             TestingFunctionResolution functionResolution = new TestingFunctionResolution();
             ArrayType arrayType = new ArrayType(elementType);
             ImmutableList<RowExpression> projections = ImmutableList.of(new CallExpression(
-                    functionResolution.resolveFunction(QualifiedName.of(name), fromTypes(arrayType, arrayType)),
+                    functionResolution.resolveFunction(name, fromTypes(arrayType, arrayType)),
                     ImmutableList.of(field(0, arrayType), field(1, arrayType))));
 
             ExpressionCompiler compiler = functionResolution.getExpressionCompiler();
@@ -129,28 +128,28 @@ public void setup()
         private static Block createChannel(int positionCount, int arraySize, Type elementType)
         {
             ArrayType arrayType = new ArrayType(elementType);
-            BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
+            ArrayBlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
             for (int position = 0; position < positionCount; position++) {
-                BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-                for (int i = 0; i < arraySize; i++) {
-                    if (elementType.getJavaType() == long.class) {
-                        elementType.writeLong(entryBuilder, ThreadLocalRandom.current().nextLong() % arraySize);
+                blockBuilder.buildEntry(elementBuilder -> {
+                    for (int i = 0; i < arraySize; i++) {
+                        if (elementType.getJavaType() == long.class) {
+                            elementType.writeLong(elementBuilder, ThreadLocalRandom.current().nextLong() % arraySize);
+                        }
+                        else if (elementType.getJavaType() == double.class) {
+                            elementType.writeDouble(elementBuilder, ThreadLocalRandom.current().nextDouble() % arraySize);
+                        }
+                        else if (elementType.getJavaType() == boolean.class) {
+                            elementType.writeBoolean(elementBuilder, ThreadLocalRandom.current().nextBoolean());
+                        }
+                        else if (elementType.equals(VARCHAR)) {
+                            // make sure the size of a varchar is rather small; otherwise the aggregated slice may overflow
+                            elementType.writeSlice(elementBuilder, Slices.utf8Slice(Long.toString(ThreadLocalRandom.current().nextLong() % arraySize)));
+                        }
+                        else {
+                            throw new UnsupportedOperationException();
+                        }
                     }
-                    else if (elementType.getJavaType() == double.class) {
-                        elementType.writeDouble(entryBuilder, ThreadLocalRandom.current().nextDouble() % arraySize);
-                    }
-                    else if (elementType.getJavaType() == boolean.class) {
-                        elementType.writeBoolean(entryBuilder, ThreadLocalRandom.current().nextBoolean());
-                    }
-                    else if (elementType.equals(VARCHAR)) {
-                        // make sure the size of a varchar is rather small; otherwise the aggregated slice may overflow
-                        elementType.writeSlice(entryBuilder, Slices.utf8Slice(Long.toString(ThreadLocalRandom.current().nextLong() % arraySize)));
-                    }
-                    else {
-                        throw new UnsupportedOperationException();
-                    }
-                }
-                blockBuilder.closeEntry();
+                });
             }
             return blockBuilder.build();
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayJoin.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayJoin.java
index 64280c0dc6bc..24d8b3df47f7 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayJoin.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayJoin.java
@@ -20,12 +20,12 @@
 import io.trino.operator.DriverYieldSignal;
 import io.trino.operator.project.PageProcessor;
 import io.trino.spi.Page;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.RowExpression;
-import io.trino.sql.tree.QualifiedName;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -35,7 +35,6 @@
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
-import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -86,7 +85,7 @@ public void setup()
             TestingFunctionResolution functionResolution = new TestingFunctionResolution();
 
             List<RowExpression> projections = ImmutableList.of(new CallExpression(
-                    functionResolution.resolveFunction(QualifiedName.of("array_join"), fromTypes(new ArrayType(BIGINT), VARCHAR)),
+                    functionResolution.resolveFunction("array_join", fromTypes(new ArrayType(BIGINT), VARCHAR)),
                     ImmutableList.of(field(0, new ArrayType(BIGINT)), constant(Slices.wrappedBuffer(",".getBytes(UTF_8)), VARCHAR))));
 
             pageProcessor = functionResolution.getExpressionCompiler()
@@ -100,13 +99,13 @@ private static Block createChannel(int positionCount, int arraySize)
         {
             ArrayType arrayType = new ArrayType(BIGINT);
 
-            BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
+            ArrayBlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
             for (int position = 0; position < positionCount; position++) {
-                BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-                for (int i = 0; i < arraySize; i++) {
-                    arrayType.getElementType().writeLong(entryBuilder, ThreadLocalRandom.current().nextLong());
-                }
-                blockBuilder.closeEntry();
+                blockBuilder.buildEntry(elementBuilder -> {
+                    for (int i = 0; i < arraySize; i++) {
+                        arrayType.getElementType().writeLong(elementBuilder, ThreadLocalRandom.current().nextLong());
+                    }
+                });
             }
             return blockBuilder.build();
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArraySort.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArraySort.java
index daa89ec75281..353f539d713f 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArraySort.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArraySort.java
@@ -21,6 +21,7 @@
 import io.trino.operator.DriverYieldSignal;
 import io.trino.operator.project.PageProcessor;
 import io.trino.spi.Page;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.ScalarFunction;
@@ -31,7 +32,6 @@
 import io.trino.sql.gen.ExpressionCompiler;
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.RowExpression;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.type.BlockTypeOperators;
 import io.trino.type.BlockTypeOperators.BlockPositionComparison;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -111,7 +111,7 @@ public void setup()
                 Type elementType = TYPES.get(i);
                 ArrayType arrayType = new ArrayType(elementType);
                 projectionsBuilder.add(new CallExpression(
-                        functionResolution.resolveFunction(QualifiedName.of(name), fromTypes(arrayType)),
+                        functionResolution.resolveFunction(name, fromTypes(arrayType)),
                         ImmutableList.of(field(i, arrayType))));
                 blocks[i] = createChannel(POSITIONS, ARRAY_SIZE, arrayType);
             }
@@ -123,21 +123,21 @@ public void setup()
 
         private static Block createChannel(int positionCount, int arraySize, ArrayType arrayType)
         {
-            BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
+            ArrayBlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
             for (int position = 0; position < positionCount; position++) {
-                BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-                for (int i = 0; i < arraySize; i++) {
-                    if (arrayType.getElementType().getJavaType() == long.class) {
-                        arrayType.getElementType().writeLong(entryBuilder, ThreadLocalRandom.current().nextLong());
+                blockBuilder.buildEntry(elementBuilder -> {
+                    for (int i = 0; i < arraySize; i++) {
+                        if (arrayType.getElementType().getJavaType() == long.class) {
+                            arrayType.getElementType().writeLong(elementBuilder, ThreadLocalRandom.current().nextLong());
+                        }
+                        else if (arrayType.getElementType().equals(VARCHAR)) {
+                            arrayType.getElementType().writeSlice(elementBuilder, Slices.utf8Slice("test_string"));
+                        }
+                        else {
+                            throw new UnsupportedOperationException();
+                        }
                     }
-                    else if (arrayType.getElementType().equals(VARCHAR)) {
-                        arrayType.getElementType().writeSlice(entryBuilder, Slices.utf8Slice("test_string"));
-                    }
-                    else {
-                        throw new UnsupportedOperationException();
-                    }
-                }
-                blockBuilder.closeEntry();
+                });
             }
             return blockBuilder.build();
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayTransform.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayTransform.java
index 89d71455c1ba..4cd61f1ed735 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayTransform.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkArrayTransform.java
@@ -20,8 +20,8 @@
 import io.trino.operator.project.PageProcessor;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.ExpressionCompiler;
@@ -31,7 +31,6 @@
 import io.trino.sql.relational.LambdaDefinitionExpression;
 import io.trino.sql.relational.RowExpression;
 import io.trino.sql.relational.VariableReferenceExpression;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.type.FunctionType;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -108,9 +107,7 @@ public void setup()
                 Type elementType = TYPES.get(i);
                 ArrayType arrayType = new ArrayType(elementType);
                 projectionsBuilder.add(new CallExpression(
-                        functionResolution.resolveFunction(
-                                QualifiedName.of("transform"),
-                                fromTypes(arrayType, new FunctionType(ImmutableList.of(BIGINT), BOOLEAN))),
+                        functionResolution.resolveFunction("transform", fromTypes(arrayType, new FunctionType(ImmutableList.of(BIGINT), BOOLEAN))),
                         ImmutableList.of(
                                 new InputReferenceExpression(0, arrayType),
                                 new LambdaDefinitionExpression(
@@ -130,18 +127,18 @@ public void setup()
 
         private static Block createChannel(int positionCount, int arraySize, ArrayType arrayType)
         {
-            BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
+            ArrayBlockBuilder blockBuilder = arrayType.createBlockBuilder(null, positionCount);
             for (int position = 0; position < positionCount; position++) {
-                BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-                for (int i = 0; i < arraySize; i++) {
-                    if (arrayType.getElementType().getJavaType() == long.class) {
-                        arrayType.getElementType().writeLong(entryBuilder, ThreadLocalRandom.current().nextLong());
+                blockBuilder.buildEntry(elementBuilder -> {
+                    for (int i = 0; i < arraySize; i++) {
+                        if (arrayType.getElementType().getJavaType() == long.class) {
+                            arrayType.getElementType().writeLong(elementBuilder, ThreadLocalRandom.current().nextLong());
+                        }
+                        else {
+                            throw new UnsupportedOperationException();
+                        }
                     }
-                    else {
-                        throw new UnsupportedOperationException();
-                    }
-                }
-                blockBuilder.closeEntry();
+                });
             }
             return blockBuilder.build();
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkEqualOperator.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkEqualOperator.java
index 82df079a588e..137a9df3385e 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkEqualOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkEqualOperator.java
@@ -16,6 +16,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -29,7 +30,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkHashCodeOperator.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkHashCodeOperator.java
index 66c94f04d4a4..eda68c732c23 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkHashCodeOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkHashCodeOperator.java
@@ -16,6 +16,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -29,7 +30,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonFunctions.java
index 1f8fec41b6f9..cfc0a3818efb 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonFunctions.java
@@ -33,9 +33,9 @@
 import io.trino.spi.type.TypeId;
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.RowExpression;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.testing.TestingSession;
 import io.trino.type.JsonPath2016Type;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -49,7 +49,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.options.WarmupMode;
-import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -181,7 +180,7 @@ private static PageProcessor createJsonValuePageProcessor(int depth, TestingFunc
             }
             List<RowExpression> jsonValueProjection = ImmutableList.of(new CallExpression(
                     functionResolution.resolveFunction(
-                            QualifiedName.of(JSON_VALUE_FUNCTION_NAME),
+                            JSON_VALUE_FUNCTION_NAME,
                             fromTypes(ImmutableList.of(
                                     JSON_2016,
                                     jsonPath2016Type,
@@ -192,7 +191,7 @@ private static PageProcessor createJsonValuePageProcessor(int depth, TestingFunc
                                     VARCHAR))),
                     ImmutableList.of(
                             new CallExpression(
-                                    functionResolution.resolveFunction(QualifiedName.of(VARCHAR_TO_JSON), fromTypes(VARCHAR, BOOLEAN)),
+                                    functionResolution.resolveFunction(VARCHAR_TO_JSON, fromTypes(VARCHAR, BOOLEAN)),
                                     ImmutableList.of(field(0, VARCHAR), constant(true, BOOLEAN))),
                             constant(new IrJsonPath(false, pathRoot), jsonPath2016Type),
                             constantNull(JSON_NO_PARAMETERS_ROW_TYPE),
@@ -216,7 +215,7 @@ private static PageProcessor createJsonExtractScalarPageProcessor(int depth, Tes
             }
             Type boundedVarcharType = createVarcharType(100);
             List<RowExpression> jsonExtractScalarProjection = ImmutableList.of(new CallExpression(
-                    functionResolution.resolveFunction(QualifiedName.of("json_extract_scalar"), fromTypes(ImmutableList.of(boundedVarcharType, JSON_PATH))),
+                    functionResolution.resolveFunction("json_extract_scalar", fromTypes(ImmutableList.of(boundedVarcharType, JSON_PATH))),
                     ImmutableList.of(field(0, boundedVarcharType), constant(new JsonPath(pathString.toString()), JSON_PATH))));
 
             return functionResolution.getExpressionCompiler()
@@ -232,7 +231,7 @@ private static PageProcessor createJsonQueryPageProcessor(int depth, TestingFunc
             }
             List<RowExpression> jsonQueryProjection = ImmutableList.of(new CallExpression(
                     functionResolution.resolveFunction(
-                            QualifiedName.of(JSON_QUERY_FUNCTION_NAME),
+                            JSON_QUERY_FUNCTION_NAME,
                             fromTypes(ImmutableList.of(
                                     JSON_2016,
                                     jsonPath2016Type,
@@ -242,7 +241,7 @@ private static PageProcessor createJsonQueryPageProcessor(int depth, TestingFunc
                                     TINYINT))),
                     ImmutableList.of(
                             new CallExpression(
-                                    functionResolution.resolveFunction(QualifiedName.of(VARCHAR_TO_JSON), fromTypes(VARCHAR, BOOLEAN)),
+                                    functionResolution.resolveFunction(VARCHAR_TO_JSON, fromTypes(VARCHAR, BOOLEAN)),
                                     ImmutableList.of(field(0, VARCHAR), constant(true, BOOLEAN))),
                             constant(new IrJsonPath(false, pathRoot), jsonPath2016Type),
                             constantNull(JSON_NO_PARAMETERS_ROW_TYPE),
@@ -265,7 +264,7 @@ private static PageProcessor createJsonExtractPageProcessor(int depth, TestingFu
             }
             Type boundedVarcharType = createVarcharType(100);
             List<RowExpression> jsonExtractScalarProjection = ImmutableList.of(new CallExpression(
-                    functionResolution.resolveFunction(QualifiedName.of("json_extract"), fromTypes(ImmutableList.of(boundedVarcharType, JSON_PATH))),
+                    functionResolution.resolveFunction("json_extract", fromTypes(ImmutableList.of(boundedVarcharType, JSON_PATH))),
                     ImmutableList.of(field(0, boundedVarcharType), constant(new JsonPath(pathString.toString()), JSON_PATH))));
 
             return functionResolution.getExpressionCompiler()
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonPathBinaryOperators.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonPathBinaryOperators.java
index 840999375d47..bce3212f89ff 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonPathBinaryOperators.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonPathBinaryOperators.java
@@ -35,9 +35,9 @@
 import io.trino.spi.type.TypeId;
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.RowExpression;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.testing.TestingSession;
 import io.trino.type.JsonPath2016Type;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -49,7 +49,6 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
-import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -150,7 +149,7 @@ private static PageProcessor createJsonValuePageProcessor()
                     Optional.empty());
             List<RowExpression> jsonValueProjection = ImmutableList.of(new CallExpression(
                     functionResolution.resolveFunction(
-                            QualifiedName.of(JSON_VALUE_FUNCTION_NAME),
+                            JSON_VALUE_FUNCTION_NAME,
                             fromTypes(ImmutableList.of(
                                     JSON_2016,
                                     jsonPath2016Type,
@@ -161,7 +160,7 @@ private static PageProcessor createJsonValuePageProcessor()
                                     VARCHAR))),
                     ImmutableList.of(
                             new CallExpression(
-                                    functionResolution.resolveFunction(QualifiedName.of(VARCHAR_TO_JSON), fromTypes(VARCHAR, BOOLEAN)),
+                                    functionResolution.resolveFunction(VARCHAR_TO_JSON, fromTypes(VARCHAR, BOOLEAN)),
                                     ImmutableList.of(field(0, VARCHAR), constant(true, BOOLEAN))),
                             constant(new IrJsonPath(false, path), jsonPath2016Type),
                             constantNull(JSON_NO_PARAMETERS_ROW_TYPE),
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonToArrayCast.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonToArrayCast.java
index 0d1cb166ec82..1274391cd103 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonToArrayCast.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonToArrayCast.java
@@ -27,6 +27,7 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.RowExpression;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -38,7 +39,6 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.runner.options.WarmupMode;
-import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonToMapCast.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonToMapCast.java
index 8bb2df88515d..c2a958142ae9 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonToMapCast.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkJsonToMapCast.java
@@ -27,6 +27,7 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.RowExpression;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -38,7 +39,6 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.runner.options.WarmupMode;
-import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkLike.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkLike.java
index 7aad0cfce2dd..79ef7aa129f4 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkLike.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkLike.java
@@ -40,6 +40,7 @@
 
 import java.util.Optional;
 
+import static com.google.common.base.Strings.repeat;
 import static io.airlift.joni.constants.MetaChar.INEFFECTIVE_META_CHAR;
 import static io.airlift.joni.constants.SyntaxProperties.OP_ASTERISK_ZERO_INF;
 import static io.airlift.joni.constants.SyntaxProperties.OP_DOT_ANYCHAR;
@@ -60,6 +61,12 @@
 @Measurement(iterations = 30, time = 500, timeUnit = MILLISECONDS)
 public class BenchmarkLike
 {
+    private static final String LONG_STRING = repeat("a", 100) +
+                                              repeat("b", 100) +
+                                              repeat("a", 100) +
+                                              repeat("b", 100) +
+                                              "the quick brown fox jumps over the lazy dog";
+
     private static final Syntax SYNTAX = new Syntax(
             OP_DOT_ANYCHAR | OP_ASTERISK_ZERO_INF | OP_LINE_ANCHOR,
             0,
@@ -73,51 +80,65 @@ public class BenchmarkLike
                     INEFFECTIVE_META_CHAR,          /* one or more time '+' */
                     INEFFECTIVE_META_CHAR));        /* anychar anytime */
 
+    public enum BenchmarkCase
+    {
+        ANY("%", LONG_STRING),
+        WILDCARD_PREFIX("_%", LONG_STRING),
+        WILDCARD_SUFFIX("%_", LONG_STRING),
+        PREFIX("the%", "the quick brown fox jumps over the lazy dog"),
+        SUFFIX("%dog", "the quick brown fox jumps over the lazy dog"),
+        FIXED_WILDCARD("_____", "abcdef"),
+        SHORT_TOKENS_1("%a%b%a%b%", LONG_STRING),
+        SHORT_TOKENS_2("%the%quick%brown%fox%jumps%over%the%lazy%dog%", LONG_STRING),
+        SHORT_TOKEN("%the%", LONG_STRING),
+        LONG_TOKENS_1("%aaaaaaaaab%bbbbbbbbba%aaaaaaaaab%bbbbbbbbbt%", LONG_STRING),
+        LONG_TOKENS_2("%aaaaaaaaaaaaaaaaaaaaaaaaaa%aaaaaaaaaaaaaaaaaaaaaaaaaathe%", LONG_STRING),
+        LONG_TOKEN_1("%bbbbbbbbbbbbbbbthe%", LONG_STRING),
+        LONG_TOKEN_2("%the quick brown fox%", LONG_STRING),
+        LONG_TOKEN_3("%aaaaaaaxaaaaaa%", LONG_STRING),
+        SHORT_TOKENS_WITH_LONG_SKIP("%the%dog%", LONG_STRING);
+
+        private final String pattern;
+        private final String text;
+
+        BenchmarkCase(String pattern, String text)
+        {
+            this.pattern = pattern;
+            this.text = text;
+        }
+
+        public String pattern()
+        {
+            return pattern;
+        }
+
+        public String text()
+        {
+            return text;
+        }
+    }
+
     @State(Thread)
     public static class Data
     {
-        @Param({
-                "%",
-                "_%",
-                "%_",
-                "abc%",
-                "%abc",
-                "_____",
-                "abc%def%ghi",
-                "%abc%def%",
-                "%a%a%a%a%",
-                "%aaaaaaaaaaaaaaaaaaaaaaaaaa%"
-        })
-        private String pattern;
+        @Param
+        private BenchmarkCase benchmarkCase;
 
         private Slice data;
         private byte[] bytes;
         private JoniRegexp joniPattern;
-        private LikeMatcher dfaMatcher;
-        private LikeMatcher nfaMatcher;
+        private LikeMatcher optimizedMatcher;
+        private LikeMatcher nonOptimizedMatcher;
 
         @Setup
         public void setup()
         {
-            data = Slices.utf8Slice(
-                    switch (pattern) {
-                        case "%" -> "qeroighqeorhgqerhb2eriuyerqiubgierubgleuqrbgilquebriuqebryqebrhqerhqsnajkbcowuhet";
-                        case "_%", "%_" -> "qeroighqeorhgqerhb2eriuyerqiubgierubgleuqrbgilquebriuqebryqebrhqerhqsnajkbcowuhet";
-                        case "abc%" -> "abcqeroighqeorhgqerhb2eriuyerqiubgierubgleuqrbgilquebriuqebryqebrhqerhqsnajkbcowuhet";
-                        case "%abc" -> "qeroighqeorhgqerhb2eriuyerqiubgierubgleuqrbgilquebriuqebryqebrhqerhqsnajkbcowuhetabc";
-                        case "_____" -> "abcde";
-                        case "abc%def%ghi" -> "abc qeroighqeorhgqerhb2eriuyerqiubgier def ubgleuqrbgilquebriuqebryqebrhqerhqsnajkbcowuhet ghi";
-                        case "%abc%def%" -> "fdnbqerbfklerqbgqjerbgkr abc qeroighqeorhgqerhb2eriuyerqiubgier def ubgleuqrbgilquebriuqebryqebrhqerhqsnajkbcowuhet";
-                        case "%a%a%a%a%" -> "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-                        case "%aaaaaaaaaaaaaaaaaaaaaaaaaa%" -> "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-                        default -> throw new IllegalArgumentException("Unknown pattern: " + pattern);
-                    });
-
-            dfaMatcher = LikeMatcher.compile(pattern, Optional.empty(), true);
-            nfaMatcher = LikeMatcher.compile(pattern, Optional.empty(), false);
-            joniPattern = compileJoni(Slices.utf8Slice(pattern).toStringUtf8(), '0', false);
-
-            bytes = data.getBytes();
+            optimizedMatcher = LikeMatcher.compile(benchmarkCase.pattern(), Optional.empty(), true);
+            nonOptimizedMatcher = LikeMatcher.compile(benchmarkCase.pattern(), Optional.empty(), false);
+            joniPattern = compileJoni(benchmarkCase.pattern(), '0', false);
+
+            bytes = benchmarkCase.text().getBytes(UTF_8);
+            data = Slices.wrappedBuffer(bytes);
         }
     }
 
@@ -128,67 +149,59 @@ public boolean matchJoni(Data data)
     }
 
     @Benchmark
-    public boolean matchDfa(Data data)
+    public boolean matchOptimized(Data data)
     {
-        return data.dfaMatcher.match(data.bytes, 0, data.bytes.length);
+        return data.optimizedMatcher.match(data.bytes, 0, data.bytes.length);
     }
 
     @Benchmark
-    public boolean matchNfa(Data data)
+    public boolean matchNonOptimized(Data data)
     {
-        return data.nfaMatcher.match(data.bytes, 0, data.bytes.length);
+        return data.nonOptimizedMatcher.match(data.bytes, 0, data.bytes.length);
     }
 
     @Benchmark
     public JoniRegexp compileJoni(Data data)
     {
-        return compileJoni(data.pattern, (char) 0, false);
+        return compileJoni(data.benchmarkCase.pattern(), (char) 0, false);
     }
 
     @Benchmark
-    public LikeMatcher compileDfa(Data data)
+    public LikeMatcher compileOptimized(Data data)
     {
-        return LikeMatcher.compile(data.pattern, Optional.empty(), true);
+        return LikeMatcher.compile(data.benchmarkCase.pattern(), Optional.empty(), true);
     }
 
     @Benchmark
-    public LikeMatcher compileNfa(Data data)
+    public LikeMatcher compileNonOptimized(Data data)
     {
-        return LikeMatcher.compile(data.pattern, Optional.empty(), false);
+        return LikeMatcher.compile(data.benchmarkCase.pattern(), Optional.empty(), false);
     }
 
     @Benchmark
-    public boolean allJoni(Data data)
+    public boolean dynamicJoni(Data data)
     {
-        return likeVarchar(data.data, compileJoni(Slices.utf8Slice(data.pattern).toStringUtf8(), '0', false));
+        return likeVarchar(data.data, compileJoni(Slices.utf8Slice(data.benchmarkCase.pattern()).toStringUtf8(), '0', false));
     }
 
     @Benchmark
-    public boolean allDfa(Data data)
+    public boolean dynamicOptimized(Data data)
     {
-        return LikeMatcher.compile(data.pattern, Optional.empty(), true)
+        return LikeMatcher.compile(data.benchmarkCase.pattern(), Optional.empty(), true)
                 .match(data.bytes, 0, data.bytes.length);
     }
 
     @Benchmark
-    public boolean allNfa(Data data)
+    public boolean dynamicNonOptimized(Data data)
     {
-        return LikeMatcher.compile(data.pattern, Optional.empty(), false)
+        return LikeMatcher.compile(data.benchmarkCase.pattern(), Optional.empty(), false)
                 .match(data.bytes, 0, data.bytes.length);
     }
 
     public static boolean likeVarchar(Slice value, JoniRegexp pattern)
     {
-        Matcher matcher;
-        int offset;
-        if (value.hasByteArray()) {
-            offset = value.byteArrayOffset();
-            matcher = pattern.regex().matcher(value.byteArray(), offset, offset + value.length());
-        }
-        else {
-            offset = 0;
-            matcher = pattern.matcher(value.getBytes());
-        }
+        int offset = value.byteArrayOffset();
+        Matcher matcher = pattern.regex().matcher(value.byteArray(), offset, offset + value.length());
         return matcher.match(offset, offset + value.length(), Option.NONE) != -1;
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkMapConcat.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkMapConcat.java
index 4367384b11fd..daea7eecc4d8 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkMapConcat.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkMapConcat.java
@@ -26,7 +26,6 @@
 import io.trino.sql.gen.ExpressionCompiler;
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.RowExpression;
-import io.trino.sql.tree.QualifiedName;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -134,7 +133,7 @@ public void setup()
             ImmutableList.Builder<RowExpression> projectionsBuilder = ImmutableList.builder();
 
             projectionsBuilder.add(new CallExpression(
-                    functionResolution.resolveFunction(QualifiedName.of(name), fromTypes(mapType, mapType)),
+                    functionResolution.resolveFunction(name, fromTypes(mapType, mapType)),
                     ImmutableList.of(field(0, mapType), field(1, mapType))));
 
             ImmutableList<RowExpression> projections = projectionsBuilder.build();
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkRowEqualOperator.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkRowEqualOperator.java
index f22756ae3dad..39e775c227b6 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkRowEqualOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkRowEqualOperator.java
@@ -15,9 +15,10 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.RowType.Field;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -31,7 +32,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.util.List;
@@ -91,20 +91,20 @@ public void setup()
         private static Block[] createChannels(int positionCount, RowType rowType)
         {
             ThreadLocalRandom random = ThreadLocalRandom.current();
-            BlockBuilder leftBlockBuilder = rowType.createBlockBuilder(null, positionCount);
-            BlockBuilder rightBlockBuilder = rowType.createBlockBuilder(null, positionCount);
+            RowBlockBuilder leftBlockBuilder = rowType.createBlockBuilder(null, positionCount);
+            RowBlockBuilder rightBlockBuilder = rowType.createBlockBuilder(null, positionCount);
             for (int position = 0; position < positionCount; position++) {
-                BlockBuilder leftEntryBuilder = leftBlockBuilder.beginBlockEntry();
-                BlockBuilder rightEntryBuilder = rightBlockBuilder.beginBlockEntry();
-
-                List<Field> fields = rowType.getFields();
-                for (int i = 0; i < fields.size() - 1; i++) {
-                    addElement(fields.get(i).getType(), random, leftEntryBuilder, rightEntryBuilder, true);
-                }
-                // last field has a 50% chance of being equal
-                addElement(fields.get(fields.size() - 1).getType(), random, leftEntryBuilder, rightEntryBuilder, random.nextBoolean());
-                leftBlockBuilder.closeEntry();
-                rightBlockBuilder.closeEntry();
+                leftBlockBuilder.buildEntry(leftFieldBuilders -> {
+                    rightBlockBuilder.buildEntry(rightFieldBuilders -> {
+                        List<Field> fields = rowType.getFields();
+                        for (int i = 0; i < fields.size() - 1; i++) {
+                            addElement(fields.get(i).getType(), random, leftFieldBuilders.get(i), rightFieldBuilders.get(i), true);
+                        }
+                        // last field has a 50% chance of being equal
+                        int lastIndex = fields.size() - 1;
+                        addElement(fields.get(lastIndex).getType(), random, leftFieldBuilders.get(lastIndex), rightFieldBuilders.get(lastIndex), random.nextBoolean());
+                    });
+                });
             }
             return new Block[] {leftBlockBuilder.build(), rightBlockBuilder.build()};
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkRowHashCodeOperator.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkRowHashCodeOperator.java
index 926b546b3f19..9ba55414e4c4 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkRowHashCodeOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkRowHashCodeOperator.java
@@ -15,9 +15,10 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.RowType.Field;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -31,7 +32,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.util.List;
@@ -86,15 +86,15 @@ public void setup()
         private static Block createChannel(int positionCount, RowType rowType)
         {
             ThreadLocalRandom random = ThreadLocalRandom.current();
-            BlockBuilder blockBuilder = rowType.createBlockBuilder(null, positionCount);
+            RowBlockBuilder blockBuilder = rowType.createBlockBuilder(null, positionCount);
             for (int position = 0; position < positionCount; position++) {
-                BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-
-                List<Field> fields = rowType.getFields();
-                for (Field field : fields) {
-                    addElement(field.getType(), random, entryBuilder);
-                }
-                blockBuilder.closeEntry();
+                blockBuilder.buildEntry(fieldBuilders -> {
+                    List<Field> fields = rowType.getFields();
+                    for (int i = 0; i < fields.size(); i++) {
+                        Field field = fields.get(i);
+                        addElement(field.getType(), random, fieldBuilders.get(i));
+                    }
+                });
             }
             return blockBuilder.build();
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkRowToRowCast.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkRowToRowCast.java
index eeab47e8c9dc..8718efcaaae6 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkRowToRowCast.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkRowToRowCast.java
@@ -26,6 +26,7 @@
 import io.trino.spi.type.VarcharType;
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.RowExpression;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -35,7 +36,6 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.runner.options.WarmupMode;
-import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -97,7 +97,7 @@ public void setup()
             Block[] fieldBlocks = fromFieldTypes.stream()
                     .map(type -> createBlock(POSITION_COUNT, type))
                     .toArray(Block[]::new);
-            Block rowBlock = fromFieldBlocks(POSITION_COUNT, Optional.empty(), fieldBlocks);
+            Block rowBlock = fromFieldBlocks(POSITION_COUNT, fieldBlocks);
 
             page = new Page(rowBlock);
         }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkStringFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkStringFunctions.java
index 3cfb4ac194ac..c0afad9f7aa2 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkStringFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkStringFunctions.java
@@ -15,7 +15,6 @@
 
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -211,11 +210,11 @@ public static class WhitespaceData
         public void setup()
         {
             Slice whitespace = createRandomUtf8Slice(ascii ? ASCII_WHITESPACE : ALL_WHITESPACE, length + 1);
-            leftWhitespace = Slices.copyOf(whitespace);
+            leftWhitespace = whitespace.copy();
             leftWhitespace.setByte(leftWhitespace.length() - 1, 'X');
-            rightWhitespace = Slices.copyOf(whitespace);
+            rightWhitespace = whitespace.copy();
             rightWhitespace.setByte(0, 'X');
-            bothWhitespace = Slices.copyOf(whitespace);
+            bothWhitespace = whitespace.copy();
             bothWhitespace.setByte(length / 2, 'X');
         }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkTransformKey.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkTransformKey.java
index 34a8fbd670b1..d62bc8f186d9 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkTransformKey.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkTransformKey.java
@@ -22,14 +22,13 @@
 import io.trino.operator.project.PageProcessor;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.ExpressionCompiler;
 import io.trino.sql.relational.LambdaDefinitionExpression;
 import io.trino.sql.relational.RowExpression;
 import io.trino.sql.relational.VariableReferenceExpression;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.type.FunctionType;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -119,7 +118,7 @@ public void setup()
             }
             MapType mapType = mapType(elementType, elementType);
             ResolvedFunction resolvedFunction = functionResolution.resolveFunction(
-                    QualifiedName.of(name),
+                    name,
                     fromTypes(mapType, new FunctionType(ImmutableList.of(elementType, elementType), elementType)));
             ResolvedFunction add = functionResolution.resolveOperator(ADD, ImmutableList.of(elementType, elementType));
             projectionsBuilder.add(call(resolvedFunction, ImmutableList.of(
@@ -139,24 +138,24 @@ public void setup()
 
         private static Block createChannel(int positionCount, MapType mapType, Type elementType)
         {
-            BlockBuilder mapBlockBuilder = mapType.createBlockBuilder(null, 1);
-            BlockBuilder singleMapBlockWriter = mapBlockBuilder.beginBlockEntry();
-            Object value;
-            for (int position = 0; position < positionCount; position++) {
-                if (elementType.equals(BIGINT)) {
-                    value = ThreadLocalRandom.current().nextLong();
+            MapBlockBuilder mapBlockBuilder = mapType.createBlockBuilder(null, 1);
+            mapBlockBuilder.buildEntry((keyBuilder, valueBuilder) -> {
+                Object value;
+                for (int position = 0; position < positionCount; position++) {
+                    if (elementType.equals(BIGINT)) {
+                        value = ThreadLocalRandom.current().nextLong();
+                    }
+                    else if (elementType.equals(DOUBLE)) {
+                        value = ThreadLocalRandom.current().nextDouble();
+                    }
+                    else {
+                        throw new UnsupportedOperationException();
+                    }
+                    // Use position as the key to avoid collision
+                    writeNativeValue(elementType, keyBuilder, position);
+                    writeNativeValue(elementType, valueBuilder, value);
                 }
-                else if (elementType.equals(DOUBLE)) {
-                    value = ThreadLocalRandom.current().nextDouble();
-                }
-                else {
-                    throw new UnsupportedOperationException();
-                }
-                // Use position as the key to avoid collision
-                writeNativeValue(elementType, singleMapBlockWriter, position);
-                writeNativeValue(elementType, singleMapBlockWriter, value);
-            }
-            mapBlockBuilder.closeEntry();
+            });
             return mapBlockBuilder.build();
         }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkTransformValue.java b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkTransformValue.java
index ee6663f3bea6..5d39374b3c43 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkTransformValue.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/BenchmarkTransformValue.java
@@ -23,14 +23,13 @@
 import io.trino.operator.project.PageProcessor;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.Type;
 import io.trino.sql.gen.ExpressionCompiler;
 import io.trino.sql.relational.LambdaDefinitionExpression;
 import io.trino.sql.relational.RowExpression;
 import io.trino.sql.relational.VariableReferenceExpression;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.type.FunctionType;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -125,7 +124,7 @@ public void setup()
             }
             MapType mapType = mapType(elementType, elementType);
             ResolvedFunction resolvedFunction = functionResolution.resolveFunction(
-                    QualifiedName.of(name),
+                    name,
                     fromTypes(mapType, new FunctionType(ImmutableList.of(elementType), elementType)));
             ResolvedFunction lessThan = functionResolution.resolveOperator(LESS_THAN, ImmutableList.of(elementType, elementType));
             projectionsBuilder.add(call(resolvedFunction, ImmutableList.of(
@@ -145,31 +144,31 @@ public void setup()
 
         private static Block createChannel(int positionCount, MapType mapType, Type elementType)
         {
-            BlockBuilder mapBlockBuilder = mapType.createBlockBuilder(null, 1);
-            BlockBuilder singleMapBlockWriter = mapBlockBuilder.beginBlockEntry();
-            Object key;
-            Object value;
-            for (int position = 0; position < positionCount; position++) {
-                if (elementType.equals(BIGINT)) {
-                    key = position;
-                    value = ThreadLocalRandom.current().nextLong();
+            MapBlockBuilder mapBlockBuilder = mapType.createBlockBuilder(null, 1);
+            mapBlockBuilder.buildEntry((keyBuilder, valueBuilder) -> {
+                Object key;
+                Object value;
+                for (int position = 0; position < positionCount; position++) {
+                    if (elementType.equals(BIGINT)) {
+                        key = position;
+                        value = ThreadLocalRandom.current().nextLong();
+                    }
+                    else if (elementType.equals(DOUBLE)) {
+                        key = position;
+                        value = ThreadLocalRandom.current().nextDouble();
+                    }
+                    else if (elementType.equals(VARCHAR)) {
+                        key = Slices.utf8Slice(Integer.toString(position));
+                        value = Slices.utf8Slice(Double.toString(ThreadLocalRandom.current().nextDouble()));
+                    }
+                    else {
+                        throw new UnsupportedOperationException();
+                    }
+                    // Use position as the key to avoid collision
+                    writeNativeValue(elementType, keyBuilder, key);
+                    writeNativeValue(elementType, valueBuilder, value);
                 }
-                else if (elementType.equals(DOUBLE)) {
-                    key = position;
-                    value = ThreadLocalRandom.current().nextDouble();
-                }
-                else if (elementType.equals(VARCHAR)) {
-                    key = Slices.utf8Slice(Integer.toString(position));
-                    value = Slices.utf8Slice(Double.toString(ThreadLocalRandom.current().nextDouble()));
-                }
-                else {
-                    throw new UnsupportedOperationException();
-                }
-                // Use position as the key to avoid collision
-                writeNativeValue(elementType, singleMapBlockWriter, key);
-                writeNativeValue(elementType, singleMapBlockWriter, value);
-            }
-            mapBlockBuilder.closeEntry();
+            });
             return mapBlockBuilder.build();
         }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayCombinationsFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayCombinationsFunction.java
index 9196bf0a9ca8..8571b00769ef 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayCombinationsFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayCombinationsFunction.java
@@ -124,13 +124,13 @@ public void testBasic()
     @Test
     public void testLimits()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("combinations", "sequence(1, 40)", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("combinations", "sequence(1, 40)", "-1")::evaluate)
                 .hasMessage("combination size must not be negative: -1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("combinations", "sequence(1, 40)", "10").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("combinations", "sequence(1, 40)", "10")::evaluate)
                 .hasMessage("combination size must not exceed 5: 10");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("combinations", "sequence(1, 100)", "5").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("combinations", "sequence(1, 100)", "5")::evaluate)
                 .hasMessage("combinations exceed max size");
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayFunctions.java
index b08e713b1158..5edf0826a4e3 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayFunctions.java
@@ -59,7 +59,7 @@ public void testArrayConstructor()
                 .binding("c", "3"))
                 .matches("ARRAY[1, 2, 3]");
 
-        assertThatThrownBy(() -> assertions.expression("array[" + Joiner.on(", ").join(nCopies(255, "rand()")) + "]").evaluate())
+        assertThatThrownBy(assertions.expression("array[" + Joiner.on(", ").join(nCopies(255, "rand()")) + "]")::evaluate)
                 .isInstanceOf(TrinoException.class)
                 .hasMessage("Too many arguments for array constructor");
     }
@@ -74,7 +74,7 @@ public void testArrayConcat()
         assertThat(assertions.function("concat", "ARRAY[1]", "ARRAY[2]", "ARRAY[3]"))
                 .matches("ARRAY[1, 2, 3]");
 
-        assertThatThrownBy(() -> assertions.expression("CONCAT(" + Joiner.on(", ").join(nCopies(128, "array[1]")) + ")").evaluate())
+        assertThatThrownBy(assertions.expression("CONCAT(" + Joiner.on(", ").join(nCopies(128, "array[1]")) + ")")::evaluate)
                 .isInstanceOf(TrinoException.class)
                 .hasMessage("line 1:12: Too many arguments for function call concat()");
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayHistogramFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayHistogramFunction.java
new file mode 100644
index 000000000000..ee676031a711
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayHistogramFunction.java
@@ -0,0 +1,154 @@
+/*
+ * Licensed 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 io.trino.operator.scalar;
+
+import io.trino.sql.query.QueryAssertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestArrayHistogramFunction
+{
+    private QueryAssertions assertions;
+
+    @BeforeAll
+    public void init()
+    {
+        assertions = new QueryAssertions();
+    }
+
+    @AfterAll
+    public void teardown()
+    {
+        assertions.close();
+        assertions = null;
+    }
+
+    @Test
+    public void testBasic()
+    {
+        assertThat(assertions.function("array_histogram", "ARRAY[42]"))
+                .isEqualTo(Map.of(42, 1L));
+
+        assertThat(assertions.function("array_histogram", "ARRAY[42]"))
+                .isEqualTo(Map.of(42, 1L));
+
+        assertThat(assertions.function("array_histogram", "ARRAY[42, 7]"))
+                .isEqualTo(Map.of(42, 1L, 7, 1L));
+
+        assertThat(assertions.function("array_histogram", "ARRAY[42, 42, 42]"))
+                .isEqualTo(Map.of(42, 3L));
+
+        assertThat(assertions.function("array_histogram", "ARRAY['a', 'b', 'a']"))
+                .isEqualTo(Map.of("a", 2L, "b", 1L));
+    }
+
+    @Test
+    public void testDuplicateKeys()
+    {
+        assertThat(assertions.function("array_histogram", "ARRAY[42, 42, 42]"))
+                .isEqualTo(Map.of(42, 3L));
+
+        assertThat(assertions.function("array_histogram", "ARRAY['a', 'b', 'a']"))
+                .isEqualTo(Map.of("a", 2L, "b", 1L));
+    }
+
+    @Test
+    public void testEmpty()
+    {
+        assertThat(assertions.function("array_histogram", "ARRAY[]"))
+                .isEqualTo(Map.of());
+    }
+
+    @Test
+    public void testNullsIgnored()
+    {
+        assertThat(assertions.function("array_histogram", "ARRAY[NULL]"))
+                .isEqualTo(Map.of());
+
+        assertThat(assertions.function("array_histogram", "ARRAY[42, NULL]"))
+                .isEqualTo(Map.of(42, 1L));
+
+        assertThat(assertions.function("array_histogram", "ARRAY[NULL, NULL, NULL, NULL, NULL]"))
+                .isEqualTo(Map.of());
+    }
+
+    @Test
+    public void testLargeArray()
+    {
+        assertThat(assertions.function("array_histogram", "ARRAY[42, 42, 42, 7, 1, 7, 1, 42, 7, 1, 1, 42, 7, 42, 1, 7, 2, 3, 7, 42, 42]"))
+                .isEqualTo(Map.of(1, 5L, 2, 1L, 3, 1L, 7, 6L, 42, 8L));
+    }
+
+    @Test
+    public void testEdgeCaseValues()
+    {
+        assertThat(assertions.function("array_histogram", "ARRAY[NULL, '', NULL, '']"))
+                .matches("MAP(ARRAY[''], CAST(ARRAY[2] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.function("array_histogram", "CAST(ARRAY[NULL, -0.1, 0, 0.1, -0.1, NULL, 0.0] AS ARRAY(DECIMAL(1,1)))"))
+                .matches("MAP(CAST(ARRAY[-0.1, 0.0, 0.1] AS ARRAY(DECIMAL(1,1))), CAST(ARRAY[2, 2, 1] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.function("array_histogram", "ARRAY[IPADDRESS '10.0.0.1', IPADDRESS '::ffff:a00:1']"))
+                .matches("MAP(ARRAY[IPADDRESS '::ffff:a00:1'], CAST(ARRAY[2] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.expression("transform_keys(array_histogram(a), (k, v) -> k AT TIME ZONE 'UTC')")
+                             .binding("a", "ARRAY[TIMESTAMP '2001-01-01 01:00:00.000 UTC', TIMESTAMP '2001-01-01 02:00:00.000 +01:00']"))
+                .matches("MAP(ARRAY[TIMESTAMP '2001-01-01 01:00:00.000 UTC'], CAST(ARRAY[2] AS ARRAY(BIGINT)))");
+    }
+
+    @Test
+    public void testTypes()
+    {
+        assertThat(assertions.function("array_histogram", "ARRAY[true, false, true]"))
+                .matches("MAP(ARRAY[true, false], CAST(ARRAY[2, 1] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.function("array_histogram", "ARRAY[42, 7, 42]"))
+                .matches("MAP(ARRAY[42, 7], CAST(ARRAY[2, 1] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.function("array_histogram", "ARRAY[42.1, 7.7, 42.1]"))
+                .matches("MAP(ARRAY[42.1, 7.7], CAST(ARRAY[2, 1] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.function("array_histogram", "ARRAY[DECIMAL '42.1', DECIMAL '7.7', DECIMAL '42.1']"))
+                .matches("MAP(ARRAY[DECIMAL '42.1', DECIMAL '7.7'], CAST(ARRAY[2, 1] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.function("array_histogram", "ARRAY[X'42', X'77', X'42']"))
+                .matches("MAP(ARRAY[X'42', X'77'], CAST(ARRAY[2, 1] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.function("array_histogram", "ARRAY[json_object('k1': 42), json_object('k1': 7), json_object('k1': 42)]"))
+                .matches("MAP(ARRAY[json_object('k1': 42), json_object('k1': 7)], CAST(ARRAY[2, 1] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.function("array_histogram", "ARRAY[DATE '2023-01-01', DATE '2023-07-07', DATE '2023-01-01']"))
+                .matches("MAP(ARRAY[DATE '2023-01-01', DATE '2023-07-07'], CAST(ARRAY[2, 1] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.function("array_histogram", "ARRAY[TIMESTAMP '2023-01-01 00:00:42', TIMESTAMP '2023-07-07 00:00:07', TIMESTAMP '2023-01-01 00:00:42']"))
+                .matches("MAP(ARRAY[TIMESTAMP '2023-01-01 00:00:42', TIMESTAMP '2023-07-07 00:00:07'], CAST(ARRAY[2, 1] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.function("array_histogram", "ARRAY[ARRAY[42], ARRAY[42, 7], ARRAY[42]]"))
+                .matches("MAP(ARRAY[ARRAY[42], ARRAY[42, 7]], CAST(ARRAY[2, 1] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.function("array_histogram", "ARRAY[MAP(ARRAY[42], ARRAY[1]), MAP(ARRAY[42, 7], ARRAY[1, 1]), MAP(ARRAY[42], ARRAY[1])]"))
+                .matches("MAP(ARRAY[MAP(ARRAY[42], ARRAY[1]), MAP(ARRAY[42, 7], ARRAY[1, 1])], CAST(ARRAY[2, 1] AS ARRAY(BIGINT)))");
+
+        assertThat(assertions.function("array_histogram", "ARRAY[ROW(42, 42), ROW(7, 7), ROW(42, 42)]"))
+                .matches("MAP(ARRAY[ROW(42, 42), ROW(7, 7)], CAST(ARRAY[2, 1] AS ARRAY(BIGINT)))");
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayNgramsFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayNgramsFunction.java
index d58f306ebe90..b89fcdb669f9 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayNgramsFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayNgramsFunction.java
@@ -160,7 +160,7 @@ public void testTypeCombinations()
                 .isEqualTo(ImmutableList.of(
                         ImmutableList.of("", "")));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ngrams", "ARRAY['foo','bar']", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ngrams", "ARRAY['foo','bar']", "0")::evaluate)
                 .hasMessage("N must be positive");
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayReduceFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayReduceFunction.java
index d9c5f94339ff..760fc0b7e842 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayReduceFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayReduceFunction.java
@@ -142,7 +142,7 @@ public void testCoercion()
                 .isEqualTo(123456789066666L);
 
         // TODO: Support coercion of return type of lambda
-        assertTrinoExceptionThrownBy(() -> assertions.expression("reduce(ARRAY [1, NULL, 2], 0, (s, x) -> CAST (s + x AS TINYINT), s -> s)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("reduce(ARRAY [1, NULL, 2], 0, (s, x) -> CAST (s + x AS TINYINT), s -> s)")::evaluate)
                 .hasErrorCode(FUNCTION_NOT_FOUND);
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayTrimFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayTrimFunction.java
index d3132abb1263..946111493015 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayTrimFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestArrayTrimFunction.java
@@ -75,9 +75,9 @@ public void testTrimArray()
                 .hasType(new ArrayType(new ArrayType(INTEGER)))
                 .isEqualTo(ImmutableList.of(ImmutableList.of(1, 2, 3)));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("trim_array", "ARRAY[1, 2, 3, 4]", "5").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("trim_array", "ARRAY[1, 2, 3, 4]", "5")::evaluate)
                 .hasMessage("size must not exceed array cardinality 4: 5");
-        assertTrinoExceptionThrownBy(() -> assertions.function("trim_array", "ARRAY[1, 2, 3, 4]", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("trim_array", "ARRAY[1, 2, 3, 4]", "-1")::evaluate)
                 .hasMessage("size must not be negative: -1");
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestBitwiseFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestBitwiseFunctions.java
index 41d3c9c28f75..e23b53c119be 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestBitwiseFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestBitwiseFunctions.java
@@ -87,10 +87,10 @@ public void testBitCount()
         assertThat(assertions.function("bit_count", Long.toString(Integer.MIN_VALUE), "32"))
                 .isEqualTo(1L);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bit_count", Long.toString(Integer.MAX_VALUE + 1L), "32").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bit_count", Long.toString(Integer.MAX_VALUE + 1L), "32")::evaluate)
                 .hasMessage("Number must be representable with the bits specified. 2147483648 cannot be represented with 32 bits");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bit_count", Long.toString(Integer.MIN_VALUE - 1L), "32").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bit_count", Long.toString(Integer.MIN_VALUE - 1L), "32")::evaluate)
                 .hasMessage("Number must be representable with the bits specified. -2147483649 cannot be represented with 32 bits");
 
         assertThat(assertions.function("bit_count", "1152921504598458367", "62"))
@@ -105,19 +105,19 @@ public void testBitCount()
         assertThat(assertions.function("bit_count", "-1", "26"))
                 .isEqualTo(26L);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bit_count", "1152921504598458367", "60").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bit_count", "1152921504598458367", "60")::evaluate)
                 .hasMessage("Number must be representable with the bits specified. 1152921504598458367 cannot be represented with 60 bits");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bit_count", "33554132", "25").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bit_count", "33554132", "25")::evaluate)
                 .hasMessage("Number must be representable with the bits specified. 33554132 cannot be represented with 25 bits");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bit_count", "0", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bit_count", "0", "-1")::evaluate)
                 .hasMessage("Bits specified in bit_count must be between 2 and 64, got -1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bit_count", "0", "1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bit_count", "0", "1")::evaluate)
                 .hasMessage("Bits specified in bit_count must be between 2 and 64, got 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bit_count", "0", "65").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bit_count", "0", "65")::evaluate)
                 .hasMessage("Bits specified in bit_count must be between 2 and 64, got 65");
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestBlockAndPositionNullConvention.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestBlockAndPositionNullConvention.java
index 8e7202127dab..40534ddbd362 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestBlockAndPositionNullConvention.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestBlockAndPositionNullConvention.java
@@ -15,7 +15,7 @@
 
 import io.airlift.slice.Slice;
 import io.trino.metadata.InternalFunctionBundle;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.BlockIndex;
 import io.trino.spi.function.BlockPosition;
 import io.trino.spi.function.ScalarFunction;
@@ -51,6 +51,7 @@ public void init()
         assertions = new QueryAssertions();
         assertions.addFunctions(InternalFunctionBundle.builder()
                 .scalar(FunctionWithBlockAndPositionConvention.class)
+                .scalar(FunctionWithValueBlockAndPositionConvention.class)
                 .build());
     }
 
@@ -105,7 +106,7 @@ public static Object generic(@TypeParameter("E") Type type, @SqlNullable @SqlTyp
         @TypeParameter("E")
         @SqlNullable
         @SqlType("E")
-        public static Object generic(@TypeParameter("E") Type type, @BlockPosition @SqlType("E") Block block, @BlockIndex int position)
+        public static Object generic(@TypeParameter("E") Type type, @SqlNullable @BlockPosition @SqlType("E") ValueBlock block, @BlockIndex int position)
         {
             hitBlockPositionObject.set(true);
             return readNativeValue(type, block, position);
@@ -124,7 +125,7 @@ public static Slice specializedSlice(@TypeParameter("E") Type type, @SqlNullable
         @TypeParameter("E")
         @SqlNullable
         @SqlType("E")
-        public static Slice specializedSlice(@TypeParameter("E") Type type, @BlockPosition @SqlType(value = "E", nativeContainerType = Slice.class) Block block, @BlockIndex int position)
+        public static Slice specializedSlice(@TypeParameter("E") Type type, @SqlNullable @BlockPosition @SqlType(value = "E", nativeContainerType = Slice.class) ValueBlock block, @BlockIndex int position)
         {
             hitBlockPositionSlice.set(true);
             return type.getSlice(block, position);
@@ -141,7 +142,7 @@ public static Boolean speciailizedBoolean(@TypeParameter("E") Type type, @SqlNul
         @TypeParameter("E")
         @SqlNullable
         @SqlType("E")
-        public static Boolean speciailizedBoolean(@TypeParameter("E") Type type, @BlockPosition @SqlType(value = "E", nativeContainerType = boolean.class) Block block, @BlockIndex int position)
+        public static Boolean speciailizedBoolean(@TypeParameter("E") Type type, @SqlNullable @BlockPosition @SqlType(value = "E", nativeContainerType = boolean.class) ValueBlock block, @BlockIndex int position)
         {
             hitBlockPositionBoolean.set(true);
             return type.getBoolean(block, position);
@@ -158,7 +159,7 @@ public static Long getLong(@SqlNullable @SqlType(StandardTypes.BIGINT) Long numb
 
         @SqlType(StandardTypes.BIGINT)
         @SqlNullable
-        public static Long getBlockPosition(@BlockPosition @SqlType(value = StandardTypes.BIGINT, nativeContainerType = long.class) Block block, @BlockIndex int position)
+        public static Long getBlockPosition(@SqlNullable @BlockPosition @SqlType(value = StandardTypes.BIGINT, nativeContainerType = long.class) ValueBlock block, @BlockIndex int position)
         {
             hitBlockPositionBigint.set(true);
             return BIGINT.getLong(block, position);
@@ -173,7 +174,126 @@ public static Double getDouble(@SqlNullable @SqlType(StandardTypes.DOUBLE) Doubl
 
         @SqlType(StandardTypes.DOUBLE)
         @SqlNullable
-        public static Double getDouble(@BlockPosition @SqlType(value = StandardTypes.DOUBLE, nativeContainerType = double.class) Block block, @BlockIndex int position)
+        public static Double getDouble(@SqlNullable @BlockPosition @SqlType(value = StandardTypes.DOUBLE, nativeContainerType = double.class) ValueBlock block, @BlockIndex int position)
+        {
+            hitBlockPositionDouble.set(true);
+            return DOUBLE.getDouble(block, position);
+        }
+    }
+
+    @Test
+    public void testValueBlockPosition()
+    {
+        assertThat(assertions.function("test_value_block_position", "BIGINT '1234'"))
+                .isEqualTo(1234L);
+        assertTrue(FunctionWithValueBlockAndPositionConvention.hitBlockPositionBigint.get());
+
+        assertThat(assertions.function("test_value_block_position", "12.34e0"))
+                .isEqualTo(12.34);
+        assertTrue(FunctionWithValueBlockAndPositionConvention.hitBlockPositionDouble.get());
+
+        assertThat(assertions.function("test_value_block_position", "'hello'"))
+                .hasType(createVarcharType(5))
+                .isEqualTo("hello");
+        assertTrue(FunctionWithValueBlockAndPositionConvention.hitBlockPositionSlice.get());
+
+        assertThat(assertions.function("test_value_block_position", "true"))
+                .isEqualTo(true);
+        assertTrue(FunctionWithValueBlockAndPositionConvention.hitBlockPositionBoolean.get());
+    }
+
+    @ScalarFunction("test_value_block_position")
+    public static final class FunctionWithValueBlockAndPositionConvention
+    {
+        private static final AtomicBoolean hitBlockPositionBigint = new AtomicBoolean();
+        private static final AtomicBoolean hitBlockPositionDouble = new AtomicBoolean();
+        private static final AtomicBoolean hitBlockPositionSlice = new AtomicBoolean();
+        private static final AtomicBoolean hitBlockPositionBoolean = new AtomicBoolean();
+        private static final AtomicBoolean hitBlockPositionObject = new AtomicBoolean();
+
+        // generic implementations
+        // these will not work right now because MethodHandle is not properly adapted
+
+        @TypeParameter("E")
+        @SqlNullable
+        @SqlType("E")
+        public static Object generic(@TypeParameter("E") Type type, @SqlNullable @SqlType("E") Object object)
+        {
+            return object;
+        }
+
+        @TypeParameter("E")
+        @SqlNullable
+        @SqlType("E")
+        public static Object generic(@TypeParameter("E") Type type, @SqlNullable @BlockPosition @SqlType("E") ValueBlock block, @BlockIndex int position)
+        {
+            hitBlockPositionObject.set(true);
+            return readNativeValue(type, block, position);
+        }
+
+        // specialized
+
+        @TypeParameter("E")
+        @SqlNullable
+        @SqlType("E")
+        public static Slice specializedSlice(@TypeParameter("E") Type type, @SqlNullable @SqlType("E") Slice slice)
+        {
+            return slice;
+        }
+
+        @TypeParameter("E")
+        @SqlNullable
+        @SqlType("E")
+        public static Slice specializedSlice(@TypeParameter("E") Type type, @SqlNullable @BlockPosition @SqlType(value = "E", nativeContainerType = Slice.class) ValueBlock block, @BlockIndex int position)
+        {
+            hitBlockPositionSlice.set(true);
+            return type.getSlice(block, position);
+        }
+
+        @TypeParameter("E")
+        @SqlNullable
+        @SqlType("E")
+        public static Boolean speciailizedBoolean(@TypeParameter("E") Type type, @SqlNullable @SqlType("E") Boolean bool)
+        {
+            return bool;
+        }
+
+        @TypeParameter("E")
+        @SqlNullable
+        @SqlType("E")
+        public static Boolean speciailizedBoolean(@TypeParameter("E") Type type, @SqlNullable @BlockPosition @SqlType(value = "E", nativeContainerType = boolean.class) ValueBlock block, @BlockIndex int position)
+        {
+            hitBlockPositionBoolean.set(true);
+            return type.getBoolean(block, position);
+        }
+
+        // exact
+
+        @SqlType(StandardTypes.BIGINT)
+        @SqlNullable
+        public static Long getLong(@SqlNullable @SqlType(StandardTypes.BIGINT) Long number)
+        {
+            return number;
+        }
+
+        @SqlType(StandardTypes.BIGINT)
+        @SqlNullable
+        public static Long getBlockPosition(@SqlNullable @BlockPosition @SqlType(value = StandardTypes.BIGINT, nativeContainerType = long.class) ValueBlock block, @BlockIndex int position)
+        {
+            hitBlockPositionBigint.set(true);
+            return BIGINT.getLong(block, position);
+        }
+
+        @SqlType(StandardTypes.DOUBLE)
+        @SqlNullable
+        public static Double getDouble(@SqlNullable @SqlType(StandardTypes.DOUBLE) Double number)
+        {
+            return number;
+        }
+
+        @SqlType(StandardTypes.DOUBLE)
+        @SqlNullable
+        public static Double getDouble(@SqlNullable @BlockPosition @SqlType(value = StandardTypes.DOUBLE, nativeContainerType = double.class) ValueBlock block, @BlockIndex int position)
         {
             hitBlockPositionDouble.set(true);
             return DOUBLE.getDouble(block, position);
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestBlockSet.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestBlockSet.java
new file mode 100644
index 000000000000..c7d92e4522ce
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestBlockSet.java
@@ -0,0 +1,275 @@
+/*
+ * Licensed 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 io.trino.operator.scalar;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.units.DataSize;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
+import io.trino.type.BlockTypeOperators;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static io.airlift.slice.Slices.utf8Slice;
+import static io.airlift.units.DataSize.Unit.KILOBYTE;
+import static io.trino.block.BlockAssertions.createEmptyLongsBlock;
+import static io.trino.block.BlockAssertions.createLongSequenceBlock;
+import static io.trino.block.BlockAssertions.createLongsBlock;
+import static io.trino.spi.StandardErrorCode.EXCEEDED_FUNCTION_MEMORY_LIMIT;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
+import static java.util.Collections.nCopies;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+public class TestBlockSet
+{
+    private static final BlockTypeOperators BLOCK_TYPE_OPERATORS = new BlockTypeOperators(new TypeOperators());
+    private static final String FUNCTION_NAME = "typed_set_test";
+
+    @Test
+    public void testConstructor()
+    {
+        for (int i = -2; i <= -1; i++) {
+            int expectedSize = i;
+            assertThatThrownBy(() -> createBlockSet(BIGINT, expectedSize))
+                    .isInstanceOf(IllegalArgumentException.class)
+                    .hasMessage("maximumSize must not be negative");
+        }
+
+        assertThatThrownBy(() -> new BlockSet(null, null, null, 1))
+                .isInstanceOfAny(NullPointerException.class, IllegalArgumentException.class);
+    }
+
+    @Test
+    public void testGetElementPosition()
+    {
+        int elementCount = 100;
+        BlockBuilder blockBuilder = BIGINT.createFixedSizeBlockBuilder(elementCount);
+        for (int i = 0; i < elementCount; i++) {
+            BIGINT.writeLong(blockBuilder, i);
+        }
+        Block block = blockBuilder.build();
+
+        BlockSet blockSet = createBlockSet(BIGINT, elementCount);
+        for (int i = 0; i < block.getPositionCount(); i++) {
+            blockSet.add(block, i);
+        }
+
+        assertEquals(blockSet.size(), elementCount);
+
+        for (int j = 0; j < block.getPositionCount(); j++) {
+            assertEquals(blockSet.positionOf(block, j), j);
+        }
+    }
+
+    @Test
+    public void testGetElementPositionWithNull()
+    {
+        int elementCount = 100;
+        BlockBuilder blockBuilder = BIGINT.createFixedSizeBlockBuilder(elementCount);
+        for (int i = 0; i < elementCount; i++) {
+            if (i % 10 == 0) {
+                blockBuilder.appendNull();
+            }
+            else {
+                BIGINT.writeLong(blockBuilder, i);
+            }
+        }
+        Block block = blockBuilder.build();
+
+        BlockSet blockSet = createBlockSet(BIGINT, elementCount);
+        for (int i = 0; i < block.getPositionCount(); i++) {
+            blockSet.add(block, i);
+        }
+
+        // The internal elementBlock and hashtable of the blockSet should contain
+        // all distinct non-null elements plus one null
+        assertEquals(blockSet.size(), elementCount - elementCount / 10 + 1);
+
+        int nullCount = 0;
+        for (int j = 0; j < block.getPositionCount(); j++) {
+            // The null is only added to blockSet once, so the internal elementBlock subscript is shifted by nullCountMinusOne
+            if (!block.isNull(j)) {
+                assertEquals(blockSet.positionOf(block, j), j - nullCount + 1);
+            }
+            else {
+                // The first null added to blockSet is at position 0
+                assertEquals(blockSet.positionOf(block, j), 0);
+                nullCount++;
+            }
+        }
+    }
+
+    @Test
+    public void testMaxSize()
+    {
+        for (int maxSize : ImmutableList.of(0, 1, 10, 100, 1000)) {
+            BlockSet blockSet = createBlockSet(BIGINT, maxSize);
+            for (int i = 0; i < maxSize; i++) {
+                assertThat(blockSet.add(toBlock(i == 20 ? null : (long) i), 0)).isTrue();
+                assertThat(blockSet.size()).isEqualTo(i + 1);
+            }
+
+            assertThatThrownBy(() -> blockSet.add(toBlock((long) maxSize), 0))
+                    .isInstanceOf(IllegalStateException.class)
+                    .hasMessage("BlockSet is full");
+            assertThat(blockSet.size()).isEqualTo(maxSize);
+
+            if (maxSize < 20) {
+                assertThatThrownBy(() -> blockSet.add(toBlock(null), 0))
+                        .isInstanceOf(IllegalStateException.class)
+                        .hasMessage("BlockSet is full");
+                assertThat(blockSet.size()).isEqualTo(maxSize);
+            }
+
+            for (int i = 0; i < maxSize; i++) {
+                assertThat(blockSet.add(toBlock(i == 20 ? null : (long) i), 0)).isFalse();
+            }
+        }
+    }
+
+    private static Block toBlock(Long value)
+    {
+        BlockBuilder blockBuilder = BIGINT.createFixedSizeBlockBuilder(1);
+        if (value == null) {
+            blockBuilder.appendNull();
+        }
+        else {
+            BIGINT.writeLong(blockBuilder, value);
+        }
+        return blockBuilder.build();
+    }
+
+    @Test
+    public void testGetElementPositionRandom()
+    {
+        BlockBuilder keysBuilder = VARCHAR.createBlockBuilder(null, 5);
+        VARCHAR.writeSlice(keysBuilder, utf8Slice("hello"));
+        VARCHAR.writeSlice(keysBuilder, utf8Slice("bye"));
+        VARCHAR.writeSlice(keysBuilder, utf8Slice("abc"));
+        Block keys = keysBuilder.build();
+
+        BlockSet set = createBlockSet(VARCHAR, 4);
+        for (int i = 0; i < keys.getPositionCount(); i++) {
+            set.add(keys, i);
+        }
+
+        BlockBuilder valuesBuilder = VARCHAR.createBlockBuilder(null, 5);
+        VARCHAR.writeSlice(valuesBuilder, utf8Slice("bye"));
+        VARCHAR.writeSlice(valuesBuilder, utf8Slice("abc"));
+        VARCHAR.writeSlice(valuesBuilder, utf8Slice("hello"));
+        VARCHAR.writeSlice(valuesBuilder, utf8Slice("bad"));
+        valuesBuilder.appendNull();
+        Block values = valuesBuilder.build();
+
+        assertEquals(set.positionOf(values, 4), -1);
+        assertEquals(set.positionOf(values, 2), 0);
+        assertEquals(set.positionOf(values, 1), 2);
+        assertEquals(set.positionOf(values, 0), 1);
+        assertFalse(set.contains(values, 3));
+
+        set.add(values, 4);
+        assertTrue(set.contains(values, 4));
+    }
+
+    @Test
+    public void testBigintSimpleBlockSet()
+    {
+        testBigint(createEmptyLongsBlock());
+        testBigint(createLongsBlock(1L));
+        testBigint(createLongsBlock(1L, 2L, 3L));
+        testBigint(createLongsBlock(1L, 2L, 3L, 1L, 2L, 3L));
+        testBigint(createLongsBlock(1L, null, 3L));
+        testBigint(createLongsBlock(null, null, null));
+        testBigint(createLongSequenceBlock(0, 100));
+        testBigint(createLongSequenceBlock(-100, 100));
+        testBigint(createLongsBlock(nCopies(1, null)));
+        testBigint(createLongsBlock(nCopies(100, null)));
+        testBigint(createLongsBlock(nCopies(2000, null)));
+        testBigint(createLongsBlock(nCopies(2000, 0L)));
+    }
+
+    private static void testBigint(Block longBlock)
+    {
+        BlockSet blockSet = createBlockSet(BIGINT, longBlock.getPositionCount());
+        Set<Long> set = new HashSet<>();
+        for (int blockPosition = 0; blockPosition < longBlock.getPositionCount(); blockPosition++) {
+            long number = BIGINT.getLong(longBlock, blockPosition);
+            assertEquals(blockSet.contains(longBlock, blockPosition), set.contains(number));
+            assertEquals(blockSet.size(), set.size());
+
+            set.add(number);
+            blockSet.add(longBlock, blockPosition);
+
+            assertEquals(blockSet.contains(longBlock, blockPosition), set.contains(number));
+            assertEquals(blockSet.size(), set.size());
+        }
+    }
+
+    @Test
+    public void testMemoryExceeded()
+    {
+        DataSize maxSize = DataSize.of(20, KILOBYTE);
+        BlockBuilder blockBuilder = BIGINT.createFixedSizeBlockBuilder(1024);
+        for (int i = 0; blockBuilder.getSizeInBytes() < maxSize.toBytes() + 8; i++) {
+            BIGINT.writeLong(blockBuilder, i);
+        }
+        Block block = blockBuilder.build();
+
+        BlockSet blockSet = createBlockSet(BIGINT, block.getPositionCount());
+        for (int i = 0; i < block.getPositionCount(); i++) {
+            blockSet.add(block, i);
+        }
+        // blockSet should contain all positions
+        assertThat(blockSet.size()).isEqualTo(block.getPositionCount());
+
+        // getting all blocks should fail
+        BlockBuilder testOutput = BIGINT.createFixedSizeBlockBuilder(1024);
+        assertTrinoExceptionThrownBy(() -> blockSet.getAllWithSizeLimit(testOutput, FUNCTION_NAME, maxSize))
+                .hasErrorCode(EXCEEDED_FUNCTION_MEMORY_LIMIT)
+                .hasMessageContaining(FUNCTION_NAME);
+
+        // blockBuilder should not contain all positions
+        int actualPositionsWritten = testOutput.getPositionCount();
+        assertThat(actualPositionsWritten).isLessThan(block.getPositionCount());
+
+        // writing to the same block builder, should fail with the same count
+        assertTrinoExceptionThrownBy(() -> blockSet.getAllWithSizeLimit(testOutput, FUNCTION_NAME, maxSize))
+                .hasErrorCode(EXCEEDED_FUNCTION_MEMORY_LIMIT)
+                .hasMessageContaining(FUNCTION_NAME);
+        assertThat(testOutput.getPositionCount()).isEqualTo(actualPositionsWritten * 2);
+
+        // writing with a higher limit should work
+        blockSet.getAllWithSizeLimit(testOutput, FUNCTION_NAME, DataSize.of(30, KILOBYTE));
+        assertThat(testOutput.getPositionCount()).isEqualTo(actualPositionsWritten * 2 + blockSet.size());
+    }
+
+    private static BlockSet createBlockSet(Type type, int expectedSize)
+    {
+        return new BlockSet(
+                type,
+                BLOCK_TYPE_OPERATORS.getDistinctFromOperator(type),
+                BLOCK_TYPE_OPERATORS.getHashCodeOperator(type),
+                expectedSize);
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestColorFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestColorFunctions.java
index a125133cd2cd..bef069727cba 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestColorFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestColorFunctions.java
@@ -14,7 +14,7 @@
 package io.trino.operator.scalar;
 
 import io.trino.sql.query.QueryAssertions;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.operator.scalar.ColorFunctions.bar;
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestConcatWsFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestConcatWsFunction.java
index 1c7914f390c2..9e9faae219b7 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestConcatWsFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestConcatWsFunction.java
@@ -14,6 +14,7 @@
 package io.trino.operator.scalar;
 
 import io.trino.sql.query.QueryAssertions;
+import org.intellij.lang.annotations.Language;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -27,6 +28,8 @@
 @TestInstance(PER_CLASS)
 public class TestConcatWsFunction
 {
+    private static final int MAX_INPUT_VALUES = 254;
+    private static final int MAX_CONCAT_VALUES = MAX_INPUT_VALUES - 1;
     private QueryAssertions assertions;
 
     @BeforeAll
@@ -159,26 +162,50 @@ public void testArray()
         assertThat(assertions.function("concat_ws", "','", "ARRAY['abc', '', '', 'xyz','abcdefghi']"))
                 .hasType(VARCHAR)
                 .isEqualTo("abc,,,xyz,abcdefghi");
+
+        // array may exceed the limit
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < MAX_CONCAT_VALUES; i++) {
+            builder.append(i).append(',');
+        }
+        builder.append(MAX_CONCAT_VALUES);
+        assertThat(assertions.function("concat_ws", "','", "transform(sequence(0, " + MAX_CONCAT_VALUES + "), x -> cast(x as varchar))"))
+                .hasType(VARCHAR)
+                .isEqualTo(builder.toString());
     }
 
     @Test
     public void testBadArray()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("concat_ws", "','", "ARRAY[1, 15]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("concat_ws", "','", "ARRAY[1, 15]")::evaluate)
                 .hasMessageContaining("Unexpected parameters");
     }
 
     @Test
     public void testBadArguments()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("concat_ws", "','", "1", "15").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("concat_ws", "','", "1", "15")::evaluate)
                 .hasMessageContaining("Unexpected parameters");
     }
 
+    @Test
+    public void testTooManyArguments()
+    {
+        // all function arguments limit to 127 in io.trino.sql.analyzer.ExpressionAnalyzer.Visitor.visitFunctionCall
+        int argumentsLimit = 127;
+        @Language("SQL") String[] inputValues = new String[argumentsLimit + 1];
+        inputValues[0] = "','";
+        for (int i = 1; i <= argumentsLimit; i++) {
+            inputValues[i] = ("'" + i + "'");
+        }
+        assertTrinoExceptionThrownBy(assertions.function("concat_ws", inputValues)::evaluate)
+                .hasMessage("line 1:8: Too many arguments for function call concat_ws()");
+    }
+
     @Test
     public void testLowArguments()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("concat_ws", "','").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("concat_ws", "','")::evaluate)
                 .hasMessage("There must be two or more arguments");
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestDataSizeFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestDataSizeFunctions.java
index 7a27180c0427..c978672e3ee0 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestDataSizeFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestDataSizeFunctions.java
@@ -98,28 +98,28 @@ public void testParseDataSize()
         assertThat(assertions.function("parse_data_size", "'69175290276410818560EB'"))
                 .isEqualTo(decimal("79753679747094952374228423616820674560", DECIMAL));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("parse_data_size", "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("parse_data_size", "''")::evaluate)
                 .hasMessage("Invalid data size: ''");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("parse_data_size", "'0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("parse_data_size", "'0'")::evaluate)
                 .hasMessage("Invalid data size: '0'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("parse_data_size", "'10KB'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("parse_data_size", "'10KB'")::evaluate)
                 .hasMessage("Invalid data size: '10KB'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("parse_data_size", "'KB'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("parse_data_size", "'KB'")::evaluate)
                 .hasMessage("Invalid data size: 'KB'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("parse_data_size", "'-1B'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("parse_data_size", "'-1B'")::evaluate)
                 .hasMessage("Invalid data size: '-1B'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("parse_data_size", "'12345K'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("parse_data_size", "'12345K'")::evaluate)
                 .hasMessage("Invalid data size: '12345K'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("parse_data_size", "'A12345B'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("parse_data_size", "'A12345B'")::evaluate)
                 .hasMessage("Invalid data size: 'A12345B'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("parse_data_size", "'99999999999999YB'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("parse_data_size", "'99999999999999YB'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("Value out of range: '99999999999999YB' ('120892581961461708544797985370825293824B')");
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestDateTimeFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestDateTimeFunctions.java
index e8a94ac6a3ea..681b754e5337 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestDateTimeFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestDateTimeFunctions.java
@@ -204,13 +204,13 @@ public void testFromUnixTimeWithOffset()
                 .matches("TIMESTAMP '2001-01-22 15:14:05.000 +01:10'");
 
         // test invalid minute offsets
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_unixtime", "0", "1", "10000").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_unixtime", "0", "1", "10000")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_unixtime", "0", "10000", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_unixtime", "0", "10000", "0")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_unixtime", "0", "-100", "100").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_unixtime", "0", "-100", "100")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
@@ -786,22 +786,22 @@ public void testDateFormat()
                 .hasType(VARCHAR)
                 .isEqualTo("0");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_format", "DATE '2001-01-09'", "'%D'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_format", "DATE '2001-01-09'", "'%D'")::evaluate)
                 .hasMessage("%D not supported in date format string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_format", "DATE '2001-01-09'", "'%U'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_format", "DATE '2001-01-09'", "'%U'")::evaluate)
                 .hasMessage("%U not supported in date format string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_format", "DATE '2001-01-09'", "'%u'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_format", "DATE '2001-01-09'", "'%u'")::evaluate)
                 .hasMessage("%u not supported in date format string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_format", "DATE '2001-01-09'", "'%V'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_format", "DATE '2001-01-09'", "'%V'")::evaluate)
                 .hasMessage("%V not supported in date format string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_format", "DATE '2001-01-09'", "'%w'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_format", "DATE '2001-01-09'", "'%w'")::evaluate)
                 .hasMessage("%w not supported in date format string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_format", "DATE '2001-01-09'", "'%X'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_format", "DATE '2001-01-09'", "'%X'")::evaluate)
                 .hasMessage("%X not supported in date format string");
     }
 
@@ -865,28 +865,28 @@ public void testDateParse()
         assertThat(assertions.function("date_parse", "'31-MAY-69 04.59.59.999000 AM'", "'%d-%b-%y %l.%i.%s.%f %p'"))
                 .matches("TIMESTAMP '2069-05-31 04:59:59.999'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_parse", "''", "'%D'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_parse", "''", "'%D'")::evaluate)
                 .hasMessage("%D not supported in date format string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_parse", "''", "'%U'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_parse", "''", "'%U'")::evaluate)
                 .hasMessage("%U not supported in date format string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_parse", "''", "'%u'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_parse", "''", "'%u'")::evaluate)
                 .hasMessage("%u not supported in date format string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_parse", "''", "'%V'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_parse", "''", "'%V'")::evaluate)
                 .hasMessage("%V not supported in date format string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_parse", "''", "'%w'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_parse", "''", "'%w'")::evaluate)
                 .hasMessage("%w not supported in date format string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_parse", "''", "'%X'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_parse", "''", "'%X'")::evaluate)
                 .hasMessage("%X not supported in date format string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_parse", "'3.0123456789'", "'%s.%f'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_parse", "'3.0123456789'", "'%s.%f'")::evaluate)
                 .hasMessage("Invalid format: \"3.0123456789\" is malformed at \"9\"");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("date_parse", "'1970-01-01'", "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("date_parse", "'1970-01-01'", "''")::evaluate)
                 .hasMessage("Both printing and parsing not supported");
     }
 
@@ -1063,13 +1063,13 @@ public void testParseDuration()
                 .isEqualTo(new SqlIntervalDayTime(1234, 13, 36, 28, 800));
 
         // invalid function calls
-        assertTrinoExceptionThrownBy(() -> assertions.function("parse_duration", "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("parse_duration", "''")::evaluate)
                 .hasMessage("duration is empty");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("parse_duration", "'1f'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("parse_duration", "'1f'")::evaluate)
                 .hasMessage("Unknown time unit: f");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("parse_duration", "'abc'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("parse_duration", "'abc'")::evaluate)
                 .hasMessage("duration is not a valid data duration string: abc");
     }
 
@@ -1119,7 +1119,7 @@ public void testWithTimezone()
         assertThat(assertions.function("with_timezone", "TIMESTAMP '2001-12-01 03:04:05.321'", "'America/Los_Angeles'"))
                 .matches("TIMESTAMP '2001-12-01 03:04:05.321 America/Los_Angeles'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("with_timezone", "TIMESTAMP '2001-08-22 03:04:05.321'", "'invalidzoneid'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("with_timezone", "TIMESTAMP '2001-08-22 03:04:05.321'", "'invalidzoneid'")::evaluate)
                 .hasMessage("'invalidzoneid' is not a valid time zone");
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestFailureFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestFailureFunction.java
index c87d5992a649..f33ba26ce890 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestFailureFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestFailureFunction.java
@@ -48,7 +48,7 @@ public void teardown()
     public void testFailure()
     {
         String failure = JsonCodec.jsonCodec(FailureInfo.class).toJson(Failures.toFailure(new RuntimeException("fail me")).toFailureInfo());
-        assertTrinoExceptionThrownBy(() -> assertions.function("fail", "json_parse('" + failure + "')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("fail", "json_parse('" + failure + "')")::evaluate)
                 .hasErrorCode(GENERIC_USER_ERROR)
                 .hasMessage("fail me");
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestFormatFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestFormatFunction.java
index b0b143bf77f6..64aa5cdae910 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestFormatFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestFormatFunction.java
@@ -146,38 +146,38 @@ public void testFormat()
         assertThat(format("%s", "cast('test' AS char(5))"))
                 .isEqualTo("test ");
 
-        assertTrinoExceptionThrownBy(() -> format("%.4d", "8").evaluate())
+        assertTrinoExceptionThrownBy(format("%.4d", "8")::evaluate)
                 .hasMessage("Invalid format string: %.4d (IllegalFormatPrecision: 4)");
 
-        assertTrinoExceptionThrownBy(() -> format("%-02d", "8").evaluate())
+        assertTrinoExceptionThrownBy(format("%-02d", "8")::evaluate)
                 .hasMessage("Invalid format string: %-02d (IllegalFormatFlags: Flags = '-0')");
 
-        assertTrinoExceptionThrownBy(() -> format("%--2d", "8").evaluate())
+        assertTrinoExceptionThrownBy(format("%--2d", "8")::evaluate)
                 .hasMessage("Invalid format string: %--2d (DuplicateFormatFlags: Flags = '-')");
 
-        assertTrinoExceptionThrownBy(() -> format("%+s", "8").evaluate())
+        assertTrinoExceptionThrownBy(format("%+s", "8")::evaluate)
                 .hasMessage("Invalid format string: %+s (FormatFlagsConversionMismatch: Conversion = s, Flags = +)");
 
-        assertTrinoExceptionThrownBy(() -> format("%-s", "8").evaluate())
+        assertTrinoExceptionThrownBy(format("%-s", "8")::evaluate)
                 .hasMessage("Invalid format string: %-s (MissingFormatWidth: %-s)");
 
-        assertTrinoExceptionThrownBy(() -> format("%5n", "8").evaluate())
+        assertTrinoExceptionThrownBy(format("%5n", "8")::evaluate)
                 .hasMessage("Invalid format string: %5n (IllegalFormatWidth: 5)");
 
-        assertTrinoExceptionThrownBy(() -> format("%s %d", "8").evaluate())
+        assertTrinoExceptionThrownBy(format("%s %d", "8")::evaluate)
                 .hasMessage("Invalid format string: %s %d (MissingFormatArgument: Format specifier '%d')");
 
-        assertTrinoExceptionThrownBy(() -> format("%d", "decimal '8'").evaluate())
+        assertTrinoExceptionThrownBy(format("%d", "decimal '8'")::evaluate)
                 .hasMessage("Invalid format string: %d (IllegalFormatConversion: d != java.math.BigDecimal)");
 
-        assertTrinoExceptionThrownBy(() -> format("%tT", "current_time").evaluate())
+        assertTrinoExceptionThrownBy(format("%tT", "current_time")::evaluate)
                 .hasMessage("Invalid format string: %tT (IllegalFormatConversion: T != java.lang.String)");
 
-        assertTrinoExceptionThrownBy(() -> format("%s", "array[8]").evaluate())
+        assertTrinoExceptionThrownBy(format("%s", "array[8]")::evaluate)
                 .hasErrorCode(NOT_SUPPORTED)
                 .hasMessage("line 1:20: Type not supported for formatting: array(integer)");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("format", "5", "8").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("format", "5", "8")::evaluate)
                 .hasErrorCode(TYPE_MISMATCH)
                 .hasMessage("line 1:17: Type of first argument to format() must be VARCHAR (actual: integer)");
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestIpAddressFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestIpAddressFunctions.java
index c7d881500a05..c79e3cde09eb 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestIpAddressFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestIpAddressFunctions.java
@@ -272,28 +272,6 @@ public void testIpAddressContains()
         assertThat(assertions.function("contains", "'0.0.0.255/32'", "IPADDRESS '255.0.0.0'"))
                 .isEqualTo(false);
 
-        // 127.0.0.1 equals ::ffff:7f00:0001 in IPv6
-        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '127.0.0.0'"))
-                .isEqualTo(false);
-        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '127.0.0.1'"))
-                .isEqualTo(true);
-        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '127.0.0.2'"))
-                .isEqualTo(false);
-
-        assertThat(assertions.function("contains", "'::ffff:7f00:0001/32'", "IPADDRESS '127.0.0.0'"))
-                .isEqualTo(false);
-        assertThat(assertions.function("contains", "'::ffff:7f00:0001/32'", "IPADDRESS '127.0.0.1'"))
-                .isEqualTo(true);
-        assertThat(assertions.function("contains", "'::ffff:7f00:0001/32'", "IPADDRESS '127.0.0.2'"))
-                .isEqualTo(false);
-
-        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '::ffff:7f00:0000'"))
-                .isEqualTo(false);
-        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '::ffff:7f00:0001'"))
-                .isEqualTo(true);
-        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '::ffff:7f00:0002'"))
-                .isEqualTo(false);
-
         // IPv6
         assertThat(assertions.function("contains", "'::ffff:0000:0000/0'", "IPADDRESS '::ffff:0000:0000'"))
                 .isEqualTo(true);
@@ -364,6 +342,12 @@ public void testIpAddressContains()
         assertThat(assertions.function("contains", "'2001:abcd:ef01:2345:6789:abcd:ef01:234/60'", "IPADDRESS '2002::'"))
                 .isEqualTo(false);
 
+        // conflicting IP address versions
+        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '64:ff9a:f:f:f:f:f:f'"))
+                .isEqualTo(false);
+        assertThat(assertions.function("contains", "'2001:abcd:ef01:2345:6789:abcd:ef01:234/60'", "IPADDRESS '127.0.0.0'"))
+                .isEqualTo(false);
+
         // NULL argument
         assertThat(assertions.function("contains", "'10.0.0.1/0'", "cast(NULL as IPADDRESS)"))
                 .isNull(BOOLEAN);
@@ -378,132 +362,171 @@ public void testIpAddressContains()
         assertThat(assertions.function("contains", "NULL", "cast(NULL as IPADDRESS)"))
                 .isNull(BOOLEAN);
 
-        // Invalid argument
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'64:ff9b::10.0.0.0/64'", "IPADDRESS '0.0.0.0'").evaluate())
-                .hasMessage("IP address version should be the same");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'0.0.0.0/0'", "IPADDRESS '64:ff9b::10.0.0.0'").evaluate())
-                .hasMessage("IP address version should be the same");
-
         // Invalid prefix length
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'0.0.0.0/-1'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'0.0.0.0/-1'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid prefix length");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'64:ff9b::10.0.0.0/-1'", "IPADDRESS '64:ff9b::10.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'64:ff9b::10.0.0.0/-1'", "IPADDRESS '64:ff9b::10.0.0.0'")::evaluate)
                 .hasMessage("Invalid prefix length");
 
         // Invalid CIDR format
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'0.0.0.1/0'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'0.0.0.1/0'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'1.0.0.0/1'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'1.0.0.0/1'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'128.1.1.1/1'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'128.1.1.1/1'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'129.0.0.0/1'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'129.0.0.0/1'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'192.1.1.1/2'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'192.1.1.1/2'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'193.0.0.0/2'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'193.0.0.0/2'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'224.1.1.1/3'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'224.1.1.1/3'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'225.0.0.0/3'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'225.0.0.0/3'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'240.1.1.1/4'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'240.1.1.1/4'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'241.0.0.0/4'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'241.0.0.0/4'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'248.1.1.1/5'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'248.1.1.1/5'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'249.0.0.0/5'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'249.0.0.0/5'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'252.1.1.1/6'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'252.1.1.1/6'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'253.0.0.0/6'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'253.0.0.0/6'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'254.1.1.1/7'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'254.1.1.1/7'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.0.0.0/7'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.0.0.0/7'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.1.1.1/8'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.1.1.1/8'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.0.1.1/9'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.0.1.1/9'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.129.0.0/9'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.129.0.0/9'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.0.1.1/10'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.0.1.1/10'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.193.0.0/10'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.193.0.0/10'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.0.1.1/11'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.0.1.1/11'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.225.0.0/11'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.225.0.0/11'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.240.1.1/12'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.240.1.1/12'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.241.0.0/12'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.241.0.0/12'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.248.1.1/13'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.248.1.1/13'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.249.1.1/13'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.249.1.1/13'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.252.1.1/14'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.252.1.1/14'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.253.0.0/14'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.253.0.0/14'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.254.1.1/15'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.254.1.1/15'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.1.1/15'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.1.1/15'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.0.1/16'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.0.1/16'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.1.0/16'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.1.0/16'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.0.1/17'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.0.1/17'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.129.0/17'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.129.0/17'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.0.1/18'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.0.1/18'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.193.0/18'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.193.0/18'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.0.1/19'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.0.1/19'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.225.0/19'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.225.0/19'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.240.1/20'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.240.1/20'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.241.0/20'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.241.0/20'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.248.1/21'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.248.1/21'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.249.1/21'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.249.1/21'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.252.1/22'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.252.1/22'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.253.0/22'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.253.0/22'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.254.1/23'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.254.1/23'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.255.1/23'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.255.1/23'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'255.255.255.1/24'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'255.255.255.1/24'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'10.0.0.1/33'", "IPADDRESS '0.0.0.0'").evaluate())
-                .hasMessage("Prefix length exceeds address length");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'64:ff9b::10.0.0.0/129'", "IPADDRESS '0.0.0.0'").evaluate())
-                .hasMessage("Prefix length exceeds address length");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'2620:109:c006:104::/250'", "IPADDRESS '2620:109:c006:104::'").evaluate())
-                .hasMessage("Prefix length exceeds address length");
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'10.0.0.1/33'", "IPADDRESS '0.0.0.0'")::evaluate)
+                .hasMessage("Invalid CIDR");
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'64:ff9b::10.0.0.0/129'", "IPADDRESS '0.0.0.0'")::evaluate)
+                .hasMessage("Invalid CIDR");
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'2620:109:c006:104::/250'", "IPADDRESS '2620:109:c006:104::'")::evaluate)
+                .hasMessage("Invalid CIDR");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'x.x.x.x'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'x.x.x.x'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'x:x:x:10.0.0.0'", "IPADDRESS '64:ff9b::10.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'x:x:x:10.0.0.0'", "IPADDRESS '64:ff9b::10.0.0.0'")::evaluate)
                 .hasMessage("Invalid CIDR");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'x.x.x.x/1'", "IPADDRESS '0.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'x.x.x.x/1'", "IPADDRESS '0.0.0.0'")::evaluate)
                 .hasMessage("Invalid network IP address");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'x:x:x:10.0.0.0/1'", "IPADDRESS '64:ff9b::10.0.0.0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'x:x:x:10.0.0.0/1'", "IPADDRESS '64:ff9b::10.0.0.0'")::evaluate)
                 .hasMessage("Invalid network IP address");
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "'2001:0DB8:0:CD3/60'", "IPADDRESS '2001:0DB8::CD30:0:0:0:0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "'2001:0DB8:0:CD3/60'", "IPADDRESS '2001:0DB8::CD30:0:0:0:0'")::evaluate)
                 .hasMessage("Invalid network IP address");
     }
+
+    @Test
+    public void testIPv4MappedAddresses()
+    {
+        assertThat(assertions.function("contains", "'0:0:0:0:0:ffff:aabb:ccdd/96'", "IPADDRESS '170.187.204.221'"))
+                .isEqualTo(true);
+        assertThat(assertions.function("contains", "'0:0:0:0:0:ffff::/96'", "IPADDRESS '170.187.204.221'"))
+                .isEqualTo(true);
+        assertThat(assertions.function("contains", "'::aabb:ccdd/96'", "IPADDRESS '170.187.204.221'"))
+                .isEqualTo(false);
+        assertThat(assertions.function("contains", "'1:2:3:4:5:6:aabb:ccdd/96'", "IPADDRESS '170.187.204.221'"))
+                .isEqualTo(false);
+
+        assertThat(assertions.function("contains", "'170.0.0.0/8'", "IPADDRESS '0:0:0:0:0:ffff:aa01:0203'"))
+                .isEqualTo(true);
+        assertThat(assertions.function("contains", "'170.187.0.0/16'", "IPADDRESS '0:0:0:0:0:ffff:aabb:0203'"))
+                .isEqualTo(true);
+        assertThat(assertions.function("contains", "'170.187.204.0/24'", "IPADDRESS '0:0:0:0:0:ffff:aabb:cc03'"))
+                .isEqualTo(true);
+
+        assertThat(assertions.function("contains", "'170.187.204.0/24'", "IPADDRESS '0:0:0:0:0:0:aabb:cc03'"))
+                .isEqualTo(false);
+
+        // 127.0.0.1 equals ::ffff:7f00:0001 in IPv6
+        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '127.0.0.0'"))
+                .isEqualTo(false);
+        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '127.0.0.1'"))
+                .isEqualTo(true);
+        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '127.0.0.2'"))
+                .isEqualTo(false);
+
+        assertThat(assertions.function("contains", "'::ffff:7f00:0001/128'", "IPADDRESS '127.0.0.0'"))
+                .isEqualTo(false);
+        assertThat(assertions.function("contains", "'::ffff:7f00:0001/128'", "IPADDRESS '127.0.0.1'"))
+                .isEqualTo(true);
+        assertThat(assertions.function("contains", "'::ffff:7f00:0001/128'", "IPADDRESS '127.0.0.2'"))
+                .isEqualTo(false);
+
+        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '::ffff:7f00:0000'"))
+                .isEqualTo(false);
+        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '::ffff:7f00:0001'"))
+                .isEqualTo(true);
+        assertThat(assertions.function("contains", "'127.0.0.1/32'", "IPADDRESS '::ffff:7f00:0002'"))
+                .isEqualTo(false);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestJsonExtract.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestJsonExtract.java
index e6c261d3f6d3..1594bd9aea80 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestJsonExtract.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestJsonExtract.java
@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
@@ -30,6 +31,7 @@
 import static io.trino.operator.scalar.JsonExtract.ObjectFieldJsonExtractor;
 import static io.trino.operator.scalar.JsonExtract.ScalarValueJsonExtractor;
 import static io.trino.operator.scalar.JsonExtract.generateExtractor;
+import static io.trino.plugin.base.util.JsonUtils.jsonFactory;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
@@ -328,6 +330,13 @@ public void testInvalidExtracts()
         assertInvalidExtract("{ \"store\": { \"book\": [{ \"title\": \"title\" }] } }", "$.store.book[", "Invalid JSON path: '$.store.book['");
     }
 
+    @Test
+    public void testExtractLongString()
+    {
+        String longString = "a".repeat(StreamReadConstraints.DEFAULT_MAX_STRING_LEN + 1);
+        assertEquals(doJsonExtract("{\"key\": \"" + longString + "\"}", "$.key"), '"' + longString + '"');
+    }
+
     @Test
     public void testNoAutomaticEncodingDetection()
     {
@@ -341,7 +350,7 @@ public void testNoAutomaticEncodingDetection()
     private static String doExtract(JsonExtractor<Slice> jsonExtractor, String json)
             throws IOException
     {
-        JsonFactory jsonFactory = new JsonFactory();
+        JsonFactory jsonFactory = jsonFactory();
         JsonParser jsonParser = jsonFactory.createParser(json);
         jsonParser.nextToken(); // Advance to the first token
         Slice extract = jsonExtractor.extract(jsonParser);
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestJsonFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestJsonFunctions.java
index a6d426a0ed71..8dfa232347d2 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestJsonFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestJsonFunctions.java
@@ -89,16 +89,16 @@ public void testIsJsonScalar()
         assertThat(assertions.function("is_json_scalar", "'{\"a\": 1, \"b\": 2}'"))
                 .isEqualTo(false);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("is_json_scalar", "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("is_json_scalar", "''")::evaluate)
                 .hasMessage("Invalid JSON value: ");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("is_json_scalar", "'[1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("is_json_scalar", "'[1'")::evaluate)
                 .hasMessage("Invalid JSON value: [1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("is_json_scalar", "'1 trailing'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("is_json_scalar", "'1 trailing'")::evaluate)
                 .hasMessage("Invalid JSON value: 1 trailing");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("is_json_scalar", "'[1, 2] trailing'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("is_json_scalar", "'[1, 2] trailing'")::evaluate)
                 .hasMessage("Invalid JSON value: [1, 2] trailing");
     }
 
@@ -663,28 +663,28 @@ public void testJsonArrayContainsInvalid()
     @Test
     public void testInvalidJsonParse()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.expression("JSON 'INVALID'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("JSON 'INVALID'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("json_parse", "'INVALID'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("json_parse", "'INVALID'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("json_parse", "'\"x\": 1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("json_parse", "'\"x\": 1'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("json_parse", "'{}{'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("json_parse", "'{}{'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("json_parse", "'{} \"a\"'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("json_parse", "'{} \"a\"'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("json_parse", "'{}{abc'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("json_parse", "'{}{abc'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("json_parse", "'{}abc'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("json_parse", "'{}abc'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("json_parse", "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("json_parse", "''")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
@@ -747,19 +747,19 @@ public void testJsonSize()
         assertThat(assertions.function("json_size", "JSON '[1,2,3]'", "null"))
                 .isNull(BIGINT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("json_size", "'{\"\":\"\"}'", "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("json_size", "'{\"\":\"\"}'", "''")::evaluate)
                 .hasMessage("Invalid JSON path: ''");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("json_size", "'{\"\":\"\"}'", "CHAR ' '").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("json_size", "'{\"\":\"\"}'", "CHAR ' '")::evaluate)
                 .hasMessage("Invalid JSON path: ' '");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("json_size", "'{\"\":\"\"}'", "'.'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("json_size", "'{\"\":\"\"}'", "'.'")::evaluate)
                 .hasMessage("Invalid JSON path: '.'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("json_size", "'{\"\":\"\"}'", "'null'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("json_size", "'{\"\":\"\"}'", "'null'")::evaluate)
                 .hasMessage("Invalid JSON path: 'null'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("json_size", "'{\"\":\"\"}'", "'null'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("json_size", "'{\"\":\"\"}'", "'null'")::evaluate)
                 .hasMessage("Invalid JSON path: 'null'");
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestJsonInputFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestJsonInputFunctions.java
index 302f8db1df33..307844b464de 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestJsonInputFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestJsonInputFunctions.java
@@ -77,7 +77,7 @@ public void testVarcharToJson()
                 .isEqualTo(JSON_OBJECT);
 
         // with unsuppressed input conversion error
-        assertTrinoExceptionThrownBy(() -> assertions.expression("\"$varchar_to_json\"('" + ERROR_INPUT + "', true)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("\"$varchar_to_json\"('" + ERROR_INPUT + "', true)")::evaluate)
                 .hasErrorCode(JSON_INPUT_CONVERSION_ERROR)
                 .hasMessage("conversion to JSON failed: ");
 
@@ -100,7 +100,7 @@ public void testVarbinaryUtf8ToJson()
 
         // wrong input encoding
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("\"$varbinary_utf8_to_json\"(" + toVarbinary(INPUT, UTF_16LE) + ", true)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("\"$varbinary_utf8_to_json\"(" + toVarbinary(INPUT, UTF_16LE) + ", true)")::evaluate)
                 .hasErrorCode(JSON_INPUT_CONVERSION_ERROR)
                 .hasMessage("conversion to JSON failed: ");
 
@@ -112,7 +112,7 @@ public void testVarbinaryUtf8ToJson()
         // correct encoding, incorrect input
 
         // with unsuppressed input conversion error
-        assertTrinoExceptionThrownBy(() -> assertions.expression("\"$varbinary_utf8_to_json\"(" + toVarbinary(ERROR_INPUT, UTF_8) + ", true)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("\"$varbinary_utf8_to_json\"(" + toVarbinary(ERROR_INPUT, UTF_8) + ", true)")::evaluate)
                 .hasErrorCode(JSON_INPUT_CONVERSION_ERROR)
                 .hasMessage("conversion to JSON failed: ");
 
@@ -132,11 +132,11 @@ public void testVarbinaryUtf16ToJson()
         // wrong input encoding
         String varbinaryLiteral = toVarbinary(INPUT, UTF_16BE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("\"$varbinary_utf16_to_json\"(" + varbinaryLiteral + ", true)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("\"$varbinary_utf16_to_json\"(" + varbinaryLiteral + ", true)")::evaluate)
                 .hasErrorCode(JSON_INPUT_CONVERSION_ERROR)
                 .hasMessage("conversion to JSON failed: ");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("\"$varbinary_utf16_to_json\"(" + toVarbinary(INPUT, UTF_8) + ", true)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("\"$varbinary_utf16_to_json\"(" + toVarbinary(INPUT, UTF_8) + ", true)")::evaluate)
                 .hasErrorCode(JSON_INPUT_CONVERSION_ERROR)
                 .hasMessage("conversion to JSON failed: ");
 
@@ -148,7 +148,7 @@ public void testVarbinaryUtf16ToJson()
         // correct encoding, incorrect input
 
         // with unsuppressed input conversion error
-        assertTrinoExceptionThrownBy(() -> assertions.expression("\"$varbinary_utf16_to_json\"(" + toVarbinary(ERROR_INPUT, UTF_16LE) + ", true)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("\"$varbinary_utf16_to_json\"(" + toVarbinary(ERROR_INPUT, UTF_16LE) + ", true)")::evaluate)
                 .hasErrorCode(JSON_INPUT_CONVERSION_ERROR)
                 .hasMessage("conversion to JSON failed: ");
 
@@ -167,11 +167,11 @@ public void testVarbinaryUtf32ToJson()
 
         // wrong input encoding
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("\"$varbinary_utf32_to_json\"(" + toVarbinary(INPUT, Charset.forName("UTF-32BE")) + ", true)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("\"$varbinary_utf32_to_json\"(" + toVarbinary(INPUT, Charset.forName("UTF-32BE")) + ", true)")::evaluate)
                 .hasErrorCode(JSON_INPUT_CONVERSION_ERROR)
                 .hasMessage("conversion to JSON failed: ");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("\"$varbinary_utf32_to_json\"(" + toVarbinary(INPUT, UTF_8) + ", true)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("\"$varbinary_utf32_to_json\"(" + toVarbinary(INPUT, UTF_8) + ", true)")::evaluate)
                 .hasErrorCode(JSON_INPUT_CONVERSION_ERROR)
                 .hasMessage("conversion to JSON failed: ");
 
@@ -183,7 +183,7 @@ public void testVarbinaryUtf32ToJson()
         // correct encoding, incorrect input
 
         // with unsuppressed input conversion error
-        assertTrinoExceptionThrownBy(() -> assertions.expression("\"$varbinary_utf32_to_json\"(" + toVarbinary(ERROR_INPUT, Charset.forName("UTF-32LE")) + ", true)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("\"$varbinary_utf32_to_json\"(" + toVarbinary(ERROR_INPUT, Charset.forName("UTF-32LE")) + ", true)")::evaluate)
                 .hasErrorCode(JSON_INPUT_CONVERSION_ERROR)
                 .hasMessage("conversion to JSON failed: ");
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestLambdaExpression.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestLambdaExpression.java
index 2340d24e0c8a..d650d3e866f8 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestLambdaExpression.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestLambdaExpression.java
@@ -296,22 +296,22 @@ public void testTypeCombinations()
     @Test
     public void testFunctionParameter()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.expression("count(x -> x)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("count(x -> x)")::evaluate)
                 .hasErrorCode(FUNCTION_NOT_FOUND)
                 .hasMessage("line 1:12: Unexpected parameters (<function>) for function count. Expected: count(), count(t) T");
-        assertTrinoExceptionThrownBy(() -> assertions.expression("max(x -> x)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("max(x -> x)")::evaluate)
                 .hasErrorCode(FUNCTION_NOT_FOUND)
-                .hasMessage("line 1:12: Unexpected parameters (<function>) for function max. Expected: max(t) T:orderable, max(e, bigint) E:orderable");
-        assertTrinoExceptionThrownBy(() -> assertions.expression("sqrt(x -> x)").evaluate())
+                .hasMessage("line 1:12: Unexpected parameters (<function>) for function max. Expected: max(e, bigint) E:orderable, max(t) T:orderable");
+        assertTrinoExceptionThrownBy(assertions.expression("sqrt(x -> x)")::evaluate)
                 .hasErrorCode(FUNCTION_NOT_FOUND)
                 .hasMessage("line 1:12: Unexpected parameters (<function>) for function sqrt. Expected: sqrt(double)");
-        assertTrinoExceptionThrownBy(() -> assertions.expression("sqrt(x -> x, 123, x -> x)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("sqrt(x -> x, 123, x -> x)")::evaluate)
                 .hasErrorCode(FUNCTION_NOT_FOUND)
                 .hasMessage("line 1:12: Unexpected parameters (<function>, integer, <function>) for function sqrt. Expected: sqrt(double)");
-        assertTrinoExceptionThrownBy(() -> assertions.expression("pow(x -> x, 123)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("pow(x -> x, 123)")::evaluate)
                 .hasErrorCode(FUNCTION_NOT_FOUND)
                 .hasMessage("line 1:12: Unexpected parameters (<function>, integer) for function pow. Expected: pow(double, double)");
-        assertTrinoExceptionThrownBy(() -> assertions.expression("pow(123, x -> x)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("pow(123, x -> x)")::evaluate)
                 .hasErrorCode(FUNCTION_NOT_FOUND)
                 .hasMessage("line 1:12: Unexpected parameters (integer, <function>) for function pow. Expected: pow(double, double)");
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestLikeFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestLikeFunctions.java
index 97b9d992b6c8..be16b5588e8b 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestLikeFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestLikeFunctions.java
@@ -15,9 +15,9 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import io.trino.likematcher.LikeMatcher;
 import io.trino.spi.TrinoException;
 import io.trino.sql.query.QueryAssertions;
+import io.trino.type.LikePattern;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -68,7 +68,7 @@ private static Slice offsetHeapSlice(String value)
     @Test
     public void testLikeBasic()
     {
-        LikeMatcher matcher = LikeMatcher.compile(utf8Slice("f%b__").toStringUtf8(), Optional.empty());
+        LikePattern matcher = LikePattern.compile(utf8Slice("f%b__").toStringUtf8(), Optional.empty());
         assertTrue(likeVarchar(utf8Slice("foobar"), matcher));
         assertTrue(likeVarchar(offsetHeapSlice("foobar"), matcher));
 
@@ -108,7 +108,7 @@ public void testLikeBasic()
     @Test
     public void testLikeChar()
     {
-        LikeMatcher matcher = LikeMatcher.compile(utf8Slice("f%b__").toStringUtf8(), Optional.empty());
+        LikePattern matcher = LikePattern.compile(utf8Slice("f%b__").toStringUtf8(), Optional.empty());
         assertTrue(likeChar(6L, utf8Slice("foobar"), matcher));
         assertTrue(likeChar(6L, offsetHeapSlice("foobar"), matcher));
         assertTrue(likeChar(6L, utf8Slice("foob"), matcher));
@@ -201,7 +201,7 @@ public void testLikeChar()
     @Test
     public void testLikeSpacesInPattern()
     {
-        LikeMatcher matcher = LikeMatcher.compile(utf8Slice("ala  ").toStringUtf8(), Optional.empty());
+        LikePattern matcher = LikePattern.compile(utf8Slice("ala  ").toStringUtf8(), Optional.empty());
         assertTrue(likeVarchar(utf8Slice("ala  "), matcher));
         assertFalse(likeVarchar(utf8Slice("ala"), matcher));
     }
@@ -209,28 +209,28 @@ public void testLikeSpacesInPattern()
     @Test
     public void testLikeNewlineInPattern()
     {
-        LikeMatcher matcher = LikeMatcher.compile(utf8Slice("%o\nbar").toStringUtf8(), Optional.empty());
+        LikePattern matcher = LikePattern.compile(utf8Slice("%o\nbar").toStringUtf8(), Optional.empty());
         assertTrue(likeVarchar(utf8Slice("foo\nbar"), matcher));
     }
 
     @Test
     public void testLikeNewlineBeforeMatch()
     {
-        LikeMatcher matcher = LikeMatcher.compile(utf8Slice("%b%").toStringUtf8(), Optional.empty());
+        LikePattern matcher = LikePattern.compile(utf8Slice("%b%").toStringUtf8(), Optional.empty());
         assertTrue(likeVarchar(utf8Slice("foo\nbar"), matcher));
     }
 
     @Test
     public void testLikeNewlineInMatch()
     {
-        LikeMatcher matcher = LikeMatcher.compile(utf8Slice("f%b%").toStringUtf8(), Optional.empty());
+        LikePattern matcher = LikePattern.compile(utf8Slice("f%b%").toStringUtf8(), Optional.empty());
         assertTrue(likeVarchar(utf8Slice("foo\nbar"), matcher));
     }
 
     @Test
     public void testLikeUtf8Pattern()
     {
-        LikeMatcher matcher = likePattern(utf8Slice("%\u540d\u8a89%"), utf8Slice("\\"));
+        LikePattern matcher = likePattern(utf8Slice("%\u540d\u8a89%"), utf8Slice("\\"));
         assertFalse(likeVarchar(utf8Slice("foo"), matcher));
     }
 
@@ -238,28 +238,28 @@ public void testLikeUtf8Pattern()
     public void testLikeInvalidUtf8Value()
     {
         Slice value = Slices.wrappedBuffer(new byte[] {'a', 'b', 'c', (byte) 0xFF, 'x', 'y'});
-        LikeMatcher matcher = likePattern(utf8Slice("%b%"), utf8Slice("\\"));
+        LikePattern matcher = likePattern(utf8Slice("%b%"), utf8Slice("\\"));
         assertTrue(likeVarchar(value, matcher));
     }
 
     @Test
     public void testBackslashesNoSpecialTreatment()
     {
-        LikeMatcher matcher = LikeMatcher.compile(utf8Slice("\\abc\\/\\\\").toStringUtf8(), Optional.empty());
+        LikePattern matcher = LikePattern.compile(utf8Slice("\\abc\\/\\\\").toStringUtf8(), Optional.empty());
         assertTrue(likeVarchar(utf8Slice("\\abc\\/\\\\"), matcher));
     }
 
     @Test
     public void testSelfEscaping()
     {
-        LikeMatcher matcher = likePattern(utf8Slice("\\\\abc\\%"), utf8Slice("\\"));
+        LikePattern matcher = likePattern(utf8Slice("\\\\abc\\%"), utf8Slice("\\"));
         assertTrue(likeVarchar(utf8Slice("\\abc%"), matcher));
     }
 
     @Test
     public void testAlternateEscapedCharacters()
     {
-        LikeMatcher matcher = likePattern(utf8Slice("xxx%x_abcxx"), utf8Slice("x"));
+        LikePattern matcher = likePattern(utf8Slice("xxx%x_abcxx"), utf8Slice("x"));
         assertTrue(likeVarchar(utf8Slice("x%_abcx"), matcher));
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestLuhnCheckFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestLuhnCheckFunction.java
index 0ecf36fc6038..bd77c64cd50f 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestLuhnCheckFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestLuhnCheckFunction.java
@@ -58,16 +58,16 @@ public void testLuhnCheck()
         assertThat(assertions.function("luhn_check", "NULL"))
                 .isNull(BOOLEAN);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("luhn_check", "'abcd424242424242'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("luhn_check", "'abcd424242424242'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
         assertThat(assertions.function("luhn_check", "'123456789'"))
                 .isEqualTo(false);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("luhn_check", "'\u4EA0\u4EFF\u4EA112345'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("luhn_check", "'\u4EA0\u4EFF\u4EA112345'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("luhn_check", "'4242\u4FE124242424242'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("luhn_check", "'4242\u4FE124242424242'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestMapTransformKeysFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestMapTransformKeysFunction.java
index dbdb2a472edd..afad49f4a35d 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestMapTransformKeysFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestMapTransformKeysFunction.java
@@ -134,42 +134,42 @@ public void testDuplicateKeys()
         assertTrinoExceptionThrownBy(() -> assertions.expression("transform_keys(a, (k, v) -> k % 3)")
                 .binding("a", "map(ARRAY[1, 2, 3, 4], ARRAY['a', 'b', 'c', 'd'])")
                 .evaluate())
-                .hasMessage("Duplicate keys (1) are not allowed");
+                .hasMessage("Duplicate map keys (1) are not allowed");
 
         assertTrinoExceptionThrownBy(() -> assertions.expression("transform_keys(a, (k, v) -> k % 2 = 0)")
                 .binding("a", "map(ARRAY[1, 2, 3], ARRAY['a', 'b', 'c'])")
                 .evaluate())
-                .hasMessage("Duplicate keys (false) are not allowed");
+                .hasMessage("Duplicate map keys (false) are not allowed");
 
         assertTrinoExceptionThrownBy(() -> assertions.expression("transform_keys(a, (k, v) -> k - floor(k))")
                 .binding("a", "map(ARRAY[1.5E0, 2.5E0, 3.5E0], ARRAY['a', 'b', 'c'])")
                 .evaluate())
-                .hasMessage("Duplicate keys (0.5) are not allowed");
+                .hasMessage("Duplicate map keys (0.5) are not allowed");
 
         assertTrinoExceptionThrownBy(() -> assertions.expression("transform_keys(a, (k, v) -> v)")
                 .binding("a", "map(ARRAY[1, 2, 3, 4], ARRAY['a', 'b', 'c', 'b'])")
                 .evaluate())
-                .hasMessage("Duplicate keys (b) are not allowed");
+                .hasMessage("Duplicate map keys (b) are not allowed");
 
         assertTrinoExceptionThrownBy(() -> assertions.expression("transform_keys(a, (k, v) -> substr(k, 1, 3))")
                 .binding("a", "map(ARRAY['abc1', 'cba2', 'abc3'], ARRAY[1, 2, 3])")
                 .evaluate())
-                .hasMessage("Duplicate keys (abc) are not allowed");
+                .hasMessage("Duplicate map keys (abc) are not allowed");
 
         assertTrinoExceptionThrownBy(() -> assertions.expression("transform_keys(a, (k, v) -> array_sort(k || v))")
                 .binding("a", "map(ARRAY[ARRAY[1], ARRAY[2]], ARRAY[2, 1])")
                 .evaluate())
-                .hasMessage("Duplicate keys ([1, 2]) are not allowed");
+                .hasMessage("Duplicate map keys ([1, 2]) are not allowed");
 
         assertTrinoExceptionThrownBy(() -> assertions.expression("transform_keys(a, (k, v) -> DATE '2001-08-22')")
                 .binding("a", "map(ARRAY[1, 2], ARRAY[null, null])")
                 .evaluate())
-                .hasMessage("Duplicate keys (2001-08-22) are not allowed");
+                .hasMessage("Duplicate map keys (2001-08-22) are not allowed");
 
         assertTrinoExceptionThrownBy(() -> assertions.expression("transform_keys(a, (k, v) -> TIMESTAMP '2001-08-22 03:04:05.321')")
                 .binding("a", "map(ARRAY[1, 2], ARRAY[null, null])")
                 .evaluate())
-                .hasMessage("Duplicate keys (2001-08-22 03:04:05.321) are not allowed");
+                .hasMessage("Duplicate map keys (2001-08-22 03:04:05.321) are not allowed");
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestMathFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestMathFunctions.java
index b1164e0c5cd5..c2be63f15ca9 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestMathFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestMathFunctions.java
@@ -128,16 +128,16 @@ public void testAbs()
         assertThat(assertions.function("abs", "REAL '-754.1985'"))
                 .isEqualTo(754.1985f);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("abs", "TINYINT '%s'".formatted(Byte.MIN_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("abs", "TINYINT '%s'".formatted(Byte.MIN_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("abs", "SMALLINT '%s'".formatted(Short.MIN_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("abs", "SMALLINT '%s'".formatted(Short.MIN_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("abs", "INTEGER '%s'".formatted(Integer.MIN_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("abs", "INTEGER '%s'".formatted(Integer.MIN_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("abs", "-9223372036854775807 - if(rand() < 10, 1, 1)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("abs", "-9223372036854775807 - if(rand() < 10, 1, 1)")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
         assertThat(assertions.function("abs", "DECIMAL '123.45'"))
@@ -1063,6 +1063,9 @@ public void testLog()
     @Test
     public void testMod()
     {
+        assertThat(assertions.function("mod", "DECIMAL '0.0'", "DECIMAL '2.0'"))
+                .isEqualTo(decimal("0", createDecimalType(1, 1)));
+
         for (int left : intLefts) {
             for (int right : intRights) {
                 assertThat(assertions.function("mod", Integer.toString(left), Integer.toString(right)))
@@ -1171,7 +1174,7 @@ public void testMod()
         assertThat(assertions.function("mod", "CAST(NULL as DECIMAL(1,0))", "DECIMAL '5.0'"))
                 .isNull(createDecimalType(2, 1));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("mod", "DECIMAL '5.0'", "DECIMAL '0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("mod", "DECIMAL '5.0'", "DECIMAL '0'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
     }
 
@@ -1421,58 +1424,58 @@ public void testRandom()
         assertThat(assertions.expression("random(-3000000000, 5000000000)"))
                 .hasType(BIGINT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("rand", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("rand", "-1")::evaluate)
                 .hasMessage("bound must be positive");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("rand", "-3000000000").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("rand", "-3000000000")::evaluate)
                 .hasMessage("bound must be positive");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "TINYINT '5'", "TINYINT '3'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "TINYINT '5'", "TINYINT '3'")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "TINYINT '5'", "TINYINT '5'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "TINYINT '5'", "TINYINT '5'")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "TINYINT '-5'", "TINYINT '-10'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "TINYINT '-5'", "TINYINT '-10'")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "TINYINT '-5'", "TINYINT '-5'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "TINYINT '-5'", "TINYINT '-5'")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "SMALLINT '30000'", "SMALLINT '10000'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "SMALLINT '30000'", "SMALLINT '10000'")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "SMALLINT '30000'", "SMALLINT '30000'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "SMALLINT '30000'", "SMALLINT '30000'")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "SMALLINT '-30000'", "SMALLINT '-31000'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "SMALLINT '-30000'", "SMALLINT '-31000'")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "SMALLINT '-30000'", "SMALLINT '-30000'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "SMALLINT '-30000'", "SMALLINT '-30000'")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "1000", "500").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "1000", "500")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "500", "500").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "500", "500")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "-500", "-600").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "-500", "-600")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "-500", "-500").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "-500", "-500")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "3000000000", "1000000000").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "3000000000", "1000000000")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "3000000000", "3000000000").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "3000000000", "3000000000")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "-3000000000", "-4000000000").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "-3000000000", "-4000000000")::evaluate)
                 .hasMessage("start value must be less than stop value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("random", "-3000000000", "-3000000000").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("random", "-3000000000", "-3000000000")::evaluate)
                 .hasMessage("start value must be less than stop value");
     }
 
@@ -1658,6 +1661,13 @@ public void testRound()
         assertThat(assertions.function("round", "DOUBLE '3000.1234567890123456789'", "16"))
                 .isEqualTo(3000.1234567890124);
 
+        // 1.8E292*10^16 is infinity.
+        assertThat(assertions.function("round", "DOUBLE '1.8E292'", "16"))
+                .isEqualTo(1.8E292);
+
+        assertThat(assertions.function("round", "DOUBLE '-1.8E292'", "16"))
+                .isEqualTo(-1.8E292);
+
         assertThat(assertions.function("round", "TINYINT '3'", "TINYINT '1'"))
                 .isEqualTo((byte) 3);
 
@@ -1702,6 +1712,13 @@ public void testRound()
         assertThat(assertions.function("round", "REAL '3000.1234567890123456789'", "16"))
                 .isEqualTo(3000.1235f);
 
+        // 3.4028235e+38 * 10 ^ 271 is infinity
+        assertThat(assertions.function("round", "REAL '3.4028235e+38'", "271"))
+                .isEqualTo(3.4028235e+38f);
+
+        assertThat(assertions.function("round", "REAL '-3.4028235e+38'", "271"))
+                .isEqualTo(-3.4028235e+38f);
+
         assertThat(assertions.function("round", "3", "1"))
                 .isEqualTo(3);
 
@@ -1892,43 +1909,43 @@ public void testRound()
         assertThat(assertions.function("round", "-9223372036854775807", "-18"))
                 .isEqualTo(-9000000000000000000L);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "TINYINT '127'", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "TINYINT '127'", "-1")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "TINYINT '-128'", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "TINYINT '-128'", "-1")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "SMALLINT '32767'", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "SMALLINT '32767'", "-1")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "SMALLINT '32767'", "-3").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "SMALLINT '32767'", "-3")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "SMALLINT '-32768'", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "SMALLINT '-32768'", "-1")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "SMALLINT '-32768'", "-3").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "SMALLINT '-32768'", "-3")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "2147483647", "-100").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "2147483647", "-100")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "2147483647", "-2147483648").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "2147483647", "-2147483648")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "9223372036854775807", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "9223372036854775807", "-1")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "9223372036854775807", "-3").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "9223372036854775807", "-3")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "9223372036854775807", "-19").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "9223372036854775807", "-19")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "-9223372036854775807", "-20").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "-9223372036854775807", "-20")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "-9223372036854775807", "-2147483648").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "-9223372036854775807", "-2147483648")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
         // ROUND short DECIMAL -> short DECIMAL
@@ -2281,10 +2298,10 @@ public void testRound()
         assertThat(assertions.function("round", "DECIMAL '9999999999999999999999999999999999999.9'", "1"))
                 .isEqualTo(decimal("9999999999999999999999999999999999999.9", createDecimalType(38, 1)));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "DECIMAL '9999999999999999999999999999999999999.9'", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "DECIMAL '9999999999999999999999999999999999999.9'", "0")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("round", "DECIMAL '9999999999999999999999999999999999999.9'", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("round", "DECIMAL '9999999999999999999999999999999999999.9'", "-1")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
         assertThat(assertions.function("round", "DECIMAL  '1329123201320737513'", "-3"))
@@ -2731,7 +2748,7 @@ public void testGreatest()
         assertThat(assertions.function("greatest", nCopies(127, "1E0")))
                 .hasType(DOUBLE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("greatest", nCopies(128, "rand()")).evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("greatest", nCopies(128, "rand()"))::evaluate)
                 .hasErrorCode(TOO_MANY_ARGUMENTS)
                 .hasMessage("line 1:8: Too many arguments for function call greatest()");
 
@@ -3246,7 +3263,7 @@ public void testToBase()
         assertThat(assertions.function("to_base", "NULL", "NULL"))
                 .isNull(createVarcharType(64));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("to_base", "255", "1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("to_base", "255", "1")::evaluate)
                 .hasMessage("Radix must be between 2 and 36");
     }
 
@@ -3277,22 +3294,22 @@ public void testFromBase()
         assertThat(assertions.function("from_base", "NULL", "NULL"))
                 .isNull(BIGINT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_base", "'Z'", "37").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_base", "'Z'", "37")::evaluate)
                 .hasMessage("Radix must be between 2 and 36");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_base", "'Z'", "35").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_base", "'Z'", "35")::evaluate)
                 .hasMessage("Not a valid base-35 number: Z");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_base", "'9223372036854775808'", "10").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_base", "'9223372036854775808'", "10")::evaluate)
                 .hasMessage("Not a valid base-10 number: 9223372036854775808");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_base", "'Z'", "37").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_base", "'Z'", "37")::evaluate)
                 .hasMessage("Radix must be between 2 and 36");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_base", "'Z'", "35").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_base", "'Z'", "35")::evaluate)
                 .hasMessage("Not a valid base-35 number: Z");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_base", "'9223372036854775808'", "10").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_base", "'9223372036854775808'", "10")::evaluate)
                 .hasMessage("Not a valid base-10 number: 9223372036854775808");
     }
 
@@ -3325,39 +3342,39 @@ public void testWidthBucket()
                 .isEqualTo(5L);
 
         // failure modes
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "3.14E0", "0", "4", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "3.14E0", "0", "4", "0")::evaluate)
                 .hasMessage("bucketCount must be greater than 0");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "3.14E0", "0", "4", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "3.14E0", "0", "4", "-1")::evaluate)
                 .hasMessage("bucketCount must be greater than 0");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "nan()", "0", "4", "3").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "nan()", "0", "4", "3")::evaluate)
                 .hasMessage("operand must not be NaN");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "3.14E0", "-1", "-1", "3").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "3.14E0", "-1", "-1", "3")::evaluate)
                 .hasMessage("bounds cannot equal each other");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "3.14E0", "nan()", "-1", "3").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "3.14E0", "nan()", "-1", "3")::evaluate)
                 .hasMessage("first bound must be finite");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "3.14E0", "-1", "nan()", "3").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "3.14E0", "-1", "nan()", "3")::evaluate)
                 .hasMessage("second bound must be finite");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "3.14E0", "infinity()", "-1", "3").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "3.14E0", "infinity()", "-1", "3")::evaluate)
                 .hasMessage("first bound must be finite");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "3.14E0", "-1", "infinity()", "3").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "3.14E0", "-1", "infinity()", "3")::evaluate)
                 .hasMessage("second bound must be finite");
     }
 
     @Test
     public void testWidthBucketOverflowAscending()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "infinity()", "0", "4", Long.toString(Long.MAX_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "infinity()", "0", "4", Long.toString(Long.MAX_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("Bucket for value Infinity is out of range");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "CAST(infinity() as REAL)", "0", "4", Long.toString(Long.MAX_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "CAST(infinity() as REAL)", "0", "4", Long.toString(Long.MAX_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("Bucket for value Infinity is out of range");
     }
@@ -3365,11 +3382,11 @@ public void testWidthBucketOverflowAscending()
     @Test
     public void testWidthBucketOverflowDescending()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "infinity()", "4", "0", Long.toString(Long.MAX_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "infinity()", "4", "0", Long.toString(Long.MAX_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("Bucket for value Infinity is out of range");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "CAST(infinity() as REAL)", "4", "0", Long.toString(Long.MAX_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "CAST(infinity() as REAL)", "4", "0", Long.toString(Long.MAX_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("Bucket for value Infinity is out of range");
     }
@@ -3394,23 +3411,23 @@ public void testWidthBucketArray()
                 .isEqualTo(0L);
 
         // failure modes
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "3.14E0", "array[]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "3.14E0", "array[]")::evaluate)
                 .hasMessage("Bins cannot be an empty array");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "nan()", "array[1.0E0, 2.0E0, 3.0E0]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "nan()", "array[1.0E0, 2.0E0, 3.0E0]")::evaluate)
                 .hasMessage("Operand cannot be NaN");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "3.14E0", "array[0.0E0, infinity()]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "3.14E0", "array[0.0E0, infinity()]")::evaluate)
                 .hasMessage("Bin value must be finite, got Infinity");
 
         // fail if we aren't sorted
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "3.145E0", "array[1.0E0, 0.0E0]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "3.145E0", "array[1.0E0, 0.0E0]")::evaluate)
                 .hasMessage("Bin values are not sorted in ascending order");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "3.145E0", "array[1.0E0, 0.0E0, -1.0E0]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "3.145E0", "array[1.0E0, 0.0E0, -1.0E0]")::evaluate)
                 .hasMessage("Bin values are not sorted in ascending order");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("width_bucket", "3.145E0", "array[1.0E0, 0.3E0, 0.0E0, -1.0E0]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("width_bucket", "3.145E0", "array[1.0E0, 0.3E0, 0.0E0, -1.0E0]")::evaluate)
                 .hasMessage("Bin values are not sorted in ascending order");
 
         // this is a case that we can't catch because we are using binary search to bisect the bins array
@@ -3449,13 +3466,13 @@ public void testInverseNormalCdf()
         assertThat(assertions.function("inverse_normal_cdf", "0.5", "0.25", "0.65"))
                 .isEqualTo(0.59633011660189195);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("inverse_normal_cdf", "4", "48", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("inverse_normal_cdf", "4", "48", "0")::evaluate)
                 .hasMessage("p must be 0 > p > 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("inverse_normal_cdf", "4", "48", "1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("inverse_normal_cdf", "4", "48", "1")::evaluate)
                 .hasMessage("p must be 0 > p > 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("inverse_normal_cdf", "4", "0", "0.4").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("inverse_normal_cdf", "4", "0", "0.4")::evaluate)
                 .hasMessage("sd must be > 0");
     }
 
@@ -3492,10 +3509,10 @@ public void testNormalCdf()
         assertThat(assertions.function("normal_cdf", "0", "1", "nan()"))
                 .isEqualTo(Double.NaN);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("normal_cdf", "0", "0", "0.1985").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("normal_cdf", "0", "0", "0.1985")::evaluate)
                 .hasMessage("standardDeviation must be > 0");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("normal_cdf", "0", "nan()", "0.1985").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("normal_cdf", "0", "nan()", "0.1985")::evaluate)
                 .hasMessage("standardDeviation must be > 0");
     }
 
@@ -3514,16 +3531,16 @@ public void testInverseBetaCdf()
         assertThat(assertions.function("inverse_beta_cdf", "3", "3.6", "0.95"))
                 .isEqualTo(0.7600272463100223);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("inverse_beta_cdf", "0", "3", "0.5").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("inverse_beta_cdf", "0", "3", "0.5")::evaluate)
                 .hasMessage("a, b must be > 0");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("inverse_beta_cdf", "3", "0", "0.5").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("inverse_beta_cdf", "3", "0", "0.5")::evaluate)
                 .hasMessage("a, b must be > 0");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("inverse_beta_cdf", "3", "5", "-0.1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("inverse_beta_cdf", "3", "5", "-0.1")::evaluate)
                 .hasMessage("p must be 0 >= p >= 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("inverse_beta_cdf", "3", "5", "1.1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("inverse_beta_cdf", "3", "5", "1.1")::evaluate)
                 .hasMessage("p must be 0 >= p >= 1");
     }
 
@@ -3542,47 +3559,47 @@ public void testBetaCdf()
         assertThat(assertions.function("beta_cdf", "3", "3.6", "0.9"))
                 .isEqualTo(0.9972502881611551);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("beta_cdf", "0", "3", "0.5").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("beta_cdf", "0", "3", "0.5")::evaluate)
                 .hasMessage("a, b must be > 0");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("beta_cdf", "3", "0", "0.5").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("beta_cdf", "3", "0", "0.5")::evaluate)
                 .hasMessage("a, b must be > 0");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("beta_cdf", "3", "5", "-0.1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("beta_cdf", "3", "5", "-0.1")::evaluate)
                 .hasMessage("value must be 0 >= v >= 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("beta_cdf", "3", "5", "1.1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("beta_cdf", "3", "5", "1.1")::evaluate)
                 .hasMessage("value must be 0 >= v >= 1");
     }
 
     @Test
     public void testWilsonInterval()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("wilson_interval_lower", "-1", "100", "2.575").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("wilson_interval_lower", "-1", "100", "2.575")::evaluate)
                 .hasMessage("number of successes must not be negative");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("wilson_interval_lower", "0", "0", "2.575").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("wilson_interval_lower", "0", "0", "2.575")::evaluate)
                 .hasMessage("number of trials must be positive");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("wilson_interval_lower", "10", "5", "2.575").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("wilson_interval_lower", "10", "5", "2.575")::evaluate)
                 .hasMessage("number of successes must not be larger than number of trials");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("wilson_interval_lower", "0", "100", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("wilson_interval_lower", "0", "100", "-1")::evaluate)
                 .hasMessage("z-score must not be negative");
 
         assertThat(assertions.function("wilson_interval_lower", "1250", "1310", "1.96e0"))
                 .isEqualTo(0.9414883725395894);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("wilson_interval_upper", "-1", "100", "2.575").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("wilson_interval_upper", "-1", "100", "2.575")::evaluate)
                 .hasMessage("number of successes must not be negative");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("wilson_interval_upper", "0", "0", "2.575").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("wilson_interval_upper", "0", "0", "2.575")::evaluate)
                 .hasMessage("number of trials must be positive");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("wilson_interval_upper", "10", "5", "2.575").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("wilson_interval_upper", "10", "5", "2.575")::evaluate)
                 .hasMessage("number of successes must not be larger than number of trials");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("wilson_interval_upper", "0", "100", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("wilson_interval_upper", "0", "100", "-1")::evaluate)
                 .hasMessage("z-score must not be negative");
 
         assertThat(assertions.function("wilson_interval_upper", "1250", "1310", "1.96e0"))
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestOperatorValidation.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestOperatorValidation.java
index 82df94b01db7..4443b1c267ab 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestOperatorValidation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestOperatorValidation.java
@@ -17,7 +17,7 @@
 import io.trino.spi.function.ScalarOperator;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.type.StandardTypes;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.function.OperatorType.ADD;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestPageProcessorCompiler.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestPageProcessorCompiler.java
index 501723a6b73f..b088d7572d8d 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestPageProcessorCompiler.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestPageProcessorCompiler.java
@@ -30,8 +30,7 @@
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.InputReferenceExpression;
 import io.trino.sql.relational.RowExpression;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -63,7 +62,7 @@ public void testNoCaching()
     {
         ImmutableList.Builder<RowExpression> projectionsBuilder = ImmutableList.builder();
         ArrayType arrayType = new ArrayType(VARCHAR);
-        ResolvedFunction resolvedFunction = functionResolution.resolveFunction(QualifiedName.of("concat"), fromTypes(arrayType, arrayType));
+        ResolvedFunction resolvedFunction = functionResolution.resolveFunction("concat", fromTypes(arrayType, arrayType));
         projectionsBuilder.add(new CallExpression(resolvedFunction, ImmutableList.of(field(0, arrayType), field(1, arrayType))));
 
         ImmutableList<RowExpression> projections = projectionsBuilder.build();
@@ -102,7 +101,7 @@ public void testSanityRLE()
     public void testSanityFilterOnDictionary()
     {
         CallExpression lengthVarchar = new CallExpression(
-                functionResolution.resolveFunction(QualifiedName.of("length"), fromTypes(VARCHAR)),
+                functionResolution.resolveFunction("length", fromTypes(VARCHAR)),
                 ImmutableList.of(field(0, VARCHAR)));
         ResolvedFunction lessThan = functionResolution.resolveOperator(LESS_THAN, ImmutableList.of(BIGINT, BIGINT));
         CallExpression filter = new CallExpression(lessThan, ImmutableList.of(lengthVarchar, constant(10L, BIGINT)));
@@ -189,7 +188,7 @@ public void testNonDeterministicProject()
     {
         ResolvedFunction lessThan = functionResolution.resolveOperator(LESS_THAN, ImmutableList.of(BIGINT, BIGINT));
         CallExpression random = new CallExpression(
-                functionResolution.resolveFunction(QualifiedName.of("random"), fromTypes(BIGINT)),
+                functionResolution.resolveFunction("random", fromTypes(BIGINT)),
                 singletonList(constant(10L, BIGINT)));
         InputReferenceExpression col0 = field(0, BIGINT);
         CallExpression lessThanRandomExpression = new CallExpression(lessThan, ImmutableList.of(col0, random));
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestParametricScalarFunctionImplementationValidation.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestParametricScalarFunctionImplementationValidation.java
index cd459568b1d3..b4ef15c1fe59 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestParametricScalarFunctionImplementationValidation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestParametricScalarFunctionImplementationValidation.java
@@ -16,11 +16,12 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BoundSignature;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Optional;
 
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -37,15 +38,16 @@ public void testConnectorSessionPosition()
     {
         // Without cached instance factory
         MethodHandle validFunctionMethodHandle = methodHandle(TestParametricScalarFunctionImplementationValidation.class, "validConnectorSessionParameterPosition", ConnectorSession.class, long.class, long.class);
+        BoundSignature signature = new BoundSignature(builtinFunctionName("test"), BIGINT, ImmutableList.of(BIGINT, BIGINT));
         ChoicesSpecializedSqlScalarFunction validFunction = new ChoicesSpecializedSqlScalarFunction(
-                new BoundSignature("test", BIGINT, ImmutableList.of(BIGINT, BIGINT)),
+                signature,
                 FAIL_ON_NULL,
                 ImmutableList.of(NEVER_NULL, NEVER_NULL),
                 validFunctionMethodHandle);
         assertEquals(validFunction.getChoices().get(0).getMethodHandle(), validFunctionMethodHandle);
 
         assertThatThrownBy(() -> new ChoicesSpecializedSqlScalarFunction(
-                new BoundSignature("test", BIGINT, ImmutableList.of(BIGINT, BIGINT)),
+                signature,
                 FAIL_ON_NULL,
                 ImmutableList.of(NEVER_NULL, NEVER_NULL),
                 methodHandle(TestParametricScalarFunctionImplementationValidation.class, "invalidConnectorSessionParameterPosition", long.class, long.class, ConnectorSession.class)))
@@ -55,7 +57,7 @@ public void testConnectorSessionPosition()
         // With cached instance factory
         MethodHandle validFunctionWithInstanceFactoryMethodHandle = methodHandle(TestParametricScalarFunctionImplementationValidation.class, "validConnectorSessionParameterPosition", Object.class, ConnectorSession.class, long.class, long.class);
         ChoicesSpecializedSqlScalarFunction validFunctionWithInstanceFactory = new ChoicesSpecializedSqlScalarFunction(
-                new BoundSignature("test", BIGINT, ImmutableList.of(BIGINT, BIGINT)),
+                signature,
                 FAIL_ON_NULL,
                 ImmutableList.of(NEVER_NULL, NEVER_NULL),
                 validFunctionWithInstanceFactoryMethodHandle,
@@ -63,7 +65,7 @@ public void testConnectorSessionPosition()
         assertEquals(validFunctionWithInstanceFactory.getChoices().get(0).getMethodHandle(), validFunctionWithInstanceFactoryMethodHandle);
 
         assertThatThrownBy(() -> new ChoicesSpecializedSqlScalarFunction(
-                new BoundSignature("test", BIGINT, ImmutableList.of(BIGINT, BIGINT)),
+                signature,
                 FAIL_ON_NULL,
                 ImmutableList.of(NEVER_NULL, NEVER_NULL),
                 methodHandle(TestParametricScalarFunctionImplementationValidation.class, "invalidConnectorSessionParameterPosition", Object.class, long.class, long.class, ConnectorSession.class),
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestScalarValidation.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestScalarValidation.java
index 10cf45706ec3..3e4927d96387 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestScalarValidation.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestScalarValidation.java
@@ -23,10 +23,9 @@
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.Type;
+import jakarta.annotation.Nullable;
 import org.testng.annotations.Test;
 
-import javax.annotation.Nullable;
-
 @SuppressWarnings("UtilityClassWithoutPrivateConstructor")
 public class TestScalarValidation
 {
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestStringFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestStringFunctions.java
index 88f2e82249cf..79f367ee9978 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestStringFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestStringFunctions.java
@@ -109,13 +109,13 @@ public void testChr()
                 .hasType(createVarcharType(1))
                 .isEqualTo("\0");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("chr", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("chr", "-1")::evaluate)
                 .hasMessage("Not a valid Unicode code point: -1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("chr", "1234567").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("chr", "1234567")::evaluate)
                 .hasMessage("Not a valid Unicode code point: 1234567");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("chr", "8589934592").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("chr", "8589934592")::evaluate)
                 .hasMessage("Not a valid Unicode code point: 8589934592");
     }
 
@@ -138,20 +138,20 @@ public void testCodepoint()
                 .hasType(INTEGER)
                 .isEqualTo(33804);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("codepoint", "'hello'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("codepoint", "'hello'")::evaluate)
                 .hasErrorCode(FUNCTION_NOT_FOUND);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("codepoint", "'\u666E\u5217\u65AF\u6258'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("codepoint", "'\u666E\u5217\u65AF\u6258'")::evaluate)
                 .hasErrorCode(FUNCTION_NOT_FOUND);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("codepoint", "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("codepoint", "''")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
     @Test
     public void testConcat()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("concat", "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("concat", "''")::evaluate)
                 .hasMessage("There must be two or more concatenation arguments");
 
         assertThat(assertions.function("concat", "'hello'", "' world'"))
@@ -200,7 +200,7 @@ public void testConcat()
                 .hasType(VARCHAR)
                 .isEqualTo(Joiner.on("").join(nCopies(127, "x")));
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("CONCAT(" + Joiner.on(", ").join(nCopies(128, "'x'")) + ")").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("CONCAT(" + Joiner.on(", ").join(nCopies(128, "'x'")) + ")")::evaluate)
                 .hasErrorCode(TOO_MANY_ARGUMENTS)
                 .hasMessage("line 1:12: Too many arguments for function call concat()");
     }
@@ -316,10 +316,10 @@ public void testLevenshteinDistance()
                 .isEqualTo(4L);
 
         // Test for invalid utf-8 characters
-        assertTrinoExceptionThrownBy(() -> assertions.function("levenshtein_distance", "'hello world'", "utf8(from_hex('81'))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("levenshtein_distance", "'hello world'", "utf8(from_hex('81'))")::evaluate)
                 .hasMessage("Invalid UTF-8 encoding in characters: �");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("levenshtein_distance", "'hello wolrd'", "utf8(from_hex('3281'))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("levenshtein_distance", "'hello wolrd'", "utf8(from_hex('3281'))")::evaluate)
                 .hasMessage("Invalid UTF-8 encoding in characters: 2�");
 
         // Test for maximum length
@@ -329,13 +329,13 @@ public void testLevenshteinDistance()
         assertThat(assertions.function("levenshtein_distance", "'%s'".formatted("l".repeat(100_000)), "'hello'"))
                 .isEqualTo(99998L);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("levenshtein_distance", "'%s'".formatted("x".repeat(1001)), "'%s'".formatted("x".repeat(1001))).evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("levenshtein_distance", "'%s'".formatted("x".repeat(1001)), "'%s'".formatted("x".repeat(1001)))::evaluate)
                 .hasMessage("The combined inputs for Levenshtein distance are too large");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("levenshtein_distance", "'hello'", "'%s'".formatted("x".repeat(500_000))).evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("levenshtein_distance", "'hello'", "'%s'".formatted("x".repeat(500_000)))::evaluate)
                 .hasMessage("The combined inputs for Levenshtein distance are too large");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("levenshtein_distance", "'%s'".formatted("x".repeat(500_000)), "'hello'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("levenshtein_distance", "'%s'".formatted("x".repeat(500_000)), "'hello'")::evaluate)
                 .hasMessage("The combined inputs for Levenshtein distance are too large");
     }
 
@@ -377,22 +377,22 @@ public void testHammingDistance()
                 .isEqualTo(1L);
 
         // Test for invalid arguments
-        assertTrinoExceptionThrownBy(() -> assertions.function("hamming_distance", "'hello'", "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("hamming_distance", "'hello'", "''")::evaluate)
                 .hasMessage("The input strings to hamming_distance function must have the same length");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("hamming_distance", "''", "'hello'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("hamming_distance", "''", "'hello'")::evaluate)
                 .hasMessage("The input strings to hamming_distance function must have the same length");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("hamming_distance", "'hello'", "'o'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("hamming_distance", "'hello'", "'o'")::evaluate)
                 .hasMessage("The input strings to hamming_distance function must have the same length");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("hamming_distance", "'h'", "'hello'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("hamming_distance", "'h'", "'hello'")::evaluate)
                 .hasMessage("The input strings to hamming_distance function must have the same length");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("hamming_distance", "'hello na\u00EFve world'", "'hello na:ive world'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("hamming_distance", "'hello na\u00EFve world'", "'hello na:ive world'")::evaluate)
                 .hasMessage("The input strings to hamming_distance function must have the same length");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("hamming_distance", "'\u4FE1\u5FF5,\u7231,\u5E0C\u671B'", "'\u4FE1\u5FF5\u5E0C\u671B'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("hamming_distance", "'\u4FE1\u5FF5,\u7231,\u5E0C\u671B'", "'\u4FE1\u5FF5\u5E0C\u671B'")::evaluate)
                 .hasMessage("The input strings to hamming_distance function must have the same length");
     }
 
@@ -664,10 +664,10 @@ public void testStringPosition()
         assertThat(assertions.function("strpos", "NULL", "NULL"))
                 .isNull(BIGINT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("strpos", "'abc/xyz/foo/bar'", "'/'", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("strpos", "'abc/xyz/foo/bar'", "'/'", "0")::evaluate)
                 .hasMessage("'instance' must be a positive or negative number.");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("strpos", "''", "''", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("strpos", "''", "''", "0")::evaluate)
                 .hasMessage("'instance' must be a positive or negative number.");
 
         assertThat(assertions.function("strpos", "'abc/xyz/foo/bar'", "'/'"))
@@ -1170,16 +1170,16 @@ public void testSplit()
                 .hasType(new ArrayType(createVarcharType(5)))
                 .isEqualTo(ImmutableList.of("a", "b", "."));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split", "'a.b.c'", "''", "1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split", "'a.b.c'", "''", "1")::evaluate)
                 .hasMessage("The delimiter may not be the empty string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split", "'a.b.c'", "'.'", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split", "'a.b.c'", "'.'", "0")::evaluate)
                 .hasMessage("Limit must be positive");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split", "'a.b.c'", "'.'", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split", "'a.b.c'", "'.'", "-1")::evaluate)
                 .hasMessage("Limit must be positive");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split", "'a.b.c'", "'.'", "2147483648").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split", "'a.b.c'", "'.'", "2147483648")::evaluate)
                 .hasMessage("Limit is too large");
     }
 
@@ -1222,27 +1222,27 @@ public void testSplitToMap()
                 .isEqualTo(ImmutableMap.of("", "\u4EC1"));
 
         // Entry delimiter and key-value delimiter must not be the same.
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_to_map", "''", "'\u4EFF'", "'\u4EFF'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_to_map", "''", "'\u4EFF'", "'\u4EFF'")::evaluate)
                 .hasMessage("entryDelimiter and keyValueDelimiter must not be the same");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_to_map", "'a=123,b=.4,c='", "'='", "'='").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_to_map", "'a=123,b=.4,c='", "'='", "'='")::evaluate)
                 .hasMessage("entryDelimiter and keyValueDelimiter must not be the same");
 
         // Duplicate keys are not allowed to exist.
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_to_map", "'a=123,a=.4'", "','", "'='").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_to_map", "'a=123,a=.4'", "','", "'='")::evaluate)
                 .hasMessage("Duplicate keys (a) are not allowed");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_to_map", "'\u4EA0\u4EFF\u4EA1\u4E00\u4EA0\u4EFF\u4EB1'", "'\u4E00'", "'\u4EFF'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_to_map", "'\u4EA0\u4EFF\u4EA1\u4E00\u4EA0\u4EFF\u4EB1'", "'\u4E00'", "'\u4EFF'")::evaluate)
                 .hasMessage("Duplicate keys (\u4EA0) are not allowed");
 
         // Key-value delimiter must appear exactly once in each entry.
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_to_map", "'key'", "','", "'='").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_to_map", "'key'", "','", "'='")::evaluate)
                 .hasMessage("Key-value delimiter must appear exactly once in each entry. Bad input: 'key'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_to_map", "'key==value'", "','", "'='").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_to_map", "'key==value'", "','", "'='")::evaluate)
                 .hasMessage("Key-value delimiter must appear exactly once in each entry. Bad input: 'key==value'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_to_map", "'key=va=lue'", "','", "'='").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_to_map", "'key=va=lue'", "','", "'='")::evaluate)
                 .hasMessage("Key-value delimiter must appear exactly once in each entry. Bad input: 'key=va=lue'");
     }
 
@@ -1296,20 +1296,20 @@ public void testSplitToMultimap()
                 .isEqualTo(ImmutableMap.of("\u4EA0", ImmutableList.of("\u4EA1", "\u4EB1")));
 
         // Entry delimiter and key-value delimiter must not be the same.
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_to_multimap", "''", "'\u4EFF'", "'\u4EFF'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_to_multimap", "''", "'\u4EFF'", "'\u4EFF'")::evaluate)
                 .hasMessage("entryDelimiter and keyValueDelimiter must not be the same");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_to_multimap", "'a=123,b=.4,c='", "'='", "'='").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_to_multimap", "'a=123,b=.4,c='", "'='", "'='")::evaluate)
                 .hasMessage("entryDelimiter and keyValueDelimiter must not be the same");
 
         // Key-value delimiter must appear exactly once in each entry.
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_to_multimap", "'key'", "','", "'='").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_to_multimap", "'key'", "','", "'='")::evaluate)
                 .hasMessage("Key-value delimiter must appear exactly once in each entry. Bad input: key");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_to_multimap", "'key==value'", "','", "'='").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_to_multimap", "'key==value'", "','", "'='")::evaluate)
                 .hasMessage("Key-value delimiter must appear exactly once in each entry. Bad input: key==value");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_to_multimap", "'key=va=lue'", "','", "'='").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_to_multimap", "'key=va=lue'", "','", "'='")::evaluate)
                 .hasMessage("Key-value delimiter must appear exactly once in each entry. Bad input: key=va=lue");
     }
 
@@ -1454,20 +1454,20 @@ public void testSplitPart()
         assertThat(assertions.function("split_part", "'\u8B49\u8BC1\u8A3C'", "'\u8BC1'", "3"))
                 .isNull(createVarcharType(3));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_part", "'abc'", "''", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_part", "'abc'", "''", "0")::evaluate)
                 .hasMessage("Index must be greater than zero");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_part", "'abc'", "''", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_part", "'abc'", "''", "-1")::evaluate)
                 .hasMessage("Index must be greater than zero");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_part", "utf8(from_hex('CE'))", "''", "1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_part", "utf8(from_hex('CE'))", "''", "1")::evaluate)
                 .hasMessage("Invalid UTF-8 encoding");
     }
 
     @Test
     public void testSplitPartInvalid()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("split_part", "'abc-@-def-@-ghi'", "'-@-'", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("split_part", "'abc-@-def-@-ghi'", "'-@-'", "0")::evaluate)
                 .hasMessage("Index must be greater than zero");
     }
 
@@ -1712,10 +1712,10 @@ public void testLeftTrimParametrized()
         assertThat(assertions.expression("CAST(LTRIM(CONCAT(' ', utf8(from_hex('81')), ' '), ' ') AS VARBINARY)"))
                 .isEqualTo(varbinary(0x81, ' '));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ltrim", "'hello world'", "utf8(from_hex('81'))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ltrim", "'hello world'", "utf8(from_hex('81'))")::evaluate)
                 .hasMessage("Invalid UTF-8 encoding in characters: �");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ltrim", "'hello wolrd'", "utf8(from_hex('3281'))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ltrim", "'hello wolrd'", "utf8(from_hex('3281'))")::evaluate)
                 .hasMessage("Invalid UTF-8 encoding in characters: 2�");
     }
 
@@ -1846,7 +1846,6 @@ public void testRightTrimParametrized()
                 .isEqualTo("\u017a\u00f3");
 
         // invalid utf-8 characters
-        // TODO
         assertThat(assertions.expression("CAST(RTRIM(utf8(from_hex('81')), ' ') AS VARBINARY)"))
                 .isEqualTo(varbinary(0x81));
 
@@ -1859,10 +1858,10 @@ public void testRightTrimParametrized()
         assertThat(assertions.expression("CAST(RTRIM(CONCAT(' ', utf8(from_hex('81')), ' '), ' ') AS VARBINARY)"))
                 .isEqualTo(varbinary(' ', 0x81));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("rtrim", "'hello world'", "utf8(from_hex('81'))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("rtrim", "'hello world'", "utf8(from_hex('81'))")::evaluate)
                 .hasMessage("Invalid UTF-8 encoding in characters: �");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("rtrim", "'hello world'", "utf8(from_hex('3281'))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("rtrim", "'hello world'", "utf8(from_hex('3281'))")::evaluate)
                 .hasMessage("Invalid UTF-8 encoding in characters: 2�");
     }
 
@@ -2084,15 +2083,15 @@ public void testLeftPad()
                 .isEqualTo("\u4FE1\u5FF5 \u7231 ");
 
         // failure modes
-        assertTrinoExceptionThrownBy(() -> assertions.function("lpad", "'abc'", "3", "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("lpad", "'abc'", "3", "''")::evaluate)
                 .hasMessage("Padding string must not be empty");
 
         // invalid target lengths
         long maxSize = Integer.MAX_VALUE;
-        assertTrinoExceptionThrownBy(() -> assertions.function("lpad", "'abc'", "-1", "'foo'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("lpad", "'abc'", "-1", "'foo'")::evaluate)
                 .hasMessage("Target length must be in the range [0.." + maxSize + "]");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("lpad", "'abc'", Long.toString(maxSize + 1), "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("lpad", "'abc'", Long.toString(maxSize + 1), "''")::evaluate)
                 .hasMessage("Target length must be in the range [0.." + maxSize + "]");
     }
 
@@ -2153,15 +2152,15 @@ public void testRightPad()
                 .isEqualTo("\u4FE1\u5FF5 \u7231 ");
 
         // failure modes
-        assertTrinoExceptionThrownBy(() -> assertions.function("rpad", "'abc'", "3", "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("rpad", "'abc'", "3", "''")::evaluate)
                 .hasMessage("Padding string must not be empty");
 
         // invalid target lengths
         long maxSize = Integer.MAX_VALUE;
-        assertTrinoExceptionThrownBy(() -> assertions.function("rpad", "'abc'", "-1", "'foo'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("rpad", "'abc'", "-1", "'foo'")::evaluate)
                 .hasMessage("Target length must be in the range [0.." + maxSize + "]");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("rpad", "'abc'", Long.toString(maxSize + 1), "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("rpad", "'abc'", Long.toString(maxSize + 1), "''")::evaluate)
                 .hasMessage("Target length must be in the range [0.." + maxSize + "]");
     }
 
@@ -2262,10 +2261,10 @@ public void testFromUtf8()
                 .hasType(VARCHAR)
                 .isEqualTo("X");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_utf8", "to_utf8('hello')", "'foo'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_utf8", "to_utf8('hello')", "'foo'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_utf8", "to_utf8('hello')", "1114112").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_utf8", "to_utf8('hello')", "1114112")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
@@ -2300,7 +2299,7 @@ public void testCharConcat()
                 .hasType(createCharType(17))
                 .isEqualTo("hello na\u00EFve world");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("concat", "cast('ab ' as char(40000))", "cast('' as char(40000))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("concat", "cast('ab ' as char(40000))", "cast('' as char(40000))")::evaluate)
                 .hasErrorCode(TYPE_NOT_FOUND)
                 .hasMessage("line 1:8: Unknown type: char(80000)");
 
@@ -2426,7 +2425,7 @@ public void testSoundex()
                 .hasType(createVarcharType(4))
                 .isEqualTo("J500");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("soundex", "'jąmes'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("soundex", "'jąmes'")::evaluate)
                 .hasMessage("The character is not mapped: Ą (index=195)");
 
         assertThat(assertions.function("soundex", "'x123'"))
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestTryFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestTryFunction.java
index ce775a0672d6..d341886e02f4 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestTryFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestTryFunction.java
@@ -115,7 +115,7 @@ public void testExceptions()
                 .isNull(BIGINT);
 
         // Exceptions that should not be suppressed
-        assertTrinoExceptionThrownBy(() -> assertions.expression("try(throw_error())").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("try(throw_error())")::evaluate)
                 .hasErrorCode(GENERIC_INTERNAL_ERROR);
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestTypeOfFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestTypeOfFunction.java
index daec4cac1ad3..02bf8dcc4553 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestTypeOfFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestTypeOfFunction.java
@@ -105,7 +105,7 @@ public void testComplex()
     @Test
     public void testLambda()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.expression("typeof(x -> x)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("typeof(x -> x)")::evaluate)
                 .hasErrorCode(FUNCTION_NOT_FOUND)
                 .hasMessage("line 1:12: Unexpected parameters (<function>) for function typeof. Expected: typeof(t) T");
     }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestVarbinaryFunctions.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestVarbinaryFunctions.java
index 13b17481716d..8bacfaea4cb0 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestVarbinaryFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestVarbinaryFunctions.java
@@ -87,7 +87,7 @@ public void testLength()
     @Test
     public void testConcat()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("CONCAT", "X''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("CONCAT", "X''")::evaluate)
                 .hasMessage("There must be two or more concatenation arguments");
 
         assertThat(assertions.expression("CAST('foo' AS VARBINARY) || CAST ('bar' AS VARBINARY)"))
@@ -324,16 +324,16 @@ public void testFromBase32()
         assertThat(assertions.function("from_base32", "CAST(NULL AS VARBINARY)"))
                 .isNull(VARBINARY);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_base32", "'1='").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_base32", "'1='")::evaluate)
                 .hasMessage("Invalid input length 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_base32", "'M1======'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_base32", "'M1======'")::evaluate)
                 .hasMessage("Unrecognized character: 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_base32", "CAST('1=' AS VARBINARY)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_base32", "CAST('1=' AS VARBINARY)")::evaluate)
                 .hasMessage("Invalid input length 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_base32", "CAST('M1======' AS VARBINARY)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_base32", "CAST('M1======' AS VARBINARY)")::evaluate)
                 .hasMessage("Unrecognized character: 1");
     }
 
@@ -386,30 +386,30 @@ public void testFromHex()
                 .isEqualTo(base16().encode(ALL_BYTES));
 
         // '0' - 1
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_hex", "'f/'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_hex", "'f/'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
         // '9' + 1
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_hex", "'f:'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_hex", "'f:'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
         // 'A' - 1
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_hex", "'f@'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_hex", "'f@'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
         // 'F' + 1
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_hex", "'fG'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_hex", "'fG'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
         // 'a' - 1
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_hex", "'f`'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_hex", "'f`'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
         // 'f' + 1
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_hex", "'fg'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_hex", "'fg'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_hex", "'fff'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_hex", "'fff'")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
@@ -444,13 +444,13 @@ public void testFromBigEndian64()
         assertThat(assertions.function("from_big_endian_64", "from_hex('8000000000000001')"))
                 .isEqualTo(-9223372036854775807L);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_big_endian_64", "from_hex('')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_big_endian_64", "from_hex('')")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_big_endian_64", "from_hex('1111')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_big_endian_64", "from_hex('1111')")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_big_endian_64", "from_hex('000000000000000011')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_big_endian_64", "from_hex('000000000000000011')")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
@@ -489,13 +489,13 @@ public void testFromBigEndian32()
                 .hasType(INTEGER)
                 .isEqualTo(-2147483647);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_big_endian_32", "from_hex('')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_big_endian_32", "from_hex('')")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_big_endian_32", "from_hex('1111')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_big_endian_32", "from_hex('1111')")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_big_endian_32", "from_hex('000000000000000011')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_big_endian_32", "from_hex('000000000000000011')")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
@@ -580,7 +580,7 @@ public void testFromIEEE754Binary32()
                 .hasType(REAL)
                 .isEqualTo(-1.4E-45f);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_ieee754_32", "from_hex('0000')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_ieee754_32", "from_hex('0000')")::evaluate)
                 .hasMessage("Input floating-point value must be exactly 4 bytes long");
     }
 
@@ -661,7 +661,7 @@ public void testFromIEEE754Binary64()
                 .hasType(DOUBLE)
                 .isEqualTo(-4.9E-324);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_ieee754_64", "from_hex('00000000')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_ieee754_64", "from_hex('00000000')")::evaluate)
                 .hasMessage("Input floating-point value must be exactly 8 bytes long");
     }
 
@@ -684,10 +684,10 @@ public void testLpad()
         assertThat(assertions.function("lpad", "x'1234'", "1", "x'4524'"))
                 .isEqualTo(sqlVarbinaryFromHex("12"));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("lpad", "x'2312'", "-1", "x'4524'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("lpad", "x'2312'", "-1", "x'4524'")::evaluate)
                 .hasMessage("Target length must be in the range [0.." + Integer.MAX_VALUE + "]");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("lpad", "x'2312'", "1", "x''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("lpad", "x'2312'", "1", "x''")::evaluate)
                 .hasMessage("Padding bytes must not be empty");
     }
 
@@ -710,10 +710,10 @@ public void testRpad()
         assertThat(assertions.function("rpad", "x'1234'", "1", "x'4524'"))
                 .isEqualTo(sqlVarbinaryFromHex("12"));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("rpad", "x'1234'", "-1", "x'4524'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("rpad", "x'1234'", "-1", "x'4524'")::evaluate)
                 .hasMessage("Target length must be in the range [0.." + Integer.MAX_VALUE + "]");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("rpad", "x'1234'", "1", "x''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("rpad", "x'1234'", "1", "x''")::evaluate)
                 .hasMessage("Padding bytes must not be empty");
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestVersionFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestVersionFunction.java
index 42acd692403b..0717535afdda 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestVersionFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestVersionFunction.java
@@ -14,7 +14,7 @@
 package io.trino.operator.scalar;
 
 import io.trino.sql.query.QueryAssertions;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TestWordStemFunction.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TestWordStemFunction.java
index 075c92fc6ffd..8dec17bf4485 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TestWordStemFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TestWordStemFunction.java
@@ -121,7 +121,7 @@ public void testWordStem()
                 .hasType(createVarcharType(6))
                 .isEqualTo("bastã");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("word_stem", "'test'", "'xx'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("word_stem", "'test'", "'xx'")::evaluate)
                 .hasMessage("Unknown stemmer language: xx");
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/TypeOperatorBenchmarkUtil.java b/core/trino-main/src/test/java/io/trino/operator/scalar/TypeOperatorBenchmarkUtil.java
index 7412a68b5807..e60e51813884 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/TypeOperatorBenchmarkUtil.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/TypeOperatorBenchmarkUtil.java
@@ -24,7 +24,7 @@
 import java.util.Base64;
 import java.util.Random;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
@@ -71,13 +71,13 @@ public static Type toType(String type)
 
     public static MethodHandle getEqualBlockMethod(Type type)
     {
-        MethodHandle equalOperator = TYPE_OPERATORS.getEqualOperator(type, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION));
+        MethodHandle equalOperator = TYPE_OPERATORS.getEqualOperator(type, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL));
         return EQUAL_BLOCK.bindTo(equalOperator);
     }
 
     public static MethodHandle getHashCodeBlockMethod(Type type)
     {
-        MethodHandle hashCodeOperator = TYPE_OPERATORS.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
+        MethodHandle hashCodeOperator = TYPE_OPERATORS.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL));
         return HASH_CODE_BLOCK.bindTo(hashCodeOperator);
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/date/TestExtract.java b/core/trino-main/src/test/java/io/trino/operator/scalar/date/TestExtract.java
index 6e2e5386f4e5..c9e50c07e974 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/date/TestExtract.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/date/TestExtract.java
@@ -13,22 +13,36 @@
  */
 package io.trino.operator.scalar.date;
 
-import io.trino.operator.scalar.AbstractTestExtract;
-
-import java.util.List;
-
+import io.trino.spi.StandardErrorCode;
+import io.trino.sql.query.QueryAssertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestExtract
-        extends AbstractTestExtract
 {
-    @Override
-    protected List<String> types()
+    private QueryAssertions assertions;
+
+    @BeforeAll
+    public void init()
     {
-        return List.of("date");
+        assertions = new QueryAssertions();
     }
 
-    @Override
+    @AfterAll
+    public void tearDown()
+    {
+        assertions.close();
+        assertions = null;
+    }
+
+    @Test
     public void testYear()
     {
         assertThat(assertions.expression("EXTRACT(YEAR FROM DATE '2020-05-10')")).matches("BIGINT '2020'");
@@ -37,7 +51,7 @@ public void testYear()
         assertThat(assertions.expression("year(DATE '1960-05-10')")).matches("BIGINT '1960'");
     }
 
-    @Override
+    @Test
     public void testMonth()
     {
         assertThat(assertions.expression("EXTRACT(MONTH FROM DATE '2020-05-10')")).matches("BIGINT '5'");
@@ -46,7 +60,7 @@ public void testMonth()
         assertThat(assertions.expression("month(DATE '1960-05-10')")).matches("BIGINT '5'");
     }
 
-    @Override
+    @Test
     public void testWeek()
     {
         assertThat(assertions.expression("EXTRACT(WEEK FROM DATE '2020-05-10')")).matches("BIGINT '19'");
@@ -55,7 +69,7 @@ public void testWeek()
         assertThat(assertions.expression("week(DATE '1960-05-10')")).matches("BIGINT '19'");
     }
 
-    @Override
+    @Test
     public void testDay()
     {
         assertThat(assertions.expression("EXTRACT(DAY FROM DATE '2020-05-10')")).matches("BIGINT '10'");
@@ -64,7 +78,7 @@ public void testDay()
         assertThat(assertions.expression("day(DATE '1960-05-10')")).matches("BIGINT '10'");
     }
 
-    @Override
+    @Test
     public void testDayOfMonth()
     {
         assertThat(assertions.expression("EXTRACT(DAY_OF_MONTH FROM DATE '2020-05-10')")).matches("BIGINT '10'");
@@ -73,7 +87,7 @@ public void testDayOfMonth()
         assertThat(assertions.expression("day_of_month(DATE '1960-05-10')")).matches("BIGINT '10'");
     }
 
-    @Override
+    @Test
     public void testDayOfWeek()
     {
         assertThat(assertions.expression("EXTRACT(DAY_OF_WEEK FROM DATE '2020-05-10')")).matches("BIGINT '7'");
@@ -82,7 +96,7 @@ public void testDayOfWeek()
         assertThat(assertions.expression("day_of_week(DATE '1960-05-10')")).matches("BIGINT '2'");
     }
 
-    @Override
+    @Test
     public void testDow()
     {
         assertThat(assertions.expression("EXTRACT(DOW FROM DATE '2020-05-10')")).matches("BIGINT '7'");
@@ -91,7 +105,7 @@ public void testDow()
         assertThat(assertions.expression("dow(DATE '1960-05-10')")).matches("BIGINT '2'");
     }
 
-    @Override
+    @Test
     public void testDayOfYear()
     {
         assertThat(assertions.expression("EXTRACT(DAY_OF_YEAR FROM DATE '2020-05-10')")).matches("BIGINT '131'");
@@ -100,7 +114,7 @@ public void testDayOfYear()
         assertThat(assertions.expression("day_of_year(DATE '1960-05-10')")).matches("BIGINT '131'");
     }
 
-    @Override
+    @Test
     public void testDoy()
     {
         assertThat(assertions.expression("EXTRACT(DOY FROM DATE '2020-05-10')")).matches("BIGINT '131'");
@@ -109,7 +123,7 @@ public void testDoy()
         assertThat(assertions.expression("doy(DATE '1960-05-10')")).matches("BIGINT '131'");
     }
 
-    @Override
+    @Test
     public void testQuarter()
     {
         assertThat(assertions.expression("EXTRACT(QUARTER FROM DATE '2020-05-10')")).matches("BIGINT '2'");
@@ -118,7 +132,7 @@ public void testQuarter()
         assertThat(assertions.expression("quarter(DATE '1960-05-10')")).matches("BIGINT '2'");
     }
 
-    @Override
+    @Test
     public void testYearOfWeek()
     {
         assertThat(assertions.expression("EXTRACT(YEAR_OF_WEEK FROM DATE '2020-05-10')")).matches("BIGINT '2020'");
@@ -127,7 +141,7 @@ public void testYearOfWeek()
         assertThat(assertions.expression("year_of_week(DATE '1960-05-10')")).matches("BIGINT '1960'");
     }
 
-    @Override
+    @Test
     public void testYow()
     {
         assertThat(assertions.expression("EXTRACT(YOW FROM DATE '2020-05-10')")).matches("BIGINT '2020'");
@@ -135,4 +149,23 @@ public void testYow()
         assertThat(assertions.expression("yow(DATE '2020-05-10')")).matches("BIGINT '2020'");
         assertThat(assertions.expression("yow(DATE '1960-05-10')")).matches("BIGINT '1960'");
     }
+
+    @Test
+    public void testUnsupported()
+    {
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(HOUR FROM DATE '2020-05-10')")::evaluate)
+                .hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MINUTE FROM DATE '2020-05-10')")::evaluate)
+                .hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(SECOND FROM DATE '2020-05-10')")::evaluate)
+                .hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM DATE '2020-05-10')")::evaluate)
+                .hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM DATE '2020-05-10')")::evaluate)
+                .hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/interval/TestIntervalDayTime.java b/core/trino-main/src/test/java/io/trino/operator/scalar/interval/TestIntervalDayTime.java
index 8d63f618b609..64bcc20ed581 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/interval/TestIntervalDayTime.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/interval/TestIntervalDayTime.java
@@ -135,20 +135,20 @@ public void testLiterals()
         assertThat(assertions.expression("INTERVAL '32' SECOND"))
                 .isEqualTo(interval(0, 0, 0, 32, 0));
 
-        assertThatThrownBy(() -> assertions.expression("INTERVAL '12X' DAY").evaluate())
-                .hasMessage("line 1:12: '12X' is not a valid interval literal");
+        assertThatThrownBy(assertions.expression("INTERVAL '12X' DAY")::evaluate)
+                .hasMessage("line 1:12: '12X' is not a valid INTERVAL literal");
 
-        assertThatThrownBy(() -> assertions.expression("INTERVAL '12 10' DAY").evaluate())
-                .hasMessage("line 1:12: '12 10' is not a valid interval literal");
+        assertThatThrownBy(assertions.expression("INTERVAL '12 10' DAY")::evaluate)
+                .hasMessage("line 1:12: '12 10' is not a valid INTERVAL literal");
 
-        assertThatThrownBy(() -> assertions.expression("INTERVAL '12 X' DAY TO HOUR").evaluate())
-                .hasMessage("line 1:12: '12 X' is not a valid interval literal");
+        assertThatThrownBy(assertions.expression("INTERVAL '12 X' DAY TO HOUR")::evaluate)
+                .hasMessage("line 1:12: '12 X' is not a valid INTERVAL literal");
 
-        assertThatThrownBy(() -> assertions.expression("INTERVAL '12 -10' DAY TO HOUR").evaluate())
-                .hasMessage("line 1:12: '12 -10' is not a valid interval literal");
+        assertThatThrownBy(assertions.expression("INTERVAL '12 -10' DAY TO HOUR")::evaluate)
+                .hasMessage("line 1:12: '12 -10' is not a valid INTERVAL literal");
 
-        assertThatThrownBy(() -> assertions.expression("INTERVAL '--12 -10' DAY TO HOUR").evaluate())
-                .hasMessage("line 1:12: '--12 -10' is not a valid interval literal");
+        assertThatThrownBy(assertions.expression("INTERVAL '--12 -10' DAY TO HOUR")::evaluate)
+                .hasMessage("line 1:12: '--12 -10' is not a valid INTERVAL literal");
     }
 
     private static SqlIntervalDayTime interval(int day, int hour, int minute, int second, int milliseconds)
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/interval/TestIntervalYearMonth.java b/core/trino-main/src/test/java/io/trino/operator/scalar/interval/TestIntervalYearMonth.java
index 6a935844a0df..bd29ccada291 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/interval/TestIntervalYearMonth.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/interval/TestIntervalYearMonth.java
@@ -63,20 +63,20 @@ public void testLiterals()
         assertThat(assertions.expression("INTERVAL '32767-32767' YEAR TO MONTH"))
                 .isEqualTo(interval(32767, 32767));
 
-        assertThatThrownBy(() -> assertions.expression("INTERVAL '124X' YEAR").evaluate())
-                .hasMessage("line 1:12: '124X' is not a valid interval literal");
+        assertThatThrownBy(assertions.expression("INTERVAL '124X' YEAR")::evaluate)
+                .hasMessage("line 1:12: '124X' is not a valid INTERVAL literal");
 
-        assertThatThrownBy(() -> assertions.expression("INTERVAL '124-30' YEAR").evaluate())
-                .hasMessage("line 1:12: '124-30' is not a valid interval literal");
+        assertThatThrownBy(assertions.expression("INTERVAL '124-30' YEAR")::evaluate)
+                .hasMessage("line 1:12: '124-30' is not a valid INTERVAL literal");
 
-        assertThatThrownBy(() -> assertions.expression("INTERVAL '124-X' YEAR TO MONTH").evaluate())
-                .hasMessage("line 1:12: '124-X' is not a valid interval literal");
+        assertThatThrownBy(assertions.expression("INTERVAL '124-X' YEAR TO MONTH")::evaluate)
+                .hasMessage("line 1:12: '124-X' is not a valid INTERVAL literal");
 
-        assertThatThrownBy(() -> assertions.expression("INTERVAL '124--30' YEAR TO MONTH").evaluate())
-                .hasMessage("line 1:12: '124--30' is not a valid interval literal");
+        assertThatThrownBy(assertions.expression("INTERVAL '124--30' YEAR TO MONTH")::evaluate)
+                .hasMessage("line 1:12: '124--30' is not a valid INTERVAL literal");
 
-        assertThatThrownBy(() -> assertions.expression("INTERVAL '--124--30' YEAR TO MONTH").evaluate())
-                .hasMessage("line 1:12: '--124--30' is not a valid interval literal");
+        assertThatThrownBy(assertions.expression("INTERVAL '--124--30' YEAR TO MONTH")::evaluate)
+                .hasMessage("line 1:12: '--124--30' is not a valid INTERVAL literal");
     }
 
     private static SqlIntervalYearMonth interval(int year, int month)
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/time/TestExtract.java b/core/trino-main/src/test/java/io/trino/operator/scalar/time/TestExtract.java
index 68a8babd8344..3e19db946246 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/time/TestExtract.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/time/TestExtract.java
@@ -13,30 +13,38 @@
  */
 package io.trino.operator.scalar.time;
 
-import io.trino.operator.scalar.AbstractTestExtract;
+import io.trino.spi.StandardErrorCode;
 import io.trino.sql.parser.ParsingException;
-import org.testng.annotations.Test;
+import io.trino.sql.query.QueryAssertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-import java.util.List;
-import java.util.stream.IntStream;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static java.lang.String.format;
+import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestExtract
-        extends AbstractTestExtract
 {
-    @Override
-    protected List<String> types()
+    private QueryAssertions assertions;
+
+    @BeforeAll
+    public void init()
+    {
+        assertions = new QueryAssertions();
+    }
+
+    @AfterAll
+    public void tearDown()
     {
-        return IntStream.rangeClosed(0, 12)
-                .mapToObj(precision -> format("time(%s)", precision))
-                .collect(toImmutableList());
+        assertions.close();
+        assertions = null;
     }
 
-    @Override
+    @Test
     public void testHour()
     {
         assertThat(assertions.expression("EXTRACT(HOUR FROM TIME '12:34:56')")).matches("BIGINT '12'");
@@ -68,7 +76,7 @@ public void testHour()
         assertThat(assertions.expression("hour(TIME '12:34:56.123456789012')")).matches("BIGINT '12'");
     }
 
-    @Override
+    @Test
     public void testMinute()
     {
         assertThat(assertions.expression("EXTRACT(MINUTE FROM TIME '12:34:56')")).matches("BIGINT '34'");
@@ -100,7 +108,7 @@ public void testMinute()
         assertThat(assertions.expression("minute(TIME '12:34:56.123456789012')")).matches("BIGINT '34'");
     }
 
-    @Override
+    @Test
     public void testSecond()
     {
         assertThat(assertions.expression("EXTRACT(SECOND FROM TIME '12:34:56')")).matches("BIGINT '56'");
@@ -135,7 +143,7 @@ public void testSecond()
     @Test
     public void testMillisecond()
     {
-        assertThatThrownBy(() -> assertions.expression("EXTRACT(MILLISECOND FROM TIME '12:34:56')").evaluate())
+        assertThatThrownBy(assertions.expression("EXTRACT(MILLISECOND FROM TIME '12:34:56')")::evaluate)
                 .isInstanceOf(ParsingException.class)
                 .hasMessage("line 1:12: Invalid EXTRACT field: MILLISECOND");
 
@@ -153,4 +161,78 @@ public void testMillisecond()
         assertThat(assertions.expression("millisecond(TIME '12:34:56.12345678901')")).matches("BIGINT '123'");
         assertThat(assertions.expression("millisecond(TIME '12:34:56.123456789012')")).matches("BIGINT '123'");
     }
+
+    @Test
+    public void testUnsupported()
+    {
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.1')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.12')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.123')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.1234')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.12345')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.123456')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.1234567')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.12345678')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.123456789')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.1234567890')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.12345678901')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.123456789012')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.1')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.12')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.123')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.1234')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.12345')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.123456')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.1234567')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.12345678')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.123456789')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.1234567890')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.12345678901')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.123456789012')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.1')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.12')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.123')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.1234')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.12345')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.123456')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.1234567')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.12345678')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.123456789')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.1234567890')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.12345678901')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.123456789012')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56.1')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56.12')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56.123')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56.1234')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56.12345')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56.123456')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56.1234567')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56.12345678')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56.123456789')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56.1234567890')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56.12345678901')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56.123456789012')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56.1')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56.12')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56.123')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56.1234')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56.12345')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56.123456')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56.1234567')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56.12345678')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56.123456789')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56.1234567890')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56.12345678901')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56.123456789012')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/time/TestTime.java b/core/trino-main/src/test/java/io/trino/operator/scalar/time/TestTime.java
index 7805b8e9c79e..c3e940dee6b8 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/time/TestTime.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/time/TestTime.java
@@ -107,20 +107,20 @@ public void testLiterals()
                 .hasType(createTimeType(12))
                 .isEqualTo(time(12, 12, 34, 56, 123_456_789_123L));
 
-        assertThatThrownBy(() -> assertions.expression("TIME '12:34:56.1234567891234'").evaluate())
+        assertThatThrownBy(assertions.expression("TIME '12:34:56.1234567891234'")::evaluate)
                 .hasMessage("line 1:12: TIME precision must be in range [0, 12]: 13");
 
-        assertThatThrownBy(() -> assertions.expression("TIME '25:00:00'").evaluate())
-                .hasMessage("line 1:12: '25:00:00' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME '25:00:00'")::evaluate)
+                .hasMessage("line 1:12: '25:00:00' is not a valid TIME literal");
 
-        assertThatThrownBy(() -> assertions.expression("TIME '12:65:00'").evaluate())
-                .hasMessage("line 1:12: '12:65:00' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME '12:65:00'")::evaluate)
+                .hasMessage("line 1:12: '12:65:00' is not a valid TIME literal");
 
-        assertThatThrownBy(() -> assertions.expression("TIME '12:00:65'").evaluate())
-                .hasMessage("line 1:12: '12:00:65' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME '12:00:65'")::evaluate)
+                .hasMessage("line 1:12: '12:00:65' is not a valid TIME literal");
 
-        assertThatThrownBy(() -> assertions.expression("TIME 'xxx'").evaluate())
-                .hasMessage("line 1:12: 'xxx' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME 'xxx'")::evaluate)
+                .hasMessage("line 1:12: 'xxx' is not a valid TIME literal");
     }
 
     @Test
@@ -1464,31 +1464,31 @@ public void testCastFromVarchar()
         assertThat(assertions.expression("CAST('23:59:59.999999999999' AS TIME(11))")).matches("TIME '00:00:00.00000000000'");
 
         // > 12 digits of precision
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(0))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(0))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(1))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(1))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(2))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(2))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(3))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(3))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(4))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(4))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(5))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(5))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(6))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(6))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(7))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(7))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(8))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(8))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(9))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(9))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(10))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(10))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(11))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(11))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
-        assertThatThrownBy(() -> assertions.expression("CAST('12:34:56.1111111111111' AS TIME(12))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('12:34:56.1111111111111' AS TIME(12))")::evaluate)
                 .hasMessage("Value cannot be cast to time: 12:34:56.1111111111111");
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/timestamp/TestExtract.java b/core/trino-main/src/test/java/io/trino/operator/scalar/timestamp/TestExtract.java
index eef0de354c36..83f56ce4376a 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/timestamp/TestExtract.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/timestamp/TestExtract.java
@@ -13,30 +13,38 @@
  */
 package io.trino.operator.scalar.timestamp;
 
-import io.trino.operator.scalar.AbstractTestExtract;
+import io.trino.spi.StandardErrorCode;
 import io.trino.sql.parser.ParsingException;
-import org.testng.annotations.Test;
+import io.trino.sql.query.QueryAssertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-import java.util.List;
-import java.util.stream.IntStream;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static java.lang.String.format;
+import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestExtract
-        extends AbstractTestExtract
 {
-    @Override
-    protected List<String> types()
+    private QueryAssertions assertions;
+
+    @BeforeAll
+    public void init()
+    {
+        assertions = new QueryAssertions();
+    }
+
+    @AfterAll
+    public void tearDown()
     {
-        return IntStream.rangeClosed(0, 12)
-                .mapToObj(precision -> format("timestamp(%s)", precision))
-                .collect(toImmutableList());
+        assertions.close();
+        assertions = null;
     }
 
-    @Override
+    @Test
     public void testYear()
     {
         assertThat(assertions.expression("EXTRACT(YEAR FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '2020'");
@@ -68,7 +76,7 @@ public void testYear()
         assertThat(assertions.expression("year(TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '2020'");
     }
 
-    @Override
+    @Test
     public void testMonth()
     {
         assertThat(assertions.expression("EXTRACT(MONTH FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '5'");
@@ -100,7 +108,7 @@ public void testMonth()
         assertThat(assertions.expression("month(TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '5'");
     }
 
-    @Override
+    @Test
     public void testWeek()
     {
         assertThat(assertions.expression("EXTRACT(WEEK FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '19'");
@@ -132,7 +140,7 @@ public void testWeek()
         assertThat(assertions.expression("week(TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '19'");
     }
 
-    @Override
+    @Test
     public void testDay()
     {
         assertThat(assertions.expression("EXTRACT(DAY FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '10'");
@@ -164,7 +172,7 @@ public void testDay()
         assertThat(assertions.expression("day(TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '10'");
     }
 
-    @Override
+    @Test
     public void testDayOfMonth()
     {
         assertThat(assertions.expression("EXTRACT(DAY_OF_MONTH FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '10'");
@@ -196,7 +204,7 @@ public void testDayOfMonth()
         assertThat(assertions.expression("day_of_month(TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '10'");
     }
 
-    @Override
+    @Test
     public void testHour()
     {
         assertThat(assertions.expression("EXTRACT(HOUR FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '12'");
@@ -228,7 +236,7 @@ public void testHour()
         assertThat(assertions.expression("hour(TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '12'");
     }
 
-    @Override
+    @Test
     public void testMinute()
     {
         assertThat(assertions.expression("EXTRACT(MINUTE FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '34'");
@@ -260,7 +268,7 @@ public void testMinute()
         assertThat(assertions.expression("minute(TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '34'");
     }
 
-    @Override
+    @Test
     public void testSecond()
     {
         assertThat(assertions.expression("EXTRACT(SECOND FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '56'");
@@ -324,7 +332,7 @@ public void testSecond()
     @Test
     public void testMillisecond()
     {
-        assertThatThrownBy(() -> assertions.expression("EXTRACT(MILLISECOND FROM TIMESTAMP '2020-05-10 12:34:56')").evaluate())
+        assertThatThrownBy(assertions.expression("EXTRACT(MILLISECOND FROM TIMESTAMP '2020-05-10 12:34:56')")::evaluate)
                 .isInstanceOf(ParsingException.class)
                 .hasMessage("line 1:12: Invalid EXTRACT field: MILLISECOND");
 
@@ -343,7 +351,7 @@ public void testMillisecond()
         assertThat(assertions.expression("millisecond(TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '123'");
     }
 
-    @Override
+    @Test
     public void testDayOfWeek()
     {
         assertThat(assertions.expression("EXTRACT(DAY_OF_WEEK FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '7'");
@@ -375,7 +383,7 @@ public void testDayOfWeek()
         assertThat(assertions.expression("day_of_week(TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '7'");
     }
 
-    @Override
+    @Test
     public void testDow()
     {
         assertThat(assertions.expression("EXTRACT(DOW FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '7'");
@@ -393,7 +401,7 @@ public void testDow()
         assertThat(assertions.expression("EXTRACT(DOW FROM TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '7'");
     }
 
-    @Override
+    @Test
     public void testDayOfYear()
     {
         assertThat(assertions.expression("EXTRACT(DAY_OF_YEAR FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '131'");
@@ -425,7 +433,7 @@ public void testDayOfYear()
         assertThat(assertions.expression("day_of_year(TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '131'");
     }
 
-    @Override
+    @Test
     public void testDoy()
     {
         assertThat(assertions.expression("EXTRACT(DOY FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '131'");
@@ -443,7 +451,7 @@ public void testDoy()
         assertThat(assertions.expression("EXTRACT(DOY FROM TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '131'");
     }
 
-    @Override
+    @Test
     public void testQuarter()
     {
         assertThat(assertions.expression("EXTRACT(QUARTER FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '2'");
@@ -478,7 +486,7 @@ public void testQuarter()
     @Test
     public void testWeekOfYear()
     {
-        assertThatThrownBy(() -> assertions.expression("EXTRACT(WEEK_OF_YEAR FROM TIMESTAMP '2020-05-10 12:34:56')").evaluate())
+        assertThatThrownBy(assertions.expression("EXTRACT(WEEK_OF_YEAR FROM TIMESTAMP '2020-05-10 12:34:56')")::evaluate)
                 .isInstanceOf(ParsingException.class)
                 .hasMessage("line 1:12: Invalid EXTRACT field: WEEK_OF_YEAR");
 
@@ -497,7 +505,7 @@ public void testWeekOfYear()
         assertThat(assertions.expression("week_of_year(TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '19'");
     }
 
-    @Override
+    @Test
     public void testYearOfWeek()
     {
         assertThat(assertions.expression("EXTRACT(YEAR_OF_WEEK FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '2020'");
@@ -529,7 +537,7 @@ public void testYearOfWeek()
         assertThat(assertions.expression("year_of_week(TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '2020'");
     }
 
-    @Override
+    @Test
     public void testYow()
     {
         assertThat(assertions.expression("EXTRACT(YOW FROM TIMESTAMP '2020-05-10 12:34:56')")).matches("BIGINT '2020'");
@@ -546,4 +554,36 @@ public void testYow()
         assertThat(assertions.expression("EXTRACT(YOW FROM TIMESTAMP '2020-05-10 12:34:56.12345678901')")).matches("BIGINT '2020'");
         assertThat(assertions.expression("EXTRACT(YOW FROM TIMESTAMP '2020-05-10 12:34:56.123456789012')")).matches("BIGINT '2020'");
     }
+
+    @Test
+    public void testUnsupported()
+    {
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56.1')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56.12')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56.123')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56.1234')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56.12345')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56.123456')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56.1234567')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56.12345678')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56.123456789')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56.1234567890')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56.12345678901')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56.123456789012')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56.1')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56.12')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56.123')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56.1234')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56.12345')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56.123456')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56.1234567')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56.12345678')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56.123456789')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56.1234567890')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56.12345678901')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56.123456789012')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/timestamp/TestHumanReadableSeconds.java b/core/trino-main/src/test/java/io/trino/operator/scalar/timestamp/TestHumanReadableSeconds.java
index 294f7bc1a419..ae55a0ca0446 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/timestamp/TestHumanReadableSeconds.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/timestamp/TestHumanReadableSeconds.java
@@ -103,11 +103,11 @@ public void testToHumanRedableSecondsFormat()
                 .isNull(VARCHAR);
 
         // check for NaN
-        assertTrinoExceptionThrownBy(() -> assertions.function("human_readable_seconds", "0.0E0 / 0.0E0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("human_readable_seconds", "0.0E0 / 0.0E0")::evaluate)
                 .hasMessage("Invalid argument found: NaN");
 
         // check for infinity
-        assertTrinoExceptionThrownBy(() -> assertions.function("human_readable_seconds", "1.0E0 / 0.0E0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("human_readable_seconds", "1.0E0 / 0.0E0")::evaluate)
                 .hasMessage("Invalid argument found: Infinity");
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/timestamp/TestTimestamp.java b/core/trino-main/src/test/java/io/trino/operator/scalar/timestamp/TestTimestamp.java
index 3f39113f3bef..bd88b424e1c3 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/timestamp/TestTimestamp.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/timestamp/TestTimestamp.java
@@ -143,14 +143,14 @@ public void testLiterals()
                 .hasType(createTimestampType(12))
                 .isEqualTo(timestamp(12, 2020, 5, 1, 12, 34, 56, 123_456_789_012L));
 
-        assertThatThrownBy(() -> assertions.expression("TIMESTAMP '2020-05-01 12:34:56.1234567890123'").evaluate())
+        assertThatThrownBy(assertions.expression("TIMESTAMP '2020-05-01 12:34:56.1234567890123'")::evaluate)
                 .hasMessage("line 1:12: TIMESTAMP precision must be in range [0, 12]: 13");
 
-        assertThatThrownBy(() -> assertions.expression("TIMESTAMP '2020-13-01'").evaluate())
-                .hasMessage("line 1:12: '2020-13-01' is not a valid timestamp literal");
+        assertThatThrownBy(assertions.expression("TIMESTAMP '2020-13-01'")::evaluate)
+                .hasMessage("line 1:12: '2020-13-01' is not a valid TIMESTAMP literal");
 
-        assertThatThrownBy(() -> assertions.expression("TIMESTAMP 'xxx'").evaluate())
-                .hasMessage("line 1:12: 'xxx' is not a valid timestamp literal");
+        assertThatThrownBy(assertions.expression("TIMESTAMP 'xxx'")::evaluate)
+                .hasMessage("line 1:12: 'xxx' is not a valid TIMESTAMP literal");
 
         // negative epoch
         assertThat(assertions.expression("TIMESTAMP '1500-05-01 12:34:56'"))
@@ -1473,9 +1473,9 @@ public void testCastToTimestampWithTimeZone()
         assertThat(assertions.expression("CAST(TIMESTAMP '-12001-05-01 12:34:56' AS TIMESTAMP(0) WITH TIME ZONE)")).matches("TIMESTAMP '-12001-05-01 12:34:56 Pacific/Apia'");
 
         // Overflow
-        assertThatThrownBy(() -> assertions.expression("CAST(TIMESTAMP '123001-05-01 12:34:56' AS TIMESTAMP WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST(TIMESTAMP '123001-05-01 12:34:56' AS TIMESTAMP WITH TIME ZONE)")::evaluate)
                 .hasMessage("Out of range for timestamp with time zone: 3819379822496000");
-        assertThatThrownBy(() -> assertions.expression("CAST(TIMESTAMP '-123001-05-01 12:34:56' AS TIMESTAMP WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST(TIMESTAMP '-123001-05-01 12:34:56' AS TIMESTAMP WITH TIME ZONE)")::evaluate)
                 .hasMessage("Out of range for timestamp with time zone: -3943693439888000");
     }
 
@@ -1678,85 +1678,85 @@ public void testCastFromVarchar()
         assertThat(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 +01:23' AS TIMESTAMP(12))"))
                 .matches("TIMESTAMP '2020-05-10 12:34:56.111111111111'");
 
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(0))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(0))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(1))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(1))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(2))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(2))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(3))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(3))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(4))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(4))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(5))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(5))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(6))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(6))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(7))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(7))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(8))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(8))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(9))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(9))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(10))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(10))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(11))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(11))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(12))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 12:34:56.111111111111 xxx' AS TIMESTAMP(12))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 12:34:56.111111111111 xxx");
 
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(0))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(0))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(1))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(1))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(2))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(2))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(3))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(3))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(4))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(4))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(5))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(5))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(6))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(6))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(7))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(7))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(8))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(8))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(9))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(9))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(10))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(10))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(11))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(11))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(12))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10 xxx' AS TIMESTAMP(12))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10 xxx");
 
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(0))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(0))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(1))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(1))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(2))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(2))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(3))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(3))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(4))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(4))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(5))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(5))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(6))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(6))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(7))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(7))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(8))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(8))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(9))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(9))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(10))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(10))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(11))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(11))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
-        assertThatThrownBy(() -> assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(12))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2020-05-10T12:34:56' AS TIMESTAMP(12))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2020-05-10T12:34:56");
     }
 
@@ -2792,30 +2792,30 @@ public void testAtTimeZone()
     @Test
     public void testCastInvalidTimestamp()
     {
-        assertThatThrownBy(() -> assertions.expression("CAST('ABC' AS TIMESTAMP)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('ABC' AS TIMESTAMP)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: ABC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-00 00:00:00' AS TIMESTAMP)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-00 00:00:00' AS TIMESTAMP)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-00 00:00:00");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-00-01 00:00:00' AS TIMESTAMP)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-00-01 00:00:00' AS TIMESTAMP)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-00-01 00:00:00");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 25:00:00' AS TIMESTAMP)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 25:00:00' AS TIMESTAMP)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 25:00:00");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 00:61:00' AS TIMESTAMP)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 00:61:00' AS TIMESTAMP)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 00:61:00");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 00:00:61' AS TIMESTAMP)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 00:00:61' AS TIMESTAMP)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 00:00:61");
 
-        assertThatThrownBy(() -> assertions.expression("CAST('ABC' AS TIMESTAMP(12))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('ABC' AS TIMESTAMP(12))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: ABC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-00 00:00:00' AS TIMESTAMP(12))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-00 00:00:00' AS TIMESTAMP(12))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-00 00:00:00");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-00-01 00:00:00' AS TIMESTAMP(12))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-00-01 00:00:00' AS TIMESTAMP(12))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-00-01 00:00:00");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 25:00:00' AS TIMESTAMP(12))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 25:00:00' AS TIMESTAMP(12))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 25:00:00");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 00:61:00' AS TIMESTAMP(12))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 00:61:00' AS TIMESTAMP(12))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 00:61:00");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 00:00:61' AS TIMESTAMP(12))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 00:00:61' AS TIMESTAMP(12))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 00:00:61");
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/timestamptz/TestCurrentTimestamp.java b/core/trino-main/src/test/java/io/trino/operator/scalar/timestamptz/TestCurrentTimestamp.java
new file mode 100644
index 000000000000..20f4240c38ff
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/timestamptz/TestCurrentTimestamp.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed 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 io.trino.operator.scalar.timestamptz;
+
+import io.trino.Session;
+import io.trino.spi.type.TimeZoneKey;
+import io.trino.sql.query.QueryAssertions;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestCurrentTimestamp
+{
+    @Test
+    public void testRoundUp()
+    {
+        try (QueryAssertions assertions = new QueryAssertions()) {
+            Session session = Session.builder(assertions.getDefaultSession())
+                    .setTimeZoneKey(TimeZoneKey.UTC_KEY)
+                    .setStart(Instant.ofEpochSecond(0, 999_999_999))
+                    .build();
+
+            assertThat(assertions.expression("current_timestamp(0)", session)).matches("TIMESTAMP '1970-01-01 00:00:01 UTC'");
+            assertThat(assertions.expression("current_timestamp(1)", session)).matches("TIMESTAMP '1970-01-01 00:00:01.0 UTC'");
+            assertThat(assertions.expression("current_timestamp(2)", session)).matches("TIMESTAMP '1970-01-01 00:00:01.00 UTC'");
+            assertThat(assertions.expression("current_timestamp(3)", session)).matches("TIMESTAMP '1970-01-01 00:00:01.000 UTC'");
+            assertThat(assertions.expression("current_timestamp(4)", session)).matches("TIMESTAMP '1970-01-01 00:00:01.0000 UTC'");
+            assertThat(assertions.expression("current_timestamp(5)", session)).matches("TIMESTAMP '1970-01-01 00:00:01.00000 UTC'");
+            assertThat(assertions.expression("current_timestamp(6)", session)).matches("TIMESTAMP '1970-01-01 00:00:01.000000 UTC'");
+            assertThat(assertions.expression("current_timestamp(7)", session)).matches("TIMESTAMP '1970-01-01 00:00:01.0000000 UTC'");
+            assertThat(assertions.expression("current_timestamp(8)", session)).matches("TIMESTAMP '1970-01-01 00:00:01.00000000 UTC'");
+            assertThat(assertions.expression("current_timestamp(9)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.999999999 UTC'");
+            assertThat(assertions.expression("current_timestamp(10)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.9999999990 UTC'");
+            assertThat(assertions.expression("current_timestamp(11)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.99999999900 UTC'");
+            assertThat(assertions.expression("current_timestamp(12)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.999999999000 UTC'");
+        }
+    }
+
+    @Test
+    public void testRoundDown()
+    {
+        try (QueryAssertions assertions = new QueryAssertions()) {
+            Session session = Session.builder(assertions.getDefaultSession())
+                    .setTimeZoneKey(TimeZoneKey.UTC_KEY)
+                    .setStart(Instant.ofEpochSecond(0, 1))
+                    .build();
+
+            assertThat(assertions.expression("current_timestamp(0)", session)).matches("TIMESTAMP '1970-01-01 00:00:00 UTC'");
+            assertThat(assertions.expression("current_timestamp(1)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.0 UTC'");
+            assertThat(assertions.expression("current_timestamp(2)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.00 UTC'");
+            assertThat(assertions.expression("current_timestamp(3)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.000 UTC'");
+            assertThat(assertions.expression("current_timestamp(4)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.0000 UTC'");
+            assertThat(assertions.expression("current_timestamp(5)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.00000 UTC'");
+            assertThat(assertions.expression("current_timestamp(6)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.000000 UTC'");
+            assertThat(assertions.expression("current_timestamp(7)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.0000000 UTC'");
+            assertThat(assertions.expression("current_timestamp(8)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.00000000 UTC'");
+            assertThat(assertions.expression("current_timestamp(9)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.000000001 UTC'");
+            assertThat(assertions.expression("current_timestamp(10)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.0000000010 UTC'");
+            assertThat(assertions.expression("current_timestamp(11)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.00000000100 UTC'");
+            assertThat(assertions.expression("current_timestamp(12)", session)).matches("TIMESTAMP '1970-01-01 00:00:00.000000001000 UTC'");
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/timestamptz/TestExtract.java b/core/trino-main/src/test/java/io/trino/operator/scalar/timestamptz/TestExtract.java
index 7bc07055f367..e618fe1898de 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/timestamptz/TestExtract.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/timestamptz/TestExtract.java
@@ -13,30 +13,36 @@
  */
 package io.trino.operator.scalar.timestamptz;
 
-import io.trino.operator.scalar.AbstractTestExtract;
 import io.trino.sql.parser.ParsingException;
-import org.testng.annotations.Test;
+import io.trino.sql.query.QueryAssertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-import java.util.List;
-import java.util.stream.IntStream;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestExtract
-        extends AbstractTestExtract
 {
-    @Override
-    protected List<String> types()
+    private QueryAssertions assertions;
+
+    @BeforeAll
+    public void init()
+    {
+        assertions = new QueryAssertions();
+    }
+
+    @AfterAll
+    public void tearDown()
     {
-        return IntStream.rangeClosed(0, 12)
-                .mapToObj(precision -> format("timestamp(%s) with time zone", precision))
-                .collect(toImmutableList());
+        assertions.close();
+        assertions = null;
     }
 
-    @Override
+    @Test
     public void testYear()
     {
         assertThat(assertions.expression("EXTRACT(YEAR FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '2020'");
@@ -68,7 +74,7 @@ public void testYear()
         assertThat(assertions.expression("year(TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '2020'");
     }
 
-    @Override
+    @Test
     public void testMonth()
     {
         assertThat(assertions.expression("EXTRACT(MONTH FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '5'");
@@ -100,7 +106,7 @@ public void testMonth()
         assertThat(assertions.expression("month(TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '5'");
     }
 
-    @Override
+    @Test
     public void testWeek()
     {
         assertThat(assertions.expression("EXTRACT(WEEK FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '19'");
@@ -132,7 +138,7 @@ public void testWeek()
         assertThat(assertions.expression("week(TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '19'");
     }
 
-    @Override
+    @Test
     public void testDay()
     {
         assertThat(assertions.expression("EXTRACT(DAY FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '10'");
@@ -164,7 +170,7 @@ public void testDay()
         assertThat(assertions.expression("day(TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '10'");
     }
 
-    @Override
+    @Test
     public void testDayOfMonth()
     {
         assertThat(assertions.expression("EXTRACT(DAY_OF_MONTH FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '10'");
@@ -196,7 +202,7 @@ public void testDayOfMonth()
         assertThat(assertions.expression("day_of_month(TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '10'");
     }
 
-    @Override
+    @Test
     public void testHour()
     {
         assertThat(assertions.expression("EXTRACT(HOUR FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '12'");
@@ -228,7 +234,7 @@ public void testHour()
         assertThat(assertions.expression("hour(TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '12'");
     }
 
-    @Override
+    @Test
     public void testMinute()
     {
         assertThat(assertions.expression("EXTRACT(MINUTE FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '34'");
@@ -260,7 +266,7 @@ public void testMinute()
         assertThat(assertions.expression("minute(TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '34'");
     }
 
-    @Override
+    @Test
     public void testSecond()
     {
         assertThat(assertions.expression("EXTRACT(SECOND FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '56'");
@@ -295,7 +301,7 @@ public void testSecond()
     @Test
     public void testMillisecond()
     {
-        assertThatThrownBy(() -> assertions.expression("EXTRACT(MILLISECOND FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')").evaluate())
+        assertThatThrownBy(assertions.expression("EXTRACT(MILLISECOND FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")::evaluate)
                 .isInstanceOf(ParsingException.class)
                 .hasMessage("line 1:12: Invalid EXTRACT field: MILLISECOND");
 
@@ -314,7 +320,7 @@ public void testMillisecond()
         assertThat(assertions.expression("millisecond(TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '123'");
     }
 
-    @Override
+    @Test
     public void testTimezoneHour()
     {
         assertThat(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIMESTAMP '2020-05-10 12:34:56 +08:35')")).matches("BIGINT '8'");
@@ -375,7 +381,7 @@ public void testTimezoneHour()
         assertThat(assertions.expression("timezone_hour(TIMESTAMP '2020-05-10 12:34:56.123456789123 -08:35')")).matches("BIGINT '-8'");
     }
 
-    @Override
+    @Test
     public void testTimezoneMinute()
     {
         assertThat(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIMESTAMP '2020-05-10 12:34:56 +08:35')")).matches("BIGINT '35'");
@@ -465,7 +471,7 @@ public void testTimezoneMinute()
         assertThat(assertions.expression("timezone_minute(TIMESTAMP '2020-05-10 12:34:56.123456789123 -00:35')")).matches("BIGINT '-35'");
     }
 
-    @Override
+    @Test
     public void testDayOfWeek()
     {
         assertThat(assertions.expression("EXTRACT(DAY_OF_WEEK FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '7'");
@@ -497,7 +503,7 @@ public void testDayOfWeek()
         assertThat(assertions.expression("day_of_week(TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '7'");
     }
 
-    @Override
+    @Test
     public void testDow()
     {
         assertThat(assertions.expression("EXTRACT(DOW FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '7'");
@@ -515,7 +521,7 @@ public void testDow()
         assertThat(assertions.expression("EXTRACT(DOW FROM TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '7'");
     }
 
-    @Override
+    @Test
     public void testDayOfYear()
     {
         assertThat(assertions.expression("EXTRACT(DAY_OF_YEAR FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '131'");
@@ -547,7 +553,7 @@ public void testDayOfYear()
         assertThat(assertions.expression("day_of_year(TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '131'");
     }
 
-    @Override
+    @Test
     public void testDoy()
     {
         assertThat(assertions.expression("EXTRACT(DOY FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '131'");
@@ -565,7 +571,7 @@ public void testDoy()
         assertThat(assertions.expression("EXTRACT(DOY FROM TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '131'");
     }
 
-    @Override
+    @Test
     public void testQuarter()
     {
         assertThat(assertions.expression("EXTRACT(QUARTER FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '2'");
@@ -600,7 +606,7 @@ public void testQuarter()
     @Test
     public void testWeekOfYear()
     {
-        assertThatThrownBy(() -> assertions.expression("EXTRACT(WEEK_OF_YEAR FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')").evaluate())
+        assertThatThrownBy(assertions.expression("EXTRACT(WEEK_OF_YEAR FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")::evaluate)
                 .isInstanceOf(ParsingException.class)
                 .hasMessage("line 1:12: Invalid EXTRACT field: WEEK_OF_YEAR");
 
@@ -619,7 +625,7 @@ public void testWeekOfYear()
         assertThat(assertions.expression("week_of_year(TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '19'");
     }
 
-    @Override
+    @Test
     public void testYearOfWeek()
     {
         assertThat(assertions.expression("EXTRACT(YEAR_OF_WEEK FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '2020'");
@@ -651,7 +657,7 @@ public void testYearOfWeek()
         assertThat(assertions.expression("year_of_week(TIMESTAMP '2020-05-10 12:34:56.123456789012 Asia/Kathmandu')")).matches("BIGINT '2020'");
     }
 
-    @Override
+    @Test
     public void testYow()
     {
         assertThat(assertions.expression("EXTRACT(YOW FROM TIMESTAMP '2020-05-10 12:34:56 Asia/Kathmandu')")).matches("BIGINT '2020'");
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/timestamptz/TestTimestampWithTimeZone.java b/core/trino-main/src/test/java/io/trino/operator/scalar/timestamptz/TestTimestampWithTimeZone.java
index 1fb9c172d02f..6cf8e535daaa 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/timestamptz/TestTimestampWithTimeZone.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/timestamptz/TestTimestampWithTimeZone.java
@@ -113,11 +113,11 @@ public void testLiterals()
                 .hasType(createTimestampWithTimeZoneType(12))
                 .isEqualTo(timestampWithTimeZone(12, 2020, 5, 1, 12, 34, 56, 123_456_789_012L, getTimeZoneKey("Asia/Kathmandu")));
 
-        assertThatThrownBy(() -> assertions.expression("TIMESTAMP '2020-05-01 12:34:56.1234567890123 Asia/Kathmandu'").evaluate())
+        assertThatThrownBy(assertions.expression("TIMESTAMP '2020-05-01 12:34:56.1234567890123 Asia/Kathmandu'")::evaluate)
                 .hasMessage("line 1:12: TIMESTAMP WITH TIME ZONE precision must be in range [0, 12]: 13");
 
-        assertThatThrownBy(() -> assertions.expression("TIMESTAMP '2020-13-01 Asia/Kathmandu'").evaluate())
-                .hasMessage("line 1:12: '2020-13-01 Asia/Kathmandu' is not a valid timestamp literal");
+        assertThatThrownBy(assertions.expression("TIMESTAMP '2020-13-01 Asia/Kathmandu'")::evaluate)
+                .hasMessage("line 1:12: '2020-13-01 Asia/Kathmandu' is not a valid TIMESTAMP literal");
 
         // negative epoch
         assertThat(assertions.expression("TIMESTAMP '1500-05-01 12:34:56 Asia/Kathmandu'"))
@@ -402,7 +402,7 @@ public void testLiterals()
                 .hasType(createTimestampWithTimeZoneType(0))
                 .isEqualTo(timestampWithTimeZone(0, 2001, 1, 2, 3, 4, 0, 0, getTimeZoneKey("+07:09")));
 
-        assertThat(assertions.expression("TIMESTAMP '2001-1-2+07:09'"))
+        assertThat(assertions.expression("TIMESTAMP '2001-1-2 +07:09'"))
                 .hasType(createTimestampWithTimeZoneType(0))
                 .isEqualTo(timestampWithTimeZone(0, 2001, 1, 2, 0, 0, 0, 0, getTimeZoneKey("+07:09")));
 
@@ -423,17 +423,22 @@ public void testLiterals()
                 .isEqualTo(timestampWithTimeZone(0, 2001, 1, 2, 0, 0, 0, 0, getTimeZoneKey("Europe/Berlin")));
 
         // Overflow
-        assertTrinoExceptionThrownBy(() -> assertions.expression("TIMESTAMP '123001-01-02 03:04:05.321 Europe/Berlin'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("TIMESTAMP '123001-01-02 03:04:05.321 Europe/Berlin'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: '123001-01-02 03:04:05.321 Europe/Berlin' is not a valid timestamp literal");
+                .hasMessage("line 1:12: '123001-01-02 03:04:05.321 Europe/Berlin' is not a valid TIMESTAMP literal");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("TIMESTAMP '+123001-01-02 03:04:05.321 Europe/Berlin'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("TIMESTAMP '+123001-01-02 03:04:05.321 Europe/Berlin'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: '+123001-01-02 03:04:05.321 Europe/Berlin' is not a valid timestamp literal");
+                .hasMessage("line 1:12: '+123001-01-02 03:04:05.321 Europe/Berlin' is not a valid TIMESTAMP literal");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("TIMESTAMP '-123001-01-02 03:04:05.321 Europe/Berlin'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("TIMESTAMP '-123001-01-02 03:04:05.321 Europe/Berlin'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: '-123001-01-02 03:04:05.321 Europe/Berlin' is not a valid timestamp literal");
+                .hasMessage("line 1:12: '-123001-01-02 03:04:05.321 Europe/Berlin' is not a valid TIMESTAMP literal");
+
+        // missing space after day
+        assertTrinoExceptionThrownBy(assertions.expression("TIMESTAMP '2020-13-01-12'")::evaluate)
+                .hasErrorCode(INVALID_LITERAL)
+                .hasMessage("line 1:12: '2020-13-01-12' is not a valid TIMESTAMP literal");
     }
 
     @Test
@@ -2603,34 +2608,34 @@ public void testJoin()
     @Test
     public void testCastInvalidTimestamp()
     {
-        assertThatThrownBy(() -> assertions.expression("CAST('ABC' AS TIMESTAMP WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('ABC' AS TIMESTAMP WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: ABC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-00 00:00:00 UTC' AS TIMESTAMP WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-00 00:00:00 UTC' AS TIMESTAMP WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-00 00:00:00 UTC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-00-01 00:00:00 UTC' AS TIMESTAMP WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-00-01 00:00:00 UTC' AS TIMESTAMP WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-00-01 00:00:00 UTC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 25:00:00 UTC' AS TIMESTAMP WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 25:00:00 UTC' AS TIMESTAMP WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 25:00:00 UTC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 00:61:00 UTC' AS TIMESTAMP WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 00:61:00 UTC' AS TIMESTAMP WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 00:61:00 UTC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 00:00:61 UTC' AS TIMESTAMP WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 00:00:61 UTC' AS TIMESTAMP WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 00:00:61 UTC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 00:00:00 ABC' AS TIMESTAMP WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 00:00:00 ABC' AS TIMESTAMP WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 00:00:00 ABC");
 
-        assertThatThrownBy(() -> assertions.expression("CAST('ABC' AS TIMESTAMP(12))").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('ABC' AS TIMESTAMP(12))")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: ABC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-00 00:00:00 UTC' AS TIMESTAMP(12) WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-00 00:00:00 UTC' AS TIMESTAMP(12) WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-00 00:00:00 UTC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-00-01 00:00:00 UTC' AS TIMESTAMP(12) WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-00-01 00:00:00 UTC' AS TIMESTAMP(12) WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-00-01 00:00:00 UTC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 25:00:00 UTC' AS TIMESTAMP(12) WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 25:00:00 UTC' AS TIMESTAMP(12) WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 25:00:00 UTC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 00:61:00 UTC' AS TIMESTAMP(12) WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 00:61:00 UTC' AS TIMESTAMP(12) WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 00:61:00 UTC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 00:00:61 UTC' AS TIMESTAMP(12) WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 00:00:61 UTC' AS TIMESTAMP(12) WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 00:00:61 UTC");
-        assertThatThrownBy(() -> assertions.expression("CAST('2022-01-01 00:00:00 ABC' AS TIMESTAMP(12) WITH TIME ZONE)").evaluate())
+        assertThatThrownBy(assertions.expression("CAST('2022-01-01 00:00:00 ABC' AS TIMESTAMP(12) WITH TIME ZONE)")::evaluate)
                 .hasMessage("Value cannot be cast to timestamp: 2022-01-01 00:00:00 ABC");
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/timetz/TestExtract.java b/core/trino-main/src/test/java/io/trino/operator/scalar/timetz/TestExtract.java
index 668dcc334e27..5720aab320e6 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/timetz/TestExtract.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/timetz/TestExtract.java
@@ -13,30 +13,38 @@
  */
 package io.trino.operator.scalar.timetz;
 
-import io.trino.operator.scalar.AbstractTestExtract;
+import io.trino.spi.StandardErrorCode;
 import io.trino.sql.parser.ParsingException;
-import org.testng.annotations.Test;
+import io.trino.sql.query.QueryAssertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-import java.util.List;
-import java.util.stream.IntStream;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static java.lang.String.format;
+import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestExtract
-        extends AbstractTestExtract
 {
-    @Override
-    protected List<String> types()
+    private QueryAssertions assertions;
+
+    @BeforeAll
+    public void init()
+    {
+        assertions = new QueryAssertions();
+    }
+
+    @AfterAll
+    public void tearDown()
     {
-        return IntStream.rangeClosed(0, 12)
-                .mapToObj(precision -> format("time(%s) with time zone", precision))
-                .collect(toImmutableList());
+        assertions.close();
+        assertions = null;
     }
 
-    @Override
+    @Test
     public void testHour()
     {
         assertThat(assertions.expression("EXTRACT(HOUR FROM TIME '12:34:56+08:35')")).matches("BIGINT '12'");
@@ -68,7 +76,7 @@ public void testHour()
         assertThat(assertions.expression("hour(TIME '12:34:56.123456789012+08:35')")).matches("BIGINT '12'");
     }
 
-    @Override
+    @Test
     public void testMinute()
     {
         assertThat(assertions.expression("EXTRACT(MINUTE FROM TIME '12:34:56+08:35')")).matches("BIGINT '34'");
@@ -100,7 +108,7 @@ public void testMinute()
         assertThat(assertions.expression("minute(TIME '12:34:56.123456789012+08:35')")).matches("BIGINT '34'");
     }
 
-    @Override
+    @Test
     public void testSecond()
     {
         assertThat(assertions.expression("EXTRACT(SECOND FROM TIME '12:34:56+08:35')")).matches("BIGINT '56'");
@@ -135,7 +143,7 @@ public void testSecond()
     @Test
     public void testMillisecond()
     {
-        assertThatThrownBy(() -> assertions.expression("EXTRACT(MILLISECOND FROM TIME '12:34:56+08:35')").evaluate())
+        assertThatThrownBy(assertions.expression("EXTRACT(MILLISECOND FROM TIME '12:34:56+08:35')")::evaluate)
                 .isInstanceOf(ParsingException.class)
                 .hasMessage("line 1:12: Invalid EXTRACT field: MILLISECOND");
 
@@ -154,7 +162,7 @@ public void testMillisecond()
         assertThat(assertions.expression("millisecond(TIME '12:34:56.123456789012+08:35')")).matches("BIGINT '123'");
     }
 
-    @Override
+    @Test
     public void testTimezoneHour()
     {
         assertThat(assertions.expression("EXTRACT(TIMEZONE_HOUR FROM TIME '12:34:56+08:35')")).matches("BIGINT '8'");
@@ -244,7 +252,7 @@ public void testTimezoneHour()
         assertThat(assertions.expression("timezone_hour(TIME '12:34:56.123456789012-00:35')")).matches("BIGINT '0'");
     }
 
-    @Override
+    @Test
     public void testTimezoneMinute()
     {
         assertThat(assertions.expression("EXTRACT(TIMEZONE_MINUTE FROM TIME '12:34:56+08:35')")).matches("BIGINT '35'");
@@ -333,4 +341,50 @@ public void testTimezoneMinute()
         assertThat(assertions.expression("timezone_minute(TIME '12:34:56.12345678901-00:35')")).matches("BIGINT '-35'");
         assertThat(assertions.expression("timezone_minute(TIME '12:34:56.123456789012-00:35')")).matches("BIGINT '-35'");
     }
+
+    @Test
+    public void testUnsupported()
+    {
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.1-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.12-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.123-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.1234-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.12345-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.123456-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.1234567-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.12345678-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.123456789-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.1234567890-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.12345678901-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(YEAR FROM TIME '12:34:56.123456789012-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.1-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.12-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.123-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.1234-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.12345-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.123456-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.1234567-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.12345678-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.123456789-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.1234567890-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.12345678901-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(MONTH FROM TIME '12:34:56.123456789012-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.1-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.12-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.123-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.1234-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.12345-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.123456-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.1234567-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.12345678-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.123456789-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.1234567890-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.12345678901-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+        assertTrinoExceptionThrownBy(assertions.expression("EXTRACT(DAY FROM TIME '12:34:56.123456789012-00:35')")::evaluate).hasErrorCode(StandardErrorCode.TYPE_MISMATCH);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/operator/scalar/timetz/TestTimeWithTimeZone.java b/core/trino-main/src/test/java/io/trino/operator/scalar/timetz/TestTimeWithTimeZone.java
index ec2c30ceef8b..b5cfdaae5311 100644
--- a/core/trino-main/src/test/java/io/trino/operator/scalar/timetz/TestTimeWithTimeZone.java
+++ b/core/trino-main/src/test/java/io/trino/operator/scalar/timetz/TestTimeWithTimeZone.java
@@ -260,35 +260,35 @@ public void testLiterals()
                 .hasType(createTimeWithTimeZoneType(12))
                 .isEqualTo(timeWithTimeZone(12, 12, 34, 56, 123_456_789_123L, -14 * 60));
 
-        assertThatThrownBy(() -> assertions.expression("TIME '12:34:56.1234567891234+08:35'").evaluate())
+        assertThatThrownBy(assertions.expression("TIME '12:34:56.1234567891234+08:35'")::evaluate)
                 .hasMessage("line 1:12: TIME WITH TIME ZONE precision must be in range [0, 12]: 13");
 
-        assertThatThrownBy(() -> assertions.expression("TIME '25:00:00+08:35'").evaluate())
-                .hasMessage("line 1:12: '25:00:00+08:35' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME '25:00:00+08:35'")::evaluate)
+                .hasMessage("line 1:12: '25:00:00+08:35' is not a valid TIME literal");
 
-        assertThatThrownBy(() -> assertions.expression("TIME '12:65:00+08:35'").evaluate())
-                .hasMessage("line 1:12: '12:65:00+08:35' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME '12:65:00+08:35'")::evaluate)
+                .hasMessage("line 1:12: '12:65:00+08:35' is not a valid TIME literal");
 
-        assertThatThrownBy(() -> assertions.expression("TIME '12:00:65+08:35'").evaluate())
-                .hasMessage("line 1:12: '12:00:65+08:35' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME '12:00:65+08:35'")::evaluate)
+                .hasMessage("line 1:12: '12:00:65+08:35' is not a valid TIME literal");
 
-        assertThatThrownBy(() -> assertions.expression("TIME '12:00:00+15:00'").evaluate())
-                .hasMessage("line 1:12: '12:00:00+15:00' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME '12:00:00+15:00'")::evaluate)
+                .hasMessage("line 1:12: '12:00:00+15:00' is not a valid TIME literal");
 
-        assertThatThrownBy(() -> assertions.expression("TIME '12:00:00-15:00'").evaluate())
-                .hasMessage("line 1:12: '12:00:00-15:00' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME '12:00:00-15:00'")::evaluate)
+                .hasMessage("line 1:12: '12:00:00-15:00' is not a valid TIME literal");
 
-        assertThatThrownBy(() -> assertions.expression("TIME '12:00:00+14:01'").evaluate())
-                .hasMessage("line 1:12: '12:00:00+14:01' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME '12:00:00+14:01'")::evaluate)
+                .hasMessage("line 1:12: '12:00:00+14:01' is not a valid TIME literal");
 
-        assertThatThrownBy(() -> assertions.expression("TIME '12:00:00-14:01'").evaluate())
-                .hasMessage("line 1:12: '12:00:00-14:01' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME '12:00:00-14:01'")::evaluate)
+                .hasMessage("line 1:12: '12:00:00-14:01' is not a valid TIME literal");
 
-        assertThatThrownBy(() -> assertions.expression("TIME '12:00:00+13:60'").evaluate())
-                .hasMessage("line 1:12: '12:00:00+13:60' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME '12:00:00+13:60'")::evaluate)
+                .hasMessage("line 1:12: '12:00:00+13:60' is not a valid TIME literal");
 
-        assertThatThrownBy(() -> assertions.expression("TIME '12:00:00-13:60'").evaluate())
-                .hasMessage("line 1:12: '12:00:00-13:60' is not a valid time literal");
+        assertThatThrownBy(assertions.expression("TIME '12:00:00-13:60'")::evaluate)
+                .hasMessage("line 1:12: '12:00:00-13:60' is not a valid TIME literal");
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/operator/unnest/BenchmarkUnnestOperator.java b/core/trino-main/src/test/java/io/trino/operator/unnest/BenchmarkUnnestOperator.java
index 9f7f4b577a51..abac31c7aa10 100644
--- a/core/trino-main/src/test/java/io/trino/operator/unnest/BenchmarkUnnestOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/unnest/BenchmarkUnnestOperator.java
@@ -29,6 +29,7 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.TestingTaskContext;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -43,7 +44,6 @@
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.profile.GCProfiler;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/core/trino-main/src/test/java/io/trino/operator/unnest/TestUnnestOperator.java b/core/trino-main/src/test/java/io/trino/operator/unnest/TestUnnestOperator.java
index 28c3233bf3da..657b44229be5 100644
--- a/core/trino-main/src/test/java/io/trino/operator/unnest/TestUnnestOperator.java
+++ b/core/trino-main/src/test/java/io/trino/operator/unnest/TestUnnestOperator.java
@@ -26,9 +26,10 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -69,15 +70,16 @@
 import static io.trino.testing.TestingTaskContext.createTaskContext;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static io.trino.util.StructuralTestUtil.arrayBlockOf;
-import static io.trino.util.StructuralTestUtil.mapBlockOf;
+import static io.trino.util.StructuralTestUtil.sqlMapOf;
 import static java.lang.Double.NEGATIVE_INFINITY;
 import static java.lang.Double.NaN;
 import static java.lang.Double.POSITIVE_INFINITY;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestUnnestOperator
 {
     private ExecutorService executor;
@@ -87,7 +89,7 @@ public class TestUnnestOperator
     private static final int PAGE_COUNT = 2;
     private static final int POSITION_COUNT = 500;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
@@ -98,7 +100,7 @@ public void setUp()
                 .addDriverContext();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         executor.shutdownNow();
@@ -112,11 +114,11 @@ public void testUnnest()
         Type mapType = TESTING_TYPE_MANAGER.getType(mapType(BIGINT.getTypeSignature(), BIGINT.getTypeSignature()));
 
         List<Page> input = rowPagesBuilder(BIGINT, arrayType, mapType)
-                .row(1L, arrayBlockOf(BIGINT, 2, 3), mapBlockOf(BIGINT, BIGINT, ImmutableMap.of(4, 5)))
+                .row(1L, arrayBlockOf(BIGINT, 2, 3), sqlMapOf(BIGINT, BIGINT, ImmutableMap.of(4, 5)))
                 .row(2L, arrayBlockOf(BIGINT, 99), null)
                 .row(3L, null, null)
                 .pageBreak()
-                .row(6L, arrayBlockOf(BIGINT, 7, 8), mapBlockOf(BIGINT, BIGINT, ImmutableMap.of(9, 10, 11, 12)))
+                .row(6L, arrayBlockOf(BIGINT, 7, 8), sqlMapOf(BIGINT, BIGINT, ImmutableMap.of(9, 10, 11, 12)))
                 .build();
 
         OperatorFactory operatorFactory = new UnnestOperator.UnnestOperatorFactory(
@@ -143,14 +145,14 @@ public void testUnnestWithArray()
                 .row(
                         1L,
                         arrayBlockOf(new ArrayType(BIGINT), ImmutableList.of(2, 4), ImmutableList.of(3, 6)),
-                        mapBlockOf(new ArrayType(BIGINT), new ArrayType(BIGINT), ImmutableMap.of(ImmutableList.of(4, 8), ImmutableList.of(5, 10))))
+                        sqlMapOf(new ArrayType(BIGINT), new ArrayType(BIGINT), ImmutableMap.of(ImmutableList.of(4, 8), ImmutableList.of(5, 10))))
                 .row(2L, arrayBlockOf(new ArrayType(BIGINT), ImmutableList.of(99, 198)), null)
                 .row(3L, null, null)
                 .pageBreak()
                 .row(
                         6,
                         arrayBlockOf(new ArrayType(BIGINT), ImmutableList.of(7, 14), ImmutableList.of(8, 16)),
-                        mapBlockOf(new ArrayType(BIGINT), new ArrayType(BIGINT), ImmutableMap.of(ImmutableList.of(9, 18), ImmutableList.of(10, 20), ImmutableList.of(11, 22), ImmutableList.of(12, 24))))
+                        sqlMapOf(new ArrayType(BIGINT), new ArrayType(BIGINT), ImmutableMap.of(ImmutableList.of(9, 18), ImmutableList.of(10, 20), ImmutableList.of(11, 22), ImmutableList.of(12, 24))))
                 .build();
 
         OperatorFactory operatorFactory = new UnnestOperator.UnnestOperatorFactory(
@@ -174,11 +176,11 @@ public void testUnnestWithOrdinality()
         Type mapType = TESTING_TYPE_MANAGER.getType(mapType(BIGINT.getTypeSignature(), BIGINT.getTypeSignature()));
 
         List<Page> input = rowPagesBuilder(BIGINT, arrayType, mapType)
-                .row(1L, arrayBlockOf(BIGINT, 2, 3), mapBlockOf(BIGINT, BIGINT, ImmutableMap.of(4, 5)))
+                .row(1L, arrayBlockOf(BIGINT, 2, 3), sqlMapOf(BIGINT, BIGINT, ImmutableMap.of(4, 5)))
                 .row(2L, arrayBlockOf(BIGINT, 99), null)
                 .row(3L, null, null)
                 .pageBreak()
-                .row(6L, arrayBlockOf(BIGINT, 7, 8), mapBlockOf(BIGINT, BIGINT, ImmutableMap.of(9, 10, 11, 12)))
+                .row(6L, arrayBlockOf(BIGINT, 7, 8), sqlMapOf(BIGINT, BIGINT, ImmutableMap.of(9, 10, 11, 12)))
                 .build();
 
         OperatorFactory operatorFactory = new UnnestOperator.UnnestOperatorFactory(
@@ -203,7 +205,7 @@ public void testUnnestNonNumericDoubles()
 
         List<Page> input = rowPagesBuilder(BIGINT, arrayType, mapType)
                 .row(1L, arrayBlockOf(DOUBLE, NEGATIVE_INFINITY, POSITIVE_INFINITY, NaN),
-                        mapBlockOf(BIGINT, DOUBLE, ImmutableMap.of(1, NEGATIVE_INFINITY, 2, POSITIVE_INFINITY, 3, NaN)))
+                        sqlMapOf(BIGINT, DOUBLE, ImmutableMap.of(1, NEGATIVE_INFINITY, 2, POSITIVE_INFINITY, 3, NaN)))
                 .build();
 
         OperatorFactory operatorFactory = new UnnestOperator.UnnestOperatorFactory(
@@ -258,7 +260,7 @@ public void testOuterUnnest()
         List<Page> input = rowPagesBuilder(BIGINT, mapType, arrayType, arrayOfRowType)
                 .row(
                         1,
-                        mapBlockOf(BIGINT, BIGINT, ImmutableMap.of(1, 2)),
+                        sqlMapOf(BIGINT, BIGINT, ImmutableMap.of(1, 2)),
                         arrayBlockOf(BIGINT, 3),
                         arrayBlockOf(elementType, ImmutableList.of(4, 5.5, "a"), ImmutableList.of(6, 7.7, "b")))
                 .row(2, null, null, null)
@@ -290,7 +292,7 @@ public void testOuterUnnestWithOrdinality()
         List<Page> input = rowPagesBuilder(BIGINT, mapType, arrayType, arrayOfRowType)
                 .row(
                         1,
-                        mapBlockOf(BIGINT, BIGINT, ImmutableMap.of(1, 2, 6, 7)),
+                        sqlMapOf(BIGINT, BIGINT, ImmutableMap.of(1, 2, 6, 7)),
                         arrayBlockOf(BIGINT, 3),
                         arrayBlockOf(elementType, ImmutableList.of(4, 5.5, "a")))
                 .row(2, null, null, null)
diff --git a/core/trino-main/src/test/java/io/trino/operator/unnest/TestingUnnesterUtil.java b/core/trino-main/src/test/java/io/trino/operator/unnest/TestingUnnesterUtil.java
index 7915eb495b0e..9825ee8f016c 100644
--- a/core/trino-main/src/test/java/io/trino/operator/unnest/TestingUnnesterUtil.java
+++ b/core/trino-main/src/test/java/io/trino/operator/unnest/TestingUnnesterUtil.java
@@ -21,7 +21,8 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.ColumnarArray;
 import io.trino.spi.block.ColumnarMap;
-import io.trino.spi.block.ColumnarRow;
+import io.trino.spi.block.RowBlock;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
@@ -85,22 +86,23 @@ public static Block createArrayBlockOfRowBlocks(Slice[][][] elements, RowType ro
             }
             else {
                 Slice[][] expectedValues = elements[i];
-                BlockBuilder elementBlockBuilder = rowType.createBlockBuilder(null, elements[i].length);
+                RowBlockBuilder elementBlockBuilder = rowType.createBlockBuilder(null, elements[i].length);
                 for (Slice[] expectedValue : expectedValues) {
                     if (expectedValue == null) {
                         elementBlockBuilder.appendNull();
                     }
                     else {
-                        BlockBuilder entryBuilder = elementBlockBuilder.beginBlockEntry();
-                        for (Slice v : expectedValue) {
-                            if (v == null) {
-                                entryBuilder.appendNull();
+                        elementBlockBuilder.buildEntry(fieldBuilders -> {
+                            for (int fieldId = 0; fieldId < expectedValue.length; fieldId++) {
+                                Slice v = expectedValue[fieldId];
+                                if (v == null) {
+                                    fieldBuilders.get(fieldId).appendNull();
+                                }
+                                else {
+                                    VARCHAR.writeSlice(fieldBuilders.get(fieldId), v);
+                                }
                             }
-                            else {
-                                VARCHAR.writeSlice(entryBuilder, v);
-                            }
-                        }
-                        elementBlockBuilder.closeEntry();
+                        });
                     }
                 }
                 arrayType.writeObject(arrayBlockBuilder, elementBlockBuilder.build());
@@ -492,27 +494,18 @@ private static Block[] buildExpectedUnnestedArrayOfRowBlock(Block block, List<Ty
     {
         ColumnarArray columnarArray = ColumnarArray.toColumnarArray(block);
         Block elementBlock = columnarArray.getElementsBlock();
-        ColumnarRow columnarRow = ColumnarRow.toColumnarRow(elementBlock);
-
-        int fieldCount = columnarRow.getFieldCount();
-        Block[] blocks = new Block[fieldCount];
+        List<Block> fields = RowBlock.getRowFieldsFromBlock(elementBlock);
 
+        Block[] blocks = new Block[fields.size()];
         int positionCount = block.getPositionCount();
-        for (int i = 0; i < fieldCount; i++) {
+        for (int i = 0; i < fields.size(); i++) {
             BlockBuilder blockBuilder = rowTypes.get(i).createBlockBuilder(null, totalEntries);
 
-            int nullRowsEncountered = 0;
             for (int j = 0; j < positionCount; j++) {
                 int rowBlockIndex = columnarArray.getOffset(j);
                 int cardinality = columnarArray.getLength(j);
                 for (int k = 0; k < cardinality; k++) {
-                    if (columnarRow.isNull(rowBlockIndex + k)) {
-                        blockBuilder.appendNull();
-                        nullRowsEncountered++;
-                    }
-                    else {
-                        rowTypes.get(i).appendTo(columnarRow.getField(i), rowBlockIndex + k - nullRowsEncountered, blockBuilder);
-                    }
+                    rowTypes.get(i).appendTo(fields.get(i), rowBlockIndex + k, blockBuilder);
                 }
 
                 int maxCardinality = maxCardinalities[j];
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/AbstractTestWindowFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/AbstractTestWindowFunction.java
index b638ba85ca74..32238aa6a194 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/AbstractTestWindowFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/AbstractTestWindowFunction.java
@@ -16,24 +16,27 @@
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.MaterializedResult;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.testing.Closeables.closeAllRuntimeException;
 import static io.trino.SessionTestUtils.TEST_SESSION;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public abstract class AbstractTestWindowFunction
 {
     protected LocalQueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public final void initTestWindowFunction()
     {
         queryRunner = LocalQueryRunner.create(TEST_SESSION);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public final void destroyTestWindowFunction()
     {
         closeAllRuntimeException(queryRunner);
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestAggregateWindowFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestAggregateWindowFunction.java
index 28a37affc10f..96cc52ae26a6 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestAggregateWindowFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestAggregateWindowFunction.java
@@ -15,7 +15,7 @@
 
 import io.trino.testing.MaterializedResult;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestApproxPercentileWindow.java b/core/trino-main/src/test/java/io/trino/operator/window/TestApproxPercentileWindow.java
index 550e43e46c31..b6a44695d4e0 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestApproxPercentileWindow.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestApproxPercentileWindow.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.type.ArrayType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestCumulativeDistributionFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestCumulativeDistributionFunction.java
index 5cb5220ff255..54b678f98322 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestCumulativeDistributionFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestCumulativeDistributionFunction.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.window;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestDenseRankFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestDenseRankFunction.java
index 88e1454d40d2..978dd86b3d99 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestDenseRankFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestDenseRankFunction.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.window;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestFirstValueFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestFirstValueFunction.java
index 0af9cd28232d..02446c6f14d1 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestFirstValueFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestFirstValueFunction.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.window;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestLagFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestLagFunction.java
index 4527efef765e..3c42cb3267f5 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestLagFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestLagFunction.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.window;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -149,20 +149,6 @@ public void testLagFunction()
                         .row(34, "O", null)
                         .build());
 
-        assertWindowQuery("lag(orderkey, null, -1) OVER (PARTITION BY orderstatus ORDER BY orderkey)",
-                resultBuilder(TEST_SESSION, INTEGER, VARCHAR, BIGINT)
-                        .row(3, "F", null)
-                        .row(5, "F", null)
-                        .row(6, "F", null)
-                        .row(33, "F", null)
-                        .row(1, "O", null)
-                        .row(2, "O", null)
-                        .row(4, "O", null)
-                        .row(7, "O", null)
-                        .row(32, "O", null)
-                        .row(34, "O", null)
-                        .build());
-
         assertWindowQuery("lag(orderkey, 0) OVER (PARTITION BY orderstatus ORDER BY orderkey)",
                 resultBuilder(TEST_SESSION, INTEGER, VARCHAR, INTEGER)
                         .row(3, "F", 3)
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestLastValueFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestLastValueFunction.java
index 7c4c102c849f..7a661eae9c26 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestLastValueFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestLastValueFunction.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.window;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestLeadFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestLeadFunction.java
index 7c70f971fbce..8826a28e7f6e 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestLeadFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestLeadFunction.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.window;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -163,20 +163,6 @@ public void testLeadFunction()
                         .row(34, "O", null)
                         .build());
 
-        assertWindowQuery("lead(orderkey, null, -1) OVER (PARTITION BY orderstatus ORDER BY orderkey)",
-                resultBuilder(TEST_SESSION, INTEGER, VARCHAR, INTEGER)
-                        .row(3, "F", null)
-                        .row(5, "F", null)
-                        .row(6, "F", null)
-                        .row(33, "F", null)
-                        .row(1, "O", null)
-                        .row(2, "O", null)
-                        .row(4, "O", null)
-                        .row(7, "O", null)
-                        .row(32, "O", null)
-                        .row(34, "O", null)
-                        .build());
-
         assertWindowQuery("lead(orderkey, 0) OVER (PARTITION BY orderstatus ORDER BY orderkey)",
                 resultBuilder(TEST_SESSION, INTEGER, VARCHAR, INTEGER)
                         .row(3, "F", 3)
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestMapAggFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestMapAggFunction.java
index 3fe894a9643a..6f73045a5b5a 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestMapAggFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestMapAggFunction.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.spi.type.VarcharType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestMultipleWindowSpecifications.java b/core/trino-main/src/test/java/io/trino/operator/window/TestMultipleWindowSpecifications.java
index 12725acb61b7..bffa7488f67e 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestMultipleWindowSpecifications.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestMultipleWindowSpecifications.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.window;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestNTileFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestNTileFunction.java
index b1227d95ce14..749ca689c7f1 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestNTileFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestNTileFunction.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.window;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestNthValueFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestNthValueFunction.java
index a1ff54419316..e2fb09f8355c 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestNthValueFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestNthValueFunction.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.window;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestPercentRankFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestPercentRankFunction.java
index 89ccd9affb7c..3fc31988864c 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestPercentRankFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestPercentRankFunction.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.window;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestRankFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestRankFunction.java
index cbf3357abde9..fcf3f8de60f8 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestRankFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestRankFunction.java
@@ -13,7 +13,7 @@
  */
 package io.trino.operator.window;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/TestRowNumberFunction.java b/core/trino-main/src/test/java/io/trino/operator/window/TestRowNumberFunction.java
index 00128558291f..dd0361d8434f 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/TestRowNumberFunction.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/TestRowNumberFunction.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.Collectors;
 
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/matcher/TestIrRowPatternToProgramRewriter.java b/core/trino-main/src/test/java/io/trino/operator/window/matcher/TestIrRowPatternToProgramRewriter.java
index 02e677869255..8d7bbc6acbb2 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/matcher/TestIrRowPatternToProgramRewriter.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/matcher/TestIrRowPatternToProgramRewriter.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.rowpattern.ir.IrLabel;
 import io.trino.sql.planner.rowpattern.ir.IrRowPattern;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/test/java/io/trino/operator/window/matcher/TestPatternMatchingMachine.java b/core/trino-main/src/test/java/io/trino/operator/window/matcher/TestPatternMatchingMachine.java
index 5929155dcf44..87c69b0b9b05 100644
--- a/core/trino-main/src/test/java/io/trino/operator/window/matcher/TestPatternMatchingMachine.java
+++ b/core/trino-main/src/test/java/io/trino/operator/window/matcher/TestPatternMatchingMachine.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.rowpattern.ir.IrLabel;
 import io.trino.sql.planner.rowpattern.ir.IrRowPattern;
 import org.assertj.core.api.AssertProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/security/TestAccessControlConfig.java b/core/trino-main/src/test/java/io/trino/security/TestAccessControlConfig.java
index 55fefbf777c3..c97d1e8c50df 100644
--- a/core/trino-main/src/test/java/io/trino/security/TestAccessControlConfig.java
+++ b/core/trino-main/src/test/java/io/trino/security/TestAccessControlConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.configuration.testing.ConfigAssertions;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/core/trino-main/src/test/java/io/trino/security/TestAccessControlManager.java b/core/trino-main/src/test/java/io/trino/security/TestAccessControlManager.java
index af1c2534a755..9e71c249b584 100644
--- a/core/trino-main/src/test/java/io/trino/security/TestAccessControlManager.java
+++ b/core/trino-main/src/test/java/io/trino/security/TestAccessControlManager.java
@@ -16,9 +16,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.connector.MockConnectorFactory;
 import io.trino.eventlistener.EventListenerManager;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.MetadataManager;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.plugin.base.security.AllowAllAccessControl;
 import io.trino.plugin.base.security.AllowAllSystemAccessControl;
@@ -27,36 +30,39 @@
 import io.trino.spi.QueryId;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogSchemaName;
+import io.trino.spi.connector.CatalogSchemaRoutineName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.eventlistener.EventListener;
+import io.trino.spi.function.FunctionKind;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.SystemAccessControl;
 import io.trino.spi.security.SystemAccessControlFactory;
 import io.trino.spi.security.SystemSecurityContext;
+import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.security.ViewExpression;
 import io.trino.spi.type.Type;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.TestingEventListenerManager;
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.Principal;
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
-import static io.trino.spi.function.FunctionKind.TABLE;
 import static io.trino.spi.security.AccessDeniedException.denySelectTable;
 import static io.trino.testing.TestingEventListenerManager.emptyEventListenerManager;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
@@ -76,6 +82,7 @@ public class TestAccessControlManager
     private static final Principal PRINCIPAL = new BasicPrincipal("principal");
     private static final String USER_NAME = "user_name";
     private static final QueryId queryId = new QueryId("query_id");
+    private static final Instant queryStart = Instant.now();
 
     @Test
     public void testInitializing()
@@ -100,22 +107,21 @@ public void testReadOnlySystemAccessControl()
         Identity identity = Identity.forUser(USER_NAME).withPrincipal(PRINCIPAL).build();
         QualifiedObjectName tableName = new QualifiedObjectName(TEST_CATALOG_NAME, "schema", "table");
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = createAccessControlManager(transactionManager);
 
         accessControlManager.loadSystemAccessControl(ReadOnlySystemAccessControl.NAME, ImmutableMap.of());
         accessControlManager.checkCanSetUser(Optional.of(PRINCIPAL), USER_NAME);
         accessControlManager.checkCanSetSystemSessionProperty(identity, "property");
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    SecurityContext context = new SecurityContext(transactionId, identity, queryId);
+                    SecurityContext context = new SecurityContext(transactionId, identity, queryId, queryStart);
                     accessControlManager.checkCanSetCatalogSessionProperty(context, TEST_CATALOG_NAME, "property");
                     accessControlManager.checkCanShowSchemas(context, TEST_CATALOG_NAME);
                     accessControlManager.checkCanShowTables(context, new CatalogSchemaName(TEST_CATALOG_NAME, "schema"));
                     accessControlManager.checkCanSelectFromColumns(context, tableName, ImmutableSet.of("column"));
                     accessControlManager.checkCanCreateViewWithSelectFromColumns(context, tableName, ImmutableSet.of("column"));
-                    accessControlManager.checkCanGrantExecuteFunctionPrivilege(context, "function", Identity.ofUser("bob"), false);
-                    accessControlManager.checkCanGrantExecuteFunctionPrivilege(context, "function", Identity.ofUser("bob"), true);
                     Set<String> catalogs = ImmutableSet.of(TEST_CATALOG_NAME);
                     assertEquals(accessControlManager.filterCatalogs(context, catalogs), catalogs);
                     Set<String> schemas = ImmutableSet.of("schema");
@@ -124,9 +130,9 @@ public void testReadOnlySystemAccessControl()
                     assertEquals(accessControlManager.filterTables(context, TEST_CATALOG_NAME, tableNames), tableNames);
                 });
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager)
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    accessControlManager.checkCanInsertIntoTable(new SecurityContext(transactionId, identity, queryId), tableName);
+                    accessControlManager.checkCanInsertIntoTable(new SecurityContext(transactionId, identity, queryId, queryStart), tableName);
                 }))
                 .isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot insert into table test-catalog.schema.table");
@@ -150,13 +156,14 @@ public void testSetAccessControl()
     public void testNoCatalogAccessControl()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = createAccessControlManager(transactionManager);
 
         TestSystemAccessControlFactory accessControlFactory = new TestSystemAccessControlFactory("test");
         accessControlManager.addSystemAccessControlFactory(accessControlFactory);
         accessControlManager.loadSystemAccessControl("test", ImmutableMap.of());
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
                     accessControlManager.checkCanSelectFromColumns(context(transactionId), new QualifiedObjectName(TEST_CATALOG_NAME, "schema", "table"), ImmutableSet.of("column"));
                 });
@@ -167,6 +174,7 @@ public void testDenyCatalogAccessControl()
     {
         try (LocalQueryRunner queryRunner = LocalQueryRunner.create(TEST_SESSION)) {
             TransactionManager transactionManager = queryRunner.getTransactionManager();
+            Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
             AccessControlManager accessControlManager = createAccessControlManager(transactionManager);
 
             TestSystemAccessControlFactory accessControlFactory = new TestSystemAccessControlFactory("test");
@@ -176,7 +184,7 @@ public void testDenyCatalogAccessControl()
             queryRunner.createCatalog(TEST_CATALOG_NAME, MockConnectorFactory.create(), ImmutableMap.of());
             accessControlManager.setConnectorAccessControlProvider(CatalogServiceProvider.singleton(queryRunner.getCatalogHandle(TEST_CATALOG_NAME), Optional.of(new DenyConnectorAccessControl())));
 
-            assertThatThrownBy(() -> transaction(transactionManager, accessControlManager)
+            assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager)
                     .execute(transactionId -> {
                         accessControlManager.checkCanSelectFromColumns(context(transactionId), new QualifiedObjectName(TEST_CATALOG_NAME, "schema", "table"), ImmutableSet.of("column"));
                     }))
@@ -198,13 +206,6 @@ public void testDenyTableFunctionCatalogAccessControl()
 
             queryRunner.createCatalog(TEST_CATALOG_NAME, MockConnectorFactory.create(), ImmutableMap.of());
             accessControlManager.setConnectorAccessControlProvider(CatalogServiceProvider.singleton(queryRunner.getCatalogHandle(TEST_CATALOG_NAME), Optional.of(new DenyConnectorAccessControl())));
-
-            assertThatThrownBy(() -> transaction(transactionManager, accessControlManager)
-                    .execute(transactionId -> {
-                        accessControlManager.checkCanGrantExecuteFunctionPrivilege(context(transactionId), TABLE, new QualifiedObjectName(TEST_CATALOG_NAME, "example_schema", "executed_function"), Identity.ofUser("bob"), true);
-                    }))
-                    .isInstanceOf(TrinoException.class)
-                    .hasMessageMatching("Access Denied: 'user_name' cannot grant 'example_schema\\.executed_function' execution to user 'bob'");
         }
     }
 
@@ -229,13 +230,16 @@ public SystemAccessControl create(Map<String, String> config)
                     return new SystemAccessControl()
                     {
                         @Override
-                        public List<ViewExpression> getColumnMasks(SystemSecurityContext context, CatalogSchemaTableName tableName, String column, Type type)
+                        public Optional<ViewExpression> getColumnMask(SystemSecurityContext context, CatalogSchemaTableName tableName, String column, Type type)
                         {
-                            return ImmutableList.of(new ViewExpression(Optional.of("user"), Optional.empty(), Optional.empty(), "system mask"));
+                            return Optional.of(ViewExpression.builder()
+                                    .identity("user")
+                                    .expression("system mask")
+                                    .build());
                         }
 
                         @Override
-                        public void checkCanSetSystemSessionProperty(SystemSecurityContext context, String propertyName)
+                        public void checkCanSetSystemSessionProperty(Identity identity, String propertyName)
                         {
                         }
                     };
@@ -247,9 +251,11 @@ public void checkCanSetSystemSessionProperty(SystemSecurityContext context, Stri
             accessControlManager.setConnectorAccessControlProvider(CatalogServiceProvider.singleton(queryRunner.getCatalogHandle(TEST_CATALOG_NAME), Optional.of(new ConnectorAccessControl()
             {
                 @Override
-                public List<ViewExpression> getColumnMasks(ConnectorSecurityContext context, SchemaTableName tableName, String column, Type type)
+                public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context, SchemaTableName tableName, String column, Type type)
                 {
-                    return ImmutableList.of(new ViewExpression(Optional.of("user"), Optional.empty(), Optional.empty(), "connector mask"));
+                    return Optional.of(ViewExpression.builder()
+                            .identity("user").expression("connector mask")
+                            .build());
                 }
 
                 @Override
@@ -263,7 +269,7 @@ public void checkCanShowCreateTable(ConnectorSecurityContext context, SchemaTabl
     private static SecurityContext context(TransactionId transactionId)
     {
         Identity identity = Identity.forUser(USER_NAME).withPrincipal(PRINCIPAL).build();
-        return new SecurityContext(transactionId, identity, queryId);
+        return new SecurityContext(transactionId, identity, queryId, queryStart);
     }
 
     @Test
@@ -271,6 +277,7 @@ public void testDenySystemAccessControl()
     {
         try (LocalQueryRunner queryRunner = LocalQueryRunner.create(TEST_SESSION)) {
             TransactionManager transactionManager = queryRunner.getTransactionManager();
+            Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
             AccessControlManager accessControlManager = createAccessControlManager(transactionManager);
 
             TestSystemAccessControlFactory accessControlFactory = new TestSystemAccessControlFactory("test");
@@ -280,7 +287,7 @@ public void testDenySystemAccessControl()
             queryRunner.createCatalog(TEST_CATALOG_NAME, MockConnectorFactory.create(), ImmutableMap.of());
             accessControlManager.setConnectorAccessControlProvider(CatalogServiceProvider.singleton(queryRunner.getCatalogHandle(TEST_CATALOG_NAME), Optional.of(new DenyConnectorAccessControl())));
 
-            assertThatThrownBy(() -> transaction(transactionManager, accessControlManager)
+            assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager)
                     .execute(transactionId -> {
                         accessControlManager.checkCanSelectFromColumns(
                                 context(transactionId),
@@ -296,13 +303,14 @@ public void testDenySystemAccessControl()
     public void testDenyExecuteProcedureBySystem()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = createAccessControlManager(transactionManager);
 
         TestSystemAccessControlFactory accessControlFactory = new TestSystemAccessControlFactory("deny-all");
         accessControlManager.addSystemAccessControlFactory(accessControlFactory);
         accessControlManager.loadSystemAccessControl("deny-all", ImmutableMap.of());
 
-        assertDenyExecuteProcedure(transactionManager, accessControlManager, "Access Denied: Cannot execute procedure test-catalog.schema.procedure");
+        assertDenyExecuteProcedure(transactionManager, metadata, accessControlManager, "Access Denied: Cannot execute procedure test-catalog.schema.procedure");
     }
 
     @Test
@@ -310,13 +318,14 @@ public void testDenyExecuteProcedureByConnector()
     {
         try (LocalQueryRunner queryRunner = LocalQueryRunner.create(TEST_SESSION)) {
             TransactionManager transactionManager = queryRunner.getTransactionManager();
+            Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
             AccessControlManager accessControlManager = createAccessControlManager(transactionManager);
             accessControlManager.loadSystemAccessControl("allow-all", ImmutableMap.of());
 
             queryRunner.createCatalog(TEST_CATALOG_NAME, MockConnectorFactory.create(), ImmutableMap.of());
             accessControlManager.setConnectorAccessControlProvider(CatalogServiceProvider.singleton(queryRunner.getCatalogHandle(TEST_CATALOG_NAME), Optional.of(new DenyConnectorAccessControl())));
 
-            assertDenyExecuteProcedure(transactionManager, accessControlManager, "Access Denied: Cannot execute procedure schema.procedure");
+            assertDenyExecuteProcedure(transactionManager, metadata, accessControlManager, "Access Denied: Cannot execute procedure schema.procedure");
         }
     }
 
@@ -325,13 +334,14 @@ public void testAllowExecuteProcedure()
     {
         try (LocalQueryRunner queryRunner = LocalQueryRunner.create(TEST_SESSION)) {
             TransactionManager transactionManager = queryRunner.getTransactionManager();
+            Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
             AccessControlManager accessControlManager = createAccessControlManager(transactionManager);
             accessControlManager.loadSystemAccessControl("allow-all", ImmutableMap.of());
 
             queryRunner.createCatalog(TEST_CATALOG_NAME, MockConnectorFactory.create(), ImmutableMap.of());
             accessControlManager.setConnectorAccessControlProvider(CatalogServiceProvider.singleton(queryRunner.getCatalogHandle(TEST_CATALOG_NAME), Optional.of(new AllowAllAccessControl())));
 
-            transaction(transactionManager, accessControlManager)
+            transaction(transactionManager, metadata, accessControlManager)
                     .execute(transactionId -> {
                         accessControlManager.checkCanExecuteProcedure(context(transactionId), new QualifiedObjectName(TEST_CATALOG_NAME, "schema", "procedure"));
                     });
@@ -414,9 +424,9 @@ public void testRegisterMultipleEventListeners()
                 .contains(firstListener, secondListener);
     }
 
-    private void assertDenyExecuteProcedure(TransactionManager transactionManager, AccessControlManager accessControlManager, String s)
+    private void assertDenyExecuteProcedure(TransactionManager transactionManager, Metadata metadata, AccessControlManager accessControlManager, String s)
     {
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
                     assertThatThrownBy(
                             () -> accessControlManager.checkCanExecuteProcedure(context(transactionId), new QualifiedObjectName(TEST_CATALOG_NAME, "schema", "procedure")))
@@ -429,20 +439,18 @@ private void assertDenyExecuteProcedure(TransactionManager transactionManager, A
     public void testDenyExecuteFunctionBySystemAccessControl()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = createAccessControlManager(transactionManager);
 
         TestSystemAccessControlFactory accessControlFactory = new TestSystemAccessControlFactory("deny-all");
         accessControlManager.addSystemAccessControlFactory(accessControlFactory);
         accessControlManager.loadSystemAccessControl("deny-all", ImmutableMap.of());
 
-        transaction(transactionManager, accessControlManager)
+        QualifiedObjectName functionName = new QualifiedObjectName(TEST_CATALOG_NAME, "schema", "executed_function");
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    assertThatThrownBy(() -> accessControlManager.checkCanExecuteFunction(context(transactionId), "executed_function"))
-                            .isInstanceOf(AccessDeniedException.class)
-                            .hasMessage("Access Denied: Cannot execute function executed_function");
-                    assertThatThrownBy(() -> accessControlManager.checkCanGrantExecuteFunctionPrivilege(context(transactionId), "executed_function", Identity.ofUser("bob"), true))
-                            .isInstanceOf(AccessDeniedException.class)
-                            .hasMessage("Access Denied: 'user_name' cannot grant 'executed_function' execution to user 'bob'");
+                    assertThat(accessControlManager.canExecuteFunction(context(transactionId), functionName)).isFalse();
+                    assertThat(accessControlManager.canCreateViewWithExecuteFunction(context(transactionId), functionName)).isFalse();
                 });
     }
 
@@ -450,13 +458,15 @@ public void testDenyExecuteFunctionBySystemAccessControl()
     public void testAllowExecuteFunction()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = createAccessControlManager(transactionManager);
         accessControlManager.loadSystemAccessControl("allow-all", ImmutableMap.of());
 
-        transaction(transactionManager, accessControlManager)
+        QualifiedObjectName functionName = new QualifiedObjectName(TEST_CATALOG_NAME, "schema", "executed_function");
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    accessControlManager.checkCanExecuteFunction(context(transactionId), "executed_function");
-                    accessControlManager.checkCanGrantExecuteFunctionPrivilege(context(transactionId), "executed_function", Identity.ofUser("bob"), true);
+                    assertThat(accessControlManager.canExecuteFunction(context(transactionId), functionName)).isTrue();
+                    assertThat(accessControlManager.canCreateViewWithExecuteFunction(context(transactionId), functionName)).isTrue();
                 });
     }
 
@@ -464,16 +474,74 @@ public void testAllowExecuteFunction()
     public void testAllowExecuteTableFunction()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = createAccessControlManager(transactionManager);
         accessControlManager.loadSystemAccessControl("allow-all", ImmutableMap.of());
 
-        transaction(transactionManager, accessControlManager)
+        QualifiedObjectName functionName = new QualifiedObjectName(TEST_CATALOG_NAME, "schema", "executed_function");
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    accessControlManager.checkCanExecuteFunction(context(transactionId), TABLE, new QualifiedObjectName(TEST_CATALOG_NAME, "example_schema", "executed_function"));
-                    accessControlManager.checkCanGrantExecuteFunctionPrivilege(context(transactionId), TABLE, new QualifiedObjectName(TEST_CATALOG_NAME, "example_schema", "executed_function"), Identity.ofUser("bob"), true);
+                    assertThat(accessControlManager.canExecuteFunction(context(transactionId), functionName)).isTrue();
+                    assertThat(accessControlManager.canCreateViewWithExecuteFunction(context(transactionId), functionName)).isTrue();
                 });
     }
 
+    @Test
+    public void testRemovedMethodsCannotBeDeclared()
+    {
+        try (LocalQueryRunner queryRunner = LocalQueryRunner.create(TEST_SESSION)) {
+            TransactionManager transactionManager = queryRunner.getTransactionManager();
+            AccessControlManager accessControlManager = createAccessControlManager(transactionManager);
+
+            assertThatThrownBy(() ->
+                    accessControlManager.setSystemAccessControls(ImmutableList.of(new AllowAllSystemAccessControl()
+                    {
+                        @SuppressWarnings("unused")
+                        public void checkCanAccessCatalog(SystemSecurityContext context, String catalogName) {}
+                    })))
+                    .isInstanceOf(IllegalArgumentException.class)
+                    .hasMessageMatching("Access control .* must not implement removed method checkCanAccessCatalog\\(.*\\)");
+
+            assertThatThrownBy(() ->
+                    accessControlManager.setSystemAccessControls(ImmutableList.of(new AllowAllSystemAccessControl()
+                    {
+                        @SuppressWarnings("unused")
+                        public void checkCanGrantExecuteFunctionPrivilege(SystemSecurityContext context, String functionName, TrinoPrincipal grantee, boolean grantOption) {}
+                    })))
+                    .isInstanceOf(IllegalArgumentException.class)
+                    .hasMessageMatching("Access control .* must not implement removed method checkCanGrantExecuteFunctionPrivilege\\(.*\\)");
+
+            assertThatThrownBy(() ->
+                    accessControlManager.setSystemAccessControls(ImmutableList.of(new AllowAllSystemAccessControl()
+                    {
+                        @SuppressWarnings("unused")
+                        public void checkCanExecuteFunction(SystemSecurityContext systemSecurityContext, String functionName) {}
+                    })))
+                    .isInstanceOf(IllegalArgumentException.class)
+                    .hasMessageMatching("Access control .* must not implement removed method checkCanExecuteFunction\\(.*\\)");
+
+            assertThatThrownBy(() ->
+                    accessControlManager.setSystemAccessControls(ImmutableList.of(new AllowAllSystemAccessControl()
+                    {
+                        @SuppressWarnings("unused")
+                        public void checkCanExecuteFunction(SystemSecurityContext systemSecurityContext, FunctionKind functionKind, CatalogSchemaRoutineName functionName) {}
+                    })))
+                    .isInstanceOf(IllegalArgumentException.class)
+                    .hasMessageMatching("Access control .* must not implement removed method checkCanExecuteFunction\\(.*\\)");
+
+            assertThatThrownBy(() ->
+                    accessControlManager.setSystemAccessControls(ImmutableList.of(new AllowAllSystemAccessControl()
+                    {
+                        @SuppressWarnings("unused")
+                        public void checkCanGrantExecuteFunctionPrivilege(SystemSecurityContext context, FunctionKind functionKind, CatalogSchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption) {}
+                    })))
+                    .isInstanceOf(IllegalArgumentException.class)
+                    .hasMessageMatching("Access control .* must not implement removed method checkCanGrantExecuteFunctionPrivilege\\(.*\\)");
+
+            accessControlManager.setSystemAccessControls(ImmutableList.of(new AllowAllSystemAccessControl()));
+        }
+    }
+
     private AccessControlManager createAccessControlManager(TestingEventListenerManager eventListenerManager, List<String> systemAccessControlProperties)
             throws IOException
     {
@@ -490,17 +558,17 @@ private AccessControlManager createAccessControlManager(TestingEventListenerMana
 
     private AccessControlManager createAccessControlManager(TransactionManager testTransactionManager)
     {
-        return new AccessControlManager(testTransactionManager, emptyEventListenerManager(), new AccessControlConfig(), DefaultSystemAccessControl.NAME);
+        return new AccessControlManager(testTransactionManager, emptyEventListenerManager(), new AccessControlConfig(), OpenTelemetry.noop(), DefaultSystemAccessControl.NAME);
     }
 
     private AccessControlManager createAccessControlManager(EventListenerManager eventListenerManager, AccessControlConfig config)
     {
-        return new AccessControlManager(createTestTransactionManager(), eventListenerManager, config, DefaultSystemAccessControl.NAME);
+        return new AccessControlManager(createTestTransactionManager(), eventListenerManager, config, OpenTelemetry.noop(), DefaultSystemAccessControl.NAME);
     }
 
     private AccessControlManager createAccessControlManager(EventListenerManager eventListenerManager, String defaultAccessControlName)
     {
-        return new AccessControlManager(createTestTransactionManager(), eventListenerManager, new AccessControlConfig(), defaultAccessControlName);
+        return new AccessControlManager(createTestTransactionManager(), eventListenerManager, new AccessControlConfig(), OpenTelemetry.noop(), defaultAccessControlName);
     }
 
     private SystemAccessControlFactory eventListeningSystemAccessControlFactory(String name, EventListener... eventListeners)
@@ -519,7 +587,7 @@ public SystemAccessControl create(Map<String, String> config)
                 return new SystemAccessControl()
                 {
                     @Override
-                    public void checkCanSetSystemSessionProperty(SystemSecurityContext context, String propertyName)
+                    public void checkCanSetSystemSessionProperty(Identity identity, String propertyName)
                     {
                     }
 
@@ -582,12 +650,13 @@ public void checkCanSetUser(Optional<Principal> principal, String userName)
                 }
 
                 @Override
-                public void checkCanAccessCatalog(SystemSecurityContext context, String catalogName)
+                public boolean canAccessCatalog(SystemSecurityContext context, String catalogName)
                 {
+                    return true;
                 }
 
                 @Override
-                public void checkCanSetSystemSessionProperty(SystemSecurityContext context, String propertyName)
+                public void checkCanSetSystemSessionProperty(Identity identity, String propertyName)
                 {
                     throw new UnsupportedOperationException();
                 }
diff --git a/core/trino-main/src/test/java/io/trino/security/TestFileBasedSystemAccessControl.java b/core/trino-main/src/test/java/io/trino/security/TestFileBasedSystemAccessControl.java
index 45af9ff7ddd1..93a4727732c9 100644
--- a/core/trino-main/src/test/java/io/trino/security/TestFileBasedSystemAccessControl.java
+++ b/core/trino-main/src/test/java/io/trino/security/TestFileBasedSystemAccessControl.java
@@ -16,6 +16,9 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.CreationException;
+import io.opentelemetry.api.OpenTelemetry;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.MetadataManager;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.plugin.base.security.DefaultSystemAccessControl;
 import io.trino.plugin.base.security.FileBasedSystemAccessControl;
@@ -27,13 +30,14 @@
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import java.io.File;
 import java.io.UncheckedIOException;
 import java.net.URISyntaxException;
+import java.time.Instant;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -75,6 +79,7 @@ public class TestFileBasedSystemAccessControl
     private static final QualifiedObjectName staffView = new QualifiedObjectName("staff-catalog", "schema2", "view");
     private static final QualifiedObjectName staffMaterializedView = new QualifiedObjectName("staff-catalog", "schema2", "materialized-view");
     private static final QueryId queryId = new QueryId("query_id");
+    private static final Instant queryStart = Instant.now();
 
     @Test
     public void testCanImpersonateUserOperations()
@@ -133,7 +138,7 @@ public void testCanImpersonateUserOperations()
     public void testDocsExample()
     {
         TransactionManager transactionManager = createTestTransactionManager();
-        AccessControlManager accessControlManager = new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), DefaultSystemAccessControl.NAME);
+        AccessControlManager accessControlManager = new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), OpenTelemetry.noop(), DefaultSystemAccessControl.NAME);
         accessControlManager.loadSystemAccessControl(
                 FileBasedSystemAccessControl.NAME,
                 ImmutableMap.of("security.config-file", new File("../../docs/src/main/sphinx/security/user-impersonation.json").getAbsolutePath()));
@@ -180,6 +185,7 @@ public void testCanSetUserOperations()
     public void testSystemInformation()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = newAccessControlManager(transactionManager, "system_information.json");
 
         accessControlManager.checkCanReadSystemInformation(admin);
@@ -189,16 +195,16 @@ public void testSystemInformation()
         accessControlManager.checkCanWriteSystemInformation(nonAsciiUser);
 
         accessControlManager.checkCanReadSystemInformation(admin);
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
             accessControlManager.checkCanWriteSystemInformation(alice);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot write system information");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
             accessControlManager.checkCanReadSystemInformation(bob);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot read system information");
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
             accessControlManager.checkCanWriteSystemInformation(bob);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot write system information");
@@ -208,17 +214,18 @@ public void testSystemInformation()
     public void testCatalogOperations()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = newAccessControlManager(transactionManager, "catalog.json");
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, admin, queryId), allCatalogs), allCatalogs);
+                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, admin, queryId, queryStart), allCatalogs), allCatalogs);
                     Set<String> aliceCatalogs = ImmutableSet.of("open-to-all", "alice-catalog", "all-allowed", "staff-catalog");
-                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, alice, queryId), allCatalogs), aliceCatalogs);
+                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, alice, queryId, queryStart), allCatalogs), aliceCatalogs);
                     Set<String> bobCatalogs = ImmutableSet.of("open-to-all", "all-allowed", "staff-catalog");
-                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, bob, queryId), allCatalogs), bobCatalogs);
+                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, bob, queryId, queryStart), allCatalogs), bobCatalogs);
                     Set<String> nonAsciiUserCatalogs = ImmutableSet.of("open-to-all", "all-allowed", "\u0200\u0200\u0200");
-                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, nonAsciiUser, queryId), allCatalogs), nonAsciiUserCatalogs);
+                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, nonAsciiUser, queryId, queryStart), allCatalogs), nonAsciiUserCatalogs);
                 });
     }
 
@@ -226,17 +233,18 @@ public void testCatalogOperations()
     public void testCatalogOperationsReadOnly()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = newAccessControlManager(transactionManager, "catalog_read_only.json");
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, admin, queryId), allCatalogs), allCatalogs);
+                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, admin, queryId, queryStart), allCatalogs), allCatalogs);
                     Set<String> aliceCatalogs = ImmutableSet.of("open-to-all", "alice-catalog", "all-allowed");
-                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, alice, queryId), allCatalogs), aliceCatalogs);
+                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, alice, queryId, queryStart), allCatalogs), aliceCatalogs);
                     Set<String> bobCatalogs = ImmutableSet.of("open-to-all", "all-allowed");
-                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, bob, queryId), allCatalogs), bobCatalogs);
+                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, bob, queryId, queryStart), allCatalogs), bobCatalogs);
                     Set<String> nonAsciiUserCatalogs = ImmutableSet.of("open-to-all", "all-allowed", "\u0200\u0200\u0200");
-                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, nonAsciiUser, queryId), allCatalogs), nonAsciiUserCatalogs);
+                    assertEquals(accessControlManager.filterCatalogs(new SecurityContext(transactionId, nonAsciiUser, queryId, queryStart), allCatalogs), nonAsciiUserCatalogs);
                 });
     }
 
@@ -244,21 +252,22 @@ public void testCatalogOperationsReadOnly()
     public void testSchemaOperations()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = newAccessControlManager(transactionManager, "catalog.json");
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
                     Set<String> aliceSchemas = ImmutableSet.of("schema");
-                    assertEquals(accessControlManager.filterSchemas(new SecurityContext(transactionId, alice, queryId), "alice-catalog", aliceSchemas), aliceSchemas);
-                    assertEquals(accessControlManager.filterSchemas(new SecurityContext(transactionId, bob, queryId), "alice-catalog", aliceSchemas), ImmutableSet.of());
+                    assertEquals(accessControlManager.filterSchemas(new SecurityContext(transactionId, alice, queryId, queryStart), "alice-catalog", aliceSchemas), aliceSchemas);
+                    assertEquals(accessControlManager.filterSchemas(new SecurityContext(transactionId, bob, queryId, queryStart), "alice-catalog", aliceSchemas), ImmutableSet.of());
 
-                    accessControlManager.checkCanCreateSchema(new SecurityContext(transactionId, alice, queryId), aliceSchema, ImmutableMap.of());
-                    accessControlManager.checkCanDropSchema(new SecurityContext(transactionId, alice, queryId), aliceSchema);
-                    accessControlManager.checkCanRenameSchema(new SecurityContext(transactionId, alice, queryId), aliceSchema, "new-schema");
-                    accessControlManager.checkCanShowSchemas(new SecurityContext(transactionId, alice, queryId), "alice-catalog");
+                    accessControlManager.checkCanCreateSchema(new SecurityContext(transactionId, alice, queryId, queryStart), aliceSchema, ImmutableMap.of());
+                    accessControlManager.checkCanDropSchema(new SecurityContext(transactionId, alice, queryId, queryStart), aliceSchema);
+                    accessControlManager.checkCanRenameSchema(new SecurityContext(transactionId, alice, queryId, queryStart), aliceSchema, "new-schema");
+                    accessControlManager.checkCanShowSchemas(new SecurityContext(transactionId, alice, queryId, queryStart), "alice-catalog");
                 });
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanCreateSchema(new SecurityContext(transactionId, bob, queryId), aliceSchema, ImmutableMap.of());
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanCreateSchema(new SecurityContext(transactionId, bob, queryId, queryStart), aliceSchema, ImmutableMap.of());
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot access catalog alice-catalog");
     }
@@ -267,34 +276,35 @@ public void testSchemaOperations()
     public void testSchemaOperationsReadOnly()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = newAccessControlManager(transactionManager, "catalog_read_only.json");
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
                     Set<String> aliceSchemas = ImmutableSet.of("schema");
-                    assertEquals(accessControlManager.filterSchemas(new SecurityContext(transactionId, alice, queryId), "alice-catalog", aliceSchemas), aliceSchemas);
-                    assertEquals(accessControlManager.filterSchemas(new SecurityContext(transactionId, bob, queryId), "alice-catalog", aliceSchemas), ImmutableSet.of());
+                    assertEquals(accessControlManager.filterSchemas(new SecurityContext(transactionId, alice, queryId, queryStart), "alice-catalog", aliceSchemas), aliceSchemas);
+                    assertEquals(accessControlManager.filterSchemas(new SecurityContext(transactionId, bob, queryId, queryStart), "alice-catalog", aliceSchemas), ImmutableSet.of());
 
-                    accessControlManager.checkCanShowSchemas(new SecurityContext(transactionId, alice, queryId), "alice-catalog");
+                    accessControlManager.checkCanShowSchemas(new SecurityContext(transactionId, alice, queryId, queryStart), "alice-catalog");
                 });
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanCreateSchema(new SecurityContext(transactionId, alice, queryId), aliceSchema, ImmutableMap.of());
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanCreateSchema(new SecurityContext(transactionId, alice, queryId, queryStart), aliceSchema, ImmutableMap.of());
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot create schema alice-catalog.schema");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanDropSchema(new SecurityContext(transactionId, alice, queryId), aliceSchema);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanDropSchema(new SecurityContext(transactionId, alice, queryId, queryStart), aliceSchema);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot drop schema alice-catalog.schema");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanRenameSchema(new SecurityContext(transactionId, alice, queryId), aliceSchema, "new-schema");
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanRenameSchema(new SecurityContext(transactionId, alice, queryId, queryStart), aliceSchema, "new-schema");
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot rename schema from alice-catalog.schema to new-schema");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanCreateSchema(new SecurityContext(transactionId, bob, queryId), aliceSchema, ImmutableMap.of());
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanCreateSchema(new SecurityContext(transactionId, bob, queryId, queryStart), aliceSchema, ImmutableMap.of());
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot access catalog alice-catalog");
     }
@@ -303,14 +313,15 @@ public void testSchemaOperationsReadOnly()
     public void testTableOperations()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = newAccessControlManager(transactionManager, "catalog.json");
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
                     Set<SchemaTableName> aliceTables = ImmutableSet.of(new SchemaTableName("schema", "table"));
-                    SecurityContext aliceContext = new SecurityContext(transactionId, alice, queryId);
-                    SecurityContext bobContext = new SecurityContext(transactionId, bob, queryId);
-                    SecurityContext nonAsciiContext = new SecurityContext(transactionId, nonAsciiUser, queryId);
+                    SecurityContext aliceContext = new SecurityContext(transactionId, alice, queryId, queryStart);
+                    SecurityContext bobContext = new SecurityContext(transactionId, bob, queryId, queryStart);
+                    SecurityContext nonAsciiContext = new SecurityContext(transactionId, nonAsciiUser, queryId, queryStart);
 
                     assertEquals(accessControlManager.filterTables(aliceContext, "alice-catalog", aliceTables), aliceTables);
                     assertEquals(accessControlManager.filterTables(aliceContext, "staff-catalog", aliceTables), aliceTables);
@@ -451,59 +462,60 @@ public void testTableOperations()
     public void testTableOperationsReadOnly()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = newAccessControlManager(transactionManager, "catalog_read_only.json");
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
                     Set<SchemaTableName> aliceTables = ImmutableSet.of(new SchemaTableName("schema", "table"));
-                    assertEquals(accessControlManager.filterTables(new SecurityContext(transactionId, alice, queryId), "alice-catalog", aliceTables), aliceTables);
-                    assertEquals(accessControlManager.filterTables(new SecurityContext(transactionId, bob, queryId), "alice-catalog", aliceTables), ImmutableSet.of());
+                    assertEquals(accessControlManager.filterTables(new SecurityContext(transactionId, alice, queryId, queryStart), "alice-catalog", aliceTables), aliceTables);
+                    assertEquals(accessControlManager.filterTables(new SecurityContext(transactionId, bob, queryId, queryStart), "alice-catalog", aliceTables), ImmutableSet.of());
 
-                    accessControlManager.checkCanSelectFromColumns(new SecurityContext(transactionId, alice, queryId), aliceTable, ImmutableSet.of());
+                    accessControlManager.checkCanSelectFromColumns(new SecurityContext(transactionId, alice, queryId, queryStart), aliceTable, ImmutableSet.of());
                 });
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanCreateTable(new SecurityContext(transactionId, alice, queryId), aliceTable, Map.of());
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanCreateTable(new SecurityContext(transactionId, alice, queryId, queryStart), aliceTable, Map.of());
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot create table alice-catalog.schema.table");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanDropTable(new SecurityContext(transactionId, alice, queryId), aliceTable);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanDropTable(new SecurityContext(transactionId, alice, queryId, queryStart), aliceTable);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot drop table alice-catalog.schema.table");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanTruncateTable(new SecurityContext(transactionId, alice, queryId), aliceTable);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanTruncateTable(new SecurityContext(transactionId, alice, queryId, queryStart), aliceTable);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot truncate table alice-catalog.schema.table");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanInsertIntoTable(new SecurityContext(transactionId, alice, queryId), aliceTable);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanInsertIntoTable(new SecurityContext(transactionId, alice, queryId, queryStart), aliceTable);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot insert into table alice-catalog.schema.table");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanDeleteFromTable(new SecurityContext(transactionId, alice, queryId), aliceTable);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanDeleteFromTable(new SecurityContext(transactionId, alice, queryId, queryStart), aliceTable);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot delete from table alice-catalog.schema.table");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanSetTableProperties(new SecurityContext(transactionId, alice, queryId), aliceTable, ImmutableMap.of());
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanSetTableProperties(new SecurityContext(transactionId, alice, queryId, queryStart), aliceTable, ImmutableMap.of());
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot set table properties to alice-catalog.schema.table");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanAddColumns(new SecurityContext(transactionId, alice, queryId), aliceTable);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanAddColumns(new SecurityContext(transactionId, alice, queryId, queryStart), aliceTable);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot add a column to table alice-catalog.schema.table");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanRenameColumn(new SecurityContext(transactionId, alice, queryId), aliceTable);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanRenameColumn(new SecurityContext(transactionId, alice, queryId, queryStart), aliceTable);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot rename a column in table alice-catalog.schema.table");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanCreateTable(new SecurityContext(transactionId, bob, queryId), aliceTable, Map.of());
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanCreateTable(new SecurityContext(transactionId, bob, queryId, queryStart), aliceTable, Map.of());
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot access catalog alice-catalog");
     }
@@ -512,13 +524,14 @@ public void testTableOperationsReadOnly()
     public void testViewOperations()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = newAccessControlManager(transactionManager, "catalog.json");
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    SecurityContext aliceContext = new SecurityContext(transactionId, alice, queryId);
-                    SecurityContext bobContext = new SecurityContext(transactionId, bob, queryId);
-                    SecurityContext nonAsciiContext = new SecurityContext(transactionId, nonAsciiUser, queryId);
+                    SecurityContext aliceContext = new SecurityContext(transactionId, alice, queryId, queryStart);
+                    SecurityContext bobContext = new SecurityContext(transactionId, bob, queryId, queryStart);
+                    SecurityContext nonAsciiContext = new SecurityContext(transactionId, nonAsciiUser, queryId, queryStart);
 
                     accessControlManager.checkCanCreateView(aliceContext, aliceView);
                     accessControlManager.checkCanDropView(aliceContext, aliceView);
@@ -628,37 +641,38 @@ public void testViewOperations()
     public void testViewOperationsReadOnly()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = newAccessControlManager(transactionManager, "catalog_read_only.json");
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    SecurityContext context = new SecurityContext(transactionId, alice, queryId);
+                    SecurityContext context = new SecurityContext(transactionId, alice, queryId, queryStart);
                     accessControlManager.checkCanSelectFromColumns(context, aliceView, ImmutableSet.of());
                     accessControlManager.checkCanSetCatalogSessionProperty(context, "alice-catalog", "property");
                 });
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId), aliceView);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId, queryStart), aliceView);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot create view alice-catalog.schema.view");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanDropView(new SecurityContext(transactionId, alice, queryId), aliceView);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanDropView(new SecurityContext(transactionId, alice, queryId, queryStart), aliceView);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot drop view alice-catalog.schema.view");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanGrantTablePrivilege(new SecurityContext(transactionId, alice, queryId), SELECT, aliceTable, new TrinoPrincipal(USER, "grantee"), true);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanGrantTablePrivilege(new SecurityContext(transactionId, alice, queryId, queryStart), SELECT, aliceTable, new TrinoPrincipal(USER, "grantee"), true);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot grant privilege SELECT on table alice-catalog.schema.table");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanRevokeTablePrivilege(new SecurityContext(transactionId, alice, queryId), SELECT, aliceTable, new TrinoPrincipal(USER, "revokee"), true);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanRevokeTablePrivilege(new SecurityContext(transactionId, alice, queryId, queryStart), SELECT, aliceTable, new TrinoPrincipal(USER, "revokee"), true);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot revoke privilege SELECT on table alice-catalog.schema.table");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanCreateView(new SecurityContext(transactionId, bob, queryId), aliceView);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanCreateView(new SecurityContext(transactionId, bob, queryId, queryStart), aliceView);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot access catalog alice-catalog");
     }
@@ -667,13 +681,14 @@ public void testViewOperationsReadOnly()
     public void testMaterializedViewAccess()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = newAccessControlManager(transactionManager, "catalog.json");
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    SecurityContext aliceContext = new SecurityContext(transactionId, alice, queryId);
-                    SecurityContext bobContext = new SecurityContext(transactionId, bob, queryId);
-                    SecurityContext nonAsciiContext = new SecurityContext(transactionId, nonAsciiUser, queryId);
+                    SecurityContext aliceContext = new SecurityContext(transactionId, alice, queryId, queryStart);
+                    SecurityContext bobContext = new SecurityContext(transactionId, bob, queryId, queryStart);
+                    SecurityContext nonAsciiContext = new SecurityContext(transactionId, nonAsciiUser, queryId, queryStart);
 
                     // User alice is allowed access to alice-catalog
                     accessControlManager.checkCanCreateMaterializedView(aliceContext, aliceMaterializedView, Map.of());
@@ -725,47 +740,48 @@ public void testMaterializedViewAccess()
     public void testReadOnlyMaterializedViewAccess()
     {
         TransactionManager transactionManager = createTestTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
         AccessControlManager accessControlManager = newAccessControlManager(transactionManager, "catalog_read_only.json");
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    SecurityContext context = new SecurityContext(transactionId, alice, queryId);
+                    SecurityContext context = new SecurityContext(transactionId, alice, queryId, queryStart);
                     accessControlManager.checkCanSelectFromColumns(context, aliceMaterializedView, ImmutableSet.of());
                     accessControlManager.checkCanSetCatalogSessionProperty(context, "alice-catalog", "property");
                 });
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanCreateMaterializedView(new SecurityContext(transactionId, alice, queryId), aliceMaterializedView, Map.of());
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanCreateMaterializedView(new SecurityContext(transactionId, alice, queryId, queryStart), aliceMaterializedView, Map.of());
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot create materialized view alice-catalog.schema.materialized-view");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanDropMaterializedView(new SecurityContext(transactionId, alice, queryId), aliceMaterializedView);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanDropMaterializedView(new SecurityContext(transactionId, alice, queryId, queryStart), aliceMaterializedView);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot drop materialized view alice-catalog.schema.materialized-view");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanRefreshMaterializedView(new SecurityContext(transactionId, alice, queryId), aliceMaterializedView);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanRefreshMaterializedView(new SecurityContext(transactionId, alice, queryId, queryStart), aliceMaterializedView);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot refresh materialized view alice-catalog.schema.materialized-view");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanSetMaterializedViewProperties(new SecurityContext(transactionId, alice, queryId), aliceMaterializedView, ImmutableMap.of());
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanSetMaterializedViewProperties(new SecurityContext(transactionId, alice, queryId, queryStart), aliceMaterializedView, ImmutableMap.of());
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot set properties of materialized view alice-catalog.schema.materialized-view");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanCreateMaterializedView(new SecurityContext(transactionId, bob, queryId), aliceMaterializedView, Map.of());
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanCreateMaterializedView(new SecurityContext(transactionId, bob, queryId, queryStart), aliceMaterializedView, Map.of());
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot access catalog alice-catalog");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanRefreshMaterializedView(new SecurityContext(transactionId, bob, queryId), aliceMaterializedView);
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanRefreshMaterializedView(new SecurityContext(transactionId, bob, queryId, queryStart), aliceMaterializedView);
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot access catalog alice-catalog");
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager).execute(transactionId -> {
-            accessControlManager.checkCanSetMaterializedViewProperties(new SecurityContext(transactionId, bob, queryId), aliceMaterializedView, ImmutableMap.of());
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager).execute(transactionId -> {
+            accessControlManager.checkCanSetMaterializedViewProperties(new SecurityContext(transactionId, bob, queryId, queryStart), aliceMaterializedView, ImmutableMap.of());
         })).isInstanceOf(AccessDeniedException.class)
                 .hasMessage("Access Denied: Cannot access catalog alice-catalog");
     }
@@ -775,7 +791,8 @@ public void testRefreshing()
             throws Exception
     {
         TransactionManager transactionManager = createTestTransactionManager();
-        AccessControlManager accessControlManager = new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), DefaultSystemAccessControl.NAME);
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
+        AccessControlManager accessControlManager = new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), OpenTelemetry.noop(), DefaultSystemAccessControl.NAME);
         File configFile = newTemporaryFile();
         configFile.deleteOnExit();
         copy(new File(getResourcePath("catalog.json")), configFile);
@@ -784,26 +801,26 @@ public void testRefreshing()
                 SECURITY_CONFIG_FILE, configFile.getAbsolutePath(),
                 SECURITY_REFRESH_PERIOD, "1ms"));
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId), aliceView);
-                    accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId), aliceView);
-                    accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId), aliceView);
+                    accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId, queryStart), aliceView);
+                    accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId, queryStart), aliceView);
+                    accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId, queryStart), aliceView);
                 });
 
         copy(new File(getResourcePath("security-config-file-with-unknown-rules.json")), configFile);
         sleep(2);
 
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager)
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId), aliceView);
+                    accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId, queryStart), aliceView);
                 }))
                 .isInstanceOf(UncheckedIOException.class)
                 .hasMessageStartingWith("Failed to convert JSON tree node");
         // test if file based cached control was not cached somewhere
-        assertThatThrownBy(() -> transaction(transactionManager, accessControlManager)
+        assertThatThrownBy(() -> transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId), aliceView);
+                    accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId, queryStart), aliceView);
                 }))
                 .isInstanceOf(UncheckedIOException.class)
                 .hasMessageStartingWith("Failed to convert JSON tree node");
@@ -811,9 +828,9 @@ public void testRefreshing()
         copy(new File(getResourcePath("catalog.json")), configFile);
         sleep(2);
 
-        transaction(transactionManager, accessControlManager)
+        transaction(transactionManager, metadata, accessControlManager)
                 .execute(transactionId -> {
-                    accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId), aliceView);
+                    accessControlManager.checkCanCreateView(new SecurityContext(transactionId, alice, queryId, queryStart), aliceView);
                 });
     }
 
@@ -835,7 +852,7 @@ public void testAllowModeInvalidValue()
 
     private AccessControlManager newAccessControlManager(TransactionManager transactionManager, String resourceName)
     {
-        AccessControlManager accessControlManager = new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), DefaultSystemAccessControl.NAME);
+        AccessControlManager accessControlManager = new AccessControlManager(transactionManager, emptyEventListenerManager(), new AccessControlConfig(), OpenTelemetry.noop(), DefaultSystemAccessControl.NAME);
 
         accessControlManager.loadSystemAccessControl(FileBasedSystemAccessControl.NAME, ImmutableMap.of("security.config-file", getResourcePath(resourceName)));
 
@@ -855,7 +872,7 @@ private String getResourcePath(String resourceName)
     @Test
     public void parseUnknownRules()
     {
-        assertThatThrownBy(() -> parse("src/test/resources/security-config-file-with-unknown-rules.json"))
+        assertThatThrownBy(() -> parse(getResourcePath("security-config-file-with-unknown-rules.json")))
                 .hasMessageContaining("Failed to convert JSON tree node");
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/security/TestForwardingAccessControl.java b/core/trino-main/src/test/java/io/trino/security/TestForwardingAccessControl.java
index 272d03fce10a..de0fbc3e8577 100644
--- a/core/trino-main/src/test/java/io/trino/security/TestForwardingAccessControl.java
+++ b/core/trino-main/src/test/java/io/trino/security/TestForwardingAccessControl.java
@@ -13,7 +13,7 @@
  */
 package io.trino.security;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 import static io.trino.spi.testing.InterfaceTestUtils.assertProperForwardingMethodsAreCalled;
diff --git a/core/trino-main/src/test/java/io/trino/security/TestGroupProviderManager.java b/core/trino-main/src/test/java/io/trino/security/TestGroupProviderManager.java
index 06bedd236f5d..f8844edff1d0 100644
--- a/core/trino-main/src/test/java/io/trino/security/TestGroupProviderManager.java
+++ b/core/trino-main/src/test/java/io/trino/security/TestGroupProviderManager.java
@@ -17,7 +17,7 @@
 import io.airlift.testing.TempFile;
 import io.trino.spi.security.GroupProvider;
 import io.trino.spi.security.GroupProviderFactory;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/core/trino-main/src/test/java/io/trino/security/TestInjectedConnectorAccessControl.java b/core/trino-main/src/test/java/io/trino/security/TestInjectedConnectorAccessControl.java
index 3ad21b949b18..d57690592274 100644
--- a/core/trino-main/src/test/java/io/trino/security/TestInjectedConnectorAccessControl.java
+++ b/core/trino-main/src/test/java/io/trino/security/TestInjectedConnectorAccessControl.java
@@ -14,7 +14,7 @@
 package io.trino.security;
 
 import io.trino.spi.connector.ConnectorAccessControl;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 
diff --git a/core/trino-main/src/test/java/io/trino/server/TestBasicQueryInfo.java b/core/trino-main/src/test/java/io/trino/server/TestBasicQueryInfo.java
index 259989e7483a..34cecfbf5b2d 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestBasicQueryInfo.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestBasicQueryInfo.java
@@ -28,7 +28,7 @@
 import io.trino.spi.eventlistener.StageGcStatistics;
 import io.trino.spi.resourcegroups.QueryType;
 import org.joda.time.DateTime;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.util.Optional;
@@ -68,6 +68,7 @@ public void testConstructor()
                                 new Duration(44, MINUTES),
                                 new Duration(9, MINUTES),
                                 new Duration(99, SECONDS),
+                                new Duration(1, SECONDS),
                                 new Duration(12, MINUTES),
                                 13,
                                 14,
@@ -90,6 +91,8 @@ public void testConstructor()
                                 DataSize.valueOf("30GB"),
                                 DataSize.valueOf("31GB"),
                                 true,
+                                OptionalDouble.of(100),
+                                OptionalDouble.of(0),
                                 new Duration(32, MINUTES),
                                 new Duration(33, MINUTES),
                                 new Duration(34, MINUTES),
@@ -139,6 +142,8 @@ public void testConstructor()
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
+                        Optional.empty(),
+                        false,
                         ImmutableMap.of(),
                         ImmutableSet.of(),
                         ImmutableMap.of(),
@@ -192,6 +197,7 @@ public void testConstructor()
         assertEquals(basicInfo.getQueryStats().getBlockedReasons(), ImmutableSet.of(BlockedReason.WAITING_FOR_MEMORY));
 
         assertEquals(basicInfo.getQueryStats().getProgressPercentage(), OptionalDouble.of(100));
+        assertEquals(basicInfo.getQueryStats().getRunningPercentage(), OptionalDouble.of(0));
 
         assertEquals(basicInfo.getErrorCode(), StandardErrorCode.ABANDONED_QUERY.toErrorCode());
         assertEquals(basicInfo.getErrorType(), StandardErrorCode.ABANDONED_QUERY.toErrorCode().getType());
diff --git a/core/trino-main/src/test/java/io/trino/server/TestDynamicFilterService.java b/core/trino-main/src/test/java/io/trino/server/TestDynamicFilterService.java
index 9ea42011ca79..d07d913d4747 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestDynamicFilterService.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestDynamicFilterService.java
@@ -49,7 +49,7 @@
 import io.trino.sql.tree.Expression;
 import io.trino.testing.TestingMetadata;
 import io.trino.testing.TestingSession;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -1062,7 +1062,7 @@ private static PlanFragment createPlan(
         FilterNode filterNode = new FilterNode(
                 new PlanNodeId("filter_node_id"),
                 tableScan,
-                createDynamicFilterExpression(session, createTestMetadataManager(), consumedDynamicFilterId, VARCHAR, symbol.toSymbolReference()));
+                createDynamicFilterExpression(createTestMetadataManager(), consumedDynamicFilterId, VARCHAR, symbol.toSymbolReference()));
 
         RemoteSourceNode remote = new RemoteSourceNode(new PlanNodeId("remote_id"), new PlanFragmentId("plan_fragment_id"), ImmutableList.of(buildSymbol), Optional.empty(), exchangeType, RetryPolicy.NONE);
         return new PlanFragment(
@@ -1089,6 +1089,7 @@ private static PlanFragment createPlan(
                 new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)),
                 StatsAndCosts.empty(),
                 ImmutableList.of(),
+                ImmutableList.of(),
                 Optional.empty());
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/server/TestEmbeddedDiscoveryConfig.java b/core/trino-main/src/test/java/io/trino/server/TestEmbeddedDiscoveryConfig.java
index b2536f3e2c51..c93813d5aa4b 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestEmbeddedDiscoveryConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestEmbeddedDiscoveryConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/server/TestFailureDetectorConfig.java b/core/trino-main/src/test/java/io/trino/server/TestFailureDetectorConfig.java
index a3210a76490d..5f5ccfd43795 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestFailureDetectorConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestFailureDetectorConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
 import io.trino.failuredetector.FailureDetectorConfig;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
diff --git a/core/trino-main/src/test/java/io/trino/server/TestGenerateTokenFilter.java b/core/trino-main/src/test/java/io/trino/server/TestGenerateTokenFilter.java
index 6ecf788fb8c1..f7de99e0eba1 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestGenerateTokenFilter.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestGenerateTokenFilter.java
@@ -14,6 +14,7 @@
 package io.trino.server;
 
 import com.google.inject.Binder;
+import com.google.inject.BindingAnnotation;
 import com.google.inject.Key;
 import com.google.inject.Module;
 import io.airlift.http.client.HttpClient;
@@ -23,14 +24,13 @@
 import io.airlift.http.client.jetty.JettyHttpClient;
 import io.trino.server.security.ResourceSecurity;
 import io.trino.server.testing.TestingTrinoServer;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import javax.inject.Qualifier;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.Path;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -45,18 +45,19 @@
 import static io.airlift.testing.Assertions.assertInstanceOf;
 import static io.airlift.testing.Closeables.closeAll;
 import static io.trino.server.security.ResourceSecurity.AccessType.PUBLIC;
+import static jakarta.servlet.http.HttpServletResponse.SC_OK;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestGenerateTokenFilter
 {
     private JettyHttpClient httpClient;
     private TestingTrinoServer server;
     private GenerateTraceTokenRequestFilter filter;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         server = TestingTrinoServer.builder()
@@ -66,12 +67,12 @@ public void setup()
 
         // extract the filter
         List<HttpRequestFilter> filters = httpClient.getRequestFilters();
-        assertEquals(filters.size(), 3);
-        assertInstanceOf(filters.get(2), GenerateTraceTokenRequestFilter.class);
-        filter = (GenerateTraceTokenRequestFilter) filters.get(2);
+        assertEquals(filters.size(), 2);
+        assertInstanceOf(filters.get(1), GenerateTraceTokenRequestFilter.class);
+        filter = (GenerateTraceTokenRequestFilter) filters.get(1);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -91,7 +92,7 @@ public void testTraceToken()
 
     @Retention(RUNTIME)
     @Target(ElementType.PARAMETER)
-    @Qualifier
+    @BindingAnnotation
     private @interface GenerateTokenFilterTest {}
 
     @Path("/testing")
diff --git a/core/trino-main/src/test/java/io/trino/server/TestHttpRequestSessionContextFactory.java b/core/trino-main/src/test/java/io/trino/server/TestHttpRequestSessionContextFactory.java
index 176a7c5a355a..f894211a53a3 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestHttpRequestSessionContextFactory.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestHttpRequestSessionContextFactory.java
@@ -22,11 +22,10 @@
 import io.trino.server.protocol.PreparedStatementEncoder;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.SelectedRole;
-import org.testng.annotations.Test;
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/server/TestInternalCommunicationConfig.java b/core/trino-main/src/test/java/io/trino/server/TestInternalCommunicationConfig.java
index d05bdf6c1658..801e8307eba6 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestInternalCommunicationConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestInternalCommunicationConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/core/trino-main/src/test/java/io/trino/server/TestJmxNamingConfig.java b/core/trino-main/src/test/java/io/trino/server/TestJmxNamingConfig.java
index 6c3d6cca0be3..c616aed0bb30 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestJmxNamingConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestJmxNamingConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/server/TestNodeResource.java b/core/trino-main/src/test/java/io/trino/server/TestNodeResource.java
index 765990ed1afa..69e2a55f33e5 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestNodeResource.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestNodeResource.java
@@ -16,9 +16,10 @@
 import io.airlift.http.client.HttpClient;
 import io.airlift.http.client.jetty.JettyHttpClient;
 import io.trino.server.testing.TestingTrinoServer;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 
@@ -28,21 +29,23 @@
 import static io.airlift.testing.Closeables.closeAll;
 import static io.trino.client.ProtocolHeaders.TRINO_HEADERS;
 import static io.trino.failuredetector.HeartbeatFailureDetector.Stats;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestNodeResource
 {
     private TestingTrinoServer server;
     private HttpClient client;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         server = TestingTrinoServer.create();
         client = new JettyHttpClient();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
diff --git a/core/trino-main/src/test/java/io/trino/server/TestProtocolConfig.java b/core/trino-main/src/test/java/io/trino/server/TestProtocolConfig.java
index 1679cae97cfe..b752f23774ca 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestProtocolConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestProtocolConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/server/TestQueryProgressStats.java b/core/trino-main/src/test/java/io/trino/server/TestQueryProgressStats.java
index c514fe24dde1..77c591f51a86 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestQueryProgressStats.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestQueryProgressStats.java
@@ -14,7 +14,7 @@
 package io.trino.server;
 
 import io.airlift.json.JsonCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.OptionalDouble;
 
diff --git a/core/trino-main/src/test/java/io/trino/server/TestQueryResource.java b/core/trino-main/src/test/java/io/trino/server/TestQueryResource.java
index e6b246349dd1..b3fa0e4414af 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestQueryResource.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestQueryResource.java
@@ -20,17 +20,22 @@
 import io.airlift.http.client.jetty.JettyHttpClient;
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
+import io.airlift.json.ObjectMapperProvider;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Span;
 import io.trino.client.QueryResults;
 import io.trino.execution.QueryInfo;
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.server.testing.TestingTrinoServer;
 import io.trino.spi.QueryId;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.List;
+import java.util.Map;
 
 import static io.airlift.http.client.HttpUriBuilder.uriBuilderFrom;
 import static io.airlift.http.client.JsonResponseHandler.createJsonResponseHandler;
@@ -41,8 +46,9 @@
 import static io.airlift.http.client.StaticBodyGenerator.createStaticBodyGenerator;
 import static io.airlift.http.client.StatusResponseHandler.createStatusResponseHandler;
 import static io.airlift.json.JsonCodec.jsonCodec;
-import static io.airlift.json.JsonCodec.listJsonCodec;
 import static io.airlift.testing.Closeables.closeAll;
+import static io.airlift.tracing.SpanSerialization.SpanDeserializer;
+import static io.airlift.tracing.SpanSerialization.SpanSerializer;
 import static io.trino.client.ProtocolHeaders.TRINO_HEADERS;
 import static io.trino.execution.QueryState.FAILED;
 import static io.trino.execution.QueryState.RUNNING;
@@ -57,19 +63,26 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestQueryResource
 {
+    static final JsonCodec<List<BasicQueryInfo>> BASIC_QUERY_INFO_CODEC = new JsonCodecFactory(
+            new ObjectMapperProvider()
+                    .withJsonSerializers(Map.of(Span.class, new SpanSerializer(OpenTelemetry.noop())))
+                    .withJsonDeserializers(Map.of(Span.class, new SpanDeserializer(OpenTelemetry.noop()))))
+            .listJsonCodec(BasicQueryInfo.class);
+
     private HttpClient client;
     private TestingTrinoServer server;
 
-    @BeforeMethod
+    @BeforeEach
     public void setup()
     {
         client = new JettyHttpClient();
@@ -78,7 +91,7 @@ public void setup()
         server.createCatalog("tpch", "tpch");
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void teardown()
             throws Exception
     {
@@ -286,7 +299,7 @@ private List<BasicQueryInfo> getQueryInfos(String path)
                 .setUri(server.resolve(path))
                 .setHeader(TRINO_HEADERS.requestUser(), "unknown")
                 .build();
-        return client.execute(request, createJsonResponseHandler(listJsonCodec(BasicQueryInfo.class)));
+        return client.execute(request, createJsonResponseHandler(BASIC_QUERY_INFO_CODEC));
     }
 
     private static void assertStateCounts(Iterable<BasicQueryInfo> infos, int expectedFinished, int expectedFailed, int expectedRunning)
diff --git a/core/trino-main/src/test/java/io/trino/server/TestQuerySessionSupplier.java b/core/trino-main/src/test/java/io/trino/server/TestQuerySessionSupplier.java
index 99b09b9c5880..46bf67debe13 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestQuerySessionSupplier.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestQuerySessionSupplier.java
@@ -13,30 +13,28 @@
  */
 package io.trino.server;
 
-import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ListMultimap;
 import io.airlift.jaxrs.testing.GuavaMultivaluedMap;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
+import io.trino.connector.system.GlobalSystemConnector;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.SessionPropertyManager;
 import io.trino.security.AllowAllAccessControl;
 import io.trino.server.protocol.PreparedStatementEncoder;
 import io.trino.spi.QueryId;
 import io.trino.spi.TrinoException;
+import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.sql.SqlEnvironmentConfig;
 import io.trino.sql.SqlPath;
-import io.trino.sql.SqlPathElement;
-import io.trino.sql.tree.Identifier;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.Test;
+import jakarta.ws.rs.core.MultivaluedMap;
+import org.junit.jupiter.api.Test;
 
-import javax.ws.rs.core.MultivaluedMap;
-
-import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 
@@ -44,6 +42,8 @@
 import static io.trino.SystemSessionProperties.MAX_HASH_PARTITION_COUNT;
 import static io.trino.SystemSessionProperties.QUERY_MAX_MEMORY;
 import static io.trino.client.ProtocolHeaders.TRINO_HEADERS;
+import static io.trino.metadata.GlobalFunctionCatalog.BUILTIN_SCHEMA;
+import static io.trino.metadata.LanguageFunctionManager.QUERY_LOCAL_SCHEMA;
 import static io.trino.metadata.MetadataManager.createTestMetadataManager;
 import static io.trino.metadata.MetadataManager.testMetadataManagerBuilder;
 import static io.trino.spi.type.TimeZoneKey.getTimeZoneKey;
@@ -79,14 +79,14 @@ public void testCreateSession()
     {
         SessionContext context = SESSION_CONTEXT_FACTORY.createSessionContext(TEST_HEADERS, Optional.empty(), Optional.of("testRemote"), Optional.empty());
         QuerySessionSupplier sessionSupplier = createSessionSupplier(new SqlEnvironmentConfig());
-        Session session = sessionSupplier.createSession(new QueryId("test_query_id"), context);
+        Session session = sessionSupplier.createSession(new QueryId("test_query_id"), Span.getInvalid(), context);
 
         assertEquals(session.getQueryId(), new QueryId("test_query_id"));
         assertEquals(session.getUser(), "testUser");
         assertEquals(session.getSource().get(), "testSource");
         assertEquals(session.getCatalog().get(), "testCatalog");
         assertEquals(session.getSchema().get(), "testSchema");
-        assertEquals(session.getPath().getRawPath().get(), "testPath");
+        assertEquals(session.getPath().getRawPath(), "testPath");
         assertEquals(session.getLocale(), Locale.TAIWAN);
         assertEquals(session.getTimeZoneKey(), getTimeZoneKey("Asia/Taipei"));
         assertEquals(session.getRemoteUserAddress().get(), "testRemote");
@@ -142,7 +142,7 @@ public void testInvalidTimeZone()
                 .build());
         SessionContext context = SESSION_CONTEXT_FACTORY.createSessionContext(headers, Optional.empty(), Optional.of("remoteAddress"), Optional.empty());
         QuerySessionSupplier sessionSupplier = createSessionSupplier(new SqlEnvironmentConfig());
-        assertThatThrownBy(() -> sessionSupplier.createSession(new QueryId("test_query_id"), context))
+        assertThatThrownBy(() -> sessionSupplier.createSession(new QueryId("test_query_id"), Span.getInvalid(), context))
                 .isInstanceOf(TrinoException.class)
                 .hasMessage("Time zone not supported: unknown_timezone");
     }
@@ -150,28 +150,26 @@ public void testInvalidTimeZone()
     @Test
     public void testSqlPathCreation()
     {
-        ImmutableList.Builder<SqlPathElement> correctValues = ImmutableList.builder();
-        correctValues.add(new SqlPathElement(
-                Optional.of(new Identifier("normal")),
-                new Identifier("schema")));
-        correctValues.add(new SqlPathElement(
-                Optional.of(new Identifier("who.uses.periods")),
-                new Identifier("in.schema.names")));
-        correctValues.add(new SqlPathElement(
-                Optional.of(new Identifier("same,deal")),
-                new Identifier("with,commas")));
-        correctValues.add(new SqlPathElement(
-                Optional.of(new Identifier("aterrible")),
-                new Identifier("thing!@#$%^&*()")));
-        List<SqlPathElement> expected = correctValues.build();
-
-        SqlPath path = new SqlPath(Optional.of("normal.schema,"
+        String rawPath = "normal.schema,"
                 + "\"who.uses.periods\".\"in.schema.names\","
                 + "\"same,deal\".\"with,commas\","
-                + "aterrible.\"thing!@#$%^&*()\""));
-
-        assertEquals(path.getParsedPath(), expected);
-        assertEquals(path.toString(), Joiner.on(", ").join(expected));
+                + "aterrible.\"thing!@#$%^&*()\"";
+        SqlPath path = SqlPath.buildPath(
+                rawPath,
+                Optional.empty());
+
+        assertEquals(
+                path.getPath(),
+                ImmutableList.<CatalogSchemaName>builder()
+                        .add(new CatalogSchemaName(GlobalSystemConnector.NAME, QUERY_LOCAL_SCHEMA))
+                        .add(new CatalogSchemaName(GlobalSystemConnector.NAME, BUILTIN_SCHEMA))
+                        .add(new CatalogSchemaName("normal", "schema"))
+                        .add(new CatalogSchemaName("who.uses.periods", "in.schema.names"))
+                        .add(new CatalogSchemaName("same,deal", "with,commas"))
+                        .add(new CatalogSchemaName("aterrible", "thing!@#$%^&*()"))
+                        .build());
+
+        assertEquals(path.toString(), rawPath);
     }
 
     @Test
@@ -237,7 +235,7 @@ private static Session createSession(ListMultimap<String, String> headers, SqlEn
         MultivaluedMap<String, String> headerMap = new GuavaMultivaluedMap<>(headers);
         SessionContext context = SESSION_CONTEXT_FACTORY.createSessionContext(headerMap, Optional.empty(), Optional.of("testRemote"), Optional.empty());
         QuerySessionSupplier sessionSupplier = createSessionSupplier(config);
-        return sessionSupplier.createSession(new QueryId("test_query_id"), context);
+        return sessionSupplier.createSession(new QueryId("test_query_id"), Span.getInvalid(), context);
     }
 
     private static QuerySessionSupplier createSessionSupplier(SqlEnvironmentConfig config)
diff --git a/core/trino-main/src/test/java/io/trino/server/TestQueryStateInfo.java b/core/trino-main/src/test/java/io/trino/server/TestQueryStateInfo.java
index abbf5893d3f1..107369fbd4e5 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestQueryStateInfo.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestQueryStateInfo.java
@@ -27,11 +27,12 @@
 import io.trino.spi.QueryId;
 import io.trino.spi.resourcegroups.QueryType;
 import org.joda.time.DateTime;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.util.List;
 import java.util.Optional;
+import java.util.OptionalDouble;
 
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
@@ -118,6 +119,7 @@ private QueryInfo createQueryInfo(String queryId, QueryState state, String query
                         new Duration(9, MINUTES),
                         new Duration(10, MINUTES),
                         new Duration(11, MINUTES),
+                        new Duration(1, SECONDS),
                         new Duration(12, MINUTES),
                         13,
                         14,
@@ -140,6 +142,8 @@ private QueryInfo createQueryInfo(String queryId, QueryState state, String query
                         DataSize.valueOf("28GB"),
                         DataSize.valueOf("29GB"),
                         true,
+                        OptionalDouble.of(8.88),
+                        OptionalDouble.of(0),
                         new Duration(23, MINUTES),
                         new Duration(24, MINUTES),
                         new Duration(25, MINUTES),
@@ -182,6 +186,8 @@ private QueryInfo createQueryInfo(String queryId, QueryState state, String query
                 Optional.empty(),
                 Optional.empty(),
                 Optional.empty(),
+                Optional.empty(),
+                false,
                 ImmutableMap.of(),
                 ImmutableSet.of(),
                 ImmutableMap.of(),
diff --git a/core/trino-main/src/test/java/io/trino/server/TestQueryStateInfoResource.java b/core/trino-main/src/test/java/io/trino/server/TestQueryStateInfoResource.java
index 16e6c01b712b..f1eeb7b50d34 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestQueryStateInfoResource.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestQueryStateInfoResource.java
@@ -24,9 +24,10 @@
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.server.testing.TestingTrinoServer;
 import io.trino.spi.ErrorCode;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.util.List;
@@ -42,17 +43,19 @@
 import static io.trino.client.ProtocolHeaders.TRINO_HEADERS;
 import static io.trino.execution.QueryState.FAILED;
 import static io.trino.execution.QueryState.RUNNING;
+import static io.trino.server.TestQueryResource.BASIC_QUERY_INFO_CODEC;
 import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.VIEW_QUERY;
 import static io.trino.testing.TestingAccessControlManager.privilege;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Fail.fail;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestQueryStateInfoResource
 {
     private static final String LONG_LASTING_QUERY = "SELECT * FROM tpch.sf1.lineitem";
@@ -62,7 +65,7 @@ public class TestQueryStateInfoResource
     private HttpClient client;
     private QueryResults queryResults;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         server = TestingTrinoServer.create();
@@ -94,7 +97,7 @@ public void setUp()
                             .setUri(uriBuilderFrom(server.getBaseUrl()).replacePath("/v1/query").build())
                             .setHeader(TRINO_HEADERS.requestUser(), "unknown")
                             .build(),
-                    createJsonResponseHandler(listJsonCodec(BasicQueryInfo.class)));
+                    createJsonResponseHandler(BASIC_QUERY_INFO_CODEC));
             if (queryInfos.size() == 2) {
                 if (queryInfos.stream().allMatch(info -> info.getState() == RUNNING)) {
                     break;
@@ -111,7 +114,7 @@ public void setUp()
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws IOException
     {
diff --git a/core/trino-main/src/test/java/io/trino/server/TestServerConfig.java b/core/trino-main/src/test/java/io/trino/server/TestServerConfig.java
index 645b7acadd3d..73f887dad77c 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestServerConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestServerConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/server/TestServerPluginsProviderConfig.java b/core/trino-main/src/test/java/io/trino/server/TestServerPluginsProviderConfig.java
index 6f7a807ec63d..c88a404ac1c1 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestServerPluginsProviderConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestServerPluginsProviderConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.Map;
diff --git a/core/trino-main/src/test/java/io/trino/server/TestSessionPropertyDefaults.java b/core/trino-main/src/test/java/io/trino/server/TestSessionPropertyDefaults.java
index 5435d1ef4bab..b27eea657310 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestSessionPropertyDefaults.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestSessionPropertyDefaults.java
@@ -22,14 +22,14 @@
 import io.trino.SystemSessionProperties;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.metadata.SessionPropertyManager;
+import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.QueryId;
 import io.trino.spi.resourcegroups.ResourceGroupId;
 import io.trino.spi.security.Identity;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.session.SessionPropertyConfigurationManagerFactory;
 import io.trino.spi.session.TestingSessionPropertyConfigurationManagerFactory;
-import io.trino.testing.AllowAllAccessControlManager;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -49,7 +49,7 @@ public class TestSessionPropertyDefaults
     @Test
     public void testApplyDefaultProperties()
     {
-        SessionPropertyDefaults sessionPropertyDefaults = new SessionPropertyDefaults(TEST_NODE_INFO, new AllowAllAccessControlManager());
+        SessionPropertyDefaults sessionPropertyDefaults = new SessionPropertyDefaults(TEST_NODE_INFO, new AllowAllAccessControl());
 
         ImmutableList<PropertyMetadata<?>> catalogProperties = ImmutableList.of(
                 PropertyMetadata.stringProperty("explicit_set", "Test property", null, false),
@@ -75,6 +75,7 @@ public void testApplyDefaultProperties()
         Session session = Session.builder(sessionPropertyManager)
                 .setQueryId(new QueryId("test_query_id"))
                 .setIdentity(Identity.ofUser("testUser"))
+                .setOriginalIdentity(Identity.ofUser("testUser"))
                 .setSystemProperty(QUERY_MAX_MEMORY, "1GB") // Override this default system property
                 .setSystemProperty(JOIN_DISTRIBUTION_TYPE, "partitioned")
                 .setSystemProperty(MAX_HASH_PARTITION_COUNT, "43")
diff --git a/core/trino-main/src/test/java/io/trino/server/TestSliceSerialization.java b/core/trino-main/src/test/java/io/trino/server/TestSliceSerialization.java
index 34796dfd465d..dd2fb65adcb3 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestSliceSerialization.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestSliceSerialization.java
@@ -21,22 +21,25 @@
 import io.airlift.json.ObjectMapperProvider;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Objects;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestSliceSerialization
 {
     private ObjectMapperProvider provider;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         provider = new ObjectMapperProvider();
@@ -44,7 +47,7 @@ public void setup()
         provider.setJsonDeserializers(ImmutableMap.of(Slice.class, new SliceSerialization.SliceDeserializer()));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
     {
         provider = null;
@@ -72,41 +75,9 @@ private void testRoundTrip(byte[] bytes)
         slice.setBytes(0, bytes);
         testRoundTrip(slice);
 
-        slice = Slices.wrappedShortArray(new short[bytes.length / Short.BYTES + bytes.length % Short.BYTES]);
-        slice.setBytes(bytes.length % Short.BYTES, bytes);
-        testRoundTrip(slice.slice(bytes.length % Short.BYTES, bytes.length));
-
-        slice = Slices.wrappedIntArray(new int[bytes.length / Integer.BYTES + bytes.length % Integer.BYTES]);
-        slice.setBytes(bytes.length % Integer.BYTES, bytes);
-        testRoundTrip(slice.slice(bytes.length % Integer.BYTES, bytes.length));
-
-        slice = Slices.wrappedLongArray(new long[bytes.length / Long.BYTES + bytes.length % Long.BYTES]);
-        slice.setBytes(bytes.length % Long.BYTES, bytes);
-        testRoundTrip(slice.slice(bytes.length % Long.BYTES, bytes.length));
-
-        slice = Slices.wrappedDoubleArray(new double[bytes.length / Double.BYTES + bytes.length % Double.BYTES]);
-        slice.setBytes(bytes.length % Double.BYTES, bytes);
-        testRoundTrip(slice.slice(bytes.length % Double.BYTES, bytes.length));
-
-        slice = Slices.wrappedFloatArray(new float[bytes.length / Float.BYTES + bytes.length % Float.BYTES]);
-        slice.setBytes(bytes.length % Float.BYTES, bytes);
-        testRoundTrip(slice.slice(bytes.length % Float.BYTES, bytes.length));
-
-        slice = Slices.wrappedBooleanArray(new boolean[bytes.length]);
-        slice.setBytes(0, bytes);
-        testRoundTrip(slice);
-
-        slice = Slices.wrappedBooleanArray(new boolean[bytes.length + 3], 2, bytes.length);
-        slice.setBytes(0, bytes);
-        testRoundTrip(slice);
-
         slice = Slices.allocate(bytes.length);
         slice.setBytes(0, bytes);
         testRoundTrip(slice);
-
-        slice = Slices.allocateDirect(bytes.length);
-        slice.setBytes(0, bytes);
-        testRoundTrip(slice);
     }
 
     private void testRoundTrip(Slice slice)
diff --git a/core/trino-main/src/test/java/io/trino/server/TestTrinoSystemRequirements.java b/core/trino-main/src/test/java/io/trino/server/TestTrinoSystemRequirements.java
index 7606d68e8d82..8c2cac5720d9 100644
--- a/core/trino-main/src/test/java/io/trino/server/TestTrinoSystemRequirements.java
+++ b/core/trino-main/src/test/java/io/trino/server/TestTrinoSystemRequirements.java
@@ -13,7 +13,7 @@
  */
 package io.trino.server;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.server.TrinoSystemRequirements.verifyJvmRequirements;
 import static io.trino.server.TrinoSystemRequirements.verifySystemTimeIsReasonable;
diff --git a/core/trino-main/src/test/java/io/trino/server/protocol/TestQueryResultRows.java b/core/trino-main/src/test/java/io/trino/server/protocol/TestQueryResultRows.java
index e7dcf5f7b25b..341592e3261c 100644
--- a/core/trino-main/src/test/java/io/trino/server/protocol/TestQueryResultRows.java
+++ b/core/trino-main/src/test/java/io/trino/server/protocol/TestQueryResultRows.java
@@ -31,7 +31,7 @@
 import io.trino.spi.type.Type;
 import io.trino.testing.TestingSession;
 import io.trino.tests.BogusType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,6 +39,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import static com.google.common.collect.Lists.newArrayList;
 import static io.trino.RowPagesBuilder.rowPagesBuilder;
 import static io.trino.client.ClientStandardTypes.ARRAY;
 import static io.trino.client.ClientStandardTypes.BIGINT;
@@ -57,7 +58,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
-import static org.testng.collections.Lists.newArrayList;
 
 public class TestQueryResultRows
 {
diff --git a/core/trino-main/src/test/java/io/trino/server/remotetask/TestBackoff.java b/core/trino-main/src/test/java/io/trino/server/remotetask/TestBackoff.java
index 4e733cb1e318..6bf65b41edc1 100644
--- a/core/trino-main/src/test/java/io/trino/server/remotetask/TestBackoff.java
+++ b/core/trino-main/src/test/java/io/trino/server/remotetask/TestBackoff.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.testing.TestingTicker;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.concurrent.TimeUnit.MICROSECONDS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/core/trino-main/src/test/java/io/trino/server/remotetask/TestHttpRemoteTask.java b/core/trino-main/src/test/java/io/trino/server/remotetask/TestHttpRemoteTask.java
index da7fa28f5db4..c0a8fc0f1180 100644
--- a/core/trino-main/src/test/java/io/trino/server/remotetask/TestHttpRemoteTask.java
+++ b/core/trino-main/src/test/java/io/trino/server/remotetask/TestHttpRemoteTask.java
@@ -30,9 +30,12 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonModule;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.block.BlockJsonSerde;
 import io.trino.client.NodeVersion;
+import io.trino.execution.BaseTestSqlTaskManager;
 import io.trino.execution.DynamicFilterConfig;
 import io.trino.execution.DynamicFiltersCollector.VersionedDynamicFilterDomains;
 import io.trino.execution.NodeTaskMap;
@@ -47,7 +50,6 @@
 import io.trino.execution.TaskState;
 import io.trino.execution.TaskStatus;
 import io.trino.execution.TaskTestUtils;
-import io.trino.execution.TestSqlTaskManager;
 import io.trino.execution.buffer.PipelinedOutputBuffers;
 import io.trino.metadata.BlockEncodingManager;
 import io.trino.metadata.HandleJsonModule;
@@ -71,6 +73,7 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeOperators;
+import io.trino.spi.type.TypeSignature;
 import io.trino.sql.DynamicFilters;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.SymbolAllocator;
@@ -79,21 +82,23 @@
 import io.trino.sql.tree.SymbolReference;
 import io.trino.testing.TestingSplit;
 import io.trino.type.TypeDeserializer;
-import org.testng.annotations.Test;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
+import io.trino.type.TypeSignatureDeserializer;
+import io.trino.type.TypeSignatureKeyDeserializer;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.UriInfo;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -117,6 +122,9 @@
 import static io.airlift.testing.Assertions.assertGreaterThan;
 import static io.airlift.testing.Assertions.assertGreaterThanOrEqual;
 import static io.airlift.testing.Assertions.assertLessThan;
+import static io.airlift.tracing.SpanSerialization.SpanDeserializer;
+import static io.airlift.tracing.SpanSerialization.SpanSerializer;
+import static io.airlift.tracing.Tracing.noopTracer;
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.SystemSessionProperties.REMOTE_TASK_ADAPTIVE_UPDATE_REQUEST_SIZE_ENABLED;
 import static io.trino.SystemSessionProperties.REMOTE_TASK_GUARANTEED_SPLITS_PER_REQUEST;
@@ -155,33 +163,37 @@ public class TestHttpRemoteTask
     private static final Duration FAIL_TIMEOUT = new Duration(20, SECONDS);
     private static final TaskManagerConfig TASK_MANAGER_CONFIG = new TaskManagerConfig()
             // Shorten status refresh wait and info update interval so that we can have a shorter test timeout
-            .setStatusRefreshMaxWait(new Duration(IDLE_TIMEOUT.roundTo(MILLISECONDS) / 100, MILLISECONDS))
-            .setInfoUpdateInterval(new Duration(IDLE_TIMEOUT.roundTo(MILLISECONDS) / 10, MILLISECONDS));
+            .setStatusRefreshMaxWait(new Duration(IDLE_TIMEOUT.roundTo(MILLISECONDS) / 100.0, MILLISECONDS))
+            .setInfoUpdateInterval(new Duration(IDLE_TIMEOUT.roundTo(MILLISECONDS) / 10.0, MILLISECONDS));
 
     private static final boolean TRACE_HTTP = false;
 
-    @Test(timeOut = 30000)
+    @Test
+    @Timeout(30)
     public void testRemoteTaskMismatch()
             throws Exception
     {
         runTest(FailureScenario.TASK_MISMATCH);
     }
 
-    @Test(timeOut = 30000)
+    @Test
+    @Timeout(30)
     public void testRejectedExecutionWhenVersionIsHigh()
             throws Exception
     {
         runTest(FailureScenario.TASK_MISMATCH_WHEN_VERSION_IS_HIGH);
     }
 
-    @Test(timeOut = 30000)
+    @Test
+    @Timeout(30)
     public void testRejectedExecution()
             throws Exception
     {
         runTest(FailureScenario.REJECTED_EXECUTION);
     }
 
-    @Test(timeOut = 30000)
+    @Test
+    @Timeout(30)
     public void testRegular()
             throws Exception
     {
@@ -209,7 +221,8 @@ public void testRegular()
         httpRemoteTaskFactory.stop();
     }
 
-    @Test(timeOut = 30000)
+    @Test
+    @Timeout(30)
     public void testDynamicFilters()
             throws Exception
     {
@@ -289,7 +302,8 @@ public void testDynamicFilters()
         httpRemoteTaskFactory.stop();
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testOutboundDynamicFilters()
             throws Exception
     {
@@ -383,7 +397,8 @@ public void testOutboundDynamicFilters()
         httpRemoteTaskFactory.stop();
     }
 
-    @Test(timeOut = 300000)
+    @Test
+    @Timeout(300)
     public void testAdaptiveRemoteTaskRequestSize()
             throws Exception
     {
@@ -511,8 +526,10 @@ private RemoteTask createRemoteTask(HttpRemoteTaskFactory httpRemoteTaskFactory,
     {
         return httpRemoteTaskFactory.createRemoteTask(
                 session,
+                Span.getInvalid(),
                 new TaskId(new StageId("test", 1), 2, 0),
                 new InternalNode("node-id", URI.create("http://fake.invalid/"), new NodeVersion("version"), false),
+                false,
                 TaskTestUtils.PLAN_FRAGMENT,
                 ImmutableMultimap.of(),
                 PipelinedOutputBuffers.createInitial(BROADCAST),
@@ -544,6 +561,8 @@ public void configure(Binder binder)
                         binder.bind(JsonMapper.class).in(SINGLETON);
                         binder.bind(Metadata.class).toInstance(createTestMetadataManager());
                         jsonBinder(binder).addDeserializerBinding(Type.class).to(TypeDeserializer.class);
+                        jsonBinder(binder).addDeserializerBinding(TypeSignature.class).to(TypeSignatureDeserializer.class);
+                        jsonBinder(binder).addKeyDeserializerBinding(TypeSignature.class).to(TypeSignatureKeyDeserializer.class);
                         jsonCodecBinder(binder).bindJsonCodec(TaskStatus.class);
                         jsonCodecBinder(binder).bindJsonCodec(VersionedDynamicFilterDomains.class);
                         jsonBinder(binder).addSerializerBinding(Block.class).to(BlockJsonSerde.Serializer.class);
@@ -555,6 +574,10 @@ public void configure(Binder binder)
                         binder.bind(TypeManager.class).toInstance(TESTING_TYPE_MANAGER);
                         binder.bind(BlockEncodingManager.class).in(SINGLETON);
                         binder.bind(BlockEncodingSerde.class).to(InternalBlockEncodingSerde.class).in(SINGLETON);
+
+                        binder.bind(OpenTelemetry.class).toInstance(OpenTelemetry.noop());
+                        jsonBinder(binder).addSerializerBinding(Span.class).to(SpanSerializer.class);
+                        jsonBinder(binder).addDeserializerBinding(Span.class).to(SpanDeserializer.class);
                     }
 
                     @Provides
@@ -573,12 +596,13 @@ private HttpRemoteTaskFactory createHttpRemoteTaskFactory(
                                 new QueryManagerConfig(),
                                 TASK_MANAGER_CONFIG,
                                 testingHttpClient,
-                                new TestSqlTaskManager.MockLocationFactory(),
+                                new BaseTestSqlTaskManager.MockLocationFactory(),
                                 taskStatusCodec,
                                 dynamicFilterDomainsCodec,
                                 taskInfoCodec,
                                 taskUpdateRequestCodec,
                                 failTaskRequestCodec,
+                                noopTracer(),
                                 new RemoteTaskStats(),
                                 dynamicFilterService);
                     }
@@ -862,11 +886,13 @@ private TaskStatus buildTaskStatus()
                     taskState,
                     initialTaskStatus.getSelf(),
                     "fake",
+                    false,
                     initialTaskStatus.getFailures(),
                     initialTaskStatus.getQueuedPartitionedDrivers(),
                     initialTaskStatus.getRunningPartitionedDrivers(),
                     initialTaskStatus.getOutputBufferStatus(),
                     initialTaskStatus.getOutputDataSize(),
+                    initialTaskStatus.getWriterInputDataSize(),
                     initialTaskStatus.getPhysicalWrittenDataSize(),
                     initialTaskStatus.getMaxWriterCount(),
                     initialTaskStatus.getMemoryReservation(),
diff --git a/core/trino-main/src/test/java/io/trino/server/security/TestCertificateConfig.java b/core/trino-main/src/test/java/io/trino/server/security/TestCertificateConfig.java
index 1face4ec07e0..148b9e5f1e6e 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/TestCertificateConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/TestCertificateConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server.security;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/core/trino-main/src/test/java/io/trino/server/security/TestHeaderAuthenticatorConfig.java b/core/trino-main/src/test/java/io/trino/server/security/TestHeaderAuthenticatorConfig.java
index 375864b1c009..297edbe68412 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/TestHeaderAuthenticatorConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/TestHeaderAuthenticatorConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/core/trino-main/src/test/java/io/trino/server/security/TestHeaderAuthenticatorManager.java b/core/trino-main/src/test/java/io/trino/server/security/TestHeaderAuthenticatorManager.java
index e36d5a08dff8..d71f0b15541e 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/TestHeaderAuthenticatorManager.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/TestHeaderAuthenticatorManager.java
@@ -19,7 +19,7 @@
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.HeaderAuthenticator;
 import io.trino.spi.security.HeaderAuthenticatorFactory;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/core/trino-main/src/test/java/io/trino/server/security/TestInsecureAuthenticatorConfig.java b/core/trino-main/src/test/java/io/trino/server/security/TestInsecureAuthenticatorConfig.java
index 0e081d2f5946..6b113a07519c 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/TestInsecureAuthenticatorConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/TestInsecureAuthenticatorConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server.security;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/core/trino-main/src/test/java/io/trino/server/security/TestKerberosConfig.java b/core/trino-main/src/test/java/io/trino/server/security/TestKerberosConfig.java
index 15200b47a8f7..0ab26ee72fc6 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/TestKerberosConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/TestKerberosConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server.security;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/core/trino-main/src/test/java/io/trino/server/security/TestPasswordAuthenticatorConfig.java b/core/trino-main/src/test/java/io/trino/server/security/TestPasswordAuthenticatorConfig.java
index 0ecf79e06f9a..4531b245be70 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/TestPasswordAuthenticatorConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/TestPasswordAuthenticatorConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server.security;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/core/trino-main/src/test/java/io/trino/server/security/TestPasswordAuthenticatorManager.java b/core/trino-main/src/test/java/io/trino/server/security/TestPasswordAuthenticatorManager.java
index a88261a806b8..0b981989fcf6 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/TestPasswordAuthenticatorManager.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/TestPasswordAuthenticatorManager.java
@@ -18,7 +18,7 @@
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.PasswordAuthenticator;
 import io.trino.spi.security.PasswordAuthenticatorFactory;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/core/trino-main/src/test/java/io/trino/server/security/TestResourceSecurity.java b/core/trino-main/src/test/java/io/trino/server/security/TestResourceSecurity.java
index 8edb799f95d9..475a39575f96 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/TestResourceSecurity.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/TestResourceSecurity.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Resources;
+import com.google.inject.Inject;
 import com.google.inject.Key;
 import com.google.inject.Module;
 import io.airlift.http.server.HttpServerConfig;
@@ -31,7 +32,6 @@
 import io.jsonwebtoken.JwtParser;
 import io.trino.plugin.base.security.AllowAllSystemAccessControl;
 import io.trino.security.AccessControl;
-import io.trino.security.AccessControlManager;
 import io.trino.server.HttpRequestSessionContextFactory;
 import io.trino.server.ProtocolConfig;
 import io.trino.server.protocol.PreparedStatementEncoder;
@@ -43,7 +43,12 @@
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.Identity;
-import io.trino.spi.security.SystemSecurityContext;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
 import okhttp3.Cookie;
 import okhttp3.CookieJar;
 import okhttp3.Credentials;
@@ -58,13 +63,6 @@
 import org.testng.annotations.Test;
 
 import javax.crypto.SecretKey;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
 
 import java.io.File;
 import java.io.IOException;
@@ -91,7 +89,6 @@
 import java.util.stream.Collectors;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
-import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.hash.Hashing.sha256;
 import static com.google.common.net.HttpHeaders.AUTHORIZATION;
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
@@ -108,21 +105,22 @@
 import static io.trino.server.security.jwt.JwtUtil.newJwtParserBuilder;
 import static io.trino.server.security.oauth2.OAuth2Service.NONCE;
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.UI_LOCATION;
+import static io.trino.server.ui.OAuthIdTokenCookie.ID_TOKEN_COOKIE;
 import static io.trino.server.ui.OAuthWebUiCookie.OAUTH2_COOKIE;
 import static io.trino.spi.security.AccessDeniedException.denyImpersonateUser;
 import static io.trino.spi.security.AccessDeniedException.denyReadSystemInformationAccess;
+import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;
+import static jakarta.servlet.http.HttpServletResponse.SC_OK;
+import static jakarta.servlet.http.HttpServletResponse.SC_SEE_OTHER;
+import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
+import static jakarta.ws.rs.core.HttpHeaders.LOCATION;
+import static jakarta.ws.rs.core.HttpHeaders.SET_COOKIE;
+import static jakarta.ws.rs.core.HttpHeaders.WWW_AUTHENTICATE;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.time.Instant.now;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MINUTES;
-import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
-import static javax.servlet.http.HttpServletResponse.SC_SEE_OTHER;
-import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
-import static javax.ws.rs.core.HttpHeaders.LOCATION;
-import static javax.ws.rs.core.HttpHeaders.SET_COOKIE;
-import static javax.ws.rs.core.HttpHeaders.WWW_AUTHENTICATE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -196,8 +194,8 @@ public void testInsecureAuthenticatorHttp()
     {
         try (TestingTrinoServer server = TestingTrinoServer.builder()
                 .setProperties(ImmutableMap.of("http-server.authentication.insecure.user-mapping.pattern", ALLOWED_USER_MAPPING_PATTERN))
+                .setSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION)
                 .build()) {
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
             assertInsecureAuthentication(httpServerInfo.getHttpUri());
         }
@@ -209,8 +207,8 @@ public void testInsecureAuthenticatorHttps()
     {
         try (TestingTrinoServer server = TestingTrinoServer.builder()
                 .setProperties(SECURE_PROPERTIES)
+                .setSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION)
                 .build()) {
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
             assertInsecureAuthentication(httpServerInfo.getHttpUri());
             assertInsecureAuthentication(httpServerInfo.getHttpsUri());
@@ -226,8 +224,8 @@ public void testInsecureAuthenticatorHttpsOnly()
                         .putAll(SECURE_PROPERTIES)
                         .put("http-server.authentication.allow-insecure-over-http", "false")
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION)
                 .build()) {
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
             assertAuthenticationDisabled(httpServerInfo.getHttpUri());
             assertInsecureAuthentication(httpServerInfo.getHttpsUri());
@@ -245,9 +243,9 @@ public void testPasswordAuthenticator()
                         .put("http-server.authentication.type", "password")
                         .put("http-server.authentication.password.user-mapping.pattern", ALLOWED_USER_MAPPING_PATTERN)
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION)
                 .build()) {
             server.getInstance(Key.get(PasswordAuthenticatorManager.class)).setAuthenticators(TestResourceSecurity::authenticate);
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
             assertAuthenticationDisabled(httpServerInfo.getHttpUri());
             assertPasswordAuthentication(httpServerInfo.getHttpsUri());
@@ -265,9 +263,9 @@ public void testMultiplePasswordAuthenticators()
                         .put("http-server.authentication.type", "password")
                         .put("http-server.authentication.password.user-mapping.pattern", ALLOWED_USER_MAPPING_PATTERN)
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION)
                 .build()) {
             server.getInstance(Key.get(PasswordAuthenticatorManager.class)).setAuthenticators(TestResourceSecurity::authenticate, TestResourceSecurity::authenticate2);
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
             assertAuthenticationDisabled(httpServerInfo.getHttpUri());
             assertPasswordAuthentication(httpServerInfo.getHttpsUri(), TEST_PASSWORD, TEST_PASSWORD2);
@@ -285,9 +283,9 @@ public void testMultiplePasswordAuthenticatorsMessages()
                         .put("http-server.authentication.type", "password")
                         .put("http-server.authentication.password.user-mapping.pattern", ALLOWED_USER_MAPPING_PATTERN)
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION)
                 .build()) {
             server.getInstance(Key.get(PasswordAuthenticatorManager.class)).setAuthenticators(TestResourceSecurity::authenticate, TestResourceSecurity::authenticate2);
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
             Request request = new Request.Builder()
                     .url(getAuthorizedUserLocation(httpServerInfo.getHttpsUri()))
@@ -312,9 +310,9 @@ public void testPasswordAuthenticatorUserMapping()
                         .put("http-server.authentication.password.user-mapping.pattern", ALLOWED_USER_MAPPING_PATTERN)
                         .buildOrThrow())
                 .setAdditionalModule(binder -> jaxrsBinder(binder).bind(TestResource.class))
+                .setSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION)
                 .build()) {
             server.getInstance(Key.get(PasswordAuthenticatorManager.class)).setAuthenticators(TestResourceSecurity::authenticate);
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
 
             // Test sets basic auth user and X-Trino-User, and the authenticator is performing user mapping.
@@ -345,9 +343,9 @@ public void testPasswordAuthenticatorWithInsecureHttp()
                         .put("http-server.authentication.allow-insecure-over-http", "true")
                         .put("http-server.authentication.password.user-mapping.pattern", ALLOWED_USER_MAPPING_PATTERN)
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION)
                 .build()) {
             server.getInstance(Key.get(PasswordAuthenticatorManager.class)).setAuthenticators(TestResourceSecurity::authenticate);
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
             assertInsecureAuthentication(httpServerInfo.getHttpUri());
             assertPasswordAuthentication(httpServerInfo.getHttpsUri());
@@ -367,9 +365,9 @@ public void testFixedManagerAuthenticatorHttpInsecureEnabledOnly()
                         .put("http-server.authentication.password.user-mapping.pattern", ALLOWED_USER_MAPPING_PATTERN)
                         .put("management.user", MANAGEMENT_USER)
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION)
                 .build()) {
             server.getInstance(Key.get(PasswordAuthenticatorManager.class)).setAuthenticators(TestResourceSecurity::authenticate);
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION);
 
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
             assertFixedManagementUser(httpServerInfo.getHttpUri(), true);
@@ -390,9 +388,9 @@ public void testFixedManagerAuthenticatorHttpInsecureDisabledOnly()
                         .put("http-server.authentication.password.user-mapping.pattern", ALLOWED_USER_MAPPING_PATTERN)
                         .put("management.user", MANAGEMENT_USER)
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION)
                 .build()) {
             server.getInstance(Key.get(PasswordAuthenticatorManager.class)).setAuthenticators(TestResourceSecurity::authenticate);
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION);
 
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
             assertResponseCode(client, getPublicLocation(httpServerInfo.getHttpUri()), SC_OK);
@@ -417,9 +415,9 @@ public void testFixedManagerAuthenticatorHttps()
                         .put("management.user", MANAGEMENT_USER)
                         .put("management.user.https-enabled", "true")
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION)
                 .build()) {
             server.getInstance(Key.get(PasswordAuthenticatorManager.class)).setAuthenticators(TestResourceSecurity::authenticate);
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.WITH_IMPERSONATION);
 
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
             assertFixedManagementUser(httpServerInfo.getHttpUri(), true);
@@ -438,8 +436,8 @@ public void testCertAuthenticator()
                         .put("http-server.https.truststore.path", LOCALHOST_KEYSTORE)
                         .put("http-server.https.truststore.key", "")
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION)
                 .build()) {
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
 
             assertAuthenticationDisabled(httpServerInfo.getHttpUri());
@@ -480,8 +478,8 @@ private void verifyJwtAuthenticator(Optional<String> principalField, Optional<Ob
                         .put("http-server.authentication.jwt.principal-field", principalField.orElse("sub"))
                         .put("http-server.authentication.jwt.required-audience", TRINO_AUDIENCE)
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION)
                 .build()) {
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
 
             assertAuthenticationDisabled(httpServerInfo.getHttpUri());
@@ -526,8 +524,8 @@ public void testJwtWithJwkAuthenticator()
                         .put("http-server.authentication.type", "jwt")
                         .put("http-server.authentication.jwt.key-file", jwkServer.getBaseUrl().toString())
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION)
                 .build()) {
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
 
             assertAuthenticationDisabled(httpServerInfo.getHttpUri());
@@ -562,8 +560,8 @@ public void testJwtAuthenticatorWithInvalidAudience()
                         .put("http-server.authentication.jwt.key-file", HMAC_KEY)
                         .put("http-server.authentication.jwt.required-audience", TRINO_AUDIENCE)
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION)
                 .build()) {
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
 
             SecretKey hmac = hmacShaKeyFor(Base64.getDecoder().decode(Files.readString(Paths.get(HMAC_KEY)).trim()));
@@ -596,8 +594,8 @@ private void verifyJwtAuthenticatorWithoutRequiredAudience(Optional<Object> audi
                         .put("http-server.authentication.type", "jwt")
                         .put("http-server.authentication.jwt.key-file", HMAC_KEY)
                         .buildOrThrow())
+                .setSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION)
                 .build()) {
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
 
             assertAuthenticationDisabled(httpServerInfo.getHttpUri());
@@ -653,8 +651,8 @@ private void verifyOAuth2Authenticator(boolean webUiEnabled, boolean refreshToke
                                 .put("http-server.authentication.oauth2.refresh-tokens", String.valueOf(refreshTokensEnabled))
                                 .buildOrThrow())
                         .setAdditionalModule(oauth2Module(tokenServer))
+                        .setSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION)
                         .build()) {
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
 
             assertAuthenticationDisabled(httpServerInfo.getHttpUri());
@@ -677,8 +675,8 @@ private void verifyOAuth2Authenticator(boolean webUiEnabled, boolean refreshToke
             if (refreshTokensEnabled) {
                 TokenPairSerializer serializer = server.getInstance(Key.get(TokenPairSerializer.class));
                 TokenPair tokenPair = serializer.deserialize(getOauthToken(client, bearer.getTokenServer()));
-                assertEquals(tokenPair.getAccessToken(), tokenServer.getAccessToken());
-                assertEquals(tokenPair.getRefreshToken(), Optional.of(tokenServer.getRefreshToken()));
+                assertEquals(tokenPair.accessToken(), tokenServer.getAccessToken());
+                assertEquals(tokenPair.refreshToken(), Optional.of(tokenServer.getRefreshToken()));
             }
             else {
                 assertEquals(getOauthToken(client, bearer.getTokenServer()), tokenServer.getAccessToken());
@@ -686,12 +684,20 @@ private void verifyOAuth2Authenticator(boolean webUiEnabled, boolean refreshToke
 
             // if Web UI is using oauth so we should get a cookie
             if (webUiEnabled) {
-                HttpCookie cookie = getOnlyElement(cookieManager.getCookieStore().getCookies());
+                HttpCookie cookie = getCookie(cookieManager, OAUTH2_COOKIE);
                 assertEquals(cookie.getValue(), tokenServer.getAccessToken());
                 assertEquals(cookie.getPath(), "/ui/");
                 assertEquals(cookie.getDomain(), baseUri.getHost());
                 assertTrue(cookie.getMaxAge() > 0 && cookie.getMaxAge() < MINUTES.toSeconds(5));
                 assertTrue(cookie.isHttpOnly());
+
+                HttpCookie idTokenCookie = getCookie(cookieManager, ID_TOKEN_COOKIE);
+                assertEquals(idTokenCookie.getValue(), tokenServer.issueIdToken(Optional.of(hashNonce(bearer.getNonceCookie().getValue()))));
+                assertEquals(idTokenCookie.getPath(), "/ui/");
+                assertEquals(idTokenCookie.getDomain(), baseUri.getHost());
+                assertTrue(idTokenCookie.getMaxAge() > 0 && cookie.getMaxAge() < MINUTES.toSeconds(5));
+                assertTrue(idTokenCookie.isHttpOnly());
+
                 cookieManager.getCookieStore().removeAll();
             }
             else {
@@ -787,8 +793,8 @@ public void testOAuth2Groups(Optional<Set<String>> groups)
                                 .put("deprecated.http-server.authentication.oauth2.groups-field", GROUPS_CLAIM)
                                 .buildOrThrow())
                         .setAdditionalModule(oauth2Module(tokenServer))
+                        .setSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION)
                         .build()) {
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
 
             String accessToken = tokenServer.issueAccessToken(groups);
@@ -854,25 +860,27 @@ public static Object[][] groups()
         };
     }
 
-    @Test
-    public void testJwtAndOAuth2AuthenticatorsSeparation()
+    @Test(dataProvider = "authenticators")
+    public void testJwtAndOAuth2AuthenticatorsSeparation(String authenticators)
             throws Exception
     {
         TestingHttpServer jwkServer = createTestingJwkServer();
         jwkServer.start();
-        try (TokenServer tokenServer = new TokenServer(Optional.empty());
+        try (TokenServer tokenServer = new TokenServer(Optional.of("preferred_username"));
                 TestingTrinoServer server = TestingTrinoServer.builder()
                         .setProperties(
                                 ImmutableMap.<String, String>builder()
                                         .putAll(SECURE_PROPERTIES)
-                                        .put("http-server.authentication.type", "jwt,oauth2")
+                                        .put("http-server.authentication.type", authenticators)
                                         .put("http-server.authentication.jwt.key-file", jwkServer.getBaseUrl().toString())
+                                        .put("http-server.authentication.jwt.principal-field", "sub")
                                         .putAll(getOAuth2Properties(tokenServer))
+                                        .put("http-server.authentication.oauth2.principal-field", "preferred_username")
                                         .put("web-ui.enabled", "true")
                                         .buildOrThrow())
                         .setAdditionalModule(oauth2Module(tokenServer))
+                        .setSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION)
                         .build()) {
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
 
             assertAuthenticationDisabled(httpServerInfo.getHttpUri());
@@ -901,6 +909,15 @@ public void testJwtAndOAuth2AuthenticatorsSeparation()
         }
     }
 
+    @DataProvider(name = "authenticators")
+    public static Object[][] authenticators()
+    {
+        return new Object[][] {
+                {"jwt,oauth2"},
+                {"oauth2,jwt"}
+        };
+    }
+
     @Test
     public void testJwtWithRefreshTokensForOAuth2Enabled()
             throws Exception
@@ -921,8 +938,8 @@ public void testJwtWithRefreshTokensForOAuth2Enabled()
                                         .put("web-ui.enabled", "true")
                                         .buildOrThrow())
                         .setAdditionalModule(oauth2Module(tokenServer))
+                        .setSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION)
                         .build()) {
-            server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION);
             HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
 
             assertAuthenticationDisabled(httpServerInfo.getHttpUri());
@@ -943,6 +960,38 @@ public void testJwtWithRefreshTokensForOAuth2Enabled()
         }
     }
 
+    @Test
+    public void testResourceSecurityImpersonation()
+            throws Exception
+    {
+        try (TestingTrinoServer server = TestingTrinoServer.builder()
+                .setProperties(ImmutableMap.<String, String>builder()
+                        .putAll(SECURE_PROPERTIES)
+                        .put("password-authenticator.config-files", passwordConfigDummy.toString())
+                        .put("http-server.authentication.type", "password")
+                        .put("http-server.authentication.password.user-mapping.pattern", ALLOWED_USER_MAPPING_PATTERN)
+                        .buildOrThrow())
+                .setAdditionalModule(binder -> jaxrsBinder(binder).bind(TestResource.class))
+                .setSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION)
+                .build()) {
+            server.getInstance(Key.get(PasswordAuthenticatorManager.class)).setAuthenticators(TestResourceSecurity::authenticate);
+            HttpServerInfo httpServerInfo = server.getInstance(Key.get(HttpServerInfo.class));
+
+            // Authenticated user TEST_USER_LOGIN impersonates impersonated-user by passing request header X-Trino-Authorization-User
+            Request request = new Request.Builder()
+                    .url(getLocation(httpServerInfo.getHttpsUri(), "/protocol/identity"))
+                    .addHeader("Authorization", Credentials.basic(TEST_USER_LOGIN, TEST_PASSWORD))
+                    .addHeader("X-Trino-Original-User", TEST_USER_LOGIN)
+                    .addHeader("X-Trino-User", "impersonated-user")
+                    .build();
+            try (Response response = client.newCall(request).execute()) {
+                assertEquals(response.code(), SC_OK);
+                assertEquals(response.header("user"), "impersonated-user");
+                assertEquals(response.header("principal"), TEST_USER_LOGIN);
+            }
+        }
+    }
+
     private static Module oauth2Module(TokenServer tokenServer)
     {
         return binder -> {
@@ -1028,7 +1077,7 @@ public Response getOAuth2Response(String code, URI callbackUri, Optional<String>
                     if (!"TEST_CODE".equals(code)) {
                         throw new IllegalArgumentException("Expected TEST_CODE");
                     }
-                    return new Response(accessToken, now().plus(5, ChronoUnit.MINUTES), Optional.of(issueIdToken(nonce.map(this::hashNonce))), Optional.of(REFRESH_TOKEN));
+                    return new Response(accessToken, now().plus(5, ChronoUnit.MINUTES), Optional.of(issueIdToken(nonce.map(TestResourceSecurity::hashNonce))), Optional.of(REFRESH_TOKEN));
                 }
 
                 @Override
@@ -1044,11 +1093,10 @@ public Response refreshTokens(String refreshToken)
                     throw new UnsupportedOperationException("refresh tokens not supported");
                 }
 
-                private String hashNonce(String nonce)
+                @Override
+                public Optional<URI> getLogoutEndpoint(Optional<String> idToken, URI callbackUrl)
                 {
-                    return sha256()
-                            .hashString(nonce, UTF_8)
-                            .toString();
+                    return Optional.empty();
                 }
             };
         }
@@ -1120,7 +1168,7 @@ private String issueIdToken(Optional<String> nonceHash)
         }
     }
 
-    @javax.ws.rs.Path("/")
+    @jakarta.ws.rs.Path("/")
     public static class TestResource
     {
         private final HttpRequestSessionContextFactory sessionContextFactory;
@@ -1137,24 +1185,24 @@ public TestResource(AccessControl accessControl)
 
         @ResourceSecurity(AUTHENTICATED_USER)
         @GET
-        @javax.ws.rs.Path("/protocol/identity")
-        public javax.ws.rs.core.Response protocolIdentity(@Context HttpServletRequest servletRequest, @Context HttpHeaders httpHeaders)
+        @jakarta.ws.rs.Path("/protocol/identity")
+        public jakarta.ws.rs.core.Response protocolIdentity(@Context HttpServletRequest servletRequest, @Context HttpHeaders httpHeaders)
         {
             return echoIdentity(servletRequest, httpHeaders);
         }
 
         @ResourceSecurity(WEB_UI)
         @GET
-        @javax.ws.rs.Path("/ui/api/identity")
-        public javax.ws.rs.core.Response webUiIdentity(@Context HttpServletRequest servletRequest, @Context HttpHeaders httpHeaders)
+        @jakarta.ws.rs.Path("/ui/api/identity")
+        public jakarta.ws.rs.core.Response webUiIdentity(@Context HttpServletRequest servletRequest, @Context HttpHeaders httpHeaders)
         {
             return echoIdentity(servletRequest, httpHeaders);
         }
 
-        public javax.ws.rs.core.Response echoIdentity(HttpServletRequest servletRequest, HttpHeaders httpHeaders)
+        public jakarta.ws.rs.core.Response echoIdentity(HttpServletRequest servletRequest, HttpHeaders httpHeaders)
         {
             Identity identity = sessionContextFactory.extractAuthorizedIdentity(servletRequest, httpHeaders, Optional.empty());
-            return javax.ws.rs.core.Response.ok()
+            return jakarta.ws.rs.core.Response.ok()
                     .header("user", identity.getUser())
                     .header("principal", identity.getPrincipal().map(Principal::getName).orElse(null))
                     .header("groups", toHeader(identity.getGroups()))
@@ -1356,6 +1404,21 @@ private static Principal authenticate2(String user, String password)
         throw new AccessDeniedException("Invalid credentials2");
     }
 
+    private static HttpCookie getCookie(CookieManager cookieManager, String cookieName)
+    {
+        return cookieManager.getCookieStore().getCookies().stream()
+                .filter(cookie -> cookie.getName().equals(cookieName))
+                .findFirst()
+                .orElseThrow();
+    }
+
+    private static String hashNonce(String nonce)
+    {
+        return sha256()
+                .hashString(nonce, UTF_8)
+                .toString();
+    }
+
     private static class TestSystemAccessControl
             extends AllowAllSystemAccessControl
     {
@@ -1370,17 +1433,17 @@ private TestSystemAccessControl(boolean allowImpersonation)
         }
 
         @Override
-        public void checkCanImpersonateUser(SystemSecurityContext context, String userName)
+        public void checkCanImpersonateUser(Identity identity, String userName)
         {
             if (!allowImpersonation) {
-                denyImpersonateUser(context.getIdentity().getUser(), userName);
+                denyImpersonateUser(identity.getUser(), userName);
             }
         }
 
         @Override
-        public void checkCanReadSystemInformation(SystemSecurityContext context)
+        public void checkCanReadSystemInformation(Identity identity)
         {
-            if (!context.getIdentity().getUser().equals(MANAGEMENT_USER)) {
+            if (!identity.getUser().equals(MANAGEMENT_USER)) {
                 denyReadSystemInformationAccess();
             }
         }
diff --git a/core/trino-main/src/test/java/io/trino/server/security/TestSecurityConfig.java b/core/trino-main/src/test/java/io/trino/server/security/TestSecurityConfig.java
index 5b7b32966197..975d92a6554a 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/TestSecurityConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/TestSecurityConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/server/security/TestUserMapping.java b/core/trino-main/src/test/java/io/trino/server/security/TestUserMapping.java
index 46496736e7df..3773976a8410 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/TestUserMapping.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/TestUserMapping.java
@@ -16,8 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Resources;
 import io.trino.server.security.UserMapping.Rule;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.net.URISyntaxException;
@@ -30,10 +29,9 @@
 
 public class TestUserMapping
 {
-    private File testFile;
+    private final File testFile;
 
-    @BeforeClass
-    public void setUp()
+    public TestUserMapping()
             throws URISyntaxException
     {
         testFile = new File(Resources.getResource("user-mapping.json").toURI());
diff --git a/core/trino-main/src/test/java/io/trino/server/security/jwt/TestJwkDecoder.java b/core/trino-main/src/test/java/io/trino/server/security/jwt/TestJwkDecoder.java
index 9e117108730c..166324ea0287 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/jwt/TestJwkDecoder.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/jwt/TestJwkDecoder.java
@@ -21,7 +21,7 @@
 import io.jsonwebtoken.SigningKeyResolver;
 import io.trino.server.security.jwt.JwkDecoder.JwkEcPublicKey;
 import io.trino.server.security.jwt.JwkDecoder.JwkRsaPublicKey;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.security.Key;
@@ -208,12 +208,12 @@ public Key resolveSigningKey(JwsHeader header, Claims claims)
                     }
 
                     @Override
-                    public Key resolveSigningKey(JwsHeader header, String plaintext)
+                    public Key resolveSigningKey(JwsHeader header, byte[] plaintext)
                     {
                         return getKey(header);
                     }
 
-                    private Key getKey(JwsHeader<?> header)
+                    private Key getKey(JwsHeader header)
                     {
                         String keyId = header.getKeyId();
                         assertEquals(keyId, "test-rsa");
@@ -344,12 +344,12 @@ public Key resolveSigningKey(JwsHeader header, Claims claims)
                     }
 
                     @Override
-                    public Key resolveSigningKey(JwsHeader header, String plaintext)
+                    public Key resolveSigningKey(JwsHeader header, byte[] plaintext)
                     {
                         return getKey(header);
                     }
 
-                    private Key getKey(JwsHeader<?> header)
+                    private Key getKey(JwsHeader header)
                     {
                         String keyId = header.getKeyId();
                         assertEquals(keyId, keyName);
diff --git a/core/trino-main/src/test/java/io/trino/server/security/jwt/TestJwkService.java b/core/trino-main/src/test/java/io/trino/server/security/jwt/TestJwkService.java
index b699e201df6b..a6c806c67f2a 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/jwt/TestJwkService.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/jwt/TestJwkService.java
@@ -18,7 +18,7 @@
 import io.airlift.http.client.Response;
 import io.airlift.http.client.testing.TestingHttpClient;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.security.PublicKey;
diff --git a/core/trino-main/src/test/java/io/trino/server/security/jwt/TestJwtAuthenticatorConfig.java b/core/trino-main/src/test/java/io/trino/server/security/jwt/TestJwtAuthenticatorConfig.java
index a83d74d76442..7a48ad4b3b55 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/jwt/TestJwtAuthenticatorConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/jwt/TestJwtAuthenticatorConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server.security.jwt;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/core/trino-main/src/test/java/io/trino/server/security/oauth2/BaseOAuth2WebUiAuthenticationFilterTest.java b/core/trino-main/src/test/java/io/trino/server/security/oauth2/BaseOAuth2WebUiAuthenticationFilterTest.java
index f8a2ea207854..72a57e0f212d 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/oauth2/BaseOAuth2WebUiAuthenticationFilterTest.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/oauth2/BaseOAuth2WebUiAuthenticationFilterTest.java
@@ -15,10 +15,18 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.io.Resources;
 import com.google.inject.Key;
+import io.airlift.http.client.HttpClientConfig;
+import io.airlift.http.client.jetty.JettyHttpClient;
 import io.airlift.log.Level;
 import io.airlift.log.Logging;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jws;
 import io.jsonwebtoken.impl.DefaultClaims;
+import io.trino.server.security.jwt.JwkService;
+import io.trino.server.security.jwt.JwkSigningKeyResolver;
 import io.trino.server.testing.TestingTrinoServer;
 import io.trino.server.ui.OAuth2WebUiAuthenticationFilter;
 import io.trino.server.ui.WebUiModule;
@@ -29,9 +37,10 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.net.CookieManager;
@@ -45,22 +54,27 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 
 import static io.airlift.testing.Closeables.closeAll;
 import static io.trino.client.OkHttpUtil.setupInsecureSsl;
 import static io.trino.server.security.jwt.JwtUtil.newJwtBuilder;
+import static io.trino.server.security.jwt.JwtUtil.newJwtParserBuilder;
 import static io.trino.server.security.oauth2.TokenEndpointAuthMethod.CLIENT_SECRET_BASIC;
+import static io.trino.server.ui.OAuthIdTokenCookie.ID_TOKEN_COOKIE;
 import static io.trino.server.ui.OAuthWebUiCookie.OAUTH2_COOKIE;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
-import static javax.ws.rs.core.HttpHeaders.LOCATION;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.SEE_OTHER;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static jakarta.servlet.http.HttpServletResponse.SC_OK;
+import static jakarta.ws.rs.core.HttpHeaders.LOCATION;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.SEE_OTHER;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public abstract class BaseOAuth2WebUiAuthenticationFilterTest
 {
     protected static final Duration TTL_ACCESS_TOKEN_IN_SECONDS = Duration.ofSeconds(5);
@@ -75,29 +89,25 @@ public abstract class BaseOAuth2WebUiAuthenticationFilterTest
     private static final String UNTRUSTED_CLIENT_SECRET = "untrusted-secret";
     private static final String UNTRUSTED_CLIENT_AUDIENCE = "https://untrusted.com";
 
-    private final Logging logging = Logging.initialize();
-    protected final OkHttpClient httpClient;
+    protected OkHttpClient httpClient;
     protected TestingHydraIdentityProvider hydraIdP;
-
     private TestingTrinoServer server;
     private URI serverUri;
     private URI uiUri;
 
-    protected BaseOAuth2WebUiAuthenticationFilterTest()
-    {
-        OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
-        setupInsecureSsl(httpClientBuilder);
-        httpClientBuilder.followRedirects(false);
-        httpClient = httpClientBuilder.build();
-    }
-
-    @BeforeClass
+    @BeforeAll
     public void setup()
             throws Exception
     {
+        Logging logging = Logging.initialize();
         logging.setLevel(OAuth2WebUiAuthenticationFilter.class.getName(), Level.DEBUG);
         logging.setLevel(OAuth2Service.class.getName(), Level.DEBUG);
 
+        OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
+        setupInsecureSsl(httpClientBuilder);
+        httpClientBuilder.followRedirects(false);
+        httpClient = httpClientBuilder.build();
+
         hydraIdP = getHydraIdp();
         String idpUrl = "https://localhost:" + hydraIdP.getAuthPort();
 
@@ -116,35 +126,47 @@ public void setup()
                 TRINO_CLIENT_SECRET,
                 CLIENT_SECRET_BASIC,
                 ImmutableList.of(TRINO_AUDIENCE, ADDITIONAL_AUDIENCE),
-                serverUri + "/oauth2/callback");
+                serverUri + "/oauth2/callback",
+                serverUri + "/ui/logout/logout.html");
         hydraIdP.createClient(
                 TRUSTED_CLIENT_ID,
                 TRUSTED_CLIENT_SECRET,
                 CLIENT_SECRET_BASIC,
                 ImmutableList.of(TRUSTED_CLIENT_ID),
-                serverUri + "/oauth2/callback");
+                serverUri + "/oauth2/callback",
+                serverUri + "/ui/logout/logout.html");
         hydraIdP.createClient(
                 UNTRUSTED_CLIENT_ID,
                 UNTRUSTED_CLIENT_SECRET,
                 CLIENT_SECRET_BASIC,
                 ImmutableList.of(UNTRUSTED_CLIENT_AUDIENCE),
-                "https://untrusted.com/callback");
+                "https://untrusted.com/callback",
+                "https://untrusted.com/logout_callback");
     }
 
-    protected abstract ImmutableMap<String, String> getOAuth2Config(String idpUrl);
+    protected abstract Map<String, String> getOAuth2Config(String idpUrl);
 
     protected abstract TestingHydraIdentityProvider getHydraIdp()
             throws Exception;
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
+        Logging logging = Logging.initialize();
         logging.clearLevel(OAuth2WebUiAuthenticationFilter.class.getName());
         logging.clearLevel(OAuth2Service.class.getName());
-        closeAll(server, hydraIdP);
+
+        closeAll(
+                server,
+                hydraIdP,
+                () -> {
+                    httpClient.dispatcher().executorService().shutdown();
+                    httpClient.connectionPool().evictAll();
+                });
         server = null;
         hydraIdP = null;
+        httpClient = null;
     }
 
     @Test
@@ -188,7 +210,7 @@ public void testUnsignedToken()
                                         .put("exp", now + 60L)
                                         .put("iat", now)
                                         .put("iss", "https://hydra:4444/")
-                                        .put("jti", UUID.randomUUID())
+                                        .put("jti", UUID.randomUUID().toString())
                                         .put("nbf", now)
                                         .put("scp", ImmutableList.of("openid"))
                                         .put("sub", "foo@bar.com")
@@ -247,22 +269,40 @@ public void testSuccessfulFlow()
         assertThat(cookieStore.get(uiUri)).isEmpty();
 
         // access UI and follow redirects in order to get OAuth2 cookie
-        Response response = httpClient.newCall(
+        try (Response response = httpClient.newCall(
                 new Request.Builder()
                         .url(uiUri.toURL())
                         .get()
                         .build())
-                .execute();
-
-        assertEquals(response.code(), SC_OK);
-        assertEquals(response.request().url().toString(), uiUri.toString());
+                .execute()) {
+            assertEquals(response.code(), SC_OK);
+            assertEquals(response.request().url().toString(), uiUri.toString());
+        }
         Optional<HttpCookie> oauth2Cookie = cookieStore.get(uiUri)
                 .stream()
                 .filter(cookie -> cookie.getName().equals(OAUTH2_COOKIE))
                 .findFirst();
         assertThat(oauth2Cookie).isNotEmpty();
-        assertTrinoCookie(oauth2Cookie.get());
+        assertTrinoOAuth2Cookie(oauth2Cookie.get());
         assertUICallWithCookie(oauth2Cookie.get().getValue());
+
+        Optional<HttpCookie> idTokenCookie = cookieStore.get(uiUri)
+                .stream()
+                .filter(cookie -> cookie.getName().equals(ID_TOKEN_COOKIE))
+                .findFirst();
+        assertThat(idTokenCookie).isNotEmpty();
+        assertIdTokenCookie(idTokenCookie.get());
+
+        try (Response response = httpClient.newCall(
+                        new Request.Builder()
+                                .url(uiUri.resolve("logout").toURL())
+                                .get()
+                                .build())
+                .execute()) {
+            assertEquals(response.code(), SC_OK);
+            assertEquals(response.request().url().toString(), uiUri.resolve("logout/logout.html").toString());
+        }
+        assertThat(cookieStore.get(uiUri)).isEmpty();
     }
 
     @Test
@@ -291,19 +331,50 @@ private Request.Builder apiCall()
                 .get();
     }
 
-    private void assertTrinoCookie(HttpCookie cookie)
+    private void assertTrinoOAuth2Cookie(HttpCookie cookie)
     {
         assertThat(cookie.getName()).isEqualTo(OAUTH2_COOKIE);
+        assertCookieAttributes(cookie);
+        validateAccessToken(cookie.getValue());
+    }
+
+    private void assertIdTokenCookie(HttpCookie cookie)
+    {
+        assertThat(cookie.getName()).isEqualTo(ID_TOKEN_COOKIE);
+        assertCookieAttributes(cookie);
+        String idToken = cookie.getValue();
+
+        assertThat(idToken).isNotBlank();
+
+        Jws<Claims> jwt = parseJwsClaims(idToken);
+        Claims claims = jwt.getBody();
+        assertThat(claims.getSubject()).isEqualTo("foo@bar.com");
+        assertThat(claims.getAudience()).isEqualTo(ImmutableSet.of(TRINO_CLIENT_ID));
+        assertThat(claims.getIssuer()).isEqualTo("https://localhost:4444/");
+    }
+
+    private void assertCookieAttributes(HttpCookie cookie)
+    {
         assertThat(cookie.getDomain()).isIn("127.0.0.1", "::1");
         assertThat(cookie.getPath()).isEqualTo("/ui/");
         assertThat(cookie.getSecure()).isTrue();
         assertThat(cookie.isHttpOnly()).isTrue();
         assertThat(cookie.getMaxAge()).isLessThanOrEqualTo(TTL_ACCESS_TOKEN_IN_SECONDS.getSeconds());
-        validateAccessToken(cookie.getValue());
     }
 
     protected abstract void validateAccessToken(String accessToken);
 
+    protected Jws<Claims> parseJwsClaims(String claimsJws)
+    {
+        return newJwtParserBuilder()
+                .setSigningKeyResolver(new JwkSigningKeyResolver(new JwkService(
+                        URI.create("https://localhost:" + hydraIdP.getAuthPort() + "/.well-known/jwks.json"),
+                        new JettyHttpClient(new HttpClientConfig()
+                                .setTrustStorePath(Resources.getResource("cert/localhost.pem").getPath())))))
+                .build()
+                .parseClaimsJws(claimsJws);
+    }
+
     private void assertUICallWithCookie(String cookieValue)
             throws IOException
     {
@@ -315,7 +386,6 @@ private void assertUICallWithCookie(String cookieValue)
         }
     }
 
-    @SuppressWarnings("NullableProblems")
     private OkHttpClient httpClientWithOAuth2Cookie(String cookieValue, boolean followRedirects)
     {
         OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
diff --git a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestJweTokenSerializer.java b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestJweTokenSerializer.java
index 489891b983ff..adfeb76d2c9a 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestJweTokenSerializer.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestJweTokenSerializer.java
@@ -18,21 +18,25 @@
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.Jwts;
 import io.trino.server.security.oauth2.TokenPairSerializer.TokenPair;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.net.URI;
 import java.security.GeneralSecurityException;
+import java.security.SecureRandom;
 import java.time.Clock;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.Base64;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Random;
 
 import static io.airlift.units.Duration.succinctDuration;
-import static io.trino.server.security.oauth2.TokenPairSerializer.TokenPair.accessAndRefreshTokens;
+import static io.trino.server.security.oauth2.TokenPairSerializer.TokenPair.withAccessAndRefreshTokens;
 import static java.time.temporal.ChronoUnit.MILLIS;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -45,15 +49,74 @@ public class TestJweTokenSerializer
     public void testSerialization()
             throws Exception
     {
-        JweTokenSerializer serializer = tokenSerializer(Clock.systemUTC(), succinctDuration(5, SECONDS));
+        JweTokenSerializer serializer = tokenSerializer(Clock.systemUTC(), succinctDuration(5, SECONDS), randomEncodedSecret());
 
         Date expiration = new Calendar.Builder().setDate(2022, 6, 22).build().getTime();
-        String serializedTokenPair = serializer.serialize(accessAndRefreshTokens("access_token", expiration, "refresh_token"));
+        String serializedTokenPair = serializer.serialize(withAccessAndRefreshTokens("access_token", expiration, "refresh_token"));
         TokenPair deserializedTokenPair = serializer.deserialize(serializedTokenPair);
 
-        assertThat(deserializedTokenPair.getAccessToken()).isEqualTo("access_token");
-        assertThat(deserializedTokenPair.getExpiration()).isEqualTo(expiration);
-        assertThat(deserializedTokenPair.getRefreshToken()).isEqualTo(Optional.of("refresh_token"));
+        assertThat(deserializedTokenPair.accessToken()).isEqualTo("access_token");
+        assertThat(deserializedTokenPair.expiration()).isEqualTo(expiration);
+        assertThat(deserializedTokenPair.refreshToken()).isEqualTo(Optional.of("refresh_token"));
+    }
+
+    @Test(dataProvider = "wrongSecretsProvider")
+    public void testDeserializationWithWrongSecret(String encryptionSecret, String decryptionSecret)
+    {
+        assertThatThrownBy(() -> assertRoundTrip(Optional.ofNullable(encryptionSecret), Optional.ofNullable(decryptionSecret)))
+                .isInstanceOf(RuntimeException.class)
+                .hasMessageContaining("decryption failed: Tag mismatch");
+    }
+
+    @DataProvider
+    public Object[][] wrongSecretsProvider()
+    {
+        return new Object[][]{
+                {randomEncodedSecret(), randomEncodedSecret()},
+                {randomEncodedSecret(16), randomEncodedSecret(24)},
+                {null, null}, // This will generate two different secret keys
+                {null, randomEncodedSecret()},
+                {randomEncodedSecret(), null}
+        };
+    }
+
+    @Test
+    public void testSerializationDeserializationRoundTripWithDifferentKeyLengths()
+            throws Exception
+    {
+        for (int keySize : new int[] {16, 24, 32}) {
+            String secret = randomEncodedSecret(keySize);
+            assertRoundTrip(secret, secret);
+        }
+    }
+
+    @Test
+    public void testSerializationFailsWithWrongKeySize()
+    {
+        for (int wrongKeySize : new int[] {8, 64, 128}) {
+            String tooShortSecret = randomEncodedSecret(wrongKeySize);
+            assertThatThrownBy(() -> assertRoundTrip(tooShortSecret, tooShortSecret))
+                    .hasStackTraceContaining("Secret key size must be either 16, 24 or 32 bytes but was " + wrongKeySize);
+        }
+    }
+
+    private void assertRoundTrip(String serializerSecret, String deserializerSecret)
+            throws Exception
+    {
+        assertRoundTrip(Optional.of(serializerSecret), Optional.of(deserializerSecret));
+    }
+
+    private void assertRoundTrip(Optional<String> serializerSecret, Optional<String> deserializerSecret)
+            throws Exception
+    {
+        JweTokenSerializer serializer = tokenSerializer(Clock.systemUTC(), succinctDuration(5, SECONDS), serializerSecret);
+        JweTokenSerializer deserializer = tokenSerializer(Clock.systemUTC(), succinctDuration(5, SECONDS), deserializerSecret);
+
+        Date expiration = new Calendar.Builder().setDate(2023, 6, 22).build().getTime();
+
+        TokenPair tokenPair = withAccessAndRefreshTokens(randomEncodedSecret(), expiration, randomEncodedSecret());
+        assertThat(deserializer.deserialize(serializer.serialize(tokenPair)))
+                .isEqualTo(tokenPair);
     }
 
     @Test
@@ -63,15 +126,16 @@ public void testTokenDeserializationAfterTimeoutButBeforeExpirationExtension()
         TestingClock clock = new TestingClock();
         JweTokenSerializer serializer = tokenSerializer(
                 clock,
-                succinctDuration(12, MINUTES));
+                succinctDuration(12, MINUTES),
+                randomEncodedSecret());
         Date expiration = new Calendar.Builder().setDate(2022, 6, 22).build().getTime();
-        String serializedTokenPair = serializer.serialize(accessAndRefreshTokens("access_token", expiration, "refresh_token"));
+        String serializedTokenPair = serializer.serialize(withAccessAndRefreshTokens("access_token", expiration, "refresh_token"));
         clock.advanceBy(succinctDuration(10, MINUTES));
         TokenPair deserializedTokenPair = serializer.deserialize(serializedTokenPair);
 
-        assertThat(deserializedTokenPair.getAccessToken()).isEqualTo("access_token");
-        assertThat(deserializedTokenPair.getExpiration()).isEqualTo(expiration);
-        assertThat(deserializedTokenPair.getRefreshToken()).isEqualTo(Optional.of("refresh_token"));
+        assertThat(deserializedTokenPair.accessToken()).isEqualTo("access_token");
+        assertThat(deserializedTokenPair.expiration()).isEqualTo(expiration);
+        assertThat(deserializedTokenPair.refreshToken()).isEqualTo(Optional.of("refresh_token"));
     }
 
     @Test
@@ -82,9 +146,10 @@ public void testTokenDeserializationAfterTimeoutAndExpirationExtension()
 
         JweTokenSerializer serializer = tokenSerializer(
                 clock,
-                succinctDuration(12, MINUTES));
+                succinctDuration(12, MINUTES),
+                randomEncodedSecret());
         Date expiration = new Calendar.Builder().setDate(2022, 6, 22).build().getTime();
-        String serializedTokenPair = serializer.serialize(accessAndRefreshTokens("access_token", expiration, "refresh_token"));
+        String serializedTokenPair = serializer.serialize(withAccessAndRefreshTokens("access_token", expiration, "refresh_token"));
 
         clock.advanceBy(succinctDuration(20, MINUTES));
         assertThatThrownBy(() -> serializer.deserialize(serializedTokenPair))
@@ -95,20 +160,28 @@ public void testTokenDeserializationAfterTimeoutAndExpirationExtension()
     public void testTokenDeserializationWhenNonJWETokenIsPassed()
             throws Exception
     {
-        JweTokenSerializer serializer = tokenSerializer(new TestingClock(), succinctDuration(12, MINUTES));
+        JweTokenSerializer serializer = tokenSerializer(new TestingClock(), succinctDuration(12, MINUTES), randomEncodedSecret());
         String nonJWEToken = "non_jwe_token";
 
         TokenPair tokenPair = serializer.deserialize(nonJWEToken);
 
-        assertThat(tokenPair.getAccessToken()).isEqualTo(nonJWEToken);
-        assertThat(tokenPair.getRefreshToken()).isEmpty();
+        assertThat(tokenPair.accessToken()).isEqualTo(nonJWEToken);
+        assertThat(tokenPair.refreshToken()).isEmpty();
+    }
+
+    private JweTokenSerializer tokenSerializer(Clock clock, Duration tokenExpiration, String encodedSecretKey)
+            throws GeneralSecurityException, KeyLengthException
+    {
+        return tokenSerializer(clock, tokenExpiration, Optional.of(encodedSecretKey));
     }
 
-    private JweTokenSerializer tokenSerializer(Clock clock, Duration tokenExpiration)
+    private JweTokenSerializer tokenSerializer(Clock clock, Duration tokenExpiration, Optional<String> secretKey)
             throws GeneralSecurityException, KeyLengthException
     {
+        RefreshTokensConfig refreshTokensConfig = new RefreshTokensConfig();
+        secretKey.ifPresent(refreshTokensConfig::setSecretKey);
         return new JweTokenSerializer(
-                new RefreshTokensConfig(),
+                refreshTokensConfig,
                 new Oauth2ClientStub(),
                 "trino_coordinator_test_version",
                 "trino_coordinator",
@@ -121,7 +194,8 @@ static class Oauth2ClientStub
             implements OAuth2Client
     {
         private final Map<String, Object> claims = Jwts.claims()
-                .setSubject("user");
+                .subject("user")
+                .build();
 
         @Override
         public void load()
@@ -151,6 +225,12 @@ public Response refreshTokens(String refreshToken)
         {
             throw new UnsupportedOperationException("operation is not yet supported");
         }
+
+        @Override
+        public Optional<URI> getLogoutEndpoint(Optional<String> idToken, URI callbackUrl)
+        {
+            return Optional.empty();
+        }
     }
 
     private static class TestingClock
@@ -181,4 +261,17 @@ public void advanceBy(Duration currentTimeDelta)
             this.currentTime = currentTime.plus(currentTimeDelta.toMillis(), MILLIS);
         }
     }
+
+    private static String randomEncodedSecret()
+    {
+        return randomEncodedSecret(24);
+    }
+
+    private static String randomEncodedSecret(int length)
+    {
+        Random random = new SecureRandom();
+        final byte[] buffer = new byte[length];
+        random.nextBytes(buffer);
+        return Base64.getEncoder().encodeToString(buffer);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2Config.java b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2Config.java
index a9cfdfba4452..2c0eb66e3709 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2Config.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2Config.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -46,6 +46,7 @@ public void testDefaults()
                 .setGroupsField(null)
                 .setAdditionalAudiences(Collections.emptyList())
                 .setMaxClockSkew(new Duration(1, MINUTES))
+                .setJwtType(null)
                 .setUserMappingPattern(null)
                 .setUserMappingFile(null)
                 .setEnableRefreshTokens(false)
@@ -68,6 +69,7 @@ public void testExplicitPropertyMappings()
                 .put("http-server.authentication.oauth2.additional-audiences", "test-aud1,test-aud2")
                 .put("http-server.authentication.oauth2.challenge-timeout", "90s")
                 .put("http-server.authentication.oauth2.max-clock-skew", "15s")
+                .put("http-server.authentication.oauth2.jwt-type", "at+jwt")
                 .put("http-server.authentication.oauth2.user-mapping.pattern", "(.*)@something")
                 .put("http-server.authentication.oauth2.user-mapping.file", userMappingFile.toString())
                 .put("http-server.authentication.oauth2.refresh-tokens", "true")
@@ -85,6 +87,7 @@ public void testExplicitPropertyMappings()
                 .setAdditionalAudiences(List.of("test-aud1", "test-aud2"))
                 .setChallengeTimeout(new Duration(90, SECONDS))
                 .setMaxClockSkew(new Duration(15, SECONDS))
+                .setJwtType("at+jwt")
                 .setUserMappingPattern("(.*)@something")
                 .setUserMappingFile(userMappingFile.toFile())
                 .setEnableRefreshTokens(true)
diff --git a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilterWithJwt.java b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilterWithJwt.java
index 2160984f3b86..4a4595b4d47c 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilterWithJwt.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilterWithJwt.java
@@ -15,23 +15,18 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Resources;
-import io.airlift.http.client.HttpClientConfig;
-import io.airlift.http.client.jetty.JettyHttpClient;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jws;
-import io.trino.server.security.jwt.JwkService;
-import io.trino.server.security.jwt.JwkSigningKeyResolver;
 
-import java.net.URI;
+import java.util.Map;
 
-import static io.trino.server.security.jwt.JwtUtil.newJwtParserBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestOAuth2WebUiAuthenticationFilterWithJwt
         extends BaseOAuth2WebUiAuthenticationFilterTest
 {
     @Override
-    protected ImmutableMap<String, String> getOAuth2Config(String idpUrl)
+    protected Map<String, String> getOAuth2Config(String idpUrl)
     {
         return ImmutableMap.<String, String>builder()
                 .put("web-ui.enabled", "true")
@@ -42,6 +37,7 @@ protected ImmutableMap<String, String> getOAuth2Config(String idpUrl)
                 .put("http-server.authentication.oauth2.issuer", "https://localhost:4444/")
                 .put("http-server.authentication.oauth2.auth-url", idpUrl + "/oauth2/auth")
                 .put("http-server.authentication.oauth2.token-url", idpUrl + "/oauth2/token")
+                .put("http-server.authentication.oauth2.end-session-url", idpUrl + "/oauth2/sessions/logout")
                 .put("http-server.authentication.oauth2.jwks-url", idpUrl + "/.well-known/jwks.json")
                 .put("http-server.authentication.oauth2.client-id", TRINO_CLIENT_ID)
                 .put("http-server.authentication.oauth2.client-secret", TRINO_CLIENT_SECRET)
@@ -67,13 +63,7 @@ protected TestingHydraIdentityProvider getHydraIdp()
     protected void validateAccessToken(String cookieValue)
     {
         assertThat(cookieValue).isNotBlank();
-        Jws<Claims> jwt = newJwtParserBuilder()
-                .setSigningKeyResolver(new JwkSigningKeyResolver(new JwkService(
-                        URI.create("https://localhost:" + hydraIdP.getAuthPort() + "/.well-known/jwks.json"),
-                        new JettyHttpClient(new HttpClientConfig()
-                                .setTrustStorePath(Resources.getResource("cert/localhost.pem").getPath())))))
-                .build()
-                .parseClaimsJws(cookieValue);
+        Jws<Claims> jwt = parseJwsClaims(cookieValue);
         Claims claims = jwt.getBody();
         assertThat(claims.getSubject()).isEqualTo("foo@bar.com");
         assertThat(claims.get("client_id")).isEqualTo(TRINO_CLIENT_ID);
diff --git a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilterWithOpaque.java b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilterWithOpaque.java
index 2ea1b21cd76c..0c4e3afcba13 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilterWithOpaque.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilterWithOpaque.java
@@ -21,17 +21,18 @@
 import okhttp3.Response;
 
 import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
 
-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
+import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.assertj.core.api.InstanceOfAssertFactories.list;
 
 public class TestOAuth2WebUiAuthenticationFilterWithOpaque
         extends BaseOAuth2WebUiAuthenticationFilterTest
 {
     @Override
-    protected ImmutableMap<String, String> getOAuth2Config(String idpUrl)
+    protected Map<String, String> getOAuth2Config(String idpUrl)
     {
         return ImmutableMap.<String, String>builder()
                 .put("web-ui.enabled", "true")
@@ -42,6 +43,7 @@ protected ImmutableMap<String, String> getOAuth2Config(String idpUrl)
                 .put("http-server.authentication.oauth2.issuer", "https://localhost:4444/")
                 .put("http-server.authentication.oauth2.auth-url", idpUrl + "/oauth2/auth")
                 .put("http-server.authentication.oauth2.token-url", idpUrl + "/oauth2/token")
+                .put("http-server.authentication.oauth2.end-session-url", idpUrl + "/oauth2/sessions/logout")
                 .put("http-server.authentication.oauth2.jwks-url", idpUrl + "/.well-known/jwks.json")
                 .put("http-server.authentication.oauth2.userinfo-url", idpUrl + "/userinfo")
                 .put("http-server.authentication.oauth2.client-id", TRINO_CLIENT_ID)
@@ -74,7 +76,7 @@ protected void validateAccessToken(String cookieValue)
             assertThat(response.body()).isNotNull();
             DefaultClaims claims = new DefaultClaims(JsonCodec.mapJsonCodec(String.class, Object.class).fromJson(response.body().bytes()));
             assertThat(claims.getSubject()).isEqualTo("foo@bar.com");
-            assertThat(claims.get("aud")).asInstanceOf(list(String.class)).contains(TRINO_CLIENT_ID);
+            assertThat(claims.get("aud")).isEqualTo(Set.of(TRINO_CLIENT_ID));
         }
         catch (IOException e) {
             fail("Exception while calling /userinfo", e);
diff --git a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilterWithRefreshTokens.java b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilterWithRefreshTokens.java
new file mode 100644
index 000000000000..5fd67da71cca
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOAuth2WebUiAuthenticationFilterWithRefreshTokens.java
@@ -0,0 +1,225 @@
+/*
+ * Licensed 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 io.trino.server.security.oauth2;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Resources;
+import com.google.inject.Key;
+import io.airlift.http.client.HttpClientConfig;
+import io.airlift.http.client.jetty.JettyHttpClient;
+import io.airlift.log.Level;
+import io.airlift.log.Logging;
+import io.trino.server.security.jwt.JwkService;
+import io.trino.server.security.jwt.JwkSigningKeyResolver;
+import io.trino.server.testing.TestingTrinoServer;
+import io.trino.server.ui.OAuth2WebUiAuthenticationFilter;
+import io.trino.server.ui.WebUiModule;
+import okhttp3.JavaNetCookieJar;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.net.CookieManager;
+import java.net.CookieStore;
+import java.net.HttpCookie;
+import java.net.URI;
+import java.time.Duration;
+
+import static io.airlift.testing.Closeables.closeAll;
+import static io.trino.client.OkHttpUtil.setupInsecureSsl;
+import static io.trino.server.security.jwt.JwtUtil.newJwtParserBuilder;
+import static io.trino.server.security.oauth2.TokenEndpointAuthMethod.CLIENT_SECRET_BASIC;
+import static io.trino.server.ui.OAuthIdTokenCookie.ID_TOKEN_COOKIE;
+import static jakarta.servlet.http.HttpServletResponse.SC_OK;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testng.Assert.assertEquals;
+
+public class TestOAuth2WebUiAuthenticationFilterWithRefreshTokens
+{
+    protected static final Duration TTL_ACCESS_TOKEN_IN_SECONDS = Duration.ofSeconds(5);
+
+    protected static final String TRINO_CLIENT_ID = "trino-client";
+    protected static final String TRINO_CLIENT_SECRET = "trino-secret";
+    private static final String TRINO_AUDIENCE = TRINO_CLIENT_ID;
+    private static final String ADDITIONAL_AUDIENCE = "https://external-service.com";
+    protected static final String TRUSTED_CLIENT_ID = "trusted-client";
+
+    protected OkHttpClient httpClient;
+    protected TestingHydraIdentityProvider hydraIdP;
+    private TestingTrinoServer server;
+    private URI serverUri;
+    private URI uiUri;
+
+    @BeforeClass
+    public void setup()
+            throws Exception
+    {
+        Logging logging = Logging.initialize();
+        logging.setLevel(OAuth2WebUiAuthenticationFilter.class.getName(), Level.DEBUG);
+        logging.setLevel(OAuth2Service.class.getName(), Level.DEBUG);
+
+        OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
+        setupInsecureSsl(httpClientBuilder);
+        httpClientBuilder.followRedirects(false);
+        httpClient = httpClientBuilder.build();
+
+        hydraIdP = new TestingHydraIdentityProvider(TTL_ACCESS_TOKEN_IN_SECONDS, true, false);
+        hydraIdP.start();
+
+        String idpUrl = "https://localhost:" + hydraIdP.getAuthPort();
+
+        server = TestingTrinoServer.builder()
+                .setCoordinator(true)
+                .setAdditionalModule(new WebUiModule())
+                .setProperties(ImmutableMap.<String, String>builder()
+                        .put("web-ui.enabled", "true")
+                        .put("web-ui.authentication.type", "oauth2")
+                        .put("http-server.https.enabled", "true")
+                        .put("http-server.https.keystore.path", Resources.getResource("cert/localhost.pem").getPath())
+                        .put("http-server.https.keystore.key", "")
+                        .put("http-server.authentication.oauth2.issuer", "https://localhost:4444/")
+                        .put("http-server.authentication.oauth2.auth-url", idpUrl + "/oauth2/auth")
+                        .put("http-server.authentication.oauth2.token-url", idpUrl + "/oauth2/token")
+                        .put("http-server.authentication.oauth2.end-session-url", idpUrl + "/oauth2/sessions/logout")
+                        .put("http-server.authentication.oauth2.jwks-url", idpUrl + "/.well-known/jwks.json")
+                        .put("http-server.authentication.oauth2.client-id", TRINO_CLIENT_ID)
+                        .put("http-server.authentication.oauth2.client-secret", TRINO_CLIENT_SECRET)
+                        .put("http-server.authentication.oauth2.additional-audiences", TRUSTED_CLIENT_ID)
+                        .put("http-server.authentication.oauth2.max-clock-skew", "0s")
+                        .put("http-server.authentication.oauth2.user-mapping.pattern", "(.*)(@.*)?")
+                        .put("http-server.authentication.oauth2.oidc.discovery", "false")
+                        .put("http-server.authentication.oauth2.scopes", "openid,offline")
+                        .put("http-server.authentication.oauth2.refresh-tokens", "true")
+                        .put("oauth2-jwk.http-client.trust-store-path", Resources.getResource("cert/localhost.pem").getPath())
+                        .buildOrThrow())
+                .build();
+        server.getInstance(Key.get(OAuth2Client.class)).load();
+        server.waitForNodeRefresh(Duration.ofSeconds(10));
+        serverUri = server.getHttpsBaseUrl();
+        uiUri = serverUri.resolve("/ui/");
+
+        hydraIdP.createClient(
+                TRINO_CLIENT_ID,
+                TRINO_CLIENT_SECRET,
+                CLIENT_SECRET_BASIC,
+                ImmutableList.of(TRINO_AUDIENCE, ADDITIONAL_AUDIENCE),
+                serverUri + "/oauth2/callback",
+                serverUri + "/ui/logout/logout.html");
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void tearDown()
+            throws Exception
+    {
+        Logging logging = Logging.initialize();
+        logging.clearLevel(OAuth2WebUiAuthenticationFilter.class.getName());
+        logging.clearLevel(OAuth2Service.class.getName());
+
+        closeAll(
+                server,
+                hydraIdP,
+                () -> {
+                    httpClient.dispatcher().executorService().shutdown();
+                    httpClient.connectionPool().evictAll();
+                });
+        server = null;
+        hydraIdP = null;
+        httpClient = null;
+    }
+
+    @Test
+    public void testSuccessfulFlowWithRefreshedAccessToken()
+            throws Exception
+    {
+        // create a new HttpClient which follows redirects and give access to cookies
+        CookieManager cookieManager = new CookieManager();
+        CookieStore cookieStore = cookieManager.getCookieStore();
+        OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
+        setupInsecureSsl(httpClientBuilder);
+        OkHttpClient httpClient = httpClientBuilder
+                .followRedirects(true)
+                .cookieJar(new JavaNetCookieJar(cookieManager))
+                .build();
+
+        assertThat(cookieStore.get(uiUri)).isEmpty();
+
+        accessUi(httpClient);
+
+        HttpCookie idTokenCookie = cookieStore.get(uiUri)
+                .stream()
+                .filter(cookie -> cookie.getName().equals(ID_TOKEN_COOKIE))
+                .findFirst()
+                .orElseThrow();
+
+        Thread.sleep(TTL_ACCESS_TOKEN_IN_SECONDS.plusSeconds(1).toMillis()); // wait for the token expiration = ttl of access token + 1 sec
+
+        // Access the UI after timeout
+        accessUi(httpClient);
+
+        HttpCookie newIdTokenCookie = cookieStore.get(uiUri)
+                .stream()
+                .filter(cookie -> cookie.getName().equals(ID_TOKEN_COOKIE))
+                .findFirst()
+                .orElseThrow();
+
+        // Post refresh of access token the id-token should remain same
+        assertThat(newIdTokenCookie.getValue()).isEqualTo(idTokenCookie.getValue());
+
+        // Check if the IDToken was expired
+        assertTokenIsExpired(newIdTokenCookie.getValue());
+
+        // Logout from the Trino
+        try (Response response = httpClient.newCall(
+                        new Request.Builder()
+                                .url(uiUri.resolve("logout").toURL())
+                                .get()
+                                .build())
+                .execute()) {
+            assertEquals(response.code(), SC_OK);
+            assertEquals(response.request().url().toString(), uiUri.resolve("logout/logout.html").toString());
+        }
+        assertThat(cookieStore.get(uiUri)).isEmpty();
+    }
+
+    protected void assertTokenIsExpired(String claimsJws)
+    {
+        assertThatThrownBy(() -> newJwtParserBuilder()
+                .setSigningKeyResolver(new JwkSigningKeyResolver(new JwkService(
+                        URI.create("https://localhost:" + hydraIdP.getAuthPort() + "/.well-known/jwks.json"),
+                        new JettyHttpClient(new HttpClientConfig()
+                                .setTrustStorePath(Resources.getResource("cert/localhost.pem").getPath())))))
+                .build()
+                .parseClaimsJws(claimsJws));
+    }
+
+    private void accessUi(OkHttpClient httpClient)
+            throws Exception
+    {
+        // access UI and follow redirects in order to get OAuth2 and IDToken cookie
+        try (Response response = httpClient.newCall(
+                        new Request.Builder()
+                                .url(uiUri.toURL())
+                                .get()
+                                .build())
+                .execute()) {
+            assertEquals(response.code(), SC_OK);
+            assertEquals(response.request().url().toString(), uiUri.toString());
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOidcDiscovery.java b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOidcDiscovery.java
index 2b184f255971..bac63b99be72 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOidcDiscovery.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOidcDiscovery.java
@@ -26,13 +26,12 @@
 import io.trino.server.testing.TestingTrinoServer;
 import io.trino.server.ui.OAuth2WebUiAuthenticationFilter;
 import io.trino.server.ui.WebUiAuthenticationFilter;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 import java.net.URI;
 import java.time.Instant;
@@ -41,10 +40,10 @@
 import java.util.Optional;
 
 import static io.airlift.http.client.HttpStatus.TOO_MANY_REQUESTS;
+import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -63,7 +62,8 @@ public void testStaticConfiguration(Optional<String> accessTokenPath, Optional<S
                     .put("http-server.authentication.oauth2.oidc.discovery", "false")
                     .put("http-server.authentication.oauth2.auth-url", issuer.resolve("/connect/authorize").toString())
                     .put("http-server.authentication.oauth2.token-url", issuer.resolve("/connect/token").toString())
-                    .put("http-server.authentication.oauth2.jwks-url", issuer.resolve("/jwks.json").toString());
+                    .put("http-server.authentication.oauth2.jwks-url", issuer.resolve("/jwks.json").toString())
+                    .put("http-server.authentication.oauth2.end-session-url", issuer.resolve("/connect/logout").toString());
             accessTokenIssuer.map(URI::toString).ifPresent(uri -> properties.put("http-server.authentication.oauth2.access-token-issuer", uri));
             userinfoUrl.map(URI::toString).ifPresent(uri -> properties.put("http-server.authentication.oauth2.userinfo-url", uri));
             try (TestingTrinoServer server = createServer(properties.buildOrThrow())) {
@@ -236,11 +236,11 @@ public void testBackwardCompatibility()
                             .buildOrThrow())) {
                 assertComponents(server);
                 OAuth2ServerConfig config = server.getInstance(Key.get(OAuth2ServerConfigProvider.class)).get();
-                assertThat(config.getAccessTokenIssuer()).isEqualTo(Optional.of(accessTokenIssuer));
-                assertThat(config.getAuthUrl()).isEqualTo(authUrl);
-                assertThat(config.getTokenUrl()).isEqualTo(tokenUrl);
-                assertThat(config.getJwksUrl()).isEqualTo(jwksUrl);
-                assertThat(config.getUserinfoUrl()).isEqualTo(Optional.of(userinfoUrl));
+                assertThat(config.accessTokenIssuer()).isEqualTo(Optional.of(accessTokenIssuer));
+                assertThat(config.authUrl()).isEqualTo(authUrl);
+                assertThat(config.tokenUrl()).isEqualTo(tokenUrl);
+                assertThat(config.jwksUrl()).isEqualTo(jwksUrl);
+                assertThat(config.userinfoUrl()).isEqualTo(Optional.of(userinfoUrl));
             }
         }
     }
@@ -249,11 +249,11 @@ private static void assertConfiguration(TestingTrinoServer server, URI issuer, O
     {
         assertComponents(server);
         OAuth2ServerConfig config = server.getInstance(Key.get(OAuth2ServerConfigProvider.class)).get();
-        assertThat(config.getAccessTokenIssuer()).isEqualTo(accessTokenIssuer.map(URI::toString));
-        assertThat(config.getAuthUrl()).isEqualTo(issuer.resolve("/connect/authorize"));
-        assertThat(config.getTokenUrl()).isEqualTo(issuer.resolve("/connect/token"));
-        assertThat(config.getJwksUrl()).isEqualTo(issuer.resolve("/jwks.json"));
-        assertThat(config.getUserinfoUrl()).isEqualTo(userinfoUrl);
+        assertThat(config.accessTokenIssuer()).isEqualTo(accessTokenIssuer.map(URI::toString));
+        assertThat(config.authUrl()).isEqualTo(issuer.resolve("/connect/authorize"));
+        assertThat(config.tokenUrl()).isEqualTo(issuer.resolve("/connect/token"));
+        assertThat(config.jwksUrl()).isEqualTo(issuer.resolve("/jwks.json"));
+        assertThat(config.userinfoUrl()).isEqualTo(userinfoUrl);
     }
 
     private static void assertComponents(TestingTrinoServer server)
diff --git a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOidcDiscoveryConfig.java b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOidcDiscoveryConfig.java
index cfdbce7b6546..2f990a72c849 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOidcDiscoveryConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOidcDiscoveryConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestRefreshTokensConfig.java b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestRefreshTokensConfig.java
index 8f6e1129a815..866b7ae31d81 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestRefreshTokensConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestRefreshTokensConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server.security.oauth2;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
diff --git a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestingHydraIdentityProvider.java b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestingHydraIdentityProvider.java
index 3ed19b907ede..cea1d648152d 100644
--- a/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestingHydraIdentityProvider.java
+++ b/core/trino-main/src/test/java/io/trino/server/security/oauth2/TestingHydraIdentityProvider.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Resources;
+import com.google.common.net.InetAddresses;
 import com.google.inject.Key;
 import com.nimbusds.oauth2.sdk.GrantType;
 import io.airlift.http.server.HttpServerConfig;
@@ -26,12 +27,17 @@
 import io.airlift.http.server.testing.TestingHttpServer;
 import io.airlift.log.Level;
 import io.airlift.log.Logging;
+import io.airlift.node.NodeConfig;
 import io.airlift.node.NodeInfo;
 import io.trino.server.testing.TestingTrinoServer;
 import io.trino.server.ui.OAuth2WebUiAuthenticationFilter;
 import io.trino.server.ui.WebUiModule;
 import io.trino.testing.ResourcePresence;
 import io.trino.util.AutoCloseableCloser;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.HttpHeaders;
 import okhttp3.Credentials;
 import okhttp3.FormBody;
 import okhttp3.HttpUrl;
@@ -49,12 +55,8 @@
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.utility.MountableFile;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.HttpHeaders;
-
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.URI;
 import java.time.Duration;
 import java.util.List;
@@ -62,10 +64,10 @@
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.client.OkHttpUtil.setupInsecureSsl;
 import static io.trino.server.security.oauth2.TokenEndpointAuthMethod.CLIENT_SECRET_BASIC;
+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static jakarta.servlet.http.HttpServletResponse.SC_OK;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 import static java.util.Objects.requireNonNull;
-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 
 public class TestingHydraIdentityProvider
         implements AutoCloseable
@@ -134,6 +136,7 @@ public void start()
                 .withEnv("SERVE_TLS_KEY_PATH", "/tmp/certs/localhost.pem")
                 .withEnv("SERVE_TLS_CERT_PATH", "/tmp/certs/localhost.pem")
                 .withEnv("TTL_ACCESS_TOKEN", ttlAccessToken.getSeconds() + "s")
+                .withEnv("TTL_ID_TOKEN", ttlAccessToken.getSeconds() + "s")
                 .withEnv("STRATEGIES_ACCESS_TOKEN", useJwt ? "jwt" : null)
                 .withEnv("LOG_LEAK_SENSITIVE_VALUES", "true")
                 .withCommand("serve", "all")
@@ -160,7 +163,8 @@ public void createClient(
             String clientSecret,
             TokenEndpointAuthMethod tokenEndpointAuthMethod,
             List<String> audiences,
-            String callbackUrl)
+            String callbackUrl,
+            String logoutCallbackUrl)
     {
         createHydraContainer()
                 .withCommand("clients", "create",
@@ -173,7 +177,8 @@ public void createClient(
                         "--response-types", "token,code,id_token",
                         "--scope", "openid,offline",
                         "--token-endpoint-auth-method", tokenEndpointAuthMethod.getValue(),
-                        "--callbacks", callbackUrl)
+                        "--callbacks", callbackUrl,
+                        "--post-logout-callbacks", logoutCallbackUrl)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofSeconds(30)))
                 .start();
     }
@@ -220,7 +225,9 @@ public void close()
     private TestingHttpServer createTestingLoginAndConsentServer()
             throws IOException
     {
-        NodeInfo nodeInfo = new NodeInfo("test");
+        NodeInfo nodeInfo = new NodeInfo(new NodeConfig()
+                .setEnvironment("test")
+                .setNodeInternalAddress(InetAddresses.toAddrString(InetAddress.getLocalHost())));
         HttpServerConfig config = new HttpServerConfig().setHttpPort(0);
         HttpServerInfo httpServerInfo = new HttpServerInfo(config, nodeInfo);
         return new TestingHttpServer(httpServerInfo, nodeInfo, config, new AcceptAllLoginsAndConsentsServlet(), ImmutableMap.of());
@@ -344,7 +351,8 @@ private static void runTestServer(boolean useJwt)
                     "trino-secret",
                     CLIENT_SECRET_BASIC,
                     ImmutableList.of("https://localhost:8443/ui"),
-                    "https://localhost:8443/oauth2/callback");
+                    "https://localhost:8443/oauth2/callback",
+                    "https://localhost:8443/ui/logout/logout.html");
             ImmutableMap.Builder<String, String> config = ImmutableMap.<String, String>builder()
                     .put("web-ui.enabled", "true")
                     .put("web-ui.authentication.type", "oauth2")
diff --git a/core/trino-main/src/test/java/io/trino/server/ui/TestFixedUserWebUiConfig.java b/core/trino-main/src/test/java/io/trino/server/ui/TestFixedUserWebUiConfig.java
index c0d1215bc8f6..7e3592489e0a 100644
--- a/core/trino-main/src/test/java/io/trino/server/ui/TestFixedUserWebUiConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/ui/TestFixedUserWebUiConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server.ui;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/server/ui/TestFormWebUiConfig.java b/core/trino-main/src/test/java/io/trino/server/ui/TestFormWebUiConfig.java
index e83844ab4e80..8fe5d8599199 100644
--- a/core/trino-main/src/test/java/io/trino/server/ui/TestFormWebUiConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/ui/TestFormWebUiConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
diff --git a/core/trino-main/src/test/java/io/trino/server/ui/TestWebUi.java b/core/trino-main/src/test/java/io/trino/server/ui/TestWebUi.java
index 32b4b4cf583f..4edc52446f3f 100644
--- a/core/trino-main/src/test/java/io/trino/server/ui/TestWebUi.java
+++ b/core/trino-main/src/test/java/io/trino/server/ui/TestWebUi.java
@@ -18,6 +18,8 @@
 import com.google.common.hash.Hashing;
 import com.google.common.io.BaseEncoding;
 import com.google.common.io.Resources;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import com.google.inject.Key;
 import io.airlift.http.server.HttpServerConfig;
 import io.airlift.http.server.HttpServerInfo;
@@ -26,6 +28,7 @@
 import io.airlift.security.pem.PemReader;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwsHeader;
+import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.impl.DefaultClaims;
 import io.trino.security.AccessControl;
 import io.trino.server.HttpRequestSessionContextFactory;
@@ -41,26 +44,26 @@
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.Identity;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.UriBuilder;
 import okhttp3.FormBody;
 import okhttp3.JavaNetCookieJar;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-import javax.annotation.concurrent.GuardedBy;
 import javax.crypto.SecretKey;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
 
 import java.io.File;
 import java.io.IOException;
@@ -105,21 +108,27 @@
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.LOGIN_FORM;
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.UI_LOGIN;
 import static io.trino.server.ui.FormWebUiAuthenticationFilter.UI_LOGOUT;
+import static io.trino.server.ui.OAuthIdTokenCookie.ID_TOKEN_COOKIE;
+import static io.trino.server.ui.OAuthWebUiCookie.OAUTH2_COOKIE;
 import static io.trino.testing.assertions.Assert.assertEventually;
+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static jakarta.servlet.http.HttpServletResponse.SC_OK;
+import static jakarta.servlet.http.HttpServletResponse.SC_SEE_OTHER;
+import static jakarta.servlet.http.HttpServletResponse.SC_TEMPORARY_REDIRECT;
+import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.function.Predicate.not;
-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
-import static javax.servlet.http.HttpServletResponse.SC_SEE_OTHER;
-import static javax.servlet.http.HttpServletResponse.SC_TEMPORARY_REDIRECT;
-import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestWebUi
 {
     private static final String LOCALHOST_KEYSTORE = Resources.getResource("cert/localhost.pem").getPath();
@@ -167,7 +176,7 @@ public class TestWebUi
     private OkHttpClient client;
     private Path passwordConfigDummy;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
             throws IOException
     {
@@ -212,7 +221,8 @@ public void testPasswordAuthenticator()
         try (TestingTrinoServer server = TestingTrinoServer.builder()
                 .setProperties(ImmutableMap.<String, String>builder()
                         .putAll(SECURE_PROPERTIES)
-                        .put("http-server.authentication.type", "password")
+                        // using mixed case to test uppercase and lowercase
+                        .put("http-server.authentication.type", "PaSSworD")
                         .put("password-authenticator.config-files", passwordConfigDummy.toString())
                         .put("http-server.authentication.password.user-mapping.pattern", ALLOWED_USER_MAPPING_PATTERN)
                         .buildOrThrow())
@@ -401,7 +411,7 @@ private void testUserMapping(URI baseUri, String username, String password, bool
         }
     }
 
-    @javax.ws.rs.Path("/ui/username")
+    @jakarta.ws.rs.Path("/ui/username")
     public static class TestResource
     {
         private final HttpRequestSessionContextFactory sessionContextFactory;
@@ -418,10 +428,10 @@ public TestResource(AccessControl accessControl)
 
         @ResourceSecurity(WEB_UI)
         @GET
-        public javax.ws.rs.core.Response echoToken(@Context HttpServletRequest servletRequest, @Context HttpHeaders httpHeaders)
+        public jakarta.ws.rs.core.Response echoToken(@Context HttpServletRequest servletRequest, @Context HttpHeaders httpHeaders)
         {
             Identity identity = sessionContextFactory.extractAuthorizedIdentity(servletRequest, httpHeaders, Optional.empty());
-            return javax.ws.rs.core.Response.ok()
+            return jakarta.ws.rs.core.Response.ok()
                     .header("user", identity.getUser())
                     .build();
         }
@@ -658,7 +668,7 @@ public void testOAuth2Authenticator()
                         .setBinding()
                         .toInstance(oauthClient))
                 .build()) {
-            assertAuth2Authentication(server, oauthClient.getAccessToken(), false);
+            assertAuth2Authentication(server, oauthClient.getAccessToken(), oauthClient.getIdToken(), false, true);
         }
         finally {
             jwkServer.stop();
@@ -682,7 +692,7 @@ public void testOAuth2AuthenticatorWithoutOpenIdScope()
                         .setBinding()
                         .toInstance(oauthClient))
                 .build()) {
-            assertAuth2Authentication(server, oauthClient.getAccessToken(), false);
+            assertAuth2Authentication(server, oauthClient.getAccessToken(), Optional.empty(), false, true);
         }
         finally {
             jwkServer.stop();
@@ -707,7 +717,7 @@ public void testOAuth2AuthenticatorWithRefreshToken()
                         .setBinding()
                         .toInstance(oauthClient))
                 .build()) {
-            assertAuth2Authentication(server, oauthClient.getAccessToken(), true);
+            assertAuth2Authentication(server, oauthClient.getAccessToken(), oauthClient.getIdToken(), true, true);
         }
         finally {
             jwkServer.stop();
@@ -808,6 +818,7 @@ public void testCustomPrincipalField()
                         .put("preferred_username", "test-user@email.com")
                         .buildOrThrow(),
                 Duration.ofSeconds(5),
+                true,
                 true);
         TestingHttpServer jwkServer = createTestingJwkServer();
         jwkServer.start();
@@ -825,7 +836,7 @@ public void testCustomPrincipalField()
                     jaxrsBinder(binder).bind(AuthenticatedIdentityCapturingFilter.class);
                 })
                 .build()) {
-            assertAuth2Authentication(server, oauthClient.getAccessToken(), false);
+            assertAuth2Authentication(server, oauthClient.getAccessToken(), oauthClient.getIdToken(), false, true);
             Identity identity = server.getInstance(Key.get(AuthenticatedIdentityCapturingFilter.class)).getAuthenticatedIdentity();
             assertThat(identity.getUser()).isEqualTo("test-user");
             assertThat(identity.getPrincipal()).isEqualTo(Optional.of(new BasicPrincipal("test-user@email.com")));
@@ -835,7 +846,31 @@ public void testCustomPrincipalField()
         }
     }
 
-    private void assertAuth2Authentication(TestingTrinoServer server, String accessToken, boolean refreshTokensEnabled)
+    @Test
+    public void testOAuth2AuthenticatorWithoutEndSessionEndpoint()
+            throws Exception
+    {
+        OAuth2ClientStub oauthClient = new OAuth2ClientStub(ImmutableMap.of(), Duration.ofSeconds(5), false, false);
+        TestingHttpServer jwkServer = createTestingJwkServer();
+        jwkServer.start();
+        try (TestingTrinoServer server = TestingTrinoServer.builder()
+                .setProperties(ImmutableMap.<String, String>builder()
+                        .putAll(OAUTH2_PROPERTIES)
+                        .put("http-server.authentication.oauth2.jwks-url", jwkServer.getBaseUrl().toString())
+                        .put("http-server.authentication.oauth2.scopes", "")
+                        .buildOrThrow())
+                .setAdditionalModule(binder -> newOptionalBinder(binder, OAuth2Client.class)
+                        .setBinding()
+                        .toInstance(oauthClient))
+                .build()) {
+            assertAuth2Authentication(server, oauthClient.getAccessToken(), oauthClient.getIdToken(), false, false);
+        }
+        finally {
+            jwkServer.stop();
+        }
+    }
+
+    private void assertAuth2Authentication(TestingTrinoServer server, String accessToken, Optional<String> idToken, boolean refreshTokensEnabled, boolean supportsEndSessionEndpoint)
             throws Exception
     {
         CookieManager cookieManager = new CookieManager();
@@ -856,7 +891,7 @@ private void assertAuth2Authentication(TestingTrinoServer server, String accessT
         assertResponseCode(client, getLocation(baseUri, "/ui/api/unknown"), UNAUTHORIZED.getStatusCode());
 
         loginWithCallbackEndpoint(client, baseUri);
-        HttpCookie cookie = getOnlyElement(cookieManager.getCookieStore().getCookies());
+        HttpCookie cookie = getCookie(cookieManager, OAUTH2_COOKIE);
         if (refreshTokensEnabled) {
             assertCookieWithRefreshToken(server, cookie, accessToken);
         }
@@ -868,6 +903,20 @@ private void assertAuth2Authentication(TestingTrinoServer server, String accessT
         assertEquals(cookie.getDomain(), baseUri.getHost());
         assertTrue(cookie.isHttpOnly());
 
+        if (idToken.isPresent()) {
+            HttpCookie idTokenCookie = getCookie(cookieManager, ID_TOKEN_COOKIE);
+            assertEquals(idTokenCookie.getValue(), idToken.get());
+            assertEquals(idTokenCookie.getPath(), "/ui/");
+            assertEquals(idTokenCookie.getDomain(), baseUri.getHost());
+            assertTrue(idTokenCookie.getMaxAge() > 0 && cookie.getMaxAge() < MINUTES.toSeconds(5));
+            assertTrue(idTokenCookie.isHttpOnly());
+        }
+        else {
+            assertThatThrownBy(() -> getCookie(cookieManager, ID_TOKEN_COOKIE))
+                    // WebIDTokenCookie should not be set
+                    .hasMessageContaining("No value present");
+        }
+
         // authentication cookie is now set, so UI should work
         testRootRedirect(baseUri, client);
         assertOk(client, getUiLocation(baseUri));
@@ -877,8 +926,26 @@ private void assertAuth2Authentication(TestingTrinoServer server, String accessT
         assertResponseCode(client, getLocation(baseUri, "/ui/api/unknown"), SC_NOT_FOUND);
 
         // logout
-        assertOk(client, getLogoutLocation(baseUri));
-        assertThat(cookieManager.getCookieStore().getCookies()).isEmpty();
+        Request request = new Request.Builder()
+                .url(uriBuilderFrom(baseUri)
+                        .replacePath("/ui/logout/")
+                        .toString())
+                .build();
+        try (Response response = client.newCall(request).execute()) {
+            String expectedRedirect = uriBuilderFrom(baseUri).replacePath("ui/logout/logout.html").toString();
+            if (supportsEndSessionEndpoint) {
+                UriBuilder uriBuilder = UriBuilder.fromUri("http://example.com/oauth2/v1/logout");
+                idToken.ifPresent(token -> uriBuilder.queryParam("id_token_hint", token));
+                uriBuilder.queryParam("post_logout_redirect_uri", expectedRedirect);
+                expectedRedirect = uriBuilder.build().toString();
+            }
+
+            assertEquals(response.code(), SC_SEE_OTHER);
+            String locationHeader = response.header(HttpHeaders.LOCATION);
+            assertNotNull(locationHeader);
+            assertEquals(locationHeader, expectedRedirect);
+            assertThat(cookieManager.getCookieStore().getCookies()).isEmpty();
+        }
         assertRedirect(client, getUiLocation(baseUri), "http://example.com/authorize", false);
     }
 
@@ -905,8 +972,8 @@ private static void assertCookieWithRefreshToken(TestingTrinoServer server, Http
     {
         TokenPairSerializer tokenPairSerializer = server.getInstance(Key.get(TokenPairSerializer.class));
         TokenPair deserialize = tokenPairSerializer.deserialize(authCookie.getValue());
-        assertEquals(deserialize.getAccessToken(), accessToken);
-        assertEquals(deserialize.getRefreshToken(), Optional.of(REFRESH_TOKEN));
+        assertEquals(deserialize.accessToken(), accessToken);
+        assertEquals(deserialize.refreshToken(), Optional.of(REFRESH_TOKEN));
         assertThat(authCookie.getMaxAge()).isGreaterThan(0).isLessThan(REFRESH_TOKEN_TIMEOUT.getSeconds());
     }
 
@@ -1213,6 +1280,7 @@ private static class OAuth2ClientStub
         private final Duration accessTokenValidity;
         private final Optional<String> nonce;
         private final Optional<String> idToken;
+        private final boolean supportsEndsessionEndpoint;
 
         public OAuth2ClientStub()
         {
@@ -1221,13 +1289,15 @@ public OAuth2ClientStub()
 
         public OAuth2ClientStub(boolean issueIdToken, Duration accessTokenValidity)
         {
-            this(ImmutableMap.of(), accessTokenValidity, issueIdToken);
+            this(ImmutableMap.of(), accessTokenValidity, issueIdToken, true);
         }
 
-        public OAuth2ClientStub(Map<String, String> additionalClaims, Duration accessTokenValidity, boolean issueIdToken)
+        public OAuth2ClientStub(Map<String, String> additionalClaims, Duration accessTokenValidity, boolean issueIdToken, boolean supportsEndsessionEnpoint)
         {
-            claims = new DefaultClaims(createClaims());
-            claims.putAll(requireNonNull(additionalClaims, "additionalClaims is null"));
+            claims = Jwts.claims()
+                    .add(createClaims())
+                    .add(requireNonNull(additionalClaims, "additionalClaims is null"))
+                    .build();
             this.accessTokenValidity = requireNonNull(accessTokenValidity, "accessTokenValidity is null");
             accessToken = issueToken(claims);
             if (issueIdToken) {
@@ -1242,6 +1312,7 @@ public OAuth2ClientStub(Map<String, String> additionalClaims, Duration accessTok
                 nonce = Optional.empty();
                 idToken = Optional.empty();
             }
+            this.supportsEndsessionEndpoint = supportsEndsessionEnpoint;
         }
 
         @Override
@@ -1280,11 +1351,28 @@ public Response refreshTokens(String refreshToken)
             throw new ChallengeFailedException("invalid refresh token");
         }
 
+        @Override
+        public Optional<URI> getLogoutEndpoint(Optional<String> idToken, URI callbackUrl)
+        {
+            if (supportsEndsessionEndpoint) {
+                UriBuilder builder = UriBuilder.fromUri("http://example.com/oauth2/v1/logout");
+                idToken.ifPresent(token -> builder.queryParam("id_token_hint", token));
+                builder.queryParam("post_logout_redirect_uri", callbackUrl);
+                return Optional.of(builder.build());
+            }
+            return Optional.empty();
+        }
+
         public String getAccessToken()
         {
             return accessToken;
         }
 
+        public Optional<String> getIdToken()
+        {
+            return idToken;
+        }
+
         private static String issueToken(Claims claims)
         {
             return newJwtBuilder()
@@ -1296,11 +1384,13 @@ private static String issueToken(Claims claims)
 
         private static Claims createClaims()
         {
-            return new DefaultClaims()
-                    .setIssuer(TOKEN_ISSUER)
-                    .setAudience(OAUTH_CLIENT_ID)
-                    .setSubject("test-user")
-                    .setExpiration(Date.from(Instant.now().plus(Duration.ofMinutes(5))));
+            return Jwts.claims()
+                .issuer(TOKEN_ISSUER)
+                .audience().add(OAUTH_CLIENT_ID)
+                .and()
+                .subject("test-user")
+                .expiration(Date.from(Instant.now().plus(Duration.ofMinutes(5))))
+                .build();
         }
 
         public static String randomNonce()
@@ -1335,4 +1425,12 @@ public synchronized Identity getAuthenticatedIdentity()
             return authenticatedIdentity;
         }
     }
+
+    private static HttpCookie getCookie(CookieManager cookieManager, String cookieName)
+    {
+        return cookieManager.getCookieStore().getCookies().stream()
+                .filter(cookie -> cookie.getName().equals(cookieName))
+                .findFirst()
+                .orElseThrow();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/server/ui/TestWebUiConfig.java b/core/trino-main/src/test/java/io/trino/server/ui/TestWebUiConfig.java
index 2e6fe7ed4283..f060a6d241e4 100644
--- a/core/trino-main/src/test/java/io/trino/server/ui/TestWebUiConfig.java
+++ b/core/trino-main/src/test/java/io/trino/server/ui/TestWebUiConfig.java
@@ -14,7 +14,7 @@
 package io.trino.server.ui;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/spiller/TestBinaryFileSpiller.java b/core/trino-main/src/test/java/io/trino/spiller/TestBinaryFileSpiller.java
index b9dce3aca0c1..c130b4d324f8 100644
--- a/core/trino-main/src/test/java/io/trino/spiller/TestBinaryFileSpiller.java
+++ b/core/trino-main/src/test/java/io/trino/spiller/TestBinaryFileSpiller.java
@@ -14,6 +14,7 @@
 package io.trino.spiller;
 
 import com.google.common.collect.ImmutableList;
+import io.airlift.slice.Slices;
 import io.trino.FeaturesConfig;
 import io.trino.RowPagesBuilder;
 import io.trino.execution.buffer.PageSerializer;
@@ -45,7 +46,6 @@
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static java.lang.Double.doubleToLongBits;
 import static org.testng.Assert.assertEquals;
 
 @Test(singleThreaded = true)
@@ -110,9 +110,9 @@ public void testFileVarbinarySpiller()
         BlockBuilder col2 = DOUBLE.createBlockBuilder(null, 1);
         BlockBuilder col3 = VARBINARY.createBlockBuilder(null, 1);
 
-        col1.writeLong(42).closeEntry();
-        col2.writeLong(doubleToLongBits(43.0)).closeEntry();
-        col3.writeLong(doubleToLongBits(43.0)).writeLong(1).closeEntry();
+        BIGINT.writeLong(col1, 42);
+        DOUBLE.writeDouble(col2, 43.0);
+        VARBINARY.writeSlice(col3, Slices.allocate(16).getOutput().appendDouble(43.0).appendLong(1).slice());
 
         Page page = new Page(col1.build(), col2.build(), col3.build());
 
@@ -156,7 +156,7 @@ private void testSpiller(List<Type> types, Spiller spiller, List<Page>... spills
         assertEquals(spillerStats.getTotalSpilledBytes() - spilledBytesBefore, spilledBytes);
         // At this point, the buffers should still be accounted for in the memory context, because
         // the spiller (FileSingleStreamSpiller) doesn't release its memory reservation until it's closed.
-        assertEquals(memoryContext.getBytes(), spills.length * FileSingleStreamSpiller.BUFFER_SIZE);
+        assertEquals(memoryContext.getBytes(), (long) spills.length * FileSingleStreamSpiller.BUFFER_SIZE);
 
         List<Iterator<Page>> actualSpills = spiller.getSpills();
         assertEquals(actualSpills.size(), spills.length);
diff --git a/core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpiller.java b/core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpiller.java
index b7ff11f37ffe..d067abeb8d42 100644
--- a/core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpiller.java
+++ b/core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpiller.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.Iterators;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
 import io.trino.execution.buffer.PagesSerdeUtil;
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.operator.PageAssertions;
@@ -24,9 +25,10 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.TestingBlockEncodingSerde;
 import io.trino.spi.type.Type;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.io.IOException;
@@ -45,14 +47,14 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
-import static java.lang.Double.doubleToLongBits;
 import static java.nio.file.Files.newInputStream;
 import static java.util.concurrent.Executors.newCachedThreadPool;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestFileSingleStreamSpiller
 {
     private static final List<Type> TYPES = ImmutableList.of(BIGINT, DOUBLE, VARBINARY);
@@ -60,14 +62,14 @@ public class TestFileSingleStreamSpiller
     private final ListeningExecutorService executor = listeningDecorator(newCachedThreadPool());
     private File spillPath;
 
-    @BeforeClass(alwaysRun = true)
+    @BeforeAll
     public void setUp()
             throws IOException
     {
         spillPath = Files.createTempDirectory("tmp").toFile();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -168,9 +170,9 @@ private Page buildPage()
         BlockBuilder col2 = DOUBLE.createBlockBuilder(null, 1);
         BlockBuilder col3 = VARBINARY.createBlockBuilder(null, 1);
 
-        col1.writeLong(42).closeEntry();
-        col2.writeLong(doubleToLongBits(43.0)).closeEntry();
-        col3.writeLong(doubleToLongBits(43.0)).writeLong(1).closeEntry();
+        BIGINT.writeLong(col1, 42);
+        DOUBLE.writeDouble(col2, 43.0);
+        VARBINARY.writeSlice(col3, Slices.allocate(16).getOutput().appendDouble(43.0).appendLong(1).slice());
 
         return new Page(col1.build(), col2.build(), col3.build());
     }
diff --git a/core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpillerFactory.java b/core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpillerFactory.java
index f45c9557e101..f1e603ec1421 100644
--- a/core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpillerFactory.java
+++ b/core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpillerFactory.java
@@ -23,9 +23,10 @@
 import io.trino.spi.block.BlockEncodingSerde;
 import io.trino.spi.block.TestingBlockEncodingSerde;
 import io.trino.spi.type.Type;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.io.IOException;
@@ -47,9 +48,10 @@
 import static java.nio.file.Files.setPosixFilePermissions;
 import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestFileSingleStreamSpillerFactory
 {
     private final BlockEncodingSerde blockEncodingSerde = new TestingBlockEncodingSerde();
@@ -58,7 +60,7 @@ public class TestFileSingleStreamSpillerFactory
     private File spillPath1;
     private File spillPath2;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
             throws IOException
     {
@@ -71,7 +73,7 @@ public void setUp()
         closer.register(() -> deleteRecursively(spillPath2.toPath(), ALLOW_INSECURE));
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
             throws Exception
     {
@@ -140,7 +142,7 @@ public void testDistributesSpillOverPathsBadDisk()
     private Page buildPage()
     {
         BlockBuilder col1 = BIGINT.createBlockBuilder(null, 1);
-        col1.writeLong(42).closeEntry();
+        BIGINT.writeLong(col1, 42);
         return new Page(col1.build());
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/spiller/TestGenericPartitioningSpiller.java b/core/trino-main/src/test/java/io/trino/spiller/TestGenericPartitioningSpiller.java
index c16fcbac77ca..ee754fa020ce 100644
--- a/core/trino-main/src/test/java/io/trino/spiller/TestGenericPartitioningSpiller.java
+++ b/core/trino-main/src/test/java/io/trino/spiller/TestGenericPartitioningSpiller.java
@@ -27,9 +27,10 @@
 import io.trino.spi.block.TestingBlockEncodingSerde;
 import io.trino.spi.type.Type;
 import io.trino.spiller.PartitioningSpiller.PartitioningSpillResult;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.UncheckedIOException;
 import java.nio.channels.ClosedChannelException;
@@ -51,8 +52,10 @@
 import static java.nio.file.Files.createTempDirectory;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestGenericPartitioningSpiller
 {
     private static final int FIRST_PARTITION_START = -10;
@@ -66,7 +69,7 @@ public class TestGenericPartitioningSpiller
     private GenericPartitioningSpillerFactory factory;
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -84,7 +87,7 @@ public void setUp()
         scheduledExecutor = newSingleThreadScheduledExecutor();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -235,7 +238,7 @@ private static class FourFixedPartitionsPartitionFunction
         }
 
         @Override
-        public int getPartitionCount()
+        public int partitionCount()
         {
             return 4;
         }
@@ -271,7 +274,7 @@ private static class ModuloPartitionFunction
         }
 
         @Override
-        public int getPartitionCount()
+        public int partitionCount()
         {
             return partitionCount;
         }
diff --git a/core/trino-main/src/test/java/io/trino/spiller/TestNodeSpillConfig.java b/core/trino-main/src/test/java/io/trino/spiller/TestNodeSpillConfig.java
index bf953b29cd78..c467042be916 100644
--- a/core/trino-main/src/test/java/io/trino/spiller/TestNodeSpillConfig.java
+++ b/core/trino-main/src/test/java/io/trino/spiller/TestNodeSpillConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/spiller/TestSpillSpaceTracker.java b/core/trino-main/src/test/java/io/trino/spiller/TestSpillSpaceTracker.java
index 2c31c0f6459d..145a4413ccab 100644
--- a/core/trino-main/src/test/java/io/trino/spiller/TestSpillSpaceTracker.java
+++ b/core/trino-main/src/test/java/io/trino/spiller/TestSpillSpaceTracker.java
@@ -15,28 +15,21 @@
 
 import io.airlift.units.DataSize;
 import io.trino.ExceededSpillLimitException;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true)
 public class TestSpillSpaceTracker
 {
     private static final DataSize MAX_DATA_SIZE = DataSize.of(10, MEGABYTE);
-    private SpillSpaceTracker spillSpaceTracker;
-
-    @BeforeMethod
-    public void setUp()
-    {
-        spillSpaceTracker = new SpillSpaceTracker(MAX_DATA_SIZE);
-    }
 
     @Test
     public void testSpillSpaceTracker()
     {
+        SpillSpaceTracker spillSpaceTracker = new SpillSpaceTracker(MAX_DATA_SIZE);
+
         assertEquals(spillSpaceTracker.getCurrentBytes(), 0);
         assertEquals(spillSpaceTracker.getMaxBytes(), MAX_DATA_SIZE.toBytes());
         long reservedBytes = DataSize.of(5, MEGABYTE).toBytes();
@@ -61,6 +54,8 @@ public void testSpillSpaceTracker()
     @Test
     public void testSpillOutOfSpace()
     {
+        SpillSpaceTracker spillSpaceTracker = new SpillSpaceTracker(MAX_DATA_SIZE);
+
         assertEquals(spillSpaceTracker.getCurrentBytes(), 0);
         assertThatThrownBy(() -> spillSpaceTracker.reserve(MAX_DATA_SIZE.toBytes() + 1))
                 .isInstanceOf(ExceededSpillLimitException.class)
@@ -70,6 +65,8 @@ public void testSpillOutOfSpace()
     @Test
     public void testFreeToMuch()
     {
+        SpillSpaceTracker spillSpaceTracker = new SpillSpaceTracker(MAX_DATA_SIZE);
+
         assertEquals(spillSpaceTracker.getCurrentBytes(), 0);
         spillSpaceTracker.reserve(1000);
         assertThatThrownBy(() -> spillSpaceTracker.free(1001))
diff --git a/core/trino-main/src/test/java/io/trino/split/MockSplitSource.java b/core/trino-main/src/test/java/io/trino/split/MockSplitSource.java
index ff10282c20a5..7b53f9a595c5 100644
--- a/core/trino-main/src/test/java/io/trino/split/MockSplitSource.java
+++ b/core/trino-main/src/test/java/io/trino/split/MockSplitSource.java
@@ -17,13 +17,12 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.metadata.Split;
 import io.trino.spi.HostAddress;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorSplit;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/split/TestBufferingSplitSource.java b/core/trino-main/src/test/java/io/trino/split/TestBufferingSplitSource.java
index 47a634b7d78f..fc53a4ac1fbd 100644
--- a/core/trino-main/src/test/java/io/trino/split/TestBufferingSplitSource.java
+++ b/core/trino-main/src/test/java/io/trino/split/TestBufferingSplitSource.java
@@ -16,7 +16,7 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.trino.split.SplitSource.SplitBatch;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.Future;
 
diff --git a/core/trino-main/src/test/java/io/trino/split/TestPageSinkId.java b/core/trino-main/src/test/java/io/trino/split/TestPageSinkId.java
index b1df373a0696..736113e05cb7 100644
--- a/core/trino-main/src/test/java/io/trino/split/TestPageSinkId.java
+++ b/core/trino-main/src/test/java/io/trino/split/TestPageSinkId.java
@@ -16,7 +16,7 @@
 import io.trino.execution.StageId;
 import io.trino.execution.TaskId;
 import io.trino.spi.QueryId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
diff --git a/core/trino-main/src/test/java/io/trino/sql/BenchmarkExpressionInterpreter.java b/core/trino-main/src/test/java/io/trino/sql/BenchmarkExpressionInterpreter.java
index f324cd3acf1f..9bb0b72f7572 100644
--- a/core/trino-main/src/test/java/io/trino/sql/BenchmarkExpressionInterpreter.java
+++ b/core/trino-main/src/test/java/io/trino/sql/BenchmarkExpressionInterpreter.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.tree.Expression;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -27,7 +28,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.options.WarmupMode;
-import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
diff --git a/core/trino-main/src/test/java/io/trino/sql/ExpressionTestUtils.java b/core/trino-main/src/test/java/io/trino/sql/ExpressionTestUtils.java
index 8923375973ad..f289a9e287dc 100644
--- a/core/trino-main/src/test/java/io/trino/sql/ExpressionTestUtils.java
+++ b/core/trino-main/src/test/java/io/trino/sql/ExpressionTestUtils.java
@@ -32,6 +32,7 @@
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.NodeRef;
 import io.trino.transaction.TestingTransactionManager;
+import io.trino.transaction.TransactionManager;
 
 import java.util.Map;
 
@@ -39,7 +40,6 @@
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.StandardErrorCode.EXPRESSION_NOT_CONSTANT;
 import static io.trino.sql.ExpressionUtils.rewriteIdentifiersToSymbolReferences;
-import static io.trino.sql.ParsingUtil.createParsingOptions;
 import static io.trino.sql.analyzer.SemanticExceptions.semanticException;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
@@ -76,23 +76,23 @@ private static void failNotEqual(Object actual, Object expected, String message)
         throw new AssertionError(formatted + ASSERT_LEFT + expected + ASSERT_MIDDLE + actual + ASSERT_RIGHT);
     }
 
-    public static Expression createExpression(Session session, String expression, PlannerContext plannerContext, TypeProvider symbolTypes)
+    public static Expression createExpression(Session session, String expression, TransactionManager transactionManager, PlannerContext plannerContext, TypeProvider symbolTypes)
     {
-        Expression parsedExpression = SQL_PARSER.createExpression(expression, createParsingOptions(session));
-        return planExpression(plannerContext, session, symbolTypes, parsedExpression);
+        Expression parsedExpression = SQL_PARSER.createExpression(expression);
+        return planExpression(transactionManager, plannerContext, session, symbolTypes, parsedExpression);
     }
 
-    public static Expression createExpression(String expression, PlannerContext plannerContext, TypeProvider symbolTypes)
+    public static Expression createExpression(String expression, TransactionManager transactionManager, PlannerContext plannerContext, TypeProvider symbolTypes)
     {
-        return createExpression(TEST_SESSION, expression, plannerContext, symbolTypes);
+        return createExpression(TEST_SESSION, expression, transactionManager, plannerContext, symbolTypes);
     }
 
-    public static Expression planExpression(PlannerContext plannerContext, Session session, TypeProvider typeProvider, Expression expression)
+    public static Expression planExpression(TransactionManager transactionManager, PlannerContext plannerContext, Session session, TypeProvider typeProvider, Expression expression)
     {
         if (session.getTransactionId().isPresent()) {
             return planExpressionInExistingTx(plannerContext, typeProvider, expression, session);
         }
-        return transaction(new TestingTransactionManager(), new AllowAllAccessControl())
+        return transaction(transactionManager, plannerContext.getMetadata(), new AllowAllAccessControl())
                 .singleStatement()
                 .execute(session, transactionSession -> {
                     return planExpressionInExistingTx(plannerContext, typeProvider, expression, transactionSession);
@@ -174,7 +174,7 @@ public static Map<NodeRef<Expression>, Type> getTypes(Session session, PlannerCo
         if (session.getTransactionId().isPresent()) {
             return createTestingTypeAnalyzer(plannerContext).getTypes(session, typeProvider, expression);
         }
-        return transaction(new TestingTransactionManager(), new AllowAllAccessControl())
+        return transaction(new TestingTransactionManager(), plannerContext.getMetadata(), new AllowAllAccessControl())
                 .singleStatement()
                 .execute(session, transactionSession -> {
                     return createTestingTypeAnalyzer(plannerContext).getTypes(transactionSession, typeProvider, expression);
diff --git a/core/trino-main/src/test/java/io/trino/sql/TestExpressionInterpreter.java b/core/trino-main/src/test/java/io/trino/sql/TestExpressionInterpreter.java
index 8e1a721e72c4..ef02a2b5fb03 100644
--- a/core/trino-main/src/test/java/io/trino/sql/TestExpressionInterpreter.java
+++ b/core/trino-main/src/test/java/io/trino/sql/TestExpressionInterpreter.java
@@ -22,7 +22,6 @@
 import io.trino.spi.type.SqlTimestampWithTimeZone;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarbinaryType;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.planner.ExpressionInterpreter;
 import io.trino.sql.planner.Symbol;
@@ -36,12 +35,12 @@
 import io.trino.sql.tree.StringLiteral;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.transaction.TestingTransactionManager;
-import io.trino.transaction.TransactionBuilder;
 import org.intellij.lang.annotations.Language;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import org.joda.time.LocalTime;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.Map;
 import java.util.Optional;
@@ -70,10 +69,10 @@
 import static io.trino.sql.ExpressionTestUtils.getTypes;
 import static io.trino.sql.ExpressionTestUtils.resolveFunctionCalls;
 import static io.trino.sql.ExpressionUtils.rewriteIdentifiersToSymbolReferences;
-import static io.trino.sql.ParsingUtil.createParsingOptions;
-import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
+import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
+import static io.trino.transaction.TransactionBuilder.transaction;
 import static io.trino.type.DateTimes.scaleEpochMillisToMicros;
 import static io.trino.type.IntervalDayTimeType.INTERVAL_DAY_TIME;
 import static java.lang.String.format;
@@ -150,6 +149,10 @@ public class TestExpressionInterpreter
     };
 
     private static final SqlParser SQL_PARSER = new SqlParser();
+    private static final TestingTransactionManager TRANSACTION_MANAGER = new TestingTransactionManager();
+    private static final PlannerContext PLANNER_CONTEXT = plannerContextBuilder()
+            .withTransactionManager(TRANSACTION_MANAGER)
+            .build();
 
     @Test
     public void testAnd()
@@ -284,6 +287,25 @@ public void testIsNotNull()
         assertOptimizedEquals("bound_decimal_long IS NOT NULL", "true");
     }
 
+    @Test
+    public void testLambdaBody()
+    {
+        assertOptimizedEquals("transform(ARRAY[bound_long], n -> CAST(n as BIGINT))",
+                "transform(ARRAY[bound_long], n -> n)");
+        assertOptimizedEquals("transform(ARRAY[bound_long], n -> CAST(n as VARCHAR(5)))",
+                "transform(ARRAY[bound_long], n -> CAST(n as VARCHAR(5)))");
+        assertOptimizedEquals("transform(ARRAY[bound_long], n -> IF(false, 1, 0 / 0))",
+                "transform(ARRAY[bound_long], n -> 0 / 0)");
+        assertOptimizedEquals("transform(ARRAY[bound_long], n -> 5 / 0)",
+                "transform(ARRAY[bound_long], n -> 5 / 0)");
+        assertOptimizedEquals("transform(ARRAY[bound_long], n -> nullif(true, true))",
+                "transform(ARRAY[bound_long], n -> CAST(null AS Boolean))");
+        assertOptimizedEquals("transform(ARRAY[bound_long], n -> n + 10 * 10)",
+                "transform(ARRAY[bound_long], n -> n + 100)");
+        assertOptimizedEquals("reduce_agg(bound_long, 0, (a, b) -> IF(false, a, b), (a, b) -> IF(true, a, b))",
+                "reduce_agg(bound_long, 0, (a, b) -> b, (a, b) -> a)");
+    }
+
     @Test
     public void testNullIf()
     {
@@ -396,6 +418,8 @@ public void testBetween()
         assertOptimizedEquals("NULL BETWEEN 2 AND 4", "NULL");
         assertOptimizedEquals("3 BETWEEN NULL AND 4", "NULL");
         assertOptimizedEquals("3 BETWEEN 2 AND NULL", "NULL");
+        assertOptimizedEquals("2 BETWEEN 3 AND NULL", "false");
+        assertOptimizedEquals("8 BETWEEN NULL AND 6", "false");
 
         assertOptimizedEquals("'cc' BETWEEN 'b' AND 'd'", "true");
         assertOptimizedEquals("'b' BETWEEN 'cc' AND 'd'", "false");
@@ -1852,7 +1876,8 @@ public void testMapSubscriptConstantIndexes()
         optimize("MAP(ARRAY[ARRAY[1,1]], ARRAY['a'])[ARRAY[1,1]]");
     }
 
-    @Test(timeOut = 60000)
+    @Test
+    @Timeout(60)
     public void testLikeInvalidUtf8()
     {
         assertLike(new byte[] {'a', 'b', 'c'}, "%b%", true);
@@ -1902,7 +1927,7 @@ private static void assertOptimizedMatches(@Language("SQL") String actual, @Lang
                         .map(Symbol::getName)
                         .collect(toImmutableMap(identity(), SymbolReference::new)));
 
-        Expression rewrittenExpected = rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expected, new ParsingOptions()));
+        Expression rewrittenExpected = rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expected));
         assertExpressionEquals(actualOptimized, rewrittenExpected, aliases.build());
     }
 
@@ -1923,10 +1948,10 @@ static Object optimize(Expression parsedExpression)
     // TODO replace that method with io.trino.sql.ExpressionTestUtils.planExpression
     static Expression planExpression(@Language("SQL") String expression)
     {
-        return TransactionBuilder.transaction(new TestingTransactionManager(), new AllowAllAccessControl())
+        return transaction(TRANSACTION_MANAGER, PLANNER_CONTEXT.getMetadata(), new AllowAllAccessControl())
                 .singleStatement()
                 .execute(TEST_SESSION, transactionSession -> {
-                    Expression parsedExpression = SQL_PARSER.createExpression(expression, createParsingOptions(transactionSession));
+                    Expression parsedExpression = SQL_PARSER.createExpression(expression);
                     parsedExpression = rewriteIdentifiersToSymbolReferences(parsedExpression);
                     parsedExpression = resolveFunctionCalls(PLANNER_CONTEXT, transactionSession, SYMBOL_TYPES, parsedExpression);
                     parsedExpression = CanonicalizeExpressionRewriter.rewrite(
@@ -1948,17 +1973,16 @@ private static Object evaluate(String expression)
     {
         assertRoundTrip(expression);
 
-        Expression parsedExpression = ExpressionTestUtils.createExpression(expression, PLANNER_CONTEXT, SYMBOL_TYPES);
+        Expression parsedExpression = ExpressionTestUtils.createExpression(expression, TRANSACTION_MANAGER, PLANNER_CONTEXT, SYMBOL_TYPES);
 
         return evaluate(parsedExpression);
     }
 
     private static void assertRoundTrip(String expression)
     {
-        ParsingOptions parsingOptions = createParsingOptions(TEST_SESSION);
-        Expression parsed = SQL_PARSER.createExpression(expression, parsingOptions);
+        Expression parsed = SQL_PARSER.createExpression(expression);
         String formatted = formatExpression(parsed);
-        assertEquals(parsed, SQL_PARSER.createExpression(formatted, parsingOptions));
+        assertEquals(parsed, SQL_PARSER.createExpression(formatted));
     }
 
     private static Object evaluate(Expression expression)
diff --git a/core/trino-main/src/test/java/io/trino/sql/TestExpressionOptimizer.java b/core/trino-main/src/test/java/io/trino/sql/TestExpressionOptimizer.java
index f92756d11f27..f44bc8dda428 100644
--- a/core/trino-main/src/test/java/io/trino/sql/TestExpressionOptimizer.java
+++ b/core/trino-main/src/test/java/io/trino/sql/TestExpressionOptimizer.java
@@ -25,13 +25,14 @@
 import io.trino.sql.relational.RowExpression;
 import io.trino.sql.relational.SpecialForm;
 import io.trino.sql.relational.optimizer.ExpressionOptimizer;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.airlift.testing.Assertions.assertInstanceOf;
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.block.BlockAssertions.toValues;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.operator.scalar.JsonStringToArrayCast.JSON_STRING_TO_ARRAY_NAME;
 import static io.trino.operator.scalar.JsonStringToMapCast.JSON_STRING_TO_MAP_NAME;
 import static io.trino.operator.scalar.JsonStringToRowCast.JSON_STRING_TO_ROW_NAME;
@@ -58,7 +59,8 @@ public class TestExpressionOptimizer
             functionResolution.getPlannerContext().getFunctionManager(),
             TEST_SESSION);
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testPossibleExponentialOptimizationTime()
     {
         RowExpression expression = constant(1L, BIGINT);
@@ -86,7 +88,7 @@ public void testIfConstantOptimization()
     @Test
     public void testCastWithJsonParseOptimization()
     {
-        ResolvedFunction jsonParseFunction = functionResolution.resolveFunction(QualifiedName.of("json_parse"), fromTypes(VARCHAR));
+        ResolvedFunction jsonParseFunction = functionResolution.resolveFunction("json_parse", fromTypes(VARCHAR));
 
         // constant
         ResolvedFunction jsonCastFunction = functionResolution.getCoercion(JSON, new ArrayType(INTEGER));
@@ -115,7 +117,7 @@ private void testCastWithJsonParseOptimization(ResolvedFunction jsonParseFunctio
         assertEquals(
                 resultExpression,
                 call(
-                        functionResolution.getCoercion(QualifiedName.of(jsonStringToRowName), VARCHAR, targetType),
+                        functionResolution.getCoercion(builtinFunctionName(jsonStringToRowName), VARCHAR, targetType),
                         field(1, VARCHAR)));
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/TestExpressionUtils.java b/core/trino-main/src/test/java/io/trino/sql/TestExpressionUtils.java
index f7185b0171e4..9d16d3cb342d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/TestExpressionUtils.java
+++ b/core/trino-main/src/test/java/io/trino/sql/TestExpressionUtils.java
@@ -18,7 +18,7 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.LogicalExpression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.metadata.MetadataManager.createTestMetadataManager;
 import static io.trino.sql.tree.LogicalExpression.Operator.AND;
diff --git a/core/trino-main/src/test/java/io/trino/sql/TestSqlEnvironmentConfig.java b/core/trino-main/src/test/java/io/trino/sql/TestSqlEnvironmentConfig.java
index b423c9c052f2..a2bffca78917 100644
--- a/core/trino-main/src/test/java/io/trino/sql/TestSqlEnvironmentConfig.java
+++ b/core/trino-main/src/test/java/io/trino/sql/TestSqlEnvironmentConfig.java
@@ -14,15 +14,15 @@
 package io.trino.sql;
 
 import com.google.common.collect.ImmutableMap;
-import io.trino.sql.parser.ParsingException;
-import org.testng.annotations.Test;
+import jakarta.validation.constraints.AssertTrue;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
 import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
 import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
 import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static io.airlift.testing.ValidationAssertions.assertFailsValidation;
 
 public class TestSqlEnvironmentConfig
 {
@@ -30,9 +30,11 @@ public class TestSqlEnvironmentConfig
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(SqlEnvironmentConfig.class)
-                .setPath(null)
+                .setPath("")
                 .setDefaultCatalog(null)
                 .setDefaultSchema(null)
+                .setDefaultFunctionCatalog(null)
+                .setDefaultFunctionSchema(null)
                 .setForcedSessionTimeZone(null));
     }
 
@@ -40,16 +42,20 @@ public void testDefaults()
     public void testExplicitPropertyMappings()
     {
         Map<String, String> properties = ImmutableMap.<String, String>builder()
-                .put("sql.path", "a.b, c.d")
+                .put("sql.path", "a.b, c.d, memory.functions")
                 .put("sql.default-catalog", "some-catalog")
                 .put("sql.default-schema", "some-schema")
+                .put("sql.default-function-catalog", "memory")
+                .put("sql.default-function-schema", "functions")
                 .put("sql.forced-session-time-zone", "UTC")
                 .buildOrThrow();
 
         SqlEnvironmentConfig expected = new SqlEnvironmentConfig()
-                .setPath("a.b, c.d")
+                .setPath("a.b, c.d, memory.functions")
                 .setDefaultCatalog("some-catalog")
                 .setDefaultSchema("some-schema")
+                .setDefaultFunctionCatalog("memory")
+                .setDefaultFunctionSchema("functions")
                 .setForcedSessionTimeZone("UTC");
 
         assertFullMapping(properties, expected);
@@ -58,9 +64,45 @@ public void testExplicitPropertyMappings()
     @Test
     public void testInvalidPath()
     {
-        SqlEnvironmentConfig config = new SqlEnvironmentConfig().setPath("too.many.qualifiers");
-        assertThatThrownBy(() -> new SqlPath(config.getPath()).getParsedPath())
-                .isInstanceOf(ParsingException.class)
-                .hasMessageMatching("\\Qline 1:9: mismatched input '.'. Expecting: ',', <EOF>\\E");
+        assertFailsValidation(
+                new SqlEnvironmentConfig()
+                        .setPath("too.many.parts"),
+                "sqlPathValid",
+                "sql.path must be a valid SQL path",
+                AssertTrue.class);
+    }
+
+    @Test
+    public void testFunctionCatalogSetWithoutSchema()
+    {
+        assertFailsValidation(
+                new SqlEnvironmentConfig()
+                        .setDefaultFunctionCatalog("memory"),
+                "bothFunctionCatalogAndSchemaSet",
+                "sql.default-function-catalog and sql.default-function-schema must be set together",
+                AssertTrue.class);
+    }
+
+    @Test
+    public void testFunctionSchemaSetWithoutCatalog()
+    {
+        assertFailsValidation(
+                new SqlEnvironmentConfig()
+                        .setDefaultFunctionSchema("functions"),
+                "bothFunctionCatalogAndSchemaSet",
+                "sql.default-function-catalog and sql.default-function-schema must be set together",
+                AssertTrue.class);
+    }
+
+    @Test
+    public void testFunctionSchemaNotInSqlPath()
+    {
+        assertFailsValidation(
+                new SqlEnvironmentConfig()
+                        .setDefaultFunctionCatalog("memory")
+                        .setDefaultFunctionSchema("functions"),
+                "functionSchemaInSqlPath",
+                "default function schema must be in the default SQL path",
+                AssertTrue.class);
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/TestSqlPath.java b/core/trino-main/src/test/java/io/trino/sql/TestSqlPath.java
new file mode 100644
index 000000000000..b6e0ea11cf5b
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/sql/TestSqlPath.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed 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 io.trino.sql;
+
+import io.trino.connector.system.GlobalSystemConnector;
+import io.trino.spi.connector.CatalogSchemaName;
+import io.trino.sql.parser.ParsingException;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
+import static io.trino.metadata.GlobalFunctionCatalog.BUILTIN_SCHEMA;
+import static io.trino.metadata.LanguageFunctionManager.QUERY_LOCAL_SCHEMA;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class TestSqlPath
+{
+    private static final CatalogSchemaName INLINE_SCHEMA_NAME = new CatalogSchemaName(GlobalSystemConnector.NAME, QUERY_LOCAL_SCHEMA);
+    private static final CatalogSchemaName BUILTIN_SCHEMA_NAME = new CatalogSchemaName(GlobalSystemConnector.NAME, BUILTIN_SCHEMA);
+
+    @Test
+    void empty()
+    {
+        assertThat(SqlPath.EMPTY_PATH.getRawPath()).isEmpty();
+        assertThat(SqlPath.EMPTY_PATH.getPath()).containsExactly(INLINE_SCHEMA_NAME, BUILTIN_SCHEMA_NAME);
+    }
+
+    @Test
+    void parsing()
+    {
+        assertThat(SqlPath.buildPath("a.b", Optional.empty()).getPath())
+                .containsExactly(INLINE_SCHEMA_NAME, BUILTIN_SCHEMA_NAME, new CatalogSchemaName("a", "b"));
+        assertThat(SqlPath.buildPath("a.b, c.d", Optional.empty()).getPath())
+                .containsExactly(INLINE_SCHEMA_NAME, BUILTIN_SCHEMA_NAME, new CatalogSchemaName("a", "b"), new CatalogSchemaName("c", "d"));
+        assertThat(SqlPath.buildPath("y", Optional.of("x")).getPath())
+                .containsExactly(INLINE_SCHEMA_NAME, BUILTIN_SCHEMA_NAME, new CatalogSchemaName("x", "y"));
+        assertThat(SqlPath.buildPath("y, z", Optional.of("x")).getPath())
+                .containsExactly(INLINE_SCHEMA_NAME, BUILTIN_SCHEMA_NAME, new CatalogSchemaName("x", "y"), new CatalogSchemaName("x", "z"));
+        assertThat(SqlPath.buildPath("a.b, c.d", Optional.of("x")).getPath())
+                .containsExactly(INLINE_SCHEMA_NAME, BUILTIN_SCHEMA_NAME, new CatalogSchemaName("a", "b"), new CatalogSchemaName("c", "d"));
+        assertThat(SqlPath.buildPath("a.b, y", Optional.of("x")).getPath())
+                .containsExactly(INLINE_SCHEMA_NAME, BUILTIN_SCHEMA_NAME, new CatalogSchemaName("a", "b"), new CatalogSchemaName("x", "y"));
+
+        assertThat(SqlPath.buildPath("a.b,   c.d", Optional.empty()).getRawPath()).isEqualTo("a.b,   c.d");
+    }
+
+    @Test
+    void invalidPath()
+    {
+        assertThatThrownBy(() -> SqlPath.buildPath("too.many.qualifiers", Optional.empty()))
+                .isInstanceOf(ParsingException.class)
+                .hasMessageMatching("\\Qline 1:9: mismatched input '.'. Expecting: ',', <EOF>\\E");
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/sql/TestSqlToRowExpressionTranslator.java b/core/trino-main/src/test/java/io/trino/sql/TestSqlToRowExpressionTranslator.java
index da82bb685193..c3f34626ff43 100644
--- a/core/trino-main/src/test/java/io/trino/sql/TestSqlToRowExpressionTranslator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/TestSqlToRowExpressionTranslator.java
@@ -26,7 +26,8 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NodeRef;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.math.BigDecimal;
 import java.util.Map;
@@ -43,7 +44,8 @@ public class TestSqlToRowExpressionTranslator
 {
     private final LiteralEncoder literalEncoder = new LiteralEncoder(PLANNER_CONTEXT);
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testPossibleExponentialOptimizationTime()
     {
         Expression expression = new LongLiteral("1");
@@ -102,7 +104,7 @@ private Expression simplifyExpression(Expression expression)
         Map<NodeRef<Expression>, Type> expressionTypes = getExpressionTypes(expression);
         ExpressionInterpreter interpreter = new ExpressionInterpreter(expression, PLANNER_CONTEXT, TEST_SESSION, expressionTypes);
         Object value = interpreter.optimize(NoOpSymbolResolver.INSTANCE);
-        return literalEncoder.toExpression(TEST_SESSION, value, expressionTypes.get(NodeRef.of(expression)));
+        return literalEncoder.toExpression(value, expressionTypes.get(NodeRef.of(expression)));
     }
 
     private Map<NodeRef<Expression>, Type> getExpressionTypes(Expression expression)
diff --git a/core/trino-main/src/test/java/io/trino/sql/analyzer/TestAnalyzer.java b/core/trino-main/src/test/java/io/trino/sql/analyzer/TestAnalyzer.java
index cb3e626328d7..76296d029339 100644
--- a/core/trino-main/src/test/java/io/trino/sql/analyzer/TestAnalyzer.java
+++ b/core/trino-main/src/test/java/io/trino/sql/analyzer/TestAnalyzer.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Closer;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.FeaturesConfig;
 import io.trino.Session;
 import io.trino.SystemSessionProperties;
@@ -81,7 +82,6 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.PlannerContext;
 import io.trino.sql.parser.ParsingException;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.planner.OptimizerConfig;
 import io.trino.sql.rewrite.ShowQueriesRewrite;
@@ -96,9 +96,11 @@
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.time.Duration;
 import java.util.List;
@@ -137,6 +139,7 @@
 import static io.trino.spi.StandardErrorCode.INVALID_ORDER_BY;
 import static io.trino.spi.StandardErrorCode.INVALID_PARAMETER_USAGE;
 import static io.trino.spi.StandardErrorCode.INVALID_PARTITION_BY;
+import static io.trino.spi.StandardErrorCode.INVALID_PATH;
 import static io.trino.spi.StandardErrorCode.INVALID_PATTERN_RECOGNITION_FUNCTION;
 import static io.trino.spi.StandardErrorCode.INVALID_PROCESSING_MODE;
 import static io.trino.spi.StandardErrorCode.INVALID_RANGE;
@@ -175,6 +178,7 @@
 import static io.trino.spi.StandardErrorCode.TYPE_MISMATCH;
 import static io.trino.spi.StandardErrorCode.VIEW_IS_RECURSIVE;
 import static io.trino.spi.StandardErrorCode.VIEW_IS_STALE;
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.spi.session.PropertyMetadata.integerProperty;
 import static io.trino.spi.session.PropertyMetadata.stringProperty;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -189,8 +193,6 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.spi.type.VarcharType.createVarcharType;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DECIMAL;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DOUBLE;
 import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.SELECT_COLUMN;
 import static io.trino.testing.TestingAccessControlManager.privilege;
 import static io.trino.testing.TestingEventListenerManager.emptyEventListenerManager;
@@ -205,8 +207,9 @@
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestAnalyzer
 {
     private static final String TPCH_CATALOG = "tpch";
@@ -798,6 +801,15 @@ public void testWindowsNotAllowed()
         assertFails("SELECT * FROM t1 WHERE foo() over () > 1")
                 .hasErrorCode(EXPRESSION_NOT_SCALAR)
                 .hasMessage("line 1:38: WHERE clause cannot contain aggregations, window functions or grouping operations: [foo() OVER ()]");
+        assertFails("SELECT * FROM t1 WHERE lag(t1.a) > t1.a")
+                .hasErrorCode(EXPRESSION_NOT_SCALAR)
+                .hasMessage("line 1:34: WHERE clause cannot contain aggregations, window functions or grouping operations: [lag(t1.a)]");
+        assertFails("SELECT * FROM t1 WHERE rank() > 1")
+                .hasErrorCode(EXPRESSION_NOT_SCALAR)
+                .hasMessage("line 1:31: WHERE clause cannot contain aggregations, window functions or grouping operations: [rank()]");
+        assertFails("SELECT * FROM t1 WHERE first_value(t1.a) > t1.a")
+                .hasErrorCode(EXPRESSION_NOT_SCALAR)
+                .hasMessage("line 1:42: WHERE clause cannot contain aggregations, window functions or grouping operations: [first_value(t1.a)]");
         assertFails("SELECT * FROM t1 GROUP BY rank() over ()")
                 .hasErrorCode(EXPRESSION_NOT_SCALAR)
                 .hasMessage("line 1:27: GROUP BY clause cannot contain aggregations, window functions or grouping operations: [rank() OVER ()]");
@@ -807,6 +819,9 @@ public void testWindowsNotAllowed()
         assertFails("SELECT 1 FROM (VALUES 1) HAVING count(*) OVER () > 1")
                 .hasErrorCode(NESTED_WINDOW)
                 .hasMessage("line 1:33: HAVING clause cannot contain window functions or row pattern measures");
+        assertFails("SELECT 1 FROM (VALUES 1) HAVING rank() > 1")
+                .hasErrorCode(NESTED_WINDOW)
+                .hasMessage("line 1:33: HAVING clause cannot contain window functions or row pattern measures");
 
         // row pattern measure over window
         assertFails("SELECT * FROM t1 WHERE classy OVER ( " +
@@ -3051,7 +3066,8 @@ public void testLike()
         analyze("SELECT CAST('1' as CHAR(1)) LIKE '1'");
     }
 
-    @Test(enabled = false) // TODO: need to support widening conversion for numbers
+    @Test // TODO: need to support widening conversion for numbers
+    @Disabled
     public void testInWithNumericTypes()
     {
         analyze("SELECT * FROM t1 WHERE 1 IN (1, 2, 3.5)");
@@ -3903,6 +3919,26 @@ public void testLambdaWithInvalidParameterCount()
                 .hasMessageMatching("line 1:39: Expected a lambda that takes 2 argument\\(s\\) but got 3");
     }
 
+    @Test
+    public void testInvalidInlineFunction()
+    {
+        assertFails("WITH FUNCTION test.abc() RETURNS int RETURN 42 SELECT 123")
+                .hasErrorCode(SYNTAX_ERROR)
+                .hasMessage("line 1:6: Inline function names cannot be qualified: test.abc");
+
+        assertFails("WITH function abc() RETURNS int SECURITY DEFINER RETURN 42 SELECT 123")
+                .hasErrorCode(NOT_SUPPORTED)
+                .hasMessage("line 1:33: Security mode not supported for inline functions");
+
+        assertFails("""
+                CREATE VIEW test AS
+                WITH FUNCTION abc() RETURNS int RETURN 42
+                SELECT 123 x
+                """)
+                .hasErrorCode(NOT_SUPPORTED)
+                .hasMessage("line 2:6: Views cannot contain inline functions");
+    }
+
     @Test
     public void testInvalidDelete()
     {
@@ -4015,6 +4051,13 @@ public void testInValidJoinOnClause()
                 .hasMessage("line 1:69: JOIN ON clause must evaluate to a boolean: actual type row(boolean, boolean)");
     }
 
+    @Test
+    public void testNullAggregationFilter()
+    {
+        analyze("SELECT count(*) FILTER (WHERE NULL) FROM t1");
+        analyze("SELECT a, count(*) FILTER (WHERE NULL) FROM t1 GROUP BY a");
+    }
+
     @Test
     public void testInvalidAggregationFilter()
     {
@@ -4027,6 +4070,12 @@ public void testInvalidAggregationFilter()
         assertFails("SELECT abs(x) FILTER (where y = 1) FROM (VALUES (1, 1, 1)) t(x, y, z) GROUP BY z")
                 .hasErrorCode(FUNCTION_NOT_AGGREGATE)
                 .hasMessage("line 1:8: Filter is only valid for aggregation functions");
+        assertFails("SELECT count(*) FILTER (WHERE 0) FROM t1")
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 1:31: Filter expression must evaluate to a boolean (actual: integer)");
+        assertFails("SELECT a, count(*) FILTER (WHERE 0) FROM t1 GROUP BY a")
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 1:34: Filter expression must evaluate to a boolean (actual: integer)");
     }
 
     @Test
@@ -6176,12 +6225,28 @@ public void testJsonArrayInAggregationContext()
                 .hasMessage("line 1:8: 'JSON_ARRAY(b ABSENT ON NULL)' must be an aggregate expression or appear in GROUP BY clause");
     }
 
+    @Test
+    public void testJsonPathName()
+    {
+        assertFails("SELECT JSON_EXISTS('[1, 2, 3]', 'lax $[2]' AS path_name)")
+                .hasErrorCode(INVALID_PATH)
+                .hasMessage("line 1:47: JSON path name is not allowed in JSON_EXISTS function");
+
+        assertFails("SELECT JSON_QUERY('[1, 2, 3]', 'lax $[2]' AS path_name)")
+                .hasErrorCode(INVALID_PATH)
+                .hasMessage("line 1:46: JSON path name is not allowed in JSON_QUERY function");
+
+        assertFails("SELECT JSON_VALUE('[1, 2, 3]', 'lax $[2]' AS path_name)")
+                .hasErrorCode(INVALID_PATH)
+                .hasMessage("line 1:46: JSON path name is not allowed in JSON_VALUE function");
+    }
+
     @Test
     public void testTableFunctionNotFound()
     {
         assertFails("SELECT * FROM TABLE(non_existent_table_function())")
                 .hasErrorCode(FUNCTION_NOT_FOUND)
-                .hasMessage("line 1:21: Table function non_existent_table_function not registered");
+                .hasMessage("line 1:21: Table function 'non_existent_table_function' not registered");
     }
 
     @Test
@@ -6656,7 +6721,23 @@ public void testTableFunctionRequiredColumns()
                 .hasMessage("Invalid index: 1 of required column from table argument INPUT");
     }
 
-    @BeforeClass
+    @Test
+    public void testJsonTable()
+    {
+        assertFails("SELECT * FROM JSON_TABLE('[1, 2, 3]', 'lax $[2]' COLUMNS(o FOR ORDINALITY))")
+                .hasErrorCode(NOT_SUPPORTED)
+                .hasMessage("line 1:15: JSON_TABLE is not yet supported");
+    }
+
+    @Test
+    public void testDisallowAggregationFunctionInUnnest()
+    {
+        assertFails("SELECT a FROM (VALUES (1), (2)) t(a), UNNEST(ARRAY[COUNT(t.a)])")
+                .hasErrorCode(EXPRESSION_NOT_SCALAR)
+                .hasMessage("line 1:46: UNNEST cannot contain aggregations, window functions or grouping operations: [COUNT(t.a)]");
+    }
+
+    @BeforeAll
     public void setup()
     {
         closer = Closer.create();
@@ -6668,6 +6749,7 @@ public void setup()
                 transactionManager,
                 emptyEventListenerManager(),
                 new AccessControlConfig(),
+                OpenTelemetry.noop(),
                 DefaultSystemAccessControl.NAME);
         accessControlManager.setSystemAccessControls(List.of(AllowAllSystemAccessControl.INSTANCE));
         this.accessControl = accessControlManager;
@@ -6693,14 +6775,14 @@ public void setup()
                         new ColumnMetadata("b", BIGINT),
                         new ColumnMetadata("c", BIGINT),
                         new ColumnMetadata("d", BIGINT))),
-                false));
+                FAIL));
 
         SchemaTableName table2 = new SchemaTableName("s1", "t2");
         inSetupTransaction(session -> metadata.createTable(session, TPCH_CATALOG,
                 new ConnectorTableMetadata(table2, ImmutableList.of(
                         new ColumnMetadata("a", BIGINT),
                         new ColumnMetadata("b", BIGINT))),
-                false));
+                FAIL));
 
         SchemaTableName table3 = new SchemaTableName("s1", "t3");
         inSetupTransaction(session -> metadata.createTable(session, TPCH_CATALOG,
@@ -6708,14 +6790,7 @@ public void setup()
                         new ColumnMetadata("a", BIGINT),
                         new ColumnMetadata("b", BIGINT),
                         ColumnMetadata.builder().setName("x").setType(BIGINT).setHidden(true).build())),
-                false));
-
-        // table in different catalog
-        SchemaTableName table4 = new SchemaTableName("s2", "t4");
-        inSetupTransaction(session -> metadata.createTable(session, SECOND_CATALOG,
-                new ConnectorTableMetadata(table4, ImmutableList.of(
-                        new ColumnMetadata("a", BIGINT))),
-                false));
+                FAIL));
 
         // table with a hidden column
         SchemaTableName table5 = new SchemaTableName("s1", "t5");
@@ -6723,7 +6798,7 @@ public void setup()
                 new ConnectorTableMetadata(table5, ImmutableList.of(
                         new ColumnMetadata("a", BIGINT),
                         ColumnMetadata.builder().setName("b").setType(BIGINT).setHidden(true).build())),
-                false));
+                FAIL));
 
         // table with a varchar column
         SchemaTableName table6 = new SchemaTableName("s1", "t6");
@@ -6733,7 +6808,7 @@ public void setup()
                         new ColumnMetadata("b", VARCHAR),
                         new ColumnMetadata("c", BIGINT),
                         new ColumnMetadata("d", BIGINT))),
-                false));
+                FAIL));
 
         // table with bigint, double, array of bigints and array of doubles column
         SchemaTableName table7 = new SchemaTableName("s1", "t7");
@@ -6743,7 +6818,7 @@ public void setup()
                         new ColumnMetadata("b", DOUBLE),
                         new ColumnMetadata("c", new ArrayType(BIGINT)),
                         new ColumnMetadata("d", new ArrayType(DOUBLE)))),
-                false));
+                FAIL));
 
         // materialized view referencing table in same schema
         MaterializedViewDefinition materializedViewData1 = new MaterializedViewDefinition(
@@ -6754,6 +6829,7 @@ public void setup()
                 Optional.of(Duration.ZERO),
                 Optional.of("comment"),
                 Identity.ofUser("user"),
+                ImmutableList.of(),
                 Optional.empty(),
                 ImmutableMap.of());
         inSetupTransaction(session -> metadata.createMaterializedView(session, new QualifiedObjectName(TPCH_CATALOG, "s1", "mv1"), materializedViewData1, false, true));
@@ -6765,7 +6841,8 @@ public void setup()
                 Optional.of("s1"),
                 ImmutableList.of(new ViewColumn("a", BIGINT.getTypeId(), Optional.empty())),
                 Optional.of("comment"),
-                Optional.of(Identity.ofUser("user")));
+                Optional.of(Identity.ofUser("user")),
+                ImmutableList.of());
         inSetupTransaction(session -> metadata.createView(session, new QualifiedObjectName(TPCH_CATALOG, "s1", "v1"), viewData1, false));
 
         // stale view (different column type)
@@ -6775,19 +6852,10 @@ public void setup()
                 Optional.of("s1"),
                 ImmutableList.of(new ViewColumn("a", VARCHAR.getTypeId(), Optional.empty())),
                 Optional.of("comment"),
-                Optional.of(Identity.ofUser("user")));
+                Optional.of(Identity.ofUser("user")),
+                ImmutableList.of());
         inSetupTransaction(session -> metadata.createView(session, new QualifiedObjectName(TPCH_CATALOG, "s1", "v2"), viewData2, false));
 
-        // view referencing table in different schema from itself and session
-        ViewDefinition viewData3 = new ViewDefinition(
-                "select a from t4",
-                Optional.of(SECOND_CATALOG),
-                Optional.of("s2"),
-                ImmutableList.of(new ViewColumn("a", BIGINT.getTypeId(), Optional.empty())),
-                Optional.of("comment"),
-                Optional.of(Identity.ofUser("owner")));
-        inSetupTransaction(session -> metadata.createView(session, new QualifiedObjectName(THIRD_CATALOG, "s3", "v3"), viewData3, false));
-
         // valid view with uppercase column name
         ViewDefinition viewData4 = new ViewDefinition(
                 "select A from t1",
@@ -6795,7 +6863,8 @@ public void setup()
                 Optional.of("s1"),
                 ImmutableList.of(new ViewColumn("a", BIGINT.getTypeId(), Optional.empty())),
                 Optional.of("comment"),
-                Optional.of(Identity.ofUser("user")));
+                Optional.of(Identity.ofUser("user")),
+                ImmutableList.of());
         inSetupTransaction(session -> metadata.createView(session, new QualifiedObjectName("tpch", "s1", "v4"), viewData4, false));
 
         // recursive view referencing to itself
@@ -6805,7 +6874,8 @@ public void setup()
                 Optional.of("s1"),
                 ImmutableList.of(new ViewColumn("a", BIGINT.getTypeId(), Optional.empty())),
                 Optional.of("comment"),
-                Optional.of(Identity.ofUser("user")));
+                Optional.of(Identity.ofUser("user")),
+                ImmutableList.of());
         inSetupTransaction(session -> metadata.createView(session, new QualifiedObjectName(TPCH_CATALOG, "s1", "v5"), viewData5, false));
 
         // type analysis for INSERT
@@ -6824,7 +6894,7 @@ public void setup()
                         new ColumnMetadata("nested_bounded_varchar_column", anonymousRow(createVarcharType(3))),
                         new ColumnMetadata("row_column", anonymousRow(TINYINT, createUnboundedVarcharType())),
                         new ColumnMetadata("date_column", DATE))),
-                false));
+                FAIL));
 
         // for identifier chain resolving tests
         queryRunner.createCatalog(CATALOG_FOR_IDENTIFIER_CHAIN_TESTS, new StaticConnectorFactory("chain", new TestingConnector(new TestingMetadata())), ImmutableMap.of());
@@ -6837,39 +6907,39 @@ public void setup()
         inSetupTransaction(session -> metadata.createTable(session, CATALOG_FOR_IDENTIFIER_CHAIN_TESTS,
                 new ConnectorTableMetadata(b, ImmutableList.of(
                         new ColumnMetadata("x", VARCHAR))),
-                false));
+                FAIL));
 
         SchemaTableName t1 = new SchemaTableName("a", "t1");
         inSetupTransaction(session -> metadata.createTable(session, CATALOG_FOR_IDENTIFIER_CHAIN_TESTS,
                 new ConnectorTableMetadata(t1, ImmutableList.of(
                         new ColumnMetadata("b", rowType))),
-                false));
+                FAIL));
 
         SchemaTableName t2 = new SchemaTableName("a", "t2");
         inSetupTransaction(session -> metadata.createTable(session, CATALOG_FOR_IDENTIFIER_CHAIN_TESTS,
                 new ConnectorTableMetadata(t2, ImmutableList.of(
                         new ColumnMetadata("a", rowType))),
-                false));
+                FAIL));
 
         SchemaTableName t3 = new SchemaTableName("a", "t3");
         inSetupTransaction(session -> metadata.createTable(session, CATALOG_FOR_IDENTIFIER_CHAIN_TESTS,
                 new ConnectorTableMetadata(t3, ImmutableList.of(
                         new ColumnMetadata("b", nestedRowType),
                         new ColumnMetadata("c", BIGINT))),
-                false));
+                FAIL));
 
         SchemaTableName t4 = new SchemaTableName("a", "t4");
         inSetupTransaction(session -> metadata.createTable(session, CATALOG_FOR_IDENTIFIER_CHAIN_TESTS,
                 new ConnectorTableMetadata(t4, ImmutableList.of(
                         new ColumnMetadata("b", doubleNestedRowType),
                         new ColumnMetadata("c", BIGINT))),
-                false));
+                FAIL));
 
         SchemaTableName t5 = new SchemaTableName("a", "t5");
         inSetupTransaction(session -> metadata.createTable(session, CATALOG_FOR_IDENTIFIER_CHAIN_TESTS,
                 new ConnectorTableMetadata(t5, ImmutableList.of(
                         new ColumnMetadata("b", singleFieldRowType))),
-                false));
+                FAIL));
 
         QualifiedObjectName tableViewAndMaterializedView = new QualifiedObjectName(TPCH_CATALOG, "s1", "table_view_and_materialized_view");
         inSetupTransaction(session -> metadata.createMaterializedView(
@@ -6883,6 +6953,7 @@ public void setup()
                         Optional.of(Duration.ZERO),
                         Optional.empty(),
                         Identity.ofUser("some user"),
+                        ImmutableList.of(),
                         Optional.of(new CatalogSchemaTableName(TPCH_CATALOG, "s1", "t1")),
                         ImmutableMap.of()),
                 false,
@@ -6893,7 +6964,8 @@ public void setup()
                 Optional.of("s1"),
                 ImmutableList.of(new ViewColumn("a", BIGINT.getTypeId(), Optional.empty())),
                 Optional.empty(),
-                Optional.empty());
+                Optional.empty(),
+                ImmutableList.of());
         inSetupTransaction(session -> metadata.createView(
                 session,
                 tableViewAndMaterializedView,
@@ -6905,7 +6977,7 @@ public void setup()
                 new ConnectorTableMetadata(
                         tableViewAndMaterializedView.asSchemaTableName(),
                         ImmutableList.of(new ColumnMetadata("a", BIGINT))),
-                false));
+                FAIL));
 
         QualifiedObjectName tableAndView = new QualifiedObjectName(TPCH_CATALOG, "s1", "table_and_view");
         inSetupTransaction(session -> metadata.createView(
@@ -6919,7 +6991,7 @@ public void setup()
                 new ConnectorTableMetadata(
                         tableAndView.asSchemaTableName(),
                         ImmutableList.of(new ColumnMetadata("a", BIGINT))),
-                false));
+                FAIL));
 
         QualifiedObjectName freshMaterializedView = new QualifiedObjectName(TPCH_CATALOG, "s1", "fresh_materialized_view");
         inSetupTransaction(session -> metadata.createMaterializedView(
@@ -6933,6 +7005,7 @@ public void setup()
                         Optional.empty(),
                         Optional.empty(),
                         Identity.ofUser("some user"),
+                        ImmutableList.of(),
                         // t3 has a, b column and hidden column x
                         Optional.of(new CatalogSchemaTableName(TPCH_CATALOG, "s1", "t3")),
                         ImmutableMap.of()),
@@ -6952,6 +7025,7 @@ public void setup()
                         Optional.empty(),
                         Optional.empty(),
                         Identity.ofUser("some user"),
+                        ImmutableList.of(),
                         Optional.of(new CatalogSchemaTableName(TPCH_CATALOG, "s1", "t2")),
                         ImmutableMap.of()),
                 false,
@@ -6970,6 +7044,7 @@ public void setup()
                         Optional.empty(),
                         Optional.empty(),
                         Identity.ofUser("some user"),
+                        ImmutableList.of(),
                         Optional.of(new CatalogSchemaTableName(TPCH_CATALOG, "s1", "t2")),
                         ImmutableMap.of()),
                 false,
@@ -6988,6 +7063,7 @@ public void setup()
                         Optional.empty(),
                         Optional.empty(),
                         Identity.ofUser("some user"),
+                        ImmutableList.of(),
                         Optional.of(new CatalogSchemaTableName(TPCH_CATALOG, "s1", "t2")),
                         ImmutableMap.of()),
                 false,
@@ -6995,7 +7071,23 @@ public void setup()
         testingConnectorMetadata.markMaterializedViewIsFresh(freshMaterializedMismatchedColumnType.asSchemaTableName());
     }
 
-    @AfterClass(alwaysRun = true)
+    @Test
+    public void testAlterTableAddRowField()
+    {
+        assertFails("ALTER TABLE a.t1 ADD COLUMN b.f3 INTEGER NOT NULL")
+                .hasErrorCode(NOT_SUPPORTED)
+                .hasMessage("line 1:1: Adding fields with NOT NULL constraint is unsupported");
+
+        assertFails("ALTER TABLE a.t1 ADD COLUMN b.f3 INTEGER WITH(foo='bar')")
+                .hasErrorCode(NOT_SUPPORTED)
+                .hasMessage("line 1:1: Adding fields with column properties is unsupported");
+
+        assertFails("ALTER TABLE a.t1 ADD COLUMN b.f3 INTEGER COMMENT 'test comment'")
+                .hasErrorCode(NOT_SUPPORTED)
+                .hasMessage("line 1:1: Adding fields with COMMENT is unsupported");
+    }
+
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -7010,7 +7102,7 @@ public void tearDown()
 
     private void inSetupTransaction(Consumer<Session> consumer)
     {
-        transaction(transactionManager, accessControl)
+        transaction(transactionManager, plannerContext.getMetadata(), accessControl)
                 .singleStatement()
                 .readUncommitted()
                 .execute(SETUP_SESSION, consumer);
@@ -7054,11 +7146,10 @@ public ConnectorTransactionHandle getConnectorTransaction(TransactionId transact
                         new PolymorphicStaticReturnTypeFunction(),
                         new PassThroughFunction(),
                         new RequiredColumnsFunction()))),
-                new SessionPropertyManager(),
                 tablePropertyManager,
                 analyzePropertyManager,
                 new TableProceduresPropertyManager(CatalogServiceProvider.fail("procedures are not supported in testing analyzer")));
-        AnalyzerFactory analyzerFactory = new AnalyzerFactory(statementAnalyzerFactory, statementRewrite);
+        AnalyzerFactory analyzerFactory = new AnalyzerFactory(statementAnalyzerFactory, statementRewrite, plannerContext.getTracer());
         return analyzerFactory.createAnalyzer(
                 session,
                 emptyList(),
@@ -7079,13 +7170,12 @@ private Analysis analyze(Session clientSession, @Language("SQL") String query)
 
     private Analysis analyze(Session clientSession, @Language("SQL") String query, AccessControl accessControl)
     {
-        return transaction(transactionManager, accessControl)
+        return transaction(transactionManager, plannerContext.getMetadata(), accessControl)
                 .singleStatement()
                 .readUncommitted()
                 .execute(clientSession, session -> {
                     Analyzer analyzer = createAnalyzer(session, accessControl);
-                    Statement statement = SQL_PARSER.createStatement(query, new ParsingOptions(
-                            new FeaturesConfig().isParseDecimalLiteralsAsDouble() ? AS_DOUBLE : AS_DECIMAL));
+                    Statement statement = SQL_PARSER.createStatement(query);
                     return analyzer.analyze(statement);
                 });
     }
diff --git a/core/trino-main/src/test/java/io/trino/sql/analyzer/TestFeaturesConfig.java b/core/trino-main/src/test/java/io/trino/sql/analyzer/TestFeaturesConfig.java
index 4e3321577add..8f64174a4c72 100644
--- a/core/trino-main/src/test/java/io/trino/sql/analyzer/TestFeaturesConfig.java
+++ b/core/trino-main/src/test/java/io/trino/sql/analyzer/TestFeaturesConfig.java
@@ -17,7 +17,7 @@
 import io.airlift.units.DataSize;
 import io.trino.FeaturesConfig;
 import io.trino.FeaturesConfig.DataIntegrityVerification;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -36,10 +36,10 @@ public class TestFeaturesConfig
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(FeaturesConfig.class)
-                .setLegacyCatalogRoles(false)
                 .setRedistributeWrites(true)
                 .setScaleWriters(true)
-                .setWriterMinSize(DataSize.of(32, MEGABYTE))
+                .setWriterScalingMinDataProcessed(DataSize.of(120, MEGABYTE))
+                .setMaxMemoryPerPartitionWriter(DataSize.of(256, MEGABYTE))
                 .setRegexLibrary(JONI)
                 .setRe2JDfaStatesLimit(Integer.MAX_VALUE)
                 .setRe2JDfaRetries(5)
@@ -52,7 +52,6 @@ public void testDefaults()
                 .setMemoryRevokingTarget(0.5)
                 .setExchangeCompressionEnabled(false)
                 .setExchangeDataIntegrityVerification(DataIntegrityVerification.ABORT)
-                .setParseDecimalLiteralsAsDouble(false)
                 .setPagesIndexEagerCompactionEnabled(false)
                 .setFilterAndProjectMinOutputPageSize(DataSize.of(500, KILOBYTE))
                 .setFilterAndProjectMinOutputPageRowCount(256)
@@ -64,7 +63,6 @@ public void testDefaults()
                 .setIncrementalHashArrayLoadFactorEnabled(true)
                 .setLegacyMaterializedViewGracePeriod(false)
                 .setHideInaccessibleColumns(false)
-                .setAllowSetViewAuthorization(false)
                 .setForceSpillingJoin(false)
                 .setFaultTolerantExecutionExchangeEncryptionEnabled(true));
     }
@@ -75,7 +73,8 @@ public void testExplicitPropertyMappings()
         Map<String, String> properties = ImmutableMap.<String, String>builder()
                 .put("redistribute-writes", "false")
                 .put("scale-writers", "false")
-                .put("writer-min-size", "42GB")
+                .put("writer-scaling-min-data-processed", "4GB")
+                .put("max-memory-per-partition-writer", "4GB")
                 .put("regex-library", "RE2J")
                 .put("re2j.dfa-states-limit", "42")
                 .put("re2j.dfa-retries", "42")
@@ -88,7 +87,6 @@ public void testExplicitPropertyMappings()
                 .put("memory-revoking-target", "0.8")
                 .put("exchange.compression-enabled", "true")
                 .put("exchange.data-integrity-verification", "RETRY")
-                .put("parse-decimal-literals-as-double", "true")
                 .put("pages-index.eager-compaction-enabled", "true")
                 .put("filter-and-project-min-output-page-size", "1MB")
                 .put("filter-and-project-min-output-page-row-count", "2048")
@@ -100,7 +98,6 @@ public void testExplicitPropertyMappings()
                 .put("incremental-hash-array-load-factor.enabled", "false")
                 .put("legacy.materialized-view-grace-period", "true")
                 .put("hide-inaccessible-columns", "true")
-                .put("legacy.allow-set-view-authorization", "true")
                 .put("force-spilling-join-operator", "true")
                 .put("fault-tolerant-execution.exchange-encryption-enabled", "false")
                 .buildOrThrow();
@@ -108,7 +105,8 @@ public void testExplicitPropertyMappings()
         FeaturesConfig expected = new FeaturesConfig()
                 .setRedistributeWrites(false)
                 .setScaleWriters(false)
-                .setWriterMinSize(DataSize.of(42, GIGABYTE))
+                .setWriterScalingMinDataProcessed(DataSize.of(4, GIGABYTE))
+                .setMaxMemoryPerPartitionWriter(DataSize.of(4, GIGABYTE))
                 .setRegexLibrary(RE2J)
                 .setRe2JDfaStatesLimit(42)
                 .setRe2JDfaRetries(42)
@@ -121,7 +119,6 @@ public void testExplicitPropertyMappings()
                 .setMemoryRevokingTarget(0.8)
                 .setExchangeCompressionEnabled(true)
                 .setExchangeDataIntegrityVerification(DataIntegrityVerification.RETRY)
-                .setParseDecimalLiteralsAsDouble(true)
                 .setPagesIndexEagerCompactionEnabled(true)
                 .setFilterAndProjectMinOutputPageSize(DataSize.of(1, MEGABYTE))
                 .setFilterAndProjectMinOutputPageRowCount(2048)
@@ -133,7 +130,6 @@ public void testExplicitPropertyMappings()
                 .setIncrementalHashArrayLoadFactorEnabled(false)
                 .setLegacyMaterializedViewGracePeriod(true)
                 .setHideInaccessibleColumns(true)
-                .setAllowSetViewAuthorization(true)
                 .setForceSpillingJoin(true)
                 .setFaultTolerantExecutionExchangeEncryptionEnabled(false);
         assertFullMapping(properties, expected);
diff --git a/core/trino-main/src/test/java/io/trino/sql/analyzer/TestOutput.java b/core/trino-main/src/test/java/io/trino/sql/analyzer/TestOutput.java
index ef110ac23894..ddaf57f7b157 100644
--- a/core/trino-main/src/test/java/io/trino/sql/analyzer/TestOutput.java
+++ b/core/trino-main/src/test/java/io/trino/sql/analyzer/TestOutput.java
@@ -18,8 +18,9 @@
 import io.airlift.json.JsonCodec;
 import io.trino.execution.Column;
 import io.trino.metadata.QualifiedObjectName;
+import io.trino.spi.connector.CatalogHandle.CatalogVersion;
 import io.trino.sql.analyzer.Analysis.SourceColumn;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -34,6 +35,7 @@ public void testRoundTrip()
     {
         Output expected = new Output(
                 "connectorId",
+                new CatalogVersion("default"),
                 "schema",
                 "table",
                 Optional.of(
diff --git a/core/trino-main/src/test/java/io/trino/sql/analyzer/TestScope.java b/core/trino-main/src/test/java/io/trino/sql/analyzer/TestScope.java
index cddf31c95e4a..b10861e27319 100644
--- a/core/trino-main/src/test/java/io/trino/sql/analyzer/TestScope.java
+++ b/core/trino-main/src/test/java/io/trino/sql/analyzer/TestScope.java
@@ -16,7 +16,7 @@
 import io.trino.sql.tree.DereferenceExpression;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/analyzer/TestTypeSignatureTranslator.java b/core/trino-main/src/test/java/io/trino/sql/analyzer/TestTypeSignatureTranslator.java
index e486c59bd3ae..a1640f3b4179 100644
--- a/core/trino-main/src/test/java/io/trino/sql/analyzer/TestTypeSignatureTranslator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/analyzer/TestTypeSignatureTranslator.java
@@ -15,7 +15,7 @@
 
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.Identifier;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Comparator;
 import java.util.Locale;
diff --git a/core/trino-main/src/test/java/io/trino/sql/gen/BenchmarkInCodeGenerator.java b/core/trino-main/src/test/java/io/trino/sql/gen/BenchmarkInCodeGenerator.java
index c8fb1a59833f..6e8e86489851 100644
--- a/core/trino-main/src/test/java/io/trino/sql/gen/BenchmarkInCodeGenerator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/gen/BenchmarkInCodeGenerator.java
@@ -29,6 +29,7 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.relational.RowExpression;
 import io.trino.sql.relational.SpecialForm;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -40,7 +41,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,7 +48,6 @@
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
-import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
 import static io.trino.metadata.FunctionManager.createTestingFunctionManager;
 import static io.trino.metadata.MetadataManager.createTestMetadataManager;
@@ -175,9 +174,9 @@ public void setup()
             Metadata metadata = createTestMetadataManager();
 
             List<ResolvedFunction> functionalDependencies = ImmutableList.of(
-                    metadata.resolveOperator(TEST_SESSION, OperatorType.EQUAL, ImmutableList.of(trinoType, trinoType)),
-                    metadata.resolveOperator(TEST_SESSION, OperatorType.HASH_CODE, ImmutableList.of(trinoType)),
-                    metadata.resolveOperator(TEST_SESSION, OperatorType.INDETERMINATE, ImmutableList.of(trinoType)));
+                    metadata.resolveOperator(OperatorType.EQUAL, ImmutableList.of(trinoType, trinoType)),
+                    metadata.resolveOperator(OperatorType.HASH_CODE, ImmutableList.of(trinoType)),
+                    metadata.resolveOperator(OperatorType.INDETERMINATE, ImmutableList.of(trinoType)));
             RowExpression filter = new SpecialForm(IN, BOOLEAN, arguments, functionalDependencies);
 
             FunctionManager functionManager = createTestingFunctionManager();
diff --git a/core/trino-main/src/test/java/io/trino/sql/gen/BenchmarkPageProcessor.java b/core/trino-main/src/test/java/io/trino/sql/gen/BenchmarkPageProcessor.java
index 394a0c64b296..e0b1ae1407cc 100644
--- a/core/trino-main/src/test/java/io/trino/sql/gen/BenchmarkPageProcessor.java
+++ b/core/trino-main/src/test/java/io/trino/sql/gen/BenchmarkPageProcessor.java
@@ -22,6 +22,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.VariableWidthBlock;
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.RowExpression;
 import io.trino.sql.relational.SpecialForm;
@@ -166,12 +167,30 @@ private static void project(int position, PageBuilder pageBuilder, Block extende
 
         private static boolean filter(int position, Block discountBlock, Block shipDateBlock, Block quantityBlock)
         {
-            return !shipDateBlock.isNull(position) && VARCHAR.getSlice(shipDateBlock, position).compareTo(MIN_SHIP_DATE) >= 0 &&
-                    !shipDateBlock.isNull(position) && VARCHAR.getSlice(shipDateBlock, position).compareTo(MAX_SHIP_DATE) < 0 &&
+            return !shipDateBlock.isNull(position) && greaterThanOrEqual(shipDateBlock, position, MIN_SHIP_DATE) &&
+                    !shipDateBlock.isNull(position) && lessThan(shipDateBlock, position, MAX_SHIP_DATE) &&
                     !discountBlock.isNull(position) && DOUBLE.getDouble(discountBlock, position) >= 0.05 &&
                     !discountBlock.isNull(position) && DOUBLE.getDouble(discountBlock, position) <= 0.07 &&
                     !quantityBlock.isNull(position) && DOUBLE.getDouble(quantityBlock, position) < 24;
         }
+
+        private static boolean lessThan(Block left, int leftPosition, Slice right)
+        {
+            VariableWidthBlock leftBlock = (VariableWidthBlock) left.getUnderlyingValueBlock();
+            Slice leftSlice = leftBlock.getRawSlice();
+            int leftOffset = leftBlock.getRawSliceOffset(leftPosition);
+            int leftLength = left.getSliceLength(leftPosition);
+            return leftSlice.compareTo(leftOffset, leftLength, right, 0, right.length()) < 0;
+        }
+
+        private static boolean greaterThanOrEqual(Block left, int leftPosition, Slice right)
+        {
+            VariableWidthBlock leftBlock = (VariableWidthBlock) left.getUnderlyingValueBlock();
+            Slice leftSlice = leftBlock.getRawSlice();
+            int leftOffset = leftBlock.getRawSliceOffset(leftPosition);
+            int leftLength = left.getSliceLength(leftPosition);
+            return leftSlice.compareTo(leftOffset, leftLength, right, 0, right.length()) >= 0;
+        }
     }
 
     // where shipdate >= '1994-01-01'
diff --git a/core/trino-main/src/test/java/io/trino/sql/gen/BenchmarkPageProcessor2.java b/core/trino-main/src/test/java/io/trino/sql/gen/BenchmarkPageProcessor2.java
index fa038e54bf53..1cd8a58b420a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/gen/BenchmarkPageProcessor2.java
+++ b/core/trino-main/src/test/java/io/trino/sql/gen/BenchmarkPageProcessor2.java
@@ -26,6 +26,7 @@
 import io.trino.spi.PageBuilder;
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.type.Type;
+import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.TypeAnalyzer;
 import io.trino.sql.planner.TypeProvider;
@@ -34,6 +35,7 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.NodeRef;
 import io.trino.testing.TestingSession;
+import io.trino.transaction.TestingTransactionManager;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -59,7 +61,7 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.ExpressionTestUtils.createExpression;
-import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
+import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
 import static java.util.Locale.ENGLISH;
 import static java.util.stream.Collectors.toList;
@@ -73,6 +75,11 @@
 @BenchmarkMode(Mode.AverageTime)
 public class BenchmarkPageProcessor2
 {
+    private static final TestingTransactionManager TRANSACTION_MANAGER = new TestingTransactionManager();
+    private static final PlannerContext PLANNER_CONTEXT = plannerContextBuilder()
+            .withTransactionManager(TRANSACTION_MANAGER)
+            .build();
+
     private static final Map<String, Type> TYPE_MAP = ImmutableMap.of("bigint", BIGINT, "varchar", VARCHAR);
     private static final TypeAnalyzer TYPE_ANALYZER = createTestingTypeAnalyzer(PLANNER_CONTEXT);
     private static final Session TEST_SESSION = TestingSession.testSessionBuilder().build();
@@ -171,7 +178,7 @@ else if (type == VARCHAR) {
 
     private RowExpression rowExpression(String value)
     {
-        Expression expression = createExpression(value, PLANNER_CONTEXT, TypeProvider.copyOf(symbolTypes));
+        Expression expression = createExpression(value, TRANSACTION_MANAGER, PLANNER_CONTEXT, TypeProvider.copyOf(symbolTypes));
 
         Map<NodeRef<Expression>, Type> expressionTypes = TYPE_ANALYZER.getTypes(TEST_SESSION, TypeProvider.copyOf(symbolTypes), expression);
         return SqlToRowExpressionTranslator.translate(
diff --git a/core/trino-main/src/test/java/io/trino/sql/gen/TestInCodeGenerator.java b/core/trino-main/src/test/java/io/trino/sql/gen/TestInCodeGenerator.java
index e28f0a5a226e..efe119e44ed0 100644
--- a/core/trino-main/src/test/java/io/trino/sql/gen/TestInCodeGenerator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/gen/TestInCodeGenerator.java
@@ -17,7 +17,7 @@
 import io.trino.metadata.TestingFunctionResolution;
 import io.trino.sql.relational.CallExpression;
 import io.trino.sql.relational.RowExpression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/core/trino-main/src/test/java/io/trino/sql/gen/TestJoinCompiler.java b/core/trino-main/src/test/java/io/trino/sql/gen/TestJoinCompiler.java
index c5144a88ec8c..a5d6d0604c07 100644
--- a/core/trino-main/src/test/java/io/trino/sql/gen/TestJoinCompiler.java
+++ b/core/trino-main/src/test/java/io/trino/sql/gen/TestJoinCompiler.java
@@ -30,9 +30,9 @@
 import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
 import io.trino.type.TypeTestUtils;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -54,253 +54,251 @@ public class TestJoinCompiler
     private static final BlockTypeOperators blockTypeOperators = new BlockTypeOperators(typeOperators);
     private static final JoinCompiler joinCompiler = new JoinCompiler(typeOperators);
 
-    @DataProvider(name = "hashEnabledValues")
-    public static Object[][] hashEnabledValuesProvider()
+    @Test
+    public void testSingleChannel()
     {
-        return new Object[][] {{true}, {false}};
-    }
+        for (boolean hashEnabled : Arrays.asList(true, false)) {
+            List<Type> joinTypes = ImmutableList.of(VARCHAR);
+            List<Integer> joinChannels = Ints.asList(0);
 
-    @Test(dataProvider = "hashEnabledValues")
-    public void testSingleChannel(boolean hashEnabled)
-    {
-        List<Type> joinTypes = ImmutableList.of(VARCHAR);
-        List<Integer> joinChannels = Ints.asList(0);
+            // compile a single channel hash strategy
+            PagesHashStrategyFactory pagesHashStrategyFactory = joinCompiler.compilePagesHashStrategyFactory(joinTypes, joinChannels);
 
-        // compile a single channel hash strategy
-        PagesHashStrategyFactory pagesHashStrategyFactory = joinCompiler.compilePagesHashStrategyFactory(joinTypes, joinChannels);
+            // create hash strategy with a single channel blocks -- make sure there is some overlap in values
+            ObjectArrayList<Block> channel = new ObjectArrayList<>();
+            channel.add(BlockAssertions.createStringSequenceBlock(10, 20));
+            channel.add(BlockAssertions.createStringSequenceBlock(20, 30));
+            channel.add(BlockAssertions.createStringSequenceBlock(15, 25));
 
-        // create hash strategy with a single channel blocks -- make sure there is some overlap in values
-        ObjectArrayList<Block> channel = new ObjectArrayList<>();
-        channel.add(BlockAssertions.createStringSequenceBlock(10, 20));
-        channel.add(BlockAssertions.createStringSequenceBlock(20, 30));
-        channel.add(BlockAssertions.createStringSequenceBlock(15, 25));
-
-        OptionalInt hashChannel = OptionalInt.empty();
-        List<ObjectArrayList<Block>> channels = ImmutableList.of(channel);
-        if (hashEnabled) {
-            ObjectArrayList<Block> hashChannelBuilder = new ObjectArrayList<>();
-            for (Block block : channel) {
-                hashChannelBuilder.add(TypeTestUtils.getHashBlock(joinTypes, block));
+            OptionalInt hashChannel = OptionalInt.empty();
+            List<ObjectArrayList<Block>> channels = ImmutableList.of(channel);
+            if (hashEnabled) {
+                ObjectArrayList<Block> hashChannelBuilder = new ObjectArrayList<>();
+                for (Block block : channel) {
+                    hashChannelBuilder.add(TypeTestUtils.getHashBlock(joinTypes, block));
+                }
+                hashChannel = OptionalInt.of(1);
+                channels = ImmutableList.of(channel, hashChannelBuilder);
             }
-            hashChannel = OptionalInt.of(1);
-            channels = ImmutableList.of(channel, hashChannelBuilder);
-        }
-        PagesHashStrategy hashStrategy = pagesHashStrategyFactory.createPagesHashStrategy(channels, hashChannel);
-
-        // verify channel count
-        assertEquals(hashStrategy.getChannelCount(), 1);
-
-        BlockTypeOperators blockTypeOperators = new BlockTypeOperators();
-        BlockPositionEqual equalOperator = blockTypeOperators.getEqualOperator(VARCHAR);
-        BlockPositionIsDistinctFrom distinctFromOperator = blockTypeOperators.getDistinctFromOperator(VARCHAR);
-        BlockPositionHashCode hashCodeOperator = blockTypeOperators.getHashCodeOperator(VARCHAR);
-
-        // verify hashStrategy is consistent with equals and hash code from block
-        for (int leftBlockIndex = 0; leftBlockIndex < channel.size(); leftBlockIndex++) {
-            Block leftBlock = channel.get(leftBlockIndex);
-
-            PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(VARCHAR));
-
-            for (int leftBlockPosition = 0; leftBlockPosition < leftBlock.getPositionCount(); leftBlockPosition++) {
-                // hash code of position must match block hash
-                assertEquals(hashStrategy.hashPosition(leftBlockIndex, leftBlockPosition), hashCodeOperator.hashCodeNullSafe(leftBlock, leftBlockPosition));
-
-                // position must be equal to itself
-                assertTrue(hashStrategy.positionEqualsPositionIgnoreNulls(leftBlockIndex, leftBlockPosition, leftBlockIndex, leftBlockPosition));
-
-                // check equality of every position against every other position in the block
-                for (int rightBlockIndex = 0; rightBlockIndex < channel.size(); rightBlockIndex++) {
-                    Block rightBlock = channel.get(rightBlockIndex);
-                    for (int rightBlockPosition = 0; rightBlockPosition < rightBlock.getPositionCount(); rightBlockPosition++) {
-                        boolean expected = equalOperator.equalNullSafe(leftBlock, leftBlockPosition, rightBlock, rightBlockPosition);
-                        boolean expectedNotDistinct = !distinctFromOperator.isDistinctFrom(leftBlock, leftBlockPosition, rightBlock, rightBlockPosition);
-                        assertEquals(hashStrategy.positionEqualsRow(leftBlockIndex, leftBlockPosition, rightBlockPosition, new Page(rightBlock)), expected);
-                        assertEquals(hashStrategy.positionNotDistinctFromRow(leftBlockIndex, leftBlockPosition, rightBlockPosition, new Page(rightBlock)), expectedNotDistinct);
-                        assertEquals(hashStrategy.rowEqualsRow(leftBlockPosition, new Page(leftBlock), rightBlockPosition, new Page(rightBlock)), expected);
-                        assertEquals(hashStrategy.rowNotDistinctFromRow(leftBlockPosition, new Page(leftBlock), rightBlockPosition, new Page(rightBlock)), expectedNotDistinct);
-                        assertEquals(hashStrategy.positionEqualsRowIgnoreNulls(leftBlockIndex, leftBlockPosition, rightBlockPosition, new Page(rightBlock)), expected);
-                        assertEquals(hashStrategy.positionEqualsPositionIgnoreNulls(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition), expected);
-                        assertEquals(hashStrategy.positionEqualsPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition), expected);
-                        assertEquals(hashStrategy.positionNotDistinctFromPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition), expectedNotDistinct);
+            PagesHashStrategy hashStrategy = pagesHashStrategyFactory.createPagesHashStrategy(channels, hashChannel);
+
+            // verify channel count
+            assertEquals(hashStrategy.getChannelCount(), 1);
+
+            BlockTypeOperators blockTypeOperators = new BlockTypeOperators();
+            BlockPositionEqual equalOperator = blockTypeOperators.getEqualOperator(VARCHAR);
+            BlockPositionIsDistinctFrom distinctFromOperator = blockTypeOperators.getDistinctFromOperator(VARCHAR);
+            BlockPositionHashCode hashCodeOperator = blockTypeOperators.getHashCodeOperator(VARCHAR);
+
+            // verify hashStrategy is consistent with equals and hash code from block
+            for (int leftBlockIndex = 0; leftBlockIndex < channel.size(); leftBlockIndex++) {
+                Block leftBlock = channel.get(leftBlockIndex);
+
+                PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(VARCHAR));
+
+                for (int leftBlockPosition = 0; leftBlockPosition < leftBlock.getPositionCount(); leftBlockPosition++) {
+                    // hash code of position must match block hash
+                    assertEquals(hashStrategy.hashPosition(leftBlockIndex, leftBlockPosition), hashCodeOperator.hashCodeNullSafe(leftBlock, leftBlockPosition));
+
+                    // position must be equal to itself
+                    assertTrue(hashStrategy.positionEqualsPositionIgnoreNulls(leftBlockIndex, leftBlockPosition, leftBlockIndex, leftBlockPosition));
+
+                    // check equality of every position against every other position in the block
+                    for (int rightBlockIndex = 0; rightBlockIndex < channel.size(); rightBlockIndex++) {
+                        Block rightBlock = channel.get(rightBlockIndex);
+                        for (int rightBlockPosition = 0; rightBlockPosition < rightBlock.getPositionCount(); rightBlockPosition++) {
+                            boolean expected = equalOperator.equalNullSafe(leftBlock, leftBlockPosition, rightBlock, rightBlockPosition);
+                            boolean expectedNotDistinct = !distinctFromOperator.isDistinctFrom(leftBlock, leftBlockPosition, rightBlock, rightBlockPosition);
+                            assertEquals(hashStrategy.positionEqualsRow(leftBlockIndex, leftBlockPosition, rightBlockPosition, new Page(rightBlock)), expected);
+                            assertEquals(hashStrategy.positionNotDistinctFromRow(leftBlockIndex, leftBlockPosition, rightBlockPosition, new Page(rightBlock)), expectedNotDistinct);
+                            assertEquals(hashStrategy.rowEqualsRow(leftBlockPosition, new Page(leftBlock), rightBlockPosition, new Page(rightBlock)), expected);
+                            assertEquals(hashStrategy.rowNotDistinctFromRow(leftBlockPosition, new Page(leftBlock), rightBlockPosition, new Page(rightBlock)), expectedNotDistinct);
+                            assertEquals(hashStrategy.positionEqualsRowIgnoreNulls(leftBlockIndex, leftBlockPosition, rightBlockPosition, new Page(rightBlock)), expected);
+                            assertEquals(hashStrategy.positionEqualsPositionIgnoreNulls(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition), expected);
+                            assertEquals(hashStrategy.positionEqualsPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition), expected);
+                            assertEquals(hashStrategy.positionNotDistinctFromPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition), expectedNotDistinct);
+                        }
                     }
-                }
 
-                // check equality of every position against every other position in the block cursor
-                for (int rightBlockIndex = 0; rightBlockIndex < channel.size(); rightBlockIndex++) {
-                    Block rightBlock = channel.get(rightBlockIndex);
-                    for (int rightBlockPosition = 0; rightBlockPosition < rightBlock.getPositionCount(); rightBlockPosition++) {
-                        boolean expected = equalOperator.equalNullSafe(leftBlock, leftBlockPosition, rightBlock, rightBlockPosition);
-                        boolean expectedNotDistinct = !distinctFromOperator.isDistinctFrom(leftBlock, leftBlockPosition, rightBlock, rightBlockPosition);
-                        assertEquals(hashStrategy.positionEqualsRow(leftBlockIndex, leftBlockPosition, rightBlockPosition, new Page(rightBlock)), expected);
-                        assertEquals(hashStrategy.positionNotDistinctFromRow(leftBlockIndex, leftBlockPosition, rightBlockPosition, new Page(rightBlock)), expectedNotDistinct);
-                        assertEquals(hashStrategy.rowEqualsRow(leftBlockPosition, new Page(leftBlock), rightBlockPosition, new Page(rightBlock)), expected);
-                        assertEquals(hashStrategy.rowNotDistinctFromRow(leftBlockPosition, new Page(leftBlock), rightBlockPosition, new Page(rightBlock)), expectedNotDistinct);
-                        assertEquals(hashStrategy.positionEqualsRowIgnoreNulls(leftBlockIndex, leftBlockPosition, rightBlockPosition, new Page(rightBlock)), expected);
-                        assertEquals(hashStrategy.positionEqualsPositionIgnoreNulls(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition), expected);
-                        assertEquals(hashStrategy.positionEqualsPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition), expected);
-                        assertEquals(hashStrategy.positionNotDistinctFromPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition), expectedNotDistinct);
+                    // check equality of every position against every other position in the block cursor
+                    for (int rightBlockIndex = 0; rightBlockIndex < channel.size(); rightBlockIndex++) {
+                        Block rightBlock = channel.get(rightBlockIndex);
+                        for (int rightBlockPosition = 0; rightBlockPosition < rightBlock.getPositionCount(); rightBlockPosition++) {
+                            boolean expected = equalOperator.equalNullSafe(leftBlock, leftBlockPosition, rightBlock, rightBlockPosition);
+                            boolean expectedNotDistinct = !distinctFromOperator.isDistinctFrom(leftBlock, leftBlockPosition, rightBlock, rightBlockPosition);
+                            assertEquals(hashStrategy.positionEqualsRow(leftBlockIndex, leftBlockPosition, rightBlockPosition, new Page(rightBlock)), expected);
+                            assertEquals(hashStrategy.positionNotDistinctFromRow(leftBlockIndex, leftBlockPosition, rightBlockPosition, new Page(rightBlock)), expectedNotDistinct);
+                            assertEquals(hashStrategy.rowEqualsRow(leftBlockPosition, new Page(leftBlock), rightBlockPosition, new Page(rightBlock)), expected);
+                            assertEquals(hashStrategy.rowNotDistinctFromRow(leftBlockPosition, new Page(leftBlock), rightBlockPosition, new Page(rightBlock)), expectedNotDistinct);
+                            assertEquals(hashStrategy.positionEqualsRowIgnoreNulls(leftBlockIndex, leftBlockPosition, rightBlockPosition, new Page(rightBlock)), expected);
+                            assertEquals(hashStrategy.positionEqualsPositionIgnoreNulls(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition), expected);
+                            assertEquals(hashStrategy.positionEqualsPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition), expected);
+                            assertEquals(hashStrategy.positionNotDistinctFromPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition), expectedNotDistinct);
+                        }
                     }
+
+                    // write position to output block
+                    pageBuilder.declarePosition();
+                    hashStrategy.appendTo(leftBlockIndex, leftBlockPosition, pageBuilder, 0);
                 }
 
-                // write position to output block
-                pageBuilder.declarePosition();
-                hashStrategy.appendTo(leftBlockIndex, leftBlockPosition, pageBuilder, 0);
+                // verify output block matches
+                assertBlockEquals(VARCHAR, pageBuilder.build().getBlock(0), leftBlock);
             }
-
-            // verify output block matches
-            assertBlockEquals(VARCHAR, pageBuilder.build().getBlock(0), leftBlock);
         }
     }
 
-    @Test(dataProvider = "hashEnabledValues")
-    public void testMultiChannel(boolean hashEnabled)
+    @Test
+    public void testMultiChannel()
     {
-        // compile a single channel hash strategy
-        List<Type> types = ImmutableList.of(VARCHAR, VARCHAR, BIGINT, DOUBLE, BOOLEAN, VARCHAR);
-        List<Type> joinTypes = ImmutableList.of(VARCHAR, BIGINT, DOUBLE, BOOLEAN);
-        List<Type> outputTypes = ImmutableList.of(VARCHAR, BIGINT, DOUBLE, BOOLEAN, VARCHAR);
-        List<Integer> joinChannels = Ints.asList(1, 2, 3, 4);
-        List<Integer> outputChannels = Ints.asList(1, 2, 3, 4, 0);
-
-        // crate hash strategy with a single channel blocks -- make sure there is some overlap in values
-        ObjectArrayList<Block> extraChannel = new ObjectArrayList<>();
-        extraChannel.add(BlockAssertions.createStringSequenceBlock(10, 20));
-        extraChannel.add(BlockAssertions.createStringSequenceBlock(20, 30));
-        extraChannel.add(BlockAssertions.createStringSequenceBlock(15, 25));
-        ObjectArrayList<Block> varcharChannel = new ObjectArrayList<>();
-        varcharChannel.add(BlockAssertions.createStringSequenceBlock(10, 20));
-        varcharChannel.add(BlockAssertions.createStringSequenceBlock(20, 30));
-        varcharChannel.add(BlockAssertions.createStringSequenceBlock(15, 25));
-        ObjectArrayList<Block> longChannel = new ObjectArrayList<>();
-        longChannel.add(BlockAssertions.createLongSequenceBlock(10, 20));
-        longChannel.add(BlockAssertions.createLongSequenceBlock(20, 30));
-        longChannel.add(BlockAssertions.createLongSequenceBlock(15, 25));
-        ObjectArrayList<Block> doubleChannel = new ObjectArrayList<>();
-        doubleChannel.add(BlockAssertions.createDoubleSequenceBlock(10, 20));
-        doubleChannel.add(BlockAssertions.createDoubleSequenceBlock(20, 30));
-        doubleChannel.add(BlockAssertions.createDoubleSequenceBlock(15, 25));
-        ObjectArrayList<Block> booleanChannel = new ObjectArrayList<>();
-        booleanChannel.add(BlockAssertions.createBooleanSequenceBlock(10, 20));
-        booleanChannel.add(BlockAssertions.createBooleanSequenceBlock(20, 30));
-        booleanChannel.add(BlockAssertions.createBooleanSequenceBlock(15, 25));
-        ObjectArrayList<Block> extraUnusedChannel = new ObjectArrayList<>();
-        extraUnusedChannel.add(BlockAssertions.createBooleanSequenceBlock(10, 20));
-        extraUnusedChannel.add(BlockAssertions.createBooleanSequenceBlock(20, 30));
-        extraUnusedChannel.add(BlockAssertions.createBooleanSequenceBlock(15, 25));
-
-        OptionalInt hashChannel = OptionalInt.empty();
-        ImmutableList<ObjectArrayList<Block>> channels = ImmutableList.of(extraChannel, varcharChannel, longChannel, doubleChannel, booleanChannel, extraUnusedChannel);
-        ObjectArrayList<Block> precomputedHash = new ObjectArrayList<>();
-        if (hashEnabled) {
-            for (int i = 0; i < 3; i++) {
-                precomputedHash.add(TypeTestUtils.getHashBlock(joinTypes, varcharChannel.get(i), longChannel.get(i), doubleChannel.get(i), booleanChannel.get(i)));
+        for (boolean hashEnabled : Arrays.asList(true, false)) {
+            // compile a single channel hash strategy
+            List<Type> types = ImmutableList.of(VARCHAR, VARCHAR, BIGINT, DOUBLE, BOOLEAN, VARCHAR);
+            List<Type> joinTypes = ImmutableList.of(VARCHAR, BIGINT, DOUBLE, BOOLEAN);
+            List<Type> outputTypes = ImmutableList.of(VARCHAR, BIGINT, DOUBLE, BOOLEAN, VARCHAR);
+            List<Integer> joinChannels = Ints.asList(1, 2, 3, 4);
+            List<Integer> outputChannels = Ints.asList(1, 2, 3, 4, 0);
+
+            // crate hash strategy with a single channel blocks -- make sure there is some overlap in values
+            ObjectArrayList<Block> extraChannel = new ObjectArrayList<>();
+            extraChannel.add(BlockAssertions.createStringSequenceBlock(10, 20));
+            extraChannel.add(BlockAssertions.createStringSequenceBlock(20, 30));
+            extraChannel.add(BlockAssertions.createStringSequenceBlock(15, 25));
+            ObjectArrayList<Block> varcharChannel = new ObjectArrayList<>();
+            varcharChannel.add(BlockAssertions.createStringSequenceBlock(10, 20));
+            varcharChannel.add(BlockAssertions.createStringSequenceBlock(20, 30));
+            varcharChannel.add(BlockAssertions.createStringSequenceBlock(15, 25));
+            ObjectArrayList<Block> longChannel = new ObjectArrayList<>();
+            longChannel.add(BlockAssertions.createLongSequenceBlock(10, 20));
+            longChannel.add(BlockAssertions.createLongSequenceBlock(20, 30));
+            longChannel.add(BlockAssertions.createLongSequenceBlock(15, 25));
+            ObjectArrayList<Block> doubleChannel = new ObjectArrayList<>();
+            doubleChannel.add(BlockAssertions.createDoubleSequenceBlock(10, 20));
+            doubleChannel.add(BlockAssertions.createDoubleSequenceBlock(20, 30));
+            doubleChannel.add(BlockAssertions.createDoubleSequenceBlock(15, 25));
+            ObjectArrayList<Block> booleanChannel = new ObjectArrayList<>();
+            booleanChannel.add(BlockAssertions.createBooleanSequenceBlock(10, 20));
+            booleanChannel.add(BlockAssertions.createBooleanSequenceBlock(20, 30));
+            booleanChannel.add(BlockAssertions.createBooleanSequenceBlock(15, 25));
+            ObjectArrayList<Block> extraUnusedChannel = new ObjectArrayList<>();
+            extraUnusedChannel.add(BlockAssertions.createBooleanSequenceBlock(10, 20));
+            extraUnusedChannel.add(BlockAssertions.createBooleanSequenceBlock(20, 30));
+            extraUnusedChannel.add(BlockAssertions.createBooleanSequenceBlock(15, 25));
+
+            OptionalInt hashChannel = OptionalInt.empty();
+            ImmutableList<ObjectArrayList<Block>> channels = ImmutableList.of(extraChannel, varcharChannel, longChannel, doubleChannel, booleanChannel, extraUnusedChannel);
+            ObjectArrayList<Block> precomputedHash = new ObjectArrayList<>();
+            if (hashEnabled) {
+                for (int i = 0; i < 3; i++) {
+                    precomputedHash.add(TypeTestUtils.getHashBlock(joinTypes, varcharChannel.get(i), longChannel.get(i), doubleChannel.get(i), booleanChannel.get(i)));
+                }
+                hashChannel = OptionalInt.of(6);
+                channels = ImmutableList.of(extraChannel, varcharChannel, longChannel, doubleChannel, booleanChannel, extraUnusedChannel, precomputedHash);
+                types = ImmutableList.of(VARCHAR, VARCHAR, BIGINT, DOUBLE, BOOLEAN, VARCHAR, BIGINT);
+                outputTypes = ImmutableList.of(VARCHAR, BIGINT, DOUBLE, BOOLEAN, VARCHAR, BIGINT);
+                outputChannels = Ints.asList(1, 2, 3, 4, 0, 6);
             }
-            hashChannel = OptionalInt.of(6);
-            channels = ImmutableList.of(extraChannel, varcharChannel, longChannel, doubleChannel, booleanChannel, extraUnusedChannel, precomputedHash);
-            types = ImmutableList.of(VARCHAR, VARCHAR, BIGINT, DOUBLE, BOOLEAN, VARCHAR, BIGINT);
-            outputTypes = ImmutableList.of(VARCHAR, BIGINT, DOUBLE, BOOLEAN, VARCHAR, BIGINT);
-            outputChannels = Ints.asList(1, 2, 3, 4, 0, 6);
-        }
-
-        PagesHashStrategyFactory pagesHashStrategyFactory = joinCompiler.compilePagesHashStrategyFactory(types, joinChannels, Optional.of(outputChannels));
-        PagesHashStrategy hashStrategy = pagesHashStrategyFactory.createPagesHashStrategy(channels, hashChannel);
-        // todo add tests for filter function
-        PagesHashStrategy expectedHashStrategy = new SimplePagesHashStrategy(types, outputChannels, channels, joinChannels, hashChannel, Optional.empty(), blockTypeOperators);
-
-        // verify channel count
-        assertEquals(hashStrategy.getChannelCount(), outputChannels.size());
-        // verify size
-        int instanceSize = instanceSize(hashStrategy.getClass());
-        long sizeInBytes = instanceSize +
-                (channels.size() > 0 ? sizeOf(channels.get(0).elements()) * channels.size() : 0) +
-                channels.stream()
-                        .flatMap(List::stream)
-                        .mapToLong(Block::getRetainedSizeInBytes)
-                        .sum();
-        assertEquals(hashStrategy.getSizeInBytes(), sizeInBytes);
-
-        // verify hashStrategy is consistent with equals and hash code from block
-        for (int leftBlockIndex = 0; leftBlockIndex < varcharChannel.size(); leftBlockIndex++) {
-            PageBuilder pageBuilder = new PageBuilder(outputTypes);
-
-            Block[] leftBlocks = new Block[4];
-            leftBlocks[0] = varcharChannel.get(leftBlockIndex);
-            leftBlocks[1] = longChannel.get(leftBlockIndex);
-            leftBlocks[2] = doubleChannel.get(leftBlockIndex);
-            leftBlocks[3] = booleanChannel.get(leftBlockIndex);
-
-            int leftPositionCount = varcharChannel.get(leftBlockIndex).getPositionCount();
-            for (int leftBlockPosition = 0; leftBlockPosition < leftPositionCount; leftBlockPosition++) {
-                // hash code of position must match block hash
-                assertEquals(
-                        hashStrategy.hashPosition(leftBlockIndex, leftBlockPosition),
-                        expectedHashStrategy.hashPosition(leftBlockIndex, leftBlockPosition));
-
-                // position must be equal to itself
-                assertTrue(hashStrategy.positionEqualsPositionIgnoreNulls(leftBlockIndex, leftBlockPosition, leftBlockIndex, leftBlockPosition));
-                assertTrue(hashStrategy.positionEqualsPosition(leftBlockIndex, leftBlockPosition, leftBlockIndex, leftBlockPosition));
-                assertTrue(hashStrategy.positionNotDistinctFromPosition(leftBlockIndex, leftBlockPosition, leftBlockIndex, leftBlockPosition));
 
-                // check equality of every position against every other position in the block
-                for (int rightBlockIndex = 0; rightBlockIndex < varcharChannel.size(); rightBlockIndex++) {
-                    Block rightBlock = varcharChannel.get(rightBlockIndex);
-                    for (int rightBlockPosition = 0; rightBlockPosition < rightBlock.getPositionCount(); rightBlockPosition++) {
-                        assertEquals(
-                                hashStrategy.positionEqualsPositionIgnoreNulls(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition),
-                                expectedHashStrategy.positionEqualsPositionIgnoreNulls(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition));
-                        assertEquals(
-                                hashStrategy.positionEqualsPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition),
-                                expectedHashStrategy.positionEqualsPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition));
-                        assertEquals(
-                                hashStrategy.positionNotDistinctFromPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition),
-                                expectedHashStrategy.positionNotDistinctFromPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition));
+            PagesHashStrategyFactory pagesHashStrategyFactory = joinCompiler.compilePagesHashStrategyFactory(types, joinChannels, Optional.of(outputChannels));
+            PagesHashStrategy hashStrategy = pagesHashStrategyFactory.createPagesHashStrategy(channels, hashChannel);
+            // todo add tests for filter function
+            PagesHashStrategy expectedHashStrategy = new SimplePagesHashStrategy(types, outputChannels, channels, joinChannels, hashChannel, Optional.empty(), blockTypeOperators);
+
+            // verify channel count
+            assertEquals(hashStrategy.getChannelCount(), outputChannels.size());
+            // verify size
+            int instanceSize = instanceSize(hashStrategy.getClass());
+            long sizeInBytes = instanceSize +
+                    (channels.size() > 0 ? sizeOf(channels.get(0).elements()) * channels.size() : 0) +
+                    channels.stream()
+                            .flatMap(List::stream)
+                            .mapToLong(Block::getRetainedSizeInBytes)
+                            .sum();
+            assertEquals(hashStrategy.getSizeInBytes(), sizeInBytes);
+
+            // verify hashStrategy is consistent with equals and hash code from block
+            for (int leftBlockIndex = 0; leftBlockIndex < varcharChannel.size(); leftBlockIndex++) {
+                PageBuilder pageBuilder = new PageBuilder(outputTypes);
+
+                Block[] leftBlocks = new Block[4];
+                leftBlocks[0] = varcharChannel.get(leftBlockIndex);
+                leftBlocks[1] = longChannel.get(leftBlockIndex);
+                leftBlocks[2] = doubleChannel.get(leftBlockIndex);
+                leftBlocks[3] = booleanChannel.get(leftBlockIndex);
+
+                int leftPositionCount = varcharChannel.get(leftBlockIndex).getPositionCount();
+                for (int leftBlockPosition = 0; leftBlockPosition < leftPositionCount; leftBlockPosition++) {
+                    // hash code of position must match block hash
+                    assertEquals(
+                            hashStrategy.hashPosition(leftBlockIndex, leftBlockPosition),
+                            expectedHashStrategy.hashPosition(leftBlockIndex, leftBlockPosition));
+
+                    // position must be equal to itself
+                    assertTrue(hashStrategy.positionEqualsPositionIgnoreNulls(leftBlockIndex, leftBlockPosition, leftBlockIndex, leftBlockPosition));
+                    assertTrue(hashStrategy.positionEqualsPosition(leftBlockIndex, leftBlockPosition, leftBlockIndex, leftBlockPosition));
+                    assertTrue(hashStrategy.positionNotDistinctFromPosition(leftBlockIndex, leftBlockPosition, leftBlockIndex, leftBlockPosition));
+
+                    // check equality of every position against every other position in the block
+                    for (int rightBlockIndex = 0; rightBlockIndex < varcharChannel.size(); rightBlockIndex++) {
+                        Block rightBlock = varcharChannel.get(rightBlockIndex);
+                        for (int rightBlockPosition = 0; rightBlockPosition < rightBlock.getPositionCount(); rightBlockPosition++) {
+                            assertEquals(
+                                    hashStrategy.positionEqualsPositionIgnoreNulls(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition),
+                                    expectedHashStrategy.positionEqualsPositionIgnoreNulls(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition));
+                            assertEquals(
+                                    hashStrategy.positionEqualsPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition),
+                                    expectedHashStrategy.positionEqualsPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition));
+                            assertEquals(
+                                    hashStrategy.positionNotDistinctFromPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition),
+                                    expectedHashStrategy.positionNotDistinctFromPosition(leftBlockIndex, leftBlockPosition, rightBlockIndex, rightBlockPosition));
+                        }
                     }
-                }
 
-                // check equality of every position against every other position in the block cursor
-                for (int rightBlockIndex = 0; rightBlockIndex < varcharChannel.size(); rightBlockIndex++) {
-                    Block[] rightBlocks = new Block[4];
-                    rightBlocks[0] = varcharChannel.get(rightBlockIndex);
-                    rightBlocks[1] = longChannel.get(rightBlockIndex);
-                    rightBlocks[2] = doubleChannel.get(rightBlockIndex);
-                    rightBlocks[3] = booleanChannel.get(rightBlockIndex);
-
-                    int rightPositionCount = varcharChannel.get(rightBlockIndex).getPositionCount();
-                    for (int rightPosition = 0; rightPosition < rightPositionCount; rightPosition++) {
-                        boolean expected = expectedHashStrategy.positionEqualsRow(leftBlockIndex, leftBlockPosition, rightPosition, new Page(rightBlocks));
-                        boolean expectedNotDistinct = expectedHashStrategy.positionNotDistinctFromRow(leftBlockIndex, leftBlockPosition, rightPosition, new Page(rightBlocks));
-
-                        assertEquals(hashStrategy.positionEqualsRow(leftBlockIndex, leftBlockPosition, rightPosition, new Page(rightBlocks)), expected);
-                        assertEquals(hashStrategy.positionNotDistinctFromRow(leftBlockIndex, leftBlockPosition, rightPosition, new Page(rightBlocks)), expectedNotDistinct);
-                        assertEquals(hashStrategy.rowEqualsRow(leftBlockPosition, new Page(leftBlocks), rightPosition, new Page(rightBlocks)), expected);
-                        assertEquals(hashStrategy.rowNotDistinctFromRow(leftBlockPosition, new Page(leftBlocks), rightPosition, new Page(rightBlocks)), expectedNotDistinct);
-                        assertEquals(hashStrategy.positionEqualsRowIgnoreNulls(leftBlockIndex, leftBlockPosition, rightPosition, new Page(rightBlocks)), expected);
+                    // check equality of every position against every other position in the block cursor
+                    for (int rightBlockIndex = 0; rightBlockIndex < varcharChannel.size(); rightBlockIndex++) {
+                        Block[] rightBlocks = new Block[4];
+                        rightBlocks[0] = varcharChannel.get(rightBlockIndex);
+                        rightBlocks[1] = longChannel.get(rightBlockIndex);
+                        rightBlocks[2] = doubleChannel.get(rightBlockIndex);
+                        rightBlocks[3] = booleanChannel.get(rightBlockIndex);
+
+                        int rightPositionCount = varcharChannel.get(rightBlockIndex).getPositionCount();
+                        for (int rightPosition = 0; rightPosition < rightPositionCount; rightPosition++) {
+                            boolean expected = expectedHashStrategy.positionEqualsRow(leftBlockIndex, leftBlockPosition, rightPosition, new Page(rightBlocks));
+                            boolean expectedNotDistinct = expectedHashStrategy.positionNotDistinctFromRow(leftBlockIndex, leftBlockPosition, rightPosition, new Page(rightBlocks));
+
+                            assertEquals(hashStrategy.positionEqualsRow(leftBlockIndex, leftBlockPosition, rightPosition, new Page(rightBlocks)), expected);
+                            assertEquals(hashStrategy.positionNotDistinctFromRow(leftBlockIndex, leftBlockPosition, rightPosition, new Page(rightBlocks)), expectedNotDistinct);
+                            assertEquals(hashStrategy.rowEqualsRow(leftBlockPosition, new Page(leftBlocks), rightPosition, new Page(rightBlocks)), expected);
+                            assertEquals(hashStrategy.rowNotDistinctFromRow(leftBlockPosition, new Page(leftBlocks), rightPosition, new Page(rightBlocks)), expectedNotDistinct);
+                            assertEquals(hashStrategy.positionEqualsRowIgnoreNulls(leftBlockIndex, leftBlockPosition, rightPosition, new Page(rightBlocks)), expected);
+                        }
                     }
-                }
 
-                // write position to output block
-                pageBuilder.declarePosition();
-                hashStrategy.appendTo(leftBlockIndex, leftBlockPosition, pageBuilder, 0);
-            }
+                    // write position to output block
+                    pageBuilder.declarePosition();
+                    hashStrategy.appendTo(leftBlockIndex, leftBlockPosition, pageBuilder, 0);
+                }
 
-            // verify output block matches
-            Page page = pageBuilder.build();
-            if (hashEnabled) {
-                assertPageEquals(outputTypes, page, new Page(
-                        varcharChannel.get(leftBlockIndex),
-                        longChannel.get(leftBlockIndex),
-                        doubleChannel.get(leftBlockIndex),
-                        booleanChannel.get(leftBlockIndex),
-                        extraChannel.get(leftBlockIndex),
-                        precomputedHash.get(leftBlockIndex)));
-            }
-            else {
-                assertPageEquals(outputTypes, page, new Page(
-                        varcharChannel.get(leftBlockIndex),
-                        longChannel.get(leftBlockIndex),
-                        doubleChannel.get(leftBlockIndex),
-                        booleanChannel.get(leftBlockIndex),
-                        extraChannel.get(leftBlockIndex)));
+                // verify output block matches
+                Page page = pageBuilder.build();
+                if (hashEnabled) {
+                    assertPageEquals(outputTypes, page, new Page(
+                            varcharChannel.get(leftBlockIndex),
+                            longChannel.get(leftBlockIndex),
+                            doubleChannel.get(leftBlockIndex),
+                            booleanChannel.get(leftBlockIndex),
+                            extraChannel.get(leftBlockIndex),
+                            precomputedHash.get(leftBlockIndex)));
+                }
+                else {
+                    assertPageEquals(outputTypes, page, new Page(
+                            varcharChannel.get(leftBlockIndex),
+                            longChannel.get(leftBlockIndex),
+                            doubleChannel.get(leftBlockIndex),
+                            booleanChannel.get(leftBlockIndex),
+                            extraChannel.get(leftBlockIndex)));
+                }
             }
         }
     }
diff --git a/core/trino-main/src/test/java/io/trino/sql/gen/TestPageFunctionCompiler.java b/core/trino-main/src/test/java/io/trino/sql/gen/TestPageFunctionCompiler.java
index d6462dbd544a..9a6136b4d8f6 100644
--- a/core/trino-main/src/test/java/io/trino/sql/gen/TestPageFunctionCompiler.java
+++ b/core/trino-main/src/test/java/io/trino/sql/gen/TestPageFunctionCompiler.java
@@ -23,7 +23,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.sql.relational.CallExpression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.function.Supplier;
diff --git a/core/trino-main/src/test/java/io/trino/sql/gen/TestVarArgsToArrayAdapterGenerator.java b/core/trino-main/src/test/java/io/trino/sql/gen/TestVarArgsToArrayAdapterGenerator.java
index 282a9050744a..9129c7d3a1de 100644
--- a/core/trino-main/src/test/java/io/trino/sql/gen/TestVarArgsToArrayAdapterGenerator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/gen/TestVarArgsToArrayAdapterGenerator.java
@@ -101,9 +101,8 @@ public static class TestVarArgsSum
 
         private TestVarArgsSum()
         {
-            super(FunctionMetadata.scalarBuilder()
+            super(FunctionMetadata.scalarBuilder("var_args_sum")
                     .signature(Signature.builder()
-                            .name("var_args_sum")
                             .returnType(INTEGER)
                             .argumentType(INTEGER)
                             .variableArity()
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/AbstractPredicatePushdownTest.java b/core/trino-main/src/test/java/io/trino/sql/planner/AbstractPredicatePushdownTest.java
index a968380cc8f7..5d6ebc84b220 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/AbstractPredicatePushdownTest.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/AbstractPredicatePushdownTest.java
@@ -22,13 +22,12 @@
 import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.ProjectNode;
 import io.trino.sql.planner.plan.WindowNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 import static io.trino.SystemSessionProperties.ENABLE_DYNAMIC_FILTERING;
 import static io.trino.SystemSessionProperties.FILTERING_SEMI_JOIN_TO_INNER;
-import static io.trino.SystemSessionProperties.JOIN_REORDERING_STRATEGY;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.assignUniqueId;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
@@ -40,7 +39,6 @@
 import static io.trino.sql.planner.assertions.PlanMatchPattern.semiJoin;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
-import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
 import static io.trino.sql.planner.plan.JoinNode.Type.LEFT;
 
 public abstract class AbstractPredicatePushdownTest
@@ -57,25 +55,6 @@ protected AbstractPredicatePushdownTest(boolean enableDynamicFiltering)
     @Test
     public abstract void testCoercions();
 
-    @Test
-    public void testNonStraddlingJoinExpression()
-    {
-        assertPlan(
-                "SELECT * FROM orders JOIN lineitem ON orders.orderkey = lineitem.orderkey AND cast(lineitem.linenumber AS varchar) = '2'",
-                anyTree(
-                        join(INNER, builder -> builder
-                                .equiCriteria("ORDERS_OK", "LINEITEM_OK")
-                                .left(
-                                        anyTree(
-                                                tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))
-                                .right(
-                                        anyTree(
-                                                filter("cast(LINEITEM_LINENUMBER as varchar) = VARCHAR '2'",
-                                                        tableScan("lineitem", ImmutableMap.of(
-                                                                "LINEITEM_OK", "orderkey",
-                                                                "LINEITEM_LINENUMBER", "linenumber"))))))));
-    }
-
     @Test
     public void testPushDownToLhsOfSemiJoin()
     {
@@ -100,40 +79,20 @@ public void testNonDeterministicPredicatePropagatesOnlyToSourceSideOfSemiJoin()
                 noSemiJoinRewrite(),
                 anyTree(
                         semiJoin("LINE_ORDER_KEY", "ORDERS_ORDER_KEY", "SEMI_JOIN_RESULT", enableDynamicFiltering,
-                                anyTree(
-                                        filter("LINE_ORDER_KEY = CAST(random(5) AS bigint)",
-                                                tableScan("lineitem", ImmutableMap.of(
-                                                        "LINE_ORDER_KEY", "orderkey")))),
+                                filter("LINE_ORDER_KEY = CAST(random(5) AS bigint)",
+                                        tableScan("lineitem", ImmutableMap.of(
+                                                "LINE_ORDER_KEY", "orderkey"))),
                                 node(ExchangeNode.class, // NO filter here
-                                        project(
-                                                tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey")))))));
+                                        tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey"))))));
 
         assertPlan("SELECT * FROM lineitem WHERE orderkey NOT IN (SELECT orderkey FROM orders) AND orderkey = random(5)",
                 anyTree(
                         semiJoin("LINE_ORDER_KEY", "ORDERS_ORDER_KEY", "SEMI_JOIN_RESULT",
-                                anyTree(
-                                        filter("LINE_ORDER_KEY = CAST(random(5) AS bigint)",
-                                                tableScan("lineitem", ImmutableMap.of(
-                                                        "LINE_ORDER_KEY", "orderkey")))),
-                                anyTree(
-                                        project(// NO filter here
-                                                tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey")))))));
-    }
-
-    @Test
-    public void testNonDeterministicPredicateDoesNotPropagateFromFilteringSideToSourceSideOfSemiJoin()
-    {
-        assertPlan("SELECT * FROM lineitem WHERE orderkey IN (SELECT orderkey FROM orders WHERE orderkey = random(5))",
-                noSemiJoinRewrite(),
-                anyTree(
-                        semiJoin("LINE_ORDER_KEY", "ORDERS_ORDER_KEY", "SEMI_JOIN_RESULT", enableDynamicFiltering,
-                                anyTree(
+                                filter("LINE_ORDER_KEY = CAST(random(5) AS bigint)",
                                         tableScan("lineitem", ImmutableMap.of(
                                                 "LINE_ORDER_KEY", "orderkey"))),
-                                node(ExchangeNode.class,
-                                        project(
-                                                filter("ORDERS_ORDER_KEY = CAST(random(5) AS bigint)",
-                                                        tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey"))))))));
+                                anyTree(
+                                        tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey"))))));
     }
 
     @Test
@@ -143,11 +102,10 @@ public void testGreaterPredicateFromFilterSidePropagatesToSourceSideOfSemiJoin()
                 noSemiJoinRewrite(),
                 anyTree(
                         semiJoin("LINE_ORDER_KEY", "ORDERS_ORDER_KEY", "SEMI_JOIN_RESULT", enableDynamicFiltering,
-                                anyTree(
-                                        filter("LINE_ORDER_KEY > BIGINT '2'",
-                                                tableScan("lineitem", ImmutableMap.of(
-                                                        "LINE_ORDER_KEY", "orderkey",
-                                                        "LINE_QUANTITY", "quantity")))),
+                                filter("LINE_ORDER_KEY > BIGINT '2'",
+                                        tableScan("lineitem", ImmutableMap.of(
+                                                "LINE_ORDER_KEY", "orderkey",
+                                                "LINE_QUANTITY", "quantity"))),
                                 anyTree(
                                         filter("ORDERS_ORDER_KEY > BIGINT '2'",
                                                 tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey")))))));
@@ -160,11 +118,10 @@ public void testEqualsPredicateFromFilterSidePropagatesToSourceSideOfSemiJoin()
                 noSemiJoinRewrite(),
                 anyTree(
                         semiJoin("LINE_ORDER_KEY", "ORDERS_ORDER_KEY", "SEMI_JOIN_RESULT", enableDynamicFiltering,
-                                anyTree(
-                                        filter("LINE_ORDER_KEY = BIGINT '2'",
-                                                tableScan("lineitem", ImmutableMap.of(
-                                                        "LINE_ORDER_KEY", "orderkey",
-                                                        "LINE_QUANTITY", "quantity")))),
+                                filter("LINE_ORDER_KEY = BIGINT '2'",
+                                        tableScan("lineitem", ImmutableMap.of(
+                                                "LINE_ORDER_KEY", "orderkey",
+                                                "LINE_QUANTITY", "quantity"))),
                                 anyTree(
                                         filter("ORDERS_ORDER_KEY = BIGINT '2'",
                                                 tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey")))))));
@@ -178,10 +135,9 @@ public void testPredicateFromFilterSideNotPropagatesToSourceSideOfSemiJoinIfNotI
                         semiJoin("LINE_ORDER_KEY", "ORDERS_ORDER_KEY", "SEMI_JOIN_RESULT",
                                 // There should be no Filter above table scan, because we don't know whether SemiJoin's filtering source is empty.
                                 // And filter would filter out NULLs from source side which is not what we need then.
-                                project(
-                                        tableScan("lineitem", ImmutableMap.of(
-                                                "LINE_ORDER_KEY", "orderkey",
-                                                "LINE_QUANTITY", "quantity"))),
+                                tableScan("lineitem", ImmutableMap.of(
+                                        "LINE_ORDER_KEY", "orderkey",
+                                        "LINE_QUANTITY", "quantity")),
                                 anyTree(
                                         filter("ORDERS_ORDER_KEY > BIGINT '2'",
                                                 tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey")))))));
@@ -194,11 +150,10 @@ public void testGreaterPredicateFromSourceSidePropagatesToFilterSideOfSemiJoin()
                 noSemiJoinRewrite(),
                 anyTree(
                         semiJoin("LINE_ORDER_KEY", "ORDERS_ORDER_KEY", "SEMI_JOIN_RESULT", enableDynamicFiltering,
-                                anyTree(
-                                        filter("LINE_ORDER_KEY > BIGINT '2'",
-                                                tableScan("lineitem", ImmutableMap.of(
-                                                        "LINE_ORDER_KEY", "orderkey",
-                                                        "LINE_QUANTITY", "quantity")))),
+                                filter("LINE_ORDER_KEY > BIGINT '2'",
+                                        tableScan("lineitem", ImmutableMap.of(
+                                                "LINE_ORDER_KEY", "orderkey",
+                                                "LINE_QUANTITY", "quantity"))),
                                 anyTree(
                                         filter("ORDERS_ORDER_KEY > BIGINT '2'",
                                                 tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey")))))));
@@ -211,11 +166,10 @@ public void testEqualPredicateFromSourceSidePropagatesToFilterSideOfSemiJoin()
                 noSemiJoinRewrite(),
                 anyTree(
                         semiJoin("LINE_ORDER_KEY", "ORDERS_ORDER_KEY", "SEMI_JOIN_RESULT", enableDynamicFiltering,
-                                anyTree(
-                                        filter("LINE_ORDER_KEY = BIGINT '2'",
-                                                tableScan("lineitem", ImmutableMap.of(
-                                                        "LINE_ORDER_KEY", "orderkey",
-                                                        "LINE_QUANTITY", "quantity")))),
+                                filter("LINE_ORDER_KEY = BIGINT '2'",
+                                        tableScan("lineitem", ImmutableMap.of(
+                                                "LINE_ORDER_KEY", "orderkey",
+                                                "LINE_QUANTITY", "quantity"))),
                                 anyTree(
                                         filter("ORDERS_ORDER_KEY = BIGINT '2'",
                                                 tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey")))))));
@@ -227,14 +181,12 @@ public void testPredicateFromSourceSideNotPropagatesToFilterSideOfSemiJoinIfNotI
         assertPlan("SELECT quantity FROM (SELECT * FROM lineitem WHERE orderkey NOT IN (SELECT orderkey FROM orders) AND orderkey > 2)",
                 anyTree(
                         semiJoin("LINE_ORDER_KEY", "ORDERS_ORDER_KEY", "SEMI_JOIN_RESULT",
-                                project(
-                                        filter("LINE_ORDER_KEY > BIGINT '2'",
-                                                tableScan("lineitem", ImmutableMap.of(
-                                                        "LINE_ORDER_KEY", "orderkey",
-                                                        "LINE_QUANTITY", "quantity")))),
+                                filter("LINE_ORDER_KEY > BIGINT '2'",
+                                        tableScan("lineitem", ImmutableMap.of(
+                                                "LINE_ORDER_KEY", "orderkey",
+                                                "LINE_QUANTITY", "quantity"))),
                                 node(ExchangeNode.class, // NO filter here
-                                        project(
-                                                tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey")))))));
+                                        tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey"))))));
     }
 
     @Test
@@ -244,9 +196,8 @@ public void testPredicateFromFilterSideNotPropagatesToSourceSideOfSemiJoinUsedIn
                 anyTree(
                         semiJoin("LINE_ORDER_KEY", "ORDERS_ORDER_KEY", "SEMI_JOIN_RESULT",
                                 // NO filter here
-                                project(
-                                        tableScan("lineitem", ImmutableMap.of(
-                                                "LINE_ORDER_KEY", "orderkey"))),
+                                tableScan("lineitem", ImmutableMap.of(
+                                        "LINE_ORDER_KEY", "orderkey")),
                                 anyTree(
                                         filter("ORDERS_ORDER_KEY > BIGINT '2'",
                                                 tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey")))))));
@@ -289,9 +240,9 @@ public void testPredicatePushDownThroughMarkDistinct()
                         join(LEFT, builder -> builder
                                 .equiCriteria("A", "B")
                                 .left(
-                                        project(assignUniqueId("unique", filter("A = 1", values("A")))))
+                                        assignUniqueId("unique", filter("A = 1", values("A"))))
                                 .right(
-                                        project(filter("1 = B", values("B")))))));
+                                        filter("1 = B", values("B"))))));
     }
 
     @Test
@@ -351,7 +302,7 @@ public void testPredicatePushDownOverProjection()
                         "SELECT * FROM t WHERE x > 5000",
                 anyTree(
                         filter("expr > 5E3",
-                                project(ImmutableMap.of("expr", expression("rand() * CAST(orderkey AS double)")),
+                                project(ImmutableMap.of("expr", expression("random() * CAST(orderkey AS double)")),
                                         tableScan("orders", ImmutableMap.of(
                                                 "orderkey", "orderkey"))))));
     }
@@ -425,7 +376,7 @@ public void testPredicateOnNonDeterministicSymbolsPushedDown()
                         node(WindowNode.class,
                                 anyTree(
                                         filter("\"ROUND\" > 1E2",
-                                                project(ImmutableMap.of("ROUND", expression("round(CAST(CUST_KEY AS double) * rand())")),
+                                                project(ImmutableMap.of("ROUND", expression("round(CAST(CUST_KEY AS double) * random())")),
                                                         tableScan(
                                                                 "orders",
                                                                 ImmutableMap.of("CUST_KEY", "custkey"))))))));
@@ -440,7 +391,7 @@ public void testNonDeterministicPredicateNotPushedDown()
                         "FROM orders" +
                         ") WHERE custkey > 100*rand()",
                 anyTree(
-                        filter("CAST(\"CUST_KEY\" AS double) > (\"rand\"() * 1E2)",
+                        filter("CAST(CUST_KEY AS double) > (random() * 1E2)",
                                 anyTree(
                                         node(WindowNode.class,
                                                 anyTree(
@@ -449,56 +400,6 @@ public void testNonDeterministicPredicateNotPushedDown()
                                                                 ImmutableMap.of("CUST_KEY", "custkey"))))))));
     }
 
-    @Test
-    public void testNormalizeOuterJoinToInner()
-    {
-        Session disableJoinReordering = Session.builder(getQueryRunner().getDefaultSession())
-                .setSystemProperty(JOIN_REORDERING_STRATEGY, "NONE")
-                .build();
-
-        // one join
-        assertPlan(
-                "SELECT customer.name, orders.orderdate " +
-                        "FROM orders " +
-                        "LEFT JOIN customer ON orders.custkey = customer.custkey " +
-                        "WHERE customer.name IS NOT NULL",
-                disableJoinReordering,
-                anyTree(
-                        join(INNER, builder -> builder
-                                .equiCriteria("o_custkey", "c_custkey")
-                                .left(
-                                        anyTree(tableScan("orders", ImmutableMap.of("o_orderdate", "orderdate", "o_custkey", "custkey"))))
-                                .right(
-                                        anyTree(
-                                                filter(
-                                                        "NOT (c_name IS NULL)",
-                                                        tableScan("customer", ImmutableMap.of("c_custkey", "custkey", "c_name", "name"))))))));
-
-        // nested joins
-        assertPlan(
-                "SELECT customer.name, lineitem.partkey " +
-                        "FROM lineitem " +
-                        "LEFT JOIN orders ON lineitem.orderkey = orders.orderkey " +
-                        "LEFT JOIN customer ON orders.custkey = customer.custkey " +
-                        "WHERE customer.name IS NOT NULL",
-                disableJoinReordering,
-                anyTree(
-                        join(INNER, builder -> builder
-                                .equiCriteria("o_custkey", "c_custkey")
-                                .left(anyTree(
-                                        join(enableDynamicFiltering ? INNER : LEFT, // TODO (https://github.com/trinodb/trino/issues/2392) this should be INNER also when dynamic filtering is off
-                                                leftJoinBuilder -> leftJoinBuilder
-                                                        .equiCriteria("l_orderkey", "o_orderkey")
-                                                        .left(
-                                                                anyTree(tableScan("lineitem", ImmutableMap.of("l_orderkey", "orderkey"))))
-                                                        .right(
-                                                                anyTree(tableScan("orders", ImmutableMap.of("o_orderkey", "orderkey", "o_custkey", "custkey")))))))
-                                .right(anyTree(
-                                        filter(
-                                                "NOT (c_name IS NULL)",
-                                                tableScan("customer", ImmutableMap.of("c_custkey", "custkey", "c_name", "name"))))))));
-    }
-
     @Test
     public void testRemovesRedundantTableScanPredicate()
     {
@@ -510,7 +411,7 @@ public void testRemovesRedundantTableScanPredicate()
                         node(
                                 JoinNode.class,
                                 node(ProjectNode.class,
-                                        filter("(ORDERKEY = BIGINT '123') AND rand() = CAST(ORDERKEY AS double) AND length(ORDERSTATUS) < BIGINT '42'",
+                                        filter("(ORDERKEY = BIGINT '123') AND random() = CAST(ORDERKEY AS double) AND length(ORDERSTATUS) < BIGINT '42'",
                                                 tableScan(
                                                         "orders",
                                                         ImmutableMap.of(
@@ -565,7 +466,7 @@ WITH t(a) AS (VALUES 'a', 'b')
                 output(values("field", "field_0")));
     }
 
-    private Session noSemiJoinRewrite()
+    protected Session noSemiJoinRewrite()
     {
         return Session.builder(getQueryRunner().getDefaultSession())
                 .setSystemProperty(FILTERING_SEMI_JOIN_TO_INNER, "false")
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/BenchmarkPlanner.java b/core/trino-main/src/test/java/io/trino/sql/planner/BenchmarkPlanner.java
index 73c3ceb98fda..59e473c4658f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/BenchmarkPlanner.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/BenchmarkPlanner.java
@@ -19,14 +19,16 @@
 import io.trino.Session;
 import io.trino.connector.MockConnectorFactory;
 import io.trino.connector.MockConnectorTableHandle;
-import io.trino.execution.warnings.WarningCollector;
+import io.trino.execution.querystats.PlanOptimizersStatsCollector;
 import io.trino.plugin.tpch.ColumnNaming;
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.sql.planner.LogicalPlanner.Stage;
+import io.trino.sql.planner.optimizations.PlanOptimizer;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.tpch.Customer;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -40,7 +42,6 @@
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.options.WarmupMode;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.net.URL;
@@ -52,6 +53,7 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static io.trino.execution.warnings.WarningCollector.NOOP;
 import static io.trino.jmh.Benchmarks.benchmark;
 import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_COLUMN_NAMING_PROPERTY;
 import static io.trino.spi.type.VarcharType.VARCHAR;
@@ -123,11 +125,12 @@ public void tearDown()
     @Benchmark
     public List<Plan> plan(BenchmarkData benchmarkData)
     {
-        return benchmarkData.queryRunner.inTransaction(transactionSession -> {
-            return benchmarkData.queries.getQueries().stream()
-                    .map(query -> benchmarkData.queryRunner.createPlan(transactionSession, query, benchmarkData.stage, false, WarningCollector.NOOP, createPlanOptimizersStatsCollector()))
-                    .collect(toImmutableList());
-        });
+        LocalQueryRunner queryRunner = benchmarkData.queryRunner;
+        List<PlanOptimizer> planOptimizers = queryRunner.getPlanOptimizers(false);
+        PlanOptimizersStatsCollector planOptimizersStatsCollector = createPlanOptimizersStatsCollector();
+        return queryRunner.inTransaction(transactionSession -> benchmarkData.queries.getQueries().stream()
+                .map(query -> queryRunner.createPlan(transactionSession, query, planOptimizers, benchmarkData.stage, NOOP, planOptimizersStatsCollector))
+                .collect(toImmutableList()));
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/PathNodes.java b/core/trino-main/src/test/java/io/trino/sql/planner/PathNodes.java
index 9adbe81503a9..cd54ee8e5411 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/PathNodes.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/PathNodes.java
@@ -23,13 +23,13 @@
 import io.trino.json.ir.IrComparisonPredicate;
 import io.trino.json.ir.IrConjunctionPredicate;
 import io.trino.json.ir.IrContextVariable;
+import io.trino.json.ir.IrDescendantMemberAccessor;
 import io.trino.json.ir.IrDisjunctionPredicate;
 import io.trino.json.ir.IrDoubleMethod;
 import io.trino.json.ir.IrExistsPredicate;
 import io.trino.json.ir.IrFilter;
 import io.trino.json.ir.IrFloorMethod;
 import io.trino.json.ir.IrIsUnknownPredicate;
-import io.trino.json.ir.IrJsonNull;
 import io.trino.json.ir.IrJsonPath;
 import io.trino.json.ir.IrKeyValueMethod;
 import io.trino.json.ir.IrLastIndexVariable;
@@ -62,6 +62,7 @@
 import static io.trino.json.ir.IrComparisonPredicate.Operator.LESS_THAN;
 import static io.trino.json.ir.IrComparisonPredicate.Operator.LESS_THAN_OR_EQUAL;
 import static io.trino.json.ir.IrComparisonPredicate.Operator.NOT_EQUAL;
+import static io.trino.json.ir.IrJsonNull.JSON_NULL;
 import static io.trino.spi.type.VarcharType.createVarcharType;
 
 public class PathNodes
@@ -161,7 +162,7 @@ public static IrPathNode floor(IrPathNode base)
 
     public static IrPathNode jsonNull()
     {
-        return new IrJsonNull();
+        return JSON_NULL;
     }
 
     public static IrPathNode keyValue(IrPathNode base)
@@ -176,7 +177,7 @@ public static IrPathNode last()
 
     public static IrPathNode literal(Type type, Object value)
     {
-        return new IrLiteral(type, value);
+        return new IrLiteral(Optional.of(type), value);
     }
 
     public static IrPathNode wildcardMemberAccessor(IrPathNode base)
@@ -189,6 +190,11 @@ public static IrPathNode memberAccessor(IrPathNode base, String key)
         return new IrMemberAccessor(base, Optional.of(key), Optional.empty());
     }
 
+    public static IrPathNode descendantMemberAccessor(IrPathNode base, String key)
+    {
+        return new IrDescendantMemberAccessor(base, key, Optional.empty());
+    }
+
     public static IrPathNode jsonVariable(int index)
     {
         return new IrNamedJsonVariable(index, Optional.empty());
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestAddDynamicFilterSource.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestAddDynamicFilterSource.java
index 4ad7f0f9018f..77335e39a214 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestAddDynamicFilterSource.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestAddDynamicFilterSource.java
@@ -31,9 +31,9 @@
 import io.trino.sql.planner.plan.FilterNode;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.SemiJoinNode;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
 import java.util.Optional;
 
 import static io.trino.SystemSessionProperties.ENABLE_DYNAMIC_FILTERING;
@@ -73,18 +73,46 @@ public TestAddDynamicFilterSource()
                 JOIN_REORDERING_STRATEGY, JoinReorderingStrategy.NONE.name()));
     }
 
-    @Test(dataProvider = "joinDistributionTypes")
-    public void testInnerJoin(JoinDistributionType joinDistributionType)
+    @Test
+    public void testBroadcastInnerJoin()
     {
         assertDistributedPlan(
                 "SELECT l.suppkey FROM lineitem l, supplier s WHERE l.suppkey = s.suppkey",
-                withJoinDistributionType(joinDistributionType),
+                withJoinDistributionType(BROADCAST),
                 anyTree(
                         join(INNER, builder -> builder
                                 .equiCriteria("LINEITEM_SK", "SUPPLIER_SK")
                                 .dynamicFilter("LINEITEM_SK", "SUPPLIER_SK")
                                 .left(
-                                        anyTree(
+                                        node(
+                                                FilterNode.class,
+                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_SK", "suppkey")))
+                                                .with(numberOfDynamicFilters(1)))
+                                .right(
+                                        exchange(
+                                                LOCAL,
+                                                exchange(
+                                                        REMOTE,
+                                                        REPLICATE,
+                                                        node(
+                                                                DynamicFilterSourceNode.class,
+                                                                tableScan("supplier", ImmutableMap.of("SUPPLIER_SK", "suppkey")))))))));
+    }
+
+    @Test
+    public void testPartitionedInnerJoin()
+    {
+        assertDistributedPlan(
+                "SELECT l.suppkey FROM lineitem l, supplier s WHERE l.suppkey = s.suppkey",
+                withJoinDistributionType(PARTITIONED),
+                anyTree(
+                        join(INNER, builder -> builder
+                                .equiCriteria("LINEITEM_SK", "SUPPLIER_SK")
+                                .dynamicFilter("LINEITEM_SK", "SUPPLIER_SK")
+                                .left(
+                                        exchange(
+                                                REMOTE,
+                                                REPARTITION,
                                                 node(
                                                         FilterNode.class,
                                                         tableScan("lineitem", ImmutableMap.of("LINEITEM_SK", "suppkey")))
@@ -94,42 +122,41 @@ public void testInnerJoin(JoinDistributionType joinDistributionType)
                                                 LOCAL,
                                                 exchange(
                                                         REMOTE,
-                                                        joinDistributionType == PARTITIONED ? REPARTITION : REPLICATE,
+                                                        REPARTITION,
                                                         node(
                                                                 DynamicFilterSourceNode.class,
-                                                                project(
-                                                                        tableScan("supplier", ImmutableMap.of("SUPPLIER_SK", "suppkey"))))))))));
+                                                                tableScan("supplier", ImmutableMap.of("SUPPLIER_SK", "suppkey")))))))));
     }
 
-    @Test(dataProvider = "joinDistributionTypes")
-    public void testSemiJoin(JoinDistributionType joinDistributionType)
+    @Test
+    public void testSemiJoin()
     {
-        SemiJoinNode.DistributionType semiJoinDistributionType = joinDistributionType == PARTITIONED
-                ? SemiJoinNode.DistributionType.PARTITIONED
-                : SemiJoinNode.DistributionType.REPLICATED;
-        assertDistributedPlan(
-                "SELECT * FROM orders WHERE orderkey IN (SELECT orderkey FROM lineitem WHERE linenumber % 4 = 0)",
-                noSemiJoinRewrite(joinDistributionType),
-                anyTree(
-                        filter("S",
-                                project(
-                                        semiJoin("X", "Y", "S", Optional.of(semiJoinDistributionType), Optional.of(true),
-                                                anyTree(
-                                                        node(
-                                                                FilterNode.class,
-                                                                tableScan("orders", ImmutableMap.of("X", "orderkey")))
-                                                                        .with(numberOfDynamicFilters(1))),
-                                                        exchange(
-                                                                LOCAL,
-                                                                exchange(
-                                                                        REMOTE,
-                                                                        joinDistributionType == PARTITIONED ? REPARTITION : REPLICATE,
-                                                                        node(
-                                                                                DynamicFilterSourceNode.class,
-                                                                                project(
-                                                                                        filter(
-                                                                                                "Z % 4 = 0",
-                                                                                        tableScan("lineitem", ImmutableMap.of("Y", "orderkey", "Z", "linenumber"))))))))))));
+        for (JoinDistributionType joinDistributionType : Arrays.asList(BROADCAST, PARTITIONED)) {
+            SemiJoinNode.DistributionType semiJoinDistributionType = joinDistributionType == PARTITIONED
+                    ? SemiJoinNode.DistributionType.PARTITIONED
+                    : SemiJoinNode.DistributionType.REPLICATED;
+            assertDistributedPlan(
+                    "SELECT * FROM orders WHERE orderkey IN (SELECT orderkey FROM lineitem WHERE linenumber % 4 = 0)",
+                    noSemiJoinRewrite(joinDistributionType),
+                    anyTree(
+                            filter("S",
+                                    semiJoin("X", "Y", "S", Optional.of(semiJoinDistributionType), Optional.of(true),
+                                            node(
+                                                    FilterNode.class,
+                                                    tableScan("orders", ImmutableMap.of("X", "orderkey")))
+                                                    .with(numberOfDynamicFilters(1)),
+                                            exchange(
+                                                    LOCAL,
+                                                    exchange(
+                                                            REMOTE,
+                                                            joinDistributionType == PARTITIONED ? REPARTITION : REPLICATE,
+                                                            node(
+                                                                    DynamicFilterSourceNode.class,
+                                                                    project(
+                                                                            filter(
+                                                                                    "Z % 4 = 0",
+                                                                                    tableScan("lineitem", ImmutableMap.of("Y", "orderkey", "Z", "linenumber")))))))))));
+        }
     }
 
     @Test
@@ -154,7 +181,7 @@ public void testInnerJoinWithUnionAllOnBuild()
                                                         node(
                                                                 DynamicFilterSourceNode.class,
                                                                 exchange(
-                                                                        REMOTE,
+                                                                        LOCAL,
                                                                         Optional.empty(),
                                                                         Optional.empty(),
                                                                         ImmutableList.of(),
@@ -162,8 +189,8 @@ public void testInnerJoinWithUnionAllOnBuild()
                                                                         Optional.empty(),
                                                                         ImmutableList.of("SUPPLIER_SK"),
                                                                         Optional.empty(),
-                                                                        project(tableScan("supplier", ImmutableMap.of("SUPPLIER_SK_1", "suppkey"))),
-                                                                        project(tableScan("supplier", ImmutableMap.of("SUPPLIER_SK_2", "suppkey")))))))))));
+                                                                        tableScan("supplier", ImmutableMap.of("SUPPLIER_SK_1", "suppkey")),
+                                                                        tableScan("supplier", ImmutableMap.of("SUPPLIER_SK_2", "suppkey"))))))))));
 
         // TODO: Add support for cases where the build side has multiple sources
         assertDistributedPlan(
@@ -185,8 +212,8 @@ public void testInnerJoinWithUnionAllOnBuild()
                                                 Optional.empty(),
                                                 ImmutableList.of("SUPPLIER_SK"),
                                                 Optional.empty(),
-                                                exchange(project(tableScan("supplier", ImmutableMap.of("SUPPLIER_SK_1", "suppkey")))),
-                                                exchange(project(tableScan("supplier", ImmutableMap.of("SUPPLIER_SK_2", "suppkey")))))))));
+                                                exchange(tableScan("supplier", ImmutableMap.of("SUPPLIER_SK_1", "suppkey"))),
+                                                exchange(tableScan("supplier", ImmutableMap.of("SUPPLIER_SK_2", "suppkey"))))))));
     }
 
     @Test
@@ -245,8 +272,7 @@ public void testJoinWithPrePartitionedBuild()
                                         exchange(
                                                 REMOTE,
                                                 REPARTITION,
-                                                project(
-                                                        tableScan("lineitem", ImmutableMap.of("LINEITEM_SK", "suppkey")))))
+                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_SK", "suppkey"))))
                                 .right(
                                         anyTree(
                                                 tableScan("supplier", ImmutableMap.of("SUPPLIER_SK", "suppkey")))))));
@@ -271,12 +297,6 @@ public MatchResult detailMatches(PlanNode node, StatsProvider stats, Session ses
         };
     }
 
-    @DataProvider
-    public Object[][] joinDistributionTypes()
-    {
-        return new Object[][] {{BROADCAST}, {PARTITIONED}};
-    }
-
     private Session noSemiJoinRewrite(JoinDistributionType distributionType)
     {
         return Session.builder(getQueryRunner().getDefaultSession())
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestCanonicalize.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestCanonicalize.java
index e0d7dd657603..787c5a041cd8 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestCanonicalize.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestCanonicalize.java
@@ -25,7 +25,7 @@
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
 import io.trino.sql.tree.GenericLiteral;
 import io.trino.sql.tree.LongLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestCompilerConfig.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestCompilerConfig.java
index 9712d97fa50c..77ee738f4f1d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestCompilerConfig.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestCompilerConfig.java
@@ -14,7 +14,7 @@
 package io.trino.sql.planner;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -28,16 +28,21 @@ public class TestCompilerConfig
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(CompilerConfig.class)
-                .setExpressionCacheSize(10_000));
+                .setExpressionCacheSize(10_000)
+                .setSpecializeAggregationLoops(true));
     }
 
     @Test
     public void testExplicitPropertyMappings()
     {
-        Map<String, String> properties = ImmutableMap.of("compiler.expression-cache-size", "52");
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("compiler.expression-cache-size", "52")
+                .put("compiler.specialized-aggregation-loops", "false")
+                .buildOrThrow();
 
         CompilerConfig expected = new CompilerConfig()
-                .setExpressionCacheSize(52);
+                .setExpressionCacheSize(52)
+                .setSpecializeAggregationLoops(false);
 
         assertFullMapping(properties, expected);
     }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestConnectorExpressionTranslator.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestConnectorExpressionTranslator.java
index d3d43ac7c8f3..db4725cf2a10 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestConnectorExpressionTranslator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestConnectorExpressionTranslator.java
@@ -16,6 +16,8 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.slice.Slices;
 import io.trino.Session;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.MetadataManager;
 import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.expression.Call;
 import io.trino.spi.expression.ConnectorExpression;
@@ -44,20 +46,18 @@
 import io.trino.sql.tree.NotExpression;
 import io.trino.sql.tree.NullIfExpression;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.sql.tree.SubscriptExpression;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.testing.TestingSession;
 import io.trino.transaction.TestingTransactionManager;
+import io.trino.transaction.TransactionManager;
 import io.trino.type.LikeFunctions;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Stream;
 
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.airlift.slice.Slices.utf8Slice;
@@ -86,7 +86,6 @@
 import static io.trino.sql.planner.ConnectorExpressionTranslator.translate;
 import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
-import static io.trino.testing.DataProviders.toDataProvider;
 import static io.trino.transaction.TransactionBuilder.transaction;
 import static io.trino.type.JoniRegexpType.JONI_REGEXP;
 import static io.trino.type.LikeFunctions.likePattern;
@@ -138,7 +137,7 @@ public void testTranslateConstant()
 
     private void testTranslateConstant(Object nativeValue, Type type)
     {
-        assertTranslationRoundTrips(LITERAL_ENCODER.toExpression(TEST_SESSION, nativeValue, type), new Constant(nativeValue, type));
+        assertTranslationRoundTrips(LITERAL_ENCODER.toExpression(nativeValue, type), new Constant(nativeValue, type));
     }
 
     @Test
@@ -160,70 +159,55 @@ public void testTranslateRowSubscript()
                         0));
     }
 
-    @Test(dataProvider = "testTranslateLogicalExpressionDataProvider")
-    public void testTranslateLogicalExpression(LogicalExpression.Operator operator)
-    {
-        assertTranslationRoundTrips(
-                new LogicalExpression(
-                        operator,
-                        List.of(
-                                new ComparisonExpression(ComparisonExpression.Operator.LESS_THAN, new SymbolReference("double_symbol_1"), new SymbolReference("double_symbol_2")),
-                                new ComparisonExpression(ComparisonExpression.Operator.EQUAL, new SymbolReference("double_symbol_1"), new SymbolReference("double_symbol_2")))),
-                new Call(
-                        BOOLEAN,
-                        operator == LogicalExpression.Operator.AND ? StandardFunctions.AND_FUNCTION_NAME : StandardFunctions.OR_FUNCTION_NAME,
-                        List.of(
-                                new Call(
-                                        BOOLEAN,
-                                        StandardFunctions.LESS_THAN_OPERATOR_FUNCTION_NAME,
-                                        List.of(new Variable("double_symbol_1", DOUBLE), new Variable("double_symbol_2", DOUBLE))),
-                                new Call(
-                                        BOOLEAN,
-                                        StandardFunctions.EQUAL_OPERATOR_FUNCTION_NAME,
-                                        List.of(new Variable("double_symbol_1", DOUBLE), new Variable("double_symbol_2", DOUBLE))))));
-    }
-
-    @DataProvider
-    public Object[][] testTranslateLogicalExpressionDataProvider()
-    {
-        return Stream.of(LogicalExpression.Operator.values())
-                .collect(toDataProvider());
-    }
-
-    @Test(dataProvider = "testTranslateComparisonExpressionDataProvider")
-    public void testTranslateComparisonExpression(ComparisonExpression.Operator operator)
-    {
-        assertTranslationRoundTrips(
-                new ComparisonExpression(operator, new SymbolReference("double_symbol_1"), new SymbolReference("double_symbol_2")),
-                new Call(
-                        BOOLEAN,
-                        ConnectorExpressionTranslator.functionNameForComparisonOperator(operator),
-                        List.of(new Variable("double_symbol_1", DOUBLE), new Variable("double_symbol_2", DOUBLE))));
-    }
-
-    @DataProvider
-    public static Object[][] testTranslateComparisonExpressionDataProvider()
+    @Test
+    public void testTranslateLogicalExpression()
     {
-        return Stream.of(ComparisonExpression.Operator.values())
-                .collect(toDataProvider());
+        for (LogicalExpression.Operator operator : LogicalExpression.Operator.values()) {
+            assertTranslationRoundTrips(
+                    new LogicalExpression(
+                            operator,
+                            List.of(
+                                    new ComparisonExpression(ComparisonExpression.Operator.LESS_THAN, new SymbolReference("double_symbol_1"), new SymbolReference("double_symbol_2")),
+                                    new ComparisonExpression(ComparisonExpression.Operator.EQUAL, new SymbolReference("double_symbol_1"), new SymbolReference("double_symbol_2")))),
+                    new Call(
+                            BOOLEAN,
+                            operator == LogicalExpression.Operator.AND ? StandardFunctions.AND_FUNCTION_NAME : StandardFunctions.OR_FUNCTION_NAME,
+                            List.of(
+                                    new Call(
+                                            BOOLEAN,
+                                            StandardFunctions.LESS_THAN_OPERATOR_FUNCTION_NAME,
+                                            List.of(new Variable("double_symbol_1", DOUBLE), new Variable("double_symbol_2", DOUBLE))),
+                                    new Call(
+                                            BOOLEAN,
+                                            StandardFunctions.EQUAL_OPERATOR_FUNCTION_NAME,
+                                            List.of(new Variable("double_symbol_1", DOUBLE), new Variable("double_symbol_2", DOUBLE))))));
+        }
     }
 
-    @Test(dataProvider = "testTranslateArithmeticBinaryDataProvider")
-    public void testTranslateArithmeticBinary(ArithmeticBinaryExpression.Operator operator)
+    @Test
+    public void testTranslateComparisonExpression()
     {
-        assertTranslationRoundTrips(
-                new ArithmeticBinaryExpression(operator, new SymbolReference("double_symbol_1"), new SymbolReference("double_symbol_2")),
-                new Call(
-                        DOUBLE,
-                        ConnectorExpressionTranslator.functionNameForArithmeticBinaryOperator(operator),
-                        List.of(new Variable("double_symbol_1", DOUBLE), new Variable("double_symbol_2", DOUBLE))));
+        for (ComparisonExpression.Operator operator : ComparisonExpression.Operator.values()) {
+            assertTranslationRoundTrips(
+                    new ComparisonExpression(operator, new SymbolReference("double_symbol_1"), new SymbolReference("double_symbol_2")),
+                    new Call(
+                            BOOLEAN,
+                            ConnectorExpressionTranslator.functionNameForComparisonOperator(operator),
+                            List.of(new Variable("double_symbol_1", DOUBLE), new Variable("double_symbol_2", DOUBLE))));
+        }
     }
 
-    @DataProvider
-    public static Object[][] testTranslateArithmeticBinaryDataProvider()
+    @Test
+    public void testTranslateArithmeticBinary()
     {
-        return Stream.of(ArithmeticBinaryExpression.Operator.values())
-                .collect(toDataProvider());
+        for (ArithmeticBinaryExpression.Operator operator : ArithmeticBinaryExpression.Operator.values()) {
+            assertTranslationRoundTrips(
+                    new ArithmeticBinaryExpression(operator, new SymbolReference("double_symbol_1"), new SymbolReference("double_symbol_2")),
+                    new Call(
+                            DOUBLE,
+                            ConnectorExpressionTranslator.functionNameForArithmeticBinaryOperator(operator),
+                            List.of(new Variable("double_symbol_1", DOUBLE), new Variable("double_symbol_2", DOUBLE))));
+        }
     }
 
     @Test
@@ -337,7 +321,9 @@ public void testTranslateCast()
     @Test
     public void testTranslateLike()
     {
-        transaction(new TestingTransactionManager(), new AllowAllAccessControl())
+        TransactionManager transactionManager = new TestingTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
+        transaction(transactionManager, metadata, new AllowAllAccessControl())
                 .readOnly()
                 .execute(TEST_SESSION, transactionSession -> {
                     String pattern = "%pattern%";
@@ -348,22 +334,22 @@ public void testTranslateLike()
 
                     assertTranslationToConnectorExpression(
                             transactionSession,
-                            FunctionCallBuilder.resolve(transactionSession, PLANNER_CONTEXT.getMetadata())
-                                    .setName(QualifiedName.of(LikeFunctions.LIKE_FUNCTION_NAME))
+                            BuiltinFunctionCallBuilder.resolve(PLANNER_CONTEXT.getMetadata())
+                                    .setName(LikeFunctions.LIKE_FUNCTION_NAME)
                                     .addArgument(VARCHAR_TYPE, new SymbolReference("varchar_symbol_1"))
-                                    .addArgument(LIKE_PATTERN, LITERAL_ENCODER.toExpression(transactionSession, likePattern(utf8Slice(pattern)), LIKE_PATTERN))
+                                    .addArgument(LIKE_PATTERN, LITERAL_ENCODER.toExpression(likePattern(utf8Slice(pattern)), LIKE_PATTERN))
                                     .build(),
                             Optional.of(translated));
 
                     assertTranslationFromConnectorExpression(
                             transactionSession,
                             translated,
-                            FunctionCallBuilder.resolve(transactionSession, PLANNER_CONTEXT.getMetadata())
-                                    .setName(QualifiedName.of(LikeFunctions.LIKE_FUNCTION_NAME))
+                            BuiltinFunctionCallBuilder.resolve(PLANNER_CONTEXT.getMetadata())
+                                    .setName(LikeFunctions.LIKE_FUNCTION_NAME)
                                     .addArgument(VARCHAR_TYPE, new SymbolReference("varchar_symbol_1"))
                                     .addArgument(LIKE_PATTERN,
-                                            FunctionCallBuilder.resolve(transactionSession, PLANNER_CONTEXT.getMetadata())
-                                                    .setName(QualifiedName.of(LikeFunctions.LIKE_PATTERN_FUNCTION_NAME))
+                                            BuiltinFunctionCallBuilder.resolve(PLANNER_CONTEXT.getMetadata())
+                                                    .setName(LikeFunctions.LIKE_PATTERN_FUNCTION_NAME)
                                                     .addArgument(createVarcharType(pattern.length()), new StringLiteral(pattern))
                                                     .build())
                                     .build());
@@ -378,22 +364,22 @@ public void testTranslateLike()
 
                     assertTranslationToConnectorExpression(
                             transactionSession,
-                            FunctionCallBuilder.resolve(transactionSession, PLANNER_CONTEXT.getMetadata())
-                                    .setName(QualifiedName.of(LikeFunctions.LIKE_FUNCTION_NAME))
+                            BuiltinFunctionCallBuilder.resolve(PLANNER_CONTEXT.getMetadata())
+                                    .setName(LikeFunctions.LIKE_FUNCTION_NAME)
                                     .addArgument(VARCHAR_TYPE, new SymbolReference("varchar_symbol_1"))
-                                    .addArgument(LIKE_PATTERN, LITERAL_ENCODER.toExpression(transactionSession, likePattern(utf8Slice(pattern), utf8Slice(escape)), LIKE_PATTERN))
+                                    .addArgument(LIKE_PATTERN, LITERAL_ENCODER.toExpression(likePattern(utf8Slice(pattern), utf8Slice(escape)), LIKE_PATTERN))
                                     .build(),
                             Optional.of(translated));
 
                     assertTranslationFromConnectorExpression(
                             transactionSession,
                             translated,
-                            FunctionCallBuilder.resolve(transactionSession, PLANNER_CONTEXT.getMetadata())
-                                    .setName(QualifiedName.of(LikeFunctions.LIKE_FUNCTION_NAME))
+                            BuiltinFunctionCallBuilder.resolve(PLANNER_CONTEXT.getMetadata())
+                                    .setName(LikeFunctions.LIKE_FUNCTION_NAME)
                                     .addArgument(VARCHAR_TYPE, new SymbolReference("varchar_symbol_1"))
                                     .addArgument(LIKE_PATTERN,
-                                            FunctionCallBuilder.resolve(transactionSession, PLANNER_CONTEXT.getMetadata())
-                                                    .setName(QualifiedName.of(LikeFunctions.LIKE_PATTERN_FUNCTION_NAME))
+                                            BuiltinFunctionCallBuilder.resolve(PLANNER_CONTEXT.getMetadata())
+                                                    .setName(LikeFunctions.LIKE_PATTERN_FUNCTION_NAME)
                                                     .addArgument(createVarcharType(pattern.length()), new StringLiteral(pattern))
                                                     .addArgument(createVarcharType(1), new StringLiteral(escape))
                                                     .build())
@@ -418,13 +404,15 @@ public void testTranslateNullIf()
     @Test
     public void testTranslateResolvedFunction()
     {
-        transaction(new TestingTransactionManager(), new AllowAllAccessControl())
+        TransactionManager transactionManager = new TestingTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
+        transaction(transactionManager, metadata, new AllowAllAccessControl())
                 .readOnly()
                 .execute(TEST_SESSION, transactionSession -> {
                     assertTranslationRoundTrips(
                             transactionSession,
-                            FunctionCallBuilder.resolve(TEST_SESSION, PLANNER_CONTEXT.getMetadata())
-                                    .setName(QualifiedName.of(("lower")))
+                            BuiltinFunctionCallBuilder.resolve(PLANNER_CONTEXT.getMetadata())
+                                    .setName(("lower"))
                                     .addArgument(VARCHAR_TYPE, new SymbolReference("varchar_symbol_1"))
                                     .build(),
                             new Call(VARCHAR_TYPE,
@@ -439,13 +427,15 @@ public void testTranslateRegularExpression()
         // Regular expression types (JoniRegexpType, Re2JRegexpType) are considered implementation detail of the engine
         // and are not exposed to connectors within ConnectorExpression. Instead, they are replaced with a varchar pattern.
 
-        transaction(new TestingTransactionManager(), new AllowAllAccessControl())
+        TransactionManager transactionManager = new TestingTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
+        transaction(transactionManager, metadata, new AllowAllAccessControl())
                 .readOnly()
                 .execute(TEST_SESSION, transactionSession -> {
-                    FunctionCall input = FunctionCallBuilder.resolve(TEST_SESSION, PLANNER_CONTEXT.getMetadata())
-                            .setName(QualifiedName.of(("regexp_like")))
+                    FunctionCall input = BuiltinFunctionCallBuilder.resolve(PLANNER_CONTEXT.getMetadata())
+                            .setName("regexp_like")
                             .addArgument(VARCHAR_TYPE, new SymbolReference("varchar_symbol_1"))
-                            .addArgument(JONI_REGEXP, LITERAL_ENCODER.toExpression(TEST_SESSION, joniRegexp(utf8Slice("a+")), JONI_REGEXP))
+                            .addArgument(JONI_REGEXP, LITERAL_ENCODER.toExpression(joniRegexp(utf8Slice("a+")), JONI_REGEXP))
                             .build();
                     Call translated = new Call(
                             BOOLEAN,
@@ -453,8 +443,8 @@ public void testTranslateRegularExpression()
                             List.of(
                                     new Variable("varchar_symbol_1", VARCHAR_TYPE),
                                     new Constant(utf8Slice("a+"), createVarcharType(2))));
-                    FunctionCall translatedBack = FunctionCallBuilder.resolve(TEST_SESSION, PLANNER_CONTEXT.getMetadata())
-                            .setName(QualifiedName.of(("regexp_like")))
+                    FunctionCall translatedBack = BuiltinFunctionCallBuilder.resolve(PLANNER_CONTEXT.getMetadata())
+                            .setName("regexp_like")
                             .addArgument(VARCHAR_TYPE, new SymbolReference("varchar_symbol_1"))
                             // Note: The result is not an optimized expression
                             .addArgument(JONI_REGEXP, new Cast(new StringLiteral("a+"), toSqlType(JONI_REGEXP)))
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestDeleteAndInsertMergeProcessor.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestDeleteAndInsertMergeProcessor.java
index 31ae14eb6c2e..3a144d52b8b7 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestDeleteAndInsertMergeProcessor.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestDeleteAndInsertMergeProcessor.java
@@ -24,9 +24,10 @@
 import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.block.RowBlock;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.Charset;
 import java.util.List;
@@ -61,14 +62,14 @@ public void testSimpleDeletedRowMerge()
                 2,
                 Optional.empty(),
                 new Block[] {
-                        makeLongArrayBlock(1, 1),               // TransactionId
-                        makeLongArrayBlock(1, 0),                // rowId
+                        makeLongArrayBlock(1, 1), // TransactionId
+                        makeLongArrayBlock(1, 0), // rowId
                         makeIntArrayBlock(536870912, 536870912)}, // bucket
                 new Block[] {
-                        makeVarcharArrayBlock("", "Dave"),      // customer
-                        makeIntArrayBlock(0, 11),               // purchases
-                        makeVarcharArrayBlock("", "Devon"),     // address
-                        makeByteArrayBlock(1, 1),                // "present" boolean
+                        makeVarcharArrayBlock("", "Dave"), // customer
+                        makeIntArrayBlock(0, 11), // purchases
+                        makeVarcharArrayBlock("", "Devon"), // address
+                        makeByteArrayBlock(1, 1), // "present" boolean
                         makeByteArrayBlock(DEFAULT_CASE_OPERATION_NUMBER, DELETE_OPERATION_NUMBER),
                         makeIntArrayBlock(-1, 0)});
 
@@ -76,11 +77,11 @@ public void testSimpleDeletedRowMerge()
         assertThat(outputPage.getPositionCount()).isEqualTo(1);
 
         // The single operation is a delete
-        assertThat(TINYINT.getLong(outputPage.getBlock(3), 0)).isEqualTo(DELETE_OPERATION_NUMBER);
+        assertThat((int) TINYINT.getByte(outputPage.getBlock(3), 0)).isEqualTo(DELETE_OPERATION_NUMBER);
 
         // Show that the row to be deleted is rowId 0, e.g. ('Dave', 11, 'Devon')
-        Block rowIdRow = outputPage.getBlock(4).getObject(0, Block.class);
-        assertThat(INTEGER.getLong(rowIdRow, 1)).isEqualTo(0);
+        SqlRow rowIdRow = outputPage.getBlock(4).getObject(0, SqlRow.class);
+        assertThat(BIGINT.getLong(rowIdRow.getRawFieldBlock(1), rowIdRow.getRawIndex())).isEqualTo(0);
     }
 
     @Test
@@ -103,10 +104,10 @@ public void testUpdateAndDeletedMerge()
         Page inputPage = makePageFromBlocks(
                 5,
                 Optional.of(rowIdNulls),
-                new Block[] {
-                        makeLongArrayBlockWithNulls(rowIdNulls, 5, 2, 1, 2, 2),               // TransactionId
-                        makeLongArrayBlockWithNulls(rowIdNulls, 5, 0, 3, 1, 2),                // rowId
-                        makeIntArrayBlockWithNulls(rowIdNulls, 5, 536870912, 536870912, 536870912, 536870912)}, // bucket
+                new Block[]{
+                        new LongArrayBlock(5, Optional.of(rowIdNulls), new long[]{2, 0, 1, 2, 2}), // TransactionId
+                        new LongArrayBlock(5, Optional.of(rowIdNulls), new long[]{0, 0, 3, 1, 2}), // rowId
+                        new IntArrayBlock(5, Optional.of(rowIdNulls), new int[]{536870912, 0, 536870912, 536870912, 536870912})}, // bucket
                 new Block[] {
                         // customer
                         makeVarcharArrayBlock("Aaron", "Carol", "Dave", "Dave", "Ed"),
@@ -144,9 +145,9 @@ public void testAnotherMergeCase()
                 5,
                 Optional.of(rowIdNulls),
                 new Block[] {
-                        makeLongArrayBlockWithNulls(rowIdNulls, 5, 2, 1, 2, 2),                // TransactionId
-                        makeLongArrayBlockWithNulls(rowIdNulls, 5, 0, 3, 1, 2),                // rowId
-                        makeIntArrayBlockWithNulls(rowIdNulls, 5, 536870912, 536870912, 536870912, 536870912)}, // bucket
+                        new LongArrayBlock(5, Optional.of(rowIdNulls), new long[]{2, 0, 1, 2, 2}), // TransactionId
+                        new LongArrayBlock(5, Optional.of(rowIdNulls), new long[]{0, 0, 3, 1, 2}), // rowId
+                        new IntArrayBlock(5, Optional.of(rowIdNulls), new int[]{536870912, 0, 536870912, 536870912, 536870912})}, // bucket
                 new Block[] {
                         // customer
                         makeVarcharArrayBlock("Aaron", "Carol", "Dave", "Dave", "Ed"),
@@ -168,11 +169,11 @@ public void testAnotherMergeCase()
         assertThat(getString(outputPage.getBlock(2), 1)).isEqualTo("Arches/Arches");
     }
 
-    private Page makePageFromBlocks(int positionCount, Optional<boolean[]> rowIdNulls, Block[] rowIdBlocks, Block[] mergeCaseBlocks)
+    private static Page makePageFromBlocks(int positionCount, Optional<boolean[]> rowIdNulls, Block[] rowIdBlocks, Block[] mergeCaseBlocks)
     {
         Block[] pageBlocks = new Block[] {
-                RowBlock.fromFieldBlocks(positionCount, rowIdNulls, rowIdBlocks),
-                RowBlock.fromFieldBlocks(positionCount, Optional.empty(), mergeCaseBlocks)
+                RowBlock.fromNotNullSuppressedFieldBlocks(positionCount, rowIdNulls, rowIdBlocks),
+                RowBlock.fromFieldBlocks(positionCount, mergeCaseBlocks)
         };
         return new Page(pageBlocks);
     }
@@ -196,34 +197,11 @@ private LongArrayBlock makeLongArrayBlock(long... elements)
         return new LongArrayBlock(elements.length, Optional.empty(), elements);
     }
 
-    private LongArrayBlock makeLongArrayBlockWithNulls(boolean[] nulls, int positionCount, long... elements)
-    {
-        assertThat(countNonNull(nulls) + elements.length).isEqualTo(positionCount);
-        return new LongArrayBlock(elements.length, Optional.of(nulls), elements);
-    }
-
     private IntArrayBlock makeIntArrayBlock(int... elements)
     {
         return new IntArrayBlock(elements.length, Optional.empty(), elements);
     }
 
-    private IntArrayBlock makeIntArrayBlockWithNulls(boolean[] nulls, int positionCount, int... elements)
-    {
-        assertThat(countNonNull(nulls) + elements.length).isEqualTo(positionCount);
-        return new IntArrayBlock(elements.length, Optional.of(nulls), elements);
-    }
-
-    private int countNonNull(boolean[] nulls)
-    {
-        int count = 0;
-        for (int position = 0; position < nulls.length; position++) {
-            if (nulls[position]) {
-                count++;
-            }
-        }
-        return count;
-    }
-
     private ByteArrayBlock makeByteArrayBlock(int... elements)
     {
         byte[] bytes = new byte[elements.length];
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestDereferencePushDown.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestDereferencePushDown.java
index a19a909968d1..32a45789affb 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestDereferencePushDown.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestDereferencePushDown.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.tree.DoubleLiteral;
 import io.trino.sql.tree.GenericLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SystemSessionProperties.FILTERING_SEMI_JOIN_TO_INNER;
 import static io.trino.SystemSessionProperties.MERGE_PROJECT_WITH_VALUES;
@@ -132,9 +132,9 @@ public void testDereferencePushdownWindow()
                         "SELECT msg.x AS x, ROW_NUMBER() OVER (PARTITION BY msg.y) AS rn " +
                         "FROM t ",
                 anyTree(
-                        project(values(
+                        values(
                                 ImmutableList.of("x", "y"),
-                                ImmutableList.of(ImmutableList.of(new GenericLiteral("BIGINT", "1"), new DoubleLiteral("2e0")))))));
+                                ImmutableList.of(ImmutableList.of(new GenericLiteral("BIGINT", "1"), new DoubleLiteral("2e0"))))));
 
         assertPlanWithSession(
                 "WITH t(msg1, msg2, msg3, msg4, msg5) AS (VALUES " +
@@ -191,7 +191,7 @@ public void testDereferencePushdownSemiJoin()
                                 project(
                                         ImmutableMap.of("a_y", expression("msg[2]")),
                                         values(ImmutableList.of("msg", "a_x"), ImmutableList.of())),
-                                project(values(ImmutableList.of("b_z"), ImmutableList.of())))));
+                                values(ImmutableList.of("b_z"), ImmutableList.of()))));
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestDeterminismEvaluator.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestDeterminismEvaluator.java
index e663b43d8e6a..8448f2ffbaa3 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestDeterminismEvaluator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestDeterminismEvaluator.java
@@ -26,9 +26,8 @@
 import io.trino.sql.tree.LambdaExpression;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.type.FunctionType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -83,7 +82,7 @@ private FunctionCall function(String name)
     private FunctionCall function(String name, List<Type> types, List<Expression> arguments)
     {
         return functionResolution
-                .functionCallBuilder(QualifiedName.of(name))
+                .functionCallBuilder(name)
                 .setArguments(types, arguments)
                 .build();
     }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestDomainCoercer.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestDomainCoercer.java
index 8ed9b5f889ae..da851c86811e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestDomainCoercer.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestDomainCoercer.java
@@ -17,7 +17,7 @@
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.ValueSet;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.predicate.Domain.multipleValues;
@@ -34,6 +34,7 @@
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
 import static java.lang.Float.floatToIntBits;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestDomainCoercer
@@ -203,10 +204,11 @@ public void testTruncatedCoercedValue()
                         true));
     }
 
-    @Test(expectedExceptions = IllegalStateException.class)
+    @Test
     public void testUnsupportedCast()
     {
-        applySaturatedCasts(Domain.singleValue(INTEGER, 10L), BIGINT);
+        assertThatThrownBy(() -> applySaturatedCasts(Domain.singleValue(INTEGER, 10L), BIGINT))
+                .isInstanceOf(IllegalStateException.class);
     }
 
     private static Domain applySaturatedCasts(Domain domain, Type coercedValueType)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestDomainTranslator.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestDomainTranslator.java
index ee200fb0a1ac..865070c3d949 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestDomainTranslator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestDomainTranslator.java
@@ -18,7 +18,8 @@
 import com.google.common.io.BaseEncoding;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import io.trino.likematcher.LikeMatcher;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.MetadataManager;
 import io.trino.metadata.TestingFunctionResolution;
 import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.predicate.Domain;
@@ -46,16 +47,18 @@
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NotExpression;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.transaction.TestingTransactionManager;
+import io.trino.transaction.TransactionManager;
+import io.trino.type.LikePattern;
 import io.trino.type.LikePatternType;
 import io.trino.type.TypeCoercion;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -82,6 +85,7 @@
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.sql.ExpressionUtils.and;
 import static io.trino.sql.ExpressionUtils.or;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
 import static io.trino.sql.tree.BooleanLiteral.FALSE_LITERAL;
 import static io.trino.sql.tree.BooleanLiteral.TRUE_LITERAL;
@@ -96,15 +100,18 @@
 import static io.trino.transaction.TransactionBuilder.transaction;
 import static io.trino.type.ColorType.COLOR;
 import static io.trino.type.LikeFunctions.LIKE_FUNCTION_NAME;
+import static io.trino.type.LikeFunctions.LIKE_PATTERN_FUNCTION_NAME;
 import static java.lang.Float.floatToIntBits;
 import static java.lang.String.format;
 import static java.util.Collections.nCopies;
 import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
+@TestInstance(PER_CLASS)
 public class TestDomainTranslator
 {
     private static final Symbol C_BIGINT = new Symbol("c_bigint");
@@ -178,7 +185,7 @@ public class TestDomainTranslator
     private LiteralEncoder literalEncoder;
     private DomainTranslator domainTranslator;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         functionResolution = new TestingFunctionResolution();
@@ -186,7 +193,7 @@ public void setup()
         domainTranslator = new DomainTranslator(functionResolution.getPlannerContext());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         functionResolution = null;
@@ -598,6 +605,13 @@ public void testFromSingleBooleanReference()
         assertEquals(result.getRemainingExpression(), originalPredicate);
     }
 
+    @Test
+    public void testFromCastOfNullPredicate()
+    {
+        assertPredicateIsAlwaysFalse(cast(nullLiteral(), BOOLEAN));
+        assertPredicateIsAlwaysFalse(not(cast(nullLiteral(), BOOLEAN)));
+    }
+
     @Test
     public void testFromNotPredicate()
     {
@@ -797,7 +811,7 @@ public void testFromBasicComparisonsWithNulls()
     @Test
     public void testFromBasicComparisonsWithNaN()
     {
-        Expression nanDouble = literalEncoder.toExpression(TEST_SESSION, Double.NaN, DOUBLE);
+        Expression nanDouble = literalEncoder.toExpression(Double.NaN, DOUBLE);
 
         assertPredicateIsAlwaysFalse(equal(C_DOUBLE, nanDouble));
         assertPredicateIsAlwaysFalse(greaterThan(C_DOUBLE, nanDouble));
@@ -815,7 +829,7 @@ public void testFromBasicComparisonsWithNaN()
         assertPredicateIsAlwaysFalse(not(notEqual(C_DOUBLE, nanDouble)));
         assertUnsupportedPredicate(not(isDistinctFrom(C_DOUBLE, nanDouble)));
 
-        Expression nanReal = literalEncoder.toExpression(TEST_SESSION, (long) Float.floatToIntBits(Float.NaN), REAL);
+        Expression nanReal = literalEncoder.toExpression((long) Float.floatToIntBits(Float.NaN), REAL);
 
         assertPredicateIsAlwaysFalse(equal(C_REAL, nanReal));
         assertPredicateIsAlwaysFalse(greaterThan(C_REAL, nanReal));
@@ -834,6 +848,16 @@ public void testFromBasicComparisonsWithNaN()
         assertUnsupportedPredicate(not(isDistinctFrom(C_REAL, nanReal)));
     }
 
+    @Test
+    public void testFromCoercionComparisonsWithNaN()
+    {
+        Expression nanDouble = literalEncoder.toExpression(Double.NaN, DOUBLE);
+
+        assertPredicateIsAlwaysFalse(equal(cast(C_TINYINT, DOUBLE), nanDouble));
+        assertPredicateIsAlwaysFalse(equal(cast(C_SMALLINT, DOUBLE), nanDouble));
+        assertPredicateIsAlwaysFalse(equal(cast(C_INTEGER, DOUBLE), nanDouble));
+    }
+
     @Test
     public void testNonImplicitCastOnSymbolSide()
     {
@@ -1189,9 +1213,9 @@ public void testInPredicateWithVarchar()
 
     private void testInPredicate(Symbol symbol, Symbol symbol2, Type type, Object one, Object two)
     {
-        Expression oneExpression = literalEncoder.toExpression(TEST_SESSION, one, type);
-        Expression twoExpression = literalEncoder.toExpression(TEST_SESSION, two, type);
-        Expression nullExpression = literalEncoder.toExpression(TEST_SESSION, null, type);
+        Expression oneExpression = literalEncoder.toExpression(one, type);
+        Expression twoExpression = literalEncoder.toExpression(two, type);
+        Expression nullExpression = literalEncoder.toExpression(null, type);
         Expression otherSymbol = symbol2.toSymbolReference();
 
         // IN, single value
@@ -1262,10 +1286,10 @@ private void testInPredicate(Symbol symbol, Symbol symbol2, Type type, Object on
 
     private void testInPredicateWithFloatingPoint(Symbol symbol, Symbol symbol2, Type type, Object one, Object two, Object nan)
     {
-        Expression oneExpression = literalEncoder.toExpression(TEST_SESSION, one, type);
-        Expression twoExpression = literalEncoder.toExpression(TEST_SESSION, two, type);
-        Expression nanExpression = literalEncoder.toExpression(TEST_SESSION, nan, type);
-        Expression nullExpression = literalEncoder.toExpression(TEST_SESSION, null, type);
+        Expression oneExpression = literalEncoder.toExpression(one, type);
+        Expression twoExpression = literalEncoder.toExpression(two, type);
+        Expression nanExpression = literalEncoder.toExpression(nan, type);
+        Expression nullExpression = literalEncoder.toExpression(null, type);
         Expression otherSymbol = symbol2.toSymbolReference();
 
         // IN, single value
@@ -1508,7 +1532,7 @@ public void testFromNullLiteralPredicate()
     public void testExpressionConstantFolding()
     {
         FunctionCall fromHex = functionResolution
-                .functionCallBuilder(QualifiedName.of("from_hex"))
+                .functionCallBuilder("from_hex")
                 .addArgument(VARCHAR, stringLiteral("123456"))
                 .build();
         Expression originalExpression = comparison(GREATER_THAN, C_VARBINARY.toSymbolReference(), fromHex);
@@ -1990,8 +2014,12 @@ public void testStartsWithFunction()
     @Test
     public void testUnsupportedFunctions()
     {
-        assertUnsupportedPredicate(new FunctionCall(QualifiedName.of("LENGTH"), ImmutableList.of(C_VARCHAR.toSymbolReference())));
-        assertUnsupportedPredicate(new FunctionCall(QualifiedName.of("REPLACE"), ImmutableList.of(C_VARCHAR.toSymbolReference(), stringLiteral("abc"))));
+        assertUnsupportedPredicate(new FunctionCall(
+                functionResolution.resolveFunction("length", fromTypes(VARCHAR)).toQualifiedName(),
+                ImmutableList.of(C_VARCHAR.toSymbolReference())));
+        assertUnsupportedPredicate(new FunctionCall(
+                functionResolution.resolveFunction("replace", fromTypes(VARCHAR, VARCHAR)).toQualifiedName(),
+                ImmutableList.of(C_VARCHAR.toSymbolReference(), stringLiteral("abc"))));
     }
 
     @Test
@@ -2046,7 +2074,9 @@ private void assertNoFullPushdown(Expression expression)
 
     private ExtractionResult fromPredicate(Expression originalPredicate)
     {
-        return transaction(new TestingTransactionManager(), new AllowAllAccessControl())
+        TransactionManager transactionManager = new TestingTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
+        return transaction(transactionManager, metadata, new AllowAllAccessControl())
                 .singleStatement()
                 .execute(TEST_SESSION, transactionSession -> {
                     return DomainTranslator.getExtractionResult(functionResolution.getPlannerContext(), transactionSession, originalPredicate, TYPES);
@@ -2055,7 +2085,7 @@ private ExtractionResult fromPredicate(Expression originalPredicate)
 
     private Expression toPredicate(TupleDomain<Symbol> tupleDomain)
     {
-        return domainTranslator.toPredicate(TEST_SESSION, tupleDomain);
+        return domainTranslator.toPredicate(tupleDomain);
     }
 
     private static Expression unprocessableExpression1(Symbol symbol)
@@ -2071,7 +2101,7 @@ private static Expression unprocessableExpression2(Symbol symbol)
     private Expression randPredicate(Symbol symbol, Type type)
     {
         FunctionCall rand = functionResolution
-                .functionCallBuilder(QualifiedName.of("rand"))
+                .functionCallBuilder("rand")
                 .build();
         return comparison(GREATER_THAN, symbol.toSymbolReference(), cast(rand, type));
     }
@@ -2113,26 +2143,33 @@ private static ComparisonExpression isDistinctFrom(Symbol symbol, Expression exp
 
     private FunctionCall like(Symbol symbol, String pattern)
     {
-        return new FunctionCall(QualifiedName.of(LIKE_FUNCTION_NAME), ImmutableList.of(
-                symbol.toSymbolReference(),
-                literalEncoder.toExpression(TEST_SESSION, LikeMatcher.compile(pattern, Optional.empty()), LikePatternType.LIKE_PATTERN)));
+        return new FunctionCall(
+                functionResolution.resolveFunction(LIKE_FUNCTION_NAME, fromTypes(VARCHAR, LikePatternType.LIKE_PATTERN)).toQualifiedName(),
+                ImmutableList.of(symbol.toSymbolReference(), literalEncoder.toExpression(LikePattern.compile(pattern, Optional.empty()), LikePatternType.LIKE_PATTERN)));
     }
 
     private FunctionCall like(Symbol symbol, Expression pattern, Expression escape)
     {
-        return new FunctionCall(QualifiedName.of(LIKE_FUNCTION_NAME), ImmutableList.of(symbol.toSymbolReference(), pattern, escape));
+        FunctionCall likePattern = new FunctionCall(
+                functionResolution.resolveFunction(LIKE_PATTERN_FUNCTION_NAME, fromTypes(VARCHAR, VARCHAR)).toQualifiedName(),
+                ImmutableList.of(symbol.toSymbolReference(), pattern, escape));
+        return new FunctionCall(
+                functionResolution.resolveFunction(LIKE_FUNCTION_NAME, fromTypes(VARCHAR, LikePatternType.LIKE_PATTERN)).toQualifiedName(),
+                ImmutableList.of(symbol.toSymbolReference(), pattern, likePattern));
     }
 
     private FunctionCall like(Symbol symbol, String pattern, Character escape)
     {
-        return new FunctionCall(QualifiedName.of(LIKE_FUNCTION_NAME), ImmutableList.of(
-                symbol.toSymbolReference(),
-                literalEncoder.toExpression(TEST_SESSION, LikeMatcher.compile(pattern, Optional.of(escape)), LikePatternType.LIKE_PATTERN)));
+        return new FunctionCall(
+                functionResolution.resolveFunction(LIKE_FUNCTION_NAME, fromTypes(VARCHAR, LikePatternType.LIKE_PATTERN)).toQualifiedName(),
+                ImmutableList.of(symbol.toSymbolReference(), literalEncoder.toExpression(LikePattern.compile(pattern, Optional.of(escape)), LikePatternType.LIKE_PATTERN)));
     }
 
-    private static FunctionCall startsWith(Symbol symbol, Expression expression)
+    private FunctionCall startsWith(Symbol symbol, Expression expression)
     {
-        return new FunctionCall(QualifiedName.of("STARTS_WITH"), ImmutableList.of(symbol.toSymbolReference(), expression));
+        return new FunctionCall(
+                functionResolution.resolveFunction("starts_with", fromTypes(VARCHAR, VARCHAR)).toQualifiedName(),
+                ImmutableList.of(symbol.toSymbolReference(), expression));
     }
 
     private static Expression isNotNull(Symbol symbol)
@@ -2168,7 +2205,7 @@ private static IsNullPredicate isNull(Expression expression)
     private InPredicate in(Expression expression, Type expressisonType, List<?> values)
     {
         List<Type> types = nCopies(values.size(), expressisonType);
-        List<Expression> expressions = literalEncoder.toExpressions(TEST_SESSION, values, types);
+        List<Expression> expressions = literalEncoder.toExpressions(values, types);
         return new InPredicate(expression, new InListExpression(expressions));
     }
 
@@ -2272,7 +2309,7 @@ private static Expression cast(Expression expression, Type type)
 
     private Expression colorLiteral(long value)
     {
-        return literalEncoder.toExpression(TEST_SESSION, value, COLOR);
+        return literalEncoder.toExpression(value, COLOR);
     }
 
     private Expression varbinaryLiteral(Slice value)
@@ -2318,7 +2355,7 @@ private void testSimpleComparison(Expression expression, Symbol symbol, Expressi
 
     private Expression toExpression(Object object, Type type)
     {
-        return literalEncoder.toExpression(TEST_SESSION, object, type);
+        return literalEncoder.toExpression(object, type);
     }
 
     private static <T> TupleDomain<T> tupleDomain(T key, Domain domain)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestDynamicFilter.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestDynamicFilter.java
index a6993a792e12..b5692727c4ee 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestDynamicFilter.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestDynamicFilter.java
@@ -34,7 +34,7 @@
 import io.trino.sql.tree.GenericDataType;
 import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.NumericParameter;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -85,10 +85,10 @@ public void testLeftEquiJoin()
                         join(LEFT, builder -> builder
                                 .equiCriteria("ORDERS_OK", "LINEITEM_OK")
                                 .left(
-                                        project(tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))
+                                        tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey")))
                                 .right(
                                         exchange(
-                                                project(tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey"))))))));
+                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey")))))));
     }
 
     @Test
@@ -99,12 +99,10 @@ public void testFullEquiJoin()
                         join(FULL, builder -> builder
                                 .equiCriteria("ORDERS_OK", "LINEITEM_OK")
                                 .left(
-                                        project(
-                                                tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))
+                                        tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey")))
                                 .right(
                                         exchange(
-                                                project(
-                                                        tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey"))))))));
+                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey")))))));
     }
 
     @Test
@@ -120,8 +118,7 @@ public void testRightEquiJoin()
                                                 tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))
                                 .right(
                                         exchange(
-                                                project(
-                                                        tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey"))))))));
+                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey")))))));
     }
 
     @Test
@@ -312,8 +309,7 @@ public void testJoin()
                                                 tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))
                                 .right(
                                         exchange(
-                                                project(
-                                                        tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey"))))))));
+                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey")))))));
     }
 
     @Test
@@ -329,8 +325,7 @@ public void testInnerJoinWithConditionReversed()
                                                 tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))
                                 .right(
                                         exchange(
-                                                project(
-                                                        tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey"))))))));
+                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey")))))));
     }
 
     @Test
@@ -380,8 +375,7 @@ public void testNotDistinctFromLeftJoin()
                                         join(LEFT, leftJoinBuilder -> leftJoinBuilder
                                                 .equiCriteria("nationkey", "ORDERS_OK")
                                                 .left(
-                                                        anyTree(
-                                                                tableScan("nation", ImmutableMap.of("nationkey", "nationkey"))))
+                                                        tableScan("nation", ImmutableMap.of("nationkey", "nationkey")))
                                                 .right(
                                                         anyTree(
                                                                 tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))))
@@ -416,10 +410,9 @@ public void testJoinOnCast()
                         join(INNER, builder -> builder
                                 .equiCriteria("expr_orders", "expr_lineitem")
                                 .left(
-                                        anyTree(
-                                                project(
-                                                        ImmutableMap.of("expr_orders", expression("CAST(ORDERS_OK AS int)")),
-                                                        tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey")))))
+                                        project(
+                                                ImmutableMap.of("expr_orders", expression("CAST(ORDERS_OK AS int)")),
+                                                tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))
                                 .right(
                                         anyTree(
                                                 project(
@@ -432,14 +425,12 @@ public void testJoinOnCast()
                         join(INNER, builder -> builder
                                 .equiCriteria("expr_orders", "LINEITEM_OK")
                                 .left(
-                                        anyTree(
-                                                project(
-                                                        ImmutableMap.of("expr_orders", expression("CAST(CAST(ORDERS_OK AS int) AS bigint)")),
-                                                        tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey")))))
+                                        project(
+                                                ImmutableMap.of("expr_orders", expression("CAST(CAST(ORDERS_OK AS int) AS bigint)")),
+                                                tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))
                                 .right(
                                         anyTree(
-                                                project(
-                                                        tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey"))))))));
+                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey")))))));
     }
 
     @Test
@@ -451,16 +442,14 @@ public void testJoinImplicitCoercions()
                         join(INNER, builder -> builder
                                 .equiCriteria("expr_linenumber", "ORDERS_OK")
                                 .left(
-                                        anyTree(
-                                                project(
-                                                        ImmutableMap.of("expr_linenumber", expression("CAST(LINEITEM_LN AS bigint)")),
-                                                        node(FilterNode.class,
-                                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_LN", "linenumber")))
-                                                                .with(numberOfDynamicFilters(1)))))
+                                        project(
+                                                ImmutableMap.of("expr_linenumber", expression("CAST(LINEITEM_LN AS bigint)")),
+                                                node(FilterNode.class,
+                                                        tableScan("lineitem", ImmutableMap.of("LINEITEM_LN", "linenumber")))
+                                                        .with(numberOfDynamicFilters(1))))
                                 .right(
                                         exchange(
-                                                project(
-                                                        tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))))));
+                                                tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey")))))));
     }
 
     @Test
@@ -478,8 +467,7 @@ public void testJoinMultipleEquiJoinClauses()
                                                 tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey", "ORDERS_CK", "custkey"))))
                                 .right(
                                         exchange(
-                                                project(
-                                                        tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey", "LINEITEM_PK", "partkey"))))))));
+                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey", "LINEITEM_PK", "partkey")))))));
     }
 
     @Test
@@ -495,8 +483,7 @@ public void testJoinWithOrderBySameKey()
                                                 tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))
                                 .right(
                                         exchange(
-                                                project(
-                                                        tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey"))))))));
+                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey")))))));
     }
 
     @Test
@@ -511,11 +498,10 @@ public void testUncorrelatedSubqueries()
                                         anyTree(
                                                 tableScan("orders", ImmutableMap.of("X", "orderkey"))))
                                 .right(
-                                        project(
-                                                node(
-                                                        EnforceSingleRowNode.class,
-                                                        anyTree(
-                                                                tableScan("lineitem", ImmutableMap.of("Y", "orderkey")))))))));
+                                        node(
+                                                EnforceSingleRowNode.class,
+                                                anyTree(
+                                                        tableScan("lineitem", ImmutableMap.of("Y", "orderkey"))))))));
     }
 
     @Test
@@ -562,7 +548,7 @@ public void testSubTreeJoinDFOnProbeSide()
                                                                         tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey"))))
                                                         .right(
                                                                 exchange(
-                                                                        project(tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey")))))))))));
+                                                                        tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))))))));
     }
 
     @Test
@@ -579,16 +565,16 @@ public void testSubTreeJoinDFOnBuildSide()
                                                 .equiCriteria("LINEITEM_OK", "ORDERS_OK")
                                                 .dynamicFilter("LINEITEM_OK", "ORDERS_OK")
                                                 .left(
-                                                        anyTree(node(FilterNode.class,
+                                                        node(FilterNode.class,
                                                                 tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey")))
-                                                                .with(numberOfDynamicFilters(2))))
+                                                                .with(numberOfDynamicFilters(2)))
                                                 .right(
                                                         anyTree(node(FilterNode.class,
                                                                 tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey")))
                                                                 .with(numberOfDynamicFilters(1))))))
                                 .right(
                                         exchange(
-                                                project(tableScan("part", ImmutableMap.of("PART_PK", "partkey"))))))));
+                                                tableScan("part", ImmutableMap.of("PART_PK", "partkey")))))));
     }
 
     @Test
@@ -614,16 +600,13 @@ public void testNestedDynamicFiltersRemoval()
                                                 join(LEFT, rightJoinBuilder -> rightJoinBuilder
                                                         .equiCriteria("ORDERS_CK16", "ORDERS_CK27")
                                                         .left(
-                                                                anyTree(
-                                                                        join(LEFT, leftJoinBuilder -> leftJoinBuilder
-                                                                                .equiCriteria("ORDERS_CK6", "ORDERS_CK16")
-                                                                                .left(
-                                                                                        project(
-                                                                                                tableScan("orders", ImmutableMap.of("ORDERS_CK6", "clerk"))))
-                                                                                .right(
-                                                                                        exchange(
-                                                                                                project(
-                                                                                                        tableScan("orders", ImmutableMap.of("ORDERS_CK16", "clerk"))))))))
+                                                                join(LEFT, leftJoinBuilder -> leftJoinBuilder
+                                                                        .equiCriteria("ORDERS_CK6", "ORDERS_CK16")
+                                                                        .left(
+                                                                                tableScan("orders", ImmutableMap.of("ORDERS_CK6", "clerk")))
+                                                                        .right(
+                                                                                exchange(
+                                                                                        tableScan("orders", ImmutableMap.of("ORDERS_CK16", "clerk"))))))
                                                         .right(
                                                                 anyTree(
                                                                         tableScan("orders", ImmutableMap.of("ORDERS_CK27", "clerk"))))))))));
@@ -642,28 +625,24 @@ public void testNonPushedDownJoinFilterRemoval()
                                 .equiCriteria(ImmutableList.of(equiJoinClause("K0", "K2"), equiJoinClause("S", "V2")))
                                 .left(
                                         project(
-                                                project(
-                                                        ImmutableMap.of("S", expression("V0 + V1")),
-                                                        join(INNER, leftJoinBuilder -> leftJoinBuilder
-                                                                .equiCriteria("K0", "K1")
-                                                                .dynamicFilter("K0", "K1")
-                                                                .left(
-                                                                        project(
-                                                                                node(
-                                                                                        FilterNode.class,
-                                                                                        tableScan("part", ImmutableMap.of("K0", "partkey", "V0", "size")))
-                                                                                        .with(numberOfDynamicFilters(2))))
-                                                                .right(
-                                                                        exchange(
-                                                                                project(
-                                                                                        node(
-                                                                                                FilterNode.class,
-                                                                                                tableScan("part", ImmutableMap.of("K1", "partkey", "V1", "size")))
-                                                                                                .with(numberOfDynamicFilters(1)))))))))
+                                                ImmutableMap.of("S", expression("V0 + V1")),
+                                                join(INNER, leftJoinBuilder -> leftJoinBuilder
+                                                        .equiCriteria("K0", "K1")
+                                                        .dynamicFilter("K0", "K1")
+                                                        .left(
+                                                                node(
+                                                                        FilterNode.class,
+                                                                        tableScan("part", ImmutableMap.of("K0", "partkey", "V0", "size")))
+                                                                        .with(numberOfDynamicFilters(2)))
+                                                        .right(
+                                                                exchange(
+                                                                        node(
+                                                                                FilterNode.class,
+                                                                                tableScan("part", ImmutableMap.of("K1", "partkey", "V1", "size")))
+                                                                                .with(numberOfDynamicFilters(1)))))))
                                 .right(
                                         exchange(
-                                                project(
-                                                        tableScan("part", ImmutableMap.of("K2", "partkey", "V2", "size"))))))));
+                                                tableScan("part", ImmutableMap.of("K2", "partkey", "V2", "size")))))));
     }
 
     @Test
@@ -674,12 +653,11 @@ public void testSemiJoin()
                 noSemiJoinRewrite(),
                 anyTree(
                         filter("S",
-                                project(
-                                        semiJoin("X", "Y", "S", true,
-                                                anyTree(
-                                                        tableScan("orders", ImmutableMap.of("X", "orderkey"))),
-                                                anyTree(
-                                                        tableScan("lineitem", ImmutableMap.of("Y", "orderkey"))))))));
+                                semiJoin("X", "Y", "S", true,
+                                        anyTree(
+                                                tableScan("orders", ImmutableMap.of("X", "orderkey"))),
+                                        anyTree(
+                                                tableScan("lineitem", ImmutableMap.of("Y", "orderkey")))))));
     }
 
     @Test
@@ -690,19 +668,16 @@ public void testNonFilteringSemiJoin()
                 "SELECT * FROM orders WHERE orderkey NOT IN (SELECT orderkey FROM lineitem WHERE linenumber < 0)",
                 anyTree(
                         filter("NOT S",
-                                project(
-                                        semiJoin("X", "Y", "S", false,
-                                                anyTree(
-                                                        tableScan("orders", ImmutableMap.of("X", "orderkey"))),
-                                                anyTree(
-                                                        tableScan("lineitem", ImmutableMap.of("Y", "orderkey"))))))));
+                                semiJoin("X", "Y", "S", false,
+                                        tableScan("orders", ImmutableMap.of("X", "orderkey")),
+                                        anyTree(
+                                                tableScan("lineitem", ImmutableMap.of("Y", "orderkey")))))));
 
         assertPlan(
                 "SELECT orderkey IN (SELECT orderkey FROM lineitem WHERE linenumber < 0) FROM orders",
                 anyTree(
                         semiJoin("X", "Y", "S", false,
-                                anyTree(
-                                        tableScan("orders", ImmutableMap.of("X", "orderkey"))),
+                                tableScan("orders", ImmutableMap.of("X", "orderkey")),
                                 anyTree(
                                         tableScan("lineitem", ImmutableMap.of("Y", "orderkey"))))));
     }
@@ -715,13 +690,11 @@ public void testSemiJoinWithStaticFiltering()
                 noSemiJoinRewrite(),
                 anyTree(
                         filter("S",
-                                project(
-                                        semiJoin("X", "Y", "S", true,
-                                                anyTree(
-                                                        filter("X > BIGINT '0'",
-                                                                tableScan("orders", ImmutableMap.of("X", "orderkey")))),
-                                                anyTree(
-                                                        tableScan("lineitem", ImmutableMap.of("Y", "orderkey"))))))));
+                                semiJoin("X", "Y", "S", true,
+                                        filter("X > BIGINT '0'",
+                                                tableScan("orders", ImmutableMap.of("X", "orderkey"))),
+                                        anyTree(
+                                                tableScan("lineitem", ImmutableMap.of("Y", "orderkey")))))));
     }
 
     @Test
@@ -733,18 +706,17 @@ public void testMultiSemiJoin()
                 noSemiJoinRewrite(),
                 anyTree(
                         filter("S0",
-                                project(
-                                        semiJoin("PART_PK", "LINEITEM_PK", "S0", true,
-                                                anyTree(
-                                                        tableScan("part", ImmutableMap.of("PART_PK", "partkey"))),
-                                                anyTree(
-                                                        filter("S1",
-                                                                project(
-                                                                        semiJoin("LINEITEM_OK", "ORDERS_OK", "S1", true,
-                                                                                anyTree(
-                                                                                        tableScan("lineitem", ImmutableMap.of("LINEITEM_PK", "partkey", "LINEITEM_OK", "orderkey"))),
-                                                                                anyTree(
-                                                                                        tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))))))))));
+                                semiJoin("PART_PK", "LINEITEM_PK", "S0", true,
+                                        anyTree(
+                                                tableScan("part", ImmutableMap.of("PART_PK", "partkey"))),
+                                        anyTree(
+                                                filter("S1",
+                                                        project(
+                                                                semiJoin("LINEITEM_OK", "ORDERS_OK", "S1", true,
+                                                                        anyTree(
+                                                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_PK", "partkey", "LINEITEM_OK", "orderkey"))),
+                                                                        anyTree(
+                                                                                tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey")))))))))));
     }
 
     @Test
@@ -757,13 +729,11 @@ public void testSemiJoinUnsupportedDynamicFilterRemoval()
                 noSemiJoinRewrite(),
                 anyTree(
                         filter("S0",
-                                project(
-                                        semiJoin("LINEITEM_PK_PLUS_1000", "PART_PK", "S0", false,
-                                                anyTree(
-                                                        project(ImmutableMap.of("LINEITEM_PK_PLUS_1000", expression("(LINEITEM_PK + BIGINT '1000')")),
-                                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_PK", "partkey")))),
-                                                anyTree(
-                                                        tableScan("part", ImmutableMap.of("PART_PK", "partkey"))))))));
+                                semiJoin("LINEITEM_PK_PLUS_1000", "PART_PK", "S0", false,
+                                        project(ImmutableMap.of("LINEITEM_PK_PLUS_1000", expression("(LINEITEM_PK + BIGINT '1000')")),
+                                                tableScan("lineitem", ImmutableMap.of("LINEITEM_PK", "partkey"))),
+                                        anyTree(
+                                                tableScan("part", ImmutableMap.of("PART_PK", "partkey")))))));
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestEffectivePredicateExtractor.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestEffectivePredicateExtractor.java
index 306403112bdd..8b01be00a3e8 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestEffectivePredicateExtractor.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestEffectivePredicateExtractor.java
@@ -33,7 +33,6 @@
 import io.trino.spi.connector.ConnectorTableProperties;
 import io.trino.spi.connector.SortOrder;
 import io.trino.spi.function.BoundSignature;
-import io.trino.spi.function.FunctionMetadata;
 import io.trino.spi.function.FunctionNullability;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
@@ -73,7 +72,6 @@
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NotExpression;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Row;
 import io.trino.testing.TestingMetadata.TestingColumnHandle;
 import io.trino.testing.TestingSession;
@@ -95,6 +93,7 @@
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.spi.function.FunctionId.toFunctionId;
 import static io.trino.spi.function.FunctionKind.SCALAR;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -144,21 +143,15 @@ public class TestEffectivePredicateExtractor
         private final Metadata delegate = functionResolution.getMetadata();
 
         @Override
-        public ResolvedFunction resolveFunction(Session session, QualifiedName name, List<TypeSignatureProvider> parameterTypes)
+        public ResolvedFunction resolveBuiltinFunction(String name, List<TypeSignatureProvider> parameterTypes)
         {
-            return delegate.resolveFunction(session, name, parameterTypes);
+            return delegate.resolveBuiltinFunction(name, parameterTypes);
         }
 
         @Override
-        public FunctionMetadata getFunctionMetadata(Session session, ResolvedFunction resolvedFunction)
+        public ResolvedFunction getCoercion(Type fromType, Type toType)
         {
-            return delegate.getFunctionMetadata(session, resolvedFunction);
-        }
-
-        @Override
-        public ResolvedFunction getCoercion(Session session, Type fromType, Type toType)
-        {
-            return delegate.getCoercion(session, fromType, toType);
+            return delegate.getCoercion(fromType, toType);
         }
 
         @Override
@@ -171,7 +164,6 @@ public TableProperties getTableProperties(Session session, TableHandle handle)
                             ((PredicatedTableHandle) handle.getConnectorHandle()).getPredicate(),
                             Optional.empty(),
                             Optional.empty(),
-                            Optional.empty(),
                             ImmutableList.of()));
         }
     };
@@ -281,7 +273,7 @@ public void testFilter()
                         greaterThan(
                                 AE,
                                 functionResolution
-                                        .functionCallBuilder(QualifiedName.of("rand"))
+                                        .functionCallBuilder("rand")
                                         .build()),
                         lessThan(BE, bigintLiteral(10))));
 
@@ -730,7 +722,7 @@ public void testValues()
                         or(new ComparisonExpression(EQUAL, BE, bigintLiteral(200)), new IsNullPredicate(BE))));
 
         // non-deterministic
-        ResolvedFunction rand = functionResolution.resolveFunction(QualifiedName.of("rand"), ImmutableList.of());
+        ResolvedFunction rand = functionResolution.resolveFunction("rand", ImmutableList.of());
         ValuesNode node = new ValuesNode(
                 newId(),
                 ImmutableList.of(A, B),
@@ -768,7 +760,7 @@ public void testValues()
 
     private Expression extract(TypeProvider types, PlanNode node)
     {
-        return transaction(new TestingTransactionManager(), new AllowAllAccessControl())
+        return transaction(new TestingTransactionManager(), metadata, new AllowAllAccessControl())
                 .singleStatement()
                 .execute(SESSION, transactionSession -> {
                     return effectivePredicateExtractor.extract(transactionSession, node, types, typeAnalyzer);
@@ -1208,11 +1200,11 @@ private static IsNullPredicate isNull(Expression expression)
 
     private static ResolvedFunction fakeFunction(String name)
     {
-        BoundSignature boundSignature = new BoundSignature(name, UNKNOWN, ImmutableList.of());
+        BoundSignature boundSignature = new BoundSignature(builtinFunctionName(name), UNKNOWN, ImmutableList.of());
         return new ResolvedFunction(
                 boundSignature,
                 GlobalSystemConnector.CATALOG_HANDLE,
-                toFunctionId(boundSignature.toSignature()),
+                toFunctionId(name, boundSignature.toSignature()),
                 SCALAR,
                 true,
                 new FunctionNullability(false, ImmutableList.of()),
@@ -1237,7 +1229,7 @@ private Set<Expression> normalizeConjuncts(Expression predicate)
         predicate = expressionNormalizer.normalize(predicate);
 
         // Equality inference rewrites and equality generation will always be stable across multiple runs in the same JVM
-        EqualityInference inference = EqualityInference.newInstance(metadata, predicate);
+        EqualityInference inference = new EqualityInference(metadata, predicate);
 
         Set<Symbol> scope = SymbolsExtractor.extractUnique(predicate);
         Set<Expression> rewrittenSet = EqualityInference.nonInferrableConjuncts(metadata, predicate)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestEqualityInference.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestEqualityInference.java
index d5c728232882..57358be9fae8 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestEqualityInference.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestEqualityInference.java
@@ -35,14 +35,13 @@
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NullIfExpression;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SearchedCaseExpression;
 import io.trino.sql.tree.SimpleCaseExpression;
 import io.trino.sql.tree.SubscriptExpression;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.sql.tree.WhenClause;
 import io.trino.type.FunctionType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -72,7 +71,7 @@ public class TestEqualityInference
     @Test
     public void testTransitivity()
     {
-        EqualityInference inference = EqualityInference.newInstance(
+        EqualityInference inference = new EqualityInference(
                 metadata,
                 equals("a1", "b1"),
                 equals("b1", "c1"),
@@ -110,7 +109,7 @@ public void testTransitivity()
     @Test
     public void testTriviallyRewritable()
     {
-        Expression expression = EqualityInference.newInstance(metadata)
+        Expression expression = new EqualityInference(metadata)
                 .rewrite(someExpression("a1", "a2"), symbols("a1", "a2"));
 
         assertEquals(expression, someExpression("a1", "a2"));
@@ -119,7 +118,7 @@ public void testTriviallyRewritable()
     @Test
     public void testUnrewritable()
     {
-        EqualityInference inference = EqualityInference.newInstance(
+        EqualityInference inference = new EqualityInference(
                 metadata,
                 equals("a1", "b1"),
                 equals("a2", "b2"));
@@ -131,7 +130,7 @@ public void testUnrewritable()
     @Test
     public void testParseEqualityExpression()
     {
-        EqualityInference inference = EqualityInference.newInstance(
+        EqualityInference inference = new EqualityInference(
                 metadata,
                 equals("a1", "b1"),
                 equals("a1", "c1"),
@@ -144,7 +143,7 @@ public void testParseEqualityExpression()
     @Test
     public void testExtractInferrableEqualities()
     {
-        EqualityInference inference = EqualityInference.newInstance(
+        EqualityInference inference = new EqualityInference(
                 metadata,
                 ExpressionUtils.and(equals("a1", "b1"), equals("b1", "c1"), someExpression("c1", "d1")));
 
@@ -158,7 +157,7 @@ public void testExtractInferrableEqualities()
     @Test
     public void testEqualityPartitionGeneration()
     {
-        EqualityInference inference = EqualityInference.newInstance(
+        EqualityInference inference = new EqualityInference(
                 metadata,
                 equals(nameReference("a1"), nameReference("b1")),
                 equals(add("a1", "a1"), multiply(nameReference("a1"), number(2))),
@@ -193,7 +192,7 @@ public void testEqualityPartitionGeneration()
 
         // There should be a "full cover" of all of the equalities used
         // THUS, we should be able to plug the generated equalities back in and get an equivalent set of equalities back the next time around
-        EqualityInference newInference = EqualityInference.newInstance(
+        EqualityInference newInference = new EqualityInference(
                 metadata,
                 ImmutableList.<Expression>builder()
                         .addAll(equalityPartition.getScopeEqualities())
@@ -211,7 +210,7 @@ public void testEqualityPartitionGeneration()
     @Test
     public void testMultipleEqualitySetsPredicateGeneration()
     {
-        EqualityInference inference = EqualityInference.newInstance(
+        EqualityInference inference = new EqualityInference(
                 metadata,
                 equals("a1", "b1"),
                 equals("b1", "c1"),
@@ -240,7 +239,7 @@ public void testMultipleEqualitySetsPredicateGeneration()
 
         // Again, there should be a "full cover" of all of the equalities used
         // THUS, we should be able to plug the generated equalities back in and get an equivalent set of equalities back the next time around
-        EqualityInference newInference = EqualityInference.newInstance(
+        EqualityInference newInference = new EqualityInference(
                 metadata,
                 ImmutableList.<Expression>builder()
                         .addAll(equalityPartition.getScopeEqualities())
@@ -258,7 +257,7 @@ public void testMultipleEqualitySetsPredicateGeneration()
     @Test
     public void testSubExpressionRewrites()
     {
-        EqualityInference inference = EqualityInference.newInstance(
+        EqualityInference inference = new EqualityInference(
                 metadata,
                 equals(nameReference("a1"), add("b", "c")), // a1 = b + c
                 equals(nameReference("a2"), multiply(nameReference("b"), add("b", "c"))), // a2 = b * (b + c)
@@ -277,7 +276,7 @@ public void testSubExpressionRewrites()
     @Test
     public void testConstantEqualities()
     {
-        EqualityInference inference = EqualityInference.newInstance(
+        EqualityInference inference = new EqualityInference(
                 metadata,
                 equals("a1", "b1"),
                 equals("b1", "c1"),
@@ -300,7 +299,7 @@ public void testConstantEqualities()
     @Test
     public void testEqualityGeneration()
     {
-        EqualityInference inference = EqualityInference.newInstance(
+        EqualityInference inference = new EqualityInference(
                 metadata,
                 equals(nameReference("a1"), add("b", "c")), // a1 = b + c
                 equals(nameReference("e1"), add("b", "d")), // e1 = b + d
@@ -316,7 +315,7 @@ public void testExpressionsThatMayReturnNullOnNonNullInput()
         List<Expression> candidates = ImmutableList.of(
                 new Cast(nameReference("b"), toSqlType(BIGINT), true), // try_cast
                 functionResolution
-                        .functionCallBuilder(QualifiedName.of(TryFunction.NAME))
+                        .functionCallBuilder(TryFunction.NAME)
                         .addArgument(new FunctionType(ImmutableList.of(), VARCHAR), new LambdaExpression(ImmutableList.of(), nameReference("b")))
                         .build(),
                 new NullIfExpression(nameReference("b"), number(1)),
@@ -327,7 +326,7 @@ public void testExpressionsThatMayReturnNullOnNonNullInput()
                 new SubscriptExpression(new Array(ImmutableList.of(new NullLiteral())), nameReference("b")));
 
         for (Expression candidate : candidates) {
-            EqualityInference inference = EqualityInference.newInstance(
+            EqualityInference inference = new EqualityInference(
                     metadata,
                     equals(nameReference("b"), nameReference("x")),
                     equals(nameReference("a"), candidate));
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestGroupingOperationRewriter.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestGroupingOperationRewriter.java
index 8152767da899..7162e821f20b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestGroupingOperationRewriter.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestGroupingOperationRewriter.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Set;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestHaving.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestHaving.java
index 279dd47111a7..99c7ba3d179e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestHaving.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestHaving.java
@@ -14,7 +14,7 @@
 package io.trino.sql.planner;
 
 import io.trino.sql.planner.assertions.BasePlanTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestInsert.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestInsert.java
index 75ba685a9c8b..56f1641c8ef8 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestInsert.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestInsert.java
@@ -32,14 +32,14 @@
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
-import static io.trino.SystemSessionProperties.PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS;
-import static io.trino.SystemSessionProperties.TASK_PARTITIONED_WRITER_COUNT;
+import static io.trino.SystemSessionProperties.SCALE_WRITERS;
+import static io.trino.SystemSessionProperties.TASK_MAX_WRITER_COUNT;
+import static io.trino.SystemSessionProperties.TASK_MIN_WRITER_COUNT;
 import static io.trino.SystemSessionProperties.TASK_SCALE_WRITERS_ENABLED;
-import static io.trino.SystemSessionProperties.TASK_WRITER_COUNT;
 import static io.trino.SystemSessionProperties.USE_PREFERRED_WRITE_PARTITIONING;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
@@ -118,10 +118,9 @@ public void testInsertWithPreferredPartitioning()
                 withForcedPreferredPartitioning(),
                 anyTree(
                         node(TableWriterNode.class,
-                                anyTree(
-                                        exchange(LOCAL, REPARTITION, ImmutableList.of(), ImmutableSet.of("column1"),
-                                                exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("column1"),
-                                                        anyTree(values("column1", "column2"))))))));
+                                exchange(LOCAL, REPARTITION, ImmutableList.of(), ImmutableSet.of("column1"),
+                                        exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("column1"),
+                                                values("column1", "column2"))))));
     }
 
     @Test
@@ -166,10 +165,9 @@ public void testCreateTableAsSelectWithPreferredPartitioning()
                 withForcedPreferredPartitioning(),
                 anyTree(
                         node(TableWriterNode.class,
-                                anyTree(
-                                        exchange(LOCAL, REPARTITION, ImmutableList.of(), ImmutableSet.of("column1"),
-                                                exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("column1"),
-                                                        anyTree(values("column1", "column2"))))))));
+                                exchange(LOCAL, REPARTITION, ImmutableList.of(), ImmutableSet.of("column1"),
+                                        exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("column1"),
+                                                values("column1", "column2"))))));
     }
 
     @Test
@@ -251,47 +249,14 @@ public MatchResult detailMatches(PlanNode node, StatsProvider stats, Session ses
         };
     }
 
-    @Test
-    public void testCreateTableAsSelectWithPreferredPartitioningThreshold()
-    {
-        assertDistributedPlan(
-                "CREATE TABLE new_test_table_preferred_partitioning (column1, column2) AS SELECT * FROM (VALUES (1, 2)) t(column1, column2)",
-                withPreferredPartitioningThreshold(),
-                anyTree(
-                        node(TableWriterNode.class,
-                                // round robin
-                                exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of(),
-                                        values("column1", "column2")))));
-        assertDistributedPlan(
-                "CREATE TABLE new_test_table_preferred_partitioning (column1, column2) AS SELECT * FROM (VALUES (1, 2), (3,4)) t(column1, column2)",
-                withPreferredPartitioningThreshold(),
-                anyTree(
-                        node(TableWriterNode.class,
-                                anyTree(
-                                        exchange(LOCAL, REPARTITION, ImmutableList.of(), ImmutableSet.of("column1"),
-                                                exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("column1"),
-                                                        anyTree(values("column1", "column2"))))))));
-    }
-
     private Session withForcedPreferredPartitioning()
     {
         return Session.builder(getQueryRunner().getDefaultSession())
                 .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "true")
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
-                .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "false")
-                .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, "16")
-                .setSystemProperty(TASK_WRITER_COUNT, "16")
-                .build();
-    }
-
-    private Session withPreferredPartitioningThreshold()
-    {
-        return Session.builder(getQueryRunner().getDefaultSession())
-                .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "true")
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "2")
+                .setSystemProperty(SCALE_WRITERS, "false")
                 .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "false")
-                .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, "16")
-                .setSystemProperty(TASK_WRITER_COUNT, "16")
+                .setSystemProperty(TASK_MAX_WRITER_COUNT, "16")
+                .setSystemProperty(TASK_MIN_WRITER_COUNT, "16")
                 .build();
     }
 
@@ -300,8 +265,8 @@ private Session withoutPreferredPartitioning()
         return Session.builder(getQueryRunner().getDefaultSession())
                 .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "false")
                 .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "false")
-                .setSystemProperty(TASK_WRITER_COUNT, "16")
-                .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, "2") // force parallel plan even on test nodes with single CPU
+                .setSystemProperty(TASK_MIN_WRITER_COUNT, "16")
+                .setSystemProperty(TASK_MAX_WRITER_COUNT, "2") // force parallel plan even on test nodes with single CPU
                 .build();
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestLiteralEncoder.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestLiteralEncoder.java
index 33af3f07de8a..1607fd46a0f5 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestLiteralEncoder.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestLiteralEncoder.java
@@ -19,10 +19,13 @@
 import io.airlift.slice.Slice;
 import io.trino.connector.system.GlobalSystemConnector;
 import io.trino.metadata.LiteralFunction;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.MetadataManager;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.operator.scalar.Re2JCastToRegexpFunction;
 import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.function.FunctionNullability;
 import io.trino.spi.function.Signature;
 import io.trino.spi.type.LongTimestamp;
@@ -35,8 +38,9 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.NodeRef;
 import io.trino.transaction.TestingTransactionManager;
+import io.trino.transaction.TransactionManager;
 import io.trino.type.Re2JRegexp;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Base64;
@@ -47,6 +51,7 @@
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.airlift.testing.Assertions.assertEqualsIgnoreCase;
 import static io.trino.SessionTestUtils.TEST_SESSION;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.metadata.LiteralFunction.LITERAL_FUNCTION_NAME;
 import static io.trino.operator.scalar.JoniRegexpCasts.castVarcharToJoniRegexp;
 import static io.trino.operator.scalar.JsonFunctions.castVarcharToJsonPath;
@@ -85,7 +90,10 @@ public class TestLiteralEncoder
     private final LiteralEncoder encoder = new LiteralEncoder(PLANNER_CONTEXT);
 
     private final ResolvedFunction literalFunction = new ResolvedFunction(
-            new BoundSignature(LITERAL_FUNCTION_NAME, VARBINARY, ImmutableList.of(VARBINARY)),
+            new BoundSignature(
+                    builtinFunctionName(LITERAL_FUNCTION_NAME),
+                    VARBINARY,
+                    ImmutableList.of(VARBINARY)),
             GlobalSystemConnector.CATALOG_HANDLE,
             new LiteralFunction(PLANNER_CONTEXT.getBlockEncodingSerde()).getFunctionMetadata().getFunctionId(),
             SCALAR,
@@ -95,13 +103,17 @@ public class TestLiteralEncoder
             ImmutableSet.of());
 
     private final ResolvedFunction base64Function = new ResolvedFunction(
-            new BoundSignature("from_base64", VARBINARY, ImmutableList.of(VARCHAR)),
+            new BoundSignature(
+                    builtinFunctionName("from_base64"),
+                    VARBINARY,
+                    ImmutableList.of(VARCHAR)),
             GlobalSystemConnector.CATALOG_HANDLE,
-            toFunctionId(Signature.builder()
-                    .name("from_base64")
-                    .returnType(VARBINARY)
-                    .argumentType(new TypeSignature("varchar", typeVariable("x")))
-                    .build()),
+            toFunctionId(
+                    "from_base64",
+                    Signature.builder()
+                            .returnType(VARBINARY)
+                            .argumentType(new TypeSignature("varchar", typeVariable("x")))
+                            .build()),
             SCALAR,
             true,
             new FunctionNullability(false, ImmutableList.of(false)),
@@ -271,7 +283,7 @@ public void testEncodeCodePoints()
 
     private void assertEncode(Object value, Type type, String expected)
     {
-        Expression expression = encoder.toExpression(TEST_SESSION, value, type);
+        Expression expression = encoder.toExpression(value, type);
         assertEquals(getExpressionType(expression), type);
         assertEquals(getExpressionValue(expression), value);
         assertEquals(formatSql(expression), expected);
@@ -283,7 +295,7 @@ private void assertEncode(Object value, Type type, String expected)
     @Deprecated
     private void assertEncodeCaseInsensitively(Object value, Type type, String expected)
     {
-        Expression expression = encoder.toExpression(TEST_SESSION, value, type);
+        Expression expression = encoder.toExpression(value, type);
         assertTrue(isEffectivelyLiteral(PLANNER_CONTEXT, TEST_SESSION, expression), "isEffectivelyLiteral returned false for: " + expression);
         assertEquals(getExpressionType(expression), type);
         assertEquals(getExpressionValue(expression), value);
@@ -292,7 +304,7 @@ private void assertEncodeCaseInsensitively(Object value, Type type, String expec
 
     private <T> void assertRoundTrip(T value, Type type, BiPredicate<T, T> predicate)
     {
-        Expression expression = encoder.toExpression(TEST_SESSION, value, type);
+        Expression expression = encoder.toExpression(value, type);
         assertTrue(isEffectivelyLiteral(PLANNER_CONTEXT, TEST_SESSION, expression), "isEffectivelyLiteral returned false for: " + expression);
         assertEquals(getExpressionType(expression), type);
         @SuppressWarnings("unchecked")
@@ -315,7 +327,9 @@ private Type getExpressionType(Expression expression)
 
     private Map<NodeRef<Expression>, Type> getExpressionTypes(Expression expression)
     {
-        return transaction(new TestingTransactionManager(), new AllowAllAccessControl())
+        TransactionManager transactionManager = new TestingTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
+        return transaction(transactionManager, metadata, new AllowAllAccessControl())
                 .singleStatement()
                 .execute(TEST_SESSION, transactionSession -> {
                     return ExpressionUtils.getExpressionTypes(PLANNER_CONTEXT, transactionSession, expression, TypeProvider.empty());
@@ -324,9 +338,13 @@ private Map<NodeRef<Expression>, Type> getExpressionTypes(Expression expression)
 
     private String literalVarbinary(byte[] value)
     {
-        return "\"" + literalFunction.toQualifiedName() + "\"" +
-                "(\"" + base64Function.toQualifiedName() + "\"" +
-                "('" + Base64.getEncoder().encodeToString(value) + "'))";
+        return "%s(%s('%s'))".formatted(serializeResolvedFunction(literalFunction), serializeResolvedFunction(base64Function), Base64.getEncoder().encodeToString(value));
+    }
+
+    private static String serializeResolvedFunction(ResolvedFunction function)
+    {
+        CatalogSchemaFunctionName name = function.toCatalogSchemaFunctionName();
+        return "%s.\"%s\".\"%s\"".formatted(name.getCatalogName(), name.getSchemaName(), name.getFunctionName());
     }
 
     private static Re2JRegexp castVarcharToRe2JRegexp(Slice value)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestLocalDynamicFilterConsumer.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestLocalDynamicFilterConsumer.java
index 40ad4e2d4c01..fb4417e3d7d8 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestLocalDynamicFilterConsumer.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestLocalDynamicFilterConsumer.java
@@ -28,7 +28,7 @@
 import io.trino.sql.planner.plan.DynamicFilterId;
 import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.JoinNode.EquiJoinClause;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Optional;
@@ -43,7 +43,6 @@
 import static io.trino.SystemSessionProperties.ENABLE_DYNAMIC_FILTERING;
 import static io.trino.SystemSessionProperties.JOIN_DISTRIBUTION_TYPE;
 import static io.trino.SystemSessionProperties.JOIN_REORDERING_STRATEGY;
-import static io.trino.metadata.AbstractMockMetadata.dummyMetadata;
 import static io.trino.spi.predicate.Range.range;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
@@ -230,7 +229,7 @@ public void testMultiplePartitionsAndColumns()
     @Test
     public void testDynamicFilterPruning()
     {
-        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), dummyMetadata(), getQueryRunner().getDefaultSession());
+        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), getQueryRunner().getPlannerContext(), getQueryRunner().getDefaultSession());
         Symbol left1 = planBuilder.symbol("left1", BIGINT);
         Symbol left2 = planBuilder.symbol("left2", INTEGER);
         Symbol left3 = planBuilder.symbol("left3", SMALLINT);
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestLocalDynamicFiltersCollector.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestLocalDynamicFiltersCollector.java
index eda267931525..0770c5b3a5f5 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestLocalDynamicFiltersCollector.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestLocalDynamicFiltersCollector.java
@@ -27,7 +27,7 @@
 import io.trino.sql.DynamicFilters;
 import io.trino.sql.planner.plan.DynamicFilterId;
 import io.trino.sql.tree.Cast;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestLocalExecutionPlanner.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestLocalExecutionPlanner.java
index acc36d1fb0dd..2aa043e0a83e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestLocalExecutionPlanner.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestLocalExecutionPlanner.java
@@ -17,9 +17,10 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.airlift.testing.Closeables.closeAllRuntimeException;
 import static io.trino.SessionTestUtils.TEST_SESSION;
@@ -27,19 +28,21 @@
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static java.util.Collections.nCopies;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestLocalExecutionPlanner
 {
     private LocalQueryRunner runner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         runner = LocalQueryRunner.create(TEST_SESSION);
         runner.createCatalog("tpch", new TpchConnectorFactory(), ImmutableMap.of());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
     {
         closeAllRuntimeException(runner);
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestLogicalPlanner.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestLogicalPlanner.java
index 654b3016cf62..f75bb051d847 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestLogicalPlanner.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestLogicalPlanner.java
@@ -63,11 +63,10 @@
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.GenericLiteral;
 import io.trino.sql.tree.LongLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.tests.QueryTemplate;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -79,7 +78,6 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.MoreCollectors.toOptional;
 import static io.airlift.slice.Slices.utf8Slice;
-import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.SystemSessionProperties.DISTRIBUTED_SORT;
 import static io.trino.SystemSessionProperties.FILTERING_SEMI_JOIN_TO_INNER;
 import static io.trino.SystemSessionProperties.JOIN_DISTRIBUTION_TYPE;
@@ -230,7 +228,7 @@ public void testAggregation()
                                                 aggregation(
                                                         ImmutableMap.of("partial_sum", functionCall("sum", ImmutableList.of("totalprice"))),
                                                         PARTIAL,
-                                                        anyTree(tableScan("orders", ImmutableMap.of("totalprice", "totalprice")))))))));
+                                                        tableScan("orders", ImmutableMap.of("totalprice", "totalprice"))))))));
 
         // simple group by over filter that keeps at most one group
         assertDistributedPlan("SELECT orderstatus, sum(totalprice) FROM orders WHERE orderstatus='O' GROUP BY orderstatus",
@@ -243,7 +241,7 @@ public void testAggregation()
                                                 aggregation(
                                                         ImmutableMap.of("partial_sum", functionCall("sum", ImmutableList.of("totalprice"))),
                                                         PARTIAL,
-                                                        anyTree(tableScan("orders", ImmutableMap.of("totalprice", "totalprice")))))))));
+                                                        tableScan("orders", ImmutableMap.of("totalprice", "totalprice"))))))));
     }
 
     @Test
@@ -275,7 +273,7 @@ public void testAllFieldsDereferenceOnSubquery()
     public void testAllFieldsDereferenceFromNonDeterministic()
     {
         FunctionCall randomFunction = new FunctionCall(
-                getQueryRunner().getMetadata().resolveFunction(TEST_SESSION, QualifiedName.of("rand"), ImmutableList.of()).toQualifiedName(),
+                getQueryRunner().getMetadata().resolveBuiltinFunction("rand", ImmutableList.of()).toQualifiedName(),
                 ImmutableList.of());
 
         assertPlan("SELECT (x, x).* FROM (SELECT rand()) T(x)",
@@ -374,10 +372,8 @@ public void testDistinctOverConstants()
                         markDistinct(
                                 "is_distinct",
                                 ImmutableList.of("orderstatus"),
-                                "hash",
                                 anyTree(
-                                        project(ImmutableMap.of("hash", expression("combine_hash(bigint '0', coalesce(\"$operator$hash_code\"(orderstatus), 0))")),
-                                                tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus")))))));
+                                        tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus"))))));
     }
 
     @Test
@@ -409,12 +405,11 @@ public void testInnerInequalityJoinWithEquiJoinConjuncts()
                                                         new DynamicFilterPattern("O_SHIPPRIORITY", EQUAL, "L_LINENUMBER"),
                                                         new DynamicFilterPattern("O_ORDERKEY", LESS_THAN, "L_ORDERKEY")))
                                         .left(
-                                                project(
-                                                        filter(TRUE_LITERAL,
-                                                                tableScan("orders",
-                                                                        ImmutableMap.of(
-                                                                                "O_SHIPPRIORITY", "shippriority",
-                                                                                "O_ORDERKEY", "orderkey")))))
+                                                filter(TRUE_LITERAL,
+                                                        tableScan("orders",
+                                                                ImmutableMap.of(
+                                                                        "O_SHIPPRIORITY", "shippriority",
+                                                                        "O_ORDERKEY", "orderkey"))))
                                         .right(
                                                 anyTree(
                                                         tableScan("lineitem",
@@ -485,12 +480,11 @@ public void testInequalityPredicatePushdownWithOuterJoin()
                                         .equiCriteria("O_ORDERKEY", "L_ORDERKEY")
                                         .filter("O_CUSTKEY + BIGINT '42' < EXPR")
                                         .left(
-                                                anyTree(
-                                                        tableScan(
-                                                                "orders",
-                                                                ImmutableMap.of(
-                                                                        "O_ORDERKEY", "orderkey",
-                                                                        "O_CUSTKEY", "custkey"))))
+                                                tableScan(
+                                                        "orders",
+                                                        ImmutableMap.of(
+                                                                "O_ORDERKEY", "orderkey",
+                                                                "O_CUSTKEY", "custkey")))
                                         .right(
                                                 anyTree(
                                                         project(
@@ -512,9 +506,9 @@ public void testTopNPushdownToJoinSource()
                                         anyTree(
                                                 join(LEFT, builder -> builder
                                                         .equiCriteria("N_KEY", "R_KEY")
-                                                        .left(project(
+                                                        .left(
                                                                 topN(1, ImmutableList.of(sort("N_COMM", ASCENDING, LAST)), TopNNode.Step.PARTIAL,
-                                                                        tableScan("nation", ImmutableMap.of("N_NAME", "name", "N_KEY", "regionkey", "N_COMM", "comment")))))
+                                                                        tableScan("nation", ImmutableMap.of("N_NAME", "name", "N_KEY", "regionkey", "N_COMM", "comment"))))
                                                         .right(anyTree(
                                                                 tableScan("region", ImmutableMap.of("R_NAME", "name", "R_KEY", "regionkey"))))))))));
     }
@@ -527,35 +521,30 @@ public void testUncorrelatedSubqueries()
                         join(INNER, builder -> builder
                                 .equiCriteria("X", "Y")
                                 .left(
-                                        project(
-                                                filter(TRUE_LITERAL,
-                                                        tableScan("orders", ImmutableMap.of("X", "orderkey")))))
+                                        filter(TRUE_LITERAL,
+                                                tableScan("orders", ImmutableMap.of("X", "orderkey"))))
                                 .right(
-                                        project(
-                                                node(EnforceSingleRowNode.class,
-                                                        anyTree(
-                                                                tableScan("lineitem", ImmutableMap.of("Y", "orderkey")))))))));
+                                        node(EnforceSingleRowNode.class,
+                                                anyTree(
+                                                        tableScan("lineitem", ImmutableMap.of("Y", "orderkey"))))))));
 
         assertPlan("SELECT * FROM orders WHERE orderkey IN (SELECT orderkey FROM lineitem WHERE linenumber % 4 = 0)",
                 noSemiJoinRewrite(),
                 anyTree(
                         filter("S",
-                                project(
-                                        semiJoin("X", "Y", "S",
-                                                anyTree(
-                                                        tableScan("orders", ImmutableMap.of("X", "orderkey"))),
-                                                anyTree(
-                                                        tableScan("lineitem", ImmutableMap.of("Y", "orderkey"))))))));
+                                semiJoin("X", "Y", "S",
+                                        anyTree(
+                                                tableScan("orders", ImmutableMap.of("X", "orderkey"))),
+                                        anyTree(
+                                                tableScan("lineitem", ImmutableMap.of("Y", "orderkey")))))));
 
         assertPlan("SELECT * FROM orders WHERE orderkey NOT IN (SELECT orderkey FROM lineitem WHERE linenumber < 0)",
                 anyTree(
                         filter("NOT S",
-                                project(
-                                        semiJoin("X", "Y", "S",
-                                                anyTree(
-                                                        tableScan("orders", ImmutableMap.of("X", "orderkey"))),
-                                                anyTree(
-                                                        tableScan("lineitem", ImmutableMap.of("Y", "orderkey"))))))));
+                                semiJoin("X", "Y", "S",
+                                        tableScan("orders", ImmutableMap.of("X", "orderkey")),
+                                        anyTree(
+                                                tableScan("lineitem", ImmutableMap.of("Y", "orderkey")))))));
     }
 
     @Test
@@ -571,14 +560,13 @@ public void testPushDownJoinConditionConjunctsToInnerSideBasedOnInheritedPredica
                                                 equiJoinClause("NATION_NAME", "REGION_NAME"),
                                                 equiJoinClause("NATION_REGIONKEY", "REGION_REGIONKEY")))
                                 .left(
-                                        anyTree(
-                                                filter("NATION_NAME = CAST ('blah' AS varchar(25))",
-                                                        constrainedTableScan(
-                                                                "nation",
-                                                                ImmutableMap.of(),
-                                                                ImmutableMap.of(
-                                                                        "NATION_NAME", "name",
-                                                                        "NATION_REGIONKEY", "regionkey")))))
+                                        filter("NATION_NAME = CAST ('blah' AS varchar(25))",
+                                                constrainedTableScan(
+                                                        "nation",
+                                                        ImmutableMap.of(),
+                                                        ImmutableMap.of(
+                                                                "NATION_NAME", "name",
+                                                                "NATION_REGIONKEY", "regionkey"))))
                                 .right(
                                         anyTree(
                                                 filter("REGION_NAME = CAST ('blah' AS varchar(25))",
@@ -762,7 +750,7 @@ public void testCorrelatedJoinWithLimit()
                 any(
                         join(LEFT, builder -> builder
                                 .equiCriteria("region_regionkey", "nation_regionkey")
-                                .left(any(tableScan("region", ImmutableMap.of("region_regionkey", "regionkey"))))
+                                .left(tableScan("region", ImmutableMap.of("region_regionkey", "regionkey")))
                                 .right(any(rowNumber(
                                         pattern -> pattern
                                                 .partitionBy(ImmutableList.of("nation_regionkey"))
@@ -790,7 +778,7 @@ public void testCorrelatedJoinWithTopN()
                 any(
                         join(LEFT, builder -> builder
                                 .equiCriteria("region_regionkey", "nation_regionkey")
-                                .left(any(tableScan("region", ImmutableMap.of("region_regionkey", "regionkey"))))
+                                .left(tableScan("region", ImmutableMap.of("region_regionkey", "regionkey")))
                                 .right(any(topNRanking(
                                         pattern -> pattern
                                                 .specification(
@@ -808,7 +796,7 @@ public void testCorrelatedJoinWithTopN()
                 any(
                         join(LEFT, builder -> builder
                                 .equiCriteria("region_regionkey", "nation_regionkey")
-                                .left(any(tableScan("region", ImmutableMap.of("region_regionkey", "regionkey"))))
+                                .left(tableScan("region", ImmutableMap.of("region_regionkey", "regionkey")))
                                 .right(any(rowNumber(
                                         pattern -> pattern
                                                 .partitionBy(ImmutableList.of("nation_regionkey"))
@@ -854,7 +842,7 @@ public void testCorrelatedScalarSubqueryInSelect()
                                                         .equiCriteria("n_regionkey", "r_regionkey")
                                                         .left(assignUniqueId("unique",
                                                                 exchange(REMOTE, REPARTITION,
-                                                                        anyTree(tableScan("nation", ImmutableMap.of("n_regionkey", "regionkey"))))))
+                                                                        tableScan("nation", ImmutableMap.of("n_regionkey", "regionkey")))))
                                                         .right(anyTree(
                                                                 tableScan("region", ImmutableMap.of("r_regionkey", "regionkey"))))))))));
 
@@ -867,9 +855,8 @@ public void testCorrelatedScalarSubqueryInSelect()
                                                 join(LEFT, builder -> builder
                                                         .equiCriteria("n_regionkey", "r_regionkey")
                                                         .left(
-                                                                project(
-                                                                        assignUniqueId("unique",
-                                                                                tableScan("nation", ImmutableMap.of("n_regionkey", "regionkey", "n_name", "name")))))
+                                                                assignUniqueId("unique",
+                                                                        tableScan("nation", ImmutableMap.of("n_regionkey", "regionkey", "n_name", "name"))))
                                                         .right(
                                                                 anyTree(
                                                                         tableScan("region", ImmutableMap.of("r_regionkey", "regionkey"))))))))));
@@ -893,8 +880,7 @@ public void testStreamingAggregationForCorrelatedSubquery()
                                 node(JoinNode.class,
                                         assignUniqueId("unique",
                                                 exchange(REMOTE, REPARTITION,
-                                                        anyTree(
-                                                                tableScan("nation", ImmutableMap.of("n_name", "name", "n_regionkey", "regionkey"))))),
+                                                        tableScan("nation", ImmutableMap.of("n_name", "name", "n_regionkey", "regionkey")))),
                                         anyTree(
                                                 project(
                                                         ImmutableMap.of("non_null", expression("true")),
@@ -957,8 +943,7 @@ public void testStreamingAggregationOverJoin()
                                 join(LEFT, builder -> builder
                                         .equiCriteria("o_orderkey", "l_orderkey")
                                         .left(
-                                                anyTree(
-                                                        tableScan("orders", ImmutableMap.of("o_orderkey", "orderkey"))))
+                                                tableScan("orders", ImmutableMap.of("o_orderkey", "orderkey")))
                                         .right(
                                                 anyTree(
                                                         tableScan("lineitem", ImmutableMap.of("l_orderkey", "orderkey"))))))));
@@ -1092,8 +1077,8 @@ public void testCorrelatedDistinctAggregationRewriteToLeftOuterJoin()
                                         .left(
                                                 join(LEFT, leftJoinBuilder -> leftJoinBuilder
                                                         .equiCriteria("c_custkey", "o_custkey")
-                                                        .left(anyTree(tableScan("customer", ImmutableMap.of("c_custkey", "custkey"))))
-                                                        .right(anyTree(aggregation(
+                                                        .left(tableScan("customer", ImmutableMap.of("c_custkey", "custkey")))
+                                                        .right(aggregation(
                                                                 singleGroupingSet("o_custkey"),
                                                                 ImmutableMap.of(Optional.of("count"), functionCall("count", ImmutableList.of("o_orderkey"))),
                                                                 ImmutableList.of(),
@@ -1106,7 +1091,7 @@ public void testCorrelatedDistinctAggregationRewriteToLeftOuterJoin()
                                                                                 ImmutableMap.of(),
                                                                                 Optional.empty(),
                                                                                 FINAL,
-                                                                                anyTree(tableScan("orders", ImmutableMap.of("o_orderkey", "orderkey", "o_custkey", "custkey"))))))))))
+                                                                                anyTree(tableScan("orders", ImmutableMap.of("o_orderkey", "orderkey", "o_custkey", "custkey")))))))))
                                         .right(anyTree(node(ValuesNode.class)))))));
     }
 
@@ -1124,23 +1109,29 @@ public void testCorrelatedDistinctGroupedAggregationRewriteToLeftOuterJoin()
                                         join(LEFT, builder -> builder
                                                 .equiCriteria("c_custkey", "o_custkey")
                                                 .left(
-                                                        project(assignUniqueId(
+                                                        assignUniqueId(
                                                                 "unique",
-                                                                tableScan("customer", ImmutableMap.of("c_custkey", "custkey")))))
+                                                                tableScan("customer", ImmutableMap.of("c_custkey", "custkey"))))
                                                 .right(
                                                         project(aggregation(
                                                                 singleGroupingSet("o_orderstatus", "o_custkey"),
                                                                 ImmutableMap.of(Optional.of("count"), functionCall("count", ImmutableList.of("o_orderkey"))),
                                                                 Optional.empty(),
                                                                 SINGLE,
-                                                                project(aggregation(
+                                                                aggregation(
                                                                         singleGroupingSet("o_orderstatus", "o_orderkey", "o_custkey"),
                                                                         ImmutableMap.of(),
                                                                         Optional.empty(),
                                                                         FINAL,
-                                                                        anyTree(tableScan(
-                                                                                "orders",
-                                                                                ImmutableMap.of("o_orderkey", "orderkey", "o_orderstatus", "orderstatus", "o_custkey", "custkey")))))))))))))));
+                                                                        anyTree(
+                                                                                aggregation(
+                                                                                        singleGroupingSet("o_orderstatus", "o_orderkey", "o_custkey"),
+                                                                                        ImmutableMap.of(),
+                                                                                        Optional.empty(),
+                                                                                        PARTIAL,
+                                                                                        tableScan(
+                                                                                                "orders",
+                                                                                                ImmutableMap.of("o_orderkey", "orderkey", "o_orderstatus", "orderstatus", "o_custkey", "custkey")))))))))))))));
     }
 
     @Test
@@ -1154,14 +1145,53 @@ public void testRemovesTrivialFilters()
                 "SELECT * FROM nation WHERE 1 = 0",
                 output(
                         values("nationkey", "name", "regionkey", "comment")));
+    }
+
+    @Test
+    public void testRemovesNullFilter()
+    {
         assertPlan(
                 "SELECT * FROM nation WHERE null",
                 output(
                         values("nationkey", "name", "regionkey", "comment")));
+        assertPlan(
+                "SELECT * FROM nation WHERE NOT null",
+                output(
+                        values("nationkey", "name", "regionkey", "comment")));
+        assertPlan(
+                "SELECT * FROM nation WHERE CAST(null AS BOOLEAN)",
+                output(
+                        values("nationkey", "name", "regionkey", "comment")));
+        assertPlan(
+                "SELECT * FROM nation WHERE NOT CAST(null AS BOOLEAN)",
+                output(
+                        values("nationkey", "name", "regionkey", "comment")));
         assertPlan(
                 "SELECT * FROM nation WHERE nationkey = null",
                 output(
                         values("nationkey", "name", "regionkey", "comment")));
+        assertPlan(
+                "SELECT * FROM nation WHERE nationkey = CAST(null AS BIGINT)",
+                output(
+                        values("nationkey", "name", "regionkey", "comment")));
+        assertPlan(
+                "SELECT * FROM nation WHERE nationkey < null OR nationkey > null",
+                output(
+                        values("nationkey", "name", "regionkey", "comment")));
+        assertPlan(
+                "SELECT * FROM nation WHERE nationkey = 19 AND CAST(null AS BOOLEAN)",
+                output(
+                        values("nationkey", "name", "regionkey", "comment")));
+    }
+
+    @Test
+    public void testRemovesFalseFilter()
+    {
+        // Regression test for https://github.com/trinodb/trino/issues/16515
+        assertPlan(
+                "SELECT * FROM nation WHERE CAST(name AS varchar(1)) = 'PO'",
+                output(
+                        values("nationkey", "name", "regionkey", "comment")));
     }
 
     @Test
@@ -1426,14 +1456,13 @@ public void testFilteringSemiJoinRewriteToInnerJoin()
                         join(INNER, builder -> builder
                                 .equiCriteria("CUSTOMER_CUSTKEY", "ORDER_CUSTKEY")
                                 .left(
-                                        project(
-                                                aggregation(
-                                                        singleGroupingSet("CUSTOMER_CUSTKEY"),
-                                                        ImmutableMap.of(),
-                                                        Optional.empty(),
-                                                        FINAL,
-                                                        anyTree(
-                                                                tableScan("customer", ImmutableMap.of("CUSTOMER_CUSTKEY", "custkey"))))))
+                                        aggregation(
+                                                singleGroupingSet("CUSTOMER_CUSTKEY"),
+                                                ImmutableMap.of(),
+                                                Optional.empty(),
+                                                FINAL,
+                                                anyTree(
+                                                        tableScan("customer", ImmutableMap.of("CUSTOMER_CUSTKEY", "custkey")))))
                                 .right(
                                         anyTree(
                                                 tableScan("orders", ImmutableMap.of("ORDER_CUSTKEY", "custkey")))))));
@@ -1747,10 +1776,8 @@ public void testRedundantDistinctLimitNodeRemoval()
         assertPlan(
                 "SELECT distinct(id) FROM (VALUES 1, 2, 3, 4, 5, 6) as t1 (id) LIMIT 10",
                 output(
-                        node(ProjectNode.class,
-                                node(AggregationNode.class,
-                                        node(ProjectNode.class,
-                                                values(ImmutableList.of("x")))))));
+                        node(AggregationNode.class,
+                                values(ImmutableList.of("x")))));
     }
 
     @Test
@@ -1758,6 +1785,9 @@ public void testRedundantHashRemovalForUnionAll()
     {
         assertPlan(
                 "SELECT count(*) FROM ((SELECT nationkey FROM customer) UNION ALL (SELECT nationkey FROM customer)) GROUP BY nationkey",
+                Session.builder(getQueryRunner().getDefaultSession())
+                        .setSystemProperty(OPTIMIZE_HASH_GENERATION, "true")
+                        .build(),
                 output(
                         project(
                                 node(AggregationNode.class,
@@ -1776,6 +1806,7 @@ public void testRedundantHashRemovalForMarkDistinct()
         assertDistributedPlan(
                 "select count(*), count(distinct orderkey), count(distinct partkey), count(distinct suppkey) from lineitem",
                 Session.builder(this.getQueryRunner().getDefaultSession())
+                        .setSystemProperty(OPTIMIZE_HASH_GENERATION, "true")
                         .setSystemProperty(TASK_CONCURRENCY, "16")
                         .build(),
                 output(
@@ -1795,6 +1826,9 @@ public void testRedundantHashRemovalForUnionAllAndMarkDistinct()
     {
         assertDistributedPlan(
                 "SELECT count(distinct(custkey)), count(distinct(nationkey)) FROM ((SELECT custkey, nationkey FROM customer) UNION ALL ( SELECT custkey, custkey FROM customer))",
+                Session.builder(getQueryRunner().getDefaultSession())
+                        .setSystemProperty(OPTIMIZE_HASH_GENERATION, "true")
+                        .build(),
                 output(
                         anyTree(
                                 node(MarkDistinctNode.class,
@@ -1822,10 +1856,10 @@ public void testRemoveRedundantFilter()
                                 .equiCriteria("expr", "ORDER_STATUS")
                                 .left(anyTree(values(ImmutableList.of("expr"), ImmutableList.of(ImmutableList.of(new StringLiteral("O")), ImmutableList.of(new StringLiteral("F"))))))
                                 .right(
-                                        exchange(project(strictConstrainedTableScan(
+                                        exchange(strictConstrainedTableScan(
                                                 "orders",
                                                 ImmutableMap.of("ORDER_STATUS", "orderstatus", "ORDER_KEY", "orderkey"),
-                                                ImmutableMap.of("orderstatus", multipleValues(createVarcharType(1), ImmutableList.of(utf8Slice("F"), utf8Slice("O")))))))))));
+                                                ImmutableMap.of("orderstatus", multipleValues(createVarcharType(1), ImmutableList.of(utf8Slice("F"), utf8Slice("O"))))))))));
     }
 
     @Test
@@ -1916,16 +1950,14 @@ public void testMergeProjectWithValues()
                         join(INNER, builder -> builder
                                 .equiCriteria("expr", "ORDER_STATUS")
                                 .left(
-                                        project(
-                                                filter("expr IN ('F', 'O')",
-                                                        values(ImmutableList.of("expr"), ImmutableList.of(ImmutableList.of(new StringLiteral("O")), ImmutableList.of(new StringLiteral("F")))))))
+                                        filter("expr IN ('F', 'O')",
+                                                values(ImmutableList.of("expr"), ImmutableList.of(ImmutableList.of(new StringLiteral("O")), ImmutableList.of(new StringLiteral("F"))))))
                                 .right(
                                         exchange(
-                                                project(
-                                                        strictConstrainedTableScan(
-                                                                "orders",
-                                                                ImmutableMap.of("ORDER_STATUS", "orderstatus", "ORDER_KEY", "orderkey"),
-                                                                ImmutableMap.of("orderstatus", multipleValues(createVarcharType(1), ImmutableList.of(utf8Slice("F"), utf8Slice("O")))))))))));
+                                                strictConstrainedTableScan(
+                                                        "orders",
+                                                        ImmutableMap.of("ORDER_STATUS", "orderstatus", "ORDER_KEY", "orderkey"),
+                                                        ImmutableMap.of("orderstatus", multipleValues(createVarcharType(1), ImmutableList.of(utf8Slice("F"), utf8Slice("O"))))))))));
 
         // Constraint for the table is derived, based on constant values in the other branch of the join.
         // It is not accepted by the connector, and remains in form of a filter over TableScan.
@@ -1938,9 +1970,9 @@ public void testMergeProjectWithValues()
                         join(INNER, builder -> builder
                                 .equiCriteria("expr", "ORDER_KEY")
                                 .left(
-                                        project(filter(
+                                        filter(
                                                 "expr IN (BIGINT '1', BIGINT '2')",
-                                                values(ImmutableList.of("expr"), ImmutableList.of(ImmutableList.of(new GenericLiteral("BIGINT", "1")), ImmutableList.of(new GenericLiteral("BIGINT", "2")))))))
+                                                values(ImmutableList.of("expr"), ImmutableList.of(ImmutableList.of(new GenericLiteral("BIGINT", "1")), ImmutableList.of(new GenericLiteral("BIGINT", "2"))))))
                                 .right(
                                         anyTree(filter(
                                                 "ORDER_KEY IN (BIGINT '1', BIGINT '2')",
@@ -2042,8 +2074,7 @@ public void testSizeBasedSemiJoin()
                 output(
                         anyTree(
                                 semiJoin("CUSTKEY", "T_A", "OUT", Optional.of(DistributionType.REPLICATED),
-                                        anyTree(
-                                                tableScan("orders", ImmutableMap.of("CUSTKEY", "custkey"))),
+                                        tableScan("orders", ImmutableMap.of("CUSTKEY", "custkey")),
                                         anyTree(
                                                 values("T_A"))))));
     }
@@ -2301,11 +2332,11 @@ public void testDifferentOuterParentScopeSubqueries()
                                                                                 .left(
                                                                                         join(LEFT, innerBuilder -> innerBuilder
                                                                                                 .equiCriteria("CUSTOMER_CUSTKEY", "ORDERS_CUSTKEY")
-                                                                                                .left(project(tableScan("customer", ImmutableMap.of("CUSTOMER_CUSTKEY", "custkey"))))
+                                                                                                .left(tableScan("customer", ImmutableMap.of("CUSTOMER_CUSTKEY", "custkey")))
                                                                                                 .right(anyTree(project(tableScan("orders", ImmutableMap.of("ORDERS_CUSTKEY", "custkey")))))))
                                                                                 .right(anyTree(node(ValuesNode.class))))))
                                                         .right(
-                                                                anyTree(project(tableScan("orders", ImmutableMap.of("ORDERS2_CUSTKEY", "custkey")))))))
+                                                                anyTree(tableScan("orders", ImmutableMap.of("ORDERS2_CUSTKEY", "custkey"))))))
                                         .right(
                                                 anyTree(node(ValuesNode.class)))))));
     }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestMaterializedViews.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestMaterializedViews.java
index 81bd4d050432..253be3ac8a24 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestMaterializedViews.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestMaterializedViews.java
@@ -38,7 +38,7 @@
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.TestingAccessControlManager;
 import io.trino.testing.TestingMetadata;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
@@ -46,6 +46,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+import static io.trino.spi.connector.SaveMode.FAIL;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
@@ -91,7 +92,7 @@ protected LocalQueryRunner createLocalQueryRunner()
                             ImmutableList.of(
                                     new ColumnMetadata("a", BIGINT),
                                     new ColumnMetadata("b", BIGINT))),
-                    false);
+                    FAIL);
             return null;
         });
 
@@ -105,7 +106,7 @@ protected LocalQueryRunner createLocalQueryRunner()
                             ImmutableList.of(
                                     new ColumnMetadata("a", BIGINT),
                                     new ColumnMetadata("b", BIGINT))),
-                    false);
+                    FAIL);
             return null;
         });
 
@@ -119,7 +120,7 @@ protected LocalQueryRunner createLocalQueryRunner()
                             ImmutableList.of(
                                     new ColumnMetadata("a", TINYINT),
                                     new ColumnMetadata("b", VARCHAR))),
-                    false);
+                    FAIL);
             return null;
         });
 
@@ -132,6 +133,7 @@ protected LocalQueryRunner createLocalQueryRunner()
                 Optional.of(STALE_MV_STALENESS.plusHours(1)),
                 Optional.empty(),
                 Identity.ofUser("some user"),
+                ImmutableList.of(),
                 Optional.of(new CatalogSchemaTableName(TEST_CATALOG_NAME, SCHEMA, "storage_table")),
                 ImmutableMap.of());
         queryRunner.inTransaction(session -> {
@@ -164,6 +166,7 @@ protected LocalQueryRunner createLocalQueryRunner()
                 Optional.empty(),
                 Optional.empty(),
                 Identity.ofUser("some user"),
+                ImmutableList.of(),
                 Optional.of(new CatalogSchemaTableName(TEST_CATALOG_NAME, SCHEMA, "storage_table_with_casts")),
                 ImmutableMap.of());
         QualifiedObjectName materializedViewWithCasts = new QualifiedObjectName(TEST_CATALOG_NAME, SCHEMA, "materialized_view_with_casts");
@@ -236,7 +239,7 @@ public void testMaterializedViewWithCasts()
                 new QualifiedObjectName(TEST_CATALOG_NAME, SCHEMA, "materialized_view_with_casts"),
                 "a",
                 "user",
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "a + 1"));
+                ViewExpression.builder().expression("a + 1").build());
         assertPlan("SELECT * FROM materialized_view_with_casts",
                 anyTree(
                         project(
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestOrderBy.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestOrderBy.java
index a7700f3f662b..1cae9996803f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestOrderBy.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestOrderBy.java
@@ -13,17 +13,28 @@
  */
 package io.trino.sql.planner;
 
+import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.sql.planner.plan.EnforceSingleRowNode;
 import io.trino.sql.planner.plan.ExchangeNode;
+import io.trino.sql.planner.plan.FilterNode;
+import io.trino.sql.planner.plan.ProjectNode;
+import io.trino.sql.planner.plan.RowNumberNode;
 import io.trino.sql.planner.plan.SortNode;
 import io.trino.sql.planner.plan.TopNNode;
 import io.trino.sql.planner.plan.ValuesNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.exchange;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.output;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.sort;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.topN;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
+import static io.trino.sql.planner.plan.ExchangeNode.Scope.LOCAL;
+import static io.trino.sql.tree.SortItem.NullOrdering.LAST;
+import static io.trino.sql.tree.SortItem.Ordering.ASCENDING;
 
 public class TestOrderBy
         extends BasePlanTest
@@ -94,4 +105,51 @@ public void testRedundantOrderByInUnion()
                                 node(ValuesNode.class),
                                 node(ValuesNode.class))));
     }
+
+    @Test
+    public void testRedundantOrderByInWith()
+    {
+        assertPlan("""
+                        WITH t(a) AS (
+                            SELECT * FROM (VALUES 2, 1) t(a)
+                            ORDER BY a)
+                        SELECT * FROM t
+                        """,
+                output(node(ValuesNode.class)));
+    }
+
+    @Test
+    public void testOrderByInWithLimit()
+    {
+        assertPlan("""
+                        WITH t(a) AS (
+                            SELECT * FROM (VALUES 2, 1) t(a)
+                            ORDER BY a
+                            LIMIT 1)
+                        SELECT * FROM t
+                        """,
+                output(
+                        topN(1, ImmutableList.of(sort("c", ASCENDING, LAST)), TopNNode.Step.FINAL,
+                                topN(1, ImmutableList.of(sort("c", ASCENDING, LAST)), TopNNode.Step.PARTIAL,
+                                        values("c")))));
+    }
+
+    @Test
+    public void testOrderByInWithOffset()
+    {
+        assertPlan("""
+                        WITH t(a) AS (
+                            SELECT * FROM (VALUES (2),(1)) t(a)
+                            ORDER BY a
+                            OFFSET 1)
+                        SELECT * FROM t
+                        """,
+                output(
+                        node(ProjectNode.class,
+                                node(FilterNode.class,
+                                        node(RowNumberNode.class,
+                                                exchange(LOCAL,
+                                                        sort(exchange(LOCAL,
+                                                                values("c")))))))));
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestPartialTranslator.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestPartialTranslator.java
index fb6f674dd156..74b13fee45c0 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestPartialTranslator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestPartialTranslator.java
@@ -25,12 +25,11 @@
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NodeRef;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.sql.tree.SubscriptExpression;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.transaction.TransactionId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -43,7 +42,9 @@
 import static io.trino.spi.type.RowType.rowType;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
 import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createVarcharType;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.planner.ConnectorExpressionTranslator.translate;
 import static io.trino.sql.planner.PartialTranslator.extractPartialTranslations;
 import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
@@ -91,8 +92,9 @@ public void testPartialTranslator()
                         dereferenceExpression3),
                 List.of(timestamp3SymbolReference, stringLiteral, dereferenceExpression3));
 
-        List<Expression> functionArguments = ImmutableList.of(stringLiteral, dereferenceExpression2);
-        Expression functionCallExpression = new FunctionCall(QualifiedName.of("concat"), functionArguments);
+        Expression functionCallExpression = new FunctionCall(
+                PLANNER_CONTEXT.getMetadata().resolveBuiltinFunction("concat", fromTypes(VARCHAR, VARCHAR)).toQualifiedName(),
+                ImmutableList.of(stringLiteral, dereferenceExpression2));
         assertFullTranslation(functionCallExpression);
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestPlanFragmentPartitionCount.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestPlanFragmentPartitionCount.java
index af67cb4e21e7..761c7bd41b64 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestPlanFragmentPartitionCount.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestPlanFragmentPartitionCount.java
@@ -27,9 +27,10 @@
 import io.trino.sql.planner.plan.OutputNode;
 import io.trino.sql.planner.plan.PlanFragmentId;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Map;
 import java.util.Optional;
@@ -42,14 +43,16 @@
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.transaction.TransactionBuilder.transaction;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestPlanFragmentPartitionCount
 {
     private PlanFragmenter planFragmenter;
     private Session session;
     private LocalQueryRunner localQueryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         session = testSessionBuilder().setCatalog(TEST_CATALOG_NAME).build();
@@ -61,10 +64,11 @@ public void setUp()
                 localQueryRunner.getFunctionManager(),
                 localQueryRunner.getTransactionManager(),
                 localQueryRunner.getCatalogManager(),
+                localQueryRunner.getLanguageFunctionManager(),
                 new QueryManagerConfig());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         planFragmenter = null;
@@ -76,7 +80,7 @@ public void tearDown()
     @Test
     public void testPartitionCountInPlanFragment()
     {
-        PlanBuilder p = new PlanBuilder(new PlanNodeIdAllocator(), localQueryRunner.getMetadata(), session);
+        PlanBuilder p = new PlanBuilder(new PlanNodeIdAllocator(), localQueryRunner.getPlannerContext(), session);
         Symbol a = p.symbol("a", VARCHAR);
         Symbol b = p.symbol("b", VARCHAR);
         Symbol c = p.symbol("c", VARCHAR);
@@ -135,17 +139,18 @@ public void testPartitionCountInPlanFragment()
                 new PlanFragmentId("4"), Optional.empty(),
                 new PlanFragmentId("5"), Optional.empty());
 
-        assertThat(expectedPartitionCount).isEqualTo(actualPartitionCount.buildOrThrow());
+        assertThat(actualPartitionCount.buildOrThrow()).isEqualTo(expectedPartitionCount);
     }
 
     private SubPlan fragment(Plan plan)
     {
+        localQueryRunner.getLanguageFunctionManager().registerQuery(session);
         return inTransaction(session -> planFragmenter.createSubPlans(session, plan, false, WarningCollector.NOOP));
     }
 
     private <T> T inTransaction(Function<Session, T> transactionSessionConsumer)
     {
-        return transaction(localQueryRunner.getTransactionManager(), new AllowAllAccessControl())
+        return transaction(localQueryRunner.getTransactionManager(), localQueryRunner.getMetadata(), new AllowAllAccessControl())
                 .singleStatement()
                 .execute(session, session -> {
                     // metadata.getCatalogHandle() registers the catalog for the transaction
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestPlanMatchingFramework.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestPlanMatchingFramework.java
index bcfa64f1bae6..b6dcde1fd778 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestPlanMatchingFramework.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestPlanMatchingFramework.java
@@ -21,7 +21,7 @@
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.sql.planner.plan.OutputNode;
 import io.trino.sql.planner.plan.TableScanNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SystemSessionProperties.JOIN_DISTRIBUTION_TYPE;
 import static io.trino.SystemSessionProperties.JOIN_REORDERING_STRATEGY;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestPredicatePushdown.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestPredicatePushdown.java
index 82e7018d663c..9ff43423109f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestPredicatePushdown.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestPredicatePushdown.java
@@ -14,12 +14,17 @@
 package io.trino.sql.planner;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import io.trino.Session;
+import io.trino.sql.planner.plan.ExchangeNode;
+import org.junit.jupiter.api.Test;
 
+import static io.trino.SystemSessionProperties.JOIN_REORDERING_STRATEGY;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.join;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.semiJoin;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
 
@@ -86,4 +91,92 @@ public void testCoercions()
                                                                 "CAST('x' AS varchar(5)) = CAST(u_v AS varchar(5))",
                                                                 tableScan("nation", ImmutableMap.of("u_k", "nationkey", "u_v", "name")))))))));
     }
+
+    @Test
+    public void testNormalizeOuterJoinToInner()
+    {
+        Session disableJoinReordering = Session.builder(getQueryRunner().getDefaultSession())
+                .setSystemProperty(JOIN_REORDERING_STRATEGY, "NONE")
+                .build();
+
+        // one join
+        assertPlan(
+                "SELECT customer.name, orders.orderdate " +
+                        "FROM orders " +
+                        "LEFT JOIN customer ON orders.custkey = customer.custkey " +
+                        "WHERE customer.name IS NOT NULL",
+                disableJoinReordering,
+                anyTree(
+                        join(INNER, builder -> builder
+                                .equiCriteria("o_custkey", "c_custkey")
+                                .left(
+                                        anyTree(
+                                                tableScan("orders", ImmutableMap.of("o_orderdate", "orderdate", "o_custkey", "custkey"))))
+                                .right(
+                                        anyTree(
+                                                filter(
+                                                        "NOT (c_name IS NULL)",
+                                                        tableScan("customer", ImmutableMap.of("c_custkey", "custkey", "c_name", "name"))))))));
+
+        // nested joins
+        assertPlan(
+                "SELECT customer.name, lineitem.partkey " +
+                        "FROM lineitem " +
+                        "LEFT JOIN orders ON lineitem.orderkey = orders.orderkey " +
+                        "LEFT JOIN customer ON orders.custkey = customer.custkey " +
+                        "WHERE customer.name IS NOT NULL",
+                disableJoinReordering,
+                anyTree(
+                        join(INNER, builder -> builder
+                                .equiCriteria("o_custkey", "c_custkey")
+                                .left(
+                                        join(INNER,
+                                                leftJoinBuilder -> leftJoinBuilder
+                                                        .equiCriteria("l_orderkey", "o_orderkey")
+                                                        .left(
+                                                                anyTree(
+                                                                        tableScan("lineitem", ImmutableMap.of("l_orderkey", "orderkey"))))
+                                                        .right(
+                                                                anyTree(
+                                                                        tableScan("orders", ImmutableMap.of("o_orderkey", "orderkey", "o_custkey", "custkey"))))))
+                                .right(
+                                        anyTree(
+                                                filter(
+                                                        "NOT (c_name IS NULL)",
+                                                        tableScan("customer", ImmutableMap.of("c_custkey", "custkey", "c_name", "name"))))))));
+    }
+
+    @Test
+    public void testNonDeterministicPredicateDoesNotPropagateFromFilteringSideToSourceSideOfSemiJoin()
+    {
+        assertPlan("SELECT * FROM lineitem WHERE orderkey IN (SELECT orderkey FROM orders WHERE orderkey = random(5))",
+                noSemiJoinRewrite(),
+                anyTree(
+                        semiJoin("LINE_ORDER_KEY", "ORDERS_ORDER_KEY", "SEMI_JOIN_RESULT", true,
+                                anyTree(
+                                        tableScan("lineitem", ImmutableMap.of(
+                                        "LINE_ORDER_KEY", "orderkey"))),
+                                node(ExchangeNode.class,
+                                        filter("ORDERS_ORDER_KEY = CAST(random(5) AS bigint)",
+                                                tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey")))))));
+    }
+
+    @Test
+    public void testNonStraddlingJoinExpression()
+    {
+        assertPlan(
+                "SELECT * FROM orders JOIN lineitem ON orders.orderkey = lineitem.orderkey AND cast(lineitem.linenumber AS varchar) = '2'",
+                anyTree(
+                        join(INNER, builder -> builder
+                                .equiCriteria("ORDERS_OK", "LINEITEM_OK")
+                                .left(
+                                        anyTree(
+                                                tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))
+                                .right(
+                                        anyTree(
+                                                filter("cast(LINEITEM_LINENUMBER as varchar) = VARCHAR '2'",
+                                                        tableScan("lineitem", ImmutableMap.of(
+                                                                "LINEITEM_OK", "orderkey",
+                                                                "LINEITEM_LINENUMBER", "linenumber"))))))));
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestPredicatePushdownWithoutDynamicFilter.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestPredicatePushdownWithoutDynamicFilter.java
index 3775e6c5c6fc..b6ded5e0c49f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestPredicatePushdownWithoutDynamicFilter.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestPredicatePushdownWithoutDynamicFilter.java
@@ -14,14 +14,20 @@
 package io.trino.sql.planner;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import io.trino.Session;
+import io.trino.sql.planner.plan.ExchangeNode;
+import org.junit.jupiter.api.Test;
 
+import static io.trino.SystemSessionProperties.JOIN_REORDERING_STRATEGY;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.join;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.semiJoin;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
+import static io.trino.sql.planner.plan.JoinNode.Type.LEFT;
 
 public class TestPredicatePushdownWithoutDynamicFilter
         extends AbstractPredicatePushdownTest
@@ -83,4 +89,88 @@ public void testCoercions()
                                                                 "CAST('x' AS varchar(5)) = CAST(u_v AS varchar(5))",
                                                                 tableScan("nation", ImmutableMap.of("u_k", "nationkey", "u_v", "name")))))))));
     }
+
+    @Test
+    public void testNormalizeOuterJoinToInner()
+    {
+        Session disableJoinReordering = Session.builder(getQueryRunner().getDefaultSession())
+                .setSystemProperty(JOIN_REORDERING_STRATEGY, "NONE")
+                .build();
+
+        // one join
+        assertPlan(
+                "SELECT customer.name, orders.orderdate " +
+                        "FROM orders " +
+                        "LEFT JOIN customer ON orders.custkey = customer.custkey " +
+                        "WHERE customer.name IS NOT NULL",
+                disableJoinReordering,
+                anyTree(
+                        join(INNER, builder -> builder
+                                .equiCriteria("o_custkey", "c_custkey")
+                                .left(
+                                        tableScan("orders", ImmutableMap.of("o_orderdate", "orderdate", "o_custkey", "custkey")))
+                                .right(
+                                        anyTree(
+                                                filter(
+                                                        "NOT (c_name IS NULL)",
+                                                        tableScan("customer", ImmutableMap.of("c_custkey", "custkey", "c_name", "name"))))))));
+
+        // nested joins
+        assertPlan(
+                "SELECT customer.name, lineitem.partkey " +
+                        "FROM lineitem " +
+                        "LEFT JOIN orders ON lineitem.orderkey = orders.orderkey " +
+                        "LEFT JOIN customer ON orders.custkey = customer.custkey " +
+                        "WHERE customer.name IS NOT NULL",
+                disableJoinReordering,
+                anyTree(
+                        join(INNER, builder -> builder
+                                .equiCriteria("o_custkey", "c_custkey")
+                                .left(
+                                        join(LEFT, // TODO (https://github.com/trinodb/trino/issues/2392) this should be INNER also when dynamic filtering is off
+                                                leftJoinBuilder -> leftJoinBuilder
+                                                        .equiCriteria("l_orderkey", "o_orderkey")
+                                                        .left(
+                                                                tableScan("lineitem", ImmutableMap.of("l_orderkey", "orderkey")))
+                                                        .right(
+                                                                anyTree(
+                                                                        tableScan("orders", ImmutableMap.of("o_orderkey", "orderkey", "o_custkey", "custkey"))))))
+                                .right(
+                                        anyTree(
+                                                filter(
+                                                        "NOT (c_name IS NULL)",
+                                                        tableScan("customer", ImmutableMap.of("c_custkey", "custkey", "c_name", "name"))))))));
+    }
+
+    @Test
+    public void testNonDeterministicPredicateDoesNotPropagateFromFilteringSideToSourceSideOfSemiJoin()
+    {
+        assertPlan("SELECT * FROM lineitem WHERE orderkey IN (SELECT orderkey FROM orders WHERE orderkey = random(5))",
+                noSemiJoinRewrite(),
+                anyTree(
+                        semiJoin("LINE_ORDER_KEY", "ORDERS_ORDER_KEY", "SEMI_JOIN_RESULT", false,
+                                tableScan("lineitem", ImmutableMap.of(
+                                        "LINE_ORDER_KEY", "orderkey")),
+                                node(ExchangeNode.class,
+                                        filter("ORDERS_ORDER_KEY = CAST(random(5) AS bigint)",
+                                                tableScan("orders", ImmutableMap.of("ORDERS_ORDER_KEY", "orderkey")))))));
+    }
+
+    @Test
+    public void testNonStraddlingJoinExpression()
+    {
+        assertPlan(
+                "SELECT * FROM orders JOIN lineitem ON orders.orderkey = lineitem.orderkey AND cast(lineitem.linenumber AS varchar) = '2'",
+                anyTree(
+                        join(INNER, builder -> builder
+                                .equiCriteria("ORDERS_OK", "LINEITEM_OK")
+                                .left(
+                                        tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey")))
+                                .right(
+                                        anyTree(
+                                                filter("cast(LINEITEM_LINENUMBER as varchar) = VARCHAR '2'",
+                                                        tableScan("lineitem", ImmutableMap.of(
+                                                                "LINEITEM_OK", "orderkey",
+                                                                "LINEITEM_LINENUMBER", "linenumber"))))))));
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestQuantifiedComparison.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestQuantifiedComparison.java
index ad0e14f2e687..e85181388c77 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestQuantifiedComparison.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestQuantifiedComparison.java
@@ -18,13 +18,12 @@
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.ValuesNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.join;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.semiJoin;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
@@ -50,10 +49,9 @@ public void testQuantifiedComparisonNotEqualsAll()
         String query = "SELECT orderkey, custkey FROM orders WHERE orderkey <> ALL (VALUES ROW(CAST(5 as BIGINT)), ROW(CAST(3 as BIGINT)))";
         assertPlan(query, anyTree(
                 filter("NOT S",
-                        project(
-                                semiJoin("X", "Y", "S",
-                                        anyTree(tableScan("orders", ImmutableMap.of("X", "orderkey"))),
-                                        anyTree(values(ImmutableMap.of("Y", 0))))))));
+                        semiJoin("X", "Y", "S",
+                                tableScan("orders", ImmutableMap.of("X", "orderkey")),
+                                values(ImmutableMap.of("Y", 0))))));
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestRecursiveCte.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestRecursiveCte.java
index e8ec34ae0293..c76fbae8d9be 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestRecursiveCte.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestRecursiveCte.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.testing.LocalQueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.sql.planner.LogicalPlanner.Stage.CREATED;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestRemoveDuplicatePredicates.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestRemoveDuplicatePredicates.java
index 0acbc1acd104..f3905721cb81 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestRemoveDuplicatePredicates.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestRemoveDuplicatePredicates.java
@@ -14,7 +14,7 @@
 package io.trino.sql.planner;
 
 import io.trino.sql.planner.assertions.BasePlanTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestRemoveRedundantSemiJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestRemoveRedundantSemiJoin.java
index a357e79f6ce4..d0f974ff0790 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestRemoveRedundantSemiJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestRemoveRedundantSemiJoin.java
@@ -14,7 +14,7 @@
 package io.trino.sql.planner;
 
 import io.trino.sql.planner.assertions.BasePlanTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestSchedulingOrderVisitor.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestSchedulingOrderVisitor.java
index a24207652d20..8b7c3fd1876c 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestSchedulingOrderVisitor.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestSchedulingOrderVisitor.java
@@ -22,14 +22,14 @@
 import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.planner.plan.TableScanNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
-import static io.trino.metadata.AbstractMockMetadata.dummyMetadata;
 import static io.trino.sql.planner.SchedulingOrderVisitor.scheduleOrder;
+import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static org.testng.Assert.assertEquals;
@@ -39,7 +39,7 @@ public class TestSchedulingOrderVisitor
     @Test
     public void testJoinOrder()
     {
-        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), dummyMetadata(), TEST_SESSION);
+        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), PLANNER_CONTEXT, TEST_SESSION);
         TableScanNode a = planBuilder.tableScan(emptyList(), emptyMap());
         TableScanNode b = planBuilder.tableScan(emptyList(), emptyMap());
         List<PlanNodeId> order = scheduleOrder(planBuilder.join(JoinNode.Type.INNER, a, b));
@@ -49,7 +49,7 @@ public void testJoinOrder()
     @Test
     public void testIndexJoinOrder()
     {
-        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), dummyMetadata(), TEST_SESSION);
+        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), PLANNER_CONTEXT, TEST_SESSION);
         TableScanNode a = planBuilder.tableScan(emptyList(), emptyMap());
         TableScanNode b = planBuilder.tableScan(emptyList(), emptyMap());
         List<PlanNodeId> order = scheduleOrder(planBuilder.indexJoin(IndexJoinNode.Type.INNER, a, b));
@@ -59,7 +59,7 @@ public void testIndexJoinOrder()
     @Test
     public void testSemiJoinOrder()
     {
-        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), dummyMetadata(), TEST_SESSION);
+        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), PLANNER_CONTEXT, TEST_SESSION);
         Symbol sourceJoin = planBuilder.symbol("sourceJoin");
         TableScanNode a = planBuilder.tableScan(ImmutableList.of(sourceJoin), ImmutableMap.of(sourceJoin, new TestingColumnHandle("sourceJoin")));
         Symbol filteringSource = planBuilder.symbol("filteringSource");
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestSimplifyIn.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestSimplifyIn.java
index 3aa6bfdc2e15..48cfc00f981b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestSimplifyIn.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestSimplifyIn.java
@@ -14,7 +14,7 @@
 package io.trino.sql.planner;
 
 import io.trino.sql.planner.assertions.BasePlanTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestSortExpressionExtractor.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestSortExpressionExtractor.java
index ec6b30a74652..3c1f87b49b95 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestSortExpressionExtractor.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestSortExpressionExtractor.java
@@ -17,10 +17,12 @@
 import com.google.common.collect.ImmutableSet;
 import io.trino.spi.type.Type;
 import io.trino.sql.ExpressionTestUtils;
+import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import io.trino.transaction.TestingTransactionManager;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
@@ -32,11 +34,15 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.sql.ExpressionUtils.extractConjuncts;
-import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
+import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
 import static org.testng.Assert.assertEquals;
 
 public class TestSortExpressionExtractor
 {
+    private static final TestingTransactionManager TRANSACTION_MANAGER = new TestingTransactionManager();
+    private static final PlannerContext PLANNER_CONTEXT = plannerContextBuilder()
+            .withTransactionManager(TRANSACTION_MANAGER)
+            .build();
     private static final TypeProvider TYPE_PROVIDER = TypeProvider.copyOf(ImmutableMap.<Symbol, Type>builder()
             .put(new Symbol("b1"), DOUBLE)
             .put(new Symbol("b2"), DOUBLE)
@@ -89,7 +95,7 @@ public void testGetSortExpression()
 
     private Expression expression(String sql)
     {
-        return ExpressionTestUtils.planExpression(PLANNER_CONTEXT, TEST_SESSION, TYPE_PROVIDER, PlanBuilder.expression(sql));
+        return ExpressionTestUtils.planExpression(TRANSACTION_MANAGER, PLANNER_CONTEXT, TEST_SESSION, TYPE_PROVIDER, PlanBuilder.expression(sql));
     }
 
     private void assertNoSortExpression(String expression)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestSymbolAllocator.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestSymbolAllocator.java
index 1c5f3d0ef00b..d1592c4a1e4b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestSymbolAllocator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestSymbolAllocator.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import io.trino.spi.type.BigintType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Set;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestTableFunctionInvocation.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestTableFunctionInvocation.java
index 2eb3621fc538..91d490cce5be 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestTableFunctionInvocation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestTableFunctionInvocation.java
@@ -21,19 +21,19 @@
 import io.trino.connector.TestingTableFunctions.DescriptorArgumentFunction;
 import io.trino.connector.TestingTableFunctions.DifferentArgumentTypesFunction;
 import io.trino.connector.TestingTableFunctions.PassThroughFunction;
-import io.trino.connector.TestingTableFunctions.TestingTableFunctionHandle;
+import io.trino.connector.TestingTableFunctions.TestingTableFunctionPushdownHandle;
 import io.trino.connector.TestingTableFunctions.TwoScalarArgumentsFunction;
 import io.trino.connector.TestingTableFunctions.TwoTableArgumentsFunction;
 import io.trino.spi.connector.TableFunctionApplicationResult;
-import io.trino.spi.ptf.Descriptor;
-import io.trino.spi.ptf.Descriptor.Field;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.Descriptor.Field;
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.sql.planner.assertions.RowNumberSymbolMatcher;
 import io.trino.sql.planner.plan.TableFunctionProcessorNode;
 import io.trino.sql.tree.GenericLiteral;
 import io.trino.sql.tree.LongLiteral;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -63,7 +63,7 @@ public class TestTableFunctionInvocation
 {
     private static final String TESTING_CATALOG = "mock";
 
-    @BeforeClass
+    @BeforeAll
     public final void setup()
     {
         getQueryRunner().installPlugin(new MockConnectorPlugin(MockConnectorFactory.builder()
@@ -74,7 +74,7 @@ public final void setup()
                         new TwoTableArgumentsFunction(),
                         new PassThroughFunction()))
                 .withApplyTableFunction((session, handle) -> {
-                    if (handle instanceof TestingTableFunctionHandle functionHandle) {
+                    if (handle instanceof TestingTableFunctionPushdownHandle functionHandle) {
                         return Optional.of(new TableFunctionApplicationResult<>(functionHandle.getTableHandle(), functionHandle.getTableHandle().getColumns().orElseThrow()));
                     }
                     throw new IllegalStateException("Unsupported table function handle: " + handle.getClass().getSimpleName());
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestTableScanNodePartitioning.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestTableScanNodePartitioning.java
index f8db25a32e0b..ea6556b156b2 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestTableScanNodePartitioning.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestTableScanNodePartitioning.java
@@ -36,7 +36,7 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -53,7 +53,6 @@
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.exchange;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.functionCall;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.sql.planner.plan.AggregationNode.Step.FINAL;
 import static io.trino.sql.planner.plan.AggregationNode.Step.PARTIAL;
@@ -152,9 +151,8 @@ void assertTableScanPlannedWithPartitioning(Session session, String table, Conne
                 anyTree(
                         aggregation(ImmutableMap.of("COUNT", functionCall("count", ImmutableList.of("COUNT_PART"))), FINAL,
                                 exchange(LOCAL, REPARTITION,
-                                        project(
-                                                aggregation(ImmutableMap.of("COUNT_PART", functionCall("count", ImmutableList.of("B"))), PARTIAL,
-                                                        tableScan(table, ImmutableMap.of("A", "column_a", "B", "column_b"))))))));
+                                        aggregation(ImmutableMap.of("COUNT_PART", functionCall("count", ImmutableList.of("B"))), PARTIAL,
+                                                tableScan(table, ImmutableMap.of("A", "column_a", "B", "column_b")))))));
         SubPlan subPlan = subplan(query, OPTIMIZED_AND_VALIDATED, false, session);
         assertThat(subPlan.getAllFragments()).hasSize(1);
         assertThat(subPlan.getAllFragments().get(0).getPartitioning().getConnectorHandle()).isEqualTo(expectedPartitioning);
@@ -168,9 +166,8 @@ void assertTableScanPlannedWithoutPartitioning(Session session, String table)
                         aggregation(ImmutableMap.of("COUNT", functionCall("count", ImmutableList.of("COUNT_PART"))), FINAL,
                                 exchange(LOCAL, REPARTITION,
                                         exchange(REMOTE, REPARTITION,
-                                                project(
-                                                        aggregation(ImmutableMap.of("COUNT_PART", functionCall("count", ImmutableList.of("B"))), PARTIAL,
-                                                                tableScan(table, ImmutableMap.of("A", "column_a", "B", "column_b")))))))));
+                                                aggregation(ImmutableMap.of("COUNT_PART", functionCall("count", ImmutableList.of("B"))), PARTIAL,
+                                                        tableScan(table, ImmutableMap.of("A", "column_a", "B", "column_b"))))))));
         SubPlan subPlan = subplan(query, OPTIMIZED_AND_VALIDATED, false, session);
         assertThat(subPlan.getAllFragments()).hasSize(2);
         assertThat(subPlan.getAllFragments().get(1).getPartitioning().getConnectorHandle()).isEqualTo(SOURCE_DISTRIBUTION.getConnectorHandle());
@@ -190,7 +187,6 @@ public static MockConnectorFactory createMockFactory()
                                 TupleDomain.all(),
                                 Optional.of(new ConnectorTablePartitioning(PARTITIONING_HANDLE, ImmutableList.of(COLUMN_HANDLE_A))),
                                 Optional.empty(),
-                                Optional.empty(),
                                 ImmutableList.of());
                     }
                     if (tableName.equals(SINGLE_BUCKET_TABLE)) {
@@ -198,7 +194,6 @@ public static MockConnectorFactory createMockFactory()
                                 TupleDomain.all(),
                                 Optional.of(new ConnectorTablePartitioning(SINGLE_BUCKET_HANDLE, ImmutableList.of(COLUMN_HANDLE_A))),
                                 Optional.empty(),
-                                Optional.empty(),
                                 ImmutableList.of());
                     }
                     if (tableName.equals(FIXED_PARTITIONED_TABLE)) {
@@ -206,7 +201,6 @@ public static MockConnectorFactory createMockFactory()
                                 TupleDomain.all(),
                                 Optional.of(new ConnectorTablePartitioning(FIXED_PARTITIONING_HANDLE, ImmutableList.of(COLUMN_HANDLE_A))),
                                 Optional.empty(),
-                                Optional.empty(),
                                 ImmutableList.of());
                     }
                     return new ConnectorTableProperties();
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestTableScanRedirectionWithPushdown.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestTableScanRedirectionWithPushdown.java
index 0f839cea7013..ca4f7dbdb818 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestTableScanRedirectionWithPushdown.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestTableScanRedirectionWithPushdown.java
@@ -20,7 +20,6 @@
 import io.trino.connector.MockConnectorColumnHandle;
 import io.trino.connector.MockConnectorFactory;
 import io.trino.connector.MockConnectorTableHandle;
-import io.trino.execution.warnings.WarningCollector;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.Assignment;
 import io.trino.spi.connector.CatalogSchemaTableName;
@@ -44,7 +43,7 @@
 import io.trino.sql.planner.optimizations.PlanOptimizer;
 import io.trino.testing.LocalQueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -55,6 +54,7 @@
 import static io.trino.connector.MockConnectorFactory.ApplyProjection;
 import static io.trino.connector.MockConnectorFactory.ApplyTableScanRedirect;
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static io.trino.execution.warnings.WarningCollector.NOOP;
 import static io.trino.spi.expression.StandardFunctions.CAST_FUNCTION_NAME;
 import static io.trino.spi.predicate.Domain.singleValue;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -69,7 +69,6 @@
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.tests.BogusType.BOGUS;
-import static io.trino.transaction.TransactionBuilder.transaction;
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -284,12 +283,19 @@ public void testPredicateTypeMismatchWithMissingCoercion()
             // After 'source_col_d = 1' is pushed into source table scan, it's possible for 'source_col_c' table scan assignment to be pruned
             // Redirection results in Project('dest_col_b') -> Filter('dest_col_d = 1') -> TableScan for such case
             // but dest_col_d has mismatched type compared to source domain
-            transaction(queryRunner.getTransactionManager(), queryRunner.getAccessControl())
-                    .execute(MOCK_SESSION, session -> {
-                        assertThatThrownBy(() -> queryRunner.createPlan(session, "SELECT source_col_b FROM test_table WHERE source_col_c = 'foo'", WarningCollector.NOOP, createPlanOptimizersStatsCollector()))
-                                .isInstanceOf(TrinoException.class)
-                                .hasMessageMatching("Cast not possible from redirected column mock_catalog.target_schema.target_table.destination_col_d with type Bogus to source column .*mock_catalog.test_schema.test_table.*source_col_c.* with type: varchar");
-                    });
+            queryRunner.inTransaction(MOCK_SESSION, transactionSession -> {
+                assertThatThrownBy(() ->
+                        queryRunner.createPlan(
+                                transactionSession,
+                                "SELECT source_col_b FROM test_table WHERE source_col_c = 'foo'",
+                                queryRunner.getPlanOptimizers(true),
+                                OPTIMIZED_AND_VALIDATED,
+                                NOOP,
+                                createPlanOptimizersStatsCollector()))
+                        .isInstanceOf(TrinoException.class)
+                        .hasMessageMatching("Cast not possible from redirected column mock_catalog.target_schema.target_table.destination_col_d with type Bogus to source column .*mock_catalog.test_schema.test_table.*source_col_c.* with type: varchar");
+                return null;
+            });
         }
     }
 
@@ -486,7 +492,7 @@ void assertPlan(LocalQueryRunner queryRunner, @Language("SQL") String sql, PlanM
         List<PlanOptimizer> optimizers = queryRunner.getPlanOptimizers(true);
 
         queryRunner.inTransaction(transactionSession -> {
-            Plan actualPlan = queryRunner.createPlan(transactionSession, sql, optimizers, OPTIMIZED_AND_VALIDATED, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+            Plan actualPlan = queryRunner.createPlan(transactionSession, sql, optimizers, OPTIMIZED_AND_VALIDATED, NOOP, createPlanOptimizersStatsCollector());
             PlanAssert.assertPlan(transactionSession, queryRunner.getMetadata(), queryRunner.getFunctionManager(), queryRunner.getStatsCalculator(), actualPlan, pattern);
             return null;
         });
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestTopologicalOrderSubPlanVisitor.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestTopologicalOrderSubPlanVisitor.java
new file mode 100644
index 000000000000..8cbc29e37399
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestTopologicalOrderSubPlanVisitor.java
@@ -0,0 +1,204 @@
+/*
+ * Licensed 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 io.trino.sql.planner;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.trino.cost.StatsAndCosts;
+import io.trino.operator.RetryPolicy;
+import io.trino.sql.planner.plan.IndexJoinNode;
+import io.trino.sql.planner.plan.JoinNode;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import io.trino.sql.planner.plan.PlanNode;
+import io.trino.sql.planner.plan.PlanNodeId;
+import io.trino.sql.planner.plan.RemoteSourceNode;
+import io.trino.sql.planner.plan.SemiJoinNode;
+import io.trino.sql.planner.plan.SpatialJoinNode;
+import io.trino.sql.planner.plan.ValuesNode;
+import io.trino.sql.tree.BooleanLiteral;
+import io.trino.sql.tree.Row;
+import io.trino.sql.tree.StringLiteral;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.SOURCE_DISTRIBUTION;
+import static io.trino.sql.planner.TopologicalOrderSubPlanVisitor.sortPlanInTopologicalOrder;
+import static io.trino.sql.planner.plan.ExchangeNode.Type.REPARTITION;
+import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestTopologicalOrderSubPlanVisitor
+{
+    private interface JoinFunction
+    {
+        PlanNode apply(String id, PlanNode left, PlanNode right);
+    }
+
+    private void test(JoinFunction f)
+    {
+        //   * root
+        //  / \
+        // A   * middle
+        //    / \
+        //   B   C
+        SubPlan a = valuesSubPlan("a");
+        SubPlan b = valuesSubPlan("b");
+        SubPlan c = valuesSubPlan("c");
+
+        SubPlan middle = createSubPlan("middle",
+                f.apply("middle_join", remoteSource("b"), remoteSource("c")),
+                ImmutableList.of(b, c));
+
+        SubPlan root = createSubPlan("root",
+                f.apply("root_join", remoteSource("a"), remoteSource("middle")),
+                ImmutableList.of(a, middle));
+
+        assertThat(sortPlanInTopologicalOrder(root))
+                .isEqualTo(ImmutableList.of(c, b, middle, a, root));
+    }
+
+    @Test
+    public void testJoinOrder()
+    {
+        test(TestTopologicalOrderSubPlanVisitor::join);
+    }
+
+    @Test
+    public void testSemiJoinOrder()
+    {
+        test(TestTopologicalOrderSubPlanVisitor::semiJoin);
+    }
+
+    @Test
+    public void testIndexJoin()
+    {
+        test(TestTopologicalOrderSubPlanVisitor::indexJoin);
+    }
+
+    @Test
+    public void testSpatialJoin()
+    {
+        test(TestTopologicalOrderSubPlanVisitor::spatialJoin);
+    }
+
+    private static RemoteSourceNode remoteSource(String fragmentId)
+    {
+        return remoteSource(ImmutableList.of(fragmentId));
+    }
+
+    private static RemoteSourceNode remoteSource(List<String> fragmentIds)
+    {
+        return new RemoteSourceNode(
+                new PlanNodeId(fragmentIds.get(0)),
+                fragmentIds.stream().map(PlanFragmentId::new).collect(toImmutableList()),
+                ImmutableList.of(new Symbol("blah")),
+                Optional.empty(),
+                REPARTITION,
+                RetryPolicy.TASK);
+    }
+
+    private static JoinNode join(String id, PlanNode left, PlanNode right)
+    {
+        return new JoinNode(
+                new PlanNodeId(id),
+                INNER,
+                left,
+                right,
+                ImmutableList.of(),
+                left.getOutputSymbols(),
+                right.getOutputSymbols(),
+                false,
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                ImmutableMap.of(),
+                Optional.empty());
+    }
+
+    private static SemiJoinNode semiJoin(String id, PlanNode left, PlanNode right)
+    {
+        return new SemiJoinNode(
+                new PlanNodeId(id),
+                left,
+                right,
+                left.getOutputSymbols().get(0),
+                right.getOutputSymbols().get(0),
+                new Symbol(id),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty());
+    }
+
+    private static IndexJoinNode indexJoin(String id, PlanNode left, PlanNode right)
+    {
+        return new IndexJoinNode(
+                new PlanNodeId(id),
+                IndexJoinNode.Type.INNER,
+                left,
+                right,
+                ImmutableList.of(),
+                Optional.empty(),
+                Optional.empty());
+    }
+
+    private static SpatialJoinNode spatialJoin(String id, PlanNode left, PlanNode right)
+    {
+        return new SpatialJoinNode(
+                new PlanNodeId(id),
+                SpatialJoinNode.Type.INNER,
+                left,
+                right,
+                left.getOutputSymbols(),
+                BooleanLiteral.TRUE_LITERAL,
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty());
+    }
+
+    private static SubPlan valuesSubPlan(String fragmentId)
+    {
+        Symbol symbol = new Symbol("column");
+        return createSubPlan(fragmentId, new ValuesNode(new PlanNodeId(fragmentId + "Values"),
+                        ImmutableList.of(symbol),
+                        ImmutableList.of(new Row(ImmutableList.of(new StringLiteral("foo"))))),
+                ImmutableList.of());
+    }
+
+    private static SubPlan createSubPlan(String fragmentId, PlanNode plan, List<SubPlan> children)
+    {
+        Symbol symbol = plan.getOutputSymbols().get(0);
+        PlanNodeId valuesNodeId = new PlanNodeId("plan");
+        PlanFragment planFragment = new PlanFragment(
+                new PlanFragmentId(fragmentId),
+                plan,
+                ImmutableMap.of(symbol, VARCHAR),
+                SOURCE_DISTRIBUTION,
+                Optional.empty(),
+                ImmutableList.of(valuesNodeId),
+                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)),
+                StatsAndCosts.empty(),
+                ImmutableList.of(),
+                ImmutableList.of(),
+                Optional.empty());
+        return new SubPlan(planFragment, children);
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestTypeValidator.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestTypeValidator.java
index 5830ec6628fa..b9e664c087c5 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestTypeValidator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestTypeValidator.java
@@ -37,11 +37,9 @@
 import io.trino.sql.tree.Cast;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FrameBound;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.WindowFrame;
 import io.trino.testing.TestingMetadata.TestingColumnHandle;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Optional;
@@ -62,48 +60,40 @@
 import static io.trino.testing.TestingHandles.TEST_TABLE_HANDLE;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-@Test(singleThreaded = true)
 public class TestTypeValidator
 {
     private static final TypeValidator TYPE_VALIDATOR = new TypeValidator();
 
     private final TestingFunctionResolution functionResolution = new TestingFunctionResolution();
-    private SymbolAllocator symbolAllocator;
-    private TableScanNode baseTableScan;
-    private Symbol columnA;
-    private Symbol columnB;
-    private Symbol columnC;
-    private Symbol columnD;
-    private Symbol columnE;
-
-    @BeforeMethod
-    public void setUp()
-    {
-        symbolAllocator = new SymbolAllocator();
-        columnA = symbolAllocator.newSymbol("a", BIGINT);
-        columnB = symbolAllocator.newSymbol("b", INTEGER);
-        columnC = symbolAllocator.newSymbol("c", DOUBLE);
-        columnD = symbolAllocator.newSymbol("d", DATE);
-        columnE = symbolAllocator.newSymbol("e", VarcharType.createVarcharType(3));  // varchar(3), to test type only coercion
-
-        Map<Symbol, ColumnHandle> assignments = ImmutableMap.<Symbol, ColumnHandle>builder()
-                .put(columnA, new TestingColumnHandle("a"))
-                .put(columnB, new TestingColumnHandle("b"))
-                .put(columnC, new TestingColumnHandle("c"))
-                .put(columnD, new TestingColumnHandle("d"))
-                .put(columnE, new TestingColumnHandle("e"))
-                .buildOrThrow();
-
-        baseTableScan = new TableScanNode(
-                newId(),
-                TEST_TABLE_HANDLE,
-                ImmutableList.copyOf(assignments.keySet()),
-                assignments,
-                TupleDomain.all(),
-                Optional.empty(),
-                false,
-                Optional.empty());
-    }
+    private final SymbolAllocator symbolAllocator = new SymbolAllocator();
+    private final Symbol columnA = symbolAllocator.newSymbol("a", BIGINT);
+    private final Symbol columnB = symbolAllocator.newSymbol("b", INTEGER);
+    private final Symbol columnC = symbolAllocator.newSymbol("c", DOUBLE);
+    private final Symbol columnD = symbolAllocator.newSymbol("d", DATE);
+    // varchar(3), to test type only coercion
+    private final Symbol columnE = symbolAllocator.newSymbol("e", VarcharType.createVarcharType(3));
+
+    private final TableScanNode baseTableScan = new TableScanNode(
+            newId(),
+            TEST_TABLE_HANDLE,
+            ImmutableList.copyOf(((Map<Symbol, ColumnHandle>) ImmutableMap.<Symbol, ColumnHandle>builder()
+                    .put(columnA, new TestingColumnHandle("a"))
+                    .put(columnB, new TestingColumnHandle("b"))
+                    .put(columnC, new TestingColumnHandle("c"))
+                    .put(columnD, new TestingColumnHandle("d"))
+                    .put(columnE, new TestingColumnHandle("e"))
+                    .buildOrThrow()).keySet()),
+            ImmutableMap.<Symbol, ColumnHandle>builder()
+                    .put(columnA, new TestingColumnHandle("a"))
+                    .put(columnB, new TestingColumnHandle("b"))
+                    .put(columnC, new TestingColumnHandle("c"))
+                    .put(columnD, new TestingColumnHandle("d"))
+                    .put(columnE, new TestingColumnHandle("e"))
+                    .buildOrThrow(),
+            TupleDomain.all(),
+            Optional.empty(),
+            false,
+            Optional.empty());
 
     @Test
     public void testValidProject()
@@ -144,7 +134,7 @@ public void testValidUnion()
     public void testValidWindow()
     {
         Symbol windowSymbol = symbolAllocator.newSymbol("sum", DOUBLE);
-        ResolvedFunction resolvedFunction = functionResolution.resolveFunction(QualifiedName.of("sum"), fromTypes(DOUBLE));
+        ResolvedFunction resolvedFunction = functionResolution.resolveFunction("sum", fromTypes(DOUBLE));
 
         WindowNode.Frame frame = new WindowNode.Frame(
                 WindowFrame.Type.RANGE,
@@ -182,7 +172,7 @@ public void testValidAggregation()
                 newId(),
                 baseTableScan,
                 ImmutableMap.of(aggregationSymbol, new Aggregation(
-                        functionResolution.resolveFunction(QualifiedName.of("sum"), fromTypes(DOUBLE)),
+                        functionResolution.resolveFunction("sum", fromTypes(DOUBLE)),
                         ImmutableList.of(columnC.toSymbolReference()),
                         false,
                         Optional.empty(),
@@ -234,7 +224,7 @@ public void testInvalidAggregationFunctionCall()
                 newId(),
                 baseTableScan,
                 ImmutableMap.of(aggregationSymbol, new Aggregation(
-                        functionResolution.resolveFunction(QualifiedName.of("sum"), fromTypes(DOUBLE)),
+                        functionResolution.resolveFunction("sum", fromTypes(DOUBLE)),
                         ImmutableList.of(columnA.toSymbolReference()),
                         false,
                         Optional.empty(),
@@ -256,7 +246,7 @@ public void testInvalidAggregationFunctionSignature()
                 newId(),
                 baseTableScan,
                 ImmutableMap.of(aggregationSymbol, new Aggregation(
-                        functionResolution.resolveFunction(QualifiedName.of("sum"), fromTypes(DOUBLE)),
+                        functionResolution.resolveFunction("sum", fromTypes(DOUBLE)),
                         ImmutableList.of(columnC.toSymbolReference()),
                         false,
                         Optional.empty(),
@@ -273,7 +263,7 @@ public void testInvalidAggregationFunctionSignature()
     public void testInvalidWindowFunctionCall()
     {
         Symbol windowSymbol = symbolAllocator.newSymbol("sum", DOUBLE);
-        ResolvedFunction resolvedFunction = functionResolution.resolveFunction(QualifiedName.of("sum"), fromTypes(DOUBLE));
+        ResolvedFunction resolvedFunction = functionResolution.resolveFunction("sum", fromTypes(DOUBLE));
 
         WindowNode.Frame frame = new WindowNode.Frame(
                 WindowFrame.Type.RANGE,
@@ -308,7 +298,7 @@ public void testInvalidWindowFunctionCall()
     public void testInvalidWindowFunctionSignature()
     {
         Symbol windowSymbol = symbolAllocator.newSymbol("sum", BIGINT);
-        ResolvedFunction resolvedFunction = functionResolution.resolveFunction(QualifiedName.of("sum"), fromTypes(DOUBLE));
+        ResolvedFunction resolvedFunction = functionResolution.resolveFunction("sum", fromTypes(DOUBLE));
 
         WindowNode.Frame frame = new WindowNode.Frame(
                 WindowFrame.Type.RANGE,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestUnwrapCastInComparison.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestUnwrapCastInComparison.java
index 14d96129753d..6608dcfa3ce0 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestUnwrapCastInComparison.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestUnwrapCastInComparison.java
@@ -17,7 +17,7 @@
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.TimeZoneKey;
 import io.trino.sql.planner.assertions.BasePlanTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.output;
@@ -802,7 +802,7 @@ private void testRemoveFilter(String inputType, String inputPredicate)
     {
         assertPlan(format("SELECT * FROM (VALUES CAST(NULL AS %s)) t(a) WHERE %s AND rand() = 42", inputType, inputPredicate),
                 output(
-                        filter("rand() = 42e0",
+                        filter("random() = 42e0",
                                 values("a"))));
     }
 
@@ -816,7 +816,7 @@ private void testUnwrap(Session session, String inputType, String inputPredicate
         assertPlan(format("SELECT * FROM (VALUES CAST(NULL AS %s)) t(a) WHERE %s OR rand() = 42", inputType, inputPredicate),
                 session,
                 output(
-                        filter(format("%s OR rand() = 42e0", expectedPredicate),
+                        filter(format("%s OR random() = 42e0", expectedPredicate),
                                 values("a"))));
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestUnwrapYearInComparison.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestUnwrapYearInComparison.java
index eb4922aba384..409e634cd610 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestUnwrapYearInComparison.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestUnwrapYearInComparison.java
@@ -15,7 +15,7 @@
 
 import io.trino.spi.type.LongTimestamp;
 import io.trino.sql.planner.assertions.BasePlanTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -69,6 +69,13 @@ public void testEquals()
         testUnwrap("timestamp(12)", "year(a) = 2022", "a BETWEEN TIMESTAMP '2022-01-01 00:00:00.000000000000' AND TIMESTAMP '2022-12-31 23:59:59.999999999999'");
     }
 
+    @Test
+    public void testInPredicate()
+    {
+        testUnwrap("date", "year(a) IN (1000, 1400, 1800)", "a BETWEEN DATE '1000-01-01' AND DATE '1000-12-31' OR a BETWEEN DATE '1400-01-01' AND DATE '1400-12-31' OR a BETWEEN DATE '1800-01-01' AND DATE '1800-12-31'");
+        testUnwrap("timestamp", "year(a) IN (1000, 1400, 1800)", "a BETWEEN TIMESTAMP '1000-01-01 00:00:00.000' AND TIMESTAMP '1000-12-31 23:59:59.999' OR a BETWEEN TIMESTAMP '1400-01-01 00:00:00.000' AND TIMESTAMP '1400-12-31 23:59:59.999' OR a BETWEEN TIMESTAMP '1800-01-01 00:00:00.000' AND TIMESTAMP '1800-12-31 23:59:59.999'");
+    }
+
     @Test
     public void testNotEquals()
     {
@@ -330,7 +337,7 @@ private void testUnwrap(String inputType, String inputPredicate, String expected
                     sql,
                     getQueryRunner().getDefaultSession(),
                     output(
-                            filter(expectedPredicate + " OR rand() = 42e0",
+                            filter(expectedPredicate + " OR random() = 42e0",
                                     values("a"))));
         }
         catch (Throwable e) {
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestWindowClause.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestWindowClause.java
index a1686815471b..9a405855f0b3 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestWindowClause.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestWindowClause.java
@@ -23,11 +23,10 @@
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
-import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.metadata.MetadataManager.createTestMetadataManager;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
@@ -90,7 +89,7 @@ public void testPreprojectExpressions()
                                         .addFunction(
                                                 "max_result",
                                                 functionCall("max", ImmutableList.of("b")),
-                                                createTestMetadataManager().resolveFunction(TEST_SESSION, QualifiedName.of("max"), fromTypes(INTEGER)),
+                                                createTestMetadataManager().resolveBuiltinFunction("max", fromTypes(INTEGER)),
                                                 windowFrame(
                                                         RANGE,
                                                         PRECEDING,
@@ -160,7 +159,7 @@ public void testWindowWithFrameCoercions()
                                         .addFunction(
                                                 "count_result",
                                                 functionCall("count", ImmutableList.of()),
-                                                createTestMetadataManager().resolveFunction(TEST_SESSION, QualifiedName.of("count"), fromTypes()),
+                                                createTestMetadataManager().resolveBuiltinFunction("count", fromTypes()),
                                                 windowFrame(
                                                         RANGE,
                                                         CURRENT_ROW,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestWindowFrameRange.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestWindowFrameRange.java
index ae9f328aaccb..0ca786838ed0 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestWindowFrameRange.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestWindowFrameRange.java
@@ -24,11 +24,10 @@
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
-import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.metadata.MetadataManager.createTestMetadataManager;
 import static io.trino.spi.StandardErrorCode.INVALID_WINDOW_FRAME;
 import static io.trino.spi.type.DecimalType.createDecimalType;
@@ -70,7 +69,7 @@ public void testFramePrecedingWithSortKeyCoercions()
                                         .addFunction(
                                                 "array_agg_result",
                                                 functionCall("array_agg", ImmutableList.of("key")),
-                                                createTestMetadataManager().resolveFunction(TEST_SESSION, QualifiedName.of("array_agg"), fromTypes(INTEGER)),
+                                                createTestMetadataManager().resolveBuiltinFunction("array_agg", fromTypes(INTEGER)),
                                                 windowFrame(
                                                         RANGE,
                                                         PRECEDING,
@@ -117,7 +116,7 @@ public void testFrameFollowingWithOffsetCoercion()
                                         .addFunction(
                                                 "array_agg_result",
                                                 functionCall("array_agg", ImmutableList.of("key")),
-                                                createTestMetadataManager().resolveFunction(TEST_SESSION, QualifiedName.of("array_agg"), fromTypes(createDecimalType(2, 1))),
+                                                createTestMetadataManager().resolveBuiltinFunction("array_agg", fromTypes(createDecimalType(2, 1))),
                                                 windowFrame(
                                                         RANGE,
                                                         CURRENT_ROW,
@@ -164,7 +163,7 @@ public void testFramePrecedingFollowingNoCoercions()
                                         .addFunction(
                                                 "array_agg_result",
                                                 functionCall("array_agg", ImmutableList.of("key")),
-                                                createTestMetadataManager().resolveFunction(TEST_SESSION, QualifiedName.of("array_agg"), fromTypes(INTEGER)),
+                                                createTestMetadataManager().resolveBuiltinFunction("array_agg", fromTypes(INTEGER)),
                                                 windowFrame(
                                                         RANGE,
                                                         PRECEDING,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestingPlannerContext.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestingPlannerContext.java
index 636b5630d33a..a7e8f9bc4bde 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestingPlannerContext.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestingPlannerContext.java
@@ -13,6 +13,7 @@
  */
 package io.trino.sql.planner;
 
+import com.google.common.collect.ImmutableSet;
 import io.trino.FeaturesConfig;
 import io.trino.connector.CatalogServiceProvider;
 import io.trino.metadata.BlockEncodingManager;
@@ -21,6 +22,8 @@
 import io.trino.metadata.GlobalFunctionCatalog;
 import io.trino.metadata.InternalBlockEncodingSerde;
 import io.trino.metadata.InternalFunctionBundle;
+import io.trino.metadata.LanguageFunctionManager;
+import io.trino.metadata.LanguageFunctionProvider;
 import io.trino.metadata.LiteralFunction;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.MetadataManager;
@@ -36,6 +39,7 @@
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeOperators;
 import io.trino.sql.PlannerContext;
+import io.trino.sql.parser.SqlParser;
 import io.trino.transaction.TransactionManager;
 import io.trino.type.BlockTypeOperators;
 import io.trino.type.InternalTypeManager;
@@ -46,6 +50,7 @@
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkState;
+import static io.airlift.tracing.Tracing.noopTracer;
 import static io.trino.client.NodeVersion.UNKNOWN;
 import static java.util.Objects.requireNonNull;
 
@@ -121,10 +126,13 @@ public PlannerContext build()
             BlockEncodingSerde blockEncodingSerde = new InternalBlockEncodingSerde(new BlockEncodingManager(), typeManager);
             globalFunctionCatalog.addFunctions(new InternalFunctionBundle(new LiteralFunction(blockEncodingSerde)));
 
+            LanguageFunctionManager languageFunctionManager = new LanguageFunctionManager(new SqlParser(), typeManager, user -> ImmutableSet.of());
+
             Metadata metadata = this.metadata;
             if (metadata == null) {
                 TestMetadataManagerBuilder builder = MetadataManager.testMetadataManagerBuilder()
                         .withTypeManager(typeManager)
+                        .withLanguageFunctionManager(languageFunctionManager)
                         .withGlobalFunctionCatalog(globalFunctionCatalog);
                 if (transactionManager != null) {
                     builder.withTransactionManager(transactionManager);
@@ -132,7 +140,7 @@ public PlannerContext build()
                 metadata = builder.build();
             }
 
-            FunctionManager functionManager = new FunctionManager(CatalogServiceProvider.fail(), globalFunctionCatalog);
+            FunctionManager functionManager = new FunctionManager(CatalogServiceProvider.fail(), globalFunctionCatalog, LanguageFunctionProvider.DISABLED);
             globalFunctionCatalog.addFunctions(new InternalFunctionBundle(
                     new JsonExistsFunction(functionManager, metadata, typeManager),
                     new JsonValueFunction(functionManager, metadata, typeManager),
@@ -144,7 +152,9 @@ public PlannerContext build()
                     typeOperators,
                     blockEncodingSerde,
                     typeManager,
-                    functionManager);
+                    functionManager,
+                    languageFunctionManager,
+                    noopTracer());
         }
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestingWriterTarget.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestingWriterTarget.java
index f20e07eecd05..636c5480a84a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/TestingWriterTarget.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/TestingWriterTarget.java
@@ -16,6 +16,7 @@
 
 import io.trino.Session;
 import io.trino.metadata.Metadata;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.sql.planner.plan.TableWriterNode;
 
 import java.util.OptionalInt;
@@ -30,20 +31,20 @@ public String toString()
     }
 
     @Override
-    public boolean supportsReportingWrittenBytes(Metadata metadata, Session session)
+    public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
     {
         return false;
     }
 
     @Override
-    public boolean supportsMultipleWritersPerPartition(Metadata metadata, Session session)
+    public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
     {
-        return false;
+        return OptionalInt.empty();
     }
 
     @Override
-    public OptionalInt getMaxWriterTasks(Metadata metadata, Session session)
+    public WriterScalingOptions getWriterScalingOptions(Metadata metadata, Session session)
     {
-        return OptionalInt.empty();
+        return WriterScalingOptions.DISABLED;
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/AggregationFunctionMatcher.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/AggregationFunctionMatcher.java
index 3b2c240510cf..9ff3660a38fa 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/AggregationFunctionMatcher.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/AggregationFunctionMatcher.java
@@ -15,6 +15,7 @@
 
 import io.trino.Session;
 import io.trino.metadata.Metadata;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.sql.planner.OrderingScheme;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.AggregationNode;
@@ -26,8 +27,10 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
-import static io.trino.metadata.ResolvedFunction.extractFunctionName;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
+import static io.trino.metadata.ResolvedFunction.isResolved;
 import static java.util.Objects.requireNonNull;
 
 public class AggregationFunctionMatcher
@@ -65,7 +68,12 @@ private static boolean aggregationMatches(Aggregation aggregation, FunctionCall
         if (expectedCall.getWindow().isPresent()) {
             return false;
         }
-        return Objects.equals(extractFunctionName(expectedCall.getName()), aggregation.getResolvedFunction().getSignature().getName()) &&
+
+        checkArgument(!isResolved(expectedCall.getName()), "Expected function call must not be resolved");
+        checkArgument(expectedCall.getName().getParts().size() == 1, "Expected function call name must not be qualified: %s", expectedCall.getName());
+        CatalogSchemaFunctionName expectedFunctionName = builtinFunctionName(expectedCall.getName().getSuffix());
+
+        return Objects.equals(expectedFunctionName, aggregation.getResolvedFunction().getSignature().getName()) &&
                 Objects.equals(expectedCall.getFilter(), aggregation.getFilter().map(Symbol::toSymbolReference)) &&
                 Objects.equals(expectedCall.getOrderBy().map(OrderingScheme::fromOrderBy), aggregation.getOrderingScheme()) &&
                 Objects.equals(expectedCall.isDistinct(), aggregation.isDistinct()) &&
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/BasePlanTest.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/BasePlanTest.java
index 0f4eaec71e6e..6adee5ed248e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/BasePlanTest.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/BasePlanTest.java
@@ -17,7 +17,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.trino.Session;
-import io.trino.execution.warnings.WarningCollector;
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.sql.planner.LogicalPlanner;
@@ -31,6 +30,9 @@
 import io.trino.sql.planner.optimizations.UnaliasSymbolReferences;
 import io.trino.testing.LocalQueryRunner;
 import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 
@@ -41,6 +43,7 @@
 
 import static io.airlift.testing.Closeables.closeAllRuntimeException;
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static io.trino.execution.warnings.WarningCollector.NOOP;
 import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED;
 import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED;
 import static io.trino.sql.planner.PlanOptimizers.columnPruningRules;
@@ -48,7 +51,9 @@
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class BasePlanTest
 {
     private final Map<String, String> sessionProperties;
@@ -82,12 +87,14 @@ protected LocalQueryRunner createLocalQueryRunner()
         return queryRunner;
     }
 
+    @BeforeAll
     @BeforeClass
     public final void initPlanTest()
     {
         this.queryRunner = createLocalQueryRunner();
     }
 
+    @AfterAll
     @AfterClass(alwaysRun = true)
     public final void destroyPlanTest()
     {
@@ -145,7 +152,7 @@ protected void assertPlan(@Language("SQL") String sql, LogicalPlanner.Stage stag
     {
         try {
             queryRunner.inTransaction(transactionSession -> {
-                Plan actualPlan = queryRunner.createPlan(transactionSession, sql, optimizers, stage, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+                Plan actualPlan = queryRunner.createPlan(transactionSession, sql, optimizers, stage, NOOP, createPlanOptimizersStatsCollector());
                 PlanAssert.assertPlan(transactionSession, queryRunner.getMetadata(), queryRunner.getFunctionManager(), queryRunner.getStatsCalculator(), actualPlan, pattern);
                 return null;
             });
@@ -187,7 +194,13 @@ protected void assertPlanWithSession(@Language("SQL") String sql, Session sessio
     {
         try {
             queryRunner.inTransaction(session, transactionSession -> {
-                Plan actualPlan = queryRunner.createPlan(transactionSession, sql, OPTIMIZED_AND_VALIDATED, forceSingleNode, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+                Plan actualPlan = queryRunner.createPlan(
+                        transactionSession,
+                        sql,
+                        queryRunner.getPlanOptimizers(forceSingleNode),
+                        OPTIMIZED_AND_VALIDATED,
+                        NOOP,
+                        createPlanOptimizersStatsCollector());
                 PlanAssert.assertPlan(transactionSession, queryRunner.getMetadata(), queryRunner.getFunctionManager(), queryRunner.getStatsCalculator(), actualPlan, pattern);
                 return null;
             });
@@ -202,7 +215,7 @@ protected void assertPlanWithSession(@Language("SQL") String sql, Session sessio
     {
         try {
             queryRunner.inTransaction(session, transactionSession -> {
-                Plan actualPlan = queryRunner.createPlan(transactionSession, sql, OPTIMIZED_AND_VALIDATED, forceSingleNode, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+                Plan actualPlan = queryRunner.createPlan(transactionSession, sql, queryRunner.getPlanOptimizers(forceSingleNode), OPTIMIZED_AND_VALIDATED, NOOP, createPlanOptimizersStatsCollector());
                 PlanAssert.assertPlan(transactionSession, queryRunner.getMetadata(), queryRunner.getFunctionManager(), queryRunner.getStatsCalculator(), actualPlan, pattern);
                 planValidator.accept(actualPlan);
                 return null;
@@ -227,7 +240,8 @@ protected Plan plan(@Language("SQL") String sql, LogicalPlanner.Stage stage)
     protected Plan plan(@Language("SQL") String sql, LogicalPlanner.Stage stage, boolean forceSingleNode)
     {
         try {
-            return queryRunner.inTransaction(transactionSession -> queryRunner.createPlan(transactionSession, sql, stage, forceSingleNode, WarningCollector.NOOP, createPlanOptimizersStatsCollector()));
+            return queryRunner.inTransaction(queryRunner.getDefaultSession(), transactionSession ->
+                    queryRunner.createPlan(transactionSession, sql, queryRunner.getPlanOptimizers(forceSingleNode), stage, NOOP, createPlanOptimizersStatsCollector()));
         }
         catch (RuntimeException e) {
             throw new AssertionError("Planning failed for SQL: " + sql, e);
@@ -243,7 +257,7 @@ protected SubPlan subplan(@Language("SQL") String sql, LogicalPlanner.Stage stag
     {
         try {
             return queryRunner.inTransaction(session, transactionSession -> {
-                Plan plan = queryRunner.createPlan(transactionSession, sql, stage, forceSingleNode, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+                Plan plan = queryRunner.createPlan(transactionSession, sql, queryRunner.getPlanOptimizers(forceSingleNode), stage, NOOP, createPlanOptimizersStatsCollector());
                 return queryRunner.createSubPlans(transactionSession, plan, forceSingleNode);
             });
         }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/ColumnReference.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/ColumnReference.java
index f7491a550679..096b404d0967 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/ColumnReference.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/ColumnReference.java
@@ -16,7 +16,7 @@
 import io.trino.Session;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.TableHandle;
-import io.trino.metadata.TableMetadata;
+import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.IndexSourceNode;
@@ -60,8 +60,8 @@ else if (node instanceof IndexSourceNode indexSourceNode) {
             return Optional.empty();
         }
 
-        TableMetadata tableMetadata = metadata.getTableMetadata(session, tableHandle);
-        String actualTableName = tableMetadata.getTable().getTableName();
+        CatalogSchemaTableName fullTableName = metadata.getTableName(session, tableHandle);
+        String actualTableName = fullTableName.getSchemaTableName().getTableName();
 
         // Wrong table -> doesn't match.
         if (!tableName.equalsIgnoreCase(actualTableName)) {
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/ExpressionMatcher.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/ExpressionMatcher.java
index 36abcf484359..a1ceec2f6792 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/ExpressionMatcher.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/ExpressionMatcher.java
@@ -16,7 +16,6 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.Session;
 import io.trino.metadata.Metadata;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.ApplyNode;
@@ -56,7 +55,7 @@ public class ExpressionMatcher
     private Expression expression(String sql)
     {
         SqlParser parser = new SqlParser();
-        return rewriteIdentifiersToSymbolReferences(parser.createExpression(sql, new ParsingOptions()));
+        return rewriteIdentifiersToSymbolReferences(parser.createExpression(sql));
     }
 
     public static ExpressionMatcher inPredicate(SymbolReference value, SymbolReference valueList)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/ExpressionVerifier.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/ExpressionVerifier.java
index 01134a73a701..f602cf48ae33 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/ExpressionVerifier.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/ExpressionVerifier.java
@@ -13,6 +13,7 @@
  */
 package io.trino.sql.planner.assertions;
 
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.sql.tree.ArithmeticBinaryExpression;
 import io.trino.sql.tree.ArithmeticUnaryExpression;
 import io.trino.sql.tree.AstVisitor;
@@ -52,8 +53,11 @@
 import java.util.List;
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
 import static io.trino.metadata.ResolvedFunction.extractFunctionName;
+import static io.trino.metadata.ResolvedFunction.isResolved;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
@@ -177,7 +181,7 @@ protected Boolean visitNullLiteral(NullLiteral node, Node expectedExpression)
     private static String getValueFromLiteral(Node expression)
     {
         if (expression instanceof LongLiteral) {
-            return String.valueOf(((LongLiteral) expression).getValue());
+            return String.valueOf(((LongLiteral) expression).getParsedValue());
         }
 
         if (expression instanceof BooleanLiteral) {
@@ -486,8 +490,17 @@ protected Boolean visitFunctionCall(FunctionCall actual, Node expectedExpression
             return false;
         }
 
+        CatalogSchemaFunctionName expectedFunctionName;
+        if (isResolved(expected.getName())) {
+            expectedFunctionName = extractFunctionName(expected.getName());
+        }
+        else {
+            checkArgument(expected.getName().getParts().size() == 1, "Unresolved function call name must not be qualified: %s", expected.getName());
+            expectedFunctionName = builtinFunctionName(expected.getName().getSuffix());
+        }
+
         return actual.isDistinct() == expected.isDistinct() &&
-                extractFunctionName(actual.getName()).equals(extractFunctionName(expected.getName())) &&
+                extractFunctionName(actual.getName()).equals(expectedFunctionName) &&
                 process(actual.getArguments(), expected.getArguments()) &&
                 process(actual.getFilter(), expected.getFilter()) &&
                 process(actual.getWindow().map(Node.class::cast), expected.getWindow().map(Node.class::cast));
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/GroupIdMatcher.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/GroupIdMatcher.java
index 6453ec4de374..043a79c7e832 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/GroupIdMatcher.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/GroupIdMatcher.java
@@ -13,6 +13,7 @@
  */
 package io.trino.sql.planner.assertions;
 
+import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
 import io.trino.cost.StatsProvider;
 import io.trino.metadata.Metadata;
@@ -21,9 +22,11 @@
 import io.trino.sql.planner.plan.PlanNode;
 
 import java.util.List;
+import java.util.Map;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.sql.planner.assertions.MatchResult.NO_MATCH;
 import static io.trino.sql.planner.assertions.MatchResult.match;
 
@@ -31,12 +34,15 @@ public class GroupIdMatcher
         implements Matcher
 {
     private final List<List<String>> groupingSets;
+    // tracks how each grouping set column is derived from an input column
+    private final Map<String, String> groupingColumns;
     private final List<String> aggregationArguments;
     private final String groupIdSymbol;
 
-    public GroupIdMatcher(List<List<String>> groupingSets, List<String> aggregationArguments, String groupIdSymbol)
+    public GroupIdMatcher(List<List<String>> groupingSets, Map<String, String> groupingColumns, List<String> aggregationArguments, String groupIdSymbol)
     {
         this.groupingSets = groupingSets;
+        this.groupingColumns = ImmutableMap.copyOf(groupingColumns);
         this.aggregationArguments = aggregationArguments;
         this.groupIdSymbol = groupIdSymbol;
     }
@@ -60,17 +66,31 @@ public MatchResult detailMatches(PlanNode node, StatsProvider stats, Session ses
             return NO_MATCH;
         }
 
+        SymbolAliases.Builder newAliases = SymbolAliases.builder()
+                .put(groupIdSymbol, groupIdNode.getGroupIdSymbol().toSymbolReference());
         for (int i = 0; i < actualGroupingSets.size(); i++) {
-            if (!AggregationMatcher.matches(groupingSets.get(i), actualGroupingSets.get(i), symbolAliases)) {
+            List<String> expectedGroupingSet = groupingSets.get(i);
+            List<Symbol> actualGroupingSet = actualGroupingSets.get(i);
+            if (!AggregationMatcher.matches(
+                    expectedGroupingSet.stream().map(symbol -> groupingColumns.getOrDefault(symbol, symbol)).collect(toImmutableList()),
+                    actualGroupingSet.stream().map(symbol -> groupIdNode.getGroupingColumns().getOrDefault(symbol, symbol)).collect(toImmutableList()),
+                    symbolAliases)) {
                 return NO_MATCH;
             }
+            for (int j = 0; j < expectedGroupingSet.size(); j++) {
+                String expectedGroupingSetSymbol = expectedGroupingSet.get(j);
+                if (!groupingColumns.getOrDefault(expectedGroupingSetSymbol, expectedGroupingSetSymbol).equals(expectedGroupingSetSymbol)) {
+                    // new symbol
+                    newAliases.put(expectedGroupingSetSymbol, actualGroupingSet.get(j).toSymbolReference());
+                }
+            }
         }
 
         if (!AggregationMatcher.matches(aggregationArguments, actualAggregationArguments, symbolAliases)) {
             return NO_MATCH;
         }
 
-        return match(groupIdSymbol, groupIdNode.getGroupIdSymbol().toSymbolReference());
+        return match(newAliases.build());
     }
 
     @Override
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/IndexSourceMatcher.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/IndexSourceMatcher.java
index 0c02dafe413c..e88d239bd836 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/IndexSourceMatcher.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/IndexSourceMatcher.java
@@ -16,7 +16,7 @@
 import io.trino.Session;
 import io.trino.cost.StatsProvider;
 import io.trino.metadata.Metadata;
-import io.trino.metadata.TableMetadata;
+import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.sql.planner.plan.IndexSourceNode;
 import io.trino.sql.planner.plan.PlanNode;
 
@@ -48,8 +48,8 @@ public MatchResult detailMatches(PlanNode node, StatsProvider stats, Session ses
         checkState(shapeMatches(node), "Plan testing framework error: shapeMatches returned false in detailMatches in %s", this.getClass().getName());
 
         IndexSourceNode indexSourceNode = (IndexSourceNode) node;
-        TableMetadata tableMetadata = metadata.getTableMetadata(session, indexSourceNode.getTableHandle());
-        String actualTableName = tableMetadata.getTable().getTableName();
+        CatalogSchemaTableName tableName = metadata.getTableName(session, indexSourceNode.getTableHandle());
+        String actualTableName = tableName.getSchemaTableName().getTableName();
 
         if (!expectedTableName.equalsIgnoreCase(actualTableName)) {
             return NO_MATCH;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/PatternRecognitionExpressionRewriter.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/PatternRecognitionExpressionRewriter.java
index 94be32647993..a2ee8a976340 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/PatternRecognitionExpressionRewriter.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/PatternRecognitionExpressionRewriter.java
@@ -15,7 +15,6 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.type.Type;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.SymbolAllocator;
@@ -49,7 +48,7 @@ private PatternRecognitionExpressionRewriter() {}
 
     public static ExpressionAndValuePointers rewrite(String definition, Map<IrLabel, Set<IrLabel>> subsets)
     {
-        return rewrite(new SqlParser().createExpression(definition, new ParsingOptions()), subsets);
+        return rewrite(new SqlParser().createExpression(definition), subsets);
     }
 
     public static ExpressionAndValuePointers rewrite(Expression definition, Map<IrLabel, Set<IrLabel>> subsets)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/PlanMatchPattern.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/PlanMatchPattern.java
index 4d72d4eba0da..5c1cc7861ae7 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/PlanMatchPattern.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/PlanMatchPattern.java
@@ -14,6 +14,7 @@
 package io.trino.sql.planner.assertions;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import io.trino.Session;
@@ -625,6 +626,11 @@ public static PlanMatchPattern exchange(ExchangeNode.Scope scope, Optional<Integ
         return exchange(scope, Optional.empty(), Optional.empty(), ImmutableList.of(), ImmutableSet.of(), Optional.empty(), ImmutableList.of(), Optional.of(partitionCount), sources);
     }
 
+    public static PlanMatchPattern exchange(ExchangeNode.Scope scope, ExchangeNode.Type type, Optional<Integer> partitionCount, PlanMatchPattern... sources)
+    {
+        return exchange(scope, Optional.of(type), Optional.empty(), ImmutableList.of(), ImmutableSet.of(), Optional.empty(), ImmutableList.of(), Optional.of(partitionCount), sources);
+    }
+
     public static PlanMatchPattern exchange(ExchangeNode.Scope scope, PartitioningHandle partitioningHandle, Optional<Integer> partitionCount, PlanMatchPattern... sources)
     {
         return exchange(scope, Optional.empty(), Optional.of(partitioningHandle), ImmutableList.of(), ImmutableSet.of(), Optional.empty(), ImmutableList.of(), Optional.of(partitionCount), sources);
@@ -746,9 +752,20 @@ public static PlanMatchPattern groupId(
             List<String> aggregationArguments,
             String groupIdSymbol,
             PlanMatchPattern source)
+    {
+        return groupId(groupingSets, ImmutableMap.of(), aggregationArguments, groupIdSymbol, source);
+    }
+
+    public static PlanMatchPattern groupId(
+            List<List<String>> groupingSets,
+            Map<String, String> groupingColumns,
+            List<String> aggregationArguments,
+            String groupIdSymbol,
+            PlanMatchPattern source)
     {
         return node(GroupIdNode.class, source).with(new GroupIdMatcher(
                 groupingSets,
+                groupingColumns,
                 aggregationArguments,
                 groupIdSymbol));
     }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TableFunctionMatcher.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TableFunctionMatcher.java
index 88454654f413..e469751a4d3e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TableFunctionMatcher.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TableFunctionMatcher.java
@@ -19,11 +19,11 @@
 import io.trino.Session;
 import io.trino.cost.StatsProvider;
 import io.trino.metadata.Metadata;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.Descriptor;
-import io.trino.spi.ptf.DescriptorArgument;
-import io.trino.spi.ptf.ScalarArgument;
-import io.trino.spi.ptf.TableArgument;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.DescriptorArgument;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.TableArgument;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
 import io.trino.sql.planner.plan.PlanNode;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TableScanMatcher.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TableScanMatcher.java
index 48a9b8896443..2bf797baa6bb 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TableScanMatcher.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TableScanMatcher.java
@@ -17,7 +17,7 @@
 import io.trino.cost.StatsProvider;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.TableHandle;
-import io.trino.metadata.TableMetadata;
+import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
@@ -58,8 +58,8 @@ public MatchResult detailMatches(PlanNode node, StatsProvider stats, Session ses
         checkState(shapeMatches(node), "Plan testing framework error: shapeMatches returned false in detailMatches in %s", this.getClass().getName());
 
         TableScanNode tableScanNode = (TableScanNode) node;
-        TableMetadata tableMetadata = metadata.getTableMetadata(session, tableScanNode.getTable());
-        String actualTableName = tableMetadata.getTable().getTableName();
+        CatalogSchemaTableName tableName = metadata.getTableName(session, tableScanNode.getTable());
+        String actualTableName = tableName.getSchemaTableName().getTableName();
 
         // TODO (https://github.com/trinodb/trino/issues/17) change to equals()
         if (!expectedTableName.equalsIgnoreCase(actualTableName)) {
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TestExpressionVerifier.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TestExpressionVerifier.java
index 7e6b389b43f8..3b1fb518b9a4 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TestExpressionVerifier.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TestExpressionVerifier.java
@@ -13,11 +13,10 @@
  */
 package io.trino.sql.planner.assertions;
 
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.ExpressionUtils.rewriteIdentifiersToSymbolReferences;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -127,6 +126,6 @@ public void testSymmetry()
 
     private Expression expression(String sql)
     {
-        return rewriteIdentifiersToSymbolReferences(parser.createExpression(sql, new ParsingOptions()));
+        return rewriteIdentifiersToSymbolReferences(parser.createExpression(sql));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/WindowFunctionMatcher.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/WindowFunctionMatcher.java
index fa4ec9fedfaf..9467dca99b85 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/WindowFunctionMatcher.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/WindowFunctionMatcher.java
@@ -16,6 +16,7 @@
 import io.trino.Session;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.ResolvedFunction;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.PatternRecognitionNode;
 import io.trino.sql.planner.plan.PlanNode;
@@ -28,8 +29,10 @@
 import java.util.Optional;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
-import static io.trino.metadata.ResolvedFunction.extractFunctionName;
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
+import static io.trino.metadata.ResolvedFunction.isResolved;
 import static java.util.Objects.requireNonNull;
 
 public class WindowFunctionMatcher
@@ -91,9 +94,13 @@ private boolean windowFunctionMatches(Function windowFunction, FunctionCall expe
             return false;
         }
 
+        checkArgument(!isResolved(expectedCall.getName()), "Expected function call must not be resolved");
+        checkArgument(expectedCall.getName().getParts().size() == 1, "Expected function call name must not be qualified: %s", expectedCall.getName());
+        CatalogSchemaFunctionName expectedFunctionName = builtinFunctionName(expectedCall.getName().getSuffix());
+
         return resolvedFunction.map(windowFunction.getResolvedFunction()::equals).orElse(true) &&
                 expectedFrame.map(windowFunction.getFrame()::equals).orElse(true) &&
-                Objects.equals(extractFunctionName(expectedCall.getName()), windowFunction.getResolvedFunction().getSignature().getName()) &&
+                Objects.equals(expectedFunctionName, windowFunction.getResolvedFunction().getSignature().getName()) &&
                 Objects.equals(expectedCall.getArguments(), windowFunction.getArguments());
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/TestIterativeOptimizer.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/TestIterativeOptimizer.java
index b0073d412b95..c17d5940f8f4 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/TestIterativeOptimizer.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/TestIterativeOptimizer.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableSet;
 import io.trino.Session;
 import io.trino.execution.querystats.PlanOptimizersStatsCollector;
-import io.trino.execution.warnings.WarningCollector;
 import io.trino.matching.Captures;
 import io.trino.matching.Pattern;
 import io.trino.plugin.tpch.TpchConnectorFactory;
@@ -30,60 +29,34 @@
 import io.trino.sql.planner.plan.ProjectNode;
 import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.Optional;
 
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static io.trino.execution.warnings.WarningCollector.NOOP;
 import static io.trino.spi.StandardErrorCode.OPTIMIZER_TIMEOUT;
+import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED;
 import static io.trino.sql.planner.plan.Patterns.tableScan;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestIterativeOptimizer
 {
-    private LocalQueryRunner queryRunner;
-
-    @BeforeClass
-    public void setUp()
-    {
-        Session.SessionBuilder sessionBuilder = testSessionBuilder()
-                .setCatalog(TEST_CATALOG_NAME)
-                .setSchema("tiny")
-                .setSystemProperty("task_concurrency", "1")
-                .setSystemProperty("iterative_optimizer_timeout", "1ms");
-
-        queryRunner = LocalQueryRunner.create(sessionBuilder.build());
-
-        queryRunner.createCatalog(queryRunner.getDefaultSession().getCatalog().get(),
-                new TpchConnectorFactory(1),
-                ImmutableMap.of());
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-    {
-        if (queryRunner != null) {
-            queryRunner.close();
-            queryRunner = null;
-        }
-    }
-
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void optimizerQueryRulesStatsCollect()
     {
-        LocalQueryRunner queryRunner = null;
-        try {
-            Session.SessionBuilder sessionBuilder = testSessionBuilder()
-                    .setSystemProperty("iterative_optimizer_timeout", "5s");
-
-            queryRunner = LocalQueryRunner.create(sessionBuilder.build());
-
+        Session.SessionBuilder sessionBuilder = testSessionBuilder()
+                .setSystemProperty("iterative_optimizer_timeout", "5s");
+        try (LocalQueryRunner queryRunner = LocalQueryRunner.create(sessionBuilder.build())) {
             PlanOptimizersStatsCollector planOptimizersStatsCollector = new PlanOptimizersStatsCollector(10);
             PlanOptimizer optimizer = new IterativeOptimizer(
                     queryRunner.getPlannerContext(),
@@ -92,7 +65,9 @@ public void optimizerQueryRulesStatsCollect()
                     queryRunner.getCostCalculator(),
                     ImmutableSet.of(new AddIdentityOverTableScan(), new RemoveRedundantIdentityProjections()));
 
-            queryRunner.createPlan(sessionBuilder.build(), "SELECT 1", ImmutableList.of(optimizer), WarningCollector.NOOP, planOptimizersStatsCollector);
+            Session session = sessionBuilder.build();
+            queryRunner.inTransaction(session, transactionSession ->
+                    queryRunner.createPlan(transactionSession, "SELECT 1", ImmutableList.of(optimizer), OPTIMIZED_AND_VALIDATED, NOOP, planOptimizersStatsCollector));
             Optional<QueryPlanOptimizerStatistics> queryRuleStats = planOptimizersStatsCollector.getTopRuleStats().stream().findFirst();
 
             assertTrue(queryRuleStats.isPresent());
@@ -102,26 +77,41 @@ public void optimizerQueryRulesStatsCollect()
             assertEquals(queryRuleStat.applied(), 3);
             assertEquals(queryRuleStat.failures(), 0);
         }
-        finally {
-            if (queryRunner != null) {
-                queryRunner.close();
-            }
-        }
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void optimizerTimeoutsOnNonConvergingPlan()
     {
-        PlanOptimizer optimizer = new IterativeOptimizer(
-                queryRunner.getPlannerContext(),
-                new RuleStatsRecorder(),
-                queryRunner.getStatsCalculator(),
-                queryRunner.getCostCalculator(),
-                ImmutableSet.of(new AddIdentityOverTableScan(), new RemoveRedundantIdentityProjections()));
+        Session.SessionBuilder sessionBuilder = testSessionBuilder()
+                .setCatalog(TEST_CATALOG_NAME)
+                .setSchema("tiny")
+                .setSystemProperty("task_concurrency", "1")
+                .setSystemProperty("iterative_optimizer_timeout", "1ms");
+
+        try (LocalQueryRunner queryRunner = LocalQueryRunner.create(sessionBuilder.build())) {
+            queryRunner.createCatalog(queryRunner.getDefaultSession().getCatalog().get(),
+                    new TpchConnectorFactory(1),
+                    ImmutableMap.of());
 
-        assertTrinoExceptionThrownBy(() -> queryRunner.inTransaction(transactionSession -> queryRunner.createPlan(transactionSession, "SELECT nationkey FROM nation", ImmutableList.of(optimizer), WarningCollector.NOOP, createPlanOptimizersStatsCollector())))
-                .hasErrorCode(OPTIMIZER_TIMEOUT)
-                .hasMessageMatching("The optimizer exhausted the time limit of 1 ms: (no rules invoked|(?s)Top rules:.*(RemoveRedundantIdentityProjections|AddIdentityOverTableScan).*)");
+            PlanOptimizer optimizer = new IterativeOptimizer(
+                    queryRunner.getPlannerContext(),
+                    new RuleStatsRecorder(),
+                    queryRunner.getStatsCalculator(),
+                    queryRunner.getCostCalculator(),
+                    ImmutableSet.of(new AddIdentityOverTableScan(), new RemoveRedundantIdentityProjections()));
+
+            assertTrinoExceptionThrownBy(() -> queryRunner.inTransaction(queryRunner.getDefaultSession(), transactionSession ->
+                    queryRunner.createPlan(
+                            transactionSession,
+                            "SELECT nationkey FROM nation",
+                            ImmutableList.of(optimizer),
+                            OPTIMIZED_AND_VALIDATED,
+                            NOOP,
+                            createPlanOptimizersStatsCollector())))
+                    .hasErrorCode(OPTIMIZER_TIMEOUT)
+                    .hasMessageMatching("The optimizer exhausted the time limit of 1 ms: (no rules invoked|(?s)Top rules:.*(RemoveRedundantIdentityProjections|AddIdentityOverTableScan).*)");
+        }
     }
 
     private static class AddIdentityOverTableScan
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/TestMemo.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/TestMemo.java
index 41d2c0eb50a3..1b41aa97122f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/TestMemo.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/TestMemo.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/TestRuleIndex.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/TestRuleIndex.java
index f6e9593edcd5..3124c7ac2a2f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/TestRuleIndex.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/TestRuleIndex.java
@@ -24,17 +24,17 @@
 import io.trino.sql.planner.plan.ProjectNode;
 import io.trino.sql.planner.plan.ValuesNode;
 import io.trino.sql.tree.BooleanLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static io.trino.SessionTestUtils.TEST_SESSION;
-import static io.trino.metadata.AbstractMockMetadata.dummyMetadata;
+import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
 import static java.util.stream.Collectors.toSet;
 import static org.testng.Assert.assertEquals;
 
 public class TestRuleIndex
 {
-    private final PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), dummyMetadata(), TEST_SESSION);
+    private final PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), PLANNER_CONTEXT, TEST_SESSION);
 
     @Test
     public void testWithPlanNodeHierarchy()
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestAddIntermediateAggregations.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestAddIntermediateAggregations.java
index 297160b89322..dff2911f88d4 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestAddIntermediateAggregations.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestAddIntermediateAggregations.java
@@ -22,7 +22,7 @@
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.ExchangeNode;
 import io.trino.sql.tree.FunctionCall;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestApplyPreferredTableWriterPartitioning.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestApplyPreferredTableWriterPartitioning.java
deleted file mode 100644
index 82146a0c1817..000000000000
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestApplyPreferredTableWriterPartitioning.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Licensed 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 io.trino.sql.planner.iterative.rule;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import io.trino.Session;
-import io.trino.cost.PlanNodeStatsEstimate;
-import io.trino.cost.SymbolStatsEstimate;
-import io.trino.sql.planner.Partitioning;
-import io.trino.sql.planner.PartitioningScheme;
-import io.trino.sql.planner.Symbol;
-import io.trino.sql.planner.assertions.PlanMatchPattern;
-import io.trino.sql.planner.iterative.rule.test.RuleAssert;
-import io.trino.sql.planner.iterative.rule.test.RuleTester;
-import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.sql.planner.plan.ValuesNode;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import java.util.Optional;
-
-import static io.airlift.testing.Closeables.closeAllRuntimeException;
-import static io.trino.SystemSessionProperties.PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS;
-import static io.trino.SystemSessionProperties.USE_PREFERRED_WRITE_PARTITIONING;
-import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_HASH_DISTRIBUTION;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.tableWriter;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
-import static io.trino.sql.planner.iterative.rule.test.RuleTester.defaultRuleTester;
-import static io.trino.testing.TestingSession.testSessionBuilder;
-import static java.lang.Double.NaN;
-
-public class TestApplyPreferredTableWriterPartitioning
-{
-    private static final String MOCK_CATALOG = "mock_catalog";
-    private static final String TEST_SCHEMA = "test_schema";
-    private static final String NODE_ID = "mock";
-    private static final double NO_STATS = -1;
-
-    private static final Session SESSION_WITHOUT_PREFERRED_PARTITIONING = testSessionBuilder()
-            .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "false")
-            .setCatalog(MOCK_CATALOG)
-            .setSchema(TEST_SCHEMA)
-            .build();
-    private static final Session SESSION_WITH_PREFERRED_PARTITIONING_THRESHOLD_0 = testSessionBuilder()
-            .setCatalog(MOCK_CATALOG)
-            .setSchema(TEST_SCHEMA)
-            .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
-            .build();
-    private static final Session SESSION_WITH_PREFERRED_PARTITIONING_DEFAULT_THRESHOLD = testSessionBuilder()
-            .setCatalog(MOCK_CATALOG)
-            .setSchema(TEST_SCHEMA)
-            .build();
-
-    private static final PlanMatchPattern SUCCESSFUL_MATCH = tableWriter(
-            ImmutableList.of(),
-            ImmutableList.of(),
-            values(0));
-
-    private RuleTester tester;
-
-    @BeforeClass
-    public void setUp()
-    {
-        tester = defaultRuleTester();
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-    {
-        closeAllRuntimeException(tester);
-        tester = null;
-    }
-
-    @Test(dataProvider = "preferWritePartitioningDataProvider")
-    public void testPreferWritePartitioning(Session session, double distinctValuesStat, boolean match)
-    {
-        RuleAssert ruleAssert = assertPreferredPartitioning(
-                new PartitioningScheme(
-                        Partitioning.create(FIXED_HASH_DISTRIBUTION, ImmutableList.of(new Symbol("col_one"))),
-                        ImmutableList.of(new Symbol("col_one"))))
-                .withSession(session);
-        if (distinctValuesStat != NO_STATS) {
-            ruleAssert = ruleAssert.overrideStats(NODE_ID, PlanNodeStatsEstimate.builder()
-                    .addSymbolStatistics(ImmutableMap.of(
-                            new Symbol("col_one"),
-                            new SymbolStatsEstimate(0, 0, 0, 0, distinctValuesStat)))
-                    .build());
-        }
-        if (match) {
-            ruleAssert.matches(SUCCESSFUL_MATCH);
-        }
-        else {
-            ruleAssert.doesNotFire();
-        }
-    }
-
-    @DataProvider(name = "preferWritePartitioningDataProvider")
-    public Object[][] preferWritePartitioningDataProvider()
-    {
-        return new Object[][] {
-                new Object[] {SESSION_WITHOUT_PREFERRED_PARTITIONING, NO_STATS, false},
-                new Object[] {SESSION_WITHOUT_PREFERRED_PARTITIONING, NaN, false},
-                new Object[] {SESSION_WITHOUT_PREFERRED_PARTITIONING, 1, false},
-                new Object[] {SESSION_WITHOUT_PREFERRED_PARTITIONING, 50, false},
-                new Object[] {SESSION_WITH_PREFERRED_PARTITIONING_THRESHOLD_0, NO_STATS, true},
-                new Object[] {SESSION_WITH_PREFERRED_PARTITIONING_THRESHOLD_0, NaN, true},
-                new Object[] {SESSION_WITH_PREFERRED_PARTITIONING_THRESHOLD_0, 1, true},
-                new Object[] {SESSION_WITH_PREFERRED_PARTITIONING_THRESHOLD_0, 49, true},
-                new Object[] {SESSION_WITH_PREFERRED_PARTITIONING_THRESHOLD_0, 50, true},
-                new Object[] {SESSION_WITH_PREFERRED_PARTITIONING_DEFAULT_THRESHOLD, NO_STATS, false},
-                new Object[] {SESSION_WITH_PREFERRED_PARTITIONING_DEFAULT_THRESHOLD, NaN, false},
-                new Object[] {SESSION_WITH_PREFERRED_PARTITIONING_DEFAULT_THRESHOLD, 1, false},
-                new Object[] {SESSION_WITH_PREFERRED_PARTITIONING_DEFAULT_THRESHOLD, 49, false},
-                new Object[] {SESSION_WITH_PREFERRED_PARTITIONING_DEFAULT_THRESHOLD, 50, true},
-        };
-    }
-
-    @Test
-    public void testThresholdWithNullFraction()
-    {
-        // Null value in partition column should increase the number of partitions by 1
-        PlanNodeStatsEstimate stats = PlanNodeStatsEstimate.builder()
-                .addSymbolStatistics(ImmutableMap.of(new Symbol("col_one"), new SymbolStatsEstimate(0, 0, .5, 0, 49)))
-                .build();
-
-        assertPreferredPartitioning(new PartitioningScheme(
-                Partitioning.create(FIXED_HASH_DISTRIBUTION, ImmutableList.of(new Symbol("col_one"))),
-                ImmutableList.of(new Symbol("col_one"))))
-                .withSession(SESSION_WITH_PREFERRED_PARTITIONING_DEFAULT_THRESHOLD)
-                .overrideStats(NODE_ID, stats)
-                .matches(SUCCESSFUL_MATCH);
-    }
-
-    @Test
-    public void testThresholdWithMultiplePartitions()
-    {
-        PlanNodeStatsEstimate stats = PlanNodeStatsEstimate.builder()
-                .addSymbolStatistics(ImmutableMap.of(new Symbol("col_one"), new SymbolStatsEstimate(0, 0, 0, 0, 5)))
-                .addSymbolStatistics(ImmutableMap.of(new Symbol("col_two"), new SymbolStatsEstimate(0, 0, 0, 0, 10)))
-                .build();
-
-        assertPreferredPartitioning(new PartitioningScheme(
-                Partitioning.create(FIXED_HASH_DISTRIBUTION, ImmutableList.of(new Symbol("col_one"), new Symbol("col_two"))),
-                ImmutableList.of(new Symbol("col_one"), new Symbol("col_two"))))
-                .withSession(SESSION_WITH_PREFERRED_PARTITIONING_DEFAULT_THRESHOLD)
-                .overrideStats(NODE_ID, stats)
-                .matches(SUCCESSFUL_MATCH);
-    }
-
-    private RuleAssert assertPreferredPartitioning(PartitioningScheme preferredPartitioningScheme)
-    {
-        return tester.assertThat(new ApplyPreferredTableWriterPartitioning())
-                .on(builder -> builder.tableWriter(
-                        ImmutableList.of(),
-                        ImmutableList.of(),
-                        Optional.empty(),
-                        Optional.of(preferredPartitioningScheme),
-                        Optional.empty(),
-                        Optional.empty(),
-                        new ValuesNode(new PlanNodeId(NODE_ID), 0)));
-    }
-}
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestApplyTableScanRedirection.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestApplyTableScanRedirection.java
index b70ba458bb8b..0e2e030689a4 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestApplyTableScanRedirection.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestApplyTableScanRedirection.java
@@ -34,7 +34,7 @@
 import io.trino.sql.planner.iterative.rule.test.RuleTester;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.TestingTransactionHandle;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Optional;
@@ -45,6 +45,7 @@
 import static io.trino.spi.predicate.Domain.singleValue;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
@@ -52,7 +53,6 @@
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.tests.BogusType.BOGUS;
-import static io.trino.transaction.TransactionBuilder.transaction;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestApplyTableScanRedirection
@@ -91,6 +91,7 @@ public void testDoesNotFire()
         MockConnectorFactory mockFactory = createMockFactory(Optional.empty());
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(mockFactory).build()) {
             ruleTester.assertThat(new ApplyTableScanRedirection(ruleTester.getPlannerContext()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol column = p.symbol(SOURCE_COLUMN_NAME_A, VARCHAR);
                         return p.tableScan(
@@ -98,7 +99,6 @@ public void testDoesNotFire()
                                 ImmutableList.of(column),
                                 ImmutableMap.of(column, SOURCE_COLUMN_HANDLE_A));
                     })
-                    .withSession(MOCK_SESSION)
                     .doesNotFire();
         }
     }
@@ -112,6 +112,7 @@ public void testDoesNotFireForDeleteTableScan()
         MockConnectorFactory mockFactory = createMockFactory(Optional.of(applyTableScanRedirect));
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(mockFactory).build()) {
             ruleTester.assertThat(new ApplyTableScanRedirection(ruleTester.getPlannerContext()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol column = p.symbol(SOURCE_COLUMN_NAME_A, VARCHAR);
                         return p.tableScan(
@@ -120,7 +121,6 @@ public void testDoesNotFireForDeleteTableScan()
                                 ImmutableMap.of(column, SOURCE_COLUMN_HANDLE_A),
                                 true);
                     })
-                    .withSession(MOCK_SESSION)
                     .doesNotFire();
         }
     }
@@ -133,8 +133,8 @@ public void doesNotFireIfNoTableScan()
         MockConnectorFactory mockFactory = createMockFactory(Optional.of(applyTableScanRedirect));
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(mockFactory).build()) {
             ruleTester.assertThat(new ApplyTableScanRedirection(ruleTester.getPlannerContext()))
-                    .on(p -> p.values(p.symbol("a", BIGINT)))
                     .withSession(MOCK_SESSION)
+                    .on(p -> p.values(p.symbol("a", BIGINT)))
                     .doesNotFire();
         }
     }
@@ -148,6 +148,7 @@ public void testMismatchedTypesWithCoercion()
         MockConnectorFactory mockFactory = createMockFactory(Optional.of(applyTableScanRedirect));
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(mockFactory).build()) {
             ruleTester.assertThat(new ApplyTableScanRedirection(ruleTester.getPlannerContext()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol column = p.symbol(SOURCE_COLUMN_NAME_A, VARCHAR);
                         return p.tableScan(
@@ -155,7 +156,6 @@ public void testMismatchedTypesWithCoercion()
                                 ImmutableList.of(column),
                                 ImmutableMap.of(column, SOURCE_COLUMN_HANDLE_A));
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(
                             project(ImmutableMap.of("COL", expression("CAST(DEST_COL AS VARCHAR)")),
                                     tableScan(
@@ -174,12 +174,19 @@ public void testMismatchedTypesWithMissingCoercion()
         MockConnectorFactory mockFactory = createMockFactory(Optional.of(applyTableScanRedirect));
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(mockFactory).build()) {
             LocalQueryRunner runner = ruleTester.getQueryRunner();
-            transaction(runner.getTransactionManager(), runner.getAccessControl())
-                    .execute(MOCK_SESSION, session -> {
-                        assertThatThrownBy(() -> runner.createPlan(session, "SELECT source_col_a FROM test_table", WarningCollector.NOOP, createPlanOptimizersStatsCollector()))
-                                .isInstanceOf(TrinoException.class)
-                                .hasMessageMatching("Cast not possible from redirected column test-catalog.target_schema.target_table.destination_col_d with type Bogus to source column .*test-catalog.test_schema.test_table.*source_col_a.* with type: varchar");
-                    });
+            runner.inTransaction(MOCK_SESSION, transactionSession -> {
+                assertThatThrownBy(() ->
+                        runner.createPlan(
+                                transactionSession,
+                                "SELECT source_col_a FROM test_table",
+                                runner.getPlanOptimizers(true),
+                                OPTIMIZED_AND_VALIDATED,
+                                WarningCollector.NOOP,
+                                createPlanOptimizersStatsCollector()))
+                        .isInstanceOf(TrinoException.class)
+                        .hasMessageMatching("Cast not possible from redirected column test-catalog.target_schema.target_table.destination_col_d with type Bogus to source column .*test-catalog.test_schema.test_table.*source_col_a.* with type: varchar");
+                return null;
+            });
         }
     }
 
@@ -192,6 +199,7 @@ public void testApplyTableScanRedirection()
         MockConnectorFactory mockFactory = createMockFactory(Optional.of(applyTableScanRedirect));
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(mockFactory).build()) {
             ruleTester.assertThat(new ApplyTableScanRedirection(ruleTester.getPlannerContext()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol column = p.symbol(SOURCE_COLUMN_NAME_A, VARCHAR);
                         return p.tableScan(
@@ -199,7 +207,6 @@ public void testApplyTableScanRedirection()
                                 ImmutableList.of(column),
                                 ImmutableMap.of(column, SOURCE_COLUMN_HANDLE_A));
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(
                             tableScan(
                                     new MockConnectorTableHandle(DESTINATION_TABLE)::equals,
@@ -223,6 +230,7 @@ public void testApplyTableScanRedirectionWithFilter()
             TupleDomain<ColumnHandle> constraint = TupleDomain.withColumnDomains(
                     ImmutableMap.of(SOURCE_COLUMN_HANDLE_A, singleValue(VARCHAR, utf8Slice("foo"))));
             ruleTester.assertThat(applyTableScanRedirection)
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol column = p.symbol(SOURCE_COLUMN_NAME_A, VARCHAR);
                         return p.tableScan(
@@ -231,7 +239,6 @@ public void testApplyTableScanRedirectionWithFilter()
                                 ImmutableMap.of(column, SOURCE_COLUMN_HANDLE_A),
                                 constraint);
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(
                             filter(
                                     "DEST_COL = VARCHAR 'foo'",
@@ -241,6 +248,7 @@ public void testApplyTableScanRedirectionWithFilter()
                                             ImmutableMap.of("DEST_COL", DESTINATION_COLUMN_HANDLE_A::equals))));
 
             ruleTester.assertThat(applyTableScanRedirection)
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol column = p.symbol(SOURCE_COLUMN_NAME_B, VARCHAR);
                         return p.tableScan(
@@ -249,7 +257,6 @@ public void testApplyTableScanRedirectionWithFilter()
                                 ImmutableMap.of(column, SOURCE_COLUMN_HANDLE_B), // predicate on non-projected column
                                 TupleDomain.all());
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(
                             project(
                                     ImmutableMap.of("expr", expression("DEST_COL_B")),
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestArraySortAfterArrayDistinct.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestArraySortAfterArrayDistinct.java
index 686d7f81e4c7..af6c060e9a3d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestArraySortAfterArrayDistinct.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestArraySortAfterArrayDistinct.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.tree.Expression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -57,6 +57,6 @@ private void test(String original, String rewritten)
 
     private Expression expression(String sql)
     {
-        return ExpressionTestUtils.planExpression(tester().getPlannerContext(), tester().getSession(), TypeProvider.empty(), PlanBuilder.expression(sql));
+        return ExpressionTestUtils.planExpression(tester().getQueryRunner().getTransactionManager(), tester().getPlannerContext(), tester().getSession(), TypeProvider.empty(), PlanBuilder.expression(sql));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestCanonicalizeExpressionRewriter.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestCanonicalizeExpressionRewriter.java
index 77210f64fec0..cfa726c2bbad 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestCanonicalizeExpressionRewriter.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestCanonicalizeExpressionRewriter.java
@@ -13,6 +13,7 @@
  */
 package io.trino.sql.planner.iterative.rule;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.type.Type;
@@ -22,9 +23,11 @@
 import io.trino.sql.planner.TypeProvider;
 import io.trino.sql.planner.assertions.SymbolAliases;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -32,6 +35,7 @@
 import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
 import static io.trino.spi.type.VarcharType.createVarcharType;
 import static io.trino.sql.ExpressionTestUtils.assertExpressionEquals;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
 import static io.trino.sql.planner.iterative.rule.CanonicalizeExpressionRewriter.rewrite;
@@ -109,17 +113,30 @@ public void testTypedLiteral()
     @Test
     public void testCanonicalizeRewriteDateFunctionToCast()
     {
-        assertRewritten("date(ts)", "CAST(ts as DATE)");
-        assertRewritten("date(tstz)", "CAST(tstz as DATE)");
-        assertRewritten("date(v)", "CAST(v as DATE)");
+        assertCanonicalizedDate(createTimestampType(3), "ts");
+        assertCanonicalizedDate(createTimestampWithTimeZoneType(3), "tstz");
+        assertCanonicalizedDate(createVarcharType(100), "v");
+    }
+
+    private static void assertCanonicalizedDate(Type type, String symbolName)
+    {
+        FunctionCall date = new FunctionCall(
+                PLANNER_CONTEXT.getMetadata().resolveBuiltinFunction("date", fromTypes(type)).toQualifiedName(),
+                ImmutableList.of(new SymbolReference(symbolName)));
+        assertRewritten(date, "CAST(" + symbolName + " as DATE)");
     }
 
     private static void assertRewritten(String from, String to)
+    {
+        assertRewritten(PlanBuilder.expression(from), to);
+    }
+
+    private static void assertRewritten(Expression from, String to)
     {
         assertExpressionEquals(
-                transaction(TRANSACTION_MANAGER, ACCESS_CONTROL).execute(TEST_SESSION, transactedSession -> {
+                transaction(TRANSACTION_MANAGER, PLANNER_CONTEXT.getMetadata(), ACCESS_CONTROL).execute(TEST_SESSION, transactedSession -> {
                     return rewrite(
-                            PlanBuilder.expression(from),
+                            from,
                             transactedSession,
                             PLANNER_CONTEXT,
                             TYPE_ANALYZER,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestCanonicalizeExpressions.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestCanonicalizeExpressions.java
index aa0bcd876289..6b2ec646fc86 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestCanonicalizeExpressions.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestCanonicalizeExpressions.java
@@ -14,7 +14,7 @@
 package io.trino.sql.planner.iterative.rule;
 
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
 import static io.trino.sql.tree.BooleanLiteral.FALSE_LITERAL;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDecorrelateInnerUnnestWithGlobalAggregation.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDecorrelateInnerUnnestWithGlobalAggregation.java
index de8254904d3d..5d91f94abfb9 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDecorrelateInnerUnnestWithGlobalAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDecorrelateInnerUnnestWithGlobalAggregation.java
@@ -15,15 +15,20 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.UnnestNode;
-import org.testng.annotations.Test;
+import io.trino.sql.tree.FunctionCall;
+import io.trino.sql.tree.StringLiteral;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
 import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.UnnestMapping.unnestMapping;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.aggregation;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.assignUniqueId;
@@ -237,7 +242,7 @@ public void testMultipleGlobalAggregations()
                         project(
                                 aggregation(
                                         singleGroupingSet("unique", "corr"),
-                                        ImmutableMap.of(Optional.of("arbitrary"), functionCall("arbitrary", ImmutableList.of("sum"))),
+                                        ImmutableMap.of(Optional.of("any_value"), functionCall("any_value", ImmutableList.of("sum"))),
                                         ImmutableList.of(),
                                         ImmutableList.of(),
                                         Optional.empty(),
@@ -305,21 +310,28 @@ public void testProjectOverGlobalAggregation()
     public void testPreprojectUnnestSymbol()
     {
         tester().assertThat(new DecorrelateInnerUnnestWithGlobalAggregation())
-                .on(p -> p.correlatedJoin(
-                        ImmutableList.of(p.symbol("corr")),
-                        p.values(p.symbol("corr")),
-                        p.aggregation(builder -> builder
-                                .globalGrouping()
-                                .addAggregation(p.symbol("max"), PlanBuilder.expression("max(unnested_corr)"), ImmutableList.of(BIGINT))
-                                .source(p.unnest(
-                                        ImmutableList.of(),
-                                        ImmutableList.of(new UnnestNode.Mapping(p.symbol("char_array"), ImmutableList.of(p.symbol("unnested_corr")))),
-                                        Optional.empty(),
-                                        INNER,
-                                        Optional.empty(),
-                                        p.project(
-                                                Assignments.of(p.symbol("char_array"), PlanBuilder.expression("regexp_extract_all(corr, '.')")),
-                                                p.values(ImmutableList.of(), ImmutableList.of(ImmutableList.of()))))))))
+                .on(p -> {
+                    Symbol corr = p.symbol("corr", VARCHAR);
+                    FunctionCall regexpExtractAll = new FunctionCall(
+                            tester().getMetadata().resolveBuiltinFunction("regexp_extract_all", fromTypes(VARCHAR, VARCHAR)).toQualifiedName(),
+                            ImmutableList.of(corr.toSymbolReference(), new StringLiteral(".")));
+
+                    return p.correlatedJoin(
+                            ImmutableList.of(corr),
+                            p.values(corr),
+                            p.aggregation(builder -> builder
+                                    .globalGrouping()
+                                    .addAggregation(p.symbol("max"), PlanBuilder.expression("max(unnested_corr)"), ImmutableList.of(BIGINT))
+                                    .source(p.unnest(
+                                            ImmutableList.of(),
+                                            ImmutableList.of(new UnnestNode.Mapping(p.symbol("char_array"), ImmutableList.of(p.symbol("unnested_corr")))),
+                                            Optional.empty(),
+                                            INNER,
+                                            Optional.empty(),
+                                            p.project(
+                                                    Assignments.of(p.symbol("char_array"), regexpExtractAll),
+                                                    p.values(ImmutableList.of(), ImmutableList.of(ImmutableList.of())))))));
+                })
                 .matches(
                         project(
                                 aggregation(
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDecorrelateLeftUnnestWithGlobalAggregation.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDecorrelateLeftUnnestWithGlobalAggregation.java
index 8c79ba738910..11296c2a4ef9 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDecorrelateLeftUnnestWithGlobalAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDecorrelateLeftUnnestWithGlobalAggregation.java
@@ -15,15 +15,20 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.UnnestNode;
-import org.testng.annotations.Test;
+import io.trino.sql.tree.FunctionCall;
+import io.trino.sql.tree.StringLiteral;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
 import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.UnnestMapping.unnestMapping;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.aggregation;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.assignUniqueId;
@@ -225,7 +230,7 @@ public void testMultipleGlobalAggregations()
                         project(
                                 aggregation(
                                         singleGroupingSet("unique", "corr"),
-                                        ImmutableMap.of(Optional.of("arbitrary"), functionCall("arbitrary", ImmutableList.of("sum"))),
+                                        ImmutableMap.of(Optional.of("any_value"), functionCall("any_value", ImmutableList.of("sum"))),
                                         ImmutableList.of(),
                                         Optional.empty(),
                                         SINGLE,
@@ -286,21 +291,28 @@ public void testProjectOverGlobalAggregation()
     public void testPreprojectUnnestSymbol()
     {
         tester().assertThat(new DecorrelateLeftUnnestWithGlobalAggregation())
-                .on(p -> p.correlatedJoin(
-                        ImmutableList.of(p.symbol("corr")),
-                        p.values(p.symbol("corr")),
-                        p.aggregation(builder -> builder
-                                .globalGrouping()
-                                .addAggregation(p.symbol("max"), PlanBuilder.expression("max(unnested_char)"), ImmutableList.of(BIGINT))
-                                .source(p.unnest(
-                                        ImmutableList.of(),
-                                        ImmutableList.of(new UnnestNode.Mapping(p.symbol("char_array"), ImmutableList.of(p.symbol("unnested_char")))),
-                                        Optional.empty(),
-                                        LEFT,
-                                        Optional.empty(),
-                                        p.project(
-                                                Assignments.of(p.symbol("char_array"), PlanBuilder.expression("regexp_extract_all(corr, '.')")),
-                                                p.values(ImmutableList.of(), ImmutableList.of(ImmutableList.of()))))))))
+                .on(p -> {
+                    Symbol corr = p.symbol("corr", VARCHAR);
+                    FunctionCall regexpExtractAll = new FunctionCall(
+                            tester().getMetadata().resolveBuiltinFunction("regexp_extract_all", fromTypes(VARCHAR, VARCHAR)).toQualifiedName(),
+                            ImmutableList.of(corr.toSymbolReference(), new StringLiteral(".")));
+
+                    return p.correlatedJoin(
+                            ImmutableList.of(corr),
+                            p.values(corr),
+                            p.aggregation(builder -> builder
+                                    .globalGrouping()
+                                    .addAggregation(p.symbol("max"), PlanBuilder.expression("max(unnested_char)"), ImmutableList.of(BIGINT))
+                                    .source(p.unnest(
+                                            ImmutableList.of(),
+                                            ImmutableList.of(new UnnestNode.Mapping(p.symbol("char_array"), ImmutableList.of(p.symbol("unnested_char")))),
+                                            Optional.empty(),
+                                            LEFT,
+                                            Optional.empty(),
+                                            p.project(
+                                                    Assignments.of(p.symbol("char_array"), regexpExtractAll),
+                                                    p.values(ImmutableList.of(), ImmutableList.of(ImmutableList.of())))))));
+                })
                 .matches(
                         project(
                                 aggregation(
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDecorrelateUnnest.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDecorrelateUnnest.java
index f421538016ca..51370f90f181 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDecorrelateUnnest.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDecorrelateUnnest.java
@@ -15,17 +15,22 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.assertions.RowNumberSymbolMatcher;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.CorrelatedJoinNode;
 import io.trino.sql.planner.plan.UnnestNode;
-import org.testng.annotations.Test;
+import io.trino.sql.tree.FunctionCall;
+import io.trino.sql.tree.StringLiteral;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
 import static io.trino.spi.connector.SortOrder.ASC_NULLS_FIRST;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.UnnestMapping.unnestMapping;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.assignUniqueId;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
@@ -201,7 +206,7 @@ public void testEnforceSingleRow()
                         project(// restore semantics of INNER unnest after it was rewritten to LEFT
                                 ImmutableMap.of("corr", expression("corr"), "unnested_corr", expression("IF((ordinality IS NULL), CAST(null AS bigint), unnested_corr)")),
                                 filter(
-                                        "IF((row_number > BIGINT '1'), CAST(\"@fail@52QIVV94JMEG607IGOBHL05P1613CN1P9T92HEMH7BITOAOHO6M5DJCDG6AVS0EF51Q4I3398DN9SEQVJ68ED8D9AA82LGAE01OA96R7FI8O05GF5V71FKQKBAP7GSQ55HDD19GI0FESCSJFDP48HV1S2NABNSUSOP897D7E08301TKKLOLOGECE3MO5MF6NVBB4I1GJJ9N18===\"(INTEGER '28', VARCHAR 'Scalar sub-query has returned multiple rows') AS boolean), true)",
+                                        "IF((row_number > BIGINT '1'), CAST(fail(INTEGER '28', VARCHAR 'Scalar sub-query has returned multiple rows') AS boolean), true)",
                                         rowNumber(
                                                 builder -> builder
                                                         .partitionBy(ImmutableList.of("unique"))
@@ -416,7 +421,7 @@ public void testDifferentNodesInSubquery()
                 .matches(
                         project(
                                 filter(// enforce single row
-                                        "IF((row_number > BIGINT '1'), CAST(\"@fail@52QIVV94JMEG607IGOBHL05P1613CN1P9T92HEMH7BITOAOHO6M5DJCDG6AVS0EF51Q4I3398DN9SEQVJ68ED8D9AA82LGAE01OA96R7FI8O05GF5V71FKQKBAP7GSQ55HDD19GI0FESCSJFDP48HV1S2NABNSUSOP897D7E08301TKKLOLOGECE3MO5MF6NVBB4I1GJJ9N18===\"(INTEGER '28', VARCHAR 'Scalar sub-query has returned multiple rows') AS boolean), true)",
+                                        "IF((row_number > BIGINT '1'), CAST(fail(INTEGER '28', VARCHAR 'Scalar sub-query has returned multiple rows') AS boolean), true)",
                                         project(// second projection
                                                 ImmutableMap.of("corr", expression("corr"), "unique", expression("unique"), "ordinality", expression("ordinality"), "row_number", expression("row_number"), "integer_result", expression("IF(boolean_result, 1, -1)")),
                                                 filter(// limit
@@ -472,20 +477,27 @@ public void testWithPreexistingOrdinality()
     public void testPreprojectUnnestSymbol()
     {
         tester().assertThat(new DecorrelateUnnest(tester().getMetadata()))
-                .on(p -> p.correlatedJoin(
-                        ImmutableList.of(p.symbol("corr")),
-                        p.values(p.symbol("corr")),
-                        CorrelatedJoinNode.Type.LEFT,
-                        TRUE_LITERAL,
-                        p.unnest(
-                                ImmutableList.of(),
-                                ImmutableList.of(new UnnestNode.Mapping(p.symbol("char_array"), ImmutableList.of(p.symbol("unnested_char")))),
-                                Optional.empty(),
-                                LEFT,
-                                Optional.empty(),
-                                p.project(
-                                        Assignments.of(p.symbol("char_array"), PlanBuilder.expression("regexp_extract_all(corr, '.')")),
-                                        p.values(ImmutableList.of(), ImmutableList.of(ImmutableList.of()))))))
+                .on(p -> {
+                    Symbol corr = p.symbol("corr", VARCHAR);
+                    FunctionCall regexpExtractAll = new FunctionCall(
+                            tester().getMetadata().resolveBuiltinFunction("regexp_extract_all", fromTypes(VARCHAR, VARCHAR)).toQualifiedName(),
+                            ImmutableList.of(corr.toSymbolReference(), new StringLiteral(".")));
+
+                    return p.correlatedJoin(
+                            ImmutableList.of(corr),
+                            p.values(corr),
+                            CorrelatedJoinNode.Type.LEFT,
+                            TRUE_LITERAL,
+                            p.unnest(
+                                    ImmutableList.of(),
+                                    ImmutableList.of(new UnnestNode.Mapping(p.symbol("char_array"), ImmutableList.of(p.symbol("unnested_char")))),
+                                    Optional.empty(),
+                                    LEFT,
+                                    Optional.empty(),
+                                    p.project(
+                                            Assignments.of(p.symbol("char_array"), regexpExtractAll),
+                                            p.values(ImmutableList.of(), ImmutableList.of(ImmutableList.of())))));
+                })
                 .matches(
                         project(
                                 unnest(
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDetermineJoinDistributionType.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDetermineJoinDistributionType.java
index 5e0e01bf5190..418d2461ce7b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDetermineJoinDistributionType.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDetermineJoinDistributionType.java
@@ -25,7 +25,7 @@
 import io.trino.sql.planner.PlanNodeIdAllocator;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
-import io.trino.sql.planner.iterative.rule.test.RuleAssert;
+import io.trino.sql.planner.iterative.rule.test.RuleBuilder;
 import io.trino.sql.planner.iterative.rule.test.RuleTester;
 import io.trino.sql.planner.plan.FilterNode;
 import io.trino.sql.planner.plan.JoinNode;
@@ -37,9 +37,10 @@
 import io.trino.sql.planner.plan.UnnestNode;
 import io.trino.sql.planner.plan.ValuesNode;
 import io.trino.testing.TestingMetadata.TestingColumnHandle;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Optional;
 
@@ -64,9 +65,10 @@
 import static io.trino.sql.planner.plan.JoinNode.Type.RIGHT;
 import static io.trino.sql.tree.BooleanLiteral.TRUE_LITERAL;
 import static java.lang.Double.NaN;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestDetermineJoinDistributionType
 {
     private static final CostComparator COST_COMPARATOR = new CostComparator(1, 1, 1);
@@ -74,7 +76,7 @@ public class TestDetermineJoinDistributionType
 
     private RuleTester tester;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         tester = RuleTester.builder()
@@ -82,7 +84,7 @@ public void setUp()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         tester.close();
@@ -108,6 +110,7 @@ public void testDetermineDistributionTypeForLeftOuter()
     private void testDetermineDistributionType(JoinDistributionType sessionDistributedJoin, Type joinType, DistributionType expectedDistribution)
     {
         assertDetermineJoinDistributionType()
+                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, sessionDistributedJoin.name())
                 .on(p ->
                         p.join(
                                 joinType,
@@ -117,7 +120,6 @@ private void testDetermineDistributionType(JoinDistributionType sessionDistribut
                                 ImmutableList.of(p.symbol("A1", BIGINT)),
                                 ImmutableList.of(p.symbol("B1", BIGINT)),
                                 Optional.empty()))
-                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, sessionDistributedJoin.name())
                 .matches(
                         join(joinType, builder -> builder
                                 .equiCriteria("B1", "A1")
@@ -140,6 +142,7 @@ public void testRepartitionRightOuter()
     private void testRepartitionRightOuter(JoinDistributionType sessionDistributedJoin, Type joinType)
     {
         assertDetermineJoinDistributionType()
+                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, sessionDistributedJoin.name())
                 .on(p ->
                         p.join(
                                 joinType,
@@ -149,7 +152,6 @@ private void testRepartitionRightOuter(JoinDistributionType sessionDistributedJo
                                 ImmutableList.of(p.symbol("A1", BIGINT)),
                                 ImmutableList.of(p.symbol("B1", BIGINT)),
                                 Optional.empty()))
-                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, sessionDistributedJoin.name())
                 .matches(
                         join(joinType, builder -> builder
                                 .equiCriteria("A1", "B1")
@@ -162,6 +164,7 @@ private void testRepartitionRightOuter(JoinDistributionType sessionDistributedJo
     public void testReplicateScalar()
     {
         assertDetermineJoinDistributionType()
+                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.PARTITIONED.name())
                 .on(p ->
                         p.join(
                                 INNER,
@@ -172,7 +175,6 @@ public void testReplicateScalar()
                                 ImmutableList.of(p.symbol("A1", BIGINT)),
                                 ImmutableList.of(p.symbol("B1", BIGINT)),
                                 Optional.empty()))
-                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.PARTITIONED.name())
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("A1", "B1")
@@ -191,6 +193,7 @@ public void testReplicateNoEquiCriteria()
     private void testReplicateNoEquiCriteria(Type joinType)
     {
         assertDetermineJoinDistributionType()
+                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.PARTITIONED.name())
                 .on(p ->
                         p.join(
                                 joinType,
@@ -200,7 +203,6 @@ private void testReplicateNoEquiCriteria(Type joinType)
                                 ImmutableList.of(p.symbol("A1", BIGINT)),
                                 ImmutableList.of(p.symbol("B1", BIGINT)),
                                 Optional.of(expression("A1 * B1 > 100"))))
-                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.PARTITIONED.name())
                 .matches(
                         join(joinType, builder -> builder
                                 .filter("A1 * B1 > 100")
@@ -306,7 +308,7 @@ public void testPartitionWhenRequiredBySession()
         int aRows = 100;
         int bRows = 10_000;
         assertDetermineJoinDistributionType()
-                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.AUTOMATIC.name())
+                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.PARTITIONED.name())
                 .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
                         .setOutputRowCount(aRows)
                         .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 6400, 100)))
@@ -327,7 +329,6 @@ public void testPartitionWhenRequiredBySession()
                             ImmutableList.of(b1),
                             Optional.empty());
                 })
-                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.PARTITIONED.name())
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("B1", "A1")
@@ -375,7 +376,7 @@ public void testReplicatesWhenRequiredBySession()
         int aRows = 10_000;
         int bRows = 10_000;
         assertDetermineJoinDistributionType()
-                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.AUTOMATIC.name())
+                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.BROADCAST.name())
                 .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
                         .setOutputRowCount(aRows)
                         .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
@@ -396,7 +397,6 @@ public void testReplicatesWhenRequiredBySession()
                             ImmutableList.of(b1),
                             Optional.empty());
                 })
-                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.BROADCAST.name())
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("A1", "B1")
@@ -897,7 +897,7 @@ public void testFlipWhenSizeDifferenceLarge()
     @Test
     public void testGetSourceTablesSizeInBytes()
     {
-        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), tester.getMetadata(), tester.getSession());
+        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), tester.getPlannerContext(), tester.getSession());
         Symbol symbol = planBuilder.symbol("col");
         Symbol sourceSymbol1 = planBuilder.symbol("source1");
         Symbol sourceSymbol2 = planBuilder.symbol("soruce2");
@@ -973,7 +973,7 @@ public void testGetSourceTablesSizeInBytes()
     @Test
     public void testGetApproximateSourceSizeInBytes()
     {
-        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), tester.getMetadata(), tester.getSession());
+        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), tester.getPlannerContext(), tester.getSession());
         Symbol symbol = planBuilder.symbol("col");
         Symbol sourceSymbol1 = planBuilder.symbol("source1");
         Symbol sourceSymbol2 = planBuilder.symbol("source2");
@@ -1127,12 +1127,12 @@ public void testGetApproximateSourceSizeInBytes()
                 NaN);
     }
 
-    private RuleAssert assertDetermineJoinDistributionType()
+    private RuleBuilder assertDetermineJoinDistributionType()
     {
         return assertDetermineJoinDistributionType(COST_COMPARATOR);
     }
 
-    private RuleAssert assertDetermineJoinDistributionType(CostComparator costComparator)
+    private RuleBuilder assertDetermineJoinDistributionType(CostComparator costComparator)
     {
         return tester.assertThat(new DetermineJoinDistributionType(costComparator, new TaskCountEstimator(() -> NODES_COUNT)));
     }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDetermineSemiJoinDistributionType.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDetermineSemiJoinDistributionType.java
index d446fa826afe..8681c1830222 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDetermineSemiJoinDistributionType.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDetermineSemiJoinDistributionType.java
@@ -22,12 +22,13 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.OptimizerConfig.JoinDistributionType;
 import io.trino.sql.planner.Symbol;
-import io.trino.sql.planner.iterative.rule.test.RuleAssert;
+import io.trino.sql.planner.iterative.rule.test.RuleBuilder;
 import io.trino.sql.planner.iterative.rule.test.RuleTester;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Optional;
 
@@ -42,8 +43,9 @@
 import static io.trino.sql.planner.plan.SemiJoinNode.DistributionType.PARTITIONED;
 import static io.trino.sql.planner.plan.SemiJoinNode.DistributionType.REPLICATED;
 import static io.trino.sql.tree.BooleanLiteral.TRUE_LITERAL;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestDetermineSemiJoinDistributionType
 {
     private static final CostComparator COST_COMPARATOR = new CostComparator(1, 1, 1);
@@ -51,7 +53,7 @@ public class TestDetermineSemiJoinDistributionType
 
     private RuleTester tester;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         tester = RuleTester.builder()
@@ -59,7 +61,7 @@ public void setUp()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         tester.close();
@@ -357,12 +359,12 @@ public void testReplicatesWhenSourceIsSmall()
                         filter("true", values(ImmutableMap.of("B1", 0)))));
     }
 
-    private RuleAssert assertDetermineSemiJoinDistributionType()
+    private RuleBuilder assertDetermineSemiJoinDistributionType()
     {
         return assertDetermineSemiJoinDistributionType(COST_COMPARATOR);
     }
 
-    private RuleAssert assertDetermineSemiJoinDistributionType(CostComparator costComparator)
+    private RuleBuilder assertDetermineSemiJoinDistributionType(CostComparator costComparator)
     {
         return tester.assertThat(new DetermineSemiJoinDistributionType(costComparator, new TaskCountEstimator(() -> NODES_COUNT)));
     }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDetermineTableScanNodePartitioning.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDetermineTableScanNodePartitioning.java
index 7a167e0ff899..f2ae09d0ab6a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDetermineTableScanNodePartitioning.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestDetermineTableScanNodePartitioning.java
@@ -28,9 +28,10 @@
 import io.trino.sql.planner.iterative.rule.test.RuleTester;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.TableScanNode;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.airlift.testing.Closeables.closeAllRuntimeException;
 import static io.trino.sql.planner.TestTableScanNodePartitioning.BUCKET_COUNT;
@@ -48,12 +49,14 @@
 import static io.trino.sql.planner.TestTableScanNodePartitioning.createMockFactory;
 import static io.trino.sql.planner.assertions.MatchResult.NO_MATCH;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDetermineTableScanNodePartitioning
 {
     private RuleTester tester;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         tester = RuleTester.builder()
@@ -61,7 +64,7 @@ public void setUp()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         closeAllRuntimeException(tester);
@@ -138,6 +141,7 @@ private void testPlanWithTableNodePartitioning(
     {
         TableHandle tableHandle = tester.getCurrentCatalogTableHandle(TEST_SCHEMA, tableName);
         tester.assertThat(new DetermineTableScanNodePartitioning(tester.getMetadata(), tester.getQueryRunner().getNodePartitioningManager(), new TaskCountEstimator(() -> numberOfTasks)))
+                .withSession(session)
                 .on(p -> {
                     Symbol a = p.symbol(COLUMN_A);
                     Symbol b = p.symbol(COLUMN_B);
@@ -146,7 +150,6 @@ private void testPlanWithTableNodePartitioning(
                             ImmutableList.of(a, b),
                             ImmutableMap.of(a, COLUMN_HANDLE_A, b, COLUMN_HANDLE_B));
                 })
-                .withSession(session)
                 .matches(
                         tableScan(
                                 tableHandle.getConnectorHandle()::equals,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestEliminateCrossJoins.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestEliminateCrossJoins.java
index 0bee8fb3d5e4..bc81568fc566 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestEliminateCrossJoins.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestEliminateCrossJoins.java
@@ -34,7 +34,7 @@
 import io.trino.sql.tree.ArithmeticUnaryExpression;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -60,7 +60,6 @@
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
 public class TestEliminateCrossJoins
         extends BaseRuleTest
 {
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestEvaluateEmptyIntersect.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestEvaluateEmptyIntersect.java
index 6ce78b5fe667..01d6edeea89a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestEvaluateEmptyIntersect.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestEvaluateEmptyIntersect.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableListMultimap;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestEvaluateZeroSample.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestEvaluateZeroSample.java
index b2027eec9b2a..47dc54a7c869 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestEvaluateZeroSample.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestEvaluateZeroSample.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.SampleNode.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 import static io.trino.sql.planner.iterative.rule.test.PlanBuilder.expression;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestExpressionRewriteRuleSet.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestExpressionRewriteRuleSet.java
index 2c0ef2fc4461..84aff40e390d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestExpressionRewriteRuleSet.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestExpressionRewriteRuleSet.java
@@ -27,14 +27,14 @@
 import io.trino.sql.tree.ExpressionTreeRewriter;
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.LongLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.QueryUtil.functionCall;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.patternRecognition;
@@ -88,7 +88,7 @@ public void testProjectionExpressionNotRewritten()
     public void testAggregationExpressionRewrite()
     {
         ExpressionRewriteRuleSet functionCallRewriter = new ExpressionRewriteRuleSet((expression, context) -> functionResolution
-                .functionCallBuilder(QualifiedName.of("count"))
+                .functionCallBuilder("count")
                 .addArgument(VARCHAR, new SymbolReference("y"))
                 .build());
         tester().assertThat(functionCallRewriter.aggregationExpressionRewrite())
@@ -96,19 +96,13 @@ public void testAggregationExpressionRewrite()
                         .globalGrouping()
                         .addAggregation(
                                 p.symbol("count_1", BigintType.BIGINT),
-                                functionResolution
-                                        .functionCallBuilder(QualifiedName.of("count"))
-                                        .addArgument(VARCHAR, new SymbolReference("x"))
-                                        .build(),
+                                functionCall("count", new SymbolReference("x")),
                                 ImmutableList.of(BigintType.BIGINT))
                         .source(
                                 p.values(p.symbol("x"), p.symbol("y")))))
                 .matches(
                         PlanMatchPattern.aggregation(
-                                ImmutableMap.of("count_1", aliases -> functionResolution
-                                        .functionCallBuilder(QualifiedName.of("count"))
-                                        .addArgument(VARCHAR, new SymbolReference("y"))
-                                        .build()),
+                                ImmutableMap.of("count_1", PlanMatchPattern.functionCall("count", ImmutableList.of("y"))),
                                 values("x", "y")));
     }
 
@@ -116,7 +110,7 @@ public void testAggregationExpressionRewrite()
     public void testAggregationExpressionNotRewritten()
     {
         FunctionCall nowCall = functionResolution
-                .functionCallBuilder(QualifiedName.of("now"))
+                .functionCallBuilder("now")
                 .build();
         ExpressionRewriteRuleSet functionCallRewriter = new ExpressionRewriteRuleSet((expression, context) -> nowCall);
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestGetSourceTablesRowCount.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestGetSourceTablesRowCount.java
index 6bb4eb40040b..51862641dd67 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestGetSourceTablesRowCount.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestGetSourceTablesRowCount.java
@@ -26,12 +26,12 @@
 import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.sql.planner.plan.ValuesNode;
 import io.trino.testing.TestingMetadata.TestingColumnHandle;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
 import static io.trino.cost.PlanNodeStatsEstimate.unknown;
-import static io.trino.metadata.AbstractMockMetadata.dummyMetadata;
+import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
 import static io.trino.sql.planner.iterative.Lookup.noLookup;
 import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
 import static io.trino.testing.TestingSession.testSessionBuilder;
@@ -107,7 +107,7 @@ private double getSourceTablesRowCount(PlanNode planNode)
 
     private PlanBuilder planBuilder()
     {
-        return new PlanBuilder(new PlanNodeIdAllocator(), dummyMetadata(), testSessionBuilder().build());
+        return new PlanBuilder(new PlanNodeIdAllocator(), PLANNER_CONTEXT, testSessionBuilder().build());
     }
 
     private static StatsProvider testStatsProvider()
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementExceptAll.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementExceptAll.java
index 1e4bae7b0e4f..ad9e32371628 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementExceptAll.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementExceptAll.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.assertions.SetOperationOutputMatcher;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementExceptDistinctAsUnion.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementExceptDistinctAsUnion.java
index 97cc10e6e9cd..1607a9093101 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementExceptDistinctAsUnion.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementExceptDistinctAsUnion.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.FilterNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementFilteredAggregations.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementFilteredAggregations.java
index 4cfe990977e8..458c2a8eee8b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementFilteredAggregations.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementFilteredAggregations.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementIntersectAll.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementIntersectAll.java
index a07a44cda387..2dcdfb10b162 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementIntersectAll.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementIntersectAll.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.assertions.SetOperationOutputMatcher;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementIntersectDistinctAsUnion.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementIntersectDistinctAsUnion.java
index 819011d28f39..f67ce3cce61c 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementIntersectDistinctAsUnion.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementIntersectDistinctAsUnion.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.FilterNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementLimitWithTies.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementLimitWithTies.java
index f4cb445898b3..e3c4ff121c94 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementLimitWithTies.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementLimitWithTies.java
@@ -18,7 +18,7 @@
 import io.trino.spi.connector.SortOrder;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementOffset.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementOffset.java
index a77cd8ca9309..d2abe512d0a6 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementOffset.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementOffset.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.assertions.RowNumberSymbolMatcher;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementTableFunctionSource.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementTableFunctionSource.java
index 5c027cb349bf..1bcf6cef8cec 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementTableFunctionSource.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestImplementTableFunctionSource.java
@@ -25,7 +25,7 @@
 import io.trino.sql.planner.plan.TableFunctionNode.PassThroughColumn;
 import io.trino.sql.planner.plan.TableFunctionNode.PassThroughSpecification;
 import io.trino.sql.planner.plan.TableFunctionNode.TableArgumentProperties;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestInlineProjectIntoFilter.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestInlineProjectIntoFilter.java
index 96bf2970de79..1deb251a7555 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestInlineProjectIntoFilter.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestInlineProjectIntoFilter.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestInlineProjections.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestInlineProjections.java
index e1da6ea7ab77..aa8129b7a2ee 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestInlineProjections.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestInlineProjections.java
@@ -22,7 +22,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.tree.Literal;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestJoinEnumerator.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestJoinEnumerator.java
index 23703efc7520..a2b8c2e58a92 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestJoinEnumerator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestJoinEnumerator.java
@@ -35,9 +35,10 @@
 import io.trino.sql.planner.iterative.rule.ReorderJoins.MultiJoinNode;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.LinkedHashSet;
 import java.util.Optional;
@@ -47,20 +48,22 @@
 import static io.trino.sql.planner.iterative.rule.ReorderJoins.JoinEnumerator.generatePartitions;
 import static io.trino.sql.tree.BooleanLiteral.TRUE_LITERAL;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 
+@TestInstance(PER_CLASS)
 public class TestJoinEnumerator
 {
     private LocalQueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         queryRunner = LocalQueryRunner.create(testSessionBuilder().build());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         closeAllRuntimeException(queryRunner);
@@ -91,7 +94,7 @@ public void testGeneratePartitions()
     public void testDoesNotCreateJoinWhenPartitionedOnCrossJoin()
     {
         PlanNodeIdAllocator idAllocator = new PlanNodeIdAllocator();
-        PlanBuilder p = new PlanBuilder(idAllocator, queryRunner.getMetadata(), queryRunner.getDefaultSession());
+        PlanBuilder p = new PlanBuilder(idAllocator, queryRunner.getPlannerContext(), queryRunner.getDefaultSession());
         Symbol a1 = p.symbol("A1");
         Symbol b1 = p.symbol("B1");
         MultiJoinNode multiJoinNode = new MultiJoinNode(
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestJoinNodeFlattener.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestJoinNodeFlattener.java
index 8efff045144a..4628fb33d781 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestJoinNodeFlattener.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestJoinNodeFlattener.java
@@ -35,9 +35,10 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -65,23 +66,25 @@
 import static io.trino.sql.tree.ComparisonExpression.Operator.NOT_EQUAL;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestJoinNodeFlattener
 {
     private static final int DEFAULT_JOIN_LIMIT = 10;
 
     private LocalQueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         queryRunner = LocalQueryRunner.create(testSessionBuilder().build());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         closeAllRuntimeException(queryRunner);
@@ -444,7 +447,7 @@ private EquiJoinClause equiJoinClause(Symbol symbol1, Symbol symbol2)
 
     private PlanBuilder planBuilder(PlanNodeIdAllocator planNodeIdAllocator)
     {
-        return new PlanBuilder(planNodeIdAllocator, queryRunner.getMetadata(), queryRunner.getDefaultSession());
+        return new PlanBuilder(planNodeIdAllocator, queryRunner.getPlannerContext(), queryRunner.getDefaultSession());
     }
 
     private void assertPlan(TypeProvider typeProvider, PlanNode actual, PlanMatchPattern pattern)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestLambdaCaptureDesugaringRewriter.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestLambdaCaptureDesugaringRewriter.java
index 01c79f11796e..1c01174f959f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestLambdaCaptureDesugaringRewriter.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestLambdaCaptureDesugaringRewriter.java
@@ -23,7 +23,7 @@
 import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.LambdaArgumentDeclaration;
 import io.trino.sql.tree.LambdaExpression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.stream.Stream;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeAdjacentWindows.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeAdjacentWindows.java
index 317ce4b37b76..545995cd071b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeAdjacentWindows.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeAdjacentWindows.java
@@ -24,9 +24,8 @@
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
 import io.trino.sql.planner.plan.WindowNode;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -47,9 +46,9 @@ public class TestMergeAdjacentWindows
         extends BaseRuleTest
 {
     private static final TestingFunctionResolution FUNCTION_RESOLUTION = new TestingFunctionResolution();
-    private static final ResolvedFunction AVG = FUNCTION_RESOLUTION.resolveFunction(QualifiedName.of("avg"), fromTypes(DOUBLE));
-    private static final ResolvedFunction SUM = FUNCTION_RESOLUTION.resolveFunction(QualifiedName.of("sum"), fromTypes(DOUBLE));
-    private static final ResolvedFunction LAG = FUNCTION_RESOLUTION.resolveFunction(QualifiedName.of("lag"), fromTypes(DOUBLE));
+    private static final ResolvedFunction AVG = FUNCTION_RESOLUTION.resolveFunction("avg", fromTypes(DOUBLE));
+    private static final ResolvedFunction SUM = FUNCTION_RESOLUTION.resolveFunction("sum", fromTypes(DOUBLE));
+    private static final ResolvedFunction LAG = FUNCTION_RESOLUTION.resolveFunction("lag", fromTypes(DOUBLE));
 
     private static final String columnAAlias = "ALIAS_A";
     private static final ExpectedValueProvider<DataOrganizationSpecification> specificationA =
@@ -152,8 +151,8 @@ public void testIdenticalAdjacentWindowSpecifications()
                 .matches(
                         window(windowMatcherBuilder -> windowMatcherBuilder
                                         .specification(specificationA)
-                                        .addFunction(functionCall(AVG.getSignature().getName(), Optional.empty(), ImmutableList.of(columnAAlias)))
-                                        .addFunction(functionCall(SUM.getSignature().getName(), Optional.empty(), ImmutableList.of(columnAAlias))),
+                                        .addFunction(functionCall(AVG.getSignature().getName().getFunctionName(), Optional.empty(), ImmutableList.of(columnAAlias)))
+                                        .addFunction(functionCall(SUM.getSignature().getName().getFunctionName(), Optional.empty(), ImmutableList.of(columnAAlias))),
                                 values(ImmutableMap.of(columnAAlias, 0))));
     }
 
@@ -190,8 +189,8 @@ public void testIntermediateProjectNodes()
                                         avgOutputAlias, PlanMatchPattern.expression(avgOutputAlias)),
                                 window(windowMatcherBuilder -> windowMatcherBuilder
                                                 .specification(specificationA)
-                                                .addFunction(lagOutputAlias, functionCall(LAG.getSignature().getName(), Optional.empty(), ImmutableList.of(columnAAlias, oneAlias)))
-                                                .addFunction(avgOutputAlias, functionCall(AVG.getSignature().getName(), Optional.empty(), ImmutableList.of(columnAAlias))),
+                                                .addFunction(lagOutputAlias, functionCall(LAG.getSignature().getName().getFunctionName(), Optional.empty(), ImmutableList.of(columnAAlias, oneAlias)))
+                                                .addFunction(avgOutputAlias, functionCall(AVG.getSignature().getName().getFunctionName(), Optional.empty(), ImmutableList.of(columnAAlias))),
                                         strictProject(
                                                 ImmutableMap.of(
                                                         oneAlias, PlanMatchPattern.expression("CAST(1 AS bigint)"),
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeExcept.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeExcept.java
index cdfe089196d5..df9ff655d793 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeExcept.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeExcept.java
@@ -21,7 +21,7 @@
 import io.trino.sql.planner.plan.ExceptNode;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.ValuesNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.except;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeFilters.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeFilters.java
index b9def4fd69d8..bcafc30f8b5b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeFilters.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeFilters.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.metadata.Metadata;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.metadata.MetadataManager.createTestMetadataManager;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeIntersect.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeIntersect.java
index 72cfa628ad24..13e1333391f6 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeIntersect.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeIntersect.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.IntersectNode;
 import io.trino.sql.planner.plan.PlanNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.intersect;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitOverProjectWithSort.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitOverProjectWithSort.java
index 5fd8b63a496a..7e5b4fdebc5b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitOverProjectWithSort.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitOverProjectWithSort.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitWithDistinct.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitWithDistinct.java
index dc912cd5ff79..2cfd685e41e8 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitWithDistinct.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitWithDistinct.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.DistinctLimitNode;
 import io.trino.sql.planner.plan.ValuesNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitWithSort.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitWithSort.java
index b0de3e062edf..e91c29dd2649 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitWithSort.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitWithSort.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitWithTopN.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitWithTopN.java
index 34da07ce5bb9..112f653edc6d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitWithTopN.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimitWithTopN.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimits.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimits.java
index d227057c2e61..ed9bf47170c7 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimits.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeLimits.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.limit;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.sort;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergePatternRecognitionNodes.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergePatternRecognitionNodes.java
index 2f0653745f38..1d78d2de7908 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergePatternRecognitionNodes.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergePatternRecognitionNodes.java
@@ -29,7 +29,7 @@
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -83,7 +83,7 @@ public void testSpecificationsDoNotMatch()
                 .doesNotFire();
 
         // aggregations in variable definitions do not match
-        QualifiedName count = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("count"), fromTypes(BIGINT)).toQualifiedName();
+        QualifiedName count = tester().getMetadata().resolveBuiltinFunction("count", fromTypes(BIGINT)).toQualifiedName();
         tester().assertThat(new MergePatternRecognitionNodesWithoutProject())
                 .on(p -> p.patternRecognition(parentBuilder -> parentBuilder
                         .pattern(new IrLabel("X"))
@@ -102,7 +102,7 @@ public void testSpecificationsDoNotMatch()
     @Test
     public void testParentDependsOnSourceCreatedOutputs()
     {
-        ResolvedFunction lag = createTestMetadataManager().resolveFunction(tester().getSession(), QualifiedName.of("lag"), fromTypes(BIGINT));
+        ResolvedFunction lag = createTestMetadataManager().resolveBuiltinFunction("lag", fromTypes(BIGINT));
 
         // parent node's measure depends on child node's measure output
         tester().assertThat(new MergePatternRecognitionNodesWithoutProject())
@@ -229,7 +229,7 @@ public void testParentDependsOnSourceCreatedOutputsWithProject()
     @Test
     public void testMergeWithoutProject()
     {
-        ResolvedFunction lag = createTestMetadataManager().resolveFunction(tester().getSession(), QualifiedName.of("lag"), fromTypes(BIGINT));
+        ResolvedFunction lag = createTestMetadataManager().resolveBuiltinFunction("lag", fromTypes(BIGINT));
 
         tester().assertThat(new MergePatternRecognitionNodesWithoutProject())
                 .on(p -> p.patternRecognition(parentBuilder -> parentBuilder
@@ -501,7 +501,7 @@ public void testOneRowPerMatchMergeWithParentDependingOnProject()
     @Test
     public void testMergeWithAggregation()
     {
-        QualifiedName count = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("count"), fromTypes(BIGINT)).toQualifiedName();
+        QualifiedName count = tester().getMetadata().resolveBuiltinFunction("count", fromTypes(BIGINT)).toQualifiedName();
         tester().assertThat(new MergePatternRecognitionNodesWithoutProject())
                 .on(p -> p.patternRecognition(parentBuilder -> parentBuilder
                         .pattern(new IrLabel("X"))
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeProjectWithValues.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeProjectWithValues.java
index 19247e966bbf..88cad8551fd2 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeProjectWithValues.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeProjectWithValues.java
@@ -28,10 +28,9 @@
 import io.trino.sql.tree.IsNullPredicate;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -138,7 +137,7 @@ public void testValuesWithoutOutputSymbols()
     public void testNonDeterministicValues()
     {
         FunctionCall randomFunction = new FunctionCall(
-                tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("random"), ImmutableList.of()).toQualifiedName(),
+                tester().getMetadata().resolveBuiltinFunction("random", ImmutableList.of()).toQualifiedName(),
                 ImmutableList.of());
 
         tester().assertThat(new MergeProjectWithValues(tester().getMetadata()))
@@ -195,7 +194,7 @@ public void testNonDeterministicValues()
     public void testDoNotFireOnNonDeterministicValues()
     {
         FunctionCall randomFunction = new FunctionCall(
-                tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("random"), ImmutableList.of()).toQualifiedName(),
+                tester().getMetadata().resolveBuiltinFunction("random", ImmutableList.of()).toQualifiedName(),
                 ImmutableList.of());
 
         tester().assertThat(new MergeProjectWithValues(tester().getMetadata()))
@@ -251,7 +250,7 @@ public void testCorrelation()
     @Test
     public void testFailingExpression()
     {
-        FunctionCall failFunction = failFunction(tester().getMetadata(), tester().getSession(), GENERIC_USER_ERROR, "message");
+        FunctionCall failFunction = failFunction(tester().getMetadata(), GENERIC_USER_ERROR, "message");
 
         tester().assertThat(new MergeProjectWithValues(tester().getMetadata()))
                 .on(p -> p.project(
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeUnion.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeUnion.java
index fa2fb7eeaf7e..d09efd4a1075 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeUnion.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMergeUnion.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.UnionNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.union;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMultipleDistinctAggregationToMarkDistinct.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMultipleDistinctAggregationToMarkDistinct.java
index 767f831cfb50..84aad4a8f22a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMultipleDistinctAggregationToMarkDistinct.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestMultipleDistinctAggregationToMarkDistinct.java
@@ -23,7 +23,7 @@
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.PlanNodeId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.function.Function;
@@ -31,7 +31,6 @@
 import static io.trino.SystemSessionProperties.MARK_DISTINCT_STRATEGY;
 import static io.trino.SystemSessionProperties.OPTIMIZE_DISTINCT_AGGREGATIONS;
 import static io.trino.SystemSessionProperties.TASK_CONCURRENCY;
-import static io.trino.SystemSessionProperties.USE_MARK_DISTINCT;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.aggregation;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.functionCall;
@@ -187,32 +186,34 @@ public void testAggregationNDV()
 
         // small NDV
         tester().assertThat(new MultipleDistinctAggregationToMarkDistinct(TASK_COUNT_ESTIMATOR))
-                .on(plan)
                 .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(2 * clusterThreadCount).build())
+                .on(plan)
                 .matches(expectedMarkDistinct);
 
         // unknown estimate
         tester().assertThat(new MultipleDistinctAggregationToMarkDistinct(TASK_COUNT_ESTIMATOR))
-                .on(plan)
                 .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(Double.NaN).build())
+                .on(plan)
                 .matches(expectedMarkDistinct);
 
         // medium NDV, optimize_mixed_distinct_aggregations enabled
         tester().assertThat(new MultipleDistinctAggregationToMarkDistinct(TASK_COUNT_ESTIMATOR))
-                .on(plan)
-                .setSystemProperty(OPTIMIZE_DISTINCT_AGGREGATIONS, "true")
                 .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(50 * clusterThreadCount).build())
+                .setSystemProperty(OPTIMIZE_DISTINCT_AGGREGATIONS, "true")
+                .on(plan)
                 .matches(expectedMarkDistinct);
 
         // medium NDV, optimize_mixed_distinct_aggregations disabled
         tester().assertThat(new MultipleDistinctAggregationToMarkDistinct(TASK_COUNT_ESTIMATOR))
-                .on(plan)
                 .setSystemProperty(OPTIMIZE_DISTINCT_AGGREGATIONS, "false")
                 .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(50 * clusterThreadCount).build())
+                .on(plan)
                 .doesNotFire();
 
         // medium NDV, optimize_mixed_distinct_aggregations enabled but plan has multiple distinct aggregations
         tester().assertThat(new MultipleDistinctAggregationToMarkDistinct(TASK_COUNT_ESTIMATOR))
+                .setSystemProperty(OPTIMIZE_DISTINCT_AGGREGATIONS, "true")
+                .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(50 * clusterThreadCount).build())
                 .on(p -> p.aggregation(builder -> builder
                         .nodeId(aggregationNodeId)
                         .singleGroupingSet(p.symbol("key"))
@@ -220,43 +221,30 @@ public void testAggregationNDV()
                         .addAggregation(p.symbol("output2"), expression("count(DISTINCT input2)"), ImmutableList.of(BIGINT))
                         .source(
                                 p.values(p.symbol("input1"), p.symbol("input2"), p.symbol("key")))))
-                .setSystemProperty(OPTIMIZE_DISTINCT_AGGREGATIONS, "true")
-                .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(50 * clusterThreadCount).build())
                 .doesNotFire();
 
         // big NDV
         tester().assertThat(new MultipleDistinctAggregationToMarkDistinct(TASK_COUNT_ESTIMATOR))
-                .on(plan)
                 .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(1000 * clusterThreadCount).build())
+                .on(plan)
                 .doesNotFire();
 
-        // big NDV, mark_distinct_strategy = always, use_mark_distinct = null
+        // big NDV, mark_distinct_strategy = always
         tester().assertThat(new MultipleDistinctAggregationToMarkDistinct(TASK_COUNT_ESTIMATOR))
-                .on(plan)
                 .setSystemProperty(MARK_DISTINCT_STRATEGY, "always")
                 .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(1000 * clusterThreadCount).build())
-                .matches(expectedMarkDistinct);
-        // big NDV, mark_distinct_strategy = null, use_mark_distinct = true
-        tester().assertThat(new MultipleDistinctAggregationToMarkDistinct(TASK_COUNT_ESTIMATOR))
                 .on(plan)
-                .setSystemProperty(USE_MARK_DISTINCT, "true")
-                .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(1000 * clusterThreadCount).build())
-                .doesNotFire();
-        // small NDV, mark_distinct_strategy = none, use_mark_distinct = null
+                .matches(expectedMarkDistinct);
+        // small NDV, mark_distinct_strategy = none
         tester().assertThat(new MultipleDistinctAggregationToMarkDistinct(TASK_COUNT_ESTIMATOR))
-                .on(plan)
                 .setSystemProperty(MARK_DISTINCT_STRATEGY, "none")
                 .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(2 * clusterThreadCount).build())
-                .doesNotFire();
-        // small NDV, mark_distinct_strategy = null, use_mark_distinct = false
-        tester().assertThat(new MultipleDistinctAggregationToMarkDistinct(TASK_COUNT_ESTIMATOR))
                 .on(plan)
-                .setSystemProperty(USE_MARK_DISTINCT, "false")
-                .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(2 * clusterThreadCount).build())
                 .doesNotFire();
 
         // big NDV but on multiple grouping keys
         tester().assertThat(new MultipleDistinctAggregationToMarkDistinct(TASK_COUNT_ESTIMATOR))
+                .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(1000 * clusterThreadCount).build())
                 .on(p -> p.aggregation(builder -> builder
                         .nodeId(aggregationNodeId)
                         .singleGroupingSet(p.symbol("key1"), p.symbol("key2"))
@@ -264,7 +252,6 @@ public void testAggregationNDV()
                         .addAggregation(p.symbol("output2"), expression("sum(input)"), ImmutableList.of(BIGINT))
                         .source(
                                 p.values(p.symbol("input"), p.symbol("key1"), p.symbol("key2")))))
-                .overrideStats(aggregationNodeId.toString(), PlanNodeStatsEstimate.builder().setOutputRowCount(1000 * clusterThreadCount).build())
                 .matches(aggregation(
                         singleGroupingSet("key1", "key2"),
                         ImmutableMap.of(
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestOptimizeDuplicateInsensitiveJoins.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestOptimizeDuplicateInsensitiveJoins.java
index f22921f80d40..f9c5b1a76c20 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestOptimizeDuplicateInsensitiveJoins.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestOptimizeDuplicateInsensitiveJoins.java
@@ -20,9 +20,9 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.JoinNode;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import io.trino.sql.tree.ComparisonExpression;
+import io.trino.sql.tree.FunctionCall;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.aggregation;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
@@ -33,19 +33,12 @@
 import static io.trino.sql.planner.iterative.rule.test.PlanBuilder.expression;
 import static io.trino.sql.planner.plan.Assignments.identity;
 import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
+import static io.trino.sql.tree.ComparisonExpression.Operator.GREATER_THAN;
 import static java.util.function.Predicate.not;
 
 public class TestOptimizeDuplicateInsensitiveJoins
         extends BaseRuleTest
 {
-    private String rand;
-
-    @BeforeClass
-    public void setup()
-    {
-        rand = "\"" + tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("rand"), ImmutableList.of()).toQualifiedName() + "\"()";
-    }
-
     @Test
     public void testNoAggregation()
     {
@@ -134,6 +127,10 @@ public void testNestedJoins()
     @Test
     public void testNondeterministicJoins()
     {
+        FunctionCall randomFunction = new FunctionCall(
+                tester().getMetadata().resolveBuiltinFunction("random", ImmutableList.of()).toQualifiedName(),
+                ImmutableList.of());
+
         tester().assertThat(new OptimizeDuplicateInsensitiveJoins(tester().getMetadata()))
                 .on(p -> {
                     Symbol symbolA = p.symbol("a");
@@ -148,12 +145,12 @@ public void testNondeterministicJoins()
                                             INNER,
                                             p.values(symbolB),
                                             p.values(symbolC)),
-                                    expression("b > " + rand))));
+                                    new ComparisonExpression(GREATER_THAN, symbolB.toSymbolReference(), randomFunction))));
                 })
                 .matches(
                         aggregation(ImmutableMap.of(),
                                 join(INNER, builder -> builder
-                                        .filter("B > rand()")
+                                        .filter("B > random()")
                                         .left(values("A"))
                                         .right(
                                                 join(INNER, rightJoinBuilder -> rightJoinBuilder
@@ -166,13 +163,17 @@ public void testNondeterministicJoins()
     @Test
     public void testNondeterministicFilter()
     {
+        FunctionCall randomFunction = new FunctionCall(
+                tester().getMetadata().resolveBuiltinFunction("random", ImmutableList.of()).toQualifiedName(),
+                ImmutableList.of());
+
         tester().assertThat(new OptimizeDuplicateInsensitiveJoins(tester().getMetadata()))
                 .on(p -> {
                     Symbol symbolA = p.symbol("a");
                     Symbol symbolB = p.symbol("b");
                     return p.aggregation(a -> a
                             .singleGroupingSet(symbolA)
-                            .source(p.filter(expression("b > " + rand),
+                            .source(p.filter(new ComparisonExpression(GREATER_THAN, symbolB.toSymbolReference(), randomFunction),
                                     p.join(
                                             INNER,
                                             p.values(symbolA),
@@ -184,6 +185,10 @@ public void testNondeterministicFilter()
     @Test
     public void testNondeterministicProjection()
     {
+        FunctionCall randomFunction = new FunctionCall(
+                tester().getMetadata().resolveBuiltinFunction("random", ImmutableList.of()).toQualifiedName(),
+                ImmutableList.of());
+
         tester().assertThat(new OptimizeDuplicateInsensitiveJoins(tester().getMetadata()))
                 .on(p -> {
                     Symbol symbolA = p.symbol("a");
@@ -194,7 +199,7 @@ public void testNondeterministicProjection()
                             .source(p.project(
                                     Assignments.builder()
                                             .putIdentity(symbolA)
-                                            .put(symbolC, expression(rand))
+                                            .put(symbolC, randomFunction)
                                             .build(),
                                     p.join(
                                             INNER,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPreAggregateCaseAggregations.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPreAggregateCaseAggregations.java
index c7d16c69ed00..08459fbecd1f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPreAggregateCaseAggregations.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPreAggregateCaseAggregations.java
@@ -31,7 +31,7 @@
 import io.trino.sql.tree.FunctionCall;
 import io.trino.testing.LocalQueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.function.Predicate;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneAggregationColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneAggregationColumns.java
index 12496d6016d4..7d47935c5768 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneAggregationColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneAggregationColumns.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.ProjectNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.function.Predicate;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneAggregationSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneAggregationSourceColumns.java
index cf9881dce536..e241bc5af8fc 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneAggregationSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneAggregationSourceColumns.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.AggregationNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneApplyColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneApplyColumns.java
index a4e3a10c7269..2ec6ae6322b0 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneApplyColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneApplyColumns.java
@@ -24,7 +24,7 @@
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.InPredicate;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.apply;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneApplyCorrelation.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneApplyCorrelation.java
index 07f77346502f..943b6eb2cd87 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneApplyCorrelation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneApplyCorrelation.java
@@ -22,7 +22,7 @@
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.InPredicate;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.apply;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneApplySourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneApplySourceColumns.java
index abcd13f2c490..56ca928a65e3 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneApplySourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneApplySourceColumns.java
@@ -22,7 +22,7 @@
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.tree.InPredicate;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.apply;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneAssignUniqueIdColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneAssignUniqueIdColumns.java
index 9b4f0fcfa4c1..03be00d797fa 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneAssignUniqueIdColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneAssignUniqueIdColumns.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.assignUniqueId;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.strictProject;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneCorrelatedJoinColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneCorrelatedJoinColumns.java
index cbf4243067c1..7b799428f65c 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneCorrelatedJoinColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneCorrelatedJoinColumns.java
@@ -21,7 +21,7 @@
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.FilterNode;
 import io.trino.sql.tree.ComparisonExpression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.correlatedJoin;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneCorrelatedJoinCorrelation.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneCorrelatedJoinCorrelation.java
index 6039f14099a6..27bf44620cfb 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneCorrelatedJoinCorrelation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneCorrelatedJoinCorrelation.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.tree.ComparisonExpression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.correlatedJoin;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneCountAggregationOverScalar.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneCountAggregationOverScalar.java
index 5c0dd6c602c8..d660c6e73184 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneCountAggregationOverScalar.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneCountAggregationOverScalar.java
@@ -25,9 +25,8 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.Assignments;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCALE_FACTOR;
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
@@ -52,7 +51,7 @@ public void testDoesNotFireOnNonNestedAggregate()
                                 .addAggregation(
                                         p.symbol("count_1", BigintType.BIGINT),
                                         functionResolution
-                                                .functionCallBuilder(QualifiedName.of("count"))
+                                                .functionCallBuilder("count")
                                                 .build(),
                                         ImmutableList.of())
                                 .source(
@@ -69,7 +68,7 @@ public void testFiresOnNestedCountAggregate()
                                 .addAggregation(
                                         p.symbol("count_1", BigintType.BIGINT),
                                         functionResolution
-                                                .functionCallBuilder(QualifiedName.of("count"))
+                                                .functionCallBuilder("count")
                                                 .build(),
                                         ImmutableList.of())
                                 .globalGrouping()
@@ -91,7 +90,7 @@ public void testFiresOnCountAggregateOverValues()
                                 .addAggregation(
                                         p.symbol("count_1", BigintType.BIGINT),
                                         functionResolution
-                                                .functionCallBuilder(QualifiedName.of("count"))
+                                                .functionCallBuilder("count")
                                                 .build(),
                                         ImmutableList.of())
                                 .step(AggregationNode.Step.SINGLE)
@@ -109,7 +108,7 @@ public void testFiresOnCountAggregateOverEnforceSingleRow()
                                 .addAggregation(
                                         p.symbol("count_1", BigintType.BIGINT),
                                         functionResolution
-                                                .functionCallBuilder(QualifiedName.of("count"))
+                                                .functionCallBuilder("count")
                                                 .build(),
                                         ImmutableList.of())
                                 .step(AggregationNode.Step.SINGLE)
@@ -127,7 +126,7 @@ public void testDoesNotFireOnNestedCountAggregateWithNonEmptyGroupBy()
                                 .addAggregation(
                                         p.symbol("count_1", BigintType.BIGINT),
                                         functionResolution
-                                                .functionCallBuilder(QualifiedName.of("count"))
+                                                .functionCallBuilder("count")
                                                 .build(),
                                         ImmutableList.of())
                                 .step(AggregationNode.Step.SINGLE)
@@ -150,7 +149,7 @@ public void testDoesNotFireOnNestedNonCountAggregate()
                     AggregationNode inner = p.aggregation((a) -> a
                             .addAggregation(totalPrice,
                                     functionResolution
-                                            .functionCallBuilder(QualifiedName.of("sum"))
+                                            .functionCallBuilder("sum")
                                             .addArgument(DOUBLE, new SymbolReference("totalprice"))
                                             .build(),
                                     ImmutableList.of(DOUBLE))
@@ -170,7 +169,7 @@ public void testDoesNotFireOnNestedNonCountAggregate()
                             .addAggregation(
                                     p.symbol("sum_outer", DOUBLE),
                                     functionResolution
-                                            .functionCallBuilder(QualifiedName.of("sum"))
+                                            .functionCallBuilder("sum")
                                             .addArgument(DOUBLE, new SymbolReference("sum_inner"))
                                             .build(),
                                     ImmutableList.of(DOUBLE))
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneDistinctAggregation.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneDistinctAggregation.java
index eaa8afae84ea..bddb0c709fad 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneDistinctAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneDistinctAggregation.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.AggregationNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.aggregation;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneDistinctLimitSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneDistinctLimitSourceColumns.java
index 17452b53696f..d44c28035a6e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneDistinctLimitSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneDistinctLimitSourceColumns.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneEnforceSingleRowColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneEnforceSingleRowColumns.java
index 8d49a03b2a90..5590dd863bc8 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneEnforceSingleRowColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneEnforceSingleRowColumns.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.enforceSingleRow;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExceptSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExceptSourceColumns.java
index a1d6e62807f1..4c527c9f5983 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExceptSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExceptSourceColumns.java
@@ -18,7 +18,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.except;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExchangeColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExchangeColumns.java
index d7646677b7bb..6c92829ab7f8 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExchangeColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExchangeColumns.java
@@ -21,7 +21,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExchangeSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExchangeSourceColumns.java
index f6c7855a4b52..bb71fcaafd7e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExchangeSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExchangeSourceColumns.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.exchange;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExplainAnalyzeSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExplainAnalyzeSourceColumns.java
index 99fe8384d99d..14b27b6df654 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExplainAnalyzeSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneExplainAnalyzeSourceColumns.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.ExplainAnalyzeNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneFilterColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneFilterColumns.java
index 585c133ac8bb..92297bc24237 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneFilterColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneFilterColumns.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.ProjectNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Predicate;
 import java.util.stream.Stream;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneGroupIdColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneGroupIdColumns.java
index 04744fe84db4..49254324e9b4 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneGroupIdColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneGroupIdColumns.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.groupId;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneGroupIdSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneGroupIdSourceColumns.java
index 459ed621d329..35afab7eee56 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneGroupIdSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneGroupIdSourceColumns.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.groupId;
@@ -52,6 +52,34 @@ public void testPruneInputColumn()
                                         values("a", "b", "k"))));
     }
 
+    @Test
+    public void testPruneInputColumnWithMapping()
+    {
+        tester().assertThat(new PruneGroupIdSourceColumns())
+                .on(p -> {
+                    Symbol a = p.symbol("a");
+                    Symbol b = p.symbol("b");
+                    Symbol k = p.symbol("k");
+                    Symbol newK = p.symbol("newK");
+                    Symbol groupId = p.symbol("group_id");
+                    return p.groupId(
+                            ImmutableList.of(ImmutableList.of(newK)),
+                            ImmutableMap.of(newK, k),
+                            ImmutableList.of(a),
+                            groupId,
+                            p.values(a, b, k));
+                })
+                .matches(
+                        groupId(
+                                ImmutableList.of(ImmutableList.of("newK")),
+                                ImmutableMap.of("newK", "k"),
+                                ImmutableList.of("a"),
+                                "group_id",
+                                strictProject(
+                                        ImmutableMap.of("a", expression("a"), "k", expression("k")),
+                                        values("a", "b", "k"))));
+    }
+
     @Test
     public void allInputsReferenced()
     {
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneIndexJoinColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneIndexJoinColumns.java
index 44956a5cad5c..81b9bae33b22 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneIndexJoinColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneIndexJoinColumns.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.IndexJoinNode.EquiJoinClause;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneIndexSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneIndexSourceColumns.java
index a7556132f725..f1846305ba39 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneIndexSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneIndexSourceColumns.java
@@ -24,7 +24,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.PlanNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Predicate;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneIntersectSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneIntersectSourceColumns.java
index d869d5520c81..a269b00845ec 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneIntersectSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneIntersectSourceColumns.java
@@ -18,7 +18,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.intersect;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneJoinChildrenColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneJoinChildrenColumns.java
index 300cd592a3a0..164602b2ba27 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneJoinChildrenColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneJoinChildrenColumns.java
@@ -22,7 +22,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.PlanNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneJoinColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneJoinColumns.java
index 035cf2835a9e..3fd23c3eb562 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneJoinColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneJoinColumns.java
@@ -23,7 +23,7 @@
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.PlanNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneLimitColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneLimitColumns.java
index cde164acb05f..c2eacb55a37a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneLimitColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneLimitColumns.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.ProjectNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.function.Predicate;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneMarkDistinctColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneMarkDistinctColumns.java
index 9216866bb49a..32bee9d04bff 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneMarkDistinctColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneMarkDistinctColumns.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.markDistinct;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneMergeSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneMergeSourceColumns.java
index 4815bd64e3ad..96dea82cbb42 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneMergeSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneMergeSourceColumns.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.MergeWriterNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.strictProject;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneOffsetColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneOffsetColumns.java
index 1969cd518267..de4c2fe8424c 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneOffsetColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneOffsetColumns.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.ProjectNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Predicate;
 import java.util.stream.Stream;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneOrderByInAggregation.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneOrderByInAggregation.java
index 33bc3227a97a..94782f0b1d07 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneOrderByInAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneOrderByInAggregation.java
@@ -21,7 +21,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.tree.SortItem;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneOutputSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneOutputSourceColumns.java
index d83e64031875..598106d42231 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneOutputSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneOutputSourceColumns.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.strictOutput;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPrunePattenRecognitionColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPrunePattenRecognitionColumns.java
index d0537b7b3f86..2c5000912c53 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPrunePattenRecognitionColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPrunePattenRecognitionColumns.java
@@ -25,7 +25,7 @@
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -58,7 +58,7 @@ public class TestPrunePattenRecognitionColumns
     @Test
     public void testRemovePatternRecognitionNode()
     {
-        ResolvedFunction rank = createTestMetadataManager().resolveFunction(tester().getSession(), QualifiedName.of("rank"), ImmutableList.of());
+        ResolvedFunction rank = createTestMetadataManager().resolveBuiltinFunction("rank", ImmutableList.of());
 
         // MATCH_RECOGNIZE with options: AFTER MATCH SKIP PAST LAST ROW, ALL ROWS WITH UNMATCHED ROW
         tester().assertThat(new PrunePattenRecognitionColumns())
@@ -113,7 +113,7 @@ public void testRemovePatternRecognitionNode()
     @Test
     public void testPruneUnreferencedWindowFunctionAndSources()
     {
-        ResolvedFunction lag = createTestMetadataManager().resolveFunction(tester().getSession(), QualifiedName.of("lag"), fromTypes(BIGINT));
+        ResolvedFunction lag = createTestMetadataManager().resolveBuiltinFunction("lag", fromTypes(BIGINT));
 
         // remove window function "lag" and input symbol "b" used only by that function
         tester().assertThat(new PrunePattenRecognitionColumns())
@@ -146,7 +146,7 @@ public void testPruneUnreferencedWindowFunctionAndSources()
     @Test
     public void testPruneUnreferencedMeasureAndSources()
     {
-        ResolvedFunction lag = createTestMetadataManager().resolveFunction(tester().getSession(), QualifiedName.of("lag"), fromTypes(BIGINT));
+        ResolvedFunction lag = createTestMetadataManager().resolveBuiltinFunction("lag", fromTypes(BIGINT));
 
         // remove row pattern measure "measure" and input symbol "a" used only by that measure
         tester().assertThat(new PrunePattenRecognitionColumns())
@@ -199,7 +199,7 @@ public void testDoNotPruneVariableDefinitionSources()
                                                 values("a", "b")))));
 
         // inputs "a", "b" are used as aggregation arguments
-        QualifiedName maxBy = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("max_by"), fromTypes(BIGINT, BIGINT)).toQualifiedName();
+        QualifiedName maxBy = tester().getMetadata().resolveBuiltinFunction("max_by", fromTypes(BIGINT, BIGINT)).toQualifiedName();
         tester().assertThat(new PrunePattenRecognitionColumns())
                 .on(p -> p.project(
                         Assignments.of(),
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPrunePatternRecognitionSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPrunePatternRecognitionSourceColumns.java
index 103795f3e4ff..ffdc02eba000 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPrunePatternRecognitionSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPrunePatternRecognitionSourceColumns.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.OrderingScheme;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.rowpattern.ir.IrLabel;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.connector.SortOrder.ASC_NULLS_LAST;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneProjectColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneProjectColumns.java
index 98c9683eccb0..c7fa48332909 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneProjectColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneProjectColumns.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.strictProject;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneRowNumberColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneRowNumberColumns.java
index 4a3ca450c7cc..def5d68d3aff 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneRowNumberColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneRowNumberColumns.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.assertions.RowNumberSymbolMatcher;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSampleColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSampleColumns.java
index 7ed2602c44c3..8df78a84ad29 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSampleColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSampleColumns.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.SampleNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSemiJoinColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSemiJoinColumns.java
index 1750176248f4..d272fa274c9c 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSemiJoinColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSemiJoinColumns.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.PlanNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSemiJoinFilteringSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSemiJoinFilteringSourceColumns.java
index b3dab255ad00..f9a6e54b824b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSemiJoinFilteringSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSemiJoinFilteringSourceColumns.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.PlanNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSortColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSortColumns.java
index 9d3c6b155673..2f05965e2634 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSortColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSortColumns.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.sort;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSpatialJoinChildrenColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSpatialJoinChildrenColumns.java
index a413b72c3594..8a672b922658 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSpatialJoinChildrenColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSpatialJoinChildrenColumns.java
@@ -15,22 +15,46 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import io.trino.connector.system.GlobalSystemConnector;
+import io.trino.metadata.ResolvedFunction;
+import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.FunctionId;
+import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.FunctionNullability;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.SpatialJoinNode;
-import org.testng.annotations.Test;
+import io.trino.sql.tree.ComparisonExpression;
+import io.trino.sql.tree.FunctionCall;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
+import static io.trino.metadata.GlobalFunctionCatalog.builtinFunctionName;
+import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.spatialJoin;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.strictProject;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 import static io.trino.sql.planner.iterative.rule.test.PlanBuilder.expression;
+import static io.trino.sql.tree.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL;
+import static io.trino.util.SpatialJoinUtils.ST_DISTANCE;
 
 public class TestPruneSpatialJoinChildrenColumns
         extends BaseRuleTest
 {
+    // normally a test can just resolve the function from metadata, but the geo functions are in a plugin that is not visible to this module
+    public static final ResolvedFunction TEST_ST_DISTANCE_FUNCTION = new ResolvedFunction(
+            new BoundSignature(builtinFunctionName(ST_DISTANCE), BIGINT, ImmutableList.of(BIGINT, BIGINT)),
+            GlobalSystemConnector.CATALOG_HANDLE,
+            new FunctionId("st_distance"),
+            FunctionKind.SCALAR,
+            true,
+            new FunctionNullability(false, ImmutableList.of(false, false)),
+            ImmutableMap.of(),
+            ImmutableSet.of());
+
     @Test
     public void testPruneOneChild()
     {
@@ -45,7 +69,10 @@ public void testPruneOneChild()
                             p.values(a, unused),
                             p.values(b, r),
                             ImmutableList.of(a, b, r),
-                            expression("ST_Distance(a, b) <= r"));
+                            new ComparisonExpression(
+                                    LESS_THAN_OR_EQUAL,
+                                    new FunctionCall(TEST_ST_DISTANCE_FUNCTION.toQualifiedName(), ImmutableList.of(a.toSymbolReference(), b.toSymbolReference())),
+                                    r.toSymbolReference()));
                 })
                 .matches(
                         spatialJoin(
@@ -73,7 +100,10 @@ public void testPruneBothChildren()
                             p.values(a, unusedLeft),
                             p.values(b, r, unusedRight),
                             ImmutableList.of(a, b, r),
-                            expression("ST_Distance(a, b) <= r"));
+                            new ComparisonExpression(
+                                    LESS_THAN_OR_EQUAL,
+                                    new FunctionCall(TEST_ST_DISTANCE_FUNCTION.toQualifiedName(), ImmutableList.of(a.toSymbolReference(), b.toSymbolReference())),
+                                    r.toSymbolReference()));
                 })
                 .matches(
                         spatialJoin(
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSpatialJoinColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSpatialJoinColumns.java
index afa6143b9e1b..d29068a9577e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSpatialJoinColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneSpatialJoinColumns.java
@@ -20,14 +20,18 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.SpatialJoinNode;
-import org.testng.annotations.Test;
+import io.trino.sql.tree.ComparisonExpression;
+import io.trino.sql.tree.FunctionCall;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.spatialJoin;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.strictProject;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
+import static io.trino.sql.planner.iterative.rule.TestPruneSpatialJoinChildrenColumns.TEST_ST_DISTANCE_FUNCTION;
 import static io.trino.sql.planner.iterative.rule.test.PlanBuilder.expression;
+import static io.trino.sql.tree.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL;
 
 public class TestPruneSpatialJoinColumns
         extends BaseRuleTest
@@ -47,7 +51,10 @@ public void notAllOutputsReferenced()
                                     p.values(a),
                                     p.values(b, r),
                                     ImmutableList.of(a, b, r),
-                                    expression("ST_Distance(a, b) <= r")));
+                                    new ComparisonExpression(
+                                            LESS_THAN_OR_EQUAL,
+                                            new FunctionCall(TEST_ST_DISTANCE_FUNCTION.toQualifiedName(), ImmutableList.of(a.toSymbolReference(), b.toSymbolReference())),
+                                            r.toSymbolReference())));
                 })
                 .matches(
                         strictProject(
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableExecuteSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableExecuteSourceColumns.java
index cb10686aaf43..b9f15a1cbc4b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableExecuteSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableExecuteSourceColumns.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -80,7 +80,6 @@ public void testDoNotPrunePartitioningSchemeSymbols()
                                     ImmutableList.of(partition, hash),
                                     ImmutableList.of(partition),
                                     hash)),
-                            Optional.empty(),
                             p.values(a, partition, hash));
                 })
                 .doesNotFire();
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableFunctionProcessorColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableFunctionProcessorColumns.java
index e5a021e9d604..2a71313865bb 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableFunctionProcessorColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableFunctionProcessorColumns.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.TableFunctionNode.PassThroughColumn;
 import io.trino.sql.planner.plan.TableFunctionNode.PassThroughSpecification;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableFunctionProcessorSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableFunctionProcessorSourceColumns.java
index a81c0422751d..7aaea5a3dd58 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableFunctionProcessorSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableFunctionProcessorSourceColumns.java
@@ -21,7 +21,7 @@
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
 import io.trino.sql.planner.plan.TableFunctionNode.PassThroughColumn;
 import io.trino.sql.planner.plan.TableFunctionNode.PassThroughSpecification;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableScanColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableScanColumns.java
index c80208dfd4de..b78ced42efaa 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableScanColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableScanColumns.java
@@ -36,7 +36,7 @@
 import io.trino.sql.planner.iterative.rule.test.RuleTester;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.testing.TestingMetadata.TestingColumnHandle;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -146,6 +146,7 @@ public void testPushColumnPruningProjection()
                 .build();
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(factory).build()) {
             ruleTester.assertThat(new PruneTableScanColumns(ruleTester.getMetadata()))
+                    .withSession(testSessionBuilder().setCatalog(TEST_CATALOG_NAME).setSchema(testSchema).build())
                     .on(p -> {
                         Symbol symbolA = p.symbol("cola", DATE);
                         Symbol symbolB = p.symbol("colb", DOUBLE);
@@ -158,7 +159,6 @@ public void testPushColumnPruningProjection()
                                                 symbolA, columnHandleA,
                                                 symbolB, columnHandleB)));
                     })
-                    .withSession(testSessionBuilder().setCatalog(TEST_CATALOG_NAME).setSchema(testSchema).build())
                     .matches(
                             strictProject(
                                     ImmutableMap.of("expr", PlanMatchPattern.expression("COLB")),
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableWriterSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableWriterSourceColumns.java
index 5946d76abe13..9a00a48e9b32 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableWriterSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableWriterSourceColumns.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.StatisticAggregationsDescriptor;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -85,7 +85,6 @@ public void testDoNotPrunePartitioningSchemeSymbols()
                                     hash)),
                             Optional.empty(),
                             Optional.empty(),
-                            Optional.empty(),
                             p.values(a, partition, hash));
                 })
                 .doesNotFire();
@@ -104,7 +103,6 @@ public void testDoNotPruneStatisticAggregationSymbols()
                             ImmutableList.of(a),
                             ImmutableList.of("column_a"),
                             Optional.empty(),
-                            Optional.empty(),
                             Optional.of(
                                     p.statisticAggregations(
                                             ImmutableMap.of(aggregation, p.aggregation(PlanBuilder.expression("avg(argument)"), ImmutableList.of(BIGINT))),
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTopNColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTopNColumns.java
index 9e19451af586..9650e084e847 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTopNColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTopNColumns.java
@@ -21,7 +21,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.ProjectNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Predicate;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTopNRankingColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTopNRankingColumns.java
index ba8995c636d7..b7f6df14d544 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTopNRankingColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTopNRankingColumns.java
@@ -22,7 +22,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnionColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnionColumns.java
index d6ff06765cdc..95c54f407c80 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnionColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnionColumns.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.strictProject;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.union;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnionSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnionSourceColumns.java
index 9e7e9884704a..3b2757a13b3a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnionSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnionSourceColumns.java
@@ -18,7 +18,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.strictProject;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnnestColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnnestColumns.java
index 5ffa369f6cfc..8e5f40fd36fa 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnnestColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnnestColumns.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.UnnestNode.Mapping;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnnestSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnnestSourceColumns.java
index 69a540b821aa..e79a2d7f9b64 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnnestSourceColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneUnnestSourceColumns.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.UnnestNode.Mapping;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.UnnestMapping.unnestMapping;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneValuesColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneValuesColumns.java
index 9423b47e63ee..024e90cb0091 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneValuesColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneValuesColumns.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneWindowColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneWindowColumns.java
index 7815bcf45dac..e173250d730e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneWindowColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneWindowColumns.java
@@ -31,9 +31,8 @@
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.WindowNode;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.WindowFrame;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -56,7 +55,7 @@
 public class TestPruneWindowColumns
         extends BaseRuleTest
 {
-    private static final ResolvedFunction MIN_FUNCTION = new TestingFunctionResolution().resolveFunction(QualifiedName.of("min"), fromTypes(BIGINT));
+    private static final ResolvedFunction MIN_FUNCTION = new TestingFunctionResolution().resolveFunction("min", fromTypes(BIGINT));
 
     private static final List<String> inputSymbolNameList =
             ImmutableList.of("orderKey", "partitionKey", "hash", "startValue1", "startValue2", "endValue1", "endValue2", "input1", "input2", "unused");
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushAggregationThroughOuterJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushAggregationThroughOuterJoin.java
index d1c38d08d157..e47fd6e7b23c 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushAggregationThroughOuterJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushAggregationThroughOuterJoin.java
@@ -22,7 +22,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.JoinNode.EquiJoinClause;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushCastIntoRow.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushCastIntoRow.java
index 3fbb38be8771..9a689fa4227b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushCastIntoRow.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushCastIntoRow.java
@@ -16,7 +16,7 @@
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushDistinctLimitIntoTableScan.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushDistinctLimitIntoTableScan.java
index b3d50fecfd3e..873750d13d62 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushDistinctLimitIntoTableScan.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushDistinctLimitIntoTableScan.java
@@ -29,9 +29,9 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.TestingSession;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
 
 import java.util.List;
 import java.util.Map;
@@ -47,7 +47,7 @@
 import static java.util.stream.Collectors.toUnmodifiableList;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true) // shared mutable state
+@ResourceLock("TestPushDistinctLimitIntoTableScan")
 public class TestPushDistinctLimitIntoTableScan
         extends BaseRuleTest
 {
@@ -82,7 +82,7 @@ protected Optional<LocalQueryRunner> createLocalQueryRunner()
         return Optional.of(queryRunner);
     }
 
-    @BeforeClass
+    @BeforeAll
     public void init()
     {
         rule = new PushDistinctLimitIntoTableScan(tester().getPlannerContext(), tester().getTypeAnalyzer());
@@ -90,15 +90,10 @@ public void init()
         tableHandle = tester().getCurrentCatalogTableHandle("mock_schema", "mock_nation");
     }
 
-    @BeforeMethod
-    public void reset()
-    {
-        testApplyAggregation = null;
-    }
-
     @Test
     public void testDoesNotFireIfNoTableScan()
     {
+        testApplyAggregation = null;
         tester().assertThat(rule)
                 .on(p -> p.values(p.symbol("a", BIGINT)))
                 .doesNotFire();
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushDownDereferencesRules.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushDownDereferencesRules.java
index a864efdfce42..383e471b9c6b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushDownDereferencesRules.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushDownDereferencesRules.java
@@ -32,15 +32,13 @@
 import io.trino.sql.planner.plan.UnnestNode;
 import io.trino.sql.planner.plan.WindowNode;
 import io.trino.sql.tree.FrameBound;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SortItem;
 import io.trino.sql.tree.WindowFrame;
 import io.trino.testing.TestingTransactionHandle;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
-import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.metadata.MetadataManager.createTestMetadataManager;
 import static io.trino.spi.connector.SortOrder.ASC_NULLS_FIRST;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -599,7 +597,7 @@ public void testPushdownDereferenceThroughWindow()
                                                 p.symbol("msg6", ROW_TYPE),
                                                 // min function on MSG_TYPE
                                                 new WindowNode.Function(
-                                                        createTestMetadataManager().resolveFunction(TEST_SESSION, QualifiedName.of("min"), fromTypes(ROW_TYPE)),
+                                                        createTestMetadataManager().resolveBuiltinFunction("min", fromTypes(ROW_TYPE)),
                                                         ImmutableList.of(p.symbol("msg3", ROW_TYPE).toSymbolReference()),
                                                         new WindowNode.Frame(
                                                                 WindowFrame.Type.RANGE,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushDownProjectionsFromPatternRecognition.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushDownProjectionsFromPatternRecognition.java
index 52a17ddd9e7f..f5907b99f7fe 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushDownProjectionsFromPatternRecognition.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushDownProjectionsFromPatternRecognition.java
@@ -21,9 +21,8 @@
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.metadata.MetadataManager.createTestMetadataManager;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
@@ -36,7 +35,7 @@
 public class TestPushDownProjectionsFromPatternRecognition
         extends BaseRuleTest
 {
-    private static final QualifiedName MAX_BY = createTestMetadataManager().resolveFunction(TEST_SESSION, QualifiedName.of("max_by"), fromTypes(BIGINT, BIGINT)).toQualifiedName();
+    private static final QualifiedName MAX_BY = createTestMetadataManager().resolveBuiltinFunction("max_by", fromTypes(BIGINT, BIGINT)).toQualifiedName();
 
     @Test
     public void testNoAggregations()
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushFilterThroughCountAggregation.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushFilterThroughCountAggregation.java
index c3a611a83c2f..561441a30f33 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushFilterThroughCountAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushFilterThroughCountAggregation.java
@@ -21,7 +21,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.aggregation;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushInequalityFilterExpressionBelowJoinRuleSet.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushInequalityFilterExpressionBelowJoinRuleSet.java
index 6fe4e2ccca46..1c9664fc180d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushInequalityFilterExpressionBelowJoinRuleSet.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushInequalityFilterExpressionBelowJoinRuleSet.java
@@ -20,8 +20,8 @@
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.GenericLiteral;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
@@ -41,7 +41,7 @@ public class TestPushInequalityFilterExpressionBelowJoinRuleSet
 {
     private PushInequalityFilterExpressionBelowJoinRuleSet ruleSet;
 
-    @BeforeClass
+    @BeforeAll
     public void setUpBeforeClass()
     {
         ruleSet = new PushInequalityFilterExpressionBelowJoinRuleSet(tester().getMetadata(), tester().getTypeAnalyzer());
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushJoinIntoTableScan.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushJoinIntoTableScan.java
index 4bfc8c951e8d..f2b39af3952f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushJoinIntoTableScan.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushJoinIntoTableScan.java
@@ -42,14 +42,16 @@
 import io.trino.sql.tree.ArithmeticBinaryExpression;
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.GenericLiteral;
-import org.assertj.core.api.Assertions;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import static com.google.common.base.Predicates.equalTo;
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -126,15 +128,16 @@ public class TestPushJoinIntoTableScan
             .map(entry -> new ColumnMetadata(((MockConnectorColumnHandle) entry.getValue()).getName(), ((MockConnectorColumnHandle) entry.getValue()).getType()))
             .collect(toImmutableList());
 
-    @Test(dataProvider = "testPushJoinIntoTableScanParams")
+    @ParameterizedTest
+    @MethodSource("testPushJoinIntoTableScanParams")
     public void testPushJoinIntoTableScan(JoinNode.Type joinType, Optional<ComparisonExpression.Operator> filterComparisonOperator)
     {
         MockConnectorFactory connectorFactory = createMockConnectorFactory((session, applyJoinType, left, right, joinConditions, leftAssignments, rightAssignments) -> {
             assertThat(((MockConnectorTableHandle) left).getTableName()).isEqualTo(TABLE_A_SCHEMA_TABLE_NAME);
             assertThat(((MockConnectorTableHandle) right).getTableName()).isEqualTo(TABLE_B_SCHEMA_TABLE_NAME);
-            Assertions.assertThat(applyJoinType).isEqualTo(toSpiJoinType(joinType));
+            assertThat(applyJoinType).isEqualTo(toSpiJoinType(joinType));
             JoinCondition.Operator expectedOperator = filterComparisonOperator.map(this::getConditionOperator).orElse(JoinCondition.Operator.EQUAL);
-            Assertions.assertThat(joinConditions).containsExactly(new JoinCondition(expectedOperator, COLUMN_A1_VARIABLE, COLUMN_B1_VARIABLE));
+            assertThat(joinConditions).containsExactly(new JoinCondition(expectedOperator, COLUMN_A1_VARIABLE, COLUMN_B1_VARIABLE));
 
             return Optional.of(new JoinApplicationResult<>(
                     JOIN_CONNECTOR_TABLE_HANDLE,
@@ -144,6 +147,7 @@ public void testPushJoinIntoTableScan(JoinNode.Type joinType, Optional<Compariso
         });
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(connectorFactory).build()) {
             ruleTester.assertThat(new PushJoinIntoTableScan(ruleTester.getPlannerContext(), ruleTester.getTypeAnalyzer()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol columnA1Symbol = p.symbol(COLUMN_A1);
                         Symbol columnA2Symbol = p.symbol(COLUMN_A2);
@@ -172,53 +176,50 @@ public void testPushJoinIntoTableScan(JoinNode.Type joinType, Optional<Compariso
                                 right,
                                 new ComparisonExpression(filterComparisonOperator.get(), columnA1Symbol.toSymbolReference(), columnB1Symbol.toSymbolReference()));
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(
                             project(
                                     tableScan(JOIN_PUSHDOWN_SCHEMA_TABLE_NAME.getTableName())));
         }
     }
 
-    @DataProvider
-    public static Object[][] testPushJoinIntoTableScanParams()
+    public static Stream<Arguments> testPushJoinIntoTableScanParams()
     {
-        return new Object[][] {
-                {INNER, Optional.empty()},
-                {INNER, Optional.of(ComparisonExpression.Operator.EQUAL)},
-                {INNER, Optional.of(ComparisonExpression.Operator.LESS_THAN)},
-                {INNER, Optional.of(ComparisonExpression.Operator.LESS_THAN_OR_EQUAL)},
-                {INNER, Optional.of(ComparisonExpression.Operator.GREATER_THAN)},
-                {INNER, Optional.of(ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL)},
-                {INNER, Optional.of(ComparisonExpression.Operator.NOT_EQUAL)},
-                {INNER, Optional.of(ComparisonExpression.Operator.IS_DISTINCT_FROM)},
-
-                {JoinNode.Type.LEFT, Optional.empty()},
-                {JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.EQUAL)},
-                {JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.LESS_THAN)},
-                {JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.LESS_THAN_OR_EQUAL)},
-                {JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.GREATER_THAN)},
-                {JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL)},
-                {JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.NOT_EQUAL)},
-                {JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.IS_DISTINCT_FROM)},
-
-                {JoinNode.Type.RIGHT, Optional.empty()},
-                {JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.EQUAL)},
-                {JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.LESS_THAN)},
-                {JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.LESS_THAN_OR_EQUAL)},
-                {JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.GREATER_THAN)},
-                {JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL)},
-                {JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.NOT_EQUAL)},
-                {JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.IS_DISTINCT_FROM)},
-
-                {JoinNode.Type.FULL, Optional.empty()},
-                {JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.EQUAL)},
-                {JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.LESS_THAN)},
-                {JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.LESS_THAN_OR_EQUAL)},
-                {JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.GREATER_THAN)},
-                {JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL)},
-                {JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.NOT_EQUAL)},
-                {JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.IS_DISTINCT_FROM)},
-        };
+        return Stream.of(
+                Arguments.of(INNER, Optional.empty()),
+                Arguments.of(INNER, Optional.of(ComparisonExpression.Operator.EQUAL)),
+                Arguments.of(INNER, Optional.of(ComparisonExpression.Operator.LESS_THAN)),
+                Arguments.of(INNER, Optional.of(ComparisonExpression.Operator.LESS_THAN_OR_EQUAL)),
+                Arguments.of(INNER, Optional.of(ComparisonExpression.Operator.GREATER_THAN)),
+                Arguments.of(INNER, Optional.of(ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL)),
+                Arguments.of(INNER, Optional.of(ComparisonExpression.Operator.NOT_EQUAL)),
+                Arguments.of(INNER, Optional.of(ComparisonExpression.Operator.IS_DISTINCT_FROM)),
+
+                Arguments.of(JoinNode.Type.LEFT, Optional.empty()),
+                Arguments.of(JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.EQUAL)),
+                Arguments.of(JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.LESS_THAN)),
+                Arguments.of(JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.LESS_THAN_OR_EQUAL)),
+                Arguments.of(JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.GREATER_THAN)),
+                Arguments.of(JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL)),
+                Arguments.of(JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.NOT_EQUAL)),
+                Arguments.of(JoinNode.Type.LEFT, Optional.of(ComparisonExpression.Operator.IS_DISTINCT_FROM)),
+
+                Arguments.of(JoinNode.Type.RIGHT, Optional.empty()),
+                Arguments.of(JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.EQUAL)),
+                Arguments.of(JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.LESS_THAN)),
+                Arguments.of(JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.LESS_THAN_OR_EQUAL)),
+                Arguments.of(JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.GREATER_THAN)),
+                Arguments.of(JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL)),
+                Arguments.of(JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.NOT_EQUAL)),
+                Arguments.of(JoinNode.Type.RIGHT, Optional.of(ComparisonExpression.Operator.IS_DISTINCT_FROM)),
+
+                Arguments.of(JoinNode.Type.FULL, Optional.empty()),
+                Arguments.of(JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.EQUAL)),
+                Arguments.of(JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.LESS_THAN)),
+                Arguments.of(JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.LESS_THAN_OR_EQUAL)),
+                Arguments.of(JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.GREATER_THAN)),
+                Arguments.of(JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL)),
+                Arguments.of(JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.NOT_EQUAL)),
+                Arguments.of(JoinNode.Type.FULL, Optional.of(ComparisonExpression.Operator.IS_DISTINCT_FROM)));
     }
 
     /**
@@ -248,6 +249,7 @@ public void testPushJoinIntoTableScanWithComplexFilter()
                 });
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(connectorFactory).build()) {
             ruleTester.assertThat(new PushJoinIntoTableScan(ruleTester.getPlannerContext(), ruleTester.getTypeAnalyzer()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol columnA1Symbol = p.symbol(COLUMN_A1);
                         Symbol columnA2Symbol = p.symbol(COLUMN_A2);
@@ -272,7 +274,6 @@ public void testPushJoinIntoTableScanWithComplexFilter()
                                         new ArithmeticBinaryExpression(ArithmeticBinaryExpression.Operator.MULTIPLY, new GenericLiteral("BIGINT", "44"), columnA1Symbol.toSymbolReference()),
                                         columnB1Symbol.toSymbolReference()));
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(
                             project(
                                     tableScan(JOIN_PUSHDOWN_SCHEMA_TABLE_NAME.getTableName())));
@@ -291,6 +292,7 @@ public void testPushJoinIntoTableScanDoesNotFireForDifferentCatalogs()
             TableHandle tableBHandleAnotherCatalog = createTableHandle(new MockConnectorTableHandle(new SchemaTableName(SCHEMA, TABLE_B)), createTestCatalogHandle("another_catalog"));
 
             ruleTester.assertThat(new PushJoinIntoTableScan(ruleTester.getPlannerContext(), ruleTester.getTypeAnalyzer()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol columnA1Symbol = p.symbol(COLUMN_A1);
                         Symbol columnA2Symbol = p.symbol(COLUMN_A2);
@@ -312,7 +314,6 @@ public void testPushJoinIntoTableScanDoesNotFireForDifferentCatalogs()
                                 right,
                                 new JoinNode.EquiJoinClause(columnA1Symbol, columnB1Symbol));
                     })
-                    .withSession(MOCK_SESSION)
                     .doesNotFire();
         }
     }
@@ -330,6 +331,7 @@ public void testPushJoinIntoTableScanDoesNotFireWhenDisabled()
                 });
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(connectorFactory).build()) {
             ruleTester.assertThat(new PushJoinIntoTableScan(ruleTester.getPlannerContext(), ruleTester.getTypeAnalyzer()))
+                    .withSession(joinPushDownDisabledSession)
                     .on(p -> {
                         Symbol columnA1Symbol = p.symbol(COLUMN_A1);
                         Symbol columnA2Symbol = p.symbol(COLUMN_A2);
@@ -351,7 +353,6 @@ public void testPushJoinIntoTableScanDoesNotFireWhenDisabled()
                                 right,
                                 new JoinNode.EquiJoinClause(columnA1Symbol, columnB1Symbol));
                     })
-                    .withSession(joinPushDownDisabledSession)
                     .doesNotFire();
         }
     }
@@ -369,6 +370,7 @@ public void testPushJoinIntoTableScanDoesNotFireWhenAllPushdownsDisabled()
                 });
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(connectorFactory).build()) {
             ruleTester.assertThat(new PushJoinIntoTableScan(ruleTester.getPlannerContext(), ruleTester.getTypeAnalyzer()))
+                    .withSession(allPushdownsDisabledSession)
                     .on(p -> {
                         Symbol columnA1Symbol = p.symbol(COLUMN_A1);
                         Symbol columnA2Symbol = p.symbol(COLUMN_A2);
@@ -390,12 +392,12 @@ public void testPushJoinIntoTableScanDoesNotFireWhenAllPushdownsDisabled()
                                 right,
                                 new JoinNode.EquiJoinClause(columnA1Symbol, columnB1Symbol));
                     })
-                    .withSession(allPushdownsDisabledSession)
                     .doesNotFire();
         }
     }
 
-    @Test(dataProvider = "testPushJoinIntoTableScanPreservesEnforcedConstraintParams")
+    @ParameterizedTest
+    @MethodSource("testPushJoinIntoTableScanPreservesEnforcedConstraintParams")
     public void testPushJoinIntoTableScanPreservesEnforcedConstraint(JoinNode.Type joinType, TupleDomain<ColumnHandle> leftConstraint, TupleDomain<ColumnHandle> rightConstraint, TupleDomain<Predicate<ColumnHandle>> expectedConstraint)
     {
         MockConnectorFactory connectorFactory = createMockConnectorFactory((session, applyJoinType, left, right, joinConditions, leftAssignments, rightAssignments) -> Optional.of(new JoinApplicationResult<>(
@@ -405,6 +407,7 @@ public void testPushJoinIntoTableScanPreservesEnforcedConstraint(JoinNode.Type j
                 false)));
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(connectorFactory).build()) {
             ruleTester.assertThat(new PushJoinIntoTableScan(ruleTester.getPlannerContext(), ruleTester.getTypeAnalyzer()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol columnA1Symbol = p.symbol(COLUMN_A1);
                         Symbol columnA2Symbol = p.symbol(COLUMN_A2);
@@ -429,7 +432,6 @@ public void testPushJoinIntoTableScanPreservesEnforcedConstraint(JoinNode.Type j
                                 right,
                                 new JoinNode.EquiJoinClause(columnA1Symbol, columnB1Symbol));
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(
                             project(
                                     tableScan(
@@ -439,14 +441,13 @@ public void testPushJoinIntoTableScanPreservesEnforcedConstraint(JoinNode.Type j
         }
     }
 
-    @DataProvider
-    public static Object[][] testPushJoinIntoTableScanPreservesEnforcedConstraintParams()
+    public static Stream<Arguments> testPushJoinIntoTableScanPreservesEnforcedConstraintParams()
     {
         Domain columnA1Domain = Domain.multipleValues(BIGINT, List.of(3L));
         Domain columnA2Domain = Domain.multipleValues(BIGINT, List.of(10L, 20L));
         Domain columnB1Domain = Domain.multipleValues(BIGINT, List.of(30L, 40L));
-        return new Object[][] {
-                {
+        return Stream.of(
+                Arguments.of(
                         INNER,
                         TupleDomain.withColumnDomains(Map.of(
                                 COLUMN_A1_HANDLE, columnA1Domain,
@@ -456,9 +457,8 @@ public static Object[][] testPushJoinIntoTableScanPreservesEnforcedConstraintPar
                         TupleDomain.withColumnDomains(Map.of(
                                 equalTo(JOIN_COLUMN_A1_HANDLE), columnA1Domain,
                                 equalTo(JOIN_COLUMN_A2_HANDLE), columnA2Domain,
-                                equalTo(JOIN_COLUMN_B1_HANDLE), columnB1Domain))
-                },
-                {
+                                equalTo(JOIN_COLUMN_B1_HANDLE), columnB1Domain))),
+                Arguments.of(
                         RIGHT,
                         TupleDomain.withColumnDomains(Map.of(
                                 COLUMN_A1_HANDLE, columnA1Domain,
@@ -468,9 +468,8 @@ public static Object[][] testPushJoinIntoTableScanPreservesEnforcedConstraintPar
                         TupleDomain.withColumnDomains(Map.of(
                                 equalTo(JOIN_COLUMN_A1_HANDLE), columnA1Domain.union(onlyNull(BIGINT)),
                                 equalTo(JOIN_COLUMN_A2_HANDLE), columnA2Domain.union(onlyNull(BIGINT)),
-                                equalTo(JOIN_COLUMN_B1_HANDLE), columnB1Domain))
-                },
-                {
+                                equalTo(JOIN_COLUMN_B1_HANDLE), columnB1Domain))),
+                Arguments.of(
                         LEFT,
                         TupleDomain.withColumnDomains(Map.of(
                                 COLUMN_A1_HANDLE, columnA1Domain,
@@ -480,9 +479,8 @@ public static Object[][] testPushJoinIntoTableScanPreservesEnforcedConstraintPar
                         TupleDomain.withColumnDomains(Map.of(
                                 equalTo(JOIN_COLUMN_A1_HANDLE), columnA1Domain,
                                 equalTo(JOIN_COLUMN_A2_HANDLE), columnA2Domain,
-                                equalTo(JOIN_COLUMN_B1_HANDLE), columnB1Domain.union(onlyNull(BIGINT))))
-                },
-                {
+                                equalTo(JOIN_COLUMN_B1_HANDLE), columnB1Domain.union(onlyNull(BIGINT))))),
+                Arguments.of(
                         FULL,
                         TupleDomain.withColumnDomains(Map.of(
                                 COLUMN_A1_HANDLE, columnA1Domain,
@@ -492,9 +490,7 @@ public static Object[][] testPushJoinIntoTableScanPreservesEnforcedConstraintPar
                         TupleDomain.withColumnDomains(Map.of(
                                 equalTo(JOIN_COLUMN_A1_HANDLE), columnA1Domain.union(onlyNull(BIGINT)),
                                 equalTo(JOIN_COLUMN_A2_HANDLE), columnA2Domain.union(onlyNull(BIGINT)),
-                                equalTo(JOIN_COLUMN_B1_HANDLE), columnB1Domain.union(onlyNull(BIGINT))))
-                }
-        };
+                                equalTo(JOIN_COLUMN_B1_HANDLE), columnB1Domain.union(onlyNull(BIGINT))))));
     }
 
     @Test
@@ -506,6 +502,7 @@ public void testPushJoinIntoTableDoesNotFireForCrossJoin()
                 });
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(connectorFactory).build()) {
             ruleTester.assertThat(new PushJoinIntoTableScan(ruleTester.getPlannerContext(), ruleTester.getTypeAnalyzer()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol columnA1Symbol = p.symbol(COLUMN_A1);
                         Symbol columnA2Symbol = p.symbol(COLUMN_A2);
@@ -528,7 +525,6 @@ public void testPushJoinIntoTableDoesNotFireForCrossJoin()
                                 left,
                                 right);
                     })
-                    .withSession(MOCK_SESSION)
                     .doesNotFire();
         }
     }
@@ -545,6 +541,7 @@ public void testPushJoinIntoTableRequiresFullColumnHandleMappingInResult()
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(connectorFactory).build()) {
             assertThatThrownBy(() -> {
                 ruleTester.assertThat(new PushJoinIntoTableScan(ruleTester.getPlannerContext(), ruleTester.getTypeAnalyzer()))
+                        .withSession(MOCK_SESSION)
                         .on(p -> {
                             Symbol columnA1Symbol = p.symbol(COLUMN_A1);
                             Symbol columnA2Symbol = p.symbol(COLUMN_A2);
@@ -574,7 +571,6 @@ public void testPushJoinIntoTableRequiresFullColumnHandleMappingInResult()
                                     right,
                                     new JoinNode.EquiJoinClause(columnA1Symbol, columnB1Symbol));
                         })
-                        .withSession(MOCK_SESSION)
                         .matches(anyTree());
             })
                     .isInstanceOf(IllegalStateException.class)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughMarkDistinct.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughMarkDistinct.java
index 1e753cd9c948..3a6f565539fa 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughMarkDistinct.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughMarkDistinct.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.plan.LimitNode;
 import io.trino.sql.planner.plan.MarkDistinctNode;
 import io.trino.sql.planner.plan.ValuesNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.limit;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughOffset.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughOffset.java
index 32ac964f123b..6f8703cb1d6a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughOffset.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughOffset.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.limit;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.offset;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughOuterJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughOuterJoin.java
index c493ce190beb..7f8c9b23a764 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughOuterJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughOuterJoin.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.JoinNode.EquiJoinClause;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.join;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.limit;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughProject.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughProject.java
index 278dd20f6dc4..7ca7eee1d73d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughProject.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughProject.java
@@ -23,7 +23,7 @@
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.SubscriptExpression;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughSemiJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughSemiJoin.java
index 6f144989693a..d1219f8850f9 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughSemiJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughSemiJoin.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.PlanNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughUnion.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughUnion.java
index d6b1c21b574a..217bcd2857dd 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughUnion.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushLimitThroughUnion.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableListMultimap;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.limit;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.union;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushMergeWriterUpdateIntoConnector.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushMergeWriterUpdateIntoConnector.java
new file mode 100644
index 000000000000..df5c42e99000
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushMergeWriterUpdateIntoConnector.java
@@ -0,0 +1,198 @@
+/*
+ * Licensed 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 io.trino.sql.planner.iterative.rule;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.trino.Session;
+import io.trino.connector.MockConnectorFactory;
+import io.trino.metadata.AbstractMockMetadata;
+import io.trino.metadata.TableHandle;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.TestingColumnHandle;
+import io.trino.spi.expression.Constant;
+import io.trino.sql.PlannerContext;
+import io.trino.sql.planner.Symbol;
+import io.trino.sql.planner.TypeAnalyzer;
+import io.trino.sql.planner.iterative.rule.test.RuleTester;
+import io.trino.sql.planner.plan.Assignments;
+import io.trino.sql.planner.plan.TableUpdateNode;
+import io.trino.sql.planner.plan.TableWriterNode;
+import io.trino.sql.tree.ArithmeticBinaryExpression;
+import io.trino.sql.tree.BooleanLiteral;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.FunctionCall;
+import io.trino.sql.tree.LongLiteral;
+import io.trino.sql.tree.Row;
+import io.trino.sql.tree.StringLiteral;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static io.trino.spi.connector.RowChangeParadigm.DELETE_ROW_AND_INSERT_ROW;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
+
+public class TestPushMergeWriterUpdateIntoConnector
+{
+    private static final String TEST_SCHEMA = "test_schema";
+    private static final String TEST_TABLE = "test_table";
+    private static final SchemaTableName SCHEMA_TABLE_NAME = new SchemaTableName(TEST_SCHEMA, TEST_TABLE);
+
+    @Test
+    public void testPushUpdateIntoConnector()
+    {
+        List<String> columnNames = ImmutableList.of("column_1", "column_2");
+        MockConnectorFactory factory = MockConnectorFactory.builder().build();
+        try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(factory).build()) {
+            ruleTester.assertThat(createRule(ruleTester))
+                    .on(p -> {
+                        Symbol mergeRow = p.symbol("merge_row");
+                        Symbol rowId = p.symbol("row_id");
+                        Symbol rowCount = p.symbol("row_count");
+                        // set column name and constant update
+                        Expression updateMergeRowExpression = new Row(ImmutableList.of(p.symbol("column_1").toSymbolReference(), new LongLiteral("1"), new BooleanLiteral("true"), new LongLiteral("1"), new LongLiteral("1")));
+
+                        return p.tableFinish(
+                                p.merge(
+                                        p.mergeProcessor(SCHEMA_TABLE_NAME,
+                                                p.project(new Assignments(Map.of(mergeRow, updateMergeRowExpression)),
+                                                        p.tableScan(tableScanBuilder -> tableScanBuilder
+                                                                .setAssignments(ImmutableMap.of())
+                                                                .setSymbols(ImmutableList.of())
+                                                                .setTableHandle(ruleTester.getCurrentCatalogTableHandle(TEST_SCHEMA, TEST_TABLE)).build())),
+                                                mergeRow,
+                                                rowId,
+                                                ImmutableList.of(),
+                                                ImmutableList.of(),
+                                                ImmutableList.of()),
+                                        p.mergeTarget(SCHEMA_TABLE_NAME, new TableWriterNode.MergeParadigmAndTypes(Optional.of(DELETE_ROW_AND_INSERT_ROW), ImmutableList.of(), columnNames, INTEGER)),
+                                        mergeRow,
+                                        rowId,
+                                        ImmutableList.of()),
+                                p.mergeTarget(SCHEMA_TABLE_NAME),
+                                rowCount);
+                    })
+                    .matches(node(TableUpdateNode.class));
+        }
+    }
+
+    @Test
+    public void testPushUpdateIntoConnectorArithmeticExpression()
+    {
+        List<String> columnNames = ImmutableList.of("column_1", "column_2");
+        MockConnectorFactory factory = MockConnectorFactory.builder().build();
+        try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(factory).build()) {
+            ruleTester.assertThat(createRule(ruleTester))
+                    .on(p -> {
+                        Symbol mergeRow = p.symbol("merge_row");
+                        Symbol rowId = p.symbol("row_id");
+                        Symbol rowCount = p.symbol("row_count");
+                        // set arithmetic expression which we don't support yet
+                        Expression updateMergeRowExpression = new Row(ImmutableList.of(p.symbol("column_1").toSymbolReference(),
+                                new ArithmeticBinaryExpression(ArithmeticBinaryExpression.Operator.MULTIPLY, p.symbol("col1").toSymbolReference(), new LongLiteral("5"))));
+
+                        return p.tableFinish(
+                                p.merge(
+                                        p.mergeProcessor(SCHEMA_TABLE_NAME,
+                                                p.project(new Assignments(Map.of(mergeRow, updateMergeRowExpression)),
+                                                        p.tableScan(tableScanBuilder -> tableScanBuilder
+                                                                .setAssignments(ImmutableMap.of())
+                                                                .setSymbols(ImmutableList.of())
+                                                                .setTableHandle(ruleTester.getCurrentCatalogTableHandle(TEST_SCHEMA, TEST_TABLE)).build())),
+                                                mergeRow,
+                                                rowId,
+                                                ImmutableList.of(),
+                                                ImmutableList.of(),
+                                                ImmutableList.of()),
+                                        p.mergeTarget(SCHEMA_TABLE_NAME, new TableWriterNode.MergeParadigmAndTypes(Optional.of(DELETE_ROW_AND_INSERT_ROW), ImmutableList.of(), columnNames, INTEGER)),
+                                        mergeRow,
+                                        rowId,
+                                        ImmutableList.of()),
+                                p.mergeTarget(SCHEMA_TABLE_NAME),
+                                rowCount);
+                    })
+                    .doesNotFire();
+        }
+    }
+
+    @Test
+    public void testPushUpdateIntoConnectorUpdateAll()
+    {
+        List<String> columnNames = ImmutableList.of("column_1", "column_2");
+        MockConnectorFactory factory = MockConnectorFactory.builder().build();
+        try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(factory).build()) {
+            ruleTester.assertThat(createRule(ruleTester))
+                    .on(p -> {
+                        Symbol mergeRow = p.symbol("merge_row");
+                        Symbol rowId = p.symbol("row_id");
+                        Symbol rowCount = p.symbol("row_count");
+                        // set function call, which represents update all columns statement
+                        Expression updateMergeRowExpression = new Row(ImmutableList.of(new FunctionCall(
+                                ruleTester.getMetadata().resolveBuiltinFunction("from_base64", fromTypes(VARCHAR)).toQualifiedName(),
+                                ImmutableList.of(new StringLiteral("")))));
+
+                        return p.tableFinish(
+                                p.merge(
+                                        p.mergeProcessor(SCHEMA_TABLE_NAME,
+                                                p.project(new Assignments(Map.of(mergeRow, updateMergeRowExpression)),
+                                                        p.tableScan(tableScanBuilder -> tableScanBuilder
+                                                                .setAssignments(ImmutableMap.of())
+                                                                .setSymbols(ImmutableList.of())
+                                                                .setTableHandle(ruleTester.getCurrentCatalogTableHandle(TEST_SCHEMA, TEST_TABLE)).build())),
+                                                mergeRow,
+                                                rowId,
+                                                ImmutableList.of(),
+                                                ImmutableList.of(),
+                                                ImmutableList.of()),
+                                        p.mergeTarget(SCHEMA_TABLE_NAME, new TableWriterNode.MergeParadigmAndTypes(Optional.of(DELETE_ROW_AND_INSERT_ROW), ImmutableList.of(), columnNames, INTEGER)),
+                                        mergeRow,
+                                        rowId,
+                                        ImmutableList.of()),
+                                p.mergeTarget(SCHEMA_TABLE_NAME),
+                                rowCount);
+                    })
+                    .doesNotFire();
+        }
+    }
+
+    private static PushMergeWriterUpdateIntoConnector createRule(RuleTester tester)
+    {
+        PlannerContext plannerContext = tester.getPlannerContext();
+        TypeAnalyzer typeAnalyzer = tester.getTypeAnalyzer();
+        return new PushMergeWriterUpdateIntoConnector(
+                plannerContext,
+                typeAnalyzer,
+                new AbstractMockMetadata()
+                {
+                    @Override
+                    public Optional<TableHandle> applyUpdate(Session session, TableHandle tableHandle, Map<ColumnHandle, Constant> assignments)
+                    {
+                        return Optional.of(tableHandle);
+                    }
+
+                    @Override
+                    public Map<String, ColumnHandle> getColumnHandles(Session session, TableHandle tableHandle)
+                    {
+                        return Map.of("column_1", new TestingColumnHandle("column_1"),
+                                "column_2", new TestingColumnHandle("column_2"));
+                    }
+                });
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushOffsetThroughProject.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushOffsetThroughProject.java
index 258c45ee3bc7..114f498ab72f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushOffsetThroughProject.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushOffsetThroughProject.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.offset;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPartialAggregationThroughJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPartialAggregationThroughJoin.java
index b7019f359385..d9f09f2a8e1d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPartialAggregationThroughJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPartialAggregationThroughJoin.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.JoinNode.EquiJoinClause;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateIntoTableScan.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateIntoTableScan.java
index e43616cfd956..d2c98927016f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateIntoTableScan.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateIntoTableScan.java
@@ -46,12 +46,11 @@
 import io.trino.sql.tree.LogicalExpression;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NullLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.testing.TestingTransactionHandle;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Optional;
@@ -94,7 +93,7 @@ public class TestPushPredicateIntoTableScan
     private TableHandle ordersTableHandle;
     private final TestingFunctionResolution functionResolution = new TestingFunctionResolution();
 
-    @BeforeClass
+    @BeforeAll
     public void setUpBeforeClass()
     {
         pushPredicateIntoTableScan = new PushPredicateIntoTableScan(tester().getPlannerContext(), createTestingTypeAnalyzer(tester().getPlannerContext()), false);
@@ -117,7 +116,7 @@ public void setUpBeforeClass()
     }
 
     @Test
-    public void doesNotFireIfNoTableScan()
+    public void testDoesNotFireIfNoTableScan()
     {
         tester().assertThat(pushPredicateIntoTableScan)
                 .on(p -> p.values(p.symbol("a", BIGINT)))
@@ -125,7 +124,7 @@ public void doesNotFireIfNoTableScan()
     }
 
     @Test
-    public void eliminateTableScanWhenNoLayoutExist()
+    public void testEliminateTableScanWhenNoLayoutExist()
     {
         tester().assertThat(pushPredicateIntoTableScan)
                 .on(p -> p.filter(expression("orderstatus = 'G'"),
@@ -137,7 +136,7 @@ public void eliminateTableScanWhenNoLayoutExist()
     }
 
     @Test
-    public void replaceWithExistsWhenNoLayoutExist()
+    public void testReplaceWithExistsWhenNoLayoutExist()
     {
         ColumnHandle columnHandle = new TpchColumnHandle("nationkey", BIGINT);
         tester().assertThat(pushPredicateIntoTableScan)
@@ -152,7 +151,7 @@ public void replaceWithExistsWhenNoLayoutExist()
     }
 
     @Test
-    public void consumesDeterministicPredicateIfNewDomainIsSame()
+    public void testConsumesDeterministicPredicateIfNewDomainIsSame()
     {
         ColumnHandle columnHandle = new TpchColumnHandle("nationkey", BIGINT);
         tester().assertThat(pushPredicateIntoTableScan)
@@ -170,7 +169,7 @@ public void consumesDeterministicPredicateIfNewDomainIsSame()
     }
 
     @Test
-    public void consumesDeterministicPredicateIfNewDomainIsWider()
+    public void testConsumesDeterministicPredicateIfNewDomainIsWider()
     {
         ColumnHandle columnHandle = new TpchColumnHandle("nationkey", BIGINT);
         tester().assertThat(pushPredicateIntoTableScan)
@@ -188,7 +187,7 @@ public void consumesDeterministicPredicateIfNewDomainIsWider()
     }
 
     @Test
-    public void consumesDeterministicPredicateIfNewDomainIsNarrower()
+    public void testConsumesDeterministicPredicateIfNewDomainIsNarrower()
     {
         Type orderStatusType = createVarcharType(1);
         ColumnHandle columnHandle = new TpchColumnHandle("orderstatus", orderStatusType);
@@ -206,7 +205,7 @@ public void consumesDeterministicPredicateIfNewDomainIsNarrower()
     }
 
     @Test
-    public void doesNotConsumeRemainingPredicateIfNewDomainIsWider()
+    public void testDoesNotConsumeRemainingPredicateIfNewDomainIsWider()
     {
         ColumnHandle columnHandle = new TpchColumnHandle("nationkey", BIGINT);
         tester().assertThat(pushPredicateIntoTableScan)
@@ -217,7 +216,7 @@ public void doesNotConsumeRemainingPredicateIfNewDomainIsWider()
                                         new ComparisonExpression(
                                                 EQUAL,
                                                 functionResolution
-                                                        .functionCallBuilder(QualifiedName.of("rand"))
+                                                        .functionCallBuilder("rand")
                                                         .build(),
                                                 new GenericLiteral("BIGINT", "42")),
                                         // non-translatable to connector expression
@@ -251,7 +250,7 @@ public void doesNotConsumeRemainingPredicateIfNewDomainIsWider()
                                         new ComparisonExpression(
                                                 EQUAL,
                                                 functionResolution
-                                                        .functionCallBuilder(QualifiedName.of("rand"))
+                                                        .functionCallBuilder("rand")
                                                         .build(),
                                                 new GenericLiteral("BIGINT", "42")),
                                         new ComparisonExpression(
@@ -268,7 +267,7 @@ public void doesNotConsumeRemainingPredicateIfNewDomainIsWider()
     }
 
     @Test
-    public void doesNotFireOnNonDeterministicPredicate()
+    public void testDoesNotFireOnNonDeterministicPredicate()
     {
         ColumnHandle columnHandle = new TpchColumnHandle("nationkey", BIGINT);
         tester().assertThat(pushPredicateIntoTableScan)
@@ -276,7 +275,7 @@ public void doesNotFireOnNonDeterministicPredicate()
                         new ComparisonExpression(
                                 EQUAL,
                                 functionResolution
-                                        .functionCallBuilder(QualifiedName.of("rand"))
+                                        .functionCallBuilder("rand")
                                         .build(),
                                 new LongLiteral("42")),
                         p.tableScan(
@@ -288,7 +287,7 @@ public void doesNotFireOnNonDeterministicPredicate()
     }
 
     @Test
-    public void doesNotFireIfRuleNotChangePlan()
+    public void testDoesNotFireIfRuleNotChangePlan()
     {
         tester().assertThat(pushPredicateIntoTableScan)
                 .on(p -> p.filter(expression("nationkey % 17 =  BIGINT '44' AND nationkey % 15 =  BIGINT '43'"),
@@ -301,7 +300,7 @@ public void doesNotFireIfRuleNotChangePlan()
     }
 
     @Test
-    public void ruleAddedTableLayoutToFilterTableScan()
+    public void testRuleAddedTableLayoutToFilterTableScan()
     {
         Map<String, Domain> filterConstraint = ImmutableMap.of("orderstatus", singleValue(createVarcharType(1), utf8Slice("F")));
         tester().assertThat(pushPredicateIntoTableScan)
@@ -315,7 +314,7 @@ public void ruleAddedTableLayoutToFilterTableScan()
     }
 
     @Test
-    public void nonDeterministicPredicate()
+    public void testNonDeterministicPredicate()
     {
         Type orderStatusType = createVarcharType(1);
         tester().assertThat(pushPredicateIntoTableScan)
@@ -328,7 +327,7 @@ public void nonDeterministicPredicate()
                                 new ComparisonExpression(
                                         EQUAL,
                                         functionResolution
-                                                .functionCallBuilder(QualifiedName.of("rand"))
+                                                .functionCallBuilder("rand")
                                                 .build(),
                                         new LongLiteral("0"))),
                         p.tableScan(
@@ -340,7 +339,7 @@ public void nonDeterministicPredicate()
                                 new ComparisonExpression(
                                         EQUAL,
                                         functionResolution
-                                                .functionCallBuilder(QualifiedName.of("rand"))
+                                                .functionCallBuilder("rand")
                                                 .build(),
                                         new LongLiteral("0")),
                                 constrainedTableScanWithTableLayout(
@@ -377,6 +376,36 @@ public void testPartitioningChanged()
                 .matches(tableScan("partitioned"));
     }
 
+    @Test
+    public void testEliminateTableScanWhenPredicateIsNull()
+    {
+        ColumnHandle nationKeyColumn = new TpchColumnHandle("nationkey", BIGINT);
+
+        tester().assertThat(pushPredicateIntoTableScan)
+                .on(p -> p.filter(expression("CAST(null AS boolean)"),
+                        p.tableScan(
+                                ordersTableHandle,
+                                ImmutableList.of(p.symbol("nationkey", BIGINT)),
+                                ImmutableMap.of(p.symbol("nationkey", BIGINT), nationKeyColumn))))
+                .matches(values(ImmutableList.of("A"), ImmutableList.of()));
+
+        tester().assertThat(pushPredicateIntoTableScan)
+                .on(p -> p.filter(expression("nationkey = CAST(null AS BIGINT)"),
+                        p.tableScan(
+                                ordersTableHandle,
+                                ImmutableList.of(p.symbol("nationkey", BIGINT)),
+                                ImmutableMap.of(p.symbol("nationkey", BIGINT), nationKeyColumn))))
+                .matches(values(ImmutableList.of("A"), ImmutableList.of()));
+
+        tester().assertThat(pushPredicateIntoTableScan)
+                .on(p -> p.filter(expression("nationkey = BIGINT '44' AND CAST(null AS boolean)"),
+                        p.tableScan(
+                                ordersTableHandle,
+                                ImmutableList.of(p.symbol("nationkey", BIGINT)),
+                                ImmutableMap.of(p.symbol("nationkey", BIGINT), nationKeyColumn))))
+                .matches(values(ImmutableList.of("A"), ImmutableList.of()));
+    }
+
     public static MockConnectorFactory createMockFactory()
     {
         MockConnectorFactory.Builder builder = MockConnectorFactory.builder();
@@ -396,7 +425,6 @@ public static MockConnectorFactory createMockFactory()
                                 TupleDomain.all(),
                                 Optional.of(new ConnectorTablePartitioning(PARTITIONING_HANDLE, ImmutableList.of(MOCK_COLUMN_HANDLE))),
                                 Optional.empty(),
-                                Optional.empty(),
                                 ImmutableList.of());
                     }
                     return new ConnectorTableProperties();
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateThroughProjectIntoRowNumber.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateThroughProjectIntoRowNumber.java
index d95746bb63b0..9fd2279cfa1c 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateThroughProjectIntoRowNumber.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateThroughProjectIntoRowNumber.java
@@ -21,7 +21,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateThroughProjectIntoWindow.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateThroughProjectIntoWindow.java
index d5d66669512e..bd4b45e91ecc 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateThroughProjectIntoWindow.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateThroughProjectIntoWindow.java
@@ -25,12 +25,10 @@
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
 import io.trino.sql.planner.plan.TopNRankingNode.RankingType;
 import io.trino.sql.planner.plan.WindowNode.Function;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
-import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.connector.SortOrder.ASC_NULLS_FIRST;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
@@ -281,7 +279,7 @@ private void assertPredicatePartiallySatisfied(Function rankingFunction, Ranking
     private Function rowNumberFunction()
     {
         return new Function(
-                tester().getMetadata().resolveFunction(TEST_SESSION, QualifiedName.of("row_number"), fromTypes()),
+                tester().getMetadata().resolveBuiltinFunction("row_number", fromTypes()),
                 ImmutableList.of(),
                 DEFAULT_FRAME,
                 false);
@@ -290,7 +288,7 @@ private Function rowNumberFunction()
     private Function rankFunction()
     {
         return new Function(
-                tester().getMetadata().resolveFunction(TEST_SESSION, QualifiedName.of("rank"), fromTypes()),
+                tester().getMetadata().resolveBuiltinFunction("rank", fromTypes()),
                 ImmutableList.of(),
                 DEFAULT_FRAME,
                 false);
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionIntoTableScan.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionIntoTableScan.java
index 6d46de442b80..8b3d874b7409 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionIntoTableScan.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionIntoTableScan.java
@@ -21,7 +21,6 @@
 import io.trino.cost.PlanNodeStatsEstimate;
 import io.trino.cost.ScalarStatsCalculator;
 import io.trino.cost.SymbolStatsEstimate;
-import io.trino.metadata.TableHandle;
 import io.trino.plugin.tpch.TpchColumnHandle;
 import io.trino.spi.connector.Assignment;
 import io.trino.spi.connector.ColumnHandle;
@@ -49,13 +48,11 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.LongLiteral;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.StringLiteral;
 import io.trino.sql.tree.SubscriptExpression;
 import io.trino.sql.tree.SymbolReference;
-import io.trino.testing.TestingTransactionHandle;
 import io.trino.transaction.TransactionId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -68,6 +65,7 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.RowType.field;
 import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.planner.ConnectorExpressionTranslator.translate;
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
 import static io.trino.sql.planner.TypeProvider.viewOf;
@@ -75,7 +73,6 @@
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
-import static io.trino.testing.TestingHandles.TEST_CATALOG_HANDLE;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.util.Arrays.asList;
@@ -104,6 +101,7 @@ public void testDoesNotFire()
             PushProjectionIntoTableScan optimizer = createRule(ruleTester);
 
             ruleTester.assertThat(optimizer)
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol symbol = p.symbol(columnName, columnType);
                         return p.project(
@@ -113,7 +111,6 @@ public void testDoesNotFire()
                                         ImmutableList.of(symbol),
                                         ImmutableMap.of(symbol, inputColumnHandle)));
                     })
-                    .withSession(MOCK_SESSION)
                     .doesNotFire();
         }
     }
@@ -145,11 +142,14 @@ public void testPushProjection()
                     call, VARCHAR);
 
             // Prepare project node assignments
-            ImmutableMap<Symbol, Expression> inputProjections = ImmutableMap.of(
-                    identity, baseColumn.toSymbolReference(),
-                    dereference, new SubscriptExpression(baseColumn.toSymbolReference(), new LongLiteral("1")),
-                    constant, new LongLiteral("5"),
-                    call, new FunctionCall(QualifiedName.of("STARTS_WITH"), ImmutableList.of(new StringLiteral("abc"), new StringLiteral("ab"))));
+            ImmutableMap<Symbol, Expression> inputProjections = ImmutableMap.<Symbol, Expression>builder()
+                    .put(identity, baseColumn.toSymbolReference())
+                    .put(dereference, new SubscriptExpression(baseColumn.toSymbolReference(), new LongLiteral("1")))
+                    .put(constant, new LongLiteral("5"))
+                    .put(call, new FunctionCall(
+                            ruleTester.getMetadata().resolveBuiltinFunction("starts_with", fromTypes(VARCHAR, VARCHAR)).toQualifiedName(),
+                            ImmutableList.of(new StringLiteral("abc"), new StringLiteral("ab"))))
+                    .buildOrThrow();
 
             // Compute expected symbols after applyProjection
             TransactionId transactionId = ruleTester.getQueryRunner().getTransactionManager().beginTransaction(false);
@@ -167,6 +167,7 @@ constant, new LongLiteral("5"),
                             e -> column(e.getValue(), types.get(e.getKey()))));
 
             ruleTester.assertThat(createRule(ruleTester))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         // Register symbols
                         types.forEach((symbol, type) -> p.symbol(symbol.getName(), type));
@@ -183,7 +184,6 @@ constant, new LongLiteral("5"),
                                                 .addSymbolStatistics(baseColumn, SymbolStatsEstimate.builder().setNullsFraction(0).setDistinctValuesCount(33).build())
                                                 .build()))));
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(project(
                             newNames.entrySet().stream()
                                     .collect(toImmutableMap(
@@ -228,6 +228,7 @@ public void testPartitioningChanged()
         MockConnectorFactory factory = createMockFactory(ImmutableMap.of(columnName, columnHandle), Optional.of(this::mockApplyProjection));
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(factory).build()) {
             assertThatThrownBy(() -> ruleTester.assertThat(createRule(ruleTester))
+                    .withSession(MOCK_SESSION)
                     // projection pushdown results in different table handle without partitioning
                     .on(p -> p.project(
                             Assignments.of(),
@@ -236,7 +237,6 @@ public void testPartitioningChanged()
                                     ImmutableList.of(p.symbol("col", VARCHAR)),
                                     ImmutableMap.of(p.symbol("col", VARCHAR), columnHandle),
                                     Optional.of(true))))
-                    .withSession(MOCK_SESSION)
                     .matches(anyTree()))
                     .hasMessage("Partitioning must not change after projection is pushed down");
         }
@@ -259,7 +259,6 @@ private MockConnectorFactory createMockFactory(Map<String, ColumnHandle> assignm
                                 TupleDomain.all(),
                                 Optional.of(new ConnectorTablePartitioning(PARTITIONING_HANDLE, ImmutableList.of(column("col", VARCHAR)))),
                                 Optional.empty(),
-                                Optional.empty(),
                                 ImmutableList.of());
                     }
 
@@ -333,14 +332,6 @@ private static PushProjectionIntoTableScan createRule(RuleTester tester)
                 new ScalarStatsCalculator(plannerContext, typeAnalyzer));
     }
 
-    private static TableHandle createTableHandle(String schemaName, String tableName)
-    {
-        return new TableHandle(
-                TEST_CATALOG_HANDLE,
-                new MockConnectorTableHandle(new SchemaTableName(schemaName, tableName)),
-                TestingTransactionHandle.create());
-    }
-
     private static SymbolReference symbolReference(String name)
     {
         return new SymbolReference(name);
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionThroughExchange.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionThroughExchange.java
index c52282745a4c..f521a55e7dea 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionThroughExchange.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionThroughExchange.java
@@ -23,7 +23,7 @@
 import io.trino.sql.tree.ArithmeticBinaryExpression;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.exchange;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
@@ -61,8 +61,8 @@ public void testDoesNotFireNarrowingProjection()
 
                     return p.project(
                             Assignments.builder()
-                                    .put(a, a.toSymbolReference())
-                                    .put(b, b.toSymbolReference())
+                                    .putIdentity(a)
+                                    .putIdentity(b)
                                     .build(),
                             p.exchange(e -> e
                                     .addSource(p.values(a, b, c))
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionThroughJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionThroughJoin.java
index 2335627b56ad..afddc5089651 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionThroughJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionThroughJoin.java
@@ -27,7 +27,7 @@
 import io.trino.sql.planner.plan.ProjectNode;
 import io.trino.sql.tree.ArithmeticBinaryExpression;
 import io.trino.sql.tree.ArithmeticUnaryExpression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -59,7 +59,7 @@ public class TestPushProjectionThroughJoin
     public void testPushesProjectionThroughJoin()
     {
         PlanNodeIdAllocator idAllocator = new PlanNodeIdAllocator();
-        PlanBuilder p = new PlanBuilder(idAllocator, dummyMetadata(), TEST_SESSION);
+        PlanBuilder p = new PlanBuilder(idAllocator, PLANNER_CONTEXT, TEST_SESSION);
         Symbol a0 = p.symbol("a0");
         Symbol a1 = p.symbol("a1");
         Symbol a2 = p.symbol("a2");
@@ -119,7 +119,7 @@ a2, new ArithmeticUnaryExpression(PLUS, a0.toSymbolReference()),
     @Test
     public void testDoesNotPushStraddlingProjection()
     {
-        PlanBuilder p = new PlanBuilder(new PlanNodeIdAllocator(), dummyMetadata(), TEST_SESSION);
+        PlanBuilder p = new PlanBuilder(new PlanNodeIdAllocator(), PLANNER_CONTEXT, TEST_SESSION);
         Symbol a = p.symbol("a");
         Symbol b = p.symbol("b");
         Symbol c = p.symbol("c");
@@ -139,7 +139,7 @@ c, new ArithmeticBinaryExpression(ADD, a.toSymbolReference(), b.toSymbolReferenc
     @Test
     public void testDoesNotPushProjectionThroughOuterJoin()
     {
-        PlanBuilder p = new PlanBuilder(new PlanNodeIdAllocator(), dummyMetadata(), TEST_SESSION);
+        PlanBuilder p = new PlanBuilder(new PlanNodeIdAllocator(), PLANNER_CONTEXT, TEST_SESSION);
         Symbol a = p.symbol("a");
         Symbol b = p.symbol("b");
         Symbol c = p.symbol("c");
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionThroughUnion.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionThroughUnion.java
index 374ac1d3d34c..13d5209574f9 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionThroughUnion.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushProjectionThroughUnion.java
@@ -23,7 +23,7 @@
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.tree.ArithmeticBinaryExpression;
 import io.trino.sql.tree.LongLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushSampleIntoTableScan.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushSampleIntoTableScan.java
index 56235d57c244..d9724909bfd9 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushSampleIntoTableScan.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushSampleIntoTableScan.java
@@ -23,7 +23,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.SampleNode.Type;
 import io.trino.sql.planner.plan.TableScanNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTableWriteThroughUnion.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTableWriteThroughUnion.java
index a681c36b3926..29255df70cd7 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTableWriteThroughUnion.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTableWriteThroughUnion.java
@@ -18,7 +18,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableWriter;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTopNIntoTableScan.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTopNIntoTableScan.java
index 3cb09db68e94..c57b3bc6d8fe 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTopNIntoTableScan.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTopNIntoTableScan.java
@@ -27,7 +27,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.RuleTester;
 import io.trino.sql.planner.plan.TopNNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.List;
@@ -68,6 +68,7 @@ public void testDoesNotFire()
         MockConnectorFactory mockFactory = createMockFactory(assignments, Optional.empty());
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(mockFactory).build()) {
             ruleTester.assertThat(new PushTopNIntoTableScan(ruleTester.getMetadata()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol dimension = p.symbol(dimensionName, VARCHAR);
                         Symbol metric = p.symbol(metricName, BIGINT);
@@ -78,7 +79,6 @@ public void testDoesNotFire()
                                                 dimension, dimensionColumn,
                                                 metric, metricColumn)));
                     })
-                    .withSession(MOCK_SESSION)
                     .doesNotFire();
         }
     }
@@ -93,6 +93,7 @@ public void testPushSingleTopNIntoTableScan()
         MockConnectorFactory mockFactory = createMockFactory(assignments, Optional.of(applyTopN));
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(mockFactory).build()) {
             ruleTester.assertThat(new PushTopNIntoTableScan(ruleTester.getMetadata()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol dimension = p.symbol(dimensionName, VARCHAR);
                         Symbol metric = p.symbol(metricName, BIGINT);
@@ -103,7 +104,6 @@ public void testPushSingleTopNIntoTableScan()
                                                 dimension, dimensionColumn,
                                                 metric, metricColumn)));
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(
                             tableScan(
                                     connectorHandle::equals,
@@ -122,6 +122,7 @@ public void testPushSingleTopNIntoTableScanNotGuaranteed()
         MockConnectorFactory mockFactory = createMockFactory(assignments, Optional.of(applyTopN));
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(mockFactory).build()) {
             ruleTester.assertThat(new PushTopNIntoTableScan(ruleTester.getMetadata()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol dimension = p.symbol(dimensionName, VARCHAR);
                         Symbol metric = p.symbol(metricName, BIGINT);
@@ -132,7 +133,6 @@ public void testPushSingleTopNIntoTableScanNotGuaranteed()
                                                 dimension, dimensionColumn,
                                                 metric, metricColumn)));
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(
                             topN(1, ImmutableList.of(sort(dimensionName, ASCENDING, FIRST)),
                                     TopNNode.Step.SINGLE,
@@ -155,6 +155,7 @@ public void testPushPartialTopNIntoTableScan()
         MockConnectorFactory mockFactory = createMockFactory(assignments, Optional.of(applyTopN));
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(mockFactory).build()) {
             ruleTester.assertThat(new PushTopNIntoTableScan(ruleTester.getMetadata()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol dimension = p.symbol(dimensionName, VARCHAR);
                         Symbol metric = p.symbol(metricName, BIGINT);
@@ -165,7 +166,6 @@ public void testPushPartialTopNIntoTableScan()
                                                 dimension, dimensionColumn,
                                                 metric, metricColumn)));
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(
                             tableScan(
                                     connectorHandle::equals,
@@ -184,6 +184,7 @@ public void testPushPartialTopNIntoTableScanNotGuaranteed()
         MockConnectorFactory mockFactory = createMockFactory(assignments, Optional.of(applyTopN));
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(mockFactory).build()) {
             ruleTester.assertThat(new PushTopNIntoTableScan(ruleTester.getMetadata()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol dimension = p.symbol(dimensionName, VARCHAR);
                         Symbol metric = p.symbol(metricName, BIGINT);
@@ -194,7 +195,6 @@ public void testPushPartialTopNIntoTableScanNotGuaranteed()
                                                 dimension, dimensionColumn,
                                                 metric, metricColumn)));
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(
                             topN(1, ImmutableList.of(sort(dimensionName, ASCENDING, FIRST)),
                                     TopNNode.Step.PARTIAL,
@@ -235,6 +235,7 @@ public void testPushFinalTopNIntoTableScan()
         MockConnectorFactory mockFactory = createMockFactory(assignments, Optional.of(applyTopN));
         try (RuleTester ruleTester = RuleTester.builder().withDefaultCatalogConnectorFactory(mockFactory).build()) {
             ruleTester.assertThat(new PushTopNIntoTableScan(ruleTester.getMetadata()))
+                    .withSession(MOCK_SESSION)
                     .on(p -> {
                         Symbol dimension = p.symbol(dimensionName, VARCHAR);
                         Symbol metric = p.symbol(metricName, BIGINT);
@@ -245,7 +246,6 @@ public void testPushFinalTopNIntoTableScan()
                                                 dimension, dimensionColumn,
                                                 metric, metricColumn)));
                     })
-                    .withSession(MOCK_SESSION)
                     .matches(
                             tableScan(
                                     connectorHandle::equals,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTopNThroughOuterJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTopNThroughOuterJoin.java
index 291f251d1507..c7c9ee9ab5ad 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTopNThroughOuterJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTopNThroughOuterJoin.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.JoinNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.join;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.sort;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTopNThroughProject.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTopNThroughProject.java
index ef186c52bcf4..55bc03ca5207 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTopNThroughProject.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushTopNThroughProject.java
@@ -25,7 +25,7 @@
 import io.trino.sql.tree.SubscriptExpression;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.testing.TestingMetadata;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -173,7 +173,7 @@ public void testPushTopNThroughOverlappingDereferences()
                                     Assignments.builder()
                                             .put(p.symbol("b"), new SubscriptExpression(a.toSymbolReference(), new LongLiteral("1")))
                                             .put(p.symbol("c", rowType), a.toSymbolReference())
-                                            .put(d, d.toSymbolReference())
+                                            .putIdentity(d)
                                             .build(),
                                     p.values(a, d)));
                 })
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownFilterIntoRowNumber.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownFilterIntoRowNumber.java
index 337db4aee92d..f61ec0991c2a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownFilterIntoRowNumber.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownFilterIntoRowNumber.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.assertions.RowNumberSymbolMatcher;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownFilterIntoWindow.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownFilterIntoWindow.java
index 7daefc9279c0..f8887c73b368 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownFilterIntoWindow.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownFilterIntoWindow.java
@@ -23,8 +23,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
 import io.trino.sql.planner.plan.WindowNode;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -48,7 +47,7 @@ public void testEliminateFilter()
 
     private void assertEliminateFilter(String rankingFunctionName)
     {
-        ResolvedFunction ranking = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of(rankingFunctionName), fromTypes());
+        ResolvedFunction ranking = tester().getMetadata().resolveBuiltinFunction(rankingFunctionName, fromTypes());
         tester().assertThat(new PushdownFilterIntoWindow(tester().getPlannerContext()))
                 .on(p -> {
                     Symbol rankSymbol = p.symbol("rank_1");
@@ -76,7 +75,7 @@ public void testKeepFilter()
 
     private void assertKeepFilter(String rankingFunctionName)
     {
-        ResolvedFunction ranking = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of(rankingFunctionName), fromTypes());
+        ResolvedFunction ranking = tester().getMetadata().resolveBuiltinFunction(rankingFunctionName, fromTypes());
         tester().assertThat(new PushdownFilterIntoWindow(tester().getPlannerContext()))
                 .on(p -> {
                     Symbol rowNumberSymbol = p.symbol("row_number_1");
@@ -133,7 +132,7 @@ public void testNoUpperBound()
 
     private void assertNoUpperBound(String rankingFunctionName)
     {
-        ResolvedFunction ranking = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of(rankingFunctionName), fromTypes());
+        ResolvedFunction ranking = tester().getMetadata().resolveBuiltinFunction(rankingFunctionName, fromTypes());
         tester().assertThat(new PushdownFilterIntoWindow(tester().getPlannerContext()))
                 .on(p -> {
                     Symbol rowNumberSymbol = p.symbol("row_number_1");
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownLimitIntoRowNumber.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownLimitIntoRowNumber.java
index e282b9bcc4e3..50acca64799a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownLimitIntoRowNumber.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownLimitIntoRowNumber.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownLimitIntoWindow.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownLimitIntoWindow.java
index be39f290ea02..5d62679ff927 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownLimitIntoWindow.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPushdownLimitIntoWindow.java
@@ -22,8 +22,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
 import io.trino.sql.planner.plan.WindowNode;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -45,7 +44,7 @@ public void testLimitAboveWindow()
 
     private void assertLimitAboveWindow(String rankingFunctionName)
     {
-        ResolvedFunction ranking = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of(rankingFunctionName), fromTypes());
+        ResolvedFunction ranking = tester().getMetadata().resolveBuiltinFunction(rankingFunctionName, fromTypes());
         tester().assertThat(new PushdownLimitIntoWindow())
                 .on(p -> {
                     Symbol a = p.symbol("a");
@@ -74,7 +73,7 @@ private void assertLimitAboveWindow(String rankingFunctionName)
     @Test
     public void testConvertToTopNRowNumber()
     {
-        ResolvedFunction ranking = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("row_number"), fromTypes());
+        ResolvedFunction ranking = tester().getMetadata().resolveBuiltinFunction("row_number", fromTypes());
         tester().assertThat(new PushdownLimitIntoWindow())
                 .on(p -> {
                     Symbol a = p.symbol("a");
@@ -102,7 +101,7 @@ public void testLimitWithPreSortedInputs()
     {
         // We can push Limit with pre-sorted inputs into WindowNode if ordering scheme is satisfied
         // We don't do it currently to avoid relying on LocalProperties outside of AddExchanges/AddLocalExchanges
-        ResolvedFunction ranking = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("row_number"), fromTypes());
+        ResolvedFunction ranking = tester().getMetadata().resolveBuiltinFunction("row_number", fromTypes());
         tester().assertThat(new PushdownLimitIntoWindow())
                 .on(p -> {
                     Symbol a = p.symbol("a");
@@ -131,7 +130,7 @@ public void testZeroLimit()
 
     private void assertZeroLimit(String rankingFunctionName)
     {
-        ResolvedFunction ranking = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of(rankingFunctionName), fromTypes());
+        ResolvedFunction ranking = tester().getMetadata().resolveBuiltinFunction(rankingFunctionName, fromTypes());
         tester().assertThat(new PushdownLimitIntoWindow())
                 .on(p -> {
                     Symbol a = p.symbol("a");
@@ -158,7 +157,7 @@ public void testWindowNotOrdered()
 
     private void assertWindowNotOrdered(String rankingFunctionName)
     {
-        ResolvedFunction ranking = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of(rankingFunctionName), fromTypes());
+        ResolvedFunction ranking = tester().getMetadata().resolveBuiltinFunction(rankingFunctionName, fromTypes());
         tester().assertThat(new PushdownLimitIntoWindow())
                 .on(p -> {
                     Symbol a = p.symbol("a");
@@ -176,8 +175,8 @@ private void assertWindowNotOrdered(String rankingFunctionName)
     @Test
     public void testMultipleWindowFunctions()
     {
-        ResolvedFunction rowNumberFunction = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("row_number"), fromTypes());
-        ResolvedFunction rankFunction = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("rank"), fromTypes());
+        ResolvedFunction rowNumberFunction = tester().getMetadata().resolveBuiltinFunction("row_number", fromTypes());
+        ResolvedFunction rankFunction = tester().getMetadata().resolveBuiltinFunction("rank", fromTypes());
         tester().assertThat(new PushdownLimitIntoWindow())
                 .on(p -> {
                     Symbol a = p.symbol("a");
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveAggregationInSemiJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveAggregationInSemiJoin.java
index dbf8d3314ed9..46e97b120afa 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveAggregationInSemiJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveAggregationInSemiJoin.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.PlanNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyExceptBranches.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyExceptBranches.java
index 99e959749202..ac2e703ff7e5 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyExceptBranches.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyExceptBranches.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.AggregationNode.Step;
 import io.trino.sql.tree.NullLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyGlobalAggregation.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyGlobalAggregation.java
index cae880e535da..1c46fce66c6e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyGlobalAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyGlobalAggregation.java
@@ -15,7 +15,7 @@
 
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyMergeWriterRuleSet.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyMergeWriterRuleSet.java
new file mode 100644
index 000000000000..e264e86f0542
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyMergeWriterRuleSet.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed 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 io.trino.sql.planner.iterative.rule;
+
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.WriterScalingOptions;
+import io.trino.sql.planner.Partitioning;
+import io.trino.sql.planner.PartitioningScheme;
+import io.trino.sql.planner.Symbol;
+import io.trino.sql.planner.iterative.Rule;
+import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
+import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
+import io.trino.sql.planner.plan.Assignments;
+import io.trino.sql.planner.plan.ExchangeNode;
+import io.trino.sql.planner.plan.PlanNode;
+import io.trino.sql.planner.plan.TableFinishNode;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
+import static io.trino.sql.planner.iterative.rule.RemoveEmptyMergeWriterRuleSet.removeEmptyMergeWriterRule;
+import static io.trino.sql.planner.iterative.rule.RemoveEmptyMergeWriterRuleSet.removeEmptyMergeWriterWithExchangeRule;
+
+public class TestRemoveEmptyMergeWriterRuleSet
+        extends BaseRuleTest
+{
+    private CatalogHandle catalogHandle;
+    private SchemaTableName schemaTableName;
+
+    @BeforeAll
+    public void setup()
+    {
+        catalogHandle = tester().getCurrentCatalogHandle();
+        schemaTableName = new SchemaTableName("schema", "table");
+    }
+
+    @Test
+    public void testRemoveEmptyMergeRewrite()
+    {
+        testRemoveEmptyMergeRewrite(removeEmptyMergeWriterRule(), false);
+    }
+
+    @Test
+    public void testRemoveEmptyMergeRewriteWithExchange()
+    {
+        testRemoveEmptyMergeRewrite(removeEmptyMergeWriterWithExchangeRule(), true);
+    }
+
+    private void testRemoveEmptyMergeRewrite(Rule<TableFinishNode> rule, boolean planWithExchange)
+    {
+        tester().assertThat(rule)
+                .on(p -> {
+                    Symbol mergeRow = p.symbol("merge_row");
+                    Symbol rowId = p.symbol("row_id");
+                    Symbol rowCount = p.symbol("row_count");
+
+                    PlanNode merge = p.merge(
+                            schemaTableName,
+                            p.exchange(e -> e
+                                    .addSource(
+                                            p.project(
+                                                    Assignments.builder()
+                                                            .putIdentity(mergeRow)
+                                                            .putIdentity(rowId)
+                                                            .putIdentity(rowCount)
+                                                            .build(),
+                                                    p.values(mergeRow, rowId, rowCount)))
+                                    .addInputsSet(mergeRow, rowId, rowCount)
+                                    .partitioningScheme(
+                                            new PartitioningScheme(
+                                                    Partitioning.create(SINGLE_DISTRIBUTION, List.of()),
+                                                    List.of(mergeRow, rowId, rowCount)))),
+                            mergeRow,
+                            rowId,
+                            List.of(rowCount));
+                    return p.tableFinish(
+                            planWithExchange ? withExchange(p, merge, rowCount) : merge,
+                            p.createTarget(catalogHandle, schemaTableName, true, WriterScalingOptions.ENABLED, false),
+                            rowCount);
+                })
+                .matches(values("A"));
+    }
+
+    private ExchangeNode withExchange(PlanBuilder planBuilder, PlanNode source, Symbol symbol)
+    {
+        return planBuilder.exchange(e -> e
+                .addSource(source)
+                .addInputsSet(symbol)
+                .partitioningScheme(new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, List.of()), List.of(symbol))));
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyUnionBranches.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyUnionBranches.java
index 23b078ba0162..f50311f404b2 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyUnionBranches.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveEmptyUnionBranches.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.tree.NullLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveFullSample.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveFullSample.java
index 2b7f1194ea9f..7f71b79ffa24 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveFullSample.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveFullSample.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.SampleNode.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantDistinctLimit.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantDistinctLimit.java
index 3ee6cbbb8e47..980f9313a3ea 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantDistinctLimit.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantDistinctLimit.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.ValuesNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantEnforceSingleRowNode.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantEnforceSingleRowNode.java
index 5acdf6c448d4..d2d5e3a2abf0 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantEnforceSingleRowNode.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantEnforceSingleRowNode.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.AggregationNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantExists.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantExists.java
index 8d3846fbc805..19a137845c78 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantExists.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantExists.java
@@ -21,7 +21,7 @@
 import io.trino.sql.tree.InPredicate;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.testing.TestingMetadata;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantJoin.java
index 1ea94766f8ea..df84bfec0e07 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantJoin.java
@@ -14,7 +14,7 @@
 package io.trino.sql.planner.iterative.rule;
 
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 import static io.trino.sql.planner.plan.JoinNode.Type.FULL;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantLimit.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantLimit.java
index 06aa68f0c78d..cf6d9796d544 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantLimit.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantLimit.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.FilterNode;
 import io.trino.sql.planner.plan.ValuesNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantOffset.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantOffset.java
index 079ca6b79625..8bba0a638781 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantOffset.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantOffset.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 import static io.trino.sql.planner.iterative.rule.test.PlanBuilder.expression;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantPredicateAboveTableScan.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantPredicateAboveTableScan.java
index d5faa022156a..9e8afcb1f9b3 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantPredicateAboveTableScan.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantPredicateAboveTableScan.java
@@ -25,16 +25,15 @@
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.sql.planner.FunctionCallBuilder;
+import io.trino.sql.planner.BuiltinFunctionCallBuilder;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.tree.ArithmeticBinaryExpression;
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.GenericLiteral;
 import io.trino.sql.tree.LogicalExpression;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.predicate.Domain.singleValue;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -54,7 +53,7 @@ public class TestRemoveRedundantPredicateAboveTableScan
     private TableHandle nationTableHandle;
     private TableHandle ordersTableHandle;
 
-    @BeforeClass
+    @BeforeAll
     public void setUpBeforeClass()
     {
         removeRedundantPredicateAboveTableScan = new RemoveRedundantPredicateAboveTableScan(tester().getPlannerContext(), tester().getTypeAnalyzer());
@@ -147,8 +146,8 @@ public void doesNotConsumeRemainingPredicateIfNewDomainIsWider()
                                 ImmutableList.of(
                                         new ComparisonExpression(
                                                 EQUAL,
-                                                FunctionCallBuilder.resolve(tester().getSession(), tester().getMetadata())
-                                                        .setName(QualifiedName.of("rand"))
+                                                BuiltinFunctionCallBuilder.resolve(tester().getMetadata())
+                                                        .setName("rand")
                                                         .build(),
                                                 new GenericLiteral("BIGINT", "42")),
                                         new ComparisonExpression(
@@ -178,8 +177,8 @@ public void doesNotConsumeRemainingPredicateIfNewDomainIsWider()
                                 LogicalExpression.and(
                                         new ComparisonExpression(
                                                 EQUAL,
-                                                FunctionCallBuilder.resolve(tester().getSession(), tester().getMetadata())
-                                                        .setName(QualifiedName.of("rand"))
+                                                BuiltinFunctionCallBuilder.resolve(tester().getMetadata())
+                                                        .setName("rand")
                                                         .build(),
                                                 new GenericLiteral("BIGINT", "42")),
                                         new ComparisonExpression(
@@ -203,8 +202,8 @@ public void doesNotFireOnNonDeterministicPredicate()
                 .on(p -> p.filter(
                         new ComparisonExpression(
                                 EQUAL,
-                                FunctionCallBuilder.resolve(tester().getSession(), tester().getMetadata())
-                                        .setName(QualifiedName.of("rand"))
+                                BuiltinFunctionCallBuilder.resolve(tester().getMetadata())
+                                        .setName("rand")
                                         .build(),
                                 new GenericLiteral("BIGINT", "42")),
                         p.tableScan(
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantSort.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantSort.java
index ba0050a06a02..bb90e18ede27 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantSort.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantSort.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.ValuesNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantSortBelowLimitWithTies.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantSortBelowLimitWithTies.java
index 6b053e0af1ae..702d56596122 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantSortBelowLimitWithTies.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantSortBelowLimitWithTies.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.limit;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.sort;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantTableFunction.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantTableFunction.java
index 701a443d70ee..397252aee858 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantTableFunction.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantTableFunction.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.TableFunctionNode.PassThroughColumn;
 import io.trino.sql.planner.plan.TableFunctionNode.PassThroughSpecification;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantTopN.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantTopN.java
index ec63d9139ad8..68d047100ba3 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantTopN.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantTopN.java
@@ -20,7 +20,7 @@
 import io.trino.sql.planner.plan.FilterNode;
 import io.trino.sql.planner.plan.SortNode;
 import io.trino.sql.planner.plan.ValuesNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantWindow.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantWindow.java
index 8c2fa2d180d4..5d9256ea59f7 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantWindow.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantWindow.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveTrivialFilters.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveTrivialFilters.java
index c641d37a3a41..a982d8bc1918 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveTrivialFilters.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveTrivialFilters.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 import static io.trino.sql.planner.iterative.rule.test.PlanBuilder.expression;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveUnreferencedScalarApplyNodes.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveUnreferencedScalarApplyNodes.java
index 345feaa43eb7..e9cdfb0f0309 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveUnreferencedScalarApplyNodes.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveUnreferencedScalarApplyNodes.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 import static io.trino.sql.planner.iterative.rule.test.PlanBuilder.expression;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveUnreferencedScalarSubqueries.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveUnreferencedScalarSubqueries.java
index 16d9ab04ee83..275e9e38fbbe 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveUnreferencedScalarSubqueries.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestRemoveUnreferencedScalarSubqueries.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.LongLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 import static io.trino.sql.planner.plan.CorrelatedJoinNode.Type.FULL;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReorderJoins.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReorderJoins.java
index 8c2e9bc13feb..a4bc5b2ee6b1 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReorderJoins.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReorderJoins.java
@@ -24,17 +24,17 @@
 import io.trino.sql.planner.OptimizerConfig.JoinReorderingStrategy;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.assertions.PlanMatchPattern;
-import io.trino.sql.planner.iterative.rule.test.RuleAssert;
+import io.trino.sql.planner.iterative.rule.test.RuleBuilder;
 import io.trino.sql.planner.iterative.rule.test.RuleTester;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.JoinNode.EquiJoinClause;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.tree.ArithmeticUnaryExpression;
 import io.trino.sql.tree.ComparisonExpression;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Optional;
 
@@ -57,12 +57,14 @@
 import static io.trino.sql.tree.ArithmeticUnaryExpression.Sign.MINUS;
 import static io.trino.sql.tree.ComparisonExpression.Operator.EQUAL;
 import static io.trino.sql.tree.ComparisonExpression.Operator.LESS_THAN;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestReorderJoins
 {
     private RuleTester tester;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         tester = RuleTester.builder()
@@ -72,7 +74,7 @@ public void setUp()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         closeAllRuntimeException(tester);
@@ -83,15 +85,6 @@ public void tearDown()
     public void testKeepsOutputSymbols()
     {
         assertReorderJoins()
-                .on(p ->
-                        p.join(
-                                INNER,
-                                p.values(new PlanNodeId("valuesA"), 2, p.symbol("A1"), p.symbol("A2")),
-                                p.values(new PlanNodeId("valuesB"), 2, p.symbol("B1")),
-                                ImmutableList.of(new EquiJoinClause(p.symbol("A1"), p.symbol("B1"))),
-                                ImmutableList.of(p.symbol("A2")),
-                                ImmutableList.of(),
-                                Optional.empty()))
                 .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
                         .setOutputRowCount(5000)
                         .addSymbolStatistics(ImmutableMap.of(
@@ -102,6 +95,15 @@ public void testKeepsOutputSymbols()
                         .setOutputRowCount(10000)
                         .addSymbolStatistics(ImmutableMap.of(new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 100, 100)))
                         .build())
+                .on(p ->
+                        p.join(
+                                INNER,
+                                p.values(new PlanNodeId("valuesA"), 2, p.symbol("A1"), p.symbol("A2")),
+                                p.values(new PlanNodeId("valuesB"), 2, p.symbol("B1")),
+                                ImmutableList.of(new EquiJoinClause(p.symbol("A1"), p.symbol("B1"))),
+                                ImmutableList.of(p.symbol("A2")),
+                                ImmutableList.of(),
+                                Optional.empty()))
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("A1", "B1")
@@ -117,6 +119,14 @@ public void testReplicatesAndFlipsWhenOneTableMuchSmaller()
         Type symbolType = createUnboundedVarcharType(); // variable width so that average row size is respected
         assertReorderJoins()
                 .setSystemProperty(JOIN_MAX_BROADCAST_TABLE_SIZE, "1PB")
+                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(100)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 6400, 100)))
+                        .build())
+                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(10000)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
+                        .build())
                 .on(p -> {
                     Symbol a1 = p.symbol("A1", symbolType);
                     Symbol b1 = p.symbol("B1", symbolType);
@@ -129,14 +139,6 @@ public void testReplicatesAndFlipsWhenOneTableMuchSmaller()
                             ImmutableList.of(b1),
                             Optional.empty());
                 })
-                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(100)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 6400, 100)))
-                        .build())
-                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(10000)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
-                        .build())
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("B1", "A1")
@@ -150,6 +152,15 @@ public void testRepartitionsWhenRequiredBySession()
     {
         Type symbolType = createUnboundedVarcharType(); // variable width so that average row size is respected
         assertReorderJoins()
+                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.PARTITIONED.name())
+                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(100)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 6400, 100)))
+                        .build())
+                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(10000)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
+                        .build())
                 .on(p -> {
                     Symbol a1 = p.symbol("A1", symbolType);
                     Symbol b1 = p.symbol("B1", symbolType);
@@ -162,15 +173,6 @@ public void testRepartitionsWhenRequiredBySession()
                             ImmutableList.of(b1),
                             Optional.empty());
                 })
-                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.PARTITIONED.name())
-                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(100)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 6400, 100)))
-                        .build())
-                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(10000)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
-                        .build())
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("B1", "A1")
@@ -183,6 +185,14 @@ public void testRepartitionsWhenRequiredBySession()
     public void testRepartitionsWhenBothTablesEqual()
     {
         assertReorderJoins()
+                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(10000)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
+                        .build())
+                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(10000)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
+                        .build())
                 .on(p ->
                         p.join(
                                 INNER,
@@ -192,14 +202,6 @@ public void testRepartitionsWhenBothTablesEqual()
                                 ImmutableList.of(p.symbol("A1")),
                                 ImmutableList.of(p.symbol("B1")),
                                 Optional.empty()))
-                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(10000)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
-                        .build())
-                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(10000)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
-                        .build())
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("A1", "B1")
@@ -212,15 +214,6 @@ public void testRepartitionsWhenBothTablesEqual()
     public void testReplicatesUnrestrictedWhenRequiredBySession()
     {
         assertReorderJoins()
-                .on(p ->
-                        p.join(
-                                INNER,
-                                p.values(new PlanNodeId("valuesA"), 2, p.symbol("A1")),
-                                p.values(new PlanNodeId("valuesB"), 2, p.symbol("B1")),
-                                ImmutableList.of(new EquiJoinClause(p.symbol("A1"), p.symbol("B1"))),
-                                ImmutableList.of(p.symbol("A1")),
-                                ImmutableList.of(p.symbol("B1")),
-                                Optional.empty()))
                 .setSystemProperty(JOIN_MAX_BROADCAST_TABLE_SIZE, "1kB")
                 .setSystemProperty(JOIN_DISTRIBUTION_TYPE, BROADCAST.name())
                 .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
@@ -231,6 +224,15 @@ public void testReplicatesUnrestrictedWhenRequiredBySession()
                         .setOutputRowCount(10000)
                         .addSymbolStatistics(ImmutableMap.of(new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
                         .build())
+                .on(p ->
+                        p.join(
+                                INNER,
+                                p.values(new PlanNodeId("valuesA"), 2, p.symbol("A1")),
+                                p.values(new PlanNodeId("valuesB"), 2, p.symbol("B1")),
+                                ImmutableList.of(new EquiJoinClause(p.symbol("A1"), p.symbol("B1"))),
+                                ImmutableList.of(p.symbol("A1")),
+                                ImmutableList.of(p.symbol("B1")),
+                                Optional.empty()))
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("A1", "B1")
@@ -259,6 +261,8 @@ public void testReplicatedScalarJoinEvenWhereSessionRequiresRepartitioned()
 
         assertReorderJoins()
                 .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.PARTITIONED.name())
+                .overrideStats("valuesA", valuesA)
+                .overrideStats("valuesB", valuesB)
                 .on(p ->
                         p.join(
                                 INNER,
@@ -268,12 +272,12 @@ public void testReplicatedScalarJoinEvenWhereSessionRequiresRepartitioned()
                                 ImmutableList.of(p.symbol("A1")),
                                 ImmutableList.of(p.symbol("B1")),
                                 Optional.empty()))
-                .overrideStats("valuesA", valuesA)
-                .overrideStats("valuesB", valuesB)
                 .matches(expectedPlan);
 
         assertReorderJoins()
                 .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.PARTITIONED.name())
+                .overrideStats("valuesA", valuesA)
+                .overrideStats("valuesB", valuesB)
                 .on(p ->
                         p.join(
                                 INNER,
@@ -283,8 +287,6 @@ public void testReplicatedScalarJoinEvenWhereSessionRequiresRepartitioned()
                                 ImmutableList.of(p.symbol("B1")),
                                 ImmutableList.of(p.symbol("A1")),
                                 Optional.empty()))
-                .overrideStats("valuesA", valuesA)
-                .overrideStats("valuesB", valuesB)
                 .matches(expectedPlan);
     }
 
@@ -292,6 +294,14 @@ public void testReplicatedScalarJoinEvenWhereSessionRequiresRepartitioned()
     public void testDoesNotFireForCrossJoin()
     {
         assertReorderJoins()
+                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(10000)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
+                        .build())
+                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(10000)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
+                        .build())
                 .on(p ->
                         p.join(
                                 INNER,
@@ -301,14 +311,6 @@ public void testDoesNotFireForCrossJoin()
                                 ImmutableList.of(p.symbol("A1")),
                                 ImmutableList.of(p.symbol("B1")),
                                 Optional.empty()))
-                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(10000)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
-                        .build())
-                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(10000)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 640000, 100)))
-                        .build())
                 .doesNotFire();
     }
 
@@ -316,6 +318,7 @@ public void testDoesNotFireForCrossJoin()
     public void testDoesNotFireWithNoStats()
     {
         assertReorderJoins()
+                .overrideStats("valuesA", PlanNodeStatsEstimate.unknown())
                 .on(p ->
                         p.join(
                                 INNER,
@@ -325,7 +328,6 @@ public void testDoesNotFireWithNoStats()
                                 ImmutableList.of(p.symbol("A1")),
                                 ImmutableList.of(),
                                 Optional.empty()))
-                .overrideStats("valuesA", PlanNodeStatsEstimate.unknown())
                 .doesNotFire();
     }
 
@@ -344,7 +346,7 @@ public void testDoesNotFireForNonDeterministicFilter()
                                 Optional.of(new ComparisonExpression(
                                         LESS_THAN,
                                         p.symbol("A1").toSymbolReference(),
-                                        new TestingFunctionResolution().functionCallBuilder(QualifiedName.of("random")).build()))))
+                                        new TestingFunctionResolution().functionCallBuilder("random").build()))))
                 .doesNotFire();
     }
 
@@ -352,6 +354,20 @@ public void testDoesNotFireForNonDeterministicFilter()
     public void testPredicatesPushedDown()
     {
         assertReorderJoins()
+                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(10)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 100, 10)))
+                        .build())
+                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(5)
+                        .addSymbolStatistics(ImmutableMap.of(
+                                new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 100, 5),
+                                new Symbol("B2"), new SymbolStatsEstimate(0, 100, 0, 100, 5)))
+                        .build())
+                .overrideStats("valuesC", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(1000)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("C1"), new SymbolStatsEstimate(0, 100, 0, 100, 100)))
+                        .build())
                 .on(p ->
                         p.join(
                                 INNER,
@@ -369,20 +385,6 @@ public void testPredicatesPushedDown()
                                 ImmutableList.of(p.symbol("A1")),
                                 ImmutableList.of(),
                                 Optional.of(new ComparisonExpression(EQUAL, p.symbol("A1").toSymbolReference(), p.symbol("B1").toSymbolReference()))))
-                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(10)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 100, 10)))
-                        .build())
-                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(5)
-                        .addSymbolStatistics(ImmutableMap.of(
-                                new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 100, 5),
-                                new Symbol("B2"), new SymbolStatsEstimate(0, 100, 0, 100, 5)))
-                        .build())
-                .overrideStats("valuesC", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(1000)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("C1"), new SymbolStatsEstimate(0, 100, 0, 100, 100)))
-                        .build())
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("C1", "B2")
@@ -398,6 +400,19 @@ public void testPredicatesPushedDown()
     public void testPushesProjectionsThroughJoin()
     {
         assertReorderJoins()
+                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(10)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 100, 10)))
+                        .build())
+                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(5)
+                        .addSymbolStatistics(ImmutableMap.of(
+                                new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 100, 5)))
+                        .build())
+                .overrideStats("valuesC", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(1000)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("C1"), new SymbolStatsEstimate(0, 100, 0, 100, 100)))
+                        .build())
                 .on(p ->
                         p.join(
                                 INNER,
@@ -418,19 +433,6 @@ public void testPushesProjectionsThroughJoin()
                                 ImmutableList.of(p.symbol("P1")),
                                 ImmutableList.of(),
                                 Optional.of(new ComparisonExpression(EQUAL, p.symbol("P2").toSymbolReference(), p.symbol("C1").toSymbolReference()))))
-                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(10)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 100, 10)))
-                        .build())
-                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(5)
-                        .addSymbolStatistics(ImmutableMap.of(
-                                new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 100, 5)))
-                        .build())
-                .overrideStats("valuesC", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(1000)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("C1"), new SymbolStatsEstimate(0, 100, 0, 100, 100)))
-                        .build())
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("C1", "P1")
@@ -452,6 +454,19 @@ public void testPushesProjectionsThroughJoin()
     public void testDoesNotPushProjectionThroughJoinIfTooExpensive()
     {
         assertReorderJoins()
+                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(10)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 100, 10)))
+                        .build())
+                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(5)
+                        .addSymbolStatistics(ImmutableMap.of(
+                                new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 100, 5)))
+                        .build())
+                .overrideStats("valuesC", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(1000)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("C1"), new SymbolStatsEstimate(0, 100, 0, 100, 100)))
+                        .build())
                 .on(p ->
                         p.join(
                                 INNER,
@@ -471,19 +486,6 @@ public void testDoesNotPushProjectionThroughJoinIfTooExpensive()
                                 ImmutableList.of(p.symbol("P1")),
                                 ImmutableList.of(),
                                 Optional.empty()))
-                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(10)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 100, 10)))
-                        .build())
-                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(5)
-                        .addSymbolStatistics(ImmutableMap.of(
-                                new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 100, 5)))
-                        .build())
-                .overrideStats("valuesC", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(1000)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("C1"), new SymbolStatsEstimate(0, 100, 0, 100, 100)))
-                        .build())
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("C1", "P1")
@@ -501,6 +503,20 @@ public void testDoesNotPushProjectionThroughJoinIfTooExpensive()
     public void testSmallerJoinFirst()
     {
         assertReorderJoins()
+                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(40)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 100, 10)))
+                        .build())
+                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(10)
+                        .addSymbolStatistics(ImmutableMap.of(
+                                new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 100, 10),
+                                new Symbol("B2"), new SymbolStatsEstimate(0, 100, 0, 100, 10)))
+                        .build())
+                .overrideStats("valuesC", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(100)
+                        .addSymbolStatistics(ImmutableMap.of(new Symbol("C1"), new SymbolStatsEstimate(99, 199, 0, 100, 100)))
+                        .build())
                 .on(p ->
                         p.join(
                                 INNER,
@@ -518,20 +534,6 @@ public void testSmallerJoinFirst()
                                 ImmutableList.of(p.symbol("A1")),
                                 ImmutableList.of(),
                                 Optional.of(new ComparisonExpression(EQUAL, p.symbol("A1").toSymbolReference(), p.symbol("B1").toSymbolReference()))))
-                .overrideStats("valuesA", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(40)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("A1"), new SymbolStatsEstimate(0, 100, 0, 100, 10)))
-                        .build())
-                .overrideStats("valuesB", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(10)
-                        .addSymbolStatistics(ImmutableMap.of(
-                                new Symbol("B1"), new SymbolStatsEstimate(0, 100, 0, 100, 10),
-                                new Symbol("B2"), new SymbolStatsEstimate(0, 100, 0, 100, 10)))
-                        .build())
-                .overrideStats("valuesC", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(100)
-                        .addSymbolStatistics(ImmutableMap.of(new Symbol("C1"), new SymbolStatsEstimate(99, 199, 0, 100, 100)))
-                        .build())
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("A1", "B1")
@@ -563,6 +565,8 @@ public void testReplicatesWhenNotRestricted()
         assertReorderJoins()
                 .setSystemProperty(JOIN_DISTRIBUTION_TYPE, AUTOMATIC.name())
                 .setSystemProperty(JOIN_MAX_BROADCAST_TABLE_SIZE, "100MB")
+                .overrideStats("valuesA", probeSideStatsEstimate)
+                .overrideStats("valuesB", buildSideStatsEstimate)
                 .on(p -> {
                     Symbol a1 = p.symbol("A1", symbolType);
                     Symbol b1 = p.symbol("B1", symbolType);
@@ -575,8 +579,6 @@ public void testReplicatesWhenNotRestricted()
                             ImmutableList.of(b1),
                             Optional.empty());
                 })
-                .overrideStats("valuesA", probeSideStatsEstimate)
-                .overrideStats("valuesB", buildSideStatsEstimate)
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("A1", "B1")
@@ -597,6 +599,8 @@ public void testReplicatesWhenNotRestricted()
         assertReorderJoins()
                 .setSystemProperty(JOIN_DISTRIBUTION_TYPE, AUTOMATIC.name())
                 .setSystemProperty(JOIN_MAX_BROADCAST_TABLE_SIZE, "100MB")
+                .overrideStats("valuesA", probeSideStatsEstimate)
+                .overrideStats("valuesB", buildSideStatsEstimate)
                 .on(p -> {
                     Symbol a1 = p.symbol("A1", symbolType);
                     Symbol b1 = p.symbol("B1", symbolType);
@@ -609,8 +613,6 @@ public void testReplicatesWhenNotRestricted()
                             ImmutableList.of(b1),
                             Optional.empty());
                 })
-                .overrideStats("valuesA", probeSideStatsEstimate)
-                .overrideStats("valuesB", buildSideStatsEstimate)
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("A1", "B1")
@@ -640,6 +642,8 @@ public void testReorderAndReplicate()
                 .setSystemProperty(JOIN_DISTRIBUTION_TYPE, AUTOMATIC.name())
                 .setSystemProperty(JOIN_REORDERING_STRATEGY, AUTOMATIC.name())
                 .setSystemProperty(JOIN_MAX_BROADCAST_TABLE_SIZE, "10MB")
+                .overrideStats("valuesA", probeSideStatsEstimate)
+                .overrideStats("valuesB", buildSideStatsEstimate)
                 .on(p -> {
                     Symbol a1 = p.symbol("A1", symbolType);
                     Symbol b1 = p.symbol("B1", symbolType);
@@ -652,8 +656,6 @@ public void testReorderAndReplicate()
                             ImmutableList.of(b1),
                             Optional.empty());
                 })
-                .overrideStats("valuesA", probeSideStatsEstimate)
-                .overrideStats("valuesB", buildSideStatsEstimate)
                 .matches(
                         join(INNER, builder -> builder
                                 .equiCriteria("B1", "A1")
@@ -662,7 +664,7 @@ public void testReorderAndReplicate()
                                 .right(values(ImmutableMap.of("A1", 0)))));
     }
 
-    private RuleAssert assertReorderJoins()
+    private RuleBuilder assertReorderJoins()
     {
         return tester.assertThat(new ReorderJoins(PLANNER_CONTEXT, new CostComparator(1, 1, 1), createTestingTypeAnalyzer(PLANNER_CONTEXT)));
     }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceJoinOverConstantWithProject.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceJoinOverConstantWithProject.java
index 151679e4bd8d..a8a18277b7f3 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceJoinOverConstantWithProject.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceJoinOverConstantWithProject.java
@@ -19,9 +19,8 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.JoinNode.EquiJoinClause;
 import io.trino.sql.tree.FunctionCall;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Row;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -313,7 +312,7 @@ public void testRemoveOutputDuplicates()
     public void testNonDeterministicValues()
     {
         FunctionCall randomFunction = new FunctionCall(
-                tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("random"), ImmutableList.of()).toQualifiedName(),
+                tester().getMetadata().resolveBuiltinFunction("random", ImmutableList.of()).toQualifiedName(),
                 ImmutableList.of());
 
         tester().assertThat(new ReplaceJoinOverConstantWithProject(tester().getMetadata()))
@@ -325,7 +324,7 @@ public void testNonDeterministicValues()
                 .doesNotFire();
 
         FunctionCall uuidFunction = new FunctionCall(
-                tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("uuid"), ImmutableList.of()).toQualifiedName(),
+                tester().getMetadata().resolveBuiltinFunction("uuid", ImmutableList.of()).toQualifiedName(),
                 ImmutableList.of());
 
         tester().assertThat(new ReplaceJoinOverConstantWithProject(tester().getMetadata()))
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceRedundantJoinWithProject.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceRedundantJoinWithProject.java
index 4368c8e9b22a..5eaac8c04fb5 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceRedundantJoinWithProject.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceRedundantJoinWithProject.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.tree.NullLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceRedundantJoinWithSource.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceRedundantJoinWithSource.java
index 22d9c029cfdf..3b9a682c0daf 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceRedundantJoinWithSource.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceRedundantJoinWithSource.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.tree.NullLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceWindowWithRowNumber.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceWindowWithRowNumber.java
index ee6d7438587c..8264bc626070 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceWindowWithRowNumber.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestReplaceWindowWithRowNumber.java
@@ -22,8 +22,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
 import io.trino.sql.planner.plan.WindowNode;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -38,7 +37,7 @@ public class TestReplaceWindowWithRowNumber
     @Test
     public void test()
     {
-        ResolvedFunction rowNumberFunction = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("row_number"), fromTypes());
+        ResolvedFunction rowNumberFunction = tester().getMetadata().resolveBuiltinFunction("row_number", fromTypes());
         tester().assertThat(new ReplaceWindowWithRowNumber(tester().getMetadata()))
                 .on(p -> {
                     Symbol a = p.symbol("a");
@@ -73,7 +72,7 @@ public void test()
     @Test
     public void testDoNotFire()
     {
-        ResolvedFunction rank = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("rank"), fromTypes());
+        ResolvedFunction rank = tester().getMetadata().resolveBuiltinFunction("rank", fromTypes());
         tester().assertThat(new ReplaceWindowWithRowNumber(tester().getMetadata()))
                 .on(p -> {
                     Symbol a = p.symbol("a");
@@ -85,7 +84,7 @@ public void testDoNotFire()
                 })
                 .doesNotFire();
 
-        ResolvedFunction rowNumber = tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("row_number"), fromTypes());
+        ResolvedFunction rowNumber = tester().getMetadata().resolveBuiltinFunction("row_number", fromTypes());
         tester().assertThat(new ReplaceWindowWithRowNumber(tester().getMetadata()))
                 .on(p -> {
                     Symbol a = p.symbol("a");
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSimplifyExpressions.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSimplifyExpressions.java
index ff44fa6a41c9..127cb83de946 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSimplifyExpressions.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSimplifyExpressions.java
@@ -13,8 +13,8 @@
  */
 package io.trino.sql.planner.iterative.rule;
 
+import com.google.common.collect.ImmutableMap;
 import io.trino.spi.type.Type;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.SymbolAllocator;
@@ -25,19 +25,25 @@
 import io.trino.sql.tree.ExpressionTreeRewriter;
 import io.trino.sql.tree.LogicalExpression;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.CharType.createCharType;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.spi.type.VarcharType.createVarcharType;
 import static io.trino.sql.ExpressionUtils.extractPredicates;
 import static io.trino.sql.ExpressionUtils.logicalExpression;
 import static io.trino.sql.ExpressionUtils.rewriteIdentifiersToSymbolReferences;
@@ -54,56 +60,101 @@ public class TestSimplifyExpressions
     @Test
     public void testPushesDownNegations()
     {
-        assertSimplifies("NOT X", "NOT X");
-        assertSimplifies("NOT NOT X", "X");
-        assertSimplifies("NOT NOT NOT X", "NOT X");
-        assertSimplifies("NOT NOT NOT X", "NOT X");
-
-        assertSimplifies("NOT (X > Y)", "X <= Y");
-        assertSimplifies("NOT (X > (NOT NOT Y))", "X <= Y");
-        assertSimplifies("X > (NOT NOT Y)", "X > Y");
-        assertSimplifies("NOT (X AND Y AND (NOT (Z OR V)))", "(NOT X) OR (NOT Y) OR (Z OR V)");
-        assertSimplifies("NOT (X OR Y OR (NOT (Z OR V)))", "(NOT X) AND (NOT Y) AND (Z OR V)");
-        assertSimplifies("NOT (X OR Y OR (Z OR V))", "(NOT X) AND (NOT Y) AND ((NOT Z) AND (NOT V))");
-
-        assertSimplifies("NOT (X IS DISTINCT FROM Y)", "NOT (X IS DISTINCT FROM Y)");
+        assertSimplifies("NOT X", "NOT X", ImmutableMap.of("X", BOOLEAN));
+        assertSimplifies("NOT NOT X", "X", ImmutableMap.of("X", BOOLEAN));
+        assertSimplifies("NOT NOT NOT X", "NOT X", ImmutableMap.of("X", BOOLEAN));
+        assertSimplifies("NOT NOT NOT X", "NOT X", ImmutableMap.of("X", BOOLEAN));
+
+        assertSimplifies("NOT (X > Y)", "X <= Y", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN));
+        assertSimplifies("NOT (X > (NOT NOT Y))", "X <= Y", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN));
+        assertSimplifies("X > (NOT NOT Y)", "X > Y", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN));
+        assertSimplifies("NOT (X AND Y AND (NOT (Z OR V)))", "(NOT X) OR (NOT Y) OR (Z OR V)", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN, "Z", BOOLEAN, "V", BOOLEAN));
+        assertSimplifies("NOT (X OR Y OR (NOT (Z OR V)))", "(NOT X) AND (NOT Y) AND (Z OR V)", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN, "Z", BOOLEAN, "V", BOOLEAN));
+        assertSimplifies("NOT (X OR Y OR (Z OR V))", "(NOT X) AND (NOT Y) AND ((NOT Z) AND (NOT V))", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN, "Z", BOOLEAN, "V", BOOLEAN));
+
+        assertSimplifies("NOT (X IS DISTINCT FROM Y)", "NOT (X IS DISTINCT FROM Y)", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN));
+        assertSimplifies("NOT (X IS DISTINCT FROM Y)", "NOT (X IS DISTINCT FROM Y)", ImmutableMap.of("X", BIGINT, "Y", BIGINT));
+        assertSimplifies("NOT (X IS DISTINCT FROM Y)", "NOT (X IS DISTINCT FROM Y)", ImmutableMap.of("X", DOUBLE, "Y", DOUBLE));
+        assertSimplifies("NOT (X IS DISTINCT FROM Y)", "NOT (X IS DISTINCT FROM Y)", ImmutableMap.of("X", VARCHAR, "Y", VARCHAR));
+    }
+
+    @Test
+    public void testLikeExpressions()
+    {
+        assertSimplifies("name LIKE '%'", "name IS NOT NULL", ImmutableMap.of("name", createCharType(2)));
+        assertSimplifies("name LIKE '%%'", "name IS NOT NULL", ImmutableMap.of("name", createCharType(2)));
+        assertSimplifies("name LIKE '%%%%'", "name IS NOT NULL", ImmutableMap.of("name", createCharType(10)));
+        assertSimplifies("name LIKE '%%%%' ESCAPE '\\'", "name IS NOT NULL", ImmutableMap.of("name", createCharType(10)));
+        assertSimplifies("name LIKE '中文%abc字母😂'", "name LIKE '中文%abc字母😂'", ImmutableMap.of("name", createCharType(10)));
+        assertSimplifies("name LIKE '中文%abc字母😂' ESCAPE '\\'", "name LIKE '中文%abc字母😂' ESCAPE '\\'", ImmutableMap.of("name", createCharType(10)));
+
+        assertSimplifies("name LIKE '%'", "name IS NOT NULL", ImmutableMap.of("name", createVarcharType(2)));
+        assertSimplifies("name LIKE '%%'", "name IS NOT NULL", ImmutableMap.of("name", createVarcharType(2)));
+        assertSimplifies("name LIKE '%%%%'", "name IS NOT NULL", ImmutableMap.of("name", createVarcharType(10)));
+        assertSimplifies("name LIKE '%%%%' ESCAPE '\\'", "name IS NOT NULL", ImmutableMap.of("name", createVarcharType(10)));
+        assertSimplifies("name LIKE '中文%abc字母😂'", "name LIKE '中文%abc字母😂'", ImmutableMap.of("name", createVarcharType(10)));
+        assertSimplifies("name LIKE '中文%abc字母😂' ESCAPE '\\'", "name LIKE '中文%abc字母😂' ESCAPE '\\'", ImmutableMap.of("name", createVarcharType(10)));
+
+        assertSimplifies("name LIKE '%'", "name IS NOT NULL", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE '%%'", "name IS NOT NULL", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE '%%%%'", "name IS NOT NULL", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE '%%%%' ESCAPE '\\'", "name IS NOT NULL", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE '中文%abc字母😂'", "name LIKE '中文%abc字母😂'", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE '中文%abc字母😂' ESCAPE '\\'", "name LIKE '中文%abc字母😂' ESCAPE '\\'", ImmutableMap.of("name", VARCHAR));
+
+        // test with the like constant
+        assertSimplifies("name LIKE 'This is a constant'", "name = VARCHAR 'This is a constant'", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE '!@#$#!'", "name = VARCHAR '!@#$#!'", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE '中文abc字母😂'", "name = VARCHAR '中文abc字母😂'", ImmutableMap.of("name", VARCHAR));
+
+        // test with the escape char
+        assertSimplifies("name LIKE '\\%' ESCAPE '\\'", "name = VARCHAR '%'", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE 'abc\\%' ESCAPE '\\'", "name = VARCHAR 'abc%'", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE '\\%%%%' ESCAPE '\\'", "name LIKE '\\%%%%' ESCAPE '\\'", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE '%\\%\\%%%%' ESCAPE '\\'", "name LIKE '%\\%\\%%%%' ESCAPE '\\'", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE '%%' ESCAPE '%'", "name = VARCHAR '%'", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE '%%%%' ESCAPE '%'", "name = VARCHAR '%%'", ImmutableMap.of("name", VARCHAR));
+        assertSimplifies("name LIKE '中文%%abc字母😂' ESCAPE '%'", "name = VARCHAR '中文%abc字母😂'", ImmutableMap.of("name", VARCHAR));
     }
 
     @Test
     public void testExtractCommonPredicates()
     {
-        assertSimplifies("X AND Y", "X AND Y");
-        assertSimplifies("X OR Y", "X OR Y");
-        assertSimplifies("X AND X", "X");
-        assertSimplifies("X OR X", "X");
-        assertSimplifies("(X OR Y) AND (X OR Y)", "X OR Y");
-
-        assertSimplifies("(A AND V) OR V", "V");
-        assertSimplifies("(A OR V) AND V", "V");
-        assertSimplifies("(A OR B OR C) AND (A OR B)", "A OR B");
-        assertSimplifies("(A AND B) OR (A AND B AND C)", "A AND B");
-        assertSimplifies("I = ((A OR B) AND (A OR B OR C))", "I = (A OR B)");
-        assertSimplifies("(X OR Y) AND (X OR Z)", "(X OR Y) AND (X OR Z)");
-        assertSimplifies("(X AND Y AND V) OR (X AND Y AND Z)", "(X AND Y) AND (V OR Z)");
-        assertSimplifies("((X OR Y OR V) AND (X OR Y OR Z)) = I", "((X OR Y) OR (V AND Z)) = I");
-
-        assertSimplifies("((X OR V) AND V) OR ((X OR V) AND V)", "V");
-        assertSimplifies("((X OR V) AND X) OR ((X OR V) AND V)", "X OR V");
-
-        assertSimplifies("((X OR V) AND Z) OR ((X OR V) AND V)", "(X OR V) AND (Z OR V)");
-        assertSimplifies("X AND ((Y AND Z) OR (Y AND V) OR (Y AND X))", "X AND Y AND (Z OR V OR X)");
-        assertSimplifies("(A AND B AND C AND D) OR (A AND B AND E) OR (A AND F)", "A AND ((B AND C AND D) OR (B AND E) OR F)");
-
-        assertSimplifies("((A AND B) OR (A AND C)) AND D", "A AND (B OR C) AND D");
-        assertSimplifies("((A OR B) AND (A OR C)) OR D", "(A OR B OR D) AND (A OR C OR D)");
-        assertSimplifies("(((A AND B) OR (A AND C)) AND D) OR E", "(A OR E) AND (B OR C OR E) AND (D OR E)");
-        assertSimplifies("(((A OR B) AND (A OR C)) OR D) AND E", "(A OR (B AND C) OR D) AND E");
-
-        assertSimplifies("(A AND B) OR (C AND D)", "(A OR C) AND (A OR D) AND (B OR C) AND (B OR D)");
+        assertSimplifies("X AND Y", "X AND Y", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN));
+        assertSimplifies("X OR Y", "X OR Y", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN));
+        assertSimplifies("X AND X", "X", ImmutableMap.of("X", BOOLEAN));
+        assertSimplifies("X OR X", "X", ImmutableMap.of("X", BOOLEAN));
+        assertSimplifies("(X OR Y) AND (X OR Y)", "X OR Y", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN));
+
+        assertSimplifies("(A AND V) OR V", "V", ImmutableMap.of("A", BOOLEAN, "V", BOOLEAN));
+        assertSimplifies("(A OR V) AND V", "V", ImmutableMap.of("A", BOOLEAN, "V", BOOLEAN));
+        assertSimplifies("(A OR B OR C) AND (A OR B)", "A OR B", ImmutableMap.of("A", BOOLEAN, "B", BOOLEAN, "C", BOOLEAN));
+        assertSimplifies("(A AND B) OR (A AND B AND C)", "A AND B", ImmutableMap.of("A", BOOLEAN, "B", BOOLEAN, "C", BOOLEAN));
+        assertSimplifies("I = ((A OR B) AND (A OR B OR C))", "I = (A OR B)", ImmutableMap.of("A", BOOLEAN, "B", BOOLEAN, "C", BOOLEAN, "I", BOOLEAN));
+        assertSimplifies("(X OR Y) AND (X OR Z)", "(X OR Y) AND (X OR Z)", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN, "Z", BOOLEAN));
+        assertSimplifies("(X AND Y AND V) OR (X AND Y AND Z)", "(X AND Y) AND (V OR Z)", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN, "Z", BOOLEAN, "V", BOOLEAN));
+        assertSimplifies("((X OR Y OR V) AND (X OR Y OR Z)) = I", "((X OR Y) OR (V AND Z)) = I", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN, "Z", BOOLEAN, "V", BOOLEAN, "I", BOOLEAN));
+
+        assertSimplifies("((X OR V) AND V) OR ((X OR V) AND V)", "V", ImmutableMap.of("X", BOOLEAN, "V", BOOLEAN));
+        assertSimplifies("((X OR V) AND X) OR ((X OR V) AND V)", "X OR V", ImmutableMap.of("X", BOOLEAN, "V", BOOLEAN));
+
+        assertSimplifies("((X OR V) AND Z) OR ((X OR V) AND V)", "(X OR V) AND (Z OR V)", ImmutableMap.of("X", BOOLEAN, "V", BOOLEAN, "Z", BOOLEAN));
+        assertSimplifies("X AND ((Y AND Z) OR (Y AND V) OR (Y AND X))", "X AND Y AND (Z OR V OR X)", ImmutableMap.of("X", BOOLEAN, "Y", BOOLEAN, "Z", BOOLEAN, "V", BOOLEAN));
+        assertSimplifies("(A AND B AND C AND D) OR (A AND B AND E) OR (A AND F)", "A AND ((B AND C AND D) OR (B AND E) OR F)", ImmutableMap.of("A", BOOLEAN, "B", BOOLEAN, "C", BOOLEAN, "D", BOOLEAN, "E", BOOLEAN, "F", BOOLEAN));
+
+        assertSimplifies("((A AND B) OR (A AND C)) AND D", "A AND (B OR C) AND D", ImmutableMap.of("A", BOOLEAN, "B", BOOLEAN, "C", BOOLEAN, "D", BOOLEAN));
+        assertSimplifies("((A OR B) AND (A OR C)) OR D", "(A OR B OR D) AND (A OR C OR D)", ImmutableMap.of("A", BOOLEAN, "B", BOOLEAN, "C", BOOLEAN, "D", BOOLEAN));
+        assertSimplifies("(((A AND B) OR (A AND C)) AND D) OR E", "(A OR E) AND (B OR C OR E) AND (D OR E)", ImmutableMap.of("A", BOOLEAN, "B", BOOLEAN, "C", BOOLEAN, "D", BOOLEAN, "E", BOOLEAN));
+        assertSimplifies("(((A OR B) AND (A OR C)) OR D) AND E", "(A OR (B AND C) OR D) AND E", ImmutableMap.of("A", BOOLEAN, "B", BOOLEAN, "C", BOOLEAN, "D", BOOLEAN, "E", BOOLEAN));
+
+        assertSimplifies("(A AND B) OR (C AND D)", "(A OR C) AND (A OR D) AND (B OR C) AND (B OR D)", ImmutableMap.of("A", BOOLEAN, "B", BOOLEAN, "C", BOOLEAN, "D", BOOLEAN));
         // No distribution since it would add too many new terms
-        assertSimplifies("(A AND B) OR (C AND D) OR (E AND F)", "(A AND B) OR (C AND D) OR (E AND F)");
+        assertSimplifies("(A AND B) OR (C AND D) OR (E AND F)", "(A AND B) OR (C AND D) OR (E AND F)", ImmutableMap.of("A", BOOLEAN, "B", BOOLEAN, "C", BOOLEAN, "D", BOOLEAN, "E", BOOLEAN, "F", BOOLEAN));
 
         // Test overflow handling for large disjunct expressions
+        Map<String, Type> symbolTypes = IntStream.range(1, 61)
+                .mapToObj(i -> "A" + i)
+                .collect(toImmutableMap(Function.identity(), x -> BOOLEAN));
         assertSimplifies("(A1 AND A2) OR (A3 AND A4) OR (A5 AND A6) OR (A7 AND A8) OR (A9 AND A10)" +
                         " OR (A11 AND A12) OR (A13 AND A14) OR (A15 AND A16) OR (A17 AND A18) OR (A19 AND A20)" +
                         " OR (A21 AND A22) OR (A23 AND A24) OR (A25 AND A26) OR (A27 AND A28) OR (A29 AND A30)" +
@@ -115,16 +166,17 @@ public void testExtractCommonPredicates()
                         " OR (A21 AND A22) OR (A23 AND A24) OR (A25 AND A26) OR (A27 AND A28) OR (A29 AND A30)" +
                         " OR (A31 AND A32) OR (A33 AND A34) OR (A35 AND A36) OR (A37 AND A38) OR (A39 AND A40)" +
                         " OR (A41 AND A42) OR (A43 AND A44) OR (A45 AND A46) OR (A47 AND A48) OR (A49 AND A50)" +
-                        " OR (A51 AND A52) OR (A53 AND A54) OR (A55 AND A56) OR (A57 AND A58) OR (A59 AND A60)");
+                        " OR (A51 AND A52) OR (A53 AND A54) OR (A55 AND A56) OR (A57 AND A58) OR (A59 AND A60)",
+                symbolTypes);
     }
 
     @Test
     public void testMultipleNulls()
     {
         assertSimplifies("null AND null AND null AND false", "false");
-        assertSimplifies("null AND null AND null AND B1", "null AND B1");
+        assertSimplifies("null AND null AND null AND B1", "null AND B1", ImmutableMap.of("B1", BOOLEAN));
         assertSimplifies("null OR null OR null OR true", "true");
-        assertSimplifies("null OR null OR null OR B1", "null OR B1");
+        assertSimplifies("null OR null OR null OR B1", "null OR B1", ImmutableMap.of("B1", BOOLEAN));
     }
 
     @Test
@@ -257,22 +309,22 @@ public void testCastDateToBoundedVarchar()
 
     private static void assertSimplifies(@Language("SQL") String expression, @Language("SQL") String expected)
     {
-        Expression expectedExpression = normalize(rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expected, new ParsingOptions())));
-        assertEquals(
-                simplify(expression),
-                expectedExpression);
+        assertSimplifies(expression, expected, ImmutableMap.of());
     }
 
-    private static Expression simplify(@Language("SQL") String expression)
+    private static void assertSimplifies(@Language("SQL") String expression, @Language("SQL") String expected, Map<String, Type> symbolTypes)
     {
-        Expression actualExpression = rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expression, new ParsingOptions()));
-        return normalize(rewrite(actualExpression, TEST_SESSION, new SymbolAllocator(booleanSymbolTypeMapFor(actualExpression)), PLANNER_CONTEXT, createTestingTypeAnalyzer(PLANNER_CONTEXT)));
+        Expression expectedExpression = normalize(rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expected)));
+        assertEquals(
+                simplify(expression, symbolTypes),
+                expectedExpression);
     }
 
-    private static Map<Symbol, Type> booleanSymbolTypeMapFor(Expression expression)
+    private static Expression simplify(@Language("SQL") String expression, Map<String, Type> symbolTypes)
     {
-        return SymbolsExtractor.extractUnique(expression).stream()
-                .collect(Collectors.toMap(symbol -> symbol, symbol -> BOOLEAN));
+        Map<Symbol, Type> symbols = symbolTypes.entrySet().stream().collect(toImmutableMap(symbolTypeEntry -> new Symbol(symbolTypeEntry.getKey()), Map.Entry::getValue));
+        Expression actualExpression = rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expression));
+        return normalize(rewrite(actualExpression, TEST_SESSION, new SymbolAllocator(symbols), PLANNER_CONTEXT, createTestingTypeAnalyzer(PLANNER_CONTEXT)));
     }
 
     @Test
@@ -331,17 +383,29 @@ public void testPushesDownNegationsNumericTypes()
     public void testRewriteOrExpression()
     {
         assertSimplifiesNumericTypes("I1 = 1 OR I1 = 2 ", "I1 IN (1, 2)");
-        // TODO: Implement rule for Merging IN expression
-        assertSimplifiesNumericTypes("I1 = 1 OR I1 = 2 OR I1 IN (3, 4)", "I1 IN (3, 4) OR I1 IN (1, 2)");
+        assertSimplifiesNumericTypes("I1 = 1 OR I1 = 2 OR I1 IN (3, 4)", "I1 IN (1, 2, 3, 4)");
         assertSimplifiesNumericTypes("I1 = 1 OR I1 = 2 OR I1 = I2", "I1 IN (1, 2, I2)");
         assertSimplifiesNumericTypes("I1 = 1 OR I1 = 2 OR I2 = 3 OR I2 = 4", "I1 IN (1, 2) OR I2 IN (3, 4)");
+        assertSimplifiesNumericTypes("I1 = 1 OR I1 IN (1, 2)", "I1 IN (1, 2)");
+        assertSimplifiesNumericTypes("I1 = 1 OR I2 IN (1, 2) OR I2 IN (2, 3)", "I1 = 1 OR I2 IN (1, 2, 3)");
+        assertSimplifiesNumericTypes("I1 IN (1)", "I1 = 1");
+        assertSimplifiesNumericTypes("I1 = 1 OR I1 IN (1)", "I1 = 1");
+        assertSimplifiesNumericTypes("I1 = 1 OR I1 IN (2)", "I1 IN (1, 2)");
+        assertSimplifiesNumericTypes("I1 IN (1, 2) OR I1 = 1", "I1 IN (1, 2)");
+        assertSimplifiesNumericTypes("I1 IN (1, 2) OR I2 = 1 OR I1 = 3 OR I2 = 4", "I1 IN (1, 2, 3) OR I2 IN (1, 4)");
+        assertSimplifiesNumericTypes("I1 IN (1, 2) OR I1 = 3 OR I1 IN (4, 5, 6) OR I2 = 3 OR I2 IN (3, 4)", "I1 IN (1, 2, 3, 4, 5, 6) OR I2 IN (3, 4)");
+
+        assertSimplifiesNumericTypes("I1 = 1 OR I1 = 2 OR I1 IN (3, 4) OR I1 IN (SELECT 1)", "I1 IN (1, 2, 3, 4) OR I1 IN (SELECT 1)");
+        assertSimplifiesNumericTypes("I1 = 1 OR I2 = 2 OR I1 = 3 OR I2 = 4", "I1 IN (1, 3) OR I2 IN (2, 4)");
+        assertSimplifiesNumericTypes("I1 = 1 OR I2 = 2 OR I1 = 3 OR I2 IS NULL", "I1 IN(1, 3) OR I2 = 2 OR I2 IS NULL");
+        assertSimplifiesNumericTypes("I1 = 1 OR I2 IN (2, 3) OR I1 = 4 OR I2 IN (5, 6)", "I1 IN (1, 4) OR I2 IN (2, 3, 5, 6)");
+        assertSimplifiesNumericTypes("I1 = 1 OR I2 = 2 OR I1 = 3 OR I2 = I1", "I1 IN (1, 3) OR I2 IN (2, I1)");
     }
 
     private static void assertSimplifiesNumericTypes(String expression, String expected)
     {
-        ParsingOptions parsingOptions = new ParsingOptions();
-        Expression actualExpression = rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expression, parsingOptions));
-        Expression expectedExpression = rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expected, parsingOptions));
+        Expression actualExpression = rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expression));
+        Expression expectedExpression = rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expected));
         Expression rewritten = rewrite(actualExpression, TEST_SESSION, new SymbolAllocator(numericAndBooleanSymbolTypeMapFor(actualExpression)), PLANNER_CONTEXT, createTestingTypeAnalyzer(PLANNER_CONTEXT));
         assertEquals(
                 normalize(rewritten),
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSimplifyFilterPredicate.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSimplifyFilterPredicate.java
index 5eb6233c35e5..2f46bd4c485f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSimplifyFilterPredicate.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSimplifyFilterPredicate.java
@@ -19,8 +19,7 @@
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.IfExpression;
 import io.trino.sql.tree.LongLiteral;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
@@ -105,7 +104,7 @@ public void testSimplifyIfExpression()
 
         // both results are equal non-deterministic expressions
         FunctionCall randomFunction = new FunctionCall(
-                tester().getMetadata().resolveFunction(tester().getSession(), QualifiedName.of("random"), ImmutableList.of()).toQualifiedName(),
+                tester().getMetadata().resolveBuiltinFunction("random", ImmutableList.of()).toQualifiedName(),
                 ImmutableList.of());
         tester().assertThat(new SimplifyFilterPredicate(tester().getMetadata()))
                 .on(p -> p.filter(
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSingleDistinctAggregationToGroupBy.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSingleDistinctAggregationToGroupBy.java
index 2258ae636ea5..6ccc5778d738 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSingleDistinctAggregationToGroupBy.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSingleDistinctAggregationToGroupBy.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.tree.FunctionCall;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSwapAdjacentWindowsBySpecifications.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSwapAdjacentWindowsBySpecifications.java
index 0cb9bbb897fe..737fc1e6e15d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSwapAdjacentWindowsBySpecifications.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSwapAdjacentWindowsBySpecifications.java
@@ -21,9 +21,8 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
 import io.trino.sql.planner.plan.WindowNode;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -43,7 +42,7 @@ public class TestSwapAdjacentWindowsBySpecifications
 
     public TestSwapAdjacentWindowsBySpecifications()
     {
-        resolvedFunction = new TestingFunctionResolution().resolveFunction(QualifiedName.of("avg"), fromTypes(BIGINT));
+        resolvedFunction = new TestingFunctionResolution().resolveFunction("avg", fromTypes(BIGINT));
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedDistinctAggregationWithProjection.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedDistinctAggregationWithProjection.java
index 4d0e69e59848..56878e6ac256 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedDistinctAggregationWithProjection.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedDistinctAggregationWithProjection.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.CorrelatedJoinNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedDistinctAggregationWithoutProjection.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedDistinctAggregationWithoutProjection.java
index 9f76832db623..3d62030bdba3 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedDistinctAggregationWithoutProjection.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedDistinctAggregationWithoutProjection.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.CorrelatedJoinNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGlobalAggregationWithProjection.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGlobalAggregationWithProjection.java
index 55e1eaad0c8c..afcb7b80d29a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGlobalAggregationWithProjection.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGlobalAggregationWithProjection.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGlobalAggregationWithoutProjection.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGlobalAggregationWithoutProjection.java
index 005127bb2d2f..4ac9249009b6 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGlobalAggregationWithoutProjection.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGlobalAggregationWithoutProjection.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGroupedAggregationWithProjection.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGroupedAggregationWithProjection.java
index 3aa76730b7bc..3e2d206599ed 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGroupedAggregationWithProjection.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGroupedAggregationWithProjection.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.JoinNode.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGroupedAggregationWithoutProjection.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGroupedAggregationWithoutProjection.java
index 77c83992cb1d..d3b5a122e395 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGroupedAggregationWithoutProjection.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedGroupedAggregationWithoutProjection.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.JoinNode.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedJoinToJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedJoinToJoin.java
index 748e75393ef7..7b02bfaa1f1b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedJoinToJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedJoinToJoin.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.plan.JoinNode.Type;
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.LongLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.join;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedScalarSubquery.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedScalarSubquery.java
index 84421cfb74be..7732e4ea5b04 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedScalarSubquery.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedScalarSubquery.java
@@ -27,7 +27,7 @@
 import io.trino.sql.tree.SimpleCaseExpression;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.sql.tree.WhenClause;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -205,7 +205,7 @@ private Expression ensureScalarSubquery()
                 new SymbolReference("is_distinct"),
                 ImmutableList.of(new WhenClause(TRUE_LITERAL, TRUE_LITERAL)),
                 Optional.of(new Cast(
-                        failFunction(tester().getMetadata(), tester().getSession(), SUBQUERY_MULTIPLE_ROWS, "Scalar sub-query has returned multiple rows"),
+                        failFunction(tester().getMetadata(), SUBQUERY_MULTIPLE_ROWS, "Scalar sub-query has returned multiple rows"),
                         toSqlType(BOOLEAN))));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedSingleRowSubqueryToProject.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedSingleRowSubqueryToProject.java
index 84fb37e440bb..0cae9d80e200 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedSingleRowSubqueryToProject.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformCorrelatedSingleRowSubqueryToProject.java
@@ -21,7 +21,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.tree.NullLiteral;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformExistsApplyToCorrelatedJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformExistsApplyToCorrelatedJoin.java
index 2cf79946037b..43d4ef41100d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformExistsApplyToCorrelatedJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformExistsApplyToCorrelatedJoin.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.FilterNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.aggregation;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformFilteringSemiJoinToInnerJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformFilteringSemiJoinToInnerJoin.java
index efc1a8daa7fe..9207896d98a7 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformFilteringSemiJoinToInnerJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformFilteringSemiJoinToInnerJoin.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformUncorrelatedInPredicateSubqueryToSemiJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformUncorrelatedInPredicateSubqueryToSemiJoin.java
index aa40e999e355..522617a7662d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformUncorrelatedInPredicateSubqueryToSemiJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformUncorrelatedInPredicateSubqueryToSemiJoin.java
@@ -20,7 +20,7 @@
 import io.trino.sql.tree.InPredicate;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformUncorrelatedSubqueryToJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformUncorrelatedSubqueryToJoin.java
index adca98d2ccb7..f88bde2a1f88 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformUncorrelatedSubqueryToJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestTransformUncorrelatedSubqueryToJoin.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.tree.ComparisonExpression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.join;
@@ -120,7 +120,7 @@ public void testRewriteRightCorrelatedJoin()
                 .matches(
                         project(
                                 ImmutableMap.of(
-                                        "a", expression("if(b > a, a, null)"),
+                                        "a", expression("if(b > a, a, cast(null AS BIGINT))"),
                                         "b", expression("b")),
                                 join(Type.INNER, builder -> builder
                                         .left(values("a"))
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUnwrapCastInComparison.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUnwrapCastInComparison.java
index 4da8a5441072..fc025fefb2c9 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUnwrapCastInComparison.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUnwrapCastInComparison.java
@@ -13,7 +13,7 @@
  */
 package io.trino.sql.planner.iterative.rule;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.time.ZoneId;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUnwrapRowSubscript.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUnwrapRowSubscript.java
index 7fd42fb6afbc..9beb95001e17 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUnwrapRowSubscript.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUnwrapRowSubscript.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.plan.Assignments;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUnwrapSingleColumnRowInApply.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUnwrapSingleColumnRowInApply.java
index d1edef9586f2..65b71023b56f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUnwrapSingleColumnRowInApply.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUnwrapSingleColumnRowInApply.java
@@ -21,7 +21,7 @@
 import io.trino.sql.tree.InPredicate;
 import io.trino.sql.tree.QuantifiedComparisonExpression;
 import io.trino.sql.tree.SymbolReference;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUseNonPartitionedJoinLookupSource.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUseNonPartitionedJoinLookupSource.java
index 8ad76e4ba6ce..51a9e06b5ab5 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUseNonPartitionedJoinLookupSource.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestUseNonPartitionedJoinLookupSource.java
@@ -22,7 +22,7 @@
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.planner.plan.UnnestNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SystemSessionProperties.JOIN_PARTITIONED_BUILD_MIN_ROW_COUNT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.exchange;
@@ -90,6 +90,9 @@ public void testRepartitioningExchangeNotChangedIfBuildSideTooBig()
     {
         tester()
                 .assertThat(new UseNonPartitionedJoinLookupSource())
+                .overrideStats("source", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(5_000_001)
+                        .build())
                 .on(p -> {
                     Symbol a = p.symbol("a");
                     Symbol b = p.symbol("b");
@@ -98,9 +101,6 @@ public void testRepartitioningExchangeNotChangedIfBuildSideTooBig()
                             p.values(a),
                             repartitioningExchange(p, b, p.values(new PlanNodeId("source"), b)));
                 })
-                .overrideStats("source", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(5_000_001)
-                        .build())
                 .doesNotFire();
     }
 
@@ -108,6 +108,7 @@ public void testRepartitioningExchangeNotChangedIfBuildSideTooBig()
     public void testRepartitioningExchangeNotChangedIfRuleDisabled()
     {
         tester().assertThat(new UseNonPartitionedJoinLookupSource())
+                .setSystemProperty(JOIN_PARTITIONED_BUILD_MIN_ROW_COUNT, "0")
                 .on(p -> {
                     Symbol a = p.symbol("a");
                     Symbol b = p.symbol("b");
@@ -116,7 +117,6 @@ public void testRepartitioningExchangeNotChangedIfRuleDisabled()
                             p.values(a),
                             repartitioningExchange(p, b, p.values(b)));
                 })
-                .setSystemProperty(JOIN_PARTITIONED_BUILD_MIN_ROW_COUNT, "0")
                 .doesNotFire();
     }
 
@@ -162,6 +162,9 @@ public void testRepartitioningExchangeNotChangedIfBuildSideRowCountUnknown()
     {
         tester()
                 .assertThat(new UseNonPartitionedJoinLookupSource())
+                .overrideStats("source", PlanNodeStatsEstimate.builder()
+                        .setOutputRowCount(NaN)
+                        .build())
                 .on(p -> {
                     Symbol a = p.symbol("a");
                     Symbol b = p.symbol("b");
@@ -170,9 +173,6 @@ public void testRepartitioningExchangeNotChangedIfBuildSideRowCountUnknown()
                             p.values(a),
                             repartitioningExchange(p, b, p.values(new PlanNodeId("source"), b)));
                 })
-                .overrideStats("source", PlanNodeStatsEstimate.builder()
-                        .setOutputRowCount(NaN)
-                        .build())
                 .doesNotFire();
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/BaseRuleTest.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/BaseRuleTest.java
index 2d7c95e99089..434882658d03 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/BaseRuleTest.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/BaseRuleTest.java
@@ -16,16 +16,17 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.Plugin;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Optional;
 
 import static io.airlift.testing.Closeables.closeAllRuntimeException;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test
+@TestInstance(PER_CLASS)
 public abstract class BaseRuleTest
 {
     private RuleTester tester;
@@ -36,7 +37,7 @@ public BaseRuleTest(Plugin... plugins)
         this.plugins = ImmutableList.copyOf(plugins);
     }
 
-    @BeforeClass
+    @BeforeAll
     public final void setUp()
     {
         Optional<LocalQueryRunner> localQueryRunner = createLocalQueryRunner();
@@ -57,7 +58,7 @@ protected Optional<LocalQueryRunner> createLocalQueryRunner()
         return Optional.empty();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public final void tearDown()
     {
         closeAllRuntimeException(tester);
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/PlanBuilder.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/PlanBuilder.java
index 05da7c5a291c..c1ccf9f2ff1d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/PlanBuilder.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/PlanBuilder.java
@@ -21,25 +21,26 @@
 import com.google.common.collect.Maps;
 import io.trino.Session;
 import io.trino.cost.PlanNodeStatsEstimate;
+import io.trino.metadata.FunctionResolver;
 import io.trino.metadata.IndexHandle;
-import io.trino.metadata.Metadata;
 import io.trino.metadata.OutputTableHandle;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.metadata.TableExecuteHandle;
 import io.trino.metadata.TableFunctionHandle;
 import io.trino.metadata.TableHandle;
 import io.trino.operator.RetryPolicy;
+import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SortOrder;
-import io.trino.spi.function.SchemaFunctionName;
+import io.trino.spi.connector.WriterScalingOptions;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
 import io.trino.spi.type.Type;
 import io.trino.sql.ExpressionUtils;
+import io.trino.sql.PlannerContext;
 import io.trino.sql.analyzer.TypeSignatureProvider;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.planner.OrderingScheme;
 import io.trino.sql.planner.Partitioning;
@@ -72,6 +73,7 @@
 import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.LimitNode;
 import io.trino.sql.planner.plan.MarkDistinctNode;
+import io.trino.sql.planner.plan.MergeProcessorNode;
 import io.trino.sql.planner.plan.MergeWriterNode;
 import io.trino.sql.planner.plan.OffsetNode;
 import io.trino.sql.planner.plan.OutputNode;
@@ -152,15 +154,15 @@
 public class PlanBuilder
 {
     private final PlanNodeIdAllocator idAllocator;
-    private final Metadata metadata;
     private final Session session;
     private final Map<Symbol, Type> symbols = new HashMap<>();
+    private final FunctionResolver functionResolver;
 
-    public PlanBuilder(PlanNodeIdAllocator idAllocator, Metadata metadata, Session session)
+    public PlanBuilder(PlanNodeIdAllocator idAllocator, PlannerContext plannerContext, Session session)
     {
         this.idAllocator = idAllocator;
-        this.metadata = metadata;
         this.session = session;
+        functionResolver = plannerContext.getFunctionResolver();
     }
 
     public OutputNode output(List<String> columnNames, List<Symbol> outputs, PlanNode source)
@@ -376,7 +378,11 @@ public GroupIdNode groupId(List<List<Symbol>> groupingSets, List<Symbol> aggrega
                 .flatMap(Collection::stream)
                 .distinct()
                 .collect(toImmutableMap(identity(), identity()));
+        return groupId(groupingSets, groupingColumns, aggregationArguments, groupIdSymbol, source);
+    }
 
+    public GroupIdNode groupId(List<List<Symbol>> groupingSets, Map<Symbol, Symbol> groupingColumns, List<Symbol> aggregationArguments, Symbol groupIdSymbol, PlanNode source)
+    {
         return new GroupIdNode(
                 idAllocator.getNextId(),
                 source,
@@ -433,7 +439,7 @@ private AggregationBuilder addAggregation(Symbol output, Expression expression,
         {
             checkArgument(expression instanceof FunctionCall);
             FunctionCall aggregation = (FunctionCall) expression;
-            ResolvedFunction resolvedFunction = metadata.resolveFunction(session, aggregation.getName(), TypeSignatureProvider.fromTypes(inputTypes));
+            ResolvedFunction resolvedFunction = functionResolver.resolveFunction(session, aggregation.getName(), TypeSignatureProvider.fromTypes(inputTypes), new AllowAllAccessControl());
             return addAggregation(output, new Aggregation(
                     resolvedFunction,
                     aggregation.getArguments(),
@@ -685,28 +691,35 @@ public TableScanNode build()
         }
     }
 
-    public TableFinishNode tableWithExchangeCreate(WriterTarget target, PlanNode source, Symbol rowCountSymbol, PartitioningScheme partitioningScheme)
+    public TableFinishNode tableFinish(PlanNode source, WriterTarget target, Symbol rowCountSymbol)
     {
         return new TableFinishNode(
                 idAllocator.getNextId(),
+                source,
+                target,
+                rowCountSymbol,
+                Optional.empty(),
+                Optional.empty());
+    }
+
+    public TableFinishNode tableWithExchangeCreate(WriterTarget target, PlanNode source, Symbol rowCountSymbol)
+    {
+        return tableFinish(
                 exchange(e -> e
                         .addSource(tableWriter(
                                 ImmutableList.of(rowCountSymbol),
                                 ImmutableList.of("column_a"),
                                 Optional.empty(),
-                                Optional.empty(),
                                 target,
                                 source,
                                 rowCountSymbol))
                         .addInputsSet(rowCountSymbol)
-                        .partitioningScheme(partitioningScheme)),
+                        .partitioningScheme(new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(rowCountSymbol)))),
                 target,
-                rowCountSymbol,
-                Optional.empty(),
-                Optional.empty());
+                rowCountSymbol);
     }
 
-    public CreateTarget createTarget(CatalogHandle catalogHandle, SchemaTableName schemaTableName, boolean reportingWrittenBytesSupported, boolean multipleWritersPerPartitionSupported, OptionalInt maxWriterTasks)
+    public CreateTarget createTarget(CatalogHandle catalogHandle, SchemaTableName schemaTableName, boolean multipleWritersPerPartitionSupported, OptionalInt maxWriterTasks, WriterScalingOptions writerScalingOptions, boolean replace)
     {
         OutputTableHandle tableHandle = new OutputTableHandle(
                 catalogHandle,
@@ -716,28 +729,52 @@ public CreateTarget createTarget(CatalogHandle catalogHandle, SchemaTableName sc
         return new CreateTarget(
                 tableHandle,
                 schemaTableName,
-                reportingWrittenBytesSupported,
                 multipleWritersPerPartitionSupported,
-                maxWriterTasks);
+                maxWriterTasks,
+                writerScalingOptions,
+                replace);
     }
 
-    public CreateTarget createTarget(CatalogHandle catalogHandle, SchemaTableName schemaTableName, boolean reportingWrittenBytesSupported, boolean multipleWritersPerPartitionSupported)
+    public CreateTarget createTarget(CatalogHandle catalogHandle, SchemaTableName schemaTableName, boolean multipleWritersPerPartitionSupported, WriterScalingOptions writerScalingOptions, boolean replace)
     {
-        return createTarget(catalogHandle, schemaTableName, reportingWrittenBytesSupported, multipleWritersPerPartitionSupported, OptionalInt.empty());
+        return createTarget(catalogHandle, schemaTableName, multipleWritersPerPartitionSupported, OptionalInt.empty(), writerScalingOptions, replace);
     }
 
     public MergeWriterNode merge(SchemaTableName schemaTableName, PlanNode mergeSource, Symbol mergeRow, Symbol rowId, List<Symbol> outputs)
+    {
+        return merge(mergeSource, mergeTarget(schemaTableName), mergeRow, rowId, outputs);
+    }
+
+    public MergeWriterNode merge(PlanNode mergeSource, MergeTarget target, Symbol mergeRow, Symbol rowId, List<Symbol> outputs)
     {
         return new MergeWriterNode(
                 idAllocator.getNextId(),
                 mergeSource,
-                mergeTarget(schemaTableName),
+                target,
                 ImmutableList.of(mergeRow, rowId),
                 Optional.empty(),
                 outputs);
     }
 
-    private MergeTarget mergeTarget(SchemaTableName schemaTableName)
+    public MergeProcessorNode mergeProcessor(SchemaTableName schemaTableName, PlanNode source, Symbol mergeRow, Symbol rowId, List<Symbol> dataColumnSymbols, List<Symbol> redistributionColumnSymbols, List<Symbol> outputs)
+    {
+        return new MergeProcessorNode(
+                idAllocator.getNextId(),
+                source,
+                mergeTarget(schemaTableName),
+                rowId,
+                mergeRow,
+                dataColumnSymbols,
+                redistributionColumnSymbols,
+                outputs);
+    }
+
+    public MergeTarget mergeTarget(SchemaTableName schemaTableName)
+    {
+        return mergeTarget(schemaTableName, new MergeParadigmAndTypes(Optional.of(DELETE_ROW_AND_INSERT_ROW), ImmutableList.of(), ImmutableList.of(), INTEGER));
+    }
+
+    public MergeTarget mergeTarget(SchemaTableName schemaTableName, MergeParadigmAndTypes mergeParadigmAndTypes)
     {
         return new MergeTarget(
                 new TableHandle(
@@ -746,7 +783,7 @@ private MergeTarget mergeTarget(SchemaTableName schemaTableName)
                         TestingTransactionHandle.create()),
                 Optional.empty(),
                 schemaTableName,
-                new MergeParadigmAndTypes(Optional.of(DELETE_ROW_AND_INSERT_ROW), ImmutableList.of(), ImmutableList.of(), INTEGER));
+                mergeParadigmAndTypes);
     }
 
     public ExchangeNode gatheringExchange(ExchangeNode.Scope scope, PlanNode child)
@@ -1132,14 +1169,13 @@ public ExceptNode except(ListMultimap<Symbol, Symbol> outputsToInputs, List<Plan
 
     public TableWriterNode tableWriter(List<Symbol> columns, List<String> columnNames, PlanNode source)
     {
-        return tableWriter(columns, columnNames, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), source);
+        return tableWriter(columns, columnNames, Optional.empty(), Optional.empty(), Optional.empty(), source);
     }
 
     public TableWriterNode tableWriter(
             List<Symbol> columns,
             List<String> columnNames,
             Optional<PartitioningScheme> partitioningScheme,
-            Optional<PartitioningScheme> preferredPartitioningScheme,
             TableWriterNode.WriterTarget target,
             PlanNode source,
             Symbol rowCountSymbol)
@@ -1153,7 +1189,6 @@ public TableWriterNode tableWriter(
                 columns,
                 columnNames,
                 partitioningScheme,
-                preferredPartitioningScheme,
                 Optional.empty(),
                 Optional.empty());
     }
@@ -1162,7 +1197,6 @@ public TableWriterNode tableWriter(
             List<Symbol> columns,
             List<String> columnNames,
             Optional<PartitioningScheme> partitioningScheme,
-            Optional<PartitioningScheme> preferredPartitioningScheme,
             Optional<StatisticAggregations> statisticAggregations,
             Optional<StatisticAggregationsDescriptor<Symbol>> statisticAggregationsDescriptor,
             PlanNode source)
@@ -1176,21 +1210,19 @@ public TableWriterNode tableWriter(
                 columns,
                 columnNames,
                 partitioningScheme,
-                preferredPartitioningScheme,
                 statisticAggregations,
                 statisticAggregationsDescriptor);
     }
 
     public TableExecuteNode tableExecute(List<Symbol> columns, List<String> columnNames, PlanNode source)
     {
-        return tableExecute(columns, columnNames, Optional.empty(), Optional.empty(), source);
+        return tableExecute(columns, columnNames, Optional.empty(), source);
     }
 
     public TableExecuteNode tableExecute(
             List<Symbol> columns,
             List<String> columnNames,
             Optional<PartitioningScheme> partitioningScheme,
-            Optional<PartitioningScheme> preferredPartitioningScheme,
             PlanNode source)
     {
         return new TableExecuteNode(
@@ -1203,13 +1235,12 @@ public TableExecuteNode tableExecute(
                                 new TestingTableExecuteHandle()),
                         Optional.empty(),
                         new SchemaTableName("schemaName", "tableName"),
-                        false),
+                        WriterScalingOptions.DISABLED),
                 symbol("partialrows", BIGINT),
                 symbol("fragment", VARBINARY),
                 columns,
                 columnNames,
-                partitioningScheme,
-                preferredPartitioningScheme);
+                partitioningScheme);
     }
 
     public TableFunctionNode tableFunction(
@@ -1229,7 +1260,7 @@ public TableFunctionNode tableFunction(
                 sources,
                 tableArgumentProperties,
                 copartitioningLists,
-                new TableFunctionHandle(TEST_CATALOG_HANDLE, new SchemaFunctionName("system", name), new ConnectorTableFunctionHandle() {}, TestingTransactionHandle.create()));
+                new TableFunctionHandle(TEST_CATALOG_HANDLE, new ConnectorTableFunctionHandle() {}, TestingTransactionHandle.create()));
     }
 
     public TableFunctionProcessorNode tableFunctionProcessor(Consumer<TableFunctionProcessorBuilder> consumer)
@@ -1257,7 +1288,7 @@ public Aggregation aggregation(Expression expression, List<Type> inputTypes)
     {
         checkArgument(expression instanceof FunctionCall);
         FunctionCall aggregation = (FunctionCall) expression;
-        ResolvedFunction resolvedFunction = metadata.resolveFunction(session, aggregation.getName(), TypeSignatureProvider.fromTypes(inputTypes));
+        ResolvedFunction resolvedFunction = functionResolver.resolveFunction(session, aggregation.getName(), TypeSignatureProvider.fromTypes(inputTypes), new AllowAllAccessControl());
         return new Aggregation(
                 resolvedFunction,
                 aggregation.getArguments(),
@@ -1378,7 +1409,7 @@ public RemoteSourceNode remoteSource(
 
     public static Expression expression(@Language("SQL") String sql)
     {
-        return ExpressionUtils.rewriteIdentifiersToSymbolReferences(new SqlParser().createExpression(sql, new ParsingOptions()));
+        return ExpressionUtils.rewriteIdentifiersToSymbolReferences(new SqlParser().createExpression(sql));
     }
 
     public static List<Expression> expressions(@Language("SQL") String... expressions)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/RuleAssert.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/RuleAssert.java
index 0d9422eb5a8e..485e80eb2acf 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/RuleAssert.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/RuleAssert.java
@@ -20,18 +20,13 @@
 import io.trino.cost.CachingTableStatsProvider;
 import io.trino.cost.CostCalculator;
 import io.trino.cost.CostProvider;
-import io.trino.cost.PlanNodeStatsEstimate;
 import io.trino.cost.StatsAndCosts;
 import io.trino.cost.StatsCalculator;
 import io.trino.cost.StatsProvider;
-import io.trino.cost.TableStatsProvider;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.matching.Capture;
 import io.trino.matching.Match;
 import io.trino.matching.Pattern;
-import io.trino.metadata.FunctionManager;
-import io.trino.metadata.Metadata;
-import io.trino.security.AccessControl;
 import io.trino.sql.planner.Plan;
 import io.trino.sql.planner.PlanNodeIdAllocator;
 import io.trino.sql.planner.SymbolAllocator;
@@ -41,137 +36,103 @@
 import io.trino.sql.planner.iterative.Memo;
 import io.trino.sql.planner.iterative.Rule;
 import io.trino.sql.planner.plan.PlanNode;
-import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.transaction.TransactionManager;
+import io.trino.testing.LocalQueryRunner;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.MoreCollectors.toOptional;
 import static io.trino.matching.Capture.newCapture;
 import static io.trino.sql.planner.assertions.PlanAssert.assertPlan;
 import static io.trino.sql.planner.planprinter.PlanPrinter.textLogicalPlan;
-import static io.trino.transaction.TransactionBuilder.transaction;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static org.testng.Assert.fail;
 
 public class RuleAssert
 {
-    private final Metadata metadata;
-    private final FunctionManager functionManager;
-    private final TestingStatsCalculator statsCalculator;
-    private final CostCalculator costCalculator;
-    private Session session;
     private final Rule<?> rule;
+    private final LocalQueryRunner queryRunner;
+    private final StatsCalculator statsCalculator;
+    private final Session session;
+    private final PlanNode plan;
+    private final TypeProvider types;
 
-    private final PlanNodeIdAllocator idAllocator = new PlanNodeIdAllocator();
-
-    private TypeProvider types;
-    private PlanNode plan;
-    private final TransactionManager transactionManager;
-    private final AccessControl accessControl;
-
-    public RuleAssert(
-            Metadata metadata,
-            FunctionManager functionManager,
-            StatsCalculator statsCalculator,
-            CostCalculator costCalculator,
-            Session session,
-            Rule<?> rule,
-            TransactionManager transactionManager,
-            AccessControl accessControl)
-    {
-        this.metadata = metadata;
-        this.functionManager = functionManager;
-        this.statsCalculator = new TestingStatsCalculator(statsCalculator);
-        this.costCalculator = costCalculator;
-        this.session = session;
-        this.rule = rule;
-        this.transactionManager = transactionManager;
-        this.accessControl = accessControl;
-    }
-
-    public RuleAssert setSystemProperty(String key, String value)
-    {
-        return withSession(Session.builder(session)
-                .setSystemProperty(key, value)
-                .build());
-    }
+    private final PlanNodeIdAllocator idAllocator;
 
-    public RuleAssert withSession(Session session)
+    RuleAssert(Rule<?> rule, LocalQueryRunner queryRunner, StatsCalculator statsCalculator, Session session, PlanNodeIdAllocator idAllocator, PlanNode plan, TypeProvider types)
     {
+        this.rule = requireNonNull(rule, "rule is null");
+        this.queryRunner = requireNonNull(queryRunner, "queryRunner is null");
+        this.statsCalculator = requireNonNull(statsCalculator, "statsCalculator is null");
+        // verify session is in a transaction
+        session.getRequiredTransactionId();
         this.session = session;
-        return this;
-    }
-
-    public RuleAssert overrideStats(String nodeId, PlanNodeStatsEstimate nodeStats)
-    {
-        statsCalculator.setNodeStats(new PlanNodeId(nodeId), nodeStats);
-        return this;
-    }
-
-    public RuleAssert on(Function<PlanBuilder, PlanNode> planProvider)
-    {
-        checkArgument(plan == null, "plan has already been set");
-
-        PlanBuilder builder = new PlanBuilder(idAllocator, metadata, session);
-        plan = planProvider.apply(builder);
-        types = builder.getTypes();
-        return this;
+        this.idAllocator = requireNonNull(idAllocator, "idAllocator is null");
+        this.plan = requireNonNull(plan, "plan is null");
+        this.types = requireNonNull(types, "types is null");
     }
 
     public void doesNotFire()
     {
-        RuleApplication ruleApplication = applyRule();
-
-        if (ruleApplication.wasRuleApplied()) {
-            fail(format(
-                    "Expected %s to not fire for:\n%s",
-                    rule,
-                    inTransaction(session -> textLogicalPlan(plan, ruleApplication.types, metadata, functionManager, StatsAndCosts.empty(), session, 2, false))));
+        try {
+            RuleApplication ruleApplication = applyRule();
+
+            if (ruleApplication.wasRuleApplied()) {
+                fail(format(
+                        "Expected %s to not fire for:\n%s",
+                        rule,
+                        textLogicalPlan(plan, ruleApplication.types(), queryRunner.getMetadata(), queryRunner.getFunctionManager(), StatsAndCosts.empty(), session, 2, false)));
+            }
+        }
+        finally {
+            queryRunner.getMetadata().cleanupQuery(session);
+            queryRunner.getTransactionManager().asyncAbort(session.getRequiredTransactionId());
         }
     }
 
     public void matches(PlanMatchPattern pattern)
     {
-        RuleApplication ruleApplication = applyRule();
-        TypeProvider types = ruleApplication.types;
-
-        if (!ruleApplication.wasRuleApplied()) {
-            fail(format(
-                    "%s did not fire for:\n%s",
-                    rule,
-                    formatPlan(plan, types)));
-        }
+        try {
+            RuleApplication ruleApplication = applyRule();
+
+            if (!ruleApplication.wasRuleApplied()) {
+                fail(format(
+                        "%s did not fire for:\n%s",
+                        rule,
+                        formatPlan(plan, ruleApplication.types())));
+            }
 
-        PlanNode actual = ruleApplication.getTransformedPlan();
+            PlanNode actual = ruleApplication.getTransformedPlan();
 
-        if (actual == plan) { // plans are not comparable, so we can only ensure they are not the same instance
-            fail(format(
-                    "%s: rule fired but return the original plan:\n%s",
-                    rule,
-                    formatPlan(plan, types)));
-        }
+            if (actual == plan) { // plans are not comparable, so we can only ensure they are not the same instance
+                fail(format(
+                        """
+                        %s: rule fired but return the original plan:
+                        %s
+                        """,
+                        rule,
+                        formatPlan(plan, ruleApplication.types())));
+            }
 
-        if (!ImmutableSet.copyOf(plan.getOutputSymbols()).equals(ImmutableSet.copyOf(actual.getOutputSymbols()))) {
-            fail(format(
-                    "%s: output schema of transformed and original plans are not equivalent\n" +
-                            "\texpected: %s\n" +
-                            "\tactual:   %s",
-                    rule,
-                    plan.getOutputSymbols(),
-                    actual.getOutputSymbols()));
-        }
+            if (!ImmutableSet.copyOf(plan.getOutputSymbols()).equals(ImmutableSet.copyOf(actual.getOutputSymbols()))) {
+                fail(format(
+                        """
+                        %s: output schema of transformed and original plans are not equivalent
+                        \texpected: %s
+                        \tactual:   %s
+                        """,
+                        rule,
+                        plan.getOutputSymbols(),
+                        actual.getOutputSymbols()));
+            }
 
-        inTransaction(session -> {
-            assertPlan(session, metadata, functionManager, ruleApplication.statsProvider, new Plan(actual, types, StatsAndCosts.empty()), ruleApplication.lookup, pattern);
-            return null;
-        });
+            assertPlan(session, queryRunner.getMetadata(), queryRunner.getFunctionManager(), ruleApplication.statsProvider(), new Plan(actual, ruleApplication.types(), StatsAndCosts.empty()), ruleApplication.lookup(), pattern);
+        }
+        finally {
+            queryRunner.getMetadata().cleanupQuery(session);
+            queryRunner.getTransactionManager().asyncAbort(session.getRequiredTransactionId());
+        }
     }
 
     private RuleApplication applyRule()
@@ -182,7 +143,7 @@ private RuleApplication applyRule()
 
         PlanNode memoRoot = memo.getNode(memo.getRootGroup());
 
-        return inTransaction(session -> applyRule(rule, memoRoot, ruleContext(statsCalculator, costCalculator, symbolAllocator, memo, lookup, session)));
+        return applyRule(rule, memoRoot, ruleContext(statsCalculator, queryRunner.getEstimatedExchangesCostCalculator(), symbolAllocator, memo, lookup, session));
     }
 
     private static <T> RuleApplication applyRule(Rule<T> rule, PlanNode planNode, Rule.Context context)
@@ -205,27 +166,14 @@ private static <T> RuleApplication applyRule(Rule<T> rule, PlanNode planNode, Ru
 
     private String formatPlan(PlanNode plan, TypeProvider types)
     {
-        return inTransaction(session -> {
-            StatsProvider statsProvider = new CachingStatsProvider(statsCalculator, session, types, new CachingTableStatsProvider(metadata, session));
-            CostProvider costProvider = new CachingCostProvider(costCalculator, statsProvider, session, types);
-            return textLogicalPlan(plan, types, metadata, functionManager, StatsAndCosts.create(plan, statsProvider, costProvider), session, 2, false);
-        });
-    }
-
-    private <T> T inTransaction(Function<Session, T> transactionSessionConsumer)
-    {
-        return transaction(transactionManager, accessControl)
-                .singleStatement()
-                .execute(session, session -> {
-                    // metadata.getCatalogHandle() registers the catalog for the transaction
-                    session.getCatalog().ifPresent(catalog -> metadata.getCatalogHandle(session, catalog));
-                    return transactionSessionConsumer.apply(session);
-                });
+        StatsProvider statsProvider = new CachingStatsProvider(statsCalculator, session, types, new CachingTableStatsProvider(queryRunner.getMetadata(), session));
+        CostProvider costProvider = new CachingCostProvider(queryRunner.getCostCalculator(), statsProvider, session, types);
+        return textLogicalPlan(plan, types, queryRunner.getMetadata(), queryRunner.getFunctionManager(), StatsAndCosts.create(plan, statsProvider, costProvider), session, 2, false);
     }
 
     private Rule.Context ruleContext(StatsCalculator statsCalculator, CostCalculator costCalculator, SymbolAllocator symbolAllocator, Memo memo, Lookup lookup, Session session)
     {
-        StatsProvider statsProvider = new CachingStatsProvider(statsCalculator, Optional.of(memo), lookup, session, symbolAllocator.getTypes(), new CachingTableStatsProvider(metadata, session));
+        StatsProvider statsProvider = new CachingStatsProvider(statsCalculator, Optional.of(memo), lookup, session, symbolAllocator.getTypes(), new CachingTableStatsProvider(queryRunner.getMetadata(), session));
         CostProvider costProvider = new CachingCostProvider(costCalculator, statsProvider, Optional.of(memo), session, symbolAllocator.getTypes());
 
         return new Rule.Context()
@@ -277,14 +225,9 @@ public WarningCollector getWarningCollector()
         };
     }
 
-    private static class RuleApplication
+    private record RuleApplication(Lookup lookup, StatsProvider statsProvider, TypeProvider types, Rule.Result result)
     {
-        private final Lookup lookup;
-        private final StatsProvider statsProvider;
-        private final TypeProvider types;
-        private final Rule.Result result;
-
-        public RuleApplication(Lookup lookup, StatsProvider statsProvider, TypeProvider types, Rule.Result result)
+        private RuleApplication(Lookup lookup, StatsProvider statsProvider, TypeProvider types, Rule.Result result)
         {
             this.lookup = requireNonNull(lookup, "lookup is null");
             this.statsProvider = requireNonNull(statsProvider, "statsProvider is null");
@@ -302,30 +245,4 @@ public PlanNode getTransformedPlan()
             return result.getTransformedPlan().orElseThrow(() -> new IllegalStateException("Rule did not produce transformed plan"));
         }
     }
-
-    private static class TestingStatsCalculator
-            implements StatsCalculator
-    {
-        private final StatsCalculator delegate;
-        private final Map<PlanNodeId, PlanNodeStatsEstimate> stats = new HashMap<>();
-
-        TestingStatsCalculator(StatsCalculator delegate)
-        {
-            this.delegate = requireNonNull(delegate, "delegate is null");
-        }
-
-        @Override
-        public PlanNodeStatsEstimate calculateStats(PlanNode node, StatsProvider sourceStats, Lookup lookup, Session session, TypeProvider types, TableStatsProvider tableStatsProvider)
-        {
-            if (stats.containsKey(node.getId())) {
-                return stats.get(node.getId());
-            }
-            return delegate.calculateStats(node, sourceStats, lookup, session, types, tableStatsProvider);
-        }
-
-        public void setNodeStats(PlanNodeId nodeId, PlanNodeStatsEstimate nodeStats)
-        {
-            stats.put(nodeId, nodeStats);
-        }
-    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/RuleBuilder.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/RuleBuilder.java
new file mode 100644
index 000000000000..7227e64f2714
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/RuleBuilder.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed 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 io.trino.sql.planner.iterative.rule.test;
+
+import io.trino.Session;
+import io.trino.cost.PlanNodeStatsEstimate;
+import io.trino.cost.StatsCalculator;
+import io.trino.cost.StatsProvider;
+import io.trino.cost.TableStatsProvider;
+import io.trino.sql.planner.PlanNodeIdAllocator;
+import io.trino.sql.planner.TypeProvider;
+import io.trino.sql.planner.iterative.Lookup;
+import io.trino.sql.planner.iterative.Rule;
+import io.trino.sql.planner.plan.PlanNode;
+import io.trino.sql.planner.plan.PlanNodeId;
+import io.trino.testing.LocalQueryRunner;
+import io.trino.transaction.TransactionId;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
+import static io.trino.spi.transaction.IsolationLevel.READ_UNCOMMITTED;
+import static io.trino.testing.TestingSession.testSession;
+import static java.util.Objects.requireNonNull;
+
+public class RuleBuilder
+{
+    private final Rule<?> rule;
+    private final LocalQueryRunner queryRunner;
+    private Session session;
+
+    private final TestingStatsCalculator statsCalculator;
+
+    RuleBuilder(Rule<?> rule, LocalQueryRunner queryRunner, Session session)
+    {
+        this.rule = requireNonNull(rule, "rule is null");
+        this.queryRunner = requireNonNull(queryRunner, "queryRunner is null");
+        this.session = requireNonNull(session, "session is null");
+
+        this.statsCalculator = new TestingStatsCalculator(queryRunner.getStatsCalculator());
+    }
+
+    public RuleBuilder setSystemProperty(String key, String value)
+    {
+        return withSession(Session.builder(session)
+                .setSystemProperty(key, value)
+                .build());
+    }
+
+    public RuleBuilder withSession(Session session)
+    {
+        this.session = session;
+        return this;
+    }
+
+    public RuleBuilder overrideStats(String nodeId, PlanNodeStatsEstimate nodeStats)
+    {
+        statsCalculator.setNodeStats(new PlanNodeId(nodeId), nodeStats);
+        return this;
+    }
+
+    public RuleAssert on(Function<PlanBuilder, PlanNode> planProvider)
+    {
+        // Generate a new random queryId in case the rule cleanup code is not executed
+        Session session = testSession(this.session);
+        // start a transaction to allow catalog access
+        TransactionId transactionId = queryRunner.getTransactionManager().beginTransaction(READ_UNCOMMITTED, false, false);
+        Session transactionSession = session.beginTransactionId(transactionId, queryRunner.getTransactionManager(), queryRunner.getAccessControl());
+        queryRunner.getMetadata().beginQuery(transactionSession);
+        try {
+            // metadata.getCatalogHandle() registers the catalog for the transaction
+            transactionSession.getCatalog().ifPresent(catalog -> queryRunner.getMetadata().getCatalogHandle(transactionSession, catalog));
+
+            PlanNodeIdAllocator idAllocator = new PlanNodeIdAllocator();
+            PlanBuilder builder = new PlanBuilder(idAllocator, queryRunner.getPlannerContext(), transactionSession);
+            PlanNode plan = planProvider.apply(builder);
+            TypeProvider types = builder.getTypes();
+            return new RuleAssert(rule, queryRunner, statsCalculator, transactionSession, idAllocator, plan, types);
+        }
+        catch (Throwable t) {
+            queryRunner.getMetadata().cleanupQuery(session);
+            queryRunner.getTransactionManager().asyncAbort(transactionId);
+            throw t;
+        }
+    }
+
+    private static class TestingStatsCalculator
+            implements StatsCalculator
+    {
+        private final StatsCalculator delegate;
+        private final Map<PlanNodeId, PlanNodeStatsEstimate> stats = new HashMap<>();
+
+        TestingStatsCalculator(StatsCalculator delegate)
+        {
+            this.delegate = requireNonNull(delegate, "delegate is null");
+        }
+
+        @Override
+        public PlanNodeStatsEstimate calculateStats(PlanNode node, StatsProvider sourceStats, Lookup lookup, Session session, TypeProvider types, TableStatsProvider tableStatsProvider)
+        {
+            if (stats.containsKey(node.getId())) {
+                return stats.get(node.getId());
+            }
+            return delegate.calculateStats(node, sourceStats, lookup, session, types, tableStatsProvider);
+        }
+
+        public void setNodeStats(PlanNodeId nodeId, PlanNodeStatsEstimate nodeStats)
+        {
+            stats.put(nodeId, nodeStats);
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/RuleTester.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/RuleTester.java
index c92df5bc8b8e..4b1dea227c37 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/RuleTester.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/RuleTester.java
@@ -19,7 +19,6 @@
 import io.trino.metadata.Metadata;
 import io.trino.metadata.TableHandle;
 import io.trino.plugin.tpch.TpchConnectorFactory;
-import io.trino.security.AccessControl;
 import io.trino.spi.Plugin;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorFactory;
@@ -29,7 +28,6 @@
 import io.trino.sql.planner.TypeAnalyzer;
 import io.trino.sql.planner.iterative.Rule;
 import io.trino.testing.LocalQueryRunner;
-import io.trino.transaction.TransactionManager;
 
 import java.io.Closeable;
 import java.util.ArrayList;
@@ -49,10 +47,8 @@ public class RuleTester
     private final Metadata metadata;
     private final Session session;
     private final LocalQueryRunner queryRunner;
-    private final TransactionManager transactionManager;
     private final SplitManager splitManager;
     private final PageSourceManager pageSourceManager;
-    private final AccessControl accessControl;
     private final TypeAnalyzer typeAnalyzer;
     private final FunctionManager functionManager;
 
@@ -67,16 +63,14 @@ public RuleTester(LocalQueryRunner queryRunner)
         this.session = queryRunner.getDefaultSession();
         this.metadata = queryRunner.getMetadata();
         this.functionManager = queryRunner.getFunctionManager();
-        this.transactionManager = queryRunner.getTransactionManager();
         this.splitManager = queryRunner.getSplitManager();
         this.pageSourceManager = queryRunner.getPageSourceManager();
-        this.accessControl = queryRunner.getAccessControl();
         this.typeAnalyzer = createTestingTypeAnalyzer(queryRunner.getPlannerContext());
     }
 
-    public RuleAssert assertThat(Rule<?> rule)
+    public RuleBuilder assertThat(Rule<?> rule)
     {
-        return new RuleAssert(metadata, functionManager, queryRunner.getStatsCalculator(), queryRunner.getEstimatedExchangesCostCalculator(), session, rule, transactionManager, accessControl);
+        return new RuleBuilder(rule, queryRunner, session);
     }
 
     @Override
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/TableFunctionProcessorBuilder.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/TableFunctionProcessorBuilder.java
index 2b271f8674d1..e3a6c901eebe 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/TableFunctionProcessorBuilder.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/TableFunctionProcessorBuilder.java
@@ -16,8 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import io.trino.metadata.TableFunctionHandle;
-import io.trino.spi.function.SchemaFunctionName;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.sql.planner.PlanNodeIdAllocator;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
@@ -130,6 +129,6 @@ public TableFunctionProcessorNode build(PlanNodeIdAllocator idAllocator)
                 prePartitioned,
                 preSorted,
                 hashSymbol,
-                new TableFunctionHandle(TEST_CATALOG_HANDLE, new SchemaFunctionName("system", name), new ConnectorTableFunctionHandle() {}, TestingTransactionHandle.create()));
+                new TableFunctionHandle(TEST_CATALOG_HANDLE, new ConnectorTableFunctionHandle() {}, TestingTransactionHandle.create()));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/TestRuleTester.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/TestRuleTester.java
index 9d200050eb0f..f0aba25a37a6 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/TestRuleTester.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/TestRuleTester.java
@@ -26,7 +26,7 @@
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.testing.TestingTransactionHandle;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddExchangesPlans.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddExchangesPlans.java
index b4c5cc1abb7b..21053f851c1a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddExchangesPlans.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddExchangesPlans.java
@@ -19,22 +19,30 @@
 import com.google.common.collect.ImmutableSet;
 import io.trino.FeaturesConfig;
 import io.trino.Session;
+import io.trino.connector.MockConnectorColumnHandle;
+import io.trino.connector.MockConnectorFactory;
+import io.trino.connector.MockConnectorTableHandle;
 import io.trino.plugin.tpch.TpchConnectorFactory;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.type.BigintType;
 import io.trino.sql.planner.OptimizerConfig.JoinDistributionType;
 import io.trino.sql.planner.OptimizerConfig.JoinReorderingStrategy;
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.assertions.RowNumberSymbolMatcher;
 import io.trino.sql.planner.plan.AggregationNode.Step;
-import io.trino.sql.planner.plan.ExchangeNode;
 import io.trino.sql.planner.plan.FilterNode;
 import io.trino.sql.planner.plan.JoinNode.DistributionType;
 import io.trino.sql.planner.plan.MarkDistinctNode;
+import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.ValuesNode;
 import io.trino.sql.query.QueryAssertions;
 import io.trino.sql.tree.GenericLiteral;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -50,12 +58,14 @@
 import static io.trino.SystemSessionProperties.TASK_CONCURRENCY;
 import static io.trino.SystemSessionProperties.USE_COST_BASED_PARTITIONING;
 import static io.trino.SystemSessionProperties.USE_EXACT_PARTITIONING;
-import static io.trino.spi.type.VarcharType.createVarcharType;
 import static io.trino.sql.planner.OptimizerConfig.JoinDistributionType.PARTITIONED;
 import static io.trino.sql.planner.OptimizerConfig.JoinReorderingStrategy.ELIMINATE_CROSS_JOINS;
+import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_ARBITRARY_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_BROADCAST_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_HASH_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.aggregation;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.any;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.anyNot;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anySymbol;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.exchange;
@@ -86,7 +96,6 @@
 import static io.trino.sql.planner.plan.TopNNode.Step.FINAL;
 import static io.trino.sql.tree.SortItem.NullOrdering.LAST;
 import static io.trino.sql.tree.SortItem.Ordering.ASCENDING;
-import static io.trino.testing.MaterializedResult.resultBuilder;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -163,8 +172,7 @@ public void testRepartitionForUnionAllBeforeHashJoin()
                                 .right(
                                         anyTree(
                                                 exchange(REMOTE, REPARTITION,
-                                                        anyTree(
-                                                                tableScan("region", ImmutableMap.of("regionkey", "regionkey")))))))));
+                                                        tableScan("region", ImmutableMap.of("regionkey", "regionkey"))))))));
 
         assertDistributedPlan("SELECT * FROM (SELECT nationkey FROM nation UNION ALL select 1) n join region r on n.nationkey = r.regionkey",
                 session,
@@ -177,13 +185,11 @@ public void testRepartitionForUnionAllBeforeHashJoin()
                                                         anyTree(
                                                                 tableScan("nation", ImmutableMap.of("nationkey", "nationkey")))),
                                                 exchange(REMOTE, REPARTITION,
-                                                        project(
-                                                                values(ImmutableList.of("expr"), ImmutableList.of(ImmutableList.of(new GenericLiteral("BIGINT", "1"))))))))
+                                                        values(ImmutableList.of("expr"), ImmutableList.of(ImmutableList.of(new GenericLiteral("BIGINT", "1")))))))
                                 .right(
                                         anyTree(
                                                 exchange(REMOTE, REPARTITION,
-                                                        anyTree(
-                                                                tableScan("region", ImmutableMap.of("regionkey", "regionkey")))))))));
+                                                        tableScan("region", ImmutableMap.of("regionkey", "regionkey"))))))));
     }
 
     @Test
@@ -198,15 +204,13 @@ public void testNonSpillableBroadcastJoinAboveTableScan()
                                 .distributionType(REPLICATED)
                                 .spillable(false)
                                 .left(
-                                        anyNot(ExchangeNode.class,
-                                                node(
-                                                        FilterNode.class,
-                                                        tableScan("nation", ImmutableMap.of("nationkey", "nationkey")))))
+                                        node(
+                                                FilterNode.class,
+                                                tableScan("nation", ImmutableMap.of("nationkey", "nationkey"))))
                                 .right(
                                         anyTree(
                                                 exchange(REMOTE, REPLICATE,
-                                                        anyTree(
-                                                                tableScan("region", ImmutableMap.of("regionkey", "regionkey")))))))));
+                                                        tableScan("region", ImmutableMap.of("regionkey", "regionkey"))))))));
 
         assertDistributedPlan(
                 "SELECT * FROM nation n join region r on n.nationkey = r.regionkey",
@@ -222,8 +226,7 @@ public void testNonSpillableBroadcastJoinAboveTableScan()
                                 .right(
                                         exchange(LOCAL, GATHER,
                                                 exchange(REMOTE, REPARTITION,
-                                                        anyTree(
-                                                                tableScan("region", ImmutableMap.of("regionkey", "regionkey")))))))));
+                                                        tableScan("region", ImmutableMap.of("regionkey", "regionkey"))))))));
     }
 
     @Test
@@ -240,15 +243,13 @@ public void testForcePartitioningMarkDistinctInput()
                         node(MarkDistinctNode.class,
                                 anyTree(
                                         exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("partition1", "partition2"),
-                                                project(
-                                                        values(
-                                                                ImmutableList.of("field", "partition2", "partition1"),
-                                                                ImmutableList.of(ImmutableList.of(new LongLiteral("1"), new LongLiteral("2"), new LongLiteral("1")))))),
+                                                values(
+                                                        ImmutableList.of("field", "partition2", "partition1"),
+                                                        ImmutableList.of(ImmutableList.of(new LongLiteral("1"), new LongLiteral("2"), new LongLiteral("1"))))),
                                         exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("partition3"),
-                                                project(
-                                                        values(
-                                                                ImmutableList.of("partition3", "partition4", "field_0"),
-                                                                ImmutableList.of(ImmutableList.of(new LongLiteral("3"), new LongLiteral("4"), new LongLiteral("1"))))))))));
+                                                values(
+                                                        ImmutableList.of("partition3", "partition4", "field_0"),
+                                                        ImmutableList.of(ImmutableList.of(new LongLiteral("3"), new LongLiteral("4"), new LongLiteral("1")))))))));
 
         assertDistributedPlan(
                 query,
@@ -260,15 +261,13 @@ public void testForcePartitioningMarkDistinctInput()
                         node(MarkDistinctNode.class,
                                 anyTree(
                                         exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("partition1"),
-                                                project(
-                                                        values(
-                                                                ImmutableList.of("field", "partition2", "partition1"),
-                                                                ImmutableList.of(ImmutableList.of(new LongLiteral("1"), new LongLiteral("2"), new LongLiteral("1")))))),
+                                                values(
+                                                        ImmutableList.of("field", "partition2", "partition1"),
+                                                        ImmutableList.of(ImmutableList.of(new LongLiteral("1"), new LongLiteral("2"), new LongLiteral("1"))))),
                                         exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("partition3"),
-                                                project(
-                                                        values(
-                                                                ImmutableList.of("partition3", "partition4", "field_0"),
-                                                                ImmutableList.of(ImmutableList.of(new LongLiteral("3"), new LongLiteral("4"), new LongLiteral("1"))))))))));
+                                                values(
+                                                        ImmutableList.of("partition3", "partition4", "field_0"),
+                                                        ImmutableList.of(ImmutableList.of(new LongLiteral("3"), new LongLiteral("4"), new LongLiteral("1")))))))));
     }
 
     @Test
@@ -371,27 +370,20 @@ public void testExchangesAroundTrivialProjection()
                 anyTree(
                         rowNumber(
                                 pattern -> pattern
-                                        .partitionBy(ImmutableList.of("regionkey"))
-                                        .hashSymbol(Optional.of("hash")),
+                                        .partitionBy(ImmutableList.of("regionkey")),
                                 exchange(
                                         LOCAL,
                                         REPARTITION,
                                         ImmutableList.of(),
                                         ImmutableSet.of("regionkey"),
                                         project(
-                                                ImmutableMap.of("regionkey", expression("regionkey"), "hash", expression("hash")),
+                                                ImmutableMap.of("regionkey", expression("regionkey")),
                                                 topN(
                                                         5,
                                                         ImmutableList.of(sort("nationkey", ASCENDING, LAST)),
                                                         FINAL,
-                                                        any(
-                                                                project(
-                                                                        ImmutableMap.of(
-                                                                                "regionkey", expression("regionkey"),
-                                                                                "nationkey", expression("nationkey"),
-                                                                                "hash", expression("combine_hash(bigint '0', COALESCE(\"$operator$hash_code\"(regionkey), 0))")),
-                                                                        any(
-                                                                                tableScan("nation", ImmutableMap.of("regionkey", "regionkey", "nationkey", "nationkey")))))))))));
+                                                        anyTree(
+                                                                tableScan("nation", ImmutableMap.of("regionkey", "regionkey", "nationkey", "nationkey")))))))));
 
         // * source of Projection is distributed (filter)
         // * parent of Projection requires hashed multiple distribution (rowNumber).
@@ -401,26 +393,20 @@ public void testExchangesAroundTrivialProjection()
                 anyTree(
                         rowNumber(
                                 pattern -> pattern
-                                        .partitionBy(ImmutableList.of("b"))
-                                        .hashSymbol(Optional.of("hash")),
+                                        .partitionBy(ImmutableList.of("b")),
                                 exchange(
                                         LOCAL,
                                         REPARTITION,
                                         ImmutableList.of(),
                                         ImmutableSet.of("b"),
                                         project(
-                                                ImmutableMap.of("b", expression("b"), "hash", expression("hash")),
+                                                ImmutableMap.of("b", expression("b")),
                                                 filter(
                                                         "a < 10",
                                                         exchange(
                                                                 LOCAL,
                                                                 REPARTITION,
-                                                                project(
-                                                                        ImmutableMap.of(
-                                                                                "a", expression("a"),
-                                                                                "b", expression("b"),
-                                                                                "hash", expression("combine_hash(bigint '0', COALESCE(\"$operator$hash_code\"(b), 0))")),
-                                                                        values("a", "b")))))))));
+                                                                values("a", "b"))))))));
 
         // * source of Projection is single stream (topN)
         // * parent of Projection requires random multiple distribution (partial aggregation)
@@ -487,15 +473,13 @@ public void testJoinBuildSideLocalExchange()
                         join(INNER, builder -> builder
                                 .equiCriteria("nationkey", "regionkey")
                                 .left(
-                                        anyNot(ExchangeNode.class,
-                                                node(
-                                                        FilterNode.class,
-                                                        tableScan("nation", ImmutableMap.of("nationkey", "nationkey")))))
+                                        node(
+                                                FilterNode.class,
+                                                tableScan("nation", ImmutableMap.of("nationkey", "nationkey"))))
                                 .right(
                                         exchange(LOCAL, GATHER,
                                                 exchange(REMOTE, REPLICATE,
-                                                        anyTree(
-                                                                tableScan("region", ImmutableMap.of("regionkey", "regionkey")))))))));
+                                                        tableScan("region", ImmutableMap.of("regionkey", "regionkey"))))))));
 
         // build side bigger than threshold, local partitioned exchanged expected
         assertDistributedPlan(
@@ -507,15 +491,13 @@ public void testJoinBuildSideLocalExchange()
                         join(INNER, builder -> builder
                                 .equiCriteria("nationkey", "regionkey")
                                 .left(
-                                        anyNot(ExchangeNode.class,
-                                                node(
-                                                        FilterNode.class,
-                                                        tableScan("nation", ImmutableMap.of("nationkey", "nationkey")))))
+                                        node(
+                                                FilterNode.class,
+                                                tableScan("nation", ImmutableMap.of("nationkey", "nationkey"))))
                                 .right(
                                         exchange(LOCAL, REPARTITION,
                                                 exchange(REMOTE, REPLICATE,
-                                                        anyTree(
-                                                                tableScan("region", ImmutableMap.of("regionkey", "regionkey")))))))));
+                                                        tableScan("region", ImmutableMap.of("regionkey", "regionkey"))))))));
         // build side contains join, local partitioned exchanged expected
         assertDistributedPlan(
                 "SELECT * FROM nation n join (select r.regionkey from region r join region r2 on r.regionkey = r2.regionkey) j on n.nationkey = j.regionkey ",
@@ -524,25 +506,22 @@ public void testJoinBuildSideLocalExchange()
                         join(INNER, builder -> builder
                                 .equiCriteria("nationkey", "regionkey2")
                                 .left(
-                                        anyNot(ExchangeNode.class,
-                                                node(
-                                                        FilterNode.class,
-                                                        tableScan("nation", ImmutableMap.of("nationkey", "nationkey")))))
+                                        node(
+                                                FilterNode.class,
+                                                tableScan("nation", ImmutableMap.of("nationkey", "nationkey"))))
                                 .right(
                                         exchange(LOCAL, REPARTITION,
                                                 exchange(REMOTE, REPLICATE,
                                                         join(INNER, rightJoinBuilder -> rightJoinBuilder
                                                                 .equiCriteria("regionkey2", "regionkey1")
                                                                 .left(
-                                                                        anyNot(ExchangeNode.class,
-                                                                                node(
-                                                                                        FilterNode.class,
-                                                                                        tableScan("region", ImmutableMap.of("regionkey2", "regionkey")))))
+                                                                        node(
+                                                                                FilterNode.class,
+                                                                                tableScan("region", ImmutableMap.of("regionkey2", "regionkey"))))
                                                                 .right(
                                                                         exchange(LOCAL, GATHER,
                                                                                 exchange(REMOTE, REPLICATE,
-                                                                                        anyTree(
-                                                                                                tableScan("region", ImmutableMap.of("regionkey1", "regionkey")))))))))))));
+                                                                                        tableScan("region", ImmutableMap.of("regionkey1", "regionkey"))))))))))));
 
         // build side smaller than threshold, but stats not available. local partitioned exchanged expected
         assertDistributedPlan(
@@ -554,15 +533,13 @@ public void testJoinBuildSideLocalExchange()
                         join(INNER, builder -> builder
                                 .equiCriteria("nationkey", "regionkey")
                                 .left(
-                                        anyNot(ExchangeNode.class,
-                                                node(
-                                                        FilterNode.class,
-                                                        tableScan("nation", ImmutableMap.of("nationkey", "nationkey")))))
+                                        node(
+                                                FilterNode.class,
+                                                tableScan("nation", ImmutableMap.of("nationkey", "nationkey"))))
                                 .right(
                                         exchange(LOCAL, REPARTITION,
                                                 exchange(REMOTE, REPLICATE,
-                                                        anyTree(
-                                                                tableScan("region", ImmutableMap.of("regionkey", "regionkey")))))))));
+                                                        tableScan("region", ImmutableMap.of("regionkey", "regionkey"))))))));
     }
 
     @Test
@@ -622,14 +599,14 @@ SELECT suppkey, partkey, count(*) as count
                                 exchange(LOCAL,
                                         // we only partition by partkey but aggregate by partkey and suppkey
                                         exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("partkey"),
-                                                anyTree(aggregation(
+                                                aggregation(
                                                         singleGroupingSet("partkey", "suppkey"),
                                                         ImmutableMap.of(Optional.of("count_partial"), functionCall("count", false, ImmutableList.of())),
                                                         Optional.empty(),
                                                         Step.PARTIAL,
-                                                        anyTree(tableScan("lineitem", ImmutableMap.of(
+                                                        tableScan("lineitem", ImmutableMap.of(
                                                                 "partkey", "partkey",
-                                                                "suppkey", "suppkey"))))))))))));
+                                                                "suppkey", "suppkey"))))))))));
 
         PlanMatchPattern exactPartitioningPlan = anyTree(aggregation(
                 singleGroupingSet("partkey"),
@@ -639,7 +616,7 @@ SELECT suppkey, partkey, count(*) as count
                 exchange(LOCAL,
                         // additional remote exchange
                         exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("partkey"),
-                                project(aggregation(
+                                aggregation(
                                         singleGroupingSet("partkey"),
                                         ImmutableMap.of(Optional.of("sum_partial"), functionCall("sum", false, ImmutableList.of(symbol("count")))),
                                         Optional.empty(),
@@ -655,9 +632,9 @@ SELECT suppkey, partkey, count(*) as count
                                                                         ImmutableMap.of(Optional.of("count_partial"), functionCall("count", false, ImmutableList.of())),
                                                                         Optional.empty(),
                                                                         PARTIAL,
-                                                                        anyTree(tableScan("lineitem", ImmutableMap.of(
+                                                                        tableScan("lineitem", ImmutableMap.of(
                                                                                 "partkey", "partkey",
-                                                                                "suppkey", "suppkey"))))))))))))));
+                                                                                "suppkey", "suppkey"))))))))))));
         // parent partitioning would be preferable but use_cost_based_partitioning=false prevents it
         assertDistributedPlan(singleColumnParentGroupBy, doNotUseCostBasedPartitioning(), exactPartitioningPlan);
         // parent partitioning would be preferable but use_exact_partitioning prevents it
@@ -680,7 +657,7 @@ SELECT suppkey, partkey, count(*) as count
                         exchange(LOCAL,
                                 // additional remote exchange
                                 exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("partkey_expr"),
-                                        project(aggregation(
+                                        aggregation(
                                                 singleGroupingSet("partkey_expr"),
                                                 ImmutableMap.of(Optional.of("sum_partial"), functionCall("sum", false, ImmutableList.of(symbol("count")))),
                                                 Optional.empty(),
@@ -696,11 +673,11 @@ SELECT suppkey, partkey, count(*) as count
                                                                                 ImmutableMap.of(Optional.of("count_partial"), functionCall("count", false, ImmutableList.of())),
                                                                                 Optional.empty(),
                                                                                 PARTIAL,
-                                                                                any(project(
+                                                                                project(
                                                                                         ImmutableMap.of("partkey_expr", expression("partkey % BIGINT '10'")),
                                                                                         tableScan("lineitem", ImmutableMap.of(
                                                                                                 "partkey", "partkey",
-                                                                                                "suppkey", "suppkey"))))))))))))))));
+                                                                                                "suppkey", "suppkey"))))))))))))));
 
         // parent aggregation partitioned by multiple columns
         assertDistributedPlan("""
@@ -720,19 +697,18 @@ SELECT suppkey, partkey, count(*) as count
                                 Step.FINAL,
                                 exchange(LOCAL,
                                         // we don't partition by suppkey because it's not needed by the parent aggregation
-                                        any(exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("orderkey_expr", "partkey"),
-                                                any(
-                                                        aggregation(
-                                                                singleGroupingSet("orderkey_expr", "partkey", "suppkey"),
-                                                                ImmutableMap.of(Optional.of("count_partial"), functionCall("count", false, ImmutableList.of())),
-                                                                Optional.empty(),
-                                                                Step.PARTIAL,
-                                                                any(project(
-                                                                        ImmutableMap.of("orderkey_expr", expression("orderkey % BIGINT '10000'")),
-                                                                        tableScan("lineitem", ImmutableMap.of(
-                                                                                "partkey", "partkey",
-                                                                                "orderkey", "orderkey",
-                                                                                "suppkey", "suppkey"))))))))))))));
+                                        exchange(REMOTE, REPARTITION, ImmutableList.of(), ImmutableSet.of("orderkey_expr", "partkey"),
+                                                aggregation(
+                                                        singleGroupingSet("orderkey_expr", "partkey", "suppkey"),
+                                                        ImmutableMap.of(Optional.of("count_partial"), functionCall("count", false, ImmutableList.of())),
+                                                        Optional.empty(),
+                                                        Step.PARTIAL,
+                                                        project(
+                                                                ImmutableMap.of("orderkey_expr", expression("orderkey % BIGINT '10000'")),
+                                                                tableScan("lineitem", ImmutableMap.of(
+                                                                        "partkey", "partkey",
+                                                                        "orderkey", "orderkey",
+                                                                        "suppkey", "suppkey")))))))))));
     }
 
     @Test
@@ -789,8 +765,7 @@ public void testRowNumberIsExactlyPartitioned()
                 useExactPartitioning(),
                 anyTree(
                         exchange(REMOTE, REPARTITION,
-                                anyTree(
-                                        values("a")))));
+                                values("a"))));
     }
 
     @Test
@@ -853,7 +828,7 @@ public void testJoinIsExactlyPartitioned()
                                 anyTree(
                                         aggregation(
                                                 singleGroupingSet("orderkey"),
-                                                ImmutableMap.of(Optional.of("arbitrary"), PlanMatchPattern.functionCall("arbitrary", false, ImmutableList.of(anySymbol()))),
+                                                ImmutableMap.of(Optional.of("any_value"), PlanMatchPattern.functionCall("any_value", false, ImmutableList.of(anySymbol()))),
                                                 ImmutableList.of("orderkey"),
                                                 ImmutableList.of(),
                                                 Optional.empty(),
@@ -863,10 +838,9 @@ public void testJoinIsExactlyPartitioned()
                                                         "orderstatus", "orderstatus"))))),
                         exchange(LOCAL, GATHER,
                                 exchange(REMOTE, REPARTITION,
-                                        anyTree(
-                                                tableScan("orders", ImmutableMap.of(
-                                                        "orderkey1", "orderkey",
-                                                        "orderstatus3", "orderstatus")))))));
+                                        tableScan("orders", ImmutableMap.of(
+                                                "orderkey1", "orderkey",
+                                                "orderstatus3", "orderstatus"))))));
     }
 
     @Test
@@ -924,13 +898,11 @@ public void testJoinNotExactlyPartitionedWhenColocatedJoinDisabled()
                 """,
                 noJoinReorderingColocatedJoinDisabled(),
                 anyTree(
-                        project(
-                                anyTree(
-                                        tableScan("orders"))),
+                        anyTree(
+                                tableScan("orders")),
                         exchange(LOCAL, GATHER,
                                 exchange(REMOTE, REPARTITION,
-                                        anyTree(
-                                                tableScan("orders"))))));
+                                        tableScan("orders")))));
     }
 
     // Negative test for use-exact-partitioning when colocated join is enabled (default)
@@ -938,16 +910,9 @@ public void testJoinNotExactlyPartitionedWhenColocatedJoinDisabled()
     public void testJoinNotExactlyPartitioned()
     {
         QueryAssertions queryAssertions = new QueryAssertions(getQueryRunner());
-        assertThat(queryAssertions.query("SHOW SESSION LIKE 'colocated_join'")).matches(
-                resultBuilder(
-                        getQueryRunner().getDefaultSession(),
-                        createVarcharType(56),
-                        createVarcharType(14),
-                        createVarcharType(14),
-                        createVarcharType(7),
-                        createVarcharType(151))
-                .row("colocated_join", "true", "true", "boolean", "Use a colocated join when possible")
-                .build());
+        assertThat(queryAssertions.query("SHOW SESSION LIKE 'colocated_join'"))
+                .skippingTypesCheck()
+                .matches("SELECT 'colocated_join', 'true', 'true', 'boolean', 'Use a colocated join when possible'");
 
         assertDistributedPlan(
                 """
@@ -970,12 +935,234 @@ public void testJoinNotExactlyPartitioned()
                 """,
                 noJoinReordering(),
                 anyTree(
-                        project(
-                                anyTree(
-                                        tableScan("orders"))),
+                        anyTree(
+                                tableScan("orders")),
                         exchange(LOCAL, GATHER,
-                                    anyTree(
-                                            tableScan("orders")))));
+                                tableScan("orders"))));
+    }
+
+    @Test
+    public void testBroadcastJoinAboveUnionAll()
+    {
+        // Put union at build side
+        assertDistributedPlan(
+                """
+                    SELECT * FROM region r JOIN (SELECT nationkey FROM nation UNION ALL SELECT nationkey as key FROM nation) n ON r.regionkey = n.nationkey
+                """,
+                noJoinReordering(),
+                anyTree(
+                        join(INNER, join -> join
+                                .equiCriteria("regionkey", "nationkey")
+                                .left(
+                                        node(FilterNode.class,
+                                                tableScan("region", ImmutableMap.of("regionkey", "regionkey"))))
+                                .right(
+                                        exchange(LOCAL, GATHER, SINGLE_DISTRIBUTION,
+                                                exchange(REMOTE, REPLICATE, FIXED_BROADCAST_DISTRIBUTION,
+                                                        exchange(LOCAL, REPARTITION, FIXED_ARBITRARY_DISTRIBUTION,
+                                                                tableScan("nation", ImmutableMap.of("nationkey", "nationkey")),
+                                                                tableScan("nation"))))))));
+        // Put union at probe side
+        assertDistributedPlan(
+                """
+                            SELECT * FROM (SELECT nationkey FROM nation UNION ALL SELECT nationkey as key FROM nation) n JOIN region r ON r.regionkey = n.nationkey
+                        """,
+                noJoinReordering(),
+                anyTree(
+                        join(INNER, join -> join
+                                .equiCriteria("nationkey", "regionkey")
+                                .left(
+                                        exchange(LOCAL, REPARTITION, FIXED_ARBITRARY_DISTRIBUTION,
+                                                node(FilterNode.class,
+                                                        tableScan("nation", ImmutableMap.of("nationkey", "nationkey"))),
+                                                node(FilterNode.class,
+                                                        tableScan("nation"))))
+                                .right(
+                                        exchange(LOCAL, GATHER, SINGLE_DISTRIBUTION,
+                                                exchange(REMOTE, REPLICATE, FIXED_BROADCAST_DISTRIBUTION,
+                                                        tableScan("region", ImmutableMap.of("regionkey", "regionkey"))))))));
+    }
+
+    @Test
+    public void testUnionAllAboveBroadcastJoin()
+    {
+        assertDistributedPlan(
+                """
+                    SELECT regionkey FROM nation UNION ALL (SELECT nationkey FROM nation n JOIN region r on r.regionkey = n.nationkey)
+                """,
+                noJoinReordering(),
+                anyTree(
+                        exchange(REMOTE, GATHER, SINGLE_DISTRIBUTION,
+                                tableScan("nation"),
+                                join(INNER, join -> join
+                                        .equiCriteria("nationkey", "regionkey")
+                                        .left(
+                                                node(FilterNode.class,
+                                                        tableScan("nation", ImmutableMap.of("nationkey", "nationkey"))))
+                                        .right(
+                                                exchange(LOCAL, GATHER, SINGLE_DISTRIBUTION,
+                                                        exchange(REMOTE, REPLICATE, FIXED_BROADCAST_DISTRIBUTION,
+                                                                tableScan("region", ImmutableMap.of("regionkey", "regionkey")))))))));
+    }
+
+    @Test
+    public void testGroupedAggregationAboveUnionAllCrossJoined()
+    {
+        assertDistributedPlan(
+                """
+                    SELECT sum(nationkey) FROM (SELECT nationkey FROM nation UNION ALL SELECT nationkey FROM nation), region group by nationkey
+                """,
+                noJoinReordering(),
+                anyTree(
+                        join(INNER, join -> join
+                                .left(
+                                        exchange(LOCAL, REPARTITION, FIXED_ARBITRARY_DISTRIBUTION,
+                                                tableScan("nation", ImmutableMap.of("nationkey", "nationkey")),
+                                                tableScan("nation")))
+                                .right(
+                                        exchange(LOCAL, GATHER, SINGLE_DISTRIBUTION,
+                                                exchange(REMOTE, REPLICATE, FIXED_BROADCAST_DISTRIBUTION,
+                                                        tableScan("region")))))));
+    }
+
+    @Test
+    public void testGroupedAggregationAboveUnionAll()
+    {
+        assertDistributedPlan(
+                """
+                    SELECT sum(nationkey) FROM (SELECT nationkey FROM nation UNION ALL SELECT nationkey FROM nation) GROUP BY nationkey
+                """,
+                noJoinReordering(),
+                anyTree(
+                        exchange(LOCAL, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                project(
+                                        exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                                aggregation(ImmutableMap.of("partial_sum", functionCall("sum", ImmutableList.of("nationkey"))),
+                                                        PARTIAL,
+                                                        tableScan("nation", ImmutableMap.of("nationkey", "nationkey"))))),
+                                project(
+                                        exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                                aggregation(ImmutableMap.of("partial_sum", functionCall("sum", ImmutableList.of("nationkey"))),
+                                                        PARTIAL,
+                                                        tableScan("nation", ImmutableMap.of("nationkey", "nationkey"))))))));
+    }
+
+    @Test
+    public void testUnionAllOnPartitionedAndUnpartitionedSources()
+    {
+        assertDistributedPlan(
+                """
+                     SELECT * FROM (SELECT nationkey FROM nation UNION ALL VALUES (1))
+                """,
+                noJoinReordering(),
+                output(
+                        exchange(LOCAL, REPARTITION, FIXED_ARBITRARY_DISTRIBUTION,
+                                values("1"),
+                                exchange(REMOTE, GATHER, SINGLE_DISTRIBUTION,
+                                        tableScan("nation")))));
+    }
+
+    @Test
+    public void testNestedUnionAll()
+    {
+        assertDistributedPlan(
+                """
+                     SELECT * FROM ((SELECT nationkey FROM nation) UNION ALL (SELECT nationkey FROM nation)) UNION ALL (SELECT nationkey FROM nation)
+                """,
+                noJoinReordering(),
+                output(
+                        exchange(REMOTE, GATHER, SINGLE_DISTRIBUTION,
+                                tableScan("nation"),
+                                tableScan("nation"),
+                                tableScan("nation"))));
+    }
+
+    @Test
+    public void testUnionAllOnSourceAndHashDistributedChildren()
+    {
+        assertDistributedPlan(
+                """
+                     SELECT * FROM ((SELECT nationkey FROM nation) UNION ALL (SELECT nationkey FROM nation)) UNION ALL (SELECT sum(nationkey) FROM nation GROUP BY nationkey)
+                """,
+                noJoinReordering(),
+                output(
+                        exchange(REMOTE, GATHER, SINGLE_DISTRIBUTION,
+                                tableScan("nation"),
+                                tableScan("nation"),
+                                project(
+                                        anyTree(
+                                                exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                                        aggregation(ImmutableMap.of("partial_sum", functionCall("sum", ImmutableList.of("nationkey"))),
+                                                                PARTIAL,
+                                                                tableScan("nation", ImmutableMap.of("nationkey", "nationkey")))))))));
+    }
+
+    @Test
+    public void testUnionAllOnDifferentCatalogs()
+    {
+        MockConnectorFactory connectorFactory = MockConnectorFactory.builder()
+                .withGetColumns(schemaTableName -> ImmutableList.of(
+                        new ColumnMetadata("nationkey", BigintType.BIGINT)))
+                .withGetTableHandle(((session, schemaTableName) -> new MockConnectorTableHandle(
+                        SchemaTableName.schemaTableName("default", "nation"),
+                        TupleDomain.all(),
+                        Optional.of(ImmutableList.of(new MockConnectorColumnHandle("nationkey", BigintType.BIGINT))))))
+                .withName("mock")
+                .build();
+        getQueryRunner().createCatalog("mock", connectorFactory, ImmutableMap.of());
+
+        // Need to use JOIN as parent of UNION ALL to expose replacing remote exchange with local exchange
+        assertDistributedPlan(
+                """
+                         SELECT * FROM (SELECT nationkey FROM nation UNION ALL SELECT nationkey FROM mock.default.nation), region
+                """,
+                noJoinReordering(),
+                output(
+                        join(INNER, join -> join
+                                .left(exchange(REMOTE, REPARTITION, FIXED_ARBITRARY_DISTRIBUTION,
+                                        tableScan("nation"),
+                                        node(TableScanNode.class)))
+                                .right(
+                                        exchange(LOCAL, GATHER, SINGLE_DISTRIBUTION,
+                                                exchange(REMOTE, REPLICATE, FIXED_BROADCAST_DISTRIBUTION,
+                                                        tableScan("region")))))));
+    }
+
+    @Test
+    public void testUnionAllOnInternalCatalog()
+    {
+        // Need to use JOIN as parent of UNION ALL to expose replacing remote exchange with local exchange
+        // TODO: https://starburstdata.atlassian.net/browse/SEP-11273
+        assertDistributedPlan(
+                """
+                         SELECT * FROM (SELECT table_catalog FROM system.information_schema.tables UNION ALL SELECT table_catalog FROM system.information_schema.tables), region
+                """,
+                noJoinReordering(),
+                output(
+                        join(INNER, join -> join
+                                .left(exchange(LOCAL, REPARTITION, FIXED_ARBITRARY_DISTRIBUTION,
+                                        tableScan("tables"),
+                                        tableScan("tables")))
+                                .right(
+                                        exchange(
+                                                LOCAL, GATHER, SINGLE_DISTRIBUTION,
+                                                exchange(REMOTE, REPLICATE, FIXED_BROADCAST_DISTRIBUTION,
+                                                        tableScan("region")))))));
+    }
+
+    @Test
+    public void testUnionAllOnTableScanAndValues()
+    {
+        assertDistributedPlan(
+                """
+                         SELECT * FROM (SELECT nationkey FROM nation UNION ALL VALUES(1))
+                """,
+                noJoinReordering(),
+                output(
+                        exchange(LOCAL, REPARTITION, FIXED_ARBITRARY_DISTRIBUTION,
+                                node(ValuesNode.class),
+                                exchange(REMOTE, GATHER, SINGLE_DISTRIBUTION,
+                                        tableScan("nation")))));
     }
 
     private Session spillEnabledWithJoinDistributionType(JoinDistributionType joinDistributionType)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddExchangesScaledWriters.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddExchangesScaledWriters.java
index fe93273a64ed..b760c56f4902 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddExchangesScaledWriters.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddExchangesScaledWriters.java
@@ -18,13 +18,15 @@
 import io.trino.Session;
 import io.trino.connector.MockConnectorFactory;
 import io.trino.plugin.tpch.TpchConnectorFactory;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.sql.planner.LogicalPlanner;
 import io.trino.sql.planner.SubPlan;
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.testing.LocalQueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
 
 import static io.trino.sql.planner.SystemPartitioningHandle.SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION;
 import static io.trino.testing.TestingSession.testSessionBuilder;
@@ -42,57 +44,54 @@ protected LocalQueryRunner createLocalQueryRunner()
                 .build();
         LocalQueryRunner queryRunner = LocalQueryRunner.create(session);
         queryRunner.createCatalog("tpch", new TpchConnectorFactory(1), ImmutableMap.of());
-        queryRunner.createCatalog("mock_dont_report_written_bytes", createConnectorFactorySupportingReportingBytesWritten(false, "mock_dont_report_written_bytes"), ImmutableMap.of());
-        queryRunner.createCatalog("mock_report_written_bytes", createConnectorFactorySupportingReportingBytesWritten(true, "mock_report_written_bytes"), ImmutableMap.of());
+        queryRunner.createCatalog("catalog_with_scaled_writers", createConnectorFactory("catalog_with_scaled_writers", true), ImmutableMap.of());
+        queryRunner.createCatalog("catalog_without_scaled_writers", createConnectorFactory("catalog_without_scaled_writers", false), ImmutableMap.of());
         return queryRunner;
     }
 
-    private MockConnectorFactory createConnectorFactorySupportingReportingBytesWritten(boolean supportsWrittenBytes, String name)
+    private MockConnectorFactory createConnectorFactory(String name, boolean writerScalingEnabledAcrossTasks)
     {
-        MockConnectorFactory connectorFactory = MockConnectorFactory.builder()
-                .withSupportsReportingWrittenBytes(supportsWrittenBytes)
+        return MockConnectorFactory.builder()
                 .withGetTableHandle(((session, schemaTableName) -> null))
                 .withName(name)
+                .withWriterScalingOptions(new WriterScalingOptions(writerScalingEnabledAcrossTasks, true))
                 .build();
-        return connectorFactory;
     }
 
-    @DataProvider(name = "scale_writers")
-    public Object[][] prepareScaledWritersOption()
+    @Test
+    public void testScaledWriters()
     {
-        return new Object[][] {{true}, {false}};
+        for (boolean isScaleWritersEnabled : Arrays.asList(true, false)) {
+            Session session = testSessionBuilder()
+                    .setSystemProperty("scale_writers", Boolean.toString(isScaleWritersEnabled))
+                    .build();
+
+            @Language("SQL")
+            String query = "CREATE TABLE catalog_with_scaled_writers.mock.test AS SELECT * FROM tpch.tiny.nation";
+            SubPlan subPlan = subplan(query, LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED, false, session);
+            if (isScaleWritersEnabled) {
+                assertThat(subPlan.getAllFragments().get(1).getPartitioning().getConnectorHandle()).isEqualTo(SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION.getConnectorHandle());
+            }
+            else {
+                subPlan.getAllFragments().forEach(
+                        fragment -> assertThat(fragment.getPartitioning().getConnectorHandle()).isNotEqualTo(SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION.getConnectorHandle()));
+            }
+        }
     }
 
-    @Test(dataProvider = "scale_writers")
-    public void testScaledWritersEnabled(boolean isScaleWritersEnabled)
+    @Test
+    public void testScaledWritersWithTasksScalingDisabled()
     {
-        Session session = testSessionBuilder()
-                .setSystemProperty("scale_writers", Boolean.toString(isScaleWritersEnabled))
-                .build();
+        for (boolean isScaleWritersEnabled : Arrays.asList(true, false)) {
+            Session session = testSessionBuilder()
+                    .setSystemProperty("scale_writers", Boolean.toString(isScaleWritersEnabled))
+                    .build();
 
-        @Language("SQL")
-        String query = "CREATE TABLE mock_report_written_bytes.mock.test AS SELECT * FROM tpch.tiny.nation";
-        SubPlan subPlan = subplan(query, LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED, false, session);
-        if (isScaleWritersEnabled) {
-            assertThat(subPlan.getAllFragments().get(1).getPartitioning().getConnectorHandle()).isEqualTo(SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION.getConnectorHandle());
-        }
-        else {
+            @Language("SQL")
+            String query = "CREATE TABLE catalog_without_scaled_writers.mock.test AS SELECT * FROM tpch.tiny.nation";
+            SubPlan subPlan = subplan(query, LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED, false, session);
             subPlan.getAllFragments().forEach(
                     fragment -> assertThat(fragment.getPartitioning().getConnectorHandle()).isNotEqualTo(SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION.getConnectorHandle()));
         }
     }
-
-    @Test(dataProvider = "scale_writers")
-    public void testScaledWritersDisabled(boolean isScaleWritersEnabled)
-    {
-        Session session = testSessionBuilder()
-                .setSystemProperty("scale_writers", Boolean.toString(isScaleWritersEnabled))
-                .build();
-
-        @Language("SQL")
-        String query = "CREATE TABLE mock_dont_report_written_bytes.mock.test AS SELECT * FROM tpch.tiny.nation";
-        SubPlan subPlan = subplan(query, LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED, false, session);
-        subPlan.getAllFragments().forEach(
-                fragment -> assertThat(fragment.getPartitioning().getConnectorHandle()).isNotEqualTo(SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION.getConnectorHandle()));
-    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddLocalExchangesForPartitionedInsertAndMerge.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddLocalExchangesForPartitionedInsertAndMerge.java
index b588b009e4b2..ab71fb8c7931 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddLocalExchangesForPartitionedInsertAndMerge.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddLocalExchangesForPartitionedInsertAndMerge.java
@@ -30,15 +30,14 @@
 import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.testing.LocalQueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
-import static io.trino.SystemSessionProperties.PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS;
 import static io.trino.SystemSessionProperties.SCALE_WRITERS;
-import static io.trino.SystemSessionProperties.TASK_PARTITIONED_WRITER_COUNT;
+import static io.trino.SystemSessionProperties.TASK_MAX_WRITER_COUNT;
+import static io.trino.SystemSessionProperties.TASK_MIN_WRITER_COUNT;
 import static io.trino.SystemSessionProperties.TASK_SCALE_WRITERS_ENABLED;
-import static io.trino.SystemSessionProperties.TASK_WRITER_COUNT;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_HASH_DISTRIBUTION;
 import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
@@ -46,7 +45,6 @@
 import static io.trino.sql.planner.assertions.PlanMatchPattern.exchange;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.mergeWriter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableWriter;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.LOCAL;
@@ -78,7 +76,6 @@ protected LocalQueryRunner createLocalQueryRunner()
                 .setSchema("mock")
                 .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "false")
                 .setSystemProperty(SCALE_WRITERS, "false")
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
                 .build();
         LocalQueryRunner queryRunner = LocalQueryRunner.create(session);
         queryRunner.createCatalog("mock_merge_and_insert", createMergeConnectorFactory(), ImmutableMap.of());
@@ -88,7 +85,6 @@ protected LocalQueryRunner createLocalQueryRunner()
     private MockConnectorFactory createMergeConnectorFactory()
     {
         return MockConnectorFactory.builder()
-                .withSupportsReportingWrittenBytes(true)
                 .withGetTableHandle(((session, schemaTableName) -> {
                     if (schemaTableName.getTableName().equals("source_table")) {
                         return new MockConnectorTableHandle(schemaTableName);
@@ -125,8 +121,8 @@ public void testTaskWriterCountHasNoEffectOnMergeOperation()
         assertDistributedPlan(
                 query,
                 Session.builder(getQueryRunner().getDefaultSession())
-                        .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, "1")
-                        .setSystemProperty(TASK_WRITER_COUNT, "8")
+                        .setSystemProperty(TASK_MAX_WRITER_COUNT, "1")
+                        .setSystemProperty(TASK_MIN_WRITER_COUNT, "8")
                         .build(),
                 anyTree(
                         mergeWriter(
@@ -138,8 +134,8 @@ public void testTaskWriterCountHasNoEffectOnMergeOperation()
         assertDistributedPlan(
                 query,
                 Session.builder(getQueryRunner().getDefaultSession())
-                        .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, "4")
-                        .setSystemProperty(TASK_WRITER_COUNT, "1")
+                        .setSystemProperty(TASK_MAX_WRITER_COUNT, "4")
+                        .setSystemProperty(TASK_MIN_WRITER_COUNT, "1")
                         .build(),
                 anyTree(
                         mergeWriter(
@@ -157,33 +153,29 @@ public void testTaskWriterCountHasNoEffectOnPartitionedInsertOperation()
         assertDistributedPlan(
                 query,
                 Session.builder(getQueryRunner().getDefaultSession())
-                        .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, "1")
-                        .setSystemProperty(TASK_WRITER_COUNT, "8")
+                        .setSystemProperty(TASK_MAX_WRITER_COUNT, "1")
+                        .setSystemProperty(TASK_MIN_WRITER_COUNT, "8")
                         .build(),
                 anyTree(
                         tableWriter(
                                 ImmutableList.of("customer", "year"),
                                 ImmutableList.of("customer", "year"),
                                 exchange(LOCAL, GATHER, SINGLE_DISTRIBUTION,
-                                        project(
-                                                exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
-                                                        anyTree(
-                                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))))));
+                                        exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
 
         assertDistributedPlan(
                 query,
                 Session.builder(getQueryRunner().getDefaultSession())
-                        .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, "4")
-                        .setSystemProperty(TASK_WRITER_COUNT, "1")
+                        .setSystemProperty(TASK_MAX_WRITER_COUNT, "4")
+                        .setSystemProperty(TASK_MIN_WRITER_COUNT, "1")
                         .build(),
                 anyTree(
                         tableWriter(
                                 ImmutableList.of("customer", "year"),
                                 ImmutableList.of("customer", "year"),
-                                project(
-                                        exchange(LOCAL, REPARTITION, FIXED_HASH_DISTRIBUTION,
-                                                exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
-                                                        anyTree(
-                                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))))));
+                                exchange(LOCAL, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                        exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddLocalExchangesForTaskScaleWriters.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddLocalExchangesForTaskScaleWriters.java
index 7ae677c86977..1f2140612228 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddLocalExchangesForTaskScaleWriters.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestAddLocalExchangesForTaskScaleWriters.java
@@ -16,6 +16,9 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import io.trino.Session;
+import io.trino.connector.MockConnector;
 import io.trino.connector.MockConnectorColumnHandle;
 import io.trino.connector.MockConnectorFactory;
 import io.trino.connector.MockConnectorTableHandle;
@@ -23,20 +26,27 @@
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorPartitioningHandle;
 import io.trino.spi.connector.ConnectorTableLayout;
+import io.trino.spi.connector.TableProcedureMetadata;
+import io.trino.spi.connector.WriterScalingOptions;
+import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.statistics.ColumnStatistics;
 import io.trino.spi.statistics.Estimate;
 import io.trino.spi.statistics.TableStatistics;
 import io.trino.sql.planner.PartitioningHandle;
 import io.trino.sql.planner.assertions.BasePlanTest;
+import io.trino.sql.planner.plan.TableExecuteNode;
+import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
 import java.util.Optional;
 
-import static io.trino.SystemSessionProperties.PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS;
 import static io.trino.SystemSessionProperties.SCALE_WRITERS;
 import static io.trino.SystemSessionProperties.TASK_SCALE_WRITERS_ENABLED;
+import static io.trino.SystemSessionProperties.USE_PREFERRED_WRITE_PARTITIONING;
+import static io.trino.spi.connector.TableProcedureExecutionMode.distributedWithFilteringAndRepartitioning;
 import static io.trino.spi.statistics.TableStatistics.empty;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_ARBITRARY_DISTRIBUTION;
@@ -46,7 +56,7 @@
 import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.exchange;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableWriter;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.LOCAL;
@@ -65,27 +75,26 @@ protected LocalQueryRunner createLocalQueryRunner()
     {
         LocalQueryRunner queryRunner = LocalQueryRunner.create(testSessionBuilder().build());
         queryRunner.createCatalog(
-                "mock_dont_report_written_bytes",
-                createConnectorFactory("mock_dont_report_written_bytes", false, true),
+                "mock_with_scaled_writers",
+                createConnectorFactory("mock_with_scaled_writers", true, true),
                 ImmutableMap.of());
         queryRunner.createCatalog(
-                "mock_report_written_bytes_without_multiple_writer_per_partition",
-                createConnectorFactory("mock_report_written_bytes", true, false),
+                "mock_without_scaled_writers",
+                createConnectorFactory("mock_without_scaled_writers", true, false),
                 ImmutableMap.of());
         queryRunner.createCatalog(
-                "mock_report_written_bytes_with_multiple_writer_per_partition",
-                createConnectorFactory("mock_report_written_bytes_with_multiple_writer_per_partition", true, true),
+                "mock_without_multiple_writer_per_partition",
+                createConnectorFactory("mock_without_multiple_writer_per_partition", false, true),
                 ImmutableMap.of());
         return queryRunner;
     }
 
     private MockConnectorFactory createConnectorFactory(
             String catalogHandle,
-            boolean supportsWrittenBytes,
-            boolean supportsMultipleWritersPerPartition)
+            boolean supportsMultipleWritersPerPartition,
+            boolean writerScalingEnabledWithinTask)
     {
         return MockConnectorFactory.builder()
-                .withSupportsReportingWrittenBytes(supportsWrittenBytes)
                 .withGetTableHandle(((session, tableName) -> {
                     if (tableName.getTableName().equals("source_table")
                             || tableName.getTableName().equals("system_partitioned_table")
@@ -95,6 +104,7 @@ private MockConnectorFactory createConnectorFactory(
                     }
                     return null;
                 }))
+                .withWriterScalingOptions(new WriterScalingOptions(true, writerScalingEnabledWithinTask))
                 .withGetTableStatistics(tableName -> {
                     if (tableName.getTableName().equals("source_table")) {
                         return new TableStatistics(
@@ -105,6 +115,17 @@ private MockConnectorFactory createConnectorFactory(
                     }
                     return empty();
                 })
+                .withGetLayoutForTableExecute((session, tableHandle) -> {
+                    MockConnector.MockConnectorTableExecuteHandle tableExecuteHandle = (MockConnector.MockConnectorTableExecuteHandle) tableHandle;
+                    if (tableExecuteHandle.getSchemaTableName().getTableName().equals("system_partitioned_table")) {
+                        return Optional.of(new ConnectorTableLayout(ImmutableList.of("year")));
+                    }
+                    return Optional.empty();
+                })
+                .withTableProcedures(ImmutableSet.of(new TableProcedureMetadata(
+                        "OPTIMIZE",
+                        distributedWithFilteringAndRepartitioning(),
+                        ImmutableList.of(PropertyMetadata.stringProperty("file_size_threshold", "file_size_threshold", "10GB", false)))))
                 .withGetColumns(schemaTableName -> ImmutableList.of(
                         new ColumnMetadata("customer", INTEGER),
                         new ColumnMetadata("year", INTEGER)))
@@ -125,12 +146,12 @@ private MockConnectorFactory createConnectorFactory(
     }
 
     @Test
-    public void testLocalScaledUnpartitionedWriterDistributionWithSupportsReportingWrittenBytes()
+    public void testLocalScaledUnpartitionedWriterDistribution()
     {
         assertDistributedPlan(
                 "INSERT INTO unpartitioned_table SELECT * FROM source_table",
                 testSessionBuilder()
-                        .setCatalog("mock_report_written_bytes_without_multiple_writer_per_partition")
+                        .setCatalog("mock_without_multiple_writer_per_partition")
                         .setSchema("mock")
                         .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "true")
                         .setSystemProperty(SCALE_WRITERS, "false")
@@ -146,7 +167,7 @@ public void testLocalScaledUnpartitionedWriterDistributionWithSupportsReportingW
         assertDistributedPlan(
                 "INSERT INTO unpartitioned_table SELECT * FROM source_table",
                 testSessionBuilder()
-                        .setCatalog("mock_report_written_bytes_without_multiple_writer_per_partition")
+                        .setCatalog("mock_without_multiple_writer_per_partition")
                         .setSchema("mock")
                         .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "false")
                         .setSystemProperty(SCALE_WRITERS, "false")
@@ -160,41 +181,31 @@ public void testLocalScaledUnpartitionedWriterDistributionWithSupportsReportingW
                                                 tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
     }
 
-    @Test(dataProvider = "taskScaleWritersOption")
-    public void testLocalScaledPartitionedWriterWithoutSupportForMultipleWritersPerPartition(boolean taskScaleWritersEnabled)
+    @Test
+    public void testLocalScaledUnpartitionedWriterWithPerTaskScalingDisabled()
     {
-        String catalogName = "mock_report_written_bytes_without_multiple_writer_per_partition";
-        PartitioningHandle partitioningHandle = new PartitioningHandle(
-                Optional.of(getCatalogHandle(catalogName)),
-                Optional.of(MockConnectorTransactionHandle.INSTANCE),
-                CONNECTOR_PARTITIONING_HANDLE);
-
         assertDistributedPlan(
-                "INSERT INTO connector_partitioned_table SELECT * FROM source_table",
+                "INSERT INTO unpartitioned_table SELECT * FROM source_table",
                 testSessionBuilder()
-                        .setCatalog(catalogName)
+                        .setCatalog("mock_without_scaled_writers")
                         .setSchema("mock")
-                        .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, String.valueOf(taskScaleWritersEnabled))
+                        .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "true")
                         .setSystemProperty(SCALE_WRITERS, "false")
                         .build(),
                 anyTree(
                         tableWriter(
                                 ImmutableList.of("customer", "year"),
                                 ImmutableList.of("customer", "year"),
-                                exchange(LOCAL, REPARTITION, partitioningHandle,
-                                        exchange(REMOTE, REPARTITION, partitioningHandle,
+                                exchange(LOCAL, GATHER, SINGLE_DISTRIBUTION,
+                                        exchange(REMOTE, REPARTITION, FIXED_ARBITRARY_DISTRIBUTION,
                                                 tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
-    }
 
-    @Test(dataProvider = "taskScaleWritersOption")
-    public void testLocalScaledUnpartitionedWriterDistributionWithoutSupportsReportingWrittenBytes(boolean taskScaleWritersEnabled)
-    {
         assertDistributedPlan(
                 "INSERT INTO unpartitioned_table SELECT * FROM source_table",
                 testSessionBuilder()
-                        .setCatalog("mock_dont_report_written_bytes")
+                        .setCatalog("mock_without_scaled_writers")
                         .setSchema("mock")
-                        .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, String.valueOf(taskScaleWritersEnabled))
+                        .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "false")
                         .setSystemProperty(SCALE_WRITERS, "false")
                         .build(),
                 anyTree(
@@ -206,98 +217,60 @@ public void testLocalScaledUnpartitionedWriterDistributionWithoutSupportsReporti
                                                 tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
     }
 
-    @Test(dataProvider = "taskScaleWritersOption")
-    public void testLocalScaledPartitionedWriterWithoutSupportsForReportingWrittenBytes(boolean taskScaleWritersEnabled)
+    @Test
+    public void testLocalScaledPartitionedWriterWithoutSupportForMultipleWritersPerPartition()
     {
-        String catalogName = "mock_dont_report_written_bytes";
-        PartitioningHandle partitioningHandle = new PartitioningHandle(
-                Optional.of(getCatalogHandle(catalogName)),
-                Optional.of(MockConnectorTransactionHandle.INSTANCE),
-                CONNECTOR_PARTITIONING_HANDLE);
+        for (boolean taskScaleWritersEnabled : Arrays.asList(true, false)) {
+            String catalogName = "mock_without_multiple_writer_per_partition";
+            PartitioningHandle partitioningHandle = new PartitioningHandle(
+                    Optional.of(getCatalogHandle(catalogName)),
+                    Optional.of(MockConnectorTransactionHandle.INSTANCE),
+                    CONNECTOR_PARTITIONING_HANDLE);
 
-        assertDistributedPlan(
-                "INSERT INTO system_partitioned_table SELECT * FROM source_table",
-                testSessionBuilder()
-                        .setCatalog(catalogName)
-                        .setSchema("mock")
-                        .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
-                        .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, String.valueOf(taskScaleWritersEnabled))
-                        .setSystemProperty(SCALE_WRITERS, "false")
-                        .build(),
-                anyTree(
-                        tableWriter(
-                                ImmutableList.of("customer", "year"),
-                                ImmutableList.of("customer", "year"),
-                                project(
-                                        exchange(LOCAL, REPARTITION, FIXED_HASH_DISTRIBUTION,
-                                                exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
-                                                        project(
-                                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))))));
-
-        assertDistributedPlan(
-                "INSERT INTO connector_partitioned_table SELECT * FROM source_table",
-                testSessionBuilder()
-                        .setCatalog(catalogName)
-                        .setSchema("mock")
-                        .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
-                        .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, String.valueOf(taskScaleWritersEnabled))
-                        .setSystemProperty(SCALE_WRITERS, "false")
-                        .build(),
-                anyTree(
-                        tableWriter(
-                                ImmutableList.of("customer", "year"),
-                                ImmutableList.of("customer", "year"),
-                                exchange(LOCAL, REPARTITION, partitioningHandle,
-                                        exchange(REMOTE, REPARTITION, partitioningHandle,
-                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
+            assertDistributedPlan(
+                    "INSERT INTO connector_partitioned_table SELECT * FROM source_table",
+                    testSessionBuilder()
+                            .setCatalog(catalogName)
+                            .setSchema("mock")
+                            .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, String.valueOf(taskScaleWritersEnabled))
+                            .setSystemProperty(SCALE_WRITERS, "false")
+                            .build(),
+                    anyTree(
+                            tableWriter(
+                                    ImmutableList.of("customer", "year"),
+                                    ImmutableList.of("customer", "year"),
+                                    exchange(LOCAL, REPARTITION, partitioningHandle,
+                                            exchange(REMOTE, REPARTITION, partitioningHandle,
+                                                    tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
+        }
     }
 
-    @Test(dataProvider = "taskScaleWritersOption")
-    public void testLocalScaledPartitionedWriterWithoutSupportForReportingWrittenBytesAndPreferredPartitioning(boolean taskScaleWritersEnabled)
+    @Test
+    public void testLocalScaledPartitionedWriterWithPerTaskScalingDisabled()
     {
-        String catalogName = "mock_dont_report_written_bytes";
-        PartitioningHandle partitioningHandle = new PartitioningHandle(
-                Optional.of(getCatalogHandle(catalogName)),
-                Optional.of(MockConnectorTransactionHandle.INSTANCE),
-                CONNECTOR_PARTITIONING_HANDLE);
+        for (boolean taskScaleWritersEnabled : Arrays.asList(true, false)) {
+            String catalogName = "mock_without_scaled_writers";
+            PartitioningHandle partitioningHandle = new PartitioningHandle(
+                    Optional.of(getCatalogHandle(catalogName)),
+                    Optional.of(MockConnectorTransactionHandle.INSTANCE),
+                    CONNECTOR_PARTITIONING_HANDLE);
 
-        assertDistributedPlan(
-                "INSERT INTO system_partitioned_table SELECT * FROM source_table",
-                testSessionBuilder()
-                        .setCatalog(catalogName)
-                        .setSchema("mock")
-                        .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, String.valueOf(taskScaleWritersEnabled))
-                        .setSystemProperty(SCALE_WRITERS, "false")
-                        .build(),
-                anyTree(
-                        tableWriter(
-                                ImmutableList.of("customer", "year"),
-                                ImmutableList.of("customer", "year"),
-                                exchange(LOCAL, GATHER, SINGLE_DISTRIBUTION,
-                                        exchange(REMOTE, REPARTITION, FIXED_ARBITRARY_DISTRIBUTION,
-                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
-
-        assertDistributedPlan(
-                "INSERT INTO connector_partitioned_table SELECT * FROM source_table",
-                testSessionBuilder()
-                        .setCatalog(catalogName)
-                        .setSchema("mock")
-                        .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, String.valueOf(taskScaleWritersEnabled))
-                        .setSystemProperty(SCALE_WRITERS, "false")
-                        .build(),
-                anyTree(
-                        tableWriter(
-                                ImmutableList.of("customer", "year"),
-                                ImmutableList.of("customer", "year"),
-                                exchange(LOCAL, REPARTITION, partitioningHandle,
-                                        exchange(REMOTE, REPARTITION, partitioningHandle,
-                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
-    }
-
-    @DataProvider
-    public Object[][] taskScaleWritersOption()
-    {
-        return new Object[][] {{true}, {false}};
+            assertDistributedPlan(
+                    "INSERT INTO connector_partitioned_table SELECT * FROM source_table",
+                    testSessionBuilder()
+                            .setCatalog(catalogName)
+                            .setSchema("mock")
+                            .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, String.valueOf(taskScaleWritersEnabled))
+                            .setSystemProperty(SCALE_WRITERS, "false")
+                            .build(),
+                    anyTree(
+                            tableWriter(
+                                    ImmutableList.of("customer", "year"),
+                                    ImmutableList.of("customer", "year"),
+                                    exchange(LOCAL, REPARTITION, partitioningHandle,
+                                            exchange(REMOTE, REPARTITION, partitioningHandle,
+                                                    tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
+        }
     }
 
     @Test
@@ -306,10 +279,10 @@ public void testLocalScaledPartitionedWriterForSystemPartitioningWithEnforcedPre
         assertDistributedPlan(
                 "INSERT INTO system_partitioned_table SELECT * FROM source_table",
                 testSessionBuilder()
-                        .setCatalog("mock_report_written_bytes_with_multiple_writer_per_partition")
+                        .setCatalog("mock_with_scaled_writers")
                         .setSchema("mock")
                         // Enforce preferred partitioning
-                        .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
+                        .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "true")
                         .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "true")
                         .setSystemProperty(SCALE_WRITERS, "false")
                         .build(),
@@ -317,19 +290,17 @@ public void testLocalScaledPartitionedWriterForSystemPartitioningWithEnforcedPre
                         tableWriter(
                                 ImmutableList.of("customer", "year"),
                                 ImmutableList.of("customer", "year"),
-                                project(
-                                        exchange(LOCAL, REPARTITION, SCALED_WRITER_HASH_DISTRIBUTION,
-                                                exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
-                                                        project(
-                                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))))));
+                                exchange(LOCAL, REPARTITION, SCALED_WRITER_HASH_DISTRIBUTION,
+                                        exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
 
         assertDistributedPlan(
                 "INSERT INTO system_partitioned_table SELECT * FROM source_table",
                 testSessionBuilder()
-                        .setCatalog("mock_report_written_bytes_with_multiple_writer_per_partition")
+                        .setCatalog("mock_with_scaled_writers")
                         .setSchema("mock")
                         // Enforce preferred partitioning
-                        .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
+                        .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "true")
                         .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "false")
                         .setSystemProperty(SCALE_WRITERS, "false")
                         .build(),
@@ -337,17 +308,15 @@ public void testLocalScaledPartitionedWriterForSystemPartitioningWithEnforcedPre
                         tableWriter(
                                 ImmutableList.of("customer", "year"),
                                 ImmutableList.of("customer", "year"),
-                                project(
-                                        exchange(LOCAL, REPARTITION, FIXED_HASH_DISTRIBUTION,
-                                                exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
-                                                        project(
-                                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))))));
+                                exchange(LOCAL, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                        exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
     }
 
     @Test
     public void testLocalScaledPartitionedWriterForConnectorPartitioning()
     {
-        String catalogName = "mock_report_written_bytes_with_multiple_writer_per_partition";
+        String catalogName = "mock_with_scaled_writers";
         PartitioningHandle partitioningHandle = new PartitioningHandle(
                 Optional.of(getCatalogHandle(catalogName)),
                 Optional.of(MockConnectorTransactionHandle.INSTANCE),
@@ -397,7 +366,7 @@ public void testLocalScaledPartitionedWriterWithEnforcedLocalPreferredPartitioni
         assertDistributedPlan(
                 "INSERT INTO system_partitioned_table SELECT * FROM source_table",
                 testSessionBuilder()
-                        .setCatalog("mock_report_written_bytes_with_multiple_writer_per_partition")
+                        .setCatalog("mock_with_scaled_writers")
                         .setSchema("mock")
                         .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "true")
                         .setSystemProperty(SCALE_WRITERS, "false")
@@ -406,16 +375,14 @@ public void testLocalScaledPartitionedWriterWithEnforcedLocalPreferredPartitioni
                         tableWriter(
                                 ImmutableList.of("customer", "year"),
                                 ImmutableList.of("customer", "year"),
-                                project(
-                                        exchange(LOCAL, REPARTITION, SCALED_WRITER_HASH_DISTRIBUTION,
-                                                exchange(REMOTE, REPARTITION, FIXED_ARBITRARY_DISTRIBUTION,
-                                                        project(
-                                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))))));
+                                exchange(LOCAL, REPARTITION, SCALED_WRITER_HASH_DISTRIBUTION,
+                                        exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                                tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
 
         assertDistributedPlan(
                 "INSERT INTO system_partitioned_table SELECT * FROM source_table",
                 testSessionBuilder()
-                        .setCatalog("mock_report_written_bytes_with_multiple_writer_per_partition")
+                        .setCatalog("mock_with_scaled_writers")
                         .setSchema("mock")
                         .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "false")
                         .setSystemProperty(SCALE_WRITERS, "false")
@@ -424,8 +391,50 @@ public void testLocalScaledPartitionedWriterWithEnforcedLocalPreferredPartitioni
                         tableWriter(
                                 ImmutableList.of("customer", "year"),
                                 ImmutableList.of("customer", "year"),
-                                exchange(LOCAL, GATHER, SINGLE_DISTRIBUTION,
-                                        exchange(REMOTE, REPARTITION, FIXED_ARBITRARY_DISTRIBUTION,
+                                exchange(LOCAL, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                        exchange(REMOTE, REPARTITION, FIXED_HASH_DISTRIBUTION,
                                                 tableScan("source_table", ImmutableMap.of("customer", "customer", "year", "year")))))));
     }
+
+    @Test
+    public void testTableExecuteLocalScalingDisabledForPartitionedTable()
+    {
+        @Language("SQL") String query = "ALTER TABLE system_partitioned_table EXECUTE optimize(file_size_threshold => '10MB')";
+
+        Session session = Session.builder(getQueryRunner().getDefaultSession())
+                .setCatalog("mock_with_scaled_writers")
+                .setSchema("mock")
+                .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "true")
+                .build();
+
+        assertDistributedPlan(
+                query,
+                session,
+                anyTree(
+                        node(TableExecuteNode.class,
+                                exchange(LOCAL, REPARTITION, FIXED_HASH_DISTRIBUTION,
+                                        exchange(REMOTE, REPARTITION, SCALED_WRITER_HASH_DISTRIBUTION,
+                                                node(TableScanNode.class))))));
+    }
+
+    @Test
+    public void testTableExecuteLocalScalingDisabledForUnpartitionedTable()
+    {
+        @Language("SQL") String query = "ALTER TABLE unpartitioned_table EXECUTE optimize(file_size_threshold => '10MB')";
+
+        Session session = Session.builder(getQueryRunner().getDefaultSession())
+                .setCatalog("mock_with_scaled_writers")
+                .setSchema("mock")
+                .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "true")
+                .build();
+
+        assertDistributedPlan(
+                query,
+                session,
+                anyTree(
+                        node(TableExecuteNode.class,
+                                exchange(LOCAL, GATHER, SINGLE_DISTRIBUTION,
+                                        exchange(REMOTE, REPARTITION, SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION,
+                                                node(TableScanNode.class))))));
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestCardinalityExtractorPlanVisitor.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestCardinalityExtractorPlanVisitor.java
index 2e3b6fd275d8..3340a17718d4 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestCardinalityExtractorPlanVisitor.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestCardinalityExtractorPlanVisitor.java
@@ -23,10 +23,10 @@
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.AggregationNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
-import static io.trino.metadata.AbstractMockMetadata.dummyMetadata;
+import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
 import static io.trino.sql.planner.optimizations.QueryCardinalityUtil.extractCardinality;
 import static java.util.Collections.emptyList;
 import static org.testng.Assert.assertEquals;
@@ -36,7 +36,7 @@ public class TestCardinalityExtractorPlanVisitor
     @Test
     public void testLimitOnTopOfValues()
     {
-        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), dummyMetadata(), TEST_SESSION);
+        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), PLANNER_CONTEXT, TEST_SESSION);
 
         assertEquals(
                 extractCardinality(planBuilder.limit(3, planBuilder.values(emptyList(), ImmutableList.of(emptyList())))),
@@ -50,7 +50,7 @@ public void testLimitOnTopOfValues()
     @Test
     public void testAggregation()
     {
-        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), dummyMetadata(), TEST_SESSION);
+        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), PLANNER_CONTEXT, TEST_SESSION);
         Symbol symbol = planBuilder.symbol("symbol");
         ColumnHandle columnHandle = new TestingColumnHandle("column");
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestColocatedJoin.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestColocatedJoin.java
index a566ddbc34e2..0470a9e70ddc 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestColocatedJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestColocatedJoin.java
@@ -33,9 +33,9 @@
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.ToIntFunction;
@@ -52,7 +52,6 @@
 import static io.trino.sql.planner.OptimizerConfig.JoinReorderingStrategy.NONE;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.exchange;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.LOCAL;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.REMOTE;
@@ -90,7 +89,6 @@ protected LocalQueryRunner createLocalQueryRunner()
                                 PARTITIONING_HANDLE,
                                 ImmutableList.of(new MockConnectorColumnHandle(COLUMN_A, BIGINT)))),
                         Optional.empty(),
-                        Optional.empty(),
                         ImmutableList.of()))
                 .build();
 
@@ -103,17 +101,12 @@ protected LocalQueryRunner createLocalQueryRunner()
         return queryRunner;
     }
 
-    @DataProvider(name = "colocated_join_enabled")
-    public Object[][] colocatedJoinEnabled()
-    {
-        return new Object[][] {{true}, {false}};
-    }
-
-    @Test(dataProvider = "colocated_join_enabled")
-    public void testColocatedJoinWhenNumberOfBucketsInTableScanIsNotSufficient(boolean colocatedJoinEnabled)
+    @Test
+    public void testColocatedJoinWhenNumberOfBucketsInTableScanIsNotSufficient()
     {
-        assertDistributedPlan(
-                """
+        for (boolean colocatedJoinEnabled : Arrays.asList(true, false)) {
+            assertDistributedPlan(
+                    """
                     SELECT
                         orders.column_a,
                         orders.column_b
@@ -131,18 +124,16 @@ public void testColocatedJoinWhenNumberOfBucketsInTableScanIsNotSufficient(boole
                             orders.column_a = t.column_a
                         AND orders.column_b = t.column_b
                 """,
-                prepareSession(20, colocatedJoinEnabled),
-                anyTree(
-                        project(
-                                anyTree(
-                                        tableScan("orders"))),
-                        exchange(
-                                LOCAL,
-                                project(
-                                        exchange(
-                                                REMOTE,
-                                                anyTree(
-                                                        tableScan("orders")))))));
+                    prepareSession(20, colocatedJoinEnabled),
+                    anyTree(
+                            anyTree(
+                                    tableScan("orders")),
+                            exchange(
+                                    LOCAL,
+                                    exchange(
+                                            REMOTE,
+                                            tableScan("orders")))));
+        }
     }
 
     @Test
@@ -169,13 +160,11 @@ public void testColocatedJoinWhenNumberOfBucketsInTableScanIsSufficient()
                 """,
                 prepareSession(0.01, true),
                 anyTree(
-                        project(
-                                anyTree(
-                                        tableScan("orders"))),
+                        anyTree(
+                                tableScan("orders")),
                         exchange(
                                 LOCAL,
-                                project(
-                                        tableScan("orders")))));
+                                tableScan("orders"))));
     }
 
     private Session prepareSession(double tableScanNodePartitioningMinBucketToTaskRatio, boolean colocatedJoinEnabled)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestDeterminePartitionCount.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestDeterminePartitionCount.java
index 8da217c0695d..439052f93e2f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestDeterminePartitionCount.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestDeterminePartitionCount.java
@@ -30,7 +30,7 @@
 import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.testing.LocalQueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -42,6 +42,7 @@
 import static io.trino.spi.statistics.TableStatistics.empty;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.exchange;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.join;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.output;
@@ -49,6 +50,9 @@
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.LOCAL;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.REMOTE;
+import static io.trino.sql.planner.plan.ExchangeNode.Type.GATHER;
+import static io.trino.sql.planner.plan.ExchangeNode.Type.REPARTITION;
+import static io.trino.sql.planner.plan.ExchangeNode.Type.REPLICATE;
 import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 
@@ -92,7 +96,9 @@ protected LocalQueryRunner createLocalQueryRunner()
                 .setCatalog(catalogName)
                 .setSchema("default")
                 .build();
-        LocalQueryRunner queryRunner = LocalQueryRunner.create(session);
+        LocalQueryRunner queryRunner = LocalQueryRunner.builder(session)
+                .withNodeCountForStats(100)
+                .build();
         queryRunner.createCatalog(
                 catalogName,
                 connectorFactory,
@@ -101,17 +107,53 @@ protected LocalQueryRunner createLocalQueryRunner()
     }
 
     @Test
-    public void testPlanWhenTableStatisticsArePresent()
+    public void testSimpleSelect()
     {
-        @Language("SQL") String query = """
-                SELECT count(column_a) FROM table_with_stats_a
-                """;
+        @Language("SQL") String query = "SELECT * FROM table_with_stats_a";
 
-        // DeterminePartitionCount optimizer rule should fire and set the partitionCount to 5 for remote exchanges
+        // DeterminePartitionCount optimizer rule should not fire since no remote exchanges are present
         assertDistributedPlan(
                 query,
                 Session.builder(getQueryRunner().getDefaultSession())
-                        .setSystemProperty(MAX_HASH_PARTITION_COUNT, "10")
+                        .setSystemProperty(MAX_HASH_PARTITION_COUNT, "100")
+                        .setSystemProperty(MIN_HASH_PARTITION_COUNT, "4")
+                        .setSystemProperty(MIN_INPUT_SIZE_PER_TASK, "20MB")
+                        .setSystemProperty(MIN_INPUT_ROWS_PER_TASK, "400")
+                        .build(),
+                output(
+                        node(TableScanNode.class)));
+    }
+
+    @Test
+    public void testSimpleFilter()
+    {
+        @Language("SQL") String query = "SELECT column_a FROM table_with_stats_a WHERE column_b IS NULL";
+
+        // DeterminePartitionCount optimizer rule should not fire since no remote exchanges are present
+        assertDistributedPlan(
+                query,
+                Session.builder(getQueryRunner().getDefaultSession())
+                        .setSystemProperty(MAX_HASH_PARTITION_COUNT, "100")
+                        .setSystemProperty(MIN_HASH_PARTITION_COUNT, "4")
+                        .setSystemProperty(MIN_INPUT_SIZE_PER_TASK, "20MB")
+                        .setSystemProperty(MIN_INPUT_ROWS_PER_TASK, "400")
+                        .build(),
+                output(
+                        project(
+                                filter("column_b IS NULL",
+                                        tableScan("table_with_stats_a", ImmutableMap.of("column_a", "column_a", "column_b", "column_b"))))));
+    }
+
+    @Test
+    public void testSimpleCount()
+    {
+        @Language("SQL") String query = "SELECT count(*) FROM table_with_stats_a";
+
+        // DeterminePartitionCount optimizer rule should not fire since no remote repartition exchanges are present
+        assertDistributedPlan(
+                query,
+                Session.builder(getQueryRunner().getDefaultSession())
+                        .setSystemProperty(MAX_HASH_PARTITION_COUNT, "100")
                         .setSystemProperty(MIN_HASH_PARTITION_COUNT, "4")
                         .setSystemProperty(MIN_INPUT_SIZE_PER_TASK, "20MB")
                         .setSystemProperty(MIN_INPUT_ROWS_PER_TASK, "400")
@@ -119,11 +161,62 @@ SELECT count(column_a) FROM table_with_stats_a
                 output(
                         node(AggregationNode.class,
                                 exchange(LOCAL,
-                                        exchange(REMOTE, Optional.of(5),
+                                        exchange(REMOTE, GATHER, Optional.empty(),
                                                 node(AggregationNode.class,
                                                         node(TableScanNode.class)))))));
     }
 
+    @Test
+    public void testPlanWhenTableStatisticsArePresent()
+    {
+        @Language("SQL") String query = """
+                SELECT count(column_a) FROM table_with_stats_a group by column_b
+                """;
+
+        // DeterminePartitionCount optimizer rule should fire and set the partitionCount to 10 for remote exchanges
+        assertDistributedPlan(
+                query,
+                Session.builder(getQueryRunner().getDefaultSession())
+                        .setSystemProperty(MAX_HASH_PARTITION_COUNT, "21")
+                        .setSystemProperty(MIN_HASH_PARTITION_COUNT, "4")
+                        .setSystemProperty(MIN_INPUT_SIZE_PER_TASK, "20MB")
+                        .setSystemProperty(MIN_INPUT_ROWS_PER_TASK, "400")
+                        .build(),
+                output(
+                        project(
+                                node(AggregationNode.class,
+                                        exchange(LOCAL,
+                                                exchange(REMOTE, REPARTITION, Optional.of(10),
+                                                        node(AggregationNode.class,
+                                                                node(TableScanNode.class))))))));
+    }
+
+    @Test
+    public void testDoesNotSetPartitionCountWhenNodeCountIsSmall()
+    {
+        @Language("SQL") String query = """
+                SELECT count(column_a) FROM table_with_stats_a group by column_b
+                """;
+
+        // DeterminePartitionCount shouldn't put partition count when 2 * "determined partition count"
+        // is greater or equal to number of workers.
+        assertDistributedPlan(
+                query,
+                Session.builder(getQueryRunner().getDefaultSession())
+                        .setSystemProperty(MAX_HASH_PARTITION_COUNT, "20")
+                        .setSystemProperty(MIN_HASH_PARTITION_COUNT, "4")
+                        .setSystemProperty(MIN_INPUT_SIZE_PER_TASK, "20MB")
+                        .setSystemProperty(MIN_INPUT_ROWS_PER_TASK, "400")
+                        .build(),
+                output(
+                        project(
+                                node(AggregationNode.class,
+                                        exchange(LOCAL,
+                                                exchange(REMOTE, REPARTITION, Optional.empty(),
+                                                        node(AggregationNode.class,
+                                                                node(TableScanNode.class))))))));
+    }
+
     @Test
     public void testPlanWhenTableStatisticsAreAbsent()
     {
@@ -145,12 +238,10 @@ public void testPlanWhenTableStatisticsAreAbsent()
                                 .equiCriteria("column_a", "column_a_0")
                                 .right(exchange(LOCAL,
                                         exchange(REMOTE, Optional.empty(),
-                                                project(
-                                                        tableScan("table_without_stats_b", ImmutableMap.of("column_a_0", "column_a", "column_b_1", "column_b"))))))
+                                                tableScan("table_without_stats_b", ImmutableMap.of("column_a_0", "column_a", "column_b_1", "column_b")))))
                                 .left(exchange(REMOTE, Optional.empty(),
-                                        project(
-                                                node(FilterNode.class,
-                                                        tableScan("table_without_stats_a", ImmutableMap.of("column_a", "column_a", "column_b", "column_b")))))))));
+                                        node(FilterNode.class,
+                                                tableScan("table_without_stats_a", ImmutableMap.of("column_a", "column_a", "column_b", "column_b"))))))));
     }
 
     @Test
@@ -184,7 +275,7 @@ public void testPlanWhenCrossJoinIsScalar()
                 SELECT * FROM table_with_stats_a CROSS JOIN (select max(column_a) from table_with_stats_b) t(a)
                 """;
 
-        // DeterminePartitionCount optimizer rule should fire and set the partitionCount to 1 for remote exchanges
+        // DeterminePartitionCount optimizer rule should not fire since no remote repartitioning exchanges are present
         assertDistributedPlan(
                 query,
                 Session.builder(getQueryRunner().getDefaultSession())
@@ -197,10 +288,10 @@ public void testPlanWhenCrossJoinIsScalar()
                         join(INNER, builder -> builder
                                 .right(
                                         exchange(LOCAL,
-                                                exchange(REMOTE, Optional.of(15),
+                                                exchange(REMOTE, REPLICATE, Optional.empty(),
                                                         node(AggregationNode.class,
                                                                 exchange(LOCAL,
-                                                                        exchange(REMOTE, Optional.of(15),
+                                                                        exchange(REMOTE, GATHER, Optional.empty(),
                                                                                 node(AggregationNode.class,
                                                                                         node(TableScanNode.class))))))))
                                 .left(node(TableScanNode.class)))));
@@ -227,12 +318,10 @@ public void testPlanWhenJoinNodeStatsAreAbsent()
                                 .equiCriteria("column_b", "column_b_1")
                                 .right(exchange(LOCAL,
                                         exchange(REMOTE, Optional.empty(),
-                                                project(
-                                                        tableScan("table_with_stats_b", ImmutableMap.of("column_a_0", "column_a", "column_b_1", "column_b"))))))
+                                                tableScan("table_with_stats_b", ImmutableMap.of("column_a_0", "column_a", "column_b_1", "column_b")))))
                                 .left(exchange(REMOTE, Optional.empty(),
-                                        project(
-                                                node(FilterNode.class,
-                                                        tableScan("table_with_stats_a", ImmutableMap.of("column_a", "column_a", "column_b", "column_b")))))))));
+                                        node(FilterNode.class,
+                                                tableScan("table_with_stats_a", ImmutableMap.of("column_a", "column_a", "column_b", "column_b"))))))));
     }
 
     @Test
@@ -242,7 +331,7 @@ public void testPlanWhenJoinNodeOutputIsBiggerThanRowsScanned()
                 SELECT a.column_a FROM table_with_stats_a as a JOIN table_with_stats_b as b ON a.column_a = b.column_a
                 """;
 
-        // DeterminePartitionCount optimizer rule should fire and set the partitionCount to 20 for remote exchanges
+        // DeterminePartitionCount optimizer rule should fire and set the partitionCount to 10 for remote exchanges
         assertDistributedPlan(
                 query,
                 Session.builder(getQueryRunner().getDefaultSession())
@@ -257,12 +346,10 @@ public void testPlanWhenJoinNodeOutputIsBiggerThanRowsScanned()
                                 .right(exchange(LOCAL,
                                         // partition count should be more than 5 because of the presence of expanding join operation
                                         exchange(REMOTE, Optional.of(10),
-                                                project(
-                                                        tableScan("table_with_stats_b", ImmutableMap.of("column_a_0", "column_a"))))))
+                                                tableScan("table_with_stats_b", ImmutableMap.of("column_a_0", "column_a")))))
                                 .left(exchange(REMOTE, Optional.of(10),
-                                        project(
-                                                node(FilterNode.class,
-                                                        tableScan("table_with_stats_a", ImmutableMap.of("column_a", "column_a")))))))));
+                                        node(FilterNode.class,
+                                                tableScan("table_with_stats_a", ImmutableMap.of("column_a", "column_a"))))))));
     }
 
     @Test
@@ -286,12 +373,10 @@ public void testEstimatedPartitionCountShouldNotBeGreaterThanMaxLimit()
                                 .equiCriteria("column_a", "column_a_0")
                                 .right(exchange(LOCAL,
                                         exchange(REMOTE, Optional.empty(),
-                                                project(
-                                                        tableScan("table_with_stats_b", ImmutableMap.of("column_a_0", "column_a", "column_b_1", "column_b"))))))
+                                                tableScan("table_with_stats_b", ImmutableMap.of("column_a_0", "column_a", "column_b_1", "column_b")))))
                                 .left(exchange(REMOTE, Optional.empty(),
-                                        project(
-                                                node(FilterNode.class,
-                                                        tableScan("table_with_stats_a", ImmutableMap.of("column_a", "column_a", "column_b", "column_b")))))))));
+                                        node(FilterNode.class,
+                                                tableScan("table_with_stats_a", ImmutableMap.of("column_a", "column_a", "column_b", "column_b"))))))));
     }
 
     @Test
@@ -305,7 +390,7 @@ public void testEstimatedPartitionCountShouldNotBeLessThanMinLimit()
         assertDistributedPlan(
                 query,
                 Session.builder(getQueryRunner().getDefaultSession())
-                        .setSystemProperty(MAX_HASH_PARTITION_COUNT, "20")
+                        .setSystemProperty(MAX_HASH_PARTITION_COUNT, "40")
                         .setSystemProperty(MIN_HASH_PARTITION_COUNT, "15")
                         .setSystemProperty(MIN_INPUT_SIZE_PER_TASK, "20MB")
                         .setSystemProperty(MIN_INPUT_ROWS_PER_TASK, "400")
@@ -315,12 +400,10 @@ public void testEstimatedPartitionCountShouldNotBeLessThanMinLimit()
                                 .equiCriteria("column_a", "column_a_0")
                                 .right(exchange(LOCAL,
                                         exchange(REMOTE, Optional.of(15),
-                                                project(
-                                                        tableScan("table_with_stats_b", ImmutableMap.of("column_a_0", "column_a"))))))
+                                                tableScan("table_with_stats_b", ImmutableMap.of("column_a_0", "column_a")))))
                                 .left(exchange(REMOTE, Optional.of(15),
-                                        project(
-                                                node(FilterNode.class,
-                                                        tableScan("table_with_stats_a", ImmutableMap.of("column_a", "column_a")))))))));
+                                        node(FilterNode.class,
+                                                tableScan("table_with_stats_a", ImmutableMap.of("column_a", "column_a"))))))));
     }
 
     @Test
@@ -336,7 +419,7 @@ public void testPlanWhenUnionNodeOutputIsBiggerThanJoinOutput()
                 FROM table_with_stats_b
                 """;
 
-        // DeterminePartitionCount optimizer rule should fire and set the partitionCount to 10 for remote exchanges
+        // DeterminePartitionCount optimizer rule should fire and set the partitionCount to 20 for remote exchanges
         assertDistributedPlan(
                 query,
                 Session.builder(getQueryRunner().getDefaultSession())
@@ -346,20 +429,17 @@ public void testPlanWhenUnionNodeOutputIsBiggerThanJoinOutput()
                         .setSystemProperty(MIN_INPUT_ROWS_PER_TASK, "400")
                         .build(),
                 output(
-                        // partition count should be 15 with just join node but since we also have union, it should be 20
-                        exchange(REMOTE, Optional.of(20),
+                        exchange(REMOTE, GATHER,
                                 join(INNER, builder -> builder
                                         .equiCriteria("column_a", "column_a_1")
                                         .right(exchange(LOCAL,
                                                 // partition count should be 15 with just join node but since we also have union, it should be 20
-                                                exchange(REMOTE, Optional.of(20),
-                                                        project(
-                                                                tableScan("table_with_stats_b", ImmutableMap.of("column_a_1", "column_a"))))))
+                                                exchange(REMOTE, REPARTITION, Optional.of(20),
+                                                        tableScan("table_with_stats_b", ImmutableMap.of("column_a_1", "column_a")))))
                                         // partition count should be 15 with just join node but since we also have union, it should be 20
-                                        .left(exchange(REMOTE, Optional.of(20),
-                                                project(
-                                                        node(FilterNode.class,
-                                                                tableScan("table_with_stats_a", ImmutableMap.of("column_a", "column_a", "column_b_0", "column_b"))))))),
+                                        .left(exchange(REMOTE, REPARTITION, Optional.of(20),
+                                                node(FilterNode.class,
+                                                        tableScan("table_with_stats_a", ImmutableMap.of("column_a", "column_a", "column_b_0", "column_b")))))),
                                 tableScan("table_with_stats_b", ImmutableMap.of("column_b_4", "column_b")))));
     }
 
@@ -367,7 +447,7 @@ public void testPlanWhenUnionNodeOutputIsBiggerThanJoinOutput()
     public void testPlanWhenEstimatedPartitionCountBasedOnRowsIsMoreThanOutputSize()
     {
         @Language("SQL") String query = """
-                SELECT count(column_a) FROM table_with_stats_a
+                SELECT count(column_a) FROM table_with_stats_a group by column_b
                 """;
 
         // DeterminePartitionCount optimizer rule should fire and set the partitionCount to 10 for remote exchanges
@@ -381,10 +461,11 @@ SELECT count(column_a) FROM table_with_stats_a
                         .setSystemProperty(MIN_INPUT_ROWS_PER_TASK, "20")
                         .build(),
                 output(
-                        node(AggregationNode.class,
-                                exchange(LOCAL,
-                                        exchange(REMOTE, Optional.of(10),
-                                                node(AggregationNode.class,
-                                                        node(TableScanNode.class)))))));
+                        project(
+                                node(AggregationNode.class,
+                                        exchange(LOCAL,
+                                                exchange(REMOTE, REPARTITION, Optional.of(10),
+                                                        node(AggregationNode.class,
+                                                                node(TableScanNode.class))))))));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestEliminateCrossJoins.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestEliminateCrossJoins.java
index 41171ae830c6..abe8a1ffc3c9 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestEliminateCrossJoins.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestEliminateCrossJoins.java
@@ -17,7 +17,7 @@
 import io.trino.SystemSessionProperties;
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.sql.planner.assertions.PlanMatchPattern;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
@@ -68,11 +68,10 @@ public void testEliminateSimpleCrossJoin()
                         join(INNER, builder -> builder
                                 .equiCriteria("L_ORDERKEY", "O_ORDERKEY")
                                 .left(
-                                        anyTree(
-                                                join(INNER, leftJoinBuilder -> leftJoinBuilder
-                                                        .equiCriteria("P_PARTKEY", "L_PARTKEY")
-                                                        .left(anyTree(PART_TABLESCAN))
-                                                        .right(anyTree(LINEITEM_TABLESCAN)))))
+                                        join(INNER, leftJoinBuilder -> leftJoinBuilder
+                                                .equiCriteria("P_PARTKEY", "L_PARTKEY")
+                                                .left(anyTree(PART_TABLESCAN))
+                                                .right(anyTree(LINEITEM_TABLESCAN))))
                                 .right(anyTree(ORDERS_TABLESCAN)))));
     }
 
@@ -106,10 +105,9 @@ public void testGiveUpOnCrossJoin()
                         join(INNER, builder -> builder
                                 .equiCriteria("O_ORDERKEY", "L_ORDERKEY")
                                 .left(
-                                        anyTree(
-                                                join(INNER, leftJoinBuilder -> leftJoinBuilder
-                                                        .left(tableScan("part"))
-                                                        .right(anyTree(tableScan("orders", ImmutableMap.of("O_ORDERKEY", "orderkey")))))))
+                                        join(INNER, leftJoinBuilder -> leftJoinBuilder
+                                                .left(tableScan("part"))
+                                                .right(anyTree(tableScan("orders", ImmutableMap.of("O_ORDERKEY", "orderkey"))))))
                                 .right(
                                         anyTree(tableScan("lineitem", ImmutableMap.of("L_ORDERKEY", "orderkey")))))));
     }
@@ -125,17 +123,16 @@ public void testEliminateCrossJoinWithNonEqualityCondition()
                         join(INNER, builder -> builder
                                 .equiCriteria("L_ORDERKEY", "O_ORDERKEY")
                                 .left(
-                                        anyTree(
-                                                join(INNER, leftJoinBuilder -> leftJoinBuilder
-                                                        .equiCriteria("P_PARTKEY", "L_PARTKEY")
-                                                        .filter("P_NAME < expr")
-                                                        .left(anyTree(PART_WITH_NAME_TABLESCAN))
-                                                        .right(
-                                                                anyTree(
-                                                                        project(
-                                                                                ImmutableMap.of("expr", expression("cast(L_COMMENT AS varchar(55))")),
-                                                                                filter("L_PARTKEY <> L_ORDERKEY",
-                                                                                        LINEITEM_WITH_COMMENT_TABLESCAN)))))))
+                                        join(INNER, leftJoinBuilder -> leftJoinBuilder
+                                                .equiCriteria("P_PARTKEY", "L_PARTKEY")
+                                                .filter("P_NAME < expr")
+                                                .left(anyTree(PART_WITH_NAME_TABLESCAN))
+                                                .right(
+                                                        anyTree(
+                                                                project(
+                                                                        ImmutableMap.of("expr", expression("cast(L_COMMENT AS varchar(55))")),
+                                                                        filter("L_PARTKEY <> L_ORDERKEY",
+                                                                                LINEITEM_WITH_COMMENT_TABLESCAN))))))
                                 .right(anyTree(ORDERS_TABLESCAN)))));
     }
 
@@ -148,11 +145,10 @@ public void testEliminateCrossJoinPreserveFilters()
                         join(INNER, builder -> builder
                                 .equiCriteria("L_ORDERKEY", "O_ORDERKEY")
                                 .left(
-                                        anyTree(
-                                                join(INNER, leftJoinBuilder -> leftJoinBuilder
-                                                        .equiCriteria("P_PARTKEY", "L_PARTKEY")
-                                                        .left(anyTree(PART_TABLESCAN))
-                                                        .right(anyTree(filter("L_RETURNFLAG = 'R'", LINEITEM_WITH_RETURNFLAG_TABLESCAN))))))
+                                        join(INNER, leftJoinBuilder -> leftJoinBuilder
+                                                .equiCriteria("P_PARTKEY", "L_PARTKEY")
+                                                .left(anyTree(PART_TABLESCAN))
+                                                .right(anyTree(filter("L_RETURNFLAG = 'R'", LINEITEM_WITH_RETURNFLAG_TABLESCAN)))))
                                 .right(
                                         anyTree(filter("O_SHIPPRIORITY >= 10", ORDERS_WITH_SHIPPRIORITY_TABLESCAN))))));
     }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestEliminateSorts.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestEliminateSorts.java
index 55168ce0ec69..a789950b60bb 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestEliminateSorts.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestEliminateSorts.java
@@ -28,15 +28,15 @@
 import io.trino.sql.planner.iterative.rule.RemoveRedundantIdentityProjections;
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
 
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.functionCall;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.output;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.sort;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.specification;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
@@ -57,33 +57,43 @@ public class TestEliminateSorts
             ImmutableMap.of(QUANTITY_ALIAS, "quantity"));
 
     @Test
-    public void testEliminateSorts()
+    public void testNotEliminateSortsIfSortKeyIsDifferent()
     {
-        @Language("SQL") String sql = "SELECT quantity, row_number() OVER (ORDER BY quantity) FROM lineitem ORDER BY quantity";
+        @Language("SQL") String sql = "SELECT quantity, row_number() OVER (ORDER BY quantity) FROM lineitem ORDER BY tax";
 
         PlanMatchPattern pattern =
-                output(
-                        window(windowMatcherBuilder -> windowMatcherBuilder
-                                        .specification(windowSpec)
-                                        .addFunction(functionCall("row_number", Optional.empty(), ImmutableList.of())),
-                                anyTree(LINEITEM_TABLESCAN_Q)));
+                anyTree(
+                        sort(
+                                anyTree(
+                                        window(windowMatcherBuilder -> windowMatcherBuilder
+                                                        .specification(windowSpec)
+                                                        .addFunction(functionCall("row_number", Optional.empty(), ImmutableList.of())),
+                                                anyTree(LINEITEM_TABLESCAN_Q)))));
 
         assertUnitPlan(sql, pattern);
     }
 
     @Test
-    public void testNotEliminateSorts()
+    public void testNotEliminateSortsIfFilterExists()
     {
-        @Language("SQL") String sql = "SELECT quantity, row_number() OVER (ORDER BY quantity) FROM lineitem ORDER BY tax";
+        @Language("SQL") String sql = """
+            SELECT * FROM (
+                SELECT quantity, row_number() OVER (ORDER BY quantity) 
+                FROM lineitem
+            )
+            WHERE quantity > 10 
+            ORDER BY quantity
+            """;
 
         PlanMatchPattern pattern =
                 anyTree(
                         sort(
                                 anyTree(
-                                        window(windowMatcherBuilder -> windowMatcherBuilder
-                                                        .specification(windowSpec)
-                                                        .addFunction(functionCall("row_number", Optional.empty(), ImmutableList.of())),
-                                                anyTree(LINEITEM_TABLESCAN_Q)))));
+                                        filter("QUANTITY > CAST(10 AS DOUBLE)",
+                                                window(windowMatcherBuilder -> windowMatcherBuilder
+                                                                .specification(windowSpec)
+                                                                .addFunction(functionCall("row_number", Optional.empty(), ImmutableList.of())),
+                                                        anyTree(LINEITEM_TABLESCAN_Q))))));
 
         assertUnitPlan(sql, pattern);
     }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestExpressionEquivalence.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestExpressionEquivalence.java
index 51e8b5f3ea7f..8a3db4a77480 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestExpressionEquivalence.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestExpressionEquivalence.java
@@ -16,17 +16,20 @@
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.metadata.Metadata;
+import io.trino.metadata.MetadataManager;
 import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignature;
-import io.trino.sql.parser.ParsingOptions;
+import io.trino.sql.PlannerContext;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.TypeProvider;
 import io.trino.sql.tree.Expression;
 import io.trino.transaction.TestingTransactionManager;
+import io.trino.transaction.TransactionManager;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Set;
 
@@ -35,9 +38,8 @@
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.sql.ExpressionTestUtils.planExpression;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DOUBLE;
 import static io.trino.sql.planner.SymbolsExtractor.extractUnique;
-import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
+import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
 import static io.trino.transaction.TransactionBuilder.transaction;
 import static java.lang.String.format;
@@ -49,6 +51,10 @@
 public class TestExpressionEquivalence
 {
     private static final SqlParser SQL_PARSER = new SqlParser();
+    private static final TestingTransactionManager TRANSACTION_MANAGER = new TestingTransactionManager();
+    private static final PlannerContext PLANNER_CONTEXT = plannerContextBuilder()
+            .withTransactionManager(TRANSACTION_MANAGER)
+            .build();
     private static final ExpressionEquivalence EQUIVALENCE = new ExpressionEquivalence(
             PLANNER_CONTEXT.getMetadata(),
             PLANNER_CONTEXT.getFunctionManager(),
@@ -130,9 +136,8 @@ public void testEquivalent()
 
     private static void assertEquivalent(@Language("SQL") String left, @Language("SQL") String right)
     {
-        ParsingOptions parsingOptions = new ParsingOptions(AS_DOUBLE /* anything */);
-        Expression leftExpression = planExpression(PLANNER_CONTEXT, TEST_SESSION, TYPE_PROVIDER, SQL_PARSER.createExpression(left, parsingOptions));
-        Expression rightExpression = planExpression(PLANNER_CONTEXT, TEST_SESSION, TYPE_PROVIDER, SQL_PARSER.createExpression(right, parsingOptions));
+        Expression leftExpression = planExpression(TRANSACTION_MANAGER, PLANNER_CONTEXT, TEST_SESSION, TYPE_PROVIDER, SQL_PARSER.createExpression(left));
+        Expression rightExpression = planExpression(TRANSACTION_MANAGER, PLANNER_CONTEXT, TEST_SESSION, TYPE_PROVIDER, SQL_PARSER.createExpression(right));
 
         Set<Symbol> symbols = extractUnique(ImmutableList.of(leftExpression, rightExpression));
         TypeProvider types = TypeProvider.copyOf(symbols.stream()
@@ -204,9 +209,8 @@ public void testNotEquivalent()
 
     private static void assertNotEquivalent(@Language("SQL") String left, @Language("SQL") String right)
     {
-        ParsingOptions parsingOptions = new ParsingOptions(AS_DOUBLE /* anything */);
-        Expression leftExpression = planExpression(PLANNER_CONTEXT, TEST_SESSION, TYPE_PROVIDER, SQL_PARSER.createExpression(left, parsingOptions));
-        Expression rightExpression = planExpression(PLANNER_CONTEXT, TEST_SESSION, TYPE_PROVIDER, SQL_PARSER.createExpression(right, parsingOptions));
+        Expression leftExpression = planExpression(TRANSACTION_MANAGER, PLANNER_CONTEXT, TEST_SESSION, TYPE_PROVIDER, SQL_PARSER.createExpression(left));
+        Expression rightExpression = planExpression(TRANSACTION_MANAGER, PLANNER_CONTEXT, TEST_SESSION, TYPE_PROVIDER, SQL_PARSER.createExpression(right));
 
         Set<Symbol> symbols = extractUnique(ImmutableList.of(leftExpression, rightExpression));
         TypeProvider types = TypeProvider.copyOf(symbols.stream()
@@ -222,7 +226,9 @@ private static void assertNotEquivalent(@Language("SQL") String left, @Language(
 
     private static boolean areExpressionEquivalent(Expression leftExpression, Expression rightExpression, TypeProvider types)
     {
-        return transaction(new TestingTransactionManager(), new AllowAllAccessControl())
+        TransactionManager transactionManager = new TestingTransactionManager();
+        Metadata metadata = MetadataManager.testMetadataManagerBuilder().withTransactionManager(transactionManager).build();
+        return transaction(transactionManager, metadata, new AllowAllAccessControl())
                 .singleStatement()
                 .execute(TEST_SESSION, transactionSession -> {
                     return EQUIVALENCE.areExpressionsEquivalent(transactionSession, leftExpression, rightExpression, types);
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestForceSingleNodeOutput.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestForceSingleNodeOutput.java
index 49132c8a9872..18737aa40039 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestForceSingleNodeOutput.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestForceSingleNodeOutput.java
@@ -17,7 +17,7 @@
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.ExchangeNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SystemSessionProperties.FORCE_SINGLE_NODE_OUTPUT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestFullOuterJoinWithCoalesce.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestFullOuterJoinWithCoalesce.java
index 2d934be5b4e8..568a9cf25a0e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestFullOuterJoinWithCoalesce.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestFullOuterJoinWithCoalesce.java
@@ -16,7 +16,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.assertions.BasePlanTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.assertions.PlanMatchPattern.aggregation;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
@@ -35,7 +36,8 @@
 public class TestFullOuterJoinWithCoalesce
         extends BasePlanTest
 {
-    @Test(enabled = false) // TODO: re-enable once FULL join property derivations are re-introduced
+    @Test
+    @Disabled // TODO: re-enable once FULL join property derivations are re-introduced
     public void testFullOuterJoinWithCoalesce()
     {
         assertDistributedPlan(
@@ -62,7 +64,8 @@ public void testFullOuterJoinWithCoalesce()
                                         .right(exchange(LOCAL, GATHER, anyTree(values(ImmutableList.of("r")))))))));
     }
 
-    @Test(enabled = false) // TODO: re-enable once FULL join property derivations are re-introduced
+    @Test
+    @Disabled // TODO: re-enable once FULL join property derivations are re-introduced
     public void testArgumentsInDifferentOrder()
     {
         // ensure properties for full outer join are derived properly regardless of the order of arguments to coalesce, since they
@@ -128,18 +131,17 @@ public void testCoalesceWithManyArguments()
                                 aggregation(
                                         ImmutableMap.of(),
                                         PARTIAL,
-                                        anyTree(
-                                                project(
-                                                        ImmutableMap.of("expr", expression("coalesce(l, m, r)")),
-                                                        join(FULL, builder -> builder
-                                                                .equiCriteria("l", "r")
-                                                                .left(
-                                                                        anyTree(
-                                                                                join(FULL, leftJoinBuilder -> leftJoinBuilder
-                                                                                        .equiCriteria("l", "m")
-                                                                                        .left(anyTree(values(ImmutableList.of("l"))))
-                                                                                        .right(anyTree(values(ImmutableList.of("m")))))))
-                                                                .right(anyTree(values(ImmutableList.of("r")))))))))));
+                                        project(
+                                                ImmutableMap.of("expr", expression("coalesce(l, m, r)")),
+                                                join(FULL, builder -> builder
+                                                        .equiCriteria("l", "r")
+                                                        .left(
+                                                                anyTree(
+                                                                        join(FULL, leftJoinBuilder -> leftJoinBuilder
+                                                                                .equiCriteria("l", "m")
+                                                                                .left(anyTree(values(ImmutableList.of("l"))))
+                                                                                .right(anyTree(values(ImmutableList.of("m")))))))
+                                                        .right(anyTree(values(ImmutableList.of("r"))))))))));
     }
 
     @Test
@@ -158,17 +160,16 @@ public void testComplexArgumentToCoalesce()
                                 aggregation(
                                         ImmutableMap.of(),
                                         PARTIAL,
-                                        anyTree(
-                                                project(
-                                                        ImmutableMap.of("expr", expression("coalesce(l, m + 1, r)")),
-                                                        join(FULL, builder -> builder
-                                                                .equiCriteria("l", "r")
-                                                                .left(
-                                                                        anyTree(
-                                                                                join(FULL, leftJoinBuilder -> leftJoinBuilder
-                                                                                        .equiCriteria("l", "m")
-                                                                                        .left(anyTree(values(ImmutableList.of("l"))))
-                                                                                        .right(anyTree(values(ImmutableList.of("m")))))))
-                                                                .right(anyTree(values(ImmutableList.of("r")))))))))));
+                                        project(
+                                                ImmutableMap.of("expr", expression("coalesce(l, m + 1, r)")),
+                                                join(FULL, builder -> builder
+                                                        .equiCriteria("l", "r")
+                                                        .left(
+                                                                anyTree(
+                                                                        join(FULL, leftJoinBuilder -> leftJoinBuilder
+                                                                                .equiCriteria("l", "m")
+                                                                                .left(anyTree(values(ImmutableList.of("l"))))
+                                                                                .right(anyTree(values(ImmutableList.of("m")))))))
+                                                        .right(anyTree(values(ImmutableList.of("r"))))))))));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestLimitMaxWriterNodesCount.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestLimitMaxWriterNodesCount.java
index b71090735b25..7e95b4f90269 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestLimitMaxWriterNodesCount.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestLimitMaxWriterNodesCount.java
@@ -25,6 +25,7 @@
 import io.trino.spi.connector.ConnectorPartitioningHandle;
 import io.trino.spi.connector.ConnectorTableLayout;
 import io.trino.spi.connector.TableProcedureMetadata;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.sql.planner.SystemPartitioningHandle;
 import io.trino.sql.planner.TestTableScanNodePartitioning;
@@ -34,17 +35,17 @@
 import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.testing.LocalQueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
 
 import static io.trino.SystemSessionProperties.MAX_WRITER_TASKS_COUNT;
-import static io.trino.SystemSessionProperties.PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS;
 import static io.trino.SystemSessionProperties.REDISTRIBUTE_WRITES;
 import static io.trino.SystemSessionProperties.RETRY_POLICY;
 import static io.trino.SystemSessionProperties.SCALE_WRITERS;
+import static io.trino.SystemSessionProperties.USE_PREFERRED_WRITE_PARTITIONING;
 import static io.trino.spi.connector.TableProcedureExecutionMode.distributedWithFilteringAndRepartitioning;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_ARBITRARY_DISTRIBUTION;
@@ -52,7 +53,6 @@
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.exchange;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.LOCAL;
@@ -99,6 +99,7 @@ private MockConnectorFactory prepareConnectorFactory(String catalogName, Optiona
                     }
                     return null;
                 }))
+                .withWriterScalingOptions(WriterScalingOptions.ENABLED)
                 .withGetInsertLayout((session, tableMetadata) -> {
                     if (tableMetadata.getTableName().equals(partitionedTable)) {
                         return Optional.of(new ConnectorTableLayout(ImmutableList.of("column_a")));
@@ -129,7 +130,6 @@ private MockConnectorFactory prepareConnectorFactory(String catalogName, Optiona
                         distributedWithFilteringAndRepartitioning(),
                         ImmutableList.of(PropertyMetadata.stringProperty("file_size_threshold", "file_size_threshold", "10GB", false)))))
                 .withPartitionProvider(new TestTableScanNodePartitioning.TestPartitioningProvider(new InMemoryNodeManager()))
-                .withSupportsReportingWrittenBytes(true)
                 .withMaxWriterTasks(maxWriterTasks)
                 .withGetColumns(schemaTableName -> ImmutableList.of(
                         new ColumnMetadata("column_a", VARCHAR),
@@ -210,7 +210,7 @@ public void testPlanWhenInsertToPartitionedTablePreferredPartitioningEnabled()
 
         Session session = Session.builder(getQueryRunner().getDefaultSession())
                 .setSystemProperty(MAX_WRITER_TASKS_COUNT, "2")
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
+                .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "true")
                 .setCatalog(catalogName)
                 .build();
 
@@ -219,12 +219,10 @@ public void testPlanWhenInsertToPartitionedTablePreferredPartitioningEnabled()
                 session,
                 anyTree(
                         node(TableWriterNode.class,
-                                project(
                                 exchange(LOCAL,
                                         // partitionCount for writing stage should be set to because session variable MAX_WRITER_TASKS_COUNT is set to 2
                                         exchange(REMOTE, SCALED_WRITER_HASH_DISTRIBUTION, Optional.of(2),
-                                                project(
-                                                        values("column_a", "column_b"))))))));
+                                                values("column_a", "column_b"))))));
     }
 
     @Test
@@ -255,7 +253,7 @@ public void testPlanWhenMaxWriterTasksSpecified()
 
         Session session = Session.builder(getQueryRunner().getDefaultSession())
                 .setSystemProperty(MAX_WRITER_TASKS_COUNT, "2")
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
+                .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "true")
                 .setCatalog(catalogNameWithMaxWriterTasksSpecified)
                 .build();
 
@@ -264,12 +262,10 @@ public void testPlanWhenMaxWriterTasksSpecified()
                 session,
                 anyTree(
                         node(TableWriterNode.class,
-                                project(
-                                        exchange(LOCAL,
-                                                // partitionCount for writing stage should be set to 4 because it was specified by connector
-                                                exchange(REMOTE, SCALED_WRITER_HASH_DISTRIBUTION, Optional.of(1),
-                                                        project(
-                                                                values("column_a", "column_b"))))))));
+                                exchange(LOCAL,
+                                        // partitionCount for writing stage should be set to 4 because it was specified by connector
+                                        exchange(REMOTE, SCALED_WRITER_HASH_DISTRIBUTION, Optional.of(1),
+                                                values("column_a", "column_b"))))));
     }
 
     @Test
@@ -279,7 +275,7 @@ public void testPlanWhenRetryPolicyIsTask()
 
         Session session = Session.builder(getQueryRunner().getDefaultSession())
                 .setSystemProperty(MAX_WRITER_TASKS_COUNT, "2")
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
+                .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "true")
                 .setSystemProperty(RETRY_POLICY, "TASK")
                 .setCatalog(catalogNameWithMaxWriterTasksSpecified)
                 .build();
@@ -289,12 +285,9 @@ public void testPlanWhenRetryPolicyIsTask()
                 session,
                 anyTree(
                         node(TableWriterNode.class,
-                                project(
-                                        exchange(LOCAL,
-                                                // partitionCount for writing stage is empty because it is FTE mode
-                                                exchange(REMOTE, SCALED_WRITER_HASH_DISTRIBUTION, Optional.empty(),
-                                                        project(
-                                                                values("column_a", "column_b"))))))));
+                                exchange(LOCAL,
+                                        exchange(REMOTE, SCALED_WRITER_HASH_DISTRIBUTION, Optional.empty(),
+                                                values("column_a", "column_b"))))));
     }
 
     @Test
@@ -369,7 +362,7 @@ public void testPlanWhenTableExecuteToPartitionedTablePreferredPartitioningEnabl
 
         Session session = Session.builder(getQueryRunner().getDefaultSession())
                 .setSystemProperty(MAX_WRITER_TASKS_COUNT, "2")
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
+                .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "true")
                 .setCatalog(catalogName)
                 .build();
 
@@ -378,12 +371,10 @@ public void testPlanWhenTableExecuteToPartitionedTablePreferredPartitioningEnabl
                 session,
                 anyTree(
                         node(TableExecuteNode.class,
-                                project(
-                                        exchange(LOCAL,
-                                                // partitionCount for writing stage should be set to because session variable MAX_WRITER_TASKS_COUNT is set to 2
-                                                exchange(REMOTE, SCALED_WRITER_HASH_DISTRIBUTION, Optional.of(2),
-                                                        project(
-                                                                node(TableScanNode.class))))))));
+                                exchange(LOCAL,
+                                        // partitionCount for writing stage should be set to because session variable MAX_WRITER_TASKS_COUNT is set to 2
+                                        exchange(REMOTE, SCALED_WRITER_HASH_DISTRIBUTION, Optional.of(2),
+                                                node(TableScanNode.class))))));
     }
 
     @Test
@@ -393,7 +384,7 @@ public void testPlanTableExecuteWhenMaxWriterTasksSpecified()
 
         Session session = Session.builder(getQueryRunner().getDefaultSession())
                 .setSystemProperty(MAX_WRITER_TASKS_COUNT, "2")
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
+                .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "true")
                 .setCatalog(catalogNameWithMaxWriterTasksSpecified)
                 .build();
 
@@ -402,12 +393,10 @@ public void testPlanTableExecuteWhenMaxWriterTasksSpecified()
                 session,
                 anyTree(
                         node(TableExecuteNode.class,
-                                    project(
-                                        exchange(LOCAL,
-                                                // partitionCount for writing stage should be set to 4 because it was specified by connector
-                                                exchange(REMOTE, SCALED_WRITER_HASH_DISTRIBUTION, Optional.of(1),
-                                                        project(
-                                                                node(TableScanNode.class))))))));
+                                exchange(LOCAL,
+                                        // partitionCount for writing stage should be set to 4 because it was specified by connector
+                                        exchange(REMOTE, SCALED_WRITER_HASH_DISTRIBUTION, Optional.of(1),
+                                                node(TableScanNode.class))))));
     }
 
     @Test
@@ -417,7 +406,7 @@ public void testPlanTableExecuteWhenRetryPolicyIsTask()
 
         Session session = Session.builder(getQueryRunner().getDefaultSession())
                 .setSystemProperty(MAX_WRITER_TASKS_COUNT, "2")
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
+                .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "true")
                 .setSystemProperty(RETRY_POLICY, "TASK")
                 .setCatalog(catalogNameWithMaxWriterTasksSpecified)
                 .build();
@@ -427,11 +416,9 @@ public void testPlanTableExecuteWhenRetryPolicyIsTask()
                 session,
                 anyTree(
                         node(TableExecuteNode.class,
-                                project(
-                                        exchange(LOCAL,
-                                                // partitionCount for writing stage is empty because it is FTE mode
-                                                exchange(REMOTE, SCALED_WRITER_HASH_DISTRIBUTION, Optional.empty(),
-                                                        project(
-                                                                node(TableScanNode.class))))))));
+                                exchange(LOCAL,
+                                        // partitionCount for writing stage is empty because it is FTE mode
+                                        exchange(REMOTE, SCALED_WRITER_HASH_DISTRIBUTION, Optional.empty(),
+                                                node(TableScanNode.class))))));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestLocalProperties.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestLocalProperties.java
index 150d27115f77..5fe70c5cbd71 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestLocalProperties.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestLocalProperties.java
@@ -30,7 +30,7 @@
 import io.trino.spi.connector.SortOrder;
 import io.trino.spi.connector.SortingProperty;
 import io.trino.testing.TestingMetadata.TestingColumnHandle;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestMergeWindows.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestMergeWindows.java
index e32bc1ea90b2..08fb973e8ba5 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestMergeWindows.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestMergeWindows.java
@@ -26,19 +26,16 @@
 import io.trino.sql.planner.iterative.rule.GatherAndMergeWindows;
 import io.trino.sql.planner.iterative.rule.RemoveRedundantIdentityProjections;
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
-import io.trino.sql.planner.plan.WindowNode;
 import io.trino.sql.tree.FrameBound;
 import io.trino.sql.tree.WindowFrame;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 
 import static io.trino.sql.planner.PlanOptimizers.columnPruningRules;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.any;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.anyNot;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
@@ -101,12 +98,7 @@ public class TestMergeWindows
 
     public TestMergeWindows()
     {
-        this(ImmutableMap.of());
-    }
-
-    public TestMergeWindows(Map<String, String> sessionProperties)
-    {
-        super(sessionProperties);
+        super(ImmutableMap.of());
 
         specificationA = specification(
                 ImmutableList.of(SUPPKEY_ALIAS),
@@ -164,8 +156,7 @@ public void testMergeableWindowsAllOptimizers()
                                         window(windowMatcherBuilder -> windowMatcherBuilder
                                                         .specification(specificationB)
                                                         .addFunction(functionCall("sum", COMMON_FRAME, ImmutableList.of(QUANTITY_ALIAS))),
-                                                anyNot(WindowNode.class,
-                                                        LINEITEM_TABLESCAN_DOQSS)))));  // should be anyTree(LINEITEM_TABLESCAN_DOQSS) but anyTree does not handle zero nodes case correctly
+                                                LINEITEM_TABLESCAN_DOQSS))));  // should be anyTree(LINEITEM_TABLESCAN_DOQSS) but anyTree does not handle zero nodes case correctly
 
         assertPlan(sql, pattern);
     }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestOptimizeMixedDistinctAggregations.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestOptimizeMixedDistinctAggregations.java
index 35a29c72cc88..08734bbf83ac 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestOptimizeMixedDistinctAggregations.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestOptimizeMixedDistinctAggregations.java
@@ -29,7 +29,7 @@
 import io.trino.sql.planner.iterative.rule.SingleDistinctAggregationToGroupBy;
 import io.trino.sql.tree.FunctionCall;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -72,7 +72,7 @@ public void testMixedDistinctAggregationOptimizer()
         // Second Aggregation data
         List<String> groupByKeysSecond = ImmutableList.of(groupBy);
         Map<Optional<String>, ExpectedValueProvider<FunctionCall>> aggregationsSecond = ImmutableMap.of(
-                Optional.of("arbitrary"), PlanMatchPattern.functionCall("arbitrary", false, ImmutableList.of(anySymbol())),
+                Optional.of("any_value"), PlanMatchPattern.functionCall("any_value", false, ImmutableList.of(anySymbol())),
                 Optional.of("count"), PlanMatchPattern.functionCall("count", false, ImmutableList.of(anySymbol())));
 
         // First Aggregation data
@@ -101,7 +101,7 @@ public void testNestedType()
     {
         // Second Aggregation data
         Map<String, ExpectedValueProvider<FunctionCall>> aggregationsSecond = ImmutableMap.of(
-                "arbitrary", PlanMatchPattern.functionCall("arbitrary", false, ImmutableList.of(anySymbol())),
+                "any_value", PlanMatchPattern.functionCall("any_value", false, ImmutableList.of(anySymbol())),
                 "count", PlanMatchPattern.functionCall("count", false, ImmutableList.of(anySymbol())));
 
         // First Aggregation data
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestPartialTopNWithPresortedInput.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestPartialTopNWithPresortedInput.java
index bddccc0dbbbe..7dc0d25af9df 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestPartialTopNWithPresortedInput.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestPartialTopNWithPresortedInput.java
@@ -31,7 +31,7 @@
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -93,7 +93,6 @@ protected LocalQueryRunner createLocalQueryRunner()
                                 TupleDomain.all(),
                                 Optional.empty(),
                                 Optional.empty(),
-                                Optional.empty(),
                                 ImmutableList.of(new SortingProperty<>(columnHandleA, ASC_NULLS_FIRST)));
                     }
                     else if (tableHandle.getTableName().equals(nestedField)) {
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestPlanNodeSearcher.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestPlanNodeSearcher.java
index 86c7f220f171..9b1dfe9e9173 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestPlanNodeSearcher.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestPlanNodeSearcher.java
@@ -14,7 +14,6 @@
 package io.trino.sql.planner.optimizations;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.metadata.AbstractMockMetadata;
 import io.trino.sql.planner.PlanNodeIdAllocator;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.Assignments;
@@ -23,19 +22,20 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.sql.planner.plan.ProjectNode;
 import io.trino.sql.planner.plan.ValuesNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.SessionTestUtils.TEST_SESSION;
+import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
 import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
 import static org.testng.Assert.assertEquals;
 
 public class TestPlanNodeSearcher
 {
-    private static final PlanBuilder BUILDER = new PlanBuilder(new PlanNodeIdAllocator(), new AbstractMockMetadata() {}, TEST_SESSION);
+    private static final PlanBuilder BUILDER = new PlanBuilder(new PlanNodeIdAllocator(), PLANNER_CONTEXT, TEST_SESSION);
 
     @Test
     public void testFindAll()
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestRemoveEmptyUnionBranches.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestRemoveEmptyUnionBranches.java
index 716db43f902f..5d0db81f6c6f 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestRemoveEmptyUnionBranches.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestRemoveEmptyUnionBranches.java
@@ -31,7 +31,7 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -87,7 +87,8 @@ public class TestRemoveEmptyUnionBranches
                                     .collect(toImmutableList()),
                             Optional.empty(),
                             Optional.empty(),
-                            true));
+                            true,
+                            ImmutableList.of()));
 
     @Override
     protected LocalQueryRunner createLocalQueryRunner()
@@ -121,7 +122,7 @@ private MockConnectorFactory createConnectorFactory(String catalogHandle)
                         .collect(toImmutableList()))
                 .withGetTableProperties((session, handle) -> {
                     MockConnectorTableHandle table = (MockConnectorTableHandle) handle;
-                    return new ConnectorTableProperties(table.getConstraint(), Optional.empty(), Optional.empty(), Optional.empty(), emptyList());
+                    return new ConnectorTableProperties(table.getConstraint(), Optional.empty(), Optional.empty(), emptyList());
                 })
                 .withApplyFilter(applyFilter())
                 .withName(catalogHandle)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestRemoveUnsupportedDynamicFilters.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestRemoveUnsupportedDynamicFilters.java
index a8cb7d371816..5c1f043980ca 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestRemoveUnsupportedDynamicFilters.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestRemoveUnsupportedDynamicFilters.java
@@ -42,8 +42,9 @@
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.testing.TestingTransactionHandle;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Optional;
 
@@ -64,8 +65,9 @@
 import static io.trino.sql.planner.iterative.rule.test.PlanBuilder.expression;
 import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
 import static io.trino.sql.tree.BooleanLiteral.TRUE_LITERAL;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true) // e.g. PlanBuilder is mutable
+@TestInstance(PER_CLASS)
 public class TestRemoveUnsupportedDynamicFilters
         extends BasePlanTest
 {
@@ -78,12 +80,12 @@ public class TestRemoveUnsupportedDynamicFilters
     private Symbol ordersOrderKeySymbol;
     private TableScanNode ordersTableScanNode;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         plannerContext = getQueryRunner().getPlannerContext();
         metadata = plannerContext.getMetadata();
-        builder = new PlanBuilder(new PlanNodeIdAllocator(), metadata, TEST_SESSION);
+        builder = new PlanBuilder(new PlanNodeIdAllocator(), plannerContext, TEST_SESSION);
         CatalogHandle catalogHandle = getCurrentCatalogHandle();
         lineitemTableHandle = new TableHandle(
                 catalogHandle,
@@ -130,7 +132,7 @@ public void testUnconsumedDynamicFilterInJoin()
     @Test
     public void testDynamicFilterConsumedOnBuildSide()
     {
-        Expression dynamicFilter = createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference());
+        Expression dynamicFilter = createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference());
         PlanNode root = builder.join(
                 INNER,
                 builder.filter(
@@ -154,7 +156,7 @@ public void testDynamicFilterConsumedOnBuildSide()
                         .left(
                                 PlanMatchPattern.filter(
                                         TRUE_LITERAL,
-                                        createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, new SymbolReference("ORDERS_OK")),
+                                        createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, new SymbolReference("ORDERS_OK")),
                                         tableScan("orders", ImmutableMap.of("ORDERS_OK", "orderkey"))))
                         .right(
                                 tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey")))));
@@ -173,7 +175,7 @@ public void testUnmatchedDynamicFilter()
                                 combineConjuncts(
                                         metadata,
                                         expression("LINEITEM_OK > 0"),
-                                        createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
+                                        createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
                                 lineitemTableScanNode),
                         ImmutableList.of(new JoinNode.EquiJoinClause(ordersOrderKeySymbol, lineitemOrderKeySymbol)),
                         ImmutableList.of(),
@@ -207,7 +209,7 @@ public void testRemoveDynamicFilterNotAboveTableScan()
                                 combineConjuncts(
                                         metadata,
                                         expression("LINEITEM_OK > 0"),
-                                        createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference())),
+                                        createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference())),
                                 builder.values(lineitemOrderKeySymbol)),
                         ordersTableScanNode,
                         ImmutableList.of(new JoinNode.EquiJoinClause(lineitemOrderKeySymbol, ordersOrderKeySymbol)),
@@ -245,11 +247,11 @@ public void testNestedDynamicFilterDisjunctionRewrite()
                                         combineDisjuncts(
                                                 metadata,
                                                 expression("LINEITEM_OK IS NULL"),
-                                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
+                                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
                                         combineDisjuncts(
                                                 metadata,
                                                 expression("LINEITEM_OK IS NOT NULL"),
-                                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference()))),
+                                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference()))),
                                 lineitemTableScanNode),
                         ImmutableList.of(new JoinNode.EquiJoinClause(ordersOrderKeySymbol, lineitemOrderKeySymbol)),
                         ImmutableList.of(ordersOrderKeySymbol),
@@ -282,11 +284,11 @@ public void testNestedDynamicFilterConjunctionRewrite()
                                         combineConjuncts(
                                                 metadata,
                                                 expression("LINEITEM_OK IS NULL"),
-                                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
+                                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
                                         combineConjuncts(
                                                 metadata,
                                                 expression("LINEITEM_OK IS NOT NULL"),
-                                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference()))),
+                                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference()))),
                                 lineitemTableScanNode),
                         ImmutableList.of(new JoinNode.EquiJoinClause(ordersOrderKeySymbol, lineitemOrderKeySymbol)),
                         ImmutableList.of(ordersOrderKeySymbol),
@@ -321,7 +323,7 @@ public void testRemoveUnsupportedCast()
                 builder.join(
                         INNER,
                         builder.filter(
-                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, expression("CAST(LINEITEM_DOUBLE_OK AS BIGINT)")),
+                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, expression("CAST(LINEITEM_DOUBLE_OK AS BIGINT)")),
                                 builder.tableScan(
                                         lineitemTableHandle,
                                         ImmutableList.of(lineitemDoubleOrderKeySymbol),
@@ -358,7 +360,7 @@ public void testSpatialJoin()
                         builder.values(leftSymbol),
                         builder.values(rightSymbol),
                         ImmutableList.of(leftSymbol, rightSymbol),
-                        createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, expression("LEFT_SYMBOL + RIGHT_SYMBOL"))));
+                        createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, expression("LEFT_SYMBOL + RIGHT_SYMBOL"))));
         assertPlan(
                 removeUnsupportedDynamicFilters(root),
                 output(
@@ -398,7 +400,7 @@ public void testDynamicFilterConsumedOnFilteringSourceSideInSemiJoin()
                         combineConjuncts(
                                 metadata,
                                 expression("LINEITEM_OK > 0"),
-                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
+                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
                         lineitemTableScanNode),
                 ordersOrderKeySymbol,
                 lineitemOrderKeySymbol,
@@ -423,7 +425,7 @@ public void testUnmatchedDynamicFilterInSemiJoin()
                         combineConjuncts(
                                 metadata,
                                 expression("ORDERS_OK > 0"),
-                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference())),
+                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference())),
                         ordersTableScanNode),
                 lineitemTableScanNode,
                 ordersOrderKeySymbol,
@@ -449,7 +451,7 @@ public void testRemoveDynamicFilterNotAboveTableScanWithSemiJoin()
                         combineConjuncts(
                                 metadata,
                                 expression("ORDERS_OK > 0"),
-                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference())),
+                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference())),
                         builder.values(ordersOrderKeySymbol)),
                 lineitemTableScanNode,
                 ordersOrderKeySymbol,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestReorderWindows.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestReorderWindows.java
index cd0b5a380cd0..e852b7ab3f9b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestReorderWindows.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestReorderWindows.java
@@ -28,7 +28,7 @@
 import io.trino.sql.planner.plan.DataOrganizationSpecification;
 import io.trino.sql.tree.WindowFrame;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestSetFlattening.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestSetFlattening.java
index ea50f28e06d9..a55da9b04acd 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestSetFlattening.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestSetFlattening.java
@@ -25,7 +25,7 @@
 import io.trino.sql.planner.iterative.rule.MergeUnion;
 import io.trino.sql.planner.iterative.rule.PruneDistinctAggregation;
 import io.trino.sql.planner.iterative.rule.RemoveRedundantIdentityProjections;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestUnaliasSymbolReferences.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestUnaliasSymbolReferences.java
index 5ab43927f058..6c1c5ba969c2 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestUnaliasSymbolReferences.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestUnaliasSymbolReferences.java
@@ -38,7 +38,7 @@
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.tree.Expression;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -47,9 +47,11 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.DynamicFilters.createDynamicFilterExpression;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.groupId;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.join;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
 import static io.trino.sql.tree.BooleanLiteral.TRUE_LITERAL;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
@@ -80,8 +82,8 @@ public void testDynamicFilterIdUnAliased()
                                     TRUE_LITERAL, // additional filter to test recursive call
                                     p.filter(
                                             ExpressionUtils.and(
-                                                    dynamicFilterExpression(metadata, session, probeColumn1, dynamicFilterId1),
-                                                    dynamicFilterExpression(metadata, session, probeColumn2, dynamicFilterId2)),
+                                                    dynamicFilterExpression(metadata, probeColumn1, dynamicFilterId1),
+                                                    dynamicFilterExpression(metadata, probeColumn2, dynamicFilterId2)),
                                             p.tableScan(
                                                     tableHandle(probeTable),
                                                     ImmutableList.of(probeColumn1, probeColumn2),
@@ -113,6 +115,29 @@ probeColumn2, new TpchColumnHandle("suppkey", BIGINT))))),
                                 project(tableScan(buildTable, ImmutableMap.of("column", "nationkey"))))));
     }
 
+    @Test
+    public void testGroupIdGroupingSetsDeduplicated()
+    {
+        assertOptimizedPlan(
+                new UnaliasSymbolReferences(getQueryRunner().getMetadata()),
+                (p, session, metadata) -> {
+                    Symbol symbol = p.symbol("symbol");
+                    Symbol alias1 = p.symbol("alias1");
+                    Symbol alias2 = p.symbol("alias2");
+
+                    return p.groupId(ImmutableList.of(ImmutableList.of(alias1, alias2)),
+                            ImmutableList.of(),
+                            p.symbol("groupId"),
+                            p.project(
+                                    Assignments.of(alias1, symbol.toSymbolReference(), alias2, symbol.toSymbolReference()),
+                                    p.values(symbol)));
+                },
+                groupId(
+                        ImmutableList.of(ImmutableList.of("symbol")),
+                        "groupId",
+                        project(values("symbol"))));
+    }
+
     private void assertOptimizedPlan(PlanOptimizer optimizer, PlanCreator planCreator, PlanMatchPattern pattern)
     {
         LocalQueryRunner queryRunner = getQueryRunner();
@@ -120,7 +145,7 @@ private void assertOptimizedPlan(PlanOptimizer optimizer, PlanCreator planCreato
             Metadata metadata = queryRunner.getMetadata();
             session.getCatalog().ifPresent(catalog -> metadata.getCatalogHandle(session, catalog));
             PlanNodeIdAllocator idAllocator = new PlanNodeIdAllocator();
-            PlanBuilder planBuilder = new PlanBuilder(idAllocator, metadata, session);
+            PlanBuilder planBuilder = new PlanBuilder(idAllocator, queryRunner.getPlannerContext(), session);
 
             SymbolAllocator symbolAllocator = new SymbolAllocator();
             PlanNode plan = planCreator.create(planBuilder, session, metadata);
@@ -140,9 +165,9 @@ private void assertOptimizedPlan(PlanOptimizer optimizer, PlanCreator planCreato
         });
     }
 
-    private Expression dynamicFilterExpression(Metadata metadata, Session session, Symbol symbol, DynamicFilterId id)
+    private Expression dynamicFilterExpression(Metadata metadata, Symbol symbol, DynamicFilterId id)
     {
-        return createDynamicFilterExpression(session, metadata, id, BigintType.BIGINT, symbol.toSymbolReference());
+        return createDynamicFilterExpression(metadata, id, BigintType.BIGINT, symbol.toSymbolReference());
     }
 
     private TableHandle tableHandle(String tableName)
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestWindow.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestWindow.java
index 4389be542e2a..dbb6e7561cdb 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestWindow.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestWindow.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
 import io.trino.sql.planner.assertions.BasePlanTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -39,6 +39,7 @@
 import static io.trino.sql.planner.assertions.PlanMatchPattern.topNRanking;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.window;
 import static io.trino.sql.planner.plan.AggregationNode.Step.FINAL;
+import static io.trino.sql.planner.plan.AggregationNode.Step.PARTIAL;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.LOCAL;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.REMOTE;
 import static io.trino.sql.planner.plan.ExchangeNode.Type.GATHER;
@@ -60,13 +61,13 @@ public void testWindow()
                         window(pattern -> pattern
                                         .specification(specification(ImmutableList.of("orderkey"), ImmutableList.of(), ImmutableMap.of()))
                                         .addFunction(functionCall("rank", Optional.empty(), ImmutableList.of())),
-                                project(tableScan("orders", ImmutableMap.of("orderkey", "orderkey"))))));
+                                tableScan("orders", ImmutableMap.of("orderkey", "orderkey")))));
 
         assertDistributedPlan("SELECT row_number() OVER (PARTITION BY orderkey) FROM orders",
                 anyTree(
                         rowNumber(pattern -> pattern
                                         .partitionBy(ImmutableList.of("orderkey")),
-                                project(tableScan("orders", ImmutableMap.of("orderkey", "orderkey"))))));
+                                tableScan("orders", ImmutableMap.of("orderkey", "orderkey")))));
 
         assertDistributedPlan("SELECT orderkey FROM (SELECT orderkey, row_number() OVER (PARTITION BY orderkey ORDER BY custkey) n FROM orders) WHERE n = 1",
                 anyTree(
@@ -75,7 +76,7 @@ public void testWindow()
                                                 ImmutableList.of("orderkey"),
                                                 ImmutableList.of("custkey"),
                                                 ImmutableMap.of("custkey", ASC_NULLS_LAST)),
-                                project(tableScan("orders", ImmutableMap.of("orderkey", "orderkey", "custkey", "custkey"))))));
+                                tableScan("orders", ImmutableMap.of("orderkey", "orderkey", "custkey", "custkey")))));
 
         // Window partition key is not pre-bucketed.
         assertDistributedPlan("SELECT rank() OVER (PARTITION BY orderstatus) FROM orders",
@@ -85,7 +86,7 @@ public void testWindow()
                                         .addFunction(functionCall("rank", Optional.empty(), ImmutableList.of())),
                                 exchange(LOCAL, GATHER,
                                         exchange(REMOTE, REPARTITION,
-                                                project(tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus"))))))));
+                                                tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus")))))));
 
         assertDistributedPlan("SELECT row_number() OVER (PARTITION BY orderstatus) FROM orders",
                 anyTree(
@@ -93,7 +94,7 @@ public void testWindow()
                                         .partitionBy(ImmutableList.of("orderstatus")),
                                 exchange(LOCAL, GATHER,
                                         exchange(REMOTE, REPARTITION,
-                                                project(tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus"))))))));
+                                                tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus")))))));
 
         assertDistributedPlan("SELECT orderstatus FROM (SELECT orderstatus, row_number() OVER (PARTITION BY orderstatus ORDER BY custkey) n FROM orders) WHERE n = 1",
                 anyTree(
@@ -111,7 +112,7 @@ public void testWindow()
                                                                         ImmutableList.of("custkey"),
                                                                         ImmutableMap.of("custkey", ASC_NULLS_LAST))
                                                                 .partial(true),
-                                                        project(tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus", "custkey", "custkey")))))))));
+                                                        tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus", "custkey", "custkey"))))))));
     }
 
     @Test
@@ -130,17 +131,16 @@ public void testWindowAfterJoin()
                                         .specification(specification(ImmutableList.of("orderstatus", "orderkey"), ImmutableList.of(), ImmutableMap.of()))
                                         .addFunction(functionCall("rank", Optional.empty(), ImmutableList.of())),
                                 exchange(LOCAL, GATHER,
-                                        project(
-                                                join(INNER, builder -> builder
-                                                        .equiCriteria("orderstatus", "linestatus")
-                                                        .distributionType(PARTITIONED)
-                                                        .left(
+                                        join(INNER, builder -> builder
+                                                .equiCriteria("orderstatus", "linestatus")
+                                                .distributionType(PARTITIONED)
+                                                .left(
+                                                        exchange(REMOTE, REPARTITION,
+                                                                anyTree(tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus", "orderkey", "orderkey")))))
+                                                .right(
+                                                        exchange(LOCAL, GATHER,
                                                                 exchange(REMOTE, REPARTITION,
-                                                                        anyTree(tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus", "orderkey", "orderkey")))))
-                                                        .right(
-                                                                exchange(LOCAL, GATHER,
-                                                                        exchange(REMOTE, REPARTITION,
-                                                                                anyTree(tableScan("lineitem", ImmutableMap.of("linestatus", "linestatus"))))))))))));
+                                                                        anyTree(tableScan("lineitem", ImmutableMap.of("linestatus", "linestatus")))))))))));
 
         // Window partition key is not a super set of join key.
         assertDistributedPlan("SELECT rank() OVER (PARTITION BY o.orderkey) FROM orders o JOIN lineitem l ON o.orderstatus = l.linestatus",
@@ -151,17 +151,16 @@ public void testWindowAfterJoin()
                                         .addFunction(functionCall("rank", Optional.empty(), ImmutableList.of())),
                                 exchange(LOCAL, GATHER,
                                         exchange(REMOTE, REPARTITION,
-                                                anyTree(
-                                                        join(INNER, builder -> builder
-                                                                .equiCriteria("orderstatus", "linestatus")
-                                                                .distributionType(PARTITIONED)
-                                                                .left(
+                                                join(INNER, builder -> builder
+                                                        .equiCriteria("orderstatus", "linestatus")
+                                                        .distributionType(PARTITIONED)
+                                                        .left(
+                                                                exchange(REMOTE, REPARTITION,
+                                                                        anyTree(tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus", "orderkey", "orderkey")))))
+                                                        .right(
+                                                                exchange(LOCAL, GATHER,
                                                                         exchange(REMOTE, REPARTITION,
-                                                                                anyTree(tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus", "orderkey", "orderkey")))))
-                                                                .right(
-                                                                        exchange(LOCAL, GATHER,
-                                                                                exchange(REMOTE, REPARTITION,
-                                                                                        anyTree(tableScan("lineitem", ImmutableMap.of("linestatus", "linestatus")))))))))))));
+                                                                                anyTree(tableScan("lineitem", ImmutableMap.of("linestatus", "linestatus"))))))))))));
 
         // Test broadcast join
         Session broadcastJoin = Session.builder(disableCbo)
@@ -175,16 +174,15 @@ public void testWindowAfterJoin()
                                         .addFunction(functionCall("rank", Optional.empty(), ImmutableList.of())),
                                 exchange(LOCAL, GATHER,
                                         exchange(REMOTE, REPARTITION,
-                                                project(
-                                                        join(INNER, builder -> builder
-                                                                .equiCriteria("orderstatus", "linestatus")
-                                                                .distributionType(REPLICATED)
-                                                                .left(
-                                                                        anyTree(tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus", "custkey", "custkey"))))
-                                                                .right(
-                                                                        exchange(LOCAL, GATHER,
-                                                                                exchange(REMOTE, REPLICATE,
-                                                                                        anyTree(tableScan("lineitem", ImmutableMap.of("linestatus", "linestatus")))))))))))));
+                                                join(INNER, builder -> builder
+                                                        .equiCriteria("orderstatus", "linestatus")
+                                                        .distributionType(REPLICATED)
+                                                        .left(
+                                                                anyTree(tableScan("orders", ImmutableMap.of("orderstatus", "orderstatus", "custkey", "custkey"))))
+                                                        .right(
+                                                                exchange(LOCAL, GATHER,
+                                                                        exchange(REMOTE, REPLICATE,
+                                                                                anyTree(tableScan("lineitem", ImmutableMap.of("linestatus", "linestatus"))))))))))));
     }
 
     @Test
@@ -196,10 +194,11 @@ public void testWindowAfterAggregation()
                         window(pattern -> pattern
                                         .specification(specification(ImmutableList.of("custkey"), ImmutableList.of(), ImmutableMap.of()))
                                         .addFunction(functionCall("rank", Optional.empty(), ImmutableList.of())),
-                                project(aggregation(singleGroupingSet("custkey"), ImmutableMap.of(), Optional.empty(), FINAL,
+                                aggregation(singleGroupingSet("custkey"), ImmutableMap.of(), Optional.empty(), FINAL,
                                         exchange(LOCAL, GATHER,
-                                                project(exchange(REMOTE, REPARTITION,
-                                                        anyTree(tableScan("orders", ImmutableMap.of("custkey", "custkey")))))))))));
+                                                exchange(REMOTE, REPARTITION,
+                                                        aggregation(singleGroupingSet("custkey"), ImmutableMap.of(), Optional.empty(), PARTIAL,
+                                                                tableScan("orders", ImmutableMap.of("custkey", "custkey")))))))));
 
         // Window partition key is not a super set of group by key.
         assertDistributedPlan("SELECT rank() OVER (partition by custkey) FROM (SELECT shippriority, custkey, sum(totalprice) FROM orders GROUP BY shippriority, custkey)",
@@ -207,10 +206,11 @@ public void testWindowAfterAggregation()
                         window(pattern -> pattern
                                         .specification(specification(ImmutableList.of("custkey"), ImmutableList.of(), ImmutableMap.of()))
                                         .addFunction(functionCall("rank", Optional.empty(), ImmutableList.of())),
-                                project(aggregation(singleGroupingSet("shippriority", "custkey"), ImmutableMap.of(), Optional.empty(), FINAL,
-                                        exchange(LOCAL, GATHER,
-                                                project(
+                                project(
+                                        aggregation(singleGroupingSet("shippriority", "custkey"), ImmutableMap.of(), Optional.empty(), FINAL,
+                                                exchange(LOCAL, GATHER,
                                                         exchange(REMOTE, REPARTITION,
-                                                                anyTree(tableScan("orders", ImmutableMap.of("custkey", "custkey", "shippriority", "shippriority")))))))))));
+                                                                aggregation(singleGroupingSet("shippriority", "custkey"), ImmutableMap.of(), Optional.empty(), PARTIAL,
+                                                                        tableScan("orders", ImmutableMap.of("custkey", "custkey", "shippriority", "shippriority"))))))))));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestWindowFilterPushDown.java b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestWindowFilterPushDown.java
index ff9d39c34d86..94d1701e1445 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestWindowFilterPushDown.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestWindowFilterPushDown.java
@@ -23,7 +23,7 @@
 import io.trino.sql.planner.plan.TopNRankingNode.RankingType;
 import io.trino.sql.planner.plan.WindowNode;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/plan/TestPatternRecognitionNodeSerialization.java b/core/trino-main/src/test/java/io/trino/sql/planner/plan/TestPatternRecognitionNodeSerialization.java
index d4058ee2cbb0..0d0fe06874dd 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/plan/TestPatternRecognitionNodeSerialization.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/plan/TestPatternRecognitionNodeSerialization.java
@@ -47,11 +47,10 @@
 import io.trino.sql.tree.SymbolReference;
 import io.trino.type.TypeDeserializer;
 import io.trino.type.TypeSignatureKeyDeserializer;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
-import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.metadata.MetadataManager.createTestMetadataManager;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -94,7 +93,7 @@ public void testAggregationValuePointerRoundtrip()
                 TypeSignature.class, new TypeSignatureKeyDeserializer()));
         JsonCodec<ValuePointer> codec = new JsonCodecFactory(provider).jsonCodec(ValuePointer.class);
 
-        ResolvedFunction countFunction = createTestMetadataManager().resolveFunction(TEST_SESSION, QualifiedName.of("count"), ImmutableList.of());
+        ResolvedFunction countFunction = createTestMetadataManager().resolveBuiltinFunction("count", ImmutableList.of());
         assertJsonRoundTrip(codec, new AggregationValuePointer(
                 countFunction,
                 new AggregatedSetDescriptor(ImmutableSet.of(), false),
@@ -102,7 +101,7 @@ public void testAggregationValuePointerRoundtrip()
                 new Symbol("classifier"),
                 new Symbol("match_number")));
 
-        ResolvedFunction maxFunction = createTestMetadataManager().resolveFunction(TEST_SESSION, QualifiedName.of("max"), fromTypes(BIGINT));
+        ResolvedFunction maxFunction = createTestMetadataManager().resolveBuiltinFunction("max", fromTypes(BIGINT));
         assertJsonRoundTrip(codec, new AggregationValuePointer(
                 maxFunction,
                 new AggregatedSetDescriptor(ImmutableSet.of(new IrLabel("A"), new IrLabel("B")), true),
@@ -189,7 +188,7 @@ public void testPatternRecognitionNodeRoundtrip()
                 TypeSignature.class, new TypeSignatureKeyDeserializer()));
         JsonCodec<PatternRecognitionNode> codec = new JsonCodecFactory(provider).jsonCodec(PatternRecognitionNode.class);
 
-        ResolvedFunction rankFunction = createTestMetadataManager().resolveFunction(TEST_SESSION, QualifiedName.of("rank"), ImmutableList.of());
+        ResolvedFunction rankFunction = createTestMetadataManager().resolveBuiltinFunction("rank", ImmutableList.of());
 
         // test remaining fields inside PatternRecognitionNode specific to pattern recognition:
         // windowFunctions, measures, commonBaseFrame, rowsPerMatch, skipToLabel, skipToPosition, initial, pattern, subsets, variableDefinitions
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/plan/TestStatisticAggregationsDescriptor.java b/core/trino-main/src/test/java/io/trino/sql/planner/plan/TestStatisticAggregationsDescriptor.java
index 9b01839136ac..463f1f6ba56b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/plan/TestStatisticAggregationsDescriptor.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/plan/TestStatisticAggregationsDescriptor.java
@@ -21,7 +21,7 @@
 import io.trino.spi.statistics.ColumnStatisticType;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.SymbolAllocator;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.statistics.TableStatisticType.ROW_COUNT;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/plan/TestWindowNode.java b/core/trino-main/src/test/java/io/trino/sql/planner/plan/TestWindowNode.java
index 7013458d89ef..a8b191cf46ab 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/plan/TestWindowNode.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/plan/TestWindowNode.java
@@ -31,13 +31,11 @@
 import io.trino.sql.planner.SymbolAllocator;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FrameBound;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.WindowFrame;
 import io.trino.type.TypeDeserializer;
 import io.trino.type.TypeSignatureDeserializer;
 import io.trino.type.TypeSignatureKeyDeserializer;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Optional;
@@ -51,12 +49,6 @@
 public class TestWindowNode
 {
     private final TestingFunctionResolution functionResolution;
-    private SymbolAllocator symbolAllocator;
-    private ValuesNode sourceNode;
-    private Symbol columnA;
-    private Symbol columnB;
-    private Symbol columnC;
-
     private final ObjectMapper objectMapper;
 
     public TestWindowNode()
@@ -77,26 +69,22 @@ Expression.class, new ExpressionDeserializer(sqlParser),
         objectMapper = provider.get();
     }
 
-    @BeforeClass
-    public void setUp()
+    @Test
+    public void testSerializationRoundtrip()
+            throws Exception
     {
-        symbolAllocator = new SymbolAllocator();
-        columnA = symbolAllocator.newSymbol("a", BIGINT);
-        columnB = symbolAllocator.newSymbol("b", BIGINT);
-        columnC = symbolAllocator.newSymbol("c", BIGINT);
+        SymbolAllocator symbolAllocator = new SymbolAllocator();
+        Symbol columnA = symbolAllocator.newSymbol("a", BIGINT);
+        Symbol columnB = symbolAllocator.newSymbol("b", BIGINT);
+        Symbol columnC = symbolAllocator.newSymbol("c", BIGINT);
 
-        sourceNode = new ValuesNode(
+        ValuesNode sourceNode = new ValuesNode(
                 newId(),
                 ImmutableList.of(columnA, columnB, columnC),
                 ImmutableList.of());
-    }
 
-    @Test
-    public void testSerializationRoundtrip()
-            throws Exception
-    {
         Symbol windowSymbol = symbolAllocator.newSymbol("sum", BIGINT);
-        ResolvedFunction resolvedFunction = functionResolution.resolveFunction(QualifiedName.of("sum"), fromTypes(BIGINT));
+        ResolvedFunction resolvedFunction = functionResolution.resolveFunction("sum", fromTypes(BIGINT));
         WindowNode.Frame frame = new WindowNode.Frame(
                 WindowFrame.Type.RANGE,
                 FrameBound.Type.UNBOUNDED_PRECEDING,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestAnonymizeJsonRepresentation.java b/core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestAnonymizeJsonRepresentation.java
index d1ff59d2b0e1..65f0e6215fbf 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestAnonymizeJsonRepresentation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestAnonymizeJsonRepresentation.java
@@ -34,9 +34,10 @@
 import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Optional;
@@ -58,7 +59,9 @@
 import static io.trino.sql.planner.planprinter.JsonRenderer.JsonRenderedNode;
 import static io.trino.sql.planner.planprinter.NodeRepresentation.TypedSymbol.typedSymbol;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestAnonymizeJsonRepresentation
 {
     private static final JsonCodec<JsonRenderedNode> JSON_RENDERED_NODE_CODEC = jsonCodec(JsonRenderedNode.class);
@@ -78,14 +81,14 @@ TEST_COLUMN_HANDLE_B, multipleValues(BIGINT, ImmutableList.of(1L, 2L, 3L)),
 
     private LocalQueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         queryRunner = LocalQueryRunner.create(TEST_SESSION);
         queryRunner.createCatalog(TEST_SESSION.getCatalog().get(), new TpchConnectorFactory(1), ImmutableMap.of());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
@@ -229,18 +232,21 @@ private static JsonRenderedNode valuesRepresentation(String id, List<NodeReprese
 
     private void assertAnonymizedRepresentation(Function<PlanBuilder, PlanNode> sourceNodeSupplier, JsonRenderedNode expectedRepresentation)
     {
-        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), queryRunner.getMetadata(), queryRunner.getDefaultSession());
-        ValuePrinter valuePrinter = new ValuePrinter(queryRunner.getMetadata(), queryRunner.getFunctionManager(), queryRunner.getDefaultSession());
-        String jsonRenderedNode = new PlanPrinter(
-                sourceNodeSupplier.apply(planBuilder),
-                planBuilder.getTypes(),
-                scanNode -> TABLE_INFO,
-                ImmutableMap.of(),
-                valuePrinter,
-                StatsAndCosts.empty(),
-                Optional.empty(),
-                new CounterBasedAnonymizer())
-                .toJson();
-        assertThat(jsonRenderedNode).isEqualTo(JSON_RENDERED_NODE_CODEC.toJson(expectedRepresentation));
+        queryRunner.inTransaction(session -> {
+            PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), queryRunner.getPlannerContext(), session);
+            ValuePrinter valuePrinter = new ValuePrinter(queryRunner.getMetadata(), queryRunner.getFunctionManager(), session);
+            String jsonRenderedNode = new PlanPrinter(
+                    sourceNodeSupplier.apply(planBuilder),
+                    planBuilder.getTypes(),
+                    scanNode -> TABLE_INFO,
+                    ImmutableMap.of(),
+                    valuePrinter,
+                    StatsAndCosts.empty(),
+                    Optional.empty(),
+                    new CounterBasedAnonymizer())
+                    .toJson();
+            assertThat(jsonRenderedNode).isEqualTo(JSON_RENDERED_NODE_CODEC.toJson(expectedRepresentation));
+            return null;
+        });
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestJsonRepresentation.java b/core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestJsonRepresentation.java
index 74c42ca9dd51..e784bae71ddf 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestJsonRepresentation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestJsonRepresentation.java
@@ -30,9 +30,10 @@
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Map;
@@ -55,7 +56,9 @@
 import static io.trino.sql.planner.planprinter.NodeRepresentation.TypedSymbol.typedSymbol;
 import static io.trino.testing.MaterializedResult.resultBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestJsonRepresentation
 {
     private static final JsonCodec<Map<String, JsonRenderedNode>> DISTRIBUTED_PLAN_JSON_CODEC = mapJsonCodec(String.class, JsonRenderedNode.class);
@@ -67,14 +70,14 @@ public class TestJsonRepresentation
 
     private LocalQueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         queryRunner = LocalQueryRunner.create(TEST_SESSION);
         queryRunner.createCatalog(TEST_SESSION.getCatalog().get(), new TpchConnectorFactory(1), ImmutableMap.of());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
@@ -101,7 +104,7 @@ public void testDistributedJsonPlan()
                                 ImmutableList.of(),
                                 ImmutableList.of(new PlanNodeStatsAndCostSummary(10, 90, 90, 0, 0)),
                                 ImmutableList.of(new JsonRenderedNode(
-                                        "149",
+                                        "147",
                                         "LocalExchange",
                                         ImmutableMap.of(
                                                 "partitioning", "SINGLE",
@@ -144,7 +147,7 @@ public void testLogicalJsonPlan()
                         ImmutableList.of(),
                         ImmutableList.of(new PlanNodeStatsAndCostSummary(10, 90, 90, 0, 0)),
                         ImmutableList.of(new JsonRenderedNode(
-                                "149",
+                                "147",
                                 "LocalExchange",
                                 ImmutableMap.of(
                                         "partitioning", "SINGLE",
@@ -206,14 +209,14 @@ public void testJoinPlan()
                         ImmutableList.of(new JoinNode.EquiJoinClause(pb.symbol("a", BIGINT), pb.symbol("d", BIGINT))),
                         ImmutableList.of(pb.symbol("b", BIGINT)),
                         ImmutableList.of(),
-                        Optional.empty(),
+                        Optional.of(expression("a < c")),
                         Optional.empty(),
                         Optional.empty(),
                         ImmutableMap.of(new DynamicFilterId("DF"), pb.symbol("d", BIGINT))),
                 new JsonRenderedNode(
                         "2",
                         "InnerJoin",
-                        ImmutableMap.of("criteria", "(\"a\" = \"d\")", "hash", "[]"),
+                        ImmutableMap.of("criteria", "(\"a\" = \"d\")", "filter", "(\"a\" < \"c\")", "hash", "[]"),
                         ImmutableList.of(typedSymbol("b", "bigint")),
                         ImmutableList.of("dynamicFilterAssignments = {d -> #DF}"),
                         ImmutableList.of(),
@@ -258,18 +261,21 @@ private static JsonRenderedNode valuesRepresentation(String id, List<TypedSymbol
 
     private void assertJsonRepresentation(Function<PlanBuilder, PlanNode> sourceNodeSupplier, JsonRenderedNode expectedRepresentation)
     {
-        PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), queryRunner.getMetadata(), queryRunner.getDefaultSession());
-        ValuePrinter valuePrinter = new ValuePrinter(queryRunner.getMetadata(), queryRunner.getFunctionManager(), queryRunner.getDefaultSession());
-        String jsonRenderedNode = new PlanPrinter(
-                sourceNodeSupplier.apply(planBuilder),
-                planBuilder.getTypes(),
-                scanNode -> TABLE_INFO,
-                ImmutableMap.of(),
-                valuePrinter,
-                StatsAndCosts.empty(),
-                Optional.empty(),
-                new NoOpAnonymizer())
-                .toJson();
-        assertThat(jsonRenderedNode).isEqualTo(JSON_RENDERED_NODE_CODEC.toJson(expectedRepresentation));
+        queryRunner.inTransaction(transactionSession -> {
+            PlanBuilder planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), queryRunner.getPlannerContext(), transactionSession);
+            ValuePrinter valuePrinter = new ValuePrinter(queryRunner.getMetadata(), queryRunner.getFunctionManager(), transactionSession);
+            String jsonRenderedNode = new PlanPrinter(
+                    sourceNodeSupplier.apply(planBuilder),
+                    planBuilder.getTypes(),
+                    scanNode -> TABLE_INFO,
+                    ImmutableMap.of(),
+                    valuePrinter,
+                    StatsAndCosts.empty(),
+                    Optional.empty(),
+                    new NoOpAnonymizer())
+                    .toJson();
+            assertThat(jsonRenderedNode).isEqualTo(JSON_RENDERED_NODE_CODEC.toJson(expectedRepresentation));
+            return null;
+        });
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestWindowOperatorStats.java b/core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestWindowOperatorStats.java
index a1ebf452a7e5..c1c18c2a9b62 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestWindowOperatorStats.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestWindowOperatorStats.java
@@ -14,7 +14,7 @@
 package io.trino.sql.planner.planprinter;
 
 import io.trino.operator.WindowInfo;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/rowpattern/TestIrRowPatternOptimization.java b/core/trino-main/src/test/java/io/trino/sql/planner/rowpattern/TestIrRowPatternOptimization.java
index 8cebd857eac3..6757118da945 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/rowpattern/TestIrRowPatternOptimization.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/rowpattern/TestIrRowPatternOptimization.java
@@ -14,7 +14,7 @@
 package io.trino.sql.planner.rowpattern;
 
 import io.trino.sql.planner.rowpattern.ir.IrRowPattern;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/rowpattern/TestRowPatternSerialization.java b/core/trino-main/src/test/java/io/trino/sql/planner/rowpattern/TestRowPatternSerialization.java
index a811b87fa072..9feb01d060a0 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/rowpattern/TestRowPatternSerialization.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/rowpattern/TestRowPatternSerialization.java
@@ -18,7 +18,7 @@
 import io.airlift.json.ObjectMapperProvider;
 import io.trino.sql.planner.rowpattern.ir.IrQuantifier;
 import io.trino.sql.planner.rowpattern.ir.IrRowPattern;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestDynamicFiltersChecker.java b/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestDynamicFiltersChecker.java
index 62979f8441b8..3080f36865c0 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestDynamicFiltersChecker.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestDynamicFiltersChecker.java
@@ -33,8 +33,8 @@
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.testing.TestingTransactionHandle;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -59,12 +59,12 @@ public class TestDynamicFiltersChecker
     private TableScanNode ordersTableScanNode;
     private PlannerContext plannerContext;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         plannerContext = getQueryRunner().getPlannerContext();
         metadata = plannerContext.getMetadata();
-        builder = new PlanBuilder(new PlanNodeIdAllocator(), metadata, TEST_SESSION);
+        builder = new PlanBuilder(new PlanNodeIdAllocator(), plannerContext, TEST_SESSION);
         CatalogHandle catalogHandle = getCurrentCatalogHandle();
         TableHandle lineitemTableHandle = new TableHandle(
                 catalogHandle,
@@ -106,10 +106,10 @@ public void testDynamicFilterConsumedOnBuildSide()
         PlanNode root = builder.join(
                 INNER,
                 builder.filter(
-                        createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference()),
+                        createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference()),
                         ordersTableScanNode),
                 builder.filter(
-                        createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference()),
+                        createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference()),
                         lineitemTableScanNode),
                 ImmutableList.of(new JoinNode.EquiJoinClause(ordersOrderKeySymbol, lineitemOrderKeySymbol)),
                 ImmutableList.of(ordersOrderKeySymbol),
@@ -136,7 +136,7 @@ public void testUnmatchedDynamicFilter()
                                 combineConjuncts(
                                         metadata,
                                         expression("LINEITEM_OK > 0"),
-                                        createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
+                                        createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
                                 lineitemTableScanNode),
                         ImmutableList.of(new JoinNode.EquiJoinClause(ordersOrderKeySymbol, lineitemOrderKeySymbol)),
                         ImmutableList.of(ordersOrderKeySymbol),
@@ -162,7 +162,7 @@ public void testDynamicFilterNotAboveTableScan()
                                 combineConjuncts(
                                         metadata,
                                         expression("LINEITEM_OK > 0"),
-                                        createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference())),
+                                        createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference())),
                                 builder.values(lineitemOrderKeySymbol)),
                         ordersTableScanNode,
                         ImmutableList.of(new JoinNode.EquiJoinClause(lineitemOrderKeySymbol, ordersOrderKeySymbol)),
@@ -192,11 +192,11 @@ public void testUnmatchedNestedDynamicFilter()
                                         combineDisjuncts(
                                                 metadata,
                                                 expression("LINEITEM_OK IS NULL"),
-                                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
+                                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
                                         combineDisjuncts(
                                                 metadata,
                                                 expression("LINEITEM_OK IS NOT NULL"),
-                                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference()))),
+                                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference()))),
                                 lineitemTableScanNode),
                         ImmutableList.of(new JoinNode.EquiJoinClause(ordersOrderKeySymbol, lineitemOrderKeySymbol)),
                         ImmutableList.of(ordersOrderKeySymbol),
@@ -217,7 +217,7 @@ public void testUnsupportedDynamicFilterExpression()
                 builder.join(
                         INNER,
                         builder.filter(
-                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, expression("LINEITEM_OK + BIGINT'1'")),
+                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, expression("LINEITEM_OK + BIGINT'1'")),
                                 lineitemTableScanNode),
                         ordersTableScanNode,
                         ImmutableList.of(new JoinNode.EquiJoinClause(lineitemOrderKeySymbol, ordersOrderKeySymbol)),
@@ -239,7 +239,7 @@ public void testUnsupportedCastExpression()
                 builder.join(
                         INNER,
                         builder.filter(
-                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, expression("CAST(CAST(LINEITEM_OK AS INT) AS BIGINT)")),
+                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, expression("CAST(CAST(LINEITEM_OK AS INT) AS BIGINT)")),
                                 lineitemTableScanNode),
                         ordersTableScanNode,
                         ImmutableList.of(new JoinNode.EquiJoinClause(lineitemOrderKeySymbol, ordersOrderKeySymbol)),
@@ -278,13 +278,13 @@ public void testDynamicFilterConsumedOnFilteringSourceSideInSemiJoin()
                         combineConjuncts(
                                 metadata,
                                 expression("ORDERS_OK > 0"),
-                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
+                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
                         ordersTableScanNode),
                 builder.filter(
                         combineConjuncts(
                                 metadata,
                                 expression("LINEITEM_OK > 0"),
-                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
+                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, lineitemOrderKeySymbol.toSymbolReference())),
                         lineitemTableScanNode),
                 ordersOrderKeySymbol,
                 lineitemOrderKeySymbol,
@@ -309,7 +309,7 @@ public void testUnmatchedDynamicFilterInSemiJoin()
                                 combineConjuncts(
                                         metadata,
                                         expression("ORDERS_OK > 0"),
-                                        createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference())),
+                                        createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference())),
                                 ordersTableScanNode),
                         lineitemTableScanNode,
                         ordersOrderKeySymbol,
@@ -332,7 +332,7 @@ public void testDynamicFilterNotAboveTableScanWithSemiJoin()
                         combineConjuncts(
                                 metadata,
                                 expression("ORDERS_OK > 0"),
-                                createDynamicFilterExpression(TEST_SESSION, metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference())),
+                                createDynamicFilterExpression(metadata, new DynamicFilterId("DF"), BIGINT, ordersOrderKeySymbol.toSymbolReference())),
                         builder.values(ordersOrderKeySymbol)),
                 lineitemTableScanNode,
                 ordersOrderKeySymbol,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestValidateAggregationsWithDefaultValues.java b/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestValidateAggregationsWithDefaultValues.java
index 0eacfc45f03d..6826f3a8ab57 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestValidateAggregationsWithDefaultValues.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestValidateAggregationsWithDefaultValues.java
@@ -30,8 +30,8 @@
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.testing.TestingTransactionHandle;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -53,11 +53,11 @@ public class TestValidateAggregationsWithDefaultValues
     private Symbol symbol;
     private TableScanNode tableScanNode;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         plannerContext = getQueryRunner().getPlannerContext();
-        builder = new PlanBuilder(new PlanNodeIdAllocator(), plannerContext.getMetadata(), TEST_SESSION);
+        builder = new PlanBuilder(new PlanNodeIdAllocator(), plannerContext, TEST_SESSION);
         CatalogHandle catalogHandle = getCurrentCatalogHandle();
         TableHandle nationTableHandle = new TableHandle(
                 catalogHandle,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestValidateScaledWritersUsage.java b/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestValidateScaledWritersUsage.java
index e56002badcde..5063fe6b30f5 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestValidateScaledWritersUsage.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestValidateScaledWritersUsage.java
@@ -24,6 +24,7 @@
 import io.trino.spi.connector.ConnectorPartitioningHandle;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.sql.PlannerContext;
 import io.trino.sql.planner.Partitioning;
 import io.trino.sql.planner.PartitioningHandle;
@@ -33,6 +34,7 @@
 import io.trino.sql.planner.TypeProvider;
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
+import io.trino.sql.planner.plan.ExchangeNode;
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.testing.LocalQueryRunner;
@@ -62,23 +64,20 @@ public class TestValidateScaledWritersUsage
     private PlanBuilder planBuilder;
     private Symbol symbol;
     private TableScanNode tableScanNode;
-    private CatalogHandle catalogSupportingScaledWriters;
-    private CatalogHandle catalogNotSupportingScaledWriters;
+    private CatalogHandle catalog;
     private SchemaTableName schemaTableName;
 
     @BeforeClass
     public void setup()
     {
         schemaTableName = new SchemaTableName("any", "any");
-        catalogSupportingScaledWriters = createTestCatalogHandle("bytes_written_reported");
-        catalogNotSupportingScaledWriters = createTestCatalogHandle("no_bytes_written_reported");
+        catalog = createTestCatalogHandle("catalog");
         queryRunner = LocalQueryRunner.create(TEST_SESSION);
-        queryRunner.createCatalog(catalogSupportingScaledWriters.getCatalogName(), createConnectorFactorySupportingReportingBytesWritten(true, catalogSupportingScaledWriters.getCatalogName()), ImmutableMap.of());
-        queryRunner.createCatalog(catalogNotSupportingScaledWriters.getCatalogName(), createConnectorFactorySupportingReportingBytesWritten(false, catalogNotSupportingScaledWriters.getCatalogName()), ImmutableMap.of());
+        queryRunner.createCatalog(catalog.getCatalogName(), createConnectorFactory(catalog.getCatalogName()), ImmutableMap.of());
         plannerContext = queryRunner.getPlannerContext();
-        planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), plannerContext.getMetadata(), TEST_SESSION);
+        planBuilder = new PlanBuilder(new PlanNodeIdAllocator(), plannerContext, TEST_SESSION);
         TableHandle nationTableHandle = new TableHandle(
-                catalogSupportingScaledWriters,
+                catalog,
                 new TpchTableHandle("sf1", "nation", 1.0),
                 TestingTransactionHandle.create());
         TpchColumnHandle nationkeyColumnHandle = new TpchColumnHandle("nationkey", BIGINT);
@@ -94,14 +93,12 @@ public void tearDown()
         plannerContext = null;
         planBuilder = null;
         tableScanNode = null;
-        catalogSupportingScaledWriters = null;
-        catalogNotSupportingScaledWriters = null;
+        catalog = null;
     }
 
-    private MockConnectorFactory createConnectorFactorySupportingReportingBytesWritten(boolean supportsWrittenBytes, String name)
+    private MockConnectorFactory createConnectorFactory(String name)
     {
         return MockConnectorFactory.builder()
-                .withSupportsReportingWrittenBytes(supportsWrittenBytes)
                 .withGetTableHandle(((session, schemaTableName) -> null))
                 .withName(name)
                 .build();
@@ -112,7 +109,7 @@ public void testScaledWritersUsedAndTargetSupportsIt(PartitioningHandle scaledWr
     {
         PlanNode tableWriterSource = planBuilder.exchange(ex ->
                 ex
-                        .partitioningScheme(new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))
+                        .partitioningScheme(new PartitioningScheme(Partitioning.create(scaledWriterPartitionHandle, ImmutableList.of()), ImmutableList.of(symbol)))
                         .addInputsSet(symbol)
                         .addSource(planBuilder.exchange(innerExchange ->
                                 innerExchange
@@ -122,146 +119,58 @@ public void testScaledWritersUsedAndTargetSupportsIt(PartitioningHandle scaledWr
         PlanNode root = planBuilder.output(
                 outputBuilder -> outputBuilder
                         .source(planBuilder.tableWithExchangeCreate(
-                                planBuilder.createTarget(catalogSupportingScaledWriters, schemaTableName, true, true),
+                                planBuilder.createTarget(catalog, schemaTableName, true, WriterScalingOptions.ENABLED, false),
                                 tableWriterSource,
-                                symbol,
-                                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))));
+                                symbol)));
         validatePlan(root);
     }
 
     @Test(dataProvider = "scaledWriterPartitioningHandles")
-    public void testScaledWritersUsedAndTargetDoesNotSupportReportingWrittenBytes(PartitioningHandle scaledWriterPartitionHandle)
+    public void testScaledWritersUsedAndTargetDoesNotSupportScalingPerTask(PartitioningHandle scaledWriterPartitionHandle)
     {
         PlanNode tableWriterSource = planBuilder.exchange(ex ->
                 ex
-                        .partitioningScheme(new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))
+                        .partitioningScheme(new PartitioningScheme(Partitioning.create(scaledWriterPartitionHandle, ImmutableList.of()), ImmutableList.of(symbol)))
                         .addInputsSet(symbol)
                         .addSource(planBuilder.exchange(innerExchange ->
                                 innerExchange
+                                        .scope(ExchangeNode.Scope.LOCAL)
                                         .partitioningScheme(new PartitioningScheme(Partitioning.create(scaledWriterPartitionHandle, ImmutableList.of()), ImmutableList.of(symbol)))
                                         .addInputsSet(symbol)
                                         .addSource(tableScanNode))));
         PlanNode root = planBuilder.output(
                 outputBuilder -> outputBuilder
                         .source(planBuilder.tableWithExchangeCreate(
-                                planBuilder.createTarget(catalogNotSupportingScaledWriters, schemaTableName, false, true),
-                                tableWriterSource,
-                                symbol,
-                                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))));
-        assertThatThrownBy(() -> validatePlan(root))
-                .isInstanceOf(IllegalStateException.class)
-                .hasMessage("The scaled writer partitioning scheme is set but writer target no_bytes_written_reported:INSTANCE doesn't support reporting physical written bytes");
-    }
-
-    @Test(dataProvider = "scaledWriterPartitioningHandles")
-    public void testScaledWritersWithMultipleSourceExchangesAndTargetDoesNotSupportReportingWrittenBytes(PartitioningHandle scaledWriterPartitionHandle)
-    {
-        PlanNode tableWriterSource = planBuilder.exchange(ex ->
-                ex
-                        .partitioningScheme(new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol, symbol)))
-                        .addInputsSet(symbol, symbol)
-                        .addInputsSet(symbol, symbol)
-                        .addSource(planBuilder.exchange(innerExchange ->
-                                innerExchange
-                                        .partitioningScheme(new PartitioningScheme(Partitioning.create(scaledWriterPartitionHandle, ImmutableList.of()), ImmutableList.of(symbol)))
-                                        .addInputsSet(symbol)
-                                        .addSource(tableScanNode)))
-                        .addSource(planBuilder.exchange(innerExchange ->
-                                innerExchange
-                                        .partitioningScheme(new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))
-                                        .addInputsSet(symbol)
-                                        .addSource(tableScanNode))));
-        PlanNode root = planBuilder.output(
-                outputBuilder -> outputBuilder
-                        .source(planBuilder.tableWithExchangeCreate(
-                                planBuilder.createTarget(catalogNotSupportingScaledWriters, schemaTableName, false, true),
+                                planBuilder.createTarget(catalog, schemaTableName, true, new WriterScalingOptions(true, false), false),
                                 tableWriterSource,
-                                symbol,
-                                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))));
+                                symbol)));
         assertThatThrownBy(() -> validatePlan(root))
                 .isInstanceOf(IllegalStateException.class)
-                .hasMessage("The scaled writer partitioning scheme is set but writer target no_bytes_written_reported:INSTANCE doesn't support reporting physical written bytes");
+                .hasMessage("The scaled writer per task partitioning scheme is set but writer target catalog:INSTANCE doesn't support it");
     }
 
     @Test(dataProvider = "scaledWriterPartitioningHandles")
-    public void testScaledWritersWithMultipleSourceExchangesAndTargetSupportIt(PartitioningHandle scaledWriterPartitionHandle)
+    public void testScaledWritersUsedAndTargetDoesNotSupportScalingAcrossTasks(PartitioningHandle scaledWriterPartitionHandle)
     {
         PlanNode tableWriterSource = planBuilder.exchange(ex ->
                 ex
-                        .partitioningScheme(new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol, symbol)))
-                        .addInputsSet(symbol, symbol)
-                        .addInputsSet(symbol, symbol)
-                        .addSource(planBuilder.exchange(innerExchange ->
-                                innerExchange
-                                        .partitioningScheme(new PartitioningScheme(Partitioning.create(scaledWriterPartitionHandle, ImmutableList.of()), ImmutableList.of(symbol)))
-                                        .addInputsSet(symbol)
-                                        .addSource(tableScanNode)))
-                        .addSource(planBuilder.exchange(innerExchange ->
-                                innerExchange
-                                        .partitioningScheme(new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))
-                                        .addInputsSet(symbol)
-                                        .addSource(tableScanNode))));
-        PlanNode root = planBuilder.output(
-                outputBuilder -> outputBuilder
-                        .source(planBuilder.tableWithExchangeCreate(
-                                planBuilder.createTarget(catalogSupportingScaledWriters, schemaTableName, true, true),
-                                tableWriterSource,
-                                symbol,
-                                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))));
-        validatePlan(root);
-    }
-
-    @Test(dataProvider = "scaledWriterPartitioningHandles")
-    public void testScaledWritersUsedAboveTableWriterInThePlanTree(PartitioningHandle scaledWriterPartitionHandle)
-    {
-        PlanNode tableWriterSource = planBuilder.exchange(ex ->
-                ex
-                        .partitioningScheme(new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))
+                        .partitioningScheme(new PartitioningScheme(Partitioning.create(scaledWriterPartitionHandle, ImmutableList.of()), ImmutableList.of(symbol)))
                         .addInputsSet(symbol)
                         .addSource(planBuilder.exchange(innerExchange ->
                                 innerExchange
-                                        .partitioningScheme(new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))
+                                        .scope(ExchangeNode.Scope.REMOTE)
+                                        .partitioningScheme(new PartitioningScheme(Partitioning.create(scaledWriterPartitionHandle, ImmutableList.of()), ImmutableList.of(symbol)))
                                         .addInputsSet(symbol)
                                         .addSource(tableScanNode))));
         PlanNode root = planBuilder.output(
                 outputBuilder -> outputBuilder
                         .source(planBuilder.tableWithExchangeCreate(
-                                planBuilder.createTarget(catalogNotSupportingScaledWriters, schemaTableName, false, true),
+                                planBuilder.createTarget(catalog, schemaTableName, true, new WriterScalingOptions(false, true), false),
                                 tableWriterSource,
-                                symbol,
-                                new PartitioningScheme(Partitioning.create(scaledWriterPartitionHandle, ImmutableList.of()), ImmutableList.of(symbol)))));
-        validatePlan(root);
-    }
-
-    @Test(dataProvider = "scaledWriterPartitioningHandles")
-    public void testScaledWritersTwoTableWritersNodes(PartitioningHandle scaledWriterPartitionHandle)
-    {
-        PlanNode tableWriterSource = planBuilder.exchange(ex ->
-                ex
-                        .partitioningScheme(new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))
-                        .addInputsSet(symbol)
-                        .addSource(planBuilder.tableWriter(
-                                ImmutableList.of(symbol),
-                                ImmutableList.of("column_a"),
-                                Optional.empty(),
-                                Optional.empty(),
-                                planBuilder.createTarget(catalogSupportingScaledWriters, schemaTableName, true, true),
-                                planBuilder.exchange(innerExchange ->
-                                        innerExchange
-                                                .partitioningScheme(new PartitioningScheme(Partitioning.create(scaledWriterPartitionHandle, ImmutableList.of()), ImmutableList.of(symbol)))
-                                                .addInputsSet(symbol)
-                                                .addSource(tableScanNode)),
                                 symbol)));
-        PlanNode root = planBuilder.output(
-                outputBuilder -> outputBuilder
-                        .source(planBuilder.tableWithExchangeCreate(
-                                planBuilder.createTarget(catalogNotSupportingScaledWriters, schemaTableName, false, true),
-                                tableWriterSource,
-                                symbol,
-                                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))));
         assertThatThrownBy(() -> validatePlan(root))
                 .isInstanceOf(IllegalStateException.class)
-                .hasMessage("The scaled writer partitioning scheme is set but writer target no_bytes_written_reported:INSTANCE doesn't support reporting physical written bytes");
+                .hasMessage("The scaled writer across tasks partitioning scheme is set but writer target catalog:INSTANCE doesn't support it");
     }
 
     @Test(dataProvider = "scaledWriterPartitioningHandles")
@@ -279,10 +188,9 @@ public void testScaledWriterUsedAndTargetDoesNotSupportMultipleWritersPerPartiti
         PlanNode root = planBuilder.output(
                 outputBuilder -> outputBuilder
                         .source(planBuilder.tableWithExchangeCreate(
-                                planBuilder.createTarget(catalogNotSupportingScaledWriters, schemaTableName, true, false),
+                                planBuilder.createTarget(catalog, schemaTableName, false, WriterScalingOptions.ENABLED, false),
                                 tableWriterSource,
-                                symbol,
-                                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))));
+                                symbol)));
 
         if (scaledWriterPartitionHandle == SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION) {
             validatePlan(root);
@@ -290,7 +198,7 @@ public void testScaledWriterUsedAndTargetDoesNotSupportMultipleWritersPerPartiti
         else {
             assertThatThrownBy(() -> validatePlan(root))
                     .isInstanceOf(IllegalStateException.class)
-                    .hasMessage("The scaled writer partitioning scheme is set for the partitioned write but writer target no_bytes_written_reported:INSTANCE doesn't support multiple writers per partition");
+                    .hasMessage("The hash scaled writer partitioning scheme is set for the partitioned write but writer target catalog:INSTANCE doesn't support multiple writers per partition");
         }
     }
 
@@ -315,10 +223,9 @@ public void testScaledWriterWithMultipleSourceExchangesAndTargetDoesNotSupportMu
         PlanNode root = planBuilder.output(
                 outputBuilder -> outputBuilder
                         .source(planBuilder.tableWithExchangeCreate(
-                                planBuilder.createTarget(catalogNotSupportingScaledWriters, schemaTableName, true, false),
+                                planBuilder.createTarget(catalog, schemaTableName, false, WriterScalingOptions.ENABLED, false),
                                 tableWriterSource,
-                                symbol,
-                                new PartitioningScheme(Partitioning.create(SINGLE_DISTRIBUTION, ImmutableList.of()), ImmutableList.of(symbol)))));
+                                symbol)));
 
         if (scaledWriterPartitionHandle == SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION) {
             validatePlan(root);
@@ -326,7 +233,7 @@ public void testScaledWriterWithMultipleSourceExchangesAndTargetDoesNotSupportMu
         else {
             assertThatThrownBy(() -> validatePlan(root))
                     .isInstanceOf(IllegalStateException.class)
-                    .hasMessage("The scaled writer partitioning scheme is set for the partitioned write but writer target no_bytes_written_reported:INSTANCE doesn't support multiple writers per partition");
+                    .hasMessage("The hash scaled writer partitioning scheme is set for the partitioned write but writer target catalog:INSTANCE doesn't support multiple writers per partition");
         }
     }
 
@@ -348,8 +255,7 @@ private void validatePlan(PlanNode root)
     {
         queryRunner.inTransaction(session -> {
             // metadata.getCatalogHandle() registers the catalog for the transaction
-            plannerContext.getMetadata().getCatalogHandle(session, catalogSupportingScaledWriters.getCatalogName());
-            plannerContext.getMetadata().getCatalogHandle(session, catalogNotSupportingScaledWriters.getCatalogName());
+            plannerContext.getMetadata().getCatalogHandle(session, catalog.getCatalogName());
             new ValidateScaledWritersUsage().validate(
                     root,
                     session,
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestValidateStreamingAggregations.java b/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestValidateStreamingAggregations.java
index be86312d5fd5..0aa0b3b28101 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestValidateStreamingAggregations.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestValidateStreamingAggregations.java
@@ -28,8 +28,8 @@
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.PlanNode;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Function;
 
@@ -46,7 +46,7 @@ public class TestValidateStreamingAggregations
     private PlanNodeIdAllocator idAllocator = new PlanNodeIdAllocator();
     private TableHandle nationTableHandle;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         plannerContext = getQueryRunner().getPlannerContext();
@@ -105,7 +105,7 @@ public void testValidateFailed()
     private void validatePlan(Function<PlanBuilder, PlanNode> planProvider)
     {
         getQueryRunner().inTransaction(session -> {
-            PlanBuilder builder = new PlanBuilder(idAllocator, plannerContext.getMetadata(), session);
+            PlanBuilder builder = new PlanBuilder(idAllocator, plannerContext, session);
             PlanNode planNode = planProvider.apply(builder);
             TypeProvider types = builder.getTypes();
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestVerifyOnlyOneOutputNode.java b/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestVerifyOnlyOneOutputNode.java
index f0740b307d5e..297f81c4a52e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestVerifyOnlyOneOutputNode.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/sanity/TestVerifyOnlyOneOutputNode.java
@@ -23,7 +23,7 @@
 import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.planner.plan.ProjectNode;
 import io.trino.sql.planner.plan.ValuesNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/QueryAssertions.java b/core/trino-main/src/test/java/io/trino/sql/query/QueryAssertions.java
index 82210783b29f..a39fdf8123fa 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/QueryAssertions.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/QueryAssertions.java
@@ -15,7 +15,6 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import io.trino.Session;
 import io.trino.execution.warnings.WarningCollector;
@@ -52,18 +51,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.testing.Assertions.assertEqualsIgnoreOrder;
 import static io.trino.cost.StatsCalculator.noopStatsCalculator;
-import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
 import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
 import static io.trino.sql.planner.assertions.PlanAssert.assertPlan;
 import static io.trino.sql.query.QueryAssertions.QueryAssert.newQueryAssert;
@@ -329,63 +323,39 @@ private QueryAssert(
 
         public QueryAssert exceptColumns(String... columnNamesToExclude)
         {
-            validateIfColumnsPresent(columnNamesToExclude);
-            checkArgument(columnNamesToExclude.length > 0, "At least one column must be excluded");
-            checkArgument(columnNamesToExclude.length < actual.getColumnNames().size(), "All columns cannot be excluded");
-            return projected(((Predicate<String>) Set.of(columnNamesToExclude)::contains).negate());
+            return new QueryAssert(
+                    runner,
+                    session,
+                    format("%s except columns %s", query, Arrays.toString(columnNamesToExclude)),
+                    actual.exceptColumns(columnNamesToExclude),
+                    ordered,
+                    skipTypesCheck,
+                    skipResultsCorrectnessCheckForPushdown);
         }
 
         public QueryAssert projected(String... columnNamesToInclude)
         {
-            validateIfColumnsPresent(columnNamesToInclude);
-            checkArgument(columnNamesToInclude.length > 0, "At least one column must be projected");
-            return projected(Set.of(columnNamesToInclude)::contains);
-        }
-
-        private QueryAssert projected(Predicate<String> columnFilter)
-        {
-            List<String> columnNames = actual.getColumnNames();
-            Map<Integer, String> columnsIndexToNameMap = new HashMap<>();
-            for (int i = 0; i < columnNames.size(); i++) {
-                String columnName = columnNames.get(i);
-                if (columnFilter.test(columnName)) {
-                    columnsIndexToNameMap.put(i, columnName);
-                }
-            }
-
             return new QueryAssert(
                     runner,
                     session,
-                    format("%s projected with %s", query, columnsIndexToNameMap.values()),
-                    new MaterializedResult(
-                            actual.getMaterializedRows().stream()
-                                    .map(row -> new MaterializedRow(
-                                            row.getPrecision(),
-                                            columnsIndexToNameMap.keySet().stream()
-                                                    .map(row::getField)
-                                                    .collect(toList()))) // values are nullable
-                                    .collect(toImmutableList()),
-                            columnsIndexToNameMap.keySet().stream()
-                                    .map(actual.getTypes()::get)
-                                    .collect(toImmutableList())),
+                    format("%s projected with %s", query, Arrays.toString(columnNamesToInclude)),
+                    actual.project(columnNamesToInclude),
                     ordered,
                     skipTypesCheck,
                     skipResultsCorrectnessCheckForPushdown);
         }
 
-        private void validateIfColumnsPresent(String... columns)
-        {
-            Set<String> columnNames = ImmutableSet.copyOf(actual.getColumnNames());
-            Arrays.stream(columns)
-                    .forEach(column -> checkArgument(columnNames.contains(column), "[%s] column is not present in %s".formatted(column, columnNames)));
-        }
-
         public QueryAssert matches(BiFunction<Session, QueryRunner, MaterializedResult> evaluator)
         {
             MaterializedResult expected = evaluator.apply(session, runner);
             return matches(expected);
         }
 
+        public QueryAssert succeeds()
+        {
+            return satisfies(actual -> {});
+        }
+
         public QueryAssert ordered()
         {
             ordered = true;
@@ -435,9 +405,9 @@ public QueryAssert matches(MaterializedResult expected)
         @CanIgnoreReturnValue
         public QueryAssert matches(PlanMatchPattern expectedPlan)
         {
-            transaction(runner.getTransactionManager(), runner.getAccessControl())
+            transaction(runner.getTransactionManager(), runner.getMetadata(), runner.getAccessControl())
                     .execute(session, session -> {
-                        Plan plan = runner.createPlan(session, query, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+                        Plan plan = runner.createPlan(session, query);
                         assertPlan(
                                 session,
                                 runner.getMetadata(),
@@ -512,9 +482,9 @@ public QueryAssert isFullyPushedDown()
         {
             checkState(!(runner instanceof LocalQueryRunner), "isFullyPushedDown() currently does not work with LocalQueryRunner");
 
-            transaction(runner.getTransactionManager(), runner.getAccessControl())
+            transaction(runner.getTransactionManager(), runner.getMetadata(), runner.getAccessControl())
                     .execute(session, session -> {
-                        Plan plan = runner.createPlan(session, query, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+                        Plan plan = runner.createPlan(session, query);
                         assertPlan(
                                 session,
                                 runner.getMetadata(),
@@ -597,9 +567,9 @@ public QueryAssert hasPlan(PlanMatchPattern expectedPlan)
 
         private QueryAssert hasPlan(PlanMatchPattern expectedPlan, Consumer<Plan> additionalPlanVerification)
         {
-            transaction(runner.getTransactionManager(), runner.getAccessControl())
+            transaction(runner.getTransactionManager(), runner.getMetadata(), runner.getAccessControl())
                     .execute(session, session -> {
-                        Plan plan = runner.createPlan(session, query, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+                        Plan plan = runner.createPlan(session, query);
                         assertPlan(
                                 session,
                                 runner.getMetadata(),
@@ -619,9 +589,9 @@ private QueryAssert hasPlan(PlanMatchPattern expectedPlan, Consumer<Plan> additi
 
         private QueryAssert verifyPlan(Consumer<Plan> planVerification)
         {
-            transaction(runner.getTransactionManager(), runner.getAccessControl())
+            transaction(runner.getTransactionManager(), runner.getMetadata(), runner.getAccessControl())
                     .execute(session, session -> {
-                        Plan plan = runner.createPlan(session, query, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+                        Plan plan = runner.createPlan(session, query);
                         planVerification.accept(plan);
                     });
 
@@ -673,54 +643,53 @@ public Result evaluate()
             if (bindings.isEmpty()) {
                 return run("VALUES ROW(%s)".formatted(expression));
             }
-            else {
-                List<Map.Entry<String, String>> entries = ImmutableList.copyOf(bindings.entrySet());
-
-                List<String> columns = entries.stream()
-                        .map(Map.Entry::getKey)
-                        .collect(toList());
-
-                List<String> values = entries.stream()
-                        .map(Map.Entry::getValue)
-                        .collect(toList());
-
-                // Evaluate the expression using two modes:
-                //  1. Avoid constant folding -> exercises the compiler and evaluation engine
-                //  2. Force constant folding -> exercises the interpreter
-
-                Result full = run("""
-                        SELECT %s
-                        FROM (
-                            VALUES ROW(%s)
-                        ) t(%s)
-                        WHERE rand() >= 0
-                        """
-                        .formatted(
-                                expression,
-                                Joiner.on(",").join(values),
-                                Joiner.on(",").join(columns)));
-
-                Result withConstantFolding = run("""
-                        SELECT %s
-                        FROM (
-                            VALUES ROW(%s)
-                        ) t(%s)
-                        """
-                        .formatted(
-                                expression,
-                                Joiner.on(",").join(values),
-                                Joiner.on(",").join(columns)));
-
-                if (!full.type().equals(withConstantFolding.type())) {
-                    fail("Mismatched types between interpreter and evaluation engine: %s vs %s".formatted(full.type(), withConstantFolding.type()));
-                }
 
-                if (!Objects.equals(full.value(), withConstantFolding.value())) {
-                    fail("Mismatched results between interpreter and evaluation engine: %s vs %s".formatted(full.value(), withConstantFolding.value()));
-                }
+            List<Map.Entry<String, String>> entries = ImmutableList.copyOf(bindings.entrySet());
+
+            List<String> columns = entries.stream()
+                    .map(Map.Entry::getKey)
+                    .collect(toList());
+
+            List<String> values = entries.stream()
+                    .map(Map.Entry::getValue)
+                    .collect(toList());
+
+            // Evaluate the expression using two modes:
+            //  1. Avoid constant folding -> exercises the compiler and evaluation engine
+            //  2. Force constant folding -> exercises the interpreter
+
+            Result full = run("""
+                    SELECT %s
+                    FROM (
+                        VALUES ROW(%s)
+                    ) t(%s)
+                    WHERE rand() >= 0
+                    """
+                    .formatted(
+                            expression,
+                            Joiner.on(",").join(values),
+                            Joiner.on(",").join(columns)));
+
+            Result withConstantFolding = run("""
+                    SELECT %s
+                    FROM (
+                        VALUES ROW(%s)
+                    ) t(%s)
+                    """
+                    .formatted(
+                            expression,
+                            Joiner.on(",").join(values),
+                            Joiner.on(",").join(columns)));
+
+            if (!full.type().equals(withConstantFolding.type())) {
+                fail("Mismatched types between interpreter and evaluation engine: %s vs %s".formatted(full.type(), withConstantFolding.type()));
+            }
 
-                return new Result(full.type(), full.value);
+            if (!Objects.equals(full.value(), withConstantFolding.value())) {
+                fail("Mismatched results between interpreter and evaluation engine: %s vs %s".formatted(full.value(), withConstantFolding.value()));
             }
+
+            return new Result(full.type(), full.value);
         }
 
         private Result run(String query)
@@ -737,7 +706,7 @@ public ExpressionAssert assertThat()
                     .withRepresentation(ExpressionAssert.TYPE_RENDERER);
         }
 
-        record Result(Type type, Object value) {}
+        public record Result(Type type, Object value) {}
     }
 
     public static class ExpressionAssert
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestAggregation.java b/core/trino-main/src/test/java/io/trino/sql/query/TestAggregation.java
index f2571a657c9a..ac3c524fb3f4 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestAggregation.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -25,19 +24,12 @@
 @TestInstance(PER_CLASS)
 public class TestAggregation
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestAggregationsInRowPatternMatching.java b/core/trino-main/src/test/java/io/trino/sql/query/TestAggregationsInRowPatternMatching.java
index 2ce69943c26f..a48e63020105 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestAggregationsInRowPatternMatching.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestAggregationsInRowPatternMatching.java
@@ -13,27 +13,22 @@
  */
 package io.trino.sql.query;
 
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestAggregationsInRowPatternMatching
 {
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions = new QueryAssertions();
 
-    @BeforeClass
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
-
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestArraySortAfterArrayDistinct.java b/core/trino-main/src/test/java/io/trino/sql/query/TestArraySortAfterArrayDistinct.java
index 58895e7ecd4f..484566ca52ee 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestArraySortAfterArrayDistinct.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestArraySortAfterArrayDistinct.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestArraySortAfterArrayDistinct
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestCheckConstraint.java b/core/trino-main/src/test/java/io/trino/sql/query/TestCheckConstraint.java
index b9fe3b011c6a..c3fc042099a3 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestCheckConstraint.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestCheckConstraint.java
@@ -22,7 +22,6 @@
 import io.trino.spi.security.Identity;
 import io.trino.testing.LocalQueryRunner;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.parallel.Execution;
@@ -50,10 +49,9 @@ public class TestCheckConstraint
             .setIdentity(Identity.forUser(USER).build())
             .build();
 
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions;
 
-    @BeforeAll
-    public void init()
+    public TestCheckConstraint()
     {
         LocalQueryRunner runner = LocalQueryRunner.builder(SESSION).build();
 
@@ -101,7 +99,7 @@ public void init()
                         return ImmutableList.of("regionkey < 10");
                     }
                     if (schemaTableName.equals(new SchemaTableName("tiny", "nation_multiple_column_constraint"))) {
-                        return ImmutableList.of("nationkey > 100 AND regionkey > 50");
+                        return ImmutableList.of("nationkey < 100 AND regionkey < 50");
                     }
                     if (schemaTableName.equals(new SchemaTableName("tiny", "nation_invalid_function"))) {
                         return ImmutableList.of("invalid_function(nationkey) > 100");
@@ -152,7 +150,6 @@ public void init()
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     /**
@@ -187,34 +184,34 @@ public void testInsert()
     public void testMergeInsert()
     {
         // Within allowed check constraint
-        assertThatThrownBy(() -> assertions.query("""
+        assertThat(assertions.query("""
                 MERGE INTO mock.tiny.nation USING (VALUES 42) t(dummy) ON false
                 WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 0, 'No comment')
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
+                .matches("SELECT BIGINT '1'");
 
-        // Outside allowed check constraint
-        assertThatThrownBy(() -> assertions.query("""
+        assertThat(assertions.query("""
                 MERGE INTO mock.tiny.nation USING (VALUES 42) t(dummy) ON false
-                WHEN NOT MATCHED THEN INSERT VALUES (26, 'POLAND', 0, 'No comment')
+                WHEN NOT MATCHED THEN INSERT (nationkey) VALUES (NULL)
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
-        assertThatThrownBy(() -> assertions.query("""
-                MERGE INTO mock.tiny.nation USING (VALUES (26, 'POLAND', 0, 'No comment'), (27, 'HOLLAND', 0, 'A comment')) t(a,b,c,d) ON nationkey = a
-                WHEN NOT MATCHED THEN INSERT VALUES (a,b,c,d)
+                .matches("SELECT BIGINT '1'");
+        assertThat(assertions.query("""
+                MERGE INTO mock.tiny.nation USING (VALUES 42) t(dummy) ON false
+                WHEN NOT MATCHED THEN INSERT (nationkey) VALUES (0)
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
+                .matches("SELECT BIGINT '1'");
 
+        // Outside allowed check constraint
         assertThatThrownBy(() -> assertions.query("""
                 MERGE INTO mock.tiny.nation USING (VALUES 42) t(dummy) ON false
-                WHEN NOT MATCHED THEN INSERT (nationkey) VALUES (NULL)
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 10, 'No comment')
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
+                .hasMessage("Check constraint violation: (regionkey < 10)");
         assertThatThrownBy(() -> assertions.query("""
-                MERGE INTO mock.tiny.nation USING (VALUES 42) t(dummy) ON false
-                WHEN NOT MATCHED THEN INSERT (nationkey) VALUES (0)
+                MERGE INTO mock.tiny.nation USING (VALUES (26, 'POLAND', 10, 'No comment'), (27, 'HOLLAND', 10, 'A comment')) t(a,b,c,d) ON nationkey = a
+                WHEN NOT MATCHED THEN INSERT VALUES (a,b,c,d)
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
+                .hasMessage("Check constraint violation: (regionkey < 10)");
     }
 
     @Test
@@ -230,13 +227,13 @@ public void testInsertAllowUnknown()
     @Test
     public void testInsertCheckMultipleColumns()
     {
-        assertThat(assertions.query("INSERT INTO mock.tiny.nation_multiple_column_constraint VALUES (101, 'POLAND', 51, 'No comment')"))
+        assertThat(assertions.query("INSERT INTO mock.tiny.nation_multiple_column_constraint VALUES (99, 'POLAND', 49, 'No comment')"))
                 .matches("SELECT BIGINT '1'");
 
-        assertThatThrownBy(() -> assertions.query("INSERT INTO mock.tiny.nation_multiple_column_constraint VALUES (101, 'POLAND', 50, 'No comment')"))
-                .hasMessage("Check constraint violation: ((nationkey > 100) AND (regionkey > 50))");
-        assertThatThrownBy(() -> assertions.query("INSERT INTO mock.tiny.nation_multiple_column_constraint VALUES (100, 'POLAND', 51, 'No comment')"))
-                .hasMessage("Check constraint violation: ((nationkey > 100) AND (regionkey > 50))");
+        assertThatThrownBy(() -> assertions.query("INSERT INTO mock.tiny.nation_multiple_column_constraint VALUES (99, 'POLAND', 50, 'No comment')"))
+                .hasMessage("Check constraint violation: ((nationkey < 100) AND (regionkey < 50))");
+        assertThatThrownBy(() -> assertions.query("INSERT INTO mock.tiny.nation_multiple_column_constraint VALUES (100, 'POLAND', 49, 'No comment')"))
+                .hasMessage("Check constraint violation: ((nationkey < 100) AND (regionkey < 50))");
     }
 
     @Test
@@ -319,28 +316,25 @@ public void testDelete()
     public void testMergeDelete()
     {
         // Within allowed check constraint
-        assertThatThrownBy(() -> assertions.query("""
+        assertThat(assertions.query("""
                 MERGE INTO mock.tiny.nation USING (VALUES 1,2) t(x) ON nationkey = x
                 WHEN MATCHED THEN DELETE
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
+                .matches("SELECT BIGINT '2'");
 
-        // Outside allowed check constraint
-        assertThatThrownBy(() -> assertions.query("""
-                MERGE INTO mock.tiny.nation USING (VALUES 1,2,3,4,5) t(x) ON regionkey = x
+        // Source values outside allowed check constraint should not cause failure
+        assertThat(assertions.query("""
+                MERGE INTO mock.tiny.nation USING (VALUES 1,2,3,4,11) t(x) ON regionkey = x
                 WHEN MATCHED THEN DELETE
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
-        assertThatThrownBy(() -> assertions.query("""
+                .matches("SELECT BIGINT '20'");
+
+        // No check constraining column in query
+        assertThat(assertions.query("""
                 MERGE INTO mock.tiny.nation USING (VALUES 1,11) t(x) ON nationkey = x
                 WHEN MATCHED THEN DELETE
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
-        assertThatThrownBy(() -> assertions.query("""
-                MERGE INTO mock.tiny.nation USING (VALUES 11,12,13,14,15) t(x) ON nationkey = x
-                WHEN MATCHED THEN DELETE
-                """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
+                .matches("SELECT BIGINT '2'");
     }
 
     /**
@@ -350,31 +344,122 @@ MERGE INTO mock.tiny.nation USING (VALUES 11,12,13,14,15) t(x) ON nationkey = x
     public void testUpdate()
     {
         // Within allowed check constraint
-        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET regionkey = regionkey * 2 WHERE nationkey < 3"))
-                .hasMessage("line 1:1: Updating a table with a check constraint is not supported");
-        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET regionkey = regionkey * 2 WHERE nationkey IN (1, 2, 3)"))
-                .hasMessage("line 1:1: Updating a table with a check constraint is not supported");
+        assertThat(assertions.query("UPDATE mock.tiny.nation SET regionkey = regionkey + 1"))
+                .matches("SELECT BIGINT '25'");
+        assertThat(assertions.query("UPDATE mock.tiny.nation SET regionkey = regionkey * 2 WHERE nationkey IN (1, 2, 3)"))
+                .matches("SELECT BIGINT '3'");
 
         // Outside allowed check constraint
-        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET regionkey = regionkey * 2"))
-                .hasMessage("line 1:1: Updating a table with a check constraint is not supported");
-        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET regionkey = regionkey * 2 WHERE nationkey IN (1, 11)"))
-                .hasMessage("line 1:1: Updating a table with a check constraint is not supported");
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET regionkey = regionkey * 10"))
+                .hasMessage("Check constraint violation: (regionkey < 10)");
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET regionkey = regionkey * 10 WHERE nationkey IN (1, 11)"))
+                .hasMessage("Check constraint violation: (regionkey < 10)");
 
-        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET regionkey = regionkey * 2 WHERE nationkey = 11"))
-                .hasMessage("line 1:1: Updating a table with a check constraint is not supported");
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET regionkey = regionkey * 10 WHERE nationkey = 11"))
+                .hasMessage("Check constraint violation: (regionkey < 10)");
 
         // Within allowed check constraint, but updated rows are outside the check constraint
-        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET nationkey = 10 WHERE nationkey < 3"))
-                .hasMessage("line 1:1: Updating a table with a check constraint is not supported");
-        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET nationkey = null WHERE nationkey < 3"))
-                .hasMessage("line 1:1: Updating a table with a check constraint is not supported");
+        assertThat(assertions.query("UPDATE mock.tiny.nation SET nationkey = 10 WHERE nationkey < 3"))
+                .matches("SELECT BIGINT '3'");
+        assertThat(assertions.query("UPDATE mock.tiny.nation SET nationkey = null WHERE nationkey < 3"))
+                .matches("SELECT BIGINT '3'");
 
         // Outside allowed check constraint, and updated rows are outside the check constraint
-        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET nationkey = 10 WHERE nationkey = 10"))
-                .hasMessage("line 1:1: Updating a table with a check constraint is not supported");
-        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET nationkey = null WHERE nationkey = null "))
-                .hasMessage("line 1:1: Updating a table with a check constraint is not supported");
+        assertThat(assertions.query("UPDATE mock.tiny.nation SET nationkey = 10 WHERE nationkey = 10"))
+                .matches("SELECT BIGINT '1'");
+        assertThat(assertions.query("UPDATE mock.tiny.nation SET nationkey = 10 WHERE nationkey = null"))
+                .matches("SELECT BIGINT '0'");
+    }
+
+    @Test
+    public void testUpdateAllowUnknown()
+    {
+        // Predicate evaluates to UNKNOWN (e.g. NULL > 100) should not violate check constraint
+        assertThat(assertions.query("UPDATE mock.tiny.nation SET regionkey = NULL"))
+                .matches("SELECT BIGINT '25'");
+    }
+
+    @Test
+    public void testUpdateCheckMultipleColumns()
+    {
+        // Within allowed check constraint
+        assertThat(assertions.query("UPDATE mock.tiny.nation_multiple_column_constraint SET regionkey = 49, nationkey = 99"))
+                .matches("SELECT BIGINT '25'");
+        assertThat(assertions.query("UPDATE mock.tiny.nation_multiple_column_constraint SET regionkey = 49"))
+                .matches("SELECT BIGINT '25'");
+        assertThat(assertions.query("UPDATE mock.tiny.nation_multiple_column_constraint SET nationkey = 99"))
+                .matches("SELECT BIGINT '25'");
+
+        // Outside allowed check constraint
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_multiple_column_constraint SET regionkey = 50, nationkey = 100"))
+                .hasMessage("Check constraint violation: ((nationkey < 100) AND (regionkey < 50))");
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_multiple_column_constraint SET regionkey = 50, nationkey = 99"))
+                .hasMessage("Check constraint violation: ((nationkey < 100) AND (regionkey < 50))");
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_multiple_column_constraint SET regionkey = 49, nationkey = 100"))
+                .hasMessage("Check constraint violation: ((nationkey < 100) AND (regionkey < 50))");
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_multiple_column_constraint SET regionkey = 50"))
+                .hasMessage("Check constraint violation: ((nationkey < 100) AND (regionkey < 50))");
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_multiple_column_constraint SET nationkey = 100"))
+                .hasMessage("Check constraint violation: ((nationkey < 100) AND (regionkey < 50))");
+    }
+
+    @Test
+    public void testUpdateSubquery()
+    {
+        // TODO Support subqueries for UPDATE statement in check constraint
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_subquery SET nationkey = 100"))
+                .hasMessageContaining("Unexpected subquery expression in logical plan");
+    }
+
+    @Test
+    public void testUpdateUnsupportedCurrentDate()
+    {
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_current_date SET nationkey = 10"))
+                .hasMessageContaining("Check constraint expression should not contain temporal expression");
+    }
+
+    @Test
+    public void testUpdateUnsupportedCurrentTime()
+    {
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_current_time SET nationkey = 10"))
+                .hasMessageContaining("Check constraint expression should not contain temporal expression");
+    }
+
+    @Test
+    public void testUpdateUnsupportedCurrentTimestamp()
+    {
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_current_timestamp SET nationkey = 10"))
+                .hasMessageContaining("Check constraint expression should not contain temporal expression");
+    }
+
+    @Test
+    public void testUpdateUnsupportedLocaltime()
+    {
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_localtime SET nationkey = 10"))
+                .hasMessageContaining("Check constraint expression should not contain temporal expression");
+    }
+
+    @Test
+    public void testUpdateUnsupportedLocaltimestamp()
+    {
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_localtimestamp SET nationkey = 10"))
+                .hasMessageContaining("Check constraint expression should not contain temporal expression");
+    }
+
+    @Test
+    public void testUpdateUnsupportedConstraint()
+    {
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_invalid_function SET nationkey = 10"))
+                .hasMessageContaining("Function 'invalid_function' not registered");
+        assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation_not_boolean_expression SET nationkey = 10"))
+                .hasMessageContaining("to be of type BOOLEAN, but was integer");
+    }
+
+    @Test
+    public void testUpdateNotDeterministic()
+    {
+        assertThatThrownBy(() -> assertions.query("INSERT INTO mock.tiny.nation_not_deterministic VALUES (100, 'POLAND', 0, 'No comment')"))
+                .hasMessageContaining("Check constraint expression should be deterministic");
     }
 
     /**
@@ -384,56 +469,247 @@ public void testUpdate()
     public void testMergeUpdate()
     {
         // Within allowed check constraint
-        assertThatThrownBy(() -> assertions.query("""
+        assertThat(assertions.query("""
                 MERGE INTO mock.tiny.nation USING (VALUES 5) t(x) ON nationkey = x
                 WHEN MATCHED THEN UPDATE SET regionkey = regionkey * 2
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
+                .matches("SELECT BIGINT '1'");
 
-        // Outside allowed check constraint
+        // Merge column within allowed check constraint, but updated rows are outside the check constraint
         assertThatThrownBy(() -> assertions.query("""
                 MERGE INTO mock.tiny.nation USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
-                WHEN MATCHED THEN UPDATE SET regionkey = regionkey * 2
+                WHEN MATCHED THEN UPDATE SET regionkey = regionkey * 5
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
+                .hasMessage("Check constraint violation: (regionkey < 10)");
         assertThatThrownBy(() -> assertions.query("""
                 MERGE INTO mock.tiny.nation USING (VALUES 1, 11) t(x) ON nationkey = x
-                WHEN MATCHED THEN UPDATE SET regionkey = regionkey * 2
+                WHEN MATCHED THEN UPDATE SET regionkey = regionkey * 5
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
+                .hasMessage("Check constraint violation: (regionkey < 10)");
+
         assertThatThrownBy(() -> assertions.query("""
-                MERGE INTO mock.tiny.nation USING (VALUES 11) t(x) ON nationkey = x
+                MERGE INTO mock.tiny.nation t USING mock.tiny.nation s ON t.nationkey = s.nationkey
+                WHEN MATCHED THEN UPDATE SET regionkey = 10
+                """))
+                .hasMessage("Check constraint violation: (regionkey < 10)");
+
+        // Merge column outside allowed check constraint and updated rows within allowed check constraint
+        assertThat(assertions.query("""
+                MERGE INTO mock.tiny.nation USING (VALUES 1, 11) t(x) ON regionkey = x
                 WHEN MATCHED THEN UPDATE SET regionkey = regionkey * 2
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
+                .matches("SELECT BIGINT '5'");
 
-        // Within allowed check constraint, but updated rows are outside the check constraint
+        // Merge column outside allowed check constraint and updated rows are outside the check constraint
         assertThatThrownBy(() -> assertions.query("""
-                MERGE INTO mock.tiny.nation USING (VALUES 1,2,3) t(x) ON nationkey = x
-                WHEN MATCHED THEN UPDATE SET nationkey = 10
+                MERGE INTO mock.tiny.nation USING (VALUES 11) t(x) ON nationkey = x
+                WHEN MATCHED THEN UPDATE SET regionkey = regionkey * 5
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
-        assertThatThrownBy(() -> assertions.query("""
+                .hasMessage("Check constraint violation: (regionkey < 10)");
+
+        // No check constraining column in query
+        assertThat(assertions.query("""
                 MERGE INTO mock.tiny.nation USING (VALUES 1,2,3) t(x) ON nationkey = x
                 WHEN MATCHED THEN UPDATE SET nationkey = NULL
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
-
-        // Outside allowed check constraint, but updated rows are outside the check constraint
-        assertThatThrownBy(() -> assertions.query("""
+                .matches("SELECT BIGINT '3'");
+        assertThat(assertions.query("""
                 MERGE INTO mock.tiny.nation USING (VALUES 10) t(x) ON nationkey = x
                 WHEN MATCHED THEN UPDATE SET nationkey = 13
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
-        assertThatThrownBy(() -> assertions.query("""
+                .matches("SELECT BIGINT '1'");
+        assertThat(assertions.query("""
                 MERGE INTO mock.tiny.nation USING (VALUES 10) t(x) ON nationkey = x
                 WHEN MATCHED THEN UPDATE SET nationkey = NULL
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
-        assertThatThrownBy(() -> assertions.query("""
+                .matches("SELECT BIGINT '1'");
+        assertThat(assertions.query("""
                 MERGE INTO mock.tiny.nation USING (VALUES 10) t(x) ON nationkey IS NULL
                 WHEN MATCHED THEN UPDATE SET nationkey = 13
                 """))
-                .hasMessage("line 1:1: Cannot merge into a table with check constraints");
+                .matches("SELECT BIGINT '0'");
+    }
+
+    @Test
+    public void testComplexMerge()
+    {
+        // Within allowed check constraint
+        assertThat(assertions.query("""
+                MERGE INTO mock.tiny.nation USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 9
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 0, 'No comment')
+                """))
+                .matches("SELECT BIGINT '22'");
+
+        // Outside allowed check constraint
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 10
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 9, 'No comment')
+                """))
+                .hasMessage("Check constraint violation: (regionkey < 10)");
+
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 9
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 10, 'No comment')
+                """))
+                .hasMessage("Check constraint violation: (regionkey < 10)");
+    }
+
+    @Test
+    public void testMergeCheckMultipleColumns()
+    {
+        // Within allowed check constraint
+        assertThat(assertions.query("""
+                MERGE INTO mock.tiny.nation_multiple_column_constraint USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 49
+                WHEN NOT MATCHED THEN INSERT VALUES (99, 'POLAND', 49, 'No comment')
+                """))
+                .matches("SELECT BIGINT '22'");
+
+        // Outside allowed check constraint (regionkey in UPDATE)
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_multiple_column_constraint USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 50
+                WHEN NOT MATCHED THEN INSERT VALUES (99, 'POLAND', 49, 'No comment')
+                """))
+                .hasMessage("Check constraint violation: ((nationkey < 100) AND (regionkey < 50))");
+
+        // Outside allowed check constraint (regionkey in INSERT)
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_multiple_column_constraint USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 49
+                WHEN NOT MATCHED THEN INSERT VALUES (99, 'POLAND', 50, 'No comment')
+                """))
+                .hasMessage("Check constraint violation: ((nationkey < 100) AND (regionkey < 50))");
+
+        // Outside allowed check constraint (nationkey in UPDATE)
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_multiple_column_constraint USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET nationkey = 100
+                WHEN NOT MATCHED THEN INSERT VALUES (99, 'POLAND', 49, 'No comment')
+                """))
+                .hasMessage("Check constraint violation: ((nationkey < 100) AND (regionkey < 50))");
+
+        // Outside allowed check constraint (nationkey in INSERT)
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_multiple_column_constraint USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET nationkey = 99
+                WHEN NOT MATCHED THEN INSERT VALUES (100, 'POLAND', 50, 'No comment')
+                """))
+                .hasMessage("Check constraint violation: ((nationkey < 100) AND (regionkey < 50))");
+    }
+
+    @Test
+    public void testMergeSubquery()
+    {
+        // TODO https://github.com/trinodb/trino/issues/18230 Support subqueries for MERGE statement in check constraint
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_subquery USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 9
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 0, 'No comment')
+                """))
+                .hasMessageContaining("Unexpected subquery expression in logical plan");
+    }
+
+    @Test
+    public void testMergeUnsupportedCurrentDate()
+    {
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_current_date USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 9
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 0, 'No comment')
+                """))
+                .hasMessageContaining("Check constraint expression should not contain temporal expression");
+    }
+
+    @Test
+    public void testMergeUnsupportedCurrentTime()
+    {
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_current_time USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 9
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 0, 'No comment')
+                """))
+                .hasMessageContaining("Check constraint expression should not contain temporal expression");
+    }
+
+    @Test
+    public void testMergeUnsupportedCurrentTimestamp()
+    {
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_current_timestamp USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 9
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 0, 'No comment')
+                """))
+                .hasMessageContaining("Check constraint expression should not contain temporal expression");
+    }
+
+    @Test
+    public void testMergeUnsupportedLocaltime()
+    {
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_localtime USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 9
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 0, 'No comment')
+                """))
+                .hasMessageContaining("Check constraint expression should not contain temporal expression");
+    }
+
+    @Test
+    public void testMergeUnsupportedLocaltimestamp()
+    {
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_localtimestamp USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 9
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 0, 'No comment')
+                """))
+                .hasMessageContaining("Check constraint expression should not contain temporal expression");
+    }
+
+    @Test
+    public void testMergeUnsupportedConstraint()
+    {
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_invalid_function USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 9
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 0, 'No comment')
+                """))
+                .hasMessageContaining("Function 'invalid_function' not registered");
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_not_boolean_expression USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 9
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 0, 'No comment')
+                """))
+                .hasMessageContaining("to be of type BOOLEAN, but was integer");
+    }
+
+    @Test
+    public void testMergeNotDeterministic()
+    {
+        assertThatThrownBy(() -> assertions.query("""
+                MERGE INTO mock.tiny.nation_not_deterministic USING (VALUES 1,2,3,4,5,6) t(x) ON regionkey = x
+                WHEN MATCHED AND t.x = 1 THEN DELETE
+                WHEN MATCHED THEN UPDATE SET regionkey = 9
+                WHEN NOT MATCHED THEN INSERT VALUES (101, 'POLAND', 0, 'No comment')
+                """))
+                .hasMessageContaining("Check constraint expression should be deterministic");
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestColumnMask.java b/core/trino-main/src/test/java/io/trino/sql/query/TestColumnMask.java
index 9c176068c678..9a1c569409c0 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestColumnMask.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestColumnMask.java
@@ -31,12 +31,12 @@
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.TestingAccessControlManager;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
+import java.time.Duration;
 import java.util.Optional;
 
 import static io.trino.connector.MockConnectorEntities.TPCH_NATION_WITH_HIDDEN_COLUMN;
@@ -67,11 +67,10 @@ public class TestColumnMask
             .setIdentity(Identity.forUser(USER).build())
             .build();
 
-    private QueryAssertions assertions;
-    private TestingAccessControlManager accessControl;
+    private final QueryAssertions assertions;
+    private final TestingAccessControlManager accessControl;
 
-    @BeforeAll
-    public void init()
+    public TestColumnMask()
     {
         LocalQueryRunner runner = LocalQueryRunner.builder(SESSION).build();
 
@@ -86,7 +85,8 @@ public void init()
                         new ConnectorViewDefinition.ViewColumn("name", VarcharType.createVarcharType(25).getTypeId(), Optional.empty())),
                 Optional.empty(),
                 Optional.of(VIEW_OWNER),
-                false);
+                false,
+                ImmutableList.of());
 
         ConnectorViewDefinition viewWithNested = new ConnectorViewDefinition(
                 """
@@ -106,7 +106,8 @@ public void init()
                         new ConnectorViewDefinition.ViewColumn("id", INTEGER.getTypeId(), Optional.empty())),
                 Optional.empty(),
                 Optional.of(VIEW_OWNER),
-                false);
+                false,
+                ImmutableList.of());
 
         ConnectorMaterializedViewDefinition materializedView = new ConnectorMaterializedViewDefinition(
                 "SELECT * FROM local.tiny.nation",
@@ -118,8 +119,10 @@ public void init()
                         new ConnectorMaterializedViewDefinition.Column("name", VarcharType.createVarcharType(25).getTypeId()),
                         new ConnectorMaterializedViewDefinition.Column("regionkey", BigintType.BIGINT.getTypeId()),
                         new ConnectorMaterializedViewDefinition.Column("comment", VarcharType.createVarcharType(152).getTypeId())),
+                Optional.of(Duration.ZERO),
                 Optional.empty(),
                 Optional.of(VIEW_OWNER),
+                ImmutableList.of(),
                 ImmutableMap.of());
 
         ConnectorMaterializedViewDefinition freshMaterializedView = new ConnectorMaterializedViewDefinition(
@@ -132,8 +135,10 @@ public void init()
                         new ConnectorMaterializedViewDefinition.Column("name", VarcharType.createVarcharType(25).getTypeId()),
                         new ConnectorMaterializedViewDefinition.Column("regionkey", BigintType.BIGINT.getTypeId()),
                         new ConnectorMaterializedViewDefinition.Column("comment", VarcharType.createVarcharType(152).getTypeId())),
+                Optional.of(Duration.ZERO),
                 Optional.empty(),
                 Optional.of(VIEW_OWNER),
+                ImmutableList.of(),
                 ImmutableMap.of());
 
         ConnectorMaterializedViewDefinition materializedViewWithCasts = new ConnectorMaterializedViewDefinition(
@@ -146,8 +151,10 @@ public void init()
                         new ConnectorMaterializedViewDefinition.Column("name", VarcharType.createVarcharType(2).getTypeId()),
                         new ConnectorMaterializedViewDefinition.Column("regionkey", BigintType.BIGINT.getTypeId()),
                         new ConnectorMaterializedViewDefinition.Column("comment", VarcharType.createVarcharType(152).getTypeId())),
+                Optional.of(Duration.ZERO),
                 Optional.empty(),
                 Optional.of(VIEW_OWNER),
+                ImmutableList.of(),
                 ImmutableMap.of());
 
         MockConnectorFactory mock = MockConnectorFactory.builder()
@@ -181,9 +188,7 @@ public void init()
     @AfterAll
     public void teardown()
     {
-        accessControl = null;
         assertions.close();
-        assertions = null;
     }
 
     @Test
@@ -194,7 +199,10 @@ public void testSimpleMask()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "custkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "-custkey"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("-custkey")
+                        .build());
         assertThat(assertions.query("SELECT custkey FROM orders WHERE orderkey = 1")).matches("VALUES BIGINT '-370'");
 
         accessControl.reset();
@@ -202,7 +210,10 @@ public void testSimpleMask()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "custkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "NULL"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("NULL")
+                        .build());
         assertThat(assertions.query("SELECT custkey FROM orders WHERE orderkey = 1")).matches("VALUES CAST(NULL AS BIGINT)");
     }
 
@@ -214,7 +225,10 @@ public void testConditionalMask()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "custkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "IF (orderkey < 2, null, -custkey)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("IF (orderkey < 2, null, -custkey)")
+                        .build());
         assertThat(assertions.query("SELECT custkey FROM orders LIMIT 2"))
                 .matches("VALUES (NULL), CAST('-781' AS BIGINT)");
     }
@@ -227,13 +241,18 @@ public void testMultipleMasksOnDifferentColumns()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "custkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "-custkey"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("-custkey").build());
 
         accessControl.columnMask(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderstatus",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "'X'"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("'X'")
+                        .build());
 
         assertThat(assertions.query("SELECT custkey, orderstatus FROM orders WHERE orderkey = 1"))
                 .matches("VALUES (BIGINT '-370', 'X')");
@@ -247,13 +266,19 @@ public void testReferenceInUsingClause()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "IF(orderkey = 1, -orderkey)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("IF(orderkey = 1, -orderkey)")
+                        .build());
 
         accessControl.columnMask(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "lineitem"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "IF(orderkey = 1, -orderkey)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("IF(orderkey = 1, -orderkey)")
+                        .build());
 
         assertThat(assertions.query("SELECT count(*) FROM orders JOIN lineitem USING (orderkey)")).matches("VALUES BIGINT '6'");
     }
@@ -266,7 +291,10 @@ public void testCoercibleType()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "CAST(clerk AS VARCHAR(5))"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("CAST(clerk AS VARCHAR(5))")
+                        .build());
         assertThat(assertions.query("SELECT clerk FROM orders WHERE orderkey = 1")).matches("VALUES CAST('Clerk' AS VARCHAR(15))");
     }
 
@@ -279,7 +307,12 @@ public void testSubquery()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "(SELECT cast(max(name) AS VARCHAR(15)) FROM nation)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("(SELECT cast(max(name) AS VARCHAR(15)) FROM nation)")
+                        .build());
         assertThat(assertions.query("SELECT clerk FROM orders WHERE orderkey = 1")).matches("VALUES CAST('VIETNAM' AS VARCHAR(15))");
 
         // correlated
@@ -288,7 +321,12 @@ public void testSubquery()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "(SELECT cast(max(name) AS VARCHAR(15)) FROM nation WHERE nationkey = orderkey)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("(SELECT cast(max(name) AS VARCHAR(15)) FROM nation WHERE nationkey = orderkey)")
+                        .build());
         assertThat(assertions.query("SELECT clerk FROM orders WHERE orderkey = 1")).matches("VALUES CAST('ARGENTINA' AS VARCHAR(15))");
     }
 
@@ -301,17 +339,26 @@ public void testMaterializedView()
                 new QualifiedObjectName(MOCK_CATALOG, "default", "nation_fresh_materialized_view"),
                 "name",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "reverse(name)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("reverse(name)")
+                        .build());
         accessControl.columnMask(
                 new QualifiedObjectName(MOCK_CATALOG, "default", "nation_materialized_view"),
                 "name",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "reverse(name)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("reverse(name)")
+                        .build());
         accessControl.columnMask(
                 new QualifiedObjectName(MOCK_CATALOG, "default", "materialized_view_with_casts"),
                 "name",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "reverse(name)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("reverse(name)")
+                        .build());
 
         assertThat(assertions.query(
                 Session.builder(SESSION)
@@ -344,7 +391,10 @@ public void testView()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "nation"),
                 "name",
                 VIEW_OWNER,
-                new ViewExpression(Optional.of(VIEW_OWNER), Optional.empty(), Optional.empty(), "reverse(name)"));
+                ViewExpression.builder()
+                        .identity(VIEW_OWNER)
+                        .expression("reverse(name)")
+                        .build());
 
         assertThat(assertions.query(
                 Session.builder(SESSION)
@@ -359,7 +409,12 @@ public void testView()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "nation"),
                 "name",
                 VIEW_OWNER,
-                new ViewExpression(Optional.of(VIEW_OWNER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "reverse(name)"));
+                ViewExpression.builder()
+                        .identity(VIEW_OWNER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("reverse(name)")
+                        .build());
 
         assertThat(assertions.query(
                 Session.builder(SESSION)
@@ -374,7 +429,12 @@ public void testView()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "nation"),
                 "name",
                 RUN_AS_USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "reverse(name)"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("reverse(name)")
+                        .build());
 
         assertThat(assertions.query(
                 Session.builder(SESSION)
@@ -389,7 +449,12 @@ public void testView()
                 new QualifiedObjectName(MOCK_CATALOG, "default", "nation_view"),
                 "name",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "reverse(name)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("reverse(name)")
+                        .build());
         assertThat(assertions.query("SELECT name FROM mock.default.nation_view WHERE nationkey = 1")).matches("VALUES CAST('ANITNEGRA' AS VARCHAR(25))");
     }
 
@@ -401,7 +466,10 @@ public void testTableReferenceInWithClause()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "custkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "-custkey"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("-custkey")
+                        .build());
         assertThat(assertions.query("WITH t AS (SELECT custkey FROM orders WHERE orderkey = 1) SELECT * FROM t")).matches("VALUES BIGINT '-370'");
     }
 
@@ -413,7 +481,12 @@ public void testOtherSchema()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(LOCAL_CATALOG), Optional.of("sf1"), "(SELECT count(*) FROM customer)")); // count is 15000 only when evaluating against sf1
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("sf1")  // count is 15000 only when evaluating against sf1
+                        .expression("(SELECT count(*) FROM customer)")
+                        .build());
         assertThat(assertions.query("SELECT max(orderkey) FROM orders")).matches("VALUES BIGINT '150000'");
     }
 
@@ -425,13 +498,23 @@ public void testDifferentIdentity()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 RUN_AS_USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "100"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("100")
+                        .build());
 
         accessControl.columnMask(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "(SELECT sum(orderkey) FROM orders)"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("(SELECT sum(orderkey) FROM orders)")
+                        .build());
 
         assertThat(assertions.query("SELECT max(orderkey) FROM orders")).matches("VALUES BIGINT '1500000'");
     }
@@ -444,7 +527,12 @@ public void testRecursion()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "(SELECT orderkey FROM orders)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("(SELECT orderkey FROM orders)")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT orderkey FROM orders"))
                 .hasMessageMatching(".*\\QColumn mask for 'local.tiny.orders.orderkey' is recursive\\E.*");
@@ -455,7 +543,12 @@ public void testRecursion()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "(SELECT orderkey FROM local.tiny.orders)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("(SELECT orderkey FROM local.tiny.orders)")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT orderkey FROM orders"))
                 .hasMessageMatching(".*\\QColumn mask for 'local.tiny.orders.orderkey' is recursive\\E.*");
@@ -466,13 +559,23 @@ public void testRecursion()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 RUN_AS_USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "(SELECT orderkey FROM orders)"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("(SELECT orderkey FROM orders)")
+                        .build());
 
         accessControl.columnMask(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "(SELECT orderkey FROM orders)"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("(SELECT orderkey FROM orders)")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT orderkey FROM orders"))
                 .hasMessageMatching(".*\\QColumn mask for 'local.tiny.orders.orderkey' is recursive\\E.*");
@@ -486,7 +589,12 @@ public void testLimitedScope()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "customer"),
                 "custkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "orderkey"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("orderkey")
+                        .build());
         assertThatThrownBy(() -> assertions.query(
                 "SELECT (SELECT min(custkey) FROM customer WHERE customer.custkey = orders.custkey) FROM orders"))
                 .hasMessage("line 1:34: Invalid column mask for 'local.tiny.customer.custkey': Column 'orderkey' cannot be resolved");
@@ -500,7 +608,12 @@ public void testSqlInjection()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "nation"),
                 "name",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "(SELECT name FROM region WHERE regionkey = 0)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("(SELECT name FROM region WHERE regionkey = 0)")
+                        .build());
         assertThat(assertions.query(
                 "WITH region(regionkey, name) AS (VALUES (0, 'ASIA'))" +
                         "SELECT name FROM nation ORDER BY name LIMIT 1"))
@@ -516,7 +629,12 @@ public void testInvalidMasks()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "$$$"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("$$$")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT orderkey FROM orders"))
                 .hasMessage("line 1:22: Invalid column mask for 'local.tiny.orders.orderkey': mismatched input '$'. Expecting: <expression>");
@@ -527,7 +645,12 @@ public void testInvalidMasks()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "unknown_column"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("unknown_column")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT orderkey FROM orders"))
                 .hasMessage("line 1:22: Invalid column mask for 'local.tiny.orders.orderkey': Column 'unknown_column' cannot be resolved");
@@ -538,7 +661,12 @@ public void testInvalidMasks()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "'foo'"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("'foo'")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT orderkey FROM orders"))
                 .hasMessage("line 1:22: Expected column mask for 'local.tiny.orders.orderkey' to be of type bigint, but was varchar(3)");
@@ -549,7 +677,12 @@ public void testInvalidMasks()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "count(*) > 0"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("count(*) > 0")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT orderkey FROM orders"))
                 .hasMessage("line 1:10: Column mask for 'orders.orderkey' cannot contain aggregations, window functions or grouping operations: [count(*)]");
@@ -560,7 +693,12 @@ public void testInvalidMasks()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "row_number() OVER () > 0"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("row_number() OVER () > 0")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT orderkey FROM orders"))
                 .hasMessage("line 1:22: Column mask for 'orders.orderkey' cannot contain aggregations, window functions or grouping operations: [row_number() OVER ()]");
@@ -571,7 +709,12 @@ public void testInvalidMasks()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "grouping(orderkey) = 0"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("grouping(orderkey) = 0")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT orderkey FROM orders"))
                 .hasMessage("line 1:20: Column mask for 'orders.orderkey' cannot contain aggregations, window functions or grouping operations: [GROUPING (orderkey)]");
@@ -585,7 +728,12 @@ public void testShowStats()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "7"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("7")
+                        .build());
 
         assertThat(assertions.query("SHOW STATS FOR (SELECT * FROM orders)"))
                 .containsAll("""
@@ -616,7 +764,12 @@ public void testJoin()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "orderkey + 1"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("orderkey + 1")
+                        .build());
         assertThat(assertions.query("SELECT count(*) FROM orders JOIN orders USING (orderkey)")).matches("VALUES BIGINT '15000'");
     }
 
@@ -629,7 +782,10 @@ public void testColumnMaskingUsingRestrictedColumn()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderkey",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "custkey"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("custkey")
+                        .build());
         assertThatThrownBy(() -> assertions.query("SELECT orderkey FROM orders"))
                 .hasMessage("Access Denied: Cannot select from columns [orderkey, custkey] in table or view local.tiny.orders");
     }
@@ -642,7 +798,10 @@ public void testInsertWithColumnMasking()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "clerk"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("clerk")
+                        .build());
         assertThatThrownBy(() -> assertions.query("INSERT INTO orders SELECT * FROM orders"))
                 .hasMessage("Insert into table with column masks is not supported");
     }
@@ -655,7 +814,10 @@ public void testDeleteWithColumnMasking()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "clerk"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("clerk")
+                        .build());
         assertThatThrownBy(() -> assertions.query("DELETE FROM orders"))
                 .hasMessage("line 1:1: Delete from table with column mask");
     }
@@ -668,7 +830,10 @@ public void testUpdateWithColumnMasking()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "clerk"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("clerk")
+                        .build());
         assertThatThrownBy(() -> assertions.query("UPDATE orders SET clerk = 'X'"))
                 .hasMessage("line 1:1: Updating a table with column masks is not supported");
         assertThatThrownBy(() -> assertions.query("UPDATE orders SET orderkey = -orderkey"))
@@ -687,7 +852,10 @@ public void testNotReferencedAndDeniedColumnMasking()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "clerk"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("clerk")
+                        .build());
         assertThat(assertions.query("SELECT orderkey FROM orders WHERE orderkey = 1")).matches("VALUES BIGINT '1'");
 
         // mask on long column
@@ -697,7 +865,10 @@ public void testNotReferencedAndDeniedColumnMasking()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "totalprice",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "totalprice"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("totalprice")
+                        .build());
         assertThat(assertions.query("SELECT orderkey FROM orders WHERE orderkey = 1")).matches("VALUES BIGINT '1'");
 
         // mask on not used varchar column with subquery masking
@@ -708,7 +879,10 @@ public void testNotReferencedAndDeniedColumnMasking()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "(SELECT orderstatus FROM local.tiny.orders)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("(SELECT orderstatus FROM local.tiny.orders)")
+                        .build());
         assertThat(assertions.query("SELECT orderkey FROM orders WHERE orderkey = 1")).matches("VALUES BIGINT '1'");
     }
 
@@ -720,7 +894,10 @@ public void testColumnMaskWithHiddenColumns()
                 new QualifiedObjectName(MOCK_CATALOG, "tiny", "nation_with_hidden_column"),
                 "name",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "'POLAND'"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("'POLAND'")
+                        .build());
 
         assertions.query("SELECT * FROM mock.tiny.nation_with_hidden_column WHERE nationkey = 1")
                 .assertThat()
@@ -754,19 +931,28 @@ public void testMultipleMasksUsingOtherMaskedColumns()
                 new QualifiedObjectName(TEST_CATALOG_NAME, "tiny", "orders"),
                 "comment",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "cast(regexp_replace(comment,'(password: [^ ]+)','password: ****') as varchar(79))"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("cast(regexp_replace(comment,'(password: [^ ]+)','password: ****') as varchar(79))")
+                        .build());
 
         accessControl.columnMask(
                 new QualifiedObjectName(TEST_CATALOG_NAME, "tiny", "orders"),
                 "orderstatus",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "if(regexp_extract(comment,'(country: [^ ]+)') IN ('country: 1'), '*', orderstatus)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("if(regexp_extract(comment,'(country: [^ ]+)') IN ('country: 1'), '*', orderstatus)")
+                        .build());
 
         accessControl.columnMask(
                 new QualifiedObjectName(TEST_CATALOG_NAME, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "if(regexp_extract(comment,'(country: [^ ]+)') IN ('country: 1'), '***', clerk)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("if(regexp_extract(comment,'(country: [^ ]+)') IN ('country: 1'), '***', clerk)")
+                        .build());
 
         assertThat(assertions.query(query)).matches(expected);
 
@@ -777,13 +963,19 @@ public void testMultipleMasksUsingOtherMaskedColumns()
                 new QualifiedObjectName(TEST_CATALOG_NAME, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "cast(regexp_replace(clerk,'(password: [^ ]+)','password: ****') as varchar(15))"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("cast(regexp_replace(clerk,'(password: [^ ]+)','password: ****') as varchar(15))")
+                        .build());
 
         accessControl.columnMask(
                 new QualifiedObjectName(TEST_CATALOG_NAME, "tiny", "orders"),
                 "comment",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "if(regexp_extract(clerk,'(country: [^ ]+)') IN ('country: 1'), '***', comment)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("if(regexp_extract(clerk,'(country: [^ ]+)') IN ('country: 1'), '***', comment)")
+                        .build());
 
         assertThat(assertions.query(query)).matches(expected);
 
@@ -794,19 +986,28 @@ public void testMultipleMasksUsingOtherMaskedColumns()
                 new QualifiedObjectName(TEST_CATALOG_NAME, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "cast(regexp_replace(clerk,'(password: [^ ]+)','password: ****') as varchar(15))"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("cast(regexp_replace(clerk,'(password: [^ ]+)','password: ****') as varchar(15))")
+                        .build());
 
         accessControl.columnMask(
                 new QualifiedObjectName(TEST_CATALOG_NAME, "tiny", "orders"),
                 "orderstatus",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "if(regexp_extract(clerk,'(country: [^ ]+)') IN ('country: 1'), '*', orderstatus)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("if(regexp_extract(clerk,'(country: [^ ]+)') IN ('country: 1'), '*', orderstatus)")
+                        .build());
 
         accessControl.columnMask(
                 new QualifiedObjectName(TEST_CATALOG_NAME, "tiny", "orders"),
                 "comment",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "if(regexp_extract(clerk,'(country: [^ ]+)') IN ('country: 1'), '***', comment)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("if(regexp_extract(clerk,'(country: [^ ]+)') IN ('country: 1'), '***', comment)")
+                        .build());
 
         assertThat(assertions.query(query)).matches(expected);
 
@@ -817,13 +1018,19 @@ public void testMultipleMasksUsingOtherMaskedColumns()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "cast(regexp_replace(clerk,'(Clerk#)','***#') as varchar(15))"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("cast(regexp_replace(clerk,'(Clerk#)','***#') as varchar(15))")
+                        .build());
 
         accessControl.columnMask(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "comment",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "if(regexp_extract(clerk,'([1-9]+)') IN ('951'), '***', comment)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("if(regexp_extract(clerk,'([1-9]+)') IN ('951'), '***', comment)")
+                        .build());
 
         assertThat(assertions.query(query))
                 .matches("VALUES (CAST('***' as varchar(79)), 'O', CAST('***#000000951' as varchar(15)))");
@@ -835,19 +1042,28 @@ public void testMultipleMasksUsingOtherMaskedColumns()
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "clerk",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "cast('###' as varchar(15))"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("cast('###' as varchar(15))")
+                        .build());
 
         accessControl.columnMask(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "orderstatus",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "if(regexp_extract(clerk,'([1-9]+)') IN ('951'), '*', orderstatus)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("if(regexp_extract(clerk,'([1-9]+)') IN ('951'), '*', orderstatus)")
+                        .build());
 
         accessControl.columnMask(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 "comment",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "if(regexp_extract(clerk,'([1-9]+)') IN ('951'), '***', comment)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("if(regexp_extract(clerk,'([1-9]+)') IN ('951'), '***', comment)")
+                        .build());
 
         assertThat(assertions.query(query))
                 .matches("VALUES (CAST('***' as varchar(79)), '*', CAST('###' as varchar(15)))");
@@ -861,7 +1077,10 @@ public void testColumnAliasing()
                 new QualifiedObjectName(MOCK_CATALOG, "default", "view_with_nested"),
                 "nested",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.empty(), Optional.empty(), "if(id = 0, nested)"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .expression("if(id = 0, nested)")
+                        .build());
 
         assertThat(assertions.query("SELECT nested[1] FROM mock.default.view_with_nested"))
                 .matches("VALUES 1, NULL");
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestComplexTypesWithNull.java b/core/trino-main/src/test/java/io/trino/sql/query/TestComplexTypesWithNull.java
index 1a5025775c29..4bb467150e6d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestComplexTypesWithNull.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestComplexTypesWithNull.java
@@ -13,30 +13,25 @@
  */
 package io.trino.sql.query;
 
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 /**
  * Regression test for https://github.com/trinodb/trino/issues/9528
  */
+@TestInstance(PER_CLASS)
 public class TestComplexTypesWithNull
 {
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions = new QueryAssertions();
 
-    @BeforeClass
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
-
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestCopyAggregationStateInRowPatternMatching.java b/core/trino-main/src/test/java/io/trino/sql/query/TestCopyAggregationStateInRowPatternMatching.java
index 2c10cbb62b77..6dc7f25671ce 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestCopyAggregationStateInRowPatternMatching.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestCopyAggregationStateInRowPatternMatching.java
@@ -13,13 +13,15 @@
  */
 package io.trino.sql.query;
 
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestCopyAggregationStateInRowPatternMatching
 {
     // at each step of matching, the threads are forked because of the alternation.
@@ -37,19 +39,12 @@ MEASURES CLASSIFIER() AS classy
               ) AS m
             """;
 
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions = new QueryAssertions();
 
-    @BeforeClass
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
-
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestCorrelatedAggregation.java b/core/trino-main/src/test/java/io/trino/sql/query/TestCorrelatedAggregation.java
index f25dcb53af9b..1ffc3bfda70b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestCorrelatedAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestCorrelatedAggregation.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestCorrelatedAggregation
 {
-    protected QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    protected final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
@@ -482,4 +474,34 @@ public void testChecksum()
                 "ON TRUE"))
                 .matches("VALUES (1, null), (2, x'd0f70cebd131ec61')");
     }
+
+    @Test
+    public void testCorrelatedSubqueryWithGroupedAggregation()
+    {
+        assertThat(assertions.query("WITH" +
+                "    t(k, v) AS (VALUES ('A', 1), ('B', NULL), ('C', 2), ('D', 3)), " +
+                "    u(k, v) AS (VALUES (1, 10), (1, 20), (2, 30)) " +
+                "SELECT" +
+                "    k," +
+                "    (" +
+                "        SELECT max(v) FROM u WHERE t.v = u.k GROUP BY k" +
+                "     ) AS cols " +
+                "FROM t"))
+                .matches("VALUES ('A', 20), ('B', NULL), ('C', 30), ('D', NULL)");
+    }
+
+    @Test
+    public void testCorrelatedSubqueryWithGlobalAggregation()
+    {
+        assertThat(assertions.query("WITH" +
+                "    t(k, v) AS (VALUES ('A', 1), ('B', NULL), ('C', 2), ('D', 3)), " +
+                "    u(k, v) AS (VALUES (1, 10), (1, 20), (2, 30)) " +
+                "SELECT" +
+                "    k," +
+                "    (" +
+                "        SELECT max(v) FROM u WHERE t.v = u.k" +
+                "     ) AS cols " +
+                "FROM t"))
+                .matches("VALUES ('A', 20), ('B', NULL), ('C', 30), ('D', NULL)");
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestCorrelatedJoin.java b/core/trino-main/src/test/java/io/trino/sql/query/TestCorrelatedJoin.java
index f880aeec5e63..1228e7205d4e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestCorrelatedJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestCorrelatedJoin.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestCorrelatedJoin
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestDistinctAggregationsNoMarkDistinct.java b/core/trino-main/src/test/java/io/trino/sql/query/TestDistinctAggregationsNoMarkDistinct.java
index fcf33be3be8c..6cc41666d07e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestDistinctAggregationsNoMarkDistinct.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestDistinctAggregationsNoMarkDistinct.java
@@ -15,7 +15,7 @@
 
 import org.junit.jupiter.api.BeforeAll;
 
-import static io.trino.SystemSessionProperties.USE_MARK_DISTINCT;
+import static io.trino.SystemSessionProperties.MARK_DISTINCT_STRATEGY;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 
 public class TestDistinctAggregationsNoMarkDistinct
@@ -26,7 +26,7 @@ public class TestDistinctAggregationsNoMarkDistinct
     public void init()
     {
         assertions = new QueryAssertions(testSessionBuilder()
-                .setSystemProperty(USE_MARK_DISTINCT, "false")
+                .setSystemProperty(MARK_DISTINCT_STRATEGY, "none")
                 .build());
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestDistinctWithOrderBy.java b/core/trino-main/src/test/java/io/trino/sql/query/TestDistinctWithOrderBy.java
index a136fc465987..183f77c3f450 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestDistinctWithOrderBy.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestDistinctWithOrderBy.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -25,19 +24,12 @@
 @TestInstance(PER_CLASS)
 public class TestDistinctWithOrderBy
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestExecute.java b/core/trino-main/src/test/java/io/trino/sql/query/TestExecute.java
index ad802742e218..e20f2d30e656 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestExecute.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestExecute.java
@@ -15,7 +15,6 @@
 
 import io.trino.Session;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -25,19 +24,12 @@
 @TestInstance(PER_CLASS)
 public class TestExecute
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestExecuteImmediate.java b/core/trino-main/src/test/java/io/trino/sql/query/TestExecuteImmediate.java
new file mode 100644
index 000000000000..3547fc2d5b06
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestExecuteImmediate.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed 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 io.trino.sql.query;
+
+import io.trino.sql.parser.ParsingException;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestExecuteImmediate
+{
+    private final QueryAssertions assertions = new QueryAssertions();
+
+    @AfterAll
+    public void teardown()
+    {
+        assertions.close();
+    }
+
+    @Test
+    public void testNoParameters()
+    {
+        assertThat(assertions.query("EXECUTE IMMEDIATE 'SELECT * FROM (VALUES 1, 2, 3)'"))
+                .matches("VALUES 1,2,3");
+    }
+
+    @Test
+    public void testParameterInLambda()
+    {
+        assertThat(assertions.query("EXECUTE IMMEDIATE 'SELECT * FROM (VALUES ARRAY[1,2,3], ARRAY[4,5,6]) t(a) WHERE any_match(t.a, v -> v = ?)' USING 1"))
+                .matches("VALUES ARRAY[1,2,3]");
+    }
+
+    @Test
+    public void testQuotesInStatement()
+    {
+        assertThat(assertions.query("EXECUTE IMMEDIATE 'SELECT ''foo'''"))
+                .matches("VALUES 'foo'");
+    }
+
+    @Test
+    public void testSyntaxError()
+    {
+        assertThatThrownBy(() -> assertions.query("EXECUTE IMMEDIATE 'SELECT ''foo'"))
+                .isInstanceOf(ParsingException.class)
+                .hasMessageMatching("line 1:27: mismatched input '''. Expecting: .*");
+        assertThatThrownBy(() -> assertions.query("EXECUTE IMMEDIATE\n'SELECT ''foo'"))
+                .isInstanceOf(ParsingException.class)
+                .hasMessageMatching("line 2:8: mismatched input '''. Expecting: .*");
+    }
+
+    @Test
+    public void testSemanticError()
+    {
+        assertTrinoExceptionThrownBy(() -> assertions.query("EXECUTE IMMEDIATE 'SELECT * FROM tiny.tpch.orders'"))
+                .hasMessageMatching("line 1:34: Catalog 'tiny' does not exist");
+        assertTrinoExceptionThrownBy(() -> assertions.query("EXECUTE IMMEDIATE\n'SELECT *\nFROM tiny.tpch.orders'"))
+                .hasMessageMatching("line 3:6: Catalog 'tiny' does not exist");
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestExpressionRewriteInRowPatternMatching.java b/core/trino-main/src/test/java/io/trino/sql/query/TestExpressionRewriteInRowPatternMatching.java
index f82300e81645..ae6de558e889 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestExpressionRewriteInRowPatternMatching.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestExpressionRewriteInRowPatternMatching.java
@@ -13,27 +13,22 @@
  */
 package io.trino.sql.query;
 
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestExpressionRewriteInRowPatternMatching
 {
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions = new QueryAssertions();
 
-    @BeforeClass
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
-
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestExpressions.java b/core/trino-main/src/test/java/io/trino/sql/query/TestExpressions.java
index f21b03841435..9b415e6f202d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestExpressions.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestExpressions.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -25,19 +24,12 @@
 @TestInstance(PER_CLASS)
 public class TestExpressions
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestFilterHideInacessibleColumnsSession.java b/core/trino-main/src/test/java/io/trino/sql/query/TestFilterHideInacessibleColumnsSession.java
index 15f7a518013f..72a9bc1335c2 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestFilterHideInacessibleColumnsSession.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestFilterHideInacessibleColumnsSession.java
@@ -23,7 +23,7 @@
 import io.trino.memory.NodeMemoryConfig;
 import io.trino.metadata.SessionPropertyManager;
 import io.trino.sql.planner.OptimizerConfig;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestFilterInaccessibleColumns.java b/core/trino-main/src/test/java/io/trino/sql/query/TestFilterInaccessibleColumns.java
index a6df900756e0..ef580e30c663 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestFilterInaccessibleColumns.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestFilterInaccessibleColumns.java
@@ -22,12 +22,9 @@
 import io.trino.spi.security.ViewExpression;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.TestingAccessControlManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import java.util.Optional;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
 import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.SELECT_COLUMN;
@@ -36,8 +33,9 @@
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true) // shared access control
+@TestInstance(PER_CLASS)
 public class TestFilterInaccessibleColumns
 {
     private static final String USER = "user";
@@ -50,11 +48,10 @@ public class TestFilterInaccessibleColumns
             .setIdentity(Identity.forUser(USER).build())
             .build();
 
-    private QueryAssertions assertions;
-    private TestingAccessControlManager accessControl;
+    private final QueryAssertions assertions;
+    private final TestingAccessControlManager accessControl;
 
-    @BeforeClass
-    public void init()
+    public TestFilterInaccessibleColumns()
     {
         LocalQueryRunner runner = LocalQueryRunner.builder(SESSION)
                 .withFeaturesConfig(new FeaturesConfig().setHideInaccessibleColumns(true))
@@ -65,22 +62,17 @@ public void init()
         accessControl = assertions.getQueryRunner().getAccessControl();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
-    }
-
-    @BeforeMethod
-    public void beforeMethod()
-    {
-        accessControl.reset();
     }
 
     @Test
     public void testSelectBaseline()
     {
+        accessControl.reset();
+
         // No filtering baseline
         assertThat(assertions.query("SELECT * FROM nation WHERE name = 'FRANCE'"))
                 .matches("VALUES (BIGINT '6', CAST('FRANCE' AS VARCHAR(25)), BIGINT '3', CAST('refully final requests. regular, ironi' AS VARCHAR(152)))");
@@ -89,6 +81,8 @@ public void testSelectBaseline()
     @Test
     public void testSimpleTableSchemaFilter()
     {
+        accessControl.reset();
+
         accessControl.deny(privilege(USER, "nation.comment", SELECT_COLUMN));
         assertThat(assertions.query("SELECT * FROM nation WHERE name = 'FRANCE'"))
                 .matches("VALUES (BIGINT '6', CAST('FRANCE' AS VARCHAR(25)), BIGINT '3')");
@@ -97,6 +91,8 @@ public void testSimpleTableSchemaFilter()
     @Test
     public void testDescribeBaseline()
     {
+        accessControl.reset();
+
         assertThat(assertions.query("DESCRIBE nation"))
                 .matches(materializedRows -> materializedRows
                         .getMaterializedRows().stream()
@@ -106,6 +102,8 @@ public void testDescribeBaseline()
     @Test
     public void testDescribe()
     {
+        accessControl.reset();
+
         accessControl.deny(privilege(USER, "nation.comment", SELECT_COLUMN));
         assertThat(assertions.query("DESCRIBE nation"))
                 .matches(materializedRows -> materializedRows
@@ -116,6 +114,8 @@ public void testDescribe()
     @Test
     public void testShowColumnsBaseline()
     {
+        accessControl.reset();
+
         assertThat(assertions.query("SHOW COLUMNS FROM nation"))
                 .matches(materializedRows -> materializedRows
                         .getMaterializedRows().stream()
@@ -125,6 +125,8 @@ public void testShowColumnsBaseline()
     @Test
     public void testShowColumns()
     {
+        accessControl.reset();
+
         accessControl.deny(privilege("nation.comment", SELECT_COLUMN));
         assertThat(assertions.query("SHOW COLUMNS FROM nation"))
                 .matches(materializedRows -> materializedRows
@@ -138,6 +140,8 @@ public void testShowColumns()
     @Test
     public void testFilterExplicitSelect()
     {
+        accessControl.reset();
+
         // Select the columns that are available to us explicitly
         accessControl.deny(privilege(USER, "nation.comment", SELECT_COLUMN));
         assertThat(assertions.query("SELECT nationkey, name, regionkey FROM nation WHERE name = 'FRANCE'"))
@@ -151,9 +155,16 @@ public void testFilterExplicitSelect()
     @Test
     public void testRowFilterWithAccessToInaccessibleColumn()
     {
+        accessControl.reset();
+
         accessControl.rowFilter(new QualifiedObjectName(TEST_CATALOG_NAME, TINY_SCHEMA_NAME, "nation"),
                 USER,
-                new ViewExpression(Optional.of(ADMIN), Optional.of(TEST_CATALOG_NAME), Optional.of(TINY_SCHEMA_NAME), "comment IS NOT null"));
+                ViewExpression.builder()
+                        .identity(ADMIN)
+                        .catalog(TEST_CATALOG_NAME)
+                        .schema(TINY_SCHEMA_NAME)
+                        .expression("comment IS NOT null")
+                        .build());
         accessControl.deny(privilege(USER, "nation.comment", SELECT_COLUMN));
         assertThat(assertions.query("SELECT * FROM nation WHERE name = 'FRANCE'"))
                 .matches("VALUES (BIGINT '6', CAST('FRANCE' AS VARCHAR(25)), BIGINT '3')");
@@ -162,9 +173,16 @@ public void testRowFilterWithAccessToInaccessibleColumn()
     @Test
     public void testRowFilterWithoutAccessToInaccessibleColumn()
     {
+        accessControl.reset();
+
         accessControl.rowFilter(new QualifiedObjectName(TEST_CATALOG_NAME, TINY_SCHEMA_NAME, "nation"),
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(TEST_CATALOG_NAME), Optional.of(TINY_SCHEMA_NAME), "comment IS NOT null"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(TEST_CATALOG_NAME)
+                        .schema(TINY_SCHEMA_NAME)
+                        .expression("comment IS NOT null")
+                        .build());
         accessControl.deny(privilege(USER, "nation.comment", SELECT_COLUMN));
         assertThatThrownBy(() -> assertions.query("SELECT * FROM nation WHERE name = 'FRANCE'"))
                 .hasMessage("Access Denied: Cannot select from columns [nationkey, regionkey, name, comment] in table or view test-catalog.tiny.nation");
@@ -173,9 +191,15 @@ public void testRowFilterWithoutAccessToInaccessibleColumn()
     @Test
     public void testRowFilterAsSessionUserOnInaccessibleColumn()
     {
+        accessControl.reset();
+
         accessControl.deny(privilege(USER, "nation.comment", SELECT_COLUMN));
         QualifiedObjectName table = new QualifiedObjectName(TEST_CATALOG_NAME, TINY_SCHEMA_NAME, "nation");
-        ViewExpression filter = new ViewExpression(Optional.empty(), Optional.of(TEST_CATALOG_NAME), Optional.of(TINY_SCHEMA_NAME), "comment IS NOT null");
+        ViewExpression filter = ViewExpression.builder()
+                .catalog(TEST_CATALOG_NAME)
+                .schema(TINY_SCHEMA_NAME)
+                .expression("comment IS NOT null")
+                .build();
         accessControl.rowFilter(table, ADMIN, filter);
         accessControl.rowFilter(table, USER, filter);
 
@@ -188,10 +212,17 @@ public void testRowFilterAsSessionUserOnInaccessibleColumn()
     @Test
     public void testMaskingOnAccessibleColumn()
     {
+        accessControl.reset();
+
         accessControl.columnMask(new QualifiedObjectName(TEST_CATALOG_NAME, TINY_SCHEMA_NAME, "nation"),
                 "nationkey",
                 USER,
-                new ViewExpression(Optional.of(ADMIN), Optional.of(TEST_CATALOG_NAME), Optional.of(TINY_SCHEMA_NAME), "-nationkey"));
+                ViewExpression.builder()
+                        .identity(ADMIN)
+                        .catalog(TEST_CATALOG_NAME)
+                        .schema(TINY_SCHEMA_NAME)
+                        .expression("-nationkey")
+                        .build());
         assertThat(assertions.query("SELECT * FROM nation WHERE name = 'FRANCE'"))
                 .matches("VALUES (BIGINT '-6',CAST('FRANCE' AS VARCHAR(25)), BIGINT '3', CAST('refully final requests. regular, ironi' AS VARCHAR(152)))");
     }
@@ -199,11 +230,18 @@ public void testMaskingOnAccessibleColumn()
     @Test
     public void testMaskingWithoutAccessToInaccessibleColumn()
     {
+        accessControl.reset();
+
         accessControl.deny(privilege(USER, "nation.nationkey", SELECT_COLUMN));
         accessControl.columnMask(new QualifiedObjectName(TEST_CATALOG_NAME, TINY_SCHEMA_NAME, "nation"),
                 "comment",
                 USER,
-                new ViewExpression(Optional.of(USER), Optional.of(TEST_CATALOG_NAME), Optional.of(TINY_SCHEMA_NAME), "CASE nationkey WHEN 6 THEN 'masked-comment' ELSE comment END"));
+                ViewExpression.builder()
+                        .identity(USER)
+                        .catalog(TEST_CATALOG_NAME)
+                        .schema(TINY_SCHEMA_NAME)
+                        .expression("CASE nationkey WHEN 6 THEN 'masked-comment' ELSE comment END")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT * FROM nation WHERE name = 'FRANCE'"))
                 .hasMessage("Access Denied: Cannot select from columns [nationkey, regionkey, name, comment] in table or view test-catalog.tiny.nation");
@@ -212,11 +250,18 @@ public void testMaskingWithoutAccessToInaccessibleColumn()
     @Test
     public void testMaskingWithAccessToInaccessibleColumn()
     {
+        accessControl.reset();
+
         accessControl.deny(privilege(USER, "nation.nationkey", SELECT_COLUMN));
         accessControl.columnMask(new QualifiedObjectName(TEST_CATALOG_NAME, TINY_SCHEMA_NAME, "nation"),
                 "comment",
                 USER,
-                new ViewExpression(Optional.of(ADMIN), Optional.of(TEST_CATALOG_NAME), Optional.of(TINY_SCHEMA_NAME), "CASE nationkey WHEN 6 THEN 'masked-comment' ELSE comment END"));
+                ViewExpression.builder()
+                        .identity(ADMIN)
+                        .catalog(TEST_CATALOG_NAME)
+                        .schema(TINY_SCHEMA_NAME)
+                        .expression("CASE nationkey WHEN 6 THEN 'masked-comment' ELSE comment END")
+                        .build());
 
         assertThat(assertions.query("SELECT * FROM nation WHERE name = 'FRANCE'"))
                 .matches("VALUES (CAST('FRANCE' AS VARCHAR(25)), BIGINT '3', CAST('masked-comment' AS VARCHAR(152)))");
@@ -228,9 +273,15 @@ public void testMaskingWithAccessToInaccessibleColumn()
     @Test
     public void testMaskingAsSessionUserWithCaseOnInaccessibleColumn()
     {
+        accessControl.reset();
+
         accessControl.deny(privilege(USER, "nation.nationkey", SELECT_COLUMN));
         QualifiedObjectName table = new QualifiedObjectName(TEST_CATALOG_NAME, TINY_SCHEMA_NAME, "nation");
-        ViewExpression mask = new ViewExpression(Optional.empty(), Optional.of(TEST_CATALOG_NAME), Optional.of(TINY_SCHEMA_NAME), "CASE nationkey WHEN 3 THEN 'masked-comment' ELSE comment END");
+        ViewExpression mask = ViewExpression.builder()
+                .catalog(TEST_CATALOG_NAME)
+                .schema(TINY_SCHEMA_NAME)
+                .expression("CASE nationkey WHEN 3 THEN 'masked-comment' ELSE comment END")
+                .build();
         accessControl.columnMask(table, "comment", ADMIN, mask);
         accessControl.columnMask(table, "comment", USER, mask);
 
@@ -243,6 +294,8 @@ public void testMaskingAsSessionUserWithCaseOnInaccessibleColumn()
     @Test
     public void testPredicateOnInaccessibleColumn()
     {
+        accessControl.reset();
+
         // Hide name but use it in the query predicate
         accessControl.deny(privilege(USER, "nation.name", SELECT_COLUMN));
         assertThatThrownBy(() -> assertions.query("SELECT * FROM nation WHERE name = 'FRANCE'"))
@@ -252,6 +305,8 @@ public void testPredicateOnInaccessibleColumn()
     @Test
     public void testJoinBaseline()
     {
+        accessControl.reset();
+
         assertThat(assertions.query("SELECT * FROM nation,customer WHERE customer.nationkey = nation.nationkey AND nation.name = 'FRANCE' AND customer.name='Customer#000001477'"))
                 .matches(materializedRows ->
                     materializedRows.getMaterializedRows().get(0).getField(11).equals("ites nag blithely alongside of the ironic accounts. accounts use. carefully silent deposits"));
@@ -260,6 +315,8 @@ public void testJoinBaseline()
     @Test
     public void testJoin()
     {
+        accessControl.reset();
+
         accessControl.deny(privilege(USER, "nation.comment", SELECT_COLUMN));
         assertThat(assertions.query("SELECT * FROM nation,customer WHERE customer.nationkey = nation.nationkey AND nation.name = 'FRANCE' AND customer.name='Customer#000001477'"))
                 .matches(materializedRows ->
@@ -269,6 +326,8 @@ public void testJoin()
     @Test
     public void testConstantFields()
     {
+        accessControl.reset();
+
         assertThat(assertions.query("SELECT * FROM (SELECT 'test')"))
                 .matches("VALUES ('test')");
     }
@@ -276,6 +335,8 @@ public void testConstantFields()
     @Test
     public void testFunctionFields()
     {
+        accessControl.reset();
+
         assertThat(assertions.query("SELECT * FROM (SELECT concat(name,'-test') FROM nation WHERE name = 'FRANCE')"))
                 .matches("VALUES (CAST('FRANCE-test' AS VARCHAR))");
     }
@@ -283,6 +344,8 @@ public void testFunctionFields()
     @Test
     public void testFunctionOnInaccessibleColumn()
     {
+        accessControl.reset();
+
         accessControl.deny(privilege(USER, "nation.name", SELECT_COLUMN));
         assertThatThrownBy(() -> assertions.query("SELECT * FROM (SELECT concat(name,'-test') FROM nation WHERE name = 'FRANCE')"))
                 .hasMessage("Access Denied: Cannot select from columns [name] in table or view test-catalog.tiny.nation");
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestFilteredAggregations.java b/core/trino-main/src/test/java/io/trino/sql/query/TestFilteredAggregations.java
index 95c2fe941d54..5f1eeb0a1d35 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestFilteredAggregations.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestFilteredAggregations.java
@@ -16,9 +16,8 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.sql.planner.plan.FilterNode;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
@@ -31,19 +30,12 @@
 public class TestFilteredAggregations
         extends BasePlanTest
 {
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions = new QueryAssertions();
 
-    @BeforeClass
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
-
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestFormat.java b/core/trino-main/src/test/java/io/trino/sql/query/TestFormat.java
index adfe9391fb6e..1f91163c3b46 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestFormat.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestFormat.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -25,19 +24,12 @@
 @TestInstance(PER_CLASS)
 public class TestFormat
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestFullJoin.java b/core/trino-main/src/test/java/io/trino/sql/query/TestFullJoin.java
index 8c15611dbf74..87288dd1da41 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestFullJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestFullJoin.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestFullJoin
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestGroupBy.java b/core/trino-main/src/test/java/io/trino/sql/query/TestGroupBy.java
index dbce87282a62..1c0b7dda43f3 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestGroupBy.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestGroupBy.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -25,19 +24,12 @@
 @TestInstance(PER_CLASS)
 public class TestGroupBy
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestGrouping.java b/core/trino-main/src/test/java/io/trino/sql/query/TestGrouping.java
index 699b2dae16f0..4c8f2e6d69f6 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestGrouping.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestGrouping.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestGrouping
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestGroupingSets.java b/core/trino-main/src/test/java/io/trino/sql/query/TestGroupingSets.java
index b990f20b920c..eb5b90fabad9 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestGroupingSets.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestGroupingSets.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestGroupingSets
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
@@ -88,4 +80,40 @@ public void testRollupAggregationWithOrderedLimit()
                 "ORDER BY a LIMIT 2"))
                 .matches("VALUES 1, 2");
     }
+
+    @Test
+    public void testComplexCube()
+    {
+        assertThat(assertions.query("""
+                SELECT a, b, c, count(*)
+                FROM (VALUES (1, 1, 1), (1, 2, 2), (1, 2, 2)) t(a, b, c)
+                GROUP BY CUBE (a, (b, c))
+                """))
+                .matches("""
+                        VALUES
+                            (   1,    1,    1, BIGINT '1'),
+                            (   1,    2,    2, 2),
+                            (   1, NULL, NULL, 3),
+                            (NULL, NULL, NULL, 3),
+                            (NULL,    1,    1, 1),
+                            (NULL,    2,    2, 2)
+                        """);
+    }
+
+    @Test
+    public void testComplexRollup()
+    {
+        assertThat(assertions.query("""
+                SELECT a, b, c, count(*)
+                FROM (VALUES (1, 1, 1), (1, 2, 2), (1, 2, 2)) t(a, b, c)
+                GROUP BY ROLLUP (a, (b, c))
+                """))
+                .matches("""
+                         VALUES
+                         (   1,    1,    1, BIGINT '1'),
+                         (NULL, NULL, NULL, 3),
+                         (   1, NULL, NULL, 3),
+                         (   1,    2,    2, 2)
+                        """);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestJoin.java b/core/trino-main/src/test/java/io/trino/sql/query/TestJoin.java
index 4fc70ca49612..1c76280055c8 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestJoin.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestJoin.java
@@ -17,7 +17,6 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.sql.planner.plan.JoinNode;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -39,19 +38,12 @@
 @TestInstance(PER_CLASS)
 public class TestJoin
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
@@ -264,11 +256,10 @@ public void testOutputDuplicatesInsensitiveJoin()
                 anyTree(
                         aggregation(
                                 ImmutableMap.of("COUNT", functionCall("count", ImmutableList.of())),
-                                anyTree(
-                                        join(INNER, builder -> builder
-                                                .left(anyTree(values("y")))
-                                                .right(values()))
-                                                .with(JoinNode.class, not(JoinNode::isMaySkipOutputDuplicates))))));
+                                join(INNER, builder -> builder
+                                        .left(anyTree(values("y")))
+                                        .right(values()))
+                                        .with(JoinNode.class, not(JoinNode::isMaySkipOutputDuplicates)))));
 
         assertions.assertQueryAndPlan(
                 "SELECT t.x FROM (VALUES 1, 2) t(x) JOIN (VALUES 2, 2) u(x) ON t.x = u.x GROUP BY t.x",
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestJoinUsing.java b/core/trino-main/src/test/java/io/trino/sql/query/TestJoinUsing.java
index 5314fef5494d..55d42787e5e7 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestJoinUsing.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestJoinUsing.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -25,19 +24,12 @@
 @TestInstance(PER_CLASS)
 public class TestJoinUsing
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestJsonArrayFunction.java b/core/trino-main/src/test/java/io/trino/sql/query/TestJsonArrayFunction.java
index 7280a46abec7..3375bf013cd3 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestJsonArrayFunction.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestJsonArrayFunction.java
@@ -15,7 +15,6 @@
 
 import io.trino.Session;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -33,19 +32,12 @@
 @TestInstance(PER_CLASS)
 public class TestJsonArrayFunction
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestJsonExistsFunction.java b/core/trino-main/src/test/java/io/trino/sql/query/TestJsonExistsFunction.java
index 45bbd24e58e5..7ef3a844364d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestJsonExistsFunction.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestJsonExistsFunction.java
@@ -17,7 +17,6 @@
 import io.trino.operator.scalar.json.JsonInputConversionError;
 import io.trino.sql.parser.ParsingException;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -35,19 +34,12 @@ public class TestJsonExistsFunction
 {
     private static final String INPUT = "[\"a\", \"b\", \"c\"]";
     private static final String INCORRECT_INPUT = "[...";
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestJsonObjectFunction.java b/core/trino-main/src/test/java/io/trino/sql/query/TestJsonObjectFunction.java
index 44c946223efc..ef7c4171a214 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestJsonObjectFunction.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestJsonObjectFunction.java
@@ -15,7 +15,6 @@
 
 import io.trino.Session;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -34,19 +33,12 @@
 @TestInstance(PER_CLASS)
 public class TestJsonObjectFunction
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestJsonQueryFunction.java b/core/trino-main/src/test/java/io/trino/sql/query/TestJsonQueryFunction.java
index 89e16fcdf141..9a2cb19cdfdd 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestJsonQueryFunction.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestJsonQueryFunction.java
@@ -18,7 +18,6 @@
 import io.trino.operator.scalar.json.JsonOutputConversionError;
 import io.trino.sql.parser.ParsingException;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -37,19 +36,12 @@ public class TestJsonQueryFunction
     private static final String INPUT = "[\"a\", \"b\", \"c\"]";
     private static final String OBJECT_INPUT = "{\"key\" : 1}";
     private static final String INCORRECT_INPUT = "[...";
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
@@ -423,4 +415,18 @@ public void testNullInput()
                 "SELECT json_query('" + INPUT + "', 'lax $var' PASSING null FORMAT JSON AS \"var\" EMPTY ARRAY ON EMPTY)"))
                 .matches("VALUES cast('[]' AS  varchar)");
     }
+
+    @Test
+    public void testDescendantMemberAccessor()
+    {
+        assertThat(assertions.query("""
+                SELECT json_query(
+                                '{"a" : {"b" : 1}, "c" :  [true, {"c" : {"c" : null}}]}',
+                                'lax $..c'
+                                WITH ARRAY WRAPPER)
+                """))
+                .matches("""
+                        VALUES cast('[[true,{"c":{"c":null}}],{"c":null},null]'AS varchar)
+                        """);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestJsonValueFunction.java b/core/trino-main/src/test/java/io/trino/sql/query/TestJsonValueFunction.java
index 2273e6870eec..4435d4870395 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestJsonValueFunction.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestJsonValueFunction.java
@@ -18,7 +18,6 @@
 import io.trino.operator.scalar.json.JsonValueFunction.JsonValueResultError;
 import io.trino.sql.parser.ParsingException;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -36,19 +35,12 @@ public class TestJsonValueFunction
 {
     private static final String INPUT = "[\"a\", \"b\", \"c\"]";
     private static final String INCORRECT_INPUT = "[...";
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestLag.java b/core/trino-main/src/test/java/io/trino/sql/query/TestLag.java
new file mode 100644
index 000000000000..58c5b983ce89
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestLag.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.sql.query;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestLag
+{
+    @Test
+    public void testNullOffset()
+    {
+        try (QueryAssertions assertions = new QueryAssertions()) {
+            assertThatThrownBy(() -> assertions.query("""
+                    SELECT lag(v, null) OVER (ORDER BY k)
+                    FROM (VALUES (1, 10), (2, 20)) t(k, v)
+                    """))
+                    .hasMessageMatching("Offset must not be null");
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestLambdaExpressions.java b/core/trino-main/src/test/java/io/trino/sql/query/TestLambdaExpressions.java
index 9eb30cde310a..a92bdd2698aa 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestLambdaExpressions.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestLambdaExpressions.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestLambdaExpressions
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestLateral.java b/core/trino-main/src/test/java/io/trino/sql/query/TestLateral.java
index c104d39795d8..65075b9ff43d 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestLateral.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestLateral.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -25,19 +24,12 @@
 @TestInstance(PER_CLASS)
 public class TestLateral
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestLead.java b/core/trino-main/src/test/java/io/trino/sql/query/TestLead.java
new file mode 100644
index 000000000000..01e63fde89ca
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestLead.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.sql.query;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestLead
+{
+    @Test
+    public void testNullOffset()
+    {
+        try (QueryAssertions assertions = new QueryAssertions()) {
+            assertThatThrownBy(() -> assertions.query("""
+                    SELECT lead(v, null) OVER (ORDER BY k)
+                    FROM (VALUES (1, 10), (2, 20)) t(k, v)
+                    """))
+                .hasMessageMatching("Offset must not be null");
+        }
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestListagg.java b/core/trino-main/src/test/java/io/trino/sql/query/TestListagg.java
index f9fcf8a6718b..4e244540dd75 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestListagg.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestListagg.java
@@ -16,7 +16,6 @@
 import io.trino.spi.TrinoException;
 import io.trino.sql.parser.ParsingException;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -29,19 +28,12 @@
 @TestInstance(PER_CLASS)
 public class TestListagg
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestMergeProjectWithValues.java b/core/trino-main/src/test/java/io/trino/sql/query/TestMergeProjectWithValues.java
index 9ca58ffc8006..457a11765154 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestMergeProjectWithValues.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestMergeProjectWithValues.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestMergeProjectWithValues
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestMinMaxNWindow.java b/core/trino-main/src/test/java/io/trino/sql/query/TestMinMaxNWindow.java
index ac05dd5cb87b..617e92b9b2c3 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestMinMaxNWindow.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestMinMaxNWindow.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestMinMaxNWindow
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestNestedLogicalBinaryExpression.java b/core/trino-main/src/test/java/io/trino/sql/query/TestNestedLogicalBinaryExpression.java
index baaf63d48206..cb80b9f91cbc 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestNestedLogicalBinaryExpression.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestNestedLogicalBinaryExpression.java
@@ -18,7 +18,6 @@
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.testing.LocalQueryRunner;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -34,10 +33,9 @@
 @TestInstance(PER_CLASS)
 public class TestNestedLogicalBinaryExpression
 {
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions;
 
-    @BeforeAll
-    public void init()
+    public TestNestedLogicalBinaryExpression()
     {
         Session session = testSessionBuilder()
                 .setCatalog(TEST_CATALOG_NAME)
@@ -56,7 +54,6 @@ public void init()
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestNumericalStability.java b/core/trino-main/src/test/java/io/trino/sql/query/TestNumericalStability.java
index e103cc85f69c..a030bff9430b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestNumericalStability.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestNumericalStability.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestNumericalStability
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestOrderedAggregation.java b/core/trino-main/src/test/java/io/trino/sql/query/TestOrderedAggregation.java
index 8b08a1fda078..33c76b90224c 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestOrderedAggregation.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestOrderedAggregation.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -25,19 +24,12 @@
 @TestInstance(PER_CLASS)
 public class TestOrderedAggregation
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestPrecomputedHashes.java b/core/trino-main/src/test/java/io/trino/sql/query/TestPrecomputedHashes.java
index ef1435358c6b..7b318ee987c4 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestPrecomputedHashes.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestPrecomputedHashes.java
@@ -15,7 +15,6 @@
 
 import io.trino.Session;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -27,10 +26,9 @@
 @TestInstance(PER_CLASS)
 public class TestPrecomputedHashes
 {
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions;
 
-    @BeforeAll
-    public void init()
+    public TestPrecomputedHashes()
     {
         Session session = testSessionBuilder()
                 .setSystemProperty(OPTIMIZE_HASH_GENERATION, "true")
@@ -43,7 +41,6 @@ public void init()
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestPredicatePushdown.java b/core/trino-main/src/test/java/io/trino/sql/query/TestPredicatePushdown.java
index 3a92f0fe028b..5cd91c0926a1 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestPredicatePushdown.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestPredicatePushdown.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestPredicatePushdown
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestRecursiveCte.java b/core/trino-main/src/test/java/io/trino/sql/query/TestRecursiveCte.java
index 5307fa2571b4..db947eba9229 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestRecursiveCte.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestRecursiveCte.java
@@ -15,7 +15,6 @@
 
 import io.trino.Session;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -28,19 +27,12 @@
 @TestInstance(PER_CLASS)
 public class TestRecursiveCte
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
@@ -328,4 +320,31 @@ public void testDuplicateOutputsInAnchorAndStepRelation()
                         "        (6, 3, 'derived',    1), " +
                         "        (7, 5, 'derived',    2)");
     }
+
+    @Test
+    public void testLambda()
+    {
+        assertThat(assertions.query("""
+                WITH RECURSIVE t(list) AS (
+                    SELECT ARRAY[0]
+                    UNION ALL
+                    SELECT list || 0
+                    FROM t
+                    WHERE any_match(list, x -> x = x) AND cardinality(list) < 4)
+                SELECT * FROM t
+                """))
+                .matches("VALUES (ARRAY[0]), (ARRAY[0, 0]), (ARRAY[0, 0, 0]), (ARRAY[0, 0, 0, 0])");
+
+        // lambda contains a symbol other than lambda argument (a)
+        assertThat(assertions.query("""
+                WITH RECURSIVE t(list, a) AS (
+                    SELECT ARRAY[0], 1
+                    UNION ALL
+                    SELECT list || a, a + 1
+                    FROM t
+                    WHERE all_match(list, x -> x < a) AND cardinality(list) < 4)
+                SELECT list FROM t
+                """))
+                .matches("VALUES (ARRAY[0]), (ARRAY[0, 1]), (ARRAY[0, 1, 2]), (ARRAY[0, 1, 2, 3])");
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestReduceAgg.java b/core/trino-main/src/test/java/io/trino/sql/query/TestReduceAgg.java
index ad99106ec8c7..3ae97c85f8d6 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestReduceAgg.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestReduceAgg.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestReduceAgg
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestRowFilter.java b/core/trino-main/src/test/java/io/trino/sql/query/TestRowFilter.java
index ed9053b140b0..db423426b9ed 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestRowFilter.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestRowFilter.java
@@ -29,7 +29,6 @@
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.TestingAccessControlManager;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.parallel.Execution;
@@ -65,11 +64,10 @@ public class TestRowFilter
             .setIdentity(Identity.forUser(USER).build())
             .build();
 
-    private QueryAssertions assertions;
-    private TestingAccessControlManager accessControl;
+    private final QueryAssertions assertions;
+    private final TestingAccessControlManager accessControl;
 
-    @BeforeAll
-    public void init()
+    public TestRowFilter()
     {
         LocalQueryRunner runner = LocalQueryRunner.builder(SESSION).build();
 
@@ -84,7 +82,8 @@ public void init()
                         new ConnectorViewDefinition.ViewColumn("name", VarcharType.createVarcharType(25).getTypeId(), Optional.empty())),
                 Optional.empty(),
                 Optional.of(VIEW_OWNER),
-                false);
+                false,
+                ImmutableList.of());
 
         MockConnectorFactory mock = MockConnectorFactory.builder()
                 .withGetViews((s, prefix) -> ImmutableMap.of(new SchemaTableName("default", "nation_view"), view))
@@ -144,9 +143,7 @@ public void init()
     @AfterAll
     public void teardown()
     {
-        accessControl = null;
         assertions.close();
-        assertions = null;
     }
 
     @Test
@@ -156,14 +153,14 @@ public void testSimpleFilter()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "orderkey < 10"));
+                ViewExpression.builder().expression("orderkey < 10").build());
         assertThat(assertions.query("SELECT count(*) FROM orders")).matches("VALUES BIGINT '7'");
 
         accessControl.reset();
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "NULL"));
+                ViewExpression.builder().expression("NULL").build());
         assertThat(assertions.query("SELECT count(*) FROM orders")).matches("VALUES BIGINT '0'");
     }
 
@@ -174,12 +171,12 @@ public void testMultipleFilters()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "orderkey < 10"));
+                ViewExpression.builder().expression("orderkey < 10").build());
 
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "orderkey > 5"));
+                ViewExpression.builder().expression("orderkey > 5").build());
 
         assertThat(assertions.query("SELECT count(*) FROM orders")).matches("VALUES BIGINT '2'");
     }
@@ -191,7 +188,11 @@ public void testCorrelatedSubquery()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "EXISTS (SELECT 1 FROM nation WHERE nationkey = orderkey)"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("EXISTS (SELECT 1 FROM nation WHERE nationkey = orderkey)")
+                        .build());
         assertThat(assertions.query("SELECT count(*) FROM orders")).matches("VALUES BIGINT '7'");
     }
 
@@ -203,7 +204,7 @@ public void testView()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "nation"),
                 VIEW_OWNER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "nationkey = 1"));
+                ViewExpression.builder().expression("nationkey = 1").build());
 
         assertThat(assertions.query(
                 Session.builder(SESSION)
@@ -217,7 +218,11 @@ public void testView()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "nation"),
                 VIEW_OWNER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "nationkey = 1"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("nationkey = 1")
+                        .build());
 
         assertThat(assertions.query(
                 Session.builder(SESSION)
@@ -231,7 +236,11 @@ public void testView()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "nation"),
                 RUN_AS_USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "nationkey = 1"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("nationkey = 1")
+                        .build());
 
         Session session = Session.builder(SESSION)
                 .setIdentity(Identity.forUser(RUN_AS_USER).build())
@@ -244,7 +253,11 @@ public void testView()
         accessControl.rowFilter(
                 new QualifiedObjectName(MOCK_CATALOG, "default", "nation_view"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "nationkey = 1"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("nationkey = 1")
+                        .build());
         assertThat(assertions.query("SELECT name FROM mock.default.nation_view")).matches("VALUES CAST('ARGENTINA' AS VARCHAR(25))");
     }
 
@@ -255,7 +268,7 @@ public void testTableReferenceInWithClause()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "orderkey = 1"));
+                ViewExpression.builder().expression("orderkey = 1").build());
         assertThat(assertions.query("WITH t AS (SELECT count(*) FROM orders) SELECT * FROM t")).matches("VALUES BIGINT '1'");
     }
 
@@ -266,7 +279,11 @@ public void testOtherSchema()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("sf1"), "(SELECT count(*) FROM customer) = 150000")); // Filter is TRUE only if evaluating against sf1.customer
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("sf1") // Filter is TRUE only if evaluating against sf1.customer
+                        .expression("(SELECT count(*) FROM customer) = 150000")
+                        .build());
         assertThat(assertions.query("SELECT count(*) FROM orders")).matches("VALUES BIGINT '15000'");
     }
 
@@ -277,12 +294,21 @@ public void testDifferentIdentity()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 RUN_AS_USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "orderkey = 1"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("orderkey = 1")
+                        .build());
 
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "orderkey IN (SELECT orderkey FROM orders)"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny").expression("orderkey IN (SELECT orderkey FROM orders)")
+                        .build());
 
         assertThat(assertions.query("SELECT count(*) FROM orders")).matches("VALUES BIGINT '1'");
     }
@@ -294,7 +320,11 @@ public void testRecursion()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "orderkey IN (SELECT orderkey FROM orders)"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("orderkey IN (SELECT orderkey FROM orders)")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT count(*) FROM orders"))
                 .hasMessageMatching(".*\\QRow filter for 'local.tiny.orders' is recursive\\E.*");
@@ -304,7 +334,11 @@ public void testRecursion()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "orderkey IN (SELECT local.tiny.orderkey FROM orders)"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("orderkey IN (SELECT local.tiny.orderkey FROM orders)")
+                        .build());
         assertThatThrownBy(() -> assertions.query("SELECT count(*) FROM orders"))
                 .hasMessageMatching(".*\\QRow filter for 'local.tiny.orders' is recursive\\E.*");
 
@@ -313,12 +347,20 @@ public void testRecursion()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 RUN_AS_USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "orderkey IN (SELECT orderkey FROM orders)"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("orderkey IN (SELECT orderkey FROM orders)")
+                        .build());
 
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "orderkey IN (SELECT orderkey FROM orders)"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("orderkey IN (SELECT orderkey FROM orders)")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT count(*) FROM orders"))
                 .hasMessageMatching(".*\\QRow filter for 'local.tiny.orders' is recursive\\E.*");
@@ -331,7 +373,11 @@ public void testLimitedScope()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "customer"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "orderkey = 1"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("orderkey = 1")
+                        .build());
         assertThatThrownBy(() -> assertions.query(
                 "SELECT (SELECT min(name) FROM customer WHERE customer.custkey = orders.custkey) FROM orders"))
                 .hasMessage("line 1:31: Invalid row filter for 'local.tiny.customer': Column 'orderkey' cannot be resolved");
@@ -344,7 +390,11 @@ public void testSqlInjection()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "nation"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "regionkey IN (SELECT regionkey FROM region WHERE name = 'ASIA')"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("regionkey IN (SELECT regionkey FROM region WHERE name = 'ASIA')")
+                        .build());
         assertThat(assertions.query(
                 "WITH region(regionkey, name) AS (VALUES (0, 'ASIA'), (1, 'ASIA'), (2, 'ASIA'), (3, 'ASIA'), (4, 'ASIA'))" +
                         "SELECT name FROM nation ORDER BY name LIMIT 1"))
@@ -359,7 +409,11 @@ public void testInvalidFilter()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "$$$"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("$$$")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT count(*) FROM orders"))
                 .hasMessage("line 1:22: Invalid row filter for 'local.tiny.orders': mismatched input '$'. Expecting: <expression>");
@@ -369,7 +423,11 @@ public void testInvalidFilter()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "unknown_column"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("unknown_column")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT count(*) FROM orders"))
                 .hasMessage("line 1:22: Invalid row filter for 'local.tiny.orders': Column 'unknown_column' cannot be resolved");
@@ -379,7 +437,11 @@ public void testInvalidFilter()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "1"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("1")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT count(*) FROM orders"))
                 .hasMessage("line 1:22: Expected row filter for 'local.tiny.orders' to be of type BOOLEAN, but was integer");
@@ -389,7 +451,11 @@ public void testInvalidFilter()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "count(*) > 0"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("count(*) > 0")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT count(*) FROM orders"))
                 .hasMessage("line 1:10: Row filter for 'local.tiny.orders' cannot contain aggregations, window functions or grouping operations: [count(*)]");
@@ -399,7 +465,11 @@ public void testInvalidFilter()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "row_number() OVER () > 0"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("row_number() OVER () > 0")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT count(*) FROM orders"))
                 .hasMessage("line 1:22: Row filter for 'local.tiny.orders' cannot contain aggregations, window functions or grouping operations: [row_number() OVER ()]");
@@ -409,7 +479,11 @@ public void testInvalidFilter()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "grouping(orderkey) = 0"));
+                ViewExpression.builder()
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("grouping(orderkey) = 0")
+                        .build());
 
         assertThatThrownBy(() -> assertions.query("SELECT count(*) FROM orders"))
                 .hasMessage("line 1:20: Row filter for 'local.tiny.orders' cannot contain aggregations, window functions or grouping operations: [GROUPING (orderkey)]");
@@ -422,7 +496,12 @@ public void testShowStats()
         accessControl.rowFilter(
                 new QualifiedObjectName(LOCAL_CATALOG, "tiny", "orders"),
                 USER,
-                new ViewExpression(Optional.of(RUN_AS_USER), Optional.of(LOCAL_CATALOG), Optional.of("tiny"), "orderkey = 0"));
+                ViewExpression.builder()
+                        .identity(RUN_AS_USER)
+                        .catalog(LOCAL_CATALOG)
+                        .schema("tiny")
+                        .expression("orderkey = 0")
+                        .build());
 
         assertThat(assertions.query("SHOW STATS FOR (SELECT * FROM tiny.orders)"))
                 .containsAll(
@@ -442,7 +521,7 @@ public void testDelete()
         accessControl.rowFilter(
                 new QualifiedObjectName(MOCK_CATALOG, "tiny", "nation"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "nationkey < 10"));
+                ViewExpression.builder().expression("nationkey < 10").build());
 
         // Within allowed row filter
         assertions.query("DELETE FROM mock.tiny.nation WHERE nationkey < 3")
@@ -474,7 +553,7 @@ public void testMergeDelete()
         accessControl.rowFilter(
                 new QualifiedObjectName(MOCK_CATALOG, "tiny", "nation"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "nationkey < 10"));
+                ViewExpression.builder().expression("nationkey < 10").build());
 
         // Within allowed row filter
         assertThatThrownBy(() -> assertions.query("""
@@ -507,7 +586,7 @@ public void testUpdate()
         accessControl.rowFilter(
                 new QualifiedObjectName(MOCK_CATALOG, "tiny", "nation"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "nationkey < 10"));
+                ViewExpression.builder().expression("nationkey < 10").build());
 
         // Within allowed row filter
         assertThatThrownBy(() -> assertions.query("UPDATE mock.tiny.nation SET regionkey = regionkey * 2 WHERE nationkey < 3"))
@@ -547,7 +626,7 @@ public void testMergeUpdate()
         accessControl.rowFilter(
                 new QualifiedObjectName(MOCK_CATALOG, "tiny", "nation"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "nationkey < 10"));
+                ViewExpression.builder().expression("nationkey < 10").build());
 
         // Within allowed row filter
         assertThatThrownBy(() -> assertions.query("""
@@ -604,7 +683,7 @@ public void testInsert()
         accessControl.rowFilter(
                 new QualifiedObjectName(MOCK_CATALOG, "tiny", "nation"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "nationkey > 100"));
+                ViewExpression.builder().expression("nationkey > 100").build());
 
         // Within allowed row filter
         assertions.query("INSERT INTO mock.tiny.nation VALUES (101, 'POLAND', 0, 'No comment')")
@@ -635,7 +714,7 @@ public void testMergeInsert()
         accessControl.rowFilter(
                 new QualifiedObjectName(MOCK_CATALOG, "tiny", "nation"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "nationkey > 100"));
+                ViewExpression.builder().expression("nationkey > 100").build());
 
         // Within allowed row filter
         assertThatThrownBy(() -> assertions.query("""
@@ -670,7 +749,7 @@ public void testRowFilterWithHiddenColumns()
         accessControl.rowFilter(
                 new QualifiedObjectName(MOCK_CATALOG, "tiny", "nation_with_hidden_column"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "nationkey < 1"));
+                ViewExpression.builder().expression("nationkey < 1").build());
 
         assertions.query("SELECT * FROM mock.tiny.nation_with_hidden_column")
                 .assertThat()
@@ -703,7 +782,7 @@ public void testRowFilterOnHiddenColumn()
         accessControl.rowFilter(
                 new QualifiedObjectName(MOCK_CATALOG, "tiny", "nation_with_hidden_column"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "\"$hidden\" < 1"));
+                ViewExpression.builder().expression("\"$hidden\" < 1").build());
 
         assertions.query("SELECT count(*) FROM mock.tiny.nation_with_hidden_column")
                 .assertThat()
@@ -730,7 +809,7 @@ public void testRowFilterOnOptionalColumn()
         accessControl.rowFilter(
                 new QualifiedObjectName(MOCK_CATALOG_MISSING_COLUMNS, "tiny", "nation_with_optional_column"),
                 USER,
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "length(optional) > 2"));
+                ViewExpression.builder().expression("length(optional) > 2").build());
 
         assertions.query("INSERT INTO mockmissingcolumns.tiny.nation_with_optional_column(nationkey, name, regionkey, comment, optional) VALUES (0, 'POLAND', 0, 'No comment', 'some string')")
                 .assertThat()
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestRowPatternMatching.java b/core/trino-main/src/test/java/io/trino/sql/query/TestRowPatternMatching.java
index 9b45301665a1..32c018b0ac42 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestRowPatternMatching.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestRowPatternMatching.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -26,19 +25,12 @@
 @TestInstance(PER_CLASS)
 public class TestRowPatternMatching
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestRowPatternMatchingInWindow.java b/core/trino-main/src/test/java/io/trino/sql/query/TestRowPatternMatchingInWindow.java
index fbddcac173cb..25e30a7efab7 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestRowPatternMatchingInWindow.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestRowPatternMatchingInWindow.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -26,19 +25,12 @@
 @TestInstance(PER_CLASS)
 public class TestRowPatternMatchingInWindow
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestSelectAll.java b/core/trino-main/src/test/java/io/trino/sql/query/TestSelectAll.java
index 7656f35e2556..8ad54dc80239 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestSelectAll.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestSelectAll.java
@@ -15,7 +15,6 @@
 
 import io.trino.testing.MaterializedResult;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -28,21 +27,14 @@
 @TestInstance(PER_CLASS)
 public class TestSelectAll
 {
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions = new QueryAssertions();
 
     private static final String UNSUPPORTED_DECORRELATION_MESSAGE = ".*: Given correlated subquery is not supported";
 
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
-
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestSessionFunctions.java b/core/trino-main/src/test/java/io/trino/sql/query/TestSessionFunctions.java
index a292b9469fde..80dc1ea9aa76 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestSessionFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestSessionFunctions.java
@@ -47,7 +47,7 @@ public void testCurrentUser()
     public void testCurrentPath()
     {
         Session session = testSessionBuilder()
-                .setPath(new SqlPath(Optional.of("testPath")))
+                .setPath(SqlPath.buildPath("testPath", Optional.empty()))
                 .build();
 
         try (QueryAssertions queryAssertions = new QueryAssertions(session)) {
@@ -55,7 +55,7 @@ public void testCurrentPath()
         }
 
         Session emptyPathSession = testSessionBuilder()
-                .setPath(new SqlPath(Optional.empty()))
+                .setPath(SqlPath.EMPTY_PATH)
                 .build();
 
         try (QueryAssertions queryAssertions = new QueryAssertions(emptyPathSession)) {
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestSetDigestFunctions.java b/core/trino-main/src/test/java/io/trino/sql/query/TestSetDigestFunctions.java
index 0b01abed0815..b6a8c3d5c03e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestSetDigestFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestSetDigestFunctions.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestSetDigestFunctions
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestSetOperations.java b/core/trino-main/src/test/java/io/trino/sql/query/TestSetOperations.java
index c84548d6afb2..c0e50ce95421 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestSetOperations.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestSetOperations.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -24,19 +23,12 @@
 @TestInstance(PER_CLASS)
 public class TestSetOperations
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestShowQueries.java b/core/trino-main/src/test/java/io/trino/sql/query/TestShowQueries.java
index 79da4a23523c..ff2f42778a21 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestShowQueries.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestShowQueries.java
@@ -19,7 +19,6 @@
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.testing.LocalQueryRunner;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -33,10 +32,9 @@
 @TestInstance(PER_CLASS)
 public class TestShowQueries
 {
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions;
 
-    @BeforeAll
-    public void init()
+    public TestShowQueries()
     {
         LocalQueryRunner queryRunner = LocalQueryRunner.create(testSessionBuilder()
                 .setCatalog("local")
@@ -71,7 +69,6 @@ public void init()
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestSubqueries.java b/core/trino-main/src/test/java/io/trino/sql/query/TestSubqueries.java
index 6ec65e1e09e6..e0efb844c079 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestSubqueries.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestSubqueries.java
@@ -20,7 +20,6 @@
 import io.trino.sql.planner.plan.JoinNode;
 import io.trino.testing.LocalQueryRunner;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -46,7 +45,7 @@
 import static io.trino.sql.planner.plan.AggregationNode.Step.FINAL;
 import static io.trino.sql.planner.plan.AggregationNode.Step.PARTIAL;
 import static io.trino.sql.planner.plan.AggregationNode.Step.SINGLE;
-import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
+import static io.trino.sql.planner.plan.JoinNode.Type.LEFT;
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
@@ -59,10 +58,9 @@ public class TestSubqueries
 {
     private static final String UNSUPPORTED_CORRELATED_SUBQUERY_ERROR_MSG = "line .*: Given correlated subquery is not supported";
 
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions;
 
-    @BeforeAll
-    public void init()
+    public TestSubqueries()
     {
         Session session = testSessionBuilder()
                 .setCatalog(TEST_CATALOG_NAME)
@@ -81,7 +79,6 @@ public void init()
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
@@ -204,14 +201,13 @@ public void testCorrelatedSubqueriesWithTopN()
                 "SELECT (SELECT t.a FROM (VALUES 1, 2, 3) t(a) WHERE t.a = t2.b ORDER BY a LIMIT 1) FROM (VALUES 1.0, 2.0) t2(b)",
                 "VALUES 1, 2",
                 output(
-                        join(INNER, builder -> builder
+                        join(LEFT, builder -> builder
                                 .equiCriteria("cast_b", "cast_a")
                                 .left(
-                                        any(
-                                                project(
-                                                        ImmutableMap.of("cast_b", expression("CAST(b AS decimal(11, 1))")),
-                                                        any(
-                                                                values("b")))))
+                                        project(
+                                                ImmutableMap.of("cast_b", expression("CAST(b AS decimal(11, 1))")),
+                                                any(
+                                                        values("b"))))
                                 .right(
                                         anyTree(
                                                 project(
@@ -229,14 +225,13 @@ public void testCorrelatedSubqueriesWithTopN()
                 "SELECT (SELECT t.a FROM (VALUES 1, 2, 3, 4, 5) t(a) WHERE t.a = t2.b * t2.c - 1 ORDER BY a LIMIT 1) FROM (VALUES (1, 2), (2, 3)) t2(b, c)",
                 "VALUES 1, 5",
                 output(
-                        join(INNER, builder -> builder
+                        join(LEFT, builder -> builder
                                 .equiCriteria("expr", "a")
                                 .left(
-                                        any(
-                                                project(
-                                                        ImmutableMap.of("expr", expression("b * c - 1")),
-                                                        any(
-                                                                values("b", "c")))))
+                                        project(
+                                                ImmutableMap.of("expr", expression("b * c - 1")),
+                                                any(
+                                                        values("b", "c"))))
                                 .right(
                                         any(
                                                 rowNumber(
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestTDigestFunctions.java b/core/trino-main/src/test/java/io/trino/sql/query/TestTDigestFunctions.java
index 91b30a11b7bf..a80fa5294aa3 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestTDigestFunctions.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestTDigestFunctions.java
@@ -15,7 +15,6 @@
 
 import io.trino.testing.MaterializedResult;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -31,19 +30,12 @@
 @TestInstance(PER_CLASS)
 public class TestTDigestFunctions
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestTrim.java b/core/trino-main/src/test/java/io/trino/sql/query/TestTrim.java
index fc9f71affed5..73f52444774e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestTrim.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestTrim.java
@@ -18,7 +18,6 @@
 import io.trino.spi.TrinoException;
 import org.intellij.lang.annotations.Language;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -30,10 +29,9 @@
 @TestInstance(PER_CLASS)
 public class TestTrim
 {
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions;
 
-    @BeforeAll
-    public void init()
+    public TestTrim()
     {
         assertions = new QueryAssertions();
         assertions.addFunctions(InternalFunctionBundle.builder()
@@ -45,7 +43,6 @@ public void init()
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestUnnest.java b/core/trino-main/src/test/java/io/trino/sql/query/TestUnnest.java
index 077c0d3cfa1f..c0e134dd9c8b 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestUnnest.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestUnnest.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -25,19 +24,12 @@
 @TestInstance(PER_CLASS)
 public class TestUnnest
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestUnwrapCastInComparison.java b/core/trino-main/src/test/java/io/trino/sql/query/TestUnwrapCastInComparison.java
index 13dc77ace7c9..af53dd983665 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestUnwrapCastInComparison.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestUnwrapCastInComparison.java
@@ -17,7 +17,6 @@
 import io.trino.Session;
 import io.trino.spi.type.TimeZoneKey;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -39,19 +38,12 @@ public class TestUnwrapCastInComparison
     private static final List<String> COMPARISON_OPERATORS = asList("=", "<>", ">=", ">", "<=", "<", "IS DISTINCT FROM");
     private static final DateTimeFormatter DATE_TIME_FORMAT = DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss[.SSS]");
 
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
@@ -418,6 +410,26 @@ public void testCastTimestampToTimestampWithTimeZone()
         }
     }
 
+    @Test
+    public void testMap()
+    {
+        String from = "MAP(ARRAY['foo', 'bar'], ARRAY[1, 2])";
+        String to = "MAP(ARRAY['foo', 'bar'], ARRAY[bigint '1', bigint '3'])";
+        for (String operator : asList("=", "!=", "<>", "IS DISTINCT FROM", "IS NOT DISTINCT FROM")) {
+            validate(operator, "MAP(VARCHAR(3),INTEGER)", from, "MAP(VARCHAR(3),BIGINT)", to);
+        }
+    }
+
+    @Test
+    public void testRow()
+    {
+        String from = "ROW(MAP(ARRAY['foo', 'bar'], ARRAY[1, 2]))";
+        String to = "ROW(MAP(ARRAY['foo', 'bar'], ARRAY[bigint '1', bigint '3']))";
+        for (String operator : asList("=", "!=", "<>", "IS DISTINCT FROM", "IS NOT DISTINCT FROM")) {
+            validate(operator, "ROW(MAP(VARCHAR(3),INTEGER))", from, "ROW(MAP(VARCHAR(3),BIGINT))", to);
+        }
+    }
+
     private void validate(String operator, String fromType, Object fromValue, String toType, Object toValue)
     {
         validate(assertions.getDefaultSession(), operator, fromType, fromValue, toType, toValue);
@@ -429,7 +441,7 @@ private void validate(Session session, String operator, String fromType, Object
                 "SELECT (CAST(v AS %s) %s CAST(%s AS %s)) " +
                         "IS NOT DISTINCT FROM " +
                         "(CAST(%s AS %s) %s CAST(%s AS %s)) " +
-                        "FROM (VALUES CAST(%s AS %s)) t(v)",
+                        "FROM (VALUES CAST(ROW(%s) AS ROW(%s))) t(v)",
                 toType, operator, toValue, toType,
                 fromValue, toType, operator, toValue, toType,
                 fromValue, fromType);
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestValues.java b/core/trino-main/src/test/java/io/trino/sql/query/TestValues.java
index c6dbcf75e7b3..70092cb94892 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestValues.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestValues.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -26,19 +25,12 @@
 @TestInstance(PER_CLASS)
 public class TestValues
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestWindow.java b/core/trino-main/src/test/java/io/trino/sql/query/TestWindow.java
new file mode 100644
index 000000000000..acf8abc74132
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestWindow.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed 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 io.trino.sql.query;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestWindow
+{
+    private final QueryAssertions assertions = new QueryAssertions();
+
+    @AfterAll
+    public void teardown()
+    {
+        assertions.close();
+    }
+
+    @Test
+    @Timeout(2)
+    public void testManyFunctionsWithSameWindow()
+    {
+        assertThat(assertions.query("""
+                SELECT
+                          SUM(a) OVER w,
+                          COUNT(a) OVER w,
+                          MIN(a) OVER w,
+                          MAX(a) OVER w,
+                          SUM(b) OVER w,
+                          COUNT(b) OVER w,
+                          MIN(b) OVER w,
+                          MAX(b) OVER w,
+                          SUM(c) OVER w,
+                          COUNT(c) OVER w,
+                          MIN(c) OVER w,
+                          MAX(c) OVER w,
+                          SUM(d) OVER w,
+                          COUNT(d) OVER w,
+                          MIN(d) OVER w,
+                          MAX(d) OVER w,
+                          SUM(e) OVER w,
+                          COUNT(e) OVER w,
+                          MIN(e) OVER w,
+                          MAX(e) OVER w,
+                          SUM(f) OVER w,
+                          COUNT(f) OVER w,
+                          MIN(f) OVER w,
+                          MAX(f) OVER w
+                        FROM (
+                            VALUES (1, 1, 1, 1, 1, 1, 1)
+                        ) AS t(k, a, b, c, d, e, f)
+                        WINDOW w AS (ORDER BY k ROWS BETWEEN 2 PRECEDING AND CURRENT ROW)
+                """))
+                .matches("VALUES (BIGINT '1', BIGINT '1', 1, 1, BIGINT '1', BIGINT '1', 1, 1, BIGINT '1', BIGINT '1', 1, 1, BIGINT '1', BIGINT '1', 1, 1, BIGINT '1', BIGINT '1', 1, 1, BIGINT '1', BIGINT '1', 1, 1)");
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestWindowFrameGroups.java b/core/trino-main/src/test/java/io/trino/sql/query/TestWindowFrameGroups.java
index 159e833db8d8..6478b877a708 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestWindowFrameGroups.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestWindowFrameGroups.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -29,19 +28,12 @@
 @TestInstance(PER_CLASS)
 public class TestWindowFrameGroups
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestWindowFrameRange.java b/core/trino-main/src/test/java/io/trino/sql/query/TestWindowFrameRange.java
index 94010c5f1d49..8f4395b1d57e 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestWindowFrameRange.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestWindowFrameRange.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -25,19 +24,12 @@
 @TestInstance(PER_CLASS)
 public class TestWindowFrameRange
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestWindowFrameRows.java b/core/trino-main/src/test/java/io/trino/sql/query/TestWindowFrameRows.java
index 20aad0e20262..6c8eaf913530 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestWindowFrameRows.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestWindowFrameRows.java
@@ -14,7 +14,6 @@
 package io.trino.sql.query;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -28,19 +27,12 @@
 @TestInstance(PER_CLASS)
 public class TestWindowFrameRows
 {
-    private QueryAssertions assertions;
-
-    @BeforeAll
-    public void init()
-    {
-        assertions = new QueryAssertions();
-    }
+    private final QueryAssertions assertions = new QueryAssertions();
 
     @AfterAll
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestWith.java b/core/trino-main/src/test/java/io/trino/sql/query/TestWith.java
index 90e01d08192a..9643538b567a 100644
--- a/core/trino-main/src/test/java/io/trino/sql/query/TestWith.java
+++ b/core/trino-main/src/test/java/io/trino/sql/query/TestWith.java
@@ -18,7 +18,6 @@
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.testing.LocalQueryRunner;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -33,10 +32,9 @@
 @TestInstance(PER_CLASS)
 public class TestWith
 {
-    private QueryAssertions assertions;
+    private final QueryAssertions assertions;
 
-    @BeforeAll
-    public void init()
+    public TestWith()
     {
         Session session = testSessionBuilder()
                 .setCatalog(TEST_CATALOG_NAME)
@@ -55,7 +53,6 @@ public void init()
     public void teardown()
     {
         assertions.close();
-        assertions = null;
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/relational/TestDeterminismEvaluator.java b/core/trino-main/src/test/java/io/trino/sql/relational/TestDeterminismEvaluator.java
index ebb4df9f1883..debd8b2db151 100644
--- a/core/trino-main/src/test/java/io/trino/sql/relational/TestDeterminismEvaluator.java
+++ b/core/trino-main/src/test/java/io/trino/sql/relational/TestDeterminismEvaluator.java
@@ -16,8 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.metadata.ResolvedFunction;
 import io.trino.metadata.TestingFunctionResolution;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -37,7 +36,7 @@ public void testDeterminismEvaluator()
         TestingFunctionResolution functionResolution = new TestingFunctionResolution();
 
         CallExpression random = new CallExpression(
-                functionResolution.resolveFunction(QualifiedName.of("random"), fromTypes(BIGINT)),
+                functionResolution.resolveFunction("random", fromTypes(BIGINT)),
                 singletonList(constant(10L, BIGINT)));
         assertFalse(isDeterministic(random));
 
diff --git a/core/trino-main/src/test/java/io/trino/sql/routine/TestSqlFunctions.java b/core/trino-main/src/test/java/io/trino/sql/routine/TestSqlFunctions.java
new file mode 100644
index 000000000000..8807b83c3c39
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/sql/routine/TestSqlFunctions.java
@@ -0,0 +1,478 @@
+/*
+ * Licensed 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 io.trino.sql.routine;
+
+import io.airlift.slice.Slice;
+import io.trino.Session;
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.operator.scalar.SpecializedSqlScalarFunction;
+import io.trino.security.AllowAllAccessControl;
+import io.trino.spi.function.FunctionId;
+import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.InvocationConvention;
+import io.trino.spi.function.ScalarFunctionImplementation;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.VarcharType;
+import io.trino.sql.PlannerContext;
+import io.trino.sql.parser.SqlParser;
+import io.trino.sql.routine.ir.IrRoutine;
+import io.trino.sql.tree.FunctionSpecification;
+import io.trino.transaction.TransactionManager;
+import org.assertj.core.api.ThrowingConsumer;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+
+import java.lang.invoke.MethodHandle;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static com.google.common.base.Throwables.throwIfUnchecked;
+import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.metadata.FunctionManager.createTestingFunctionManager;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static io.trino.transaction.InMemoryTransactionManager.createTestTransactionManager;
+import static io.trino.transaction.TransactionBuilder.transaction;
+import static io.trino.type.UnknownType.UNKNOWN;
+import static java.lang.Math.floor;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TestSqlFunctions
+{
+    private static final SqlParser SQL_PARSER = new SqlParser();
+    private static final TransactionManager TRANSACTION_MANAGER = createTestTransactionManager();
+    private static final PlannerContext PLANNER_CONTEXT = plannerContextBuilder()
+            .withTransactionManager(TRANSACTION_MANAGER)
+            .build();
+    private static final Session SESSION = testSessionBuilder().build();
+
+    @Test
+    void testConstantReturn()
+    {
+        @Language("SQL") String sql = """
+                FUNCTION answer()
+                RETURNS BIGINT
+                RETURN 42
+                """;
+        assertFunction(sql, handle -> assertThat(handle.invoke()).isEqualTo(42L));
+    }
+
+    @Test
+    void testSimpleReturn()
+    {
+        @Language("SQL") String sql = """
+                FUNCTION hello(s VARCHAR)
+                RETURNS VARCHAR
+                RETURN 'Hello, ' || s || '!'
+                """;
+        assertFunction(sql, handle -> {
+            assertThat(handle.invoke(utf8Slice("world"))).isEqualTo(utf8Slice("Hello, world!"));
+            assertThat(handle.invoke(utf8Slice("WORLD"))).isEqualTo(utf8Slice("Hello, WORLD!"));
+        });
+
+        testSingleExpression(VARCHAR, utf8Slice("foo"), VARCHAR, "Hello, foo!", "'Hello, ' || p || '!'");
+    }
+
+    @Test
+    void testSimpleExpression()
+    {
+        @Language("SQL") String sql = """
+                FUNCTION test(a bigint)
+                RETURNS bigint
+                BEGIN
+                  DECLARE x bigint DEFAULT CAST(99 AS bigint);
+                  RETURN x * a;
+                END
+                """;
+        assertFunction(sql, handle -> {
+            assertThat(handle.invoke(0L)).isEqualTo(0L);
+            assertThat(handle.invoke(1L)).isEqualTo(99L);
+            assertThat(handle.invoke(42L)).isEqualTo(42L * 99);
+            assertThat(handle.invoke(123L)).isEqualTo(123L * 99);
+        });
+    }
+
+    @Test
+    void testSimpleCase()
+    {
+        @Language("SQL") String sql = """
+                FUNCTION simple_case(a bigint)
+                RETURNS varchar
+                BEGIN
+                  CASE a
+                    WHEN 0 THEN RETURN 'zero';
+                    WHEN 1 THEN RETURN 'one';
+                    WHEN DECIMAL '10.0' THEN RETURN 'ten';
+                    WHEN 20.0E0 THEN RETURN 'twenty';
+                    ELSE RETURN 'other';
+                  END CASE;
+                  RETURN NULL;
+                END
+                """;
+        assertFunction(sql, handle -> {
+            assertThat(handle.invoke(0L)).isEqualTo(utf8Slice("zero"));
+            assertThat(handle.invoke(1L)).isEqualTo(utf8Slice("one"));
+            assertThat(handle.invoke(10L)).isEqualTo(utf8Slice("ten"));
+            assertThat(handle.invoke(20L)).isEqualTo(utf8Slice("twenty"));
+            assertThat(handle.invoke(42L)).isEqualTo(utf8Slice("other"));
+        });
+    }
+
+    @Test
+    void testSearchCase()
+    {
+        @Language("SQL") String sql = """
+                FUNCTION search_case(a bigint, b bigint)
+                RETURNS varchar
+                BEGIN
+                  CASE
+                    WHEN a = 0 THEN RETURN 'zero';
+                    WHEN b = 1 THEN RETURN 'one';
+                    WHEN a = DECIMAL '10.0' THEN RETURN 'ten';
+                    WHEN b = 20.0E0 THEN RETURN 'twenty';
+                    ELSE RETURN 'other';
+                  END CASE;
+                  RETURN NULL;
+                END
+                """;
+        assertFunction(sql, handle -> {
+            assertThat(handle.invoke(0L, 42L)).isEqualTo(utf8Slice("zero"));
+            assertThat(handle.invoke(42L, 1L)).isEqualTo(utf8Slice("one"));
+            assertThat(handle.invoke(10L, 42L)).isEqualTo(utf8Slice("ten"));
+            assertThat(handle.invoke(42L, 20L)).isEqualTo(utf8Slice("twenty"));
+            assertThat(handle.invoke(42L, 42L)).isEqualTo(utf8Slice("other"));
+
+            // verify ordering
+            assertThat(handle.invoke(0L, 1L)).isEqualTo(utf8Slice("zero"));
+            assertThat(handle.invoke(10L, 1L)).isEqualTo(utf8Slice("one"));
+            assertThat(handle.invoke(10L, 20L)).isEqualTo(utf8Slice("ten"));
+            assertThat(handle.invoke(42L, 20L)).isEqualTo(utf8Slice("twenty"));
+        });
+    }
+
+    @Test
+    void testFibonacciWhileLoop()
+    {
+        @Language("SQL") String sql = """
+                FUNCTION fib(n bigint)
+                RETURNS bigint
+                BEGIN
+                  DECLARE a, b bigint DEFAULT 1;
+                  DECLARE c bigint;
+                  IF n <= 2 THEN
+                    RETURN 1;
+                  END IF;
+                  WHILE n > 2 DO
+                    SET n = n - 1;
+                    SET c = a + b;
+                    SET a = b;
+                    SET b = c;
+                  END WHILE;
+                  RETURN c;
+                END
+                """;
+        assertFunction(sql, handle -> {
+            assertThat(handle.invoke(1L)).isEqualTo(1L);
+            assertThat(handle.invoke(2L)).isEqualTo(1L);
+            assertThat(handle.invoke(3L)).isEqualTo(2L);
+            assertThat(handle.invoke(4L)).isEqualTo(3L);
+            assertThat(handle.invoke(5L)).isEqualTo(5L);
+            assertThat(handle.invoke(6L)).isEqualTo(8L);
+            assertThat(handle.invoke(7L)).isEqualTo(13L);
+            assertThat(handle.invoke(8L)).isEqualTo(21L);
+        });
+    }
+
+    @Test
+    void testBreakContinue()
+    {
+        @Language("SQL") String sql = """
+                FUNCTION test()
+                RETURNS bigint
+                BEGIN
+                  DECLARE a, b int DEFAULT 0;
+                  top: WHILE a < 10 DO
+                    SET a = a + 1;
+                    IF a < 3 THEN
+                      ITERATE top;
+                    END IF;
+                    SET b = b + 1;
+                    IF a > 6 THEN
+                      LEAVE top;
+                    END IF;
+                  END WHILE;
+                  RETURN b;
+                END
+                """;
+        assertFunction(sql, handle -> assertThat(handle.invoke()).isEqualTo(5L));
+    }
+
+    @Test
+    void testRepeat()
+    {
+        @Language("SQL") String sql = """
+                FUNCTION test_repeat(a bigint)
+                RETURNS bigint
+                BEGIN
+                  REPEAT
+                    SET a = a + 1;
+                  UNTIL a >= 10 END REPEAT;
+                  RETURN a;
+                END
+                """;
+        assertFunction(sql, handle -> {
+            assertThat(handle.invoke(0L)).isEqualTo(10L);
+            assertThat(handle.invoke(100L)).isEqualTo(101L);
+        });
+    }
+
+    @Test
+    void testRepeatContinue()
+    {
+        @Language("SQL") String sql = """
+                FUNCTION test_repeat_continue()
+                RETURNS bigint
+                BEGIN
+                  DECLARE a int DEFAULT 0;
+                  DECLARE b int DEFAULT 0;
+                  top: REPEAT
+                    SET a = a + 1;
+                    IF a <= 3 THEN
+                      ITERATE top;
+                    END IF;
+                    SET b = b + 1;
+                  UNTIL a >= 10 END REPEAT;
+                  RETURN b;
+                END
+                """;
+        assertFunction(sql, handle -> assertThat(handle.invoke()).isEqualTo(7L));
+    }
+
+    @Test
+    void testReuseLabels()
+    {
+        @Language("SQL") String sql = """
+                FUNCTION test()
+                RETURNS int
+                BEGIN
+                  DECLARE r int DEFAULT 0;
+                  abc: LOOP
+                    SET r = r + 1;
+                    LEAVE abc;
+                  END LOOP;
+                  abc: LOOP
+                    SET r = r + 1;
+                    LEAVE abc;
+                  END LOOP;
+                  RETURN r;
+                END
+                """;
+        assertFunction(sql, handle -> assertThat(handle.invoke()).isEqualTo(2L));
+    }
+
+    @Test
+    void testReuseVariables()
+    {
+        @Language("SQL") String sql = """
+                FUNCTION test()
+                RETURNS bigint
+                BEGIN
+                  DECLARE r bigint DEFAULT 0;
+                  BEGIN
+                    DECLARE x varchar DEFAULT 'hello';
+                    SET r = r + length(x);
+                  END;
+                  BEGIN
+                    DECLARE x array(int) DEFAULT array[1, 2, 3];
+                    SET r = r + cardinality(x);
+                  END;
+                  RETURN r;
+                END
+                """;
+        assertFunction(sql, handle -> assertThat(handle.invoke()).isEqualTo(8L));
+    }
+
+    @Test
+    void testAssignParameter()
+    {
+        @Language("SQL") String sql = """
+                FUNCTION test(x int)
+                RETURNS int
+                BEGIN
+                  SET x = x * 3;
+                  RETURN x;
+                END
+                """;
+        assertFunction(sql, handle -> assertThat(handle.invoke(2L)).isEqualTo(6L));
+    }
+
+    @Test
+    void testCall()
+    {
+        testSingleExpression(BIGINT, -123L, BIGINT, 123L, "abs(p)");
+    }
+
+    @Test
+    void testCallNested()
+    {
+        testSingleExpression(BIGINT, -123L, BIGINT, 123L, "abs(ceiling(p))");
+        testSingleExpression(BIGINT, 42L, DOUBLE, 42.0, "to_unixTime(from_unixtime(p))");
+    }
+
+    @Test
+    void testArray()
+    {
+        testSingleExpression(BIGINT, 3L, BIGINT, 5L, "array[3,4,5,6,7][p]");
+        testSingleExpression(BIGINT, 0L, BIGINT, 0L, "array_sort(array[3,2,4,5,1,p])[1]");
+    }
+
+    @Test
+    void testRow()
+    {
+        testSingleExpression(BIGINT, 8L, BIGINT, 8L, "ROW(1, 'a', p)[3]");
+    }
+
+    @Test
+    void testLambda()
+    {
+        testSingleExpression(BIGINT, 3L, BIGINT, 9L, "(transform(ARRAY [5, 6], x -> x + p)[2])", false);
+    }
+
+    @Test
+    void testTry()
+    {
+        testSingleExpression(VARCHAR, utf8Slice("42"), BIGINT, 42L, "try(cast(p AS bigint))");
+        testSingleExpression(VARCHAR, utf8Slice("abc"), BIGINT, null, "try(cast(p AS bigint))");
+    }
+
+    @Test
+    void testTryCast()
+    {
+        testSingleExpression(VARCHAR, utf8Slice("42"), BIGINT, 42L, "try_cast(p AS bigint)");
+        testSingleExpression(VARCHAR, utf8Slice("abc"), BIGINT, null, "try_cast(p AS bigint)");
+    }
+
+    @Test
+    void testNonCanonical()
+    {
+        testSingleExpression(BIGINT, 100_000L, BIGINT, 1970L, "EXTRACT(YEAR FROM from_unixtime(p))");
+    }
+
+    @Test
+    void testAtTimeZone()
+    {
+        testSingleExpression(UNKNOWN, null, VARCHAR, "2012-10-30 18:00:00 America/Los_Angeles", "CAST(TIMESTAMP '2012-10-31 01:00 UTC' AT TIME ZONE 'America/Los_Angeles' AS VARCHAR)");
+    }
+
+    @Test
+    void testSession()
+    {
+        testSingleExpression(UNKNOWN, null, DOUBLE, floor(SESSION.getStart().toEpochMilli() / 1000.0), "floor(to_unixtime(localtimestamp))");
+        testSingleExpression(UNKNOWN, null, VARCHAR, SESSION.getUser(), "current_user");
+    }
+
+    @Test
+    void testSpecialType()
+    {
+        testSingleExpression(VARCHAR, utf8Slice("abc"), BOOLEAN, true, "(p LIKE '%bc')");
+        testSingleExpression(VARCHAR, utf8Slice("xb"), BOOLEAN, false, "(p LIKE '%bc')");
+        testSingleExpression(VARCHAR, utf8Slice("abc"), BOOLEAN, false, "regexp_like(p, '\\d')");
+        testSingleExpression(VARCHAR, utf8Slice("123"), BOOLEAN, true, "regexp_like(p, '\\d')");
+        testSingleExpression(VARCHAR, utf8Slice("[4,5,6]"), VARCHAR, "6", "json_extract_scalar(p, '$[2]')");
+    }
+
+    private final AtomicLong nextId = new AtomicLong();
+
+    private void testSingleExpression(Type inputType, Object input, Type outputType, Object output, String expression)
+    {
+        testSingleExpression(inputType, input, outputType, output, expression, true);
+    }
+
+    private void testSingleExpression(Type inputType, Object input, Type outputType, Object output, String expression, boolean deterministic)
+    {
+        @Language("SQL") String sql = "FUNCTION %s(p %s)\nRETURNS %s\n%s\nRETURN %s".formatted(
+                "test" + nextId.incrementAndGet(),
+                inputType.getTypeSignature(),
+                outputType.getTypeSignature(),
+                deterministic ? "DETERMINISTIC" : "NOT DETERMINISTIC",
+                expression);
+
+        assertFunction(sql, handle -> {
+            Object result = handle.invoke(input);
+
+            if ((outputType instanceof VarcharType) && (result instanceof Slice slice)) {
+                result = slice.toStringUtf8();
+            }
+
+            assertThat(result).isEqualTo(output);
+        });
+    }
+
+    private static void assertFunction(@Language("SQL") String sql, ThrowingConsumer<MethodHandle> consumer)
+    {
+        transaction(TRANSACTION_MANAGER, PLANNER_CONTEXT.getMetadata(), new AllowAllAccessControl())
+                .singleStatement()
+                .execute(SESSION, session -> {
+                    ScalarFunctionImplementation implementation = compileFunction(sql, session);
+                    MethodHandle handle = implementation.getMethodHandle()
+                            .bindTo(getInstance(implementation))
+                            .bindTo(session.toConnectorSession());
+                    consumer.accept(handle);
+                });
+    }
+
+    private static Object getInstance(ScalarFunctionImplementation implementation)
+    {
+        try {
+            return implementation.getInstanceFactory().orElseThrow().invoke();
+        }
+        catch (Throwable t) {
+            throwIfUnchecked(t);
+            throw new RuntimeException(t);
+        }
+    }
+
+    private static ScalarFunctionImplementation compileFunction(@Language("SQL") String sql, Session session)
+    {
+        FunctionSpecification function = SQL_PARSER.createFunctionSpecification(sql);
+
+        FunctionMetadata metadata = SqlRoutineAnalyzer.extractFunctionMetadata(new FunctionId("test"), function);
+
+        SqlRoutineAnalyzer analyzer = new SqlRoutineAnalyzer(PLANNER_CONTEXT, WarningCollector.NOOP);
+        SqlRoutineAnalysis analysis = analyzer.analyze(session, new AllowAllAccessControl(), function);
+
+        SqlRoutinePlanner planner = new SqlRoutinePlanner(PLANNER_CONTEXT, WarningCollector.NOOP);
+        IrRoutine routine = planner.planSqlFunction(session, function, analysis);
+
+        SqlRoutineCompiler compiler = new SqlRoutineCompiler(createTestingFunctionManager());
+        SpecializedSqlScalarFunction sqlScalarFunction = compiler.compile(routine);
+
+        InvocationConvention invocationConvention = new InvocationConvention(
+                metadata.getFunctionNullability().getArgumentNullable().stream()
+                        .map(nullable -> nullable ? BOXED_NULLABLE : NEVER_NULL)
+                        .toList(),
+                metadata.getFunctionNullability().isReturnNullable() ? NULLABLE_RETURN : FAIL_ON_NULL,
+                true,
+                true);
+
+        return sqlScalarFunction.getScalarFunctionImplementation(invocationConvention);
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/sql/routine/TestSqlRoutineAnalyzer.java b/core/trino-main/src/test/java/io/trino/sql/routine/TestSqlRoutineAnalyzer.java
new file mode 100644
index 000000000000..4d8c32592648
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/sql/routine/TestSqlRoutineAnalyzer.java
@@ -0,0 +1,538 @@
+/*
+ * Licensed 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 io.trino.sql.routine;
+
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.security.AllowAllAccessControl;
+import io.trino.sql.PlannerContext;
+import io.trino.sql.parser.SqlParser;
+import io.trino.sql.tree.FunctionSpecification;
+import io.trino.testing.assertions.TrinoExceptionAssert;
+import io.trino.transaction.TestingTransactionManager;
+import io.trino.transaction.TransactionManager;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
+import static io.trino.spi.StandardErrorCode.INVALID_ARGUMENTS;
+import static io.trino.spi.StandardErrorCode.MISSING_RETURN;
+import static io.trino.spi.StandardErrorCode.NOT_FOUND;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.StandardErrorCode.SYNTAX_ERROR;
+import static io.trino.spi.StandardErrorCode.TYPE_MISMATCH;
+import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
+import static io.trino.testing.TestingSession.testSession;
+import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
+import static io.trino.transaction.TransactionBuilder.transaction;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.from;
+
+class TestSqlRoutineAnalyzer
+{
+    private static final SqlParser SQL_PARSER = new SqlParser();
+
+    @Test
+    void testParameters()
+    {
+        assertFails("FUNCTION test(x) RETURNS int RETURN 123")
+                .hasErrorCode(INVALID_ARGUMENTS)
+                .hasMessage("line 1:15: Function parameters must have a name");
+
+        assertFails("FUNCTION test(x int, y int, x bigint) RETURNS int RETURN 123")
+                .hasErrorCode(INVALID_ARGUMENTS)
+                .hasMessage("line 1:29: Duplicate function parameter name: x");
+    }
+
+    @Test
+    void testCharacteristics()
+    {
+        assertFails("FUNCTION test() RETURNS int CALLED ON NULL INPUT CALLED ON NULL INPUT RETURN 123")
+                .hasErrorCode(SYNTAX_ERROR)
+                .hasMessage("line 1:1: Multiple null-call clauses specified");
+
+        assertFails("FUNCTION test() RETURNS int RETURNS NULL ON NULL INPUT CALLED ON NULL INPUT RETURN 123")
+                .hasErrorCode(SYNTAX_ERROR)
+                .hasMessage("line 1:1: Multiple null-call clauses specified");
+
+        assertFails("FUNCTION test() RETURNS int COMMENT 'abc' COMMENT 'xyz' RETURN 123")
+                .hasErrorCode(SYNTAX_ERROR)
+                .hasMessage("line 1:1: Multiple comment clauses specified");
+
+        assertFails("FUNCTION test() RETURNS int LANGUAGE abc LANGUAGE xyz RETURN 123")
+                .hasErrorCode(SYNTAX_ERROR)
+                .hasMessage("line 1:1: Multiple language clauses specified");
+
+        assertFails("FUNCTION test() RETURNS int NOT DETERMINISTIC DETERMINISTIC RETURN 123")
+                .hasErrorCode(SYNTAX_ERROR)
+                .hasMessage("line 1:1: Multiple deterministic clauses specified");
+    }
+
+    @Test
+    void testParameterTypeUnknown()
+    {
+        assertFails("FUNCTION test(x abc) RETURNS int RETURN 123")
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 1:15: Unknown type: abc");
+    }
+
+    @Test
+    void testReturnTypeUnknown()
+    {
+        assertFails("FUNCTION test() RETURNS abc RETURN 123")
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 1:17: Unknown type: abc");
+    }
+
+    @Test
+    void testReturnType()
+    {
+        analyze("FUNCTION test() RETURNS bigint RETURN smallint '123'");
+        analyze("FUNCTION test() RETURNS varchar(10) RETURN 'test'");
+
+        assertFails("FUNCTION test() RETURNS varchar(2) RETURN 'test'")
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 1:43: Value of RETURN must evaluate to varchar(2) (actual: varchar(4))");
+
+        assertFails("FUNCTION test() RETURNS bigint RETURN random()")
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 1:39: Value of RETURN must evaluate to bigint (actual: double)");
+
+        assertFails("FUNCTION test() RETURNS real RETURN random()")
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 1:37: Value of RETURN must evaluate to real (actual: double)");
+    }
+
+    @Test
+    void testLanguage()
+    {
+        assertThat(analyze("FUNCTION test() RETURNS bigint LANGUAGE SQL RETURN abs(-42)"))
+                .returns(true, from(SqlRoutineAnalysis::deterministic));
+
+        assertFails("FUNCTION test() RETURNS bigint LANGUAGE JAVASCRIPT RETURN abs(-42)")
+                .hasErrorCode(NOT_SUPPORTED)
+                .hasMessage("line 1:1: Unsupported language: JAVASCRIPT");
+    }
+
+    @Test
+    void testDeterministic()
+    {
+        assertThat(analyze("FUNCTION test() RETURNS bigint RETURN abs(-42)"))
+                .returns(true, from(SqlRoutineAnalysis::deterministic));
+
+        assertThat(analyze("FUNCTION test() RETURNS bigint DETERMINISTIC RETURN abs(-42)"))
+                .returns(true, from(SqlRoutineAnalysis::deterministic));
+
+        assertFails("FUNCTION test() RETURNS bigint NOT DETERMINISTIC RETURN abs(-42)")
+                .hasErrorCode(INVALID_ARGUMENTS)
+                .hasMessage("line 1:1: Deterministic function declared NOT DETERMINISTIC");
+
+        assertThat(analyze("FUNCTION test() RETURNS varchar RETURN reverse('test')"))
+                .returns(true, from(SqlRoutineAnalysis::deterministic));
+
+        assertThat(analyze("FUNCTION test() RETURNS double NOT DETERMINISTIC RETURN 42 * random()"))
+                .returns(false, from(SqlRoutineAnalysis::deterministic));
+
+        assertFails("FUNCTION test() RETURNS double RETURN 42 * random()")
+                .hasErrorCode(INVALID_ARGUMENTS)
+                .hasMessage("line 1:1: Non-deterministic function declared DETERMINISTIC");
+    }
+
+    @Test
+    void testIfConditionType()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  IF random() THEN
+                    RETURN 13;
+                  END IF;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 3:6: Condition of IF statement must evaluate to boolean (actual: double)");
+    }
+
+    @Test
+    void testElseIfConditionType()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  IF false THEN
+                    RETURN 13;
+                  ELSEIF random() THEN
+                    RETURN 13;
+                  END IF;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 5:10: Condition of ELSEIF clause must evaluate to boolean (actual: double)");
+    }
+
+    @Test
+    void testCaseWhenClauseValueType()
+    {
+        assertFails("""
+                FUNCTION test(x int) RETURNS int
+                BEGIN
+                  CASE x
+                    WHEN 13 THEN RETURN 13;
+                    WHEN 'abc' THEN RETURN 42;
+                  END CASE;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 5:10: WHEN clause value must evaluate to CASE value type integer (actual: varchar(3))");
+    }
+
+    @Test
+    void testCaseWhenClauseConditionType()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  CASE
+                    WHEN true THEN RETURN 42;
+                    WHEN 13 THEN RETURN 13;
+                  END CASE;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 5:10: Condition of WHEN clause must evaluate to boolean (actual: integer)");
+    }
+
+    @Test
+    void testMissingReturn()
+    {
+        assertFails("FUNCTION test() RETURNS int BEGIN END")
+                .hasErrorCode(MISSING_RETURN)
+                .hasMessage("line 1:29: Function must end in a RETURN statement");
+
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  IF false THEN
+                    RETURN 13;
+                  END IF;
+                END
+                """)
+                .hasErrorCode(MISSING_RETURN)
+                .hasMessage("line 2:1: Function must end in a RETURN statement");
+    }
+
+    @Test
+    void testBadVariableDefault()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  DECLARE x int DEFAULT 'abc';
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 3:25: Value of DEFAULT must evaluate to integer (actual: varchar(3))");
+    }
+
+    @Test
+    void testVariableAlreadyDeclared()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  DECLARE x int;
+                  DECLARE x int;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(ALREADY_EXISTS)
+                .hasMessage("line 4:11: Variable already declared in this scope: x");
+
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  DECLARE x int;
+                  DECLARE y, x int;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(ALREADY_EXISTS)
+                .hasMessage("line 4:14: Variable already declared in this scope: x");
+
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  DECLARE x, y, x int;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(ALREADY_EXISTS)
+                .hasMessage("line 3:17: Variable already declared in this scope: x");
+
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  DECLARE x int;
+                  BEGIN
+                    DECLARE x int;
+                  END;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(ALREADY_EXISTS)
+                .hasMessage("line 5:13: Variable already declared in this scope: x");
+
+        analyze("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  BEGIN
+                    DECLARE x int;
+                  END;
+                  BEGIN
+                    DECLARE x varchar;
+                  END;
+                  RETURN 0;
+                END
+                """);
+    }
+
+    @Test
+    void testAssignmentUnknownTarget()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  SET x = 13;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(NOT_FOUND)
+                .hasMessage("line 3:7: Variable cannot be resolved: x");
+    }
+
+    @Test
+    void testAssignmentType()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  DECLARE x int;
+                  SET x = 'abc';
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 4:11: Value of SET 'x' must evaluate to integer (actual: varchar(3))");
+    }
+
+    @Test
+    void testWhileConditionType()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  WHILE 13 DO
+                    RETURN 0;
+                  END WHILE;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(TYPE_MISMATCH)
+                .hasMessage("line 3:9: Condition of WHILE statement must evaluate to boolean (actual: integer)");
+    }
+
+    @Test
+    void testUntilConditionType()
+    {
+         assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  REPEAT
+                    RETURN 42;
+                  UNTIL 13 END REPEAT;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(TYPE_MISMATCH)
+                 .hasMessage("line 5:9: Condition of REPEAT statement must evaluate to boolean (actual: integer)");
+    }
+
+    @Test
+    void testIterateUnknownLabel()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  WHILE true DO
+                    ITERATE abc;
+                  END WHILE;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(NOT_FOUND)
+                .hasMessage("line 4:13: Label not defined: abc");
+    }
+
+    @Test
+    void testLeaveUnknownLabel()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  LEAVE abc;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(NOT_FOUND)
+                .hasMessage("line 3:9: Label not defined: abc");
+    }
+
+    @Test
+    void testDuplicateWhileLabel()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  abc: WHILE true DO
+                    LEAVE abc;
+                    abc: WHILE true DO
+                      LEAVE abc;
+                    END WHILE;
+                  END WHILE;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(ALREADY_EXISTS)
+                .hasMessage("line 5:5: Label already declared in this scope: abc");
+
+        analyze("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  abc: WHILE true DO
+                    LEAVE abc;
+                  END WHILE;
+                  abc: WHILE true DO
+                    LEAVE abc;
+                  END WHILE;
+                  RETURN 0;
+                END
+                """);
+    }
+
+    @Test
+    void testDuplicateRepeatLabel()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  abc: REPEAT
+                    LEAVE abc;
+                    abc: REPEAT
+                      LEAVE abc;
+                    UNTIL true END REPEAT;
+                  UNTIL true END REPEAT;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(ALREADY_EXISTS)
+                .hasMessage("line 5:5: Label already declared in this scope: abc");
+
+        analyze("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  abc: REPEAT
+                    LEAVE abc;
+                  UNTIL true END REPEAT;
+                  abc: REPEAT
+                    LEAVE abc;
+                  UNTIL true END REPEAT;
+                  RETURN 0;
+                END
+                """);
+    }
+
+    @Test
+    void testDuplicateLoopLabel()
+    {
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  abc: LOOP
+                    LEAVE abc;
+                    abc: LOOP
+                      LEAVE abc;
+                    END LOOP;
+                  END LOOP;
+                  RETURN 0;
+                END
+                """)
+                .hasErrorCode(ALREADY_EXISTS)
+                .hasMessage("line 5:5: Label already declared in this scope: abc");
+
+        analyze("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  abc: LOOP
+                    LEAVE abc;
+                  END LOOP;
+                  abc: LOOP
+                    LEAVE abc;
+                  END LOOP;
+                  RETURN 0;
+                END
+                """);
+    }
+
+    @Test
+    void testSubquery()
+    {
+        assertFails("FUNCTION test() RETURNS int RETURN (SELECT 123)")
+                .hasErrorCode(NOT_SUPPORTED)
+                .hasMessage("line 1:36: Queries are not allowed in functions");
+
+        assertFails("""
+                FUNCTION test() RETURNS int
+                BEGIN
+                  RETURN (SELECT 123);
+                END
+                """)
+                .hasErrorCode(NOT_SUPPORTED)
+                .hasMessage("line 3:10: Queries are not allowed in functions");
+    }
+
+    private static TrinoExceptionAssert assertFails(@Language("SQL") String function)
+    {
+        return assertTrinoExceptionThrownBy(() -> analyze(function));
+    }
+
+    private static SqlRoutineAnalysis analyze(@Language("SQL") String function)
+    {
+        FunctionSpecification specification = SQL_PARSER.createFunctionSpecification(function);
+
+        TransactionManager transactionManager = new TestingTransactionManager();
+        PlannerContext plannerContext = plannerContextBuilder()
+                .withTransactionManager(transactionManager)
+                .build();
+        return transaction(transactionManager, plannerContext.getMetadata(), new AllowAllAccessControl())
+                .singleStatement()
+                .execute(testSession(), transactionSession -> {
+                    SqlRoutineAnalyzer analyzer = new SqlRoutineAnalyzer(plannerContext, WarningCollector.NOOP);
+                    return analyzer.analyze(transactionSession, new AllowAllAccessControl(), specification);
+                });
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/sql/routine/TestSqlRoutineCompiler.java b/core/trino-main/src/test/java/io/trino/sql/routine/TestSqlRoutineCompiler.java
new file mode 100644
index 000000000000..5771adb312e2
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/sql/routine/TestSqlRoutineCompiler.java
@@ -0,0 +1,316 @@
+/*
+ * Licensed 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 io.trino.sql.routine;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.Session;
+import io.trino.metadata.ResolvedFunction;
+import io.trino.spi.function.OperatorType;
+import io.trino.spi.type.Type;
+import io.trino.sql.relational.InputReferenceExpression;
+import io.trino.sql.relational.RowExpression;
+import io.trino.sql.routine.ir.IrBlock;
+import io.trino.sql.routine.ir.IrBreak;
+import io.trino.sql.routine.ir.IrContinue;
+import io.trino.sql.routine.ir.IrIf;
+import io.trino.sql.routine.ir.IrLabel;
+import io.trino.sql.routine.ir.IrLoop;
+import io.trino.sql.routine.ir.IrRepeat;
+import io.trino.sql.routine.ir.IrReturn;
+import io.trino.sql.routine.ir.IrRoutine;
+import io.trino.sql.routine.ir.IrSet;
+import io.trino.sql.routine.ir.IrStatement;
+import io.trino.sql.routine.ir.IrVariable;
+import io.trino.sql.routine.ir.IrWhile;
+import io.trino.util.Reflection;
+import org.junit.jupiter.api.Test;
+
+import java.lang.invoke.MethodHandle;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Supplier;
+
+import static com.google.common.collect.MoreCollectors.onlyElement;
+import static io.trino.spi.function.OperatorType.ADD;
+import static io.trino.spi.function.OperatorType.LESS_THAN;
+import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.MULTIPLY;
+import static io.trino.spi.function.OperatorType.SUBTRACT;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
+import static io.trino.sql.relational.Expressions.call;
+import static io.trino.sql.relational.Expressions.constant;
+import static io.trino.sql.relational.Expressions.constantNull;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static io.trino.util.Reflection.constructorMethodHandle;
+import static java.util.Arrays.stream;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestSqlRoutineCompiler
+{
+    private static final Session TEST_SESSION = testSessionBuilder().build();
+    private final SqlRoutineCompiler compiler = new SqlRoutineCompiler(PLANNER_CONTEXT.getFunctionManager());
+
+    @Test
+    public void testSimpleExpression()
+            throws Throwable
+    {
+        // CREATE FUNCTION test(a bigint)
+        // RETURNS bigint
+        // BEGIN
+        //   DECLARE x bigint DEFAULT 99;
+        //   RETURN x * a;
+        // END
+
+        IrVariable arg = new IrVariable(0, BIGINT, constantNull(BIGINT));
+        IrVariable variable = new IrVariable(1, BIGINT, constant(99L, BIGINT));
+
+        ResolvedFunction multiply = operator(MULTIPLY, BIGINT, BIGINT);
+
+        IrRoutine routine = new IrRoutine(
+                BIGINT,
+                parameters(arg),
+                new IrBlock(variables(variable), statements(
+                        new IrSet(variable, call(multiply, reference(variable), reference(arg))),
+                        new IrReturn(reference(variable)))));
+
+        MethodHandle handle = compile(routine);
+
+        assertThat(handle.invoke(0L)).isEqualTo(0L);
+        assertThat(handle.invoke(1L)).isEqualTo(99L);
+        assertThat(handle.invoke(42L)).isEqualTo(42L * 99);
+        assertThat(handle.invoke(123L)).isEqualTo(123L * 99);
+    }
+
+    @Test
+    public void testFibonacciWhileLoop()
+            throws Throwable
+    {
+        // CREATE FUNCTION fib(n bigint)
+        // RETURNS bigint
+        // BEGIN
+        //   DECLARE a bigint DEFAULT 1;
+        //   DECLARE b bigint DEFAULT 1;
+        //   DECLARE c bigint;
+        //
+        //   IF n <= 2 THEN
+        //     RETURN 1;
+        //   END IF;
+        //
+        //   WHILE n > 2 DO
+        //     SET n = n - 1;
+        //     SET c = a + b;
+        //     SET a = b;
+        //     SET b = c;
+        //   END WHILE;
+        //
+        //   RETURN c;
+        // END
+
+        IrVariable n = new IrVariable(0, BIGINT, constantNull(BIGINT));
+        IrVariable a = new IrVariable(1, BIGINT, constant(1L, BIGINT));
+        IrVariable b = new IrVariable(2, BIGINT, constant(1L, BIGINT));
+        IrVariable c = new IrVariable(3, BIGINT, constantNull(BIGINT));
+
+        ResolvedFunction add = operator(ADD, BIGINT, BIGINT);
+        ResolvedFunction subtract = operator(SUBTRACT, BIGINT, BIGINT);
+        ResolvedFunction lessThan = operator(LESS_THAN, BIGINT, BIGINT);
+        ResolvedFunction lessThanOrEqual = operator(LESS_THAN_OR_EQUAL, BIGINT, BIGINT);
+
+        IrRoutine routine = new IrRoutine(
+                BIGINT,
+                parameters(n),
+                new IrBlock(variables(a, b, c), statements(
+                        new IrIf(
+                                call(lessThanOrEqual, reference(n), constant(2L, BIGINT)),
+                                new IrReturn(constant(1L, BIGINT)),
+                                Optional.empty()),
+                        new IrWhile(
+                                Optional.empty(),
+                                call(lessThan, constant(2L, BIGINT), reference(n)),
+                                new IrBlock(
+                                        variables(),
+                                        statements(
+                                                new IrSet(n, call(subtract, reference(n), constant(1L, BIGINT))),
+                                                new IrSet(c, call(add, reference(a), reference(b))),
+                                                new IrSet(a, reference(b)),
+                                                new IrSet(b, reference(c))))),
+                        new IrReturn(reference(c)))));
+
+        MethodHandle handle = compile(routine);
+
+        assertThat(handle.invoke(1L)).isEqualTo(1L);
+        assertThat(handle.invoke(2L)).isEqualTo(1L);
+        assertThat(handle.invoke(3L)).isEqualTo(2L);
+        assertThat(handle.invoke(4L)).isEqualTo(3L);
+        assertThat(handle.invoke(5L)).isEqualTo(5L);
+        assertThat(handle.invoke(6L)).isEqualTo(8L);
+        assertThat(handle.invoke(7L)).isEqualTo(13L);
+        assertThat(handle.invoke(8L)).isEqualTo(21L);
+    }
+
+    @Test
+    public void testBreakContinue()
+            throws Throwable
+    {
+        // CREATE FUNCTION test()
+        // RETURNS bigint
+        // BEGIN
+        //   DECLARE a bigint DEFAULT 0;
+        //   DECLARE b bigint DEFAULT 0;
+        //
+        //   top: WHILE a < 10 DO
+        //     SET a = a + 1;
+        //     IF a < 3 THEN
+        //       ITERATE top;
+        //     END IF;
+        //     SET b = b + 1;
+        //     IF a > 6 THEN
+        //       LEAVE top;
+        //     END IF;
+        //   END WHILE;
+        //
+        //   RETURN b;
+        // END
+
+        IrVariable a = new IrVariable(0, BIGINT, constant(0L, BIGINT));
+        IrVariable b = new IrVariable(1, BIGINT, constant(0L, BIGINT));
+
+        ResolvedFunction add = operator(ADD, BIGINT, BIGINT);
+        ResolvedFunction lessThan = operator(LESS_THAN, BIGINT, BIGINT);
+
+        IrLabel label = new IrLabel("test");
+
+        IrRoutine routine = new IrRoutine(
+                BIGINT,
+                parameters(),
+                new IrBlock(variables(a, b), statements(
+                        new IrWhile(
+                                Optional.of(label),
+                                call(lessThan, reference(a), constant(10L, BIGINT)),
+                                new IrBlock(variables(), statements(
+                                        new IrSet(a, call(add, reference(a), constant(1L, BIGINT))),
+                                        new IrIf(
+                                                call(lessThan, reference(a), constant(3L, BIGINT)),
+                                                new IrContinue(label),
+                                                Optional.empty()),
+                                        new IrSet(b, call(add, reference(b), constant(1L, BIGINT))),
+                                        new IrIf(
+                                                call(lessThan, constant(6L, BIGINT), reference(a)),
+                                                new IrBreak(label),
+                                                Optional.empty())))),
+                        new IrReturn(reference(b)))));
+
+        MethodHandle handle = compile(routine);
+
+        assertThat(handle.invoke()).isEqualTo(5L);
+    }
+
+    @Test
+    public void testInterruptionWhile()
+            throws Throwable
+    {
+        assertRoutineInterruption(() -> new IrWhile(
+                Optional.empty(),
+                constant(true, BOOLEAN),
+                new IrBlock(variables(), statements())));
+    }
+
+    @Test
+    public void testInterruptionRepeat()
+            throws Throwable
+    {
+        assertRoutineInterruption(() -> new IrRepeat(
+                Optional.empty(),
+                constant(false, BOOLEAN),
+                new IrBlock(variables(), statements())));
+    }
+
+    @Test
+    public void testInterruptionLoop()
+            throws Throwable
+    {
+        assertRoutineInterruption(() -> new IrLoop(
+                Optional.empty(),
+                new IrBlock(variables(), statements())));
+    }
+
+    private void assertRoutineInterruption(Supplier<IrStatement> loopFactory)
+            throws Throwable
+    {
+        IrRoutine routine = new IrRoutine(
+                BIGINT,
+                parameters(),
+                new IrBlock(variables(), statements(
+                        loopFactory.get(),
+                        new IrReturn(constant(null, BIGINT)))));
+
+        MethodHandle handle = compile(routine);
+
+        AtomicBoolean interrupted = new AtomicBoolean();
+        Thread thread = new Thread(() -> {
+            assertThatThrownBy(handle::invoke)
+                    .hasMessageContaining("Thread interrupted");
+            interrupted.set(true);
+        });
+        thread.start();
+        thread.interrupt();
+        thread.join(TimeUnit.SECONDS.toMillis(10));
+        assertThat(interrupted).isTrue();
+    }
+
+    private MethodHandle compile(IrRoutine routine)
+            throws Throwable
+    {
+        Class<?> clazz = compiler.compileClass(routine);
+
+        MethodHandle handle = stream(clazz.getMethods())
+                .filter(method -> method.getName().equals("run"))
+                .map(Reflection::methodHandle)
+                .collect(onlyElement());
+
+        Object instance = constructorMethodHandle(clazz).invoke();
+
+        return handle.bindTo(instance).bindTo(TEST_SESSION.toConnectorSession());
+    }
+
+    private static List<IrVariable> parameters(IrVariable... variables)
+    {
+        return ImmutableList.copyOf(variables);
+    }
+
+    private static List<IrVariable> variables(IrVariable... variables)
+    {
+        return ImmutableList.copyOf(variables);
+    }
+
+    private static List<IrStatement> statements(IrStatement... statements)
+    {
+        return ImmutableList.copyOf(statements);
+    }
+
+    private static RowExpression reference(IrVariable variable)
+    {
+        return new InputReferenceExpression(variable.field(), variable.type());
+    }
+
+    private static ResolvedFunction operator(OperatorType operator, Type... argumentTypes)
+    {
+        return PLANNER_CONTEXT.getMetadata().resolveOperator(operator, ImmutableList.copyOf(argumentTypes));
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/testing/TestBytes.java b/core/trino-main/src/test/java/io/trino/testing/TestBytes.java
index 78fbe57981cc..1f9c33c0b325 100644
--- a/core/trino-main/src/test/java/io/trino/testing/TestBytes.java
+++ b/core/trino-main/src/test/java/io/trino/testing/TestBytes.java
@@ -13,7 +13,7 @@
  */
 package io.trino.testing;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 
diff --git a/core/trino-main/src/main/java/io/trino/testing/TestTestingMetadata.java b/core/trino-main/src/test/java/io/trino/testing/TestTestingMetadata.java
similarity index 94%
rename from core/trino-main/src/main/java/io/trino/testing/TestTestingMetadata.java
rename to core/trino-main/src/test/java/io/trino/testing/TestTestingMetadata.java
index f83947556bb7..8abce5709f1b 100644
--- a/core/trino-main/src/main/java/io/trino/testing/TestTestingMetadata.java
+++ b/core/trino-main/src/test/java/io/trino/testing/TestTestingMetadata.java
@@ -18,8 +18,9 @@
 import io.trino.spi.connector.ConnectorMaterializedViewDefinition;
 import io.trino.spi.connector.ConnectorMaterializedViewDefinition.Column;
 import io.trino.spi.connector.SchemaTableName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.time.Duration;
 import java.util.Optional;
 
 import static io.trino.spi.connector.SchemaTableName.schemaTableName;
@@ -58,8 +59,10 @@ private static ConnectorMaterializedViewDefinition someMaterializedView()
                 Optional.empty(),
                 Optional.empty(),
                 ImmutableList.of(new Column("test", BIGINT.getTypeId())),
+                Optional.of(Duration.ZERO),
                 Optional.empty(),
                 Optional.of("owner"),
+                ImmutableList.of(),
                 ImmutableMap.of());
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/tests/TestVerifyTrinoMainTestSetup.java b/core/trino-main/src/test/java/io/trino/tests/TestVerifyTrinoMainTestSetup.java
index 277394914d98..44b107491ab3 100644
--- a/core/trino-main/src/test/java/io/trino/tests/TestVerifyTrinoMainTestSetup.java
+++ b/core/trino-main/src/test/java/io/trino/tests/TestVerifyTrinoMainTestSetup.java
@@ -13,7 +13,7 @@
  */
 package io.trino.tests;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.ZoneId;
 
diff --git a/core/trino-main/src/test/java/io/trino/tracing/TestTracingAccessControl.java b/core/trino-main/src/test/java/io/trino/tracing/TestTracingAccessControl.java
new file mode 100644
index 000000000000..252ac69480b8
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/tracing/TestTracingAccessControl.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed 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 io.trino.tracing;
+
+import io.trino.security.AccessControl;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
+
+public class TestTracingAccessControl
+{
+    @Test
+    public void testEverythingImplemented()
+    {
+        assertAllMethodsOverridden(AccessControl.class, TracingAccessControl.class);
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/tracing/TestTracingConnectorMetadata.java b/core/trino-main/src/test/java/io/trino/tracing/TestTracingConnectorMetadata.java
new file mode 100644
index 000000000000..9d8bf40ac2ae
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/tracing/TestTracingConnectorMetadata.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed 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 io.trino.tracing;
+
+import io.trino.spi.connector.ConnectorMetadata;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
+
+public class TestTracingConnectorMetadata
+{
+    @Test
+    public void testEverythingImplemented()
+    {
+        assertAllMethodsOverridden(ConnectorMetadata.class, TracingConnectorMetadata.class);
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/tracing/TestTracingMetadata.java b/core/trino-main/src/test/java/io/trino/tracing/TestTracingMetadata.java
new file mode 100644
index 000000000000..606180de7259
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/tracing/TestTracingMetadata.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed 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 io.trino.tracing;
+
+import io.trino.metadata.Metadata;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
+
+public class TestTracingMetadata
+{
+    @Test
+    public void testEverythingImplemented()
+    {
+        assertAllMethodsOverridden(Metadata.class, TracingMetadata.class);
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/transaction/TestTransactionManager.java b/core/trino-main/src/test/java/io/trino/transaction/TestTransactionManager.java
index c518d2e93308..793a4ba66188 100644
--- a/core/trino-main/src/test/java/io/trino/transaction/TestTransactionManager.java
+++ b/core/trino-main/src/test/java/io/trino/transaction/TestTransactionManager.java
@@ -19,8 +19,9 @@
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.Closeable;
 import java.util.concurrent.ExecutorService;
@@ -39,15 +40,17 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestTransactionManager
 {
     private final ExecutorService finishingExecutor = newCachedThreadPool(daemonThreadsNamed("transaction-%s"));
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         finishingExecutor.shutdownNow();
diff --git a/core/trino-main/src/test/java/io/trino/transaction/TestTransactionManagerConfig.java b/core/trino-main/src/test/java/io/trino/transaction/TestTransactionManagerConfig.java
index db11f432414a..10df15b255fe 100644
--- a/core/trino-main/src/test/java/io/trino/transaction/TestTransactionManagerConfig.java
+++ b/core/trino-main/src/test/java/io/trino/transaction/TestTransactionManagerConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
diff --git a/core/trino-main/src/test/java/io/trino/type/AbstractTestType.java b/core/trino-main/src/test/java/io/trino/type/AbstractTestType.java
index 1e1626a3b2ed..19d8600f960d 100644
--- a/core/trino-main/src/test/java/io/trino/type/AbstractTestType.java
+++ b/core/trino-main/src/test/java/io/trino/type/AbstractTestType.java
@@ -23,6 +23,7 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockEncodingSerde;
 import io.trino.spi.block.TestingBlockEncodingSerde;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.LongTimestamp;
 import io.trino.spi.type.LongTimestampWithTimeZone;
@@ -38,13 +39,16 @@
 import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
 import io.trino.type.BlockTypeOperators.BlockPositionIsDistinctFrom;
 import io.trino.type.BlockTypeOperators.BlockPositionXxHash64;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.lang.invoke.MethodHandle;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.SortedMap;
 import java.util.TreeMap;
+import java.util.stream.IntStream;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.testing.Assertions.assertInstanceOf;
@@ -56,8 +60,14 @@
 import static io.trino.spi.connector.SortOrder.DESC_NULLS_FIRST;
 import static io.trino.spi.connector.SortOrder.DESC_NULLS_LAST;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.DEFAULT_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
@@ -65,7 +75,7 @@
 import static io.trino.sql.ExpressionUtils.isEffectivelyLiteral;
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.util.StructuralTestUtil.arrayBlockOf;
-import static io.trino.util.StructuralTestUtil.mapBlockOf;
+import static io.trino.util.StructuralTestUtil.sqlMapOf;
 import static java.lang.String.format;
 import static java.util.Collections.unmodifiableSortedMap;
 import static java.util.Objects.requireNonNull;
@@ -81,9 +91,26 @@ public abstract class AbstractTestType
     private final BlockEncodingSerde blockEncodingSerde = new TestingBlockEncodingSerde();
 
     private final Class<?> objectValueType;
-    private final Block testBlock;
+    private final ValueBlock testBlock;
     protected final Type type;
+
     private final TypeOperators typeOperators;
+    private final MethodHandle readBlockMethod;
+    private final MethodHandle writeBlockMethod;
+    private final MethodHandle writeFlatToBlockMethod;
+    private final MethodHandle readFlatMethod;
+    private final MethodHandle writeFlatMethod;
+    private final MethodHandle writeBlockToFlatMethod;
+    private final MethodHandle stackStackEqualOperator;
+    private final MethodHandle flatFlatEqualOperator;
+    private final MethodHandle flatBlockPositionEqualOperator;
+    private final MethodHandle blockPositionFlatEqualOperator;
+    private final MethodHandle flatHashCodeOperator;
+    private final MethodHandle flatXxHash64Operator;
+    private final MethodHandle flatFlatDistinctFromOperator;
+    private final MethodHandle flatBlockPositionDistinctFromOperator;
+    private final MethodHandle blockPositionFlatDistinctFromOperator;
+
     protected final BlockTypeOperators blockTypeOperators;
     private final BlockPositionEqual equalOperator;
     private final BlockPositionHashCode hashCodeOperator;
@@ -91,25 +118,52 @@ public abstract class AbstractTestType
     private final BlockPositionIsDistinctFrom distinctFromOperator;
     private final SortedMap<Integer, Object> expectedStackValues;
     private final SortedMap<Integer, Object> expectedObjectValues;
-    private final Block testBlockWithNulls;
+    private final ValueBlock testBlockWithNulls;
 
-    protected AbstractTestType(Type type, Class<?> objectValueType, Block testBlock)
+    protected AbstractTestType(Type type, Class<?> objectValueType, ValueBlock testBlock)
     {
         this(type, objectValueType, testBlock, testBlock);
     }
 
-    protected AbstractTestType(Type type, Class<?> objectValueType, Block testBlock, Block expectedValues)
+    protected AbstractTestType(Type type, Class<?> objectValueType, ValueBlock testBlock, ValueBlock expectedValues)
     {
         this.type = requireNonNull(type, "type is null");
         typeOperators = new TypeOperators();
+        readBlockMethod = typeOperators.getReadValueOperator(type, simpleConvention(FAIL_ON_NULL, VALUE_BLOCK_POSITION_NOT_NULL));
+        writeBlockMethod = typeOperators.getReadValueOperator(type, simpleConvention(BLOCK_BUILDER, NEVER_NULL));
+        writeFlatToBlockMethod = typeOperators.getReadValueOperator(type, simpleConvention(BLOCK_BUILDER, FLAT));
+        readFlatMethod = typeOperators.getReadValueOperator(type, simpleConvention(FAIL_ON_NULL, FLAT));
+        writeFlatMethod = typeOperators.getReadValueOperator(type, simpleConvention(FLAT_RETURN, NEVER_NULL));
+        writeBlockToFlatMethod = typeOperators.getReadValueOperator(type, simpleConvention(FLAT_RETURN, VALUE_BLOCK_POSITION));
+
         blockTypeOperators = new BlockTypeOperators(typeOperators);
         if (type.isComparable()) {
+            stackStackEqualOperator = typeOperators.getEqualOperator(type, simpleConvention(NULLABLE_RETURN, NEVER_NULL, NEVER_NULL));
+            flatFlatEqualOperator = typeOperators.getEqualOperator(type, simpleConvention(NULLABLE_RETURN, FLAT, FLAT));
+            flatBlockPositionEqualOperator = typeOperators.getEqualOperator(type, simpleConvention(NULLABLE_RETURN, FLAT, VALUE_BLOCK_POSITION));
+            blockPositionFlatEqualOperator = typeOperators.getEqualOperator(type, simpleConvention(NULLABLE_RETURN, VALUE_BLOCK_POSITION, FLAT));
+            flatHashCodeOperator = typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, FLAT));
+            flatXxHash64Operator = typeOperators.getXxHash64Operator(type, simpleConvention(FAIL_ON_NULL, FLAT));
+            flatFlatDistinctFromOperator = typeOperators.getDistinctFromOperator(type, simpleConvention(FAIL_ON_NULL, FLAT, FLAT));
+            flatBlockPositionDistinctFromOperator = typeOperators.getDistinctFromOperator(type, simpleConvention(FAIL_ON_NULL, FLAT, VALUE_BLOCK_POSITION));
+            blockPositionFlatDistinctFromOperator = typeOperators.getDistinctFromOperator(type, simpleConvention(FAIL_ON_NULL, VALUE_BLOCK_POSITION, FLAT));
+
             equalOperator = blockTypeOperators.getEqualOperator(type);
             hashCodeOperator = blockTypeOperators.getHashCodeOperator(type);
             xxHash64Operator = blockTypeOperators.getXxHash64Operator(type);
             distinctFromOperator = blockTypeOperators.getDistinctFromOperator(type);
         }
         else {
+            stackStackEqualOperator = null;
+            flatFlatEqualOperator = null;
+            flatBlockPositionEqualOperator = null;
+            blockPositionFlatEqualOperator = null;
+            flatHashCodeOperator = null;
+            flatXxHash64Operator = null;
+            flatFlatDistinctFromOperator = null;
+            flatBlockPositionDistinctFromOperator = null;
+            blockPositionFlatDistinctFromOperator = null;
+
             equalOperator = null;
             hashCodeOperator = null;
             xxHash64Operator = null;
@@ -124,7 +178,7 @@ protected AbstractTestType(Type type, Class<?> objectValueType, Block testBlock,
         this.testBlockWithNulls = createAlternatingNullsBlock(testBlock);
     }
 
-    private Block createAlternatingNullsBlock(Block testBlock)
+    private ValueBlock createAlternatingNullsBlock(Block testBlock)
     {
         BlockBuilder nullsBlockBuilder = type.createBlockBuilder(null, testBlock.getPositionCount());
         for (int position = 0; position < testBlock.getPositionCount(); position++) {
@@ -150,7 +204,7 @@ else if (type.getJavaType() == Slice.class) {
             }
             nullsBlockBuilder.appendNull();
         }
-        return nullsBlockBuilder.build();
+        return nullsBlockBuilder.buildValueBlock();
     }
 
     @Test
@@ -160,7 +214,7 @@ public void testLiteralFormRecognized()
         LiteralEncoder literalEncoder = new LiteralEncoder(plannerContext);
         for (int position = 0; position < testBlock.getPositionCount(); position++) {
             Object value = readNativeValue(type, testBlock, position);
-            Expression expression = literalEncoder.toExpression(TEST_SESSION, value, type);
+            Expression expression = literalEncoder.toExpression(value, type);
             if (!isEffectivelyLiteral(plannerContext, TEST_SESSION, expression)) {
                 fail(format(
                         "Expression not recognized literal for value %s at position %s (%s): %s",
@@ -181,6 +235,7 @@ protected PlannerContext createPlannerContext()
 
     @Test
     public void testBlock()
+            throws Throwable
     {
         for (Entry<Integer, Object> entry : expectedStackValues.entrySet()) {
             assertPositionEquals(testBlock, entry.getKey(), entry.getValue(), expectedObjectValues.get(entry.getKey()));
@@ -192,38 +247,103 @@ public void testBlock()
     }
 
     @Test
-    public void testRange()
+    public void testFlat()
+            throws Throwable
     {
-        assertThat(type.getRange())
-                .isEmpty();
-    }
+        int flatFixedSize = type.getFlatFixedSize();
+        int[] variableLengths = new int[expectedStackValues.size()];
+        if (type.isFlatVariableWidth()) {
+            for (int i = 0; i < variableLengths.length; i++) {
+                variableLengths[i] = type.getFlatVariableWidthSize(testBlock, i);
+            }
+        }
 
-    @Test
-    public void testPreviousValue()
-    {
-        Object sampleValue = getSampleValue();
-        if (!type.isOrderable()) {
-            assertThatThrownBy(() -> type.getPreviousValue(sampleValue))
-                    .isInstanceOf(IllegalStateException.class)
-                    .hasMessage("Type is not orderable: " + type);
-            return;
+        byte[] fixed = new byte[expectedStackValues.size() * flatFixedSize];
+        byte[] variable = new byte[IntStream.of(variableLengths).sum()];
+        int variableOffset = 0;
+        for (int i = 0; i < expectedStackValues.size(); i++) {
+            writeFlatMethod.invoke(expectedStackValues.get(i), fixed, i * flatFixedSize, variable, variableOffset);
+            variableOffset += variableLengths[i];
         }
-        assertThat(type.getPreviousValue(sampleValue))
-                .isEmpty();
+        assertFlat(fixed, 0, variable);
+
+        Arrays.fill(fixed, (byte) 0);
+        Arrays.fill(variable, (byte) 0);
+        variableOffset = 0;
+        for (int i = 0; i < expectedStackValues.size(); i++) {
+            writeBlockToFlatMethod.invokeExact(testBlock, i, fixed, i * flatFixedSize, variable, variableOffset);
+            variableOffset += variableLengths[i];
+        }
+        assertFlat(fixed, 0, variable);
+
+        // test relocation
+        byte[] newFixed = new byte[fixed.length + 73];
+        System.arraycopy(fixed, 0, newFixed, 73, fixed.length);
+        byte[] newVariable = new byte[variable.length + 101];
+        System.arraycopy(variable, 0, newVariable, 101, variable.length);
+        Arrays.fill(fixed, (byte) 0);
+        Arrays.fill(variable, (byte) 0);
+
+        variableOffset = 101;
+        for (int i = 0; i < expectedStackValues.size(); i++) {
+            int variableSize = type.relocateFlatVariableWidthOffsets(newFixed, 73 + i * flatFixedSize, newVariable, variableOffset);
+            variableOffset += variableSize;
+            assertThat(variableSize).isEqualTo(variableLengths[i]);
+        }
+        assertFlat(newFixed, 73, newVariable);
     }
 
-    @Test
-    public void testNextValue()
+    private void assertFlat(byte[] fixed, int fixedOffset, byte[] variable)
+            throws Throwable
     {
-        Object sampleValue = getSampleValue();
-        if (!type.isOrderable()) {
-            assertThatThrownBy(() -> type.getNextValue(sampleValue))
-                    .isInstanceOf(IllegalStateException.class)
-                    .hasMessage("Type is not orderable: " + type);
-            return;
+        int flatFixedSize = type.getFlatFixedSize();
+        for (int i = 0; i < expectedStackValues.size(); i++) {
+            Object expectedStackValue = expectedStackValues.get(i);
+            int elementFixedOffset = fixedOffset + (i * flatFixedSize);
+            if (type.getJavaType() == boolean.class) {
+                assertEquals((boolean) readFlatMethod.invokeExact(fixed, elementFixedOffset, variable), expectedStackValue);
+            }
+            else if (type.getJavaType() == long.class) {
+                assertEquals((long) readFlatMethod.invokeExact(fixed, elementFixedOffset, variable), expectedStackValue);
+            }
+            else if (type.getJavaType() == double.class) {
+                assertEquals((double) readFlatMethod.invokeExact(fixed, elementFixedOffset, variable), expectedStackValue);
+            }
+            else if (type.getJavaType() == Slice.class) {
+                assertEquals((Slice) readFlatMethod.invokeExact(fixed, elementFixedOffset, variable), expectedStackValue);
+            }
+            else if (type.getJavaType() == Block.class) {
+                assertBlockEquals((Block) readFlatMethod.invokeExact(fixed, elementFixedOffset, variable), (Block) expectedStackValue);
+            }
+            else if (stackStackEqualOperator != null) {
+                assertTrue((Boolean) stackStackEqualOperator.invoke(readFlatMethod.invoke(fixed, elementFixedOffset, variable), expectedStackValue));
+            }
+            else {
+                assertEquals(readFlatMethod.invoke(fixed, elementFixedOffset, variable), expectedStackValue);
+            }
+
+            BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
+            writeFlatToBlockMethod.invokeExact(fixed, elementFixedOffset, variable, blockBuilder);
+            assertPositionEquals(testBlock, i, expectedStackValue, expectedObjectValues.get(i));
+
+            if (type.isComparable()) {
+                assertTrue((Boolean) flatFlatEqualOperator.invokeExact(fixed, elementFixedOffset, variable, fixed, elementFixedOffset, variable));
+                assertTrue((Boolean) flatBlockPositionEqualOperator.invokeExact(fixed, elementFixedOffset, variable, testBlock, i));
+                assertTrue((Boolean) blockPositionFlatEqualOperator.invokeExact(testBlock, i, fixed, elementFixedOffset, variable));
+
+                assertEquals((long) flatHashCodeOperator.invokeExact(fixed, elementFixedOffset, variable), hashCodeOperator.hashCodeNullSafe(testBlock, i));
+
+                assertEquals((long) flatXxHash64Operator.invokeExact(fixed, elementFixedOffset, variable), xxHash64Operator.xxHash64(testBlock, i));
+
+                assertFalse((boolean) flatFlatDistinctFromOperator.invokeExact(fixed, elementFixedOffset, variable, fixed, elementFixedOffset, variable));
+                assertFalse((boolean) flatBlockPositionDistinctFromOperator.invokeExact(fixed, elementFixedOffset, variable, testBlock, i));
+                assertFalse((boolean) blockPositionFlatDistinctFromOperator.invokeExact(testBlock, i, fixed, elementFixedOffset, variable));
+
+                ValueBlock nullValue = type.createBlockBuilder(null, 1).appendNull().buildValueBlock();
+                assertTrue((boolean) flatBlockPositionDistinctFromOperator.invokeExact(fixed, elementFixedOffset, variable, nullValue, 0));
+                assertTrue((boolean) blockPositionFlatDistinctFromOperator.invokeExact(nullValue, 0, fixed, elementFixedOffset, variable));
+            }
         }
-        assertThat(type.getNextValue(sampleValue))
-                .isEmpty();
     }
 
     protected Object getSampleValue()
@@ -231,7 +351,8 @@ protected Object getSampleValue()
         return requireNonNull(Iterables.get(expectedStackValues.values(), 0), "sample value is null");
     }
 
-    protected void assertPositionEquals(Block block, int position, Object expectedStackValue, Object expectedObjectValue)
+    protected void assertPositionEquals(ValueBlock block, int position, Object expectedStackValue, Object expectedObjectValue)
+            throws Throwable
     {
         long hash = 0;
         if (type.isComparable()) {
@@ -245,10 +366,17 @@ protected void assertPositionEquals(Block block, int position, Object expectedSt
 
         BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
         type.appendTo(block, position, blockBuilder);
-        assertPositionValue(blockBuilder.build(), 0, expectedStackValue, hash, expectedObjectValue);
+        assertPositionValue(blockBuilder.buildValueBlock(), 0, expectedStackValue, hash, expectedObjectValue);
+
+        if (expectedStackValue != null) {
+            blockBuilder = type.createBlockBuilder(null, 1);
+            writeBlockMethod.invoke(expectedStackValue, blockBuilder);
+            assertPositionValue(blockBuilder.buildValueBlock(), 0, expectedStackValue, hash, expectedObjectValue);
+        }
     }
 
-    private void assertPositionValue(Block block, int position, Object expectedStackValue, long expectedHash, Object expectedObjectValue)
+    private void assertPositionValue(ValueBlock block, int position, Object expectedStackValue, long expectedHash, Object expectedObjectValue)
+            throws Throwable
     {
         assertEquals(block.isNull(position), expectedStackValue == null);
 
@@ -277,6 +405,10 @@ private void assertPositionValue(Block block, int position, Object expectedStack
                     .isInstanceOf(UnsupportedOperationException.class)
                     .hasMessageContaining("is not comparable");
 
+            assertThatThrownBy(() -> typeOperators.getEqualOperator(type, simpleConvention(DEFAULT_ON_NULL, BLOCK_POSITION, BLOCK_POSITION)))
+                    .isInstanceOf(UnsupportedOperationException.class)
+                    .hasMessageContaining("is not comparable");
+
             assertThatThrownBy(() -> typeOperators.getDistinctFromOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION)))
                     .isInstanceOf(UnsupportedOperationException.class)
                     .hasMessageContaining("is not comparable");
@@ -325,18 +457,21 @@ private void assertPositionValue(Block block, int position, Object expectedStack
             assertThatThrownBy(() -> type.getLong(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getDouble(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getObject(block, position)).isInstanceOf(UnsupportedOperationException.class);
+            assertEquals((boolean) readBlockMethod.invokeExact(block, position), expectedStackValue);
         }
         else if (type.getJavaType() == long.class) {
             assertEquals(type.getLong(block, position), expectedStackValue);
             assertThatThrownBy(() -> type.getBoolean(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getDouble(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getObject(block, position)).isInstanceOf(UnsupportedOperationException.class);
+            assertEquals((long) readBlockMethod.invokeExact(block, position), expectedStackValue);
         }
         else if (type.getJavaType() == double.class) {
             assertEquals(type.getDouble(block, position), expectedStackValue);
             assertThatThrownBy(() -> type.getBoolean(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getLong(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getObject(block, position)).isInstanceOf(UnsupportedOperationException.class);
+            assertEquals((double) readBlockMethod.invokeExact(block, position), expectedStackValue);
         }
         else if (type.getJavaType() == Slice.class) {
             assertEquals(type.getSlice(block, position), expectedStackValue);
@@ -344,26 +479,44 @@ else if (type.getJavaType() == Slice.class) {
             assertThatThrownBy(() -> type.getBoolean(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getLong(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getDouble(block, position)).isInstanceOf(UnsupportedOperationException.class);
+            assertEquals((Slice) readBlockMethod.invokeExact(block, position), expectedStackValue);
         }
         else if (type.getJavaType() == Block.class) {
-            SliceOutput actualSliceOutput = new DynamicSliceOutput(100);
-            writeBlock(blockEncodingSerde, actualSliceOutput, (Block) type.getObject(block, position));
-            SliceOutput expectedSliceOutput = new DynamicSliceOutput(actualSliceOutput.size());
-            writeBlock(blockEncodingSerde, expectedSliceOutput, (Block) expectedStackValue);
-            assertEquals(actualSliceOutput.slice(), expectedSliceOutput.slice());
+            assertBlockEquals((Block) type.getObject(block, position), (Block) expectedStackValue);
             assertThatThrownBy(() -> type.getBoolean(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getLong(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getDouble(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getSlice(block, position)).isInstanceOf(UnsupportedOperationException.class);
+            assertBlockEquals((Block) readBlockMethod.invokeExact(block, position), (Block) expectedStackValue);
         }
         else {
-            assertEquals(type.getObject(block, position), expectedStackValue);
+            if (stackStackEqualOperator != null) {
+                assertTrue((Boolean) stackStackEqualOperator.invoke(type.getObject(block, position), expectedStackValue));
+            }
+            else {
+                assertEquals(type.getObject(block, position), expectedStackValue);
+            }
             assertThatThrownBy(() -> type.getBoolean(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getLong(block, position)).isInstanceOf(UnsupportedOperationException.class);
             assertThatThrownBy(() -> type.getDouble(block, position)).isInstanceOf(UnsupportedOperationException.class);
+            if (stackStackEqualOperator != null) {
+                assertTrue((Boolean) stackStackEqualOperator.invoke(readBlockMethod.invoke(block, position), expectedStackValue));
+            }
+            else {
+                assertEquals(readBlockMethod.invoke(block, position), expectedStackValue);
+            }
         }
     }
 
+    private void assertBlockEquals(Block actualValue, Block expectedValue)
+    {
+        SliceOutput actualSliceOutput = new DynamicSliceOutput(100);
+        writeBlock(blockEncodingSerde, actualSliceOutput, actualValue);
+        SliceOutput expectedSliceOutput = new DynamicSliceOutput(actualSliceOutput.size());
+        writeBlock(blockEncodingSerde, expectedSliceOutput, expectedValue);
+        assertEquals(actualSliceOutput.slice(), expectedSliceOutput.slice());
+    }
+
     private void verifyInvalidPositionHandling(Block block)
     {
         assertThatThrownBy(() -> type.getObjectValue(SESSION, block, -1))
@@ -422,6 +575,14 @@ private void verifyInvalidPositionHandling(Block block)
                     .hasMessage("Invalid position %d in block with %d positions", block.getPositionCount(), block.getPositionCount());
         }
 
+        assertThatThrownBy(() -> readBlockMethod.invoke(block, -1))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Invalid position -1 in block with %d positions", block.getPositionCount());
+
+        assertThatThrownBy(() -> readBlockMethod.invoke(block, block.getPositionCount()))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Invalid position %d in block with %d positions", block.getPositionCount(), block.getPositionCount());
+
         if (type.getJavaType() == boolean.class) {
             assertThatThrownBy(() -> type.getBoolean(block, -1))
                     .isInstanceOf(IllegalArgumentException.class)
@@ -484,7 +645,7 @@ else if (javaType == Slice.class) {
         else {
             type.writeObject(blockBuilder, value);
         }
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     /**
@@ -535,7 +696,7 @@ private static Object getNonNullValueForType(Type type)
             Object keyNonNullValue = getNonNullValueForType(keyType);
             Object valueNonNullValue = getNonNullValueForType(valueType);
             Map<?, ?> map = ImmutableMap.of(keyNonNullValue, valueNonNullValue);
-            return mapBlockOf(keyType, valueType, map);
+            return sqlMapOf(keyType, valueType, map);
         }
         if (type instanceof RowType rowType) {
             List<Type> elementTypes = rowType.getTypeParameters();
@@ -568,7 +729,7 @@ else if (javaType == Slice.class) {
         else {
             type.writeObject(blockBuilder, value);
         }
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     private static SortedMap<Integer, Object> indexStackValues(Type type, Block block)
diff --git a/core/trino-main/src/test/java/io/trino/type/BenchmarkDecimalOperators.java b/core/trino-main/src/test/java/io/trino/type/BenchmarkDecimalOperators.java
index 3e679c77b767..dd1d5fc4f418 100644
--- a/core/trino-main/src/test/java/io/trino/type/BenchmarkDecimalOperators.java
+++ b/core/trino-main/src/test/java/io/trino/type/BenchmarkDecimalOperators.java
@@ -23,6 +23,7 @@
 import io.trino.spi.type.DoubleType;
 import io.trino.spi.type.SqlDecimal;
 import io.trino.spi.type.Type;
+import io.trino.sql.PlannerContext;
 import io.trino.sql.gen.ExpressionCompiler;
 import io.trino.sql.gen.PageFunctionCompiler;
 import io.trino.sql.planner.Symbol;
@@ -31,6 +32,8 @@
 import io.trino.sql.relational.RowExpression;
 import io.trino.sql.relational.SqlToRowExpressionTranslator;
 import io.trino.sql.tree.Expression;
+import io.trino.transaction.TestingTransactionManager;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
@@ -41,7 +44,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.math.BigInteger;
 import java.util.HashMap;
@@ -61,7 +63,7 @@
 import static io.trino.spi.type.DecimalType.createDecimalType;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.sql.ExpressionTestUtils.createExpression;
-import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
+import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static java.lang.String.format;
@@ -83,6 +85,11 @@
 @Measurement(iterations = 50, timeUnit = TimeUnit.MILLISECONDS)
 public class BenchmarkDecimalOperators
 {
+    private static final TestingTransactionManager TRANSACTION_MANAGER = new TestingTransactionManager();
+    private static final PlannerContext PLANNER_CONTEXT = plannerContextBuilder()
+            .withTransactionManager(TRANSACTION_MANAGER)
+            .build();
+
     private static final int PAGE_SIZE = 30000;
 
     private static final DecimalType SHORT_DECIMAL_TYPE = createDecimalType(10, 0);
@@ -613,7 +620,7 @@ protected void setDoubleMaxValue(double doubleMaxValue)
 
         private RowExpression rowExpression(String value)
         {
-            Expression expression = createExpression(value, PLANNER_CONTEXT, TypeProvider.copyOf(symbolTypes));
+            Expression expression = createExpression(value, TRANSACTION_MANAGER, PLANNER_CONTEXT, TypeProvider.copyOf(symbolTypes));
 
             return SqlToRowExpressionTranslator.translate(
                     expression,
diff --git a/core/trino-main/src/test/java/io/trino/type/TestArrayOfMapOfBigintVarcharType.java b/core/trino-main/src/test/java/io/trino/type/TestArrayOfMapOfBigintVarcharType.java
new file mode 100644
index 000000000000..7c04b7e78363
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/type/TestArrayOfMapOfBigintVarcharType.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed 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 io.trino.type;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.type.ArrayType;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.util.StructuralTestUtil.arrayBlockOf;
+import static io.trino.util.StructuralTestUtil.mapType;
+import static io.trino.util.StructuralTestUtil.sqlMapOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestArrayOfMapOfBigintVarcharType
+        extends AbstractTestType
+{
+    private static final ArrayType TYPE = new ArrayType(mapType(BIGINT, VARCHAR));
+
+    public TestArrayOfMapOfBigintVarcharType()
+    {
+        super(TYPE, List.class, createTestBlock());
+    }
+
+    public static ValueBlock createTestBlock()
+    {
+        BlockBuilder blockBuilder = TYPE.createBlockBuilder(null, 4);
+        TYPE.writeObject(blockBuilder, arrayBlockOf(TYPE.getElementType(),
+                sqlMapOf(BIGINT, VARCHAR, ImmutableMap.of(1, "hi")),
+                sqlMapOf(BIGINT, VARCHAR, ImmutableMap.of(2, "bye"))));
+        TYPE.writeObject(blockBuilder, arrayBlockOf(TYPE.getElementType(),
+                sqlMapOf(BIGINT, VARCHAR, ImmutableMap.of(1, "2", 2, "hello")),
+                sqlMapOf(BIGINT, VARCHAR, ImmutableMap.of(3, "4", 4, "bye"))));
+        TYPE.writeObject(blockBuilder, arrayBlockOf(TYPE.getElementType(),
+                sqlMapOf(BIGINT, VARCHAR, ImmutableMap.of(100, "hundred")),
+                sqlMapOf(BIGINT, VARCHAR, ImmutableMap.of(200, "two hundred"))));
+        return blockBuilder.buildValueBlock();
+    }
+
+    @Override
+    protected Object getGreaterValue(Object value)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThatThrownBy(() -> type.getPreviousValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThatThrownBy(() -> type.getPreviousValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/type/TestArrayOperators.java b/core/trino-main/src/test/java/io/trino/type/TestArrayOperators.java
index 01585c213f29..f5927936838c 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestArrayOperators.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestArrayOperators.java
@@ -20,8 +20,8 @@
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
 import io.trino.metadata.InternalFunctionBundle;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.LiteralParameters;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
@@ -39,13 +39,14 @@
 import java.util.Collections;
 
 import static io.trino.block.BlockSerdeUtil.writeBlock;
-import static io.trino.operator.aggregation.TypedSet.MAX_FUNCTION_MEMORY;
+import static io.trino.operator.scalar.BlockSet.MAX_FUNCTION_MEMORY;
 import static io.trino.spi.StandardErrorCode.AMBIGUOUS_FUNCTION_CALL;
 import static io.trino.spi.StandardErrorCode.EXCEEDED_FUNCTION_MEMORY_LIMIT;
 import static io.trino.spi.StandardErrorCode.FUNCTION_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.StandardErrorCode.OPERATOR_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.TYPE_MISMATCH;
 import static io.trino.spi.function.OperatorType.INDETERMINATE;
 import static io.trino.spi.function.OperatorType.IS_DISTINCT_FROM;
@@ -119,9 +120,12 @@ public void testStackRepresentation()
         DynamicSliceOutput actualSliceOutput = new DynamicSliceOutput(100);
         writeBlock(((LocalQueryRunner) assertions.getQueryRunner()).getPlannerContext().getBlockEncodingSerde(), actualSliceOutput, actualBlock);
 
-        BlockBuilder expectedBlockBuilder = arrayType.createBlockBuilder(null, 3);
-        arrayType.writeObject(expectedBlockBuilder, BIGINT.createBlockBuilder(null, 2).writeLong(1).writeLong(2).build());
-        arrayType.writeObject(expectedBlockBuilder, BIGINT.createBlockBuilder(null, 1).writeLong(3).build());
+        ArrayBlockBuilder expectedBlockBuilder = arrayType.createBlockBuilder(null, 3);
+        expectedBlockBuilder.buildEntry(elementBuilder -> {
+            BIGINT.writeLong(elementBuilder, 1);
+            BIGINT.writeLong(elementBuilder, 2);
+        });
+        expectedBlockBuilder.buildEntry(elementBuilder -> BIGINT.writeLong(elementBuilder, 3));
         Block expectedBlock = expectedBlockBuilder.build();
         DynamicSliceOutput expectedSliceOutput = new DynamicSliceOutput(100);
         writeBlock(((LocalQueryRunner) assertions.getQueryRunner()).getPlannerContext().getBlockEncodingSerde(), expectedSliceOutput, expectedBlock);
@@ -948,7 +952,7 @@ public void testArrayToArrayConcat()
                 .binding("a", "ARRAY[ARRAY[1]]")
                 .binding("b", "ARRAY[ARRAY['x']]")
                 .evaluate())
-                .hasMessage("line 1:10: Unexpected parameters (array(array(integer)), array(array(varchar(1)))) for function concat. Expected: concat(char(x), char(y)), concat(array(E), E) E, concat(E, array(E)) E, concat(array(E)) E, concat(varchar), concat(varbinary)");
+                .hasMessage("line 1:10: Unexpected parameters (array(array(integer)), array(array(varchar(1)))) for function concat. Expected: concat(E, array(E)) E, concat(array(E)) E, concat(array(E), E) E, concat(char(x), char(y)), concat(varbinary), concat(varchar)");
     }
 
     @Test
@@ -1057,7 +1061,7 @@ public void testElementArrayConcat()
                 .binding("a", "ARRAY[ARRAY[1]]")
                 .binding("b", "ARRAY['x']")
                 .evaluate())
-                .hasMessage("line 1:10: Unexpected parameters (array(array(integer)), array(varchar(1))) for function concat. Expected: concat(char(x), char(y)), concat(array(E), E) E, concat(E, array(E)) E, concat(array(E)) E, concat(varchar), concat(varbinary)");
+                .hasMessage("line 1:10: Unexpected parameters (array(array(integer)), array(varchar(1))) for function concat. Expected: concat(E, array(E)) E, concat(array(E)) E, concat(array(E), E) E, concat(char(x), char(y)), concat(varbinary), concat(varchar)");
     }
 
     @Test
@@ -1150,10 +1154,10 @@ public void testArrayContains()
         assertThat(assertions.function("contains", "array[TIMESTAMP '2020-05-10 12:34:56.123456789', TIMESTAMP '1111-05-10 12:34:56.123456789']", "TIMESTAMP '1111-05-10 12:34:56.123456789'"))
                 .isEqualTo(true);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "array[ARRAY[1.1, 2.2], ARRAY[3.3, 4.3]]", "ARRAY[1.1, null]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "array[ARRAY[1.1, 2.2], ARRAY[3.3, 4.3]]", "ARRAY[1.1, null]")::evaluate)
                 .hasErrorCode(NOT_SUPPORTED);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("contains", "array[ARRAY[1.1, null], ARRAY[3.3, 4.3]]", "ARRAY[1.1, null]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("contains", "array[ARRAY[1.1, null], ARRAY[3.3, 4.3]]", "ARRAY[1.1, null]")::evaluate)
                 .hasErrorCode(NOT_SUPPORTED);
     }
 
@@ -1275,14 +1279,14 @@ public void testArrayJoin()
                 .hasType(VARCHAR)
                 .isEqualTo("1.0E0x2.1E0x3.3E0");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("array_join", "ARRAY[ARRAY[1], ARRAY[2]]", "'-'").evaluate())
-                .hasErrorCode(FUNCTION_NOT_FOUND);
+        assertTrinoExceptionThrownBy(assertions.function("array_join", "ARRAY[ARRAY[1], ARRAY[2]]", "'-'")::evaluate)
+                .hasErrorCode(OPERATOR_NOT_FOUND);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("array_join", "ARRAY[MAP(ARRAY[1], ARRAY[2])]", "'-'").evaluate())
-                .hasErrorCode(FUNCTION_NOT_FOUND);
+        assertTrinoExceptionThrownBy(assertions.function("array_join", "ARRAY[MAP(ARRAY[1], ARRAY[2])]", "'-'")::evaluate)
+                .hasErrorCode(OPERATOR_NOT_FOUND);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("array_join", "ARRAY[CAST(row(1, 2) AS row(col0 bigint, col1 bigint))]", "'-'").evaluate())
-                .hasErrorCode(FUNCTION_NOT_FOUND);
+        assertTrinoExceptionThrownBy(assertions.function("array_join", "ARRAY[CAST(row(1, 2) AS row(col0 bigint, col1 bigint))]", "'-'")::evaluate)
+                .hasErrorCode(OPERATOR_NOT_FOUND);
     }
 
     @Test
@@ -1828,10 +1832,10 @@ public void testArrayPosition()
         assertThat(assertions.function("array_position", "ARRAY[TIMESTAMP '2020-05-10 12:34:56.123456789', TIMESTAMP '1111-05-10 12:34:56.123456789']", "TIMESTAMP '1111-05-10 12:34:56.123456789'"))
                 .isEqualTo(2L);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("array_position", "ARRAY[ARRAY[null]]", "ARRAY[1]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("array_position", "ARRAY[ARRAY[null]]", "ARRAY[1]")::evaluate)
                 .hasErrorCode(NOT_SUPPORTED);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("array_position", "ARRAY[ARRAY[null]]", "ARRAY[null]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("array_position", "ARRAY[ARRAY[null]]", "ARRAY[null]")::evaluate)
                 .hasErrorCode(NOT_SUPPORTED);
     }
 
@@ -1992,10 +1996,10 @@ public void testSubscriptReturnType()
     @Test
     public void testElementAt()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("element_at", "ARRAY[]", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("element_at", "ARRAY[]", "0")::evaluate)
                 .hasMessage("SQL array indices start at 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("element_at", "ARRAY[1, 2, 3]", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("element_at", "ARRAY[1, 2, 3]", "0")::evaluate)
                 .hasMessage("SQL array indices start at 1");
 
         assertThat(assertions.function("element_at", "ARRAY[]", "1"))
@@ -2289,7 +2293,7 @@ public void testSort()
                 .isEqualTo(asList(-1, 0, 1, null, null));
 
         // invalid functions
-        assertTrinoExceptionThrownBy(() -> assertions.function("array_sort", "ARRAY[color('red'), color('blue')]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("array_sort", "ARRAY[color('red'), color('blue')]")::evaluate)
                 .hasErrorCode(FUNCTION_NOT_FOUND);
 
         assertTrinoExceptionThrownBy(() -> assertions.expression("array_sort(a, (x, y) -> y - x)")
@@ -2515,10 +2519,10 @@ public void testSlice()
         assertThat(assertions.function("slice", "ARRAY[2.330, 1.900, 2.330]", "1", "2"))
                 .matches("ARRAY[2.330, 1.900]");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("slice", "ARRAY[1, 2, 3, 4]", "1", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("slice", "ARRAY[1, 2, 3, 4]", "1", "-1")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("slice", "ARRAY[1, 2, 3, 4]", "0", "1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("slice", "ARRAY[1, 2, 3, 4]", "0", "1")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
@@ -4064,13 +4068,13 @@ public void testArrayRemove()
                         decimal("9876543210.9876543210", createDecimalType(22, 10)),
                         decimal("123123123456.6549876543", createDecimalType(22, 10))));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("array_remove", "ARRAY[ARRAY[CAST(null AS BIGINT)]]", "ARRAY[CAST(1 AS BIGINT)]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("array_remove", "ARRAY[ARRAY[CAST(null AS BIGINT)]]", "ARRAY[CAST(1 AS BIGINT)]")::evaluate)
                 .hasErrorCode(NOT_SUPPORTED);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("array_remove", "ARRAY[ARRAY[CAST(null AS BIGINT)]]", "ARRAY[CAST(null AS BIGINT)]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("array_remove", "ARRAY[ARRAY[CAST(null AS BIGINT)]]", "ARRAY[CAST(null AS BIGINT)]")::evaluate)
                 .hasErrorCode(NOT_SUPPORTED);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("array_remove", "ARRAY[ARRAY[CAST(1 AS BIGINT)]]", "ARRAY[CAST(null AS BIGINT)]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("array_remove", "ARRAY[ARRAY[CAST(1 AS BIGINT)]]", "ARRAY[CAST(null AS BIGINT)]")::evaluate)
                 .hasErrorCode(NOT_SUPPORTED);
     }
 
@@ -4149,16 +4153,16 @@ public void testRepeat()
                 .isEqualTo(ImmutableList.of());
 
         // illegal inputs
-        assertTrinoExceptionThrownBy(() -> assertions.function("repeat", "2", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("repeat", "2", "-1")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("repeat", "1", "1000000").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("repeat", "1", "1000000")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("repeat", "'loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongvarchar'", "9999").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("repeat", "'loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongvarchar'", "9999")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("repeat", "array[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]", "9999").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("repeat", "array[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]", "9999")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
@@ -4302,17 +4306,80 @@ public void testSequence()
                 .hasType(new ArrayType(BIGINT))
                 .isEqualTo(ImmutableList.of(10L, 8L, 6L, 4L, 2L));
 
+        assertThat(assertions.function("sequence", "9223372036854775807", "-9223372036854775808", "-9223372036854775807"))
+                .hasType(new ArrayType(BIGINT))
+                .isEqualTo(ImmutableList.of(9223372036854775807L, 0L, -9223372036854775807L));
+
+        assertThat(assertions.function("sequence", "9223372036854775807", "-9223372036854775808", "-9223372036854775808"))
+                .hasType(new ArrayType(BIGINT))
+                .isEqualTo(ImmutableList.of(9223372036854775807L, -1L));
+
+        assertThat(assertions.function("sequence", "-9223372036854775808", "9223372036854775807", "9223372036854775807"))
+                .hasType(new ArrayType(BIGINT))
+                .isEqualTo(ImmutableList.of(-9223372036854775808L, -1L, 9223372036854775806L));
+
+        assertThat(assertions.function("sequence", "-9223372036854775808", "-2", "9223372036854775807"))
+                .hasType(new ArrayType(BIGINT))
+                .isEqualTo(ImmutableList.of(-9223372036854775808L));
+
+        // test small range with big steps
+        assertThat(assertions.function("sequence", "-5", "5", "1000"))
+                .hasType(new ArrayType(BIGINT))
+                .isEqualTo(ImmutableList.of(-5L));
+
+        assertThat(assertions.function("sequence", "-5", "5", "7"))
+                .hasType(new ArrayType(BIGINT))
+                .isEqualTo(ImmutableList.of(-5L, 2L));
+
+        assertThat(assertions.function("sequence", "-100", "5", "100"))
+                .hasType(new ArrayType(BIGINT))
+                .isEqualTo(ImmutableList.of(-100L, 0L));
+
         // failure modes
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "2", "-1", "1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "2", "-1", "1")::evaluate)
                 .hasMessage("sequence stop value should be greater than or equal to start value if step is greater than zero otherwise stop should be less than or equal to start");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "-1", "-10", "1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "-1", "-10", "1")::evaluate)
                 .hasMessage("sequence stop value should be greater than or equal to start value if step is greater than zero otherwise stop should be less than or equal to start");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "1", "1000000").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "1", "1000000")::evaluate)
+                .hasMessage("result of sequence function must not have more than 10000 entries");
+
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "DATE '2000-04-14'", "DATE '2030-04-12'")::evaluate)
+                .hasMessage("result of sequence function must not have more than 10000 entries");
+
+        // long overflow
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "9223372036854775807", "-9223372036854775808", "-100")::evaluate)
+                .hasMessage("result of sequence function must not have more than 10000 entries");
+
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "9223372036854775807", "-9223372036854775808", "-1")::evaluate)
+                .hasMessage("result of sequence function must not have more than 10000 entries");
+
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "-9223372036854775808", "9223372036854775807", "100")::evaluate)
+                .hasMessage("result of sequence function must not have more than 10000 entries");
+
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "-9223372036854775808", "9223372036854775807", "1")::evaluate)
+                .hasMessage("result of sequence function must not have more than 10000 entries");
+
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "-9223372036854775808", "0", "100")::evaluate)
+                .hasMessage("result of sequence function must not have more than 10000 entries");
+
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "-9223372036854775808", "0", "1")::evaluate)
+                .hasMessage("result of sequence function must not have more than 10000 entries");
+
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "9223372036854775807", "0", "-1")::evaluate)
+                .hasMessage("result of sequence function must not have more than 10000 entries");
+
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "0", "9223372036854775807", "1")::evaluate)
+                .hasMessage("result of sequence function must not have more than 10000 entries");
+
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "0", "-9223372036854775808", "-1")::evaluate)
+                .hasMessage("result of sequence function must not have more than 10000 entries");
+
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "-5000", "5000")::evaluate)
                 .hasMessage("result of sequence function must not have more than 10000 entries");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "DATE '2000-04-14'", "DATE '2030-04-12'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "5000", "-5000", "-1")::evaluate)
                 .hasMessage("result of sequence function must not have more than 10000 entries");
     }
 
@@ -4350,25 +4417,25 @@ public void testSequenceDateTimeDayToSecond()
                 .matches("ARRAY[TIMESTAMP '2016-04-16 01:00:10',TIMESTAMP '2016-04-15 06:00:10',TIMESTAMP '2016-04-14 11:00:10']");
 
         // failure modes
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "DATE '2016-04-12'", "DATE '2016-04-14'", "interval '-1' day").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "DATE '2016-04-12'", "DATE '2016-04-14'", "interval '-1' day")::evaluate)
                 .hasMessage("sequence stop value should be greater than or equal to start value if step is greater than zero otherwise stop should be less than or equal to start");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "DATE '2016-04-14'", "DATE '2016-04-12'", "interval '1' day").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "DATE '2016-04-14'", "DATE '2016-04-12'", "interval '1' day")::evaluate)
                 .hasMessage("sequence stop value should be greater than or equal to start value if step is greater than zero otherwise stop should be less than or equal to start");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "DATE '2000-04-14'", "DATE '2030-04-12'", "interval '1' day").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "DATE '2000-04-14'", "DATE '2030-04-12'", "interval '1' day")::evaluate)
                 .hasMessage("result of sequence function must not have more than 10000 entries");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "DATE '2018-01-01'", "DATE '2018-01-04'", "interval '18' hour").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "DATE '2018-01-01'", "DATE '2018-01-04'", "interval '18' hour")::evaluate)
                 .hasMessage("sequence step must be a day interval if start and end values are dates");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "timestamp '2016-04-16 01:00:10'", "timestamp '2016-04-16 01:01:00'", "interval '-20' second").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "timestamp '2016-04-16 01:00:10'", "timestamp '2016-04-16 01:01:00'", "interval '-20' second")::evaluate)
                 .hasMessage("sequence stop value should be greater than or equal to start value if step is greater than zero otherwise stop should be less than or equal to start");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "timestamp '2016-04-16 01:10:10'", "timestamp '2016-04-16 01:01:00'", "interval '20' second").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "timestamp '2016-04-16 01:10:10'", "timestamp '2016-04-16 01:01:00'", "interval '20' second")::evaluate)
                 .hasMessage("sequence stop value should be greater than or equal to start value if step is greater than zero otherwise stop should be less than or equal to start");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "timestamp '2016-04-16 01:00:10'", "timestamp '2016-04-16 09:01:00'", "interval '1' second").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "timestamp '2016-04-16 01:00:10'", "timestamp '2016-04-16 09:01:00'", "interval '1' second")::evaluate)
                 .hasMessage("result of sequence function must not have more than 10000 entries");
     }
 
@@ -4406,22 +4473,22 @@ public void testSequenceDateTimeYearToMonth()
                 .matches("ARRAY[TIMESTAMP '2016-04-16 01:01:10', TIMESTAMP '2014-04-16 01:01:10', TIMESTAMP '2012-04-16 01:01:10']");
 
         // failure modes
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "DATE '2016-06-12'", "DATE '2016-04-12'", "interval '1' month").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "DATE '2016-06-12'", "DATE '2016-04-12'", "interval '1' month")::evaluate)
                 .hasMessage("sequence stop value should be greater than or equal to start value if step is greater than zero otherwise stop should be less than or equal to start");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "DATE '2016-04-12'", "DATE '2016-06-12'", "interval '-1' month").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "DATE '2016-04-12'", "DATE '2016-06-12'", "interval '-1' month")::evaluate)
                 .hasMessage("sequence stop value should be greater than or equal to start value if step is greater than zero otherwise stop should be less than or equal to start");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "DATE '2000-04-12'", "DATE '3000-06-12'", "interval '1' month").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "DATE '2000-04-12'", "DATE '3000-06-12'", "interval '1' month")::evaluate)
                 .hasMessage("result of sequence function must not have more than 10000 entries");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "timestamp '2016-05-16 01:00:10'", "timestamp '2016-04-16 01:01:00'", "interval '1' month").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "timestamp '2016-05-16 01:00:10'", "timestamp '2016-04-16 01:01:00'", "interval '1' month")::evaluate)
                 .hasMessage("sequence stop value should be greater than or equal to start value if step is greater than zero otherwise stop should be less than or equal to start");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "timestamp '2016-04-16 01:10:10'", "timestamp '2016-05-16 01:01:00'", "interval '-1' month").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "timestamp '2016-04-16 01:10:10'", "timestamp '2016-05-16 01:01:00'", "interval '-1' month")::evaluate)
                 .hasMessage("sequence stop value should be greater than or equal to start value if step is greater than zero otherwise stop should be less than or equal to start");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("sequence", "timestamp '2016-04-16 01:00:10'", "timestamp '3000-04-16 09:01:00'", "interval '1' month").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("sequence", "timestamp '2016-04-16 01:00:10'", "timestamp '3000-04-16 09:01:00'", "interval '1' month")::evaluate)
                 .hasMessage("result of sequence function must not have more than 10000 entries");
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/type/TestBigintArrayType.java b/core/trino-main/src/test/java/io/trino/type/TestBigintArrayType.java
index 1e23832a9408..7f466ba8e8bc 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestBigintArrayType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestBigintArrayType.java
@@ -15,7 +15,9 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -23,6 +25,7 @@
 import static io.trino.spi.type.TypeSignature.arrayType;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static io.trino.util.StructuralTestUtil.arrayBlockOf;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBigintArrayType
         extends AbstractTestType
@@ -32,14 +35,14 @@ public TestBigintArrayType()
         super(TESTING_TYPE_MANAGER.getType(arrayType(BIGINT.getTypeSignature())), List.class, createTestBlock(TESTING_TYPE_MANAGER.getType(arrayType(BIGINT.getTypeSignature()))));
     }
 
-    public static Block createTestBlock(Type arrayType)
+    public static ValueBlock createTestBlock(Type arrayType)
     {
         BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, 4);
         arrayType.writeObject(blockBuilder, arrayBlockOf(BIGINT, 1, 2));
         arrayType.writeObject(blockBuilder, arrayBlockOf(BIGINT, 1, 2, 3));
         arrayType.writeObject(blockBuilder, arrayBlockOf(BIGINT, 1, 2, 3));
         arrayType.writeObject(blockBuilder, arrayBlockOf(BIGINT, 100, 200, 300));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -52,6 +55,27 @@ protected Object getGreaterValue(Object value)
         }
         BIGINT.writeLong(blockBuilder, 1L);
 
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
+    }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestBigintOperators.java b/core/trino-main/src/test/java/io/trino/type/TestBigintOperators.java
index 6ff1fcf856bb..15b3f8a79bea 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestBigintOperators.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestBigintOperators.java
@@ -482,7 +482,7 @@ public void testIsDistinctFrom()
     @Test
     public void testOverflowAdd()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.operator(ADD, Long.toString(Long.MAX_VALUE), "BIGINT '1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(ADD, Long.toString(Long.MAX_VALUE), "BIGINT '1'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("bigint addition overflow: 9223372036854775807 + 1");
     }
@@ -490,7 +490,7 @@ public void testOverflowAdd()
     @Test
     public void testUnderflowSubtract()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.operator(SUBTRACT, Long.toString(Long.MIN_VALUE), "BIGINT '1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(SUBTRACT, Long.toString(Long.MIN_VALUE), "BIGINT '1'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("bigint subtraction overflow: -9223372036854775808 - 1");
     }
@@ -498,11 +498,11 @@ public void testUnderflowSubtract()
     @Test
     public void testOverflowMultiply()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, Long.toString(Long.MAX_VALUE), "2").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, Long.toString(Long.MAX_VALUE), "2")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("bigint multiplication overflow: 9223372036854775807 * 2");
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, Long.toString(Long.MIN_VALUE), "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, Long.toString(Long.MIN_VALUE), "-1")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("bigint multiplication overflow: -9223372036854775808 * -1");
     }
@@ -510,7 +510,7 @@ public void testOverflowMultiply()
     @Test
     public void testOverflowDivide()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, Long.toString(Long.MIN_VALUE), "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, Long.toString(Long.MIN_VALUE), "-1")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("bigint division overflow: -9223372036854775808 / -1");
     }
@@ -534,7 +534,7 @@ public void testIndeterminate()
     @Test
     public void testNegateOverflow()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.operator(NEGATION, Long.toString(Long.MIN_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(NEGATION, Long.toString(Long.MIN_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("bigint negation overflow: -9223372036854775808");
     }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestBigintType.java b/core/trino-main/src/test/java/io/trino/type/TestBigintType.java
index 33481299229e..c22a8800f2ad 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestBigintType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestBigintType.java
@@ -13,9 +13,10 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type.Range;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -31,7 +32,7 @@ public TestBigintType()
         super(BIGINT, Long.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = BIGINT.createBlockBuilder(null, 15);
         BIGINT.writeLong(blockBuilder, 1111);
@@ -45,7 +46,7 @@ public static Block createTestBlock()
         BIGINT.writeLong(blockBuilder, 3333);
         BIGINT.writeLong(blockBuilder, 3333);
         BIGINT.writeLong(blockBuilder, 4444);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -54,7 +55,7 @@ protected Object getGreaterValue(Object value)
         return ((Long) value) + 1;
     }
 
-    @Override
+    @Test
     public void testRange()
     {
         Range range = type.getRange().orElseThrow();
@@ -62,7 +63,7 @@ public void testRange()
         assertEquals(range.getMax(), Long.MAX_VALUE);
     }
 
-    @Override
+    @Test
     public void testPreviousValue()
     {
         long minValue = Long.MIN_VALUE;
@@ -82,7 +83,7 @@ public void testPreviousValue()
                 .isEqualTo(Optional.of(maxValue - 1));
     }
 
-    @Override
+    @Test
     public void testNextValue()
     {
         long minValue = Long.MIN_VALUE;
diff --git a/core/trino-main/src/test/java/io/trino/type/TestBigintVarcharMapType.java b/core/trino-main/src/test/java/io/trino/type/TestBigintVarcharMapType.java
index 2df0d7b72c03..88f279d6dd75 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestBigintVarcharMapType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestBigintVarcharMapType.java
@@ -14,16 +14,19 @@
 package io.trino.type;
 
 import com.google.common.collect.ImmutableMap;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.util.StructuralTestUtil.mapBlockOf;
 import static io.trino.util.StructuralTestUtil.mapType;
+import static io.trino.util.StructuralTestUtil.sqlMapOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestBigintVarcharMapType
         extends AbstractTestType
@@ -33,12 +36,13 @@ public TestBigintVarcharMapType()
         super(mapType(BIGINT, VARCHAR), Map.class, createTestBlock(mapType(BIGINT, VARCHAR)));
     }
 
-    public static Block createTestBlock(Type mapType)
+    public static ValueBlock createTestBlock(Type mapType)
     {
         BlockBuilder blockBuilder = mapType.createBlockBuilder(null, 2);
-        mapType.writeObject(blockBuilder, mapBlockOf(BIGINT, VARCHAR, ImmutableMap.of(1, "hi")));
-        mapType.writeObject(blockBuilder, mapBlockOf(BIGINT, VARCHAR, ImmutableMap.of(1, "2", 2, "hello")));
-        return blockBuilder.build();
+        mapType.writeObject(blockBuilder, sqlMapOf(BIGINT, VARCHAR, ImmutableMap.of(1, "hi")));
+        mapType.writeObject(blockBuilder, sqlMapOf(BIGINT, VARCHAR, ImmutableMap.of(1, "2", 2, "hello")));
+        mapType.writeObject(blockBuilder, sqlMapOf(BIGINT, VARCHAR, ImmutableMap.of(1, "123456789012345", 2, "hello-world-hello-world-hello-world")));
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -46,4 +50,27 @@ protected Object getGreaterValue(Object value)
     {
         throw new UnsupportedOperationException();
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThatThrownBy(() -> type.getPreviousValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThatThrownBy(() -> type.getPreviousValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestBooleanType.java b/core/trino-main/src/test/java/io/trino/type/TestBooleanType.java
index 5a999c286394..b267d02f8c9c 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestBooleanType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestBooleanType.java
@@ -16,11 +16,13 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.ByteArrayBlock;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.BooleanType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.block.BlockAssertions.assertBlockEquals;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
@@ -65,7 +67,7 @@ public void testBooleanBlockWithSingleNonNullValue()
         assertFalse(BooleanType.createBlockForSingleNonNullValue(false).mayHaveNull());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = BOOLEAN.createBlockBuilder(null, 15);
         BOOLEAN.writeBoolean(blockBuilder, true);
@@ -79,7 +81,7 @@ public static Block createTestBlock()
         BOOLEAN.writeBoolean(blockBuilder, true);
         BOOLEAN.writeBoolean(blockBuilder, true);
         BOOLEAN.writeBoolean(blockBuilder, false);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -87,4 +89,25 @@ protected Object getGreaterValue(Object value)
     {
         return true;
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestBoundedVarcharType.java b/core/trino-main/src/test/java/io/trino/type/TestBoundedVarcharType.java
index c374463979b6..7874cea36276 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestBoundedVarcharType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestBoundedVarcharType.java
@@ -15,13 +15,15 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.VarcharType.createVarcharType;
 import static java.lang.Character.MAX_CODE_POINT;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 public class TestBoundedVarcharType
@@ -32,7 +34,7 @@ public TestBoundedVarcharType()
         super(createVarcharType(6), String.class, createTestBlock(createVarcharType(6)));
     }
 
-    private static Block createTestBlock(VarcharType type)
+    private static ValueBlock createTestBlock(VarcharType type)
     {
         BlockBuilder blockBuilder = type.createBlockBuilder(null, 15);
         type.writeString(blockBuilder, "apple");
@@ -46,7 +48,7 @@ private static Block createTestBlock(VarcharType type)
         type.writeString(blockBuilder, "cherry");
         type.writeString(blockBuilder, "cherry");
         type.writeString(blockBuilder, "date");
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -55,11 +57,25 @@ protected Object getGreaterValue(Object value)
         return Slices.utf8Slice(((Slice) value).toStringUtf8() + "_");
     }
 
-    @Override
+    @Test
     public void testRange()
     {
         Type.Range range = type.getRange().orElseThrow();
         assertEquals(range.getMin(), Slices.utf8Slice(""));
         assertEquals(range.getMax(), Slices.utf8Slice(Character.toString(MAX_CODE_POINT).repeat(((VarcharType) type).getBoundedLength())));
     }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestCastDependencies.java b/core/trino-main/src/test/java/io/trino/type/TestCastDependencies.java
index 8ff3faaeb20f..970b2a0a7331 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestCastDependencies.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestCastDependencies.java
@@ -24,8 +24,8 @@
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.StandardTypes;
 import io.trino.sql.query.QueryAssertions;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.testng.annotations.Test;
 
 import java.lang.invoke.MethodHandle;
 
diff --git a/core/trino-main/src/test/java/io/trino/type/TestCharType.java b/core/trino-main/src/test/java/io/trino/type/TestCharType.java
index c33aad758a39..333fa0086fb3 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestCharType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestCharType.java
@@ -18,9 +18,11 @@
 import io.airlift.slice.Slices;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.slice.SliceUtf8.codePointToUtf8;
 import static io.airlift.slice.Slices.EMPTY_SLICE;
@@ -30,6 +32,7 @@
 import static java.lang.Character.MIN_CODE_POINT;
 import static java.lang.Character.MIN_SUPPLEMENTARY_CODE_POINT;
 import static java.lang.Character.isSupplementaryCodePoint;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
@@ -43,7 +46,7 @@ public TestCharType()
         super(CHAR_TYPE, String.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = CHAR_TYPE.createBlockBuilder(null, 15);
         CHAR_TYPE.writeString(blockBuilder, "apple");
@@ -57,7 +60,7 @@ public static Block createTestBlock()
         CHAR_TYPE.writeString(blockBuilder, "cherry");
         CHAR_TYPE.writeString(blockBuilder, "cherry");
         CHAR_TYPE.writeString(blockBuilder, "date");
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -72,10 +75,9 @@ public void testGetObjectValue()
         CharType charType = createCharType(3);
 
         for (int codePoint : ImmutableList.of(0, 1, 10, 17, (int) ' ', 127, 1011, 11_000, 65_891, MIN_SUPPLEMENTARY_CODE_POINT, MAX_CODE_POINT)) {
-            BlockBuilder blockBuilder = charType.createBlockBuilder(null, 1);
+            VariableWidthBlockBuilder blockBuilder = charType.createBlockBuilder(null, 1);
             Slice slice = (codePoint != ' ') ? codePointToUtf8(codePoint) : EMPTY_SLICE;
-            blockBuilder.writeBytes(slice, 0, slice.length());
-            blockBuilder.closeEntry();
+            blockBuilder.writeEntry(slice);
             Block block = blockBuilder.build();
             int codePointLengthInUtf16 = isSupplementaryCodePoint(codePoint) ? 2 : 1;
 
@@ -89,11 +91,25 @@ public void testGetObjectValue()
         }
     }
 
-    @Override
+    @Test
     public void testRange()
     {
         Type.Range range = type.getRange().orElseThrow();
         assertEquals(range.getMin(), Slices.utf8Slice(Character.toString(MIN_CODE_POINT).repeat(((CharType) type).getLength())));
         assertEquals(range.getMax(), Slices.utf8Slice(Character.toString(MAX_CODE_POINT).repeat(((CharType) type).getLength())));
     }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestColorArrayType.java b/core/trino-main/src/test/java/io/trino/type/TestColorArrayType.java
index 45e22d1ca32b..f2d81fe09119 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestColorArrayType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestColorArrayType.java
@@ -13,9 +13,10 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -23,6 +24,8 @@
 import static io.trino.type.ColorType.COLOR;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static io.trino.util.StructuralTestUtil.arrayBlockOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestColorArrayType
         extends AbstractTestType
@@ -32,14 +35,14 @@ public TestColorArrayType()
         super(TESTING_TYPE_MANAGER.getType(arrayType(COLOR.getTypeSignature())), List.class, createTestBlock(TESTING_TYPE_MANAGER.getType(arrayType(COLOR.getTypeSignature()))));
     }
 
-    public static Block createTestBlock(Type arrayType)
+    public static ValueBlock createTestBlock(Type arrayType)
     {
         BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, 4);
         arrayType.writeObject(blockBuilder, arrayBlockOf(COLOR, 1, 2));
         arrayType.writeObject(blockBuilder, arrayBlockOf(COLOR, 1, 2, 3));
         arrayType.writeObject(blockBuilder, arrayBlockOf(COLOR, 1, 2, 3));
         arrayType.writeObject(blockBuilder, arrayBlockOf(COLOR, 100, 200, 300));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -47,4 +50,27 @@ protected Object getGreaterValue(Object value)
     {
         throw new UnsupportedOperationException();
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThatThrownBy(() -> type.getPreviousValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThatThrownBy(() -> type.getNextValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestColorType.java b/core/trino-main/src/test/java/io/trino/type/TestColorType.java
index a86ef9528c14..3d640f0d3f80 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestColorType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestColorType.java
@@ -15,11 +15,14 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import org.testng.annotations.Test;
+import io.trino.spi.block.ValueBlock;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.operator.scalar.ColorFunctions.rgb;
 import static io.trino.type.ColorType.COLOR;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestColorType
@@ -33,7 +36,7 @@ public TestColorType()
     @Test
     public void testGetObjectValue()
     {
-        int[] valuesOfInterest = new int[]{0, 1, 15, 16, 127, 128, 255};
+        int[] valuesOfInterest = new int[] {0, 1, 15, 16, 127, 128, 255};
         BlockBuilder builder = COLOR.createFixedSizeBlockBuilder(valuesOfInterest.length * valuesOfInterest.length * valuesOfInterest.length);
         for (int r : valuesOfInterest) {
             for (int g : valuesOfInterest) {
@@ -52,7 +55,7 @@ public void testGetObjectValue()
         }
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = COLOR.createBlockBuilder(null, 15);
         COLOR.writeLong(blockBuilder, rgb(1, 1, 1));
@@ -66,7 +69,7 @@ public static Block createTestBlock()
         COLOR.writeLong(blockBuilder, rgb(3, 3, 3));
         COLOR.writeLong(blockBuilder, rgb(3, 3, 3));
         COLOR.writeLong(blockBuilder, rgb(4, 4, 4));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -74,4 +77,27 @@ protected Object getGreaterValue(Object value)
     {
         throw new UnsupportedOperationException();
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThatThrownBy(() -> type.getPreviousValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThatThrownBy(() -> type.getNextValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestConventionDependencies.java b/core/trino-main/src/test/java/io/trino/type/TestConventionDependencies.java
index 83e00fee6087..309179070ac6 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestConventionDependencies.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestConventionDependencies.java
@@ -16,6 +16,8 @@
 import io.trino.metadata.InternalFunctionBundle;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.IntArrayBlock;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.BlockIndex;
 import io.trino.spi.function.BlockPosition;
 import io.trino.spi.function.Convention;
@@ -37,6 +39,7 @@
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -55,6 +58,7 @@ public void init()
         assertions.addFunctions(InternalFunctionBundle.builder()
                 .scalar(RegularConvention.class)
                 .scalar(BlockPositionConvention.class)
+                .scalar(ValueBlockPositionConvention.class)
                 .scalar(Add.class)
                 .build());
 
@@ -88,6 +92,15 @@ public void testConventionDependencies()
 
         assertThat(assertions.function("block_position_convention", "ARRAY[56, 275, 36]"))
                 .isEqualTo(367);
+
+        assertThat(assertions.function("value_block_position_convention", "ARRAY[1, 2, 3]"))
+                .isEqualTo(6);
+
+        assertThat(assertions.function("value_block_position_convention", "ARRAY[25, 0, 5]"))
+                .isEqualTo(30);
+
+        assertThat(assertions.function("value_block_position_convention", "ARRAY[56, 275, 36]"))
+                .isEqualTo(367);
     }
 
     @ScalarFunction("regular_convention")
@@ -138,6 +151,34 @@ public static long testBlockPositionConvention(
         }
     }
 
+    @ScalarFunction("value_block_position_convention")
+    public static final class ValueBlockPositionConvention
+    {
+        @SqlType(StandardTypes.INTEGER)
+        public static long testBlockPositionConvention(
+                @FunctionDependency(
+                        name = "add",
+                        argumentTypes = {StandardTypes.INTEGER, StandardTypes.INTEGER},
+                        convention = @Convention(arguments = {NEVER_NULL, VALUE_BLOCK_POSITION_NOT_NULL}, result = FAIL_ON_NULL)) MethodHandle function,
+                @SqlType("array(integer)") Block array)
+        {
+            ValueBlock arrayValues = array.getUnderlyingValueBlock();
+
+            long sum = 0;
+            for (int i = 0; i < array.getPositionCount(); i++) {
+                try {
+                    sum = (long) function.invokeExact(sum, arrayValues, array.getUnderlyingValuePosition(i));
+                }
+                catch (Throwable t) {
+                    throwIfInstanceOf(t, Error.class);
+                    throwIfInstanceOf(t, TrinoException.class);
+                    throw new TrinoException(GENERIC_INTERNAL_ERROR, t);
+                }
+            }
+            return sum;
+        }
+    }
+
     @ScalarFunction("add")
     public static final class Add
     {
@@ -152,10 +193,10 @@ public static long add(
         @SqlType(StandardTypes.INTEGER)
         public static long addBlockPosition(
                 @SqlType(StandardTypes.INTEGER) long first,
-                @BlockPosition @SqlType(value = StandardTypes.INTEGER, nativeContainerType = long.class) Block block,
+                @BlockPosition @SqlType(value = StandardTypes.INTEGER, nativeContainerType = long.class) IntArrayBlock block,
                 @BlockIndex int position)
         {
-            return Math.addExact((int) first, (int) INTEGER.getLong(block, position));
+            return Math.addExact((int) first, INTEGER.getInt(block, position));
         }
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestDate.java b/core/trino-main/src/test/java/io/trino/type/TestDate.java
index ccec20dd551d..466bb0d18cb3 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestDate.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestDate.java
@@ -82,13 +82,13 @@ public void testLiteral()
                 .isEqualTo(toDate(new DateTime(2013, 2, 2, 0, 0, 0, 0, UTC)));
 
         // three digit for month or day
-        assertTrinoExceptionThrownBy(() -> assertions.expression("DATE '2013-02-002'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("DATE '2013-02-002'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: '2013-02-002' is not a valid date literal");
+                .hasMessage("line 1:12: '2013-02-002' is not a valid DATE literal");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("DATE '2013-002-02'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("DATE '2013-002-02'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: '2013-002-02' is not a valid date literal");
+                .hasMessage("line 1:12: '2013-002-02' is not a valid DATE literal");
 
         // zero-padded year
         assertThat(assertions.expression("DATE '02013-02-02'"))
@@ -100,9 +100,9 @@ public void testLiteral()
                 .isEqualTo(toDate(new DateTime(13, 2, 2, 0, 0, 0, 0, UTC)));
 
         // invalid date
-        assertTrinoExceptionThrownBy(() -> assertions.expression("DATE '2013-02-29'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("DATE '2013-02-29'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: '2013-02-29' is not a valid date literal");
+                .hasMessage("line 1:12: '2013-02-29' is not a valid DATE literal");
 
         // surrounding whitespace
         assertThat(assertions.expression("DATE '  2013-02-02  '"))
@@ -114,22 +114,22 @@ public void testLiteral()
                 .isEqualTo(toDate(new DateTime(2013, 2, 2, 0, 0, 0, 0, UTC)));
 
         // intra whitespace
-        assertTrinoExceptionThrownBy(() -> assertions.expression("DATE '2013 -02-02'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("DATE '2013 -02-02'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: '2013 -02-02' is not a valid date literal");
+                .hasMessage("line 1:12: '2013 -02-02' is not a valid DATE literal");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("DATE '2013- 2-02'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("DATE '2013- 2-02'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: '2013- 2-02' is not a valid date literal");
+                .hasMessage("line 1:12: '2013- 2-02' is not a valid DATE literal");
 
         // large year
-        assertTrinoExceptionThrownBy(() -> assertions.expression("DATE '5881580-07-12'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("DATE '5881580-07-12'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: '5881580-07-12' is not a valid date literal");
+                .hasMessage("line 1:12: '5881580-07-12' is not a valid DATE literal");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("DATE '392251590-07-12'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("DATE '392251590-07-12'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: '392251590-07-12' is not a valid date literal");
+                .hasMessage("line 1:12: '392251590-07-12' is not a valid DATE literal");
 
         // signed
         assertThat(assertions.expression("DATE '+2013-02-02'"))
@@ -145,25 +145,25 @@ public void testLiteral()
                 .hasType(DATE)
                 .isEqualTo(toDate(new DateTime(2013, 2, 2, 0, 0, 0, 0, UTC)));
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("DATE '+ 2013-02-02'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("DATE '+ 2013-02-02'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: '+ 2013-02-02' is not a valid date literal");
+                .hasMessage("line 1:12: '+ 2013-02-02' is not a valid DATE literal");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("DATE ' + 2013-02-02'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("DATE ' + 2013-02-02'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: ' + 2013-02-02' is not a valid date literal");
+                .hasMessage("line 1:12: ' + 2013-02-02' is not a valid DATE literal");
 
         assertThat(assertions.expression("DATE ' -2013-02-02'"))
                 .hasType(DATE)
                 .isEqualTo(toDate(new DateTime(-2013, 2, 2, 0, 0, 0, 0, UTC)));
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("DATE '- 2013-02-02'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("DATE '- 2013-02-02'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: '- 2013-02-02' is not a valid date literal");
+                .hasMessage("line 1:12: '- 2013-02-02' is not a valid DATE literal");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("DATE ' - 2013-02-02'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("DATE ' - 2013-02-02'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL)
-                .hasMessage("line 1:12: ' - 2013-02-02' is not a valid date literal");
+                .hasMessage("line 1:12: ' - 2013-02-02' is not a valid DATE literal");
     }
 
     @Test
@@ -581,7 +581,7 @@ public void testMinusInterval()
         assertThat(assertions.operator(SUBTRACT, "DATE '2001-1-22'", "INTERVAL '3' day"))
                 .matches("DATE '2001-01-19'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(SUBTRACT, "DATE '2001-1-22'", "INTERVAL '3' hour").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(SUBTRACT, "DATE '2001-1-22'", "INTERVAL '3' hour")::evaluate)
                 .hasMessage("Cannot subtract hour, minutes or seconds from a date");
     }
 
@@ -606,10 +606,10 @@ public void testPlusInterval()
         assertThat(assertions.operator(ADD, "INTERVAL '3' year", "DATE '2001-1-22'"))
                 .matches("DATE '2004-01-22'");
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(ADD, "DATE '2001-1-22'", "INTERVAL '3' hour").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(ADD, "DATE '2001-1-22'", "INTERVAL '3' hour")::evaluate)
                 .hasMessage("Cannot add hour, minutes or seconds to a date");
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(ADD, "INTERVAL '3' hour", "DATE '2001-1-22'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(ADD, "INTERVAL '3' hour", "DATE '2001-1-22'")::evaluate)
                 .hasMessage("Cannot add hour, minutes or seconds to a date");
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/type/TestDateType.java b/core/trino-main/src/test/java/io/trino/type/TestDateType.java
index 1889ba942ea5..9e3565cfcb86 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestDateType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestDateType.java
@@ -13,10 +13,11 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.SqlDate;
 import io.trino.spi.type.Type.Range;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -32,7 +33,7 @@ public TestDateType()
         super(DATE, SqlDate.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = DATE.createBlockBuilder(null, 15);
         DATE.writeLong(blockBuilder, 1111);
@@ -46,7 +47,7 @@ public static Block createTestBlock()
         DATE.writeLong(blockBuilder, 3333);
         DATE.writeLong(blockBuilder, 3333);
         DATE.writeLong(blockBuilder, 4444);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -55,7 +56,7 @@ protected Object getGreaterValue(Object value)
         return ((Long) value) + 1;
     }
 
-    @Override
+    @Test
     public void testRange()
     {
         Range range = type.getRange().orElseThrow();
@@ -63,7 +64,7 @@ public void testRange()
         assertEquals(range.getMax(), (long) Integer.MAX_VALUE);
     }
 
-    @Override
+    @Test
     public void testPreviousValue()
     {
         long minValue = Integer.MIN_VALUE;
@@ -83,7 +84,7 @@ public void testPreviousValue()
                 .isEqualTo(Optional.of(maxValue - 1));
     }
 
-    @Override
+    @Test
     public void testNextValue()
     {
         long minValue = Integer.MIN_VALUE;
diff --git a/core/trino-main/src/test/java/io/trino/type/TestDecimalOperators.java b/core/trino-main/src/test/java/io/trino/type/TestDecimalOperators.java
index 0836040d8cc5..463621588d4b 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestDecimalOperators.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestDecimalOperators.java
@@ -145,22 +145,22 @@ public void testAdd()
                 .isEqualTo(decimal("12345678.123456789012345678901234567890", createDecimalType(38, 30)));
 
         // overflow tests
-        assertTrinoExceptionThrownBy(() -> assertions.operator(ADD, "DECIMAL '99999999999999999999999999999999999999'", "DECIMAL '1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(ADD, "DECIMAL '99999999999999999999999999999999999999'", "DECIMAL '1'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(ADD, "DECIMAL '.1'", "DECIMAL '99999999999999999999999999999999999999'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(ADD, "DECIMAL '.1'", "DECIMAL '99999999999999999999999999999999999999'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(ADD, "DECIMAL '1'", "DECIMAL '99999999999999999999999999999999999999'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(ADD, "DECIMAL '1'", "DECIMAL '99999999999999999999999999999999999999'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(ADD, "DECIMAL '99999999999999999999999999999999999999'", "DECIMAL '.1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(ADD, "DECIMAL '99999999999999999999999999999999999999'", "DECIMAL '.1'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(ADD, "DECIMAL '99999999999999999999999999999999999999'", "DECIMAL '99999999999999999999999999999999999999'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(ADD, "DECIMAL '99999999999999999999999999999999999999'", "DECIMAL '99999999999999999999999999999999999999'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(ADD, "DECIMAL '-99999999999999999999999999999999999999'", "DECIMAL '-99999999999999999999999999999999999999'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(ADD, "DECIMAL '-99999999999999999999999999999999999999'", "DECIMAL '-99999999999999999999999999999999999999'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
         // max supported value for rescaling
@@ -170,7 +170,7 @@ public void testAdd()
                 .isEqualTo(decimal("9999999999999999999999999999999999999.9", createDecimalType(38, 1)));
 
         // 17015000000000000000000000000000000000 on the other hand is too large and rescaled to DECIMAL(38,1) it does not fit in in 127 bits
-        assertTrinoExceptionThrownBy(() -> assertions.operator(ADD, "DECIMAL '17015000000000000000000000000000000000'", "DECIMAL '-7015000000000000000000000000000000000.1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(ADD, "DECIMAL '17015000000000000000000000000000000000'", "DECIMAL '-7015000000000000000000000000000000000.1'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
     }
 
@@ -256,19 +256,19 @@ public void testSubtract()
                 .isEqualTo(decimal("12345677.999999999999999999999999999999", createDecimalType(38, 30)));
 
         // overflow tests
-        assertTrinoExceptionThrownBy(() -> assertions.operator(SUBTRACT, "DECIMAL '-99999999999999999999999999999999999999'", "DECIMAL '1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(SUBTRACT, "DECIMAL '-99999999999999999999999999999999999999'", "DECIMAL '1'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(SUBTRACT, "DECIMAL '.1'", "DECIMAL '99999999999999999999999999999999999999'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(SUBTRACT, "DECIMAL '.1'", "DECIMAL '99999999999999999999999999999999999999'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(SUBTRACT, "DECIMAL '-1'", "DECIMAL '99999999999999999999999999999999999999'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(SUBTRACT, "DECIMAL '-1'", "DECIMAL '99999999999999999999999999999999999999'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(SUBTRACT, "DECIMAL '99999999999999999999999999999999999999'", "DECIMAL '.1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(SUBTRACT, "DECIMAL '99999999999999999999999999999999999999'", "DECIMAL '.1'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(SUBTRACT, "DECIMAL '-99999999999999999999999999999999999999'", "DECIMAL '99999999999999999999999999999999999999'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(SUBTRACT, "DECIMAL '-99999999999999999999999999999999999999'", "DECIMAL '99999999999999999999999999999999999999'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
         // max supported value for rescaling
@@ -278,7 +278,7 @@ public void testSubtract()
                 .isEqualTo(decimal("9999999999999999999999999999999999999.9", createDecimalType(38, 1)));
 
         // 17015000000000000000000000000000000000 on the other hand is too large and rescaled to DECIMAL(38,1) it does not fit in in 127 bits
-        assertTrinoExceptionThrownBy(() -> assertions.operator(SUBTRACT, "DECIMAL '17015000000000000000000000000000000000'", "DECIMAL '7015000000000000000000000000000000000.1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(SUBTRACT, "DECIMAL '17015000000000000000000000000000000000'", "DECIMAL '7015000000000000000000000000000000000.1'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
     }
 
@@ -408,23 +408,23 @@ public void testMultiply()
                 .isEqualTo(decimal(".01524157875323883675019051998750190521", createDecimalType(38, 38)));
 
         // scale exceeds max precision
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, "DECIMAL '.1234567890123456789'", "DECIMAL '.12345678901234567890'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, "DECIMAL '.1234567890123456789'", "DECIMAL '.12345678901234567890'")::evaluate)
                 .hasMessage("line 1:8: DECIMAL scale must be in range [0, precision (38)]: 39");
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, "DECIMAL '.1'", "DECIMAL '.12345678901234567890123456789012345678'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, "DECIMAL '.1'", "DECIMAL '.12345678901234567890123456789012345678'")::evaluate)
                 .hasMessage("line 1:8: DECIMAL scale must be in range [0, precision (38)]: 39");
 
         // runtime overflow tests
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, "DECIMAL '12345678901234567890123456789012345678'", "DECIMAL '9'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, "DECIMAL '12345678901234567890123456789012345678'", "DECIMAL '9'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, "DECIMAL '.12345678901234567890123456789012345678'", "DECIMAL '9'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, "DECIMAL '.12345678901234567890123456789012345678'", "DECIMAL '9'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, "DECIMAL '12345678901234567890123456789012345678'", "DECIMAL '-9'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, "DECIMAL '12345678901234567890123456789012345678'", "DECIMAL '-9'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, "DECIMAL '.12345678901234567890123456789012345678'", "DECIMAL '-9'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, "DECIMAL '.12345678901234567890123456789012345678'", "DECIMAL '-9'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
         assertThatThrownBy(() -> DecimalOperators.multiplyLongShortLong(Int128.valueOf("12345678901234567890123456789012345678"), 9))
@@ -665,29 +665,29 @@ public void testDivide()
                 .isEqualTo(decimal("0000000000000000000000000000000000.0344", createDecimalType(38, 4)));
 
         // runtime overflow
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "DECIMAL '12345678901234567890123456789012345678'", "DECIMAL '.1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "DECIMAL '12345678901234567890123456789012345678'", "DECIMAL '.1'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "DECIMAL '.12345678901234567890123456789012345678'", "DECIMAL '.1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "DECIMAL '.12345678901234567890123456789012345678'", "DECIMAL '.1'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "DECIMAL '12345678901234567890123456789012345678'", "DECIMAL '.12345678901234567890123456789012345678'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "DECIMAL '12345678901234567890123456789012345678'", "DECIMAL '.12345678901234567890123456789012345678'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "DECIMAL '1'", "DECIMAL '.12345678901234567890123456789012345678'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "DECIMAL '1'", "DECIMAL '.12345678901234567890123456789012345678'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE);
 
         // division by zero tests
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "DECIMAL '1'", "DECIMAL '0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "DECIMAL '1'", "DECIMAL '0'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "DECIMAL '1.000000000000000000000000000000000000'", "DECIMAL '0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "DECIMAL '1.000000000000000000000000000000000000'", "DECIMAL '0'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "DECIMAL '1.000000000000000000000000000000000000'", "DECIMAL '0.0000000000000000000000000000000000000'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "DECIMAL '1.000000000000000000000000000000000000'", "DECIMAL '0.0000000000000000000000000000000000000'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "DECIMAL '1'", "DECIMAL '0.0000000000000000000000000000000000000'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "DECIMAL '1'", "DECIMAL '0.0000000000000000000000000000000000000'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
 
         assertThat(assertions.operator(DIVIDE, "CAST(1000 AS DECIMAL(38,8))", "CAST(25 AS DECIMAL(38,8))"))
@@ -926,19 +926,19 @@ public void testModulus()
                 .isEqualTo(decimal("00000000000000000000000000000000000000", createDecimalType(38)));
 
         // division by zero tests
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MODULUS, "DECIMAL '1'", "DECIMAL '0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MODULUS, "DECIMAL '1'", "DECIMAL '0'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MODULUS, "DECIMAL '1.000000000000000000000000000000000000'", "DECIMAL '0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MODULUS, "DECIMAL '1.000000000000000000000000000000000000'", "DECIMAL '0'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MODULUS, "DECIMAL '1.000000000000000000000000000000000000'", "DECIMAL '0.0000000000000000000000000000000000000'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MODULUS, "DECIMAL '1.000000000000000000000000000000000000'", "DECIMAL '0.0000000000000000000000000000000000000'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MODULUS, "DECIMAL '1'", "DECIMAL '0.0000000000000000000000000000000000000'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MODULUS, "DECIMAL '1'", "DECIMAL '0.0000000000000000000000000000000000000'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MODULUS, "DECIMAL '1'", "CAST(0 AS DECIMAL(38,0))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MODULUS, "DECIMAL '1'", "CAST(0 AS DECIMAL(38,0))")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/type/TestDoubleOperators.java b/core/trino-main/src/test/java/io/trino/type/TestDoubleOperators.java
index c53795c7a875..cfad0b81e47f 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestDoubleOperators.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestDoubleOperators.java
@@ -591,7 +591,7 @@ public void testCastToVarchar()
                 .hasMessage("Value -0.0 (-0E0) cannot be represented as varchar(3)")
                 .hasErrorCode(INVALID_CAST_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("cast(0e0 / 0e0 AS varchar(2))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("cast(0e0 / 0e0 AS varchar(2))")::evaluate)
                 .hasMessage("Value NaN (NaN) cannot be represented as varchar(2)")
                 .hasErrorCode(INVALID_CAST_ARGUMENT);
 
diff --git a/core/trino-main/src/test/java/io/trino/type/TestDoubleType.java b/core/trino-main/src/test/java/io/trino/type/TestDoubleType.java
index 7ab8a0dd4329..d13a3eee46c1 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestDoubleType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestDoubleType.java
@@ -16,13 +16,15 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.LongArrayBlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
 import io.trino.type.BlockTypeOperators.BlockPositionXxHash64;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static java.lang.Double.doubleToLongBits;
 import static java.lang.Double.doubleToRawLongBits;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 public class TestDoubleType
@@ -33,7 +35,7 @@ public TestDoubleType()
         super(DOUBLE, Double.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = DOUBLE.createBlockBuilder(null, 15);
         DOUBLE.writeDouble(blockBuilder, 11.11);
@@ -47,7 +49,7 @@ public static Block createTestBlock()
         DOUBLE.writeDouble(blockBuilder, 33.33);
         DOUBLE.writeDouble(blockBuilder, 33.33);
         DOUBLE.writeDouble(blockBuilder, 44.44);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -59,21 +61,46 @@ protected Object getGreaterValue(Object value)
     @Test
     public void testNaNHash()
     {
-        BlockBuilder blockBuilder = new LongArrayBlockBuilder(null, 4);
+        LongArrayBlockBuilder blockBuilder = (LongArrayBlockBuilder) DOUBLE.createBlockBuilder(null, 5);
+        DOUBLE.writeDouble(blockBuilder, Double.NaN);
         blockBuilder.writeLong(doubleToLongBits(Double.NaN));
         blockBuilder.writeLong(doubleToRawLongBits(Double.NaN));
         // the following two are the long values of a double NaN
         blockBuilder.writeLong(-0x000fffffffffffffL);
         blockBuilder.writeLong(0x7ff8000000000000L);
+        Block block = blockBuilder.build();
 
         BlockPositionHashCode hashCodeOperator = blockTypeOperators.getHashCodeOperator(DOUBLE);
-        assertEquals(hashCodeOperator.hashCode(blockBuilder, 0), hashCodeOperator.hashCode(blockBuilder, 1));
-        assertEquals(hashCodeOperator.hashCode(blockBuilder, 0), hashCodeOperator.hashCode(blockBuilder, 2));
-        assertEquals(hashCodeOperator.hashCode(blockBuilder, 0), hashCodeOperator.hashCode(blockBuilder, 3));
+        assertEquals(hashCodeOperator.hashCode(block, 0), hashCodeOperator.hashCode(block, 1));
+        assertEquals(hashCodeOperator.hashCode(block, 0), hashCodeOperator.hashCode(block, 2));
+        assertEquals(hashCodeOperator.hashCode(block, 0), hashCodeOperator.hashCode(block, 3));
+        assertEquals(hashCodeOperator.hashCode(block, 0), hashCodeOperator.hashCode(block, 4));
 
         BlockPositionXxHash64 xxHash64Operator = blockTypeOperators.getXxHash64Operator(DOUBLE);
-        assertEquals(xxHash64Operator.xxHash64(blockBuilder, 0), xxHash64Operator.xxHash64(blockBuilder, 1));
-        assertEquals(xxHash64Operator.xxHash64(blockBuilder, 0), xxHash64Operator.xxHash64(blockBuilder, 2));
-        assertEquals(xxHash64Operator.xxHash64(blockBuilder, 0), xxHash64Operator.xxHash64(blockBuilder, 3));
+        assertEquals(xxHash64Operator.xxHash64(block, 0), xxHash64Operator.xxHash64(block, 1));
+        assertEquals(xxHash64Operator.xxHash64(block, 0), xxHash64Operator.xxHash64(block, 2));
+        assertEquals(xxHash64Operator.xxHash64(block, 0), xxHash64Operator.xxHash64(block, 3));
+        assertEquals(xxHash64Operator.xxHash64(block, 0), xxHash64Operator.xxHash64(block, 4));
+    }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestFunctionType.java b/core/trino-main/src/test/java/io/trino/type/TestFunctionType.java
index 5483fd037691..6b4db788a624 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestFunctionType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestFunctionType.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
diff --git a/core/trino-main/src/test/java/io/trino/type/TestIntegerArrayType.java b/core/trino-main/src/test/java/io/trino/type/TestIntegerArrayType.java
index 6ff06196a624..40dda9308495 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestIntegerArrayType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestIntegerArrayType.java
@@ -15,7 +15,9 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -23,6 +25,7 @@
 import static io.trino.spi.type.TypeSignature.arrayType;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static io.trino.util.StructuralTestUtil.arrayBlockOf;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIntegerArrayType
         extends AbstractTestType
@@ -32,14 +35,14 @@ public TestIntegerArrayType()
         super(TESTING_TYPE_MANAGER.getType(arrayType(INTEGER.getTypeSignature())), List.class, createTestBlock(TESTING_TYPE_MANAGER.getType(arrayType(INTEGER.getTypeSignature()))));
     }
 
-    public static Block createTestBlock(Type arrayType)
+    public static ValueBlock createTestBlock(Type arrayType)
     {
         BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, 4);
         arrayType.writeObject(blockBuilder, arrayBlockOf(INTEGER, 1, 2));
         arrayType.writeObject(blockBuilder, arrayBlockOf(INTEGER, 1, 2, 3));
         arrayType.writeObject(blockBuilder, arrayBlockOf(INTEGER, 1, 2, 3));
         arrayType.writeObject(blockBuilder, arrayBlockOf(INTEGER, 100, 200, 300));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -52,6 +55,27 @@ protected Object getGreaterValue(Object value)
         }
         INTEGER.writeLong(blockBuilder, 1L);
 
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
+    }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestIntegerOperators.java b/core/trino-main/src/test/java/io/trino/type/TestIntegerOperators.java
index d7dbff6b749a..6d8ca7d15639 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestIntegerOperators.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestIntegerOperators.java
@@ -68,7 +68,7 @@ public void testLiteral()
         assertThat(assertions.expression("INTEGER '17'"))
                 .isEqualTo(17);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("INTEGER '" + ((long) Integer.MAX_VALUE + 1L) + "'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("INTEGER '" + ((long) Integer.MAX_VALUE + 1L) + "'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL);
     }
 
@@ -91,7 +91,7 @@ public void testUnaryMinus()
         assertThat(assertions.expression("INTEGER '-17'"))
                 .isEqualTo(-17);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("INTEGER '-" + Integer.MIN_VALUE + "'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("INTEGER '-" + Integer.MIN_VALUE + "'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL);
     }
 
@@ -110,7 +110,7 @@ public void testAdd()
         assertThat(assertions.operator(ADD, "INTEGER '17'", "INTEGER '17'"))
                 .isEqualTo(17 + 17);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression(format("INTEGER '%s' + INTEGER '1'", Integer.MAX_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression(format("INTEGER '%s' + INTEGER '1'", Integer.MAX_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("integer addition overflow: 2147483647 + 1");
     }
@@ -130,7 +130,7 @@ public void testSubtract()
         assertThat(assertions.operator(SUBTRACT, "INTEGER '17'", "INTEGER '17'"))
                 .isEqualTo(0);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression(format("INTEGER '%s' - INTEGER '1'", Integer.MIN_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression(format("INTEGER '%s' - INTEGER '1'", Integer.MIN_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("integer subtraction overflow: -2147483648 - 1");
     }
@@ -150,7 +150,7 @@ public void testMultiply()
         assertThat(assertions.operator(MULTIPLY, "INTEGER '17'", "INTEGER '17'"))
                 .isEqualTo(17 * 17);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression(format("INTEGER '%s' * INTEGER '2'", Integer.MAX_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression(format("INTEGER '%s' * INTEGER '2'", Integer.MAX_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("integer multiplication overflow: 2147483647 * 2");
     }
@@ -170,7 +170,7 @@ public void testDivide()
         assertThat(assertions.operator(DIVIDE, "INTEGER '17'", "INTEGER '17'"))
                 .isEqualTo(1);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "INTEGER '17'", "INTEGER '0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "INTEGER '17'", "INTEGER '0'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
     }
 
@@ -189,7 +189,7 @@ public void testModulus()
         assertThat(assertions.operator(MODULUS, "INTEGER '17'", "INTEGER '17'"))
                 .isEqualTo(0);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MODULUS, "INTEGER '17'", "INTEGER '0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MODULUS, "INTEGER '17'", "INTEGER '0'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
     }
 
@@ -205,7 +205,7 @@ public void testNegation()
         assertThat(assertions.expression("-(INTEGER '" + Integer.MAX_VALUE + "')"))
                 .isEqualTo(Integer.MIN_VALUE + 1);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression(format("-(INTEGER '%s')", Integer.MIN_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression(format("-(INTEGER '%s')", Integer.MIN_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("integer negation overflow: -2147483648");
     }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestIntegerType.java b/core/trino-main/src/test/java/io/trino/type/TestIntegerType.java
index 7c8fa786cb24..2a76b84a3c3a 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestIntegerType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestIntegerType.java
@@ -13,9 +13,10 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type.Range;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -31,7 +32,7 @@ public TestIntegerType()
         super(INTEGER, Integer.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = INTEGER.createBlockBuilder(null, 15);
         INTEGER.writeLong(blockBuilder, 1111);
@@ -45,7 +46,7 @@ public static Block createTestBlock()
         INTEGER.writeLong(blockBuilder, 3333);
         INTEGER.writeLong(blockBuilder, 3333);
         INTEGER.writeLong(blockBuilder, 4444);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -54,7 +55,7 @@ protected Object getGreaterValue(Object value)
         return ((Long) value) + 1;
     }
 
-    @Override
+    @Test
     public void testRange()
     {
         Range range = type.getRange().orElseThrow();
@@ -62,7 +63,7 @@ public void testRange()
         assertEquals(range.getMax(), (long) Integer.MAX_VALUE);
     }
 
-    @Override
+    @Test
     public void testPreviousValue()
     {
         long minValue = Integer.MIN_VALUE;
@@ -82,7 +83,7 @@ public void testPreviousValue()
                 .isEqualTo(Optional.of(maxValue - 1));
     }
 
-    @Override
+    @Test
     public void testNextValue()
     {
         long minValue = Integer.MIN_VALUE;
diff --git a/core/trino-main/src/test/java/io/trino/type/TestIntegerVarcharMapType.java b/core/trino-main/src/test/java/io/trino/type/TestIntegerVarcharMapType.java
index 42c130e6ddf0..5349a0475f2a 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestIntegerVarcharMapType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestIntegerVarcharMapType.java
@@ -14,16 +14,19 @@
 package io.trino.type;
 
 import com.google.common.collect.ImmutableMap;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.util.StructuralTestUtil.mapBlockOf;
 import static io.trino.util.StructuralTestUtil.mapType;
+import static io.trino.util.StructuralTestUtil.sqlMapOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestIntegerVarcharMapType
         extends AbstractTestType
@@ -33,12 +36,13 @@ public TestIntegerVarcharMapType()
         super(mapType(INTEGER, VARCHAR), Map.class, createTestBlock(mapType(INTEGER, VARCHAR)));
     }
 
-    public static Block createTestBlock(Type mapType)
+    public static ValueBlock createTestBlock(Type mapType)
     {
         BlockBuilder blockBuilder = mapType.createBlockBuilder(null, 2);
-        mapType.writeObject(blockBuilder, mapBlockOf(INTEGER, VARCHAR, ImmutableMap.of(1, "hi")));
-        mapType.writeObject(blockBuilder, mapBlockOf(INTEGER, VARCHAR, ImmutableMap.of(1, "2", 2, "hello")));
-        return blockBuilder.build();
+        mapType.writeObject(blockBuilder, sqlMapOf(INTEGER, VARCHAR, ImmutableMap.of(1, "hi")));
+        mapType.writeObject(blockBuilder, sqlMapOf(INTEGER, VARCHAR, ImmutableMap.of(1, "2", 2, "hello")));
+        mapType.writeObject(blockBuilder, sqlMapOf(INTEGER, VARCHAR, ImmutableMap.of(1, "123456789012345", 2, "hello-world-hello-world-hello-world")));
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -46,4 +50,39 @@ protected Object getGreaterValue(Object value)
     {
         throw new UnsupportedOperationException();
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        Object sampleValue = getSampleValue();
+        if (!type.isOrderable()) {
+            assertThatThrownBy(() -> type.getPreviousValue(sampleValue))
+                    .isInstanceOf(IllegalStateException.class)
+                    .hasMessage("Type is not orderable: " + type);
+            return;
+        }
+        assertThat(type.getPreviousValue(sampleValue))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        Object sampleValue = getSampleValue();
+        if (!type.isOrderable()) {
+            assertThatThrownBy(() -> type.getNextValue(sampleValue))
+                    .isInstanceOf(IllegalStateException.class)
+                    .hasMessage("Type is not orderable: " + type);
+            return;
+        }
+        assertThat(type.getNextValue(sampleValue))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestIntervalDayTime.java b/core/trino-main/src/test/java/io/trino/type/TestIntervalDayTime.java
index eaca95e16726..98fa41ef6f11 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestIntervalDayTime.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestIntervalDayTime.java
@@ -120,10 +120,10 @@ public void testMultiply()
         assertThat(assertions.operator(MULTIPLY, "2.5", "INTERVAL '1' DAY"))
                 .matches("INTERVAL '2 12:00:00.000' DAY TO SECOND");
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, "INTERVAL '6' SECOND", "nan()").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, "INTERVAL '6' SECOND", "nan()")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, "nan()", "INTERVAL '6' DAY").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, "nan()", "INTERVAL '6' DAY")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
@@ -142,16 +142,16 @@ public void testDivide()
         assertThat(assertions.operator(DIVIDE, "INTERVAL '4' DAY", "2.5"))
                 .matches("INTERVAL '1 14:24:00.000' DAY TO SECOND");
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "INTERVAL '6' SECOND", "nan()").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "INTERVAL '6' SECOND", "nan()")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "INTERVAL '6' DAY", "nan()").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "INTERVAL '6' DAY", "nan()")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "INTERVAL '6' SECOND", "0E0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "INTERVAL '6' SECOND", "0E0")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "INTERVAL '6' DAY", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "INTERVAL '6' DAY", "0")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/type/TestIntervalDayTimeType.java b/core/trino-main/src/test/java/io/trino/type/TestIntervalDayTimeType.java
index 21a68da74e8b..e967ec08bff4 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestIntervalDayTimeType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestIntervalDayTimeType.java
@@ -13,10 +13,12 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.type.IntervalDayTimeType.INTERVAL_DAY_TIME;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIntervalDayTimeType
         extends AbstractTestType
@@ -26,7 +28,7 @@ public TestIntervalDayTimeType()
         super(INTERVAL_DAY_TIME, SqlIntervalDayTime.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = INTERVAL_DAY_TIME.createBlockBuilder(null, 15);
         INTERVAL_DAY_TIME.writeLong(blockBuilder, 1111);
@@ -40,7 +42,7 @@ public static Block createTestBlock()
         INTERVAL_DAY_TIME.writeLong(blockBuilder, 3333);
         INTERVAL_DAY_TIME.writeLong(blockBuilder, 3333);
         INTERVAL_DAY_TIME.writeLong(blockBuilder, 4444);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -48,4 +50,25 @@ protected Object getGreaterValue(Object value)
     {
         return ((Long) value) + 1;
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestIntervalYearMonth.java b/core/trino-main/src/test/java/io/trino/type/TestIntervalYearMonth.java
index 1478a8991aa5..5204f1cbc567 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestIntervalYearMonth.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestIntervalYearMonth.java
@@ -121,10 +121,10 @@ public void testMultiply()
         assertThat(assertions.operator(MULTIPLY, "2.5", "INTERVAL '1' YEAR"))
                 .matches("INTERVAL '2-6' YEAR TO MONTH");
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, "INTERVAL '6' MONTH", "nan()").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, "INTERVAL '6' MONTH", "nan()")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, "nan()", "INTERVAL '6' YEAR").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, "nan()", "INTERVAL '6' YEAR")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
@@ -143,16 +143,16 @@ public void testDivide()
         assertThat(assertions.operator(DIVIDE, "INTERVAL '4' YEAR", "4.8"))
                 .matches("INTERVAL '10' MONTH");
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "INTERVAL '6' MONTH", "nan()").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "INTERVAL '6' MONTH", "nan()")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "INTERVAL '6' YEAR", "nan()").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "INTERVAL '6' YEAR", "nan()")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "INTERVAL '6' MONTH", "0E0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "INTERVAL '6' MONTH", "0E0")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "INTERVAL '6' YEAR", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "INTERVAL '6' YEAR", "0")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/type/TestIntervalYearMonthType.java b/core/trino-main/src/test/java/io/trino/type/TestIntervalYearMonthType.java
index 4b771672e1c2..108ad544ead9 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestIntervalYearMonthType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestIntervalYearMonthType.java
@@ -13,10 +13,12 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.type.IntervalYearMonthType.INTERVAL_YEAR_MONTH;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIntervalYearMonthType
         extends AbstractTestType
@@ -26,7 +28,7 @@ public TestIntervalYearMonthType()
         super(INTERVAL_YEAR_MONTH, SqlIntervalYearMonth.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = INTERVAL_YEAR_MONTH.createBlockBuilder(null, 15);
         INTERVAL_YEAR_MONTH.writeLong(blockBuilder, 1111);
@@ -40,7 +42,7 @@ public static Block createTestBlock()
         INTERVAL_YEAR_MONTH.writeLong(blockBuilder, 3333);
         INTERVAL_YEAR_MONTH.writeLong(blockBuilder, 3333);
         INTERVAL_YEAR_MONTH.writeLong(blockBuilder, 4444);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -48,4 +50,25 @@ protected Object getGreaterValue(Object value)
     {
         return ((Long) value) + 1;
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestIpAddressType.java b/core/trino-main/src/test/java/io/trino/type/TestIpAddressType.java
index a57f787b07b9..6c4a4c7d42ee 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestIpAddressType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestIpAddressType.java
@@ -16,12 +16,13 @@
 import com.google.common.net.InetAddresses;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import org.testng.annotations.Test;
+import io.trino.spi.block.ValueBlock;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.type.IpAddressType.IPADDRESS;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 public class TestIpAddressType
@@ -32,7 +33,7 @@ public TestIpAddressType()
         super(IPADDRESS, String.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = IPADDRESS.createBlockBuilder(null, 1);
         IPADDRESS.writeSlice(blockBuilder, getSliceForAddress("2001:db8::ff00:42:8320"));
@@ -45,7 +46,7 @@ public static Block createTestBlock()
         IPADDRESS.writeSlice(blockBuilder, getSliceForAddress("2001:db8::ff00:42:8327"));
         IPADDRESS.writeSlice(blockBuilder, getSliceForAddress("2001:db8::ff00:42:8328"));
         IPADDRESS.writeSlice(blockBuilder, getSliceForAddress("2001:db8::ff00:42:8329"));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -72,4 +73,25 @@ private static Slice getSliceForAddress(String address)
     {
         return Slices.wrappedBuffer(InetAddresses.forString(address).getAddress());
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestJsonOperators.java b/core/trino-main/src/test/java/io/trino/type/TestJsonOperators.java
index 4010bfbe30ab..1357eb6c57c7 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestJsonOperators.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestJsonOperators.java
@@ -399,19 +399,19 @@ public void testTypeConstructor()
                 .hasType(JSON)
                 .isEqualTo("{\"x\":null}");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("JSON '{}{'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("JSON '{}{'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("JSON '{} \"a\"'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("JSON '{} \"a\"'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("JSON '{}{abc'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("JSON '{}{abc'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("JSON '{}abc'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("JSON '{}abc'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("JSON ''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("JSON ''")::evaluate)
                 .hasErrorCode(INVALID_LITERAL);
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/type/TestJsonPath2016TypeSerialization.java b/core/trino-main/src/test/java/io/trino/type/TestJsonPath2016TypeSerialization.java
index 8f00401b003e..7e28a1efc9eb 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestJsonPath2016TypeSerialization.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestJsonPath2016TypeSerialization.java
@@ -26,13 +26,12 @@
 import io.trino.json.ir.IrConstantJsonSequence;
 import io.trino.json.ir.IrContextVariable;
 import io.trino.json.ir.IrDatetimeMethod;
+import io.trino.json.ir.IrDescendantMemberAccessor;
 import io.trino.json.ir.IrDoubleMethod;
 import io.trino.json.ir.IrFloorMethod;
-import io.trino.json.ir.IrJsonNull;
 import io.trino.json.ir.IrJsonPath;
 import io.trino.json.ir.IrKeyValueMethod;
 import io.trino.json.ir.IrLastIndexVariable;
-import io.trino.json.ir.IrLiteral;
 import io.trino.json.ir.IrMemberAccessor;
 import io.trino.json.ir.IrNamedJsonVariable;
 import io.trino.json.ir.IrNamedValueVariable;
@@ -42,7 +41,10 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.TestingBlockEncodingSerde;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.assertj.core.api.AssertProvider;
+import org.assertj.core.api.RecursiveComparisonAssert;
+import org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -53,6 +55,7 @@
 import static io.trino.json.ir.IrArithmeticUnary.Sign.PLUS;
 import static io.trino.json.ir.IrConstantJsonSequence.EMPTY_SEQUENCE;
 import static io.trino.json.ir.IrConstantJsonSequence.singletonSequence;
+import static io.trino.json.ir.IrJsonNull.JSON_NULL;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DecimalType.createDecimalType;
@@ -62,29 +65,31 @@
 import static io.trino.spi.type.TimeType.createTimeType;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createVarcharType;
+import static io.trino.sql.planner.PathNodes.literal;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJsonPath2016TypeSerialization
 {
     private static final Type JSON_PATH_2016 = new JsonPath2016Type(new TypeDeserializer(TESTING_TYPE_MANAGER), new TestingBlockEncodingSerde());
+    private static final RecursiveComparisonConfiguration COMPARISON_CONFIGURATION = RecursiveComparisonConfiguration.builder().withStrictTypeChecking(true).build();
 
     @Test
     public void testJsonPathMode()
     {
-        assertJsonRoundTrip(new IrJsonPath(true, new IrJsonNull()));
-        assertJsonRoundTrip(new IrJsonPath(false, new IrJsonNull()));
+        assertJsonRoundTrip(new IrJsonPath(true, JSON_NULL));
+        assertJsonRoundTrip(new IrJsonPath(false, JSON_NULL));
     }
 
     @Test
     public void testLiterals()
     {
-        assertJsonRoundTrip(new IrJsonPath(true, new IrLiteral(createDecimalType(2, 1), 1L)));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrLiteral(DOUBLE, 1e0)));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrLiteral(INTEGER, 1L)));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrLiteral(BIGINT, 1000000000000L)));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrLiteral(VARCHAR, utf8Slice("some_text"))));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrLiteral(BOOLEAN, false)));
+        assertJsonRoundTrip(new IrJsonPath(true, literal(createDecimalType(2, 1), 1L)));
+        assertJsonRoundTrip(new IrJsonPath(true, literal(DOUBLE, 1e0)));
+        assertJsonRoundTrip(new IrJsonPath(true, literal(INTEGER, 1L)));
+        assertJsonRoundTrip(new IrJsonPath(true, literal(BIGINT, 1000000000000L)));
+        assertJsonRoundTrip(new IrJsonPath(true, literal(VARCHAR, utf8Slice("some_text"))));
+        assertJsonRoundTrip(new IrJsonPath(true, literal(BOOLEAN, false)));
     }
 
     @Test
@@ -108,34 +113,34 @@ public void testNamedVariables()
     @Test
     public void testMethods()
     {
-        assertJsonRoundTrip(new IrJsonPath(true, new IrAbsMethod(new IrLiteral(DOUBLE, 1e0), Optional.of(DOUBLE))));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrCeilingMethod(new IrLiteral(DOUBLE, 1e0), Optional.of(DOUBLE))));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrDatetimeMethod(new IrLiteral(BIGINT, 1L), Optional.of("some_time_format"), Optional.of(createTimeType(DEFAULT_PRECISION)))));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrDoubleMethod(new IrLiteral(BIGINT, 1L), Optional.of(DOUBLE))));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrFloorMethod(new IrLiteral(DOUBLE, 1e0), Optional.of(DOUBLE))));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrKeyValueMethod(new IrJsonNull())));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrSizeMethod(new IrJsonNull(), Optional.of(INTEGER))));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrTypeMethod(new IrJsonNull(), Optional.of(createVarcharType(7)))));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrAbsMethod(literal(DOUBLE, 1e0), Optional.of(DOUBLE))));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrCeilingMethod(literal(DOUBLE, 1e0), Optional.of(DOUBLE))));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrDatetimeMethod(literal(BIGINT, 1L), Optional.of("some_time_format"), Optional.of(createTimeType(DEFAULT_PRECISION)))));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrDoubleMethod(literal(BIGINT, 1L), Optional.of(DOUBLE))));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrFloorMethod(literal(DOUBLE, 1e0), Optional.of(DOUBLE))));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrKeyValueMethod(JSON_NULL)));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrSizeMethod(JSON_NULL, Optional.of(INTEGER))));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrTypeMethod(JSON_NULL, Optional.of(createVarcharType(7)))));
     }
 
     @Test
     public void testArrayAccessor()
     {
         // wildcard accessor
-        assertJsonRoundTrip(new IrJsonPath(true, new IrArrayAccessor(new IrJsonNull(), ImmutableList.of(), Optional.empty())));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrArrayAccessor(JSON_NULL, ImmutableList.of(), Optional.empty())));
 
         // with subscripts based on literals
         assertJsonRoundTrip(new IrJsonPath(true, new IrArrayAccessor(
-                new IrJsonNull(),
+                JSON_NULL,
                 ImmutableList.of(
-                        new Subscript(new IrLiteral(INTEGER, 0L), Optional.of(new IrLiteral(INTEGER, 1L))),
-                        new Subscript(new IrLiteral(INTEGER, 3L), Optional.of(new IrLiteral(INTEGER, 5L))),
-                        new Subscript(new IrLiteral(INTEGER, 7L), Optional.empty())),
+                        new Subscript(literal(INTEGER, 0L), Optional.of(literal(INTEGER, 1L))),
+                        new Subscript(literal(INTEGER, 3L), Optional.of(literal(INTEGER, 5L))),
+                        new Subscript(literal(INTEGER, 7L), Optional.empty())),
                 Optional.of(VARCHAR))));
 
         // with LAST index variable
         assertJsonRoundTrip(new IrJsonPath(true, new IrArrayAccessor(
-                new IrJsonNull(),
+                JSON_NULL,
                 ImmutableList.of(new Subscript(new IrLastIndexVariable(Optional.of(INTEGER)), Optional.empty())),
                 Optional.empty())));
     }
@@ -144,30 +149,36 @@ public void testArrayAccessor()
     public void testMemberAccessor()
     {
         // wildcard accessor
-        assertJsonRoundTrip(new IrJsonPath(true, new IrMemberAccessor(new IrJsonNull(), Optional.empty(), Optional.empty())));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrMemberAccessor(JSON_NULL, Optional.empty(), Optional.empty())));
 
         // accessor by field name
-        assertJsonRoundTrip(new IrJsonPath(true, new IrMemberAccessor(new IrJsonNull(), Optional.of("some_key"), Optional.of(BIGINT))));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrMemberAccessor(JSON_NULL, Optional.of("some_key"), Optional.of(BIGINT))));
+    }
+
+    @Test
+    public void testDescendantMemberAccessor()
+    {
+        assertJsonRoundTrip(new IrJsonPath(true, new IrDescendantMemberAccessor(JSON_NULL, "some_key", Optional.empty())));
     }
 
     @Test
     public void testArithmeticBinary()
     {
-        assertJsonRoundTrip(new IrJsonPath(true, new IrArithmeticBinary(ADD, new IrJsonNull(), new IrJsonNull(), Optional.empty())));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrArithmeticBinary(ADD, JSON_NULL, JSON_NULL, Optional.empty())));
 
         assertJsonRoundTrip(new IrJsonPath(true, new IrArithmeticBinary(
                 ADD,
-                new IrLiteral(INTEGER, 1L),
-                new IrLiteral(BIGINT, 2L),
+                literal(INTEGER, 1L),
+                literal(BIGINT, 2L),
                 Optional.of(BIGINT))));
     }
 
     @Test
     public void testArithmeticUnary()
     {
-        assertJsonRoundTrip(new IrJsonPath(true, new IrArithmeticUnary(PLUS, new IrJsonNull(), Optional.empty())));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrArithmeticUnary(MINUS, new IrJsonNull(), Optional.empty())));
-        assertJsonRoundTrip(new IrJsonPath(true, new IrArithmeticUnary(MINUS, new IrLiteral(INTEGER, 1L), Optional.of(INTEGER))));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrArithmeticUnary(PLUS, JSON_NULL, Optional.empty())));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrArithmeticUnary(MINUS, JSON_NULL, Optional.empty())));
+        assertJsonRoundTrip(new IrJsonPath(true, new IrArithmeticUnary(MINUS, literal(INTEGER, 1L), Optional.of(INTEGER))));
     }
 
     @Test
@@ -194,7 +205,7 @@ public void testNestedStructure()
                 new IrTypeMethod(
                         new IrArithmeticBinary(
                                 MULTIPLY,
-                                new IrArithmeticUnary(MINUS, new IrAbsMethod(new IrFloorMethod(new IrLiteral(INTEGER, 1L), Optional.of(INTEGER)), Optional.of(INTEGER)), Optional.of(INTEGER)),
+                                new IrArithmeticUnary(MINUS, new IrAbsMethod(new IrFloorMethod(literal(INTEGER, 1L), Optional.of(INTEGER)), Optional.of(INTEGER)), Optional.of(INTEGER)),
                                 new IrCeilingMethod(new IrMemberAccessor(new IrContextVariable(Optional.empty()), Optional.of("some_key"), Optional.of(BIGINT)), Optional.of(BIGINT)),
                                 Optional.of(BIGINT)),
                         Optional.of(createVarcharType(7)))));
@@ -206,6 +217,7 @@ private static void assertJsonRoundTrip(IrJsonPath object)
         JSON_PATH_2016.writeObject(blockBuilder, object);
         Block serialized = blockBuilder.build();
         Object deserialized = JSON_PATH_2016.getObject(serialized, 0);
-        assertEquals(deserialized, object);
+        assertThat((AssertProvider<? extends RecursiveComparisonAssert<?>>) () -> new RecursiveComparisonAssert<>(deserialized, COMPARISON_CONFIGURATION))
+                .isEqualTo(object);
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestJsonType.java b/core/trino-main/src/test/java/io/trino/type/TestJsonType.java
index 22650b5da4a2..20f14a17b824 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestJsonType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestJsonType.java
@@ -15,10 +15,13 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.type.JsonType.JSON;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestJsonType
         extends AbstractTestType
@@ -28,12 +31,12 @@ public TestJsonType()
         super(JSON, String.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = JSON.createBlockBuilder(null, 1);
         Slice slice = Slices.utf8Slice("{\"x\":1, \"y\":2}");
         JSON.writeSlice(blockBuilder, slice);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -41,4 +44,27 @@ protected Object getGreaterValue(Object value)
     {
         return null;
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThatThrownBy(() -> type.getPreviousValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThatThrownBy(() -> type.getNextValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestLikePatternType.java b/core/trino-main/src/test/java/io/trino/type/TestLikePatternType.java
index 5516ac528932..501531ae2d61 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestLikePatternType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestLikePatternType.java
@@ -13,7 +13,6 @@
  */
 package io.trino.type;
 
-import io.trino.likematcher.LikeMatcher;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
@@ -30,15 +29,15 @@ public class TestLikePatternType
     public void testGetObject()
     {
         BlockBuilder blockBuilder = LIKE_PATTERN.createBlockBuilder(new PageBuilderStatus().createBlockBuilderStatus(), 10);
-        LIKE_PATTERN.writeObject(blockBuilder, LikeMatcher.compile("helloX_world", Optional.of('X')));
-        LIKE_PATTERN.writeObject(blockBuilder, LikeMatcher.compile("foo%_bar"));
+        LIKE_PATTERN.writeObject(blockBuilder, LikePattern.compile("helloX_world", Optional.of('X')));
+        LIKE_PATTERN.writeObject(blockBuilder, LikePattern.compile("foo%_bar", Optional.empty()));
         Block block = blockBuilder.build();
 
-        LikeMatcher pattern = (LikeMatcher) LIKE_PATTERN.getObject(block, 0);
+        LikePattern pattern = (LikePattern) LIKE_PATTERN.getObject(block, 0);
         assertThat(pattern.getPattern()).isEqualTo("helloX_world");
         assertThat(pattern.getEscape()).isEqualTo(Optional.of('X'));
 
-        pattern = (LikeMatcher) LIKE_PATTERN.getObject(block, 1);
+        pattern = (LikePattern) LIKE_PATTERN.getObject(block, 1);
         assertThat(pattern.getPattern()).isEqualTo("foo%_bar");
         assertThat(pattern.getEscape()).isEqualTo(Optional.empty());
     }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestLongDecimalType.java b/core/trino-main/src/test/java/io/trino/type/TestLongDecimalType.java
index 973a56db24a2..1dd5ebb9a895 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestLongDecimalType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestLongDecimalType.java
@@ -13,16 +13,18 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Decimals;
 import io.trino.spi.type.Int128;
 import io.trino.spi.type.SqlDecimal;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 
 import static io.trino.spi.type.Decimals.writeBigDecimal;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestLongDecimalType
         extends AbstractTestType
@@ -34,7 +36,7 @@ public TestLongDecimalType()
         super(LONG_DECIMAL_TYPE, SqlDecimal.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = LONG_DECIMAL_TYPE.createBlockBuilder(null, 15);
         writeBigDecimal(LONG_DECIMAL_TYPE, blockBuilder, new BigDecimal("-12345678901234567890.1234567890"));
@@ -48,7 +50,7 @@ public static Block createTestBlock()
         writeBigDecimal(LONG_DECIMAL_TYPE, blockBuilder, new BigDecimal("32345678901234567890.1234567890"));
         writeBigDecimal(LONG_DECIMAL_TYPE, blockBuilder, new BigDecimal("32345678901234567890.1234567890"));
         writeBigDecimal(LONG_DECIMAL_TYPE, blockBuilder, new BigDecimal("42345678901234567890.1234567890"));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -69,4 +71,25 @@ private static BigDecimal toBigDecimal(Int128 value, int scale)
     {
         return new BigDecimal(value.toBigInteger(), scale);
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestLongTimestampType.java b/core/trino-main/src/test/java/io/trino/type/TestLongTimestampType.java
index e419e65993cb..6e194fafc0fc 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestLongTimestampType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestLongTimestampType.java
@@ -13,16 +13,19 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
+import com.google.common.collect.ImmutableList;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.LongTimestamp;
 import io.trino.spi.type.SqlTimestamp;
 import io.trino.spi.type.Type.Range;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
 
 import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
 import static io.trino.spi.type.TimestampType.createTimestampType;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 public class TestLongTimestampType
@@ -33,7 +36,7 @@ public TestLongTimestampType()
         super(TIMESTAMP_NANOS, SqlTimestamp.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = TIMESTAMP_NANOS.createBlockBuilder(null, 15);
         TIMESTAMP_NANOS.writeObject(blockBuilder, new LongTimestamp(1111_123, 123_000));
@@ -47,7 +50,7 @@ public static Block createTestBlock()
         TIMESTAMP_NANOS.writeObject(blockBuilder, new LongTimestamp(3333_123, 123_000));
         TIMESTAMP_NANOS.writeObject(blockBuilder, new LongTimestamp(3333_123, 123_000));
         TIMESTAMP_NANOS.writeObject(blockBuilder, new LongTimestamp(4444_123, 123_000));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -57,7 +60,7 @@ protected Object getGreaterValue(Object value)
         return new LongTimestamp(timestamp.getEpochMicros() + 1, 0);
     }
 
-    @Override
+    @Test
     public void testRange()
     {
         Range range = type.getRange().orElseThrow();
@@ -65,24 +68,42 @@ public void testRange()
         assertEquals(range.getMax(), new LongTimestamp(Long.MAX_VALUE, 999_000));
     }
 
-    @Test(dataProvider = "testRangeEveryPrecisionDataProvider")
-    public void testRangeEveryPrecision(int precision, LongTimestamp expectedMax)
+    @Test
+    public void testRangeEveryPrecision()
     {
-        Range range = createTimestampType(precision).getRange().orElseThrow();
-        assertEquals(range.getMin(), new LongTimestamp(Long.MIN_VALUE, 0));
-        assertEquals(range.getMax(), expectedMax);
+        for (MaxPrecision entry : maxPrecisions()) {
+            Range range = createTimestampType(entry.precision()).getRange().orElseThrow();
+            assertEquals(range.getMin(), new LongTimestamp(Long.MIN_VALUE, 0));
+            assertEquals(range.getMax(), entry.expectedMax());
+        }
+    }
+
+    public static List<MaxPrecision> maxPrecisions()
+    {
+        return ImmutableList.of(
+                new MaxPrecision(7, new LongTimestamp(Long.MAX_VALUE, 900_000)),
+                new MaxPrecision(8, new LongTimestamp(Long.MAX_VALUE, 990_000)),
+                new MaxPrecision(9, new LongTimestamp(Long.MAX_VALUE, 999_000)),
+                new MaxPrecision(10, new LongTimestamp(Long.MAX_VALUE, 999_900)),
+                new MaxPrecision(11, new LongTimestamp(Long.MAX_VALUE, 999_990)),
+                new MaxPrecision(12, new LongTimestamp(Long.MAX_VALUE, 999_999)));
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
     }
 
-    @DataProvider
-    public static Object[][] testRangeEveryPrecisionDataProvider()
+    record MaxPrecision(int precision, LongTimestamp expectedMax)
     {
-        return new Object[][] {
-                {7, new LongTimestamp(Long.MAX_VALUE, 900_000)},
-                {8, new LongTimestamp(Long.MAX_VALUE, 990_000)},
-                {9, new LongTimestamp(Long.MAX_VALUE, 999_000)},
-                {10, new LongTimestamp(Long.MAX_VALUE, 999_900)},
-                {11, new LongTimestamp(Long.MAX_VALUE, 999_990)},
-                {12, new LongTimestamp(Long.MAX_VALUE, 999_999)},
-        };
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestLongTimestampWithTimeZoneType.java b/core/trino-main/src/test/java/io/trino/type/TestLongTimestampWithTimeZoneType.java
index f26e25bc15ea..ce610e7fcf63 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestLongTimestampWithTimeZoneType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestLongTimestampWithTimeZoneType.java
@@ -13,15 +13,18 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.LongTimestampWithTimeZone;
 import io.trino.spi.type.SqlTimestampWithTimeZone;
 import io.trino.spi.type.Type;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static io.trino.spi.type.TimeZoneKey.getTimeZoneKeyForOffset;
@@ -37,7 +40,7 @@ public TestLongTimestampWithTimeZoneType()
         super(TIMESTAMP_TZ_MICROS, SqlTimestampWithTimeZone.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = TIMESTAMP_TZ_MICROS.createBlockBuilder(null, 15);
         TIMESTAMP_TZ_MICROS.writeObject(blockBuilder, LongTimestampWithTimeZone.fromEpochMillisAndFraction(1111, 0, getTimeZoneKeyForOffset(0)));
@@ -51,7 +54,7 @@ public static Block createTestBlock()
         TIMESTAMP_TZ_MICROS.writeObject(blockBuilder, LongTimestampWithTimeZone.fromEpochMillisAndFraction(3333, 0, getTimeZoneKeyForOffset(8)));
         TIMESTAMP_TZ_MICROS.writeObject(blockBuilder, LongTimestampWithTimeZone.fromEpochMillisAndFraction(3333, 0, getTimeZoneKeyForOffset(9)));
         TIMESTAMP_TZ_MICROS.writeObject(blockBuilder, LongTimestampWithTimeZone.fromEpochMillisAndFraction(4444, 0, getTimeZoneKeyForOffset(10)));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -61,7 +64,7 @@ protected Object getGreaterValue(Object value)
         return LongTimestampWithTimeZone.fromEpochMillisAndFraction(((LongTimestampWithTimeZone) value).getEpochMillis() + 1, 0, getTimeZoneKeyForOffset(33));
     }
 
-    @Override
+    @Test
     public void testPreviousValue()
     {
         LongTimestampWithTimeZone minValue = LongTimestampWithTimeZone.fromEpochMillisAndFraction(Long.MIN_VALUE, 0, UTC_KEY);
@@ -76,6 +79,8 @@ public void testPreviousValue()
 
         assertThat(type.getPreviousValue(getSampleValue()))
                 .isEqualTo(Optional.of(LongTimestampWithTimeZone.fromEpochMillisAndFraction(1110, 999_000_000, getTimeZoneKeyForOffset(0))));
+        assertThat(type.getPreviousValue(LongTimestampWithTimeZone.fromEpochMillisAndFraction(1483228800000L, 000_000_000, getTimeZoneKeyForOffset(0))))
+                .isEqualTo(Optional.of(LongTimestampWithTimeZone.fromEpochMillisAndFraction(1483228799999L, 999_000_000, getTimeZoneKeyForOffset(0))));
 
         assertThat(type.getPreviousValue(previousToMaxValue))
                 .isEqualTo(Optional.of(LongTimestampWithTimeZone.fromEpochMillisAndFraction(Long.MAX_VALUE, 997_000_000, UTC_KEY)));
@@ -83,7 +88,7 @@ public void testPreviousValue()
                 .isEqualTo(Optional.of(previousToMaxValue));
     }
 
-    @Override
+    @Test
     public void testNextValue()
     {
         LongTimestampWithTimeZone minValue = LongTimestampWithTimeZone.fromEpochMillisAndFraction(Long.MIN_VALUE, 0, UTC_KEY);
@@ -98,6 +103,8 @@ public void testNextValue()
 
         assertThat(type.getNextValue(getSampleValue()))
                 .isEqualTo(Optional.of(LongTimestampWithTimeZone.fromEpochMillisAndFraction(1111, 1_000_000, getTimeZoneKeyForOffset(0))));
+        assertThat(type.getNextValue(LongTimestampWithTimeZone.fromEpochMillisAndFraction(1483228799999L, 999_000_000, getTimeZoneKeyForOffset(0))))
+                .isEqualTo(Optional.of(LongTimestampWithTimeZone.fromEpochMillisAndFraction(1483228800000L, 000_000_000, getTimeZoneKeyForOffset(0))));
 
         assertThat(type.getNextValue(previousToMaxValue))
                 .isEqualTo(Optional.of(maxValue));
@@ -105,7 +112,8 @@ public void testNextValue()
                 .isEqualTo(Optional.empty());
     }
 
-    @Test(dataProvider = "testPreviousNextValueEveryPrecisionDatProvider")
+    @ParameterizedTest
+    @MethodSource("testPreviousNextValueEveryPrecisionDataProvider")
     public void testPreviousValueEveryPrecision(int precision, long minValue, long maxValue, long step)
     {
         Type type = createTimestampType(precision);
@@ -126,7 +134,8 @@ public void testPreviousValueEveryPrecision(int precision, long minValue, long m
                 .isEqualTo(Optional.of(maxValue - step));
     }
 
-    @Test(dataProvider = "testPreviousNextValueEveryPrecisionDatProvider")
+    @ParameterizedTest
+    @MethodSource("testPreviousNextValueEveryPrecisionDataProvider")
     public void testNextValueEveryPrecision(int precision, long minValue, long maxValue, long step)
     {
         Type type = createTimestampType(precision);
@@ -147,17 +156,22 @@ public void testNextValueEveryPrecision(int precision, long minValue, long maxVa
                 .isEqualTo(Optional.empty());
     }
 
-    @DataProvider
-    public Object[][] testPreviousNextValueEveryPrecisionDatProvider()
+    public static Stream<Arguments> testPreviousNextValueEveryPrecisionDataProvider()
+    {
+        return Stream.of(
+                Arguments.of(0, Long.MIN_VALUE + 775808, Long.MAX_VALUE - 775807, 1_000_000L),
+                Arguments.of(1, Long.MIN_VALUE + 75808, Long.MAX_VALUE - 75807, 100_000L),
+                Arguments.of(2, Long.MIN_VALUE + 5808, Long.MAX_VALUE - 5807, 10_000L),
+                Arguments.of(3, Long.MIN_VALUE + 808, Long.MAX_VALUE - 807, 1_000L),
+                Arguments.of(4, Long.MIN_VALUE + 8, Long.MAX_VALUE - 7, 100L),
+                Arguments.of(5, Long.MIN_VALUE + 8, Long.MAX_VALUE - 7, 10L),
+                Arguments.of(6, Long.MIN_VALUE, Long.MAX_VALUE, 1L));
+    }
+
+    @Test
+    public void testRange()
     {
-        return new Object[][] {
-                {0, Long.MIN_VALUE + 775808, Long.MAX_VALUE - 775807, 1_000_000L},
-                {1, Long.MIN_VALUE + 75808, Long.MAX_VALUE - 75807, 100_000L},
-                {2, Long.MIN_VALUE + 5808, Long.MAX_VALUE - 5807, 10_000L},
-                {3, Long.MIN_VALUE + 808, Long.MAX_VALUE - 807, 1_000L},
-                {4, Long.MIN_VALUE + 8, Long.MAX_VALUE - 7, 100L},
-                {5, Long.MIN_VALUE + 8, Long.MAX_VALUE - 7, 10L},
-                {6, Long.MIN_VALUE, Long.MAX_VALUE, 1L},
-        };
+        assertThat(type.getRange())
+                .isEmpty();
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestMapOperators.java b/core/trino-main/src/test/java/io/trino/type/TestMapOperators.java
index f2c4d3aecdf5..9b1f905fbe42 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestMapOperators.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestMapOperators.java
@@ -153,23 +153,23 @@ public void testConstructor()
                         sqlTimestampOf(0, 1973, 7, 8, 22, 0, 1, 0),
                         100.0));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map", "ARRAY[1]", "ARRAY[2, 4]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("map", "ARRAY[1]", "ARRAY[2, 4]")::evaluate)
                 .hasMessage("Key and value arrays must be the same length");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map", "ARRAY[1, 2, 3, 2]", "ARRAY[4, 5, 6, 7]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("map", "ARRAY[1, 2, 3, 2]", "ARRAY[4, 5, 6, 7]")::evaluate)
                 .hasMessage("Duplicate map keys (2) are not allowed");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map", "ARRAY[ARRAY[1, 2], ARRAY[1, 3], ARRAY[1, 2]]", "ARRAY[1, 2, 3]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("map", "ARRAY[ARRAY[1, 2], ARRAY[1, 3], ARRAY[1, 2]]", "ARRAY[1, 2, 3]")::evaluate)
                 .hasMessage("Duplicate map keys ([1, 2]) are not allowed");
 
         assertThat(assertions.function("map", "ARRAY[ARRAY[1]]", "ARRAY[2]"))
                 .hasType(mapType(new ArrayType(INTEGER), INTEGER))
                 .isEqualTo(ImmutableMap.of(ImmutableList.of(1), 2));
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map", "ARRAY[NULL]", "ARRAY[2]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("map", "ARRAY[NULL]", "ARRAY[2]")::evaluate)
                 .hasMessage("map key cannot be null");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map", "ARRAY[ARRAY[NULL]]", "ARRAY[2]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("map", "ARRAY[ARRAY[NULL]]", "ARRAY[2]")::evaluate)
                 .hasMessage("map key cannot be indeterminate: [null]");
     }
 
@@ -689,12 +689,12 @@ public void testJsonToMap()
 
         assertTrinoExceptionThrownBy(() -> assertions.expression("cast(a as MAP(BIGINT, BIGINT))")
                 .binding("a", "JSON '{\"1\":1, \"01\": 2}'").evaluate())
-                .hasMessage("Cannot cast to map(bigint, bigint). Duplicate keys are not allowed\n{\"01\":2,\"1\":1}")
+                .hasMessage("Cannot cast to map(bigint, bigint). Duplicate map keys are not allowed\n{\"01\":2,\"1\":1}")
                 .hasErrorCode(INVALID_CAST_ARGUMENT);
 
         assertTrinoExceptionThrownBy(() -> assertions.expression("cast(a as ARRAY(MAP(BIGINT, BIGINT)))")
                 .binding("a", "JSON '[{\"1\":1, \"01\": 2}]'").evaluate())
-                .hasMessage("Cannot cast to array(map(bigint, bigint)). Duplicate keys are not allowed\n[{\"01\":2,\"1\":1}]")
+                .hasMessage("Cannot cast to array(map(bigint, bigint)). Duplicate map keys are not allowed\n[{\"01\":2,\"1\":1}]")
                 .hasErrorCode(INVALID_CAST_ARGUMENT);
 
         // some other key/value type combinations
@@ -841,13 +841,13 @@ public void testSubscript()
                 .binding("a", "map(ARRAY['puppies'], ARRAY[null])"))
                 .isNull(UNKNOWN);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map", "ARRAY[CAST(null as bigint)]", "ARRAY[1]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("map", "ARRAY[CAST(null as bigint)]", "ARRAY[1]")::evaluate)
                 .hasMessage("map key cannot be null");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map", "ARRAY[CAST(null as bigint)]", "ARRAY[CAST(null as bigint)]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("map", "ARRAY[CAST(null as bigint)]", "ARRAY[CAST(null as bigint)]")::evaluate)
                 .hasMessage("map key cannot be null");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map", "ARRAY[1,null]", "ARRAY[null,2]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("map", "ARRAY[1,null]", "ARRAY[null,2]")::evaluate)
                 .hasMessage("map key cannot be null");
 
         assertThat(assertions.expression("a[3]")
@@ -1324,6 +1324,9 @@ public void testNotEquals()
     @Test
     public void testDistinctFrom()
     {
+        assertThat(assertions.operator(IS_DISTINCT_FROM, "MAP(ARRAY[1], ARRAY[0])", "MAP(ARRAY[1], ARRAY[NULL])"))
+                .isEqualTo(true);
+
         assertThat(assertions.operator(IS_DISTINCT_FROM, "CAST(NULL AS MAP(INTEGER, VARCHAR))", "CAST(NULL AS MAP(INTEGER, VARCHAR))"))
                 .isEqualTo(false);
 
@@ -1661,31 +1664,31 @@ public void testMapFromEntries()
                 .isEqualTo(expectedNullValueMap);
 
         // invalid invocation
-        assertTrinoExceptionThrownBy(() -> assertions.function("map_from_entries", "ARRAY[('a', 1), ('a', 2)]").evaluate())
-                .hasMessage("Duplicate keys (a) are not allowed");
+        assertTrinoExceptionThrownBy(assertions.function("map_from_entries", "ARRAY[('a', 1), ('a', 2)]")::evaluate)
+                .hasMessage("Duplicate map keys (a) are not allowed");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map_from_entries", "ARRAY[(1, 1), (1, 2)]").evaluate())
-                .hasMessage("Duplicate keys (1) are not allowed");
+        assertTrinoExceptionThrownBy(assertions.function("map_from_entries", "ARRAY[(1, 1), (1, 2)]")::evaluate)
+                .hasMessage("Duplicate map keys (1) are not allowed");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map_from_entries", "ARRAY[(1.0, 1), (1.0, 2)]").evaluate())
-                .hasMessage("Duplicate keys (1.0) are not allowed");
+        assertTrinoExceptionThrownBy(assertions.function("map_from_entries", "ARRAY[(1.0, 1), (1.0, 2)]")::evaluate)
+                .hasMessage("Duplicate map keys (1.0) are not allowed");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map_from_entries", "ARRAY[(ARRAY[1, 2], 1), (ARRAY[1, 2], 2)]").evaluate())
-                .hasMessage("Duplicate keys ([1, 2]) are not allowed");
+        assertTrinoExceptionThrownBy(assertions.function("map_from_entries", "ARRAY[(ARRAY[1, 2], 1), (ARRAY[1, 2], 2)]")::evaluate)
+                .hasMessage("Duplicate map keys ([1, 2]) are not allowed");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map_from_entries", "ARRAY[(MAP(ARRAY[1], ARRAY[2]), 1), (MAP(ARRAY[1], ARRAY[2]), 2)]").evaluate())
-                .hasMessage("Duplicate keys ({1=2}) are not allowed");
+        assertTrinoExceptionThrownBy(assertions.function("map_from_entries", "ARRAY[(MAP(ARRAY[1], ARRAY[2]), 1), (MAP(ARRAY[1], ARRAY[2]), 2)]")::evaluate)
+                .hasMessage("Duplicate map keys ({1=2}) are not allowed");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map_from_entries", "ARRAY[(NaN(), 1), (NaN(), 2)]").evaluate())
-                .hasMessage("Duplicate keys (NaN) are not allowed");
+        assertTrinoExceptionThrownBy(assertions.function("map_from_entries", "ARRAY[(NaN(), 1), (NaN(), 2)]")::evaluate)
+                .hasMessage("Duplicate map keys (NaN) are not allowed");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map_from_entries", "ARRAY[(null, 1), (null, 2)]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("map_from_entries", "ARRAY[(null, 1), (null, 2)]")::evaluate)
                 .hasMessage("map key cannot be null");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map_from_entries", "ARRAY[null]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("map_from_entries", "ARRAY[null]")::evaluate)
                 .hasMessage("map entry cannot be null");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("map_from_entries", "ARRAY[(1, 2), null]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("map_from_entries", "ARRAY[(1, 2), null]")::evaluate)
                 .hasMessage("map entry cannot be null");
     }
 
@@ -1728,13 +1731,13 @@ public void testMultimapFromEntries()
                 .isEqualTo(ImmutableMap.of(Double.NaN, ImmutableList.of(1, 2)));
 
         // invalid invocation
-        assertTrinoExceptionThrownBy(() -> assertions.function("multimap_from_entries", "ARRAY[(null, 1), (null, 2)]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("multimap_from_entries", "ARRAY[(null, 1), (null, 2)]")::evaluate)
                 .hasMessage("map key cannot be null");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("multimap_from_entries", "ARRAY[null]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("multimap_from_entries", "ARRAY[null]")::evaluate)
                 .hasMessage("map entry cannot be null");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("multimap_from_entries", "ARRAY[(1, 2), null]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("multimap_from_entries", "ARRAY[(1, 2), null]")::evaluate)
                 .hasMessage("map entry cannot be null");
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/type/TestRealType.java b/core/trino-main/src/test/java/io/trino/type/TestRealType.java
index ae63fbcf3cc6..7fbfa28d67c1 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestRealType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestRealType.java
@@ -16,13 +16,15 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.IntArrayBlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.type.BlockTypeOperators.BlockPositionHashCode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.RealType.REAL;
 import static java.lang.Float.floatToIntBits;
 import static java.lang.Float.floatToRawIntBits;
 import static java.lang.Float.intBitsToFloat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 public class TestRealType
@@ -33,7 +35,7 @@ public TestRealType()
         super(REAL, Float.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = REAL.createBlockBuilder(null, 30);
         REAL.writeLong(blockBuilder, floatToRawIntBits(11.11F));
@@ -47,7 +49,7 @@ public static Block createTestBlock()
         REAL.writeLong(blockBuilder, floatToRawIntBits(33.33F));
         REAL.writeLong(blockBuilder, floatToRawIntBits(33.33F));
         REAL.writeLong(blockBuilder, floatToRawIntBits(44.44F));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -61,16 +63,40 @@ protected Object getGreaterValue(Object value)
     @Test
     public void testNaNHash()
     {
-        BlockBuilder blockBuilder = new IntArrayBlockBuilder(null, 4);
-        blockBuilder.writeInt(floatToIntBits(Float.NaN));
-        blockBuilder.writeInt(floatToRawIntBits(Float.NaN));
+        BlockBuilder blockBuilder = new IntArrayBlockBuilder(null, 5);
+        REAL.writeFloat(blockBuilder, Float.NaN);
+        REAL.writeInt(blockBuilder, floatToIntBits(Float.NaN));
+        REAL.writeInt(blockBuilder, floatToRawIntBits(Float.NaN));
         // the following two are the integer values of a float NaN
-        blockBuilder.writeInt(-0x400000);
-        blockBuilder.writeInt(0x7fc00000);
+        REAL.writeInt(blockBuilder, -0x400000);
+        REAL.writeInt(blockBuilder, 0x7fc00000);
+        Block block = blockBuilder.build();
 
         BlockPositionHashCode hashCodeOperator = blockTypeOperators.getHashCodeOperator(REAL);
-        assertEquals(hashCodeOperator.hashCode(blockBuilder, 0), hashCodeOperator.hashCode(blockBuilder, 1));
-        assertEquals(hashCodeOperator.hashCode(blockBuilder, 0), hashCodeOperator.hashCode(blockBuilder, 2));
-        assertEquals(hashCodeOperator.hashCode(blockBuilder, 0), hashCodeOperator.hashCode(blockBuilder, 3));
+        assertEquals(hashCodeOperator.hashCode(block, 0), hashCodeOperator.hashCode(block, 1));
+        assertEquals(hashCodeOperator.hashCode(block, 0), hashCodeOperator.hashCode(block, 2));
+        assertEquals(hashCodeOperator.hashCode(block, 0), hashCodeOperator.hashCode(block, 3));
+        assertEquals(hashCodeOperator.hashCode(block, 0), hashCodeOperator.hashCode(block, 4));
+    }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestRowOperators.java b/core/trino-main/src/test/java/io/trino/type/TestRowOperators.java
index 538149cca35c..8d552121f4ef 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestRowOperators.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestRowOperators.java
@@ -673,19 +673,19 @@ public void testRowComparison()
         assertComparisonCombination("row(TRUE, FALSE, TRUE, FALSE)", "row(TRUE, TRUE, TRUE, FALSE)");
         assertComparisonCombination("row(1, 2.0E0, TRUE, 'kittens', from_unixtime(1))", "row(1, 3.0E0, TRUE, 'kittens', from_unixtime(1))");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("CAST(row(CAST(CAST('' as varbinary) as hyperloglog)) as row(col0 hyperloglog)) = CAST(row(CAST(CAST('' as varbinary) as hyperloglog)) as row(col0 hyperloglog))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("CAST(row(CAST(CAST('' as varbinary) as hyperloglog)) as row(col0 hyperloglog)) = CAST(row(CAST(CAST('' as varbinary) as hyperloglog)) as row(col0 hyperloglog))")::evaluate)
                 .hasErrorCode(TYPE_MISMATCH)
                 .hasMessage("line 1:91: Cannot apply operator: row(col0 HyperLogLog) = row(col0 HyperLogLog)");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("CAST(row(CAST(CAST('' as varbinary) as hyperloglog)) as row(col0 hyperloglog)) > CAST(row(CAST(CAST('' as varbinary) as hyperloglog)) as row(col0 hyperloglog))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("CAST(row(CAST(CAST('' as varbinary) as hyperloglog)) as row(col0 hyperloglog)) > CAST(row(CAST(CAST('' as varbinary) as hyperloglog)) as row(col0 hyperloglog))")::evaluate)
                 .hasErrorCode(TYPE_MISMATCH)
                 .hasMessage("line 1:91: Cannot apply operator: row(col0 HyperLogLog) < row(col0 HyperLogLog)");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("CAST(row(CAST(CAST('' as varbinary) as qdigest(double))) as row(col0 qdigest(double))) = CAST(row(CAST(CAST('' as varbinary) as qdigest(double))) as row(col0 qdigest(double)))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("CAST(row(CAST(CAST('' as varbinary) as qdigest(double))) as row(col0 qdigest(double))) = CAST(row(CAST(CAST('' as varbinary) as qdigest(double))) as row(col0 qdigest(double)))")::evaluate)
                 .hasErrorCode(TYPE_MISMATCH)
                 .hasMessage("line 1:99: Cannot apply operator: row(col0 qdigest(double)) = row(col0 qdigest(double))");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("CAST(row(CAST(CAST('' as varbinary) as qdigest(double))) as row(col0 qdigest(double))) > CAST(row(CAST(CAST('' as varbinary) as qdigest(double))) as row(col0 qdigest(double)))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("CAST(row(CAST(CAST('' as varbinary) as qdigest(double))) as row(col0 qdigest(double))) > CAST(row(CAST(CAST('' as varbinary) as qdigest(double))) as row(col0 qdigest(double)))")::evaluate)
                 .hasErrorCode(TYPE_MISMATCH)
                 .hasMessage("line 1:99: Cannot apply operator: row(col0 qdigest(double)) < row(col0 qdigest(double))");
 
@@ -711,11 +711,11 @@ public void testRowComparison()
                 .binding("b", "row(1, 2)"))
                 .isEqualTo(true);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("row(TRUE, ARRAY [1, 2], MAP(ARRAY[1, 3], ARRAY[2.0E0, 4.0E0])) > row(TRUE, ARRAY [1, 2], MAP(ARRAY[1, 3], ARRAY[2.0E0, 4.0E0]))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("row(TRUE, ARRAY [1, 2], MAP(ARRAY[1, 3], ARRAY[2.0E0, 4.0E0])) > row(TRUE, ARRAY [1, 2], MAP(ARRAY[1, 3], ARRAY[2.0E0, 4.0E0]))")::evaluate)
                 .hasErrorCode(TYPE_MISMATCH)
                 .hasMessage("line 1:75: Cannot apply operator: row(boolean, array(integer), map(integer, double)) < row(boolean, array(integer), map(integer, double))");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("row(1, CAST(NULL AS INTEGER)) < row(1, 2)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("row(1, CAST(NULL AS INTEGER)) < row(1, 2)")::evaluate)
                 .hasErrorCode(StandardErrorCode.NOT_SUPPORTED);
 
         assertComparisonCombination("row(1.0E0, ARRAY [1,2,3], row(2, 2.0E0))", "row(1.0E0, ARRAY [1,3,3], row(2, 2.0E0))");
diff --git a/core/trino-main/src/test/java/io/trino/type/TestRowParametricType.java b/core/trino-main/src/test/java/io/trino/type/TestRowParametricType.java
index 1befebaa845d..fda1b96e61e6 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestRowParametricType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestRowParametricType.java
@@ -19,7 +19,7 @@
 import io.trino.spi.type.TypeParameter;
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.TypeSignatureParameter;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/type/TestShortDecimalType.java b/core/trino-main/src/test/java/io/trino/type/TestShortDecimalType.java
index bdea4a4d983c..712e83d682fd 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestShortDecimalType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestShortDecimalType.java
@@ -13,12 +13,14 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.SqlDecimal;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.DecimalType.createDecimalType;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestShortDecimalType
         extends AbstractTestType
@@ -30,7 +32,7 @@ public TestShortDecimalType()
         super(SHORT_DECIMAL_TYPE, SqlDecimal.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = SHORT_DECIMAL_TYPE.createBlockBuilder(null, 15);
         SHORT_DECIMAL_TYPE.writeLong(blockBuilder, -1234);
@@ -44,7 +46,7 @@ public static Block createTestBlock()
         SHORT_DECIMAL_TYPE.writeLong(blockBuilder, 3321);
         SHORT_DECIMAL_TYPE.writeLong(blockBuilder, 3321);
         SHORT_DECIMAL_TYPE.writeLong(blockBuilder, 4321);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -52,4 +54,25 @@ protected Object getGreaterValue(Object value)
     {
         return ((long) value) + 1;
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestShortTimestampType.java b/core/trino-main/src/test/java/io/trino/type/TestShortTimestampType.java
index 1dc091588d0e..a80089c14bca 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestShortTimestampType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestShortTimestampType.java
@@ -13,15 +13,18 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.SqlTimestamp;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.Type.Range;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
 import static io.trino.spi.type.TimestampType.createTimestampType;
@@ -36,7 +39,7 @@ public TestShortTimestampType()
         super(TIMESTAMP_MILLIS, SqlTimestamp.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = TIMESTAMP_MILLIS.createBlockBuilder(null, 15);
         TIMESTAMP_MILLIS.writeLong(blockBuilder, 1111_000);
@@ -50,7 +53,7 @@ public static Block createTestBlock()
         TIMESTAMP_MILLIS.writeLong(blockBuilder, 3333_000);
         TIMESTAMP_MILLIS.writeLong(blockBuilder, 3333_000);
         TIMESTAMP_MILLIS.writeLong(blockBuilder, 4444_000);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -59,7 +62,7 @@ protected Object getGreaterValue(Object value)
         return ((Long) value) + 1_000;
     }
 
-    @Override
+    @Test
     public void testRange()
     {
         Range range = type.getRange().orElseThrow();
@@ -67,7 +70,8 @@ public void testRange()
         assertEquals(range.getMax(), Long.MAX_VALUE - 807);
     }
 
-    @Test(dataProvider = "testRangeEveryPrecisionDataProvider")
+    @ParameterizedTest
+    @MethodSource("testRangeEveryPrecisionDataProvider")
     public void testRangeEveryPrecision(int precision, long expectedMin, long expectedMax)
     {
         Range range = createTimestampType(precision).getRange().orElseThrow();
@@ -75,21 +79,19 @@ public void testRangeEveryPrecision(int precision, long expectedMin, long expect
         assertEquals(range.getMax(), expectedMax);
     }
 
-    @DataProvider
-    public static Object[][] testRangeEveryPrecisionDataProvider()
+    public static Stream<Arguments> testRangeEveryPrecisionDataProvider()
     {
-        return new Object[][] {
-                {0, Long.MIN_VALUE + 775808, Long.MAX_VALUE - 775807},
-                {1, Long.MIN_VALUE + 75808, Long.MAX_VALUE - 75807},
-                {2, Long.MIN_VALUE + 5808, Long.MAX_VALUE - 5807},
-                {3, Long.MIN_VALUE + 808, Long.MAX_VALUE - 807},
-                {4, Long.MIN_VALUE + 8, Long.MAX_VALUE - 7},
-                {5, Long.MIN_VALUE + 8, Long.MAX_VALUE - 7},
-                {6, Long.MIN_VALUE, Long.MAX_VALUE},
-        };
+        return Stream.of(
+                Arguments.of(0, Long.MIN_VALUE + 775808, Long.MAX_VALUE - 775807),
+                Arguments.of(1, Long.MIN_VALUE + 75808, Long.MAX_VALUE - 75807),
+                Arguments.of(2, Long.MIN_VALUE + 5808, Long.MAX_VALUE - 5807),
+                Arguments.of(3, Long.MIN_VALUE + 808, Long.MAX_VALUE - 807),
+                Arguments.of(4, Long.MIN_VALUE + 8, Long.MAX_VALUE - 7),
+                Arguments.of(5, Long.MIN_VALUE + 8, Long.MAX_VALUE - 7),
+                Arguments.of(6, Long.MIN_VALUE, Long.MAX_VALUE));
     }
 
-    @Override
+    @Test
     public void testPreviousValue()
     {
         long minValue = Long.MIN_VALUE + 808;
@@ -109,7 +111,7 @@ public void testPreviousValue()
                 .isEqualTo(Optional.of(maxValue - 1_000));
     }
 
-    @Override
+    @Test
     public void testNextValue()
     {
         long minValue = Long.MIN_VALUE + 808;
@@ -129,7 +131,8 @@ public void testNextValue()
                 .isEqualTo(Optional.empty());
     }
 
-    @Test(dataProvider = "testPreviousNextValueEveryPrecisionDatProvider")
+    @ParameterizedTest
+    @MethodSource("testPreviousNextValueEveryPrecisionDataProvider")
     public void testPreviousValueEveryPrecision(int precision, long minValue, long maxValue, long step)
     {
         Type type = createTimestampType(precision);
@@ -150,7 +153,8 @@ public void testPreviousValueEveryPrecision(int precision, long minValue, long m
                 .isEqualTo(Optional.of(maxValue - step));
     }
 
-    @Test(dataProvider = "testPreviousNextValueEveryPrecisionDatProvider")
+    @ParameterizedTest
+    @MethodSource("testPreviousNextValueEveryPrecisionDataProvider")
     public void testNextValueEveryPrecision(int precision, long minValue, long maxValue, long step)
     {
         Type type = createTimestampType(precision);
@@ -171,17 +175,15 @@ public void testNextValueEveryPrecision(int precision, long minValue, long maxVa
                 .isEqualTo(Optional.empty());
     }
 
-    @DataProvider
-    public Object[][] testPreviousNextValueEveryPrecisionDatProvider()
+    public static Stream<Arguments> testPreviousNextValueEveryPrecisionDataProvider()
     {
-        return new Object[][] {
-                {0, Long.MIN_VALUE + 775808, Long.MAX_VALUE - 775807, 1_000_000L},
-                {1, Long.MIN_VALUE + 75808, Long.MAX_VALUE - 75807, 100_000L},
-                {2, Long.MIN_VALUE + 5808, Long.MAX_VALUE - 5807, 10_000L},
-                {3, Long.MIN_VALUE + 808, Long.MAX_VALUE - 807, 1_000L},
-                {4, Long.MIN_VALUE + 8, Long.MAX_VALUE - 7, 100L},
-                {5, Long.MIN_VALUE + 8, Long.MAX_VALUE - 7, 10L},
-                {6, Long.MIN_VALUE, Long.MAX_VALUE, 1L},
-        };
+        return Stream.of(
+                Arguments.of(0, Long.MIN_VALUE + 775808, Long.MAX_VALUE - 775807, 1_000_000L),
+                Arguments.of(1, Long.MIN_VALUE + 75808, Long.MAX_VALUE - 75807, 100_000L),
+                Arguments.of(2, Long.MIN_VALUE + 5808, Long.MAX_VALUE - 5807, 10_000L),
+                Arguments.of(3, Long.MIN_VALUE + 808, Long.MAX_VALUE - 807, 1_000L),
+                Arguments.of(4, Long.MIN_VALUE + 8, Long.MAX_VALUE - 7, 100L),
+                Arguments.of(5, Long.MIN_VALUE + 8, Long.MAX_VALUE - 7, 10L),
+                Arguments.of(6, Long.MIN_VALUE, Long.MAX_VALUE, 1L));
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestShortTimestampWithTimeZoneType.java b/core/trino-main/src/test/java/io/trino/type/TestShortTimestampWithTimeZoneType.java
index 5e74b008dd3e..2fbf03b4963e 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestShortTimestampWithTimeZoneType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestShortTimestampWithTimeZoneType.java
@@ -13,14 +13,16 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.SqlTimestampWithTimeZone;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
 import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
 import static io.trino.spi.type.TimeZoneKey.getTimeZoneKeyForOffset;
 import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestShortTimestampWithTimeZoneType
         extends AbstractTestType
@@ -30,7 +32,7 @@ public TestShortTimestampWithTimeZoneType()
         super(TIMESTAMP_TZ_MILLIS, SqlTimestampWithTimeZone.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = TIMESTAMP_TZ_MILLIS.createBlockBuilder(null, 15);
         TIMESTAMP_TZ_MILLIS.writeLong(blockBuilder, packDateTimeWithZone(1111, getTimeZoneKeyForOffset(0)));
@@ -44,7 +46,7 @@ public static Block createTestBlock()
         TIMESTAMP_TZ_MILLIS.writeLong(blockBuilder, packDateTimeWithZone(3333, getTimeZoneKeyForOffset(8)));
         TIMESTAMP_TZ_MILLIS.writeLong(blockBuilder, packDateTimeWithZone(3333, getTimeZoneKeyForOffset(9)));
         TIMESTAMP_TZ_MILLIS.writeLong(blockBuilder, packDateTimeWithZone(4444, getTimeZoneKeyForOffset(10)));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -53,4 +55,25 @@ protected Object getGreaterValue(Object value)
         // time zone doesn't matter for ordering
         return packDateTimeWithZone(unpackMillisUtc((Long) value) + 10, getTimeZoneKeyForOffset(33));
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestSimpleRowType.java b/core/trino-main/src/test/java/io/trino/type/TestSimpleRowType.java
index ef718bfc9ce3..a31cadf58b20 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestSimpleRowType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestSimpleRowType.java
@@ -14,23 +14,25 @@
 package io.trino.type;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.RowBlockBuilder;
-import io.trino.spi.block.SingleRowBlockWriter;
+import io.trino.spi.block.SqlRow;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.RowType;
-import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.RowType.field;
 import static io.trino.spi.type.VarcharType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSimpleRowType
         extends AbstractTestType
 {
-    private static final Type TYPE = RowType.from(ImmutableList.of(
+    private static final RowType TYPE = RowType.from(ImmutableList.of(
             field("a", BIGINT),
             field("b", VARCHAR)));
 
@@ -39,42 +41,57 @@ public TestSimpleRowType()
         super(TYPE, List.class, createTestBlock());
     }
 
-    private static Block createTestBlock()
+    private static ValueBlock createTestBlock()
     {
-        RowBlockBuilder blockBuilder = (RowBlockBuilder) TYPE.createBlockBuilder(null, 3);
+        RowBlockBuilder blockBuilder = TYPE.createBlockBuilder(null, 3);
 
-        SingleRowBlockWriter singleRowBlockWriter;
+        blockBuilder.buildEntry(fieldBuilders -> {
+            BIGINT.writeLong(fieldBuilders.get(0), 1);
+            VARCHAR.writeSlice(fieldBuilders.get(1), utf8Slice("cat"));
+        });
 
-        singleRowBlockWriter = blockBuilder.beginBlockEntry();
-        BIGINT.writeLong(singleRowBlockWriter, 1);
-        VARCHAR.writeSlice(singleRowBlockWriter, utf8Slice("cat"));
-        blockBuilder.closeEntry();
+        blockBuilder.buildEntry(fieldBuilders -> {
+            BIGINT.writeLong(fieldBuilders.get(0), 2);
+            VARCHAR.writeSlice(fieldBuilders.get(1), utf8Slice("cats"));
+        });
 
-        singleRowBlockWriter = blockBuilder.beginBlockEntry();
-        BIGINT.writeLong(singleRowBlockWriter, 2);
-        VARCHAR.writeSlice(singleRowBlockWriter, utf8Slice("cats"));
-        blockBuilder.closeEntry();
+        blockBuilder.buildEntry(fieldBuilders -> {
+            BIGINT.writeLong(fieldBuilders.get(0), 3);
+            VARCHAR.writeSlice(fieldBuilders.get(1), utf8Slice("dog"));
+        });
 
-        singleRowBlockWriter = blockBuilder.beginBlockEntry();
-        BIGINT.writeLong(singleRowBlockWriter, 3);
-        VARCHAR.writeSlice(singleRowBlockWriter, utf8Slice("dog"));
-        blockBuilder.closeEntry();
-
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
     protected Object getGreaterValue(Object value)
     {
-        RowBlockBuilder blockBuilder = (RowBlockBuilder) TYPE.createBlockBuilder(null, 1);
-        SingleRowBlockWriter singleRowBlockWriter;
+        return buildRowValue(TYPE, fieldBuilders -> {
+            SqlRow sqlRow = (SqlRow) value;
+            int rawIndex = sqlRow.getRawIndex();
+            BIGINT.writeLong(fieldBuilders.get(0), BIGINT.getLong(sqlRow.getRawFieldBlock(0), rawIndex) + 1);
+            VARCHAR.writeSlice(fieldBuilders.get(1), VARCHAR.getSlice(sqlRow.getRawFieldBlock(1), rawIndex).slice(0, 1));
+        });
+    }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
 
-        Block block = (Block) value;
-        singleRowBlockWriter = blockBuilder.beginBlockEntry();
-        BIGINT.writeLong(singleRowBlockWriter, block.getSingleValueBlock(0).getLong(0, 0) + 1);
-        VARCHAR.writeSlice(singleRowBlockWriter, block.getSingleValueBlock(1).getSlice(0, 0, 1));
-        blockBuilder.closeEntry();
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
 
-        return TYPE.getObject(blockBuilder.build(), 0);
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestSingleAccessMethodCompiler.java b/core/trino-main/src/test/java/io/trino/type/TestSingleAccessMethodCompiler.java
index 80f5faa3b4ac..a74973e9bb07 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestSingleAccessMethodCompiler.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestSingleAccessMethodCompiler.java
@@ -13,7 +13,8 @@
  */
 package io.trino.type;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.objectweb.asm.ByteVector;
 
 import java.lang.invoke.MethodType;
 import java.util.function.LongFunction;
@@ -21,7 +22,9 @@
 
 import static io.trino.util.SingleAccessMethodCompiler.compileSingleAccessMethod;
 import static java.lang.invoke.MethodHandles.lookup;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
 
 public class TestSingleAccessMethodCompiler
 {
@@ -41,6 +44,33 @@ private static long increment(long x)
         return x + 1;
     }
 
+    @Test
+    public void testBasicWithClassNameTooLong()
+            throws ReflectiveOperationException
+    {
+        int symbolTableSizeLimit = 65535;
+        int overflowingNameLength = 65550;
+        StringBuilder builder = new StringBuilder(overflowingNameLength);
+        for (int i = 0; i < 1150; i++) {
+            builder.append("NameThatIsLongerThanTheAllowedSymbolTableUTF8ConstantSize");
+        }
+        String suggestedName = builder.toString();
+        assertEquals(suggestedName.length(), overflowingNameLength);
+
+        // Ensure that symbol table entries are still limited to 65535 bytes
+        assertThatThrownBy(() -> new ByteVector().putUTF8(suggestedName))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("UTF8 string too large");
+
+        // Class generation should succeed by truncating the class name
+        LongUnaryOperator addOne = compileSingleAccessMethod(
+                suggestedName,
+                LongUnaryOperator.class,
+                lookup().findStatic(TestSingleAccessMethodCompiler.class, "increment", MethodType.methodType(long.class, long.class)));
+        assertEquals(addOne.applyAsLong(1), 2L);
+        assertTrue(addOne.getClass().getName().length() < symbolTableSizeLimit, "class name should be truncated with extra room to spare");
+    }
+
     @Test
     public void testGeneric()
             throws ReflectiveOperationException
diff --git a/core/trino-main/src/test/java/io/trino/type/TestSmallintArrayType.java b/core/trino-main/src/test/java/io/trino/type/TestSmallintArrayType.java
index ae0059f096fe..7874f8defe9a 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestSmallintArrayType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestSmallintArrayType.java
@@ -15,7 +15,9 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -23,6 +25,7 @@
 import static io.trino.spi.type.TypeSignature.arrayType;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static io.trino.util.StructuralTestUtil.arrayBlockOf;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSmallintArrayType
         extends AbstractTestType
@@ -32,14 +35,14 @@ public TestSmallintArrayType()
         super(TESTING_TYPE_MANAGER.getType(arrayType(SMALLINT.getTypeSignature())), List.class, createTestBlock(TESTING_TYPE_MANAGER.getType(arrayType(SMALLINT.getTypeSignature()))));
     }
 
-    public static Block createTestBlock(Type arrayType)
+    public static ValueBlock createTestBlock(Type arrayType)
     {
         BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, 4);
         arrayType.writeObject(blockBuilder, arrayBlockOf(SMALLINT, 1, 2));
         arrayType.writeObject(blockBuilder, arrayBlockOf(SMALLINT, 1, 2, 3));
         arrayType.writeObject(blockBuilder, arrayBlockOf(SMALLINT, 1, 2, 3));
         arrayType.writeObject(blockBuilder, arrayBlockOf(SMALLINT, 100, 200, 300));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -52,6 +55,27 @@ protected Object getGreaterValue(Object value)
         }
         SMALLINT.writeLong(blockBuilder, 1L);
 
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
+    }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestSmallintOperators.java b/core/trino-main/src/test/java/io/trino/type/TestSmallintOperators.java
index 182de876f0b4..97b43a04fb1e 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestSmallintOperators.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestSmallintOperators.java
@@ -69,7 +69,7 @@ public void testLiteral()
         assertThat(assertions.expression("SMALLINT '17'"))
                 .isEqualTo((short) 17);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("SMALLINT '" + ((long) Short.MAX_VALUE + 1L) + "'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("SMALLINT '" + ((long) Short.MAX_VALUE + 1L) + "'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL);
     }
 
@@ -92,7 +92,7 @@ public void testUnaryMinus()
         assertThat(assertions.expression("SMALLINT '-17'"))
                 .isEqualTo((short) -17);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("SMALLINT '-" + Short.MIN_VALUE + "'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("SMALLINT '-" + Short.MIN_VALUE + "'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL);
     }
 
@@ -111,7 +111,7 @@ public void testAdd()
         assertThat(assertions.operator(ADD, "SMALLINT '17'", "SMALLINT '17'"))
                 .isEqualTo((short) (17 + 17));
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression(format("SMALLINT '%s' + SMALLINT '1'", Short.MAX_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression(format("SMALLINT '%s' + SMALLINT '1'", Short.MAX_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("smallint addition overflow: 32767 + 1");
     }
@@ -131,7 +131,7 @@ public void testSubtract()
         assertThat(assertions.operator(SUBTRACT, "SMALLINT '17'", "SMALLINT '17'"))
                 .isEqualTo((short) 0);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression(format("SMALLINT '%s' - SMALLINT '1'", Short.MIN_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression(format("SMALLINT '%s' - SMALLINT '1'", Short.MIN_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("smallint subtraction overflow: -32768 - 1");
     }
@@ -151,7 +151,7 @@ public void testMultiply()
         assertThat(assertions.operator(MULTIPLY, "SMALLINT '17'", "SMALLINT '17'"))
                 .isEqualTo((short) (17 * 17));
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression(format("SMALLINT '%s' * SMALLINT '2'", Short.MAX_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression(format("SMALLINT '%s' * SMALLINT '2'", Short.MAX_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("smallint multiplication overflow: 32767 * 2");
     }
@@ -171,7 +171,7 @@ public void testDivide()
         assertThat(assertions.operator(DIVIDE, "SMALLINT '17'", "SMALLINT '17'"))
                 .isEqualTo((short) 1);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "SMALLINT '17'", "SMALLINT '0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "SMALLINT '17'", "SMALLINT '0'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
     }
 
@@ -190,7 +190,7 @@ public void testModulus()
         assertThat(assertions.operator(MODULUS, "SMALLINT '17'", "SMALLINT '17'"))
                 .isEqualTo((short) 0);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MODULUS, "SMALLINT '17'", "SMALLINT '0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MODULUS, "SMALLINT '17'", "SMALLINT '0'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
     }
 
@@ -206,7 +206,7 @@ public void testNegation()
         assertThat(assertions.expression("-(SMALLINT '" + Short.MAX_VALUE + "')"))
                 .isEqualTo((short) (Short.MIN_VALUE + 1));
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression(format("-(SMALLINT '%s')", Short.MIN_VALUE)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression(format("-(SMALLINT '%s')", Short.MIN_VALUE))::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("smallint negation overflow: -32768");
     }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestSmallintType.java b/core/trino-main/src/test/java/io/trino/type/TestSmallintType.java
index a889ebfab2bd..46a163aa9d2b 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestSmallintType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestSmallintType.java
@@ -13,9 +13,10 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type.Range;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -31,7 +32,7 @@ public TestSmallintType()
         super(SMALLINT, Short.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = SMALLINT.createBlockBuilder(null, 15);
         SMALLINT.writeLong(blockBuilder, 1111);
@@ -45,7 +46,7 @@ public static Block createTestBlock()
         SMALLINT.writeLong(blockBuilder, 3333);
         SMALLINT.writeLong(blockBuilder, 3333);
         SMALLINT.writeLong(blockBuilder, 4444);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -54,7 +55,7 @@ protected Object getGreaterValue(Object value)
         return ((Long) value) + 1;
     }
 
-    @Override
+    @Test
     public void testRange()
     {
         Range range = type.getRange().orElseThrow();
@@ -62,7 +63,7 @@ public void testRange()
         assertEquals(range.getMax(), (long) Short.MAX_VALUE);
     }
 
-    @Override
+    @Test
     public void testPreviousValue()
     {
         long minValue = Short.MIN_VALUE;
@@ -82,7 +83,7 @@ public void testPreviousValue()
                 .isEqualTo(Optional.of(maxValue - 1));
     }
 
-    @Override
+    @Test
     public void testNextValue()
     {
         long minValue = Short.MIN_VALUE;
diff --git a/core/trino-main/src/test/java/io/trino/type/TestSmallintVarcharMapType.java b/core/trino-main/src/test/java/io/trino/type/TestSmallintVarcharMapType.java
index 6f04a6d179e4..15eead1a0eb6 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestSmallintVarcharMapType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestSmallintVarcharMapType.java
@@ -14,16 +14,19 @@
 package io.trino.type;
 
 import com.google.common.collect.ImmutableMap;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.util.StructuralTestUtil.mapBlockOf;
 import static io.trino.util.StructuralTestUtil.mapType;
+import static io.trino.util.StructuralTestUtil.sqlMapOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestSmallintVarcharMapType
         extends AbstractTestType
@@ -33,12 +36,13 @@ public TestSmallintVarcharMapType()
         super(mapType(SMALLINT, VARCHAR), Map.class, createTestBlock(mapType(SMALLINT, VARCHAR)));
     }
 
-    public static Block createTestBlock(Type mapType)
+    public static ValueBlock createTestBlock(Type mapType)
     {
         BlockBuilder blockBuilder = mapType.createBlockBuilder(null, 2);
-        mapType.writeObject(blockBuilder, mapBlockOf(SMALLINT, VARCHAR, ImmutableMap.of(1, "hi")));
-        mapType.writeObject(blockBuilder, mapBlockOf(SMALLINT, VARCHAR, ImmutableMap.of(1, "2", 2, "hello")));
-        return blockBuilder.build();
+        mapType.writeObject(blockBuilder, sqlMapOf(SMALLINT, VARCHAR, ImmutableMap.of(1, "hi")));
+        mapType.writeObject(blockBuilder, sqlMapOf(SMALLINT, VARCHAR, ImmutableMap.of(1, "2", 2, "hello")));
+        mapType.writeObject(blockBuilder, sqlMapOf(SMALLINT, VARCHAR, ImmutableMap.of(1, "123456789012345", 2, "hello-world-hello-world-hello-world")));
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -46,4 +50,27 @@ protected Object getGreaterValue(Object value)
     {
         throw new UnsupportedOperationException();
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThatThrownBy(() -> type.getPreviousValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThatThrownBy(() -> type.getNextValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestTimeType.java b/core/trino-main/src/test/java/io/trino/type/TestTimeType.java
index 862026ca9025..2454aa80d464 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestTimeType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestTimeType.java
@@ -13,11 +13,13 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.SqlTime;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.TimeType.TIME_MILLIS;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTimeType
         extends AbstractTestType
@@ -27,7 +29,7 @@ public TestTimeType()
         super(TIME_MILLIS, SqlTime.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = TIME_MILLIS.createBlockBuilder(null, 15);
         TIME_MILLIS.writeLong(blockBuilder, 1_111_000_000_000L);
@@ -41,7 +43,7 @@ public static Block createTestBlock()
         TIME_MILLIS.writeLong(blockBuilder, 3_333_000_000_000L);
         TIME_MILLIS.writeLong(blockBuilder, 3_333_000_000_000L);
         TIME_MILLIS.writeLong(blockBuilder, 4_444_000_000_000L);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -49,4 +51,25 @@ protected Object getGreaterValue(Object value)
     {
         return ((Long) value) + 1;
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestTimeWithTimeZoneType.java b/core/trino-main/src/test/java/io/trino/type/TestTimeWithTimeZoneType.java
index 33566ff6906c..df18e4c47593 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestTimeWithTimeZoneType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestTimeWithTimeZoneType.java
@@ -13,14 +13,16 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.SqlTimeWithTimeZone;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.DateTimeEncoding.packTimeWithTimeZone;
 import static io.trino.spi.type.DateTimeEncoding.unpackOffsetMinutes;
 import static io.trino.spi.type.DateTimeEncoding.unpackTimeNanos;
 import static io.trino.spi.type.TimeWithTimeZoneType.TIME_TZ_MILLIS;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTimeWithTimeZoneType
         extends AbstractTestType
@@ -30,7 +32,7 @@ public TestTimeWithTimeZoneType()
         super(TIME_TZ_MILLIS, SqlTimeWithTimeZone.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = TIME_TZ_MILLIS.createBlockBuilder(null, 15);
         TIME_TZ_MILLIS.writeLong(blockBuilder, packTimeWithTimeZone(1_111_000_000L, 0));
@@ -44,7 +46,7 @@ public static Block createTestBlock()
         TIME_TZ_MILLIS.writeLong(blockBuilder, packTimeWithTimeZone(3_333_000_000L, 8));
         TIME_TZ_MILLIS.writeLong(blockBuilder, packTimeWithTimeZone(3_333_000_000L, 9));
         TIME_TZ_MILLIS.writeLong(blockBuilder, packTimeWithTimeZone(4_444_000_000L, 10));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -52,4 +54,25 @@ protected Object getGreaterValue(Object value)
     {
         return packTimeWithTimeZone(unpackTimeNanos((Long) value) + 10, unpackOffsetMinutes((Long) value));
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestTinyintArrayType.java b/core/trino-main/src/test/java/io/trino/type/TestTinyintArrayType.java
index 00f60533a318..327622dd2c28 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestTinyintArrayType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestTinyintArrayType.java
@@ -15,7 +15,9 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -23,6 +25,7 @@
 import static io.trino.spi.type.TypeSignature.arrayType;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static io.trino.util.StructuralTestUtil.arrayBlockOf;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTinyintArrayType
         extends AbstractTestType
@@ -32,14 +35,14 @@ public TestTinyintArrayType()
         super(TESTING_TYPE_MANAGER.getType(arrayType(TINYINT.getTypeSignature())), List.class, createTestBlock(TESTING_TYPE_MANAGER.getType(arrayType(TINYINT.getTypeSignature()))));
     }
 
-    public static Block createTestBlock(Type arrayType)
+    public static ValueBlock createTestBlock(Type arrayType)
     {
         BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, 4);
         arrayType.writeObject(blockBuilder, arrayBlockOf(TINYINT, 1, 2));
         arrayType.writeObject(blockBuilder, arrayBlockOf(TINYINT, 1, 2, 3));
         arrayType.writeObject(blockBuilder, arrayBlockOf(TINYINT, 1, 2, 3));
         arrayType.writeObject(blockBuilder, arrayBlockOf(TINYINT, 100, 110, 127));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -52,6 +55,27 @@ protected Object getGreaterValue(Object value)
         }
         TINYINT.writeLong(blockBuilder, 1L);
 
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
+    }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestTinyintOperators.java b/core/trino-main/src/test/java/io/trino/type/TestTinyintOperators.java
index be5193f83ee1..07e69d8801b0 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestTinyintOperators.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestTinyintOperators.java
@@ -67,7 +67,7 @@ public void testLiteral()
         assertThat(assertions.expression("TINYINT '17'"))
                 .isEqualTo((byte) 17);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("TINYINT '" + ((long) Byte.MAX_VALUE + 1L) + "'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("TINYINT '" + ((long) Byte.MAX_VALUE + 1L) + "'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL);
     }
 
@@ -90,7 +90,7 @@ public void testUnaryMinus()
         assertThat(assertions.expression("TINYINT '-17'"))
                 .isEqualTo((byte) -17);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("TINYINT '-" + Byte.MIN_VALUE + "'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("TINYINT '-" + Byte.MIN_VALUE + "'")::evaluate)
                 .hasErrorCode(INVALID_LITERAL);
     }
 
@@ -109,7 +109,7 @@ public void testAdd()
         assertThat(assertions.operator(ADD, "TINYINT '17'", "TINYINT '17'"))
                 .isEqualTo((byte) (17 + 17));
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(ADD, "TINYINT '%s'".formatted(Byte.MAX_VALUE), "TINYINT '1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(ADD, "TINYINT '%s'".formatted(Byte.MAX_VALUE), "TINYINT '1'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("tinyint addition overflow: 127 + 1");
     }
@@ -129,7 +129,7 @@ public void testSubtract()
         assertThat(assertions.operator(SUBTRACT, "TINYINT '17'", "TINYINT '17'"))
                 .isEqualTo((byte) 0);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(SUBTRACT, "TINYINT '%s'".formatted(Byte.MIN_VALUE), "TINYINT '1'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(SUBTRACT, "TINYINT '%s'".formatted(Byte.MIN_VALUE), "TINYINT '1'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("tinyint subtraction overflow: -128 - 1");
     }
@@ -149,7 +149,7 @@ public void testMultiply()
         assertThat(assertions.operator(MULTIPLY, "TINYINT '9'", "TINYINT '9'"))
                 .isEqualTo((byte) (9 * 9));
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MULTIPLY, "TINYINT '%s'".formatted(Byte.MAX_VALUE), "TINYINT '2'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MULTIPLY, "TINYINT '%s'".formatted(Byte.MAX_VALUE), "TINYINT '2'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("tinyint multiplication overflow: 127 * 2");
     }
@@ -169,7 +169,7 @@ public void testDivide()
         assertThat(assertions.operator(DIVIDE, "TINYINT '17'", "TINYINT '17'"))
                 .isEqualTo((byte) 1);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(DIVIDE, "TINYINT '17'", "TINYINT '0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(DIVIDE, "TINYINT '17'", "TINYINT '0'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
     }
 
@@ -188,7 +188,7 @@ public void testModulus()
         assertThat(assertions.operator(MODULUS, "TINYINT '17'", "TINYINT '17'"))
                 .isEqualTo((byte) 0);
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(MODULUS, "TINYINT '17'", "TINYINT '0'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(MODULUS, "TINYINT '17'", "TINYINT '0'")::evaluate)
                 .hasErrorCode(DIVISION_BY_ZERO);
     }
 
@@ -204,7 +204,7 @@ public void testNegation()
         assertThat(assertions.operator(NEGATION, "TINYINT '" + Byte.MAX_VALUE + "'"))
                 .isEqualTo((byte) (Byte.MIN_VALUE + 1));
 
-        assertTrinoExceptionThrownBy(() -> assertions.operator(NEGATION, "TINYINT '" + Byte.MIN_VALUE + "'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.operator(NEGATION, "TINYINT '" + Byte.MIN_VALUE + "'")::evaluate)
                 .hasErrorCode(NUMERIC_VALUE_OUT_OF_RANGE)
                 .hasMessage("tinyint negation overflow: -128");
     }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestTinyintType.java b/core/trino-main/src/test/java/io/trino/type/TestTinyintType.java
index 85157ed64e18..c4987a648156 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestTinyintType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestTinyintType.java
@@ -13,9 +13,10 @@
  */
 package io.trino.type;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type.Range;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -31,7 +32,7 @@ public TestTinyintType()
         super(TINYINT, Byte.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = TINYINT.createBlockBuilder(null, 15);
         TINYINT.writeLong(blockBuilder, 111);
@@ -45,7 +46,7 @@ public static Block createTestBlock()
         TINYINT.writeLong(blockBuilder, 33);
         TINYINT.writeLong(blockBuilder, 33);
         TINYINT.writeLong(blockBuilder, 44);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -54,7 +55,7 @@ protected Object getGreaterValue(Object value)
         return ((Long) value) + 1;
     }
 
-    @Override
+    @Test
     public void testRange()
     {
         Range range = type.getRange().orElseThrow();
@@ -62,7 +63,7 @@ public void testRange()
         assertEquals(range.getMax(), (long) Byte.MAX_VALUE);
     }
 
-    @Override
+    @Test
     public void testPreviousValue()
     {
         long minValue = Byte.MIN_VALUE;
@@ -82,7 +83,7 @@ public void testPreviousValue()
                 .isEqualTo(Optional.of(maxValue - 1));
     }
 
-    @Override
+    @Test
     public void testNextValue()
     {
         long minValue = Byte.MIN_VALUE;
diff --git a/core/trino-main/src/test/java/io/trino/type/TestTinyintVarcharMapType.java b/core/trino-main/src/test/java/io/trino/type/TestTinyintVarcharMapType.java
index 223c83f63440..522bc24c44d8 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestTinyintVarcharMapType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestTinyintVarcharMapType.java
@@ -14,16 +14,19 @@
 package io.trino.type;
 
 import com.google.common.collect.ImmutableMap;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.util.StructuralTestUtil.mapBlockOf;
 import static io.trino.util.StructuralTestUtil.mapType;
+import static io.trino.util.StructuralTestUtil.sqlMapOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestTinyintVarcharMapType
         extends AbstractTestType
@@ -33,12 +36,13 @@ public TestTinyintVarcharMapType()
         super(mapType(TINYINT, VARCHAR), Map.class, createTestBlock(mapType(TINYINT, VARCHAR)));
     }
 
-    public static Block createTestBlock(Type mapType)
+    public static ValueBlock createTestBlock(Type mapType)
     {
         BlockBuilder blockBuilder = mapType.createBlockBuilder(null, 2);
-        mapType.writeObject(blockBuilder, mapBlockOf(TINYINT, VARCHAR, ImmutableMap.of(1, "hi")));
-        mapType.writeObject(blockBuilder, mapBlockOf(TINYINT, VARCHAR, ImmutableMap.of(1, "2", 2, "hello")));
-        return blockBuilder.build();
+        mapType.writeObject(blockBuilder, sqlMapOf(TINYINT, VARCHAR, ImmutableMap.of(1, "hi")));
+        mapType.writeObject(blockBuilder, sqlMapOf(TINYINT, VARCHAR, ImmutableMap.of(1, "2", 2, "hello")));
+        mapType.writeObject(blockBuilder, sqlMapOf(TINYINT, VARCHAR, ImmutableMap.of(1, "123456789012345", 2, "hello-world-hello-world-hello-world")));
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -46,4 +50,27 @@ protected Object getGreaterValue(Object value)
     {
         throw new UnsupportedOperationException();
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThatThrownBy(() -> type.getPreviousValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThatThrownBy(() -> type.getNextValue(getSampleValue()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Type is not orderable: " + type);
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestTypeCoercion.java b/core/trino-main/src/test/java/io/trino/type/TestTypeCoercion.java
index 95987e41ad3d..360f38327553 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestTypeCoercion.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestTypeCoercion.java
@@ -22,7 +22,7 @@
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeOperators;
 import io.trino.spi.type.TypeSignature;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collection;
 import java.util.Optional;
diff --git a/core/trino-main/src/test/java/io/trino/type/TestTypeRegistry.java b/core/trino-main/src/test/java/io/trino/type/TestTypeRegistry.java
index 5057d5c42c78..aa2f9aa23f9f 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestTypeRegistry.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestTypeRegistry.java
@@ -18,7 +18,7 @@
 import io.trino.spi.type.TypeNotFoundException;
 import io.trino.spi.type.TypeOperators;
 import io.trino.spi.type.TypeSignature;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
diff --git a/core/trino-main/src/test/java/io/trino/type/TestUnboundedVarcharType.java b/core/trino-main/src/test/java/io/trino/type/TestUnboundedVarcharType.java
index df798a054c4b..4fb2e02eab98 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestUnboundedVarcharType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestUnboundedVarcharType.java
@@ -15,10 +15,12 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.VarcharType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestUnboundedVarcharType
         extends AbstractTestType
@@ -28,7 +30,7 @@ public TestUnboundedVarcharType()
         super(VARCHAR, String.class, createTestBlock());
     }
 
-    private static Block createTestBlock()
+    private static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = VARCHAR.createBlockBuilder(null, 15);
         VARCHAR.writeString(blockBuilder, "apple");
@@ -42,7 +44,7 @@ private static Block createTestBlock()
         VARCHAR.writeString(blockBuilder, "cherry");
         VARCHAR.writeString(blockBuilder, "cherry");
         VARCHAR.writeString(blockBuilder, "date");
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -50,4 +52,25 @@ protected Object getGreaterValue(Object value)
     {
         return Slices.utf8Slice(((Slice) value).toStringUtf8() + "_");
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestUnknownType.java b/core/trino-main/src/test/java/io/trino/type/TestUnknownType.java
index 8747be3d7ac0..6a2a0ce364ac 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestUnknownType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestUnknownType.java
@@ -13,7 +13,10 @@
  */
 package io.trino.type;
 
+import org.junit.jupiter.api.Test;
+
 import static io.trino.type.UnknownType.UNKNOWN;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestUnknownType
         extends AbstractTestType
@@ -26,7 +29,7 @@ public TestUnknownType()
                         .appendNull()
                         .appendNull()
                         .appendNull()
-                        .build());
+                        .buildValueBlock());
     }
 
     @Override
@@ -35,15 +38,18 @@ protected Object getGreaterValue(Object value)
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void testPreviousValue()
+    @Test
+    public void testRange()
     {
-        // There is no value of this type, so getPreviousValue() cannot be invoked
+        assertThat(type.getRange())
+                .isEmpty();
     }
 
+    @Test
     @Override
-    public void testNextValue()
+    public void testFlat()
+            throws Throwable
     {
-        // There is no value of this type, so getNextValue() cannot be invoked
+        // unknown is always mull, so flat methods don't work
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestUuidType.java b/core/trino-main/src/test/java/io/trino/type/TestUuidType.java
index 6918a7bf6bfe..c10478f35c53 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestUuidType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestUuidType.java
@@ -15,16 +15,16 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.TypeOperators;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.invoke.MethodHandle;
 
 import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
 import static io.airlift.slice.Slices.utf8Slice;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
@@ -44,27 +44,30 @@ public TestUuidType()
         super(UUID, String.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = UUID.createBlockBuilder(null, 1);
         for (int i = 0; i < 10; i++) {
             String uuid = "6b5f5b65-67e4-43b0-8ee3-586cd49f58a" + i;
             UUID.writeSlice(blockBuilder, castFromVarcharToUuid(utf8Slice(uuid)));
         }
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
     protected Object getGreaterValue(Object value)
     {
         Slice slice = (Slice) value;
-        return Slices.wrappedLongArray(slice.getLong(0), reverseBytes(reverseBytes(slice.getLong(SIZE_OF_LONG)) + 1));
+        Slice greater = Slices.allocate(2 * SIZE_OF_LONG);
+        greater.setLong(0, slice.getLong(0));
+        greater.setLong(SIZE_OF_LONG, reverseBytes(reverseBytes(slice.getLong(SIZE_OF_LONG)) + 1));
+        return greater;
     }
 
     @Override
     protected Object getNonNullValue()
     {
-        return Slices.wrappedLongArray(0, 0);
+        return Slices.allocate(2 * SIZE_OF_LONG);
     }
 
     @Test
@@ -103,7 +106,7 @@ public void testOrdering()
                 .as("value comparison operator result")
                 .isLessThan(0);
 
-        MethodHandle compareFromBlock = new TypeOperators().getComparisonUnorderedFirstOperator(UUID, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
+        MethodHandle compareFromBlock = new TypeOperators().getComparisonUnorderedFirstOperator(UUID, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL));
         long comparisonFromBlock = (long) compareFromBlock.invoke(nativeValueToBlock(UUID, lowerSlice), 0, nativeValueToBlock(UUID, higherSlice), 0);
         assertThat(comparisonFromBlock)
                 .as("block-position comparison operator result")
@@ -114,4 +117,25 @@ public void testOrdering()
                 .as("comparing slices lexicographically")
                 .isLessThan(higherSlice);
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestVarbinaryType.java b/core/trino-main/src/test/java/io/trino/type/TestVarbinaryType.java
index 386cb4d3d963..4b3e2c92dcd2 100644
--- a/core/trino-main/src/test/java/io/trino/type/TestVarbinaryType.java
+++ b/core/trino-main/src/test/java/io/trino/type/TestVarbinaryType.java
@@ -15,11 +15,13 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.type.SqlVarbinary;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestVarbinaryType
         extends AbstractTestType
@@ -29,7 +31,7 @@ public TestVarbinaryType()
         super(VARBINARY, SqlVarbinary.class, createTestBlock());
     }
 
-    public static Block createTestBlock()
+    public static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = VARBINARY.createBlockBuilder(null, 15);
         VARBINARY.writeSlice(blockBuilder, Slices.utf8Slice("apple"));
@@ -43,7 +45,7 @@ public static Block createTestBlock()
         VARBINARY.writeSlice(blockBuilder, Slices.utf8Slice("cherry"));
         VARBINARY.writeSlice(blockBuilder, Slices.utf8Slice("cherry"));
         VARBINARY.writeSlice(blockBuilder, Slices.utf8Slice("date"));
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -51,4 +53,25 @@ protected Object getGreaterValue(Object value)
     {
         return Slices.utf8Slice(((Slice) value).toStringUtf8() + "_");
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
 }
diff --git a/core/trino-main/src/test/java/io/trino/type/TestVarcharArrayType.java b/core/trino-main/src/test/java/io/trino/type/TestVarcharArrayType.java
new file mode 100644
index 000000000000..0015ab005c09
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/type/TestVarcharArrayType.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed 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 io.trino.type;
+
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.spi.type.TypeSignature.arrayType;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
+import static io.trino.util.StructuralTestUtil.arrayBlockOf;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestVarcharArrayType
+        extends AbstractTestType
+{
+    public TestVarcharArrayType()
+    {
+        super(TESTING_TYPE_MANAGER.getType(arrayType(VARCHAR.getTypeSignature())), List.class, createTestBlock(TESTING_TYPE_MANAGER.getType(arrayType(VARCHAR.getTypeSignature()))));
+    }
+
+    public static ValueBlock createTestBlock(Type arrayType)
+    {
+        BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, 4);
+        arrayType.writeObject(blockBuilder, arrayBlockOf(VARCHAR, "1", "2"));
+        arrayType.writeObject(blockBuilder, arrayBlockOf(VARCHAR, "the", "quick", "brown", "fox"));
+        arrayType.writeObject(blockBuilder, arrayBlockOf(VARCHAR, "one-two-three-four-five", "123456789012345", "the quick brown fox", "hello-world-hello-world-hello-world"));
+        return blockBuilder.buildValueBlock();
+    }
+
+    @Override
+    protected Object getGreaterValue(Object value)
+    {
+        Block block = (Block) value;
+        BlockBuilder blockBuilder = VARCHAR.createBlockBuilder(null, block.getPositionCount() + 1);
+        for (int i = 0; i < block.getPositionCount(); i++) {
+            VARCHAR.appendTo(block, i, blockBuilder);
+        }
+        VARCHAR.writeSlice(blockBuilder, utf8Slice("_"));
+
+        return blockBuilder.build();
+    }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        assertThat(type.getPreviousValue(getSampleValue()))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        assertThat(type.getNextValue(getSampleValue()))
+                .isEmpty();
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/type/TestVarcharVarcharMapType.java b/core/trino-main/src/test/java/io/trino/type/TestVarcharVarcharMapType.java
new file mode 100644
index 000000000000..42a666cda7e2
--- /dev/null
+++ b/core/trino-main/src/test/java/io/trino/type/TestVarcharVarcharMapType.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed 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 io.trino.type;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.util.StructuralTestUtil.mapType;
+import static io.trino.util.StructuralTestUtil.sqlMapOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestVarcharVarcharMapType
+        extends AbstractTestType
+{
+    public TestVarcharVarcharMapType()
+    {
+        super(mapType(VARCHAR, VARCHAR), Map.class, createTestBlock(mapType(VARCHAR, VARCHAR)));
+    }
+
+    public static ValueBlock createTestBlock(Type mapType)
+    {
+        BlockBuilder blockBuilder = mapType.createBlockBuilder(null, 2);
+        mapType.writeObject(blockBuilder, sqlMapOf(VARCHAR, VARCHAR, ImmutableMap.of("hi", "there")));
+        mapType.writeObject(blockBuilder, sqlMapOf(VARCHAR, VARCHAR, ImmutableMap.of("one", "1", "hello", "world")));
+        mapType.writeObject(blockBuilder, sqlMapOf(VARCHAR, VARCHAR, ImmutableMap.of("one-two-three-four-five", "123456789012345", "the quick brown fox", "hello-world-hello-world-hello-world")));
+        return blockBuilder.buildValueBlock();
+    }
+
+    @Override
+    protected Object getGreaterValue(Object value)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        Object sampleValue = getSampleValue();
+        if (!type.isOrderable()) {
+            assertThatThrownBy(() -> type.getPreviousValue(sampleValue))
+                    .isInstanceOf(IllegalStateException.class)
+                    .hasMessage("Type is not orderable: " + type);
+            return;
+        }
+        assertThat(type.getPreviousValue(sampleValue))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        Object sampleValue = getSampleValue();
+        if (!type.isOrderable()) {
+            assertThatThrownBy(() -> type.getNextValue(sampleValue))
+                    .isInstanceOf(IllegalStateException.class)
+                    .hasMessage("Type is not orderable: " + type);
+            return;
+        }
+        assertThat(type.getNextValue(sampleValue))
+                .isEmpty();
+    }
+}
diff --git a/core/trino-main/src/test/java/io/trino/type/TypeTestUtils.java b/core/trino-main/src/test/java/io/trino/type/TypeTestUtils.java
index 4460c674ade6..1a65b8a8ebf5 100644
--- a/core/trino-main/src/test/java/io/trino/type/TypeTestUtils.java
+++ b/core/trino-main/src/test/java/io/trino/type/TypeTestUtils.java
@@ -15,7 +15,6 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.operator.HashGenerator;
-import io.trino.operator.InterpretedHashGenerator;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
@@ -25,18 +24,19 @@
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.operator.InterpretedHashGenerator.createPagePrefixHashGenerator;
 import static io.trino.spi.type.BigintType.BIGINT;
 
 public final class TypeTestUtils
 {
-    private static final BlockTypeOperators TYPE_OPERATOR_FACTORY = new BlockTypeOperators(new TypeOperators());
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
 
     private TypeTestUtils() {}
 
     public static Block getHashBlock(List<? extends Type> hashTypes, Block... hashBlocks)
     {
         checkArgument(hashTypes.size() == hashBlocks.length);
-        HashGenerator hashGenerator = InterpretedHashGenerator.createPositionalWithTypes(ImmutableList.copyOf(hashTypes), TYPE_OPERATOR_FACTORY);
+        HashGenerator hashGenerator = createPagePrefixHashGenerator(ImmutableList.copyOf(hashTypes), TYPE_OPERATORS);
         int positionCount = hashBlocks[0].getPositionCount();
         BlockBuilder builder = BIGINT.createFixedSizeBlockBuilder(positionCount);
         Page page = new Page(hashBlocks);
diff --git a/core/trino-main/src/test/java/io/trino/type/setdigest/TestSetDigest.java b/core/trino-main/src/test/java/io/trino/type/setdigest/TestSetDigest.java
index 74cc263a8e89..30ced6f675f0 100644
--- a/core/trino-main/src/test/java/io/trino/type/setdigest/TestSetDigest.java
+++ b/core/trino-main/src/test/java/io/trino/type/setdigest/TestSetDigest.java
@@ -15,11 +15,10 @@
 package io.trino.type.setdigest;
 
 import com.google.common.collect.ImmutableSet;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.SingleMapBlock;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.TypeOperators;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -105,22 +104,20 @@ public void testHashCounts()
         digest2.add(2);
 
         MapType mapType = new MapType(BIGINT, SMALLINT, new TypeOperators());
-        Block block = hashCounts(mapType, digest1.serialize());
-        assertTrue(block instanceof SingleMapBlock);
+        SqlMap sqlMap = hashCounts(mapType, digest1.serialize());
         Set<Short> blockValues = new HashSet<>();
-        for (int i = 1; i < block.getPositionCount(); i += 2) {
-            blockValues.add(block.getShort(i, 0));
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            blockValues.add(sqlMap.getRawValueBlock().getShort(sqlMap.getRawOffset() + i, 0));
         }
         Set<Short> expected = ImmutableSet.of((short) 1, (short) 2);
         assertEquals(blockValues, expected);
 
         digest1.mergeWith(digest2);
-        block = hashCounts(mapType, digest1.serialize());
-        assertTrue(block instanceof SingleMapBlock);
+        sqlMap = hashCounts(mapType, digest1.serialize());
         expected = ImmutableSet.of((short) 1, (short) 2, (short) 4);
         blockValues = new HashSet<>();
-        for (int i = 1; i < block.getPositionCount(); i += 2) {
-            blockValues.add(block.getShort(i, 0));
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            blockValues.add(sqlMap.getRawValueBlock().getShort(sqlMap.getRawOffset() + i, 0));
         }
         assertEquals(blockValues, expected);
     }
diff --git a/core/trino-main/src/test/java/io/trino/util/BenchmarkPagesSort.java b/core/trino-main/src/test/java/io/trino/util/BenchmarkPagesSort.java
index 84dd6c8afce9..fde9badf63e7 100644
--- a/core/trino-main/src/test/java/io/trino/util/BenchmarkPagesSort.java
+++ b/core/trino-main/src/test/java/io/trino/util/BenchmarkPagesSort.java
@@ -24,6 +24,7 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 import io.trino.sql.gen.OrderingCompiler;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -34,7 +35,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/trino-main/src/test/java/io/trino/util/StructuralTestUtil.java b/core/trino-main/src/test/java/io/trino/util/StructuralTestUtil.java
index d0f46c5d530d..95f33478d47c 100644
--- a/core/trino-main/src/test/java/io/trino/util/StructuralTestUtil.java
+++ b/core/trino-main/src/test/java/io/trino/util/StructuralTestUtil.java
@@ -16,8 +16,14 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.RowValueBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Decimals;
 import io.trino.spi.type.Int128;
@@ -31,6 +37,7 @@
 import java.math.BigDecimal;
 import java.util.Map;
 
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.lang.Float.floatToRawIntBits;
@@ -48,17 +55,17 @@ public static Block arrayBlockOf(Type elementType, Object... values)
         return blockBuilder.build();
     }
 
-    public static Block mapBlockOf(Type keyType, Type valueType, Map<?, ?> value)
+    public static SqlMap sqlMapOf(Type keyType, Type valueType, Map<?, ?> map)
     {
-        MapType mapType = mapType(keyType, valueType);
-        BlockBuilder mapArrayBuilder = mapType.createBlockBuilder(null, 1);
-        BlockBuilder singleMapWriter = mapArrayBuilder.beginBlockEntry();
-        for (Map.Entry<?, ?> entry : value.entrySet()) {
-            appendToBlockBuilder(keyType, entry.getKey(), singleMapWriter);
-            appendToBlockBuilder(valueType, entry.getValue(), singleMapWriter);
-        }
-        mapArrayBuilder.closeEntry();
-        return mapType.getObject(mapArrayBuilder, 0);
+        return buildMapValue(
+                mapType(keyType, valueType),
+                map.size(),
+                (keyBuilder, valueBuilder) -> {
+                    map.forEach((key, value) -> {
+                        appendToBlockBuilder(keyType, key, keyBuilder);
+                        appendToBlockBuilder(valueType, value, valueBuilder);
+                    });
+                });
     }
 
     public static MapType mapType(Type keyType, Type valueType)
@@ -68,6 +75,15 @@ public static MapType mapType(Type keyType, Type valueType)
                 TypeSignatureParameter.typeParameter(valueType.getTypeSignature())));
     }
 
+    public static SqlRow sqlRowOf(RowType rowType, Object... values)
+    {
+        return RowValueBuilder.buildRowValue(rowType, fieldBuilders -> {
+            for (int i = 0; i < values.length; i++) {
+                appendToBlockBuilder(rowType.getTypeParameters().get(i), values[i], fieldBuilders.get(i));
+            }
+        });
+    }
+
     public static void appendToBlockBuilder(Type type, Object element, BlockBuilder blockBuilder)
     {
         Class<?> javaType = type.getJavaType();
@@ -75,28 +91,28 @@ public static void appendToBlockBuilder(Type type, Object element, BlockBuilder
             blockBuilder.appendNull();
         }
         else if (type instanceof ArrayType && element instanceof Iterable<?>) {
-            BlockBuilder subBlockBuilder = blockBuilder.beginBlockEntry();
-            for (Object subElement : (Iterable<?>) element) {
-                appendToBlockBuilder(type.getTypeParameters().get(0), subElement, subBlockBuilder);
-            }
-            blockBuilder.closeEntry();
+            ((ArrayBlockBuilder) blockBuilder).buildEntry(elementBuilder -> {
+                for (Object subElement : (Iterable<?>) element) {
+                    appendToBlockBuilder(type.getTypeParameters().get(0), subElement, elementBuilder);
+                }
+            });
         }
         else if (type instanceof RowType && element instanceof Iterable<?>) {
-            BlockBuilder subBlockBuilder = blockBuilder.beginBlockEntry();
-            int field = 0;
-            for (Object subElement : (Iterable<?>) element) {
-                appendToBlockBuilder(type.getTypeParameters().get(field), subElement, subBlockBuilder);
-                field++;
-            }
-            blockBuilder.closeEntry();
+            ((RowBlockBuilder) blockBuilder).buildEntry(fieldBuilders -> {
+                int field = 0;
+                for (Object subElement : (Iterable<?>) element) {
+                    appendToBlockBuilder(type.getTypeParameters().get(field), subElement, fieldBuilders.get(field));
+                    field++;
+                }
+            });
         }
-        else if (type instanceof MapType && element instanceof Map<?, ?>) {
-            BlockBuilder subBlockBuilder = blockBuilder.beginBlockEntry();
-            for (Map.Entry<?, ?> entry : ((Map<?, ?>) element).entrySet()) {
-                appendToBlockBuilder(type.getTypeParameters().get(0), entry.getKey(), subBlockBuilder);
-                appendToBlockBuilder(type.getTypeParameters().get(1), entry.getValue(), subBlockBuilder);
-            }
-            blockBuilder.closeEntry();
+        else if (type instanceof MapType mapType && element instanceof Map<?, ?>) {
+            ((MapBlockBuilder) blockBuilder).buildEntry((keyBuilder, valueBuilder) -> {
+                for (Map.Entry<?, ?> entry : ((Map<?, ?>) element).entrySet()) {
+                    appendToBlockBuilder(mapType.getKeyType(), entry.getKey(), keyBuilder);
+                    appendToBlockBuilder(mapType.getValueType(), entry.getValue(), valueBuilder);
+                }
+            });
         }
         else if (javaType == boolean.class) {
             type.writeBoolean(blockBuilder, (Boolean) element);
diff --git a/core/trino-main/src/test/java/io/trino/util/TestAutoCloseableCloser.java b/core/trino-main/src/test/java/io/trino/util/TestAutoCloseableCloser.java
index 58e62b03174a..2a428def57cf 100644
--- a/core/trino-main/src/test/java/io/trino/util/TestAutoCloseableCloser.java
+++ b/core/trino-main/src/test/java/io/trino/util/TestAutoCloseableCloser.java
@@ -13,7 +13,7 @@
  */
 package io.trino.util;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.base.Throwables.propagateIfPossible;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/core/trino-main/src/test/java/io/trino/util/TestDateTimeUtils.java b/core/trino-main/src/test/java/io/trino/util/TestDateTimeUtils.java
index 90c8a57ec009..edfc909f4146 100644
--- a/core/trino-main/src/test/java/io/trino/util/TestDateTimeUtils.java
+++ b/core/trino-main/src/test/java/io/trino/util/TestDateTimeUtils.java
@@ -13,7 +13,7 @@
  */
 package io.trino.util;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.DateTimeException;
 
diff --git a/core/trino-main/src/test/java/io/trino/util/TestDisjointSet.java b/core/trino-main/src/test/java/io/trino/util/TestDisjointSet.java
index 65a27ad440d3..91d78b97ffc6 100644
--- a/core/trino-main/src/test/java/io/trino/util/TestDisjointSet.java
+++ b/core/trino-main/src/test/java/io/trino/util/TestDisjointSet.java
@@ -14,7 +14,7 @@
 package io.trino.util;
 
 import com.google.common.collect.Iterables;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/core/trino-main/src/test/java/io/trino/util/TestFailures.java b/core/trino-main/src/test/java/io/trino/util/TestFailures.java
index acadb943bca8..41058a43b53c 100644
--- a/core/trino-main/src/test/java/io/trino/util/TestFailures.java
+++ b/core/trino-main/src/test/java/io/trino/util/TestFailures.java
@@ -15,7 +15,7 @@
 
 import io.trino.execution.ExecutionFailureInfo;
 import io.trino.spi.TrinoException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.StandardErrorCode.TOO_MANY_REQUESTS_FAILED;
diff --git a/core/trino-main/src/test/java/io/trino/util/TestHeapTraversal.java b/core/trino-main/src/test/java/io/trino/util/TestHeapTraversal.java
index 3bfd7b737d91..a2833d9bac9a 100644
--- a/core/trino-main/src/test/java/io/trino/util/TestHeapTraversal.java
+++ b/core/trino-main/src/test/java/io/trino/util/TestHeapTraversal.java
@@ -13,7 +13,7 @@
  */
 package io.trino.util;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
diff --git a/core/trino-main/src/test/java/io/trino/util/TestLong2LongOpenBigHashMap.java b/core/trino-main/src/test/java/io/trino/util/TestLong2LongOpenBigHashMap.java
index 3f0b0ff5fc42..bc246d6633de 100644
--- a/core/trino-main/src/test/java/io/trino/util/TestLong2LongOpenBigHashMap.java
+++ b/core/trino-main/src/test/java/io/trino/util/TestLong2LongOpenBigHashMap.java
@@ -13,7 +13,7 @@
  */
 package io.trino.util;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/core/trino-main/src/test/java/io/trino/util/TestLongBigArrayFIFOQueue.java b/core/trino-main/src/test/java/io/trino/util/TestLongBigArrayFIFOQueue.java
index 17d2bf0dd516..277cae70cfd5 100644
--- a/core/trino-main/src/test/java/io/trino/util/TestLongBigArrayFIFOQueue.java
+++ b/core/trino-main/src/test/java/io/trino/util/TestLongBigArrayFIFOQueue.java
@@ -13,7 +13,7 @@
  */
 package io.trino.util;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
diff --git a/core/trino-main/src/test/java/io/trino/util/TestLongLong2LongOpenCustomBigHashMap.java b/core/trino-main/src/test/java/io/trino/util/TestLongLong2LongOpenCustomBigHashMap.java
index 00f2c64cb10a..f5d3884b8086 100644
--- a/core/trino-main/src/test/java/io/trino/util/TestLongLong2LongOpenCustomBigHashMap.java
+++ b/core/trino-main/src/test/java/io/trino/util/TestLongLong2LongOpenCustomBigHashMap.java
@@ -78,7 +78,7 @@ public void testBasicOps(long nullKey1, long nullKey2)
                 count++;
                 assertTrue(map.replace(key1, key2, count - 1, count));
                 assertFalse(map.isEmpty());
-                assertEquals(map.size(), values.size() * values.size());
+                assertEquals(map.size(), (long) values.size() * values.size());
             }
         }
 
@@ -145,7 +145,7 @@ public boolean equals(long a1, long a2, long b1, long b2)
                 count++;
                 assertTrue(map.replace(key1, key2, count - 1, count));
                 assertFalse(map.isEmpty());
-                assertEquals(map.size(), values.size() * values.size());
+                assertEquals(map.size(), (long) values.size() * values.size());
             }
         }
 
diff --git a/core/trino-main/src/test/java/io/trino/util/TestMergeSortedPages.java b/core/trino-main/src/test/java/io/trino/util/TestMergeSortedPages.java
index 3156a2d63024..9b8979f8806f 100644
--- a/core/trino-main/src/test/java/io/trino/util/TestMergeSortedPages.java
+++ b/core/trino-main/src/test/java/io/trino/util/TestMergeSortedPages.java
@@ -24,7 +24,7 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-main/src/test/java/io/trino/util/TestPowerOfTwoValidator.java b/core/trino-main/src/test/java/io/trino/util/TestPowerOfTwoValidator.java
index 93294a850d33..9506076a2294 100644
--- a/core/trino-main/src/test/java/io/trino/util/TestPowerOfTwoValidator.java
+++ b/core/trino-main/src/test/java/io/trino/util/TestPowerOfTwoValidator.java
@@ -13,7 +13,7 @@
  */
 package io.trino.util;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.testing.ValidationAssertions.assertFailsValidation;
 import static io.airlift.testing.ValidationAssertions.assertValidates;
diff --git a/core/trino-main/src/test/java/io/trino/util/TestTimeZoneUtils.java b/core/trino-main/src/test/java/io/trino/util/TestTimeZoneUtils.java
index 76bdc4b7f74f..b10c231d2351 100644
--- a/core/trino-main/src/test/java/io/trino/util/TestTimeZoneUtils.java
+++ b/core/trino-main/src/test/java/io/trino/util/TestTimeZoneUtils.java
@@ -16,7 +16,7 @@
 import io.trino.spi.type.TimeZoneKey;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.ZoneId;
 import java.util.TreeSet;
diff --git a/core/trino-main/src/test/java/io/trino/version/TestEmbedVersion.java b/core/trino-main/src/test/java/io/trino/version/TestEmbedVersion.java
index 53e58db82ca2..78d3ba20446e 100644
--- a/core/trino-main/src/test/java/io/trino/version/TestEmbedVersion.java
+++ b/core/trino-main/src/test/java/io/trino/version/TestEmbedVersion.java
@@ -13,9 +13,7 @@
  */
 package io.trino.version;
 
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;
@@ -26,19 +24,7 @@
 
 public class TestEmbedVersion
 {
-    private EmbedVersion embedVersion;
-
-    @BeforeClass
-    public void setUp()
-    {
-        embedVersion = new EmbedVersion("123-some-test-version");
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-    {
-        embedVersion = null;
-    }
+    private final EmbedVersion embedVersion = new EmbedVersion("123-some-test-version");
 
     @Test
     public void testEmbedVersionInRunnable()
diff --git a/core/trino-parser/pom.xml b/core/trino-parser/pom.xml
index b877ad9c5ed2..09f93e578258 100644
--- a/core/trino-parser/pom.xml
+++ b/core/trino-parser/pom.xml
@@ -5,25 +5,17 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-parser</artifactId>
-    <name>trino-parser</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <project.build.targetJdk>8</project.build.targetJdk>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_annotations</artifactId>
@@ -35,12 +27,27 @@
             <artifactId>guava</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-grammar</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -71,13 +78,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr4-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/core/trino-parser/src/main/java/io/trino/sql/ExpressionFormatter.java b/core/trino-parser/src/main/java/io/trino/sql/ExpressionFormatter.java
index aa10586b50bf..743d4a181568 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/ExpressionFormatter.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/ExpressionFormatter.java
@@ -13,7 +13,6 @@
  */
 package io.trino.sql;
 
-import com.google.common.base.CharMatcher;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.tree.AllColumns;
@@ -31,7 +30,6 @@
 import io.trino.sql.tree.CharLiteral;
 import io.trino.sql.tree.CoalesceExpression;
 import io.trino.sql.tree.ComparisonExpression;
-import io.trino.sql.tree.Cube;
 import io.trino.sql.tree.CurrentCatalog;
 import io.trino.sql.tree.CurrentPath;
 import io.trino.sql.tree.CurrentSchema;
@@ -84,7 +82,6 @@
 import io.trino.sql.tree.Parameter;
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.QuantifiedComparisonExpression;
-import io.trino.sql.tree.Rollup;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.RowDataType;
 import io.trino.sql.tree.SearchedCaseExpression;
@@ -114,10 +111,8 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
-import java.util.PrimitiveIterator;
 import java.util.function.Function;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.sql.ReservedIdentifiers.reserved;
@@ -314,7 +309,7 @@ protected String visitLongLiteral(LongLiteral node, Void context)
         {
             return literalFormatter
                     .map(formatter -> formatter.apply(node))
-                    .orElseGet(() -> Long.toString(node.getValue()));
+                    .orElseGet(node::getValue);
         }
 
         @Override
@@ -467,14 +462,10 @@ protected String visitFunctionCall(FunctionCall node, Void context)
             builder.append(')');
 
             node.getNullTreatment().ifPresent(nullTreatment -> {
-                switch (nullTreatment) {
-                    case IGNORE:
-                        builder.append(" IGNORE NULLS");
-                        break;
-                    case RESPECT:
-                        builder.append(" RESPECT NULLS");
-                        break;
-                }
+                builder.append(switch (nullTreatment) {
+                    case IGNORE -> " IGNORE NULLS";
+                    case RESPECT -> " RESPECT NULLS";
+                });
             });
 
             if (node.getFilter().isPresent()) {
@@ -594,15 +585,12 @@ protected String visitArithmeticUnary(ArithmeticUnaryExpression node, Void conte
         {
             String value = process(node.getValue(), context);
 
-            switch (node.getSign()) {
-                case MINUS:
-                    // Unary is ambiguous with respect to negative numbers. "-1" parses as a number, but "-(1)" parses as "unaryMinus(number)"
-                    // The parentheses are needed to ensure the parsing roundtrips properly.
-                    return "-(" + value + ")";
-                case PLUS:
-                    return "+" + value;
-            }
-            throw new UnsupportedOperationException("Unsupported sign: " + node.getSign());
+            return switch (node.getSign()) {
+                // Unary is ambiguous with respect to negative numbers. "-1" parses as a number, but "-(1)" parses as "unaryMinus(number)"
+                // The parentheses are needed to ensure the parsing roundtrips properly.
+                case MINUS -> "-(" + value + ")";
+                case PLUS -> "+" + value;
+            };
         }
 
         @Override
@@ -896,31 +884,17 @@ protected String visitJsonQuery(JsonQuery node, Void context)
                         .append(node.getOutputFormat().map(string -> " FORMAT " + string).orElse(""));
             }
 
-            switch (node.getWrapperBehavior()) {
-                case WITHOUT:
-                    builder.append(" WITHOUT ARRAY WRAPPER");
-                    break;
-                case CONDITIONAL:
-                    builder.append(" WITH CONDITIONAL ARRAY WRAPPER");
-                    break;
-                case UNCONDITIONAL:
-                    builder.append((" WITH UNCONDITIONAL ARRAY WRAPPER"));
-                    break;
-                default:
-                    throw new IllegalStateException("unexpected array wrapper behavior: " + node.getWrapperBehavior());
-            }
+            builder.append(switch (node.getWrapperBehavior()) {
+                case WITHOUT -> " WITHOUT ARRAY WRAPPER";
+                case CONDITIONAL -> " WITH CONDITIONAL ARRAY WRAPPER";
+                case UNCONDITIONAL -> (" WITH UNCONDITIONAL ARRAY WRAPPER");
+            });
 
             if (node.getQuotesBehavior().isPresent()) {
-                switch (node.getQuotesBehavior().get()) {
-                    case KEEP:
-                        builder.append(" KEEP QUOTES ON SCALAR STRING");
-                        break;
-                    case OMIT:
-                        builder.append(" OMIT QUOTES ON SCALAR STRING");
-                        break;
-                    default:
-                        throw new IllegalStateException("unexpected quotes behavior: " + node.getQuotesBehavior());
-                }
+                builder.append(switch (node.getQuotesBehavior().get()) {
+                    case KEEP -> " KEEP QUOTES ON SCALAR STRING";
+                    case OMIT -> " OMIT QUOTES ON SCALAR STRING";
+                });
             }
 
             builder.append(" ")
@@ -1055,35 +1029,7 @@ private String visitListagg(FunctionCall node)
 
     static String formatStringLiteral(String s)
     {
-        s = s.replace("'", "''");
-        if (CharMatcher.inRange((char) 0x20, (char) 0x7E).matchesAllOf(s)) {
-            return "'" + s + "'";
-        }
-
-        StringBuilder builder = new StringBuilder();
-        builder.append("U&'");
-        PrimitiveIterator.OfInt iterator = s.codePoints().iterator();
-        while (iterator.hasNext()) {
-            int codePoint = iterator.nextInt();
-            checkArgument(codePoint >= 0, "Invalid UTF-8 encoding in characters: %s", s);
-            if (isAsciiPrintable(codePoint)) {
-                char ch = (char) codePoint;
-                if (ch == '\\') {
-                    builder.append(ch);
-                }
-                builder.append(ch);
-            }
-            else if (codePoint <= 0xFFFF) {
-                builder.append('\\');
-                builder.append(format("%04X", codePoint));
-            }
-            else {
-                builder.append("\\+");
-                builder.append(format("%06X", codePoint));
-            }
-        }
-        builder.append("'");
-        return builder.toString();
+        return "'" + s.replace("'", "''") + "'";
     }
 
     public static String formatOrderBy(OrderBy orderBy)
@@ -1183,37 +1129,29 @@ private static String formatFrame(WindowFrame windowFrame)
 
     private static String formatFrameBound(FrameBound frameBound)
     {
-        switch (frameBound.getType()) {
-            case UNBOUNDED_PRECEDING:
-                return "UNBOUNDED PRECEDING";
-            case PRECEDING:
-                return formatExpression(frameBound.getValue().get()) + " PRECEDING";
-            case CURRENT_ROW:
-                return "CURRENT ROW";
-            case FOLLOWING:
-                return formatExpression(frameBound.getValue().get()) + " FOLLOWING";
-            case UNBOUNDED_FOLLOWING:
-                return "UNBOUNDED FOLLOWING";
-        }
-        throw new IllegalArgumentException("unhandled type: " + frameBound.getType());
+        return switch (frameBound.getType()) {
+            case UNBOUNDED_PRECEDING -> "UNBOUNDED PRECEDING";
+            case PRECEDING -> formatExpression(frameBound.getValue().get()) + " PRECEDING";
+            case CURRENT_ROW -> "CURRENT ROW";
+            case FOLLOWING -> formatExpression(frameBound.getValue().get()) + " FOLLOWING";
+            case UNBOUNDED_FOLLOWING -> "UNBOUNDED FOLLOWING";
+        };
     }
 
     public static String formatSkipTo(SkipTo skipTo)
     {
-        switch (skipTo.getPosition()) {
-            case PAST_LAST:
-                return "AFTER MATCH SKIP PAST LAST ROW";
-            case NEXT:
-                return "AFTER MATCH SKIP TO NEXT ROW";
-            case LAST:
+        return switch (skipTo.getPosition()) {
+            case PAST_LAST -> "AFTER MATCH SKIP PAST LAST ROW";
+            case NEXT -> "AFTER MATCH SKIP TO NEXT ROW";
+            case LAST -> {
                 checkState(skipTo.getIdentifier().isPresent(), "missing identifier in AFTER MATCH SKIP TO LAST");
-                return "AFTER MATCH SKIP TO LAST " + formatExpression(skipTo.getIdentifier().get());
-            case FIRST:
+                yield "AFTER MATCH SKIP TO LAST " + formatExpression(skipTo.getIdentifier().get());
+            }
+            case FIRST -> {
                 checkState(skipTo.getIdentifier().isPresent(), "missing identifier in AFTER MATCH SKIP TO FIRST");
-                return "AFTER MATCH SKIP TO FIRST " + formatExpression(skipTo.getIdentifier().get());
-            default:
-                throw new IllegalStateException("unexpected skipTo: " + skipTo);
-        }
+                yield "AFTER MATCH SKIP TO FIRST " + formatExpression(skipTo.getIdentifier().get());
+            }
+        };
     }
 
     static String formatGroupBy(List<GroupingElement> groupingElements)
@@ -1229,16 +1167,16 @@ static String formatGroupBy(List<GroupingElement> groupingElements)
                     result = formatGroupingSet(columns);
                 }
             }
-            else if (groupingElement instanceof GroupingSets) {
-                result = ((GroupingSets) groupingElement).getSets().stream()
+            else if (groupingElement instanceof GroupingSets groupingSets) {
+                String type = switch (groupingSets.getType()) {
+                    case EXPLICIT -> "GROUPING SETS";
+                    case CUBE -> "CUBE";
+                    case ROLLUP -> "ROLLUP";
+                };
+
+                result = groupingSets.getSets().stream()
                         .map(ExpressionFormatter::formatGroupingSet)
-                        .collect(joining(", ", "GROUPING SETS (", ")"));
-            }
-            else if (groupingElement instanceof Cube) {
-                result = "CUBE " + formatGroupingSet(groupingElement.getExpressions());
-            }
-            else if (groupingElement instanceof Rollup) {
-                result = "ROLLUP " + formatGroupingSet(groupingElement.getExpressions());
+                        .collect(joining(", ", type + " (", ")"));
             }
             return result;
         })
@@ -1264,30 +1202,16 @@ private static Function<SortItem, String> sortItemFormatterFunction()
 
             builder.append(formatExpression(input.getSortKey()));
 
-            switch (input.getOrdering()) {
-                case ASCENDING:
-                    builder.append(" ASC");
-                    break;
-                case DESCENDING:
-                    builder.append(" DESC");
-                    break;
-                default:
-                    throw new UnsupportedOperationException("unknown ordering: " + input.getOrdering());
-            }
+            builder.append(switch (input.getOrdering()) {
+                case ASCENDING -> " ASC";
+                case DESCENDING -> " DESC";
+            });
 
-            switch (input.getNullOrdering()) {
-                case FIRST:
-                    builder.append(" NULLS FIRST");
-                    break;
-                case LAST:
-                    builder.append(" NULLS LAST");
-                    break;
-                case UNDEFINED:
-                    // no op
-                    break;
-                default:
-                    throw new UnsupportedOperationException("unknown null ordering: " + input.getNullOrdering());
-            }
+            builder.append(switch (input.getNullOrdering()) {
+                case FIRST -> " NULLS FIRST";
+                case LAST -> " NULLS LAST";
+                case UNDEFINED -> "";
+            });
 
             return builder.toString();
         };
@@ -1301,6 +1225,10 @@ public static String formatJsonPathInvocation(JsonPathInvocation pathInvocation)
                 .append(", ")
                 .append(formatExpression(pathInvocation.getJsonPath()));
 
+        pathInvocation.getPathName().ifPresent(pathName -> builder
+                .append(" AS ")
+                .append(formatExpression(pathName)));
+
         if (!pathInvocation.getPathParameters().isEmpty()) {
             builder.append(" PASSING ");
             builder.append(formatJsonPathParameters(pathInvocation.getPathParameters()));
diff --git a/core/trino-parser/src/main/java/io/trino/sql/QueryUtil.java b/core/trino-parser/src/main/java/io/trino/sql/QueryUtil.java
index 19fe8278990d..194de410efdc 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/QueryUtil.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/QueryUtil.java
@@ -25,7 +25,6 @@
 import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.LogicalExpression;
 import io.trino.sql.tree.Node;
-import io.trino.sql.tree.NullLiteral;
 import io.trino.sql.tree.Offset;
 import io.trino.sql.tree.OrderBy;
 import io.trino.sql.tree.QualifiedName;
@@ -268,28 +267,10 @@ public static Query singleValueQuery(String columnName, boolean value)
                 aliased(values, "t", ImmutableList.of(columnName)));
     }
 
-    // TODO pass column types
-    public static Query emptyQuery(List<String> columns)
-    {
-        Select select = selectList(columns.stream()
-                .map(column -> new SingleColumn(new NullLiteral(), QueryUtil.identifier(column)))
-                .toArray(SelectItem[]::new));
-        Optional<Expression> where = Optional.of(FALSE_LITERAL);
-        return query(new QuerySpecification(
-                select,
-                Optional.empty(),
-                where,
-                Optional.empty(),
-                Optional.empty(),
-                ImmutableList.of(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty()));
-    }
-
     public static Query query(QueryBody body)
     {
         return new Query(
+                ImmutableList.of(),
                 Optional.empty(),
                 body,
                 Optional.empty(),
diff --git a/core/trino-parser/src/main/java/io/trino/sql/ReservedIdentifiers.java b/core/trino-parser/src/main/java/io/trino/sql/ReservedIdentifiers.java
index 6b9145d23f56..16692410d930 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/ReservedIdentifiers.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/ReservedIdentifiers.java
@@ -13,13 +13,9 @@
  */
 package io.trino.sql;
 
-import com.google.common.collect.ImmutableSet;
 import io.trino.sql.parser.ParsingException;
-import io.trino.sql.parser.ParsingOptions;
-import io.trino.sql.parser.SqlBaseLexer;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.Identifier;
-import org.antlr.v4.runtime.Vocabulary;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -32,15 +28,15 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.google.common.base.Strings.nullToEmpty;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.grammar.sql.SqlKeywords.sqlKeywords;
 import static java.lang.String.format;
 
 public final class ReservedIdentifiers
 {
-    private static final Pattern IDENTIFIER = Pattern.compile("'([A-Z_]+)'");
-    private static final Pattern TABLE_ROW = Pattern.compile("``([A-Z_]+)``.*");
-    private static final String TABLE_PREFIX = "============================== ";
+    private static final Pattern TABLE_ROW = Pattern.compile("\\| `([A-Z_]+)`.*");
+    private static final String TABLE_START = "| ------------------- |";
+    private static final String TABLE_ROW_START = "|";
 
     private static final SqlParser PARSER = new SqlParser();
 
@@ -71,28 +67,22 @@ private static void validateDocs(Path path)
         System.out.println("Validating " + path);
         List<String> lines = Files.readAllLines(path);
 
-        if (lines.stream().filter(s -> s.startsWith(TABLE_PREFIX)).count() != 3) {
+        if (lines.stream().filter(s -> s.startsWith(TABLE_START)).count() != 1) {
             throw new RuntimeException("Failed to find exactly one table");
         }
 
         Iterator<String> iterator = lines.iterator();
 
-        // find table and skip header
-        while (!iterator.next().startsWith(TABLE_PREFIX)) {
+        // find start of list in table
+        while (!iterator.next().startsWith(TABLE_START)) {
             // skip
         }
-        if (iterator.next().startsWith(TABLE_PREFIX)) {
-            throw new RuntimeException("Expected to find a header line");
-        }
-        if (!iterator.next().startsWith(TABLE_PREFIX)) {
-            throw new RuntimeException("Found multiple header lines");
-        }
 
         Set<String> reserved = reservedIdentifiers();
         Set<String> found = new HashSet<>();
         while (true) {
             String line = iterator.next();
-            if (line.startsWith(TABLE_PREFIX)) {
+            if (!line.startsWith(TABLE_ROW_START)) {
                 break;
             }
 
@@ -127,24 +117,10 @@ public static Set<String> reservedIdentifiers()
                 .collect(toImmutableSet());
     }
 
-    public static Set<String> sqlKeywords()
-    {
-        ImmutableSet.Builder<String> names = ImmutableSet.builder();
-        Vocabulary vocabulary = SqlBaseLexer.VOCABULARY;
-        for (int i = 0; i <= vocabulary.getMaxTokenType(); i++) {
-            String name = nullToEmpty(vocabulary.getLiteralName(i));
-            Matcher matcher = IDENTIFIER.matcher(name);
-            if (matcher.matches()) {
-                names.add(matcher.group(1));
-            }
-        }
-        return names.build();
-    }
-
     public static boolean reserved(String name)
     {
         try {
-            return !(PARSER.createExpression(name, new ParsingOptions()) instanceof Identifier);
+            return !(PARSER.createExpression(name) instanceof Identifier);
         }
         catch (ParsingException ignored) {
             return true;
diff --git a/core/trino-parser/src/main/java/io/trino/sql/RowPatternFormatter.java b/core/trino-parser/src/main/java/io/trino/sql/RowPatternFormatter.java
index c430c7377084..089ae098e629 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/RowPatternFormatter.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/RowPatternFormatter.java
@@ -101,14 +101,10 @@ protected String visitPatternPermutation(PatternPermutation node, Void context)
         @Override
         protected String visitAnchorPattern(AnchorPattern node, Void context)
         {
-            switch (node.getType()) {
-                case PARTITION_START:
-                    return "^";
-                case PARTITION_END:
-                    return "$";
-                default:
-                    throw new IllegalStateException("unexpected anchor pattern type: " + node.getType());
-            }
+            return switch (node.getType()) {
+                case PARTITION_START -> "^";
+                case PARTITION_END -> "$";
+            };
         }
 
         @Override
diff --git a/core/trino-parser/src/main/java/io/trino/sql/SqlFormatter.java b/core/trino-parser/src/main/java/io/trino/sql/SqlFormatter.java
index 9692ae9129a5..9f17c3a0ebcb 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/SqlFormatter.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/SqlFormatter.java
@@ -20,13 +20,20 @@
 import io.trino.sql.tree.AliasedRelation;
 import io.trino.sql.tree.AllColumns;
 import io.trino.sql.tree.Analyze;
+import io.trino.sql.tree.AssignmentStatement;
 import io.trino.sql.tree.AstVisitor;
 import io.trino.sql.tree.Call;
 import io.trino.sql.tree.CallArgument;
+import io.trino.sql.tree.CaseStatement;
+import io.trino.sql.tree.CaseStatementWhenClause;
 import io.trino.sql.tree.ColumnDefinition;
 import io.trino.sql.tree.Comment;
+import io.trino.sql.tree.CommentCharacteristic;
 import io.trino.sql.tree.Commit;
+import io.trino.sql.tree.CompoundStatement;
+import io.trino.sql.tree.ControlStatement;
 import io.trino.sql.tree.CreateCatalog;
+import io.trino.sql.tree.CreateFunction;
 import io.trino.sql.tree.CreateMaterializedView;
 import io.trino.sql.tree.CreateRole;
 import io.trino.sql.tree.CreateSchema;
@@ -38,15 +45,20 @@
 import io.trino.sql.tree.Deny;
 import io.trino.sql.tree.DescribeInput;
 import io.trino.sql.tree.DescribeOutput;
+import io.trino.sql.tree.DeterministicCharacteristic;
 import io.trino.sql.tree.DropCatalog;
 import io.trino.sql.tree.DropColumn;
+import io.trino.sql.tree.DropFunction;
 import io.trino.sql.tree.DropMaterializedView;
 import io.trino.sql.tree.DropRole;
 import io.trino.sql.tree.DropSchema;
 import io.trino.sql.tree.DropTable;
 import io.trino.sql.tree.DropView;
+import io.trino.sql.tree.ElseClause;
+import io.trino.sql.tree.ElseIfClause;
 import io.trino.sql.tree.Except;
 import io.trino.sql.tree.Execute;
+import io.trino.sql.tree.ExecuteImmediate;
 import io.trino.sql.tree.Explain;
 import io.trino.sql.tree.ExplainAnalyze;
 import io.trino.sql.tree.ExplainFormat;
@@ -54,35 +66,52 @@
 import io.trino.sql.tree.ExplainType;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FetchFirst;
+import io.trino.sql.tree.FunctionSpecification;
 import io.trino.sql.tree.Grant;
 import io.trino.sql.tree.GrantRoles;
 import io.trino.sql.tree.GrantorSpecification;
 import io.trino.sql.tree.Identifier;
+import io.trino.sql.tree.IfStatement;
 import io.trino.sql.tree.Insert;
 import io.trino.sql.tree.Intersect;
 import io.trino.sql.tree.Isolation;
+import io.trino.sql.tree.IterateStatement;
 import io.trino.sql.tree.Join;
 import io.trino.sql.tree.JoinCriteria;
 import io.trino.sql.tree.JoinOn;
 import io.trino.sql.tree.JoinUsing;
+import io.trino.sql.tree.JsonTable;
+import io.trino.sql.tree.JsonTableColumnDefinition;
+import io.trino.sql.tree.JsonTableDefaultPlan;
+import io.trino.sql.tree.LanguageCharacteristic;
 import io.trino.sql.tree.Lateral;
+import io.trino.sql.tree.LeaveStatement;
 import io.trino.sql.tree.LikeClause;
 import io.trino.sql.tree.Limit;
+import io.trino.sql.tree.LoopStatement;
 import io.trino.sql.tree.Merge;
 import io.trino.sql.tree.MergeCase;
 import io.trino.sql.tree.MergeDelete;
 import io.trino.sql.tree.MergeInsert;
 import io.trino.sql.tree.MergeUpdate;
 import io.trino.sql.tree.NaturalJoin;
+import io.trino.sql.tree.NestedColumns;
 import io.trino.sql.tree.Node;
+import io.trino.sql.tree.NullInputCharacteristic;
 import io.trino.sql.tree.Offset;
 import io.trino.sql.tree.OrderBy;
+import io.trino.sql.tree.OrdinalityColumn;
+import io.trino.sql.tree.ParameterDeclaration;
 import io.trino.sql.tree.PatternRecognitionRelation;
+import io.trino.sql.tree.PlanLeaf;
+import io.trino.sql.tree.PlanParentChild;
+import io.trino.sql.tree.PlanSiblings;
 import io.trino.sql.tree.Prepare;
 import io.trino.sql.tree.PrincipalSpecification;
 import io.trino.sql.tree.Property;
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.Query;
+import io.trino.sql.tree.QueryColumn;
 import io.trino.sql.tree.QueryPeriod;
 import io.trino.sql.tree.QuerySpecification;
 import io.trino.sql.tree.RefreshMaterializedView;
@@ -92,13 +121,19 @@
 import io.trino.sql.tree.RenameSchema;
 import io.trino.sql.tree.RenameTable;
 import io.trino.sql.tree.RenameView;
+import io.trino.sql.tree.RepeatStatement;
 import io.trino.sql.tree.ResetSession;
+import io.trino.sql.tree.ResetSessionAuthorization;
+import io.trino.sql.tree.ReturnStatement;
+import io.trino.sql.tree.ReturnsClause;
 import io.trino.sql.tree.Revoke;
 import io.trino.sql.tree.RevokeRoles;
 import io.trino.sql.tree.Rollback;
+import io.trino.sql.tree.RoutineCharacteristic;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.RowPattern;
 import io.trino.sql.tree.SampledRelation;
+import io.trino.sql.tree.SecurityCharacteristic;
 import io.trino.sql.tree.Select;
 import io.trino.sql.tree.SelectItem;
 import io.trino.sql.tree.SetColumnType;
@@ -107,6 +142,7 @@
 import io.trino.sql.tree.SetRole;
 import io.trino.sql.tree.SetSchemaAuthorization;
 import io.trino.sql.tree.SetSession;
+import io.trino.sql.tree.SetSessionAuthorization;
 import io.trino.sql.tree.SetTableAuthorization;
 import io.trino.sql.tree.SetTimeZone;
 import io.trino.sql.tree.SetViewAuthorization;
@@ -137,7 +173,10 @@
 import io.trino.sql.tree.Unnest;
 import io.trino.sql.tree.Update;
 import io.trino.sql.tree.UpdateAssignment;
+import io.trino.sql.tree.ValueColumn;
 import io.trino.sql.tree.Values;
+import io.trino.sql.tree.VariableDeclaration;
+import io.trino.sql.tree.WhileStatement;
 import io.trino.sql.tree.WithQuery;
 
 import java.util.ArrayList;
@@ -149,11 +188,15 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.sql.ExpressionFormatter.formatGroupBy;
+import static io.trino.sql.ExpressionFormatter.formatJsonPathInvocation;
 import static io.trino.sql.ExpressionFormatter.formatOrderBy;
 import static io.trino.sql.ExpressionFormatter.formatSkipTo;
 import static io.trino.sql.ExpressionFormatter.formatStringLiteral;
 import static io.trino.sql.ExpressionFormatter.formatWindowSpecification;
 import static io.trino.sql.RowPatternFormatter.formatPattern;
+import static io.trino.sql.tree.SaveMode.IGNORE;
+import static io.trino.sql.tree.SaveMode.REPLACE;
+import static java.lang.String.join;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
 
@@ -187,13 +230,6 @@ private static String formatExpression(Expression expression)
         return ExpressionFormatter.formatExpression(expression);
     }
 
-    /**
-     * @deprecated Use {@link #formatName(Identifier)} instead.
-     */
-    @Deprecated
-    @SuppressWarnings("unused")
-    private static void formatExpression(Identifier identifier) {}
-
     private static class Formatter
             extends AstVisitor<Void, Integer>
     {
@@ -264,6 +300,161 @@ protected Void visitUnnest(Unnest node, Integer indent)
             return null;
         }
 
+        @Override
+        protected Void visitJsonTable(JsonTable node, Integer indent)
+        {
+            builder.append("JSON_TABLE (")
+                    .append(formatJsonPathInvocation(node.getJsonPathInvocation()))
+                    .append("\n");
+            appendJsonTableColumns(node.getColumns(), indent + 1);
+            node.getPlan().ifPresent(plan -> {
+                builder.append("\n");
+                if (plan instanceof JsonTableDefaultPlan) {
+                    append(indent + 1, "PLAN DEFAULT (");
+                }
+                else {
+                    append(indent + 1, "PLAN (");
+                }
+                process(plan, indent + 1);
+                builder.append(")");
+            });
+            node.getErrorBehavior().ifPresent(behavior -> {
+                builder.append("\n");
+                append(indent + 1, behavior + " ON ERROR");
+            });
+            builder.append(")\n");
+            return null;
+        }
+
+        private void appendJsonTableColumns(List<JsonTableColumnDefinition> columns, int indent)
+        {
+            append(indent, "COLUMNS (\n");
+            for (int i = 0; i < columns.size() - 1; i++) {
+                process(columns.get(i), indent + 1);
+                builder.append(",\n");
+            }
+            process(columns.get(columns.size() - 1), indent + 1);
+            builder.append(")");
+        }
+
+        @Override
+        protected Void visitOrdinalityColumn(OrdinalityColumn node, Integer indent)
+        {
+            append(indent, formatName(node.getName()) + " FOR ORDINALITY");
+            return null;
+        }
+
+        @Override
+        protected Void visitValueColumn(ValueColumn node, Integer indent)
+        {
+            append(indent, formatName(node.getName()))
+                    .append(" ")
+                    .append(formatExpression(node.getType()));
+            node.getJsonPath().ifPresent(path ->
+                    builder.append(" PATH ")
+                            .append(formatExpression(path)));
+            builder.append(" ")
+                    .append(node.getEmptyBehavior().name())
+                    .append(node.getEmptyDefault().map(expression -> " " + formatExpression(expression)).orElse(""))
+                    .append(" ON EMPTY");
+            node.getErrorBehavior().ifPresent(behavior ->
+                    builder.append(" ")
+                            .append(behavior.name())
+                            .append(node.getErrorDefault().map(expression -> " " + formatExpression(expression)).orElse(""))
+                            .append(" ON ERROR"));
+            return null;
+        }
+
+        @Override
+        protected Void visitQueryColumn(QueryColumn node, Integer indent)
+        {
+            append(indent, formatName(node.getName()))
+                    .append(" ")
+                    .append(formatExpression(node.getType()))
+                    .append(" FORMAT ")
+                    .append(node.getFormat().name());
+            node.getJsonPath().ifPresent(path ->
+                    builder.append(" PATH ")
+                            .append(formatExpression(path)));
+            builder.append(switch (node.getWrapperBehavior()) {
+                case WITHOUT -> " WITHOUT ARRAY WRAPPER";
+                case CONDITIONAL -> " WITH CONDITIONAL ARRAY WRAPPER";
+                case UNCONDITIONAL -> (" WITH UNCONDITIONAL ARRAY WRAPPER");
+            });
+
+            if (node.getQuotesBehavior().isPresent()) {
+                builder.append(switch (node.getQuotesBehavior().get()) {
+                    case KEEP -> " KEEP QUOTES ON SCALAR STRING";
+                    case OMIT -> " OMIT QUOTES ON SCALAR STRING";
+                });
+            }
+            builder.append(" ")
+                    .append(node.getEmptyBehavior().toString())
+                    .append(" ON EMPTY");
+            node.getErrorBehavior().ifPresent(behavior ->
+                    builder.append(" ")
+                            .append(behavior.toString())
+                            .append(" ON ERROR"));
+            return null;
+        }
+
+        @Override
+        protected Void visitNestedColumns(NestedColumns node, Integer indent)
+        {
+            append(indent, "NESTED PATH ")
+                    .append(formatExpression(node.getJsonPath()));
+            node.getPathName().ifPresent(name ->
+                    builder.append(" AS ")
+                            .append(formatName(name)));
+            builder.append("\n");
+            appendJsonTableColumns(node.getColumns(), indent + 1);
+            return null;
+        }
+
+        @Override
+        protected Void visitJsonTableDefaultPlan(JsonTableDefaultPlan node, Integer indent)
+        {
+            builder.append(node.getParentChild().name())
+                    .append(", ")
+                    .append(node.getSiblings().name());
+            return null;
+        }
+
+        @Override
+        protected Void visitPlanParentChild(PlanParentChild node, Integer indent)
+        {
+            process(node.getParent());
+            builder.append(" ")
+                    .append(node.getType().name())
+                    .append(" (");
+            process(node.getChild());
+            builder.append(")");
+            return null;
+        }
+
+        @Override
+        protected Void visitPlanSiblings(PlanSiblings node, Integer context)
+        {
+            for (int i = 0; i < node.getSiblings().size() - 1; i++) {
+                builder.append("(");
+                process(node.getSiblings().get(i));
+                builder.append(") ")
+                        .append(node.getType().name())
+                        .append(" ");
+            }
+            builder.append("(");
+            process(node.getSiblings().get(node.getSiblings().size() - 1));
+            builder.append(")");
+            return null;
+        }
+
+        @Override
+        protected Void visitPlanLeaf(PlanLeaf node, Integer context)
+        {
+            builder.append(formatName(node.getName()));
+            return null;
+        }
+
         @Override
         protected Void visitLateral(Lateral node, Integer indent)
         {
@@ -415,6 +606,21 @@ protected Void visitExecute(Execute node, Integer indent)
             return null;
         }
 
+        @Override
+        protected Void visitExecuteImmediate(ExecuteImmediate node, Integer indent)
+        {
+            append(indent, "EXECUTE IMMEDIATE\n")
+                    .append(formatStringLiteral(node.getStatement().getValue()));
+            List<Expression> parameters = node.getParameters();
+            if (!parameters.isEmpty()) {
+                builder.append("\nUSING ");
+                builder.append(parameters.stream()
+                        .map(SqlFormatter::formatExpression)
+                        .collect(joining(", ")));
+            }
+            return null;
+        }
+
         @Override
         protected Void visitDescribeOutput(DescribeOutput node, Integer indent)
         {
@@ -434,6 +640,18 @@ protected Void visitDescribeInput(DescribeInput node, Integer indent)
         @Override
         protected Void visitQuery(Query node, Integer indent)
         {
+            if (!node.getFunctions().isEmpty()) {
+                builder.append("WITH\n");
+                Iterator<FunctionSpecification> functions = node.getFunctions().iterator();
+                while (functions.hasNext()) {
+                    process(functions.next(), indent + 1);
+                    if (functions.hasNext()) {
+                        builder.append(',');
+                    }
+                    builder.append('\n');
+                }
+            }
+
             node.getWith().ifPresent(with -> {
                 append(indent, "WITH");
                 if (with.isRecursive()) {
@@ -690,24 +908,14 @@ protected Void visitPatternRecognitionRelation(PatternRecognitionRelation node,
             }
 
             node.getRowsPerMatch().ifPresent(rowsPerMatch -> {
-                String rowsPerMatchDescription;
-                switch (rowsPerMatch) {
-                    case ONE:
-                        rowsPerMatchDescription = "ONE ROW PER MATCH";
-                        break;
-                    case ALL_SHOW_EMPTY:
-                        rowsPerMatchDescription = "ALL ROWS PER MATCH SHOW EMPTY MATCHES";
-                        break;
-                    case ALL_OMIT_EMPTY:
-                        rowsPerMatchDescription = "ALL ROWS PER MATCH OMIT EMPTY MATCHES";
-                        break;
-                    case ALL_WITH_UNMATCHED:
-                        rowsPerMatchDescription = "ALL ROWS PER MATCH WITH UNMATCHED ROWS";
-                        break;
-                    default:
-                        // RowsPerMatch of type WINDOW cannot occur in MATCH_RECOGNIZE clause
-                        throw new IllegalStateException("unexpected rowsPerMatch: " + node.getRowsPerMatch().get());
-                }
+                String rowsPerMatchDescription = switch (rowsPerMatch) {
+                    case ONE -> "ONE ROW PER MATCH";
+                    case ALL_SHOW_EMPTY -> "ALL ROWS PER MATCH SHOW EMPTY MATCHES";
+                    case ALL_OMIT_EMPTY -> "ALL ROWS PER MATCH OMIT EMPTY MATCHES";
+                    case ALL_WITH_UNMATCHED -> "ALL ROWS PER MATCH WITH UNMATCHED ROWS";
+                    default -> // RowsPerMatch of type WINDOW cannot occur in MATCH_RECOGNIZE clause
+                            throw new IllegalStateException("unexpected rowsPerMatch: " + node.getRowsPerMatch().get());
+                };
                 append(indent + 1, rowsPerMatchDescription)
                         .append("\n");
             });
@@ -1206,6 +1414,10 @@ protected Void visitShowFunctions(ShowFunctions node, Integer indent)
         {
             builder.append("SHOW FUNCTIONS");
 
+            node.getSchema().ifPresent(value -> builder
+                    .append(" FROM ")
+                    .append(formatName(value)));
+
             node.getLikePattern().ifPresent(value -> builder
                     .append(" LIKE ")
                     .append(formatStringLiteral(value)));
@@ -1335,8 +1547,12 @@ protected Void visitSetSchemaAuthorization(SetSchemaAuthorization node, Integer
         @Override
         protected Void visitCreateTableAsSelect(CreateTableAsSelect node, Integer indent)
         {
-            builder.append("CREATE TABLE ");
-            if (node.isNotExists()) {
+            builder.append("CREATE ");
+            if (node.getSaveMode() == REPLACE) {
+                builder.append("OR REPLACE ");
+            }
+            builder.append("TABLE ");
+            if (node.getSaveMode() == IGNORE) {
                 builder.append("IF NOT EXISTS ");
             }
             builder.append(formatName(node.getName()));
@@ -1365,8 +1581,12 @@ protected Void visitCreateTableAsSelect(CreateTableAsSelect node, Integer indent
         @Override
         protected Void visitCreateTable(CreateTable node, Integer indent)
         {
-            builder.append("CREATE TABLE ");
-            if (node.isNotExists()) {
+            builder.append("CREATE ");
+            if (node.getSaveMode() == REPLACE) {
+                builder.append("OR REPLACE ");
+            }
+            builder.append("TABLE ");
+            if (node.getSaveMode() == IGNORE) {
                 builder.append("IF NOT EXISTS ");
             }
             String tableName = formatName(node.getName());
@@ -1449,27 +1669,19 @@ private String formatColumnDefinition(ColumnDefinition column)
         private static String formatGrantor(GrantorSpecification grantor)
         {
             GrantorSpecification.Type type = grantor.getType();
-            switch (type) {
-                case CURRENT_ROLE:
-                case CURRENT_USER:
-                    return type.name();
-                case PRINCIPAL:
-                    return formatPrincipal(grantor.getPrincipal().get());
-            }
-            throw new IllegalArgumentException("Unsupported principal type: " + type);
+            return switch (type) {
+                case CURRENT_ROLE, CURRENT_USER -> type.name();
+                case PRINCIPAL -> formatPrincipal(grantor.getPrincipal().get());
+            };
         }
 
         private static String formatPrincipal(PrincipalSpecification principal)
         {
             PrincipalSpecification.Type type = principal.getType();
-            switch (type) {
-                case UNSPECIFIED:
-                    return principal.getName().toString();
-                case USER:
-                case ROLE:
-                    return type.name() + " " + principal.getName();
-            }
-            throw new IllegalArgumentException("Unsupported principal type: " + type);
+            return switch (type) {
+                case UNSPECIFIED -> principal.getName().toString();
+                case USER, ROLE -> type.name() + " " + principal.getName();
+            };
         }
 
         @Override
@@ -1503,16 +1715,11 @@ protected Void visitSetProperties(SetProperties node, Integer context)
         {
             SetProperties.Type type = node.getType();
             builder.append("ALTER ");
-            switch (type) {
-                case TABLE:
-                    builder.append("TABLE ");
-                    break;
-                case MATERIALIZED_VIEW:
-                    builder.append("MATERIALIZED VIEW ");
-                    break;
-                default:
-                    throw new IllegalArgumentException("Unsupported SetProperties.Type: " + type);
-            }
+            builder.append(switch (type) {
+                case TABLE -> "TABLE ";
+                case MATERIALIZED_VIEW -> "MATERIALIZED VIEW ";
+            });
+
             builder.append(formatName(node.getName()))
                     .append(" SET PROPERTIES ")
                     .append(joinProperties(node.getProperties()));
@@ -1535,26 +1742,13 @@ protected Void visitComment(Comment node, Integer context)
                     .map(ExpressionFormatter::formatStringLiteral)
                     .orElse("NULL");
 
-            switch (node.getType()) {
-                case TABLE:
-                    builder.append("COMMENT ON TABLE ")
-                            .append(formatName(node.getName()))
-                            .append(" IS ")
-                            .append(comment);
-                    break;
-                case VIEW:
-                    builder.append("COMMENT ON VIEW ")
-                            .append(formatName(node.getName()))
-                            .append(" IS ")
-                            .append(comment);
-                    break;
-                case COLUMN:
-                    builder.append("COMMENT ON COLUMN ")
-                            .append(formatName(node.getName()))
-                            .append(" IS ")
-                            .append(comment);
-                    break;
-            }
+            String type = switch (node.getType()) {
+                case TABLE -> "TABLE";
+                case VIEW -> "VIEW";
+                case COLUMN -> "COLUMN";
+            };
+
+            builder.append("COMMENT ON " + type + " " + formatName(node.getName()) + " IS " + comment);
 
             return null;
         }
@@ -1740,6 +1934,21 @@ public Void visitResetSession(ResetSession node, Integer indent)
             return null;
         }
 
+        @Override
+        protected Void visitSetSessionAuthorization(SetSessionAuthorization node, Integer context)
+        {
+            builder.append("SET SESSION AUTHORIZATION ");
+            builder.append(formatExpression(node.getUser()));
+            return null;
+        }
+
+        @Override
+        protected Void visitResetSessionAuthorization(ResetSessionAuthorization node, Integer context)
+        {
+            builder.append("RESET SESSION AUTHORIZATION");
+            return null;
+        }
+
         @Override
         protected Void visitCallArgument(CallArgument node, Integer indent)
         {
@@ -1908,17 +2117,10 @@ protected Void visitSetRole(SetRole node, Integer indent)
         {
             builder.append("SET ROLE ");
             SetRole.Type type = node.getType();
-            switch (type) {
-                case ALL:
-                case NONE:
-                    builder.append(type.name());
-                    break;
-                case ROLE:
-                    builder.append(formatName(node.getRole().get()));
-                    break;
-                default:
-                    throw new IllegalArgumentException("Unsupported type: " + type);
-            }
+            builder.append(switch (type) {
+                case ALL, NONE -> type.name();
+                case ROLE -> formatName(node.getRole().get());
+            });
             node.getCatalog().ifPresent(catalog -> builder
                     .append(" IN ")
                     .append(formatName(catalog)));
@@ -1931,7 +2133,7 @@ public Void visitGrant(Grant node, Integer indent)
             builder.append("GRANT ");
 
             builder.append(node.getPrivileges()
-                    .map(privileges -> String.join(", ", privileges))
+                    .map(privileges -> join(", ", privileges))
                     .orElse("ALL PRIVILEGES"));
 
             builder.append(" ON ");
@@ -1954,7 +2156,7 @@ public Void visitDeny(Deny node, Integer indent)
             builder.append("DENY ");
 
             if (node.getPrivileges().isPresent()) {
-                builder.append(String.join(", ", node.getPrivileges().get()));
+                builder.append(join(", ", node.getPrivileges().get()));
             }
             else {
                 builder.append("ALL PRIVILEGES");
@@ -1982,7 +2184,7 @@ public Void visitRevoke(Revoke node, Integer indent)
             }
 
             builder.append(node.getPrivileges()
-                    .map(privileges -> String.join(", ", privileges))
+                    .map(privileges -> join(", ", privileges))
                     .orElse("ALL PRIVILEGES"));
 
             builder.append(" ON ");
@@ -2053,6 +2255,301 @@ public Void visitSetTimeZone(SetTimeZone node, Integer indent)
             return null;
         }
 
+        @Override
+        protected Void visitCreateFunction(CreateFunction node, Integer indent)
+        {
+            builder.append("CREATE ");
+            if (node.isReplace()) {
+                builder.append("OR REPLACE ");
+            }
+            process(node.getSpecification(), indent);
+            return null;
+        }
+
+        @Override
+        protected Void visitDropFunction(DropFunction node, Integer indent)
+        {
+            builder.append("DROP FUNCTION ");
+            if (node.isExists()) {
+                builder.append("IF EXISTS ");
+            }
+            builder.append(formatName(node.getName()));
+            processParameters(node.getParameters(), indent);
+            return null;
+        }
+
+        @Override
+        protected Void visitFunctionSpecification(FunctionSpecification node, Integer indent)
+        {
+            append(indent, "FUNCTION ")
+                    .append(formatName(node.getName()));
+            processParameters(node.getParameters(), indent);
+            builder.append("\n");
+            process(node.getReturnsClause(), indent);
+            builder.append("\n");
+            for (RoutineCharacteristic characteristic : node.getRoutineCharacteristics()) {
+                process(characteristic, indent);
+                builder.append("\n");
+            }
+            process(node.getStatement(), indent);
+            return null;
+        }
+
+        @Override
+        protected Void visitParameterDeclaration(ParameterDeclaration node, Integer indent)
+        {
+            node.getName().ifPresent(value ->
+                    builder.append(formatName(value)).append(" "));
+            builder.append(formatExpression(node.getType()));
+            return null;
+        }
+
+        @Override
+        protected Void visitLanguageCharacteristic(LanguageCharacteristic node, Integer indent)
+        {
+            append(indent, "LANGUAGE ")
+                    .append(formatName(node.getLanguage()));
+            return null;
+        }
+
+        @Override
+        protected Void visitDeterministicCharacteristic(DeterministicCharacteristic node, Integer indent)
+        {
+            append(indent, (node.isDeterministic() ? "" : "NOT ") + "DETERMINISTIC");
+            return null;
+        }
+
+        @Override
+        protected Void visitNullInputCharacteristic(NullInputCharacteristic node, Integer indent)
+        {
+            if (node.isCalledOnNull()) {
+                append(indent, "CALLED ON NULL INPUT");
+            }
+            else {
+                append(indent, "RETURNS NULL ON NULL INPUT");
+            }
+            return null;
+        }
+
+        @Override
+        protected Void visitSecurityCharacteristic(SecurityCharacteristic node, Integer indent)
+        {
+            append(indent, "SECURITY ")
+                    .append(node.getSecurity().name());
+            return null;
+        }
+
+        @Override
+        protected Void visitCommentCharacteristic(CommentCharacteristic node, Integer indent)
+        {
+            append(indent, "COMMENT ")
+                    .append(formatStringLiteral(node.getComment()));
+            return null;
+        }
+
+        @Override
+        protected Void visitReturnClause(ReturnsClause node, Integer indent)
+        {
+            append(indent, "RETURNS ")
+                    .append(formatExpression(node.getReturnType()));
+            return null;
+        }
+
+        @Override
+        protected Void visitReturnStatement(ReturnStatement node, Integer indent)
+        {
+            append(indent, "RETURN ")
+                    .append(formatExpression(node.getValue()));
+            return null;
+        }
+
+        @Override
+        protected Void visitCompoundStatement(CompoundStatement node, Integer indent)
+        {
+            append(indent, "BEGIN\n");
+            for (VariableDeclaration variableDeclaration : node.getVariableDeclarations()) {
+                process(variableDeclaration, indent + 1);
+                builder.append(";\n");
+            }
+            for (ControlStatement statement : node.getStatements()) {
+                process(statement, indent + 1);
+                builder.append(";\n");
+            }
+            append(indent, "END");
+            return null;
+        }
+
+        @Override
+        protected Void visitVariableDeclaration(VariableDeclaration node, Integer indent)
+        {
+            append(indent, "DECLARE ")
+                    .append(node.getNames().stream()
+                            .map(SqlFormatter::formatName)
+                            .collect(joining(", ")))
+                    .append(" ")
+                    .append(formatExpression(node.getType()));
+            if (node.getDefaultValue().isPresent()) {
+                builder.append(" DEFAULT ")
+                        .append(formatExpression(node.getDefaultValue().get()));
+            }
+            return null;
+        }
+
+        @Override
+        protected Void visitAssignmentStatement(AssignmentStatement node, Integer indent)
+        {
+            append(indent, "SET ");
+            builder.append(formatName(node.getTarget()))
+                    .append(" = ")
+                    .append(formatExpression(node.getValue()));
+            return null;
+        }
+
+        @Override
+        protected Void visitCaseStatement(CaseStatement node, Integer indent)
+        {
+            append(indent, "CASE");
+            if (node.getExpression().isPresent()) {
+                builder.append(" ")
+                        .append(formatExpression(node.getExpression().get()));
+            }
+            builder.append("\n");
+            for (CaseStatementWhenClause whenClause : node.getWhenClauses()) {
+                process(whenClause, indent + 1);
+            }
+            if (node.getElseClause().isPresent()) {
+                process(node.getElseClause().get(), indent + 1);
+            }
+            append(indent, "END CASE");
+            return null;
+        }
+
+        @Override
+        protected Void visitCaseStatementWhenClause(CaseStatementWhenClause node, Integer indent)
+        {
+            append(indent, "WHEN ")
+                    .append(formatExpression(node.getExpression()))
+                    .append(" THEN\n");
+            for (ControlStatement statement : node.getStatements()) {
+                process(statement, indent + 1);
+                builder.append(";\n");
+            }
+            return null;
+        }
+
+        @Override
+        protected Void visitIfStatement(IfStatement node, Integer indent)
+        {
+            append(indent, "IF ")
+                    .append(formatExpression(node.getExpression()))
+                    .append(" THEN\n");
+            for (ControlStatement statement : node.getStatements()) {
+                process(statement, indent + 1);
+                builder.append(";\n");
+            }
+            for (ElseIfClause elseIfClause : node.getElseIfClauses()) {
+                process(elseIfClause, indent);
+            }
+            if (node.getElseClause().isPresent()) {
+                process(node.getElseClause().get(), indent);
+            }
+            append(indent, "END IF");
+            return null;
+        }
+
+        @Override
+        protected Void visitElseIfClause(ElseIfClause node, Integer indent)
+        {
+            append(indent, "ELSEIF ")
+                    .append(formatExpression(node.getExpression()))
+                    .append(" THEN\n");
+            for (ControlStatement statement : node.getStatements()) {
+                process(statement, indent + 1);
+                builder.append(";\n");
+            }
+            return null;
+        }
+
+        @Override
+        protected Void visitElseClause(ElseClause node, Integer indent)
+        {
+            append(indent, "ELSE\n");
+            for (ControlStatement statement : node.getStatements()) {
+                process(statement, indent + 1);
+                builder.append(";\n");
+            }
+            return null;
+        }
+
+        @Override
+        protected Void visitIterateStatement(IterateStatement node, Integer indent)
+        {
+            append(indent, "ITERATE ")
+                    .append(formatName(node.getLabel()));
+            return null;
+        }
+
+        @Override
+        protected Void visitLeaveStatement(LeaveStatement node, Integer indent)
+        {
+            append(indent, "LEAVE ")
+                    .append(formatName(node.getLabel()));
+            return null;
+        }
+
+        @Override
+        protected Void visitLoopStatement(LoopStatement node, Integer indent)
+        {
+            builder.append(indentString(indent));
+            appendBeginLabel(node.getLabel());
+            builder.append("LOOP\n");
+            for (ControlStatement statement : node.getStatements()) {
+                process(statement, indent + 1);
+                builder.append(";\n");
+            }
+            append(indent, "END LOOP");
+            return null;
+        }
+
+        @Override
+        protected Void visitWhileStatement(WhileStatement node, Integer indent)
+        {
+            builder.append(indentString(indent));
+            appendBeginLabel(node.getLabel());
+            builder.append("WHILE ")
+                    .append(formatExpression(node.getExpression()))
+                    .append(" DO\n");
+            for (ControlStatement statement : node.getStatements()) {
+                process(statement, indent + 1);
+                builder.append(";\n");
+            }
+            append(indent, "END WHILE");
+            return null;
+        }
+
+        @Override
+        protected Void visitRepeatStatement(RepeatStatement node, Integer indent)
+        {
+            builder.append(indentString(indent));
+            appendBeginLabel(node.getLabel());
+            builder.append("REPEAT\n");
+            for (ControlStatement statement : node.getStatements()) {
+                process(statement, indent + 1);
+                builder.append(";\n");
+            }
+            append(indent, "UNTIL ")
+                    .append(formatExpression(node.getCondition()))
+                    .append("\n");
+            append(indent, "END REPEAT");
+            return null;
+        }
+
+        private void appendBeginLabel(Optional<Identifier> label)
+        {
+            label.ifPresent(value ->
+                    builder.append(formatName(value)).append(": "));
+        }
+
         private void processRelation(Relation relation, Integer indent)
         {
             // TODO: handle this properly
@@ -2066,6 +2563,19 @@ private void processRelation(Relation relation, Integer indent)
             }
         }
 
+        private void processParameters(List<ParameterDeclaration> parameters, Integer indent)
+        {
+            builder.append("(");
+            Iterator<ParameterDeclaration> iterator = parameters.iterator();
+            while (iterator.hasNext()) {
+                process(iterator.next(), indent);
+                if (iterator.hasNext()) {
+                    builder.append(", ");
+                }
+            }
+            builder.append(")");
+        }
+
         private SqlBuilder append(int indent, String value)
         {
             return builder.append(indentString(indent))
diff --git a/core/trino-parser/src/main/java/io/trino/sql/jsonpath/PathParser.java b/core/trino-parser/src/main/java/io/trino/sql/jsonpath/PathParser.java
index 2e54556165d6..e3be63349577 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/jsonpath/PathParser.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/jsonpath/PathParser.java
@@ -13,9 +13,9 @@
  */
 package io.trino.sql.jsonpath;
 
-import io.trino.jsonpath.JsonPathBaseListener;
-import io.trino.jsonpath.JsonPathLexer;
-import io.trino.jsonpath.JsonPathParser;
+import io.trino.grammar.jsonpath.JsonPathBaseListener;
+import io.trino.grammar.jsonpath.JsonPathLexer;
+import io.trino.grammar.jsonpath.JsonPathParser;
 import io.trino.sql.jsonpath.tree.PathNode;
 import io.trino.sql.parser.ParsingException;
 import org.antlr.v4.runtime.BaseErrorListener;
@@ -28,12 +28,12 @@
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.atn.PredictionMode;
 import org.antlr.v4.runtime.misc.Pair;
-import org.antlr.v4.runtime.misc.ParseCancellationException;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 import java.util.Arrays;
 import java.util.List;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 public final class PathParser
@@ -44,8 +44,8 @@ public PathParser(Location startLocation)
     {
         requireNonNull(startLocation, "startLocation is null");
 
-        int pathStartLine = startLocation.line;
-        int pathStartColumn = startLocation.column;
+        int pathStartLine = startLocation.line();
+        int pathStartColumn = startLocation.column();
         this.errorListener = new BaseErrorListener()
         {
             @Override
@@ -83,7 +83,7 @@ public PathNode parseJsonPath(String path)
                 parser.getInterpreter().setPredictionMode(PredictionMode.SLL);
                 tree = parser.path();
             }
-            catch (ParseCancellationException ex) {
+            catch (ParsingException ex) {
                 // if we fail, parse with LL mode
                 tokenStream.seek(0); // rewind input stream
                 parser.reset();
@@ -135,33 +135,12 @@ public void exitNonReserved(JsonPathParser.NonReservedContext context)
         }
     }
 
-    public static class Location
+    public record Location(int line, int column)
     {
-        private final int line;
-        private final int column;
-
-        public Location(int line, int column)
-        {
-            if (line < 1) {
-                throw new IllegalArgumentException("line must be at least 1");
-            }
-
-            if (column < 0) {
-                throw new IllegalArgumentException("column must be at least 0");
-            }
-
-            this.line = line;
-            this.column = column;
-        }
-
-        public int getLine()
-        {
-            return line;
-        }
-
-        public int getColumn()
+        public Location
         {
-            return column;
+            checkArgument(line >= 1, "line must be at least 1");
+            checkArgument(column >= 0, "column must be at least 0");
         }
     }
 }
diff --git a/core/trino-parser/src/main/java/io/trino/sql/jsonpath/PathTreeBuilder.java b/core/trino-parser/src/main/java/io/trino/sql/jsonpath/PathTreeBuilder.java
index aa8475276fa7..1965c7d68822 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/jsonpath/PathTreeBuilder.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/jsonpath/PathTreeBuilder.java
@@ -14,8 +14,8 @@
 package io.trino.sql.jsonpath;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.jsonpath.JsonPathBaseVisitor;
-import io.trino.jsonpath.JsonPathParser;
+import io.trino.grammar.jsonpath.JsonPathBaseVisitor;
+import io.trino.grammar.jsonpath.JsonPathParser;
 import io.trino.sql.jsonpath.tree.AbsMethod;
 import io.trino.sql.jsonpath.tree.ArithmeticBinary;
 import io.trino.sql.jsonpath.tree.ArithmeticBinary.Operator;
@@ -27,6 +27,7 @@
 import io.trino.sql.jsonpath.tree.ConjunctionPredicate;
 import io.trino.sql.jsonpath.tree.ContextVariable;
 import io.trino.sql.jsonpath.tree.DatetimeMethod;
+import io.trino.sql.jsonpath.tree.DescendantMemberAccessor;
 import io.trino.sql.jsonpath.tree.DisjunctionPredicate;
 import io.trino.sql.jsonpath.tree.DoubleMethod;
 import io.trino.sql.jsonpath.tree.ExistsPredicate;
@@ -168,6 +169,20 @@ public PathNode visitWildcardMemberAccessor(JsonPathParser.WildcardMemberAccesso
         return new MemberAccessor(base, Optional.empty());
     }
 
+    @Override
+    public PathNode visitDescendantMemberAccessor(JsonPathParser.DescendantMemberAccessorContext context)
+    {
+        PathNode base = visit(context.accessorExpression());
+        String key;
+        if (context.stringLiteral() != null) {
+            key = unquote(context.stringLiteral().getText());
+        }
+        else {
+            key = context.identifier().getText();
+        }
+        return new DescendantMemberAccessor(base, key);
+    }
+
     @Override
     public PathNode visitArrayAccessor(JsonPathParser.ArrayAccessorContext context)
     {
diff --git a/core/trino-parser/src/main/java/io/trino/sql/jsonpath/tree/DescendantMemberAccessor.java b/core/trino-parser/src/main/java/io/trino/sql/jsonpath/tree/DescendantMemberAccessor.java
new file mode 100644
index 000000000000..0fb57fdac6b2
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/jsonpath/tree/DescendantMemberAccessor.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed 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 io.trino.sql.jsonpath.tree;
+
+import static java.util.Objects.requireNonNull;
+
+public class DescendantMemberAccessor
+        extends Accessor
+{
+    private final String key;
+
+    public DescendantMemberAccessor(PathNode base, String key)
+    {
+        super(base);
+        this.key = requireNonNull(key, "key is null");
+    }
+
+    @Override
+    public <R, C> R accept(JsonPathTreeVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitDescendantMemberAccessor(this, context);
+    }
+
+    public String getKey()
+    {
+        return key;
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/jsonpath/tree/JsonPathTreeVisitor.java b/core/trino-parser/src/main/java/io/trino/sql/jsonpath/tree/JsonPathTreeVisitor.java
index beabf01e56f1..0249c0b050e1 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/jsonpath/tree/JsonPathTreeVisitor.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/jsonpath/tree/JsonPathTreeVisitor.java
@@ -13,7 +13,7 @@
  */
 package io.trino.sql.jsonpath.tree;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 public abstract class JsonPathTreeVisitor<R, C>
 {
@@ -82,6 +82,11 @@ protected R visitDatetimeMethod(DatetimeMethod node, C context)
         return visitMethod(node, context);
     }
 
+    protected R visitDescendantMemberAccessor(DescendantMemberAccessor node, C context)
+    {
+        return visitAccessor(node, context);
+    }
+
     protected R visitDisjunctionPredicate(DisjunctionPredicate node, C context)
     {
         return visitPredicate(node, context);
diff --git a/core/trino-parser/src/main/java/io/trino/sql/parser/AstBuilder.java b/core/trino-parser/src/main/java/io/trino/sql/parser/AstBuilder.java
index 8cbdcce8b3b6..b2581d57cfb8 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/parser/AstBuilder.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/parser/AstBuilder.java
@@ -17,8 +17,11 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
-import io.trino.sql.parser.SqlBaseParser.CreateCatalogContext;
-import io.trino.sql.parser.SqlBaseParser.DropCatalogContext;
+import io.trino.grammar.sql.SqlBaseBaseVisitor;
+import io.trino.grammar.sql.SqlBaseLexer;
+import io.trino.grammar.sql.SqlBaseParser;
+import io.trino.grammar.sql.SqlBaseParser.CreateCatalogContext;
+import io.trino.grammar.sql.SqlBaseParser.DropCatalogContext;
 import io.trino.sql.tree.AddColumn;
 import io.trino.sql.tree.AliasedRelation;
 import io.trino.sql.tree.AllColumns;
@@ -28,6 +31,7 @@
 import io.trino.sql.tree.ArithmeticBinaryExpression;
 import io.trino.sql.tree.ArithmeticUnaryExpression;
 import io.trino.sql.tree.Array;
+import io.trino.sql.tree.AssignmentStatement;
 import io.trino.sql.tree.AtTimeZone;
 import io.trino.sql.tree.BetweenPredicate;
 import io.trino.sql.tree.BinaryLiteral;
@@ -35,21 +39,26 @@
 import io.trino.sql.tree.BooleanLiteral;
 import io.trino.sql.tree.Call;
 import io.trino.sql.tree.CallArgument;
+import io.trino.sql.tree.CaseStatement;
+import io.trino.sql.tree.CaseStatementWhenClause;
 import io.trino.sql.tree.Cast;
 import io.trino.sql.tree.CharLiteral;
 import io.trino.sql.tree.CoalesceExpression;
 import io.trino.sql.tree.ColumnDefinition;
 import io.trino.sql.tree.Comment;
+import io.trino.sql.tree.CommentCharacteristic;
 import io.trino.sql.tree.Commit;
 import io.trino.sql.tree.ComparisonExpression;
+import io.trino.sql.tree.CompoundStatement;
+import io.trino.sql.tree.ControlStatement;
 import io.trino.sql.tree.CreateCatalog;
+import io.trino.sql.tree.CreateFunction;
 import io.trino.sql.tree.CreateMaterializedView;
 import io.trino.sql.tree.CreateRole;
 import io.trino.sql.tree.CreateSchema;
 import io.trino.sql.tree.CreateTable;
 import io.trino.sql.tree.CreateTableAsSelect;
 import io.trino.sql.tree.CreateView;
-import io.trino.sql.tree.Cube;
 import io.trino.sql.tree.CurrentCatalog;
 import io.trino.sql.tree.CurrentPath;
 import io.trino.sql.tree.CurrentSchema;
@@ -67,20 +76,25 @@
 import io.trino.sql.tree.DescribeOutput;
 import io.trino.sql.tree.Descriptor;
 import io.trino.sql.tree.DescriptorField;
+import io.trino.sql.tree.DeterministicCharacteristic;
 import io.trino.sql.tree.DoubleLiteral;
 import io.trino.sql.tree.DropCatalog;
 import io.trino.sql.tree.DropColumn;
+import io.trino.sql.tree.DropFunction;
 import io.trino.sql.tree.DropMaterializedView;
 import io.trino.sql.tree.DropRole;
 import io.trino.sql.tree.DropSchema;
 import io.trino.sql.tree.DropTable;
 import io.trino.sql.tree.DropView;
+import io.trino.sql.tree.ElseClause;
+import io.trino.sql.tree.ElseIfClause;
 import io.trino.sql.tree.EmptyPattern;
 import io.trino.sql.tree.EmptyTableTreatment;
 import io.trino.sql.tree.EmptyTableTreatment.Treatment;
 import io.trino.sql.tree.Except;
 import io.trino.sql.tree.ExcludedPattern;
 import io.trino.sql.tree.Execute;
+import io.trino.sql.tree.ExecuteImmediate;
 import io.trino.sql.tree.ExistsPredicate;
 import io.trino.sql.tree.Explain;
 import io.trino.sql.tree.ExplainAnalyze;
@@ -94,6 +108,7 @@
 import io.trino.sql.tree.FrameBound;
 import io.trino.sql.tree.FunctionCall;
 import io.trino.sql.tree.FunctionCall.NullTreatment;
+import io.trino.sql.tree.FunctionSpecification;
 import io.trino.sql.tree.GenericDataType;
 import io.trino.sql.tree.GenericLiteral;
 import io.trino.sql.tree.Grant;
@@ -106,6 +121,7 @@
 import io.trino.sql.tree.GroupingSets;
 import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.IfExpression;
+import io.trino.sql.tree.IfStatement;
 import io.trino.sql.tree.InListExpression;
 import io.trino.sql.tree.InPredicate;
 import io.trino.sql.tree.Insert;
@@ -115,6 +131,7 @@
 import io.trino.sql.tree.IsNotNullPredicate;
 import io.trino.sql.tree.IsNullPredicate;
 import io.trino.sql.tree.Isolation;
+import io.trino.sql.tree.IterateStatement;
 import io.trino.sql.tree.Join;
 import io.trino.sql.tree.JoinCriteria;
 import io.trino.sql.tree.JoinOn;
@@ -128,15 +145,25 @@
 import io.trino.sql.tree.JsonPathParameter;
 import io.trino.sql.tree.JsonPathParameter.JsonFormat;
 import io.trino.sql.tree.JsonQuery;
+import io.trino.sql.tree.JsonTable;
+import io.trino.sql.tree.JsonTableColumnDefinition;
+import io.trino.sql.tree.JsonTableDefaultPlan;
+import io.trino.sql.tree.JsonTablePlan;
+import io.trino.sql.tree.JsonTablePlan.ParentChildPlanType;
+import io.trino.sql.tree.JsonTablePlan.SiblingsPlanType;
+import io.trino.sql.tree.JsonTableSpecificPlan;
 import io.trino.sql.tree.JsonValue;
 import io.trino.sql.tree.LambdaArgumentDeclaration;
 import io.trino.sql.tree.LambdaExpression;
+import io.trino.sql.tree.LanguageCharacteristic;
 import io.trino.sql.tree.Lateral;
+import io.trino.sql.tree.LeaveStatement;
 import io.trino.sql.tree.LikeClause;
 import io.trino.sql.tree.LikePredicate;
 import io.trino.sql.tree.Limit;
 import io.trino.sql.tree.LogicalExpression;
 import io.trino.sql.tree.LongLiteral;
+import io.trino.sql.tree.LoopStatement;
 import io.trino.sql.tree.MeasureDefinition;
 import io.trino.sql.tree.Merge;
 import io.trino.sql.tree.MergeCase;
@@ -144,16 +171,20 @@
 import io.trino.sql.tree.MergeInsert;
 import io.trino.sql.tree.MergeUpdate;
 import io.trino.sql.tree.NaturalJoin;
+import io.trino.sql.tree.NestedColumns;
 import io.trino.sql.tree.Node;
 import io.trino.sql.tree.NodeLocation;
 import io.trino.sql.tree.NotExpression;
 import io.trino.sql.tree.NullIfExpression;
+import io.trino.sql.tree.NullInputCharacteristic;
 import io.trino.sql.tree.NullLiteral;
 import io.trino.sql.tree.NumericParameter;
 import io.trino.sql.tree.Offset;
 import io.trino.sql.tree.OneOrMoreQuantifier;
 import io.trino.sql.tree.OrderBy;
+import io.trino.sql.tree.OrdinalityColumn;
 import io.trino.sql.tree.Parameter;
+import io.trino.sql.tree.ParameterDeclaration;
 import io.trino.sql.tree.PathElement;
 import io.trino.sql.tree.PathSpecification;
 import io.trino.sql.tree.PatternAlternation;
@@ -164,6 +195,9 @@
 import io.trino.sql.tree.PatternRecognitionRelation.RowsPerMatch;
 import io.trino.sql.tree.PatternSearchMode;
 import io.trino.sql.tree.PatternVariable;
+import io.trino.sql.tree.PlanLeaf;
+import io.trino.sql.tree.PlanParentChild;
+import io.trino.sql.tree.PlanSiblings;
 import io.trino.sql.tree.Prepare;
 import io.trino.sql.tree.PrincipalSpecification;
 import io.trino.sql.tree.ProcessingMode;
@@ -173,6 +207,7 @@
 import io.trino.sql.tree.QuantifiedPattern;
 import io.trino.sql.tree.Query;
 import io.trino.sql.tree.QueryBody;
+import io.trino.sql.tree.QueryColumn;
 import io.trino.sql.tree.QueryPeriod;
 import io.trino.sql.tree.QuerySpecification;
 import io.trino.sql.tree.RangeQuantifier;
@@ -183,16 +218,22 @@
 import io.trino.sql.tree.RenameSchema;
 import io.trino.sql.tree.RenameTable;
 import io.trino.sql.tree.RenameView;
+import io.trino.sql.tree.RepeatStatement;
 import io.trino.sql.tree.ResetSession;
+import io.trino.sql.tree.ResetSessionAuthorization;
+import io.trino.sql.tree.ReturnStatement;
+import io.trino.sql.tree.ReturnsClause;
 import io.trino.sql.tree.Revoke;
 import io.trino.sql.tree.RevokeRoles;
 import io.trino.sql.tree.Rollback;
-import io.trino.sql.tree.Rollup;
+import io.trino.sql.tree.RoutineCharacteristic;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.RowDataType;
 import io.trino.sql.tree.RowPattern;
 import io.trino.sql.tree.SampledRelation;
+import io.trino.sql.tree.SaveMode;
 import io.trino.sql.tree.SearchedCaseExpression;
+import io.trino.sql.tree.SecurityCharacteristic;
 import io.trino.sql.tree.Select;
 import io.trino.sql.tree.SelectItem;
 import io.trino.sql.tree.SetColumnType;
@@ -201,6 +242,7 @@
 import io.trino.sql.tree.SetRole;
 import io.trino.sql.tree.SetSchemaAuthorization;
 import io.trino.sql.tree.SetSession;
+import io.trino.sql.tree.SetSessionAuthorization;
 import io.trino.sql.tree.SetTableAuthorization;
 import io.trino.sql.tree.SetTimeZone;
 import io.trino.sql.tree.SetViewAuthorization;
@@ -246,9 +288,12 @@
 import io.trino.sql.tree.Update;
 import io.trino.sql.tree.UpdateAssignment;
 import io.trino.sql.tree.Use;
+import io.trino.sql.tree.ValueColumn;
 import io.trino.sql.tree.Values;
+import io.trino.sql.tree.VariableDeclaration;
 import io.trino.sql.tree.VariableDefinition;
 import io.trino.sql.tree.WhenClause;
+import io.trino.sql.tree.WhileStatement;
 import io.trino.sql.tree.Window;
 import io.trino.sql.tree.WindowDefinition;
 import io.trino.sql.tree.WindowFrame;
@@ -272,12 +317,16 @@
 import java.util.Optional;
 import java.util.function.Function;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.sql.parser.SqlBaseParser.TIME;
-import static io.trino.sql.parser.SqlBaseParser.TIMESTAMP;
+import static io.trino.grammar.sql.SqlBaseParser.TIME;
+import static io.trino.grammar.sql.SqlBaseParser.TIMESTAMP;
 import static io.trino.sql.tree.AnchorPattern.Type.PARTITION_END;
 import static io.trino.sql.tree.AnchorPattern.Type.PARTITION_START;
+import static io.trino.sql.tree.GroupingSets.Type.CUBE;
+import static io.trino.sql.tree.GroupingSets.Type.EXPLICIT;
+import static io.trino.sql.tree.GroupingSets.Type.ROLLUP;
 import static io.trino.sql.tree.JsonExists.ErrorBehavior.ERROR;
 import static io.trino.sql.tree.JsonExists.ErrorBehavior.FALSE;
 import static io.trino.sql.tree.JsonExists.ErrorBehavior.TRUE;
@@ -302,6 +351,9 @@
 import static io.trino.sql.tree.PatternSearchMode.Mode.SEEK;
 import static io.trino.sql.tree.ProcessingMode.Mode.FINAL;
 import static io.trino.sql.tree.ProcessingMode.Mode.RUNNING;
+import static io.trino.sql.tree.SaveMode.FAIL;
+import static io.trino.sql.tree.SaveMode.IGNORE;
+import static io.trino.sql.tree.SaveMode.REPLACE;
 import static io.trino.sql.tree.SkipTo.skipPastLastRow;
 import static io.trino.sql.tree.SkipTo.skipToFirst;
 import static io.trino.sql.tree.SkipTo.skipToLast;
@@ -317,11 +369,11 @@ class AstBuilder
         extends SqlBaseBaseVisitor<Node>
 {
     private int parameterPosition;
-    private final ParsingOptions parsingOptions;
+    private final Optional<NodeLocation> baseLocation;
 
-    AstBuilder(ParsingOptions parsingOptions)
+    AstBuilder(Optional<NodeLocation> baseLocation)
     {
-        this.parsingOptions = requireNonNull(parsingOptions, "parsingOptions is null");
+        this.baseLocation = requireNonNull(baseLocation, "location is null");
     }
 
     @Override
@@ -354,6 +406,12 @@ public Node visitStandaloneRowPattern(SqlBaseParser.StandaloneRowPatternContext
         return visit(context.rowPattern());
     }
 
+    @Override
+    public Node visitStandaloneFunctionSpecification(SqlBaseParser.StandaloneFunctionSpecificationContext context)
+    {
+        return visit(context.functionSpecification());
+    }
+
     // ******************* statements **********************
 
     @Override
@@ -452,6 +510,23 @@ public Node visitSetSchemaAuthorization(SqlBaseParser.SetSchemaAuthorizationCont
                 getPrincipalSpecification(context.principal()));
     }
 
+    private static SaveMode toSaveMode(TerminalNode replace, TerminalNode exists)
+    {
+        boolean isReplace = replace != null;
+        boolean isNotExists = exists != null;
+        checkArgument(!(isReplace && isNotExists), "'OR REPLACE' and 'IF NOT EXISTS' clauses can not be used together");
+
+        if (isReplace) {
+            return REPLACE;
+        }
+
+        if (isNotExists) {
+            return IGNORE;
+        }
+
+        return FAIL;
+    }
+
     @Override
     public Node visitCreateTableAsSelect(SqlBaseParser.CreateTableAsSelectContext context)
     {
@@ -470,11 +545,15 @@ public Node visitCreateTableAsSelect(SqlBaseParser.CreateTableAsSelectContext co
             properties = visit(context.properties().propertyAssignments().property(), Property.class);
         }
 
+        if (context.REPLACE() != null && context.EXISTS() != null) {
+            throw parseError("'OR REPLACE' and 'IF NOT EXISTS' clauses can not be used together", context);
+        }
+
         return new CreateTableAsSelect(
                 getLocation(context),
                 getQualifiedName(context.qualifiedName()),
-                (Query) visit(context.query()),
-                context.EXISTS() != null,
+                (Query) visit(context.rootQuery()),
+                toSaveMode(context.REPLACE(), context.EXISTS()),
                 properties,
                 context.NO() == null,
                 columnAliases,
@@ -492,11 +571,14 @@ public Node visitCreateTable(SqlBaseParser.CreateTableContext context)
         if (context.properties() != null) {
             properties = visit(context.properties().propertyAssignments().property(), Property.class);
         }
+        if (context.REPLACE() != null && context.EXISTS() != null) {
+            throw parseError("'OR REPLACE' and 'IF NOT EXISTS' clauses can not be used together", context);
+        }
         return new CreateTable(
                 getLocation(context),
                 getQualifiedName(context.qualifiedName()),
                 visit(context.tableElement(), TableElement.class),
-                context.EXISTS() != null,
+                toSaveMode(context.REPLACE(), context.EXISTS()),
                 properties,
                 comment);
     }
@@ -522,7 +604,7 @@ public Node visitCreateMaterializedView(SqlBaseParser.CreateMaterializedViewCont
         return new CreateMaterializedView(
                 Optional.of(getLocation(context)),
                 getQualifiedName(context.qualifiedName()),
-                (Query) visit(context.query()),
+                (Query) visit(context.rootQuery()),
                 context.REPLACE() != null,
                 context.EXISTS() != null,
                 gracePeriod,
@@ -574,7 +656,7 @@ public Node visitInsertInto(SqlBaseParser.InsertIntoContext context)
         return new Insert(
                 new Table(getQualifiedName(context.qualifiedName())),
                 columnAliases,
-                (Query) visit(context.query()));
+                (Query) visit(context.rootQuery()));
     }
 
     @Override
@@ -630,17 +712,10 @@ public Node visitMergeInsert(SqlBaseParser.MergeInsertContext context)
         return new MergeInsert(
                 getLocation(context),
                 visitIfPresent(context.condition, Expression.class),
-                visitIdentifiers(context.targets),
+                visit(context.targets, Identifier.class),
                 visit(context.values, Expression.class));
     }
 
-    private List<Identifier> visitIdentifiers(List<SqlBaseParser.IdentifierContext> identifiers)
-    {
-        return identifiers.stream()
-                .map(identifier -> (Identifier) visit(identifier))
-                .collect(toImmutableList());
-    }
-
     @Override
     public Node visitMergeUpdate(SqlBaseParser.MergeUpdateContext context)
     {
@@ -719,7 +794,7 @@ public Node visitRenameColumn(SqlBaseParser.RenameColumnContext context)
         return new RenameColumn(
                 getLocation(context),
                 getQualifiedName(context.tableName),
-                (Identifier) visit(context.from),
+                getQualifiedName(context.from),
                 (Identifier) visit(context.to),
                 context.EXISTS().stream().anyMatch(node -> node.getSymbol().getTokenIndex() < context.COLUMN().getSymbol().getTokenIndex()),
                 context.EXISTS().stream().anyMatch(node -> node.getSymbol().getTokenIndex() > context.COLUMN().getSymbol().getTokenIndex()));
@@ -754,7 +829,7 @@ public Node visitSetColumnType(SqlBaseParser.SetColumnTypeContext context)
         return new SetColumnType(
                 getLocation(context),
                 getQualifiedName(context.tableName),
-                (Identifier) visit(context.columnName),
+                getQualifiedName(context.columnName),
                 (DataType) visit(context.type()),
                 context.EXISTS() != null);
     }
@@ -813,7 +888,7 @@ else if (context.INVOKER() != null) {
         return new CreateView(
                 getLocation(context),
                 getQualifiedName(context.qualifiedName()),
-                (Query) visit(context.query()),
+                (Query) visit(context.rootQuery()),
                 context.REPLACE() != null,
                 comment,
                 security);
@@ -850,6 +925,25 @@ public Node visitSetMaterializedViewProperties(SqlBaseParser.SetMaterializedView
                 visit(context.propertyAssignments().property(), Property.class));
     }
 
+    @Override
+    public Node visitCreateFunction(SqlBaseParser.CreateFunctionContext context)
+    {
+        return new CreateFunction(
+                getLocation(context),
+                (FunctionSpecification) visit(context.functionSpecification()),
+                context.REPLACE() != null);
+    }
+
+    @Override
+    public Node visitDropFunction(SqlBaseParser.DropFunctionContext context)
+    {
+        return new DropFunction(
+                getLocation(context),
+                getQualifiedName(context.functionDeclaration().qualifiedName()),
+                visit(context.functionDeclaration().parameterDeclaration(), ParameterDeclaration.class),
+                context.EXISTS() != null);
+    }
+
     @Override
     public Node visitStartTransaction(SqlBaseParser.StartTransactionContext context)
     {
@@ -939,6 +1033,15 @@ public Node visitExecute(SqlBaseParser.ExecuteContext context)
                 visit(context.expression(), Expression.class));
     }
 
+    @Override
+    public Node visitExecuteImmediate(SqlBaseParser.ExecuteImmediateContext context)
+    {
+        return new ExecuteImmediate(
+                getLocation(context),
+                ((StringLiteral) visit(context.string())),
+                visit(context.expression(), Expression.class));
+    }
+
     @Override
     public Node visitDescribeOutput(SqlBaseParser.DescribeOutputContext context)
     {
@@ -970,6 +1073,24 @@ public Node visitProperty(SqlBaseParser.PropertyContext context)
 
     // ********************** query expressions ********************
 
+    @Override
+    public Node visitRootQuery(SqlBaseParser.RootQueryContext context)
+    {
+        Query query = (Query) visit(context.query());
+
+        return new Query(
+                getLocation(context),
+                Optional.ofNullable(context.withFunction())
+                        .map(SqlBaseParser.WithFunctionContext::functionSpecification)
+                        .map(contexts -> visit(contexts, FunctionSpecification.class))
+                        .orElseGet(ImmutableList::of),
+                query.getWith(),
+                query.getQueryBody(),
+                query.getOrderBy(),
+                query.getOffset(),
+                query.getLimit());
+    }
+
     @Override
     public Node visitQuery(SqlBaseParser.QueryContext context)
     {
@@ -977,6 +1098,7 @@ public Node visitQuery(SqlBaseParser.QueryContext context)
 
         return new Query(
                 getLocation(context),
+                ImmutableList.of(),
                 visitIfPresent(context.with(), With.class),
                 body.getQueryBody(),
                 body.getOrderBy(),
@@ -1072,6 +1194,7 @@ else if (context.limit.rowCount().INTEGER_VALUE() != null) {
 
             return new Query(
                     getLocation(context),
+                    ImmutableList.of(),
                     Optional.empty(),
                     new QuerySpecification(
                             getLocation(context),
@@ -1091,6 +1214,7 @@ else if (context.limit.rowCount().INTEGER_VALUE() != null) {
 
         return new Query(
                 getLocation(context),
+                ImmutableList.of(),
                 Optional.empty(),
                 term,
                 orderBy,
@@ -1145,19 +1269,23 @@ public Node visitSingleGroupingSet(SqlBaseParser.SingleGroupingSetContext contex
     @Override
     public Node visitRollup(SqlBaseParser.RollupContext context)
     {
-        return new Rollup(getLocation(context), visit(context.expression(), Expression.class));
+        return new GroupingSets(getLocation(context), ROLLUP, context.groupingSet().stream()
+                .map(groupingSet -> visit(groupingSet.expression(), Expression.class))
+                .collect(toList()));
     }
 
     @Override
     public Node visitCube(SqlBaseParser.CubeContext context)
     {
-        return new Cube(getLocation(context), visit(context.expression(), Expression.class));
+        return new GroupingSets(getLocation(context), CUBE, context.groupingSet().stream()
+                .map(groupingSet -> visit(groupingSet.expression(), Expression.class))
+                .collect(toList()));
     }
 
     @Override
     public Node visitMultipleGroupingSets(SqlBaseParser.MultipleGroupingSetsContext context)
     {
-        return new GroupingSets(getLocation(context), context.groupingSet().stream()
+        return new GroupingSets(getLocation(context), EXPLICIT, context.groupingSet().stream()
                 .map(groupingSet -> visit(groupingSet.expression(), Expression.class))
                 .collect(toList()));
     }
@@ -1195,16 +1323,12 @@ public Node visitSetOperation(SqlBaseParser.SetOperationContext context)
 
         boolean distinct = context.setQuantifier() == null || context.setQuantifier().DISTINCT() != null;
 
-        switch (context.operator.getType()) {
-            case SqlBaseLexer.UNION:
-                return new Union(getLocation(context.UNION()), ImmutableList.of(left, right), distinct);
-            case SqlBaseLexer.INTERSECT:
-                return new Intersect(getLocation(context.INTERSECT()), ImmutableList.of(left, right), distinct);
-            case SqlBaseLexer.EXCEPT:
-                return new Except(getLocation(context.EXCEPT()), left, right, distinct);
-        }
-
-        throw new IllegalArgumentException("Unsupported set operation: " + context.operator.getText());
+        return switch (context.operator.getType()) {
+            case SqlBaseLexer.UNION -> new Union(getLocation(context.UNION()), ImmutableList.of(left, right), distinct);
+            case SqlBaseLexer.INTERSECT -> new Intersect(getLocation(context.INTERSECT()), ImmutableList.of(left, right), distinct);
+            case SqlBaseLexer.EXCEPT -> new Except(getLocation(context.EXCEPT()), left, right, distinct);
+            default -> throw new IllegalArgumentException("Unsupported set operation: " + context.operator.getText());
+        };
     }
 
     @Override
@@ -1263,33 +1387,24 @@ public Node visitExplainAnalyze(SqlBaseParser.ExplainAnalyzeContext context)
     @Override
     public Node visitExplainFormat(SqlBaseParser.ExplainFormatContext context)
     {
-        switch (context.value.getType()) {
-            case SqlBaseLexer.GRAPHVIZ:
-                return new ExplainFormat(getLocation(context), ExplainFormat.Type.GRAPHVIZ);
-            case SqlBaseLexer.TEXT:
-                return new ExplainFormat(getLocation(context), ExplainFormat.Type.TEXT);
-            case SqlBaseLexer.JSON:
-                return new ExplainFormat(getLocation(context), ExplainFormat.Type.JSON);
-        }
-
-        throw new IllegalArgumentException("Unsupported EXPLAIN format: " + context.value.getText());
+        return switch (context.value.getType()) {
+            case SqlBaseLexer.GRAPHVIZ -> new ExplainFormat(getLocation(context), ExplainFormat.Type.GRAPHVIZ);
+            case SqlBaseLexer.TEXT -> new ExplainFormat(getLocation(context), ExplainFormat.Type.TEXT);
+            case SqlBaseLexer.JSON -> new ExplainFormat(getLocation(context), ExplainFormat.Type.JSON);
+            default -> throw new IllegalArgumentException("Unsupported EXPLAIN format: " + context.value.getText());
+        };
     }
 
     @Override
     public Node visitExplainType(SqlBaseParser.ExplainTypeContext context)
     {
-        switch (context.value.getType()) {
-            case SqlBaseLexer.LOGICAL:
-                return new ExplainType(getLocation(context), ExplainType.Type.LOGICAL);
-            case SqlBaseLexer.DISTRIBUTED:
-                return new ExplainType(getLocation(context), ExplainType.Type.DISTRIBUTED);
-            case SqlBaseLexer.VALIDATE:
-                return new ExplainType(getLocation(context), ExplainType.Type.VALIDATE);
-            case SqlBaseLexer.IO:
-                return new ExplainType(getLocation(context), ExplainType.Type.IO);
-        }
-
-        throw new IllegalArgumentException("Unsupported EXPLAIN type: " + context.value.getText());
+        return switch (context.value.getType()) {
+            case SqlBaseLexer.LOGICAL -> new ExplainType(getLocation(context), ExplainType.Type.LOGICAL);
+            case SqlBaseLexer.DISTRIBUTED -> new ExplainType(getLocation(context), ExplainType.Type.DISTRIBUTED);
+            case SqlBaseLexer.VALIDATE -> new ExplainType(getLocation(context), ExplainType.Type.VALIDATE);
+            case SqlBaseLexer.IO -> new ExplainType(getLocation(context), ExplainType.Type.IO);
+            default -> throw new IllegalArgumentException("Unsupported EXPLAIN type: " + context.value.getText());
+        };
     }
 
     @Override
@@ -1348,7 +1463,7 @@ public Node visitShowStats(SqlBaseParser.ShowStatsContext context)
     @Override
     public Node visitShowStatsForQuery(SqlBaseParser.ShowStatsForQueryContext context)
     {
-        Query query = (Query) visit(context.query());
+        Query query = (Query) visit(context.rootQuery());
         return new ShowStats(Optional.of(getLocation(context)), new TableSubquery(query));
     }
 
@@ -1374,6 +1489,8 @@ public Node visitShowCreateMaterializedView(SqlBaseParser.ShowCreateMaterialized
     public Node visitShowFunctions(SqlBaseParser.ShowFunctionsContext context)
     {
         return new ShowFunctions(getLocation(context),
+                Optional.ofNullable(context.qualifiedName())
+                        .map(this::getQualifiedName),
                 getTextIfPresent(context.pattern)
                         .map(AstBuilder::unquote),
                 getTextIfPresent(context.escape)
@@ -1402,6 +1519,23 @@ public Node visitResetSession(SqlBaseParser.ResetSessionContext context)
         return new ResetSession(getLocation(context), getQualifiedName(context.qualifiedName()));
     }
 
+    @Override
+    public Node visitSetSessionAuthorization(SqlBaseParser.SetSessionAuthorizationContext context)
+    {
+        if (context.authorizationUser() instanceof SqlBaseParser.IdentifierUserContext || context.authorizationUser() instanceof SqlBaseParser.StringUserContext) {
+            return new SetSessionAuthorization(getLocation(context), (Expression) visit(context.authorizationUser()));
+        }
+        else {
+            throw new IllegalArgumentException("Unsupported Session Authorization User: " + context.authorizationUser());
+        }
+    }
+
+    @Override
+    public Node visitResetSessionAuthorization(SqlBaseParser.ResetSessionAuthorizationContext context)
+    {
+        return new ResetSessionAuthorization(getLocation(context));
+    }
+
     @Override
     public Node visitCreateRole(SqlBaseParser.CreateRoleContext context)
     {
@@ -1620,8 +1754,7 @@ public Node visitLogicalNot(SqlBaseParser.LogicalNotContext context)
     public Node visitOr(SqlBaseParser.OrContext context)
     {
         List<ParserRuleContext> terms = flatten(context, element -> {
-            if (element instanceof SqlBaseParser.OrContext) {
-                SqlBaseParser.OrContext or = (SqlBaseParser.OrContext) element;
+            if (element instanceof SqlBaseParser.OrContext or) {
                 return Optional.of(or.booleanExpression());
             }
 
@@ -1635,8 +1768,7 @@ public Node visitOr(SqlBaseParser.OrContext context)
     public Node visitAnd(SqlBaseParser.AndContext context)
     {
         List<ParserRuleContext> terms = flatten(context, element -> {
-            if (element instanceof SqlBaseParser.AndContext) {
-                SqlBaseParser.AndContext and = (SqlBaseParser.AndContext) element;
+            if (element instanceof SqlBaseParser.AndContext and) {
                 return Optional.of(and.booleanExpression());
             }
 
@@ -2150,14 +2282,11 @@ public Node visitArithmeticUnary(SqlBaseParser.ArithmeticUnaryContext context)
     {
         Expression child = (Expression) visit(context.valueExpression());
 
-        switch (context.operator.getType()) {
-            case SqlBaseLexer.MINUS:
-                return ArithmeticUnaryExpression.negative(getLocation(context), child);
-            case SqlBaseLexer.PLUS:
-                return ArithmeticUnaryExpression.positive(getLocation(context), child);
-            default:
-                throw new UnsupportedOperationException("Unsupported sign: " + context.operator.getText());
-        }
+        return switch (context.operator.getType()) {
+            case SqlBaseLexer.MINUS -> ArithmeticUnaryExpression.negative(getLocation(context), child);
+            case SqlBaseLexer.PLUS -> ArithmeticUnaryExpression.positive(getLocation(context), child);
+            default -> throw new UnsupportedOperationException("Unsupported sign: " + context.operator.getText());
+        };
     }
 
     @Override
@@ -2353,15 +2482,12 @@ public Node visitTrim(SqlBaseParser.TrimContext context)
 
     private static Trim.Specification toTrimSpecification(Token token)
     {
-        switch (token.getType()) {
-            case SqlBaseLexer.BOTH:
-                return Trim.Specification.BOTH;
-            case SqlBaseLexer.LEADING:
-                return Trim.Specification.LEADING;
-            case SqlBaseLexer.TRAILING:
-                return Trim.Specification.TRAILING;
-        }
-        throw new IllegalArgumentException("Unsupported trim specification: " + token.getText());
+        return switch (token.getType()) {
+            case SqlBaseLexer.BOTH -> Trim.Specification.BOTH;
+            case SqlBaseLexer.LEADING -> Trim.Specification.LEADING;
+            case SqlBaseLexer.TRAILING -> Trim.Specification.TRAILING;
+            default -> throw new IllegalArgumentException("Unsupported trim specification: " + token.getText());
+        };
     }
 
     @Override
@@ -2537,9 +2663,10 @@ public Node visitJsonPathInvocation(SqlBaseParser.JsonPathInvocationContext cont
         }
 
         StringLiteral jsonPath = (StringLiteral) visit(context.path);
+        Optional<Identifier> pathName = visitIfPresent(context.pathName, Identifier.class);
         List<JsonPathParameter> pathParameters = visit(context.jsonArgument(), JsonPathParameter.class);
 
-        return new JsonPathInvocation(Optional.of(getLocation(context)), jsonInput, inputFormat, jsonPath, pathParameters);
+        return new JsonPathInvocation(Optional.of(getLocation(context)), jsonInput, inputFormat, jsonPath, pathName, pathParameters);
     }
 
     private JsonFormat getJsonFormat(SqlBaseParser.JsonRepresentationContext context)
@@ -2903,7 +3030,7 @@ public Node visitColumnDefinition(SqlBaseParser.ColumnDefinitionContext context)
 
         return new ColumnDefinition(
                 getLocation(context),
-                (Identifier) visit(context.identifier()),
+                getQualifiedName(context.qualifiedName()),
                 (DataType) visit(context.type()),
                 nullable,
                 properties,
@@ -3173,15 +3300,7 @@ public Node visitIntegerLiteral(SqlBaseParser.IntegerLiteralContext context)
     @Override
     public Node visitDecimalLiteral(SqlBaseParser.DecimalLiteralContext context)
     {
-        switch (parsingOptions.getDecimalLiteralTreatment()) {
-            case AS_DOUBLE:
-                return new DoubleLiteral(getLocation(context), context.getText());
-            case AS_DECIMAL:
-                return new DecimalLiteral(getLocation(context), context.getText());
-            case REJECT:
-                throw new ParsingException("Unexpected decimal literal: " + context.getText());
-        }
-        throw new AssertionError("Unreachable");
+        return new DecimalLiteral(getLocation(context), context.getText());
     }
 
     @Override
@@ -3378,6 +3497,437 @@ public Node visitQueryPeriod(SqlBaseParser.QueryPeriodContext context)
         return new QueryPeriod(getLocation(context), type, marker);
     }
 
+    @Override
+    public Node visitJsonTable(SqlBaseParser.JsonTableContext context)
+    {
+        JsonPathInvocation jsonPathInvocation = (JsonPathInvocation) visit(context.jsonPathInvocation());
+        List<JsonTableColumnDefinition> columns = visit(context.jsonTableColumn(), JsonTableColumnDefinition.class);
+        Optional<JsonTablePlan> plan = visitIfPresent(context.jsonTableSpecificPlan(), JsonTablePlan.class);
+        if (!plan.isPresent()) {
+            plan = visitIfPresent(context.jsonTableDefaultPlan(), JsonTablePlan.class);
+        }
+        Optional<JsonTable.ErrorBehavior> errorBehavior = Optional.empty();
+        if (context.EMPTY() != null) {
+            errorBehavior = Optional.of(JsonTable.ErrorBehavior.EMPTY);
+        }
+        else if (context.ERROR(0) != null) {
+            errorBehavior = Optional.of(JsonTable.ErrorBehavior.ERROR);
+        }
+
+        return new JsonTable(getLocation(context), jsonPathInvocation, columns, plan, errorBehavior);
+    }
+
+    @Override
+    public Node visitOrdinalityColumn(SqlBaseParser.OrdinalityColumnContext context)
+    {
+        return new OrdinalityColumn(getLocation(context), (Identifier) visit(context.identifier()));
+    }
+
+    @Override
+    public Node visitValueColumn(SqlBaseParser.ValueColumnContext context)
+    {
+        JsonValue.EmptyOrErrorBehavior emptyBehavior;
+        Optional<Expression> emptyDefault = Optional.empty();
+        SqlBaseParser.JsonValueBehaviorContext emptyBehaviorContext = context.emptyBehavior;
+        if (emptyBehaviorContext == null || emptyBehaviorContext.NULL() != null) {
+            emptyBehavior = JsonValue.EmptyOrErrorBehavior.NULL;
+        }
+        else if (emptyBehaviorContext.ERROR() != null) {
+            emptyBehavior = JsonValue.EmptyOrErrorBehavior.ERROR;
+        }
+        else if (emptyBehaviorContext.DEFAULT() != null) {
+            emptyBehavior = JsonValue.EmptyOrErrorBehavior.DEFAULT;
+            emptyDefault = visitIfPresent(emptyBehaviorContext.expression(), Expression.class);
+        }
+        else {
+            throw new IllegalArgumentException("Unexpected empty behavior: " + emptyBehaviorContext.getText());
+        }
+
+        Optional<JsonValue.EmptyOrErrorBehavior> errorBehavior = Optional.empty();
+        Optional<Expression> errorDefault = Optional.empty();
+        SqlBaseParser.JsonValueBehaviorContext errorBehaviorContext = context.errorBehavior;
+        if (errorBehaviorContext != null) {
+            if (errorBehaviorContext.NULL() != null) {
+                errorBehavior = Optional.of(JsonValue.EmptyOrErrorBehavior.NULL);
+            }
+            else if (errorBehaviorContext.ERROR() != null) {
+                errorBehavior = Optional.of(JsonValue.EmptyOrErrorBehavior.ERROR);
+            }
+            else if (errorBehaviorContext.DEFAULT() != null) {
+                errorBehavior = Optional.of(JsonValue.EmptyOrErrorBehavior.DEFAULT);
+                errorDefault = visitIfPresent(errorBehaviorContext.expression(), Expression.class);
+            }
+            else {
+                throw new IllegalArgumentException("Unexpected error behavior: " + errorBehaviorContext.getText());
+            }
+        }
+
+        return new ValueColumn(
+                getLocation(context),
+                (Identifier) visit(context.identifier()),
+                (DataType) visit(context.type()),
+                visitIfPresent(context.string(), StringLiteral.class),
+                emptyBehavior,
+                emptyDefault,
+                errorBehavior,
+                errorDefault);
+    }
+
+    @Override
+    public Node visitQueryColumn(SqlBaseParser.QueryColumnContext context)
+    {
+        SqlBaseParser.JsonQueryWrapperBehaviorContext wrapperBehaviorContext = context.jsonQueryWrapperBehavior();
+        JsonQuery.ArrayWrapperBehavior wrapperBehavior;
+        if (wrapperBehaviorContext == null || wrapperBehaviorContext.WITHOUT() != null) {
+            wrapperBehavior = WITHOUT;
+        }
+        else if (wrapperBehaviorContext.CONDITIONAL() != null) {
+            wrapperBehavior = CONDITIONAL;
+        }
+        else {
+            wrapperBehavior = UNCONDITIONAL;
+        }
+
+        Optional<JsonQuery.QuotesBehavior> quotesBehavior = Optional.empty();
+        if (context.KEEP() != null) {
+            quotesBehavior = Optional.of(KEEP);
+        }
+        else if (context.OMIT() != null) {
+            quotesBehavior = Optional.of(OMIT);
+        }
+
+        JsonQuery.EmptyOrErrorBehavior emptyBehavior;
+        SqlBaseParser.JsonQueryBehaviorContext emptyBehaviorContext = context.emptyBehavior;
+        if (emptyBehaviorContext == null || emptyBehaviorContext.NULL() != null) {
+            emptyBehavior = JsonQuery.EmptyOrErrorBehavior.NULL;
+        }
+        else if (emptyBehaviorContext.ERROR() != null) {
+            emptyBehavior = JsonQuery.EmptyOrErrorBehavior.ERROR;
+        }
+        else if (emptyBehaviorContext.ARRAY() != null) {
+            emptyBehavior = EMPTY_ARRAY;
+        }
+        else if (emptyBehaviorContext.OBJECT() != null) {
+            emptyBehavior = EMPTY_OBJECT;
+        }
+        else {
+            throw new IllegalArgumentException("Unexpected empty behavior: " + emptyBehaviorContext.getText());
+        }
+
+        Optional<JsonQuery.EmptyOrErrorBehavior> errorBehavior = Optional.empty();
+        SqlBaseParser.JsonQueryBehaviorContext errorBehaviorContext = context.errorBehavior;
+        if (errorBehaviorContext != null) {
+            if (errorBehaviorContext.NULL() != null) {
+                errorBehavior = Optional.of(JsonQuery.EmptyOrErrorBehavior.NULL);
+            }
+            else if (errorBehaviorContext.ERROR() != null) {
+                errorBehavior = Optional.of(JsonQuery.EmptyOrErrorBehavior.ERROR);
+            }
+            else if (errorBehaviorContext.ARRAY() != null) {
+                errorBehavior = Optional.of(EMPTY_ARRAY);
+            }
+            else if (errorBehaviorContext.OBJECT() != null) {
+                errorBehavior = Optional.of(EMPTY_OBJECT);
+            }
+            else {
+                throw new IllegalArgumentException("Unexpected error behavior: " + errorBehaviorContext.getText());
+            }
+        }
+
+        return new QueryColumn(
+                getLocation(context),
+                (Identifier) visit(context.identifier()),
+                (DataType) visit(context.type()),
+                getJsonFormat(context.jsonRepresentation()),
+                visitIfPresent(context.string(), StringLiteral.class),
+                wrapperBehavior,
+                quotesBehavior,
+                emptyBehavior,
+                errorBehavior);
+    }
+
+    @Override
+    public Node visitNestedColumns(SqlBaseParser.NestedColumnsContext context)
+    {
+        return new NestedColumns(
+                getLocation(context),
+                (StringLiteral) visit(context.string()),
+                visitIfPresent(context.identifier(), Identifier.class),
+                visit(context.jsonTableColumn(), JsonTableColumnDefinition.class));
+    }
+
+    @Override
+    public Node visitJoinPlan(SqlBaseParser.JoinPlanContext context)
+    {
+        ParentChildPlanType type;
+        if (context.OUTER() != null) {
+            type = ParentChildPlanType.OUTER;
+        }
+        else if (context.INNER() != null) {
+            type = ParentChildPlanType.INNER;
+        }
+        else {
+            throw new IllegalArgumentException("Unexpected parent-child type: " + context.getText());
+        }
+
+        return new PlanParentChild(
+                getLocation(context),
+                type,
+                (PlanLeaf) visit(context.jsonTablePathName()),
+                (JsonTableSpecificPlan) visit(context.planPrimary()));
+    }
+
+    @Override
+    public Node visitUnionPlan(SqlBaseParser.UnionPlanContext context)
+    {
+        return new PlanSiblings(getLocation(context), SiblingsPlanType.UNION, visit(context.planPrimary(), JsonTableSpecificPlan.class));
+    }
+
+    @Override
+    public Node visitCrossPlan(SqlBaseParser.CrossPlanContext context)
+    {
+        return new PlanSiblings(getLocation(context), SiblingsPlanType.CROSS, visit(context.planPrimary(), JsonTableSpecificPlan.class));
+    }
+
+    @Override
+    public Node visitJsonTablePathName(SqlBaseParser.JsonTablePathNameContext context)
+    {
+        return new PlanLeaf(getLocation(context), (Identifier) visit(context.identifier()));
+    }
+
+    @Override
+    public Node visitPlanPrimary(SqlBaseParser.PlanPrimaryContext context)
+    {
+        if (context.jsonTablePathName() != null) {
+            return visit(context.jsonTablePathName());
+        }
+        return visit(context.jsonTableSpecificPlan());
+    }
+
+    @Override
+    public Node visitJsonTableDefaultPlan(SqlBaseParser.JsonTableDefaultPlanContext context)
+    {
+        ParentChildPlanType parentChildPlanType = ParentChildPlanType.OUTER;
+        if (context.INNER() != null) {
+            parentChildPlanType = ParentChildPlanType.INNER;
+        }
+        SiblingsPlanType siblingsPlanType = SiblingsPlanType.UNION;
+        if (context.CROSS() != null) {
+            siblingsPlanType = SiblingsPlanType.CROSS;
+        }
+
+        return new JsonTableDefaultPlan(getLocation(context), parentChildPlanType, siblingsPlanType);
+    }
+
+    // ***************** functions & stored procedures *****************
+
+    @Override
+    public Node visitFunctionSpecification(SqlBaseParser.FunctionSpecificationContext context)
+    {
+        ControlStatement statement = (ControlStatement) visit(context.controlStatement());
+        if (!(statement instanceof ReturnStatement || statement instanceof CompoundStatement)) {
+            throw parseError("Function body must start with RETURN or BEGIN", context.controlStatement());
+        }
+        return new FunctionSpecification(
+                getLocation(context),
+                getQualifiedName(context.functionDeclaration().qualifiedName()),
+                visit(context.functionDeclaration().parameterDeclaration(), ParameterDeclaration.class),
+                (ReturnsClause) visit(context.returnsClause()),
+                visit(context.routineCharacteristic(), RoutineCharacteristic.class),
+                statement);
+    }
+
+    @Override
+    public Node visitParameterDeclaration(SqlBaseParser.ParameterDeclarationContext context)
+    {
+        return new ParameterDeclaration(
+                getLocation(context),
+                getIdentifierIfPresent(context.identifier()),
+                (DataType) visit(context.type()));
+    }
+
+    @Override
+    public Node visitReturnsClause(SqlBaseParser.ReturnsClauseContext context)
+    {
+        return new ReturnsClause(getLocation(context), (DataType) visit(context.type()));
+    }
+
+    @Override
+    public Node visitLanguageCharacteristic(SqlBaseParser.LanguageCharacteristicContext context)
+    {
+        return new LanguageCharacteristic(getLocation(context), (Identifier) visit(context.identifier()));
+    }
+
+    @Override
+    public Node visitDeterministicCharacteristic(SqlBaseParser.DeterministicCharacteristicContext context)
+    {
+        return new DeterministicCharacteristic(getLocation(context), context.NOT() == null);
+    }
+
+    @Override
+    public Node visitReturnsNullOnNullInputCharacteristic(SqlBaseParser.ReturnsNullOnNullInputCharacteristicContext context)
+    {
+        return NullInputCharacteristic.returnsNullOnNullInput(getLocation(context));
+    }
+
+    @Override
+    public Node visitCalledOnNullInputCharacteristic(SqlBaseParser.CalledOnNullInputCharacteristicContext context)
+    {
+        return NullInputCharacteristic.calledOnNullInput(getLocation(context));
+    }
+
+    @Override
+    public Node visitSecurityCharacteristic(SqlBaseParser.SecurityCharacteristicContext context)
+    {
+        return new SecurityCharacteristic(getLocation(context), (context.INVOKER() != null)
+                ? SecurityCharacteristic.Security.INVOKER
+                : SecurityCharacteristic.Security.DEFINER);
+    }
+
+    @Override
+    public Node visitCommentCharacteristic(SqlBaseParser.CommentCharacteristicContext context)
+    {
+        return new CommentCharacteristic(getLocation(context), ((StringLiteral) visit(context.string())).getValue());
+    }
+
+    @Override
+    public Node visitReturnStatement(SqlBaseParser.ReturnStatementContext context)
+    {
+        return new ReturnStatement(getLocation(context), (Expression) visit(context.valueExpression()));
+    }
+
+    @Override
+    public Node visitAssignmentStatement(SqlBaseParser.AssignmentStatementContext context)
+    {
+        return new AssignmentStatement(
+                getLocation(context),
+                (Identifier) visit(context.identifier()),
+                (Expression) visit(context.expression()));
+    }
+
+    @Override
+    public Node visitSimpleCaseStatement(SqlBaseParser.SimpleCaseStatementContext context)
+    {
+        return new CaseStatement(
+                getLocation(context),
+                visitIfPresent(context.expression(), Expression.class),
+                visit(context.caseStatementWhenClause(), CaseStatementWhenClause.class),
+                visitIfPresent(context.elseClause(), ElseClause.class));
+    }
+
+    @Override
+    public Node visitSearchedCaseStatement(SqlBaseParser.SearchedCaseStatementContext context)
+    {
+        return new CaseStatement(
+                getLocation(context),
+                Optional.empty(),
+                visit(context.caseStatementWhenClause(), CaseStatementWhenClause.class),
+                visitIfPresent(context.elseClause(), ElseClause.class));
+    }
+
+    @Override
+    public Node visitCaseStatementWhenClause(SqlBaseParser.CaseStatementWhenClauseContext context)
+    {
+        return new CaseStatementWhenClause(
+                getLocation(context),
+                (Expression) visit(context.expression()),
+                visit(context.sqlStatementList().controlStatement(), ControlStatement.class));
+    }
+
+    @Override
+    public Node visitIfStatement(SqlBaseParser.IfStatementContext context)
+    {
+        return new IfStatement(
+                getLocation(context),
+                (Expression) visit(context.expression()),
+                visit(context.sqlStatementList().controlStatement(), ControlStatement.class),
+                visit(context.elseIfClause(), ElseIfClause.class),
+                visitIfPresent(context.elseClause(), ElseClause.class));
+    }
+
+    @Override
+    public Node visitElseIfClause(SqlBaseParser.ElseIfClauseContext context)
+    {
+        return new ElseIfClause(
+                getLocation(context),
+                (Expression) visit(context.expression()),
+                visit(context.sqlStatementList().controlStatement(), ControlStatement.class));
+    }
+
+    @Override
+    public Node visitElseClause(SqlBaseParser.ElseClauseContext context)
+    {
+        return new ElseClause(
+                getLocation(context),
+                visit(context.sqlStatementList().controlStatement(), ControlStatement.class));
+    }
+
+    @Override
+    public Node visitIterateStatement(SqlBaseParser.IterateStatementContext context)
+    {
+        return new IterateStatement(
+                getLocation(context),
+                (Identifier) visit(context.identifier()));
+    }
+
+    @Override
+    public Node visitLeaveStatement(SqlBaseParser.LeaveStatementContext context)
+    {
+        return new LeaveStatement(
+                getLocation(context),
+                (Identifier) visit(context.identifier()));
+    }
+
+    @Override
+    public Node visitVariableDeclaration(SqlBaseParser.VariableDeclarationContext context)
+    {
+        return new VariableDeclaration(
+                getLocation(context),
+                visit(context.identifier(), Identifier.class),
+                (DataType) visit(context.type()),
+                visitIfPresent(context.valueExpression(), Expression.class));
+    }
+
+    @Override
+    public Node visitCompoundStatement(SqlBaseParser.CompoundStatementContext context)
+    {
+        return new CompoundStatement(
+                getLocation(context),
+                visit(context.variableDeclaration(), VariableDeclaration.class),
+                visit(Optional.ofNullable(context.sqlStatementList())
+                        .map(SqlBaseParser.SqlStatementListContext::controlStatement)
+                        .orElse(ImmutableList.of()), ControlStatement.class));
+    }
+
+    @Override
+    public Node visitLoopStatement(SqlBaseParser.LoopStatementContext context)
+    {
+        return new LoopStatement(
+                getLocation(context),
+                getIdentifierIfPresent(context.label),
+                visit(context.sqlStatementList().controlStatement(), ControlStatement.class));
+    }
+
+    @Override
+    public Node visitWhileStatement(SqlBaseParser.WhileStatementContext context)
+    {
+        return new WhileStatement(
+                getLocation(context),
+                getIdentifierIfPresent(context.label),
+                (Expression) visit(context.expression()),
+                visit(context.sqlStatementList().controlStatement(), ControlStatement.class));
+    }
+
+    @Override
+    public Node visitRepeatStatement(SqlBaseParser.RepeatStatementContext context)
+    {
+        return new RepeatStatement(
+                getLocation(context),
+                getIdentifierIfPresent(context.label),
+                visit(context.sqlStatementList().controlStatement(), ControlStatement.class),
+                (Expression) visit(context.expression()));
+    }
+
     // ***************** helpers *****************
 
     @Override
@@ -3429,15 +3979,15 @@ private static String decodeUnicodeLiteral(SqlBaseParser.UnicodeStringLiteralCon
         for (int i = 0; i < rawContent.length(); i++) {
             char ch = rawContent.charAt(i);
             switch (state) {
-                case EMPTY:
+                case EMPTY -> {
                     if (ch == escape) {
                         state = UnicodeDecodeState.ESCAPED;
                     }
                     else {
                         unicodeStringBuilder.append(ch);
                     }
-                    break;
-                case ESCAPED:
+                }
+                case ESCAPED -> {
                     if (ch == escape) {
                         unicodeStringBuilder.append(escape);
                         state = UnicodeDecodeState.EMPTY;
@@ -3454,8 +4004,8 @@ else if (isHexDigit(ch)) {
                     else {
                         throw parseError("Invalid hexadecimal digit: " + ch, context);
                     }
-                    break;
-                case UNICODE_SEQUENCE:
+                }
+                case UNICODE_SEQUENCE -> {
                     check(isHexDigit(ch), "Incomplete escape sequence: " + escapedCharacterBuilder.toString(), context);
                     escapedCharacterBuilder.append(ch);
                     if (charactersNeeded == escapedCharacterBuilder.length()) {
@@ -3479,9 +4029,8 @@ else if (isHexDigit(ch)) {
                     else {
                         check(charactersNeeded > escapedCharacterBuilder.length(), "Unexpected escape sequence length: " + escapedCharacterBuilder.length(), context);
                     }
-                    break;
-                default:
-                    throw new UnsupportedOperationException();
+                }
+                default -> throw new UnsupportedOperationException();
             }
         }
 
@@ -3512,13 +4061,11 @@ private static String unquote(String value)
 
     private static LikeClause.PropertiesOption getPropertiesOption(Token token)
     {
-        switch (token.getType()) {
-            case SqlBaseLexer.INCLUDING:
-                return LikeClause.PropertiesOption.INCLUDING;
-            case SqlBaseLexer.EXCLUDING:
-                return LikeClause.PropertiesOption.EXCLUDING;
-        }
-        throw new IllegalArgumentException("Unsupported LIKE option type: " + token.getText());
+        return switch (token.getType()) {
+            case SqlBaseLexer.INCLUDING -> LikeClause.PropertiesOption.INCLUDING;
+            case SqlBaseLexer.EXCLUDING -> LikeClause.PropertiesOption.EXCLUDING;
+            default -> throw new IllegalArgumentException("Unsupported LIKE option type: " + token.getText());
+        };
     }
 
     private QualifiedName getQualifiedName(SqlBaseParser.QualifiedNameContext context)
@@ -3556,178 +4103,126 @@ private Optional<Identifier> getIdentifierIfPresent(ParserRuleContext context)
 
     private static ArithmeticBinaryExpression.Operator getArithmeticBinaryOperator(Token operator)
     {
-        switch (operator.getType()) {
-            case SqlBaseLexer.PLUS:
-                return ArithmeticBinaryExpression.Operator.ADD;
-            case SqlBaseLexer.MINUS:
-                return ArithmeticBinaryExpression.Operator.SUBTRACT;
-            case SqlBaseLexer.ASTERISK:
-                return ArithmeticBinaryExpression.Operator.MULTIPLY;
-            case SqlBaseLexer.SLASH:
-                return ArithmeticBinaryExpression.Operator.DIVIDE;
-            case SqlBaseLexer.PERCENT:
-                return ArithmeticBinaryExpression.Operator.MODULUS;
-        }
-
-        throw new UnsupportedOperationException("Unsupported operator: " + operator.getText());
+        return switch (operator.getType()) {
+            case SqlBaseLexer.PLUS -> ArithmeticBinaryExpression.Operator.ADD;
+            case SqlBaseLexer.MINUS -> ArithmeticBinaryExpression.Operator.SUBTRACT;
+            case SqlBaseLexer.ASTERISK -> ArithmeticBinaryExpression.Operator.MULTIPLY;
+            case SqlBaseLexer.SLASH -> ArithmeticBinaryExpression.Operator.DIVIDE;
+            case SqlBaseLexer.PERCENT -> ArithmeticBinaryExpression.Operator.MODULUS;
+            default -> throw new UnsupportedOperationException("Unsupported operator: " + operator.getText());
+        };
     }
 
     private static ComparisonExpression.Operator getComparisonOperator(Token symbol)
     {
-        switch (symbol.getType()) {
-            case SqlBaseLexer.EQ:
-                return ComparisonExpression.Operator.EQUAL;
-            case SqlBaseLexer.NEQ:
-                return ComparisonExpression.Operator.NOT_EQUAL;
-            case SqlBaseLexer.LT:
-                return ComparisonExpression.Operator.LESS_THAN;
-            case SqlBaseLexer.LTE:
-                return ComparisonExpression.Operator.LESS_THAN_OR_EQUAL;
-            case SqlBaseLexer.GT:
-                return ComparisonExpression.Operator.GREATER_THAN;
-            case SqlBaseLexer.GTE:
-                return ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL;
-        }
-
-        throw new IllegalArgumentException("Unsupported operator: " + symbol.getText());
+        return switch (symbol.getType()) {
+            case SqlBaseLexer.EQ -> ComparisonExpression.Operator.EQUAL;
+            case SqlBaseLexer.NEQ -> ComparisonExpression.Operator.NOT_EQUAL;
+            case SqlBaseLexer.LT -> ComparisonExpression.Operator.LESS_THAN;
+            case SqlBaseLexer.LTE -> ComparisonExpression.Operator.LESS_THAN_OR_EQUAL;
+            case SqlBaseLexer.GT -> ComparisonExpression.Operator.GREATER_THAN;
+            case SqlBaseLexer.GTE -> ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL;
+            default -> throw new IllegalArgumentException("Unsupported operator: " + symbol.getText());
+        };
     }
 
     private static CurrentTime.Function getDateTimeFunctionType(Token token)
     {
-        switch (token.getType()) {
-            case SqlBaseLexer.CURRENT_DATE:
-                return CurrentTime.Function.DATE;
-            case SqlBaseLexer.CURRENT_TIME:
-                return CurrentTime.Function.TIME;
-            case SqlBaseLexer.CURRENT_TIMESTAMP:
-                return CurrentTime.Function.TIMESTAMP;
-            case SqlBaseLexer.LOCALTIME:
-                return CurrentTime.Function.LOCALTIME;
-            case SqlBaseLexer.LOCALTIMESTAMP:
-                return CurrentTime.Function.LOCALTIMESTAMP;
-        }
-
-        throw new IllegalArgumentException("Unsupported special function: " + token.getText());
+        return switch (token.getType()) {
+            case SqlBaseLexer.CURRENT_DATE -> CurrentTime.Function.DATE;
+            case SqlBaseLexer.CURRENT_TIME -> CurrentTime.Function.TIME;
+            case SqlBaseLexer.CURRENT_TIMESTAMP -> CurrentTime.Function.TIMESTAMP;
+            case SqlBaseLexer.LOCALTIME -> CurrentTime.Function.LOCALTIME;
+            case SqlBaseLexer.LOCALTIMESTAMP -> CurrentTime.Function.LOCALTIMESTAMP;
+            default -> throw new IllegalArgumentException("Unsupported special function: " + token.getText());
+        };
     }
 
     private static IntervalLiteral.IntervalField getIntervalFieldType(Token token)
     {
-        switch (token.getType()) {
-            case SqlBaseLexer.YEAR:
-                return IntervalLiteral.IntervalField.YEAR;
-            case SqlBaseLexer.MONTH:
-                return IntervalLiteral.IntervalField.MONTH;
-            case SqlBaseLexer.DAY:
-                return IntervalLiteral.IntervalField.DAY;
-            case SqlBaseLexer.HOUR:
-                return IntervalLiteral.IntervalField.HOUR;
-            case SqlBaseLexer.MINUTE:
-                return IntervalLiteral.IntervalField.MINUTE;
-            case SqlBaseLexer.SECOND:
-                return IntervalLiteral.IntervalField.SECOND;
-        }
-
-        throw new IllegalArgumentException("Unsupported interval field: " + token.getText());
+        return switch (token.getType()) {
+            case SqlBaseLexer.YEAR -> IntervalLiteral.IntervalField.YEAR;
+            case SqlBaseLexer.MONTH -> IntervalLiteral.IntervalField.MONTH;
+            case SqlBaseLexer.DAY -> IntervalLiteral.IntervalField.DAY;
+            case SqlBaseLexer.HOUR -> IntervalLiteral.IntervalField.HOUR;
+            case SqlBaseLexer.MINUTE -> IntervalLiteral.IntervalField.MINUTE;
+            case SqlBaseLexer.SECOND -> IntervalLiteral.IntervalField.SECOND;
+            default -> throw new IllegalArgumentException("Unsupported interval field: " + token.getText());
+        };
     }
 
     private static IntervalLiteral.Sign getIntervalSign(Token token)
     {
-        switch (token.getType()) {
-            case SqlBaseLexer.MINUS:
-                return IntervalLiteral.Sign.NEGATIVE;
-            case SqlBaseLexer.PLUS:
-                return IntervalLiteral.Sign.POSITIVE;
-        }
-
-        throw new IllegalArgumentException("Unsupported sign: " + token.getText());
+        return switch (token.getType()) {
+            case SqlBaseLexer.MINUS -> IntervalLiteral.Sign.NEGATIVE;
+            case SqlBaseLexer.PLUS -> IntervalLiteral.Sign.POSITIVE;
+            default -> throw new IllegalArgumentException("Unsupported sign: " + token.getText());
+        };
     }
 
     private static WindowFrame.Type getFrameType(Token type)
     {
-        switch (type.getType()) {
-            case SqlBaseLexer.RANGE:
-                return WindowFrame.Type.RANGE;
-            case SqlBaseLexer.ROWS:
-                return WindowFrame.Type.ROWS;
-            case SqlBaseLexer.GROUPS:
-                return WindowFrame.Type.GROUPS;
-        }
-
-        throw new IllegalArgumentException("Unsupported frame type: " + type.getText());
+        return switch (type.getType()) {
+            case SqlBaseLexer.RANGE -> WindowFrame.Type.RANGE;
+            case SqlBaseLexer.ROWS -> WindowFrame.Type.ROWS;
+            case SqlBaseLexer.GROUPS -> WindowFrame.Type.GROUPS;
+            default -> throw new IllegalArgumentException("Unsupported frame type: " + type.getText());
+        };
     }
 
     private static FrameBound.Type getBoundedFrameBoundType(Token token)
     {
-        switch (token.getType()) {
-            case SqlBaseLexer.PRECEDING:
-                return FrameBound.Type.PRECEDING;
-            case SqlBaseLexer.FOLLOWING:
-                return FrameBound.Type.FOLLOWING;
-        }
-
-        throw new IllegalArgumentException("Unsupported bound type: " + token.getText());
+        return switch (token.getType()) {
+            case SqlBaseLexer.PRECEDING -> FrameBound.Type.PRECEDING;
+            case SqlBaseLexer.FOLLOWING -> FrameBound.Type.FOLLOWING;
+            default -> throw new IllegalArgumentException("Unsupported bound type: " + token.getText());
+        };
     }
 
     private static FrameBound.Type getUnboundedFrameBoundType(Token token)
     {
-        switch (token.getType()) {
-            case SqlBaseLexer.PRECEDING:
-                return FrameBound.Type.UNBOUNDED_PRECEDING;
-            case SqlBaseLexer.FOLLOWING:
-                return FrameBound.Type.UNBOUNDED_FOLLOWING;
-        }
-
-        throw new IllegalArgumentException("Unsupported bound type: " + token.getText());
+        return switch (token.getType()) {
+            case SqlBaseLexer.PRECEDING -> FrameBound.Type.UNBOUNDED_PRECEDING;
+            case SqlBaseLexer.FOLLOWING -> FrameBound.Type.UNBOUNDED_FOLLOWING;
+            default -> throw new IllegalArgumentException("Unsupported bound type: " + token.getText());
+        };
     }
 
     private static SampledRelation.Type getSamplingMethod(Token token)
     {
-        switch (token.getType()) {
-            case SqlBaseLexer.BERNOULLI:
-                return SampledRelation.Type.BERNOULLI;
-            case SqlBaseLexer.SYSTEM:
-                return SampledRelation.Type.SYSTEM;
-        }
-
-        throw new IllegalArgumentException("Unsupported sampling method: " + token.getText());
+        return switch (token.getType()) {
+            case SqlBaseLexer.BERNOULLI -> SampledRelation.Type.BERNOULLI;
+            case SqlBaseLexer.SYSTEM -> SampledRelation.Type.SYSTEM;
+            default -> throw new IllegalArgumentException("Unsupported sampling method: " + token.getText());
+        };
     }
 
     private static SortItem.NullOrdering getNullOrderingType(Token token)
     {
-        switch (token.getType()) {
-            case SqlBaseLexer.FIRST:
-                return SortItem.NullOrdering.FIRST;
-            case SqlBaseLexer.LAST:
-                return SortItem.NullOrdering.LAST;
-        }
-
-        throw new IllegalArgumentException("Unsupported ordering: " + token.getText());
+        return switch (token.getType()) {
+            case SqlBaseLexer.FIRST -> SortItem.NullOrdering.FIRST;
+            case SqlBaseLexer.LAST -> SortItem.NullOrdering.LAST;
+            default -> throw new IllegalArgumentException("Unsupported ordering: " + token.getText());
+        };
     }
 
     private static SortItem.Ordering getOrderingType(Token token)
     {
-        switch (token.getType()) {
-            case SqlBaseLexer.ASC:
-                return SortItem.Ordering.ASCENDING;
-            case SqlBaseLexer.DESC:
-                return SortItem.Ordering.DESCENDING;
-        }
-
-        throw new IllegalArgumentException("Unsupported ordering: " + token.getText());
+        return switch (token.getType()) {
+            case SqlBaseLexer.ASC -> SortItem.Ordering.ASCENDING;
+            case SqlBaseLexer.DESC -> SortItem.Ordering.DESCENDING;
+            default -> throw new IllegalArgumentException("Unsupported ordering: " + token.getText());
+        };
     }
 
     private static QuantifiedComparisonExpression.Quantifier getComparisonQuantifier(Token symbol)
     {
-        switch (symbol.getType()) {
-            case SqlBaseLexer.ALL:
-                return QuantifiedComparisonExpression.Quantifier.ALL;
-            case SqlBaseLexer.ANY:
-                return QuantifiedComparisonExpression.Quantifier.ANY;
-            case SqlBaseLexer.SOME:
-                return QuantifiedComparisonExpression.Quantifier.SOME;
-        }
-
-        throw new IllegalArgumentException("Unsupported quantifier: " + symbol.getText());
+        return switch (symbol.getType()) {
+            case SqlBaseLexer.ALL -> QuantifiedComparisonExpression.Quantifier.ALL;
+            case SqlBaseLexer.ANY -> QuantifiedComparisonExpression.Quantifier.ANY;
+            case SqlBaseLexer.SOME -> QuantifiedComparisonExpression.Quantifier.SOME;
+            default -> throw new IllegalArgumentException("Unsupported quantifier: " + symbol.getText());
+        };
     }
 
     private List<Identifier> getIdentifiers(List<SqlBaseParser.IdentifierContext> identifiers)
@@ -3780,22 +4275,26 @@ private static void check(boolean condition, String message, ParserRuleContext c
         }
     }
 
-    public static NodeLocation getLocation(TerminalNode terminalNode)
+    private NodeLocation getLocation(TerminalNode terminalNode)
     {
         requireNonNull(terminalNode, "terminalNode is null");
         return getLocation(terminalNode.getSymbol());
     }
 
-    public static NodeLocation getLocation(ParserRuleContext parserRuleContext)
+    private NodeLocation getLocation(ParserRuleContext parserRuleContext)
     {
         requireNonNull(parserRuleContext, "parserRuleContext is null");
         return getLocation(parserRuleContext.getStart());
     }
 
-    public static NodeLocation getLocation(Token token)
+    private NodeLocation getLocation(Token token)
     {
         requireNonNull(token, "token is null");
-        return new NodeLocation(token.getLine(), token.getCharPositionInLine() + 1);
+        return baseLocation
+                .map(location -> new NodeLocation(
+                        token.getLine() + location.getLineNumber() - 1,
+                        token.getCharPositionInLine() + 1 + (token.getLine() == 1 ? location.getColumnNumber() : 0)))
+                .orElse(new NodeLocation(token.getLine(), token.getCharPositionInLine() + 1));
     }
 
     private static ParsingException parseError(String message, ParserRuleContext context)
@@ -3805,13 +4304,11 @@ private static ParsingException parseError(String message, ParserRuleContext con
 
     private static QueryPeriod.RangeType getRangeType(Token token)
     {
-        switch (token.getType()) {
-            case SqlBaseLexer.TIMESTAMP:
-                return QueryPeriod.RangeType.TIMESTAMP;
-            case SqlBaseLexer.VERSION:
-                return QueryPeriod.RangeType.VERSION;
-        }
-        throw new IllegalArgumentException("Unsupported query period range type: " + token.getText());
+        return switch (token.getType()) {
+            case SqlBaseLexer.TIMESTAMP -> QueryPeriod.RangeType.TIMESTAMP;
+            case SqlBaseLexer.VERSION -> QueryPeriod.RangeType.VERSION;
+            default -> throw new IllegalArgumentException("Unsupported query period range type: " + token.getText());
+        };
     }
 
     private static void validateArgumentAlias(Identifier alias, ParserRuleContext context)
diff --git a/core/trino-parser/src/main/java/io/trino/sql/parser/CaseInsensitiveStream.java b/core/trino-parser/src/main/java/io/trino/sql/parser/CaseInsensitiveStream.java
deleted file mode 100644
index 8a0d665dde95..000000000000
--- a/core/trino-parser/src/main/java/io/trino/sql/parser/CaseInsensitiveStream.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed 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 io.trino.sql.parser;
-
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.IntStream;
-import org.antlr.v4.runtime.misc.Interval;
-
-public class CaseInsensitiveStream
-        implements CharStream
-{
-    private final CharStream stream;
-
-    public CaseInsensitiveStream(CharStream stream)
-    {
-        this.stream = stream;
-    }
-
-    @Override
-    public String getText(Interval interval)
-    {
-        return stream.getText(interval);
-    }
-
-    @Override
-    public void consume()
-    {
-        stream.consume();
-    }
-
-    @Override
-    public int LA(int i)
-    {
-        int result = stream.LA(i);
-
-        switch (result) {
-            case 0:
-            case IntStream.EOF:
-                return result;
-            default:
-                return Character.toUpperCase(result);
-        }
-    }
-
-    @Override
-    public int mark()
-    {
-        return stream.mark();
-    }
-
-    @Override
-    public void release(int marker)
-    {
-        stream.release(marker);
-    }
-
-    @Override
-    public int index()
-    {
-        return stream.index();
-    }
-
-    @Override
-    public void seek(int index)
-    {
-        stream.seek(index);
-    }
-
-    @Override
-    public int size()
-    {
-        return stream.size();
-    }
-
-    @Override
-    public String getSourceName()
-    {
-        return stream.getSourceName();
-    }
-}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/parser/ErrorHandler.java b/core/trino-parser/src/main/java/io/trino/sql/parser/ErrorHandler.java
index 4ad96d9bcf3e..6644cd73597b 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/parser/ErrorHandler.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/parser/ErrorHandler.java
@@ -296,8 +296,7 @@ else if (ignoredRules.contains(rule)) {
                 for (int i = 0; i < state.getNumberOfTransitions(); i++) {
                     Transition transition = state.transition(i);
 
-                    if (transition instanceof RuleTransition) {
-                        RuleTransition ruleTransition = (RuleTransition) transition;
+                    if (transition instanceof RuleTransition ruleTransition) {
                         for (int endToken : process(new ParsingState(ruleTransition.target, tokenIndex, suppressed, parser), ruleTransition.precedence)) {
                             activeStates.push(new ParsingState(ruleTransition.followState, endToken, suppressed && endToken == currentToken, parser));
                         }
diff --git a/core/trino-parser/src/main/java/io/trino/sql/parser/ParsingOptions.java b/core/trino-parser/src/main/java/io/trino/sql/parser/ParsingOptions.java
deleted file mode 100644
index 4f0b203fe48d..000000000000
--- a/core/trino-parser/src/main/java/io/trino/sql/parser/ParsingOptions.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed 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 io.trino.sql.parser;
-
-import static java.util.Objects.requireNonNull;
-
-public class ParsingOptions
-{
-    public enum DecimalLiteralTreatment
-    {
-        AS_DOUBLE,
-        AS_DECIMAL,
-        REJECT
-    }
-
-    private final DecimalLiteralTreatment decimalLiteralTreatment;
-
-    public ParsingOptions()
-    {
-        this(DecimalLiteralTreatment.REJECT);
-    }
-
-    public ParsingOptions(DecimalLiteralTreatment decimalLiteralTreatment)
-    {
-        this.decimalLiteralTreatment = requireNonNull(decimalLiteralTreatment, "decimalLiteralTreatment is null");
-    }
-
-    public DecimalLiteralTreatment getDecimalLiteralTreatment()
-    {
-        return decimalLiteralTreatment;
-    }
-}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/parser/RefreshableSqlBaseParserInitializer.java b/core/trino-parser/src/main/java/io/trino/sql/parser/RefreshableSqlBaseParserInitializer.java
index 4347afa740e6..0abbe03c3431 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/parser/RefreshableSqlBaseParserInitializer.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/parser/RefreshableSqlBaseParserInitializer.java
@@ -14,7 +14,9 @@
 
 package io.trino.sql.parser;
 
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import io.trino.grammar.sql.SqlBaseLexer;
+import io.trino.grammar.sql.SqlBaseParser;
 
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
diff --git a/core/trino-parser/src/main/java/io/trino/sql/parser/SqlParser.java b/core/trino-parser/src/main/java/io/trino/sql/parser/SqlParser.java
index 772cb44f78b3..9c4507093d9d 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/parser/SqlParser.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/parser/SqlParser.java
@@ -13,12 +13,18 @@
  */
 package io.trino.sql.parser;
 
+import io.trino.grammar.sql.SqlBaseBaseListener;
+import io.trino.grammar.sql.SqlBaseLexer;
+import io.trino.grammar.sql.SqlBaseParser;
 import io.trino.sql.tree.DataType;
 import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.FunctionSpecification;
 import io.trino.sql.tree.Node;
+import io.trino.sql.tree.NodeLocation;
 import io.trino.sql.tree.PathSpecification;
 import io.trino.sql.tree.RowPattern;
 import io.trino.sql.tree.Statement;
+import org.antlr.v4.runtime.ANTLRErrorListener;
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonToken;
@@ -32,11 +38,11 @@
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.atn.PredictionMode;
 import org.antlr.v4.runtime.misc.Pair;
-import org.antlr.v4.runtime.misc.ParseCancellationException;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
@@ -44,7 +50,7 @@
 
 public class SqlParser
 {
-    private static final BaseErrorListener LEXER_ERROR_LISTENER = new BaseErrorListener()
+    private static final ANTLRErrorListener LEXER_ERROR_LISTENER = new BaseErrorListener()
     {
         @Override
         public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String message, RecognitionException e)
@@ -79,35 +85,50 @@ public SqlParser(BiConsumer<SqlBaseLexer, SqlBaseParser> initializer)
         this.initializer = requireNonNull(initializer, "initializer is null");
     }
 
-    public Statement createStatement(String sql, ParsingOptions parsingOptions)
+    public Statement createStatement(String sql)
     {
-        return (Statement) invokeParser("statement", sql, SqlBaseParser::singleStatement, parsingOptions);
+        return (Statement) invokeParser("statement", sql, SqlBaseParser::singleStatement);
     }
 
-    public Expression createExpression(String expression, ParsingOptions parsingOptions)
+    public Statement createStatement(String sql, NodeLocation location)
     {
-        return (Expression) invokeParser("expression", expression, SqlBaseParser::standaloneExpression, parsingOptions);
+        return (Statement) invokeParser("statement", sql, Optional.ofNullable(location), SqlBaseParser::singleStatement);
+    }
+
+    public Expression createExpression(String expression)
+    {
+        return (Expression) invokeParser("expression", expression, SqlBaseParser::standaloneExpression);
     }
 
     public DataType createType(String expression)
     {
-        return (DataType) invokeParser("type", expression, SqlBaseParser::standaloneType, new ParsingOptions());
+        return (DataType) invokeParser("type", expression, SqlBaseParser::standaloneType);
     }
 
     public PathSpecification createPathSpecification(String expression)
     {
-        return (PathSpecification) invokeParser("path specification", expression, SqlBaseParser::standalonePathSpecification, new ParsingOptions());
+        return (PathSpecification) invokeParser("path specification", expression, SqlBaseParser::standalonePathSpecification);
     }
 
     public RowPattern createRowPattern(String pattern)
     {
-        return (RowPattern) invokeParser("row pattern", pattern, SqlBaseParser::standaloneRowPattern, new ParsingOptions());
+        return (RowPattern) invokeParser("row pattern", pattern, SqlBaseParser::standaloneRowPattern);
     }
 
-    private Node invokeParser(String name, String sql, Function<SqlBaseParser, ParserRuleContext> parseFunction, ParsingOptions parsingOptions)
+    public FunctionSpecification createFunctionSpecification(String sql)
+    {
+        return (FunctionSpecification) invokeParser("function specification", sql, SqlBaseParser::standaloneFunctionSpecification);
+    }
+
+    private Node invokeParser(String name, String sql, Function<SqlBaseParser, ParserRuleContext> parseFunction)
+    {
+        return invokeParser(name, sql, Optional.empty(), parseFunction);
+    }
+
+    private Node invokeParser(String name, String sql, Optional<NodeLocation> location, Function<SqlBaseParser, ParserRuleContext> parseFunction)
     {
         try {
-            SqlBaseLexer lexer = new SqlBaseLexer(new CaseInsensitiveStream(CharStreams.fromString(sql)));
+            SqlBaseLexer lexer = new SqlBaseLexer(CharStreams.fromString(sql));
             CommonTokenStream tokenStream = new CommonTokenStream(lexer);
             SqlBaseParser parser = new SqlBaseParser(tokenStream);
             initializer.accept(lexer, parser);
@@ -137,20 +158,34 @@ public Token recoverInline(Parser recognizer)
 
             ParserRuleContext tree;
             try {
-                // first, try parsing with potentially faster SLL mode
-                parser.getInterpreter().setPredictionMode(PredictionMode.SLL);
-                tree = parseFunction.apply(parser);
-            }
-            catch (ParseCancellationException ex) {
-                // if we fail, parse with LL mode
-                tokenStream.seek(0); // rewind input stream
-                parser.reset();
+                try {
+                    // first, try parsing with potentially faster SLL mode
+                    parser.getInterpreter().setPredictionMode(PredictionMode.SLL);
+                    tree = parseFunction.apply(parser);
+                }
+                catch (ParsingException ex) {
+                    // if we fail, parse with LL mode
+                    tokenStream.seek(0); // rewind input stream
+                    parser.reset();
 
-                parser.getInterpreter().setPredictionMode(PredictionMode.LL);
-                tree = parseFunction.apply(parser);
+                    parser.getInterpreter().setPredictionMode(PredictionMode.LL);
+                    tree = parseFunction.apply(parser);
+                }
+            }
+            catch (ParsingException e) {
+                location.ifPresent(statementLocation -> {
+                    int line = statementLocation.getLineNumber();
+                    int column = statementLocation.getColumnNumber();
+                    throw new ParsingException(
+                            e.getErrorMessage(),
+                            (RecognitionException) e.getCause(),
+                            e.getLineNumber() + line - 1,
+                            e.getColumnNumber() + (line == 1 ? column : 0));
+                });
+                throw e;
             }
 
-            return new AstBuilder(parsingOptions).visit(tree);
+            return new AstBuilder(location).visit(tree);
         }
         catch (StackOverflowError e) {
             throw new ParsingException(name + " is too large (stack overflow while parsing)");
diff --git a/core/trino-parser/src/main/java/io/trino/sql/parser/StatementSplitter.java b/core/trino-parser/src/main/java/io/trino/sql/parser/StatementSplitter.java
deleted file mode 100644
index 7385a2b2bb29..000000000000
--- a/core/trino-parser/src/main/java/io/trino/sql/parser/StatementSplitter.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Licensed 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 io.trino.sql.parser;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.TokenSource;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-import static java.util.Objects.requireNonNull;
-
-public class StatementSplitter
-{
-    private final List<Statement> completeStatements;
-    private final String partialStatement;
-
-    public StatementSplitter(String sql)
-    {
-        this(sql, ImmutableSet.of(";"));
-    }
-
-    public StatementSplitter(String sql, Set<String> delimiters)
-    {
-        TokenSource tokens = getLexer(sql, delimiters);
-        ImmutableList.Builder<Statement> list = ImmutableList.builder();
-        StringBuilder sb = new StringBuilder();
-        while (true) {
-            Token token = tokens.nextToken();
-            if (token.getType() == Token.EOF) {
-                break;
-            }
-            if (token.getType() == SqlBaseParser.DELIMITER) {
-                String statement = sb.toString().trim();
-                if (!statement.isEmpty()) {
-                    list.add(new Statement(statement, token.getText()));
-                }
-                sb = new StringBuilder();
-            }
-            else {
-                sb.append(token.getText());
-            }
-        }
-        this.completeStatements = list.build();
-        this.partialStatement = sb.toString().trim();
-    }
-
-    public List<Statement> getCompleteStatements()
-    {
-        return completeStatements;
-    }
-
-    public String getPartialStatement()
-    {
-        return partialStatement;
-    }
-
-    public static String squeezeStatement(String sql)
-    {
-        TokenSource tokens = getLexer(sql, ImmutableSet.of());
-        StringBuilder sb = new StringBuilder();
-        while (true) {
-            Token token = tokens.nextToken();
-            if (token.getType() == Token.EOF) {
-                break;
-            }
-            if (token.getType() == SqlBaseLexer.WS) {
-                sb.append(' ');
-            }
-            else {
-                sb.append(token.getText());
-            }
-        }
-        return sb.toString().trim();
-    }
-
-    public static boolean isEmptyStatement(String sql)
-    {
-        TokenSource tokens = getLexer(sql, ImmutableSet.of());
-        while (true) {
-            Token token = tokens.nextToken();
-            if (token.getType() == Token.EOF) {
-                return true;
-            }
-            if (token.getChannel() != Token.HIDDEN_CHANNEL) {
-                return false;
-            }
-        }
-    }
-
-    public static TokenSource getLexer(String sql, Set<String> terminators)
-    {
-        requireNonNull(sql, "sql is null");
-        CharStream stream = new CaseInsensitiveStream(CharStreams.fromString(sql));
-        return new DelimiterLexer(stream, terminators);
-    }
-
-    public static class Statement
-    {
-        private final String statement;
-        private final String terminator;
-
-        public Statement(String statement, String terminator)
-        {
-            this.statement = requireNonNull(statement, "statement is null");
-            this.terminator = requireNonNull(terminator, "terminator is null");
-        }
-
-        public String statement()
-        {
-            return statement;
-        }
-
-        public String terminator()
-        {
-            return terminator;
-        }
-
-        @Override
-        public boolean equals(Object obj)
-        {
-            if (this == obj) {
-                return true;
-            }
-            if ((obj == null) || (getClass() != obj.getClass())) {
-                return false;
-            }
-            Statement o = (Statement) obj;
-            return Objects.equals(statement, o.statement) &&
-                    Objects.equals(terminator, o.terminator);
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hash(statement, terminator);
-        }
-
-        @Override
-        public String toString()
-        {
-            return statement + terminator;
-        }
-    }
-}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/testing/TreeAssertions.java b/core/trino-parser/src/main/java/io/trino/sql/testing/TreeAssertions.java
index f57151532aac..98ee4b9b7e07 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/testing/TreeAssertions.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/testing/TreeAssertions.java
@@ -16,18 +16,15 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import io.trino.sql.parser.ParsingException;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.DefaultTraversalVisitor;
 import io.trino.sql.tree.Node;
 import io.trino.sql.tree.Statement;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 
 import static io.trino.sql.SqlFormatter.formatSql;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DOUBLE;
 import static java.lang.String.format;
 
 public final class TreeAssertions
@@ -35,17 +32,11 @@ public final class TreeAssertions
     private TreeAssertions() {}
 
     public static void assertFormattedSql(SqlParser sqlParser, Node expected)
-    {
-        ParsingOptions parsingOptions = new ParsingOptions(AS_DOUBLE /* anything */);
-        assertFormattedSql(sqlParser, parsingOptions, expected);
-    }
-
-    public static void assertFormattedSql(SqlParser sqlParser, ParsingOptions parsingOptions, Node expected)
     {
         String formatted = formatSql(expected);
 
         // verify round-trip of formatting already-formatted SQL
-        Statement actual = parseFormatted(sqlParser, parsingOptions, formatted, expected);
+        Statement actual = parseFormatted(sqlParser, formatted, expected);
         assertEquals(formatSql(actual), formatted);
 
         // compare parsed tree with parsed tree of formatted SQL
@@ -56,10 +47,10 @@ public static void assertFormattedSql(SqlParser sqlParser, ParsingOptions parsin
         assertEquals(actual, expected);
     }
 
-    private static Statement parseFormatted(SqlParser sqlParser, ParsingOptions parsingOptions, String sql, Node tree)
+    private static Statement parseFormatted(SqlParser sqlParser, String sql, Node tree)
     {
         try {
-            return sqlParser.createStatement(sql, parsingOptions);
+            return sqlParser.createStatement(sql);
         }
         catch (ParsingException e) {
             String message = format("failed to parse formatted SQL: %s\nerror: %s\ntree: %s", sql, e.getMessage(), tree);
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/AssignmentStatement.java b/core/trino-parser/src/main/java/io/trino/sql/tree/AssignmentStatement.java
new file mode 100644
index 000000000000..6a0d5afd1653
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/AssignmentStatement.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class AssignmentStatement
+        extends ControlStatement
+{
+    private final Identifier target;
+    private final Expression value;
+
+    public AssignmentStatement(NodeLocation location, Identifier target, Expression value)
+    {
+        super(location);
+        this.target = requireNonNull(target, "target is null");
+        this.value = requireNonNull(value, "value is null");
+    }
+
+    public Identifier getTarget()
+    {
+        return target;
+    }
+
+    public Expression getValue()
+    {
+        return value;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitAssignmentStatement(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of(value, target);
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof AssignmentStatement other) &&
+                Objects.equals(target, other.target) &&
+                Objects.equals(value, other.value);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(target, value);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("target", target)
+                .add("value", value)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/AstVisitor.java b/core/trino-parser/src/main/java/io/trino/sql/tree/AstVisitor.java
index eccac7a01c75..272d6633dadd 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/AstVisitor.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/AstVisitor.java
@@ -13,7 +13,7 @@
  */
 package io.trino.sql.tree;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 public abstract class AstVisitor<R, C>
 {
@@ -102,6 +102,11 @@ protected R visitExecute(Execute node, C context)
         return visitStatement(node, context);
     }
 
+    protected R visitExecuteImmediate(ExecuteImmediate node, C context)
+    {
+        return visitStatement(node, context);
+    }
+
     protected R visitDescribeOutput(DescribeOutput node, C context)
     {
         return visitStatement(node, context);
@@ -182,6 +187,16 @@ protected R visitResetSession(ResetSession node, C context)
         return visitStatement(node, context);
     }
 
+    protected R visitSetSessionAuthorization(SetSessionAuthorization node, C context)
+    {
+        return visitStatement(node, context);
+    }
+
+    protected R visitResetSessionAuthorization(ResetSessionAuthorization node, C context)
+    {
+        return visitStatement(node, context);
+    }
+
     protected R visitGenericLiteral(GenericLiteral node, C context)
     {
         return visitLiteral(node, context);
@@ -862,21 +877,11 @@ protected R visitGroupingElement(GroupingElement node, C context)
         return visitNode(node, context);
     }
 
-    protected R visitCube(Cube node, C context)
-    {
-        return visitGroupingElement(node, context);
-    }
-
     protected R visitGroupingSets(GroupingSets node, C context)
     {
         return visitGroupingElement(node, context);
     }
 
-    protected R visitRollup(Rollup node, C context)
-    {
-        return visitGroupingElement(node, context);
-    }
-
     protected R visitSimpleGroupBy(SimpleGroupBy node, C context)
     {
         return visitGroupingElement(node, context);
@@ -1176,4 +1181,169 @@ protected R visitEmptyTableTreatment(EmptyTableTreatment node, C context)
     {
         return visitNode(node, context);
     }
+
+    protected R visitJsonTable(JsonTable node, C context)
+    {
+        return visitRelation(node, context);
+    }
+
+    protected R visitOrdinalityColumn(OrdinalityColumn node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitValueColumn(ValueColumn node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitQueryColumn(QueryColumn node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitNestedColumns(NestedColumns node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitPlanParentChild(PlanParentChild node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitPlanSiblings(PlanSiblings node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitPlanLeaf(PlanLeaf node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitJsonTableDefaultPlan(JsonTableDefaultPlan node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitCreateFunction(CreateFunction node, C context)
+    {
+        return visitStatement(node, context);
+    }
+
+    protected R visitDropFunction(DropFunction node, C context)
+    {
+        return visitStatement(node, context);
+    }
+
+    protected R visitFunctionSpecification(FunctionSpecification node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitParameterDeclaration(ParameterDeclaration node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitReturnClause(ReturnsClause node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitLanguageCharacteristic(LanguageCharacteristic node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitDeterministicCharacteristic(DeterministicCharacteristic node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitNullInputCharacteristic(NullInputCharacteristic node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitSecurityCharacteristic(SecurityCharacteristic node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitCommentCharacteristic(CommentCharacteristic node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitReturnStatement(ReturnStatement node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitCompoundStatement(CompoundStatement node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitVariableDeclaration(VariableDeclaration node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitAssignmentStatement(AssignmentStatement node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitCaseStatement(CaseStatement node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitCaseStatementWhenClause(CaseStatementWhenClause node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitIfStatement(IfStatement node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitElseClause(ElseClause node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitElseIfClause(ElseIfClause node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitIterateStatement(IterateStatement node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitLeaveStatement(LeaveStatement node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitWhileStatement(WhileStatement node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitLoopStatement(LoopStatement node, C context)
+    {
+        return visitNode(node, context);
+    }
+
+    protected R visitRepeatStatement(RepeatStatement node, C context)
+    {
+        return visitNode(node, context);
+    }
 }
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/CaseStatement.java b/core/trino-parser/src/main/java/io/trino/sql/tree/CaseStatement.java
new file mode 100644
index 000000000000..69a7a02fe271
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/CaseStatement.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class CaseStatement
+        extends ControlStatement
+{
+    private final Optional<Expression> expression;
+    private final List<CaseStatementWhenClause> whenClauses;
+    private final Optional<ElseClause> elseClause;
+
+    public CaseStatement(
+            NodeLocation location,
+            Optional<Expression> expression,
+            List<CaseStatementWhenClause> whenClauses,
+            Optional<ElseClause> elseClause)
+    {
+        super(location);
+        this.expression = requireNonNull(expression, "expression is null");
+        this.whenClauses = requireNonNull(whenClauses, "whenClauses is null");
+        this.elseClause = requireNonNull(elseClause, "elseClause is null");
+    }
+
+    public Optional<Expression> getExpression()
+    {
+        return expression;
+    }
+
+    public List<CaseStatementWhenClause> getWhenClauses()
+    {
+        return whenClauses;
+    }
+
+    public Optional<ElseClause> getElseClause()
+    {
+        return elseClause;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitCaseStatement(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        ImmutableList.Builder<Node> children = ImmutableList.builder();
+        expression.ifPresent(children::add);
+        children.addAll(whenClauses);
+        elseClause.ifPresent(children::add);
+        return children.build();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof CaseStatement other) &&
+                Objects.equals(expression, other.expression) &&
+                Objects.equals(whenClauses, other.whenClauses) &&
+                Objects.equals(elseClause, other.elseClause);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(expression, whenClauses, elseClause);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("expression", expression)
+                .add("whenClauses", whenClauses)
+                .add("elseClause", elseClause)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/CaseStatementWhenClause.java b/core/trino-parser/src/main/java/io/trino/sql/tree/CaseStatementWhenClause.java
new file mode 100644
index 000000000000..29b9fd5d6762
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/CaseStatementWhenClause.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class CaseStatementWhenClause
+        extends Node
+{
+    private final Expression expression;
+    private final List<ControlStatement> statements;
+
+    public CaseStatementWhenClause(Expression expression, List<ControlStatement> statements)
+    {
+        this(Optional.empty(), expression, statements);
+    }
+
+    public CaseStatementWhenClause(NodeLocation location, Expression expression, List<ControlStatement> statements)
+    {
+        this(Optional.of(location), expression, statements);
+    }
+
+    private CaseStatementWhenClause(Optional<NodeLocation> location, Expression expression, List<ControlStatement> statements)
+    {
+        super(location);
+        this.expression = requireNonNull(expression, "expression is null");
+        this.statements = requireNonNull(statements, "statements is null");
+    }
+
+    public Expression getExpression()
+    {
+        return expression;
+    }
+
+    public List<ControlStatement> getStatements()
+    {
+        return statements;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitCaseStatementWhenClause(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.<Node>builder()
+                .add(expression)
+                .addAll(statements)
+                .build();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof CaseStatementWhenClause other) &&
+                Objects.equals(expression, other.expression) &&
+                Objects.equals(statements, other.statements);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(expression, statements);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("expression", expression)
+                .add("statements", statements)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/ColumnDefinition.java b/core/trino-parser/src/main/java/io/trino/sql/tree/ColumnDefinition.java
index b96a9e077b5b..4bf41f65ecfc 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/ColumnDefinition.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/ColumnDefinition.java
@@ -25,23 +25,23 @@
 public final class ColumnDefinition
         extends TableElement
 {
-    private final Identifier name;
+    private final QualifiedName name;
     private final DataType type;
     private final boolean nullable;
     private final List<Property> properties;
     private final Optional<String> comment;
 
-    public ColumnDefinition(Identifier name, DataType type, boolean nullable, List<Property> properties, Optional<String> comment)
+    public ColumnDefinition(QualifiedName name, DataType type, boolean nullable, List<Property> properties, Optional<String> comment)
     {
         this(Optional.empty(), name, type, nullable, properties, comment);
     }
 
-    public ColumnDefinition(NodeLocation location, Identifier name, DataType type, boolean nullable, List<Property> properties, Optional<String> comment)
+    public ColumnDefinition(NodeLocation location, QualifiedName name, DataType type, boolean nullable, List<Property> properties, Optional<String> comment)
     {
         this(Optional.of(location), name, type, nullable, properties, comment);
     }
 
-    private ColumnDefinition(Optional<NodeLocation> location, Identifier name, DataType type, boolean nullable, List<Property> properties, Optional<String> comment)
+    private ColumnDefinition(Optional<NodeLocation> location, QualifiedName name, DataType type, boolean nullable, List<Property> properties, Optional<String> comment)
     {
         super(location);
         this.name = requireNonNull(name, "name is null");
@@ -51,7 +51,7 @@ private ColumnDefinition(Optional<NodeLocation> location, Identifier name, DataT
         this.comment = requireNonNull(comment, "comment is null");
     }
 
-    public Identifier getName()
+    public QualifiedName getName()
     {
         return name;
     }
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/CommentCharacteristic.java b/core/trino-parser/src/main/java/io/trino/sql/tree/CommentCharacteristic.java
new file mode 100644
index 000000000000..df4cf9627a61
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/CommentCharacteristic.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class CommentCharacteristic
+        extends RoutineCharacteristic
+{
+    private final String comment;
+
+    public CommentCharacteristic(String comment)
+    {
+        this(Optional.empty(), comment);
+    }
+
+    public CommentCharacteristic(NodeLocation location, String comment)
+    {
+        this(Optional.of(location), comment);
+    }
+
+    private CommentCharacteristic(Optional<NodeLocation> location, String comment)
+    {
+        super(location);
+        this.comment = requireNonNull(comment, "comment is null");
+    }
+
+    public String getComment()
+    {
+        return comment;
+    }
+
+    @Override
+    protected <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitCommentCharacteristic(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof CommentCharacteristic other) &&
+                comment.equals(other.comment);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return comment.hashCode();
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("comment", comment)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/CompoundStatement.java b/core/trino-parser/src/main/java/io/trino/sql/tree/CompoundStatement.java
new file mode 100644
index 000000000000..ee4ec9b555b7
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/CompoundStatement.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class CompoundStatement
+        extends ControlStatement
+{
+    private final List<VariableDeclaration> variableDeclarations;
+    private final List<ControlStatement> statements;
+
+    public CompoundStatement(
+            NodeLocation location,
+            List<VariableDeclaration> variableDeclarations,
+            List<ControlStatement> statements)
+    {
+        super(location);
+        this.variableDeclarations = requireNonNull(variableDeclarations, "variableDeclarations is null");
+        this.statements = requireNonNull(statements, "statements is null");
+    }
+
+    public List<ControlStatement> getStatements()
+    {
+        return statements;
+    }
+
+    public List<VariableDeclaration> getVariableDeclarations()
+    {
+        return variableDeclarations;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitCompoundStatement(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.<Node>builder()
+                .addAll(statements)
+                .addAll(variableDeclarations)
+                .build();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof CompoundStatement other) &&
+                Objects.equals(variableDeclarations, other.variableDeclarations) &&
+                Objects.equals(statements, other.statements);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(variableDeclarations, statements);
+    }
+
+    @Override
+
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("variableDeclarations", variableDeclarations)
+                .add("statements", statements)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/ControlStatement.java b/core/trino-parser/src/main/java/io/trino/sql/tree/ControlStatement.java
new file mode 100644
index 000000000000..ae69ecb5d057
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/ControlStatement.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import java.util.Optional;
+
+public abstract sealed class ControlStatement
+        extends Node
+        permits AssignmentStatement, CaseStatement, CompoundStatement,
+        IfStatement, IterateStatement, LeaveStatement, LoopStatement,
+        RepeatStatement, ReturnStatement, VariableDeclaration, WhileStatement
+{
+    protected ControlStatement(NodeLocation location)
+    {
+        super(Optional.of(location));
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/CreateFunction.java b/core/trino-parser/src/main/java/io/trino/sql/tree/CreateFunction.java
new file mode 100644
index 000000000000..3018cdea951b
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/CreateFunction.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class CreateFunction
+        extends Statement
+{
+    private final FunctionSpecification specification;
+    private final boolean replace;
+
+    public CreateFunction(FunctionSpecification specification, boolean replace)
+    {
+        this(Optional.empty(), specification, replace);
+    }
+
+    public CreateFunction(NodeLocation location, FunctionSpecification specification, boolean replace)
+    {
+        this(Optional.of(location), specification, replace);
+    }
+
+    private CreateFunction(Optional<NodeLocation> location, FunctionSpecification specification, boolean replace)
+    {
+        super(location);
+        this.specification = requireNonNull(specification, "specification is null");
+        this.replace = replace;
+    }
+
+    public FunctionSpecification getSpecification()
+    {
+        return specification;
+    }
+
+    public boolean isReplace()
+    {
+        return replace;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitCreateFunction(this, context);
+    }
+
+    @Override
+    public List<Node> getChildren()
+    {
+        return ImmutableList.of(specification);
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof CreateFunction other) &&
+                Objects.equals(specification, other.specification) &&
+                Objects.equals(replace, other.replace);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(specification, replace);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("specification", specification)
+                .add("replace", replace)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/CreateTable.java b/core/trino-parser/src/main/java/io/trino/sql/tree/CreateTable.java
index e288062fb19f..7b71b7e2f8b3 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/CreateTable.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/CreateTable.java
@@ -27,26 +27,26 @@ public class CreateTable
 {
     private final QualifiedName name;
     private final List<TableElement> elements;
-    private final boolean notExists;
+    private final SaveMode saveMode;
     private final List<Property> properties;
     private final Optional<String> comment;
 
-    public CreateTable(QualifiedName name, List<TableElement> elements, boolean notExists, List<Property> properties, Optional<String> comment)
+    public CreateTable(QualifiedName name, List<TableElement> elements, SaveMode saveMode, List<Property> properties, Optional<String> comment)
     {
-        this(Optional.empty(), name, elements, notExists, properties, comment);
+        this(Optional.empty(), name, elements, saveMode, properties, comment);
     }
 
-    public CreateTable(NodeLocation location, QualifiedName name, List<TableElement> elements, boolean notExists, List<Property> properties, Optional<String> comment)
+    public CreateTable(NodeLocation location, QualifiedName name, List<TableElement> elements, SaveMode saveMode, List<Property> properties, Optional<String> comment)
     {
-        this(Optional.of(location), name, elements, notExists, properties, comment);
+        this(Optional.of(location), name, elements, saveMode, properties, comment);
     }
 
-    private CreateTable(Optional<NodeLocation> location, QualifiedName name, List<TableElement> elements, boolean notExists, List<Property> properties, Optional<String> comment)
+    private CreateTable(Optional<NodeLocation> location, QualifiedName name, List<TableElement> elements, SaveMode saveMode, List<Property> properties, Optional<String> comment)
     {
         super(location);
         this.name = requireNonNull(name, "name is null");
         this.elements = ImmutableList.copyOf(requireNonNull(elements, "elements is null"));
-        this.notExists = notExists;
+        this.saveMode = requireNonNull(saveMode, "saveMode is null");
         this.properties = requireNonNull(properties, "properties is null");
         this.comment = requireNonNull(comment, "comment is null");
     }
@@ -61,9 +61,9 @@ public List<TableElement> getElements()
         return elements;
     }
 
-    public boolean isNotExists()
+    public SaveMode getSaveMode()
     {
-        return notExists;
+        return saveMode;
     }
 
     public List<Property> getProperties()
@@ -94,7 +94,7 @@ public List<Node> getChildren()
     @Override
     public int hashCode()
     {
-        return Objects.hash(name, elements, notExists, properties, comment);
+        return Objects.hash(name, elements, saveMode, properties, comment);
     }
 
     @Override
@@ -109,7 +109,7 @@ public boolean equals(Object obj)
         CreateTable o = (CreateTable) obj;
         return Objects.equals(name, o.name) &&
                 Objects.equals(elements, o.elements) &&
-                Objects.equals(notExists, o.notExists) &&
+                Objects.equals(saveMode, o.saveMode) &&
                 Objects.equals(properties, o.properties) &&
                 Objects.equals(comment, o.comment);
     }
@@ -120,7 +120,7 @@ public String toString()
         return toStringHelper(this)
                 .add("name", name)
                 .add("elements", elements)
-                .add("notExists", notExists)
+                .add("saveMode", saveMode)
                 .add("properties", properties)
                 .add("comment", comment)
                 .toString();
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/CreateTableAsSelect.java b/core/trino-parser/src/main/java/io/trino/sql/tree/CreateTableAsSelect.java
index 628c3e4b1c65..b379549b6561 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/CreateTableAsSelect.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/CreateTableAsSelect.java
@@ -27,28 +27,28 @@ public class CreateTableAsSelect
 {
     private final QualifiedName name;
     private final Query query;
-    private final boolean notExists;
+    private final SaveMode saveMode;
     private final List<Property> properties;
     private final boolean withData;
     private final Optional<List<Identifier>> columnAliases;
     private final Optional<String> comment;
 
-    public CreateTableAsSelect(QualifiedName name, Query query, boolean notExists, List<Property> properties, boolean withData, Optional<List<Identifier>> columnAliases, Optional<String> comment)
+    public CreateTableAsSelect(QualifiedName name, Query query, SaveMode saveMode, List<Property> properties, boolean withData, Optional<List<Identifier>> columnAliases, Optional<String> comment)
     {
-        this(Optional.empty(), name, query, notExists, properties, withData, columnAliases, comment);
+        this(Optional.empty(), name, query, saveMode, properties, withData, columnAliases, comment);
     }
 
-    public CreateTableAsSelect(NodeLocation location, QualifiedName name, Query query, boolean notExists, List<Property> properties, boolean withData, Optional<List<Identifier>> columnAliases, Optional<String> comment)
+    public CreateTableAsSelect(NodeLocation location, QualifiedName name, Query query, SaveMode saveMode, List<Property> properties, boolean withData, Optional<List<Identifier>> columnAliases, Optional<String> comment)
     {
-        this(Optional.of(location), name, query, notExists, properties, withData, columnAliases, comment);
+        this(Optional.of(location), name, query, saveMode, properties, withData, columnAliases, comment);
     }
 
-    private CreateTableAsSelect(Optional<NodeLocation> location, QualifiedName name, Query query, boolean notExists, List<Property> properties, boolean withData, Optional<List<Identifier>> columnAliases, Optional<String> comment)
+    private CreateTableAsSelect(Optional<NodeLocation> location, QualifiedName name, Query query, SaveMode saveMode, List<Property> properties, boolean withData, Optional<List<Identifier>> columnAliases, Optional<String> comment)
     {
         super(location);
         this.name = requireNonNull(name, "name is null");
         this.query = requireNonNull(query, "query is null");
-        this.notExists = notExists;
+        this.saveMode = requireNonNull(saveMode, "saveMode is null");
         this.properties = ImmutableList.copyOf(requireNonNull(properties, "properties is null"));
         this.withData = withData;
         this.columnAliases = columnAliases;
@@ -65,9 +65,9 @@ public Query getQuery()
         return query;
     }
 
-    public boolean isNotExists()
+    public SaveMode getSaveMode()
     {
-        return notExists;
+        return saveMode;
     }
 
     public List<Property> getProperties()
@@ -108,7 +108,7 @@ public List<Node> getChildren()
     @Override
     public int hashCode()
     {
-        return Objects.hash(name, query, properties, withData, columnAliases, comment);
+        return Objects.hash(name, query, saveMode, properties, withData, columnAliases, comment);
     }
 
     @Override
@@ -123,7 +123,7 @@ public boolean equals(Object obj)
         CreateTableAsSelect o = (CreateTableAsSelect) obj;
         return Objects.equals(name, o.name)
                 && Objects.equals(query, o.query)
-                && Objects.equals(notExists, o.notExists)
+                && Objects.equals(saveMode, o.saveMode)
                 && Objects.equals(properties, o.properties)
                 && Objects.equals(withData, o.withData)
                 && Objects.equals(columnAliases, o.columnAliases)
@@ -136,7 +136,7 @@ public String toString()
         return toStringHelper(this)
                 .add("name", name)
                 .add("query", query)
-                .add("notExists", notExists)
+                .add("saveMode", saveMode)
                 .add("properties", properties)
                 .add("withData", withData)
                 .add("columnAliases", columnAliases)
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/Cube.java b/core/trino-parser/src/main/java/io/trino/sql/tree/Cube.java
deleted file mode 100644
index 2a5b567ecded..000000000000
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/Cube.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed 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 io.trino.sql.tree;
-
-import com.google.common.collect.ImmutableList;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static java.util.Objects.requireNonNull;
-
-public final class Cube
-        extends GroupingElement
-{
-    private final List<Expression> columns;
-
-    public Cube(List<Expression> columns)
-    {
-        this(Optional.empty(), columns);
-    }
-
-    public Cube(NodeLocation location, List<Expression> columns)
-    {
-        this(Optional.of(location), columns);
-    }
-
-    private Cube(Optional<NodeLocation> location, List<Expression> columns)
-    {
-        super(location);
-        this.columns = ImmutableList.copyOf(requireNonNull(columns, "columns is null"));
-    }
-
-    @Override
-    public List<Expression> getExpressions()
-    {
-        return columns;
-    }
-
-    @Override
-    protected <R, C> R accept(AstVisitor<R, C> visitor, C context)
-    {
-        return visitor.visitCube(this, context);
-    }
-
-    @Override
-    public List<Node> getChildren()
-    {
-        return ImmutableList.of();
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Cube cube = (Cube) o;
-        return Objects.equals(columns, cube.columns);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(columns);
-    }
-
-    @Override
-    public String toString()
-    {
-        return toStringHelper(this)
-                .add("columns", columns)
-                .toString();
-    }
-}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/DefaultTraversalVisitor.java b/core/trino-parser/src/main/java/io/trino/sql/tree/DefaultTraversalVisitor.java
index 9b2857ee4995..96d10cf7e6a7 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/DefaultTraversalVisitor.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/DefaultTraversalVisitor.java
@@ -606,18 +606,6 @@ protected Void visitGroupBy(GroupBy node, C context)
         return null;
     }
 
-    @Override
-    protected Void visitCube(Cube node, C context)
-    {
-        return null;
-    }
-
-    @Override
-    protected Void visitRollup(Rollup node, C context)
-    {
-        return null;
-    }
-
     @Override
     protected Void visitSimpleGroupBy(SimpleGroupBy node, C context)
     {
@@ -1003,4 +991,34 @@ protected Void visitTableFunctionInvocation(TableFunctionInvocation node, C cont
 
         return null;
     }
+
+    @Override
+    protected Void visitJsonTable(JsonTable node, C context)
+    {
+        process(node.getJsonPathInvocation(), context);
+        for (JsonTableColumnDefinition column : node.getColumns()) {
+            process(column, context);
+        }
+
+        return null;
+    }
+
+    @Override
+    protected Void visitValueColumn(ValueColumn node, C context)
+    {
+        node.getEmptyDefault().ifPresent(expression -> process(expression, context));
+        node.getErrorDefault().ifPresent(expression -> process(expression, context));
+
+        return null;
+    }
+
+    @Override
+    protected Void visitNestedColumns(NestedColumns node, C context)
+    {
+        for (JsonTableColumnDefinition column : node.getColumns()) {
+            process(column, context);
+        }
+
+        return null;
+    }
 }
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/DeterministicCharacteristic.java b/core/trino-parser/src/main/java/io/trino/sql/tree/DeterministicCharacteristic.java
new file mode 100644
index 000000000000..790b0c892adc
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/DeterministicCharacteristic.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+
+public final class DeterministicCharacteristic
+        extends RoutineCharacteristic
+{
+    private final boolean deterministic;
+
+    public DeterministicCharacteristic(boolean deterministic)
+    {
+        this(Optional.empty(), deterministic);
+    }
+
+    public DeterministicCharacteristic(NodeLocation location, boolean deterministic)
+    {
+        this(Optional.of(location), deterministic);
+    }
+
+    private DeterministicCharacteristic(Optional<NodeLocation> location, boolean deterministic)
+    {
+        super(location);
+        this.deterministic = deterministic;
+    }
+
+    public boolean isDeterministic()
+    {
+        return deterministic;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitDeterministicCharacteristic(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof DeterministicCharacteristic other) &&
+                (deterministic == other.deterministic);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(deterministic);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("deterministic", deterministic)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/DropFunction.java b/core/trino-parser/src/main/java/io/trino/sql/tree/DropFunction.java
new file mode 100644
index 000000000000..5587f6e68ad2
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/DropFunction.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public class DropFunction
+        extends Statement
+{
+    private final QualifiedName name;
+    private final List<ParameterDeclaration> parameters;
+    private final boolean exists;
+
+    public DropFunction(QualifiedName name, List<ParameterDeclaration> parameters, boolean exists)
+    {
+        this(Optional.empty(), name, parameters, exists);
+    }
+
+    public DropFunction(NodeLocation location, QualifiedName name, List<ParameterDeclaration> parameters, boolean exists)
+    {
+        this(Optional.of(location), name, parameters, exists);
+    }
+
+    private DropFunction(Optional<NodeLocation> location, QualifiedName name, List<ParameterDeclaration> parameters, boolean exists)
+    {
+        super(location);
+        this.name = requireNonNull(name, "name is null");
+        this.parameters = ImmutableList.copyOf(requireNonNull(parameters, "parameters is null"));
+        this.exists = exists;
+    }
+
+    public QualifiedName getName()
+    {
+        return name;
+    }
+
+    public List<ParameterDeclaration> getParameters()
+    {
+        return parameters;
+    }
+
+    public boolean isExists()
+    {
+        return exists;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitDropFunction(this, context);
+    }
+
+    @Override
+    public List<Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(name, exists);
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj) {
+            return true;
+        }
+        if ((obj == null) || (getClass() != obj.getClass())) {
+            return false;
+        }
+        DropFunction o = (DropFunction) obj;
+        return Objects.equals(name, o.name)
+                && (exists == o.exists);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("name", name)
+                .add("exists", exists)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/ElseClause.java b/core/trino-parser/src/main/java/io/trino/sql/tree/ElseClause.java
new file mode 100644
index 000000000000..68e1f8b656e2
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/ElseClause.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class ElseClause
+        extends Node
+{
+    private final List<ControlStatement> statements;
+
+    public ElseClause(List<ControlStatement> statements)
+    {
+        this(Optional.empty(), statements);
+    }
+
+    public ElseClause(NodeLocation location, List<ControlStatement> statements)
+    {
+        this(Optional.of(location), statements);
+    }
+
+    private ElseClause(Optional<NodeLocation> location, List<ControlStatement> statements)
+    {
+        super(location);
+        this.statements = requireNonNull(statements, "statements is null");
+    }
+
+    public List<ControlStatement> getStatements()
+    {
+        return statements;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitElseClause(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return statements;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof ElseClause other) &&
+                Objects.equals(statements, other.statements);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(statements);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("statements", statements)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/ElseIfClause.java b/core/trino-parser/src/main/java/io/trino/sql/tree/ElseIfClause.java
new file mode 100644
index 000000000000..853742f63e6c
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/ElseIfClause.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class ElseIfClause
+        extends Node
+{
+    private final Expression expression;
+    private final List<ControlStatement> statements;
+
+    public ElseIfClause(Expression expression, List<ControlStatement> statements)
+    {
+        this(Optional.empty(), expression, statements);
+    }
+
+    public ElseIfClause(NodeLocation location, Expression expression, List<ControlStatement> statements)
+    {
+        this(Optional.of(location), expression, statements);
+    }
+
+    private ElseIfClause(Optional<NodeLocation> location, Expression expression, List<ControlStatement> statements)
+    {
+        super(location);
+        this.expression = requireNonNull(expression, "expression is null");
+        this.statements = requireNonNull(statements, "statements is null");
+    }
+
+    public Expression getExpression()
+    {
+        return expression;
+    }
+
+    public List<ControlStatement> getStatements()
+    {
+        return statements;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitElseIfClause(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.<Node>builder()
+                .add(expression)
+                .addAll(statements)
+                .build();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof ElseIfClause other) &&
+                Objects.equals(expression, other.expression) &&
+                Objects.equals(statements, other.statements);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(expression, statements);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("expression", expression)
+                .add("statements", statements)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/ExecuteImmediate.java b/core/trino-parser/src/main/java/io/trino/sql/tree/ExecuteImmediate.java
new file mode 100644
index 000000000000..b2fa9f293b6d
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/ExecuteImmediate.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public class ExecuteImmediate
+        extends Statement
+{
+    private final StringLiteral statement;
+    private final List<Expression> parameters;
+
+    public ExecuteImmediate(NodeLocation location, StringLiteral statement, List<Expression> parameters)
+    {
+        super(Optional.of(location));
+        this.statement = requireNonNull(statement, "statement is null");
+        this.parameters = ImmutableList.copyOf(parameters);
+    }
+
+    public StringLiteral getStatement()
+    {
+        return statement;
+    }
+
+    public List<Expression> getParameters()
+    {
+        return parameters;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitExecuteImmediate(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.<Node>builder().addAll(parameters).add(statement).build();
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(statement, parameters);
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj) {
+            return true;
+        }
+        if ((obj == null) || (getClass() != obj.getClass())) {
+            return false;
+        }
+        ExecuteImmediate o = (ExecuteImmediate) obj;
+        return Objects.equals(statement, o.statement) &&
+                Objects.equals(parameters, o.parameters);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("statement", statement)
+                .add("parameters", parameters)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/Expression.java b/core/trino-parser/src/main/java/io/trino/sql/tree/Expression.java
index 30e8fc555032..b97770bc4a39 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/Expression.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/Expression.java
@@ -13,10 +13,12 @@
  */
 package io.trino.sql.tree;
 
+import com.google.errorprone.annotations.Immutable;
 import io.trino.sql.ExpressionFormatter;
 
 import java.util.Optional;
 
+@Immutable
 public abstract class Expression
         extends Node
 {
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/ExpressionTreeRewriter.java b/core/trino-parser/src/main/java/io/trino/sql/tree/ExpressionTreeRewriter.java
index 5e761c8d4095..774d4a58b220 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/ExpressionTreeRewriter.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/ExpressionTreeRewriter.java
@@ -652,9 +652,19 @@ protected Expression visitLambdaExpression(LambdaExpression node, Context<C> con
                 }
             }
 
+            List<LambdaArgumentDeclaration> arguments = node.getArguments().stream()
+                    .map(LambdaArgumentDeclaration::getName)
+                    .map(Identifier::getValue)
+                    .map(SymbolReference::new)
+                    .map(expression -> rewrite(expression, context.get()))
+                    .map(SymbolReference::getName)
+                    .map(Identifier::new)
+                    .map(LambdaArgumentDeclaration::new)
+                    .collect(toImmutableList());
+
             Expression body = rewrite(node.getBody(), context.get());
             if (body != node.getBody()) {
-                return new LambdaExpression(node.getArguments(), body);
+                return new LambdaExpression(arguments, body);
             }
 
             return node;
@@ -1328,7 +1338,7 @@ private JsonPathInvocation rewriteJsonPathInvocation(JsonPathInvocation pathInvo
                     .collect(toImmutableList());
 
             if (pathInvocation.getInputExpression() != inputExpression || !sameElements(pathInvocation.getPathParameters(), pathParameters)) {
-                return new JsonPathInvocation(pathInvocation.getLocation(), inputExpression, pathInvocation.getInputFormat(), pathInvocation.getJsonPath(), pathParameters);
+                return new JsonPathInvocation(pathInvocation.getLocation(), inputExpression, pathInvocation.getInputFormat(), pathInvocation.getJsonPath(), pathInvocation.getPathName(), pathParameters);
             }
 
             return pathInvocation;
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/Extract.java b/core/trino-parser/src/main/java/io/trino/sql/tree/Extract.java
index a242276b7300..18d801563459 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/Extract.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/Extract.java
@@ -14,8 +14,7 @@
 package io.trino.sql.tree;
 
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/FunctionSpecification.java b/core/trino-parser/src/main/java/io/trino/sql/tree/FunctionSpecification.java
new file mode 100644
index 000000000000..6c6339f3247d
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/FunctionSpecification.java
@@ -0,0 +1,141 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class FunctionSpecification
+        extends Node
+{
+    private final QualifiedName name;
+    private final List<ParameterDeclaration> parameters;
+    private final ReturnsClause returnsClause;
+    private final List<RoutineCharacteristic> routineCharacteristics;
+    private final ControlStatement statement;
+
+    public FunctionSpecification(
+            QualifiedName name,
+            List<ParameterDeclaration> parameters,
+            ReturnsClause returnsClause,
+            List<RoutineCharacteristic> routineCharacteristics,
+            ControlStatement statement)
+    {
+        this(Optional.empty(), name, parameters, returnsClause, routineCharacteristics, statement);
+    }
+
+    public FunctionSpecification(
+            NodeLocation location,
+            QualifiedName name,
+            List<ParameterDeclaration> parameters,
+            ReturnsClause returnsClause,
+            List<RoutineCharacteristic> routineCharacteristics,
+            ControlStatement statement)
+    {
+        this(Optional.of(location), name, parameters, returnsClause, routineCharacteristics, statement);
+    }
+
+    private FunctionSpecification(
+            Optional<NodeLocation> location,
+            QualifiedName name,
+            List<ParameterDeclaration> parameters,
+            ReturnsClause returnsClause,
+            List<RoutineCharacteristic> routineCharacteristics,
+            ControlStatement statement)
+    {
+        super(location);
+        this.name = requireNonNull(name, "name is null");
+        this.parameters = ImmutableList.copyOf(requireNonNull(parameters, "parameters is null"));
+        this.returnsClause = requireNonNull(returnsClause, "returnClause is null");
+        this.routineCharacteristics = ImmutableList.copyOf(requireNonNull(routineCharacteristics, "routineCharacteristics is null"));
+        this.statement = requireNonNull(statement, "statement is null");
+    }
+
+    public QualifiedName getName()
+    {
+        return name;
+    }
+
+    public List<ParameterDeclaration> getParameters()
+    {
+        return parameters;
+    }
+
+    public ReturnsClause getReturnsClause()
+    {
+        return returnsClause;
+    }
+
+    public List<RoutineCharacteristic> getRoutineCharacteristics()
+    {
+        return routineCharacteristics;
+    }
+
+    public ControlStatement getStatement()
+    {
+        return statement;
+    }
+
+    @Override
+    public List<Node> getChildren()
+    {
+        return ImmutableList.<Node>builder()
+                .addAll(parameters)
+                .add(returnsClause)
+                .addAll(routineCharacteristics)
+                .add(statement)
+                .build();
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitFunctionSpecification(this, context);
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof FunctionSpecification other) &&
+                Objects.equals(name, other.name) &&
+                Objects.equals(parameters, other.parameters) &&
+                Objects.equals(returnsClause, other.returnsClause) &&
+                Objects.equals(routineCharacteristics, other.routineCharacteristics) &&
+                Objects.equals(statement, other.statement);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(name, parameters, returnsClause, routineCharacteristics, statement);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("name", name)
+                .add("parameters", parameters)
+                .add("returnsClause", returnsClause)
+                .add("routineCharacteristics", routineCharacteristics)
+                .add("statement", statement)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/GroupingSets.java b/core/trino-parser/src/main/java/io/trino/sql/tree/GroupingSets.java
index 823f28ee5341..13b2a44d0227 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/GroupingSets.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/GroupingSets.java
@@ -28,26 +28,40 @@
 public final class GroupingSets
         extends GroupingElement
 {
+    public enum Type
+    {
+        EXPLICIT,
+        ROLLUP,
+        CUBE
+    }
+
+    private final Type type;
     private final List<List<Expression>> sets;
 
-    public GroupingSets(List<List<Expression>> groupingSets)
+    public GroupingSets(Type type, List<List<Expression>> groupingSets)
     {
-        this(Optional.empty(), groupingSets);
+        this(Optional.empty(), type, groupingSets);
     }
 
-    public GroupingSets(NodeLocation location, List<List<Expression>> sets)
+    public GroupingSets(NodeLocation location, Type type, List<List<Expression>> sets)
     {
-        this(Optional.of(location), sets);
+        this(Optional.of(location), type, sets);
     }
 
-    private GroupingSets(Optional<NodeLocation> location, List<List<Expression>> sets)
+    private GroupingSets(Optional<NodeLocation> location, Type type, List<List<Expression>> sets)
     {
         super(location);
+        this.type = requireNonNull(type, "type is null");
         requireNonNull(sets, "sets is null");
         checkArgument(!sets.isEmpty(), "grouping sets cannot be empty");
         this.sets = sets.stream().map(ImmutableList::copyOf).collect(toImmutableList());
     }
 
+    public Type getType()
+    {
+        return type;
+    }
+
     public List<List<Expression>> getSets()
     {
         return sets;
@@ -82,20 +96,21 @@ public boolean equals(Object o)
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        GroupingSets groupingSets = (GroupingSets) o;
-        return Objects.equals(sets, groupingSets.sets);
+        GroupingSets that = (GroupingSets) o;
+        return type == that.type && sets.equals(that.sets);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(sets);
+        return Objects.hash(type, sets);
     }
 
     @Override
     public String toString()
     {
         return toStringHelper(this)
+                .add("type", type)
                 .add("sets", sets)
                 .toString();
     }
@@ -108,6 +123,6 @@ public boolean shallowEquals(Node other)
         }
 
         GroupingSets that = (GroupingSets) other;
-        return Objects.equals(sets, that.sets);
+        return Objects.equals(sets, that.sets) && Objects.equals(type, that.type);
     }
 }
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/IfStatement.java b/core/trino-parser/src/main/java/io/trino/sql/tree/IfStatement.java
new file mode 100644
index 000000000000..3f03ea3b0afc
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/IfStatement.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class IfStatement
+        extends ControlStatement
+{
+    private final Expression expression;
+    private final List<ControlStatement> statements;
+    private final List<ElseIfClause> elseIfClauses;
+    private final Optional<ElseClause> elseClause;
+
+    public IfStatement(
+            NodeLocation location,
+            Expression expression,
+            List<ControlStatement> statements,
+            List<ElseIfClause> elseIfClauses,
+            Optional<ElseClause> elseClause)
+    {
+        super(location);
+        this.expression = requireNonNull(expression, "expression is null");
+        this.statements = requireNonNull(statements, "statements is null");
+        this.elseIfClauses = requireNonNull(elseIfClauses, "elseIfClauses is null");
+        this.elseClause = requireNonNull(elseClause, "elseClause is null");
+    }
+
+    public Expression getExpression()
+    {
+        return expression;
+    }
+
+    public List<ControlStatement> getStatements()
+    {
+        return statements;
+    }
+
+    public List<ElseIfClause> getElseIfClauses()
+    {
+        return elseIfClauses;
+    }
+
+    public Optional<ElseClause> getElseClause()
+    {
+        return elseClause;
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        ImmutableList.Builder<Node> children = ImmutableList.<Node>builder()
+                .add(expression)
+                .addAll(statements)
+                .addAll(elseIfClauses);
+        elseClause.ifPresent(children::add);
+        return children.build();
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitIfStatement(this, context);
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof IfStatement other) &&
+                Objects.equals(expression, other.expression) &&
+                Objects.equals(statements, other.statements) &&
+                Objects.equals(elseIfClauses, other.elseIfClauses) &&
+                Objects.equals(elseClause, other.elseClause);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(expression, statements, elseIfClauses, elseClause);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("expression", expression)
+                .add("statements", statements)
+                .add("elseIfClauses", elseIfClauses)
+                .add("elseClause", elseClause)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/IterateStatement.java b/core/trino-parser/src/main/java/io/trino/sql/tree/IterateStatement.java
new file mode 100644
index 000000000000..e49c6052c3b3
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/IterateStatement.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class IterateStatement
+        extends ControlStatement
+{
+    private final Identifier label;
+
+    public IterateStatement(NodeLocation location, Identifier label)
+    {
+        super(location);
+        this.label = requireNonNull(label, "label is null");
+    }
+
+    public Identifier getLabel()
+    {
+        return label;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitIterateStatement(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        IterateStatement that = (IterateStatement) o;
+        return Objects.equals(label, that.label);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(label);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("label", label)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/JsonPathInvocation.java b/core/trino-parser/src/main/java/io/trino/sql/tree/JsonPathInvocation.java
index 37a198f59169..da3ec5264ba2 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/JsonPathInvocation.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/JsonPathInvocation.java
@@ -29,6 +29,7 @@ public class JsonPathInvocation
     private final Expression inputExpression;
     private final JsonFormat inputFormat;
     private final StringLiteral jsonPath;
+    private final Optional<Identifier> pathName;
     private final List<JsonPathParameter> pathParameters;
 
     public JsonPathInvocation(
@@ -36,17 +37,20 @@ public JsonPathInvocation(
             Expression inputExpression,
             JsonFormat inputFormat,
             StringLiteral jsonPath,
+            Optional<Identifier> pathName,
             List<JsonPathParameter> pathParameters)
     {
         super(location);
         requireNonNull(inputExpression, "inputExpression is null");
         requireNonNull(inputFormat, "inputFormat is null");
         requireNonNull(jsonPath, "jsonPath is null");
+        requireNonNull(pathName, "pathName is null");
         requireNonNull(pathParameters, "pathParameters is null");
 
         this.inputExpression = inputExpression;
         this.inputFormat = inputFormat;
         this.jsonPath = jsonPath;
+        this.pathName = pathName;
         this.pathParameters = ImmutableList.copyOf(pathParameters);
     }
 
@@ -65,6 +69,11 @@ public StringLiteral getJsonPath()
         return jsonPath;
     }
 
+    public Optional<Identifier> getPathName()
+    {
+        return pathName;
+    }
+
     public List<JsonPathParameter> getPathParameters()
     {
         return pathParameters;
@@ -101,13 +110,14 @@ public boolean equals(Object o)
         return Objects.equals(inputExpression, that.inputExpression) &&
                 inputFormat == that.inputFormat &&
                 Objects.equals(jsonPath, that.jsonPath) &&
+                Objects.equals(pathName, that.pathName) &&
                 Objects.equals(pathParameters, that.pathParameters);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(inputExpression, inputFormat, jsonPath, pathParameters);
+        return Objects.hash(inputExpression, inputFormat, jsonPath, pathName, pathParameters);
     }
 
     @Override
@@ -117,7 +127,9 @@ public boolean shallowEquals(Node other)
             return false;
         }
 
-        return inputFormat == ((JsonPathInvocation) other).inputFormat;
+        JsonPathInvocation otherInvocation = (JsonPathInvocation) other;
+        return inputFormat == otherInvocation.inputFormat &&
+                pathName.equals(otherInvocation.getPathName());
     }
 
     @Override
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTable.java b/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTable.java
new file mode 100644
index 000000000000..6457bea9daf0
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTable.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+public final class JsonTable
+        extends Relation
+{
+    private final JsonPathInvocation jsonPathInvocation;
+    private final List<JsonTableColumnDefinition> columns;
+    private final Optional<JsonTablePlan> plan;
+    private final Optional<ErrorBehavior> errorBehavior;
+
+    public JsonTable(NodeLocation location, JsonPathInvocation jsonPathInvocation, List<JsonTableColumnDefinition> columns, Optional<JsonTablePlan> plan, Optional<ErrorBehavior> errorBehavior)
+    {
+        super(Optional.of(location));
+        this.jsonPathInvocation = requireNonNull(jsonPathInvocation, "jsonPathInvocation is null");
+        this.columns = ImmutableList.copyOf(columns);
+        checkArgument(!columns.isEmpty(), "columns is empty");
+        this.plan = requireNonNull(plan, "plan is null");
+        this.errorBehavior = requireNonNull(errorBehavior, "errorBehavior is null");
+    }
+
+    public enum ErrorBehavior
+    {
+        ERROR,
+        EMPTY
+    }
+
+    public JsonPathInvocation getJsonPathInvocation()
+    {
+        return jsonPathInvocation;
+    }
+
+    public List<JsonTableColumnDefinition> getColumns()
+    {
+        return columns;
+    }
+
+    public Optional<JsonTablePlan> getPlan()
+    {
+        return plan;
+    }
+
+    public Optional<ErrorBehavior> getErrorBehavior()
+    {
+        return errorBehavior;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitJsonTable(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        ImmutableList.Builder<Node> children = ImmutableList.builder();
+        children.add(jsonPathInvocation);
+        children.addAll(columns);
+        plan.ifPresent(children::add);
+        return children.build();
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("jsonPathInvocation", jsonPathInvocation)
+                .add("columns", columns)
+                .add("plan", plan.orElse(null))
+                .add("errorBehavior", errorBehavior.orElse(null))
+                .omitNullValues()
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj) {
+            return true;
+        }
+        if ((obj == null) || (getClass() != obj.getClass())) {
+            return false;
+        }
+        JsonTable o = (JsonTable) obj;
+        return Objects.equals(jsonPathInvocation, o.jsonPathInvocation) &&
+                Objects.equals(columns, o.columns) &&
+                Objects.equals(plan, o.plan) &&
+                Objects.equals(errorBehavior, o.errorBehavior);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(jsonPathInvocation, columns, plan, errorBehavior);
+    }
+
+    @Override
+    public boolean shallowEquals(Node other)
+    {
+        if (!sameClass(this, other)) {
+            return false;
+        }
+
+        JsonTable otherNode = (JsonTable) other;
+        return Objects.equals(errorBehavior, otherNode.errorBehavior);
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTableColumnDefinition.java b/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTableColumnDefinition.java
new file mode 100644
index 000000000000..0f33ae12c4da
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTableColumnDefinition.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import java.util.Optional;
+
+public abstract class JsonTableColumnDefinition
+        extends Node
+{
+    protected JsonTableColumnDefinition(NodeLocation location)
+    {
+        super(Optional.of(location));
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTableDefaultPlan.java b/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTableDefaultPlan.java
new file mode 100644
index 000000000000..97fed7ee104f
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTableDefaultPlan.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public class JsonTableDefaultPlan
+        extends JsonTablePlan
+{
+    private final ParentChildPlanType parentChild;
+    private final SiblingsPlanType siblings;
+
+    public JsonTableDefaultPlan(NodeLocation location, ParentChildPlanType parentChildPlanType, SiblingsPlanType siblingsPlanType)
+    {
+        super(location);
+        this.parentChild = requireNonNull(parentChildPlanType, "parentChild is null");
+        this.siblings = requireNonNull(siblingsPlanType, "siblings is null");
+    }
+
+    public ParentChildPlanType getParentChild()
+    {
+        return parentChild;
+    }
+
+    public SiblingsPlanType getSiblings()
+    {
+        return siblings;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitJsonTableDefaultPlan(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("parentChild", parentChild)
+                .add("siblings", siblings)
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        JsonTableDefaultPlan that = (JsonTableDefaultPlan) o;
+        return parentChild == that.parentChild &&
+                siblings == that.siblings;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(parentChild, siblings);
+    }
+
+    @Override
+    public boolean shallowEquals(Node other)
+    {
+        if (!sameClass(this, other)) {
+            return false;
+        }
+
+        JsonTableDefaultPlan otherPlan = (JsonTableDefaultPlan) other;
+
+        return parentChild == otherPlan.parentChild &&
+                siblings == otherPlan.siblings;
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTablePlan.java b/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTablePlan.java
new file mode 100644
index 000000000000..88d963cae117
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTablePlan.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import java.util.Optional;
+
+public abstract class JsonTablePlan
+        extends Node
+{
+    protected JsonTablePlan(NodeLocation location)
+    {
+        super(Optional.of(location));
+    }
+
+    public enum ParentChildPlanType
+    {
+        OUTER,
+        INNER
+    }
+
+    public enum SiblingsPlanType
+    {
+        UNION,
+        CROSS
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTableSpecificPlan.java b/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTableSpecificPlan.java
new file mode 100644
index 000000000000..6b582a124da5
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/JsonTableSpecificPlan.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+public abstract class JsonTableSpecificPlan
+        extends JsonTablePlan
+{
+    protected JsonTableSpecificPlan(NodeLocation location)
+    {
+        super(location);
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/LanguageCharacteristic.java b/core/trino-parser/src/main/java/io/trino/sql/tree/LanguageCharacteristic.java
new file mode 100644
index 000000000000..b89cc1fde7ec
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/LanguageCharacteristic.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class LanguageCharacteristic
+        extends RoutineCharacteristic
+{
+    private final Identifier language;
+
+    public LanguageCharacteristic(Identifier language)
+    {
+        this(Optional.empty(), language);
+    }
+
+    public LanguageCharacteristic(NodeLocation location, Identifier language)
+    {
+        this(Optional.of(location), language);
+    }
+
+    private LanguageCharacteristic(Optional<NodeLocation> location, Identifier language)
+    {
+        super(location);
+        this.language = requireNonNull(language, "comment is null");
+    }
+
+    public Identifier getLanguage()
+    {
+        return language;
+    }
+
+    @Override
+    protected <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitLanguageCharacteristic(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof LanguageCharacteristic other) &&
+                language.equals(other.language);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return language.hashCode();
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("language", language)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/LeaveStatement.java b/core/trino-parser/src/main/java/io/trino/sql/tree/LeaveStatement.java
new file mode 100644
index 000000000000..041753c5eb0b
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/LeaveStatement.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class LeaveStatement
+        extends ControlStatement
+{
+    private final Identifier label;
+
+    public LeaveStatement(NodeLocation location, Identifier label)
+    {
+        super(location);
+        this.label = requireNonNull(label, "label is null");
+    }
+
+    public Identifier getLabel()
+    {
+        return label;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitLeaveStatement(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof LeaveStatement other) &&
+                Objects.equals(label, other.label);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(label);
+    }
+
+    @Override
+
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("label", label)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/LongLiteral.java b/core/trino-parser/src/main/java/io/trino/sql/tree/LongLiteral.java
index 3e434ef0701f..cc8d656f11a7 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/LongLiteral.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/LongLiteral.java
@@ -22,7 +22,8 @@
 public class LongLiteral
         extends Literal
 {
-    private final long value;
+    private final String value;
+    private final long parsedValue;
 
     public LongLiteral(String value)
     {
@@ -39,18 +40,24 @@ private LongLiteral(Optional<NodeLocation> location, String value)
         super(location);
         requireNonNull(value, "value is null");
         try {
-            this.value = Long.parseLong(value);
+            this.value = value;
+            this.parsedValue = parse(value);
         }
         catch (NumberFormatException e) {
             throw new ParsingException("Invalid numeric literal: " + value);
         }
     }
 
-    public long getValue()
+    public String getValue()
     {
         return value;
     }
 
+    public long getParsedValue()
+    {
+        return parsedValue;
+    }
+
     @Override
     public <R, C> R accept(AstVisitor<R, C> visitor, C context)
     {
@@ -69,7 +76,7 @@ public boolean equals(Object o)
 
         LongLiteral that = (LongLiteral) o;
 
-        if (value != that.value) {
+        if (parsedValue != that.parsedValue) {
             return false;
         }
 
@@ -79,7 +86,7 @@ public boolean equals(Object o)
     @Override
     public int hashCode()
     {
-        return (int) (value ^ (value >>> 32));
+        return (int) (parsedValue ^ (parsedValue >>> 32));
     }
 
     @Override
@@ -89,6 +96,24 @@ public boolean shallowEquals(Node other)
             return false;
         }
 
-        return value == ((LongLiteral) other).value;
+        return parsedValue == ((LongLiteral) other).parsedValue;
+    }
+
+    private static long parse(String value)
+    {
+        value = value.replace("_", "");
+
+        if (value.startsWith("0x") || value.startsWith("0X")) {
+            return Long.parseLong(value.substring(2), 16);
+        }
+        else if (value.startsWith("0b") || value.startsWith("0B")) {
+            return Long.parseLong(value.substring(2), 2);
+        }
+        else if (value.startsWith("0o") || value.startsWith("0O")) {
+            return Long.parseLong(value.substring(2), 8);
+        }
+        else {
+            return Long.parseLong(value);
+        }
     }
 }
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/LoopStatement.java b/core/trino-parser/src/main/java/io/trino/sql/tree/LoopStatement.java
new file mode 100644
index 000000000000..08cdc000c667
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/LoopStatement.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class LoopStatement
+        extends ControlStatement
+{
+    private final Optional<Identifier> label;
+    private final List<ControlStatement> statements;
+
+    public LoopStatement(NodeLocation location, Optional<Identifier> label, List<ControlStatement> statements)
+    {
+        super(location);
+        this.label = requireNonNull(label, "label is null");
+        this.statements = requireNonNull(statements, "statements is null");
+    }
+
+    public Optional<Identifier> getLabel()
+    {
+        return label;
+    }
+
+    public List<ControlStatement> getStatements()
+    {
+        return statements;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitLoopStatement(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return statements;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof LoopStatement other) &&
+                Objects.equals(label, other.label) &&
+                Objects.equals(statements, other.statements);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(label, statements);
+    }
+
+    @Override
+
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("label", label)
+                .add("statements", statements)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/NestedColumns.java b/core/trino-parser/src/main/java/io/trino/sql/tree/NestedColumns.java
new file mode 100644
index 000000000000..d76a182793a4
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/NestedColumns.java
@@ -0,0 +1,114 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+public class NestedColumns
+        extends JsonTableColumnDefinition
+{
+    private final StringLiteral jsonPath;
+    private final Optional<Identifier> pathName;
+    private final List<JsonTableColumnDefinition> columns;
+
+    public NestedColumns(NodeLocation location, StringLiteral jsonPath, Optional<Identifier> pathName, List<JsonTableColumnDefinition> columns)
+    {
+        super(location);
+        this.jsonPath = requireNonNull(jsonPath, "jsonPath is null");
+        this.pathName = requireNonNull(pathName, "pathName is null");
+        this.columns = ImmutableList.copyOf(columns);
+        checkArgument(!columns.isEmpty(), "columns is empty");
+    }
+
+    public StringLiteral getJsonPath()
+    {
+        return jsonPath;
+    }
+
+    public Optional<Identifier> getPathName()
+    {
+        return pathName;
+    }
+
+    public List<JsonTableColumnDefinition> getColumns()
+    {
+        return columns;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitNestedColumns(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.<Node>builder()
+                .add(jsonPath)
+                .addAll(columns)
+                .build();
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("jsonPath", jsonPath)
+                .add("pathName", pathName.orElse(null))
+                .add("columns", columns)
+                .omitNullValues()
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        NestedColumns that = (NestedColumns) o;
+        return Objects.equals(jsonPath, that.jsonPath) &&
+                Objects.equals(pathName, that.pathName) &&
+                Objects.equals(columns, that.columns);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(jsonPath, pathName, columns);
+    }
+
+    @Override
+    public boolean shallowEquals(Node other)
+    {
+        if (!sameClass(this, other)) {
+            return false;
+        }
+
+        return pathName.equals(((NestedColumns) other).pathName);
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/NullInputCharacteristic.java b/core/trino-parser/src/main/java/io/trino/sql/tree/NullInputCharacteristic.java
new file mode 100644
index 000000000000..ab69f12bf2c1
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/NullInputCharacteristic.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+
+public final class NullInputCharacteristic
+        extends RoutineCharacteristic
+{
+    public static NullInputCharacteristic returnsNullOnNullInput()
+    {
+        return new NullInputCharacteristic(Optional.empty(), false);
+    }
+
+    public static NullInputCharacteristic returnsNullOnNullInput(NodeLocation location)
+    {
+        return new NullInputCharacteristic(Optional.of(location), false);
+    }
+
+    public static NullInputCharacteristic calledOnNullInput()
+    {
+        return new NullInputCharacteristic(Optional.empty(), true);
+    }
+
+    public static NullInputCharacteristic calledOnNullInput(NodeLocation location)
+    {
+        return new NullInputCharacteristic(Optional.of(location), true);
+    }
+
+    private final boolean calledOnNull;
+
+    private NullInputCharacteristic(Optional<NodeLocation> location, boolean calledOnNull)
+    {
+        super(location);
+        this.calledOnNull = calledOnNull;
+    }
+
+    public boolean isCalledOnNull()
+    {
+        return calledOnNull;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitNullInputCharacteristic(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof NullInputCharacteristic other) &&
+                (calledOnNull == other.calledOnNull);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(calledOnNull);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("calledOnNull", calledOnNull)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/OrdinalityColumn.java b/core/trino-parser/src/main/java/io/trino/sql/tree/OrdinalityColumn.java
new file mode 100644
index 000000000000..08d1d6e54685
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/OrdinalityColumn.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public class OrdinalityColumn
+        extends JsonTableColumnDefinition
+{
+    private final Identifier name;
+
+    public OrdinalityColumn(NodeLocation location, Identifier name)
+    {
+        super(location);
+        this.name = requireNonNull(name, "name is null");
+    }
+
+    public Identifier getName()
+    {
+        return name;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitOrdinalityColumn(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("name", name)
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        OrdinalityColumn that = (OrdinalityColumn) o;
+        return Objects.equals(name, that.name);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(name);
+    }
+
+    @Override
+    public boolean shallowEquals(Node other)
+    {
+        if (!sameClass(this, other)) {
+            return false;
+        }
+
+        return Objects.equals(name, ((OrdinalityColumn) other).name);
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/ParameterDeclaration.java b/core/trino-parser/src/main/java/io/trino/sql/tree/ParameterDeclaration.java
new file mode 100644
index 000000000000..afccf350d47c
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/ParameterDeclaration.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class ParameterDeclaration
+        extends Node
+{
+    private final Optional<Identifier> name;
+    private final DataType type;
+
+    public ParameterDeclaration(Optional<Identifier> name, DataType type)
+    {
+        this(Optional.empty(), name, type);
+    }
+
+    public ParameterDeclaration(NodeLocation location, Optional<Identifier> name, DataType type)
+    {
+        this(Optional.of(location), name, type);
+    }
+
+    private ParameterDeclaration(Optional<NodeLocation> location, Optional<Identifier> name, DataType type)
+    {
+        super(location);
+        this.name = requireNonNull(name, "name is null");
+        this.type = requireNonNull(type, "type is null");
+    }
+
+    public Optional<Identifier> getName()
+    {
+        return name;
+    }
+
+    public DataType getType()
+    {
+        return type;
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitParameterDeclaration(this, context);
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof ParameterDeclaration other) &&
+                Objects.equals(name, other.name) &&
+                Objects.equals(type, other.type);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(name, type);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("name", name)
+                .add("type", type)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/PlanLeaf.java b/core/trino-parser/src/main/java/io/trino/sql/tree/PlanLeaf.java
new file mode 100644
index 000000000000..089bc5f28dac
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/PlanLeaf.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public class PlanLeaf
+        extends JsonTableSpecificPlan
+{
+    private final Identifier name;
+
+    public PlanLeaf(NodeLocation location, Identifier name)
+    {
+        super(location);
+        this.name = requireNonNull(name, "name is null");
+    }
+
+    public Identifier getName()
+    {
+        return name;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitPlanLeaf(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("name", name)
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        return Objects.equals(name, ((PlanLeaf) o).name);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(name);
+    }
+
+    @Override
+    public boolean shallowEquals(Node other)
+    {
+        if (!sameClass(this, other)) {
+            return false;
+        }
+
+        return name.equals(((PlanLeaf) other).name);
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/PlanParentChild.java b/core/trino-parser/src/main/java/io/trino/sql/tree/PlanParentChild.java
new file mode 100644
index 000000000000..99ff6ccef202
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/PlanParentChild.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public class PlanParentChild
+        extends JsonTableSpecificPlan
+{
+    private final ParentChildPlanType type;
+    private final PlanLeaf parent;
+    private final JsonTableSpecificPlan child;
+
+    public PlanParentChild(NodeLocation location, ParentChildPlanType type, PlanLeaf parent, JsonTableSpecificPlan child)
+    {
+        super(location);
+        this.type = requireNonNull(type, "type is null");
+        this.parent = requireNonNull(parent, "parent is null");
+        this.child = requireNonNull(child, "child is null");
+    }
+
+    public ParentChildPlanType getType()
+    {
+        return type;
+    }
+
+    public PlanLeaf getParent()
+    {
+        return parent;
+    }
+
+    public JsonTableSpecificPlan getChild()
+    {
+        return child;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitPlanParentChild(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of(child);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("type", type)
+                .add("parent", parent)
+                .add("child", child)
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        PlanParentChild that = (PlanParentChild) o;
+        return type == that.type &&
+                Objects.equals(parent, that.parent) &&
+                Objects.equals(child, that.child);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(type, parent, child);
+    }
+
+    @Override
+    public boolean shallowEquals(Node other)
+    {
+        if (!sameClass(this, other)) {
+            return false;
+        }
+
+        PlanParentChild otherPlan = (PlanParentChild) other;
+
+        return type == otherPlan.type &&
+                parent.equals(otherPlan.parent);
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/PlanSiblings.java b/core/trino-parser/src/main/java/io/trino/sql/tree/PlanSiblings.java
new file mode 100644
index 000000000000..844eb4ebb8dc
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/PlanSiblings.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+public class PlanSiblings
+        extends JsonTableSpecificPlan
+{
+    private final SiblingsPlanType type;
+    private final List<JsonTableSpecificPlan> siblings;
+
+    public PlanSiblings(NodeLocation location, SiblingsPlanType type, List<JsonTableSpecificPlan> siblings)
+    {
+        super(location);
+        this.type = requireNonNull(type, "type is null");
+        this.siblings = ImmutableList.copyOf(siblings);
+        checkArgument(siblings.size() >= 2, "sibling plan must contain at least two siblings, actual: " + siblings.size());
+    }
+
+    public SiblingsPlanType getType()
+    {
+        return type;
+    }
+
+    public List<JsonTableSpecificPlan> getSiblings()
+    {
+        return siblings;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitPlanSiblings(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return siblings;
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("type", type)
+                .add("siblings", siblings)
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        PlanSiblings that = (PlanSiblings) o;
+        return type == that.type &&
+                Objects.equals(siblings, that.siblings);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(type, siblings);
+    }
+
+    @Override
+    public boolean shallowEquals(Node other)
+    {
+        if (!sameClass(this, other)) {
+            return false;
+        }
+
+        return type == ((PlanSiblings) other).type;
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/QualifiedName.java b/core/trino-parser/src/main/java/io/trino/sql/tree/QualifiedName.java
index 1d8f0787995e..5db15866a70d 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/QualifiedName.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/QualifiedName.java
@@ -60,7 +60,7 @@ private QualifiedName(List<Identifier> originalParts)
     {
         this.originalParts = originalParts;
         // Iteration instead of stream for performance reasons
-        ImmutableList.Builder partsBuilder = ImmutableList.builderWithExpectedSize(originalParts.size());
+        ImmutableList.Builder<String> partsBuilder = ImmutableList.builderWithExpectedSize(originalParts.size());
         for (Identifier identifier : originalParts) {
             partsBuilder.add(mapIdentifier(identifier));
         }
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/Query.java b/core/trino-parser/src/main/java/io/trino/sql/tree/Query.java
index 19afd477eb82..31f8da6698bf 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/Query.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/Query.java
@@ -26,6 +26,7 @@
 public class Query
         extends Statement
 {
+    private final List<FunctionSpecification> functions;
     private final Optional<With> with;
     private final QueryBody queryBody;
     private final Optional<OrderBy> orderBy;
@@ -33,28 +34,31 @@ public class Query
     private final Optional<Node> limit;
 
     public Query(
+            List<FunctionSpecification> functions,
             Optional<With> with,
             QueryBody queryBody,
             Optional<OrderBy> orderBy,
             Optional<Offset> offset,
             Optional<Node> limit)
     {
-        this(Optional.empty(), with, queryBody, orderBy, offset, limit);
+        this(Optional.empty(), functions, with, queryBody, orderBy, offset, limit);
     }
 
     public Query(
             NodeLocation location,
+            List<FunctionSpecification> functions,
             Optional<With> with,
             QueryBody queryBody,
             Optional<OrderBy> orderBy,
             Optional<Offset> offset,
             Optional<Node> limit)
     {
-        this(Optional.of(location), with, queryBody, orderBy, offset, limit);
+        this(Optional.of(location), functions, with, queryBody, orderBy, offset, limit);
     }
 
     private Query(
             Optional<NodeLocation> location,
+            List<FunctionSpecification> functions,
             Optional<With> with,
             QueryBody queryBody,
             Optional<OrderBy> orderBy,
@@ -62,6 +66,7 @@ private Query(
             Optional<Node> limit)
     {
         super(location);
+        requireNonNull(functions, "function si snull");
         requireNonNull(with, "with is null");
         requireNonNull(queryBody, "queryBody is null");
         requireNonNull(orderBy, "orderBy is null");
@@ -69,6 +74,7 @@ private Query(
         requireNonNull(limit, "limit is null");
         checkArgument(!limit.isPresent() || limit.get() instanceof FetchFirst || limit.get() instanceof Limit, "limit must be optional of either FetchFirst or Limit type");
 
+        this.functions = ImmutableList.copyOf(functions);
         this.with = with;
         this.queryBody = queryBody;
         this.orderBy = orderBy;
@@ -76,6 +82,11 @@ private Query(
         this.limit = limit;
     }
 
+    public List<FunctionSpecification> getFunctions()
+    {
+        return functions;
+    }
+
     public Optional<With> getWith()
     {
         return with;
@@ -111,6 +122,7 @@ public <R, C> R accept(AstVisitor<R, C> visitor, C context)
     public List<Node> getChildren()
     {
         ImmutableList.Builder<Node> nodes = ImmutableList.builder();
+        nodes.addAll(functions);
         with.ifPresent(nodes::add);
         nodes.add(queryBody);
         orderBy.ifPresent(nodes::add);
@@ -123,6 +135,7 @@ public List<Node> getChildren()
     public String toString()
     {
         return toStringHelper(this)
+                .add("functions", functions.isEmpty() ? null : functions)
                 .add("with", with.orElse(null))
                 .add("queryBody", queryBody)
                 .add("orderBy", orderBy)
@@ -142,7 +155,8 @@ public boolean equals(Object obj)
             return false;
         }
         Query o = (Query) obj;
-        return Objects.equals(with, o.with) &&
+        return Objects.equals(functions, o.functions) &&
+                Objects.equals(with, o.with) &&
                 Objects.equals(queryBody, o.queryBody) &&
                 Objects.equals(orderBy, o.orderBy) &&
                 Objects.equals(offset, o.offset) &&
@@ -152,7 +166,7 @@ public boolean equals(Object obj)
     @Override
     public int hashCode()
     {
-        return Objects.hash(with, queryBody, orderBy, offset, limit);
+        return Objects.hash(functions, with, queryBody, orderBy, offset, limit);
     }
 
     @Override
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/QueryColumn.java b/core/trino-parser/src/main/java/io/trino/sql/tree/QueryColumn.java
new file mode 100644
index 000000000000..ca932c41ec83
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/QueryColumn.java
@@ -0,0 +1,175 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.sql.tree.JsonPathParameter.JsonFormat;
+import io.trino.sql.tree.JsonQuery.ArrayWrapperBehavior;
+import io.trino.sql.tree.JsonQuery.EmptyOrErrorBehavior;
+import io.trino.sql.tree.JsonQuery.QuotesBehavior;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public class QueryColumn
+        extends JsonTableColumnDefinition
+{
+    private final Identifier name;
+    private final DataType type;
+    private final JsonFormat format;
+    private final Optional<StringLiteral> jsonPath;
+    private final ArrayWrapperBehavior wrapperBehavior;
+    private final Optional<QuotesBehavior> quotesBehavior;
+    private final EmptyOrErrorBehavior emptyBehavior;
+    private final Optional<EmptyOrErrorBehavior> errorBehavior;
+
+    public QueryColumn(
+            NodeLocation location,
+            Identifier name,
+            DataType type,
+            JsonFormat format,
+            Optional<StringLiteral> jsonPath,
+            ArrayWrapperBehavior wrapperBehavior,
+            Optional<QuotesBehavior> quotesBehavior,
+            EmptyOrErrorBehavior emptyBehavior,
+            Optional<EmptyOrErrorBehavior> errorBehavior)
+    {
+        super(location);
+        this.name = requireNonNull(name, "name is null");
+        this.type = requireNonNull(type, "type is null");
+        this.format = requireNonNull(format, "format is null");
+        this.jsonPath = requireNonNull(jsonPath, "jsonPath is null");
+        this.wrapperBehavior = requireNonNull(wrapperBehavior, "wrapperBehavior is null");
+        this.quotesBehavior = requireNonNull(quotesBehavior, "quotesBehavior is null");
+        this.emptyBehavior = requireNonNull(emptyBehavior, "emptyBehavior is null");
+        this.errorBehavior = requireNonNull(errorBehavior, "errorBehavior is null");
+    }
+
+    public Identifier getName()
+    {
+        return name;
+    }
+
+    public DataType getType()
+    {
+        return type;
+    }
+
+    public JsonFormat getFormat()
+    {
+        return format;
+    }
+
+    public Optional<StringLiteral> getJsonPath()
+    {
+        return jsonPath;
+    }
+
+    public ArrayWrapperBehavior getWrapperBehavior()
+    {
+        return wrapperBehavior;
+    }
+
+    public Optional<QuotesBehavior> getQuotesBehavior()
+    {
+        return quotesBehavior;
+    }
+
+    public EmptyOrErrorBehavior getEmptyBehavior()
+    {
+        return emptyBehavior;
+    }
+
+    public Optional<EmptyOrErrorBehavior> getErrorBehavior()
+    {
+        return errorBehavior;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitQueryColumn(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return jsonPath.map(ImmutableList::of).orElse(ImmutableList.of());
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("name", name)
+                .add("type", type)
+                .add("format", format)
+                .add("jsonPath", jsonPath.orElse(null))
+                .add("wrapperBehavior", wrapperBehavior)
+                .add("quotesBehavior", quotesBehavior.orElse(null))
+                .add("emptyBehavior", emptyBehavior)
+                .add("errorBehavior", errorBehavior.orElse(null))
+                .omitNullValues()
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        QueryColumn that = (QueryColumn) o;
+        return Objects.equals(name, that.name) &&
+                Objects.equals(type, that.type) &&
+                Objects.equals(format, that.format) &&
+                Objects.equals(jsonPath, that.jsonPath) &&
+                wrapperBehavior == that.wrapperBehavior &&
+                Objects.equals(quotesBehavior, that.quotesBehavior) &&
+                emptyBehavior == that.emptyBehavior &&
+                Objects.equals(errorBehavior, that.errorBehavior);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(name, type, format, jsonPath, wrapperBehavior, quotesBehavior, emptyBehavior, errorBehavior);
+    }
+
+    @Override
+    public boolean shallowEquals(Node other)
+    {
+        if (!sameClass(this, other)) {
+            return false;
+        }
+
+        QueryColumn otherQueryColumn = (QueryColumn) other;
+
+        return name.equals(otherQueryColumn.name) &&
+                type.equals(otherQueryColumn.type) &&
+                format.equals(otherQueryColumn.format) &&
+                wrapperBehavior == otherQueryColumn.wrapperBehavior &&
+                Objects.equals(quotesBehavior, otherQueryColumn.quotesBehavior) &&
+                emptyBehavior == otherQueryColumn.emptyBehavior &&
+                Objects.equals(errorBehavior, otherQueryColumn.errorBehavior);
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/RenameColumn.java b/core/trino-parser/src/main/java/io/trino/sql/tree/RenameColumn.java
index 2edbc4fdac78..e6f9283569fc 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/RenameColumn.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/RenameColumn.java
@@ -26,12 +26,12 @@ public class RenameColumn
         extends Statement
 {
     private final QualifiedName table;
-    private final Identifier source;
+    private final QualifiedName source;
     private final Identifier target;
     private final boolean tableExists;
     private final boolean columnExists;
 
-    public RenameColumn(NodeLocation location, QualifiedName table, Identifier source, Identifier target, boolean tableExists, boolean columnExists)
+    public RenameColumn(NodeLocation location, QualifiedName table, QualifiedName source, Identifier target, boolean tableExists, boolean columnExists)
     {
         super(Optional.of(location));
         this.table = requireNonNull(table, "table is null");
@@ -46,7 +46,7 @@ public QualifiedName getTable()
         return table;
     }
 
-    public Identifier getSource()
+    public QualifiedName getSource()
     {
         return source;
     }
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/RepeatStatement.java b/core/trino-parser/src/main/java/io/trino/sql/tree/RepeatStatement.java
new file mode 100644
index 000000000000..6dc0067710a5
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/RepeatStatement.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class RepeatStatement
+        extends ControlStatement
+{
+    private final Optional<Identifier> label;
+    private final List<ControlStatement> statements;
+    private final Expression condition;
+
+    public RepeatStatement(NodeLocation location, Optional<Identifier> label, List<ControlStatement> statements, Expression condition)
+    {
+        super(location);
+        this.label = requireNonNull(label, "label is null");
+        this.statements = requireNonNull(statements, "statements is null");
+        this.condition = requireNonNull(condition, "condition is null");
+    }
+
+    public Optional<Identifier> getLabel()
+    {
+        return label;
+    }
+
+    public List<ControlStatement> getStatements()
+    {
+        return statements;
+    }
+
+    public Expression getCondition()
+    {
+        return condition;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitRepeatStatement(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.<Node>builder()
+                .addAll(statements)
+                .add(condition)
+                .build();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof RepeatStatement other) &&
+                Objects.equals(label, other.label) &&
+                Objects.equals(statements, other.statements) &&
+                Objects.equals(condition, other.condition);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(label, statements, condition);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("label", label)
+                .add("statements", statements)
+                .add("condition", condition)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/ResetSessionAuthorization.java b/core/trino-parser/src/main/java/io/trino/sql/tree/ResetSessionAuthorization.java
new file mode 100644
index 000000000000..aaca69e5e4e7
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/ResetSessionAuthorization.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Optional;
+
+public class ResetSessionAuthorization
+        extends Statement
+{
+    public ResetSessionAuthorization()
+    {
+        this(Optional.empty());
+    }
+
+    public ResetSessionAuthorization(NodeLocation location)
+    {
+        this(Optional.of(location));
+    }
+
+    private ResetSessionAuthorization(Optional<NodeLocation> location)
+    {
+        super(location);
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitResetSessionAuthorization(this, context);
+    }
+
+    @Override
+    public List<Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return 0;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj) {
+            return true;
+        }
+        if ((obj == null) || (getClass() != obj.getClass())) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "RESET SESSION AUTHORIZATION";
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/ReturnStatement.java b/core/trino-parser/src/main/java/io/trino/sql/tree/ReturnStatement.java
new file mode 100644
index 000000000000..3b29b8d17c96
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/ReturnStatement.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class ReturnStatement
+        extends ControlStatement
+{
+    private final Expression value;
+
+    public ReturnStatement(NodeLocation location, Expression value)
+    {
+        super(location);
+        this.value = requireNonNull(value, "value is null");
+    }
+
+    public Expression getValue()
+    {
+        return value;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitReturnStatement(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of(value);
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof ReturnStatement other) &&
+                Objects.equals(value, other.value);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(value);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("value", value)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/ReturnsClause.java b/core/trino-parser/src/main/java/io/trino/sql/tree/ReturnsClause.java
new file mode 100644
index 000000000000..03798ebabd22
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/ReturnsClause.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class ReturnsClause
+        extends Node
+{
+    private final DataType returnType;
+
+    public ReturnsClause(NodeLocation location, DataType returnType)
+    {
+        super(Optional.of(location));
+        this.returnType = requireNonNull(returnType, "returnType is null");
+    }
+
+    public DataType getReturnType()
+    {
+        return returnType;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitReturnClause(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof ReturnsClause other) &&
+                returnType.equals(other.returnType);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return returnType.hashCode();
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("returnType", returnType)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/Rollup.java b/core/trino-parser/src/main/java/io/trino/sql/tree/Rollup.java
deleted file mode 100644
index aa079d17c29e..000000000000
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/Rollup.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed 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 io.trino.sql.tree;
-
-import com.google.common.collect.ImmutableList;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static java.util.Objects.requireNonNull;
-
-public final class Rollup
-        extends GroupingElement
-{
-    private final List<Expression> columns;
-
-    public Rollup(List<Expression> columns)
-    {
-        this(Optional.empty(), columns);
-    }
-
-    public Rollup(NodeLocation location, List<Expression> columns)
-    {
-        this(Optional.of(location), columns);
-    }
-
-    private Rollup(Optional<NodeLocation> location, List<Expression> columns)
-    {
-        super(location);
-        this.columns = ImmutableList.copyOf(requireNonNull(columns, "columns is null"));
-    }
-
-    @Override
-    public List<Expression> getExpressions()
-    {
-        return columns;
-    }
-
-    @Override
-    protected <R, C> R accept(AstVisitor<R, C> visitor, C context)
-    {
-        return visitor.visitRollup(this, context);
-    }
-
-    @Override
-    public List<Node> getChildren()
-    {
-        return ImmutableList.of();
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Rollup rollup = (Rollup) o;
-        return Objects.equals(columns, rollup.columns);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(columns);
-    }
-
-    @Override
-    public String toString()
-    {
-        return toStringHelper(this)
-                .add("columns", columns)
-                .toString();
-    }
-}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/RoutineCharacteristic.java b/core/trino-parser/src/main/java/io/trino/sql/tree/RoutineCharacteristic.java
new file mode 100644
index 000000000000..771428342d70
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/RoutineCharacteristic.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import java.util.Optional;
+
+public abstract sealed class RoutineCharacteristic
+        extends Node
+        permits CommentCharacteristic, DeterministicCharacteristic, LanguageCharacteristic, NullInputCharacteristic, SecurityCharacteristic
+{
+    protected RoutineCharacteristic(Optional<NodeLocation> location)
+    {
+        super(location);
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/SaveMode.java b/core/trino-parser/src/main/java/io/trino/sql/tree/SaveMode.java
new file mode 100644
index 000000000000..4c08b0cb0516
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/SaveMode.java
@@ -0,0 +1,20 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+public enum SaveMode {
+    IGNORE,
+    REPLACE,
+    FAIL
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/SecurityCharacteristic.java b/core/trino-parser/src/main/java/io/trino/sql/tree/SecurityCharacteristic.java
new file mode 100644
index 000000000000..561d61913112
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/SecurityCharacteristic.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class SecurityCharacteristic
+        extends RoutineCharacteristic
+{
+    public enum Security
+    {
+        INVOKER, DEFINER
+    }
+
+    private final Security security;
+
+    public SecurityCharacteristic(Security security)
+    {
+        this(Optional.empty(), security);
+    }
+
+    public SecurityCharacteristic(NodeLocation location, Security security)
+    {
+        this(Optional.of(location), security);
+    }
+
+    private SecurityCharacteristic(Optional<NodeLocation> location, Security security)
+    {
+        super(location);
+        this.security = requireNonNull(security, "security is null");
+    }
+
+    public Security getSecurity()
+    {
+        return security;
+    }
+
+    @Override
+    protected <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitSecurityCharacteristic(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof SecurityCharacteristic other) &&
+                (security == other.security);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return security.hashCode();
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("security", security)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/SetColumnType.java b/core/trino-parser/src/main/java/io/trino/sql/tree/SetColumnType.java
index 9f5913d0fcb3..bcf1991c135d 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/SetColumnType.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/SetColumnType.java
@@ -26,11 +26,11 @@ public class SetColumnType
         extends Statement
 {
     private final QualifiedName tableName;
-    private final Identifier columnName;
+    private final QualifiedName columnName;
     private final DataType type;
     private final boolean tableExists;
 
-    public SetColumnType(NodeLocation location, QualifiedName tableName, Identifier columnName, DataType type, boolean tableExists)
+    public SetColumnType(NodeLocation location, QualifiedName tableName, QualifiedName columnName, DataType type, boolean tableExists)
     {
         super(Optional.of(location));
         this.tableName = requireNonNull(tableName, "tableName is null");
@@ -44,7 +44,7 @@ public QualifiedName getTableName()
         return tableName;
     }
 
-    public Identifier getColumnName()
+    public QualifiedName getColumnName()
     {
         return columnName;
     }
@@ -68,7 +68,7 @@ public <R, C> R accept(AstVisitor<R, C> visitor, C context)
     @Override
     public List<Node> getChildren()
     {
-        return ImmutableList.of(columnName, type);
+        return ImmutableList.of(type);
     }
 
     @Override
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/SetSessionAuthorization.java b/core/trino-parser/src/main/java/io/trino/sql/tree/SetSessionAuthorization.java
new file mode 100644
index 000000000000..a160758f52d6
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/SetSessionAuthorization.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public class SetSessionAuthorization
+        extends Statement
+{
+    private final Expression user;
+
+    public SetSessionAuthorization(Expression user)
+    {
+        this(Optional.empty(), user);
+    }
+
+    public SetSessionAuthorization(NodeLocation location, Expression user)
+    {
+        this(Optional.of(location), user);
+    }
+
+    private SetSessionAuthorization(Optional<NodeLocation> location, Expression user)
+    {
+        super(location);
+        this.user = requireNonNull(user, "user is null");
+    }
+
+    public Expression getUser()
+    {
+        return user;
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitSetSessionAuthorization(this, context);
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        SetSessionAuthorization setSessionAuthorization = (SetSessionAuthorization) o;
+        return Objects.equals(user, setSessionAuthorization.user);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(user);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("user", user)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/ShowFunctions.java b/core/trino-parser/src/main/java/io/trino/sql/tree/ShowFunctions.java
index 0bab2d011b3d..8027994534be 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/ShowFunctions.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/ShowFunctions.java
@@ -22,29 +22,36 @@
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static java.util.Objects.requireNonNull;
 
-public class ShowFunctions
+public final class ShowFunctions
         extends Statement
 {
+    private final Optional<QualifiedName> schema;
     private final Optional<String> likePattern;
     private final Optional<String> escape;
 
-    public ShowFunctions(Optional<String> likePattern, Optional<String> escape)
+    public ShowFunctions(Optional<QualifiedName> schema, Optional<String> likePattern, Optional<String> escape)
     {
-        this(Optional.empty(), likePattern, escape);
+        this(Optional.empty(), schema, likePattern, escape);
     }
 
-    public ShowFunctions(NodeLocation location, Optional<String> likePattern, Optional<String> escape)
+    public ShowFunctions(NodeLocation location, Optional<QualifiedName> schema, Optional<String> likePattern, Optional<String> escape)
     {
-        this(Optional.of(location), likePattern, escape);
+        this(Optional.of(location), schema, likePattern, escape);
     }
 
-    private ShowFunctions(Optional<NodeLocation> location, Optional<String> likePattern, Optional<String> escape)
+    private ShowFunctions(Optional<NodeLocation> location, Optional<QualifiedName> schema, Optional<String> likePattern, Optional<String> escape)
     {
         super(location);
+        this.schema = requireNonNull(schema, "schema is null");
         this.likePattern = requireNonNull(likePattern, "likePattern is null");
         this.escape = requireNonNull(escape, "escape is null");
     }
 
+    public Optional<QualifiedName> getSchema()
+    {
+        return schema;
+    }
+
     public Optional<String> getLikePattern()
     {
         return likePattern;
@@ -70,29 +77,26 @@ public List<Node> getChildren()
     @Override
     public int hashCode()
     {
-        return Objects.hash(likePattern, escape);
+        return Objects.hash(schema, likePattern, escape);
     }
 
     @Override
     public boolean equals(Object obj)
     {
-        if (this == obj) {
-            return true;
-        }
-        if ((obj == null) || (getClass() != obj.getClass())) {
-            return false;
-        }
-        ShowFunctions o = (ShowFunctions) obj;
-        return Objects.equals(likePattern, o.likePattern) &&
-                Objects.equals(escape, o.escape);
+        return (obj instanceof ShowFunctions other) &&
+                Objects.equals(schema, other.schema) &&
+                Objects.equals(likePattern, other.likePattern) &&
+                Objects.equals(escape, other.escape);
     }
 
     @Override
     public String toString()
     {
         return toStringHelper(this)
-                .add("likePattern", likePattern)
-                .add("escape", escape)
+                .add("schema", schema.orElse(null))
+                .add("likePattern", likePattern.orElse(null))
+                .add("escape", escape.orElse(null))
+                .omitNullValues()
                 .toString();
     }
 }
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/TableExecute.java b/core/trino-parser/src/main/java/io/trino/sql/tree/TableExecute.java
index 47c6b26157d5..78eb360d112d 100644
--- a/core/trino-parser/src/main/java/io/trino/sql/tree/TableExecute.java
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/TableExecute.java
@@ -106,7 +106,7 @@ public String toString()
     {
         return toStringHelper(this)
                 .add("table", table)
-                .add("procedureNaem", procedureName)
+                .add("procedureName", procedureName)
                 .add("arguments", arguments)
                 .add("where", where)
                 .toString();
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/ValueColumn.java b/core/trino-parser/src/main/java/io/trino/sql/tree/ValueColumn.java
new file mode 100644
index 000000000000..45af76864691
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/ValueColumn.java
@@ -0,0 +1,169 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.sql.tree.JsonValue.EmptyOrErrorBehavior;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.sql.tree.JsonValue.EmptyOrErrorBehavior.DEFAULT;
+import static java.util.Objects.requireNonNull;
+
+public class ValueColumn
+        extends JsonTableColumnDefinition
+{
+    private final Identifier name;
+    private final DataType type;
+    private final Optional<StringLiteral> jsonPath;
+    private final EmptyOrErrorBehavior emptyBehavior;
+    private final Optional<Expression> emptyDefault;
+    private final Optional<EmptyOrErrorBehavior> errorBehavior;
+    private final Optional<Expression> errorDefault;
+
+    public ValueColumn(
+            NodeLocation location,
+            Identifier name,
+            DataType type,
+            Optional<StringLiteral> jsonPath,
+            EmptyOrErrorBehavior emptyBehavior,
+            Optional<Expression> emptyDefault,
+            Optional<EmptyOrErrorBehavior> errorBehavior,
+            Optional<Expression> errorDefault)
+    {
+        super(location);
+        this.name = requireNonNull(name, "name is null");
+        this.type = requireNonNull(type, "type is null");
+        this.jsonPath = requireNonNull(jsonPath, "jsonPath is null");
+        this.emptyBehavior = requireNonNull(emptyBehavior, "emptyBehavior is null");
+        this.emptyDefault = requireNonNull(emptyDefault, "emptyDefault is null");
+        checkArgument(emptyBehavior == DEFAULT || !emptyDefault.isPresent(), "default value can be specified only for DEFAULT ... ON EMPTY option");
+        checkArgument(emptyBehavior != DEFAULT || emptyDefault.isPresent(), "DEFAULT ... ON EMPTY option requires default value");
+        this.errorBehavior = requireNonNull(errorBehavior, "errorBehavior is null");
+        this.errorDefault = requireNonNull(errorDefault, "errorDefault is null");
+        checkArgument(errorBehavior.isPresent() && errorBehavior.get() == DEFAULT || !errorDefault.isPresent(), "default value can be specified only for DEFAULT ... ON ERROR option");
+        checkArgument(!errorBehavior.isPresent() || errorBehavior.get() != DEFAULT || errorDefault.isPresent(), "DEFAULT ... ON ERROR option requires default value");
+    }
+
+    public Identifier getName()
+    {
+        return name;
+    }
+
+    public DataType getType()
+    {
+        return type;
+    }
+
+    public Optional<StringLiteral> getJsonPath()
+    {
+        return jsonPath;
+    }
+
+    public EmptyOrErrorBehavior getEmptyBehavior()
+    {
+        return emptyBehavior;
+    }
+
+    public Optional<Expression> getEmptyDefault()
+    {
+        return emptyDefault;
+    }
+
+    public Optional<EmptyOrErrorBehavior> getErrorBehavior()
+    {
+        return errorBehavior;
+    }
+
+    public Optional<Expression> getErrorDefault()
+    {
+        return errorDefault;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitValueColumn(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        ImmutableList.Builder<Node> children = ImmutableList.builder();
+        jsonPath.ifPresent(children::add);
+        emptyDefault.ifPresent(children::add);
+        errorDefault.ifPresent(children::add);
+        return children.build();
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("name", name)
+                .add("type", type)
+                .add("jsonPath", jsonPath.orElse(null))
+                .add("emptyBehavior", emptyBehavior)
+                .add("emptyDefault", emptyDefault.orElse(null))
+                .add("errorBehavior", errorBehavior.orElse(null))
+                .add("errorDefault", errorDefault.orElse(null))
+                .omitNullValues()
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ValueColumn that = (ValueColumn) o;
+        return Objects.equals(name, that.name) &&
+                Objects.equals(type, that.type) &&
+                Objects.equals(jsonPath, that.jsonPath) &&
+                emptyBehavior == that.emptyBehavior &&
+                Objects.equals(emptyDefault, that.emptyDefault) &&
+                Objects.equals(errorBehavior, that.errorBehavior) &&
+                Objects.equals(errorDefault, that.errorDefault);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(name, type, jsonPath, emptyBehavior, emptyDefault, errorBehavior, errorDefault);
+    }
+
+    @Override
+    public boolean shallowEquals(Node other)
+    {
+        if (!sameClass(this, other)) {
+            return false;
+        }
+
+        ValueColumn otherValueColumn = (ValueColumn) other;
+
+        return name.equals(otherValueColumn.name) &&
+                type.equals(otherValueColumn.type) &&
+                emptyBehavior == otherValueColumn.emptyBehavior &&
+                Objects.equals(errorBehavior, otherValueColumn.errorBehavior);
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/VariableDeclaration.java b/core/trino-parser/src/main/java/io/trino/sql/tree/VariableDeclaration.java
new file mode 100644
index 000000000000..ab2c3dd7031d
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/VariableDeclaration.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class VariableDeclaration
+        extends ControlStatement
+{
+    private final List<Identifier> names;
+    private final DataType type;
+    private final Optional<Expression> defaultValue;
+
+    public VariableDeclaration(NodeLocation location, List<Identifier> names, DataType type, Optional<Expression> defaultValue)
+    {
+        super(location);
+        this.names = requireNonNull(names, "name is null");
+        this.type = requireNonNull(type, "type is null");
+        this.defaultValue = requireNonNull(defaultValue, "defaultValue is null");
+    }
+
+    public List<Identifier> getNames()
+    {
+        return names;
+    }
+
+    public DataType getType()
+    {
+        return type;
+    }
+
+    public Optional<Expression> getDefaultValue()
+    {
+        return defaultValue;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitVariableDeclaration(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return defaultValue.map(ImmutableList::of).orElse(ImmutableList.of());
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof VariableDeclaration other) &&
+                Objects.equals(names, other.names) &&
+                Objects.equals(type, other.type) &&
+                Objects.equals(defaultValue, other.defaultValue);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(names, type, defaultValue);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("names", names)
+                .add("type", type)
+                .add("defaultValue", defaultValue)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/WhileStatement.java b/core/trino-parser/src/main/java/io/trino/sql/tree/WhileStatement.java
new file mode 100644
index 000000000000..360d965b21aa
--- /dev/null
+++ b/core/trino-parser/src/main/java/io/trino/sql/tree/WhileStatement.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed 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 io.trino.sql.tree;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public final class WhileStatement
+        extends ControlStatement
+{
+    private final Optional<Identifier> label;
+    private final Expression expression;
+    private final List<ControlStatement> statements;
+
+    public WhileStatement(NodeLocation location, Optional<Identifier> label, Expression expression, List<ControlStatement> statements)
+    {
+        super(location);
+        this.label = requireNonNull(label, "label is null");
+        this.expression = requireNonNull(expression, "expression is null");
+        this.statements = requireNonNull(statements, "statements is null");
+    }
+
+    public Optional<Identifier> getLabel()
+    {
+        return label;
+    }
+
+    public Expression getExpression()
+    {
+        return expression;
+    }
+
+    public List<ControlStatement> getStatements()
+    {
+        return statements;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitWhileStatement(this, context);
+    }
+
+    @Override
+    public List<? extends Node> getChildren()
+    {
+        return ImmutableList.<Node>builder()
+                .add(expression)
+                .addAll(statements)
+                .build();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj instanceof WhileStatement other) &&
+                Objects.equals(label, other.label) &&
+                Objects.equals(expression, other.expression) &&
+                Objects.equals(statements, other.statements);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(label, expression, statements);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("label", label)
+                .add("expression", expression)
+                .add("statements", statements)
+                .toString();
+    }
+}
diff --git a/core/trino-parser/src/main/java/io/trino/type/TypeCalculation.java b/core/trino-parser/src/main/java/io/trino/type/TypeCalculation.java
index 7a6fc7a4b450..df797ffbcb9e 100644
--- a/core/trino-parser/src/main/java/io/trino/type/TypeCalculation.java
+++ b/core/trino-parser/src/main/java/io/trino/type/TypeCalculation.java
@@ -13,16 +13,19 @@
  */
 package io.trino.type;
 
-import io.trino.sql.parser.CaseInsensitiveStream;
+import io.trino.grammar.type.TypeCalculationBaseVisitor;
+import io.trino.grammar.type.TypeCalculationLexer;
+import io.trino.grammar.type.TypeCalculationParser;
+import io.trino.grammar.type.TypeCalculationParser.ArithmeticBinaryContext;
+import io.trino.grammar.type.TypeCalculationParser.ArithmeticUnaryContext;
+import io.trino.grammar.type.TypeCalculationParser.BinaryFunctionContext;
+import io.trino.grammar.type.TypeCalculationParser.IdentifierContext;
+import io.trino.grammar.type.TypeCalculationParser.NullLiteralContext;
+import io.trino.grammar.type.TypeCalculationParser.NumericLiteralContext;
+import io.trino.grammar.type.TypeCalculationParser.ParenthesizedExpressionContext;
+import io.trino.grammar.type.TypeCalculationParser.TypeCalculationContext;
 import io.trino.sql.parser.ParsingException;
-import io.trino.type.TypeCalculationParser.ArithmeticBinaryContext;
-import io.trino.type.TypeCalculationParser.ArithmeticUnaryContext;
-import io.trino.type.TypeCalculationParser.BinaryFunctionContext;
-import io.trino.type.TypeCalculationParser.IdentifierContext;
-import io.trino.type.TypeCalculationParser.NullLiteralContext;
-import io.trino.type.TypeCalculationParser.NumericLiteralContext;
-import io.trino.type.TypeCalculationParser.ParenthesizedExpressionContext;
-import io.trino.type.TypeCalculationParser.TypeCalculationContext;
+import org.antlr.v4.runtime.ANTLRErrorListener;
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
@@ -30,23 +33,22 @@
 import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.Recognizer;
 import org.antlr.v4.runtime.atn.PredictionMode;
-import org.antlr.v4.runtime.misc.ParseCancellationException;
 
 import java.math.BigInteger;
 import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkState;
-import static io.trino.type.TypeCalculationParser.ASTERISK;
-import static io.trino.type.TypeCalculationParser.MAX;
-import static io.trino.type.TypeCalculationParser.MIN;
-import static io.trino.type.TypeCalculationParser.MINUS;
-import static io.trino.type.TypeCalculationParser.PLUS;
-import static io.trino.type.TypeCalculationParser.SLASH;
+import static io.trino.grammar.type.TypeCalculationParser.ASTERISK;
+import static io.trino.grammar.type.TypeCalculationParser.MAX;
+import static io.trino.grammar.type.TypeCalculationParser.MIN;
+import static io.trino.grammar.type.TypeCalculationParser.MINUS;
+import static io.trino.grammar.type.TypeCalculationParser.PLUS;
+import static io.trino.grammar.type.TypeCalculationParser.SLASH;
 import static java.util.Objects.requireNonNull;
 
 public final class TypeCalculation
 {
-    private static final BaseErrorListener ERROR_LISTENER = new BaseErrorListener()
+    private static final ANTLRErrorListener ERROR_LISTENER = new BaseErrorListener()
     {
         @Override
         public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String message, RecognitionException e)
@@ -74,7 +76,7 @@ public static Long calculateLiteralValue(
 
     private static ParserRuleContext parseTypeCalculation(String calculation)
     {
-        TypeCalculationLexer lexer = new TypeCalculationLexer(new CaseInsensitiveStream(CharStreams.fromString(calculation)));
+        TypeCalculationLexer lexer = new TypeCalculationLexer(CharStreams.fromString(calculation));
         CommonTokenStream tokenStream = new CommonTokenStream(lexer);
         TypeCalculationParser parser = new TypeCalculationParser(tokenStream);
 
@@ -90,7 +92,7 @@ private static ParserRuleContext parseTypeCalculation(String calculation)
             parser.getInterpreter().setPredictionMode(PredictionMode.SLL);
             tree = parser.typeCalculation();
         }
-        catch (ParseCancellationException ex) {
+        catch (ParsingException ex) {
             // if we fail, parse with LL mode
             tokenStream.seek(0); // rewind input stream
             parser.reset();
@@ -101,34 +103,6 @@ private static ParserRuleContext parseTypeCalculation(String calculation)
         return tree;
     }
 
-    private static class IsSimpleExpressionVisitor
-            extends TypeCalculationBaseVisitor<Boolean>
-    {
-        @Override
-        public Boolean visitArithmeticBinary(ArithmeticBinaryContext ctx)
-        {
-            return false;
-        }
-
-        @Override
-        public Boolean visitArithmeticUnary(ArithmeticUnaryContext ctx)
-        {
-            return false;
-        }
-
-        @Override
-        protected Boolean defaultResult()
-        {
-            return true;
-        }
-
-        @Override
-        protected Boolean aggregateResult(Boolean aggregate, Boolean nextResult)
-        {
-            return aggregate && nextResult;
-        }
-    }
-
     private static class CalculateTypeVisitor
             extends TypeCalculationBaseVisitor<BigInteger>
     {
@@ -150,32 +124,24 @@ public BigInteger visitArithmeticBinary(ArithmeticBinaryContext ctx)
         {
             BigInteger left = visit(ctx.left);
             BigInteger right = visit(ctx.right);
-            switch (ctx.operator.getType()) {
-                case PLUS:
-                    return left.add(right);
-                case MINUS:
-                    return left.subtract(right);
-                case ASTERISK:
-                    return left.multiply(right);
-                case SLASH:
-                    return left.divide(right);
-                default:
-                    throw new IllegalStateException("Unsupported binary operator " + ctx.operator.getText());
-            }
+            return switch (ctx.operator.getType()) {
+                case PLUS -> left.add(right);
+                case MINUS -> left.subtract(right);
+                case ASTERISK -> left.multiply(right);
+                case SLASH -> left.divide(right);
+                default -> throw new IllegalStateException("Unsupported binary operator " + ctx.operator.getText());
+            };
         }
 
         @Override
         public BigInteger visitArithmeticUnary(ArithmeticUnaryContext ctx)
         {
             BigInteger value = visit(ctx.expression());
-            switch (ctx.operator.getType()) {
-                case PLUS:
-                    return value;
-                case MINUS:
-                    return value.negate();
-                default:
-                    throw new IllegalStateException("Unsupported unary operator " + ctx.operator.getText());
-            }
+            return switch (ctx.operator.getType()) {
+                case PLUS -> value;
+                case MINUS -> value.negate();
+                default -> throw new IllegalStateException("Unsupported unary operator " + ctx.operator.getText());
+            };
         }
 
         @Override
@@ -183,14 +149,11 @@ public BigInteger visitBinaryFunction(BinaryFunctionContext ctx)
         {
             BigInteger left = visit(ctx.left);
             BigInteger right = visit(ctx.right);
-            switch (ctx.binaryFunctionName().name.getType()) {
-                case MIN:
-                    return left.min(right);
-                case MAX:
-                    return left.max(right);
-                default:
-                    throw new IllegalArgumentException("Unsupported binary function " + ctx.binaryFunctionName().getText());
-            }
+            return switch (ctx.binaryFunctionName().name.getType()) {
+                case MIN -> left.min(right);
+                case MAX -> left.max(right);
+                default -> throw new IllegalArgumentException("Unsupported binary function " + ctx.binaryFunctionName().getText());
+            };
         }
 
         @Override
diff --git a/core/trino-parser/src/test/java/io/trino/sql/TestExpressionFormatter.java b/core/trino-parser/src/test/java/io/trino/sql/TestExpressionFormatter.java
index 6b2c804f022f..db85579cc168 100644
--- a/core/trino-parser/src/test/java/io/trino/sql/TestExpressionFormatter.java
+++ b/core/trino-parser/src/test/java/io/trino/sql/TestExpressionFormatter.java
@@ -13,8 +13,11 @@
  */
 package io.trino.sql;
 
+import io.trino.sql.tree.CharLiteral;
 import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.GenericLiteral;
 import io.trino.sql.tree.IntervalLiteral;
+import io.trino.sql.tree.StringLiteral;
 import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
@@ -28,6 +31,48 @@
 
 public class TestExpressionFormatter
 {
+    @Test
+    public void testStringLiteral()
+    {
+        assertFormattedExpression(
+                new StringLiteral("test"),
+                "'test'");
+        assertFormattedExpression(
+                new StringLiteral("攻殻機動隊"),
+                "'攻殻機動隊'");
+        assertFormattedExpression(
+                new StringLiteral("😂"),
+                "'😂'");
+    }
+
+    @Test
+    public void testCharLiteral()
+    {
+        assertFormattedExpression(
+                new CharLiteral("test"),
+                "CHAR 'test'");
+        assertFormattedExpression(
+                new CharLiteral("攻殻機動隊"),
+                "CHAR '攻殻機動隊'");
+        assertFormattedExpression(
+                new CharLiteral("😂"),
+                "CHAR '😂'");
+    }
+
+    @Test
+    public void testGenericLiteral()
+    {
+        assertFormattedExpression(
+                new GenericLiteral("VARCHAR", "test"),
+                "VARCHAR 'test'");
+        assertFormattedExpression(
+                new GenericLiteral("VARCHAR", "攻殻機動隊"),
+                "VARCHAR '攻殻機動隊'");
+        assertFormattedExpression(
+                new GenericLiteral("VARCHAR", "😂"),
+                "VARCHAR '😂'");
+    }
+
     @Test
     public void testIntervalLiteral()
     {
diff --git a/core/trino-parser/src/test/java/io/trino/sql/TestSqlFormatter.java b/core/trino-parser/src/test/java/io/trino/sql/TestSqlFormatter.java
index e46df26ed16f..ec74559cac8d 100644
--- a/core/trino-parser/src/test/java/io/trino/sql/TestSqlFormatter.java
+++ b/core/trino-parser/src/test/java/io/trino/sql/TestSqlFormatter.java
@@ -14,22 +14,146 @@
 package io.trino.sql;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.sql.tree.AddColumn;
+import io.trino.sql.tree.AllColumns;
 import io.trino.sql.tree.ColumnDefinition;
+import io.trino.sql.tree.Comment;
+import io.trino.sql.tree.CreateCatalog;
+import io.trino.sql.tree.CreateMaterializedView;
 import io.trino.sql.tree.CreateTable;
+import io.trino.sql.tree.CreateTableAsSelect;
+import io.trino.sql.tree.CreateView;
+import io.trino.sql.tree.ExecuteImmediate;
 import io.trino.sql.tree.GenericDataType;
 import io.trino.sql.tree.Identifier;
+import io.trino.sql.tree.LongLiteral;
 import io.trino.sql.tree.NodeLocation;
 import io.trino.sql.tree.QualifiedName;
+import io.trino.sql.tree.Query;
+import io.trino.sql.tree.ShowCatalogs;
+import io.trino.sql.tree.ShowColumns;
+import io.trino.sql.tree.ShowFunctions;
+import io.trino.sql.tree.ShowSchemas;
+import io.trino.sql.tree.ShowSession;
+import io.trino.sql.tree.ShowTables;
+import io.trino.sql.tree.StringLiteral;
 import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.function.BiFunction;
 
+import static io.trino.sql.QueryUtil.selectList;
+import static io.trino.sql.QueryUtil.simpleQuery;
+import static io.trino.sql.QueryUtil.table;
 import static io.trino.sql.SqlFormatter.formatSql;
+import static io.trino.sql.tree.SaveMode.FAIL;
+import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSqlFormatter
 {
+    @Test
+    public void testShowCatalogs()
+    {
+        assertThat(formatSql(
+                new ShowCatalogs(Optional.empty(), Optional.empty())))
+                .isEqualTo("SHOW CATALOGS");
+        assertThat(formatSql(
+                new ShowCatalogs(Optional.of("%"), Optional.empty())))
+                .isEqualTo("SHOW CATALOGS LIKE '%'");
+        assertThat(formatSql(
+                new ShowCatalogs(Optional.of("%$_%"), Optional.of("$"))))
+                .isEqualTo("SHOW CATALOGS LIKE '%$_%' ESCAPE '$'");
+        assertThat(formatSql(
+                new ShowCatalogs(Optional.of("%機動隊"), Optional.of("😂"))))
+                .isEqualTo("SHOW CATALOGS LIKE '%機動隊' ESCAPE '😂'");
+    }
+
+    @Test
+    public void testShowSchemas()
+    {
+        assertThat(formatSql(
+                new ShowSchemas(Optional.empty(), Optional.empty(), Optional.empty())))
+                .isEqualTo("SHOW SCHEMAS");
+        assertThat(formatSql(
+                new ShowSchemas(Optional.empty(), Optional.of("%"), Optional.empty())))
+                .isEqualTo("SHOW SCHEMAS LIKE '%'");
+        assertThat(formatSql(
+                new ShowSchemas(Optional.empty(), Optional.of("%$_%"), Optional.of("$"))))
+                .isEqualTo("SHOW SCHEMAS LIKE '%$_%' ESCAPE '$'");
+        assertThat(formatSql(
+                new ShowSchemas(Optional.empty(), Optional.of("%機動隊"), Optional.of("😂"))))
+                .isEqualTo("SHOW SCHEMAS LIKE '%機動隊' ESCAPE '😂'");
+    }
+
+    @Test
+    public void testShowTables()
+    {
+        assertThat(formatSql(
+                new ShowTables(Optional.empty(), Optional.empty(), Optional.empty())))
+                .isEqualTo("SHOW TABLES");
+        assertThat(formatSql(
+                new ShowTables(Optional.empty(), Optional.of("%"), Optional.empty())))
+                .isEqualTo("SHOW TABLES LIKE '%'");
+        assertThat(formatSql(
+                new ShowTables(Optional.empty(), Optional.of("%$_%"), Optional.of("$"))))
+                .isEqualTo("SHOW TABLES LIKE '%$_%' ESCAPE '$'");
+        assertThat(formatSql(
+                new ShowTables(Optional.empty(), Optional.of("%機動隊"), Optional.of("😂"))))
+                .isEqualTo("SHOW TABLES LIKE '%機動隊' ESCAPE '😂'");
+    }
+
+    @Test
+    public void testShowColumns()
+    {
+        assertThat(formatSql(
+                new ShowColumns(QualifiedName.of("a"), Optional.empty(), Optional.empty())))
+                .isEqualTo("SHOW COLUMNS FROM a");
+        assertThat(formatSql(
+                new ShowColumns(QualifiedName.of("a"), Optional.of("%"), Optional.empty())))
+                .isEqualTo("SHOW COLUMNS FROM a LIKE '%'");
+        assertThat(formatSql(
+                new ShowColumns(QualifiedName.of("a"), Optional.of("%$_%"), Optional.of("$"))))
+                .isEqualTo("SHOW COLUMNS FROM a LIKE '%$_%' ESCAPE '$'");
+        assertThat(formatSql(
+                new ShowColumns(QualifiedName.of("a"), Optional.of("%機動隊"), Optional.of("😂"))))
+                .isEqualTo("SHOW COLUMNS FROM a LIKE '%機動隊' ESCAPE '😂'");
+    }
+
+    @Test
+    public void testShowFunctions()
+    {
+        assertThat(formatSql(
+                new ShowFunctions(Optional.empty(), Optional.empty(), Optional.empty())))
+                .isEqualTo("SHOW FUNCTIONS");
+        assertThat(formatSql(
+                new ShowFunctions(Optional.empty(), Optional.of("%"), Optional.empty())))
+                .isEqualTo("SHOW FUNCTIONS LIKE '%'");
+        assertThat(formatSql(
+                new ShowFunctions(Optional.empty(), Optional.of("%$_%"), Optional.of("$"))))
+                .isEqualTo("SHOW FUNCTIONS LIKE '%$_%' ESCAPE '$'");
+        assertThat(formatSql(
+                new ShowFunctions(Optional.empty(), Optional.of("%機動隊"), Optional.of("😂"))))
+                .isEqualTo("SHOW FUNCTIONS LIKE '%機動隊' ESCAPE '😂'");
+    }
+
+    @Test
+    public void testShowSession()
+    {
+        assertThat(formatSql(
+                new ShowSession(Optional.empty(), Optional.empty())))
+                .isEqualTo("SHOW SESSION");
+        assertThat(formatSql(
+                new ShowSession(Optional.of("%"), Optional.empty())))
+                .isEqualTo("SHOW SESSION LIKE '%'");
+        assertThat(formatSql(
+                new ShowSession(Optional.of("%$_%"), Optional.of("$"))))
+                .isEqualTo("SHOW SESSION LIKE '%$_%' ESCAPE '$'");
+        assertThat(formatSql(
+                new ShowSession(Optional.of("%機動隊"), Optional.of("😂"))))
+                .isEqualTo("SHOW SESSION LIKE '%機動隊' ESCAPE '😂'");
+    }
+
     @Test
     public void testIdentifiers()
     {
@@ -53,6 +177,40 @@ public void testIdentifiers()
         assertThat(formatSql(new Identifier("\"1\"", true))).isEqualTo("\"\"\"1\"\"\"");
     }
 
+    @Test
+    public void testCreateCatalog()
+    {
+        assertThat(formatSql(
+                new CreateCatalog(
+                        new Identifier("test"),
+                        false,
+                        new Identifier("conn"),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        Optional.empty())))
+                .isEqualTo("CREATE CATALOG test USING conn");
+        assertThat(formatSql(
+                new CreateCatalog(
+                        new Identifier("test"),
+                        false,
+                        new Identifier("conn"),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        Optional.of("test comment"))))
+                .isEqualTo("CREATE CATALOG test USING conn\n" +
+                        "COMMENT 'test comment'");
+        assertThat(formatSql(
+                new CreateCatalog(
+                        new Identifier("test"),
+                        false,
+                        new Identifier("conn"),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        Optional.of("攻殻機動隊"))))
+                .isEqualTo("CREATE CATALOG test USING conn\n" +
+                        "COMMENT '攻殻機動隊'");
+    }
+
     @Test
     public void testCreateTable()
     {
@@ -62,12 +220,12 @@ public void testCreateTable()
             return new CreateTable(
                     QualifiedName.of(ImmutableList.of(new Identifier(tableName, false))),
                     ImmutableList.of(new ColumnDefinition(
-                            new Identifier(columnName, false),
+                            QualifiedName.of(columnName),
                             new GenericDataType(location, type, ImmutableList.of()),
                             true,
                             ImmutableList.of(),
                             Optional.empty())),
-                    false,
+                    FAIL,
                     ImmutableList.of(),
                     Optional.empty());
         };
@@ -77,5 +235,221 @@ public void testCreateTable()
                 .isEqualTo(String.format(createTableSql, "table_name", "column_name"));
         assertThat(formatSql(createTable.apply("exists", "exists")))
                 .isEqualTo(String.format(createTableSql, "\"exists\"", "\"exists\""));
+
+        // Create a table with table comment
+        assertThat(formatSql(
+                new CreateTable(
+                        QualifiedName.of(ImmutableList.of(new Identifier("test", false))),
+                        ImmutableList.of(new ColumnDefinition(
+                                QualifiedName.of("col"),
+                                new GenericDataType(new NodeLocation(1, 1), new Identifier("VARCHAR", false), ImmutableList.of()),
+                                true,
+                                ImmutableList.of(),
+                                Optional.empty())),
+                        FAIL,
+                        ImmutableList.of(),
+                        Optional.of("攻殻機動隊"))))
+                .isEqualTo("CREATE TABLE test (\n" +
+                        "   col VARCHAR\n" +
+                        ")\n" +
+                        "COMMENT '攻殻機動隊'");
+
+        // Create a table with column comment
+        assertThat(formatSql(
+                new CreateTable(
+                        QualifiedName.of(ImmutableList.of(new Identifier("test", false))),
+                        ImmutableList.of(new ColumnDefinition(
+                                QualifiedName.of("col"),
+                                new GenericDataType(new NodeLocation(1, 1), new Identifier("VARCHAR", false), ImmutableList.of()),
+                                true,
+                                ImmutableList.of(),
+                                Optional.of("攻殻機動隊"))),
+                        FAIL,
+                        ImmutableList.of(),
+                        Optional.empty())))
+                .isEqualTo("CREATE TABLE test (\n" +
+                        "   col VARCHAR COMMENT '攻殻機動隊'\n" +
+                        ")");
+    }
+
+    @Test
+    public void testCreateTableAsSelect()
+    {
+        BiFunction<String, String, CreateTableAsSelect> createTableAsSelect = (tableName, columnName) -> {
+            Query query = simpleQuery(selectList(new AllColumns()), table(QualifiedName.of("t")));
+            return new CreateTableAsSelect(
+                    QualifiedName.of(ImmutableList.of(new Identifier(tableName, false))),
+                    query,
+                    FAIL,
+                    ImmutableList.of(),
+                    true,
+                    Optional.of(ImmutableList.of(new Identifier(columnName, false))),
+                    Optional.empty());
+        };
+        String createTableSql = "CREATE TABLE %s( %s ) AS SELECT *\nFROM\n  t\n";
+
+        assertThat(formatSql(createTableAsSelect.apply("table_name", "column_name")))
+                .isEqualTo(String.format(createTableSql, "table_name", "column_name"));
+        assertThat(formatSql(createTableAsSelect.apply("exists", "exists")))
+                .isEqualTo(String.format(createTableSql, "\"exists\"", "\"exists\""));
+
+        assertThat(formatSql(
+                new CreateTableAsSelect(
+                        QualifiedName.of(ImmutableList.of(new Identifier("test", false))),
+                        simpleQuery(selectList(new AllColumns()), table(QualifiedName.of("t"))),
+                        FAIL,
+                        ImmutableList.of(),
+                        true,
+                        Optional.of(ImmutableList.of(new Identifier("col", false))),
+                        Optional.of("攻殻機動隊"))))
+                .isEqualTo("CREATE TABLE test( col )\n" +
+                        "COMMENT '攻殻機動隊' AS SELECT *\n" +
+                        "FROM\n" +
+                        "  t\n");
+    }
+
+    @Test
+    public void testCreateView()
+    {
+        assertThat(formatSql(
+                new CreateView(
+                        new NodeLocation(1, 1),
+                        QualifiedName.of("test"),
+                        simpleQuery(selectList(new AllColumns()), table(QualifiedName.of("t"))),
+                        false,
+                        Optional.empty(),
+                        Optional.empty())))
+                .isEqualTo("CREATE VIEW test AS\n" +
+                        "SELECT *\n" +
+                        "FROM\n" +
+                        "  t\n");
+        assertThat(formatSql(
+                new CreateView(
+                        new NodeLocation(1, 1),
+                        QualifiedName.of("test"),
+                        simpleQuery(selectList(new AllColumns()), table(QualifiedName.of("t"))),
+                        false,
+                        Optional.of("攻殻機動隊"),
+                        Optional.empty())))
+                .isEqualTo("CREATE VIEW test COMMENT '攻殻機動隊' AS\n" +
+                        "SELECT *\n" +
+                        "FROM\n" +
+                        "  t\n");
+    }
+
+    @Test
+    public void testCreateMaterializedView()
+    {
+        assertThat(formatSql(
+                new CreateMaterializedView(
+                        Optional.empty(),
+                        QualifiedName.of("test_mv"),
+                        simpleQuery(selectList(new AllColumns()), table(QualifiedName.of("test_base"))),
+                        false,
+                        false,
+                        Optional.empty(),
+                        ImmutableList.of(),
+                        Optional.empty())))
+                .isEqualTo("CREATE MATERIALIZED VIEW test_mv AS\n" +
+                        "SELECT *\n" +
+                        "FROM\n" +
+                        "  test_base\n");
+        assertThat(formatSql(
+                new CreateMaterializedView(
+                        Optional.empty(),
+                        QualifiedName.of("test_mv"),
+                        simpleQuery(selectList(new AllColumns()), table(QualifiedName.of("test_base"))),
+                        false,
+                        false,
+                        Optional.empty(),
+                        ImmutableList.of(),
+                        Optional.of("攻殻機動隊"))))
+                .isEqualTo("CREATE MATERIALIZED VIEW test_mv\n" +
+                        "COMMENT '攻殻機動隊' AS\n" +
+                        "SELECT *\n" +
+                        "FROM\n" +
+                        "  test_base\n");
+    }
+
+    @Test
+    public void testAddColumn()
+    {
+        assertThat(formatSql(
+                new AddColumn(
+                        QualifiedName.of("foo", "t"),
+                        new ColumnDefinition(QualifiedName.of("c"),
+                                new GenericDataType(new NodeLocation(1, 1), new Identifier("VARCHAR", false), ImmutableList.of()),
+                                true,
+                                emptyList(),
+                                Optional.empty()),
+                        false, false)))
+                .isEqualTo("ALTER TABLE foo.t ADD COLUMN c VARCHAR");
+        assertThat(formatSql(
+                new AddColumn(
+                        QualifiedName.of("foo", "t"),
+                        new ColumnDefinition(QualifiedName.of("c"),
+                                new GenericDataType(new NodeLocation(1, 1), new Identifier("VARCHAR", false), ImmutableList.of()),
+                                true,
+                                emptyList(),
+                                Optional.of("攻殻機動隊")),
+                        false, false)))
+                .isEqualTo("ALTER TABLE foo.t ADD COLUMN c VARCHAR COMMENT '攻殻機動隊'");
+    }
+
+    @Test
+    public void testCommentOnTable()
+    {
+        assertThat(formatSql(
+                new Comment(Comment.Type.TABLE, QualifiedName.of("a"), Optional.of("test"))))
+                .isEqualTo("COMMENT ON TABLE a IS 'test'");
+        assertThat(formatSql(
+                new Comment(Comment.Type.TABLE, QualifiedName.of("a"), Optional.of("攻殻機動隊"))))
+                .isEqualTo("COMMENT ON TABLE a IS '攻殻機動隊'");
+    }
+
+    @Test
+    public void testCommentOnView()
+    {
+        assertThat(formatSql(
+                new Comment(Comment.Type.VIEW, QualifiedName.of("a"), Optional.of("test"))))
+                .isEqualTo("COMMENT ON VIEW a IS 'test'");
+        assertThat(formatSql(
+                new Comment(Comment.Type.VIEW, QualifiedName.of("a"), Optional.of("攻殻機動隊"))))
+                .isEqualTo("COMMENT ON VIEW a IS '攻殻機動隊'");
+    }
+
+    @Test
+    public void testCommentOnColumn()
+    {
+        assertThat(formatSql(
+                new Comment(Comment.Type.COLUMN, QualifiedName.of("test", "a"), Optional.of("test"))))
+                .isEqualTo("COMMENT ON COLUMN test.a IS 'test'");
+        assertThat(formatSql(
+                new Comment(Comment.Type.COLUMN, QualifiedName.of("test", "a"), Optional.of("攻殻機動隊"))))
+                .isEqualTo("COMMENT ON COLUMN test.a IS '攻殻機動隊'");
+    }
+
+    @Test
+    public void testExecuteImmediate()
+    {
+        assertThat(formatSql(
+                new ExecuteImmediate(
+                        new NodeLocation(1, 1),
+                        new StringLiteral(new NodeLocation(1, 19), "SELECT * FROM foo WHERE col1 = ? AND col2 = ?"),
+                        ImmutableList.of(new LongLiteral("42"), new StringLiteral("bar")))))
+                .isEqualTo("EXECUTE IMMEDIATE\n'SELECT * FROM foo WHERE col1 = ? AND col2 = ?'\nUSING 42, 'bar'");
+        assertThat(formatSql(
+                new ExecuteImmediate(
+                        new NodeLocation(1, 1),
+                        new StringLiteral(new NodeLocation(1, 19), "SELECT * FROM foo WHERE col1 = 'bar'"),
+                        ImmutableList.of())))
+                .isEqualTo("EXECUTE IMMEDIATE\n'SELECT * FROM foo WHERE col1 = ''bar'''");
+        assertThat(formatSql(
+                new ExecuteImmediate(
+                        new NodeLocation(1, 1),
+                        new StringLiteral(new NodeLocation(1, 19), "SELECT * FROM foo WHERE col1 = '攻殻機動隊'"),
+                        ImmutableList.of())))
+                .isEqualTo("EXECUTE IMMEDIATE\n" +
+                        "'SELECT * FROM foo WHERE col1 = ''攻殻機動隊'''");
     }
 }
diff --git a/core/trino-parser/src/test/java/io/trino/sql/jsonpath/TestPathParser.java b/core/trino-parser/src/test/java/io/trino/sql/jsonpath/TestPathParser.java
index c4ab51219743..f294b2299d69 100644
--- a/core/trino-parser/src/test/java/io/trino/sql/jsonpath/TestPathParser.java
+++ b/core/trino-parser/src/test/java/io/trino/sql/jsonpath/TestPathParser.java
@@ -25,6 +25,7 @@
 import io.trino.sql.jsonpath.tree.ConjunctionPredicate;
 import io.trino.sql.jsonpath.tree.ContextVariable;
 import io.trino.sql.jsonpath.tree.DatetimeMethod;
+import io.trino.sql.jsonpath.tree.DescendantMemberAccessor;
 import io.trino.sql.jsonpath.tree.DisjunctionPredicate;
 import io.trino.sql.jsonpath.tree.DoubleMethod;
 import io.trino.sql.jsonpath.tree.ExistsPredicate;
@@ -257,6 +258,16 @@ public void testMemberAccessor()
                         new MemberAccessor(new ContextVariable(), Optional.of("Key Name"))));
     }
 
+    @Test
+    public void testDescendantMemberAccessor()
+    {
+        assertThat(path("lax $..Key_Identifier"))
+                .isEqualTo(new JsonPath(true, new DescendantMemberAccessor(new ContextVariable(), "Key_Identifier")));
+
+        assertThat(path("lax $..\"Key Name\""))
+                .isEqualTo(new JsonPath(true, new DescendantMemberAccessor(new ContextVariable(), "Key Name")));
+    }
+
     @Test
     public void testPrecedenceAndGrouping()
     {
diff --git a/core/trino-parser/src/test/java/io/trino/sql/parser/ParserAssert.java b/core/trino-parser/src/test/java/io/trino/sql/parser/ParserAssert.java
index bed52a621a2e..56d10ef0301f 100644
--- a/core/trino-parser/src/test/java/io/trino/sql/parser/ParserAssert.java
+++ b/core/trino-parser/src/test/java/io/trino/sql/parser/ParserAssert.java
@@ -28,7 +28,6 @@
 import java.util.function.Function;
 
 import static io.trino.sql.SqlFormatter.formatSql;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DECIMAL;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 public class ParserAssert
@@ -66,14 +65,19 @@ public static AssertProvider<ParserAssert> rowPattern(String sql)
         return createAssertion(new SqlParser()::createRowPattern, sql);
     }
 
+    public static AssertProvider<ParserAssert> functionSpecification(String sql)
+    {
+        return createAssertion(new SqlParser()::createFunctionSpecification, sql);
+    }
+
     private static Expression createExpression(String expression)
     {
-        return new SqlParser().createExpression(expression, new ParsingOptions(AS_DECIMAL));
+        return new SqlParser().createExpression(expression);
     }
 
     private static Statement createStatement(String statement)
     {
-        return new SqlParser().createStatement(statement, new ParsingOptions(AS_DECIMAL));
+        return new SqlParser().createStatement(statement);
     }
 
     public static ThrowableAssertAlternative<ParsingException> assertExpressionIsInvalid(@Language("SQL") String sql)
diff --git a/core/trino-parser/src/test/java/io/trino/sql/parser/TestSqlParser.java b/core/trino-parser/src/test/java/io/trino/sql/parser/TestSqlParser.java
index 08304e82d0af..4d922f76d7da 100644
--- a/core/trino-parser/src/test/java/io/trino/sql/parser/TestSqlParser.java
+++ b/core/trino-parser/src/test/java/io/trino/sql/parser/TestSqlParser.java
@@ -45,7 +45,6 @@
 import io.trino.sql.tree.CreateTable;
 import io.trino.sql.tree.CreateTableAsSelect;
 import io.trino.sql.tree.CreateView;
-import io.trino.sql.tree.Cube;
 import io.trino.sql.tree.CurrentTime;
 import io.trino.sql.tree.Deallocate;
 import io.trino.sql.tree.DecimalLiteral;
@@ -67,6 +66,7 @@
 import io.trino.sql.tree.EmptyPattern;
 import io.trino.sql.tree.EmptyTableTreatment;
 import io.trino.sql.tree.Execute;
+import io.trino.sql.tree.ExecuteImmediate;
 import io.trino.sql.tree.ExistsPredicate;
 import io.trino.sql.tree.Explain;
 import io.trino.sql.tree.ExplainAnalyze;
@@ -106,6 +106,8 @@
 import io.trino.sql.tree.JsonPathInvocation;
 import io.trino.sql.tree.JsonPathParameter;
 import io.trino.sql.tree.JsonQuery;
+import io.trino.sql.tree.JsonTable;
+import io.trino.sql.tree.JsonTablePlan;
 import io.trino.sql.tree.JsonValue;
 import io.trino.sql.tree.LambdaArgumentDeclaration;
 import io.trino.sql.tree.LambdaExpression;
@@ -120,6 +122,7 @@
 import io.trino.sql.tree.MergeInsert;
 import io.trino.sql.tree.MergeUpdate;
 import io.trino.sql.tree.NaturalJoin;
+import io.trino.sql.tree.NestedColumns;
 import io.trino.sql.tree.Node;
 import io.trino.sql.tree.NodeLocation;
 import io.trino.sql.tree.NotExpression;
@@ -128,6 +131,7 @@
 import io.trino.sql.tree.Offset;
 import io.trino.sql.tree.OneOrMoreQuantifier;
 import io.trino.sql.tree.OrderBy;
+import io.trino.sql.tree.OrdinalityColumn;
 import io.trino.sql.tree.Parameter;
 import io.trino.sql.tree.PathElement;
 import io.trino.sql.tree.PathSpecification;
@@ -135,6 +139,9 @@
 import io.trino.sql.tree.PatternConcatenation;
 import io.trino.sql.tree.PatternSearchMode;
 import io.trino.sql.tree.PatternVariable;
+import io.trino.sql.tree.PlanLeaf;
+import io.trino.sql.tree.PlanParentChild;
+import io.trino.sql.tree.PlanSiblings;
 import io.trino.sql.tree.Prepare;
 import io.trino.sql.tree.PrincipalSpecification;
 import io.trino.sql.tree.PrincipalSpecification.Type;
@@ -144,6 +151,7 @@
 import io.trino.sql.tree.QuantifiedComparisonExpression;
 import io.trino.sql.tree.QuantifiedPattern;
 import io.trino.sql.tree.Query;
+import io.trino.sql.tree.QueryColumn;
 import io.trino.sql.tree.QueryPeriod;
 import io.trino.sql.tree.QuerySpecification;
 import io.trino.sql.tree.RangeQuantifier;
@@ -155,10 +163,10 @@
 import io.trino.sql.tree.RenameTable;
 import io.trino.sql.tree.RenameView;
 import io.trino.sql.tree.ResetSession;
+import io.trino.sql.tree.ResetSessionAuthorization;
 import io.trino.sql.tree.Revoke;
 import io.trino.sql.tree.RevokeRoles;
 import io.trino.sql.tree.Rollback;
-import io.trino.sql.tree.Rollup;
 import io.trino.sql.tree.Row;
 import io.trino.sql.tree.SearchedCaseExpression;
 import io.trino.sql.tree.Select;
@@ -168,6 +176,7 @@
 import io.trino.sql.tree.SetProperties;
 import io.trino.sql.tree.SetRole;
 import io.trino.sql.tree.SetSession;
+import io.trino.sql.tree.SetSessionAuthorization;
 import io.trino.sql.tree.SetTableAuthorization;
 import io.trino.sql.tree.SetTimeZone;
 import io.trino.sql.tree.SetViewAuthorization;
@@ -206,6 +215,7 @@
 import io.trino.sql.tree.Unnest;
 import io.trino.sql.tree.Update;
 import io.trino.sql.tree.UpdateAssignment;
+import io.trino.sql.tree.ValueColumn;
 import io.trino.sql.tree.Values;
 import io.trino.sql.tree.VariableDefinition;
 import io.trino.sql.tree.WhenClause;
@@ -246,8 +256,6 @@
 import static io.trino.sql.parser.ParserAssert.expression;
 import static io.trino.sql.parser.ParserAssert.rowPattern;
 import static io.trino.sql.parser.ParserAssert.statement;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DECIMAL;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.REJECT;
 import static io.trino.sql.parser.TreeNodes.columnDefinition;
 import static io.trino.sql.parser.TreeNodes.dateTimeType;
 import static io.trino.sql.parser.TreeNodes.field;
@@ -271,6 +279,9 @@
 import static io.trino.sql.tree.PatternSearchMode.Mode.SEEK;
 import static io.trino.sql.tree.ProcessingMode.Mode.FINAL;
 import static io.trino.sql.tree.ProcessingMode.Mode.RUNNING;
+import static io.trino.sql.tree.SaveMode.FAIL;
+import static io.trino.sql.tree.SaveMode.IGNORE;
+import static io.trino.sql.tree.SaveMode.REPLACE;
 import static io.trino.sql.tree.SetProperties.Type.MATERIALIZED_VIEW;
 import static io.trino.sql.tree.SkipTo.skipToNextRow;
 import static io.trino.sql.tree.SortItem.NullOrdering.LAST;
@@ -321,20 +332,22 @@ public void testPossibleExponentialBacktracking()
     @Timeout(value = 2, unit = SECONDS)
     public void testPotentialUnboundedLookahead()
     {
-        createExpression("(\n" +
-                "      1 * -1 +\n" +
-                "      1 * -2 +\n" +
-                "      1 * -3 +\n" +
-                "      1 * -4 +\n" +
-                "      1 * -5 +\n" +
-                "      1 * -6 +\n" +
-                "      1 * -7 +\n" +
-                "      1 * -8 +\n" +
-                "      1 * -9 +\n" +
-                "      1 * -10 +\n" +
-                "      1 * -11 +\n" +
-                "      1 * -12 \n" +
-                ")\n");
+        createExpression("""
+                (
+                      1 * -1 +
+                      1 * -2 +
+                      1 * -3 +
+                      1 * -4 +
+                      1 * -5 +
+                      1 * -6 +
+                      1 * -7 +
+                      1 * -8 +
+                      1 * -9 +
+                      1 * -10 +
+                      1 * -11 +
+                      1 * -12
+                )
+                """);
     }
 
     @Test
@@ -448,6 +461,77 @@ public void testNumbers()
                 .isEqualTo(new DecimalLiteral(location, "1.2"));
         assertThat(expression("-1.2"))
                 .isEqualTo(new DecimalLiteral(location, "-1.2"));
+
+        assertThat(expression("123_456_789"))
+                .isEqualTo(new LongLiteral(new NodeLocation(1, 1), "123_456_789"))
+                .satisfies(value -> assertThat(((LongLiteral) value).getParsedValue()).isEqualTo(123456789L));
+
+        assertThatThrownBy(() -> SQL_PARSER.createExpression("123_456_789_"))
+                .isInstanceOf(ParsingException.class);
+
+        assertThat(expression("123_456.789_0123"))
+                .isEqualTo(new DecimalLiteral(new NodeLocation(1, 1), "123_456.789_0123"));
+
+        assertThatThrownBy(() -> SQL_PARSER.createExpression("123_456.789_0123_"))
+                .isInstanceOf(ParsingException.class);
+
+        assertThatThrownBy(() -> SQL_PARSER.createExpression("_123_456.789_0123"))
+                .isInstanceOf(ParsingException.class);
+
+        assertThatThrownBy(() -> SQL_PARSER.createExpression("123_456_.789_0123"))
+                .isInstanceOf(ParsingException.class);
+
+        assertThatThrownBy(() -> SQL_PARSER.createExpression("123_456._789_0123"))
+                .isInstanceOf(ParsingException.class);
+
+        assertThat(expression("0x123_abc_def"))
+                .isEqualTo(new LongLiteral(new NodeLocation(1, 1), "0x123_abc_def"))
+                .satisfies(value -> assertThat(((LongLiteral) value).getParsedValue()).isEqualTo(4893429231L));
+
+        assertThat(expression("0X123_ABC_DEF"))
+                .isEqualTo(new LongLiteral(new NodeLocation(1, 1), "0X123_ABC_DEF"))
+                .satisfies(value -> assertThat(((LongLiteral) value).getParsedValue()).isEqualTo(4893429231L));
+
+        assertThatThrownBy(() -> SQL_PARSER.createExpression("0x123_ABC_DEF_"))
+                .isInstanceOf(ParsingException.class);
+
+        assertThat(expression("0O012_345"))
+                .isEqualTo(new LongLiteral(new NodeLocation(1, 1), "0O012_345"))
+                .satisfies(value -> assertThat(((LongLiteral) value).getParsedValue()).isEqualTo(5349L));
+
+        assertThat(expression("0o012_345"))
+                .isEqualTo(new LongLiteral(new NodeLocation(1, 1), "0o012_345"))
+                .satisfies(value -> assertThat(((LongLiteral) value).getParsedValue()).isEqualTo(5349L));
+
+        assertThatThrownBy(() -> SQL_PARSER.createExpression("0o012_345_"))
+                .isInstanceOf(ParsingException.class);
+
+        assertThat(expression("0B110_010"))
+                .isEqualTo(new LongLiteral(new NodeLocation(1, 1), "0B110_010"))
+                .satisfies(value -> assertThat(((LongLiteral) value).getParsedValue()).isEqualTo(50L));
+
+        assertThat(expression("0b110_010"))
+                .isEqualTo(new LongLiteral(new NodeLocation(1, 1), "0b110_010"))
+                .satisfies(value -> assertThat(((LongLiteral) value).getParsedValue()).isEqualTo(50L));
+
+        assertThatThrownBy(() -> SQL_PARSER.createExpression("0b110_010_"))
+                .isInstanceOf(ParsingException.class);
+    }
+
+    @Test
+    public void testIdentifier()
+    {
+        assertThat(expression("_123_456"))
+                .isEqualTo(new Identifier(new NodeLocation(1, 1), "_123_456", false));
+
+        assertThat(expression("_0x123_ABC_DEF"))
+                .isEqualTo(new Identifier(new NodeLocation(1, 1), "_0x123_ABC_DEF", false));
+
+        assertThat(expression("_0o012_345"))
+                .isEqualTo(new Identifier(new NodeLocation(1, 1), "_0o012_345", false));
+
+        assertThat(expression("_0b110_010"))
+                .isEqualTo(new Identifier(new NodeLocation(1, 1), "_0b110_010", false));
     }
 
     @Test
@@ -1159,18 +1243,6 @@ public void testDecimal()
                 .isEqualTo(new DecimalLiteral(location, ".5"));
         assertThat(expression("123.5"))
                 .isEqualTo(new DecimalLiteral(location, "123.5"));
-
-        assertInvalidDecimalExpression("123.", "Unexpected decimal literal: 123.");
-        assertInvalidDecimalExpression("123.0", "Unexpected decimal literal: 123.0");
-        assertInvalidDecimalExpression(".5", "Unexpected decimal literal: .5");
-        assertInvalidDecimalExpression("123.5", "Unexpected decimal literal: 123.5");
-    }
-
-    private static void assertInvalidDecimalExpression(String sql, String message)
-    {
-        assertThatThrownBy(() -> SQL_PARSER.createExpression(sql, new ParsingOptions(REJECT)))
-                .isInstanceOfSatisfying(ParsingException.class, e ->
-                        assertThat(e.getErrorMessage()).isEqualTo(message));
     }
 
     @Test
@@ -1359,9 +1431,10 @@ public void testShowColumns()
     @Test
     public void testShowFunctions()
     {
-        assertStatement("SHOW FUNCTIONS", new ShowFunctions(Optional.empty(), Optional.empty()));
-        assertStatement("SHOW FUNCTIONS LIKE '%'", new ShowFunctions(Optional.of("%"), Optional.empty()));
-        assertStatement("SHOW FUNCTIONS LIKE '%' ESCAPE '$'", new ShowFunctions(Optional.of("%"), Optional.of("$")));
+        assertStatement("SHOW FUNCTIONS", new ShowFunctions(Optional.empty(), Optional.empty(), Optional.empty()));
+        assertStatement("SHOW FUNCTIONS FROM x", new ShowFunctions(Optional.of(QualifiedName.of("x")), Optional.empty(), Optional.empty()));
+        assertStatement("SHOW FUNCTIONS LIKE '%'", new ShowFunctions(Optional.empty(), Optional.of("%"), Optional.empty()));
+        assertStatement("SHOW FUNCTIONS LIKE '%' ESCAPE '$'", new ShowFunctions(Optional.empty(), Optional.of("%"), Optional.of("$")));
     }
 
     @Test
@@ -1601,6 +1674,7 @@ public void testSelectWithGroupBy()
                         new Table(QualifiedName.of("table1")),
                         Optional.empty(),
                         Optional.of(new GroupBy(false, ImmutableList.of(new GroupingSets(
+                                GroupingSets.Type.EXPLICIT,
                                 ImmutableList.of(
                                         ImmutableList.of(new Identifier("a"))))))),
                         Optional.empty(),
@@ -1619,6 +1693,7 @@ public void testSelectWithGroupBy()
                         new Table(QualifiedName.of("table1")),
                         Optional.empty(),
                         Optional.of(new GroupBy(false, ImmutableList.of(new GroupingSets(
+                                GroupingSets.Type.EXPLICIT,
                                 ImmutableList.of(
                                         ImmutableList.of(new Identifier("a")),
                                         ImmutableList.of(new Identifier("b"))))))),
@@ -1634,12 +1709,13 @@ public void testSelectWithGroupBy()
                         Optional.empty(),
                         Optional.of(new GroupBy(false, ImmutableList.of(
                                 new GroupingSets(
+                                        GroupingSets.Type.EXPLICIT,
                                         ImmutableList.of(
                                                 ImmutableList.of(new Identifier("a"), new Identifier("b")),
                                                 ImmutableList.of(new Identifier("a")),
                                                 ImmutableList.of())),
-                                new Cube(ImmutableList.of(new Identifier("c"))),
-                                new Rollup(ImmutableList.of(new Identifier("d")))))),
+                                new GroupingSets(GroupingSets.Type.CUBE, ImmutableList.of(ImmutableList.of(new Identifier("c")))),
+                                new GroupingSets(GroupingSets.Type.ROLLUP, ImmutableList.of(ImmutableList.of(new Identifier("d"))))))),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
@@ -1652,12 +1728,13 @@ public void testSelectWithGroupBy()
                         Optional.empty(),
                         Optional.of(new GroupBy(true, ImmutableList.of(
                                 new GroupingSets(
+                                        GroupingSets.Type.EXPLICIT,
                                         ImmutableList.of(
                                                 ImmutableList.of(new Identifier("a"), new Identifier("b")),
                                                 ImmutableList.of(new Identifier("a")),
                                                 ImmutableList.of())),
-                                new Cube(ImmutableList.of(new Identifier("c"))),
-                                new Rollup(ImmutableList.of(new Identifier("d")))))),
+                                new GroupingSets(GroupingSets.Type.CUBE, ImmutableList.of(ImmutableList.of(new Identifier("c")))),
+                                new GroupingSets(GroupingSets.Type.ROLLUP, ImmutableList.of(ImmutableList.of(new Identifier("d"))))))),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
@@ -1822,7 +1899,7 @@ public void testCreateTable()
                                 columnDefinition(location(1, 19), "a", simpleType(location(1, 21), "VARCHAR")),
                                 columnDefinition(location(1, 30), "b", simpleType(location(1, 32), "BIGINT"), true, "hello world"),
                                 columnDefinition(location(1, 62), "c", simpleType(location(1, 64), "IPADDRESS"))),
-                        false,
+                        FAIL,
                         ImmutableList.of(),
                         Optional.empty()));
 
@@ -1832,7 +1909,7 @@ public void testCreateTable()
                         qualifiedName(location(1, 28), "bar"),
                         ImmutableList.of(
                                 columnDefinition(location(1, 33), "c", dateTimeType(location(1, 35), TIMESTAMP, false), true)),
-                        true,
+                        IGNORE,
                         ImmutableList.of(),
                         Optional.empty()));
 
@@ -1851,7 +1928,7 @@ public void testCreateTable()
                                                 ImmutableList.of(
                                                         property(location(1, 49), "nullable", new BooleanLiteral(location(1, 60), "true")),
                                                         property(location(1, 66), "compression", new StringLiteral(location(1, 80), "LZ4"))))),
-                                true,
+                                IGNORE,
                                 ImmutableList.of(),
                                 Optional.empty()));
 
@@ -1861,7 +1938,7 @@ public void testCreateTable()
                         ImmutableList.of(
                                 new LikeClause(QualifiedName.of("like_table"),
                                         Optional.empty())),
-                        true,
+                        IGNORE,
                         ImmutableList.of(),
                         Optional.empty()));
 
@@ -1869,10 +1946,10 @@ public void testCreateTable()
                 .ignoringLocation()
                 .isEqualTo(new CreateTable(QualifiedName.of("bar"),
                         ImmutableList.of(
-                                new ColumnDefinition(identifier("c"), simpleType(location(1, 35), "VARCHAR"), true, emptyList(), Optional.empty()),
+                                new ColumnDefinition(QualifiedName.of("c"), simpleType(location(1, 35), "VARCHAR"), true, emptyList(), Optional.empty()),
                                 new LikeClause(QualifiedName.of("like_table"),
                                         Optional.empty())),
-                        true,
+                        IGNORE,
                         ImmutableList.of(),
                         Optional.empty()));
 
@@ -1880,193 +1957,841 @@ public void testCreateTable()
                 .ignoringLocation()
                 .isEqualTo(new CreateTable(QualifiedName.of("bar"),
                         ImmutableList.of(
-                                new ColumnDefinition(identifier("c"), simpleType(location(1, 35), "VARCHAR"), true, emptyList(), Optional.empty()),
+                                new ColumnDefinition(QualifiedName.of("c"), simpleType(location(1, 35), "VARCHAR"), true, emptyList(), Optional.empty()),
+                                new LikeClause(QualifiedName.of("like_table"),
+                                        Optional.empty()),
+                                new ColumnDefinition(QualifiedName.of("d"), simpleType(location(1, 63), "BIGINT"), true, emptyList(), Optional.empty())),
+                        IGNORE,
+                        ImmutableList.of(),
+                        Optional.empty()));
+
+        assertStatement("CREATE TABLE IF NOT EXISTS bar (LIKE like_table INCLUDING PROPERTIES)",
+                new CreateTable(QualifiedName.of("bar"),
+                        ImmutableList.of(
+                                new LikeClause(QualifiedName.of("like_table"),
+                                        Optional.of(LikeClause.PropertiesOption.INCLUDING))),
+                        IGNORE,
+                        ImmutableList.of(),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE TABLE IF NOT EXISTS bar (c VARCHAR, LIKE like_table EXCLUDING PROPERTIES)"))
+                .ignoringLocation()
+                .isEqualTo(new CreateTable(QualifiedName.of("bar"),
+                        ImmutableList.of(
+                                new ColumnDefinition(QualifiedName.of("c"), simpleType(location(1, 35), "VARCHAR"), true, emptyList(), Optional.empty()),
+                                new LikeClause(QualifiedName.of("like_table"),
+                                        Optional.of(LikeClause.PropertiesOption.EXCLUDING))),
+                        IGNORE,
+                        ImmutableList.of(),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE TABLE IF NOT EXISTS bar (c VARCHAR, LIKE like_table EXCLUDING PROPERTIES) COMMENT 'test'"))
+                .ignoringLocation()
+                .isEqualTo(new CreateTable(QualifiedName.of("bar"),
+                        ImmutableList.of(
+                                new ColumnDefinition(QualifiedName.of("c"), simpleType(location(1, 35), "VARCHAR"), true, emptyList(), Optional.empty()),
                                 new LikeClause(QualifiedName.of("like_table"),
+                                        Optional.of(LikeClause.PropertiesOption.EXCLUDING))),
+                        IGNORE,
+                        ImmutableList.of(),
+                        Optional.of("test")));
+    }
+
+    @Test
+    public void testCreateTableWithNotNull()
+    {
+        assertThat(statement("""
+                CREATE TABLE foo (
+                a VARCHAR NOT NULL COMMENT 'column a',
+                b BIGINT COMMENT 'hello world',
+                c IPADDRESS,
+                d INTEGER NOT NULL)
+                """))
+                .ignoringLocation()
+                .isEqualTo(new CreateTable(
+                        QualifiedName.of("foo"),
+                        ImmutableList.of(
+                                new ColumnDefinition(QualifiedName.of("a"), simpleType(location(1, 20), "VARCHAR"), false, emptyList(), Optional.of("column a")),
+                                new ColumnDefinition(QualifiedName.of("b"), simpleType(location(1, 59), "BIGINT"), true, emptyList(), Optional.of("hello world")),
+                                new ColumnDefinition(QualifiedName.of("c"), simpleType(location(1, 91), "IPADDRESS"), true, emptyList(), Optional.empty()),
+                                new ColumnDefinition(QualifiedName.of("d"), simpleType(location(1, 104), "INTEGER"), false, emptyList(), Optional.empty())),
+                        FAIL,
+                        ImmutableList.of(),
+                        Optional.empty()));
+    }
+
+    @Test
+    public void testCreateTableAsSelect()
+    {
+        assertThat(statement("CREATE TABLE foo AS SELECT * FROM t"))
+                .isEqualTo(new CreateTableAsSelect(location(1, 1), qualifiedName(location(1, 14), "foo"), new Query(
+                        location(1, 21),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        new QuerySpecification(
+                                location(1, 21),
+                                new Select(location(1, 21), false, ImmutableList.of(new AllColumns(location(1, 28), Optional.empty(), ImmutableList.of()))),
+                                Optional.of(new Table(location(1, 35), qualifiedName(location(1, 35), "t"))),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                        FAIL,
+                        ImmutableList.of(),
+                        true,
+                        Optional.empty(),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE TABLE foo(x) AS SELECT a FROM t"))
+                .isEqualTo(new CreateTableAsSelect(location(1, 1), qualifiedName(location(1, 14), "foo"), new Query(
+                        location(1, 24),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        new QuerySpecification(
+                                location(1, 24),
+                                new Select(location(1, 24), false, ImmutableList.of(new SingleColumn(location(1, 31), new Identifier(location(1, 31), "a", false), Optional.empty()))),
+                                Optional.of(new Table(location(1, 38), qualifiedName(location(1, 38), "t"))),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                        FAIL,
+                        ImmutableList.of(),
+                        true,
+                        Optional.of(ImmutableList.of(new Identifier(location(1, 18), "x", false))),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE TABLE foo(x,y) AS SELECT a,b FROM t"))
+                .isEqualTo(new CreateTableAsSelect(location(1, 1), qualifiedName(location(1, 14), "foo"), new Query(
+                        location(1, 26),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        new QuerySpecification(
+                                location(1, 26),
+                                new Select(location(1, 26), false, ImmutableList.of(
+                                        new SingleColumn(location(1, 33), new Identifier(location(1, 33), "a", false), Optional.empty()),
+                                        new SingleColumn(location(1, 35), new Identifier(location(1, 35), "b", false), Optional.empty()))),
+                                Optional.of(new Table(location(1, 42), qualifiedName(location(1, 42), "t"))),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                        FAIL,
+                        ImmutableList.of(),
+                        true,
+                        Optional.of(ImmutableList.of(
+                                new Identifier(location(1, 18), "x", false),
+                                new Identifier(location(1, 20), "y", false))),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE OR REPLACE TABLE foo AS SELECT * FROM t"))
+                .isEqualTo(new CreateTableAsSelect(location(1, 1), qualifiedName(location(1, 25), "foo"), new Query(
+                        location(1, 32),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        new QuerySpecification(
+                                location(1, 32),
+                                new Select(location(1, 32), false, ImmutableList.of(new AllColumns(location(1, 39), Optional.empty(), ImmutableList.of()))),
+                                Optional.of(new Table(location(1, 46), qualifiedName(location(1, 46), "t"))),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                        REPLACE,
+                        ImmutableList.of(),
+                        true,
+                        Optional.empty(),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE OR REPLACE TABLE foo(x) AS SELECT a FROM t"))
+                .isEqualTo(new CreateTableAsSelect(location(1, 1), qualifiedName(location(1, 25), "foo"), new Query(
+                        location(1, 35),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        new QuerySpecification(
+                                location(1, 35),
+                                new Select(location(1, 35), false, ImmutableList.of(new SingleColumn(location(1, 42), new Identifier(location(1, 42), "a", false), Optional.empty()))),
+                                Optional.of(new Table(location(1, 49), qualifiedName(location(1, 49), "t"))),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                        REPLACE,
+                        ImmutableList.of(),
+                        true,
+                        Optional.of(ImmutableList.of(new Identifier(location(1, 29), "x", false))),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE OR REPLACE TABLE foo(x,y) AS SELECT a,b FROM t"))
+                .isEqualTo(new CreateTableAsSelect(location(1, 1), qualifiedName(location(1, 25), "foo"), new Query(
+                        location(1, 37),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        new QuerySpecification(
+                                location(1, 37),
+                                new Select(location(1, 37), false, ImmutableList.of(
+                                        new SingleColumn(location(1, 44), new Identifier(location(1, 44), "a", false), Optional.empty()),
+                                        new SingleColumn(location(1, 46), new Identifier(location(1, 46), "b", false), Optional.empty()))),
+                                Optional.of(new Table(location(1, 53), qualifiedName(location(1, 53), "t"))),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                        REPLACE,
+                        ImmutableList.of(),
+                        true,
+                        Optional.of(ImmutableList.of(
+                                new Identifier(location(1, 29), "x", false),
+                                new Identifier(location(1, 31), "y", false))),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE TABLE IF NOT EXISTS foo AS SELECT * FROM t"))
+                .isEqualTo(new CreateTableAsSelect(location(1, 1), qualifiedName(location(1, 28), "foo"), new Query(
+                        location(1, 35),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        new QuerySpecification(
+                                location(1, 35),
+                                new Select(location(1, 35), false, ImmutableList.of(new AllColumns(location(1, 42), Optional.empty(), ImmutableList.of()))),
+                                Optional.of(new Table(location(1, 49), qualifiedName(location(1, 49), "t"))),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                        IGNORE,
+                        ImmutableList.of(),
+                        true,
+                        Optional.empty(),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE TABLE IF NOT EXISTS foo(x) AS SELECT a FROM t"))
+                .isEqualTo(new CreateTableAsSelect(location(1, 1), qualifiedName(location(1, 28), "foo"), new Query(
+                        location(1, 38),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        new QuerySpecification(
+                                location(1, 38),
+                                new Select(location(1, 38), false, ImmutableList.of(new SingleColumn(location(1, 45), new Identifier(location(1, 45), "a", false), Optional.empty()))),
+                                Optional.of(new Table(location(1, 52), qualifiedName(location(1, 52), "t"))),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                        IGNORE,
+                        ImmutableList.of(),
+                        true,
+                        Optional.of(ImmutableList.of(new Identifier(location(1, 32), "x", false))),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE TABLE IF NOT EXISTS foo(x,y) AS SELECT a,b FROM t"))
+                .isEqualTo(new CreateTableAsSelect(location(1, 1), qualifiedName(location(1, 28), "foo"), new Query(
+                        location(1, 40),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        new QuerySpecification(
+                                location(1, 40),
+                                new Select(location(1, 40), false, ImmutableList.of(
+                                        new SingleColumn(location(1, 47), new Identifier(location(1, 47), "a", false), Optional.empty()),
+                                        new SingleColumn(location(1, 49), new Identifier(location(1, 49), "b", false), Optional.empty()))),
+                                Optional.of(new Table(location(1, 56), qualifiedName(location(1, 56), "t"))),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                        IGNORE,
+                        ImmutableList.of(),
+                        true,
+                        Optional.of(ImmutableList.of(
+                                new Identifier(location(1, 32), "x", false),
+                                new Identifier(location(1, 34), "y", false))),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE TABLE foo AS SELECT * FROM t WITH NO DATA"))
+                .isEqualTo(new CreateTableAsSelect(location(1, 1), qualifiedName(location(1, 14), "foo"), new Query(
+                        location(1, 21),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        new QuerySpecification(
+                                location(1, 21),
+                                new Select(location(1, 21), false, ImmutableList.of(new AllColumns(location(1, 28), Optional.empty(), ImmutableList.of()))),
+                                Optional.of(new Table(location(1, 35), qualifiedName(location(1, 35), "t"))),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                        FAIL,
+                        ImmutableList.of(),
+                        false,
+                        Optional.empty(),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE TABLE foo(x) AS SELECT a FROM t WITH NO DATA"))
+                .isEqualTo(new CreateTableAsSelect(location(1, 1), qualifiedName(location(1, 14), "foo"), new Query(
+                        location(1, 24),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        new QuerySpecification(
+                                location(1, 24),
+                                new Select(location(1, 24), false, ImmutableList.of(new SingleColumn(location(1, 31), new Identifier(location(1, 31), "a", false), Optional.empty()))),
+                                Optional.of(new Table(location(1, 38), qualifiedName(location(1, 38), "t"))),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                        FAIL,
+                        ImmutableList.of(),
+                        false,
+                        Optional.of(ImmutableList.of(new Identifier(location(1, 18), "x", false))),
+                        Optional.empty()));
+
+        assertThat(statement("CREATE TABLE foo(x,y) AS SELECT a,b FROM t WITH NO DATA"))
+                .isEqualTo(new CreateTableAsSelect(location(1, 1), qualifiedName(location(1, 14), "foo"), new Query(
+                        location(1, 26),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        new QuerySpecification(
+                                location(1, 26),
+                                new Select(location(1, 26), false, ImmutableList.of(
+                                        new SingleColumn(location(1, 33), new Identifier(location(1, 33), "a", false), Optional.empty()),
+                                        new SingleColumn(location(1, 35), new Identifier(location(1, 35), "b", false), Optional.empty()))),
+                                Optional.of(new Table(location(1, 42), qualifiedName(location(1, 42), "t"))),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                        FAIL,
+                        ImmutableList.of(),
+                        false,
+                        Optional.of(ImmutableList.of(
+                                new Identifier(location(1, 18), "x", false),
+                                new Identifier(location(1, 20), "y", false))),
+                        Optional.empty()));
+
+        assertThat(statement("""
+                CREATE TABLE foo
+                WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] )
+                AS
+                SELECT * FROM t
+                """))
+                .isEqualTo(new CreateTableAsSelect(
+                        location(1, 1),
+                        qualifiedName(location(1, 14), "foo"),
+                        new Query(
+                                location(4, 1),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                new QuerySpecification(
+                                        location(4, 1),
+                                        new Select(
+                                                location(4, 1),
+                                                false,
+                                                ImmutableList.of(new AllColumns(location(4, 8), Optional.empty(), ImmutableList.of()))),
+                                        Optional.of(new Table(location(4, 15), qualifiedName(location(4, 15), "t"))),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        ImmutableList.of(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty()),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        FAIL,
+                        ImmutableList.of(
+                                new Property(location(2, 8), new Identifier(location(2, 8), "string", false), new StringLiteral(location(2, 17), "bar")),
+                                new Property(location(2, 24), new Identifier(location(2, 24), "long", false), new LongLiteral(location(2, 31), "42")),
+                                new Property(
+                                        location(2, 35),
+                                        new Identifier(location(2, 35), "computed", false),
+                                        new FunctionCall(location(2, 52), QualifiedName.of("concat"), ImmutableList.of(new StringLiteral(location(2, 46), "ban"), new StringLiteral(location(2, 55), "ana")))),
+                                new Property(location(2, 62), new Identifier(location(2, 62), "a", false), new Array(location(2, 67), ImmutableList.of(new StringLiteral(location(2, 74), "v1"), new StringLiteral(location(2, 80), "v2"))))),
+                        true,
+                        Optional.empty(),
+                        Optional.empty()));
+
+        assertThat(statement("""
+                CREATE TABLE foo(x)
+                WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] )
+                AS
+                SELECT a FROM t
+                """))
+                .isEqualTo(new CreateTableAsSelect(
+                        location(1, 1),
+                        qualifiedName(location(1, 14), "foo"),
+                        new Query(
+                                location(4, 1),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                new QuerySpecification(
+                                        location(4, 1),
+                                        new Select(location(4, 1), false, ImmutableList.of(new SingleColumn(location(4, 8), new Identifier(location(4, 8), "a", false), Optional.empty()))),
+                                        Optional.of(new Table(location(4, 15), qualifiedName(location(4, 15), "t"))),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        ImmutableList.of(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty()),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        FAIL,
+                        ImmutableList.of(
+                                new Property(location(2, 8), new Identifier(location(2, 8), "string", false), new StringLiteral(location(2, 17), "bar")),
+                                new Property(location(2, 24), new Identifier(location(2, 24), "long", false), new LongLiteral(location(2, 31), "42")),
+                                new Property(
+                                        location(2, 35),
+                                        new Identifier(location(2, 35), "computed", false),
+                                        new FunctionCall(location(2, 52), QualifiedName.of("concat"), ImmutableList.of(new StringLiteral(location(2, 46), "ban"), new StringLiteral(location(2, 55), "ana")))),
+                                new Property(location(2, 62), new Identifier(location(2, 62), "a", false), new Array(location(2, 67), ImmutableList.of(new StringLiteral(location(2, 74), "v1"), new StringLiteral(location(2, 80), "v2"))))),
+                        true,
+                        Optional.of(ImmutableList.of(new Identifier(location(1, 18), "x", false))),
+                        Optional.empty()));
+
+        assertThat(statement("""
+                CREATE TABLE foo(x,y)
+                WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] )
+                AS
+                SELECT a,b FROM t
+                """))
+                .isEqualTo(new CreateTableAsSelect(
+                        location(1, 1),
+                        qualifiedName(location(1, 14), "foo"),
+                        new Query(
+                                location(4, 1),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                new QuerySpecification(
+                                        location(4, 1),
+                                        new Select(location(4, 1), false, ImmutableList.of(new SingleColumn(location(4, 8), new Identifier(location(4, 8), "a", false), Optional.empty()), new SingleColumn(location(4, 10), new Identifier(location(4, 10), "b", false), Optional.empty()))),
+                                        Optional.of(new Table(location(4, 17), qualifiedName(location(4, 17), "t"))),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        ImmutableList.of(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty()),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        FAIL,
+                        ImmutableList.of(
+                                new Property(location(2, 8), new Identifier(location(2, 8), "string", false), new StringLiteral(location(2, 17), "bar")),
+                                new Property(location(2, 24), new Identifier(location(2, 24), "long", false), new LongLiteral(location(2, 31), "42")),
+                                new Property(
+                                        location(2, 35),
+                                        new Identifier(location(2, 35), "computed", false),
+                                        new FunctionCall(location(2, 52), QualifiedName.of("concat"), ImmutableList.of(new StringLiteral(location(2, 46), "ban"), new StringLiteral(location(2, 55), "ana")))),
+                                new Property(location(2, 62), new Identifier(location(2, 62), "a", false), new Array(location(2, 67), ImmutableList.of(new StringLiteral(location(2, 74), "v1"), new StringLiteral(location(2, 80), "v2"))))),
+                        true,
+                        Optional.of(ImmutableList.of(new Identifier(location(1, 18), "x", false), new Identifier(location(1, 20), "y", false))),
+                        Optional.empty()));
+
+        assertThat(statement("""
+                CREATE TABLE foo
+                WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] )
+                AS
+                SELECT * FROM t
+                WITH NO DATA
+                """))
+                .isEqualTo(new CreateTableAsSelect(
+                        location(1, 1),
+                        qualifiedName(location(1, 14), "foo"),
+                        new Query(
+                                location(4, 1),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                new QuerySpecification(
+                                        location(4, 1),
+                                        new Select(
+                                                location(4, 1),
+                                                false,
+                                                ImmutableList.of(new AllColumns(location(4, 8), Optional.empty(), ImmutableList.of()))),
+                                        Optional.of(new Table(location(4, 15), qualifiedName(location(4, 15), "t"))),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        ImmutableList.of(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty()),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        FAIL,
+                        ImmutableList.of(
+                                new Property(location(2, 8), new Identifier(location(2, 8), "string", false), new StringLiteral(location(2, 17), "bar")),
+                                new Property(location(2, 24), new Identifier(location(2, 24), "long", false), new LongLiteral(location(2, 31), "42")),
+                                new Property(
+                                        location(2, 35),
+                                        new Identifier(location(2, 35), "computed", false),
+                                        new FunctionCall(location(2, 52), QualifiedName.of("concat"), ImmutableList.of(new StringLiteral(location(2, 46), "ban"), new StringLiteral(location(2, 55), "ana")))),
+                                new Property(location(2, 62), new Identifier(location(2, 62), "a", false), new Array(location(2, 67), ImmutableList.of(new StringLiteral(location(2, 74), "v1"), new StringLiteral(location(2, 80), "v2"))))),
+                        false,
+                        Optional.empty(),
+                        Optional.empty()));
+
+        assertThat(statement("""
+                CREATE TABLE foo(x)
+                WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] )
+                AS
+                SELECT a FROM t
+                WITH NO DATA
+                """))
+                .isEqualTo(new CreateTableAsSelect(
+                        location(1, 1),
+                        qualifiedName(location(1, 14), "foo"),
+                        new Query(
+                                location(4, 1),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                new QuerySpecification(
+                                        location(4, 1),
+                                        new Select(location(4, 1), false, ImmutableList.of(new SingleColumn(location(4, 8), new Identifier(location(4, 8), "a", false), Optional.empty()))),
+                                        Optional.of(new Table(location(4, 15), qualifiedName(location(4, 15), "t"))),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        ImmutableList.of(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty()),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        FAIL,
+                        ImmutableList.of(
+                                new Property(location(2, 8), new Identifier(location(2, 8), "string", false), new StringLiteral(location(2, 17), "bar")),
+                                new Property(location(2, 24), new Identifier(location(2, 24), "long", false), new LongLiteral(location(2, 31), "42")),
+                                new Property(
+                                        location(2, 35),
+                                        new Identifier(location(2, 35), "computed", false),
+                                        new FunctionCall(location(2, 52), QualifiedName.of("concat"), ImmutableList.of(new StringLiteral(location(2, 46), "ban"), new StringLiteral(location(2, 55), "ana")))),
+                                new Property(location(2, 62), new Identifier(location(2, 62), "a", false), new Array(location(2, 67), ImmutableList.of(new StringLiteral(location(2, 74), "v1"), new StringLiteral(location(2, 80), "v2"))))),
+                        false,
+                        Optional.of(ImmutableList.of(new Identifier(location(1, 18), "x", false))),
+                        Optional.empty()));
+
+        assertThat(statement("""
+                CREATE TABLE foo(x,y)
+                WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] )
+                AS
+                SELECT a,b FROM t
+                WITH NO DATA
+                """))
+                .isEqualTo(new CreateTableAsSelect(
+                        location(1, 1),
+                        qualifiedName(location(1, 14), "foo"),
+                        new Query(
+                                location(4, 1),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                new QuerySpecification(
+                                        location(4, 1),
+                                        new Select(location(4, 1), false, ImmutableList.of(new SingleColumn(location(4, 8), new Identifier(location(4, 8), "a", false), Optional.empty()), new SingleColumn(location(4, 10), new Identifier(location(4, 10), "b", false), Optional.empty()))),
+                                        Optional.of(new Table(location(4, 17), qualifiedName(location(4, 17), "t"))),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        ImmutableList.of(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty()),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        FAIL,
+                        ImmutableList.of(
+                                new Property(location(2, 8), new Identifier(location(2, 8), "string", false), new StringLiteral(location(2, 17), "bar")),
+                                new Property(location(2, 24), new Identifier(location(2, 24), "long", false), new LongLiteral(location(2, 31), "42")),
+                                new Property(
+                                        location(2, 35),
+                                        new Identifier(location(2, 35), "computed", false),
+                                        new FunctionCall(location(2, 52), QualifiedName.of("concat"), ImmutableList.of(new StringLiteral(location(2, 46), "ban"), new StringLiteral(location(2, 55), "ana")))),
+                                new Property(location(2, 62), new Identifier(location(2, 62), "a", false), new Array(location(2, 67), ImmutableList.of(new StringLiteral(location(2, 74), "v1"), new StringLiteral(location(2, 80), "v2"))))),
+                        false,
+                        Optional.of(ImmutableList.of(new Identifier(location(1, 18), "x", false), new Identifier(location(1, 20), "y", false))),
+                        Optional.empty()));
+
+        assertThat(statement("""
+                CREATE TABLE foo COMMENT 'test'
+                WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] )
+                AS
+                SELECT * FROM t
+                WITH NO DATA
+                """))
+                .isEqualTo(new CreateTableAsSelect(
+                        location(1, 1),
+                        qualifiedName(location(1, 14), "foo"),
+                        new Query(
+                                location(4, 1),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                new QuerySpecification(
+                                        location(4, 1),
+                                        new Select(
+                                                location(4, 1),
+                                                false,
+                                                ImmutableList.of(new AllColumns(location(4, 8), Optional.empty(), ImmutableList.of()))),
+                                        Optional.of(new Table(location(4, 15), qualifiedName(location(4, 15), "t"))),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        ImmutableList.of(),
+                                        Optional.empty(),
+                                        Optional.empty(),
                                         Optional.empty()),
-                                new ColumnDefinition(identifier("d"), simpleType(location(1, 63), "BIGINT"), true, emptyList(), Optional.empty())),
-                        true,
-                        ImmutableList.of(),
-                        Optional.empty()));
-
-        assertStatement("CREATE TABLE IF NOT EXISTS bar (LIKE like_table INCLUDING PROPERTIES)",
-                new CreateTable(QualifiedName.of("bar"),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        FAIL,
                         ImmutableList.of(
-                                new LikeClause(QualifiedName.of("like_table"),
-                                        Optional.of(LikeClause.PropertiesOption.INCLUDING))),
-                        true,
-                        ImmutableList.of(),
-                        Optional.empty()));
+                                new Property(location(2, 8), new Identifier(location(2, 8), "string", false), new StringLiteral(location(2, 17), "bar")),
+                                new Property(location(2, 24), new Identifier(location(2, 24), "long", false), new LongLiteral(location(2, 31), "42")),
+                                new Property(
+                                        location(2, 35),
+                                        new Identifier(location(2, 35), "computed", false),
+                                        new FunctionCall(location(2, 52), QualifiedName.of("concat"), ImmutableList.of(new StringLiteral(location(2, 46), "ban"), new StringLiteral(location(2, 55), "ana")))),
+                                new Property(location(2, 62), new Identifier(location(2, 62), "a", false), new Array(location(2, 67), ImmutableList.of(new StringLiteral(location(2, 74), "v1"), new StringLiteral(location(2, 80), "v2"))))),
+                        false,
+                        Optional.empty(),
+                        Optional.of("test")));
 
-        assertThat(statement("CREATE TABLE IF NOT EXISTS bar (c VARCHAR, LIKE like_table EXCLUDING PROPERTIES)"))
-                .ignoringLocation()
-                .isEqualTo(new CreateTable(QualifiedName.of("bar"),
+        assertThat(statement("""
+                CREATE TABLE foo(x) COMMENT 'test'
+                WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] )
+                AS
+                SELECT a FROM t
+                WITH NO DATA
+                """))
+                .isEqualTo(new CreateTableAsSelect(
+                        location(1, 1),
+                        qualifiedName(location(1, 14), "foo"),
+                        new Query(
+                                location(4, 1),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                new QuerySpecification(
+                                        location(4, 1),
+                                        new Select(location(4, 1), false, ImmutableList.of(new SingleColumn(location(4, 8), new Identifier(location(4, 8), "a", false), Optional.empty()))),
+                                        Optional.of(new Table(location(4, 15), qualifiedName(location(4, 15), "t"))),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        ImmutableList.of(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty()),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        FAIL,
                         ImmutableList.of(
-                                new ColumnDefinition(identifier("c"), simpleType(location(1, 35), "VARCHAR"), true, emptyList(), Optional.empty()),
-                                new LikeClause(QualifiedName.of("like_table"),
-                                        Optional.of(LikeClause.PropertiesOption.EXCLUDING))),
-                        true,
-                        ImmutableList.of(),
-                        Optional.empty()));
+                                new Property(location(2, 8), new Identifier(location(2, 8), "string", false), new StringLiteral(location(2, 17), "bar")),
+                                new Property(location(2, 24), new Identifier(location(2, 24), "long", false), new LongLiteral(location(2, 31), "42")),
+                                new Property(
+                                        location(2, 35),
+                                        new Identifier(location(2, 35), "computed", false),
+                                        new FunctionCall(location(2, 52), QualifiedName.of("concat"), ImmutableList.of(new StringLiteral(location(2, 46), "ban"), new StringLiteral(location(2, 55), "ana")))),
+                                new Property(location(2, 62), new Identifier(location(2, 62), "a", false), new Array(location(2, 67), ImmutableList.of(new StringLiteral(location(2, 74), "v1"), new StringLiteral(location(2, 80), "v2"))))),
+                        false,
+                        Optional.of(ImmutableList.of(new Identifier(location(1, 18), "x", false))),
+                        Optional.of("test")));
 
-        assertThat(statement("CREATE TABLE IF NOT EXISTS bar (c VARCHAR, LIKE like_table EXCLUDING PROPERTIES) COMMENT 'test'"))
-                .ignoringLocation()
-                .isEqualTo(new CreateTable(QualifiedName.of("bar"),
+        assertThat(statement("""
+                CREATE TABLE foo(x,y) COMMENT 'test'
+                WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] )
+                AS
+                SELECT a,b FROM t
+                WITH NO DATA
+                """))
+                .isEqualTo(new CreateTableAsSelect(
+                        location(1, 1),
+                        qualifiedName(location(1, 14), "foo"),
+                        new Query(
+                                location(4, 1),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                new QuerySpecification(
+                                        location(4, 1),
+                                        new Select(location(4, 1), false, ImmutableList.of(new SingleColumn(location(4, 8), new Identifier(location(4, 8), "a", false), Optional.empty()), new SingleColumn(location(4, 10), new Identifier(location(4, 10), "b", false), Optional.empty()))),
+                                        Optional.of(new Table(location(4, 17), qualifiedName(location(4, 17), "t"))),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        ImmutableList.of(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty()),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        FAIL,
                         ImmutableList.of(
-                                new ColumnDefinition(identifier("c"), simpleType(location(1, 35), "VARCHAR"), true, emptyList(), Optional.empty()),
-                                new LikeClause(QualifiedName.of("like_table"),
-                                        Optional.of(LikeClause.PropertiesOption.EXCLUDING))),
-                        true,
-                        ImmutableList.of(),
+                                new Property(location(2, 8), new Identifier(location(2, 8), "string", false), new StringLiteral(location(2, 17), "bar")),
+                                new Property(location(2, 24), new Identifier(location(2, 24), "long", false), new LongLiteral(location(2, 31), "42")),
+                                new Property(
+                                        location(2, 35),
+                                        new Identifier(location(2, 35), "computed", false),
+                                        new FunctionCall(location(2, 52), QualifiedName.of("concat"), ImmutableList.of(new StringLiteral(location(2, 46), "ban"), new StringLiteral(location(2, 55), "ana")))),
+                                new Property(location(2, 62), new Identifier(location(2, 62), "a", false), new Array(location(2, 67), ImmutableList.of(new StringLiteral(location(2, 74), "v1"), new StringLiteral(location(2, 80), "v2"))))),
+                        false,
+                        Optional.of(ImmutableList.of(new Identifier(location(1, 18), "x", false), new Identifier(location(1, 20), "y", false))),
                         Optional.of("test")));
-    }
 
-    @Test
-    public void testCreateTableWithNotNull()
-    {
-        assertThat(statement(
-                "CREATE TABLE foo (" +
-                        "a VARCHAR NOT NULL COMMENT 'column a', " +
-                        "b BIGINT COMMENT 'hello world', " +
-                        "c IPADDRESS, " +
-                        "d INTEGER NOT NULL)"))
-                .ignoringLocation()
-                .isEqualTo(new CreateTable(
-                        QualifiedName.of("foo"),
+        assertThat(statement("""
+                CREATE TABLE foo(x,y) COMMENT 'test'
+                WITH ( "string" = 'bar', "long" = 42, computed = 'ban' || 'ana', a = ARRAY[ 'v1', 'v2' ] )
+                AS
+                SELECT a,b FROM t
+                WITH NO DATA
+                """))
+                .isEqualTo(new CreateTableAsSelect(
+                        location(1, 1),
+                        qualifiedName(location(1, 14), "foo"),
+                        new Query(
+                                location(4, 1),
+                                ImmutableList.of(),
+                                Optional.empty(),
+                                new QuerySpecification(
+                                        location(4, 1),
+                                        new Select(location(4, 1), false, ImmutableList.of(new SingleColumn(location(4, 8), new Identifier(location(4, 8), "a", false), Optional.empty()), new SingleColumn(location(4, 10), new Identifier(location(4, 10), "b", false), Optional.empty()))),
+                                        Optional.of(new Table(location(4, 17), qualifiedName(location(4, 17), "t"))),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        ImmutableList.of(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty()),
+                                Optional.empty(),
+                                Optional.empty(),
+                                Optional.empty()),
+                        FAIL,
                         ImmutableList.of(
-                                new ColumnDefinition(identifier("a"), simpleType(location(1, 20), "VARCHAR"), false, emptyList(), Optional.of("column a")),
-                                new ColumnDefinition(identifier("b"), simpleType(location(1, 59), "BIGINT"), true, emptyList(), Optional.of("hello world")),
-                                new ColumnDefinition(identifier("c"), simpleType(location(1, 91), "IPADDRESS"), true, emptyList(), Optional.empty()),
-                                new ColumnDefinition(identifier("d"), simpleType(location(1, 104), "INTEGER"), false, emptyList(), Optional.empty())),
+                                new Property(location(2, 8), new Identifier(location(2, 8), "string", true), new StringLiteral(location(2, 19), "bar")),
+                                new Property(location(2, 26), new Identifier(location(2, 26), "long", true), new LongLiteral(location(2, 35), "42")),
+                                new Property(
+                                        location(2, 39),
+                                        new Identifier(location(2, 39), "computed", false),
+                                        new FunctionCall(location(2, 56), QualifiedName.of("concat"), ImmutableList.of(new StringLiteral(location(2, 50), "ban"), new StringLiteral(location(2, 59), "ana")))),
+                                new Property(location(2, 66), new Identifier(location(2, 66), "a", false), new Array(location(2, 70), ImmutableList.of(new StringLiteral(location(2, 77), "v1"), new StringLiteral(location(2, 83), "v2"))))),
                         false,
-                        ImmutableList.of(),
-                        Optional.empty()));
-    }
-
-    @Test
-    public void testCreateTableAsSelect()
-    {
-        Query query = simpleQuery(selectList(new AllColumns()), table(QualifiedName.of("t")));
-        Query querySelectColumn = simpleQuery(selectList(new Identifier("a")), table(QualifiedName.of("t")));
-        Query querySelectColumns = simpleQuery(selectList(new Identifier("a"), new Identifier("b")), table(QualifiedName.of("t")));
-        QualifiedName table = QualifiedName.of("foo");
-
-        assertStatement("CREATE TABLE foo AS SELECT * FROM t",
-                new CreateTableAsSelect(table, query, false, ImmutableList.of(), true, Optional.empty(), Optional.empty()));
-        assertStatement("CREATE TABLE foo(x) AS SELECT a FROM t",
-                new CreateTableAsSelect(table, querySelectColumn, false, ImmutableList.of(), true, Optional.of(ImmutableList.of(new Identifier("x"))), Optional.empty()));
-        assertStatement("CREATE TABLE foo(x,y) AS SELECT a,b FROM t",
-                new CreateTableAsSelect(table, querySelectColumns, false, ImmutableList.of(), true, Optional.of(ImmutableList.of(new Identifier("x"), new Identifier("y"))), Optional.empty()));
-
-        assertStatement("CREATE TABLE IF NOT EXISTS foo AS SELECT * FROM t",
-                new CreateTableAsSelect(table, query, true, ImmutableList.of(), true, Optional.empty(), Optional.empty()));
-        assertStatement("CREATE TABLE IF NOT EXISTS foo(x) AS SELECT a FROM t",
-                new CreateTableAsSelect(table, querySelectColumn, true, ImmutableList.of(), true, Optional.of(ImmutableList.of(new Identifier("x"))), Optional.empty()));
-        assertStatement("CREATE TABLE IF NOT EXISTS foo(x,y) AS SELECT a,b FROM t",
-                new CreateTableAsSelect(table, querySelectColumns, true, ImmutableList.of(), true, Optional.of(ImmutableList.of(new Identifier("x"), new Identifier("y"))), Optional.empty()));
-
-        assertStatement("CREATE TABLE foo AS SELECT * FROM t WITH NO DATA",
-                new CreateTableAsSelect(table, query, false, ImmutableList.of(), false, Optional.empty(), Optional.empty()));
-        assertStatement("CREATE TABLE foo(x) AS SELECT a FROM t WITH NO DATA",
-                new CreateTableAsSelect(table, querySelectColumn, false, ImmutableList.of(), false, Optional.of(ImmutableList.of(new Identifier("x"))), Optional.empty()));
-        assertStatement("CREATE TABLE foo(x,y) AS SELECT a,b FROM t WITH NO DATA",
-                new CreateTableAsSelect(table, querySelectColumns, false, ImmutableList.of(), false, Optional.of(ImmutableList.of(new Identifier("x"), new Identifier("y"))), Optional.empty()));
-
-        List<Property> properties = ImmutableList.of(
-                new Property(new Identifier("string"), new StringLiteral("bar")),
-                new Property(new Identifier("long"), new LongLiteral("42")),
-                new Property(
-                        new Identifier("computed"),
-                        new FunctionCall(QualifiedName.of("concat"), ImmutableList.of(new StringLiteral("ban"), new StringLiteral("ana")))),
-                new Property(new Identifier("a"), new Array(ImmutableList.of(new StringLiteral("v1"), new StringLiteral("v2")))));
-
-        assertStatement("CREATE TABLE foo " +
-                        "WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] ) " +
-                        "AS " +
-                        "SELECT * FROM t",
-                new CreateTableAsSelect(table, query, false, properties, true, Optional.empty(), Optional.empty()));
-        assertStatement("CREATE TABLE foo(x) " +
-                        "WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] ) " +
-                        "AS " +
-                        "SELECT a FROM t",
-                new CreateTableAsSelect(table, querySelectColumn, false, properties, true, Optional.of(ImmutableList.of(new Identifier("x"))), Optional.empty()));
-        assertStatement("CREATE TABLE foo(x,y) " +
-                        "WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] ) " +
-                        "AS " +
-                        "SELECT a,b FROM t",
-                new CreateTableAsSelect(table, querySelectColumns, false, properties, true, Optional.of(ImmutableList.of(new Identifier("x"), new Identifier("y"))), Optional.empty()));
-
-        assertStatement("CREATE TABLE foo " +
-                        "WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] ) " +
-                        "AS " +
-                        "SELECT * FROM t " +
-                        "WITH NO DATA",
-                new CreateTableAsSelect(table, query, false, properties, false, Optional.empty(), Optional.empty()));
-        assertStatement("CREATE TABLE foo(x) " +
-                        "WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] ) " +
-                        "AS " +
-                        "SELECT a FROM t " +
-                        "WITH NO DATA",
-                new CreateTableAsSelect(table, querySelectColumn, false, properties, false, Optional.of(ImmutableList.of(new Identifier("x"))), Optional.empty()));
-        assertStatement("CREATE TABLE foo(x,y) " +
-                        "WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] ) " +
-                        "AS " +
-                        "SELECT a,b FROM t " +
-                        "WITH NO DATA",
-                new CreateTableAsSelect(table, querySelectColumns, false, properties, false, Optional.of(ImmutableList.of(new Identifier("x"), new Identifier("y"))), Optional.empty()));
-
-        assertStatement("CREATE TABLE foo COMMENT 'test'" +
-                        "WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] ) " +
-                        "AS " +
-                        "SELECT * FROM t " +
-                        "WITH NO DATA",
-                new CreateTableAsSelect(table, query, false, properties, false, Optional.empty(), Optional.of("test")));
-        assertStatement("CREATE TABLE foo(x) COMMENT 'test'" +
-                        "WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] ) " +
-                        "AS " +
-                        "SELECT a FROM t " +
-                        "WITH NO DATA",
-                new CreateTableAsSelect(table, querySelectColumn, false, properties, false, Optional.of(ImmutableList.of(new Identifier("x"))), Optional.of("test")));
-        assertStatement("CREATE TABLE foo(x,y) COMMENT 'test'" +
-                        "WITH ( string = 'bar', long = 42, computed = 'ban' || 'ana', a  = ARRAY[ 'v1', 'v2' ] ) " +
-                        "AS " +
-                        "SELECT a,b FROM t " +
-                        "WITH NO DATA",
-                new CreateTableAsSelect(table, querySelectColumns, false, properties, false, Optional.of(ImmutableList.of(new Identifier("x"), new Identifier("y"))), Optional.of("test")));
-        assertStatement("CREATE TABLE foo(x,y) COMMENT 'test'" +
-                        "WITH ( \"string\" = 'bar', \"long\" = 42, computed = 'ban' || 'ana', a = ARRAY[ 'v1', 'v2' ] ) " +
-                        "AS " +
-                        "SELECT a,b FROM t " +
-                        "WITH NO DATA",
-                new CreateTableAsSelect(table, querySelectColumns, false, properties, false, Optional.of(ImmutableList.of(new Identifier("x"), new Identifier("y"))), Optional.of("test")));
+                        Optional.of(ImmutableList.of(new Identifier(location(1, 18), "x", false), new Identifier(location(1, 20), "y", false))),
+                        Optional.of("test")));
     }
 
     @Test
     public void testCreateTableAsWith()
     {
-        String queryParenthesizedWith = "CREATE TABLE foo " +
-                "AS " +
-                "( WITH t(x) AS (VALUES 1) " +
-                "TABLE t ) " +
-                "WITH NO DATA";
-        String queryUnparenthesizedWith = "CREATE TABLE foo " +
-                "AS " +
-                "WITH t(x) AS (VALUES 1) " +
-                "TABLE t " +
-                "WITH NO DATA";
-        String queryParenthesizedWithHasAlias = "CREATE TABLE foo(a) " +
-                "AS " +
-                "( WITH t(x) AS (VALUES 1) " +
-                "TABLE t ) " +
-                "WITH NO DATA";
-        String queryUnparenthesizedWithHasAlias = "CREATE TABLE foo(a) " +
-                "AS " +
-                "WITH t(x) AS (VALUES 1) " +
-                "TABLE t " +
-                "WITH NO DATA";
+        String queryParenthesizedWith = """
+                CREATE TABLE foo
+                AS
+                ( WITH t(x) AS (VALUES 1)
+                TABLE t )
+                WITH NO DATA
+                """;
+        String queryUnparenthesizedWith = """
+                CREATE TABLE foo
+                AS
+                WITH t(x) AS (VALUES 1)
+                TABLE t
+                WITH NO DATA
+                """;
+        String queryParenthesizedWithHasAlias = """
+                CREATE TABLE foo(a)
+                AS
+                ( WITH t(x) AS (VALUES 1)
+                TABLE t )
+                WITH NO DATA
+                """;
+        String queryUnparenthesizedWithHasAlias = """
+                CREATE TABLE foo(a)
+                AS
+                WITH t(x) AS (VALUES 1)
+                TABLE t
+                WITH NO DATA
+                """;
 
         QualifiedName table = QualifiedName.of("foo");
 
         Query query = new Query(
+                ImmutableList.of(),
                 Optional.of(new With(false, ImmutableList.of(
                         new WithQuery(
                                 identifier("t"),
@@ -2076,10 +2801,10 @@ public void testCreateTableAsWith()
                 Optional.empty(),
                 Optional.empty(),
                 Optional.empty());
-        assertStatement(queryParenthesizedWith, new CreateTableAsSelect(table, query, false, ImmutableList.of(), false, Optional.empty(), Optional.empty()));
-        assertStatement(queryUnparenthesizedWith, new CreateTableAsSelect(table, query, false, ImmutableList.of(), false, Optional.empty(), Optional.empty()));
-        assertStatement(queryParenthesizedWithHasAlias, new CreateTableAsSelect(table, query, false, ImmutableList.of(), false, Optional.of(ImmutableList.of(new Identifier("a"))), Optional.empty()));
-        assertStatement(queryUnparenthesizedWithHasAlias, new CreateTableAsSelect(table, query, false, ImmutableList.of(), false, Optional.of(ImmutableList.of(new Identifier("a"))), Optional.empty()));
+        assertStatement(queryParenthesizedWith, new CreateTableAsSelect(table, query, FAIL, ImmutableList.of(), false, Optional.empty(), Optional.empty()));
+        assertStatement(queryUnparenthesizedWith, new CreateTableAsSelect(table, query, FAIL, ImmutableList.of(), false, Optional.empty(), Optional.empty()));
+        assertStatement(queryParenthesizedWithHasAlias, new CreateTableAsSelect(table, query, FAIL, ImmutableList.of(), false, Optional.of(ImmutableList.of(new Identifier("a"))), Optional.empty()));
+        assertStatement(queryUnparenthesizedWithHasAlias, new CreateTableAsSelect(table, query, FAIL, ImmutableList.of(), false, Optional.of(ImmutableList.of(new Identifier("a"))), Optional.empty()));
     }
 
     @Test
@@ -2146,18 +2871,18 @@ public void testDelete()
     public void testMerge()
     {
         NodeLocation location = new NodeLocation(1, 1);
-        assertStatement("" +
-                        "MERGE INTO inventory AS i " +
-                        "  USING changes AS c " +
-                        "  ON i.part = c.part " +
-                        "WHEN MATCHED AND c.action = 'mod' " +
-                        "  THEN UPDATE SET " +
-                        "    qty = qty + c.qty " +
-                        "  , ts = CURRENT_TIMESTAMP " +
-                        "WHEN MATCHED AND c.action = 'del' " +
-                        "  THEN DELETE " +
-                        "WHEN NOT MATCHED AND c.action = 'new' " +
-                        "  THEN INSERT (part, qty) VALUES (c.part, c.qty)",
+        assertStatement("""
+                        MERGE INTO inventory AS i
+                          USING changes AS c
+                          ON i.part = c.part
+                        WHEN MATCHED AND c.action = 'mod'
+                          THEN UPDATE SET
+                            qty = qty + c.qty
+                          , ts = CURRENT_TIMESTAMP
+                        WHEN MATCHED AND c.action = 'del'
+                          THEN DELETE
+                        WHEN NOT MATCHED AND c.action = 'new'
+                          THEN INSERT (part, qty) VALUES (c.part, c.qty)""",
                 new Merge(
                         location,
                         new AliasedRelation(location, table(QualifiedName.of("inventory")), new Identifier("i"), null),
@@ -2242,7 +2967,7 @@ public void testRenameColumn()
                         QualifiedName.of(ImmutableList.of(
                                 new Identifier(location(1, 13), "foo", false),
                                 new Identifier(location(1, 17), "t", false))),
-                        new Identifier(location(1, 33), "a", false),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 33), "a", false))),
                         new Identifier(location(1, 38), "b", false),
                         false,
                         false));
@@ -2253,7 +2978,7 @@ public void testRenameColumn()
                         QualifiedName.of(ImmutableList.of(
                                 new Identifier(location(1, 23), "foo", false),
                                 new Identifier(location(1, 27), "t", false))),
-                        new Identifier(location(1, 43), "a", false),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 43), "a", false))),
                         new Identifier(location(1, 48), "b", false),
                         true,
                         false));
@@ -2264,7 +2989,7 @@ public void testRenameColumn()
                         QualifiedName.of(ImmutableList.of(
                                 new Identifier(location(1, 13), "foo", false),
                                 new Identifier(location(1, 17), "t", false))),
-                        new Identifier(location(1, 43), "a", false),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 43), "a", false))),
                         new Identifier(location(1, 48), "b", false),
                         false,
                         true));
@@ -2275,10 +3000,64 @@ public void testRenameColumn()
                         QualifiedName.of(ImmutableList.of(
                                 new Identifier(location(1, 23), "foo", false),
                                 new Identifier(location(1, 27), "t", false))),
-                        new Identifier(location(1, 53), "a", false),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 53), "a", false))),
                         new Identifier(location(1, 58), "b", false),
                         true,
                         true));
+
+        assertThat(statement("ALTER TABLE foo.t RENAME COLUMN c.d TO x"))
+                .isEqualTo(new RenameColumn(
+                        location(1, 1),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 13), "foo", false), new Identifier(location(1, 17), "t", false))),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 33), "c", false), new Identifier(location(1, 35), "d", false))),
+                        new Identifier(location(1, 40), "x", false),
+                        false,
+                        false));
+
+        assertThat(statement("ALTER TABLE foo.t RENAME COLUMN IF EXISTS c.d TO x"))
+                .isEqualTo(new RenameColumn(
+                        location(1, 1),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 13), "foo", false), new Identifier(location(1, 17), "t", false))),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 43), "c", false), new Identifier(location(1, 45), "d", false))),
+                        new Identifier(location(1, 50), "x", false),
+                        false,
+                        true));
+
+        assertThat(statement("ALTER TABLE IF EXISTS foo.t RENAME COLUMN c.d TO x"))
+                .isEqualTo(new RenameColumn(
+                        location(1, 1),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 23), "foo", false), new Identifier(location(1, 27), "t", false))),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 43), "c", false), new Identifier(location(1, 45), "d", false))),
+                        new Identifier(location(1, 50), "x", false),
+                        true,
+                        false));
+
+        assertThat(statement("ALTER TABLE IF EXISTS foo.t RENAME COLUMN b.\"c.d\" TO x"))
+                .isEqualTo(new RenameColumn(
+                        location(1, 1),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 23), "foo", false), new Identifier(location(1, 27), "t", false))),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 43), "b", false), new Identifier(location(1, 45), "c.d", true))),
+                        new Identifier(location(1, 54), "x", false),
+                        true,
+                        false));
+
+        assertThat(statement("ALTER TABLE IF EXISTS foo.t RENAME COLUMN \"b.c\".d TO x"))
+                .isEqualTo(new RenameColumn(
+                        location(1, 1),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 23), "foo", false), new Identifier(location(1, 27), "t", false))),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 43), "b.c", true), new Identifier(location(1, 49), "d", false))),
+                        new Identifier(location(1, 54), "x", false),
+                        true,
+                        false));
+
+        assertThat(statement("ALTER TABLE IF EXISTS foo.t RENAME COLUMN IF EXISTS c.d TO x"))
+                .isEqualTo(new RenameColumn(
+                        location(1, 1),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 23), "foo", false), new Identifier(location(1, 27), "t", false))),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 53), "c", false), new Identifier(location(1, 55), "d", false))),
+                        new Identifier(location(1, 60), "x", false),
+                        true,
+                        true));
     }
 
     @Test
@@ -2363,31 +3142,116 @@ public void testAddColumn()
                 .ignoringLocation()
                 .isEqualTo(new AddColumn(
                         QualifiedName.of("foo", "t"),
-                        new ColumnDefinition(identifier("c"), simpleType(location(1, 31), "bigint"), true, emptyList(), Optional.empty()), false, false));
+                        new ColumnDefinition(QualifiedName.of("c"), simpleType(location(1, 31), "bigint"), true, emptyList(), Optional.empty()), false, false));
 
         assertThat(statement("ALTER TABLE foo.t ADD COLUMN d double NOT NULL"))
                 .ignoringLocation()
                 .isEqualTo(new AddColumn(
                         QualifiedName.of("foo", "t"),
-                        new ColumnDefinition(identifier("d"), simpleType(location(1, 31), "double"), false, emptyList(), Optional.empty()), false, false));
+                        new ColumnDefinition(QualifiedName.of("d"), simpleType(location(1, 31), "double"), false, emptyList(), Optional.empty()), false, false));
 
         assertThat(statement("ALTER TABLE IF EXISTS foo.t ADD COLUMN d double NOT NULL"))
                 .ignoringLocation()
                 .isEqualTo(new AddColumn(
                         QualifiedName.of("foo", "t"),
-                        new ColumnDefinition(identifier("d"), simpleType(location(1, 31), "double"), false, emptyList(), Optional.empty()), true, false));
+                        new ColumnDefinition(QualifiedName.of("d"), simpleType(location(1, 31), "double"), false, emptyList(), Optional.empty()), true, false));
 
         assertThat(statement("ALTER TABLE foo.t ADD COLUMN IF NOT EXISTS d double NOT NULL"))
                 .ignoringLocation()
                 .isEqualTo(new AddColumn(
                         QualifiedName.of("foo", "t"),
-                        new ColumnDefinition(identifier("d"), simpleType(location(1, 31), "double"), false, emptyList(), Optional.empty()), false, true));
+                        new ColumnDefinition(QualifiedName.of("d"), simpleType(location(1, 31), "double"), false, emptyList(), Optional.empty()), false, true));
 
         assertThat(statement("ALTER TABLE IF EXISTS foo.t ADD COLUMN IF NOT EXISTS d double NOT NULL"))
                 .ignoringLocation()
                 .isEqualTo(new AddColumn(
                         QualifiedName.of("foo", "t"),
-                        new ColumnDefinition(identifier("d"), simpleType(location(1, 31), "double"), false, emptyList(), Optional.empty()), true, true));
+                        new ColumnDefinition(QualifiedName.of("d"), simpleType(location(1, 31), "double"), false, emptyList(), Optional.empty()), true, true));
+
+        // Add a field
+        assertThat(statement("ALTER TABLE foo.t ADD COLUMN c.d double"))
+                .isEqualTo(new AddColumn(
+                        location(1, 1),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 13), "foo", false), new Identifier(location(1, 17), "t", false))),
+                        new ColumnDefinition(
+                                location(1, 30),
+                                QualifiedName.of(ImmutableList.of(new Identifier(location(1, 30), "c", false), new Identifier(location(1, 32), "d", false))),
+                                simpleType(location(1, 34), "double"),
+                                true,
+                                ImmutableList.of(),
+                                Optional.empty()),
+                        false,
+                        false));
+
+        assertThat(statement("ALTER TABLE foo.t ADD COLUMN IF NOT EXISTS c.d double"))
+                .isEqualTo(new AddColumn(
+                        location(1, 1),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 13), "foo", false), new Identifier(location(1, 17), "t", false))),
+                        new ColumnDefinition(
+                                location(1, 44),
+                                QualifiedName.of(ImmutableList.of(new Identifier(location(1, 44), "c", false), new Identifier(location(1, 46), "d", false))),
+                                simpleType(location(1, 48), "double"),
+                                true,
+                                ImmutableList.of(),
+                                Optional.empty()),
+                        false,
+                        true));
+
+        assertThat(statement("ALTER TABLE IF EXISTS foo.t ADD COLUMN c.d double"))
+                .isEqualTo(new AddColumn(
+                        location(1, 1),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 23), "foo", false), new Identifier(location(1, 27), "t", false))),
+                        new ColumnDefinition(
+                                location(1, 40),
+                                QualifiedName.of(ImmutableList.of(new Identifier(location(1, 40), "c", false), new Identifier(location(1, 42), "d", false))),
+                                simpleType(location(1, 44), "double"),
+                                true,
+                                ImmutableList.of(),
+                                Optional.empty()),
+                        true,
+                        false));
+
+        assertThat(statement("ALTER TABLE IF EXISTS foo.t ADD COLUMN b.\"c.d\" double"))
+                .isEqualTo(new AddColumn(
+                        location(1, 1),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 23), "foo", false), new Identifier(location(1, 27), "t", false))),
+                        new ColumnDefinition(
+                                location(1, 40),
+                                QualifiedName.of(ImmutableList.of(new Identifier(location(1, 40), "b", false), new Identifier(location(1, 42), "c.d", true))),
+                                simpleType(location(1, 48), "double"),
+                                true,
+                                ImmutableList.of(),
+                                Optional.empty()),
+                        true,
+                        false));
+
+        assertThat(statement("ALTER TABLE IF EXISTS foo.t ADD COLUMN \"b.c\".d double"))
+                .isEqualTo(new AddColumn(
+                        location(1, 1),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 23), "foo", false), new Identifier(location(1, 27), "t", false))),
+                        new ColumnDefinition(
+                                location(1, 40),
+                                QualifiedName.of(ImmutableList.of(new Identifier(location(1, 40), "b.c", true), new Identifier(location(1, 46), "d", false))),
+                                simpleType(location(1, 48), "double"),
+                                true,
+                                ImmutableList.of(),
+                                Optional.empty()),
+                        true,
+                        false));
+
+        assertThat(statement("ALTER TABLE IF EXISTS foo.t ADD COLUMN IF NOT EXISTS c.d double"))
+                .isEqualTo(new AddColumn(
+                        location(1, 1),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 23), "foo", false), new Identifier(location(1, 27), "t", false))),
+                        new ColumnDefinition(
+                                location(1, 54),
+                                QualifiedName.of(ImmutableList.of(new Identifier(location(1, 54), "c", false), new Identifier(location(1, 56), "d", false))),
+                                simpleType(location(1, 58), "double"),
+                                true,
+                                ImmutableList.of(),
+                                Optional.empty()),
+                        true,
+                        true));
     }
 
     @Test
@@ -2414,7 +3278,7 @@ public void testAlterColumnSetDataType()
                         QualifiedName.of(ImmutableList.of(
                                 new Identifier(location(1, 13), "foo", false),
                                 new Identifier(location(1, 17), "t", false))),
-                        new Identifier(location(1, 32), "a", false),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 32), "a", false))),
                         simpleType(location(1, 48), "bigint"),
                         false));
 
@@ -2424,7 +3288,7 @@ public void testAlterColumnSetDataType()
                         QualifiedName.of(ImmutableList.of(
                                 new Identifier(location(1, 23), "foo", false),
                                 new Identifier(location(1, 27), "t", false))),
-                        new Identifier(location(1, 42), "b", false),
+                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 42), "b", false))),
                         simpleType(location(1, 58), "double"),
                         true));
     }
@@ -2645,7 +3509,7 @@ public void testSetPath()
                 .isInstanceOf(ParsingException.class)
                 .hasMessage("line 1:17: mismatched input '.'. Expecting: ',', <EOF>");
 
-        assertThatThrownBy(() -> SQL_PARSER.createStatement("SET PATH ", new ParsingOptions()))
+        assertThatThrownBy(() -> SQL_PARSER.createStatement("SET PATH "))
                 .isInstanceOf(ParsingException.class)
                 .hasMessage("line 1:10: mismatched input '<EOF>'. Expecting: <identifier>");
     }
@@ -2709,6 +3573,7 @@ public void testWith()
     {
         assertStatement("WITH a (t, u) AS (SELECT * FROM x), b AS (SELECT * FROM y) TABLE z",
                 new Query(
+                        ImmutableList.of(),
                         Optional.of(new With(false, ImmutableList.of(
                                 new WithQuery(
                                         identifier("a"),
@@ -2729,6 +3594,7 @@ public void testWith()
 
         assertStatement("WITH RECURSIVE a AS (SELECT * FROM x) TABLE y",
                 new Query(
+                        ImmutableList.of(),
                         Optional.of(new With(true, ImmutableList.of(
                                 new WithQuery(
                                         identifier("a"),
@@ -3159,6 +4025,28 @@ public void testExecuteWithUsing()
                 new Execute(identifier("myquery"), ImmutableList.of(new LongLiteral("1"), new StringLiteral("abc"), new Array(ImmutableList.of(new StringLiteral("hello"))))));
     }
 
+    @Test
+    public void testExecuteImmediate()
+    {
+        assertStatement(
+                "EXECUTE IMMEDIATE 'SELECT * FROM foo'",
+                new ExecuteImmediate(
+                        new NodeLocation(1, 1),
+                        new StringLiteral(new NodeLocation(1, 19), "SELECT * FROM foo"),
+                        emptyList()));
+    }
+
+    @Test
+    public void testExecuteImmediateWithUsing()
+    {
+        assertStatement(
+                "EXECUTE IMMEDIATE 'SELECT ?, ? FROM foo' USING 1, 'abc', ARRAY ['hello']",
+                new ExecuteImmediate(
+                        new NodeLocation(1, 1),
+                        new StringLiteral(new NodeLocation(1, 19), "SELECT ?, ? FROM foo"),
+                        ImmutableList.of(new LongLiteral("1"), new StringLiteral("abc"), new Array(ImmutableList.of(new StringLiteral("hello"))))));
+    }
+
     @Test
     public void testExists()
     {
@@ -3251,6 +4139,7 @@ public void testShowStatsForQuery()
                                 new TableSubquery(
                                         new Query(
                                                 location(1, 17),
+                                                ImmutableList.of(),
                                                 Optional.empty(),
                                                 new QuerySpecification(
                                                         location(1, 17),
@@ -3280,6 +4169,7 @@ public void testShowStatsForQuery()
                                 new TableSubquery(
                                         new Query(
                                                 location(1, 17),
+                                                ImmutableList.of(),
                                                 Optional.empty(),
                                                 new QuerySpecification(
                                                         location(1, 17),
@@ -3303,15 +4193,18 @@ public void testShowStatsForQuery()
                                                 Optional.empty()))));
 
         // SELECT with WITH
-        assertThat(statement("SHOW STATS FOR (\n" +
-                "   WITH t AS (SELECT 1 )\n" +
-                "   SELECT * FROM t)"))
+        assertThat(statement("""
+                SHOW STATS FOR (
+                   WITH t AS (SELECT 1 )
+                   SELECT * FROM t)
+                """))
                 .isEqualTo(
                         new ShowStats(
                                 Optional.of(location(1, 1)),
                                 new TableSubquery(
                                         new Query(
                                                 location(2, 4),
+                                                ImmutableList.of(),
                                                 Optional.of(
                                                         new With(
                                                                 location(2, 4),
@@ -3322,6 +4215,7 @@ public void testShowStatsForQuery()
                                                                                 new Identifier(location(2, 9), "t", false),
                                                                                 new Query(
                                                                                         location(2, 15),
+                                                                                        ImmutableList.of(),
                                                                                         Optional.empty(),
                                                                                         new QuerySpecification(
                                                                                                 location(2, 15),
@@ -3695,6 +4589,7 @@ public void testCreateMaterializedView()
                         QualifiedName.of(ImmutableList.of(new Identifier(new NodeLocation(1, 26), "a", false))),
                         new Query(
                                 new NodeLocation(1, 31),
+                                ImmutableList.of(),
                                 Optional.empty(),
                                 new QuerySpecification(
                                         new NodeLocation(1, 31),
@@ -3732,6 +4627,7 @@ public void testCreateMaterializedView()
                                 new Identifier(new NodeLocation(1, 52), "matview", false))),
                         new Query(
                                 new NodeLocation(1, 100),
+                                ImmutableList.of(),
                                 Optional.empty(),
                                 new QuerySpecification(
                                         new NodeLocation(1, 100),
@@ -3768,6 +4664,7 @@ public void testCreateMaterializedView()
                         QualifiedName.of(ImmutableList.of(new Identifier(new NodeLocation(1, 26), "a", false))),
                         new Query(
                                 new NodeLocation(1, 61),
+                                ImmutableList.of(),
                                 Optional.empty(),
                                 new QuerySpecification(
                                         new NodeLocation(1, 61),
@@ -3795,9 +4692,11 @@ public void testCreateMaterializedView()
                         Optional.empty()));
 
         // OR REPLACE, COMMENT, WITH properties
-        assertThat(statement("CREATE OR REPLACE MATERIALIZED VIEW catalog.schema.matview COMMENT 'A simple materialized view'" +
-                "WITH (partitioned_by = ARRAY ['dateint'])" +
-                " AS SELECT * FROM catalog2.schema2.tab"))
+        assertThat(statement("""
+                CREATE OR REPLACE MATERIALIZED VIEW catalog.schema.matview COMMENT 'A simple materialized view'
+                WITH (partitioned_by = ARRAY ['dateint'])
+                 AS SELECT * FROM catalog2.schema2.tab
+                """))
                 .isEqualTo(new CreateMaterializedView(
                         Optional.of(new NodeLocation(1, 1)),
                         QualifiedName.of(ImmutableList.of(
@@ -3805,20 +4704,21 @@ public void testCreateMaterializedView()
                                 new Identifier(new NodeLocation(1, 45), "schema", false),
                                 new Identifier(new NodeLocation(1, 52), "matview", false))),
                         new Query(
-                                new NodeLocation(1, 141),
+                                new NodeLocation(3, 5),
+                                ImmutableList.of(),
                                 Optional.empty(),
                                 new QuerySpecification(
-                                        new NodeLocation(1, 141),
+                                        new NodeLocation(3, 5),
                                         new Select(
-                                                new NodeLocation(1, 141),
+                                                new NodeLocation(3, 5),
                                                 false,
-                                                ImmutableList.of(new AllColumns(new NodeLocation(1, 148), Optional.empty(), ImmutableList.of()))),
+                                                ImmutableList.of(new AllColumns(new NodeLocation(3, 12), Optional.empty(), ImmutableList.of()))),
                                         Optional.of(new Table(
-                                                new NodeLocation(1, 155),
+                                                new NodeLocation(3, 19),
                                                 QualifiedName.of(ImmutableList.of(
-                                                        new Identifier(new NodeLocation(1, 155), "catalog2", false),
-                                                        new Identifier(new NodeLocation(1, 164), "schema2", false),
-                                                        new Identifier(new NodeLocation(1, 172), "tab", false))))),
+                                                        new Identifier(new NodeLocation(3, 19), "catalog2", false),
+                                                        new Identifier(new NodeLocation(3, 28), "schema2", false),
+                                                        new Identifier(new NodeLocation(3, 36), "tab", false))))),
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
@@ -3833,17 +4733,19 @@ public void testCreateMaterializedView()
                         false,
                         Optional.empty(),
                         ImmutableList.of(new Property(
-                                new NodeLocation(1, 102),
-                                new Identifier(new NodeLocation(1, 102), "partitioned_by", false),
+                                new NodeLocation(2, 7),
+                                new Identifier(new NodeLocation(2, 7), "partitioned_by", false),
                                 new Array(
-                                        new NodeLocation(1, 119),
-                                        ImmutableList.of(new StringLiteral(new NodeLocation(1, 126), "dateint"))))),
+                                        new NodeLocation(2, 24),
+                                        ImmutableList.of(new StringLiteral(new NodeLocation(2, 31), "dateint"))))),
                         Optional.of("A simple materialized view")));
 
         // OR REPLACE, COMMENT, WITH properties, view text containing WITH clause
-        assertThat(statement("CREATE OR REPLACE MATERIALIZED VIEW catalog.schema.matview COMMENT 'A partitioned materialized view' " +
-                "WITH (partitioned_by = ARRAY ['dateint'])" +
-                " AS WITH a (t, u) AS (SELECT * FROM x), b AS (SELECT * FROM a) TABLE b"))
+        assertThat(statement("""
+                CREATE OR REPLACE MATERIALIZED VIEW catalog.schema.matview COMMENT 'A partitioned materialized view'
+                WITH (partitioned_by = ARRAY ['dateint'])
+                 AS WITH a (t, u) AS (SELECT * FROM x), b AS (SELECT * FROM a) TABLE b
+                """))
                 .isEqualTo(new CreateMaterializedView(
                         Optional.of(new NodeLocation(1, 1)),
                         QualifiedName.of(ImmutableList.of(
@@ -3851,26 +4753,28 @@ public void testCreateMaterializedView()
                                 new Identifier(new NodeLocation(1, 45), "schema", false),
                                 new Identifier(new NodeLocation(1, 52), "matview", false))),
                         new Query(
-                                new NodeLocation(1, 147),
+                                new NodeLocation(3, 5),
+                                ImmutableList.of(),
                                 Optional.of(new With(
-                                        new NodeLocation(1, 147),
+                                        new NodeLocation(3, 5),
                                         false,
                                         ImmutableList.of(
                                                 new WithQuery(
-                                                        new NodeLocation(1, 152),
-                                                        new Identifier(new NodeLocation(1, 152), "a", false),
+                                                        new NodeLocation(3, 10),
+                                                        new Identifier(new NodeLocation(3, 10), "a", false),
                                                         new Query(
-                                                                new NodeLocation(1, 165),
+                                                                new NodeLocation(3, 23),
+                                                                ImmutableList.of(),
                                                                 Optional.empty(),
                                                                 new QuerySpecification(
-                                                                        new NodeLocation(1, 165),
+                                                                        new NodeLocation(3, 23),
                                                                         new Select(
-                                                                                new NodeLocation(1, 165),
+                                                                                new NodeLocation(3, 23),
                                                                                 false,
-                                                                                ImmutableList.of(new AllColumns(new NodeLocation(1, 172), Optional.empty(), ImmutableList.of()))),
+                                                                                ImmutableList.of(new AllColumns(new NodeLocation(3, 30), Optional.empty(), ImmutableList.of()))),
                                                                         Optional.of(new Table(
-                                                                                new NodeLocation(1, 179),
-                                                                                QualifiedName.of(ImmutableList.of(new Identifier(new NodeLocation(1, 179), "x", false))))),
+                                                                                new NodeLocation(3, 37),
+                                                                                QualifiedName.of(ImmutableList.of(new Identifier(new NodeLocation(3, 37), "x", false))))),
                                                                         Optional.empty(),
                                                                         Optional.empty(),
                                                                         Optional.empty(),
@@ -3882,23 +4786,24 @@ public void testCreateMaterializedView()
                                                                 Optional.empty(),
                                                                 Optional.empty()),
                                                         Optional.of(ImmutableList.of(
-                                                                new Identifier(new NodeLocation(1, 155), "t", false),
-                                                                new Identifier(new NodeLocation(1, 158), "u", false)))),
+                                                                new Identifier(new NodeLocation(3, 13), "t", false),
+                                                                new Identifier(new NodeLocation(3, 16), "u", false)))),
                                                 new WithQuery(
-                                                        new NodeLocation(1, 183),
-                                                        new Identifier(new NodeLocation(1, 183), "b", false),
+                                                        new NodeLocation(3, 41),
+                                                        new Identifier(new NodeLocation(3, 41), "b", false),
                                                         new Query(
-                                                                new NodeLocation(1, 189),
+                                                                new NodeLocation(3, 47),
+                                                                ImmutableList.of(),
                                                                 Optional.empty(),
                                                                 new QuerySpecification(
-                                                                        new NodeLocation(1, 189),
+                                                                        new NodeLocation(3, 47),
                                                                         new Select(
-                                                                                new NodeLocation(1, 189),
+                                                                                new NodeLocation(3, 47),
                                                                                 false,
-                                                                                ImmutableList.of(new AllColumns(new NodeLocation(1, 196), Optional.empty(), ImmutableList.of()))),
+                                                                                ImmutableList.of(new AllColumns(new NodeLocation(3, 54), Optional.empty(), ImmutableList.of()))),
                                                                         Optional.of(new Table(
-                                                                                new NodeLocation(1, 203),
-                                                                                QualifiedName.of(ImmutableList.of(new Identifier(new NodeLocation(1, 203), "a", false))))),
+                                                                                new NodeLocation(3, 61),
+                                                                                QualifiedName.of(ImmutableList.of(new Identifier(new NodeLocation(3, 61), "a", false))))),
                                                                         Optional.empty(),
                                                                         Optional.empty(),
                                                                         Optional.empty(),
@@ -3911,8 +4816,8 @@ public void testCreateMaterializedView()
                                                                 Optional.empty()),
                                                         Optional.empty())))),
                                 new Table(
-                                        new NodeLocation(1, 206),
-                                        QualifiedName.of(ImmutableList.of(new Identifier(new NodeLocation(1, 212), "b", false)))),
+                                        new NodeLocation(3, 64),
+                                        QualifiedName.of(ImmutableList.of(new Identifier(new NodeLocation(3, 70), "b", false)))),
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty()),
@@ -3920,11 +4825,11 @@ public void testCreateMaterializedView()
                         false,
                         Optional.empty(),
                         ImmutableList.of(new Property(
-                                new NodeLocation(1, 108),
-                                new Identifier(new NodeLocation(1, 108), "partitioned_by", false),
+                                new NodeLocation(2, 7),
+                                new Identifier(new NodeLocation(2, 7), "partitioned_by", false),
                                 new Array(
-                                        new NodeLocation(1, 125),
-                                        ImmutableList.of(new StringLiteral(new NodeLocation(1, 132), "dateint"))))),
+                                        new NodeLocation(2, 24),
+                                        ImmutableList.of(new StringLiteral(new NodeLocation(2, 31), "dateint"))))),
                         Optional.of("A partitioned materialized view")));
     }
 
@@ -4144,85 +5049,87 @@ public void testWindowClause()
     @Test
     public void testWindowFrameWithPatternRecognition()
     {
-        assertThat(expression("rank() OVER (" +
-                "                           PARTITION BY x " +
-                "                           ORDER BY y " +
-                "                           MEASURES " +
-                "                               MATCH_NUMBER() AS match_no, " +
-                "                               LAST(A.z) AS last_z " +
-                "                           ROWS BETWEEN CURRENT ROW AND 5 FOLLOWING " +
-                "                           AFTER MATCH SKIP TO NEXT ROW " +
-                "                           SEEK " +
-                "                           PATTERN (A B C) " +
-                "                           SUBSET U = (A, B) " +
-                "                           DEFINE " +
-                "                               B AS false, " +
-                "                               C AS CLASSIFIER(U) = 'B' " +
-                "                         )"))
+        assertThat(expression("""
+                rank() OVER (
+                   PARTITION BY x
+                   ORDER BY y
+                   MEASURES
+                       MATCH_NUMBER() AS match_no,
+                       LAST(A.z) AS last_z
+                   ROWS BETWEEN CURRENT ROW AND 5 FOLLOWING
+                   AFTER MATCH SKIP TO NEXT ROW
+                   SEEK
+                   PATTERN (A B C)
+                   SUBSET U = (A, B)
+                   DEFINE
+                       B AS false,
+                       C AS CLASSIFIER(U) = 'B'
+                 )
+                """))
                 .isEqualTo(new FunctionCall(
                         Optional.of(location(1, 1)),
                         QualifiedName.of(ImmutableList.of(new Identifier(location(1, 1), "rank", false))),
                         Optional.of(new WindowSpecification(
-                                location(1, 41),
+                                location(2, 4),
                                 Optional.empty(),
-                                ImmutableList.of(new Identifier(location(1, 54), "x", false)),
+                                ImmutableList.of(new Identifier(location(2, 17), "x", false)),
                                 Optional.of(new OrderBy(
-                                        location(1, 83),
-                                        ImmutableList.of(new SortItem(location(1, 92), new Identifier(location(1, 92), "y", false), ASCENDING, UNDEFINED)))),
+                                        location(3, 4),
+                                        ImmutableList.of(new SortItem(location(3, 13), new Identifier(location(3, 13), "y", false), ASCENDING, UNDEFINED)))),
                                 Optional.of(new WindowFrame(
-                                        location(1, 121),
+                                        location(4, 4),
                                         ROWS,
-                                        new FrameBound(location(1, 280), CURRENT_ROW),
-                                        Optional.of(new FrameBound(location(1, 296), FOLLOWING, new LongLiteral(location(1, 296), "5"))),
+                                        new FrameBound(location(7, 17), CURRENT_ROW),
+                                        Optional.of(new FrameBound(location(7, 33), FOLLOWING, new LongLiteral(location(7, 33), "5"))),
                                         ImmutableList.of(
                                                 new MeasureDefinition(
-                                                        location(1, 161),
+                                                        location(5, 8),
                                                         new FunctionCall(
-                                                                location(1, 161),
-                                                                QualifiedName.of(ImmutableList.of(new Identifier(location(1, 161), "MATCH_NUMBER", false))),
+                                                                location(5, 8),
+                                                                QualifiedName.of(ImmutableList.of(new Identifier(location(5, 8), "MATCH_NUMBER", false))),
                                                                 ImmutableList.of()),
-                                                        new Identifier(location(1, 179), "match_no", false)),
+                                                        new Identifier(location(5, 26), "match_no", false)),
                                                 new MeasureDefinition(
-                                                        location(1, 220),
+                                                        location(6, 8),
                                                         new FunctionCall(
-                                                                location(1, 220),
-                                                                QualifiedName.of(ImmutableList.of(new Identifier(location(1, 220), "LAST", false))),
+                                                                location(6, 8),
+                                                                QualifiedName.of(ImmutableList.of(new Identifier(location(6, 8), "LAST", false))),
                                                                 ImmutableList.of(new DereferenceExpression(
-                                                                        location(1, 225),
-                                                                        new Identifier(location(1, 225), "A", false),
-                                                                        new Identifier(location(1, 227), "z", false)))),
-                                                        new Identifier(location(1, 233), "last_z", false))),
-                                        Optional.of(skipToNextRow(location(1, 347))),
-                                        Optional.of(new PatternSearchMode(location(1, 391), SEEK)),
+                                                                        location(6, 13),
+                                                                        new Identifier(location(6, 13), "A", false),
+                                                                        new Identifier(location(6, 15), "z", false)))),
+                                                        new Identifier(location(6, 21), "last_z", false))),
+                                        Optional.of(skipToNextRow(location(8, 16))),
+                                        Optional.of(new PatternSearchMode(location(9, 4), SEEK)),
                                         Optional.of(new PatternConcatenation(
-                                                location(1, 432),
+                                                location(10, 13),
                                                 ImmutableList.of(
                                                         new PatternConcatenation(
-                                                                location(1, 432),
+                                                                location(10, 13),
                                                                 ImmutableList.of(
-                                                                        new PatternVariable(location(1, 432), new Identifier(location(1, 432), "A", false)),
-                                                                        new PatternVariable(location(1, 434), new Identifier(location(1, 434), "B", false)))),
-                                                        new PatternVariable(location(1, 436), new Identifier(location(1, 436), "C", false))))),
+                                                                        new PatternVariable(location(10, 13), new Identifier(location(10, 13), "A", false)),
+                                                                        new PatternVariable(location(10, 15), new Identifier(location(10, 15), "B", false)))),
+                                                        new PatternVariable(location(10, 17), new Identifier(location(10, 17), "C", false))))),
                                         ImmutableList.of(new SubsetDefinition(
-                                                location(1, 473),
-                                                new Identifier(location(1, 473), "U", false),
-                                                ImmutableList.of(new Identifier(location(1, 478), "A", false), new Identifier(location(1, 481), "B", false)))),
+                                                location(11, 11),
+                                                new Identifier(location(11, 11), "U", false),
+                                                ImmutableList.of(new Identifier(location(11, 16), "A", false), new Identifier(location(11, 19), "B", false)))),
                                         ImmutableList.of(
                                                 new VariableDefinition(
-                                                        location(1, 549),
-                                                        new Identifier(location(1, 549), "B", false),
-                                                        new BooleanLiteral(location(1, 554), "false")),
+                                                        location(13, 8),
+                                                        new Identifier(location(13, 8), "B", false),
+                                                        new BooleanLiteral(location(13, 13), "false")),
                                                 new VariableDefinition(
-                                                        location(1, 592),
-                                                        new Identifier(location(1, 592), "C", false),
+                                                        location(14, 8),
+                                                        new Identifier(location(14, 8), "C", false),
                                                         new ComparisonExpression(
-                                                                location(1, 611),
+                                                                location(14, 27),
                                                                 EQUAL,
                                                                 new FunctionCall(
-                                                                        location(1, 597),
-                                                                        QualifiedName.of(ImmutableList.of(new Identifier(location(1, 597), "CLASSIFIER", false))),
-                                                                        ImmutableList.of(new Identifier(location(1, 608), "U", false))),
-                                                                new StringLiteral(location(1, 613), "B")))))))),
+                                                                        location(14, 13),
+                                                                        QualifiedName.of(ImmutableList.of(new Identifier(location(14, 13), "CLASSIFIER", false))),
+                                                                        ImmutableList.of(new Identifier(location(14, 24), "U", false))),
+                                                                new StringLiteral(location(14, 29), "B")))))))),
                         Optional.empty(),
                         Optional.empty(),
                         false,
@@ -4234,43 +5141,45 @@ public void testWindowFrameWithPatternRecognition()
     @Test
     public void testMeasureOverWindow()
     {
-        assertThat(expression("last_z OVER (" +
-                "                           MEASURES z AS last_z " +
-                "                           ROWS CURRENT ROW " +
-                "                           PATTERN (A) " +
-                "                           DEFINE a AS true " +
-                "                         )"))
+        assertThat(expression("""
+                last_z OVER (
+                  MEASURES z AS last_z
+                  ROWS CURRENT ROW
+                  PATTERN (A)
+                  DEFINE a AS true
+                )
+                """))
                 .isEqualTo(new WindowOperation(
                         location(1, 1),
                         new Identifier(location(1, 1), "last_z", false),
                         new WindowSpecification(
-                                location(1, 41),
+                                location(2, 3),
                                 Optional.empty(),
                                 ImmutableList.of(),
                                 Optional.empty(),
                                 Optional.of(new WindowFrame(
-                                        location(1, 41),
+                                        location(2, 3),
                                         ROWS,
-                                        new FrameBound(location(1, 94), CURRENT_ROW),
+                                        new FrameBound(location(3, 8), CURRENT_ROW),
                                         Optional.empty(),
                                         ImmutableList.of(new MeasureDefinition(
-                                                location(1, 50),
-                                                new Identifier(location(1, 50), "z", false),
-                                                new Identifier(location(1, 55), "last_z", false))),
+                                                location(2, 12),
+                                                new Identifier(location(2, 12), "z", false),
+                                                new Identifier(location(2, 17), "last_z", false))),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.of(new PatternVariable(location(1, 142), new Identifier(location(1, 142), "A", false))),
+                                        Optional.of(new PatternVariable(location(4, 12), new Identifier(location(4, 12), "A", false))),
                                         ImmutableList.of(),
                                         ImmutableList.of(new VariableDefinition(
-                                                location(1, 179),
-                                                new Identifier(location(1, 179), "a", false),
-                                                new BooleanLiteral(location(1, 184), "true"))))))));
+                                                location(5, 10),
+                                                new Identifier(location(5, 10), "a", false),
+                                                new BooleanLiteral(location(5, 15), "true"))))))));
     }
 
     @Test
     public void testAllRowsReference()
     {
-        assertThatThrownBy(() -> SQL_PARSER.createStatement("SELECT 1 + A.*", new ParsingOptions(REJECT)))
+        assertThatThrownBy(() -> SQL_PARSER.createStatement("SELECT 1 + A.*"))
                 .isInstanceOf(ParsingException.class)
                 .hasMessageMatching("line 1:13: mismatched input '.'.*");
 
@@ -4282,10 +5191,11 @@ public void testAllRowsReference()
     @Test
     public void testUpdate()
     {
-        assertStatement("" +
-                        "UPDATE foo_table\n" +
-                        "    SET bar = 23, baz = 3.1415E0, bletch = 'barf'\n" +
-                        "WHERE (nothing = 'fun')",
+        assertStatement("""
+                        UPDATE foo_table
+                            SET bar = 23, baz = 3.1415E0, bletch = 'barf'
+                        WHERE (nothing = 'fun')
+                        """,
                 new Update(
                         new NodeLocation(1, 1),
                         table(QualifiedName.of("foo_table")),
@@ -4299,9 +5209,10 @@ public void testUpdate()
     @Test
     public void testWherelessUpdate()
     {
-        assertStatement("" +
-                        "UPDATE foo_table\n" +
-                        "    SET bar = 23",
+        assertStatement("""
+                        UPDATE foo_table
+                        SET bar = 23
+                        """,
                 new Update(
                         new NodeLocation(1, 1),
                         table(QualifiedName.of("foo_table")),
@@ -4320,6 +5231,7 @@ public void testQueryPeriod()
                 .isEqualTo(
                         new Query(
                                 location(1, 1),
+                                ImmutableList.of(),
                                 Optional.empty(),
                                 new QuerySpecification(
                                         location(1, 1),
@@ -4350,6 +5262,7 @@ public void testQueryPeriod()
                 .isEqualTo(
                         new Query(
                                 location(1, 1),
+                                ImmutableList.of(),
                                 Optional.empty(),
                                 new QuerySpecification(
                                         location(1, 1),
@@ -4493,65 +5406,67 @@ public void testTableFunctionInvocation()
                                 new LongLiteral(location(1, 39), "1"))),
                         ImmutableList.of())));
 
-        assertThat(statement("SELECT * FROM TABLE(some_ptf(" +
-                "                                               arg1 => TABLE(orders) AS ord(a, b, c) " +
-                "                                                                    PARTITION BY a " +
-                "                                                                    PRUNE WHEN EMPTY " +
-                "                                                                    ORDER BY b ASC NULLS LAST, " +
-                "                                               arg2 => CAST(NULL AS DESCRIPTOR), " +
-                "                                               arg3 => DESCRIPTOR(x integer, y varchar), " +
-                "                                               arg4 => 5, " +
-                "                                               'not-named argument' " +
-                "                                               COPARTITION (ord, nation)))"))
+        assertThat(statement("""
+                SELECT * FROM TABLE(some_ptf(
+                    arg1 => TABLE(orders) AS ord(a, b, c)
+                        PARTITION BY a
+                        PRUNE WHEN EMPTY
+                        ORDER BY b ASC NULLS LAST,
+                    arg2 => CAST(NULL AS DESCRIPTOR),
+                    arg3 => DESCRIPTOR(x integer, y varchar),
+                    arg4 => 5,
+                    'not-named argument'
+                    COPARTITION (ord, nation)))
+                """))
                 .isEqualTo(selectAllFrom(new TableFunctionInvocation(
                         location(1, 21),
                         qualifiedName(location(1, 21), "some_ptf"),
                         ImmutableList.of(
                                 new TableFunctionArgument(
-                                        location(1, 77),
-                                        Optional.of(new Identifier(location(1, 77), "arg1", false)),
+                                        location(2, 5),
+                                        Optional.of(new Identifier(location(2, 5), "arg1", false)),
                                         new TableFunctionTableArgument(
-                                                location(1, 85),
+                                                location(2, 13),
                                                 new AliasedRelation(
-                                                        location(1, 85),
-                                                        new Table(location(1, 85), qualifiedName(location(1, 91), "orders")),
-                                                        new Identifier(location(1, 102), "ord", false),
+                                                        location(2, 13),
+                                                        new Table(location(2, 13), qualifiedName(location(2, 19), "orders")),
+                                                        new Identifier(location(2, 30), "ord", false),
                                                         ImmutableList.of(
-                                                                new Identifier(location(1, 106), "a", false),
-                                                                new Identifier(location(1, 109), "b", false),
-                                                                new Identifier(location(1, 112), "c", false))),
-                                                Optional.of(ImmutableList.of(new Identifier(location(1, 196), "a", false))),
-                                                Optional.of(new OrderBy(ImmutableList.of(new SortItem(location(1, 360), new Identifier(location(1, 360), "b", false), ASCENDING, LAST)))),
-                                                Optional.of(new EmptyTableTreatment(location(1, 266), PRUNE)))),
+                                                                new Identifier(location(2, 34), "a", false),
+                                                                new Identifier(location(2, 37), "b", false),
+                                                                new Identifier(location(2, 40), "c", false))),
+                                                Optional.of(ImmutableList.of(new Identifier(location(3, 22), "a", false))),
+                                                Optional.of(new OrderBy(ImmutableList.of(new SortItem(location(5, 18), new Identifier(location(5, 18), "b", false), ASCENDING, LAST)))),
+                                                Optional.of(new EmptyTableTreatment(location(4, 9), PRUNE)))),
                                 new TableFunctionArgument(
-                                        location(1, 425),
-                                        Optional.of(new Identifier(location(1, 425), "arg2", false)),
-                                        nullDescriptorArgument(location(1, 433))),
+                                        location(6, 5),
+                                        Optional.of(new Identifier(location(6, 5), "arg2", false)),
+                                        nullDescriptorArgument(location(6, 13))),
                                 new TableFunctionArgument(
-                                        location(1, 506),
-                                        Optional.of(new Identifier(location(1, 506), "arg3", false)),
+                                        location(7, 5),
+                                        Optional.of(new Identifier(location(7, 5), "arg3", false)),
                                         descriptorArgument(
-                                                location(1, 514),
-                                                new Descriptor(location(1, 514), ImmutableList.of(
+                                                location(7, 13),
+                                                new Descriptor(location(7, 13), ImmutableList.of(
                                                         new DescriptorField(
-                                                                location(1, 525),
-                                                                new Identifier(location(1, 525), "x", false),
-                                                                Optional.of(new GenericDataType(location(1, 527), new Identifier(location(1, 527), "integer", false), ImmutableList.of()))),
+                                                                location(7, 24),
+                                                                new Identifier(location(7, 24), "x", false),
+                                                                Optional.of(new GenericDataType(location(7, 26), new Identifier(location(7, 26), "integer", false), ImmutableList.of()))),
                                                         new DescriptorField(
-                                                                location(1, 536),
-                                                                new Identifier(location(1, 536), "y", false),
-                                                                Optional.of(new GenericDataType(location(1, 538), new Identifier(location(1, 538), "varchar", false), ImmutableList.of()))))))),
+                                                                location(7, 35),
+                                                                new Identifier(location(7, 35), "y", false),
+                                                                Optional.of(new GenericDataType(location(7, 37), new Identifier(location(7, 37), "varchar", false), ImmutableList.of()))))))),
                                 new TableFunctionArgument(
-                                        location(1, 595),
-                                        Optional.of(new Identifier(location(1, 595), "arg4", false)),
-                                        new LongLiteral(location(1, 603), "5")),
+                                        location(8, 5),
+                                        Optional.of(new Identifier(location(8, 5), "arg4", false)),
+                                        new LongLiteral(location(8, 13), "5")),
                                 new TableFunctionArgument(
-                                        location(1, 653),
+                                        location(9, 5),
                                         Optional.empty(),
-                                        new StringLiteral(location(1, 653), "not-named argument"))),
+                                        new StringLiteral(location(9, 5), "not-named argument"))),
                         ImmutableList.of(ImmutableList.of(
-                                qualifiedName(location(1, 734), "ord"),
-                                qualifiedName(location(1, 739), "nation"))))));
+                                qualifiedName(location(10, 18), "ord"),
+                                qualifiedName(location(10, 23), "nation"))))));
     }
 
     @Test
@@ -4621,50 +5536,53 @@ public void testTableFunctionTableArgumentAliasing()
     public void testCopartitionInTableArgumentAlias()
     {
         // table argument 'input' is aliased. The alias "copartition" is illegal in this context.
-        assertThatThrownBy(() -> SQL_PARSER.createStatement(
-                "SELECT * " +
-                        "FROM TABLE(some_ptf( " +
-                        "input => TABLE(orders) copartition(a, b, c)))",
-                new ParsingOptions()))
+        assertThatThrownBy(() -> SQL_PARSER.createStatement("""
+                        SELECT *
+                        FROM TABLE(some_ptf(
+                        input => TABLE(orders) copartition(a, b, c)))
+                        """))
                 .isInstanceOf(ParsingException.class)
-                .hasMessageMatching("line 1:54: The word \"COPARTITION\" is ambiguous in this context. " +
+                .hasMessageMatching("line 3:24: The word \"COPARTITION\" is ambiguous in this context. " +
                         "To alias an argument, precede the alias with \"AS\". " +
                         "To specify co-partitioning, change the argument order so that the last argument cannot be aliased.");
 
         // table argument 'input' contains an aliased relation with the alias "copartition". The alias is enclosed in the 'TABLE(...)' clause, and the argument itself is not aliased.
         // The alias "copartition" is legal in this context.
-        assertThat(statement(
-                "SELECT * " +
-                        "FROM TABLE(some_ptf( " +
-                        "                   input => TABLE(SELECT * FROM orders copartition(a, b, c))))"))
+        assertThat(statement("""
+                SELECT *
+                FROM TABLE(some_ptf(
+                   input => TABLE(SELECT * FROM orders copartition(a, b, c))))
+                """))
                 .isInstanceOf(Query.class);
 
         // table argument 'input' is aliased. The alias "COPARTITION" is delimited, so it can cause no ambiguity with the COPARTITION clause, and is considered legal in this context.
-        assertThat(statement(
-                "SELECT * " +
-                        "FROM TABLE(some_ptf( " +
-                        "input => TABLE(orders) \"COPARTITION\"(a, b, c)))"))
+        assertThat(statement("""
+                SELECT *
+                FROM TABLE(some_ptf(
+                    input => TABLE(orders) "COPARTITION"(a, b, c)))
+                """))
                 .isInstanceOf(Query.class);
 
         // table argument 'input' is aliased. The alias "copartition" is preceded with the keyword "AS", so it can cause no ambiguity with the COPARTITION clause, and is considered legal in this context.
-        assertThat(statement(
-                "SELECT * " +
-                        "FROM TABLE(some_ptf( " +
-                        "input => TABLE(orders) AS copartition(a, b, c)))"))
+        assertThat(statement("""
+                SELECT *
+                FROM TABLE(some_ptf(
+                   input => TABLE(orders) AS copartition(a, b, c)))
+                """))
                 .isInstanceOf(Query.class);
 
         // the COPARTITION word can be either the alias for argument 'input3', or part of the COPARTITION clause.
         // It is parsed as the argument alias, and then fails as illegal in this context.
-        assertThatThrownBy(() -> SQL_PARSER.createStatement(
-                "SELECT * " +
-                        "FROM TABLE(some_ptf( " +
-                        "input1 => TABLE(customers) PARTITION BY nationkey, " +
-                        "input2 => TABLE(nation) PARTITION BY nationkey, " +
-                        "input3 => TABLE(lineitem) " +
-                        "COPARTITION(customers, nation))) ",
-                new ParsingOptions()))
+        assertThatThrownBy(() -> SQL_PARSER.createStatement("""
+                SELECT *
+                FROM TABLE(some_ptf(
+                    input1 => TABLE(customers) PARTITION BY nationkey,
+                    input2 => TABLE(nation) PARTITION BY nationkey,
+                    input3 => TABLE(lineitem)
+                    COPARTITION(customers, nation)))
+                """))
                 .isInstanceOf(ParsingException.class)
-                .hasMessageMatching("line 1:156: The word \"COPARTITION\" is ambiguous in this context. " +
+                .hasMessageMatching("line 6:5: The word \"COPARTITION\" is ambiguous in this context. " +
                         "To alias an argument, precede the alias with \"AS\". " +
                         "To specify co-partitioning, change the argument order so that the last argument cannot be aliased.");
 
@@ -4672,13 +5590,14 @@ public void testCopartitionInTableArgumentAlias()
         // In such case, the COPARTITION word cannot be mistaken for alias.
         // Note that this transformation of the query is always available. If the table function invocation contains the COPARTITION clause,
         // at least two table arguments must have partitioning specified.
-        assertThat(statement(
-                "SELECT * " +
-                        "FROM TABLE(some_ptf( " +
-                        "input1 => TABLE(customers) PARTITION BY nationkey, " +
-                        "input3 => TABLE(lineitem), " +
-                        "input2 => TABLE(nation) PARTITION BY nationkey " +
-                        "COPARTITION(customers, nation))) "))
+        assertThat(statement("""
+                SELECT *
+                FROM TABLE(some_ptf(
+                    input1 => TABLE(customers) PARTITION BY nationkey,
+                    input3 => TABLE(lineitem),
+                    input2 => TABLE(nation) PARTITION BY nationkey
+                    COPARTITION(customers, nation)))
+                """))
                 .isInstanceOf(Query.class);
     }
 
@@ -4686,6 +5605,7 @@ private static Query selectAllFrom(Relation relation)
     {
         return new Query(
                 location(1, 1),
+                ImmutableList.of(),
                 Optional.empty(),
                 new QuerySpecification(
                         location(1, 1),
@@ -4703,6 +5623,7 @@ private static Query selectAllFrom(Relation relation)
                 Optional.empty());
     }
 
+    @Test
     public void testJsonExists()
     {
         // test defaults
@@ -4714,33 +5635,37 @@ public void testJsonExists()
                                 new Identifier(location(1, 13), "json_column", false),
                                 JSON,
                                 new StringLiteral(location(1, 26), "lax $[5]"),
+                                Optional.empty(),
                                 ImmutableList.of()),
                         JsonExists.ErrorBehavior.FALSE));
 
-        assertThat(expression("JSON_EXISTS(" +
-                "                               json_column FORMAT JSON ENCODING UTF8, " +
-                "                               'lax $[start_parameter TO end_parameter.ceiling()]' " +
-                "                                   PASSING " +
-                "                                           start_column AS start_parameter, " +
-                "                                           end_column FORMAT JSON ENCODING UTF16 AS end_parameter " +
-                "                               UNKNOWN ON ERROR)"))
+        assertThat(expression("""
+                JSON_EXISTS(
+                    json_column FORMAT JSON ENCODING UTF8,
+                    'lax $[start_parameter TO end_parameter.ceiling()]'
+                        PASSING
+                                start_column AS start_parameter,
+                                end_column FORMAT JSON ENCODING UTF16 AS end_parameter
+                    UNKNOWN ON ERROR)
+                """))
                 .isEqualTo(new JsonExists(
                         Optional.of(location(1, 1)),
                         new JsonPathInvocation(
-                                Optional.of(location(1, 44)),
-                                new Identifier(location(1, 44), "json_column", false),
+                                Optional.of(location(2, 5)),
+                                new Identifier(location(2, 5), "json_column", false),
                                 UTF8,
-                                new StringLiteral(location(1, 114), "lax $[start_parameter TO end_parameter.ceiling()]"),
+                                new StringLiteral(location(3, 5), "lax $[start_parameter TO end_parameter.ceiling()]"),
+                                Optional.empty(),
                                 ImmutableList.of(
                                         new JsonPathParameter(
-                                                Optional.of(location(1, 252)),
-                                                new Identifier(location(1, 268), "start_parameter", false),
-                                                new Identifier(location(1, 252), "start_column", false),
+                                                Optional.of(location(5, 17)),
+                                                new Identifier(location(5, 33), "start_parameter", false),
+                                                new Identifier(location(5, 17), "start_column", false),
                                                 Optional.empty()),
                                         new JsonPathParameter(
-                                                Optional.of(location(1, 328)),
-                                                new Identifier(location(1, 369), "end_parameter", false),
-                                                new Identifier(location(1, 328), "end_column", false),
+                                                Optional.of(location(6, 17)),
+                                                new Identifier(location(6, 58), "end_parameter", false),
+                                                new Identifier(location(6, 17), "end_column", false),
                                                 Optional.of(UTF16)))),
                         JsonExists.ErrorBehavior.UNKNOWN));
     }
@@ -4757,6 +5682,7 @@ public void testJsonValue()
                                 new Identifier(location(1, 12), "json_column", false),
                                 JSON,
                                 new StringLiteral(location(1, 25), "lax $[5]"),
+                                Optional.empty(),
                                 ImmutableList.of()),
                         Optional.empty(),
                         JsonValue.EmptyOrErrorBehavior.NULL,
@@ -4764,36 +5690,39 @@ public void testJsonValue()
                         JsonValue.EmptyOrErrorBehavior.NULL,
                         Optional.empty()));
 
-        assertThat(expression("JSON_VALUE(" +
-                "                               json_column FORMAT JSON ENCODING UTF8, " +
-                "                               'lax $[start_parameter TO end_parameter.ceiling()]' " +
-                "                                   PASSING " +
-                "                                           start_column AS start_parameter, " +
-                "                                           end_column FORMAT JSON ENCODING UTF16 AS end_parameter " +
-                "                               RETURNING double " +
-                "                               DEFAULT 5e0 ON EMPTY " +
-                "                               ERROR ON ERROR)"))
+        assertThat(expression("""
+                JSON_VALUE(
+                    json_column FORMAT JSON ENCODING UTF8,
+                    'lax $[start_parameter TO end_parameter.ceiling()]'
+                        PASSING
+                                start_column AS start_parameter,
+                                end_column FORMAT JSON ENCODING UTF16 AS end_parameter
+                    RETURNING double
+                    DEFAULT 5e0 ON EMPTY
+                    ERROR ON ERROR)
+                """))
                 .isEqualTo(new JsonValue(
                         Optional.of(location(1, 1)),
                         new JsonPathInvocation(
-                                Optional.of(location(1, 43)),
-                                new Identifier(location(1, 43), "json_column", false),
+                                Optional.of(location(2, 5)),
+                                new Identifier(location(2, 5), "json_column", false),
                                 UTF8,
-                                new StringLiteral(location(1, 113), "lax $[start_parameter TO end_parameter.ceiling()]"),
+                                new StringLiteral(location(3, 5), "lax $[start_parameter TO end_parameter.ceiling()]"),
+                                Optional.empty(),
                                 ImmutableList.of(
                                         new JsonPathParameter(
-                                                Optional.of(location(1, 251)),
-                                                new Identifier(location(1, 267), "start_parameter", false),
-                                                new Identifier(location(1, 251), "start_column", false),
+                                                Optional.of(location(5, 17)),
+                                                new Identifier(location(5, 33), "start_parameter", false),
+                                                new Identifier(location(5, 17), "start_column", false),
                                                 Optional.empty()),
                                         new JsonPathParameter(
-                                                Optional.of(location(1, 327)),
-                                                new Identifier(location(1, 368), "end_parameter", false),
-                                                new Identifier(location(1, 327), "end_column", false),
+                                                Optional.of(location(6, 17)),
+                                                new Identifier(location(6, 58), "end_parameter", false),
+                                                new Identifier(location(6, 17), "end_column", false),
                                                 Optional.of(UTF16)))),
-                        Optional.of(new GenericDataType(location(1, 423), new Identifier(location(1, 423), "double", false), ImmutableList.of())),
+                        Optional.of(new GenericDataType(location(7, 15), new Identifier(location(7, 15), "double", false), ImmutableList.of())),
                         JsonValue.EmptyOrErrorBehavior.DEFAULT,
-                        Optional.of(new DoubleLiteral(location(1, 469), "5e0")),
+                        Optional.of(new DoubleLiteral(location(8, 13), "5e0")),
                         JsonValue.EmptyOrErrorBehavior.ERROR,
                         Optional.empty()));
     }
@@ -4810,6 +5739,7 @@ public void testJsonQuery()
                                 new Identifier(location(1, 12), "json_column", false),
                                 JSON,
                                 new StringLiteral(location(1, 25), "lax $[5]"),
+                                Optional.empty(),
                                 ImmutableList.of()),
                         Optional.empty(),
                         Optional.empty(),
@@ -4818,36 +5748,39 @@ public void testJsonQuery()
                         JsonQuery.EmptyOrErrorBehavior.NULL,
                         JsonQuery.EmptyOrErrorBehavior.NULL));
 
-        assertThat(expression("JSON_QUERY(" +
-                "                               json_column FORMAT JSON ENCODING UTF8, " +
-                "                               'lax $[start_parameter TO end_parameter.ceiling()]' " +
-                "                                   PASSING " +
-                "                                           start_column AS start_parameter, " +
-                "                                           end_column FORMAT JSON ENCODING UTF16 AS end_parameter " +
-                "                               RETURNING varchar FORMAT JSON ENCODING UTF32 " +
-                "                               WITH ARRAY WRAPPER " +
-                "                               OMIT QUOTES " +
-                "                               EMPTY ARRAY ON EMPTY " +
-                "                               ERROR ON ERROR)"))
+        assertThat(expression("""
+                JSON_QUERY(
+                    json_column FORMAT JSON ENCODING UTF8,
+                    'lax $[start_parameter TO end_parameter.ceiling()]'
+                        PASSING
+                                start_column AS start_parameter,
+                                end_column FORMAT JSON ENCODING UTF16 AS end_parameter
+                    RETURNING varchar FORMAT JSON ENCODING UTF32
+                    WITH ARRAY WRAPPER
+                    OMIT QUOTES
+                    EMPTY ARRAY ON EMPTY
+                    ERROR ON ERROR)
+                """))
                 .isEqualTo(new JsonQuery(
                         Optional.of(location(1, 1)),
                         new JsonPathInvocation(
-                                Optional.of(location(1, 43)),
-                                new Identifier(location(1, 43), "json_column", false),
+                                Optional.of(location(2, 5)),
+                                new Identifier(location(2, 5), "json_column", false),
                                 UTF8,
-                                new StringLiteral(location(1, 113), "lax $[start_parameter TO end_parameter.ceiling()]"),
+                                new StringLiteral(location(3, 5), "lax $[start_parameter TO end_parameter.ceiling()]"),
+                                Optional.empty(),
                                 ImmutableList.of(
                                         new JsonPathParameter(
-                                                Optional.of(location(1, 251)),
-                                                new Identifier(location(1, 267), "start_parameter", false),
-                                                new Identifier(location(1, 251), "start_column", false),
+                                                Optional.of(location(5, 17)),
+                                                new Identifier(location(5, 33), "start_parameter", false),
+                                                new Identifier(location(5, 17), "start_column", false),
                                                 Optional.empty()),
                                         new JsonPathParameter(
-                                                Optional.of(location(1, 327)),
-                                                new Identifier(location(1, 368), "end_parameter", false),
-                                                new Identifier(location(1, 327), "end_column", false),
+                                                Optional.of(location(6, 17)),
+                                                new Identifier(location(6, 58), "end_parameter", false),
+                                                new Identifier(location(6, 17), "end_column", false),
                                                 Optional.of(UTF16)))),
-                        Optional.of(new GenericDataType(location(1, 423), new Identifier(location(1, 423), "varchar", false), ImmutableList.of())),
+                        Optional.of(new GenericDataType(location(7, 15), new Identifier(location(7, 15), "varchar", false), ImmutableList.of())),
                         Optional.of(UTF32),
                         JsonQuery.ArrayWrapperBehavior.UNCONDITIONAL,
                         Optional.of(JsonQuery.QuotesBehavior.OMIT),
@@ -4882,35 +5815,36 @@ public void testJsonObject()
                         Optional.empty(),
                         Optional.empty()));
 
-        assertThat(expression("JSON_OBJECT( " +
-                "                               key_column_1 VALUE value_column FORMAT JSON ENCODING UTF16, " +
-                "                               KEY 'key_literal' VALUE 5, " +
-                "                               key_column_2 : null " +
-                "                               ABSENT ON NULL " +
-                "                               WITH UNIQUE KEYS " +
-                "                               RETURNING varbinary FORMAT JSON ENCODING UTF32 " +
-                "                              )"))
+        assertThat(expression("""
+                JSON_OBJECT(
+                     key_column_1 VALUE value_column FORMAT JSON ENCODING UTF16,
+                     KEY 'key_literal' VALUE 5,
+                     key_column_2 : null
+                     ABSENT ON NULL
+                     WITH UNIQUE KEYS
+                     RETURNING varbinary FORMAT JSON ENCODING UTF32)
+                """))
                 .isEqualTo(new JsonObject(
                         Optional.of(location(1, 1)),
                         ImmutableList.of(
                                 new JsonObjectMember(
-                                        location(1, 45),
-                                        new Identifier(location(1, 45), "key_column_1", false),
-                                        new Identifier(location(1, 64), "value_column", false),
+                                        location(2, 6),
+                                        new Identifier(location(2, 6), "key_column_1", false),
+                                        new Identifier(location(2, 25), "value_column", false),
                                         Optional.of(UTF16)),
                                 new JsonObjectMember(
-                                        location(1, 136),
-                                        new StringLiteral(location(1, 140), "key_literal"),
-                                        new LongLiteral(location(1, 160), "5"),
+                                        location(3, 6),
+                                        new StringLiteral(location(3, 10), "key_literal"),
+                                        new LongLiteral(location(3, 30), "5"),
                                         Optional.empty()),
                                 new JsonObjectMember(
-                                        location(1, 194),
-                                        new Identifier(location(1, 194), "key_column_2", false),
-                                        new NullLiteral(location(1, 209)),
+                                        location(4, 6),
+                                        new Identifier(location(4, 6), "key_column_2", false),
+                                        new NullLiteral(location(4, 21)),
                                         Optional.empty())),
                         false,
                         true,
-                        Optional.of(new GenericDataType(location(1, 349), new Identifier(location(1, 349), "varbinary", false), ImmutableList.of())),
+                        Optional.of(new GenericDataType(location(7, 16), new Identifier(location(7, 16), "varbinary", false), ImmutableList.of())),
                         Optional.of(UTF32)));
     }
 
@@ -4938,12 +5872,13 @@ public void testJsonArray()
                         Optional.empty(),
                         Optional.empty()));
 
-        assertThat(expression("JSON_ARRAY(value_column FORMAT JSON ENCODING UTF16, " +
-                "                               5, " +
-                "                               null " +
-                "                               NULL ON NULL " +
-                "                               RETURNING varbinary FORMAT JSON ENCODING UTF32 " +
-                "                              )"))
+        assertThat(expression("""
+                JSON_ARRAY(value_column FORMAT JSON ENCODING UTF16,
+                    5,
+                    null
+                    NULL ON NULL
+                    RETURNING varbinary FORMAT JSON ENCODING UTF32)
+                """))
                 .isEqualTo(new JsonArray(
                         Optional.of(location(1, 1)),
                         ImmutableList.of(
@@ -4952,18 +5887,168 @@ public void testJsonArray()
                                         new Identifier(location(1, 12), "value_column", false),
                                         Optional.of(UTF16)),
                                 new JsonArrayElement(
-                                        location(1, 84),
-                                        new LongLiteral(location(1, 84), "5"),
+                                        location(2, 5),
+                                        new LongLiteral(location(2, 5), "5"),
                                         Optional.empty()),
                                 new JsonArrayElement(
-                                        location(1, 118),
-                                        new NullLiteral(location(1, 118)),
+                                        location(3, 5),
+                                        new NullLiteral(location(3, 5)),
                                         Optional.empty())),
                         true,
-                        Optional.of(new GenericDataType(location(1, 208), new Identifier(location(1, 208), "varbinary", false), ImmutableList.of())),
+                        Optional.of(new GenericDataType(location(5, 15), new Identifier(location(5, 15), "varbinary", false), ImmutableList.of())),
                         Optional.of(UTF32)));
     }
 
+    @Test
+    public void testJsonTableScalarColumns()
+    {
+        // test json_table with ordinality column, value column, and query column
+        assertThat(statement("SELECT * FROM JSON_TABLE(col, 'lax $' COLUMNS(" +
+                "ordinal_number FOR ORDINALITY, " +
+                "customer_name varchar PATH 'lax $.cust_no' DEFAULT 'anonymous' ON EMPTY null ON ERROR, " +
+                "customer_countries varchar FORMAT JSON PATH 'lax.cust_ctr[*]' WITH WRAPPER KEEP QUOTES null ON EMPTY ERROR ON ERROR," +
+                "customer_regions varchar FORMAT JSON PATH 'lax.cust_reg[*]' EMPTY ARRAY ON EMPTY EMPTY OBJECT ON ERROR) " +
+                "EMPTY ON ERROR)"))
+                .isEqualTo(selectAllFrom(new JsonTable(
+                        location(1, 15),
+                        new JsonPathInvocation(
+                                Optional.of(location(1, 26)),
+                                new Identifier(location(1, 26), "col", false),
+                                JSON,
+                                new StringLiteral(location(1, 31), "lax $"),
+                                Optional.empty(),
+                                ImmutableList.of()),
+                        ImmutableList.of(
+                                new OrdinalityColumn(location(1, 47), new Identifier(location(1, 47), "ordinal_number", false)),
+                                new ValueColumn(
+                                        location(1, 78),
+                                        new Identifier(location(1, 78), "customer_name", false),
+                                        new GenericDataType(location(1, 92), new Identifier(location(1, 92), "varchar", false), ImmutableList.of()),
+                                        Optional.of(new StringLiteral(location(1, 105), "lax $.cust_no")),
+                                        JsonValue.EmptyOrErrorBehavior.DEFAULT,
+                                        Optional.of(new StringLiteral(location(1, 129), "anonymous")),
+                                        Optional.of(JsonValue.EmptyOrErrorBehavior.NULL),
+                                        Optional.empty()),
+                                new QueryColumn(
+                                        location(1, 165),
+                                        new Identifier(location(1, 165), "customer_countries", false),
+                                        new GenericDataType(location(1, 184), new Identifier(location(1, 184), "varchar", false), ImmutableList.of()),
+                                        JSON,
+                                        Optional.of(new StringLiteral(location(1, 209), "lax.cust_ctr[*]")),
+                                        JsonQuery.ArrayWrapperBehavior.UNCONDITIONAL,
+                                        Optional.of(JsonQuery.QuotesBehavior.KEEP),
+                                        JsonQuery.EmptyOrErrorBehavior.NULL,
+                                        Optional.of(JsonQuery.EmptyOrErrorBehavior.ERROR)),
+                                new QueryColumn(
+                                        location(1, 281),
+                                        new Identifier(location(1, 281), "customer_regions", false),
+                                        new GenericDataType(location(1, 298), new Identifier(location(1, 298), "varchar", false), ImmutableList.of()),
+                                        JSON,
+                                        Optional.of(new StringLiteral(location(1, 323), "lax.cust_reg[*]")),
+                                        JsonQuery.ArrayWrapperBehavior.WITHOUT,
+                                        Optional.empty(),
+                                        JsonQuery.EmptyOrErrorBehavior.EMPTY_ARRAY,
+                                        Optional.of(JsonQuery.EmptyOrErrorBehavior.EMPTY_OBJECT))),
+                        Optional.empty(),
+                        Optional.of(JsonTable.ErrorBehavior.EMPTY))));
+    }
+
+    @Test
+    public void testJsonTableNestedColumns()
+    {
+        // test json_table with nested columns and PLAN clause
+        assertThat(statement("""
+                SELECT * FROM JSON_TABLE(col, 'lax $' AS customer COLUMNS(
+                    NESTED PATH 'lax $.cust_status[*]' AS status COLUMNS(
+                       status varchar PATH 'lax $.type',
+                       fresh boolean PATH 'lax &.new'),
+                    NESTED PATH 'lax &.cust_comm[*]' AS comment COLUMNS(
+                       comment varchar PATH 'lax $.text'))
+                    PLAN (customer OUTER (status CROSS comment))
+                    ERROR ON ERROR)
+                """))
+                .isEqualTo(selectAllFrom(new JsonTable(
+                        location(1, 15),
+                        new JsonPathInvocation(
+                                Optional.of(location(1, 26)),
+                                new Identifier(location(1, 26), "col", false),
+                                JSON,
+                                new StringLiteral(location(1, 31), "lax $"),
+                                Optional.of(new Identifier(location(1, 42), "customer", false)),
+                                ImmutableList.of()),
+                        ImmutableList.of(
+                                new NestedColumns(
+                                        location(2, 5),
+                                        new StringLiteral(location(2, 17), "lax $.cust_status[*]"),
+                                        Optional.of(new Identifier(location(2, 43), "status", false)),
+                                        ImmutableList.of(
+                                                new ValueColumn(
+                                                        location(3, 8),
+                                                        new Identifier(location(3, 8), "status", false),
+                                                        new GenericDataType(location(3, 15), new Identifier(location(3, 15), "varchar", false), ImmutableList.of()),
+                                                        Optional.of(new StringLiteral(location(3, 28), "lax $.type")),
+                                                        JsonValue.EmptyOrErrorBehavior.NULL,
+                                                        Optional.empty(),
+                                                        Optional.empty(),
+                                                        Optional.empty()),
+                                                new ValueColumn(
+                                                        location(4, 8),
+                                                        new Identifier(location(4, 8), "fresh", false),
+                                                        new GenericDataType(location(4, 14), new Identifier(location(4, 14), "boolean", false), ImmutableList.of()),
+                                                        Optional.of(new StringLiteral(location(4, 27), "lax &.new")),
+                                                        JsonValue.EmptyOrErrorBehavior.NULL,
+                                                        Optional.empty(),
+                                                        Optional.empty(),
+                                                        Optional.empty()))),
+                                new NestedColumns(
+                                        location(5, 5),
+                                        new StringLiteral(location(5, 17), "lax &.cust_comm[*]"),
+                                        Optional.of(new Identifier(location(5, 41), "comment", false)),
+                                        ImmutableList.of(
+                                                new ValueColumn(
+                                                        location(6, 8),
+                                                        new Identifier(location(6, 8), "comment", false),
+                                                        new GenericDataType(location(6, 16), new Identifier(location(6, 16), "varchar", false), ImmutableList.of()),
+                                                        Optional.of(new StringLiteral(location(6, 29), "lax $.text")),
+                                                        JsonValue.EmptyOrErrorBehavior.NULL,
+                                                        Optional.empty(),
+                                                        Optional.empty(),
+                                                        Optional.empty())))),
+                        Optional.of(new PlanParentChild(
+                                location(7, 11),
+                                JsonTablePlan.ParentChildPlanType.OUTER,
+                                new PlanLeaf(location(7, 11), new Identifier(location(7, 11), "customer", false)),
+                                new PlanSiblings(
+                                        location(7, 27),
+                                        JsonTablePlan.SiblingsPlanType.CROSS,
+                                        ImmutableList.of(
+                                                new PlanLeaf(location(7, 27), new Identifier(location(7, 27), "status", false)),
+                                                new PlanLeaf(location(7, 40), new Identifier(location(7, 40), "comment", false)))))),
+                        Optional.of(JsonTable.ErrorBehavior.ERROR))));
+    }
+
+    @Test
+    public void testSetSessionAuthorization()
+    {
+        assertStatement("SET SESSION AUTHORIZATION user", new SetSessionAuthorization(identifier("user")));
+        assertStatement("SET SESSION AUTHORIZATION \"user\"", new SetSessionAuthorization(identifier("user")));
+        assertStatement("SET SESSION AUTHORIZATION 'user'", new SetSessionAuthorization(new StringLiteral("user")));
+
+        assertStatementIsInvalid("SET SESSION AUTHORIZATION user-a").withMessage("line 1:31: mismatched input '-'. Expecting: <EOF>");
+        assertStatement("SET SESSION AUTHORIZATION \"user-a\"", new SetSessionAuthorization(identifier("user-a")));
+        assertStatement("SET SESSION AUTHORIZATION 'user-a'", new SetSessionAuthorization(new StringLiteral("user-a")));
+
+        assertStatementIsInvalid("SET SESSION AUTHORIZATION null").withMessage("line 1:27: mismatched input 'null'. Expecting: '.', '=', <identifier>, <string>");
+        assertStatement("SET SESSION AUTHORIZATION \"null\"", new SetSessionAuthorization(identifier("null")));
+        assertStatement("SET SESSION AUTHORIZATION 'null'", new SetSessionAuthorization(new StringLiteral("null")));
+    }
+
+    @Test
+    public void testResetSessionAuthorization()
+    {
+        assertStatement("RESET SESSION AUTHORIZATION", new ResetSessionAuthorization());
+    }
+
     private static QualifiedName makeQualifiedName(String tableName)
     {
         List<Identifier> parts = Splitter.on('.').splitToList(tableName).stream()
@@ -4978,7 +6063,7 @@ private static QualifiedName makeQualifiedName(String tableName)
     @Deprecated
     private static void assertStatement(@Language("SQL") String query, Statement expected)
     {
-        assertParsed(query, expected, SQL_PARSER.createStatement(query, new ParsingOptions()));
+        assertParsed(query, expected, SQL_PARSER.createStatement(query));
         assertFormattedSql(SQL_PARSER, expected);
     }
 
@@ -4990,7 +6075,7 @@ private static void assertExpression(@Language("SQL") String expression, Express
     {
         requireNonNull(expression, "expression is null");
         requireNonNull(expected, "expected is null");
-        assertParsed(expression, expected, SQL_PARSER.createExpression(expression, new ParsingOptions(AS_DECIMAL)));
+        assertParsed(expression, expected, SQL_PARSER.createExpression(expression));
     }
 
     private static void assertParsed(String input, Node expected, Node parsed)
@@ -5017,6 +6102,6 @@ private static String indent(String value)
 
     private static Expression createExpression(String expression)
     {
-        return SQL_PARSER.createExpression(expression, new ParsingOptions());
+        return SQL_PARSER.createExpression(expression);
     }
 }
diff --git a/core/trino-parser/src/test/java/io/trino/sql/parser/TestSqlParserErrorHandling.java b/core/trino-parser/src/test/java/io/trino/sql/parser/TestSqlParserErrorHandling.java
index 42929926dced..8631b75e870a 100644
--- a/core/trino-parser/src/test/java/io/trino/sql/parser/TestSqlParserErrorHandling.java
+++ b/core/trino-parser/src/test/java/io/trino/sql/parser/TestSqlParserErrorHandling.java
@@ -29,7 +29,6 @@
 public class TestSqlParserErrorHandling
 {
     private static final SqlParser SQL_PARSER = new SqlParser();
-    private static final ParsingOptions PARSING_OPTIONS = new ParsingOptions();
 
     private static Stream<Arguments> expressions()
     {
@@ -43,14 +42,14 @@ private static Stream<Arguments> statements()
         return Stream.of(
                 Arguments.of("",
                         "line 1:1: mismatched input '<EOF>'. Expecting: 'ALTER', 'ANALYZE', 'CALL', 'COMMENT', 'COMMIT', 'CREATE', 'DEALLOCATE', 'DELETE', 'DENY', 'DESC', 'DESCRIBE', 'DROP', 'EXECUTE', 'EXPLAIN', 'GRANT', " +
-                                "'INSERT', 'MERGE', 'PREPARE', 'REFRESH', 'RESET', 'REVOKE', 'ROLLBACK', 'SET', 'SHOW', 'START', 'TRUNCATE', 'UPDATE', 'USE', <query>"),
+                                "'INSERT', 'MERGE', 'PREPARE', 'REFRESH', 'RESET', 'REVOKE', 'ROLLBACK', 'SET', 'SHOW', 'START', 'TRUNCATE', 'UPDATE', 'USE', 'WITH', <query>"),
                 Arguments.of("@select",
                         "line 1:1: mismatched input '@'. Expecting: 'ALTER', 'ANALYZE', 'CALL', 'COMMENT', 'COMMIT', 'CREATE', 'DEALLOCATE', 'DELETE', 'DENY', 'DESC', 'DESCRIBE', 'DROP', 'EXECUTE', 'EXPLAIN', 'GRANT', " +
-                                "'INSERT', 'MERGE', 'PREPARE', 'REFRESH', 'RESET', 'REVOKE', 'ROLLBACK', 'SET', 'SHOW', 'START', 'TRUNCATE', 'UPDATE', 'USE', <query>"),
+                                "'INSERT', 'MERGE', 'PREPARE', 'REFRESH', 'RESET', 'REVOKE', 'ROLLBACK', 'SET', 'SHOW', 'START', 'TRUNCATE', 'UPDATE', 'USE', 'WITH', <query>"),
                 Arguments.of("select * from foo where @what",
                         "line 1:25: mismatched input '@'. Expecting: <expression>"),
                 Arguments.of("select * from 'oops",
-                        "line 1:15: mismatched input '''. Expecting: '(', 'LATERAL', 'TABLE', 'UNNEST', <identifier>"),
+                        "line 1:15: mismatched input '''. Expecting: '(', 'JSON_TABLE', 'LATERAL', 'TABLE', 'UNNEST', <identifier>"),
                 Arguments.of("select *\nfrom x\nfrom",
                         "line 3:1: mismatched input 'from'. Expecting: ',', '.', 'AS', 'CROSS', 'EXCEPT', 'FETCH', 'FOR', 'FULL', 'GROUP', 'HAVING', 'INNER', 'INTERSECT', 'JOIN', 'LEFT', " +
                                 "'LIMIT', 'MATCH_RECOGNIZE', 'NATURAL', 'OFFSET', 'ORDER', 'RIGHT', 'TABLESAMPLE', 'UNION', 'WHERE', 'WINDOW', <EOF>, <identifier>"),
@@ -59,9 +58,9 @@ private static Stream<Arguments> statements()
                 Arguments.of("select ",
                         "line 1:8: mismatched input '<EOF>'. Expecting: '*', 'ALL', 'DISTINCT', <expression>"),
                 Arguments.of("select * from",
-                        "line 1:14: mismatched input '<EOF>'. Expecting: '(', 'LATERAL', 'TABLE', 'UNNEST', <identifier>"),
+                        "line 1:14: mismatched input '<EOF>'. Expecting: '(', 'JSON_TABLE', 'LATERAL', 'TABLE', 'UNNEST', <identifier>"),
                 Arguments.of("select * from  ",
-                        "line 1:16: mismatched input '<EOF>'. Expecting: '(', 'LATERAL', 'TABLE', 'UNNEST', <identifier>"),
+                        "line 1:16: mismatched input '<EOF>'. Expecting: '(', 'JSON_TABLE', 'LATERAL', 'TABLE', 'UNNEST', <identifier>"),
                 Arguments.of("select * from `foo`",
                         "line 1:15: backquoted identifiers are not supported; use double quotes to quote identifiers"),
                 Arguments.of("select * from foo `bar`",
@@ -87,7 +86,7 @@ private static Stream<Arguments> statements()
                 Arguments.of("select foo(DISTINCT ,1)",
                         "line 1:21: mismatched input ','. Expecting: <expression>"),
                 Arguments.of("CREATE )",
-                        "line 1:8: mismatched input ')'. Expecting: 'CATALOG', 'MATERIALIZED', 'OR', 'ROLE', 'SCHEMA', 'TABLE', 'VIEW'"),
+                        "line 1:8: mismatched input ')'. Expecting: 'CATALOG', 'FUNCTION', 'MATERIALIZED', 'OR', 'ROLE', 'SCHEMA', 'TABLE', 'VIEW'"),
                 Arguments.of("CREATE TABLE ) AS (VALUES 1)",
                         "line 1:14: mismatched input ')'. Expecting: 'IF', <identifier>"),
                 Arguments.of("CREATE TABLE foo ",
@@ -115,7 +114,7 @@ private static Stream<Arguments> statements()
                 Arguments.of("CREATE TABLE t (x bigint) COMMENT ",
                         "line 1:35: mismatched input '<EOF>'. Expecting: <string>"),
                 Arguments.of("SELECT * FROM ( ",
-                        "line 1:17: mismatched input '<EOF>'. Expecting: '(', 'LATERAL', 'TABLE', 'UNNEST', <identifier>, <query>"),
+                        "line 1:17: mismatched input '<EOF>'. Expecting: '(', 'JSON_TABLE', 'LATERAL', 'TABLE', 'UNNEST', <identifier>, <query>"),
                 Arguments.of("SELECT CAST(a AS )",
                         "line 1:18: mismatched input ')'. Expecting: <type>"),
                 Arguments.of("SELECT CAST(a AS decimal()",
@@ -221,7 +220,7 @@ public void testPossibleExponentialBacktracking2()
     @MethodSource("statements")
     public void testStatement(String sql, String error)
     {
-        assertThatThrownBy(() -> SQL_PARSER.createStatement(sql, PARSING_OPTIONS))
+        assertThatThrownBy(() -> SQL_PARSER.createStatement(sql))
                 .isInstanceOf(ParsingException.class)
                 .hasMessage(error);
     }
@@ -230,7 +229,7 @@ public void testStatement(String sql, String error)
     @MethodSource("expressions")
     public void testExpression(String sql, String error)
     {
-        assertThatThrownBy(() -> SQL_PARSER.createExpression(sql, PARSING_OPTIONS))
+        assertThatThrownBy(() -> SQL_PARSER.createExpression(sql))
                 .isInstanceOf(ParsingException.class)
                 .hasMessage(error);
     }
@@ -238,7 +237,7 @@ public void testExpression(String sql, String error)
     @Test
     public void testParsingExceptionPositionInfo()
     {
-        assertThatThrownBy(() -> SQL_PARSER.createStatement("select *\nfrom x\nwhere from", PARSING_OPTIONS))
+        assertThatThrownBy(() -> SQL_PARSER.createStatement("select *\nfrom x\nwhere from"))
                 .isInstanceOfSatisfying(ParsingException.class, e -> {
                     assertTrue(e.getMessage().startsWith("line 3:7: mismatched input 'from'"));
                     assertTrue(e.getErrorMessage().startsWith("mismatched input 'from'"));
@@ -257,7 +256,7 @@ public void testStackOverflowExpression()
                         for (int i = 1; i < size; i++) {
                             expression = "(" + expression + ") OR x = y";
                         }
-                        SQL_PARSER.createExpression(expression, new ParsingOptions());
+                        SQL_PARSER.createExpression(expression);
                     }
                 })
                 .hasMessageContaining("line 1:1: expression is too large (stack overflow while parsing)");
@@ -273,7 +272,7 @@ public void testStackOverflowStatement()
                         for (int i = 1; i < size; i++) {
                             expression = "(" + expression + ") OR x = y";
                         }
-                        SQL_PARSER.createStatement("SELECT " + expression, PARSING_OPTIONS);
+                        SQL_PARSER.createStatement("SELECT " + expression);
                     }
                 })
                 .hasMessageContaining("line 1:1: statement is too large (stack overflow while parsing)");
diff --git a/core/trino-parser/src/test/java/io/trino/sql/parser/TestSqlParserRoutines.java b/core/trino-parser/src/test/java/io/trino/sql/parser/TestSqlParserRoutines.java
new file mode 100644
index 000000000000..143a495d0601
--- /dev/null
+++ b/core/trino-parser/src/test/java/io/trino/sql/parser/TestSqlParserRoutines.java
@@ -0,0 +1,356 @@
+/*
+ * Licensed 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 io.trino.sql.parser;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.sql.tree.ArithmeticBinaryExpression;
+import io.trino.sql.tree.AssignmentStatement;
+import io.trino.sql.tree.CommentCharacteristic;
+import io.trino.sql.tree.ComparisonExpression;
+import io.trino.sql.tree.CompoundStatement;
+import io.trino.sql.tree.ControlStatement;
+import io.trino.sql.tree.CreateFunction;
+import io.trino.sql.tree.DataType;
+import io.trino.sql.tree.DeterministicCharacteristic;
+import io.trino.sql.tree.ElseIfClause;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.FunctionCall;
+import io.trino.sql.tree.FunctionSpecification;
+import io.trino.sql.tree.GenericDataType;
+import io.trino.sql.tree.Identifier;
+import io.trino.sql.tree.IfStatement;
+import io.trino.sql.tree.LanguageCharacteristic;
+import io.trino.sql.tree.LogicalExpression;
+import io.trino.sql.tree.LongLiteral;
+import io.trino.sql.tree.NodeLocation;
+import io.trino.sql.tree.ParameterDeclaration;
+import io.trino.sql.tree.QualifiedName;
+import io.trino.sql.tree.Query;
+import io.trino.sql.tree.QuerySpecification;
+import io.trino.sql.tree.ReturnStatement;
+import io.trino.sql.tree.ReturnsClause;
+import io.trino.sql.tree.SecurityCharacteristic;
+import io.trino.sql.tree.Select;
+import io.trino.sql.tree.StringLiteral;
+import io.trino.sql.tree.VariableDeclaration;
+import io.trino.sql.tree.WhileStatement;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Optional;
+
+import static io.trino.sql.QueryUtil.functionCall;
+import static io.trino.sql.QueryUtil.identifier;
+import static io.trino.sql.QueryUtil.selectList;
+import static io.trino.sql.parser.ParserAssert.functionSpecification;
+import static io.trino.sql.parser.ParserAssert.statement;
+import static io.trino.sql.tree.NullInputCharacteristic.calledOnNullInput;
+import static io.trino.sql.tree.NullInputCharacteristic.returnsNullOnNullInput;
+import static io.trino.sql.tree.SecurityCharacteristic.Security.DEFINER;
+import static io.trino.sql.tree.SecurityCharacteristic.Security.INVOKER;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TestSqlParserRoutines
+{
+    @Test
+    public void testStandaloneFunction()
+    {
+        assertThat(functionSpecification("FUNCTION foo() RETURNS bigint RETURN 42"))
+                .ignoringLocation()
+                .isEqualTo(new FunctionSpecification(
+                        QualifiedName.of("foo"),
+                        ImmutableList.of(),
+                        returns(type("bigint")),
+                        ImmutableList.of(),
+                        new ReturnStatement(location(), literal(42))));
+    }
+
+    @Test
+    void testInlineFunction()
+    {
+        assertThat(statement("""
+                WITH
+                  FUNCTION answer()
+                  RETURNS BIGINT
+                  RETURN 42
+                SELECT answer()
+                """))
+                .ignoringLocation()
+                .isEqualTo(query(
+                        new FunctionSpecification(
+                                QualifiedName.of("answer"),
+                                ImmutableList.of(),
+                                returns(type("BIGINT")),
+                                ImmutableList.of(),
+                                new ReturnStatement(location(), literal(42))),
+                        selectList(new FunctionCall(QualifiedName.of("answer"), ImmutableList.of()))));
+    }
+
+    @Test
+    void testSimpleFunction()
+    {
+        assertThat(statement("""
+                CREATE FUNCTION hello(s VARCHAR)
+                RETURNS varchar
+                LANGUAGE SQL
+                DETERMINISTIC
+                CALLED ON NULL INPUT
+                SECURITY INVOKER
+                COMMENT 'hello world function'
+                RETURN CONCAT('Hello, ', s, '!')
+                """))
+                .ignoringLocation()
+                .isEqualTo(new CreateFunction(
+                        new FunctionSpecification(
+                                QualifiedName.of("hello"),
+                                ImmutableList.of(parameter("s", type("VARCHAR"))),
+                                returns(type("varchar")),
+                                ImmutableList.of(
+                                        new LanguageCharacteristic(identifier("SQL")),
+                                        new DeterministicCharacteristic(true),
+                                        calledOnNullInput(),
+                                        new SecurityCharacteristic(INVOKER),
+                                        new CommentCharacteristic("hello world function")),
+                                new ReturnStatement(location(), functionCall(
+                                        "CONCAT",
+                                        literal("Hello, "),
+                                        identifier("s"),
+                                        literal("!")))),
+                        false));
+    }
+
+    @Test
+    void testEmptyFunction()
+    {
+        assertThat(statement("""
+                CREATE OR REPLACE FUNCTION answer()
+                RETURNS bigint
+                RETURN 42
+                """))
+                .ignoringLocation()
+                .isEqualTo(new CreateFunction(
+                        new FunctionSpecification(
+                                QualifiedName.of("answer"),
+                                ImmutableList.of(),
+                                returns(type("bigint")),
+                                ImmutableList.of(),
+                                new ReturnStatement(location(), literal(42))),
+                        true));
+    }
+
+    @Test
+    void testFibFunction()
+    {
+        assertThat(statement("""
+                CREATE FUNCTION fib(n bigint)
+                RETURNS bigint
+                BEGIN
+                  DECLARE a bigint DEFAULT 1;
+                  DECLARE b bigint DEFAULT 1;
+                  DECLARE c bigint;
+                  IF n <= 2 THEN
+                    RETURN 1;
+                  END IF;
+                  WHILE n > 2 DO
+                    SET n = n - 1;
+                    SET c = a + b;
+                    SET a = b;
+                    SET b = c;
+                  END WHILE;
+                  RETURN c;
+                END
+                """))
+                .ignoringLocation()
+                .isEqualTo(new CreateFunction(
+                        new FunctionSpecification(
+                                QualifiedName.of("fib"),
+                                ImmutableList.of(parameter("n", type("bigint"))),
+                                returns(type("bigint")),
+                                ImmutableList.of(),
+                                beginEnd(
+                                        ImmutableList.of(
+                                                declare("a", type("bigint"), literal(1)),
+                                                declare("b", type("bigint"), literal(1)),
+                                                declare("c", type("bigint"))),
+                                        new IfStatement(
+                                                location(),
+                                                lte("n", literal(2)),
+                                                ImmutableList.of(new ReturnStatement(location(), literal(1))),
+                                                ImmutableList.of(),
+                                                Optional.empty()),
+                                        new WhileStatement(
+                                                location(),
+                                                Optional.empty(),
+                                                gt("n", literal(2)),
+                                                ImmutableList.of(
+                                                        assign("n", minus(identifier("n"), literal(1))),
+                                                        assign("c", plus(identifier("a"), identifier("b"))),
+                                                        assign("a", identifier("b")),
+                                                        assign("b", identifier("c")))),
+                                        new ReturnStatement(location(), identifier("c")))),
+                        false));
+    }
+
+    @Test
+    void testFunctionWithIfElseIf()
+    {
+        assertThat(statement("""
+                CREATE FUNCTION CustomerLevel(p_creditLimit DOUBLE)
+                RETURNS varchar
+                RETURNS NULL ON NULL INPUT
+                SECURITY DEFINER
+                BEGIN
+                  DECLARE lvl VarChar;
+                  IF p_creditLimit > 50000 THEN
+                    SET lvl = 'PLATINUM';
+                  ELSEIF (p_creditLimit <= 50000 AND p_creditLimit >= 10000) THEN
+                    SET lvl = 'GOLD';
+                  ELSEIF p_creditLimit < 10000 THEN
+                    SET lvl = 'SILVER';
+                  END IF;
+                  RETURN (lvl);
+                END
+                """))
+                .ignoringLocation()
+                .isEqualTo(new CreateFunction(
+                        new FunctionSpecification(
+                                QualifiedName.of("CustomerLevel"),
+                                ImmutableList.of(parameter("p_creditLimit", type("DOUBLE"))),
+                                returns(type("varchar")),
+                                ImmutableList.of(
+                                        returnsNullOnNullInput(),
+                                        new SecurityCharacteristic(DEFINER)),
+                                beginEnd(
+                                        ImmutableList.of(declare("lvl", type("VarChar"))),
+                                        new IfStatement(
+                                                location(),
+                                                gt("p_creditLimit", literal(50000)),
+                                                ImmutableList.of(assign("lvl", literal("PLATINUM"))),
+                                                ImmutableList.of(
+                                                        elseIf(LogicalExpression.and(
+                                                                        lte("p_creditLimit", literal(50000)),
+                                                                        gte("p_creditLimit", literal(10000))),
+                                                                assign("lvl", literal("GOLD"))),
+                                                        elseIf(lt("p_creditLimit", literal(10000)),
+                                                                assign("lvl", literal("SILVER")))),
+                                                Optional.empty()),
+                                        new ReturnStatement(location(), identifier("lvl")))),
+                        false));
+    }
+
+    private static DataType type(String identifier)
+    {
+        return new GenericDataType(Optional.empty(), new Identifier(identifier, false), ImmutableList.of());
+    }
+
+    private static ReturnsClause returns(DataType type)
+    {
+        return new ReturnsClause(location(), type);
+    }
+
+    private static VariableDeclaration declare(String name, DataType type)
+    {
+        return new VariableDeclaration(location(), ImmutableList.of(new Identifier(name)), type, Optional.empty());
+    }
+
+    private static VariableDeclaration declare(String name, DataType type, Expression defaultValue)
+    {
+        return new VariableDeclaration(location(), ImmutableList.of(new Identifier(name)), type, Optional.of(defaultValue));
+    }
+
+    private static ParameterDeclaration parameter(String name, DataType type)
+    {
+        return new ParameterDeclaration(Optional.of(new Identifier(name)), type);
+    }
+
+    private static AssignmentStatement assign(String name, Expression value)
+    {
+        return new AssignmentStatement(location(), new Identifier(name), value);
+    }
+
+    private static ArithmeticBinaryExpression plus(Expression left, Expression right)
+    {
+        return new ArithmeticBinaryExpression(ArithmeticBinaryExpression.Operator.ADD, left, right);
+    }
+
+    private static ArithmeticBinaryExpression minus(Expression left, Expression right)
+    {
+        return new ArithmeticBinaryExpression(ArithmeticBinaryExpression.Operator.SUBTRACT, left, right);
+    }
+
+    private static ComparisonExpression lt(String name, Expression expression)
+    {
+        return new ComparisonExpression(ComparisonExpression.Operator.LESS_THAN, identifier(name), expression);
+    }
+
+    private static ComparisonExpression lte(String name, Expression expression)
+    {
+        return new ComparisonExpression(ComparisonExpression.Operator.LESS_THAN_OR_EQUAL, identifier(name), expression);
+    }
+
+    private static ComparisonExpression gt(String name, Expression expression)
+    {
+        return new ComparisonExpression(ComparisonExpression.Operator.GREATER_THAN, identifier(name), expression);
+    }
+
+    private static ComparisonExpression gte(String name, Expression expression)
+    {
+        return new ComparisonExpression(ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL, identifier(name), expression);
+    }
+
+    private static StringLiteral literal(String literal)
+    {
+        return new StringLiteral(literal);
+    }
+
+    private static LongLiteral literal(long literal)
+    {
+        return new LongLiteral(String.valueOf(literal));
+    }
+
+    private static CompoundStatement beginEnd(List<VariableDeclaration> variableDeclarations, ControlStatement... statements)
+    {
+        return new CompoundStatement(location(), variableDeclarations, ImmutableList.copyOf(statements));
+    }
+
+    private static ElseIfClause elseIf(Expression expression, ControlStatement... statements)
+    {
+        return new ElseIfClause(expression, ImmutableList.copyOf(statements));
+    }
+
+    private static Query query(FunctionSpecification function, Select select)
+    {
+        return new Query(
+                ImmutableList.of(function),
+                Optional.empty(),
+                new QuerySpecification(
+                        select,
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        ImmutableList.of(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty()),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty());
+    }
+
+    private static NodeLocation location()
+    {
+        return new NodeLocation(1, 1);
+    }
+}
diff --git a/core/trino-parser/src/test/java/io/trino/sql/parser/TestStatementBuilder.java b/core/trino-parser/src/test/java/io/trino/sql/parser/TestStatementBuilder.java
index 965e5b6b73fa..34381faccec3 100644
--- a/core/trino-parser/src/test/java/io/trino/sql/parser/TestStatementBuilder.java
+++ b/core/trino-parser/src/test/java/io/trino/sql/parser/TestStatementBuilder.java
@@ -23,7 +23,6 @@
 import java.io.UncheckedIOException;
 
 import static com.google.common.base.Strings.repeat;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DOUBLE;
 import static io.trino.sql.testing.TreeAssertions.assertFormattedSql;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -329,17 +328,20 @@ public void testStatementBuilder()
                 "when matched and c.action = 'del' then delete\n" +
                 "when not matched and c.action = 'new' then\n" +
                 "insert (part, qty) values (c.part, c.qty)");
+
+        printStatement("set session authorization user");
+        printStatement("reset session authorization");
     }
 
     @Test
     public void testStringFormatter()
     {
         assertSqlFormatter("U&'hello\\6d4B\\8Bd5\\+10FFFFworld\\7F16\\7801'",
-                "U&'hello\\6D4B\\8BD5\\+10FFFFworld\\7F16\\7801'");
+                "'hello测试\uDBFF\uDFFFworld编码'");
         assertSqlFormatter("'hello world'", "'hello world'");
-        assertSqlFormatter("U&'!+10FFFF!6d4B!8Bd5ABC!6d4B!8Bd5' UESCAPE '!'", "U&'\\+10FFFF\\6D4B\\8BD5ABC\\6D4B\\8BD5'");
-        assertSqlFormatter("U&'\\+10FFFF\\6D4B\\8BD5\\0041\\0042\\0043\\6D4B\\8BD5'", "U&'\\+10FFFF\\6D4B\\8BD5ABC\\6D4B\\8BD5'");
-        assertSqlFormatter("U&'\\\\abc\\6D4B'''", "U&'\\\\abc\\6D4B'''");
+        assertSqlFormatter("U&'!+10FFFF!6d4B!8Bd5ABC!6d4B!8Bd5' UESCAPE '!'", "'\uDBFF\uDFFF测试ABC测试'");
+        assertSqlFormatter("U&'\\+10FFFF\\6D4B\\8BD5\\0041\\0042\\0043\\6D4B\\8BD5'", "'\uDBFF\uDFFF测试ABC测试'");
+        assertSqlFormatter("U&'\\\\abc\\6D4B'''", "'\\abc测'''");
     }
 
     @Test
@@ -381,8 +383,7 @@ private static void printStatement(String sql)
         println(sql.trim());
         println("");
 
-        ParsingOptions parsingOptions = new ParsingOptions(AS_DOUBLE /* anything */);
-        Statement statement = SQL_PARSER.createStatement(sql, parsingOptions);
+        Statement statement = SQL_PARSER.createStatement(sql);
         println(statement.toString());
         println("");
 
@@ -396,7 +397,7 @@ private static void printStatement(String sql)
 
     private static void assertSqlFormatter(String expression, String formatted)
     {
-        Expression originalExpression = SQL_PARSER.createExpression(expression, new ParsingOptions());
+        Expression originalExpression = SQL_PARSER.createExpression(expression);
         String real = SqlFormatter.formatSql(originalExpression);
         assertEquals(formatted, real);
     }
diff --git a/core/trino-parser/src/test/java/io/trino/sql/parser/TestStatementSplitter.java b/core/trino-parser/src/test/java/io/trino/sql/parser/TestStatementSplitter.java
deleted file mode 100644
index 9b0d471065a5..000000000000
--- a/core/trino-parser/src/test/java/io/trino/sql/parser/TestStatementSplitter.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Licensed 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 io.trino.sql.parser;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.sql.parser.StatementSplitter.Statement;
-import static io.trino.sql.parser.StatementSplitter.isEmptyStatement;
-import static io.trino.sql.parser.StatementSplitter.squeezeStatement;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class TestStatementSplitter
-{
-    @Test
-    public void testSplitterIncomplete()
-    {
-        StatementSplitter splitter = new StatementSplitter(" select * FROM foo  ");
-        assertEquals(ImmutableList.of(), splitter.getCompleteStatements());
-        assertEquals("select * FROM foo", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterEmptyInput()
-    {
-        StatementSplitter splitter = new StatementSplitter("");
-        assertEquals(ImmutableList.of(), splitter.getCompleteStatements());
-        assertEquals("", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterEmptyStatements()
-    {
-        StatementSplitter splitter = new StatementSplitter(";;;");
-        assertEquals(ImmutableList.of(), splitter.getCompleteStatements());
-        assertEquals("", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterSingle()
-    {
-        StatementSplitter splitter = new StatementSplitter("select * from foo;");
-        assertEquals(statements("select * from foo", ";"), splitter.getCompleteStatements());
-        assertEquals("", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterMultiple()
-    {
-        StatementSplitter splitter = new StatementSplitter(" select * from  foo ; select * from t; select * from ");
-        assertEquals(statements("select * from  foo", ";", "select * from t", ";"), splitter.getCompleteStatements());
-        assertEquals("select * from", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterMultipleWithEmpty()
-    {
-        StatementSplitter splitter = new StatementSplitter("; select * from  foo ; select * from t;;;select * from ");
-        assertEquals(statements("select * from  foo", ";", "select * from t", ";"), splitter.getCompleteStatements());
-        assertEquals("select * from", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterCustomDelimiters()
-    {
-        String sql = "// select * from  foo // select * from t;//select * from ";
-        StatementSplitter splitter = new StatementSplitter(sql, ImmutableSet.of(";", "//"));
-        assertEquals(statements("select * from  foo", "//", "select * from t", ";"), splitter.getCompleteStatements());
-        assertEquals("select * from", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterErrorBeforeComplete()
-    {
-        StatementSplitter splitter = new StatementSplitter(" select * from z# oops ; select ");
-        assertEquals(statements("select * from z# oops", ";"), splitter.getCompleteStatements());
-        assertEquals("select", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterErrorAfterComplete()
-    {
-        StatementSplitter splitter = new StatementSplitter("select * from foo; select z# oops ");
-        assertEquals(statements("select * from foo", ";"), splitter.getCompleteStatements());
-        assertEquals("select z# oops", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterWithQuotedString()
-    {
-        String sql = "select 'foo bar' x from dual";
-        StatementSplitter splitter = new StatementSplitter(sql);
-        assertEquals(ImmutableList.of(), splitter.getCompleteStatements());
-        assertEquals(sql, splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterWithIncompleteQuotedString()
-    {
-        String sql = "select 'foo', 'bar";
-        StatementSplitter splitter = new StatementSplitter(sql);
-        assertEquals(ImmutableList.of(), splitter.getCompleteStatements());
-        assertEquals(sql, splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterWithEscapedSingleQuote()
-    {
-        String sql = "select 'hello''world' from dual";
-        StatementSplitter splitter = new StatementSplitter(sql + ";");
-        assertEquals(statements(sql, ";"), splitter.getCompleteStatements());
-        assertEquals("", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterWithQuotedIdentifier()
-    {
-        String sql = "select \"0\"\"bar\" from dual";
-        StatementSplitter splitter = new StatementSplitter(sql + ";");
-        assertEquals(statements(sql, ";"), splitter.getCompleteStatements());
-        assertEquals("", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterWithBackquote()
-    {
-        String sql = "select  ` f``o o ` from dual";
-        StatementSplitter splitter = new StatementSplitter(sql);
-        assertEquals(ImmutableList.of(), splitter.getCompleteStatements());
-        assertEquals(sql, splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterWithDigitIdentifier()
-    {
-        String sql = "select   1x  from dual";
-        StatementSplitter splitter = new StatementSplitter(sql);
-        assertEquals(ImmutableList.of(), splitter.getCompleteStatements());
-        assertEquals(sql, splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterWithSingleLineComment()
-    {
-        StatementSplitter splitter = new StatementSplitter("--empty\n;-- start\nselect * -- junk\n-- hi\nfrom foo; -- done");
-        assertEquals(statements("--empty", ";", "-- start\nselect * -- junk\n-- hi\nfrom foo", ";"), splitter.getCompleteStatements());
-        assertEquals("-- done", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterWithMultiLineComment()
-    {
-        StatementSplitter splitter = new StatementSplitter("/* empty */;/* start */ select * /* middle */ from foo; /* end */");
-        assertEquals(statements("/* empty */", ";", "/* start */ select * /* middle */ from foo", ";"), splitter.getCompleteStatements());
-        assertEquals("/* end */", splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterWithSingleLineCommentPartial()
-    {
-        String sql = "-- start\nselect * -- junk\n-- hi\nfrom foo -- done";
-        StatementSplitter splitter = new StatementSplitter(sql);
-        assertEquals(ImmutableList.of(), splitter.getCompleteStatements());
-        assertEquals(sql, splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testSplitterWithMultiLineCommentPartial()
-    {
-        String sql = "/* start */ select * /* middle */ from foo /* end */";
-        StatementSplitter splitter = new StatementSplitter(sql);
-        assertEquals(ImmutableList.of(), splitter.getCompleteStatements());
-        assertEquals(sql, splitter.getPartialStatement());
-    }
-
-    @Test
-    public void testIsEmptyStatement()
-    {
-        assertTrue(isEmptyStatement(""));
-        assertTrue(isEmptyStatement(" "));
-        assertTrue(isEmptyStatement("\t\n "));
-        assertTrue(isEmptyStatement("--foo\n  --what"));
-        assertTrue(isEmptyStatement("/* oops */"));
-        assertFalse(isEmptyStatement("x"));
-        assertFalse(isEmptyStatement("select"));
-        assertFalse(isEmptyStatement("123"));
-        assertFalse(isEmptyStatement("z#oops"));
-    }
-
-    @Test
-    public void testSqueezeStatement()
-    {
-        String sql = "select   *  from\n foo\n  order by x ; ";
-        assertEquals("select * from foo order by x ;", squeezeStatement(sql));
-    }
-
-    @Test
-    public void testSqueezeStatementWithIncompleteQuotedString()
-    {
-        String sql = "select   *  from\n foo\n  where x = 'oops";
-        assertEquals("select * from foo where x = 'oops", squeezeStatement(sql));
-    }
-
-    @Test
-    public void testSqueezeStatementWithBackquote()
-    {
-        String sql = "select  `  f``o  o`` `   from dual";
-        assertEquals("select `  f``o  o`` ` from dual", squeezeStatement(sql));
-    }
-
-    @Test
-    public void testSqueezeStatementAlternateDelimiter()
-    {
-        String sql = "select   *  from\n foo\n  order by x // ";
-        assertEquals("select * from foo order by x //", squeezeStatement(sql));
-    }
-
-    @Test
-    public void testSqueezeStatementError()
-    {
-        String sql = "select   *  from z#oops";
-        assertEquals("select * from z#oops", squeezeStatement(sql));
-    }
-
-    private static List<Statement> statements(String... args)
-    {
-        checkArgument(args.length % 2 == 0, "arguments not paired");
-        ImmutableList.Builder<Statement> list = ImmutableList.builder();
-        for (int i = 0; i < args.length; i += 2) {
-            list.add(new Statement(args[i], args[i + 1]));
-        }
-        return list.build();
-    }
-}
diff --git a/core/trino-parser/src/test/java/io/trino/sql/parser/TreeNodes.java b/core/trino-parser/src/test/java/io/trino/sql/parser/TreeNodes.java
index 9fd9285687fb..b57ccb0858e5 100644
--- a/core/trino-parser/src/test/java/io/trino/sql/parser/TreeNodes.java
+++ b/core/trino-parser/src/test/java/io/trino/sql/parser/TreeNodes.java
@@ -117,22 +117,22 @@ public static NumericParameter parameter(NodeLocation location, String value)
 
     public static ColumnDefinition columnDefinition(NodeLocation location, String name, DataType type)
     {
-        return new ColumnDefinition(location, identifier(location, name), type, true, emptyList(), Optional.empty());
+        return new ColumnDefinition(location, qualifiedName(location, name), type, true, emptyList(), Optional.empty());
     }
 
     public static ColumnDefinition columnDefinition(NodeLocation location, String name, DataType type, boolean nullable)
     {
-        return new ColumnDefinition(location, identifier(location, name), type, nullable, emptyList(), Optional.empty());
+        return new ColumnDefinition(location, qualifiedName(location, name), type, nullable, emptyList(), Optional.empty());
     }
 
     public static ColumnDefinition columnDefinition(NodeLocation location, String name, DataType type, boolean nullable, String comment)
     {
-        return new ColumnDefinition(location, identifier(location, name), type, nullable, emptyList(), Optional.of(comment));
+        return new ColumnDefinition(location, qualifiedName(location, name), type, nullable, emptyList(), Optional.of(comment));
     }
 
     public static ColumnDefinition columnDefinition(NodeLocation location, String name, DataType type, boolean nullable, List<Property> properties)
     {
-        return new ColumnDefinition(location, identifier(location, name), type, nullable, properties, Optional.empty());
+        return new ColumnDefinition(location, qualifiedName(location, name), type, nullable, properties, Optional.empty());
     }
 
     public static Property property(NodeLocation location, String name, Expression value)
diff --git a/core/trino-server-main/pom.xml b/core/trino-server-main/pom.xml
index 0a092506fd0b..522e3c52d8bf 100644
--- a/core/trino-server-main/pom.xml
+++ b/core/trino-server-main/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-server-main</artifactId>
-    <name>trino-server-main</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -20,19 +19,31 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/core/trino-server-main/src/test/java/io/trino/server/TestDummy.java b/core/trino-server-main/src/test/java/io/trino/server/TestDummy.java
index dea00f6fd596..b560df431cb6 100644
--- a/core/trino-server-main/src/test/java/io/trino/server/TestDummy.java
+++ b/core/trino-server-main/src/test/java/io/trino/server/TestDummy.java
@@ -13,7 +13,7 @@
  */
 package io.trino.server;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestDummy
 {
diff --git a/core/trino-server-rpm/pom.xml b/core/trino-server-rpm/pom.xml
index c448a04fd37d..a82e2b6d438f 100644
--- a/core/trino-server-rpm/pom.xml
+++ b/core/trino-server-rpm/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-server-rpm</artifactId>
-    <name>trino-server-rpm</name>
     <packaging>rpm</packaging>
 
     <properties>
@@ -20,34 +19,33 @@
     </properties>
 
     <dependencies>
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-jdbc</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-testing</artifactId>
+            <artifactId>trino-jdbc</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -71,9 +69,14 @@
                     <groupId>com.mycila</groupId>
                     <artifactId>license-maven-plugin</artifactId>
                     <configuration>
-                        <excludes combine.children="append">
-                            <exclude>src/main/rpm/**</exclude>
-                        </excludes>
+                        <licenseSets>
+                            <licenseSet>
+                                <header>${air.license.header-file}</header>
+                                <excludes combine.children="append">
+                                    <exclude>src/main/rpm/**</exclude>
+                                </excludes>
+                            </licenseSet>
+                        </licenseSets>
                         <mapping>
                             <groovy>SLASHSTAR_STYLE</groovy>
                         </mapping>
@@ -102,10 +105,10 @@
                 <executions>
                     <execution>
                         <id>unpack</id>
-                        <phase>prepare-package</phase>
                         <goals>
                             <goal>provision</goal>
                         </goals>
+                        <phase>prepare-package</phase>
                         <configuration>
                             <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                         </configuration>
@@ -118,10 +121,10 @@
                 <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>prepare-package</phase>
                         <goals>
                             <goal>execute</goal>
                         </goals>
+                        <phase>prepare-package</phase>
                         <configuration>
                             <source>${project.basedir}/src/main/script/symlink.groovy</source>
                             <properties>
@@ -136,7 +139,7 @@
             <plugin>
                 <groupId>io.airlift.maven.plugins</groupId>
                 <artifactId>redlinerpm-maven-plugin</artifactId>
-                <version>2.1.7</version>
+                <version>2.1.8</version>
                 <extensions>true</extensions>
 
                 <configuration>
@@ -276,15 +279,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
                     <!-- All Trino modules are imported into this module as "provided" dependencies what makes dependencies from all the modules to be cross checked for compatibility -->
                     <!-- Override rules to disable dependency checks as dependencies of different connectors don't have to be compatible -->
@@ -299,6 +293,15 @@
                     </rules>
                     <fail>true</fail>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <phase>verify</phase>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
@@ -311,7 +314,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>2.22.2</version>
                         <configuration>
                             <systemPropertyVariables>
                                 <rpm>${project.build.directory}/${project.build.finalName}.noarch.rpm</rpm>
diff --git a/core/trino-server-rpm/src/main/resources/dist/config/jvm.config b/core/trino-server-rpm/src/main/resources/dist/config/jvm.config
index bd4958ddf7c8..5725218bd7a9 100644
--- a/core/trino-server-rpm/src/main/resources/dist/config/jvm.config
+++ b/core/trino-server-rpm/src/main/resources/dist/config/jvm.config
@@ -16,3 +16,5 @@
 -XX:+UseAESCTRIntrinsics
 # Disable Preventive GC for performance reasons (JDK-8293861)
 -XX:-G1UsePreventiveGC
+# Reduce starvation of threads by GClocker, recommend to set about the number of cpu cores (JDK-8192647)
+-XX:GCLockerRetryAllocationCount=32
diff --git a/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java b/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java
index 2e0551e495f2..4a4107c927b7 100644
--- a/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java
+++ b/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java
@@ -18,7 +18,7 @@
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.Container.ExecResult;
 import org.testcontainers.containers.GenericContainer;
-import org.testng.annotations.Parameters;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.io.File;
@@ -42,30 +42,63 @@
 @Test(singleThreaded = true)
 public class ServerIT
 {
-    private static final String BASE_IMAGE = "ghcr.io/trinodb/testing/centos7-oj17";
+    private static final String BASE_IMAGE_PREFIX = "eclipse-temurin:";
+    private static final String BASE_IMAGE_SUFFIX = "-jre-centos7";
 
-    @Parameters("rpm")
-    @Test
-    public void testWithJava17(String rpm)
+    @Test(dataProvider = "rpmJavaTestDataProvider")
+    public void testInstall(String rpmHostPath, String javaVersion)
     {
-        testServer(rpm, "17");
+        String rpm = "/" + new File(rpmHostPath).getName();
+        String command = "" +
+                // install RPM
+                "yum localinstall -q -y " + rpm + "\n" +
+                // create Hive catalog file
+                "mkdir /etc/trino/catalog\n" +
+                "echo CONFIG_ENV[HMS_PORT]=9083 >> /etc/trino/env.sh\n" +
+                "echo CONFIG_ENV[NODE_ID]=test-node-id-injected-via-env >> /etc/trino/env.sh\n" +
+                "sed -i \"s/^node.id=.*/node.id=\\${ENV:NODE_ID}/g\" /etc/trino/node.properties\n" +
+                "cat > /etc/trino/catalog/hive.properties <<\"EOT\"\n" +
+                "connector.name=hive\n" +
+                "hive.metastore.uri=thrift://localhost:${ENV:HMS_PORT}\n" +
+                "EOT\n" +
+                // create JMX catalog file
+                "cat > /etc/trino/catalog/jmx.properties <<\"EOT\"\n" +
+                "connector.name=jmx\n" +
+                "EOT\n" +
+                // start server
+                "/etc/init.d/trino start\n" +
+                // allow tail to work with Docker's non-local file system
+                "tail ---disable-inotify -F /var/log/trino/server.log\n";
+
+        try (GenericContainer<?> container = new GenericContainer<>(BASE_IMAGE_PREFIX + javaVersion + BASE_IMAGE_SUFFIX)) {
+            container.withExposedPorts(8080)
+                    // the RPM is hundreds MB and file system bind is much more efficient
+                    .withFileSystemBind(rpmHostPath, rpm, BindMode.READ_ONLY)
+                    .withCommand("sh", "-xeuc", command)
+                    .waitingFor(forLogMessage(".*SERVER STARTED.*", 1).withStartupTimeout(Duration.ofMinutes(5)))
+                    .start();
+            QueryRunner queryRunner = new QueryRunner(container.getHost(), container.getMappedPort(8080));
+            assertEquals(queryRunner.execute("SHOW CATALOGS"), ImmutableSet.of(asList("system"), asList("hive"), asList("jmx")));
+            assertEquals(queryRunner.execute("SELECT node_id FROM system.runtime.nodes"), ImmutableSet.of(asList("test-node-id-injected-via-env")));
+            // TODO remove usage of assertEventually once https://github.com/trinodb/trino/issues/2214 is fixed
+            assertEventually(
+                    new io.airlift.units.Duration(1, MINUTES),
+                    () -> assertEquals(queryRunner.execute("SELECT specversion FROM jmx.current.\"java.lang:type=runtime\""), ImmutableSet.of(asList(javaVersion))));
+        }
     }
 
-    @Parameters("rpm")
-    @Test
-    public void testUninstall(String rpmHostPath)
+    @Test(dataProvider = "rpmJavaTestDataProvider")
+    public void testUninstall(String rpmHostPath, String javaVersion)
             throws Exception
     {
         String rpm = "/" + new File(rpmHostPath).getName();
         String installAndStartTrino = "" +
+                // install RPM
                 "yum localinstall -q -y " + rpm + "\n" +
-                // update default JDK to 17
-                "alternatives --set java /usr/lib/jvm/zulu-17/bin/java\n" +
-                "alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac\n" +
                 "/etc/init.d/trino start\n" +
                 // allow tail to work with Docker's non-local file system
                 "tail ---disable-inotify -F /var/log/trino/server.log\n";
-        try (GenericContainer<?> container = new GenericContainer<>(BASE_IMAGE)) {
+        try (GenericContainer<?> container = new GenericContainer<>(BASE_IMAGE_PREFIX + javaVersion + BASE_IMAGE_SUFFIX)) {
             container.withFileSystemBind(rpmHostPath, rpm, BindMode.READ_ONLY)
                     .withCommand("sh", "-xeuc", installAndStartTrino)
                     .waitingFor(forLogMessage(".*SERVER STARTED.*", 1).withStartupTimeout(Duration.ofMinutes(5)))
@@ -85,6 +118,15 @@ public void testUninstall(String rpmHostPath)
         }
     }
 
+    @DataProvider
+    public static Object[][] rpmJavaTestDataProvider()
+    {
+        String rpmHostPath = requireNonNull(System.getProperty("rpm"), "rpm is null");
+        return new Object[][]{
+                {rpmHostPath, "17"},
+                {rpmHostPath, "19"}};
+    }
+
     private static void assertPathDeleted(GenericContainer<?> container, String path)
             throws Exception
     {
@@ -96,51 +138,6 @@ private static void assertPathDeleted(GenericContainer<?> container, String path
         assertEquals(actualResult.getExitCode(), 0);
     }
 
-    private static void testServer(String rpmHostPath, String expectedJavaVersion)
-    {
-        String rpm = "/" + new File(rpmHostPath).getName();
-
-        String command = "" +
-                // install RPM
-                "yum localinstall -q -y " + rpm + "\n" +
-                // update default JDK to 17
-                "alternatives --set java /usr/lib/jvm/zulu-17/bin/java\n" +
-                "alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac\n" +
-                // create Hive catalog file
-                "mkdir /etc/trino/catalog\n" +
-                "echo CONFIG_ENV[HMS_PORT]=9083 >> /etc/trino/env.sh\n" +
-                "echo CONFIG_ENV[NODE_ID]=test-node-id-injected-via-env >> /etc/trino/env.sh\n" +
-                "sed -i \"s/^node.id=.*/node.id=\\${ENV:NODE_ID}/g\" /etc/trino/node.properties\n" +
-                "cat > /etc/trino/catalog/hive.properties <<\"EOT\"\n" +
-                "connector.name=hive\n" +
-                "hive.metastore.uri=thrift://localhost:${ENV:HMS_PORT}\n" +
-                "EOT\n" +
-                // create JMX catalog file
-                "cat > /etc/trino/catalog/jmx.properties <<\"EOT\"\n" +
-                "connector.name=jmx\n" +
-                "EOT\n" +
-                // start server
-                "/etc/init.d/trino start\n" +
-                // allow tail to work with Docker's non-local file system
-                "tail ---disable-inotify -F /var/log/trino/server.log\n";
-
-        try (GenericContainer<?> container = new GenericContainer<>(BASE_IMAGE)) {
-            container.withExposedPorts(8080)
-                    // the RPM is hundreds MB and file system bind is much more efficient
-                    .withFileSystemBind(rpmHostPath, rpm, BindMode.READ_ONLY)
-                    .withCommand("sh", "-xeuc", command)
-                    .waitingFor(forLogMessage(".*SERVER STARTED.*", 1).withStartupTimeout(Duration.ofMinutes(5)))
-                    .start();
-            QueryRunner queryRunner = new QueryRunner(container.getHost(), container.getMappedPort(8080));
-            assertEquals(queryRunner.execute("SHOW CATALOGS"), ImmutableSet.of(asList("system"), asList("hive"), asList("jmx")));
-            assertEquals(queryRunner.execute("SELECT node_id FROM system.runtime.nodes"), ImmutableSet.of(asList("test-node-id-injected-via-env")));
-            // TODO remove usage of assertEventually once https://github.com/trinodb/trino/issues/2214 is fixed
-            assertEventually(
-                    new io.airlift.units.Duration(1, MINUTES),
-                    () -> assertEquals(queryRunner.execute("SELECT specversion FROM jmx.current.\"java.lang:type=runtime\""), ImmutableSet.of(asList(expectedJavaVersion))));
-        }
-    }
-
     private static class QueryRunner
     {
         private final String host;
diff --git a/core/trino-server/pom.xml b/core/trino-server/pom.xml
index 28c51cfbd653..f24d140328d6 100644
--- a/core/trino-server/pom.xml
+++ b/core/trino-server/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-server</artifactId>
-    <name>trino-server</name>
     <packaging>provisio</packaging>
 
     <properties>
@@ -44,13 +43,21 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>verify</phase>
                         <goals>
                             <goal>enforce</goal>
                         </goals>
+                        <phase>verify</phase>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>io.takari.maven.plugins</groupId>
+                <artifactId>takari-lifecycle-plugin</artifactId>
+                <version>${dep.takari.version}</version>
+                <configuration>
+                    <proc>none</proc>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/core/trino-server/src/main/provisio/trino.xml b/core/trino-server/src/main/provisio/trino.xml
index 8e014d0b9a57..a68fabacd1cf 100644
--- a/core/trino-server/src/main/provisio/trino.xml
+++ b/core/trino-server/src/main/provisio/trino.xml
@@ -188,6 +188,12 @@
         </artifact>
     </artifactSet>
 
+    <artifactSet to="plugin/snowflake">
+        <artifact id="${project.groupId}:trino-snowflake:zip:${project.version}">
+            <unpack />
+        </artifact>
+    </artifactSet>
+
     <artifactSet to="plugin/sqlserver">
         <artifact id="${project.groupId}:trino-sqlserver:zip:${project.version}">
             <unpack />
diff --git a/core/trino-spi/pom.xml b/core/trino-spi/pom.xml
index 19fc3ba90d37..219a412f7305 100644
--- a/core/trino-spi/pom.xml
+++ b/core/trino-spi/pom.xml
@@ -5,77 +5,104 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-spi</artifactId>
-    <name>trino-spi</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
         <released-artifacts.dir>${project.build.directory}/released-artifacts</released-artifacts.dir>
+        <trino.check.skip-revapi>${air.check.skip-basic}</trino.check.skip-revapi>
     </properties>
 
     <!-- the SPI should have only minimal dependencies -->
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>slice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <optional>true</optional>
         </dependency>
 
-        <!-- used by slice and must be listed for plugin dependency enforcer -->
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.openjdk.jol</groupId>
             <artifactId>jol-core</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <artifactId>json</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -97,12 +124,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
@@ -114,27 +135,21 @@
             <artifactId>jmh-generator-annprocess</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
         <resources>
             <resource>
-                <directory>src/main/resources</directory>
                 <filtering>true</filtering>
+                <directory>src/main/resources</directory>
                 <includes>
                     <include>io/trino/spi/trino-spi-version.txt</include>
                 </includes>
             </resource>
 
             <resource>
-                <directory>src/main/resources</directory>
                 <filtering>false</filtering>
+                <directory>src/main/resources</directory>
                 <excludes>
                     <exclude>io/trino/spi/trino-spi-version.txt</exclude>
                 </excludes>
@@ -146,38 +161,19 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <dependencies>
-                    <!-- allow both JUnit and TestNG -->
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit-platform</artifactId>
-                        <version>${dep.plugin.surefire.version}</version>
-                    </dependency>
                     <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-testng</artifactId>
-                        <version>${dep.plugin.surefire.version}</version>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.revapi</groupId>
                 <artifactId>revapi-maven-plugin</artifactId>
-                <version>0.14.7</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.revapi</groupId>
-                        <artifactId>revapi-java</artifactId>
-                        <version>0.27.0</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <version>0.15.0</version>
                 <configuration>
+                    <skip>${trino.check.skip-revapi}</skip>
                     <ignoreSuggestionsFormat>xml</ignoreSuggestionsFormat>
                     <analysisConfiguration>
                         <revapi.filter>
@@ -219,45 +215,870 @@
                                         <match>@java.lang.Deprecated(*) ^*;</match>
                                     </old>
                                 </item>
-                                <!-- Revapi tries to compare any API with its previous version -->
-                                <!-- If it can't download the old version, if falls back to comparing with an empty file -->
-                                <!-- This can lead to errors which are not shown in daily development where local Maven cache has the old version -->
+                                <!-- Backwards incompatible changes since the previous release -->
+                                <!-- Any exclusions below can be deleted after each release -->
                                 <item>
-                                    <ignore>true</ignore>
-                                    <code>java.class.externalClassExposedInAPI</code>
-                                    <new>class io.airlift.slice.BasicSliceInput</new>
-                                    <justification>Trino SPI depends on Airlift</justification>
+                                    <code>java.class.nonPublicPartOfAPI</code>
+                                    <old>class io.trino.spi.block.SqlMap.HashTableSupplier</old>
+                                    <new>class io.trino.spi.block.SqlMap.HashTableSupplier</new>
                                 </item>
                                 <item>
-                                    <ignore>true</ignore>
-                                    <code>java.class.externalClassExposedInAPI</code>
-                                    <new>class io.airlift.slice.Slice</new>
-                                    <justification>Trino SPI depends on Airlift</justification>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method void io.trino.spi.block.SqlMap::&lt;init&gt;(io.trino.spi.type.MapType, io.trino.spi.block.Block, io.trino.spi.block.Block, io.trino.spi.block.SqlMap.HashTableSupplier, int, int)</old>
+                                    <new>method void io.trino.spi.block.SqlMap::&lt;init&gt;(io.trino.spi.type.MapType, io.trino.spi.block.Block, io.trino.spi.block.Block, io.trino.spi.block.SqlMap.HashTableSupplier, int, int)</new>
+                                    <oldVisibility>public</oldVisibility>
                                 </item>
                                 <item>
-                                    <ignore>true</ignore>
-                                    <code>java.class.externalClassExposedInAPI</code>
-                                    <new>class io.airlift.slice.SliceInput</new>
-                                    <justification>Trino SPI depends on Airlift</justification>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method &lt;E extends java.lang.Throwable&gt; io.trino.spi.block.Block io.trino.spi.block.BufferedMapValueBuilder::build(int, io.trino.spi.block.MapValueBuilder&lt;E&gt;) throws E</old>
+                                    <new>method &lt;E extends java.lang.Throwable&gt; io.trino.spi.block.SqlMap io.trino.spi.block.BufferedMapValueBuilder::build(int, io.trino.spi.block.MapValueBuilder&lt;E&gt;) throws E</new>
                                 </item>
                                 <item>
-                                    <ignore>true</ignore>
-                                    <code>java.class.externalClassExposedInAPI</code>
-                                    <new>class io.airlift.slice.SliceOutput</new>
-                                    <justification>Trino SPI depends on Airlift</justification>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method &lt;E extends java.lang.Throwable&gt; io.trino.spi.block.Block io.trino.spi.block.MapValueBuilder&lt;E extends java.lang.Throwable&gt;::buildMapValue(io.trino.spi.type.MapType, int, io.trino.spi.block.MapValueBuilder&lt;E&gt;) throws E</old>
+                                    <new>method &lt;E extends java.lang.Throwable&gt; io.trino.spi.block.SqlMap io.trino.spi.block.MapValueBuilder&lt;E extends java.lang.Throwable&gt;::buildMapValue(io.trino.spi.type.MapType, int, io.trino.spi.block.MapValueBuilder&lt;E&gt;) throws E</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.type.MapType::getObject(io.trino.spi.block.Block, int)</old>
+                                    <new>method io.trino.spi.block.SqlMap io.trino.spi.type.MapType::getObject(io.trino.spi.block.Block, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChanged</code>
+                                    <old>method &lt;E extends java.lang.Throwable&gt; io.trino.spi.block.Block io.trino.spi.block.BufferedMapValueBuilder::build(int, io.trino.spi.block.MapValueBuilder&lt;E&gt;) throws E</old>
+                                    <new>method &lt;E extends java.lang.Throwable&gt; io.trino.spi.block.SqlMap io.trino.spi.block.BufferedMapValueBuilder::build(int, io.trino.spi.block.MapValueBuilder&lt;E&gt;) throws E</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChanged</code>
+                                    <old>method &lt;E extends java.lang.Throwable&gt; io.trino.spi.block.Block io.trino.spi.block.MapValueBuilder&lt;E extends java.lang.Throwable&gt;::buildMapValue(io.trino.spi.type.MapType, int, io.trino.spi.block.MapValueBuilder&lt;E&gt;) throws E</old>
+                                    <new>method &lt;E extends java.lang.Throwable&gt; io.trino.spi.block.SqlMap io.trino.spi.block.MapValueBuilder&lt;E extends java.lang.Throwable&gt;::buildMapValue(io.trino.spi.type.MapType, int, io.trino.spi.block.MapValueBuilder&lt;E&gt;) throws E</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChanged</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.type.MapType::getObject(io.trino.spi.block.Block, int)</old>
+                                    <new>method io.trino.spi.block.SqlMap io.trino.spi.type.MapType::getObject(io.trino.spi.block.Block, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.class.removed</code>
+                                    <old>class io.trino.spi.block.SingleRowBlock</old>
+                                </item>
+                                <item>
+                                    <code>java.class.removed</code>
+                                    <old>class io.trino.spi.block.SingleRowBlockEncoding</old>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChanged</code>
+                                    <old>method &lt;E extends java.lang.Throwable&gt; io.trino.spi.block.Block io.trino.spi.block.BufferedRowValueBuilder::build(io.trino.spi.block.RowValueBuilder&lt;E&gt;) throws E</old>
+                                    <new>method &lt;E extends java.lang.Throwable&gt; io.trino.spi.block.SqlRow io.trino.spi.block.BufferedRowValueBuilder::build(io.trino.spi.block.RowValueBuilder&lt;E&gt;) throws E</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChanged</code>
+                                    <old>method &lt;E extends java.lang.Throwable&gt; io.trino.spi.block.Block io.trino.spi.block.RowValueBuilder&lt;E extends java.lang.Throwable&gt;::buildRowValue(io.trino.spi.type.RowType, io.trino.spi.block.RowValueBuilder&lt;E&gt;) throws E</old>
+                                    <new>method &lt;E extends java.lang.Throwable&gt; io.trino.spi.block.SqlRow io.trino.spi.block.RowValueBuilder&lt;E extends java.lang.Throwable&gt;::buildRowValue(io.trino.spi.type.RowType, io.trino.spi.block.RowValueBuilder&lt;E&gt;) throws E</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChanged</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.type.RowType::getObject(io.trino.spi.block.Block, int)</old>
+                                    <new>method io.trino.spi.block.SqlRow io.trino.spi.type.RowType::getObject(io.trino.spi.block.Block, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.class.removed</code>
+                                    <old>class io.trino.spi.block.AbstractVariableWidthBlock</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method io.airlift.slice.Slice io.trino.spi.block.VariableWidthBlock::getRawSlice(int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method boolean io.trino.spi.block.VariableWidthBlock::isEntryNull(int)</old>
+                                </item>
+                                <item>
+                                    <code>java.class.noLongerInheritsFromClass</code>
+                                    <old>class io.trino.spi.block.VariableWidthBlock</old>
+                                    <new>class io.trino.spi.block.VariableWidthBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractArrayBlock::copyPositions(int[], int, int) @ io.trino.spi.block.ArrayBlock</old>
+                                    <new>method io.trino.spi.block.ArrayBlock io.trino.spi.block.ArrayBlock::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractArrayBlock::copyRegion(int, int) @ io.trino.spi.block.ArrayBlock</old>
+                                    <new>method io.trino.spi.block.ArrayBlock io.trino.spi.block.ArrayBlock::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ArrayBlock::copyWithAppendedNull()</old>
+                                    <new>method io.trino.spi.block.ArrayBlock io.trino.spi.block.ArrayBlock::copyWithAppendedNull()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ArrayBlock::getLoadedBlock()</old>
+                                    <new>method io.trino.spi.block.ArrayBlock io.trino.spi.block.ArrayBlock::getLoadedBlock()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractArrayBlock::getRegion(int, int) @ io.trino.spi.block.ArrayBlock</old>
+                                    <new>method io.trino.spi.block.ArrayBlock io.trino.spi.block.ArrayBlock::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractArrayBlock::getSingleValueBlock(int) @ io.trino.spi.block.ArrayBlock</old>
+                                    <new>method io.trino.spi.block.ArrayBlock io.trino.spi.block.ArrayBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ByteArrayBlock::copyPositions(int[], int, int)</old>
+                                    <new>method io.trino.spi.block.ByteArrayBlock io.trino.spi.block.ByteArrayBlock::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ByteArrayBlock::copyRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.ByteArrayBlock io.trino.spi.block.ByteArrayBlock::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ByteArrayBlock::copyWithAppendedNull()</old>
+                                    <new>method io.trino.spi.block.ByteArrayBlock io.trino.spi.block.ByteArrayBlock::copyWithAppendedNull()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ByteArrayBlock::getRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.ByteArrayBlock io.trino.spi.block.ByteArrayBlock::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ByteArrayBlock::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.ByteArrayBlock io.trino.spi.block.ByteArrayBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Fixed12Block::copyPositions(int[], int, int)</old>
+                                    <new>method io.trino.spi.block.Fixed12Block io.trino.spi.block.Fixed12Block::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Fixed12Block::copyRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.Fixed12Block io.trino.spi.block.Fixed12Block::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Fixed12Block::copyWithAppendedNull()</old>
+                                    <new>method io.trino.spi.block.Fixed12Block io.trino.spi.block.Fixed12Block::copyWithAppendedNull()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Fixed12Block::getRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.Fixed12Block io.trino.spi.block.Fixed12Block::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Fixed12Block::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.Fixed12Block io.trino.spi.block.Fixed12Block::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Int128ArrayBlock::copyPositions(int[], int, int)</old>
+                                    <new>method io.trino.spi.block.Int128ArrayBlock io.trino.spi.block.Int128ArrayBlock::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Int128ArrayBlock::copyRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.Int128ArrayBlock io.trino.spi.block.Int128ArrayBlock::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Int128ArrayBlock::copyWithAppendedNull()</old>
+                                    <new>method io.trino.spi.block.Int128ArrayBlock io.trino.spi.block.Int128ArrayBlock::copyWithAppendedNull()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Int128ArrayBlock::getRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.Int128ArrayBlock io.trino.spi.block.Int128ArrayBlock::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Int128ArrayBlock::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.Int128ArrayBlock io.trino.spi.block.Int128ArrayBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.IntArrayBlock::copyPositions(int[], int, int)</old>
+                                    <new>method io.trino.spi.block.IntArrayBlock io.trino.spi.block.IntArrayBlock::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.IntArrayBlock::copyRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.IntArrayBlock io.trino.spi.block.IntArrayBlock::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.IntArrayBlock::copyWithAppendedNull()</old>
+                                    <new>method io.trino.spi.block.IntArrayBlock io.trino.spi.block.IntArrayBlock::copyWithAppendedNull()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.IntArrayBlock::getRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.IntArrayBlock io.trino.spi.block.IntArrayBlock::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.IntArrayBlock::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.IntArrayBlock io.trino.spi.block.IntArrayBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.LongArrayBlock::copyPositions(int[], int, int)</old>
+                                    <new>method io.trino.spi.block.LongArrayBlock io.trino.spi.block.LongArrayBlock::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.LongArrayBlock::copyRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.LongArrayBlock io.trino.spi.block.LongArrayBlock::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.LongArrayBlock::copyWithAppendedNull()</old>
+                                    <new>method io.trino.spi.block.LongArrayBlock io.trino.spi.block.LongArrayBlock::copyWithAppendedNull()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.LongArrayBlock::getRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.LongArrayBlock io.trino.spi.block.LongArrayBlock::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.LongArrayBlock::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.LongArrayBlock io.trino.spi.block.LongArrayBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractMapBlock::copyPositions(int[], int, int) @ io.trino.spi.block.MapBlock</old>
+                                    <new>method io.trino.spi.block.MapBlock io.trino.spi.block.MapBlock::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractMapBlock::copyRegion(int, int) @ io.trino.spi.block.MapBlock</old>
+                                    <new>method io.trino.spi.block.MapBlock io.trino.spi.block.MapBlock::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::copyWithAppendedNull()</old>
+                                    <new>method io.trino.spi.block.MapBlock io.trino.spi.block.MapBlock::copyWithAppendedNull()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractMapBlock::getRegion(int, int) @ io.trino.spi.block.MapBlock</old>
+                                    <new>method io.trino.spi.block.MapBlock io.trino.spi.block.MapBlock::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractMapBlock::getSingleValueBlock(int) @ io.trino.spi.block.MapBlock</old>
+                                    <new>method io.trino.spi.block.MapBlock io.trino.spi.block.MapBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractRowBlock::copyPositions(int[], int, int) @ io.trino.spi.block.RowBlock</old>
+                                    <new>method io.trino.spi.block.RowBlock io.trino.spi.block.RowBlock::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractRowBlock::copyRegion(int, int) @ io.trino.spi.block.RowBlock</old>
+                                    <new>method io.trino.spi.block.RowBlock io.trino.spi.block.RowBlock::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.RowBlock::copyWithAppendedNull()</old>
+                                    <new>method io.trino.spi.block.RowBlock io.trino.spi.block.RowBlock::copyWithAppendedNull()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractRowBlock::getRegion(int, int) @ io.trino.spi.block.RowBlock</old>
+                                    <new>method io.trino.spi.block.RowBlock io.trino.spi.block.RowBlock::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractRowBlock::getSingleValueBlock(int) @ io.trino.spi.block.RowBlock</old>
+                                    <new>method io.trino.spi.block.RowBlock io.trino.spi.block.RowBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ShortArrayBlock::copyPositions(int[], int, int)</old>
+                                    <new>method io.trino.spi.block.ShortArrayBlock io.trino.spi.block.ShortArrayBlock::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ShortArrayBlock::copyRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.ShortArrayBlock io.trino.spi.block.ShortArrayBlock::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ShortArrayBlock::copyWithAppendedNull()</old>
+                                    <new>method io.trino.spi.block.ShortArrayBlock io.trino.spi.block.ShortArrayBlock::copyWithAppendedNull()</new>
+                                    <justification>ADD YOUR EXPLANATION FOR THE NECESSITY OF THIS CHANGE</justification>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ShortArrayBlock::getRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.ShortArrayBlock io.trino.spi.block.ShortArrayBlock::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ShortArrayBlock::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.ShortArrayBlock io.trino.spi.block.ShortArrayBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.VariableWidthBlock::copyPositions(int[], int, int)</old>
+                                    <new>method io.trino.spi.block.VariableWidthBlock io.trino.spi.block.VariableWidthBlock::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.VariableWidthBlock::copyRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.VariableWidthBlock io.trino.spi.block.VariableWidthBlock::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.VariableWidthBlock::copyWithAppendedNull()</old>
+                                    <new>method io.trino.spi.block.VariableWidthBlock io.trino.spi.block.VariableWidthBlock::copyWithAppendedNull()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.VariableWidthBlock::getRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.VariableWidthBlock io.trino.spi.block.VariableWidthBlock::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.AbstractVariableWidthBlock::getSingleValueBlock(int) @ io.trino.spi.block.VariableWidthBlock</old>
+                                    <new>method io.trino.spi.block.VariableWidthBlock io.trino.spi.block.VariableWidthBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.addedToInterface</code>
+                                    <new>method io.trino.spi.block.ValueBlock io.trino.spi.block.Block::getUnderlyingValueBlock()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.addedToInterface</code>
+                                    <new>method int io.trino.spi.block.Block::getUnderlyingValuePosition(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.RunLengthEncodedBlock::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.ValueBlock io.trino.spi.block.RunLengthEncodedBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.RunLengthEncodedBlock::getValue()</old>
+                                    <new>method io.trino.spi.block.ValueBlock io.trino.spi.block.RunLengthEncodedBlock::getValue()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Block::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.ValueBlock io.trino.spi.block.Block::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.DictionaryBlock::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.ValueBlock io.trino.spi.block.DictionaryBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.LazyBlock::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.ValueBlock io.trino.spi.block.LazyBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.DictionaryBlock::getDictionary()</old>
+                                    <new>method io.trino.spi.block.ValueBlock io.trino.spi.block.DictionaryBlock::getDictionary()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.addedToInterface</code>
+                                    <new>method io.trino.spi.block.ValueBlock io.trino.spi.block.BlockBuilder::buildValueBlock()</new>
                                 </item>
-                                <!-- Backwards incompatible changes since the previous release -->
-                                <!-- Any exclusions below can be deleted after each release -->
                                 <item>
-                                    <ignore>true</ignore>
                                     <code>java.method.numberOfParametersChanged</code>
-                                    <old>method void io.trino.spi.connector.MaterializedViewFreshness::&lt;init&gt;(boolean)</old>
-                                    <new>method void io.trino.spi.connector.MaterializedViewFreshness::&lt;init&gt;(io.trino.spi.connector.MaterializedViewFreshness.Freshness, java.util.Optional&lt;java.time.Instant&gt;)</new>
+                                    <old>method void io.trino.spi.type.AbstractType::&lt;init&gt;(io.trino.spi.type.TypeSignature, java.lang.Class&lt;?&gt;)</old>
+                                    <new>method void io.trino.spi.type.AbstractType::&lt;init&gt;(io.trino.spi.type.TypeSignature, java.lang.Class&lt;?&gt;, java.lang.Class&lt;? extends io.trino.spi.block.ValueBlock&gt;)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.numberOfParametersChanged</code>
+                                    <old>method void io.trino.spi.type.TimeWithTimeZoneType::&lt;init&gt;(int, java.lang.Class&lt;?&gt;)</old>
+                                    <new>method void io.trino.spi.type.TimeWithTimeZoneType::&lt;init&gt;(int, java.lang.Class&lt;?&gt;, java.lang.Class&lt;? extends io.trino.spi.block.ValueBlock&gt;)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.addedToInterface</code>
+                                    <new>method java.lang.Class&lt;? extends io.trino.spi.block.ValueBlock&gt; io.trino.spi.type.Type::getValueBlockType()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.type.TypeUtils::writeNativeValue(io.trino.spi.type.Type, java.lang.Object)</old>
+                                    <new>method io.trino.spi.block.ValueBlock io.trino.spi.type.TypeUtils::writeNativeValue(io.trino.spi.type.Type, java.lang.Object)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ArrayBlock::fromElementBlock(int, java.util.Optional&lt;boolean[]&gt;, int[], io.trino.spi.block.Block)</old>
+                                    <new>method io.trino.spi.block.ArrayBlock io.trino.spi.block.ArrayBlock::fromElementBlock(int, java.util.Optional&lt;boolean[]&gt;, int[], io.trino.spi.block.Block)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.type.MapType::createBlockFromKeyValue(java.util.Optional&lt;boolean[]&gt;, int[], io.trino.spi.block.Block, io.trino.spi.block.Block)</old>
+                                    <new>method io.trino.spi.block.MapBlock io.trino.spi.type.MapType::createBlockFromKeyValue(java.util.Optional&lt;boolean[]&gt;, int[], io.trino.spi.block.Block, io.trino.spi.block.Block)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityIncreased</code>
+                                    <old>method int[] io.trino.spi.block.DictionaryBlock::getRawIds()</old>
+                                    <new>method int[] io.trino.spi.block.DictionaryBlock::getRawIds()</new>
+                                    <oldVisibility>package</oldVisibility>
+                                    <newVisibility>public</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityIncreased</code>
+                                    <old>method int io.trino.spi.block.DictionaryBlock::getRawIdsOffset()</old>
+                                    <new>method int io.trino.spi.block.DictionaryBlock::getRawIdsOffset()</new>
+                                    <oldVisibility>package</oldVisibility>
+                                    <newVisibility>public</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int io.trino.spi.block.Block::bytesCompare(int, int, int, io.airlift.slice.Slice, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method boolean io.trino.spi.block.Block::bytesEqual(int, int, io.airlift.slice.Slice, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int io.trino.spi.block.Block::compareTo(int, int, int, io.trino.spi.block.Block, int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method boolean io.trino.spi.block.Block::equals(int, int, io.trino.spi.block.Block, int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method long io.trino.spi.block.Block::hash(int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int io.trino.spi.block.DictionaryBlock::bytesCompare(int, int, int, io.airlift.slice.Slice, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method boolean io.trino.spi.block.DictionaryBlock::bytesEqual(int, int, io.airlift.slice.Slice, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int io.trino.spi.block.DictionaryBlock::compareTo(int, int, int, io.trino.spi.block.Block, int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method boolean io.trino.spi.block.DictionaryBlock::equals(int, int, io.trino.spi.block.Block, int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method long io.trino.spi.block.DictionaryBlock::hash(int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int io.trino.spi.block.LazyBlock::bytesCompare(int, int, int, io.airlift.slice.Slice, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method boolean io.trino.spi.block.LazyBlock::bytesEqual(int, int, io.airlift.slice.Slice, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int io.trino.spi.block.LazyBlock::compareTo(int, int, int, io.trino.spi.block.Block, int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method boolean io.trino.spi.block.LazyBlock::equals(int, int, io.trino.spi.block.Block, int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method long io.trino.spi.block.LazyBlock::hash(int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int io.trino.spi.block.RunLengthEncodedBlock::bytesCompare(int, int, int, io.airlift.slice.Slice, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method boolean io.trino.spi.block.RunLengthEncodedBlock::bytesEqual(int, int, io.airlift.slice.Slice, int, int)</old>
+                                    <justification>ADD YOUR EXPLANATION FOR THE NECESSITY OF THIS CHANGE</justification>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int io.trino.spi.block.RunLengthEncodedBlock::compareTo(int, int, int, io.trino.spi.block.Block, int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method boolean io.trino.spi.block.RunLengthEncodedBlock::equals(int, int, io.trino.spi.block.Block, int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method long io.trino.spi.block.RunLengthEncodedBlock::hash(int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method void io.trino.spi.block.Block::writeSliceTo(int, int, int, io.airlift.slice.SliceOutput)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method void io.trino.spi.block.DictionaryBlock::writeSliceTo(int, int, int, io.airlift.slice.SliceOutput)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method void io.trino.spi.block.LazyBlock::writeSliceTo(int, int, int, io.airlift.slice.SliceOutput)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method void io.trino.spi.block.RunLengthEncodedBlock::writeSliceTo(int, int, int, io.airlift.slice.SliceOutput)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ArrayBlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</old>
+                                    <new>method io.trino.spi.block.ArrayBlock io.trino.spi.block.ArrayBlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ByteArrayBlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</old>
+                                    <new>method io.trino.spi.block.ByteArrayBlock io.trino.spi.block.ByteArrayBlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Fixed12BlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</old>
+                                    <new>method io.trino.spi.block.Fixed12Block io.trino.spi.block.Fixed12BlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.Int128ArrayBlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</old>
+                                    <new>method io.trino.spi.block.Int128ArrayBlock io.trino.spi.block.Int128ArrayBlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.IntArrayBlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</old>
+                                    <new>method io.trino.spi.block.IntArrayBlock io.trino.spi.block.IntArrayBlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.LongArrayBlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</old>
+                                    <new>method io.trino.spi.block.LongArrayBlock io.trino.spi.block.LongArrayBlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ShortArrayBlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</old>
+                                    <new>method io.trino.spi.block.ShortArrayBlock io.trino.spi.block.ShortArrayBlockEncoding::readBlock(io.trino.spi.block.BlockEncodingSerde, io.airlift.slice.SliceInput)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.nowStatic</code>
+                                    <old>method void io.trino.spi.type.AbstractIntType::checkValueValid(long)</old>
+                                    <new>method void io.trino.spi.type.AbstractIntType::checkValueValid(long)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ArrayBlock::copyPositions(int[], int, int)</old>
+                                    <new>method io.trino.spi.block.ArrayBlock io.trino.spi.block.ArrayBlock::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ArrayBlock::copyRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.ArrayBlock io.trino.spi.block.ArrayBlock::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ArrayBlock::getRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.ArrayBlock io.trino.spi.block.ArrayBlock::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ArrayBlock::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.ArrayBlock io.trino.spi.block.ArrayBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::copyPositions(int[], int, int)</old>
+                                    <new>method io.trino.spi.block.MapBlock io.trino.spi.block.MapBlock::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::copyRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.MapBlock io.trino.spi.block.MapBlock::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::getRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.MapBlock io.trino.spi.block.MapBlock::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.MapBlock io.trino.spi.block.MapBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.RowBlock::copyPositions(int[], int, int)</old>
+                                    <new>method io.trino.spi.block.RowBlock io.trino.spi.block.RowBlock::copyPositions(int[], int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.RowBlock::copyRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.RowBlock io.trino.spi.block.RowBlock::copyRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.RowBlock::getRegion(int, int)</old>
+                                    <new>method io.trino.spi.block.RowBlock io.trino.spi.block.RowBlock::getRegion(int, int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.RowBlock::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.RowBlock io.trino.spi.block.RowBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int io.trino.spi.block.VariableWidthBlock::bytesCompare(int, int, int, io.airlift.slice.Slice, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method boolean io.trino.spi.block.VariableWidthBlock::bytesEqual(int, int, io.airlift.slice.Slice, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int io.trino.spi.block.VariableWidthBlock::compareTo(int, int, int, io.trino.spi.block.Block, int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method boolean io.trino.spi.block.VariableWidthBlock::equals(int, int, io.trino.spi.block.Block, int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChangedCovariantly</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.VariableWidthBlock::getSingleValueBlock(int)</old>
+                                    <new>method io.trino.spi.block.VariableWidthBlock io.trino.spi.block.VariableWidthBlock::getSingleValueBlock(int)</new>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method long io.trino.spi.block.VariableWidthBlock::hash(int, int, int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method void io.trino.spi.block.VariableWidthBlock::writeSliceTo(int, int, int, io.airlift.slice.SliceOutput)</old>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.ArrayBlock</old>
+                                    <new>class io.trino.spi.block.ArrayBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.ByteArrayBlock</old>
+                                    <new>class io.trino.spi.block.ByteArrayBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.DictionaryBlock</old>
+                                    <new>class io.trino.spi.block.DictionaryBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.Fixed12Block</old>
+                                    <new>class io.trino.spi.block.Fixed12Block</new>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.Int128ArrayBlock</old>
+                                    <new>class io.trino.spi.block.Int128ArrayBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.IntArrayBlock</old>
+                                    <new>class io.trino.spi.block.IntArrayBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.LazyBlock</old>
+                                    <new>class io.trino.spi.block.LazyBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.LongArrayBlock</old>
+                                    <new>class io.trino.spi.block.LongArrayBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.MapBlock</old>
+                                    <new>class io.trino.spi.block.MapBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.RowBlock</old>
+                                    <new>class io.trino.spi.block.RowBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.RunLengthEncodedBlock</old>
+                                    <new>class io.trino.spi.block.RunLengthEncodedBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.ShortArrayBlock</old>
+                                    <new>class io.trino.spi.block.ShortArrayBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.class.nowFinal</code>
+                                    <old>class io.trino.spi.block.VariableWidthBlock</old>
+                                    <new>class io.trino.spi.block.VariableWidthBlock</new>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method int io.trino.spi.block.ArrayBlock::getOffsetBase()</old>
+                                    <new>method int io.trino.spi.block.ArrayBlock::getOffsetBase()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method int[] io.trino.spi.block.ArrayBlock::getOffsets()</old>
+                                    <new>method int[] io.trino.spi.block.ArrayBlock::getOffsets()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.ArrayBlock::getRawElementBlock()</old>
+                                    <new>method io.trino.spi.block.Block io.trino.spi.block.ArrayBlock::getRawElementBlock()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method void io.trino.spi.block.MapBlock::ensureHashTableLoaded()</old>
+                                    <new>method void io.trino.spi.block.MapBlock::ensureHashTableLoaded()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method io.trino.spi.block.MapHashTables io.trino.spi.block.MapBlock::getHashTables()</old>
+                                    <new>method io.trino.spi.block.MapHashTables io.trino.spi.block.MapBlock::getHashTables()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method io.trino.spi.type.MapType io.trino.spi.block.MapBlock::getMapType()</old>
+                                    <new>method io.trino.spi.type.MapType io.trino.spi.block.MapBlock::getMapType()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method int io.trino.spi.block.MapBlock::getOffsetBase()</old>
+                                    <new>method int io.trino.spi.block.MapBlock::getOffsetBase()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method int[] io.trino.spi.block.MapBlock::getOffsets()</old>
+                                    <new>method int[] io.trino.spi.block.MapBlock::getOffsets()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::getRawKeyBlock()</old>
+                                    <new>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::getRawKeyBlock()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::getRawValueBlock()</old>
+                                    <new>method io.trino.spi.block.Block io.trino.spi.block.MapBlock::getRawValueBlock()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method int[] io.trino.spi.block.RowBlock::getFieldBlockOffsets()</old>
+                                    <new>method int[] io.trino.spi.block.RowBlock::getFieldBlockOffsets()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method int io.trino.spi.block.RowBlock::getOffsetBase()</old>
+                                    <new>method int io.trino.spi.block.RowBlock::getOffsetBase()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method java.util.List&lt;io.trino.spi.block.Block&gt; io.trino.spi.block.RowBlock::getRawFieldBlocks()</old>
+                                    <new>method java.util.List&lt;io.trino.spi.block.Block&gt; io.trino.spi.block.RowBlock::getRawFieldBlocks()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method int io.trino.spi.block.VariableWidthBlock::getPositionOffset(int)</old>
+                                    <new>method int io.trino.spi.block.VariableWidthBlock::getPositionOffset(int)</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
+                                </item>
+                                <item>
+                                    <code>java.class.removed</code>
+                                    <old>class io.trino.spi.block.ColumnarRow</old>
+                                </item>
+                                <item>
+                                    <code>java.method.numberOfParametersChanged</code>
+                                    <old>method io.trino.spi.block.RowBlock io.trino.spi.block.RowBlock::fromFieldBlocks(int, java.util.Optional&lt;boolean[]&gt;, io.trino.spi.block.Block[])</old>
+                                    <new>method io.trino.spi.block.RowBlock io.trino.spi.block.RowBlock::fromFieldBlocks(int, io.trino.spi.block.Block[])</new>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int[] io.trino.spi.block.RowBlock::getFieldBlockOffsets()</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int io.trino.spi.block.RowBlock::getOffsetBase()</old>
+                                </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method int io.trino.spi.block.RowBlock::getFieldBlockOffset(int)</old>
+                                </item>
+                                <item>
+                                    <code>java.method.returnTypeChanged</code>
+                                    <old>method java.util.List&lt;io.trino.spi.block.Block&gt; io.trino.spi.block.RowBlock::getRawFieldBlocks()</old>
+                                    <new>method io.trino.spi.block.Block[] io.trino.spi.block.RowBlock::getRawFieldBlocks()</new>
+                                </item>
+                                <item>
+                                    <code>java.method.visibilityReduced</code>
+                                    <old>method java.util.List&lt;io.trino.spi.block.Block&gt; io.trino.spi.block.RowBlock::getRawFieldBlocks()</old>
+                                    <new>method io.trino.spi.block.Block[] io.trino.spi.block.RowBlock::getRawFieldBlocks()</new>
+                                    <oldVisibility>protected</oldVisibility>
+                                    <newVisibility>package</newVisibility>
                                 </item>
                             </differences>
                         </revapi.differences>
                     </analysisConfiguration>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.revapi</groupId>
+                        <artifactId>revapi-java</artifactId>
+                        <version>0.28.1</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/core/trino-spi/src/main/java/io/trino/spi/Location.java b/core/trino-spi/src/main/java/io/trino/spi/Location.java
index 33b361f6d548..9a20b7757957 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/Location.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/Location.java
@@ -13,7 +13,7 @@
  */
 package io.trino.spi;
 
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 @Immutable
 public class Location
diff --git a/core/trino-spi/src/main/java/io/trino/spi/Page.java b/core/trino-spi/src/main/java/io/trino/spi/Page.java
index e9f3f37d353c..14a7a94446ef 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/Page.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/Page.java
@@ -153,6 +153,10 @@ public Page getRegion(int positionOffset, int length)
             throw new IndexOutOfBoundsException(format("Invalid position %s and length %s in page with %s positions", positionOffset, length, positionCount));
         }
 
+        if (positionOffset == 0 && length == positionCount) {
+            return this;
+        }
+
         int channelCount = getChannelCount();
         Block[] slicedBlocks = new Block[channelCount];
         for (int i = 0; i < channelCount; i++) {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/PageIndexerFactory.java b/core/trino-spi/src/main/java/io/trino/spi/PageIndexerFactory.java
index 9b0233ef9f13..e26ac7a77a50 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/PageIndexerFactory.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/PageIndexerFactory.java
@@ -19,5 +19,5 @@
 
 public interface PageIndexerFactory
 {
-    PageIndexer createPageIndexer(List<? extends Type> types);
+    PageIndexer createPageIndexer(List<Type> types);
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/QueryId.java b/core/trino-spi/src/main/java/io/trino/spi/QueryId.java
index 956aead6da45..ad1d9c58329b 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/QueryId.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/QueryId.java
@@ -76,10 +76,6 @@ public boolean equals(Object obj)
     // Check if the string matches [_a-z0-9]+ , but without the overhead of regex
     private static boolean isValidId(String id)
     {
-        if (id.length() == 0) {
-            return false;
-        }
-
         for (int i = 0; i < id.length(); i++) {
             char c = id.charAt(i);
             if (!(c == '_' || c >= 'a' && c <= 'z' || c >= '0' && c <= '9')) {
@@ -107,8 +103,7 @@ public static List<String> parseDottedId(String id, int expectedParts, String na
         checkArgument(ids.size() == expectedParts, "Invalid %s %s", name, id);
 
         for (String part : ids) {
-            checkArgument(!part.isEmpty(), "Invalid id %s", id);
-            checkArgument(isValidId(part), "Invalid id %s", id);
+            validateId(part);
         }
         return ids;
     }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/StandardErrorCode.java b/core/trino-spi/src/main/java/io/trino/spi/StandardErrorCode.java
index e16f80af4ca9..9500f3e4a66b 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/StandardErrorCode.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/StandardErrorCode.java
@@ -147,6 +147,7 @@ public enum StandardErrorCode
     INVALID_CHECK_CONSTRAINT(123, USER_ERROR),
     INVALID_CATALOG_PROPERTY(124, USER_ERROR),
     CATALOG_UNAVAILABLE(125, USER_ERROR),
+    MISSING_RETURN(126, USER_ERROR),
 
     GENERIC_INTERNAL_ERROR(65536, INTERNAL_ERROR),
     TOO_MANY_REQUESTS_FAILED(65537, INTERNAL_ERROR),
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractArrayBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/AbstractArrayBlock.java
deleted file mode 100644
index f12e296a6cf5..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractArrayBlock.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import javax.annotation.Nullable;
-
-import java.util.List;
-import java.util.OptionalInt;
-
-import static io.trino.spi.block.ArrayBlock.createArrayBlockInternal;
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-import static io.trino.spi.block.BlockUtil.checkValidPositions;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
-import static io.trino.spi.block.BlockUtil.compactArray;
-import static io.trino.spi.block.BlockUtil.compactOffsets;
-import static io.trino.spi.block.BlockUtil.countAndMarkSelectedPositionsFromOffsets;
-import static io.trino.spi.block.BlockUtil.countSelectedPositionsFromOffsets;
-import static java.util.Collections.singletonList;
-
-public abstract class AbstractArrayBlock
-        implements Block
-{
-    @Override
-    public final List<Block> getChildren()
-    {
-        return singletonList(getRawElementBlock());
-    }
-
-    protected abstract Block getRawElementBlock();
-
-    protected abstract int[] getOffsets();
-
-    protected abstract int getOffsetBase();
-
-    /**
-     * @return the underlying valueIsNull array, or null when all values are guaranteed to be non-null
-     */
-    @Nullable
-    protected abstract boolean[] getValueIsNull();
-
-    int getOffset(int position)
-    {
-        return getOffsets()[position + getOffsetBase()];
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        return ArrayBlockEncoding.NAME;
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        int[] newOffsets = new int[length + 1];
-        newOffsets[0] = 0;
-        boolean[] newValueIsNull = getValueIsNull() == null ? null : new boolean[length];
-
-        IntArrayList valuesPositions = new IntArrayList();
-        for (int i = 0; i < length; i++) {
-            int position = positions[offset + i];
-            if (newValueIsNull != null && isNull(position)) {
-                newValueIsNull[i] = true;
-                newOffsets[i + 1] = newOffsets[i];
-            }
-            else {
-                int valuesStartOffset = getOffset(position);
-                int valuesEndOffset = getOffset(position + 1);
-                int valuesLength = valuesEndOffset - valuesStartOffset;
-
-                newOffsets[i + 1] = newOffsets[i] + valuesLength;
-
-                for (int elementIndex = valuesStartOffset; elementIndex < valuesEndOffset; elementIndex++) {
-                    valuesPositions.add(elementIndex);
-                }
-            }
-        }
-        Block newValues = getRawElementBlock().copyPositions(valuesPositions.elements(), 0, valuesPositions.size());
-        return createArrayBlockInternal(0, length, newValueIsNull, newOffsets, newValues);
-    }
-
-    @Override
-    public Block getRegion(int position, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        return createArrayBlockInternal(
-                position + getOffsetBase(),
-                length,
-                getValueIsNull(),
-                getOffsets(),
-                getRawElementBlock());
-    }
-
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.empty(); // size per position is variable based on the number of entries in each array
-    }
-
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        int valueStart = getOffsets()[getOffsetBase() + position];
-        int valueEnd = getOffsets()[getOffsetBase() + position + length];
-
-        return getRawElementBlock().getRegionSizeInBytes(valueStart, valueEnd - valueStart) + ((Integer.BYTES + Byte.BYTES) * (long) length);
-    }
-
-    @Override
-    public final long getPositionsSizeInBytes(boolean[] positions, int selectedArrayPositions)
-    {
-        int positionCount = getPositionCount();
-        checkValidPositions(positions, positionCount);
-        if (selectedArrayPositions == 0) {
-            return 0;
-        }
-        if (selectedArrayPositions == positionCount) {
-            return getSizeInBytes();
-        }
-
-        Block rawElementBlock = getRawElementBlock();
-        OptionalInt fixedPerElementSizeInBytes = rawElementBlock.fixedSizeInBytesPerPosition();
-        int[] offsets = getOffsets();
-        int offsetBase = getOffsetBase();
-        long elementsSizeInBytes;
-
-        if (fixedPerElementSizeInBytes.isPresent()) {
-            elementsSizeInBytes = fixedPerElementSizeInBytes.getAsInt() * (long) countSelectedPositionsFromOffsets(positions, offsets, offsetBase);
-        }
-        else if (rawElementBlock instanceof RunLengthEncodedBlock) {
-            // RLE blocks don't have fixed size per position, but accept null for the positions array
-            elementsSizeInBytes = rawElementBlock.getPositionsSizeInBytes(null, countSelectedPositionsFromOffsets(positions, offsets, offsetBase));
-        }
-        else {
-            boolean[] selectedElements = new boolean[rawElementBlock.getPositionCount()];
-            int selectedElementCount = countAndMarkSelectedPositionsFromOffsets(positions, offsets, offsetBase, selectedElements);
-            elementsSizeInBytes = rawElementBlock.getPositionsSizeInBytes(selectedElements, selectedElementCount);
-        }
-        return elementsSizeInBytes + ((Integer.BYTES + Byte.BYTES) * (long) selectedArrayPositions);
-    }
-
-    @Override
-    public Block copyRegion(int position, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        int startValueOffset = getOffset(position);
-        int endValueOffset = getOffset(position + length);
-        Block newValues = getRawElementBlock().copyRegion(startValueOffset, endValueOffset - startValueOffset);
-
-        int[] newOffsets = compactOffsets(getOffsets(), position + getOffsetBase(), length);
-        boolean[] valueIsNull = getValueIsNull();
-        boolean[] newValueIsNull = valueIsNull == null ? null : compactArray(valueIsNull, position + getOffsetBase(), length);
-
-        if (newValues == getRawElementBlock() && newOffsets == getOffsets() && newValueIsNull == valueIsNull) {
-            return this;
-        }
-        return createArrayBlockInternal(0, length, newValueIsNull, newOffsets, newValues);
-    }
-
-    @Override
-    public <T> T getObject(int position, Class<T> clazz)
-    {
-        if (clazz != Block.class) {
-            throw new IllegalArgumentException("clazz must be Block.class");
-        }
-        checkReadablePosition(this, position);
-
-        int startValueOffset = getOffset(position);
-        int endValueOffset = getOffset(position + 1);
-        return clazz.cast(getRawElementBlock().getRegion(startValueOffset, endValueOffset - startValueOffset));
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        checkReadablePosition(this, position);
-
-        int startValueOffset = getOffset(position);
-        int valueLength = getOffset(position + 1) - startValueOffset;
-        Block newValues = getRawElementBlock().copyRegion(startValueOffset, valueLength);
-
-        return createArrayBlockInternal(
-                0,
-                1,
-                isNull(position) ? new boolean[] {true} : null,
-                new int[] {0, valueLength},
-                newValues);
-    }
-
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        checkReadablePosition(this, position);
-
-        if (isNull(position)) {
-            return 0;
-        }
-
-        int startValueOffset = getOffset(position);
-        int endValueOffset = getOffset(position + 1);
-
-        Block rawElementBlock = getRawElementBlock();
-        long size = 0;
-        for (int i = startValueOffset; i < endValueOffset; i++) {
-            size += rawElementBlock.getEstimatedDataSizeForStats(i);
-        }
-        return size;
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkReadablePosition(this, position);
-        boolean[] valueIsNull = getValueIsNull();
-        return valueIsNull != null && valueIsNull[position + getOffsetBase()];
-    }
-
-    public <T> T apply(ArrayBlockFunction<T> function, int position)
-    {
-        checkReadablePosition(this, position);
-
-        int startValueOffset = getOffset(position);
-        int endValueOffset = getOffset(position + 1);
-        return function.apply(getRawElementBlock(), startValueOffset, endValueOffset - startValueOffset);
-    }
-
-    public interface ArrayBlockFunction<T>
-    {
-        T apply(Block block, int startPosition, int length);
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractMapBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/AbstractMapBlock.java
deleted file mode 100644
index 0a9da03669ea..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractMapBlock.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.trino.spi.type.MapType;
-
-import javax.annotation.Nullable;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.OptionalInt;
-
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-import static io.trino.spi.block.BlockUtil.checkValidPositions;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
-import static io.trino.spi.block.BlockUtil.compactArray;
-import static io.trino.spi.block.BlockUtil.compactOffsets;
-import static io.trino.spi.block.BlockUtil.countAndMarkSelectedPositionsFromOffsets;
-import static io.trino.spi.block.BlockUtil.countSelectedPositionsFromOffsets;
-import static io.trino.spi.block.MapBlock.createMapBlockInternal;
-import static io.trino.spi.block.MapHashTables.HASH_MULTIPLIER;
-import static java.util.Objects.requireNonNull;
-
-public abstract class AbstractMapBlock
-        implements Block
-{
-    private final MapType mapType;
-
-    public AbstractMapBlock(MapType mapType)
-    {
-        this.mapType = requireNonNull(mapType, "mapType is null");
-    }
-
-    @Override
-    public final List<Block> getChildren()
-    {
-        return List.of(getRawKeyBlock(), getRawValueBlock());
-    }
-
-    protected MapType getMapType()
-    {
-        return mapType;
-    }
-
-    protected abstract Block getRawKeyBlock();
-
-    protected abstract Block getRawValueBlock();
-
-    protected abstract MapHashTables getHashTables();
-
-    /**
-     * offset is entry-based, not position-based. In other words,
-     * if offset[1] is 6, it means the first map has 6 key-value pairs,
-     * not 6 key/values (which would be 3 pairs).
-     */
-    protected abstract int[] getOffsets();
-
-    /**
-     * offset is entry-based, not position-based. (see getOffsets)
-     */
-    protected abstract int getOffsetBase();
-
-    @Nullable
-    protected abstract boolean[] getMapIsNull();
-
-    protected abstract void ensureHashTableLoaded();
-
-    int getOffset(int position)
-    {
-        return getOffsets()[position + getOffsetBase()];
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        return MapBlockEncoding.NAME;
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        int[] newOffsets = new int[length + 1];
-        boolean[] newMapIsNull = new boolean[length];
-
-        IntArrayList entriesPositions = new IntArrayList();
-        int newPosition = 0;
-        for (int i = offset; i < offset + length; ++i) {
-            int position = positions[i];
-            if (isNull(position)) {
-                newMapIsNull[newPosition] = true;
-                newOffsets[newPosition + 1] = newOffsets[newPosition];
-            }
-            else {
-                int entriesStartOffset = getOffset(position);
-                int entriesEndOffset = getOffset(position + 1);
-                int entryCount = entriesEndOffset - entriesStartOffset;
-
-                newOffsets[newPosition + 1] = newOffsets[newPosition] + entryCount;
-
-                for (int elementIndex = entriesStartOffset; elementIndex < entriesEndOffset; elementIndex++) {
-                    entriesPositions.add(elementIndex);
-                }
-            }
-            newPosition++;
-        }
-
-        int[] rawHashTables = getHashTables().tryGet().orElse(null);
-        int[] newRawHashTables = null;
-        int newHashTableEntries = newOffsets[newOffsets.length - 1] * HASH_MULTIPLIER;
-        if (rawHashTables != null) {
-            newRawHashTables = new int[newHashTableEntries];
-            int newHashIndex = 0;
-            for (int i = offset; i < offset + length; ++i) {
-                int position = positions[i];
-                int entriesStartOffset = getOffset(position);
-                int entriesEndOffset = getOffset(position + 1);
-                for (int hashIndex = entriesStartOffset * HASH_MULTIPLIER; hashIndex < entriesEndOffset * HASH_MULTIPLIER; hashIndex++) {
-                    newRawHashTables[newHashIndex] = rawHashTables[hashIndex];
-                    newHashIndex++;
-                }
-            }
-        }
-
-        Block newKeys = getRawKeyBlock().copyPositions(entriesPositions.elements(), 0, entriesPositions.size());
-        Block newValues = getRawValueBlock().copyPositions(entriesPositions.elements(), 0, entriesPositions.size());
-        return createMapBlockInternal(
-                mapType,
-                0,
-                length,
-                Optional.of(newMapIsNull),
-                newOffsets,
-                newKeys,
-                newValues,
-                new MapHashTables(mapType, Optional.ofNullable(newRawHashTables)));
-    }
-
-    @Override
-    public Block getRegion(int position, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        return createMapBlockInternal(
-                mapType,
-                position + getOffsetBase(),
-                length,
-                Optional.ofNullable(getMapIsNull()),
-                getOffsets(),
-                getRawKeyBlock(),
-                getRawValueBlock(),
-                getHashTables());
-    }
-
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        int entriesStart = getOffsets()[getOffsetBase() + position];
-        int entriesEnd = getOffsets()[getOffsetBase() + position + length];
-        int entryCount = entriesEnd - entriesStart;
-
-        return getRawKeyBlock().getRegionSizeInBytes(entriesStart, entryCount) +
-                getRawValueBlock().getRegionSizeInBytes(entriesStart, entryCount) +
-                (Integer.BYTES + Byte.BYTES) * (long) length +
-                Integer.BYTES * HASH_MULTIPLIER * (long) entryCount;
-    }
-
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.empty(); // size per row is variable on the number of entries in each row
-    }
-
-    private OptionalInt keyAndValueFixedSizeInBytesPerRow()
-    {
-        OptionalInt keyFixedSizePerRow = getRawKeyBlock().fixedSizeInBytesPerPosition();
-        if (!keyFixedSizePerRow.isPresent()) {
-            return OptionalInt.empty();
-        }
-        OptionalInt valueFixedSizePerRow = getRawValueBlock().fixedSizeInBytesPerPosition();
-        if (!valueFixedSizePerRow.isPresent()) {
-            return OptionalInt.empty();
-        }
-
-        return OptionalInt.of(keyFixedSizePerRow.getAsInt() + valueFixedSizePerRow.getAsInt());
-    }
-
-    @Override
-    public final long getPositionsSizeInBytes(boolean[] positions, int selectedMapPositions)
-    {
-        int positionCount = getPositionCount();
-        checkValidPositions(positions, positionCount);
-        if (selectedMapPositions == 0) {
-            return 0;
-        }
-        if (selectedMapPositions == positionCount) {
-            return getSizeInBytes();
-        }
-
-        int[] offsets = getOffsets();
-        int offsetBase = getOffsetBase();
-        OptionalInt fixedKeyAndValueSizePerRow = keyAndValueFixedSizeInBytesPerRow();
-
-        int selectedEntryCount;
-        long keyAndValuesSizeInBytes;
-        if (fixedKeyAndValueSizePerRow.isPresent()) {
-            // no new positions array need be created, we can just count the number of elements
-            selectedEntryCount = countSelectedPositionsFromOffsets(positions, offsets, offsetBase);
-            keyAndValuesSizeInBytes = fixedKeyAndValueSizePerRow.getAsInt() * (long) selectedEntryCount;
-        }
-        else {
-            // We can use either the getRegionSizeInBytes or getPositionsSizeInBytes
-            // from the underlying raw blocks to implement this function. We chose
-            // getPositionsSizeInBytes with the assumption that constructing a
-            // positions array is cheaper than calling getRegionSizeInBytes for each
-            // used position.
-            boolean[] entryPositions = new boolean[getRawKeyBlock().getPositionCount()];
-            selectedEntryCount = countAndMarkSelectedPositionsFromOffsets(positions, offsets, offsetBase, entryPositions);
-            keyAndValuesSizeInBytes = getRawKeyBlock().getPositionsSizeInBytes(entryPositions, selectedEntryCount) +
-                    getRawValueBlock().getPositionsSizeInBytes(entryPositions, selectedEntryCount);
-        }
-
-        return keyAndValuesSizeInBytes +
-                (Integer.BYTES + Byte.BYTES) * (long) selectedMapPositions +
-                Integer.BYTES * HASH_MULTIPLIER * (long) selectedEntryCount;
-    }
-
-    @Override
-    public Block copyRegion(int position, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        int startValueOffset = getOffset(position);
-        int endValueOffset = getOffset(position + length);
-        Block newKeys = getRawKeyBlock().copyRegion(startValueOffset, endValueOffset - startValueOffset);
-        Block newValues = getRawValueBlock().copyRegion(startValueOffset, endValueOffset - startValueOffset);
-
-        int[] newOffsets = compactOffsets(getOffsets(), position + getOffsetBase(), length);
-        boolean[] mapIsNull = getMapIsNull();
-        boolean[] newMapIsNull = mapIsNull == null ? null : compactArray(mapIsNull, position + getOffsetBase(), length);
-        int[] rawHashTables = getHashTables().tryGet().orElse(null);
-        int[] newRawHashTables = null;
-        int expectedNewHashTableEntries = (endValueOffset - startValueOffset) * HASH_MULTIPLIER;
-        if (rawHashTables != null) {
-            newRawHashTables = compactArray(rawHashTables, startValueOffset * HASH_MULTIPLIER, expectedNewHashTableEntries);
-        }
-
-        if (newKeys == getRawKeyBlock() && newValues == getRawValueBlock() && newOffsets == getOffsets() && newMapIsNull == mapIsNull && newRawHashTables == rawHashTables) {
-            return this;
-        }
-        return createMapBlockInternal(
-                mapType,
-                0,
-                length,
-                Optional.ofNullable(newMapIsNull),
-                newOffsets,
-                newKeys,
-                newValues,
-                new MapHashTables(mapType, Optional.ofNullable(newRawHashTables)));
-    }
-
-    @Override
-    public <T> T getObject(int position, Class<T> clazz)
-    {
-        if (clazz != Block.class) {
-            throw new IllegalArgumentException("clazz must be Block.class");
-        }
-        checkReadablePosition(this, position);
-
-        int startEntryOffset = getOffset(position);
-        int endEntryOffset = getOffset(position + 1);
-        return clazz.cast(new SingleMapBlock(
-                startEntryOffset * 2,
-                (endEntryOffset - startEntryOffset) * 2,
-                this));
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        checkReadablePosition(this, position);
-
-        int startValueOffset = getOffset(position);
-        int endValueOffset = getOffset(position + 1);
-        int valueLength = endValueOffset - startValueOffset;
-        Block newKeys = getRawKeyBlock().copyRegion(startValueOffset, valueLength);
-        Block newValues = getRawValueBlock().copyRegion(startValueOffset, valueLength);
-        int[] rawHashTables = getHashTables().tryGet().orElse(null);
-        int[] newRawHashTables = null;
-        if (rawHashTables != null) {
-            newRawHashTables = Arrays.copyOfRange(rawHashTables, startValueOffset * HASH_MULTIPLIER, endValueOffset * HASH_MULTIPLIER);
-        }
-
-        return createMapBlockInternal(
-                mapType,
-                0,
-                1,
-                Optional.of(new boolean[] {isNull(position)}),
-                new int[] {0, valueLength},
-                newKeys,
-                newValues,
-                new MapHashTables(mapType, Optional.ofNullable(newRawHashTables)));
-    }
-
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        checkReadablePosition(this, position);
-
-        if (isNull(position)) {
-            return 0;
-        }
-
-        int startValueOffset = getOffset(position);
-        int endValueOffset = getOffset(position + 1);
-
-        long size = 0;
-        Block rawKeyBlock = getRawKeyBlock();
-        Block rawValueBlock = getRawValueBlock();
-        for (int i = startValueOffset; i < endValueOffset; i++) {
-            size += rawKeyBlock.getEstimatedDataSizeForStats(i);
-            size += rawValueBlock.getEstimatedDataSizeForStats(i);
-        }
-        return size;
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkReadablePosition(this, position);
-        boolean[] mapIsNull = getMapIsNull();
-        return mapIsNull != null && mapIsNull[position + getOffsetBase()];
-    }
-
-    // only visible for testing
-    public boolean isHashTablesPresent()
-    {
-        return getHashTables().tryGet().isPresent();
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractRowBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/AbstractRowBlock.java
deleted file mode 100644
index 6017bb29a8ed..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractRowBlock.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import javax.annotation.Nullable;
-
-import java.util.List;
-import java.util.OptionalInt;
-
-import static io.trino.spi.block.BlockUtil.arraySame;
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-import static io.trino.spi.block.BlockUtil.checkValidPositions;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
-import static io.trino.spi.block.BlockUtil.compactArray;
-import static io.trino.spi.block.BlockUtil.compactOffsets;
-import static io.trino.spi.block.RowBlock.createRowBlockInternal;
-
-public abstract class AbstractRowBlock
-        implements Block
-{
-    protected final int numFields;
-
-    @Override
-    public final List<Block> getChildren()
-    {
-        return List.of(getRawFieldBlocks());
-    }
-
-    protected abstract Block[] getRawFieldBlocks();
-
-    @Nullable
-    protected abstract int[] getFieldBlockOffsets();
-
-    protected abstract int getOffsetBase();
-
-    /**
-     * @return the underlying rowIsNull array, or null when all rows are guaranteed to be non-null
-     */
-    @Nullable
-    protected abstract boolean[] getRowIsNull();
-
-    // the offset in each field block, it can also be viewed as the "entry-based" offset in the RowBlock
-    public final int getFieldBlockOffset(int position)
-    {
-        int[] offsets = getFieldBlockOffsets();
-        return offsets != null ? offsets[position + getOffsetBase()] : position + getOffsetBase();
-    }
-
-    protected AbstractRowBlock(int numFields)
-    {
-        if (numFields <= 0) {
-            throw new IllegalArgumentException("Number of fields in RowBlock must be positive");
-        }
-        this.numFields = numFields;
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        return RowBlockEncoding.NAME;
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        int[] newOffsets = null;
-
-        int[] fieldBlockPositions = new int[length];
-        int fieldBlockPositionCount;
-        boolean[] newRowIsNull;
-        if (getRowIsNull() == null) {
-            // No nulls are present
-            newRowIsNull = null;
-            for (int i = 0; i < fieldBlockPositions.length; i++) {
-                int position = positions[offset + i];
-                checkReadablePosition(this, position);
-                fieldBlockPositions[i] = getFieldBlockOffset(position);
-            }
-            fieldBlockPositionCount = fieldBlockPositions.length;
-        }
-        else {
-            newRowIsNull = new boolean[length];
-            newOffsets = new int[length + 1];
-            fieldBlockPositionCount = 0;
-            for (int i = 0; i < length; i++) {
-                newOffsets[i] = fieldBlockPositionCount;
-                int position = positions[offset + i];
-                boolean positionIsNull = isNull(position);
-                newRowIsNull[i] = positionIsNull;
-                fieldBlockPositions[fieldBlockPositionCount] = getFieldBlockOffset(position);
-                fieldBlockPositionCount += positionIsNull ? 0 : 1;
-            }
-            // Record last offset position
-            newOffsets[length] = fieldBlockPositionCount;
-            if (fieldBlockPositionCount == length) {
-                // No nulls encountered, discard the null mask and offsets
-                newRowIsNull = null;
-                newOffsets = null;
-            }
-        }
-
-        Block[] newBlocks = new Block[numFields];
-        Block[] rawBlocks = getRawFieldBlocks();
-        for (int i = 0; i < newBlocks.length; i++) {
-            newBlocks[i] = rawBlocks[i].copyPositions(fieldBlockPositions, 0, fieldBlockPositionCount);
-        }
-        return createRowBlockInternal(0, length, newRowIsNull, newOffsets, newBlocks);
-    }
-
-    @Override
-    public Block getRegion(int position, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        return createRowBlockInternal(position + getOffsetBase(), length, getRowIsNull(), getFieldBlockOffsets(), getRawFieldBlocks());
-    }
-
-    @Override
-    public final OptionalInt fixedSizeInBytesPerPosition()
-    {
-        if (!mayHaveNull()) {
-            // when null rows are present, we can't use the fixed field sizes to infer the correct
-            // size for arbitrary position selection
-            OptionalInt fieldSize = fixedSizeInBytesPerFieldPosition();
-            if (fieldSize.isPresent()) {
-                // must include the row block overhead in addition to the per position size in bytes
-                return OptionalInt.of(fieldSize.getAsInt() + (Integer.BYTES + Byte.BYTES)); // offsets + rowIsNull
-            }
-        }
-        return OptionalInt.empty();
-    }
-
-    /**
-     * Returns the combined {@link Block#fixedSizeInBytesPerPosition()} value for all fields, assuming all
-     * are fixed size. If any field is not fixed size, then no value will be returned. This does <i>not</i>
-     * include the size-per-position overhead associated with the {@link AbstractRowBlock} itself, only of
-     * the constituent field members.
-     */
-    private OptionalInt fixedSizeInBytesPerFieldPosition()
-    {
-        Block[] rawFieldBlocks = getRawFieldBlocks();
-        int fixedSizePerRow = 0;
-        for (int i = 0; i < numFields; i++) {
-            OptionalInt fieldFixedSize = rawFieldBlocks[i].fixedSizeInBytesPerPosition();
-            if (fieldFixedSize.isEmpty()) {
-                return OptionalInt.empty(); // found a block without a single per-position size
-            }
-            fixedSizePerRow += fieldFixedSize.getAsInt();
-        }
-        return OptionalInt.of(fixedSizePerRow);
-    }
-
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        int startFieldBlockOffset = getFieldBlockOffset(position);
-        int endFieldBlockOffset = getFieldBlockOffset(position + length);
-        int fieldBlockLength = endFieldBlockOffset - startFieldBlockOffset;
-
-        long regionSizeInBytes = (Integer.BYTES + Byte.BYTES) * (long) length;
-        for (int i = 0; i < numFields; i++) {
-            regionSizeInBytes += getRawFieldBlocks()[i].getRegionSizeInBytes(startFieldBlockOffset, fieldBlockLength);
-        }
-        return regionSizeInBytes;
-    }
-
-    @Override
-    public final long getPositionsSizeInBytes(boolean[] positions, int selectedRowPositions)
-    {
-        int positionCount = getPositionCount();
-        checkValidPositions(positions, positionCount);
-        if (selectedRowPositions == 0) {
-            return 0;
-        }
-        if (selectedRowPositions == positionCount) {
-            return getSizeInBytes();
-        }
-
-        OptionalInt fixedSizePerFieldPosition = fixedSizeInBytesPerFieldPosition();
-        if (fixedSizePerFieldPosition.isPresent()) {
-            // All field blocks are fixed size per position, no specific position mapping is necessary
-            int selectedFieldPositionCount = selectedRowPositions;
-            boolean[] rowIsNull = getRowIsNull();
-            if (rowIsNull != null) {
-                // Some positions in usedPositions may be null which must be removed from the selectedFieldPositionCount
-                int offsetBase = getOffsetBase();
-                for (int i = 0; i < positions.length; i++) {
-                    if (positions[i] && rowIsNull[i + offsetBase]) {
-                        selectedFieldPositionCount--; // selected row is null, don't include it in the selected field positions
-                    }
-                }
-                if (selectedFieldPositionCount < 0) {
-                    throw new IllegalStateException("Invalid field position selection after nulls removed: " + selectedFieldPositionCount);
-                }
-            }
-            return ((Integer.BYTES + Byte.BYTES) * (long) selectedRowPositions) + (fixedSizePerFieldPosition.getAsInt() * (long) selectedFieldPositionCount);
-        }
-
-        // Fall back to specific position size calculations
-        return getSpecificPositionsSizeInBytes(positions, selectedRowPositions);
-    }
-
-    private long getSpecificPositionsSizeInBytes(boolean[] positions, int selectedRowPositions)
-    {
-        int positionCount = getPositionCount();
-        int offsetBase = getOffsetBase();
-        boolean[] rowIsNull = getRowIsNull();
-        // No fixed width size per row, specific positions used must be tracked
-        int totalFieldPositions = getRawFieldBlocks()[0].getPositionCount();
-        boolean[] fieldPositions;
-        int selectedFieldPositionCount;
-        if (rowIsNull == null) {
-            // No nulls, so the same number of positions are used
-            selectedFieldPositionCount = selectedRowPositions;
-            if (offsetBase == 0 && positionCount == totalFieldPositions) {
-                // No need to adapt the positions array at all, reuse it directly
-                fieldPositions = positions;
-            }
-            else {
-                // no nulls present, so we can just shift the positions array into alignment with the elements block with other positions unused
-                fieldPositions = new boolean[totalFieldPositions];
-                System.arraycopy(positions, 0, fieldPositions, offsetBase, positions.length);
-            }
-        }
-        else {
-            fieldPositions = new boolean[totalFieldPositions];
-            selectedFieldPositionCount = 0;
-            for (int i = 0; i < positions.length; i++) {
-                if (positions[i] && !rowIsNull[offsetBase + i]) {
-                    selectedFieldPositionCount++;
-                    fieldPositions[getFieldBlockOffset(i)] = true;
-                }
-            }
-        }
-
-        Block[] rawFieldBlocks = getRawFieldBlocks();
-        long sizeInBytes = ((Integer.BYTES + Byte.BYTES) * (long) selectedRowPositions); // offsets + rowIsNull
-        for (int j = 0; j < numFields; j++) {
-            sizeInBytes += rawFieldBlocks[j].getPositionsSizeInBytes(fieldPositions, selectedFieldPositionCount);
-        }
-        return sizeInBytes;
-    }
-
-    @Override
-    public Block copyRegion(int position, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        int startFieldBlockOffset = getFieldBlockOffset(position);
-        int endFieldBlockOffset = getFieldBlockOffset(position + length);
-        int fieldBlockLength = endFieldBlockOffset - startFieldBlockOffset;
-        Block[] newBlocks = new Block[numFields];
-        for (int i = 0; i < numFields; i++) {
-            newBlocks[i] = getRawFieldBlocks()[i].copyRegion(startFieldBlockOffset, fieldBlockLength);
-        }
-        int[] fieldBlockOffsets = getFieldBlockOffsets();
-        int[] newOffsets = fieldBlockOffsets == null ? null : compactOffsets(fieldBlockOffsets, position + getOffsetBase(), length);
-        boolean[] rowIsNull = getRowIsNull();
-        boolean[] newRowIsNull = rowIsNull == null ? null : compactArray(rowIsNull, position + getOffsetBase(), length);
-
-        if (arraySame(newBlocks, getRawFieldBlocks()) && newOffsets == fieldBlockOffsets && newRowIsNull == rowIsNull) {
-            return this;
-        }
-        return createRowBlockInternal(0, length, newRowIsNull, newOffsets, newBlocks);
-    }
-
-    @Override
-    public <T> T getObject(int position, Class<T> clazz)
-    {
-        if (clazz != Block.class) {
-            throw new IllegalArgumentException("clazz must be Block.class");
-        }
-        checkReadablePosition(this, position);
-
-        return clazz.cast(new SingleRowBlock(getFieldBlockOffset(position), getRawFieldBlocks()));
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        checkReadablePosition(this, position);
-
-        int startFieldBlockOffset = getFieldBlockOffset(position);
-        int endFieldBlockOffset = getFieldBlockOffset(position + 1);
-        int fieldBlockLength = endFieldBlockOffset - startFieldBlockOffset;
-        Block[] newBlocks = new Block[numFields];
-        for (int i = 0; i < numFields; i++) {
-            newBlocks[i] = getRawFieldBlocks()[i].copyRegion(startFieldBlockOffset, fieldBlockLength);
-        }
-        boolean[] newRowIsNull = isNull(position) ? new boolean[] {true} : null;
-        int[] newOffsets = isNull(position) ? new int[] {0, fieldBlockLength} : null;
-
-        return createRowBlockInternal(0, 1, newRowIsNull, newOffsets, newBlocks);
-    }
-
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        checkReadablePosition(this, position);
-
-        if (isNull(position)) {
-            return 0;
-        }
-
-        Block[] rawFieldBlocks = getRawFieldBlocks();
-        long size = 0;
-        for (int i = 0; i < numFields; i++) {
-            size += rawFieldBlocks[i].getEstimatedDataSizeForStats(getFieldBlockOffset(position));
-        }
-        return size;
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkReadablePosition(this, position);
-        boolean[] rowIsNull = getRowIsNull();
-        return rowIsNull != null && rowIsNull[position + getOffsetBase()];
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractSingleArrayBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/AbstractSingleArrayBlock.java
deleted file mode 100644
index 13fe12bb783b..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractSingleArrayBlock.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.airlift.slice.Slice;
-
-import java.util.List;
-
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-import static java.util.Collections.singletonList;
-
-public abstract class AbstractSingleArrayBlock
-        implements Block
-{
-    protected final int start;
-
-    protected AbstractSingleArrayBlock(int start)
-    {
-        this.start = start;
-    }
-
-    @Override
-    public final List<Block> getChildren()
-    {
-        return singletonList(getBlock());
-    }
-
-    protected abstract Block getBlock();
-
-    @Override
-    public int getSliceLength(int position)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().getSliceLength(position + start);
-    }
-
-    @Override
-    public byte getByte(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().getByte(position + start, offset);
-    }
-
-    @Override
-    public short getShort(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().getShort(position + start, offset);
-    }
-
-    @Override
-    public int getInt(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().getInt(position + start, offset);
-    }
-
-    @Override
-    public long getLong(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().getLong(position + start, offset);
-    }
-
-    @Override
-    public Slice getSlice(int position, int offset, int length)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().getSlice(position + start, offset, length);
-    }
-
-    @Override
-    public <T> T getObject(int position, Class<T> clazz)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().getObject(position + start, clazz);
-    }
-
-    @Override
-    public boolean bytesEqual(int position, int offset, Slice otherSlice, int otherOffset, int length)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().bytesEqual(position + start, offset, otherSlice, otherOffset, length);
-    }
-
-    @Override
-    public int bytesCompare(int position, int offset, int length, Slice otherSlice, int otherOffset, int otherLength)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().bytesCompare(position + start, offset, length, otherSlice, otherOffset, otherLength);
-    }
-
-    @Override
-    public void writeBytesTo(int position, int offset, int length, BlockBuilder blockBuilder)
-    {
-        checkReadablePosition(this, position);
-        getBlock().writeBytesTo(position + start, offset, length, blockBuilder);
-    }
-
-    @Override
-    public boolean equals(int position, int offset, Block otherBlock, int otherPosition, int otherOffset, int length)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().equals(position + start, offset, otherBlock, otherPosition, otherOffset, length);
-    }
-
-    @Override
-    public long hash(int position, int offset, int length)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().hash(position + start, offset, length);
-    }
-
-    @Override
-    public int compareTo(int leftPosition, int leftOffset, int leftLength, Block rightBlock, int rightPosition, int rightOffset, int rightLength)
-    {
-        checkReadablePosition(this, leftPosition);
-        return getBlock().compareTo(leftPosition + start, leftOffset, leftLength, rightBlock, rightPosition, rightOffset, rightLength);
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().getSingleValueBlock(position + start);
-    }
-
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().getEstimatedDataSizeForStats(position + start);
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkReadablePosition(this, position);
-        return getBlock().isNull(position + start);
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        // SingleArrayBlockEncoding does not exist
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Block getRegion(int position, int length)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionsCount)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Block copyRegion(int position, int length)
-    {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractSingleMapBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/AbstractSingleMapBlock.java
deleted file mode 100644
index 72d5b2fb7d95..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractSingleMapBlock.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.airlift.slice.Slice;
-
-import java.util.List;
-
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-
-public abstract class AbstractSingleMapBlock
-        implements Block
-{
-    abstract int getOffset();
-
-    @Override
-    public final List<Block> getChildren()
-    {
-        return List.of(getRawKeyBlock(), getRawValueBlock());
-    }
-
-    abstract Block getRawKeyBlock();
-
-    abstract Block getRawValueBlock();
-
-    private int getAbsolutePosition(int position)
-    {
-        checkReadablePosition(this, position);
-        return position + getOffset();
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            if (getRawKeyBlock().isNull(position / 2)) {
-                throw new IllegalStateException("Map key is null");
-            }
-            return false;
-        }
-        return getRawValueBlock().isNull(position / 2);
-    }
-
-    @Override
-    public byte getByte(int position, int offset)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().getByte(position / 2, offset);
-        }
-        return getRawValueBlock().getByte(position / 2, offset);
-    }
-
-    @Override
-    public short getShort(int position, int offset)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().getShort(position / 2, offset);
-        }
-        return getRawValueBlock().getShort(position / 2, offset);
-    }
-
-    @Override
-    public int getInt(int position, int offset)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().getInt(position / 2, offset);
-        }
-        return getRawValueBlock().getInt(position / 2, offset);
-    }
-
-    @Override
-    public long getLong(int position, int offset)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().getLong(position / 2, offset);
-        }
-        return getRawValueBlock().getLong(position / 2, offset);
-    }
-
-    @Override
-    public Slice getSlice(int position, int offset, int length)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().getSlice(position / 2, offset, length);
-        }
-        return getRawValueBlock().getSlice(position / 2, offset, length);
-    }
-
-    @Override
-    public int getSliceLength(int position)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().getSliceLength(position / 2);
-        }
-        return getRawValueBlock().getSliceLength(position / 2);
-    }
-
-    @Override
-    public int compareTo(int position, int offset, int length, Block otherBlock, int otherPosition, int otherOffset, int otherLength)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().compareTo(position / 2, offset, length, otherBlock, otherPosition, otherOffset, otherLength);
-        }
-        return getRawValueBlock().compareTo(position / 2, offset, length, otherBlock, otherPosition, otherOffset, otherLength);
-    }
-
-    @Override
-    public boolean bytesEqual(int position, int offset, Slice otherSlice, int otherOffset, int length)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().bytesEqual(position / 2, offset, otherSlice, otherOffset, length);
-        }
-        return getRawValueBlock().bytesEqual(position / 2, offset, otherSlice, otherOffset, length);
-    }
-
-    @Override
-    public int bytesCompare(int position, int offset, int length, Slice otherSlice, int otherOffset, int otherLength)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().bytesCompare(position / 2, offset, length, otherSlice, otherOffset, otherLength);
-        }
-        return getRawValueBlock().bytesCompare(position / 2, offset, length, otherSlice, otherOffset, otherLength);
-    }
-
-    @Override
-    public void writeBytesTo(int position, int offset, int length, BlockBuilder blockBuilder)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            getRawKeyBlock().writeBytesTo(position / 2, offset, length, blockBuilder);
-        }
-        else {
-            getRawValueBlock().writeBytesTo(position / 2, offset, length, blockBuilder);
-        }
-    }
-
-    @Override
-    public boolean equals(int position, int offset, Block otherBlock, int otherPosition, int otherOffset, int length)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().equals(position / 2, offset, otherBlock, otherPosition, otherOffset, length);
-        }
-        return getRawValueBlock().equals(position / 2, offset, otherBlock, otherPosition, otherOffset, length);
-    }
-
-    @Override
-    public long hash(int position, int offset, int length)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().hash(position / 2, offset, length);
-        }
-        return getRawValueBlock().hash(position / 2, offset, length);
-    }
-
-    @Override
-    public <T> T getObject(int position, Class<T> clazz)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().getObject(position / 2, clazz);
-        }
-        return getRawValueBlock().getObject(position / 2, clazz);
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().getSingleValueBlock(position / 2);
-        }
-        return getRawValueBlock().getSingleValueBlock(position / 2);
-    }
-
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        position = getAbsolutePosition(position);
-        if (position % 2 == 0) {
-            return getRawKeyBlock().getEstimatedDataSizeForStats(position / 2);
-        }
-        return getRawValueBlock().getEstimatedDataSizeForStats(position / 2);
-    }
-
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionsCount)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Block getRegion(int positionOffset, int length)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Block copyRegion(int position, int length)
-    {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractSingleRowBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/AbstractSingleRowBlock.java
deleted file mode 100644
index 22d736dd54da..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractSingleRowBlock.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.airlift.slice.Slice;
-
-import java.util.List;
-
-public abstract class AbstractSingleRowBlock
-        implements Block
-{
-    @Override
-    public final List<Block> getChildren()
-    {
-        return List.of(getRawFieldBlocks());
-    }
-
-    abstract Block[] getRawFieldBlocks();
-
-    protected abstract Block getRawFieldBlock(int fieldIndex);
-
-    protected abstract int getRowIndex();
-
-    private void checkFieldIndex(int position)
-    {
-        if (position < 0 || position >= getPositionCount()) {
-            throw new IllegalArgumentException("position is not valid: " + position);
-        }
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).isNull(getRowIndex());
-    }
-
-    @Override
-    public byte getByte(int position, int offset)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).getByte(getRowIndex(), offset);
-    }
-
-    @Override
-    public short getShort(int position, int offset)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).getShort(getRowIndex(), offset);
-    }
-
-    @Override
-    public int getInt(int position, int offset)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).getInt(getRowIndex(), offset);
-    }
-
-    @Override
-    public long getLong(int position, int offset)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).getLong(getRowIndex(), offset);
-    }
-
-    @Override
-    public Slice getSlice(int position, int offset, int length)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).getSlice(getRowIndex(), offset, length);
-    }
-
-    @Override
-    public int getSliceLength(int position)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).getSliceLength(getRowIndex());
-    }
-
-    @Override
-    public int compareTo(int position, int offset, int length, Block otherBlock, int otherPosition, int otherOffset, int otherLength)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).compareTo(getRowIndex(), offset, length, otherBlock, otherPosition, otherOffset, otherLength);
-    }
-
-    @Override
-    public boolean bytesEqual(int position, int offset, Slice otherSlice, int otherOffset, int length)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).bytesEqual(getRowIndex(), offset, otherSlice, otherOffset, length);
-    }
-
-    @Override
-    public int bytesCompare(int position, int offset, int length, Slice otherSlice, int otherOffset, int otherLength)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).bytesCompare(getRowIndex(), offset, length, otherSlice, otherOffset, otherLength);
-    }
-
-    @Override
-    public void writeBytesTo(int position, int offset, int length, BlockBuilder blockBuilder)
-    {
-        checkFieldIndex(position);
-        getRawFieldBlock(position).writeBytesTo(getRowIndex(), offset, length, blockBuilder);
-    }
-
-    @Override
-    public boolean equals(int position, int offset, Block otherBlock, int otherPosition, int otherOffset, int length)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).equals(getRowIndex(), offset, otherBlock, otherPosition, otherOffset, length);
-    }
-
-    @Override
-    public long hash(int position, int offset, int length)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).hash(getRowIndex(), offset, length);
-    }
-
-    @Override
-    public <T> T getObject(int position, Class<T> clazz)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).getObject(getRowIndex(), clazz);
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).getSingleValueBlock(getRowIndex());
-    }
-
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        checkFieldIndex(position);
-        return getRawFieldBlock(position).getEstimatedDataSizeForStats(getRowIndex());
-    }
-
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionsCount)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Block getRegion(int positionOffset, int length)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Block copyRegion(int position, int length)
-    {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractVariableWidthBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/AbstractVariableWidthBlock.java
deleted file mode 100644
index 597c4833c365..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/AbstractVariableWidthBlock.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-import io.airlift.slice.XxHash64;
-
-import static io.airlift.slice.Slices.EMPTY_SLICE;
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-
-public abstract class AbstractVariableWidthBlock
-        implements Block
-{
-    protected abstract Slice getRawSlice(int position);
-
-    protected abstract int getPositionOffset(int position);
-
-    protected abstract boolean isEntryNull(int position);
-
-    @Override
-    public String getEncodingName()
-    {
-        return VariableWidthBlockEncoding.NAME;
-    }
-
-    @Override
-    public byte getByte(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        return getRawSlice(position).getByte(getPositionOffset(position) + offset);
-    }
-
-    @Override
-    public short getShort(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        return getRawSlice(position).getShort(getPositionOffset(position) + offset);
-    }
-
-    @Override
-    public int getInt(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        return getRawSlice(position).getInt(getPositionOffset(position) + offset);
-    }
-
-    @Override
-    public long getLong(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        return getRawSlice(position).getLong(getPositionOffset(position) + offset);
-    }
-
-    @Override
-    public Slice getSlice(int position, int offset, int length)
-    {
-        checkReadablePosition(this, position);
-        return getRawSlice(position).slice(getPositionOffset(position) + offset, length);
-    }
-
-    @Override
-    public boolean equals(int position, int offset, Block otherBlock, int otherPosition, int otherOffset, int length)
-    {
-        checkReadablePosition(this, position);
-        Slice rawSlice = getRawSlice(position);
-        if (getSliceLength(position) < length) {
-            return false;
-        }
-        return otherBlock.bytesEqual(otherPosition, otherOffset, rawSlice, getPositionOffset(position) + offset, length);
-    }
-
-    @Override
-    public boolean bytesEqual(int position, int offset, Slice otherSlice, int otherOffset, int length)
-    {
-        checkReadablePosition(this, position);
-        return getRawSlice(position).equals(getPositionOffset(position) + offset, length, otherSlice, otherOffset, length);
-    }
-
-    @Override
-    public long hash(int position, int offset, int length)
-    {
-        checkReadablePosition(this, position);
-        return XxHash64.hash(getRawSlice(position), getPositionOffset(position) + offset, length);
-    }
-
-    @Override
-    public int compareTo(int position, int offset, int length, Block otherBlock, int otherPosition, int otherOffset, int otherLength)
-    {
-        checkReadablePosition(this, position);
-        Slice rawSlice = getRawSlice(position);
-        if (getSliceLength(position) < length) {
-            throw new IllegalArgumentException("Length longer than value length");
-        }
-        return -otherBlock.bytesCompare(otherPosition, otherOffset, otherLength, rawSlice, getPositionOffset(position) + offset, length);
-    }
-
-    @Override
-    public int bytesCompare(int position, int offset, int length, Slice otherSlice, int otherOffset, int otherLength)
-    {
-        checkReadablePosition(this, position);
-        return getRawSlice(position).compareTo(getPositionOffset(position) + offset, length, otherSlice, otherOffset, otherLength);
-    }
-
-    @Override
-    public void writeBytesTo(int position, int offset, int length, BlockBuilder blockBuilder)
-    {
-        checkReadablePosition(this, position);
-        blockBuilder.writeBytes(getRawSlice(position), getPositionOffset(position) + offset, length);
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        if (isNull(position)) {
-            return new VariableWidthBlock(0, 1, EMPTY_SLICE, new int[] {0, 0}, new boolean[] {true});
-        }
-
-        int offset = getPositionOffset(position);
-        int entrySize = getSliceLength(position);
-
-        Slice copy = Slices.copyOf(getRawSlice(position), offset, entrySize);
-
-        return new VariableWidthBlock(0, 1, copy, new int[] {0, copy.length()}, null);
-    }
-
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        return isNull(position) ? 0 : getSliceLength(position);
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkReadablePosition(this, position);
-        return isEntryNull(position);
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlock.java
index d4bdbe3a0bdb..9aad1d9da67e 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlock.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlock.java
@@ -13,20 +13,31 @@
  */
 package io.trino.spi.block;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
+import java.util.List;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.function.ObjLongConsumer;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.spi.block.BlockUtil.checkArrayRange;
+import static io.trino.spi.block.BlockUtil.checkReadablePosition;
+import static io.trino.spi.block.BlockUtil.checkValidPositions;
+import static io.trino.spi.block.BlockUtil.checkValidRegion;
+import static io.trino.spi.block.BlockUtil.compactArray;
+import static io.trino.spi.block.BlockUtil.compactOffsets;
 import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
 import static io.trino.spi.block.BlockUtil.copyOffsetsAndAppendNull;
+import static io.trino.spi.block.BlockUtil.countAndMarkSelectedPositionsFromOffsets;
+import static io.trino.spi.block.BlockUtil.countSelectedPositionsFromOffsets;
 import static java.lang.String.format;
+import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
 
-public class ArrayBlock
-        extends AbstractArrayBlock
+public final class ArrayBlock
+        implements ValueBlock
 {
     private static final int INSTANCE_SIZE = instanceSize(ArrayBlock.class);
 
@@ -43,7 +54,7 @@ public class ArrayBlock
      * Create an array block directly from columnar nulls, values, and offsets into the values.
      * A null array must have no entries.
      */
-    public static Block fromElementBlock(int positionCount, Optional<boolean[]> valueIsNullOptional, int[] arrayOffset, Block values)
+    public static ArrayBlock fromElementBlock(int positionCount, Optional<boolean[]> valueIsNullOptional, int[] arrayOffset, Block values)
     {
         boolean[] valueIsNull = valueIsNullOptional.orElse(null);
         validateConstructorArguments(0, positionCount, valueIsNull, arrayOffset, values);
@@ -62,7 +73,7 @@ public static Block fromElementBlock(int positionCount, Optional<boolean[]> valu
     }
 
     /**
-     * Create an array block directly without per element validations.
+     * Create an array block directly without per-element validations.
      */
     static ArrayBlock createArrayBlockInternal(int arrayOffset, int positionCount, @Nullable boolean[] valueIsNull, int[] offsets, Block values)
     {
@@ -156,29 +167,31 @@ public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
         consumer.accept(this, INSTANCE_SIZE);
     }
 
-    @Override
-    protected Block getRawElementBlock()
+    Block getRawElementBlock()
     {
         return values;
     }
 
-    @Override
-    protected int[] getOffsets()
+    int[] getOffsets()
     {
         return offsets;
     }
 
-    @Override
-    protected int getOffsetBase()
+    int getOffsetBase()
     {
         return arrayOffset;
     }
 
     @Override
-    @Nullable
-    protected boolean[] getValueIsNull()
+    public List<Block> getChildren()
+    {
+        return singletonList(values);
+    }
+
+    @Override
+    public String getEncodingName()
     {
-        return valueIsNull;
+        return ArrayBlockEncoding.NAME;
     }
 
     @Override
@@ -203,7 +216,7 @@ public boolean isLoaded()
     }
 
     @Override
-    public Block getLoadedBlock()
+    public ArrayBlock getLoadedBlock()
     {
         Block loadedValuesBlock = values.getLoadedBlock();
 
@@ -219,16 +232,216 @@ public Block getLoadedBlock()
     }
 
     @Override
-    public Block copyWithAppendedNull()
+    public ArrayBlock copyWithAppendedNull()
     {
-        boolean[] newValueIsNull = copyIsNullAndAppendNull(getValueIsNull(), getOffsetBase(), getPositionCount());
-        int[] newOffsets = copyOffsetsAndAppendNull(getOffsets(), getOffsetBase(), getPositionCount());
+        boolean[] newValueIsNull = copyIsNullAndAppendNull(valueIsNull, arrayOffset, getPositionCount());
+        int[] newOffsets = copyOffsetsAndAppendNull(offsets, arrayOffset, getPositionCount());
 
         return createArrayBlockInternal(
-                getOffsetBase(),
+                arrayOffset,
                 getPositionCount() + 1,
                 newValueIsNull,
                 newOffsets,
-                getRawElementBlock());
+                values);
+    }
+
+    @Override
+    public ArrayBlock copyPositions(int[] positions, int offset, int length)
+    {
+        checkArrayRange(positions, offset, length);
+
+        int[] newOffsets = new int[length + 1];
+        newOffsets[0] = 0;
+        boolean[] newValueIsNull = valueIsNull == null ? null : new boolean[length];
+
+        IntArrayList valuesPositions = new IntArrayList();
+        for (int i = 0; i < length; i++) {
+            int position = positions[offset + i];
+            if (newValueIsNull != null && isNull(position)) {
+                newValueIsNull[i] = true;
+                newOffsets[i + 1] = newOffsets[i];
+            }
+            else {
+                int valuesStartOffset = offsets[position + arrayOffset];
+                int valuesEndOffset = offsets[position + 1 + arrayOffset];
+                int valuesLength = valuesEndOffset - valuesStartOffset;
+
+                newOffsets[i + 1] = newOffsets[i] + valuesLength;
+
+                for (int elementIndex = valuesStartOffset; elementIndex < valuesEndOffset; elementIndex++) {
+                    valuesPositions.add(elementIndex);
+                }
+            }
+        }
+        Block newValues = values.copyPositions(valuesPositions.elements(), 0, valuesPositions.size());
+        return createArrayBlockInternal(0, length, newValueIsNull, newOffsets, newValues);
+    }
+
+    @Override
+    public ArrayBlock getRegion(int position, int length)
+    {
+        int positionCount = getPositionCount();
+        checkValidRegion(positionCount, position, length);
+
+        return createArrayBlockInternal(
+                position + arrayOffset,
+                length,
+                valueIsNull,
+                offsets,
+                values);
+    }
+
+    @Override
+    public OptionalInt fixedSizeInBytesPerPosition()
+    {
+        return OptionalInt.empty(); // size per position varies based on the number of entries in each array
+    }
+
+    @Override
+    public long getRegionSizeInBytes(int position, int length)
+    {
+        int positionCount = getPositionCount();
+        checkValidRegion(positionCount, position, length);
+
+        int valueStart = offsets[arrayOffset + position];
+        int valueEnd = offsets[arrayOffset + position + length];
+
+        return values.getRegionSizeInBytes(valueStart, valueEnd - valueStart) + ((Integer.BYTES + Byte.BYTES) * (long) length);
+    }
+
+    @Override
+    public long getPositionsSizeInBytes(boolean[] positions, int selectedArrayPositions)
+    {
+        int positionCount = getPositionCount();
+        checkValidPositions(positions, positionCount);
+        if (selectedArrayPositions == 0) {
+            return 0;
+        }
+        if (selectedArrayPositions == positionCount) {
+            return getSizeInBytes();
+        }
+
+        Block rawElementBlock = values;
+        OptionalInt fixedPerElementSizeInBytes = rawElementBlock.fixedSizeInBytesPerPosition();
+        int[] offsets = this.offsets;
+        int offsetBase = arrayOffset;
+        long sizeInBytes;
+
+        if (fixedPerElementSizeInBytes.isPresent()) {
+            sizeInBytes = fixedPerElementSizeInBytes.getAsInt() * (long) countSelectedPositionsFromOffsets(positions, offsets, offsetBase);
+        }
+        else if (rawElementBlock instanceof RunLengthEncodedBlock) {
+            // RLE blocks don't have a fixed-size per position, but accept null for the position array
+            sizeInBytes = rawElementBlock.getPositionsSizeInBytes(null, countSelectedPositionsFromOffsets(positions, offsets, offsetBase));
+        }
+        else {
+            boolean[] selectedElements = new boolean[rawElementBlock.getPositionCount()];
+            int selectedElementCount = countAndMarkSelectedPositionsFromOffsets(positions, offsets, offsetBase, selectedElements);
+            sizeInBytes = rawElementBlock.getPositionsSizeInBytes(selectedElements, selectedElementCount);
+        }
+        return sizeInBytes + ((Integer.BYTES + Byte.BYTES) * (long) selectedArrayPositions);
+    }
+
+    @Override
+    public ArrayBlock copyRegion(int position, int length)
+    {
+        int positionCount = getPositionCount();
+        checkValidRegion(positionCount, position, length);
+
+        int startValueOffset = offsets[position + arrayOffset];
+        int endValueOffset = offsets[position + length + arrayOffset];
+        Block newValues = values.copyRegion(startValueOffset, endValueOffset - startValueOffset);
+
+        int[] newOffsets = compactOffsets(offsets, position + arrayOffset, length);
+        boolean[] valueIsNull = this.valueIsNull;
+        boolean[] newValueIsNull;
+        newValueIsNull = valueIsNull == null ? null : compactArray(valueIsNull, position + arrayOffset, length);
+
+        if (newValues == values && newOffsets == offsets && newValueIsNull == valueIsNull) {
+            return this;
+        }
+        return createArrayBlockInternal(0, length, newValueIsNull, newOffsets, newValues);
+    }
+
+    @Override
+    public <T> T getObject(int position, Class<T> clazz)
+    {
+        if (clazz != Block.class) {
+            throw new IllegalArgumentException("clazz must be Block.class");
+        }
+        return clazz.cast(getArray(position));
+    }
+
+    public Block getArray(int position)
+    {
+        checkReadablePosition(this, position);
+        int startValueOffset = offsets[position + arrayOffset];
+        int endValueOffset = offsets[position + 1 + arrayOffset];
+        return values.getRegion(startValueOffset, endValueOffset - startValueOffset);
+    }
+
+    @Override
+    public ArrayBlock getSingleValueBlock(int position)
+    {
+        checkReadablePosition(this, position);
+
+        int startValueOffset = offsets[position + arrayOffset];
+        int valueLength = offsets[position + 1 + arrayOffset] - startValueOffset;
+        Block newValues = values.copyRegion(startValueOffset, valueLength);
+
+        return createArrayBlockInternal(
+                0,
+                1,
+                isNull(position) ? new boolean[] {true} : null,
+                new int[] {0, valueLength},
+                newValues);
+    }
+
+    @Override
+    public long getEstimatedDataSizeForStats(int position)
+    {
+        checkReadablePosition(this, position);
+
+        if (isNull(position)) {
+            return 0;
+        }
+
+        int startValueOffset = offsets[position + arrayOffset];
+        int endValueOffset = offsets[position + 1 + arrayOffset];
+
+        Block rawElementBlock = values;
+        long size = 0;
+        for (int i = startValueOffset; i < endValueOffset; i++) {
+            size += rawElementBlock.getEstimatedDataSizeForStats(i);
+        }
+        return size;
+    }
+
+    @Override
+    public boolean isNull(int position)
+    {
+        checkReadablePosition(this, position);
+        boolean[] valueIsNull = this.valueIsNull;
+        return valueIsNull != null && valueIsNull[position + arrayOffset];
+    }
+
+    @Override
+    public ArrayBlock getUnderlyingValueBlock()
+    {
+        return this;
+    }
+
+    public <T> T apply(ArrayBlockFunction<T> function, int position)
+    {
+        checkReadablePosition(this, position);
+
+        int startValueOffset = offsets[position + arrayOffset];
+        int endValueOffset = offsets[position + 1 + arrayOffset];
+        return function.apply(values, startValueOffset, endValueOffset - startValueOffset);
+    }
+
+    public interface ArrayBlockFunction<T>
+    {
+        T apply(Block block, int startPosition, int length);
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlockBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlockBuilder.java
index 2b53dc8f952e..df28648003e7 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlockBuilder.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlockBuilder.java
@@ -14,22 +14,17 @@
 package io.trino.spi.block;
 
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
-import java.util.function.ObjLongConsumer;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.trino.spi.block.ArrayBlock.createArrayBlockInternal;
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
 import static java.lang.Math.max;
 import static java.util.Objects.requireNonNull;
 
 public class ArrayBlockBuilder
-        extends AbstractArrayBlock
         implements BlockBuilder
 {
     private static final int INSTANCE_SIZE = instanceSize(ArrayBlockBuilder.class);
@@ -108,66 +103,17 @@ public long getRetainedSizeInBytes()
         return retainedSizeInBytes + values.getRetainedSizeInBytes();
     }
 
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(values, values.getRetainedSizeInBytes());
-        consumer.accept(offsets, sizeOf(offsets));
-        consumer.accept(valueIsNull, sizeOf(valueIsNull));
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
-    @Override
-    protected Block getRawElementBlock()
-    {
-        return values;
-    }
-
-    @Override
-    protected int[] getOffsets()
-    {
-        return offsets;
-    }
-
-    @Override
-    protected int getOffsetBase()
-    {
-        return 0;
-    }
-
-    @Nullable
-    @Override
-    protected boolean[] getValueIsNull()
-    {
-        return hasNullValue ? valueIsNull : null;
-    }
-
-    @Override
-    public boolean mayHaveNull()
-    {
-        return hasNullValue;
-    }
-
-    @Override
-    public SingleArrayBlockWriter beginBlockEntry()
+    public <E extends Throwable> void buildEntry(ArrayValueBuilder<E> builder)
+            throws E
     {
         if (currentEntryOpened) {
             throw new IllegalStateException("Expected current entry to be closed but was opened");
         }
-        currentEntryOpened = true;
-        return new SingleArrayBlockWriter(values, values.getPositionCount());
-    }
-
-    @Override
-    public BlockBuilder closeEntry()
-    {
-        if (!currentEntryOpened) {
-            throw new IllegalStateException("Expected entry to be opened but was closed");
-        }
 
+        currentEntryOpened = true;
+        builder.build(values);
         entryAdded(false);
         currentEntryOpened = false;
-        return this;
     }
 
     @Override
@@ -230,6 +176,15 @@ public Block build()
         if (!hasNonNullRow) {
             return nullRle(positionCount);
         }
+        return buildValueBlock();
+    }
+
+    @Override
+    public ValueBlock buildValueBlock()
+    {
+        if (currentEntryOpened) {
+            throw new IllegalStateException("Current entry must be closed before the block can be built");
+        }
         return createArrayBlockInternal(0, positionCount, hasNullValue ? valueIsNull : null, offsets, values.build());
     }
 
@@ -248,41 +203,6 @@ public String toString()
         return sb.toString();
     }
 
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        if (!hasNonNullRow) {
-            return nullRle(length);
-        }
-        return super.copyPositions(positions, offset, length);
-    }
-
-    @Override
-    public Block getRegion(int position, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        if (!hasNonNullRow) {
-            return nullRle(length);
-        }
-        return super.getRegion(position, length);
-    }
-
-    @Override
-    public Block copyRegion(int position, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        if (!hasNonNullRow) {
-            return nullRle(length);
-        }
-        return super.copyRegion(position, length);
-    }
-
     private Block nullRle(int positionCount)
     {
         ArrayBlock nullValueBlock = createArrayBlockInternal(0, 1, new boolean[] {true}, new int[] {0, 0}, values.newBlockBuilderLike(null).build());
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlockEncoding.java
index 467405365af9..ad01d4128132 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlockEncoding.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ArrayBlockEncoding.java
@@ -15,7 +15,6 @@
 
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.SliceOutput;
-import io.airlift.slice.Slices;
 
 import static io.trino.spi.block.ArrayBlock.createArrayBlockInternal;
 import static io.trino.spi.block.EncoderUtil.decodeNullBits;
@@ -35,7 +34,7 @@ public String getName()
     @Override
     public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
     {
-        AbstractArrayBlock arrayBlock = (AbstractArrayBlock) block;
+        ArrayBlock arrayBlock = (ArrayBlock) block;
 
         int positionCount = arrayBlock.getPositionCount();
 
@@ -51,17 +50,17 @@ public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceO
         for (int position = 0; position < positionCount + 1; position++) {
             sliceOutput.writeInt(offsets[offsetBase + position] - valuesStartOffset);
         }
-        encodeNullsAsBits(sliceOutput, block);
+        encodeNullsAsBits(sliceOutput, arrayBlock);
     }
 
     @Override
-    public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
+    public ArrayBlock readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
     {
         Block values = blockEncodingSerde.readBlock(sliceInput);
 
         int positionCount = sliceInput.readInt();
         int[] offsets = new int[positionCount + 1];
-        sliceInput.readBytes(Slices.wrappedIntArray(offsets));
+        sliceInput.readInts(offsets);
         boolean[] valueIsNull = decodeNullBits(sliceInput, positionCount).orElse(null);
         return createArrayBlockInternal(0, positionCount, valueIsNull, offsets, values);
     }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ArrayValueBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/ArrayValueBuilder.java
new file mode 100644
index 000000000000..89ce9c000254
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ArrayValueBuilder.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.trino.spi.type.ArrayType;
+
+public interface ArrayValueBuilder<E extends Throwable>
+{
+    static <E extends Throwable> Block buildArrayValue(ArrayType arrayType, int entryCount, ArrayValueBuilder<E> builder)
+            throws E
+    {
+        return new BufferedArrayValueBuilder(arrayType, 1)
+                .build(entryCount, builder);
+    }
+
+    void build(BlockBuilder elementBuilder)
+            throws E;
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/Block.java b/core/trino-spi/src/main/java/io/trino/spi/block/Block.java
index 057ba169447e..5cf302fd2d44 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/Block.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/Block.java
@@ -21,8 +21,10 @@
 import java.util.function.ObjLongConsumer;
 
 import static io.trino.spi.block.BlockUtil.checkArrayRange;
+import static io.trino.spi.block.DictionaryId.randomDictionaryId;
 
-public interface Block
+public sealed interface Block
+        permits DictionaryBlock, RunLengthEncodedBlock, LazyBlock, ValueBlock
 {
     /**
      * Gets the length of the value at the {@code position}.
@@ -81,68 +83,6 @@ default <T> T getObject(int position, Class<T> clazz)
         throw new UnsupportedOperationException(getClass().getName());
     }
 
-    /**
-     * Is the byte sequences at {@code offset} in the value at {@code position} equal
-     * to the byte sequence at {@code otherOffset} in {@code otherSlice}.
-     * This method must be implemented if @{code getSlice} is implemented.
-     */
-    default boolean bytesEqual(int position, int offset, Slice otherSlice, int otherOffset, int length)
-    {
-        throw new UnsupportedOperationException(getClass().getName());
-    }
-
-    /**
-     * Compares the byte sequences at {@code offset} in the value at {@code position}
-     * to the byte sequence at {@code otherOffset} in {@code otherSlice}.
-     * This method must be implemented if @{code getSlice} is implemented.
-     */
-    default int bytesCompare(int position, int offset, int length, Slice otherSlice, int otherOffset, int otherLength)
-    {
-        throw new UnsupportedOperationException(getClass().getName());
-    }
-
-    /**
-     * Appends the byte sequences at {@code offset} in the value at {@code position}
-     * to {@code blockBuilder}.
-     * This method must be implemented if @{code getSlice} is implemented.
-     */
-    default void writeBytesTo(int position, int offset, int length, BlockBuilder blockBuilder)
-    {
-        throw new UnsupportedOperationException(getClass().getName());
-    }
-
-    /**
-     * Is the byte sequences at {@code offset} in the value at {@code position} equal
-     * to the byte sequence at {@code otherOffset} in the value at {@code otherPosition}
-     * in {@code otherBlock}.
-     * This method must be implemented if @{code getSlice} is implemented.
-     */
-    default boolean equals(int position, int offset, Block otherBlock, int otherPosition, int otherOffset, int length)
-    {
-        throw new UnsupportedOperationException(getClass().getName());
-    }
-
-    /**
-     * Calculates the hash code the byte sequences at {@code offset} in the
-     * value at {@code position}.
-     * This method must be implemented if @{code getSlice} is implemented.
-     */
-    default long hash(int position, int offset, int length)
-    {
-        throw new UnsupportedOperationException(getClass().getName());
-    }
-
-    /**
-     * Compares the byte sequences at {@code offset} in the value at {@code position}
-     * to the byte sequence at {@code otherOffset} in the value at {@code otherPosition}
-     * in {@code otherBlock}.
-     * This method must be implemented if @{code getSlice} is implemented.
-     */
-    default int compareTo(int leftPosition, int leftOffset, int leftLength, Block rightBlock, int rightPosition, int rightOffset, int rightLength)
-    {
-        throw new UnsupportedOperationException(getClass().getName());
-    }
-
     /**
      * Gets the value at the specified position as a single element block.  The method
      * must copy the data into a new block.
@@ -152,7 +92,7 @@ default int compareTo(int leftPosition, int leftOffset, int leftLength, Block ri
      *
      * @throws IllegalArgumentException if this position is not valid
      */
-    Block getSingleValueBlock(int position);
+    ValueBlock getSingleValueBlock(int position);
 
     /**
      * Returns the number of positions in this block.
@@ -244,7 +184,7 @@ default Block getPositions(int[] positions, int offset, int length)
     {
         checkArrayRange(positions, offset, length);
 
-        return new DictionaryBlock(offset, length, this, positions);
+        return DictionaryBlock.createInternal(offset, length, this, positions, randomDictionaryId());
     }
 
     /**
@@ -335,4 +275,14 @@ default List<Block> getChildren()
      * i.e. not on in-progress block builders.
      */
     Block copyWithAppendedNull();
+
+    /**
+     * Returns the underlying value block underlying this block.
+     */
+    ValueBlock getUnderlyingValueBlock();
+
+    /**
+     * Returns the position in the underlying value block corresponding to the specified position in this block.
+     */
+    int getUnderlyingValuePosition(int position);
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/BlockBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/BlockBuilder.java
index 47ac89760802..7d458991497e 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/BlockBuilder.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/BlockBuilder.java
@@ -13,76 +13,28 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
-
 import static io.trino.spi.block.BlockUtil.calculateBlockResetSize;
 
 public interface BlockBuilder
-        extends Block
 {
     /**
-     * Write a byte to the current entry;
-     */
-    default BlockBuilder writeByte(int value)
-    {
-        throw new UnsupportedOperationException(getClass().getName());
-    }
-
-    /**
-     * Write a short to the current entry;
-     */
-    default BlockBuilder writeShort(int value)
-    {
-        throw new UnsupportedOperationException(getClass().getName());
-    }
-
-    /**
-     * Write a int to the current entry;
-     */
-    default BlockBuilder writeInt(int value)
-    {
-        throw new UnsupportedOperationException(getClass().getName());
-    }
-
-    /**
-     * Write a long to the current entry;
-     */
-    default BlockBuilder writeLong(long value)
-    {
-        throw new UnsupportedOperationException(getClass().getName());
-    }
-
-    /**
-     * Write a byte sequences to the current entry;
+     * Returns the number of positions in this block builder.
      */
-    default BlockBuilder writeBytes(Slice source, int sourceIndex, int length)
-    {
-        throw new UnsupportedOperationException(getClass().getName());
-    }
+    int getPositionCount();
 
     /**
-     * Return a writer to the current entry. The caller can operate on the returned caller to incrementally build the object. This is generally more efficient than
-     * building the object elsewhere and call writeObject afterwards because a large chunk of memory could potentially be unnecessarily copied in this process.
+     * Returns the size of this block as if it was compacted, ignoring any over-allocations
+     * and any unloaded nested blocks.
+     * For example, in dictionary blocks, this only counts each dictionary entry once,
+     * rather than each time a value is referenced.
      */
-    default BlockBuilder beginBlockEntry()
-    {
-        throw new UnsupportedOperationException(getClass().getName());
-    }
+    long getSizeInBytes();
 
     /**
-     * Create a new block from the current materialized block by keeping the same elements
-     * only with respect to {@code visiblePositions}.
+     * Returns the retained size of this block in memory, including over-allocations.
+     * This method is called from the innermost execution loop and must be fast.
      */
-    @Override
-    default Block getPositions(int[] visiblePositions, int offset, int length)
-    {
-        return build().getPositions(visiblePositions, offset, length);
-    }
-
-    /**
-     * Close the current entry.
-     */
-    BlockBuilder closeEntry();
+    long getRetainedSizeInBytes();
 
     /**
      * Appends a null value to the block.
@@ -91,9 +43,15 @@ default Block getPositions(int[] visiblePositions, int offset, int length)
 
     /**
      * Builds the block. This method can be called multiple times.
+     * The return value may be a block such as RLE to allow for optimizations when all block values are the same.
      */
     Block build();
 
+    /**
+     * Builds a ValueBlock. This method can be called multiple times.
+     */
+    ValueBlock buildValueBlock();
+
     /**
      * Creates a new block builder of the same type based on the current usage statistics of this block builder.
      */
@@ -103,14 +61,4 @@ default BlockBuilder newBlockBuilderLike(BlockBuilderStatus blockBuilderStatus)
     {
         return newBlockBuilderLike(calculateBlockResetSize(getPositionCount()), blockBuilderStatus);
     }
-
-    /**
-     * This method is not expected to be implemented for {@code BlockBuilder} implementations, the method
-     * {@link BlockBuilder#appendNull} should be used instead.
-     */
-    @Override
-    default Block copyWithAppendedNull()
-    {
-        throw new UnsupportedOperationException("BlockBuilder implementation does not support newBlockWithAppendedNull");
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/BlockUtil.java b/core/trino-spi/src/main/java/io/trino/spi/block/BlockUtil.java
index 0a460061124d..e17b4ab28ef4 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/BlockUtil.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/BlockUtil.java
@@ -14,9 +14,7 @@
 package io.trino.spi.block;
 
 import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 
@@ -148,7 +146,7 @@ static Slice compactSlice(Slice slice, int index, int length)
         if (slice.isCompact() && index == 0 && length == slice.length()) {
             return slice;
         }
-        return Slices.copyOf(slice, index, length);
+        return slice.copy(index, length);
     }
 
     /**
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/BufferedArrayValueBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/BufferedArrayValueBuilder.java
new file mode 100644
index 000000000000..a744880e2711
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/BufferedArrayValueBuilder.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.trino.spi.type.ArrayType;
+
+import static io.airlift.slice.SizeOf.instanceSize;
+
+public class BufferedArrayValueBuilder
+{
+    private static final int INSTANCE_SIZE = instanceSize(BufferedArrayValueBuilder.class);
+
+    private int bufferSize;
+    private BlockBuilder valueBuilder;
+
+    public static BufferedArrayValueBuilder createBuffered(ArrayType arrayType)
+    {
+        return new BufferedArrayValueBuilder(arrayType, 1024);
+    }
+
+    BufferedArrayValueBuilder(ArrayType arrayType, int bufferSize)
+    {
+        this.bufferSize = bufferSize;
+        this.valueBuilder = arrayType.getElementType().createBlockBuilder(null, bufferSize);
+    }
+
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE + valueBuilder.getRetainedSizeInBytes();
+    }
+
+    public <E extends Throwable> Block build(int entryCount, ArrayValueBuilder<E> builder)
+            throws E
+    {
+        // grow or reset builders if necessary
+        if (valueBuilder.getPositionCount() + entryCount > bufferSize) {
+            if (bufferSize < entryCount) {
+                bufferSize = entryCount;
+            }
+            valueBuilder = valueBuilder.newBlockBuilderLike(bufferSize, null);
+        }
+
+        int startSize = valueBuilder.getPositionCount();
+
+        builder.build(valueBuilder);
+
+        int endSize = valueBuilder.getPositionCount();
+        return valueBuilder.build().getRegion(startSize, endSize - startSize);
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/BufferedMapValueBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/BufferedMapValueBuilder.java
new file mode 100644
index 000000000000..c1e8846a634e
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/BufferedMapValueBuilder.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.trino.spi.block.MapHashTables.HashBuildMode;
+import io.trino.spi.type.MapType;
+
+import static io.airlift.slice.SizeOf.instanceSize;
+import static java.lang.Math.max;
+import static java.util.Objects.requireNonNull;
+
+public class BufferedMapValueBuilder
+{
+    private static final int INSTANCE_SIZE = instanceSize(BufferedMapValueBuilder.class);
+
+    private final MapType mapType;
+    private final HashBuildMode hashBuildMode;
+    private BlockBuilder keyBlockBuilder;
+    private BlockBuilder valueBlockBuilder;
+    private int bufferSize;
+
+    public static BufferedMapValueBuilder createBuffered(MapType mapType)
+    {
+        return new BufferedMapValueBuilder(mapType, HashBuildMode.DUPLICATE_NOT_CHECKED, 1024);
+    }
+
+    public static BufferedMapValueBuilder createBufferedStrict(MapType mapType)
+    {
+        return new BufferedMapValueBuilder(mapType, HashBuildMode.STRICT_EQUALS, 1024);
+    }
+
+    public static BufferedMapValueBuilder createBufferedDistinctStrict(MapType mapType)
+    {
+        return new BufferedMapValueBuilder(mapType, HashBuildMode.STRICT_NOT_DISTINCT_FROM, 1024);
+    }
+
+    BufferedMapValueBuilder(MapType mapType, HashBuildMode hashBuildMode, int bufferSize)
+    {
+        this.mapType = requireNonNull(mapType, "mapType is null");
+        this.hashBuildMode = hashBuildMode;
+        this.keyBlockBuilder = mapType.getKeyType().createBlockBuilder(null, bufferSize);
+        this.valueBlockBuilder = mapType.getValueType().createBlockBuilder(null, bufferSize);
+        this.bufferSize = bufferSize;
+    }
+
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE + keyBlockBuilder.getRetainedSizeInBytes() + valueBlockBuilder.getRetainedSizeInBytes();
+    }
+
+    public <E extends Throwable> SqlMap build(int entryCount, MapValueBuilder<E> builder)
+            throws E
+    {
+        if (keyBlockBuilder.getPositionCount() != valueBlockBuilder.getPositionCount()) {
+            // we could fix this by appending nulls to the shorter builder, but this is a sign the buffer is being used in a multithreaded environment which is not supported
+            throw new IllegalStateException("Key and value builders were corrupted by a previous call to buildValue");
+        }
+
+        // grow or reset builders if necessary
+        if (keyBlockBuilder.getPositionCount() + entryCount > bufferSize) {
+            if (bufferSize < entryCount) {
+                bufferSize = entryCount;
+            }
+            keyBlockBuilder = keyBlockBuilder.newBlockBuilderLike(bufferSize, null);
+            valueBlockBuilder = valueBlockBuilder.newBlockBuilderLike(bufferSize, null);
+        }
+
+        int startSize = keyBlockBuilder.getPositionCount();
+
+        // build the map
+        try {
+            builder.build(keyBlockBuilder, valueBlockBuilder);
+        }
+        catch (Exception e) {
+            equalizeBlockBuilders();
+            throw e;
+        }
+
+        // check that key and value builders have the same size
+        if (equalizeBlockBuilders()) {
+            throw new IllegalStateException("Expected key and value builders to have the same size");
+        }
+        int endSize = keyBlockBuilder.getPositionCount();
+
+        // build the map block
+        Block keyBlock = keyBlockBuilder.build().getRegion(startSize, endSize - startSize);
+        Block valueBlock = valueBlockBuilder.build().getRegion(startSize, endSize - startSize);
+        return new SqlMap(mapType, hashBuildMode, keyBlock, valueBlock);
+    }
+
+    private boolean equalizeBlockBuilders()
+    {
+        int keyBlockSize = keyBlockBuilder.getPositionCount();
+        if (keyBlockSize == valueBlockBuilder.getPositionCount()) {
+            return false;
+        }
+
+        // append nulls to even out the blocks
+        int expectedSize = max(keyBlockSize, valueBlockBuilder.getPositionCount());
+        while (keyBlockBuilder.getPositionCount() < expectedSize) {
+            keyBlockBuilder.appendNull();
+        }
+        while (valueBlockBuilder.getPositionCount() < expectedSize) {
+            valueBlockBuilder.appendNull();
+        }
+        return true;
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/BufferedRowValueBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/BufferedRowValueBuilder.java
new file mode 100644
index 000000000000..735d0f541e55
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/BufferedRowValueBuilder.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.trino.spi.type.RowType;
+
+import java.util.List;
+
+import static io.airlift.slice.SizeOf.instanceSize;
+
+public class BufferedRowValueBuilder
+{
+    private static final int INSTANCE_SIZE = instanceSize(BufferedRowValueBuilder.class);
+
+    private final int bufferSize;
+    private List<BlockBuilder> fieldBuilders;
+
+    public static BufferedRowValueBuilder createBuffered(RowType rowType)
+    {
+        return new BufferedRowValueBuilder(rowType, 1024);
+    }
+
+    BufferedRowValueBuilder(RowType rowType, int bufferSize)
+    {
+        this.bufferSize = bufferSize;
+        this.fieldBuilders = rowType.getTypeParameters().stream()
+                .map(fieldType -> fieldType.createBlockBuilder(null, bufferSize))
+                .toList();
+    }
+
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE + fieldBuilders.stream().mapToLong(BlockBuilder::getRetainedSizeInBytes).sum();
+    }
+
+    public <E extends Throwable> SqlRow build(RowValueBuilder<E> builder)
+            throws E
+    {
+        int expectedSize = fieldBuilders.get(0).getPositionCount();
+        if (!fieldBuilders.stream().allMatch(field -> field.getPositionCount() == expectedSize)) {
+            // we could fix this by appending nulls to the shorter builders, but this is a sign the buffer is being used in a multithreaded environment which is not supported
+            throw new IllegalStateException("Field builders were corrupted by a previous call to buildValue");
+        }
+
+        // grow or reset builders if necessary
+        if (fieldBuilders.get(0).getPositionCount() + 1 > bufferSize) {
+            fieldBuilders = fieldBuilders.stream()
+                    .map(field -> field.newBlockBuilderLike(bufferSize, null))
+                    .toList();
+        }
+
+        int startSize = fieldBuilders.get(0).getPositionCount();
+
+        try {
+            builder.build(fieldBuilders);
+        }
+        catch (Exception e) {
+            equalizeBlockBuilders();
+            throw e;
+        }
+
+        // check that field builders have the same size
+        if (equalizeBlockBuilders()) {
+            throw new IllegalStateException("Expected field builders to have the same size");
+        }
+        int endSize = fieldBuilders.get(0).getPositionCount();
+        if (endSize != startSize + 1) {
+            throw new IllegalStateException("Expected exactly one entry added to each field builder");
+        }
+
+        List<Block> blocks = fieldBuilders.stream()
+                .map(field -> field.build().getRegion(startSize, 1))
+                .toList();
+        return new SqlRow(0, blocks.toArray(new Block[0]));
+    }
+
+    private boolean equalizeBlockBuilders()
+    {
+        // append nulls to even out the blocks
+        boolean nullsAppended = false;
+        int newBlockSize = fieldBuilders.stream().mapToInt(BlockBuilder::getPositionCount).max().orElseThrow();
+        for (BlockBuilder fieldBuilder : fieldBuilders) {
+            while (fieldBuilder.getPositionCount() < newBlockSize) {
+                fieldBuilder.appendNull();
+                nullsAppended = true;
+            }
+        }
+        return nullsAppended;
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlock.java
index b781c0cf3069..744c6753445c 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlock.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlock.java
@@ -15,8 +15,7 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -31,8 +30,8 @@
 import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
 import static io.trino.spi.block.BlockUtil.ensureCapacity;
 
-public class ByteArrayBlock
-        implements Block
+public final class ByteArrayBlock
+        implements ValueBlock
 {
     private static final int INSTANCE_SIZE = instanceSize(ByteArrayBlock.class);
     public static final int SIZE_IN_BYTES_PER_POSITION = Byte.BYTES + Byte.BYTES;
@@ -129,10 +128,15 @@ public int getPositionCount()
     @Override
     public byte getByte(int position, int offset)
     {
-        checkReadablePosition(this, position);
         if (offset != 0) {
             throw new IllegalArgumentException("offset must be zero");
         }
+        return getByte(position);
+    }
+
+    public byte getByte(int position)
+    {
+        checkReadablePosition(this, position);
         return values[position + arrayOffset];
     }
 
@@ -150,7 +154,7 @@ public boolean isNull(int position)
     }
 
     @Override
-    public Block getSingleValueBlock(int position)
+    public ByteArrayBlock getSingleValueBlock(int position)
     {
         checkReadablePosition(this, position);
         return new ByteArrayBlock(
@@ -161,7 +165,7 @@ public Block getSingleValueBlock(int position)
     }
 
     @Override
-    public Block copyPositions(int[] positions, int offset, int length)
+    public ByteArrayBlock copyPositions(int[] positions, int offset, int length)
     {
         checkArrayRange(positions, offset, length);
 
@@ -182,7 +186,7 @@ public Block copyPositions(int[] positions, int offset, int length)
     }
 
     @Override
-    public Block getRegion(int positionOffset, int length)
+    public ByteArrayBlock getRegion(int positionOffset, int length)
     {
         checkValidRegion(getPositionCount(), positionOffset, length);
 
@@ -190,7 +194,7 @@ public Block getRegion(int positionOffset, int length)
     }
 
     @Override
-    public Block copyRegion(int positionOffset, int length)
+    public ByteArrayBlock copyRegion(int positionOffset, int length)
     {
         checkValidRegion(getPositionCount(), positionOffset, length);
 
@@ -211,7 +215,7 @@ public String getEncodingName()
     }
 
     @Override
-    public Block copyWithAppendedNull()
+    public ByteArrayBlock copyWithAppendedNull()
     {
         boolean[] newValueIsNull = copyIsNullAndAppendNull(valueIsNull, arrayOffset, positionCount);
         byte[] newValues = ensureCapacity(values, arrayOffset + positionCount + 1);
@@ -219,6 +223,12 @@ public Block copyWithAppendedNull()
         return new ByteArrayBlock(arrayOffset, positionCount + 1, newValueIsNull, newValues);
     }
 
+    @Override
+    public ByteArrayBlock getUnderlyingValueBlock()
+    {
+        return this;
+    }
+
     @Override
     public String toString()
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlockBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlockBuilder.java
index 6223b87de036..559ead304ead 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlockBuilder.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlockBuilder.java
@@ -13,20 +13,12 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
 import static java.lang.Math.max;
 
 public class ByteArrayBlockBuilder
@@ -58,14 +50,13 @@ public ByteArrayBlockBuilder(@Nullable BlockBuilderStatus blockBuilderStatus, in
         updateDataSize();
     }
 
-    @Override
-    public BlockBuilder writeByte(int value)
+    public BlockBuilder writeByte(byte value)
     {
         if (values.length <= positionCount) {
             growCapacity();
         }
 
-        values[positionCount] = (byte) value;
+        values[positionCount] = value;
 
         hasNonNullValue = true;
         positionCount++;
@@ -75,12 +66,6 @@ public BlockBuilder writeByte(int value)
         return this;
     }
 
-    @Override
-    public BlockBuilder closeEntry()
-    {
-        return this;
-    }
-
     @Override
     public BlockBuilder appendNull()
     {
@@ -104,6 +89,12 @@ public Block build()
         if (!hasNonNullValue) {
             return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, positionCount);
         }
+        return buildValueBlock();
+    }
+
+    @Override
+    public ByteArrayBlock buildValueBlock()
+    {
         return new ByteArrayBlock(0, positionCount, hasNullValue ? valueIsNull : null, values);
     }
 
@@ -137,147 +128,24 @@ private void updateDataSize()
         }
     }
 
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.of(ByteArrayBlock.SIZE_IN_BYTES_PER_POSITION);
-    }
-
     @Override
     public long getSizeInBytes()
     {
         return ByteArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) positionCount;
     }
 
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        return ByteArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) length;
-    }
-
-    @Override
-    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionsCount)
-    {
-        return (long) ByteArrayBlock.SIZE_IN_BYTES_PER_POSITION * selectedPositionsCount;
-    }
-
     @Override
     public long getRetainedSizeInBytes()
     {
         return retainedSizeInBytes;
     }
 
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        return isNull(position) ? 0 : Byte.BYTES;
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(values, sizeOf(values));
-        consumer.accept(valueIsNull, sizeOf(valueIsNull));
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
     @Override
     public int getPositionCount()
     {
         return positionCount;
     }
 
-    @Override
-    public byte getByte(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        if (offset != 0) {
-            throw new IllegalArgumentException("offset must be zero");
-        }
-        return values[position];
-    }
-
-    @Override
-    public boolean mayHaveNull()
-    {
-        return hasNullValue;
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkReadablePosition(this, position);
-        return valueIsNull[position];
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        checkReadablePosition(this, position);
-        return new ByteArrayBlock(
-                0,
-                1,
-                valueIsNull[position] ? new boolean[] {true} : null,
-                new byte[] {values[position]});
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = new boolean[length];
-        }
-        byte[] newValues = new byte[length];
-        for (int i = 0; i < length; i++) {
-            int position = positions[offset + i];
-            checkReadablePosition(this, position);
-            if (hasNullValue) {
-                newValueIsNull[i] = valueIsNull[position];
-            }
-            newValues[i] = values[position];
-        }
-        return new ByteArrayBlock(0, length, newValueIsNull, newValues);
-    }
-
-    @Override
-    public Block getRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        return new ByteArrayBlock(positionOffset, length, hasNullValue ? valueIsNull : null, values);
-    }
-
-    @Override
-    public Block copyRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = Arrays.copyOfRange(valueIsNull, positionOffset, positionOffset + length);
-        }
-        byte[] newValues = Arrays.copyOfRange(values, positionOffset, positionOffset + length);
-        return new ByteArrayBlock(0, length, newValueIsNull, newValues);
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        return ByteArrayBlockEncoding.NAME;
-    }
-
     @Override
     public String toString()
     {
@@ -286,9 +154,4 @@ public String toString()
         sb.append('}');
         return sb.toString();
     }
-
-    Slice getValuesSlice()
-    {
-        return Slices.wrappedBuffer(values, 0, positionCount);
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlockEncoding.java
index 0fc86d4549d1..17f346f4e440 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlockEncoding.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ByteArrayBlockEncoding.java
@@ -13,7 +13,6 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.SliceOutput;
 import io.airlift.slice.Slices;
@@ -37,20 +36,21 @@ public String getName()
     @Override
     public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
     {
-        int positionCount = block.getPositionCount();
+        ByteArrayBlock byteArrayBlock = (ByteArrayBlock) block;
+        int positionCount = byteArrayBlock.getPositionCount();
         sliceOutput.appendInt(positionCount);
 
-        encodeNullsAsBits(sliceOutput, block);
+        encodeNullsAsBits(sliceOutput, byteArrayBlock);
 
-        if (!block.mayHaveNull()) {
-            sliceOutput.writeBytes(getValuesSlice(block));
+        if (!byteArrayBlock.mayHaveNull()) {
+            sliceOutput.writeBytes(byteArrayBlock.getValuesSlice());
         }
         else {
             byte[] valuesWithoutNull = new byte[positionCount];
             int nonNullPositionCount = 0;
             for (int i = 0; i < positionCount; i++) {
-                valuesWithoutNull[nonNullPositionCount] = block.getByte(i, 0);
-                if (!block.isNull(i)) {
+                valuesWithoutNull[nonNullPositionCount] = byteArrayBlock.getByte(i);
+                if (!byteArrayBlock.isNull(i)) {
                     nonNullPositionCount++;
                 }
             }
@@ -61,7 +61,7 @@ public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceO
     }
 
     @Override
-    public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
+    public ByteArrayBlock readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
     {
         int positionCount = sliceInput.readInt();
 
@@ -105,16 +105,4 @@ else if (packed != -1) { // At least one non-null
         }
         return new ByteArrayBlock(0, positionCount, valueIsNull, values);
     }
-
-    private Slice getValuesSlice(Block block)
-    {
-        if (block instanceof ByteArrayBlock) {
-            return ((ByteArrayBlock) block).getValuesSlice();
-        }
-        if (block instanceof ByteArrayBlockBuilder) {
-            return ((ByteArrayBlockBuilder) block).getValuesSlice();
-        }
-
-        throw new IllegalArgumentException("Unexpected block type " + block.getClass().getSimpleName());
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ColumnarArray.java b/core/trino-spi/src/main/java/io/trino/spi/block/ColumnarArray.java
index 7aee3cbf0fed..4c46be6e4b48 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/ColumnarArray.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ColumnarArray.java
@@ -36,22 +36,24 @@ public static ColumnarArray toColumnarArray(Block block)
             return toColumnarArray(runLengthEncodedBlock);
         }
 
-        if (!(block instanceof AbstractArrayBlock arrayBlock)) {
+        if (!(block instanceof ArrayBlock arrayBlock)) {
             throw new IllegalArgumentException("Invalid array block: " + block.getClass().getName());
         }
 
         Block elementsBlock = arrayBlock.getRawElementBlock();
+        int[] offsets = arrayBlock.getOffsets();
+        int arrayOffset = arrayBlock.getOffsetBase();
 
         // trim elements to just visible region
         int elementsOffset = 0;
         int elementsLength = 0;
         if (arrayBlock.getPositionCount() > 0) {
-            elementsOffset = arrayBlock.getOffset(0);
-            elementsLength = arrayBlock.getOffset(arrayBlock.getPositionCount()) - elementsOffset;
+            elementsOffset = offsets[arrayOffset];
+            elementsLength = offsets[arrayBlock.getPositionCount() + arrayOffset] - elementsOffset;
         }
         elementsBlock = elementsBlock.getRegion(elementsOffset, elementsLength);
 
-        return new ColumnarArray(block, arrayBlock.getOffsetBase(), arrayBlock.getOffsets(), elementsBlock);
+        return new ColumnarArray(block, arrayOffset, offsets, elementsBlock);
     }
 
     private static ColumnarArray toColumnarArray(DictionaryBlock dictionaryBlock)
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ColumnarMap.java b/core/trino-spi/src/main/java/io/trino/spi/block/ColumnarMap.java
index 0c7a3dc90d95..d6a935203de0 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/ColumnarMap.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ColumnarMap.java
@@ -37,7 +37,7 @@ public static ColumnarMap toColumnarMap(Block block)
             return toColumnarMap(runLengthEncodedBlock);
         }
 
-        if (!(block instanceof AbstractMapBlock mapBlock)) {
+        if (!(block instanceof MapBlock mapBlock)) {
             throw new IllegalArgumentException("Invalid map block: " + block.getClass().getName());
         }
 
@@ -45,8 +45,9 @@ public static ColumnarMap toColumnarMap(Block block)
         int[] offsets = mapBlock.getOffsets();
 
         // get the keys and values for visible region
-        int firstEntryPosition = mapBlock.getOffset(0);
-        int totalEntryCount = mapBlock.getOffset(block.getPositionCount()) - firstEntryPosition;
+        int firstEntryPosition = offsets[offsetBase];
+        int position = block.getPositionCount();
+        int totalEntryCount = offsets[position + offsetBase] - firstEntryPosition;
         Block keysBlock = mapBlock.getRawKeyBlock().getRegion(firstEntryPosition, totalEntryCount);
         Block valuesBlock = mapBlock.getRawValueBlock().getRegion(firstEntryPosition, totalEntryCount);
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ColumnarRow.java b/core/trino-spi/src/main/java/io/trino/spi/block/ColumnarRow.java
deleted file mode 100644
index f7685f1e09cd..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/ColumnarRow.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import javax.annotation.Nullable;
-
-import static java.util.Objects.requireNonNull;
-
-public final class ColumnarRow
-{
-    private final int positionCount;
-    @Nullable
-    private final Block nullCheckBlock;
-    private final Block[] fields;
-
-    public static ColumnarRow toColumnarRow(Block block)
-    {
-        requireNonNull(block, "block is null");
-
-        if (block instanceof LazyBlock lazyBlock) {
-            block = lazyBlock.getBlock();
-        }
-        if (block instanceof DictionaryBlock dictionaryBlock) {
-            return toColumnarRow(dictionaryBlock);
-        }
-        if (block instanceof RunLengthEncodedBlock runLengthEncodedBlock) {
-            return toColumnarRow(runLengthEncodedBlock);
-        }
-
-        if (!(block instanceof AbstractRowBlock rowBlock)) {
-            throw new IllegalArgumentException("Invalid row block: " + block.getClass().getName());
-        }
-
-        // get fields for visible region
-        int firstRowPosition = rowBlock.getFieldBlockOffset(0);
-        int totalRowCount = rowBlock.getFieldBlockOffset(block.getPositionCount()) - firstRowPosition;
-        Block[] fieldBlocks = new Block[rowBlock.numFields];
-        for (int i = 0; i < fieldBlocks.length; i++) {
-            fieldBlocks[i] = rowBlock.getRawFieldBlocks()[i].getRegion(firstRowPosition, totalRowCount);
-        }
-
-        return new ColumnarRow(block.getPositionCount(), block, fieldBlocks);
-    }
-
-    private static ColumnarRow toColumnarRow(DictionaryBlock dictionaryBlock)
-    {
-        if (!dictionaryBlock.mayHaveNull()) {
-            return toColumnarRowFromDictionaryWithoutNulls(dictionaryBlock);
-        }
-        // build a mapping from the old dictionary to a new dictionary with nulls removed
-        Block dictionary = dictionaryBlock.getDictionary();
-        int[] newDictionaryIndex = new int[dictionary.getPositionCount()];
-        int nextNewDictionaryIndex = 0;
-        for (int position = 0; position < dictionary.getPositionCount(); position++) {
-            if (!dictionary.isNull(position)) {
-                newDictionaryIndex[position] = nextNewDictionaryIndex;
-                nextNewDictionaryIndex++;
-            }
-        }
-
-        // reindex the dictionary
-        int[] dictionaryIds = new int[dictionaryBlock.getPositionCount()];
-        int nonNullPositionCount = 0;
-        for (int position = 0; position < dictionaryBlock.getPositionCount(); position++) {
-            if (!dictionaryBlock.isNull(position)) {
-                int oldDictionaryId = dictionaryBlock.getId(position);
-                dictionaryIds[nonNullPositionCount] = newDictionaryIndex[oldDictionaryId];
-                nonNullPositionCount++;
-            }
-        }
-
-        ColumnarRow columnarRow = toColumnarRow(dictionaryBlock.getDictionary());
-        Block[] fields = new Block[columnarRow.getFieldCount()];
-        for (int i = 0; i < columnarRow.getFieldCount(); i++) {
-            fields[i] = DictionaryBlock.create(nonNullPositionCount, columnarRow.getField(i), dictionaryIds);
-        }
-
-        int positionCount = dictionaryBlock.getPositionCount();
-        if (nonNullPositionCount == positionCount) {
-            // no null rows are referenced in the dictionary, discard the null check block
-            dictionaryBlock = null;
-        }
-        return new ColumnarRow(positionCount, dictionaryBlock, fields);
-    }
-
-    private static ColumnarRow toColumnarRowFromDictionaryWithoutNulls(DictionaryBlock dictionaryBlock)
-    {
-        ColumnarRow columnarRow = toColumnarRow(dictionaryBlock.getDictionary());
-        Block[] fields = new Block[columnarRow.getFieldCount()];
-        for (int i = 0; i < fields.length; i++) {
-            // Reuse the dictionary ids array directly since no nulls are present
-            fields[i] = new DictionaryBlock(
-                    dictionaryBlock.getRawIdsOffset(),
-                    dictionaryBlock.getPositionCount(),
-                    columnarRow.getField(i),
-                    dictionaryBlock.getRawIds());
-        }
-        return new ColumnarRow(dictionaryBlock.getPositionCount(), null, fields);
-    }
-
-    private static ColumnarRow toColumnarRow(RunLengthEncodedBlock rleBlock)
-    {
-        Block rleValue = rleBlock.getValue();
-        ColumnarRow columnarRow = toColumnarRow(rleValue);
-
-        Block[] fields = new Block[columnarRow.getFieldCount()];
-        for (int i = 0; i < columnarRow.getFieldCount(); i++) {
-            Block nullSuppressedField = columnarRow.getField(i);
-            if (rleValue.isNull(0)) {
-                // the rle value is a null row so, all null-suppressed fields should empty
-                if (nullSuppressedField.getPositionCount() != 0) {
-                    throw new IllegalArgumentException("Invalid row block");
-                }
-                fields[i] = nullSuppressedField;
-            }
-            else {
-                fields[i] = RunLengthEncodedBlock.create(nullSuppressedField, rleBlock.getPositionCount());
-            }
-        }
-        return new ColumnarRow(rleBlock.getPositionCount(), rleBlock, fields);
-    }
-
-    private ColumnarRow(int positionCount, @Nullable Block nullCheckBlock, Block[] fields)
-    {
-        this.positionCount = positionCount;
-        this.nullCheckBlock = nullCheckBlock != null && nullCheckBlock.mayHaveNull() ? nullCheckBlock : null;
-        this.fields = fields;
-    }
-
-    public int getPositionCount()
-    {
-        return positionCount;
-    }
-
-    public boolean mayHaveNull()
-    {
-        return nullCheckBlock != null;
-    }
-
-    public boolean isNull(int position)
-    {
-        return nullCheckBlock != null && nullCheckBlock.isNull(position);
-    }
-
-    public int getFieldCount()
-    {
-        return fields.length;
-    }
-
-    /**
-     * Gets the specified field for all rows as a column.
-     * <p>
-     * Note: A null row will not have an entry in the block, so the block
-     * will be the size of the non-null rows.  This block may still contain
-     * null values when the row is non-null but the field value is null.
-     */
-    public Block getField(int index)
-    {
-        return fields[index];
-    }
-
-    public Block getNullCheckBlock()
-    {
-        return nullCheckBlock;
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/DictionaryBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/DictionaryBlock.java
index 38a8972fbfb1..69c3902fd5e4 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/DictionaryBlock.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/DictionaryBlock.java
@@ -14,7 +14,6 @@
 package io.trino.spi.block;
 
 import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,19 +27,20 @@
 import static io.trino.spi.block.BlockUtil.checkValidPosition;
 import static io.trino.spi.block.BlockUtil.checkValidPositions;
 import static io.trino.spi.block.BlockUtil.checkValidRegion;
+import static io.trino.spi.block.BlockUtil.compactArray;
 import static io.trino.spi.block.DictionaryId.randomDictionaryId;
 import static java.lang.Math.min;
 import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
 
-public class DictionaryBlock
+public final class DictionaryBlock
         implements Block
 {
     private static final int INSTANCE_SIZE = instanceSize(DictionaryBlock.class) + instanceSize(DictionaryId.class);
     private static final int NULL_NOT_FOUND = -1;
 
     private final int positionCount;
-    private final Block dictionary;
+    private final ValueBlock dictionary;
     private final int idsOffset;
     private final int[] ids;
     private final long retainedSizeInBytes;
@@ -54,7 +54,7 @@ public class DictionaryBlock
 
     public static Block create(int positionCount, Block dictionary, int[] ids)
     {
-        return createInternal(positionCount, dictionary, ids, randomDictionaryId());
+        return createInternal(0, positionCount, dictionary, ids, randomDictionaryId());
     }
 
     /**
@@ -62,16 +62,16 @@ public static Block create(int positionCount, Block dictionary, int[] ids)
      */
     public static Block createProjectedDictionaryBlock(int positionCount, Block dictionary, int[] ids, DictionaryId dictionarySourceId)
     {
-        return createInternal(positionCount, dictionary, ids, dictionarySourceId);
+        return createInternal(0, positionCount, dictionary, ids, dictionarySourceId);
     }
 
-    private static Block createInternal(int positionCount, Block dictionary, int[] ids, DictionaryId dictionarySourceId)
+    static Block createInternal(int idsOffset, int positionCount, Block dictionary, int[] ids, DictionaryId dictionarySourceId)
     {
         if (positionCount == 0) {
             return dictionary.copyRegion(0, 0);
         }
         if (positionCount == 1) {
-            return dictionary.getRegion(ids[0], 1);
+            return dictionary.getRegion(ids[idsOffset], 1);
         }
 
         // if dictionary is an RLE then this can just be a new RLE
@@ -79,25 +79,19 @@ private static Block createInternal(int positionCount, Block dictionary, int[] i
             return RunLengthEncodedBlock.create(rle.getValue(), positionCount);
         }
 
-        // unwrap dictionary in dictionary
-        if (dictionary instanceof DictionaryBlock dictionaryBlock) {
-            int[] newIds = new int[positionCount];
-            for (int position = 0; position < positionCount; position++) {
-                newIds[position] = dictionaryBlock.getId(ids[position]);
-            }
-            dictionary = dictionaryBlock.getDictionary();
-            dictionarySourceId = randomDictionaryId();
-            ids = newIds;
+        if (dictionary instanceof ValueBlock valueBlock) {
+            return new DictionaryBlock(idsOffset, positionCount, valueBlock, ids, false, false, dictionarySourceId);
         }
-        return new DictionaryBlock(0, positionCount, dictionary, ids, false, false, dictionarySourceId);
-    }
 
-    DictionaryBlock(int idsOffset, int positionCount, Block dictionary, int[] ids)
-    {
-        this(idsOffset, positionCount, dictionary, ids, false, false, randomDictionaryId());
+        // unwrap dictionary in dictionary
+        int[] newIds = new int[positionCount];
+        for (int position = 0; position < positionCount; position++) {
+            newIds[position] = dictionary.getUnderlyingValuePosition(ids[idsOffset + position]);
+        }
+        return new DictionaryBlock(0, positionCount, dictionary.getUnderlyingValueBlock(), newIds, false, false, randomDictionaryId());
     }
 
-    private DictionaryBlock(int idsOffset, int positionCount, Block dictionary, int[] ids, boolean dictionaryIsCompacted, boolean isSequentialIds, DictionaryId dictionarySourceId)
+    private DictionaryBlock(int idsOffset, int positionCount, ValueBlock dictionary, int[] ids, boolean dictionaryIsCompacted, boolean isSequentialIds, DictionaryId dictionarySourceId)
     {
         requireNonNull(dictionary, "dictionary is null");
         requireNonNull(ids, "ids is null");
@@ -130,12 +124,12 @@ private DictionaryBlock(int idsOffset, int positionCount, Block dictionary, int[
         this.isSequentialIds = isSequentialIds;
     }
 
-    int[] getRawIds()
+    public int[] getRawIds()
     {
         return ids;
     }
 
-    int getRawIdsOffset()
+    public int getRawIdsOffset()
     {
         return idsOffset;
     }
@@ -183,43 +177,7 @@ public <T> T getObject(int position, Class<T> clazz)
     }
 
     @Override
-    public boolean bytesEqual(int position, int offset, Slice otherSlice, int otherOffset, int length)
-    {
-        return dictionary.bytesEqual(getId(position), offset, otherSlice, otherOffset, length);
-    }
-
-    @Override
-    public int bytesCompare(int position, int offset, int length, Slice otherSlice, int otherOffset, int otherLength)
-    {
-        return dictionary.bytesCompare(getId(position), offset, length, otherSlice, otherOffset, otherLength);
-    }
-
-    @Override
-    public void writeBytesTo(int position, int offset, int length, BlockBuilder blockBuilder)
-    {
-        dictionary.writeBytesTo(getId(position), offset, length, blockBuilder);
-    }
-
-    @Override
-    public boolean equals(int position, int offset, Block otherBlock, int otherPosition, int otherOffset, int length)
-    {
-        return dictionary.equals(getId(position), offset, otherBlock, otherPosition, otherOffset, length);
-    }
-
-    @Override
-    public long hash(int position, int offset, int length)
-    {
-        return dictionary.hash(getId(position), offset, length);
-    }
-
-    @Override
-    public int compareTo(int leftPosition, int leftOffset, int leftLength, Block rightBlock, int rightPosition, int rightOffset, int rightLength)
-    {
-        return dictionary.compareTo(getId(leftPosition), leftOffset, leftLength, rightBlock, rightPosition, rightOffset, rightLength);
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
+    public ValueBlock getSingleValueBlock(int position)
     {
         return dictionary.getSingleValueBlock(getId(position));
     }
@@ -431,7 +389,7 @@ public Block copyPositions(int[] positions, int offset, int length)
             }
             newIds[i] = newId;
         }
-        Block compactDictionary = dictionary.copyPositions(positionsToCopy.elements(), 0, positionsToCopy.size());
+        ValueBlock compactDictionary = dictionary.copyPositions(positionsToCopy.elements(), 0, positionsToCopy.size());
         if (positionsToCopy.size() == length) {
             // discovered that all positions are unique, so return the unwrapped underlying dictionary directly
             return compactDictionary;
@@ -473,16 +431,18 @@ public Block copyRegion(int position, int length)
             // therefore it makes sense to unwrap this outer dictionary layer directly
             return dictionary.copyPositions(ids, idsOffset + position, length);
         }
-        int[] newIds = Arrays.copyOfRange(ids, idsOffset + position, idsOffset + position + length);
-        DictionaryBlock dictionaryBlock = new DictionaryBlock(
+        int[] newIds = compactArray(ids, idsOffset + position, length);
+        if (newIds == ids) {
+            return this;
+        }
+        return new DictionaryBlock(
                 0,
-                newIds.length,
+                length,
                 dictionary,
                 newIds,
                 false,
                 false,
-                randomDictionaryId());
-        return dictionaryBlock.compact();
+                randomDictionaryId()).compact();
     }
 
     @Override
@@ -534,7 +494,7 @@ public Block copyWithAppendedNull()
     {
         int desiredLength = idsOffset + positionCount + 1;
         int[] newIds = Arrays.copyOf(ids, desiredLength);
-        Block newDictionary = dictionary;
+        ValueBlock newDictionary = dictionary;
 
         int nullIndex = NULL_NOT_FOUND;
 
@@ -569,36 +529,54 @@ public String toString()
     }
 
     @Override
-    public boolean isLoaded()
+    public List<Block> getChildren()
     {
-        return dictionary.isLoaded();
+        return singletonList(getDictionary());
     }
 
     @Override
-    public Block getLoadedBlock()
+    public ValueBlock getUnderlyingValueBlock()
     {
-        Block loadedDictionary = dictionary.getLoadedBlock();
-
-        if (loadedDictionary == dictionary) {
-            return this;
-        }
-        return new DictionaryBlock(idsOffset, getPositionCount(), loadedDictionary, ids, false, false, randomDictionaryId());
+        return dictionary;
     }
 
     @Override
-    public final List<Block> getChildren()
+    public int getUnderlyingValuePosition(int position)
     {
-        return singletonList(getDictionary());
+        return getId(position);
     }
 
-    public Block getDictionary()
+    public ValueBlock getDictionary()
     {
         return dictionary;
     }
 
-    Slice getIds()
+    public Block createProjection(Block newDictionary)
     {
-        return Slices.wrappedIntArray(ids, idsOffset, positionCount);
+        if (newDictionary.getPositionCount() != dictionary.getPositionCount()) {
+            throw new IllegalArgumentException("newDictionary must have the same position count");
+        }
+
+        // if the new dictionary is lazy be careful to not materialize it
+        if (newDictionary instanceof LazyBlock lazyBlock) {
+            return new LazyBlock(positionCount, () -> {
+                Block newDictionaryBlock = lazyBlock.getBlock();
+                return createProjection(newDictionaryBlock);
+            });
+        }
+        if (newDictionary instanceof ValueBlock valueBlock) {
+            return new DictionaryBlock(idsOffset, positionCount, valueBlock, ids, isCompact(), false, dictionarySourceId);
+        }
+        if (newDictionary instanceof RunLengthEncodedBlock rle) {
+            return RunLengthEncodedBlock.create(rle.getValue(), positionCount);
+        }
+
+        // unwrap dictionary in dictionary
+        int[] newIds = new int[positionCount];
+        for (int position = 0; position < positionCount; position++) {
+            newIds[position] = newDictionary.getUnderlyingValuePosition(getIdUnchecked(position));
+        }
+        return new DictionaryBlock(0, positionCount, newDictionary.getUnderlyingValueBlock(), newIds, false, false, randomDictionaryId());
     }
 
     boolean isSequentialIds()
@@ -680,7 +658,7 @@ public DictionaryBlock compact()
             newIds[i] = newId;
         }
         try {
-            Block compactDictionary = dictionary.copyPositions(dictionaryPositionsToCopy.elements(), 0, dictionaryPositionsToCopy.size());
+            ValueBlock compactDictionary = dictionary.copyPositions(dictionaryPositionsToCopy.elements(), 0, dictionaryPositionsToCopy.size());
             return new DictionaryBlock(
                     0,
                     positionCount,
@@ -741,13 +719,13 @@ public static List<DictionaryBlock> compactRelatedBlocks(List<DictionaryBlock> b
             }
 
             try {
-                Block compactDictionary = dictionaryBlock.getDictionary().copyPositions(dictionaryPositionsToCopy, 0, numberOfIndexes);
+                ValueBlock compactDictionary = dictionaryBlock.getDictionary().copyPositions(dictionaryPositionsToCopy, 0, numberOfIndexes);
                 outputDictionaryBlocks.add(new DictionaryBlock(
                         0,
                         positionCount,
                         compactDictionary,
                         newIds,
-                        !(compactDictionary instanceof DictionaryBlock),
+                        true,
                         false,
                         newDictionaryId));
             }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/DictionaryBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/DictionaryBlockEncoding.java
index 9c806ff92daf..75b0b6818d6a 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/DictionaryBlockEncoding.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/DictionaryBlockEncoding.java
@@ -15,12 +15,9 @@
 
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.SliceOutput;
-import io.airlift.slice.Slices;
 
 import java.util.Optional;
 
-import static io.trino.spi.block.DictionaryBlock.createProjectedDictionaryBlock;
-
 public class DictionaryBlockEncoding
         implements BlockEncoding
 {
@@ -51,12 +48,7 @@ public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceO
         blockEncodingSerde.writeBlock(sliceOutput, dictionary);
 
         // ids
-        sliceOutput.writeBytes(dictionaryBlock.getIds());
-
-        // instance id
-        sliceOutput.appendLong(dictionaryBlock.getDictionarySourceId().getMostSignificantBits());
-        sliceOutput.appendLong(dictionaryBlock.getDictionarySourceId().getLeastSignificantBits());
-        sliceOutput.appendLong(dictionaryBlock.getDictionarySourceId().getSequenceId());
+        sliceOutput.writeInts(dictionaryBlock.getRawIds(), dictionaryBlock.getRawIdsOffset(), dictionaryBlock.getPositionCount());
     }
 
     @Override
@@ -70,17 +62,10 @@ public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceIn
 
         // ids
         int[] ids = new int[positionCount];
-        sliceInput.readBytes(Slices.wrappedIntArray(ids));
-
-        // instance id
-        long mostSignificantBits = sliceInput.readLong();
-        long leastSignificantBits = sliceInput.readLong();
-        long sequenceId = sliceInput.readLong();
+        sliceInput.readInts(ids);
 
-        // We always compact the dictionary before we send it. However, dictionaryBlock comes from sliceInput, which may over-retain memory.
-        // As a result, setting dictionaryIsCompacted to true is not appropriate here.
-        // TODO: fix DictionaryBlock so that dictionaryIsCompacted can be set to true when the underlying block over-retains memory.
-        return createProjectedDictionaryBlock(positionCount, dictionaryBlock, ids, new DictionaryId(mostSignificantBits, leastSignificantBits, sequenceId));
+        // flatten the dictionary
+        return dictionaryBlock.copyPositions(ids, 0, ids.length);
     }
 
     @Override
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/EncoderUtil.java b/core/trino-spi/src/main/java/io/trino/spi/block/EncoderUtil.java
index 5161ff32be8c..5f415a25e5c5 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/EncoderUtil.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/EncoderUtil.java
@@ -15,8 +15,7 @@
 
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.SliceOutput;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/Fixed12Block.java b/core/trino-spi/src/main/java/io/trino/spi/block/Fixed12Block.java
new file mode 100644
index 000000000000..f38e059ad2f6
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/Fixed12Block.java
@@ -0,0 +1,306 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import jakarta.annotation.Nullable;
+
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.function.ObjLongConsumer;
+
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.spi.block.BlockUtil.checkArrayRange;
+import static io.trino.spi.block.BlockUtil.checkReadablePosition;
+import static io.trino.spi.block.BlockUtil.checkValidRegion;
+import static io.trino.spi.block.BlockUtil.compactArray;
+import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
+import static io.trino.spi.block.BlockUtil.ensureCapacity;
+
+public final class Fixed12Block
+        implements ValueBlock
+{
+    private static final int INSTANCE_SIZE = instanceSize(Fixed12Block.class);
+    public static final int FIXED12_BYTES = Long.BYTES + Integer.BYTES;
+    public static final int SIZE_IN_BYTES_PER_POSITION = FIXED12_BYTES + Byte.BYTES;
+
+    private final int positionOffset;
+    private final int positionCount;
+    @Nullable
+    private final boolean[] valueIsNull;
+    private final int[] values;
+
+    private final long retainedSizeInBytes;
+
+    public Fixed12Block(int positionCount, Optional<boolean[]> valueIsNull, int[] values)
+    {
+        this(0, positionCount, valueIsNull.orElse(null), values);
+    }
+
+    Fixed12Block(int positionOffset, int positionCount, boolean[] valueIsNull, int[] values)
+    {
+        if (positionOffset < 0) {
+            throw new IllegalArgumentException("positionOffset is negative");
+        }
+        this.positionOffset = positionOffset;
+        if (positionCount < 0) {
+            throw new IllegalArgumentException("positionCount is negative");
+        }
+        this.positionCount = positionCount;
+
+        if (values.length - (positionOffset * 3) < positionCount * 3) {
+            throw new IllegalArgumentException("values length is less than positionCount");
+        }
+        this.values = values;
+
+        if (valueIsNull != null && valueIsNull.length - positionOffset < positionCount) {
+            throw new IllegalArgumentException("isNull length is less than positionCount");
+        }
+        this.valueIsNull = valueIsNull;
+
+        retainedSizeInBytes = INSTANCE_SIZE + sizeOf(valueIsNull) + sizeOf(values);
+    }
+
+    @Override
+    public OptionalInt fixedSizeInBytesPerPosition()
+    {
+        return OptionalInt.of(SIZE_IN_BYTES_PER_POSITION);
+    }
+
+    @Override
+    public long getSizeInBytes()
+    {
+        return SIZE_IN_BYTES_PER_POSITION * (long) positionCount;
+    }
+
+    @Override
+    public long getRegionSizeInBytes(int position, int length)
+    {
+        return SIZE_IN_BYTES_PER_POSITION * (long) length;
+    }
+
+    @Override
+    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionsCount)
+    {
+        return (long) SIZE_IN_BYTES_PER_POSITION * selectedPositionsCount;
+    }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return retainedSizeInBytes;
+    }
+
+    @Override
+    public long getEstimatedDataSizeForStats(int position)
+    {
+        return isNull(position) ? 0 : FIXED12_BYTES;
+    }
+
+    @Override
+    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
+    {
+        consumer.accept(values, sizeOf(values));
+        if (valueIsNull != null) {
+            consumer.accept(valueIsNull, sizeOf(valueIsNull));
+        }
+        consumer.accept(this, INSTANCE_SIZE);
+    }
+
+    @Override
+    public int getPositionCount()
+    {
+        return positionCount;
+    }
+
+    @Override
+    public long getLong(int position, int offset)
+    {
+        if (offset != 0) {
+            // If needed, we can add support for offset 4
+            throw new IllegalArgumentException("offset must be 0");
+        }
+        return getFixed12First(position);
+    }
+
+    @Override
+    public int getInt(int position, int offset)
+    {
+        checkReadablePosition(this, position);
+        if (offset == 0) {
+            return values[(position + positionOffset) * 3];
+        }
+        if (offset == 4) {
+            return values[((position + positionOffset) * 3) + 1];
+        }
+        if (offset == 8) {
+            return values[((position + positionOffset) * 3) + 2];
+        }
+        throw new IllegalArgumentException("offset must be 0, 4, or 8");
+    }
+
+    public long getFixed12First(int position)
+    {
+        checkReadablePosition(this, position);
+        return decodeFixed12First(values, position + positionOffset);
+    }
+
+    public int getFixed12Second(int position)
+    {
+        return decodeFixed12Second(values, position + positionOffset);
+    }
+
+    @Override
+    public boolean mayHaveNull()
+    {
+        return valueIsNull != null;
+    }
+
+    @Override
+    public boolean isNull(int position)
+    {
+        checkReadablePosition(this, position);
+        return valueIsNull != null && valueIsNull[position + positionOffset];
+    }
+
+    @Override
+    public Fixed12Block getSingleValueBlock(int position)
+    {
+        checkReadablePosition(this, position);
+        int index = (position + positionOffset) * 3;
+        return new Fixed12Block(
+                0,
+                1,
+                isNull(position) ? new boolean[] {true} : null,
+                new int[] {values[index], values[index + 1], values[index + 2]});
+    }
+
+    @Override
+    public Fixed12Block copyPositions(int[] positions, int offset, int length)
+    {
+        checkArrayRange(positions, offset, length);
+
+        boolean[] newValueIsNull = null;
+        if (valueIsNull != null) {
+            newValueIsNull = new boolean[length];
+        }
+        int[] newValues = new int[length * 3];
+        for (int i = 0; i < length; i++) {
+            int position = positions[offset + i];
+            checkReadablePosition(this, position);
+            if (valueIsNull != null) {
+                newValueIsNull[i] = valueIsNull[position + positionOffset];
+            }
+            int valuesIndex = (position + positionOffset) * 3;
+            int newValuesIndex = i * 3;
+            newValues[newValuesIndex] = values[valuesIndex];
+            newValues[newValuesIndex + 1] = values[valuesIndex + 1];
+            newValues[newValuesIndex + 2] = values[valuesIndex + 2];
+        }
+        return new Fixed12Block(0, length, newValueIsNull, newValues);
+    }
+
+    @Override
+    public Fixed12Block getRegion(int positionOffset, int length)
+    {
+        checkValidRegion(getPositionCount(), positionOffset, length);
+
+        return new Fixed12Block(positionOffset + this.positionOffset, length, valueIsNull, values);
+    }
+
+    @Override
+    public Fixed12Block copyRegion(int positionOffset, int length)
+    {
+        checkValidRegion(getPositionCount(), positionOffset, length);
+
+        positionOffset += this.positionOffset;
+        boolean[] newValueIsNull = valueIsNull == null ? null : compactArray(valueIsNull, positionOffset, length);
+        int[] newValues = compactArray(values, positionOffset * 3, length * 3);
+
+        if (newValueIsNull == valueIsNull && newValues == values) {
+            return this;
+        }
+        return new Fixed12Block(0, length, newValueIsNull, newValues);
+    }
+
+    @Override
+    public String getEncodingName()
+    {
+        return Fixed12BlockEncoding.NAME;
+    }
+
+    @Override
+    public Fixed12Block copyWithAppendedNull()
+    {
+        boolean[] newValueIsNull = copyIsNullAndAppendNull(valueIsNull, positionOffset, positionCount);
+        int[] newValues = ensureCapacity(values, (positionOffset + positionCount + 1) * 3);
+        return new Fixed12Block(positionOffset, positionCount + 1, newValueIsNull, newValues);
+    }
+
+    @Override
+    public Fixed12Block getUnderlyingValueBlock()
+    {
+        return this;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder("Fixed12Block{");
+        sb.append("positionCount=").append(getPositionCount());
+        sb.append('}');
+        return sb.toString();
+    }
+
+    /**
+     * At position * 3 in the values, write a little endian long followed by a little endian int.
+     */
+    public static void encodeFixed12(long first, int second, int[] values, int position)
+    {
+        int entryPosition = position * 3;
+        values[entryPosition] = (int) first;
+        values[entryPosition + 1] = (int) (first >>> 32);
+        values[entryPosition + 2] = second;
+    }
+
+    /**
+     * At position * 3 in the values, read a little endian long.
+     */
+    public static long decodeFixed12First(int[] values, int position)
+    {
+        int offset = position * 3;
+        long high32 = (long) values[offset + 1] << 32;
+        long low32 = values[offset] & 0xFFFF_FFFFL;
+        return high32 | low32;
+    }
+
+    /**
+     * At position * 3 + 8 in the values, read a little endian int.
+     */
+    public static int decodeFixed12Second(int[] values, int position)
+    {
+        int offset = position * 3;
+        return values[offset + 2];
+    }
+
+    int getPositionOffset()
+    {
+        return positionOffset;
+    }
+
+    int[] getRawValues()
+    {
+        return values;
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/Fixed12BlockBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/Fixed12BlockBuilder.java
new file mode 100644
index 000000000000..f0d9e278510f
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/Fixed12BlockBuilder.java
@@ -0,0 +1,158 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import jakarta.annotation.Nullable;
+
+import java.util.Arrays;
+
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.spi.block.Fixed12Block.FIXED12_BYTES;
+import static io.trino.spi.block.Fixed12Block.encodeFixed12;
+import static java.lang.Math.max;
+
+public class Fixed12BlockBuilder
+        implements BlockBuilder
+{
+    private static final int INSTANCE_SIZE = instanceSize(Fixed12BlockBuilder.class);
+    private static final Block NULL_VALUE_BLOCK = new Fixed12Block(0, 1, new boolean[] {true}, new int[3]);
+
+    @Nullable
+    private final BlockBuilderStatus blockBuilderStatus;
+    private boolean initialized;
+    private final int initialEntryCount;
+
+    private int positionCount;
+    private boolean hasNullValue;
+    private boolean hasNonNullValue;
+
+    // it is assumed that these arrays are the same length
+    private boolean[] valueIsNull = new boolean[0];
+    private int[] values = new int[0];
+
+    private long retainedSizeInBytes;
+
+    public Fixed12BlockBuilder(@Nullable BlockBuilderStatus blockBuilderStatus, int expectedEntries)
+    {
+        this.blockBuilderStatus = blockBuilderStatus;
+        this.initialEntryCount = max(expectedEntries, 1);
+
+        updateDataSize();
+    }
+
+    public void writeFixed12(long first, int second)
+    {
+        if (valueIsNull.length <= positionCount) {
+            growCapacity();
+        }
+
+        encodeFixed12(first, second, values, positionCount);
+
+        hasNonNullValue = true;
+        positionCount++;
+        if (blockBuilderStatus != null) {
+            blockBuilderStatus.addBytes(Byte.BYTES + FIXED12_BYTES);
+        }
+    }
+
+    @Override
+    public BlockBuilder appendNull()
+    {
+        if (valueIsNull.length <= positionCount) {
+            growCapacity();
+        }
+
+        valueIsNull[positionCount] = true;
+
+        hasNullValue = true;
+        positionCount++;
+        if (blockBuilderStatus != null) {
+            blockBuilderStatus.addBytes(Byte.BYTES + FIXED12_BYTES);
+        }
+        return this;
+    }
+
+    @Override
+    public Block build()
+    {
+        if (!hasNonNullValue) {
+            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, positionCount);
+        }
+        return buildValueBlock();
+    }
+
+    @Override
+    public Fixed12Block buildValueBlock()
+    {
+        return new Fixed12Block(0, positionCount, hasNullValue ? valueIsNull : null, values);
+    }
+
+    @Override
+    public BlockBuilder newBlockBuilderLike(int expectedEntries, BlockBuilderStatus blockBuilderStatus)
+    {
+        return new Fixed12BlockBuilder(blockBuilderStatus, expectedEntries);
+    }
+
+    private void growCapacity()
+    {
+        int newSize;
+        if (initialized) {
+            newSize = BlockUtil.calculateNewArraySize(valueIsNull.length);
+        }
+        else {
+            newSize = initialEntryCount;
+            initialized = true;
+        }
+
+        valueIsNull = Arrays.copyOf(valueIsNull, newSize);
+        values = Arrays.copyOf(values, newSize * 3);
+        updateDataSize();
+    }
+
+    private void updateDataSize()
+    {
+        retainedSizeInBytes = INSTANCE_SIZE + sizeOf(valueIsNull) + sizeOf(values);
+        if (blockBuilderStatus != null) {
+            retainedSizeInBytes += BlockBuilderStatus.INSTANCE_SIZE;
+        }
+    }
+
+    @Override
+    public long getSizeInBytes()
+    {
+        return Fixed12Block.SIZE_IN_BYTES_PER_POSITION * (long) positionCount;
+    }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return retainedSizeInBytes;
+    }
+
+    @Override
+    public int getPositionCount()
+    {
+        return positionCount;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder("Fixed12BlockBuilder{");
+        sb.append("positionCount=").append(getPositionCount());
+        sb.append('}');
+        return sb.toString();
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/Fixed12BlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/Fixed12BlockEncoding.java
new file mode 100644
index 000000000000..131837f74c86
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/Fixed12BlockEncoding.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.airlift.slice.SliceInput;
+import io.airlift.slice.SliceOutput;
+
+import static io.trino.spi.block.EncoderUtil.decodeNullBits;
+import static io.trino.spi.block.EncoderUtil.encodeNullsAsBits;
+
+public class Fixed12BlockEncoding
+        implements BlockEncoding
+{
+    public static final String NAME = "FIXED12";
+
+    @Override
+    public String getName()
+    {
+        return NAME;
+    }
+
+    @Override
+    public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
+    {
+        Fixed12Block fixed12Block = (Fixed12Block) block;
+        int positionCount = fixed12Block.getPositionCount();
+        sliceOutput.appendInt(positionCount);
+
+        encodeNullsAsBits(sliceOutput, fixed12Block);
+
+        if (!fixed12Block.mayHaveNull()) {
+            sliceOutput.writeInts(fixed12Block.getRawValues(), fixed12Block.getPositionOffset() * 3, fixed12Block.getPositionCount() * 3);
+        }
+        else {
+            int[] valuesWithoutNull = new int[positionCount * 3];
+            int nonNullPositionCount = 0;
+            for (int i = 0; i < positionCount; i++) {
+                valuesWithoutNull[nonNullPositionCount] = fixed12Block.getInt(i, 0);
+                valuesWithoutNull[nonNullPositionCount + 1] = fixed12Block.getInt(i, 4);
+                valuesWithoutNull[nonNullPositionCount + 2] = fixed12Block.getInt(i, 8);
+                if (!fixed12Block.isNull(i)) {
+                    nonNullPositionCount += 3;
+                }
+            }
+
+            sliceOutput.writeInt(nonNullPositionCount / 3);
+            sliceOutput.writeInts(valuesWithoutNull, 0, nonNullPositionCount);
+        }
+    }
+
+    @Override
+    public Fixed12Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
+    {
+        int positionCount = sliceInput.readInt();
+
+        boolean[] valueIsNull = decodeNullBits(sliceInput, positionCount).orElse(null);
+
+        int[] values = new int[positionCount * 3];
+        if (valueIsNull == null) {
+            sliceInput.readInts(values);
+        }
+        else {
+            int nonNullPositionCount = sliceInput.readInt();
+            sliceInput.readInts(values, 0, nonNullPositionCount * 3);
+            int position = 3 * (nonNullPositionCount - 1);
+            for (int i = positionCount - 1; i >= 0 && position >= 0; i--) {
+                System.arraycopy(values, position, values, 3 * i, 3);
+                if (!valueIsNull[i]) {
+                    position -= 3;
+                }
+            }
+        }
+        return new Fixed12Block(0, positionCount, valueIsNull, values);
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlock.java
index c8e4a5ef3aaa..57b8e4ac9bd4 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlock.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlock.java
@@ -13,10 +13,8 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import io.trino.spi.type.Int128;
+import jakarta.annotation.Nullable;
 
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -31,8 +29,8 @@
 import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
 import static io.trino.spi.block.BlockUtil.ensureCapacity;
 
-public class Int128ArrayBlock
-        implements Block
+public final class Int128ArrayBlock
+        implements ValueBlock
 {
     private static final int INSTANCE_SIZE = instanceSize(Int128ArrayBlock.class);
     public static final int INT128_BYTES = Long.BYTES + Long.BYTES;
@@ -130,16 +128,34 @@ public int getPositionCount()
     @Override
     public long getLong(int position, int offset)
     {
-        checkReadablePosition(this, position);
         if (offset == 0) {
-            return values[(position + positionOffset) * 2];
+            return getInt128High(position);
         }
         if (offset == 8) {
-            return values[((position + positionOffset) * 2) + 1];
+            return getInt128Low(position);
         }
         throw new IllegalArgumentException("offset must be 0 or 8");
     }
 
+    public Int128 getInt128(int position)
+    {
+        checkReadablePosition(this, position);
+        int offset = (position + positionOffset) * 2;
+        return Int128.valueOf(values[offset], values[offset + 1]);
+    }
+
+    public long getInt128High(int position)
+    {
+        checkReadablePosition(this, position);
+        return values[(position + positionOffset) * 2];
+    }
+
+    public long getInt128Low(int position)
+    {
+        checkReadablePosition(this, position);
+        return values[((position + positionOffset) * 2) + 1];
+    }
+
     @Override
     public boolean mayHaveNull()
     {
@@ -154,7 +170,7 @@ public boolean isNull(int position)
     }
 
     @Override
-    public Block getSingleValueBlock(int position)
+    public Int128ArrayBlock getSingleValueBlock(int position)
     {
         checkReadablePosition(this, position);
         return new Int128ArrayBlock(
@@ -167,7 +183,7 @@ public Block getSingleValueBlock(int position)
     }
 
     @Override
-    public Block copyPositions(int[] positions, int offset, int length)
+    public Int128ArrayBlock copyPositions(int[] positions, int offset, int length)
     {
         checkArrayRange(positions, offset, length);
 
@@ -189,7 +205,7 @@ public Block copyPositions(int[] positions, int offset, int length)
     }
 
     @Override
-    public Block getRegion(int positionOffset, int length)
+    public Int128ArrayBlock getRegion(int positionOffset, int length)
     {
         checkValidRegion(getPositionCount(), positionOffset, length);
 
@@ -197,7 +213,7 @@ public Block getRegion(int positionOffset, int length)
     }
 
     @Override
-    public Block copyRegion(int positionOffset, int length)
+    public Int128ArrayBlock copyRegion(int positionOffset, int length)
     {
         checkValidRegion(getPositionCount(), positionOffset, length);
 
@@ -218,13 +234,19 @@ public String getEncodingName()
     }
 
     @Override
-    public Block copyWithAppendedNull()
+    public Int128ArrayBlock copyWithAppendedNull()
     {
         boolean[] newValueIsNull = copyIsNullAndAppendNull(valueIsNull, positionOffset, positionCount);
         long[] newValues = ensureCapacity(values, (positionOffset + positionCount + 1) * 2);
         return new Int128ArrayBlock(positionOffset, positionCount + 1, newValueIsNull, newValues);
     }
 
+    @Override
+    public Int128ArrayBlock getUnderlyingValueBlock()
+    {
+        return this;
+    }
+
     @Override
     public String toString()
     {
@@ -234,8 +256,13 @@ public String toString()
         return sb.toString();
     }
 
-    Slice getValuesSlice()
+    long[] getRawValues()
+    {
+        return values;
+    }
+
+    int getPositionOffset()
     {
-        return Slices.wrappedLongArray(values, positionOffset * 2, positionCount * 2);
+        return positionOffset;
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlockBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlockBuilder.java
index e40c87b6747f..f22ae8951fea 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlockBuilder.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlockBuilder.java
@@ -13,23 +13,12 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
 
-import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
-import static io.trino.spi.block.BlockUtil.compactArray;
-import static io.trino.spi.block.Int128ArrayBlock.INT128_BYTES;
 import static java.lang.Math.max;
 
 public class Int128ArrayBlockBuilder
@@ -53,8 +42,6 @@ public class Int128ArrayBlockBuilder
 
     private long retainedSizeInBytes;
 
-    private int entryPositionCount;
-
     public Int128ArrayBlockBuilder(@Nullable BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         this.blockBuilderStatus = blockBuilderStatus;
@@ -63,33 +50,21 @@ public Int128ArrayBlockBuilder(@Nullable BlockBuilderStatus blockBuilderStatus,
         updateDataSize();
     }
 
-    @Override
-    public BlockBuilder writeLong(long value)
+    public void writeInt128(long high, long low)
     {
         if (valueIsNull.length <= positionCount) {
             growCapacity();
         }
 
-        values[(positionCount * 2) + entryPositionCount] = value;
-        entryPositionCount++;
+        int valueIndex = positionCount * 2;
+        values[valueIndex] = high;
+        values[valueIndex + 1] = low;
 
         hasNonNullValue = true;
-        return this;
-    }
-
-    @Override
-    public BlockBuilder closeEntry()
-    {
-        if (entryPositionCount != 2) {
-            throw new IllegalStateException("Expected entry size to be exactly " + INT128_BYTES + " bytes but was " + (entryPositionCount * SIZE_OF_LONG));
-        }
-
         positionCount++;
-        entryPositionCount = 0;
         if (blockBuilderStatus != null) {
             blockBuilderStatus.addBytes(Int128ArrayBlock.SIZE_IN_BYTES_PER_POSITION);
         }
-        return this;
     }
 
     @Override
@@ -98,9 +73,6 @@ public BlockBuilder appendNull()
         if (valueIsNull.length <= positionCount) {
             growCapacity();
         }
-        if (entryPositionCount != 0) {
-            throw new IllegalStateException("Current entry must be closed before a null can be written");
-        }
 
         valueIsNull[positionCount] = true;
 
@@ -118,6 +90,12 @@ public Block build()
         if (!hasNonNullValue) {
             return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, positionCount);
         }
+        return buildValueBlock();
+    }
+
+    @Override
+    public Int128ArrayBlock buildValueBlock()
+    {
         return new Int128ArrayBlock(0, positionCount, hasNullValue ? valueIsNull : null, values);
     }
 
@@ -151,153 +129,24 @@ private void updateDataSize()
         }
     }
 
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.of(Int128ArrayBlock.SIZE_IN_BYTES_PER_POSITION);
-    }
-
     @Override
     public long getSizeInBytes()
     {
         return Int128ArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) positionCount;
     }
 
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        return Int128ArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) length;
-    }
-
-    @Override
-    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionsCount)
-    {
-        return Int128ArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) selectedPositionsCount;
-    }
-
     @Override
     public long getRetainedSizeInBytes()
     {
         return retainedSizeInBytes;
     }
 
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        return isNull(position) ? 0 : INT128_BYTES;
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(values, sizeOf(values));
-        consumer.accept(valueIsNull, sizeOf(valueIsNull));
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
     @Override
     public int getPositionCount()
     {
         return positionCount;
     }
 
-    @Override
-    public long getLong(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        if (offset == 0) {
-            return values[position * 2];
-        }
-        if (offset == 8) {
-            return values[(position * 2) + 1];
-        }
-        throw new IllegalArgumentException("offset must be 0 or 8");
-    }
-
-    @Override
-    public boolean mayHaveNull()
-    {
-        return hasNullValue;
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkReadablePosition(this, position);
-        return valueIsNull[position];
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        checkReadablePosition(this, position);
-        return new Int128ArrayBlock(
-                0,
-                1,
-                valueIsNull[position] ? new boolean[] {true} : null,
-                new long[] {
-                        values[position * 2],
-                        values[(position * 2) + 1]});
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = new boolean[length];
-        }
-        long[] newValues = new long[length * 2];
-        for (int i = 0; i < length; i++) {
-            int position = positions[offset + i];
-            checkReadablePosition(this, position);
-            if (hasNullValue) {
-                newValueIsNull[i] = valueIsNull[position];
-            }
-            newValues[i * 2] = values[(position * 2)];
-            newValues[(i * 2) + 1] = values[(position * 2) + 1];
-        }
-        return new Int128ArrayBlock(0, length, newValueIsNull, newValues);
-    }
-
-    @Override
-    public Block getRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        return new Int128ArrayBlock(positionOffset, length, hasNullValue ? valueIsNull : null, values);
-    }
-
-    @Override
-    public Block copyRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = compactArray(valueIsNull, positionOffset, length);
-        }
-        long[] newValues = compactArray(values, positionOffset * 2, length * 2);
-        return new Int128ArrayBlock(0, length, newValueIsNull, newValues);
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        return Int128ArrayBlockEncoding.NAME;
-    }
-
     @Override
     public String toString()
     {
@@ -306,9 +155,4 @@ public String toString()
         sb.append('}');
         return sb.toString();
     }
-
-    Slice getValuesSlice()
-    {
-        return Slices.wrappedLongArray(values, 0, positionCount * 2);
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlockEncoding.java
index 6ce731e4e8cc..78e8191202e5 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlockEncoding.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/Int128ArrayBlockEncoding.java
@@ -13,10 +13,8 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.SliceOutput;
-import io.airlift.slice.Slices;
 
 import static io.trino.spi.block.EncoderUtil.decodeNullBits;
 import static io.trino.spi.block.EncoderUtil.encodeNullsAsBits;
@@ -35,32 +33,33 @@ public String getName()
     @Override
     public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
     {
-        int positionCount = block.getPositionCount();
+        Int128ArrayBlock int128ArrayBlock = (Int128ArrayBlock) block;
+        int positionCount = int128ArrayBlock.getPositionCount();
         sliceOutput.appendInt(positionCount);
 
-        encodeNullsAsBits(sliceOutput, block);
+        encodeNullsAsBits(sliceOutput, int128ArrayBlock);
 
-        if (!block.mayHaveNull()) {
-            sliceOutput.writeBytes(getValuesSlice(block));
+        if (!int128ArrayBlock.mayHaveNull()) {
+            sliceOutput.writeLongs(int128ArrayBlock.getRawValues(), int128ArrayBlock.getPositionOffset() * 2, int128ArrayBlock.getPositionCount() * 2);
         }
         else {
             long[] valuesWithoutNull = new long[positionCount * 2];
             int nonNullPositionCount = 0;
             for (int i = 0; i < positionCount; i++) {
-                valuesWithoutNull[nonNullPositionCount] = block.getLong(i, 0);
-                valuesWithoutNull[nonNullPositionCount + 1] = block.getLong(i, 8);
-                if (!block.isNull(i)) {
+                valuesWithoutNull[nonNullPositionCount] = int128ArrayBlock.getInt128High(i);
+                valuesWithoutNull[nonNullPositionCount + 1] = int128ArrayBlock.getInt128Low(i);
+                if (!int128ArrayBlock.isNull(i)) {
                     nonNullPositionCount += 2;
                 }
             }
 
             sliceOutput.writeInt(nonNullPositionCount / 2);
-            sliceOutput.writeBytes(Slices.wrappedLongArray(valuesWithoutNull, 0, nonNullPositionCount));
+            sliceOutput.writeLongs(valuesWithoutNull, 0, nonNullPositionCount);
         }
     }
 
     @Override
-    public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
+    public Int128ArrayBlock readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
     {
         int positionCount = sliceInput.readInt();
 
@@ -68,11 +67,11 @@ public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceIn
 
         long[] values = new long[positionCount * 2];
         if (valueIsNull == null) {
-            sliceInput.readBytes(Slices.wrappedLongArray(values));
+            sliceInput.readLongs(values);
         }
         else {
             int nonNullPositionCount = sliceInput.readInt();
-            sliceInput.readBytes(Slices.wrappedLongArray(values, 0, nonNullPositionCount * 2));
+            sliceInput.readLongs(values, 0, nonNullPositionCount * 2);
             int position = 2 * (nonNullPositionCount - 1);
             for (int i = positionCount - 1; i >= 0 && position >= 0; i--) {
                 System.arraycopy(values, position, values, 2 * i, 2);
@@ -84,16 +83,4 @@ public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceIn
 
         return new Int128ArrayBlock(0, positionCount, valueIsNull, values);
     }
-
-    private Slice getValuesSlice(Block block)
-    {
-        if (block instanceof Int128ArrayBlock) {
-            return ((Int128ArrayBlock) block).getValuesSlice();
-        }
-        if (block instanceof Int128ArrayBlockBuilder) {
-            return ((Int128ArrayBlockBuilder) block).getValuesSlice();
-        }
-
-        throw new IllegalArgumentException("Unexpected block type " + block.getClass().getSimpleName());
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/Int96ArrayBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/Int96ArrayBlock.java
deleted file mode 100644
index f0bb53e3631b..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/Int96ArrayBlock.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
-
-import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
-
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
-import static io.trino.spi.block.BlockUtil.compactArray;
-import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
-import static io.trino.spi.block.BlockUtil.ensureCapacity;
-
-public class Int96ArrayBlock
-        implements Block
-{
-    private static final int INSTANCE_SIZE = instanceSize(Int96ArrayBlock.class);
-    public static final int INT96_BYTES = Long.BYTES + Integer.BYTES;
-    public static final int SIZE_IN_BYTES_PER_POSITION = INT96_BYTES + Byte.BYTES;
-
-    private final int positionOffset;
-    private final int positionCount;
-    @Nullable
-    private final boolean[] valueIsNull;
-    private final long[] high;
-    private final int[] low;
-
-    private final long retainedSizeInBytes;
-
-    public Int96ArrayBlock(int positionCount, Optional<boolean[]> valueIsNull, long[] high, int[] low)
-    {
-        this(0, positionCount, valueIsNull.orElse(null), high, low);
-    }
-
-    Int96ArrayBlock(int positionOffset, int positionCount, boolean[] valueIsNull, long[] high, int[] low)
-    {
-        if (positionOffset < 0) {
-            throw new IllegalArgumentException("positionOffset is negative");
-        }
-        this.positionOffset = positionOffset;
-        if (positionCount < 0) {
-            throw new IllegalArgumentException("positionCount is negative");
-        }
-        this.positionCount = positionCount;
-
-        if (high.length - positionOffset < positionCount) {
-            throw new IllegalArgumentException("high length is less than positionCount");
-        }
-        this.high = high;
-
-        if (low.length - positionOffset < positionCount) {
-            throw new IllegalArgumentException("low length is less than positionCount");
-        }
-        this.low = low;
-
-        if (valueIsNull != null && valueIsNull.length - positionOffset < positionCount) {
-            throw new IllegalArgumentException("isNull length is less than positionCount");
-        }
-        this.valueIsNull = valueIsNull;
-
-        retainedSizeInBytes = INSTANCE_SIZE + sizeOf(valueIsNull) + sizeOf(high) + sizeOf(low);
-    }
-
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.of(SIZE_IN_BYTES_PER_POSITION);
-    }
-
-    @Override
-    public long getSizeInBytes()
-    {
-        return SIZE_IN_BYTES_PER_POSITION * (long) positionCount;
-    }
-
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        return SIZE_IN_BYTES_PER_POSITION * (long) length;
-    }
-
-    @Override
-    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionsCount)
-    {
-        return (long) SIZE_IN_BYTES_PER_POSITION * selectedPositionsCount;
-    }
-
-    @Override
-    public long getRetainedSizeInBytes()
-    {
-        return retainedSizeInBytes;
-    }
-
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        return isNull(position) ? 0 : INT96_BYTES;
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(high, sizeOf(high));
-        consumer.accept(low, sizeOf(low));
-        if (valueIsNull != null) {
-            consumer.accept(valueIsNull, sizeOf(valueIsNull));
-        }
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
-    @Override
-    public int getPositionCount()
-    {
-        return positionCount;
-    }
-
-    @Override
-    public long getLong(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        if (offset != 0) {
-            throw new IllegalArgumentException("offset must be 0");
-        }
-        return high[positionOffset + position];
-    }
-
-    @Override
-    public int getInt(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        if (offset != 8) {
-            throw new IllegalArgumentException("offset must be 8");
-        }
-        return low[positionOffset + position];
-    }
-
-    @Override
-    public boolean mayHaveNull()
-    {
-        return valueIsNull != null;
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkReadablePosition(this, position);
-        return valueIsNull != null && valueIsNull[position + positionOffset];
-    }
-
-    @Override
-    public Block copyWithAppendedNull()
-    {
-        boolean[] newValueIsNull = copyIsNullAndAppendNull(valueIsNull, positionOffset, positionCount);
-        long[] newHigh = ensureCapacity(high, positionOffset + positionCount + 1);
-        int[] newLow = ensureCapacity(low, positionOffset + positionCount + 1);
-        return new Int96ArrayBlock(positionOffset, positionCount + 1, newValueIsNull, newHigh, newLow);
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        checkReadablePosition(this, position);
-        return new Int96ArrayBlock(
-                0,
-                1,
-                isNull(position) ? new boolean[] {true} : null,
-                new long[] {high[position + positionOffset]},
-                new int[] {low[position + positionOffset]});
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        boolean[] newValueIsNull = null;
-        if (valueIsNull != null) {
-            newValueIsNull = new boolean[length];
-        }
-        long[] newHigh = new long[length];
-        int[] newLow = new int[length];
-        for (int i = 0; i < length; i++) {
-            int position = positions[offset + i];
-            checkReadablePosition(this, position);
-            if (valueIsNull != null) {
-                newValueIsNull[i] = valueIsNull[position + positionOffset];
-            }
-            newHigh[i] = high[position + positionOffset];
-            newLow[i] = low[position + positionOffset];
-        }
-        return new Int96ArrayBlock(0, length, newValueIsNull, newHigh, newLow);
-    }
-
-    @Override
-    public Block getRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        return new Int96ArrayBlock(positionOffset + this.positionOffset, length, valueIsNull, high, low);
-    }
-
-    @Override
-    public Block copyRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        positionOffset += this.positionOffset;
-        boolean[] newValueIsNull = valueIsNull == null ? null : compactArray(valueIsNull, positionOffset, length);
-        long[] newHigh = compactArray(high, positionOffset, length);
-        int[] newLow = compactArray(low, positionOffset, length);
-
-        if (newValueIsNull == valueIsNull && newHigh == high && newLow == low) {
-            return this;
-        }
-        return new Int96ArrayBlock(0, length, newValueIsNull, newHigh, newLow);
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        return Int96ArrayBlockEncoding.NAME;
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder("Int96ArrayBlock{");
-        sb.append("positionCount=").append(getPositionCount());
-        sb.append('}');
-        return sb.toString();
-    }
-
-    Slice getHighSlice()
-    {
-        return Slices.wrappedLongArray(high, positionOffset, positionCount);
-    }
-
-    Slice getLowSlice()
-    {
-        return Slices.wrappedIntArray(low, positionOffset, positionCount);
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/Int96ArrayBlockBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/Int96ArrayBlockBuilder.java
deleted file mode 100644
index 3a22b9ca667a..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/Int96ArrayBlockBuilder.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
-
-import java.util.Arrays;
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
-
-import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
-import static io.trino.spi.block.BlockUtil.compactArray;
-import static io.trino.spi.block.Int96ArrayBlock.INT96_BYTES;
-import static java.lang.Math.max;
-
-public class Int96ArrayBlockBuilder
-        implements BlockBuilder
-{
-    private static final int INSTANCE_SIZE = instanceSize(Int96ArrayBlockBuilder.class);
-    private static final Block NULL_VALUE_BLOCK = new Int96ArrayBlock(0, 1, new boolean[] {true}, new long[1], new int[1]);
-
-    @Nullable
-    private final BlockBuilderStatus blockBuilderStatus;
-    private boolean initialized;
-    private final int initialEntryCount;
-
-    private int positionCount;
-    private boolean hasNullValue;
-    private boolean hasNonNullValue;
-
-    // it is assumed that these arrays are the same length
-    private boolean[] valueIsNull = new boolean[0];
-    private long[] high = new long[0];
-    private int[] low = new int[0];
-
-    private long retainedSizeInBytes;
-
-    private int entryPositionCount;
-
-    public Int96ArrayBlockBuilder(@Nullable BlockBuilderStatus blockBuilderStatus, int expectedEntries)
-    {
-        this.blockBuilderStatus = blockBuilderStatus;
-        this.initialEntryCount = max(expectedEntries, 1);
-
-        updateDataSize();
-    }
-
-    @Override
-    public BlockBuilder writeLong(long high)
-    {
-        if (entryPositionCount != 0) {
-            throw new IllegalArgumentException("long can only be written at the beginning of the entry");
-        }
-
-        if (valueIsNull.length <= positionCount) {
-            growCapacity();
-        }
-
-        this.high[positionCount] = high;
-        hasNonNullValue = true;
-        entryPositionCount++;
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeInt(int low)
-    {
-        if (entryPositionCount != 1) {
-            throw new IllegalArgumentException("int can only be written at the end of the entry");
-        }
-
-        if (valueIsNull.length <= positionCount) {
-            growCapacity();
-        }
-
-        this.low[positionCount] = low;
-        hasNonNullValue = true;
-        entryPositionCount++;
-        return this;
-    }
-
-    @Override
-    public BlockBuilder closeEntry()
-    {
-        if (entryPositionCount != 2) {
-            throw new IllegalStateException("Expected entry size to be exactly " + INT96_BYTES + " bytes but was " + (entryPositionCount * SIZE_OF_LONG));
-        }
-
-        positionCount++;
-        entryPositionCount = 0;
-        if (blockBuilderStatus != null) {
-            blockBuilderStatus.addBytes(Byte.BYTES + INT96_BYTES);
-        }
-        return this;
-    }
-
-    @Override
-    public BlockBuilder appendNull()
-    {
-        if (entryPositionCount != 0) {
-            throw new IllegalStateException("Current entry must be closed before a null can be written");
-        }
-
-        if (valueIsNull.length <= positionCount) {
-            growCapacity();
-        }
-
-        valueIsNull[positionCount] = true;
-
-        hasNullValue = true;
-        positionCount++;
-        if (blockBuilderStatus != null) {
-            blockBuilderStatus.addBytes(Byte.BYTES + INT96_BYTES);
-        }
-        return this;
-    }
-
-    @Override
-    public Block build()
-    {
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, positionCount);
-        }
-        return new Int96ArrayBlock(0, positionCount, hasNullValue ? valueIsNull : null, high, low);
-    }
-
-    @Override
-    public BlockBuilder newBlockBuilderLike(int expectedEntries, BlockBuilderStatus blockBuilderStatus)
-    {
-        return new Int96ArrayBlockBuilder(blockBuilderStatus, expectedEntries);
-    }
-
-    private void growCapacity()
-    {
-        int newSize;
-        if (initialized) {
-            newSize = BlockUtil.calculateNewArraySize(valueIsNull.length);
-        }
-        else {
-            newSize = initialEntryCount;
-            initialized = true;
-        }
-
-        valueIsNull = Arrays.copyOf(valueIsNull, newSize);
-        high = Arrays.copyOf(high, newSize);
-        low = Arrays.copyOf(low, newSize);
-        updateDataSize();
-    }
-
-    private void updateDataSize()
-    {
-        retainedSizeInBytes = INSTANCE_SIZE + sizeOf(valueIsNull) + sizeOf(high) + sizeOf(low);
-        if (blockBuilderStatus != null) {
-            retainedSizeInBytes += BlockBuilderStatus.INSTANCE_SIZE;
-        }
-    }
-
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.of(Int96ArrayBlock.SIZE_IN_BYTES_PER_POSITION);
-    }
-
-    @Override
-    public long getSizeInBytes()
-    {
-        return Int96ArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) positionCount;
-    }
-
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        return Int96ArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) length;
-    }
-
-    @Override
-    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionsCount)
-    {
-        return Int96ArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) selectedPositionsCount;
-    }
-
-    @Override
-    public long getRetainedSizeInBytes()
-    {
-        return retainedSizeInBytes;
-    }
-
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        return isNull(position) ? 0 : INT96_BYTES;
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(high, sizeOf(high));
-        consumer.accept(low, sizeOf(low));
-        consumer.accept(valueIsNull, sizeOf(valueIsNull));
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
-    @Override
-    public int getPositionCount()
-    {
-        return positionCount;
-    }
-
-    @Override
-    public long getLong(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        if (offset != 0) {
-            throw new IllegalArgumentException("offset must be 0");
-        }
-
-        return high[position];
-    }
-
-    @Override
-    public int getInt(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        if (offset != 8) {
-            throw new IllegalArgumentException("offset must be 8");
-        }
-
-        return low[position];
-    }
-
-    @Override
-    public boolean mayHaveNull()
-    {
-        return hasNullValue;
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkReadablePosition(this, position);
-        return valueIsNull[position];
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        checkReadablePosition(this, position);
-        return new Int96ArrayBlock(
-                0,
-                1,
-                valueIsNull[position] ? new boolean[] {true} : null,
-                new long[] {high[position]},
-                new int[] {low[position]});
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = new boolean[length];
-        }
-        long[] newHigh = new long[length];
-        int[] newLow = new int[length];
-        for (int i = 0; i < length; i++) {
-            int position = positions[offset + i];
-            checkReadablePosition(this, position);
-            if (hasNullValue) {
-                newValueIsNull[i] = valueIsNull[position];
-            }
-            newHigh[i] = high[position];
-            newLow[i] = low[position];
-        }
-        return new Int96ArrayBlock(0, length, newValueIsNull, newHigh, newLow);
-    }
-
-    @Override
-    public Block getRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        return new Int96ArrayBlock(positionOffset, length, hasNullValue ? valueIsNull : null, high, low);
-    }
-
-    @Override
-    public Block copyRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = compactArray(valueIsNull, positionOffset, length);
-        }
-        long[] newHigh = compactArray(high, positionOffset, length);
-        int[] newLow = compactArray(low, positionOffset, length);
-        return new Int96ArrayBlock(0, length, newValueIsNull, newHigh, newLow);
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        return Int96ArrayBlockEncoding.NAME;
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder("Int96ArrayBlockBuilder{");
-        sb.append("positionCount=").append(getPositionCount());
-        sb.append('}');
-        return sb.toString();
-    }
-
-    Slice getHighSlice()
-    {
-        return Slices.wrappedLongArray(high, 0, positionCount);
-    }
-
-    Slice getLowSlice()
-    {
-        return Slices.wrappedIntArray(low, 0, positionCount);
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/Int96ArrayBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/Int96ArrayBlockEncoding.java
deleted file mode 100644
index c94421cbfafe..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/Int96ArrayBlockEncoding.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.airlift.slice.Slice;
-import io.airlift.slice.SliceInput;
-import io.airlift.slice.SliceOutput;
-import io.airlift.slice.Slices;
-
-import static io.trino.spi.block.EncoderUtil.decodeNullBits;
-import static io.trino.spi.block.EncoderUtil.encodeNullsAsBits;
-import static io.trino.spi.block.EncoderUtil.retrieveNullBits;
-import static java.lang.System.arraycopy;
-
-public class Int96ArrayBlockEncoding
-        implements BlockEncoding
-{
-    public static final String NAME = "INT96_ARRAY";
-
-    @Override
-    public String getName()
-    {
-        return NAME;
-    }
-
-    @Override
-    public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
-    {
-        int positionCount = block.getPositionCount();
-        sliceOutput.appendInt(positionCount);
-
-        encodeNullsAsBits(sliceOutput, block);
-
-        if (!block.mayHaveNull()) {
-            sliceOutput.writeBytes(getHighSlice(block));
-            sliceOutput.writeBytes(getLowSlice(block));
-        }
-        else {
-            long[] high = new long[positionCount];
-            int[] low = new int[positionCount];
-            int nonNullPositionCount = 0;
-            for (int i = 0; i < positionCount; i++) {
-                high[nonNullPositionCount] = block.getLong(i, 0);
-                low[nonNullPositionCount] = block.getInt(i, 8);
-                if (!block.isNull(i)) {
-                    nonNullPositionCount++;
-                }
-            }
-
-            sliceOutput.writeInt(nonNullPositionCount);
-            sliceOutput.writeBytes(Slices.wrappedLongArray(high, 0, nonNullPositionCount));
-            sliceOutput.writeBytes(Slices.wrappedIntArray(low, 0, nonNullPositionCount));
-        }
-    }
-
-    @Override
-    public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
-    {
-        int positionCount = sliceInput.readInt();
-
-        byte[] valueIsNullPacked = retrieveNullBits(sliceInput, positionCount);
-        long[] high = new long[positionCount];
-        int[] low = new int[positionCount];
-
-        if (valueIsNullPacked == null) {
-            sliceInput.readBytes(Slices.wrappedLongArray(high));
-            sliceInput.readBytes(Slices.wrappedIntArray(low));
-            return new Int96ArrayBlock(0, positionCount, null, high, low);
-        }
-        boolean[] valueIsNull = decodeNullBits(valueIsNullPacked, positionCount);
-
-        int nonNullPositionCount = sliceInput.readInt();
-        sliceInput.readBytes(Slices.wrappedLongArray(high, 0, nonNullPositionCount));
-        sliceInput.readBytes(Slices.wrappedIntArray(low, 0, nonNullPositionCount));
-        int position = nonNullPositionCount - 1;
-
-        // Handle Last (positionCount % 8) values
-        for (int i = positionCount - 1; i >= (positionCount & ~0b111) && position >= 0; i--) {
-            high[i] = high[position];
-            low[i] = low[position];
-            if (!valueIsNull[i]) {
-                position--;
-            }
-        }
-
-        // Handle the remaining positions.
-        for (int i = (positionCount & ~0b111) - 8; i >= 0 && position >= 0; i -= 8) {
-            byte packed = valueIsNullPacked[i >> 3];
-            if (packed == 0) { // Only values
-                arraycopy(high, position - 7, high, i, 8);
-                arraycopy(low, position - 7, low, i, 8);
-                position -= 8;
-            }
-            else if (packed != -1) { // At least one non-null
-                for (int j = i + 7; j >= i && position >= 0; j--) {
-                    high[j] = high[position];
-                    low[j] = low[position];
-                    if (!valueIsNull[j]) {
-                        position--;
-                    }
-                }
-            }
-            // Do nothing if there are only nulls
-        }
-        return new Int96ArrayBlock(0, positionCount, valueIsNull, high, low);
-    }
-
-    private Slice getHighSlice(Block block)
-    {
-        if (block instanceof Int96ArrayBlock) {
-            return ((Int96ArrayBlock) block).getHighSlice();
-        }
-        if (block instanceof Int96ArrayBlockBuilder) {
-            return ((Int96ArrayBlockBuilder) block).getHighSlice();
-        }
-
-        throw new IllegalArgumentException("Unexpected block type " + block.getClass().getSimpleName());
-    }
-
-    private Slice getLowSlice(Block block)
-    {
-        if (block instanceof Int96ArrayBlock) {
-            return ((Int96ArrayBlock) block).getLowSlice();
-        }
-        if (block instanceof Int96ArrayBlockBuilder) {
-            return ((Int96ArrayBlockBuilder) block).getLowSlice();
-        }
-
-        throw new IllegalArgumentException("Unexpected block type " + block.getClass().getSimpleName());
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlock.java
index e2b557bfac9d..93fa86da8456 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlock.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlock.java
@@ -13,10 +13,8 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import io.trino.spi.Experimental;
+import jakarta.annotation.Nullable;
 
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -31,8 +29,8 @@
 import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
 import static io.trino.spi.block.BlockUtil.ensureCapacity;
 
-public class IntArrayBlock
-        implements Block
+public final class IntArrayBlock
+        implements ValueBlock
 {
     private static final int INSTANCE_SIZE = instanceSize(IntArrayBlock.class);
     public static final int SIZE_IN_BYTES_PER_POSITION = Integer.BYTES + Byte.BYTES;
@@ -129,10 +127,15 @@ public int getPositionCount()
     @Override
     public int getInt(int position, int offset)
     {
-        checkReadablePosition(this, position);
         if (offset != 0) {
             throw new IllegalArgumentException("offset must be zero");
         }
+        return getInt(position);
+    }
+
+    public int getInt(int position)
+    {
+        checkReadablePosition(this, position);
         return values[position + arrayOffset];
     }
 
@@ -150,7 +153,7 @@ public boolean isNull(int position)
     }
 
     @Override
-    public Block getSingleValueBlock(int position)
+    public IntArrayBlock getSingleValueBlock(int position)
     {
         checkReadablePosition(this, position);
         return new IntArrayBlock(
@@ -161,7 +164,7 @@ public Block getSingleValueBlock(int position)
     }
 
     @Override
-    public Block copyPositions(int[] positions, int offset, int length)
+    public IntArrayBlock copyPositions(int[] positions, int offset, int length)
     {
         checkArrayRange(positions, offset, length);
 
@@ -182,7 +185,7 @@ public Block copyPositions(int[] positions, int offset, int length)
     }
 
     @Override
-    public Block getRegion(int positionOffset, int length)
+    public IntArrayBlock getRegion(int positionOffset, int length)
     {
         checkValidRegion(getPositionCount(), positionOffset, length);
 
@@ -190,7 +193,7 @@ public Block getRegion(int positionOffset, int length)
     }
 
     @Override
-    public Block copyRegion(int positionOffset, int length)
+    public IntArrayBlock copyRegion(int positionOffset, int length)
     {
         checkValidRegion(getPositionCount(), positionOffset, length);
 
@@ -211,7 +214,7 @@ public String getEncodingName()
     }
 
     @Override
-    public Block copyWithAppendedNull()
+    public IntArrayBlock copyWithAppendedNull()
     {
         boolean[] newValueIsNull = copyIsNullAndAppendNull(valueIsNull, arrayOffset, positionCount);
         int[] newValues = ensureCapacity(values, arrayOffset + positionCount + 1);
@@ -219,6 +222,12 @@ public Block copyWithAppendedNull()
         return new IntArrayBlock(arrayOffset, positionCount + 1, newValueIsNull, newValues);
     }
 
+    @Override
+    public IntArrayBlock getUnderlyingValueBlock()
+    {
+        return this;
+    }
+
     @Override
     public String toString()
     {
@@ -228,8 +237,15 @@ public String toString()
         return sb.toString();
     }
 
-    Slice getValuesSlice()
+    @Experimental(eta = "2023-12-31")
+    public int[] getRawValues()
+    {
+        return values;
+    }
+
+    @Experimental(eta = "2023-12-31")
+    public int getRawValuesOffset()
     {
-        return Slices.wrappedIntArray(values, arrayOffset, positionCount);
+        return arrayOffset;
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlockBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlockBuilder.java
index 41ff815c7d94..bf124103418b 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlockBuilder.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlockBuilder.java
@@ -13,20 +13,12 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
 import static java.lang.Math.max;
 
 public class IntArrayBlockBuilder
@@ -58,7 +50,6 @@ public IntArrayBlockBuilder(@Nullable BlockBuilderStatus blockBuilderStatus, int
         updateDataSize();
     }
 
-    @Override
     public BlockBuilder writeInt(int value)
     {
         if (values.length <= positionCount) {
@@ -75,12 +66,6 @@ public BlockBuilder writeInt(int value)
         return this;
     }
 
-    @Override
-    public BlockBuilder closeEntry()
-    {
-        return this;
-    }
-
     @Override
     public BlockBuilder appendNull()
     {
@@ -104,6 +89,12 @@ public Block build()
         if (!hasNonNullValue) {
             return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, positionCount);
         }
+        return buildValueBlock();
+    }
+
+    @Override
+    public IntArrayBlock buildValueBlock()
+    {
         return new IntArrayBlock(0, positionCount, hasNullValue ? valueIsNull : null, values);
     }
 
@@ -137,147 +128,24 @@ private void updateDataSize()
         }
     }
 
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.of(IntArrayBlock.SIZE_IN_BYTES_PER_POSITION);
-    }
-
     @Override
     public long getSizeInBytes()
     {
         return IntArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) positionCount;
     }
 
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        return IntArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) length;
-    }
-
-    @Override
-    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionsCount)
-    {
-        return IntArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) selectedPositionsCount;
-    }
-
     @Override
     public long getRetainedSizeInBytes()
     {
         return retainedSizeInBytes;
     }
 
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        return isNull(position) ? 0 : Integer.BYTES;
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(values, sizeOf(values));
-        consumer.accept(valueIsNull, sizeOf(valueIsNull));
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
     @Override
     public int getPositionCount()
     {
         return positionCount;
     }
 
-    @Override
-    public int getInt(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        if (offset != 0) {
-            throw new IllegalArgumentException("offset must be zero");
-        }
-        return values[position];
-    }
-
-    @Override
-    public boolean mayHaveNull()
-    {
-        return hasNullValue;
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkReadablePosition(this, position);
-        return valueIsNull[position];
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        checkReadablePosition(this, position);
-        return new IntArrayBlock(
-                0,
-                1,
-                valueIsNull[position] ? new boolean[] {true} : null,
-                new int[] {values[position]});
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = new boolean[length];
-        }
-        int[] newValues = new int[length];
-        for (int i = 0; i < length; i++) {
-            int position = positions[offset + i];
-            checkReadablePosition(this, position);
-            if (hasNullValue) {
-                newValueIsNull[i] = valueIsNull[position];
-            }
-            newValues[i] = values[position];
-        }
-        return new IntArrayBlock(0, length, newValueIsNull, newValues);
-    }
-
-    @Override
-    public Block getRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        return new IntArrayBlock(positionOffset, length, hasNullValue ? valueIsNull : null, values);
-    }
-
-    @Override
-    public Block copyRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = Arrays.copyOfRange(valueIsNull, positionOffset, positionOffset + length);
-        }
-        int[] newValues = Arrays.copyOfRange(values, positionOffset, positionOffset + length);
-        return new IntArrayBlock(0, length, newValueIsNull, newValues);
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        return IntArrayBlockEncoding.NAME;
-    }
-
     @Override
     public String toString()
     {
@@ -286,9 +154,4 @@ public String toString()
         sb.append('}');
         return sb.toString();
     }
-
-    Slice getValuesSlice()
-    {
-        return Slices.wrappedIntArray(values, 0, positionCount);
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlockEncoding.java
index 038ee2b98ee8..408475020e9a 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlockEncoding.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlockEncoding.java
@@ -13,10 +13,8 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.SliceOutput;
-import io.airlift.slice.Slices;
 
 import static io.trino.spi.block.EncoderUtil.decodeNullBits;
 import static io.trino.spi.block.EncoderUtil.encodeNullsAsBits;
@@ -37,31 +35,32 @@ public String getName()
     @Override
     public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
     {
-        int positionCount = block.getPositionCount();
+        IntArrayBlock intArrayBlock = (IntArrayBlock) block;
+        int positionCount = intArrayBlock.getPositionCount();
         sliceOutput.appendInt(positionCount);
 
-        encodeNullsAsBits(sliceOutput, block);
+        encodeNullsAsBits(sliceOutput, intArrayBlock);
 
-        if (!block.mayHaveNull()) {
-            sliceOutput.writeBytes(getValuesSlice(block));
+        if (!intArrayBlock.mayHaveNull()) {
+            sliceOutput.writeInts(intArrayBlock.getRawValues(), intArrayBlock.getRawValuesOffset(), intArrayBlock.getPositionCount());
         }
         else {
             int[] valuesWithoutNull = new int[positionCount];
             int nonNullPositionCount = 0;
             for (int i = 0; i < positionCount; i++) {
-                valuesWithoutNull[nonNullPositionCount] = block.getInt(i, 0);
-                if (!block.isNull(i)) {
+                valuesWithoutNull[nonNullPositionCount] = intArrayBlock.getInt(i);
+                if (!intArrayBlock.isNull(i)) {
                     nonNullPositionCount++;
                 }
             }
 
             sliceOutput.writeInt(nonNullPositionCount);
-            sliceOutput.writeBytes(Slices.wrappedIntArray(valuesWithoutNull, 0, nonNullPositionCount));
+            sliceOutput.writeInts(valuesWithoutNull, 0, nonNullPositionCount);
         }
     }
 
     @Override
-    public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
+    public IntArrayBlock readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
     {
         int positionCount = sliceInput.readInt();
 
@@ -69,13 +68,13 @@ public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceIn
         int[] values = new int[positionCount];
 
         if (valueIsNullPacked == null) {
-            sliceInput.readBytes(Slices.wrappedIntArray(values));
+            sliceInput.readInts(values);
             return new IntArrayBlock(0, positionCount, null, values);
         }
         boolean[] valueIsNull = decodeNullBits(valueIsNullPacked, positionCount);
 
         int nonNullPositionCount = sliceInput.readInt();
-        sliceInput.readBytes(Slices.wrappedIntArray(values, 0, nonNullPositionCount));
+        sliceInput.readInts(values, 0, nonNullPositionCount);
         int position = nonNullPositionCount - 1;
 
         // Handle Last (positionCount % 8) values
@@ -105,16 +104,4 @@ else if (packed != -1) { // At least one non-null
         }
         return new IntArrayBlock(0, positionCount, valueIsNull, values);
     }
-
-    private Slice getValuesSlice(Block block)
-    {
-        if (block instanceof IntArrayBlock) {
-            return ((IntArrayBlock) block).getValuesSlice();
-        }
-        if (block instanceof IntArrayBlockBuilder) {
-            return ((IntArrayBlockBuilder) block).getValuesSlice();
-        }
-
-        throw new IllegalArgumentException("Unexpected block type " + block.getClass().getSimpleName());
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/LazyBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/LazyBlock.java
index 1b428cd55656..8579f7ca93fb 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/LazyBlock.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/LazyBlock.java
@@ -14,9 +14,7 @@
 package io.trino.spi.block;
 
 import io.airlift.slice.Slice;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.NotThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,8 +29,8 @@
 import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
 
-@NotThreadSafe
-public class LazyBlock
+// This class is not considered thread-safe.
+public final class LazyBlock
         implements Block
 {
     private static final int INSTANCE_SIZE = instanceSize(LazyBlock.class) + instanceSize(LazyData.class);
@@ -95,62 +93,7 @@ public <T> T getObject(int position, Class<T> clazz)
     }
 
     @Override
-    public boolean bytesEqual(int position, int offset, Slice otherSlice, int otherOffset, int length)
-    {
-        return getBlock().bytesEqual(position, offset, otherSlice, otherOffset, length);
-    }
-
-    @Override
-    public int bytesCompare(int position, int offset, int length, Slice otherSlice, int otherOffset, int otherLength)
-    {
-        return getBlock().bytesCompare(
-                position,
-                offset,
-                length,
-                otherSlice,
-                otherOffset,
-                otherLength);
-    }
-
-    @Override
-    public void writeBytesTo(int position, int offset, int length, BlockBuilder blockBuilder)
-    {
-        getBlock().writeBytesTo(position, offset, length, blockBuilder);
-    }
-
-    @Override
-    public boolean equals(int position, int offset, Block otherBlock, int otherPosition, int otherOffset, int length)
-    {
-        return getBlock().equals(
-                position,
-                offset,
-                otherBlock,
-                otherPosition,
-                otherOffset,
-                length);
-    }
-
-    @Override
-    public long hash(int position, int offset, int length)
-    {
-        return getBlock().hash(position, offset, length);
-    }
-
-    @Override
-    public int compareTo(int leftPosition, int leftOffset, int leftLength, Block rightBlock, int rightPosition, int rightOffset, int rightLength)
-    {
-        return getBlock().compareTo(
-                leftPosition,
-                leftOffset,
-                leftLength,
-                rightBlock,
-                rightPosition,
-                rightOffset,
-                rightLength);
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
+    public ValueBlock getSingleValueBlock(int position)
     {
         return getBlock().getSingleValueBlock(position);
     }
@@ -270,7 +213,7 @@ public boolean mayHaveNull()
     }
 
     @Override
-    public final List<Block> getChildren()
+    public List<Block> getChildren()
     {
         return singletonList(getBlock());
     }
@@ -292,6 +235,18 @@ public Block getLoadedBlock()
         return lazyData.getFullyLoadedBlock();
     }
 
+    @Override
+    public ValueBlock getUnderlyingValueBlock()
+    {
+        return getBlock().getUnderlyingValueBlock();
+    }
+
+    @Override
+    public int getUnderlyingValuePosition(int position)
+    {
+        return getBlock().getUnderlyingValuePosition(position);
+    }
+
     public static void listenForLoads(Block block, Consumer<Block> listener)
     {
         requireNonNull(block, "block is null");
@@ -435,7 +390,7 @@ private void load(boolean recursive)
         }
 
         /**
-         * If block is unloaded, add the listeners; otherwise call this method on child blocks
+         * If the block is unloaded, add the listeners; otherwise call this method on child blocks
          */
         @SuppressWarnings("AccessingNonPublicFieldOfAnotherObject")
         private static void addListenersRecursive(Block block, List<Consumer<Block>> listeners)
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/LazyBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/LazyBlockEncoding.java
index a472cab833f3..99a3df02b65a 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/LazyBlockEncoding.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/LazyBlockEncoding.java
@@ -23,8 +23,6 @@ public class LazyBlockEncoding
 {
     public static final String NAME = "LAZY";
 
-    public LazyBlockEncoding() {}
-
     @Override
     public String getName()
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlock.java
index 7c7431979405..2b9aec633844 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlock.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlock.java
@@ -13,10 +13,7 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -32,8 +29,8 @@
 import static io.trino.spi.block.BlockUtil.ensureCapacity;
 import static java.lang.Math.toIntExact;
 
-public class LongArrayBlock
-        implements Block
+public final class LongArrayBlock
+        implements ValueBlock
 {
     private static final int INSTANCE_SIZE = instanceSize(LongArrayBlock.class);
     public static final int SIZE_IN_BYTES_PER_POSITION = Long.BYTES + Byte.BYTES;
@@ -130,10 +127,15 @@ public int getPositionCount()
     @Override
     public long getLong(int position, int offset)
     {
-        checkReadablePosition(this, position);
         if (offset != 0) {
             throw new IllegalArgumentException("offset must be zero");
         }
+        return getLong(position);
+    }
+
+    public long getLong(int position)
+    {
+        checkReadablePosition(this, position);
         return values[position + arrayOffset];
     }
 
@@ -197,7 +199,7 @@ public boolean isNull(int position)
     }
 
     @Override
-    public Block getSingleValueBlock(int position)
+    public LongArrayBlock getSingleValueBlock(int position)
     {
         checkReadablePosition(this, position);
         return new LongArrayBlock(
@@ -208,7 +210,7 @@ public Block getSingleValueBlock(int position)
     }
 
     @Override
-    public Block copyPositions(int[] positions, int offset, int length)
+    public LongArrayBlock copyPositions(int[] positions, int offset, int length)
     {
         checkArrayRange(positions, offset, length);
 
@@ -229,7 +231,7 @@ public Block copyPositions(int[] positions, int offset, int length)
     }
 
     @Override
-    public Block getRegion(int positionOffset, int length)
+    public LongArrayBlock getRegion(int positionOffset, int length)
     {
         checkValidRegion(getPositionCount(), positionOffset, length);
 
@@ -237,7 +239,7 @@ public Block getRegion(int positionOffset, int length)
     }
 
     @Override
-    public Block copyRegion(int positionOffset, int length)
+    public LongArrayBlock copyRegion(int positionOffset, int length)
     {
         checkValidRegion(getPositionCount(), positionOffset, length);
 
@@ -258,7 +260,7 @@ public String getEncodingName()
     }
 
     @Override
-    public Block copyWithAppendedNull()
+    public LongArrayBlock copyWithAppendedNull()
     {
         boolean[] newValueIsNull = copyIsNullAndAppendNull(valueIsNull, arrayOffset, positionCount);
         long[] newValues = ensureCapacity(values, arrayOffset + positionCount + 1);
@@ -266,6 +268,12 @@ public Block copyWithAppendedNull()
         return new LongArrayBlock(arrayOffset, positionCount + 1, newValueIsNull, newValues);
     }
 
+    @Override
+    public LongArrayBlock getUnderlyingValueBlock()
+    {
+        return this;
+    }
+
     @Override
     public String toString()
     {
@@ -275,8 +283,13 @@ public String toString()
         return sb.toString();
     }
 
-    Slice getValuesSlice()
+    long[] getRawValues()
+    {
+        return values;
+    }
+
+    int getRawValuesOffset()
     {
-        return Slices.wrappedLongArray(values, arrayOffset, positionCount);
+        return arrayOffset;
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlockBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlockBuilder.java
index 9ca2e64a225f..09a530971ac1 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlockBuilder.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlockBuilder.java
@@ -13,22 +13,13 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
 import static java.lang.Math.max;
-import static java.lang.Math.toIntExact;
 
 public class LongArrayBlockBuilder
         implements BlockBuilder
@@ -59,7 +50,6 @@ public LongArrayBlockBuilder(@Nullable BlockBuilderStatus blockBuilderStatus, in
         updateDataSize();
     }
 
-    @Override
     public BlockBuilder writeLong(long value)
     {
         if (values.length <= positionCount) {
@@ -76,12 +66,6 @@ public BlockBuilder writeLong(long value)
         return this;
     }
 
-    @Override
-    public BlockBuilder closeEntry()
-    {
-        return this;
-    }
-
     @Override
     public BlockBuilder appendNull()
     {
@@ -105,6 +89,12 @@ public Block build()
         if (!hasNonNullValue) {
             return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, positionCount);
         }
+        return buildValueBlock();
+    }
+
+    @Override
+    public LongArrayBlock buildValueBlock()
+    {
         return new LongArrayBlock(0, positionCount, hasNullValue ? valueIsNull : null, values);
     }
 
@@ -138,193 +128,24 @@ private void updateDataSize()
         }
     }
 
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.of(LongArrayBlock.SIZE_IN_BYTES_PER_POSITION);
-    }
-
     @Override
     public long getSizeInBytes()
     {
         return LongArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) positionCount;
     }
 
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        return LongArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) length;
-    }
-
-    @Override
-    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionsCount)
-    {
-        return LongArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) selectedPositionsCount;
-    }
-
     @Override
     public long getRetainedSizeInBytes()
     {
         return retainedSizeInBytes;
     }
 
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        return isNull(position) ? 0 : Long.BYTES;
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(values, sizeOf(values));
-        consumer.accept(valueIsNull, sizeOf(valueIsNull));
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
     @Override
     public int getPositionCount()
     {
         return positionCount;
     }
 
-    @Override
-    public long getLong(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        if (offset != 0) {
-            throw new IllegalArgumentException("offset must be zero");
-        }
-        return values[position];
-    }
-
-    @Override
-    @Deprecated
-    // TODO: Remove when we fix intermediate types on aggregations.
-    public int getInt(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        if (offset != 0) {
-            throw new IllegalArgumentException("offset must be zero");
-        }
-        return toIntExact(values[position]);
-    }
-
-    @Override
-    @Deprecated
-    // TODO: Remove when we fix intermediate types on aggregations.
-    public short getShort(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        if (offset != 0) {
-            throw new IllegalArgumentException("offset must be zero");
-        }
-
-        short value = (short) (values[position]);
-        if (value != values[position]) {
-            throw new ArithmeticException("short overflow");
-        }
-        return value;
-    }
-
-    @Override
-    @Deprecated
-    // TODO: Remove when we fix intermediate types on aggregations.
-    public byte getByte(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        if (offset != 0) {
-            throw new IllegalArgumentException("offset must be zero");
-        }
-
-        byte value = (byte) (values[position]);
-        if (value != values[position]) {
-            throw new ArithmeticException("byte overflow");
-        }
-        return value;
-    }
-
-    @Override
-    public boolean mayHaveNull()
-    {
-        return hasNullValue;
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkReadablePosition(this, position);
-        return valueIsNull[position];
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        checkReadablePosition(this, position);
-        return new LongArrayBlock(
-                0,
-                1,
-                valueIsNull[position] ? new boolean[] {true} : null,
-                new long[] {values[position]});
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = new boolean[length];
-        }
-        long[] newValues = new long[length];
-        for (int i = 0; i < length; i++) {
-            int position = positions[offset + i];
-            checkReadablePosition(this, position);
-            if (hasNullValue) {
-                newValueIsNull[i] = valueIsNull[position];
-            }
-            newValues[i] = values[position];
-        }
-        return new LongArrayBlock(0, length, newValueIsNull, newValues);
-    }
-
-    @Override
-    public Block getRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        return new LongArrayBlock(positionOffset, length, hasNullValue ? valueIsNull : null, values);
-    }
-
-    @Override
-    public Block copyRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = Arrays.copyOfRange(valueIsNull, positionOffset, positionOffset + length);
-        }
-        long[] newValues = Arrays.copyOfRange(values, positionOffset, positionOffset + length);
-        return new LongArrayBlock(0, length, newValueIsNull, newValues);
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        return LongArrayBlockEncoding.NAME;
-    }
-
     @Override
     public String toString()
     {
@@ -333,9 +154,4 @@ public String toString()
         sb.append('}');
         return sb.toString();
     }
-
-    Slice getValuesSlice()
-    {
-        return Slices.wrappedLongArray(values, 0, positionCount);
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlockEncoding.java
index b453e854d114..5167fca68087 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlockEncoding.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/LongArrayBlockEncoding.java
@@ -13,10 +13,8 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.SliceOutput;
-import io.airlift.slice.Slices;
 
 import static io.trino.spi.block.EncoderUtil.decodeNullBits;
 import static io.trino.spi.block.EncoderUtil.encodeNullsAsBits;
@@ -37,31 +35,32 @@ public String getName()
     @Override
     public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
     {
-        int positionCount = block.getPositionCount();
+        LongArrayBlock longArrayBlock = (LongArrayBlock) block;
+        int positionCount = longArrayBlock.getPositionCount();
         sliceOutput.appendInt(positionCount);
 
-        encodeNullsAsBits(sliceOutput, block);
+        encodeNullsAsBits(sliceOutput, longArrayBlock);
 
-        if (!block.mayHaveNull()) {
-            sliceOutput.writeBytes(getValuesSlice(block));
+        if (!longArrayBlock.mayHaveNull()) {
+            sliceOutput.writeLongs(longArrayBlock.getRawValues(), longArrayBlock.getRawValuesOffset(), longArrayBlock.getPositionCount());
         }
         else {
             long[] valuesWithoutNull = new long[positionCount];
             int nonNullPositionCount = 0;
             for (int i = 0; i < positionCount; i++) {
-                valuesWithoutNull[nonNullPositionCount] = block.getLong(i, 0);
-                if (!block.isNull(i)) {
+                valuesWithoutNull[nonNullPositionCount] = longArrayBlock.getLong(i);
+                if (!longArrayBlock.isNull(i)) {
                     nonNullPositionCount++;
                 }
             }
 
             sliceOutput.writeInt(nonNullPositionCount);
-            sliceOutput.writeBytes(Slices.wrappedLongArray(valuesWithoutNull, 0, nonNullPositionCount));
+            sliceOutput.writeLongs(valuesWithoutNull, 0, nonNullPositionCount);
         }
     }
 
     @Override
-    public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
+    public LongArrayBlock readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
     {
         int positionCount = sliceInput.readInt();
 
@@ -69,13 +68,13 @@ public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceIn
         long[] values = new long[positionCount];
 
         if (valueIsNullPacked == null) {
-            sliceInput.readBytes(Slices.wrappedLongArray(values));
+            sliceInput.readLongs(values);
             return new LongArrayBlock(0, positionCount, null, values);
         }
         boolean[] valueIsNull = decodeNullBits(valueIsNullPacked, positionCount);
 
         int nonNullPositionCount = sliceInput.readInt();
-        sliceInput.readBytes(Slices.wrappedLongArray(values, 0, nonNullPositionCount));
+        sliceInput.readLongs(values, 0, nonNullPositionCount);
         int position = nonNullPositionCount - 1;
 
         // Handle Last (positionCount % 8) values
@@ -105,16 +104,4 @@ else if (packed != -1) { // At least one non-null
         }
         return new LongArrayBlock(0, positionCount, valueIsNull, values);
     }
-
-    private Slice getValuesSlice(Block block)
-    {
-        if (block instanceof LongArrayBlock) {
-            return ((LongArrayBlock) block).getValuesSlice();
-        }
-        if (block instanceof LongArrayBlockBuilder) {
-            return ((LongArrayBlockBuilder) block).getValuesSlice();
-        }
-
-        throw new IllegalArgumentException("Unexpected block type " + block.getClass().getSimpleName());
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/MapBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/MapBlock.java
index e580e291fc78..d7c78df45d46 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/MapBlock.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/MapBlock.java
@@ -15,25 +15,38 @@
 package io.trino.spi.block;
 
 import io.trino.spi.type.MapType;
+import jakarta.annotation.Nullable;
 
-import javax.annotation.Nullable;
-
+import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.function.ObjLongConsumer;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.spi.block.BlockUtil.checkArrayRange;
+import static io.trino.spi.block.BlockUtil.checkReadablePosition;
+import static io.trino.spi.block.BlockUtil.checkValidPositions;
+import static io.trino.spi.block.BlockUtil.checkValidRegion;
+import static io.trino.spi.block.BlockUtil.compactArray;
+import static io.trino.spi.block.BlockUtil.compactOffsets;
 import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
 import static io.trino.spi.block.BlockUtil.copyOffsetsAndAppendNull;
+import static io.trino.spi.block.BlockUtil.countAndMarkSelectedPositionsFromOffsets;
+import static io.trino.spi.block.BlockUtil.countSelectedPositionsFromOffsets;
 import static io.trino.spi.block.MapHashTables.HASH_MULTIPLIER;
+import static io.trino.spi.block.MapHashTables.HashBuildMode.DUPLICATE_NOT_CHECKED;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
-public class MapBlock
-        extends AbstractMapBlock
+public final class MapBlock
+        implements ValueBlock
 {
     private static final int INSTANCE_SIZE = instanceSize(MapBlock.class);
 
+    private final MapType mapType;
+
     private final int startOffset;
     private final int positionCount;
 
@@ -59,9 +72,18 @@ public static MapBlock fromKeyValueBlock(
             Block valueBlock,
             MapType mapType)
     {
-        validateConstructorArguments(mapType, 0, offsets.length - 1, mapIsNull.orElse(null), offsets, keyBlock, valueBlock);
+        return fromKeyValueBlock(mapIsNull, offsets, offsets.length - 1, keyBlock, valueBlock, mapType);
+    }
 
-        int mapCount = offsets.length - 1;
+    public static MapBlock fromKeyValueBlock(
+            Optional<boolean[]> mapIsNull,
+            int[] offsets,
+            int mapCount,
+            Block keyBlock,
+            Block valueBlock,
+            MapType mapType)
+    {
+        validateConstructorArguments(mapType, 0, mapCount, mapIsNull.orElse(null), offsets, keyBlock, valueBlock);
 
         return createMapBlockInternal(
                 mapType,
@@ -71,7 +93,7 @@ public static MapBlock fromKeyValueBlock(
                 offsets,
                 keyBlock,
                 valueBlock,
-                new MapHashTables(mapType, Optional.empty()));
+                new MapHashTables(mapType, DUPLICATE_NOT_CHECKED, mapCount, Optional.empty()));
     }
 
     /**
@@ -142,7 +164,7 @@ private MapBlock(
             Block valueBlock,
             MapHashTables hashTables)
     {
-        super(mapType);
+        this.mapType = requireNonNull(mapType, "mapType is null");
 
         int[] rawHashTables = hashTables.tryGet().orElse(null);
         if (rawHashTables != null && rawHashTables.length < keyBlock.getPositionCount() * HASH_MULTIPLIER) {
@@ -165,43 +187,31 @@ private MapBlock(
         this.retainedSizeInBytes = INSTANCE_SIZE + sizeOf(offsets) + sizeOf(mapIsNull);
     }
 
-    @Override
-    protected Block getRawKeyBlock()
+    Block getRawKeyBlock()
     {
         return keyBlock;
     }
 
-    @Override
-    protected Block getRawValueBlock()
+    Block getRawValueBlock()
     {
         return valueBlock;
     }
 
-    @Override
-    protected MapHashTables getHashTables()
+    MapHashTables getHashTables()
     {
         return hashTables;
     }
 
-    @Override
-    protected int[] getOffsets()
+    int[] getOffsets()
     {
         return offsets;
     }
 
-    @Override
-    protected int getOffsetBase()
+    int getOffsetBase()
     {
         return startOffset;
     }
 
-    @Override
-    @Nullable
-    protected boolean[] getMapIsNull()
-    {
-        return mapIsNull;
-    }
-
     @Override
     public boolean mayHaveNull()
     {
@@ -292,26 +302,328 @@ public Block getLoadedBlock()
                 hashTables);
     }
 
-    @Override
-    protected void ensureHashTableLoaded()
+    void ensureHashTableLoaded()
     {
-        hashTables.buildAllHashTablesIfNecessary(getRawKeyBlock(), offsets, mapIsNull);
+        hashTables.buildAllHashTablesIfNecessary(keyBlock, offsets, mapIsNull);
     }
 
     @Override
-    public Block copyWithAppendedNull()
+    public MapBlock copyWithAppendedNull()
     {
-        boolean[] newMapIsNull = copyIsNullAndAppendNull(getMapIsNull(), getOffsetBase(), getPositionCount());
-        int[] newOffsets = copyOffsetsAndAppendNull(getOffsets(), getOffsetBase(), getPositionCount());
+        boolean[] newMapIsNull = copyIsNullAndAppendNull(mapIsNull, startOffset, getPositionCount());
+        int[] newOffsets = copyOffsetsAndAppendNull(offsets, startOffset, getPositionCount());
 
         return createMapBlockInternal(
                 getMapType(),
-                getOffsetBase(),
+                startOffset,
                 getPositionCount() + 1,
                 Optional.of(newMapIsNull),
                 newOffsets,
-                getRawKeyBlock(),
-                getRawValueBlock(),
-                getHashTables());
+                keyBlock,
+                valueBlock,
+                hashTables);
+    }
+
+    @Override
+    public List<Block> getChildren()
+    {
+        return List.of(keyBlock, valueBlock);
+    }
+
+    MapType getMapType()
+    {
+        return mapType;
+    }
+
+    private int getOffset(int position)
+    {
+        return offsets[position + startOffset];
+    }
+
+    @Override
+    public String getEncodingName()
+    {
+        return MapBlockEncoding.NAME;
+    }
+
+    @Override
+    public MapBlock copyPositions(int[] positions, int offset, int length)
+    {
+        checkArrayRange(positions, offset, length);
+
+        int[] newOffsets = new int[length + 1];
+        boolean[] newMapIsNull = new boolean[length];
+
+        IntArrayList entriesPositions = new IntArrayList();
+        int newPosition = 0;
+        for (int i = offset; i < offset + length; ++i) {
+            int position = positions[i];
+            if (isNull(position)) {
+                newMapIsNull[newPosition] = true;
+                newOffsets[newPosition + 1] = newOffsets[newPosition];
+            }
+            else {
+                int entriesStartOffset = getOffset(position);
+                int entriesEndOffset = getOffset(position + 1);
+                int entryCount = entriesEndOffset - entriesStartOffset;
+
+                newOffsets[newPosition + 1] = newOffsets[newPosition] + entryCount;
+
+                for (int elementIndex = entriesStartOffset; elementIndex < entriesEndOffset; elementIndex++) {
+                    entriesPositions.add(elementIndex);
+                }
+            }
+            newPosition++;
+        }
+
+        int[] rawHashTables = hashTables.tryGet().orElse(null);
+        int[] newRawHashTables = null;
+        int newHashTableEntries = newOffsets[newOffsets.length - 1] * HASH_MULTIPLIER;
+        if (rawHashTables != null) {
+            newRawHashTables = new int[newHashTableEntries];
+            int newHashIndex = 0;
+            for (int i = offset; i < offset + length; ++i) {
+                int position = positions[i];
+                int entriesStartOffset = getOffset(position);
+                int entriesEndOffset = getOffset(position + 1);
+                for (int hashIndex = entriesStartOffset * HASH_MULTIPLIER; hashIndex < entriesEndOffset * HASH_MULTIPLIER; hashIndex++) {
+                    newRawHashTables[newHashIndex] = rawHashTables[hashIndex];
+                    newHashIndex++;
+                }
+            }
+        }
+
+        Block newKeys = keyBlock.copyPositions(entriesPositions.elements(), 0, entriesPositions.size());
+        Block newValues = valueBlock.copyPositions(entriesPositions.elements(), 0, entriesPositions.size());
+        return createMapBlockInternal(
+                mapType,
+                0,
+                length,
+                Optional.of(newMapIsNull),
+                newOffsets,
+                newKeys,
+                newValues,
+                new MapHashTables(mapType, DUPLICATE_NOT_CHECKED, length, Optional.ofNullable(newRawHashTables)));
+    }
+
+    @Override
+    public MapBlock getRegion(int position, int length)
+    {
+        int positionCount = getPositionCount();
+        checkValidRegion(positionCount, position, length);
+
+        return createMapBlockInternal(
+                mapType,
+                position + startOffset,
+                length,
+                Optional.ofNullable(mapIsNull),
+                offsets,
+                keyBlock,
+                valueBlock,
+                hashTables);
+    }
+
+    @Override
+    public long getRegionSizeInBytes(int position, int length)
+    {
+        int positionCount = getPositionCount();
+        checkValidRegion(positionCount, position, length);
+
+        int entriesStart = offsets[startOffset + position];
+        int entriesEnd = offsets[startOffset + position + length];
+        int entryCount = entriesEnd - entriesStart;
+
+        return keyBlock.getRegionSizeInBytes(entriesStart, entryCount) +
+                valueBlock.getRegionSizeInBytes(entriesStart, entryCount) +
+                (Integer.BYTES + Byte.BYTES) * (long) length +
+                Integer.BYTES * HASH_MULTIPLIER * (long) entryCount;
+    }
+
+    @Override
+    public OptionalInt fixedSizeInBytesPerPosition()
+    {
+        return OptionalInt.empty(); // size per row is variable on the number of entries in each row
+    }
+
+    private OptionalInt keyAndValueFixedSizeInBytesPerRow()
+    {
+        OptionalInt keyFixedSizePerRow = keyBlock.fixedSizeInBytesPerPosition();
+        if (keyFixedSizePerRow.isEmpty()) {
+            return OptionalInt.empty();
+        }
+        OptionalInt valueFixedSizePerRow = valueBlock.fixedSizeInBytesPerPosition();
+        if (valueFixedSizePerRow.isEmpty()) {
+            return OptionalInt.empty();
+        }
+
+        return OptionalInt.of(keyFixedSizePerRow.getAsInt() + valueFixedSizePerRow.getAsInt());
+    }
+
+    @Override
+    public long getPositionsSizeInBytes(boolean[] positions, int selectedMapPositions)
+    {
+        int positionCount = getPositionCount();
+        checkValidPositions(positions, positionCount);
+        if (selectedMapPositions == 0) {
+            return 0;
+        }
+        if (selectedMapPositions == positionCount) {
+            return getSizeInBytes();
+        }
+
+        int[] offsets = this.offsets;
+        int offsetBase = startOffset;
+        OptionalInt fixedKeyAndValueSizePerRow = keyAndValueFixedSizeInBytesPerRow();
+
+        int selectedEntryCount;
+        long keyAndValuesSizeInBytes;
+        if (fixedKeyAndValueSizePerRow.isPresent()) {
+            // no new positions array need be created, we can just count the number of elements
+            selectedEntryCount = countSelectedPositionsFromOffsets(positions, offsets, offsetBase);
+            keyAndValuesSizeInBytes = fixedKeyAndValueSizePerRow.getAsInt() * (long) selectedEntryCount;
+        }
+        else {
+            // We can use either the getRegionSizeInBytes or getPositionsSizeInBytes
+            // from the underlying raw blocks to implement this function. We chose
+            // getPositionsSizeInBytes with the assumption that constructing a
+            // positions array is cheaper than calling getRegionSizeInBytes for each
+            // used position.
+            boolean[] entryPositions = new boolean[keyBlock.getPositionCount()];
+            selectedEntryCount = countAndMarkSelectedPositionsFromOffsets(positions, offsets, offsetBase, entryPositions);
+            keyAndValuesSizeInBytes = keyBlock.getPositionsSizeInBytes(entryPositions, selectedEntryCount) +
+                    valueBlock.getPositionsSizeInBytes(entryPositions, selectedEntryCount);
+        }
+
+        return keyAndValuesSizeInBytes +
+                (Integer.BYTES + Byte.BYTES) * (long) selectedMapPositions +
+                Integer.BYTES * HASH_MULTIPLIER * (long) selectedEntryCount;
+    }
+
+    @Override
+    public MapBlock copyRegion(int position, int length)
+    {
+        int positionCount = getPositionCount();
+        checkValidRegion(positionCount, position, length);
+
+        int startValueOffset = getOffset(position);
+        int endValueOffset = getOffset(position + length);
+        Block newKeys = keyBlock.copyRegion(startValueOffset, endValueOffset - startValueOffset);
+        Block newValues = valueBlock.copyRegion(startValueOffset, endValueOffset - startValueOffset);
+
+        int[] newOffsets = compactOffsets(offsets, position + startOffset, length);
+        boolean[] mapIsNull = this.mapIsNull;
+        boolean[] newMapIsNull;
+        newMapIsNull = mapIsNull == null ? null : compactArray(mapIsNull, position + startOffset, length);
+        int[] rawHashTables = hashTables.tryGet().orElse(null);
+        int[] newRawHashTables = null;
+        int expectedNewHashTableEntries = (endValueOffset - startValueOffset) * HASH_MULTIPLIER;
+        if (rawHashTables != null) {
+            newRawHashTables = compactArray(rawHashTables, startValueOffset * HASH_MULTIPLIER, expectedNewHashTableEntries);
+        }
+
+        if (newKeys == keyBlock && newValues == valueBlock && newOffsets == offsets && newMapIsNull == mapIsNull && newRawHashTables == rawHashTables) {
+            return this;
+        }
+        return createMapBlockInternal(
+                mapType,
+                0,
+                length,
+                Optional.ofNullable(newMapIsNull),
+                newOffsets,
+                newKeys,
+                newValues,
+                new MapHashTables(mapType, DUPLICATE_NOT_CHECKED, length, Optional.ofNullable(newRawHashTables)));
+    }
+
+    @Override
+    public <T> T getObject(int position, Class<T> clazz)
+    {
+        if (clazz != SqlMap.class) {
+            throw new IllegalArgumentException("clazz must be SqlMap.class");
+        }
+        return clazz.cast(getMap(position));
+    }
+
+    public SqlMap getMap(int position)
+    {
+        checkReadablePosition(this, position);
+        int startEntryOffset = getOffset(position);
+        int endEntryOffset = getOffset(position + 1);
+        return new SqlMap(
+                mapType,
+                keyBlock,
+                valueBlock,
+                new SqlMap.HashTableSupplier(this),
+                startEntryOffset,
+                (endEntryOffset - startEntryOffset));
+    }
+
+    @Override
+    public MapBlock getSingleValueBlock(int position)
+    {
+        checkReadablePosition(this, position);
+
+        int startValueOffset = getOffset(position);
+        int endValueOffset = getOffset(position + 1);
+        int valueLength = endValueOffset - startValueOffset;
+        Block newKeys = keyBlock.copyRegion(startValueOffset, valueLength);
+        Block newValues = valueBlock.copyRegion(startValueOffset, valueLength);
+        int[] rawHashTables = hashTables.tryGet().orElse(null);
+        int[] newRawHashTables = null;
+        if (rawHashTables != null) {
+            newRawHashTables = Arrays.copyOfRange(rawHashTables, startValueOffset * HASH_MULTIPLIER, endValueOffset * HASH_MULTIPLIER);
+        }
+
+        return createMapBlockInternal(
+                mapType,
+                0,
+                1,
+                Optional.of(new boolean[] {isNull(position)}),
+                new int[] {0, valueLength},
+                newKeys,
+                newValues,
+                new MapHashTables(mapType, DUPLICATE_NOT_CHECKED, 1, Optional.ofNullable(newRawHashTables)));
+    }
+
+    @Override
+    public long getEstimatedDataSizeForStats(int position)
+    {
+        checkReadablePosition(this, position);
+
+        if (isNull(position)) {
+            return 0;
+        }
+
+        int startValueOffset = getOffset(position);
+        int endValueOffset = getOffset(position + 1);
+
+        long size = 0;
+        Block rawKeyBlock = keyBlock;
+        Block rawValueBlock = valueBlock;
+        for (int i = startValueOffset; i < endValueOffset; i++) {
+            size += rawKeyBlock.getEstimatedDataSizeForStats(i);
+            size += rawValueBlock.getEstimatedDataSizeForStats(i);
+        }
+        return size;
+    }
+
+    @Override
+    public boolean isNull(int position)
+    {
+        checkReadablePosition(this, position);
+        boolean[] mapIsNull = this.mapIsNull;
+        return mapIsNull != null && mapIsNull[position + startOffset];
+    }
+
+    @Override
+    public MapBlock getUnderlyingValueBlock()
+    {
+        return this;
+    }
+
+    // only visible for testing
+    public boolean isHashTablesPresent()
+    {
+        return hashTables.tryGet().isPresent();
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/MapBlockBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/MapBlockBuilder.java
index fe96206b0cfa..477ae48f4ce1 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/MapBlockBuilder.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/MapBlockBuilder.java
@@ -14,13 +14,12 @@
 
 package io.trino.spi.block;
 
+import io.trino.spi.block.MapHashTables.HashBuildMode;
 import io.trino.spi.type.MapType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Optional;
-import java.util.function.ObjLongConsumer;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
@@ -31,11 +30,12 @@
 import static java.util.Objects.requireNonNull;
 
 public class MapBlockBuilder
-        extends AbstractMapBlock
         implements BlockBuilder
 {
     private static final int INSTANCE_SIZE = instanceSize(MapBlockBuilder.class);
 
+    private final MapType mapType;
+
     @Nullable
     private final BlockBuilderStatus blockBuilderStatus;
 
@@ -45,10 +45,9 @@ public class MapBlockBuilder
     private boolean hasNullValue;
     private final BlockBuilder keyBlockBuilder;
     private final BlockBuilder valueBlockBuilder;
-    private final MapHashTables hashTables;
 
     private boolean currentEntryOpened;
-    private boolean strict;
+    private HashBuildMode hashBuildMode = HashBuildMode.DUPLICATE_NOT_CHECKED;
 
     public MapBlockBuilder(MapType mapType, BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
@@ -69,7 +68,7 @@ private MapBlockBuilder(
             int[] offsets,
             boolean[] mapIsNull)
     {
-        super(mapType);
+        this.mapType = requireNonNull(mapType, "mapType is null");
 
         this.blockBuilderStatus = blockBuilderStatus;
 
@@ -78,59 +77,18 @@ private MapBlockBuilder(
         this.mapIsNull = requireNonNull(mapIsNull, "mapIsNull is null");
         this.keyBlockBuilder = requireNonNull(keyBlockBuilder, "keyBlockBuilder is null");
         this.valueBlockBuilder = requireNonNull(valueBlockBuilder, "valueBlockBuilder is null");
-
-        int[] hashTable = new int[mapIsNull.length * HASH_MULTIPLIER];
-        Arrays.fill(hashTable, -1);
-        this.hashTables = new MapHashTables(mapType, Optional.of(hashTable));
     }
 
     public MapBlockBuilder strict()
     {
-        this.strict = true;
+        this.hashBuildMode = HashBuildMode.STRICT_EQUALS;
         return this;
     }
 
-    @Override
-    protected Block getRawKeyBlock()
-    {
-        return keyBlockBuilder;
-    }
-
-    @Override
-    protected Block getRawValueBlock()
-    {
-        return valueBlockBuilder;
-    }
-
-    @Override
-    protected MapHashTables getHashTables()
-    {
-        return hashTables;
-    }
-
-    @Override
-    protected int[] getOffsets()
-    {
-        return offsets;
-    }
-
-    @Override
-    protected int getOffsetBase()
-    {
-        return 0;
-    }
-
-    @Nullable
-    @Override
-    protected boolean[] getMapIsNull()
-    {
-        return hasNullValue ? mapIsNull : null;
-    }
-
-    @Override
-    public boolean mayHaveNull()
+    public MapBlockBuilder strictNotDistinctFrom()
     {
-        return hasNullValue;
+        this.hashBuildMode = HashBuildMode.STRICT_NOT_DISTINCT_FROM;
+        return this;
     }
 
     @Override
@@ -154,83 +112,24 @@ public long getRetainedSizeInBytes()
                 + keyBlockBuilder.getRetainedSizeInBytes()
                 + valueBlockBuilder.getRetainedSizeInBytes()
                 + sizeOf(offsets)
-                + sizeOf(mapIsNull)
-                + hashTables.getRetainedSizeInBytes();
+                + sizeOf(mapIsNull);
         if (blockBuilderStatus != null) {
             size += BlockBuilderStatus.INSTANCE_SIZE;
         }
         return size;
     }
 
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(keyBlockBuilder, keyBlockBuilder.getRetainedSizeInBytes());
-        consumer.accept(valueBlockBuilder, valueBlockBuilder.getRetainedSizeInBytes());
-        consumer.accept(offsets, sizeOf(offsets));
-        consumer.accept(mapIsNull, sizeOf(mapIsNull));
-        consumer.accept(hashTables, hashTables.getRetainedSizeInBytes());
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
-    @Override
-    public SingleMapBlockWriter beginBlockEntry()
+    public <E extends Throwable> void buildEntry(MapValueBuilder<E> builder)
+            throws E
     {
         if (currentEntryOpened) {
             throw new IllegalStateException("Expected current entry to be closed but was opened");
         }
-        currentEntryOpened = true;
-        return new SingleMapBlockWriter(keyBlockBuilder.getPositionCount() * 2, keyBlockBuilder, valueBlockBuilder, this::strict);
-    }
-
-    @Override
-    public BlockBuilder closeEntry()
-    {
-        if (!currentEntryOpened) {
-            throw new IllegalStateException("Expected entry to be opened but was closed");
-        }
-
-        entryAdded(false);
-        currentEntryOpened = false;
-
-        ensureHashTableSize();
-        int previousAggregatedEntryCount = offsets[positionCount - 1];
-        int aggregatedEntryCount = offsets[positionCount];
-        int entryCount = aggregatedEntryCount - previousAggregatedEntryCount;
-        if (strict) {
-            hashTables.buildHashTableStrict(keyBlockBuilder, previousAggregatedEntryCount, entryCount);
-        }
-        else {
-            hashTables.buildHashTable(keyBlockBuilder, previousAggregatedEntryCount, entryCount);
-        }
-        return this;
-    }
-
-    /**
-     * This method will check duplicate keys and close entry.
-     * <p>
-     * When duplicate keys are discovered, the block is guaranteed to be in
-     * a consistent state before {@link DuplicateMapKeyException} is thrown.
-     * In other words, one can continue to use this BlockBuilder.
-     *
-     * @deprecated use strict method instead
-     */
-    @Deprecated
-    public void closeEntryStrict()
-            throws DuplicateMapKeyException
-    {
-        if (!currentEntryOpened) {
-            throw new IllegalStateException("Expected entry to be opened but was closed");
-        }
 
+        currentEntryOpened = true;
+        builder.build(keyBlockBuilder, valueBlockBuilder);
         entryAdded(false);
         currentEntryOpened = false;
-
-        ensureHashTableSize();
-        int previousAggregatedEntryCount = offsets[positionCount - 1];
-        int aggregatedEntryCount = offsets[positionCount];
-        int entryCount = aggregatedEntryCount - previousAggregatedEntryCount;
-        hashTables.buildHashTableStrict(keyBlockBuilder, previousAggregatedEntryCount, entryCount);
     }
 
     @Override
@@ -265,33 +164,32 @@ private void entryAdded(boolean isNull)
         }
     }
 
-    private void ensureHashTableSize()
+    @Override
+    public Block build()
     {
-        int[] rawHashTables = hashTables.get();
-        if (rawHashTables.length < offsets[positionCount] * HASH_MULTIPLIER) {
-            int newSize = calculateNewArraySize(offsets[positionCount] * HASH_MULTIPLIER);
-            hashTables.growHashTables(newSize);
-        }
+        return buildValueBlock();
     }
 
     @Override
-    public Block build()
+    public MapBlock buildValueBlock()
     {
         if (currentEntryOpened) {
             throw new IllegalStateException("Current entry must be closed before the block can be built");
         }
 
-        int[] rawHashTables = hashTables.get();
-        int hashTablesEntries = offsets[positionCount] * HASH_MULTIPLIER;
+        Block keyBlock = keyBlockBuilder.build();
+        Block valueBlock = valueBlockBuilder.build();
+        MapHashTables hashTables = MapHashTables.create(hashBuildMode, mapType, positionCount, keyBlock, offsets, mapIsNull);
+
         return createMapBlockInternal(
-                getMapType(),
+                mapType,
                 0,
                 positionCount,
                 hasNullValue ? Optional.of(mapIsNull) : Optional.empty(),
                 offsets,
-                keyBlockBuilder.build(),
-                valueBlockBuilder.build(),
-                new MapHashTables(getMapType(), Optional.of(Arrays.copyOf(rawHashTables, hashTablesEntries))));
+                keyBlock,
+                valueBlock,
+                hashTables);
     }
 
     @Override
@@ -306,14 +204,11 @@ public String toString()
     public BlockBuilder newBlockBuilderLike(int expectedEntries, BlockBuilderStatus blockBuilderStatus)
     {
         return new MapBlockBuilder(
-                getMapType(),
+                mapType,
                 blockBuilderStatus,
                 keyBlockBuilder.newBlockBuilderLike(blockBuilderStatus),
                 valueBlockBuilder.newBlockBuilderLike(blockBuilderStatus),
                 new int[expectedEntries + 1],
                 new boolean[expectedEntries]);
     }
-
-    @Override
-    protected void ensureHashTableLoaded() {}
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/MapBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/MapBlockEncoding.java
index dcbe8991d417..2442219f1bac 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/MapBlockEncoding.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/MapBlockEncoding.java
@@ -20,9 +20,9 @@
 
 import java.util.Optional;
 
-import static io.airlift.slice.Slices.wrappedIntArray;
 import static io.trino.spi.block.MapBlock.createMapBlockInternal;
 import static io.trino.spi.block.MapHashTables.HASH_MULTIPLIER;
+import static io.trino.spi.block.MapHashTables.HashBuildMode.DUPLICATE_NOT_CHECKED;
 import static java.lang.String.format;
 
 public class MapBlockEncoding
@@ -39,7 +39,7 @@ public String getName()
     @Override
     public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
     {
-        AbstractMapBlock mapBlock = (AbstractMapBlock) block;
+        MapBlock mapBlock = (MapBlock) block;
 
         int positionCount = mapBlock.getPositionCount();
 
@@ -58,7 +58,7 @@ public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceO
         if (hashTable.isPresent()) {
             int hashTableLength = (entriesEndOffset - entriesStartOffset) * HASH_MULTIPLIER;
             sliceOutput.appendInt(hashTableLength); // hashtable length
-            sliceOutput.writeBytes(wrappedIntArray(hashTable.get(), entriesStartOffset * HASH_MULTIPLIER, hashTableLength));
+            sliceOutput.writeInts(hashTable.get(), entriesStartOffset * HASH_MULTIPLIER, hashTableLength);
         }
         else {
             // if the hashTable is null, we write the length -1
@@ -84,7 +84,7 @@ public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceIn
         int[] hashTable = null;
         if (hashTableLength >= 0) {
             hashTable = new int[hashTableLength];
-            sliceInput.readBytes(wrappedIntArray(hashTable));
+            sliceInput.readInts(hashTable);
         }
 
         if (keyBlock.getPositionCount() != valueBlock.getPositionCount()) {
@@ -103,9 +103,9 @@ public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceIn
 
         int positionCount = sliceInput.readInt();
         int[] offsets = new int[positionCount + 1];
-        sliceInput.readBytes(wrappedIntArray(offsets));
+        sliceInput.readInts(offsets);
         Optional<boolean[]> mapIsNull = EncoderUtil.decodeNullBits(sliceInput, positionCount);
-        MapHashTables hashTables = new MapHashTables(mapType, Optional.ofNullable(hashTable));
+        MapHashTables hashTables = new MapHashTables(mapType, DUPLICATE_NOT_CHECKED, positionCount, Optional.ofNullable(hashTable));
         return createMapBlockInternal(mapType, 0, positionCount, mapIsNull, offsets, keyBlock, valueBlock, hashTables);
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/MapHashTables.java b/core/trino-spi/src/main/java/io/trino/spi/block/MapHashTables.java
index 35eed1eee353..a6b35dbc4807 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/MapHashTables.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/MapHashTables.java
@@ -13,18 +13,18 @@
  */
 package io.trino.spi.block;
 
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.MapType;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Optional;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static java.lang.String.format;
 
@@ -33,19 +33,43 @@ public final class MapHashTables
 {
     public static final int INSTANCE_SIZE = instanceSize(MapHashTables.class);
 
-    // inverse of hash fill ratio, must be integer
+    // inverse of the hash fill ratio must be integer
     static final int HASH_MULTIPLIER = 2;
 
+    public enum HashBuildMode
+    {
+        DUPLICATE_NOT_CHECKED, STRICT_EQUALS, STRICT_NOT_DISTINCT_FROM
+    }
+
     private final MapType mapType;
+    private final HashBuildMode mode;
+    private final int hashTableCount;
 
     @SuppressWarnings("VolatileArrayField")
     @GuardedBy("this")
     @Nullable
     private volatile int[] hashTables;
 
-    MapHashTables(MapType mapType, Optional<int[]> hashTables)
+    static MapHashTables createSingleTable(MapType mapType, HashBuildMode mode, Block keyBlock)
+    {
+        int[] hashTables = new int[keyBlock.getPositionCount() * HASH_MULTIPLIER];
+        Arrays.fill(hashTables, -1);
+        buildHashTable(mode, mapType, keyBlock, 0, keyBlock.getPositionCount(), hashTables);
+        return new MapHashTables(mapType, mode, 1, Optional.of(hashTables));
+    }
+
+    static MapHashTables create(HashBuildMode mode, MapType mapType, int hashTableCount, Block keyBlock, int[] offsets, @Nullable boolean[] mapIsNull)
+    {
+        MapHashTables hashTables = new MapHashTables(mapType, mode, hashTableCount, Optional.empty());
+        hashTables.buildAllHashTables(keyBlock, offsets, mapIsNull);
+        return hashTables;
+    }
+
+    MapHashTables(MapType mapType, HashBuildMode mode, int hashTableCount, Optional<int[]> hashTables)
     {
         this.mapType = mapType;
+        this.mode = mode;
+        this.hashTableCount = hashTableCount;
         this.hashTables = hashTables.orElse(null);
     }
 
@@ -68,30 +92,16 @@ int[] get()
     }
 
     /**
-     * Returns the raw hash tables, if they have been built.  The raw hash tables must not be modified.
+     * Returns the raw hash tables if they have been built.  The raw hash tables must not be modified.
      */
     Optional<int[]> tryGet()
     {
         return Optional.ofNullable(hashTables);
     }
 
-    synchronized void growHashTables(int newSize)
-    {
-        int[] hashTables = this.hashTables;
-        if (hashTables == null) {
-            throw new IllegalStateException("hashTables not set");
-        }
-        if (newSize < hashTables.length) {
-            throw new IllegalArgumentException("hashTables size does not match expectedEntryCount");
-        }
-        int[] newRawHashTables = Arrays.copyOf(hashTables, newSize);
-        Arrays.fill(newRawHashTables, hashTables.length, newSize, -1);
-        this.hashTables = newRawHashTables;
-    }
-
     void buildAllHashTablesIfNecessary(Block rawKeyBlock, int[] offsets, @Nullable boolean[] mapIsNull)
     {
-        // this is double checked locking
+        // this is double-checked locking
         if (hashTables == null) {
             buildAllHashTables(rawKeyBlock, offsets, mapIsNull);
         }
@@ -106,7 +116,6 @@ private synchronized void buildAllHashTables(Block rawKeyBlock, int[] offsets, @
         int[] hashTables = new int[rawKeyBlock.getPositionCount() * HASH_MULTIPLIER];
         Arrays.fill(hashTables, -1);
 
-        int hashTableCount = offsets.length - 1;
         for (int i = 0; i < hashTableCount; i++) {
             int keyOffset = offsets[i];
             int keyCount = offsets[i + 1] - keyOffset;
@@ -116,28 +125,26 @@ private synchronized void buildAllHashTables(Block rawKeyBlock, int[] offsets, @
             if (mapIsNull != null && mapIsNull[i] && keyCount != 0) {
                 throw new IllegalArgumentException("A null map must have zero entries");
             }
-            buildHashTableInternal(rawKeyBlock, keyOffset, keyCount, hashTables);
+            buildHashTable(mode, mapType, rawKeyBlock, keyOffset, keyCount, hashTables);
         }
         this.hashTables = hashTables;
     }
 
-    synchronized void buildHashTable(Block keyBlock, int keyOffset, int keyCount)
+    private static void buildHashTable(HashBuildMode mode, MapType mapType, Block rawKeyBlock, int keyOffset, int keyCount, int[] hashTables)
     {
-        int[] hashTables = this.hashTables;
-        if (hashTables == null) {
-            throw new IllegalStateException("hashTables not set");
+        switch (mode) {
+            case DUPLICATE_NOT_CHECKED -> buildHashTableDuplicateNotChecked(mapType, rawKeyBlock, keyOffset, keyCount, hashTables);
+            case STRICT_EQUALS -> buildHashTableStrict(mapType, rawKeyBlock, keyOffset, keyCount, hashTables);
+            case STRICT_NOT_DISTINCT_FROM -> buildDistinctHashTableStrict(mapType, rawKeyBlock, keyOffset, keyCount, hashTables);
         }
-
-        buildHashTableInternal(keyBlock, keyOffset, keyCount, hashTables);
-        this.hashTables = hashTables;
     }
 
-    private void buildHashTableInternal(Block keyBlock, int keyOffset, int keyCount, int[] hashTables)
+    private static void buildHashTableDuplicateNotChecked(MapType mapType, Block keyBlock, int keyOffset, int keyCount, int[] hashTables)
     {
         int hashTableOffset = keyOffset * HASH_MULTIPLIER;
         int hashTableSize = keyCount * HASH_MULTIPLIER;
         for (int i = 0; i < keyCount; i++) {
-            int hash = getHashPosition(keyBlock, keyOffset + i, hashTableSize);
+            int hash = getHashPosition(mapType, keyBlock, keyOffset + i, hashTableSize);
             while (true) {
                 if (hashTables[hashTableOffset + hash] == -1) {
                     hashTables[hashTableOffset + hash] = i;
@@ -154,19 +161,14 @@ private void buildHashTableInternal(Block keyBlock, int keyOffset, int keyCount,
     /**
      * This method checks whether {@code keyBlock} has duplicated entries (in the specified range)
      */
-    synchronized void buildHashTableStrict(Block keyBlock, int keyOffset, int keyCount)
-            throws DuplicateMapKeyException
+    private static void buildHashTableStrict(MapType mapType, Block keyBlock, int keyOffset, int keyCount, int[] hashTables)
     {
-        int[] hashTables = this.hashTables;
-        if (hashTables == null) {
-            throw new IllegalStateException("hashTables not set");
-        }
-
         int hashTableOffset = keyOffset * HASH_MULTIPLIER;
         int hashTableSize = keyCount * HASH_MULTIPLIER;
 
         for (int i = 0; i < keyCount; i++) {
-            int hash = getHashPosition(keyBlock, keyOffset + i, hashTableSize);
+            // this throws if the position is null
+            int hash = getHashPosition(mapType, keyBlock, keyOffset + i, hashTableSize);
             while (true) {
                 if (hashTables[hashTableOffset + hash] == -1) {
                     hashTables[hashTableOffset + hash] = i;
@@ -175,7 +177,8 @@ synchronized void buildHashTableStrict(Block keyBlock, int keyOffset, int keyCou
 
                 Boolean isDuplicateKey;
                 try {
-                    // assuming maps with indeterminate keys are not supported
+                    // assuming maps with indeterminate keys are not supported,
+                    // the left and right values are never null because the above call check for null before the insertion
                     isDuplicateKey = (Boolean) mapType.getKeyBlockEqual().invokeExact(keyBlock, keyOffset + i, keyBlock, keyOffset + hashTables[hashTableOffset + hash]);
                 }
                 catch (RuntimeException e) {
@@ -199,13 +202,52 @@ synchronized void buildHashTableStrict(Block keyBlock, int keyOffset, int keyCou
                 }
             }
         }
-        this.hashTables = hashTables;
     }
 
-    private int getHashPosition(Block keyBlock, int position, int hashTableSize)
+    /**
+     * This method checks whether {@code keyBlock} has duplicates based on type NOT DISTINCT FROM.
+     */
+    private static void buildDistinctHashTableStrict(MapType mapType, Block keyBlock, int keyOffset, int keyCount, int[] hashTables)
+    {
+        int hashTableOffset = keyOffset * HASH_MULTIPLIER;
+        int hashTableSize = keyCount * HASH_MULTIPLIER;
+
+        for (int i = 0; i < keyCount; i++) {
+            int hash = getHashPosition(mapType, keyBlock, keyOffset + i, hashTableSize);
+            while (true) {
+                if (hashTables[hashTableOffset + hash] == -1) {
+                    hashTables[hashTableOffset + hash] = i;
+                    break;
+                }
+
+                boolean isDuplicateKey;
+                try {
+                    // assuming maps with indeterminate keys are not supported
+                    isDuplicateKey = (boolean) mapType.getKeyBlockNotDistinctFrom().invokeExact(keyBlock, keyOffset + i, keyBlock, keyOffset + hashTables[hashTableOffset + hash]);
+                }
+                catch (RuntimeException e) {
+                    throw e;
+                }
+                catch (Throwable throwable) {
+                    throw new RuntimeException(throwable);
+                }
+
+                if (isDuplicateKey) {
+                    throw new DuplicateMapKeyException(keyBlock, keyOffset + i);
+                }
+
+                hash++;
+                if (hash == hashTableSize) {
+                    hash = 0;
+                }
+            }
+        }
+    }
+
+    private static int getHashPosition(MapType mapType, Block keyBlock, int position, int hashTableSize)
     {
         if (keyBlock.isNull(position)) {
-            throw new IllegalArgumentException("map keys cannot be null");
+            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "map key cannot be null");
         }
 
         long hashCode;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/MapValueBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/MapValueBuilder.java
new file mode 100644
index 000000000000..d3d9554e6ac4
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/MapValueBuilder.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.trino.spi.block.MapHashTables.HashBuildMode;
+import io.trino.spi.type.MapType;
+
+public interface MapValueBuilder<E extends Throwable>
+{
+    static <E extends Throwable> SqlMap buildMapValue(MapType mapType, int entryCount, MapValueBuilder<E> builder)
+            throws E
+    {
+        return new BufferedMapValueBuilder(mapType, HashBuildMode.DUPLICATE_NOT_CHECKED, entryCount)
+                .build(entryCount, builder);
+    }
+
+    void build(BlockBuilder keyBuilder, BlockBuilder valueBuilder)
+            throws E;
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/RowBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/RowBlock.java
index e12440f18be2..930f82bbe50a 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/RowBlock.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/RowBlock.java
@@ -13,146 +13,137 @@
  */
 package io.trino.spi.block;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.function.ObjLongConsumer;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
-import static io.trino.spi.block.BlockUtil.copyOffsetsAndAppendNull;
+import static io.trino.spi.block.BlockUtil.arraySame;
+import static io.trino.spi.block.BlockUtil.checkArrayRange;
+import static io.trino.spi.block.BlockUtil.checkReadablePosition;
+import static io.trino.spi.block.BlockUtil.checkValidPositions;
+import static io.trino.spi.block.BlockUtil.checkValidRegion;
+import static io.trino.spi.block.BlockUtil.compactArray;
 import static io.trino.spi.block.BlockUtil.ensureBlocksAreLoaded;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
-public class RowBlock
-        extends AbstractRowBlock
+public final class RowBlock
+        implements ValueBlock
 {
     private static final int INSTANCE_SIZE = instanceSize(RowBlock.class);
 
-    private final int startOffset;
     private final int positionCount;
-
+    @Nullable
     private final boolean[] rowIsNull;
-    private final int[] fieldBlockOffsets;
+    /**
+     * Field blocks have the same position count as this row block. The field value of a null row must be null.
+     */
     private final Block[] fieldBlocks;
+    private final List<Block> fieldBlocksList;
+    private final int fixedSizePerRow;
 
     private volatile long sizeInBytes = -1;
-    private final long retainedSizeInBytes;
 
     /**
-     * Create a row block directly from columnar nulls and field blocks.
+     * Create a row block directly from field blocks. The returned RowBlock will not contain any null rows, although the fields may contain null values.
      */
-    public static Block fromFieldBlocks(int positionCount, Optional<boolean[]> rowIsNullOptional, Block[] fieldBlocks)
+    public static RowBlock fromFieldBlocks(int positionCount, Block[] fieldBlocks)
     {
-        boolean[] rowIsNull = rowIsNullOptional.orElse(null);
-        int[] fieldBlockOffsets = null;
-        if (rowIsNull != null) {
-            // Check for nulls when computing field block offsets
-            fieldBlockOffsets = new int[positionCount + 1];
-            fieldBlockOffsets[0] = 0;
-            for (int position = 0; position < positionCount; position++) {
-                fieldBlockOffsets[position + 1] = fieldBlockOffsets[position] + (rowIsNull[position] ? 0 : 1);
-            }
-            // fieldBlockOffsets is positionCount + 1 in length
-            if (fieldBlockOffsets[positionCount] == positionCount) {
-                // No nulls encountered, discard the null mask
-                rowIsNull = null;
-                fieldBlockOffsets = null;
-            }
-        }
-
-        validateConstructorArguments(0, positionCount, rowIsNull, fieldBlockOffsets, fieldBlocks);
-        return new RowBlock(0, positionCount, rowIsNull, fieldBlockOffsets, fieldBlocks);
+        return createRowBlockInternal(positionCount, null, fieldBlocks);
     }
 
     /**
-     * Create a row block directly without per element validations.
+     * Create a row block directly from field blocks that are not null-suppressed. The field value of a null row must be null.
      */
-    static RowBlock createRowBlockInternal(int startOffset, int positionCount, @Nullable boolean[] rowIsNull, @Nullable int[] fieldBlockOffsets, Block[] fieldBlocks)
+    public static RowBlock fromNotNullSuppressedFieldBlocks(int positionCount, Optional<boolean[]> rowIsNullOptional, Block[] fieldBlocks)
     {
-        validateConstructorArguments(startOffset, positionCount, rowIsNull, fieldBlockOffsets, fieldBlocks);
-        return new RowBlock(startOffset, positionCount, rowIsNull, fieldBlockOffsets, fieldBlocks);
+        // verify that field values for null rows are null
+        if (rowIsNullOptional.isPresent()) {
+            boolean[] rowIsNull = rowIsNullOptional.get();
+            checkArrayRange(rowIsNull, 0, positionCount);
+
+            for (int fieldIndex = 0; fieldIndex < fieldBlocks.length; fieldIndex++) {
+                Block field = fieldBlocks[fieldIndex];
+                // LazyBlock may not have loaded the field yet
+                if (!(field instanceof LazyBlock lazyBlock) || lazyBlock.isLoaded()) {
+                    for (int position = 0; position < positionCount; position++) {
+                        if (rowIsNull[position] && !field.isNull(position)) {
+                            throw new IllegalArgumentException(format("Field value for null row must be null: field %s, position %s", fieldIndex, position));
+                        }
+                    }
+                }
+            }
+        }
+        return createRowBlockInternal(positionCount, rowIsNullOptional.orElse(null), fieldBlocks);
     }
 
-    private static void validateConstructorArguments(int startOffset, int positionCount, @Nullable boolean[] rowIsNull, @Nullable int[] fieldBlockOffsets, Block[] fieldBlocks)
+    static RowBlock createRowBlockInternal(int positionCount, @Nullable boolean[] rowIsNull, Block[] fieldBlocks)
     {
-        if (startOffset < 0) {
-            throw new IllegalArgumentException("arrayOffset is negative");
+        int fixedSize = Byte.BYTES;
+        for (Block fieldBlock : fieldBlocks) {
+            OptionalInt fieldFixedSize = fieldBlock.fixedSizeInBytesPerPosition();
+            if (fieldFixedSize.isEmpty()) {
+                // found a block without a single per-position size
+                fixedSize = -1;
+                break;
+            }
+            fixedSize += fieldFixedSize.getAsInt();
         }
 
+        return new RowBlock(positionCount, rowIsNull, fieldBlocks, fixedSize);
+    }
+
+    /**
+     * Use createRowBlockInternal or fromFieldBlocks instead of this method. The caller of this method is assumed to have
+     * validated the arguments with validateConstructorArguments.
+     */
+    private RowBlock(int positionCount, @Nullable boolean[] rowIsNull, Block[] fieldBlocks, int fixedSizePerRow)
+    {
         if (positionCount < 0) {
             throw new IllegalArgumentException("positionCount is negative");
         }
 
-        if (rowIsNull != null && rowIsNull.length - startOffset < positionCount) {
+        if (rowIsNull != null && rowIsNull.length < positionCount) {
             throw new IllegalArgumentException("rowIsNull length is less than positionCount");
         }
 
-        if ((rowIsNull == null) != (fieldBlockOffsets == null)) {
-            throw new IllegalArgumentException("When rowIsNull is (non) null then fieldBlockOffsets should be (non) null as well");
-        }
-
-        if (fieldBlockOffsets != null && fieldBlockOffsets.length - startOffset < positionCount + 1) {
-            throw new IllegalArgumentException("fieldBlockOffsets length is less than positionCount");
-        }
-
         requireNonNull(fieldBlocks, "fieldBlocks is null");
-
-        if (fieldBlocks.length <= 0) {
-            throw new IllegalArgumentException("Number of fields in RowBlock must be positive");
+        if (fieldBlocks.length == 0) {
+            throw new IllegalArgumentException("Row block must contain at least one field");
         }
 
-        int firstFieldBlockPositionCount = fieldBlocks[0].getPositionCount();
-        for (int i = 1; i < fieldBlocks.length; i++) {
-            if (firstFieldBlockPositionCount != fieldBlocks[i].getPositionCount()) {
-                throw new IllegalArgumentException(format("length of field blocks differ: field 0: %s, block %s: %s", firstFieldBlockPositionCount, i, fieldBlocks[i].getPositionCount()));
+        for (int i = 0; i < fieldBlocks.length; i++) {
+            if (positionCount != fieldBlocks[i].getPositionCount()) {
+                throw new IllegalArgumentException("Expected field %s to have %s positions but has %s positions".formatted(i, positionCount, fieldBlocks[i].getPositionCount()));
             }
         }
-    }
-
-    /**
-     * Use createRowBlockInternal or fromFieldBlocks instead of this method.  The caller of this method is assumed to have
-     * validated the arguments with validateConstructorArguments.
-     */
-    private RowBlock(int startOffset, int positionCount, @Nullable boolean[] rowIsNull, @Nullable int[] fieldBlockOffsets, Block[] fieldBlocks)
-    {
-        super(fieldBlocks.length);
 
-        this.startOffset = startOffset;
         this.positionCount = positionCount;
-        this.rowIsNull = rowIsNull;
-        this.fieldBlockOffsets = fieldBlockOffsets;
+        this.rowIsNull = positionCount == 0 ? null : rowIsNull;
         this.fieldBlocks = fieldBlocks;
-
-        this.retainedSizeInBytes = INSTANCE_SIZE + sizeOf(fieldBlockOffsets) + sizeOf(rowIsNull);
+        this.fieldBlocksList = List.of(fieldBlocks);
+        this.fixedSizePerRow = fixedSizePerRow;
     }
 
-    @Override
-    protected Block[] getRawFieldBlocks()
+    Block[] getRawFieldBlocks()
     {
         return fieldBlocks;
     }
 
-    @Override
-    @Nullable
-    protected int[] getFieldBlockOffsets()
-    {
-        return fieldBlockOffsets;
-    }
-
-    @Override
-    protected int getOffsetBase()
+    public List<Block> getFieldBlocks()
     {
-        return startOffset;
+        return fieldBlocksList;
     }
 
-    @Override
-    @Nullable
-    protected boolean[] getRowIsNull()
+    public Block getFieldBlock(int fieldIndex)
     {
-        return rowIsNull;
+        return fieldBlocks[fieldIndex];
     }
 
     @Override
@@ -174,15 +165,11 @@ public long getSizeInBytes()
             return sizeInBytes;
         }
 
-        long sizeInBytes = getBaseSizeInBytes();
+        long sizeInBytes = Byte.BYTES * (long) positionCount;
         boolean hasUnloadedBlocks = false;
 
-        int startFieldBlockOffset = fieldBlockOffsets != null ? fieldBlockOffsets[startOffset] : startOffset;
-        int endFieldBlockOffset = fieldBlockOffsets != null ? fieldBlockOffsets[startOffset + positionCount] : startOffset + positionCount;
-        int fieldBlockLength = endFieldBlockOffset - startFieldBlockOffset;
-
         for (Block fieldBlock : fieldBlocks) {
-            sizeInBytes += fieldBlock.getRegionSizeInBytes(startFieldBlockOffset, fieldBlockLength);
+            sizeInBytes += fieldBlock.getSizeInBytes();
             hasUnloadedBlocks = hasUnloadedBlocks || !fieldBlock.isLoaded();
         }
 
@@ -192,15 +179,10 @@ public long getSizeInBytes()
         return sizeInBytes;
     }
 
-    private long getBaseSizeInBytes()
-    {
-        return (Integer.BYTES + Byte.BYTES) * (long) positionCount;
-    }
-
     @Override
     public long getRetainedSizeInBytes()
     {
-        long retainedSizeInBytes = this.retainedSizeInBytes;
+        long retainedSizeInBytes = INSTANCE_SIZE + sizeOf(rowIsNull);
         for (Block fieldBlock : fieldBlocks) {
             retainedSizeInBytes += fieldBlock.getRetainedSizeInBytes();
         }
@@ -210,11 +192,8 @@ public long getRetainedSizeInBytes()
     @Override
     public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
     {
-        for (int i = 0; i < numFields; i++) {
-            consumer.accept(fieldBlocks[i], fieldBlocks[i].getRetainedSizeInBytes());
-        }
-        if (fieldBlockOffsets != null) {
-            consumer.accept(fieldBlockOffsets, sizeOf(fieldBlockOffsets));
+        for (Block fieldBlock : fieldBlocks) {
+            consumer.accept(fieldBlock, fieldBlock.getRetainedSizeInBytes());
         }
         if (rowIsNull != null) {
             consumer.accept(rowIsNull, sizeOf(rowIsNull));
@@ -225,7 +204,7 @@ public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
     @Override
     public String toString()
     {
-        return format("RowBlock{numFields=%d, positionCount=%d}", numFields, getPositionCount());
+        return format("RowBlock{fieldCount=%d, positionCount=%d}", fieldBlocks.length, positionCount);
     }
 
     @Override
@@ -247,36 +226,280 @@ public Block getLoadedBlock()
             // All blocks are already loaded
             return this;
         }
-        return createRowBlockInternal(
-                startOffset,
-                positionCount,
-                rowIsNull,
-                fieldBlockOffsets,
-                loadedFieldBlocks);
+        return new RowBlock(positionCount, rowIsNull, loadedFieldBlocks, fixedSizePerRow);
+    }
+
+    @Override
+    public RowBlock copyWithAppendedNull()
+    {
+        boolean[] newRowIsNull;
+        if (rowIsNull != null) {
+            newRowIsNull = Arrays.copyOf(rowIsNull, positionCount + 1);
+        }
+        else {
+            newRowIsNull = new boolean[positionCount + 1];
+        }
+        // mark the (new) last element as null
+        newRowIsNull[positionCount] = true;
+
+        Block[] newBlocks = new Block[fieldBlocks.length];
+        for (int i = 0; i < fieldBlocks.length; i++) {
+            newBlocks[i] = fieldBlocks[i].copyWithAppendedNull();
+        }
+        return new RowBlock(positionCount + 1, newRowIsNull, newBlocks, fixedSizePerRow);
+    }
+
+    @Override
+    public List<Block> getChildren()
+    {
+        return fieldBlocksList;
+    }
+
+    @Override
+    public String getEncodingName()
+    {
+        return RowBlockEncoding.NAME;
     }
 
     @Override
-    public Block copyWithAppendedNull()
-    {
-        boolean[] newRowIsNull = copyIsNullAndAppendNull(getRowIsNull(), getOffsetBase(), getPositionCount());
-
-        int[] newOffsets;
-        if (getFieldBlockOffsets() == null) {
-            int desiredLength = getOffsetBase() + positionCount + 2;
-            newOffsets = new int[desiredLength];
-            newOffsets[getOffsetBase()] = getOffsetBase();
-            for (int position = getOffsetBase(); position < getOffsetBase() + positionCount; position++) {
-                // Since there are no nulls in the original array, new offsets are the same as previous ones
-                newOffsets[position + 1] = newOffsets[position] + 1;
+    public RowBlock copyPositions(int[] positions, int offset, int length)
+    {
+        checkArrayRange(positions, offset, length);
+
+        Block[] newBlocks = new Block[fieldBlocks.length];
+        for (int i = 0; i < newBlocks.length; i++) {
+            newBlocks[i] = fieldBlocks[i].copyPositions(positions, offset, length);
+        }
+
+        boolean[] newRowIsNull = null;
+        if (rowIsNull != null) {
+            newRowIsNull = new boolean[length];
+            for (int i = 0; i < length; i++) {
+                newRowIsNull[i] = rowIsNull[positions[offset + i]];
             }
+        }
+
+        return new RowBlock(length, newRowIsNull, newBlocks, fixedSizePerRow);
+    }
 
-            // Null does not change offset
-            newOffsets[desiredLength - 1] = newOffsets[desiredLength - 2];
+    @Override
+    public RowBlock getRegion(int positionOffset, int length)
+    {
+        checkValidRegion(positionCount, positionOffset, length);
+
+        // This copies the null array, but this dramatically simplifies this class.
+        // Without a copy here, we would need a null array offset, and that would mean that the
+        // null array would be offset while the field blocks are not offset, which is confusing.
+        boolean[] newRowIsNull = rowIsNull == null ? null : compactArray(rowIsNull, positionOffset, length);
+        Block[] newBlocks = new Block[fieldBlocks.length];
+        for (int i = 0; i < newBlocks.length; i++) {
+            newBlocks[i] = fieldBlocks[i].getRegion(positionOffset, length);
         }
-        else {
-            newOffsets = copyOffsetsAndAppendNull(getFieldBlockOffsets(), getOffsetBase(), getPositionCount());
+        return new RowBlock(length, newRowIsNull, newBlocks, fixedSizePerRow);
+    }
+
+    @Override
+    public OptionalInt fixedSizeInBytesPerPosition()
+    {
+        return fixedSizePerRow > 0 ? OptionalInt.of(fixedSizePerRow) : OptionalInt.empty();
+    }
+
+    @Override
+    public long getRegionSizeInBytes(int position, int length)
+    {
+        checkValidRegion(positionCount, position, length);
+
+        long regionSizeInBytes = Byte.BYTES * (long) length;
+        for (Block fieldBlock : fieldBlocks) {
+            regionSizeInBytes += fieldBlock.getRegionSizeInBytes(position, length);
         }
+        return regionSizeInBytes;
+    }
+
+    @Override
+    public long getPositionsSizeInBytes(boolean[] positions, int selectedRowPositions)
+    {
+        checkValidPositions(positions, positionCount);
+        if (selectedRowPositions == 0) {
+            return 0;
+        }
+        if (selectedRowPositions == positionCount) {
+            return getSizeInBytes();
+        }
+
+        if (fixedSizePerRow > 0) {
+            return fixedSizePerRow * (long) selectedRowPositions;
+        }
+
+        long sizeInBytes = Byte.BYTES * (long) selectedRowPositions;
+        for (Block fieldBlock : fieldBlocks) {
+            sizeInBytes += fieldBlock.getPositionsSizeInBytes(positions, selectedRowPositions);
+        }
+        return sizeInBytes;
+    }
+
+    @Override
+    public RowBlock copyRegion(int positionOffset, int length)
+    {
+        checkValidRegion(positionCount, positionOffset, length);
+
+        Block[] newBlocks = new Block[fieldBlocks.length];
+        for (int i = 0; i < fieldBlocks.length; i++) {
+            newBlocks[i] = fieldBlocks[i].copyRegion(positionOffset, length);
+        }
+
+        boolean[] newRowIsNull = rowIsNull == null ? null : compactArray(rowIsNull, positionOffset, length);
+        if (newRowIsNull == rowIsNull && arraySame(newBlocks, fieldBlocks)) {
+            return this;
+        }
+        return new RowBlock(length, newRowIsNull, newBlocks, fixedSizePerRow);
+    }
+
+    @Override
+    public <T> T getObject(int position, Class<T> clazz)
+    {
+        if (clazz != SqlRow.class) {
+            throw new IllegalArgumentException("clazz must be SqlRow.class");
+        }
+        return clazz.cast(getRow(position));
+    }
+
+    public SqlRow getRow(int position)
+    {
+        checkReadablePosition(this, position);
+        if (isNull(position)) {
+            throw new IllegalStateException("Position is null");
+        }
+        return new SqlRow(position, fieldBlocks);
+    }
+
+    @Override
+    public RowBlock getSingleValueBlock(int position)
+    {
+        checkReadablePosition(this, position);
+
+        Block[] newBlocks = new Block[fieldBlocks.length];
+        for (int i = 0; i < fieldBlocks.length; i++) {
+            newBlocks[i] = fieldBlocks[i].getSingleValueBlock(position);
+        }
+        boolean[] newRowIsNull = isNull(position) ? new boolean[] {true} : null;
+        return new RowBlock(1, newRowIsNull, newBlocks, fixedSizePerRow);
+    }
 
-        return createRowBlockInternal(getOffsetBase(), getPositionCount() + 1, newRowIsNull, newOffsets, getRawFieldBlocks());
+    @Override
+    public long getEstimatedDataSizeForStats(int position)
+    {
+        checkReadablePosition(this, position);
+
+        if (isNull(position)) {
+            return 0;
+        }
+
+        long size = 0;
+        for (Block fieldBlock : fieldBlocks) {
+            size += fieldBlock.getEstimatedDataSizeForStats(position);
+        }
+        return size;
+    }
+
+    @Override
+    public boolean isNull(int position)
+    {
+        checkReadablePosition(this, position);
+        return rowIsNull != null && rowIsNull[position];
+    }
+
+    /**
+     * Returns the row fields from the specified block. The block maybe a LazyBlock, RunLengthEncodedBlock, or
+     * DictionaryBlock, but the underlying block must be a RowBlock. The returned field blocks will be the same
+     * length as the specified block, which means they are not null suppressed.
+     */
+    public static List<Block> getRowFieldsFromBlock(Block block)
+    {
+        // if the block is lazy, be careful to not materialize the nested blocks
+        if (block instanceof LazyBlock lazyBlock) {
+            block = lazyBlock.getBlock();
+        }
+
+        if (block instanceof RunLengthEncodedBlock runLengthEncodedBlock) {
+            RowBlock rowBlock = (RowBlock) runLengthEncodedBlock.getValue();
+            return rowBlock.fieldBlocksList.stream()
+                    .map(fieldBlock -> RunLengthEncodedBlock.create(fieldBlock, runLengthEncodedBlock.getPositionCount()))
+                    .toList();
+        }
+        if (block instanceof DictionaryBlock dictionaryBlock) {
+            RowBlock rowBlock = (RowBlock) dictionaryBlock.getDictionary();
+            return rowBlock.fieldBlocksList.stream()
+                    .map(dictionaryBlock::createProjection)
+                    .toList();
+        }
+        if (block instanceof RowBlock) {
+            return ((RowBlock) block).getFieldBlocks();
+        }
+        throw new IllegalArgumentException("Unexpected block type: " + block.getClass().getSimpleName());
+    }
+
+    /**
+     * Returns the row fields from the specified block with null rows suppressed. The block maybe a LazyBlock, RunLengthEncodedBlock, or
+     * DictionaryBlock, but the underlying block must be a RowBlock. The returned field blocks will not be the same
+     * length as the specified block if it contains null rows.
+     */
+    public static List<Block> getNullSuppressedRowFieldsFromBlock(Block block)
+    {
+        // if the block is lazy, be careful to not materialize the nested blocks
+        if (block instanceof LazyBlock lazyBlock) {
+            block = lazyBlock.getBlock();
+        }
+
+        if (!block.mayHaveNull()) {
+            return getRowFieldsFromBlock(block);
+        }
+
+        if (block instanceof RunLengthEncodedBlock runLengthEncodedBlock) {
+            RowBlock rowBlock = (RowBlock) runLengthEncodedBlock.getValue();
+            if (!rowBlock.isNull(0)) {
+                throw new IllegalStateException("Expected run length encoded block value to be null");
+            }
+            // all values are null, so return a zero-length block of the correct type
+            return rowBlock.fieldBlocksList.stream()
+                    .map(fieldBlock -> fieldBlock.getRegion(0, 0))
+                    .toList();
+        }
+        if (block instanceof DictionaryBlock dictionaryBlock) {
+            int[] newIds = new int[dictionaryBlock.getPositionCount()];
+            int idCount = 0;
+            for (int position = 0; position < newIds.length; position++) {
+                if (!dictionaryBlock.isNull(position)) {
+                    newIds[idCount] = dictionaryBlock.getId(position);
+                    idCount++;
+                }
+            }
+            int nonNullPositionCount = idCount;
+            RowBlock rowBlock = (RowBlock) dictionaryBlock.getDictionary();
+            return rowBlock.fieldBlocksList.stream()
+                    .map(field -> DictionaryBlock.create(nonNullPositionCount, field, newIds))
+                    .toList();
+        }
+        if (block instanceof RowBlock rowBlock) {
+            int[] nonNullPositions = new int[rowBlock.getPositionCount()];
+            int idCount = 0;
+            for (int position = 0; position < nonNullPositions.length; position++) {
+                if (!rowBlock.isNull(position)) {
+                    nonNullPositions[idCount] = position;
+                    idCount++;
+                }
+            }
+            int nonNullPositionCount = idCount;
+            return rowBlock.fieldBlocksList.stream()
+                    .map(field -> DictionaryBlock.create(nonNullPositionCount, field, nonNullPositions))
+                    .toList();
+        }
+        throw new IllegalArgumentException("Unexpected block type: " + block.getClass().getSimpleName());
+    }
+
+    @Override
+    public RowBlock getUnderlyingValueBlock()
+    {
+        return this;
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/RowBlockBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/RowBlockBuilder.java
index 437ae97ec28c..291c97c1b9ae 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/RowBlockBuilder.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/RowBlockBuilder.java
@@ -15,23 +15,18 @@
 package io.trino.spi.block;
 
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.function.ObjLongConsumer;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
 import static io.trino.spi.block.RowBlock.createRowBlockInternal;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class RowBlockBuilder
-        extends AbstractRowBlock
         implements BlockBuilder
 {
     private static final int INSTANCE_SIZE = instanceSize(RowBlockBuilder.class);
@@ -40,10 +35,9 @@ public class RowBlockBuilder
     private final BlockBuilderStatus blockBuilderStatus;
 
     private int positionCount;
-    private int[] fieldBlockOffsets;
     private boolean[] rowIsNull;
     private final BlockBuilder[] fieldBlockBuilders;
-    private final SingleRowBlockWriter singleRowBlockWriter;
+    private final List<BlockBuilder> fieldBlockBuildersList;
 
     private boolean currentEntryOpened;
     private boolean hasNullRow;
@@ -54,20 +48,16 @@ public RowBlockBuilder(List<Type> fieldTypes, BlockBuilderStatus blockBuilderSta
         this(
                 blockBuilderStatus,
                 createFieldBlockBuilders(fieldTypes, blockBuilderStatus, expectedEntries),
-                new int[expectedEntries + 1],
                 new boolean[expectedEntries]);
     }
 
-    private RowBlockBuilder(@Nullable BlockBuilderStatus blockBuilderStatus, BlockBuilder[] fieldBlockBuilders, int[] fieldBlockOffsets, boolean[] rowIsNull)
+    private RowBlockBuilder(@Nullable BlockBuilderStatus blockBuilderStatus, BlockBuilder[] fieldBlockBuilders, boolean[] rowIsNull)
     {
-        super(fieldBlockBuilders.length);
-
         this.blockBuilderStatus = blockBuilderStatus;
         this.positionCount = 0;
-        this.fieldBlockOffsets = requireNonNull(fieldBlockOffsets, "fieldBlockOffsets is null");
         this.rowIsNull = requireNonNull(rowIsNull, "rowIsNull is null");
         this.fieldBlockBuilders = requireNonNull(fieldBlockBuilders, "fieldBlockBuilders is null");
-        this.singleRowBlockWriter = new SingleRowBlockWriter(fieldBlockBuilders);
+        this.fieldBlockBuildersList = List.of(fieldBlockBuilders);
     }
 
     private static BlockBuilder[] createFieldBlockBuilders(List<Type> fieldTypes, BlockBuilderStatus blockBuilderStatus, int expectedEntries)
@@ -80,38 +70,6 @@ private static BlockBuilder[] createFieldBlockBuilders(List<Type> fieldTypes, Bl
         return fieldBlockBuilders;
     }
 
-    @Override
-    protected Block[] getRawFieldBlocks()
-    {
-        return fieldBlockBuilders;
-    }
-
-    @Override
-    @Nullable
-    protected int[] getFieldBlockOffsets()
-    {
-        return hasNullRow ? fieldBlockOffsets : null;
-    }
-
-    @Override
-    protected int getOffsetBase()
-    {
-        return 0;
-    }
-
-    @Nullable
-    @Override
-    protected boolean[] getRowIsNull()
-    {
-        return hasNullRow ? rowIsNull : null;
-    }
-
-    @Override
-    public boolean mayHaveNull()
-    {
-        return hasNullRow;
-    }
-
     @Override
     public int getPositionCount()
     {
@@ -122,8 +80,8 @@ public int getPositionCount()
     public long getSizeInBytes()
     {
         long sizeInBytes = (Integer.BYTES + Byte.BYTES) * (long) positionCount;
-        for (int i = 0; i < numFields; i++) {
-            sizeInBytes += fieldBlockBuilders[i].getSizeInBytes();
+        for (BlockBuilder fieldBlockBuilder : fieldBlockBuilders) {
+            sizeInBytes += fieldBlockBuilder.getSizeInBytes();
         }
         return sizeInBytes;
     }
@@ -131,50 +89,27 @@ public long getSizeInBytes()
     @Override
     public long getRetainedSizeInBytes()
     {
-        long size = INSTANCE_SIZE + sizeOf(fieldBlockOffsets) + sizeOf(rowIsNull);
-        for (int i = 0; i < numFields; i++) {
-            size += fieldBlockBuilders[i].getRetainedSizeInBytes();
+        long size = INSTANCE_SIZE + sizeOf(rowIsNull);
+        for (BlockBuilder fieldBlockBuilder : fieldBlockBuilders) {
+            size += fieldBlockBuilder.getRetainedSizeInBytes();
         }
         if (blockBuilderStatus != null) {
             size += BlockBuilderStatus.INSTANCE_SIZE;
         }
-        size += SingleRowBlockWriter.INSTANCE_SIZE;
         return size;
     }
 
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        for (int i = 0; i < numFields; i++) {
-            consumer.accept(fieldBlockBuilders[i], fieldBlockBuilders[i].getRetainedSizeInBytes());
-        }
-        consumer.accept(fieldBlockOffsets, sizeOf(fieldBlockOffsets));
-        consumer.accept(rowIsNull, sizeOf(rowIsNull));
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
-    @Override
-    public SingleRowBlockWriter beginBlockEntry()
+    public <E extends Throwable> void buildEntry(RowValueBuilder<E> builder)
+            throws E
     {
         if (currentEntryOpened) {
             throw new IllegalStateException("Expected current entry to be closed but was opened");
         }
-        currentEntryOpened = true;
-        singleRowBlockWriter.setRowIndex(fieldBlockBuilders[0].getPositionCount());
-        return singleRowBlockWriter;
-    }
-
-    @Override
-    public BlockBuilder closeEntry()
-    {
-        if (!currentEntryOpened) {
-            throw new IllegalStateException("Expected entry to be opened but was closed");
-        }
 
+        currentEntryOpened = true;
+        builder.build(fieldBlockBuildersList);
         entryAdded(false);
         currentEntryOpened = false;
-        singleRowBlockWriter.reset();
-        return this;
     }
 
     @Override
@@ -183,6 +118,11 @@ public BlockBuilder appendNull()
         if (currentEntryOpened) {
             throw new IllegalStateException("Current entry must be closed before a null can be written");
         }
+
+        for (BlockBuilder fieldBlockBuilder : fieldBlockBuilders) {
+            fieldBlockBuilder.appendNull();
+        }
+
         entryAdded(true);
         return this;
     }
@@ -192,23 +132,16 @@ private void entryAdded(boolean isNull)
         if (rowIsNull.length <= positionCount) {
             int newSize = BlockUtil.calculateNewArraySize(rowIsNull.length);
             rowIsNull = Arrays.copyOf(rowIsNull, newSize);
-            fieldBlockOffsets = Arrays.copyOf(fieldBlockOffsets, newSize + 1);
         }
 
-        if (isNull) {
-            fieldBlockOffsets[positionCount + 1] = fieldBlockOffsets[positionCount];
-        }
-        else {
-            fieldBlockOffsets[positionCount + 1] = fieldBlockOffsets[positionCount] + 1;
-        }
         rowIsNull[positionCount] = isNull;
         hasNullRow |= isNull;
         hasNonNullRow |= !isNull;
         positionCount++;
 
-        for (int i = 0; i < numFields; i++) {
-            if (fieldBlockBuilders[i].getPositionCount() != fieldBlockOffsets[positionCount]) {
-                throw new IllegalStateException(format("field %s has unexpected position count. Expected: %s, actual: %s", i, fieldBlockOffsets[positionCount], fieldBlockBuilders[i].getPositionCount()));
+        for (int i = 0; i < fieldBlockBuilders.length; i++) {
+            if (fieldBlockBuilders[i].getPositionCount() != positionCount) {
+                throw new IllegalStateException(format("field %s has unexpected position count. Expected: %s, actual: %s", i, positionCount, fieldBlockBuilders[i].getPositionCount()));
             }
         }
 
@@ -226,72 +159,47 @@ public Block build()
         if (!hasNonNullRow) {
             return nullRle(positionCount);
         }
-        Block[] fieldBlocks = new Block[numFields];
-        for (int i = 0; i < numFields; i++) {
-            fieldBlocks[i] = fieldBlockBuilders[i].build();
-        }
-        return createRowBlockInternal(0, positionCount, hasNullRow ? rowIsNull : null, hasNullRow ? fieldBlockOffsets : null, fieldBlocks);
-    }
-
-    @Override
-    public String toString()
-    {
-        return format("RowBlockBuilder{numFields=%d, positionCount=%d", numFields, getPositionCount());
+        return buildValueBlock();
     }
 
     @Override
-    public BlockBuilder newBlockBuilderLike(int expectedEntries, BlockBuilderStatus blockBuilderStatus)
+    public RowBlock buildValueBlock()
     {
-        BlockBuilder[] newBlockBuilders = new BlockBuilder[numFields];
-        for (int i = 0; i < numFields; i++) {
-            newBlockBuilders[i] = fieldBlockBuilders[i].newBlockBuilderLike(blockBuilderStatus);
+        if (currentEntryOpened) {
+            throw new IllegalStateException("Current entry must be closed before the block can be built");
         }
-        return new RowBlockBuilder(blockBuilderStatus, newBlockBuilders, new int[expectedEntries + 1], new boolean[expectedEntries]);
-    }
 
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        if (!hasNonNullRow) {
-            return nullRle(length);
+        Block[] fieldBlocks = new Block[fieldBlockBuilders.length];
+        for (int i = 0; i < fieldBlockBuilders.length; i++) {
+            fieldBlocks[i] = fieldBlockBuilders[i].build();
         }
-        return super.copyPositions(positions, offset, length);
+        return createRowBlockInternal(positionCount, hasNullRow ? rowIsNull : null, fieldBlocks);
     }
 
     @Override
-    public Block getRegion(int position, int length)
+    public String toString()
     {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        if (!hasNonNullRow) {
-            return nullRle(length);
-        }
-        return super.getRegion(position, length);
+        return format("RowBlockBuilder{numFields=%d, positionCount=%d", fieldBlockBuilders.length, getPositionCount());
     }
 
     @Override
-    public Block copyRegion(int position, int length)
+    public BlockBuilder newBlockBuilderLike(int expectedEntries, BlockBuilderStatus blockBuilderStatus)
     {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, position, length);
-
-        if (!hasNonNullRow) {
-            return nullRle(length);
+        BlockBuilder[] newBlockBuilders = new BlockBuilder[fieldBlockBuilders.length];
+        for (int i = 0; i < fieldBlockBuilders.length; i++) {
+            newBlockBuilders[i] = fieldBlockBuilders[i].newBlockBuilderLike(blockBuilderStatus);
         }
-        return super.copyRegion(position, length);
+        return new RowBlockBuilder(blockBuilderStatus, newBlockBuilders, new boolean[expectedEntries]);
     }
 
     private Block nullRle(int length)
     {
-        Block[] fieldBlocks = new Block[numFields];
-        for (int i = 0; i < numFields; i++) {
-            fieldBlocks[i] = fieldBlockBuilders[i].newBlockBuilderLike(null).build();
+        Block[] fieldBlocks = new Block[fieldBlockBuilders.length];
+        for (int i = 0; i < fieldBlockBuilders.length; i++) {
+            fieldBlocks[i] = fieldBlockBuilders[i].newBlockBuilderLike(null).appendNull().build();
         }
 
-        RowBlock nullRowBlock = createRowBlockInternal(0, 1, new boolean[] {true}, new int[] {0, 0}, fieldBlocks);
+        RowBlock nullRowBlock = createRowBlockInternal(1, new boolean[] {true}, fieldBlocks);
         return RunLengthEncodedBlock.create(nullRowBlock, length);
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/RowBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/RowBlockEncoding.java
index 00fe6302fea4..32d29086402d 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/RowBlockEncoding.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/RowBlockEncoding.java
@@ -17,8 +17,7 @@
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.SliceOutput;
 
-import static io.airlift.slice.Slices.wrappedIntArray;
-import static io.trino.spi.block.RowBlock.createRowBlockInternal;
+import java.util.Optional;
 
 public class RowBlockEncoding
         implements BlockEncoding
@@ -34,62 +33,31 @@ public String getName()
     @Override
     public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
     {
-        AbstractRowBlock rowBlock = (AbstractRowBlock) block;
-        int[] fieldBlockOffsets = rowBlock.getFieldBlockOffsets();
+        RowBlock rowBlock = (RowBlock) block;
 
-        int numFields = rowBlock.numFields;
+        sliceOutput.appendInt(rowBlock.getPositionCount());
 
-        int positionCount = rowBlock.getPositionCount();
-
-        int offsetBase = rowBlock.getOffsetBase();
-
-        int startFieldBlockOffset = fieldBlockOffsets != null ? fieldBlockOffsets[offsetBase] : offsetBase;
-        int endFieldBlockOffset = fieldBlockOffsets != null ? fieldBlockOffsets[offsetBase + positionCount] : offsetBase + positionCount;
-
-        sliceOutput.appendInt(numFields);
-        sliceOutput.appendInt(positionCount);
-
-        for (int i = 0; i < numFields; i++) {
-            blockEncodingSerde.writeBlock(sliceOutput, rowBlock.getRawFieldBlocks()[i].getRegion(startFieldBlockOffset, endFieldBlockOffset - startFieldBlockOffset));
+        Block[] rawFieldBlocks = rowBlock.getRawFieldBlocks();
+        sliceOutput.appendInt(rawFieldBlocks.length);
+        for (Block rawFieldBlock : rawFieldBlocks) {
+            blockEncodingSerde.writeBlock(sliceOutput, rawFieldBlock);
         }
 
         EncoderUtil.encodeNullsAsBits(sliceOutput, block);
-
-        if ((rowBlock.getRowIsNull() == null) != (fieldBlockOffsets == null)) {
-            throw new IllegalArgumentException("When rowIsNull is (non) null then fieldBlockOffsets should be (non) null as well");
-        }
-
-        if (fieldBlockOffsets != null) {
-            if (startFieldBlockOffset == 0) {
-                sliceOutput.writeBytes(wrappedIntArray(fieldBlockOffsets, offsetBase, positionCount + 1));
-            }
-            else {
-                int[] newFieldBlockOffsets = new int[positionCount + 1];
-                for (int position = 0; position < positionCount + 1; position++) {
-                    newFieldBlockOffsets[position] = fieldBlockOffsets[offsetBase + position] - startFieldBlockOffset;
-                }
-                sliceOutput.writeBytes(wrappedIntArray(newFieldBlockOffsets));
-            }
-        }
     }
 
     @Override
     public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
     {
-        int numFields = sliceInput.readInt();
         int positionCount = sliceInput.readInt();
 
+        int numFields = sliceInput.readInt();
         Block[] fieldBlocks = new Block[numFields];
         for (int i = 0; i < numFields; i++) {
             fieldBlocks[i] = blockEncodingSerde.readBlock(sliceInput);
         }
 
-        boolean[] rowIsNull = EncoderUtil.decodeNullBits(sliceInput, positionCount).orElse(null);
-        int[] fieldBlockOffsets = null;
-        if (rowIsNull != null) {
-            fieldBlockOffsets = new int[positionCount + 1];
-            sliceInput.readBytes(wrappedIntArray(fieldBlockOffsets));
-        }
-        return createRowBlockInternal(0, positionCount, rowIsNull, fieldBlockOffsets, fieldBlocks);
+        Optional<boolean[]> rowIsNull = EncoderUtil.decodeNullBits(sliceInput, positionCount);
+        return RowBlock.fromNotNullSuppressedFieldBlocks(positionCount, rowIsNull, fieldBlocks);
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/RowValueBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/RowValueBuilder.java
new file mode 100644
index 000000000000..b6579a9e4032
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/RowValueBuilder.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.trino.spi.type.RowType;
+
+import java.util.List;
+
+public interface RowValueBuilder<E extends Throwable>
+{
+    static <E extends Throwable> SqlRow buildRowValue(RowType rowType, RowValueBuilder<E> builder)
+            throws E
+    {
+        return new BufferedRowValueBuilder(rowType, 1)
+                .build(builder);
+    }
+
+    void build(List<BlockBuilder> fieldBuilders)
+            throws E;
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/RunLengthEncodedBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/RunLengthEncodedBlock.java
index eb23b72364a6..ec09dabf36ef 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/RunLengthEncodedBlock.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/RunLengthEncodedBlock.java
@@ -16,8 +16,7 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.predicate.Utils;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.OptionalInt;
@@ -32,7 +31,7 @@
 import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
 
-public class RunLengthEncodedBlock
+public final class RunLengthEncodedBlock
         implements Block
 {
     private static final int INSTANCE_SIZE = instanceSize(RunLengthEncodedBlock.class);
@@ -59,13 +58,30 @@ public static Block create(Block value, int positionCount)
         if (positionCount == 1) {
             return value;
         }
-        return new RunLengthEncodedBlock(value, positionCount);
+
+        if (value instanceof ValueBlock valueBlock) {
+            return new RunLengthEncodedBlock(valueBlock, positionCount);
+        }
+
+        // if the value is lazy be careful to not materialize it
+        if (value instanceof LazyBlock lazyBlock) {
+            return new LazyBlock(positionCount, () -> create(lazyBlock.getBlock(), positionCount));
+        }
+
+        // unwrap the value
+        ValueBlock valueBlock = value.getUnderlyingValueBlock();
+        int valuePosition = value.getUnderlyingValuePosition(0);
+        if (valueBlock.getPositionCount() == 1 && valuePosition == 0) {
+            return new RunLengthEncodedBlock(valueBlock, positionCount);
+        }
+
+        return new RunLengthEncodedBlock(valueBlock.getRegion(valuePosition, 1), positionCount);
     }
 
-    private final Block value;
+    private final ValueBlock value;
     private final int positionCount;
 
-    private RunLengthEncodedBlock(Block value, int positionCount)
+    private RunLengthEncodedBlock(ValueBlock value, int positionCount)
     {
         requireNonNull(value, "value is null");
         if (positionCount < 0) {
@@ -75,40 +91,23 @@ private RunLengthEncodedBlock(Block value, int positionCount)
             throw new IllegalArgumentException("positionCount must be at least 2");
         }
 
-        // do not nest an RLE or Dictionary in an RLE
-        if (value instanceof RunLengthEncodedBlock block) {
-            this.value = block.getValue();
-        }
-        else if (value instanceof DictionaryBlock block) {
-            Block dictionary = block.getDictionary();
-            int id = block.getId(0);
-            if (dictionary.getPositionCount() == 1 && id == 0) {
-                this.value = dictionary;
-            }
-            else {
-                this.value = dictionary.getRegion(id, 1);
-            }
-        }
-        else {
-            this.value = value;
-        }
-
+        this.value = value;
         this.positionCount = positionCount;
     }
 
     @Override
-    public final List<Block> getChildren()
+    public List<Block> getChildren()
     {
         return singletonList(value);
     }
 
-    public Block getValue()
+    public ValueBlock getValue()
     {
         return value;
     }
 
     /**
-     * Positions count will always be at least 2
+     * Position count will always be at least 2
      */
     @Override
     public int getPositionCount()
@@ -255,49 +254,7 @@ public <T> T getObject(int position, Class<T> clazz)
     }
 
     @Override
-    public boolean bytesEqual(int position, int offset, Slice otherSlice, int otherOffset, int length)
-    {
-        checkReadablePosition(this, position);
-        return value.bytesEqual(0, offset, otherSlice, otherOffset, length);
-    }
-
-    @Override
-    public int bytesCompare(int position, int offset, int length, Slice otherSlice, int otherOffset, int otherLength)
-    {
-        checkReadablePosition(this, position);
-        return value.bytesCompare(0, offset, length, otherSlice, otherOffset, otherLength);
-    }
-
-    @Override
-    public void writeBytesTo(int position, int offset, int length, BlockBuilder blockBuilder)
-    {
-        checkReadablePosition(this, position);
-        value.writeBytesTo(0, offset, length, blockBuilder);
-    }
-
-    @Override
-    public boolean equals(int position, int offset, Block otherBlock, int otherPosition, int otherOffset, int length)
-    {
-        checkReadablePosition(this, position);
-        return value.equals(0, offset, otherBlock, otherPosition, otherOffset, length);
-    }
-
-    @Override
-    public long hash(int position, int offset, int length)
-    {
-        checkReadablePosition(this, position);
-        return value.hash(0, offset, length);
-    }
-
-    @Override
-    public int compareTo(int leftPosition, int leftOffset, int leftLength, Block rightBlock, int rightPosition, int rightOffset, int rightLength)
-    {
-        checkReadablePosition(this, leftPosition);
-        return value.compareTo(0, leftOffset, leftLength, rightBlock, rightPosition, rightOffset, rightLength);
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
+    public ValueBlock getSingleValueBlock(int position)
     {
         checkReadablePosition(this, position);
         return value;
@@ -323,7 +280,7 @@ public Block copyWithAppendedNull()
             return create(value, positionCount + 1);
         }
 
-        Block dictionary = value.copyWithAppendedNull();
+        ValueBlock dictionary = value.copyWithAppendedNull();
         int[] ids = new int[positionCount + 1];
         ids[positionCount] = 1;
         return DictionaryBlock.create(ids.length, dictionary, ids);
@@ -340,19 +297,14 @@ public String toString()
     }
 
     @Override
-    public boolean isLoaded()
+    public ValueBlock getUnderlyingValueBlock()
     {
-        return value.isLoaded();
+        return value;
     }
 
     @Override
-    public Block getLoadedBlock()
+    public int getUnderlyingValuePosition(int position)
     {
-        Block loadedValueBlock = value.getLoadedBlock();
-
-        if (loadedValueBlock == value) {
-            return this;
-        }
-        return create(loadedValueBlock, positionCount);
+        return 0;
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ShortArrayBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/ShortArrayBlock.java
index ca1d5a9dd131..336a5b845539 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/ShortArrayBlock.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ShortArrayBlock.java
@@ -13,10 +13,7 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -31,8 +28,8 @@
 import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
 import static io.trino.spi.block.BlockUtil.ensureCapacity;
 
-public class ShortArrayBlock
-        implements Block
+public final class ShortArrayBlock
+        implements ValueBlock
 {
     private static final int INSTANCE_SIZE = instanceSize(ShortArrayBlock.class);
     public static final int SIZE_IN_BYTES_PER_POSITION = Short.BYTES + Byte.BYTES;
@@ -129,10 +126,15 @@ public int getPositionCount()
     @Override
     public short getShort(int position, int offset)
     {
-        checkReadablePosition(this, position);
         if (offset != 0) {
             throw new IllegalArgumentException("offset must be zero");
         }
+        return getShort(position);
+    }
+
+    public short getShort(int position)
+    {
+        checkReadablePosition(this, position);
         return values[position + arrayOffset];
     }
 
@@ -150,7 +152,7 @@ public boolean isNull(int position)
     }
 
     @Override
-    public Block getSingleValueBlock(int position)
+    public ShortArrayBlock getSingleValueBlock(int position)
     {
         checkReadablePosition(this, position);
         return new ShortArrayBlock(
@@ -161,7 +163,7 @@ public Block getSingleValueBlock(int position)
     }
 
     @Override
-    public Block copyPositions(int[] positions, int offset, int length)
+    public ShortArrayBlock copyPositions(int[] positions, int offset, int length)
     {
         checkArrayRange(positions, offset, length);
 
@@ -182,7 +184,7 @@ public Block copyPositions(int[] positions, int offset, int length)
     }
 
     @Override
-    public Block getRegion(int positionOffset, int length)
+    public ShortArrayBlock getRegion(int positionOffset, int length)
     {
         checkValidRegion(getPositionCount(), positionOffset, length);
 
@@ -190,7 +192,7 @@ public Block getRegion(int positionOffset, int length)
     }
 
     @Override
-    public Block copyRegion(int positionOffset, int length)
+    public ShortArrayBlock copyRegion(int positionOffset, int length)
     {
         checkValidRegion(getPositionCount(), positionOffset, length);
 
@@ -211,13 +213,19 @@ public String getEncodingName()
     }
 
     @Override
-    public Block copyWithAppendedNull()
+    public ShortArrayBlock copyWithAppendedNull()
     {
         boolean[] newValueIsNull = copyIsNullAndAppendNull(valueIsNull, arrayOffset, positionCount);
         short[] newValues = ensureCapacity(values, arrayOffset + positionCount + 1);
         return new ShortArrayBlock(arrayOffset, positionCount + 1, newValueIsNull, newValues);
     }
 
+    @Override
+    public ShortArrayBlock getUnderlyingValueBlock()
+    {
+        return this;
+    }
+
     @Override
     public String toString()
     {
@@ -227,8 +235,13 @@ public String toString()
         return sb.toString();
     }
 
-    Slice getValuesSlice()
+    int getRawValuesOffset()
+    {
+        return arrayOffset;
+    }
+
+    short[] getRawValues()
     {
-        return Slices.wrappedShortArray(values, arrayOffset, positionCount);
+        return values;
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ShortArrayBlockBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/ShortArrayBlockBuilder.java
index a6dc1f4a4240..ee44b44b6dc2 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/ShortArrayBlockBuilder.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ShortArrayBlockBuilder.java
@@ -13,20 +13,12 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkReadablePosition;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
 import static java.lang.Math.max;
 
 public class ShortArrayBlockBuilder
@@ -58,14 +50,13 @@ public ShortArrayBlockBuilder(@Nullable BlockBuilderStatus blockBuilderStatus, i
         updateDataSize();
     }
 
-    @Override
-    public BlockBuilder writeShort(int value)
+    public BlockBuilder writeShort(short value)
     {
         if (values.length <= positionCount) {
             growCapacity();
         }
 
-        values[positionCount] = (short) value;
+        values[positionCount] = value;
 
         hasNonNullValue = true;
         positionCount++;
@@ -75,12 +66,6 @@ public BlockBuilder writeShort(int value)
         return this;
     }
 
-    @Override
-    public BlockBuilder closeEntry()
-    {
-        return this;
-    }
-
     @Override
     public BlockBuilder appendNull()
     {
@@ -104,6 +89,12 @@ public Block build()
         if (!hasNonNullValue) {
             return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, positionCount);
         }
+        return buildValueBlock();
+    }
+
+    @Override
+    public ShortArrayBlock buildValueBlock()
+    {
         return new ShortArrayBlock(0, positionCount, hasNullValue ? valueIsNull : null, values);
     }
 
@@ -137,147 +128,24 @@ private void updateDataSize()
         }
     }
 
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.of(ShortArrayBlock.SIZE_IN_BYTES_PER_POSITION);
-    }
-
     @Override
     public long getSizeInBytes()
     {
         return ShortArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) positionCount;
     }
 
-    @Override
-    public long getRegionSizeInBytes(int position, int length)
-    {
-        return ShortArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) length;
-    }
-
-    @Override
-    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionCount)
-    {
-        return ShortArrayBlock.SIZE_IN_BYTES_PER_POSITION * (long) selectedPositionCount;
-    }
-
     @Override
     public long getRetainedSizeInBytes()
     {
         return retainedSizeInBytes;
     }
 
-    @Override
-    public long getEstimatedDataSizeForStats(int position)
-    {
-        return isNull(position) ? 0 : Short.BYTES;
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(values, sizeOf(values));
-        consumer.accept(valueIsNull, sizeOf(valueIsNull));
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
     @Override
     public int getPositionCount()
     {
         return positionCount;
     }
 
-    @Override
-    public short getShort(int position, int offset)
-    {
-        checkReadablePosition(this, position);
-        if (offset != 0) {
-            throw new IllegalArgumentException("offset must be zero");
-        }
-        return values[position];
-    }
-
-    @Override
-    public boolean mayHaveNull()
-    {
-        return hasNullValue;
-    }
-
-    @Override
-    public boolean isNull(int position)
-    {
-        checkReadablePosition(this, position);
-        return valueIsNull[position];
-    }
-
-    @Override
-    public Block getSingleValueBlock(int position)
-    {
-        checkReadablePosition(this, position);
-        return new ShortArrayBlock(
-                0,
-                1,
-                valueIsNull[position] ? new boolean[] {true} : null,
-                new short[] {values[position]});
-    }
-
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = new boolean[length];
-        }
-        short[] newValues = new short[length];
-        for (int i = 0; i < length; i++) {
-            int position = positions[offset + i];
-            checkReadablePosition(this, position);
-            if (hasNullValue) {
-                newValueIsNull[i] = valueIsNull[position];
-            }
-            newValues[i] = values[position];
-        }
-        return new ShortArrayBlock(0, length, newValueIsNull, newValues);
-    }
-
-    @Override
-    public Block getRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        return new ShortArrayBlock(positionOffset, length, hasNullValue ? valueIsNull : null, values);
-    }
-
-    @Override
-    public Block copyRegion(int positionOffset, int length)
-    {
-        checkValidRegion(getPositionCount(), positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = Arrays.copyOfRange(valueIsNull, positionOffset, positionOffset + length);
-        }
-        short[] newValues = Arrays.copyOfRange(values, positionOffset, positionOffset + length);
-        return new ShortArrayBlock(0, length, newValueIsNull, newValues);
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        return ShortArrayBlockEncoding.NAME;
-    }
-
     @Override
     public String toString()
     {
@@ -286,9 +154,4 @@ public String toString()
         sb.append('}');
         return sb.toString();
     }
-
-    Slice getValuesSlice()
-    {
-        return Slices.wrappedShortArray(values, 0, positionCount);
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ShortArrayBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/ShortArrayBlockEncoding.java
index 49c3591f3270..15813a428f74 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/ShortArrayBlockEncoding.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ShortArrayBlockEncoding.java
@@ -13,10 +13,8 @@
  */
 package io.trino.spi.block;
 
-import io.airlift.slice.Slice;
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.SliceOutput;
-import io.airlift.slice.Slices;
 
 import static io.trino.spi.block.EncoderUtil.decodeNullBits;
 import static io.trino.spi.block.EncoderUtil.encodeNullsAsBits;
@@ -37,31 +35,32 @@ public String getName()
     @Override
     public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
     {
-        int positionCount = block.getPositionCount();
+        ShortArrayBlock shortArrayBlock = (ShortArrayBlock) block;
+        int positionCount = shortArrayBlock.getPositionCount();
         sliceOutput.appendInt(positionCount);
 
-        encodeNullsAsBits(sliceOutput, block);
+        encodeNullsAsBits(sliceOutput, shortArrayBlock);
 
-        if (!block.mayHaveNull()) {
-            sliceOutput.writeBytes(getValuesSlice(block));
+        if (!shortArrayBlock.mayHaveNull()) {
+            sliceOutput.writeShorts(shortArrayBlock.getRawValues(), shortArrayBlock.getRawValuesOffset(), shortArrayBlock.getPositionCount());
         }
         else {
             short[] valuesWithoutNull = new short[positionCount];
             int nonNullPositionCount = 0;
             for (int i = 0; i < positionCount; i++) {
-                valuesWithoutNull[nonNullPositionCount] = block.getShort(i, 0);
-                if (!block.isNull(i)) {
+                valuesWithoutNull[nonNullPositionCount] = shortArrayBlock.getShort(i);
+                if (!shortArrayBlock.isNull(i)) {
                     nonNullPositionCount++;
                 }
             }
 
             sliceOutput.writeInt(nonNullPositionCount);
-            sliceOutput.writeBytes(Slices.wrappedShortArray(valuesWithoutNull, 0, nonNullPositionCount));
+            sliceOutput.writeShorts(valuesWithoutNull, 0, nonNullPositionCount);
         }
     }
 
     @Override
-    public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
+    public ShortArrayBlock readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
     {
         int positionCount = sliceInput.readInt();
 
@@ -69,13 +68,13 @@ public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceIn
         short[] values = new short[positionCount];
 
         if (valueIsNullPacked == null) {
-            sliceInput.readBytes(Slices.wrappedShortArray(values));
+            sliceInput.readShorts(values);
             return new ShortArrayBlock(0, positionCount, null, values);
         }
         boolean[] valueIsNull = decodeNullBits(valueIsNullPacked, positionCount);
 
         int nonNullPositionCount = sliceInput.readInt();
-        sliceInput.readBytes(Slices.wrappedShortArray(values, 0, nonNullPositionCount));
+        sliceInput.readShorts(values, 0, nonNullPositionCount);
         int position = nonNullPositionCount - 1;
 
         // Handle Last (positionCount % 8) values
@@ -105,16 +104,4 @@ else if (packed != -1) { // At least one non-null
         }
         return new ShortArrayBlock(0, positionCount, valueIsNull, values);
     }
-
-    private Slice getValuesSlice(Block block)
-    {
-        if (block instanceof ShortArrayBlock) {
-            return ((ShortArrayBlock) block).getValuesSlice();
-        }
-        if (block instanceof ShortArrayBlockBuilder) {
-            return ((ShortArrayBlockBuilder) block).getValuesSlice();
-        }
-
-        throw new IllegalArgumentException("Unexpected block type " + block.getClass().getSimpleName());
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/SingleArrayBlockWriter.java b/core/trino-spi/src/main/java/io/trino/spi/block/SingleArrayBlockWriter.java
deleted file mode 100644
index 65219571b509..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/SingleArrayBlockWriter.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.airlift.slice.Slice;
-
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
-
-import static io.airlift.slice.SizeOf.instanceSize;
-import static java.lang.String.format;
-
-public class SingleArrayBlockWriter
-        extends AbstractSingleArrayBlock
-        implements BlockBuilder
-{
-    private static final int INSTANCE_SIZE = instanceSize(SingleArrayBlockWriter.class);
-
-    private final BlockBuilder blockBuilder;
-    private final long initialBlockBuilderSize;
-    private int positionsWritten;
-
-    public SingleArrayBlockWriter(BlockBuilder blockBuilder, int start)
-    {
-        super(start);
-        this.blockBuilder = blockBuilder;
-        this.initialBlockBuilderSize = blockBuilder.getSizeInBytes();
-    }
-
-    @Override
-    protected Block getBlock()
-    {
-        return blockBuilder;
-    }
-
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.empty();
-    }
-
-    @Override
-    public long getSizeInBytes()
-    {
-        return blockBuilder.getSizeInBytes() - initialBlockBuilderSize;
-    }
-
-    @Override
-    public long getRetainedSizeInBytes()
-    {
-        return INSTANCE_SIZE + blockBuilder.getRetainedSizeInBytes();
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(blockBuilder, blockBuilder.getRetainedSizeInBytes());
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
-    @Override
-    public BlockBuilder writeByte(int value)
-    {
-        blockBuilder.writeByte(value);
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeShort(int value)
-    {
-        blockBuilder.writeShort(value);
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeInt(int value)
-    {
-        blockBuilder.writeInt(value);
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeLong(long value)
-    {
-        blockBuilder.writeLong(value);
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeBytes(Slice source, int sourceIndex, int length)
-    {
-        blockBuilder.writeBytes(source, sourceIndex, length);
-        return this;
-    }
-
-    @Override
-    public BlockBuilder beginBlockEntry()
-    {
-        return blockBuilder.beginBlockEntry();
-    }
-
-    @Override
-    public BlockBuilder appendNull()
-    {
-        blockBuilder.appendNull();
-        entryAdded();
-        return this;
-    }
-
-    @Override
-    public BlockBuilder closeEntry()
-    {
-        blockBuilder.closeEntry();
-        entryAdded();
-        return this;
-    }
-
-    private void entryAdded()
-    {
-        positionsWritten++;
-    }
-
-    @Override
-    public int getPositionCount()
-    {
-        return positionsWritten;
-    }
-
-    @Override
-    public Block build()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public BlockBuilder newBlockBuilderLike(int expectedEntries, BlockBuilderStatus blockBuilderStatus)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String toString()
-    {
-        return format("SingleArrayBlockWriter{positionCount=%d}", getPositionCount());
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/SingleMapBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/SingleMapBlock.java
deleted file mode 100644
index 54cdf6f0e7a2..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/SingleMapBlock.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.trino.spi.TrinoException;
-import io.trino.spi.type.Type;
-
-import java.lang.invoke.MethodHandle;
-import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
-
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.airlift.slice.SizeOf.sizeOfIntArray;
-import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static io.trino.spi.block.MapHashTables.HASH_MULTIPLIER;
-import static io.trino.spi.block.MapHashTables.computePosition;
-import static java.lang.String.format;
-
-public class SingleMapBlock
-        extends AbstractSingleMapBlock
-{
-    private static final int INSTANCE_SIZE = instanceSize(SingleMapBlock.class);
-
-    private final int offset;
-    private final int positionCount;    // The number of keys in this single map * 2
-    private final AbstractMapBlock mapBlock;
-
-    SingleMapBlock(int offset, int positionCount, AbstractMapBlock mapBlock)
-    {
-        this.offset = offset;
-        this.positionCount = positionCount;
-        this.mapBlock = mapBlock;
-    }
-
-    public Type getMapType()
-    {
-        return mapBlock.getMapType();
-    }
-
-    @Override
-    public int getPositionCount()
-    {
-        return positionCount;
-    }
-
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.empty();
-    }
-
-    @Override
-    public long getSizeInBytes()
-    {
-        return mapBlock.getRawKeyBlock().getRegionSizeInBytes(offset / 2, positionCount / 2) +
-                mapBlock.getRawValueBlock().getRegionSizeInBytes(offset / 2, positionCount / 2) +
-                sizeOfIntArray(positionCount / 2 * HASH_MULTIPLIER);
-    }
-
-    @Override
-    public long getRetainedSizeInBytes()
-    {
-        return INSTANCE_SIZE + mapBlock.getRetainedSizeInBytes();
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(mapBlock.getRawKeyBlock(), mapBlock.getRawKeyBlock().getRetainedSizeInBytes());
-        consumer.accept(mapBlock.getRawValueBlock(), mapBlock.getRawValueBlock().getRetainedSizeInBytes());
-        consumer.accept(mapBlock.getHashTables(), mapBlock.getHashTables().getRetainedSizeInBytes());
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        return SingleMapBlockEncoding.NAME;
-    }
-
-    @Override
-    public int getOffset()
-    {
-        return offset;
-    }
-
-    @Override
-    Block getRawKeyBlock()
-    {
-        return mapBlock.getRawKeyBlock();
-    }
-
-    @Override
-    Block getRawValueBlock()
-    {
-        return mapBlock.getRawValueBlock();
-    }
-
-    @Override
-    public Block copyWithAppendedNull()
-    {
-        throw new UnsupportedOperationException("SingleMapBlock does not support newBlockWithAppendedNull()");
-    }
-
-    @Override
-    public String toString()
-    {
-        return format("SingleMapBlock{positionCount=%d}", getPositionCount());
-    }
-
-    @Override
-    public boolean isLoaded()
-    {
-        return mapBlock.getRawKeyBlock().isLoaded() && mapBlock.getRawValueBlock().isLoaded();
-    }
-
-    @Override
-    public Block getLoadedBlock()
-    {
-        if (mapBlock.getRawKeyBlock() != mapBlock.getRawKeyBlock().getLoadedBlock()) {
-            // keyBlock has to be loaded since MapBlock constructs hash table eagerly.
-            throw new IllegalStateException();
-        }
-
-        Block loadedValueBlock = mapBlock.getRawValueBlock().getLoadedBlock();
-        if (loadedValueBlock == mapBlock.getRawValueBlock()) {
-            return this;
-        }
-        return new SingleMapBlock(
-                offset,
-                positionCount,
-                mapBlock);
-    }
-
-    public Optional<int[]> tryGetHashTable()
-    {
-        return mapBlock.getHashTables().tryGet();
-    }
-
-    /**
-     * @return position of the value under {@code nativeValue} key. -1 when key is not found.
-     */
-    public int seekKey(Object nativeValue)
-    {
-        if (positionCount == 0) {
-            return -1;
-        }
-
-        mapBlock.ensureHashTableLoaded();
-        int[] hashTable = mapBlock.getHashTables().get();
-
-        long hashCode;
-        try {
-            hashCode = (long) mapBlock.getMapType().getKeyNativeHashCode().invoke(nativeValue);
-        }
-        catch (Throwable throwable) {
-            throw handleThrowable(throwable);
-        }
-
-        int hashTableOffset = offset / 2 * HASH_MULTIPLIER;
-        int hashTableSize = positionCount / 2 * HASH_MULTIPLIER;
-        int position = computePosition(hashCode, hashTableSize);
-        while (true) {
-            int keyPosition = hashTable[hashTableOffset + position];
-            if (keyPosition == -1) {
-                return -1;
-            }
-            Boolean match;
-            try {
-                // assuming maps with indeterminate keys are not supported
-                match = (Boolean) mapBlock.getMapType().getKeyBlockNativeEqual().invoke(mapBlock.getRawKeyBlock(), offset / 2 + keyPosition, nativeValue);
-            }
-            catch (Throwable throwable) {
-                throw handleThrowable(throwable);
-            }
-            checkNotIndeterminate(match);
-            if (match) {
-                return keyPosition * 2 + 1;
-            }
-            position++;
-            if (position == hashTableSize) {
-                position = 0;
-            }
-        }
-    }
-
-    public int seekKey(MethodHandle keyEqualOperator, MethodHandle keyHashOperator, Block targetKeyBlock, int targetKeyPosition)
-    {
-        if (positionCount == 0) {
-            return -1;
-        }
-
-        mapBlock.ensureHashTableLoaded();
-        int[] hashTable = mapBlock.getHashTables().get();
-
-        long hashCode;
-        try {
-            hashCode = (long) keyHashOperator.invoke(targetKeyBlock, targetKeyPosition);
-        }
-        catch (Throwable throwable) {
-            throw handleThrowable(throwable);
-        }
-
-        int hashTableOffset = offset / 2 * HASH_MULTIPLIER;
-        int hashTableSize = positionCount / 2 * HASH_MULTIPLIER;
-        int position = computePosition(hashCode, hashTableSize);
-        while (true) {
-            int keyPosition = hashTable[hashTableOffset + position];
-            if (keyPosition == -1) {
-                return -1;
-            }
-            Boolean match;
-            try {
-                // assuming maps with indeterminate keys are not supported
-                match = (Boolean) keyEqualOperator.invoke(mapBlock.getRawKeyBlock(), offset / 2 + keyPosition, targetKeyBlock, targetKeyPosition);
-            }
-            catch (Throwable throwable) {
-                throw handleThrowable(throwable);
-            }
-            checkNotIndeterminate(match);
-            if (match) {
-                return keyPosition * 2 + 1;
-            }
-            position++;
-            if (position == hashTableSize) {
-                position = 0;
-            }
-        }
-    }
-
-    // The next 5 seekKeyExact functions are the same as seekKey
-    // except MethodHandle.invoke is replaced with invokeExact.
-
-    public int seekKeyExact(long nativeValue)
-    {
-        if (positionCount == 0) {
-            return -1;
-        }
-
-        mapBlock.ensureHashTableLoaded();
-        int[] hashTable = mapBlock.getHashTables().get();
-
-        long hashCode;
-        try {
-            hashCode = (long) mapBlock.getMapType().getKeyNativeHashCode().invokeExact(nativeValue);
-        }
-        catch (Throwable throwable) {
-            throw handleThrowable(throwable);
-        }
-
-        int hashTableOffset = offset / 2 * HASH_MULTIPLIER;
-        int hashTableSize = positionCount / 2 * HASH_MULTIPLIER;
-        int position = computePosition(hashCode, hashTableSize);
-        while (true) {
-            int keyPosition = hashTable[hashTableOffset + position];
-            if (keyPosition == -1) {
-                return -1;
-            }
-            Boolean match;
-            try {
-                // assuming maps with indeterminate keys are not supported
-                match = (Boolean) mapBlock.getMapType().getKeyBlockNativeEqual().invokeExact(mapBlock.getRawKeyBlock(), offset / 2 + keyPosition, nativeValue);
-            }
-            catch (Throwable throwable) {
-                throw handleThrowable(throwable);
-            }
-            checkNotIndeterminate(match);
-            if (match) {
-                return keyPosition * 2 + 1;
-            }
-            position++;
-            if (position == hashTableSize) {
-                position = 0;
-            }
-        }
-    }
-
-    public int seekKeyExact(boolean nativeValue)
-    {
-        if (positionCount == 0) {
-            return -1;
-        }
-
-        mapBlock.ensureHashTableLoaded();
-        int[] hashTable = mapBlock.getHashTables().get();
-
-        long hashCode;
-        try {
-            hashCode = (long) mapBlock.getMapType().getKeyNativeHashCode().invokeExact(nativeValue);
-        }
-        catch (Throwable throwable) {
-            throw handleThrowable(throwable);
-        }
-
-        int hashTableOffset = offset / 2 * HASH_MULTIPLIER;
-        int hashTableSize = positionCount / 2 * HASH_MULTIPLIER;
-        int position = computePosition(hashCode, hashTableSize);
-        while (true) {
-            int keyPosition = hashTable[hashTableOffset + position];
-            if (keyPosition == -1) {
-                return -1;
-            }
-            Boolean match;
-            try {
-                // assuming maps with indeterminate keys are not supported
-                match = (Boolean) mapBlock.getMapType().getKeyBlockNativeEqual().invokeExact(mapBlock.getRawKeyBlock(), offset / 2 + keyPosition, nativeValue);
-            }
-            catch (Throwable throwable) {
-                throw handleThrowable(throwable);
-            }
-            checkNotIndeterminate(match);
-            if (match) {
-                return keyPosition * 2 + 1;
-            }
-            position++;
-            if (position == hashTableSize) {
-                position = 0;
-            }
-        }
-    }
-
-    public int seekKeyExact(double nativeValue)
-    {
-        if (positionCount == 0) {
-            return -1;
-        }
-
-        mapBlock.ensureHashTableLoaded();
-        int[] hashTable = mapBlock.getHashTables().get();
-
-        long hashCode;
-        try {
-            hashCode = (long) mapBlock.getMapType().getKeyNativeHashCode().invokeExact(nativeValue);
-        }
-        catch (Throwable throwable) {
-            throw handleThrowable(throwable);
-        }
-
-        int hashTableOffset = offset / 2 * HASH_MULTIPLIER;
-        int hashTableSize = positionCount / 2 * HASH_MULTIPLIER;
-        int position = computePosition(hashCode, hashTableSize);
-        while (true) {
-            int keyPosition = hashTable[hashTableOffset + position];
-            if (keyPosition == -1) {
-                return -1;
-            }
-            Boolean match;
-            try {
-                // assuming maps with indeterminate keys are not supported
-                match = (Boolean) mapBlock.getMapType().getKeyBlockNativeEqual().invokeExact(mapBlock.getRawKeyBlock(), offset / 2 + keyPosition, nativeValue);
-            }
-            catch (Throwable throwable) {
-                throw handleThrowable(throwable);
-            }
-            checkNotIndeterminate(match);
-            if (match) {
-                return keyPosition * 2 + 1;
-            }
-            position++;
-            if (position == hashTableSize) {
-                position = 0;
-            }
-        }
-    }
-
-    public int seekKeyExact(Object nativeValue)
-    {
-        if (positionCount == 0) {
-            return -1;
-        }
-
-        mapBlock.ensureHashTableLoaded();
-        int[] hashTable = mapBlock.getHashTables().get();
-
-        long hashCode;
-        try {
-            hashCode = (long) mapBlock.getMapType().getKeyNativeHashCode().invokeExact(nativeValue);
-        }
-        catch (Throwable throwable) {
-            throw handleThrowable(throwable);
-        }
-
-        int hashTableOffset = offset / 2 * HASH_MULTIPLIER;
-        int hashTableSize = positionCount / 2 * HASH_MULTIPLIER;
-        int position = computePosition(hashCode, hashTableSize);
-        while (true) {
-            int keyPosition = hashTable[hashTableOffset + position];
-            if (keyPosition == -1) {
-                return -1;
-            }
-            Boolean match;
-            try {
-                // assuming maps with indeterminate keys are not supported
-                match = (Boolean) mapBlock.getMapType().getKeyBlockNativeEqual().invokeExact(mapBlock.getRawKeyBlock(), offset / 2 + keyPosition, nativeValue);
-            }
-            catch (Throwable throwable) {
-                throw handleThrowable(throwable);
-            }
-            checkNotIndeterminate(match);
-            if (match) {
-                return keyPosition * 2 + 1;
-            }
-            position++;
-            if (position == hashTableSize) {
-                position = 0;
-            }
-        }
-    }
-
-    private static RuntimeException handleThrowable(Throwable throwable)
-    {
-        if (throwable instanceof Error) {
-            throw (Error) throwable;
-        }
-        if (throwable instanceof TrinoException) {
-            throw (TrinoException) throwable;
-        }
-        throw new TrinoException(GENERIC_INTERNAL_ERROR, throwable);
-    }
-
-    private static void checkNotIndeterminate(Boolean equalResult)
-    {
-        if (equalResult == null) {
-            throw new TrinoException(NOT_SUPPORTED, "map key cannot be null or contain nulls");
-        }
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/SingleMapBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/SingleMapBlockEncoding.java
deleted file mode 100644
index 86038744e1b6..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/SingleMapBlockEncoding.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.airlift.slice.SliceInput;
-import io.airlift.slice.SliceOutput;
-import io.trino.spi.type.MapType;
-
-import java.util.Optional;
-
-import static io.airlift.slice.Slices.wrappedIntArray;
-import static io.trino.spi.block.MapHashTables.HASH_MULTIPLIER;
-import static java.lang.String.format;
-
-public class SingleMapBlockEncoding
-        implements BlockEncoding
-{
-    public static final String NAME = "MAP_ELEMENT";
-
-    @Override
-    public String getName()
-    {
-        return NAME;
-    }
-
-    @Override
-    public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
-    {
-        SingleMapBlock singleMapBlock = (SingleMapBlock) block;
-        blockEncodingSerde.writeType(sliceOutput, singleMapBlock.getMapType());
-
-        int offset = singleMapBlock.getOffset();
-        int positionCount = singleMapBlock.getPositionCount();
-        blockEncodingSerde.writeBlock(sliceOutput, singleMapBlock.getRawKeyBlock().getRegion(offset / 2, positionCount / 2));
-        blockEncodingSerde.writeBlock(sliceOutput, singleMapBlock.getRawValueBlock().getRegion(offset / 2, positionCount / 2));
-
-        Optional<int[]> hashTable = singleMapBlock.tryGetHashTable();
-        if (hashTable.isPresent()) {
-            int hashTableLength = positionCount / 2 * HASH_MULTIPLIER;
-            sliceOutput.appendInt(hashTableLength);  // hashtable length
-            sliceOutput.writeBytes(wrappedIntArray(hashTable.get(), offset / 2 * HASH_MULTIPLIER, hashTableLength));
-        }
-        else {
-            // if the hashTable is null, we write the length -1
-            sliceOutput.appendInt(-1);
-        }
-    }
-
-    @Override
-    public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
-    {
-        MapType mapType = (MapType) blockEncodingSerde.readType(sliceInput);
-
-        Block keyBlock = blockEncodingSerde.readBlock(sliceInput);
-        Block valueBlock = blockEncodingSerde.readBlock(sliceInput);
-
-        int hashTableLength = sliceInput.readInt();
-        int[] hashTable = null;
-        if (hashTableLength >= 0) {
-            hashTable = new int[hashTableLength];
-            sliceInput.readBytes(wrappedIntArray(hashTable));
-        }
-
-        if (keyBlock.getPositionCount() != valueBlock.getPositionCount()) {
-            throw new IllegalArgumentException(format("Deserialized SingleMapBlock violates invariants: key %d, value %d",
-                    keyBlock.getPositionCount(),
-                    valueBlock.getPositionCount()));
-        }
-
-        if (hashTable != null && keyBlock.getPositionCount() * HASH_MULTIPLIER != hashTable.length) {
-            throw new IllegalArgumentException(format("Deserialized SingleMapBlock violates invariants: expected hashtable size %d, actual hashtable size %d",
-                    keyBlock.getPositionCount() * HASH_MULTIPLIER,
-                    hashTable.length));
-        }
-
-        MapBlock mapBlock = MapBlock.createMapBlockInternal(
-                mapType,
-                0,
-                1,
-                Optional.empty(),
-                new int[] {0, keyBlock.getPositionCount()},
-                keyBlock,
-                valueBlock,
-                new MapHashTables(mapType, Optional.ofNullable(hashTable)));
-
-        return new SingleMapBlock(0, keyBlock.getPositionCount() * 2, mapBlock);
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/SingleMapBlockWriter.java b/core/trino-spi/src/main/java/io/trino/spi/block/SingleMapBlockWriter.java
deleted file mode 100644
index f90cea18374d..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/SingleMapBlockWriter.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.airlift.slice.Slice;
-
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
-
-import static io.airlift.slice.SizeOf.instanceSize;
-import static java.lang.String.format;
-
-public class SingleMapBlockWriter
-        extends AbstractSingleMapBlock
-        implements BlockBuilder
-{
-    private static final int INSTANCE_SIZE = instanceSize(SingleMapBlockWriter.class);
-
-    private final int offset;
-    private final BlockBuilder keyBlockBuilder;
-    private final BlockBuilder valueBlockBuilder;
-    private final Runnable setStrict;
-    private final long initialBlockBuilderSize;
-    private int positionsWritten;
-
-    private boolean writeToValueNext;
-
-    SingleMapBlockWriter(int start, BlockBuilder keyBlockBuilder, BlockBuilder valueBlockBuilder, Runnable setStrict)
-    {
-        this.offset = start;
-        this.keyBlockBuilder = keyBlockBuilder;
-        this.valueBlockBuilder = valueBlockBuilder;
-        this.setStrict = setStrict;
-        this.initialBlockBuilderSize = keyBlockBuilder.getSizeInBytes() + valueBlockBuilder.getSizeInBytes();
-    }
-
-    public SingleMapBlockWriter strict()
-    {
-        setStrict.run();
-        return this;
-    }
-
-    @Override
-    int getOffset()
-    {
-        return offset;
-    }
-
-    @Override
-    Block getRawKeyBlock()
-    {
-        return keyBlockBuilder;
-    }
-
-    @Override
-    Block getRawValueBlock()
-    {
-        return valueBlockBuilder;
-    }
-
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.empty();
-    }
-
-    @Override
-    public long getSizeInBytes()
-    {
-        return keyBlockBuilder.getSizeInBytes() + valueBlockBuilder.getSizeInBytes() - initialBlockBuilderSize;
-    }
-
-    @Override
-    public long getRetainedSizeInBytes()
-    {
-        return INSTANCE_SIZE + keyBlockBuilder.getRetainedSizeInBytes() + valueBlockBuilder.getRetainedSizeInBytes();
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        consumer.accept(keyBlockBuilder, keyBlockBuilder.getRetainedSizeInBytes());
-        consumer.accept(valueBlockBuilder, valueBlockBuilder.getRetainedSizeInBytes());
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
-    @Override
-    public BlockBuilder writeByte(int value)
-    {
-        if (writeToValueNext) {
-            valueBlockBuilder.writeByte(value);
-        }
-        else {
-            keyBlockBuilder.writeByte(value);
-        }
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeShort(int value)
-    {
-        if (writeToValueNext) {
-            valueBlockBuilder.writeShort(value);
-        }
-        else {
-            keyBlockBuilder.writeShort(value);
-        }
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeInt(int value)
-    {
-        if (writeToValueNext) {
-            valueBlockBuilder.writeInt(value);
-        }
-        else {
-            keyBlockBuilder.writeInt(value);
-        }
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeLong(long value)
-    {
-        if (writeToValueNext) {
-            valueBlockBuilder.writeLong(value);
-        }
-        else {
-            keyBlockBuilder.writeLong(value);
-        }
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeBytes(Slice source, int sourceIndex, int length)
-    {
-        if (writeToValueNext) {
-            valueBlockBuilder.writeBytes(source, sourceIndex, length);
-        }
-        else {
-            keyBlockBuilder.writeBytes(source, sourceIndex, length);
-        }
-        return this;
-    }
-
-    @Override
-    public BlockBuilder beginBlockEntry()
-    {
-        BlockBuilder result;
-        if (writeToValueNext) {
-            result = valueBlockBuilder.beginBlockEntry();
-        }
-        else {
-            result = keyBlockBuilder.beginBlockEntry();
-        }
-        return result;
-    }
-
-    @Override
-    public BlockBuilder appendNull()
-    {
-        if (writeToValueNext) {
-            valueBlockBuilder.appendNull();
-        }
-        else {
-            keyBlockBuilder.appendNull();
-        }
-        entryAdded();
-        return this;
-    }
-
-    @Override
-    public BlockBuilder closeEntry()
-    {
-        if (writeToValueNext) {
-            valueBlockBuilder.closeEntry();
-        }
-        else {
-            keyBlockBuilder.closeEntry();
-        }
-        entryAdded();
-        return this;
-    }
-
-    private void entryAdded()
-    {
-        writeToValueNext = !writeToValueNext;
-        positionsWritten++;
-    }
-
-    @Override
-    public int getPositionCount()
-    {
-        return positionsWritten;
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Block build()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public BlockBuilder newBlockBuilderLike(int expectedEntries, BlockBuilderStatus blockBuilderStatus)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String toString()
-    {
-        return format("SingleMapBlockWriter{positionCount=%d}", getPositionCount());
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/SingleRowBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/SingleRowBlock.java
deleted file mode 100644
index 4cb0c2e25ef0..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/SingleRowBlock.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
-
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.spi.block.BlockUtil.ensureBlocksAreLoaded;
-import static java.lang.String.format;
-
-public class SingleRowBlock
-        extends AbstractSingleRowBlock
-{
-    private static final int INSTANCE_SIZE = instanceSize(SingleRowBlock.class);
-
-    private final Block[] fieldBlocks;
-    private final int rowIndex;
-
-    SingleRowBlock(int rowIndex, Block[] fieldBlocks)
-    {
-        this.rowIndex = rowIndex;
-        this.fieldBlocks = fieldBlocks;
-    }
-
-    int getNumFields()
-    {
-        return fieldBlocks.length;
-    }
-
-    @Override
-    Block[] getRawFieldBlocks()
-    {
-        return fieldBlocks;
-    }
-
-    @Override
-    protected Block getRawFieldBlock(int fieldIndex)
-    {
-        return fieldBlocks[fieldIndex];
-    }
-
-    @Override
-    public int getPositionCount()
-    {
-        return fieldBlocks.length;
-    }
-
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.empty();
-    }
-
-    @Override
-    public long getSizeInBytes()
-    {
-        long sizeInBytes = 0;
-        for (int i = 0; i < fieldBlocks.length; i++) {
-            sizeInBytes += getRawFieldBlock(i).getRegionSizeInBytes(getRowIndex(), 1);
-        }
-        return sizeInBytes;
-    }
-
-    @Override
-    public long getRetainedSizeInBytes()
-    {
-        long retainedSizeInBytes = INSTANCE_SIZE;
-        for (int i = 0; i < fieldBlocks.length; i++) {
-            retainedSizeInBytes += getRawFieldBlock(i).getRetainedSizeInBytes();
-        }
-        return retainedSizeInBytes;
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        for (Block fieldBlock : fieldBlocks) {
-            consumer.accept(fieldBlock, fieldBlock.getRetainedSizeInBytes());
-        }
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        return SingleRowBlockEncoding.NAME;
-    }
-
-    @Override
-    public int getRowIndex()
-    {
-        return rowIndex;
-    }
-
-    @Override
-    public Block copyWithAppendedNull()
-    {
-        throw new UnsupportedOperationException("SingleRowBlock does not support newBlockWithAppendedNull()");
-    }
-
-    @Override
-    public String toString()
-    {
-        return format("SingleRowBlock{numFields=%d}", fieldBlocks.length);
-    }
-
-    @Override
-    public boolean isLoaded()
-    {
-        for (Block fieldBlock : fieldBlocks) {
-            if (!fieldBlock.isLoaded()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Block getLoadedBlock()
-    {
-        Block[] loadedFieldBlocks = ensureBlocksAreLoaded(fieldBlocks);
-        if (loadedFieldBlocks == fieldBlocks) {
-            // All blocks are already loaded
-            return this;
-        }
-        return new SingleRowBlock(getRowIndex(), loadedFieldBlocks);
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/SingleRowBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/SingleRowBlockEncoding.java
deleted file mode 100644
index 506f80109fa3..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/SingleRowBlockEncoding.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.airlift.slice.SliceInput;
-import io.airlift.slice.SliceOutput;
-
-public class SingleRowBlockEncoding
-        implements BlockEncoding
-{
-    public static final String NAME = "ROW_ELEMENT";
-
-    @Override
-    public String getName()
-    {
-        return NAME;
-    }
-
-    @Override
-    public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
-    {
-        SingleRowBlock singleRowBlock = (SingleRowBlock) block;
-        int numFields = singleRowBlock.getNumFields();
-        int rowIndex = singleRowBlock.getRowIndex();
-        sliceOutput.appendInt(numFields);
-        for (int i = 0; i < numFields; i++) {
-            blockEncodingSerde.writeBlock(sliceOutput, singleRowBlock.getRawFieldBlock(i).getRegion(rowIndex, 1));
-        }
-    }
-
-    @Override
-    public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceInput)
-    {
-        int numFields = sliceInput.readInt();
-        Block[] fieldBlocks = new Block[numFields];
-        for (int i = 0; i < fieldBlocks.length; i++) {
-            fieldBlocks[i] = blockEncodingSerde.readBlock(sliceInput);
-        }
-        return new SingleRowBlock(0, fieldBlocks);
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/SingleRowBlockWriter.java b/core/trino-spi/src/main/java/io/trino/spi/block/SingleRowBlockWriter.java
deleted file mode 100644
index 4cd96950712a..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/block/SingleRowBlockWriter.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.airlift.slice.Slice;
-
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
-
-import static io.airlift.slice.SizeOf.instanceSize;
-import static java.lang.String.format;
-
-public class SingleRowBlockWriter
-        extends AbstractSingleRowBlock
-        implements BlockBuilder
-{
-    public static final int INSTANCE_SIZE = instanceSize(SingleRowBlockWriter.class);
-
-    private final BlockBuilder[] fieldBlockBuilders;
-
-    private int currentFieldIndexToWrite;
-    private int rowIndex = -1;
-    private boolean fieldBlockBuilderReturned;
-
-    SingleRowBlockWriter(BlockBuilder[] fieldBlockBuilders)
-    {
-        this.fieldBlockBuilders = fieldBlockBuilders;
-    }
-
-    /**
-     * Obtains the field {@code BlockBuilder}.
-     * <p>
-     * This method is used to perform random write to {@code SingleRowBlockWriter}.
-     * Each field {@code BlockBuilder} must be written EXACTLY once.
-     * <p>
-     * Field {@code BlockBuilder} can only be obtained before any sequential write has done.
-     * Once obtained, sequential write is no longer allowed.
-     */
-    public BlockBuilder getFieldBlockBuilder(int fieldIndex)
-    {
-        if (currentFieldIndexToWrite != 0) {
-            throw new IllegalStateException("field block builder can only be obtained before any sequential write has done");
-        }
-        fieldBlockBuilderReturned = true;
-        return fieldBlockBuilders[fieldIndex];
-    }
-
-    @Override
-    Block[] getRawFieldBlocks()
-    {
-        return fieldBlockBuilders;
-    }
-
-    @Override
-    protected Block getRawFieldBlock(int fieldIndex)
-    {
-        return fieldBlockBuilders[fieldIndex];
-    }
-
-    @Override
-    protected int getRowIndex()
-    {
-        return rowIndex;
-    }
-
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.empty();
-    }
-
-    @Override
-    public long getSizeInBytes()
-    {
-        long currentBlockBuilderSize = 0;
-         /*
-          * We need to use subtraction in order to compute size because getRegionSizeInBytes(0, 1)
-          * returns non-zero result even if field block builder has no position appended
-          */
-        for (BlockBuilder fieldBlockBuilder : fieldBlockBuilders) {
-            currentBlockBuilderSize += fieldBlockBuilder.getSizeInBytes() - fieldBlockBuilder.getRegionSizeInBytes(0, rowIndex);
-        }
-        return currentBlockBuilderSize;
-    }
-
-    @Override
-    public long getRetainedSizeInBytes()
-    {
-        long size = INSTANCE_SIZE;
-        for (BlockBuilder fieldBlockBuilder : fieldBlockBuilders) {
-            size += fieldBlockBuilder.getRetainedSizeInBytes();
-        }
-        return size;
-    }
-
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
-    {
-        for (BlockBuilder fieldBlockBuilder : fieldBlockBuilders) {
-            consumer.accept(fieldBlockBuilder, fieldBlockBuilder.getRetainedSizeInBytes());
-        }
-        consumer.accept(this, INSTANCE_SIZE);
-    }
-
-    @Override
-    public BlockBuilder writeByte(int value)
-    {
-        checkFieldIndexToWrite();
-        fieldBlockBuilders[currentFieldIndexToWrite].writeByte(value);
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeShort(int value)
-    {
-        checkFieldIndexToWrite();
-        fieldBlockBuilders[currentFieldIndexToWrite].writeShort(value);
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeInt(int value)
-    {
-        checkFieldIndexToWrite();
-        fieldBlockBuilders[currentFieldIndexToWrite].writeInt(value);
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeLong(long value)
-    {
-        checkFieldIndexToWrite();
-        fieldBlockBuilders[currentFieldIndexToWrite].writeLong(value);
-        return this;
-    }
-
-    @Override
-    public BlockBuilder writeBytes(Slice source, int sourceIndex, int length)
-    {
-        checkFieldIndexToWrite();
-        fieldBlockBuilders[currentFieldIndexToWrite].writeBytes(source, sourceIndex, length);
-        return this;
-    }
-
-    @Override
-    public BlockBuilder beginBlockEntry()
-    {
-        checkFieldIndexToWrite();
-        return fieldBlockBuilders[currentFieldIndexToWrite].beginBlockEntry();
-    }
-
-    @Override
-    public BlockBuilder appendNull()
-    {
-        checkFieldIndexToWrite();
-        fieldBlockBuilders[currentFieldIndexToWrite].appendNull();
-        entryAdded();
-        return this;
-    }
-
-    @Override
-    public BlockBuilder closeEntry()
-    {
-        checkFieldIndexToWrite();
-        fieldBlockBuilders[currentFieldIndexToWrite].closeEntry();
-        entryAdded();
-        return this;
-    }
-
-    private void entryAdded()
-    {
-        currentFieldIndexToWrite++;
-    }
-
-    @Override
-    public int getPositionCount()
-    {
-        if (fieldBlockBuilderReturned) {
-            throw new IllegalStateException("field block builder has been returned");
-        }
-        return currentFieldIndexToWrite;
-    }
-
-    @Override
-    public String getEncodingName()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Block build()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public BlockBuilder newBlockBuilderLike(int expectedEntries, BlockBuilderStatus blockBuilderStatus)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String toString()
-    {
-        if (!fieldBlockBuilderReturned) {
-            return format("SingleRowBlockWriter{numFields=%d, fieldBlockBuilderReturned=false, positionCount=%d}", fieldBlockBuilders.length, getPositionCount());
-        }
-        return format("SingleRowBlockWriter{numFields=%d, fieldBlockBuilderReturned=true}", fieldBlockBuilders.length);
-    }
-
-    void setRowIndex(int rowIndex)
-    {
-        if (this.rowIndex != -1) {
-            throw new IllegalStateException("SingleRowBlockWriter should be reset before usage");
-        }
-        this.rowIndex = rowIndex;
-    }
-
-    void reset()
-    {
-        if (this.rowIndex == -1) {
-            throw new IllegalStateException("SingleRowBlockWriter is already reset");
-        }
-        this.rowIndex = -1;
-        this.currentFieldIndexToWrite = 0;
-        this.fieldBlockBuilderReturned = false;
-    }
-
-    private void checkFieldIndexToWrite()
-    {
-        if (fieldBlockBuilderReturned) {
-            throw new IllegalStateException("cannot do sequential write after getFieldBlockBuilder is called");
-        }
-        if (currentFieldIndexToWrite >= fieldBlockBuilders.length) {
-            throw new IllegalStateException("currentFieldIndexToWrite is not valid");
-        }
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/SqlMap.java b/core/trino-spi/src/main/java/io/trino/spi/block/SqlMap.java
new file mode 100644
index 000000000000..81bdd3b67fae
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/SqlMap.java
@@ -0,0 +1,509 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.airlift.slice.SizeOf;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.MapHashTables.HashBuildMode;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.Type;
+
+import java.lang.invoke.MethodHandle;
+import java.util.Optional;
+import java.util.function.ObjLongConsumer;
+
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOfIntArray;
+import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.block.MapHashTables.HASH_MULTIPLIER;
+import static io.trino.spi.block.MapHashTables.computePosition;
+import static io.trino.spi.block.MapHashTables.createSingleTable;
+import static java.lang.String.format;
+import static java.util.Objects.checkFromIndexSize;
+import static java.util.Objects.requireNonNull;
+
+public class SqlMap
+{
+    private static final int INSTANCE_SIZE = instanceSize(SqlMap.class);
+
+    private final MapType mapType;
+    private final Block rawKeyBlock;
+    private final Block rawValueBlock;
+    private final HashTableSupplier hashTablesSupplier;
+    private final int offset;
+    private final int size;
+
+    public SqlMap(MapType mapType, HashBuildMode mode, Block keyBlock, Block valueBlock)
+    {
+        this.mapType = requireNonNull(mapType, "mapType is null");
+        if (keyBlock.getPositionCount() != valueBlock.getPositionCount()) {
+            throw new IllegalArgumentException(format("Key and value blocks have different size: %s %s", keyBlock.getPositionCount(), valueBlock.getPositionCount()));
+        }
+        this.rawKeyBlock = keyBlock;
+        this.rawValueBlock = valueBlock;
+        this.offset = 0;
+        this.size = keyBlock.getPositionCount();
+
+        this.hashTablesSupplier = new HashTableSupplier(createSingleTable(mapType, mode, keyBlock).get());
+    }
+
+    SqlMap(MapType mapType, Block rawKeyBlock, Block rawValueBlock, HashTableSupplier hashTablesSupplier, int offset, int size)
+    {
+        this.mapType = requireNonNull(mapType, "mapType is null");
+        this.rawKeyBlock = requireNonNull(rawKeyBlock, "rawKeyBlock is null");
+        this.rawValueBlock = requireNonNull(rawValueBlock, "rawValueBlock is null");
+        this.hashTablesSupplier = requireNonNull(hashTablesSupplier, "hashTablesSupplier is null");
+
+        checkFromIndexSize(offset, size, rawKeyBlock.getPositionCount());
+        checkFromIndexSize(offset, size, rawValueBlock.getPositionCount());
+        this.offset = offset;
+        this.size = size;
+    }
+
+    public Type getMapType()
+    {
+        return mapType;
+    }
+
+    public int getSize()
+    {
+        return size;
+    }
+
+    public int getRawOffset()
+    {
+        return offset;
+    }
+
+    public Block getRawKeyBlock()
+    {
+        return rawKeyBlock;
+    }
+
+    public Block getRawValueBlock()
+    {
+        return rawValueBlock;
+    }
+
+    public int getUnderlyingKeyPosition(int position)
+    {
+        return rawKeyBlock.getUnderlyingValuePosition(offset + position);
+    }
+
+    public ValueBlock getUnderlyingKeyBlock()
+    {
+        return rawKeyBlock.getUnderlyingValueBlock();
+    }
+
+    public int getUnderlyingValuePosition(int position)
+    {
+        return rawValueBlock.getUnderlyingValuePosition(offset + position);
+    }
+
+    public ValueBlock getUnderlyingValueBlock()
+    {
+        return rawValueBlock.getUnderlyingValueBlock();
+    }
+
+    @Override
+    public String toString()
+    {
+        return format("SqlMap{size=%d}", size);
+    }
+
+    /**
+     * @return position of the value under {@code nativeValue} key. -1 when key is not found.
+     */
+    public int seekKey(Object nativeValue)
+    {
+        if (size == 0) {
+            return -1;
+        }
+
+        if (nativeValue == null) {
+            throw new TrinoException(NOT_SUPPORTED, "map key cannot be null or contain nulls");
+        }
+
+        int[] hashTable = hashTablesSupplier.getHashTables();
+
+        long hashCode;
+        try {
+            hashCode = (long) mapType.getKeyNativeHashCode().invoke(nativeValue);
+        }
+        catch (Throwable throwable) {
+            throw handleThrowable(throwable);
+        }
+
+        int hashTableOffset = offset * HASH_MULTIPLIER;
+        int hashTableSize = size * HASH_MULTIPLIER;
+        int position = computePosition(hashCode, hashTableSize);
+        while (true) {
+            int keyPosition = hashTable[hashTableOffset + position];
+            if (keyPosition == -1) {
+                return -1;
+            }
+
+            int rawKeyPosition = offset + keyPosition;
+            checkKeyNotNull(rawKeyBlock, rawKeyPosition);
+
+            Boolean match;
+            try {
+                // assuming maps with indeterminate keys are not supported.
+                // the left and right values are never null because the above call check for null before the insertion
+                match = (Boolean) mapType.getKeyBlockNativeEqual().invoke(rawKeyBlock, rawKeyPosition, nativeValue);
+            }
+            catch (Throwable throwable) {
+                throw handleThrowable(throwable);
+            }
+            checkNotIndeterminate(match);
+            if (match) {
+                return keyPosition;
+            }
+            position++;
+            if (position == hashTableSize) {
+                position = 0;
+            }
+        }
+    }
+
+    public int seekKey(MethodHandle keyEqualOperator, MethodHandle keyHashOperator, Block targetKeyBlock, int targetKeyPosition)
+    {
+        if (size == 0) {
+            return -1;
+        }
+
+        int[] hashTable = hashTablesSupplier.getHashTables();
+
+        checkKeyNotNull(targetKeyBlock, targetKeyPosition);
+        long hashCode;
+        try {
+            hashCode = (long) keyHashOperator.invoke(targetKeyBlock, targetKeyPosition);
+        }
+        catch (Throwable throwable) {
+            throw handleThrowable(throwable);
+        }
+
+        int hashTableOffset = offset * HASH_MULTIPLIER;
+        int hashTableSize = size * HASH_MULTIPLIER;
+        int position = computePosition(hashCode, hashTableSize);
+        while (true) {
+            int keyPosition = hashTable[hashTableOffset + position];
+            if (keyPosition == -1) {
+                return -1;
+            }
+
+            int rawKeyPosition = offset + keyPosition;
+            checkKeyNotNull(rawKeyBlock, rawKeyPosition);
+
+            Boolean match;
+            try {
+                // assuming maps with indeterminate keys are not supported
+                match = (Boolean) keyEqualOperator.invoke(rawKeyBlock, rawKeyPosition, targetKeyBlock, targetKeyPosition);
+            }
+            catch (Throwable throwable) {
+                throw handleThrowable(throwable);
+            }
+            checkNotIndeterminate(match);
+            if (match) {
+                return keyPosition;
+            }
+            position++;
+            if (position == hashTableSize) {
+                position = 0;
+            }
+        }
+    }
+
+    // The next 5 seekKeyExact functions are the same as seekKey
+    // except MethodHandle.invoke is replaced with invokeExact.
+
+    public int seekKeyExact(long nativeValue)
+    {
+        if (size == 0) {
+            return -1;
+        }
+
+        int[] hashTable = hashTablesSupplier.getHashTables();
+
+        long hashCode;
+        try {
+            hashCode = (long) mapType.getKeyNativeHashCode().invokeExact(nativeValue);
+        }
+        catch (Throwable throwable) {
+            throw handleThrowable(throwable);
+        }
+
+        int hashTableOffset = offset * HASH_MULTIPLIER;
+        int hashTableSize = size * HASH_MULTIPLIER;
+        int position = computePosition(hashCode, hashTableSize);
+        while (true) {
+            int keyPosition = hashTable[hashTableOffset + position];
+            if (keyPosition == -1) {
+                return -1;
+            }
+
+            int rawKeyPosition = offset + keyPosition;
+            checkKeyNotNull(rawKeyBlock, rawKeyPosition);
+
+            Boolean match;
+            try {
+                // assuming maps with indeterminate keys are not supported
+                match = (Boolean) mapType.getKeyBlockNativeEqual().invokeExact(rawKeyBlock, rawKeyPosition, nativeValue);
+            }
+            catch (Throwable throwable) {
+                throw handleThrowable(throwable);
+            }
+            checkNotIndeterminate(match);
+            if (match) {
+                return keyPosition;
+            }
+            position++;
+            if (position == hashTableSize) {
+                position = 0;
+            }
+        }
+    }
+
+    public int seekKeyExact(boolean nativeValue)
+    {
+        if (size == 0) {
+            return -1;
+        }
+
+        int[] hashTable = hashTablesSupplier.getHashTables();
+
+        long hashCode;
+        try {
+            hashCode = (long) mapType.getKeyNativeHashCode().invokeExact(nativeValue);
+        }
+        catch (Throwable throwable) {
+            throw handleThrowable(throwable);
+        }
+
+        int hashTableOffset = offset * HASH_MULTIPLIER;
+        int hashTableSize = size * HASH_MULTIPLIER;
+        int position = computePosition(hashCode, hashTableSize);
+        while (true) {
+            int keyPosition = hashTable[hashTableOffset + position];
+            if (keyPosition == -1) {
+                return -1;
+            }
+
+            int rawKeyPosition = offset + keyPosition;
+            checkKeyNotNull(rawKeyBlock, rawKeyPosition);
+
+            Boolean match;
+            try {
+                // assuming maps with indeterminate keys are not supported
+                match = (Boolean) mapType.getKeyBlockNativeEqual().invokeExact(rawKeyBlock, rawKeyPosition, nativeValue);
+            }
+            catch (Throwable throwable) {
+                throw handleThrowable(throwable);
+            }
+            checkNotIndeterminate(match);
+            if (match) {
+                return keyPosition;
+            }
+            position++;
+            if (position == hashTableSize) {
+                position = 0;
+            }
+        }
+    }
+
+    public int seekKeyExact(double nativeValue)
+    {
+        if (size == 0) {
+            return -1;
+        }
+
+        int[] hashTable = hashTablesSupplier.getHashTables();
+
+        long hashCode;
+        try {
+            hashCode = (long) mapType.getKeyNativeHashCode().invokeExact(nativeValue);
+        }
+        catch (Throwable throwable) {
+            throw handleThrowable(throwable);
+        }
+
+        int hashTableOffset = offset * HASH_MULTIPLIER;
+        int hashTableSize = size * HASH_MULTIPLIER;
+        int position = computePosition(hashCode, hashTableSize);
+        while (true) {
+            int keyPosition = hashTable[hashTableOffset + position];
+            if (keyPosition == -1) {
+                return -1;
+            }
+
+            int rawKeyPosition = offset + keyPosition;
+            checkKeyNotNull(rawKeyBlock, rawKeyPosition);
+
+            Boolean match;
+            try {
+                // assuming maps with indeterminate keys are not supported
+                match = (Boolean) mapType.getKeyBlockNativeEqual().invokeExact(rawKeyBlock, rawKeyPosition, nativeValue);
+            }
+            catch (Throwable throwable) {
+                throw handleThrowable(throwable);
+            }
+            checkNotIndeterminate(match);
+            if (match) {
+                return keyPosition;
+            }
+            position++;
+            if (position == hashTableSize) {
+                position = 0;
+            }
+        }
+    }
+
+    public int seekKeyExact(Object nativeValue)
+    {
+        if (size == 0) {
+            return -1;
+        }
+
+        if (nativeValue == null) {
+            throw new TrinoException(NOT_SUPPORTED, "map key cannot be null or contain nulls");
+        }
+
+        int[] hashTable = hashTablesSupplier.getHashTables();
+
+        long hashCode;
+        try {
+            hashCode = (long) mapType.getKeyNativeHashCode().invokeExact(nativeValue);
+        }
+        catch (Throwable throwable) {
+            throw handleThrowable(throwable);
+        }
+
+        int hashTableOffset = offset * HASH_MULTIPLIER;
+        int hashTableSize = size * HASH_MULTIPLIER;
+        int position = computePosition(hashCode, hashTableSize);
+        while (true) {
+            int keyPosition = hashTable[hashTableOffset + position];
+            if (keyPosition == -1) {
+                return -1;
+            }
+
+            int rawKeyPosition = offset + keyPosition;
+            checkKeyNotNull(rawKeyBlock, rawKeyPosition);
+
+            Boolean match;
+            try {
+                // assuming maps with indeterminate keys are not supported
+                match = (Boolean) mapType.getKeyBlockNativeEqual().invokeExact(rawKeyBlock, rawKeyPosition, nativeValue);
+            }
+            catch (Throwable throwable) {
+                throw handleThrowable(throwable);
+            }
+            checkNotIndeterminate(match);
+            if (match) {
+                return keyPosition;
+            }
+            position++;
+            if (position == hashTableSize) {
+                position = 0;
+            }
+        }
+    }
+
+    private static RuntimeException handleThrowable(Throwable throwable)
+    {
+        if (throwable instanceof Error) {
+            throw (Error) throwable;
+        }
+        if (throwable instanceof TrinoException) {
+            throw (TrinoException) throwable;
+        }
+        throw new TrinoException(GENERIC_INTERNAL_ERROR, throwable);
+    }
+
+    private static void checkKeyNotNull(Block keyBlock, int positionCount)
+    {
+        if (keyBlock.isNull(positionCount)) {
+            throw new TrinoException(NOT_SUPPORTED, "map key cannot be null or contain nulls");
+        }
+    }
+
+    private static void checkNotIndeterminate(Boolean equalResult)
+    {
+        if (equalResult == null) {
+            throw new TrinoException(NOT_SUPPORTED, "map key cannot be null or contain nulls");
+        }
+    }
+
+    public long getSizeInBytes()
+    {
+        return rawKeyBlock.getRegionSizeInBytes(offset, size) +
+                rawValueBlock.getRegionSizeInBytes(offset, size) +
+                sizeOfIntArray(size * HASH_MULTIPLIER);
+    }
+
+    public long getRetainedSizeInBytes()
+    {
+        long size = INSTANCE_SIZE +
+                rawKeyBlock.getRetainedSizeInBytes() +
+                rawValueBlock.getRetainedSizeInBytes() +
+                hashTablesSupplier.tryGetHashTable().map(SizeOf::sizeOf).orElse(0L);
+        return size;
+    }
+
+    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
+    {
+        consumer.accept(this, INSTANCE_SIZE);
+        consumer.accept(rawKeyBlock, rawKeyBlock.getRetainedSizeInBytes());
+        consumer.accept(rawValueBlock, rawValueBlock.getRetainedSizeInBytes());
+        hashTablesSupplier.tryGetHashTable().ifPresent(hashTables -> consumer.accept(hashTables, SizeOf.sizeOf(hashTables)));
+    }
+
+    static class HashTableSupplier
+    {
+        private MapBlock mapBlock;
+        private int[] hashTables;
+
+        public HashTableSupplier(MapBlock mapBlock)
+        {
+            hashTables = mapBlock.getHashTables().tryGet().orElse(null);
+            if (hashTables == null) {
+                this.mapBlock = mapBlock;
+            }
+        }
+
+        public HashTableSupplier(int[] hashTables)
+        {
+            this.hashTables = requireNonNull(hashTables, "hashTables is null");
+        }
+
+        public Optional<int[]> tryGetHashTable()
+        {
+            if (hashTables == null) {
+                hashTables = mapBlock.getHashTables().tryGet().orElse(null);
+            }
+            return Optional.ofNullable(hashTables);
+        }
+
+        public int[] getHashTables()
+        {
+            if (hashTables == null) {
+                mapBlock.ensureHashTableLoaded();
+                hashTables = mapBlock.getHashTables().get();
+            }
+            return hashTables;
+        }
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/SqlRow.java b/core/trino-spi/src/main/java/io/trino/spi/block/SqlRow.java
new file mode 100644
index 000000000000..7a569a99d6c2
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/SqlRow.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import java.util.List;
+import java.util.function.ObjLongConsumer;
+
+import static io.airlift.slice.SizeOf.instanceSize;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+public class SqlRow
+{
+    private static final int INSTANCE_SIZE = instanceSize(SqlRow.class);
+
+    private final Block[] fieldBlocks;
+    private final List<Block> fieldBlocksList;
+    private final int rawIndex;
+
+    public SqlRow(int rawIndex, Block[] fieldBlocks)
+    {
+        this.rawIndex = rawIndex;
+        this.fieldBlocks = requireNonNull(fieldBlocks, "fieldBlocks is null");
+        fieldBlocksList = List.of(fieldBlocks);
+    }
+
+    public int getFieldCount()
+    {
+        return fieldBlocks.length;
+    }
+
+    public int getRawIndex()
+    {
+        return rawIndex;
+    }
+
+    public Block getRawFieldBlock(int fieldIndex)
+    {
+        return fieldBlocks[fieldIndex];
+    }
+
+    public List<Block> getRawFieldBlocks()
+    {
+        return fieldBlocksList;
+    }
+
+    public long getSizeInBytes()
+    {
+        long sizeInBytes = 0;
+        for (Block fieldBlock : fieldBlocks) {
+            sizeInBytes += fieldBlock.getRegionSizeInBytes(rawIndex, 1);
+        }
+        return sizeInBytes;
+    }
+
+    public long getRetainedSizeInBytes()
+    {
+        long retainedSizeInBytes = INSTANCE_SIZE;
+        for (Block fieldBlock : fieldBlocks) {
+            retainedSizeInBytes += fieldBlock.getRetainedSizeInBytes();
+        }
+        return retainedSizeInBytes;
+    }
+
+    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
+    {
+        for (Block fieldBlock : fieldBlocks) {
+            consumer.accept(fieldBlock, fieldBlock.getRetainedSizeInBytes());
+        }
+        consumer.accept(this, INSTANCE_SIZE);
+    }
+
+    public int getUnderlyingFieldPosition(int fieldIndex)
+    {
+        return fieldBlocks[fieldIndex].getUnderlyingValuePosition(rawIndex);
+    }
+
+    public ValueBlock getUnderlyingFieldBlock(int fieldIndex)
+    {
+        return fieldBlocks[fieldIndex].getUnderlyingValueBlock();
+    }
+
+    @Override
+    public String toString()
+    {
+        return format("SqlRow{numFields=%d}", fieldBlocks.length);
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ValueBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/ValueBlock.java
new file mode 100644
index 000000000000..500769a29a13
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/ValueBlock.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+public non-sealed interface ValueBlock
+        extends Block
+{
+    @Override
+    ValueBlock copyPositions(int[] positions, int offset, int length);
+
+    @Override
+    ValueBlock getRegion(int positionOffset, int length);
+
+    @Override
+    ValueBlock copyRegion(int position, int length);
+
+    @Override
+    ValueBlock copyWithAppendedNull();
+
+    @Override
+    default ValueBlock getUnderlyingValueBlock()
+    {
+        return this;
+    }
+
+    @Override
+    default int getUnderlyingValuePosition(int position)
+    {
+        return position;
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/VariableWidthBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/VariableWidthBlock.java
index 2b94422c1eb6..931d4cae70eb 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/VariableWidthBlock.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/VariableWidthBlock.java
@@ -16,8 +16,7 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
 import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -35,8 +34,8 @@
 import static io.trino.spi.block.BlockUtil.copyIsNullAndAppendNull;
 import static io.trino.spi.block.BlockUtil.copyOffsetsAndAppendNull;
 
-public class VariableWidthBlock
-        extends AbstractVariableWidthBlock
+public final class VariableWidthBlock
+        implements ValueBlock
 {
     private static final int INSTANCE_SIZE = instanceSize(VariableWidthBlock.class);
 
@@ -102,8 +101,7 @@ public int getRawSliceOffset(int position)
         return getPositionOffset(position);
     }
 
-    @Override
-    protected final int getPositionOffset(int position)
+    int getPositionOffset(int position)
     {
         return offsets[position + arrayOffset];
     }
@@ -115,18 +113,6 @@ public int getSliceLength(int position)
         return getPositionOffset(position + 1) - getPositionOffset(position);
     }
 
-    @Override
-    public boolean mayHaveNull()
-    {
-        return valueIsNull != null;
-    }
-
-    @Override
-    protected boolean isEntryNull(int position)
-    {
-        return valueIsNull != null && valueIsNull[position + arrayOffset];
-    }
-
     @Override
     public int getPositionCount()
     {
@@ -175,6 +161,12 @@ public long getRetainedSizeInBytes()
         return retainedSizeInBytes;
     }
 
+    @Override
+    public long getEstimatedDataSizeForStats(int position)
+    {
+        return isNull(position) ? 0 : getSliceLength(position);
+    }
+
     @Override
     public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
     {
@@ -187,7 +179,78 @@ public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
     }
 
     @Override
-    public Block copyPositions(int[] positions, int offset, int length)
+    public byte getByte(int position, int offset)
+    {
+        checkReadablePosition(this, position);
+        return slice.getByte(getPositionOffset(position) + offset);
+    }
+
+    @Override
+    public short getShort(int position, int offset)
+    {
+        checkReadablePosition(this, position);
+        return slice.getShort(getPositionOffset(position) + offset);
+    }
+
+    @Override
+    public int getInt(int position, int offset)
+    {
+        checkReadablePosition(this, position);
+        return slice.getInt(getPositionOffset(position) + offset);
+    }
+
+    @Override
+    public long getLong(int position, int offset)
+    {
+        checkReadablePosition(this, position);
+        return slice.getLong(getPositionOffset(position) + offset);
+    }
+
+    @Override
+    public Slice getSlice(int position, int offset, int length)
+    {
+        checkReadablePosition(this, position);
+        return slice.slice(getPositionOffset(position) + offset, length);
+    }
+
+    public Slice getSlice(int position)
+    {
+        checkReadablePosition(this, position);
+        int offset = offsets[position + arrayOffset];
+        int length = offsets[position + 1 + arrayOffset] - offset;
+        return slice.slice(offset, length);
+    }
+
+    @Override
+    public boolean mayHaveNull()
+    {
+        return valueIsNull != null;
+    }
+
+    @Override
+    public boolean isNull(int position)
+    {
+        checkReadablePosition(this, position);
+        return valueIsNull != null && valueIsNull[position + arrayOffset];
+    }
+
+    @Override
+    public VariableWidthBlock getSingleValueBlock(int position)
+    {
+        if (isNull(position)) {
+            return new VariableWidthBlock(0, 1, EMPTY_SLICE, new int[] {0, 0}, new boolean[] {true});
+        }
+
+        int offset = getPositionOffset(position);
+        int entrySize = getSliceLength(position);
+
+        Slice copy = slice.copy(offset, entrySize);
+
+        return new VariableWidthBlock(0, 1, copy, new int[] {0, copy.length()}, null);
+    }
+
+    @Override
+    public VariableWidthBlock copyPositions(int[] positions, int offset, int length)
     {
         checkArrayRange(positions, offset, length);
         if (length == 0) {
@@ -231,13 +294,7 @@ public Block copyPositions(int[] positions, int offset, int length)
     }
 
     @Override
-    protected Slice getRawSlice(int position)
-    {
-        return slice;
-    }
-
-    @Override
-    public Block getRegion(int positionOffset, int length)
+    public VariableWidthBlock getRegion(int positionOffset, int length)
     {
         checkValidRegion(getPositionCount(), positionOffset, length);
 
@@ -245,7 +302,7 @@ public Block getRegion(int positionOffset, int length)
     }
 
     @Override
-    public Block copyRegion(int positionOffset, int length)
+    public VariableWidthBlock copyRegion(int positionOffset, int length)
     {
         checkValidRegion(getPositionCount(), positionOffset, length);
         positionOffset += arrayOffset;
@@ -261,7 +318,13 @@ public Block copyRegion(int positionOffset, int length)
     }
 
     @Override
-    public Block copyWithAppendedNull()
+    public String getEncodingName()
+    {
+        return VariableWidthBlockEncoding.NAME;
+    }
+
+    @Override
+    public VariableWidthBlock copyWithAppendedNull()
     {
         boolean[] newValueIsNull = copyIsNullAndAppendNull(valueIsNull, arrayOffset, positionCount);
         int[] newOffsets = copyOffsetsAndAppendNull(offsets, arrayOffset, positionCount);
@@ -269,6 +332,12 @@ public Block copyWithAppendedNull()
         return new VariableWidthBlock(arrayOffset, positionCount + 1, slice, newOffsets, newValueIsNull);
     }
 
+    @Override
+    public VariableWidthBlock getUnderlyingValueBlock()
+    {
+        return this;
+    }
+
     @Override
     public String toString()
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/VariableWidthBlockBuilder.java b/core/trino-spi/src/main/java/io/trino/spi/block/VariableWidthBlockBuilder.java
index eff098b1ef43..6ec063828cf1 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/VariableWidthBlockBuilder.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/VariableWidthBlockBuilder.java
@@ -16,34 +16,20 @@
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
-import io.airlift.slice.Slices;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
-import java.util.OptionalInt;
-import java.util.function.ObjLongConsumer;
 
 import static io.airlift.slice.SizeOf.SIZE_OF_BYTE;
 import static io.airlift.slice.SizeOf.SIZE_OF_INT;
-import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
-import static io.airlift.slice.SizeOf.SIZE_OF_SHORT;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.airlift.slice.Slices.EMPTY_SLICE;
 import static io.trino.spi.block.BlockUtil.MAX_ARRAY_SIZE;
 import static io.trino.spi.block.BlockUtil.calculateBlockResetBytes;
-import static io.trino.spi.block.BlockUtil.checkArrayRange;
-import static io.trino.spi.block.BlockUtil.checkValidPosition;
-import static io.trino.spi.block.BlockUtil.checkValidPositions;
-import static io.trino.spi.block.BlockUtil.checkValidRegion;
-import static io.trino.spi.block.BlockUtil.compactArray;
-import static io.trino.spi.block.BlockUtil.compactOffsets;
-import static io.trino.spi.block.BlockUtil.compactSlice;
 import static java.lang.Math.min;
 
 public class VariableWidthBlockBuilder
-        extends AbstractVariableWidthBlock
         implements BlockBuilder
 {
     private static final int INSTANCE_SIZE = instanceSize(VariableWidthBlockBuilder.class);
@@ -53,7 +39,7 @@ public class VariableWidthBlockBuilder
 
     private boolean initialized;
     private final int initialEntryCount;
-    private int initialSliceOutputSize;
+    private final int initialSliceOutputSize;
 
     private SliceOutput sliceOutput = new DynamicSliceOutput(0);
 
@@ -64,7 +50,6 @@ public class VariableWidthBlockBuilder
     private int[] offsets = new int[1];
 
     private int positions;
-    private int currentEntrySize;
 
     private long arraysRetainedSizeInBytes;
 
@@ -78,38 +63,12 @@ public VariableWidthBlockBuilder(@Nullable BlockBuilderStatus blockBuilderStatus
         updateArraysDataSize();
     }
 
-    @Override
-    protected int getPositionOffset(int position)
-    {
-        checkValidPosition(position, positions);
-        return getOffset(position);
-    }
-
-    @Override
-    public int getSliceLength(int position)
-    {
-        checkValidPosition(position, positions);
-        return getOffset((position + 1)) - getOffset(position);
-    }
-
-    @Override
-    protected Slice getRawSlice(int position)
-    {
-        return sliceOutput.getUnderlyingSlice();
-    }
-
     @Override
     public int getPositionCount()
     {
         return positions;
     }
 
-    @Override
-    public OptionalInt fixedSizeInBytesPerPosition()
-    {
-        return OptionalInt.empty(); // size varies per element and is not fixed
-    }
-
     @Override
     public long getSizeInBytes()
     {
@@ -117,28 +76,6 @@ public long getSizeInBytes()
         return sliceOutput.size() + arraysSizeInBytes;
     }
 
-    @Override
-    public long getRegionSizeInBytes(int positionOffset, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, positionOffset, length);
-        long arraysSizeInBytes = (Integer.BYTES + Byte.BYTES) * (long) length;
-        return getOffset(positionOffset + length) - getOffset(positionOffset) + arraysSizeInBytes;
-    }
-
-    @Override
-    public long getPositionsSizeInBytes(boolean[] positions, int selectedPositionCount)
-    {
-        checkValidPositions(positions, getPositionCount());
-        long sizeInBytes = 0;
-        for (int i = 0; i < positions.length; ++i) {
-            if (positions[i]) {
-                sizeInBytes += getOffset(i + 1) - getOffset(i);
-            }
-        }
-        return sizeInBytes + (Integer.BYTES + Byte.BYTES) * (long) selectedPositionCount;
-    }
-
     @Override
     public long getRetainedSizeInBytes()
     {
@@ -149,118 +86,55 @@ public long getRetainedSizeInBytes()
         return size;
     }
 
-    @Override
-    public void retainedBytesForEachPart(ObjLongConsumer<Object> consumer)
+    public VariableWidthBlockBuilder writeEntry(Slice source)
     {
-        consumer.accept(sliceOutput, sliceOutput.getRetainedSize());
-        consumer.accept(offsets, sizeOf(offsets));
-        consumer.accept(valueIsNull, sizeOf(valueIsNull));
-        consumer.accept(this, INSTANCE_SIZE);
+        return writeEntry(source, 0, source.length());
     }
 
-    @Override
-    public Block copyPositions(int[] positions, int offset, int length)
-    {
-        checkArrayRange(positions, offset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-
-        int finalLength = 0;
-        for (int i = offset; i < offset + length; i++) {
-            finalLength += getSliceLength(positions[i]);
-        }
-        SliceOutput newSlice = Slices.allocate(finalLength).getOutput();
-        int[] newOffsets = new int[length + 1];
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = new boolean[length];
-        }
-
-        for (int i = 0; i < length; i++) {
-            int position = positions[offset + i];
-            if (isEntryNull(position)) {
-                newValueIsNull[i] = true;
-            }
-            else {
-                newSlice.writeBytes(sliceOutput.getUnderlyingSlice(), getPositionOffset(position), getSliceLength(position));
-            }
-            newOffsets[i + 1] = newSlice.size();
-        }
-        return new VariableWidthBlock(0, length, newSlice.slice(), newOffsets, newValueIsNull);
-    }
-
-    @Override
-    public BlockBuilder writeByte(int value)
+    public VariableWidthBlockBuilder writeEntry(Slice source, int sourceIndex, int length)
     {
         if (!initialized) {
             initializeCapacity();
         }
-        sliceOutput.writeByte(value);
-        currentEntrySize += SIZE_OF_BYTE;
-        return this;
-    }
 
-    @Override
-    public BlockBuilder writeShort(int value)
-    {
-        if (!initialized) {
-            initializeCapacity();
-        }
-        sliceOutput.writeShort(value);
-        currentEntrySize += SIZE_OF_SHORT;
+        sliceOutput.writeBytes(source, sourceIndex, length);
+        entryAdded(length, false);
         return this;
     }
 
-    @Override
-    public BlockBuilder writeInt(int value)
+    public VariableWidthBlockBuilder writeEntry(byte[] source, int sourceIndex, int length)
     {
         if (!initialized) {
             initializeCapacity();
         }
-        sliceOutput.writeInt(value);
-        currentEntrySize += SIZE_OF_INT;
-        return this;
-    }
 
-    @Override
-    public BlockBuilder writeLong(long value)
-    {
-        if (!initialized) {
-            initializeCapacity();
-        }
-        sliceOutput.writeLong(value);
-        currentEntrySize += SIZE_OF_LONG;
+        sliceOutput.writeBytes(source, sourceIndex, length);
+        entryAdded(length, false);
         return this;
     }
 
-    @Override
-    public BlockBuilder writeBytes(Slice source, int sourceIndex, int length)
+    public <E extends Throwable> void buildEntry(VariableWidthEntryBuilder<E> builder)
+            throws E
     {
         if (!initialized) {
             initializeCapacity();
         }
-        sliceOutput.writeBytes(source, sourceIndex, length);
-        currentEntrySize += length;
-        return this;
+
+        int start = sliceOutput.size();
+        builder.build(sliceOutput);
+        int length = sliceOutput.size() - start;
+        entryAdded(length, false);
     }
 
-    @Override
-    public BlockBuilder closeEntry()
+    public interface VariableWidthEntryBuilder<E extends Throwable>
     {
-        entryAdded(currentEntrySize, false);
-        currentEntrySize = 0;
-        return this;
+        void build(SliceOutput output)
+                throws E;
     }
 
     @Override
     public BlockBuilder appendNull()
     {
-        if (currentEntrySize > 0) {
-            throw new IllegalStateException("Current entry must be closed before a null can be written");
-        }
-
         hasNullValue = true;
         entryAdded(0, true);
         return this;
@@ -295,7 +169,7 @@ private void growCapacity()
 
     private void initializeCapacity()
     {
-        if (positions != 0 || currentEntrySize != 0) {
+        if (positions != 0) {
             throw new IllegalStateException(getClass().getSimpleName() + " was used before initialization");
         }
         initialized = true;
@@ -311,58 +185,17 @@ private void updateArraysDataSize()
     }
 
     @Override
-    public boolean mayHaveNull()
-    {
-        return hasNullValue;
-    }
-
-    @Override
-    protected boolean isEntryNull(int position)
-    {
-        return valueIsNull[position];
-    }
-
-    @Override
-    public Block getRegion(int positionOffset, int length)
-    {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, positionOffset, length);
-
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-
-        return new VariableWidthBlock(positionOffset, length, sliceOutput.slice(), offsets, hasNullValue ? valueIsNull : null);
-    }
-
-    @Override
-    public Block copyRegion(int positionOffset, int length)
+    public Block build()
     {
-        int positionCount = getPositionCount();
-        checkValidRegion(positionCount, positionOffset, length);
         if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, length);
-        }
-
-        int[] newOffsets = compactOffsets(offsets, positionOffset, length);
-        boolean[] newValueIsNull = null;
-        if (hasNullValue) {
-            newValueIsNull = compactArray(valueIsNull, positionOffset, length);
+            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, positions);
         }
-        Slice slice = compactSlice(sliceOutput.getUnderlyingSlice(), offsets[positionOffset], newOffsets[length]);
-
-        return new VariableWidthBlock(0, length, slice, newOffsets, newValueIsNull);
+        return buildValueBlock();
     }
 
     @Override
-    public Block build()
+    public VariableWidthBlock buildValueBlock()
     {
-        if (currentEntrySize > 0) {
-            throw new IllegalStateException("Current entry must be closed before the block can be built");
-        }
-        if (!hasNonNullValue) {
-            return RunLengthEncodedBlock.create(NULL_VALUE_BLOCK, positions);
-        }
         return new VariableWidthBlock(0, positions, sliceOutput.slice(), offsets, hasNullValue ? valueIsNull : null);
     }
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/VariableWidthBlockEncoding.java b/core/trino-spi/src/main/java/io/trino/spi/block/VariableWidthBlockEncoding.java
index eded7b4585bf..6e8af40a5b44 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/block/VariableWidthBlockEncoding.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/block/VariableWidthBlockEncoding.java
@@ -38,8 +38,7 @@ public String getName()
     @Override
     public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceOutput, Block block)
     {
-        // The down casts here are safe because it is the block itself the provides this encoding implementation.
-        AbstractVariableWidthBlock variableWidthBlock = (AbstractVariableWidthBlock) block;
+        VariableWidthBlock variableWidthBlock = (VariableWidthBlock) block;
 
         int positionCount = variableWidthBlock.getPositionCount();
         sliceOutput.appendInt(positionCount);
@@ -58,13 +57,13 @@ public void writeBlock(BlockEncodingSerde blockEncodingSerde, SliceOutput sliceO
 
         sliceOutput
                 .appendInt(nonNullsCount)
-                .writeBytes(Slices.wrappedIntArray(lengths, 0, nonNullsCount));
+                .writeInts(lengths, 0, nonNullsCount);
 
         encodeNullsAsBits(sliceOutput, variableWidthBlock);
 
         sliceOutput
                 .appendInt(totalLength)
-                .writeBytes(variableWidthBlock.getRawSlice(0), variableWidthBlock.getPositionOffset(0), totalLength);
+                .writeBytes(variableWidthBlock.getRawSlice(), variableWidthBlock.getPositionOffset(0), totalLength);
     }
 
     @Override
@@ -80,7 +79,7 @@ public Block readBlock(BlockEncodingSerde blockEncodingSerde, SliceInput sliceIn
         int[] offsets = new int[positionCount + 1];
         // Read the lengths array into the end of the offsets array, since nonNullsCount <= positionCount
         int lengthIndex = offsets.length - nonNullsCount;
-        sliceInput.readBytes(Slices.wrappedIntArray(offsets, lengthIndex, nonNullsCount));
+        sliceInput.readInts(offsets, lengthIndex, nonNullsCount);
 
         boolean[] valueIsNull = decodeNullBits(sliceInput, positionCount).orElse(null);
         // Transform lengths back to offsets
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ColumnMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ColumnMetadata.java
index 1198edf79d41..f54fe7e67873 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ColumnMetadata.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ColumnMetadata.java
@@ -14,8 +14,7 @@
 package io.trino.spi.connector;
 
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/Connector.java b/core/trino-spi/src/main/java/io/trino/spi/connector/Connector.java
index 8fdb5222449e..ae511a01d18b 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/Connector.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/Connector.java
@@ -16,8 +16,8 @@
 import io.trino.spi.Experimental;
 import io.trino.spi.eventlistener.EventListener;
 import io.trino.spi.function.FunctionProvider;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.procedure.Procedure;
-import io.trino.spi.ptf.ConnectorTableFunction;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorAccessControl.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorAccessControl.java
index 585f270a1ca4..59b49306592b 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorAccessControl.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorAccessControl.java
@@ -13,25 +13,25 @@
  */
 package io.trino.spi.connector;
 
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.AccessDeniedException;
-import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.security.ViewExpression;
 import io.trino.spi.type.Type;
 
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static io.trino.spi.security.AccessDeniedException.denyAddColumn;
 import static io.trino.spi.security.AccessDeniedException.denyAlterColumn;
 import static io.trino.spi.security.AccessDeniedException.denyCommentColumn;
 import static io.trino.spi.security.AccessDeniedException.denyCommentTable;
 import static io.trino.spi.security.AccessDeniedException.denyCommentView;
+import static io.trino.spi.security.AccessDeniedException.denyCreateFunction;
 import static io.trino.spi.security.AccessDeniedException.denyCreateMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyCreateRole;
 import static io.trino.spi.security.AccessDeniedException.denyCreateSchema;
@@ -42,15 +42,14 @@
 import static io.trino.spi.security.AccessDeniedException.denyDenySchemaPrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyDenyTablePrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyDropColumn;
+import static io.trino.spi.security.AccessDeniedException.denyDropFunction;
 import static io.trino.spi.security.AccessDeniedException.denyDropMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyDropRole;
 import static io.trino.spi.security.AccessDeniedException.denyDropSchema;
 import static io.trino.spi.security.AccessDeniedException.denyDropTable;
 import static io.trino.spi.security.AccessDeniedException.denyDropView;
-import static io.trino.spi.security.AccessDeniedException.denyExecuteFunction;
 import static io.trino.spi.security.AccessDeniedException.denyExecuteProcedure;
 import static io.trino.spi.security.AccessDeniedException.denyExecuteTableProcedure;
-import static io.trino.spi.security.AccessDeniedException.denyGrantExecuteFunctionPrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyGrantRoles;
 import static io.trino.spi.security.AccessDeniedException.denyGrantSchemaPrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyGrantTablePrivilege;
@@ -76,14 +75,13 @@
 import static io.trino.spi.security.AccessDeniedException.denyShowCreateSchema;
 import static io.trino.spi.security.AccessDeniedException.denyShowCreateTable;
 import static io.trino.spi.security.AccessDeniedException.denyShowCurrentRoles;
-import static io.trino.spi.security.AccessDeniedException.denyShowRoleAuthorizationDescriptors;
+import static io.trino.spi.security.AccessDeniedException.denyShowFunctions;
 import static io.trino.spi.security.AccessDeniedException.denyShowRoleGrants;
 import static io.trino.spi.security.AccessDeniedException.denyShowRoles;
 import static io.trino.spi.security.AccessDeniedException.denyShowSchemas;
 import static io.trino.spi.security.AccessDeniedException.denyShowTables;
 import static io.trino.spi.security.AccessDeniedException.denyTruncateTable;
 import static io.trino.spi.security.AccessDeniedException.denyUpdateTableColumns;
-import static java.lang.String.format;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptySet;
 
@@ -279,12 +277,26 @@ default void checkCanShowColumns(ConnectorSecurityContext context, SchemaTableNa
 
     /**
      * Filter the list of columns to those visible to the identity.
+     *
+     * @deprecated Use {@link #filterColumns(ConnectorSecurityContext, Map)}
      */
+    @Deprecated
     default Set<String> filterColumns(ConnectorSecurityContext context, SchemaTableName tableName, Set<String> columns)
     {
         return emptySet();
     }
 
+    /**
+     * Filter lists of columns of multiple tables to those visible to the identity.
+     */
+    default Map<SchemaTableName, Set<String>> filterColumns(ConnectorSecurityContext context, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        return tableColumns.entrySet().stream()
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        entry -> filterColumns(context, entry.getKey(), entry.getValue())));
+    }
+
     /**
      * Check if identity is allowed to add columns to the specified table.
      *
@@ -485,17 +497,6 @@ default void checkCanRenameMaterializedView(ConnectorSecurityContext context, Sc
         denyRenameMaterializedView(viewName.toString(), newViewName.toString());
     }
 
-    /**
-     * Check if identity is allowed to grant an access to the function execution to grantee.
-     *
-     * @throws AccessDeniedException if not allowed
-     */
-    default void checkCanGrantExecuteFunctionPrivilege(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-        String granteeAsString = format("%s '%s'", grantee.getType().name().toLowerCase(Locale.ENGLISH), grantee.getName());
-        denyGrantExecuteFunctionPrivilege(functionName.toString(), Identity.ofUser(context.getIdentity().getUser()), granteeAsString);
-    }
-
     /**
      * Check if identity is allowed to set the specified property.
      *
@@ -586,16 +587,6 @@ default void checkCanSetRole(ConnectorSecurityContext context, String role)
         denySetRole(role);
     }
 
-    /**
-     * Check if identity is allowed to show role authorization descriptors (i.e. RoleGrants).
-     *
-     * @throws io.trino.spi.security.AccessDeniedException if not allowed
-     */
-    default void checkCanShowRoleAuthorizationDescriptors(ConnectorSecurityContext context)
-    {
-        denyShowRoleAuthorizationDescriptors();
-    }
-
     /**
      * Check if identity is allowed to show roles.
      *
@@ -637,13 +628,61 @@ default void checkCanExecuteTableProcedure(ConnectorSecurityContext context, Sch
     }
 
     /**
-     * Check if identity is allowed to execute function
+     * Is the identity allowed to execute the specified function?
+     */
+    default boolean canExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        return false;
+    }
+
+    /**
+     * Is identity allowed to create a view that executes the specified function?
+     */
+    default boolean canCreateViewWithExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        return false;
+    }
+
+    /**
+     * Check if identity is allowed to show functions by executing SHOW FUNCTIONS.
+     * <p>
+     * NOTE: This method is only present to give users an error message when listing is not allowed.
+     * The {@link #filterFunctions} method must filter all results for unauthorized users,
+     * since there are multiple ways to list functions.
      *
-     * @throws io.trino.spi.security.AccessDeniedException if not allowed
+     * @throws AccessDeniedException if not allowed
+     */
+    default void checkCanShowFunctions(ConnectorSecurityContext context, String schemaName)
+    {
+        denyShowFunctions(schemaName);
+    }
+
+    /**
+     * Filter the list of functions to those visible to the identity.
+     */
+    default Set<SchemaFunctionName> filterFunctions(ConnectorSecurityContext context, Set<SchemaFunctionName> functionNames)
+    {
+        return emptySet();
+    }
+
+    /**
+     * Check if identity is allowed to create the specified function.
+     *
+     * @throws AccessDeniedException if not allowed
      */
-    default void checkCanExecuteFunction(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName function)
+    default void checkCanCreateFunction(ConnectorSecurityContext context, SchemaRoutineName function)
     {
-        denyExecuteFunction(function.toString());
+        denyCreateFunction(function.toString());
+    }
+
+    /**
+     * Check if identity is allowed to drop the specified function.
+     *
+     * @throws AccessDeniedException if not allowed
+     */
+    default void checkCanDropFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        denyDropFunction(function.toString());
     }
 
     /**
@@ -668,17 +707,6 @@ default List<ViewExpression> getRowFilters(ConnectorSecurityContext context, Sch
      */
     default Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
     {
-        List<ViewExpression> masks = getColumnMasks(context, tableName, columnName, type);
-        if (masks.size() > 1) {
-            throw new UnsupportedOperationException("Multiple masks on a single column are no longer supported");
-        }
-
-        return masks.stream().findFirst();
-    }
-
-    @Deprecated
-    default List<ViewExpression> getColumnMasks(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
-    {
-        return emptyList();
+        return Optional.empty();
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorContext.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorContext.java
index 288fc373da67..07f8a7f4742d 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorContext.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorContext.java
@@ -13,6 +13,8 @@
  */
 package io.trino.spi.connector;
 
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.spi.NodeManager;
 import io.trino.spi.PageIndexerFactory;
 import io.trino.spi.PageSorter;
@@ -26,6 +28,16 @@ default CatalogHandle getCatalogHandle()
         throw new UnsupportedOperationException();
     }
 
+    default OpenTelemetry getOpenTelemetry()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    default Tracer getTracer()
+    {
+        throw new UnsupportedOperationException();
+    }
+
     default NodeManager getNodeManager()
     {
         throw new UnsupportedOperationException();
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMaterializedViewDefinition.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMaterializedViewDefinition.java
index 27a4a59ad85d..70523c97f018 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMaterializedViewDefinition.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMaterializedViewDefinition.java
@@ -24,6 +24,7 @@
 
 import static io.trino.spi.connector.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.joining;
 
 public class ConnectorMaterializedViewDefinition
 {
@@ -35,31 +36,9 @@ public class ConnectorMaterializedViewDefinition
     private final Optional<Duration> gracePeriod;
     private final Optional<String> comment;
     private final Optional<String> owner;
+    private final List<CatalogSchemaName> path;
     private final Map<String, Object> properties;
 
-    @Deprecated
-    public ConnectorMaterializedViewDefinition(
-            String originalSql,
-            Optional<CatalogSchemaTableName> storageTable,
-            Optional<String> catalog,
-            Optional<String> schema,
-            List<Column> columns,
-            Optional<String> comment,
-            Optional<String> owner,
-            Map<String, Object> properties)
-    {
-        this(
-                originalSql,
-                storageTable,
-                catalog,
-                schema,
-                columns,
-                Optional.of(Duration.ZERO),
-                comment,
-                owner,
-                properties);
-    }
-
     public ConnectorMaterializedViewDefinition(
             String originalSql,
             Optional<CatalogSchemaTableName> storageTable,
@@ -69,6 +48,7 @@ public ConnectorMaterializedViewDefinition(
             Optional<Duration> gracePeriod,
             Optional<String> comment,
             Optional<String> owner,
+            List<CatalogSchemaName> path,
             Map<String, Object> properties)
     {
         this.originalSql = requireNonNull(originalSql, "originalSql is null");
@@ -80,6 +60,7 @@ public ConnectorMaterializedViewDefinition(
         this.gracePeriod = gracePeriod;
         this.comment = requireNonNull(comment, "comment is null");
         this.owner = requireNonNull(owner, "owner is null");
+        this.path = List.copyOf(path);
         this.properties = requireNonNull(properties, "properties are null");
 
         if (catalog.isEmpty() && schema.isPresent()) {
@@ -130,6 +111,11 @@ public Optional<String> getOwner()
         return owner;
     }
 
+    public List<CatalogSchemaName> getPath()
+    {
+        return path;
+    }
+
     public Map<String, Object> getProperties()
     {
         return properties;
@@ -148,6 +134,7 @@ public String toString()
         comment.ifPresent(value -> joiner.add("comment=" + value));
         joiner.add("owner=" + owner);
         joiner.add("properties=" + properties);
+        joiner.add(path.stream().map(CatalogSchemaName::toString).collect(joining(", ", "path=(", ")")));
         return getClass().getSimpleName() + joiner.toString();
     }
 
@@ -169,24 +156,33 @@ public boolean equals(Object o)
                 Objects.equals(gracePeriod, that.gracePeriod) &&
                 Objects.equals(comment, that.comment) &&
                 Objects.equals(owner, that.owner) &&
+                Objects.equals(path, that.path) &&
                 Objects.equals(properties, that.properties);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(originalSql, storageTable, catalog, schema, columns, gracePeriod, comment, owner, properties);
+        return Objects.hash(originalSql, storageTable, catalog, schema, columns, gracePeriod, comment, owner, path, properties);
     }
 
     public static final class Column
     {
         private final String name;
         private final TypeId type;
+        private final Optional<String> comment;
 
+        @Deprecated
         public Column(String name, TypeId type)
+        {
+            this(name, type, Optional.empty());
+        }
+
+        public Column(String name, TypeId type, Optional<String> comment)
         {
             this.name = requireNonNull(name, "name is null");
             this.type = requireNonNull(type, "type is null");
+            this.comment = requireNonNull(comment, "comment is null");
         }
 
         public String getName()
@@ -199,6 +195,11 @@ public TypeId getType()
             return type;
         }
 
+        public Optional<String> getComment()
+        {
+            return comment;
+        }
+
         @Override
         public String toString()
         {
@@ -216,13 +217,14 @@ public boolean equals(Object o)
             }
             Column column = (Column) o;
             return Objects.equals(name, column.name) &&
-                    Objects.equals(type, column.type);
+                    Objects.equals(type, column.type) &&
+                    Objects.equals(comment, column.comment);
         }
 
         @Override
         public int hashCode()
         {
-            return Objects.hash(name, type);
+            return Objects.hash(name, type, comment);
         }
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java
index d1612a635b5d..8191761d9924 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java
@@ -14,6 +14,7 @@
 package io.trino.spi.connector;
 
 import io.airlift.slice.Slice;
+import io.trino.spi.ErrorCode;
 import io.trino.spi.Experimental;
 import io.trino.spi.TrinoException;
 import io.trino.spi.expression.Call;
@@ -25,9 +26,10 @@
 import io.trino.spi.function.FunctionDependencyDeclaration;
 import io.trino.spi.function.FunctionId;
 import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.function.SchemaFunctionName;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
 import io.trino.spi.security.GrantInfo;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.RoleGrant;
@@ -36,8 +38,7 @@
 import io.trino.spi.statistics.TableStatistics;
 import io.trino.spi.statistics.TableStatisticsMetadata;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -45,20 +46,35 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
+import java.util.function.UnaryOperator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
 
+import static io.trino.spi.ErrorType.EXTERNAL;
+import static io.trino.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_ERROR;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static io.trino.spi.StandardErrorCode.NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.StandardErrorCode.UNSUPPORTED_TABLE_TYPE;
+import static io.trino.spi.connector.SaveMode.IGNORE;
+import static io.trino.spi.connector.SaveMode.REPLACE;
+import static io.trino.spi.expression.Constant.FALSE;
 import static io.trino.spi.expression.StandardFunctions.AND_FUNCTION_NAME;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static java.util.Locale.ENGLISH;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.toMap;
 import static java.util.stream.Collectors.toUnmodifiableList;
+import static java.util.stream.Collectors.toUnmodifiableSet;
 
 public interface ConnectorMetadata
 {
@@ -96,8 +112,10 @@ default List<String> listSchemaNames(ConnectorSession session)
      * cannot be queried.
      * @see #getView(ConnectorSession, SchemaTableName)
      * @see #getMaterializedView(ConnectorSession, SchemaTableName)
+     * @deprecated Implement {@link #getTableHandle(ConnectorSession, SchemaTableName, Optional, Optional)}.
      */
     @Nullable
+    @Deprecated
     default ConnectorTableHandle getTableHandle(ConnectorSession session, SchemaTableName tableName)
     {
         return null;
@@ -133,8 +151,7 @@ default ConnectorTableHandle getTableHandle(
     /**
      * Create initial handle for execution of table procedure. The handle will be used through planning process. It will be converted to final
      * handle used for execution via @{link {@link ConnectorMetadata#beginTableExecute}
-     *
-     * <p/>
+     * <p>
      * If connector does not support execution with retries, the method should throw:
      * <pre>
      *     new TrinoException(NOT_SUPPORTED, "This connector does not support query retries")
@@ -222,8 +239,7 @@ default Optional<ConnectorPartitioningHandle> getCommonPartitioningHandle(Connec
      *
      * @throws RuntimeException if table handle is no longer valid
      */
-    @Deprecated // ... and optimized implementations already removed
-    default SchemaTableName getSchemaTableName(ConnectorSession session, ConnectorTableHandle table)
+    default SchemaTableName getTableName(ConnectorSession session, ConnectorTableHandle table)
     {
         return getTableSchema(session, table).getTable();
     }
@@ -257,6 +273,9 @@ default Optional<Object> getInfo(ConnectorTableHandle table)
     /**
      * List table, view and materialized view names, possibly filtered by schema. An empty list is returned if none match.
      * An empty list is returned also when schema name does not refer to an existing schema.
+     *
+     * @see #listViews(ConnectorSession, Optional)
+     * @see #listMaterializedViews(ConnectorSession, Optional)
      */
     default List<SchemaTableName> listTables(ConnectorSession session, Optional<String> schemaName)
     {
@@ -284,7 +303,7 @@ default ColumnMetadata getColumnMetadata(ConnectorSession session, ConnectorTabl
     }
 
     /**
-     * Gets the metadata for all columns that match the specified table prefix.
+     * Gets the metadata for all columns that match the specified table prefix. Columns of views and materialized views are not included.
      *
      * @deprecated use {@link #streamTableColumns} which handles redirected tables
      */
@@ -296,8 +315,11 @@ default Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSes
 
     /**
      * Gets the metadata for all columns that match the specified table prefix. Redirected table names are included, but
-     * the column metadata for them is not.
+     * the column metadata for them is not. Views and materialized views are not included.
+     *
+     * @deprecated Implement {@link #streamRelationColumns}.
      */
+    @Deprecated
     default Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
     {
         return listTableColumns(session, prefix).entrySet().stream()
@@ -305,6 +327,117 @@ default Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession sessi
                 .iterator();
     }
 
+    /**
+     * Gets columns for all relations (tables, views, materialized views), possibly filtered by schemaName.
+     * (e.g. for all relations that would be returned by {@link #listTables(ConnectorSession, Optional)}).
+     * Redirected table names are included, but the comment for them is not.
+     */
+    @Experimental(eta = "2024-01-01")
+    default Iterator<RelationColumnsMetadata> streamRelationColumns(
+            ConnectorSession session,
+            Optional<String> schemaName,
+            UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        Map<SchemaTableName, RelationColumnsMetadata> relationColumns = new HashMap<>();
+
+        // Collect column metadata from tables
+        SchemaTablePrefix prefix = schemaName.map(SchemaTablePrefix::new)
+                .orElseGet(SchemaTablePrefix::new);
+        streamTableColumns(session, prefix)
+                .forEachRemaining(columnsMetadata -> {
+                    SchemaTableName name = columnsMetadata.getTable();
+                    relationColumns.put(name, columnsMetadata.getColumns()
+                            .map(columns -> RelationColumnsMetadata.forTable(name, columns))
+                            .orElseGet(() -> RelationColumnsMetadata.forRedirectedTable(name)));
+                });
+
+        // Collect column metadata from views. if table and view names overlap, the view wins
+        for (Map.Entry<SchemaTableName, ConnectorViewDefinition> entry : getViews(session, schemaName).entrySet()) {
+            relationColumns.put(entry.getKey(), RelationColumnsMetadata.forView(entry.getKey(), entry.getValue().getColumns()));
+        }
+
+        // if view and materialized view names overlap, the materialized view wins
+        for (Map.Entry<SchemaTableName, ConnectorMaterializedViewDefinition> entry : getMaterializedViews(session, schemaName).entrySet()) {
+            relationColumns.put(entry.getKey(), RelationColumnsMetadata.forMaterializedView(entry.getKey(), entry.getValue().getColumns()));
+        }
+
+        return relationFilter.apply(relationColumns.keySet()).stream()
+                .map(relationColumns::get)
+                .iterator();
+    }
+
+    /**
+     * Gets comments for all relations (tables, views, materialized views), possibly filtered by schemaName.
+     * (e.g. for all relations that would be returned by {@link #listTables(ConnectorSession, Optional)}).
+     * Redirected table names are included, but the comment for them is not.
+     */
+    @Experimental(eta = "2024-01-01")
+    default Iterator<RelationCommentMetadata> streamRelationComments(ConnectorSession session, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        List<RelationCommentMetadata> materializedViews = getMaterializedViews(session, schemaName).entrySet().stream()
+                .map(entry -> RelationCommentMetadata.forRelation(entry.getKey(), entry.getValue().getComment()))
+                .toList();
+        Set<SchemaTableName> mvNames = materializedViews.stream()
+                .map(RelationCommentMetadata::name)
+                .collect(toUnmodifiableSet());
+
+        List<RelationCommentMetadata> views = getViews(session, schemaName).entrySet().stream()
+                .map(entry -> RelationCommentMetadata.forRelation(entry.getKey(), entry.getValue().getComment()))
+                .filter(commentMetadata -> !mvNames.contains(commentMetadata.name()))
+                .toList();
+        Set<SchemaTableName> mvAndViewNames = Stream.concat(mvNames.stream(), views.stream().map(RelationCommentMetadata::name))
+                .collect(toUnmodifiableSet());
+
+        List<RelationCommentMetadata> tables = listTables(session, schemaName).stream()
+                .filter(tableName -> !mvAndViewNames.contains(tableName))
+                .collect(collectingAndThen(toUnmodifiableSet(), relationFilter)).stream()
+                .map(tableName -> {
+                    if (redirectTable(session, tableName).isPresent()) {
+                        return RelationCommentMetadata.forRedirectedTable(tableName);
+                    }
+                    try {
+                        ConnectorTableHandle tableHandle = getTableHandle(session, tableName, Optional.empty(), Optional.empty());
+                        if (tableHandle == null) {
+                            // disappeared during listing
+                            return null;
+                        }
+                        return RelationCommentMetadata.forRelation(tableName, getTableMetadata(session, tableHandle).getComment());
+                    }
+                    catch (RuntimeException e) {
+                        boolean silent = false;
+                        if (e instanceof TrinoException trinoException) {
+                            ErrorCode errorCode = trinoException.getErrorCode();
+                            silent = errorCode.equals(UNSUPPORTED_TABLE_TYPE.toErrorCode()) ||
+                                    // e.g. table deleted concurrently
+                                    errorCode.equals(NOT_FOUND.toErrorCode()) ||
+                                    // e.g. Iceberg/Delta table being deleted concurrently resulting in failure to load metadata from filesystem
+                                    errorCode.getType() == EXTERNAL;
+                        }
+                        if (silent) {
+                            Helper.juliLogger.log(Level.FINE, e, () -> "Failed to get metadata for table: " + tableName);
+                        }
+                        else {
+                            // getTableHandle or getTableMetadata failed call may fail if table disappeared during listing or is unsupported.
+                            Helper.juliLogger.log(Level.WARNING, e, () -> "Failed to get metadata for table: " + tableName);
+                        }
+                        // Since the getTableHandle did not return null (i.e. succeeded or failed), we assume the table would be returned by listTables
+                        return RelationCommentMetadata.forRelation(tableName, Optional.empty());
+                    }
+                })
+                .filter(Objects::nonNull)
+                .toList();
+
+        Set<SchemaTableName> availableMvAndViews = relationFilter.apply(mvAndViewNames);
+        return Stream.of(
+                        materializedViews.stream()
+                                .filter(commentMetadata -> availableMvAndViews.contains(commentMetadata.name())),
+                        views.stream()
+                                .filter(commentMetadata -> availableMvAndViews.contains(commentMetadata.name())),
+                        tables.stream())
+                .flatMap(identity())
+                .iterator();
+    }
+
     /**
      * Get statistics for table.
      */
@@ -324,9 +457,9 @@ default void createSchema(ConnectorSession session, String schemaName, Map<Strin
     /**
      * Drops the specified schema.
      *
-     * @throws TrinoException with {@code SCHEMA_NOT_EMPTY} if the schema is not empty
+     * @throws TrinoException with {@code SCHEMA_NOT_EMPTY} if {@code cascade} is false and the schema is not empty
      */
-    default void dropSchema(ConnectorSession session, String schemaName)
+    default void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support dropping schemas");
     }
@@ -351,12 +484,30 @@ default void setSchemaAuthorization(ConnectorSession session, String schemaName,
      * Creates a table using the specified table metadata.
      *
      * @throws TrinoException with {@code ALREADY_EXISTS} if the table already exists and {@param ignoreExisting} is not set
+     * @deprecated use {@link #createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, SaveMode saveMode)}
      */
+    @Deprecated
     default void createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, boolean ignoreExisting)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support creating tables");
     }
 
+    /**
+     * Creates a table using the specified table metadata.
+     * IGNORE means the table is created using CREATE ... IF NOT EXISTS syntax.
+     * REPLACE means the table is created using CREATE OR REPLACE syntax.
+     *
+     * @throws TrinoException with {@code ALREADY_EXISTS} if the table already exists and {@param savemode} is FAIL.
+     */
+    default void createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, SaveMode saveMode)
+    {
+        if (saveMode == REPLACE) {
+            throw new TrinoException(NOT_SUPPORTED, "This connector does not support replacing tables");
+        }
+        // Delegate to deprecated SPI to not break existing connectors
+        createTable(session, tableMetadata, saveMode == IGNORE);
+    }
+
     /**
      * Drops the specified table
      *
@@ -417,6 +568,14 @@ default void setViewColumnComment(ConnectorSession session, SchemaTableName view
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support setting view column comments");
     }
 
+    /**
+     * Comments to the specified materialized view column.
+     */
+    default void setMaterializedViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "This connector does not support setting materialized view column comments");
+    }
+
     /**
      * Comments to the specified column
      */
@@ -433,6 +592,17 @@ default void addColumn(ConnectorSession session, ConnectorTableHandle tableHandl
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support adding columns");
     }
 
+    /**
+     * Add the specified field, potentially nested, to a row.
+     *
+     * @param parentPath path to a field within the column, without leaf field name.
+     */
+    @Experimental(eta = "2023-06-01") // TODO add support for rows inside arrays and maps and for anonymous row fields
+    default void addField(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> parentPath, String fieldName, Type type, boolean ignoreExisting)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "This connector does not support adding fields");
+    }
+
     /**
      * Set the specified column type
      */
@@ -442,6 +612,17 @@ default void setColumnType(ConnectorSession session, ConnectorTableHandle tableH
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support setting column types");
     }
 
+    /**
+     * Set the specified field type
+     *
+     * @param fieldPath path starting with column name. The path is always lower-cased. It cannot be an empty or a single element.
+     */
+    @Experimental(eta = "2023-09-01")
+    default void setFieldType(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> fieldPath, Type type)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "This connector does not support setting field types");
+    }
+
     /**
      * Sets the user/role on the specified table.
      */
@@ -458,6 +639,18 @@ default void renameColumn(ConnectorSession session, ConnectorTableHandle tableHa
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support renaming columns");
     }
 
+    /**
+     * Rename the specified field, potentially nested, to a row.
+     *
+     * @param fieldPath path starting with column name.
+     * @param target the new field name. The field position and nested level shouldn't be changed.
+     */
+    @Experimental(eta = "2023-09-01") // TODO add support for rows inside arrays and maps and for anonymous row fields
+    default void renameField(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> fieldPath, String target)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "This connector does not support renaming fields");
+    }
+
     /**
      * Drop the specified column
      */
@@ -485,6 +678,17 @@ default Optional<ConnectorTableLayout> getNewTableLayout(ConnectorSession sessio
         return Optional.empty();
     }
 
+    /**
+     * Return the effective {@link io.trino.spi.type.Type} that is supported by the connector for the given type.
+     * If {@link Optional#empty()} is returned, the type will be used as is during table creation which may or may not be supported by the connector.
+     * The effective type shall be a type that is cast-compatible with the input type.
+     */
+    @Experimental(eta = "2024-01-31")
+    default Optional<Type> getSupportedType(ConnectorSession session, Map<String, Object> tableProperties, Type type)
+    {
+        return Optional.empty();
+    }
+
     /**
      * Get the physical layout for inserting into an existing table.
      */
@@ -494,7 +698,7 @@ default Optional<ConnectorTableLayout> getInsertLayout(ConnectorSession session,
         return properties.getTablePartitioning()
                 .map(partitioning -> {
                     Map<ColumnHandle, String> columnNamesByHandle = getColumnHandles(session, tableHandle).entrySet().stream()
-                            .collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
+                            .collect(toMap(Map.Entry::getValue, Map.Entry::getKey));
                     List<String> partitionColumns = partitioning.getPartitioningColumns().stream()
                             .map(columnNamesByHandle::get)
                             .collect(toUnmodifiableList());
@@ -537,19 +741,40 @@ default void finishStatisticsCollection(ConnectorSession session, ConnectorTable
 
     /**
      * Begin the atomic creation of a table with data.
-     *
-     * <p/>
+     * <p>
      * If connector does not support execution with retries, the method should throw:
      * <pre>
      *     new TrinoException(NOT_SUPPORTED, "This connector does not support query retries")
      * </pre>
      * unless {@code retryMode} is set to {@code NO_RETRIES}.
+     *
+     * @deprecated use {@link #beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, Optional layout, RetryMode retryMode, boolean replace)}
      */
+    @Deprecated
     default ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, Optional<ConnectorTableLayout> layout, RetryMode retryMode)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support creating tables with data");
     }
 
+    /**
+     * Begin the atomic creation of a table with data.
+     *
+     * <p/>
+     * If connector does not support execution with retries, the method should throw:
+     * <pre>
+     *     new TrinoException(NOT_SUPPORTED, "This connector does not support query retries")
+     * </pre>
+     * unless {@code retryMode} is set to {@code NO_RETRIES}.
+     */
+    default ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, Optional<ConnectorTableLayout> layout, RetryMode retryMode, boolean replace)
+    {
+        // Redirect to deprecated SPI to not break existing connectors
+        if (!replace) {
+            return beginCreateTable(session, tableMetadata, layout, retryMode);
+        }
+        throw new TrinoException(NOT_SUPPORTED, "This connector does not support replacing tables");
+    }
+
     /**
      * Finish a table creation with data after the data is written.
      */
@@ -571,8 +796,7 @@ default void cleanupQuery(ConnectorSession session) {}
 
     /**
      * Begin insert query.
-     *
-     * <p/>
+     * <p>
      * If connector does not support execution with retries, the method should throw:
      * <pre>
      *     new TrinoException(NOT_SUPPORTED, "This connector does not support query retries")
@@ -618,8 +842,7 @@ default CompletableFuture<?> refreshMaterializedView(ConnectorSession session, S
 
     /**
      * Begin materialized view query.
-     *
-     * <p/>
+     * <p>
      * If connector does not support execution with retries, the method should throw:
      * <pre>
      *     new TrinoException(NOT_SUPPORTED, "This connector does not support query retries")
@@ -686,11 +909,11 @@ default ConnectorMergeTableHandle beginMerge(ConnectorSession session, Connector
      * Finish a merge query
      *
      * @param session The session
-     * @param tableHandle A ConnectorMergeTableHandle for the table that is the target of the merge
+     * @param mergeTableHandle A ConnectorMergeTableHandle for the table that is the target of the merge
      * @param fragments All fragments returned by the merge plan
      * @param computedStatistics Statistics for the table, meaningful only to the connector that produced them.
      */
-    default void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    default void finishMerge(ConnectorSession session, ConnectorMergeTableHandle mergeTableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
     {
         throw new TrinoException(GENERIC_INTERNAL_ERROR, "ConnectorMetadata beginMerge() is implemented without finishMerge()");
     }
@@ -729,8 +952,10 @@ default void dropView(ConnectorSession session, SchemaTableName viewName)
     }
 
     /**
-     * List view names, possibly filtered by schema. An empty list is returned if none match.
+     * List view names (but not materialized views), possibly filtered by schema. An empty list is returned if none match.
      * An empty list is returned also when schema name does not refer to an existing schema.
+     *
+     * @see #listMaterializedViews(ConnectorSession, Optional)
      */
     default List<SchemaTableName> listViews(ConnectorSession session, Optional<String> schemaName)
     {
@@ -738,7 +963,7 @@ default List<SchemaTableName> listViews(ConnectorSession session, Optional<Strin
     }
 
     /**
-     * Gets the definitions of views, possibly filtered by schema.
+     * Gets the definitions of views (but not materialized views), possibly filtered by schema.
      * This optional method may be implemented by connectors that can support fetching
      * view data in bulk. It is used to implement {@code information_schema.views}.
      */
@@ -766,7 +991,7 @@ default Optional<ConnectorViewDefinition> getView(ConnectorSession session, Sche
     /**
      * Gets the schema properties for the specified schema.
      */
-    default Map<String, Object> getSchemaProperties(ConnectorSession session, CatalogSchemaName schemaName)
+    default Map<String, Object> getSchemaProperties(ConnectorSession session, String schemaName)
     {
         return Map.of();
     }
@@ -774,11 +999,30 @@ default Map<String, Object> getSchemaProperties(ConnectorSession session, Catalo
     /**
      * Get the schema properties for the specified schema.
      */
-    default Optional<TrinoPrincipal> getSchemaOwner(ConnectorSession session, CatalogSchemaName schemaName)
+    default Optional<TrinoPrincipal> getSchemaOwner(ConnectorSession session, String schemaName)
     {
         return Optional.empty();
     }
 
+    /**
+     * Attempt to push down an update operation into the connector. If a connector
+     * can execute an update for the table handle on its own, it should return a
+     * table handle, which will be passed back to {@link #executeUpdate} during
+     * query executing to actually execute the update.
+     */
+    default Optional<ConnectorTableHandle> applyUpdate(ConnectorSession session, ConnectorTableHandle handle, Map<ColumnHandle, Constant> assignments)
+    {
+        return Optional.empty();
+    }
+
+    /**
+     * Execute the update operation on the handle returned from {@link #applyUpdate}.
+     */
+    default OptionalLong executeUpdate(ConnectorSession session, ConnectorTableHandle handle)
+    {
+        throw new TrinoException(FUNCTION_IMPLEMENTATION_ERROR, "ConnectorMetadata applyUpdate() is implemented without executeUpdate()");
+    }
+
     /**
      * Attempt to push down a delete operation into the connector. If a connector
      * can execute a delete for the table handle on its own, it should return a
@@ -846,6 +1090,52 @@ default FunctionDependencyDeclaration getFunctionDependencies(ConnectorSession s
         throw new IllegalArgumentException("Unknown function " + functionId);
     }
 
+    /**
+     * List available language functions.
+     */
+    default Collection<LanguageFunction> listLanguageFunctions(ConnectorSession session, String schemaName)
+    {
+        return List.of();
+    }
+
+    /**
+     * Get all language functions with the specified name.
+     */
+    default Collection<LanguageFunction> getLanguageFunctions(ConnectorSession session, SchemaFunctionName name)
+    {
+        return List.of();
+    }
+
+    /**
+     * Check if a language function exists.
+     */
+    default boolean languageFunctionExists(ConnectorSession session, SchemaFunctionName name, String signatureToken)
+    {
+        return getLanguageFunctions(session, name).stream()
+                .anyMatch(function -> function.signatureToken().equals(signatureToken));
+    }
+
+    /**
+     * Creates a language function with the specified name and signature token.
+     * The signature token is an opaque string that uniquely identifies the function signature.
+     * Multiple functions with the same name but with different signatures may exist.
+     * The signature token is used to identify the function when dropping it.
+     *
+     * @param replace if true, replace existing function with the same name and signature token
+     */
+    default void createLanguageFunction(ConnectorSession session, SchemaFunctionName name, LanguageFunction function, boolean replace)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "This connector does not support creating functions");
+    }
+
+    /**
+     * Drops a language function with the specified name and signature token.
+     */
+    default void dropLanguageFunction(ConnectorSession session, SchemaFunctionName name, String signatureToken)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "This connector does not support dropping functions");
+    }
+
     /**
      * Does the specified role exist.
      */
@@ -1029,9 +1319,15 @@ default Optional<LimitApplicationResult<ConnectorTableHandle>> applyLimit(Connec
      */
     default Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(ConnectorSession session, ConnectorTableHandle handle, Constraint constraint)
     {
-        if (constraint.getSummary().getDomains().isEmpty()) {
+        // applyFilter is expected not to be invoked with a "false" constraint
+        if (constraint.getSummary().isNone()) {
             throw new IllegalArgumentException("constraint summary is NONE");
         }
+        if (FALSE.equals(constraint.getExpression())) {
+            // DomainTranslator translates FALSE expressions into TupleDomain.none() (via Visitor#visitBooleanLiteral)
+            // so the remaining expression shouldn't be FALSE and therefore the translated connectorExpression shouldn't be FALSE either.
+            throw new IllegalArgumentException("constraint expression is FALSE");
+        }
         return Optional.empty();
     }
 
@@ -1198,6 +1494,11 @@ default Optional<AggregationApplicationResult<ConnectorTableHandle>> applyAggreg
             Map<String, ColumnHandle> assignments,
             List<List<ColumnHandle>> groupingSets)
     {
+        // Global aggregation is represented by [[]]
+        if (groupingSets.isEmpty()) {
+            throw new IllegalArgumentException("No grouping sets provided");
+        }
+
         return Optional.empty();
     }
 
@@ -1426,18 +1727,25 @@ default Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session,
         return Optional.empty();
     }
 
-    default boolean supportsReportingWrittenBytes(ConnectorSession session, SchemaTableName schemaTableName, Map<String, Object> tableProperties)
+    default OptionalInt getMaxWriterTasks(ConnectorSession session)
     {
-        return false;
+        return OptionalInt.empty();
     }
 
-    default boolean supportsReportingWrittenBytes(ConnectorSession session, ConnectorTableHandle connectorTableHandle)
+    default WriterScalingOptions getNewTableWriterScalingOptions(ConnectorSession session, SchemaTableName tableName, Map<String, Object> tableProperties)
     {
-        return false;
+        return WriterScalingOptions.DISABLED;
     }
 
-    default OptionalInt getMaxWriterTasks(ConnectorSession session)
+    default WriterScalingOptions getInsertWriterScalingOptions(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
-        return OptionalInt.empty();
+        return WriterScalingOptions.DISABLED;
+    }
+
+    final class Helper
+    {
+        private Helper() {}
+
+        static final Logger juliLogger = Logger.getLogger(ConnectorMetadata.class.getName());
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSession.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSession.java
index d5896d6186a3..bc20bcc7b5c5 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSession.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSession.java
@@ -39,15 +39,6 @@ default String getUser()
 
     Optional<String> getTraceToken();
 
-    /**
-     * @deprecated use {@link #getStart()} instead
-     */
-    @Deprecated
-    default long getStartTime()
-    {
-        return getStart().toEpochMilli();
-    }
-
     Instant getStart();
 
     <T> T getProperty(String name, Class<T> type);
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitManager.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitManager.java
index daf579d1ce92..36a141b50db0 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitManager.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitManager.java
@@ -14,8 +14,7 @@
 package io.trino.spi.connector;
 
 import io.trino.spi.Experimental;
-import io.trino.spi.function.SchemaFunctionName;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 
 public interface ConnectorSplitManager
 {
@@ -29,11 +28,10 @@ default ConnectorSplitSource getSplits(
         throw new UnsupportedOperationException();
     }
 
-    @Experimental(eta = "2023-03-31")
+    @Experimental(eta = "2023-07-31")
     default ConnectorSplitSource getSplits(
             ConnectorTransactionHandle transaction,
             ConnectorSession session,
-            SchemaFunctionName name,
             ConnectorTableFunctionHandle function)
     {
         throw new UnsupportedOperationException();
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitSource.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitSource.java
index 87a964099cb2..04bbba0cde6b 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitSource.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitSource.java
@@ -20,6 +20,11 @@
 
 import static java.util.Objects.requireNonNull;
 
+/**
+ * Source of splits to be processed.
+ * <p>
+ * Thread-safety: the implementations are not required to be thread-safe.
+ */
 public interface ConnectorSplitSource
         extends Closeable
 {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTablePartitioning.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTablePartitioning.java
index 7f534a3fa963..70d82e7097de 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTablePartitioning.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTablePartitioning.java
@@ -49,11 +49,18 @@ public class ConnectorTablePartitioning
 {
     private final ConnectorPartitioningHandle partitioningHandle;
     private final List<ColumnHandle> partitioningColumns;
+    private final boolean singleSplitPerPartition;
 
     public ConnectorTablePartitioning(ConnectorPartitioningHandle partitioningHandle, List<ColumnHandle> partitioningColumns)
+    {
+        this(partitioningHandle, partitioningColumns, false);
+    }
+
+    public ConnectorTablePartitioning(ConnectorPartitioningHandle partitioningHandle, List<ColumnHandle> partitioningColumns, boolean singleSplitPerPartition)
     {
         this.partitioningHandle = requireNonNull(partitioningHandle, "partitioningHandle is null");
         this.partitioningColumns = List.copyOf(requireNonNull(partitioningColumns, "partitioningColumns is null"));
+        this.singleSplitPerPartition = singleSplitPerPartition;
     }
 
     /**
@@ -76,6 +83,11 @@ public List<ColumnHandle> getPartitioningColumns()
         return partitioningColumns;
     }
 
+    public boolean isSingleSplitPerPartition()
+    {
+        return singleSplitPerPartition;
+    }
+
     @Override
     public boolean equals(Object o)
     {
@@ -86,13 +98,14 @@ public boolean equals(Object o)
             return false;
         }
         ConnectorTablePartitioning that = (ConnectorTablePartitioning) o;
-        return Objects.equals(partitioningHandle, that.partitioningHandle) &&
+        return singleSplitPerPartition == that.singleSplitPerPartition &&
+                Objects.equals(partitioningHandle, that.partitioningHandle) &&
                 Objects.equals(partitioningColumns, that.partitioningColumns);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(partitioningHandle, partitioningColumns);
+        return Objects.hash(partitioningHandle, partitioningColumns, singleSplitPerPartition);
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTableProperties.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTableProperties.java
index 1fe6d94c63a2..ad89457269d6 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTableProperties.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTableProperties.java
@@ -18,7 +18,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNull;
@@ -27,30 +26,26 @@ public class ConnectorTableProperties
 {
     private final TupleDomain<ColumnHandle> predicate;
     private final Optional<ConnectorTablePartitioning> tablePartitioning;
-    private final Optional<Set<ColumnHandle>> streamPartitioningColumns;
     private final Optional<DiscretePredicates> discretePredicates;
     private final List<LocalProperty<ColumnHandle>> localProperties;
 
     public ConnectorTableProperties()
     {
-        this(TupleDomain.all(), Optional.empty(), Optional.empty(), Optional.empty(), emptyList());
+        this(TupleDomain.all(), Optional.empty(), Optional.empty(), emptyList());
     }
 
     public ConnectorTableProperties(
             TupleDomain<ColumnHandle> predicate,
             Optional<ConnectorTablePartitioning> tablePartitioning,
-            Optional<Set<ColumnHandle>> streamPartitioningColumns,
             Optional<DiscretePredicates> discretePredicates,
             List<LocalProperty<ColumnHandle>> localProperties)
     {
-        requireNonNull(streamPartitioningColumns, "streamPartitioningColumns is null");
         requireNonNull(tablePartitioning, "tablePartitioning is null");
         requireNonNull(predicate, "predicate is null");
         requireNonNull(discretePredicates, "discretePredicates is null");
         requireNonNull(localProperties, "localProperties is null");
 
         this.tablePartitioning = tablePartitioning;
-        this.streamPartitioningColumns = streamPartitioningColumns;
         this.predicate = predicate;
         this.discretePredicates = discretePredicates;
         this.localProperties = localProperties;
@@ -78,20 +73,6 @@ public Optional<ConnectorTablePartitioning> getTablePartitioning()
         return tablePartitioning;
     }
 
-    /**
-     * The partitioning for the table streams.
-     * If empty, the table layout is partitioned arbitrarily.
-     * Otherwise, table steams are partitioned on the given set of columns (or unpartitioned, if the set is empty)
-     * <p>
-     * If the table is partitioned, the connector guarantees that each combination of values for
-     * the partition columns will be contained within a single split (i.e., partitions cannot
-     * straddle multiple splits)
-     */
-    public Optional<Set<ColumnHandle>> getStreamPartitioningColumns()
-    {
-        return streamPartitioningColumns;
-    }
-
     /**
      * A collection of discrete predicates describing the data in this layout. The union of
      * these predicates is expected to be equivalent to the overall predicate returned
@@ -113,7 +94,7 @@ public List<LocalProperty<ColumnHandle>> getLocalProperties()
     @Override
     public int hashCode()
     {
-        return Objects.hash(predicate, discretePredicates, streamPartitioningColumns, tablePartitioning, localProperties);
+        return Objects.hash(predicate, discretePredicates, tablePartitioning, localProperties);
     }
 
     @Override
@@ -128,7 +109,6 @@ public boolean equals(Object obj)
         ConnectorTableProperties other = (ConnectorTableProperties) obj;
         return Objects.equals(this.predicate, other.predicate)
                 && Objects.equals(this.discretePredicates, other.discretePredicates)
-                && Objects.equals(this.streamPartitioningColumns, other.streamPartitioningColumns)
                 && Objects.equals(this.tablePartitioning, other.tablePartitioning)
                 && Objects.equals(this.localProperties, other.localProperties);
     }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorViewDefinition.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorViewDefinition.java
index 2bc653b14066..401993aec056 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorViewDefinition.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorViewDefinition.java
@@ -22,6 +22,7 @@
 import java.util.StringJoiner;
 
 import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.joining;
 
 public class ConnectorViewDefinition
 {
@@ -32,6 +33,7 @@ public class ConnectorViewDefinition
     private final Optional<String> comment;
     private final Optional<String> owner;
     private final boolean runAsInvoker;
+    private final List<CatalogSchemaName> path;
 
     @JsonCreator
     public ConnectorViewDefinition(
@@ -41,7 +43,8 @@ public ConnectorViewDefinition(
             @JsonProperty("columns") List<ViewColumn> columns,
             @JsonProperty("comment") Optional<String> comment,
             @JsonProperty("owner") Optional<String> owner,
-            @JsonProperty("runAsInvoker") boolean runAsInvoker)
+            @JsonProperty("runAsInvoker") boolean runAsInvoker,
+            @JsonProperty("path") List<CatalogSchemaName> path)
     {
         this.originalSql = requireNonNull(originalSql, "originalSql is null");
         this.catalog = requireNonNull(catalog, "catalog is null");
@@ -50,6 +53,7 @@ public ConnectorViewDefinition(
         this.comment = requireNonNull(comment, "comment is null");
         this.owner = requireNonNull(owner, "owner is null");
         this.runAsInvoker = runAsInvoker;
+        this.path = path == null ? List.of() : List.copyOf(path);
         if (catalog.isEmpty() && schema.isPresent()) {
             throw new IllegalArgumentException("catalog must be present if schema is present");
         }
@@ -103,6 +107,12 @@ public boolean isRunAsInvoker()
         return runAsInvoker;
     }
 
+    @JsonProperty
+    public List<CatalogSchemaName> getPath()
+    {
+        return path;
+    }
+
     public ConnectorViewDefinition withoutOwner()
     {
         return new ConnectorViewDefinition(
@@ -112,7 +122,8 @@ public ConnectorViewDefinition withoutOwner()
                 columns,
                 comment,
                 Optional.empty(),
-                runAsInvoker);
+                runAsInvoker,
+                path);
     }
 
     @Override
@@ -125,6 +136,7 @@ public String toString()
         joiner.add("columns=" + columns);
         catalog.ifPresent(value -> joiner.add("catalog=" + value));
         schema.ifPresent(value -> joiner.add("schema=" + value));
+        joiner.add(path.stream().map(CatalogSchemaName::toString).collect(joining(", ", "path=(", ")")));
         joiner.add("originalSql=[" + originalSql + "]");
         return getClass().getSimpleName() + joiner.toString();
     }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/EmptyPageSource.java b/core/trino-spi/src/main/java/io/trino/spi/connector/EmptyPageSource.java
index 279917b49e13..edf0e69ce4d2 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/EmptyPageSource.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/EmptyPageSource.java
@@ -13,35 +13,11 @@
  */
 package io.trino.spi.connector;
 
-import io.airlift.slice.Slice;
 import io.trino.spi.Page;
-import io.trino.spi.block.Block;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
 
 public class EmptyPageSource
         implements ConnectorPageSource
 {
-    @Deprecated // This method has been removed from the API
-    public void deleteRows(Block rowIds)
-    {
-        throw new UnsupportedOperationException("deleteRows called on EmptyPageSource");
-    }
-
-    @Deprecated // This method has been removed from the API
-    public void updateRows(Page page, List<Integer> columnValueAndRowIdChannels)
-    {
-        throw new UnsupportedOperationException("updateRows called on EmptyPageSource");
-    }
-
-    @Deprecated // This method has been removed from the API
-    public CompletableFuture<Collection<Slice>> finish()
-    {
-        throw new UnsupportedOperationException("finish called on EmptyPageSource");
-    }
-
     @Override
     public long getCompletedBytes()
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/FixedPageSource.java b/core/trino-spi/src/main/java/io/trino/spi/connector/FixedPageSource.java
index fb238bb94e9d..39536c57ea75 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/FixedPageSource.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/FixedPageSource.java
@@ -29,21 +29,12 @@ public class FixedPageSource
     private long completedBytes;
     private boolean closed;
 
-    /**
-     * @deprecated This constructor hides the fact {@code pages} are iterated twice.
-     */
-    @Deprecated
-    public FixedPageSource(Iterable<Page> pages)
-    {
-        this(pages.iterator(), memoryUsage(pages));
-    }
-
     public FixedPageSource(List<Page> pages)
     {
         this(pages.iterator(), memoryUsage(pages));
     }
 
-    private static long memoryUsage(Iterable<Page> pages)
+    private static long memoryUsage(List<Page> pages)
     {
         long memoryUsageBytes = 0;
         for (Page page : pages) {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/InMemoryRecordSet.java b/core/trino-spi/src/main/java/io/trino/spi/connector/InMemoryRecordSet.java
index 652dc931ceef..2236d44f04b7 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/InMemoryRecordSet.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/InMemoryRecordSet.java
@@ -16,6 +16,8 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Int128;
@@ -300,6 +302,12 @@ else if (value instanceof byte[]) {
             else if (value instanceof Block) {
                 completedBytes += ((Block) value).getSizeInBytes();
             }
+            else if (value instanceof SqlMap map) {
+                completedBytes += map.getSizeInBytes();
+            }
+            else if (value instanceof SqlRow row) {
+                completedBytes += row.getSizeInBytes();
+            }
             else if (value instanceof Slice) {
                 completedBytes += ((Slice) value).length();
             }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/MergePage.java b/core/trino-spi/src/main/java/io/trino/spi/connector/MergePage.java
index 8b4f6dbe4e8e..ad40f85f0a9f 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/MergePage.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/MergePage.java
@@ -24,7 +24,6 @@
 import static io.trino.spi.connector.ConnectorMergeSink.UPDATE_DELETE_OPERATION_NUMBER;
 import static io.trino.spi.connector.ConnectorMergeSink.UPDATE_INSERT_OPERATION_NUMBER;
 import static io.trino.spi.type.TinyintType.TINYINT;
-import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
@@ -79,7 +78,7 @@ public static MergePage createDeleteAndInsertPages(Page inputPage, int dataColum
         int insertPositionCount = 0;
 
         for (int position = 0; position < positionCount; position++) {
-            int operation = toIntExact(TINYINT.getLong(operationBlock, position));
+            byte operation = TINYINT.getByte(operationBlock, position);
             switch (operation) {
                 case DELETE_OPERATION_NUMBER, UPDATE_DELETE_OPERATION_NUMBER:
                     deletePositions[deletePositionCount] = position;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/RelationColumnsMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/connector/RelationColumnsMetadata.java
new file mode 100644
index 000000000000..da73a5bc177e
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/RelationColumnsMetadata.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed 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 io.trino.spi.connector;
+
+import io.trino.spi.Experimental;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import static io.trino.spi.connector.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+@Experimental(eta = "2024-01-01")
+public record RelationColumnsMetadata(
+        SchemaTableName name,
+        Optional<List<ConnectorMaterializedViewDefinition.Column>> materializedViewColumns,
+        Optional<List<ConnectorViewDefinition.ViewColumn>> viewColumns,
+        Optional<List<ColumnMetadata>> tableColumns,
+        boolean redirected)
+{
+    public RelationColumnsMetadata
+    {
+        requireNonNull(name, "name is null");
+        materializedViewColumns = materializedViewColumns.map(List::copyOf);
+        viewColumns = viewColumns.map(List::copyOf);
+        tableColumns = tableColumns.map(List::copyOf);
+
+        checkArgument(
+                Stream.of(materializedViewColumns.isPresent(), viewColumns.isPresent(), tableColumns.isPresent(), redirected)
+                        .filter(value -> value)
+                        .count() == 1,
+                "Expected exactly one to be true. Use factory methods to ensure correct instantiation");
+    }
+
+    public static RelationColumnsMetadata forMaterializedView(SchemaTableName name, List<ConnectorMaterializedViewDefinition.Column> columns)
+    {
+        return new RelationColumnsMetadata(
+                name,
+                Optional.of(columns),
+                Optional.empty(),
+                Optional.empty(),
+                false);
+    }
+
+    public static RelationColumnsMetadata forView(SchemaTableName name, List<ConnectorViewDefinition.ViewColumn> columns)
+    {
+        return new RelationColumnsMetadata(
+                name,
+                Optional.empty(),
+                Optional.of(columns),
+                Optional.empty(),
+                false);
+    }
+
+    public static RelationColumnsMetadata forTable(SchemaTableName name, List<ColumnMetadata> columns)
+    {
+        return new RelationColumnsMetadata(
+                name,
+                Optional.empty(),
+                Optional.empty(),
+                Optional.of(columns),
+                false);
+    }
+
+    public static RelationColumnsMetadata forRedirectedTable(SchemaTableName name)
+    {
+        return new RelationColumnsMetadata(
+                name,
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                true);
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/RelationCommentMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/connector/RelationCommentMetadata.java
new file mode 100644
index 000000000000..0c2e0e1fe15e
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/RelationCommentMetadata.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed 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 io.trino.spi.connector;
+
+import io.trino.spi.Experimental;
+
+import java.util.Optional;
+
+import static io.trino.spi.connector.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+@Experimental(eta = "2024-01-01")
+public record RelationCommentMetadata(
+        SchemaTableName name,
+        boolean tableRedirected,
+        Optional<String> comment)
+{
+    public RelationCommentMetadata
+    {
+        requireNonNull(name, "name is null");
+        requireNonNull(comment, "comment is null");
+        checkArgument(!tableRedirected || comment.isEmpty(), "Unexpected comment for redirected table");
+    }
+
+    public static RelationCommentMetadata forRelation(SchemaTableName name, Optional<String> comment)
+    {
+        return new RelationCommentMetadata(name, false, comment);
+    }
+
+    public static RelationCommentMetadata forRedirectedTable(SchemaTableName name)
+    {
+        return new RelationCommentMetadata(name, true, Optional.empty());
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/SaveMode.java b/core/trino-spi/src/main/java/io/trino/spi/connector/SaveMode.java
new file mode 100644
index 000000000000..5c6eb0aaffdd
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/SaveMode.java
@@ -0,0 +1,20 @@
+/*
+ * Licensed 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 io.trino.spi.connector;
+
+public enum SaveMode {
+    IGNORE,
+    REPLACE,
+    FAIL
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/SystemTable.java b/core/trino-spi/src/main/java/io/trino/spi/connector/SystemTable.java
index ad5af77d9ebc..a5313f7a4f75 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/SystemTable.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/SystemTable.java
@@ -15,6 +15,8 @@
 
 import io.trino.spi.predicate.TupleDomain;
 
+import java.util.Set;
+
 /**
  * Exactly one of {@link #cursor} or {@link #pageSource} must be implemented.
  */
@@ -40,6 +42,11 @@ default RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connec
         throw new UnsupportedOperationException();
     }
 
+    default RecordCursor cursor(ConnectorTransactionHandle transactionHandle, ConnectorSession session, TupleDomain<Integer> constraint, Set<Integer> requiredColumns)
+    {
+        return cursor(transactionHandle, session, constraint);
+    }
+
     /**
      * Create a page source for the data in this table.
      *
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/WriterScalingOptions.java b/core/trino-spi/src/main/java/io/trino/spi/connector/WriterScalingOptions.java
new file mode 100644
index 000000000000..52acb3632092
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/WriterScalingOptions.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed 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 io.trino.spi.connector;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public record WriterScalingOptions(boolean isWriterTasksScalingEnabled, boolean isPerTaskWriterScalingEnabled, Optional<Integer> perTaskMaxScaledWriterCount)
+{
+    public static final WriterScalingOptions DISABLED = new WriterScalingOptions(false, false);
+    public static final WriterScalingOptions ENABLED = new WriterScalingOptions(true, true);
+
+    public WriterScalingOptions(boolean writerTasksScalingEnabled, boolean perTaskWriterScalingEnabled)
+    {
+        this(writerTasksScalingEnabled, perTaskWriterScalingEnabled, Optional.empty());
+    }
+
+    @JsonCreator
+    public WriterScalingOptions(
+            @JsonProperty boolean isWriterTasksScalingEnabled,
+            @JsonProperty boolean isPerTaskWriterScalingEnabled,
+            @JsonProperty Optional<Integer> perTaskMaxScaledWriterCount)
+    {
+        this.isWriterTasksScalingEnabled = isWriterTasksScalingEnabled;
+        this.isPerTaskWriterScalingEnabled = isPerTaskWriterScalingEnabled;
+        this.perTaskMaxScaledWriterCount = requireNonNull(perTaskMaxScaledWriterCount, "perTaskMaxScaledWriterCount is null");
+    }
+
+    @Override
+    @JsonProperty
+    public boolean isWriterTasksScalingEnabled()
+    {
+        return isWriterTasksScalingEnabled;
+    }
+
+    @Override
+    @JsonProperty
+    public boolean isPerTaskWriterScalingEnabled()
+    {
+        return isPerTaskWriterScalingEnabled;
+    }
+
+    @JsonProperty
+    public Optional<Integer> perTaskMaxScaledWriterCount()
+    {
+        return perTaskMaxScaledWriterCount;
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryContext.java b/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryContext.java
index db235e24e70d..a14094f5a9ce 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryContext.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryContext.java
@@ -32,7 +32,9 @@
 public class QueryContext
 {
     private final String user;
+    private final String originalUser;
     private final Optional<String> principal;
+    private final Set<String> enabledRoles;
     private final Set<String> groups;
     private final Optional<String> traceToken;
     private final Optional<String> remoteClientAddress;
@@ -41,6 +43,7 @@ public class QueryContext
     private final Set<String> clientTags;
     private final Set<String> clientCapabilities;
     private final Optional<String> source;
+    private final String timezone;
 
     private final Optional<String> catalog;
     private final Optional<String> schema;
@@ -62,7 +65,9 @@ public class QueryContext
     @Unstable
     public QueryContext(
             String user,
+            String originalUser,
             Optional<String> principal,
+            Set<String> enabledRoles,
             Set<String> groups,
             Optional<String> traceToken,
             Optional<String> remoteClientAddress,
@@ -71,6 +76,7 @@ public QueryContext(
             Set<String> clientTags,
             Set<String> clientCapabilities,
             Optional<String> source,
+            String timezone,
             Optional<String> catalog,
             Optional<String> schema,
             Optional<ResourceGroupId> resourceGroupId,
@@ -83,7 +89,9 @@ public QueryContext(
             String retryPolicy)
     {
         this.user = requireNonNull(user, "user is null");
+        this.originalUser = requireNonNull(originalUser, "originalUser is null");
         this.principal = requireNonNull(principal, "principal is null");
+        this.enabledRoles = requireNonNull(enabledRoles, "enabledRoles is null");
         this.groups = requireNonNull(groups, "groups is null");
         this.traceToken = requireNonNull(traceToken, "traceToken is null");
         this.remoteClientAddress = requireNonNull(remoteClientAddress, "remoteClientAddress is null");
@@ -92,6 +100,7 @@ public QueryContext(
         this.clientTags = requireNonNull(clientTags, "clientTags is null");
         this.clientCapabilities = requireNonNull(clientCapabilities, "clientCapabilities is null");
         this.source = requireNonNull(source, "source is null");
+        this.timezone = requireNonNull(timezone, "timezone is null");
         this.catalog = requireNonNull(catalog, "catalog is null");
         this.schema = requireNonNull(schema, "schema is null");
         this.resourceGroupId = requireNonNull(resourceGroupId, "resourceGroupId is null");
@@ -110,12 +119,24 @@ public String getUser()
         return user;
     }
 
+    @JsonProperty
+    public String getOriginalUser()
+    {
+        return originalUser;
+    }
+
     @JsonProperty
     public Optional<String> getPrincipal()
     {
         return principal;
     }
 
+    @JsonProperty
+    public Set<String> getEnabledRoles()
+    {
+        return enabledRoles;
+    }
+
     @JsonProperty
     public Set<String> getGroups()
     {
@@ -164,6 +185,12 @@ public Optional<String> getSource()
         return source;
     }
 
+    @JsonProperty
+    public String getTimezone()
+    {
+        return timezone;
+    }
+
     @JsonProperty
     public Optional<String> getCatalog()
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryInputMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryInputMetadata.java
index c413d93473bf..2218fabdc5ad 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryInputMetadata.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryInputMetadata.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.Unstable;
+import io.trino.spi.connector.CatalogHandle.CatalogVersion;
 import io.trino.spi.metrics.Metrics;
 
 import java.util.List;
@@ -30,6 +31,7 @@
 public class QueryInputMetadata
 {
     private final String catalogName;
+    private final CatalogVersion catalogVersion;
     private final String schema;
     private final String table;
     private final List<String> columns;
@@ -40,7 +42,9 @@ public class QueryInputMetadata
 
     @JsonCreator
     @Unstable
-    public QueryInputMetadata(String catalogName,
+    public QueryInputMetadata(
+            String catalogName,
+            CatalogVersion catalogVersion,
             String schema,
             String table,
             List<String> columns,
@@ -50,6 +54,7 @@ public QueryInputMetadata(String catalogName,
             OptionalLong physicalInputRows)
     {
         this.catalogName = requireNonNull(catalogName, "catalogName is null");
+        this.catalogVersion = requireNonNull(catalogVersion, "catalogVersion is null");
         this.schema = requireNonNull(schema, "schema is null");
         this.table = requireNonNull(table, "table is null");
         this.columns = requireNonNull(columns, "columns is null");
@@ -65,6 +70,12 @@ public String getCatalogName()
         return catalogName;
     }
 
+    @JsonProperty
+    public CatalogVersion getCatalogVersion()
+    {
+        return catalogVersion;
+    }
+
     @JsonProperty
     public String getSchema()
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryOutputMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryOutputMetadata.java
index 7e36c09dd31d..d663695873de 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryOutputMetadata.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryOutputMetadata.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.Unstable;
+import io.trino.spi.connector.CatalogHandle.CatalogVersion;
 
 import java.util.List;
 import java.util.Optional;
@@ -28,6 +29,7 @@
 public class QueryOutputMetadata
 {
     private final String catalogName;
+    private final CatalogVersion catalogVersion;
     private final String schema;
     private final String table;
     private final Optional<List<OutputColumnMetadata>> columns;
@@ -37,8 +39,9 @@ public class QueryOutputMetadata
 
     @JsonCreator
     @Unstable
-    public QueryOutputMetadata(String catalogName, String schema, String table, Optional<List<OutputColumnMetadata>> columns, Optional<String> connectorOutputMetadata, Optional<Boolean> jsonLengthLimitExceeded)
+    public QueryOutputMetadata(String catalogName, CatalogVersion catalogVersion, String schema, String table, Optional<List<OutputColumnMetadata>> columns, Optional<String> connectorOutputMetadata, Optional<Boolean> jsonLengthLimitExceeded)
     {
+        this.catalogVersion = requireNonNull(catalogVersion, "catalogVersion is null");
         this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.schema = requireNonNull(schema, "schema is null");
         this.table = requireNonNull(table, "table is null");
@@ -53,6 +56,12 @@ public String getCatalogName()
         return catalogName;
     }
 
+    @JsonProperty
+    public CatalogVersion getCatalogVersion()
+    {
+        return catalogVersion;
+    }
+
     @JsonProperty
     public String getSchema()
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryStatistics.java b/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryStatistics.java
index 08cd9011b407..0180262654e8 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryStatistics.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/eventlistener/QueryStatistics.java
@@ -37,6 +37,7 @@ public class QueryStatistics
     private final Optional<Duration> resourceWaitingTime;
     private final Optional<Duration> analysisTime;
     private final Optional<Duration> planningTime;
+    private final Optional<Duration> planningCpuTime;
     private final Optional<Duration> executionTime;
     private final Optional<Duration> inputBlockedTime;
     private final Optional<Duration> failedInputBlockedTime;
@@ -96,6 +97,7 @@ public QueryStatistics(
             Optional<Duration> resourceWaitingTime,
             Optional<Duration> analysisTime,
             Optional<Duration> planningTime,
+            Optional<Duration> planningCpuTime,
             Optional<Duration> executionTime,
             Optional<Duration> inputBlockedTime,
             Optional<Duration> failedInputBlockedTime,
@@ -138,6 +140,7 @@ public QueryStatistics(
         this.resourceWaitingTime = requireNonNull(resourceWaitingTime, "resourceWaitingTime is null");
         this.analysisTime = requireNonNull(analysisTime, "analysisTime is null");
         this.planningTime = requireNonNull(planningTime, "planningTime is null");
+        this.planningCpuTime = requireNonNull(planningCpuTime, "planningCpuTime is null");
         this.executionTime = requireNonNull(executionTime, "executionTime is null");
         this.inputBlockedTime = requireNonNull(inputBlockedTime, "inputBlockedTime is null");
         this.failedInputBlockedTime = requireNonNull(failedInputBlockedTime, "failedInputBlockedTime is null");
@@ -226,6 +229,12 @@ public Optional<Duration> getPlanningTime()
         return planningTime;
     }
 
+    @JsonProperty
+    public Optional<Duration> getPlanningCpuTime()
+    {
+        return planningCpuTime;
+    }
+
     @JsonProperty
     public Optional<Duration> getExecutionTime()
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/Exchange.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/Exchange.java
index 650b729560ea..911aa8daf0c2 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/exchange/Exchange.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/exchange/Exchange.java
@@ -13,18 +13,22 @@
  */
 package io.trino.spi.exchange;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.spi.Experimental;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.io.Closeable;
 import java.util.concurrent.CompletableFuture;
 
 @ThreadSafe
-@Experimental(eta = "2023-01-01")
+@Experimental(eta = "2024-03-01")
 public interface Exchange
         extends Closeable
 {
+    enum SourceHandlesDeliveryMode {
+        STANDARD,
+        EAGER
+    }
+
     /**
      * Get id of this exchange
      */
@@ -95,6 +99,23 @@ public interface Exchange
      */
     ExchangeSourceHandleSource getSourceHandles();
 
+    /**
+     * Change {@link ExchangeSourceHandleSource} delivery mode.
+     * <p>
+     * In {@link SourceHandlesDeliveryMode#STANDARD} mode the handles are delivered at
+     * pace optimized for throughput.
+     * <p>
+     * In {@link SourceHandlesDeliveryMode#EAGER} the handles are delivered as soon as possible even if that would mean
+     * each handle corresponds to smaller amount of data, which may be not optimal from throughput.
+     * <p>
+     * There are no strict constraints regarding when this method can be called. When called, the newly selected delivery mode
+     * will apply to all {@link ExchangeSourceHandleSource} instances already obtained via {@link #getSourceHandles()} method.
+     * As well as to those yet to be obtained.
+     * <p>
+     * Support for this method is optional and best-effort.
+     */
+    default void setSourceHandlesDeliveryMode(SourceHandlesDeliveryMode sourceHandlesDeliveryMode) {}
+
     @Override
     void close();
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeContext.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeContext.java
index 38fd8807d35c..2f3a1604d64f 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeContext.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeContext.java
@@ -18,7 +18,7 @@
 
 import static java.util.Objects.requireNonNull;
 
-@Experimental(eta = "2023-01-01")
+@Experimental(eta = "2023-09-01")
 public class ExchangeContext
 {
     private final QueryId queryId;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeId.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeId.java
index 77b51ef0a1fb..0e7daf373ac3 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeId.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeId.java
@@ -25,7 +25,7 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.UUID.randomUUID;
 
-@Experimental(eta = "2023-01-01")
+@Experimental(eta = "2023-09-01")
 public class ExchangeId
 {
     private static final long INSTANCE_SIZE = instanceSize(ExchangeId.class);
diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeManager.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeManager.java
index ca9c6d1c836c..431904072539 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeManager.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeManager.java
@@ -13,11 +13,10 @@
  */
 package io.trino.spi.exchange;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.slice.Slice;
 import io.trino.spi.Experimental;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 /**
  * Service provider interface for an external exchange
  * <p>
@@ -38,7 +37,7 @@
  * data written by other instances must be safely discarded
  */
 @ThreadSafe
-@Experimental(eta = "2023-01-01")
+@Experimental(eta = "2023-09-01")
 public interface ExchangeManager
 {
     /**
@@ -74,6 +73,11 @@ public interface ExchangeManager
      */
     ExchangeSource createSource();
 
+    /**
+     * Provides information if Exchange implementation provided with this plugin supports concurrent reading and writing.
+     */
+    boolean supportsConcurrentReadAndWrite();
+
     /**
      * Shutdown the exchange manager by releasing any held resources such as
      * threads, sockets, etc. This method will only be called when no
diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeManagerFactory.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeManagerFactory.java
index e8b724bb5658..25b299b86aa7 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeManagerFactory.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeManagerFactory.java
@@ -17,7 +17,7 @@
 
 import java.util.Map;
 
-@Experimental(eta = "2023-01-01")
+@Experimental(eta = "2023-09-01")
 public interface ExchangeManagerFactory
 {
     String getName();
diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeManagerHandleResolver.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeManagerHandleResolver.java
index 0a359340b3ce..58484e065f39 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeManagerHandleResolver.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeManagerHandleResolver.java
@@ -15,7 +15,7 @@
 
 import io.trino.spi.Experimental;
 
-@Experimental(eta = "2023-01-01")
+@Experimental(eta = "2023-09-01")
 public interface ExchangeManagerHandleResolver
 {
     Class<? extends ExchangeSinkInstanceHandle> getExchangeSinkInstanceHandleClass();
diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSink.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSink.java
index d4198241382e..6cf893baafcb 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSink.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSink.java
@@ -13,15 +13,14 @@
  */
 package io.trino.spi.exchange;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.slice.Slice;
 import io.trino.spi.Experimental;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.concurrent.CompletableFuture;
 
 @ThreadSafe
-@Experimental(eta = "2023-01-01")
+@Experimental(eta = "2023-09-01")
 public interface ExchangeSink
 {
     CompletableFuture<Void> NOT_BLOCKED = CompletableFuture.completedFuture(null);
diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSinkHandle.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSinkHandle.java
index 9485647650a3..2c9d0de98323 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSinkHandle.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSinkHandle.java
@@ -18,7 +18,7 @@
 /*
  * Implementation is expected to be Jackson serializable
  */
-@Experimental(eta = "2023-01-01")
+@Experimental(eta = "2023-09-01")
 public interface ExchangeSinkHandle
 {
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSinkInstanceHandle.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSinkInstanceHandle.java
index c02865842f86..cee6657750b4 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSinkInstanceHandle.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSinkInstanceHandle.java
@@ -15,7 +15,7 @@
 
 import io.trino.spi.Experimental;
 
-@Experimental(eta = "2023-01-01")
+@Experimental(eta = "2023-09-01")
 public interface ExchangeSinkInstanceHandle
 {
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSource.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSource.java
index 6e2db4e7fff9..039788af0216 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSource.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSource.java
@@ -13,18 +13,17 @@
  */
 package io.trino.spi.exchange;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.slice.Slice;
 import io.trino.spi.Experimental;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.io.Closeable;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 @ThreadSafe
-@Experimental(eta = "2023-01-01")
+@Experimental(eta = "2023-09-01")
 public interface ExchangeSource
         extends Closeable
 {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSourceHandle.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSourceHandle.java
index 0e5cfbb7518c..e37b506b3bce 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSourceHandle.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSourceHandle.java
@@ -18,7 +18,7 @@
 /*
  * Implementation is expected to be Jackson serializable
  */
-@Experimental(eta = "2023-01-01")
+@Experimental(eta = "2023-09-01")
 public interface ExchangeSourceHandle
 {
     int getPartitionId();
diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSourceStatistics.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSourceStatistics.java
index 2fcbb4e58f00..20ee790db21e 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSourceStatistics.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSourceStatistics.java
@@ -15,7 +15,7 @@
 
 import io.trino.spi.Experimental;
 
-@Experimental(eta = "2023-01-01")
+@Experimental(eta = "2023-09-01")
 public class ExchangeSourceStatistics
 {
     private final long sizeInBytes;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/expression/Constant.java b/core/trino-spi/src/main/java/io/trino/spi/expression/Constant.java
index aad723864288..f950aae04901 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/expression/Constant.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/expression/Constant.java
@@ -16,8 +16,7 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.type.BooleanType;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/AggregationFunction.java b/core/trino-spi/src/main/java/io/trino/spi/function/AggregationFunction.java
index 86accb021b61..3ec2c8395ab4 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/AggregationFunction.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/AggregationFunction.java
@@ -13,6 +13,8 @@
  */
 package io.trino.spi.function;
 
+import com.google.errorprone.annotations.Keep;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -20,6 +22,7 @@
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+@Keep
 @Retention(RUNTIME)
 @Target({TYPE, METHOD})
 public @interface AggregationFunction
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/BoundSignature.java b/core/trino-spi/src/main/java/io/trino/spi/function/BoundSignature.java
index 6100ca8058ef..85287d185217 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/BoundSignature.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/BoundSignature.java
@@ -28,13 +28,13 @@
 @Experimental(eta = "2022-10-31")
 public class BoundSignature
 {
-    private final String name;
+    private final CatalogSchemaFunctionName name;
     private final Type returnType;
     private final List<Type> argumentTypes;
 
     @JsonCreator
     public BoundSignature(
-            @JsonProperty("name") String name,
+            @JsonProperty("name") CatalogSchemaFunctionName name,
             @JsonProperty("returnType") Type returnType,
             @JsonProperty("argumentTypes") List<Type> argumentTypes)
     {
@@ -43,8 +43,11 @@ public BoundSignature(
         this.argumentTypes = List.copyOf(requireNonNull(argumentTypes, "argumentTypes is null"));
     }
 
+    /**
+     * The absolute canonical name of the function.
+     */
     @JsonProperty
-    public String getName()
+    public CatalogSchemaFunctionName getName()
     {
         return name;
     }
@@ -74,7 +77,6 @@ public List<Type> getArgumentTypes()
     public Signature toSignature()
     {
         return Signature.builder()
-                .name(name)
                 .returnType(returnType)
                 .argumentTypes(argumentTypes.stream()
                         .map(Type::getTypeSignature)
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/CatalogSchemaFunctionName.java b/core/trino-spi/src/main/java/io/trino/spi/function/CatalogSchemaFunctionName.java
new file mode 100644
index 000000000000..65de16525c15
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/CatalogSchemaFunctionName.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed 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 io.trino.spi.function;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+import static java.util.Locale.ROOT;
+import static java.util.Objects.requireNonNull;
+
+public final class CatalogSchemaFunctionName
+{
+    private final String catalogName;
+    private final SchemaFunctionName schemaFunctionName;
+
+    public CatalogSchemaFunctionName(String catalogName, SchemaFunctionName schemaFunctionName)
+    {
+        this.catalogName = catalogName.toLowerCase(ROOT);
+        if (catalogName.isEmpty()) {
+            throw new IllegalArgumentException("catalogName is empty");
+        }
+        this.schemaFunctionName = requireNonNull(schemaFunctionName, "schemaFunctionName is null");
+    }
+
+    @JsonCreator
+    public CatalogSchemaFunctionName(
+            @JsonProperty String catalogName,
+            @JsonProperty String schemaName,
+            @JsonProperty String functionName)
+    {
+        this(catalogName, new SchemaFunctionName(schemaName, functionName));
+    }
+
+    @JsonProperty
+    public String getCatalogName()
+    {
+        return catalogName;
+    }
+
+    public SchemaFunctionName getSchemaFunctionName()
+    {
+        return schemaFunctionName;
+    }
+
+    @JsonProperty
+    public String getSchemaName()
+    {
+        return schemaFunctionName.getSchemaName();
+    }
+
+    @JsonProperty
+    public String getFunctionName()
+    {
+        return schemaFunctionName.getFunctionName();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CatalogSchemaFunctionName that = (CatalogSchemaFunctionName) o;
+        return Objects.equals(catalogName, that.catalogName) &&
+                Objects.equals(schemaFunctionName, that.schemaFunctionName);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(catalogName, schemaFunctionName);
+    }
+
+    @Override
+    public String toString()
+    {
+        return catalogName + '.' + schemaFunctionName;
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/FlatFixed.java b/core/trino-spi/src/main/java/io/trino/spi/function/FlatFixed.java
new file mode 100644
index 000000000000..042dd6e90f7f
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/FlatFixed.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed 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 io.trino.spi.function;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface FlatFixed {}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/FlatFixedOffset.java b/core/trino-spi/src/main/java/io/trino/spi/function/FlatFixedOffset.java
new file mode 100644
index 000000000000..9d4a6860c75d
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/FlatFixedOffset.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.spi.function;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface FlatFixedOffset
+{
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/FlatVariableWidth.java b/core/trino-spi/src/main/java/io/trino/spi/function/FlatVariableWidth.java
new file mode 100644
index 000000000000..32882518a412
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/FlatVariableWidth.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.spi.function;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface FlatVariableWidth
+{
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/FunctionDependencies.java b/core/trino-spi/src/main/java/io/trino/spi/function/FunctionDependencies.java
index b3f27a4c1ced..8a27710349d0 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/FunctionDependencies.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/FunctionDependencies.java
@@ -24,15 +24,15 @@ public interface FunctionDependencies
 {
     Type getType(TypeSignature typeSignature);
 
-    FunctionNullability getFunctionNullability(QualifiedFunctionName name, List<Type> parameterTypes);
+    FunctionNullability getFunctionNullability(CatalogSchemaFunctionName name, List<Type> parameterTypes);
 
     FunctionNullability getOperatorNullability(OperatorType operatorType, List<Type> parameterTypes);
 
     FunctionNullability getCastNullability(Type fromType, Type toType);
 
-    ScalarFunctionImplementation getScalarFunctionImplementation(QualifiedFunctionName name, List<Type> parameterTypes, InvocationConvention invocationConvention);
+    ScalarFunctionImplementation getScalarFunctionImplementation(CatalogSchemaFunctionName name, List<Type> parameterTypes, InvocationConvention invocationConvention);
 
-    ScalarFunctionImplementation getScalarFunctionImplementationSignature(QualifiedFunctionName name, List<TypeSignature> parameterTypes, InvocationConvention invocationConvention);
+    ScalarFunctionImplementation getScalarFunctionImplementationSignature(CatalogSchemaFunctionName name, List<TypeSignature> parameterTypes, InvocationConvention invocationConvention);
 
     ScalarFunctionImplementation getOperatorImplementation(OperatorType operatorType, List<Type> parameterTypes, InvocationConvention invocationConvention);
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/FunctionDependencyDeclaration.java b/core/trino-spi/src/main/java/io/trino/spi/function/FunctionDependencyDeclaration.java
index f376d69b3f2e..382a9a8db3a6 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/FunctionDependencyDeclaration.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/FunctionDependencyDeclaration.java
@@ -13,6 +13,8 @@
  */
 package io.trino.spi.function;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.Experimental;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignature;
@@ -25,7 +27,6 @@
 
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toUnmodifiableList;
 
 @Experimental(eta = "2022-10-31")
 public class FunctionDependencyDeclaration
@@ -54,26 +55,40 @@ private FunctionDependencyDeclaration(
         this.castDependencies = Set.copyOf(requireNonNull(castDependencies, "castDependencies is null"));
     }
 
+    @JsonProperty
     public Set<TypeSignature> getTypeDependencies()
     {
         return typeDependencies;
     }
 
+    @JsonProperty
     public Set<FunctionDependency> getFunctionDependencies()
     {
         return functionDependencies;
     }
 
+    @JsonProperty
     public Set<OperatorDependency> getOperatorDependencies()
     {
         return operatorDependencies;
     }
 
+    @JsonProperty
     public Set<CastDependency> getCastDependencies()
     {
         return castDependencies;
     }
 
+    @JsonCreator
+    public static FunctionDependencyDeclaration fromJson(
+            @JsonProperty Set<TypeSignature> typeDependencies,
+            @JsonProperty Set<FunctionDependency> functionDependencies,
+            @JsonProperty Set<OperatorDependency> operatorDependencies,
+            @JsonProperty Set<CastDependency> castDependencies)
+    {
+        return new FunctionDependencyDeclaration(typeDependencies, functionDependencies, operatorDependencies, castDependencies);
+    }
+
     public static final class FunctionDependencyDeclarationBuilder
     {
         private final Set<TypeSignature> typeDependencies = new LinkedHashSet<>();
@@ -89,32 +104,32 @@ public FunctionDependencyDeclarationBuilder addType(TypeSignature typeSignature)
             return this;
         }
 
-        public FunctionDependencyDeclarationBuilder addFunction(QualifiedFunctionName name, List<Type> parameterTypes)
+        public FunctionDependencyDeclarationBuilder addFunction(CatalogSchemaFunctionName name, List<Type> parameterTypes)
         {
             functionDependencies.add(new FunctionDependency(name, parameterTypes.stream()
                     .map(Type::getTypeSignature)
-                    .collect(toUnmodifiableList()), false));
+                    .toList(), false));
             return this;
         }
 
-        public FunctionDependencyDeclarationBuilder addFunctionSignature(QualifiedFunctionName name, List<TypeSignature> parameterTypes)
+        public FunctionDependencyDeclarationBuilder addFunctionSignature(CatalogSchemaFunctionName name, List<TypeSignature> parameterTypes)
         {
             functionDependencies.add(new FunctionDependency(name, parameterTypes, false));
             return this;
         }
 
-        public FunctionDependencyDeclarationBuilder addOptionalFunction(QualifiedFunctionName name, List<Type> parameterTypes)
+        public FunctionDependencyDeclarationBuilder addOptionalFunction(CatalogSchemaFunctionName name, List<Type> parameterTypes)
         {
             functionDependencies.add(new FunctionDependency(
                     name,
                     parameterTypes.stream()
                             .map(Type::getTypeSignature)
-                            .collect(toUnmodifiableList()),
+                            .toList(),
                     true));
             return this;
         }
 
-        public FunctionDependencyDeclarationBuilder addOptionalFunctionSignature(QualifiedFunctionName name, List<TypeSignature> parameterTypes)
+        public FunctionDependencyDeclarationBuilder addOptionalFunctionSignature(CatalogSchemaFunctionName name, List<TypeSignature> parameterTypes)
         {
             functionDependencies.add(new FunctionDependency(name, parameterTypes, true));
             return this;
@@ -124,7 +139,7 @@ public FunctionDependencyDeclarationBuilder addOperator(OperatorType operatorTyp
         {
             operatorDependencies.add(new OperatorDependency(operatorType, parameterTypes.stream()
                     .map(Type::getTypeSignature)
-                    .collect(toUnmodifiableList()), false));
+                    .toList(), false));
             return this;
         }
 
@@ -140,7 +155,7 @@ public FunctionDependencyDeclarationBuilder addOptionalOperator(OperatorType ope
                     operatorType,
                     parameterTypes.stream()
                             .map(Type::getTypeSignature)
-                            .collect(toUnmodifiableList()),
+                            .toList(),
                     true));
             return this;
         }
@@ -187,32 +202,44 @@ public FunctionDependencyDeclaration build()
 
     public static final class FunctionDependency
     {
-        private final QualifiedFunctionName name;
+        private final CatalogSchemaFunctionName name;
         private final List<TypeSignature> argumentTypes;
         private final boolean optional;
 
-        private FunctionDependency(QualifiedFunctionName name, List<TypeSignature> argumentTypes, boolean optional)
+        private FunctionDependency(CatalogSchemaFunctionName name, List<TypeSignature> argumentTypes, boolean optional)
         {
             this.name = requireNonNull(name, "name is null");
             this.argumentTypes = List.copyOf(requireNonNull(argumentTypes, "argumentTypes is null"));
             this.optional = optional;
         }
 
-        public QualifiedFunctionName getName()
+        @JsonProperty
+        public CatalogSchemaFunctionName getName()
         {
             return name;
         }
 
+        @JsonProperty
         public List<TypeSignature> getArgumentTypes()
         {
             return argumentTypes;
         }
 
+        @JsonProperty
         public boolean isOptional()
         {
             return optional;
         }
 
+        @JsonCreator
+        public static FunctionDependency fromJson(
+                @JsonProperty CatalogSchemaFunctionName name,
+                @JsonProperty List<TypeSignature> argumentTypes,
+                @JsonProperty boolean optional)
+        {
+            return new FunctionDependency(name, argumentTypes, optional);
+        }
+
         @Override
         public boolean equals(Object o)
         {
@@ -255,21 +282,33 @@ private OperatorDependency(OperatorType operatorType, List<TypeSignature> argume
             this.optional = optional;
         }
 
+        @JsonProperty
         public OperatorType getOperatorType()
         {
             return operatorType;
         }
 
+        @JsonProperty
         public List<TypeSignature> getArgumentTypes()
         {
             return argumentTypes;
         }
 
+        @JsonProperty
         public boolean isOptional()
         {
             return optional;
         }
 
+        @JsonCreator
+        public static OperatorDependency fromJson(
+                @JsonProperty OperatorType operatorType,
+                @JsonProperty List<TypeSignature> argumentTypes,
+                @JsonProperty boolean optional)
+        {
+            return new OperatorDependency(operatorType, argumentTypes, optional);
+        }
+
         @Override
         public boolean equals(Object o)
         {
@@ -312,21 +351,33 @@ private CastDependency(TypeSignature fromType, TypeSignature toType, boolean opt
             this.optional = optional;
         }
 
+        @JsonProperty
         public TypeSignature getFromType()
         {
             return fromType;
         }
 
+        @JsonProperty
         public TypeSignature getToType()
         {
             return toType;
         }
 
+        @JsonProperty
         public boolean isOptional()
         {
             return optional;
         }
 
+        @JsonCreator
+        public static CastDependency fromJson(
+                @JsonProperty TypeSignature fromType,
+                @JsonProperty TypeSignature toType,
+                @JsonProperty boolean optional)
+        {
+            return new CastDependency(fromType, toType, optional);
+        }
+
         @Override
         public boolean equals(Object o)
         {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/FunctionId.java b/core/trino-spi/src/main/java/io/trino/spi/function/FunctionId.java
index d78bee164bc2..f688c7c74698 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/FunctionId.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/FunctionId.java
@@ -68,8 +68,8 @@ public String toString()
         return id;
     }
 
-    public static FunctionId toFunctionId(Signature signature)
+    public static FunctionId toFunctionId(String canonicalName, Signature signature)
     {
-        return new FunctionId(signature.toString().toLowerCase(Locale.US));
+        return new FunctionId((canonicalName + signature).toLowerCase(Locale.US));
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/FunctionMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/function/FunctionMetadata.java
index f233faca1027..312ffc94c805 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/FunctionMetadata.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/FunctionMetadata.java
@@ -13,11 +13,15 @@
  */
 package io.trino.spi.function;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.spi.Experimental;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import static io.trino.spi.function.FunctionKind.AGGREGATE;
 import static io.trino.spi.function.FunctionKind.SCALAR;
@@ -27,9 +31,13 @@
 @Experimental(eta = "2022-10-31")
 public class FunctionMetadata
 {
+    // Copied from OperatorNameUtil
+    private static final String OPERATOR_PREFIX = "$operator$";
+
     private final FunctionId functionId;
     private final Signature signature;
     private final String canonicalName;
+    private final Set<String> names;
     private final FunctionNullability functionNullability;
     private final boolean hidden;
     private final boolean deterministic;
@@ -41,6 +49,7 @@ private FunctionMetadata(
             FunctionId functionId,
             Signature signature,
             String canonicalName,
+            Set<String> names,
             FunctionNullability functionNullability,
             boolean hidden,
             boolean deterministic,
@@ -51,6 +60,10 @@ private FunctionMetadata(
         this.functionId = requireNonNull(functionId, "functionId is null");
         this.signature = requireNonNull(signature, "signature is null");
         this.canonicalName = requireNonNull(canonicalName, "canonicalName is null");
+        this.names = Set.copyOf(names);
+        if (!names.contains(canonicalName)) {
+            throw new IllegalArgumentException("names must contain the canonical name");
+        }
         this.functionNullability = requireNonNull(functionNullability, "functionNullability is null");
         if (functionNullability.getArgumentNullable().size() != signature.getArgumentTypes().size()) {
             throw new IllegalArgumentException("signature and functionNullability must have same argument count");
@@ -65,8 +78,8 @@ private FunctionMetadata(
 
     /**
      * Unique id of this function.
-     * For aliased functions, each alias must have a different alias.
      */
+    @JsonProperty
     public FunctionId getFunctionId()
     {
         return functionId;
@@ -74,82 +87,131 @@ public FunctionId getFunctionId()
 
     /**
      * Signature of a matching call site.
-     * For aliased functions, the signature must use the alias name.
      */
+    @JsonProperty
     public Signature getSignature()
     {
         return signature;
     }
 
     /**
-     * For aliased functions, the canonical name of the function.
+     * The canonical name of the function.
      */
+    @JsonProperty
     public String getCanonicalName()
     {
         return canonicalName;
     }
 
+    /**
+     * Canonical name and any aliases.
+     */
+    @JsonProperty
+    public Set<String> getNames()
+    {
+        return names;
+    }
+
+    @JsonProperty
     public FunctionNullability getFunctionNullability()
     {
         return functionNullability;
     }
 
+    @JsonProperty
     public boolean isHidden()
     {
         return hidden;
     }
 
+    @JsonProperty
     public boolean isDeterministic()
     {
         return deterministic;
     }
 
+    @JsonProperty
     public String getDescription()
     {
         return description;
     }
 
+    @JsonProperty
     public FunctionKind getKind()
     {
         return kind;
     }
 
+    @JsonProperty
     public boolean isDeprecated()
     {
         return deprecated;
     }
 
+    @JsonCreator
+    public static FunctionMetadata fromJson(
+            @JsonProperty FunctionId functionId,
+            @JsonProperty Signature signature,
+            @JsonProperty String canonicalName,
+            @JsonProperty Set<String> names,
+            @JsonProperty FunctionNullability functionNullability,
+            @JsonProperty boolean hidden,
+            @JsonProperty boolean deterministic,
+            @JsonProperty String description,
+            @JsonProperty FunctionKind kind,
+            @JsonProperty boolean deprecated)
+    {
+        return new FunctionMetadata(
+                functionId,
+                signature,
+                canonicalName,
+                names,
+                functionNullability,
+                hidden,
+                deterministic,
+                description,
+                kind,
+                deprecated);
+    }
+
     @Override
     public String toString()
     {
         return signature.toString();
     }
 
-    public static Builder scalarBuilder()
+    public static Builder scalarBuilder(String canonicalName)
     {
-        return builder(SCALAR);
+        return builder(canonicalName, SCALAR);
     }
 
-    public static Builder aggregateBuilder()
+    public static Builder operatorBuilder(OperatorType operatorType)
     {
-        return builder(AGGREGATE);
+        String name = OPERATOR_PREFIX + requireNonNull(operatorType, "operatorType is null").name();
+        return builder(name, SCALAR);
     }
 
-    public static Builder windowBuilder()
+    public static Builder aggregateBuilder(String canonicalName)
     {
-        return builder(WINDOW);
+        return builder(canonicalName, AGGREGATE);
     }
 
-    public static Builder builder(FunctionKind functionKind)
+    public static Builder windowBuilder(String canonicalName)
     {
-        return new Builder(functionKind);
+        return builder(canonicalName, WINDOW);
+    }
+
+    public static Builder builder(String canonicalName, FunctionKind functionKind)
+    {
+        return new Builder(canonicalName, functionKind);
     }
 
     public static final class Builder
     {
+        private final String canonicalName;
         private final FunctionKind kind;
         private Signature signature;
-        private String canonicalName;
+        private final Set<String> names = new HashSet<>();
         private boolean nullable;
         private List<Boolean> argumentNullability;
         private boolean hidden;
@@ -158,8 +220,14 @@ public static final class Builder
         private FunctionId functionId;
         private boolean deprecated;
 
-        private Builder(FunctionKind kind)
+        private Builder(String canonicalName, FunctionKind kind)
         {
+            this.canonicalName = requireNonNull(canonicalName, "canonicalName is null");
+            names.add(canonicalName);
+            if (canonicalName.startsWith(OPERATOR_PREFIX)) {
+                hidden = true;
+                description = "";
+            }
             this.kind = kind;
             if (kind == AGGREGATE || kind == WINDOW) {
                 nullable = true;
@@ -169,16 +237,12 @@ private Builder(FunctionKind kind)
         public Builder signature(Signature signature)
         {
             this.signature = signature;
-            if (signature.isOperator()) {
-                hidden = true;
-                description = "";
-            }
             return this;
         }
 
-        public Builder canonicalName(String canonicalName)
+        public Builder alias(String alias)
         {
-            this.canonicalName = canonicalName;
+            names.add(alias);
             return this;
         }
 
@@ -251,10 +315,7 @@ public FunctionMetadata build()
         {
             FunctionId functionId = this.functionId;
             if (functionId == null) {
-                functionId = FunctionId.toFunctionId(signature);
-            }
-            if (canonicalName == null) {
-                canonicalName = signature.getName();
+                functionId = FunctionId.toFunctionId(canonicalName, signature);
             }
             if (argumentNullability == null) {
                 argumentNullability = Collections.nCopies(signature.getArgumentTypes().size(), kind == WINDOW);
@@ -263,6 +324,7 @@ public FunctionMetadata build()
                     functionId,
                     signature,
                     canonicalName,
+                    names,
                     new FunctionNullability(nullable, argumentNullability),
                     hidden,
                     deterministic,
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/FunctionProvider.java b/core/trino-spi/src/main/java/io/trino/spi/function/FunctionProvider.java
index 30e9a7c189eb..7bfbdc3ef7fb 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/FunctionProvider.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/FunctionProvider.java
@@ -14,7 +14,8 @@
 package io.trino.spi.function;
 
 import io.trino.spi.Experimental;
-import io.trino.spi.ptf.TableFunctionProcessorProvider;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
 
 @Experimental(eta = "2023-03-31")
 public interface FunctionProvider
@@ -38,7 +39,7 @@ default WindowFunctionSupplier getWindowFunctionSupplier(FunctionId functionId,
         throw new UnsupportedOperationException("%s does not provide window functions".formatted(getClass().getName()));
     }
 
-    default TableFunctionProcessorProvider getTableFunctionProcessorProvider(SchemaFunctionName name)
+    default TableFunctionProcessorProvider getTableFunctionProcessorProvider(ConnectorTableFunctionHandle functionHandle)
     {
         throw new UnsupportedOperationException("%s does not provide table functions".formatted(getClass().getName()));
     }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/InputFunction.java b/core/trino-spi/src/main/java/io/trino/spi/function/InputFunction.java
index 7e7463f952f3..02baff4c8572 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/InputFunction.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/InputFunction.java
@@ -13,12 +13,15 @@
  */
 package io.trino.spi.function;
 
+import com.google.errorprone.annotations.Keep;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+@Keep
 @Retention(RUNTIME)
 @Target(METHOD)
 public @interface InputFunction
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/InvocationConvention.java b/core/trino-spi/src/main/java/io/trino/spi/function/InvocationConvention.java
index b9db00fdb52a..a494839c5253 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/InvocationConvention.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/InvocationConvention.java
@@ -109,6 +109,19 @@ public enum InvocationArgumentConvention
          * Argument must not be a boxed type. Argument will never be null.
          */
         NEVER_NULL(false, 1),
+        /**
+         * Argument is passed a Block followed by the integer position in the block.
+         * If the actual block position passed to the function argument is null, the
+         * results are undefined.
+         */
+        BLOCK_POSITION_NOT_NULL(false, 2),
+        /**
+         * Argument is passed a ValueBlock followed by the integer position in the block.
+         * The actual block parameter may be any subtype of ValueBlock, and the scalar function
+         * adapter will convert the parameter to ValueBlock. If the actual block position
+         * passed to the function argument is null, the results are undefined.
+         */
+        VALUE_BLOCK_POSITION_NOT_NULL(false, 2),
         /**
          * Argument is always an object type. An SQL null will be passed a Java null.
          */
@@ -119,10 +132,20 @@ public enum InvocationArgumentConvention
          */
         NULL_FLAG(true, 2),
         /**
-         * Argument is passed a Block followed by the integer position in the block.  The
+         * Argument is passed a Block followed by the integer position in the block. The
          * sql value may be null.
          */
         BLOCK_POSITION(true, 2),
+        /**
+         * Argument is passed a ValueBlock followed by the integer position in the block.
+         * The actual block parameter may be any subtype of ValueBlock, and the scalar function
+         * adapter will convert the parameter to ValueBlock. The sql value may be null.
+         */
+        VALUE_BLOCK_POSITION(true, 2),
+        /**
+         * Argument is passed as a flat slice. The sql value may not be null.
+         */
+        FLAT(false, 3),
         /**
          * Argument is passed in an InOut. The sql value may be null.
          */
@@ -154,19 +177,60 @@ public int getParameterCount()
 
     public enum InvocationReturnConvention
     {
-        FAIL_ON_NULL(false),
-        NULLABLE_RETURN(true);
+        /**
+         * The function will never return a null value.
+         * It is not possible to adapt a NEVER_NULL argument to a
+         * BOXED_NULLABLE or NULL_FLAG argument when this return
+         * convention is used.
+         */
+        FAIL_ON_NULL(false, 0),
+        /**
+         * When a null is passed to a never null argument, the function
+         * will not be invoked, and the Java default value for the return
+         * type will be returned.
+         * This can not be used as an actual function return convention,
+         * and instead is only used for adaptation.
+         */
+        DEFAULT_ON_NULL(false, 0),
+        /**
+         * The function may return a null value.
+         * When a null is passed to a never null argument, the function
+         * will not be invoked, and a null value is returned.
+         */
+        NULLABLE_RETURN(true, 0),
+        /**
+         * Return value is witten to a BlockBuilder passed as the last argument.
+         * When a null is passed to a never null argument, the function
+         * will not be invoked, and a null is written to the block builder.
+         */
+        BLOCK_BUILDER(true, 1),
+        /**
+         * Return value is written to flat memory passed as the last 5
+         * arguments to the function.
+         * It is not possible to adapt a NEVER_NULL argument to a
+         * BOXED_NULLABLE or NULL_FLAG argument when this return
+         * convention is used.
+         */
+        FLAT_RETURN(false, 4),
+        /**/;
 
         private final boolean nullable;
+        private final int parameterCount;
 
-        InvocationReturnConvention(boolean nullable)
+        InvocationReturnConvention(boolean nullable, int parameterCount)
         {
             this.nullable = nullable;
+            this.parameterCount = parameterCount;
         }
 
         public boolean isNullable()
         {
             return nullable;
         }
+
+        public int getParameterCount()
+        {
+            return parameterCount;
+        }
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/LanguageFunction.java b/core/trino-spi/src/main/java/io/trino/spi/function/LanguageFunction.java
new file mode 100644
index 000000000000..710a585ce947
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/LanguageFunction.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed 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 io.trino.spi.function;
+
+import io.trino.spi.connector.CatalogSchemaName;
+
+import java.util.List;
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public record LanguageFunction(
+        String signatureToken,
+        String sql,
+        List<CatalogSchemaName> path,
+        Optional<String> owner)
+{
+    public LanguageFunction
+    {
+        requireNonNull(signatureToken, "signatureToken is null");
+        requireNonNull(sql, "sql is null");
+        path = List.copyOf(requireNonNull(path, "path is null"));
+        requireNonNull(owner, "owner is null");
+    }
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/OperatorMethodHandle.java b/core/trino-spi/src/main/java/io/trino/spi/function/OperatorMethodHandle.java
index 1304c318894d..0575a08fe4f5 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/OperatorMethodHandle.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/OperatorMethodHandle.java
@@ -15,6 +15,8 @@
 
 import java.lang.invoke.MethodHandle;
 
+import static java.util.Objects.requireNonNull;
+
 public class OperatorMethodHandle
 {
     private final InvocationConvention callingConvention;
@@ -22,8 +24,8 @@ public class OperatorMethodHandle
 
     public OperatorMethodHandle(InvocationConvention callingConvention, MethodHandle methodHandle)
     {
-        this.callingConvention = callingConvention;
-        this.methodHandle = methodHandle;
+        this.callingConvention = requireNonNull(callingConvention, "callingConvention is null");
+        this.methodHandle = requireNonNull(methodHandle, "methodHandle is null");
     }
 
     public InvocationConvention getCallingConvention()
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/OperatorType.java b/core/trino-spi/src/main/java/io/trino/spi/function/OperatorType.java
index f2cf5b321d36..c86be88034fc 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/OperatorType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/OperatorType.java
@@ -38,7 +38,9 @@ public enum OperatorType
     SATURATED_FLOOR_CAST("SATURATED FLOOR CAST", 1),
     IS_DISTINCT_FROM("IS DISTINCT FROM", 2),
     XX_HASH_64("XX HASH 64", 1),
-    INDETERMINATE("INDETERMINATE", 1);
+    INDETERMINATE("INDETERMINATE", 1),
+    READ_VALUE("READ VALUE", 1),
+    /**/;
 
     private final String operator;
     private final int argumentCount;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/OutputFunction.java b/core/trino-spi/src/main/java/io/trino/spi/function/OutputFunction.java
index b9a03580ccc7..008081277ea5 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/OutputFunction.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/OutputFunction.java
@@ -13,12 +13,15 @@
  */
 package io.trino.spi.function;
 
+import com.google.errorprone.annotations.Keep;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+@Keep
 @Retention(RUNTIME)
 @Target(METHOD)
 public @interface OutputFunction
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/QualifiedFunctionName.java b/core/trino-spi/src/main/java/io/trino/spi/function/QualifiedFunctionName.java
deleted file mode 100644
index 70a2f0da3487..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/function/QualifiedFunctionName.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.function;
-
-import io.trino.spi.Experimental;
-
-import java.util.Objects;
-import java.util.Optional;
-
-import static java.util.Objects.requireNonNull;
-
-@Experimental(eta = "2022-10-31")
-public class QualifiedFunctionName
-{
-    private final Optional<String> catalogName;
-    private final Optional<String> schemaName;
-    private final String functionName;
-
-    public static QualifiedFunctionName of(String functionName)
-    {
-        return new QualifiedFunctionName(Optional.empty(), Optional.empty(), functionName);
-    }
-
-    public static QualifiedFunctionName of(String schemaName, String functionName)
-    {
-        return new QualifiedFunctionName(Optional.empty(), Optional.of(schemaName), functionName);
-    }
-
-    public static QualifiedFunctionName of(String catalogName, String schemaName, String functionName)
-    {
-        return new QualifiedFunctionName(Optional.of(catalogName), Optional.of(schemaName), functionName);
-    }
-
-    private QualifiedFunctionName(Optional<String> catalogName, Optional<String> schemaName, String functionName)
-    {
-        this.catalogName = requireNonNull(catalogName, "catalogName is null");
-        if (catalogName.map(String::isEmpty).orElse(false)) {
-            throw new IllegalArgumentException("catalogName is empty");
-        }
-        this.schemaName = requireNonNull(schemaName, "schemaName is null");
-        if (schemaName.map(String::isEmpty).orElse(false)) {
-            throw new IllegalArgumentException("schemaName is empty");
-        }
-        if (catalogName.isPresent() && schemaName.isEmpty()) {
-            throw new IllegalArgumentException("Schema name must be provided when catalog name is provided");
-        }
-        this.functionName = requireNonNull(functionName, "functionName is null");
-        if (functionName.isEmpty()) {
-            throw new IllegalArgumentException("functionName is empty");
-        }
-    }
-
-    public Optional<String> getCatalogName()
-    {
-        return catalogName;
-    }
-
-    public Optional<String> getSchemaName()
-    {
-        return schemaName;
-    }
-
-    public String getFunctionName()
-    {
-        return functionName;
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        QualifiedFunctionName that = (QualifiedFunctionName) o;
-        return catalogName.equals(that.catalogName) &&
-                schemaName.equals(that.schemaName) &&
-                functionName.equals(that.functionName);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(catalogName, schemaName, functionName);
-    }
-
-    @Override
-    public String toString()
-    {
-        return catalogName.map(name -> name + ".").orElse("") +
-                schemaName.map(name -> name + ".").orElse("") +
-                functionName;
-    }
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/RemoveInputFunction.java b/core/trino-spi/src/main/java/io/trino/spi/function/RemoveInputFunction.java
index f8d030755e94..08eaef711431 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/RemoveInputFunction.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/RemoveInputFunction.java
@@ -13,12 +13,15 @@
  */
 package io.trino.spi.function;
 
+import com.google.errorprone.annotations.Keep;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+@Keep
 @Retention(RUNTIME)
 @Target(METHOD)
 public @interface RemoveInputFunction
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/ScalarFunction.java b/core/trino-spi/src/main/java/io/trino/spi/function/ScalarFunction.java
index 9a2bec8516b6..c3ca1707f6bd 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/ScalarFunction.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/ScalarFunction.java
@@ -13,6 +13,8 @@
  */
 package io.trino.spi.function;
 
+import com.google.errorprone.annotations.Keep;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -20,6 +22,7 @@
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+@Keep
 @Retention(RUNTIME)
 @Target({METHOD, TYPE})
 public @interface ScalarFunction
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/ScalarFunctionAdapter.java b/core/trino-spi/src/main/java/io/trino/spi/function/ScalarFunctionAdapter.java
index ff87e9b1358d..27b3e9385181 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/ScalarFunctionAdapter.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/ScalarFunctionAdapter.java
@@ -18,59 +18,88 @@
 import io.trino.spi.StandardErrorCode;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.InvocationConvention.InvocationArgumentConvention;
 import io.trino.spi.function.InvocationConvention.InvocationReturnConvention;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
 
 import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.IntStream;
 
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FUNCTION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.IN_OUT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NULL_FLAG;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.DEFAULT_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
-import static io.trino.spi.function.ScalarFunctionAdapter.NullAdaptationPolicy.RETURN_NULL_ON_NULL;
-import static io.trino.spi.function.ScalarFunctionAdapter.NullAdaptationPolicy.THROW_ON_NULL;
-import static io.trino.spi.function.ScalarFunctionAdapter.NullAdaptationPolicy.UNDEFINED_VALUE_FOR_NULL;
-import static io.trino.spi.function.ScalarFunctionAdapter.NullAdaptationPolicy.UNSUPPORTED;
 import static java.lang.invoke.MethodHandles.collectArguments;
-import static java.lang.invoke.MethodHandles.constant;
 import static java.lang.invoke.MethodHandles.dropArguments;
+import static java.lang.invoke.MethodHandles.empty;
 import static java.lang.invoke.MethodHandles.explicitCastArguments;
 import static java.lang.invoke.MethodHandles.filterArguments;
-import static java.lang.invoke.MethodHandles.filterReturnValue;
 import static java.lang.invoke.MethodHandles.guardWithTest;
 import static java.lang.invoke.MethodHandles.identity;
 import static java.lang.invoke.MethodHandles.insertArguments;
 import static java.lang.invoke.MethodHandles.lookup;
 import static java.lang.invoke.MethodHandles.permuteArguments;
-import static java.lang.invoke.MethodHandles.publicLookup;
 import static java.lang.invoke.MethodHandles.throwException;
 import static java.lang.invoke.MethodType.methodType;
 import static java.util.Objects.requireNonNull;
 
 public final class ScalarFunctionAdapter
 {
-    private static final MethodHandle IS_NULL_METHOD = lookupIsNullMethod();
+    private static final MethodHandle OBJECT_IS_NULL_METHOD;
+    private static final MethodHandle APPEND_NULL_METHOD;
+    private static final MethodHandle BLOCK_IS_NULL_METHOD;
+    private static final MethodHandle IN_OUT_IS_NULL_METHOD;
+    private static final MethodHandle GET_UNDERLYING_VALUE_BLOCK_METHOD;
+    private static final MethodHandle GET_UNDERLYING_VALUE_POSITION_METHOD;
+    private static final MethodHandle NEW_NEVER_NULL_IS_NULL_EXCEPTION;
+    // This is needed to convert flat arguments to stack types
+    private static final TypeOperators READ_VALUE_TYPE_OPERATORS = new TypeOperators();
+
+    static {
+        try {
+            MethodHandles.Lookup lookup = lookup();
+            OBJECT_IS_NULL_METHOD = lookup.findStatic(Objects.class, "isNull", methodType(boolean.class, Object.class));
+            APPEND_NULL_METHOD = lookup.findVirtual(BlockBuilder.class, "appendNull", methodType(BlockBuilder.class))
+                    .asType(methodType(void.class, BlockBuilder.class));
+            BLOCK_IS_NULL_METHOD = lookup.findVirtual(Block.class, "isNull", methodType(boolean.class, int.class));
+            IN_OUT_IS_NULL_METHOD = lookup.findVirtual(InOut.class, "isNull", methodType(boolean.class));
 
-    private final NullAdaptationPolicy nullAdaptationPolicy;
+            GET_UNDERLYING_VALUE_BLOCK_METHOD = lookup().findVirtual(Block.class, "getUnderlyingValueBlock", methodType(ValueBlock.class));
+            GET_UNDERLYING_VALUE_POSITION_METHOD = lookup().findVirtual(Block.class, "getUnderlyingValuePosition", methodType(int.class, int.class));
 
-    public ScalarFunctionAdapter(NullAdaptationPolicy nullAdaptationPolicy)
-    {
-        this.nullAdaptationPolicy = requireNonNull(nullAdaptationPolicy, "nullAdaptationPolicy is null");
+            NEW_NEVER_NULL_IS_NULL_EXCEPTION = lookup.findConstructor(TrinoException.class, methodType(void.class, ErrorCodeSupplier.class, String.class))
+                    .bindTo(StandardErrorCode.INVALID_FUNCTION_ARGUMENT)
+                    .bindTo("A never null argument is null");
+        }
+        catch (ReflectiveOperationException e) {
+            throw new ExceptionInInitializerError(e);
+        }
     }
 
+    private ScalarFunctionAdapter() {}
+
     /**
      * Can the actual calling convention of a method be converted to the expected calling convention?
      */
-    public boolean canAdapt(InvocationConvention actualConvention, InvocationConvention expectedConvention)
+    public static boolean canAdapt(InvocationConvention actualConvention, InvocationConvention expectedConvention)
     {
         requireNonNull(actualConvention, "actualConvention is null");
         requireNonNull(expectedConvention, "expectedConvention is null");
@@ -103,7 +132,7 @@ public boolean canAdapt(InvocationConvention actualConvention, InvocationConvent
         return true;
     }
 
-    private boolean canAdaptReturn(
+    private static boolean canAdaptReturn(
             InvocationReturnConvention actualReturnConvention,
             InvocationReturnConvention expectedReturnConvention)
     {
@@ -111,27 +140,15 @@ private boolean canAdaptReturn(
             return true;
         }
 
-        if (expectedReturnConvention == NULLABLE_RETURN && actualReturnConvention == FAIL_ON_NULL) {
-            return true;
-        }
-
-        if (expectedReturnConvention == FAIL_ON_NULL && actualReturnConvention == NULLABLE_RETURN) {
-            switch (nullAdaptationPolicy) {
-                case THROW_ON_NULL:
-                case UNDEFINED_VALUE_FOR_NULL:
-                    return true;
-                case UNSUPPORTED:
-                case RETURN_NULL_ON_NULL:
-                    return false;
-                default:
-                    return false;
-            }
-        }
-
-        return false;
+        return switch (actualReturnConvention) {
+            case FAIL_ON_NULL -> expectedReturnConvention != FLAT_RETURN;
+            case NULLABLE_RETURN -> expectedReturnConvention.isNullable() || expectedReturnConvention == DEFAULT_ON_NULL;
+            case BLOCK_BUILDER, FLAT_RETURN -> false;
+            case DEFAULT_ON_NULL -> throw new IllegalArgumentException("actual return convention cannot be DEFAULT_ON_NULL");
+        };
     }
 
-    private boolean canAdaptParameter(
+    private static boolean canAdaptParameter(
             InvocationArgumentConvention actualArgumentConvention,
             InvocationArgumentConvention expectedArgumentConvention,
             InvocationReturnConvention returnConvention)
@@ -141,49 +158,45 @@ private boolean canAdaptParameter(
             return true;
         }
 
-        // no conversions to block and position, function, or in-out are supported
-        if (actualArgumentConvention == BLOCK_POSITION || actualArgumentConvention == FUNCTION || actualArgumentConvention == IN_OUT) {
+        // function cannot be adapted
+        if (expectedArgumentConvention == FUNCTION || actualArgumentConvention == FUNCTION) {
             return false;
         }
 
-        // caller will never pass null, so all conversions are allowed
-        if (expectedArgumentConvention == NEVER_NULL) {
-            return true;
-        }
-
-        // nulls are passed in blocks or in-out values, so adapter will handle null or throw exception at runtime
-        if (expectedArgumentConvention == BLOCK_POSITION || expectedArgumentConvention == IN_OUT) {
-            return true;
-        }
-
-        // null is passed as boxed value or a boolean null flag
-        if (expectedArgumentConvention == BOXED_NULLABLE || expectedArgumentConvention == NULL_FLAG) {
-            // null able to not nullable has special handling
-            if (actualArgumentConvention == NEVER_NULL) {
-                switch (nullAdaptationPolicy) {
-                    case THROW_ON_NULL:
-                    case UNDEFINED_VALUE_FOR_NULL:
-                        return true;
-                    case RETURN_NULL_ON_NULL:
-                        return returnConvention != FAIL_ON_NULL;
-                    case UNSUPPORTED:
-                        return false;
-                    default:
-                        return false;
-                }
-            }
-
-            return true;
-        }
-
-        return false;
+        return switch (actualArgumentConvention) {
+            case NEVER_NULL -> switch (expectedArgumentConvention) {
+                case BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION_NOT_NULL, FLAT -> true;
+                case BOXED_NULLABLE, NULL_FLAG -> returnConvention != FAIL_ON_NULL;
+                case BLOCK_POSITION, VALUE_BLOCK_POSITION, IN_OUT -> true; // todo only support these if the return convention is nullable
+                case FUNCTION -> throw new IllegalStateException("Unexpected value: " + expectedArgumentConvention);
+                // this is not needed as the case where actual and expected are the same is covered above,
+                // but this means we will get a compile time error if a new convention is added in the future
+                //noinspection DataFlowIssue
+                case NEVER_NULL -> true;
+            };
+            case BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION_NOT_NULL -> switch (expectedArgumentConvention) {
+                case BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION_NOT_NULL -> true;
+                case BLOCK_POSITION, VALUE_BLOCK_POSITION -> returnConvention.isNullable() || returnConvention == DEFAULT_ON_NULL;
+                case NEVER_NULL, NULL_FLAG, BOXED_NULLABLE, FLAT, IN_OUT -> false;
+                case FUNCTION -> throw new IllegalStateException("Unexpected value: " + expectedArgumentConvention);
+            };
+            case BLOCK_POSITION, VALUE_BLOCK_POSITION -> switch (expectedArgumentConvention) {
+                case BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION_NOT_NULL, BLOCK_POSITION, VALUE_BLOCK_POSITION -> true;
+                case NEVER_NULL, NULL_FLAG, BOXED_NULLABLE, FLAT, IN_OUT -> false;
+                case FUNCTION -> throw new IllegalStateException("Unexpected value: " + expectedArgumentConvention);
+            };
+            case BOXED_NULLABLE, NULL_FLAG -> true;
+            case FLAT, IN_OUT -> false;
+            case FUNCTION -> throw new IllegalArgumentException("Unsupported argument convention: " + actualArgumentConvention);
+        };
     }
 
     /**
      * Adapt the method handle from the actual calling convention of a method be converted to the expected calling convention?
      */
-    public MethodHandle adapt(
+    public static MethodHandle adapt(
             MethodHandle methodHandle,
+            Type returnType,
             List<Type> actualArgumentTypes,
             InvocationConvention actualConvention,
             InvocationConvention expectedConvention)
@@ -196,14 +209,14 @@ public MethodHandle adapt(
         }
 
         if (actualConvention.supportsSession() && !expectedConvention.supportsSession()) {
-            throw new IllegalArgumentException("Session method can not be adapted to no session");
+            throw new IllegalArgumentException("Session method cannot be adapted to no session");
         }
         if (!(expectedConvention.supportsInstanceFactory() || !actualConvention.supportsInstanceFactory())) {
-            throw new IllegalArgumentException("Instance method can not be adapted to no instance");
+            throw new IllegalArgumentException("Instance method cannot be adapted to no instance");
         }
 
         // adapt return first, since return-null-on-null parameter convention must know if the return type is nullable
-        methodHandle = adaptReturn(methodHandle, actualConvention.getReturnConvention(), expectedConvention.getReturnConvention());
+        methodHandle = adaptReturn(methodHandle, returnType, actualConvention.getReturnConvention(), expectedConvention.getReturnConvention());
 
         // adapt parameters one at a time
         int parameterIndex = 0;
@@ -226,16 +239,14 @@ public MethodHandle adapt(
                     actualArgumentConvention,
                     expectedArgumentConvention,
                     expectedConvention.getReturnConvention());
-            parameterIndex++;
-            if (expectedArgumentConvention == NULL_FLAG || expectedArgumentConvention == BLOCK_POSITION) {
-                parameterIndex++;
-            }
+            parameterIndex += expectedArgumentConvention.getParameterCount();
         }
         return methodHandle;
     }
 
-    private MethodHandle adaptReturn(
+    private static MethodHandle adaptReturn(
             MethodHandle methodHandle,
+            Type returnType,
             InvocationReturnConvention actualReturnConvention,
             InvocationReturnConvention expectedReturnConvention)
     {
@@ -243,42 +254,46 @@ private MethodHandle adaptReturn(
             return methodHandle;
         }
 
-        Class<?> returnType = methodHandle.type().returnType();
         if (expectedReturnConvention == NULLABLE_RETURN) {
             if (actualReturnConvention == FAIL_ON_NULL) {
                 // box return
-                return explicitCastArguments(methodHandle, methodHandle.type().changeReturnType(wrap(returnType)));
+                return explicitCastArguments(methodHandle, methodHandle.type().changeReturnType(wrap(methodHandle.type().returnType())));
             }
         }
 
-        if (expectedReturnConvention == FAIL_ON_NULL) {
-            if (actualReturnConvention == NULLABLE_RETURN) {
-                if (nullAdaptationPolicy == UNSUPPORTED || nullAdaptationPolicy == RETURN_NULL_ON_NULL) {
-                    throw new IllegalArgumentException("Nullable return can not be adapted fail on null");
-                }
-
-                if (nullAdaptationPolicy == UNDEFINED_VALUE_FOR_NULL) {
-                    // currently, we just perform unboxing, which converts nulls to Java primitive default value
-                    methodHandle = explicitCastArguments(methodHandle, methodHandle.type().changeReturnType(unwrap(returnType)));
-                    return methodHandle;
-                }
+        if (expectedReturnConvention == BLOCK_BUILDER) {
+            // write the result to block builder
+            // type.writeValue(BlockBuilder, value), f(a,b)::value => method(BlockBuilder, a, b)::void
+            methodHandle = collectArguments(writeBlockValue(returnType), 1, methodHandle);
+            // f(BlockBuilder, a, b)::void => f(a, b, BlockBuilder)
+            MethodType newType = methodHandle.type()
+                    .dropParameterTypes(0, 1)
+                    .appendParameterTypes(BlockBuilder.class);
+            int[] reorder = IntStream.range(0, newType.parameterCount())
+                    .map(i -> i > 0 ? i - 1 : newType.parameterCount() - 1)
+                    .toArray();
+            methodHandle = permuteArguments(methodHandle, newType, reorder);
+            return methodHandle;
+        }
 
-                if (nullAdaptationPolicy == THROW_ON_NULL) {
-                    MethodHandle adapter = identity(returnType);
-                    adapter = explicitCastArguments(adapter, adapter.type().changeReturnType(unwrap(returnType)));
-                    adapter = guardWithTest(
-                            isNullArgument(adapter.type(), 0),
-                            throwTrinoNullArgumentException(adapter.type()),
-                            adapter);
+        if (expectedReturnConvention == FAIL_ON_NULL && actualReturnConvention == NULLABLE_RETURN) {
+            throw new IllegalArgumentException("Nullable return cannot be adapted fail on null");
+        }
 
-                    return filterReturnValue(methodHandle, adapter);
-                }
+        if (expectedReturnConvention == DEFAULT_ON_NULL) {
+            if (actualReturnConvention == FAIL_ON_NULL) {
+                return methodHandle;
+            }
+            if (actualReturnConvention == NULLABLE_RETURN) {
+                // perform unboxing, which converts nulls to Java primitive default value
+                methodHandle = explicitCastArguments(methodHandle, methodHandle.type().changeReturnType(unwrap(returnType.getJavaType())));
+                return methodHandle;
             }
         }
-        throw new IllegalArgumentException("Unsupported return convention: " + actualReturnConvention);
+        throw new IllegalArgumentException("%s return convention cannot be adapted to %s".formatted(actualReturnConvention, expectedReturnConvention));
     }
 
-    private MethodHandle adaptParameter(
+    private static MethodHandle adaptParameter(
             MethodHandle methodHandle,
             int parameterIndex,
             Type argumentType,
@@ -286,18 +301,23 @@ private MethodHandle adaptParameter(
             InvocationArgumentConvention expectedArgumentConvention,
             InvocationReturnConvention returnConvention)
     {
+        // For value block, cast specialized parameter to ValueBlock
+        if (actualArgumentConvention == VALUE_BLOCK_POSITION || actualArgumentConvention == VALUE_BLOCK_POSITION_NOT_NULL && methodHandle.type().parameterType(parameterIndex) != ValueBlock.class) {
+            methodHandle = methodHandle.asType(methodHandle.type().changeParameterType(parameterIndex, ValueBlock.class));
+        }
+
         if (actualArgumentConvention == expectedArgumentConvention) {
             return methodHandle;
         }
-        if (actualArgumentConvention == BLOCK_POSITION) {
-            throw new IllegalArgumentException("Block and position argument cannot be adapted");
-        }
         if (actualArgumentConvention == IN_OUT) {
             throw new IllegalArgumentException("In-out argument cannot be adapted");
         }
-        if (actualArgumentConvention == FUNCTION) {
+        if (actualArgumentConvention == FUNCTION || expectedArgumentConvention == FUNCTION) {
             throw new IllegalArgumentException("Function argument cannot be adapted");
         }
+        if (actualArgumentConvention == FLAT) {
+            throw new IllegalArgumentException("Flat argument cannot be adapted");
+        }
 
         // caller will never pass null
         if (expectedArgumentConvention == NEVER_NULL) {
@@ -311,56 +331,33 @@ private MethodHandle adaptParameter(
             }
 
             if (actualArgumentConvention == NULL_FLAG) {
-                // actual method takes value and null flag, so change method handle to not have the flag and always pass false to the actual method
+                // actual method takes value and null flag, so change method handles to not have the flag and always pass false to the actual method
                 return insertArguments(methodHandle, parameterIndex + 1, false);
             }
-
-            throw new IllegalArgumentException("Unsupported actual argument convention: " + actualArgumentConvention);
         }
 
         // caller will pass Java null for SQL null
         if (expectedArgumentConvention == BOXED_NULLABLE) {
             if (actualArgumentConvention == NEVER_NULL) {
-                if (nullAdaptationPolicy == UNSUPPORTED) {
-                    throw new IllegalArgumentException("Not null argument can not be adapted to nullable");
-                }
-
                 // box argument
                 Class<?> boxedType = wrap(methodHandle.type().parameterType(parameterIndex));
                 MethodType targetType = methodHandle.type().changeParameterType(parameterIndex, boxedType);
                 methodHandle = explicitCastArguments(methodHandle, targetType);
 
-                if (nullAdaptationPolicy == UNDEFINED_VALUE_FOR_NULL) {
-                    // currently, we just perform unboxing, which converts nulls to Java primitive default value
-                    return methodHandle;
-                }
-
-                if (nullAdaptationPolicy == RETURN_NULL_ON_NULL) {
-                    if (returnConvention == FAIL_ON_NULL) {
-                        throw new IllegalArgumentException("RETURN_NULL_ON_NULL adaptation can not be used with FAIL_ON_NULL return convention");
-                    }
-                    return guardWithTest(
-                            isNullArgument(methodHandle.type(), parameterIndex),
-                            returnNull(methodHandle.type()),
-                            methodHandle);
-                }
-
-                if (nullAdaptationPolicy == THROW_ON_NULL) {
-                    MethodType adapterType = methodType(boxedType, boxedType);
-                    MethodHandle adapter = guardWithTest(
-                            isNullArgument(adapterType, 0),
-                            throwTrinoNullArgumentException(adapterType),
-                            identity(boxedType));
-
-                    return collectArguments(methodHandle, parameterIndex, adapter);
+                if (returnConvention == FAIL_ON_NULL) {
+                    throw new IllegalArgumentException("RETURN_NULL_ON_NULL adaptation cannot be used with FAIL_ON_NULL return convention");
                 }
+                return guardWithTest(
+                        isNullArgument(methodHandle.type(), parameterIndex),
+                        getNullShortCircuitResult(methodHandle, returnConvention),
+                        methodHandle);
             }
 
             if (actualArgumentConvention == NULL_FLAG) {
                 // The conversion is described below in reverse order as this is how method handle adaptation works.  The provided example
                 // signature is based on a boxed Long argument.
 
-                // 3. unbox the value (if null the java default is sent)
+                // 3. unbox the value (if null, the java default is sent)
                 // long, boolean => Long, boolean
                 Class<?> parameterType = methodHandle.type().parameterType(parameterIndex);
                 methodHandle = explicitCastArguments(methodHandle, methodHandle.type().changeParameterType(parameterIndex, wrap(parameterType)));
@@ -370,7 +367,7 @@ private MethodHandle adaptParameter(
                 methodHandle = filterArguments(
                         methodHandle,
                         parameterIndex + 1,
-                        explicitCastArguments(IS_NULL_METHOD, methodType(boolean.class, wrap(parameterType))));
+                        explicitCastArguments(OBJECT_IS_NULL_METHOD, methodType(boolean.class, wrap(parameterType))));
 
                 // 1. Duplicate the argument, so we have two copies of the value
                 // Long, Long => Long
@@ -381,116 +378,94 @@ private MethodHandle adaptParameter(
                 methodHandle = permuteArguments(methodHandle, newType, reorder);
                 return methodHandle;
             }
-
-            throw new IllegalArgumentException("Unsupported actual argument convention: " + actualArgumentConvention);
         }
 
         // caller will pass boolean true in the next argument for SQL null
         if (expectedArgumentConvention == NULL_FLAG) {
             if (actualArgumentConvention == NEVER_NULL) {
-                if (nullAdaptationPolicy == UNSUPPORTED) {
-                    throw new IllegalArgumentException("Not null argument can not be adapted to nullable");
+                // if caller sets the null flag, return null, otherwise invoke target
+                if (returnConvention == FAIL_ON_NULL) {
+                    throw new IllegalArgumentException("RETURN_NULL_ON_NULL adaptation cannot be used with FAIL_ON_NULL return convention");
                 }
+                // add a null flag to call
+                methodHandle = dropArguments(methodHandle, parameterIndex + 1, boolean.class);
 
-                if (nullAdaptationPolicy == UNDEFINED_VALUE_FOR_NULL) {
-                    // add null flag to call
-                    methodHandle = dropArguments(methodHandle, parameterIndex + 1, boolean.class);
-                    return methodHandle;
-                }
-
-                // if caller sets null flag, return null, otherwise invoke target
-                if (nullAdaptationPolicy == RETURN_NULL_ON_NULL) {
-                    if (returnConvention == FAIL_ON_NULL) {
-                        throw new IllegalArgumentException("RETURN_NULL_ON_NULL adaptation can not be used with FAIL_ON_NULL return convention");
-                    }
-                    // add null flag to call
-                    methodHandle = dropArguments(methodHandle, parameterIndex + 1, boolean.class);
-                    return guardWithTest(
-                            isTrueNullFlag(methodHandle.type(), parameterIndex),
-                            returnNull(methodHandle.type()),
-                            methodHandle);
-                }
-
-                if (nullAdaptationPolicy == THROW_ON_NULL) {
-                    MethodHandle adapter = identity(methodHandle.type().parameterType(parameterIndex));
-                    adapter = dropArguments(adapter, 1, boolean.class);
-                    adapter = guardWithTest(
-                            isTrueNullFlag(adapter.type(), 0),
-                            throwTrinoNullArgumentException(adapter.type()),
-                            adapter);
-
-                    return collectArguments(methodHandle, parameterIndex, adapter);
-                }
+                return guardWithTest(
+                        isTrueNullFlag(methodHandle.type(), parameterIndex),
+                        getNullShortCircuitResult(methodHandle, returnConvention),
+                        methodHandle);
             }
 
             if (actualArgumentConvention == BOXED_NULLABLE) {
                 return collectArguments(methodHandle, parameterIndex, boxedToNullFlagFilter(methodHandle.type().parameterType(parameterIndex)));
             }
+        }
+
+        if (expectedArgumentConvention == BLOCK_POSITION_NOT_NULL) {
+            if (actualArgumentConvention == VALUE_BLOCK_POSITION_NOT_NULL || actualArgumentConvention == VALUE_BLOCK_POSITION) {
+                return adaptValueBlockArgumentToBlock(methodHandle, parameterIndex);
+            }
 
-            throw new IllegalArgumentException("Unsupported actual argument convention: " + actualArgumentConvention);
+            return adaptParameterToBlockPositionNotNull(methodHandle, parameterIndex, argumentType, actualArgumentConvention, expectedArgumentConvention, returnConvention);
+        }
+
+        if (expectedArgumentConvention == VALUE_BLOCK_POSITION_NOT_NULL) {
+            if (actualArgumentConvention == VALUE_BLOCK_POSITION) {
+                return methodHandle;
+            }
+
+            methodHandle = adaptParameterToBlockPositionNotNull(methodHandle, parameterIndex, argumentType, actualArgumentConvention, expectedArgumentConvention, returnConvention);
+            methodHandle = methodHandle.asType(methodHandle.type().changeParameterType(parameterIndex, ValueBlock.class));
+            return methodHandle;
         }
 
         // caller passes block and position which may contain a null
         if (expectedArgumentConvention == BLOCK_POSITION) {
-            MethodHandle getBlockValue = getBlockValue(argumentType, methodHandle.type().parameterType(parameterIndex));
-
-            if (actualArgumentConvention == NEVER_NULL) {
-                if (nullAdaptationPolicy == UNDEFINED_VALUE_FOR_NULL) {
-                    // Current, null is not checked, so whatever type returned is passed through
-                    methodHandle = collectArguments(methodHandle, parameterIndex, getBlockValue);
-                    return methodHandle;
-                }
+            // convert ValueBlock argument to Block
+            if (actualArgumentConvention == VALUE_BLOCK_POSITION || actualArgumentConvention == VALUE_BLOCK_POSITION_NOT_NULL) {
+                adaptValueBlockArgumentToBlock(methodHandle, parameterIndex);
+                methodHandle = adaptValueBlockArgumentToBlock(methodHandle, parameterIndex);
+            }
 
-                if (nullAdaptationPolicy == RETURN_NULL_ON_NULL && returnConvention != FAIL_ON_NULL) {
-                    // if caller sets null flag, return null, otherwise invoke target
-                    methodHandle = collectArguments(methodHandle, parameterIndex, getBlockValue);
-                    return guardWithTest(
-                            isBlockPositionNull(methodHandle.type(), parameterIndex),
-                            returnNull(methodHandle.type()),
-                            methodHandle);
-                }
+            if (actualArgumentConvention == VALUE_BLOCK_POSITION) {
+                return methodHandle;
+            }
 
-                if (nullAdaptationPolicy == THROW_ON_NULL || nullAdaptationPolicy == UNSUPPORTED || nullAdaptationPolicy == RETURN_NULL_ON_NULL) {
-                    MethodHandle adapter = guardWithTest(
-                            isBlockPositionNull(getBlockValue.type(), 0),
-                            throwTrinoNullArgumentException(getBlockValue.type()),
-                            getBlockValue);
+            return adaptParameterToBlockPosition(methodHandle, parameterIndex, argumentType, actualArgumentConvention, expectedArgumentConvention, returnConvention);
+        }
 
-                    return collectArguments(methodHandle, parameterIndex, adapter);
-                }
+        // caller passes value block and position which may contain a null
+        if (expectedArgumentConvention == VALUE_BLOCK_POSITION) {
+            if (actualArgumentConvention != BLOCK_POSITION) {
+                methodHandle = adaptParameterToBlockPosition(methodHandle, parameterIndex, argumentType, actualArgumentConvention, expectedArgumentConvention, returnConvention);
             }
+            methodHandle = methodHandle.asType(methodHandle.type().changeParameterType(parameterIndex, ValueBlock.class));
+            return methodHandle;
+        }
 
-            if (actualArgumentConvention == BOXED_NULLABLE) {
-                getBlockValue = explicitCastArguments(getBlockValue, getBlockValue.type().changeReturnType(wrap(getBlockValue.type().returnType())));
-                getBlockValue = guardWithTest(
-                        isBlockPositionNull(getBlockValue.type(), 0),
-                        returnNull(getBlockValue.type()),
-                        getBlockValue);
-                methodHandle = collectArguments(methodHandle, parameterIndex, getBlockValue);
-                return methodHandle;
+        // caller will pass boolean true in the next argument for SQL null
+        if (expectedArgumentConvention == FLAT) {
+            if (actualArgumentConvention != NEVER_NULL && actualArgumentConvention != BOXED_NULLABLE && actualArgumentConvention != NULL_FLAG) {
+                throw new IllegalArgumentException(actualArgumentConvention + " cannot be adapted to " + expectedArgumentConvention);
             }
 
+            // if the actual method has a null flag, set the flag to false
             if (actualArgumentConvention == NULL_FLAG) {
-                // long, boolean => long, Block, int
-                MethodHandle isNull = isBlockPositionNull(getBlockValue.type(), 0);
-                methodHandle = collectArguments(methodHandle, parameterIndex + 1, isNull);
-
-                // long, Block, int => Block, int, Block, int
-                getBlockValue = guardWithTest(
-                        isBlockPositionNull(getBlockValue.type(), 0),
-                        returnNull(getBlockValue.type()),
-                        getBlockValue);
-                methodHandle = collectArguments(methodHandle, parameterIndex, getBlockValue);
+                // actual method takes value and null flag, so change method handles to not have the flag and always pass false to the actual method
+                methodHandle = insertArguments(methodHandle, parameterIndex + 1, false);
+            }
 
-                int[] reorder = IntStream.range(0, methodHandle.type().parameterCount())
-                        .map(i -> i <= parameterIndex + 1 ? i : i - 2)
-                        .toArray();
-                MethodType newType = methodHandle.type().dropParameterTypes(parameterIndex + 2, parameterIndex + 4);
-                methodHandle = permuteArguments(methodHandle, newType, reorder);
-                return methodHandle;
+            // if the actual method has a boxed argument, change it to accept the unboxed value
+            if (actualArgumentConvention == BOXED_NULLABLE) {
+                // if actual argument is boxed primitive, change method handle to accept a primitive and then box to actual method
+                if (isWrapperType(methodHandle.type().parameterType(parameterIndex))) {
+                    MethodType targetType = methodHandle.type().changeParameterType(parameterIndex, unwrap(methodHandle.type().parameterType(parameterIndex)));
+                    methodHandle = explicitCastArguments(methodHandle, targetType);
+                }
             }
 
-            throw new IllegalArgumentException("Unsupported actual argument convention: " + actualArgumentConvention);
+            // read the value from flat memory
+            return collectArguments(methodHandle, parameterIndex, getFlatValueNeverNull(argumentType, methodHandle.type().parameterType(parameterIndex)));
         }
 
         // caller passes in-out which may contain a null
@@ -498,36 +473,29 @@ private MethodHandle adaptParameter(
             MethodHandle getInOutValue = getInOutValue(argumentType, methodHandle.type().parameterType(parameterIndex));
 
             if (actualArgumentConvention == NEVER_NULL) {
-                if (nullAdaptationPolicy == UNDEFINED_VALUE_FOR_NULL) {
-                    // Current, null is not checked, so whatever value returned is passed through
+                if (returnConvention != FAIL_ON_NULL) {
+                    // if caller sets the null flag, return null, otherwise invoke target
                     methodHandle = collectArguments(methodHandle, parameterIndex, getInOutValue);
-                    return methodHandle;
-                }
 
-                if (nullAdaptationPolicy == RETURN_NULL_ON_NULL && returnConvention != FAIL_ON_NULL) {
-                    // if caller sets null flag, return null, otherwise invoke target
-                    methodHandle = collectArguments(methodHandle, parameterIndex, getInOutValue);
                     return guardWithTest(
                             isInOutNull(methodHandle.type(), parameterIndex),
-                            returnNull(methodHandle.type()),
+                            getNullShortCircuitResult(methodHandle, returnConvention),
                             methodHandle);
                 }
 
-                if (nullAdaptationPolicy == THROW_ON_NULL || nullAdaptationPolicy == UNSUPPORTED || nullAdaptationPolicy == RETURN_NULL_ON_NULL) {
-                    MethodHandle adapter = guardWithTest(
-                            isInOutNull(getInOutValue.type(), 0),
-                            throwTrinoNullArgumentException(getInOutValue.type()),
-                            getInOutValue);
+                MethodHandle adapter = guardWithTest(
+                        isInOutNull(getInOutValue.type(), 0),
+                        throwTrinoNullArgumentException(getInOutValue.type()),
+                        getInOutValue);
 
-                    return collectArguments(methodHandle, parameterIndex, adapter);
-                }
+                return collectArguments(methodHandle, parameterIndex, adapter);
             }
 
             if (actualArgumentConvention == BOXED_NULLABLE) {
                 getInOutValue = explicitCastArguments(getInOutValue, getInOutValue.type().changeReturnType(wrap(getInOutValue.type().returnType())));
                 getInOutValue = guardWithTest(
                         isInOutNull(getInOutValue.type(), 0),
-                        returnNull(getInOutValue.type()),
+                        empty(getInOutValue.type()),
                         getInOutValue);
                 methodHandle = collectArguments(methodHandle, parameterIndex, getInOutValue);
                 return methodHandle;
@@ -541,7 +509,7 @@ private MethodHandle adaptParameter(
                 // long, InOut => InOut, InOut
                 getInOutValue = guardWithTest(
                         isInOutNull(getInOutValue.type(), 0),
-                        returnNull(getInOutValue.type()),
+                        empty(getInOutValue.type()),
                         getInOutValue);
                 methodHandle = collectArguments(methodHandle, parameterIndex, getInOutValue);
 
@@ -553,11 +521,120 @@ private MethodHandle adaptParameter(
                 methodHandle = permuteArguments(methodHandle, newType, reorder);
                 return methodHandle;
             }
+        }
+
+        throw unsupportedArgumentAdaptation(actualArgumentConvention, expectedArgumentConvention, returnConvention);
+    }
 
-            throw new IllegalArgumentException("Unsupported actual argument convention: " + actualArgumentConvention);
+    private static MethodHandle adaptParameterToBlockPosition(MethodHandle methodHandle, int parameterIndex, Type argumentType, InvocationArgumentConvention actualArgumentConvention, InvocationArgumentConvention expectedArgumentConvention, InvocationReturnConvention returnConvention)
+    {
+        MethodHandle getBlockValue = getBlockValue(argumentType, methodHandle.type().parameterType(parameterIndex));
+        if (actualArgumentConvention == NEVER_NULL) {
+            if (returnConvention != FAIL_ON_NULL) {
+                // if caller sets the null flag, return null, otherwise invoke target
+                methodHandle = collectArguments(methodHandle, parameterIndex, getBlockValue);
+
+                return guardWithTest(
+                        isBlockPositionNull(methodHandle.type(), parameterIndex),
+                        getNullShortCircuitResult(methodHandle, returnConvention),
+                        methodHandle);
+            }
+
+            MethodHandle adapter = guardWithTest(
+                    isBlockPositionNull(getBlockValue.type(), 0),
+                    throwTrinoNullArgumentException(getBlockValue.type()),
+                    getBlockValue);
+
+            return collectArguments(methodHandle, parameterIndex, adapter);
         }
 
-        throw new IllegalArgumentException("Unsupported expected argument convention: " + expectedArgumentConvention);
+        if (actualArgumentConvention == BOXED_NULLABLE) {
+            getBlockValue = explicitCastArguments(getBlockValue, getBlockValue.type().changeReturnType(wrap(getBlockValue.type().returnType())));
+            getBlockValue = guardWithTest(
+                    isBlockPositionNull(getBlockValue.type(), 0),
+                    empty(getBlockValue.type()),
+                    getBlockValue);
+            methodHandle = collectArguments(methodHandle, parameterIndex, getBlockValue);
+            return methodHandle;
+        }
+
+        if (actualArgumentConvention == NULL_FLAG) {
+            // long, boolean => long, Block, int
+            MethodHandle isNull = isBlockPositionNull(getBlockValue.type(), 0);
+            methodHandle = collectArguments(methodHandle, parameterIndex + 1, isNull);
+
+            // convert get block value to be null safe
+            getBlockValue = guardWithTest(
+                    isBlockPositionNull(getBlockValue.type(), 0),
+                    empty(getBlockValue.type()),
+                    getBlockValue);
+
+            // long, Block, int => Block, int, Block, int
+            methodHandle = collectArguments(methodHandle, parameterIndex, getBlockValue);
+
+            int[] reorder = IntStream.range(0, methodHandle.type().parameterCount())
+                    .map(i -> i <= parameterIndex + 1 ? i : i - 2)
+                    .toArray();
+            MethodType newType = methodHandle.type().dropParameterTypes(parameterIndex + 2, parameterIndex + 4);
+            methodHandle = permuteArguments(methodHandle, newType, reorder);
+            return methodHandle;
+        }
+
+        if (actualArgumentConvention == BLOCK_POSITION_NOT_NULL || actualArgumentConvention == VALUE_BLOCK_POSITION_NOT_NULL) {
+            if (returnConvention != FAIL_ON_NULL) {
+                MethodHandle nullReturnValue = getNullShortCircuitResult(methodHandle, returnConvention);
+                return guardWithTest(
+                        isBlockPositionNull(methodHandle.type(), parameterIndex),
+                        nullReturnValue,
+                        methodHandle);
+            }
+        }
+        throw unsupportedArgumentAdaptation(actualArgumentConvention, expectedArgumentConvention, returnConvention);
+    }
+
+    private static MethodHandle adaptParameterToBlockPositionNotNull(MethodHandle methodHandle, int parameterIndex, Type argumentType, InvocationArgumentConvention actualArgumentConvention, InvocationArgumentConvention expectedArgumentConvention, InvocationReturnConvention returnConvention)
+    {
+        if (actualArgumentConvention == BLOCK_POSITION || actualArgumentConvention == BLOCK_POSITION_NOT_NULL) {
+            return methodHandle;
+        }
+
+        MethodHandle getBlockValue = getBlockValue(argumentType, methodHandle.type().parameterType(parameterIndex));
+        if (actualArgumentConvention == NEVER_NULL) {
+            return collectArguments(methodHandle, parameterIndex, getBlockValue);
+        }
+        if (actualArgumentConvention == BOXED_NULLABLE) {
+            MethodType targetType = getBlockValue.type().changeReturnType(wrap(getBlockValue.type().returnType()));
+            return collectArguments(methodHandle, parameterIndex, explicitCastArguments(getBlockValue, targetType));
+        }
+        if (actualArgumentConvention == NULL_FLAG) {
+            // actual method takes value and null flag, so change method handles to not have the flag and always pass false to the actual method
+            return collectArguments(insertArguments(methodHandle, parameterIndex + 1, false), parameterIndex, getBlockValue);
+        }
+        throw unsupportedArgumentAdaptation(actualArgumentConvention, expectedArgumentConvention, returnConvention);
+    }
+
+    private static IllegalArgumentException unsupportedArgumentAdaptation(InvocationArgumentConvention actualArgumentConvention, InvocationArgumentConvention expectedArgumentConvention, InvocationReturnConvention returnConvention)
+    {
+        return new IllegalArgumentException("Cannot convert argument %s to %s with return convention %s".formatted(actualArgumentConvention, expectedArgumentConvention, returnConvention));
+    }
+
+    private static MethodHandle adaptValueBlockArgumentToBlock(MethodHandle methodHandle, int parameterIndex)
+    {
+        // someValueBlock, position => valueBlock, position
+        methodHandle = explicitCastArguments(methodHandle, methodHandle.type().changeParameterType(parameterIndex, ValueBlock.class));
+        // valueBlock, position => block, position
+        methodHandle = collectArguments(methodHandle, parameterIndex, GET_UNDERLYING_VALUE_BLOCK_METHOD);
+        // block, position => block, block, position
+        methodHandle = collectArguments(methodHandle, parameterIndex + 1, GET_UNDERLYING_VALUE_POSITION_METHOD);
+
+        // block, block, position => block, position
+        methodHandle = permuteArguments(
+                methodHandle,
+                methodHandle.type().dropParameterTypes(parameterIndex, parameterIndex + 1),
+                IntStream.range(0, methodHandle.type().parameterCount())
+                        .map(i -> i <= parameterIndex ? i : i - 1)
+                        .toArray());
+        return methodHandle;
     }
 
     private static MethodHandle getBlockValue(Type argumentType, Class<?> expectedType)
@@ -591,6 +668,44 @@ else if (methodArgumentType == Slice.class) {
         }
     }
 
+    private static MethodHandle writeBlockValue(Type type)
+    {
+        Class<?> methodArgumentType = type.getJavaType();
+        String getterName;
+        if (methodArgumentType == boolean.class) {
+            getterName = "writeBoolean";
+        }
+        else if (methodArgumentType == long.class) {
+            getterName = "writeLong";
+        }
+        else if (methodArgumentType == double.class) {
+            getterName = "writeDouble";
+        }
+        else if (methodArgumentType == Slice.class) {
+            getterName = "writeSlice";
+        }
+        else {
+            getterName = "writeObject";
+            methodArgumentType = Object.class;
+        }
+
+        try {
+            return lookup().findVirtual(Type.class, getterName, methodType(void.class, BlockBuilder.class, methodArgumentType))
+                    .bindTo(type)
+                    .asType(methodType(void.class, BlockBuilder.class, type.getJavaType()));
+        }
+        catch (ReflectiveOperationException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private static MethodHandle getFlatValueNeverNull(Type argumentType, Class<?> expectedType)
+    {
+        MethodHandle readValueOperator = READ_VALUE_TYPE_OPERATORS.getReadValueOperator(argumentType, InvocationConvention.simpleConvention(FAIL_ON_NULL, FLAT));
+        readValueOperator = explicitCastArguments(readValueOperator, readValueOperator.type().changeReturnType(expectedType));
+        return readValueOperator;
+    }
+
     private static MethodHandle getInOutValue(Type argumentType, Class<?> expectedType)
     {
         Class<?> methodArgumentType = argumentType.getJavaType();
@@ -628,10 +743,10 @@ private static MethodHandle boxedToNullFlagFilter(Class<?> argumentType)
         }
         // Add boolean null flag
         handle = dropArguments(handle, 1, boolean.class);
-        // if flag is true, return null, otherwise invoke identity
+        // if the flag is true, return null, otherwise invoke identity
         return guardWithTest(
                 isTrueNullFlag(handle.type(), 0),
-                returnNull(handle.type()),
+                empty(handle.type()),
                 handle);
     }
 
@@ -643,85 +758,41 @@ private static MethodHandle isTrueNullFlag(MethodType methodType, int index)
     private static MethodHandle isNullArgument(MethodType methodType, int index)
     {
         // Start with Objects.isNull(Object):boolean
-        MethodHandle isNull = IS_NULL_METHOD;
+        MethodHandle isNull = OBJECT_IS_NULL_METHOD;
         // Cast in incoming type: isNull(T):boolean
         isNull = explicitCastArguments(isNull, methodType(boolean.class, methodType.parameterType(index)));
-        // Add extra argument to match expected method type
+        // Add extra argument to match the expected method type
         isNull = permuteArguments(isNull, methodType.changeReturnType(boolean.class), index);
         return isNull;
     }
 
     private static MethodHandle isBlockPositionNull(MethodType methodType, int index)
     {
-        // Start with Objects.isNull(Object):boolean
-        MethodHandle isNull;
-        try {
-            isNull = lookup().findVirtual(Block.class, "isNull", methodType(boolean.class, int.class));
-        }
-        catch (ReflectiveOperationException e) {
-            throw new AssertionError(e);
-        }
-        // Add extra argument to match expected method type
-        isNull = permuteArguments(isNull, methodType.changeReturnType(boolean.class), index, index + 1);
-        return isNull;
+        // Add extra argument to Block.isNull(int):boolean match the expected method type
+        MethodHandle blockIsNull = BLOCK_IS_NULL_METHOD.asType(BLOCK_IS_NULL_METHOD.type().changeParameterType(0, methodType.parameterType(index)));
+        return permuteArguments(blockIsNull, methodType.changeReturnType(boolean.class), index, index + 1);
     }
 
     private static MethodHandle isInOutNull(MethodType methodType, int index)
     {
-        MethodHandle isNull;
-        try {
-            isNull = lookup().findVirtual(InOut.class, "isNull", methodType(boolean.class));
-        }
-        catch (ReflectiveOperationException e) {
-            throw new AssertionError(e);
-        }
-        isNull = permuteArguments(isNull, methodType.changeReturnType(boolean.class), index);
-        return isNull;
+        // Add extra argument to InOut.isNull(int):boolean match the expected method type
+        return permuteArguments(IN_OUT_IS_NULL_METHOD, methodType.changeReturnType(boolean.class), index);
     }
 
-    private static MethodHandle lookupIsNullMethod()
+    private static MethodHandle getNullShortCircuitResult(MethodHandle methodHandle, InvocationReturnConvention returnConvention)
     {
-        MethodHandle isNull;
-        try {
-            isNull = lookup().findStatic(Objects.class, "isNull", methodType(boolean.class, Object.class));
-        }
-        catch (ReflectiveOperationException e) {
-            throw new AssertionError(e);
+        if (returnConvention == BLOCK_BUILDER) {
+            return permuteArguments(APPEND_NULL_METHOD, methodHandle.type(), methodHandle.type().parameterCount() - 1);
         }
-        return isNull;
-    }
-
-    private static MethodHandle returnNull(MethodType methodType)
-    {
-        // Start with a constant null value of the expected return type: f():R
-        MethodHandle returnNull = constant(wrap(methodType.returnType()), null);
-
-        // Add extra argument to match expected method type: f(a, b, c, ..., n):R
-        returnNull = permuteArguments(returnNull, methodType.changeReturnType(wrap(methodType.returnType())));
-
-        // Convert return to a primitive is necessary: f(a, b, c, ..., n):r
-        returnNull = explicitCastArguments(returnNull, methodType);
-        return returnNull;
+        return empty(methodHandle.type());
     }
 
     private static MethodHandle throwTrinoNullArgumentException(MethodType type)
     {
-        MethodHandle throwException = collectArguments(throwException(type.returnType(), TrinoException.class), 0, trinoNullArgumentException());
+        MethodHandle throwException = collectArguments(throwException(type.returnType(), TrinoException.class), 0, NEW_NEVER_NULL_IS_NULL_EXCEPTION);
         return permuteArguments(throwException, type);
     }
 
-    private static MethodHandle trinoNullArgumentException()
-    {
-        try {
-            return publicLookup().findConstructor(TrinoException.class, methodType(void.class, ErrorCodeSupplier.class, String.class))
-                    .bindTo(StandardErrorCode.INVALID_FUNCTION_ARGUMENT)
-                    .bindTo("A never null argument is null");
-        }
-        catch (ReflectiveOperationException e) {
-            throw new AssertionError(e);
-        }
-    }
-
     private static boolean isWrapperType(Class<?> type)
     {
         return type != unwrap(type);
@@ -736,12 +807,4 @@ private static Class<?> unwrap(Class<?> type)
     {
         return methodType(type).unwrap().returnType();
     }
-
-    public enum NullAdaptationPolicy
-    {
-        UNSUPPORTED,
-        THROW_ON_NULL,
-        RETURN_NULL_ON_NULL,
-        UNDEFINED_VALUE_FOR_NULL
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/ScalarOperator.java b/core/trino-spi/src/main/java/io/trino/spi/function/ScalarOperator.java
index a47dcfc64b00..70917a2287cf 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/ScalarOperator.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/ScalarOperator.java
@@ -13,6 +13,8 @@
  */
 package io.trino.spi.function;
 
+import com.google.errorprone.annotations.Keep;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -20,6 +22,7 @@
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+@Keep
 @Retention(RUNTIME)
 @Target({METHOD, TYPE})
 public @interface ScalarOperator
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/SchemaFunctionName.java b/core/trino-spi/src/main/java/io/trino/spi/function/SchemaFunctionName.java
index 1f7e9c33869e..c8c922b83a5b 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/SchemaFunctionName.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/SchemaFunctionName.java
@@ -19,7 +19,7 @@
 
 import java.util.Objects;
 
-import static java.util.Objects.requireNonNull;
+import static java.util.Locale.ROOT;
 
 @Experimental(eta = "2022-10-31")
 public final class SchemaFunctionName
@@ -30,11 +30,11 @@ public final class SchemaFunctionName
     @JsonCreator
     public SchemaFunctionName(@JsonProperty("schemaName") String schemaName, @JsonProperty("functionName") String functionName)
     {
-        this.schemaName = requireNonNull(schemaName, "schemaName is null");
+        this.schemaName = schemaName.toLowerCase(ROOT);
         if (schemaName.isEmpty()) {
             throw new IllegalArgumentException("schemaName is empty");
         }
-        this.functionName = requireNonNull(functionName, "functionName is null");
+        this.functionName = functionName.toLowerCase(ROOT);
         if (functionName.isEmpty()) {
             throw new IllegalArgumentException("functionName is empty");
         }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/Signature.java b/core/trino-spi/src/main/java/io/trino/spi/function/Signature.java
index 93cfd40898f3..bd5659b1e4c4 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/function/Signature.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/Signature.java
@@ -21,7 +21,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -32,10 +31,6 @@
 @Experimental(eta = "2022-10-31")
 public class Signature
 {
-    // Copied from OperatorNameUtil
-    private static final String OPERATOR_PREFIX = "$operator$";
-
-    private final String name;
     private final List<TypeVariableConstraint> typeVariableConstraints;
     private final List<LongVariableConstraint> longVariableConstraints;
     private final TypeSignature returnType;
@@ -43,18 +38,15 @@ public class Signature
     private final boolean variableArity;
 
     private Signature(
-            String name,
             List<TypeVariableConstraint> typeVariableConstraints,
             List<LongVariableConstraint> longVariableConstraints,
             TypeSignature returnType,
             List<TypeSignature> argumentTypes,
             boolean variableArity)
     {
-        requireNonNull(name, "name is null");
         requireNonNull(typeVariableConstraints, "typeVariableConstraints is null");
         requireNonNull(longVariableConstraints, "longVariableConstraints is null");
 
-        this.name = name;
         this.typeVariableConstraints = List.copyOf(typeVariableConstraints);
         this.longVariableConstraints = List.copyOf(longVariableConstraints);
         this.returnType = requireNonNull(returnType, "returnType is null");
@@ -62,17 +54,6 @@ private Signature(
         this.variableArity = variableArity;
     }
 
-    boolean isOperator()
-    {
-        return name.startsWith(OPERATOR_PREFIX);
-    }
-
-    @JsonProperty
-    public String getName()
-    {
-        return name;
-    }
-
     @JsonProperty
     public TypeSignature getReturnType()
     {
@@ -106,7 +87,7 @@ public List<LongVariableConstraint> getLongVariableConstraints()
     @Override
     public int hashCode()
     {
-        return Objects.hash(name.toLowerCase(Locale.US), typeVariableConstraints, longVariableConstraints, returnType, argumentTypes, variableArity);
+        return Objects.hash(typeVariableConstraints, longVariableConstraints, returnType, argumentTypes, variableArity);
     }
 
     @Override
@@ -119,8 +100,7 @@ public boolean equals(Object obj)
             return false;
         }
         Signature other = (Signature) obj;
-        return name.equalsIgnoreCase(other.name) &&
-                Objects.equals(this.typeVariableConstraints, other.typeVariableConstraints) &&
+        return Objects.equals(this.typeVariableConstraints, other.typeVariableConstraints) &&
                 Objects.equals(this.longVariableConstraints, other.longVariableConstraints) &&
                 Objects.equals(this.returnType, other.returnType) &&
                 Objects.equals(this.argumentTypes, other.argumentTypes) &&
@@ -135,23 +115,11 @@ public String toString()
                 longVariableConstraints.stream().map(LongVariableConstraint::toString))
                 .collect(Collectors.toList());
 
-        return name +
-                (allConstraints.isEmpty() ? "" : allConstraints.stream().collect(joining(",", "<", ">"))) +
+        return (allConstraints.isEmpty() ? "" : allConstraints.stream().collect(joining(",", "<", ">"))) +
                 argumentTypes.stream().map(Objects::toString).collect(joining(",", "(", ")")) +
                 ":" + returnType;
     }
 
-    public Signature withName(String name)
-    {
-        return fromJson(
-                name,
-                typeVariableConstraints,
-                longVariableConstraints,
-                returnType,
-                argumentTypes,
-                variableArity);
-    }
-
     public static Builder builder()
     {
         return new Builder();
@@ -159,7 +127,6 @@ public static Builder builder()
 
     public static final class Builder
     {
-        private String name;
         private final List<TypeVariableConstraint> typeVariableConstraints = new ArrayList<>();
         private final List<LongVariableConstraint> longVariableConstraints = new ArrayList<>();
         private TypeSignature returnType;
@@ -168,18 +135,6 @@ public static final class Builder
 
         private Builder() {}
 
-        public Builder name(String name)
-        {
-            this.name = requireNonNull(name, "name is null");
-            return this;
-        }
-
-        public Builder operatorType(OperatorType operatorType)
-        {
-            this.name = OPERATOR_PREFIX + requireNonNull(operatorType, "operatorType is null").name();
-            return this;
-        }
-
         public Builder typeVariable(String name)
         {
             typeVariableConstraints.add(TypeVariableConstraint.builder(name).build());
@@ -280,7 +235,7 @@ public Builder variableArity()
 
         public Signature build()
         {
-            return fromJson(name, typeVariableConstraints, longVariableConstraints, returnType, argumentTypes, variableArity);
+            return new Signature(typeVariableConstraints, longVariableConstraints, returnType, argumentTypes, variableArity);
         }
     }
 
@@ -292,13 +247,12 @@ public Signature build()
     @Deprecated
     @JsonCreator
     public static Signature fromJson(
-            @JsonProperty("name") String name,
             @JsonProperty("typeVariableConstraints") List<TypeVariableConstraint> typeVariableConstraints,
             @JsonProperty("longVariableConstraints") List<LongVariableConstraint> longVariableConstraints,
             @JsonProperty("returnType") TypeSignature returnType,
             @JsonProperty("argumentTypes") List<TypeSignature> argumentTypes,
             @JsonProperty("variableArity") boolean variableArity)
     {
-        return new Signature(name, typeVariableConstraints, longVariableConstraints, returnType, argumentTypes, variableArity);
+        return new Signature(typeVariableConstraints, longVariableConstraints, returnType, argumentTypes, variableArity);
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/AbstractConnectorTableFunction.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/AbstractConnectorTableFunction.java
similarity index 93%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/AbstractConnectorTableFunction.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/AbstractConnectorTableFunction.java
index e23ecadd7219..ce73eb1b8f09 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/AbstractConnectorTableFunction.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/AbstractConnectorTableFunction.java
@@ -11,9 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Experimental;
+import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
@@ -64,5 +65,5 @@ public ReturnTypeSpecification getReturnTypeSpecification()
     }
 
     @Override
-    public abstract TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments);
+    public abstract TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments, ConnectorAccessControl accessControl);
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/Argument.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/Argument.java
similarity index 97%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/Argument.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/Argument.java
index ee2371cc911d..006a358f0c8e 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/Argument.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/Argument.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/ArgumentSpecification.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/ArgumentSpecification.java
similarity index 88%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/ArgumentSpecification.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/ArgumentSpecification.java
index 30374afa720e..ff8fa9583b5c 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/ArgumentSpecification.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/ArgumentSpecification.java
@@ -11,14 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Experimental;
+import jakarta.annotation.Nullable;
 
-import javax.annotation.Nullable;
-
-import static io.trino.spi.ptf.Preconditions.checkArgument;
-import static io.trino.spi.ptf.Preconditions.checkNotNullOrEmpty;
+import static io.trino.spi.function.table.Preconditions.checkArgument;
+import static io.trino.spi.function.table.Preconditions.checkNotNullOrEmpty;
 
 /**
  * Abstract class to capture the three supported argument types for a table function:
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/ConnectorTableFunction.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/ConnectorTableFunction.java
similarity index 94%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/ConnectorTableFunction.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/ConnectorTableFunction.java
index a5a0d5af1946..b7f7788e70a6 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/ConnectorTableFunction.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/ConnectorTableFunction.java
@@ -11,9 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Experimental;
+import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
@@ -47,5 +48,5 @@ public interface ConnectorTableFunction
      *
      * @param arguments actual invocation arguments, mapped by argument names
      */
-    TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments);
+    TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments, ConnectorAccessControl accessControl);
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/ConnectorTableFunctionHandle.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/ConnectorTableFunctionHandle.java
similarity index 95%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/ConnectorTableFunctionHandle.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/ConnectorTableFunctionHandle.java
index 47df2b836356..8514e215af7c 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/ConnectorTableFunctionHandle.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/ConnectorTableFunctionHandle.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Experimental;
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/Descriptor.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/Descriptor.java
similarity index 97%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/Descriptor.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/Descriptor.java
index 7b1387dded02..7281e287e149 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/Descriptor.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/Descriptor.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,7 +25,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static io.trino.spi.ptf.Preconditions.checkArgument;
+import static io.trino.spi.function.table.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 @Experimental(eta = "2022-10-31")
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/DescriptorArgument.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/DescriptorArgument.java
similarity index 96%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/DescriptorArgument.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/DescriptorArgument.java
index f79add30ccbf..5cd3b0ac7963 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/DescriptorArgument.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/DescriptorArgument.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -21,7 +21,7 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import static io.trino.spi.ptf.Preconditions.checkArgument;
+import static io.trino.spi.function.table.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 /**
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/DescriptorArgumentSpecification.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/DescriptorArgumentSpecification.java
similarity index 94%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/DescriptorArgumentSpecification.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/DescriptorArgumentSpecification.java
index 1e7eea6b4ae4..89f722b837d7 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/DescriptorArgumentSpecification.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/DescriptorArgumentSpecification.java
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Experimental;
 
-import static io.trino.spi.ptf.Preconditions.checkArgument;
+import static io.trino.spi.function.table.Preconditions.checkArgument;
 
 @Experimental(eta = "2022-10-31")
 public class DescriptorArgumentSpecification
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/NameAndPosition.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/NameAndPosition.java
similarity index 91%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/NameAndPosition.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/NameAndPosition.java
index 59cd944e40f0..22eb163db822 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/NameAndPosition.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/NameAndPosition.java
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Experimental;
 
 import java.util.Objects;
 
-import static io.trino.spi.ptf.Preconditions.checkArgument;
-import static io.trino.spi.ptf.Preconditions.checkNotNullOrEmpty;
+import static io.trino.spi.function.table.Preconditions.checkArgument;
+import static io.trino.spi.function.table.Preconditions.checkNotNullOrEmpty;
 
 /**
  * This class represents a descriptor field reference.
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/Preconditions.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/Preconditions.java
similarity index 96%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/Preconditions.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/Preconditions.java
index 872dbfc9b900..ba92cc888b36 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/Preconditions.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/Preconditions.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/Primitives.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/Primitives.java
similarity index 97%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/Primitives.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/Primitives.java
index cf5a97840af9..93a94ce62d26 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/Primitives.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/Primitives.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/ReturnTypeSpecification.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/ReturnTypeSpecification.java
similarity index 95%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/ReturnTypeSpecification.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/ReturnTypeSpecification.java
index 73f016f0ae50..d15a911de49b 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/ReturnTypeSpecification.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/ReturnTypeSpecification.java
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Experimental;
 
-import static io.trino.spi.ptf.Preconditions.checkArgument;
+import static io.trino.spi.function.table.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 /**
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/ScalarArgument.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/ScalarArgument.java
similarity index 97%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/ScalarArgument.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/ScalarArgument.java
index f0cea1c7bc57..c059f1fcbca9 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/ScalarArgument.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/ScalarArgument.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -19,8 +19,7 @@
 import io.trino.spi.expression.ConnectorExpression;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/ScalarArgumentSpecification.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/ScalarArgumentSpecification.java
similarity index 95%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/ScalarArgumentSpecification.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/ScalarArgumentSpecification.java
index a0afc7d26833..bf9f85cb7fae 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/ScalarArgumentSpecification.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/ScalarArgumentSpecification.java
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Experimental;
 import io.trino.spi.type.Type;
 
-import static io.trino.spi.ptf.Preconditions.checkArgument;
+import static io.trino.spi.function.table.Preconditions.checkArgument;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableArgument.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableArgument.java
similarity index 98%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/TableArgument.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/TableArgument.java
index 1f2ece78339b..f81d8e7cc4b6 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableArgument.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableArgument.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableArgumentSpecification.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableArgumentSpecification.java
similarity index 96%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/TableArgumentSpecification.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/TableArgumentSpecification.java
index bdd209d57e84..2c29e5ee9c9c 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableArgumentSpecification.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableArgumentSpecification.java
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Experimental;
 
-import static io.trino.spi.ptf.Preconditions.checkArgument;
+import static io.trino.spi.function.table.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 @Experimental(eta = "2022-10-31")
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionAnalysis.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionAnalysis.java
similarity index 94%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionAnalysis.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionAnalysis.java
index 583103f707cc..fcc1c5e72dcd 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionAnalysis.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionAnalysis.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Experimental;
 
@@ -20,8 +20,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static io.trino.spi.ptf.EmptyTableFunctionHandle.EMPTY_HANDLE;
-import static io.trino.spi.ptf.Preconditions.checkArgument;
+import static io.trino.spi.function.table.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toMap;
 
@@ -82,7 +81,7 @@ public static final class Builder
     {
         private Descriptor returnedType;
         private final Map<String, List<Integer>> requiredColumns = new HashMap<>();
-        private ConnectorTableFunctionHandle handle = EMPTY_HANDLE;
+        private ConnectorTableFunctionHandle handle;
 
         private Builder() {}
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionDataProcessor.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionDataProcessor.java
similarity index 97%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionDataProcessor.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionDataProcessor.java
index 06f842029f7d..3d5ca9cec596 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionDataProcessor.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionDataProcessor.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Page;
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionProcessorProvider.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionProcessorProvider.java
similarity index 89%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionProcessorProvider.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionProcessorProvider.java
index e3072eb61783..0be4cd2ed585 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionProcessorProvider.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionProcessorProvider.java
@@ -11,12 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Experimental;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorSplit;
 
-@Experimental(eta = "2023-03-31")
+@Experimental(eta = "2023-07-31")
 public interface TableFunctionProcessorProvider
 {
     /**
@@ -32,7 +33,7 @@ default TableFunctionDataProcessor getDataProcessor(ConnectorTableFunctionHandle
      * This method returns a {@code TableFunctionSplitProcessor}. All the necessary information collected during analysis is available
      * in the form of {@link ConnectorTableFunctionHandle}. It is called once per each split processed by the table function.
      */
-    default TableFunctionSplitProcessor getSplitProcessor(ConnectorSession session, ConnectorTableFunctionHandle handle)
+    default TableFunctionSplitProcessor getSplitProcessor(ConnectorSession session, ConnectorTableFunctionHandle handle, ConnectorSplit split)
     {
         throw new UnsupportedOperationException("this table function does not process splits");
     }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionProcessorState.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionProcessorState.java
similarity index 97%
rename from core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionProcessorState.java
rename to core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionProcessorState.java
index 6533570466df..8b235210e57d 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionProcessorState.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionProcessorState.java
@@ -11,12 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.ptf;
+package io.trino.spi.function.table;
 
 import io.trino.spi.Experimental;
 import io.trino.spi.Page;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -34,7 +33,7 @@
  * Note: when the input is empty, the only valid index value is null, because there are no input rows that could be attached to output. In such case, for performance
  * reasons, the validation of indexes is skipped, and all pass-through columns are filled with nulls.
  */
-@Experimental(eta = "2023-03-31")
+@Experimental(eta = "2023-07-31")
 public sealed interface TableFunctionProcessorState
         permits TableFunctionProcessorState.Blocked, TableFunctionProcessorState.Finished, TableFunctionProcessorState.Processed
 {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionSplitProcessor.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionSplitProcessor.java
new file mode 100644
index 000000000000..3cc2709e9c4c
--- /dev/null
+++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionSplitProcessor.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed 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 io.trino.spi.function.table;
+
+import io.trino.spi.Experimental;
+
+/**
+ * Processes table functions splits, as returned from {@link io.trino.spi.connector.ConnectorSplitManager}
+ * for a {@link ConnectorTableFunctionHandle}.
+ * <p>
+ * Thread-safety: implementations do not have to be thread-safe. The {@link #process} method may be called from
+ * multiple threads, but will never be called from two threads at the same time.
+ */
+@Experimental(eta = "2023-07-31")
+public interface TableFunctionSplitProcessor
+{
+    /**
+     * This method processes a split. It is called multiple times until the whole output for the split is produced.
+     *
+     * @return {@link TableFunctionProcessorState} including the processor's state and optionally a portion of result.
+     * After the returned state is {@code FINISHED}, the method will not be called again.
+     */
+    TableFunctionProcessorState process();
+}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/predicate/EquatableValueSet.java b/core/trino-spi/src/main/java/io/trino/spi/predicate/EquatableValueSet.java
index 9a04ff07cbec..7c0c90f43377 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/predicate/EquatableValueSet.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/predicate/EquatableValueSet.java
@@ -37,8 +37,8 @@
 import static io.airlift.slice.SizeOf.estimatedSizeOf;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.DEFAULT_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.predicate.Utils.TUPLE_DOMAIN_TYPE_OPERATORS;
 import static io.trino.spi.predicate.Utils.handleThrowable;
@@ -451,7 +451,7 @@ public ValueEntry(
             if (block.getPositionCount() != 1) {
                 throw new IllegalArgumentException("Block should only have one position");
             }
-            this.equalOperator = TUPLE_DOMAIN_TYPE_OPERATORS.getEqualOperator(type, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION));
+            this.equalOperator = TUPLE_DOMAIN_TYPE_OPERATORS.getEqualOperator(type, simpleConvention(DEFAULT_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
             this.hashCodeOperator = TUPLE_DOMAIN_TYPE_OPERATORS.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
         }
 
@@ -502,14 +502,14 @@ public boolean equals(Object obj)
                 return false;
             }
 
-            Boolean result;
+            boolean result;
             try {
-                result = (Boolean) equalOperator.invokeExact(this.block, 0, other.block, 0);
+                result = (boolean) equalOperator.invokeExact(this.block, 0, other.block, 0);
             }
             catch (Throwable throwable) {
                 throw handleThrowable(throwable);
             }
-            return Boolean.TRUE.equals(result);
+            return result;
         }
 
         public long getRetainedSizeInBytes()
diff --git a/core/trino-spi/src/main/java/io/trino/spi/predicate/NullableValue.java b/core/trino-spi/src/main/java/io/trino/spi/predicate/NullableValue.java
index 79311fda9908..32c25482fb44 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/predicate/NullableValue.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/predicate/NullableValue.java
@@ -23,8 +23,8 @@
 import java.util.Objects;
 
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.DEFAULT_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.predicate.Utils.TUPLE_DOMAIN_TYPE_OPERATORS;
 import static io.trino.spi.predicate.Utils.handleThrowable;
@@ -51,8 +51,8 @@ public NullableValue(Type type, Object value)
         this.value = value;
 
         if (type.isComparable()) {
-            this.equalOperator = TUPLE_DOMAIN_TYPE_OPERATORS.getEqualOperator(type, simpleConvention(NULLABLE_RETURN, NEVER_NULL, NEVER_NULL))
-                    .asType(MethodType.methodType(Boolean.class, Object.class, Object.class));
+            this.equalOperator = TUPLE_DOMAIN_TYPE_OPERATORS.getEqualOperator(type, simpleConvention(DEFAULT_ON_NULL, NEVER_NULL, NEVER_NULL))
+                    .asType(MethodType.methodType(boolean.class, Object.class, Object.class));
             this.hashCodeOperator = TUPLE_DOMAIN_TYPE_OPERATORS.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, NEVER_NULL))
                     .asType(MethodType.methodType(long.class, Object.class));
         }
@@ -147,7 +147,7 @@ public boolean equals(Object obj)
     private boolean valueEquals(Object otherValue)
     {
         try {
-            return ((Boolean) equalOperator.invokeExact(value, otherValue)) == Boolean.TRUE;
+            return (boolean) equalOperator.invokeExact(value, otherValue);
         }
         catch (Throwable throwable) {
             throw handleThrowable(throwable);
diff --git a/core/trino-spi/src/main/java/io/trino/spi/predicate/SortedRangeSet.java b/core/trino-spi/src/main/java/io/trino/spi/predicate/SortedRangeSet.java
index 61c1a6637063..a14ce100e5fe 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/predicate/SortedRangeSet.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/predicate/SortedRangeSet.java
@@ -40,8 +40,9 @@
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.DEFAULT_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.predicate.Utils.TUPLE_DOMAIN_TYPE_OPERATORS;
 import static io.trino.spi.predicate.Utils.handleThrowable;
@@ -49,7 +50,6 @@
 import static io.trino.spi.type.TypeUtils.isFloatingPointNaN;
 import static io.trino.spi.type.TypeUtils.readNativeValue;
 import static io.trino.spi.type.TypeUtils.writeNativeValue;
-import static java.lang.Boolean.TRUE;
 import static java.lang.Math.min;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
@@ -86,8 +86,8 @@ private SortedRangeSet(Type type, boolean[] inclusive, Block sortedRanges)
             throw new IllegalArgumentException("Type is not orderable: " + type);
         }
         this.type = type;
-        this.equalOperator = TUPLE_DOMAIN_TYPE_OPERATORS.getEqualOperator(type, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION));
-        this.hashCodeOperator = TUPLE_DOMAIN_TYPE_OPERATORS.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
+        this.equalOperator = TUPLE_DOMAIN_TYPE_OPERATORS.getEqualOperator(type, simpleConvention(DEFAULT_ON_NULL, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL));
+        this.hashCodeOperator = TUPLE_DOMAIN_TYPE_OPERATORS.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL));
         // choice of placing unordered values first or last does not matter for this code
         this.comparisonOperator = TUPLE_DOMAIN_TYPE_OPERATORS.getComparisonUnorderedLastOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
         // Calculating the comparison operator once instead of per range to avoid hitting TypeOperators cache
@@ -317,8 +317,7 @@ public boolean isAll()
         if (getRangeCount() != 1) {
             return false;
         }
-        RangeView onlyRange = getRangeView(0);
-        return onlyRange.isLowUnbounded() && onlyRange.isHighUnbounded();
+        return isRangeLowUnbounded(0) && isRangeHighUnbounded(0);
     }
 
     @Override
@@ -446,6 +445,16 @@ private RangeView getRangeView(int rangeIndex)
                 rangeRight);
     }
 
+    private boolean isRangeLowUnbounded(int rangeIndex)
+    {
+        return sortedRanges.isNull(2 * rangeIndex);
+    }
+
+    private boolean isRangeHighUnbounded(int rangeIndex)
+    {
+        return sortedRanges.isNull(2 * rangeIndex + 1);
+    }
+
     @Override
     public Ranges getRanges()
     {
@@ -862,14 +871,14 @@ private boolean valuesEqual(Block leftBlock, int leftPosition, Block rightBlock,
             // TODO this should probably use IS NOT DISTINCT FROM
             return leftIsNull == rightIsNull;
         }
-        Boolean equal;
+        boolean equal;
         try {
-            equal = (Boolean) equalOperator.invokeExact(leftBlock, leftPosition, rightBlock, rightPosition);
+            equal = (boolean) equalOperator.invokeExact(leftBlock, leftPosition, rightBlock, rightPosition);
         }
         catch (Throwable throwable) {
             throw handleThrowable(throwable);
         }
-        return TRUE.equals(equal);
+        return equal;
     }
 
     private static int compareValues(MethodHandle comparisonOperator, Block leftBlock, int leftPosition, Block rightBlock, int rightPosition)
@@ -1068,7 +1077,7 @@ static SortedRangeSet buildFromUnsortedRanges(Type type, Collection<Range> unsor
             writeRange(type, blockBuilder, inclusive, rangeIndex, range);
         }
 
-        return new SortedRangeSet(type, inclusive, blockBuilder);
+        return new SortedRangeSet(type, inclusive, blockBuilder.build());
     }
 
     private static void writeRange(Type type, BlockBuilder blockBuilder, boolean[] inclusive, int rangeIndex, Range range)
diff --git a/core/trino-spi/src/main/java/io/trino/spi/predicate/TupleDomain.java b/core/trino-spi/src/main/java/io/trino/spi/predicate/TupleDomain.java
index 6398ec443829..c7177eda8487 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/predicate/TupleDomain.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/predicate/TupleDomain.java
@@ -235,6 +235,21 @@ public Optional<Map<T, Domain>> getDomains()
         return domains;
     }
 
+    public Domain getDomain(T column, Type type)
+    {
+        if (domains.isEmpty()) {
+            return Domain.none(type);
+        }
+        Domain domain = domains.get().get(column);
+        if (domain != null && !domain.getType().equals(type)) {
+            throw new IllegalArgumentException("Provided type %s does not match domain type %s for column %s".formatted(type, domain.getType(), column));
+        }
+        if (domain == null) {
+            return Domain.all(type);
+        }
+        return domain;
+    }
+
     /**
      * Returns the strict intersection of the TupleDomains.
      * The resulting TupleDomain represents the set of tuples that would be valid
diff --git a/core/trino-spi/src/main/java/io/trino/spi/predicate/Utils.java b/core/trino-spi/src/main/java/io/trino/spi/predicate/Utils.java
index 8e1965005ffc..50587ac26789 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/predicate/Utils.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/predicate/Utils.java
@@ -14,11 +14,9 @@
 package io.trino.spi.predicate;
 
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static io.trino.spi.type.TypeUtils.readNativeValue;
 import static io.trino.spi.type.TypeUtils.writeNativeValue;
@@ -41,9 +39,7 @@ public static Block nativeValueToBlock(Type type, @Nullable Object object)
                 throw new IllegalArgumentException(format("Object '%s' (%s) is not instance of %s", object, object.getClass().getName(), expectedClass.getName()));
             }
         }
-        BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
-        writeNativeValue(type, blockBuilder, object);
-        return blockBuilder.build();
+        return writeNativeValue(type, object);
     }
 
     public static Object blockToNativeValue(Type type, Block block)
diff --git a/core/trino-spi/src/main/java/io/trino/spi/procedure/Procedure.java b/core/trino-spi/src/main/java/io/trino/spi/procedure/Procedure.java
index 5751f13ddefe..ce6cf97c36a5 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/procedure/Procedure.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/procedure/Procedure.java
@@ -16,8 +16,7 @@
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.lang.invoke.MethodHandle;
 import java.util.HashSet;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/EmptyTableFunctionHandle.java b/core/trino-spi/src/main/java/io/trino/spi/ptf/EmptyTableFunctionHandle.java
deleted file mode 100644
index ab49c94a77f4..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/EmptyTableFunctionHandle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.ptf;
-
-public enum EmptyTableFunctionHandle
-        implements ConnectorTableFunctionHandle
-{
-    EMPTY_HANDLE
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionSplitProcessor.java b/core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionSplitProcessor.java
deleted file mode 100644
index 1868fa899bee..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/ptf/TableFunctionSplitProcessor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.ptf;
-
-import io.trino.spi.connector.ConnectorSplit;
-
-public interface TableFunctionSplitProcessor
-{
-    /**
-     * This method processes a split. It is called multiple times until the whole output for the split is produced.
-     *
-     * @param split a {@link ConnectorSplit} representing a subtask.
-     * @return {@link TableFunctionProcessorState} including the processor's state and optionally a portion of result.
-     * After the returned state is {@code FINISHED}, the method will not be called again.
-     */
-    TableFunctionProcessorState process(ConnectorSplit split);
-}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/security/AccessDeniedException.java b/core/trino-spi/src/main/java/io/trino/spi/security/AccessDeniedException.java
index 076337a40c2d..af010719ca4a 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/security/AccessDeniedException.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/security/AccessDeniedException.java
@@ -425,12 +425,7 @@ public static void denyCreateViewWithSelect(String sourceName, ConnectorIdentity
         throw new AccessDeniedException(format("View owner '%s' cannot create view that selects from %s%s", identity.getUser(), sourceName, formatExtraInfo(extraInfo)));
     }
 
-    public static void denyGrantExecuteFunctionPrivilege(String functionName, Identity identity, Identity grantee)
-    {
-        denyGrantExecuteFunctionPrivilege(functionName, identity, format("user '%s'", grantee.getUser()));
-    }
-
-    public static void denyGrantExecuteFunctionPrivilege(String functionName, Identity identity, String grantee)
+    public static void denyGrantExecuteFunctionPrivilege(String functionName, Identity identity, TrinoPrincipal grantee)
     {
         throw new AccessDeniedException(format("'%s' cannot grant '%s' execution to %s", identity.getUser(), functionName, grantee));
     }
@@ -700,6 +695,36 @@ public static void denyExecuteTableProcedure(String tableName, String procedureN
         throw new AccessDeniedException(format("Cannot execute table procedure %s on %s", procedureName, tableName));
     }
 
+    public static void denyShowFunctions(String schemaName)
+    {
+        denyShowFunctions(schemaName, null);
+    }
+
+    public static void denyShowFunctions(String schemaName, String extraInfo)
+    {
+        throw new AccessDeniedException(format("Cannot show functions of schema %s%s", schemaName, formatExtraInfo(extraInfo)));
+    }
+
+    public static void denyCreateFunction(String functionName)
+    {
+        denyCreateFunction(functionName, null);
+    }
+
+    public static void denyCreateFunction(String functionName, String extraInfo)
+    {
+        throw new AccessDeniedException(format("Cannot create function %s%s", functionName, formatExtraInfo(extraInfo)));
+    }
+
+    public static void denyDropFunction(String functionName)
+    {
+        denyDropFunction(functionName, null);
+    }
+
+    public static void denyDropFunction(String functionName, String extraInfo)
+    {
+        throw new AccessDeniedException(format("Cannot drop function %s%s", functionName, formatExtraInfo(extraInfo)));
+    }
+
     private static Object formatExtraInfo(String extraInfo)
     {
         if (extraInfo == null || extraInfo.isEmpty()) {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/security/ConnectorIdentity.java b/core/trino-spi/src/main/java/io/trino/spi/security/ConnectorIdentity.java
index 5742a85e0664..b134126e8264 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/security/ConnectorIdentity.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/security/ConnectorIdentity.java
@@ -157,7 +157,6 @@ public Builder withPrincipal(Optional<Principal> principal)
 
         public Builder withEnabledSystemRoles(Set<String> enabledSystemRoles)
         {
-            enabledSystemRoles = new HashSet<>(requireNonNull(enabledSystemRoles, "enabledSystemRoles is null"));
             this.enabledSystemRoles = new HashSet<>(requireNonNull(enabledSystemRoles, "enabledSystemRoles is null"));
             return this;
         }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/security/Identity.java b/core/trino-spi/src/main/java/io/trino/spi/security/Identity.java
index 903ef6e1b93d..3130166fa1cc 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/security/Identity.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/security/Identity.java
@@ -226,7 +226,6 @@ public Builder withPrincipal(Optional<Principal> principal)
 
         public Builder withEnabledRoles(Set<String> enabledRoles)
         {
-            enabledRoles = new HashSet<>(requireNonNull(enabledRoles, "enabledRoles is null"));
             this.enabledRoles = new HashSet<>(requireNonNull(enabledRoles, "enabledRoles is null"));
             return this;
         }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/security/SystemAccessControl.java b/core/trino-spi/src/main/java/io/trino/spi/security/SystemAccessControl.java
index e2bc482ede93..d9ad77b5809a 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/security/SystemAccessControl.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/security/SystemAccessControl.java
@@ -18,13 +18,12 @@
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.eventlistener.EventListener;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.type.Type;
 
 import java.security.Principal;
 import java.util.Collection;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -32,11 +31,11 @@
 
 import static io.trino.spi.security.AccessDeniedException.denyAddColumn;
 import static io.trino.spi.security.AccessDeniedException.denyAlterColumn;
-import static io.trino.spi.security.AccessDeniedException.denyCatalogAccess;
 import static io.trino.spi.security.AccessDeniedException.denyCommentColumn;
 import static io.trino.spi.security.AccessDeniedException.denyCommentTable;
 import static io.trino.spi.security.AccessDeniedException.denyCommentView;
 import static io.trino.spi.security.AccessDeniedException.denyCreateCatalog;
+import static io.trino.spi.security.AccessDeniedException.denyCreateFunction;
 import static io.trino.spi.security.AccessDeniedException.denyCreateMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyCreateRole;
 import static io.trino.spi.security.AccessDeniedException.denyCreateSchema;
@@ -48,22 +47,22 @@
 import static io.trino.spi.security.AccessDeniedException.denyDenyTablePrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyDropCatalog;
 import static io.trino.spi.security.AccessDeniedException.denyDropColumn;
+import static io.trino.spi.security.AccessDeniedException.denyDropFunction;
 import static io.trino.spi.security.AccessDeniedException.denyDropMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyDropRole;
 import static io.trino.spi.security.AccessDeniedException.denyDropSchema;
 import static io.trino.spi.security.AccessDeniedException.denyDropTable;
 import static io.trino.spi.security.AccessDeniedException.denyDropView;
-import static io.trino.spi.security.AccessDeniedException.denyExecuteFunction;
 import static io.trino.spi.security.AccessDeniedException.denyExecuteProcedure;
 import static io.trino.spi.security.AccessDeniedException.denyExecuteQuery;
 import static io.trino.spi.security.AccessDeniedException.denyExecuteTableProcedure;
-import static io.trino.spi.security.AccessDeniedException.denyGrantExecuteFunctionPrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyGrantRoles;
 import static io.trino.spi.security.AccessDeniedException.denyGrantSchemaPrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyGrantTablePrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyImpersonateUser;
 import static io.trino.spi.security.AccessDeniedException.denyInsertTable;
 import static io.trino.spi.security.AccessDeniedException.denyKillQuery;
+import static io.trino.spi.security.AccessDeniedException.denyReadSystemInformationAccess;
 import static io.trino.spi.security.AccessDeniedException.denyRefreshMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyRenameColumn;
 import static io.trino.spi.security.AccessDeniedException.denyRenameMaterializedView;
@@ -85,7 +84,7 @@
 import static io.trino.spi.security.AccessDeniedException.denyShowCreateSchema;
 import static io.trino.spi.security.AccessDeniedException.denyShowCreateTable;
 import static io.trino.spi.security.AccessDeniedException.denyShowCurrentRoles;
-import static io.trino.spi.security.AccessDeniedException.denyShowRoleAuthorizationDescriptors;
+import static io.trino.spi.security.AccessDeniedException.denyShowFunctions;
 import static io.trino.spi.security.AccessDeniedException.denyShowRoleGrants;
 import static io.trino.spi.security.AccessDeniedException.denyShowRoles;
 import static io.trino.spi.security.AccessDeniedException.denyShowSchemas;
@@ -93,7 +92,7 @@
 import static io.trino.spi.security.AccessDeniedException.denyTruncateTable;
 import static io.trino.spi.security.AccessDeniedException.denyUpdateTableColumns;
 import static io.trino.spi.security.AccessDeniedException.denyViewQuery;
-import static java.lang.String.format;
+import static io.trino.spi.security.AccessDeniedException.denyWriteSystemInformationAccess;
 import static java.util.Collections.emptySet;
 
 public interface SystemAccessControl
@@ -103,9 +102,9 @@ public interface SystemAccessControl
      *
      * @throws AccessDeniedException if not allowed
      */
-    default void checkCanImpersonateUser(SystemSecurityContext context, String userName)
+    default void checkCanImpersonateUser(Identity identity, String userName)
     {
-        denyImpersonateUser(context.getIdentity().getUser(), userName);
+        denyImpersonateUser(identity.getUser(), userName);
     }
 
     /**
@@ -125,7 +124,7 @@ default void checkCanSetUser(Optional<Principal> principal, String userName)
      *
      * @throws AccessDeniedException if not allowed
      */
-    default void checkCanExecuteQuery(SystemSecurityContext context)
+    default void checkCanExecuteQuery(Identity identity)
     {
         denyExecuteQuery();
     }
@@ -136,20 +135,7 @@ default void checkCanExecuteQuery(SystemSecurityContext context)
      *
      * @throws AccessDeniedException if not allowed
      */
-    default void checkCanViewQueryOwnedBy(SystemSecurityContext context, Identity queryOwner)
-    {
-        checkCanViewQueryOwnedBy(context, queryOwner.getUser());
-    }
-
-    /**
-     * Checks if identity can view a query owned by the specified user.  The method
-     * will not be called when the current user is the query owner.
-     *
-     * @throws AccessDeniedException if not allowed
-     * @deprecated Implement {@link #checkCanViewQueryOwnedBy(SystemSecurityContext, Identity)} instead.
-     */
-    @Deprecated
-    default void checkCanViewQueryOwnedBy(SystemSecurityContext context, String queryOwner)
+    default void checkCanViewQueryOwnedBy(Identity identity, Identity queryOwner)
     {
         denyViewQuery();
     }
@@ -158,25 +144,7 @@ default void checkCanViewQueryOwnedBy(SystemSecurityContext context, String quer
      * Filter the list of users to those the identity view query owned by the user.  The method
      * will not be called with the current user in the set.
      */
-    default Collection<Identity> filterViewQueryOwnedBy(SystemSecurityContext context, Collection<Identity> queryOwners)
-    {
-        Set<String> ownerUsers = queryOwners.stream()
-                .map(Identity::getUser)
-                .collect(Collectors.toSet());
-        Set<String> allowedUsers = filterViewQueryOwnedBy(context, ownerUsers);
-        return queryOwners.stream()
-                .filter(owner -> allowedUsers.contains(owner.getUser()))
-                .collect(Collectors.toList());
-    }
-
-    /**
-     * Filter the list of users to those the identity view query owned by the user.  The method
-     * will not be called with the current user in the set.
-     *
-     * @deprecated Implement {@link #filterViewQueryOwnedBy(SystemSecurityContext, Collection)} instead.
-     */
-    @Deprecated
-    default Set<String> filterViewQueryOwnedBy(SystemSecurityContext context, Set<String> queryOwners)
+    default Collection<Identity> filterViewQueryOwnedBy(Identity identity, Collection<Identity> queryOwners)
     {
         return emptySet();
     }
@@ -187,20 +155,7 @@ default Set<String> filterViewQueryOwnedBy(SystemSecurityContext context, Set<St
      *
      * @throws AccessDeniedException if not allowed
      */
-    default void checkCanKillQueryOwnedBy(SystemSecurityContext context, Identity queryOwner)
-    {
-        checkCanKillQueryOwnedBy(context, queryOwner.getUser());
-    }
-
-    /**
-     * Checks if identity can kill a query owned by the specified user.  The method
-     * will not be called when the current user is the query owner.
-     *
-     * @throws AccessDeniedException if not allowed
-     * @deprecated Implement {@link #checkCanKillQueryOwnedBy(SystemSecurityContext, Identity)} instead.
-     */
-    @Deprecated
-    default void checkCanKillQueryOwnedBy(SystemSecurityContext context, String queryOwner)
+    default void checkCanKillQueryOwnedBy(Identity identity, Identity queryOwner)
     {
         denyKillQuery();
     }
@@ -212,9 +167,9 @@ default void checkCanKillQueryOwnedBy(SystemSecurityContext context, String quer
      *
      * @throws AccessDeniedException if not allowed
      */
-    default void checkCanReadSystemInformation(SystemSecurityContext context)
+    default void checkCanReadSystemInformation(Identity identity)
     {
-        AccessDeniedException.denyReadSystemInformationAccess();
+        denyReadSystemInformationAccess();
     }
 
     /**
@@ -223,9 +178,9 @@ default void checkCanReadSystemInformation(SystemSecurityContext context)
      *
      * @throws AccessDeniedException if not allowed
      */
-    default void checkCanWriteSystemInformation(SystemSecurityContext context)
+    default void checkCanWriteSystemInformation(Identity identity)
     {
-        AccessDeniedException.denyReadSystemInformationAccess();
+        denyWriteSystemInformationAccess();
     }
 
     /**
@@ -233,19 +188,17 @@ default void checkCanWriteSystemInformation(SystemSecurityContext context)
      *
      * @throws AccessDeniedException if not allowed
      */
-    default void checkCanSetSystemSessionProperty(SystemSecurityContext context, String propertyName)
+    default void checkCanSetSystemSessionProperty(Identity identity, String propertyName)
     {
         denySetSystemSessionProperty(propertyName);
     }
 
     /**
-     * Check if identity is allowed to access the specified catalog
-     *
-     * @throws AccessDeniedException if not allowed
+     * Is identity allowed to access the specified catalog?
      */
-    default void checkCanAccessCatalog(SystemSecurityContext context, String catalogName)
+    default boolean canAccessCatalog(SystemSecurityContext context, String catalogName)
     {
-        denyCatalogAccess(catalogName);
+        return false;
     }
 
     /**
@@ -466,12 +419,26 @@ default void checkCanShowColumns(SystemSecurityContext context, CatalogSchemaTab
 
     /**
      * Filter the list of columns to those visible to the identity.
+     *
+     * @deprecated Use {@link #filterColumns(SystemSecurityContext, String, Map)}
      */
+    @Deprecated
     default Set<String> filterColumns(SystemSecurityContext context, CatalogSchemaTableName table, Set<String> columns)
     {
         return emptySet();
     }
 
+    /**
+     * Filter lists of columns of multiple tables to those visible to the identity.
+     */
+    default Map<SchemaTableName, Set<String>> filterColumns(SystemSecurityContext context, String catalogName, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        return tableColumns.entrySet().stream()
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        entry -> filterColumns(context, new CatalogSchemaTableName(catalogName, entry.getKey()), entry.getValue())));
+    }
+
     /**
      * Check if identity is allowed to add columns to the specified table in a catalog.
      *
@@ -672,28 +639,6 @@ default void checkCanRenameMaterializedView(SystemSecurityContext context, Catal
         denyRenameMaterializedView(view.toString(), newView.toString());
     }
 
-    /**
-     * Check if identity is allowed to grant an access to the function execution to grantee.
-     *
-     * @throws AccessDeniedException if not allowed
-     */
-    default void checkCanGrantExecuteFunctionPrivilege(SystemSecurityContext context, String functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-        String granteeAsString = format("%s '%s'", grantee.getType().name().toLowerCase(Locale.ENGLISH), grantee.getName());
-        denyGrantExecuteFunctionPrivilege(functionName, context.getIdentity(), granteeAsString);
-    }
-
-    /**
-     * Check if identity is allowed to grant an access to the function execution to grantee.
-     *
-     * @throws AccessDeniedException if not allowed
-     */
-    default void checkCanGrantExecuteFunctionPrivilege(SystemSecurityContext context, FunctionKind functionKind, CatalogSchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-        String granteeAsString = format("%s '%s'", grantee.getType().name().toLowerCase(Locale.ENGLISH), grantee.getName());
-        denyGrantExecuteFunctionPrivilege(functionName.toString(), context.getIdentity(), granteeAsString);
-    }
-
     /**
      * Check if identity is allowed to set the specified property in a catalog.
      *
@@ -814,16 +759,6 @@ default void checkCanRevokeRoles(SystemSecurityContext context, Set<String> role
         denyRevokeRoles(roles, grantees);
     }
 
-    /**
-     * Check if identity is allowed to show role authorization descriptors (i.e. RoleGrants).
-     *
-     * @throws AccessDeniedException if not allowed
-     */
-    default void checkCanShowRoleAuthorizationDescriptors(SystemSecurityContext context)
-    {
-        denyShowRoleAuthorizationDescriptors();
-    }
-
     /**
      * Check if identity is allowed to show current roles.
      *
@@ -855,33 +790,71 @@ default void checkCanExecuteProcedure(SystemSecurityContext systemSecurityContex
     }
 
     /**
-     * Check if identity is allowed to execute the specified function
+     * Is identity allowed to execute the specified function?
+     */
+    default boolean canExecuteFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
+    {
+        return false;
+    }
+
+    /**
+     * Is identity allowed to create a view that executes the specified function?
+     */
+    default boolean canCreateViewWithExecuteFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
+    {
+        return false;
+    }
+
+    /**
+     * Check if identity is allowed to execute the specified table procedure on specified table
+     *
+     * @throws AccessDeniedException if not allowed
+     */
+    default void checkCanExecuteTableProcedure(SystemSecurityContext systemSecurityContext, CatalogSchemaTableName table, String procedure)
+    {
+        denyExecuteTableProcedure(table.toString(), procedure);
+    }
+
+    /**
+     * Check if identity is allowed to show functions by executing SHOW FUNCTIONS in a catalog schema.
+     * <p>
+     * NOTE: This method is only present to give users an error message when listing is not allowed.
+     * The {@link #filterFunctions} method must filter all results for unauthorized users,
+     * since there are multiple ways to list functions.
      *
      * @throws AccessDeniedException if not allowed
      */
-    default void checkCanExecuteFunction(SystemSecurityContext systemSecurityContext, String functionName)
+    default void checkCanShowFunctions(SystemSecurityContext context, CatalogSchemaName schema)
+    {
+        denyShowFunctions(schema.toString());
+    }
+
+    /**
+     * Filter the list of functions to those visible to the identity.
+     */
+    default Set<SchemaFunctionName> filterFunctions(SystemSecurityContext context, String catalogName, Set<SchemaFunctionName> functionNames)
     {
-        denyExecuteFunction(functionName);
+        return emptySet();
     }
 
     /**
-     * Check if identity is allowed to execute the specified function
+     * Check if identity is allowed to create the specified function in the catalog.
      *
      * @throws AccessDeniedException if not allowed
      */
-    default void checkCanExecuteFunction(SystemSecurityContext systemSecurityContext, FunctionKind functionKind, CatalogSchemaRoutineName functionName)
+    default void checkCanCreateFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
     {
-        denyExecuteFunction(functionName.toString());
+        denyCreateFunction(functionName.toString());
     }
 
     /**
-     * Check if identity is allowed to execute the specified table procedure on specified table
+     * Check if identity is allowed to drop the specified function in the catalog.
      *
      * @throws AccessDeniedException if not allowed
      */
-    default void checkCanExecuteTableProcedure(SystemSecurityContext systemSecurityContext, CatalogSchemaTableName table, String procedure)
+    default void checkCanDropFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
     {
-        denyExecuteTableProcedure(table.toString(), procedure);
+        denyDropFunction(functionName.toString());
     }
 
     /**
@@ -906,18 +879,7 @@ default List<ViewExpression> getRowFilters(SystemSecurityContext context, Catalo
      */
     default Optional<ViewExpression> getColumnMask(SystemSecurityContext context, CatalogSchemaTableName tableName, String columnName, Type type)
     {
-        List<ViewExpression> masks = getColumnMasks(context, tableName, columnName, type);
-        if (masks.size() > 1) {
-            throw new UnsupportedOperationException("Multiple masks on a single column are no longer supported");
-        }
-
-        return masks.stream().findFirst();
-    }
-
-    @Deprecated
-    default List<ViewExpression> getColumnMasks(SystemSecurityContext context, CatalogSchemaTableName tableName, String columnName, Type type)
-    {
-        return List.of();
+        return Optional.empty();
     }
 
     /**
diff --git a/core/trino-spi/src/main/java/io/trino/spi/security/SystemAccessControlFactory.java b/core/trino-spi/src/main/java/io/trino/spi/security/SystemAccessControlFactory.java
index de6e2d69eb3a..e86c97168299 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/security/SystemAccessControlFactory.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/security/SystemAccessControlFactory.java
@@ -13,11 +13,27 @@
  */
 package io.trino.spi.security;
 
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
+
 import java.util.Map;
 
 public interface SystemAccessControlFactory
 {
     String getName();
 
+    @Deprecated
     SystemAccessControl create(Map<String, String> config);
+
+    default SystemAccessControl create(Map<String, String> config, SystemAccessControlContext context)
+    {
+        return create(config);
+    }
+
+    interface SystemAccessControlContext
+    {
+        OpenTelemetry getOpenTelemetry();
+
+        Tracer getTracer();
+    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/security/SystemSecurityContext.java b/core/trino-spi/src/main/java/io/trino/spi/security/SystemSecurityContext.java
index 18b176aef3cb..86903ad4a6b0 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/security/SystemSecurityContext.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/security/SystemSecurityContext.java
@@ -15,19 +15,21 @@
 
 import io.trino.spi.QueryId;
 
-import java.util.Optional;
+import java.time.Instant;
 
 import static java.util.Objects.requireNonNull;
 
 public class SystemSecurityContext
 {
     private final Identity identity;
-    private final Optional<QueryId> queryId;
+    private final QueryId queryId;
+    private final Instant queryStart;
 
-    public SystemSecurityContext(Identity identity, Optional<QueryId> queryId)
+    public SystemSecurityContext(Identity identity, QueryId queryId, Instant queryStart)
     {
         this.identity = requireNonNull(identity, "identity is null");
         this.queryId = requireNonNull(queryId, "queryId is null");
+        this.queryStart = requireNonNull(queryStart, "queryStart is null");
     }
 
     public Identity getIdentity()
@@ -35,8 +37,13 @@ public Identity getIdentity()
         return identity;
     }
 
-    public Optional<QueryId> getQueryId()
+    public QueryId getQueryId()
     {
         return queryId;
     }
+
+    public Instant getQueryStart()
+    {
+        return queryStart;
+    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/security/ViewExpression.java b/core/trino-spi/src/main/java/io/trino/spi/security/ViewExpression.java
index 7e280aa140e5..2771df51976c 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/security/ViewExpression.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/security/ViewExpression.java
@@ -13,6 +13,9 @@
  */
 package io.trino.spi.security;
 
+import io.trino.spi.connector.CatalogSchemaName;
+
+import java.util.List;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
@@ -23,33 +26,23 @@ public class ViewExpression
     private final Optional<String> catalog;
     private final Optional<String> schema;
     private final String expression;
+    private final List<CatalogSchemaName> path;
 
-    @Deprecated
-    public ViewExpression(String identity, Optional<String> catalog, Optional<String> schema, String expression)
-    {
-        this(Optional.of(identity), catalog, schema, expression);
-    }
-
-    public ViewExpression(Optional<String> identity, Optional<String> catalog, Optional<String> schema, String expression)
+    private ViewExpression(Optional<String> identity, Optional<String> catalog, Optional<String> schema, String expression, List<CatalogSchemaName> path)
     {
         this.identity = requireNonNull(identity, "identity is null");
         this.catalog = requireNonNull(catalog, "catalog is null");
         this.schema = requireNonNull(schema, "schema is null");
         this.expression = requireNonNull(expression, "expression is null");
+        this.path = List.copyOf(path);
 
         if (catalog.isEmpty() && schema.isPresent()) {
             throw new IllegalArgumentException("catalog must be present if schema is present");
         }
     }
 
-    @Deprecated
-    public String getIdentity()
-    {
-        return identity.orElseThrow();
-    }
-
     /**
-     * @return user as whom the view expression will be evaluated. If empty identity is returned
+     * @return user as whom the view expression will be evaluated. If empty identity is returned,
      * then session user is used.
      */
     public Optional<String> getSecurityIdentity()
@@ -71,4 +64,64 @@ public String getExpression()
     {
         return expression;
     }
+
+    public List<CatalogSchemaName> getPath()
+    {
+        return path;
+    }
+
+    public static Builder builder()
+    {
+        return new Builder();
+    }
+
+    public static class Builder
+    {
+        private String identity;
+        private String catalog;
+        private String schema;
+        private String expression;
+        private List<CatalogSchemaName> path = List.of();
+
+        private Builder() {}
+
+        public Builder identity(String identity)
+        {
+            this.identity = identity;
+            return this;
+        }
+
+        public Builder catalog(String catalog)
+        {
+            this.catalog = catalog;
+            return this;
+        }
+
+        public Builder schema(String schema)
+        {
+            this.schema = schema;
+            return this;
+        }
+
+        public Builder expression(String expression)
+        {
+            this.expression = expression;
+            return this;
+        }
+
+        public void setPath(List<CatalogSchemaName> path)
+        {
+            this.path = List.copyOf(path);
+        }
+
+        public ViewExpression build()
+        {
+            return new ViewExpression(
+                    Optional.ofNullable(identity),
+                    Optional.ofNullable(catalog),
+                    Optional.ofNullable(schema),
+                    expression,
+                    path);
+        }
+    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/session/PropertyMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/session/PropertyMetadata.java
index a24153d89dbd..80c112fffc51 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/session/PropertyMetadata.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/session/PropertyMetadata.java
@@ -58,7 +58,7 @@ public PropertyMetadata(
         requireNonNull(decoder, "decoder is null");
         requireNonNull(encoder, "encoder is null");
 
-        if (name.isEmpty() || !name.trim().toLowerCase(ENGLISH).equals(name)) {
+        if (name.isEmpty() || !name.trim().toLowerCase(ENGLISH).equals(name) || name.contains(".")) {
             throw new IllegalArgumentException(format("Invalid property name '%s'", name));
         }
         if (description.isEmpty() || !description.trim().equals(description)) {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/AbstractIntType.java b/core/trino-spi/src/main/java/io/trino/spi/type/AbstractIntType.java
index 8e2513d563a6..d9adc24d9650 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/AbstractIntType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/AbstractIntType.java
@@ -13,22 +13,32 @@
  */
 package io.trino.spi.type;
 
-import io.airlift.slice.Slice;
 import io.airlift.slice.XxHash64;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.IntArrayBlock;
 import io.trino.spi.block.IntArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
+
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.String.format;
@@ -39,10 +49,11 @@ public abstract class AbstractIntType
         implements FixedWidthType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(AbstractIntType.class, lookup(), long.class);
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, ByteOrder.LITTLE_ENDIAN);
 
     protected AbstractIntType(TypeSignature signature)
     {
-        super(signature, long.class);
+        super(signature, long.class, IntArrayBlock.class);
     }
 
     @Override
@@ -72,23 +83,27 @@ public TypeOperatorDeclaration getTypeOperatorDeclaration(TypeOperators typeOper
     @Override
     public final long getLong(Block block, int position)
     {
-        return block.getInt(position, 0);
+        return getInt(block, position);
     }
 
-    @Override
-    public final Slice getSlice(Block block, int position)
+    public final int getInt(Block block, int position)
     {
-        return block.getSlice(position, 0, getFixedSize());
+        return readInt((IntArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
     public void writeLong(BlockBuilder blockBuilder, long value)
     {
         checkValueValid(value);
-        blockBuilder.writeInt((int) value).closeEntry();
+        writeInt(blockBuilder, (int) value);
+    }
+
+    public BlockBuilder writeInt(BlockBuilder blockBuilder, int value)
+    {
+        return ((IntArrayBlockBuilder) blockBuilder).writeInt(value);
     }
 
-    protected void checkValueValid(long value)
+    protected static void checkValueValid(long value)
     {
         if (value > Integer.MAX_VALUE) {
             throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Value %d exceeds MAX_INT", value));
@@ -105,10 +120,16 @@ public final void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeInt(block.getInt(position, 0)).closeEntry();
+            writeInt(blockBuilder, getInt(block, position));
         }
     }
 
+    @Override
+    public int getFlatFixedSize()
+    {
+        return Integer.BYTES;
+    }
+
     @Override
     public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
     {
@@ -136,6 +157,37 @@ public final BlockBuilder createFixedSizeBlockBuilder(int positionCount)
         return new IntArrayBlockBuilder(null, positionCount);
     }
 
+    @ScalarOperator(READ_VALUE)
+    private static long read(@BlockPosition IntArrayBlock block, @BlockIndex int position)
+    {
+        return readInt(block, position);
+    }
+
+    private static int readInt(IntArrayBlock block, int position)
+    {
+        return block.getInt(position);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static long readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            long value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset, (int) value);
+    }
+
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(long left, long right)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/AbstractLongType.java b/core/trino-spi/src/main/java/io/trino/spi/type/AbstractLongType.java
index 7ae2d0859e99..030c2ce4fe92 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/AbstractLongType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/AbstractLongType.java
@@ -13,20 +13,30 @@
  */
 package io.trino.spi.type;
 
-import io.airlift.slice.Slice;
 import io.airlift.slice.XxHash64;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.LongArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
+
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.Long.rotateLeft;
@@ -37,10 +47,11 @@ public abstract class AbstractLongType
         implements FixedWidthType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(AbstractLongType.class, lookup(), long.class);
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
 
     public AbstractLongType(TypeSignature signature)
     {
-        super(signature, long.class);
+        super(signature, long.class, LongArrayBlock.class);
     }
 
     @Override
@@ -70,19 +81,13 @@ public TypeOperatorDeclaration getTypeOperatorDeclaration(TypeOperators typeOper
     @Override
     public final long getLong(Block block, int position)
     {
-        return block.getLong(position, 0);
-    }
-
-    @Override
-    public final Slice getSlice(Block block, int position)
-    {
-        return block.getSlice(position, 0, getFixedSize());
+        return read((LongArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
     public final void writeLong(BlockBuilder blockBuilder, long value)
     {
-        blockBuilder.writeLong(value).closeEntry();
+        ((LongArrayBlockBuilder) blockBuilder).writeLong(value);
     }
 
     @Override
@@ -92,10 +97,16 @@ public final void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeLong(block.getLong(position, 0)).closeEntry();
+            writeLong(blockBuilder, getLong(block, position));
         }
     }
 
+    @Override
+    public int getFlatFixedSize()
+    {
+        return Long.BYTES;
+    }
+
     @Override
     public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
     {
@@ -129,6 +140,32 @@ public static long hash(long value)
         return rotateLeft(value * 0xC2B2AE3D27D4EB4FL, 31) * 0x9E3779B185EBCA87L;
     }
 
+    @ScalarOperator(READ_VALUE)
+    private static long read(@BlockPosition LongArrayBlock block, @BlockIndex int position)
+    {
+        return block.getLong(position);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static long readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            long value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, value);
+    }
+
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(long left, long right)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/AbstractType.java b/core/trino-spi/src/main/java/io/trino/spi/type/AbstractType.java
index 2719f3a5ea0e..a7c0b9fe15e1 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/AbstractType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/AbstractType.java
@@ -16,6 +16,7 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 
 import java.util.List;
 
@@ -24,11 +25,13 @@ public abstract class AbstractType
 {
     private final TypeSignature signature;
     private final Class<?> javaType;
+    private final Class<? extends ValueBlock> valueBlockType;
 
-    protected AbstractType(TypeSignature signature, Class<?> javaType)
+    protected AbstractType(TypeSignature signature, Class<?> javaType, Class<? extends ValueBlock> valueBlockType)
     {
         this.signature = signature;
         this.javaType = javaType;
+        this.valueBlockType = valueBlockType;
     }
 
     @Override
@@ -49,6 +52,12 @@ public final Class<?> getJavaType()
         return javaType;
     }
 
+    @Override
+    public Class<? extends ValueBlock> getValueBlockType()
+    {
+        return valueBlockType;
+    }
+
     @Override
     public List<Type> getTypeParameters()
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/AbstractVariableWidthType.java b/core/trino-spi/src/main/java/io/trino/spi/type/AbstractVariableWidthType.java
index 45f4a71c4d75..be1cf7dd70ae 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/AbstractVariableWidthType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/AbstractVariableWidthType.java
@@ -13,26 +13,53 @@
  */
 package io.trino.spi.type;
 
+import io.airlift.slice.Slice;
+import io.airlift.slice.XxHash64;
+import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
 import io.trino.spi.block.PageBuilderStatus;
+import io.trino.spi.block.VariableWidthBlock;
 import io.trino.spi.block.VariableWidthBlockBuilder;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
+import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+
+import static io.airlift.slice.Slices.wrappedBuffer;
+import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
+import static io.trino.spi.function.OperatorType.EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
+import static io.trino.spi.function.OperatorType.XX_HASH_64;
+import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.Math.min;
+import static java.lang.invoke.MethodHandles.lookup;
 
 public abstract class AbstractVariableWidthType
         extends AbstractType
         implements VariableWidthType
 {
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, ByteOrder.LITTLE_ENDIAN);
+
     protected static final int EXPECTED_BYTES_PER_ENTRY = 32;
+    protected static final TypeOperatorDeclaration DEFAULT_READ_OPERATORS = extractOperatorDeclaration(DefaultReadOperators.class, lookup(), Slice.class);
+    protected static final TypeOperatorDeclaration DEFAULT_COMPARABLE_OPERATORS = extractOperatorDeclaration(DefaultComparableOperators.class, lookup(), Slice.class);
+    protected static final TypeOperatorDeclaration DEFAULT_ORDERING_OPERATORS = extractOperatorDeclaration(DefaultOrderingOperators.class, lookup(), Slice.class);
 
     protected AbstractVariableWidthType(TypeSignature signature, Class<?> javaType)
     {
-        super(signature, javaType);
+        super(signature, javaType, VariableWidthBlock.class);
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public VariableWidthBlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -46,13 +73,334 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
         int expectedBytes = (int) min((long) expectedEntries * expectedBytesPerEntry, maxBlockSizeInBytes);
         return new VariableWidthBlockBuilder(
                 blockBuilderStatus,
-                expectedBytesPerEntry == 0 ? expectedEntries : Math.min(expectedEntries, maxBlockSizeInBytes / expectedBytesPerEntry),
+                expectedBytesPerEntry == 0 ? expectedEntries : min(expectedEntries, maxBlockSizeInBytes / expectedBytesPerEntry),
                 expectedBytes);
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
+    public VariableWidthBlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         return createBlockBuilder(blockBuilderStatus, expectedEntries, EXPECTED_BYTES_PER_ENTRY);
     }
+
+    @Override
+    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
+    {
+        if (block.isNull(position)) {
+            blockBuilder.appendNull();
+        }
+        else {
+            VariableWidthBlock variableWidthBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+            position = block.getUnderlyingValuePosition(position);
+            Slice slice = variableWidthBlock.getRawSlice();
+            int offset = variableWidthBlock.getRawSliceOffset(position);
+            int length = variableWidthBlock.getSliceLength(position);
+            ((VariableWidthBlockBuilder) blockBuilder).writeEntry(slice, offset, length);
+        }
+    }
+
+    @Override
+    public TypeOperatorDeclaration getTypeOperatorDeclaration(TypeOperators typeOperators)
+    {
+        return DEFAULT_READ_OPERATORS;
+    }
+
+    @Override
+    public int getFlatFixedSize()
+    {
+        return 16;
+    }
+
+    @Override
+    public boolean isFlatVariableWidth()
+    {
+        return true;
+    }
+
+    @Override
+    public int getFlatVariableWidthSize(Block block, int position)
+    {
+        int length = block.getSliceLength(position);
+        if (length <= 12) {
+            return 0;
+        }
+        return length;
+    }
+
+    @Override
+    public int relocateFlatVariableWidthOffsets(byte[] fixedSizeSlice, int fixedSizeOffset, byte[] variableSizeSlice, int variableSizeOffset)
+    {
+        int length = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+        if (length <= 12) {
+            return 0;
+        }
+
+        if (variableSizeSlice.length < variableSizeOffset + length) {
+            throw new IllegalArgumentException("Variable size slice does not have enough space");
+        }
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + Long.BYTES + Integer.BYTES, variableSizeOffset);
+        return length;
+    }
+
+    private static class DefaultReadOperators
+    {
+        @ScalarOperator(READ_VALUE)
+        private static Slice readFlatToStack(
+                @FlatFixed byte[] fixedSizeSlice,
+                @FlatFixedOffset int fixedSizeOffset,
+                @FlatVariableWidth byte[] variableSizeSlice)
+        {
+            int length = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+            if (length <= 12) {
+                return wrappedBuffer(fixedSizeSlice, fixedSizeOffset + Integer.BYTES, length);
+            }
+            int variableSizeOffset = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Integer.BYTES + Long.BYTES);
+            return wrappedBuffer(variableSizeSlice, variableSizeOffset, length);
+        }
+
+        @ScalarOperator(READ_VALUE)
+        private static void readFlatToBlock(
+                @FlatFixed byte[] fixedSizeSlice,
+                @FlatFixedOffset int fixedSizeOffset,
+                @FlatVariableWidth byte[] variableSizeSlice,
+                BlockBuilder blockBuilder)
+        {
+            int length = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+            if (length <= 12) {
+                ((VariableWidthBlockBuilder) blockBuilder).writeEntry(fixedSizeSlice, fixedSizeOffset + Integer.BYTES, length);
+            }
+            else {
+                int variableSizeOffset = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Integer.BYTES + Long.BYTES);
+                ((VariableWidthBlockBuilder) blockBuilder).writeEntry(variableSizeSlice, variableSizeOffset, length);
+            }
+        }
+
+        @ScalarOperator(READ_VALUE)
+        private static void writeFlatFromStack(
+                Slice value,
+                byte[] fixedSizeSlice,
+                int fixedSizeOffset,
+                byte[] variableSizeSlice,
+                int variableSizeOffset)
+        {
+            int length = value.length();
+            INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset, length);
+            if (length <= 12) {
+                value.getBytes(0, fixedSizeSlice, fixedSizeOffset + Integer.BYTES, length);
+            }
+            else {
+                INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + Integer.BYTES + Long.BYTES, variableSizeOffset);
+                value.getBytes(0, variableSizeSlice, variableSizeOffset, length);
+            }
+        }
+
+        @ScalarOperator(READ_VALUE)
+        private static void writeFlatFromBlock(
+                @BlockPosition VariableWidthBlock block,
+                @BlockIndex int position,
+                byte[] fixedSizeSlice,
+                int fixedSizeOffset,
+                byte[] variableSizeSlice,
+                int variableSizeOffset)
+        {
+            Slice rawSlice = block.getRawSlice();
+            int rawSliceOffset = block.getRawSliceOffset(position);
+            int length = block.getSliceLength(position);
+
+            INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset, length);
+            if (length <= 12) {
+                rawSlice.getBytes(rawSliceOffset, fixedSizeSlice, fixedSizeOffset + Integer.BYTES, length);
+            }
+            else {
+                INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + Integer.BYTES + Long.BYTES, variableSizeOffset);
+                rawSlice.getBytes(rawSliceOffset, variableSizeSlice, variableSizeOffset, length);
+            }
+        }
+    }
+
+    private static class DefaultComparableOperators
+    {
+        @ScalarOperator(EQUAL)
+        private static boolean equalOperator(Slice left, Slice right)
+        {
+            return left.equals(right);
+        }
+
+        @ScalarOperator(EQUAL)
+        private static boolean equalOperator(@BlockPosition VariableWidthBlock leftBlock, @BlockIndex int leftPosition, @BlockPosition VariableWidthBlock rightBlock, @BlockIndex int rightPosition)
+        {
+            Slice leftRawSlice = leftBlock.getRawSlice();
+            int leftRawSliceOffset = leftBlock.getRawSliceOffset(leftPosition);
+            int leftLength = leftBlock.getSliceLength(leftPosition);
+
+            Slice rightRawSlice = rightBlock.getRawSlice();
+            int rightRawSliceOffset = rightBlock.getRawSliceOffset(rightPosition);
+            int rightLength = rightBlock.getSliceLength(rightPosition);
+
+            return leftRawSlice.equals(leftRawSliceOffset, leftLength, rightRawSlice, rightRawSliceOffset, rightLength);
+        }
+
+        @ScalarOperator(EQUAL)
+        private static boolean equalOperator(Slice left, @BlockPosition VariableWidthBlock rightBlock, @BlockIndex int rightPosition)
+        {
+            return equalOperator(rightBlock, rightPosition, left);
+        }
+
+        @ScalarOperator(EQUAL)
+        private static boolean equalOperator(@BlockPosition VariableWidthBlock leftBlock, @BlockIndex int leftPosition, Slice right)
+        {
+            Slice leftRawSlice = leftBlock.getRawSlice();
+            int leftRawSliceOffset = leftBlock.getRawSliceOffset(leftPosition);
+            int leftLength = leftBlock.getSliceLength(leftPosition);
+
+            return leftRawSlice.equals(leftRawSliceOffset, leftLength, right, 0, right.length());
+        }
+
+        @ScalarOperator(EQUAL)
+        private static boolean equalOperator(
+                @FlatFixed byte[] leftFixedSizeSlice,
+                @FlatFixedOffset int leftFixedSizeOffset,
+                @FlatVariableWidth byte[] leftVariableSizeSlice,
+                @FlatFixed byte[] rightFixedSizeSlice,
+                @FlatFixedOffset int rightFixedSizeOffset,
+                @FlatVariableWidth byte[] rightVariableSizeSlice)
+        {
+            int leftLength = (int) INT_HANDLE.get(leftFixedSizeSlice, leftFixedSizeOffset);
+            int rightLength = (int) INT_HANDLE.get(rightFixedSizeSlice, rightFixedSizeOffset);
+            if (leftLength != rightLength) {
+                return false;
+            }
+            if (leftLength <= 12) {
+                return Arrays.equals(
+                        leftFixedSizeSlice,
+                        leftFixedSizeOffset + Integer.BYTES,
+                        leftFixedSizeOffset + Integer.BYTES + leftLength,
+                        rightFixedSizeSlice,
+                        rightFixedSizeOffset + Integer.BYTES,
+                        rightFixedSizeOffset + Integer.BYTES + leftLength);
+            }
+            else {
+                int leftVariableSizeOffset = (int) INT_HANDLE.get(leftFixedSizeSlice, leftFixedSizeOffset + Integer.BYTES + Long.BYTES);
+                int rightVariableSizeOffset = (int) INT_HANDLE.get(rightFixedSizeSlice, rightFixedSizeOffset + Integer.BYTES + Long.BYTES);
+                return Arrays.equals(
+                        leftVariableSizeSlice,
+                        leftVariableSizeOffset,
+                        leftVariableSizeOffset + leftLength,
+                        rightVariableSizeSlice,
+                        rightVariableSizeOffset,
+                        rightVariableSizeOffset + rightLength);
+            }
+        }
+
+        @ScalarOperator(EQUAL)
+        private static boolean equalOperator(
+                @BlockPosition VariableWidthBlock leftBlock,
+                @BlockIndex int leftPosition,
+                @FlatFixed byte[] rightFixedSizeSlice,
+                @FlatFixedOffset int rightFixedSizeOffset,
+                @FlatVariableWidth byte[] rightVariableSizeSlice)
+        {
+            return equalOperator(
+                    rightFixedSizeSlice,
+                    rightFixedSizeOffset,
+                    rightVariableSizeSlice,
+                    leftBlock,
+                    leftPosition);
+        }
+
+        @ScalarOperator(EQUAL)
+        private static boolean equalOperator(
+                @FlatFixed byte[] leftFixedSizeSlice,
+                @FlatFixedOffset int leftFixedSizeOffset,
+                @FlatVariableWidth byte[] leftVariableSizeSlice,
+                @BlockPosition VariableWidthBlock rightBlock,
+                @BlockIndex int rightPosition)
+        {
+            int leftLength = (int) INT_HANDLE.get(leftFixedSizeSlice, leftFixedSizeOffset);
+
+            Slice rightRawSlice = rightBlock.getRawSlice();
+            int rightRawSliceOffset = rightBlock.getRawSliceOffset(rightPosition);
+            int rightLength = rightBlock.getSliceLength(rightPosition);
+
+            if (leftLength != rightLength) {
+                return false;
+            }
+            if (leftLength <= 12) {
+                return rightRawSlice.equals(rightRawSliceOffset, rightLength, wrappedBuffer(leftFixedSizeSlice, leftFixedSizeOffset + Integer.BYTES, leftLength), 0, leftLength);
+            }
+            else {
+                int leftVariableSizeOffset = (int) INT_HANDLE.get(leftFixedSizeSlice, leftFixedSizeOffset + Integer.BYTES + Long.BYTES);
+                return rightRawSlice.equals(rightRawSliceOffset, rightLength, wrappedBuffer(leftVariableSizeSlice, leftVariableSizeOffset, leftLength), 0, leftLength);
+            }
+        }
+
+        @ScalarOperator(XX_HASH_64)
+        private static long xxHash64Operator(Slice value)
+        {
+            return XxHash64.hash(value);
+        }
+
+        @ScalarOperator(XX_HASH_64)
+        private static long xxHash64Operator(@BlockPosition VariableWidthBlock block, @BlockIndex int position)
+        {
+            return XxHash64.hash(block.getRawSlice(), block.getRawSliceOffset(position), block.getSliceLength(position));
+        }
+
+        @ScalarOperator(XX_HASH_64)
+        private static long xxHash64Operator(
+                @FlatFixed byte[] fixedSizeSlice,
+                @FlatFixedOffset int fixedSizeOffset,
+                @FlatVariableWidth byte[] variableSizeSlice)
+        {
+            int length = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+            if (length <= 12) {
+                return XxHash64.hash(wrappedBuffer(fixedSizeSlice, fixedSizeOffset + Integer.BYTES, length));
+            }
+            int variableSizeOffset = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Integer.BYTES + Long.BYTES);
+            return XxHash64.hash(wrappedBuffer(variableSizeSlice, variableSizeOffset, length));
+        }
+    }
+
+    private static class DefaultOrderingOperators
+    {
+        @ScalarOperator(COMPARISON_UNORDERED_LAST)
+        private static long comparisonOperator(Slice left, Slice right)
+        {
+            return left.compareTo(right);
+        }
+
+        @ScalarOperator(COMPARISON_UNORDERED_LAST)
+        private static long comparisonOperator(@BlockPosition VariableWidthBlock leftBlock, @BlockIndex int leftPosition, @BlockPosition VariableWidthBlock rightBlock, @BlockIndex int rightPosition)
+        {
+            Slice leftRawSlice = leftBlock.getRawSlice();
+            int leftRawSliceOffset = leftBlock.getRawSliceOffset(leftPosition);
+            int leftLength = leftBlock.getSliceLength(leftPosition);
+
+            Slice rightRawSlice = rightBlock.getRawSlice();
+            int rightRawSliceOffset = rightBlock.getRawSliceOffset(rightPosition);
+            int rightLength = rightBlock.getSliceLength(rightPosition);
+
+            return leftRawSlice.compareTo(leftRawSliceOffset, leftLength, rightRawSlice, rightRawSliceOffset, rightLength);
+        }
+
+        @ScalarOperator(COMPARISON_UNORDERED_LAST)
+        private static long comparisonOperator(@BlockPosition VariableWidthBlock leftBlock, @BlockIndex int leftPosition, Slice right)
+        {
+            Slice leftRawSlice = leftBlock.getRawSlice();
+            int leftRawSliceOffset = leftBlock.getRawSliceOffset(leftPosition);
+            int leftLength = leftBlock.getSliceLength(leftPosition);
+
+            return leftRawSlice.compareTo(leftRawSliceOffset, leftLength, right, 0, right.length());
+        }
+
+        @ScalarOperator(COMPARISON_UNORDERED_LAST)
+        private static long comparisonOperator(Slice left, @BlockPosition VariableWidthBlock rightBlock, @BlockIndex int rightPosition)
+        {
+            Slice rightRawSlice = rightBlock.getRawSlice();
+            int rightRawSliceOffset = rightBlock.getRawSliceOffset(rightPosition);
+            int rightLength = rightBlock.getSliceLength(rightPosition);
+
+            return left.compareTo(0, left.length(), rightRawSlice, rightRawSliceOffset, rightLength);
+        }
+    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/ArrayType.java b/core/trino-spi/src/main/java/io/trino/spi/type/ArrayType.java
index ac29e3095cd0..5b904f16943c 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/ArrayType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/ArrayType.java
@@ -13,12 +13,14 @@
  */
 package io.trino.spi.type;
 
-import io.airlift.slice.Slice;
-import io.trino.spi.block.AbstractArrayBlock;
+import io.trino.spi.block.ArrayBlock;
 import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.DictionaryBlock;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.InvocationConvention;
 import io.trino.spi.function.OperatorMethodHandle;
@@ -27,21 +29,28 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.MethodType;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.BiFunction;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NULL_FLAG;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.type.StandardTypes.ARRAY;
 import static io.trino.spi.type.TypeUtils.NULL_HASH_CODE;
 import static io.trino.spi.type.TypeUtils.checkElementNotNull;
+import static java.lang.Math.toIntExact;
+import static java.lang.invoke.MethodHandles.insertArguments;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
@@ -49,12 +58,20 @@
 public class ArrayType
         extends AbstractType
 {
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, ByteOrder.LITTLE_ENDIAN);
+
+    private static final InvocationConvention READ_FLAT_CONVENTION = simpleConvention(FAIL_ON_NULL, FLAT);
+    private static final InvocationConvention READ_FLAT_TO_BLOCK_CONVENTION = simpleConvention(BLOCK_BUILDER, FLAT);
+    private static final InvocationConvention WRITE_FLAT_CONVENTION = simpleConvention(FLAT_RETURN, NEVER_NULL);
     private static final InvocationConvention EQUAL_CONVENTION = simpleConvention(NULLABLE_RETURN, NEVER_NULL, NEVER_NULL);
     private static final InvocationConvention HASH_CODE_CONVENTION = simpleConvention(FAIL_ON_NULL, NEVER_NULL);
     private static final InvocationConvention DISTINCT_FROM_CONVENTION = simpleConvention(FAIL_ON_NULL, BOXED_NULLABLE, BOXED_NULLABLE);
     private static final InvocationConvention INDETERMINATE_CONVENTION = simpleConvention(FAIL_ON_NULL, NULL_FLAG);
     private static final InvocationConvention COMPARISON_CONVENTION = simpleConvention(FAIL_ON_NULL, NEVER_NULL, NEVER_NULL);
 
+    private static final MethodHandle READ_FLAT;
+    private static final MethodHandle READ_FLAT_TO_BLOCK;
+    private static final MethodHandle WRITE_FLAT;
     private static final MethodHandle EQUAL;
     private static final MethodHandle HASH_CODE;
     private static final MethodHandle DISTINCT_FROM;
@@ -64,6 +81,9 @@ public class ArrayType
     static {
         try {
             Lookup lookup = MethodHandles.lookup();
+            READ_FLAT = lookup.findStatic(ArrayType.class, "readFlat", MethodType.methodType(Block.class, Type.class, MethodHandle.class, int.class, byte[].class, int.class, byte[].class));
+            READ_FLAT_TO_BLOCK = lookup.findStatic(ArrayType.class, "readFlatToBlock", MethodType.methodType(void.class, MethodHandle.class, int.class, byte[].class, int.class, byte[].class, BlockBuilder.class));
+            WRITE_FLAT = lookup.findStatic(ArrayType.class, "writeFlat", MethodType.methodType(void.class, Type.class, MethodHandle.class, int.class, boolean.class, Block.class, byte[].class, int.class, byte[].class, int.class));
             EQUAL = lookup.findStatic(ArrayType.class, "equalOperator", MethodType.methodType(Boolean.class, MethodHandle.class, Block.class, Block.class));
             HASH_CODE = lookup.findStatic(ArrayType.class, "hashOperator", MethodType.methodType(long.class, MethodHandle.class, Block.class));
             DISTINCT_FROM = lookup.findStatic(ArrayType.class, "distinctFromOperator", MethodType.methodType(boolean.class, MethodHandle.class, Block.class, Block.class));
@@ -79,13 +99,13 @@ public class ArrayType
 
     private final Type elementType;
 
-    // this field is used in double checked locking
+    // this field is used in double-checked locking
     @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
     private volatile TypeOperatorDeclaration operatorDeclaration;
 
     public ArrayType(Type elementType)
     {
-        super(new TypeSignature(ARRAY, TypeSignatureParameter.typeParameter(elementType.getTypeSignature())), Block.class);
+        super(new TypeSignature(ARRAY, TypeSignatureParameter.typeParameter(elementType.getTypeSignature())), Block.class, ArrayBlock.class);
         this.elementType = requireNonNull(elementType, "elementType is null");
     }
 
@@ -104,6 +124,7 @@ private synchronized void generateTypeOperators(TypeOperators typeOperators)
             return;
         }
         operatorDeclaration = TypeOperatorDeclaration.builder(getJavaType())
+                .addReadValueOperators(getReadValueOperatorMethodHandles(typeOperators, elementType))
                 .addEqualOperators(getEqualOperatorMethodHandles(typeOperators, elementType))
                 .addHashCodeOperators(getHashCodeOperatorMethodHandles(typeOperators, elementType))
                 .addXxHash64Operators(getXxHash64OperatorMethodHandles(typeOperators, elementType))
@@ -114,12 +135,26 @@ private synchronized void generateTypeOperators(TypeOperators typeOperators)
                 .build();
     }
 
+    private static List<OperatorMethodHandle> getReadValueOperatorMethodHandles(TypeOperators typeOperators, Type elementType)
+    {
+        MethodHandle elementReadOperator = typeOperators.getReadValueOperator(elementType, simpleConvention(BLOCK_BUILDER, FLAT));
+        MethodHandle readFlat = insertArguments(READ_FLAT, 0, elementType, elementReadOperator, elementType.getFlatFixedSize());
+        MethodHandle readFlatToBlock = insertArguments(READ_FLAT_TO_BLOCK, 0, elementReadOperator, elementType.getFlatFixedSize());
+
+        MethodHandle elementWriteOperator = typeOperators.getReadValueOperator(elementType, simpleConvention(FLAT_RETURN, VALUE_BLOCK_POSITION_NOT_NULL));
+        MethodHandle writeFlatToBlock = insertArguments(WRITE_FLAT, 0, elementType, elementWriteOperator, elementType.getFlatFixedSize(), elementType.isFlatVariableWidth());
+        return List.of(
+                new OperatorMethodHandle(READ_FLAT_CONVENTION, readFlat),
+                new OperatorMethodHandle(READ_FLAT_TO_BLOCK_CONVENTION, readFlatToBlock),
+                new OperatorMethodHandle(WRITE_FLAT_CONVENTION, writeFlatToBlock));
+    }
+
     private static List<OperatorMethodHandle> getEqualOperatorMethodHandles(TypeOperators typeOperators, Type elementType)
     {
         if (!elementType.isComparable()) {
             return emptyList();
         }
-        MethodHandle equalOperator = typeOperators.getEqualOperator(elementType, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION));
+        MethodHandle equalOperator = typeOperators.getEqualOperator(elementType, simpleConvention(NULLABLE_RETURN, VALUE_BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION_NOT_NULL));
         return singletonList(new OperatorMethodHandle(EQUAL_CONVENTION, EQUAL.bindTo(equalOperator)));
     }
 
@@ -128,7 +163,7 @@ private static List<OperatorMethodHandle> getHashCodeOperatorMethodHandles(TypeO
         if (!elementType.isComparable()) {
             return emptyList();
         }
-        MethodHandle elementHashCodeOperator = typeOperators.getHashCodeOperator(elementType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
+        MethodHandle elementHashCodeOperator = typeOperators.getHashCodeOperator(elementType, simpleConvention(FAIL_ON_NULL, VALUE_BLOCK_POSITION_NOT_NULL));
         return singletonList(new OperatorMethodHandle(HASH_CODE_CONVENTION, HASH_CODE.bindTo(elementHashCodeOperator)));
     }
 
@@ -137,7 +172,7 @@ private static List<OperatorMethodHandle> getXxHash64OperatorMethodHandles(TypeO
         if (!elementType.isComparable()) {
             return emptyList();
         }
-        MethodHandle elementHashCodeOperator = typeOperators.getXxHash64Operator(elementType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
+        MethodHandle elementHashCodeOperator = typeOperators.getXxHash64Operator(elementType, simpleConvention(FAIL_ON_NULL, VALUE_BLOCK_POSITION_NOT_NULL));
         return singletonList(new OperatorMethodHandle(HASH_CODE_CONVENTION, HASH_CODE.bindTo(elementHashCodeOperator)));
     }
 
@@ -146,7 +181,7 @@ private static List<OperatorMethodHandle> getDistinctFromOperatorInvokers(TypeOp
         if (!elementType.isComparable()) {
             return emptyList();
         }
-        MethodHandle elementDistinctFromOperator = typeOperators.getDistinctFromOperator(elementType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
+        MethodHandle elementDistinctFromOperator = typeOperators.getDistinctFromOperator(elementType, simpleConvention(FAIL_ON_NULL, VALUE_BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION_NOT_NULL));
         return singletonList(new OperatorMethodHandle(DISTINCT_FROM_CONVENTION, DISTINCT_FROM.bindTo(elementDistinctFromOperator)));
     }
 
@@ -155,7 +190,7 @@ private static List<OperatorMethodHandle> getIndeterminateOperatorInvokers(TypeO
         if (!elementType.isComparable()) {
             return emptyList();
         }
-        MethodHandle elementIndeterminateOperator = typeOperators.getIndeterminateOperator(elementType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
+        MethodHandle elementIndeterminateOperator = typeOperators.getIndeterminateOperator(elementType, simpleConvention(FAIL_ON_NULL, VALUE_BLOCK_POSITION_NOT_NULL));
         return singletonList(new OperatorMethodHandle(INDETERMINATE_CONVENTION, INDETERMINATE.bindTo(elementIndeterminateOperator)));
     }
 
@@ -164,7 +199,7 @@ private static List<OperatorMethodHandle> getComparisonOperatorInvokers(BiFuncti
         if (!elementType.isOrderable()) {
             return emptyList();
         }
-        MethodHandle elementComparisonOperator = comparisonOperatorFactory.apply(elementType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
+        MethodHandle elementComparisonOperator = comparisonOperatorFactory.apply(elementType, simpleConvention(FAIL_ON_NULL, VALUE_BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION_NOT_NULL));
         return singletonList(new OperatorMethodHandle(COMPARISON_CONVENTION, COMPARISON.bindTo(elementComparisonOperator)));
     }
 
@@ -192,10 +227,10 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        if (block instanceof AbstractArrayBlock) {
-            return ((AbstractArrayBlock) block).apply((valuesBlock, start, length) -> arrayBlockToObjectValues(session, valuesBlock, start, length), position);
+        if (block instanceof ArrayBlock) {
+            return ((ArrayBlock) block).apply((valuesBlock, start, length) -> arrayBlockToObjectValues(session, valuesBlock, start, length), position);
         }
-        Block arrayBlock = block.getObject(position, Block.class);
+        Block arrayBlock = getObject(block, position);
         return arrayBlockToObjectValues(session, arrayBlock, 0, arrayBlock.getPositionCount());
     }
 
@@ -222,49 +257,121 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
     }
 
     @Override
-    public Slice getSlice(Block block, int position)
+    public Block getObject(Block block, int position)
     {
-        return block.getSlice(position, 0, block.getSliceLength(position));
+        return read((ArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
-    public void writeSlice(BlockBuilder blockBuilder, Slice value)
+    public void writeObject(BlockBuilder blockBuilder, Object value)
     {
-        writeSlice(blockBuilder, value, 0, value.length());
+        Block arrayBlock = (Block) value;
+        ((ArrayBlockBuilder) blockBuilder).buildEntry(elementBuilder -> {
+            for (int i = 0; i < arrayBlock.getPositionCount(); i++) {
+                elementType.appendTo(arrayBlock, i, elementBuilder);
+            }
+        });
     }
 
+    // FLAT MEMORY LAYOUT
+    //
+    // All data of the array is stored in the variable width section. Within the variable width section,
+    // fixed data for all elements is stored first, followed by variable length data for all elements
+    // This simplifies the read implementation as we can simply step through the fixed section without
+    // knowing the variable length of each element, since each element stores the offset to its variable
+    // length data inside its fixed length data.
+    //
+    // In the current implementation, the element and null flag are stored in an interleaved flat record.
+    // This layout is not required by the format, and could be changed to a columnar if it is determined
+    // to be more efficient.
+    //
+    // Fixed:
+    //   int positionCount, int variableSizeOffset
+    // Variable:
+    //   byte element1Null, elementFixedSize element1FixedData
+    //   byte element2Null, elementFixedSize element2FixedData
+    //   ...
+    //   element1VariableSize element1VariableData
+    //   element2VariableSize element2VariableData
+    //   ...
+
     @Override
-    public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int length)
+    public int getFlatFixedSize()
     {
-        blockBuilder.writeBytes(value, offset, length).closeEntry();
+        return 8;
     }
 
     @Override
-    public Block getObject(Block block, int position)
+    public boolean isFlatVariableWidth()
     {
-        return block.getObject(position, Block.class);
+        return true;
     }
 
     @Override
-    public void writeObject(BlockBuilder blockBuilder, Object value)
+    public int getFlatVariableWidthSize(Block block, int position)
     {
-        Block arrayBlock = (Block) value;
+        Block array = getObject(block, position);
+        int arrayLength = array.getPositionCount();
+
+        int flatFixedSize = elementType.getFlatFixedSize();
+        boolean variableWidth = elementType.isFlatVariableWidth();
+
+        // one byte for null flag
+        long size = arrayLength * (flatFixedSize + 1L);
+        if (variableWidth) {
+            for (int index = 0; index < arrayLength; index++) {
+                if (!array.isNull(index)) {
+                    size += elementType.getFlatVariableWidthSize(array, index);
+                }
+            }
+        }
+        return toIntExact(size);
+    }
+
+    @Override
+    public int relocateFlatVariableWidthOffsets(byte[] fixedSizeSlice, int fixedSizeOffset, byte[] variableSizeSlice, int variableSizeOffset)
+    {
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + Integer.BYTES, variableSizeOffset);
+
+        int positionCount = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+        int elementFixedSize = elementType.getFlatFixedSize();
+        if (!elementType.isFlatVariableWidth()) {
+            return positionCount * (1 + elementFixedSize);
+        }
 
-        BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-        for (int i = 0; i < arrayBlock.getPositionCount(); i++) {
-            elementType.appendTo(arrayBlock, i, entryBuilder);
+        return relocateVariableWidthData(positionCount, elementFixedSize, variableSizeSlice, variableSizeOffset);
+    }
+
+    private int relocateVariableWidthData(int positionCount, int elementFixedSize, byte[] slice, int offset)
+    {
+        int writeFixedOffset = offset;
+        // variable width data starts after fixed width data
+        // there is one extra byte per position for the null flag
+        int writeVariableWidthOffset = offset + positionCount * (1 + elementFixedSize);
+        for (int index = 0; index < positionCount; index++) {
+            if (slice[writeFixedOffset] != 0) {
+                writeFixedOffset++;
+            }
+            else {
+                // skip null byte
+                writeFixedOffset++;
+
+                int elementVariableSize = elementType.relocateFlatVariableWidthOffsets(slice, writeFixedOffset, slice, writeVariableWidthOffset);
+                writeVariableWidthOffset += elementVariableSize;
+            }
+            writeFixedOffset += elementFixedSize;
         }
-        blockBuilder.closeEntry();
+        return writeVariableWidthOffset - offset;
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public ArrayBlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
     {
         return new ArrayBlockBuilder(elementType, blockBuilderStatus, expectedEntries, expectedBytesPerEntry);
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
+    public ArrayBlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         return createBlockBuilder(blockBuilderStatus, expectedEntries, 100);
     }
@@ -281,6 +388,137 @@ public String getDisplayName()
         return ARRAY + "(" + elementType.getDisplayName() + ")";
     }
 
+    private static Block read(ArrayBlock block, int position)
+    {
+        return block.getArray(position);
+    }
+
+    private static Block readFlat(
+            Type elementType,
+            MethodHandle elementReadFlat,
+            int elementFixedSize,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] variableSizeSlice)
+            throws Throwable
+    {
+        int positionCount = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+        int variableSizeOffset = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Integer.BYTES);
+        BlockBuilder elementBuilder = elementType.createBlockBuilder(null, positionCount);
+        readFlatElements(elementReadFlat, elementFixedSize, variableSizeSlice, variableSizeOffset, positionCount, elementBuilder);
+        return elementBuilder.build();
+    }
+
+    private static void readFlatToBlock(
+            MethodHandle elementReadFlat,
+            int elementFixedSize,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] variableSizeSlice,
+            BlockBuilder blockBuilder)
+            throws Throwable
+    {
+        int positionCount = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+        int variableSizeOffset = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Integer.BYTES);
+        ((ArrayBlockBuilder) blockBuilder).buildEntry(elementBuilder ->
+                readFlatElements(elementReadFlat, elementFixedSize, variableSizeSlice, variableSizeOffset, positionCount, elementBuilder));
+    }
+
+    private static void readFlatElements(MethodHandle elementReadFlat, int elementFixedSize, byte[] slice, int sliceOffset, int positionCount, BlockBuilder elementBuilder)
+            throws Throwable
+    {
+        for (int i = 0; i < positionCount; i++) {
+            boolean elementIsNull = slice[sliceOffset] != 0;
+            if (elementIsNull) {
+                elementBuilder.appendNull();
+            }
+            else {
+                elementReadFlat.invokeExact(
+                        slice,
+                        sliceOffset + 1,
+                        slice,
+                        elementBuilder);
+            }
+            sliceOffset += 1 + elementFixedSize;
+        }
+    }
+
+    private static void writeFlat(
+            Type elementType,
+            MethodHandle elementWriteFlat,
+            int elementFixedSize,
+            boolean elementVariableWidth,
+            Block array,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] variableSizeSlice,
+            int variableSizeOffset)
+            throws Throwable
+    {
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset, array.getPositionCount());
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + Integer.BYTES, variableSizeOffset);
+
+        writeFlatElements(elementType, elementWriteFlat, elementFixedSize, elementVariableWidth, array, variableSizeSlice, variableSizeOffset);
+    }
+
+    private static void writeFlatElements(Type elementType, MethodHandle elementWriteFlat, int elementFixedSize, boolean elementVariableWidth, Block array, byte[] slice, int offset)
+            throws Throwable
+    {
+        array = array.getLoadedBlock();
+
+        int positionCount = array.getPositionCount();
+        // variable width data starts after fixed width data
+        // there is one extra byte per position for the null flag
+        int writeVariableWidthOffset = offset + positionCount * (1 + elementFixedSize);
+        if (array instanceof ValueBlock valuesBlock) {
+            for (int index = 0; index < positionCount; index++) {
+                writeVariableWidthOffset = writeFlatElement(elementType, elementWriteFlat, elementVariableWidth, valuesBlock, index, slice, offset, writeVariableWidthOffset);
+                offset += 1 + elementFixedSize;
+            }
+        }
+        else if (array instanceof RunLengthEncodedBlock rleBlock) {
+            ValueBlock valuesBlock = rleBlock.getValue();
+            for (int index = 0; index < positionCount; index++) {
+                writeVariableWidthOffset = writeFlatElement(elementType, elementWriteFlat, elementVariableWidth, valuesBlock, 0, slice, offset, writeVariableWidthOffset);
+                offset += 1 + elementFixedSize;
+            }
+        }
+        else if (array instanceof DictionaryBlock dictionaryBlock) {
+            ValueBlock valuesBlock = dictionaryBlock.getDictionary();
+            for (int position = 0; position < positionCount; position++) {
+                int index = dictionaryBlock.getId(position);
+                writeVariableWidthOffset = writeFlatElement(elementType, elementWriteFlat, elementVariableWidth, valuesBlock, index, slice, offset, writeVariableWidthOffset);
+                offset += 1 + elementFixedSize;
+            }
+        }
+        else {
+            throw new IllegalArgumentException("Unsupported block type: " + array.getClass().getName());
+        }
+    }
+
+    private static int writeFlatElement(Type elementType, MethodHandle elementWriteFlat, boolean elementVariableWidth, ValueBlock array, int index, byte[] slice, int offset, int writeVariableWidthOffset)
+            throws Throwable
+    {
+        if (array.isNull(index)) {
+            slice[offset] = 1;
+        }
+        else {
+            int elementVariableSize = 0;
+            if (elementVariableWidth) {
+                elementVariableSize = elementType.getFlatVariableWidthSize(array, index);
+            }
+            elementWriteFlat.invokeExact(
+                    array,
+                    index,
+                    slice,
+                    offset + 1, // skip null byte
+                    slice,
+                    writeVariableWidthOffset);
+            writeVariableWidthOffset += elementVariableSize;
+        }
+        return writeVariableWidthOffset;
+    }
+
     private static Boolean equalOperator(MethodHandle equalOperator, Block leftArray, Block rightArray)
             throws Throwable
     {
@@ -288,13 +526,21 @@ private static Boolean equalOperator(MethodHandle equalOperator, Block leftArray
             return false;
         }
 
+        leftArray = leftArray.getLoadedBlock();
+        rightArray = rightArray.getLoadedBlock();
+
+        ValueBlock leftValues = leftArray.getUnderlyingValueBlock();
+        ValueBlock rightValues = rightArray.getUnderlyingValueBlock();
+
         boolean unknown = false;
         for (int position = 0; position < leftArray.getPositionCount(); position++) {
-            if (leftArray.isNull(position) || rightArray.isNull(position)) {
+            int leftIndex = leftArray.getUnderlyingValuePosition(position);
+            int rightIndex = rightArray.getUnderlyingValuePosition(position);
+            if (leftValues.isNull(leftIndex) || rightValues.isNull(rightIndex)) {
                 unknown = true;
                 continue;
             }
-            Boolean result = (Boolean) equalOperator.invokeExact(leftArray, position, rightArray, position);
+            Boolean result = (Boolean) equalOperator.invokeExact(leftValues, leftIndex, rightValues, rightIndex);
             if (result == null) {
                 unknown = true;
             }
@@ -309,15 +555,43 @@ else if (!result) {
         return true;
     }
 
-    private static long hashOperator(MethodHandle hashOperator, Block block)
+    private static long hashOperator(MethodHandle hashOperator, Block array)
             throws Throwable
     {
-        long hash = 0;
-        for (int position = 0; position < block.getPositionCount(); position++) {
-            long elementHash = block.isNull(position) ? NULL_HASH_CODE : (long) hashOperator.invokeExact(block, position);
-            hash = 31 * hash + elementHash;
+        array = array.getLoadedBlock();
+
+        if (array instanceof ValueBlock valuesBlock) {
+            long hash = 0;
+            for (int index = 0; index < valuesBlock.getPositionCount(); index++) {
+                long elementHash = valuesBlock.isNull(index) ? NULL_HASH_CODE : (long) hashOperator.invokeExact(valuesBlock, index);
+                hash = 31 * hash + elementHash;
+            }
+            return hash;
+        }
+
+        if (array instanceof RunLengthEncodedBlock rleBlock) {
+            ValueBlock valuesBlock = rleBlock.getValue();
+            long elementHash = valuesBlock.isNull(0) ? NULL_HASH_CODE : (long) hashOperator.invokeExact(valuesBlock, 0);
+
+            long hash = 0;
+            for (int position = 0; position < valuesBlock.getPositionCount(); position++) {
+                hash = 31 * hash + elementHash;
+            }
+            return hash;
+        }
+
+        if (array instanceof DictionaryBlock dictionaryBlock) {
+            ValueBlock valuesBlock = dictionaryBlock.getDictionary();
+            long hash = 0;
+            for (int position = 0; position < valuesBlock.getPositionCount(); position++) {
+                int index = dictionaryBlock.getId(position);
+                long elementHash = valuesBlock.isNull(position) ? NULL_HASH_CODE : (long) hashOperator.invokeExact(valuesBlock, index);
+                hash = 31 * hash + elementHash;
+            }
+            return hash;
         }
-        return hash;
+
+        throw new IllegalArgumentException("Unsupported block type: " + array.getClass().getName());
     }
 
     private static boolean distinctFromOperator(MethodHandle distinctFromOperator, Block leftArray, Block rightArray)
@@ -333,8 +607,26 @@ private static boolean distinctFromOperator(MethodHandle distinctFromOperator, B
             return true;
         }
 
+        leftArray = leftArray.getLoadedBlock();
+        rightArray = rightArray.getLoadedBlock();
+
+        ValueBlock leftValues = leftArray.getUnderlyingValueBlock();
+        ValueBlock rightValues = rightArray.getUnderlyingValueBlock();
+
         for (int position = 0; position < leftArray.getPositionCount(); position++) {
-            boolean result = (boolean) distinctFromOperator.invokeExact(leftArray, position, rightArray, position);
+            int leftIndex = leftArray.getUnderlyingValuePosition(position);
+            int rightIndex = rightArray.getUnderlyingValuePosition(position);
+
+            boolean leftValueIsNull = leftValues.isNull(leftIndex);
+            boolean rightValueIsNull = rightValues.isNull(rightIndex);
+            if (leftValueIsNull != rightValueIsNull) {
+                return true;
+            }
+            if (leftValueIsNull) {
+                continue;
+            }
+
+            boolean result = (boolean) distinctFromOperator.invokeExact(leftValues, leftIndex, rightValues, rightIndex);
             if (result) {
                 return true;
             }
@@ -343,33 +635,73 @@ private static boolean distinctFromOperator(MethodHandle distinctFromOperator, B
         return false;
     }
 
-    private static boolean indeterminateOperator(MethodHandle elementIndeterminateFunction, Block block, boolean isNull)
+    private static boolean indeterminateOperator(MethodHandle elementIndeterminateFunction, Block array, boolean isNull)
             throws Throwable
     {
         if (isNull) {
             return true;
         }
 
-        for (int position = 0; position < block.getPositionCount(); position++) {
-            if (block.isNull(position)) {
+        array = array.getLoadedBlock();
+
+        if (array instanceof ValueBlock valuesBlock) {
+            for (int index = 0; index < valuesBlock.getPositionCount(); index++) {
+                if (valuesBlock.isNull(index)) {
+                    return true;
+                }
+                if ((boolean) elementIndeterminateFunction.invoke(valuesBlock, index)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        if (array instanceof RunLengthEncodedBlock rleBlock) {
+            ValueBlock valuesBlock = rleBlock.getValue();
+            if (valuesBlock.isNull(0)) {
                 return true;
             }
-            if ((boolean) elementIndeterminateFunction.invoke(block, position)) {
+            if ((boolean) elementIndeterminateFunction.invoke(valuesBlock, 0)) {
                 return true;
             }
+            return false;
         }
-        return false;
+
+        if (array instanceof DictionaryBlock dictionaryBlock) {
+            ValueBlock valuesBlock = dictionaryBlock.getDictionary();
+            for (int position = 0; position < valuesBlock.getPositionCount(); position++) {
+                int index = dictionaryBlock.getId(position);
+                if (valuesBlock.isNull(index)) {
+                    return true;
+                }
+                if ((boolean) elementIndeterminateFunction.invoke(valuesBlock, index)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        throw new IllegalArgumentException("Unsupported block type: " + array.getClass().getName());
     }
 
     private static long comparisonOperator(MethodHandle comparisonOperator, Block leftArray, Block rightArray)
             throws Throwable
     {
+        leftArray = leftArray.getLoadedBlock();
+        rightArray = rightArray.getLoadedBlock();
+
+        ValueBlock leftValues = leftArray.getUnderlyingValueBlock();
+        ValueBlock rightValues = rightArray.getUnderlyingValueBlock();
+
         int len = Math.min(leftArray.getPositionCount(), rightArray.getPositionCount());
         for (int position = 0; position < len; position++) {
             checkElementNotNull(leftArray.isNull(position), ARRAY_NULL_ELEMENT_MSG);
             checkElementNotNull(rightArray.isNull(position), ARRAY_NULL_ELEMENT_MSG);
 
-            long result = (long) comparisonOperator.invokeExact(leftArray, position, rightArray, position);
+            int leftIndex = leftArray.getUnderlyingValuePosition(position);
+            int rightIndex = rightArray.getUnderlyingValuePosition(position);
+
+            long result = (long) comparisonOperator.invokeExact(leftValues, leftIndex, rightValues, rightIndex);
             if (result != 0) {
                 return result;
             }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/BigintType.java b/core/trino-spi/src/main/java/io/trino/spi/type/BigintType.java
index 8c6bd5dc61ac..7fb7b46fed51 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/BigintType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/BigintType.java
@@ -37,7 +37,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return block.getLong(position, 0);
+        return getLong(block, position);
     }
 
     @Override
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/BooleanType.java b/core/trino-spi/src/main/java/io/trino/spi/type/BooleanType.java
index 226248866dec..d2195f2c1619 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/BooleanType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/BooleanType.java
@@ -21,6 +21,11 @@
 import io.trino.spi.block.ByteArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
 import java.util.Optional;
@@ -29,6 +34,7 @@
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.invoke.MethodHandles.lookup;
@@ -63,7 +69,7 @@ public static Block createBlockForSingleNonNullValue(boolean value)
 
     private BooleanType()
     {
-        super(new TypeSignature(StandardTypes.BOOLEAN), boolean.class);
+        super(new TypeSignature(StandardTypes.BOOLEAN), boolean.class, ByteArrayBlock.class);
     }
 
     @Override
@@ -124,7 +130,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return block.getByte(position, 0) != 0;
+        return getBoolean(block, position);
     }
 
     @Override
@@ -134,20 +140,26 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeByte(block.getByte(position, 0)).closeEntry();
+            ((ByteArrayBlockBuilder) blockBuilder).writeByte(getBoolean(block, position) ? (byte) 1 : 0);
         }
     }
 
     @Override
     public boolean getBoolean(Block block, int position)
     {
-        return block.getByte(position, 0) != 0;
+        return read((ByteArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
     public void writeBoolean(BlockBuilder blockBuilder, boolean value)
     {
-        blockBuilder.writeByte(value ? 1 : 0).closeEntry();
+        ((ByteArrayBlockBuilder) blockBuilder).writeByte((byte) (value ? 1 : 0));
+    }
+
+    @Override
+    public int getFlatFixedSize()
+    {
+        return 1;
     }
 
     @Override
@@ -162,6 +174,32 @@ public int hashCode()
         return getClass().hashCode();
     }
 
+    @ScalarOperator(READ_VALUE)
+    private static boolean read(@BlockPosition ByteArrayBlock block, @BlockIndex int position)
+    {
+        return block.getByte(position) != 0;
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static boolean readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return fixedSizeSlice[fixedSizeOffset] != 0;
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            boolean value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        fixedSizeSlice[fixedSizeOffset] = (byte) (value ? 1 : 0);
+    }
+
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(boolean left, boolean right)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/CharType.java b/core/trino-spi/src/main/java/io/trino/spi/type/CharType.java
index f2b77164305a..b9e1967a848a 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/CharType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/CharType.java
@@ -16,13 +16,12 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceUtf8;
 import io.airlift.slice.Slices;
-import io.airlift.slice.XxHash64;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.function.BlockIndex;
-import io.trino.spi.function.BlockPosition;
 import io.trino.spi.function.ScalarOperator;
 
 import java.util.Objects;
@@ -30,12 +29,9 @@
 
 import static io.airlift.slice.SliceUtf8.countCodePoints;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
-import static io.trino.spi.function.OperatorType.EQUAL;
-import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.Chars.compareChars;
 import static io.trino.spi.type.Chars.padSpaces;
 import static io.trino.spi.type.Slices.sliceRepresentation;
-import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.Character.MAX_CODE_POINT;
 import static java.lang.Character.MIN_CODE_POINT;
 import static java.lang.Math.toIntExact;
@@ -46,7 +42,11 @@
 public final class CharType
         extends AbstractVariableWidthType
 {
-    private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(CharType.class, lookup(), Slice.class);
+    private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = TypeOperatorDeclaration.builder(Slice.class)
+            .addOperators(DEFAULT_READ_OPERATORS)
+            .addOperators(DEFAULT_COMPARABLE_OPERATORS)
+            .addOperators(CharType.class, lookup())
+            .build();
 
     public static final int MAX_LENGTH = 65_536;
     private static final CharType[] CACHED_INSTANCES = new CharType[128];
@@ -126,7 +126,7 @@ public Optional<Range> getRange()
         if (!cachedRangePresent) {
             if (length > 100) {
                 // The max/min values may be materialized in the plan, so we don't want them to be too large.
-                // Range comparison against large values are usually nonsensical, too, so no need to support them
+                // Range comparison against large values is usually nonsensical, too, so no need to support them
                 // beyond a certain size. They specific choice above is arbitrary and can be adjusted if needed.
                 range = Optional.empty();
             }
@@ -159,7 +159,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        Slice slice = block.getSlice(position, 0, block.getSliceLength(position));
+        Slice slice = getSlice(block, position);
         if (slice.length() > 0) {
             if (countCodePoints(slice) > length) {
                 throw new IllegalArgumentException(format("Character count exceeds length limit %s: %s", length, sliceRepresentation(slice)));
@@ -173,29 +173,19 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
+    public VariableWidthBlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         // If bound on length of char is smaller than EXPECTED_BYTES_PER_ENTRY, use that as expectedBytesPerEntry
         // The data can take up to 4 bytes per character due to UTF-8 encoding, but we assume it is ASCII and only needs one byte.
         return createBlockBuilder(blockBuilderStatus, expectedEntries, Math.min(length, EXPECTED_BYTES_PER_ENTRY));
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
-    }
-
     @Override
     public Slice getSlice(Block block, int position)
     {
-        return block.getSlice(position, 0, block.getSliceLength(position));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return valueBlock.getSlice(valuePosition);
     }
 
     public void writeString(BlockBuilder blockBuilder, String value)
@@ -215,7 +205,7 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int l
         if (length > 0 && value.getByte(offset + length - 1) == ' ') {
             throw new IllegalArgumentException("Slice representing Char should not have trailing spaces");
         }
-        blockBuilder.writeBytes(value, offset, length).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(value, offset, length);
     }
 
     @Override
@@ -239,35 +229,6 @@ public int hashCode()
         return Objects.hash(length);
     }
 
-    @ScalarOperator(EQUAL)
-    private static boolean equalOperator(Slice left, Slice right)
-    {
-        return left.equals(right);
-    }
-
-    @ScalarOperator(EQUAL)
-    private static boolean equalOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
-    {
-        int leftLength = leftBlock.getSliceLength(leftPosition);
-        int rightLength = rightBlock.getSliceLength(rightPosition);
-        if (leftLength != rightLength) {
-            return false;
-        }
-        return leftBlock.equals(leftPosition, 0, rightBlock, rightPosition, 0, leftLength);
-    }
-
-    @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(Slice value)
-    {
-        return XxHash64.hash(value);
-    }
-
-    @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(@BlockPosition Block block, @BlockIndex int position)
-    {
-        return block.hash(position, 0, block.getSliceLength(position));
-    }
-
     @ScalarOperator(COMPARISON_UNORDERED_LAST)
     private static long comparisonOperator(Slice left, Slice right)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/DateType.java b/core/trino-spi/src/main/java/io/trino/spi/type/DateType.java
index be74bb309a49..5dad5193338f 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/DateType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/DateType.java
@@ -23,7 +23,7 @@
 //
 // Note: when dealing with a java.sql.Date it is important to remember that the value is stored
 // as the number of milliseconds from 1970-01-01T00:00:00 in UTC but time must be midnight in
-// the local time zone.  This mean when converting between a java.sql.Date and this
+// the local time zone.  This means when converting between a java.sql.Date and this
 // type, the time zone offset must be added or removed to keep the time at midnight in UTC.
 //
 public final class DateType
@@ -43,7 +43,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        int days = block.getInt(position, 0);
+        int days = getInt(block, position);
         return new SqlDate(days);
     }
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/DecimalConversions.java b/core/trino-spi/src/main/java/io/trino/spi/type/DecimalConversions.java
index 5bdc417debe2..4dce2709a654 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/DecimalConversions.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/DecimalConversions.java
@@ -122,7 +122,17 @@ private static Int128 internalDoubleToLongDecimal(double value, long precision,
         }
     }
 
+    /**
+     * @deprecated Use {@link #realToShortDecimal(float, long, long)} instead
+     */
+    @Deprecated(forRemoval = true)
     public static long realToShortDecimal(long value, long precision, long scale)
+    {
+        float floatValue = intBitsToFloat(intScale(value));
+        return realToShortDecimal(floatValue, precision, scale);
+    }
+
+    public static long realToShortDecimal(float value, long precision, long scale)
     {
         // TODO: implement specialized version for short decimals
         Int128 decimal = realToLongDecimal(value, precision, scale);
@@ -135,9 +145,18 @@ public static long realToShortDecimal(long value, long precision, long scale)
         return low;
     }
 
+    /**
+     * @deprecated Use {@link #realToLongDecimal(float, long, long)} instead
+     */
+    @Deprecated(forRemoval = true)
     public static Int128 realToLongDecimal(long value, long precision, long scale)
     {
         float floatValue = intBitsToFloat(intScale(value));
+        return realToLongDecimal(floatValue, precision, scale);
+    }
+
+    public static Int128 realToLongDecimal(float floatValue, long precision, long scale)
+    {
         if (Float.isInfinite(floatValue) || Float.isNaN(floatValue)) {
             throw new TrinoException(INVALID_CAST_ARGUMENT, format("Cannot cast REAL '%s' to DECIMAL(%s, %s)", floatValue, precision, scale));
         }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/DecimalType.java b/core/trino-spi/src/main/java/io/trino/spi/type/DecimalType.java
index efaaba6a2f51..828780d5ba16 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/DecimalType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/DecimalType.java
@@ -14,6 +14,7 @@
 package io.trino.spi.type;
 
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ValueBlock;
 
 import java.util.List;
 
@@ -60,9 +61,9 @@ public static DecimalType createDecimalType()
     private final int precision;
     private final int scale;
 
-    DecimalType(int precision, int scale, Class<?> javaType)
+    DecimalType(int precision, int scale, Class<?> javaType, Class<? extends ValueBlock> valueBlockType)
     {
-        super(new TypeSignature(StandardTypes.DECIMAL, buildTypeParameters(precision, scale)), javaType);
+        super(new TypeSignature(StandardTypes.DECIMAL, buildTypeParameters(precision, scale)), javaType, valueBlockType);
         this.precision = precision;
         this.scale = scale;
     }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/Decimals.java b/core/trino-spi/src/main/java/io/trino/spi/type/Decimals.java
index ec9af3a84596..9ed0664a1e0c 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/Decimals.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/Decimals.java
@@ -16,6 +16,7 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.LongArrayBlockBuilder;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -45,7 +46,7 @@ private Decimals() {}
     public static final int MAX_PRECISION = 38;
     public static final int MAX_SHORT_PRECISION = 18;
 
-    private static final Pattern DECIMAL_PATTERN = Pattern.compile("(\\+?|-?)((0*)(\\d*))(\\.(\\d*))?");
+    private static final Pattern DECIMAL_PATTERN = Pattern.compile("([+-]?)(\\d(?:_?\\d)*)?(?:\\.(\\d(?:_?\\d)*)?)?");
 
     private static final int LONG_POWERS_OF_TEN_TABLE_LENGTH = 19;
     private static final int BIG_INTEGER_POWERS_OF_TEN_TABLE_LENGTH = 100;
@@ -77,28 +78,30 @@ public static DecimalParseResult parse(String stringValue)
     {
         Matcher matcher = DECIMAL_PATTERN.matcher(stringValue);
         if (!matcher.matches()) {
-            throw new IllegalArgumentException("Invalid decimal value '" + stringValue + "'");
+            throw new IllegalArgumentException("Invalid DECIMAL value '" + stringValue + "'");
         }
 
         String sign = getMatcherGroup(matcher, 1);
         if (sign.isEmpty()) {
             sign = "+";
         }
-        String leadingZeros = getMatcherGroup(matcher, 3);
-        String integralPart = getMatcherGroup(matcher, 4);
-        String fractionalPart = getMatcherGroup(matcher, 6);
+        String integralPart = getMatcherGroup(matcher, 2);
+        String fractionalPart = getMatcherGroup(matcher, 3);
 
-        if (leadingZeros.isEmpty() && integralPart.isEmpty() && fractionalPart.isEmpty()) {
-            throw new IllegalArgumentException("Invalid decimal value '" + stringValue + "'");
+        if (integralPart.isEmpty() && fractionalPart.isEmpty()) {
+            throw new IllegalArgumentException("Invalid DECIMAL value '" + stringValue + "'");
         }
 
+        integralPart = stripLeadingZeros(integralPart.replace("_", ""));
+        fractionalPart = fractionalPart.replace("_", "");
+
         int scale = fractionalPart.length();
         int precision = integralPart.length() + scale;
         if (precision == 0) {
             precision = 1;
         }
 
-        String unscaledValue = sign + leadingZeros + integralPart + fractionalPart;
+        String unscaledValue = sign + (integralPart.isEmpty() ? "0" : "") + integralPart + fractionalPart;
         Object value;
         if (precision <= MAX_SHORT_PRECISION) {
             value = Long.parseLong(unscaledValue);
@@ -114,6 +117,17 @@ public static DecimalParseResult parse(String stringValue)
         return new DecimalParseResult(value, createDecimalType(precision, scale));
     }
 
+    private static String stripLeadingZeros(String number)
+    {
+        for (int i = 0; i < number.length(); i++) {
+            if (number.charAt(i) != '0') {
+                return number.substring(i);
+            }
+        }
+
+        return "";
+    }
+
     private static String getMatcherGroup(MatchResult matcher, int group)
     {
         String groupValue = matcher.group(group);
@@ -240,7 +254,7 @@ public static BigDecimal rescale(BigDecimal value, DecimalType type)
 
     public static void writeShortDecimal(BlockBuilder blockBuilder, long value)
     {
-        blockBuilder.writeLong(value).closeEntry();
+        ((LongArrayBlockBuilder) blockBuilder).writeLong(value);
     }
 
     public static long rescale(long value, int fromScale, int toScale)
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/DoubleType.java b/core/trino-spi/src/main/java/io/trino/spi/type/DoubleType.java
index 5ecbd37bf60c..4a9175875e70 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/DoubleType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/DoubleType.java
@@ -17,12 +17,21 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.LongArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.IsNull;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
 import java.util.Optional;
 
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_FIRST;
@@ -32,6 +41,7 @@
 import static io.trino.spi.function.OperatorType.IS_DISTINCT_FROM;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.Double.doubleToLongBits;
@@ -43,12 +53,13 @@ public final class DoubleType
         implements FixedWidthType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(DoubleType.class, lookup(), double.class);
+    private static final VarHandle DOUBLE_HANDLE = MethodHandles.byteArrayViewVarHandle(double[].class, ByteOrder.LITTLE_ENDIAN);
 
     public static final DoubleType DOUBLE = new DoubleType();
 
     private DoubleType()
     {
-        super(new TypeSignature(StandardTypes.DOUBLE), double.class);
+        super(new TypeSignature(StandardTypes.DOUBLE), double.class, LongArrayBlock.class);
     }
 
     @Override
@@ -81,7 +92,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         if (block.isNull(position)) {
             return null;
         }
-        return longBitsToDouble(block.getLong(position, 0));
+        return getDouble(block, position);
     }
 
     @Override
@@ -91,20 +102,22 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeLong(block.getLong(position, 0)).closeEntry();
+            LongArrayBlock valueBlock = (LongArrayBlock) block.getUnderlyingValueBlock();
+            int valuePosition = block.getUnderlyingValuePosition(position);
+            ((LongArrayBlockBuilder) blockBuilder).writeLong(valueBlock.getLong(valuePosition));
         }
     }
 
     @Override
     public double getDouble(Block block, int position)
     {
-        return longBitsToDouble(block.getLong(position, 0));
+        return read((LongArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
     public void writeDouble(BlockBuilder blockBuilder, double value)
     {
-        blockBuilder.writeLong(doubleToLongBits(value)).closeEntry();
+        ((LongArrayBlockBuilder) blockBuilder).writeLong(doubleToLongBits(value));
     }
 
     @Override
@@ -134,6 +147,12 @@ public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
         return new LongArrayBlockBuilder(null, positionCount);
     }
 
+    @Override
+    public int getFlatFixedSize()
+    {
+        return Double.BYTES;
+    }
+
     @Override
     @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
     public boolean equals(Object other)
@@ -155,6 +174,33 @@ public Optional<Range> getRange()
         return Optional.empty();
     }
 
+    @ScalarOperator(READ_VALUE)
+    private static double read(@BlockPosition LongArrayBlock block, @BlockIndex int position)
+    {
+        return longBitsToDouble(block.getLong(position));
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static double readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return (double) DOUBLE_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            double value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        DOUBLE_HANDLE.set(fixedSizeSlice, fixedSizeOffset, value);
+    }
+
+    @SuppressWarnings("FloatingPointEquality")
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(double left, double right)
     {
@@ -179,6 +225,7 @@ public static long xxHash64(double value)
         return XxHash64.hash(doubleToLongBits(value));
     }
 
+    @SuppressWarnings("FloatingPointEquality")
     @ScalarOperator(IS_DISTINCT_FROM)
     private static boolean distinctFromOperator(double left, @IsNull boolean leftNull, double right, @IsNull boolean rightNull)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/FixedWidthType.java b/core/trino-spi/src/main/java/io/trino/spi/type/FixedWidthType.java
index 38ae6c49d64b..5d6d69972e0a 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/FixedWidthType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/FixedWidthType.java
@@ -13,6 +13,7 @@
  */
 package io.trino.spi.type;
 
+import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 
 /**
@@ -32,4 +33,22 @@ public interface FixedWidthType
      * of positions.
      */
     BlockBuilder createFixedSizeBlockBuilder(int positionCount);
+
+    @Override
+    default boolean isFlatVariableWidth()
+    {
+        return false;
+    }
+
+    @Override
+    default int getFlatVariableWidthSize(Block block, int position)
+    {
+        return 0;
+    }
+
+    @Override
+    default int relocateFlatVariableWidthOffsets(byte[] fixedSizeSlice, int fixedSizeOffset, byte[] variableSizeSlice, int variableSizeOffset)
+    {
+        return 0;
+    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/HyperLogLogType.java b/core/trino-spi/src/main/java/io/trino/spi/type/HyperLogLogType.java
index 26a9ae187b75..15be6c253302 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/HyperLogLogType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/HyperLogLogType.java
@@ -17,6 +17,8 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 
 // Layout is <size>:<hll>, where
@@ -33,22 +35,12 @@ public HyperLogLogType()
         super(new TypeSignature(StandardTypes.HYPER_LOG_LOG), Slice.class);
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
-    }
-
     @Override
     public Slice getSlice(Block block, int position)
     {
-        return block.getSlice(position, 0, block.getSliceLength(position));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return valueBlock.getSlice(valuePosition);
     }
 
     @Override
@@ -60,7 +52,7 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value)
     @Override
     public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int length)
     {
-        blockBuilder.writeBytes(value, offset, length).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(value, offset, length);
     }
 
     @Override
@@ -70,6 +62,6 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return new SqlVarbinary(block.getSlice(position, 0, block.getSliceLength(position)).getBytes());
+        return new SqlVarbinary(getSlice(block, position).getBytes());
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/IntegerType.java b/core/trino-spi/src/main/java/io/trino/spi/type/IntegerType.java
index 0726dabb941d..7d9da63bbaba 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/IntegerType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/IntegerType.java
@@ -37,7 +37,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return block.getInt(position, 0);
+        return getInt(block, position);
     }
 
     @Override
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/LongDecimalType.java b/core/trino-spi/src/main/java/io/trino/spi/type/LongDecimalType.java
index 22e6028e7e81..1519ecacecfd 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/LongDecimalType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/LongDecimalType.java
@@ -17,18 +17,27 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.Int128ArrayBlock;
 import io.trino.spi.block.Int128ArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BlockIndex;
 import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 import java.math.BigInteger;
+import java.nio.ByteOrder;
 
 import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
+import static io.trino.spi.block.Int128ArrayBlock.INT128_BYTES;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 import static io.trino.spi.function.OperatorType.EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.invoke.MethodHandles.lookup;
@@ -37,10 +46,11 @@ final class LongDecimalType
         extends DecimalType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(LongDecimalType.class, lookup(), Int128.class);
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
 
     LongDecimalType(int precision, int scale)
     {
-        super(precision, scale, Int128.class);
+        super(precision, scale, Int128.class, Int128ArrayBlock.class);
         checkArgument(Decimals.MAX_SHORT_PRECISION < precision && precision <= Decimals.MAX_PRECISION, "Invalid precision: %s", precision);
         checkArgument(0 <= scale && scale <= precision, "Invalid scale for precision %s: %s", precision, scale);
     }
@@ -90,7 +100,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         if (block.isNull(position)) {
             return null;
         }
-        Int128 value = (Int128) getObject(block, position);
+        Int128 value = getObject(block, position);
         BigInteger unscaledValue = value.toBigInteger();
         return new SqlDecimal(unscaledValue, getPrecision(), getScale());
     }
@@ -102,9 +112,9 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeLong(block.getLong(position, 0));
-            blockBuilder.writeLong(block.getLong(position, SIZE_OF_LONG));
-            blockBuilder.closeEntry();
+            Int128ArrayBlock valueBlock = (Int128ArrayBlock) block.getUnderlyingValueBlock();
+            int valuePosition = block.getUnderlyingValuePosition(position);
+            ((Int128ArrayBlockBuilder) blockBuilder).writeInt128(valueBlock.getInt128High(valuePosition), valueBlock.getInt128Low(valuePosition));
         }
     }
 
@@ -112,17 +122,73 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
     public void writeObject(BlockBuilder blockBuilder, Object value)
     {
         Int128 decimal = (Int128) value;
-        blockBuilder.writeLong(decimal.getHigh());
-        blockBuilder.writeLong(decimal.getLow());
-        blockBuilder.closeEntry();
+        ((Int128ArrayBlockBuilder) blockBuilder).writeInt128(decimal.getHigh(), decimal.getLow());
     }
 
     @Override
-    public Object getObject(Block block, int position)
+    public Int128 getObject(Block block, int position)
+    {
+        return read((Int128ArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
+    }
+
+    @Override
+    public int getFlatFixedSize()
+    {
+        return INT128_BYTES;
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static Int128 read(@BlockPosition Int128ArrayBlock block, @BlockIndex int position)
+    {
+        return block.getInt128(position);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static Int128 readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
     {
         return Int128.valueOf(
-                block.getLong(position, 0),
-                block.getLong(position, SIZE_OF_LONG));
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset),
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG));
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void readFlatToBlock(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice,
+            BlockBuilder blockBuilder)
+    {
+        ((Int128ArrayBlockBuilder) blockBuilder).writeInt128(
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset),
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG));
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            Int128 value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, value.getHigh());
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG, value.getLow());
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeBlockToFlat(
+            @BlockPosition Int128ArrayBlock block,
+            @BlockIndex int position,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, block.getInt128High(position));
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG, block.getInt128Low(position));
     }
 
     @ScalarOperator(EQUAL)
@@ -132,10 +198,10 @@ private static boolean equalOperator(Int128 left, Int128 right)
     }
 
     @ScalarOperator(EQUAL)
-    private static boolean equalOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static boolean equalOperator(@BlockPosition Int128ArrayBlock leftBlock, @BlockIndex int leftPosition, @BlockPosition Int128ArrayBlock rightBlock, @BlockIndex int rightPosition)
     {
-        return leftBlock.getLong(leftPosition, 0) == rightBlock.getLong(rightPosition, 0) &&
-                leftBlock.getLong(leftPosition, SIZE_OF_LONG) == rightBlock.getLong(rightPosition, SIZE_OF_LONG);
+        return leftBlock.getInt128High(leftPosition) == rightBlock.getInt128High(rightPosition) &&
+                leftBlock.getInt128Low(leftPosition) == rightBlock.getInt128Low(rightPosition);
     }
 
     @ScalarOperator(XX_HASH_64)
@@ -145,9 +211,9 @@ private static long xxHash64Operator(Int128 value)
     }
 
     @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(@BlockPosition Block block, @BlockIndex int position)
+    private static long xxHash64Operator(@BlockPosition Int128ArrayBlock block, @BlockIndex int position)
     {
-        return xxHash64(block.getLong(position, 0), block.getLong(position, SIZE_OF_LONG));
+        return xxHash64(block.getInt128High(position), block.getInt128Low(position));
     }
 
     private static long xxHash64(long low, long high)
@@ -162,12 +228,12 @@ private static long comparisonOperator(Int128 left, Int128 right)
     }
 
     @ScalarOperator(COMPARISON_UNORDERED_LAST)
-    private static long comparisonOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static long comparisonOperator(@BlockPosition Int128ArrayBlock leftBlock, @BlockIndex int leftPosition, @BlockPosition Int128ArrayBlock rightBlock, @BlockIndex int rightPosition)
     {
         return Int128.compare(
-                leftBlock.getLong(leftPosition, 0),
-                leftBlock.getLong(leftPosition, SIZE_OF_LONG),
-                rightBlock.getLong(rightPosition, 0),
-                rightBlock.getLong(rightPosition, SIZE_OF_LONG));
+                leftBlock.getInt128High(leftPosition),
+                leftBlock.getInt128Low(leftPosition),
+                rightBlock.getInt128High(rightPosition),
+                rightBlock.getInt128Low(rightPosition));
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/LongTimeWithTimeZoneType.java b/core/trino-spi/src/main/java/io/trino/spi/type/LongTimeWithTimeZoneType.java
index 504ef457f7df..9fc12b124a0f 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/LongTimeWithTimeZoneType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/LongTimeWithTimeZoneType.java
@@ -17,19 +17,28 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
-import io.trino.spi.block.Int96ArrayBlockBuilder;
+import io.trino.spi.block.Fixed12Block;
+import io.trino.spi.block.Fixed12BlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BlockIndex;
 import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
+
 import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TimeWithTimeZoneTypes.normalizePicos;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
@@ -40,10 +49,12 @@ final class LongTimeWithTimeZoneType
         extends TimeWithTimeZoneType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(LongTimeWithTimeZoneType.class, lookup(), LongTimeWithTimeZone.class);
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, ByteOrder.LITTLE_ENDIAN);
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
 
     public LongTimeWithTimeZoneType(int precision)
     {
-        super(precision, LongTimeWithTimeZone.class);
+        super(precision, LongTimeWithTimeZone.class, Fixed12Block.class);
 
         if (precision < MAX_SHORT_PRECISION + 1 || precision > MAX_PRECISION) {
             throw new IllegalArgumentException(format("Precision must be in the range [%s, %s]", MAX_SHORT_PRECISION + 1, MAX_PRECISION));
@@ -72,7 +83,7 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
         else {
             maxBlockSizeInBytes = blockBuilderStatus.getMaxPageSizeInBytes();
         }
-        return new Int96ArrayBlockBuilder(
+        return new Fixed12BlockBuilder(
                 blockBuilderStatus,
                 Math.min(expectedEntries, maxBlockSizeInBytes / getFixedSize()));
     }
@@ -86,7 +97,7 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {
-        return new Int96ArrayBlockBuilder(null, positionCount);
+        return new Fixed12BlockBuilder(null, positionCount);
     }
 
     @Override
@@ -96,25 +107,30 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeLong(getPicos(block, position));
-            blockBuilder.writeInt(getOffsetMinutes(block, position));
-            blockBuilder.closeEntry();
+            Fixed12Block valueBlock = (Fixed12Block) block.getUnderlyingValueBlock();
+            int valuePosition = block.getUnderlyingValuePosition(position);
+            write(blockBuilder, getPicos(valueBlock, valuePosition), getOffsetMinutes(valueBlock, valuePosition));
         }
     }
 
     @Override
-    public Object getObject(Block block, int position)
+    public LongTimeWithTimeZone getObject(Block block, int position)
     {
-        return new LongTimeWithTimeZone(getPicos(block, position), getOffsetMinutes(block, position));
+        Fixed12Block valueBlock = (Fixed12Block) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return new LongTimeWithTimeZone(getPicos(valueBlock, valuePosition), getOffsetMinutes(valueBlock, valuePosition));
     }
 
     @Override
     public void writeObject(BlockBuilder blockBuilder, Object value)
     {
         LongTimeWithTimeZone timestamp = (LongTimeWithTimeZone) value;
-        blockBuilder.writeLong(timestamp.getPicoseconds());
-        blockBuilder.writeInt(timestamp.getOffsetMinutes());
-        blockBuilder.closeEntry();
+        write(blockBuilder, timestamp.getPicoseconds(), timestamp.getOffsetMinutes());
+    }
+
+    private static void write(BlockBuilder blockBuilder, long picoseconds, int offsetMinutes)
+    {
+        ((Fixed12BlockBuilder) blockBuilder).writeFixed12(picoseconds, offsetMinutes);
     }
 
     @Override
@@ -124,17 +140,73 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return SqlTimeWithTimeZone.newInstance(getPrecision(), getPicos(block, position), getOffsetMinutes(block, position));
+        Fixed12Block valueBlock = (Fixed12Block) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return SqlTimeWithTimeZone.newInstance(getPrecision(), getPicos(valueBlock, valuePosition), getOffsetMinutes(valueBlock, valuePosition));
+    }
+
+    @Override
+    public int getFlatFixedSize()
+    {
+        return Long.BYTES + Integer.BYTES;
+    }
+
+    private static long getPicos(Fixed12Block block, int position)
+    {
+        return block.getFixed12First(position);
+    }
+
+    private static int getOffsetMinutes(Fixed12Block block, int position)
+    {
+        return block.getFixed12Second(position);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static LongTimeWithTimeZone readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return new LongTimeWithTimeZone(
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset),
+                (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Long.BYTES));
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void readFlatToBlock(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice,
+            BlockBuilder blockBuilder)
+    {
+        write(blockBuilder,
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset),
+                (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Long.BYTES));
     }
 
-    private static long getPicos(Block block, int position)
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            LongTimeWithTimeZone value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
     {
-        return block.getLong(position, 0);
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, value.getPicoseconds());
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG, value.getOffsetMinutes());
     }
 
-    private static int getOffsetMinutes(Block block, int position)
+    @ScalarOperator(READ_VALUE)
+    private static void writeBlockFlat(
+            @BlockPosition Fixed12Block block,
+            @BlockIndex int position,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
     {
-        return block.getInt(position, SIZE_OF_LONG);
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, getPicos(block, position));
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG, getOffsetMinutes(block, position));
     }
 
     @ScalarOperator(EQUAL)
@@ -148,7 +220,7 @@ private static boolean equalOperator(LongTimeWithTimeZone left, LongTimeWithTime
     }
 
     @ScalarOperator(EQUAL)
-    private static boolean equalOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static boolean equalOperator(@BlockPosition Fixed12Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Fixed12Block rightBlock, @BlockIndex int rightPosition)
     {
         return equal(
                 getPicos(leftBlock, leftPosition),
@@ -169,7 +241,7 @@ private static long hashCodeOperator(LongTimeWithTimeZone value)
     }
 
     @ScalarOperator(HASH_CODE)
-    private static long hashCodeOperator(@BlockPosition Block block, @BlockIndex int position)
+    private static long hashCodeOperator(@BlockPosition Fixed12Block block, @BlockIndex int position)
     {
         return hashCodeOperator(getPicos(block, position), getOffsetMinutes(block, position));
     }
@@ -186,7 +258,7 @@ private static long xxHash64Operator(LongTimeWithTimeZone value)
     }
 
     @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(@BlockPosition Block block, @BlockIndex int position)
+    private static long xxHash64Operator(@BlockPosition Fixed12Block block, @BlockIndex int position)
     {
         return xxHash64(getPicos(block, position), getOffsetMinutes(block, position));
     }
@@ -207,7 +279,7 @@ private static long comparisonOperator(LongTimeWithTimeZone left, LongTimeWithTi
     }
 
     @ScalarOperator(COMPARISON_UNORDERED_LAST)
-    private static long comparisonOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static long comparisonOperator(@BlockPosition Fixed12Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Fixed12Block rightBlock, @BlockIndex int rightPosition)
     {
         return comparison(
                 getPicos(leftBlock, leftPosition),
@@ -232,7 +304,7 @@ private static boolean lessThanOperator(LongTimeWithTimeZone left, LongTimeWithT
     }
 
     @ScalarOperator(LESS_THAN)
-    private static boolean lessThanOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static boolean lessThanOperator(@BlockPosition Fixed12Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Fixed12Block rightBlock, @BlockIndex int rightPosition)
     {
         return lessThan(
                 getPicos(leftBlock, leftPosition),
@@ -257,7 +329,7 @@ private static boolean lessThanOrEqualOperator(LongTimeWithTimeZone left, LongTi
     }
 
     @ScalarOperator(LESS_THAN_OR_EQUAL)
-    private static boolean lessThanOrEqualOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static boolean lessThanOrEqualOperator(@BlockPosition Fixed12Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Fixed12Block rightBlock, @BlockIndex int rightPosition)
     {
         return lessThanOrEqual(
                 getPicos(leftBlock, leftPosition),
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/LongTimestampType.java b/core/trino-spi/src/main/java/io/trino/spi/type/LongTimestampType.java
index d3ed36374ad5..0e13a7b7331e 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/LongTimestampType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/LongTimestampType.java
@@ -17,13 +17,20 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
-import io.trino.spi.block.Int96ArrayBlockBuilder;
+import io.trino.spi.block.Fixed12Block;
+import io.trino.spi.block.Fixed12BlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BlockIndex;
 import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
 import java.util.Optional;
 
 import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
@@ -31,6 +38,7 @@
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MICROSECOND;
 import static io.trino.spi.type.Timestamps.rescale;
@@ -44,21 +52,23 @@
  * in the first long and the fractional increment in the remaining integer, as
  * a number of picoseconds additional to the epoch microsecond.
  */
-class LongTimestampType
+final class LongTimestampType
         extends TimestampType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(LongTimestampType.class, lookup(), LongTimestamp.class);
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, ByteOrder.LITTLE_ENDIAN);
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
     private final Range range;
 
     public LongTimestampType(int precision)
     {
-        super(precision, LongTimestamp.class);
+        super(precision, LongTimestamp.class, Fixed12Block.class);
 
         if (precision < MAX_SHORT_PRECISION + 1 || precision > MAX_PRECISION) {
             throw new IllegalArgumentException(format("Precision must be in the range [%s, %s]", MAX_SHORT_PRECISION + 1, MAX_PRECISION));
         }
 
-        // ShortTimestampType instances are created eagerly and shared so it's OK to precompute some things.
+        // ShortTimestampType instances are created eagerly and shared, so it's OK to precompute some things.
         int picosOfMicroMax = toIntExact(PICOSECONDS_PER_MICROSECOND - rescale(1, 0, 12 - getPrecision()));
         range = new Range(new LongTimestamp(Long.MIN_VALUE, 0), new LongTimestamp(Long.MAX_VALUE, picosOfMicroMax));
     }
@@ -85,7 +95,7 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
         else {
             maxBlockSizeInBytes = blockBuilderStatus.getMaxPageSizeInBytes();
         }
-        return new Int96ArrayBlockBuilder(
+        return new Fixed12BlockBuilder(
                 blockBuilderStatus,
                 Math.min(expectedEntries, maxBlockSizeInBytes / getFixedSize()));
     }
@@ -99,7 +109,7 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {
-        return new Int96ArrayBlockBuilder(null, positionCount);
+        return new Fixed12BlockBuilder(null, positionCount);
     }
 
     @Override
@@ -109,16 +119,18 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeLong(getEpochMicros(block, position));
-            blockBuilder.writeInt(getFraction(block, position));
-            blockBuilder.closeEntry();
+            Fixed12Block valueBlock = (Fixed12Block) block.getUnderlyingValueBlock();
+            int valuePosition = block.getUnderlyingValuePosition(position);
+            ((Fixed12BlockBuilder) blockBuilder).writeFixed12(getEpochMicros(valueBlock, valuePosition), getFraction(valueBlock, valuePosition));
         }
     }
 
     @Override
     public Object getObject(Block block, int position)
     {
-        return new LongTimestamp(getEpochMicros(block, position), getFraction(block, position));
+        Fixed12Block valueBlock = (Fixed12Block) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return new LongTimestamp(getEpochMicros(valueBlock, valuePosition), getFraction(valueBlock, valuePosition));
     }
 
     @Override
@@ -128,11 +140,9 @@ public void writeObject(BlockBuilder blockBuilder, Object value)
         write(blockBuilder, timestamp.getEpochMicros(), timestamp.getPicosOfMicro());
     }
 
-    public void write(BlockBuilder blockBuilder, long epochMicros, int fraction)
+    private static void write(BlockBuilder blockBuilder, long epochMicros, int fraction)
     {
-        blockBuilder.writeLong(epochMicros);
-        blockBuilder.writeInt(fraction);
-        blockBuilder.closeEntry();
+        ((Fixed12BlockBuilder) blockBuilder).writeFixed12(epochMicros, fraction);
     }
 
     @Override
@@ -142,20 +152,25 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        long epochMicros = getEpochMicros(block, position);
-        int fraction = getFraction(block, position);
+        Fixed12Block valueBlock = (Fixed12Block) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return SqlTimestamp.newInstance(getPrecision(), getEpochMicros(valueBlock, valuePosition), getFraction(valueBlock, valuePosition));
+    }
 
-        return SqlTimestamp.newInstance(getPrecision(), epochMicros, fraction);
+    @Override
+    public int getFlatFixedSize()
+    {
+        return Long.BYTES + Integer.BYTES;
     }
 
-    private static long getEpochMicros(Block block, int position)
+    private static long getEpochMicros(Fixed12Block block, int position)
     {
-        return block.getLong(position, 0);
+        return block.getFixed12First(position);
     }
 
-    private static int getFraction(Block block, int position)
+    private static int getFraction(Fixed12Block block, int position)
     {
-        return block.getInt(position, SIZE_OF_LONG);
+        return block.getFixed12Second(position);
     }
 
     @Override
@@ -164,6 +179,54 @@ public Optional<Range> getRange()
         return Optional.of(range);
     }
 
+    @ScalarOperator(READ_VALUE)
+    private static LongTimestamp readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return new LongTimestamp(
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset),
+                (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Long.BYTES));
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void readFlatToBlock(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice,
+            BlockBuilder blockBuilder)
+    {
+        write(blockBuilder,
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset),
+                (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG));
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            LongTimestamp value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, value.getEpochMicros());
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG, value.getPicosOfMicro());
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeBlockFlat(
+            @BlockPosition Fixed12Block block,
+            @BlockIndex int position,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, getEpochMicros(block, position));
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG, getFraction(block, position));
+    }
+
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(LongTimestamp left, LongTimestamp right)
     {
@@ -175,7 +238,7 @@ private static boolean equalOperator(LongTimestamp left, LongTimestamp right)
     }
 
     @ScalarOperator(EQUAL)
-    private static boolean equalOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static boolean equalOperator(@BlockPosition Fixed12Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Fixed12Block rightBlock, @BlockIndex int rightPosition)
     {
         return equal(
                 getEpochMicros(leftBlock, leftPosition),
@@ -196,7 +259,7 @@ private static long xxHash64Operator(LongTimestamp value)
     }
 
     @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(@BlockPosition Block block, @BlockIndex int position)
+    private static long xxHash64Operator(@BlockPosition Fixed12Block block, @BlockIndex int position)
     {
         return xxHash64(
                 getEpochMicros(block, position),
@@ -215,7 +278,7 @@ private static long comparisonOperator(LongTimestamp left, LongTimestamp right)
     }
 
     @ScalarOperator(COMPARISON_UNORDERED_LAST)
-    private static long comparisonOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static long comparisonOperator(@BlockPosition Fixed12Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Fixed12Block rightBlock, @BlockIndex int rightPosition)
     {
         return comparison(
                 getEpochMicros(leftBlock, leftPosition),
@@ -240,7 +303,7 @@ private static boolean lessThanOperator(LongTimestamp left, LongTimestamp right)
     }
 
     @ScalarOperator(LESS_THAN)
-    private static boolean lessThanOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static boolean lessThanOperator(@BlockPosition Fixed12Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Fixed12Block rightBlock, @BlockIndex int rightPosition)
     {
         return lessThan(
                 getEpochMicros(leftBlock, leftPosition),
@@ -262,7 +325,7 @@ private static boolean lessThanOrEqualOperator(LongTimestamp left, LongTimestamp
     }
 
     @ScalarOperator(LESS_THAN_OR_EQUAL)
-    private static boolean lessThanOrEqualOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static boolean lessThanOrEqualOperator(@BlockPosition Fixed12Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Fixed12Block rightBlock, @BlockIndex int rightPosition)
     {
         return lessThanOrEqual(
                 getEpochMicros(leftBlock, leftPosition),
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/LongTimestampWithTimeZoneType.java b/core/trino-spi/src/main/java/io/trino/spi/type/LongTimestampWithTimeZoneType.java
index 9f275d02abb6..cd58e49d993c 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/LongTimestampWithTimeZoneType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/LongTimestampWithTimeZoneType.java
@@ -17,13 +17,20 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
-import io.trino.spi.block.Int96ArrayBlockBuilder;
+import io.trino.spi.block.Fixed12Block;
+import io.trino.spi.block.Fixed12BlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BlockIndex;
 import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
 import java.util.Optional;
 
 import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
@@ -31,6 +38,7 @@
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
 import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
@@ -39,6 +47,7 @@
 import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MILLISECOND;
 import static io.trino.spi.type.Timestamps.rescale;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
+import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.lang.invoke.MethodHandles.lookup;
 
@@ -51,10 +60,12 @@ final class LongTimestampWithTimeZoneType
         extends TimestampWithTimeZoneType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(LongTimestampWithTimeZoneType.class, lookup(), LongTimestampWithTimeZone.class);
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, ByteOrder.LITTLE_ENDIAN);
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
 
     public LongTimestampWithTimeZoneType(int precision)
     {
-        super(precision, LongTimestampWithTimeZone.class);
+        super(precision, LongTimestampWithTimeZone.class, Fixed12Block.class);
 
         if (precision < MAX_SHORT_PRECISION + 1 || precision > MAX_PRECISION) {
             throw new IllegalArgumentException(format("Precision must be in the range [%s, %s]", MAX_SHORT_PRECISION + 1, MAX_PRECISION));
@@ -83,7 +94,7 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
         else {
             maxBlockSizeInBytes = blockBuilderStatus.getMaxPageSizeInBytes();
         }
-        return new Int96ArrayBlockBuilder(
+        return new Fixed12BlockBuilder(
                 blockBuilderStatus,
                 Math.min(expectedEntries, maxBlockSizeInBytes / getFixedSize()));
     }
@@ -97,7 +108,7 @@ public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, in
     @Override
     public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {
-        return new Int96ArrayBlockBuilder(null, positionCount);
+        return new Fixed12BlockBuilder(null, positionCount);
     }
 
     @Override
@@ -107,17 +118,19 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeLong(getPackedEpochMillis(block, position));
-            blockBuilder.writeInt(getPicosOfMilli(block, position));
-            blockBuilder.closeEntry();
+            Fixed12Block valueBlock = (Fixed12Block) block.getUnderlyingValueBlock();
+            int valuePosition = block.getUnderlyingValuePosition(position);
+            write(blockBuilder, getPackedEpochMillis(valueBlock, valuePosition), getPicosOfMilli(valueBlock, valuePosition));
         }
     }
 
     @Override
     public Object getObject(Block block, int position)
     {
-        long packedEpochMillis = getPackedEpochMillis(block, position);
-        int picosOfMilli = getPicosOfMilli(block, position);
+        Fixed12Block valueBlock = (Fixed12Block) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        long packedEpochMillis = getPackedEpochMillis(valueBlock, valuePosition);
+        int picosOfMilli = getPicosOfMilli(valueBlock, valuePosition);
 
         return LongTimestampWithTimeZone.fromEpochMillisAndFraction(unpackMillisUtc(packedEpochMillis), picosOfMilli, unpackZoneKey(packedEpochMillis));
     }
@@ -127,9 +140,14 @@ public void writeObject(BlockBuilder blockBuilder, Object value)
     {
         LongTimestampWithTimeZone timestamp = (LongTimestampWithTimeZone) value;
 
-        blockBuilder.writeLong(packDateTimeWithZone(timestamp.getEpochMillis(), timestamp.getTimeZoneKey()));
-        blockBuilder.writeInt(timestamp.getPicosOfMilli());
-        blockBuilder.closeEntry();
+        write(blockBuilder, packDateTimeWithZone(timestamp.getEpochMillis(), timestamp.getTimeZoneKey()), timestamp.getPicosOfMilli());
+    }
+
+    private static void write(BlockBuilder blockBuilder, long packedDateTimeWithZone, int picosOfMilli)
+    {
+        ((Fixed12BlockBuilder) blockBuilder).writeFixed12(
+                packedDateTimeWithZone,
+                picosOfMilli);
     }
 
     @Override
@@ -139,19 +157,27 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        long packedEpochMillis = getPackedEpochMillis(block, position);
-        int picosOfMilli = getPicosOfMilli(block, position);
+        Fixed12Block valueBlock = (Fixed12Block) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        long packedEpochMillis = getPackedEpochMillis(valueBlock, valuePosition);
+        int picosOfMilli = getPicosOfMilli(valueBlock, valuePosition);
 
         return SqlTimestampWithTimeZone.newInstance(getPrecision(), unpackMillisUtc(packedEpochMillis), picosOfMilli, unpackZoneKey(packedEpochMillis));
     }
 
+    @Override
+    public int getFlatFixedSize()
+    {
+        return Long.BYTES + Integer.BYTES;
+    }
+
     @Override
     public Optional<Object> getPreviousValue(Object value)
     {
         LongTimestampWithTimeZone timestampWithTimeZone = (LongTimestampWithTimeZone) value;
         long epochMillis = timestampWithTimeZone.getEpochMillis();
         int picosOfMilli = timestampWithTimeZone.getPicosOfMilli();
-        picosOfMilli -= rescale(1, 0, 12 - getPrecision());
+        picosOfMilli -= toIntExact(rescale(1, 0, 12 - getPrecision()));
         if (picosOfMilli < 0) {
             if (epochMillis == Long.MIN_VALUE) {
                 return Optional.empty();
@@ -169,31 +195,79 @@ public Optional<Object> getNextValue(Object value)
         LongTimestampWithTimeZone timestampWithTimeZone = (LongTimestampWithTimeZone) value;
         long epochMillis = timestampWithTimeZone.getEpochMillis();
         int picosOfMilli = timestampWithTimeZone.getPicosOfMilli();
-        picosOfMilli += rescale(1, 0, 12 - getPrecision());
+        picosOfMilli += toIntExact(rescale(1, 0, 12 - getPrecision()));
         if (picosOfMilli >= PICOSECONDS_PER_MILLISECOND) {
             if (epochMillis == Long.MAX_VALUE) {
                 return Optional.empty();
             }
-            epochMillis--;
+            epochMillis++;
             picosOfMilli -= PICOSECONDS_PER_MILLISECOND;
         }
         // time zone doesn't matter for ordering
         return Optional.of(LongTimestampWithTimeZone.fromEpochMillisAndFraction(epochMillis, picosOfMilli, UTC_KEY));
     }
 
-    private static long getPackedEpochMillis(Block block, int position)
+    private static long getPackedEpochMillis(Fixed12Block block, int position)
     {
-        return block.getLong(position, 0);
+        return block.getFixed12First(position);
     }
 
-    private static long getEpochMillis(Block block, int position)
+    private static long getEpochMillis(Fixed12Block block, int position)
     {
         return unpackMillisUtc(getPackedEpochMillis(block, position));
     }
 
-    private static int getPicosOfMilli(Block block, int position)
+    private static int getPicosOfMilli(Fixed12Block block, int position)
+    {
+        return block.getFixed12Second(position);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static LongTimestampWithTimeZone readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        long packedEpochMillis = (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+        int picosOfMilli = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Long.BYTES);
+        return LongTimestampWithTimeZone.fromEpochMillisAndFraction(unpackMillisUtc(packedEpochMillis), picosOfMilli, unpackZoneKey(packedEpochMillis));
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void readFlatToBlock(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice,
+            BlockBuilder blockBuilder)
+    {
+        write(blockBuilder,
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset),
+                (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Long.BYTES));
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            LongTimestampWithTimeZone value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, packDateTimeWithZone(value.getEpochMillis(), value.getTimeZoneKey()));
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG, value.getPicosOfMilli());
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeBlockFlat(
+            @BlockPosition Fixed12Block block,
+            @BlockIndex int position,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
     {
-        return block.getInt(position, SIZE_OF_LONG);
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, getPackedEpochMillis(block, position));
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG, getPicosOfMilli(block, position));
     }
 
     @ScalarOperator(EQUAL)
@@ -207,7 +281,7 @@ private static boolean equalOperator(LongTimestampWithTimeZone left, LongTimesta
     }
 
     @ScalarOperator(EQUAL)
-    private static boolean equalOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static boolean equalOperator(@BlockPosition Fixed12Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Fixed12Block rightBlock, @BlockIndex int rightPosition)
     {
         return equal(
                 getEpochMillis(leftBlock, leftPosition),
@@ -229,7 +303,7 @@ private static long xxHash64Operator(LongTimestampWithTimeZone value)
     }
 
     @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(@BlockPosition Block block, @BlockIndex int position)
+    private static long xxHash64Operator(@BlockPosition Fixed12Block block, @BlockIndex int position)
     {
         return xxHash64(
                 getEpochMillis(block, position),
@@ -248,7 +322,7 @@ private static long comparisonOperator(LongTimestampWithTimeZone left, LongTimes
     }
 
     @ScalarOperator(COMPARISON_UNORDERED_LAST)
-    private static long comparisonOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static long comparisonOperator(@BlockPosition Fixed12Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Fixed12Block rightBlock, @BlockIndex int rightPosition)
     {
         return comparison(
                 getEpochMillis(leftBlock, leftPosition),
@@ -273,7 +347,7 @@ private static boolean lessThanOperator(LongTimestampWithTimeZone left, LongTime
     }
 
     @ScalarOperator(LESS_THAN)
-    private static boolean lessThanOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static boolean lessThanOperator(@BlockPosition Fixed12Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Fixed12Block rightBlock, @BlockIndex int rightPosition)
     {
         return lessThan(
                 getEpochMillis(leftBlock, leftPosition),
@@ -295,7 +369,7 @@ private static boolean lessThanOrEqualOperator(LongTimestampWithTimeZone left, L
     }
 
     @ScalarOperator(LESS_THAN_OR_EQUAL)
-    private static boolean lessThanOrEqualOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static boolean lessThanOrEqualOperator(@BlockPosition Fixed12Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Fixed12Block rightBlock, @BlockIndex int rightPosition)
     {
         return lessThanOrEqual(
                 getEpochMillis(leftBlock, leftPosition),
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/MapType.java b/core/trino-spi/src/main/java/io/trino/spi/type/MapType.java
index 99585bf89388..049a0594db92 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/MapType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/MapType.java
@@ -18,7 +18,7 @@
 import io.trino.spi.block.BlockBuilderStatus;
 import io.trino.spi.block.MapBlock;
 import io.trino.spi.block.MapBlockBuilder;
-import io.trino.spi.block.SingleMapBlock;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.InvocationConvention;
 import io.trino.spi.function.OperatorMethodHandle;
@@ -26,33 +26,52 @@
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NULL_FLAG;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.type.TypeOperatorDeclaration.NO_TYPE_OPERATOR_DECLARATION;
 import static io.trino.spi.type.TypeUtils.NULL_HASH_CODE;
+import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
+import static java.lang.invoke.MethodHandles.filterReturnValue;
+import static java.lang.invoke.MethodHandles.insertArguments;
 import static java.lang.invoke.MethodType.methodType;
 import static java.util.Arrays.asList;
 
 public class MapType
         extends AbstractType
 {
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, ByteOrder.LITTLE_ENDIAN);
+
+    private static final MethodHandle NOT;
+    private static final InvocationConvention READ_FLAT_CONVENTION = simpleConvention(FAIL_ON_NULL, FLAT);
+    private static final InvocationConvention READ_FLAT_TO_BLOCK_CONVENTION = simpleConvention(BLOCK_BUILDER, FLAT);
+    private static final InvocationConvention WRITE_FLAT_CONVENTION = simpleConvention(FLAT_RETURN, NEVER_NULL);
     private static final InvocationConvention EQUAL_CONVENTION = simpleConvention(NULLABLE_RETURN, NEVER_NULL, NEVER_NULL);
     private static final InvocationConvention HASH_CODE_CONVENTION = simpleConvention(FAIL_ON_NULL, NEVER_NULL);
     private static final InvocationConvention DISTINCT_FROM_CONVENTION = simpleConvention(FAIL_ON_NULL, BOXED_NULLABLE, BOXED_NULLABLE);
     private static final InvocationConvention INDETERMINATE_CONVENTION = simpleConvention(FAIL_ON_NULL, NULL_FLAG);
 
+    private static final MethodHandle READ_FLAT;
+    private static final MethodHandle READ_FLAT_TO_BLOCK;
+    private static final MethodHandle WRITE_FLAT;
     private static final MethodHandle EQUAL;
     private static final MethodHandle HASH_CODE;
 
@@ -63,12 +82,16 @@ public class MapType
     static {
         try {
             Lookup lookup = MethodHandles.lookup();
-            EQUAL = lookup.findStatic(MapType.class, "equalOperator", methodType(Boolean.class, MethodHandle.class, MethodHandle.class, Block.class, Block.class));
-            HASH_CODE = lookup.findStatic(MapType.class, "hashOperator", methodType(long.class, MethodHandle.class, MethodHandle.class, Block.class));
-            DISTINCT_FROM = lookup.findStatic(MapType.class, "distinctFromOperator", methodType(boolean.class, MethodHandle.class, MethodHandle.class, Block.class, Block.class));
-            INDETERMINATE = lookup.findStatic(MapType.class, "indeterminate", methodType(boolean.class, MethodHandle.class, Block.class, boolean.class));
+            NOT = lookup.findStatic(MapType.class, "not", methodType(boolean.class, boolean.class));
+            READ_FLAT = lookup.findStatic(MapType.class, "readFlat", methodType(SqlMap.class, MapType.class, MethodHandle.class, MethodHandle.class, int.class, int.class, byte[].class, int.class, byte[].class));
+            READ_FLAT_TO_BLOCK = lookup.findStatic(MapType.class, "readFlatToBlock", methodType(void.class, MethodHandle.class, MethodHandle.class, int.class, int.class, byte[].class, int.class, byte[].class, BlockBuilder.class));
+            WRITE_FLAT = lookup.findStatic(MapType.class, "writeFlat", methodType(void.class, Type.class, Type.class, MethodHandle.class, MethodHandle.class, int.class, int.class, boolean.class, boolean.class, SqlMap.class, byte[].class, int.class, byte[].class, int.class));
+            EQUAL = lookup.findStatic(MapType.class, "equalOperator", methodType(Boolean.class, MethodHandle.class, MethodHandle.class, SqlMap.class, SqlMap.class));
+            HASH_CODE = lookup.findStatic(MapType.class, "hashOperator", methodType(long.class, MethodHandle.class, MethodHandle.class, SqlMap.class));
+            DISTINCT_FROM = lookup.findStatic(MapType.class, "distinctFromOperator", methodType(boolean.class, MethodHandle.class, MethodHandle.class, SqlMap.class, SqlMap.class));
+            INDETERMINATE = lookup.findStatic(MapType.class, "indeterminate", methodType(boolean.class, MethodHandle.class, SqlMap.class, boolean.class));
             SEEK_KEY = lookup.findVirtual(
-                    SingleMapBlock.class,
+                    SqlMap.class,
                     "seekKey",
                     methodType(int.class, MethodHandle.class, MethodHandle.class, Block.class, int.class));
         }
@@ -81,12 +104,14 @@ public class MapType
     private final Type valueType;
     private static final int EXPECTED_BYTES_PER_ENTRY = 32;
 
+    private final MethodHandle keyBlockNativeNotDistinctFrom;
+    private final MethodHandle keyBlockNotDistinctFrom;
     private final MethodHandle keyNativeHashCode;
     private final MethodHandle keyBlockHashCode;
     private final MethodHandle keyBlockNativeEqual;
     private final MethodHandle keyBlockEqual;
 
-    // this field is used in double checked locking
+    // this field is used in double-checked locking
     @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
     private volatile TypeOperatorDeclaration typeOperatorDeclaration;
 
@@ -97,19 +122,25 @@ public MapType(Type keyType, Type valueType, TypeOperators typeOperators)
                         StandardTypes.MAP,
                         TypeSignatureParameter.typeParameter(keyType.getTypeSignature()),
                         TypeSignatureParameter.typeParameter(valueType.getTypeSignature())),
-                Block.class);
+                SqlMap.class,
+                MapBlock.class);
         if (!keyType.isComparable()) {
             throw new IllegalArgumentException(format("key type must be comparable, got %s", keyType));
         }
         this.keyType = keyType;
         this.valueType = valueType;
 
-        keyBlockNativeEqual = typeOperators.getEqualOperator(keyType, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, NEVER_NULL))
+        keyBlockNativeEqual = typeOperators.getEqualOperator(keyType, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION_NOT_NULL, NEVER_NULL))
                 .asType(methodType(Boolean.class, Block.class, int.class, keyType.getJavaType().isPrimitive() ? keyType.getJavaType() : Object.class));
-        keyBlockEqual = typeOperators.getEqualOperator(keyType, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION));
+        keyBlockEqual = typeOperators.getEqualOperator(keyType, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL));
+
+        keyBlockNativeNotDistinctFrom = filterReturnValue(typeOperators.getDistinctFromOperator(keyType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, NEVER_NULL)), NOT)
+                .asType(methodType(boolean.class, Block.class, int.class, keyType.getJavaType().isPrimitive() ? keyType.getJavaType() : Object.class));
+        keyBlockNotDistinctFrom = filterReturnValue(typeOperators.getDistinctFromOperator(keyType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION)), NOT);
+
         keyNativeHashCode = typeOperators.getHashCodeOperator(keyType, HASH_CODE_CONVENTION)
                 .asType(methodType(long.class, keyType.getJavaType().isPrimitive() ? keyType.getJavaType() : Object.class));
-        keyBlockHashCode = typeOperators.getHashCodeOperator(keyType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
+        keyBlockHashCode = typeOperators.getHashCodeOperator(keyType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL));
     }
 
     @Override
@@ -130,6 +161,7 @@ private synchronized void generateTypeOperators(TypeOperators typeOperators)
             typeOperatorDeclaration = NO_TYPE_OPERATOR_DECLARATION;
         }
         typeOperatorDeclaration = TypeOperatorDeclaration.builder(getJavaType())
+                .addReadValueOperators(getReadValueOperatorMethodHandles(typeOperators, this))
                 .addEqualOperator(getEqualOperatorMethodHandle(typeOperators, keyType, valueType))
                 .addHashCodeOperator(getHashCodeOperatorMethodHandle(typeOperators, keyType, valueType))
                 .addXxHash64Operator(getXxHash64OperatorMethodHandle(typeOperators, keyType, valueType))
@@ -138,57 +170,101 @@ private synchronized void generateTypeOperators(TypeOperators typeOperators)
                 .build();
     }
 
+    private static List<OperatorMethodHandle> getReadValueOperatorMethodHandles(TypeOperators typeOperators, MapType mapType)
+    {
+        Type keyType = mapType.getKeyType();
+        Type valueType = mapType.getValueType();
+
+        MethodHandle keyReadOperator = typeOperators.getReadValueOperator(keyType, simpleConvention(BLOCK_BUILDER, FLAT));
+        MethodHandle valueReadOperator = typeOperators.getReadValueOperator(valueType, simpleConvention(BLOCK_BUILDER, FLAT));
+        MethodHandle readFlat = insertArguments(
+                READ_FLAT,
+                0,
+                mapType,
+                keyReadOperator,
+                valueReadOperator,
+                keyType.getFlatFixedSize(),
+                valueType.getFlatFixedSize());
+        MethodHandle readFlatToBlock = insertArguments(
+                READ_FLAT_TO_BLOCK,
+                0,
+                keyReadOperator,
+                valueReadOperator,
+                keyType.getFlatFixedSize(),
+                valueType.getFlatFixedSize());
+
+        MethodHandle keyWriteOperator = typeOperators.getReadValueOperator(keyType, simpleConvention(FLAT_RETURN, BLOCK_POSITION));
+        MethodHandle valueWriteOperator = typeOperators.getReadValueOperator(valueType, simpleConvention(FLAT_RETURN, BLOCK_POSITION));
+        MethodHandle writeFlat = insertArguments(
+                WRITE_FLAT,
+                0,
+                mapType.getKeyType(),
+                mapType.getValueType(),
+                keyWriteOperator,
+                valueWriteOperator,
+                keyType.getFlatFixedSize(),
+                valueType.getFlatFixedSize(),
+                keyType.isFlatVariableWidth(),
+                valueType.isFlatVariableWidth());
+
+        return List.of(
+                new OperatorMethodHandle(READ_FLAT_CONVENTION, readFlat),
+                new OperatorMethodHandle(READ_FLAT_TO_BLOCK_CONVENTION, readFlatToBlock),
+                new OperatorMethodHandle(WRITE_FLAT_CONVENTION, writeFlat));
+    }
+
     private static OperatorMethodHandle getHashCodeOperatorMethodHandle(TypeOperators typeOperators, Type keyType, Type valueType)
     {
-        MethodHandle keyHashCodeOperator = typeOperators.getHashCodeOperator(keyType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
-        MethodHandle valueHashCodeOperator = typeOperators.getHashCodeOperator(valueType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
+        MethodHandle keyHashCodeOperator = typeOperators.getHashCodeOperator(keyType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL));
+        MethodHandle valueHashCodeOperator = typeOperators.getHashCodeOperator(valueType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL));
         return new OperatorMethodHandle(HASH_CODE_CONVENTION, HASH_CODE.bindTo(keyHashCodeOperator).bindTo(valueHashCodeOperator));
     }
 
     private static OperatorMethodHandle getXxHash64OperatorMethodHandle(TypeOperators typeOperators, Type keyType, Type valueType)
     {
-        MethodHandle keyHashCodeOperator = typeOperators.getXxHash64Operator(keyType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
-        MethodHandle valueHashCodeOperator = typeOperators.getXxHash64Operator(valueType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
+        MethodHandle keyHashCodeOperator = typeOperators.getXxHash64Operator(keyType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL));
+        MethodHandle valueHashCodeOperator = typeOperators.getXxHash64Operator(valueType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL));
         return new OperatorMethodHandle(HASH_CODE_CONVENTION, HASH_CODE.bindTo(keyHashCodeOperator).bindTo(valueHashCodeOperator));
     }
 
     private static OperatorMethodHandle getEqualOperatorMethodHandle(TypeOperators typeOperators, Type keyType, Type valueType)
     {
-        MethodHandle seekKey = MethodHandles.insertArguments(
+        MethodHandle seekKey = insertArguments(
                 SEEK_KEY,
                 1,
-                typeOperators.getEqualOperator(keyType, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION)),
-                typeOperators.getHashCodeOperator(keyType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION)));
-        MethodHandle valueEqualOperator = typeOperators.getEqualOperator(valueType, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION));
+                typeOperators.getEqualOperator(keyType, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL)),
+                typeOperators.getHashCodeOperator(keyType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)));
+        MethodHandle valueEqualOperator = typeOperators.getEqualOperator(valueType, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL));
         return new OperatorMethodHandle(EQUAL_CONVENTION, EQUAL.bindTo(seekKey).bindTo(valueEqualOperator));
     }
 
     private static OperatorMethodHandle getDistinctFromOperatorInvoker(TypeOperators typeOperators, Type keyType, Type valueType)
     {
-        MethodHandle seekKey = MethodHandles.insertArguments(
+        MethodHandle seekKey = insertArguments(
                 SEEK_KEY,
                 1,
-                typeOperators.getEqualOperator(keyType, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION)),
-                typeOperators.getHashCodeOperator(keyType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION)));
+                typeOperators.getEqualOperator(keyType, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL)),
+                typeOperators.getHashCodeOperator(keyType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)));
 
         MethodHandle valueDistinctFromOperator = typeOperators.getDistinctFromOperator(valueType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
-        return new OperatorMethodHandle(DISTINCT_FROM_CONVENTION, DISTINCT_FROM.bindTo(seekKey).bindTo(valueDistinctFromOperator));
+        MethodHandle methodHandle = DISTINCT_FROM.bindTo(seekKey).bindTo(valueDistinctFromOperator);
+        return new OperatorMethodHandle(DISTINCT_FROM_CONVENTION, methodHandle);
     }
 
     private static OperatorMethodHandle getIndeterminateOperatorInvoker(TypeOperators typeOperators, Type valueType)
     {
-        MethodHandle valueIndeterminateOperator = typeOperators.getIndeterminateOperator(valueType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
+        MethodHandle valueIndeterminateOperator = typeOperators.getIndeterminateOperator(valueType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL));
         return new OperatorMethodHandle(INDETERMINATE_CONVENTION, INDETERMINATE.bindTo(valueIndeterminateOperator));
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public MapBlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
     {
         return new MapBlockBuilder(this, blockBuilderStatus, expectedEntries);
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
+    public MapBlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         return createBlockBuilder(blockBuilderStatus, expectedEntries, EXPECTED_BYTES_PER_ENTRY);
     }
@@ -216,13 +292,14 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        Block singleMapBlock = block.getObject(position, Block.class);
-        if (!(singleMapBlock instanceof SingleMapBlock)) {
-            throw new UnsupportedOperationException("Map is encoded with legacy block representation");
-        }
+        SqlMap sqlMap = getObject(block, position);
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
         Map<Object, Object> map = new HashMap<>();
-        for (int i = 0; i < singleMapBlock.getPositionCount(); i += 2) {
-            map.put(keyType.getObjectValue(session, singleMapBlock, i), valueType.getObjectValue(session, singleMapBlock, i + 1));
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            map.put(keyType.getObjectValue(session, rawKeyBlock, rawOffset + i), valueType.getObjectValue(session, rawValueBlock, rawOffset + i));
         }
 
         return Collections.unmodifiableMap(map);
@@ -240,26 +317,139 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
     }
 
     @Override
-    public Block getObject(Block block, int position)
+    public SqlMap getObject(Block block, int position)
     {
-        return block.getObject(position, Block.class);
+        return read((MapBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
     public void writeObject(BlockBuilder blockBuilder, Object value)
     {
-        if (!(value instanceof SingleMapBlock singleMapBlock)) {
-            throw new IllegalArgumentException("Maps must be represented with SingleMapBlock");
+        if (!(value instanceof SqlMap sqlMap)) {
+            throw new IllegalArgumentException("Maps must be represented with SqlMap");
+        }
+
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
+        ((MapBlockBuilder) blockBuilder).buildEntry((keyBuilder, valueBuilder) -> {
+            for (int i = 0; i < sqlMap.getSize(); i++) {
+                keyType.appendTo(rawKeyBlock, rawOffset + i, keyBuilder);
+                valueType.appendTo(rawValueBlock, rawOffset + i, valueBuilder);
+            }
+        });
+    }
+
+    // FLAT MEMORY LAYOUT
+    //
+    // All data of the map is stored in the variable width section. Within the variable width section,
+    // fixed data for all keys and values are stored first, followed by variable length data for all keys
+    // and values. This simplifies the read implementation as we can simply step through the fixed
+    // section without knowing the variable length of each value, since each value stores the offset
+    // to its variable length data inside its fixed length data.
+    //
+    // In the current implementation, the keys and values are stored in an interleaved flat record along
+    // with null flags. This layout is not required by the format, and could be changed to a columnar
+    // if it is determined to be more efficient. Additionally, this layout allows for a null key, since
+    // non-null keys is not always enforced, and null keys may be allowed in the future.
+    //
+    // Fixed:
+    //   int positionCount, int variableSizeOffset
+    // Variable:
+    //   byte key1Null, keyFixedSize key1FixedData, byte value1Null, valueFixedSize value1FixedData
+    //   byte key2Null, keyFixedSize key2FixedData, byte value2Null, valueFixedSize value2FixedData
+    //   ...
+    //   key1VariableSize key1VariableData, value1VariableSize value1VariableData
+    //   key2VariableSize key2VariableData, value2VariableSize value2VariableData
+    //   ...
+
+    @Override
+    public int getFlatFixedSize()
+    {
+        return 8;
+    }
+
+    @Override
+    public boolean isFlatVariableWidth()
+    {
+        return true;
+    }
+
+    @Override
+    public int getFlatVariableWidthSize(Block block, int position)
+    {
+        SqlMap sqlMap = getObject(block, position);
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
+        long flatSize = sqlMap.getSize() * (keyType.getFlatFixedSize() + valueType.getFlatFixedSize() + 2L);
+
+        if (keyType.isFlatVariableWidth()) {
+            for (int index = 0; index < sqlMap.getSize(); index++) {
+                if (!rawKeyBlock.isNull(rawOffset + index)) {
+                    flatSize += keyType.getFlatVariableWidthSize(rawKeyBlock, rawOffset + index);
+                }
+            }
         }
+        if (valueType.isFlatVariableWidth()) {
+            for (int index = 0; index < sqlMap.getSize(); index++) {
+                if (!rawValueBlock.isNull(rawOffset + index)) {
+                    flatSize += valueType.getFlatVariableWidthSize(rawValueBlock, rawOffset + index);
+                }
+            }
+        }
+        return toIntExact(flatSize);
+    }
 
-        BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
+    @Override
+    public int relocateFlatVariableWidthOffsets(byte[] fixedSizeSlice, int fixedSizeOffset, byte[] variableSizeSlice, int variableSizeOffset)
+    {
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + Integer.BYTES, variableSizeOffset);
 
-        for (int i = 0; i < singleMapBlock.getPositionCount(); i += 2) {
-            keyType.appendTo(singleMapBlock, i, entryBuilder);
-            valueType.appendTo(singleMapBlock, i + 1, entryBuilder);
+        int size = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+        int keyFixedSize = keyType.getFlatFixedSize();
+        int valueFixedSize = valueType.getFlatFixedSize();
+        if (!keyType.isFlatVariableWidth() && !valueType.isFlatVariableWidth()) {
+            return size * (2 + keyFixedSize + valueFixedSize);
         }
 
-        blockBuilder.closeEntry();
+        return relocateVariableWidthData(size, keyFixedSize, valueFixedSize, variableSizeSlice, variableSizeOffset);
+    }
+
+    private int relocateVariableWidthData(int size, int keyFixedSize, int valueFixedSize, byte[] slice, int offset)
+    {
+        int writeFixedOffset = offset;
+        // variable width data starts after fixed width data for the keys and values
+        // there is one extra byte per key and value for a null flag
+        int writeVariableWidthOffset = offset + (size * (2 + keyFixedSize + valueFixedSize));
+        for (int index = 0; index < size; index++) {
+            if (!keyType.isFlatVariableWidth() || slice[writeFixedOffset] != 0) {
+                writeFixedOffset++;
+            }
+            else {
+                // skip null byte
+                writeFixedOffset++;
+
+                int keyVariableSize = keyType.relocateFlatVariableWidthOffsets(slice, writeFixedOffset, slice, writeVariableWidthOffset);
+                writeVariableWidthOffset += keyVariableSize;
+            }
+            writeFixedOffset += keyFixedSize;
+
+            if (!valueType.isFlatVariableWidth() || slice[writeFixedOffset] != 0) {
+                writeFixedOffset++;
+            }
+            else {
+                // skip null byte
+                writeFixedOffset++;
+
+                int valueVariableSize = valueType.relocateFlatVariableWidthOffsets(slice, writeFixedOffset, slice, writeVariableWidthOffset);
+                writeVariableWidthOffset += valueVariableSize;
+            }
+            writeFixedOffset += valueFixedSize;
+        }
+        return writeVariableWidthOffset - offset;
     }
 
     @Override
@@ -274,7 +464,7 @@ public String getDisplayName()
         return "map(" + keyType.getDisplayName() + ", " + valueType.getDisplayName() + ")";
     }
 
-    public Block createBlockFromKeyValue(Optional<boolean[]> mapIsNull, int[] offsets, Block keyBlock, Block valueBlock)
+    public MapBlock createBlockFromKeyValue(Optional<boolean[]> mapIsNull, int[] offsets, Block keyBlock, Block valueBlock)
     {
         return MapBlock.fromKeyValueBlock(
                 mapIsNull,
@@ -316,52 +506,267 @@ public MethodHandle getKeyBlockEqual()
         return keyBlockEqual;
     }
 
-    private static long hashOperator(MethodHandle keyOperator, MethodHandle valueOperator, Block block)
+    /**
+     * Internal use by this package and io.trino.spi.block only.
+     */
+    public MethodHandle getKeyBlockNativeNotDistinctFrom()
+    {
+        return keyBlockNativeNotDistinctFrom;
+    }
+
+    /**
+     * Internal use by this package and io.trino.spi.block only.
+     */
+    public MethodHandle getKeyBlockNotDistinctFrom()
+    {
+        return keyBlockNotDistinctFrom;
+    }
+
+    private static long hashOperator(MethodHandle keyOperator, MethodHandle valueOperator, SqlMap sqlMap)
             throws Throwable
     {
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
         long result = 0;
-        for (int i = 0; i < block.getPositionCount(); i += 2) {
-            result += invokeHashOperator(keyOperator, block, i) ^ invokeHashOperator(valueOperator, block, i + 1);
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            result += invokeHashOperator(keyOperator, rawKeyBlock, rawOffset + i) ^ invokeHashOperator(valueOperator, rawValueBlock, rawOffset + i);
         }
         return result;
     }
 
-    private static long invokeHashOperator(MethodHandle keyOperator, Block block, int position)
+    private static long invokeHashOperator(MethodHandle hashOperator, Block block, int position)
             throws Throwable
     {
         if (block.isNull(position)) {
             return NULL_HASH_CODE;
         }
-        return (long) keyOperator.invokeExact(block, position);
+        return (long) hashOperator.invokeExact((Block) block, position);
+    }
+
+    private static SqlMap read(MapBlock block, int position)
+    {
+        return block.getMap(position);
+    }
+
+    private static SqlMap readFlat(
+            MapType mapType,
+            MethodHandle keyReadOperator,
+            MethodHandle valueReadOperator,
+            int keyFixedSize,
+            int valueFixedSize,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] variableWidthSlice)
+            throws Throwable
+    {
+        int size = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+        int variableWidthOffset = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Integer.BYTES);
+        return buildMapValue(mapType, size, (keyBuilder, valueBuilder) ->
+                readFlatEntries(
+                        keyReadOperator,
+                        valueReadOperator,
+                        keyFixedSize,
+                        valueFixedSize,
+                        size,
+                        variableWidthSlice,
+                        variableWidthOffset,
+                        keyBuilder,
+                        valueBuilder));
+    }
+
+    private static void readFlatToBlock(
+            MethodHandle keyReadOperator,
+            MethodHandle valueReadOperator,
+            int keyFixedSize,
+            int valueFixedSize,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] variableWidthSlice,
+            BlockBuilder blockBuilder)
+            throws Throwable
+    {
+        int size = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+        int variableWidthOffset = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Integer.BYTES);
+        ((MapBlockBuilder) blockBuilder).buildEntry((keyBuilder, valueBuilder) ->
+                readFlatEntries(
+                        keyReadOperator,
+                        valueReadOperator,
+                        keyFixedSize,
+                        valueFixedSize,
+                        size,
+                        variableWidthSlice,
+                        variableWidthOffset,
+                        keyBuilder,
+                        valueBuilder));
+    }
+
+    private static void readFlatEntries(
+            MethodHandle keyReadFlat,
+            MethodHandle valueReadFlat,
+            int keyFixedSize,
+            int valueFixedSize,
+            int size,
+            byte[] slice,
+            int offset,
+            BlockBuilder keyBuilder,
+            BlockBuilder valueBuilder)
+            throws Throwable
+    {
+        for (int index = 0; index < size; index++) {
+            boolean keyIsNull = slice[offset] != 0;
+            offset++;
+            if (keyIsNull) {
+                keyBuilder.appendNull();
+            }
+            else {
+                keyReadFlat.invokeExact(
+                        slice,
+                        offset,
+                        slice,
+                        keyBuilder);
+            }
+            offset += keyFixedSize;
+
+            boolean valueIsNull = slice[offset] != 0;
+            offset++;
+            if (valueIsNull) {
+                valueBuilder.appendNull();
+            }
+            else {
+                valueReadFlat.invokeExact(
+                        slice,
+                        offset,
+                        slice,
+                        valueBuilder);
+            }
+            offset += valueFixedSize;
+        }
+    }
+
+    private static void writeFlat(
+            Type keyType,
+            Type valueType,
+            MethodHandle keyWriteFlat,
+            MethodHandle valueWriteFlat,
+            int keyFixedSize,
+            int valueFixedSize,
+            boolean keyVariableWidth,
+            boolean valueVariableWidth,
+            SqlMap map,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] variableSizeSlice,
+            int variableSizeOffset)
+            throws Throwable
+    {
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset, map.getSize());
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + Integer.BYTES, variableSizeOffset);
+
+        writeFlatEntries(keyType, valueType, keyWriteFlat, valueWriteFlat, keyFixedSize, valueFixedSize, keyVariableWidth, valueVariableWidth, map, variableSizeSlice, variableSizeOffset);
+    }
+
+    private static void writeFlatEntries(
+            Type keyType,
+            Type valueType,
+            MethodHandle keyWriteFlat,
+            MethodHandle valueWriteFlat,
+            int keyFixedSize,
+            int valueFixedSize,
+            boolean keyVariableWidth,
+            boolean valueVariableWidth,
+            SqlMap sqlMap,
+            byte[] slice,
+            int offset)
+            throws Throwable
+    {
+        int size = sqlMap.getSize();
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
+        // variable width data starts after fixed width data for the keys and values
+        // there is one extra byte per key and value for a null flag
+        int writeVariableWidthOffset = offset + (size * (2 + keyFixedSize + valueFixedSize));
+        for (int index = 0; index < size; index++) {
+            if (rawKeyBlock.isNull(rawOffset + index)) {
+                slice[offset] = 1;
+                offset++;
+            }
+            else {
+                // skip null byte
+                offset++;
+
+                int keyVariableSize = 0;
+                if (keyVariableWidth) {
+                    keyVariableSize = keyType.getFlatVariableWidthSize(rawKeyBlock, rawOffset + index);
+                }
+                keyWriteFlat.invokeExact(
+                        rawKeyBlock,
+                        rawOffset + index,
+                        slice,
+                        offset,
+                        slice,
+                        writeVariableWidthOffset);
+                writeVariableWidthOffset += keyVariableSize;
+            }
+            offset += keyFixedSize;
+
+            if (rawValueBlock.isNull(rawOffset + index)) {
+                slice[offset] = 1;
+                offset++;
+            }
+            else {
+                // skip null byte
+                offset++;
+
+                int valueVariableSize = 0;
+                if (valueVariableWidth) {
+                    valueVariableSize = valueType.getFlatVariableWidthSize(rawValueBlock, rawOffset + index);
+                }
+                valueWriteFlat.invokeExact(
+                        rawValueBlock,
+                        rawOffset + index,
+                        slice,
+                        offset,
+                        slice,
+                        writeVariableWidthOffset);
+                writeVariableWidthOffset += valueVariableSize;
+            }
+            offset += valueFixedSize;
+        }
     }
 
     private static Boolean equalOperator(
             MethodHandle seekKey,
             MethodHandle valueEqualOperator,
-            Block leftBlock,
-            Block rightBlock)
+            SqlMap leftMap,
+            SqlMap rightMap)
             throws Throwable
     {
-        if (leftBlock.getPositionCount() != rightBlock.getPositionCount()) {
+        if (leftMap.getSize() != rightMap.getSize()) {
             return false;
         }
 
-        SingleMapBlock leftSingleMapLeftBlock = (SingleMapBlock) leftBlock;
-        SingleMapBlock rightSingleMapBlock = (SingleMapBlock) rightBlock;
+        int leftRawOffset = leftMap.getRawOffset();
+        Block leftRawKeyBlock = leftMap.getRawKeyBlock();
+        Block leftRawValueBlock = leftMap.getRawValueBlock();
+        int rightRawOffset = rightMap.getRawOffset();
+        Block rightRawValueBlock = rightMap.getRawValueBlock();
 
         boolean unknown = false;
-        for (int position = 0; position < leftSingleMapLeftBlock.getPositionCount(); position += 2) {
-            int leftPosition = position + 1;
-            int rightPosition = (int) seekKey.invokeExact(rightSingleMapBlock, leftBlock, position);
-            if (rightPosition == -1) {
+        for (int leftIndex = 0; leftIndex < leftMap.getSize(); leftIndex++) {
+            int rightIndex = (int) seekKey.invokeExact(rightMap, leftRawKeyBlock, leftRawOffset + leftIndex);
+            if (rightIndex == -1) {
                 return false;
             }
 
-            if (leftBlock.isNull(leftPosition) || rightBlock.isNull(rightPosition)) {
+            if (leftRawValueBlock.isNull(leftRawOffset + leftIndex) || rightRawValueBlock.isNull(rightRawOffset + rightIndex)) {
                 unknown = true;
             }
             else {
-                Boolean result = (Boolean) valueEqualOperator.invokeExact((Block) leftSingleMapLeftBlock, leftPosition, (Block) rightSingleMapBlock, rightPosition);
+                Boolean result = (Boolean) valueEqualOperator.invokeExact(leftRawValueBlock, leftRawOffset + leftIndex, rightRawValueBlock, rightRawOffset + rightIndex);
                 if (result == null) {
                     unknown = true;
                 }
@@ -380,31 +785,33 @@ else if (!result) {
     private static boolean distinctFromOperator(
             MethodHandle seekKey,
             MethodHandle valueDistinctFromOperator,
-            Block leftBlock,
-            Block rightBlock)
+            SqlMap leftMap,
+            SqlMap rightMap)
             throws Throwable
     {
-        boolean leftIsNull = leftBlock == null;
-        boolean rightIsNull = rightBlock == null;
+        boolean leftIsNull = leftMap == null;
+        boolean rightIsNull = rightMap == null;
         if (leftIsNull || rightIsNull) {
             return leftIsNull != rightIsNull;
         }
 
-        if (leftBlock.getPositionCount() != rightBlock.getPositionCount()) {
+        if (leftMap.getSize() != rightMap.getSize()) {
             return true;
         }
 
-        SingleMapBlock leftSingleMapLeftBlock = (SingleMapBlock) leftBlock;
-        SingleMapBlock rightSingleMapBlock = (SingleMapBlock) rightBlock;
+        int leftRawOffset = leftMap.getRawOffset();
+        Block leftRawKeyBlock = leftMap.getRawKeyBlock();
+        Block leftRawValueBlock = leftMap.getRawValueBlock();
+        int rightRawOffset = rightMap.getRawOffset();
+        Block rightRawValueBlock = rightMap.getRawValueBlock();
 
-        for (int position = 0; position < leftSingleMapLeftBlock.getPositionCount(); position += 2) {
-            int leftPosition = position + 1;
-            int rightPosition = (int) seekKey.invokeExact(rightSingleMapBlock, leftBlock, position);
-            if (rightPosition == -1) {
+        for (int leftIndex = 0; leftIndex < leftMap.getSize(); leftIndex++) {
+            int rightIndex = (int) seekKey.invokeExact(rightMap, leftRawKeyBlock, leftRawOffset + leftIndex);
+            if (rightIndex == -1) {
                 return true;
             }
 
-            boolean result = (boolean) valueDistinctFromOperator.invokeExact((Block) leftSingleMapLeftBlock, leftPosition, (Block) rightSingleMapBlock, rightPosition);
+            boolean result = (boolean) valueDistinctFromOperator.invokeExact(leftRawValueBlock, leftRawOffset + leftIndex, rightRawValueBlock, rightRawOffset + rightIndex);
             if (result) {
                 return true;
             }
@@ -413,21 +820,30 @@ private static boolean distinctFromOperator(
         return false;
     }
 
-    private static boolean indeterminate(MethodHandle valueIndeterminateFunction, Block block, boolean isNull)
+    private static boolean indeterminate(MethodHandle valueIndeterminateFunction, SqlMap sqlMap, boolean isNull)
             throws Throwable
     {
         if (isNull) {
             return true;
         }
-        for (int i = 0; i < block.getPositionCount(); i += 2) {
-            // since maps are not allowed to have indeterminate keys we only check values here
-            if (block.isNull(i + 1)) {
+
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            // since maps are not allowed to have indeterminate keys, we only check values here
+            if (rawValueBlock.isNull(rawOffset + i)) {
                 return true;
             }
-            if ((boolean) valueIndeterminateFunction.invokeExact(block, i + 1)) {
+            if ((boolean) valueIndeterminateFunction.invokeExact(rawValueBlock, rawOffset + i)) {
                 return true;
             }
         }
         return false;
     }
+
+    private static boolean not(boolean value)
+    {
+        return !value;
+    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/NamedTypeSignature.java b/core/trino-spi/src/main/java/io/trino/spi/type/NamedTypeSignature.java
index 90309c2d3460..f0f3ac4382bf 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/NamedTypeSignature.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/NamedTypeSignature.java
@@ -13,7 +13,7 @@
  */
 package io.trino.spi.type;
 
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/P4HyperLogLogType.java b/core/trino-spi/src/main/java/io/trino/spi/type/P4HyperLogLogType.java
index 9594572368ed..d8832dad944d 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/P4HyperLogLogType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/P4HyperLogLogType.java
@@ -32,12 +32,6 @@ public P4HyperLogLogType()
         super(new TypeSignature(StandardTypes.P4_HYPER_LOG_LOG), Slice.class);
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        HYPER_LOG_LOG.appendTo(block, position, blockBuilder);
-    }
-
     @Override
     public Slice getSlice(Block block, int position)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/QuantileDigestType.java b/core/trino-spi/src/main/java/io/trino/spi/type/QuantileDigestType.java
index ac6a0d19dd7b..7f3bb4cb785e 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/QuantileDigestType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/QuantileDigestType.java
@@ -17,6 +17,8 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 
 import java.util.List;
@@ -35,22 +37,12 @@ public QuantileDigestType(Type valueType)
         this.valueType = valueType;
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
-    }
-
     @Override
     public Slice getSlice(Block block, int position)
     {
-        return block.getSlice(position, 0, block.getSliceLength(position));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return valueBlock.getSlice(valuePosition);
     }
 
     @Override
@@ -62,7 +54,7 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value)
     @Override
     public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int length)
     {
-        blockBuilder.writeBytes(value, offset, length).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(value, offset, length);
     }
 
     @Override
@@ -72,7 +64,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return new SqlVarbinary(block.getSlice(position, 0, block.getSliceLength(position)).getBytes());
+        return new SqlVarbinary(getSlice(block, position).getBytes());
     }
 
     public Type getValueType()
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/RealType.java b/core/trino-spi/src/main/java/io/trino/spi/type/RealType.java
index 53c0e2d8e3ba..da26b556cefd 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/RealType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/RealType.java
@@ -18,9 +18,15 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.IsNull;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
 import java.util.Optional;
 
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
@@ -31,6 +37,7 @@
 import static io.trino.spi.function.OperatorType.IS_DISTINCT_FROM;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.Float.floatToIntBits;
@@ -43,6 +50,7 @@ public final class RealType
         extends AbstractIntType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(RealType.class, lookup(), long.class);
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, ByteOrder.LITTLE_ENDIAN);
 
     public static final RealType REAL = new RealType();
 
@@ -63,7 +71,12 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         if (block.isNull(position)) {
             return null;
         }
-        return intBitsToFloat(block.getInt(position, 0));
+        return getFloat(block, position);
+    }
+
+    public float getFloat(Block block, int position)
+    {
+        return intBitsToFloat(getInt(block, position));
     }
 
     @Override
@@ -76,7 +89,12 @@ public void writeLong(BlockBuilder blockBuilder, long value)
         catch (ArithmeticException e) {
             throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Value (%sb) is not a valid single-precision float", Long.toBinaryString(value)));
         }
-        blockBuilder.writeInt(floatValue).closeEntry();
+        writeInt(blockBuilder, floatValue);
+    }
+
+    public void writeFloat(BlockBuilder blockBuilder, float value)
+    {
+        writeInt(blockBuilder, floatToIntBits(value));
     }
 
     @Override
@@ -99,6 +117,27 @@ public Optional<Range> getRange()
         return Optional.empty();
     }
 
+    @ScalarOperator(READ_VALUE)
+    private static long readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            long value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset, (int) value);
+    }
+
+    @SuppressWarnings("FloatingPointEquality")
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(long left, long right)
     {
@@ -125,6 +164,7 @@ private static long xxHash64Operator(long value)
         return XxHash64.hash(floatToIntBits(realValue));
     }
 
+    @SuppressWarnings("FloatingPointEquality")
     @ScalarOperator(IS_DISTINCT_FROM)
     private static boolean distinctFromOperator(long left, @IsNull boolean leftNull, long right, @IsNull boolean rightNull)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/RowFieldName.java b/core/trino-spi/src/main/java/io/trino/spi/type/RowFieldName.java
index add8fccb7df0..9ff4c28c5bca 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/RowFieldName.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/RowFieldName.java
@@ -13,7 +13,7 @@
  */
 package io.trino.spi.type;
 
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/RowType.java b/core/trino-spi/src/main/java/io/trino/spi/type/RowType.java
index 2cbc920cb32d..a5115075e4d5 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/RowType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/RowType.java
@@ -18,7 +18,9 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.RowBlock;
 import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.InvocationConvention;
 import io.trino.spi.function.OperatorMethodHandle;
@@ -33,10 +35,15 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.type.StandardTypes.ROW;
@@ -53,7 +60,6 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toUnmodifiableList;
 
 /**
  * As defined in ISO/IEC FCD 9075-2 (SQL 2011), section 4.8
@@ -61,12 +67,18 @@
 public class RowType
         extends AbstractType
 {
+    private static final InvocationConvention READ_FLAT_CONVENTION = simpleConvention(FAIL_ON_NULL, FLAT);
+    private static final InvocationConvention READ_FLAT_TO_BLOCK_CONVENTION = simpleConvention(BLOCK_BUILDER, FLAT);
+    private static final InvocationConvention WRITE_FLAT_CONVENTION = simpleConvention(FLAT_RETURN, NEVER_NULL);
     private static final InvocationConvention EQUAL_CONVENTION = simpleConvention(NULLABLE_RETURN, NEVER_NULL, NEVER_NULL);
     private static final InvocationConvention HASH_CODE_CONVENTION = simpleConvention(FAIL_ON_NULL, NEVER_NULL);
     private static final InvocationConvention DISTINCT_FROM_CONVENTION = simpleConvention(FAIL_ON_NULL, BOXED_NULLABLE, BOXED_NULLABLE);
     private static final InvocationConvention INDETERMINATE_CONVENTION = simpleConvention(FAIL_ON_NULL, BOXED_NULLABLE);
     private static final InvocationConvention COMPARISON_CONVENTION = simpleConvention(FAIL_ON_NULL, NEVER_NULL, NEVER_NULL);
 
+    private static final MethodHandle READ_FLAT;
+    private static final MethodHandle READ_FLAT_TO_BLOCK;
+    private static final MethodHandle WRITE_FLAT;
     private static final MethodHandle EQUAL;
     private static final MethodHandle CHAIN_EQUAL;
     private static final MethodHandle HASH_CODE;
@@ -80,24 +92,27 @@ public class RowType
     private static final MethodHandle CHAIN_COMPARISON;
     private static final int MEGAMORPHIC_FIELD_COUNT = 64;
 
-    // this field is used in double checked locking
+    // this field is used in double-checked locking
     @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
     private volatile TypeOperatorDeclaration typeOperatorDeclaration;
 
     static {
         try {
             Lookup lookup = lookup();
-            EQUAL = lookup.findStatic(RowType.class, "megamorphicEqualOperator", methodType(Boolean.class, List.class, Block.class, Block.class));
-            CHAIN_EQUAL = lookup.findStatic(RowType.class, "chainEqual", methodType(Boolean.class, Boolean.class, int.class, MethodHandle.class, Block.class, Block.class));
-            HASH_CODE = lookup.findStatic(RowType.class, "megamorphicHashCodeOperator", methodType(long.class, List.class, Block.class));
-            CHAIN_HASH_CODE = lookup.findStatic(RowType.class, "chainHashCode", methodType(long.class, long.class, int.class, MethodHandle.class, Block.class));
-            DISTINCT_FROM = lookup.findStatic(RowType.class, "megamorphicDistinctFromOperator", methodType(boolean.class, List.class, Block.class, Block.class));
-            CHAIN_DISTINCT_FROM_START = lookup.findStatic(RowType.class, "chainDistinctFromStart", methodType(boolean.class, MethodHandle.class, Block.class, Block.class));
-            CHAIN_DISTINCT_FROM = lookup.findStatic(RowType.class, "chainDistinctFrom", methodType(boolean.class, boolean.class, int.class, MethodHandle.class, Block.class, Block.class));
-            INDETERMINATE = lookup.findStatic(RowType.class, "megamorphicIndeterminateOperator", methodType(boolean.class, List.class, Block.class));
-            CHAIN_INDETERMINATE = lookup.findStatic(RowType.class, "chainIndeterminate", methodType(boolean.class, boolean.class, int.class, MethodHandle.class, Block.class));
-            COMPARISON = lookup.findStatic(RowType.class, "megamorphicComparisonOperator", methodType(long.class, List.class, Block.class, Block.class));
-            CHAIN_COMPARISON = lookup.findStatic(RowType.class, "chainComparison", methodType(long.class, long.class, int.class, MethodHandle.class, Block.class, Block.class));
+            READ_FLAT = lookup.findStatic(RowType.class, "megamorphicReadFlat", methodType(SqlRow.class, RowType.class, List.class, byte[].class, int.class, byte[].class));
+            READ_FLAT_TO_BLOCK = lookup.findStatic(RowType.class, "megamorphicReadFlatToBlock", methodType(void.class, RowType.class, List.class, byte[].class, int.class, byte[].class, BlockBuilder.class));
+            WRITE_FLAT = lookup.findStatic(RowType.class, "megamorphicWriteFlat", methodType(void.class, RowType.class, List.class, SqlRow.class, byte[].class, int.class, byte[].class, int.class));
+            EQUAL = lookup.findStatic(RowType.class, "megamorphicEqualOperator", methodType(Boolean.class, List.class, SqlRow.class, SqlRow.class));
+            CHAIN_EQUAL = lookup.findStatic(RowType.class, "chainEqual", methodType(Boolean.class, Boolean.class, int.class, MethodHandle.class, SqlRow.class, SqlRow.class));
+            HASH_CODE = lookup.findStatic(RowType.class, "megamorphicHashCodeOperator", methodType(long.class, List.class, SqlRow.class));
+            CHAIN_HASH_CODE = lookup.findStatic(RowType.class, "chainHashCode", methodType(long.class, long.class, int.class, MethodHandle.class, SqlRow.class));
+            DISTINCT_FROM = lookup.findStatic(RowType.class, "megamorphicDistinctFromOperator", methodType(boolean.class, List.class, SqlRow.class, SqlRow.class));
+            CHAIN_DISTINCT_FROM_START = lookup.findStatic(RowType.class, "chainDistinctFromStart", methodType(boolean.class, MethodHandle.class, SqlRow.class, SqlRow.class));
+            CHAIN_DISTINCT_FROM = lookup.findStatic(RowType.class, "chainDistinctFrom", methodType(boolean.class, boolean.class, int.class, MethodHandle.class, SqlRow.class, SqlRow.class));
+            INDETERMINATE = lookup.findStatic(RowType.class, "megamorphicIndeterminateOperator", methodType(boolean.class, List.class, SqlRow.class));
+            CHAIN_INDETERMINATE = lookup.findStatic(RowType.class, "chainIndeterminate", methodType(boolean.class, boolean.class, int.class, MethodHandle.class, SqlRow.class));
+            COMPARISON = lookup.findStatic(RowType.class, "megamorphicComparisonOperator", methodType(long.class, List.class, SqlRow.class, SqlRow.class));
+            CHAIN_COMPARISON = lookup.findStatic(RowType.class, "chainComparison", methodType(long.class, long.class, int.class, MethodHandle.class, SqlRow.class, SqlRow.class));
         }
         catch (NoSuchMethodException | IllegalAccessException e) {
             throw new RuntimeException(e);
@@ -108,18 +123,29 @@ public class RowType
     private final List<Type> fieldTypes;
     private final boolean comparable;
     private final boolean orderable;
+    private final int flatFixedSize;
+    private final boolean flatVariableWidth;
 
     private RowType(TypeSignature typeSignature, List<Field> originalFields)
     {
-        super(typeSignature, Block.class);
+        super(typeSignature, SqlRow.class, RowBlock.class);
 
         this.fields = List.copyOf(originalFields);
         this.fieldTypes = fields.stream()
                 .map(Field::getType)
-                .collect(toUnmodifiableList());
+                .toList();
 
         this.comparable = fields.stream().allMatch(field -> field.getType().isComparable());
         this.orderable = fields.stream().allMatch(field -> field.getType().isOrderable());
+
+        // flat fixed size is one null byte for each field plus the sum of the field fixed sizes
+        int fixedSize = fieldTypes.size();
+        for (Type fieldType : fieldTypes) {
+            fixedSize += fieldType.getFlatFixedSize();
+        }
+        flatFixedSize = fixedSize;
+
+        this.flatVariableWidth = fields.stream().anyMatch(field -> field.getType().isFlatVariableWidth());
     }
 
     public static RowType from(List<Field> fields)
@@ -131,7 +157,7 @@ public static RowType anonymous(List<Type> types)
     {
         List<Field> fields = types.stream()
                 .map(type -> new Field(Optional.empty(), type))
-                .collect(toUnmodifiableList());
+                .toList();
 
         return new RowType(makeSignature(fields), fields);
     }
@@ -172,19 +198,19 @@ private static TypeSignature makeSignature(List<Field> fields)
         List<TypeSignatureParameter> parameters = fields.stream()
                 .map(field -> new NamedTypeSignature(field.getName().map(RowFieldName::new), field.getType().getTypeSignature()))
                 .map(TypeSignatureParameter::namedTypeParameter)
-                .collect(toUnmodifiableList());
+                .toList();
 
         return new TypeSignature(ROW, parameters);
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public RowBlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
     {
         return new RowBlockBuilder(getTypeParameters(), blockBuilderStatus, expectedEntries);
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
+    public RowBlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         return new RowBlockBuilder(getTypeParameters(), blockBuilderStatus, expectedEntries);
     }
@@ -218,11 +244,12 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        Block arrayBlock = getObject(block, position);
-        List<Object> values = new ArrayList<>(arrayBlock.getPositionCount());
+        SqlRow sqlRow = getObject(block, position);
+        List<Object> values = new ArrayList<>(sqlRow.getFieldCount());
 
-        for (int i = 0; i < arrayBlock.getPositionCount(); i++) {
-            values.add(fields.get(i).getType().getObjectValue(session, arrayBlock, i));
+        int rawIndex = sqlRow.getRawIndex();
+        for (int i = 0; i < sqlRow.getFieldCount(); i++) {
+            values.add(fields.get(i).getType().getObjectValue(session, sqlRow.getRawFieldBlock(i), rawIndex));
         }
 
         return Collections.unmodifiableList(values);
@@ -240,22 +267,71 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
     }
 
     @Override
-    public Block getObject(Block block, int position)
+    public SqlRow getObject(Block block, int position)
     {
-        return block.getObject(position, Block.class);
+        return read((RowBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
     public void writeObject(BlockBuilder blockBuilder, Object value)
     {
-        Block rowBlock = (Block) value;
+        SqlRow sqlRow = (SqlRow) value;
+        int rawIndex = sqlRow.getRawIndex();
+        ((RowBlockBuilder) blockBuilder).buildEntry(fieldBuilders -> {
+            for (int i = 0; i < sqlRow.getFieldCount(); i++) {
+                fields.get(i).getType().appendTo(sqlRow.getRawFieldBlock(i), rawIndex, fieldBuilders.get(i));
+            }
+        });
+    }
+
+    @Override
+    public int getFlatFixedSize()
+    {
+        return flatFixedSize;
+    }
 
-        BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
-        for (int i = 0; i < rowBlock.getPositionCount(); i++) {
-            fields.get(i).getType().appendTo(rowBlock, i, entryBuilder);
+    @Override
+    public boolean isFlatVariableWidth()
+    {
+        return flatVariableWidth;
+    }
+
+    @Override
+    public int getFlatVariableWidthSize(Block block, int position)
+    {
+        if (!flatVariableWidth) {
+            return 0;
         }
 
-        blockBuilder.closeEntry();
+        SqlRow sqlRow = getObject(block, position);
+        int rawIndex = sqlRow.getRawIndex();
+
+        int variableSize = 0;
+        for (int i = 0; i < fieldTypes.size(); i++) {
+            Type fieldType = fieldTypes.get(i);
+            Block fieldBlock = sqlRow.getRawFieldBlock(i);
+            if (!fieldBlock.isNull(rawIndex)) {
+                variableSize += fieldType.getFlatVariableWidthSize(fieldBlock, rawIndex);
+            }
+        }
+        return variableSize;
+    }
+
+    @Override
+    public int relocateFlatVariableWidthOffsets(byte[] fixedSizeSlice, int fixedSizeOffset, byte[] variableSizeSlice, int variableSizeOffset)
+    {
+        if (!flatVariableWidth) {
+            return 0;
+        }
+
+        int totalVariableSize = 0;
+        for (Type fieldType : fieldTypes) {
+            if (fieldType.isFlatVariableWidth() && fixedSizeSlice[fixedSizeOffset] == 0) {
+                totalVariableSize += fieldType.relocateFlatVariableWidthOffsets(fixedSizeSlice, fixedSizeOffset + 1, variableSizeSlice, variableSizeOffset + totalVariableSize);
+            }
+            fixedSizeOffset += 1 + fieldType.getFlatFixedSize();
+        }
+        return totalVariableSize;
     }
 
     @Override
@@ -312,12 +388,13 @@ public TypeOperatorDeclaration getTypeOperatorDeclaration(TypeOperators typeOper
         return typeOperatorDeclaration;
     }
 
-    private synchronized void generateTypeOperators(TypeOperators typeOperators)
+    private void generateTypeOperators(TypeOperators typeOperators)
     {
         if (typeOperatorDeclaration != null) {
             return;
         }
         typeOperatorDeclaration = TypeOperatorDeclaration.builder(getJavaType())
+                .addReadValueOperators(getReadValueOperatorMethodHandles(typeOperators))
                 .addEqualOperators(getEqualOperatorMethodHandles(typeOperators, fields))
                 .addHashCodeOperators(getHashCodeOperatorMethodHandles(typeOperators, fields))
                 .addXxHash64Operators(getXxHash64OperatorMethodHandles(typeOperators, fields))
@@ -328,6 +405,112 @@ private synchronized void generateTypeOperators(TypeOperators typeOperators)
                .build();
     }
 
+    private List<OperatorMethodHandle> getReadValueOperatorMethodHandles(TypeOperators typeOperators)
+    {
+        List<MethodHandle> fieldReadFlatMethods = fields.stream()
+                .map(Field::getType)
+                .map(type -> typeOperators.getReadValueOperator(type, simpleConvention(BLOCK_BUILDER, FLAT)))
+                .toList();
+        MethodHandle readFlat = insertArguments(READ_FLAT, 0, this, fieldReadFlatMethods);
+        MethodHandle readFlatToBlock = insertArguments(READ_FLAT_TO_BLOCK, 0, this, fieldReadFlatMethods);
+
+        List<MethodHandle> fieldWriteFlatMethods = fields.stream()
+                .map(Field::getType)
+                .map(type -> typeOperators.getReadValueOperator(type, simpleConvention(FLAT_RETURN, BLOCK_POSITION)))
+                .toList();
+        MethodHandle writeFlat = insertArguments(WRITE_FLAT, 0, this, fieldWriteFlatMethods);
+
+        return List.of(
+                new OperatorMethodHandle(READ_FLAT_CONVENTION, readFlat),
+                new OperatorMethodHandle(READ_FLAT_TO_BLOCK_CONVENTION, readFlatToBlock),
+                new OperatorMethodHandle(WRITE_FLAT_CONVENTION, writeFlat));
+    }
+
+    private static SqlRow read(RowBlock block, int position)
+    {
+        return block.getRow(position);
+    }
+
+    private static SqlRow megamorphicReadFlat(
+            RowType rowType,
+            List<MethodHandle> fieldReadFlatMethods,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] variableSizeSlice)
+            throws Throwable
+    {
+        return buildRowValue(rowType, fieldBuilders ->
+                readFlatFields(rowType, fieldReadFlatMethods, fixedSizeSlice, fixedSizeOffset, variableSizeSlice, fieldBuilders));
+    }
+
+    private static void megamorphicReadFlatToBlock(
+            RowType rowType,
+            List<MethodHandle> fieldReadFlatMethods,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] variableSizeSlice,
+            BlockBuilder blockBuilder)
+            throws Throwable
+    {
+        ((RowBlockBuilder) blockBuilder).buildEntry(fieldBuilders ->
+                readFlatFields(rowType, fieldReadFlatMethods, fixedSizeSlice, fixedSizeOffset, variableSizeSlice, fieldBuilders));
+    }
+
+    private static void readFlatFields(
+            RowType rowType,
+            List<MethodHandle> fieldReadFlatMethods,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] variableSizeSlice,
+            List<BlockBuilder> fieldBuilders)
+            throws Throwable
+    {
+        List<Type> fieldTypes = rowType.getTypeParameters();
+        for (int fieldIndex = 0; fieldIndex < fieldTypes.size(); fieldIndex++) {
+            Type fieldType = fieldTypes.get(fieldIndex);
+            BlockBuilder fieldBuilder = fieldBuilders.get(fieldIndex);
+
+            boolean isNull = fixedSizeSlice[fixedSizeOffset] != 0;
+            if (isNull) {
+                fieldBuilder.appendNull();
+            }
+            else {
+                fieldReadFlatMethods.get(fieldIndex).invokeExact(fixedSizeSlice, fixedSizeOffset + 1, variableSizeSlice, fieldBuilder);
+            }
+            fixedSizeOffset += 1 + fieldType.getFlatFixedSize();
+        }
+    }
+
+    private static void megamorphicWriteFlat(
+            RowType rowType,
+            List<MethodHandle> fieldWriteFlatMethods,
+            SqlRow row,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] variableSizeSlice,
+            int variableSizeOffset)
+            throws Throwable
+    {
+        int rawIndex = row.getRawIndex();
+        List<Type> fieldTypes = rowType.getTypeParameters();
+        for (int fieldIndex = 0; fieldIndex < fieldTypes.size(); fieldIndex++) {
+            Type fieldType = fieldTypes.get(fieldIndex);
+            Block fieldBlock = row.getRawFieldBlock(fieldIndex);
+            if (fieldBlock.isNull(rawIndex)) {
+                fixedSizeSlice[fixedSizeOffset] = 1;
+            }
+            else {
+                int fieldVariableLength = 0;
+                if (fieldType.isFlatVariableWidth()) {
+                    fieldVariableLength = fieldType.getFlatVariableWidthSize(fieldBlock, rawIndex);
+                }
+                fieldWriteFlatMethods.get(fieldIndex).invokeExact((Block) fieldBlock, rawIndex, fixedSizeSlice, fixedSizeOffset + 1, variableSizeSlice, variableSizeOffset);
+                variableSizeOffset += fieldVariableLength;
+            }
+            fixedSizeOffset += 1 + fieldType.getFlatFixedSize();
+        }
+    }
+
     private static List<OperatorMethodHandle> getEqualOperatorMethodHandles(TypeOperators typeOperators, List<Field> fields)
     {
         boolean comparable = fields.stream().allMatch(field -> field.getType().isComparable());
@@ -337,45 +520,51 @@ private static List<OperatorMethodHandle> getEqualOperatorMethodHandles(TypeOper
 
         // for large rows, use a generic loop with a megamorphic call site
         if (fields.size() > MEGAMORPHIC_FIELD_COUNT) {
-            List<MethodHandle> equalOperators = fields.stream()
-                    .map(field -> typeOperators.getEqualOperator(field.getType(), simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION)))
-                    .collect(toUnmodifiableList());
+            List<MethodHandle> equalOperators = new ArrayList<>();
+            for (Field field : fields) {
+                MethodHandle equalOperator = typeOperators.getEqualOperator(field.getType(), simpleConvention(NULLABLE_RETURN, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL));
+                equalOperators.add(equalOperator);
+            }
             return singletonList(new OperatorMethodHandle(EQUAL_CONVENTION, EQUAL.bindTo(equalOperators)));
         }
 
-        // (Block, Block):Boolean
-        MethodHandle equal = dropArguments(constant(Boolean.class, TRUE), 0, Block.class, Block.class);
+        // (SqlRow, SqlRow):Boolean
+        MethodHandle equal = dropArguments(constant(Boolean.class, TRUE), 0, SqlRow.class, SqlRow.class);
         for (int fieldId = 0; fieldId < fields.size(); fieldId++) {
             Field field = fields.get(fieldId);
-            // (Block, Block, int, MethodHandle, Block, Block):Boolean
+            // (SqlRow, SqlRow, int, MethodHandle, SqlRow, SqlRow):Boolean
             equal = collectArguments(
                     CHAIN_EQUAL,
                     0,
                     equal);
 
             // field equal
-            MethodHandle fieldEqualOperator = typeOperators.getEqualOperator(field.getType(), simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION));
+            MethodHandle fieldEqualOperator = typeOperators.getEqualOperator(field.getType(), simpleConvention(NULLABLE_RETURN, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL));
 
-            // (Block, Block, Block, Block):Boolean
+            // (SqlRow, SqlRow, SqlRow, SqlRow):Boolean
             equal = insertArguments(equal, 2, fieldId, fieldEqualOperator);
 
-            // (Block, Block):Boolean
-            equal = permuteArguments(equal, methodType(Boolean.class, Block.class, Block.class), 0, 1, 0, 1);
+            // (SqlRow, SqlRow):Boolean
+            equal = permuteArguments(equal, methodType(Boolean.class, SqlRow.class, SqlRow.class), 0, 1, 0, 1);
         }
         return singletonList(new OperatorMethodHandle(EQUAL_CONVENTION, equal));
     }
 
-    private static Boolean megamorphicEqualOperator(List<MethodHandle> equalOperators, Block leftRow, Block rightRow)
+    private static Boolean megamorphicEqualOperator(List<MethodHandle> equalOperators, SqlRow leftRow, SqlRow rightRow)
             throws Throwable
     {
+        int leftRawIndex = leftRow.getRawIndex();
+        int rightRawIndex = rightRow.getRawIndex();
         boolean unknown = false;
         for (int fieldIndex = 0; fieldIndex < equalOperators.size(); fieldIndex++) {
-            if (leftRow.isNull(fieldIndex) || rightRow.isNull(fieldIndex)) {
+            Block leftFieldBlock = leftRow.getRawFieldBlock(fieldIndex);
+            Block rightFieldBlock = rightRow.getRawFieldBlock(fieldIndex);
+            if (leftFieldBlock.isNull(leftRawIndex) || rightFieldBlock.isNull(rightRawIndex)) {
                 unknown = true;
                 continue;
             }
             MethodHandle equalOperator = equalOperators.get(fieldIndex);
-            Boolean result = (Boolean) equalOperator.invokeExact(leftRow, fieldIndex, rightRow, fieldIndex);
+            Boolean result = (Boolean) equalOperator.invokeExact(leftFieldBlock, leftRawIndex, rightFieldBlock, rightRawIndex);
             if (result == null) {
                 unknown = true;
             }
@@ -390,20 +579,25 @@ else if (!result) {
         return true;
     }
 
-    private static Boolean chainEqual(Boolean previousFieldsEqual, int currentFieldIndex, MethodHandle currentFieldEqual, Block rightRow, Block leftRow)
+    private static Boolean chainEqual(Boolean previousFieldsEqual, int currentFieldIndex, MethodHandle currentFieldEqual, SqlRow leftRow, SqlRow rightRow)
             throws Throwable
     {
         if (previousFieldsEqual == FALSE) {
             return FALSE;
         }
 
-        if (leftRow.isNull(currentFieldIndex) || rightRow.isNull(currentFieldIndex)) {
+        int leftRawIndex = leftRow.getRawIndex();
+        int rightRawIndex = rightRow.getRawIndex();
+        Block leftFieldBlock = leftRow.getRawFieldBlock(currentFieldIndex);
+        Block rightFieldBlock = rightRow.getRawFieldBlock(currentFieldIndex);
+
+        if (leftFieldBlock.isNull(leftRawIndex) || rightFieldBlock.isNull(rightRawIndex)) {
             return null;
         }
 
-        Boolean result = (Boolean) currentFieldEqual.invokeExact(rightRow, currentFieldIndex, leftRow, currentFieldIndex);
+        Boolean result = (Boolean) currentFieldEqual.invokeExact(leftFieldBlock, leftRawIndex, rightFieldBlock, rightRawIndex);
         if (result == TRUE) {
-            // this field is equal, so result is either true or unknown depending on the previous fields
+            // this field is equal, so the result is either true or unknown depending on the previous fields
             return previousFieldsEqual;
         }
         // this field is either not equal or unknown, which is the result
@@ -412,12 +606,12 @@ private static Boolean chainEqual(Boolean previousFieldsEqual, int currentFieldI
 
     private static List<OperatorMethodHandle> getHashCodeOperatorMethodHandles(TypeOperators typeOperators, List<Field> fields)
     {
-        return getHashCodeOperatorMethodHandles(fields, type -> typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION)));
+        return getHashCodeOperatorMethodHandles(fields, type -> typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)));
     }
 
     private static List<OperatorMethodHandle> getXxHash64OperatorMethodHandles(TypeOperators typeOperators, List<Field> fields)
     {
-        return getHashCodeOperatorMethodHandles(fields, type -> typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION)));
+        return getHashCodeOperatorMethodHandles(fields, type -> typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)));
     }
 
     private static List<OperatorMethodHandle> getHashCodeOperatorMethodHandles(List<Field> fields, Function<Type, MethodHandle> getHashOperator)
@@ -431,15 +625,15 @@ private static List<OperatorMethodHandle> getHashCodeOperatorMethodHandles(List<
         if (fields.size() > MEGAMORPHIC_FIELD_COUNT) {
             List<MethodHandle> hashCodeOperators = fields.stream()
                     .map(field -> getHashOperator.apply(field.getType()))
-                    .collect(toUnmodifiableList());
+                    .toList();
             return singletonList(new OperatorMethodHandle(HASH_CODE_CONVENTION, HASH_CODE.bindTo(hashCodeOperators)));
         }
 
-        // (Block):long
-        MethodHandle hashCode = dropArguments(constant(long.class, 1), 0, Block.class);
+        // (SqlRow):long
+        MethodHandle hashCode = dropArguments(constant(long.class, 1), 0, SqlRow.class);
         for (int fieldId = 0; fieldId < fields.size(); fieldId++) {
             Field field = fields.get(fieldId);
-            // (Block, int, MethodHandle, Block):long
+            // (SqlRow, int, MethodHandle, SqlRow):long
             hashCode = collectArguments(
                     CHAIN_HASH_CODE,
                     0,
@@ -448,36 +642,42 @@ private static List<OperatorMethodHandle> getHashCodeOperatorMethodHandles(List<
             // field hash code
             MethodHandle fieldHashCodeOperator = getHashOperator.apply(field.getType());
 
-            // (Block, Block):long
+            // (SqlRow, SqlRow):long
             hashCode = insertArguments(hashCode, 1, fieldId, fieldHashCodeOperator);
 
-            // (Block):long
-            hashCode = permuteArguments(hashCode, methodType(long.class, Block.class), 0, 0);
+            // (SqlRow):long
+            hashCode = permuteArguments(hashCode, methodType(long.class, SqlRow.class), 0, 0);
         }
         return singletonList(new OperatorMethodHandle(HASH_CODE_CONVENTION, hashCode));
     }
 
-    private static long megamorphicHashCodeOperator(List<MethodHandle> hashCodeOperators, Block rowBlock)
+    private static long megamorphicHashCodeOperator(List<MethodHandle> hashCodeOperators, SqlRow row)
             throws Throwable
     {
+        int rawIndex = row.getRawIndex();
+
         long result = 1;
         for (int fieldIndex = 0; fieldIndex < hashCodeOperators.size(); fieldIndex++) {
+            Block fieldBlock = row.getRawFieldBlock(fieldIndex);
             long fieldHashCode = NULL_HASH_CODE;
-            if (!rowBlock.isNull(fieldIndex)) {
+            if (!fieldBlock.isNull(rawIndex)) {
                 MethodHandle hashCodeOperator = hashCodeOperators.get(fieldIndex);
-                fieldHashCode = (long) hashCodeOperator.invokeExact(rowBlock, fieldIndex);
+                fieldHashCode = (long) hashCodeOperator.invokeExact(fieldBlock, rawIndex);
             }
             result = 31 * result + fieldHashCode;
         }
         return result;
     }
 
-    private static long chainHashCode(long previousFieldHashCode, int currentFieldIndex, MethodHandle currentFieldHashCodeOperator, Block row)
+    private static long chainHashCode(long previousFieldHashCode, int currentFieldIndex, MethodHandle currentFieldHashCodeOperator, SqlRow row)
             throws Throwable
     {
+        Block fieldBlock = row.getRawFieldBlock(currentFieldIndex);
+        int rawIndex = row.getRawIndex();
+
         long fieldHashCode = NULL_HASH_CODE;
-        if (!row.isNull(currentFieldIndex)) {
-            fieldHashCode = (long) currentFieldHashCodeOperator.invokeExact(row, currentFieldIndex);
+        if (!fieldBlock.isNull(rawIndex)) {
+            fieldHashCode = (long) currentFieldHashCodeOperator.invokeExact(fieldBlock, rawIndex);
         }
         return 31 * previousFieldHashCode + fieldHashCode;
     }
@@ -493,15 +693,15 @@ private static List<OperatorMethodHandle> getDistinctFromOperatorInvokers(TypeOp
         if (fields.size() > MEGAMORPHIC_FIELD_COUNT) {
             List<MethodHandle> distinctFromOperators = fields.stream()
                     .map(field -> typeOperators.getDistinctFromOperator(field.getType(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION)))
-                    .collect(toUnmodifiableList());
+                    .toList();
             return singletonList(new OperatorMethodHandle(DISTINCT_FROM_CONVENTION, DISTINCT_FROM.bindTo(distinctFromOperators)));
         }
 
-        // (Block, Block):boolean
-        MethodHandle distinctFrom = dropArguments(constant(boolean.class, false), 0, Block.class, Block.class);
+        // (SqlRow, SqlRow):boolean
+        MethodHandle distinctFrom = dropArguments(constant(boolean.class, false), 0, SqlRow.class, SqlRow.class);
         for (int fieldId = 0; fieldId < fields.size(); fieldId++) {
             Field field = fields.get(fieldId);
-            // (Block, Block, int, MethodHandle, Block, Block):boolean
+            // (SqlRow, SqlRow, int, MethodHandle, SqlRow, SqlRow):boolean
             distinctFrom = collectArguments(
                     CHAIN_DISTINCT_FROM,
                     0,
@@ -510,18 +710,18 @@ private static List<OperatorMethodHandle> getDistinctFromOperatorInvokers(TypeOp
             // field distinctFrom
             MethodHandle fieldDistinctFromOperator = typeOperators.getDistinctFromOperator(field.getType(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
 
-            // (Block, Block, Block, Block):boolean
+            // (SqlRow, SqlRow, SqlRow, SqlRow):boolean
             distinctFrom = insertArguments(distinctFrom, 2, fieldId, fieldDistinctFromOperator);
 
-            // (Block, Block):boolean
-            distinctFrom = permuteArguments(distinctFrom, methodType(boolean.class, Block.class, Block.class), 0, 1, 0, 1);
+            // (SqlRow, SqlRow):boolean
+            distinctFrom = permuteArguments(distinctFrom, methodType(boolean.class, SqlRow.class, SqlRow.class), 0, 1, 0, 1);
         }
         distinctFrom = CHAIN_DISTINCT_FROM_START.bindTo(distinctFrom);
 
         return singletonList(new OperatorMethodHandle(DISTINCT_FROM_CONVENTION, distinctFrom));
     }
 
-    private static boolean megamorphicDistinctFromOperator(List<MethodHandle> distinctFromOperators, Block leftRow, Block rightRow)
+    private static boolean megamorphicDistinctFromOperator(List<MethodHandle> distinctFromOperators, SqlRow leftRow, SqlRow rightRow)
             throws Throwable
     {
         boolean leftIsNull = leftRow == null;
@@ -530,9 +730,15 @@ private static boolean megamorphicDistinctFromOperator(List<MethodHandle> distin
             return leftIsNull != rightIsNull;
         }
 
+        int leftRawIndex = leftRow.getRawIndex();
+        int rightRawIndex = rightRow.getRawIndex();
+
         for (int fieldIndex = 0; fieldIndex < distinctFromOperators.size(); fieldIndex++) {
+            Block leftFieldBlock = leftRow.getRawFieldBlock(fieldIndex);
+            Block rightFieldBlock = rightRow.getRawFieldBlock(fieldIndex);
+
             MethodHandle equalOperator = distinctFromOperators.get(fieldIndex);
-            boolean result = (boolean) equalOperator.invoke(leftRow, fieldIndex, rightRow, fieldIndex);
+            boolean result = (boolean) equalOperator.invoke(leftFieldBlock, leftRawIndex, rightFieldBlock, rightRawIndex);
             if (result) {
                 return true;
             }
@@ -541,7 +747,7 @@ private static boolean megamorphicDistinctFromOperator(List<MethodHandle> distin
         return false;
     }
 
-    private static boolean chainDistinctFromStart(MethodHandle chain, Block rightRow, Block leftRow)
+    private static boolean chainDistinctFromStart(MethodHandle chain, SqlRow leftRow, SqlRow rightRow)
             throws Throwable
     {
         boolean leftIsNull = leftRow == null;
@@ -549,16 +755,18 @@ private static boolean chainDistinctFromStart(MethodHandle chain, Block rightRow
         if (leftIsNull || rightIsNull) {
             return leftIsNull != rightIsNull;
         }
-        return (boolean) chain.invokeExact(rightRow, leftRow);
+        return (boolean) chain.invokeExact(leftRow, rightRow);
     }
 
-    private static boolean chainDistinctFrom(boolean previousFieldsDistinctFrom, int currentFieldIndex, MethodHandle currentFieldDistinctFrom, Block rightRow, Block leftRow)
+    private static boolean chainDistinctFrom(boolean previousFieldsDistinctFrom, int currentFieldIndex, MethodHandle currentFieldDistinctFrom, SqlRow leftRow, SqlRow rightRow)
             throws Throwable
     {
         if (previousFieldsDistinctFrom) {
             return true;
         }
-        return (boolean) currentFieldDistinctFrom.invokeExact(rightRow, currentFieldIndex, leftRow, currentFieldIndex);
+        return (boolean) currentFieldDistinctFrom.invokeExact(
+                leftRow.getRawFieldBlock(currentFieldIndex), leftRow.getRawIndex(),
+                rightRow.getRawFieldBlock(currentFieldIndex), rightRow.getRawIndex());
     }
 
     private static List<OperatorMethodHandle> getIndeterminateOperatorInvokers(TypeOperators typeOperators, List<Field> fields)
@@ -571,43 +779,45 @@ private static List<OperatorMethodHandle> getIndeterminateOperatorInvokers(TypeO
         // for large rows, use a generic loop with a megamorphic call site
         if (fields.size() > MEGAMORPHIC_FIELD_COUNT) {
             List<MethodHandle> indeterminateOperators = fields.stream()
-                    .map(field -> typeOperators.getIndeterminateOperator(field.getType(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION)))
-                    .collect(toUnmodifiableList());
+                    .map(field -> typeOperators.getIndeterminateOperator(field.getType(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)))
+                    .toList();
             return singletonList(new OperatorMethodHandle(INDETERMINATE_CONVENTION, INDETERMINATE.bindTo(indeterminateOperators)));
         }
 
-        // (Block):long
-        MethodHandle indeterminate = dropArguments(constant(boolean.class, false), 0, Block.class);
+        // (SqlRow):long
+        MethodHandle indeterminate = dropArguments(constant(boolean.class, false), 0, SqlRow.class);
         for (int fieldId = 0; fieldId < fields.size(); fieldId++) {
             Field field = fields.get(fieldId);
-            // (Block, int, MethodHandle, Block):boolean
+            // (SqlRow, int, MethodHandle, SqlRow):boolean
             indeterminate = collectArguments(
                     CHAIN_INDETERMINATE,
                     0,
                     indeterminate);
 
             // field indeterminate
-            MethodHandle fieldIndeterminateOperator = typeOperators.getIndeterminateOperator(field.getType(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION));
+            MethodHandle fieldIndeterminateOperator = typeOperators.getIndeterminateOperator(field.getType(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL));
 
-            // (Block, Block):boolean
+            // (SqlRow, SqlRow):boolean
             indeterminate = insertArguments(indeterminate, 1, fieldId, fieldIndeterminateOperator);
 
-            // (Block):boolean
-            indeterminate = permuteArguments(indeterminate, methodType(boolean.class, Block.class), 0, 0);
+            // (SqlRow):boolean
+            indeterminate = permuteArguments(indeterminate, methodType(boolean.class, SqlRow.class), 0, 0);
         }
         return singletonList(new OperatorMethodHandle(INDETERMINATE_CONVENTION, indeterminate));
     }
 
-    private static boolean megamorphicIndeterminateOperator(List<MethodHandle> indeterminateOperators, Block rowBlock)
+    private static boolean megamorphicIndeterminateOperator(List<MethodHandle> indeterminateOperators, SqlRow row)
             throws Throwable
     {
-        if (rowBlock == null) {
+        if (row == null) {
             return true;
         }
+        int rawIndex = row.getRawIndex();
         for (int fieldIndex = 0; fieldIndex < indeterminateOperators.size(); fieldIndex++) {
-            if (!rowBlock.isNull(fieldIndex)) {
+            Block fieldBlock = row.getRawFieldBlock(fieldIndex);
+            if (!fieldBlock.isNull(rawIndex)) {
                 MethodHandle indeterminateOperator = indeterminateOperators.get(fieldIndex);
-                if ((boolean) indeterminateOperator.invokeExact(rowBlock, fieldIndex)) {
+                if ((boolean) indeterminateOperator.invokeExact(fieldBlock, rawIndex)) {
                     return true;
                 }
             }
@@ -615,13 +825,18 @@ private static boolean megamorphicIndeterminateOperator(List<MethodHandle> indet
         return false;
     }
 
-    private static boolean chainIndeterminate(boolean previousFieldIndeterminate, int currentFieldIndex, MethodHandle currentFieldIndeterminateOperator, Block row)
+    private static boolean chainIndeterminate(boolean previousFieldIndeterminate, int currentFieldIndex, MethodHandle currentFieldIndeterminateOperator, SqlRow row)
             throws Throwable
     {
         if (row == null || previousFieldIndeterminate) {
             return true;
         }
-        return (boolean) currentFieldIndeterminateOperator.invokeExact(row, currentFieldIndex);
+        int rawIndex = row.getRawIndex();
+        Block fieldBlock = row.getRawFieldBlock(currentFieldIndex);
+        if (fieldBlock.isNull(rawIndex)) {
+            return true;
+        }
+        return (boolean) currentFieldIndeterminateOperator.invokeExact(fieldBlock, rawIndex);
     }
 
     private static List<OperatorMethodHandle> getComparisonOperatorInvokers(BiFunction<Type, InvocationConvention, MethodHandle> comparisonOperatorFactory, List<Field> fields)
@@ -634,42 +849,48 @@ private static List<OperatorMethodHandle> getComparisonOperatorInvokers(BiFuncti
         // for large rows, use a generic loop with a megamorphic call site
         if (fields.size() > MEGAMORPHIC_FIELD_COUNT) {
             List<MethodHandle> comparisonOperators = fields.stream()
-                    .map(field -> comparisonOperatorFactory.apply(field.getType(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION)))
-                    .collect(toUnmodifiableList());
+                    .map(field -> comparisonOperatorFactory.apply(field.getType(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL)))
+                    .toList();
             return singletonList(new OperatorMethodHandle(COMPARISON_CONVENTION, COMPARISON.bindTo(comparisonOperators)));
         }
 
-        // (Block, Block):Boolean
-        MethodHandle comparison = dropArguments(constant(long.class, 0), 0, Block.class, Block.class);
+        // (SqlRow, SqlRow):Boolean
+        MethodHandle comparison = dropArguments(constant(long.class, 0), 0, SqlRow.class, SqlRow.class);
         for (int fieldId = 0; fieldId < fields.size(); fieldId++) {
             Field field = fields.get(fieldId);
-            // (Block, Block, int, MethodHandle, Block, Block):Boolean
+            // (SqlRow, SqlRow, int, MethodHandle, SqlRow, SqlRow):Boolean
             comparison = collectArguments(
                     CHAIN_COMPARISON,
                     0,
                     comparison);
 
             // field comparison
-            MethodHandle fieldComparisonOperator = comparisonOperatorFactory.apply(field.getType(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
+            MethodHandle fieldComparisonOperator = comparisonOperatorFactory.apply(field.getType(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL));
 
-            // (Block, Block, Block, Block):Boolean
+            // (SqlRow, SqlRow, SqlRow, SqlRow):Boolean
             comparison = insertArguments(comparison, 2, fieldId, fieldComparisonOperator);
 
-            // (Block, Block):Boolean
-            comparison = permuteArguments(comparison, methodType(long.class, Block.class, Block.class), 0, 1, 0, 1);
+            // (SqlRow, SqlRow):Boolean
+            comparison = permuteArguments(comparison, methodType(long.class, SqlRow.class, SqlRow.class), 0, 1, 0, 1);
         }
         return singletonList(new OperatorMethodHandle(COMPARISON_CONVENTION, comparison));
     }
 
-    private static long megamorphicComparisonOperator(List<MethodHandle> comparisonOperators, Block leftRow, Block rightRow)
+    private static long megamorphicComparisonOperator(List<MethodHandle> comparisonOperators, SqlRow leftRow, SqlRow rightRow)
             throws Throwable
     {
+        int leftRawIndex = leftRow.getRawIndex();
+        int rightRawIndex = rightRow.getRawIndex();
+
         for (int fieldIndex = 0; fieldIndex < comparisonOperators.size(); fieldIndex++) {
-            checkElementNotNull(leftRow.isNull(fieldIndex));
-            checkElementNotNull(rightRow.isNull(fieldIndex));
+            Block leftFieldBlock = leftRow.getRawFieldBlock(fieldIndex);
+            Block rightFieldBlock = rightRow.getRawFieldBlock(fieldIndex);
+
+            checkElementNotNull(leftFieldBlock.isNull(leftRawIndex));
+            checkElementNotNull(rightFieldBlock.isNull(rightRawIndex));
 
             MethodHandle comparisonOperator = comparisonOperators.get(fieldIndex);
-            long result = (long) comparisonOperator.invoke(leftRow, fieldIndex, rightRow, fieldIndex);
+            long result = (long) comparisonOperator.invoke(leftFieldBlock, leftRawIndex, rightFieldBlock, rightRawIndex);
             if (result == 0) {
                 return result;
             }
@@ -677,17 +898,22 @@ private static long megamorphicComparisonOperator(List<MethodHandle> comparisonO
         return 0;
     }
 
-    private static long chainComparison(long previousFieldsResult, int fieldIndex, MethodHandle nextFieldComparison, Block rightRow, Block leftRow)
+    private static long chainComparison(long previousFieldsResult, int fieldIndex, MethodHandle nextFieldComparison, SqlRow leftRow, SqlRow rightRow)
             throws Throwable
     {
         if (previousFieldsResult != 0) {
             return previousFieldsResult;
         }
 
-        checkElementNotNull(leftRow.isNull(fieldIndex));
-        checkElementNotNull(rightRow.isNull(fieldIndex));
+        int leftRawIndex = leftRow.getRawIndex();
+        int rightRawIndex = rightRow.getRawIndex();
+        Block leftFieldBlock = leftRow.getRawFieldBlock(fieldIndex);
+        Block rightFieldBlock = rightRow.getRawFieldBlock(fieldIndex);
+
+        checkElementNotNull(leftFieldBlock.isNull(leftRawIndex));
+        checkElementNotNull(rightFieldBlock.isNull(rightRawIndex));
 
-        return (long) nextFieldComparison.invokeExact(rightRow, fieldIndex, leftRow, fieldIndex);
+        return (long) nextFieldComparison.invokeExact(leftFieldBlock, leftRawIndex, rightFieldBlock, rightRawIndex);
     }
 
     private static void checkElementNotNull(boolean isNull)
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/ShortDecimalType.java b/core/trino-spi/src/main/java/io/trino/spi/type/ShortDecimalType.java
index 769293a6b9dd..adda87f36d0c 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/ShortDecimalType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/ShortDecimalType.java
@@ -17,12 +17,21 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.LongArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 import java.math.BigInteger;
+import java.nio.ByteOrder;
 import java.util.Optional;
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
@@ -33,6 +42,7 @@
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.Decimals.MAX_SHORT_PRECISION;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
@@ -42,6 +52,7 @@ final class ShortDecimalType
         extends DecimalType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(ShortDecimalType.class, lookup(), long.class);
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
 
     private static final ShortDecimalType[][] INSTANCES;
 
@@ -61,8 +72,8 @@ static ShortDecimalType getInstance(int precision, int scale)
 
     private ShortDecimalType(int precision, int scale)
     {
-        super(precision, scale, long.class);
-        checkArgument(0 < precision && precision <= Decimals.MAX_SHORT_PRECISION, "Invalid precision: %s", precision);
+        super(precision, scale, long.class, LongArrayBlock.class);
+        checkArgument(0 < precision && precision <= MAX_SHORT_PRECISION, "Invalid precision: %s", precision);
         checkArgument(0 <= scale && scale <= precision, "Invalid scale for precision %s: %s", precision, scale);
     }
 
@@ -111,8 +122,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         if (block.isNull(position)) {
             return null;
         }
-        long unscaledValue = block.getLong(position, 0);
-        return new SqlDecimal(BigInteger.valueOf(unscaledValue), getPrecision(), getScale());
+        return new SqlDecimal(BigInteger.valueOf(getLong(block, position)), getPrecision(), getScale());
     }
 
     @Override
@@ -122,20 +132,26 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeLong(block.getLong(position, 0)).closeEntry();
+            writeLong(blockBuilder, getLong(block, position));
         }
     }
 
     @Override
     public long getLong(Block block, int position)
     {
-        return block.getLong(position, 0);
+        return read((LongArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
     public void writeLong(BlockBuilder blockBuilder, long value)
     {
-        blockBuilder.writeLong(value).closeEntry();
+        ((LongArrayBlockBuilder) blockBuilder).writeLong(value);
+    }
+
+    @Override
+    public int getFlatFixedSize()
+    {
+        return Long.BYTES;
     }
 
     @Override
@@ -144,6 +160,32 @@ public Optional<Stream<?>> getDiscreteValues(Range range)
         return Optional.of(LongStream.rangeClosed((long) range.getMin(), (long) range.getMax()).boxed());
     }
 
+    @ScalarOperator(READ_VALUE)
+    private static long read(@BlockPosition LongArrayBlock block, @BlockIndex int position)
+    {
+        return block.getLong(position);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static long readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            long value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, value);
+    }
+
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(long left, long right)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimeWithTimeZoneType.java b/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimeWithTimeZoneType.java
index 2f1b8b944fdd..d679a0d37357 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimeWithTimeZoneType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimeWithTimeZoneType.java
@@ -13,21 +13,31 @@
  */
 package io.trino.spi.type;
 
-import io.airlift.slice.Slice;
 import io.airlift.slice.XxHash64;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.LongArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
+
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.DateTimeEncoding.unpackOffsetMinutes;
 import static io.trino.spi.type.DateTimeEncoding.unpackTimeNanos;
@@ -44,10 +54,11 @@ final class ShortTimeWithTimeZoneType
         extends TimeWithTimeZoneType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(ShortTimeWithTimeZoneType.class, lookup(), long.class);
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
 
     public ShortTimeWithTimeZoneType(int precision)
     {
-        super(precision, long.class);
+        super(precision, long.class, LongArrayBlock.class);
 
         if (precision < 0 || precision > MAX_SHORT_PRECISION) {
             throw new IllegalArgumentException(format("Precision must be in the range [0, %s]", MAX_SHORT_PRECISION));
@@ -61,42 +72,36 @@ public TypeOperatorDeclaration getTypeOperatorDeclaration(TypeOperators typeOper
     }
 
     @Override
-    public final int getFixedSize()
+    public int getFixedSize()
     {
         return Long.BYTES;
     }
 
     @Override
-    public final long getLong(Block block, int position)
-    {
-        return block.getLong(position, 0);
-    }
-
-    @Override
-    public final Slice getSlice(Block block, int position)
+    public long getLong(Block block, int position)
     {
-        return block.getSlice(position, 0, getFixedSize());
+        return read((LongArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
-    public final void writeLong(BlockBuilder blockBuilder, long value)
+    public void writeLong(BlockBuilder blockBuilder, long value)
     {
-        blockBuilder.writeLong(value).closeEntry();
+        ((LongArrayBlockBuilder) blockBuilder).writeLong(value);
     }
 
     @Override
-    public final void appendTo(Block block, int position, BlockBuilder blockBuilder)
+    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
     {
         if (block.isNull(position)) {
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeLong(block.getLong(position, 0)).closeEntry();
+            writeLong(blockBuilder, getLong(block, position));
         }
     }
 
     @Override
-    public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -111,13 +116,13 @@ public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStat
     }
 
     @Override
-    public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         return createBlockBuilder(blockBuilderStatus, expectedEntries, Long.BYTES);
     }
 
     @Override
-    public final BlockBuilder createFixedSizeBlockBuilder(int positionCount)
+    public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {
         return new LongArrayBlockBuilder(null, positionCount);
     }
@@ -129,10 +134,42 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        long value = block.getLong(position, 0);
+        long value = getLong(block, position);
         return SqlTimeWithTimeZone.newInstance(getPrecision(), unpackTimeNanos(value) * PICOSECONDS_PER_NANOSECOND, unpackOffsetMinutes(value));
     }
 
+    @Override
+    public int getFlatFixedSize()
+    {
+        return Long.BYTES;
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static long read(@BlockPosition LongArrayBlock block, @BlockIndex int position)
+    {
+        return block.getLong(position);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static long readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            long value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, value);
+    }
+
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(long leftPackedTime, long rightPackedTime)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimestampType.java b/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimestampType.java
index 6703b15a55ab..6a86b1febd78 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimestampType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimestampType.java
@@ -17,11 +17,20 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.LongArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
 import java.util.Optional;
 
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
@@ -29,6 +38,7 @@
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.Timestamps.rescale;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
@@ -41,21 +51,22 @@
  * The value is encoded as microseconds from the 1970-01-01 00:00:00 epoch and is to be interpreted as
  * local date time without regards to any time zone.
  */
-class ShortTimestampType
+final class ShortTimestampType
         extends TimestampType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(ShortTimestampType.class, lookup(), long.class);
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
     private final Range range;
 
     public ShortTimestampType(int precision)
     {
-        super(precision, long.class);
+        super(precision, long.class, LongArrayBlock.class);
 
         if (precision < 0 || precision > MAX_SHORT_PRECISION) {
             throw new IllegalArgumentException(format("Precision must be in the range [0, %s]", MAX_SHORT_PRECISION));
         }
 
-        // ShortTimestampType instances are created eagerly and shared so it's OK to precompute some things.
+        // ShortTimestampType instances are created eagerly and shared, so it's OK to precompute some things.
         if (getPrecision() == MAX_SHORT_PRECISION) {
             range = new Range(Long.MIN_VALUE, Long.MAX_VALUE);
         }
@@ -72,36 +83,36 @@ public TypeOperatorDeclaration getTypeOperatorDeclaration(TypeOperators typeOper
     }
 
     @Override
-    public final int getFixedSize()
+    public int getFixedSize()
     {
         return Long.BYTES;
     }
 
     @Override
-    public final long getLong(Block block, int position)
+    public long getLong(Block block, int position)
     {
-        return block.getLong(position, 0);
+        return read((LongArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
-    public final void writeLong(BlockBuilder blockBuilder, long value)
+    public void writeLong(BlockBuilder blockBuilder, long value)
     {
-        blockBuilder.writeLong(value).closeEntry();
+        ((LongArrayBlockBuilder) blockBuilder).writeLong(value);
     }
 
     @Override
-    public final void appendTo(Block block, int position, BlockBuilder blockBuilder)
+    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
     {
         if (block.isNull(position)) {
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeLong(getLong(block, position)).closeEntry();
+            writeLong(blockBuilder, getLong(block, position));
         }
     }
 
     @Override
-    public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -116,13 +127,13 @@ public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStat
     }
 
     @Override
-    public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         return createBlockBuilder(blockBuilderStatus, expectedEntries, Long.BYTES);
     }
 
     @Override
-    public final BlockBuilder createFixedSizeBlockBuilder(int positionCount)
+    public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {
         return new LongArrayBlockBuilder(null, positionCount);
     }
@@ -138,6 +149,12 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         return SqlTimestamp.newInstance(getPrecision(), epochMicros, 0);
     }
 
+    @Override
+    public int getFlatFixedSize()
+    {
+        return Long.BYTES;
+    }
+
     @Override
     public Optional<Range> getRange()
     {
@@ -162,6 +179,32 @@ public Optional<Object> getNextValue(Object value)
         return Optional.of((long) value + rescale(1_000_000, getPrecision(), 0));
     }
 
+    @ScalarOperator(READ_VALUE)
+    private static long read(@BlockPosition LongArrayBlock block, @BlockIndex int position)
+    {
+        return block.getLong(position);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static long readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            long value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, value);
+    }
+
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(long left, long right)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimestampWithTimeZoneType.java b/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimestampWithTimeZoneType.java
index 2a0684e64e35..401ba757e344 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimestampWithTimeZoneType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/ShortTimestampWithTimeZoneType.java
@@ -13,21 +13,31 @@
  */
 package io.trino.spi.type;
 
-import io.airlift.slice.Slice;
 import io.airlift.slice.XxHash64;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.LongArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
+
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
 import static io.trino.spi.type.DateTimeEncoding.unpackZoneKey;
@@ -44,10 +54,11 @@ final class ShortTimestampWithTimeZoneType
         extends TimestampWithTimeZoneType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(ShortTimestampWithTimeZoneType.class, lookup(), long.class);
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
 
     public ShortTimestampWithTimeZoneType(int precision)
     {
-        super(precision, long.class);
+        super(precision, long.class, LongArrayBlock.class);
 
         if (precision < 0 || precision > MAX_SHORT_PRECISION) {
             throw new IllegalArgumentException(format("Precision must be in the range [0, %s]", MAX_SHORT_PRECISION));
@@ -61,42 +72,36 @@ public TypeOperatorDeclaration getTypeOperatorDeclaration(TypeOperators typeOper
     }
 
     @Override
-    public final int getFixedSize()
+    public int getFixedSize()
     {
         return Long.BYTES;
     }
 
     @Override
-    public final long getLong(Block block, int position)
-    {
-        return block.getLong(position, 0);
-    }
-
-    @Override
-    public final Slice getSlice(Block block, int position)
+    public long getLong(Block block, int position)
     {
-        return block.getSlice(position, 0, getFixedSize());
+        return read((LongArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
-    public final void writeLong(BlockBuilder blockBuilder, long value)
+    public void writeLong(BlockBuilder blockBuilder, long value)
     {
-        blockBuilder.writeLong(value).closeEntry();
+        ((LongArrayBlockBuilder) blockBuilder).writeLong(value);
     }
 
     @Override
-    public final void appendTo(Block block, int position, BlockBuilder blockBuilder)
+    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
     {
         if (block.isNull(position)) {
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeLong(block.getLong(position, 0)).closeEntry();
+            writeLong(blockBuilder, getLong(block, position));
         }
     }
 
     @Override
-    public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries, int expectedBytesPerEntry)
     {
         int maxBlockSizeInBytes;
         if (blockBuilderStatus == null) {
@@ -111,13 +116,13 @@ public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStat
     }
 
     @Override
-    public final BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
+    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         return createBlockBuilder(blockBuilderStatus, expectedEntries, Long.BYTES);
     }
 
     @Override
-    public final BlockBuilder createFixedSizeBlockBuilder(int positionCount)
+    public BlockBuilder createFixedSizeBlockBuilder(int positionCount)
     {
         return new LongArrayBlockBuilder(null, positionCount);
     }
@@ -129,10 +134,42 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        long value = block.getLong(position, 0);
+        long value = getLong(block, position);
         return SqlTimestampWithTimeZone.newInstance(getPrecision(), unpackMillisUtc(value), 0, unpackZoneKey(value));
     }
 
+    @Override
+    public int getFlatFixedSize()
+    {
+        return Long.BYTES;
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static long read(@BlockPosition LongArrayBlock block, @BlockIndex int position)
+    {
+        return block.getLong(position);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static long readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            long value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, value);
+    }
+
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(long left, long right)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/SmallintType.java b/core/trino-spi/src/main/java/io/trino/spi/type/SmallintType.java
index c81ec1a251de..2114679bf4b5 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/SmallintType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/SmallintType.java
@@ -19,10 +19,19 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
 import io.trino.spi.block.PageBuilderStatus;
+import io.trino.spi.block.ShortArrayBlock;
 import io.trino.spi.block.ShortArrayBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
 import java.util.Optional;
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
@@ -33,6 +42,7 @@
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.String.format;
@@ -43,12 +53,13 @@ public final class SmallintType
         implements FixedWidthType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(SmallintType.class, lookup(), long.class);
+    private static final VarHandle SHORT_HANDLE = MethodHandles.byteArrayViewVarHandle(short[].class, ByteOrder.LITTLE_ENDIAN);
 
     public static final SmallintType SMALLINT = new SmallintType();
 
     private SmallintType()
     {
-        super(new TypeSignature(StandardTypes.SMALLINT), long.class);
+        super(new TypeSignature(StandardTypes.SMALLINT), long.class, ShortArrayBlock.class);
     }
 
     @Override
@@ -109,7 +120,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return block.getShort(position, 0);
+        return getShort(block, position);
     }
 
     @Override
@@ -153,24 +164,34 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeShort(block.getShort(position, 0)).closeEntry();
+            ((ShortArrayBlockBuilder) blockBuilder).writeShort(getShort(block, position));
         }
     }
 
     @Override
     public long getLong(Block block, int position)
     {
-        return block.getShort(position, 0);
+        return getShort(block, position);
+    }
+
+    public short getShort(Block block, int position)
+    {
+        return readShort((ShortArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
     public void writeLong(BlockBuilder blockBuilder, long value)
     {
         checkValueValid(value);
-        blockBuilder.writeShort((int) value).closeEntry();
+        writeShort(blockBuilder, (short) value);
+    }
+
+    public void writeShort(BlockBuilder blockBuilder, short value)
+    {
+        ((ShortArrayBlockBuilder) blockBuilder).writeShort(value);
     }
 
-    private void checkValueValid(long value)
+    private static void checkValueValid(long value)
     {
         if (value > Short.MAX_VALUE) {
             throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Value %d exceeds MAX_SHORT", value));
@@ -180,6 +201,12 @@ private void checkValueValid(long value)
         }
     }
 
+    @Override
+    public int getFlatFixedSize()
+    {
+        return Short.BYTES;
+    }
+
     @Override
     @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
     public boolean equals(Object other)
@@ -193,6 +220,37 @@ public int hashCode()
         return getClass().hashCode();
     }
 
+    @ScalarOperator(READ_VALUE)
+    private static long read(@BlockPosition ShortArrayBlock block, @BlockIndex int position)
+    {
+        return readShort(block, position);
+    }
+
+    private static short readShort(ShortArrayBlock block, int position)
+    {
+        return block.getShort(position);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static long readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return (short) SHORT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            long value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        SHORT_HANDLE.set(fixedSizeSlice, fixedSizeOffset, (short) value);
+    }
+
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(long left, long right)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/SqlTimestampWithTimeZone.java b/core/trino-spi/src/main/java/io/trino/spi/type/SqlTimestampWithTimeZone.java
index 70a2871d26b1..7c1b6155f5ce 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/SqlTimestampWithTimeZone.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/SqlTimestampWithTimeZone.java
@@ -55,7 +55,7 @@ public static SqlTimestampWithTimeZone newInstance(int precision, long epochMill
                 throw new IllegalArgumentException(format("Expected picosOfMilli to be 0 for precision %s: %s", precision, picosOfMilli));
             }
             if (round(epochMillis, 3 - precision) != epochMillis) {
-                throw new IllegalArgumentException(format("Expected 0s for digits beyond precision %s: epochMicros = %s", precision, epochMillis));
+                throw new IllegalArgumentException(format("Expected 0s for digits beyond precision %s: epochMillis = %s", precision, epochMillis));
             }
         }
         else {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/SqlVarbinary.java b/core/trino-spi/src/main/java/io/trino/spi/type/SqlVarbinary.java
index 7510df0583d5..5c54a95fe15f 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/SqlVarbinary.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/SqlVarbinary.java
@@ -77,13 +77,13 @@ public String toString()
         int lastLineBytes = bytes.length % 32;
 
         // 4 full words with 3 word separators and one line break per full line of output
-        long totalSize = fullLineCount * ((4 * OUTPUT_CHARS_PER_FULL_WORD) + (3 * WORD_SEPARATOR.length()) + 1);
+        long totalSize = (long) fullLineCount * ((4 * OUTPUT_CHARS_PER_FULL_WORD) + (3 * WORD_SEPARATOR.length()) + 1);
         if (lastLineBytes == 0) {
             totalSize--; // no final line separator
         }
         else {
             int lastLineWords = lastLineBytes / 8;
-            totalSize += (lastLineWords * (OUTPUT_CHARS_PER_FULL_WORD + WORD_SEPARATOR.length()));
+            totalSize += (long) lastLineWords * (OUTPUT_CHARS_PER_FULL_WORD + WORD_SEPARATOR.length());
             // whole words and separators on last line
             if (lastLineWords * 8 == lastLineBytes) {
                 totalSize -= WORD_SEPARATOR.length(); // last line ends on a word boundary, no separator
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/TimeType.java b/core/trino-spi/src/main/java/io/trino/spi/type/TimeType.java
index ee3f5326002e..1c66925c69c7 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/TimeType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/TimeType.java
@@ -17,14 +17,22 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
+
 import static io.trino.spi.StandardErrorCode.NUMERIC_VALUE_OUT_OF_RANGE;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.String.format;
@@ -37,6 +45,7 @@ public final class TimeType
         extends AbstractLongType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(TimeType.class, lookup(), long.class);
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
 
     public static final int MAX_PRECISION = 12;
     public static final int DEFAULT_PRECISION = 3; // TODO: should be 6 per SQL spec
@@ -89,7 +98,27 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return SqlTime.newInstance(precision, block.getLong(position, 0));
+        return SqlTime.newInstance(precision, getLong(block, position));
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static long readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            long value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        LONG_HANDLE.set(fixedSizeSlice, fixedSizeOffset, value);
     }
 
     @ScalarOperator(EQUAL)
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/TimeWithTimeZoneType.java b/core/trino-spi/src/main/java/io/trino/spi/type/TimeWithTimeZoneType.java
index e3d0fbc706c6..ee9e406080bb 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/TimeWithTimeZoneType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/TimeWithTimeZoneType.java
@@ -14,6 +14,7 @@
 package io.trino.spi.type;
 
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ValueBlock;
 
 import static io.trino.spi.StandardErrorCode.NUMERIC_VALUE_OUT_OF_RANGE;
 import static java.lang.String.format;
@@ -59,9 +60,9 @@ public static TimeWithTimeZoneType createTimeWithTimeZoneType(int precision)
         return TYPES[precision];
     }
 
-    protected TimeWithTimeZoneType(int precision, Class<?> javaType)
+    protected TimeWithTimeZoneType(int precision, Class<?> javaType, Class<? extends ValueBlock> valueBlockType)
     {
-        super(new TypeSignature(StandardTypes.TIME_WITH_TIME_ZONE, TypeSignatureParameter.numericParameter(precision)), javaType);
+        super(new TypeSignature(StandardTypes.TIME_WITH_TIME_ZONE, TypeSignatureParameter.numericParameter(precision)), javaType, valueBlockType);
         this.precision = precision;
     }
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/TimestampType.java b/core/trino-spi/src/main/java/io/trino/spi/type/TimestampType.java
index 5d6cd360371d..03749b781ade 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/TimestampType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/TimestampType.java
@@ -14,6 +14,7 @@
 package io.trino.spi.type;
 
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ValueBlock;
 
 import static io.trino.spi.StandardErrorCode.NUMERIC_VALUE_OUT_OF_RANGE;
 import static java.lang.String.format;
@@ -24,9 +25,10 @@
  * @see ShortTimestampType
  * @see LongTimestampType
  */
-public abstract class TimestampType
+public abstract sealed class TimestampType
         extends AbstractType
         implements FixedWidthType
+        permits LongTimestampType, ShortTimestampType
 {
     public static final int MAX_PRECISION = 12;
 
@@ -57,9 +59,9 @@ public static TimestampType createTimestampType(int precision)
         return TYPES[precision];
     }
 
-    TimestampType(int precision, Class<?> javaType)
+    TimestampType(int precision, Class<?> javaType, Class<? extends ValueBlock> valueBlockType)
     {
-        super(new TypeSignature(StandardTypes.TIMESTAMP, TypeSignatureParameter.numericParameter(precision)), javaType);
+        super(new TypeSignature(StandardTypes.TIMESTAMP, TypeSignatureParameter.numericParameter(precision)), javaType, valueBlockType);
         this.precision = precision;
     }
 
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/TimestampTypes.java b/core/trino-spi/src/main/java/io/trino/spi/type/TimestampTypes.java
index c5243dcbb3ac..5b260a5f14af 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/TimestampTypes.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/TimestampTypes.java
@@ -14,6 +14,7 @@
 package io.trino.spi.type;
 
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.Fixed12BlockBuilder;
 
 public final class TimestampTypes
 {
@@ -26,8 +27,6 @@ public static void writeLongTimestamp(BlockBuilder blockBuilder, LongTimestamp t
 
     public static void writeLongTimestamp(BlockBuilder blockBuilder, long epochMicros, int fraction)
     {
-        blockBuilder.writeLong(epochMicros);
-        blockBuilder.writeInt(fraction);
-        blockBuilder.closeEntry();
+        ((Fixed12BlockBuilder) blockBuilder).writeFixed12(epochMicros, fraction);
     }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/TimestampWithTimeZoneType.java b/core/trino-spi/src/main/java/io/trino/spi/type/TimestampWithTimeZoneType.java
index d900d47553c8..4f75e8176c5f 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/TimestampWithTimeZoneType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/TimestampWithTimeZoneType.java
@@ -14,6 +14,7 @@
 package io.trino.spi.type;
 
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ValueBlock;
 
 import static io.trino.spi.StandardErrorCode.NUMERIC_VALUE_OUT_OF_RANGE;
 import static java.lang.String.format;
@@ -56,9 +57,9 @@ public static TimestampWithTimeZoneType createTimestampWithTimeZoneType(int prec
         return TYPES[precision];
     }
 
-    TimestampWithTimeZoneType(int precision, Class<?> javaType)
+    TimestampWithTimeZoneType(int precision, Class<?> javaType, Class<? extends ValueBlock> valueBlockType)
     {
-        super(new TypeSignature(StandardTypes.TIMESTAMP_WITH_TIME_ZONE, TypeSignatureParameter.numericParameter(precision)), javaType);
+        super(new TypeSignature(StandardTypes.TIMESTAMP_WITH_TIME_ZONE, TypeSignatureParameter.numericParameter(precision)), javaType, valueBlockType);
 
         if (precision < 0 || precision > MAX_PRECISION) {
             throw new IllegalArgumentException(format("Precision must be in the range [0, %s]", MAX_PRECISION));
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/TinyintType.java b/core/trino-spi/src/main/java/io/trino/spi/type/TinyintType.java
index 37db7bcfcac0..b8b254eef3d4 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/TinyintType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/TinyintType.java
@@ -18,9 +18,15 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.ByteArrayBlock;
 import io.trino.spi.block.ByteArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
 import java.util.Optional;
@@ -33,6 +39,7 @@
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.String.format;
@@ -48,7 +55,7 @@ public final class TinyintType
 
     private TinyintType()
     {
-        super(new TypeSignature(StandardTypes.TINYINT), long.class);
+        super(new TypeSignature(StandardTypes.TINYINT), long.class, ByteArrayBlock.class);
     }
 
     @Override
@@ -109,7 +116,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return block.getByte(position, 0);
+        return getByte(block, position);
     }
 
     @Override
@@ -153,24 +160,34 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeByte(block.getByte(position, 0)).closeEntry();
+            writeByte(blockBuilder, getByte(block, position));
         }
     }
 
     @Override
     public long getLong(Block block, int position)
     {
-        return block.getByte(position, 0);
+        return getByte(block, position);
+    }
+
+    public byte getByte(Block block, int position)
+    {
+        return readByte((ByteArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
     }
 
     @Override
     public void writeLong(BlockBuilder blockBuilder, long value)
     {
         checkValueValid(value);
-        blockBuilder.writeByte((int) value).closeEntry();
+        writeByte(blockBuilder, (byte) value);
+    }
+
+    public void writeByte(BlockBuilder blockBuilder, byte value)
+    {
+        ((ByteArrayBlockBuilder) blockBuilder).writeByte(value);
     }
 
-    private void checkValueValid(long value)
+    private static void checkValueValid(long value)
     {
         if (value > Byte.MAX_VALUE) {
             throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Value %d exceeds MAX_BYTE", value));
@@ -180,6 +197,12 @@ private void checkValueValid(long value)
         }
     }
 
+    @Override
+    public int getFlatFixedSize()
+    {
+        return Byte.BYTES;
+    }
+
     @Override
     public boolean equals(Object other)
     {
@@ -192,6 +215,37 @@ public int hashCode()
         return getClass().hashCode();
     }
 
+    @ScalarOperator(READ_VALUE)
+    private static long read(@BlockPosition ByteArrayBlock block, @BlockIndex int position)
+    {
+        return readByte(block, position);
+    }
+
+    private static byte readByte(ByteArrayBlock block, int position)
+    {
+        return block.getByte(position);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static long readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return fixedSizeSlice[fixedSizeOffset];
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            long value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        fixedSizeSlice[fixedSizeOffset] = (byte) value;
+    }
+
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(long left, long right)
     {
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/Type.java b/core/trino-spi/src/main/java/io/trino/spi/type/Type.java
index dab302cc06be..519abbfbb462 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/Type.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/Type.java
@@ -18,6 +18,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.connector.ConnectorSession;
 
 import java.util.List;
@@ -81,6 +82,11 @@ default TypeOperatorDeclaration getTypeOperatorDeclaration(TypeOperators typeOpe
      */
     Class<?> getJavaType();
 
+    /**
+     * Gets the ValueBlock type used to store values of this type.
+     */
+    Class<? extends ValueBlock> getValueBlockType();
+
     /**
      * For parameterized types returns the list of parameters.
      */
@@ -215,6 +221,31 @@ default Optional<Stream<?>> getDiscreteValues(Range range)
         return Optional.empty();
     }
 
+    /**
+     * Returns the fixed size of this type when written to a flat buffer.
+     */
+    int getFlatFixedSize();
+
+    /**
+     * Returns true if this type is variable width when written to a flat buffer.
+     */
+    boolean isFlatVariableWidth();
+
+    /**
+     * Returns the variable width size of the value at the specified position when written to a flat buffer.
+     */
+    int getFlatVariableWidthSize(Block block, int position);
+
+    /**
+     * Update the variable width offsets recorded in the value.
+     * This method is called after the value has been moved to a new location, and therefore the offsets
+     * need to be updated.
+     * Returns the length of the variable width data, so container types can update their offsets.
+     *
+     * @return the length of the variable width data
+     */
+    int relocateFlatVariableWidthOffsets(byte[] fixedSizeSlice, int fixedSizeOffset, byte[] variableSizeSlice, int variableSizeOffset);
+
     final class Range
     {
         private final Object min;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/TypeOperatorDeclaration.java b/core/trino-spi/src/main/java/io/trino/spi/type/TypeOperatorDeclaration.java
index 7204ac95f380..bc604ded7dcd 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/TypeOperatorDeclaration.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/TypeOperatorDeclaration.java
@@ -14,9 +14,14 @@
 package io.trino.spi.type;
 
 import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BlockIndex;
 import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.InvocationConvention;
 import io.trino.spi.function.InvocationConvention.InvocationArgumentConvention;
 import io.trino.spi.function.InvocationConvention.InvocationReturnConvention;
@@ -37,10 +42,16 @@
 import java.util.List;
 
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NULL_FLAG;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static java.lang.String.format;
@@ -51,6 +62,7 @@ public final class TypeOperatorDeclaration
 {
     public static final TypeOperatorDeclaration NO_TYPE_OPERATOR_DECLARATION = builder(boolean.class).build();
 
+    private final Collection<OperatorMethodHandle> readValueOperators;
     private final Collection<OperatorMethodHandle> equalOperators;
     private final Collection<OperatorMethodHandle> hashCodeOperators;
     private final Collection<OperatorMethodHandle> xxHash64Operators;
@@ -62,6 +74,7 @@ public final class TypeOperatorDeclaration
     private final Collection<OperatorMethodHandle> lessThanOrEqualOperators;
 
     private TypeOperatorDeclaration(
+            Collection<OperatorMethodHandle> readValueOperators,
             Collection<OperatorMethodHandle> equalOperators,
             Collection<OperatorMethodHandle> hashCodeOperators,
             Collection<OperatorMethodHandle> xxHash64Operators,
@@ -72,6 +85,7 @@ private TypeOperatorDeclaration(
             Collection<OperatorMethodHandle> lessThanOperators,
             Collection<OperatorMethodHandle> lessThanOrEqualOperators)
     {
+        this.readValueOperators = List.copyOf(requireNonNull(readValueOperators, "readValueOperators is null"));
         this.equalOperators = List.copyOf(requireNonNull(equalOperators, "equalOperators is null"));
         this.hashCodeOperators = List.copyOf(requireNonNull(hashCodeOperators, "hashCodeOperators is null"));
         this.xxHash64Operators = List.copyOf(requireNonNull(xxHash64Operators, "xxHash64Operators is null"));
@@ -93,6 +107,11 @@ public boolean isOrderable()
         return !comparisonUnorderedLastOperators.isEmpty();
     }
 
+    public Collection<OperatorMethodHandle> getReadValueOperators()
+    {
+        return readValueOperators;
+    }
+
     public Collection<OperatorMethodHandle> getEqualOperators()
     {
         return equalOperators;
@@ -154,6 +173,7 @@ public static class Builder
     {
         private final Class<?> typeJavaType;
 
+        private final Collection<OperatorMethodHandle> readValueOperators = new ArrayList<>();
         private final Collection<OperatorMethodHandle> equalOperators = new ArrayList<>();
         private final Collection<OperatorMethodHandle> hashCodeOperators = new ArrayList<>();
         private final Collection<OperatorMethodHandle> xxHash64Operators = new ArrayList<>();
@@ -164,12 +184,43 @@ public static class Builder
         private final Collection<OperatorMethodHandle> lessThanOperators = new ArrayList<>();
         private final Collection<OperatorMethodHandle> lessThanOrEqualOperators = new ArrayList<>();
 
-        public Builder(Class<?> typeJavaType)
+        private Builder(Class<?> typeJavaType)
         {
             this.typeJavaType = requireNonNull(typeJavaType, "typeJavaType is null");
             checkArgument(!typeJavaType.equals(void.class), "void type is not supported");
         }
 
+        public Builder addOperators(TypeOperatorDeclaration operatorDeclaration)
+        {
+            operatorDeclaration.getReadValueOperators().forEach(this::addReadValueOperator);
+            operatorDeclaration.getEqualOperators().forEach(this::addEqualOperator);
+            operatorDeclaration.getHashCodeOperators().forEach(this::addHashCodeOperator);
+            operatorDeclaration.getXxHash64Operators().forEach(this::addXxHash64Operator);
+            operatorDeclaration.getDistinctFromOperators().forEach(this::addDistinctFromOperator);
+            operatorDeclaration.getIndeterminateOperators().forEach(this::addIndeterminateOperator);
+            operatorDeclaration.getComparisonUnorderedLastOperators().forEach(this::addComparisonUnorderedLastOperator);
+            operatorDeclaration.getComparisonUnorderedFirstOperators().forEach(this::addComparisonUnorderedFirstOperator);
+            operatorDeclaration.getLessThanOperators().forEach(this::addLessThanOperator);
+            operatorDeclaration.getLessThanOrEqualOperators().forEach(this::addLessThanOrEqualOperator);
+            return this;
+        }
+
+        public Builder addReadValueOperator(OperatorMethodHandle readValueOperator)
+        {
+            verifyMethodHandleSignature(1, typeJavaType, readValueOperator);
+            this.readValueOperators.add(readValueOperator);
+            return this;
+        }
+
+        public Builder addReadValueOperators(Collection<OperatorMethodHandle> readValueOperators)
+        {
+            for (OperatorMethodHandle readValueOperator : readValueOperators) {
+                verifyMethodHandleSignature(1, typeJavaType, readValueOperator);
+            }
+            this.readValueOperators.addAll(readValueOperators);
+            return this;
+        }
+
         public Builder addEqualOperator(OperatorMethodHandle equalOperator)
         {
             verifyMethodHandleSignature(2, boolean.class, equalOperator);
@@ -333,6 +384,9 @@ public Builder addOperators(Class<?> operatorsClass, Lookup lookup)
                 }
 
                 switch (operatorType) {
+                    case READ_VALUE:
+                        addReadValueOperator(new OperatorMethodHandle(parseInvocationConvention(operatorType, typeJavaType, method, typeJavaType), methodHandle));
+                        break;
                     case EQUAL:
                         addEqualOperator(new OperatorMethodHandle(parseInvocationConvention(operatorType, typeJavaType, method, boolean.class), methodHandle));
                         break;
@@ -385,6 +439,7 @@ private void verifyMethodHandleSignature(int expectedArgumentCount, Class<?> ret
             int expectedParameterCount = convention.getArgumentConventions().stream()
                     .mapToInt(InvocationArgumentConvention::getParameterCount)
                     .sum();
+            expectedParameterCount += convention.getReturnConvention().getParameterCount();
             checkArgument(expectedParameterCount == methodType.parameterCount(),
                     "Expected %s method parameters, but got %s", expectedParameterCount, methodType.parameterCount());
 
@@ -407,9 +462,21 @@ private void verifyMethodHandleSignature(int expectedArgumentCount, Class<?> ret
                         checkArgument(parameterType.isAssignableFrom(wrap(typeJavaType)),
                                 "Expected argument type to be %s, but is %s", wrap(typeJavaType), parameterType);
                         break;
+                    case BLOCK_POSITION_NOT_NULL:
                     case BLOCK_POSITION:
                         checkArgument(parameterType.equals(Block.class) && methodType.parameterType(parameterIndex + 1).equals(int.class),
-                                "Expected BLOCK_POSITION argument have parameters Block and int");
+                                "Expected BLOCK_POSITION argument to have parameters Block and int");
+                        break;
+                    case VALUE_BLOCK_POSITION_NOT_NULL:
+                    case VALUE_BLOCK_POSITION:
+                        checkArgument(Block.class.isAssignableFrom(parameterType) && methodType.parameterType(parameterIndex + 1).equals(int.class),
+                                "Expected VALUE_BLOCK_POSITION argument to have parameters ValueBlock and int");
+                        break;
+                    case FLAT:
+                        checkArgument(parameterType.equals(byte[].class) &&
+                                        methodType.parameterType(parameterIndex + 1).equals(int.class) &&
+                                        methodType.parameterType(parameterIndex + 2).equals(byte[].class),
+                                "Expected FLAT argument to have parameters byte[], int, and byte[]");
                         break;
                     case FUNCTION:
                         throw new IllegalArgumentException("Function argument convention is not supported in type operators");
@@ -429,19 +496,38 @@ private void verifyMethodHandleSignature(int expectedArgumentCount, Class<?> ret
                     checkArgument(methodType.returnType().equals(wrap(returnJavaType)),
                             "Expected return type to be %s, but is %s", returnJavaType, wrap(methodType.returnType()));
                     break;
+                case BLOCK_BUILDER:
+                    checkArgument(methodType.lastParameterType().equals(BlockBuilder.class),
+                            "Expected last argument type to be BlockBuilder, but is %s", methodType.returnType());
+                    checkArgument(methodType.returnType().equals(void.class),
+                            "Expected return type to be void, but is %s", methodType.returnType());
+                    break;
+                case FLAT_RETURN:
+                    List<Class<?>> parameters = methodType.parameterList();
+                    parameters = parameters.subList(parameters.size() - 4, parameters.size());
+                    checkArgument(
+                            parameters.equals(List.of(byte[].class, int.class, byte[].class, int.class)),
+                            "Expected last argument types to be (byte[], int, byte[], int), but is %s", methodType);
+                    checkArgument(methodType.returnType().equals(void.class),
+                            "Expected return type to be void, but is %s", methodType.returnType());
+                    break;
                 default:
                     throw new UnsupportedOperationException("Unknown return convention: " + returnConvention);
             }
+
+            if (operatorMethodHandle.getCallingConvention().getArgumentConventions().stream().anyMatch(argumentConvention -> argumentConvention == BLOCK_POSITION || argumentConvention == BLOCK_POSITION_NOT_NULL)) {
+                throw new IllegalArgumentException("BLOCK_POSITION argument convention is not allowed for type operators");
+            }
         }
 
         private static InvocationConvention parseInvocationConvention(OperatorType operatorType, Class<?> typeJavaType, Method method, Class<?> expectedReturnType)
         {
-            checkArgument(expectedReturnType.isPrimitive(), "Expected return type must be a primitive: %s", expectedReturnType);
-
             InvocationReturnConvention returnConvention = getReturnConvention(expectedReturnType, operatorType, method);
 
             List<Class<?>> parameterTypes = List.of(method.getParameterTypes());
             List<Annotation[]> parameterAnnotations = List.of(method.getParameterAnnotations());
+            parameterTypes = parameterTypes.subList(0, parameterTypes.size() - returnConvention.getParameterCount());
+            parameterAnnotations = parameterAnnotations.subList(0, parameterAnnotations.size() - returnConvention.getParameterCount());
 
             InvocationArgumentConvention leftArgumentConvention = extractNextArgumentConvention(typeJavaType, parameterTypes, parameterAnnotations, operatorType, method);
             if (leftArgumentConvention.getParameterCount() == parameterTypes.size()) {
@@ -475,6 +561,19 @@ private static InvocationReturnConvention getReturnConvention(Class<?> expectedR
             else if (method.isAnnotationPresent(SqlNullable.class) && method.getReturnType().equals(wrap(expectedReturnType))) {
                 returnConvention = NULLABLE_RETURN;
             }
+            else if (method.getReturnType().equals(void.class) &&
+                    method.getParameterCount() >= 1 &&
+                    method.getParameterTypes()[method.getParameterCount() - 1].equals(BlockBuilder.class)) {
+                returnConvention = BLOCK_BUILDER;
+            }
+            else if (method.getReturnType().equals(void.class) &&
+                    method.getParameterCount() >= 4 &&
+                    method.getParameterTypes()[method.getParameterCount() - 4].equals(byte[].class) &&
+                    method.getParameterTypes()[method.getParameterCount() - 3].equals(int.class) &&
+                    method.getParameterTypes()[method.getParameterCount() - 2].equals(byte[].class) &&
+                    method.getParameterTypes()[method.getParameterCount() - 1].equals(int.class)) {
+                returnConvention = FLAT_RETURN;
+            }
             else {
                 throw new IllegalArgumentException(format("Expected %s operator to return %s: %s", operatorType, expectedReturnType, method));
             }
@@ -488,17 +587,30 @@ private static InvocationArgumentConvention extractNextArgumentConvention(
                 OperatorType operatorType,
                 Method method)
         {
-            if (isAnnotationPresent(parameterAnnotations.get(0), SqlNullable.class)) {
+            if (isAnnotationPresent(parameterAnnotations.get(0), BlockPosition.class)) {
+                if (parameterTypes.size() > 1 && isAnnotationPresent(parameterAnnotations.get(1), BlockIndex.class)) {
+                    if (!ValueBlock.class.isAssignableFrom(parameterTypes.get(0))) {
+                        throw new IllegalArgumentException("@BlockPosition argument must be a ValueBlock type for %s operator: %s".formatted(operatorType, method));
+                    }
+                    if (parameterTypes.get(1) != int.class) {
+                        throw new IllegalArgumentException("@BlockIndex argument must be type int for %s operator: %s".formatted(operatorType, method));
+                    }
+                    return isAnnotationPresent(parameterAnnotations.get(0), SqlNullable.class) ? VALUE_BLOCK_POSITION : VALUE_BLOCK_POSITION_NOT_NULL;
+                }
+            }
+            else if (isAnnotationPresent(parameterAnnotations.get(0), SqlNullable.class)) {
                 if (parameterTypes.get(0).equals(wrap(typeJavaType))) {
                     return BOXED_NULLABLE;
                 }
             }
-            else if (isAnnotationPresent(parameterAnnotations.get(0), BlockPosition.class)) {
-                if (parameterTypes.size() > 1 &&
-                        isAnnotationPresent(parameterAnnotations.get(1), BlockIndex.class) &&
-                        parameterTypes.get(0).equals(Block.class) &&
-                        parameterTypes.get(1).equals(int.class)) {
-                    return BLOCK_POSITION;
+            else if (isAnnotationPresent(parameterAnnotations.get(0), FlatFixed.class)) {
+                if (parameterTypes.size() > 2 &&
+                        isAnnotationPresent(parameterAnnotations.get(1), FlatFixedOffset.class) &&
+                        isAnnotationPresent(parameterAnnotations.get(2), FlatVariableWidth.class) &&
+                        parameterTypes.get(0).equals(byte[].class) &&
+                        parameterTypes.get(1).equals(int.class) &&
+                        parameterTypes.get(2).equals(byte[].class)) {
+                    return FLAT;
                 }
             }
             else if (parameterTypes.size() > 1 && isAnnotationPresent(parameterAnnotations.get(1), IsNull.class)) {
@@ -553,6 +665,7 @@ public TypeOperatorDeclaration build()
             }
 
             return new TypeOperatorDeclaration(
+                    readValueOperators,
                     equalOperators,
                     hashCodeOperators,
                     xxHash64Operators,
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/TypeOperators.java b/core/trino-spi/src/main/java/io/trino/spi/type/TypeOperators.java
index e589122a4559..8d14c5f87998 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/TypeOperators.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/TypeOperators.java
@@ -13,8 +13,10 @@
  */
 package io.trino.spi.type;
 
+import io.airlift.slice.Slice;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.connector.SortOrder;
 import io.trino.spi.function.InvocationConvention;
 import io.trino.spi.function.InvocationConvention.InvocationArgumentConvention;
@@ -24,46 +26,52 @@
 import io.trino.spi.function.ScalarFunctionAdapter;
 
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.MethodType;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.StringJoiner;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiFunction;
 import java.util.function.Supplier;
 
 import static io.trino.spi.StandardErrorCode.FUNCTION_NOT_FOUND;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NULL_FLAG;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_FIRST;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
-import static io.trino.spi.function.ScalarFunctionAdapter.NullAdaptationPolicy.RETURN_NULL_ON_NULL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.IntegerType.INTEGER;
 import static java.lang.String.format;
 import static java.lang.invoke.MethodHandles.collectArguments;
+import static java.lang.invoke.MethodHandles.constant;
 import static java.lang.invoke.MethodHandles.dropArguments;
 import static java.lang.invoke.MethodHandles.filterReturnValue;
 import static java.lang.invoke.MethodHandles.guardWithTest;
+import static java.lang.invoke.MethodHandles.identity;
 import static java.lang.invoke.MethodHandles.lookup;
 import static java.lang.invoke.MethodHandles.permuteArguments;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toUnmodifiableList;
 
 public class TypeOperators
 {
-    private final ScalarFunctionAdapter functionAdapter = new ScalarFunctionAdapter(RETURN_NULL_ON_NULL);
+    private static final InvocationConvention READ_BLOCK_NOT_NULL_CALLING_CONVENTION = simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL);
+    private static final InvocationConvention WRITE_BLOCK_CALLING_CONVENTION = simpleConvention(BLOCK_BUILDER, NEVER_NULL);
+
     private final BiFunction<Object, Supplier<Object>, Object> cache;
 
     public TypeOperators()
@@ -84,6 +92,11 @@ public TypeOperators(BiFunction<Object, Supplier<Object>, Object> cache)
         this.cache = cache;
     }
 
+    public MethodHandle getReadValueOperator(Type type, InvocationConvention callingConvention)
+    {
+        return getOperatorAdaptor(type, callingConvention, READ_VALUE).get();
+    }
+
     public MethodHandle getEqualOperator(Type type, InvocationConvention callingConvention)
     {
         if (!type.isComparable()) {
@@ -173,18 +186,16 @@ private OperatorAdaptor getOperatorAdaptor(Type type, InvocationConvention calli
     private OperatorAdaptor getOperatorAdaptor(Type type, Optional<SortOrder> sortOrder, InvocationConvention callingConvention, OperatorType operatorType)
     {
         OperatorConvention operatorConvention = new OperatorConvention(type, operatorType, sortOrder, callingConvention);
-        return (OperatorAdaptor) cache.apply(operatorConvention, () -> new OperatorAdaptor(functionAdapter, operatorConvention));
+        return (OperatorAdaptor) cache.apply(operatorConvention, () -> new OperatorAdaptor(operatorConvention));
     }
 
     private class OperatorAdaptor
     {
-        private final ScalarFunctionAdapter functionAdapter;
         private final OperatorConvention operatorConvention;
         private MethodHandle adapted;
 
-        public OperatorAdaptor(ScalarFunctionAdapter functionAdapter, OperatorConvention operatorConvention)
+        public OperatorAdaptor(OperatorConvention operatorConvention)
         {
-            this.functionAdapter = functionAdapter;
             this.operatorConvention = operatorConvention;
         }
 
@@ -203,32 +214,40 @@ private MethodHandle adaptOperator(OperatorConvention operatorConvention)
             return methodHandle;
         }
 
-        private MethodHandle adaptOperator(OperatorConvention operatorConvention, OperatorMethodHandle operatorMethodHandle)
+        private static MethodHandle adaptOperator(OperatorConvention operatorConvention, OperatorMethodHandle operatorMethodHandle)
         {
-            return functionAdapter.adapt(
+            return ScalarFunctionAdapter.adapt(
                     operatorMethodHandle.getMethodHandle(),
+                    getOperatorReturnType(operatorConvention),
                     getOperatorArgumentTypes(operatorConvention),
                     operatorMethodHandle.getCallingConvention(),
-                    operatorConvention.getCallingConvention());
+                    operatorConvention.callingConvention());
         }
 
         private OperatorMethodHandle selectOperatorMethodHandleToAdapt(OperatorConvention operatorConvention)
         {
             List<OperatorMethodHandle> operatorMethodHandles = getOperatorMethodHandles(operatorConvention).stream()
                     .sorted(Comparator.comparing(TypeOperators::getScore).reversed())
-                    .collect(toUnmodifiableList());
+                    .toList();
 
+            // if a method handle exists for the exact convention, use it
             for (OperatorMethodHandle operatorMethodHandle : operatorMethodHandles) {
-                if (functionAdapter.canAdapt(operatorMethodHandle.getCallingConvention(), operatorConvention.getCallingConvention())) {
+                if (operatorMethodHandle.getCallingConvention().equals(operatorConvention.callingConvention())) {
+                    return operatorMethodHandle;
+                }
+            }
+
+            for (OperatorMethodHandle operatorMethodHandle : operatorMethodHandles) {
+                if (ScalarFunctionAdapter.canAdapt(operatorMethodHandle.getCallingConvention(), operatorConvention.callingConvention())) {
                     return operatorMethodHandle;
                 }
             }
 
             throw new TrinoException(FUNCTION_NOT_FOUND, format(
                     "%s %s operator can not be adapted to convention (%s). Available implementations: %s",
-                    operatorConvention.getType(),
-                    operatorConvention.getOperatorType(),
-                    operatorConvention.getCallingConvention(),
+                    operatorConvention.type(),
+                    operatorConvention.operatorType(),
+                    operatorConvention.callingConvention(),
                     operatorMethodHandles.stream()
                             .map(OperatorMethodHandle::getCallingConvention)
                             .map(Object::toString)
@@ -237,92 +256,232 @@ private OperatorMethodHandle selectOperatorMethodHandleToAdapt(OperatorConventio
 
         private Collection<OperatorMethodHandle> getOperatorMethodHandles(OperatorConvention operatorConvention)
         {
-            TypeOperatorDeclaration typeOperatorDeclaration = operatorConvention.getType().getTypeOperatorDeclaration(TypeOperators.this);
-            requireNonNull(typeOperatorDeclaration, "typeOperators is null for " + operatorConvention.getType());
-            switch (operatorConvention.getOperatorType()) {
-                case EQUAL:
-                    return typeOperatorDeclaration.getEqualOperators();
-                case HASH_CODE:
+            TypeOperatorDeclaration typeOperatorDeclaration = operatorConvention.type().getTypeOperatorDeclaration(TypeOperators.this);
+            requireNonNull(typeOperatorDeclaration, "typeOperators is null for " + operatorConvention.type());
+            return switch (operatorConvention.operatorType()) {
+                case READ_VALUE -> {
+                    List<OperatorMethodHandle> readValueOperators = new ArrayList<>(typeOperatorDeclaration.getReadValueOperators());
+                    if (readValueOperators.stream().map(OperatorMethodHandle::getCallingConvention).noneMatch(READ_BLOCK_NOT_NULL_CALLING_CONVENTION::equals)) {
+                        readValueOperators.add(new OperatorMethodHandle(READ_BLOCK_NOT_NULL_CALLING_CONVENTION, getDefaultReadBlockMethod(operatorConvention.type())));
+                    }
+                    if (readValueOperators.stream().map(OperatorMethodHandle::getCallingConvention).noneMatch(WRITE_BLOCK_CALLING_CONVENTION::equals)) {
+                        readValueOperators.add(new OperatorMethodHandle(WRITE_BLOCK_CALLING_CONVENTION, getDefaultWriteMethod(operatorConvention.type())));
+                    }
+                    yield readValueOperators;
+                }
+                case EQUAL -> typeOperatorDeclaration.getEqualOperators();
+                case HASH_CODE -> {
                     Collection<OperatorMethodHandle> hashCodeOperators = typeOperatorDeclaration.getHashCodeOperators();
                     if (hashCodeOperators.isEmpty()) {
-                        return typeOperatorDeclaration.getXxHash64Operators();
+                        yield typeOperatorDeclaration.getXxHash64Operators();
                     }
-                    return hashCodeOperators;
-                case XX_HASH_64:
-                    return typeOperatorDeclaration.getXxHash64Operators();
-                case IS_DISTINCT_FROM:
+                    yield hashCodeOperators;
+                }
+                case XX_HASH_64 -> typeOperatorDeclaration.getXxHash64Operators();
+                case IS_DISTINCT_FROM -> {
                     Collection<OperatorMethodHandle> distinctFromOperators = typeOperatorDeclaration.getDistinctFromOperators();
                     if (distinctFromOperators.isEmpty()) {
-                        return List.of(generateDistinctFromOperator(operatorConvention));
+                        yield List.of(generateDistinctFromOperator(operatorConvention));
                     }
-                    return distinctFromOperators;
-                case INDETERMINATE:
+                    yield distinctFromOperators;
+                }
+                case INDETERMINATE -> {
                     Collection<OperatorMethodHandle> indeterminateOperators = typeOperatorDeclaration.getIndeterminateOperators();
                     if (indeterminateOperators.isEmpty()) {
-                        return List.of(defaultIndeterminateOperator(operatorConvention.getType().getJavaType()));
+                        yield List.of(defaultIndeterminateOperator(operatorConvention.type().getJavaType()));
                     }
-                    return indeterminateOperators;
-                case COMPARISON_UNORDERED_LAST:
-                    if (operatorConvention.getSortOrder().isPresent()) {
-                        return List.of(generateOrderingOperator(operatorConvention));
+                    yield indeterminateOperators;
+                }
+                case COMPARISON_UNORDERED_LAST -> {
+                    if (operatorConvention.sortOrder().isPresent()) {
+                        yield List.of(generateOrderingOperator(operatorConvention));
                     }
                     Collection<OperatorMethodHandle> comparisonUnorderedLastOperators = typeOperatorDeclaration.getComparisonUnorderedLastOperators();
                     if (comparisonUnorderedLastOperators.isEmpty()) {
-                        // if a type only provides one comparison operator it is assumed that the type does not have unordered values
-                        return typeOperatorDeclaration.getComparisonUnorderedFirstOperators();
+                        // if a type only provides one comparison operator, it is assumed that the type does not have unordered values
+                        yield typeOperatorDeclaration.getComparisonUnorderedFirstOperators();
                     }
-                    return comparisonUnorderedLastOperators;
-                case COMPARISON_UNORDERED_FIRST:
-                    if (operatorConvention.getSortOrder().isPresent()) {
-                        return List.of(generateOrderingOperator(operatorConvention));
+                    yield comparisonUnorderedLastOperators;
+                }
+                case COMPARISON_UNORDERED_FIRST -> {
+                    if (operatorConvention.sortOrder().isPresent()) {
+                        yield List.of(generateOrderingOperator(operatorConvention));
                     }
                     Collection<OperatorMethodHandle> comparisonUnorderedFirstOperators = typeOperatorDeclaration.getComparisonUnorderedFirstOperators();
                     if (comparisonUnorderedFirstOperators.isEmpty()) {
-                        // if a type only provides one comparison operator it is assumed that the type does not have unordered values
-                        return typeOperatorDeclaration.getComparisonUnorderedLastOperators();
+                        // if a type only provides one comparison operator, it is assumed that the type does not have unordered values
+                        yield typeOperatorDeclaration.getComparisonUnorderedLastOperators();
                     }
-                    return comparisonUnorderedFirstOperators;
-                case LESS_THAN:
+                    yield comparisonUnorderedFirstOperators;
+                }
+                case LESS_THAN -> {
                     Collection<OperatorMethodHandle> lessThanOperators = typeOperatorDeclaration.getLessThanOperators();
                     if (lessThanOperators.isEmpty()) {
-                        return List.of(generateLessThanOperator(operatorConvention, false));
+                        yield List.of(generateLessThanOperator(operatorConvention, false));
                     }
-                    return lessThanOperators;
-                case LESS_THAN_OR_EQUAL:
+                    yield lessThanOperators;
+                }
+                case LESS_THAN_OR_EQUAL -> {
                     Collection<OperatorMethodHandle> lessThanOrEqualOperators = typeOperatorDeclaration.getLessThanOrEqualOperators();
                     if (lessThanOrEqualOperators.isEmpty()) {
-                        return List.of(generateLessThanOperator(operatorConvention, true));
+                        yield List.of(generateLessThanOperator(operatorConvention, true));
                     }
-                    return lessThanOrEqualOperators;
-                default:
-                    throw new IllegalArgumentException("Unsupported operator type: " + operatorConvention.getOperatorType());
+                    yield lessThanOrEqualOperators;
+                }
+                default -> throw new IllegalArgumentException("Unsupported operator type: " + operatorConvention.operatorType());
+            };
+        }
+
+        private static MethodHandle getDefaultReadBlockMethod(Type type)
+        {
+            Class<?> javaType = type.getJavaType();
+            if (boolean.class.equals(javaType)) {
+                return TYPE_GET_BOOLEAN.bindTo(type);
+            }
+            if (long.class.equals(javaType)) {
+                return TYPE_GET_LONG.bindTo(type);
             }
+            if (double.class.equals(javaType)) {
+                return TYPE_GET_DOUBLE.bindTo(type);
+            }
+            if (Slice.class.equals(javaType)) {
+                return TYPE_GET_SLICE.bindTo(type);
+            }
+            return TYPE_GET_OBJECT
+                    .asType(TYPE_GET_OBJECT.type().changeReturnType(type.getJavaType()))
+                    .bindTo(type);
+        }
+
+        private static MethodHandle getDefaultWriteMethod(Type type)
+        {
+            Class<?> javaType = type.getJavaType();
+            if (boolean.class.equals(javaType)) {
+                return TYPE_WRITE_BOOLEAN.bindTo(type);
+            }
+            if (long.class.equals(javaType)) {
+                return TYPE_WRITE_LONG.bindTo(type);
+            }
+            if (double.class.equals(javaType)) {
+                return TYPE_WRITE_DOUBLE.bindTo(type);
+            }
+            if (Slice.class.equals(javaType)) {
+                return TYPE_WRITE_SLICE.bindTo(type);
+            }
+            return TYPE_WRITE_OBJECT.bindTo(type);
         }
 
         private OperatorMethodHandle generateDistinctFromOperator(OperatorConvention operatorConvention)
         {
-            if (operatorConvention.getCallingConvention().getArgumentConventions().equals(List.of(BLOCK_POSITION, BLOCK_POSITION))) {
-                OperatorConvention equalOperator = new OperatorConvention(operatorConvention.getType(), EQUAL, Optional.empty(), simpleConvention(NULLABLE_RETURN, BLOCK_POSITION, BLOCK_POSITION));
-                MethodHandle equalMethodHandle = adaptOperator(equalOperator);
-                return adaptBlockPositionEqualToDistinctFrom(equalMethodHandle);
+            // This code assumes that the declared equals method for the type is not nullable, which is true for all non-container types.
+            // Container types directly define the distinct operator, so this assumption is reasonable.
+            List<InvocationArgumentConvention> argumentConventions = operatorConvention.callingConvention().getArgumentConventions();
+
+            // if none of the arguments are nullable, return "not equal"
+            if (argumentConventions.stream().noneMatch(InvocationArgumentConvention::isNullable)) {
+                InvocationConvention convention = new InvocationConvention(argumentConventions, FAIL_ON_NULL, false, false);
+                MethodHandle equalMethodHandle = adaptOperator(new OperatorConvention(operatorConvention.type(), EQUAL, Optional.empty(), convention));
+                return new OperatorMethodHandle(convention, filterReturnValue(equalMethodHandle, LOGICAL_NOT));
             }
 
-            OperatorConvention equalOperator = new OperatorConvention(operatorConvention.getType(), EQUAL, Optional.empty(), simpleConvention(NULLABLE_RETURN, NEVER_NULL, NEVER_NULL));
-            MethodHandle equalMethodHandle = adaptOperator(equalOperator);
-            return adaptNeverNullEqualToDistinctFrom(equalMethodHandle);
+            // one or both of the arguments are nullable
+            List<InvocationArgumentConvention> equalArgumentConventions = new ArrayList<>();
+            List<InvocationArgumentConvention> distinctArgumentConventions = new ArrayList<>();
+            for (InvocationArgumentConvention argumentConvention : argumentConventions) {
+                if (argumentConvention.isNullable()) {
+                    if (argumentConvention == BLOCK_POSITION) {
+                        equalArgumentConventions.add(BLOCK_POSITION_NOT_NULL);
+                        distinctArgumentConventions.add(BLOCK_POSITION);
+                    }
+                    else {
+                        equalArgumentConventions.add(NEVER_NULL);
+                        distinctArgumentConventions.add(NULL_FLAG);
+                    }
+                }
+                else {
+                    equalArgumentConventions.add(argumentConvention);
+                    distinctArgumentConventions.add(argumentConvention);
+                }
+            }
+            InvocationArgumentConvention leftDistinctConvention = distinctArgumentConventions.get(0);
+            InvocationArgumentConvention rightDistinctConvention = distinctArgumentConventions.get(1);
+
+            // distinct is "not equal", with some extra handling for nulls
+            MethodHandle notEqualMethodHandle = filterReturnValue(
+                    adaptOperator(new OperatorConvention(
+                            operatorConvention.type(),
+                            EQUAL,
+                            Optional.empty(),
+                            new InvocationConvention(equalArgumentConventions, FAIL_ON_NULL, false, false))),
+                    LOGICAL_NOT);
+            // add the unused null flag if necessary
+            if (rightDistinctConvention == NULL_FLAG) {
+                notEqualMethodHandle = dropArguments(notEqualMethodHandle, notEqualMethodHandle.type().parameterCount(), boolean.class);
+            }
+            if (leftDistinctConvention == NULL_FLAG) {
+                notEqualMethodHandle = dropArguments(notEqualMethodHandle, 1, boolean.class);
+            }
+
+            MethodHandle testNullHandle;
+            if (leftDistinctConvention.isNullable() && rightDistinctConvention.isNullable()) {
+                testNullHandle = LOGICAL_OR;
+                testNullHandle = collectArguments(testNullHandle, 1, distinctArgumentNullTest(operatorConvention, rightDistinctConvention));
+                testNullHandle = collectArguments(testNullHandle, 0, distinctArgumentNullTest(operatorConvention, leftDistinctConvention));
+            }
+            else if (leftDistinctConvention.isNullable()) {
+                // test method can have fewer arguments than the operator method
+                testNullHandle = distinctArgumentNullTest(operatorConvention, leftDistinctConvention);
+            }
+            else {
+                testNullHandle = distinctArgumentNullTest(operatorConvention, rightDistinctConvention);
+                testNullHandle = dropArguments(testNullHandle, 0, notEqualMethodHandle.type().parameterList().subList(0, leftDistinctConvention.getParameterCount()));
+            }
+
+            MethodHandle hasNullResultHandle;
+            if (leftDistinctConvention.isNullable() && rightDistinctConvention.isNullable()) {
+                hasNullResultHandle = BOOLEAN_NOT_EQUAL;
+                hasNullResultHandle = collectArguments(hasNullResultHandle, 1, distinctArgumentNullTest(operatorConvention, rightDistinctConvention));
+                hasNullResultHandle = collectArguments(hasNullResultHandle, 0, distinctArgumentNullTest(operatorConvention, leftDistinctConvention));
+            }
+            else {
+                hasNullResultHandle = dropArguments(constant(boolean.class, true), 0, notEqualMethodHandle.type().parameterList());
+            }
+
+            return new OperatorMethodHandle(
+                    simpleConvention(FAIL_ON_NULL, leftDistinctConvention, rightDistinctConvention),
+                    guardWithTest(
+                            testNullHandle,
+                            hasNullResultHandle,
+                            notEqualMethodHandle));
+        }
+
+        private static MethodHandle distinctArgumentNullTest(OperatorConvention operatorConvention, InvocationArgumentConvention distinctArgumentConvention)
+        {
+            if (distinctArgumentConvention == BLOCK_POSITION) {
+                return BLOCK_IS_NULL;
+            }
+            if (distinctArgumentConvention == NULL_FLAG) {
+                return dropArguments(identity(boolean.class), 0, operatorConvention.type().getJavaType());
+            }
+            throw new IllegalArgumentException("Unexpected argument convention: " + distinctArgumentConvention);
         }
 
         private OperatorMethodHandle generateLessThanOperator(OperatorConvention operatorConvention, boolean orEqual)
         {
             InvocationConvention comparisonCallingConvention;
-            if (operatorConvention.getCallingConvention().getArgumentConventions().equals(List.of(BLOCK_POSITION, BLOCK_POSITION))) {
+            if (operatorConvention.callingConvention().getArgumentConventions().equals(List.of(BLOCK_POSITION, BLOCK_POSITION))) {
                 comparisonCallingConvention = simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION);
             }
+            else if (operatorConvention.callingConvention().getArgumentConventions().equals(List.of(NEVER_NULL, BLOCK_POSITION))) {
+                comparisonCallingConvention = simpleConvention(FAIL_ON_NULL, NEVER_NULL, BLOCK_POSITION);
+            }
+            else if (operatorConvention.callingConvention().getArgumentConventions().equals(List.of(BLOCK_POSITION, NEVER_NULL))) {
+                comparisonCallingConvention = simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, NEVER_NULL);
+            }
             else {
                 comparisonCallingConvention = simpleConvention(FAIL_ON_NULL, NEVER_NULL, NEVER_NULL);
             }
 
-            OperatorConvention comparisonOperator = new OperatorConvention(operatorConvention.getType(), COMPARISON_UNORDERED_LAST, Optional.empty(), comparisonCallingConvention);
+            OperatorConvention comparisonOperator = new OperatorConvention(operatorConvention.type(), COMPARISON_UNORDERED_LAST, Optional.empty(), comparisonCallingConvention);
             MethodHandle comparisonMethod = adaptOperator(comparisonOperator);
             if (orEqual) {
                 return adaptComparisonToLessThanOrEqual(new OperatorMethodHandle(comparisonCallingConvention, comparisonMethod));
@@ -332,36 +491,39 @@ private OperatorMethodHandle generateLessThanOperator(OperatorConvention operato
 
         private OperatorMethodHandle generateOrderingOperator(OperatorConvention operatorConvention)
         {
-            SortOrder sortOrder = operatorConvention.getSortOrder().orElseThrow(() -> new IllegalArgumentException("Operator convention does not contain a sort order"));
-            OperatorType comparisonType = operatorConvention.getOperatorType();
-            if (operatorConvention.getCallingConvention().getArgumentConventions().equals(List.of(BLOCK_POSITION, BLOCK_POSITION))) {
-                OperatorConvention comparisonOperator = new OperatorConvention(operatorConvention.getType(), comparisonType, Optional.empty(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
+            SortOrder sortOrder = operatorConvention.sortOrder().orElseThrow(() -> new IllegalArgumentException("Operator convention does not contain a sort order"));
+            OperatorType comparisonType = operatorConvention.operatorType();
+            if (operatorConvention.callingConvention().getArgumentConventions().equals(List.of(BLOCK_POSITION, BLOCK_POSITION))) {
+                OperatorConvention comparisonOperator = new OperatorConvention(operatorConvention.type(), comparisonType, Optional.empty(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
                 MethodHandle comparisonInvoker = adaptOperator(comparisonOperator);
                 return adaptBlockPositionComparisonToOrdering(sortOrder, comparisonInvoker);
             }
 
-            OperatorConvention comparisonOperator = new OperatorConvention(operatorConvention.getType(), comparisonType, Optional.empty(), simpleConvention(FAIL_ON_NULL, NULL_FLAG, NULL_FLAG));
+            OperatorConvention comparisonOperator = new OperatorConvention(operatorConvention.type(), comparisonType, Optional.empty(), simpleConvention(FAIL_ON_NULL, NULL_FLAG, NULL_FLAG));
             MethodHandle comparisonInvoker = adaptOperator(comparisonOperator);
             return adaptNeverNullComparisonToOrdering(sortOrder, comparisonInvoker);
         }
 
-        private List<Type> getOperatorArgumentTypes(OperatorConvention operatorConvention)
+        private static Type getOperatorReturnType(OperatorConvention operatorConvention)
         {
-            switch (operatorConvention.getOperatorType()) {
-                case EQUAL:
-                case IS_DISTINCT_FROM:
-                case COMPARISON_UNORDERED_LAST:
-                case COMPARISON_UNORDERED_FIRST:
-                case LESS_THAN:
-                case LESS_THAN_OR_EQUAL:
-                    return List.of(operatorConvention.getType(), operatorConvention.getType());
-                case HASH_CODE:
-                case XX_HASH_64:
-                case INDETERMINATE:
-                    return List.of(operatorConvention.getType());
-                default:
-                    throw new IllegalArgumentException("Unsupported operator type: " + operatorConvention.getOperatorType());
-            }
+            return switch (operatorConvention.operatorType()) {
+                case EQUAL, IS_DISTINCT_FROM, LESS_THAN, LESS_THAN_OR_EQUAL, INDETERMINATE -> BOOLEAN;
+                case COMPARISON_UNORDERED_LAST, COMPARISON_UNORDERED_FIRST -> INTEGER;
+                case HASH_CODE, XX_HASH_64 -> BIGINT;
+                case READ_VALUE -> operatorConvention.type();
+                default -> throw new IllegalArgumentException("Unsupported operator type: " + operatorConvention.operatorType());
+            };
+        }
+
+        private static List<Type> getOperatorArgumentTypes(OperatorConvention operatorConvention)
+        {
+            return switch (operatorConvention.operatorType()) {
+                case EQUAL, IS_DISTINCT_FROM, COMPARISON_UNORDERED_LAST, COMPARISON_UNORDERED_FIRST, LESS_THAN, LESS_THAN_OR_EQUAL ->
+                        List.of(operatorConvention.type(), operatorConvention.type());
+                case READ_VALUE, HASH_CODE, XX_HASH_64, INDETERMINATE ->
+                        List.of(operatorConvention.type());
+                default -> throw new IllegalArgumentException("Unsupported operator type: " + operatorConvention.operatorType());
+            };
         }
     }
 
@@ -369,9 +531,12 @@ private static int getScore(OperatorMethodHandle operatorMethodHandle)
     {
         int score = 0;
         for (InvocationArgumentConvention argument : operatorMethodHandle.getCallingConvention().getArgumentConventions()) {
-            if (argument == NULL_FLAG) {
+            if (argument == FLAT) {
                 score += 1000;
             }
+            if (argument == NULL_FLAG || argument == FLAT) {
+                score += 100;
+            }
             else if (argument == BLOCK_POSITION) {
                 score += 1;
             }
@@ -379,151 +544,84 @@ else if (argument == BLOCK_POSITION) {
         return score;
     }
 
-    private static final class OperatorConvention
+    private record OperatorConvention(Type type, OperatorType operatorType, Optional<SortOrder> sortOrder, InvocationConvention callingConvention)
     {
-        private final Type type;
-        private final OperatorType operatorType;
-        private final Optional<SortOrder> sortOrder;
-        private final InvocationConvention callingConvention;
-
-        public OperatorConvention(Type type, OperatorType operatorType, Optional<SortOrder> sortOrder, InvocationConvention callingConvention)
-        {
-            this.type = requireNonNull(type, "type is null");
-            this.operatorType = requireNonNull(operatorType, "operatorType is null");
-            this.sortOrder = requireNonNull(sortOrder, "sortOrder is null");
-            this.callingConvention = requireNonNull(callingConvention, "callingConvention is null");
-        }
-
-        @Override
-        public boolean equals(Object o)
-        {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            OperatorConvention operatorConvention = (OperatorConvention) o;
-            return type.equals(operatorConvention.type) &&
-                    operatorType == operatorConvention.operatorType &&
-                    sortOrder.equals(operatorConvention.sortOrder) &&
-                    callingConvention.equals(operatorConvention.callingConvention);
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hash(type, operatorType, sortOrder, callingConvention);
-        }
-
-        @Override
-        public String toString()
-        {
-            return new StringJoiner(", ", OperatorConvention.class.getSimpleName() + "[", "]")
-                    .add("type=" + type)
-                    .add("operatorType=" + sortOrder.map(order -> "ORDER_" + order).orElseGet(operatorType::toString))
-                    .add("callingConvention=" + callingConvention)
-                    .toString();
-        }
-
-        public Type getType()
+        private OperatorConvention
         {
-            return type;
-        }
-
-        public OperatorType getOperatorType()
-        {
-            return operatorType;
-        }
-
-        public Optional<SortOrder> getSortOrder()
-        {
-            return sortOrder;
-        }
-
-        public InvocationConvention getCallingConvention()
-        {
-            return callingConvention;
+            requireNonNull(type, "type is null");
+            requireNonNull(operatorType, "operatorType is null");
+            requireNonNull(sortOrder, "sortOrder is null");
+            requireNonNull(callingConvention, "callingConvention is null");
         }
     }
 
-    private static final MethodHandle BLOCK_POSITION_DISTINCT_FROM;
+    private static final MethodHandle LOGICAL_NOT;
     private static final MethodHandle LOGICAL_OR;
-    private static final MethodHandle LOGICAL_XOR;
-    private static final MethodHandle NOT_EQUAL;
+    private static final MethodHandle BOOLEAN_NOT_EQUAL;
     private static final MethodHandle IS_COMPARISON_LESS_THAN;
     private static final MethodHandle IS_COMPARISON_LESS_THAN_OR_EQUAL;
     private static final MethodHandle ORDER_NULLS;
     private static final MethodHandle ORDER_COMPARISON_RESULT;
     private static final MethodHandle BLOCK_IS_NULL;
 
+    private static final MethodHandle TYPE_GET_BOOLEAN;
+    private static final MethodHandle TYPE_GET_LONG;
+    private static final MethodHandle TYPE_GET_DOUBLE;
+    private static final MethodHandle TYPE_GET_SLICE;
+    private static final MethodHandle TYPE_GET_OBJECT;
+
+    private static final MethodHandle TYPE_WRITE_BOOLEAN;
+    private static final MethodHandle TYPE_WRITE_LONG;
+    private static final MethodHandle TYPE_WRITE_DOUBLE;
+    private static final MethodHandle TYPE_WRITE_SLICE;
+    private static final MethodHandle TYPE_WRITE_OBJECT;
+
     static {
         try {
             Lookup lookup = lookup();
-            BLOCK_POSITION_DISTINCT_FROM = lookup.findStatic(
-                    TypeOperators.class,
-                    "genericBlockPositionDistinctFrom",
-                    MethodType.methodType(boolean.class, MethodHandle.class, Block.class, int.class, Block.class, int.class));
+            LOGICAL_NOT = lookup.findStatic(TypeOperators.class, "logicalNot", MethodType.methodType(boolean.class, boolean.class));
             LOGICAL_OR = lookup.findStatic(Boolean.class, "logicalOr", MethodType.methodType(boolean.class, boolean.class, boolean.class));
-            LOGICAL_XOR = lookup.findStatic(Boolean.class, "logicalXor", MethodType.methodType(boolean.class, boolean.class, boolean.class));
-            NOT_EQUAL = lookup.findStatic(TypeOperators.class, "notEqual", MethodType.methodType(boolean.class, Boolean.class));
+            BOOLEAN_NOT_EQUAL = lookup.findStatic(TypeOperators.class, "booleanNotEqual", MethodType.methodType(boolean.class, boolean.class, boolean.class));
             IS_COMPARISON_LESS_THAN = lookup.findStatic(TypeOperators.class, "isComparisonLessThan", MethodType.methodType(boolean.class, long.class));
             IS_COMPARISON_LESS_THAN_OR_EQUAL = lookup.findStatic(TypeOperators.class, "isComparisonLessThanOrEqual", MethodType.methodType(boolean.class, long.class));
             ORDER_NULLS = lookup.findStatic(TypeOperators.class, "orderNulls", MethodType.methodType(int.class, SortOrder.class, boolean.class, boolean.class));
             ORDER_COMPARISON_RESULT = lookup.findStatic(TypeOperators.class, "orderComparisonResult", MethodType.methodType(int.class, SortOrder.class, long.class));
             BLOCK_IS_NULL = lookup.findVirtual(Block.class, "isNull", MethodType.methodType(boolean.class, int.class));
+
+            TYPE_GET_BOOLEAN = lookup.findVirtual(Type.class, "getBoolean", MethodType.methodType(boolean.class, Block.class, int.class));
+            TYPE_GET_LONG = lookup.findVirtual(Type.class, "getLong", MethodType.methodType(long.class, Block.class, int.class));
+            TYPE_GET_DOUBLE = lookup.findVirtual(Type.class, "getDouble", MethodType.methodType(double.class, Block.class, int.class));
+            TYPE_GET_SLICE = lookup.findVirtual(Type.class, "getSlice", MethodType.methodType(Slice.class, Block.class, int.class));
+            TYPE_GET_OBJECT = lookup.findVirtual(Type.class, "getObject", MethodType.methodType(Object.class, Block.class, int.class));
+
+            TYPE_WRITE_BOOLEAN = lookupWriteBlockBuilderMethod(lookup, "writeBoolean", boolean.class);
+            TYPE_WRITE_LONG = lookupWriteBlockBuilderMethod(lookup, "writeLong", long.class);
+            TYPE_WRITE_DOUBLE = lookupWriteBlockBuilderMethod(lookup, "writeDouble", double.class);
+            TYPE_WRITE_SLICE = lookupWriteBlockBuilderMethod(lookup, "writeSlice", Slice.class);
+            TYPE_WRITE_OBJECT = lookupWriteBlockBuilderMethod(lookup, "writeObject", Object.class);
         }
         catch (NoSuchMethodException | IllegalAccessException e) {
             throw new RuntimeException(e);
         }
     }
 
-    //
-    // Adapt equal to is distinct from
-    //
-
-    private static OperatorMethodHandle adaptBlockPositionEqualToDistinctFrom(MethodHandle blockPositionEqual)
+    private static MethodHandle lookupWriteBlockBuilderMethod(Lookup lookup, String methodName, Class<?> javaType)
+            throws NoSuchMethodException, IllegalAccessException
     {
-        return new OperatorMethodHandle(
-                simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION),
-                BLOCK_POSITION_DISTINCT_FROM.bindTo(blockPositionEqual));
+        return permuteArguments(
+                lookup.findVirtual(Type.class, methodName, MethodType.methodType(void.class, BlockBuilder.class, javaType)),
+                MethodType.methodType(void.class, Type.class, javaType, BlockBuilder.class),
+                0, 2, 1);
     }
 
-    private static boolean genericBlockPositionDistinctFrom(MethodHandle equalOperator, Block left, int leftPosition, Block right, int rightPosition)
-            throws Throwable
+    private static boolean logicalNot(boolean value)
     {
-        boolean leftIsNull = left.isNull(leftPosition);
-        boolean rightIsNull = right.isNull(rightPosition);
-        if (leftIsNull || rightIsNull) {
-            return leftIsNull != rightIsNull;
-        }
-        return notEqual((Boolean) equalOperator.invokeExact(left, leftPosition, right, rightPosition));
+        return !value;
     }
 
-    private static OperatorMethodHandle adaptNeverNullEqualToDistinctFrom(MethodHandle neverNullEqual)
+    private static boolean booleanNotEqual(boolean left, boolean right)
     {
-        // boolean distinctFrom(T left, boolean leftIsNull, T right, boolean rightIsNull)
-        // {
-        //     if (leftIsNull || rightIsNull) {
-        //         return leftIsNull ^ rightIsNull;
-        //     }
-        //     return notEqual(equalOperator.invokeExact(left, leftIsNull, right, rightIsNull));
-        // }
-        MethodHandle eitherArgIsNull = LOGICAL_OR;
-        eitherArgIsNull = dropArguments(eitherArgIsNull, 0, neverNullEqual.type().parameterType(0));
-        eitherArgIsNull = dropArguments(eitherArgIsNull, 2, neverNullEqual.type().parameterType(1));
-
-        MethodHandle distinctNullValues = LOGICAL_XOR;
-        distinctNullValues = dropArguments(distinctNullValues, 0, neverNullEqual.type().parameterType(0));
-        distinctNullValues = dropArguments(distinctNullValues, 2, neverNullEqual.type().parameterType(1));
-
-        MethodHandle notEqual = filterReturnValue(neverNullEqual, NOT_EQUAL);
-        notEqual = dropArguments(notEqual, 1, boolean.class);
-        notEqual = dropArguments(notEqual, 3, boolean.class);
-
-        return new OperatorMethodHandle(
-                simpleConvention(FAIL_ON_NULL, NULL_FLAG, NULL_FLAG),
-                guardWithTest(eitherArgIsNull, distinctNullValues, notEqual));
+        return left != right;
     }
 
     //
@@ -536,16 +634,11 @@ private static OperatorMethodHandle defaultIndeterminateOperator(Class<?> javaTy
         // {
         //     return valueIsNull;
         // }
-        MethodHandle methodHandle = MethodHandles.identity(boolean.class);
+        MethodHandle methodHandle = identity(boolean.class);
         methodHandle = dropArguments(methodHandle, 0, javaType);
         return new OperatorMethodHandle(simpleConvention(FAIL_ON_NULL, NULL_FLAG), methodHandle);
     }
 
-    private static boolean notEqual(Boolean equal)
-    {
-        return !requireNonNull(equal, "equal returned null");
-    }
-
     //
     // Adapt comparison to ordering
     //
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/TypeSignature.java b/core/trino-spi/src/main/java/io/trino/spi/type/TypeSignature.java
index bbc69cf6b8ec..3beba11937ba 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/TypeSignature.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/TypeSignature.java
@@ -14,8 +14,7 @@
 package io.trino.spi.type;
 
 import com.fasterxml.jackson.annotation.JsonValue;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/TypeSignatureParameter.java b/core/trino-spi/src/main/java/io/trino/spi/type/TypeSignatureParameter.java
index 0e0086dcff12..3f6a03de7388 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/TypeSignatureParameter.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/TypeSignatureParameter.java
@@ -13,7 +13,7 @@
  */
 package io.trino.spi.type;
 
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/TypeUtils.java b/core/trino-spi/src/main/java/io/trino/spi/type/TypeUtils.java
index 7f435105ccad..7e5cd97a39ed 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/TypeUtils.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/TypeUtils.java
@@ -18,8 +18,8 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-
-import javax.annotation.Nullable;
+import io.trino.spi.block.ValueBlock;
+import jakarta.annotation.Nullable;
 
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.type.DoubleType.DOUBLE;
@@ -61,6 +61,13 @@ public static Object readNativeValue(Type type, Block block, int position)
         return type.getObject(block, position);
     }
 
+    public static ValueBlock writeNativeValue(Type type, @Nullable Object value)
+    {
+        BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
+        writeNativeValue(type, blockBuilder, value);
+        return blockBuilder.buildValueBlock();
+    }
+
     /**
      * Write a native value object to the current entry of {@code blockBuilder}.
      */
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/UuidType.java b/core/trino-spi/src/main/java/io/trino/spi/type/UuidType.java
index 2cadfc33e2e4..228ad712bff7 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/UuidType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/UuidType.java
@@ -19,19 +19,28 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.Int128ArrayBlock;
 import io.trino.spi.block.Int128ArrayBlockBuilder;
 import io.trino.spi.block.PageBuilderStatus;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.function.BlockIndex;
 import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
 import io.trino.spi.function.ScalarOperator;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
 import java.util.UUID;
 
 import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
+import static io.airlift.slice.Slices.wrappedBuffer;
 import static io.trino.spi.block.Int128ArrayBlock.INT128_BYTES;
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 import static io.trino.spi.function.OperatorType.EQUAL;
+import static io.trino.spi.function.OperatorType.READ_VALUE;
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.Long.reverseBytes;
@@ -47,12 +56,13 @@ public class UuidType
         implements FixedWidthType
 {
     private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(UuidType.class, lookup(), Slice.class);
+    private static final VarHandle LONG_HANDLE = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
 
     public static final UuidType UUID = new UuidType();
 
     private UuidType()
     {
-        super(new TypeSignature(StandardTypes.UUID), Slice.class);
+        super(new TypeSignature(StandardTypes.UUID), Slice.class, Int128ArrayBlock.class);
     }
 
     @Override
@@ -112,8 +122,10 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         if (block.isNull(position)) {
             return null;
         }
-        long high = reverseBytes(block.getLong(position, 0));
-        long low = reverseBytes(block.getLong(position, SIZE_OF_LONG));
+        Int128ArrayBlock valueBlock = (Int128ArrayBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        long high = reverseBytes(valueBlock.getInt128High(valuePosition));
+        long low = reverseBytes(valueBlock.getInt128Low(valuePosition));
         return new UUID(high, low).toString();
     }
 
@@ -124,9 +136,9 @@ public void appendTo(Block block, int position, BlockBuilder blockBuilder)
             blockBuilder.appendNull();
         }
         else {
-            blockBuilder.writeLong(block.getLong(position, 0));
-            blockBuilder.writeLong(block.getLong(position, SIZE_OF_LONG));
-            blockBuilder.closeEntry();
+            Int128ArrayBlock valueBlock = (Int128ArrayBlock) block.getUnderlyingValueBlock();
+            int valuePosition = block.getUnderlyingValuePosition(position);
+            ((Int128ArrayBlockBuilder) blockBuilder).writeInt128(valueBlock.getInt128High(valuePosition), valueBlock.getInt128Low(valuePosition));
         }
     }
 
@@ -142,24 +154,29 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int l
         if (length != INT128_BYTES) {
             throw new IllegalStateException("Expected entry size to be exactly " + INT128_BYTES + " but was " + length);
         }
-        blockBuilder.writeLong(value.getLong(offset));
-        blockBuilder.writeLong(value.getLong(offset + SIZE_OF_LONG));
-        blockBuilder.closeEntry();
+        ((Int128ArrayBlockBuilder) blockBuilder).writeInt128(
+                value.getLong(offset),
+                value.getLong(offset + SIZE_OF_LONG));
     }
 
     @Override
     public final Slice getSlice(Block block, int position)
     {
-        return Slices.wrappedLongArray(
-                block.getLong(position, 0),
-                block.getLong(position, SIZE_OF_LONG));
+        return read((Int128ArrayBlock) block.getUnderlyingValueBlock(), block.getUnderlyingValuePosition(position));
+    }
+
+    @Override
+    public int getFlatFixedSize()
+    {
+        return INT128_BYTES;
     }
 
     public static Slice javaUuidToTrinoUuid(UUID uuid)
     {
-        return Slices.wrappedLongArray(
-                reverseBytes(uuid.getMostSignificantBits()),
-                reverseBytes(uuid.getLeastSignificantBits()));
+        Slice value = Slices.allocate(INT128_BYTES);
+        value.setLong(0, reverseBytes(uuid.getMostSignificantBits()));
+        value.setLong(SIZE_OF_LONG, reverseBytes(uuid.getLeastSignificantBits()));
+        return value;
     }
 
     public static UUID trinoUuidToJavaUuid(Slice uuid)
@@ -172,6 +189,47 @@ public static UUID trinoUuidToJavaUuid(Slice uuid)
                 reverseBytes(uuid.getLong(SIZE_OF_LONG)));
     }
 
+    @ScalarOperator(READ_VALUE)
+    private static Slice read(@BlockPosition Int128ArrayBlock block, @BlockIndex int position)
+    {
+        Slice value = Slices.allocate(INT128_BYTES);
+        value.setLong(0, block.getInt128High(position));
+        value.setLong(SIZE_OF_LONG, block.getInt128Low(position));
+        return value;
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static Slice readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice)
+    {
+        return wrappedBuffer(fixedSizeSlice, fixedSizeOffset, INT128_BYTES);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            Slice sourceSlice,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] unusedVariableSizeSlice,
+            int unusedVariableSizeOffset)
+    {
+        sourceSlice.getBytes(0, fixedSizeSlice, fixedSizeOffset, INT128_BYTES);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void readFlatToBlock(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] unusedVariableSizeSlice,
+            BlockBuilder blockBuilder)
+    {
+        ((Int128ArrayBlockBuilder) blockBuilder).writeInt128(
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset),
+                (long) LONG_HANDLE.get(fixedSizeSlice, fixedSizeOffset + SIZE_OF_LONG));
+    }
+
     @ScalarOperator(EQUAL)
     private static boolean equalOperator(Slice left, Slice right)
     {
@@ -183,13 +241,13 @@ private static boolean equalOperator(Slice left, Slice right)
     }
 
     @ScalarOperator(EQUAL)
-    private static boolean equalOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static boolean equalOperator(@BlockPosition Int128ArrayBlock leftBlock, @BlockIndex int leftPosition, @BlockPosition Int128ArrayBlock rightBlock, @BlockIndex int rightPosition)
     {
         return equal(
-                leftBlock.getLong(leftPosition, 0),
-                leftBlock.getLong(leftPosition, SIZE_OF_LONG),
-                rightBlock.getLong(rightPosition, 0),
-                rightBlock.getLong(rightPosition, SIZE_OF_LONG));
+                leftBlock.getInt128High(leftPosition),
+                leftBlock.getInt128Low(leftPosition),
+                rightBlock.getInt128High(rightPosition),
+                rightBlock.getInt128Low(rightPosition));
     }
 
     private static boolean equal(long leftLow, long leftHigh, long rightLow, long rightHigh)
@@ -204,9 +262,9 @@ private static long xxHash64Operator(Slice value)
     }
 
     @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(@BlockPosition Block block, @BlockIndex int position)
+    private static long xxHash64Operator(@BlockPosition Int128ArrayBlock block, @BlockIndex int position)
     {
-        return xxHash64(block.getLong(position, 0), block.getLong(position, SIZE_OF_LONG));
+        return xxHash64(block.getInt128High(position), block.getInt128Low(position));
     }
 
     private static long xxHash64(long low, long high)
@@ -225,13 +283,13 @@ private static long comparisonOperator(Slice left, Slice right)
     }
 
     @ScalarOperator(COMPARISON_UNORDERED_LAST)
-    private static long comparisonOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
+    private static long comparisonOperator(@BlockPosition Int128ArrayBlock leftBlock, @BlockIndex int leftPosition, @BlockPosition Int128ArrayBlock rightBlock, @BlockIndex int rightPosition)
     {
         return compareLittleEndian(
-                leftBlock.getLong(leftPosition, 0),
-                leftBlock.getLong(leftPosition, SIZE_OF_LONG),
-                rightBlock.getLong(rightPosition, 0),
-                rightBlock.getLong(rightPosition, SIZE_OF_LONG));
+                leftBlock.getInt128High(leftPosition),
+                leftBlock.getInt128Low(leftPosition),
+                rightBlock.getInt128High(rightPosition),
+                rightBlock.getInt128Low(rightPosition));
     }
 
     private static int compareLittleEndian(long leftLow64le, long leftHigh64le, long rightLow64le, long rightHigh64le)
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/VarbinaryType.java b/core/trino-spi/src/main/java/io/trino/spi/type/VarbinaryType.java
index 52454d3d5f06..07f192cb83cf 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/VarbinaryType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/VarbinaryType.java
@@ -14,25 +14,20 @@
 package io.trino.spi.type;
 
 import io.airlift.slice.Slice;
-import io.airlift.slice.XxHash64;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.function.BlockIndex;
-import io.trino.spi.function.BlockPosition;
-import io.trino.spi.function.ScalarOperator;
-import io.trino.spi.function.SqlNullable;
-
-import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
-import static io.trino.spi.function.OperatorType.EQUAL;
-import static io.trino.spi.function.OperatorType.XX_HASH_64;
-import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
-import static java.lang.invoke.MethodHandles.lookup;
 
 public final class VarbinaryType
         extends AbstractVariableWidthType
 {
-    private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(VarbinaryType.class, lookup(), Slice.class);
+    private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = TypeOperatorDeclaration.builder(Slice.class)
+            .addOperators(DEFAULT_READ_OPERATORS)
+            .addOperators(DEFAULT_COMPARABLE_OPERATORS)
+            .addOperators(DEFAULT_ORDERING_OPERATORS)
+            .build();
 
     public static final VarbinaryType VARBINARY = new VarbinaryType();
 
@@ -75,25 +70,15 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return new SqlVarbinary(block.getSlice(position, 0, block.getSliceLength(position)).getBytes());
-    }
-
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
+        return new SqlVarbinary(getSlice(block, position).getBytes());
     }
 
     @Override
     public Slice getSlice(Block block, int position)
     {
-        return block.getSlice(position, 0, block.getSliceLength(position));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return valueBlock.getSlice(valuePosition);
     }
 
     @Override
@@ -105,7 +90,7 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value)
     @Override
     public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int length)
     {
-        blockBuilder.writeBytes(value, offset, length).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(value, offset, length);
     }
 
     @Override
@@ -119,48 +104,4 @@ public int hashCode()
     {
         return getClass().hashCode();
     }
-
-    @ScalarOperator(EQUAL)
-    private static boolean equalOperator(Slice left, Slice right)
-    {
-        return left.equals(right);
-    }
-
-    @ScalarOperator(EQUAL)
-    @SqlNullable
-    private static Boolean equalOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
-    {
-        int leftLength = leftBlock.getSliceLength(leftPosition);
-        int rightLength = rightBlock.getSliceLength(rightPosition);
-        if (leftLength != rightLength) {
-            return false;
-        }
-        return leftBlock.equals(leftPosition, 0, rightBlock, rightPosition, 0, leftLength);
-    }
-
-    @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(Slice value)
-    {
-        return XxHash64.hash(value);
-    }
-
-    @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(@BlockPosition Block block, @BlockIndex int position)
-    {
-        return block.hash(position, 0, block.getSliceLength(position));
-    }
-
-    @ScalarOperator(COMPARISON_UNORDERED_LAST)
-    private static long comparisonOperator(Slice left, Slice right)
-    {
-        return left.compareTo(right);
-    }
-
-    @ScalarOperator(COMPARISON_UNORDERED_LAST)
-    private static long comparisonOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
-    {
-        int leftLength = leftBlock.getSliceLength(leftPosition);
-        int rightLength = rightBlock.getSliceLength(rightPosition);
-        return leftBlock.compareTo(leftPosition, 0, leftLength, rightBlock, rightPosition, 0, rightLength);
-    }
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/VarcharType.java b/core/trino-spi/src/main/java/io/trino/spi/type/VarcharType.java
index ed3e0a24abfc..02aa8ff06d2e 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/type/VarcharType.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/type/VarcharType.java
@@ -16,33 +16,30 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceUtf8;
 import io.airlift.slice.Slices;
-import io.airlift.slice.XxHash64;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockBuilderStatus;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.function.BlockIndex;
-import io.trino.spi.function.BlockPosition;
-import io.trino.spi.function.ScalarOperator;
 
 import java.util.Objects;
 import java.util.Optional;
 
 import static io.airlift.slice.SliceUtf8.countCodePoints;
-import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
-import static io.trino.spi.function.OperatorType.EQUAL;
-import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.Slices.sliceRepresentation;
-import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
 import static java.lang.Character.MAX_CODE_POINT;
 import static java.lang.String.format;
-import static java.lang.invoke.MethodHandles.lookup;
 import static java.util.Collections.singletonList;
 
 public final class VarcharType
         extends AbstractVariableWidthType
 {
-    private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(VarcharType.class, lookup(), Slice.class);
+    private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = TypeOperatorDeclaration.builder(Slice.class)
+            .addOperators(DEFAULT_READ_OPERATORS)
+            .addOperators(DEFAULT_COMPARABLE_OPERATORS)
+            .addOperators(DEFAULT_ORDERING_OPERATORS)
+            .build();
 
     public static final int UNBOUNDED_LENGTH = Integer.MAX_VALUE;
     public static final int MAX_LENGTH = Integer.MAX_VALUE - 1;
@@ -136,7 +133,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        Slice slice = block.getSlice(position, 0, block.getSliceLength(position));
+        Slice slice = getSlice(block, position);
         if (!isUnbounded() && countCodePoints(slice) > length) {
             throw new IllegalArgumentException(format("Character count exceeds length limit %s: %s", length, sliceRepresentation(slice)));
         }
@@ -144,7 +141,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
     }
 
     @Override
-    public BlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
+    public VariableWidthBlockBuilder createBlockBuilder(BlockBuilderStatus blockBuilderStatus, int expectedEntries)
     {
         return createBlockBuilder(
                 blockBuilderStatus,
@@ -165,7 +162,7 @@ public Optional<Range> getRange()
         if (!cachedRangePresent) {
             if (length > 100) {
                 // The max/min values may be materialized in the plan, so we don't want them to be too large.
-                // Range comparison against large values are usually nonsensical, too, so no need to support them
+                // Range comparison against large values is usually nonsensical, too, so no need to support them
                 // beyond a certain size. They specific choice above is arbitrary and can be adjusted if needed.
                 range = Optional.empty();
             }
@@ -185,22 +182,12 @@ public Optional<Range> getRange()
         return range;
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
-    }
-
     @Override
     public Slice getSlice(Block block, int position)
     {
-        return block.getSlice(position, 0, block.getSliceLength(position));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return valueBlock.getSlice(valuePosition);
     }
 
     public void writeString(BlockBuilder blockBuilder, String value)
@@ -217,7 +204,7 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value)
     @Override
     public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int length)
     {
-        blockBuilder.writeBytes(value, offset, length).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(value, offset, length);
     }
 
     @Override
@@ -240,47 +227,4 @@ public int hashCode()
     {
         return Objects.hash(length);
     }
-
-    @ScalarOperator(EQUAL)
-    private static boolean equalOperator(Slice left, Slice right)
-    {
-        return left.equals(right);
-    }
-
-    @ScalarOperator(EQUAL)
-    private static boolean equalOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
-    {
-        int leftLength = leftBlock.getSliceLength(leftPosition);
-        int rightLength = rightBlock.getSliceLength(rightPosition);
-        if (leftLength != rightLength) {
-            return false;
-        }
-        return leftBlock.equals(leftPosition, 0, rightBlock, rightPosition, 0, leftLength);
-    }
-
-    @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(Slice value)
-    {
-        return XxHash64.hash(value);
-    }
-
-    @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(@BlockPosition Block block, @BlockIndex int position)
-    {
-        return block.hash(position, 0, block.getSliceLength(position));
-    }
-
-    @ScalarOperator(COMPARISON_UNORDERED_LAST)
-    private static long comparisonOperator(Slice left, Slice right)
-    {
-        return left.compareTo(right);
-    }
-
-    @ScalarOperator(COMPARISON_UNORDERED_LAST)
-    private static long comparisonOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
-    {
-        int leftLength = leftBlock.getSliceLength(leftPosition);
-        int rightLength = rightBlock.getSliceLength(rightPosition);
-        return leftBlock.compareTo(leftPosition, 0, leftLength, rightBlock, rightPosition, 0, rightLength);
-    }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/TestHostAddress.java b/core/trino-spi/src/test/java/io/trino/spi/TestHostAddress.java
index 35ed709daa87..39a57429facd 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/TestHostAddress.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/TestHostAddress.java
@@ -13,10 +13,9 @@
  */
 package io.trino.spi;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHostAddress
 {
@@ -25,16 +24,16 @@ public void testEquality()
     {
         HostAddress address1 = HostAddress.fromParts("[1111:2222:3333:4444:5555:6666:7777:8888]", 1234);
         HostAddress address1NoBrackets = HostAddress.fromParts("1111:2222:3333:4444:5555:6666:7777:8888", 1234);
-        assertEquals(address1, address1NoBrackets);
+        assertThat(address1).isEqualTo(address1NoBrackets);
 
         HostAddress address1FromString = HostAddress.fromString("[1111:2222:3333:4444:5555:6666:7777:8888]:1234");
-        assertEquals(address1, address1FromString);
+        assertThat(address1).isEqualTo(address1FromString);
 
         HostAddress address2 = HostAddress.fromParts("[1111:2222:3333:4444:5555:6666:7777:9999]", 1234);
-        assertNotEquals(address1, address2);
+        assertThat(address1).isNotEqualTo(address2);
 
         HostAddress address3 = HostAddress.fromParts("[1111:2222:3333:4444:5555:6666:7777:8888]", 1235);
-        assertNotEquals(address1, address3);
+        assertThat(address1).isNotEqualTo(address3);
     }
 
     @Test
@@ -42,11 +41,11 @@ public void testRoundTrip()
     {
         HostAddress address = HostAddress.fromParts("[1111:2222:3333:4444:5555:6666:7777:8888]", 1234);
         HostAddress fromParts = HostAddress.fromParts(address.getHostText(), address.getPort());
-        assertEquals(address, fromParts);
+        assertThat(address).isEqualTo(fromParts);
 
         HostAddress fromString = HostAddress.fromString(address.toString());
-        assertEquals(address, fromString);
+        assertThat(address).isEqualTo(fromString);
 
-        assertEquals(fromParts, fromString);
+        assertThat(fromParts).isEqualTo(fromString);
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/TestPage.java b/core/trino-spi/src/test/java/io/trino/spi/TestPage.java
index e41220a2318d..b9de91ded7b2 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/TestPage.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/TestPage.java
@@ -20,7 +20,7 @@
 import io.trino.spi.block.DictionaryBlock;
 import io.trino.spi.block.DictionaryId;
 import io.trino.spi.block.LazyBlock;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verifyNotNull;
@@ -29,24 +29,24 @@
 import static io.trino.spi.block.DictionaryId.randomDictionaryId;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertTrue;
 
 public class TestPage
 {
     @Test
     public void testGetRegion()
     {
-        assertEquals(new Page(10).getRegion(5, 5).getPositionCount(), 5);
+        Page page = new Page(10);
+        assertThat(page.getRegion(5, 5).getPositionCount()).isEqualTo(5);
+        assertThat(page.getRegion(0, 10)).isSameAs(page);
     }
 
     @Test
     public void testGetEmptyRegion()
     {
-        assertEquals(new Page(0).getRegion(0, 0).getPositionCount(), 0);
-        assertEquals(new Page(10).getRegion(5, 0).getPositionCount(), 0);
+        assertThat(new Page(0).getRegion(0, 0).getPositionCount()).isEqualTo(0);
+        assertThat(new Page(10).getRegion(5, 0).getPositionCount()).isEqualTo(0);
     }
 
     @Test
@@ -60,16 +60,16 @@ public void testGetRegionExceptions()
     @Test
     public void testGetRegionFromNoColumnPage()
     {
-        assertEquals(new Page(100).getRegion(0, 10).getPositionCount(), 10);
+        assertThat(new Page(100).getRegion(0, 10).getPositionCount()).isEqualTo(10);
     }
 
     @Test
     public void testSizesForNoColumnPage()
     {
         Page page = new Page(100);
-        assertEquals(page.getSizeInBytes(), 0);
-        assertEquals(page.getLogicalSizeInBytes(), 0);
-        assertEquals(page.getRetainedSizeInBytes(), Page.INSTANCE_SIZE); // does not include the blocks array
+        assertThat(page.getSizeInBytes()).isEqualTo(0);
+        assertThat(page.getLogicalSizeInBytes()).isEqualTo(0);
+        assertThat(page.getRetainedSizeInBytes()).isEqualTo(Page.INSTANCE_SIZE); // does not include the blocks array
     }
 
     @Test
@@ -104,16 +104,19 @@ public void testCompactDictionaryBlocks()
         page.compact();
 
         // dictionary blocks should all be compact
-        assertTrue(((DictionaryBlock) page.getBlock(0)).isCompact());
-        assertTrue(((DictionaryBlock) page.getBlock(1)).isCompact());
-        assertTrue(((DictionaryBlock) page.getBlock(2)).isCompact());
-        assertEquals(((DictionaryBlock) page.getBlock(0)).getDictionary().getPositionCount(), commonDictionaryUsedPositions);
-        assertEquals(((DictionaryBlock) page.getBlock(1)).getDictionary().getPositionCount(), otherDictionaryUsedPositions);
-        assertEquals(((DictionaryBlock) page.getBlock(2)).getDictionary().getPositionCount(), commonDictionaryUsedPositions);
+        assertThat(((DictionaryBlock) page.getBlock(0)).isCompact()).isTrue();
+        assertThat(((DictionaryBlock) page.getBlock(1)).isCompact()).isTrue();
+        assertThat(((DictionaryBlock) page.getBlock(2)).isCompact()).isTrue();
+        assertThat(((DictionaryBlock) page.getBlock(0)).getDictionary().getPositionCount()).isEqualTo(commonDictionaryUsedPositions);
+        assertThat(((DictionaryBlock) page.getBlock(1)).getDictionary().getPositionCount()).isEqualTo(otherDictionaryUsedPositions);
+        assertThat(((DictionaryBlock) page.getBlock(2)).getDictionary().getPositionCount()).isEqualTo(commonDictionaryUsedPositions);
 
         // Blocks that had the same source id before compacting page should have the same source id after compacting page
-        assertNotEquals(((DictionaryBlock) page.getBlock(0)).getDictionarySourceId(), ((DictionaryBlock) page.getBlock(1)).getDictionarySourceId());
-        assertEquals(((DictionaryBlock) page.getBlock(0)).getDictionarySourceId(), ((DictionaryBlock) page.getBlock(2)).getDictionarySourceId());
+        assertThat(((DictionaryBlock) page.getBlock(0)).getDictionarySourceId())
+                .isNotEqualTo(((DictionaryBlock) page.getBlock(1)).getDictionarySourceId());
+
+        assertThat(((DictionaryBlock) page.getBlock(0)).getDictionarySourceId())
+                .isEqualTo(((DictionaryBlock) page.getBlock(2)).getDictionarySourceId());
     }
 
     @Test
@@ -127,13 +130,13 @@ public void testGetPositions()
         Block block = blockBuilder.build();
 
         Page page = new Page(block, block, block).getPositions(new int[] {0, 1, 1, 1, 2, 5, 5}, 1, 5);
-        assertEquals(page.getPositionCount(), 5);
+        assertThat(page.getPositionCount()).isEqualTo(5);
         for (int i = 0; i < 3; i++) {
-            assertEquals(page.getBlock(i).getLong(0, 0), 1);
-            assertEquals(page.getBlock(i).getLong(1, 0), 1);
-            assertEquals(page.getBlock(i).getLong(2, 0), 1);
-            assertEquals(page.getBlock(i).getLong(3, 0), 2);
-            assertEquals(page.getBlock(i).getLong(4, 0), 5);
+            assertThat(page.getBlock(i).getLong(0, 0)).isEqualTo(1);
+            assertThat(page.getBlock(i).getLong(1, 0)).isEqualTo(1);
+            assertThat(page.getBlock(i).getLong(2, 0)).isEqualTo(1);
+            assertThat(page.getBlock(i).getLong(3, 0)).isEqualTo(2);
+            assertThat(page.getBlock(i).getLong(4, 0)).isEqualTo(5);
         }
     }
 
@@ -150,21 +153,21 @@ public void testGetLoadedPage()
         LazyBlock lazyBlock = lazyWrapper(block);
         Page page = new Page(lazyBlock);
         long lazyPageRetainedSize = Page.INSTANCE_SIZE + sizeOf(new Block[] {block}) + lazyBlock.getRetainedSizeInBytes();
-        assertEquals(page.getRetainedSizeInBytes(), lazyPageRetainedSize);
+        assertThat(page.getRetainedSizeInBytes()).isEqualTo(lazyPageRetainedSize);
         Page loadedPage = page.getLoadedPage();
         // Retained size of page remains the same
-        assertEquals(page.getRetainedSizeInBytes(), lazyPageRetainedSize);
+        assertThat(page.getRetainedSizeInBytes()).isEqualTo(lazyPageRetainedSize);
         long loadedPageRetainedSize = Page.INSTANCE_SIZE + sizeOf(new Block[] {block}) + block.getRetainedSizeInBytes();
         // Retained size of loaded page depends on the loaded block
-        assertEquals(loadedPage.getRetainedSizeInBytes(), loadedPageRetainedSize);
+        assertThat(loadedPage.getRetainedSizeInBytes()).isEqualTo(loadedPageRetainedSize);
 
         lazyBlock = lazyWrapper(block);
         page = new Page(lazyBlock);
-        assertEquals(page.getRetainedSizeInBytes(), lazyPageRetainedSize);
+        assertThat(page.getRetainedSizeInBytes()).isEqualTo(lazyPageRetainedSize);
         loadedPage = page.getLoadedPage(new int[] {0}, new int[] {0});
         // Retained size of page is updated based on loaded block
-        assertEquals(page.getRetainedSizeInBytes(), loadedPageRetainedSize);
-        assertEquals(loadedPage.getRetainedSizeInBytes(), loadedPageRetainedSize);
+        assertThat(page.getRetainedSizeInBytes()).isEqualTo(loadedPageRetainedSize);
+        assertThat(loadedPage.getRetainedSizeInBytes()).isEqualTo(loadedPageRetainedSize);
     }
 
     private static LazyBlock lazyWrapper(Block block)
diff --git a/core/trino-spi/src/test/java/io/trino/spi/TestStandardErrorCode.java b/core/trino-spi/src/test/java/io/trino/spi/TestStandardErrorCode.java
index 18fa71adbc31..c5ad129b595f 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/TestStandardErrorCode.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/TestStandardErrorCode.java
@@ -13,7 +13,7 @@
  */
 package io.trino.spi;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -25,8 +25,7 @@
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.StandardErrorCode.UNSUPPORTED_TABLE_TYPE;
 import static java.util.Arrays.asList;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestStandardErrorCode
 {
@@ -37,9 +36,11 @@ public void testUnique()
     {
         Set<Integer> codes = new HashSet<>();
         for (StandardErrorCode code : StandardErrorCode.values()) {
-            assertTrue(codes.add(code(code)), "Code already exists: " + code);
+            assertThat(codes.add(code(code)))
+                    .describedAs("Code already exists: " + code)
+                    .isTrue();
         }
-        assertEquals(codes.size(), StandardErrorCode.values().length);
+        assertThat(codes).hasSize(StandardErrorCode.values().length);
     }
 
     @Test
@@ -55,7 +56,7 @@ public void testOrdering()
     {
         Iterator<StandardErrorCode> iterator = asList(StandardErrorCode.values()).iterator();
 
-        assertTrue(iterator.hasNext());
+        assertThat(iterator.hasNext()).isTrue();
         int previous = code(iterator.next());
 
         while (iterator.hasNext()) {
@@ -63,7 +64,9 @@ public void testOrdering()
             int current = code(code);
             assertGreaterThan(current, previous, "Code is out of order: " + code);
             if (code != GENERIC_INTERNAL_ERROR && code != GENERIC_INSUFFICIENT_RESOURCES && code != UNSUPPORTED_TABLE_TYPE) {
-                assertEquals(current, previous + 1, "Code is not sequential: " + code);
+                assertThat(current)
+                        .describedAs("Code is not sequential: " + code)
+                        .isEqualTo(previous + 1);
             }
             previous = current;
         }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/TestTrinoException.java b/core/trino-spi/src/test/java/io/trino/spi/TestTrinoException.java
index 43101cee63f4..7299925c7896 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/TestTrinoException.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/TestTrinoException.java
@@ -13,10 +13,10 @@
  */
 package io.trino.spi;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.ErrorType.USER_ERROR;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTrinoException
 {
@@ -24,13 +24,13 @@ public class TestTrinoException
     public void testMessage()
     {
         TrinoException exception = new TrinoException(new TestErrorCode(), "test");
-        assertEquals(exception.getMessage(), "test");
+        assertThat(exception).hasMessage("test");
 
         exception = new TrinoException(new TestErrorCode(), new RuntimeException("test2"));
-        assertEquals(exception.getMessage(), "test2");
+        assertThat(exception).hasMessage("test2");
 
         exception = new TrinoException(new TestErrorCode(), new RuntimeException());
-        assertEquals(exception.getMessage(), "test");
+        assertThat(exception).hasMessage("test");
     }
 
     private static class TestErrorCode
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/BaseBlockEncodingTest.java b/core/trino-spi/src/test/java/io/trino/spi/block/BaseBlockEncodingTest.java
index 7ee9cf0453a7..7bc32fb5f122 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/BaseBlockEncodingTest.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/BaseBlockEncodingTest.java
@@ -15,12 +15,10 @@
 
 import io.airlift.slice.DynamicSliceOutput;
 import io.trino.spi.type.Type;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Random;
-import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import static io.trino.spi.block.BlockTestUtils.assertBlockEquals;
@@ -83,10 +81,14 @@ public void testBlocksOf8()
         roundTrip(values);
     }
 
-    @Test(dataProvider = "testRandomDataDataProvider")
-    public void testRandomData(int size, BlockFill fill)
+    @Test
+    public void testRandomData()
     {
-        roundTrip(getObjects(size, fill, getRandom()));
+        for (int size : RANDOM_BLOCK_SIZES) {
+            for (BlockFill fill : BlockFill.values()) {
+                roundTrip(getObjects(size, fill, getRandom()));
+            }
+        }
     }
 
     private Object[] getObjects(int size, BlockFill fill, Random random)
@@ -113,14 +115,6 @@ private Object[] getObjects(int size, BlockFill fill, Random random)
         return values;
     }
 
-    @DataProvider
-    public static Object[][] testRandomDataDataProvider()
-    {
-        return Arrays.stream(BlockFill.values())
-                .flatMap(fill -> IntStream.of(RANDOM_BLOCK_SIZES).mapToObj(size -> new Object[] {size, fill}))
-                .toArray(Object[][]::new);
-    }
-
     protected final void roundTrip(Object... values)
     {
         BlockBuilder expectedBlockBuilder = createBlockBuilder(values.length);
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/BenchmarkCopyPositions.java b/core/trino-spi/src/test/java/io/trino/spi/block/BenchmarkCopyPositions.java
index 282ea0b1b20c..c66eade9807b 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/BenchmarkCopyPositions.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/BenchmarkCopyPositions.java
@@ -15,6 +15,7 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -24,12 +25,10 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
-import org.testng.annotations.Test;
 
 import java.util.Optional;
 import java.util.Random;
 import java.util.stream.IntStream;
-import java.util.stream.LongStream;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.jmh.Benchmarks.benchmark;
@@ -101,7 +100,9 @@ public void setup()
                 block = createBlockBuilderWithValues(slices).build();
             }
             else if (type.equals("ROW(BIGINT)")) {
-                block = createRowBlock(POSITIONS, createRandomLongArrayBlock());
+                Optional<boolean[]> rowIsNull = nullsAllowed ? Optional.of(generateIsNull(POSITIONS)) : Optional.empty();
+                LongArrayBlock randomLongArrayBlock = new LongArrayBlock(POSITIONS, rowIsNull, new Random(SEED).longs().limit(POSITIONS).toArray());
+                block = RowBlock.fromNotNullSuppressedFieldBlocks(POSITIONS, rowIsNull, new Block[]{randomLongArrayBlock});
             }
         }
 
@@ -114,10 +115,7 @@ private Slice[] generateValues()
                     generatedValues[position] = null;
                 }
                 else {
-                    int length = random.nextInt(380) + 20;
-                    byte[] buffer = new byte[length];
-                    random.nextBytes(buffer);
-                    generatedValues[position] = Slices.wrappedBuffer(buffer);
+                    generatedValues[position] = Slices.random(random.nextInt(380) + 20);
                 }
             }
             return generatedValues;
@@ -135,31 +133,19 @@ private static boolean randomNullChance(Random random)
 
         private static BlockBuilder createBlockBuilderWithValues(Slice[] generatedValues)
         {
-            BlockBuilder blockBuilder = new VariableWidthBlockBuilder(null, generatedValues.length, 32 * generatedValues.length);
+            VariableWidthBlockBuilder blockBuilder = new VariableWidthBlockBuilder(null, generatedValues.length, 32 * generatedValues.length);
             for (Slice value : generatedValues) {
                 if (value == null) {
                     blockBuilder.appendNull();
                 }
                 else {
-                    blockBuilder.writeBytes(value, 0, value.length()).closeEntry();
+                    blockBuilder.writeEntry(value);
                 }
             }
             return blockBuilder;
         }
 
-        private static LongArrayBlock createRandomLongArrayBlock()
-        {
-            Random random = new Random(SEED);
-            return new LongArrayBlock(POSITIONS, Optional.empty(), LongStream.range(0, POSITIONS).map(i -> random.nextLong()).toArray());
-        }
-
-        private Block createRowBlock(int positionCount, Block... field)
-        {
-            Optional<boolean[]> rowIsNull = nullsAllowed ? Optional.of(generateIsNull(positionCount)) : Optional.empty();
-            return RowBlock.fromFieldBlocks(positionCount, rowIsNull, field);
-        }
-
-        private boolean[] generateIsNull(int positionCount)
+        private static boolean[] generateIsNull(int positionCount)
         {
             Random random = new Random(SEED);
             boolean[] result = new boolean[positionCount];
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/BlockTestUtils.java b/core/trino-spi/src/test/java/io/trino/spi/block/BlockTestUtils.java
index 7ae2ff15ff7c..cea57c9b428e 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/BlockTestUtils.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/BlockTestUtils.java
@@ -16,7 +16,7 @@
 import io.trino.spi.type.Type;
 
 import static io.trino.spi.block.TestingSession.SESSION;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class BlockTestUtils
 {
@@ -25,7 +25,7 @@ private BlockTestUtils() {}
     public static void assertBlockEquals(Type type, Block actual, Block expected)
     {
         for (int position = 0; position < actual.getPositionCount(); position++) {
-            assertEquals(type.getObjectValue(SESSION, actual, position), type.getObjectValue(SESSION, expected, position));
+            assertThat(type.getObjectValue(SESSION, actual, position)).isEqualTo(type.getObjectValue(SESSION, expected, position));
         }
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/ColumnarTestUtils.java b/core/trino-spi/src/test/java/io/trino/spi/block/ColumnarTestUtils.java
new file mode 100644
index 000000000000..4164bfa9c4ca
--- /dev/null
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/ColumnarTestUtils.java
@@ -0,0 +1,155 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.airlift.slice.Slice;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.Type;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public final class ColumnarTestUtils
+{
+    private ColumnarTestUtils() {}
+
+    public static <T> void assertBlock(Type type, Block block, T[] expectedValues)
+    {
+        assertBlockPositions(type, block, expectedValues);
+    }
+
+    private static <T> void assertBlockPositions(Type type, Block block, T[] expectedValues)
+    {
+        assertThat(block.getPositionCount()).isEqualTo(expectedValues.length);
+        for (int position = 0; position < block.getPositionCount(); position++) {
+            assertBlockPosition(type, block, position, expectedValues[position]);
+        }
+    }
+
+    public static <T> void assertBlockPosition(Type type, Block block, int position, T expectedValue)
+    {
+        assertPositionValue(type, block, position, expectedValue);
+        assertPositionValue(type, block.getSingleValueBlock(position), 0, expectedValue);
+    }
+
+    private static <T> void assertPositionValue(Type type, Block block, int position, T expectedValue)
+    {
+        if (expectedValue == null) {
+            assertThat(block.isNull(position)).isTrue();
+            return;
+        }
+        assertThat(block.isNull(position)).isFalse();
+
+        if (expectedValue instanceof Slice expected) {
+            int length = block.getSliceLength(position);
+            assertThat(length).isEqualTo(expected.length());
+
+            Slice actual = block.getSlice(position, 0, length);
+            assertThat(actual).isEqualTo(expected);
+        }
+        else if (type instanceof ArrayType arrayType) {
+            Block actual = arrayType.getObject(block, position);
+            assertBlock(type, actual, (Slice[]) expectedValue);
+        }
+        else if (type instanceof RowType rowType) {
+            SqlRow actual = rowType.getObject(block, position);
+            int rawIndex = actual.getRawIndex();
+            List<Block> fieldBlocks = actual.getRawFieldBlocks();
+            Slice[] expectedValues = (Slice[]) expectedValue;
+            for (int fieldIndex = 0; fieldIndex < fieldBlocks.size(); fieldIndex++) {
+                Block fieldBlock = fieldBlocks.get(fieldIndex);
+                Type fieldType = rowType.getTypeParameters().get(fieldIndex);
+                assertBlockPosition(fieldType, fieldBlock, rawIndex, expectedValues[fieldIndex]);
+            }
+        }
+        else if (type instanceof MapType mapType) {
+            Slice[][] expected = (Slice[][]) expectedValue;
+            SqlMap actual = mapType.getObject(block, position);
+
+            Block actualKeys = actual.getRawKeyBlock().getRegion(actual.getRawOffset(), actual.getSize());
+            Slice[] expectedKeys = Arrays.stream(expected)
+                    .map(pair -> pair[0])
+                    .toArray(Slice[]::new);
+            assertBlock(type, actualKeys, expectedKeys);
+
+            Block actualValues = actual.getRawValueBlock().getRegion(actual.getRawOffset(), actual.getSize());
+            Slice[] expectedValues = Arrays.stream(expected)
+                    .map(pair -> pair[1])
+                    .toArray(Slice[]::new);
+            assertBlock(type, actualValues, expectedValues);
+        }
+        else {
+            throw new IllegalArgumentException(expectedValue.getClass().getName());
+        }
+    }
+
+    public static <T> T[] alternatingNullValues(T[] objects)
+    {
+        @SuppressWarnings("unchecked")
+        T[] objectsWithNulls = (T[]) Array.newInstance(objects.getClass().getComponentType(), objects.length * 2 + 1);
+        for (int i = 0; i < objects.length; i++) {
+            objectsWithNulls[i * 2] = null;
+            objectsWithNulls[i * 2 + 1] = objects[i];
+        }
+        objectsWithNulls[objectsWithNulls.length - 1] = null;
+        return objectsWithNulls;
+    }
+
+    public static Block createTestDictionaryBlock(Block block)
+    {
+        int[] dictionaryIndexes = createTestDictionaryIndexes(block.getPositionCount());
+        return DictionaryBlock.create(dictionaryIndexes.length, block, dictionaryIndexes);
+    }
+
+    public static <T> T[] createTestDictionaryExpectedValues(T[] expectedValues)
+    {
+        int[] dictionaryIndexes = createTestDictionaryIndexes(expectedValues.length);
+        T[] expectedDictionaryValues = Arrays.copyOf(expectedValues, dictionaryIndexes.length);
+        for (int i = 0; i < dictionaryIndexes.length; i++) {
+            int dictionaryIndex = dictionaryIndexes[i];
+            T expectedValue = expectedValues[dictionaryIndex];
+            expectedDictionaryValues[i] = expectedValue;
+        }
+        return expectedDictionaryValues;
+    }
+
+    private static int[] createTestDictionaryIndexes(int valueCount)
+    {
+        int[] dictionaryIndexes = new int[valueCount * 2];
+        for (int i = 0; i < valueCount; i++) {
+            dictionaryIndexes[i] = valueCount - i - 1;
+            dictionaryIndexes[i + valueCount] = i;
+        }
+        return dictionaryIndexes;
+    }
+
+    public static <T> T[] createTestRleExpectedValues(T[] expectedValues, int position)
+    {
+        T[] expectedDictionaryValues = Arrays.copyOf(expectedValues, 10);
+        for (int i = 0; i < 10; i++) {
+            expectedDictionaryValues[i] = expectedValues[position];
+        }
+        return expectedDictionaryValues;
+    }
+
+    public static RunLengthEncodedBlock createTestRleBlock(Block block, int position)
+    {
+        return (RunLengthEncodedBlock) RunLengthEncodedBlock.create(block.getRegion(position, 1), 10);
+    }
+}
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestArrayBlockBuilder.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestArrayBlockBuilder.java
index 6761efd6c4bf..511961cb8260 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestArrayBlockBuilder.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestArrayBlockBuilder.java
@@ -13,14 +13,13 @@
  */
 package io.trino.spi.block;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static java.lang.Long.BYTES;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
 
 public class TestArrayBlockBuilder
 {
@@ -36,17 +35,17 @@ public void testArrayBlockIsFull()
 
     private void testIsFull(PageBuilderStatus pageBuilderStatus)
     {
-        BlockBuilder blockBuilder = new ArrayBlockBuilder(BIGINT, pageBuilderStatus.createBlockBuilderStatus(), EXPECTED_ENTRY_COUNT);
-        assertTrue(pageBuilderStatus.isEmpty());
+        ArrayBlockBuilder blockBuilder = new ArrayBlockBuilder(BIGINT, pageBuilderStatus.createBlockBuilderStatus(), EXPECTED_ENTRY_COUNT);
+        assertThat(pageBuilderStatus.isEmpty()).isTrue();
         while (!pageBuilderStatus.isFull()) {
-            BlockBuilder elementBuilder = blockBuilder.beginBlockEntry();
-            BIGINT.writeLong(elementBuilder, 12);
-            elementBuilder.appendNull();
-            BIGINT.writeLong(elementBuilder, 34);
-            blockBuilder.closeEntry();
+            blockBuilder.buildEntry(elementBuilder -> {
+                BIGINT.writeLong(elementBuilder, 12);
+                elementBuilder.appendNull();
+                BIGINT.writeLong(elementBuilder, 34);
+            });
         }
-        assertEquals(blockBuilder.getPositionCount(), EXPECTED_ENTRY_COUNT);
-        assertEquals(pageBuilderStatus.isFull(), true);
+        assertThat(blockBuilder.getPositionCount()).isEqualTo(EXPECTED_ENTRY_COUNT);
+        assertThat(pageBuilderStatus.isFull()).isEqualTo(true);
     }
 
     //TODO we should systematically test Block::getRetainedSizeInBytes()
@@ -54,25 +53,26 @@ private void testIsFull(PageBuilderStatus pageBuilderStatus)
     public void testRetainedSizeInBytes()
     {
         int expectedEntries = 1000;
-        BlockBuilder arrayBlockBuilder = new ArrayBlockBuilder(BIGINT, null, expectedEntries);
+        ArrayBlockBuilder arrayBlockBuilder = new ArrayBlockBuilder(BIGINT, null, expectedEntries);
         long initialRetainedSize = arrayBlockBuilder.getRetainedSizeInBytes();
         for (int i = 0; i < expectedEntries; i++) {
-            BlockBuilder arrayElementBuilder = arrayBlockBuilder.beginBlockEntry();
-            BIGINT.writeLong(arrayElementBuilder, i);
-            arrayBlockBuilder.closeEntry();
+            int value = i;
+            arrayBlockBuilder.buildEntry(elementBuilder -> BIGINT.writeLong(elementBuilder, value));
         }
-        assertTrue(arrayBlockBuilder.getRetainedSizeInBytes() >= (expectedEntries * BYTES + instanceSize(LongArrayBlockBuilder.class) + initialRetainedSize));
+        assertThat(arrayBlockBuilder.getRetainedSizeInBytes())
+                .isGreaterThanOrEqualTo(expectedEntries * BYTES + instanceSize(LongArrayBlockBuilder.class) + initialRetainedSize);
     }
 
     @Test
     public void testConcurrentWriting()
     {
-        BlockBuilder blockBuilder = new ArrayBlockBuilder(BIGINT, null, EXPECTED_ENTRY_COUNT);
-        BlockBuilder elementBlockWriter = blockBuilder.beginBlockEntry();
-        elementBlockWriter.writeLong(45).closeEntry();
-        assertThatThrownBy(blockBuilder::beginBlockEntry)
-                .isInstanceOf(IllegalStateException.class)
-                .hasMessage("Expected current entry to be closed but was opened");
+        ArrayBlockBuilder blockBuilder = new ArrayBlockBuilder(BIGINT, null, EXPECTED_ENTRY_COUNT);
+        blockBuilder.buildEntry(elementBuilder -> {
+            BIGINT.writeLong(elementBuilder, 45);
+            assertThatThrownBy(() -> blockBuilder.buildEntry(ignore -> {}))
+                    .isInstanceOf(IllegalStateException.class)
+                    .hasMessage("Expected current entry to be closed but was opened");
+        });
     }
 
     @Test
@@ -86,11 +86,6 @@ public void testBuilderProducesNullRleForNullRows()
 
         // multiple nulls
         assertIsAllNulls(blockBuilder().appendNull().appendNull().build(), 2);
-
-        BlockBuilder blockBuilder = blockBuilder().appendNull().appendNull();
-        assertIsAllNulls(blockBuilder.copyPositions(new int[] {0}, 0, 1), 1);
-        assertIsAllNulls(blockBuilder.getRegion(0, 1), 1);
-        assertIsAllNulls(blockBuilder.copyRegion(0, 1), 1);
     }
 
     private static BlockBuilder blockBuilder()
@@ -100,16 +95,16 @@ private static BlockBuilder blockBuilder()
 
     private static void assertIsAllNulls(Block block, int expectedPositionCount)
     {
-        assertEquals(block.getPositionCount(), expectedPositionCount);
+        assertThat(block.getPositionCount()).isEqualTo(expectedPositionCount);
         if (expectedPositionCount <= 1) {
-            assertEquals(block.getClass(), ArrayBlock.class);
+            assertThat(block.getClass()).isEqualTo(ArrayBlock.class);
         }
         else {
-            assertEquals(block.getClass(), RunLengthEncodedBlock.class);
-            assertEquals(((RunLengthEncodedBlock) block).getValue().getClass(), ArrayBlock.class);
+            assertThat(block.getClass()).isEqualTo(RunLengthEncodedBlock.class);
+            assertThat(((RunLengthEncodedBlock) block).getValue().getClass()).isEqualTo(ArrayBlock.class);
         }
         if (expectedPositionCount > 0) {
-            assertTrue(block.isNull(0));
+            assertThat(block.isNull(0)).isTrue();
         }
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestBlockRetainedSizeBreakdown.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestBlockRetainedSizeBreakdown.java
index d44d78c50cf9..81bff39dbf94 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestBlockRetainedSizeBreakdown.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestBlockRetainedSizeBreakdown.java
@@ -17,7 +17,7 @@
 import io.trino.spi.type.Type;
 import it.unimi.dsi.fastutil.Hash.Strategy;
 import it.unimi.dsi.fastutil.objects.Object2LongOpenCustomHashMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
@@ -29,7 +29,7 @@
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.TypeUtils.writeNativeValue;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBlockRetainedSizeBreakdown
 {
@@ -38,11 +38,10 @@ public class TestBlockRetainedSizeBreakdown
     @Test
     public void testArrayBlock()
     {
-        BlockBuilder arrayBlockBuilder = new ArrayBlockBuilder(BIGINT, null, EXPECTED_ENTRIES);
+        ArrayBlockBuilder arrayBlockBuilder = new ArrayBlockBuilder(BIGINT, null, EXPECTED_ENTRIES);
         for (int i = 0; i < EXPECTED_ENTRIES; i++) {
-            BlockBuilder arrayElementBuilder = arrayBlockBuilder.beginBlockEntry();
-            writeNativeValue(BIGINT, arrayElementBuilder, castIntegerToObject(i, BIGINT));
-            arrayBlockBuilder.closeEntry();
+            int value = i;
+            arrayBlockBuilder.buildEntry(elementBuilder -> writeNativeValue(BIGINT, elementBuilder, castIntegerToObject(value, BIGINT)));
         }
         checkRetainedSize(arrayBlockBuilder.build(), false);
     }
@@ -50,9 +49,9 @@ public void testArrayBlock()
     @Test
     public void testByteArrayBlock()
     {
-        BlockBuilder blockBuilder = new ByteArrayBlockBuilder(null, EXPECTED_ENTRIES);
+        ByteArrayBlockBuilder blockBuilder = new ByteArrayBlockBuilder(null, EXPECTED_ENTRIES);
         for (int i = 0; i < EXPECTED_ENTRIES; i++) {
-            blockBuilder.writeByte(i);
+            blockBuilder.writeByte((byte) i);
         }
         checkRetainedSize(blockBuilder.build(), false);
     }
@@ -95,9 +94,9 @@ public void testRunLengthEncodedBlock()
     @Test
     public void testShortArrayBlock()
     {
-        BlockBuilder blockBuilder = new ShortArrayBlockBuilder(null, EXPECTED_ENTRIES);
+        ShortArrayBlockBuilder blockBuilder = new ShortArrayBlockBuilder(null, EXPECTED_ENTRIES);
         for (int i = 0; i < EXPECTED_ENTRIES; i++) {
-            blockBuilder.writeShort(i);
+            blockBuilder.writeShort((short) i);
         }
         checkRetainedSize(blockBuilder.build(), false);
     }
@@ -146,18 +145,18 @@ private static void checkRetainedSize(Block block, boolean getRegionCreateNewObj
         };
 
         block.retainedBytesForEachPart(consumer);
-        assertEquals(objectSize.get(), block.getRetainedSizeInBytes());
+        assertThat(objectSize.get()).isEqualTo(block.getRetainedSizeInBytes());
 
         Block copyBlock = block.getRegion(0, block.getPositionCount() / 2);
         copyBlock.retainedBytesForEachPart(consumer);
-        assertEquals(objectSize.get(), block.getRetainedSizeInBytes() + copyBlock.getRetainedSizeInBytes());
+        assertThat(objectSize.get()).isEqualTo(block.getRetainedSizeInBytes() + copyBlock.getRetainedSizeInBytes());
 
-        assertEquals(trackedObjects.getLong(block), 1);
-        assertEquals(trackedObjects.getLong(copyBlock), 1);
+        assertThat(trackedObjects.getLong(block)).isEqualTo(1);
+        assertThat(trackedObjects.getLong(copyBlock)).isEqualTo(1);
         trackedObjects.remove(block);
         trackedObjects.remove(copyBlock);
         for (long value : trackedObjects.values()) {
-            assertEquals(value, getRegionCreateNewObjects ? 1 : 2);
+            assertThat(value).isEqualTo(getRegionCreateNewObjects ? 1 : 2);
         }
     }
 
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestBlockUtil.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestBlockUtil.java
index 0399387457e1..a58582cdb617 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestBlockUtil.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestBlockUtil.java
@@ -13,24 +13,24 @@
  */
 package io.trino.spi.block;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.block.BlockUtil.MAX_ARRAY_SIZE;
 import static java.lang.String.format;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBlockUtil
 {
     @Test
     public void testCalculateNewArraySize()
     {
-        assertEquals(BlockUtil.calculateNewArraySize(200), 300);
-        assertEquals(BlockUtil.calculateNewArraySize(Integer.MAX_VALUE), MAX_ARRAY_SIZE);
+        assertThat(BlockUtil.calculateNewArraySize(200)).isEqualTo(300);
+        assertThat(BlockUtil.calculateNewArraySize(Integer.MAX_VALUE)).isEqualTo(MAX_ARRAY_SIZE);
         try {
             BlockUtil.calculateNewArraySize(MAX_ARRAY_SIZE);
         }
         catch (IllegalArgumentException e) {
-            assertEquals(e.getMessage(), format("Cannot grow array beyond '%s'", MAX_ARRAY_SIZE));
+            assertThat(e.getMessage()).isEqualTo(format("Cannot grow array beyond '%s'", MAX_ARRAY_SIZE));
         }
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestByteArrayBlockEncoding.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestByteArrayBlockEncoding.java
index c5a0e25d793b..f0488c1ea3fe 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestByteArrayBlockEncoding.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestByteArrayBlockEncoding.java
@@ -31,7 +31,7 @@ protected Type getType()
     @Override
     protected void write(BlockBuilder blockBuilder, Byte value)
     {
-        blockBuilder.writeByte(value);
+        TINYINT.writeByte(blockBuilder, value);
     }
 
     @Override
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestColumnarArray.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestColumnarArray.java
new file mode 100644
index 000000000000..74ce2025f39a
--- /dev/null
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestColumnarArray.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
+import io.trino.spi.type.ArrayType;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+
+import static io.trino.spi.block.ColumnarArray.toColumnarArray;
+import static io.trino.spi.block.ColumnarTestUtils.alternatingNullValues;
+import static io.trino.spi.block.ColumnarTestUtils.assertBlock;
+import static io.trino.spi.block.ColumnarTestUtils.assertBlockPosition;
+import static io.trino.spi.block.ColumnarTestUtils.createTestDictionaryBlock;
+import static io.trino.spi.block.ColumnarTestUtils.createTestDictionaryExpectedValues;
+import static io.trino.spi.block.ColumnarTestUtils.createTestRleBlock;
+import static io.trino.spi.block.ColumnarTestUtils.createTestRleExpectedValues;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestColumnarArray
+{
+    private static final int[] ARRAY_SIZES = new int[] {16, 0, 13, 1, 2, 11, 4, 7};
+    private static final ArrayType ARRAY_TYPE = new ArrayType(VARCHAR);
+
+    @Test
+    public void test()
+    {
+        Slice[][] expectedValues = new Slice[ARRAY_SIZES.length][];
+        for (int i = 0; i < ARRAY_SIZES.length; i++) {
+            expectedValues[i] = new Slice[ARRAY_SIZES[i]];
+            for (int j = 0; j < ARRAY_SIZES[i]; j++) {
+                if (j % 3 != 1) {
+                    expectedValues[i][j] = Slices.utf8Slice(format("%d.%d", i, j));
+                }
+            }
+        }
+        Block block = createBlockBuilderWithValues(expectedValues).build();
+        verifyBlock(block, expectedValues);
+
+        Slice[][] expectedValuesWithNull = alternatingNullValues(expectedValues);
+        Block blockWithNull = createBlockBuilderWithValues(expectedValuesWithNull).build();
+        verifyBlock(blockWithNull, expectedValuesWithNull);
+    }
+
+    private static <T> void verifyBlock(Block block, T[] expectedValues)
+    {
+        assertBlock(ARRAY_TYPE, block, expectedValues);
+
+        assertColumnarArray(block, expectedValues);
+        assertDictionaryBlock(block, expectedValues);
+        assertRunLengthEncodedBlock(block, expectedValues);
+
+        int offset = 1;
+        int length = expectedValues.length - 2;
+        Block blockRegion = block.getRegion(offset, length);
+        T[] expectedValuesRegion = Arrays.copyOfRange(expectedValues, offset, offset + length);
+
+        assertBlock(ARRAY_TYPE, blockRegion, expectedValuesRegion);
+
+        assertColumnarArray(blockRegion, expectedValuesRegion);
+        assertDictionaryBlock(blockRegion, expectedValuesRegion);
+        assertRunLengthEncodedBlock(blockRegion, expectedValuesRegion);
+    }
+
+    private static <T> void assertDictionaryBlock(Block block, T[] expectedValues)
+    {
+        Block dictionaryBlock = createTestDictionaryBlock(block);
+        T[] expectedDictionaryValues = createTestDictionaryExpectedValues(expectedValues);
+
+        assertBlock(ARRAY_TYPE, dictionaryBlock, expectedDictionaryValues);
+        assertColumnarArray(dictionaryBlock, expectedDictionaryValues);
+        assertRunLengthEncodedBlock(dictionaryBlock, expectedDictionaryValues);
+    }
+
+    private static <T> void assertRunLengthEncodedBlock(Block block, T[] expectedValues)
+    {
+        for (int position = 0; position < block.getPositionCount(); position++) {
+            RunLengthEncodedBlock runLengthEncodedBlock = createTestRleBlock(block, position);
+            T[] expectedDictionaryValues = createTestRleExpectedValues(expectedValues, position);
+
+            assertBlock(ARRAY_TYPE, runLengthEncodedBlock, expectedDictionaryValues);
+            assertColumnarArray(runLengthEncodedBlock, expectedDictionaryValues);
+        }
+    }
+
+    private static <T> void assertColumnarArray(Block block, T[] expectedValues)
+    {
+        ColumnarArray columnarArray = toColumnarArray(block);
+        assertThat(columnarArray.getPositionCount()).isEqualTo(expectedValues.length);
+
+        Block elementsBlock = columnarArray.getElementsBlock();
+        int elementsPosition = 0;
+        for (int position = 0; position < expectedValues.length; position++) {
+            T expectedArray = expectedValues[position];
+            assertThat(columnarArray.isNull(position)).isEqualTo(expectedArray == null);
+            assertThat(columnarArray.getLength(position)).isEqualTo(expectedArray == null ? 0 : Array.getLength(expectedArray));
+            assertThat(elementsPosition).isEqualTo(columnarArray.getOffset(position));
+
+            for (int i = 0; i < columnarArray.getLength(position); i++) {
+                Object expectedElement = Array.get(expectedArray, i);
+                assertBlockPosition(ARRAY_TYPE, elementsBlock, elementsPosition, expectedElement);
+                elementsPosition++;
+            }
+        }
+    }
+
+    public static BlockBuilder createBlockBuilderWithValues(Slice[][] expectedValues)
+    {
+        BlockBuilder blockBuilder = ARRAY_TYPE.createBlockBuilder(null, 100, 100);
+        for (Slice[] expectedValue : expectedValues) {
+            if (expectedValue == null) {
+                blockBuilder.appendNull();
+            }
+            else {
+                BlockBuilder elementBlockBuilder = VARCHAR.createBlockBuilder(null, expectedValue.length);
+                for (Slice v : expectedValue) {
+                    if (v == null) {
+                        elementBlockBuilder.appendNull();
+                    }
+                    else {
+                        VARCHAR.writeSlice(elementBlockBuilder, v);
+                    }
+                }
+                ARRAY_TYPE.writeObject(blockBuilder, elementBlockBuilder.build());
+            }
+        }
+        return blockBuilder;
+    }
+}
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestColumnarMap.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestColumnarMap.java
new file mode 100644
index 000000000000..7a625a7f2c31
--- /dev/null
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestColumnarMap.java
@@ -0,0 +1,166 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.TypeOperators;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+import static io.trino.spi.block.ColumnarMap.toColumnarMap;
+import static io.trino.spi.block.ColumnarTestUtils.alternatingNullValues;
+import static io.trino.spi.block.ColumnarTestUtils.assertBlock;
+import static io.trino.spi.block.ColumnarTestUtils.assertBlockPosition;
+import static io.trino.spi.block.ColumnarTestUtils.createTestDictionaryBlock;
+import static io.trino.spi.block.ColumnarTestUtils.createTestDictionaryExpectedValues;
+import static io.trino.spi.block.ColumnarTestUtils.createTestRleBlock;
+import static io.trino.spi.block.ColumnarTestUtils.createTestRleExpectedValues;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestColumnarMap
+{
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
+    private static final MapType MAP_TYPE = new MapType(VARCHAR, VARCHAR, TYPE_OPERATORS);
+    private static final int[] MAP_SIZES = new int[]{16, 0, 13, 1, 2, 11, 4, 7};
+
+    @Test
+    public void test()
+    {
+        Slice[][][] expectedValues = new Slice[MAP_SIZES.length][][];
+        for (int mapIndex = 0; mapIndex < MAP_SIZES.length; mapIndex++) {
+            expectedValues[mapIndex] = new Slice[MAP_SIZES[mapIndex]][];
+            for (int entryIndex = 0; entryIndex < MAP_SIZES[mapIndex]; entryIndex++) {
+                Slice[] entry = new Slice[2];
+                entry[0] = Slices.utf8Slice(format("key.%d.%d", mapIndex, entryIndex));
+                if (entryIndex % 3 != 1) {
+                    entry[1] = Slices.utf8Slice(format("value.%d.%d", mapIndex, entryIndex));
+                }
+                expectedValues[mapIndex][entryIndex] = entry;
+            }
+        }
+        Block block = createBlockBuilderWithValues(expectedValues).build();
+        verifyBlock(block, expectedValues);
+
+        Slice[][][] expectedValuesWithNull = alternatingNullValues(expectedValues);
+        Block blockWithNull = createBlockBuilderWithValues(expectedValuesWithNull).build();
+        verifyBlock(blockWithNull, expectedValuesWithNull);
+    }
+
+    private static void verifyBlock(Block block, Slice[][][] expectedValues)
+    {
+        assertBlock(MAP_TYPE, block, expectedValues);
+
+        assertColumnarMap(block, expectedValues);
+        assertDictionaryBlock(block, expectedValues);
+        assertRunLengthEncodedBlock(block, expectedValues);
+
+        int offset = 1;
+        int length = expectedValues.length - 2;
+        Block blockRegion = block.getRegion(offset, length);
+        Slice[][][] expectedValuesRegion = Arrays.copyOfRange(expectedValues, offset, offset + length);
+
+        assertBlock(MAP_TYPE, blockRegion, expectedValuesRegion);
+
+        assertColumnarMap(blockRegion, expectedValuesRegion);
+        assertDictionaryBlock(blockRegion, expectedValuesRegion);
+        assertRunLengthEncodedBlock(blockRegion, expectedValuesRegion);
+    }
+
+    private static void assertDictionaryBlock(Block block, Slice[][][] expectedValues)
+    {
+        Block dictionaryBlock = createTestDictionaryBlock(block);
+        Slice[][][] expectedDictionaryValues = createTestDictionaryExpectedValues(expectedValues);
+
+        assertBlock(MAP_TYPE, dictionaryBlock, expectedDictionaryValues);
+        assertColumnarMap(dictionaryBlock, expectedDictionaryValues);
+        assertRunLengthEncodedBlock(dictionaryBlock, expectedDictionaryValues);
+    }
+
+    private static void assertRunLengthEncodedBlock(Block block, Slice[][][] expectedValues)
+    {
+        for (int position = 0; position < block.getPositionCount(); position++) {
+            RunLengthEncodedBlock runLengthEncodedBlock = createTestRleBlock(block, position);
+            Slice[][][] expectedDictionaryValues = createTestRleExpectedValues(expectedValues, position);
+
+            assertBlock(MAP_TYPE, runLengthEncodedBlock, expectedDictionaryValues);
+            assertColumnarMap(runLengthEncodedBlock, expectedDictionaryValues);
+        }
+    }
+
+    private static void assertColumnarMap(Block block, Slice[][][] expectedValues)
+    {
+        ColumnarMap columnarMap = toColumnarMap(block);
+        assertThat(columnarMap.getPositionCount()).isEqualTo(expectedValues.length);
+
+        Block keysBlock = columnarMap.getKeysBlock();
+        Block valuesBlock = columnarMap.getValuesBlock();
+        int elementsPosition = 0;
+        for (int position = 0; position < expectedValues.length; position++) {
+            Slice[][] expectedMap = expectedValues[position];
+            assertThat(columnarMap.isNull(position)).isEqualTo(expectedMap == null);
+            if (expectedMap == null) {
+                assertThat(columnarMap.getEntryCount(position)).isEqualTo(0);
+                continue;
+            }
+
+            assertThat(columnarMap.getEntryCount(position)).isEqualTo(expectedMap.length);
+            assertThat(columnarMap.getOffset(position)).isEqualTo(elementsPosition);
+
+            for (int i = 0; i < columnarMap.getEntryCount(position); i++) {
+                Slice[] expectedEntry = expectedMap[i];
+
+                Slice expectedKey = expectedEntry[0];
+                assertBlockPosition(MAP_TYPE, keysBlock, elementsPosition, expectedKey);
+
+                Slice expectedValue = expectedEntry[1];
+                assertBlockPosition(MAP_TYPE, valuesBlock, elementsPosition, expectedValue);
+
+                elementsPosition++;
+            }
+        }
+    }
+
+    public static BlockBuilder createBlockBuilderWithValues(Slice[][][] expectedValues)
+    {
+        MapBlockBuilder blockBuilder = MAP_TYPE.createBlockBuilder(null, 100);
+        for (Slice[][] expectedMap : expectedValues) {
+            if (expectedMap == null) {
+                blockBuilder.appendNull();
+            }
+            else {
+                blockBuilder.buildEntry((keyBuilder, valueBuilder) -> {
+                    for (Slice[] entry : expectedMap) {
+                        Slice key = entry[0];
+                        assertThat(key).isNotNull();
+                        VARCHAR.writeSlice(keyBuilder, key);
+
+                        Slice value = entry[1];
+                        if (value == null) {
+                            valueBuilder.appendNull();
+                        }
+                        else {
+                            VARCHAR.writeSlice(valueBuilder, value);
+                        }
+                    }
+                });
+            }
+        }
+        return blockBuilder;
+    }
+}
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestDictionaryBlockEncoding.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestDictionaryBlockEncoding.java
index 772ffed647f0..81bfec9b0a26 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestDictionaryBlockEncoding.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestDictionaryBlockEncoding.java
@@ -14,12 +14,11 @@
 package io.trino.spi.block;
 
 import io.airlift.slice.DynamicSliceOutput;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.block.BlockTestUtils.assertBlockEquals;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDictionaryBlockEncoding
 {
@@ -40,13 +39,7 @@ public void testRoundTrip()
         DictionaryBlock dictionaryBlock = (DictionaryBlock) DictionaryBlock.create(ids.length, dictionary, ids);
 
         Block actualBlock = roundTripBlock(dictionaryBlock);
-        assertTrue(actualBlock instanceof DictionaryBlock);
-        DictionaryBlock actualDictionaryBlock = (DictionaryBlock) actualBlock;
-        assertBlockEquals(VARCHAR, actualDictionaryBlock.getDictionary(), dictionary);
-        for (int position = 0; position < actualDictionaryBlock.getPositionCount(); position++) {
-            assertEquals(actualDictionaryBlock.getId(position), ids[position]);
-        }
-        assertEquals(actualDictionaryBlock.getDictionarySourceId(), dictionaryBlock.getDictionarySourceId());
+        assertBlockEquals(VARCHAR, actualBlock, dictionaryBlock);
     }
 
     @Test
@@ -56,7 +49,6 @@ public void testNonSequentialDictionaryUnnest()
         DictionaryBlock dictionaryBlock = (DictionaryBlock) DictionaryBlock.create(ids.length, dictionary, ids);
 
         Block actualBlock = roundTripBlock(dictionaryBlock);
-        assertTrue(actualBlock instanceof DictionaryBlock);
         assertBlockEquals(VARCHAR, actualBlock, dictionary.getPositions(ids, 0, 4));
     }
 
@@ -67,7 +59,7 @@ public void testNonSequentialDictionaryUnnestWithGaps()
         DictionaryBlock dictionaryBlock = (DictionaryBlock) DictionaryBlock.create(ids.length, dictionary, ids);
 
         Block actualBlock = roundTripBlock(dictionaryBlock);
-        assertTrue(actualBlock instanceof VariableWidthBlock);
+        assertThat(actualBlock).isInstanceOf(VariableWidthBlock.class);
         assertBlockEquals(VARCHAR, actualBlock, dictionary.getPositions(ids, 0, 3));
     }
 
@@ -78,7 +70,7 @@ public void testSequentialDictionaryUnnest()
         DictionaryBlock dictionaryBlock = (DictionaryBlock) DictionaryBlock.create(ids.length, dictionary, ids);
 
         Block actualBlock = roundTripBlock(dictionaryBlock);
-        assertTrue(actualBlock instanceof VariableWidthBlock);
+        assertThat(actualBlock).isInstanceOf(VariableWidthBlock.class);
         assertBlockEquals(VARCHAR, actualBlock, dictionary.getPositions(ids, 0, 4));
     }
 
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestFixed12BlockEncoding.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestFixed12BlockEncoding.java
new file mode 100644
index 000000000000..44ea0de97b06
--- /dev/null
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestFixed12BlockEncoding.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.trino.spi.type.LongTimestamp;
+import io.trino.spi.type.Type;
+
+import java.util.Random;
+
+import static io.trino.spi.type.TimestampType.TIMESTAMP_PICOS;
+import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MICROSECOND;
+
+public class TestFixed12BlockEncoding
+        extends BaseBlockEncodingTest<LongTimestamp>
+{
+    @Override
+    protected Type getType()
+    {
+        return TIMESTAMP_PICOS;
+    }
+
+    @Override
+    protected void write(BlockBuilder blockBuilder, LongTimestamp value)
+    {
+        TIMESTAMP_PICOS.writeObject(blockBuilder, value);
+    }
+
+    @Override
+    protected LongTimestamp randomValue(Random random)
+    {
+        return new LongTimestamp(random.nextLong(), random.nextInt(PICOSECONDS_PER_MICROSECOND));
+    }
+}
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestInt96ArrayBlockEncoding.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestInt96ArrayBlockEncoding.java
deleted file mode 100644
index 68ccd8880d7f..000000000000
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestInt96ArrayBlockEncoding.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import io.trino.spi.type.LongTimestamp;
-import io.trino.spi.type.Type;
-
-import java.util.Random;
-
-import static io.trino.spi.type.TimestampType.TIMESTAMP_PICOS;
-import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MICROSECOND;
-
-public class TestInt96ArrayBlockEncoding
-        extends BaseBlockEncodingTest<LongTimestamp>
-{
-    @Override
-    protected Type getType()
-    {
-        return TIMESTAMP_PICOS;
-    }
-
-    @Override
-    protected void write(BlockBuilder blockBuilder, LongTimestamp value)
-    {
-        TIMESTAMP_PICOS.writeObject(blockBuilder, value);
-    }
-
-    @Override
-    protected LongTimestamp randomValue(Random random)
-    {
-        return new LongTimestamp(random.nextLong(), random.nextInt(PICOSECONDS_PER_MICROSECOND));
-    }
-}
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestIntArrayList.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestIntArrayList.java
index 215d57f36773..f380211e9849 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestIntArrayList.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestIntArrayList.java
@@ -13,9 +13,9 @@
  */
 package io.trino.spi.block;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIntArrayList
 {
@@ -30,11 +30,11 @@ public void testAddsElements()
             list.add(i);
         }
 
-        assertEquals(list.size(), N_ELEMENTS);
+        assertThat(list.size()).isEqualTo(N_ELEMENTS);
 
         int[] elements = list.elements();
         for (int i = 0; i < N_ELEMENTS; ++i) {
-            assertEquals(elements[i], i);
+            assertThat(elements[i]).isEqualTo(i);
         }
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestIntegerArrayBlockEncoding.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestIntegerArrayBlockEncoding.java
index 96afa7fbd06d..617e23632271 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestIntegerArrayBlockEncoding.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestIntegerArrayBlockEncoding.java
@@ -31,7 +31,7 @@ protected Type getType()
     @Override
     protected void write(BlockBuilder blockBuilder, Integer value)
     {
-        blockBuilder.writeInt(value);
+        ((IntArrayBlockBuilder) blockBuilder).writeInt(value);
     }
 
     @Override
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestLazyBlock.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestLazyBlock.java
index 7efd90de459e..30d27f8a34ee 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestLazyBlock.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestLazyBlock.java
@@ -14,16 +14,13 @@
 package io.trino.spi.block;
 
 import com.google.common.collect.ImmutableList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
 public class TestLazyBlock
 {
@@ -35,10 +32,10 @@ public void testListener()
         LazyBlock.listenForLoads(lazyBlock, notifications::add);
 
         Block loadedBlock = lazyBlock.getBlock();
-        assertEquals(notifications, ImmutableList.of(loadedBlock));
+        assertThat(notifications).isEqualTo(ImmutableList.of(loadedBlock));
 
         loadedBlock = lazyBlock.getBlock();
-        assertEquals(notifications, ImmutableList.of(loadedBlock));
+        assertThat(notifications).isEqualTo(ImmutableList.of(loadedBlock));
     }
 
     @Test
@@ -60,42 +57,42 @@ public void testLoadedBlockNestedListener()
         Block nestedRowBlock = lazyBlock.getBlock();
         LazyBlock.listenForLoads(lazyBlock, actualNotifications::add);
         Block loadedBlock = ((LazyBlock) nestedRowBlock.getChildren().get(0)).getBlock();
-        assertEquals(actualNotifications, ImmutableList.of(loadedBlock));
+        assertThat(actualNotifications).isEqualTo(ImmutableList.of(loadedBlock));
     }
 
     @Test
     public void testNestedGetLoadedBlock()
     {
         List<Block> actualNotifications = new ArrayList<>();
-        Block arrayBlock = new IntArrayBlock(1, Optional.empty(), new int[] {0});
-        LazyBlock lazyArrayBlock = new LazyBlock(1, () -> arrayBlock);
-        Block dictionaryBlock = DictionaryBlock.create(2, lazyArrayBlock, new int[] {0, 0});
-        LazyBlock lazyBlock = new LazyBlock(2, () -> dictionaryBlock);
+        Block arrayBlock = new IntArrayBlock(2, Optional.empty(), new int[] {0, 1});
+        LazyBlock lazyArrayBlock = new LazyBlock(2, () -> arrayBlock);
+        Block rowBlock = RowBlock.fromFieldBlocks(2, new Block[]{lazyArrayBlock});
+        LazyBlock lazyBlock = new LazyBlock(2, () -> rowBlock);
         LazyBlock.listenForLoads(lazyBlock, actualNotifications::add);
 
         Block loadedBlock = lazyBlock.getBlock();
-        assertThat(loadedBlock).isInstanceOf(DictionaryBlock.class);
-        assertThat(((DictionaryBlock) loadedBlock).getDictionary()).isInstanceOf(LazyBlock.class);
-        assertEquals(actualNotifications, ImmutableList.of(loadedBlock));
+        assertThat(loadedBlock).isInstanceOf(RowBlock.class);
+        assertThat(((RowBlock) loadedBlock).getFieldBlock(0)).isInstanceOf(LazyBlock.class);
+        assertThat(actualNotifications).isEqualTo(ImmutableList.of(loadedBlock));
 
         Block fullyLoadedBlock = lazyBlock.getLoadedBlock();
-        assertThat(fullyLoadedBlock).isInstanceOf(DictionaryBlock.class);
-        assertThat(((DictionaryBlock) fullyLoadedBlock).getDictionary()).isInstanceOf(IntArrayBlock.class);
-        assertEquals(actualNotifications, ImmutableList.of(loadedBlock, arrayBlock));
-        assertTrue(lazyBlock.isLoaded());
-        assertTrue(dictionaryBlock.isLoaded());
+        assertThat(fullyLoadedBlock).isInstanceOf(RowBlock.class);
+        assertThat(((RowBlock) fullyLoadedBlock).getFieldBlock(0)).isInstanceOf(IntArrayBlock.class);
+        assertThat(actualNotifications).isEqualTo(ImmutableList.of(loadedBlock, arrayBlock));
+        assertThat(lazyBlock.isLoaded()).isTrue();
+        assertThat(rowBlock.isLoaded()).isTrue();
     }
 
     private static void assertNotificationsRecursive(int depth, Block lazyBlock, List<Block> actualNotifications, List<Block> expectedNotifications)
     {
-        assertFalse(lazyBlock.isLoaded());
+        assertThat(lazyBlock.isLoaded()).isFalse();
         Block loadedBlock = ((LazyBlock) lazyBlock).getBlock();
         expectedNotifications.add(loadedBlock);
-        assertEquals(actualNotifications, expectedNotifications);
+        assertThat(actualNotifications).isEqualTo(expectedNotifications);
 
         if (loadedBlock instanceof ArrayBlock) {
-            long expectedSize = (Integer.BYTES + Byte.BYTES) * loadedBlock.getPositionCount();
-            assertEquals(loadedBlock.getSizeInBytes(), expectedSize);
+            long expectedSize = (long) (Integer.BYTES + Byte.BYTES) * loadedBlock.getPositionCount();
+            assertThat(loadedBlock.getSizeInBytes()).isEqualTo(expectedSize);
 
             Block elementsBlock = loadedBlock.getChildren().get(0);
             if (depth > 0) {
@@ -103,12 +100,12 @@ private static void assertNotificationsRecursive(int depth, Block lazyBlock, Lis
             }
 
             expectedSize += elementsBlock.getSizeInBytes();
-            assertEquals(loadedBlock.getSizeInBytes(), expectedSize);
+            assertThat(loadedBlock.getSizeInBytes()).isEqualTo(expectedSize);
             return;
         }
         if (loadedBlock instanceof RowBlock) {
-            long expectedSize = (Integer.BYTES + Byte.BYTES) * loadedBlock.getPositionCount();
-            assertEquals(loadedBlock.getSizeInBytes(), expectedSize);
+            long expectedSize = (long) Byte.BYTES * loadedBlock.getPositionCount();
+            assertThat(loadedBlock.getSizeInBytes()).isEqualTo(expectedSize);
 
             for (Block fieldBlock : loadedBlock.getChildren()) {
                 if (depth > 0) {
@@ -117,7 +114,7 @@ private static void assertNotificationsRecursive(int depth, Block lazyBlock, Lis
 
                 long fieldBlockSize = fieldBlock.getSizeInBytes();
                 expectedSize += fieldBlockSize;
-                assertEquals(loadedBlock.getSizeInBytes(), expectedSize);
+                assertThat(loadedBlock.getSizeInBytes()).isEqualTo(expectedSize);
             }
             return;
         }
@@ -131,7 +128,7 @@ private static Block createSingleValueBlock(int value)
 
     private static Block createInfiniteRecursiveRowBlock()
     {
-        return RowBlock.fromFieldBlocks(1, Optional.empty(), new Block[] {
+        return RowBlock.fromFieldBlocks(1, new Block[] {
                 new LazyBlock(1, TestLazyBlock::createInfiniteRecursiveArrayBlock),
                 new LazyBlock(1, TestLazyBlock::createInfiniteRecursiveArrayBlock),
                 new LazyBlock(1, TestLazyBlock::createInfiniteRecursiveArrayBlock)
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlock.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlock.java
deleted file mode 100644
index 2b7f14637d77..000000000000
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlock.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed 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 io.trino.spi.block;
-
-import org.testng.annotations.Test;
-
-import java.util.Optional;
-
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-
-public class TestRowBlock
-{
-    @Test
-    public void testFieldBlockOffsetsIsNullWhenThereIsNoNullRow()
-    {
-        Block fieldBlock = new ByteArrayBlock(1, Optional.empty(), new byte[]{10});
-        AbstractRowBlock rowBlock = (RowBlock) RowBlock.fromFieldBlocks(1, Optional.empty(), new Block[] {fieldBlock});
-        // Blocks should discard the offset mask during creation if no values are null
-        assertNull(rowBlock.getFieldBlockOffsets());
-    }
-
-    @Test
-    public void testFieldBlockOffsetsIsNotNullWhenThereIsNullRow()
-    {
-        Block fieldBlock = new ByteArrayBlock(1, Optional.empty(), new byte[]{10});
-        AbstractRowBlock rowBlock = (RowBlock) RowBlock.fromFieldBlocks(1, Optional.of(new boolean[] {true}), new Block[] {fieldBlock});
-        // Blocks should not discard the offset mask during creation if no values are null
-        assertNotNull(rowBlock.getFieldBlockOffsets());
-    }
-}
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlockBuilder.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlockBuilder.java
index 7f7ec79e2e7c..c46a57ded70e 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlockBuilder.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlockBuilder.java
@@ -14,11 +14,10 @@
 package io.trino.spi.block;
 
 import com.google.common.collect.ImmutableList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestRowBlockBuilder
 {
@@ -33,11 +32,6 @@ public void testBuilderProducesNullRleForNullRows()
 
         // multiple nulls
         assertIsAllNulls(blockBuilder().appendNull().appendNull().build(), 2);
-
-        BlockBuilder blockBuilder = blockBuilder().appendNull().appendNull();
-        assertIsAllNulls(blockBuilder.copyPositions(new int[] {0}, 0, 1), 1);
-        assertIsAllNulls(blockBuilder.getRegion(0, 1), 1);
-        assertIsAllNulls(blockBuilder.copyRegion(0, 1), 1);
     }
 
     private static BlockBuilder blockBuilder()
@@ -47,16 +41,16 @@ private static BlockBuilder blockBuilder()
 
     private static void assertIsAllNulls(Block block, int expectedPositionCount)
     {
-        assertEquals(block.getPositionCount(), expectedPositionCount);
+        assertThat(block.getPositionCount()).isEqualTo(expectedPositionCount);
         if (expectedPositionCount <= 1) {
-            assertEquals(block.getClass(), RowBlock.class);
+            assertThat(block.getClass()).isEqualTo(RowBlock.class);
         }
         else {
-            assertEquals(block.getClass(), RunLengthEncodedBlock.class);
-            assertEquals(((RunLengthEncodedBlock) block).getValue().getClass(), RowBlock.class);
+            assertThat(block.getClass()).isEqualTo(RunLengthEncodedBlock.class);
+            assertThat(((RunLengthEncodedBlock) block).getValue().getClass()).isEqualTo(RowBlock.class);
         }
         if (expectedPositionCount > 0) {
-            assertTrue(block.isNull(0));
+            assertThat(block.isNull(0)).isTrue();
         }
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlockEncoding.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlockEncoding.java
index 1d662813c4d6..2bb1ddc76507 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlockEncoding.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlockEncoding.java
@@ -37,10 +37,10 @@ protected Type getType()
     @Override
     protected void write(BlockBuilder blockBuilder, Object[] value)
     {
-        BlockBuilder row = blockBuilder.beginBlockEntry();
-        BIGINT.writeLong(row, (long) value[0]);
-        VARCHAR.writeSlice(row, utf8Slice((String) value[1]));
-        blockBuilder.closeEntry();
+        ((RowBlockBuilder) blockBuilder).buildEntry(fieldBuilders -> {
+            BIGINT.writeLong(fieldBuilders.get(0), (long) value[0]);
+            VARCHAR.writeSlice(fieldBuilders.get(1), utf8Slice((String) value[1]));
+        });
     }
 
     @Override
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlockFieldExtraction.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlockFieldExtraction.java
new file mode 100644
index 000000000000..448accd87e84
--- /dev/null
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestRowBlockFieldExtraction.java
@@ -0,0 +1,167 @@
+/*
+ * Licensed 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 io.trino.spi.block;
+
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
+import io.trino.spi.type.RowType;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static io.trino.spi.block.ColumnarTestUtils.alternatingNullValues;
+import static io.trino.spi.block.ColumnarTestUtils.assertBlock;
+import static io.trino.spi.block.ColumnarTestUtils.assertBlockPosition;
+import static io.trino.spi.block.ColumnarTestUtils.createTestDictionaryBlock;
+import static io.trino.spi.block.ColumnarTestUtils.createTestDictionaryExpectedValues;
+import static io.trino.spi.block.ColumnarTestUtils.createTestRleBlock;
+import static io.trino.spi.block.ColumnarTestUtils.createTestRleExpectedValues;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestRowBlockFieldExtraction
+{
+    @Test
+    public void testBlockFieldExtraction()
+    {
+        int fieldCount = 5;
+        RowType rowType = RowType.anonymous(Collections.nCopies(fieldCount, VARCHAR));
+        Slice[][] expectedValues = new Slice[20][];
+        for (int rowIndex = 0; rowIndex < expectedValues.length; rowIndex++) {
+            expectedValues[rowIndex] = new Slice[fieldCount];
+            for (int fieldIndex = 0; fieldIndex < fieldCount; fieldIndex++) {
+                if (fieldIndex % 3 != 1) {
+                    expectedValues[rowIndex][fieldIndex] = Slices.utf8Slice(format("%d.%d", rowIndex, fieldIndex));
+                }
+            }
+        }
+        Block block = createBlockBuilderWithValues(rowType, expectedValues);
+        verifyBlock(rowType, block, expectedValues);
+
+        Slice[][] expectedValuesWithNull = alternatingNullValues(expectedValues);
+        Block blockWithNull = createBlockBuilderWithValues(rowType, expectedValuesWithNull);
+        verifyBlock(rowType, blockWithNull, expectedValuesWithNull);
+    }
+
+    private static <T> void verifyBlock(RowType rowType, Block block, T[] expectedValues)
+    {
+        assertBlock(rowType, block, expectedValues);
+
+        assertGetFields(rowType, block, expectedValues);
+        assertGetNullSuppressedFields(rowType, block, expectedValues);
+        assertDictionaryBlock(rowType, block, expectedValues);
+        assertRunLengthEncodedBlock(rowType, block, expectedValues);
+
+        int offset = 1;
+        int length = expectedValues.length - 2;
+        Block blockRegion = block.getRegion(offset, length);
+        T[] expectedValuesRegion = Arrays.copyOfRange(expectedValues, offset, offset + length);
+
+        assertBlock(rowType, blockRegion, expectedValuesRegion);
+
+        assertGetFields(rowType, blockRegion, expectedValuesRegion);
+        assertGetNullSuppressedFields(rowType, blockRegion, expectedValuesRegion);
+        assertDictionaryBlock(rowType, blockRegion, expectedValuesRegion);
+        assertRunLengthEncodedBlock(rowType, blockRegion, expectedValuesRegion);
+    }
+
+    private static <T> void assertDictionaryBlock(RowType rowType, Block block, T[] expectedValues)
+    {
+        Block dictionaryBlock = createTestDictionaryBlock(block);
+        T[] expectedDictionaryValues = createTestDictionaryExpectedValues(expectedValues);
+
+        assertBlock(rowType, dictionaryBlock, expectedDictionaryValues);
+        assertGetFields(rowType, dictionaryBlock, expectedDictionaryValues);
+        assertGetNullSuppressedFields(rowType, dictionaryBlock, expectedDictionaryValues);
+        assertRunLengthEncodedBlock(rowType, dictionaryBlock, expectedDictionaryValues);
+    }
+
+    private static <T> void assertRunLengthEncodedBlock(RowType rowType, Block block, T[] expectedValues)
+    {
+        for (int position = 0; position < block.getPositionCount(); position++) {
+            RunLengthEncodedBlock runLengthEncodedBlock = createTestRleBlock(block, position);
+            T[] expectedDictionaryValues = createTestRleExpectedValues(expectedValues, position);
+
+            assertBlock(rowType, runLengthEncodedBlock, expectedDictionaryValues);
+            assertGetFields(rowType, runLengthEncodedBlock, expectedDictionaryValues);
+            assertGetNullSuppressedFields(rowType, runLengthEncodedBlock, expectedDictionaryValues);
+        }
+    }
+
+    private static <T> void assertGetFields(RowType rowType, Block block, T[] expectedValues)
+    {
+        assertThat(block.getPositionCount()).isEqualTo(expectedValues.length);
+        List<Block> nullSuppressedFields = RowBlock.getRowFieldsFromBlock(block);
+
+        for (int fieldId = 0; fieldId < 5; fieldId++) {
+            Block fieldBlock = nullSuppressedFields.get(fieldId);
+            for (int position = 0; position < expectedValues.length; position++) {
+                T expectedRow = expectedValues[position];
+                assertThat(block.isNull(position)).isEqualTo(expectedRow == null);
+
+                Object expectedElement = expectedRow == null ? null : Array.get(expectedRow, fieldId);
+                assertBlockPosition(rowType, fieldBlock, position, expectedElement);
+            }
+        }
+    }
+
+    private static <T> void assertGetNullSuppressedFields(RowType rowType, Block block, T[] expectedValues)
+    {
+        assertThat(block.getPositionCount()).isEqualTo(expectedValues.length);
+        List<Block> nullSuppressedFields = RowBlock.getNullSuppressedRowFieldsFromBlock(block);
+
+        for (int fieldId = 0; fieldId < 5; fieldId++) {
+            Block fieldBlock = nullSuppressedFields.get(fieldId);
+            int nullSuppressedPosition = 0;
+            for (int position = 0; position < expectedValues.length; position++) {
+                T expectedRow = expectedValues[position];
+                assertThat(block.isNull(position)).isEqualTo(expectedRow == null);
+                if (expectedRow == null) {
+                    continue;
+                }
+                Object expectedElement = Array.get(expectedRow, fieldId);
+                assertBlockPosition(rowType, fieldBlock, nullSuppressedPosition, expectedElement);
+                nullSuppressedPosition++;
+            }
+        }
+    }
+
+    public static Block createBlockBuilderWithValues(RowType rowType, Slice[][] expectedValues)
+    {
+        RowBlockBuilder blockBuilder = rowType.createBlockBuilder(null, 100);
+        for (Slice[] expectedValue : expectedValues) {
+            if (expectedValue == null) {
+                blockBuilder.appendNull();
+            }
+            else {
+                blockBuilder.buildEntry(fieldBuilders -> {
+                    for (int i = 0; i < expectedValue.length; i++) {
+                        Slice v = expectedValue[i];
+                        if (v == null) {
+                            fieldBuilders.get(i).appendNull();
+                        }
+                        else {
+                            VARCHAR.writeSlice(fieldBuilders.get(i), v);
+                        }
+                    }
+                });
+            }
+        }
+        return blockBuilder.build();
+    }
+}
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestShortArrayBlockEncoding.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestShortArrayBlockEncoding.java
index 66d5e1626519..1251eb7fdae8 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestShortArrayBlockEncoding.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestShortArrayBlockEncoding.java
@@ -31,7 +31,7 @@ protected Type getType()
     @Override
     protected void write(BlockBuilder blockBuilder, Short value)
     {
-        blockBuilder.writeShort(value);
+        ((ShortArrayBlockBuilder) blockBuilder).writeShort(value);
     }
 
     @Override
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestVariableWidthBlockBuilder.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestVariableWidthBlockBuilder.java
index 8bad38440cdb..f41eaf4fc22d 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestVariableWidthBlockBuilder.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestVariableWidthBlockBuilder.java
@@ -16,15 +16,14 @@
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.slice.SizeOf.SIZE_OF_INT;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.Math.ceil;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestVariableWidthBlockBuilder
 {
@@ -45,29 +44,28 @@ public void testNewBlockBuilderLike()
     {
         int entries = 12345;
         double resetSkew = 1.25;
-        BlockBuilder blockBuilder = new VariableWidthBlockBuilder(null, entries, entries);
+        VariableWidthBlockBuilder blockBuilder = new VariableWidthBlockBuilder(null, entries, entries);
         for (int i = 0; i < entries; i++) {
-            blockBuilder.writeByte(i);
-            blockBuilder.closeEntry();
+            blockBuilder.writeEntry(Slices.wrappedBuffer((byte) i));
         }
-        blockBuilder = blockBuilder.newBlockBuilderLike(null);
+        blockBuilder = (VariableWidthBlockBuilder) blockBuilder.newBlockBuilderLike(null);
         // force to initialize capacity
-        blockBuilder.writeByte(1);
+        blockBuilder.writeEntry(Slices.wrappedBuffer((byte) 1));
 
         long actualArrayBytes = sizeOf(new int[(int) ceil(resetSkew * (entries + 1))]) + sizeOf(new boolean[(int) ceil(resetSkew * entries)]);
         long actualSliceBytes = SLICE_INSTANCE_SIZE + sizeOf(new byte[(int) ceil(resetSkew * entries)]);
-        assertEquals(blockBuilder.getRetainedSizeInBytes(), BLOCK_BUILDER_INSTANCE_SIZE + actualSliceBytes + actualArrayBytes);
+        assertThat(blockBuilder.getRetainedSizeInBytes()).isEqualTo(BLOCK_BUILDER_INSTANCE_SIZE + actualSliceBytes + actualArrayBytes);
     }
 
     private void testIsFull(PageBuilderStatus pageBuilderStatus)
     {
         BlockBuilder blockBuilder = new VariableWidthBlockBuilder(pageBuilderStatus.createBlockBuilderStatus(), 32, 1024);
-        assertTrue(pageBuilderStatus.isEmpty());
+        assertThat(pageBuilderStatus.isEmpty()).isTrue();
         while (!pageBuilderStatus.isFull()) {
             VARCHAR.writeSlice(blockBuilder, Slices.allocate(VARCHAR_VALUE_SIZE));
         }
-        assertEquals(blockBuilder.getPositionCount(), EXPECTED_ENTRY_COUNT);
-        assertEquals(pageBuilderStatus.isFull(), true);
+        assertThat(blockBuilder.getPositionCount()).isEqualTo(EXPECTED_ENTRY_COUNT);
+        assertThat(pageBuilderStatus.isFull()).isEqualTo(true);
     }
 
     @Test
@@ -81,11 +79,6 @@ public void testBuilderProducesNullRleForNullRows()
 
         // multiple nulls
         assertIsAllNulls(blockBuilder().appendNull().appendNull().build(), 2);
-
-        BlockBuilder blockBuilder = blockBuilder().appendNull().appendNull();
-        assertIsAllNulls(blockBuilder.copyPositions(new int[] {0}, 0, 1), 1);
-        assertIsAllNulls(blockBuilder.getRegion(0, 1), 1);
-        assertIsAllNulls(blockBuilder.copyRegion(0, 1), 1);
     }
 
     private static BlockBuilder blockBuilder()
@@ -95,16 +88,16 @@ private static BlockBuilder blockBuilder()
 
     private static void assertIsAllNulls(Block block, int expectedPositionCount)
     {
-        assertEquals(block.getPositionCount(), expectedPositionCount);
+        assertThat(block.getPositionCount()).isEqualTo(expectedPositionCount);
         if (expectedPositionCount <= 1) {
-            assertEquals(block.getClass(), VariableWidthBlock.class);
+            assertThat(block.getClass()).isEqualTo(VariableWidthBlock.class);
         }
         else {
-            assertEquals(block.getClass(), RunLengthEncodedBlock.class);
-            assertEquals(((RunLengthEncodedBlock) block).getValue().getClass(), VariableWidthBlock.class);
+            assertThat(block.getClass()).isEqualTo(RunLengthEncodedBlock.class);
+            assertThat(((RunLengthEncodedBlock) block).getValue().getClass()).isEqualTo(VariableWidthBlock.class);
         }
         if (expectedPositionCount > 0) {
-            assertTrue(block.isNull(0));
+            assertThat(block.isNull(0)).isTrue();
         }
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestVariableWidthBlockEncoding.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestVariableWidthBlockEncoding.java
index 62f2a8b0001b..44ec86cf618e 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestVariableWidthBlockEncoding.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestVariableWidthBlockEncoding.java
@@ -14,7 +14,7 @@
 package io.trino.spi.block;
 
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Random;
 
diff --git a/core/trino-spi/src/test/java/io/trino/spi/block/TestingBlockEncodingSerde.java b/core/trino-spi/src/test/java/io/trino/spi/block/TestingBlockEncodingSerde.java
index f84dabcd5b49..9ab2e668091a 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/block/TestingBlockEncodingSerde.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/block/TestingBlockEncodingSerde.java
@@ -49,14 +49,12 @@ public TestingBlockEncodingSerde(Function<TypeId, Type> types)
         addBlockEncoding(new ShortArrayBlockEncoding());
         addBlockEncoding(new IntArrayBlockEncoding());
         addBlockEncoding(new LongArrayBlockEncoding());
-        addBlockEncoding(new Int96ArrayBlockEncoding());
+        addBlockEncoding(new Fixed12BlockEncoding());
         addBlockEncoding(new Int128ArrayBlockEncoding());
         addBlockEncoding(new DictionaryBlockEncoding());
         addBlockEncoding(new ArrayBlockEncoding());
         addBlockEncoding(new MapBlockEncoding());
-        addBlockEncoding(new SingleMapBlockEncoding());
         addBlockEncoding(new RowBlockEncoding());
-        addBlockEncoding(new SingleRowBlockEncoding());
         addBlockEncoding(new RunLengthBlockEncoding());
         addBlockEncoding(new LazyBlockEncoding());
     }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/connector/TestConnectorViewDefinition.java b/core/trino-spi/src/test/java/io/trino/spi/connector/TestConnectorViewDefinition.java
index 5bc16832bf93..a6b5a9eb0eff 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/connector/TestConnectorViewDefinition.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/connector/TestConnectorViewDefinition.java
@@ -23,7 +23,7 @@
 import io.trino.spi.type.TestingTypeDeserializer;
 import io.trino.spi.type.TestingTypeManager;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Comparator;
 import java.util.Optional;
@@ -33,9 +33,6 @@
 import static io.trino.spi.type.VarcharType.createVarcharType;
 import static java.util.Comparator.comparing;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
 public class TestConnectorViewDefinition
 {
@@ -57,7 +54,7 @@ public void testLegacyViewWithoutOwner()
         // very old view before owner was added
         ConnectorViewDefinition view = CODEC.fromJson("{" + BASE_JSON + "}");
         assertBaseView(view);
-        assertFalse(view.getOwner().isPresent());
+        assertThat(view.getOwner()).isNotPresent();
     }
 
     @Test
@@ -66,8 +63,8 @@ public void testViewWithOwner()
         // old view before invoker security was added
         ConnectorViewDefinition view = CODEC.fromJson("{" + BASE_JSON + ", \"owner\": \"abc\"}");
         assertBaseView(view);
-        assertEquals(view.getOwner(), Optional.of("abc"));
-        assertFalse(view.isRunAsInvoker());
+        assertThat(view.getOwner()).isEqualTo(Optional.of("abc"));
+        assertThat(view.isRunAsInvoker()).isFalse();
     }
 
     @Test
@@ -75,7 +72,7 @@ public void testViewComment()
     {
         ConnectorViewDefinition view = CODEC.fromJson("{" + BASE_JSON + ", \"comment\": \"hello\"}");
         assertBaseView(view);
-        assertEquals(view.getComment(), Optional.of("hello"));
+        assertThat(view.getComment()).isEqualTo(Optional.of("hello"));
     }
 
     @Test
@@ -83,8 +80,8 @@ public void testViewSecurityDefiner()
     {
         ConnectorViewDefinition view = CODEC.fromJson("{" + BASE_JSON + ", \"owner\": \"abc\", \"runAsInvoker\": false}");
         assertBaseView(view);
-        assertEquals(view.getOwner(), Optional.of("abc"));
-        assertFalse(view.isRunAsInvoker());
+        assertThat(view.getOwner()).isEqualTo(Optional.of("abc"));
+        assertThat(view.isRunAsInvoker()).isFalse();
     }
 
     @Test
@@ -92,8 +89,8 @@ public void testViewSecurityInvoker()
     {
         ConnectorViewDefinition view = CODEC.fromJson("{" + BASE_JSON + ", \"runAsInvoker\": true}");
         assertBaseView(view);
-        assertFalse(view.getOwner().isPresent());
-        assertTrue(view.isRunAsInvoker());
+        assertThat(view.getOwner()).isNotPresent();
+        assertThat(view.isRunAsInvoker()).isTrue();
     }
 
     @Test
@@ -108,27 +105,28 @@ public void testRoundTrip()
                         new ViewColumn("xyz", new ArrayType(createVarcharType(32)).getTypeId(), Optional.empty())),
                 Optional.of("comment"),
                 Optional.of("test_owner"),
-                false));
+                false,
+                ImmutableList.of()));
     }
 
     private static void assertBaseView(ConnectorViewDefinition view)
     {
-        assertEquals(view.getOriginalSql(), "SELECT 42 x");
-        assertEquals(view.getColumns().size(), 1);
+        assertThat(view.getOriginalSql()).isEqualTo("SELECT 42 x");
+        assertThat(view.getColumns().size()).isEqualTo(1);
         ViewColumn column = getOnlyElement(view.getColumns());
-        assertEquals(column.getName(), "x");
-        assertEquals(column.getType(), BIGINT.getTypeId());
+        assertThat(column.getName()).isEqualTo("x");
+        assertThat(column.getType()).isEqualTo(BIGINT.getTypeId());
         assertRoundTrip(view);
     }
 
     private static void assertRoundTrip(ConnectorViewDefinition expected)
     {
         ConnectorViewDefinition actual = CODEC.fromJson(CODEC.toJson(expected));
-        assertEquals(actual.getOwner(), expected.getOwner());
-        assertEquals(actual.isRunAsInvoker(), expected.isRunAsInvoker());
-        assertEquals(actual.getCatalog(), expected.getCatalog());
-        assertEquals(actual.getSchema(), expected.getSchema());
-        assertEquals(actual.getOriginalSql(), expected.getOriginalSql());
+        assertThat(actual.getOwner()).isEqualTo(expected.getOwner());
+        assertThat(actual.isRunAsInvoker()).isEqualTo(expected.isRunAsInvoker());
+        assertThat(actual.getCatalog()).isEqualTo(expected.getCatalog());
+        assertThat(actual.getSchema()).isEqualTo(expected.getSchema());
+        assertThat(actual.getOriginalSql()).isEqualTo(expected.getOriginalSql());
         assertThat(actual.getColumns())
                 .usingElementComparator(columnComparator())
                 .isEqualTo(expected.getColumns());
diff --git a/core/trino-spi/src/test/java/io/trino/spi/exchange/TestExchangeId.java b/core/trino-spi/src/test/java/io/trino/spi/exchange/TestExchangeId.java
index 137a4ab1d46a..1a10b7fb3765 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/exchange/TestExchangeId.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/exchange/TestExchangeId.java
@@ -13,10 +13,10 @@
  */
 package io.trino.spi.exchange;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
 
 public class TestExchangeId
 {
@@ -30,6 +30,6 @@ public void testIdValidation()
         assertThatThrownBy(() -> new ExchangeId("~"))
                 .isInstanceOf(IllegalArgumentException.class);
         String allLegalSymbols = "ABCDEFGHIJKLMNOPQRSTUVWXYZ-abcdefghijklmnopqrstuvwxyz_1234567890";
-        assertEquals(new ExchangeId(allLegalSymbols).getId(), allLegalSymbols);
+        assertThat(new ExchangeId(allLegalSymbols).getId()).isEqualTo(allLegalSymbols);
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/function/TestScalarFunctionAdapter.java b/core/trino-spi/src/test/java/io/trino/spi/function/TestScalarFunctionAdapter.java
index 188d4ba373c0..ac0ba86d87d4 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/function/TestScalarFunctionAdapter.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/function/TestScalarFunctionAdapter.java
@@ -19,23 +19,28 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlock;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.Fixed12Block;
+import io.trino.spi.block.LongArrayBlock;
+import io.trino.spi.block.VariableWidthBlock;
 import io.trino.spi.function.InvocationConvention.InvocationArgumentConvention;
 import io.trino.spi.function.InvocationConvention.InvocationReturnConvention;
-import io.trino.spi.function.ScalarFunctionAdapter.NullAdaptationPolicy;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.LongTimestamp;
 import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import io.trino.spi.type.TypeOperators;
+import org.junit.jupiter.api.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.ArrayList;
 import java.util.BitSet;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.stream.IntStream;
 
@@ -46,15 +51,18 @@
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.trino.spi.block.TestingSession.SESSION;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.IN_OUT;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NULL_FLAG;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.ScalarFunctionAdapter.NullAdaptationPolicy.RETURN_NULL_ON_NULL;
-import static io.trino.spi.function.ScalarFunctionAdapter.NullAdaptationPolicy.THROW_ON_NULL;
-import static io.trino.spi.function.ScalarFunctionAdapter.NullAdaptationPolicy.UNDEFINED_VALUE_FOR_NULL;
-import static io.trino.spi.function.ScalarFunctionAdapter.NullAdaptationPolicy.UNSUPPORTED;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
+import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.CharType.createCharType;
@@ -66,18 +74,16 @@
 import static java.lang.invoke.MethodType.methodType;
 import static java.util.Collections.nCopies;
 import static java.util.Objects.requireNonNull;
-import static org.assertj.core.api.Fail.fail;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestScalarFunctionAdapter
 {
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
     private static final ArrayType ARRAY_TYPE = new ArrayType(BIGINT);
     private static final CharType CHAR_TYPE = createCharType(7);
     private static final TimestampType TIMESTAMP_TYPE = createTimestampType(9);
-    private static final List<Type> ARGUMENT_TYPES = ImmutableList.of(BOOLEAN, BIGINT, DOUBLE, VARCHAR, ARRAY_TYPE);
+    private static final Type RETURN_TYPE = BOOLEAN;
+    private static final List<Type> ARGUMENT_TYPES = ImmutableList.of(DOUBLE, VARCHAR, ARRAY_TYPE);
     private static final List<Type> OBJECTS_ARGUMENT_TYPES = ImmutableList.of(VARCHAR, ARRAY_TYPE, CHAR_TYPE, TIMESTAMP_TYPE);
 
     @Test
@@ -89,11 +95,7 @@ public void testAdaptFromNeverNull()
                 FAIL_ON_NULL,
                 false,
                 true);
-        String methodName = "neverNull";
-        verifyAllAdaptations(actualConvention, methodName, RETURN_NULL_ON_NULL, ARGUMENT_TYPES);
-        verifyAllAdaptations(actualConvention, methodName, UNDEFINED_VALUE_FOR_NULL, ARGUMENT_TYPES);
-        verifyAllAdaptations(actualConvention, methodName, THROW_ON_NULL, ARGUMENT_TYPES);
-        verifyAllAdaptations(actualConvention, methodName, UNSUPPORTED, ARGUMENT_TYPES);
+        verifyAllAdaptations(actualConvention, "neverNull", RETURN_TYPE, ARGUMENT_TYPES);
     }
 
     @Test
@@ -105,11 +107,7 @@ public void testAdaptFromNeverNullObjects()
                 FAIL_ON_NULL,
                 false,
                 true);
-        String methodName = "neverNullObjects";
-        verifyAllAdaptations(actualConvention, methodName, RETURN_NULL_ON_NULL, OBJECTS_ARGUMENT_TYPES);
-        verifyAllAdaptations(actualConvention, methodName, UNDEFINED_VALUE_FOR_NULL, OBJECTS_ARGUMENT_TYPES);
-        verifyAllAdaptations(actualConvention, methodName, THROW_ON_NULL, OBJECTS_ARGUMENT_TYPES);
-        verifyAllAdaptations(actualConvention, methodName, UNSUPPORTED, OBJECTS_ARGUMENT_TYPES);
+        verifyAllAdaptations(actualConvention, "neverNullObjects", RETURN_TYPE, OBJECTS_ARGUMENT_TYPES);
     }
 
     @Test
@@ -121,8 +119,7 @@ public void testAdaptFromBoxedNull()
                 FAIL_ON_NULL,
                 false,
                 true);
-        String methodName = "boxedNull";
-        verifyAllAdaptations(actualConvention, methodName, UNSUPPORTED, ARGUMENT_TYPES);
+        verifyAllAdaptations(actualConvention, "boxedNull", RETURN_TYPE, ARGUMENT_TYPES);
     }
 
     @Test
@@ -134,8 +131,7 @@ public void testAdaptFromBoxedNullObjects()
                 FAIL_ON_NULL,
                 false,
                 true);
-        String methodName = "boxedNullObjects";
-        verifyAllAdaptations(actualConvention, methodName, UNSUPPORTED, OBJECTS_ARGUMENT_TYPES);
+        verifyAllAdaptations(actualConvention, "boxedNullObjects", RETURN_TYPE, OBJECTS_ARGUMENT_TYPES);
     }
 
     @Test
@@ -147,8 +143,7 @@ public void testAdaptFromNullFlag()
                 FAIL_ON_NULL,
                 false,
                 true);
-        String methodName = "nullFlag";
-        verifyAllAdaptations(actualConvention, methodName, UNSUPPORTED, ARGUMENT_TYPES);
+        verifyAllAdaptations(actualConvention, "nullFlag", RETURN_TYPE, ARGUMENT_TYPES);
     }
 
     @Test
@@ -160,31 +155,130 @@ public void testAdaptFromNullFlagObjects()
                 FAIL_ON_NULL,
                 false,
                 true);
-        String methodName = "nullFlagObjects";
-        verifyAllAdaptations(actualConvention, methodName, UNSUPPORTED, OBJECTS_ARGUMENT_TYPES);
+        verifyAllAdaptations(actualConvention, "nullFlagObjects", RETURN_TYPE, OBJECTS_ARGUMENT_TYPES);
+    }
+
+    @Test
+    public void testAdaptFromBlockPosition()
+            throws Throwable
+    {
+        InvocationConvention actualConvention = new InvocationConvention(
+                nCopies(ARGUMENT_TYPES.size(), BLOCK_POSITION),
+                FAIL_ON_NULL,
+                false,
+                true);
+        verifyAllAdaptations(actualConvention, "blockPosition", RETURN_TYPE, ARGUMENT_TYPES);
+    }
+
+    @Test
+    public void testAdaptFromBlockPositionObjects()
+            throws Throwable
+    {
+        InvocationConvention actualConvention = new InvocationConvention(
+                nCopies(OBJECTS_ARGUMENT_TYPES.size(), BLOCK_POSITION),
+                FAIL_ON_NULL,
+                false,
+                true);
+        verifyAllAdaptations(actualConvention, "blockPositionObjects", RETURN_TYPE, OBJECTS_ARGUMENT_TYPES);
+    }
+
+    @Test
+    public void testAdaptFromBlockPositionNotNull()
+            throws Throwable
+    {
+        InvocationConvention actualConvention = new InvocationConvention(
+                nCopies(ARGUMENT_TYPES.size(), BLOCK_POSITION_NOT_NULL),
+                FAIL_ON_NULL,
+                false,
+                true);
+        verifyAllAdaptations(actualConvention, "blockPosition", RETURN_TYPE, ARGUMENT_TYPES);
+    }
+
+    @Test
+    public void testAdaptFromBlockPositionNotNullObjects()
+            throws Throwable
+    {
+        InvocationConvention actualConvention = new InvocationConvention(
+                nCopies(OBJECTS_ARGUMENT_TYPES.size(), BLOCK_POSITION_NOT_NULL),
+                FAIL_ON_NULL,
+                false,
+                true);
+        verifyAllAdaptations(actualConvention, "blockPositionObjects", RETURN_TYPE, OBJECTS_ARGUMENT_TYPES);
+    }
+
+    @Test
+    public void testAdaptFromValueBlockPosition()
+            throws Throwable
+    {
+        InvocationConvention actualConvention = new InvocationConvention(
+                nCopies(ARGUMENT_TYPES.size(), VALUE_BLOCK_POSITION),
+                FAIL_ON_NULL,
+                false,
+                true);
+        String methodName = "valueBlockPosition";
+        verifyAllAdaptations(actualConvention, methodName, RETURN_TYPE, ARGUMENT_TYPES);
+    }
+
+    @Test
+    public void testAdaptFromValueBlockPositionObjects()
+            throws Throwable
+    {
+        InvocationConvention actualConvention = new InvocationConvention(
+                nCopies(OBJECTS_ARGUMENT_TYPES.size(), VALUE_BLOCK_POSITION),
+                FAIL_ON_NULL,
+                false,
+                true);
+        String methodName = "valueBlockPositionObjects";
+        verifyAllAdaptations(actualConvention, methodName, RETURN_TYPE, OBJECTS_ARGUMENT_TYPES);
+    }
+
+    @Test
+    public void testAdaptFromValueBlockPositionNotNull()
+            throws Throwable
+    {
+        InvocationConvention actualConvention = new InvocationConvention(
+                nCopies(ARGUMENT_TYPES.size(), VALUE_BLOCK_POSITION_NOT_NULL),
+                FAIL_ON_NULL,
+                false,
+                true);
+        String methodName = "valueBlockPosition";
+        verifyAllAdaptations(actualConvention, methodName, RETURN_TYPE, ARGUMENT_TYPES);
+    }
+
+    @Test
+    public void testAdaptFromValueBlockPositionObjectsNotNull()
+            throws Throwable
+    {
+        InvocationConvention actualConvention = new InvocationConvention(
+                nCopies(OBJECTS_ARGUMENT_TYPES.size(), VALUE_BLOCK_POSITION_NOT_NULL),
+                FAIL_ON_NULL,
+                false,
+                true);
+        String methodName = "valueBlockPositionObjects";
+        verifyAllAdaptations(actualConvention, methodName, RETURN_TYPE, OBJECTS_ARGUMENT_TYPES);
     }
 
     private static void verifyAllAdaptations(
             InvocationConvention actualConvention,
             String methodName,
-            NullAdaptationPolicy nullAdaptationPolicy,
+            Type returnType,
             List<Type> argumentTypes)
             throws Throwable
     {
         MethodType type = methodType(actualConvention.getReturnConvention() == FAIL_ON_NULL ? boolean.class : Boolean.class, toCallArgumentTypes(actualConvention, argumentTypes));
         MethodHandle methodHandle = lookup().findVirtual(Target.class, methodName, type);
-        verifyAllAdaptations(actualConvention, methodHandle, nullAdaptationPolicy, argumentTypes);
+        verifyAllAdaptations(actualConvention, methodHandle, returnType, argumentTypes);
     }
 
     private static void verifyAllAdaptations(
             InvocationConvention actualConvention,
             MethodHandle methodHandle,
-            NullAdaptationPolicy nullAdaptationPolicy,
+            Type returnType,
             List<Type> argumentTypes)
             throws Throwable
     {
         List<List<InvocationArgumentConvention>> allArgumentConventions = allCombinations(
-                ImmutableList.of(NEVER_NULL, BOXED_NULLABLE, NULL_FLAG, BLOCK_POSITION, IN_OUT),
+                ImmutableList.of(NEVER_NULL, BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION_NOT_NULL, BOXED_NULLABLE, NULL_FLAG, BLOCK_POSITION, VALUE_BLOCK_POSITION, FLAT, IN_OUT),
                 argumentTypes.size());
         for (List<InvocationArgumentConvention> argumentConventions : allArgumentConventions) {
             for (InvocationReturnConvention returnConvention : InvocationReturnConvention.values()) {
@@ -193,7 +287,8 @@ private static void verifyAllAdaptations(
                         methodHandle,
                         actualConvention,
                         expectedConvention,
-                        nullAdaptationPolicy, argumentTypes);
+                        returnType,
+                        argumentTypes);
             }
         }
     }
@@ -202,27 +297,32 @@ private static void adaptAndVerify(
             MethodHandle methodHandle,
             InvocationConvention actualConvention,
             InvocationConvention expectedConvention,
-            NullAdaptationPolicy nullAdaptationPolicy,
+            Type returnType,
             List<Type> argumentTypes)
             throws Throwable
     {
-        ScalarFunctionAdapter scalarFunctionAdapter = new ScalarFunctionAdapter(nullAdaptationPolicy);
-        MethodHandle adaptedMethodHandle = null;
+        MethodHandle adaptedMethodHandle;
         try {
-            adaptedMethodHandle = scalarFunctionAdapter.adapt(
+            adaptedMethodHandle = ScalarFunctionAdapter.adapt(
                     methodHandle,
+                    returnType,
                     argumentTypes,
                     actualConvention,
                     expectedConvention);
-            assertTrue(scalarFunctionAdapter.canAdapt(actualConvention, expectedConvention));
+            assertThat(ScalarFunctionAdapter.canAdapt(actualConvention, expectedConvention)).isTrue();
         }
         catch (IllegalArgumentException e) {
-            assertFalse(scalarFunctionAdapter.canAdapt(actualConvention, expectedConvention));
-            assertTrue(nullAdaptationPolicy == UNSUPPORTED || (nullAdaptationPolicy == RETURN_NULL_ON_NULL && expectedConvention.getReturnConvention() == FAIL_ON_NULL));
-            if (hasNullableToNoNullableAdaptation(actualConvention, expectedConvention)) {
-                return;
+            if (!ScalarFunctionAdapter.canAdapt(actualConvention, expectedConvention)) {
+                if (hasNullableToNoNullableAdaptation(actualConvention, expectedConvention)) {
+                    assertThat(expectedConvention.getReturnConvention() == FAIL_ON_NULL || expectedConvention.getReturnConvention() == FLAT_RETURN).isTrue();
+                    return;
+                }
+                if (actualConvention.getArgumentConventions().stream()
+                        .anyMatch(convention -> EnumSet.of(BLOCK_POSITION, BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION, VALUE_BLOCK_POSITION_NOT_NULL).contains(convention))) {
+                    return;
+                }
             }
-            fail("Adaptation failed but no illegal conversions found", e);
+            throw new AssertionError("Adaptation failed but no illegal conversions found", e);
         }
 
         InvocationConvention newCallingConvention = new InvocationConvention(
@@ -234,7 +334,9 @@ private static void adaptAndVerify(
         // crete an exact invoker to the handle, so we can use object invoke interface without type coercion concerns
         MethodHandle exactInvoker = MethodHandles.exactInvoker(adaptedMethodHandle.type())
                 .bindTo(adaptedMethodHandle);
-        exactInvoker = MethodHandles.explicitCastArguments(exactInvoker, exactInvoker.type().changeReturnType(Boolean.class));
+        if (expectedConvention.getReturnConvention() != BLOCK_BUILDER) {
+            exactInvoker = MethodHandles.explicitCastArguments(exactInvoker, exactInvoker.type().changeReturnType(Boolean.class));
+        }
 
         // try all combinations of null and not null arguments
         for (int notNullMask = 0; notNullMask < (1 << actualConvention.getArgumentConventions().size()); notNullMask++) {
@@ -245,25 +347,32 @@ private static void adaptAndVerify(
             Target target = new Target();
             List<Object> argumentValues = toCallArgumentValues(newCallingConvention, nullArguments, target, argumentTypes);
             try {
-                Boolean result = (Boolean) exactInvoker.invokeWithArguments(argumentValues);
-                if (result == null) {
-                    assertEquals(nullAdaptationPolicy, RETURN_NULL_ON_NULL);
+                boolean expectNull = expectNullReturn(actualConvention, nullArguments);
+                if (expectedConvention.getReturnConvention() == BLOCK_BUILDER) {
+                    BlockBuilder blockBuilder = returnType.createBlockBuilder(null, 1);
+                    argumentValues.add(blockBuilder);
+                    exactInvoker.invokeWithArguments(argumentValues);
+                    Block result = blockBuilder.build();
+                    assertThat(result.getPositionCount()).isEqualTo(1);
+                    assertThat(result.isNull(0)).isEqualTo(expectNull);
+                    if (!expectNull) {
+                        assertThat(BOOLEAN.getBoolean(result, 0)).isTrue();
+                    }
+                    return;
                 }
-                else {
-                    assertTrue(result);
+
+                Boolean result = (Boolean) exactInvoker.invokeWithArguments(argumentValues);
+                switch (expectedConvention.getReturnConvention()) {
+                    case FAIL_ON_NULL -> assertThat(result).isTrue();
+                    case DEFAULT_ON_NULL -> assertThat(result).isEqualTo((Boolean) !expectNull);
+                    case NULLABLE_RETURN -> assertThat(result).isEqualTo(!expectNull ? true : null);
+                    default -> throw new UnsupportedOperationException();
                 }
             }
             catch (TrinoException trinoException) {
-                if (nullAdaptationPolicy == UNSUPPORTED) {
-                    // never null is allowed to be converted to block and position, but will throw if value is null
-                    assertTrue(hasNullBlockAndPositionToNeverNullArgument(actualConvention, expectedConvention, nullArguments));
-                }
-                else {
-                    assertTrue(nullAdaptationPolicy == THROW_ON_NULL || nullAdaptationPolicy == RETURN_NULL_ON_NULL);
-                }
-                assertEquals(trinoException.getErrorCode(), INVALID_FUNCTION_ARGUMENT.toErrorCode());
+                assertThat(trinoException.getErrorCode()).isEqualTo(INVALID_FUNCTION_ARGUMENT.toErrorCode());
             }
-            target.verify(actualConvention, nullArguments, nullAdaptationPolicy, argumentTypes);
+            target.verify(actualConvention, nullArguments, argumentTypes);
         }
     }
 
@@ -281,25 +390,31 @@ private static boolean hasNullableToNoNullableAdaptation(InvocationConvention ac
                 return true;
             }
         }
+        if (actualConvention.getReturnConvention() != expectedConvention.getReturnConvention()) {
+            if (expectedConvention.getReturnConvention() == FLAT_RETURN) {
+                // Flat return can not be adapted
+                return true;
+            }
+        }
         return false;
     }
 
     private static boolean canCallConventionWithNullArguments(InvocationConvention convention, BitSet nullArguments)
     {
         for (int i = 0; i < convention.getArgumentConventions().size(); i++) {
-            if (nullArguments.get(i) && convention.getArgumentConvention(i) == NEVER_NULL) {
+            InvocationArgumentConvention argumentConvention = convention.getArgumentConvention(i);
+            if (nullArguments.get(i) && EnumSet.of(NEVER_NULL, BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION_NOT_NULL, FLAT).contains(argumentConvention)) {
                 return false;
             }
         }
         return true;
     }
 
-    private static boolean hasNullBlockAndPositionToNeverNullArgument(InvocationConvention actualConvention, InvocationConvention expectedConvention, BitSet nullArguments)
+    private static boolean expectNullReturn(InvocationConvention convention, BitSet nullArguments)
     {
-        for (int i = 0; i < actualConvention.getArgumentConventions().size(); i++) {
-            InvocationArgumentConvention argumentConvention = actualConvention.getArgumentConvention(i);
-            InvocationArgumentConvention expectedArgumentConvention = expectedConvention.getArgumentConvention(i);
-            if (nullArguments.get(i) && argumentConvention == NEVER_NULL && (expectedArgumentConvention == BLOCK_POSITION || expectedArgumentConvention == IN_OUT)) {
+        for (int i = 0; i < convention.getArgumentConventions().size(); i++) {
+            InvocationArgumentConvention argumentConvention = convention.getArgumentConvention(i);
+            if (nullArguments.get(i) && !argumentConvention.isNullable()) {
                 return true;
             }
         }
@@ -317,31 +432,35 @@ private static List<Class<?>> toCallArgumentTypes(InvocationConvention callingCo
                 javaType = Object.class;
             }
             switch (argumentConvention) {
-                case NEVER_NULL:
-                    expectedArguments.add(javaType);
-                    break;
-                case BOXED_NULLABLE:
-                    expectedArguments.add(Primitives.wrap(javaType));
-                    break;
-                case NULL_FLAG:
+                case NEVER_NULL -> expectedArguments.add(javaType);
+                case BOXED_NULLABLE -> expectedArguments.add(Primitives.wrap(javaType));
+                case NULL_FLAG -> {
                     expectedArguments.add(javaType);
                     expectedArguments.add(boolean.class);
-                    break;
-                case BLOCK_POSITION:
+                }
+                case BLOCK_POSITION_NOT_NULL, BLOCK_POSITION -> {
                     expectedArguments.add(Block.class);
                     expectedArguments.add(int.class);
-                    break;
-                case IN_OUT:
-                    expectedArguments.add(InOut.class);
-                    break;
-                default:
-                    throw new IllegalArgumentException("Unsupported argument convention: " + argumentConvention);
+                }
+                case VALUE_BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION -> {
+                    expectedArguments.add(argumentType.getValueBlockType());
+                    expectedArguments.add(int.class);
+                }
+                case FLAT -> {
+                    expectedArguments.add(Slice.class);
+                    expectedArguments.add(int.class);
+                    expectedArguments.add(Slice.class);
+                    expectedArguments.add(int.class);
+                }
+                case IN_OUT -> expectedArguments.add(InOut.class);
+                default -> throw new IllegalArgumentException("Unsupported argument convention: " + argumentConvention);
             }
         }
         return expectedArguments;
     }
 
     private static List<Object> toCallArgumentValues(InvocationConvention callingConvention, BitSet nullArguments, Target target, List<Type> argumentTypes)
+            throws Throwable
     {
         List<Object> callArguments = new ArrayList<>();
         callArguments.add(target);
@@ -359,31 +478,60 @@ private static List<Object> toCallArgumentValues(InvocationConvention callingCon
 
             InvocationArgumentConvention argumentConvention = callingConvention.getArgumentConvention(i);
             switch (argumentConvention) {
-                case NEVER_NULL:
+                case NEVER_NULL -> {
                     verify(testValue != null, "null can not be passed to a never null argument");
                     callArguments.add(testValue);
-                    break;
-                case BOXED_NULLABLE:
-                    callArguments.add(testValue);
-                    break;
-                case NULL_FLAG:
+                }
+                case BOXED_NULLABLE -> callArguments.add(testValue);
+                case NULL_FLAG -> {
                     callArguments.add(testValue == null ? Defaults.defaultValue(argumentType.getJavaType()) : testValue);
                     callArguments.add(testValue == null);
-                    break;
-                case BLOCK_POSITION:
+                }
+                case BLOCK_POSITION_NOT_NULL, VALUE_BLOCK_POSITION_NOT_NULL -> {
+                    verify(testValue != null, "null cannot be passed to a block positions not null argument");
                     BlockBuilder blockBuilder = argumentType.createBlockBuilder(null, 3);
                     blockBuilder.appendNull();
                     writeNativeValue(argumentType, blockBuilder, testValue);
                     blockBuilder.appendNull();
-
-                    callArguments.add(blockBuilder.build());
+                    if (argumentConvention == BLOCK_POSITION_NOT_NULL) {
+                        callArguments.add(blockBuilder.build());
+                    }
+                    else {
+                        callArguments.add(blockBuilder.buildValueBlock());
+                    }
                     callArguments.add(1);
-                    break;
-                case IN_OUT:
-                    callArguments.add(new TestingInOut(argumentType, testValue));
-                    break;
-                default:
-                    throw new IllegalArgumentException("Unsupported argument convention: " + argumentConvention);
+                }
+                case BLOCK_POSITION, VALUE_BLOCK_POSITION -> {
+                    BlockBuilder blockBuilder = argumentType.createBlockBuilder(null, 3);
+                    blockBuilder.appendNull();
+                    writeNativeValue(argumentType, blockBuilder, testValue);
+                    blockBuilder.appendNull();
+                    if (argumentConvention == BLOCK_POSITION) {
+                        callArguments.add(blockBuilder.build());
+                    }
+                    else {
+                        callArguments.add(blockBuilder.buildValueBlock());
+                    }
+                    callArguments.add(1);
+                }
+                case FLAT -> {
+                    verify(testValue != null, "null cannot be passed to a flat argument");
+                    BlockBuilder blockBuilder = argumentType.createBlockBuilder(null, 3);
+                    writeNativeValue(argumentType, blockBuilder, testValue);
+                    Block block = blockBuilder.build();
+
+                    byte[] fixedSlice = new byte[argumentType.getFlatFixedSize()];
+                    int variableWidthLength = argumentType.getFlatVariableWidthSize(block, 0);
+                    byte[] variableSlice = new byte[variableWidthLength];
+                    MethodHandle writeFlat = TYPE_OPERATORS.getReadValueOperator(argumentType, simpleConvention(FLAT_RETURN, BLOCK_POSITION));
+                    writeFlat.invokeExact(block, 0, fixedSlice, 0, variableSlice, 0);
+
+                    callArguments.add(fixedSlice);
+                    callArguments.add(0);
+                    callArguments.add(variableSlice);
+                }
+                case IN_OUT -> callArguments.add(new TestingInOut(argumentType, testValue));
+                default -> throw new IllegalArgumentException("Unsupported argument convention: " + argumentConvention);
             }
         }
         return callArguments;
@@ -407,9 +555,9 @@ private static Object getTestValue(Type argumentType)
         if (argumentType.equals(ARRAY_TYPE)) {
             BlockBuilder blockBuilder = BIGINT.createBlockBuilder(null, 4);
             blockBuilder.appendNull();
-            blockBuilder.writeLong(99);
+            BIGINT.writeLong(blockBuilder, 99);
             blockBuilder.appendNull();
-            blockBuilder.writeLong(100);
+            BIGINT.writeLong(blockBuilder, 100);
             return blockBuilder.build();
         }
         if (argumentType.equals(CHAR_TYPE)) {
@@ -447,28 +595,26 @@ private static class Target
     {
         private boolean invoked;
         private boolean objectsMethod;
-        private Boolean booleanValue;
-        private Long longValue;
         private Double doubleValue;
         private Slice sliceValue;
         private Block blockValue;
         private Object objectCharValue;
         private Object objectTimestampValue;
 
-        public boolean neverNull(boolean booleanValue, long longValue, double doubleValue, Slice sliceValue, Block blockValue)
+        @SuppressWarnings("unused")
+        public boolean neverNull(double doubleValue, Slice sliceValue, Block blockValue)
         {
             checkState(!invoked, "Already invoked");
             invoked = true;
             objectsMethod = false;
 
-            this.booleanValue = booleanValue;
-            this.longValue = longValue;
             this.doubleValue = doubleValue;
             this.sliceValue = sliceValue;
             this.blockValue = blockValue;
             return true;
         }
 
+        @SuppressWarnings("unused")
         public boolean neverNullObjects(Slice sliceValue, Block blockValue, Object objectCharValue, Object objectTimestampValue)
         {
             checkState(!invoked, "Already invoked");
@@ -482,20 +628,20 @@ public boolean neverNullObjects(Slice sliceValue, Block blockValue, Object objec
             return true;
         }
 
-        public boolean boxedNull(Boolean booleanValue, Long longValue, Double doubleValue, Slice sliceValue, Block blockValue)
+        @SuppressWarnings("unused")
+        public boolean boxedNull(Double doubleValue, Slice sliceValue, Block blockValue)
         {
             checkState(!invoked, "Already invoked");
             invoked = true;
             objectsMethod = false;
 
-            this.booleanValue = booleanValue;
-            this.longValue = longValue;
             this.doubleValue = doubleValue;
             this.sliceValue = sliceValue;
             this.blockValue = blockValue;
             return true;
         }
 
+        @SuppressWarnings("unused")
         public boolean boxedNullObjects(Slice sliceValue, Block blockValue, Object objectCharValue, Object objectTimestampValue)
         {
             checkState(!invoked, "Already invoked");
@@ -509,9 +655,8 @@ public boolean boxedNullObjects(Slice sliceValue, Block blockValue, Object objec
             return true;
         }
 
+        @SuppressWarnings("unused")
         public boolean nullFlag(
-                boolean booleanValue, boolean booleanNull,
-                long longValue, boolean longNull,
                 double doubleValue, boolean doubleNull,
                 Slice sliceValue, boolean sliceNull,
                 Block blockValue, boolean blockNull)
@@ -520,24 +665,8 @@ public boolean nullFlag(
             invoked = true;
             objectsMethod = false;
 
-            if (booleanNull) {
-                assertFalse(booleanValue);
-                this.booleanValue = null;
-            }
-            else {
-                this.booleanValue = booleanValue;
-            }
-
-            if (longNull) {
-                assertEquals(longValue, 0);
-                this.longValue = null;
-            }
-            else {
-                this.longValue = longValue;
-            }
-
             if (doubleNull) {
-                assertEquals(doubleValue, 0.0);
+                assertThat(doubleValue).isEqualTo(0.0);
                 this.doubleValue = null;
             }
             else {
@@ -545,7 +674,7 @@ public boolean nullFlag(
             }
 
             if (sliceNull) {
-                assertNull(sliceValue);
+                assertThat(sliceValue).isNull();
                 this.sliceValue = null;
             }
             else {
@@ -553,7 +682,7 @@ public boolean nullFlag(
             }
 
             if (blockNull) {
-                assertNull(blockValue);
+                assertThat(blockValue).isNull();
                 this.blockValue = null;
             }
             else {
@@ -562,6 +691,7 @@ public boolean nullFlag(
             return true;
         }
 
+        @SuppressWarnings("unused")
         public boolean nullFlagObjects(
                 Slice sliceValue, boolean sliceNull,
                 Block blockValue, boolean blockNull,
@@ -573,7 +703,7 @@ public boolean nullFlagObjects(
             objectsMethod = true;
 
             if (sliceNull) {
-                assertNull(sliceValue);
+                assertThat(sliceValue).isNull();
                 this.sliceValue = null;
             }
             else {
@@ -581,7 +711,7 @@ public boolean nullFlagObjects(
             }
 
             if (blockNull) {
-                assertNull(blockValue);
+                assertThat(blockValue).isNull();
                 this.blockValue = null;
             }
             else {
@@ -589,7 +719,7 @@ public boolean nullFlagObjects(
             }
 
             if (objectCharNull) {
-                assertNull(objectCharValue);
+                assertThat(objectCharValue).isNull();
                 this.objectCharValue = null;
             }
             else {
@@ -597,7 +727,7 @@ public boolean nullFlagObjects(
             }
 
             if (objectTimestampNull) {
-                assertNull(objectTimestampValue);
+                assertThat(objectTimestampValue).isNull();
                 this.objectTimestampValue = null;
             }
             else {
@@ -606,20 +736,167 @@ public boolean nullFlagObjects(
             return true;
         }
 
+        @SuppressWarnings("unused")
+        public boolean blockPosition(
+                Block doubleBlock, int doublePosition,
+                Block sliceBlock, int slicePosition,
+                Block blockBlock, int blockPosition)
+        {
+            checkState(!invoked, "Already invoked");
+            invoked = true;
+            objectsMethod = false;
+
+            if (doubleBlock.isNull(doublePosition)) {
+                this.doubleValue = null;
+            }
+            else {
+                this.doubleValue = DOUBLE.getDouble(doubleBlock, doublePosition);
+            }
+
+            if (sliceBlock.isNull(slicePosition)) {
+                this.sliceValue = null;
+            }
+            else {
+                this.sliceValue = VARCHAR.getSlice(sliceBlock, slicePosition);
+            }
+
+            if (blockBlock.isNull(blockPosition)) {
+                this.blockValue = null;
+            }
+            else {
+                this.blockValue = ARRAY_TYPE.getObject(blockBlock, blockPosition);
+            }
+            return true;
+        }
+
+        @SuppressWarnings("unused")
+        public boolean blockPositionObjects(
+                Block sliceBlock, int slicePosition,
+                Block blockBlock, int blockPosition,
+                Block objectCharBlock, int objectCharPosition,
+                Block objectTimestampBlock, int objectTimestampPosition)
+        {
+            checkState(!invoked, "Already invoked");
+            invoked = true;
+            objectsMethod = true;
+
+            if (sliceBlock.isNull(slicePosition)) {
+                this.sliceValue = null;
+            }
+            else {
+                this.sliceValue = VARCHAR.getSlice(sliceBlock, slicePosition);
+            }
+
+            if (blockBlock.isNull(blockPosition)) {
+                this.blockValue = null;
+            }
+            else {
+                this.blockValue = ARRAY_TYPE.getObject(blockBlock, blockPosition);
+            }
+
+            if (objectCharBlock.isNull(objectCharPosition)) {
+                this.objectCharValue = null;
+            }
+            else {
+                this.objectCharValue = CHAR_TYPE.getObject(objectCharBlock, objectCharPosition);
+            }
+
+            if (objectTimestampBlock.isNull(objectTimestampPosition)) {
+                this.objectTimestampValue = null;
+            }
+            else {
+                this.objectTimestampValue = TIMESTAMP_TYPE.getObject(objectTimestampBlock, objectTimestampPosition);
+            }
+            return true;
+        }
+
+        @SuppressWarnings("unused")
+        public boolean valueBlockPosition(
+                LongArrayBlock doubleBlock, int doublePosition,
+                VariableWidthBlock sliceBlock, int slicePosition,
+                ArrayBlock blockBlock, int blockPosition)
+        {
+            checkState(!invoked, "Already invoked");
+            invoked = true;
+            objectsMethod = false;
+
+            if (doubleBlock.isNull(doublePosition)) {
+                this.doubleValue = null;
+            }
+            else {
+                this.doubleValue = DOUBLE.getDouble(doubleBlock, doublePosition);
+            }
+
+            if (sliceBlock.isNull(slicePosition)) {
+                this.sliceValue = null;
+            }
+            else {
+                this.sliceValue = VARCHAR.getSlice(sliceBlock, slicePosition);
+            }
+
+            if (blockBlock.isNull(blockPosition)) {
+                this.blockValue = null;
+            }
+            else {
+                this.blockValue = ARRAY_TYPE.getObject(blockBlock, blockPosition);
+            }
+            return true;
+        }
+
+        @SuppressWarnings("unused")
+        public boolean valueBlockPositionObjects(
+                VariableWidthBlock sliceBlock, int slicePosition,
+                ArrayBlock blockBlock, int blockPosition,
+                VariableWidthBlock objectCharBlock, int objectCharPosition,
+                Fixed12Block objectTimestampBlock, int objectTimestampPosition)
+        {
+            checkState(!invoked, "Already invoked");
+            invoked = true;
+            objectsMethod = true;
+
+            if (sliceBlock.isNull(slicePosition)) {
+                this.sliceValue = null;
+            }
+            else {
+                this.sliceValue = VARCHAR.getSlice(sliceBlock, slicePosition);
+            }
+
+            if (blockBlock.isNull(blockPosition)) {
+                this.blockValue = null;
+            }
+            else {
+                this.blockValue = ARRAY_TYPE.getObject(blockBlock, blockPosition);
+            }
+
+            if (objectCharBlock.isNull(objectCharPosition)) {
+                this.objectCharValue = null;
+            }
+            else {
+                this.objectCharValue = CHAR_TYPE.getObject(objectCharBlock, objectCharPosition);
+            }
+
+            if (objectTimestampBlock.isNull(objectTimestampPosition)) {
+                this.objectTimestampValue = null;
+            }
+            else {
+                this.objectTimestampValue = TIMESTAMP_TYPE.getObject(objectTimestampBlock, objectTimestampPosition);
+            }
+            return true;
+        }
+
         public void verify(
                 InvocationConvention actualConvention,
                 BitSet nullArguments,
-                NullAdaptationPolicy nullAdaptationPolicy,
                 List<Type> argumentTypes)
         {
-            if (shouldFunctionBeInvoked(actualConvention, nullArguments, nullAdaptationPolicy)) {
-                assertTrue(invoked, "function not invoked");
+            if (shouldFunctionBeInvoked(actualConvention, nullArguments)) {
+                assertThat(invoked)
+                        .describedAs("function not invoked")
+                        .isTrue();
                 if (!objectsMethod) {
-                    assertArgumentValue(this.booleanValue, 0, actualConvention, nullArguments, argumentTypes);
-                    assertArgumentValue(this.longValue, 1, actualConvention, nullArguments, argumentTypes);
-                    assertArgumentValue(this.doubleValue, 2, actualConvention, nullArguments, argumentTypes);
-                    assertArgumentValue(this.sliceValue, 3, actualConvention, nullArguments, argumentTypes);
-                    assertArgumentValue(this.blockValue, 4, actualConvention, nullArguments, argumentTypes);
+                    assertArgumentValue(this.doubleValue, 0, actualConvention, nullArguments, argumentTypes);
+                    assertArgumentValue(this.sliceValue, 1, actualConvention, nullArguments, argumentTypes);
+                    assertArgumentValue(this.blockValue, 2, actualConvention, nullArguments, argumentTypes);
                 }
                 else {
                     assertArgumentValue(this.sliceValue, 0, actualConvention, nullArguments, argumentTypes);
@@ -629,20 +906,18 @@ public void verify(
                 }
             }
             else {
-                assertFalse(invoked, "Function should not be invoked when null is passed to a NEVER_NULL argument and adaptation is " + nullAdaptationPolicy);
-                assertNull(this.booleanValue);
-                assertNull(this.longValue);
-                assertNull(this.doubleValue);
-                assertNull(this.sliceValue);
-                assertNull(this.blockValue);
-                assertNull(this.objectCharValue);
-                assertNull(this.objectTimestampValue);
+                assertThat(invoked)
+                        .describedAs("Function should not be invoked when null is passed to a NEVER_NULL argument")
+                        .isFalse();
+                assertThat(this.doubleValue).isNull();
+                assertThat(this.sliceValue).isNull();
+                assertThat(this.blockValue).isNull();
+                assertThat(this.objectCharValue).isNull();
+                assertThat(this.objectTimestampValue).isNull();
             }
 
             this.invoked = false;
             this.objectsMethod = false;
-            this.booleanValue = null;
-            this.longValue = null;
             this.doubleValue = null;
             this.sliceValue = null;
             this.blockValue = null;
@@ -650,14 +925,11 @@ public void verify(
             this.objectTimestampValue = null;
         }
 
-        private static boolean shouldFunctionBeInvoked(InvocationConvention actualConvention, BitSet nullArguments, NullAdaptationPolicy nullAdaptationPolicy)
+        private static boolean shouldFunctionBeInvoked(InvocationConvention actualConvention, BitSet nullArguments)
         {
-            if (nullAdaptationPolicy == UNDEFINED_VALUE_FOR_NULL) {
-                return true;
-            }
-
             for (int i = 0; i < actualConvention.getArgumentConventions().size(); i++) {
-                if (actualConvention.getArgumentConvention(i) == NEVER_NULL && nullArguments.get(i)) {
+                InvocationArgumentConvention argumentConvention = actualConvention.getArgumentConvention(i);
+                if ((argumentConvention == NEVER_NULL || argumentConvention == BLOCK_POSITION_NOT_NULL || argumentConvention == VALUE_BLOCK_POSITION_NOT_NULL || argumentConvention == FLAT) && nullArguments.get(i)) {
                     return false;
                 }
             }
@@ -685,13 +957,13 @@ private static void assertArgumentValue(
                 return;
             }
 
-            if (argumentConvention != NEVER_NULL) {
-                assertNull(actualValue);
+            if (argumentConvention != NEVER_NULL && argumentConvention != FLAT) {
+                assertThat(actualValue).isNull();
                 return;
             }
 
             // the only way for a never null to be called with a null is for the undefined value null convention
-            // Currently, for primitives, the value is the java default, but for all other types it could be anything
+            // Currently, for primitives, the value is the java default, but for all other types it could be any value
             if (argumentType.getJavaType().isPrimitive()) {
                 assertArgumentValue(actualValue, Defaults.defaultValue(argumentType.getJavaType()));
             }
@@ -703,14 +975,14 @@ private static void assertArgumentValue(Object actual, Object expected)
                 assertBlockEquals(BIGINT, (Block) actual, (Block) expected);
             }
             else {
-                assertEquals(actual, expected);
+                assertThat(actual).isEqualTo(expected);
             }
         }
 
         private static void assertBlockEquals(Type type, Block actual, Block expected)
         {
             for (int position = 0; position < actual.getPositionCount(); position++) {
-                assertEquals(type.getObjectValue(SESSION, actual, position), type.getObjectValue(SESSION, expected, position));
+                assertThat(type.getObjectValue(SESSION, actual, position)).isEqualTo(type.getObjectValue(SESSION, expected, position));
             }
         }
     }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/predicate/BenchmarkSortedRangeSet.java b/core/trino-spi/src/test/java/io/trino/spi/predicate/BenchmarkSortedRangeSet.java
index 8f565b9d2898..e6837427da80 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/predicate/BenchmarkSortedRangeSet.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/predicate/BenchmarkSortedRangeSet.java
@@ -13,6 +13,7 @@
  */
 package io.trino.spi.predicate;
 
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -25,7 +26,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -239,7 +239,7 @@ public void init()
         {
             ranges = new ArrayList<>();
 
-            int factor = 0;
+            long factor = 0;
             for (int i = 0; i < 10_000; i++) {
                 long from = ThreadLocalRandom.current().nextLong(100) + factor * 100;
                 long to = ThreadLocalRandom.current().nextLong(100) + (factor + 1) * 100;
diff --git a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestAllOrNoneValueSet.java b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestAllOrNoneValueSet.java
index 2d21ce937f48..809e16408556 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestAllOrNoneValueSet.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestAllOrNoneValueSet.java
@@ -20,7 +20,7 @@
 import io.trino.spi.type.TestingTypeDeserializer;
 import io.trino.spi.type.TestingTypeManager;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -29,9 +29,6 @@
 import static io.trino.spi.type.HyperLogLogType.HYPER_LOG_LOG;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
 public class TestAllOrNoneValueSet
 {
@@ -39,11 +36,11 @@ public class TestAllOrNoneValueSet
     public void testAll()
     {
         AllOrNoneValueSet valueSet = AllOrNoneValueSet.all(HYPER_LOG_LOG);
-        assertEquals(valueSet.getType(), HYPER_LOG_LOG);
-        assertFalse(valueSet.isNone());
-        assertTrue(valueSet.isAll());
-        assertFalse(valueSet.isSingleValue());
-        assertTrue(valueSet.containsValue(Slices.EMPTY_SLICE));
+        assertThat(valueSet.getType()).isEqualTo(HYPER_LOG_LOG);
+        assertThat(valueSet.isNone()).isFalse();
+        assertThat(valueSet.isAll()).isTrue();
+        assertThat(valueSet.isSingleValue()).isFalse();
+        assertThat(valueSet.containsValue(Slices.EMPTY_SLICE)).isTrue();
 
         assertThatThrownBy(valueSet::getSingleValue)
                 .isInstanceOf(UnsupportedOperationException.class);
@@ -53,11 +50,11 @@ public void testAll()
     public void testNone()
     {
         AllOrNoneValueSet valueSet = AllOrNoneValueSet.none(HYPER_LOG_LOG);
-        assertEquals(valueSet.getType(), HYPER_LOG_LOG);
-        assertTrue(valueSet.isNone());
-        assertFalse(valueSet.isAll());
-        assertFalse(valueSet.isSingleValue());
-        assertFalse(valueSet.containsValue(Slices.EMPTY_SLICE));
+        assertThat(valueSet.getType()).isEqualTo(HYPER_LOG_LOG);
+        assertThat(valueSet.isNone()).isTrue();
+        assertThat(valueSet.isAll()).isFalse();
+        assertThat(valueSet.isSingleValue()).isFalse();
+        assertThat(valueSet.containsValue(Slices.EMPTY_SLICE)).isFalse();
 
         assertThatThrownBy(valueSet::getSingleValue)
                 .isInstanceOf(UnsupportedOperationException.class);
@@ -69,10 +66,10 @@ public void testIntersect()
         AllOrNoneValueSet all = AllOrNoneValueSet.all(HYPER_LOG_LOG);
         AllOrNoneValueSet none = AllOrNoneValueSet.none(HYPER_LOG_LOG);
 
-        assertEquals(all.intersect(all), all);
-        assertEquals(all.intersect(none), none);
-        assertEquals(none.intersect(all), none);
-        assertEquals(none.intersect(none), none);
+        assertThat(all.intersect(all)).isEqualTo(all);
+        assertThat(all.intersect(none)).isEqualTo(none);
+        assertThat(none.intersect(all)).isEqualTo(none);
+        assertThat(none.intersect(none)).isEqualTo(none);
     }
 
     @Test
@@ -81,10 +78,10 @@ public void testUnion()
         AllOrNoneValueSet all = AllOrNoneValueSet.all(HYPER_LOG_LOG);
         AllOrNoneValueSet none = AllOrNoneValueSet.none(HYPER_LOG_LOG);
 
-        assertEquals(all.union(all), all);
-        assertEquals(all.union(none), all);
-        assertEquals(none.union(all), all);
-        assertEquals(none.union(none), none);
+        assertThat(all.union(all)).isEqualTo(all);
+        assertThat(all.union(none)).isEqualTo(all);
+        assertThat(none.union(all)).isEqualTo(all);
+        assertThat(none.union(none)).isEqualTo(none);
     }
 
     @Test
@@ -93,8 +90,8 @@ public void testComplement()
         AllOrNoneValueSet all = AllOrNoneValueSet.all(HYPER_LOG_LOG);
         AllOrNoneValueSet none = AllOrNoneValueSet.none(HYPER_LOG_LOG);
 
-        assertEquals(all.complement(), none);
-        assertEquals(none.complement(), all);
+        assertThat(all.complement()).isEqualTo(none);
+        assertThat(none.complement()).isEqualTo(all);
     }
 
     @Test
@@ -103,10 +100,10 @@ public void testOverlaps()
         AllOrNoneValueSet all = AllOrNoneValueSet.all(HYPER_LOG_LOG);
         AllOrNoneValueSet none = AllOrNoneValueSet.none(HYPER_LOG_LOG);
 
-        assertTrue(all.overlaps(all));
-        assertFalse(all.overlaps(none));
-        assertFalse(none.overlaps(all));
-        assertFalse(none.overlaps(none));
+        assertThat(all.overlaps(all)).isTrue();
+        assertThat(all.overlaps(none)).isFalse();
+        assertThat(none.overlaps(all)).isFalse();
+        assertThat(none.overlaps(none)).isFalse();
     }
 
     @Test
@@ -115,10 +112,10 @@ public void testSubtract()
         AllOrNoneValueSet all = AllOrNoneValueSet.all(HYPER_LOG_LOG);
         AllOrNoneValueSet none = AllOrNoneValueSet.none(HYPER_LOG_LOG);
 
-        assertEquals(all.subtract(all), none);
-        assertEquals(all.subtract(none), all);
-        assertEquals(none.subtract(all), none);
-        assertEquals(none.subtract(none), none);
+        assertThat(all.subtract(all)).isEqualTo(none);
+        assertThat(all.subtract(none)).isEqualTo(all);
+        assertThat(none.subtract(all)).isEqualTo(none);
+        assertThat(none.subtract(none)).isEqualTo(none);
     }
 
     @Test
@@ -127,17 +124,17 @@ public void testContains()
         AllOrNoneValueSet all = AllOrNoneValueSet.all(HYPER_LOG_LOG);
         AllOrNoneValueSet none = AllOrNoneValueSet.none(HYPER_LOG_LOG);
 
-        assertTrue(all.contains(all));
-        assertTrue(all.contains(none));
-        assertFalse(none.contains(all));
-        assertTrue(none.contains(none));
+        assertThat(all.contains(all)).isTrue();
+        assertThat(all.contains(none)).isTrue();
+        assertThat(none.contains(all)).isFalse();
+        assertThat(none.contains(none)).isTrue();
     }
 
     @Test
     public void testContainsValue()
     {
-        assertTrue(AllOrNoneValueSet.all(BIGINT).containsValue(42L));
-        assertFalse(AllOrNoneValueSet.none(BIGINT).containsValue(42L));
+        assertThat(AllOrNoneValueSet.all(BIGINT).containsValue(42L)).isTrue();
+        assertThat(AllOrNoneValueSet.none(BIGINT).containsValue(42L)).isFalse();
     }
 
     @Test
@@ -150,10 +147,10 @@ public void testJsonSerialization()
                 .registerModule(new SimpleModule().addDeserializer(Type.class, new TestingTypeDeserializer(typeManager)));
 
         AllOrNoneValueSet all = AllOrNoneValueSet.all(HYPER_LOG_LOG);
-        assertEquals(all, mapper.readValue(mapper.writeValueAsString(all), AllOrNoneValueSet.class));
+        assertThat(all).isEqualTo(mapper.readValue(mapper.writeValueAsString(all), AllOrNoneValueSet.class));
 
         AllOrNoneValueSet none = AllOrNoneValueSet.none(HYPER_LOG_LOG);
-        assertEquals(none, mapper.readValue(mapper.writeValueAsString(none), AllOrNoneValueSet.class));
+        assertThat(none).isEqualTo(mapper.readValue(mapper.writeValueAsString(none), AllOrNoneValueSet.class));
     }
 
     @Test
diff --git a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestDomain.java b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestDomain.java
index 5b0203106e7a..f16967352672 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestDomain.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestDomain.java
@@ -24,7 +24,7 @@
 import io.trino.spi.type.TestingTypeDeserializer;
 import io.trino.spi.type.TestingTypeManager;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -35,10 +35,8 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.Double.longBitsToDouble;
 import static java.lang.Float.floatToRawIntBits;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
 public class TestDomain
 {
@@ -46,287 +44,287 @@ public class TestDomain
     public void testOrderableNone()
     {
         Domain domain = Domain.none(BIGINT);
-        assertTrue(domain.isNone());
-        assertFalse(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertFalse(domain.isNullableSingleValue());
-        assertFalse(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.none(BIGINT));
-        assertEquals(domain.getType(), BIGINT);
-        assertFalse(domain.includesNullableValue(Long.MIN_VALUE));
-        assertFalse(domain.includesNullableValue(0L));
-        assertFalse(domain.includesNullableValue(Long.MAX_VALUE));
-        assertFalse(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.all(BIGINT));
-        assertEquals(domain.toString(), "NONE");
+        assertThat(domain.isNone()).isTrue();
+        assertThat(domain.isAll()).isFalse();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isFalse();
+        assertThat(domain.isNullAllowed()).isFalse();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.none(BIGINT));
+        assertThat(domain.getType()).isEqualTo(BIGINT);
+        assertThat(domain.includesNullableValue(Long.MIN_VALUE)).isFalse();
+        assertThat(domain.includesNullableValue(0L)).isFalse();
+        assertThat(domain.includesNullableValue(Long.MAX_VALUE)).isFalse();
+        assertThat(domain.includesNullableValue(null)).isFalse();
+        assertThat(domain.complement()).isEqualTo(Domain.all(BIGINT));
+        assertThat(domain.toString()).isEqualTo("NONE");
     }
 
     @Test
     public void testEquatableNone()
     {
         Domain domain = Domain.none(ID);
-        assertTrue(domain.isNone());
-        assertFalse(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertFalse(domain.isNullableSingleValue());
-        assertFalse(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.none(ID));
-        assertEquals(domain.getType(), ID);
-        assertFalse(domain.includesNullableValue(0L));
-        assertFalse(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.all(ID));
-        assertEquals(domain.toString(), "NONE");
+        assertThat(domain.isNone()).isTrue();
+        assertThat(domain.isAll()).isFalse();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isFalse();
+        assertThat(domain.isNullAllowed()).isFalse();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.none(ID));
+        assertThat(domain.getType()).isEqualTo(ID);
+        assertThat(domain.includesNullableValue(0L)).isFalse();
+        assertThat(domain.includesNullableValue(null)).isFalse();
+        assertThat(domain.complement()).isEqualTo(Domain.all(ID));
+        assertThat(domain.toString()).isEqualTo("NONE");
     }
 
     @Test
     public void testUncomparableNone()
     {
         Domain domain = Domain.none(HYPER_LOG_LOG);
-        assertTrue(domain.isNone());
-        assertFalse(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertFalse(domain.isNullableSingleValue());
-        assertFalse(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.none(HYPER_LOG_LOG));
-        assertEquals(domain.getType(), HYPER_LOG_LOG);
-        assertFalse(domain.includesNullableValue(Slices.EMPTY_SLICE));
-        assertFalse(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.all(HYPER_LOG_LOG));
-        assertEquals(domain.toString(), "NONE");
+        assertThat(domain.isNone()).isTrue();
+        assertThat(domain.isAll()).isFalse();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isFalse();
+        assertThat(domain.isNullAllowed()).isFalse();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.none(HYPER_LOG_LOG));
+        assertThat(domain.getType()).isEqualTo(HYPER_LOG_LOG);
+        assertThat(domain.includesNullableValue(Slices.EMPTY_SLICE)).isFalse();
+        assertThat(domain.includesNullableValue(null)).isFalse();
+        assertThat(domain.complement()).isEqualTo(Domain.all(HYPER_LOG_LOG));
+        assertThat(domain.toString()).isEqualTo("NONE");
     }
 
     @Test
     public void testOrderableAll()
     {
         Domain domain = Domain.all(BIGINT);
-        assertFalse(domain.isNone());
-        assertTrue(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertFalse(domain.isNullableSingleValue());
-        assertFalse(domain.isOnlyNull());
-        assertTrue(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.all(BIGINT));
-        assertEquals(domain.getType(), BIGINT);
-        assertTrue(domain.includesNullableValue(Long.MIN_VALUE));
-        assertTrue(domain.includesNullableValue(0L));
-        assertTrue(domain.includesNullableValue(Long.MAX_VALUE));
-        assertTrue(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.none(BIGINT));
-        assertEquals(domain.toString(), "ALL");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isTrue();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isFalse();
+        assertThat(domain.isOnlyNull()).isFalse();
+        assertThat(domain.isNullAllowed()).isTrue();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.all(BIGINT));
+        assertThat(domain.getType()).isEqualTo(BIGINT);
+        assertThat(domain.includesNullableValue(Long.MIN_VALUE)).isTrue();
+        assertThat(domain.includesNullableValue(0L)).isTrue();
+        assertThat(domain.includesNullableValue(Long.MAX_VALUE)).isTrue();
+        assertThat(domain.includesNullableValue(null)).isTrue();
+        assertThat(domain.complement()).isEqualTo(Domain.none(BIGINT));
+        assertThat(domain.toString()).isEqualTo("ALL");
     }
 
     @Test
     public void testFloatingPointOrderableAll()
     {
         Domain domain = Domain.all(REAL);
-        assertFalse(domain.isNone());
-        assertTrue(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertFalse(domain.isNullableSingleValue());
-        assertFalse(domain.isOnlyNull());
-        assertTrue(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.all(REAL));
-        assertEquals(domain.getType(), REAL);
-        assertTrue(domain.includesNullableValue((long) floatToRawIntBits(-Float.MAX_VALUE)));
-        assertTrue(domain.includesNullableValue((long) floatToRawIntBits(0.0f)));
-        assertTrue(domain.includesNullableValue((long) floatToRawIntBits(Float.MAX_VALUE)));
-        assertTrue(domain.includesNullableValue((long) floatToRawIntBits(Float.MIN_VALUE)));
-        assertTrue(domain.includesNullableValue(null));
-        assertTrue(domain.includesNullableValue((long) floatToRawIntBits(Float.NaN)));
-        assertTrue(domain.includesNullableValue((long) 0x7fc01234)); // different NaN representation
-        assertEquals(domain.complement(), Domain.none(REAL));
-        assertEquals(domain.toString(), "ALL");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isTrue();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isFalse();
+        assertThat(domain.isOnlyNull()).isFalse();
+        assertThat(domain.isNullAllowed()).isTrue();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.all(REAL));
+        assertThat(domain.getType()).isEqualTo(REAL);
+        assertThat(domain.includesNullableValue((long) floatToRawIntBits(-Float.MAX_VALUE))).isTrue();
+        assertThat(domain.includesNullableValue((long) floatToRawIntBits(0.0f))).isTrue();
+        assertThat(domain.includesNullableValue((long) floatToRawIntBits(Float.MAX_VALUE))).isTrue();
+        assertThat(domain.includesNullableValue((long) floatToRawIntBits(Float.MIN_VALUE))).isTrue();
+        assertThat(domain.includesNullableValue(null)).isTrue();
+        assertThat(domain.includesNullableValue((long) floatToRawIntBits(Float.NaN))).isTrue();
+        assertThat(domain.includesNullableValue((long) 0x7fc01234)).isTrue(); // different NaN representation
+        assertThat(domain.complement()).isEqualTo(Domain.none(REAL));
+        assertThat(domain.toString()).isEqualTo("ALL");
 
         domain = Domain.all(DOUBLE);
-        assertFalse(domain.isNone());
-        assertTrue(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertFalse(domain.isNullableSingleValue());
-        assertFalse(domain.isOnlyNull());
-        assertTrue(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.all(DOUBLE));
-        assertEquals(domain.getType(), DOUBLE);
-        assertTrue(domain.includesNullableValue(-Double.MAX_VALUE));
-        assertTrue(domain.includesNullableValue(0.0));
-        assertTrue(domain.includesNullableValue(Double.MAX_VALUE));
-        assertTrue(domain.includesNullableValue(Double.MIN_VALUE));
-        assertTrue(domain.includesNullableValue(null));
-        assertTrue(domain.includesNullableValue(Double.NaN));
-        assertTrue(domain.includesNullableValue(longBitsToDouble(0x7ff8123412341234L))); // different NaN representation
-        assertEquals(domain.complement(), Domain.none(DOUBLE));
-        assertEquals(domain.toString(), "ALL");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isTrue();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isFalse();
+        assertThat(domain.isOnlyNull()).isFalse();
+        assertThat(domain.isNullAllowed()).isTrue();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.all(DOUBLE));
+        assertThat(domain.getType()).isEqualTo(DOUBLE);
+        assertThat(domain.includesNullableValue(-Double.MAX_VALUE)).isTrue();
+        assertThat(domain.includesNullableValue(0.0)).isTrue();
+        assertThat(domain.includesNullableValue(Double.MAX_VALUE)).isTrue();
+        assertThat(domain.includesNullableValue(Double.MIN_VALUE)).isTrue();
+        assertThat(domain.includesNullableValue(null)).isTrue();
+        assertThat(domain.includesNullableValue(Double.NaN)).isTrue();
+        assertThat(domain.includesNullableValue(longBitsToDouble(0x7ff8123412341234L))).isTrue(); // different NaN representation
+        assertThat(domain.complement()).isEqualTo(Domain.none(DOUBLE));
+        assertThat(domain.toString()).isEqualTo("ALL");
     }
 
     @Test
     public void testEquatableAll()
     {
         Domain domain = Domain.all(ID);
-        assertFalse(domain.isNone());
-        assertTrue(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertFalse(domain.isNullableSingleValue());
-        assertFalse(domain.isOnlyNull());
-        assertTrue(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.all(ID));
-        assertEquals(domain.getType(), ID);
-        assertTrue(domain.includesNullableValue(0L));
-        assertTrue(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.none(ID));
-        assertEquals(domain.toString(), "ALL");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isTrue();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isFalse();
+        assertThat(domain.isOnlyNull()).isFalse();
+        assertThat(domain.isNullAllowed()).isTrue();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.all(ID));
+        assertThat(domain.getType()).isEqualTo(ID);
+        assertThat(domain.includesNullableValue(0L)).isTrue();
+        assertThat(domain.includesNullableValue(null)).isTrue();
+        assertThat(domain.complement()).isEqualTo(Domain.none(ID));
+        assertThat(domain.toString()).isEqualTo("ALL");
     }
 
     @Test
     public void testUncomparableAll()
     {
         Domain domain = Domain.all(HYPER_LOG_LOG);
-        assertFalse(domain.isNone());
-        assertTrue(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertFalse(domain.isNullableSingleValue());
-        assertFalse(domain.isOnlyNull());
-        assertTrue(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.all(HYPER_LOG_LOG));
-        assertEquals(domain.getType(), HYPER_LOG_LOG);
-        assertTrue(domain.includesNullableValue(Slices.EMPTY_SLICE));
-        assertTrue(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.none(HYPER_LOG_LOG));
-        assertEquals(domain.toString(), "ALL");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isTrue();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isFalse();
+        assertThat(domain.isOnlyNull()).isFalse();
+        assertThat(domain.isNullAllowed()).isTrue();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.all(HYPER_LOG_LOG));
+        assertThat(domain.getType()).isEqualTo(HYPER_LOG_LOG);
+        assertThat(domain.includesNullableValue(Slices.EMPTY_SLICE)).isTrue();
+        assertThat(domain.includesNullableValue(null)).isTrue();
+        assertThat(domain.complement()).isEqualTo(Domain.none(HYPER_LOG_LOG));
+        assertThat(domain.toString()).isEqualTo("ALL");
     }
 
     @Test
     public void testOrderableNullOnly()
     {
         Domain domain = Domain.onlyNull(BIGINT);
-        assertFalse(domain.isNone());
-        assertFalse(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertTrue(domain.isNullAllowed());
-        assertTrue(domain.isNullableSingleValue());
-        assertTrue(domain.isOnlyNull());
-        assertEquals(domain.getValues(), ValueSet.none(BIGINT));
-        assertEquals(domain.getType(), BIGINT);
-        assertFalse(domain.includesNullableValue(Long.MIN_VALUE));
-        assertFalse(domain.includesNullableValue(0L));
-        assertFalse(domain.includesNullableValue(Long.MAX_VALUE));
-        assertTrue(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.notNull(BIGINT));
-        assertEquals(domain.getNullableSingleValue(), null);
-        assertEquals(domain.toString(), "[NULL]");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isFalse();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullAllowed()).isTrue();
+        assertThat(domain.isNullableSingleValue()).isTrue();
+        assertThat(domain.isOnlyNull()).isTrue();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.none(BIGINT));
+        assertThat(domain.getType()).isEqualTo(BIGINT);
+        assertThat(domain.includesNullableValue(Long.MIN_VALUE)).isFalse();
+        assertThat(domain.includesNullableValue(0L)).isFalse();
+        assertThat(domain.includesNullableValue(Long.MAX_VALUE)).isFalse();
+        assertThat(domain.includesNullableValue(null)).isTrue();
+        assertThat(domain.complement()).isEqualTo(Domain.notNull(BIGINT));
+        assertThat(domain.getNullableSingleValue()).isEqualTo(null);
+        assertThat(domain.toString()).isEqualTo("[NULL]");
     }
 
     @Test
     public void testEquatableNullOnly()
     {
         Domain domain = Domain.onlyNull(ID);
-        assertFalse(domain.isNone());
-        assertFalse(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertTrue(domain.isNullableSingleValue());
-        assertTrue(domain.isOnlyNull());
-        assertTrue(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.none(ID));
-        assertEquals(domain.getType(), ID);
-        assertFalse(domain.includesNullableValue(0L));
-        assertTrue(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.notNull(ID));
-        assertEquals(domain.getNullableSingleValue(), null);
-        assertEquals(domain.toString(), "[NULL]");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isFalse();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isTrue();
+        assertThat(domain.isOnlyNull()).isTrue();
+        assertThat(domain.isNullAllowed()).isTrue();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.none(ID));
+        assertThat(domain.getType()).isEqualTo(ID);
+        assertThat(domain.includesNullableValue(0L)).isFalse();
+        assertThat(domain.includesNullableValue(null)).isTrue();
+        assertThat(domain.complement()).isEqualTo(Domain.notNull(ID));
+        assertThat(domain.getNullableSingleValue()).isEqualTo(null);
+        assertThat(domain.toString()).isEqualTo("[NULL]");
     }
 
     @Test
     public void testUncomparableNullOnly()
     {
         Domain domain = Domain.onlyNull(HYPER_LOG_LOG);
-        assertFalse(domain.isNone());
-        assertFalse(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertTrue(domain.isNullableSingleValue());
-        assertTrue(domain.isOnlyNull());
-        assertTrue(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.none(HYPER_LOG_LOG));
-        assertEquals(domain.getType(), HYPER_LOG_LOG);
-        assertFalse(domain.includesNullableValue(Slices.EMPTY_SLICE));
-        assertTrue(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.notNull(HYPER_LOG_LOG));
-        assertEquals(domain.getNullableSingleValue(), null);
-        assertEquals(domain.toString(), "[NULL]");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isFalse();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isTrue();
+        assertThat(domain.isOnlyNull()).isTrue();
+        assertThat(domain.isNullAllowed()).isTrue();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.none(HYPER_LOG_LOG));
+        assertThat(domain.getType()).isEqualTo(HYPER_LOG_LOG);
+        assertThat(domain.includesNullableValue(Slices.EMPTY_SLICE)).isFalse();
+        assertThat(domain.includesNullableValue(null)).isTrue();
+        assertThat(domain.complement()).isEqualTo(Domain.notNull(HYPER_LOG_LOG));
+        assertThat(domain.getNullableSingleValue()).isEqualTo(null);
+        assertThat(domain.toString()).isEqualTo("[NULL]");
     }
 
     @Test
     public void testOrderableNotNull()
     {
         Domain domain = Domain.notNull(BIGINT);
-        assertFalse(domain.isNone());
-        assertFalse(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertFalse(domain.isNullableSingleValue());
-        assertFalse(domain.isOnlyNull());
-        assertFalse(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.all(BIGINT));
-        assertEquals(domain.getType(), BIGINT);
-        assertTrue(domain.includesNullableValue(Long.MIN_VALUE));
-        assertTrue(domain.includesNullableValue(0L));
-        assertTrue(domain.includesNullableValue(Long.MAX_VALUE));
-        assertFalse(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.onlyNull(BIGINT));
-        assertEquals(domain.toString(), "[ SortedRangeSet[type=bigint, ranges=1, {(<min>,<max>)}] ]");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isFalse();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isFalse();
+        assertThat(domain.isOnlyNull()).isFalse();
+        assertThat(domain.isNullAllowed()).isFalse();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.all(BIGINT));
+        assertThat(domain.getType()).isEqualTo(BIGINT);
+        assertThat(domain.includesNullableValue(Long.MIN_VALUE)).isTrue();
+        assertThat(domain.includesNullableValue(0L)).isTrue();
+        assertThat(domain.includesNullableValue(Long.MAX_VALUE)).isTrue();
+        assertThat(domain.includesNullableValue(null)).isFalse();
+        assertThat(domain.complement()).isEqualTo(Domain.onlyNull(BIGINT));
+        assertThat(domain.toString()).isEqualTo("[ SortedRangeSet[type=bigint, ranges=1, {(<min>,<max>)}] ]");
     }
 
     @Test
     public void testEquatableNotNull()
     {
         Domain domain = Domain.notNull(ID);
-        assertFalse(domain.isNone());
-        assertFalse(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertFalse(domain.isNullableSingleValue());
-        assertFalse(domain.isOnlyNull());
-        assertFalse(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.all(ID));
-        assertEquals(domain.getType(), ID);
-        assertTrue(domain.includesNullableValue(0L));
-        assertFalse(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.onlyNull(ID));
-        assertEquals(domain.toString(), "[ EquatableValueSet[type=id, values=0, EXCLUDES{}] ]");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isFalse();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isFalse();
+        assertThat(domain.isOnlyNull()).isFalse();
+        assertThat(domain.isNullAllowed()).isFalse();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.all(ID));
+        assertThat(domain.getType()).isEqualTo(ID);
+        assertThat(domain.includesNullableValue(0L)).isTrue();
+        assertThat(domain.includesNullableValue(null)).isFalse();
+        assertThat(domain.complement()).isEqualTo(Domain.onlyNull(ID));
+        assertThat(domain.toString()).isEqualTo("[ EquatableValueSet[type=id, values=0, EXCLUDES{}] ]");
     }
 
     @Test
     public void testUncomparableNotNull()
     {
         Domain domain = Domain.notNull(HYPER_LOG_LOG);
-        assertFalse(domain.isNone());
-        assertFalse(domain.isAll());
-        assertFalse(domain.isSingleValue());
-        assertFalse(domain.isNullableSingleValue());
-        assertFalse(domain.isOnlyNull());
-        assertFalse(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.all(HYPER_LOG_LOG));
-        assertEquals(domain.getType(), HYPER_LOG_LOG);
-        assertTrue(domain.includesNullableValue(Slices.EMPTY_SLICE));
-        assertFalse(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.onlyNull(HYPER_LOG_LOG));
-        assertEquals(domain.toString(), "[ [ALL] ]");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isFalse();
+        assertThat(domain.isSingleValue()).isFalse();
+        assertThat(domain.isNullableSingleValue()).isFalse();
+        assertThat(domain.isOnlyNull()).isFalse();
+        assertThat(domain.isNullAllowed()).isFalse();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.all(HYPER_LOG_LOG));
+        assertThat(domain.getType()).isEqualTo(HYPER_LOG_LOG);
+        assertThat(domain.includesNullableValue(Slices.EMPTY_SLICE)).isTrue();
+        assertThat(domain.includesNullableValue(null)).isFalse();
+        assertThat(domain.complement()).isEqualTo(Domain.onlyNull(HYPER_LOG_LOG));
+        assertThat(domain.toString()).isEqualTo("[ [ALL] ]");
     }
 
     @Test
     public void testOrderableSingleValue()
     {
         Domain domain = Domain.singleValue(BIGINT, 0L);
-        assertFalse(domain.isNone());
-        assertFalse(domain.isAll());
-        assertTrue(domain.isSingleValue());
-        assertTrue(domain.isNullableSingleValue());
-        assertFalse(domain.isOnlyNull());
-        assertFalse(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.ofRanges(Range.equal(BIGINT, 0L)));
-        assertEquals(domain.getType(), BIGINT);
-        assertFalse(domain.includesNullableValue(Long.MIN_VALUE));
-        assertTrue(domain.includesNullableValue(0L));
-        assertFalse(domain.includesNullableValue(Long.MAX_VALUE));
-        assertEquals(domain.complement(), Domain.create(ValueSet.ofRanges(Range.lessThan(BIGINT, 0L), Range.greaterThan(BIGINT, 0L)), true));
-        assertEquals(domain.getSingleValue(), 0L);
-        assertEquals(domain.getNullableSingleValue(), 0L);
-        assertEquals(domain.toString(), "[ SortedRangeSet[type=bigint, ranges=1, {[0]}] ]");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isFalse();
+        assertThat(domain.isSingleValue()).isTrue();
+        assertThat(domain.isNullableSingleValue()).isTrue();
+        assertThat(domain.isOnlyNull()).isFalse();
+        assertThat(domain.isNullAllowed()).isFalse();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.ofRanges(Range.equal(BIGINT, 0L)));
+        assertThat(domain.getType()).isEqualTo(BIGINT);
+        assertThat(domain.includesNullableValue(Long.MIN_VALUE)).isFalse();
+        assertThat(domain.includesNullableValue(0L)).isTrue();
+        assertThat(domain.includesNullableValue(Long.MAX_VALUE)).isFalse();
+        assertThat(domain.complement()).isEqualTo(Domain.create(ValueSet.ofRanges(Range.lessThan(BIGINT, 0L), Range.greaterThan(BIGINT, 0L)), true));
+        assertThat(domain.getSingleValue()).isEqualTo(0L);
+        assertThat(domain.getNullableSingleValue()).isEqualTo(0L);
+        assertThat(domain.toString()).isEqualTo("[ SortedRangeSet[type=bigint, ranges=1, {[0]}] ]");
 
         assertThatThrownBy(() -> Domain.create(ValueSet.ofRanges(Range.range(BIGINT, 1L, true, 2L, true)), false).getSingleValue())
                 .isInstanceOf(IllegalStateException.class)
@@ -337,20 +335,20 @@ public void testOrderableSingleValue()
     public void testEquatableSingleValue()
     {
         Domain domain = Domain.singleValue(ID, 0L);
-        assertFalse(domain.isNone());
-        assertFalse(domain.isAll());
-        assertTrue(domain.isSingleValue());
-        assertTrue(domain.isNullableSingleValue());
-        assertFalse(domain.isOnlyNull());
-        assertFalse(domain.isNullAllowed());
-        assertEquals(domain.getValues(), ValueSet.of(ID, 0L));
-        assertEquals(domain.getType(), ID);
-        assertTrue(domain.includesNullableValue(0L));
-        assertFalse(domain.includesNullableValue(null));
-        assertEquals(domain.complement(), Domain.create(ValueSet.of(ID, 0L).complement(), true));
-        assertEquals(domain.getSingleValue(), 0L);
-        assertEquals(domain.getNullableSingleValue(), 0L);
-        assertEquals(domain.toString(), "[ EquatableValueSet[type=id, values=1, {0}] ]");
+        assertThat(domain.isNone()).isFalse();
+        assertThat(domain.isAll()).isFalse();
+        assertThat(domain.isSingleValue()).isTrue();
+        assertThat(domain.isNullableSingleValue()).isTrue();
+        assertThat(domain.isOnlyNull()).isFalse();
+        assertThat(domain.isNullAllowed()).isFalse();
+        assertThat(domain.getValues()).isEqualTo(ValueSet.of(ID, 0L));
+        assertThat(domain.getType()).isEqualTo(ID);
+        assertThat(domain.includesNullableValue(0L)).isTrue();
+        assertThat(domain.includesNullableValue(null)).isFalse();
+        assertThat(domain.complement()).isEqualTo(Domain.create(ValueSet.of(ID, 0L).complement(), true));
+        assertThat(domain.getSingleValue()).isEqualTo(0L);
+        assertThat(domain.getNullableSingleValue()).isEqualTo(0L);
+        assertThat(domain.toString()).isEqualTo("[ EquatableValueSet[type=id, values=1, {0}] ]");
 
         assertThatThrownBy(() -> Domain.create(ValueSet.of(ID, 0L, 1L), false).getSingleValue())
                 .isInstanceOf(IllegalStateException.class)
@@ -368,105 +366,89 @@ public void testUncomparableSingleValue()
     @Test
     public void testOverlaps()
     {
-        assertTrue(Domain.all(BIGINT).overlaps(Domain.all(BIGINT)));
-        assertFalse(Domain.all(BIGINT).overlaps(Domain.none(BIGINT)));
-        assertTrue(Domain.all(BIGINT).overlaps(Domain.notNull(BIGINT)));
-        assertTrue(Domain.all(BIGINT).overlaps(Domain.onlyNull(BIGINT)));
-        assertTrue(Domain.all(BIGINT).overlaps(Domain.singleValue(BIGINT, 0L)));
-
-        assertFalse(Domain.none(BIGINT).overlaps(Domain.all(BIGINT)));
-        assertFalse(Domain.none(BIGINT).overlaps(Domain.none(BIGINT)));
-        assertFalse(Domain.none(BIGINT).overlaps(Domain.notNull(BIGINT)));
-        assertFalse(Domain.none(BIGINT).overlaps(Domain.onlyNull(BIGINT)));
-        assertFalse(Domain.none(BIGINT).overlaps(Domain.singleValue(BIGINT, 0L)));
-
-        assertTrue(Domain.notNull(BIGINT).overlaps(Domain.all(BIGINT)));
-        assertFalse(Domain.notNull(BIGINT).overlaps(Domain.none(BIGINT)));
-        assertTrue(Domain.notNull(BIGINT).overlaps(Domain.notNull(BIGINT)));
-        assertFalse(Domain.notNull(BIGINT).overlaps(Domain.onlyNull(BIGINT)));
-        assertTrue(Domain.notNull(BIGINT).overlaps(Domain.singleValue(BIGINT, 0L)));
-
-        assertTrue(Domain.onlyNull(BIGINT).overlaps(Domain.all(BIGINT)));
-        assertFalse(Domain.onlyNull(BIGINT).overlaps(Domain.none(BIGINT)));
-        assertFalse(Domain.onlyNull(BIGINT).overlaps(Domain.notNull(BIGINT)));
-        assertTrue(Domain.onlyNull(BIGINT).overlaps(Domain.onlyNull(BIGINT)));
-        assertFalse(Domain.onlyNull(BIGINT).overlaps(Domain.singleValue(BIGINT, 0L)));
-
-        assertTrue(Domain.singleValue(BIGINT, 0L).overlaps(Domain.all(BIGINT)));
-        assertFalse(Domain.singleValue(BIGINT, 0L).overlaps(Domain.none(BIGINT)));
-        assertTrue(Domain.singleValue(BIGINT, 0L).overlaps(Domain.notNull(BIGINT)));
-        assertFalse(Domain.singleValue(BIGINT, 0L).overlaps(Domain.onlyNull(BIGINT)));
-        assertTrue(Domain.singleValue(BIGINT, 0L).overlaps(Domain.singleValue(BIGINT, 0L)));
+        assertThat(Domain.all(BIGINT).overlaps(Domain.all(BIGINT))).isTrue();
+        assertThat(Domain.all(BIGINT).overlaps(Domain.none(BIGINT))).isFalse();
+        assertThat(Domain.all(BIGINT).overlaps(Domain.notNull(BIGINT))).isTrue();
+        assertThat(Domain.all(BIGINT).overlaps(Domain.onlyNull(BIGINT))).isTrue();
+        assertThat(Domain.all(BIGINT).overlaps(Domain.singleValue(BIGINT, 0L))).isTrue();
+
+        assertThat(Domain.none(BIGINT).overlaps(Domain.all(BIGINT))).isFalse();
+        assertThat(Domain.none(BIGINT).overlaps(Domain.none(BIGINT))).isFalse();
+        assertThat(Domain.none(BIGINT).overlaps(Domain.notNull(BIGINT))).isFalse();
+        assertThat(Domain.none(BIGINT).overlaps(Domain.onlyNull(BIGINT))).isFalse();
+        assertThat(Domain.none(BIGINT).overlaps(Domain.singleValue(BIGINT, 0L))).isFalse();
+
+        assertThat(Domain.notNull(BIGINT).overlaps(Domain.all(BIGINT))).isTrue();
+        assertThat(Domain.notNull(BIGINT).overlaps(Domain.none(BIGINT))).isFalse();
+        assertThat(Domain.notNull(BIGINT).overlaps(Domain.notNull(BIGINT))).isTrue();
+        assertThat(Domain.notNull(BIGINT).overlaps(Domain.onlyNull(BIGINT))).isFalse();
+        assertThat(Domain.notNull(BIGINT).overlaps(Domain.singleValue(BIGINT, 0L))).isTrue();
+
+        assertThat(Domain.onlyNull(BIGINT).overlaps(Domain.all(BIGINT))).isTrue();
+        assertThat(Domain.onlyNull(BIGINT).overlaps(Domain.none(BIGINT))).isFalse();
+        assertThat(Domain.onlyNull(BIGINT).overlaps(Domain.notNull(BIGINT))).isFalse();
+        assertThat(Domain.onlyNull(BIGINT).overlaps(Domain.onlyNull(BIGINT))).isTrue();
+        assertThat(Domain.onlyNull(BIGINT).overlaps(Domain.singleValue(BIGINT, 0L))).isFalse();
+
+        assertThat(Domain.singleValue(BIGINT, 0L).overlaps(Domain.all(BIGINT))).isTrue();
+        assertThat(Domain.singleValue(BIGINT, 0L).overlaps(Domain.none(BIGINT))).isFalse();
+        assertThat(Domain.singleValue(BIGINT, 0L).overlaps(Domain.notNull(BIGINT))).isTrue();
+        assertThat(Domain.singleValue(BIGINT, 0L).overlaps(Domain.onlyNull(BIGINT))).isFalse();
+        assertThat(Domain.singleValue(BIGINT, 0L).overlaps(Domain.singleValue(BIGINT, 0L))).isTrue();
     }
 
     @Test
     public void testContains()
     {
-        assertTrue(Domain.all(BIGINT).contains(Domain.all(BIGINT)));
-        assertTrue(Domain.all(BIGINT).contains(Domain.none(BIGINT)));
-        assertTrue(Domain.all(BIGINT).contains(Domain.notNull(BIGINT)));
-        assertTrue(Domain.all(BIGINT).contains(Domain.onlyNull(BIGINT)));
-        assertTrue(Domain.all(BIGINT).contains(Domain.singleValue(BIGINT, 0L)));
-
-        assertFalse(Domain.none(BIGINT).contains(Domain.all(BIGINT)));
-        assertTrue(Domain.none(BIGINT).contains(Domain.none(BIGINT)));
-        assertFalse(Domain.none(BIGINT).contains(Domain.notNull(BIGINT)));
-        assertFalse(Domain.none(BIGINT).contains(Domain.onlyNull(BIGINT)));
-        assertFalse(Domain.none(BIGINT).contains(Domain.singleValue(BIGINT, 0L)));
-
-        assertFalse(Domain.notNull(BIGINT).contains(Domain.all(BIGINT)));
-        assertTrue(Domain.notNull(BIGINT).contains(Domain.none(BIGINT)));
-        assertTrue(Domain.notNull(BIGINT).contains(Domain.notNull(BIGINT)));
-        assertFalse(Domain.notNull(BIGINT).contains(Domain.onlyNull(BIGINT)));
-        assertTrue(Domain.notNull(BIGINT).contains(Domain.singleValue(BIGINT, 0L)));
-
-        assertFalse(Domain.onlyNull(BIGINT).contains(Domain.all(BIGINT)));
-        assertTrue(Domain.onlyNull(BIGINT).contains(Domain.none(BIGINT)));
-        assertFalse(Domain.onlyNull(BIGINT).contains(Domain.notNull(BIGINT)));
-        assertTrue(Domain.onlyNull(BIGINT).contains(Domain.onlyNull(BIGINT)));
-        assertFalse(Domain.onlyNull(BIGINT).contains(Domain.singleValue(BIGINT, 0L)));
-
-        assertFalse(Domain.singleValue(BIGINT, 0L).contains(Domain.all(BIGINT)));
-        assertTrue(Domain.singleValue(BIGINT, 0L).contains(Domain.none(BIGINT)));
-        assertFalse(Domain.singleValue(BIGINT, 0L).contains(Domain.notNull(BIGINT)));
-        assertFalse(Domain.singleValue(BIGINT, 0L).contains(Domain.onlyNull(BIGINT)));
-        assertTrue(Domain.singleValue(BIGINT, 0L).contains(Domain.singleValue(BIGINT, 0L)));
+        assertThat(Domain.all(BIGINT).contains(Domain.all(BIGINT))).isTrue();
+        assertThat(Domain.all(BIGINT).contains(Domain.none(BIGINT))).isTrue();
+        assertThat(Domain.all(BIGINT).contains(Domain.notNull(BIGINT))).isTrue();
+        assertThat(Domain.all(BIGINT).contains(Domain.onlyNull(BIGINT))).isTrue();
+        assertThat(Domain.all(BIGINT).contains(Domain.singleValue(BIGINT, 0L))).isTrue();
+
+        assertThat(Domain.none(BIGINT).contains(Domain.all(BIGINT))).isFalse();
+        assertThat(Domain.none(BIGINT).contains(Domain.none(BIGINT))).isTrue();
+        assertThat(Domain.none(BIGINT).contains(Domain.notNull(BIGINT))).isFalse();
+        assertThat(Domain.none(BIGINT).contains(Domain.onlyNull(BIGINT))).isFalse();
+        assertThat(Domain.none(BIGINT).contains(Domain.singleValue(BIGINT, 0L))).isFalse();
+
+        assertThat(Domain.notNull(BIGINT).contains(Domain.all(BIGINT))).isFalse();
+        assertThat(Domain.notNull(BIGINT).contains(Domain.none(BIGINT))).isTrue();
+        assertThat(Domain.notNull(BIGINT).contains(Domain.notNull(BIGINT))).isTrue();
+        assertThat(Domain.notNull(BIGINT).contains(Domain.onlyNull(BIGINT))).isFalse();
+        assertThat(Domain.notNull(BIGINT).contains(Domain.singleValue(BIGINT, 0L))).isTrue();
+
+        assertThat(Domain.onlyNull(BIGINT).contains(Domain.all(BIGINT))).isFalse();
+        assertThat(Domain.onlyNull(BIGINT).contains(Domain.none(BIGINT))).isTrue();
+        assertThat(Domain.onlyNull(BIGINT).contains(Domain.notNull(BIGINT))).isFalse();
+        assertThat(Domain.onlyNull(BIGINT).contains(Domain.onlyNull(BIGINT))).isTrue();
+        assertThat(Domain.onlyNull(BIGINT).contains(Domain.singleValue(BIGINT, 0L))).isFalse();
+
+        assertThat(Domain.singleValue(BIGINT, 0L).contains(Domain.all(BIGINT))).isFalse();
+        assertThat(Domain.singleValue(BIGINT, 0L).contains(Domain.none(BIGINT))).isTrue();
+        assertThat(Domain.singleValue(BIGINT, 0L).contains(Domain.notNull(BIGINT))).isFalse();
+        assertThat(Domain.singleValue(BIGINT, 0L).contains(Domain.onlyNull(BIGINT))).isFalse();
+        assertThat(Domain.singleValue(BIGINT, 0L).contains(Domain.singleValue(BIGINT, 0L))).isTrue();
     }
 
     @Test
     public void testIntersect()
     {
-        assertEquals(
-                Domain.all(BIGINT).intersect(Domain.all(BIGINT)),
-                Domain.all(BIGINT));
+        assertThat(Domain.all(BIGINT).intersect(Domain.all(BIGINT))).isEqualTo(Domain.all(BIGINT));
 
-        assertEquals(
-                Domain.none(BIGINT).intersect(Domain.none(BIGINT)),
-                Domain.none(BIGINT));
+        assertThat(Domain.none(BIGINT).intersect(Domain.none(BIGINT))).isEqualTo(Domain.none(BIGINT));
 
-        assertEquals(
-                Domain.all(BIGINT).intersect(Domain.none(BIGINT)),
-                Domain.none(BIGINT));
+        assertThat(Domain.all(BIGINT).intersect(Domain.none(BIGINT))).isEqualTo(Domain.none(BIGINT));
 
-        assertEquals(
-                Domain.notNull(BIGINT).intersect(Domain.onlyNull(BIGINT)),
-                Domain.none(BIGINT));
+        assertThat(Domain.notNull(BIGINT).intersect(Domain.onlyNull(BIGINT))).isEqualTo(Domain.none(BIGINT));
 
-        assertEquals(
-                Domain.singleValue(BIGINT, 0L).intersect(Domain.all(BIGINT)),
-                Domain.singleValue(BIGINT, 0L));
+        assertThat(Domain.singleValue(BIGINT, 0L).intersect(Domain.all(BIGINT))).isEqualTo(Domain.singleValue(BIGINT, 0L));
 
-        assertEquals(
-                Domain.singleValue(BIGINT, 0L).intersect(Domain.onlyNull(BIGINT)),
-                Domain.none(BIGINT));
+        assertThat(Domain.singleValue(BIGINT, 0L).intersect(Domain.onlyNull(BIGINT))).isEqualTo(Domain.none(BIGINT));
 
-        assertEquals(
-                Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L)), true).intersect(Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 2L)), true)),
-                Domain.onlyNull(BIGINT));
+        assertThat(Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L)), true).intersect(Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 2L)), true))).isEqualTo(Domain.onlyNull(BIGINT));
 
-        assertEquals(
-                Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L)), true).intersect(Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L), Range.equal(BIGINT, 2L)), false)),
-                Domain.singleValue(BIGINT, 1L));
+        assertThat(Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L)), true).intersect(Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L), Range.equal(BIGINT, 2L)), false))).isEqualTo(Domain.singleValue(BIGINT, 1L));
     }
 
     @Test
@@ -502,93 +484,39 @@ public void testUnion()
     @Test
     public void testSubtract()
     {
-        assertEquals(
-                Domain.all(BIGINT).subtract(Domain.all(BIGINT)),
-                Domain.none(BIGINT));
-        assertEquals(
-                Domain.all(BIGINT).subtract(Domain.none(BIGINT)),
-                Domain.all(BIGINT));
-        assertEquals(
-                Domain.all(BIGINT).subtract(Domain.notNull(BIGINT)),
-                Domain.onlyNull(BIGINT));
-        assertEquals(
-                Domain.all(BIGINT).subtract(Domain.onlyNull(BIGINT)),
-                Domain.notNull(BIGINT));
-        assertEquals(
-                Domain.all(BIGINT).subtract(Domain.singleValue(BIGINT, 0L)),
-                Domain.create(ValueSet.ofRanges(Range.lessThan(BIGINT, 0L), Range.greaterThan(BIGINT, 0L)), true));
-
-        assertEquals(
-                Domain.none(BIGINT).subtract(Domain.all(BIGINT)),
-                Domain.none(BIGINT));
-        assertEquals(
-                Domain.none(BIGINT).subtract(Domain.none(BIGINT)),
-                Domain.none(BIGINT));
-        assertEquals(
-                Domain.none(BIGINT).subtract(Domain.notNull(BIGINT)),
-                Domain.none(BIGINT));
-        assertEquals(
-                Domain.none(BIGINT).subtract(Domain.onlyNull(BIGINT)),
-                Domain.none(BIGINT));
-        assertEquals(
-                Domain.none(BIGINT).subtract(Domain.singleValue(BIGINT, 0L)),
-                Domain.none(BIGINT));
-
-        assertEquals(
-                Domain.notNull(BIGINT).subtract(Domain.all(BIGINT)),
-                Domain.none(BIGINT));
-        assertEquals(
-                Domain.notNull(BIGINT).subtract(Domain.none(BIGINT)),
-                Domain.notNull(BIGINT));
-        assertEquals(
-                Domain.notNull(BIGINT).subtract(Domain.notNull(BIGINT)),
-                Domain.none(BIGINT));
-        assertEquals(
-                Domain.notNull(BIGINT).subtract(Domain.onlyNull(BIGINT)),
-                Domain.notNull(BIGINT));
-        assertEquals(
-                Domain.notNull(BIGINT).subtract(Domain.singleValue(BIGINT, 0L)),
-                Domain.create(ValueSet.ofRanges(Range.lessThan(BIGINT, 0L), Range.greaterThan(BIGINT, 0L)), false));
-
-        assertEquals(
-                Domain.onlyNull(BIGINT).subtract(Domain.all(BIGINT)),
-                Domain.none(BIGINT));
-        assertEquals(
-                Domain.onlyNull(BIGINT).subtract(Domain.none(BIGINT)),
-                Domain.onlyNull(BIGINT));
-        assertEquals(
-                Domain.onlyNull(BIGINT).subtract(Domain.notNull(BIGINT)),
-                Domain.onlyNull(BIGINT));
-        assertEquals(
-                Domain.onlyNull(BIGINT).subtract(Domain.onlyNull(BIGINT)),
-                Domain.none(BIGINT));
-        assertEquals(
-                Domain.onlyNull(BIGINT).subtract(Domain.singleValue(BIGINT, 0L)),
-                Domain.onlyNull(BIGINT));
-
-        assertEquals(
-                Domain.singleValue(BIGINT, 0L).subtract(Domain.all(BIGINT)),
-                Domain.none(BIGINT));
-        assertEquals(
-                Domain.singleValue(BIGINT, 0L).subtract(Domain.none(BIGINT)),
-                Domain.singleValue(BIGINT, 0L));
-        assertEquals(
-                Domain.singleValue(BIGINT, 0L).subtract(Domain.notNull(BIGINT)),
-                Domain.none(BIGINT));
-        assertEquals(
-                Domain.singleValue(BIGINT, 0L).subtract(Domain.onlyNull(BIGINT)),
-                Domain.singleValue(BIGINT, 0L));
-        assertEquals(
-                Domain.singleValue(BIGINT, 0L).subtract(Domain.singleValue(BIGINT, 0L)),
-                Domain.none(BIGINT));
-
-        assertEquals(
-                Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L)), true).subtract(Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 2L)), true)),
-                Domain.singleValue(BIGINT, 1L));
-
-        assertEquals(
-                Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L)), true).subtract(Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L), Range.equal(BIGINT, 2L)), false)),
-                Domain.onlyNull(BIGINT));
+        assertThat(Domain.all(BIGINT).subtract(Domain.all(BIGINT))).isEqualTo(Domain.none(BIGINT));
+        assertThat(Domain.all(BIGINT).subtract(Domain.none(BIGINT))).isEqualTo(Domain.all(BIGINT));
+        assertThat(Domain.all(BIGINT).subtract(Domain.notNull(BIGINT))).isEqualTo(Domain.onlyNull(BIGINT));
+        assertThat(Domain.all(BIGINT).subtract(Domain.onlyNull(BIGINT))).isEqualTo(Domain.notNull(BIGINT));
+        assertThat(Domain.all(BIGINT).subtract(Domain.singleValue(BIGINT, 0L))).isEqualTo(Domain.create(ValueSet.ofRanges(Range.lessThan(BIGINT, 0L), Range.greaterThan(BIGINT, 0L)), true));
+
+        assertThat(Domain.none(BIGINT).subtract(Domain.all(BIGINT))).isEqualTo(Domain.none(BIGINT));
+        assertThat(Domain.none(BIGINT).subtract(Domain.none(BIGINT))).isEqualTo(Domain.none(BIGINT));
+        assertThat(Domain.none(BIGINT).subtract(Domain.notNull(BIGINT))).isEqualTo(Domain.none(BIGINT));
+        assertThat(Domain.none(BIGINT).subtract(Domain.onlyNull(BIGINT))).isEqualTo(Domain.none(BIGINT));
+        assertThat(Domain.none(BIGINT).subtract(Domain.singleValue(BIGINT, 0L))).isEqualTo(Domain.none(BIGINT));
+
+        assertThat(Domain.notNull(BIGINT).subtract(Domain.all(BIGINT))).isEqualTo(Domain.none(BIGINT));
+        assertThat(Domain.notNull(BIGINT).subtract(Domain.none(BIGINT))).isEqualTo(Domain.notNull(BIGINT));
+        assertThat(Domain.notNull(BIGINT).subtract(Domain.notNull(BIGINT))).isEqualTo(Domain.none(BIGINT));
+        assertThat(Domain.notNull(BIGINT).subtract(Domain.onlyNull(BIGINT))).isEqualTo(Domain.notNull(BIGINT));
+        assertThat(Domain.notNull(BIGINT).subtract(Domain.singleValue(BIGINT, 0L))).isEqualTo(Domain.create(ValueSet.ofRanges(Range.lessThan(BIGINT, 0L), Range.greaterThan(BIGINT, 0L)), false));
+
+        assertThat(Domain.onlyNull(BIGINT).subtract(Domain.all(BIGINT))).isEqualTo(Domain.none(BIGINT));
+        assertThat(Domain.onlyNull(BIGINT).subtract(Domain.none(BIGINT))).isEqualTo(Domain.onlyNull(BIGINT));
+        assertThat(Domain.onlyNull(BIGINT).subtract(Domain.notNull(BIGINT))).isEqualTo(Domain.onlyNull(BIGINT));
+        assertThat(Domain.onlyNull(BIGINT).subtract(Domain.onlyNull(BIGINT))).isEqualTo(Domain.none(BIGINT));
+        assertThat(Domain.onlyNull(BIGINT).subtract(Domain.singleValue(BIGINT, 0L))).isEqualTo(Domain.onlyNull(BIGINT));
+
+        assertThat(Domain.singleValue(BIGINT, 0L).subtract(Domain.all(BIGINT))).isEqualTo(Domain.none(BIGINT));
+        assertThat(Domain.singleValue(BIGINT, 0L).subtract(Domain.none(BIGINT))).isEqualTo(Domain.singleValue(BIGINT, 0L));
+        assertThat(Domain.singleValue(BIGINT, 0L).subtract(Domain.notNull(BIGINT))).isEqualTo(Domain.none(BIGINT));
+        assertThat(Domain.singleValue(BIGINT, 0L).subtract(Domain.onlyNull(BIGINT))).isEqualTo(Domain.singleValue(BIGINT, 0L));
+        assertThat(Domain.singleValue(BIGINT, 0L).subtract(Domain.singleValue(BIGINT, 0L))).isEqualTo(Domain.none(BIGINT));
+
+        assertThat(Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L)), true).subtract(Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 2L)), true))).isEqualTo(Domain.singleValue(BIGINT, 1L));
+
+        assertThat(Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L)), true).subtract(Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L), Range.equal(BIGINT, 2L)), false))).isEqualTo(Domain.onlyNull(BIGINT));
     }
 
     @Test
@@ -605,36 +533,36 @@ public void testJsonSerialization()
                         .addDeserializer(Block.class, new TestingBlockJsonSerde.Deserializer(blockEncodingSerde)));
 
         Domain domain = Domain.all(BIGINT);
-        assertEquals(domain, mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
+        assertThat(domain).isEqualTo(mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
 
         domain = Domain.none(DOUBLE);
-        assertEquals(domain, mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
+        assertThat(domain).isEqualTo(mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
 
         domain = Domain.notNull(BOOLEAN);
-        assertEquals(domain, mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
+        assertThat(domain).isEqualTo(mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
 
         domain = Domain.notNull(HYPER_LOG_LOG);
-        assertEquals(domain, mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
+        assertThat(domain).isEqualTo(mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
 
         domain = Domain.onlyNull(VARCHAR);
-        assertEquals(domain, mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
+        assertThat(domain).isEqualTo(mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
 
         domain = Domain.onlyNull(HYPER_LOG_LOG);
-        assertEquals(domain, mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
+        assertThat(domain).isEqualTo(mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
 
         domain = Domain.singleValue(BIGINT, Long.MIN_VALUE);
-        assertEquals(domain, mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
+        assertThat(domain).isEqualTo(mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
 
         domain = Domain.singleValue(ID, Long.MIN_VALUE);
-        assertEquals(domain, mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
+        assertThat(domain).isEqualTo(mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
 
         domain = Domain.create(ValueSet.ofRanges(Range.lessThan(BIGINT, 0L), Range.equal(BIGINT, 1L), Range.range(BIGINT, 2L, true, 3L, true)), true);
-        assertEquals(domain, mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
+        assertThat(domain).isEqualTo(mapper.readValue(mapper.writeValueAsString(domain), Domain.class));
     }
 
     private void assertUnion(Domain first, Domain second, Domain expected)
     {
-        assertEquals(first.union(second), expected);
-        assertEquals(Domain.union(ImmutableList.of(first, second)), expected);
+        assertThat(first.union(second)).isEqualTo(expected);
+        assertThat(Domain.union(ImmutableList.of(first, second))).isEqualTo(expected);
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestEquatableValueSet.java b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestEquatableValueSet.java
index 451412acd785..9c2773b4806e 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestEquatableValueSet.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestEquatableValueSet.java
@@ -24,7 +24,7 @@
 import io.trino.spi.type.TestingTypeDeserializer;
 import io.trino.spi.type.TestingTypeManager;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -35,9 +35,6 @@
 import static io.trino.spi.type.TestingIdType.ID;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
 public class TestEquatableValueSet
 {
@@ -45,31 +42,31 @@ public class TestEquatableValueSet
     public void testEmptySet()
     {
         EquatableValueSet equatables = EquatableValueSet.none(ID);
-        assertEquals(equatables.getType(), ID);
-        assertTrue(equatables.isNone());
-        assertFalse(equatables.isAll());
-        assertFalse(equatables.isSingleValue());
-        assertTrue(equatables.inclusive());
-        assertEquals(equatables.getValues().size(), 0);
-        assertEquals(equatables.complement(), EquatableValueSet.all(ID));
-        assertFalse(equatables.containsValue(0L));
-        assertFalse(equatables.containsValue(1L));
-        assertEquals(equatables.toString(), "EquatableValueSet[type=id, values=0, {}]");
+        assertThat(equatables.getType()).isEqualTo(ID);
+        assertThat(equatables.isNone()).isTrue();
+        assertThat(equatables.isAll()).isFalse();
+        assertThat(equatables.isSingleValue()).isFalse();
+        assertThat(equatables.inclusive()).isTrue();
+        assertThat(equatables.getValues().size()).isEqualTo(0);
+        assertThat(equatables.complement()).isEqualTo(EquatableValueSet.all(ID));
+        assertThat(equatables.containsValue(0L)).isFalse();
+        assertThat(equatables.containsValue(1L)).isFalse();
+        assertThat(equatables.toString()).isEqualTo("EquatableValueSet[type=id, values=0, {}]");
     }
 
     @Test
     public void testEntireSet()
     {
         EquatableValueSet equatables = EquatableValueSet.all(ID);
-        assertEquals(equatables.getType(), ID);
-        assertFalse(equatables.isNone());
-        assertTrue(equatables.isAll());
-        assertFalse(equatables.isSingleValue());
-        assertFalse(equatables.inclusive());
-        assertEquals(equatables.getValues().size(), 0);
-        assertEquals(equatables.complement(), EquatableValueSet.none(ID));
-        assertTrue(equatables.containsValue(0L));
-        assertTrue(equatables.containsValue(1L));
+        assertThat(equatables.getType()).isEqualTo(ID);
+        assertThat(equatables.isNone()).isFalse();
+        assertThat(equatables.isAll()).isTrue();
+        assertThat(equatables.isSingleValue()).isFalse();
+        assertThat(equatables.inclusive()).isFalse();
+        assertThat(equatables.getValues().size()).isEqualTo(0);
+        assertThat(equatables.complement()).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(equatables.containsValue(0L)).isTrue();
+        assertThat(equatables.containsValue(1L)).isTrue();
     }
 
     @Test
@@ -80,28 +77,28 @@ public void testSingleValue()
         EquatableValueSet complement = (EquatableValueSet) EquatableValueSet.all(ID).subtract(equatables);
 
         // inclusive
-        assertEquals(equatables.getType(), ID);
-        assertFalse(equatables.isNone());
-        assertFalse(equatables.isAll());
-        assertTrue(equatables.isSingleValue());
-        assertTrue(equatables.inclusive());
-        assertTrue(Iterables.elementsEqual(equatables.getValues(), ImmutableList.of(10L)));
-        assertEquals(equatables.complement(), complement);
-        assertFalse(equatables.containsValue(0L));
-        assertFalse(equatables.containsValue(1L));
-        assertTrue(equatables.containsValue(10L));
+        assertThat(equatables.getType()).isEqualTo(ID);
+        assertThat(equatables.isNone()).isFalse();
+        assertThat(equatables.isAll()).isFalse();
+        assertThat(equatables.isSingleValue()).isTrue();
+        assertThat(equatables.inclusive()).isTrue();
+        assertThat(Iterables.elementsEqual(equatables.getValues(), ImmutableList.of(10L))).isTrue();
+        assertThat(equatables.complement()).isEqualTo(complement);
+        assertThat(equatables.containsValue(0L)).isFalse();
+        assertThat(equatables.containsValue(1L)).isFalse();
+        assertThat(equatables.containsValue(10L)).isTrue();
 
         // exclusive
-        assertEquals(complement.getType(), ID);
-        assertFalse(complement.isNone());
-        assertFalse(complement.isAll());
-        assertFalse(complement.isSingleValue());
-        assertFalse(complement.inclusive());
-        assertTrue(Iterables.elementsEqual(complement.getValues(), ImmutableList.of(10L)));
-        assertEquals(complement.complement(), equatables);
-        assertTrue(complement.containsValue(0L));
-        assertTrue(complement.containsValue(1L));
-        assertFalse(complement.containsValue(10L));
+        assertThat(complement.getType()).isEqualTo(ID);
+        assertThat(complement.isNone()).isFalse();
+        assertThat(complement.isAll()).isFalse();
+        assertThat(complement.isSingleValue()).isFalse();
+        assertThat(complement.inclusive()).isFalse();
+        assertThat(Iterables.elementsEqual(complement.getValues(), ImmutableList.of(10L))).isTrue();
+        assertThat(complement.complement()).isEqualTo(equatables);
+        assertThat(complement.containsValue(0L)).isTrue();
+        assertThat(complement.containsValue(1L)).isTrue();
+        assertThat(complement.containsValue(10L)).isFalse();
     }
 
     @Test
@@ -112,46 +109,42 @@ public void testMultipleValues()
         EquatableValueSet complement = (EquatableValueSet) EquatableValueSet.all(ID).subtract(equatables);
 
         // inclusive
-        assertEquals(equatables.getType(), ID);
-        assertFalse(equatables.isNone());
-        assertFalse(equatables.isAll());
-        assertFalse(equatables.isSingleValue());
-        assertTrue(equatables.inclusive());
-        assertTrue(Iterables.elementsEqual(equatables.getValues(), ImmutableList.of(1L, 2L, 3L)));
-        assertEquals(equatables.complement(), complement);
-        assertFalse(equatables.containsValue(0L));
-        assertTrue(equatables.containsValue(1L));
-        assertTrue(equatables.containsValue(2L));
-        assertTrue(equatables.containsValue(3L));
-        assertFalse(equatables.containsValue(4L));
-        assertEquals(equatables.toString(), "EquatableValueSet[type=id, values=3, {1, 2, 3}]");
-        assertEquals(
-                equatables.toString(ToStringSession.INSTANCE, 2),
-                "EquatableValueSet[type=id, values=3, {1, 2, ...}]");
+        assertThat(equatables.getType()).isEqualTo(ID);
+        assertThat(equatables.isNone()).isFalse();
+        assertThat(equatables.isAll()).isFalse();
+        assertThat(equatables.isSingleValue()).isFalse();
+        assertThat(equatables.inclusive()).isTrue();
+        assertThat(Iterables.elementsEqual(equatables.getValues(), ImmutableList.of(1L, 2L, 3L))).isTrue();
+        assertThat(equatables.complement()).isEqualTo(complement);
+        assertThat(equatables.containsValue(0L)).isFalse();
+        assertThat(equatables.containsValue(1L)).isTrue();
+        assertThat(equatables.containsValue(2L)).isTrue();
+        assertThat(equatables.containsValue(3L)).isTrue();
+        assertThat(equatables.containsValue(4L)).isFalse();
+        assertThat(equatables.toString()).isEqualTo("EquatableValueSet[type=id, values=3, {1, 2, 3}]");
+        assertThat(equatables.toString(ToStringSession.INSTANCE, 2)).isEqualTo("EquatableValueSet[type=id, values=3, {1, 2, ...}]");
 
         // exclusive
-        assertEquals(complement.getType(), ID);
-        assertFalse(complement.isNone());
-        assertFalse(complement.isAll());
-        assertFalse(complement.isSingleValue());
-        assertFalse(complement.inclusive());
-        assertTrue(Iterables.elementsEqual(complement.getValues(), ImmutableList.of(1L, 2L, 3L)));
-        assertEquals(complement.complement(), equatables);
-        assertTrue(complement.containsValue(0L));
-        assertFalse(complement.containsValue(1L));
-        assertFalse(complement.containsValue(2L));
-        assertFalse(complement.containsValue(3L));
-        assertTrue(complement.containsValue(4L));
-        assertEquals(complement.toString(), "EquatableValueSet[type=id, values=3, EXCLUDES{1, 2, 3}]");
-        assertEquals(
-                complement.toString(ToStringSession.INSTANCE, 2),
-                "EquatableValueSet[type=id, values=3, EXCLUDES{1, 2, ...}]");
+        assertThat(complement.getType()).isEqualTo(ID);
+        assertThat(complement.isNone()).isFalse();
+        assertThat(complement.isAll()).isFalse();
+        assertThat(complement.isSingleValue()).isFalse();
+        assertThat(complement.inclusive()).isFalse();
+        assertThat(Iterables.elementsEqual(complement.getValues(), ImmutableList.of(1L, 2L, 3L))).isTrue();
+        assertThat(complement.complement()).isEqualTo(equatables);
+        assertThat(complement.containsValue(0L)).isTrue();
+        assertThat(complement.containsValue(1L)).isFalse();
+        assertThat(complement.containsValue(2L)).isFalse();
+        assertThat(complement.containsValue(3L)).isFalse();
+        assertThat(complement.containsValue(4L)).isTrue();
+        assertThat(complement.toString()).isEqualTo("EquatableValueSet[type=id, values=3, EXCLUDES{1, 2, 3}]");
+        assertThat(complement.toString(ToStringSession.INSTANCE, 2)).isEqualTo("EquatableValueSet[type=id, values=3, EXCLUDES{1, 2, ...}]");
     }
 
     @Test
     public void testGetSingleValue()
     {
-        assertEquals(EquatableValueSet.of(ID, 0L).getSingleValue(), 0L);
+        assertThat(EquatableValueSet.of(ID, 0L).getSingleValue()).isEqualTo(0L);
         assertThatThrownBy(() -> EquatableValueSet.all(ID).getSingleValue())
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("EquatableValueSet does not have just a single value");
@@ -160,150 +153,150 @@ public void testGetSingleValue()
     @Test
     public void testOverlaps()
     {
-        assertTrue(EquatableValueSet.all(ID).overlaps(EquatableValueSet.all(ID)));
-        assertFalse(EquatableValueSet.all(ID).overlaps(EquatableValueSet.none(ID)));
-        assertTrue(EquatableValueSet.all(ID).overlaps(EquatableValueSet.of(ID, 0L)));
-        assertTrue(EquatableValueSet.all(ID).overlaps(EquatableValueSet.of(ID, 0L, 1L)));
-        assertTrue(EquatableValueSet.all(ID).overlaps(EquatableValueSet.of(ID, 0L, 1L).complement()));
-
-        assertFalse(EquatableValueSet.none(ID).overlaps(EquatableValueSet.all(ID)));
-        assertFalse(EquatableValueSet.none(ID).overlaps(EquatableValueSet.none(ID)));
-        assertFalse(EquatableValueSet.none(ID).overlaps(EquatableValueSet.of(ID, 0L)));
-        assertFalse(EquatableValueSet.none(ID).overlaps(EquatableValueSet.of(ID, 0L, 1L)));
-        assertFalse(EquatableValueSet.none(ID).overlaps(EquatableValueSet.of(ID, 0L, 1L).complement()));
-
-        assertTrue(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.all(ID)));
-        assertFalse(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.none(ID)));
-        assertTrue(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.of(ID, 0L)));
-        assertFalse(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.of(ID, 1L)));
-        assertTrue(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.of(ID, 0L, 1L)));
-        assertFalse(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.of(ID, 0L, 1L).complement()));
-        assertFalse(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.of(ID, 0L).complement()));
-        assertTrue(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.of(ID, 1L).complement()));
-
-        assertTrue(EquatableValueSet.of(ID, 0L, 1L).overlaps(EquatableValueSet.all(ID)));
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).overlaps(EquatableValueSet.none(ID)));
-        assertTrue(EquatableValueSet.of(ID, 0L, 1L).overlaps(EquatableValueSet.of(ID, 0L)));
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).overlaps(EquatableValueSet.of(ID, -1L)));
-        assertTrue(EquatableValueSet.of(ID, 0L, 1L).overlaps(EquatableValueSet.of(ID, 0L, 1L)));
-        assertTrue(EquatableValueSet.of(ID, 0L, 1L).overlaps(EquatableValueSet.of(ID, -1L).complement()));
-
-        assertTrue(EquatableValueSet.of(ID, 0L, 1L).complement().overlaps(EquatableValueSet.all(ID)));
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).complement().overlaps(EquatableValueSet.none(ID)));
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).complement().overlaps(EquatableValueSet.of(ID, 0L)));
-        assertTrue(EquatableValueSet.of(ID, 0L, 1L).complement().overlaps(EquatableValueSet.of(ID, -1L)));
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).complement().overlaps(EquatableValueSet.of(ID, 0L, 1L)));
-        assertTrue(EquatableValueSet.of(ID, 0L, 1L).complement().overlaps(EquatableValueSet.of(ID, -1L).complement()));
+        assertThat(EquatableValueSet.all(ID).overlaps(EquatableValueSet.all(ID))).isTrue();
+        assertThat(EquatableValueSet.all(ID).overlaps(EquatableValueSet.none(ID))).isFalse();
+        assertThat(EquatableValueSet.all(ID).overlaps(EquatableValueSet.of(ID, 0L))).isTrue();
+        assertThat(EquatableValueSet.all(ID).overlaps(EquatableValueSet.of(ID, 0L, 1L))).isTrue();
+        assertThat(EquatableValueSet.all(ID).overlaps(EquatableValueSet.of(ID, 0L, 1L).complement())).isTrue();
+
+        assertThat(EquatableValueSet.none(ID).overlaps(EquatableValueSet.all(ID))).isFalse();
+        assertThat(EquatableValueSet.none(ID).overlaps(EquatableValueSet.none(ID))).isFalse();
+        assertThat(EquatableValueSet.none(ID).overlaps(EquatableValueSet.of(ID, 0L))).isFalse();
+        assertThat(EquatableValueSet.none(ID).overlaps(EquatableValueSet.of(ID, 0L, 1L))).isFalse();
+        assertThat(EquatableValueSet.none(ID).overlaps(EquatableValueSet.of(ID, 0L, 1L).complement())).isFalse();
+
+        assertThat(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.all(ID))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.none(ID))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.of(ID, 0L))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.of(ID, 1L))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.of(ID, 0L, 1L))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.of(ID, 0L, 1L).complement())).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.of(ID, 0L).complement())).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L).overlaps(EquatableValueSet.of(ID, 1L).complement())).isTrue();
+
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).overlaps(EquatableValueSet.all(ID))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).overlaps(EquatableValueSet.none(ID))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).overlaps(EquatableValueSet.of(ID, 0L))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).overlaps(EquatableValueSet.of(ID, -1L))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).overlaps(EquatableValueSet.of(ID, 0L, 1L))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).overlaps(EquatableValueSet.of(ID, -1L).complement())).isTrue();
+
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().overlaps(EquatableValueSet.all(ID))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().overlaps(EquatableValueSet.none(ID))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().overlaps(EquatableValueSet.of(ID, 0L))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().overlaps(EquatableValueSet.of(ID, -1L))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().overlaps(EquatableValueSet.of(ID, 0L, 1L))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().overlaps(EquatableValueSet.of(ID, -1L).complement())).isTrue();
     }
 
     @Test
     public void testContains()
     {
-        assertTrue(EquatableValueSet.all(ID).contains(EquatableValueSet.all(ID)));
-        assertTrue(EquatableValueSet.all(ID).contains(EquatableValueSet.none(ID)));
-        assertTrue(EquatableValueSet.all(ID).contains(EquatableValueSet.of(ID, 0L)));
-        assertTrue(EquatableValueSet.all(ID).contains(EquatableValueSet.of(ID, 0L, 1L)));
-        assertTrue(EquatableValueSet.all(ID).contains(EquatableValueSet.of(ID, 0L, 1L).complement()));
-
-        assertFalse(EquatableValueSet.none(ID).contains(EquatableValueSet.all(ID)));
-        assertTrue(EquatableValueSet.none(ID).contains(EquatableValueSet.none(ID)));
-        assertFalse(EquatableValueSet.none(ID).contains(EquatableValueSet.of(ID, 0L)));
-        assertFalse(EquatableValueSet.none(ID).contains(EquatableValueSet.of(ID, 0L, 1L)));
-        assertFalse(EquatableValueSet.none(ID).contains(EquatableValueSet.of(ID, 0L, 1L).complement()));
-
-        assertFalse(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.all(ID)));
-        assertTrue(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.none(ID)));
-        assertTrue(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.of(ID, 0L)));
-        assertFalse(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.of(ID, 0L, 1L)));
-        assertFalse(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.of(ID, 0L, 1L).complement()));
-        assertFalse(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.of(ID, 0L).complement()));
-        assertFalse(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.of(ID, 1L).complement()));
-
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.all(ID)));
-        assertTrue(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.none(ID)));
-        assertTrue(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.of(ID, 0L)));
-        assertTrue(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.of(ID, 0L, 1L)));
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.of(ID, 0L, 2L)));
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.of(ID, 0L, 1L).complement()));
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.of(ID, 0L).complement()));
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.of(ID, 1L).complement()));
-
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).complement().contains(EquatableValueSet.all(ID)));
-        assertTrue(EquatableValueSet.of(ID, 0L, 1L).complement().contains(EquatableValueSet.none(ID)));
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).complement().contains(EquatableValueSet.of(ID, 0L)));
-        assertTrue(EquatableValueSet.of(ID, 0L, 1L).complement().contains(EquatableValueSet.of(ID, -1L)));
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).complement().contains(EquatableValueSet.of(ID, 0L, 1L)));
-        assertFalse(EquatableValueSet.of(ID, 0L, 1L).complement().contains(EquatableValueSet.of(ID, -1L).complement()));
+        assertThat(EquatableValueSet.all(ID).contains(EquatableValueSet.all(ID))).isTrue();
+        assertThat(EquatableValueSet.all(ID).contains(EquatableValueSet.none(ID))).isTrue();
+        assertThat(EquatableValueSet.all(ID).contains(EquatableValueSet.of(ID, 0L))).isTrue();
+        assertThat(EquatableValueSet.all(ID).contains(EquatableValueSet.of(ID, 0L, 1L))).isTrue();
+        assertThat(EquatableValueSet.all(ID).contains(EquatableValueSet.of(ID, 0L, 1L).complement())).isTrue();
+
+        assertThat(EquatableValueSet.none(ID).contains(EquatableValueSet.all(ID))).isFalse();
+        assertThat(EquatableValueSet.none(ID).contains(EquatableValueSet.none(ID))).isTrue();
+        assertThat(EquatableValueSet.none(ID).contains(EquatableValueSet.of(ID, 0L))).isFalse();
+        assertThat(EquatableValueSet.none(ID).contains(EquatableValueSet.of(ID, 0L, 1L))).isFalse();
+        assertThat(EquatableValueSet.none(ID).contains(EquatableValueSet.of(ID, 0L, 1L).complement())).isFalse();
+
+        assertThat(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.all(ID))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.none(ID))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.of(ID, 0L))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.of(ID, 0L, 1L))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.of(ID, 0L, 1L).complement())).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.of(ID, 0L).complement())).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L).contains(EquatableValueSet.of(ID, 1L).complement())).isFalse();
+
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.all(ID))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.none(ID))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.of(ID, 0L))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.of(ID, 0L, 1L))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.of(ID, 0L, 2L))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.of(ID, 0L, 1L).complement())).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.of(ID, 0L).complement())).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).contains(EquatableValueSet.of(ID, 1L).complement())).isFalse();
+
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().contains(EquatableValueSet.all(ID))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().contains(EquatableValueSet.none(ID))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().contains(EquatableValueSet.of(ID, 0L))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().contains(EquatableValueSet.of(ID, -1L))).isTrue();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().contains(EquatableValueSet.of(ID, 0L, 1L))).isFalse();
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().contains(EquatableValueSet.of(ID, -1L).complement())).isFalse();
     }
 
     @Test
     public void testIntersect()
     {
-        assertEquals(EquatableValueSet.none(ID).intersect(EquatableValueSet.none(ID)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.all(ID).intersect(EquatableValueSet.all(ID)), EquatableValueSet.all(ID));
-        assertEquals(EquatableValueSet.none(ID).intersect(EquatableValueSet.all(ID)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.none(ID).intersect(EquatableValueSet.of(ID, 0L)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.all(ID).intersect(EquatableValueSet.of(ID, 0L)), EquatableValueSet.of(ID, 0L));
-        assertEquals(EquatableValueSet.of(ID, 0L).intersect(EquatableValueSet.of(ID, 0L)), EquatableValueSet.of(ID, 0L));
-        assertEquals(EquatableValueSet.of(ID, 0L, 1L).intersect(EquatableValueSet.of(ID, 0L)), EquatableValueSet.of(ID, 0L));
-        assertEquals(EquatableValueSet.of(ID, 0L).complement().intersect(EquatableValueSet.of(ID, 0L)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.of(ID, 0L).complement().intersect(EquatableValueSet.of(ID, 1L)), EquatableValueSet.of(ID, 1L));
-        assertEquals(EquatableValueSet.of(ID, 0L).intersect(EquatableValueSet.of(ID, 1L).complement()), EquatableValueSet.of(ID, 0L));
-        assertEquals(EquatableValueSet.of(ID, 0L, 1L).intersect(EquatableValueSet.of(ID, 0L, 2L)), EquatableValueSet.of(ID, 0L));
-        assertEquals(EquatableValueSet.of(ID, 0L, 1L).complement().intersect(EquatableValueSet.of(ID, 0L, 2L)), EquatableValueSet.of(ID, 2L));
-        assertEquals(EquatableValueSet.of(ID, 0L, 1L).complement().intersect(EquatableValueSet.of(ID, 0L, 2L).complement()), EquatableValueSet.of(ID, 0L, 1L, 2L).complement());
+        assertThat(EquatableValueSet.none(ID).intersect(EquatableValueSet.none(ID))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.all(ID).intersect(EquatableValueSet.all(ID))).isEqualTo(EquatableValueSet.all(ID));
+        assertThat(EquatableValueSet.none(ID).intersect(EquatableValueSet.all(ID))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.none(ID).intersect(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.all(ID).intersect(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.of(ID, 0L));
+        assertThat(EquatableValueSet.of(ID, 0L).intersect(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.of(ID, 0L));
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).intersect(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.of(ID, 0L));
+        assertThat(EquatableValueSet.of(ID, 0L).complement().intersect(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.of(ID, 0L).complement().intersect(EquatableValueSet.of(ID, 1L))).isEqualTo(EquatableValueSet.of(ID, 1L));
+        assertThat(EquatableValueSet.of(ID, 0L).intersect(EquatableValueSet.of(ID, 1L).complement())).isEqualTo(EquatableValueSet.of(ID, 0L));
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).intersect(EquatableValueSet.of(ID, 0L, 2L))).isEqualTo(EquatableValueSet.of(ID, 0L));
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().intersect(EquatableValueSet.of(ID, 0L, 2L))).isEqualTo(EquatableValueSet.of(ID, 2L));
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().intersect(EquatableValueSet.of(ID, 0L, 2L).complement())).isEqualTo(EquatableValueSet.of(ID, 0L, 1L, 2L).complement());
     }
 
     @Test
     public void testUnion()
     {
-        assertEquals(EquatableValueSet.none(ID).union(EquatableValueSet.none(ID)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.all(ID).union(EquatableValueSet.all(ID)), EquatableValueSet.all(ID));
-        assertEquals(EquatableValueSet.none(ID).union(EquatableValueSet.all(ID)), EquatableValueSet.all(ID));
-        assertEquals(EquatableValueSet.none(ID).union(EquatableValueSet.of(ID, 0L)), EquatableValueSet.of(ID, 0L));
-        assertEquals(EquatableValueSet.all(ID).union(EquatableValueSet.of(ID, 0L)), EquatableValueSet.all(ID));
-        assertEquals(EquatableValueSet.of(ID, 0L).union(EquatableValueSet.of(ID, 0L)), EquatableValueSet.of(ID, 0L));
-        assertEquals(EquatableValueSet.of(ID, 0L, 1L).union(EquatableValueSet.of(ID, 0L)), EquatableValueSet.of(ID, 0L, 1L));
-        assertEquals(EquatableValueSet.of(ID, 0L).complement().union(EquatableValueSet.of(ID, 0L)), EquatableValueSet.all(ID));
-        assertEquals(EquatableValueSet.of(ID, 0L).complement().union(EquatableValueSet.of(ID, 1L)), EquatableValueSet.of(ID, 0L).complement());
-        assertEquals(EquatableValueSet.of(ID, 0L).union(EquatableValueSet.of(ID, 1L).complement()), EquatableValueSet.of(ID, 1L).complement());
-        assertEquals(EquatableValueSet.of(ID, 0L, 1L).union(EquatableValueSet.of(ID, 0L, 2L)), EquatableValueSet.of(ID, 0L, 1L, 2L));
-        assertEquals(EquatableValueSet.of(ID, 0L, 1L).complement().union(EquatableValueSet.of(ID, 0L, 2L)), EquatableValueSet.of(ID, 1L).complement());
-        assertEquals(EquatableValueSet.of(ID, 0L, 1L).complement().union(EquatableValueSet.of(ID, 0L, 2L).complement()), EquatableValueSet.of(ID, 0L).complement());
+        assertThat(EquatableValueSet.none(ID).union(EquatableValueSet.none(ID))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.all(ID).union(EquatableValueSet.all(ID))).isEqualTo(EquatableValueSet.all(ID));
+        assertThat(EquatableValueSet.none(ID).union(EquatableValueSet.all(ID))).isEqualTo(EquatableValueSet.all(ID));
+        assertThat(EquatableValueSet.none(ID).union(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.of(ID, 0L));
+        assertThat(EquatableValueSet.all(ID).union(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.all(ID));
+        assertThat(EquatableValueSet.of(ID, 0L).union(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.of(ID, 0L));
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).union(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.of(ID, 0L, 1L));
+        assertThat(EquatableValueSet.of(ID, 0L).complement().union(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.all(ID));
+        assertThat(EquatableValueSet.of(ID, 0L).complement().union(EquatableValueSet.of(ID, 1L))).isEqualTo(EquatableValueSet.of(ID, 0L).complement());
+        assertThat(EquatableValueSet.of(ID, 0L).union(EquatableValueSet.of(ID, 1L).complement())).isEqualTo(EquatableValueSet.of(ID, 1L).complement());
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).union(EquatableValueSet.of(ID, 0L, 2L))).isEqualTo(EquatableValueSet.of(ID, 0L, 1L, 2L));
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().union(EquatableValueSet.of(ID, 0L, 2L))).isEqualTo(EquatableValueSet.of(ID, 1L).complement());
+        assertThat(EquatableValueSet.of(ID, 0L, 1L).complement().union(EquatableValueSet.of(ID, 0L, 2L).complement())).isEqualTo(EquatableValueSet.of(ID, 0L).complement());
     }
 
     @Test
     public void testSubtract()
     {
-        assertEquals(EquatableValueSet.all(ID).subtract(EquatableValueSet.all(ID)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.all(ID).subtract(EquatableValueSet.none(ID)), EquatableValueSet.all(ID));
-        assertEquals(EquatableValueSet.all(ID).subtract(EquatableValueSet.of(ID, 0L)), EquatableValueSet.of(ID, 0L).complement());
-        assertEquals(EquatableValueSet.all(ID).subtract(EquatableValueSet.of(ID, 0L, 1L)), EquatableValueSet.of(ID, 0L, 1L).complement());
-        assertEquals(EquatableValueSet.all(ID).subtract(EquatableValueSet.of(ID, 0L, 1L).complement()), EquatableValueSet.of(ID, 0L, 1L));
-
-        assertEquals(EquatableValueSet.none(ID).subtract(EquatableValueSet.all(ID)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.none(ID).subtract(EquatableValueSet.none(ID)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.none(ID).subtract(EquatableValueSet.of(ID, 0L)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.none(ID).subtract(EquatableValueSet.of(ID, 0L, 1L)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.none(ID).subtract(EquatableValueSet.of(ID, 0L, 1L).complement()), EquatableValueSet.none(ID));
-
-        assertEquals(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.all(ID)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.none(ID)), EquatableValueSet.of(ID, 0L));
-        assertEquals(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.of(ID, 0L)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.of(ID, 0L).complement()), EquatableValueSet.of(ID, 0L));
-        assertEquals(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.of(ID, 1L)), EquatableValueSet.of(ID, 0L));
-        assertEquals(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.of(ID, 1L).complement()), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.of(ID, 0L, 1L)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.of(ID, 0L, 1L).complement()), EquatableValueSet.of(ID, 0L));
-
-        assertEquals(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.all(ID)), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.none(ID)), EquatableValueSet.of(ID, 0L).complement());
-        assertEquals(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.of(ID, 0L)), EquatableValueSet.of(ID, 0L).complement());
-        assertEquals(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.of(ID, 0L).complement()), EquatableValueSet.none(ID));
-        assertEquals(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.of(ID, 1L)), EquatableValueSet.of(ID, 0L, 1L).complement());
-        assertEquals(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.of(ID, 1L).complement()), EquatableValueSet.of(ID, 1L));
-        assertEquals(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.of(ID, 0L, 1L)), EquatableValueSet.of(ID, 0L, 1L).complement());
-        assertEquals(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.of(ID, 0L, 1L).complement()), EquatableValueSet.of(ID, 1L));
+        assertThat(EquatableValueSet.all(ID).subtract(EquatableValueSet.all(ID))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.all(ID).subtract(EquatableValueSet.none(ID))).isEqualTo(EquatableValueSet.all(ID));
+        assertThat(EquatableValueSet.all(ID).subtract(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.of(ID, 0L).complement());
+        assertThat(EquatableValueSet.all(ID).subtract(EquatableValueSet.of(ID, 0L, 1L))).isEqualTo(EquatableValueSet.of(ID, 0L, 1L).complement());
+        assertThat(EquatableValueSet.all(ID).subtract(EquatableValueSet.of(ID, 0L, 1L).complement())).isEqualTo(EquatableValueSet.of(ID, 0L, 1L));
+
+        assertThat(EquatableValueSet.none(ID).subtract(EquatableValueSet.all(ID))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.none(ID).subtract(EquatableValueSet.none(ID))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.none(ID).subtract(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.none(ID).subtract(EquatableValueSet.of(ID, 0L, 1L))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.none(ID).subtract(EquatableValueSet.of(ID, 0L, 1L).complement())).isEqualTo(EquatableValueSet.none(ID));
+
+        assertThat(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.all(ID))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.none(ID))).isEqualTo(EquatableValueSet.of(ID, 0L));
+        assertThat(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.of(ID, 0L).complement())).isEqualTo(EquatableValueSet.of(ID, 0L));
+        assertThat(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.of(ID, 1L))).isEqualTo(EquatableValueSet.of(ID, 0L));
+        assertThat(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.of(ID, 1L).complement())).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.of(ID, 0L, 1L))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.of(ID, 0L).subtract(EquatableValueSet.of(ID, 0L, 1L).complement())).isEqualTo(EquatableValueSet.of(ID, 0L));
+
+        assertThat(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.all(ID))).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.none(ID))).isEqualTo(EquatableValueSet.of(ID, 0L).complement());
+        assertThat(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.of(ID, 0L))).isEqualTo(EquatableValueSet.of(ID, 0L).complement());
+        assertThat(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.of(ID, 0L).complement())).isEqualTo(EquatableValueSet.none(ID));
+        assertThat(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.of(ID, 1L))).isEqualTo(EquatableValueSet.of(ID, 0L, 1L).complement());
+        assertThat(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.of(ID, 1L).complement())).isEqualTo(EquatableValueSet.of(ID, 1L));
+        assertThat(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.of(ID, 0L, 1L))).isEqualTo(EquatableValueSet.of(ID, 0L, 1L).complement());
+        assertThat(EquatableValueSet.of(ID, 0L).complement().subtract(EquatableValueSet.of(ID, 0L, 1L).complement())).isEqualTo(EquatableValueSet.of(ID, 1L));
     }
 
     @Test
@@ -354,19 +347,19 @@ public void testJsonSerialization()
                         .addDeserializer(Block.class, new TestingBlockJsonSerde.Deserializer(blockEncodingSerde)));
 
         EquatableValueSet set = EquatableValueSet.all(ID);
-        assertEquals(set, mapper.readValue(mapper.writeValueAsString(set), EquatableValueSet.class));
+        assertThat(set).isEqualTo(mapper.readValue(mapper.writeValueAsString(set), EquatableValueSet.class));
 
         set = EquatableValueSet.none(ID);
-        assertEquals(set, mapper.readValue(mapper.writeValueAsString(set), EquatableValueSet.class));
+        assertThat(set).isEqualTo(mapper.readValue(mapper.writeValueAsString(set), EquatableValueSet.class));
 
         set = EquatableValueSet.of(ID, 1L);
-        assertEquals(set, mapper.readValue(mapper.writeValueAsString(set), EquatableValueSet.class));
+        assertThat(set).isEqualTo(mapper.readValue(mapper.writeValueAsString(set), EquatableValueSet.class));
 
         set = EquatableValueSet.of(ID, 1L, 2L);
-        assertEquals(set, mapper.readValue(mapper.writeValueAsString(set), EquatableValueSet.class));
+        assertThat(set).isEqualTo(mapper.readValue(mapper.writeValueAsString(set), EquatableValueSet.class));
 
         set = EquatableValueSet.of(ID, 1L, 2L).complement();
-        assertEquals(set, mapper.readValue(mapper.writeValueAsString(set), EquatableValueSet.class));
+        assertThat(set).isEqualTo(mapper.readValue(mapper.writeValueAsString(set), EquatableValueSet.class));
     }
 
     @Test
diff --git a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestRange.java b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestRange.java
index d258f657f7d5..ca80291266b4 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestRange.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestRange.java
@@ -13,7 +13,7 @@
  */
 package io.trino.spi.predicate;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -22,9 +22,6 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
 public class TestRange
 {
@@ -61,12 +58,12 @@ public void testSingleValueExclusive()
     @Test
     public void testSingleValue()
     {
-        assertTrue(Range.range(BIGINT, 1L, true, 1L, true).isSingleValue());
-        assertFalse(Range.range(BIGINT, 1L, true, 2L, true).isSingleValue());
-        assertTrue(Range.range(DOUBLE, 1.1, true, 1.1, true).isSingleValue());
-        assertTrue(Range.range(VARCHAR, utf8Slice("a"), true, utf8Slice("a"), true).isSingleValue());
-        assertTrue(Range.range(BOOLEAN, true, true, true, true).isSingleValue());
-        assertFalse(Range.range(BOOLEAN, false, true, true, true).isSingleValue());
+        assertThat(Range.range(BIGINT, 1L, true, 1L, true).isSingleValue()).isTrue();
+        assertThat(Range.range(BIGINT, 1L, true, 2L, true).isSingleValue()).isFalse();
+        assertThat(Range.range(DOUBLE, 1.1, true, 1.1, true).isSingleValue()).isTrue();
+        assertThat(Range.range(VARCHAR, utf8Slice("a"), true, utf8Slice("a"), true).isSingleValue()).isTrue();
+        assertThat(Range.range(BOOLEAN, true, true, true, true).isSingleValue()).isTrue();
+        assertThat(Range.range(BOOLEAN, false, true, true, true).isSingleValue()).isFalse();
     }
 
     @Test
@@ -74,21 +71,21 @@ public void testAllRange()
     {
         Range range = Range.all(BIGINT);
 
-        assertTrue(range.isLowUnbounded());
-        assertFalse(range.isLowInclusive());
+        assertThat(range.isLowUnbounded()).isTrue();
+        assertThat(range.isLowInclusive()).isFalse();
         assertThatThrownBy(range::getLowBoundedValue)
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("The range is low-unbounded");
 
-        assertTrue(range.isHighUnbounded());
-        assertFalse(range.isHighInclusive());
+        assertThat(range.isHighUnbounded()).isTrue();
+        assertThat(range.isHighInclusive()).isFalse();
         assertThatThrownBy(range::getHighBoundedValue)
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("The range is high-unbounded");
 
-        assertFalse(range.isSingleValue());
-        assertTrue(range.isAll());
-        assertEquals(range.getType(), BIGINT);
+        assertThat(range.isSingleValue()).isFalse();
+        assertThat(range.isAll()).isTrue();
+        assertThat(range.getType()).isEqualTo(BIGINT);
     }
 
     @Test
@@ -96,19 +93,19 @@ public void testGreaterThanRange()
     {
         Range range = Range.greaterThan(BIGINT, 1L);
 
-        assertFalse(range.isLowUnbounded());
-        assertFalse(range.isLowInclusive());
-        assertEquals(range.getLowBoundedValue(), 1L);
+        assertThat(range.isLowUnbounded()).isFalse();
+        assertThat(range.isLowInclusive()).isFalse();
+        assertThat(range.getLowBoundedValue()).isEqualTo(1L);
 
-        assertTrue(range.isHighUnbounded());
-        assertFalse(range.isHighInclusive());
+        assertThat(range.isHighUnbounded()).isTrue();
+        assertThat(range.isHighInclusive()).isFalse();
         assertThatThrownBy(range::getHighBoundedValue)
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("The range is high-unbounded");
 
-        assertFalse(range.isSingleValue());
-        assertFalse(range.isAll());
-        assertEquals(range.getType(), BIGINT);
+        assertThat(range.isSingleValue()).isFalse();
+        assertThat(range.isAll()).isFalse();
+        assertThat(range.getType()).isEqualTo(BIGINT);
     }
 
     @Test
@@ -116,19 +113,19 @@ public void testGreaterThanOrEqualRange()
     {
         Range range = Range.greaterThanOrEqual(BIGINT, 1L);
 
-        assertFalse(range.isLowUnbounded());
-        assertTrue(range.isLowInclusive());
-        assertEquals(range.getLowBoundedValue(), 1L);
+        assertThat(range.isLowUnbounded()).isFalse();
+        assertThat(range.isLowInclusive()).isTrue();
+        assertThat(range.getLowBoundedValue()).isEqualTo(1L);
 
-        assertTrue(range.isHighUnbounded());
-        assertFalse(range.isHighInclusive());
+        assertThat(range.isHighUnbounded()).isTrue();
+        assertThat(range.isHighInclusive()).isFalse();
         assertThatThrownBy(range::getHighBoundedValue)
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("The range is high-unbounded");
 
-        assertFalse(range.isSingleValue());
-        assertFalse(range.isAll());
-        assertEquals(range.getType(), BIGINT);
+        assertThat(range.isSingleValue()).isFalse();
+        assertThat(range.isAll()).isFalse();
+        assertThat(range.getType()).isEqualTo(BIGINT);
     }
 
     @Test
@@ -136,19 +133,19 @@ public void testLessThanRange()
     {
         Range range = Range.lessThan(BIGINT, 1L);
 
-        assertTrue(range.isLowUnbounded());
-        assertFalse(range.isLowInclusive());
+        assertThat(range.isLowUnbounded()).isTrue();
+        assertThat(range.isLowInclusive()).isFalse();
         assertThatThrownBy(range::getLowBoundedValue)
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("The range is low-unbounded");
 
-        assertFalse(range.isHighUnbounded());
-        assertFalse(range.isHighInclusive());
-        assertEquals(range.getHighBoundedValue(), 1L);
+        assertThat(range.isHighUnbounded()).isFalse();
+        assertThat(range.isHighInclusive()).isFalse();
+        assertThat(range.getHighBoundedValue()).isEqualTo(1L);
 
-        assertFalse(range.isSingleValue());
-        assertFalse(range.isAll());
-        assertEquals(range.getType(), BIGINT);
+        assertThat(range.isSingleValue()).isFalse();
+        assertThat(range.isAll()).isFalse();
+        assertThat(range.getType()).isEqualTo(BIGINT);
     }
 
     @Test
@@ -156,19 +153,19 @@ public void testLessThanOrEqualRange()
     {
         Range range = Range.lessThanOrEqual(BIGINT, 1L);
 
-        assertTrue(range.isLowUnbounded());
-        assertFalse(range.isLowInclusive());
+        assertThat(range.isLowUnbounded()).isTrue();
+        assertThat(range.isLowInclusive()).isFalse();
         assertThatThrownBy(range::getLowBoundedValue)
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("The range is low-unbounded");
 
-        assertFalse(range.isHighUnbounded());
-        assertTrue(range.isHighInclusive());
-        assertEquals(range.getHighBoundedValue(), 1L);
+        assertThat(range.isHighUnbounded()).isFalse();
+        assertThat(range.isHighInclusive()).isTrue();
+        assertThat(range.getHighBoundedValue()).isEqualTo(1L);
 
-        assertFalse(range.isSingleValue());
-        assertFalse(range.isAll());
-        assertEquals(range.getType(), BIGINT);
+        assertThat(range.isSingleValue()).isFalse();
+        assertThat(range.isAll()).isFalse();
+        assertThat(range.getType()).isEqualTo(BIGINT);
     }
 
     @Test
@@ -176,40 +173,40 @@ public void testEqualRange()
     {
         Range range = Range.equal(BIGINT, 1L);
 
-        assertFalse(range.isLowUnbounded());
-        assertTrue(range.isLowInclusive());
-        assertEquals(range.getLowBoundedValue(), 1L);
+        assertThat(range.isLowUnbounded()).isFalse();
+        assertThat(range.isLowInclusive()).isTrue();
+        assertThat(range.getLowBoundedValue()).isEqualTo(1L);
 
-        assertFalse(range.isHighUnbounded());
-        assertTrue(range.isHighInclusive());
-        assertEquals(range.getHighBoundedValue(), 1L);
+        assertThat(range.isHighUnbounded()).isFalse();
+        assertThat(range.isHighInclusive()).isTrue();
+        assertThat(range.getHighBoundedValue()).isEqualTo(1L);
 
-        assertTrue(range.isSingleValue());
-        assertFalse(range.isAll());
-        assertEquals(range.getType(), BIGINT);
+        assertThat(range.isSingleValue()).isTrue();
+        assertThat(range.isAll()).isFalse();
+        assertThat(range.getType()).isEqualTo(BIGINT);
     }
 
     @Test
     public void testRange()
     {
         Range range = Range.range(BIGINT, 0L, false, 2L, true);
-        assertFalse(range.isLowUnbounded());
-        assertFalse(range.isLowInclusive());
-        assertEquals(range.getLowBoundedValue(), 0L);
+        assertThat(range.isLowUnbounded()).isFalse();
+        assertThat(range.isLowInclusive()).isFalse();
+        assertThat(range.getLowBoundedValue()).isEqualTo(0L);
 
-        assertFalse(range.isHighUnbounded());
-        assertTrue(range.isHighInclusive());
-        assertEquals(range.getHighBoundedValue(), 2L);
+        assertThat(range.isHighUnbounded()).isFalse();
+        assertThat(range.isHighInclusive()).isTrue();
+        assertThat(range.getHighBoundedValue()).isEqualTo(2L);
 
-        assertFalse(range.isSingleValue());
-        assertFalse(range.isAll());
-        assertEquals(range.getType(), BIGINT);
+        assertThat(range.isSingleValue()).isFalse();
+        assertThat(range.isAll()).isFalse();
+        assertThat(range.getType()).isEqualTo(BIGINT);
     }
 
     @Test
     public void testGetSingleValue()
     {
-        assertEquals(Range.equal(BIGINT, 0L).getSingleValue(), 0L);
+        assertThat(Range.equal(BIGINT, 0L).getSingleValue()).isEqualTo(0L);
         assertThatThrownBy(() -> Range.lessThan(BIGINT, 0L).getSingleValue())
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("Range does not have just a single value");
@@ -218,43 +215,43 @@ public void testGetSingleValue()
     @Test
     public void testContains()
     {
-        assertTrue(Range.all(BIGINT).contains(Range.all(BIGINT)));
-        assertTrue(Range.all(BIGINT).contains(Range.equal(BIGINT, 0L)));
-        assertTrue(Range.all(BIGINT).contains(Range.greaterThan(BIGINT, 0L)));
-        assertTrue(Range.equal(BIGINT, 0L).contains(Range.equal(BIGINT, 0L)));
-        assertFalse(Range.equal(BIGINT, 0L).contains(Range.greaterThan(BIGINT, 0L)));
-        assertFalse(Range.equal(BIGINT, 0L).contains(Range.greaterThanOrEqual(BIGINT, 0L)));
-        assertFalse(Range.equal(BIGINT, 0L).contains(Range.all(BIGINT)));
-        assertTrue(Range.greaterThanOrEqual(BIGINT, 0L).contains(Range.greaterThan(BIGINT, 0L)));
-        assertTrue(Range.greaterThan(BIGINT, 0L).contains(Range.greaterThan(BIGINT, 1L)));
-        assertFalse(Range.greaterThan(BIGINT, 0L).contains(Range.lessThan(BIGINT, 0L)));
-        assertTrue(Range.range(BIGINT, 0L, true, 2L, true).contains(Range.range(BIGINT, 1L, true, 2L, true)));
-        assertFalse(Range.range(BIGINT, 0L, true, 2L, true).contains(Range.range(BIGINT, 1L, true, 3L, false)));
+        assertThat(Range.all(BIGINT).contains(Range.all(BIGINT))).isTrue();
+        assertThat(Range.all(BIGINT).contains(Range.equal(BIGINT, 0L))).isTrue();
+        assertThat(Range.all(BIGINT).contains(Range.greaterThan(BIGINT, 0L))).isTrue();
+        assertThat(Range.equal(BIGINT, 0L).contains(Range.equal(BIGINT, 0L))).isTrue();
+        assertThat(Range.equal(BIGINT, 0L).contains(Range.greaterThan(BIGINT, 0L))).isFalse();
+        assertThat(Range.equal(BIGINT, 0L).contains(Range.greaterThanOrEqual(BIGINT, 0L))).isFalse();
+        assertThat(Range.equal(BIGINT, 0L).contains(Range.all(BIGINT))).isFalse();
+        assertThat(Range.greaterThanOrEqual(BIGINT, 0L).contains(Range.greaterThan(BIGINT, 0L))).isTrue();
+        assertThat(Range.greaterThan(BIGINT, 0L).contains(Range.greaterThan(BIGINT, 1L))).isTrue();
+        assertThat(Range.greaterThan(BIGINT, 0L).contains(Range.lessThan(BIGINT, 0L))).isFalse();
+        assertThat(Range.range(BIGINT, 0L, true, 2L, true).contains(Range.range(BIGINT, 1L, true, 2L, true))).isTrue();
+        assertThat(Range.range(BIGINT, 0L, true, 2L, true).contains(Range.range(BIGINT, 1L, true, 3L, false))).isFalse();
     }
 
     @Test
     public void testSpan()
     {
-        assertEquals(Range.greaterThan(BIGINT, 1L).span(Range.lessThanOrEqual(BIGINT, 2L)), Range.all(BIGINT));
-        assertEquals(Range.greaterThan(BIGINT, 2L).span(Range.lessThanOrEqual(BIGINT, 0L)), Range.all(BIGINT));
-        assertEquals(Range.range(BIGINT, 1L, true, 3L, false).span(Range.equal(BIGINT, 2L)), Range.range(BIGINT, 1L, true, 3L, false));
-        assertEquals(Range.range(BIGINT, 1L, true, 3L, false).span(Range.range(BIGINT, 2L, false, 10L, false)), Range.range(BIGINT, 1L, true, 10L, false));
-        assertEquals(Range.greaterThan(BIGINT, 1L).span(Range.equal(BIGINT, 0L)), Range.greaterThanOrEqual(BIGINT, 0L));
-        assertEquals(Range.greaterThan(BIGINT, 1L).span(Range.greaterThanOrEqual(BIGINT, 10L)), Range.greaterThan(BIGINT, 1L));
-        assertEquals(Range.lessThan(BIGINT, 1L).span(Range.lessThanOrEqual(BIGINT, 1L)), Range.lessThanOrEqual(BIGINT, 1L));
-        assertEquals(Range.all(BIGINT).span(Range.lessThanOrEqual(BIGINT, 1L)), Range.all(BIGINT));
+        assertThat(Range.greaterThan(BIGINT, 1L).span(Range.lessThanOrEqual(BIGINT, 2L))).isEqualTo(Range.all(BIGINT));
+        assertThat(Range.greaterThan(BIGINT, 2L).span(Range.lessThanOrEqual(BIGINT, 0L))).isEqualTo(Range.all(BIGINT));
+        assertThat(Range.range(BIGINT, 1L, true, 3L, false).span(Range.equal(BIGINT, 2L))).isEqualTo(Range.range(BIGINT, 1L, true, 3L, false));
+        assertThat(Range.range(BIGINT, 1L, true, 3L, false).span(Range.range(BIGINT, 2L, false, 10L, false))).isEqualTo(Range.range(BIGINT, 1L, true, 10L, false));
+        assertThat(Range.greaterThan(BIGINT, 1L).span(Range.equal(BIGINT, 0L))).isEqualTo(Range.greaterThanOrEqual(BIGINT, 0L));
+        assertThat(Range.greaterThan(BIGINT, 1L).span(Range.greaterThanOrEqual(BIGINT, 10L))).isEqualTo(Range.greaterThan(BIGINT, 1L));
+        assertThat(Range.lessThan(BIGINT, 1L).span(Range.lessThanOrEqual(BIGINT, 1L))).isEqualTo(Range.lessThanOrEqual(BIGINT, 1L));
+        assertThat(Range.all(BIGINT).span(Range.lessThanOrEqual(BIGINT, 1L))).isEqualTo(Range.all(BIGINT));
     }
 
     @Test
     public void testOverlaps()
     {
-        assertTrue(Range.greaterThan(BIGINT, 1L).overlaps(Range.lessThanOrEqual(BIGINT, 2L)));
-        assertFalse(Range.greaterThan(BIGINT, 2L).overlaps(Range.lessThan(BIGINT, 2L)));
-        assertTrue(Range.range(BIGINT, 1L, true, 3L, false).overlaps(Range.equal(BIGINT, 2L)));
-        assertTrue(Range.range(BIGINT, 1L, true, 3L, false).overlaps(Range.range(BIGINT, 2L, false, 10L, false)));
-        assertFalse(Range.range(BIGINT, 1L, true, 3L, false).overlaps(Range.range(BIGINT, 3L, true, 10L, false)));
-        assertTrue(Range.range(BIGINT, 1L, true, 3L, true).overlaps(Range.range(BIGINT, 3L, true, 10L, false)));
-        assertTrue(Range.all(BIGINT).overlaps(Range.equal(BIGINT, Long.MAX_VALUE)));
+        assertThat(Range.greaterThan(BIGINT, 1L).overlaps(Range.lessThanOrEqual(BIGINT, 2L))).isTrue();
+        assertThat(Range.greaterThan(BIGINT, 2L).overlaps(Range.lessThan(BIGINT, 2L))).isFalse();
+        assertThat(Range.range(BIGINT, 1L, true, 3L, false).overlaps(Range.equal(BIGINT, 2L))).isTrue();
+        assertThat(Range.range(BIGINT, 1L, true, 3L, false).overlaps(Range.range(BIGINT, 2L, false, 10L, false))).isTrue();
+        assertThat(Range.range(BIGINT, 1L, true, 3L, false).overlaps(Range.range(BIGINT, 3L, true, 10L, false))).isFalse();
+        assertThat(Range.range(BIGINT, 1L, true, 3L, true).overlaps(Range.range(BIGINT, 3L, true, 10L, false))).isTrue();
+        assertThat(Range.all(BIGINT).overlaps(Range.equal(BIGINT, Long.MAX_VALUE))).isTrue();
     }
 
     @Test
diff --git a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestSortedRangeSet.java b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestSortedRangeSet.java
index e98c210c3f2c..a6c1408506e3 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestSortedRangeSet.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestSortedRangeSet.java
@@ -16,7 +16,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
 import io.airlift.json.ObjectMapperProvider;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.TestingBlockEncodingSerde;
@@ -25,9 +24,9 @@
 import io.trino.spi.type.TestingTypeManager;
 import io.trino.spi.type.Type;
 import org.assertj.core.api.AssertProvider;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
@@ -47,9 +46,6 @@
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
 public class TestSortedRangeSet
 {
@@ -57,29 +53,29 @@ public class TestSortedRangeSet
     public void testEmptySet()
     {
         SortedRangeSet rangeSet = SortedRangeSet.none(BIGINT);
-        assertEquals(rangeSet.getType(), BIGINT);
-        assertTrue(rangeSet.isNone());
-        assertFalse(rangeSet.isAll());
-        assertFalse(rangeSet.isSingleValue());
-        assertTrue(rangeSet.getOrderedRanges().isEmpty());
-        assertEquals(rangeSet.getRangeCount(), 0);
-        assertEquals(rangeSet.complement(), SortedRangeSet.all(BIGINT));
-        assertFalse(rangeSet.containsValue(0L));
-        assertEquals(rangeSet.toString(), "SortedRangeSet[type=bigint, ranges=0, {}]");
+        assertThat(rangeSet.getType()).isEqualTo(BIGINT);
+        assertThat(rangeSet.isNone()).isTrue();
+        assertThat(rangeSet.isAll()).isFalse();
+        assertThat(rangeSet.isSingleValue()).isFalse();
+        assertThat(rangeSet.getOrderedRanges().isEmpty()).isTrue();
+        assertThat(rangeSet.getRangeCount()).isEqualTo(0);
+        assertThat(rangeSet.complement()).isEqualTo(SortedRangeSet.all(BIGINT));
+        assertThat(rangeSet.containsValue(0L)).isFalse();
+        assertThat(rangeSet.toString()).isEqualTo("SortedRangeSet[type=bigint, ranges=0, {}]");
     }
 
     @Test
     public void testEntireSet()
     {
         SortedRangeSet rangeSet = SortedRangeSet.all(BIGINT);
-        assertEquals(rangeSet.getType(), BIGINT);
-        assertFalse(rangeSet.isNone());
-        assertTrue(rangeSet.isAll());
-        assertFalse(rangeSet.isSingleValue());
-        assertEquals(rangeSet.getRangeCount(), 1);
-        assertEquals(rangeSet.complement(), SortedRangeSet.none(BIGINT));
-        assertTrue(rangeSet.containsValue(0L));
-        assertEquals(rangeSet.toString(), "SortedRangeSet[type=bigint, ranges=1, {(<min>,<max>)}]");
+        assertThat(rangeSet.getType()).isEqualTo(BIGINT);
+        assertThat(rangeSet.isNone()).isFalse();
+        assertThat(rangeSet.isAll()).isTrue();
+        assertThat(rangeSet.isSingleValue()).isFalse();
+        assertThat(rangeSet.getRangeCount()).isEqualTo(1);
+        assertThat(rangeSet.complement()).isEqualTo(SortedRangeSet.none(BIGINT));
+        assertThat(rangeSet.containsValue(0L)).isTrue();
+        assertThat(rangeSet.toString()).isEqualTo("SortedRangeSet[type=bigint, ranges=1, {(<min>,<max>)}]");
     }
 
     @Test
@@ -89,20 +85,18 @@ public void testSingleValue()
 
         SortedRangeSet complement = SortedRangeSet.of(Range.greaterThan(BIGINT, 10L), Range.lessThan(BIGINT, 10L));
 
-        assertEquals(rangeSet.getType(), BIGINT);
-        assertFalse(rangeSet.isNone());
-        assertFalse(rangeSet.isAll());
-        assertTrue(rangeSet.isSingleValue());
-        assertTrue(Iterables.elementsEqual(rangeSet.getOrderedRanges(), ImmutableList.of(Range.equal(BIGINT, 10L))));
-        assertEquals(rangeSet.getRangeCount(), 1);
-        assertEquals(rangeSet.complement(), complement);
-        assertTrue(rangeSet.containsValue(10L));
-        assertFalse(rangeSet.containsValue(9L));
-        assertEquals(rangeSet.toString(), "SortedRangeSet[type=bigint, ranges=1, {[10]}]");
-
-        assertEquals(
-                SortedRangeSet.of(Range.equal(VARCHAR, utf8Slice("LARGE PLATED NICKEL"))).toString(),
-                "SortedRangeSet[type=varchar, ranges=1, {[LARGE PLATED NICKEL]}]");
+        assertThat(rangeSet.getType()).isEqualTo(BIGINT);
+        assertThat(rangeSet.isNone()).isFalse();
+        assertThat(rangeSet.isAll()).isFalse();
+        assertThat(rangeSet.isSingleValue()).isTrue();
+        assertThat(rangeSet.getOrderedRanges()).isEqualTo(ImmutableList.of(Range.equal(BIGINT, 10L)));
+        assertThat(rangeSet.getRangeCount()).isEqualTo(1);
+        assertThat(rangeSet.complement()).isEqualTo(complement);
+        assertThat(rangeSet.containsValue(10L)).isTrue();
+        assertThat(rangeSet.containsValue(9L)).isFalse();
+        assertThat(rangeSet.toString()).isEqualTo("SortedRangeSet[type=bigint, ranges=1, {[10]}]");
+
+        assertThat(SortedRangeSet.of(Range.equal(VARCHAR, utf8Slice("LARGE PLATED NICKEL"))).toString()).isEqualTo("SortedRangeSet[type=varchar, ranges=1, {[LARGE PLATED NICKEL]}]");
     }
 
     @Test
@@ -127,25 +121,21 @@ public void testBoundedSet()
                 Range.range(BIGINT, 5L, false, 9L, false),
                 Range.greaterThanOrEqual(BIGINT, 11L));
 
-        assertEquals(rangeSet.getType(), BIGINT);
-        assertFalse(rangeSet.isNone());
-        assertFalse(rangeSet.isAll());
-        assertFalse(rangeSet.isSingleValue());
-        assertTrue(Iterables.elementsEqual(rangeSet.getOrderedRanges(), normalizedResult));
-        assertEquals(rangeSet, SortedRangeSet.copyOf(BIGINT, normalizedResult));
-        assertEquals(rangeSet.getRangeCount(), 3);
-        assertEquals(rangeSet.complement(), complement);
-        assertTrue(rangeSet.containsValue(0L));
-        assertFalse(rangeSet.containsValue(1L));
-        assertFalse(rangeSet.containsValue(7L));
-        assertTrue(rangeSet.containsValue(9L));
-        assertEquals(rangeSet.toString(), "SortedRangeSet[type=bigint, ranges=3, {[0], [2,5], [9,11)}]");
-        assertEquals(
-                rangeSet.toString(ToStringSession.INSTANCE, 2),
-                "SortedRangeSet[type=bigint, ranges=3, {[0], ..., [9,11)}]");
-        assertEquals(
-                rangeSet.toString(ToStringSession.INSTANCE, 1),
-                "SortedRangeSet[type=bigint, ranges=3, {[0], ...}]");
+        assertThat(rangeSet.getType()).isEqualTo(BIGINT);
+        assertThat(rangeSet.isNone()).isFalse();
+        assertThat(rangeSet.isAll()).isFalse();
+        assertThat(rangeSet.isSingleValue()).isFalse();
+        assertThat(rangeSet.getOrderedRanges()).isEqualTo(normalizedResult);
+        assertThat(rangeSet).isEqualTo(SortedRangeSet.copyOf(BIGINT, normalizedResult));
+        assertThat(rangeSet.getRangeCount()).isEqualTo(3);
+        assertThat(rangeSet.complement()).isEqualTo(complement);
+        assertThat(rangeSet.containsValue(0L)).isTrue();
+        assertThat(rangeSet.containsValue(1L)).isFalse();
+        assertThat(rangeSet.containsValue(7L)).isFalse();
+        assertThat(rangeSet.containsValue(9L)).isTrue();
+        assertThat(rangeSet.toString()).isEqualTo("SortedRangeSet[type=bigint, ranges=3, {[0], [2,5], [9,11)}]");
+        assertThat(rangeSet.toString(ToStringSession.INSTANCE, 2)).isEqualTo("SortedRangeSet[type=bigint, ranges=3, {[0], ..., [9,11)}]");
+        assertThat(rangeSet.toString(ToStringSession.INSTANCE, 1)).isEqualTo("SortedRangeSet[type=bigint, ranges=3, {[0], ...}]");
     }
 
     @Test
@@ -168,18 +158,18 @@ public void testUnboundedSet()
                 Range.range(BIGINT, 0L, false, 1L, true),
                 Range.range(BIGINT, 6L, true, 9L, true));
 
-        assertEquals(rangeSet.getType(), BIGINT);
-        assertFalse(rangeSet.isNone());
-        assertFalse(rangeSet.isAll());
-        assertFalse(rangeSet.isSingleValue());
-        assertTrue(Iterables.elementsEqual(rangeSet.getOrderedRanges(), normalizedResult));
-        assertEquals(rangeSet, SortedRangeSet.copyOf(BIGINT, normalizedResult));
-        assertEquals(rangeSet.getRangeCount(), 3);
-        assertEquals(rangeSet.complement(), complement);
-        assertTrue(rangeSet.containsValue(0L));
-        assertTrue(rangeSet.containsValue(4L));
-        assertFalse(rangeSet.containsValue(7L));
-        assertEquals(rangeSet.toString(), "SortedRangeSet[type=bigint, ranges=3, {(<min>,0], (1,6), (9,<max>)}]");
+        assertThat(rangeSet.getType()).isEqualTo(BIGINT);
+        assertThat(rangeSet.isNone()).isFalse();
+        assertThat(rangeSet.isAll()).isFalse();
+        assertThat(rangeSet.isSingleValue()).isFalse();
+        assertThat(rangeSet.getOrderedRanges()).isEqualTo(normalizedResult);
+        assertThat(rangeSet).isEqualTo(SortedRangeSet.copyOf(BIGINT, normalizedResult));
+        assertThat(rangeSet.getRangeCount()).isEqualTo(3);
+        assertThat(rangeSet.complement()).isEqualTo(complement);
+        assertThat(rangeSet.containsValue(0L)).isTrue();
+        assertThat(rangeSet.containsValue(4L)).isTrue();
+        assertThat(rangeSet.containsValue(7L)).isFalse();
+        assertThat(rangeSet.toString()).isEqualTo("SortedRangeSet[type=bigint, ranges=3, {(<min>,0], (1,6), (9,<max>)}]");
     }
 
     @Test
@@ -213,7 +203,7 @@ public void testCreateWithRanges()
     @Test
     public void testGetSingleValue()
     {
-        assertEquals(SortedRangeSet.of(BIGINT, 0L).getSingleValue(), 0L);
+        assertThat(SortedRangeSet.of(BIGINT, 0L).getSingleValue()).isEqualTo(0L);
         assertThatThrownBy(() -> SortedRangeSet.all(BIGINT).getSingleValue())
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("SortedRangeSet does not have just a single value");
@@ -226,91 +216,91 @@ public void testSpan()
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("Cannot get span if no ranges exist");
 
-        assertEquals(SortedRangeSet.all(BIGINT).getSpan(), Range.all(BIGINT));
-        assertEquals(SortedRangeSet.of(BIGINT, 0L).getSpan(), Range.equal(BIGINT, 0L));
-        assertEquals(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).getSpan(), Range.range(BIGINT, 0L, true, 1L, true));
-        assertEquals(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.greaterThan(BIGINT, 1L)).getSpan(), Range.greaterThanOrEqual(BIGINT, 0L));
-        assertEquals(SortedRangeSet.of(Range.lessThan(BIGINT, 0L), Range.greaterThan(BIGINT, 1L)).getSpan(), Range.all(BIGINT));
+        assertThat(SortedRangeSet.all(BIGINT).getSpan()).isEqualTo(Range.all(BIGINT));
+        assertThat(SortedRangeSet.of(BIGINT, 0L).getSpan()).isEqualTo(Range.equal(BIGINT, 0L));
+        assertThat(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).getSpan()).isEqualTo(Range.range(BIGINT, 0L, true, 1L, true));
+        assertThat(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.greaterThan(BIGINT, 1L)).getSpan()).isEqualTo(Range.greaterThanOrEqual(BIGINT, 0L));
+        assertThat(SortedRangeSet.of(Range.lessThan(BIGINT, 0L), Range.greaterThan(BIGINT, 1L)).getSpan()).isEqualTo(Range.all(BIGINT));
     }
 
     @Test
     public void testOverlaps()
     {
-        assertTrue(SortedRangeSet.all(BIGINT).overlaps(SortedRangeSet.all(BIGINT)));
-        assertFalse(SortedRangeSet.all(BIGINT).overlaps(SortedRangeSet.none(BIGINT)));
-        assertTrue(SortedRangeSet.all(BIGINT).overlaps(SortedRangeSet.of(BIGINT, 0L)));
-        assertTrue(SortedRangeSet.all(BIGINT).overlaps(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L))));
-        assertTrue(SortedRangeSet.all(BIGINT).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))));
-        assertTrue(SortedRangeSet.all(BIGINT).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L), Range.lessThan(BIGINT, 0L))));
-
-        assertFalse(SortedRangeSet.none(BIGINT).overlaps(SortedRangeSet.all(BIGINT)));
-        assertFalse(SortedRangeSet.none(BIGINT).overlaps(SortedRangeSet.none(BIGINT)));
-        assertFalse(SortedRangeSet.none(BIGINT).overlaps(SortedRangeSet.of(BIGINT, 0L)));
-        assertFalse(SortedRangeSet.none(BIGINT).overlaps(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L))));
-        assertFalse(SortedRangeSet.none(BIGINT).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))));
-        assertFalse(SortedRangeSet.none(BIGINT).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L), Range.lessThan(BIGINT, 0L))));
-
-        assertTrue(SortedRangeSet.of(BIGINT, 0L).overlaps(SortedRangeSet.all(BIGINT)));
-        assertFalse(SortedRangeSet.of(BIGINT, 0L).overlaps(SortedRangeSet.none(BIGINT)));
-        assertTrue(SortedRangeSet.of(BIGINT, 0L).overlaps(SortedRangeSet.of(BIGINT, 0L)));
-        assertTrue(SortedRangeSet.of(BIGINT, 0L).overlaps(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L))));
-        assertFalse(SortedRangeSet.of(BIGINT, 0L).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))));
-        assertFalse(SortedRangeSet.of(BIGINT, 0L).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L), Range.lessThan(BIGINT, 0L))));
-
-        assertTrue(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).overlaps(SortedRangeSet.of(Range.equal(BIGINT, 1L))));
-        assertFalse(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).overlaps(SortedRangeSet.of(Range.equal(BIGINT, 2L))));
-        assertTrue(SortedRangeSet.of(Range.greaterThanOrEqual(BIGINT, 0L)).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))));
-        assertTrue(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).overlaps(SortedRangeSet.of(Range.greaterThanOrEqual(BIGINT, 0L))));
-        assertFalse(SortedRangeSet.of(Range.lessThan(BIGINT, 0L)).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))));
+        assertThat(SortedRangeSet.all(BIGINT).overlaps(SortedRangeSet.all(BIGINT))).isTrue();
+        assertThat(SortedRangeSet.all(BIGINT).overlaps(SortedRangeSet.none(BIGINT))).isFalse();
+        assertThat(SortedRangeSet.all(BIGINT).overlaps(SortedRangeSet.of(BIGINT, 0L))).isTrue();
+        assertThat(SortedRangeSet.all(BIGINT).overlaps(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)))).isTrue();
+        assertThat(SortedRangeSet.all(BIGINT).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isTrue();
+        assertThat(SortedRangeSet.all(BIGINT).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L), Range.lessThan(BIGINT, 0L)))).isTrue();
+
+        assertThat(SortedRangeSet.none(BIGINT).overlaps(SortedRangeSet.all(BIGINT))).isFalse();
+        assertThat(SortedRangeSet.none(BIGINT).overlaps(SortedRangeSet.none(BIGINT))).isFalse();
+        assertThat(SortedRangeSet.none(BIGINT).overlaps(SortedRangeSet.of(BIGINT, 0L))).isFalse();
+        assertThat(SortedRangeSet.none(BIGINT).overlaps(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)))).isFalse();
+        assertThat(SortedRangeSet.none(BIGINT).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isFalse();
+        assertThat(SortedRangeSet.none(BIGINT).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L), Range.lessThan(BIGINT, 0L)))).isFalse();
+
+        assertThat(SortedRangeSet.of(BIGINT, 0L).overlaps(SortedRangeSet.all(BIGINT))).isTrue();
+        assertThat(SortedRangeSet.of(BIGINT, 0L).overlaps(SortedRangeSet.none(BIGINT))).isFalse();
+        assertThat(SortedRangeSet.of(BIGINT, 0L).overlaps(SortedRangeSet.of(BIGINT, 0L))).isTrue();
+        assertThat(SortedRangeSet.of(BIGINT, 0L).overlaps(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)))).isTrue();
+        assertThat(SortedRangeSet.of(BIGINT, 0L).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isFalse();
+        assertThat(SortedRangeSet.of(BIGINT, 0L).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L), Range.lessThan(BIGINT, 0L)))).isFalse();
+
+        assertThat(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).overlaps(SortedRangeSet.of(Range.equal(BIGINT, 1L)))).isTrue();
+        assertThat(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).overlaps(SortedRangeSet.of(Range.equal(BIGINT, 2L)))).isFalse();
+        assertThat(SortedRangeSet.of(Range.greaterThanOrEqual(BIGINT, 0L)).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isTrue();
+        assertThat(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).overlaps(SortedRangeSet.of(Range.greaterThanOrEqual(BIGINT, 0L)))).isTrue();
+        assertThat(SortedRangeSet.of(Range.lessThan(BIGINT, 0L)).overlaps(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isFalse();
     }
 
     @Test
     public void testContains()
     {
-        assertTrue(SortedRangeSet.all(BIGINT).contains(SortedRangeSet.all(BIGINT)));
-        assertTrue(SortedRangeSet.all(BIGINT).contains(SortedRangeSet.none(BIGINT)));
-        assertTrue(SortedRangeSet.all(BIGINT).contains(SortedRangeSet.of(BIGINT, 0L)));
-        assertTrue(SortedRangeSet.all(BIGINT).contains(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L))));
-        assertTrue(SortedRangeSet.all(BIGINT).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))));
-        assertTrue(SortedRangeSet.all(BIGINT).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L), Range.lessThan(BIGINT, 0L))));
-
-        assertFalse(SortedRangeSet.none(BIGINT).contains(SortedRangeSet.all(BIGINT)));
-        assertTrue(SortedRangeSet.none(BIGINT).contains(SortedRangeSet.none(BIGINT)));
-        assertFalse(SortedRangeSet.none(BIGINT).contains(SortedRangeSet.of(BIGINT, 0L)));
-        assertFalse(SortedRangeSet.none(BIGINT).contains(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L))));
-        assertFalse(SortedRangeSet.none(BIGINT).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))));
-        assertFalse(SortedRangeSet.none(BIGINT).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L), Range.lessThan(BIGINT, 0L))));
+        assertThat(SortedRangeSet.all(BIGINT).contains(SortedRangeSet.all(BIGINT))).isTrue();
+        assertThat(SortedRangeSet.all(BIGINT).contains(SortedRangeSet.none(BIGINT))).isTrue();
+        assertThat(SortedRangeSet.all(BIGINT).contains(SortedRangeSet.of(BIGINT, 0L))).isTrue();
+        assertThat(SortedRangeSet.all(BIGINT).contains(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)))).isTrue();
+        assertThat(SortedRangeSet.all(BIGINT).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isTrue();
+        assertThat(SortedRangeSet.all(BIGINT).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L), Range.lessThan(BIGINT, 0L)))).isTrue();
+
+        assertThat(SortedRangeSet.none(BIGINT).contains(SortedRangeSet.all(BIGINT))).isFalse();
+        assertThat(SortedRangeSet.none(BIGINT).contains(SortedRangeSet.none(BIGINT))).isTrue();
+        assertThat(SortedRangeSet.none(BIGINT).contains(SortedRangeSet.of(BIGINT, 0L))).isFalse();
+        assertThat(SortedRangeSet.none(BIGINT).contains(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)))).isFalse();
+        assertThat(SortedRangeSet.none(BIGINT).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isFalse();
+        assertThat(SortedRangeSet.none(BIGINT).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L), Range.lessThan(BIGINT, 0L)))).isFalse();
 
         ValueSet valueSet = SortedRangeSet.of(BIGINT, 0L);
-        assertTrue(valueSet.contains(valueSet));
+        assertThat(valueSet.contains(valueSet)).isTrue();
 
-        assertFalse(SortedRangeSet.of(BIGINT, 0L).contains(SortedRangeSet.all(BIGINT)));
-        assertTrue(SortedRangeSet.of(BIGINT, 0L).contains(SortedRangeSet.none(BIGINT)));
-        assertTrue(SortedRangeSet.of(BIGINT, 0L).contains(SortedRangeSet.of(BIGINT, 0L)));
-        assertFalse(SortedRangeSet.of(BIGINT, 0L).contains(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L))));
-        assertFalse(SortedRangeSet.of(BIGINT, 0L).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))));
-        assertFalse(SortedRangeSet.of(BIGINT, 0L).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L), Range.lessThan(BIGINT, 0L))));
+        assertThat(SortedRangeSet.of(BIGINT, 0L).contains(SortedRangeSet.all(BIGINT))).isFalse();
+        assertThat(SortedRangeSet.of(BIGINT, 0L).contains(SortedRangeSet.none(BIGINT))).isTrue();
+        assertThat(SortedRangeSet.of(BIGINT, 0L).contains(SortedRangeSet.of(BIGINT, 0L))).isTrue();
+        assertThat(SortedRangeSet.of(BIGINT, 0L).contains(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)))).isFalse();
+        assertThat(SortedRangeSet.of(BIGINT, 0L).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isFalse();
+        assertThat(SortedRangeSet.of(BIGINT, 0L).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L), Range.lessThan(BIGINT, 0L)))).isFalse();
 
-        assertTrue(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).contains(SortedRangeSet.of(Range.equal(BIGINT, 1L))));
-        assertFalse(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).contains(SortedRangeSet.of(Range.equal(BIGINT, 1L), Range.equal(BIGINT, 2L))));
-        assertTrue(SortedRangeSet.of(Range.greaterThanOrEqual(BIGINT, 0L)).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))));
-        assertFalse(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).contains(SortedRangeSet.of(Range.greaterThanOrEqual(BIGINT, 0L))));
-        assertFalse(SortedRangeSet.of(Range.lessThan(BIGINT, 0L)).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))));
+        assertThat(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).contains(SortedRangeSet.of(Range.equal(BIGINT, 1L)))).isTrue();
+        assertThat(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).contains(SortedRangeSet.of(Range.equal(BIGINT, 1L), Range.equal(BIGINT, 2L)))).isFalse();
+        assertThat(SortedRangeSet.of(Range.greaterThanOrEqual(BIGINT, 0L)).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isTrue();
+        assertThat(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).contains(SortedRangeSet.of(Range.greaterThanOrEqual(BIGINT, 0L)))).isFalse();
+        assertThat(SortedRangeSet.of(Range.lessThan(BIGINT, 0L)).contains(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isFalse();
 
         Range rangeA = Range.range(BIGINT, 0L, true, 2L, true);
         Range rangeB = Range.range(BIGINT, 4L, true, 6L, true);
         Range rangeC = Range.range(BIGINT, 8L, true, 10L, true);
-        assertFalse(SortedRangeSet.of(rangeA, rangeB).contains(SortedRangeSet.of(rangeC)));
-        assertFalse(SortedRangeSet.of(rangeB, rangeC).contains(SortedRangeSet.of(rangeA)));
-        assertFalse(SortedRangeSet.of(rangeA, rangeC).contains(SortedRangeSet.of(rangeB)));
-        assertFalse(SortedRangeSet.of(rangeA, rangeB).contains(SortedRangeSet.of(rangeB, rangeC)));
-        assertTrue(SortedRangeSet.of(rangeA, rangeB, rangeC).contains(SortedRangeSet.of(rangeA)));
-        assertTrue(SortedRangeSet.of(rangeA, rangeB, rangeC).contains(SortedRangeSet.of(rangeB)));
-        assertTrue(SortedRangeSet.of(rangeA, rangeB, rangeC).contains(SortedRangeSet.of(rangeC)));
-        assertTrue(SortedRangeSet.of(rangeA, rangeB, rangeC).contains(
-                SortedRangeSet.of(Range.equal(BIGINT, 4L), Range.equal(BIGINT, 6L), Range.equal(BIGINT, 9L))));
-        assertFalse(SortedRangeSet.of(rangeA, rangeB, rangeC).contains(
-                SortedRangeSet.of(Range.equal(BIGINT, 1L), Range.range(BIGINT, 6L, true, 10L, true))));
+        assertThat(SortedRangeSet.of(rangeA, rangeB).contains(SortedRangeSet.of(rangeC))).isFalse();
+        assertThat(SortedRangeSet.of(rangeB, rangeC).contains(SortedRangeSet.of(rangeA))).isFalse();
+        assertThat(SortedRangeSet.of(rangeA, rangeC).contains(SortedRangeSet.of(rangeB))).isFalse();
+        assertThat(SortedRangeSet.of(rangeA, rangeB).contains(SortedRangeSet.of(rangeB, rangeC))).isFalse();
+        assertThat(SortedRangeSet.of(rangeA, rangeB, rangeC).contains(SortedRangeSet.of(rangeA))).isTrue();
+        assertThat(SortedRangeSet.of(rangeA, rangeB, rangeC).contains(SortedRangeSet.of(rangeB))).isTrue();
+        assertThat(SortedRangeSet.of(rangeA, rangeB, rangeC).contains(SortedRangeSet.of(rangeC))).isTrue();
+        assertThat(SortedRangeSet.of(rangeA, rangeB, rangeC).contains(
+                SortedRangeSet.of(Range.equal(BIGINT, 4L), Range.equal(BIGINT, 6L), Range.equal(BIGINT, 9L)))).isTrue();
+        assertThat(SortedRangeSet.of(rangeA, rangeB, rangeC).contains(
+                SortedRangeSet.of(Range.equal(BIGINT, 1L), Range.range(BIGINT, 6L, true, 10L, true)))).isFalse();
     }
 
     @Test
@@ -397,45 +387,29 @@ public void testContainsValueRejectNull()
     @Test
     public void testIntersect()
     {
-        assertEquals(
-                SortedRangeSet.none(BIGINT).intersect(
-                        SortedRangeSet.none(BIGINT)),
-                SortedRangeSet.none(BIGINT));
-
-        assertEquals(
-                SortedRangeSet.all(BIGINT).intersect(
-                        SortedRangeSet.all(BIGINT)),
-                SortedRangeSet.all(BIGINT));
-
-        assertEquals(
-                SortedRangeSet.none(BIGINT).intersect(
-                        SortedRangeSet.all(BIGINT)),
-                SortedRangeSet.none(BIGINT));
-
-        assertEquals(
-                SortedRangeSet.of(Range.equal(BIGINT, 1L), Range.equal(BIGINT, 2L), Range.equal(BIGINT, 3L)).intersect(
-                        SortedRangeSet.of(Range.equal(BIGINT, 2L), Range.equal(BIGINT, 4L))),
-                SortedRangeSet.of(Range.equal(BIGINT, 2L)));
-
-        assertEquals(
-                SortedRangeSet.all(BIGINT).intersect(
-                        SortedRangeSet.of(Range.equal(BIGINT, 2L), Range.equal(BIGINT, 4L))),
-                SortedRangeSet.of(Range.equal(BIGINT, 2L), Range.equal(BIGINT, 4L)));
-
-        assertEquals(
-                SortedRangeSet.of(Range.range(BIGINT, 0L, true, 4L, false)).intersect(
-                        SortedRangeSet.of(Range.equal(BIGINT, 2L), Range.greaterThan(BIGINT, 3L))),
-                SortedRangeSet.of(Range.equal(BIGINT, 2L), Range.range(BIGINT, 3L, false, 4L, false)));
-
-        assertEquals(
-                SortedRangeSet.of(Range.greaterThanOrEqual(BIGINT, 0L)).intersect(
-                        SortedRangeSet.of(Range.lessThanOrEqual(BIGINT, 0L))),
-                SortedRangeSet.of(Range.equal(BIGINT, 0L)));
-
-        assertEquals(
-                SortedRangeSet.of(Range.greaterThanOrEqual(BIGINT, -1L)).intersect(
-                        SortedRangeSet.of(Range.lessThanOrEqual(BIGINT, 1L))),
-                SortedRangeSet.of(Range.range(BIGINT, -1L, true, 1L, true)));
+        assertThat(SortedRangeSet.none(BIGINT).intersect(
+                SortedRangeSet.none(BIGINT))).isEqualTo(SortedRangeSet.none(BIGINT));
+
+        assertThat(SortedRangeSet.all(BIGINT).intersect(
+                SortedRangeSet.all(BIGINT))).isEqualTo(SortedRangeSet.all(BIGINT));
+
+        assertThat(SortedRangeSet.none(BIGINT).intersect(
+                SortedRangeSet.all(BIGINT))).isEqualTo(SortedRangeSet.none(BIGINT));
+
+        assertThat(SortedRangeSet.of(Range.equal(BIGINT, 1L), Range.equal(BIGINT, 2L), Range.equal(BIGINT, 3L)).intersect(
+                SortedRangeSet.of(Range.equal(BIGINT, 2L), Range.equal(BIGINT, 4L)))).isEqualTo(SortedRangeSet.of(Range.equal(BIGINT, 2L)));
+
+        assertThat(SortedRangeSet.all(BIGINT).intersect(
+                SortedRangeSet.of(Range.equal(BIGINT, 2L), Range.equal(BIGINT, 4L)))).isEqualTo(SortedRangeSet.of(Range.equal(BIGINT, 2L), Range.equal(BIGINT, 4L)));
+
+        assertThat(SortedRangeSet.of(Range.range(BIGINT, 0L, true, 4L, false)).intersect(
+                SortedRangeSet.of(Range.equal(BIGINT, 2L), Range.greaterThan(BIGINT, 3L)))).isEqualTo(SortedRangeSet.of(Range.equal(BIGINT, 2L), Range.range(BIGINT, 3L, false, 4L, false)));
+
+        assertThat(SortedRangeSet.of(Range.greaterThanOrEqual(BIGINT, 0L)).intersect(
+                SortedRangeSet.of(Range.lessThanOrEqual(BIGINT, 0L)))).isEqualTo(SortedRangeSet.of(Range.equal(BIGINT, 0L)));
+
+        assertThat(SortedRangeSet.of(Range.greaterThanOrEqual(BIGINT, -1L)).intersect(
+                SortedRangeSet.of(Range.lessThanOrEqual(BIGINT, 1L)))).isEqualTo(SortedRangeSet.of(Range.range(BIGINT, -1L, true, 1L, true)));
     }
 
     @Test
@@ -521,85 +495,35 @@ public void testUnion()
     @Test
     public void testSubtract()
     {
-        assertEquals(
-                SortedRangeSet.all(BIGINT).subtract(SortedRangeSet.all(BIGINT)),
-                SortedRangeSet.none(BIGINT));
-        assertEquals(
-                SortedRangeSet.all(BIGINT).subtract(SortedRangeSet.none(BIGINT)),
-                SortedRangeSet.all(BIGINT));
-        assertEquals(
-                SortedRangeSet.all(BIGINT).subtract(SortedRangeSet.of(BIGINT, 0L)),
-                SortedRangeSet.of(BIGINT, 0L).complement());
-        assertEquals(
-                SortedRangeSet.all(BIGINT).subtract(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L))),
-                SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).complement());
-        assertEquals(
-                SortedRangeSet.all(BIGINT).subtract(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))),
-                SortedRangeSet.of(Range.lessThanOrEqual(BIGINT, 0L)));
-
-        assertEquals(
-                SortedRangeSet.none(BIGINT).subtract(SortedRangeSet.all(BIGINT)),
-                SortedRangeSet.none(BIGINT));
-        assertEquals(
-                SortedRangeSet.none(BIGINT).subtract(SortedRangeSet.none(BIGINT)),
-                SortedRangeSet.none(BIGINT));
-        assertEquals(
-                SortedRangeSet.none(BIGINT).subtract(SortedRangeSet.of(BIGINT, 0L)),
-                SortedRangeSet.none(BIGINT));
-        assertEquals(
-                SortedRangeSet.none(BIGINT).subtract(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L))),
-                SortedRangeSet.none(BIGINT));
-        assertEquals(
-                SortedRangeSet.none(BIGINT).subtract(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))),
-                SortedRangeSet.none(BIGINT));
-
-        assertEquals(
-                SortedRangeSet.of(BIGINT, 0L).subtract(SortedRangeSet.all(BIGINT)),
-                SortedRangeSet.none(BIGINT));
-        assertEquals(
-                SortedRangeSet.of(BIGINT, 0L).subtract(SortedRangeSet.none(BIGINT)),
-                SortedRangeSet.of(BIGINT, 0L));
-        assertEquals(
-                SortedRangeSet.of(BIGINT, 0L).subtract(SortedRangeSet.of(BIGINT, 0L)),
-                SortedRangeSet.none(BIGINT));
-        assertEquals(
-                SortedRangeSet.of(BIGINT, 0L).subtract(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L))),
-                SortedRangeSet.none(BIGINT));
-        assertEquals(
-                SortedRangeSet.of(BIGINT, 0L).subtract(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))),
-                SortedRangeSet.of(BIGINT, 0L));
-
-        assertEquals(
-                SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).subtract(SortedRangeSet.all(BIGINT)),
-                SortedRangeSet.none(BIGINT));
-        assertEquals(
-                SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).subtract(SortedRangeSet.none(BIGINT)),
-                SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)));
-        assertEquals(
-                SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).subtract(SortedRangeSet.of(BIGINT, 0L)),
-                SortedRangeSet.of(BIGINT, 1L));
-        assertEquals(
-                SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).subtract(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L))),
-                SortedRangeSet.none(BIGINT));
-        assertEquals(
-                SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).subtract(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))),
-                SortedRangeSet.of(Range.equal(BIGINT, 0L)));
-
-        assertEquals(
-                SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).subtract(SortedRangeSet.all(BIGINT)),
-                SortedRangeSet.none(BIGINT));
-        assertEquals(
-                SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).subtract(SortedRangeSet.none(BIGINT)),
-                SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)));
-        assertEquals(
-                SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).subtract(SortedRangeSet.of(BIGINT, 0L)),
-                SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)));
-        assertEquals(
-                SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).subtract(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L))),
-                SortedRangeSet.of(Range.range(BIGINT, 0L, false, 1L, false), Range.greaterThan(BIGINT, 1L)));
-        assertEquals(
-                SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).subtract(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L))),
-                SortedRangeSet.none(BIGINT));
+        assertThat(SortedRangeSet.all(BIGINT).subtract(SortedRangeSet.all(BIGINT))).isEqualTo(SortedRangeSet.none(BIGINT));
+        assertThat(SortedRangeSet.all(BIGINT).subtract(SortedRangeSet.none(BIGINT))).isEqualTo(SortedRangeSet.all(BIGINT));
+        assertThat(SortedRangeSet.all(BIGINT).subtract(SortedRangeSet.of(BIGINT, 0L))).isEqualTo(SortedRangeSet.of(BIGINT, 0L).complement());
+        assertThat(SortedRangeSet.all(BIGINT).subtract(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)))).isEqualTo(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).complement());
+        assertThat(SortedRangeSet.all(BIGINT).subtract(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isEqualTo(SortedRangeSet.of(Range.lessThanOrEqual(BIGINT, 0L)));
+
+        assertThat(SortedRangeSet.none(BIGINT).subtract(SortedRangeSet.all(BIGINT))).isEqualTo(SortedRangeSet.none(BIGINT));
+        assertThat(SortedRangeSet.none(BIGINT).subtract(SortedRangeSet.none(BIGINT))).isEqualTo(SortedRangeSet.none(BIGINT));
+        assertThat(SortedRangeSet.none(BIGINT).subtract(SortedRangeSet.of(BIGINT, 0L))).isEqualTo(SortedRangeSet.none(BIGINT));
+        assertThat(SortedRangeSet.none(BIGINT).subtract(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)))).isEqualTo(SortedRangeSet.none(BIGINT));
+        assertThat(SortedRangeSet.none(BIGINT).subtract(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isEqualTo(SortedRangeSet.none(BIGINT));
+
+        assertThat(SortedRangeSet.of(BIGINT, 0L).subtract(SortedRangeSet.all(BIGINT))).isEqualTo(SortedRangeSet.none(BIGINT));
+        assertThat(SortedRangeSet.of(BIGINT, 0L).subtract(SortedRangeSet.none(BIGINT))).isEqualTo(SortedRangeSet.of(BIGINT, 0L));
+        assertThat(SortedRangeSet.of(BIGINT, 0L).subtract(SortedRangeSet.of(BIGINT, 0L))).isEqualTo(SortedRangeSet.none(BIGINT));
+        assertThat(SortedRangeSet.of(BIGINT, 0L).subtract(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)))).isEqualTo(SortedRangeSet.none(BIGINT));
+        assertThat(SortedRangeSet.of(BIGINT, 0L).subtract(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isEqualTo(SortedRangeSet.of(BIGINT, 0L));
+
+        assertThat(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).subtract(SortedRangeSet.all(BIGINT))).isEqualTo(SortedRangeSet.none(BIGINT));
+        assertThat(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).subtract(SortedRangeSet.none(BIGINT))).isEqualTo(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)));
+        assertThat(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).subtract(SortedRangeSet.of(BIGINT, 0L))).isEqualTo(SortedRangeSet.of(BIGINT, 1L));
+        assertThat(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).subtract(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)))).isEqualTo(SortedRangeSet.none(BIGINT));
+        assertThat(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)).subtract(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isEqualTo(SortedRangeSet.of(Range.equal(BIGINT, 0L)));
+
+        assertThat(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).subtract(SortedRangeSet.all(BIGINT))).isEqualTo(SortedRangeSet.none(BIGINT));
+        assertThat(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).subtract(SortedRangeSet.none(BIGINT))).isEqualTo(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)));
+        assertThat(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).subtract(SortedRangeSet.of(BIGINT, 0L))).isEqualTo(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)));
+        assertThat(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).subtract(SortedRangeSet.of(Range.equal(BIGINT, 0L), Range.equal(BIGINT, 1L)))).isEqualTo(SortedRangeSet.of(Range.range(BIGINT, 0L, false, 1L, false), Range.greaterThan(BIGINT, 1L)));
+        assertThat(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)).subtract(SortedRangeSet.of(Range.greaterThan(BIGINT, 0L)))).isEqualTo(SortedRangeSet.none(BIGINT));
     }
 
     @Test
@@ -616,138 +540,134 @@ public void testJsonSerialization()
                         .addDeserializer(Block.class, new TestingBlockJsonSerde.Deserializer(blockEncodingSerde)));
 
         SortedRangeSet set = SortedRangeSet.all(BIGINT);
-        assertEquals(set, mapper.readValue(mapper.writeValueAsString(set), SortedRangeSet.class));
+        assertThat(set).isEqualTo(mapper.readValue(mapper.writeValueAsString(set), SortedRangeSet.class));
 
         set = SortedRangeSet.none(DOUBLE);
-        assertEquals(set, mapper.readValue(mapper.writeValueAsString(set), SortedRangeSet.class));
+        assertThat(set).isEqualTo(mapper.readValue(mapper.writeValueAsString(set), SortedRangeSet.class));
 
         set = SortedRangeSet.of(VARCHAR, utf8Slice("abc"));
-        assertEquals(set, mapper.readValue(mapper.writeValueAsString(set), SortedRangeSet.class));
+        assertThat(set).isEqualTo(mapper.readValue(mapper.writeValueAsString(set), SortedRangeSet.class));
 
         set = SortedRangeSet.of(Range.equal(BOOLEAN, true), Range.equal(BOOLEAN, false));
-        assertEquals(set, mapper.readValue(mapper.writeValueAsString(set), SortedRangeSet.class));
-    }
-
-    @DataProvider
-    public Object[][] denseTypes()
-    {
-        return new Object[][] {{BIGINT}, {INTEGER}, {SMALLINT}, {TINYINT}, {createDecimalType(2)}};
+        assertThat(set).isEqualTo(mapper.readValue(mapper.writeValueAsString(set), SortedRangeSet.class));
     }
 
-    @Test(dataProvider = "denseTypes")
-    public void testExpandRangesForDenseType(Type type)
+    @Test
+    public void testExpandRangesForDenseType()
     {
-        assertThat(ValueSet.ofRanges(Range.equal(type, 1L))
-                .tryExpandRanges(0))
-                .isEqualTo(Optional.empty());
-
-        assertThat(ValueSet.none(type)
-                .tryExpandRanges(0))
-                .isEqualTo(Optional.of(List.of()));
-
-        assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 5L, true))
-                .tryExpandRanges(10))
-                .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L, 5L)));
+        for (Type type : Arrays.asList(BIGINT, INTEGER, SMALLINT, TINYINT, createDecimalType(2))) {
+            assertThat(ValueSet.ofRanges(Range.equal(type, 1L))
+                    .tryExpandRanges(0))
+                    .isEqualTo(Optional.empty());
 
-        assertThat(ValueSet.of(type, 1L, 2L, 3L, 4L, 5L)
-                .tryExpandRanges(10))
-                .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L, 5L)));
+            assertThat(ValueSet.none(type)
+                    .tryExpandRanges(0))
+                    .isEqualTo(Optional.of(List.of()));
 
-        type.getRange().ifPresent(range -> {
-            long min = (long) range.getMin();
-
-            assertThat(ValueSet.ofRanges(Range.range(type, min, true, min + 3, true))
-                    .tryExpandRanges(10))
-                    .isEqualTo(Optional.of(List.of(min, min + 1, min + 2, min + 3)));
-            assertThat(ValueSet.ofRanges(Range.lessThan(type, min + 4))
+            assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 5L, true))
                     .tryExpandRanges(10))
-                    .isEqualTo(Optional.of(List.of(min, min + 1, min + 2, min + 3)));
-            assertThat(ValueSet.ofRanges(Range.lessThanOrEqual(type, min + 3))
-                    .tryExpandRanges(10))
-                    .isEqualTo(Optional.of(List.of(min, min + 1, min + 2, min + 3)));
-
-            long max = (long) range.getMax();
+                    .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L, 5L)));
 
-            assertThat(ValueSet.ofRanges(Range.range(type, max - 3, true, max, true))
-                    .tryExpandRanges(10))
-                    .isEqualTo(Optional.of(List.of(max - 3, max - 2, max - 1, max)));
-            assertThat(ValueSet.ofRanges(Range.greaterThan(type, max - 4))
+            assertThat(ValueSet.of(type, 1L, 2L, 3L, 4L, 5L)
                     .tryExpandRanges(10))
-                    .isEqualTo(Optional.of(List.of(max - 3, max - 2, max - 1, max)));
-            assertThat(ValueSet.ofRanges(Range.greaterThanOrEqual(type, max - 3))
+                    .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L, 5L)));
+
+            type.getRange().ifPresent(range -> {
+                long min = (long) range.getMin();
+
+                assertThat(ValueSet.ofRanges(Range.range(type, min, true, min + 3, true))
+                        .tryExpandRanges(10))
+                        .isEqualTo(Optional.of(List.of(min, min + 1, min + 2, min + 3)));
+                assertThat(ValueSet.ofRanges(Range.lessThan(type, min + 4))
+                        .tryExpandRanges(10))
+                        .isEqualTo(Optional.of(List.of(min, min + 1, min + 2, min + 3)));
+                assertThat(ValueSet.ofRanges(Range.lessThanOrEqual(type, min + 3))
+                        .tryExpandRanges(10))
+                        .isEqualTo(Optional.of(List.of(min, min + 1, min + 2, min + 3)));
+
+                long max = (long) range.getMax();
+
+                assertThat(ValueSet.ofRanges(Range.range(type, max - 3, true, max, true))
+                        .tryExpandRanges(10))
+                        .isEqualTo(Optional.of(List.of(max - 3, max - 2, max - 1, max)));
+                assertThat(ValueSet.ofRanges(Range.greaterThan(type, max - 4))
+                        .tryExpandRanges(10))
+                        .isEqualTo(Optional.of(List.of(max - 3, max - 2, max - 1, max)));
+                assertThat(ValueSet.ofRanges(Range.greaterThanOrEqual(type, max - 3))
+                        .tryExpandRanges(10))
+                        .isEqualTo(Optional.of(List.of(max - 3, max - 2, max - 1, max)));
+            });
+
+            assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 5L, true))
                     .tryExpandRanges(10))
-                    .isEqualTo(Optional.of(List.of(max - 3, max - 2, max - 1, max)));
-        });
+                    .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L, 5L)));
 
-        assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 5L, true))
-                .tryExpandRanges(10))
-                .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L, 5L)));
+            assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 5L, true))
+                    .tryExpandRanges(5))
+                    .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L, 5L)));
 
-        assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 5L, true))
-                .tryExpandRanges(5))
-                .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L, 5L)));
+            assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 5L, false))
+                    .tryExpandRanges(5))
+                    .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L)));
 
-        assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 5L, false))
-                .tryExpandRanges(5))
-                .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L)));
+            assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 6L, true))
+                    .tryExpandRanges(5))
+                    .isEqualTo(Optional.empty());
 
-        assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 6L, true))
-                .tryExpandRanges(5))
-                .isEqualTo(Optional.empty());
+            assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 6L, false))
+                    .tryExpandRanges(5))
+                    .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L, 5L)));
 
-        assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 6L, false))
-                .tryExpandRanges(5))
-                .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L, 5L)));
+            assertThat(ValueSet.ofRanges(Range.range(type, 1L, false, 5L, true))
+                    .tryExpandRanges(5))
+                    .isEqualTo(Optional.of(List.of(2L, 3L, 4L, 5L)));
 
-        assertThat(ValueSet.ofRanges(Range.range(type, 1L, false, 5L, true))
-                .tryExpandRanges(5))
-                .isEqualTo(Optional.of(List.of(2L, 3L, 4L, 5L)));
+            assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 5L, false))
+                    .tryExpandRanges(5))
+                    .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L)));
 
-        assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 5L, false))
-                .tryExpandRanges(5))
-                .isEqualTo(Optional.of(List.of(1L, 2L, 3L, 4L)));
+            assertThat(ValueSet.ofRanges(Range.range(type, 1L, false, 5L, false))
+                    .tryExpandRanges(5))
+                    .isEqualTo(Optional.of(List.of(2L, 3L, 4L)));
 
-        assertThat(ValueSet.ofRanges(Range.range(type, 1L, false, 5L, false))
-                .tryExpandRanges(5))
-                .isEqualTo(Optional.of(List.of(2L, 3L, 4L)));
+            assertThat(ValueSet.ofRanges(Range.range(type, 1L, false, 2L, false))
+                    .tryExpandRanges(5))
+                    .isEqualTo(Optional.of(List.of()));
 
-        assertThat(ValueSet.ofRanges(Range.range(type, 1L, false, 2L, false))
-                .tryExpandRanges(5))
-                .isEqualTo(Optional.of(List.of()));
+            assertThat(ValueSet.ofRanges(Range.range(type, 1L, false, 3L, false))
+                    .tryExpandRanges(5))
+                    .isEqualTo(Optional.of(List.of(2L)));
 
-        assertThat(ValueSet.ofRanges(Range.range(type, 1L, false, 3L, false))
-                .tryExpandRanges(5))
-                .isEqualTo(Optional.of(List.of(2L)));
+            assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 5L, true))
+                    .tryExpandRanges(3))
+                    .isEqualTo(Optional.empty());
 
-        assertThat(ValueSet.ofRanges(Range.range(type, 1L, true, 5L, true))
-                .tryExpandRanges(3))
-                .isEqualTo(Optional.empty());
+            assertThat(ValueSet.of(type, 1L, 2L, 3L, 4L, 5L)
+                    .tryExpandRanges(3))
+                    .isEqualTo(Optional.empty());
 
-        assertThat(ValueSet.of(type, 1L, 2L, 3L, 4L, 5L)
-                .tryExpandRanges(3))
-                .isEqualTo(Optional.empty());
+            assertThat(ValueSet.ofRanges(Range.greaterThan(type, 1L))
+                    .tryExpandRanges(3))
+                    .isEqualTo(Optional.empty());
 
-        assertThat(ValueSet.ofRanges(Range.greaterThan(type, 1L))
-                .tryExpandRanges(3))
-                .isEqualTo(Optional.empty());
+            assertThat(ValueSet.ofRanges(Range.greaterThanOrEqual(type, 1L))
+                    .tryExpandRanges(3))
+                    .isEqualTo(Optional.empty());
 
-        assertThat(ValueSet.ofRanges(Range.greaterThanOrEqual(type, 1L))
-                .tryExpandRanges(3))
-                .isEqualTo(Optional.empty());
+            assertThat(ValueSet.ofRanges(Range.lessThan(type, 1L))
+                    .tryExpandRanges(3))
+                    .isEqualTo(Optional.empty());
 
-        assertThat(ValueSet.ofRanges(Range.lessThan(type, 1L))
-                .tryExpandRanges(3))
-                .isEqualTo(Optional.empty());
-
-        assertThat(ValueSet.ofRanges(Range.lessThanOrEqual(type, 1L))
-                .tryExpandRanges(3))
-                .isEqualTo(Optional.empty());
+            assertThat(ValueSet.ofRanges(Range.lessThanOrEqual(type, 1L))
+                    .tryExpandRanges(3))
+                    .isEqualTo(Optional.empty());
+        }
     }
 
     private void assertUnion(SortedRangeSet first, SortedRangeSet second, SortedRangeSet expected)
     {
-        assertEquals(first.union(second), expected);
-        assertEquals(first.union(ImmutableList.of(first, second)), expected);
+        assertThat(first.union(second)).isEqualTo(expected);
+        assertThat(first.union(ImmutableList.of(first, second))).isEqualTo(expected);
     }
 
     private static SortedRangeSetAssert assertSortedRangeSet(SortedRangeSet sortedRangeSet)
diff --git a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestTupleDomain.java b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestTupleDomain.java
index f4f9fedea0dc..613607f853d2 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestTupleDomain.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestTupleDomain.java
@@ -30,7 +30,7 @@
 import io.trino.spi.type.TestingTypeDeserializer;
 import io.trino.spi.type.TestingTypeManager;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.List;
@@ -48,10 +48,6 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
 
 public class TestTupleDomain
 {
@@ -64,25 +60,21 @@ public class TestTupleDomain
     @Test
     public void testNone()
     {
-        assertTrue(TupleDomain.none().isNone());
-        assertEquals(TupleDomain.<ColumnHandle>none(),
-                TupleDomain.withColumnDomains(ImmutableMap.of(
-                        A, Domain.none(BIGINT))));
-        assertEquals(TupleDomain.<ColumnHandle>none(),
-                TupleDomain.withColumnDomains(ImmutableMap.of(
-                        A, Domain.all(BIGINT),
-                        B, Domain.none(VARCHAR))));
+        assertThat(TupleDomain.none().isNone()).isTrue();
+        assertThat(TupleDomain.<ColumnHandle>none()).isEqualTo(TupleDomain.withColumnDomains(ImmutableMap.of(
+                A, Domain.none(BIGINT))));
+        assertThat(TupleDomain.<ColumnHandle>none()).isEqualTo(TupleDomain.withColumnDomains(ImmutableMap.of(
+                A, Domain.all(BIGINT),
+                B, Domain.none(VARCHAR))));
     }
 
     @Test
     public void testAll()
     {
-        assertTrue(TupleDomain.all().isAll());
-        assertEquals(TupleDomain.<ColumnHandle>all(),
-                TupleDomain.withColumnDomains(ImmutableMap.of(
-                        A, Domain.all(BIGINT))));
-        assertEquals(TupleDomain.<ColumnHandle>all(),
-                TupleDomain.withColumnDomains(ImmutableMap.<ColumnHandle, Domain>of()));
+        assertThat(all().isAll()).isTrue();
+        assertThat(TupleDomain.<ColumnHandle>all()).isEqualTo(TupleDomain.withColumnDomains(ImmutableMap.of(
+                A, Domain.all(BIGINT))));
+        assertThat(TupleDomain.<ColumnHandle>all()).isEqualTo(TupleDomain.withColumnDomains(ImmutableMap.<ColumnHandle, Domain>of()));
     }
 
     @Test
@@ -112,12 +104,12 @@ public void testIntersection()
                         .put(D, Domain.create(ValueSet.ofRanges(Range.range(DOUBLE, 0.0, true, 10.0, false)), false))
                         .buildOrThrow());
 
-        assertEquals(tupleDomain1.intersect(tupleDomain2), expectedTupleDomain);
-        assertEquals(tupleDomain2.intersect(tupleDomain1), expectedTupleDomain);
+        assertThat(tupleDomain1.intersect(tupleDomain2)).isEqualTo(expectedTupleDomain);
+        assertThat(tupleDomain2.intersect(tupleDomain1)).isEqualTo(expectedTupleDomain);
 
-        assertEquals(TupleDomain.intersect(ImmutableList.of()), all());
-        assertEquals(TupleDomain.intersect(ImmutableList.of(tupleDomain1)), tupleDomain1);
-        assertEquals(TupleDomain.intersect(ImmutableList.of(tupleDomain1, tupleDomain2)), expectedTupleDomain);
+        assertThat(TupleDomain.intersect(ImmutableList.of())).isEqualTo(all());
+        assertThat(TupleDomain.intersect(ImmutableList.of(tupleDomain1))).isEqualTo(tupleDomain1);
+        assertThat(TupleDomain.intersect(ImmutableList.of(tupleDomain1, tupleDomain2))).isEqualTo(expectedTupleDomain);
 
         TupleDomain<ColumnHandle> tupleDomain3 = TupleDomain.withColumnDomains(ImmutableMap.of(
                 C, Domain.singleValue(BIGINT, 1L),
@@ -128,19 +120,17 @@ public void testIntersection()
                         B, Domain.singleValue(DOUBLE, 0.0),
                         C, Domain.singleValue(BIGINT, 1L),
                         D, Domain.create(ValueSet.ofRanges(Range.range(DOUBLE, 5.0, true, 10.0, false)), false)));
-        assertEquals(TupleDomain.intersect(ImmutableList.of(tupleDomain1, tupleDomain2, tupleDomain3)), expectedTupleDomain);
+        assertThat(TupleDomain.intersect(ImmutableList.of(tupleDomain1, tupleDomain2, tupleDomain3))).isEqualTo(expectedTupleDomain);
     }
 
     @Test
     public void testNoneIntersection()
     {
-        assertEquals(TupleDomain.none().intersect(TupleDomain.all()), TupleDomain.none());
-        assertEquals(TupleDomain.all().intersect(TupleDomain.none()), TupleDomain.none());
-        assertEquals(TupleDomain.none().intersect(TupleDomain.none()), TupleDomain.none());
-        assertEquals(
-                TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.onlyNull(BIGINT)))
-                        .intersect(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.notNull(BIGINT)))),
-                TupleDomain.<ColumnHandle>none());
+        assertThat(TupleDomain.none().intersect(all())).isEqualTo(TupleDomain.none());
+        assertThat(all().intersect(TupleDomain.none())).isEqualTo(TupleDomain.none());
+        assertThat(TupleDomain.none().intersect(TupleDomain.none())).isEqualTo(TupleDomain.none());
+        assertThat(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.onlyNull(BIGINT)))
+                .intersect(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.notNull(BIGINT))))).isEqualTo(TupleDomain.<ColumnHandle>none());
     }
 
     @Test
@@ -161,7 +151,7 @@ public void testMismatchedColumnIntersection()
                 B, Domain.singleValue(VARCHAR, utf8Slice("value")),
                 C, Domain.singleValue(BIGINT, 1L)));
 
-        assertEquals(tupleDomain1.intersect(tupleDomain2), expectedTupleDomain);
+        assertThat(tupleDomain1.intersect(tupleDomain2)).isEqualTo(expectedTupleDomain);
     }
 
     @Test
@@ -171,12 +161,12 @@ public void testIntersectResultType()
         TupleDomain<Integer> integerDomain = TupleDomain.withColumnDomains(Map.of(10, Domain.multipleValues(BIGINT, List.of(41L, 42L, 42L))));
         // Declare explicit variable to verify assignability from the derived type of TupleDomain.intersect
         TupleDomain<Number> intersection = numberDomain.intersect(integerDomain);
-        assertEquals(intersection, numberDomain);
+        assertThat(intersection).isEqualTo(numberDomain);
         // Sadly, this cannot be made to work:
         //   intersection = integerDomain.intersect(numberDomain)
         // but this can:
         intersection = TupleDomain.intersect(List.of(integerDomain, numberDomain));
-        assertEquals(intersection, numberDomain);
+        assertThat(intersection).isEqualTo(numberDomain);
     }
 
     @Test
@@ -209,20 +199,18 @@ public void testColumnWiseUnion()
                         .put(E, Domain.all(DOUBLE))
                         .buildOrThrow());
 
-        assertEquals(columnWiseUnion(tupleDomain1, tupleDomain2), expectedTupleDomain);
+        assertThat(columnWiseUnion(tupleDomain1, tupleDomain2)).isEqualTo(expectedTupleDomain);
     }
 
     @Test
     public void testNoneColumnWiseUnion()
     {
-        assertEquals(columnWiseUnion(TupleDomain.none(), TupleDomain.all()), TupleDomain.all());
-        assertEquals(columnWiseUnion(TupleDomain.all(), TupleDomain.none()), TupleDomain.all());
-        assertEquals(columnWiseUnion(TupleDomain.none(), TupleDomain.none()), TupleDomain.none());
-        assertEquals(
-                columnWiseUnion(
-                        TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.onlyNull(BIGINT))),
-                        TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.notNull(BIGINT)))),
-                TupleDomain.<ColumnHandle>all());
+        assertThat(columnWiseUnion(TupleDomain.none(), all())).isEqualTo(all());
+        assertThat(columnWiseUnion(all(), TupleDomain.none())).isEqualTo(all());
+        assertThat(columnWiseUnion(TupleDomain.none(), TupleDomain.none())).isEqualTo(TupleDomain.none());
+        assertThat(columnWiseUnion(
+                TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.onlyNull(BIGINT))),
+                TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.notNull(BIGINT))))).isEqualTo(TupleDomain.<ColumnHandle>all());
     }
 
     @Test
@@ -240,7 +228,7 @@ public void testMismatchedColumnWiseUnion()
 
         TupleDomain<ColumnHandle> expectedTupleDomain = TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.all(DOUBLE)));
 
-        assertEquals(columnWiseUnion(tupleDomain1, tupleDomain2), expectedTupleDomain);
+        assertThat(columnWiseUnion(tupleDomain1, tupleDomain2)).isEqualTo(expectedTupleDomain);
     }
 
     @Test
@@ -337,328 +325,324 @@ public void testOverlaps()
     @Test
     public void testContains()
     {
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(),
-                ImmutableMap.of()));
+                ImmutableMap.of())).isTrue();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(),
-                ImmutableMap.of(A, Domain.none(BIGINT))));
+                ImmutableMap.of(A, Domain.none(BIGINT)))).isTrue();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(),
-                ImmutableMap.of(A, Domain.all(BIGINT))));
+                ImmutableMap.of(A, Domain.all(BIGINT)))).isTrue();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(),
-                ImmutableMap.of(A, Domain.singleValue(DOUBLE, 0.0))));
+                ImmutableMap.of(A, Domain.singleValue(DOUBLE, 0.0)))).isTrue();
 
-        assertFalse(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.none(BIGINT)),
-                ImmutableMap.of()));
+                ImmutableMap.of())).isFalse();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.none(BIGINT)),
-                ImmutableMap.of(A, Domain.none(BIGINT))));
+                ImmutableMap.of(A, Domain.none(BIGINT)))).isTrue();
 
-        assertFalse(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.none(BIGINT)),
-                ImmutableMap.of(A, Domain.all(BIGINT))));
+                ImmutableMap.of(A, Domain.all(BIGINT)))).isFalse();
 
-        assertFalse(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.none(BIGINT)),
-                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L))));
+                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)))).isFalse();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.all(BIGINT)),
-                ImmutableMap.of()));
+                ImmutableMap.of())).isTrue();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.all(BIGINT)),
-                ImmutableMap.of(A, Domain.none(BIGINT))));
+                ImmutableMap.of(A, Domain.none(BIGINT)))).isTrue();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.all(BIGINT)),
-                ImmutableMap.of(A, Domain.all(BIGINT))));
+                ImmutableMap.of(A, Domain.all(BIGINT)))).isTrue();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.all(BIGINT)),
-                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L))));
+                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)))).isTrue();
 
-        assertFalse(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)),
-                ImmutableMap.of()));
+                ImmutableMap.of())).isFalse();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)),
-                ImmutableMap.of(A, Domain.none(BIGINT))));
+                ImmutableMap.of(A, Domain.none(BIGINT)))).isTrue();
 
-        assertFalse(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)),
-                ImmutableMap.of(A, Domain.all(BIGINT))));
+                ImmutableMap.of(A, Domain.all(BIGINT)))).isFalse();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)),
-                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L))));
+                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)))).isTrue();
 
-        assertFalse(contains(
+        assertThat(contains(
                 ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)),
-                ImmutableMap.of(B, Domain.singleValue(VARCHAR, utf8Slice("value")))));
+                ImmutableMap.of(B, Domain.singleValue(VARCHAR, utf8Slice("value"))))).isFalse();
 
-        assertFalse(contains(
+        assertThat(contains(
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
                         B, Domain.singleValue(VARCHAR, utf8Slice("value"))),
-                ImmutableMap.of(B, Domain.singleValue(VARCHAR, utf8Slice("value")))));
+                ImmutableMap.of(B, Domain.singleValue(VARCHAR, utf8Slice("value"))))).isFalse();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
                         B, Domain.singleValue(VARCHAR, utf8Slice("value"))),
-                ImmutableMap.of(B, Domain.none(VARCHAR))));
+                ImmutableMap.of(B, Domain.none(VARCHAR)))).isTrue();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
                         B, Domain.singleValue(VARCHAR, utf8Slice("value"))),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 1L),
-                        B, Domain.none(VARCHAR))));
+                        B, Domain.none(VARCHAR)))).isTrue();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(
                         B, Domain.singleValue(VARCHAR, utf8Slice("value"))),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
-                        B, Domain.singleValue(VARCHAR, utf8Slice("value")))));
+                        B, Domain.singleValue(VARCHAR, utf8Slice("value"))))).isTrue();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(
                         A, Domain.all(BIGINT),
                         B, Domain.singleValue(VARCHAR, utf8Slice("value"))),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
-                        B, Domain.singleValue(VARCHAR, utf8Slice("value")))));
+                        B, Domain.singleValue(VARCHAR, utf8Slice("value"))))).isTrue();
 
-        assertFalse(contains(
+        assertThat(contains(
                 ImmutableMap.of(
                         A, Domain.all(BIGINT),
                         B, Domain.singleValue(VARCHAR, utf8Slice("value"))),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
-                        B, Domain.singleValue(VARCHAR, utf8Slice("value2")))));
+                        B, Domain.singleValue(VARCHAR, utf8Slice("value2"))))).isFalse();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(
                         A, Domain.all(BIGINT),
                         B, Domain.singleValue(VARCHAR, utf8Slice("value"))),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
                         B, Domain.singleValue(VARCHAR, utf8Slice("value2")),
-                        C, Domain.none(VARCHAR))));
+                        C, Domain.none(VARCHAR)))).isTrue();
 
-        assertFalse(contains(
+        assertThat(contains(
                 ImmutableMap.of(
                         A, Domain.all(BIGINT),
                         B, Domain.singleValue(VARCHAR, utf8Slice("value")),
                         C, Domain.none(VARCHAR)),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
-                        B, Domain.singleValue(VARCHAR, utf8Slice("value2")))));
+                        B, Domain.singleValue(VARCHAR, utf8Slice("value2"))))).isFalse();
 
-        assertTrue(contains(
+        assertThat(contains(
                 ImmutableMap.of(
                         A, Domain.all(BIGINT),
                         B, Domain.singleValue(VARCHAR, utf8Slice("value")),
                         C, Domain.none(VARCHAR)),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
-                        B, Domain.none(VARCHAR))));
+                        B, Domain.none(VARCHAR)))).isTrue();
     }
 
     @Test
     public void testEquals()
     {
-        assertTrue(equals(
+        assertThat(equals(
                 ImmutableMap.of(),
-                ImmutableMap.of()));
+                ImmutableMap.of())).isTrue();
 
-        assertTrue(equals(
+        assertThat(equals(
                 ImmutableMap.of(),
-                ImmutableMap.of(A, Domain.all(BIGINT))));
+                ImmutableMap.of(A, Domain.all(BIGINT)))).isTrue();
 
-        assertFalse(equals(
+        assertThat(equals(
                 ImmutableMap.of(),
-                ImmutableMap.of(A, Domain.none(BIGINT))));
+                ImmutableMap.of(A, Domain.none(BIGINT)))).isFalse();
 
-        assertFalse(equals(
+        assertThat(equals(
                 ImmutableMap.of(),
-                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L))));
+                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)))).isFalse();
 
-        assertTrue(equals(
+        assertThat(equals(
                 ImmutableMap.of(A, Domain.all(BIGINT)),
-                ImmutableMap.of(A, Domain.all(BIGINT))));
+                ImmutableMap.of(A, Domain.all(BIGINT)))).isTrue();
 
-        assertFalse(equals(
+        assertThat(equals(
                 ImmutableMap.of(A, Domain.all(BIGINT)),
-                ImmutableMap.of(A, Domain.none(BIGINT))));
+                ImmutableMap.of(A, Domain.none(BIGINT)))).isFalse();
 
-        assertFalse(equals(
+        assertThat(equals(
                 ImmutableMap.of(A, Domain.all(BIGINT)),
-                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L))));
+                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)))).isFalse();
 
-        assertTrue(equals(
+        assertThat(equals(
                 ImmutableMap.of(A, Domain.none(BIGINT)),
-                ImmutableMap.of(A, Domain.none(BIGINT))));
+                ImmutableMap.of(A, Domain.none(BIGINT)))).isTrue();
 
-        assertFalse(equals(
+        assertThat(equals(
                 ImmutableMap.of(A, Domain.none(BIGINT)),
-                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L))));
+                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)))).isFalse();
 
-        assertTrue(equals(
+        assertThat(equals(
                 ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)),
-                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L))));
+                ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)))).isTrue();
 
-        assertFalse(equals(
+        assertThat(equals(
                 ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)),
-                ImmutableMap.of(B, Domain.singleValue(BIGINT, 0L))));
+                ImmutableMap.of(B, Domain.singleValue(BIGINT, 0L)))).isFalse();
 
-        assertFalse(equals(
+        assertThat(equals(
                 ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L)),
-                ImmutableMap.of(A, Domain.singleValue(BIGINT, 1L))));
+                ImmutableMap.of(A, Domain.singleValue(BIGINT, 1L)))).isFalse();
 
-        assertTrue(equals(
+        assertThat(equals(
                 ImmutableMap.of(A, Domain.all(BIGINT)),
-                ImmutableMap.of(B, Domain.all(VARCHAR))));
+                ImmutableMap.of(B, Domain.all(VARCHAR)))).isTrue();
 
-        assertTrue(equals(
+        assertThat(equals(
                 ImmutableMap.of(A, Domain.none(BIGINT)),
-                ImmutableMap.of(B, Domain.none(VARCHAR))));
+                ImmutableMap.of(B, Domain.none(VARCHAR)))).isTrue();
 
-        assertTrue(equals(
+        assertThat(equals(
                 ImmutableMap.of(A, Domain.none(BIGINT)),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
-                        B, Domain.none(VARCHAR))));
+                        B, Domain.none(VARCHAR)))).isTrue();
 
-        assertFalse(equals(
+        assertThat(equals(
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 1L)),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
-                        B, Domain.none(VARCHAR))));
+                        B, Domain.none(VARCHAR)))).isFalse();
 
-        assertTrue(equals(
+        assertThat(equals(
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 1L),
                         C, Domain.none(DOUBLE)),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
-                        B, Domain.none(VARCHAR))));
+                        B, Domain.none(VARCHAR)))).isTrue();
 
-        assertTrue(equals(
+        assertThat(equals(
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
                         B, Domain.all(DOUBLE)),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
-                        B, Domain.all(DOUBLE))));
+                        B, Domain.all(DOUBLE)))).isTrue();
 
-        assertTrue(equals(
+        assertThat(equals(
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
                         B, Domain.all(VARCHAR)),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
-                        C, Domain.all(DOUBLE))));
+                        C, Domain.all(DOUBLE)))).isTrue();
 
-        assertFalse(equals(
+        assertThat(equals(
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
                         B, Domain.all(VARCHAR)),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 1L),
-                        C, Domain.all(DOUBLE))));
+                        C, Domain.all(DOUBLE)))).isFalse();
 
-        assertFalse(equals(
+        assertThat(equals(
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
                         B, Domain.all(VARCHAR)),
                 ImmutableMap.of(
                         A, Domain.singleValue(BIGINT, 0L),
-                        C, Domain.singleValue(DOUBLE, 0.0))));
+                        C, Domain.singleValue(DOUBLE, 0.0)))).isFalse();
     }
 
     @Test
     public void testIsNone()
     {
-        assertFalse(TupleDomain.withColumnDomains(ImmutableMap.<ColumnHandle, Domain>of()).isNone());
-        assertFalse(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L))).isNone());
-        assertTrue(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.none(BIGINT))).isNone());
-        assertFalse(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.all(BIGINT))).isNone());
-        assertTrue(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.all(BIGINT), B, Domain.none(BIGINT))).isNone());
+        assertThat(TupleDomain.withColumnDomains(ImmutableMap.<ColumnHandle, Domain>of()).isNone()).isFalse();
+        assertThat(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L))).isNone()).isFalse();
+        assertThat(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.none(BIGINT))).isNone()).isTrue();
+        assertThat(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.all(BIGINT))).isNone()).isFalse();
+        assertThat(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.all(BIGINT), B, Domain.none(BIGINT))).isNone()).isTrue();
     }
 
     @Test
     public void testIsAll()
     {
-        assertTrue(TupleDomain.withColumnDomains(ImmutableMap.<ColumnHandle, Domain>of()).isAll());
-        assertFalse(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L))).isAll());
-        assertTrue(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.all(BIGINT))).isAll());
-        assertFalse(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L), B, Domain.all(BIGINT))).isAll());
+        assertThat(TupleDomain.withColumnDomains(ImmutableMap.<ColumnHandle, Domain>of()).isAll()).isTrue();
+        assertThat(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L))).isAll()).isFalse();
+        assertThat(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.all(BIGINT))).isAll()).isTrue();
+        assertThat(TupleDomain.withColumnDomains(ImmutableMap.of(A, Domain.singleValue(BIGINT, 0L), B, Domain.all(BIGINT))).isAll()).isFalse();
     }
 
     @Test
     public void testExtractFixedValues()
     {
-        assertEquals(
-                TupleDomain.extractFixedValues(TupleDomain.withColumnDomains(
-                        ImmutableMap.<ColumnHandle, Domain>builder()
-                                .put(A, Domain.all(DOUBLE))
-                                .put(B, Domain.singleValue(VARCHAR, utf8Slice("value")))
-                                .put(C, Domain.onlyNull(BIGINT))
-                                .put(D, Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L)), true))
-                                .buildOrThrow())).get(),
-                ImmutableMap.of(
-                        B, NullableValue.of(VARCHAR, utf8Slice("value")),
-                        C, NullableValue.asNull(BIGINT)));
+        assertThat(TupleDomain.extractFixedValues(TupleDomain.withColumnDomains(
+                ImmutableMap.<ColumnHandle, Domain>builder()
+                        .put(A, Domain.all(DOUBLE))
+                        .put(B, Domain.singleValue(VARCHAR, utf8Slice("value")))
+                        .put(C, Domain.onlyNull(BIGINT))
+                        .put(D, Domain.create(ValueSet.ofRanges(Range.equal(BIGINT, 1L)), true))
+                        .buildOrThrow())).get()).isEqualTo(ImmutableMap.of(
+                B, NullableValue.of(VARCHAR, utf8Slice("value")),
+                C, NullableValue.asNull(BIGINT)));
     }
 
     @Test
     public void testExtractFixedValuesFromNone()
     {
-        assertFalse(TupleDomain.extractFixedValues(TupleDomain.none()).isPresent());
+        assertThat(TupleDomain.extractFixedValues(TupleDomain.none()).isPresent()).isFalse();
     }
 
     @Test
     public void testExtractFixedValuesFromAll()
     {
-        assertEquals(TupleDomain.extractFixedValues(TupleDomain.all()).get(), ImmutableMap.of());
+        assertThat(TupleDomain.extractFixedValues(all()).get()).isEqualTo(ImmutableMap.of());
     }
 
     @Test
     public void testSingleValuesMapToDomain()
     {
-        assertEquals(
-                TupleDomain.fromFixedValues(
-                        ImmutableMap.<ColumnHandle, NullableValue>builder()
-                                .put(A, NullableValue.of(BIGINT, 1L))
-                                .put(B, NullableValue.of(VARCHAR, utf8Slice("value")))
-                                .put(C, NullableValue.of(DOUBLE, 0.01))
-                                .put(D, NullableValue.asNull(BOOLEAN))
-                                .buildOrThrow()),
-                TupleDomain.withColumnDomains(ImmutableMap.<ColumnHandle, Domain>builder()
-                        .put(A, Domain.singleValue(BIGINT, 1L))
-                        .put(B, Domain.singleValue(VARCHAR, utf8Slice("value")))
-                        .put(C, Domain.singleValue(DOUBLE, 0.01))
-                        .put(D, Domain.onlyNull(BOOLEAN))
-                        .buildOrThrow()));
+        assertThat(TupleDomain.fromFixedValues(
+                ImmutableMap.<ColumnHandle, NullableValue>builder()
+                        .put(A, NullableValue.of(BIGINT, 1L))
+                        .put(B, NullableValue.of(VARCHAR, utf8Slice("value")))
+                        .put(C, NullableValue.of(DOUBLE, 0.01))
+                        .put(D, NullableValue.asNull(BOOLEAN))
+                        .buildOrThrow())).isEqualTo(TupleDomain.withColumnDomains(ImmutableMap.<ColumnHandle, Domain>builder()
+                .put(A, Domain.singleValue(BIGINT, 1L))
+                .put(B, Domain.singleValue(VARCHAR, utf8Slice("value")))
+                .put(C, Domain.singleValue(DOUBLE, 0.01))
+                .put(D, Domain.onlyNull(BOOLEAN))
+                .buildOrThrow()));
     }
 
     @Test
     public void testEmptySingleValuesMapToDomain()
     {
-        assertEquals(TupleDomain.fromFixedValues(ImmutableMap.of()), TupleDomain.all());
+        assertThat(TupleDomain.fromFixedValues(ImmutableMap.of())).isEqualTo(all());
     }
 
     @Test
@@ -684,13 +668,13 @@ public ColumnHandle deserialize(JsonParser jsonParser, DeserializationContext de
                         .addDeserializer(Block.class, new TestingBlockJsonSerde.Deserializer(blockEncodingSerde)));
 
         TupleDomain<ColumnHandle> tupleDomain = TupleDomain.all();
-        assertEquals(tupleDomain, mapper.readValue(mapper.writeValueAsString(tupleDomain), new TypeReference<TupleDomain<ColumnHandle>>() {}));
+        assertThat(tupleDomain).isEqualTo(mapper.readValue(mapper.writeValueAsString(tupleDomain), new TypeReference<TupleDomain<ColumnHandle>>() { }));
 
         tupleDomain = TupleDomain.none();
-        assertEquals(tupleDomain, mapper.readValue(mapper.writeValueAsString(tupleDomain), new TypeReference<TupleDomain<ColumnHandle>>() {}));
+        assertThat(tupleDomain).isEqualTo(mapper.readValue(mapper.writeValueAsString(tupleDomain), new TypeReference<TupleDomain<ColumnHandle>>() { }));
 
         tupleDomain = TupleDomain.fromFixedValues(ImmutableMap.of(A, NullableValue.of(BIGINT, 1L), B, NullableValue.asNull(VARCHAR)));
-        assertEquals(tupleDomain, mapper.readValue(mapper.writeValueAsString(tupleDomain), new TypeReference<TupleDomain<ColumnHandle>>() {}));
+        assertThat(tupleDomain).isEqualTo(mapper.readValue(mapper.writeValueAsString(tupleDomain), new TypeReference<TupleDomain<ColumnHandle>>() { }));
     }
 
     @Test
@@ -711,7 +695,7 @@ public void testTransformKeys()
                 .put("3", Domain.singleValue(BIGINT, 3L))
                 .buildOrThrow();
 
-        assertEquals(transformed.getDomains().get(), expected);
+        assertThat(transformed.getDomains().get()).isEqualTo(expected);
     }
 
     @Test
@@ -829,9 +813,9 @@ private void testAsPredicate(TupleDomain<ColumnHandle> tupleDomain, Map<ColumnHa
     {
         Predicate<Map<ColumnHandle, NullableValue>> predicate = tupleDomain.asPredicate();
         boolean result = predicate.test(bindings);
-        if (result != expected) {
-            fail(format("asPredicate(%s).test(%s) returned %s instead of %s", tupleDomain, bindings, result, expected));
-        }
+        assertThat(expected)
+                .withFailMessage(() -> format("asPredicate(%s).test(%s) returned %s instead of %s", tupleDomain, bindings, result, expected))
+                .isEqualTo(result);
     }
 
     private void verifyOverlaps(Map<ColumnHandle, Domain> domains1, Map<ColumnHandle, Domain> domains2, boolean expected)
diff --git a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestValueSet.java b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestValueSet.java
index b51a494c7ef3..1484cedd9145 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestValueSet.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestValueSet.java
@@ -15,7 +15,7 @@
 
 import io.airlift.slice.Slice;
 import io.trino.spi.type.VarcharType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/core/trino-spi/src/test/java/io/trino/spi/resourcegroups/TestResourceGroupId.java b/core/trino-spi/src/test/java/io/trino/spi/resourcegroups/TestResourceGroupId.java
index acf801b4bcda..a9971f1974b9 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/resourcegroups/TestResourceGroupId.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/resourcegroups/TestResourceGroupId.java
@@ -14,11 +14,9 @@
 package io.trino.spi.resourcegroups;
 
 import io.airlift.json.JsonCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestResourceGroupId
 {
@@ -35,10 +33,10 @@ public void testCodec()
     {
         JsonCodec<ResourceGroupId> codec = JsonCodec.jsonCodec(ResourceGroupId.class);
         ResourceGroupId resourceGroupId = new ResourceGroupId(new ResourceGroupId("test.test"), "foo");
-        assertEquals(codec.fromJson(codec.toJson(resourceGroupId)), resourceGroupId);
+        assertThat(codec.fromJson(codec.toJson(resourceGroupId))).isEqualTo(resourceGroupId);
 
-        assertEquals(codec.toJson(resourceGroupId), "[ \"test.test\", \"foo\" ]");
-        assertEquals(codec.fromJson("[\"test.test\", \"foo\"]"), resourceGroupId);
+        assertThat(codec.toJson(resourceGroupId)).isEqualTo("[ \"test.test\", \"foo\" ]");
+        assertThat(codec.fromJson("[\"test.test\", \"foo\"]")).isEqualTo(resourceGroupId);
     }
 
     @Test
@@ -48,15 +46,15 @@ public void testIsAncestor()
         ResourceGroupId rootA = new ResourceGroupId(root, "a");
         ResourceGroupId rootAFoo = new ResourceGroupId(rootA, "foo");
         ResourceGroupId rootBar = new ResourceGroupId(root, "bar");
-        assertTrue(root.isAncestorOf(rootA));
-        assertTrue(root.isAncestorOf(rootAFoo));
-        assertTrue(root.isAncestorOf(rootBar));
-        assertTrue(rootA.isAncestorOf(rootAFoo));
-        assertFalse(rootA.isAncestorOf(rootBar));
-        assertFalse(rootAFoo.isAncestorOf(rootBar));
-        assertFalse(rootBar.isAncestorOf(rootAFoo));
-        assertFalse(rootAFoo.isAncestorOf(root));
-        assertFalse(root.isAncestorOf(root));
-        assertFalse(rootAFoo.isAncestorOf(rootAFoo));
+        assertThat(root.isAncestorOf(rootA)).isTrue();
+        assertThat(root.isAncestorOf(rootAFoo)).isTrue();
+        assertThat(root.isAncestorOf(rootBar)).isTrue();
+        assertThat(rootA.isAncestorOf(rootAFoo)).isTrue();
+        assertThat(rootA.isAncestorOf(rootBar)).isFalse();
+        assertThat(rootAFoo.isAncestorOf(rootBar)).isFalse();
+        assertThat(rootBar.isAncestorOf(rootAFoo)).isFalse();
+        assertThat(rootAFoo.isAncestorOf(root)).isFalse();
+        assertThat(root.isAncestorOf(root)).isFalse();
+        assertThat(rootAFoo.isAncestorOf(rootAFoo)).isFalse();
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/security/TestIdentity.java b/core/trino-spi/src/test/java/io/trino/spi/security/TestIdentity.java
index 209b98f04e9b..77bd36a28fe3 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/security/TestIdentity.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/security/TestIdentity.java
@@ -15,8 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -48,26 +47,26 @@ public void testEquals()
                 .isEqualTo(TEST_IDENTITY);
     }
 
-    @Test(dataProvider = "notEqualProvider")
-    public void testNotEquals(Identity otherIdentity)
+    @Test
+    public void testNotEquals()
     {
-        assertThat(otherIdentity)
+        assertThat(Identity.from(TEST_IDENTITY).withPrincipal(new BasicPrincipal("other principal")).build())
                 .isNotEqualTo(TEST_IDENTITY);
-    }
 
-    @DataProvider
-    public static Object[][] notEqualProvider()
-    {
-        return new Object[][]
-                {
-                        {Identity.from(TEST_IDENTITY).withPrincipal(new BasicPrincipal("other principal")).build()},
-                        {Identity.from(TEST_IDENTITY).withGroups(ImmutableSet.of("group2", "group3")).build()},
-                        {Identity.from(TEST_IDENTITY).withEnabledRoles(ImmutableSet.of("role2", "role3")).build()},
-                        {Identity.from(TEST_IDENTITY).withConnectorRoles(ImmutableMap.of(
-                                "connector2", new SelectedRole(SelectedRole.Type.ROLE, Optional.of("connector2role")),
-                                "connector3", new SelectedRole(SelectedRole.Type.ROLE, Optional.of("connector3role"))))
-                                .build()},
-                };
+        assertThat(Identity.from(TEST_IDENTITY).withPrincipal(new BasicPrincipal("other principal")).build())
+                .isNotEqualTo(TEST_IDENTITY);
+
+        assertThat(Identity.from(TEST_IDENTITY).withGroups(ImmutableSet.of("group2", "group3")).build())
+                .isNotEqualTo(TEST_IDENTITY);
+
+        assertThat(Identity.from(TEST_IDENTITY).withEnabledRoles(ImmutableSet.of("role2", "role3")).build())
+                .isNotEqualTo(TEST_IDENTITY);
+
+        assertThat(Identity.from(TEST_IDENTITY).withConnectorRoles(ImmutableMap.of(
+                        "connector2", new SelectedRole(SelectedRole.Type.ROLE, Optional.of("connector2role")),
+                        "connector3", new SelectedRole(SelectedRole.Type.ROLE, Optional.of("connector3role"))))
+                .build())
+                .isNotEqualTo(TEST_IDENTITY);
     }
 
     @Test
diff --git a/core/trino-spi/src/test/java/io/trino/spi/security/TestSelectedRole.java b/core/trino-spi/src/test/java/io/trino/spi/security/TestSelectedRole.java
index 4c4b8a16f9bd..2118a73355e9 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/security/TestSelectedRole.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/security/TestSelectedRole.java
@@ -14,12 +14,12 @@
 package io.trino.spi.security;
 
 import io.airlift.json.JsonCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
 import static io.airlift.json.JsonCodec.jsonCodec;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSelectedRole
 {
@@ -35,7 +35,7 @@ public void testJsonSerialization()
 
     private static void assertJsonRoundTrip(SelectedRole expected)
     {
-        assertEquals(SELECTED_ROLE_JSON_CODEC.fromJson(SELECTED_ROLE_JSON_CODEC.toJson(expected)), expected);
+        assertThat(SELECTED_ROLE_JSON_CODEC.fromJson(SELECTED_ROLE_JSON_CODEC.toJson(expected))).isEqualTo(expected);
     }
 
     @Test
@@ -48,6 +48,6 @@ public void testToStringSerialization()
 
     private static void assertToStringRoundTrip(SelectedRole expected)
     {
-        assertEquals(SelectedRole.valueOf(expected.toString()), expected);
+        assertThat(SelectedRole.valueOf(expected.toString())).isEqualTo(expected);
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/statistics/TestDoubleRange.java b/core/trino-spi/src/test/java/io/trino/spi/statistics/TestDoubleRange.java
index b1571c27ba38..a881db10a9dd 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/statistics/TestDoubleRange.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/statistics/TestDoubleRange.java
@@ -13,11 +13,11 @@
  */
 package io.trino.spi.statistics;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.statistics.DoubleRange.union;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
 
 public class TestDoubleRange
 {
@@ -61,17 +61,17 @@ public void testRange()
     @Test
     public void testUnion()
     {
-        assertEquals(union(new DoubleRange(1, 2), new DoubleRange(4, 5)), new DoubleRange(1, 5));
-        assertEquals(union(new DoubleRange(1, 2), new DoubleRange(1, 2)), new DoubleRange(1, 2));
-        assertEquals(union(new DoubleRange(4, 5), new DoubleRange(1, 2)), new DoubleRange(1, 5));
-        assertEquals(union(new DoubleRange(Double.NEGATIVE_INFINITY, 0), new DoubleRange(0, Double.POSITIVE_INFINITY)), new DoubleRange(Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY));
-        assertEquals(union(new DoubleRange(0, Double.POSITIVE_INFINITY), new DoubleRange(Double.NEGATIVE_INFINITY, 0)), new DoubleRange(Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY));
+        assertThat(union(new DoubleRange(1, 2), new DoubleRange(4, 5))).isEqualTo(new DoubleRange(1, 5));
+        assertThat(union(new DoubleRange(1, 2), new DoubleRange(1, 2))).isEqualTo(new DoubleRange(1, 2));
+        assertThat(union(new DoubleRange(4, 5), new DoubleRange(1, 2))).isEqualTo(new DoubleRange(1, 5));
+        assertThat(union(new DoubleRange(Double.NEGATIVE_INFINITY, 0), new DoubleRange(0, Double.POSITIVE_INFINITY))).isEqualTo(new DoubleRange(Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY));
+        assertThat(union(new DoubleRange(0, Double.POSITIVE_INFINITY), new DoubleRange(Double.NEGATIVE_INFINITY, 0))).isEqualTo(new DoubleRange(Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY));
     }
 
     private static void assertRange(double min, double max)
     {
         DoubleRange range = new DoubleRange(min, max);
-        assertEquals(range.getMin(), min);
-        assertEquals(range.getMax(), max);
+        assertThat(range.getMin()).isEqualTo(min);
+        assertThat(range.getMax()).isEqualTo(max);
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/statistics/TestStatsUtil.java b/core/trino-spi/src/test/java/io/trino/spi/statistics/TestStatsUtil.java
index 544e19b12848..79c34918649b 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/statistics/TestStatsUtil.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/statistics/TestStatsUtil.java
@@ -18,7 +18,7 @@
 import io.trino.spi.type.LongTimestamp;
 import io.trino.spi.type.LongTimestampWithTimeZone;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.util.OptionalDouble;
@@ -38,7 +38,7 @@
 import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static java.lang.Float.floatToIntBits;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestStatsUtil
 {
@@ -69,6 +69,6 @@ public void testToStatsRepresentation()
     private static void assertToStatsRepresentation(Type type, Object trinoValue, double expected)
     {
         verify(Primitives.wrap(type.getJavaType()).isInstance(trinoValue), "Incorrect class of value for %s: %s", type, trinoValue.getClass());
-        assertEquals(toStatsRepresentation(type, trinoValue), OptionalDouble.of(expected));
+        assertThat(toStatsRepresentation(type, trinoValue)).isEqualTo(OptionalDouble.of(expected));
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/testing/InterfaceTestUtils.java b/core/trino-spi/src/test/java/io/trino/spi/testing/InterfaceTestUtils.java
index 4c89dd5c7f4c..b3bb9cd432fd 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/testing/InterfaceTestUtils.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/testing/InterfaceTestUtils.java
@@ -26,8 +26,8 @@
 import static com.google.common.collect.Sets.difference;
 import static com.google.common.reflect.Reflection.newProxy;
 import static java.lang.String.format;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Fail.fail;
 
 public final class InterfaceTestUtils
 {
@@ -86,7 +86,7 @@ public static <I, C extends I> void assertProperForwardingMethodsAreCalled(Class
             }
             C forwardingInstance = forwardingInstanceFactory.apply(
                     newProxy(iface, (proxy, expectedMethod, expectedArguments) -> {
-                        assertEquals(actualMethod.getName(), expectedMethod.getName());
+                        assertThat(actualMethod.getName()).isEqualTo(expectedMethod.getName());
                         // TODO assert arguments
 
                         if (actualMethod.getReturnType().isPrimitive()) {
diff --git a/core/trino-spi/src/test/java/io/trino/spi/testing/TestInterfaceTestUtils.java b/core/trino-spi/src/test/java/io/trino/spi/testing/TestInterfaceTestUtils.java
index fb7891bd905e..1e0290eb1c2c 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/testing/TestInterfaceTestUtils.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/testing/TestInterfaceTestUtils.java
@@ -13,7 +13,7 @@
  */
 package io.trino.spi.testing;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.Serializable;
 
diff --git a/core/trino-spi/src/test/java/io/trino/spi/transaction/TestIsolationLevel.java b/core/trino-spi/src/test/java/io/trino/spi/transaction/TestIsolationLevel.java
index fe6fb734a156..84877b8b0884 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/transaction/TestIsolationLevel.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/transaction/TestIsolationLevel.java
@@ -13,48 +13,46 @@
  */
 package io.trino.spi.transaction;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.transaction.IsolationLevel.READ_COMMITTED;
 import static io.trino.spi.transaction.IsolationLevel.READ_UNCOMMITTED;
 import static io.trino.spi.transaction.IsolationLevel.REPEATABLE_READ;
 import static io.trino.spi.transaction.IsolationLevel.SERIALIZABLE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIsolationLevel
 {
     @Test
     public void testMeetsRequirementOf()
     {
-        assertTrue(READ_UNCOMMITTED.meetsRequirementOf(READ_UNCOMMITTED));
-        assertFalse(READ_UNCOMMITTED.meetsRequirementOf(READ_COMMITTED));
-        assertFalse(READ_UNCOMMITTED.meetsRequirementOf(REPEATABLE_READ));
-        assertFalse(READ_UNCOMMITTED.meetsRequirementOf(SERIALIZABLE));
+        assertThat(READ_UNCOMMITTED.meetsRequirementOf(READ_UNCOMMITTED)).isTrue();
+        assertThat(READ_UNCOMMITTED.meetsRequirementOf(READ_COMMITTED)).isFalse();
+        assertThat(READ_UNCOMMITTED.meetsRequirementOf(REPEATABLE_READ)).isFalse();
+        assertThat(READ_UNCOMMITTED.meetsRequirementOf(SERIALIZABLE)).isFalse();
 
-        assertTrue(READ_COMMITTED.meetsRequirementOf(READ_UNCOMMITTED));
-        assertTrue(READ_COMMITTED.meetsRequirementOf(READ_COMMITTED));
-        assertFalse(READ_COMMITTED.meetsRequirementOf(REPEATABLE_READ));
-        assertFalse(READ_COMMITTED.meetsRequirementOf(SERIALIZABLE));
+        assertThat(READ_COMMITTED.meetsRequirementOf(READ_UNCOMMITTED)).isTrue();
+        assertThat(READ_COMMITTED.meetsRequirementOf(READ_COMMITTED)).isTrue();
+        assertThat(READ_COMMITTED.meetsRequirementOf(REPEATABLE_READ)).isFalse();
+        assertThat(READ_COMMITTED.meetsRequirementOf(SERIALIZABLE)).isFalse();
 
-        assertTrue(REPEATABLE_READ.meetsRequirementOf(READ_UNCOMMITTED));
-        assertTrue(REPEATABLE_READ.meetsRequirementOf(READ_COMMITTED));
-        assertTrue(REPEATABLE_READ.meetsRequirementOf(REPEATABLE_READ));
-        assertFalse(REPEATABLE_READ.meetsRequirementOf(SERIALIZABLE));
+        assertThat(REPEATABLE_READ.meetsRequirementOf(READ_UNCOMMITTED)).isTrue();
+        assertThat(REPEATABLE_READ.meetsRequirementOf(READ_COMMITTED)).isTrue();
+        assertThat(REPEATABLE_READ.meetsRequirementOf(REPEATABLE_READ)).isTrue();
+        assertThat(REPEATABLE_READ.meetsRequirementOf(SERIALIZABLE)).isFalse();
 
-        assertTrue(SERIALIZABLE.meetsRequirementOf(READ_UNCOMMITTED));
-        assertTrue(SERIALIZABLE.meetsRequirementOf(READ_COMMITTED));
-        assertTrue(SERIALIZABLE.meetsRequirementOf(REPEATABLE_READ));
-        assertTrue(SERIALIZABLE.meetsRequirementOf(SERIALIZABLE));
+        assertThat(SERIALIZABLE.meetsRequirementOf(READ_UNCOMMITTED)).isTrue();
+        assertThat(SERIALIZABLE.meetsRequirementOf(READ_COMMITTED)).isTrue();
+        assertThat(SERIALIZABLE.meetsRequirementOf(REPEATABLE_READ)).isTrue();
+        assertThat(SERIALIZABLE.meetsRequirementOf(SERIALIZABLE)).isTrue();
     }
 
     @Test
     public void testToString()
     {
-        assertEquals(READ_UNCOMMITTED.toString(), "READ UNCOMMITTED");
-        assertEquals(READ_COMMITTED.toString(), "READ COMMITTED");
-        assertEquals(REPEATABLE_READ.toString(), "REPEATABLE READ");
-        assertEquals(SERIALIZABLE.toString(), "SERIALIZABLE");
+        assertThat(READ_UNCOMMITTED.toString()).isEqualTo("READ UNCOMMITTED");
+        assertThat(READ_COMMITTED.toString()).isEqualTo("READ COMMITTED");
+        assertThat(REPEATABLE_READ.toString()).isEqualTo("REPEATABLE READ");
+        assertThat(SERIALIZABLE.toString()).isEqualTo("SERIALIZABLE");
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestArrayType.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestArrayType.java
index 4896f14e25de..b5866642abb9 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestArrayType.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestArrayType.java
@@ -13,10 +13,10 @@
  */
 package io.trino.spi.type;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BooleanType.BOOLEAN;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestArrayType
 {
@@ -24,6 +24,6 @@ public class TestArrayType
     public void testDisplayName()
     {
         ArrayType type = new ArrayType(BOOLEAN);
-        assertEquals(type.getDisplayName(), "array(boolean)");
+        assertThat(type.getDisplayName()).isEqualTo("array(boolean)");
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestChars.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestChars.java
index d4baf7ad1bb4..1cf41696089f 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestChars.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestChars.java
@@ -14,7 +14,7 @@
 package io.trino.spi.type;
 
 import io.airlift.slice.Slice;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.base.Verify.verify;
 import static io.airlift.slice.Slices.utf8Slice;
@@ -23,8 +23,8 @@
 import static io.trino.spi.type.Chars.byteCountWithoutTrailingSpace;
 import static io.trino.spi.type.Chars.padSpaces;
 import static io.trino.spi.type.Chars.truncateToLengthAndTrimSpaces;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
 
 public class TestChars
 {
@@ -51,26 +51,26 @@ public void testPadSpaces()
 
     private void testPadSpaces(String input, int length, String expected)
     {
-        assertEquals(padSpaces(input, createCharType(length)), expected);
-        assertEquals(padSpaces(utf8Slice(input), createCharType(length)), utf8Slice(expected));
-        assertEquals(padSpaces(utf8Slice(input), length), utf8Slice(expected));
+        assertThat(padSpaces(input, createCharType(length))).isEqualTo(expected);
+        assertThat(padSpaces(utf8Slice(input), createCharType(length))).isEqualTo(utf8Slice(expected));
+        assertThat(padSpaces(utf8Slice(input), length)).isEqualTo(utf8Slice(expected));
     }
 
     @Test
     public void testTruncateToLengthAndTrimSpaces()
     {
-        assertEquals(utf8Slice("a"), truncateToLengthAndTrimSpaces(utf8Slice("a c"), 1));
-        assertEquals(utf8Slice("a"), truncateToLengthAndTrimSpaces(utf8Slice("a  "), 1));
-        assertEquals(utf8Slice("a"), truncateToLengthAndTrimSpaces(utf8Slice("abc"), 1));
-        assertEquals(utf8Slice(""), truncateToLengthAndTrimSpaces(utf8Slice("a c"), 0));
-        assertEquals(utf8Slice("a c"), truncateToLengthAndTrimSpaces(utf8Slice("a c "), 3));
-        assertEquals(utf8Slice("a c"), truncateToLengthAndTrimSpaces(utf8Slice("a c "), 4));
-        assertEquals(utf8Slice("a c"), truncateToLengthAndTrimSpaces(utf8Slice("a c "), 5));
-        assertEquals(utf8Slice("a c"), truncateToLengthAndTrimSpaces(utf8Slice("a c"), 3));
-        assertEquals(utf8Slice("a c"), truncateToLengthAndTrimSpaces(utf8Slice("a c"), 4));
-        assertEquals(utf8Slice("a c"), truncateToLengthAndTrimSpaces(utf8Slice("a c"), 5));
-        assertEquals(utf8Slice(""), truncateToLengthAndTrimSpaces(utf8Slice("  "), 1));
-        assertEquals(utf8Slice(""), truncateToLengthAndTrimSpaces(utf8Slice(""), 1));
+        assertThat(utf8Slice("a")).isEqualTo(truncateToLengthAndTrimSpaces(utf8Slice("a c"), 1));
+        assertThat(utf8Slice("a")).isEqualTo(truncateToLengthAndTrimSpaces(utf8Slice("a  "), 1));
+        assertThat(utf8Slice("a")).isEqualTo(truncateToLengthAndTrimSpaces(utf8Slice("abc"), 1));
+        assertThat(utf8Slice("")).isEqualTo(truncateToLengthAndTrimSpaces(utf8Slice("a c"), 0));
+        assertThat(utf8Slice("a c")).isEqualTo(truncateToLengthAndTrimSpaces(utf8Slice("a c "), 3));
+        assertThat(utf8Slice("a c")).isEqualTo(truncateToLengthAndTrimSpaces(utf8Slice("a c "), 4));
+        assertThat(utf8Slice("a c")).isEqualTo(truncateToLengthAndTrimSpaces(utf8Slice("a c "), 5));
+        assertThat(utf8Slice("a c")).isEqualTo(truncateToLengthAndTrimSpaces(utf8Slice("a c"), 3));
+        assertThat(utf8Slice("a c")).isEqualTo(truncateToLengthAndTrimSpaces(utf8Slice("a c"), 4));
+        assertThat(utf8Slice("a c")).isEqualTo(truncateToLengthAndTrimSpaces(utf8Slice("a c"), 5));
+        assertThat(utf8Slice("")).isEqualTo(truncateToLengthAndTrimSpaces(utf8Slice("  "), 1));
+        assertThat(utf8Slice("")).isEqualTo(truncateToLengthAndTrimSpaces(utf8Slice(""), 1));
     }
 
     @Test
@@ -135,7 +135,7 @@ private static void assertByteCountWithoutTrailingSpace(byte[] actual, int offse
         Slice slice = wrappedBuffer(actual);
         int trimmedLength = byteCountWithoutTrailingSpace(slice, offset, length);
         byte[] bytes = slice.getBytes(offset, trimmedLength);
-        assertEquals(bytes, expected);
+        assertThat(bytes).isEqualTo(expected);
     }
 
     private static void assertByteCountWithoutTrailingSpace(String actual, int offset, int length, int codePointCount, String expected)
@@ -148,6 +148,6 @@ private static void assertByteCountWithoutTrailingSpace(byte[] actual, int offse
         Slice slice = wrappedBuffer(actual);
         int truncatedLength = byteCountWithoutTrailingSpace(slice, offset, length, codePointCount);
         byte[] bytes = slice.getBytes(offset, truncatedLength);
-        assertEquals(bytes, expected);
+        assertThat(bytes).isEqualTo(expected);
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestDecimals.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestDecimals.java
index 0cb68890749e..4346bbcc0b9a 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestDecimals.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestDecimals.java
@@ -13,20 +13,16 @@
  */
 package io.trino.spi.type;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
-import java.util.Objects;
 
 import static io.trino.spi.type.DecimalType.createDecimalType;
 import static io.trino.spi.type.Decimals.encodeScaledValue;
 import static io.trino.spi.type.Decimals.encodeShortScaledValue;
 import static io.trino.spi.type.Decimals.overflows;
 import static java.lang.String.format;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDecimals
 {
@@ -92,6 +88,16 @@ public void testParse()
         assertParseResult("0000.12345678901234567890123456789012345678", Int128.valueOf("12345678901234567890123456789012345678"), 38, 38);
         assertParseResult("+0000.12345678901234567890123456789012345678", Int128.valueOf("12345678901234567890123456789012345678"), 38, 38);
         assertParseResult("-0000.12345678901234567890123456789012345678", Int128.valueOf("-12345678901234567890123456789012345678"), 38, 38);
+
+        assertParseResult("0_1_2_3_4", 1234L, 4, 0);
+        assertParseFailure("0_1_2_3_4_");
+        assertParseFailure("_0_1_2_3_4");
+
+        assertParseResult("0_1_2_3_4.5_6_7_8", 12345678L, 8, 4);
+        assertParseFailure("_0_1_2_3_4.5_6_7_8");
+        assertParseFailure("0_1_2_3_4_.5_6_7_8");
+        assertParseFailure("0_1_2_3_4._5_6_7_8");
+        assertParseFailure("0_1_2_3_4.5_6_7_8_");
     }
 
     @Test
@@ -105,47 +111,46 @@ public void testRejectNoDigits()
     @Test
     public void testEncodeShortScaledValue()
     {
-        assertEquals(encodeShortScaledValue(new BigDecimal("2.00"), 2), 200L);
-        assertEquals(encodeShortScaledValue(new BigDecimal("2.13"), 2), 213L);
-        assertEquals(encodeShortScaledValue(new BigDecimal("172.60"), 2), 17260L);
-        assertEquals(encodeShortScaledValue(new BigDecimal("2"), 2), 200L);
-        assertEquals(encodeShortScaledValue(new BigDecimal("172.6"), 2), 17260L);
+        assertThat(encodeShortScaledValue(new BigDecimal("2.00"), 2)).isEqualTo(200L);
+        assertThat(encodeShortScaledValue(new BigDecimal("2.13"), 2)).isEqualTo(213L);
+        assertThat(encodeShortScaledValue(new BigDecimal("172.60"), 2)).isEqualTo(17260L);
+        assertThat(encodeShortScaledValue(new BigDecimal("2"), 2)).isEqualTo(200L);
+        assertThat(encodeShortScaledValue(new BigDecimal("172.6"), 2)).isEqualTo(17260L);
 
-        assertEquals(encodeShortScaledValue(new BigDecimal("-2.00"), 2), -200L);
-        assertEquals(encodeShortScaledValue(new BigDecimal("-2.13"), 2), -213L);
-        assertEquals(encodeShortScaledValue(new BigDecimal("-2"), 2), -200L);
+        assertThat(encodeShortScaledValue(new BigDecimal("-2.00"), 2)).isEqualTo(-200L);
+        assertThat(encodeShortScaledValue(new BigDecimal("-2.13"), 2)).isEqualTo(-213L);
+        assertThat(encodeShortScaledValue(new BigDecimal("-2"), 2)).isEqualTo(-200L);
     }
 
     @Test
     public void testEncodeScaledValue()
     {
-        assertEquals(encodeScaledValue(new BigDecimal("2.00"), 2), Int128.valueOf(200));
-        assertEquals(encodeScaledValue(new BigDecimal("2.13"), 2), Int128.valueOf(213));
-        assertEquals(encodeScaledValue(new BigDecimal("172.60"), 2), Int128.valueOf(17260));
-        assertEquals(encodeScaledValue(new BigDecimal("2"), 2), Int128.valueOf(200));
-        assertEquals(encodeScaledValue(new BigDecimal("172.6"), 2), Int128.valueOf(17260));
+        assertThat(encodeScaledValue(new BigDecimal("2.00"), 2)).isEqualTo(Int128.valueOf(200));
+        assertThat(encodeScaledValue(new BigDecimal("2.13"), 2)).isEqualTo(Int128.valueOf(213));
+        assertThat(encodeScaledValue(new BigDecimal("172.60"), 2)).isEqualTo(Int128.valueOf(17260));
+        assertThat(encodeScaledValue(new BigDecimal("2"), 2)).isEqualTo(Int128.valueOf(200));
+        assertThat(encodeScaledValue(new BigDecimal("172.6"), 2)).isEqualTo(Int128.valueOf(17260));
 
-        assertEquals(encodeScaledValue(new BigDecimal("-2.00"), 2), Int128.valueOf(-200));
-        assertEquals(encodeScaledValue(new BigDecimal("-2.13"), 2), Int128.valueOf(-213));
-        assertEquals(encodeScaledValue(new BigDecimal("-2"), 2), Int128.valueOf(-200));
-        assertEquals(encodeScaledValue(new BigDecimal("-172.60"), 2), Int128.valueOf(-17260));
+        assertThat(encodeScaledValue(new BigDecimal("-2.00"), 2)).isEqualTo(Int128.valueOf(-200));
+        assertThat(encodeScaledValue(new BigDecimal("-2.13"), 2)).isEqualTo(Int128.valueOf(-213));
+        assertThat(encodeScaledValue(new BigDecimal("-2"), 2)).isEqualTo(Int128.valueOf(-200));
+        assertThat(encodeScaledValue(new BigDecimal("-172.60"), 2)).isEqualTo(Int128.valueOf(-17260));
     }
 
     @Test
     public void testOverflows()
     {
-        assertTrue(overflows(Int128.valueOf("100"), 2));
-        assertTrue(overflows(Int128.valueOf("-100"), 2));
-        assertFalse(overflows(Int128.valueOf("99"), 2));
-        assertFalse(overflows(Int128.valueOf("-99"), 2));
+        assertThat(overflows(Int128.valueOf("100"), 2)).isTrue();
+        assertThat(overflows(Int128.valueOf("-100"), 2)).isTrue();
+        assertThat(overflows(Int128.valueOf("99"), 2)).isFalse();
+        assertThat(overflows(Int128.valueOf("-99"), 2)).isFalse();
     }
 
     private void assertParseResult(String value, Object expectedObject, int expectedPrecision, int expectedScale)
     {
-        assertEquals(Decimals.parse(value),
-                new DecimalParseResult(
-                        expectedObject,
-                        createDecimalType(expectedPrecision, expectedScale)));
+        assertThat(Decimals.parse(value)).isEqualTo(new DecimalParseResult(
+                expectedObject,
+                createDecimalType(expectedPrecision, expectedScale)));
     }
 
     private void assertParseFailure(String text)
@@ -154,12 +159,12 @@ private void assertParseFailure(String text)
             Decimals.parse(text);
         }
         catch (IllegalArgumentException e) {
-            String expectedMessage = format("Invalid decimal value '%s'", text);
-            if (!Objects.equals(e.getMessage(), expectedMessage)) {
-                fail(format("Unexpected exception, exception with message '%s' was expected", expectedMessage), e);
-            }
+            String expectedMessage = format("Invalid DECIMAL value '%s'", text);
+            assertThat(e.getMessage())
+                    .withFailMessage(() -> format("Unexpected exception, exception with message '%s' was expected", expectedMessage))
+                    .isEqualTo(expectedMessage);
             return;
         }
-        fail("Parse failure was expected");
+        throw new AssertionError("Parse failure was expected");
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestInt128.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestInt128.java
index 02833e80285d..48b4fd474bc3 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestInt128.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestInt128.java
@@ -13,7 +13,7 @@
  */
 package io.trino.spi.type;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigInteger;
 
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestInt128Math.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestInt128Math.java
index 4b16ecae2969..f776ada046b2 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestInt128Math.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestInt128Math.java
@@ -13,7 +13,7 @@
  */
 package io.trino.spi.type;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -35,10 +35,6 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
 
 public class TestInt128Math
 {
@@ -251,7 +247,7 @@ private static void assertMultiply256(Int128 left, Int128 right, int[] expected)
         leftArg[3] = (int) (left.getHigh() >> 32);
 
         multiply256Destructive(leftArg, right);
-        assertEquals(leftArg, expected);
+        assertThat(leftArg).isEqualTo(expected);
     }
 
     @Test
@@ -422,117 +418,110 @@ public void testCompare()
     @Test
     public void testNegate()
     {
-        assertEquals(negate(negate(MIN_DECIMAL)), MIN_DECIMAL);
-        assertEquals(negate(MIN_DECIMAL), MAX_DECIMAL);
-        assertEquals(negate(MIN_DECIMAL), MAX_DECIMAL);
+        assertThat(negate(negate(MIN_DECIMAL))).isEqualTo(MIN_DECIMAL);
+        assertThat(negate(MIN_DECIMAL)).isEqualTo(MAX_DECIMAL);
+        assertThat(negate(MIN_DECIMAL)).isEqualTo(MAX_DECIMAL);
 
-        assertEquals(negate(Int128.valueOf(1)), Int128.valueOf(-1));
-        assertEquals(negate(Int128.valueOf(-1)), Int128.valueOf(1));
+        assertThat(negate(Int128.valueOf(1))).isEqualTo(Int128.valueOf(-1));
+        assertThat(negate(Int128.valueOf(-1))).isEqualTo(Int128.valueOf(1));
     }
 
     @Test
     public void testIsNegative()
     {
-        assertTrue(MIN_DECIMAL.isNegative());
-        assertFalse(MAX_DECIMAL.isNegative());
-        assertFalse(Int128.ZERO.isNegative());
+        assertThat(MIN_DECIMAL.isNegative()).isTrue();
+        assertThat(MAX_DECIMAL.isNegative()).isFalse();
+        assertThat(Int128.ZERO.isNegative()).isFalse();
     }
 
     @Test
     public void testToString()
     {
-        assertEquals(Int128.ZERO.toString(), "0");
-        assertEquals(Int128.valueOf(1).toString(), "1");
-        assertEquals(Int128.valueOf(-1).toString(), "-1");
-        assertEquals(MAX_DECIMAL.toString(), Decimals.MAX_UNSCALED_DECIMAL.toBigInteger().toString());
-        assertEquals(MIN_DECIMAL.toString(), Decimals.MIN_UNSCALED_DECIMAL.toBigInteger().toString());
-        assertEquals(Int128.valueOf("1000000000000000000000000000000000000").toString(), "1000000000000000000000000000000000000");
-        assertEquals(Int128.valueOf("-1000000000002000000000000300000000000").toString(), "-1000000000002000000000000300000000000");
+        assertThat(Int128.ZERO.toString()).isEqualTo("0");
+        assertThat(Int128.valueOf(1).toString()).isEqualTo("1");
+        assertThat(Int128.valueOf(-1).toString()).isEqualTo("-1");
+        assertThat(MAX_DECIMAL.toString()).isEqualTo(Decimals.MAX_UNSCALED_DECIMAL.toBigInteger().toString());
+        assertThat(MIN_DECIMAL.toString()).isEqualTo(Decimals.MIN_UNSCALED_DECIMAL.toBigInteger().toString());
+        assertThat(Int128.valueOf("1000000000000000000000000000000000000").toString()).isEqualTo("1000000000000000000000000000000000000");
+        assertThat(Int128.valueOf("-1000000000002000000000000300000000000").toString()).isEqualTo("-1000000000002000000000000300000000000");
     }
 
     @Test
     public void testShiftLeftMultiPrecision()
     {
-        assertEquals(shiftLeftMultiPrecision(
-                        new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
-                                0b11111111000000011010101010101011, 0b00000000000000000000000000000000}, 4, 0),
+        assertThat(shiftLeftMultiPrecision(
                 new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
+                        0b11111111000000011010101010101011, 0b00000000000000000000000000000000}, 4, 0))
+                .isEqualTo(new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
                         0b11111111000000011010101010101011, 0b00000000000000000000000000000000});
-        assertEquals(shiftLeftMultiPrecision(
-                        new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
-                                0b11111111000000011010101010101011, 0b00000000000000000000000000000000}, 5, 1),
-                new int[] {0b01000010100010110100001010001010, 0b10101101001011010110101010101011, 0b10100101111100011111000101010100,
+        assertThat(shiftLeftMultiPrecision(
+                new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
+                        0b11111111000000011010101010101011, 0b00000000000000000000000000000000}, 5, 1))
+                .isEqualTo(new int[] {0b01000010100010110100001010001010, 0b10101101001011010110101010101011, 0b10100101111100011111000101010100,
                         0b11111110000000110101010101010110, 0b00000000000000000000000000000001});
-        assertEquals(shiftLeftMultiPrecision(
-                        new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
-                                0b11111111000000011010101010101011, 0b00000000000000000000000000000000}, 5, 31),
-                new int[] {0b10000000000000000000000000000000, 0b11010000101000101101000010100010, 0b00101011010010110101101010101010,
+        assertThat(shiftLeftMultiPrecision(
+                new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
+                        0b11111111000000011010101010101011, 0b00000000000000000000000000000000}, 5, 31))
+                .isEqualTo(new int[] {0b10000000000000000000000000000000, 0b11010000101000101101000010100010, 0b00101011010010110101101010101010,
                         0b10101001011111000111110001010101, 0b1111111100000001101010101010101});
-        assertEquals(shiftLeftMultiPrecision(
-                        new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
-                                0b11111111000000011010101010101011, 0b00000000000000000000000000000000}, 5, 32),
-                new int[] {0b00000000000000000000000000000000, 0b10100001010001011010000101000101, 0b01010110100101101011010101010101,
+        assertThat(shiftLeftMultiPrecision(
+                new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
+                        0b11111111000000011010101010101011, 0b00000000000000000000000000000000}, 5, 32))
+                .isEqualTo(new int[] {0b00000000000000000000000000000000, 0b10100001010001011010000101000101, 0b01010110100101101011010101010101,
                         0b01010010111110001111100010101010, 0b11111111000000011010101010101011});
-        assertEquals(shiftLeftMultiPrecision(
-                        new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
-                                0b11111111000000011010101010101011, 0b00000000000000000000000000000000, 0b00000000000000000000000000000000}, 6, 33),
-                new int[] {0b00000000000000000000000000000000, 0b01000010100010110100001010001010, 0b10101101001011010110101010101011,
+        assertThat(shiftLeftMultiPrecision(
+                new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
+                        0b11111111000000011010101010101011, 0b00000000000000000000000000000000, 0b00000000000000000000000000000000}, 6, 33))
+                .isEqualTo(new int[] {0b00000000000000000000000000000000, 0b01000010100010110100001010001010, 0b10101101001011010110101010101011,
                         0b10100101111100011111000101010100, 0b11111110000000110101010101010110, 0b00000000000000000000000000000001});
-        assertEquals(shiftLeftMultiPrecision(
-                        new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
-                                0b11111111000000011010101010101011, 0b00000000000000000000000000000000, 0b00000000000000000000000000000000}, 6, 37),
-                new int[] {0b00000000000000000000000000000000, 0b00101000101101000010100010100000, 0b11010010110101101010101010110100,
+        assertThat(shiftLeftMultiPrecision(
+                new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
+                        0b11111111000000011010101010101011, 0b00000000000000000000000000000000, 0b00000000000000000000000000000000}, 6, 37))
+                .isEqualTo(new int[] {0b00000000000000000000000000000000, 0b00101000101101000010100010100000, 0b11010010110101101010101010110100,
                         0b01011111000111110001010101001010, 0b11100000001101010101010101101010, 0b00000000000000000000000000011111});
-        assertEquals(shiftLeftMultiPrecision(
-                        new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
-                                0b11111111000000011010101010101011, 0b00000000000000000000000000000000, 0b00000000000000000000000000000000}, 6, 64),
-                new int[] {0b00000000000000000000000000000000, 0b00000000000000000000000000000000, 0b10100001010001011010000101000101,
+        assertThat(shiftLeftMultiPrecision(
+                new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
+                        0b11111111000000011010101010101011, 0b00000000000000000000000000000000, 0b00000000000000000000000000000000}, 6, 64))
+                .isEqualTo(new int[] {0b00000000000000000000000000000000, 0b00000000000000000000000000000000, 0b10100001010001011010000101000101,
                         0b01010110100101101011010101010101, 0b01010010111110001111100010101010, 0b11111111000000011010101010101011});
     }
 
     @Test
     public void testShiftRightMultiPrecision()
     {
-        assertEquals(shiftRightMultiPrecision(
-                        new int[] {
-                                0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
-                                0b11111111000000011010101010101011, 0b00000000000000000000000000000000}, 4, 0),
-                new int[] {
-                        0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
+        assertThat(shiftRightMultiPrecision(
+                new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
+                        0b11111111000000011010101010101011, 0b00000000000000000000000000000000}, 4, 0))
+                .isEqualTo(new int[] {0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
                         0b11111111000000011010101010101011, 0b00000000000000000000000000000000});
-        assertEquals(shiftRightMultiPrecision(
-                        new int[] {
-                                0b00000000000000000000000000000000, 0b10100001010001011010000101000101, 0b01010110100101101011010101010101,
-                                0b01010010111110001111100010101010, 0b11111111000000011010101010101011}, 5, 1),
-                new int[] {
+        assertThat(shiftRightMultiPrecision(
+                new int[] {0b00000000000000000000000000000000, 0b10100001010001011010000101000101, 0b01010110100101101011010101010101,
+                        0b01010010111110001111100010101010, 0b11111111000000011010101010101011}, 5, 1))
+                .isEqualTo(new int[] {
                         0b10000000000000000000000000000000, 0b11010000101000101101000010100010, 0b00101011010010110101101010101010,
                         0b10101001011111000111110001010101, 0b1111111100000001101010101010101});
-        assertEquals(shiftRightMultiPrecision(
-                        new int[] {
-                                0b00000000000000000000000000000000, 0b10100001010001011010000101000101, 0b01010110100101101011010101010101,
-                                0b01010010111110001111100010101010, 0b11111111000000011010101010101011}, 5, 32),
-                new int[] {
+        assertThat(shiftRightMultiPrecision(
+                new int[] {0b00000000000000000000000000000000, 0b10100001010001011010000101000101, 0b01010110100101101011010101010101,
+                        0b01010010111110001111100010101010, 0b11111111000000011010101010101011}, 5, 32))
+                .isEqualTo(new int[] {
                         0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
                         0b11111111000000011010101010101011, 0b00000000000000000000000000000000});
-        assertEquals(shiftRightMultiPrecision(
-                        new int[] {
-                                0b00000000000000000000000000000000, 0b00000000000000000000000000000000, 0b10100001010001011010000101000101,
-                                0b01010110100101101011010101010101, 0b01010010111110001111100010101010, 0b11111111000000011010101010101011}, 6, 33),
-                new int[] {
+        assertThat(shiftRightMultiPrecision(
+                new int[] {0b00000000000000000000000000000000, 0b00000000000000000000000000000000, 0b10100001010001011010000101000101,
+                        0b01010110100101101011010101010101, 0b01010010111110001111100010101010, 0b11111111000000011010101010101011}, 6, 33))
+                .isEqualTo(new int[] {
                         0b10000000000000000000000000000000, 0b11010000101000101101000010100010, 0b00101011010010110101101010101010,
                         0b10101001011111000111110001010101, 0b01111111100000001101010101010101, 0b00000000000000000000000000000000});
-        assertEquals(shiftRightMultiPrecision(
-                        new int[] {
-                                0b00000000000000000000000000000000, 0b00000000000000000000000000000000, 0b10100001010001011010000101000101,
-                                0b01010110100101101011010101010101, 0b01010010111110001111100010101010, 0b11111111000000011010101010101011}, 6, 37),
-                new int[] {
+        assertThat(shiftRightMultiPrecision(
+                new int[] {0b00000000000000000000000000000000, 0b00000000000000000000000000000000, 0b10100001010001011010000101000101,
+                        0b01010110100101101011010101010101, 0b01010010111110001111100010101010, 0b11111111000000011010101010101011}, 6, 37))
+                .isEqualTo(new int[] {
                         0b00101000000000000000000000000000, 0b10101101000010100010110100001010, 0b01010010101101001011010110101010,
                         0b01011010100101111100011111000101, 0b00000111111110000000110101010101, 0b00000000000000000000000000000000});
-        assertEquals(shiftRightMultiPrecision(
-                        new int[] {
-                                0b00000000000000000000000000000000, 0b00000000000000000000000000000000, 0b10100001010001011010000101000101,
-                                0b01010110100101101011010101010101, 0b01010010111110001111100010101010, 0b11111111000000011010101010101011}, 6, 64),
-                new int[] {
+        assertThat(shiftRightMultiPrecision(
+                new int[] {0b00000000000000000000000000000000, 0b00000000000000000000000000000000, 0b10100001010001011010000101000101,
+                        0b01010110100101101011010101010101, 0b01010010111110001111100010101010, 0b11111111000000011010101010101011}, 6, 64))
+                .isEqualTo(new int[] {
                         0b10100001010001011010000101000101, 0b01010110100101101011010101010101, 0b01010010111110001111100010101010,
                         0b11111111000000011010101010101011, 0b00000000000000000000000000000000, 0b00000000000000000000000000000000});
     }
@@ -540,15 +529,15 @@ public void testShiftRightMultiPrecision()
     @Test
     public void testShiftLeft()
     {
-        assertEquals(shiftLeft(Int128.valueOf(0xEFDCBA0987654321L, 0x1234567890ABCDEFL), 0), Int128.valueOf(0xEFDCBA0987654321L, 0x1234567890ABCDEFL));
-        assertEquals(shiftLeft(Int128.valueOf(0xEFDCBA0987654321L, 0x1234567890ABCDEFL), 1), Int128.valueOf(0xDFB974130ECA8642L, 0x2468ACF121579BDEL));
-        assertEquals(shiftLeft(Int128.valueOf(0x00DCBA0987654321L, 0x1234567890ABCDEFL), 8), Int128.valueOf(0xDCBA098765432112L, 0x34567890ABCDEF00L));
-        assertEquals(shiftLeft(Int128.valueOf(0x0000BA0987654321L, 0x1234567890ABCDEFL), 16), Int128.valueOf(0xBA09876543211234L, 0x567890ABCDEF0000L));
-        assertEquals(shiftLeft(Int128.valueOf(0x0000000087654321L, 0x1234567890ABCDEFL), 32), Int128.valueOf(0x8765432112345678L, 0x90ABCDEF00000000L));
-        assertEquals(shiftLeft(Int128.valueOf(0L, 0x1234567890ABCDEFL), 64), Int128.valueOf(0x1234567890ABCDEFL, 0x0000000000000000L));
-        assertEquals(shiftLeft(Int128.valueOf(0L, 0x0034567890ABCDEFL), 64 + 8), Int128.valueOf(0x34567890ABCDEF00L, 0x0000000000000000L));
-        assertEquals(shiftLeft(Int128.valueOf(0L, 0x000000000000CDEFL), 64 + 48), Int128.valueOf(0xCDEF000000000000L, 0x0000000000000000L));
-        assertEquals(shiftLeft(Int128.valueOf(0L, 0x1L), 64 + 63), Int128.valueOf(0x8000000000000000L, 0x0000000000000000L));
+        assertThat(shiftLeft(Int128.valueOf(0xEFDCBA0987654321L, 0x1234567890ABCDEFL), 0)).isEqualTo(Int128.valueOf(0xEFDCBA0987654321L, 0x1234567890ABCDEFL));
+        assertThat(shiftLeft(Int128.valueOf(0xEFDCBA0987654321L, 0x1234567890ABCDEFL), 1)).isEqualTo(Int128.valueOf(0xDFB974130ECA8642L, 0x2468ACF121579BDEL));
+        assertThat(shiftLeft(Int128.valueOf(0x00DCBA0987654321L, 0x1234567890ABCDEFL), 8)).isEqualTo(Int128.valueOf(0xDCBA098765432112L, 0x34567890ABCDEF00L));
+        assertThat(shiftLeft(Int128.valueOf(0x0000BA0987654321L, 0x1234567890ABCDEFL), 16)).isEqualTo(Int128.valueOf(0xBA09876543211234L, 0x567890ABCDEF0000L));
+        assertThat(shiftLeft(Int128.valueOf(0x0000000087654321L, 0x1234567890ABCDEFL), 32)).isEqualTo(Int128.valueOf(0x8765432112345678L, 0x90ABCDEF00000000L));
+        assertThat(shiftLeft(Int128.valueOf(0L, 0x1234567890ABCDEFL), 64)).isEqualTo(Int128.valueOf(0x1234567890ABCDEFL, 0x0000000000000000L));
+        assertThat(shiftLeft(Int128.valueOf(0L, 0x0034567890ABCDEFL), 64 + 8)).isEqualTo(Int128.valueOf(0x34567890ABCDEF00L, 0x0000000000000000L));
+        assertThat(shiftLeft(Int128.valueOf(0L, 0x000000000000CDEFL), 64 + 48)).isEqualTo(Int128.valueOf(0xCDEF000000000000L, 0x0000000000000000L));
+        assertThat(shiftLeft(Int128.valueOf(0L, 0x1L), 64 + 63)).isEqualTo(Int128.valueOf(0x8000000000000000L, 0x0000000000000000L));
 
         assertShiftLeft(new BigInteger("446319580078125"), 19);
 
@@ -594,7 +583,7 @@ private void assertAdd(Int128 left, Int128 right, Int128 result)
                 right.getHigh(), right.getLow(),
                 resultArray,
                 0);
-        assertEquals(Int128.valueOf(resultArray[0], resultArray[1]).toBigInteger(), result.toBigInteger());
+        assertThat(Int128.valueOf(resultArray[0], resultArray[1]).toBigInteger()).isEqualTo(result.toBigInteger());
     }
 
     private static void assertInt128ToLongOverflows(BigInteger value)
@@ -621,26 +610,26 @@ private static void assertRescaleOverflows(Int128 decimal, int rescaleFactor)
 
     private static void assertCompare(Int128 left, Int128 right, int expectedResult)
     {
-        assertEquals(left.compareTo(right), expectedResult);
-        assertEquals(Int128.compare(left.getHigh(), left.getLow(), right.getHigh(), right.getLow()), expectedResult);
+        assertThat(left.compareTo(right)).isEqualTo(expectedResult);
+        assertThat(Int128.compare(left.getHigh(), left.getLow(), right.getHigh(), right.getLow())).isEqualTo(expectedResult);
     }
 
     private static void assertConvertsUnscaledBigIntegerToDecimal(BigInteger value)
     {
-        assertEquals(Int128.valueOf(value).toBigInteger(), value);
+        assertThat(Int128.valueOf(value).toBigInteger()).isEqualTo(value);
     }
 
     private static void assertConvertsUnscaledLongToDecimal(long value)
     {
-        assertEquals(Int128.valueOf(value).toLongExact(), value);
-        assertEquals(Int128.valueOf(value), Int128.valueOf(BigInteger.valueOf(value)));
+        assertThat(Int128.valueOf(value).toLongExact()).isEqualTo(value);
+        assertThat(Int128.valueOf(value)).isEqualTo(Int128.valueOf(BigInteger.valueOf(value)));
     }
 
     private static void assertShiftRight(Int128 decimal, int rightShifts, boolean roundUp, Int128 expectedResult)
     {
         long[] result = new long[2];
         shiftRight(decimal.getHigh(), decimal.getLow(), rightShifts, roundUp, result, 0);
-        assertEquals(Int128.valueOf(result), expectedResult);
+        assertThat(Int128.valueOf(result)).isEqualTo(expectedResult);
     }
 
     private static void assertDivideAllSigns(int[] dividend, int[] divisor)
@@ -653,7 +642,7 @@ private void assertShiftLeft(BigInteger value, int leftShifts)
         Int128 decimal = Int128.valueOf(value);
         BigInteger expectedResult = value.multiply(TWO.pow(leftShifts));
         decimal = shiftLeft(decimal, leftShifts);
-        assertEquals(decimal.toBigInteger(), expectedResult);
+        assertThat(decimal.toBigInteger()).isEqualTo(expectedResult);
     }
 
     private static void assertDivideAllSigns(String dividend, String divisor)
@@ -712,7 +701,7 @@ private static void assertDivide(Int128 dividend, int dividendRescaleFactor, Int
                     divisorRescaleFactor);
 
             if (overflowIsExpected) {
-                fail("overflow is expected");
+                throw new AssertionError("overflow is expected");
             }
 
             BigInteger actualQuotient = quotient.toBigInteger();
@@ -722,7 +711,7 @@ private static void assertDivide(Int128 dividend, int dividendRescaleFactor, Int
                 return;
             }
 
-            fail(format("%s / %s ([%s * 2^%d] / [%s * 2^%d]) Expected: %s(%s). Actual: %s(%s)",
+            throw new AssertionError(format("%s / %s ([%s * 2^%d] / [%s * 2^%d]) Expected: %s(%s). Actual: %s(%s)",
                     rescaledDividend, rescaledDivisor,
                     dividendBigInteger, dividendRescaleFactor,
                     divisorBigInteger, divisorRescaleFactor,
@@ -731,7 +720,7 @@ private static void assertDivide(Int128 dividend, int dividendRescaleFactor, Int
         }
         catch (ArithmeticException e) {
             if (!overflowIsExpected) {
-                fail("overflow wasn't expected");
+                throw new AssertionError("overflow wasn't expected");
             }
         }
     }
@@ -763,36 +752,36 @@ private static void assertMultiply(long a, long b, long result)
 
     private static void assertMultiply(BigInteger a, BigInteger b, BigInteger result)
     {
-        assertEquals(Int128.valueOf(result), multiply(Int128.valueOf(a), Int128.valueOf(b)));
+        assertThat(Int128.valueOf(result)).isEqualTo(multiply(Int128.valueOf(a), Int128.valueOf(b)));
         if (isShort(a) && isShort(b)) {
-            assertEquals(Int128.valueOf(result), multiply(a.longValue(), b.longValue()));
+            assertThat(Int128.valueOf(result)).isEqualTo(multiply(a.longValue(), b.longValue()));
         }
         if (isShort(a) && !isShort(b)) {
-            assertEquals(Int128.valueOf(result), multiply(Int128.valueOf(b), a.longValue()));
+            assertThat(Int128.valueOf(result)).isEqualTo(multiply(Int128.valueOf(b), a.longValue()));
         }
         if (!isShort(a) && isShort(b)) {
-            assertEquals(Int128.valueOf(result), multiply(Int128.valueOf(a), b.longValue()));
+            assertThat(Int128.valueOf(result)).isEqualTo(multiply(Int128.valueOf(a), b.longValue()));
         }
     }
 
     private static void assertRescale(Int128 decimal, int rescale, Int128 expected)
     {
-        assertEquals(rescale(decimal, rescale), expected);
+        assertThat(rescale(decimal, rescale)).isEqualTo(expected);
 
         // test non-zero offset
         long[] result = new long[3];
         rescale(decimal.getHigh(), decimal.getLow(), rescale, result, 1);
-        assertEquals(Int128.valueOf(result[1], result[2]), expected);
+        assertThat(Int128.valueOf(result[1], result[2])).isEqualTo(expected);
     }
 
     private static void assertRescaleTruncate(Int128 decimal, int rescale, Int128 expected)
     {
-        assertEquals(rescaleTruncate(decimal, rescale), expected);
+        assertThat(rescaleTruncate(decimal, rescale)).isEqualTo(expected);
 
         // test non-zero offset
         long[] result = new long[3];
         rescaleTruncate(decimal.getHigh(), decimal.getLow(), rescale, result, 1);
-        assertEquals(Int128.valueOf(result[1], result[2]), expected);
+        assertThat(Int128.valueOf(result[1], result[2])).isEqualTo(expected);
     }
 
     private static Int128 shiftLeft(Int128 value, int shift)
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestLongDecimalType.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestLongDecimalType.java
index 71800ae757d8..6c2eaac57619 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestLongDecimalType.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestLongDecimalType.java
@@ -17,21 +17,21 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.Int128ArrayBlockBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.math.BigDecimal;
 
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static java.lang.Math.signum;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestLongDecimalType
 {
     private static final LongDecimalType TYPE = (LongDecimalType) LongDecimalType.createDecimalType(20, 10);
-    private static final MethodHandle TYPE_COMPARISON = new TypeOperators().getComparisonUnorderedLastOperator(TYPE, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
+    private static final MethodHandle TYPE_COMPARISON = new TypeOperators().getComparisonUnorderedLastOperator(TYPE, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL));
 
     @Test
     public void testCompareTo()
@@ -60,7 +60,9 @@ private void testCompare(String decimalA, String decimalB, int expected)
     {
         try {
             long actual = (long) TYPE_COMPARISON.invokeExact(decimalAsBlock(decimalA), 0, decimalAsBlock(decimalB), 0);
-            assertEquals((int) signum(actual), (int) signum(expected), "bad comparison result for " + decimalA + ", " + decimalB);
+            assertThat((int) signum(actual))
+                    .describedAs("bad comparison result for " + decimalA + ", " + decimalB)
+                    .isEqualTo((int) signum(expected));
         }
         catch (Throwable throwable) {
             Throwables.throwIfUnchecked(throwable);
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestLongTimestamp.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestLongTimestamp.java
index 79f99c1bbf95..c13666c293ed 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestLongTimestamp.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestLongTimestamp.java
@@ -13,18 +13,18 @@
  */
 package io.trino.spi.type;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestLongTimestamp
 {
     @Test
     public void testToString()
     {
-        assertEquals(new LongTimestamp(1600960182536000L, 0).toString(), "2020-09-24 15:09:42.536000000000");
-        assertEquals(new LongTimestamp(1600960182536123L, 0).toString(), "2020-09-24 15:09:42.536123000000");
-        assertEquals(new LongTimestamp(1600960182536123L, 456000).toString(), "2020-09-24 15:09:42.536123456000");
-        assertEquals(new LongTimestamp(1600960182536123L, 456789).toString(), "2020-09-24 15:09:42.536123456789");
+        assertThat(new LongTimestamp(1600960182536000L, 0).toString()).isEqualTo("2020-09-24 15:09:42.536000000000");
+        assertThat(new LongTimestamp(1600960182536123L, 0).toString()).isEqualTo("2020-09-24 15:09:42.536123000000");
+        assertThat(new LongTimestamp(1600960182536123L, 456000).toString()).isEqualTo("2020-09-24 15:09:42.536123456000");
+        assertThat(new LongTimestamp(1600960182536123L, 456789).toString()).isEqualTo("2020-09-24 15:09:42.536123456789");
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestMapType.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestMapType.java
index 979a0debc284..726386ee05be 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestMapType.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestMapType.java
@@ -13,12 +13,12 @@
  */
 package io.trino.spi.type;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createVarcharType;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestMapType
 {
@@ -27,9 +27,9 @@ public void testMapDisplayName()
     {
         TypeOperators typeOperators = new TypeOperators();
         MapType mapType = new MapType(BIGINT, createVarcharType(42), typeOperators);
-        assertEquals(mapType.getDisplayName(), "map(bigint, varchar(42))");
+        assertThat(mapType.getDisplayName()).isEqualTo("map(bigint, varchar(42))");
 
         mapType = new MapType(BIGINT, VARCHAR, typeOperators);
-        assertEquals(mapType.getDisplayName(), "map(bigint, varchar)");
+        assertThat(mapType.getDisplayName()).isEqualTo("map(bigint, varchar)");
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestRowType.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestRowType.java
index 4ce847b31572..c8d20b880df8 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestRowType.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestRowType.java
@@ -13,7 +13,7 @@
  */
 package io.trino.spi.type;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -21,7 +21,7 @@
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Arrays.asList;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestRowType
 {
@@ -37,9 +37,7 @@ public void testRowDisplayName()
                 RowType.field("map_col", new MapType(BOOLEAN, DOUBLE, typeOperators)));
 
         RowType row = RowType.from(fields);
-        assertEquals(
-                row.getDisplayName(),
-                "row(bool_col boolean, double_col double, array_col array(varchar), map_col map(boolean, double))");
+        assertThat(row.getDisplayName()).isEqualTo("row(bool_col boolean, double_col double, array_col array(varchar), map_col map(boolean, double))");
     }
 
     @Test
@@ -51,9 +49,7 @@ public void testRowDisplayNoColumnNames()
                 new ArrayType(VARCHAR),
                 new MapType(BOOLEAN, DOUBLE, typeOperators));
         RowType row = RowType.anonymous(types);
-        assertEquals(
-                row.getDisplayName(),
-                "row(boolean, double, array(varchar), map(boolean, double))");
+        assertThat(row.getDisplayName()).isEqualTo("row(boolean, double, array(varchar), map(boolean, double))");
     }
 
     @Test
@@ -66,8 +62,6 @@ public void testRowDisplayMixedUnnamedColumns()
                 RowType.field("map_col", new MapType(BOOLEAN, DOUBLE, typeOperators)));
 
         RowType row = RowType.from(fields);
-        assertEquals(
-                row.getDisplayName(),
-                "row(boolean, double_col double, array(varchar), map_col map(boolean, double))");
+        assertThat(row.getDisplayName()).isEqualTo("row(boolean, double_col double, array(varchar), map_col map(boolean, double))");
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestSqlDecimal.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestSqlDecimal.java
index b64432669f4c..3da341a77871 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestSqlDecimal.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestSqlDecimal.java
@@ -13,37 +13,37 @@
  */
 package io.trino.spi.type;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigInteger;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSqlDecimal
 {
     @Test
     public void testToString()
     {
-        assertEquals(new SqlDecimal(new BigInteger("0"), 2, 1).toString(), "0.0");
-        assertEquals(new SqlDecimal(new BigInteger("0"), 3, 2).toString(), "0.00");
-        assertEquals(new SqlDecimal(new BigInteger("0"), 6, 5).toString(), "0.00000");
-        assertEquals(new SqlDecimal(new BigInteger("0"), 10, 5).toString(), "0.00000");
-        assertEquals(new SqlDecimal(new BigInteger("1"), 2, 1).toString(), "0.1");
-        assertEquals(new SqlDecimal(new BigInteger("0"), 3, 3).toString(), "0.000");
-        assertEquals(new SqlDecimal(new BigInteger("1"), 1, 0).toString(), "1");
-        assertEquals(new SqlDecimal(new BigInteger("1000"), 4, 3).toString(), "1.000");
-        assertEquals(new SqlDecimal(new BigInteger("12345678901234567890123456789012345678"), 38, 20)
-                .toString(), "123456789012345678.90123456789012345678");
+        assertThat(new SqlDecimal(new BigInteger("0"), 2, 1).toString()).isEqualTo("0.0");
+        assertThat(new SqlDecimal(new BigInteger("0"), 3, 2).toString()).isEqualTo("0.00");
+        assertThat(new SqlDecimal(new BigInteger("0"), 6, 5).toString()).isEqualTo("0.00000");
+        assertThat(new SqlDecimal(new BigInteger("0"), 10, 5).toString()).isEqualTo("0.00000");
+        assertThat(new SqlDecimal(new BigInteger("1"), 2, 1).toString()).isEqualTo("0.1");
+        assertThat(new SqlDecimal(new BigInteger("0"), 3, 3).toString()).isEqualTo("0.000");
+        assertThat(new SqlDecimal(new BigInteger("1"), 1, 0).toString()).isEqualTo("1");
+        assertThat(new SqlDecimal(new BigInteger("1000"), 4, 3).toString()).isEqualTo("1.000");
+        assertThat(new SqlDecimal(new BigInteger("12345678901234567890123456789012345678"), 38, 20)
+                .toString()).isEqualTo("123456789012345678.90123456789012345678");
 
-        assertEquals(new SqlDecimal(new BigInteger("-10"), 2, 1).toString(), "-1.0");
-        assertEquals(new SqlDecimal(new BigInteger("-100"), 3, 2).toString(), "-1.00");
-        assertEquals(new SqlDecimal(new BigInteger("-100000"), 6, 5).toString(), "-1.00000");
-        assertEquals(new SqlDecimal(new BigInteger("-100000"), 10, 5).toString(), "-1.00000");
-        assertEquals(new SqlDecimal(new BigInteger("-1"), 2, 1).toString(), "-0.1");
-        assertEquals(new SqlDecimal(new BigInteger("-1"), 3, 3).toString(), "-0.001");
-        assertEquals(new SqlDecimal(new BigInteger("-1"), 1, 0).toString(), "-1");
-        assertEquals(new SqlDecimal(new BigInteger("-1000"), 4, 3).toString(), "-1.000");
-        assertEquals(new SqlDecimal(new BigInteger("-12345678901234567890123456789012345678"), 38, 20)
-                .toString(), "-123456789012345678.90123456789012345678");
+        assertThat(new SqlDecimal(new BigInteger("-10"), 2, 1).toString()).isEqualTo("-1.0");
+        assertThat(new SqlDecimal(new BigInteger("-100"), 3, 2).toString()).isEqualTo("-1.00");
+        assertThat(new SqlDecimal(new BigInteger("-100000"), 6, 5).toString()).isEqualTo("-1.00000");
+        assertThat(new SqlDecimal(new BigInteger("-100000"), 10, 5).toString()).isEqualTo("-1.00000");
+        assertThat(new SqlDecimal(new BigInteger("-1"), 2, 1).toString()).isEqualTo("-0.1");
+        assertThat(new SqlDecimal(new BigInteger("-1"), 3, 3).toString()).isEqualTo("-0.001");
+        assertThat(new SqlDecimal(new BigInteger("-1"), 1, 0).toString()).isEqualTo("-1");
+        assertThat(new SqlDecimal(new BigInteger("-1000"), 4, 3).toString()).isEqualTo("-1.000");
+        assertThat(new SqlDecimal(new BigInteger("-12345678901234567890123456789012345678"), 38, 20)
+                .toString()).isEqualTo("-123456789012345678.90123456789012345678");
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestSqlTimestamp.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestSqlTimestamp.java
index caeead8eb94d..6b4ec4d4144f 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestSqlTimestamp.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestSqlTimestamp.java
@@ -13,7 +13,7 @@
  */
 package io.trino.spi.type;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
 
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestSqlTimestampWithTimeZone.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestSqlTimestampWithTimeZone.java
index e6d057c187ea..64f00db56899 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestSqlTimestampWithTimeZone.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestSqlTimestampWithTimeZone.java
@@ -13,84 +13,56 @@
  */
 package io.trino.spi.type;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.ZonedDateTime;
 
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSqlTimestampWithTimeZone
 {
     @Test
     public void testToZonedDateTime()
     {
-        assertEquals(
-                new SqlTimestampWithTimeZone(3, 0, 0, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("1970-01-01T00:00Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(3, 0, 0, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("1970-01-01T00:00Z[UTC]"));
 
-        assertEquals(
-                new SqlTimestampWithTimeZone(9, 1234567890123L, 123_000_000, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("2009-02-13T23:31:30.123123Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(9, 1234567890123L, 123_000_000, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("2009-02-13T23:31:30.123123Z[UTC]"));
 
         // non-UTC
-        assertEquals(
-                new SqlTimestampWithTimeZone(9, 1234567890123L, 123_000_000, TimeZoneKey.getTimeZoneKey("Europe/Warsaw")).toZonedDateTime(),
-                ZonedDateTime.parse("2009-02-13T23:31:30.123123Z[Europe/Warsaw]"));
+        assertThat(new SqlTimestampWithTimeZone(9, 1234567890123L, 123_000_000, TimeZoneKey.getTimeZoneKey("Europe/Warsaw")).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("2009-02-13T23:31:30.123123Z[Europe/Warsaw]"));
 
         // nanoseconds
-        assertEquals(
-                new SqlTimestampWithTimeZone(9, 1234567890123L, 123_456_000, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("2009-02-13T23:31:30.123123456Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(9, 1234567890123L, 123_456_000, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("2009-02-13T23:31:30.123123456Z[UTC]"));
 
         // picoseconds, rounding down
-        assertEquals(
-                new SqlTimestampWithTimeZone(12, 1234567890123L, 123_456_499, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("2009-02-13T23:31:30.123123456Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(12, 1234567890123L, 123_456_499, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("2009-02-13T23:31:30.123123456Z[UTC]"));
 
         // picoseconds, rounding up
-        assertEquals(
-                new SqlTimestampWithTimeZone(12, 1234567890123L, 123_456_500, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("2009-02-13T23:31:30.123123457Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(12, 1234567890123L, 123_456_500, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("2009-02-13T23:31:30.123123457Z[UTC]"));
 
         // rounding to next millisecond
-        assertEquals(
-                new SqlTimestampWithTimeZone(12, 1234567890123L, 999_999_999, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("2009-02-13T23:31:30.124Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(12, 1234567890123L, 999_999_999, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("2009-02-13T23:31:30.124Z[UTC]"));
 
         // rounding to next second
-        assertEquals(
-                new SqlTimestampWithTimeZone(12, 1234567890999L, 999_999_999, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("2009-02-13T23:31:31Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(12, 1234567890999L, 999_999_999, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("2009-02-13T23:31:31Z[UTC]"));
 
         // negative epoch
-        assertEquals(
-                new SqlTimestampWithTimeZone(9, -1234567890123L, 123_000_000, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("1930-11-18T00:28:29.877123Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(9, -1234567890123L, 123_000_000, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("1930-11-18T00:28:29.877123Z[UTC]"));
 
         // negative epoch, nanoseconds
-        assertEquals(
-                new SqlTimestampWithTimeZone(9, -1234567890123L, 123_456_000, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("1930-11-18T00:28:29.877123456Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(9, -1234567890123L, 123_456_000, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("1930-11-18T00:28:29.877123456Z[UTC]"));
 
         // negative epoch, picoseconds, rounding down
-        assertEquals(
-                new SqlTimestampWithTimeZone(12, -1234567890123L, 123_456_499, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("1930-11-18T00:28:29.877123456Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(12, -1234567890123L, 123_456_499, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("1930-11-18T00:28:29.877123456Z[UTC]"));
 
         // negative epoch, picoseconds, rounding up
-        assertEquals(
-                new SqlTimestampWithTimeZone(12, -1234567890123L, 123_456_500, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("1930-11-18T00:28:29.877123457Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(12, -1234567890123L, 123_456_500, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("1930-11-18T00:28:29.877123457Z[UTC]"));
 
         // negative epoch, rounding to next millisecond
-        assertEquals(
-                new SqlTimestampWithTimeZone(12, -1234567890123L, 999_999_999, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("1930-11-18T00:28:29.878Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(12, -1234567890123L, 999_999_999, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("1930-11-18T00:28:29.878Z[UTC]"));
 
         // negative epoch, rounding to next second
-        assertEquals(
-                new SqlTimestampWithTimeZone(12, 1234567890999L, 999_999_999, UTC_KEY).toZonedDateTime(),
-                ZonedDateTime.parse("2009-02-13T23:31:31Z[UTC]"));
+        assertThat(new SqlTimestampWithTimeZone(12, 1234567890999L, 999_999_999, UTC_KEY).toZonedDateTime()).isEqualTo(ZonedDateTime.parse("2009-02-13T23:31:31Z[UTC]"));
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestTimeZoneKey.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestTimeZoneKey.java
index adf22493cf5a..3d69781fffcf 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestTimeZoneKey.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestTimeZoneKey.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.hash.Hasher;
 import com.google.common.hash.Hashing;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -26,11 +26,8 @@
 import static io.trino.spi.type.TimeZoneKey.MAX_TIME_ZONE_KEY;
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static java.util.Comparator.comparingInt;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
 
 public class TestTimeZoneKey
 {
@@ -40,127 +37,127 @@ public class TestTimeZoneKey
     @Test
     public void testUTC()
     {
-        assertEquals(UTC_KEY.getKey(), 0);
-        assertEquals(UTC_KEY.getId(), "UTC");
+        assertThat(UTC_KEY.getKey()).isEqualTo((short) 0);
+        assertThat(UTC_KEY.getId()).isEqualTo("UTC");
 
-        assertSame(TimeZoneKey.getTimeZoneKey((short) 0), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UTC"), UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey((short) 0)).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UTC")).isSameAs(UTC_KEY);
 
         // verify UTC equivalent zones map to UTC
-        assertSame(TimeZoneKey.getTimeZoneKey("Z"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Zulu"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UT"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UCT"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Universal"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT-0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT+00:00"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT-00:00"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("+00:00"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("-00:00"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("+0000"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("-0000"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT+00:00"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT-00:00"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UT"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UCT"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/Universal"), UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Z")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Zulu")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UT")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UCT")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Universal")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT-0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT+00:00")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT-00:00")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("+00:00")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("-00:00")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("+0000")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("-0000")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT+00:00")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT-00:00")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UT")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UCT")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/Universal")).isSameAs(UTC_KEY);
     }
 
     @Test
     public void testHourOffsetZone()
     {
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT-0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT-0"), UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT-0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT-0")).isSameAs(UTC_KEY);
         assertTimeZoneNotSupported("GMT7");
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT+7"), PLUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT-7"), MINUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT+7"), PLUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("GMT-7"), MINUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT+7")).isSameAs(PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT-7")).isSameAs(MINUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT+7")).isSameAs(PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("GMT-7")).isSameAs(MINUS_7_KEY);
 
         assertTimeZoneNotSupported("UT0");
-        assertSame(TimeZoneKey.getTimeZoneKey("UT+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UT-0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UT+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UT-0"), UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UT+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UT-0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UT+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UT-0")).isSameAs(UTC_KEY);
         assertTimeZoneNotSupported("UT7");
-        assertSame(TimeZoneKey.getTimeZoneKey("UT+7"), PLUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UT-7"), MINUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UT+7"), PLUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UT-7"), MINUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UT+7")).isSameAs(PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UT-7")).isSameAs(MINUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UT+7")).isSameAs(PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UT-7")).isSameAs(MINUS_7_KEY);
 
         assertTimeZoneNotSupported("UTC0");
-        assertSame(TimeZoneKey.getTimeZoneKey("UTC+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UTC-0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UTC+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UTC-0"), UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UTC+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UTC-0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UTC+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UTC-0")).isSameAs(UTC_KEY);
         assertTimeZoneNotSupported("UTC7");
-        assertSame(TimeZoneKey.getTimeZoneKey("UTC+7"), PLUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UTC-7"), MINUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UTC+7"), PLUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("UTC-7"), MINUS_7_KEY);
-
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT-0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT-0"), UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UTC+7")).isSameAs(PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UTC-7")).isSameAs(MINUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UTC+7")).isSameAs(PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("UTC-7")).isSameAs(MINUS_7_KEY);
+
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT-0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT-0")).isSameAs(UTC_KEY);
         assertTimeZoneNotSupported("Etc/GMT7");
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT+7"), MINUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT-7"), PLUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT+7"), MINUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/GMT-7"), PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT+7")).isSameAs(MINUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT-7")).isSameAs(PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT+7")).isSameAs(MINUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/GMT-7")).isSameAs(PLUS_7_KEY);
 
         assertTimeZoneNotSupported("Etc/UT0");
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UT+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UT-0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UT+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UT-0"), UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UT+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UT-0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UT+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UT-0")).isSameAs(UTC_KEY);
         assertTimeZoneNotSupported("Etc/UT7");
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UT+7"), PLUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UT-7"), MINUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UT+7"), PLUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UT-7"), MINUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UT+7")).isSameAs(PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UT-7")).isSameAs(MINUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UT+7")).isSameAs(PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UT-7")).isSameAs(MINUS_7_KEY);
 
         assertTimeZoneNotSupported("Etc/UTC0");
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC-0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC+0"), UTC_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC-0"), UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC-0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC+0")).isSameAs(UTC_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC-0")).isSameAs(UTC_KEY);
         assertTimeZoneNotSupported("Etc/UTC7");
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC+7"), PLUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC-7"), MINUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC+7"), PLUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC-7"), MINUS_7_KEY);
-
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC-7:00"), MINUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC-07:00"), MINUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC+7:00"), PLUS_7_KEY);
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC+07:00"), PLUS_7_KEY);
-
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC-7:35"), TimeZoneKey.getTimeZoneKeyForOffset(-(7 * 60 + 35)));
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC-07:35"), TimeZoneKey.getTimeZoneKeyForOffset(-(7 * 60 + 35)));
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC+7:35"), TimeZoneKey.getTimeZoneKeyForOffset(7 * 60 + 35));
-        assertSame(TimeZoneKey.getTimeZoneKey("Etc/UTC+07:35"), TimeZoneKey.getTimeZoneKeyForOffset(7 * 60 + 35));
-
-        assertSame(TimeZoneKey.getTimeZoneKey("+0735"), TimeZoneKey.getTimeZoneKeyForOffset(7 * 60 + 35));
-        assertSame(TimeZoneKey.getTimeZoneKey("-0735"), TimeZoneKey.getTimeZoneKeyForOffset(-(7 * 60 + 35)));
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC+7")).isSameAs(PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC-7")).isSameAs(MINUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC+7")).isSameAs(PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC-7")).isSameAs(MINUS_7_KEY);
+
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC-7:00")).isSameAs(MINUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC-07:00")).isSameAs(MINUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC+7:00")).isSameAs(PLUS_7_KEY);
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC+07:00")).isSameAs(PLUS_7_KEY);
+
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC-7:35")).isSameAs(TimeZoneKey.getTimeZoneKeyForOffset(-(7 * 60 + 35)));
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC-07:35")).isSameAs(TimeZoneKey.getTimeZoneKeyForOffset(-(7 * 60 + 35)));
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC+7:35")).isSameAs(TimeZoneKey.getTimeZoneKeyForOffset(7 * 60 + 35));
+        assertThat(TimeZoneKey.getTimeZoneKey("Etc/UTC+07:35")).isSameAs(TimeZoneKey.getTimeZoneKeyForOffset(7 * 60 + 35));
+
+        assertThat(TimeZoneKey.getTimeZoneKey("+0735")).isSameAs(TimeZoneKey.getTimeZoneKeyForOffset(7 * 60 + 35));
+        assertThat(TimeZoneKey.getTimeZoneKey("-0735")).isSameAs(TimeZoneKey.getTimeZoneKeyForOffset(-(7 * 60 + 35)));
     }
 
     @Test
     public void testZoneKeyLookup()
     {
         for (TimeZoneKey timeZoneKey : TimeZoneKey.getTimeZoneKeys()) {
-            assertSame(TimeZoneKey.getTimeZoneKey(timeZoneKey.getKey()), timeZoneKey);
-            assertSame(TimeZoneKey.getTimeZoneKey(timeZoneKey.getId()), timeZoneKey);
+            assertThat(TimeZoneKey.getTimeZoneKey(timeZoneKey.getKey())).isSameAs(timeZoneKey);
+            assertThat(TimeZoneKey.getTimeZoneKey(timeZoneKey.getId())).isSameAs(timeZoneKey);
         }
     }
 
@@ -169,10 +166,14 @@ public void testMaxTimeZoneKey()
     {
         boolean foundMax = false;
         for (TimeZoneKey timeZoneKey : TimeZoneKey.getTimeZoneKeys()) {
-            assertTrue(timeZoneKey.getKey() <= MAX_TIME_ZONE_KEY, timeZoneKey + " key is larger than max key " + MAX_TIME_ZONE_KEY);
+            assertThat(timeZoneKey.getKey() <= MAX_TIME_ZONE_KEY)
+                    .describedAs(timeZoneKey + " key is larger than max key " + MAX_TIME_ZONE_KEY)
+                    .isTrue();
             foundMax = foundMax || (timeZoneKey.getKey() == MAX_TIME_ZONE_KEY);
         }
-        assertTrue(foundMax, "Did not find a time zone with the MAX_TIME_ZONE_KEY");
+        assertThat(foundMax)
+                .describedAs("Did not find a time zone with the MAX_TIME_ZONE_KEY")
+                .isTrue();
     }
 
     @Test
@@ -182,29 +183,35 @@ public void testZoneKeyIdRange()
 
         for (TimeZoneKey timeZoneKey : TimeZoneKey.getTimeZoneKeys()) {
             short key = timeZoneKey.getKey();
-            assertTrue(key >= 0, timeZoneKey + " has a negative time zone key");
-            assertFalse(hasValue[key], "Another time zone has the same zone key as " + timeZoneKey);
+            assertThat(key >= 0)
+                    .describedAs(timeZoneKey + " has a negative time zone key")
+                    .isTrue();
+            assertThat(hasValue[key])
+                    .describedAs("Another time zone has the same zone key as " + timeZoneKey)
+                    .isFalse();
             hasValue[key] = true;
         }
 
         // previous spot for Canada/East-Saskatchewan
-        assertFalse(hasValue[2040]);
+        assertThat(hasValue[2040]).isFalse();
         hasValue[2040] = true;
         // previous spot for EST
-        assertFalse(hasValue[2180]);
+        assertThat(hasValue[2180]).isFalse();
         hasValue[2180] = true;
         // previous spot for HST
-        assertFalse(hasValue[2186]);
+        assertThat(hasValue[2186]).isFalse();
         hasValue[2186] = true;
         // previous spot for MST
-        assertFalse(hasValue[2196]);
+        assertThat(hasValue[2196]).isFalse();
         hasValue[2196] = true;
         // previous spot for US/Pacific-New
-        assertFalse(hasValue[2174]);
+        assertThat(hasValue[2174]).isFalse();
         hasValue[2174] = true;
 
         for (int i = 0; i < hasValue.length; i++) {
-            assertTrue(hasValue[i], "There is no time zone with key " + i);
+            assertThat(hasValue[i])
+                    .describedAs("There is no time zone with key " + i)
+                    .isTrue();
         }
     }
 
@@ -220,7 +227,9 @@ public void testZoneKeyData()
             hasher.putString(timeZoneKey.getId(), StandardCharsets.UTF_8);
         }
         // Zone file should not (normally) be changed, so let's make this more difficult
-        assertEquals(hasher.hash().asLong(), 4825838578917475630L, "zone-index.properties file contents changed!");
+        assertThat(hasher.hash().asLong())
+                .describedAs("zone-index.properties file contents changed!")
+                .isEqualTo(4825838578917475630L);
     }
 
     @Test
@@ -232,7 +241,7 @@ public void testRoundTripSerialization()
         for (TimeZoneKey zoneKey : TimeZoneKey.getTimeZoneKeys()) {
             String json = mapper.writeValueAsString(zoneKey);
             Object value = mapper.readValue(json, zoneKey.getClass());
-            assertEquals(value, zoneKey);
+            assertThat(value).isEqualTo(zoneKey);
         }
     }
 
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestTimestamps.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestTimestamps.java
index 71e7f15e53fa..ead746997fba 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestTimestamps.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestTimestamps.java
@@ -13,7 +13,7 @@
  */
 package io.trino.spi.type;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.Timestamps.roundDiv;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestTypeOperators.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestTypeOperators.java
new file mode 100644
index 000000000000..5adda97e330a
--- /dev/null
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestTypeOperators.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed 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 io.trino.spi.type;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.function.InvocationConvention.InvocationArgumentConvention;
+import org.junit.jupiter.api.Test;
+
+import java.lang.invoke.MethodHandle;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import static com.google.common.base.Verify.verify;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NULL_FLAG;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
+import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FLAT_RETURN;
+import static io.trino.spi.function.InvocationConvention.simpleConvention;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static java.lang.invoke.MethodHandles.exactInvoker;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TestTypeOperators
+{
+    @Test
+    void testDistinctGenerator()
+            throws Throwable
+    {
+        TypeOperators typeOperators = new TypeOperators();
+
+        List<InvocationArgumentConvention> argumentConventions = ImmutableList.of(NEVER_NULL, BOXED_NULLABLE, NULL_FLAG, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION, FLAT);
+        List<Long> testArguments = Arrays.asList(0L, 1L, 2L, null);
+        for (InvocationArgumentConvention leftConvention : argumentConventions) {
+            for (InvocationArgumentConvention rightConvention : argumentConventions) {
+                MethodHandle operator = typeOperators.getDistinctFromOperator(BIGINT, simpleConvention(FAIL_ON_NULL, leftConvention, rightConvention));
+                operator = exactInvoker(operator.type()).bindTo(operator);
+
+                for (Long leftArgument : testArguments) {
+                    for (Long rightArgument : testArguments) {
+                        if (!leftConvention.isNullable() && leftArgument == null || !rightConvention.isNullable() && rightArgument == null) {
+                            continue;
+                        }
+                        boolean expected = !Objects.equals(leftArgument, rightArgument);
+
+                        ArrayList<Object> arguments = new ArrayList<>();
+                        addCallArgument(typeOperators, leftConvention, leftArgument, arguments);
+                        addCallArgument(typeOperators, rightConvention, rightArgument, arguments);
+                        assertThat((boolean) operator.invokeWithArguments(arguments)).isEqualTo(expected);
+                    }
+                }
+            }
+        }
+    }
+
+    private static void addCallArgument(TypeOperators typeOperators, InvocationArgumentConvention convention, Long value, List<Object> callArguments)
+            throws Throwable
+    {
+        switch (convention) {
+            case NEVER_NULL, BOXED_NULLABLE -> callArguments.add(value);
+            case NULL_FLAG -> {
+                callArguments.add(value == null ? 0 : value);
+                callArguments.add(value == null);
+            }
+            case BLOCK_POSITION, BLOCK_POSITION_NOT_NULL -> {
+                BlockBuilder blockBuilder = BIGINT.createBlockBuilder(null, 1);
+                if (value == null) {
+                    verify(convention == BLOCK_POSITION);
+                    blockBuilder.appendNull();
+                }
+                else {
+                    BIGINT.writeLong(blockBuilder, value);
+                }
+                callArguments.add(blockBuilder.build());
+                callArguments.add(0);
+            }
+            case FLAT -> {
+                verify(value != null);
+
+                byte[] fixedSlice = new byte[BIGINT.getFlatFixedSize()];
+                MethodHandle writeFlat = typeOperators.getReadValueOperator(BIGINT, simpleConvention(FLAT_RETURN, NEVER_NULL));
+                writeFlat.invoke(value, fixedSlice, 0, new byte[0], 0);
+
+                callArguments.add(fixedSlice);
+                callArguments.add(0);
+                callArguments.add(new byte[0]);
+            }
+            default -> throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestVarchars.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestVarchars.java
index 98363bee4cfb..178b384c6d13 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestVarchars.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestVarchars.java
@@ -14,16 +14,15 @@
 package io.trino.spi.type;
 
 import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.airlift.slice.Slices.wrappedBuffer;
 import static io.trino.spi.type.VarcharType.createVarcharType;
 import static io.trino.spi.type.Varchars.byteCount;
 import static io.trino.spi.type.Varchars.truncateToLength;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
 
 public class TestVarchars
 {
@@ -31,27 +30,23 @@ public class TestVarchars
     public void testTruncateToLength()
     {
         // Single byte code points
-        assertEquals(truncateToLength(Slices.utf8Slice("abc"), 0), Slices.utf8Slice(""));
-        assertEquals(truncateToLength(Slices.utf8Slice("abc"), 1), Slices.utf8Slice("a"));
-        assertEquals(truncateToLength(Slices.utf8Slice("abc"), 4), Slices.utf8Slice("abc"));
-        assertEquals(truncateToLength(Slices.utf8Slice("abcde"), 5), Slices.utf8Slice("abcde"));
+        assertThat(truncateToLength(utf8Slice("abc"), 0)).isEqualTo(utf8Slice(""));
+        assertThat(truncateToLength(utf8Slice("abc"), 1)).isEqualTo(utf8Slice("a"));
+        assertThat(truncateToLength(utf8Slice("abc"), 4)).isEqualTo(utf8Slice("abc"));
+        assertThat(truncateToLength(utf8Slice("abcde"), 5)).isEqualTo(utf8Slice("abcde"));
         // 2 bytes code points
-        assertEquals(truncateToLength(Slices.utf8Slice("абв"), 0), Slices.utf8Slice(""));
-        assertEquals(truncateToLength(Slices.utf8Slice("абв"), 1), Slices.utf8Slice("а"));
-        assertEquals(truncateToLength(Slices.utf8Slice("абв"), 4), Slices.utf8Slice("абв"));
-        assertEquals(truncateToLength(Slices.utf8Slice("абвгд"), 5), Slices.utf8Slice("абвгд"));
+        assertThat(truncateToLength(utf8Slice("абв"), 0)).isEqualTo(utf8Slice(""));
+        assertThat(truncateToLength(utf8Slice("абв"), 1)).isEqualTo(utf8Slice("а"));
+        assertThat(truncateToLength(utf8Slice("абв"), 4)).isEqualTo(utf8Slice("абв"));
+        assertThat(truncateToLength(utf8Slice("абвгд"), 5)).isEqualTo(utf8Slice("абвгд"));
         // 4 bytes code points
-        assertEquals(truncateToLength(Slices.utf8Slice("\uD841\uDF0E\uD841\uDF31\uD841\uDF79\uD843\uDC53\uD843\uDC78"), 0),
-                Slices.utf8Slice(""));
-        assertEquals(truncateToLength(Slices.utf8Slice("\uD841\uDF0E\uD841\uDF31\uD841\uDF79\uD843\uDC53\uD843\uDC78"), 1),
-                Slices.utf8Slice("\uD841\uDF0E"));
-        assertEquals(truncateToLength(Slices.utf8Slice("\uD841\uDF0E\uD841\uDF31\uD841\uDF79"), 4),
-                Slices.utf8Slice("\uD841\uDF0E\uD841\uDF31\uD841\uDF79"));
-        assertEquals(truncateToLength(Slices.utf8Slice("\uD841\uDF0E\uD841\uDF31\uD841\uDF79\uD843\uDC53\uD843\uDC78"), 5),
-                Slices.utf8Slice("\uD841\uDF0E\uD841\uDF31\uD841\uDF79\uD843\uDC53\uD843\uDC78"));
+        assertThat(truncateToLength(utf8Slice("\uD841\uDF0E\uD841\uDF31\uD841\uDF79\uD843\uDC53\uD843\uDC78"), 0)).isEqualTo(utf8Slice(""));
+        assertThat(truncateToLength(utf8Slice("\uD841\uDF0E\uD841\uDF31\uD841\uDF79\uD843\uDC53\uD843\uDC78"), 1)).isEqualTo(utf8Slice("\uD841\uDF0E"));
+        assertThat(truncateToLength(utf8Slice("\uD841\uDF0E\uD841\uDF31\uD841\uDF79"), 4)).isEqualTo(utf8Slice("\uD841\uDF0E\uD841\uDF31\uD841\uDF79"));
+        assertThat(truncateToLength(utf8Slice("\uD841\uDF0E\uD841\uDF31\uD841\uDF79\uD843\uDC53\uD843\uDC78"), 5)).isEqualTo(utf8Slice("\uD841\uDF0E\uD841\uDF31\uD841\uDF79\uD843\uDC53\uD843\uDC78"));
 
-        assertEquals(truncateToLength(Slices.utf8Slice("abc"), createVarcharType(1)), Slices.utf8Slice("a"));
-        assertEquals(truncateToLength(Slices.utf8Slice("abc"), (Type) createVarcharType(1)), Slices.utf8Slice("a"));
+        assertThat(truncateToLength(utf8Slice("abc"), createVarcharType(1))).isEqualTo(utf8Slice("a"));
+        assertThat(truncateToLength(utf8Slice("abc"), (Type) createVarcharType(1))).isEqualTo(utf8Slice("a"));
     }
 
     @Test
@@ -130,6 +125,6 @@ private static void assertByteCount(byte[] actual, int offset, int length, int c
         Slice slice = wrappedBuffer(actual);
         int truncatedLength = byteCount(slice, offset, length, codePointCount);
         byte[] bytes = slice.getBytes(offset, truncatedLength);
-        assertEquals(bytes, expected);
+        assertThat(bytes).isEqualTo(expected);
     }
 }
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestingIdType.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestingIdType.java
index 723396c57120..1d60f9c89932 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestingIdType.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestingIdType.java
@@ -40,7 +40,7 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return block.getLong(position, 0);
+        return getLong(block, position);
     }
 
     @Override
diff --git a/docs/.vale.ini b/docs/.vale.ini
new file mode 100644
index 000000000000..445d5b1fad57
--- /dev/null
+++ b/docs/.vale.ini
@@ -0,0 +1,11 @@
+StylesPath = .vale
+
+MinAlertLevel = warning ## error, warning, or suggestion
+Vocab = Base
+
+Packages = Google
+
+[*.{md,rst}]
+BasedOnStyles = Vale, Google
+
+Google.Passive = NO
diff --git a/docs/.vale/Google/AMPM.yml b/docs/.vale/Google/AMPM.yml
new file mode 100644
index 000000000000..fbdc6e4f84b9
--- /dev/null
+++ b/docs/.vale/Google/AMPM.yml
@@ -0,0 +1,9 @@
+extends: existence
+message: "Use 'AM' or 'PM' (preceded by a space)."
+link: 'https://developers.google.com/style/word-list'
+level: error
+nonword: true
+tokens:
+  - '\d{1,2}[AP]M'
+  - '\d{1,2} ?[ap]m'
+  - '\d{1,2} ?[aApP]\.[mM]\.'
diff --git a/docs/.vale/Google/Acronyms.yml b/docs/.vale/Google/Acronyms.yml
new file mode 100644
index 000000000000..f41af0189b07
--- /dev/null
+++ b/docs/.vale/Google/Acronyms.yml
@@ -0,0 +1,64 @@
+extends: conditional
+message: "Spell out '%s', if it's unfamiliar to the audience."
+link: 'https://developers.google.com/style/abbreviations'
+level: suggestion
+ignorecase: false
+# Ensures that the existence of 'first' implies the existence of 'second'.
+first: '\b([A-Z]{3,5})\b'
+second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{3,5})\)'
+# ... with the exception of these:
+exceptions:
+  - API
+  - ASP
+  - CLI
+  - CPU
+  - CSS
+  - CSV
+  - DEBUG
+  - DOM
+  - DPI
+  - FAQ
+  - GCC
+  - GDB
+  - GET
+  - GPU
+  - GTK
+  - GUI
+  - HTML
+  - HTTP
+  - HTTPS
+  - IDE
+  - JAR
+  - JSON
+  - JSX
+  - LESS
+  - LLDB
+  - NET
+  - NOTE
+  - NVDA
+  - OSS
+  - PATH
+  - PDF
+  - PHP
+  - POST
+  - RAM
+  - REPL
+  - RSA
+  - SCM
+  - SCSS
+  - SDK
+  - SQL
+  - SSH
+  - SSL
+  - SVG
+  - TBD
+  - TCP
+  - TODO
+  - URI
+  - URL
+  - USB
+  - UTF
+  - XML
+  - XSS
+  - YAML
+  - ZIP
diff --git a/docs/.vale/Google/Colons.yml b/docs/.vale/Google/Colons.yml
new file mode 100644
index 000000000000..99363fbd46d7
--- /dev/null
+++ b/docs/.vale/Google/Colons.yml
@@ -0,0 +1,8 @@
+extends: existence
+message: "'%s' should be in lowercase."
+link: 'https://developers.google.com/style/colons'
+nonword: true
+level: warning
+scope: sentence
+tokens:
+  - ':\s[A-Z]'
diff --git a/docs/.vale/Google/Contractions.yml b/docs/.vale/Google/Contractions.yml
new file mode 100644
index 000000000000..95234987bea9
--- /dev/null
+++ b/docs/.vale/Google/Contractions.yml
@@ -0,0 +1,30 @@
+extends: substitution
+message: "Feel free to use '%s' instead of '%s'."
+link: 'https://developers.google.com/style/contractions'
+level: suggestion
+ignorecase: true
+action:
+  name: replace
+swap:
+  are not: aren't
+  cannot: can't
+  could not: couldn't
+  did not: didn't
+  do not: don't
+  does not: doesn't
+  has not: hasn't
+  have not: haven't
+  how is: how's
+  is not: isn't
+  it is: it's
+  should not: shouldn't
+  that is: that's
+  they are: they're
+  was not: wasn't
+  we are: we're
+  we have: we've
+  were not: weren't
+  what is: what's
+  when is: when's
+  where is: where's
+  will not: won't
diff --git a/docs/.vale/Google/DateFormat.yml b/docs/.vale/Google/DateFormat.yml
new file mode 100644
index 000000000000..e9d227fa13d5
--- /dev/null
+++ b/docs/.vale/Google/DateFormat.yml
@@ -0,0 +1,9 @@
+extends: existence
+message: "Use 'July 31, 2016' format, not '%s'."
+link: 'https://developers.google.com/style/dates-times'
+ignorecase: true
+level: error
+nonword: true
+tokens:
+  - '\d{1,2}(?:\.|/)\d{1,2}(?:\.|/)\d{4}'
+  - '\d{1,2} (?:Jan(?:uary)?|Feb(?:ruary)?|Mar(?:ch)?|Apr(?:il)|May|Jun(?:e)|Jul(?:y)|Aug(?:ust)|Sep(?:tember)?|Oct(?:ober)|Nov(?:ember)?|Dec(?:ember)?) \d{4}'
diff --git a/docs/.vale/Google/Ellipses.yml b/docs/.vale/Google/Ellipses.yml
new file mode 100644
index 000000000000..1e070517bfe4
--- /dev/null
+++ b/docs/.vale/Google/Ellipses.yml
@@ -0,0 +1,9 @@
+extends: existence
+message: "In general, don't use an ellipsis."
+link: 'https://developers.google.com/style/ellipses'
+nonword: true
+level: warning
+action:
+  name: remove
+tokens:
+  - '\.\.\.'
diff --git a/docs/.vale/Google/EmDash.yml b/docs/.vale/Google/EmDash.yml
new file mode 100644
index 000000000000..1befe72aa881
--- /dev/null
+++ b/docs/.vale/Google/EmDash.yml
@@ -0,0 +1,12 @@
+extends: existence
+message: "Don't put a space before or after a dash."
+link: 'https://developers.google.com/style/dashes'
+nonword: true
+level: error
+action:
+  name: edit
+  params:
+    - remove
+    - ' '
+tokens:
+  - '\s[—–]\s'
diff --git a/docs/.vale/Google/EnDash.yml b/docs/.vale/Google/EnDash.yml
new file mode 100644
index 000000000000..b314dc4e98ab
--- /dev/null
+++ b/docs/.vale/Google/EnDash.yml
@@ -0,0 +1,13 @@
+extends: existence
+message: "Use an em dash ('—') instead of '–'."
+link: 'https://developers.google.com/style/dashes'
+nonword: true
+level: error
+action:
+  name: edit
+  params:
+    - replace
+    - '-'
+    - '—'
+tokens:
+  - '–'
diff --git a/docs/.vale/Google/Exclamation.yml b/docs/.vale/Google/Exclamation.yml
new file mode 100644
index 000000000000..3e15181b2fad
--- /dev/null
+++ b/docs/.vale/Google/Exclamation.yml
@@ -0,0 +1,7 @@
+extends: existence
+message: "Don't use exclamation points in text."
+link: 'https://developers.google.com/style/exclamation-points'
+nonword: true
+level: error
+tokens:
+  - '\w!(?:\s|$)'
diff --git a/docs/.vale/Google/FirstPerson.yml b/docs/.vale/Google/FirstPerson.yml
new file mode 100644
index 000000000000..0b7b8828ca5f
--- /dev/null
+++ b/docs/.vale/Google/FirstPerson.yml
@@ -0,0 +1,13 @@
+extends: existence
+message: "Avoid first-person pronouns such as '%s'."
+link: 'https://developers.google.com/style/pronouns#personal-pronouns'
+ignorecase: true
+level: warning
+nonword: true
+tokens:
+  - (?:^|\s)I\s
+  - (?:^|\s)I,\s
+  - \bI'm\b
+  - \bme\b
+  - \bmy\b
+  - \bmine\b
diff --git a/docs/.vale/Google/Gender.yml b/docs/.vale/Google/Gender.yml
new file mode 100644
index 000000000000..c8486181d697
--- /dev/null
+++ b/docs/.vale/Google/Gender.yml
@@ -0,0 +1,9 @@
+extends: existence
+message: "Don't use '%s' as a gender-neutral pronoun."
+link: 'https://developers.google.com/style/pronouns#gender-neutral-pronouns'
+level: error
+ignorecase: true
+tokens:
+  - he/she
+  - s/he
+  - \(s\)he
diff --git a/docs/.vale/Google/GenderBias.yml b/docs/.vale/Google/GenderBias.yml
new file mode 100644
index 000000000000..261cfb666fce
--- /dev/null
+++ b/docs/.vale/Google/GenderBias.yml
@@ -0,0 +1,45 @@
+extends: substitution
+message: "Consider using '%s' instead of '%s'."
+link: 'https://developers.google.com/style/inclusive-documentation'
+ignorecase: true
+level: error
+swap:
+  (?:alumna|alumnus):          graduate
+  (?:alumnae|alumni):          graduates
+  air(?:m[ae]n|wom[ae]n):      pilot(s)
+  anchor(?:m[ae]n|wom[ae]n):   anchor(s)
+  authoress:                   author
+  camera(?:m[ae]n|wom[ae]n):   camera operator(s)
+  chair(?:m[ae]n|wom[ae]n):    chair(s)
+  congress(?:m[ae]n|wom[ae]n): member(s) of congress
+  door(?:m[ae]|wom[ae]n):      concierge(s)
+  draft(?:m[ae]n|wom[ae]n):    drafter(s)
+  fire(?:m[ae]n|wom[ae]n):     firefighter(s)
+  fisher(?:m[ae]n|wom[ae]n):   fisher(s)
+  fresh(?:m[ae]n|wom[ae]n):    first-year student(s)
+  garbage(?:m[ae]n|wom[ae]n):  waste collector(s)
+  lady lawyer:                 lawyer
+  ladylike:                    courteous
+  landlord:                    building manager
+  mail(?:m[ae]n|wom[ae]n):     mail carriers
+  man and wife:                husband and wife
+  man enough:                  strong enough
+  mankind:                     human kind
+  manmade:                     manufactured
+  manpower:                    personnel
+  men and girls:               men and women
+  middle(?:m[ae]n|wom[ae]n):   intermediary
+  news(?:m[ae]n|wom[ae]n):     journalist(s)
+  ombuds(?:man|woman):         ombuds
+  oneupmanship:                upstaging
+  poetess:                     poet
+  police(?:m[ae]n|wom[ae]n):   police officer(s)
+  repair(?:m[ae]n|wom[ae]n):   technician(s)
+  sales(?:m[ae]n|wom[ae]n):    salesperson or sales people
+  service(?:m[ae]n|wom[ae]n):  soldier(s)
+  steward(?:ess)?:             flight attendant
+  tribes(?:m[ae]n|wom[ae]n):   tribe member(s)
+  waitress:                    waiter
+  woman doctor:                doctor
+  woman scientist[s]?:         scientist(s)
+  work(?:m[ae]n|wom[ae]n):     worker(s)
diff --git a/docs/.vale/Google/HeadingPunctuation.yml b/docs/.vale/Google/HeadingPunctuation.yml
new file mode 100644
index 000000000000..b538be5b42a2
--- /dev/null
+++ b/docs/.vale/Google/HeadingPunctuation.yml
@@ -0,0 +1,13 @@
+extends: existence
+message: "Don't put a period at the end of a heading."
+link: 'https://developers.google.com/style/capitalization#capitalization-in-titles-and-headings'
+nonword: true
+level: warning
+scope: heading
+action:
+  name: edit
+  params:
+    - remove
+    - '.'
+tokens:
+  - '[a-z0-9][.]\s*$'
diff --git a/docs/.vale/Google/Headings.yml b/docs/.vale/Google/Headings.yml
new file mode 100644
index 000000000000..a53301338a47
--- /dev/null
+++ b/docs/.vale/Google/Headings.yml
@@ -0,0 +1,29 @@
+extends: capitalization
+message: "'%s' should use sentence-style capitalization."
+link: 'https://developers.google.com/style/capitalization#capitalization-in-titles-and-headings'
+level: warning
+scope: heading
+match: $sentence
+indicators:
+  - ':'
+exceptions:
+  - Azure
+  - CLI
+  - Code
+  - Cosmos
+  - Docker
+  - Emmet
+  - gRPC
+  - I
+  - Kubernetes
+  - Linux
+  - macOS
+  - Marketplace
+  - MongoDB
+  - REPL
+  - Studio
+  - TypeScript
+  - URLs
+  - Visual
+  - VS
+  - Windows
diff --git a/docs/.vale/Google/Latin.yml b/docs/.vale/Google/Latin.yml
new file mode 100644
index 000000000000..d91700de3fbd
--- /dev/null
+++ b/docs/.vale/Google/Latin.yml
@@ -0,0 +1,11 @@
+extends: substitution
+message: "Use '%s' instead of '%s'."
+link: 'https://developers.google.com/style/abbreviations'
+ignorecase: true
+level: error
+nonword: true
+action:
+  name: replace
+swap:
+  '\b(?:eg|e\.g\.)[\s,]': for example
+  '\b(?:ie|i\.e\.)[\s,]': that is
diff --git a/docs/.vale/Google/LyHyphens.yml b/docs/.vale/Google/LyHyphens.yml
new file mode 100644
index 000000000000..ac8f557a4af7
--- /dev/null
+++ b/docs/.vale/Google/LyHyphens.yml
@@ -0,0 +1,14 @@
+extends: existence
+message: "'%s' doesn't need a hyphen."
+link: 'https://developers.google.com/style/hyphens'
+level: error
+ignorecase: false
+nonword: true
+action:
+  name: edit
+  params:
+    - replace
+    - '-'
+    - ' '
+tokens:
+  - '\s[^\s-]+ly-'
diff --git a/docs/.vale/Google/OptionalPlurals.yml b/docs/.vale/Google/OptionalPlurals.yml
new file mode 100644
index 000000000000..f858ea6fee16
--- /dev/null
+++ b/docs/.vale/Google/OptionalPlurals.yml
@@ -0,0 +1,12 @@
+extends: existence
+message: "Don't use plurals in parentheses such as in '%s'."
+link: 'https://developers.google.com/style/plurals-parentheses'
+level: error
+nonword: true
+action:
+  name: edit
+  params:
+    - remove
+    - '(s)'
+tokens:
+  - '\b\w+\(s\)'
diff --git a/docs/.vale/Google/Ordinal.yml b/docs/.vale/Google/Ordinal.yml
new file mode 100644
index 000000000000..d1ac7d27e80d
--- /dev/null
+++ b/docs/.vale/Google/Ordinal.yml
@@ -0,0 +1,7 @@
+extends: existence
+message: "Spell out all ordinal numbers ('%s') in text."
+link: 'https://developers.google.com/style/numbers'
+level: error
+nonword: true
+tokens:
+  - \d+(?:st|nd|rd|th)
diff --git a/docs/.vale/Google/OxfordComma.yml b/docs/.vale/Google/OxfordComma.yml
new file mode 100644
index 000000000000..b9ba21ebb25a
--- /dev/null
+++ b/docs/.vale/Google/OxfordComma.yml
@@ -0,0 +1,7 @@
+extends: existence
+message: "Use the Oxford comma in '%s'."
+link: 'https://developers.google.com/style/commas'
+scope: sentence
+level: warning
+tokens:
+  - '(?:[^,]+,){1,}\s\w+\s(?:and|or)'
diff --git a/docs/.vale/Google/Parens.yml b/docs/.vale/Google/Parens.yml
new file mode 100644
index 000000000000..3b8711d0c88f
--- /dev/null
+++ b/docs/.vale/Google/Parens.yml
@@ -0,0 +1,7 @@
+extends: existence
+message: "Use parentheses judiciously."
+link: 'https://developers.google.com/style/parentheses'
+nonword: true
+level: suggestion
+tokens:
+  - '\(.+\)'
diff --git a/docs/.vale/Google/Passive.yml b/docs/.vale/Google/Passive.yml
new file mode 100644
index 000000000000..3265890e5202
--- /dev/null
+++ b/docs/.vale/Google/Passive.yml
@@ -0,0 +1,184 @@
+extends: existence
+link: 'https://developers.google.com/style/voice'
+message: "In general, use active voice instead of passive voice ('%s')."
+ignorecase: true
+level: suggestion
+raw:
+  - \b(am|are|were|being|is|been|was|be)\b\s*
+tokens:
+  - '[\w]+ed'
+  - awoken
+  - beat
+  - become
+  - been
+  - begun
+  - bent
+  - beset
+  - bet
+  - bid
+  - bidden
+  - bitten
+  - bled
+  - blown
+  - born
+  - bought
+  - bound
+  - bred
+  - broadcast
+  - broken
+  - brought
+  - built
+  - burnt
+  - burst
+  - cast
+  - caught
+  - chosen
+  - clung
+  - come
+  - cost
+  - crept
+  - cut
+  - dealt
+  - dived
+  - done
+  - drawn
+  - dreamt
+  - driven
+  - drunk
+  - dug
+  - eaten
+  - fallen
+  - fed
+  - felt
+  - fit
+  - fled
+  - flown
+  - flung
+  - forbidden
+  - foregone
+  - forgiven
+  - forgotten
+  - forsaken
+  - fought
+  - found
+  - frozen
+  - given
+  - gone
+  - gotten
+  - ground
+  - grown
+  - heard
+  - held
+  - hidden
+  - hit
+  - hung
+  - hurt
+  - kept
+  - knelt
+  - knit
+  - known
+  - laid
+  - lain
+  - leapt
+  - learnt
+  - led
+  - left
+  - lent
+  - let
+  - lighted
+  - lost
+  - made
+  - meant
+  - met
+  - misspelt
+  - mistaken
+  - mown
+  - overcome
+  - overdone
+  - overtaken
+  - overthrown
+  - paid
+  - pled
+  - proven
+  - put
+  - quit
+  - read
+  - rid
+  - ridden
+  - risen
+  - run
+  - rung
+  - said
+  - sat
+  - sawn
+  - seen
+  - sent
+  - set
+  - sewn
+  - shaken
+  - shaven
+  - shed
+  - shod
+  - shone
+  - shorn
+  - shot
+  - shown
+  - shrunk
+  - shut
+  - slain
+  - slept
+  - slid
+  - slit
+  - slung
+  - smitten
+  - sold
+  - sought
+  - sown
+  - sped
+  - spent
+  - spilt
+  - spit
+  - split
+  - spoken
+  - spread
+  - sprung
+  - spun
+  - stolen
+  - stood
+  - stridden
+  - striven
+  - struck
+  - strung
+  - stuck
+  - stung
+  - stunk
+  - sung
+  - sunk
+  - swept
+  - swollen
+  - sworn
+  - swum
+  - swung
+  - taken
+  - taught
+  - thought
+  - thrived
+  - thrown
+  - thrust
+  - told
+  - torn
+  - trodden
+  - understood
+  - upheld
+  - upset
+  - wed
+  - wept
+  - withheld
+  - withstood
+  - woken
+  - won
+  - worn
+  - wound
+  - woven
+  - written
+  - wrung
diff --git a/docs/.vale/Google/Periods.yml b/docs/.vale/Google/Periods.yml
new file mode 100644
index 000000000000..d24a6a6c0335
--- /dev/null
+++ b/docs/.vale/Google/Periods.yml
@@ -0,0 +1,7 @@
+extends: existence
+message: "Don't use periods with acronyms or initialisms such as '%s'."
+link: 'https://developers.google.com/style/abbreviations'
+level: error
+nonword: true
+tokens:
+  - '\b(?:[A-Z]\.){3,}'
diff --git a/docs/.vale/Google/Quotes.yml b/docs/.vale/Google/Quotes.yml
new file mode 100644
index 000000000000..3cb6f1abd182
--- /dev/null
+++ b/docs/.vale/Google/Quotes.yml
@@ -0,0 +1,7 @@
+extends: existence
+message: "Commas and periods go inside quotation marks."
+link: 'https://developers.google.com/style/quotation-marks'
+level: error
+nonword: true
+tokens:
+  - '"[^"]+"[.,?]'
diff --git a/docs/.vale/Google/Ranges.yml b/docs/.vale/Google/Ranges.yml
new file mode 100644
index 000000000000..3ec045e777d9
--- /dev/null
+++ b/docs/.vale/Google/Ranges.yml
@@ -0,0 +1,7 @@
+extends: existence
+message: "Don't add words such as 'from' or 'between' to describe a range of numbers."
+link: 'https://developers.google.com/style/hyphens'
+nonword: true
+level: warning
+tokens:
+  - '(?:from|between)\s\d+\s?-\s?\d+'
diff --git a/docs/.vale/Google/Semicolons.yml b/docs/.vale/Google/Semicolons.yml
new file mode 100644
index 000000000000..bb8b85b420ee
--- /dev/null
+++ b/docs/.vale/Google/Semicolons.yml
@@ -0,0 +1,8 @@
+extends: existence
+message: "Use semicolons judiciously."
+link: 'https://developers.google.com/style/semicolons'
+nonword: true
+scope: sentence
+level: suggestion
+tokens:
+  - ';'
diff --git a/docs/.vale/Google/Slang.yml b/docs/.vale/Google/Slang.yml
new file mode 100644
index 000000000000..63f4c248a841
--- /dev/null
+++ b/docs/.vale/Google/Slang.yml
@@ -0,0 +1,11 @@
+extends: existence
+message: "Don't use internet slang abbreviations such as '%s'."
+link: 'https://developers.google.com/style/abbreviations'
+ignorecase: true
+level: error
+tokens:
+  - 'tl;dr'
+  - ymmv
+  - rtfm
+  - imo
+  - fwiw
diff --git a/docs/.vale/Google/Spacing.yml b/docs/.vale/Google/Spacing.yml
new file mode 100644
index 000000000000..27f7ca2bdc3f
--- /dev/null
+++ b/docs/.vale/Google/Spacing.yml
@@ -0,0 +1,8 @@
+extends: existence
+message: "'%s' should have one space."
+link: 'https://developers.google.com/style/sentence-spacing'
+level: error
+nonword: true
+tokens:
+  - '[a-z][.?!] {2,}[A-Z]'
+  - '[a-z][.?!][A-Z]'
diff --git a/docs/.vale/Google/Spelling.yml b/docs/.vale/Google/Spelling.yml
new file mode 100644
index 000000000000..57acb8841410
--- /dev/null
+++ b/docs/.vale/Google/Spelling.yml
@@ -0,0 +1,8 @@
+extends: existence
+message: "In general, use American spelling instead of '%s'."
+link: 'https://developers.google.com/style/spelling'
+ignorecase: true
+level: warning
+tokens:
+  - '(?:\w+)nised?'
+  - '(?:\w+)logue'
diff --git a/docs/.vale/Google/Units.yml b/docs/.vale/Google/Units.yml
new file mode 100644
index 000000000000..379fad6b8e81
--- /dev/null
+++ b/docs/.vale/Google/Units.yml
@@ -0,0 +1,8 @@
+extends: existence
+message: "Put a nonbreaking space between the number and the unit in '%s'."
+link: 'https://developers.google.com/style/units-of-measure'
+nonword: true
+level: error
+tokens:
+  - \d+(?:B|kB|MB|GB|TB)
+  - \d+(?:ns|ms|s|min|h|d)
diff --git a/docs/.vale/Google/We.yml b/docs/.vale/Google/We.yml
new file mode 100644
index 000000000000..c7ac7d36221d
--- /dev/null
+++ b/docs/.vale/Google/We.yml
@@ -0,0 +1,11 @@
+extends: existence
+message: "Try to avoid using first-person plural like '%s'."
+link: 'https://developers.google.com/style/pronouns#personal-pronouns'
+level: warning
+ignorecase: true
+tokens:
+  - we
+  - we'(?:ve|re)
+  - ours?
+  - us
+  - let's
diff --git a/docs/.vale/Google/Will.yml b/docs/.vale/Google/Will.yml
new file mode 100644
index 000000000000..128a918362b8
--- /dev/null
+++ b/docs/.vale/Google/Will.yml
@@ -0,0 +1,7 @@
+extends: existence
+message: "Avoid using '%s'."
+link: 'https://developers.google.com/style/tense'
+ignorecase: true
+level: warning
+tokens:
+  - will
diff --git a/docs/.vale/Google/WordList.yml b/docs/.vale/Google/WordList.yml
new file mode 100644
index 000000000000..bb711517e6ab
--- /dev/null
+++ b/docs/.vale/Google/WordList.yml
@@ -0,0 +1,80 @@
+extends: substitution
+message: "Use '%s' instead of '%s'."
+link: 'https://developers.google.com/style/word-list'
+level: warning
+ignorecase: false
+action:
+  name: replace
+swap:
+  '(?:API Console|dev|developer) key': API key
+  '(?:cell ?phone|smart ?phone)': phone|mobile phone
+  '(?:dev|developer|APIs) console': API console
+  '(?:e-mail|Email|E-mail)': email
+  '(?:file ?path|path ?name)': path
+  '(?:kill|terminate|abort)': stop|exit|cancel|end
+  '(?:OAuth ?2|Oauth)': OAuth 2.0
+  '(?:ok|Okay)': OK|okay
+  '(?:WiFi|wifi)': Wi-Fi
+  '[\.]+apk': APK
+  '3\-D': 3D
+  'Google (?:I\-O|IO)': Google I/O
+  'tap (?:&|and) hold': touch & hold
+  'un(?:check|select)': clear
+  above: preceding
+  account name: username
+  action bar: app bar
+  admin: administrator
+  Ajax: AJAX
+  Android device: Android-powered device
+  android: Android
+  API explorer: APIs Explorer
+  application: app
+  approx\.: approximately
+  authN: authentication
+  authZ: authorization
+  autoupdate: automatically update
+  cellular data: mobile data
+  cellular network: mobile network
+  chapter: documents|pages|sections
+  check box: checkbox
+  check: select
+  CLI: command-line tool
+  click on: click|click in
+  Cloud: Google Cloud Platform|GCP
+  Container Engine: Kubernetes Engine
+  content type: media type
+  curated roles: predefined roles
+  data are: data is
+  Developers Console: Google API Console|API Console
+  disabled?: turn off|off
+  ephemeral IP address: ephemeral external IP address
+  fewer data: less data
+  file name: filename
+  firewalls: firewall rules
+  functionality: capability|feature
+  Google account: Google Account
+  Google accounts: Google Accounts
+  Googling: search with Google
+  grayed-out: unavailable
+  HTTPs: HTTPS
+  in order to: to
+  ingest: import|load
+  k8s: Kubernetes
+  long press: touch & hold
+  network IP address: internal IP address
+  omnibox: address bar
+  open-source: open source
+  overview screen: recents screen
+  regex: regular expression
+  SHA1: SHA-1|HAS-SHA1
+  sign into: sign in to
+  sign-?on: single sign-on
+  static IP address: static external IP address
+  stylesheet: style sheet
+  synch: sync
+  tablename: table name
+  tablet: device
+  touch: tap
+  url:  URL
+  vs\.: versus
+  World Wide Web: web
diff --git a/docs/.vale/Google/meta.json b/docs/.vale/Google/meta.json
new file mode 100644
index 000000000000..a5da2a8480ef
--- /dev/null
+++ b/docs/.vale/Google/meta.json
@@ -0,0 +1,4 @@
+{
+  "feed": "https://github.com/errata-ai/Google/releases.atom",
+  "vale_version": ">=1.0.0"
+}
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/region/_delta_log/.s3-optimization-0 b/docs/.vale/Google/vocab.txt
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/region/_delta_log/.s3-optimization-0
rename to docs/.vale/Google/vocab.txt
diff --git a/docs/.vale/Vocab/Base/accept.txt b/docs/.vale/Vocab/Base/accept.txt
new file mode 100644
index 000000000000..add896ea5c0b
--- /dev/null
+++ b/docs/.vale/Vocab/Base/accept.txt
@@ -0,0 +1,40 @@
+ANSI
+API
+application
+ASCII
+Avro
+boolean
+CLI
+ConnectorFactory
+ConnectorMetadata
+ConnectorPageSinkProvider
+ConnectorPageSourceProvider
+ConnectorRecordSetProvider
+ConnectorSplitManager
+CPU
+DNS
+ETL
+Guice
+gzip
+HDFS
+JDBC
+JDK
+JKS
+JVM
+Kerberos
+keystore
+KeyStore
+Metastore
+open-source
+ORC
+Parquet
+PEM
+PKCS
+pushdown
+rowId
+SPI
+subnet
+TLS
+Trino
+trino
+truststore
diff --git a/docs/README.md b/docs/README.md
index d05a5f491c24..d67649df0aa7 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -8,9 +8,11 @@ The `docs` module contains the reference documentation for Trino.
 - [Default build](#default-build)
 - [Viewing documentation](#viewing-documentation)
 - [Versioning](#versioning)
+- [Style check](#style-check)
 - [Contribution requirements](#contribution-requirements)
 - [Workflow](#workflow)
 - [Videos](#videos)
+- [Docker container](#docker-container)
 
 ## Writing and contributing
 
@@ -41,14 +43,16 @@ it, default to using "a SQL."
 
 Other useful resources:
 
+- [Style check](#style-check)
 - [Google Technical Writing Courses](https://developers.google.com/tech-writing)
-- [RST cheatsheet](https://github.com/ralsina/rst-cheatsheet/blob/master/rst-cheatsheet.rst)
+- [Myst guide](https://mystmd.org/guide)
 
 ## Tools
 
-Documentation source files can be found in [Restructured
-Text](https://en.wikipedia.org/wiki/ReStructuredText) (`.rst`) format in
-`src/main/sphinx` and sub-folders.
+Documentation source files can be found in [Myst Markdown](https://mystmd.org/)
+(`.md`) format in `src/main/sphinx` and sub-folders. Refer to the [Myst
+guide](https://mystmd.org/guide) and the existing documentation for more
+information about how to write and format the documentation source.
 
 The engine used to create the documentation in HTML format is the Python-based
 [Sphinx](https://www.sphinx-doc.org).
@@ -164,6 +168,38 @@ docs/build
 This is especially useful when deploying doc patches for a release where the
 Maven pom has already moved to the next SNAPSHOT version.
 
+## Style check
+
+The project contains a configured setup for [Vale](https://vale.sh) and the
+Google developer documentation style. Vale is a command-line tool to check for
+editorial style issues of a document or a set of documents.
+
+Install vale with brew on macOS or follow the instructions on the website.
+
+```
+brew install vale
+```
+
+The `docs` folder contains the necessary configuration to use vale for any
+document in the repository:
+
+* `.vale` directory with Google style setup
+* `.vale/Vocab/Base/accept.txt` file for additional approved words and spelling
+* `.vale.ini` configuration file configured for rst and md files
+
+With this setup you can validate an individual file from the root by specifying
+the path:
+
+```
+vale src/main/sphinx/overview/sep-ui.rst
+```
+
+You can also use directory paths and all files within.
+
+Treat all output from vale as another help towards better docs. Fixing any
+issues is not required, but can help with learning more about the [Google style
+guide](https://developers.google.com/style) that we try to follow.
+
 ## Contribution requirements
 
 
@@ -210,7 +246,8 @@ contribution](https://trino.io/development/process.html).
 
 1. See [**Contributing to the Trino
    documentation**](https://www.youtube.com/watch?v=yseFM3ZI2ro) for a
-   five-minute video introduction.
+   five-minute video introduction. Note that this video uses the old RST source
+   format.
 
 2. You might select a GitHub doc issue to work on that requires you to verify
    how Trino handles a situation, such as [adding
@@ -221,3 +258,34 @@ contribution](https://trino.io/development/process.html).
    Docker](https://www.youtube.com/watch?v=y58sb9bW2mA) gives you a starting
    point for setting up a test system on your laptop.
 
+## Docker container
+
+The build of the docs uses a Docker container that includes Sphinx and the
+required libraries. The container is referenced in the `SPHINX_IMAGE` variable
+in the `build` script.
+
+The specific details for the container are available in `Dockerfile`, and
+`requirements.in`. The file `requirements.txt` must be updated after any changes
+to `requirements.in`.
+
+The container must be published to the GitHub container registry at ghcr.io with
+the necessary access credentials and the following command, after modification
+of the version tag `xxx` to the new desired value as used in the `build` script:
+
+```
+docker buildx build docs --platform=linux/arm64,linux/amd64 --tag ghcr.io/trinodb/build/sphinx:xxx --provenance=false --push
+```
+
+Note that the version must be updated and the command automatically also
+publishes the container with support for arm64 and amd64 processors. This is
+necessary so the build performs well on both hardware platforms.
+
+After the container is published, you can update the `build` script and merge
+the related pull request.
+
+Example PRs:
+
+* https://github.com/trinodb/trino/pull/17778
+* https://github.com/trinodb/trino/pull/13225
+
+
diff --git a/docs/build b/docs/build
index 85589d71565c..7cbb83a6980b 100755
--- a/docs/build
+++ b/docs/build
@@ -6,7 +6,7 @@ cd "${BASH_SOURCE%/*}"
 
 test -t 1 && OPTS='-it' || OPTS=''
 
-SPHINX_IMAGE=${SPHINX_IMAGE:-ghcr.io/trinodb/build/sphinx:5}
+SPHINX_IMAGE=${SPHINX_IMAGE:-ghcr.io/trinodb/build/sphinx:7}
 
 docker run --rm $OPTS -e TRINO_VERSION -u $(id -u):$(id -g) -v "$PWD":/docs $SPHINX_IMAGE \
   sphinx-build -q -j auto -b html -W -d target/doctrees src/main/sphinx target/html
diff --git a/docs/pom.xml b/docs/pom.xml
index 662c99c0bc80..8499c4ee0069 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,11 +5,10 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
     </parent>
 
     <artifactId>trino-docs</artifactId>
-    <name>trino-docs</name>
     <packaging>pom</packaging>
 
     <properties>
@@ -23,12 +22,16 @@
                     <groupId>com.mycila</groupId>
                     <artifactId>license-maven-plugin</artifactId>
                     <configuration>
-                        <excludes combine.children="append">
-                            <exclude>**/*.conf</exclude>
-                            <exclude>**/*.css</exclude>
-                            <exclude>**/*.js</exclude>
-                            <exclude>**/*.fragment</exclude>
-                        </excludes>
+                        <licenseSets>
+                            <licenseSet>
+                                <excludes combine.children="append">
+                                    <exclude>**/*.conf</exclude>
+                                    <exclude>**/*.css</exclude>
+                                    <exclude>**/*.js</exclude>
+                                    <exclude>**/*.fragment</exclude>
+                                </excludes>
+                            </licenseSet>
+                        </licenseSets>
                     </configuration>
                 </plugin>
             </plugins>
@@ -38,12 +41,19 @@
             <plugin>
                 <groupId>io.airlift.drift</groupId>
                 <artifactId>drift-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>io.trino</groupId>
+                        <artifactId>trino-thrift-api</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
-                        <phase>validate</phase>
                         <goals>
                             <goal>generate-thrift-idl</goal>
                         </goals>
+                        <phase>validate</phase>
                         <configuration>
                             <outputFile>${project.build.directory}/TrinoThriftService.thrift</outputFile>
                             <classes>
@@ -53,39 +63,43 @@
                         </configuration>
                     </execution>
                 </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <configuration>
+                    <includeProjectDependencies>false</includeProjectDependencies>
+                    <includePluginDependencies>true</includePluginDependencies>
+                </configuration>
                 <dependencies>
                     <dependency>
                         <groupId>io.trino</groupId>
-                        <artifactId>trino-thrift-api</artifactId>
+                        <artifactId>trino-parser</artifactId>
                         <version>${project.version}</version>
                     </dependency>
                 </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>validate-reserved</id>
-                        <phase>validate</phase>
                         <goals>
                             <goal>java</goal>
                         </goals>
+                        <phase>validate</phase>
                         <configuration>
                             <mainClass>io.trino.sql.ReservedIdentifiers</mainClass>
                             <arguments>
                                 <argument>validateDocs</argument>
-                                <argument>${project.basedir}/src/main/sphinx/language/reserved.rst</argument>
+                                <argument>${project.basedir}/src/main/sphinx/language/reserved.md</argument>
                             </arguments>
                         </configuration>
                     </execution>
                     <execution>
                         <id>validate-thrift-idl</id>
-                        <phase>validate</phase>
                         <goals>
                             <goal>exec</goal>
                         </goals>
+                        <phase>validate</phase>
                         <configuration>
                             <executable>diff</executable>
                             <arguments>
@@ -98,26 +112,15 @@
                     </execution>
                     <execution>
                         <id>run-sphinx</id>
-                        <phase>package</phase>
                         <goals>
                             <goal>exec</goal>
                         </goals>
+                        <phase>package</phase>
                         <configuration>
                             <executable>${project.basedir}/build</executable>
                         </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <includeProjectDependencies>false</includeProjectDependencies>
-                    <includePluginDependencies>true</includePluginDependencies>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>io.trino</groupId>
-                        <artifactId>trino-parser</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
 
             <plugin>
@@ -126,10 +129,10 @@
                 <executions>
                     <execution>
                         <id>docs</id>
-                        <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
+                        <phase>package</phase>
                         <configuration>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
@@ -140,10 +143,10 @@
 
                     <execution>
                         <id>sources</id>
-                        <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
+                        <phase>package</phase>
                         <configuration>
                             <descriptors>
                                 <descriptor>src/main/assembly/sources.xml</descriptor>
diff --git a/docs/requirements.in b/docs/requirements.in
index b0f492d69d46..0461c193fc71 100644
--- a/docs/requirements.in
+++ b/docs/requirements.in
@@ -1,5 +1,5 @@
 markupsafe==2.0.1
-myst-parser
+myst-parser==1.0.0
 pillow
 sphinx-material
 sphinx-copybutton
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 8eb552dad5ea..042ead442d27 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    pip-compile requirements.in
 #
@@ -24,8 +24,6 @@ idna==2.9
     # via requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==4.12.0
-    # via sphinx
 jinja2==2.11.1
     # via
     #   myst-parser
@@ -40,11 +38,11 @@ markupsafe==2.0.1
     # via
     #   -r requirements.in
     #   jinja2
-mdit-py-plugins==0.3.0
+mdit-py-plugins==0.3.5
     # via myst-parser
 mdurl==0.1.1
     # via markdown-it-py
-myst-parser==0.18.0
+myst-parser==1.0.0
     # via -r requirements.in
 packaging==20.3
     # via sphinx
@@ -91,11 +89,7 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 text-unidecode==1.3
     # via python-slugify
-typing-extensions==4.3.0
-    # via myst-parser
 unidecode==1.1.1
     # via python-slugify
 urllib3==1.25.8
     # via requests
-zipp==3.8.1
-    # via importlib-metadata
diff --git a/docs/src/main/sphinx/admin.md b/docs/src/main/sphinx/admin.md
new file mode 100644
index 000000000000..ba37ea2f6d04
--- /dev/null
+++ b/docs/src/main/sphinx/admin.md
@@ -0,0 +1,26 @@
+# Administration
+
+```{toctree}
+:maxdepth: 1
+
+admin/web-interface
+admin/tuning
+admin/jmx
+admin/properties
+admin/spill
+admin/resource-groups
+admin/session-property-managers
+admin/dist-sort
+admin/dynamic-filtering
+admin/graceful-shutdown
+admin/fault-tolerant-execution
+```
+
+## Event listeners
+
+```{toctree}
+:titlesonly: true
+
+admin/event-listeners-http
+admin/event-listeners-mysql
+```
diff --git a/docs/src/main/sphinx/admin.rst b/docs/src/main/sphinx/admin.rst
deleted file mode 100644
index a69c92fc1e79..000000000000
--- a/docs/src/main/sphinx/admin.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-**************
-Administration
-**************
-
-.. toctree::
-    :maxdepth: 1
-
-    admin/web-interface
-    admin/tuning
-    admin/jmx
-    admin/properties
-    admin/spill
-    admin/resource-groups
-    admin/session-property-managers
-    admin/dist-sort
-    admin/dynamic-filtering
-    admin/graceful-shutdown
-    admin/fault-tolerant-execution
-
-***************
-Event listeners
-***************
-
-.. toctree::
-    :titlesonly:
-
-    admin/event-listeners-http
diff --git a/docs/src/main/sphinx/admin/dist-sort.md b/docs/src/main/sphinx/admin/dist-sort.md
new file mode 100644
index 000000000000..44adf32b1013
--- /dev/null
+++ b/docs/src/main/sphinx/admin/dist-sort.md
@@ -0,0 +1,15 @@
+# Distributed sort
+
+Distributed sort allows to sort data, which exceeds `query.max-memory-per-node`.
+Distributed sort is enabled via the `distributed_sort` session property, or
+`distributed-sort` configuration property set in
+`etc/config.properties` of the coordinator. Distributed sort is enabled by
+default.
+
+When distributed sort is enabled, the sort operator executes in parallel on multiple
+nodes in the cluster. Partially sorted data from each Trino worker node is then streamed
+to a single worker node for a final merge. This technique allows to utilize memory of multiple
+Trino worker nodes for sorting. The primary purpose of distributed sort is to allow for sorting
+of data sets which don't normally fit into single node memory. Performance improvement
+can be expected, but it won't scale linearly with the number of nodes, since the
+data needs to be merged by a single node.
diff --git a/docs/src/main/sphinx/admin/dist-sort.rst b/docs/src/main/sphinx/admin/dist-sort.rst
deleted file mode 100644
index a47a86cd361e..000000000000
--- a/docs/src/main/sphinx/admin/dist-sort.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-================
-Distributed sort
-================
-
-Distributed sort allows to sort data, which exceeds ``query.max-memory-per-node``.
-Distributed sort is enabled via the ``distributed_sort`` session property, or
-``distributed-sort`` configuration property set in
-``etc/config.properties`` of the coordinator. Distributed sort is enabled by
-default.
-
-When distributed sort is enabled, the sort operator executes in parallel on multiple
-nodes in the cluster. Partially sorted data from each Trino worker node is then streamed
-to a single worker node for a final merge. This technique allows to utilize memory of multiple
-Trino worker nodes for sorting. The primary purpose of distributed sort is to allow for sorting
-of data sets which don't normally fit into single node memory. Performance improvement
-can be expected, but it won't scale linearly with the number of nodes, since the
-data needs to be merged by a single node.
diff --git a/docs/src/main/sphinx/admin/dynamic-filtering.md b/docs/src/main/sphinx/admin/dynamic-filtering.md
new file mode 100644
index 000000000000..f6ae597e0527
--- /dev/null
+++ b/docs/src/main/sphinx/admin/dynamic-filtering.md
@@ -0,0 +1,264 @@
+# Dynamic filtering
+
+Dynamic filtering optimizations significantly improve the performance of queries
+with selective joins by avoiding reading of data that would be filtered by join condition.
+
+Consider the following query which captures a common pattern of a fact table `store_sales`
+joined with a filtered dimension table `date_dim`:
+
+> SELECT count(\*)
+> FROM store_sales
+> JOIN date_dim ON store_sales.ss_sold_date_sk = date_dim.d_date_sk
+> WHERE d_following_holiday='Y' AND d_year = 2000;
+
+Without dynamic filtering, Trino pushes predicates for the dimension table to the
+table scan on `date_dim`, and it scans all the data in the fact table since there
+are no filters on `store_sales` in the query. The join operator ends up throwing away
+most of the probe-side rows as the join criteria is highly selective.
+
+When dynamic filtering is enabled, Trino collects candidate values for join condition
+from the processed dimension table on the right side of join. In the case of broadcast joins,
+the runtime predicates generated from this collection are pushed into the local table scan
+on the left side of the join running on the same worker.
+
+Additionally, these runtime predicates are communicated to the coordinator over the network
+so that dynamic filtering can also be performed on the coordinator during enumeration of
+table scan splits.
+
+For example, in the case of the Hive connector, dynamic filters are used
+to skip loading of partitions which don't match the join criteria.
+This is known as **dynamic partition pruning**.
+
+After completing the collection of dynamic filters, the coordinator also distributes them
+to worker nodes over the network for partitioned joins. This allows push down of dynamic
+filters from partitioned joins into the table scans on the left side of that join.
+Distribution of dynamic filters from the coordinator to workers is enabled by default.
+It can be disabled by setting either the `enable-coordinator-dynamic-filters-distribution`
+configuration property, or the session property
+`enable_coordinator_dynamic_filters_distribution` to `false`.
+
+The results of dynamic filtering optimization can include the following benefits:
+
+- improved overall query performance
+- reduced network traffic between Trino and the data source
+- reduced load on the remote data source
+
+Dynamic filtering is enabled by default. It can be disabled by setting either the
+`enable-dynamic-filtering` configuration property, or the session property
+`enable_dynamic_filtering` to `false`.
+
+Support for push down of dynamic filters is specific to each connector,
+and the relevant underlying database or storage system. The documentation for
+specific connectors with support for dynamic filtering includes further details,
+for example the {ref}`Hive connector <hive-dynamic-filtering>`
+or the {ref}`Memory connector <memory-dynamic-filtering>`.
+
+## Analysis and confirmation
+
+Dynamic filtering depends on a number of factors:
+
+- Planner support for dynamic filtering for a given join operation in Trino.
+  Currently inner and right joins with `=`, `<`, `<=`, `>`, `>=` or
+  `IS NOT DISTINCT FROM` join conditions, and
+  semi-joins with `IN` conditions are supported.
+- Connector support for utilizing dynamic filters pushed into the table scan at runtime.
+  For example, the Hive connector can push dynamic filters into ORC and Parquet readers
+  to perform stripe or row-group pruning.
+- Connector support for utilizing dynamic filters at the splits enumeration stage.
+- Size of right (build) side of the join.
+
+You can take a closer look at the {doc}`EXPLAIN plan </sql/explain>` of the query
+to analyze if the planner is adding dynamic filters to a specific query's plan.
+For example, the explain plan for the above query can be obtained by running
+the following statement:
+
+```
+EXPLAIN
+SELECT count(*)
+FROM store_sales
+JOIN date_dim ON store_sales.ss_sold_date_sk = date_dim.d_date_sk
+WHERE d_following_holiday='Y' AND d_year = 2000;
+```
+
+The explain plan for this query shows `dynamicFilterAssignments` in the
+`InnerJoin` node with dynamic filter `df_370` collected from build symbol `d_date_sk`.
+You can also see the `dynamicFilter` predicate as part of the Hive `ScanFilterProject`
+operator where `df_370` is associated with probe symbol `ss_sold_date_sk`.
+This shows you that the planner is successful in pushing dynamic filters
+down to the connector in the query plan.
+
+```text
+...
+
+Fragment 1 [SOURCE]
+    Output layout: [count_3]
+    Output partitioning: SINGLE []
+    Aggregate(PARTIAL)
+    │   Layout: [count_3:bigint]
+    │   count_3 := count(*)
+    └─ InnerJoin[(""ss_sold_date_sk"" = ""d_date_sk"")][$hashvalue, $hashvalue_4]
+       │   Layout: []
+       │   Estimates: {rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}
+       │   Distribution: REPLICATED
+       │   dynamicFilterAssignments = {d_date_sk -> #df_370}
+       ├─ ScanFilterProject[table = hive:default:store_sales, grouped = false, filterPredicate = true, dynamicFilters = {""ss_sold_date_sk"" = #df_370}]
+       │      Layout: [ss_sold_date_sk:bigint, $hashvalue:bigint]
+       │      Estimates: {rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}/{rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}/{rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}
+       │      $hashvalue := combine_hash(bigint '0', COALESCE(""$operator$hash_code""(""ss_sold_date_sk""), 0))
+       │      ss_sold_date_sk := ss_sold_date_sk:bigint:REGULAR
+       └─ LocalExchange[HASH][$hashvalue_4] (""d_date_sk"")
+          │   Layout: [d_date_sk:bigint, $hashvalue_4:bigint]
+          │   Estimates: {rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}
+          └─ RemoteSource[2]
+                 Layout: [d_date_sk:bigint, $hashvalue_5:bigint]
+
+Fragment 2 [SOURCE]
+    Output layout: [d_date_sk, $hashvalue_6]
+    Output partitioning: BROADCAST []
+    ScanFilterProject[table = hive:default:date_dim, grouped = false, filterPredicate = ((""d_following_holiday"" = CAST('Y' AS char(1))) AND (""d_year"" = 2000))]
+        Layout: [d_date_sk:bigint, $hashvalue_6:bigint]
+        Estimates: {rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}/{rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}/{rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}
+        $hashvalue_6 := combine_hash(bigint '0', COALESCE(""$operator$hash_code""(""d_date_sk""), 0))
+        d_following_holiday := d_following_holiday:char(1):REGULAR
+        d_date_sk := d_date_sk:bigint:REGULAR
+        d_year := d_year:int:REGULAR
+```
+
+During execution of a query with dynamic filters, Trino populates statistics
+about dynamic filters in the QueryInfo JSON available through the
+{doc}`/admin/web-interface`.
+In the `queryStats` section, statistics about dynamic filters collected
+by the coordinator can be found in the `dynamicFiltersStats` structure.
+
+```text
+"dynamicFiltersStats" : {
+      "dynamicFilterDomainStats" : [ {
+        "dynamicFilterId" : "df_370",
+        "simplifiedDomain" : "[ SortedRangeSet[type=bigint, ranges=3, {[2451546], ..., [2451905]}] ]",
+        "collectionDuration" : "2.34s"
+      } ],
+      "lazyDynamicFilters" : 1,
+      "replicatedDynamicFilters" : 1,
+      "totalDynamicFilters" : 1,
+      "dynamicFiltersCompleted" : 1
+}
+```
+
+Push down of dynamic filters into a table scan on the worker nodes can be
+verified by looking at the operator statistics for that table scan.
+`dynamicFilterSplitsProcessed` records the number of splits
+processed after a dynamic filter is pushed down to the table scan.
+
+```text
+"operatorType" : "ScanFilterAndProjectOperator",
+"totalDrivers" : 1,
+"addInputCalls" : 762,
+"addInputWall" : "0.00ns",
+"addInputCpu" : "0.00ns",
+"physicalInputDataSize" : "0B",
+"physicalInputPositions" : 28800991,
+"inputPositions" : 28800991,
+"dynamicFilterSplitsProcessed" : 1,
+```
+
+Dynamic filters are reported as a part of the
+{doc}`EXPLAIN ANALYZE plan </sql/explain-analyze>` in the statistics for
+`ScanFilterProject` nodes.
+
+```text
+...
+
+ └─ InnerJoin[("ss_sold_date_sk" = "d_date_sk")][$hashvalue, $hashvalue_4]
+    │   Layout: []
+    │   Estimates: {rows: 11859 (0B), cpu: 8.84M, memory: 3.19kB, network: 3.19kB}
+    │   CPU: 78.00ms (30.00%), Scheduled: 295.00ms (47.05%), Output: 296 rows (0B)
+    │   Left (probe) Input avg.: 120527.00 rows, Input std.dev.: 0.00%
+    │   Right (build) Input avg.: 0.19 rows, Input std.dev.: 208.17%
+    │   Distribution: REPLICATED
+    │   dynamicFilterAssignments = {d_date_sk -> #df_370}
+    ├─ ScanFilterProject[table = hive:default:store_sales, grouped = false, filterPredicate = true, dynamicFilters = {"ss_sold_date_sk" = #df_370}]
+    │      Layout: [ss_sold_date_sk:bigint, $hashvalue:bigint]
+    │      Estimates: {rows: 120527 (2.03MB), cpu: 1017.64k, memory: 0B, network: 0B}/{rows: 120527 (2.03MB), cpu: 1.99M, memory: 0B, network: 0B}/{rows: 120527 (2.03MB), cpu: 4.02M, memory: 0B, network: 0B}
+    │      CPU: 49.00ms (18.85%), Scheduled: 123.00ms (19.62%), Output: 120527 rows (2.07MB)
+    │      Input avg.: 120527.00 rows, Input std.dev.: 0.00%
+    │      $hashvalue := combine_hash(bigint '0', COALESCE("$operator$hash_code"("ss_sold_date_sk"), 0))
+    │      ss_sold_date_sk := ss_sold_date_sk:bigint:REGULAR
+    │      Input: 120527 rows (1.03MB), Filtered: 0.00%
+    │      Dynamic filters:
+    │          - df_370, [ SortedRangeSet[type=bigint, ranges=3, {[2451546], ..., [2451905]}] ], collection time=2.34s
+    |
+...
+```
+
+## Dynamic filter collection thresholds
+
+In order for dynamic filtering to work, the smaller dimension table
+needs to be chosen as a join’s build side. The cost-based optimizer can automatically
+do this using table statistics provided by connectors. Therefore, it is recommended
+to keep {doc}`table statistics </optimizer/statistics>` up to date and rely on the
+CBO to correctly choose the smaller table on the build side of join.
+
+Collection of values of the join key columns from the build side for
+dynamic filtering may incur additional CPU overhead during query execution.
+Therefore, to limit the overhead of collecting dynamic filters
+to the cases where the join operator is likely to be selective,
+Trino defines thresholds on the size of dynamic filters collected from build side tasks.
+Collection of dynamic filters for joins with large build sides can be enabled
+using the `enable-large-dynamic-filters` configuration property or the
+`enable_large_dynamic_filters` session property.
+
+When large dynamic filters are enabled, limits on the size of dynamic filters can
+be configured using the configuration properties
+`dynamic-filtering.large.max-distinct-values-per-driver`,
+`dynamic-filtering.large.max-size-per-driver` ,
+`dynamic-filtering.large.range-row-limit-per-driver`,
+`dynamic-filtering.large-partitioned.max-distinct-values-per-driver`,
+`dynamic-filtering.large-partitioned.max-size-per-driver` and
+`dynamic-filtering.large-partitioned.range-row-limit-per-driver`.
+
+Similarly, limits for dynamic filters when `enable-large-dynamic-filters`
+is not enabled can be configured using configuration properties like
+`dynamic-filtering.small.max-distinct-values-per-driver`,
+`dynamic-filtering.small.max-size-per-driver` ,
+`dynamic-filtering.small.range-row-limit-per-driver`,
+`dynamic-filtering.small-partitioned.max-distinct-values-per-driver`,
+`dynamic-filtering.small-partitioned.max-size-per-driver` and
+`dynamic-filtering.small-partitioned.range-row-limit-per-driver`.
+
+The `dynamic-filtering.large.*` and `dynamic-filtering.small.*` limits are applied
+when dynamic filters are collected before build side is partitioned on join
+keys (when broadcast join is chosen or when fault tolerant execution is enabled). The
+`dynamic-filtering.large-partitioned.*` and `dynamic-filtering.small-partitioned.*`
+limits are applied when dynamic filters are collected after build side is partitioned
+on join keys (when partitioned join is chosen and fault tolerant execution is disabled).
+
+The properties based on `max-distinct-values-per-driver` and `max-size-per-driver`
+define thresholds for the size up to which dynamic filters are collected in a
+distinct values data structure. When the build side exceeds these thresholds,
+Trino switches to collecting min and max values per column to reduce overhead.
+This min-max filter has much lower granularity than the distinct values filter.
+However, it may still be beneficial in filtering some data from the probe side,
+especially when a range of values is selected from the build side of the join.
+The limits for min-max filters collection are defined by the properties
+based on `range-row-limit-per-driver`.
+
+## Dimension tables layout
+
+Dynamic filtering works best for dimension tables where
+table keys are correlated with columns.
+
+For example, a date dimension key column should be correlated with a date column,
+so the table keys monotonically increase with date values.
+An address dimension key can be composed of other columns such as
+`COUNTRY-STATE-ZIP-ADDRESS_ID` with an example value of `US-NY-10001-1234`.
+This usage allows dynamic filtering to succeed even with a large number
+of selected rows from the dimension table.
+
+## Limitations
+
+- Min-max dynamic filter collection is not supported for `DOUBLE`, `REAL` and unorderable data types.
+- Dynamic filtering is not supported for `DOUBLE` and `REAL` data types when using `IS NOT DISTINCT FROM` predicate.
+- Dynamic filtering is supported when the join key contains a cast from the build key type to the
+  probe key type. Dynamic filtering is also supported in limited scenarios when there is an implicit
+  cast from the probe key type to the build key type. For example, dynamic filtering is supported when
+  the build side key is of `DOUBLE` type and the probe side key is of `REAL` or `INTEGER` type.
diff --git a/docs/src/main/sphinx/admin/dynamic-filtering.rst b/docs/src/main/sphinx/admin/dynamic-filtering.rst
deleted file mode 100644
index 9f64f7f376e2..000000000000
--- a/docs/src/main/sphinx/admin/dynamic-filtering.rst
+++ /dev/null
@@ -1,258 +0,0 @@
-=================
-Dynamic filtering
-=================
-
-Dynamic filtering optimizations significantly improve the performance of queries
-with selective joins by avoiding reading of data that would be filtered by join condition.
-
-Consider the following query which captures a common pattern of a fact table ``store_sales``
-joined with a filtered dimension table ``date_dim``:
-
-    SELECT count(*)
-    FROM store_sales
-    JOIN date_dim ON store_sales.ss_sold_date_sk = date_dim.d_date_sk
-    WHERE d_following_holiday='Y' AND d_year = 2000;
-
-Without dynamic filtering, Trino pushes predicates for the dimension table to the
-table scan on ``date_dim``, and it scans all the data in the fact table since there
-are no filters on ``store_sales`` in the query. The join operator ends up throwing away
-most of the probe-side rows as the join criteria is highly selective.
-
-When dynamic filtering is enabled, Trino collects candidate values for join condition
-from the processed dimension table on the right side of join. In the case of broadcast joins,
-the runtime predicates generated from this collection are pushed into the local table scan
-on the left side of the join running on the same worker.
-
-Additionally, these runtime predicates are communicated to the coordinator over the network
-so that dynamic filtering can also be performed on the coordinator during enumeration of
-table scan splits.
-
-For example, in the case of the Hive connector, dynamic filters are used
-to skip loading of partitions which don't match the join criteria.
-This is known as **dynamic partition pruning**.
-
-After completing the collection of dynamic filters, the coordinator also distributes them
-to worker nodes over the network for partitioned joins. This allows push down of dynamic
-filters from partitioned joins into the table scans on the left side of that join.
-Distribution of dynamic filters from the coordinator to workers is enabled by default.
-It can be disabled by setting either the ``enable-coordinator-dynamic-filters-distribution``
-configuration property, or the session property
-``enable_coordinator_dynamic_filters_distribution`` to ``false``.
-
-The results of dynamic filtering optimization can include the following benefits:
-
-* improved overall query performance
-* reduced network traffic between Trino and the data source
-* reduced load on the remote data source
-
-Dynamic filtering is enabled by default. It can be disabled by setting either the
-``enable-dynamic-filtering`` configuration property, or the session property
-``enable_dynamic_filtering`` to ``false``.
-
-Support for push down of dynamic filters is specific to each connector,
-and the relevant underlying database or storage system. The documentation for
-specific connectors with support for dynamic filtering includes further details,
-for example the :ref:`Hive connector <hive_dynamic_filtering>`
-or the :ref:`Memory connector <memory_dynamic_filtering>`.
-
-Analysis and confirmation
--------------------------
-
-Dynamic filtering depends on a number of factors:
-
-* Planner support for dynamic filtering for a given join operation in Trino.
-  Currently inner and right joins with ``=``, ``<``, ``<=``, ``>``, ``>=`` or
-  ``IS NOT DISTINCT FROM`` join conditions, and
-  semi-joins with ``IN`` conditions are supported.
-* Connector support for utilizing dynamic filters pushed into the table scan at runtime.
-  For example, the Hive connector can push dynamic filters into ORC and Parquet readers
-  to perform stripe or row-group pruning.
-* Connector support for utilizing dynamic filters at the splits enumeration stage.
-* Size of right (build) side of the join.
-
-You can take a closer look at the :doc:`EXPLAIN plan </sql/explain>` of the query
-to analyze if the planner is adding dynamic filters to a specific query's plan.
-For example, the explain plan for the above query can be obtained by running
-the following statement::
-
-    EXPLAIN
-    SELECT count(*)
-    FROM store_sales
-    JOIN date_dim ON store_sales.ss_sold_date_sk = date_dim.d_date_sk
-    WHERE d_following_holiday='Y' AND d_year = 2000;
-
-The explain plan for this query shows ``dynamicFilterAssignments`` in the
-``InnerJoin`` node with dynamic filter ``df_370`` collected from build symbol ``d_date_sk``.
-You can also see the ``dynamicFilter`` predicate as part of the Hive ``ScanFilterProject``
-operator where ``df_370`` is associated with probe symbol ``ss_sold_date_sk``.
-This shows you that the planner is successful in pushing dynamic filters
-down to the connector in the query plan.
-
-.. code-block:: text
-
-    ...
-
-    Fragment 1 [SOURCE]
-        Output layout: [count_3]
-        Output partitioning: SINGLE []
-        Aggregate(PARTIAL)
-        │   Layout: [count_3:bigint]
-        │   count_3 := count(*)
-        └─ InnerJoin[(""ss_sold_date_sk"" = ""d_date_sk"")][$hashvalue, $hashvalue_4]
-           │   Layout: []
-           │   Estimates: {rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}
-           │   Distribution: REPLICATED
-           │   dynamicFilterAssignments = {d_date_sk -> #df_370}
-           ├─ ScanFilterProject[table = hive:default:store_sales, grouped = false, filterPredicate = true, dynamicFilters = {""ss_sold_date_sk"" = #df_370}]
-           │      Layout: [ss_sold_date_sk:bigint, $hashvalue:bigint]
-           │      Estimates: {rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}/{rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}/{rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}
-           │      $hashvalue := combine_hash(bigint '0', COALESCE(""$operator$hash_code""(""ss_sold_date_sk""), 0))
-           │      ss_sold_date_sk := ss_sold_date_sk:bigint:REGULAR
-           └─ LocalExchange[HASH][$hashvalue_4] (""d_date_sk"")
-              │   Layout: [d_date_sk:bigint, $hashvalue_4:bigint]
-              │   Estimates: {rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}
-              └─ RemoteSource[2]
-                     Layout: [d_date_sk:bigint, $hashvalue_5:bigint]
-
-    Fragment 2 [SOURCE]
-        Output layout: [d_date_sk, $hashvalue_6]
-        Output partitioning: BROADCAST []
-        ScanFilterProject[table = hive:default:date_dim, grouped = false, filterPredicate = ((""d_following_holiday"" = CAST('Y' AS char(1))) AND (""d_year"" = 2000))]
-            Layout: [d_date_sk:bigint, $hashvalue_6:bigint]
-            Estimates: {rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}/{rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}/{rows: 0 (0B), cpu: 0, memory: 0B, network: 0B}
-            $hashvalue_6 := combine_hash(bigint '0', COALESCE(""$operator$hash_code""(""d_date_sk""), 0))
-            d_following_holiday := d_following_holiday:char(1):REGULAR
-            d_date_sk := d_date_sk:bigint:REGULAR
-            d_year := d_year:int:REGULAR
-
-
-During execution of a query with dynamic filters, Trino populates statistics
-about dynamic filters in the QueryInfo JSON available through the
-:doc:`/admin/web-interface`.
-In the ``queryStats`` section, statistics about dynamic filters collected
-by the coordinator can be found in the ``dynamicFiltersStats`` structure.
-
-.. code-block:: text
-
-    "dynamicFiltersStats" : {
-          "dynamicFilterDomainStats" : [ {
-            "dynamicFilterId" : "df_370",
-            "simplifiedDomain" : "[ SortedRangeSet[type=bigint, ranges=3, {[2451546], ..., [2451905]}] ]",
-            "collectionDuration" : "2.34s"
-          } ],
-          "lazyDynamicFilters" : 1,
-          "replicatedDynamicFilters" : 1,
-          "totalDynamicFilters" : 1,
-          "dynamicFiltersCompleted" : 1
-    }
-
-Push down of dynamic filters into a table scan on the worker nodes can be
-verified by looking at the operator statistics for that table scan.
-``dynamicFilterSplitsProcessed`` records the number of splits
-processed after a dynamic filter is pushed down to the table scan.
-
-.. code-block:: text
-
-    "operatorType" : "ScanFilterAndProjectOperator",
-    "totalDrivers" : 1,
-    "addInputCalls" : 762,
-    "addInputWall" : "0.00ns",
-    "addInputCpu" : "0.00ns",
-    "physicalInputDataSize" : "0B",
-    "physicalInputPositions" : 28800991,
-    "inputPositions" : 28800991,
-    "dynamicFilterSplitsProcessed" : 1,
-
-Dynamic filters are reported as a part of the
-:doc:`EXPLAIN ANALYZE plan </sql/explain-analyze>` in the statistics for
-``ScanFilterProject`` nodes.
-
-.. code-block:: text
-
-    ...
-
-     └─ InnerJoin[("ss_sold_date_sk" = "d_date_sk")][$hashvalue, $hashvalue_4]
-        │   Layout: []
-        │   Estimates: {rows: 11859 (0B), cpu: 8.84M, memory: 3.19kB, network: 3.19kB}
-        │   CPU: 78.00ms (30.00%), Scheduled: 295.00ms (47.05%), Output: 296 rows (0B)
-        │   Left (probe) Input avg.: 120527.00 rows, Input std.dev.: 0.00%
-        │   Right (build) Input avg.: 0.19 rows, Input std.dev.: 208.17%
-        │   Distribution: REPLICATED
-        │   dynamicFilterAssignments = {d_date_sk -> #df_370}
-        ├─ ScanFilterProject[table = hive:default:store_sales, grouped = false, filterPredicate = true, dynamicFilters = {"ss_sold_date_sk" = #df_370}]
-        │      Layout: [ss_sold_date_sk:bigint, $hashvalue:bigint]
-        │      Estimates: {rows: 120527 (2.03MB), cpu: 1017.64k, memory: 0B, network: 0B}/{rows: 120527 (2.03MB), cpu: 1.99M, memory: 0B, network: 0B}/{rows: 120527 (2.03MB), cpu: 4.02M, memory: 0B, network: 0B}
-        │      CPU: 49.00ms (18.85%), Scheduled: 123.00ms (19.62%), Output: 120527 rows (2.07MB)
-        │      Input avg.: 120527.00 rows, Input std.dev.: 0.00%
-        │      $hashvalue := combine_hash(bigint '0', COALESCE("$operator$hash_code"("ss_sold_date_sk"), 0))
-        │      ss_sold_date_sk := ss_sold_date_sk:bigint:REGULAR
-        │      Input: 120527 rows (1.03MB), Filtered: 0.00%
-        │      Dynamic filters:
-        │          - df_370, [ SortedRangeSet[type=bigint, ranges=3, {[2451546], ..., [2451905]}] ], collection time=2.34s
-        |
-    ...
-
-Dynamic filter collection thresholds
-------------------------------------
-
-In order for dynamic filtering to work, the smaller dimension table
-needs to be chosen as a join’s build side. The cost-based optimizer can automatically
-do this using table statistics provided by connectors. Therefore, it is recommended
-to keep :doc:`table statistics </optimizer/statistics>` up to date and rely on the
-CBO to correctly choose the smaller table on the build side of join.
-
-Collection of values of the join key columns from the build side for
-dynamic filtering may incur additional CPU overhead during query execution.
-Therefore, to limit the overhead of collecting dynamic filters
-to the cases where the join operator is likely to be selective,
-Trino defines thresholds on the size of dynamic filters collected from build side tasks.
-Collection of dynamic filters for joins with large build sides can be enabled
-using the ``enable-large-dynamic-filters`` configuration property or the
-``enable_large_dynamic_filters`` session property.
-
-When large dynamic filters are enabled, limits on the size of dynamic filters can
-be configured for each join distribution type using the configuration properties
-``dynamic-filtering.large-broadcast.max-distinct-values-per-driver``,
-``dynamic-filtering.large-broadcast.max-size-per-driver`` and
-``dynamic-filtering.large-broadcast.range-row-limit-per-driver`` and their
-equivalents for partitioned join distribution type.
-
-Similarly, limits for dynamic filters when ``enable-large-dynamic-filters``
-is not enabled can be configured using configuration properties like
-``dynamic-filtering.large-partitioned.max-distinct-values-per-driver``,
-``dynamic-filtering.large-partitioned.max-size-per-driver`` and
-``dynamic-filtering.large-partitioned.range-row-limit-per-driver`` and their
-equivalent for broadcast join distribution type.
-
-The properties based on ``max-distinct-values-per-driver`` and ``max-size-per-driver``
-define thresholds for the size up to which dynamic filters are collected in a
-distinct values data structure. When the build side exceeds these thresholds,
-Trino switches to collecting min and max values per column to reduce overhead.
-This min-max filter has much lower granularity than the distinct values filter.
-However, it may still be beneficial in filtering some data from the probe side,
-especially when a range of values is selected from the build side of the join.
-The limits for min-max filters collection are defined by the properties
-based on ``range-row-limit-per-driver``.
-
-Dimension tables layout
------------------------
-
-Dynamic filtering works best for dimension tables where
-table keys are correlated with columns.
-
-For example, a date dimension key column should be correlated with a date column,
-so the table keys monotonically increase with date values.
-An address dimension key can be composed of other columns such as
-``COUNTRY-STATE-ZIP-ADDRESS_ID`` with an example value of ``US-NY-10001-1234``.
-This usage allows dynamic filtering to succeed even with a large number
-of selected rows from the dimension table.
-
-Limitations
------------
-
-* Min-max dynamic filter collection is not supported for ``DOUBLE``, ``REAL`` and unorderable data types.
-* Dynamic filtering is not supported for ``DOUBLE`` and ``REAL`` data types when using ``IS NOT DISTINCT FROM`` predicate.
-* Dynamic filtering is supported when the join key contains a cast from the build key type to the
-  probe key type. Dynamic filtering is also supported in limited scenarios when there is an implicit
-  cast from the probe key type to the build key type. For example, dynamic filtering is supported when
-  the build side key is of ``DOUBLE`` type and the probe side key is of ``REAL`` or ``INTEGER`` type.
diff --git a/docs/src/main/sphinx/admin/event-listeners-http.md b/docs/src/main/sphinx/admin/event-listeners-http.md
new file mode 100644
index 000000000000..6eeea6d51853
--- /dev/null
+++ b/docs/src/main/sphinx/admin/event-listeners-http.md
@@ -0,0 +1,123 @@
+# HTTP event listener
+
+The HTTP event listener plugin allows streaming of query events, encoded in
+JSON format, to an external service for further processing, by POSTing them
+to a specified URI.
+
+## Rationale
+
+This event listener is a simple first step into better understanding the usage
+of a datalake using query events provided by Trino. These can provide CPU and memory
+usage metrics, what data is being accessed with resolution down to specific columns,
+and metadata about the query processing.
+
+Running the capture system separate from Trino reduces the performance impact and
+avoids downtime for non-client-facing changes.
+
+(http-event-listener-requirements)=
+## Requirements
+
+You need to perform the following steps:
+
+- Provide an HTTP/S service that accepts POST events with a JSON body.
+- Configure `http-event-listener.connect-ingest-uri` in the event listener properties file
+  with the URI of the service.
+- Detail the events to send in the {ref}`http-event-listener-configuration` section.
+
+(http-event-listener-configuration)=
+
+## Configuration
+
+To configure the HTTP event listener plugin, create an event listener properties
+file in `etc` named `http-event-listener.properties` with the following contents
+as an example:
+
+```properties
+event-listener.name=http
+http-event-listener.log-created=true
+http-event-listener.connect-ingest-uri=<your ingest URI>
+```
+
+And set add `etc/http-event-listener.properties` to `event-listener.config-files`
+in {ref}`config-properties`:
+
+```properties
+event-listener.config-files=etc/http-event-listener.properties,...
+```
+
+### Configuration properties
+
+:::{list-table}
+:widths: 40, 40, 20
+:header-rows: 1
+
+* - Property name
+  - Description
+  - Default
+
+* - http-event-listener.log-created
+  - Enable the plugin to log `QueryCreatedEvent` events
+  - `false`
+
+* - http-event-listener.log-completed
+  - Enable the plugin to log `QueryCompletedEvent` events
+  - `false`
+
+* - http-event-listener.log-split
+  - Enable the plugin to log `SplitCompletedEvent` events
+  - `false`
+
+* - http-event-listener.connect-ingest-uri
+  - The URI that the plugin will POST events to
+  - None. See the [requirements](http-event-listener-requirements) section.
+
+* - http-event-listener.connect-http-headers
+  - List of custom HTTP headers to be sent along with the events. See
+    [](http-event-listener-custom-headers) for more details
+  - Empty
+
+* - http-event-listener.connect-retry-count
+  - The number of retries on server error. A server is considered to be
+    in an error state when the response code is 500 or higher
+  - `0`
+
+* - http-event-listener.connect-retry-delay
+  - Duration for which to delay between attempts to send a request
+  - `1s`
+
+* - http-event-listener.connect-backoff-base
+  - The base used for exponential backoff when retrying on server error.
+    The formula used to calculate the delay is
+    `attemptDelay = retryDelay * backoffBase^{attemptCount}`.
+    Attempt count starts from 0. Leave this empty or set to 1 to disable
+    exponential backoff and keep constant delays
+  - `2`
+
+* - http-event-listener.connect-max-delay
+  - The upper bound of a delay between 2 retries. This should be
+    used with exponential backoff.
+  - `1m`
+
+* - http-event-listener.*
+  - Pass configuration onto the HTTP client
+  -
+:::
+
+(http-event-listener-custom-headers)=
+
+### Custom HTTP headers
+
+Providing custom HTTP headers is a useful mechanism for sending metadata along with
+event messages.
+
+Providing headers follows the pattern of `key:value` pairs separated by commas:
+
+```text
+http-event-listener.connect-http-headers="Header-Name-1:header value 1,Header-Value-2:header value 2,..."
+```
+
+If you need to use a comma(`,`) or colon(`:`) in a header name or value,
+escape it using a backslash (`\`).
+
+Keep in mind that these are static, so they can not carry information
+taken from the event itself.
diff --git a/docs/src/main/sphinx/admin/event-listeners-http.rst b/docs/src/main/sphinx/admin/event-listeners-http.rst
deleted file mode 100644
index 064c5e989da1..000000000000
--- a/docs/src/main/sphinx/admin/event-listeners-http.rst
+++ /dev/null
@@ -1,128 +0,0 @@
-===================
-HTTP event listener
-===================
-
-The HTTP event listener plugin allows streaming of query events, encoded in
-JSON format, to an external service for further processing, by POSTing them
-to a specified URI.
-
-Rationale
----------
-
-This event listener is a simple first step into better understanding the usage
-of a datalake using query events provided by Trino. These can provide CPU and memory
-usage metrics, what data is being accessed with resolution down to specific columns,
-and metadata about the query processing.
-
-Running the capture system separate from Trino reduces the performance impact and
-avoids downtime for non-client-facing changes.
-
-Requirements
-------------
-
-You need to perform the following steps:
-
-* Provide an HTTP/S service that accepts POST events with a JSON body.
-* Configure ``http-event-listener.connect-ingest-uri`` in the event listener properties file
-  with the URI of the service.
-* Detail the events to send in the :ref:`http_event_listener_configuration` section.
-
-.. _http_event_listener_configuration:
-
-Configuration
--------------
-
-To configure the HTTP event listener plugin, create an event listener properties
-file in ``etc`` named ``http-event-listener.properties`` with the following contents
-as an example:
-
-.. code-block:: properties
-
-    event-listener.name=http
-    http-event-listener.log-created=true
-    http-event-listener.connect-ingest-uri=<your ingest URI>
-
-And set add ``etc/http-event-listener.properties`` to ``event-listener.config-files``
-in :ref:`config_properties`:
-
-.. code-block:: properties
-
-    event-listener.config-files=etc/http-event-listener.properties,...
-
-Configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. list-table::
-  :widths: 40, 40, 20
-  :header-rows: 1
-
-  * - Property name
-    - Description
-    - Default
-
-  * - http-event-listener.log-created
-    - Enable the plugin to log ``QueryCreatedEvent`` events
-    - ``false``
-
-  * - http-event-listener.log-completed
-    - Enable the plugin to log ``QueryCompletedEvent`` events
-    - ``false``
-
-  * - http-event-listener.log-split
-    - Enable the plugin to log ``SplitCompletedEvent`` events
-    - ``false``
-
-  * - http-event-listener.connect-ingest-uri
-    - The URI that the plugin will POST events to
-    - None. See the `requirements <#requirements>`_ section.
-
-  * - http-event-listener.connect-http-headers
-    - List of custom HTTP headers to be sent along with the events. See
-      :ref:`http_event_listener_custom_headers` for more details
-    - Empty
-
-  * - http-event-listener.connect-retry-count
-    - The number of retries on server error. A server is considered to be
-      in an error state when the response code is 500 or higher
-    - ``0``
-
-  * - http-event-listener.connect-retry-delay
-    - Duration for which to delay between attempts to send a request
-    - ``1s``
-
-  * - http-event-listener.connect-backoff-base
-    - The base used for exponential backoff when retrying on server error.
-      The formula used to calculate the delay is
-      :math:`attemptDelay = retryDelay * backoffBase^{attemptCount}`.
-      Attempt count starts from 0. Leave this empty or set to 1 to disable
-      exponential backoff and keep constant delays
-    - ``2``
-
-  * - http-event-listener.connect-max-delay
-    - The upper bound of a delay between 2 retries. This should be
-      used with exponential backoff.
-    - ``1m``
-
-  * - http-event-listener.*
-    - Pass configuration onto the HTTP client
-    -
-
-.. _http_event_listener_custom_headers:
-
-Custom HTTP headers
-^^^^^^^^^^^^^^^^^^^
-
-Providing custom HTTP headers is a useful mechanism for sending metadata along with
-event messages.
-
-Providing headers follows the pattern of ``key:value`` pairs separated by commas:
-
-.. code-block:: text
-
-    http-event-listener.connect-http-headers="Header-Name-1:header value 1,Header-Value-2:header value 2,..."
-
-If you need to use a comma(``,``) or colon(``:``) in a header name or value,
-escape it using a backslash (``\``).
-
-Keep in mind that these are static, so they can not carry information
-taken from the event itself.
diff --git a/docs/src/main/sphinx/admin/event-listeners-mysql.md b/docs/src/main/sphinx/admin/event-listeners-mysql.md
new file mode 100644
index 000000000000..25a99d732290
--- /dev/null
+++ b/docs/src/main/sphinx/admin/event-listeners-mysql.md
@@ -0,0 +1,71 @@
+# MySQL event listener
+
+The MySQL event listener plugin allows streaming of query events to an external
+MySQL database. The query history in the database can then be accessed directly
+in MySQL or via Trino in a catalog using the [MySQL connector](/connector/mysql).
+
+## Rationale
+
+This event listener is a first step to store the query history of your Trino
+cluster. The query events can provide CPU and memory usage metrics, what data is
+being accessed with resolution down to specific columns, and metadata about the
+query processing.
+
+Running the capture system separate from Trino reduces the performance impact
+and avoids downtime for non-client-facing changes.
+
+## Requirements
+
+You need to perform the following steps:
+
+- Create a MySQL database.
+- Determine the JDBC connection URL for the database.
+- Ensure network access from the Trino coordinator to MySQL is available.
+  Port 3306 is the default port.
+
+(mysql-event-listener-configuration)=
+
+## Configuration
+
+To configure the MySQL event listener plugin, create an event listener properties
+file in `etc` named `mysql-event-listener.properties` with the following contents
+as an example:
+
+```properties
+event-listener.name=mysql
+mysql-event-listener.db.url=jdbc:mysql://example.net:3306
+```
+
+The `mysql-event-listener.db.url` defines the connection to a MySQL database
+available at the domain `example.net` on port 3306. You can pass further
+parameters to the MySQL JDBC driver. The supported parameters for the URL are
+documented in the [MySQL Developer
+Guide](https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-reference-configuration-properties.html).
+
+And set `event-listener.config-files` to `etc/mysql-event-listener.properties`
+in {ref}`config-properties`:
+
+```properties
+event-listener.config-files=etc/mysql-event-listener.properties
+```
+
+If another event listener is already configured, add the new value
+`etc/mysql-event-listener.properties` with a separating comma.
+
+After this configuration and successful start of the Trino cluster, the table
+`trino_queries` is created in the MySQL database. From then on, any query
+processing event is captured by the event listener and a new row is inserted
+into the table. The table includes many columns, such as query identifier, query
+string, user, catalog, and others with information about the query processing.
+
+### Configuration properties
+
+:::{list-table}
+:widths: 40, 60
+:header-rows: 1
+
+* - Property name
+  - Description
+* - `mysql-event-listener.db.url`
+  - JDBC connection URL to the database including credentials
+:::
\ No newline at end of file
diff --git a/docs/src/main/sphinx/admin/fault-tolerant-execution.md b/docs/src/main/sphinx/admin/fault-tolerant-execution.md
new file mode 100644
index 000000000000..54185a71f3b8
--- /dev/null
+++ b/docs/src/main/sphinx/admin/fault-tolerant-execution.md
@@ -0,0 +1,611 @@
+# Fault-tolerant execution
+
+By default, if a Trino node lacks the resources to execute a task or
+otherwise fails during query execution, the query fails and must be run again
+manually. The longer the runtime of a query, the more likely it is to be
+susceptible to such failures.
+
+Fault-tolerant execution is a mechanism in Trino that enables a cluster to
+mitigate query failures by retrying queries or their component tasks in
+the event of failure. With fault-tolerant execution enabled, intermediate
+exchange data is spooled and can be re-used by another worker in the event of a
+worker outage or other fault during query execution.
+
+:::{note}
+Fault tolerance does not apply to broken queries or other user error. For
+example, Trino does not spend resources retrying a query that fails because
+its SQL cannot be parsed.
+
+For a step-by-step guide explaining how to configure a Trino cluster with
+fault-tolerant execution to improve query processing resilience, read
+{doc}`/installation/query-resiliency`.
+:::
+
+## Configuration
+
+Fault-tolerant execution is disabled by default. To enable the feature, set the
+`retry-policy` configuration property to either `QUERY` or `TASK`
+depending on the desired {ref}`retry policy <fte-retry-policy>`.
+
+```properties
+retry-policy=QUERY
+```
+
+:::{warning}
+Setting `retry-policy` may cause queries to fail with connectors that do not
+explicitly support fault-tolerant execution, resulting in a "This connector
+does not support query retries" error message.
+
+Support for fault-tolerant execution of SQL statements varies on a
+per-connector basis, with more details in the documentation for each
+connector. The following connectors support fault-tolerant execution:
+
+- {ref}`BigQuery connector <bigquery-fte-support>`
+- {ref}`Delta Lake connector <delta-lake-fte-support>`
+- {ref}`Hive connector <hive-fte-support>`
+- {ref}`Iceberg connector <iceberg-fte-support>`
+- {ref}`MongoDB connector <mongodb-fte-support>`
+- {ref}`MySQL connector <mysql-fte-support>`
+- {ref}`Oracle connector <oracle-fte-support>`
+- {ref}`PostgreSQL connector <postgresql-fte-support>`
+- {ref}`Redshift connector <redshift-fte-support>`
+- {ref}`SQL Server connector <sqlserver-fte-support>`
+:::
+
+The following configuration properties control the behavior of fault-tolerant
+execution on a Trino cluster:
+
+
+:::{list-table} Fault-tolerant execution configuration properties
+:widths: 30, 50, 20
+:header-rows: 1
+
+* - Property name
+  - Description
+  - Default value
+* - `retry-policy`
+  - Configures what is retried in the event of failure, either `QUERY` to retry
+    the whole query, or `TASK` to retry tasks individually if they fail. See
+    [retry policy](fte-retry-policy) for more information.
+  - `NONE`
+* - `exchange.deduplication-buffer-size`
+  - [Data size](prop-type-data-size) of the coordinator's in-memory buffer used
+    by fault-tolerant execution to store output of query
+    [stages](trino-concept-stage). If this buffer is filled during query
+    execution, the query fails with a "Task descriptor storage capacity has been
+    exceeded" error message unless an [exchange manager](fte-exchange-manager)
+    is configured.
+  - `32MB`
+* - `exchange.compression-enabled`
+  - Enable compression of spooling data. Setting to `true` is recommended
+    when using an [exchange manager](fte-exchange-manager).
+  - ``false``
+:::
+
+(fte-retry-policy)=
+
+## Retry policy
+
+The `retry-policy` configuration property designates whether Trino retries
+entire queries or a query's individual tasks in the event of failure.
+
+### QUERY
+
+A `QUERY` retry policy instructs Trino to automatically retry a query in the
+event of an error occuring on a worker node. A `QUERY` retry policy is
+recommended when the majority of the Trino cluster's workload consists of many
+small queries.
+
+By default Trino does not implement fault tolerance for queries whose result set
+exceeds 32MB in size, such as {doc}`/sql/select` statements that return a very
+large data set to the user. This limit can be increased by modifying the
+`exchange.deduplication-buffer-size` configuration property to be greater than
+the default value of `32MB`, but this results in higher memory usage on the
+coordinator.
+
+To enable fault-tolerant execution on queries with a larger result set, it is
+strongly recommended to configure an {ref}`exchange manager
+<fte-exchange-manager>` that utilizes external storage for spooled data and
+therefore allows for storage of spilled data beyond the in-memory buffer size.
+
+### TASK
+
+A `TASK` retry policy instructs Trino to retry individual query {ref}`tasks
+<trino-concept-task>` in the event of failure. You must configure an
+{ref}`exchange manager <fte-exchange-manager>` to use the task retry policy.
+This policy is recommended when executing large batch queries, as the cluster
+can more efficiently retry smaller tasks within the query rather than retry the
+whole query.
+
+When a cluster is configured with a `TASK` retry policy, some relevant
+configuration properties have their default values changed to follow best
+practices for a fault-tolerant cluster. However, this automatic change does not
+affect clusters that have these properties manually configured. If you have
+any of the following properties configured in the `config.properties` file on
+a cluster with a `TASK` retry policy, it is strongly recommended to make the
+following changes:
+
+- Set the `task.low-memory-killer.policy`
+  {doc}`query management property </admin/properties-query-management>` to
+  `total-reservation-on-blocked-nodes`, or queries may
+  need to be manually killed if the cluster runs out of memory.
+- Set the `query.low-memory-killer.delay`
+  {doc}`query management property </admin/properties-query-management>` to
+  `0s` so the cluster immediately unblocks nodes that run out of memory.
+- Modify the `query.remote-task.max-error-duration`
+  {doc}`query management property </admin/properties-query-management>`
+  to adjust how long Trino allows a remote task to try reconnecting before
+  considering it lost and rescheduling.
+
+:::{note}
+A `TASK` retry policy is best suited for large batch queries, but this
+policy can result in higher latency for short-running queries executed in high
+volume. As a best practice, it is recommended to run a dedicated cluster
+with a `TASK` retry policy for large batch queries, separate from another
+cluster that handles short queries.
+:::
+
+## Advanced configuration
+
+You can further configure fault-tolerant execution with the following
+configuration properties. The default values for these properties should work
+for most deployments, but you can change these values for testing or
+troubleshooting purposes.
+
+### Retry limits
+
+The following configuration properties control the thresholds at which
+queries/tasks are no longer retried in the event of repeated failures:
+
+:::{list-table} Fault tolerance retry limit configuration properties
+:widths: 30, 50, 20, 30
+:header-rows: 1
+
+* - Property name
+  - Description
+  - Default value
+  - Retry policy
+* - `query-retry-attempts`
+  - Maximum number of times Trino may attempt to retry a query before declaring
+    the query as failed.
+  - `4`
+  - Only `QUERY`
+* - `task-retry-attempts-per-task`
+  - Maximum number of times Trino may attempt to retry a single task before
+    declaring the query as failed.
+  - `4`
+  - Only `TASK`
+* - `retry-initial-delay`
+  - Minimum [time](prop-type-duration) that a failed query or task must wait
+    before it is retried. May be overridden with the `retry_initial_delay`
+    [session property](session-properties-definition).
+  - `10s`
+  - `QUERY` and `TASK`
+* - `retry-max-delay`
+  - Maximum :ref:`time <prop-type-duration>` that a failed query or task must
+    wait before it is retried. Wait time is increased on each subsequent
+    failure. May be overridden with the ``retry_max_delay`` [session
+    property](session-properties-definition).
+  - `1m`
+  - `QUERY` and `TASK`
+* - `retry-delay-scale-factor`
+  - Factor by which retry delay is increased on each query or task failure. May
+    be overridden with the `retry_delay_scale_factor` [session
+    property](session-properties-definition).
+  - `2.0`
+  - `QUERY` and `TASK`
+:::
+
+### Task sizing
+
+With a `TASK` retry policy, it is important to manage the amount of data
+processed in each task. If tasks are too small, the management of task
+coordination can take more processing time and resources than executing the task
+itself. If tasks are too large, then a single task may require more resources
+than are available on any one node and therefore prevent the query from
+completing.
+
+Trino supports limited automatic task sizing. If issues are occurring
+during fault-tolerant task execution, you can configure the following
+configuration properties to manually control task sizing. These configuration
+properties only apply to a `TASK` retry policy.
+
+:::{list-table} Task sizing configuration properties
+:widths: 30, 50, 20
+:header-rows: 1
+
+* - Property name
+  - Description
+  - Default value
+* - `fault-tolerant-execution-standard-split-size`
+  - Standard [split](trino-concept-splits) [data size]( prop-type-data-size)
+    processed by tasks that read data from source tables. Value is interpreted
+    with split weight taken into account. If the weight of splits produced by a
+    catalog denotes that they are lighter or heavier than "standard" split, then
+    the number of splits processed by a single task is adjusted accordingly.
+
+    May be overridden for the current session with the
+    `fault_tolerant_execution_standard_split_size` [session
+    property](session-properties-definition).
+  - `64MB`
+* - `fault-tolerant-execution-max-task-split-count`
+  - Maximum number of [splits](trino-concept-splits) processed by a single task.
+    This value is not split weight-adjusted and serves as protection against
+    situations where catalogs report an incorrect split weight.
+
+    May be overridden for the current session with the
+    `fault_tolerant_execution_max_task_split_count` [session
+    property](session-properties-definition).
+  - `256`
+* - `fault-tolerant-execution-arbitrary-distribution-compute-task-target-size-growth-period`
+  - The number of tasks created for any given non-writer stage of arbitrary
+    distribution before task size is increased.
+  - `64`
+* - `fault-tolerant-execution-arbitrary-distribution-compute-task-target-size-growth-factor`
+  - Growth factor for adaptive sizing of non-writer tasks of arbitrary
+    distribution for fault-tolerant execution. Lower bound is 1.0. For every
+    task size increase, new task target size is old task target size multiplied
+    by this growth factor.
+  - `1.26`
+* - `fault-tolerant-execution-arbitrary-distribution-compute-task-target-size-min`
+  - Initial/minimum target input [data size](prop-type-data-size) for non-writer
+    tasks of arbitrary distribution of fault-tolerant execution.
+  - `512MB`
+* - `fault-tolerant-execution-arbitrary-distribution-compute-task-target-size-max`
+  - Maximum target input [data size](prop-type-data-size) for each non-writer
+    task of arbitrary distribution of fault-tolerant execution.
+  - `50GB`
+* - `fault-tolerant-execution-arbitrary-distribution-write-task-target-size-growth-period`
+  - The number of tasks created for any given writer stage of arbitrary
+    distribution before task size is increased.
+  - `64`
+* - `fault-tolerant-execution-arbitrary-distribution-write-task-target-size-growth-factor`
+  - Growth factor for adaptive sizing of writer tasks of arbitrary distribution
+    for fault-tolerant execution. Lower bound is 1.0. For every task size
+    increase, new task target size is old task target size multiplied by this
+    growth factor.
+  - `1.26`
+* - `fault-tolerant-execution-arbitrary-distribution-write-task-target-size-min`
+  - Initial/minimum target input [data size](prop-type-data-size) for writer
+    tasks of arbitrary distribution of fault-tolerant execution.
+  - `4GB`
+* - `fault-tolerant-execution-arbitrary-distribution-write-task-target-size-max`
+  - Maximum target input [data size](prop-type-data-size) for writer tasks of
+    arbitrary distribution of fault-tolerant execution.
+  - `50GB`
+* - `fault-tolerant-execution-hash-distribution-compute-task-target-size`
+  - Target input [data size](prop-type-data-size) for non-writer tasks of hash
+    distribution of fault-tolerant execution.
+  - `512MB`
+* - `fault-tolerant-execution-hash-distribution-write-task-target-size`
+  - Target input [data size](prop-type-data-size) of writer tasks of hash
+    distribution of fault-tolerant execution.
+  - ``4GB``
+* - `fault-tolerant-execution-hash-distribution-write-task-target-max-count`
+  - Soft upper bound on number of writer tasks in a stage of hash distribution
+    of fault-tolerant execution.
+  - `2000`
+:::
+
+### Node allocation
+
+With a `TASK` retry policy, nodes are allocated to tasks based on available
+memory and estimated memory usage. If task failure occurs due to exceeding
+available memory on a node, the task is restarted with a request to allocate the
+full node for its execution.
+
+The initial task memory-requirements estimation is static and configured with
+the `fault-tolerant-task-memory` configuration property. This property only
+applies to a `TASK` retry policy.
+
+:::{list-table} Node allocation configuration properties
+:widths: 30, 50, 20
+:header-rows: 1
+
+* - Property name
+  - Description
+  - Default value
+* - `fault-tolerant-execution-task-memory`
+  - Initial task memory [data size](prop-type-data-size) estimation
+    used for bin-packing when allocating nodes for tasks. May be overridden
+    for the current session with the
+    `fault_tolerant_execution_task_memory`
+    [session property](session-properties-definition).
+  - `5GB`
+:::
+
+### Other tuning
+
+The following additional configuration property can be used to manage
+fault-tolerant execution:
+
+:::{list-table} Other fault-tolerant execution configuration properties
+:widths: 30, 50, 20, 30
+:header-rows: 1
+
+* - Property name
+  - Description
+  - Default value
+  - Retry policy
+* - `fault-tolerant-execution-task-descriptor-storage-max-memory`
+  - Maximum [data size](prop-type-data-size) of memory to be used to
+    store task descriptors for fault tolerant queries on coordinator. Extra
+    memory is needed to be able to reschedule tasks in case of a failure.
+  - (JVM heap size * 0.15)
+  - Only `TASK`
+* - `fault-tolerant-execution-max-partition-count`
+  - Maximum number of partitions to use for distributed joins and aggregations,
+    similar in function to the ``query.max-hash-partition-count`` [query
+    management property](/admin/properties-query-management). It is not
+    recommended to increase this property value above the default of `50`, which
+    may result in instability and poor performance. May be overridden for the
+    current session with the `fault_tolerant_execution_max_partition_count`
+    [session property](session-properties-definition).
+  - `50`
+  - Only `TASK`
+* - `fault-tolerant-execution-min-partition-count`
+  - Minimum number of partitions to use for distributed joins and aggregations,
+    similar in function to the `query.min-hash-partition-count` [query
+    management property](/admin/properties-query-management). May be overridden
+    for the current session with the
+    `fault_tolerant_execution_min_partition_count` [session
+    property](session-properties-definition).
+  - `4`
+  - Only `TASK`
+* - `fault-tolerant-execution-min-partition-count-for-write`
+  - Minimum number of partitions to use for distributed joins and aggregations
+    in write queries, similar in function to the
+    `query.min-hash-partition-count-for-write` [query management
+    property](/admin/properties-query-management). May be overridden for the
+    current session with the
+    `fault_tolerant_execution_min_partition_count_for_write` [session
+    property](session-properties-definition).
+  - `50`
+  - Only `TASK`
+* - `max-tasks-waiting-for-node-per-stage`
+  - Allow for up to configured number of tasks to wait for node allocation
+    per stage, before pausing scheduling for other tasks from this stage.
+  - 5
+  - Only `TASK`
+:::
+
+(fte-exchange-manager)=
+
+## Exchange manager
+
+Exchange spooling is responsible for storing and managing spooled data for
+fault-tolerant execution. You can configure a filesystem-based exchange manager
+that stores spooled data in a specified location, such as {ref}`AWS S3
+<fte-exchange-aws-s3>` and S3-compatible systems, {ref}`Azure Blob Storage
+<fte-exchange-azure-blob>`, {ref}`Google Cloud Storage <fte-exchange-gcs>`,
+or {ref}`HDFS <fte-exchange-hdfs>`.
+
+### Configuration
+
+To configure an exchange manager, create a new
+`etc/exchange-manager.properties` configuration file on the coordinator and
+all worker nodes. In this file, set the `exchange-manager.name` configuration
+property to `filesystem` or `hdfs`, and set additional configuration properties as needed
+for your storage solution.
+
+The following table lists the available configuration properties for
+`exchange-manager.properties`, their default values, and which filesystem(s)
+the property may be configured for:
+
+:::{list-table} Exchange manager configuration properties
+:widths: 30, 50, 20, 30
+:header-rows: 1
+
+* - Property name
+  - Description
+  - Default value
+  - Supported filesystem
+* - `exchange.base-directories`
+  - Comma-separated list of URI locations that the exchange manager uses to
+    store spooling data.
+  -
+  - Any
+* - `exchange.sink-buffer-pool-min-size`
+  - The minimum buffer pool size for an exchange sink. The larger the buffer
+    pool size, the larger the write parallelism and memory usage.
+  - `10`
+  - Any
+* - `exchange.sink-buffers-per-partition`
+  - The number of buffers per partition in the buffer pool. The larger the
+    buffer pool size, the larger the write parallelism and memory usage.
+  - `2`
+  - Any
+* - `exchange.sink-max-file-size`
+  - Max [data size](prop-type-data-size) of files written by exchange sinks.
+  - ``1GB``
+  - Any
+* - `exchange.source-concurrent-readers`
+  - Number of concurrent readers to read from spooling storage. The larger the
+    number of concurrent readers, the larger the read parallelism and memory
+    usage.
+  - `4`
+  - Any
+* - `exchange.s3.aws-access-key`
+  - AWS access key to use. Required for a connection to AWS S3 and GCS, can be
+    ignored for other S3 storage systems.
+  -
+  - AWS S3, GCS
+* - `exchange.s3.aws-secret-key`
+  - AWS secret key to use. Required for a connection to AWS S3 and GCS, can be
+    ignored for other S3 storage systems.
+  -
+  - AWS S3, GCS
+* - `exchange.s3.iam-role`
+  - IAM role to assume.
+  -
+  - AWS S3, GCS
+* - `exchange.s3.external-id`
+  - External ID for the IAM role trust policy.
+  -
+  - AWS S3, GCS
+* - `exchange.s3.region`
+  - Region of the S3 bucket.
+  -
+  - AWS S3, GCS
+* - `exchange.s3.endpoint`
+  - S3 storage endpoint server if using an S3-compatible storage system that
+    is not AWS. If using AWS S3, this can be ignored. If using GCS, set it
+    to `https://storage.googleapis.com`.
+  -
+  - Any S3-compatible storage
+* - `exchange.s3.max-error-retries`
+  - Maximum number of times the exchange manager's S3 client should retry
+    a request.
+  - `10`
+  - Any S3-compatible storage
+* - `exchange.s3.path-style-access`
+  - Enables using [path-style access](https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html#path-style-access)
+    for all requests to S3.
+  - `false`
+  - Any S3-compatible storage
+* - `exchange.s3.upload.part-size`
+  - Part [data size](prop-type-data-size) for S3 multi-part upload.
+  - `5MB`
+  - Any S3-compatible storage
+* - `exchange.gcs.json-key-file-path`
+  - Path to the JSON file that contains your Google Cloud Platform service
+    account key. Not to be set together with `exchange.gcs.json-key`
+  -
+  - GCS
+* - `exchange.gcs.json-key`
+  - Your Google Cloud Platform service account key in JSON format. Not to be set
+    together with `exchange.gcs.json-key-file-path`
+  -
+  - GCS
+* - `exchange.azure.connection-string`
+  - Connection string used to access the spooling container.
+  -
+  - Azure Blob Storage
+* - `exchange.azure.block-size`
+  - Block [data size](prop-type-data-size) for Azure block blob parallel upload.
+  - `4MB`
+  - Azure Blob Storage
+* - `exchange.azure.max-error-retries`
+  - Maximum number of times the exchange manager's Azure client should
+    retry a request.
+  - `10`
+  - Azure Blob Storage
+* - `exchange.hdfs.block-size`
+  - Block [data size](prop-type-data-size) for HDFS storage.
+  - `4MB`
+  - HDFS
+* - `hdfs.config.resources`
+  - Comma-separated list of paths to HDFS configuration files, for example
+    `/etc/hdfs-site.xml`. The files must exist on all nodes in the Trino
+    cluster.
+  -
+  - HDFS
+:::
+
+It is recommended to set the `exchange.compression-enabled` property to
+`true` in the cluster's `config.properties` file, to reduce the exchange
+manager's overall I/O load. It is also recommended to configure a bucket
+lifecycle rule to automatically expire abandoned objects in the event of a node
+crash.
+
+(fte-exchange-aws-s3)=
+
+#### AWS S3
+
+The following example `exchange-manager.properties` configuration specifies an
+AWS S3 bucket as the spooling storage destination. Note that the destination
+does not have to be in AWS, but can be any S3-compatible storage system.
+
+```properties
+exchange-manager.name=filesystem
+exchange.base-directories=s3://exchange-spooling-bucket
+exchange.s3.region=us-west-1
+exchange.s3.aws-access-key=example-access-key
+exchange.s3.aws-secret-key=example-secret-key
+```
+
+You can configure multiple S3 buckets for the exchange manager to distribute
+spooled data across buckets, reducing the I/O load on any one bucket. If a query
+fails with the error message
+"software.amazon.awssdk.services.s3.model.S3Exception: Please reduce your
+request rate", this indicates that the workload is I/O intensive, and you should
+specify multiple S3 buckets in `exchange.base-directories` to balance the
+load:
+
+```properties
+exchange.base-directories=s3://exchange-spooling-bucket-1,s3://exchange-spooling-bucket-2
+```
+
+(fte-exchange-azure-blob)=
+
+#### Azure Blob Storage
+
+The following example `exchange-manager.properties` configuration specifies an
+Azure Blob Storage container as the spooling storage destination. You must use
+Azure Blob Storage, not Azure Data Lake Storage or any other hierarchical
+storage option in Azure.
+
+```properties
+exchange-manager.name=filesystem
+exchange.base-directories=abfs://container_name@account_name.dfs.core.windows.net
+exchange.azure.connection-string=connection-string
+```
+
+(fte-exchange-gcs)=
+
+#### Google Cloud Storage
+
+To enable exchange spooling on GCS in Trino, change the request endpoint to the
+`https://storage.googleapis.com` Google storage URI, and configure your AWS
+access/secret keys to use the GCS HMAC keys. If you deploy Trino on GCP, you
+must either create a service account with access to your spooling bucket or
+configure the key path to your GCS credential file.
+
+For more information on GCS's S3 compatibility, refer to the [Google Cloud
+documentation on S3 migration](https://cloud.google.com/storage/docs/aws-simple-migration).
+
+The following example `exchange-manager.properties` configuration specifies a
+GCS bucket as the spooling storage destination.
+
+```properties
+exchange-manager.name=filesystem
+exchange.base-directories=gs://exchange-spooling-bucket
+exchange.s3.region=us-west-1
+exchange.s3.aws-access-key=example-access-key
+exchange.s3.aws-secret-key=example-secret-key
+exchange.s3.endpoint=https://storage.googleapis.com
+exchange.gcs.json-key-file-path=/path/to/gcs_keyfile.json
+```
+
+(fte-exchange-hdfs)=
+
+#### HDFS
+
+The following `exchange-manager.properties` configuration example specifies HDFS
+as the spooling storage destination.
+
+```properties
+exchange-manager.name=hdfs
+exchange.base-directories=hadoop-master:9000/exchange-spooling-directory
+hdfs.config.resources=/usr/lib/hadoop/etc/hadoop/core-site.xml
+```
+
+(fte-exchange-local-filesystem)=
+
+#### Local filesystem storage
+
+The following example `exchange-manager.properties` configuration specifies a
+local directory, `/tmp/trino-exchange-manager`, as the spooling storage
+destination.
+
+:::{note}
+It is only recommended to use a local filesystem for exchange in standalone,
+non-production clusters. A local directory can only be used for exchange in
+a distributed cluster if the exchange directory is shared and accessible
+from all worker nodes.
+:::
+
+```properties
+exchange-manager.name=filesystem
+exchange.base-directories=/tmp/trino-exchange-manager
+```
diff --git a/docs/src/main/sphinx/admin/fault-tolerant-execution.rst b/docs/src/main/sphinx/admin/fault-tolerant-execution.rst
deleted file mode 100644
index 4c229ebd9eb9..000000000000
--- a/docs/src/main/sphinx/admin/fault-tolerant-execution.rst
+++ /dev/null
@@ -1,568 +0,0 @@
-========================
-Fault-tolerant execution
-========================
-
-By default, if a Trino node lacks the resources to execute a task or
-otherwise fails during query execution, the query fails and must be run again
-manually. The longer the runtime of a query, the more likely it is to be
-susceptible to such failures.
-
-Fault-tolerant execution is a mechanism in Trino that enables a cluster to
-mitigate query failures by retrying queries or their component tasks in
-the event of failure. With fault-tolerant execution enabled, intermediate
-exchange data is spooled and can be re-used by another worker in the event of a
-worker outage or other fault during query execution.
-
-.. note::
-
-    Fault tolerance does not apply to broken queries or other user error. For
-    example, Trino does not spend resources retrying a query that fails because
-    its SQL cannot be parsed.
-
-    For a step-by-step guide explaining how to configure a Trino cluster with
-    fault-tolerant execution to improve query processing resilience, read
-    :doc:`/installation/query-resiliency`.
-
-Configuration
--------------
-
-Fault-tolerant execution is disabled by default. To enable the feature, set the
-``retry-policy`` configuration property to either ``QUERY`` or ``TASK``
-depending on the desired :ref:`retry policy <fte-retry-policy>`.
-
-.. code-block:: properties
-
-    retry-policy=QUERY
-
-.. warning::
-
-  Setting ``retry-policy`` disables :ref:`write operations
-  <sql-write-operations>` with connectors that do not support fault-tolerant
-  execution of write operations, resulting in a "This connector does not support
-  query retries" error message.
-
-  Support for fault-tolerant execution of SQL statements varies on a
-  per-connector basis:
-
-  * Fault-tolerant execution of :ref:`read operations <sql-read-operations>` is
-    supported by all connectors.
-  * Fault-tolerant execution of :ref:`write operations <sql-write-operations>`
-    is supported by the following connectors:
-
-    * :doc:`/connector/bigquery`
-    * :doc:`/connector/delta-lake`
-    * :doc:`/connector/hive`
-    * :doc:`/connector/iceberg`
-    * :doc:`/connector/mongodb`
-    * :doc:`/connector/mysql`
-    * :doc:`/connector/postgresql`
-    * :doc:`/connector/sqlserver`
-
-The following configuration properties control the behavior of fault-tolerant
-execution on a Trino cluster:
-
-.. list-table:: Fault-tolerant execution configuration properties
-   :widths: 30, 50, 20
-   :header-rows: 1
-
-   * - Property name
-     - Description
-     - Default value
-   * - ``retry-policy``
-     - Configures what is retried in the event of failure, either
-       ``QUERY`` to retry the whole query, or ``TASK`` to retry tasks
-       individually if they fail. See :ref:`retry policy <fte-retry-policy>` for
-       more information.
-     - ``NONE``
-   * - ``exchange.deduplication-buffer-size``
-     - Size of the coordinator's in-memory buffer used by fault-tolerant
-       execution to store output of query :ref:`stages <trino-concept-stage>`.
-       If this buffer is filled during query execution, the query fails with a
-       "Task descriptor storage capacity has been exceeded" error message unless
-       an :ref:`exchange manager <fte-exchange-manager>` is configured.
-     - ``32MB``
-   * - ``exchange.compression-enabled``
-     - Enable compression of spooling data. Setting to ``true`` is recommended
-       when using an :ref:`exchange manager <fte-exchange-manager>`.
-     - ``false``
-
-.. _fte-retry-policy:
-
-Retry policy
-------------
-
-The ``retry-policy`` configuration property designates whether Trino retries
-entire queries or a query's individual tasks in the event of failure.
-
-QUERY
-^^^^^
-
-A ``QUERY`` retry policy instructs Trino to automatically retry a query in the
-event of an error occuring on a worker node. A ``QUERY`` retry policy is
-recommended when the majority of the Trino cluster's workload consists of many
-small queries, or if an :ref:`exchange manager <fte-exchange-manager>` is not
-configured.
-
-By default Trino does not implement fault tolerance for queries whose result set
-exceeds 32MB in size, such as :doc:`/sql/select` statements that return a very
-large data set to the user. This limit can be increased by modifying the
-``exchange.deduplication-buffer-size`` configuration property to be greater than
-the default value of ``32MB``, but this results in higher memory usage on the
-coordinator.
-
-To enable fault-tolerant execution on queries with a larger result set, it is
-strongly recommended to configure an :ref:`exchange manager
-<fte-exchange-manager>` that utilizes external storage for spooled data and
-therefore allows for storage of spilled data beyond the in-memory buffer size.
-
-TASK
-^^^^
-
-A ``TASK`` retry policy instructs Trino to retry individual query
-:ref:`tasks <trino-concept-task>` in the event of failure. This policy is
-recommended when executing large batch queries, as the cluster can more
-efficiently retry smaller tasks within the query rather than retry the whole
-query.
-
-When a cluster is configured with a ``TASK`` retry policy, some relevant
-configuration properties have their default values changed to follow best
-practices for a fault-tolerant cluster. However, this automatic change does not
-affect clusters that have these properties manually configured. If you have
-any of the following properties configured in the ``config.properties`` file on
-a cluster with a ``TASK`` retry policy, it is strongly recommended to make the
-following changes:
-
-* Set the ``task.low-memory-killer.policy``
-  :doc:`query management property </admin/properties-query-management>` to
-  ``total-reservation-on-blocked-nodes``, or queries may
-  need to be manually killed if the cluster runs out of memory.
-* Set the ``query.low-memory-killer.delay``
-  :doc:`query management property </admin/properties-query-management>` to
-  ``0s`` so the cluster immediately unblocks nodes that run out of memory.
-* Modify the ``query.remote-task.max-error-duration``
-  :doc:`query management property </admin/properties-query-management>`
-  to adjust how long Trino allows a remote task to try reconnecting before
-  considering it lost and rescheduling.
-
-.. note::
-
-  A ``TASK`` retry policy is best suited for large batch queries, but this
-  policy can result in higher latency for short-running queries executed in high
-  volume. As a best practice, it is recommended to run a dedicated cluster
-  with a ``TASK`` retry policy for large batch queries, separate from another
-  cluster that handles short queries.
-
-Advanced configuration
-----------------------
-
-You can further configure fault-tolerant execution with the following
-configuration properties. The default values for these properties should work
-for most deployments, but you can change these values for testing or
-troubleshooting purposes.
-
-Retry limits
-^^^^^^^^^^^^
-
-The following configuration properties control the thresholds at which
-queries/tasks are no longer retried in the event of repeated failures:
-
-.. list-table:: Fault tolerance retry limit configuration properties
-   :widths: 30, 50, 20, 30
-   :header-rows: 1
-
-   * - Property name
-     - Description
-     - Default value
-     - Retry policy
-   * - ``query-retry-attempts``
-     - Maximum number of times Trino may attempt to retry a query before
-       declaring the query as failed.
-     - ``4``
-     - Only ``QUERY``
-   * - ``task-retry-attempts-per-task``
-     - Maximum number of times Trino may attempt to retry a single task before
-       declaring the query as failed.
-     - ``4``
-     - Only ``TASK``
-   * - ``retry-initial-delay``
-     - Minimum time that a failed query or task must wait before it is retried. May be
-       overridden with the ``retry_initial_delay`` :ref:`session property
-       <session-properties-definition>`.
-     - ``10s``
-     - ``QUERY`` and ``TASK``
-   * - ``retry-max-delay``
-     - Maximum time that a failed query or task must wait before it is retried.
-       Wait time is increased on each subsequent  failure. May be
-       overridden with the ``retry_max_delay`` :ref:`session property
-       <session-properties-definition>`.
-     - ``1m``
-     - ``QUERY`` and ``TASK``
-   * - ``retry-delay-scale-factor``
-     - Factor by which retry delay is increased on each query or task failure. May be
-       overridden with the ``retry_delay_scale_factor`` :ref:`session property
-       <session-properties-definition>`.
-     - ``2.0``
-     - ``QUERY`` and ``TASK``
-
-Task sizing
-^^^^^^^^^^^
-
-With a ``TASK`` retry policy, it is important to manage the amount of data
-processed in each task. If tasks are too small, the management of task
-coordination can take more processing time and resources than executing the task
-itself. If tasks are too large, then a single task may require more resources
-than are available on any one node and therefore prevent the query from
-completing.
-
-Trino supports limited automatic task sizing. If issues are occurring
-during fault-tolerant task execution, you can configure the following
-configuration properties to manually control task sizing. These configuration
-properties only apply to a ``TASK`` retry policy.
-
-.. list-table:: Task sizing configuration properties
-   :widths: 30, 50, 20
-   :header-rows: 1
-
-   * - Property name
-     - Description
-     - Default value
-   * - ``fault-tolerant-execution-target-task-input-size``
-     - Target size in bytes of all task inputs for a single fault-tolerant task.
-       Applies to tasks that read input from spooled data written by other
-       tasks.
-
-       May be overridden for the current session with the
-       ``fault_tolerant_execution_target_task_input_size``
-       :ref:`session property <session-properties-definition>`.
-     - ``4GB``
-   * - ``fault-tolerant-execution-target-task-split-count``
-     - Target number of standard :ref:`splits <trino-concept-splits>` processed
-       by a single task that reads data from source tables. Value is interpreted
-       with split weight taken into account. If the weight of splits produced by
-       a catalog denotes that they are lighter or heavier than "standard" split,
-       then the number of splits processed by single task is adjusted
-       accordingly.
-
-       May be overridden for the current session with the
-       ``fault_tolerant_execution_target_task_split_count``
-       :ref:`session property <session-properties-definition>`.
-     - ``64``
-   * - ``fault-tolerant-execution-max-task-split-count``
-     - Maximum number of :ref:`splits <trino-concept-splits>` processed by a
-       single task. This value is not split weight-adjusted and serves as
-       protection against situations where catalogs report an incorrect split
-       weight.
-
-       May be overridden for the current session with the
-       ``fault_tolerant_execution_max_task_split_count``
-       :ref:`session property <session-properties-definition>`.
-     - ``256``
-
-Node allocation
-^^^^^^^^^^^^^^^
-
-With a ``TASK`` retry policy, nodes are allocated to tasks based on available
-memory and estimated memory usage. If task failure occurs due to exceeding
-available memory on a node, the task is restarted with a request to allocate the
-full node for its execution.
-
-The initial task memory-requirements estimation is static and configured with
-the ``fault-tolerant-task-memory`` configuration property. This property only
-applies to a ``TASK`` retry policy.
-
-.. list-table:: Node allocation configuration properties
-   :widths: 30, 50, 20
-   :header-rows: 1
-
-   * - Property name
-     - Description
-     - Default value
-   * - ``fault-tolerant-execution-task-memory``
-     - Initial task memory estimation used for bin-packing when allocating nodes
-       for tasks. May be overridden for the current session with the
-       ``fault_tolerant_execution_task_memory``
-       :ref:`session property <session-properties-definition>`.
-     - ``5GB``
-
-Other tuning
-^^^^^^^^^^^^
-
-The following additional configuration property can be used to manage
-fault-tolerant execution:
-
-.. list-table:: Other fault-tolerant execution configuration properties
-   :widths: 30, 50, 20, 30
-   :header-rows: 1
-
-   * - Property name
-     - Description
-     - Default value
-     - Retry policy
-   * - ``fault-tolerant-execution-task-descriptor-storage-max-memory``
-     - Maximum amount of memory to be used to store task descriptors for fault
-       tolerant queries on coordinator. Extra memory is needed to be able to
-       reschedule tasks in case of a failure.
-     - (JVM heap size * 0.15)
-     - Only ``TASK``
-   * - ``fault-tolerant-execution-partition-count``
-     - Number of partitions to use for distributed joins and aggregations,
-       similar in function to the ``query.hash-partition-count`` :doc:`query
-       management property </admin/properties-query-management>`. It is not
-       recommended to increase this property value above the default of ``50``,
-       which may result in instability and poor performance. May be overridden
-       for the current session with the
-       ``fault_tolerant_execution_partition_count`` :ref:`session property
-       <session-properties-definition>`.
-     - ``50``
-     - Only ``TASK``
-   * - ``max-tasks-waiting-for-node-per-stage``
-     - Allow for up to configured number of tasks to wait for node allocation
-       per stage, before pausing scheduling for other tasks from this stage.
-     - 5
-     - Only ``TASK``
-
-.. _fte-exchange-manager:
-
-Exchange manager
-----------------
-
-Exchange spooling is responsible for storing and managing spooled data for
-fault-tolerant execution. You can configure a filesystem-based exchange manager
-that stores spooled data in a specified location, such as :ref:`AWS S3
-<fte-exchange-aws-s3>` and S3-compatible systems, :ref:`Azure Blob Storage
-<fte-exchange-azure-blob>`, :ref:`Google Cloud Storage <fte-exchange-gcs>`,
-or :ref:`HDFS <fte-exchange-hdfs>`.
-
-Configuration
-^^^^^^^^^^^^^
-
-To configure an exchange manager, create a new
-``etc/exchange-manager.properties`` configuration file on the coordinator and
-all worker nodes. In this file, set the ``exchange-manager.name`` configuration
-property to ``filesystem`` or ``hdfs``, and set additional configuration properties as needed
-for your storage solution.
-
-The following table lists the available configuration properties for
-``exchange-manager.properties``, their default values, and which filesystem(s)
-the property may be configured for:
-
-.. list-table:: Exchange manager configuration properties
-   :widths: 30, 50, 20, 30
-   :header-rows: 1
-
-   * - Property name
-     - Description
-     - Default value
-     - Supported filesystem
-   * - ``exchange.base-directories``
-     - Comma-separated list of URI locations that the exchange manager uses to
-       store spooling data.
-     -
-     - Any
-   * - ``exchange.sink-buffer-pool-min-size``
-     - The minimum buffer pool size for an exchange sink. The larger the buffer
-       pool size, the larger the write parallelism and memory usage.
-     - ``10``
-     - Any
-   * - ``exchange.sink-buffers-per-partition``
-     - The number of buffers per partition in the buffer pool. The larger the
-       buffer pool size, the larger the write parallelism and memory usage.
-     - ``2``
-     - Any
-   * - ``exchange.sink-max-file-size``
-     - Max size of files written by exchange sinks.
-     - ``1GB``
-     - Any
-   * - ``exchange.source-concurrent-reader``
-     - Number of concurrent readers to read from spooling storage. The
-       larger the number of concurrent readers, the larger the read parallelism
-       and memory usage.
-     - ``4``
-     - Any
-   * - ``exchange.s3.aws-access-key``
-     - AWS access key to use. Required for a connection to AWS S3 and GCS, can
-       be ignored for other S3 storage systems.
-     -
-     - AWS S3, GCS
-   * - ``exchange.s3.aws-secret-key``
-     - AWS secret key to use. Required for a connection to AWS S3 and GCS, can
-       be ignored for other S3 storage systems.
-     -
-     - AWS S3, GCS
-   * - ``exchange.s3.iam-role``
-     - IAM role to assume.
-     -
-     - AWS S3, GCS
-   * - ``exchange.s3.external-id``
-     - External ID for the IAM role trust policy.
-     -
-     - AWS S3, GCS
-   * - ``exchange.s3.region``
-     - Region of the S3 bucket.
-     -
-     - AWS S3, GCS
-   * - ``exchange.s3.endpoint``
-     - S3 storage endpoint server if using an S3-compatible storage system that
-       is not AWS. If using AWS S3, this can be ignored. If using GCS, set it
-       to ``https://storage.googleapis.com``.
-     -
-     - Any S3-compatible storage
-   * - ``exchange.s3.max-error-retries``
-     - Maximum number of times the exchange manager's S3 client should retry
-       a request.
-     - ``10``
-     - Any S3-compatible storage
-   * - ``exchange.s3.path-style-access``
-     - Enables using `path-style access <https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html#path-style-access>`_
-       for all requests to S3.
-     - ``false``
-     - Any S3-compatible storage
-   * - ``exchange.s3.upload.part-size``
-     - Part size for S3 multi-part upload.
-     - ``5MB``
-     - Any S3-compatible storage
-   * - ``exchange.gcs.json-key-file-path``
-     - Path to the JSON file that contains your Google Cloud Platform
-       service account key. Not to be set together with
-       ``exchange.gcs.json-key``
-     -
-     - GCS
-   * - ``exchange.gcs.json-key``
-     - Your Google Cloud Platform service account key in JSON format.
-       Not to be set together with ``exchange.gcs.json-key-file-path``
-     -
-     - GCS
-   * - ``exchange.azure.connection-string``
-     - Connection string used to access the spooling container.
-     -
-     - Azure Blob Storage
-   * - ``exchange.azure.block-size``
-     - Block size for Azure block blob parallel upload.
-     - ``4MB``
-     - Azure Blob Storage
-   * - ``exchange.azure.max-error-retries``
-     - Maximum number of times the exchange manager's Azure client should
-       retry a request.
-     - ``10``
-     - Azure Blob Storage
-   * - ``exchange.hdfs.block-size``
-     - Block size for HDFS storage.
-     - ``4MB``
-     - HDFS
-   * - ``hdfs.config.resources``
-     - Comma-separated list of paths to HDFS configuration files, for example ``/etc/hdfs-site.xml``.
-       The files must exist on all nodes in the Trino cluster.
-     -
-     - HDFS
-
-It is recommended to set the ``exchange.compression-enabled`` property to
-``true`` in the cluster's ``config.properties`` file, to reduce the exchange
-manager's overall I/O load. It is also recommended to configure a bucket
-lifecycle rule to automatically expire abandoned objects in the event of a node
-crash.
-
-.. _fte-exchange-aws-s3:
-
-AWS S3
-~~~~~~
-
-The following example ``exchange-manager.properties`` configuration specifies an
-AWS S3 bucket as the spooling storage destination. Note that the destination
-does not have to be in AWS, but can be any S3-compatible storage system.
-
-.. code-block:: properties
-
-    exchange-manager.name=filesystem
-    exchange.base-directories=s3://exchange-spooling-bucket
-    exchange.s3.region=us-west-1
-    exchange.s3.aws-access-key=example-access-key
-    exchange.s3.aws-secret-key=example-secret-key
-
-You can configure multiple S3 buckets for the exchange manager to distribute
-spooled data across buckets, reducing the I/O load on any one bucket. If a query
-fails with the error message
-"software.amazon.awssdk.services.s3.model.S3Exception: Please reduce your
-request rate", this indicates that the workload is I/O intensive, and you should
-specify multiple S3 buckets in ``exchange.base-directories`` to balance the
-load:
-
-.. code-block:: properties
-
-    exchange.base-directories=s3://exchange-spooling-bucket-1,s3://exchange-spooling-bucket-2
-
-.. _fte-exchange-azure-blob:
-
-Azure Blob Storage
-~~~~~~~~~~~~~~~~~~
-
-The following example ``exchange-manager.properties`` configuration specifies an
-Azure Blob Storage container as the spooling storage destination.
-
-.. code-block:: properties
-
-    exchange-manager.name=filesystem
-    exchange.base-directories=abfs://container_name@account_name.dfs.core.windows.net
-    exchange.azure.connection-string=connection-string
-
-.. _fte-exchange-gcs:
-
-Google Cloud Storage
-~~~~~~~~~~~~~~~~~~~~
-
-To enable exchange spooling on GCS in Trino, change the request endpoint to the
-``https://storage.googleapis.com`` Google storage URI, and configure your AWS
-access/secret keys to use the GCS HMAC keys. If you deploy Trino on GCP, you
-must either create a service account with access to your spooling bucket or
-configure the key path to your GCS credential file.
-
-For more information on GCS's S3 compatibility, refer to the `Google Cloud
-documentation on S3 migration
-<https://cloud.google.com/storage/docs/aws-simple-migration>`_.
-
-The following example ``exchange-manager.properties`` configuration specifies a
-GCS bucket as the spooling storage destination.
-
-.. code-block:: properties
-
-    exchange-manager.name=filesystem
-    exchange.base-directories=gs://exchange-spooling-bucket
-    exchange.s3.region=us-west-1
-    exchange.s3.aws-access-key=example-access-key
-    exchange.s3.aws-secret-key=example-secret-key
-    exchange.s3.endpoint=https://storage.googleapis.com
-    exchange.gcs.json-key-file-path=/path/to/gcs_keyfile.json
-
-.. _fte-exchange-hdfs:
-
-HDFS
-~~~~
-
-The following ``exchange-manager.properties`` configuration example specifies HDFS
-as the spooling storage destination.
-
-.. code-block:: properties
-
-    exchange-manager.name=hdfs
-    exchange.base-directories=hadoop-master:9000/exchange-spooling-directory
-    hdfs.config.resources=/usr/lib/hadoop/etc/hadoop/core-site.xml
-
-.. _fte-exchange-local-filesystem:
-
-Local filesystem storage
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-The following example ``exchange-manager.properties`` configuration specifies a
-local directory, ``/tmp/trino-exchange-manager``, as the spooling storage
-destination.
-
-.. note::
-
-    It is only recommended to use a local filesystem for exchange in standalone,
-    non-production clusters. A local directory can only be used for exchange in
-    a distributed cluster if the exchange directory is shared and accessible
-    from all worker nodes.
-
-.. code-block:: properties
-
-    exchange-manager.name=filesystem
-    exchange.base-directories=/tmp/trino-exchange-manager
diff --git a/docs/src/main/sphinx/admin/graceful-shutdown.md b/docs/src/main/sphinx/admin/graceful-shutdown.md
new file mode 100644
index 000000000000..9deb35b35458
--- /dev/null
+++ b/docs/src/main/sphinx/admin/graceful-shutdown.md
@@ -0,0 +1,41 @@
+# Graceful shutdown
+
+Trino has a graceful shutdown API that can be used exclusively on workers in
+order to ensure that they terminate without affecting running queries, given a
+sufficient grace period.
+
+You can invoke the API with a HTTP PUT request:
+
+```bash
+curl -v -X PUT -d '"SHUTTING_DOWN"' -H "Content-type: application/json" \
+    http://worker:8081/v1/info/state
+```
+
+A successful invocation is logged with a `Shutdown requested` message at
+`INFO` level in the worker server log.
+
+Keep the following aspects in mind:
+
+- If your cluster is secure, you need to provide a basic-authorization header,
+  or satisfy whatever other security you have enabled.
+- If you have TLS/HTTPS enabled, you have to ensure the worker certificate is
+  CA signed, or trusted by the server calling the shut down endpoint.
+  Otherwise, you can make the call `--insecure`, but that isn't recommended.
+- The `default` {doc}`/security/built-in-system-access-control` does not allow
+  graceful shutdowns. You can use the `allow-all` system access control, or
+  configure {ref}`system information rules
+  <system-file-auth-system-information>` with the `file` system access
+  control. These configuration must be present on all workers.
+
+## Shutdown behavior
+
+Once the API is called, the worker performs the following steps:
+
+- Go into `SHUTTING_DOWN` state.
+- Sleep for `shutdown.grace-period`, which defaults to 2 minutes.
+  : - After this, the coordinator is aware of the shutdown and stops sending
+      tasks to the worker.
+- Block until all active tasks are complete.
+- Sleep for the grace period again in order to ensure the coordinator sees
+  all tasks are complete.
+- Shutdown the application.
diff --git a/docs/src/main/sphinx/admin/graceful-shutdown.rst b/docs/src/main/sphinx/admin/graceful-shutdown.rst
deleted file mode 100644
index 3a5be3090b69..000000000000
--- a/docs/src/main/sphinx/admin/graceful-shutdown.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-=================
-Graceful shutdown
-=================
-
-Trino has a graceful shutdown API that can be used exclusively on workers in
-order to ensure that they terminate without affecting running queries, given a
-sufficient grace period.
-
-You can invoke the API with a HTTP PUT request:
-
-.. code-block:: bash
-
-    curl -v -X PUT -d '"SHUTTING_DOWN"' -H "Content-type: application/json" \
-        http://worker:8081/v1/info/state
-
-A successful invocation is logged with a ``Shutdown requested`` message at
-``INFO`` level in the worker server log.
-
-Keep the following aspects in mind:
-
-* If your cluster is secure, you need to provide a basic-authorization header,
-  or satisfy whatever other security you have enabled.
-* If you have TLS/HTTPS enabled, you have to ensure the worker certificate is
-  CA signed, or trusted by the server calling the shut down endpoint.
-  Otherwise, you can make the call ``--insecure``, but that isn't recommended.
-* If :ref:`system information rules <system-file-auth-system_information>` are
-  configured, then the user in the HTTP request must have read and write
-  permissions in the system information rules.
-
-Shutdown behavior
------------------
-
-Once the API is called, the worker performs the following steps:
-
-* Go into ``SHUTTING_DOWN`` state.
-* Sleep for ``shutdown.grace-period``, which defaults to 2 minutes.
-    * After this, the coordinator is aware of the shutdown and stops sending
-      tasks to the worker.
-* Block until all active tasks are complete.
-* Sleep for the grace period again in order to ensure the coordinator sees
-  all tasks are complete.
-* Shutdown the application.
diff --git a/docs/src/main/sphinx/admin/jmx.md b/docs/src/main/sphinx/admin/jmx.md
new file mode 100644
index 000000000000..b6d6dad46a2a
--- /dev/null
+++ b/docs/src/main/sphinx/admin/jmx.md
@@ -0,0 +1,70 @@
+# Monitoring with JMX
+
+Trino exposes a large number of different metrics via the Java Management Extensions (JMX).
+
+You have to enable JMX by setting the ports used by the RMI registry and server
+in the {ref}`config.properties file <config-properties>`:
+
+```text
+jmx.rmiregistry.port=9080
+jmx.rmiserver.port=9081
+```
+
+- `jmx.rmiregistry.port`:
+  Specifies the port for the JMX RMI registry. JMX clients should connect to this port.
+- `jmx.rmiserver.port`:
+  Specifies the port for the JMX RMI server. Trino exports many metrics,
+  that are useful for monitoring via JMX.
+
+Additionally configure a Java system property in the
+[jvm.config](jvm-config) with the RMI server port:
+
+```properties
+-Dcom.sun.management.jmxremote.rmi.port=9081
+```
+
+JConsole (supplied with the JDK), [VisualVM](https://visualvm.github.io/), and
+many other tools can be used to access the metrics in a client application.
+Many monitoring solutions support JMX. You can also use the
+{doc}`/connector/jmx` and query the metrics using SQL.
+
+Many of these JMX metrics are a complex metric object such as a `CounterStat`
+that has a collection of related metrics. For example, `InputPositions` has
+`InputPositions.TotalCount`, `InputPositions.OneMinute.Count`, and so on.
+
+A small subset of the available metrics are described below.
+
+## JVM
+
+- Heap size: `java.lang:type=Memory:HeapMemoryUsage.used`
+- Thread count: `java.lang:type=Threading:ThreadCount`
+
+## Trino cluster and nodes
+
+- Active nodes:
+  `trino.failuredetector:name=HeartbeatFailureDetector:ActiveCount`
+- Free memory (general pool):
+  `trino.memory:type=ClusterMemoryPool:name=general:FreeDistributedBytes`
+- Cumulative count (since Trino started) of queries that ran out of memory and were killed:
+  `trino.memory:name=ClusterMemoryManager:QueriesKilledDueToOutOfMemory`
+
+## Trino queries
+
+- Active queries currently executing or queued: `trino.execution:name=QueryManager:RunningQueries`
+- Queries started: `trino.execution:name=QueryManager:StartedQueries.FiveMinute.Count`
+- Failed queries from last 5 min (all): `trino.execution:name=QueryManager:FailedQueries.FiveMinute.Count`
+- Failed queries from last 5 min (internal): `trino.execution:name=QueryManager:InternalFailures.FiveMinute.Count`
+- Failed queries from last 5 min (external): `trino.execution:name=QueryManager:ExternalFailures.FiveMinute.Count`
+- Failed queries (user): `trino.execution:name=QueryManager:UserErrorFailures.FiveMinute.Count`
+- Execution latency (P50): `trino.execution:name=QueryManager:ExecutionTime.FiveMinutes.P50`
+- Input data rate (P90): `trino.execution:name=QueryManager:WallInputBytesRate.FiveMinutes.P90`
+
+## Trino tasks
+
+- Input data bytes: `trino.execution:name=SqlTaskManager:InputDataSize.FiveMinute.Count`
+- Input rows: `trino.execution:name=SqlTaskManager:InputPositions.FiveMinute.Count`
+
+## Connectors
+
+Many connectors provide their own metrics. The metric names typically start with
+`trino.plugin`.
diff --git a/docs/src/main/sphinx/admin/jmx.rst b/docs/src/main/sphinx/admin/jmx.rst
deleted file mode 100644
index 1eacbf1eb29e..000000000000
--- a/docs/src/main/sphinx/admin/jmx.rst
+++ /dev/null
@@ -1,76 +0,0 @@
-===================
-Monitoring with JMX
-===================
-
-Trino exposes a large number of different metrics via the Java Management Extensions (JMX).
-
-You have to enable JMX by setting the ports used by the RMI registry and server
-in the :ref:`config.properties file <config_properties>`:
-
-.. code-block:: text
-
-    jmx.rmiregistry.port=9080
-    jmx.rmiserver.port=9081
-
-* ``jmx.rmiregistry.port``:
-  Specifies the port for the JMX RMI registry. JMX clients should connect to this port.
-
-* ``jmx.rmiserver.port``:
-  Specifies the port for the JMX RMI server. Trino exports many metrics,
-  that are useful for monitoring via JMX.
-
-JConsole (supplied with the JDK), `VisualVM <https://visualvm.github.io/>`_, and
-many other tools can be used to access the metrics in a client application.
-Many monitoring solutions support JMX. You can also use the
-:doc:`/connector/jmx` and query the metrics using SQL.
-
-Many of these JMX metrics are a complex metric object such as a ``CounterStat``
-that has a collection of related metrics. For example, ``InputPositions`` has
-``InputPositions.TotalCount``, ``InputPositions.OneMinute.Count``, and so on.
-
-A small subset of the available metrics are described below.
-
-JVM
----
-
-* Heap size: ``java.lang:type=Memory:HeapMemoryUsage.used``
-* Thread count: ``java.lang:type=Threading:ThreadCount``
-
-Trino cluster and nodes
-------------------------
-
-* Active nodes:
-  ``trino.failuredetector:name=HeartbeatFailureDetector:ActiveCount``
-
-* Free memory (general pool):
-  ``trino.memory:type=ClusterMemoryPool:name=general:FreeDistributedBytes``
-
-* Cumulative count (since Trino started) of queries that ran out of memory and were killed:
-  ``trino.memory:name=ClusterMemoryManager:QueriesKilledDueToOutOfMemory``
-
-Trino queries
---------------
-
-* Active queries currently executing or queued: ``trino.execution:name=QueryManager:RunningQueries``
-
-* Queries started: ``trino.execution:name=QueryManager:StartedQueries.FiveMinute.Count``
-
-* Failed queries from last 5 min (all): ``trino.execution:name=QueryManager:FailedQueries.FiveMinute.Count``
-* Failed queries from last 5 min (internal): ``trino.execution:name=QueryManager:InternalFailures.FiveMinute.Count``
-* Failed queries from last 5 min (external): ``trino.execution:name=QueryManager:ExternalFailures.FiveMinute.Count``
-* Failed queries (user): ``trino.execution:name=QueryManager:UserErrorFailures.FiveMinute.Count``
-
-* Execution latency (P50): ``trino.execution:name=QueryManager:ExecutionTime.FiveMinutes.P50``
-* Input data rate (P90): ``trino.execution:name=QueryManager:WallInputBytesRate.FiveMinutes.P90``
-
-Trino tasks
-------------
-
-* Input data bytes: ``trino.execution:name=SqlTaskManager:InputDataSize.FiveMinute.Count``
-* Input rows: ``trino.execution:name=SqlTaskManager:InputPositions.FiveMinute.Count``
-
-Connectors
-----------
-
-Many connectors provide their own metrics. The metric names typically start with
-``trino.plugin``.
diff --git a/docs/src/main/sphinx/admin/properties-exchange.md b/docs/src/main/sphinx/admin/properties-exchange.md
new file mode 100644
index 000000000000..3abaf957f667
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-exchange.md
@@ -0,0 +1,91 @@
+# Exchange properties
+
+Exchanges transfer data between Trino nodes for different stages of
+a query. Adjusting these properties may help to resolve inter-node
+communication issues or improve network utilization.
+
+## `exchange.client-threads`
+
+- **Type:** {ref}`prop-type-integer`
+- **Minimum value:** `1`
+- **Default value:** `25`
+
+Number of threads used by exchange clients to fetch data from other Trino
+nodes. A higher value can improve performance for large clusters or clusters
+with very high concurrency, but excessively high values may cause a drop
+in performance due to context switches and additional memory usage.
+
+## `exchange.concurrent-request-multiplier`
+
+- **Type:** {ref}`prop-type-integer`
+- **Minimum value:** `1`
+- **Default value:** `3`
+
+Multiplier determining the number of concurrent requests relative to
+available buffer memory. The maximum number of requests is determined
+using a heuristic of the number of clients that can fit into available
+buffer space, based on average buffer usage per request times this
+multiplier. For example, with an `exchange.max-buffer-size` of `32 MB`
+and `20 MB` already used and average size per request being `2MB`,
+the maximum number of clients is
+`multiplier * ((32MB - 20MB) / 2MB) = multiplier * 6`. Tuning this
+value adjusts the heuristic, which may increase concurrency and improve
+network utilization.
+
+## `exchange.data-integrity-verification`
+
+- **Type:** {ref}`prop-type-string`
+- **Allowed values:** `NONE`, `ABORT`, `RETRY`
+- **Default value:** `ABORT`
+
+Configure the resulting behavior of data integrity issues. By default,
+`ABORT` causes queries to be aborted when data integrity issues are
+detected as part of the built-in verification. Setting the property to
+`NONE` disables the verification. `RETRY` causes the data exchange to be
+repeated when integrity issues are detected.
+
+## `exchange.max-buffer-size`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `32MB`
+
+Size of buffer in the exchange client that holds data fetched from other
+nodes before it is processed. A larger buffer can increase network
+throughput for larger clusters, and thus decrease query processing time,
+but reduces the amount of memory available for other usages.
+
+## `exchange.max-response-size`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Minimum value:** `1MB`
+- **Default value:** `16MB`
+
+Maximum size of a response returned from an exchange request. The response
+is placed in the exchange client buffer, which is shared across all
+concurrent requests for the exchange.
+
+Increasing the value may improve network throughput, if there is high
+latency. Decreasing the value may improve query performance for large
+clusters as it reduces skew, due to the exchange client buffer holding
+responses for more tasks, rather than hold more data from fewer tasks.
+
+## `sink.max-buffer-size`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `32MB`
+
+Output buffer size for task data that is waiting to be pulled by upstream
+tasks. If the task output is hash partitioned, then the buffer is
+shared across all of the partitioned consumers. Increasing this value may
+improve network throughput for data transferred between stages, if the
+network has high latency, or if there are many nodes in the cluster.
+
+## `sink.max-broadcast-buffer-size`
+
+- **Type** `data size`
+- **Default value:** `200MB`
+
+Broadcast output buffer size for task data that is waiting to be pulled by
+upstream tasks. The broadcast buffer is used to store and transfer build side
+data for replicated joins. If the buffer is too small, it prevents scaling of
+join probe side tasks, when new nodes are added to the cluster.
diff --git a/docs/src/main/sphinx/admin/properties-exchange.rst b/docs/src/main/sphinx/admin/properties-exchange.rst
deleted file mode 100644
index 9c2f47bd3d42..000000000000
--- a/docs/src/main/sphinx/admin/properties-exchange.rst
+++ /dev/null
@@ -1,100 +0,0 @@
-===================
-Exchange properties
-===================
-
-Exchanges transfer data between Trino nodes for different stages of
-a query. Adjusting these properties may help to resolve inter-node
-communication issues or improve network utilization.
-
-``exchange.client-threads``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Minimum value:** ``1``
-* **Default value:** ``25``
-
-Number of threads used by exchange clients to fetch data from other Trino
-nodes. A higher value can improve performance for large clusters or clusters
-with very high concurrency, but excessively high values may cause a drop
-in performance due to context switches and additional memory usage.
-
-``exchange.concurrent-request-multiplier``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Minimum value:** ``1``
-* **Default value:** ``3``
-
-Multiplier determining the number of concurrent requests relative to
-available buffer memory. The maximum number of requests is determined
-using a heuristic of the number of clients that can fit into available
-buffer space, based on average buffer usage per request times this
-multiplier. For example, with an ``exchange.max-buffer-size`` of ``32 MB``
-and ``20 MB`` already used and average size per request being ``2MB``,
-the maximum number of clients is
-``multiplier * ((32MB - 20MB) / 2MB) = multiplier * 6``. Tuning this
-value adjusts the heuristic, which may increase concurrency and improve
-network utilization.
-
-``exchange.data-integrity-verification``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Allowed values:** ``NONE``, ``ABORT``, ``RETRY``
-* **Default value:** ``ABORT``
-
-Configure the resulting behavior of data integrity issues. By default,
-``ABORT`` causes queries to be aborted when data integrity issues are
-detected as part of the built-in verification. Setting the property to
-``NONE`` disables the verification. ``RETRY`` causes the data exchange to be
-repeated when integrity issues are detected.
-
-``exchange.max-buffer-size``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``32MB``
-
-Size of buffer in the exchange client that holds data fetched from other
-nodes before it is processed. A larger buffer can increase network
-throughput for larger clusters, and thus decrease query processing time,
-but reduces the amount of memory available for other usages.
-
-``exchange.max-response-size``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Minimum value:** ``1MB``
-* **Default value:** ``16MB``
-
-Maximum size of a response returned from an exchange request. The response
-is placed in the exchange client buffer, which is shared across all
-concurrent requests for the exchange.
-
-Increasing the value may improve network throughput, if there is high
-latency. Decreasing the value may improve query performance for large
-clusters as it reduces skew, due to the exchange client buffer holding
-responses for more tasks, rather than hold more data from fewer tasks.
-
-``sink.max-buffer-size``
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``32MB``
-
-Output buffer size for task data that is waiting to be pulled by upstream
-tasks. If the task output is hash partitioned, then the buffer is
-shared across all of the partitioned consumers. Increasing this value may
-improve network throughput for data transferred between stages, if the
-network has high latency, or if there are many nodes in the cluster.
-
-``sink.max-broadcast-buffer-size``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type** ``data size``
-* **Default value:** ``200MB``
-
-Broadcast output buffer size for task data that is waiting to be pulled by
-upstream tasks. The broadcast buffer is used to store and transfer build side
-data for replicated joins. If the buffer is too small, it prevents scaling of
-join probe side tasks, when new nodes are added to the cluster.
diff --git a/docs/src/main/sphinx/admin/properties-general.md b/docs/src/main/sphinx/admin/properties-general.md
new file mode 100644
index 000000000000..860bb44b4da7
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-general.md
@@ -0,0 +1,69 @@
+# General properties
+
+## `join-distribution-type`
+
+- **Type:** {ref}`prop-type-string`
+- **Allowed values:** `AUTOMATIC`, `PARTITIONED`, `BROADCAST`
+- **Default value:** `AUTOMATIC`
+- **Session property:** `join_distribution_type`
+
+The type of distributed join to use.  When set to `PARTITIONED`, Trino
+uses hash distributed joins.  When set to `BROADCAST`, it broadcasts the
+right table to all nodes in the cluster that have data from the left table.
+Partitioned joins require redistributing both tables using a hash of the join key.
+This can be slower, sometimes substantially, than broadcast joins, but allows much
+larger joins. In particular broadcast joins are faster, if the right table is
+much smaller than the left.  However, broadcast joins require that the tables on the right
+side of the join after filtering fit in memory on each node, whereas distributed joins
+only need to fit in distributed memory across all nodes. When set to `AUTOMATIC`,
+Trino makes a cost based decision as to which distribution type is optimal.
+It considers switching the left and right inputs to the join.  In `AUTOMATIC`
+mode, Trino defaults to hash distributed joins if no cost could be computed, such as if
+the tables do not have statistics.
+
+## `redistribute-writes`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+- **Session property:** `redistribute_writes`
+
+This property enables redistribution of data before writing. This can
+eliminate the performance impact of data skew when writing by hashing it
+across nodes in the cluster. It can be disabled, when it is known that the
+output data set is not skewed, in order to avoid the overhead of hashing and
+redistributing all the data across the network.
+
+## `protocol.v1.alternate-header-name`
+
+**Type:** `string`
+
+The 351 release of Trino changes the HTTP client protocol headers to start with
+`X-Trino-`. Clients for versions 350 and lower expect the HTTP headers to
+start with `X-Presto-`, while newer clients expect `X-Trino-`. You can support these
+older clients by setting this property to `Presto`.
+
+The preferred approach to migrating from versions earlier than 351 is to update
+all clients together with the release, or immediately afterwards, and then
+remove usage of this property.
+
+Ensure to use this only as a temporary measure to assist in your migration
+efforts.
+
+## `protocol.v1.prepared-statement-compression.length-threshold`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `2048`
+
+Prepared statements that are submitted to Trino for processing, and are longer
+than the value of this property, are compressed for transport via the HTTP
+header to improve handling, and to avoid failures due to hitting HTTP header
+size limits.
+
+## `protocol.v1.prepared-statement-compression.min-gain`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `512`
+
+Prepared statement compression is not applied if the size gain is less than the
+configured value. Smaller statements do not benefit from compression, and are
+left uncompressed.
diff --git a/docs/src/main/sphinx/admin/properties-general.rst b/docs/src/main/sphinx/admin/properties-general.rst
deleted file mode 100644
index 0b9ed0bb4807..000000000000
--- a/docs/src/main/sphinx/admin/properties-general.rst
+++ /dev/null
@@ -1,76 +0,0 @@
-==================
-General properties
-==================
-
-``join-distribution-type``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Allowed values:** ``AUTOMATIC``, ``PARTITIONED``, ``BROADCAST``
-* **Default value:** ``AUTOMATIC``
-
-The type of distributed join to use.  When set to ``PARTITIONED``, Trino
-uses hash distributed joins.  When set to ``BROADCAST``, it broadcasts the
-right table to all nodes in the cluster that have data from the left table.
-Partitioned joins require redistributing both tables using a hash of the join key.
-This can be slower, sometimes substantially, than broadcast joins, but allows much
-larger joins. In particular broadcast joins are faster, if the right table is
-much smaller than the left.  However, broadcast joins require that the tables on the right
-side of the join after filtering fit in memory on each node, whereas distributed joins
-only need to fit in distributed memory across all nodes. When set to ``AUTOMATIC``,
-Trino makes a cost based decision as to which distribution type is optimal.
-It considers switching the left and right inputs to the join.  In ``AUTOMATIC``
-mode, Trino defaults to hash distributed joins if no cost could be computed, such as if
-the tables do not have statistics. This can be specified on a per-query basis using
-the ``join_distribution_type`` session property.
-
-``redistribute-writes``
-^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-This property enables redistribution of data before writing. This can
-eliminate the performance impact of data skew when writing by hashing it
-across nodes in the cluster. It can be disabled, when it is known that the
-output data set is not skewed, in order to avoid the overhead of hashing and
-redistributing all the data across the network. This can be specified
-on a per-query basis using the ``redistribute_writes`` session property.
-
-``protocol.v1.alternate-header-name``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-**Type:** ``string``
-
-The 351 release of Trino changes the HTTP client protocol headers to start with
-``X-Trino-``. Clients for versions 350 and lower expect the HTTP headers to
-start with ``X-Presto-``, while newer clients expect ``X-Trino-``. You can support these
-older clients by setting this property to ``Presto``.
-
-The preferred approach to migrating from versions earlier than 351 is to update
-all clients together with the release, or immediately afterwards, and then
-remove usage of this property.
-
-Ensure to use this only as a temporary measure to assist in your migration
-efforts.
-
-``protocol.v1.prepared-statement-compression.length-threshold``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``2048``
-
-Prepared statements that are submitted to Trino for processing, and are longer
-than the value of this property, are compressed for transport via the HTTP
-header to improve handling, and to avoid failures due to hitting HTTP header
-size limits.
-
-``protocol.v1.prepared-statement-compression.min-gain``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``512``
-
-Prepared statement compression is not applied if the size gain is less than the
-configured value. Smaller statements do not benefit from compression, and are
-left uncompressed.
diff --git a/docs/src/main/sphinx/admin/properties-http-client.md b/docs/src/main/sphinx/admin/properties-http-client.md
new file mode 100644
index 000000000000..5c40b022e7ce
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-http-client.md
@@ -0,0 +1,177 @@
+# HTTP client properties
+
+HTTP client properties allow you to configure the connection from Trino to
+external services using HTTP.
+
+The following properties can be used after adding the specific prefix to the
+property. For example, for {doc}`/security/oauth2`, you can enable HTTP for
+interactions with the external OAuth 2.0 provider by adding the prefix
+`oauth2-jwk` to the `http-client.connect-timeout` property, and increasing
+the connection timeout to ten seconds by setting the value to `10`:
+
+```
+oauth2-jwk.http-client.connect-timeout=10s
+```
+
+The following prefixes are supported:
+
+- `oauth2-jwk` for {doc}`/security/oauth2`
+- `jwk` for {doc}`/security/jwt`
+
+## General properties
+
+### `http-client.connect-timeout`
+
+- **Type:** {ref}`prop-type-duration`
+- **Default value:** `5s`
+- **Minimum value:** `0ms`
+
+Timeout value for establishing the connection to the external service.
+
+### `http-client.max-connections`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `200`
+
+Maximum connections allowed to the service.
+
+### `http-client.request-timeout`
+
+- **Type:** {ref}`prop-type-duration`
+- **Default value:** `5m`
+- **Minimum value:** `0ms`
+
+Timeout value for the overall request.
+
+## TLS and security properties
+
+### `http-client.https.excluded-cipher`
+
+- **Type:** {ref}`prop-type-string`
+
+A comma-separated list of regexes for the names of cipher algorithms to exclude.
+
+### `http-client.https.included-cipher`
+
+- **Type:** {ref}`prop-type-string`
+
+A comma-separated list of regexes for the names of the cipher algorithms to use.
+
+### `http-client.https.hostname-verification`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+
+Verify that the server hostname matches the server DNS name in the
+SubjectAlternativeName (SAN) field of the certificate.
+
+### `http-client.key-store-password`
+
+- **Type:** {ref}`prop-type-string`
+
+Password for the keystore.
+
+### `http-client.key-store-path`
+
+- **Type:** {ref}`prop-type-string`
+
+File path on the server to the keystore file.
+
+### `http-client.secure-random-algorithm`
+
+- **Type:** {ref}`prop-type-string`
+
+Set the secure random algorithm for the connection. The default varies by
+operating system. Algorithms are specified according to standard algorithm name
+documentation.
+
+Possible types include `NativePRNG`, `NativePRNGBlocking`,
+`NativePRNGNonBlocking`, `PKCS11`, and `SHA1PRNG`.
+
+### `http-client.trust-store-password`
+
+- **Type:** {ref}`prop-type-string`
+
+Password for the truststore.
+
+### `http-client.trust-store-path`
+
+- **Type:** {ref}`prop-type-string`
+
+File path on the server to the truststore file.
+
+## Proxy properties
+
+### `http-client.http-proxy`
+
+- **Type:** {ref}`prop-type-string`
+
+Host and port for an HTTP proxy with the format `example.net:8080`.
+
+### `http-client.http-proxy.secure`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `false`
+
+Enable HTTPS for the proxy.
+
+### `http-client.socks-proxy`
+
+- **Type:** {ref}`prop-type-string`
+
+Host and port for a SOCKS proxy.
+
+## Request logging
+
+### `http-client.log.compression-enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+
+Enable log file compression. The client uses the `.gz` format for log files.
+
+### `http-client.log.enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `false`
+
+Enable logging of HTTP requests.
+
+### `http-client.log.flush-interval`
+
+- **Type:** {ref}`prop-type-duration`
+- **Default value:** `10s`
+
+Frequency of flushing the log data to disk.
+
+### `http-client.log.max-history`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `15`
+
+Retention limit of log files in days. Files older than the `max-history` are
+deleted when the HTTP client creates files for new logging periods.
+
+### `http-client.log.max-size`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `1GB`
+
+Maximum total size of all log files on disk.
+
+### `http-client.log.path`
+
+- **Type:** {ref}`prop-type-string`
+- **Default value:** `var/log/`
+
+Sets the path of the log files. All log files are named `http-client.log`, and
+have the prefix of the specific HTTP client added. For example,
+`jwk-http-client.log`.
+
+### `http-client.log.queue-size`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `10000`
+- **Minimum value:** `1`
+
+Size of the HTTP client logging queue.
diff --git a/docs/src/main/sphinx/admin/properties-http-client.rst b/docs/src/main/sphinx/admin/properties-http-client.rst
deleted file mode 100644
index 4a25a965d5e5..000000000000
--- a/docs/src/main/sphinx/admin/properties-http-client.rst
+++ /dev/null
@@ -1,204 +0,0 @@
-======================
-HTTP client properties
-======================
-
-HTTP client properties allow you to configure the connection from Trino to
-external services using HTTP.
-
-The following properties can be used after adding the specific prefix to the
-property. For example, for :doc:`/security/oauth2`, you can enable HTTP for
-interactions with the external OAuth 2.0 provider by adding the prefix
-``oauth2-jwk`` to the ``http-client.connect-timeout`` property, and increasing
-the connection timeout to ten seconds by setting the value to ``10``:
-
-.. code-block::
-
-    oauth2-jwk.http-client.connect-timeout=10s
-
-The following prefixes are supported:
-
-* ``oauth2-jwk`` for :doc:`/security/oauth2`
-* ``jwk`` for :doc:`/security/jwt`
-
-General properties
-------------------
-
-``http-client.connect-timeout``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Default value:** ``5s``
-* **Minimum value:** ``0ms``
-
-Timeout value for establishing the connection to the external service.
-
-``http-client.max-connections``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``200``
-
-Maximum connections allowed to the service.
-
-``http-client.request-timeout``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Default value:** ``5m``
-* **Minimum value:** ``0ms``
-
-Timeout value for the overall request.
-
-TLS and security properties
----------------------------
-
-``http-client.https.excluded-cipher``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-
-A comma-separated list of regexes for the names of cipher algorithms to exclude.
-
-``http-client.https.included-cipher``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-
-A comma-separated list of regexes for the names of the cipher algorithms to use.
-
-``http-client.https.hostname-verification``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Verify that the server hostname matches the server DNS name in the
-SubjectAlternativeName (SAN) field of the certificate.
-
-``http-client.key-store-password``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-
-Password for the keystore.
-
-``http-client.key-store-path``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-
-File path on the server to the keystore file.
-
-``http-client.secure-random-algorithm``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-
-Set the secure random algorithm for the connection. The default varies by
-operating system. Algorithms are specified according to standard algorithm name
-documentation.
-
-Possible types include ``NativePRNG``, ``NativePRNGBlocking``,
-``NativePRNGNonBlocking``, ``PKCS11``, and ``SHA1PRNG``.
-
-``http-client.trust-store-password``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-
-Password for the truststore.
-
-``http-client.trust-store-path``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-
-File path on the server to the truststore file.
-
-Proxy properties
-----------------
-
-``http-client.http-proxy``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-
-Host and port for an HTTP proxy with the format ``example.net:8080``.
-
-``http-client.http-proxy.secure``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``false``
-
-Enable HTTPS for the proxy.
-
-``http-client.socks-proxy``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-
-Host and port for a SOCKS proxy.
-
-Request logging
----------------
-
-``http-client.log.compression-enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Enable log file compression. The client uses the ``.gz`` format for log files.
-
-``http-client.log.enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``false``
-
-Enable logging of HTTP requests.
-
-``http-client.log.flush-interval``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Default value:** ``10s``
-
-Frequency of flushing the log data to disk.
-
-``http-client.log.max-history``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``15``
-
-Retention limit of log files in days. Files older than the ``max-history`` are
-deleted when the HTTP client creates files for new logging periods.
-
-``http-client.log.max-size``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``1GB``
-
-Maximum total size of all log files on disk.
-
-``http-client.log.path``
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Default value:** ``var/log/``
-
-Sets the path of the log files. All log files are named ``http-client.log``, and
-have the prefix of the specific HTTP client added. For example,
-``jwk-http-client.log``.
-
-``http-client.log.queue-size``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``10000``
-* **Minimum value:** ``1``
-
-Size of the HTTP client logging queue.
diff --git a/docs/src/main/sphinx/admin/properties-logging.md b/docs/src/main/sphinx/admin/properties-logging.md
new file mode 100644
index 000000000000..43f6595afa81
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-logging.md
@@ -0,0 +1,98 @@
+# Logging properties
+
+## `log.annotation-file`
+
+- **Type:** {ref}`prop-type-string`
+
+An optional properties file that contains annotations to be included with
+each log message. This can be used to include machine-specific or
+environment-specific information into logs which are centrally aggregated.
+The annotation values can contain references to environment variables.
+
+```properties
+environment=production
+host=${ENV:HOSTNAME}
+```
+
+## `log.format`
+
+- **Type:** {ref}`prop-type-string`
+- **Default value:** `TEXT`
+
+The file format for log records. Can be set to either `TEXT` or `JSON`. When
+set to `JSON`, the log record is formatted as a JSON object, one record per
+line. Any newlines in the field values, such as exception stack traces, are
+escaped as normal in the JSON object. This allows for capturing and indexing
+exceptions as singular fields in a logging search system.
+
+## `log.path`
+
+- **Type:** {ref}`prop-type-string`
+
+The path to the log file used by Trino. The path is relative to the data
+directory, configured to `var/log/server.log` by the launcher script as
+detailed in {ref}`running-trino`. Alternatively, you can write logs to separate
+the process (typically running next to Trino as a sidecar process) via the TCP
+protocol by using a log path of the format `tcp://host:port`.
+
+## `log.max-size`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `100MB`
+
+The maximum file size for the general application log file.
+
+## `log.max-total-size`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `1GB`
+
+The maximum file size for all general application log files combined.
+
+## `log.compression`
+
+- **Type:** {ref}`prop-type-string`
+- **Default value:** `GZIP`
+
+The compression format for rotated log files. Can be set to either `GZIP` or `NONE`. When
+set to `NONE`, compression is disabled.
+
+## `http-server.log.enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+
+Flag to enable or disable logging for the HTTP server.
+
+## `http-server.log.compression.enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+
+Flag to enable or disable compression of the log files of the HTTP server.
+
+## `http-server.log.path`
+
+- **Type:** {ref}`prop-type-string`
+- **Default value:** `var/log/http-request.log`
+
+The path to the log file used by the HTTP server. The path is relative to
+the data directory, configured by the launcher script as detailed in
+{ref}`running-trino`.
+
+## `http-server.log.max-history`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `15`
+
+The maximum number of log files for the HTTP server to use, before
+log rotation replaces old content.
+
+## `http-server.log.max-size`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `unlimited`
+
+The maximum file size for the log file of the HTTP server. Defaults to
+`unlimited`, setting a {ref}`prop-type-data-size` value limits the file size
+to that value.
diff --git a/docs/src/main/sphinx/admin/properties-logging.rst b/docs/src/main/sphinx/admin/properties-logging.rst
deleted file mode 100644
index fbce71a23142..000000000000
--- a/docs/src/main/sphinx/admin/properties-logging.rst
+++ /dev/null
@@ -1,102 +0,0 @@
-==================
-Logging properties
-==================
-
-``log.annotation-file``
-^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-
-An optional properties file that contains annotations to be included with
-each log message. This can be used to include machine-specific or
-environment-specific information into logs which are centrally aggregated.
-The annotation values can contain references to environment variables.
-
-.. code-block:: properties
-
-    environment=production
-    host=${ENV:HOSTNAME}
-
-``log.format``
-^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Default value:** ``TEXT``
-
-The file format for log records. Can be set to either ``TEXT`` or ``JSON``. When
-set to ``JSON``, the log record is formatted as a JSON object, one record per
-line. Any newlines in the field values, such as exception stack traces, are
-escaped as normal in the JSON object. This allows for capturing and indexing
-exceptions as singular fields in a logging search system.
-
-``log.path``
-^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-
-The path to the log file used by Trino. The path is relative to the data
-directory, configured to ``var/log/server.log`` by the launcher script as
-detailed in :ref:`running_trino`. Alternatively, you can write logs to separate
-the process (typically running next to Trino as a sidecar process) via the TCP
-protocol by using a log path of the format ``tcp://host:port``.
-
-``log.max-history``
-^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``30``
-
-The maximum number of general application log files to use, before log
-rotation replaces old content.
-
-``log.max-size``
-^^^^^^^^^^^^^^^^
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``100MB``
-
-The maximum file size for the general application log file.
-
-``http-server.log.enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Flag to enable or disable logging for the HTTP server.
-
-``http-server.log.compression.enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Flag to enable or disable compression of the log files of the HTTP server.
-
-``http-server.log.path``
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Default value:** ``var/log/http-request.log``
-
-The path to the log file used by the HTTP server. The path is relative to
-the data directory, configured by the launcher script as detailed in
-:ref:`running_trino`.
-
-``http-server.log.max-history``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``15``
-
-The maximum number of log files for the HTTP server to use, before
-log rotation replaces old content.
-
-``http-server.log.max-size``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``unlimited``
-
-The maximum file size for the log file of the HTTP server. Defaults to
-``unlimited``, setting a :ref:`prop-type-data-size` value limits the file size
-to that value.
diff --git a/docs/src/main/sphinx/admin/properties-node-scheduler.md b/docs/src/main/sphinx/admin/properties-node-scheduler.md
new file mode 100644
index 000000000000..85a87a09f868
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-node-scheduler.md
@@ -0,0 +1,185 @@
+# Node scheduler properties
+
+## `node-scheduler.include-coordinator`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+
+Allows scheduling work on the coordinator so that a single machine can function
+as both coordinator and worker. For large clusters, processing work on the
+coordinator can negatively impact query performance because the machine's
+resources are not available for the critical coordinator tasks of scheduling,
+managing, and monitoring query execution.
+
+### Splits
+
+## `node-scheduler.max-splits-per-node`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `256`
+
+The target value for the total number of splits that can be running for
+each worker node, assuming all splits have the standard split weight.
+
+Using a higher value is recommended, if queries are submitted in large batches
+(e.g., running a large group of reports periodically), or for connectors that
+produce many splits that complete quickly but do not support assigning split
+weight values to express that to the split scheduler. Increasing this value may
+improve query latency, by ensuring that the workers have enough splits to keep
+them fully utilized.
+
+When connectors do support weight based split scheduling, the number of splits
+assigned will depend on the weight of the individual splits. If splits are
+small, more of them are allowed to be assigned to each worker to compensate.
+
+Setting this too high wastes memory and may result in lower performance
+due to splits not being balanced across workers. Ideally, it should be set
+such that there is always at least one split waiting to be processed, but
+not higher.
+
+## `node-scheduler.min-pending-splits-per-task`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `16`
+
+The minimum number of outstanding splits with the standard split weight guaranteed to be scheduled on a node (even when the node
+is already at the limit for total number of splits) for a single task given the task has remaining splits to process.
+Allowing a minimum number of splits per stage is required to prevent starvation and deadlocks.
+
+This value must be smaller or equal than `max-adjusted-pending-splits-per-task` and
+`node-scheduler.max-splits-per-node`, is usually increased for the same reasons,
+and has similar drawbacks if set too high.
+
+## `node-scheduler.max-adjusted-pending-splits-per-task`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `2000`
+
+The maximum number of outstanding splits with the standard split weight guaranteed to be scheduled on a node (even when the node
+is already at the limit for total number of splits) for a single task given the task has remaining splits to process.
+Split queue size is adjusted dynamically during split scheduling and cannot exceed `node-scheduler.max-adjusted-pending-splits-per-task`.
+Split queue size per task will be adjusted upward if node processes splits faster than it receives them.
+
+Usually increased for the same reasons as `node-scheduler.max-splits-per-node`, with smaller drawbacks
+if set too high.
+
+:::{note}
+Only applies for `uniform` {ref}`scheduler policy <node-scheduler-policy>`.
+:::
+
+## `node-scheduler.max-unacknowledged-splits-per-task`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `2000`
+
+Maximum number of splits that are either queued on the coordinator, but not yet sent or confirmed to have been received by
+the worker. This limit enforcement takes precedence over other existing split limit configurations
+like `node-scheduler.max-splits-per-node` or `node-scheduler.max-adjusted-pending-splits-per-task`
+and is designed to prevent large task update requests that might cause a query to fail.
+
+## `node-scheduler.min-candidates`
+
+- **Type:** {ref}`prop-type-integer`
+- **Minimum value:** `1`
+- **Default value:** `10`
+
+The minimum number of candidate nodes that are evaluated by the
+node scheduler when choosing the target node for a split. Setting
+this value too low may prevent splits from being properly balanced
+across all worker nodes. Setting it too high may increase query
+latency and increase CPU usage on the coordinator.
+
+(node-scheduler-policy)=
+
+## `node-scheduler.policy`
+
+- **Type:** {ref}`prop-type-string`
+- **Allowed values:** `uniform`, `topology`
+- **Default value:** `uniform`
+
+Sets the node scheduler policy to use when scheduling splits. `uniform`  attempts
+to schedule splits on the host where the data is located, while maintaining a uniform
+distribution across all hosts. `topology` tries to schedule splits according to
+the topology distance between nodes and splits. It is recommended to use `uniform`
+for clusters where distributed storage runs on the same nodes as Trino workers.
+
+### Network topology
+
+## `node-scheduler.network-topology.segments`
+
+- **Type:** {ref}`prop-type-string`
+- **Default value:** `machine`
+
+A comma-separated string describing the meaning of each segment of a network location.
+For example, setting `region,rack,machine` means a network location contains three segments.
+
+## `node-scheduler.network-topology.type`
+
+- **Type:** {ref}`prop-type-string`
+- **Allowed values:** `flat`, `file`, `subnet`
+- **Default value:** `flat`
+
+Sets the network topology type. To use this option, `node-scheduler.policy`
+must be set to `topology`.
+
+- `flat`: the topology has only one segment, with one value for each machine.
+- `file`: the topology is loaded from a file using the properties
+  `node-scheduler.network-topology.file` and
+  `node-scheduler.network-topology.refresh-period` described in the
+  following sections.
+- `subnet`: the topology is derived based on subnet configuration provided
+  through properties `node-scheduler.network-topology.subnet.cidr-prefix-lengths`
+  and `node-scheduler.network-topology.subnet.ip-address-protocol` described
+  in the following sections.
+
+### File based network topology
+
+## `node-scheduler.network-topology.file`
+
+- **Type:** {ref}`prop-type-string`
+
+Load the network topology from a file. To use this option, `node-scheduler.network-topology.type`
+must be set to `file`. Each line contains a mapping between a host name and a
+network location, separated by whitespace. Network location must begin with a leading
+`/` and segments are separated by a `/`.
+
+```text
+192.168.0.1 /region1/rack1/machine1
+192.168.0.2 /region1/rack1/machine2
+hdfs01.example.com /region2/rack2/machine3
+```
+
+## `node-scheduler.network-topology.refresh-period`
+
+- **Type:** {ref}`prop-type-duration`
+- **Minimum value:** `1ms`
+- **Default value:** `5m`
+
+Controls how often the network topology file is reloaded.  To use this option,
+`node-scheduler.network-topology.type` must be set to `file`.
+
+### Subnet based network topology
+
+## `node-scheduler.network-topology.subnet.ip-address-protocol`
+
+- **Type:** {ref}`prop-type-string`
+- **Allowed values:** `IPv4`, `IPv6`
+- **Default value:** `IPv4`
+
+Sets the IP address protocol to be used for computing subnet based
+topology.  To use this option, `node-scheduler.network-topology.type` must
+be set to `subnet`.
+
+## `node-scheduler.network-topology.subnet.cidr-prefix-lengths`
+
+A comma-separated list of {ref}`prop-type-integer` values defining CIDR prefix
+lengths for subnet masks. The prefix lengths must be in increasing order. The
+maximum prefix length values for IPv4 and IPv6 protocols are 32 and 128
+respectively. To use this option, `node-scheduler.network-topology.type` must
+be set to `subnet`.
+
+For example, the value `24,25,27` for this property with IPv4 protocol means
+that masks applied on the IP address to compute location segments are
+`255.255.255.0`, `255.255.255.128` and `255.255.255.224`. So the segments
+created for an address `192.168.0.172` are `[192.168.0.0, 192.168.0.128,
+192.168.0.160, 192.168.0.172]`.
diff --git a/docs/src/main/sphinx/admin/properties-node-scheduler.rst b/docs/src/main/sphinx/admin/properties-node-scheduler.rst
deleted file mode 100644
index 33a0495fef39..000000000000
--- a/docs/src/main/sphinx/admin/properties-node-scheduler.rst
+++ /dev/null
@@ -1,191 +0,0 @@
-=========================
-Node scheduler properties
-=========================
-
-Splits
-------
-
-``node-scheduler.max-splits-per-node``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``100``
-
-The target value for the total number of splits that can be running for
-each worker node, assuming all splits have the standard split weight.
-
-Using a higher value is recommended, if queries are submitted in large batches
-(e.g., running a large group of reports periodically), or for connectors that
-produce many splits that complete quickly but do not support assigning split
-weight values to express that to the split scheduler. Increasing this value may
-improve query latency, by ensuring that the workers have enough splits to keep
-them fully utilized.
-
-When connectors do support weight based split scheduling, the number of splits
-assigned will depend on the weight of the individual splits. If splits are
-small, more of them are allowed to be assigned to each worker to compensate.
-
-Setting this too high wastes memory and may result in lower performance
-due to splits not being balanced across workers. Ideally, it should be set
-such that there is always at least one split waiting to be processed, but
-not higher.
-
-``node-scheduler.min-pending-splits-per-task``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``10``
-
-The minimum number of outstanding splits with the standard split weight guaranteed to be scheduled on a node (even when the node
-is already at the limit for total number of splits) for a single task given the task has remaining splits to process.
-Allowing a minimum number of splits per stage is required to prevent starvation and deadlocks.
-
-This value must be smaller or equal than ``max-adjusted-pending-splits-per-task`` and
-``node-scheduler.max-splits-per-node``, is usually increased for the same reasons,
-and has similar drawbacks if set too high.
-
-``node-scheduler.max-adjusted-pending-splits-per-task``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``2000``
-
-The maximum number of outstanding splits with the standard split weight guaranteed to be scheduled on a node (even when the node
-is already at the limit for total number of splits) for a single task given the task has remaining splits to process.
-Split queue size is adjusted dynamically during split scheduling and cannot exceed ``node-scheduler.max-adjusted-pending-splits-per-task``.
-Split queue size per task will be adjusted upward if node processes splits faster than it receives them.
-
-Usually increased for the same reasons as ``node-scheduler.max-splits-per-node``, with smaller drawbacks
-if set too high.
-
-.. note::
-
-    Only applies for ``uniform`` :ref:`scheduler policy <node-scheduler-policy>`.
-
-``node-scheduler.max-unacknowledged-splits-per-task``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``2000``
-
-Maximum number of splits that are either queued on the coordinator, but not yet sent or confirmed to have been received by
-the worker. This limit enforcement takes precedence over other existing split limit configurations
-like ``node-scheduler.max-splits-per-node`` or ``node-scheduler.max-adjusted-pending-splits-per-task``
-and is designed to prevent large task update requests that might cause a query to fail.
-
-``node-scheduler.min-candidates``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Minimum value:** ``1``
-* **Default value:** ``10``
-
-The minimum number of candidate nodes that are evaluated by the
-node scheduler when choosing the target node for a split. Setting
-this value too low may prevent splits from being properly balanced
-across all worker nodes. Setting it too high may increase query
-latency and increase CPU usage on the coordinator.
-
-.. _node-scheduler-policy:
-
-``node-scheduler.policy``
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Allowed values:** ``uniform``, ``topology``
-* **Default value:** ``uniform``
-
-Sets the node scheduler policy to use when scheduling splits. ``uniform``  attempts
-to schedule splits on the host where the data is located, while maintaining a uniform
-distribution across all hosts. ``topology`` tries to schedule splits according to
-the topology distance between nodes and splits. It is recommended to use ``uniform``
-for clusters where distributed storage runs on the same nodes as Trino workers.
-
-Network topology
-----------------
-
-``node-scheduler.network-topology.segments``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Default value:** ``machine``
-
-A comma-separated string describing the meaning of each segment of a network location.
-For example, setting ``region,rack,machine`` means a network location contains three segments.
-
-``node-scheduler.network-topology.type``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Allowed values:** ``flat``, ``file``, ``subnet``
-* **Default value:** ``flat``
-
-Sets the network topology type. To use this option, ``node-scheduler.policy``
-must be set to ``topology``.
-
-- ``flat``: the topology has only one segment, with one value for each machine.
-- ``file``: the topology is loaded from a file using the properties
-  ``node-scheduler.network-topology.file`` and
-  ``node-scheduler.network-topology.refresh-period`` described in the
-  following sections.
-- ``subnet``: the topology is derived based on subnet configuration provided
-  through properties ``node-scheduler.network-topology.subnet.cidr-prefix-lengths``
-  and ``node-scheduler.network-topology.subnet.ip-address-protocol`` described
-  in the following sections.
-
-File based network topology
----------------------------
-
-``node-scheduler.network-topology.file``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-
-Load the network topology from a file. To use this option, ``node-scheduler.network-topology.type``
-must be set to ``file``. Each line contains a mapping between a host name and a
-network location, separated by whitespace. Network location must begin with a leading
-``/`` and segments are separated by a ``/``.
-
-.. code-block:: text
-
-    192.168.0.1 /region1/rack1/machine1
-    192.168.0.2 /region1/rack1/machine2
-    hdfs01.example.com /region2/rack2/machine3
-
-``node-scheduler.network-topology.refresh-period``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Minimum value:** ``1ms``
-* **Default value:** ``5m``
-
-Controls how often the network topology file is reloaded.  To use this option,
-``node-scheduler.network-topology.type`` must be set to ``file``.
-
-Subnet based network topology
------------------------------
-
-``node-scheduler.network-topology.subnet.ip-address-protocol``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Allowed values:** ``IPv4``, ``IPv6``
-* **Default value:** ``IPv4``
-
-Sets the IP address protocol to be used for computing subnet based
-topology.  To use this option, ``node-scheduler.network-topology.type`` must
-be set to ``subnet``.
-
-``node-scheduler.network-topology.subnet.cidr-prefix-lengths``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-A comma-separated list of :ref:`prop-type-integer` values defining CIDR prefix
-lengths for subnet masks. The prefix lengths must be in increasing order. The
-maximum prefix length values for IPv4 and IPv6 protocols are 32 and 128
-respectively. To use this option, ``node-scheduler.network-topology.type`` must
-be set to ``subnet``.
-
-For example, the value ``24,25,27`` for this property with IPv4 protocol means
-that masks applied on the IP address to compute location segments are
-``255.255.255.0``, ``255.255.255.128`` and ``255.255.255.224``. So the segments
-created for an address ``192.168.0.172`` are ``[192.168.0.0, 192.168.0.128,
-192.168.0.160, 192.168.0.172]``.
diff --git a/docs/src/main/sphinx/admin/properties-optimizer.md b/docs/src/main/sphinx/admin/properties-optimizer.md
new file mode 100644
index 000000000000..9fc94c6ae6a1
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-optimizer.md
@@ -0,0 +1,258 @@
+# Optimizer properties
+
+## `optimizer.dictionary-aggregation`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `false`
+- **Session property:** `dictionary_aggregation`
+
+Enables optimization for aggregations on dictionaries.
+
+## `optimizer.optimize-hash-generation`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+- **Session property:** `optimize_hash_generation
+
+Compute hash codes for distribution, joins, and aggregations early during execution,
+allowing result to be shared between operations later in the query. This can reduce
+CPU usage by avoiding computing the same hash multiple times, but at the cost of
+additional network transfer for the hashes. In most cases it decreases overall
+query processing time.
+
+It is often helpful to disable this property, when using {doc}`/sql/explain` in order
+to make the query plan easier to read.
+
+## `optimizer.optimize-metadata-queries`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `false`
+
+Enable optimization of some aggregations by using values that are stored as metadata.
+This allows Trino to execute some simple queries in constant time. Currently, this
+optimization applies to `max`, `min` and `approx_distinct` of partition
+keys and other aggregation insensitive to the cardinality of the input,including
+`DISTINCT` aggregates. Using this may speed up some queries significantly.
+
+The main drawback is that it can produce incorrect results, if the connector returns
+partition keys for partitions that have no rows. In particular, the Hive connector
+can return empty partitions, if they were created by other systems. Trino cannot
+create them.
+
+## `optimizer.mark-distinct-strategy`
+
+- **Type:** {ref}`prop-type-string`
+- **Allowed values:** `AUTOMATIC`, `ALWAYS`, `NONE`
+- **Default value:** `AUTOMATIC`
+- **Session property:**  `mark_distinct_strategy`
+
+The mark distinct strategy to use for distinct aggregations. `NONE` does not use
+`MarkDistinct` operator.  `ALWAYS` uses `MarkDistinct` for multiple distinct
+aggregations or for mix of distinct and non-distinct aggregations.
+`AUTOMATIC` limits the use of `MarkDistinct` only for cases with limited
+concurrency (global or small cardinality aggregations), where direct distinct
+aggregation implementation cannot utilize CPU efficiently.
+
+## `optimizer.push-aggregation-through-outer-join`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+- **Session property:** `push_aggregation_through_join`
+
+When an aggregation is above an outer join and all columns from the outer side of the join
+are in the grouping clause, the aggregation is pushed below the outer join. This optimization
+is particularly useful for correlated scalar subqueries, which get rewritten to an aggregation
+over an outer join. For example:
+
+```
+SELECT * FROM item i
+    WHERE i.i_current_price > (
+        SELECT AVG(j.i_current_price) FROM item j
+            WHERE i.i_category = j.i_category);
+```
+
+Enabling this optimization can substantially speed up queries by reducing the
+amount of data that needs to be processed by the join. However, it may slow down
+some queries that have very selective joins.
+
+## `optimizer.push-table-write-through-union`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+- **Session property:** `push_table_write_through_union`
+
+Parallelize writes when using `UNION ALL` in queries that write data. This improves the
+speed of writing output tables in `UNION ALL` queries, because these writes do not require
+additional synchronization when collecting results. Enabling this optimization can improve
+`UNION ALL` speed, when write speed is not yet saturated. However, it may slow down queries
+in an already heavily loaded system.
+
+## `optimizer.join-reordering-strategy`
+
+- **Type:** {ref}`prop-type-string`
+- **Allowed values:** `AUTOMATIC`, `ELIMINATE_CROSS_JOINS`, `NONE`
+- **Default value:** `AUTOMATIC`
+- **Session property:** `join_reordering_strategy`
+
+The join reordering strategy to use.  `NONE` maintains the order the tables are listed in the
+query.  `ELIMINATE_CROSS_JOINS` reorders joins to eliminate cross joins, where possible, and
+otherwise maintains the original query order. When reordering joins, it also strives to maintain the
+original table order as much as possible. `AUTOMATIC` enumerates possible orders, and uses
+statistics-based cost estimation to determine the least cost order. If stats are not available, or if
+for any reason a cost could not be computed, the `ELIMINATE_CROSS_JOINS` strategy is used.
+
+## `optimizer.max-reordered-joins`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `9`
+
+When optimizer.join-reordering-strategy is set to cost-based, this property determines
+the maximum number of joins that can be reordered at once.
+
+:::{warning}
+The number of possible join orders scales factorially with the number of
+relations, so increasing this value can cause serious performance issues.
+:::
+
+## `optimizer.optimize-duplicate-insensitive-joins`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+
+Reduces number of rows produced by joins when optimizer detects that duplicated
+join output rows can be skipped.
+
+## `optimizer.use-exact-partitioning`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `false`
+
+Re-partition data unless the partitioning of the upstream
+{ref}`stage <trino-concept-stage>` exactly matches what the downstream stage
+expects. This can also be specified using the `use_exact_partitioning` session
+property.
+
+## `optimizer.use-table-scan-node-partitioning`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+
+Use connector provided table node partitioning when reading tables.
+For example, table node partitioning corresponds to Hive table buckets.
+When set to `true` and minimal partition to task ratio is matched or exceeded,
+each table partition is read by a separate worker. The minimal ratio is defined in
+`optimizer.table-scan-node-partitioning-min-bucket-to-task-ratio`.
+
+Partition reader assignments are distributed across workers for
+parallel processing. Use of table scan node partitioning can improve
+query performance by reducing query complexity. For example,
+cluster wide data reshuffling might not be needed when processing an aggregation query.
+However, query parallelism might be reduced when partition count is
+low compared to number of workers.
+
+## `optimizer.table-scan-node-partitioning-min-bucket-to-task-ratio`
+
+- **Type:** {ref}`prop-type-double`
+- **Default value:** `0.5`
+
+Specifies minimal bucket to task ratio that has to be matched or exceeded in order
+to use table scan node partitioning. When the table bucket count is small
+compared to the number of workers, then the table scan is distributed across
+all workers for improved parallelism.
+
+## `optimizer.colocated-joins-enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+- **Session property:** `colocated_join`
+
+Use co-located joins when both sides of a join have the same table partitioning on the join keys
+and the conditions for `optimizer.use-table-scan-node-partitioning` are met.
+For example, a join on bucketed Hive tables with matching bucketing schemes can
+avoid exchanging data between workers using a co-located join to improve query performance.
+
+## `optimizer.filter-conjunction-independence-factor`
+
+- **Type:** {ref}`prop-type-double`
+- **Default value:** `0.75`
+- **Min allowed value:** `0`
+- **Max allowed value:** `1`
+
+Scales the strength of independence assumption for estimating the selectivity of
+the conjunction of multiple predicates. Lower values for this property will produce
+more conservative estimates by assuming a greater degree of correlation between the
+columns of the predicates in a conjunction. A value of `0` results in the
+optimizer assuming that the columns of the predicates are fully correlated and only
+the most selective predicate drives the selectivity of a conjunction of predicates.
+
+## `optimizer.join-multi-clause-independence-factor`
+
+- **Type:** {ref}`prop-type-double`
+- **Default value:** `0.25`
+- **Min allowed value:** `0`
+- **Max allowed value:** `1`
+
+Scales the strength of independence assumption for estimating the output of a
+multi-clause join. Lower values for this property will produce more
+conservative estimates by assuming a greater degree of correlation between the
+columns of the clauses in a join. A value of `0` results in the optimizer
+assuming that the columns of the join clauses are fully correlated and only
+the most selective clause drives the selectivity of the join.
+
+## `optimizer.non-estimatable-predicate-approximation.enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+
+Enables approximation of the output row count of filters whose costs cannot be
+accurately estimated even with complete statistics. This allows the optimizer to
+produce more efficient plans in the presence of filters which were previously
+not estimated.
+
+## `optimizer.join-partitioned-build-min-row-count`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `1000000`
+- **Min allowed value:** `0`
+
+The minimum number of join build side rows required to use partitioned join lookup.
+If the build side of a join is estimated to be smaller than the configured threshold,
+single threaded join lookup is used to improve join performance.
+A value of `0` disables this optimization.
+
+## `optimizer.min-input-size-per-task`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `5GB`
+- **Min allowed value:** `0MB`
+- **Session property:** `min_input_size_per_task`
+
+The minimum input size required per task. This will help optimizer to determine hash
+partition count for joins and aggregations. Limiting hash partition count for small queries
+increases concurrency on large clusters where multiple small queries are running concurrently.
+The estimated value will always be between `min_hash_partition_count` and
+`max_hash_partition_count` session property.
+A value of `0MB` disables this optimization.
+
+## `optimizer.min-input-rows-per-task`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `10000000`
+- **Min allowed value:** `0`
+- **Session property:** `min_input_rows_per_task`
+
+The minimum number of input rows required per task. This will help optimizer to determine hash
+partition count for joins and aggregations. Limiting hash partition count for small queries
+increases concurrency on large clusters where multiple small queries are running concurrently.
+The estimated value will always be between `min_hash_partition_count` and
+`max_hash_partition_count` session property.
+A value of `0` disables this optimization.
+
+## `optimizer.use-cost-based-partitioning`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+- **Session property:** `use_cost_based_partitioning`
+
+When enabled the cost based optimizer is used to determine if repartitioning the output of an
+already partitioned stage is necessary.
diff --git a/docs/src/main/sphinx/admin/properties-optimizer.rst b/docs/src/main/sphinx/admin/properties-optimizer.rst
deleted file mode 100644
index cb676d8fc307..000000000000
--- a/docs/src/main/sphinx/admin/properties-optimizer.rst
+++ /dev/null
@@ -1,284 +0,0 @@
-====================
-Optimizer properties
-====================
-
-``optimizer.dictionary-aggregation``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``false``
-
-Enables optimization for aggregations on dictionaries. This can also be specified
-on a per-query basis using the ``dictionary_aggregation`` session property.
-
-``optimizer.optimize-hash-generation``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Compute hash codes for distribution, joins, and aggregations early during execution,
-allowing result to be shared between operations later in the query. This can reduce
-CPU usage by avoiding computing the same hash multiple times, but at the cost of
-additional network transfer for the hashes. In most cases it decreases overall
-query processing time. This can also be specified on a per-query basis using the
-``optimize_hash_generation`` session property.
-
-It is often helpful to disable this property, when using :doc:`/sql/explain` in order
-to make the query plan easier to read.
-
-``optimizer.optimize-metadata-queries``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``false``
-
-Enable optimization of some aggregations by using values that are stored as metadata.
-This allows Trino to execute some simple queries in constant time. Currently, this
-optimization applies to ``max``, ``min`` and ``approx_distinct`` of partition
-keys and other aggregation insensitive to the cardinality of the input,including
-``DISTINCT`` aggregates. Using this may speed up some queries significantly.
-
-The main drawback is that it can produce incorrect results, if the connector returns
-partition keys for partitions that have no rows. In particular, the Hive connector
-can return empty partitions, if they were created by other systems. Trino cannot
-create them.
-
-``optimizer.mark-distinct-strategy``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Allowed values:** ``AUTOMATIC``, ``ALWAYS``, ``NONE``
-* **Default value:** ``AUTOMATIC``
-
-The mark distinct strategy to use for distinct aggregations. ``NONE`` does not use
-``MarkDistinct`` operator.  ``ALWAYS`` uses ``MarkDistinct`` for multiple distinct
-aggregations or for mix of distinct and non-distinct aggregations.
-``AUTOMATIC`` limits the use of ``MarkDistinct`` only for cases with limited
-concurrency (global or small cardinality aggregations), where direct distinct
-aggregation implementation cannot utilize CPU efficiently.
-``optimizer.mark-distinct-strategy`` overrides, if set, the deprecated
-``optimizer.use-mark-distinct``. If ``optimizer.mark-distinct-strategy`` is not
-set, but ``optimizer.use-mark-distinct`` is then ``optimizer.use-mark-distinct``
-is mapped to ``optimizer.mark-distinct-strategy`` with value ``true`` mapped to
-``AUTOMATIC`` and value ``false`` mapped to ``NONE``.The strategy can be specified
-on a per-query basis using the ``mark_distinct_strategy`` session property.
-
-``optimizer.push-aggregation-through-outer-join``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-When an aggregation is above an outer join and all columns from the outer side of the join
-are in the grouping clause, the aggregation is pushed below the outer join. This optimization
-is particularly useful for correlated scalar subqueries, which get rewritten to an aggregation
-over an outer join. For example::
-
-    SELECT * FROM item i
-        WHERE i.i_current_price > (
-            SELECT AVG(j.i_current_price) FROM item j
-                WHERE i.i_category = j.i_category);
-
-Enabling this optimization can substantially speed up queries by reducing
-the amount of data that needs to be processed by the join.  However, it may slow down some
-queries that have very selective joins. This can also be specified on a per-query basis using
-the ``push_aggregation_through_join`` session property.
-
-``optimizer.push-table-write-through-union``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Parallelize writes when using ``UNION ALL`` in queries that write data. This improves the
-speed of writing output tables in ``UNION ALL`` queries, because these writes do not require
-additional synchronization when collecting results. Enabling this optimization can improve
-``UNION ALL`` speed, when write speed is not yet saturated. However, it may slow down queries
-in an already heavily loaded system. This can also be specified on a per-query basis
-using the ``push_table_write_through_union`` session property.
-
-
-``optimizer.join-reordering-strategy``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Allowed values:** ``AUTOMATIC``, ``ELIMINATE_CROSS_JOINS``, ``NONE``
-* **Default value:** ``AUTOMATIC``
-
-The join reordering strategy to use.  ``NONE`` maintains the order the tables are listed in the
-query.  ``ELIMINATE_CROSS_JOINS`` reorders joins to eliminate cross joins, where possible, and
-otherwise maintains the original query order. When reordering joins, it also strives to maintain the
-original table order as much as possible. ``AUTOMATIC`` enumerates possible orders, and uses
-statistics-based cost estimation to determine the least cost order. If stats are not available, or if
-for any reason a cost could not be computed, the ``ELIMINATE_CROSS_JOINS`` strategy is used. This can
-be specified on a per-query basis using the ``join_reordering_strategy`` session property.
-
-``optimizer.max-reordered-joins``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``9``
-
-When optimizer.join-reordering-strategy is set to cost-based, this property determines
-the maximum number of joins that can be reordered at once.
-
-.. warning::
-
-    The number of possible join orders scales factorially with the number of
-    relations, so increasing this value can cause serious performance issues.
-
-``optimizer.optimize-duplicate-insensitive-joins``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Reduces number of rows produced by joins when optimizer detects that duplicated
-join output rows can be skipped.
-
-``optimizer.use-exact-partitioning``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``false``
-
-Re-partition data unless the partitioning of the upstream
-:ref:`stage <trino-concept-stage>` exactly matches what the downstream stage
-expects. This can also be specified using the ``use_exact_partitioning`` session
-property.
-
-``optimizer.use-table-scan-node-partitioning``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Use connector provided table node partitioning when reading tables.
-For example, table node partitioning corresponds to Hive table buckets.
-When set to ``true`` and minimal partition to task ratio is matched or exceeded,
-each table partition is read by a separate worker. The minimal ratio is defined in
-``optimizer.table-scan-node-partitioning-min-bucket-to-task-ratio``.
-
-Partition reader assignments are distributed across workers for
-parallel processing. Use of table scan node partitioning can improve
-query performance by reducing query complexity. For example,
-cluster wide data reshuffling might not be needed when processing an aggregation query.
-However, query parallelism might be reduced when partition count is
-low compared to number of workers.
-
-``optimizer.table-scan-node-partitioning-min-bucket-to-task-ratio``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-double`
-* **Default value:** ``0.5``
-
-Specifies minimal bucket to task ratio that has to be matched or exceeded in order
-to use table scan node partitioning. When the table bucket count is small
-compared to the number of workers, then the table scan is distributed across
-all workers for improved parallelism.
-
-``optimizer.colocated-joins-enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-* **Session property:** ``colocated_join``
-
-Use co-located joins when both sides of a join have the same table partitioning on the join keys
-and the conditions for ``optimizer.use-table-scan-node-partitioning`` are met.
-For example, a join on bucketed Hive tables with matching bucketing schemes can
-avoid exchanging data between workers using a co-located join to improve query performance.
-
-``optimizer.filter-conjunction-independence-factor``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-double`
-* **Default value:** ``0.75``
-* **Min allowed value:** ``0``
-* **Max allowed value:** ``1``
-
-Scales the strength of independence assumption for estimating the selectivity of
-the conjunction of multiple predicates. Lower values for this property will produce
-more conservative estimates by assuming a greater degree of correlation between the
-columns of the predicates in a conjunction. A value of ``0`` results in the
-optimizer assuming that the columns of the predicates are fully correlated and only
-the most selective predicate drives the selectivity of a conjunction of predicates.
-
-``optimizer.join-multi-clause-independence-factor``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-double`
-* **Default value:** ``0.25``
-* **Min allowed value:** ``0``
-* **Max allowed value:** ``1``
-
-Scales the strength of independence assumption for estimating the output of a
-multi-clause join. Lower values for this property will produce more
-conservative estimates by assuming a greater degree of correlation between the
-columns of the clauses in a join. A value of ``0`` results in the optimizer
-assuming that the columns of the join clauses are fully correlated and only
-the most selective clause drives the selectivity of the join.
-
-``optimizer.non-estimatable-predicate-approximation.enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Enables approximation of the output row count of filters whose costs cannot be
-accurately estimated even with complete statistics. This allows the optimizer to
-produce more efficient plans in the presence of filters which were previously
-not estimated.
-
-``optimizer.join-partitioned-build-min-row-count``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``1000000``
-* **Min allowed value:** ``0``
-
-The minimum number of join build side rows required to use partitioned join lookup.
-If the build side of a join is estimated to be smaller than the configured threshold,
-single threaded join lookup is used to improve join performance.
-A value of ``0`` disables this optimization.
-
-``optimizer.min-input-size-per-task``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``5GB``
-* **Min allowed value:** ``0MB``
-* **Session property:** ``min_input_size_per_task``
-
-The minimum input size required per task. This will help optimizer to determine hash
-partition count for joins and aggregations. Limiting hash partition count for small queries
-increases concurrency on large clusters where multiple small queries are running concurrently.
-The estimated value will always be between ``min_hash_partition_count`` and
-``max_hash_partition_count`` session property.
-A value of ``0MB`` disables this optimization.
-
-``optimizer.min-input-rows-per-task``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``10000000``
-* **Min allowed value:** ``0``
-* **Session property:** ``min_input_rows_per_task``
-
-The minimum number of input rows required per task. This will help optimizer to determine hash
-partition count for joins and aggregations. Limiting hash partition count for small queries
-increases concurrency on large clusters where multiple small queries are running concurrently.
-The estimated value will always be between ``min_hash_partition_count`` and
-``max_hash_partition_count`` session property.
-A value of ``0`` disables this optimization.
-
-``optimizer.use-cost-based-partitioning``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-* **Session property:** ``use_cost_based_partitioning``
-
-When enabled the cost based optimizer is used to determine if repartitioning the output of an
-already partitioned stage is necessary.
diff --git a/docs/src/main/sphinx/admin/properties-query-management.md b/docs/src/main/sphinx/admin/properties-query-management.md
new file mode 100644
index 000000000000..6f1e95ad960f
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-query-management.md
@@ -0,0 +1,278 @@
+# Query management properties
+
+## `query.client.timeout`
+
+- **Type:** {ref}`prop-type-duration`
+- **Default value:** `5m`
+
+Configures how long the cluster runs without contact from the client
+application, such as the CLI, before it abandons and cancels its work.
+
+## `query.execution-policy`
+
+- **Type:** {ref}`prop-type-string`
+- **Default value:** `phased`
+- **Session property:** `execution_policy`
+
+Configures the algorithm to organize the processing of all of the
+stages of a query. You can use the following execution policies:
+
+- `phased` schedules stages in a sequence to avoid blockages because of
+  inter-stage dependencies. This policy maximizes cluster resource utilization
+  and provides the lowest query wall time.
+- `all-at-once` schedules all of the stages of a query at one time. As a
+  result, cluster resource utilization is initially high, but inter-stage
+  dependencies typically prevent full processing and cause longer queue times
+  which increases the query wall time overall.
+
+## `query.determine-partition-count-for-write-enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `false`
+- **Session property:** `determine_partition_count_for_write_enabled`
+
+Enables determining the number of partitions based on amount of data read and processed by the
+query for write queries.
+
+## `query.max-hash-partition-count`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `100`
+- **Session property:** `max_hash_partition_count`
+
+The maximum number of partitions to use for processing distributed operations, such as
+joins, aggregations, partitioned window functions and others.
+
+## `query.min-hash-partition-count`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `4`
+- **Session property:** `min_hash_partition_count`
+
+The minimum number of partitions to use for processing distributed operations, such as
+joins, aggregations, partitioned window functions and others.
+
+## `query.min-hash-partition-count-for-write`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `50`
+- **Session property:** `min_hash_partition_count_for_writre`
+
+The minimum number of partitions to use for processing distributed operations in write queries,
+such as joins, aggregations, partitioned window functions and others.
+
+## `query.max-writer-tasks-count`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `100`
+- **Session property:** `max_writer_tasks_count`
+
+The maximum number of tasks that will take part in writing data during
+`INSERT`, `CREATE TABLE AS SELECT` and `EXECUTE` queries.
+The limit is only applicable when `redistribute-writes` or `scale-writers` is be enabled.
+
+## `query.low-memory-killer.policy`
+
+- **Type:** {ref}`prop-type-string`
+- **Default value:** `total-reservation-on-blocked-nodes`
+
+Configures the behavior to handle killing running queries in the event of low
+memory availability. Supports the following values:
+
+- `none` - Do not kill any queries in the event of low memory.
+- `total-reservation` - Kill the query currently using the most total memory.
+- `total-reservation-on-blocked-nodes` - Kill the query currently using the
+  most memory specifically on nodes that are now out of memory.
+
+:::{note}
+Only applies for queries with task level retries disabled (`retry-policy` set to `NONE` or `QUERY`)
+:::
+
+## `task.low-memory-killer.policy`
+
+- **Type:** {ref}`prop-type-string`
+- **Default value:** `total-reservation-on-blocked-nodes`
+
+Configures the behavior to handle killing running tasks in the event of low
+memory availability. Supports the following values:
+
+- `none` - Do not kill any tasks in the event of low memory.
+- `total-reservation-on-blocked-nodes` - Kill the tasks which are part of the queries
+  which has task retries enabled and are currently using the most memory specifically
+  on nodes that are now out of memory.
+- `least-waste` - Kill the tasks which are part of the queries
+  which has task retries enabled and use significant amount of memory on nodes
+  which are now out of memory. This policy avoids killing tasks which are already
+  executing for a long time, so significant amount of work is not wasted.
+
+:::{note}
+Only applies for queries with task level retries enabled (`retry-policy=TASK`)
+:::
+
+## `query.low-memory-killer.delay`
+
+- **Type:** {ref}`prop-type-duration`
+- **Default value:** `5m`
+
+The amount of time a query is allowed to recover between running out of memory
+and being killed, if `query.low-memory-killer.policy` or
+`task.low-memory-killer.policy` is set to value differnt than `none`.
+
+## `query.max-execution-time`
+
+- **Type:** {ref}`prop-type-duration`
+- **Default value:** `100d`
+- **Session property:** `query_max_execution_time`
+
+The maximum allowed time for a query to be actively executing on the
+cluster, before it is terminated. Compared to the run time below, execution
+time does not include analysis, query planning or wait times in a queue.
+
+## `query.max-length`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `1,000,000`
+- **Maximum value:** `1,000,000,000`
+
+The maximum number of characters allowed for the SQL query text. Longer queries
+are not processed, and terminated with error `QUERY_TEXT_TOO_LARGE`.
+
+## `query.max-planning-time`
+
+- **Type:** {ref}`prop-type-duration`
+- **Default value:** `10m`
+- **Session property:** `query_max_planning_time`
+
+The maximum allowed time for a query to be actively planning the execution.
+After this period the coordinator will make its best effort to stop the
+query. Note that some operations in planning phase are not easily cancellable
+and may not terminate immediately.
+
+## `query.max-run-time`
+
+- **Type:** {ref}`prop-type-duration`
+- **Default value:** `100d`
+- **Session property:** `query_max_run_time`
+
+The maximum allowed time for a query to be processed on the cluster, before
+it is terminated. The time includes time for analysis and planning, but also
+time spend in a queue waiting, so essentially this is the time allowed for a
+query to exist since creation.
+
+## `query.max-scan-physical-bytes`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Session property:** `query_max_scan_physical_bytes`
+
+The maximum number of bytes that can be scanned by a query during its execution.
+When this limit is reached, query processing is terminated to prevent excessive
+resource usage.
+
+## `query.max-stage-count`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `150`
+- **Minimum value:** `1`
+
+The maximum number of stages allowed to be generated per query. If a query
+generates more stages than this it will get killed with error
+`QUERY_HAS_TOO_MANY_STAGES`.
+
+:::{warning}
+Setting this to a high value can cause queries with large number of
+stages to introduce instability in the cluster causing unrelated queries
+to get killed with `REMOTE_TASK_ERROR` and the message
+`Max requests queued per destination exceeded for HttpDestination ...`
+:::
+
+## `query.max-history`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `100`
+
+The maximum number of queries to keep in the query history to provide
+statistics and other information. If this amount is reached, queries are
+removed based on age.
+
+## `query.min-expire-age`
+
+- **Type:** {ref}`prop-type-duration`
+- **Default value:** `15m`
+
+The minimal age of a query in the history before it is expired. An expired
+query is removed from the query history buffer and no longer available in
+the {doc}`/admin/web-interface`.
+
+## `query.remote-task.enable-adaptive-request-size`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+- **Session property:** `query_remote_task_enable_adaptive_request_size`
+
+Enables dynamically splitting up server requests sent by tasks, which can
+prevent out-of-memory errors for large schemas. The default settings are
+optimized for typical usage and should only be modified by advanced users
+working with extremely large tables.
+
+## `query.remote-task.guaranteed-splits-per-task`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `3`
+- **Session property:** `query_remote_task_guaranteed_splits_per_task`
+
+The minimum number of splits that should be assigned to each remote task to
+ensure that each task has a minimum amount of work to perform. Requires
+`query.remote-task.enable-adaptive-request-size` to be enabled.
+
+## `query.remote-task.max-error-duration`
+
+- **Type:** {ref}`prop-type-duration`
+- **Default value:** `5m`
+
+Timeout value for remote tasks that fail to communicate with the coordinator. If
+the coordinator is unable to receive updates from a remote task before this
+value is reached, the coordinator treats the task as failed.
+
+## `query.remote-task.max-request-size`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `8MB`
+- **Session property:** `query_remote_task_max_request_size`
+
+The maximum size of a single request made by a remote task. Requires
+`query.remote-task.enable-adaptive-request-size` to be enabled.
+
+## `query.remote-task.request-size-headroom`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `2MB`
+- **Session property:** `query_remote_task_request_size_headroom`
+
+Determines the amount of headroom that should be allocated beyond the size of
+the request data. Requires `query.remote-task.enable-adaptive-request-size` to
+be enabled.
+
+## `query.info-url-template`
+
+- **Type:** {ref}`prop-type-string`
+- **Default value:** `(URL of the query info page on the coordinator)`
+
+Configure redirection of clients to an alternative location for query
+information. The URL must contain a query id placeholder `${QUERY_ID}`.
+
+For example `https://example.com/query/${QUERY_ID}`.
+
+The `${QUERY_ID}` gets replaced with the actual query's id.
+
+## `retry-policy`
+
+- **Type:** {ref}`prop-type-string`
+- **Default value:** `NONE`
+
+The {ref}`retry policy <fte-retry-policy>` to use for
+{doc}`/admin/fault-tolerant-execution`. Supports the following values:
+
+- `NONE` - Disable fault-tolerant execution.
+- `TASK` - Retry individual tasks within a query in the event of failure.
+  Requires configuration of an {ref}`exchange manager <fte-exchange-manager>`.
+- `QUERY` - Retry the whole query in the event of failure.
diff --git a/docs/src/main/sphinx/admin/properties-query-management.rst b/docs/src/main/sphinx/admin/properties-query-management.rst
deleted file mode 100644
index 6709dd557a0f..000000000000
--- a/docs/src/main/sphinx/admin/properties-query-management.rst
+++ /dev/null
@@ -1,261 +0,0 @@
-===========================
-Query management properties
-===========================
-
-``query.client.timeout``
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Default value:** ``5m``
-
-Configures how long the cluster runs without contact from the client
-application, such as the CLI, before it abandons and cancels its work.
-
-``query.execution-policy``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Default value:** ``phased``
-* **Session property:** ``execution_policy``
-
-Configures the algorithm to organize the processing of all of the
-stages of a query. You can use the following execution policies:
-
-* ``phased`` schedules stages in a sequence to avoid blockages because of
-  inter-stage dependencies. This policy maximizes cluster resource utilization
-  and provides the lowest query wall time.
-* ``all-at-once`` schedules all of the stages of a query at one time. As a
-  result, cluster resource utilization is initially high, but inter-stage
-  dependencies typically prevent full processing and cause longer queue times
-  which increases the query wall time overall.
-
-``query.max-hash-partition-count``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``100``
-* **Session property:** ``max_hash_partition_count``
-
-The maximum number of partitions to use for processing distributed operations, such as
-joins, aggregations, partitioned window functions and others.
-
-``query.min-hash-partition-count``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``4``
-* **Session property:** ``min_hash_partition_count``
-
-The minimum number of partitions to use for processing distributed operations, such as
-joins, aggregations, partitioned window functions and others.
-
-``query.max-writer-tasks-count``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``100``
-* **Session property:** ``max_writer_tasks_count``
-
-The maximum number of tasks that will take part in writing data during
-``INSERT``, ``CREATE TABLE AS SELECT`` and ``EXECUTE`` queries.
-The limit is only applicable when ``redistribute-writes`` or ``scale-writers`` is be enabled.
-
-``query.low-memory-killer.policy``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Default value:** ``total-reservation-on-blocked-nodes``
-
-Configures the behavior to handle killing running queries in the event of low
-memory availability. Supports the following values:
-
-* ``none`` - Do not kill any queries in the event of low memory.
-* ``total-reservation`` - Kill the query currently using the most total memory.
-* ``total-reservation-on-blocked-nodes`` - Kill the query currently using the
-  most memory specifically on nodes that are now out of memory.
-
-.. note::
-
-    Only applies for queries with task level retries disabled (``retry-policy`` set to ``NONE`` or ``QUERY``)
-
-``task.low-memory-killer.policy``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Default value:** ``total-reservation-on-blocked-nodes``
-
-Configures the behavior to handle killing running tasks in the event of low
-memory availability. Supports the following values:
-
-* ``none`` - Do not kill any tasks in the event of low memory.
-* ``total-reservation-on-blocked-nodes`` - Kill the tasks which are part of the queries
-  which has task retries enabled and are currently using the most memory specifically
-  on nodes that are now out of memory.
-* ``least-waste`` - Kill the tasks which are part of the queries
-  which has task retries enabled and use significant amount of memory on nodes
-  which are now out of memory. This policy avoids killing tasks which are already
-  executing for a long time, so significant amount of work is not wasted.
-
-.. note::
-
-    Only applies for queries with task level retries enabled (``retry-policy=TASK``)
-
-``query.low-memory-killer.delay``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Default value:** ``5m``
-
-The amount of time a query is allowed to recover between running out of memory
-and being killed, if ``query.low-memory-killer.policy`` or
-``task.low-memory-killer.policy`` is set to value differnt than ``none``.
-
-``query.max-execution-time``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Default value:** ``100d``
-* **Session property:** ``query_max_execution_time``
-
-The maximum allowed time for a query to be actively executing on the
-cluster, before it is terminated. Compared to the run time below, execution
-time does not include analysis, query planning or wait times in a queue.
-
-``query.max-length``
-^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``1,000,000``
-* **Maximum value:** ``1,000,000,000``
-
-The maximum number of characters allowed for the SQL query text. Longer queries
-are not processed, and terminated with error ``QUERY_TEXT_TOO_LARGE``.
-
-``query.max-planning-time``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Default value:** ``10m``
-* **Session property:** ``query_max_planning_time``
-
-The maximum allowed time for a query to be actively planning the execution.
-After this period the coordinator will make its best effort to stop the
-query. Note that some operations in planning phase are not easily cancellable
-and may not terminate immediately.
-
-``query.max-run-time``
-^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Default value:** ``100d``
-* **Session property:** ``query_max_run_time``
-
-The maximum allowed time for a query to be processed on the cluster, before
-it is terminated. The time includes time for analysis and planning, but also
-time spend in a queue waiting, so essentially this is the time allowed for a
-query to exist since creation.
-
-``query.max-stage-count``
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``150``
-* **Minimum value:** ``1``
-
-The maximum number of stages allowed to be generated per query. If a query
-generates more stages than this it will get killed with error
-``QUERY_HAS_TOO_MANY_STAGES``.
-
-.. warning::
-
-    Setting this to a high value can cause queries with large number of
-    stages to introduce instability in the cluster causing unrelated queries
-    to get killed with ``REMOTE_TASK_ERROR`` and the message
-    ``Max requests queued per destination exceeded for HttpDestination ...``
-
-``query.max-history``
-^^^^^^^^^^^^^^^^^^^^^
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``100``
-
-The maximum number of queries to keep in the query history to provide
-statistics and other information. If this amount is reached, queries are
-removed based on age.
-
-``query.min-expire-age``
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Default value:** ``15m``
-
-The minimal age of a query in the history before it is expired. An expired
-query is removed from the query history buffer and no longer available in
-the :doc:`/admin/web-interface`.
-
-``query.remote-task.enable-adaptive-request-size``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-* **Session property:** ``query_remote_task_enable_adaptive_request_size``
-
-Enables dynamically splitting up server requests sent by tasks, which can
-prevent out-of-memory errors for large schemas. The default settings are
-optimized for typical usage and should only be modified by advanced users
-working with extremely large tables.
-
-``query.remote-task.guaranteed-splits-per-task``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``3``
-* **Session property:** ``query_remote_task_guaranteed_splits_per_task``
-
-The minimum number of splits that should be assigned to each remote task to
-ensure that each task has a minimum amount of work to perform. Requires
-``query.remote-task.enable-adaptive-request-size`` to be enabled.
-
-``query.remote-task.max-error-duration``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Default value:** ``5m``
-
-Timeout value for remote tasks that fail to communicate with the coordinator. If
-the coordinator is unable to receive updates from a remote task before this
-value is reached, the coordinator treats the task as failed.
-
-``query.remote-task.max-request-size``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``8MB``
-* **Session property:** ``query_remote_task_max_request_size``
-
-The maximum size of a single request made by a remote task. Requires
-``query.remote-task.enable-adaptive-request-size`` to be enabled.
-
-``query.remote-task.request-size-headroom``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``2MB``
-* **Session property:** ``query_remote_task_request_size_headroom``
-
-Determines the amount of headroom that should be allocated beyond the size of
-the request data. Requires ``query.remote-task.enable-adaptive-request-size`` to
-be enabled.
-
-``retry-policy``
-^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Default value:** ``NONE``
-
-The :ref:`retry policy <fte-retry-policy>` to use for
-:doc:`/admin/fault-tolerant-execution`. Supports the following values:
-
-* ``NONE`` - Disable fault-tolerant execution.
-* ``TASK`` - Retry individual tasks within a query in the event of failure.
-  Requires configuration of an :ref:`exchange manager <fte-exchange-manager>`.
-* ``QUERY`` - Retry the whole query in the event of failure.
diff --git a/docs/src/main/sphinx/admin/properties-regexp-function.md b/docs/src/main/sphinx/admin/properties-regexp-function.md
new file mode 100644
index 000000000000..caaa028975de
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-regexp-function.md
@@ -0,0 +1,42 @@
+# Regular expression function properties
+
+These properties allow tuning the {doc}`/functions/regexp`.
+
+## `regex-library`
+
+- **Type:** {ref}`prop-type-string`
+- **Allowed values:** `JONI`, `RE2J`
+- **Default value:** `JONI`
+
+Which library to use for regular expression functions.
+`JONI` is generally faster for common usage, but can require exponential
+time for certain expression patterns. `RE2J` uses a different algorithm,
+which guarantees linear time, but is often slower.
+
+## `re2j.dfa-states-limit`
+
+- **Type:** {ref}`prop-type-integer`
+- **Minimum value:** `2`
+- **Default value:** `2147483647`
+
+The maximum number of states to use when RE2J builds the fast,
+but potentially memory intensive, deterministic finite automaton (DFA)
+for regular expression matching. If the limit is reached, RE2J falls
+back to the algorithm that uses the slower, but less memory intensive
+non-deterministic finite automaton (NFA). Decreasing this value decreases the
+maximum memory footprint of a regular expression search at the cost of speed.
+
+## `re2j.dfa-retries`
+
+- **Type:** {ref}`prop-type-integer`
+- **Minimum value:** `0`
+- **Default value:** `5`
+
+The number of times that RE2J retries the DFA algorithm, when
+it reaches a states limit before using the slower, but less memory
+intensive NFA algorithm, for all future inputs for that search. If hitting the
+limit for a given input row is likely to be an outlier, you want to be able
+to process subsequent rows using the faster DFA algorithm. If you are likely
+to hit the limit on matches for subsequent rows as well, you want to use the
+correct algorithm from the beginning so as not to waste time and resources.
+The more rows you are processing, the larger this value should be.
diff --git a/docs/src/main/sphinx/admin/properties-regexp-function.rst b/docs/src/main/sphinx/admin/properties-regexp-function.rst
deleted file mode 100644
index 18a94e33014e..000000000000
--- a/docs/src/main/sphinx/admin/properties-regexp-function.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-======================================
-Regular expression function properties
-======================================
-
-These properties allow tuning the :doc:`/functions/regexp`.
-
-``regex-library``
-^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Allowed values:** ``JONI``, ``RE2J``
-* **Default value:** ``JONI``
-
-Which library to use for regular expression functions.
-``JONI`` is generally faster for common usage, but can require exponential
-time for certain expression patterns. ``RE2J`` uses a different algorithm,
-which guarantees linear time, but is often slower.
-
-``re2j.dfa-states-limit``
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Minimum value:** ``2``
-* **Default value:** ``2147483647``
-
-The maximum number of states to use when RE2J builds the fast,
-but potentially memory intensive, deterministic finite automaton (DFA)
-for regular expression matching. If the limit is reached, RE2J falls
-back to the algorithm that uses the slower, but less memory intensive
-non-deterministic finite automaton (NFA). Decreasing this value decreases the
-maximum memory footprint of a regular expression search at the cost of speed.
-
-``re2j.dfa-retries``
-^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Minimum value:** ``0``
-* **Default value:** ``5``
-
-The number of times that RE2J retries the DFA algorithm, when
-it reaches a states limit before using the slower, but less memory
-intensive NFA algorithm, for all future inputs for that search. If hitting the
-limit for a given input row is likely to be an outlier, you want to be able
-to process subsequent rows using the faster DFA algorithm. If you are likely
-to hit the limit on matches for subsequent rows as well, you want to use the
-correct algorithm from the beginning so as not to waste time and resources.
-The more rows you are processing, the larger this value should be.
diff --git a/docs/src/main/sphinx/admin/properties-resource-management.md b/docs/src/main/sphinx/admin/properties-resource-management.md
new file mode 100644
index 000000000000..9c6bb21ba9da
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-resource-management.md
@@ -0,0 +1,105 @@
+# Resource management properties
+
+(prop-resource-query-max-cpu-time)=
+
+## `query.max-cpu-time`
+
+- **Type:** {ref}`prop-type-duration`
+- **Default value:** `1_000_000_000d`
+
+This is the max amount of CPU time that a query can use across the entire
+cluster. Queries that exceed this limit are killed.
+
+(prop-resource-query-max-memory-per-node)=
+
+## `query.max-memory-per-node`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** (JVM max memory * 0.3)
+
+This is the max amount of user memory a query can use on a worker.
+User memory is allocated during execution for things that are directly
+attributable to, or controllable by, a user query. For example, memory used
+by the hash tables built during execution, memory used during sorting, etc.
+When the user memory allocation of a query on any worker hits this limit,
+it is killed.
+
+:::{warning}
+The sum of {ref}`prop-resource-query-max-memory-per-node` and
+{ref}`prop-resource-memory-heap-headroom-per-node` must be less than the
+maximum heap size in the JVM on the node. See {ref}`jvm-config`.
+:::
+
+:::{note}
+Does not apply for queries with task level retries enabled (`retry-policy=TASK`)
+:::
+
+(prop-resource-query-max-memory)=
+
+## `query.max-memory`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `20GB`
+
+This is the max amount of user memory a query can use across the entire cluster.
+User memory is allocated during execution for things that are directly
+attributable to, or controllable by, a user query. For example, memory used
+by the hash tables built during execution, memory used during sorting, etc.
+When the user memory allocation of a query across all workers hits this limit
+it is killed.
+
+:::{warning}
+{ref}`prop-resource-query-max-total-memory` must be greater than
+{ref}`prop-resource-query-max-memory`.
+:::
+
+:::{note}
+Does not apply for queries with task level retries enabled (`retry-policy=TASK`)
+:::
+
+(prop-resource-query-max-total-memory)=
+
+## `query.max-total-memory`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** (`query.max-memory` * 2)
+
+This is the max amount of memory a query can use across the entire cluster,
+including revocable memory. When the memory allocated by a query across all
+workers hits this limit it is killed. The value of `query.max-total-memory`
+must be greater than `query.max-memory`.
+
+:::{warning}
+{ref}`prop-resource-query-max-total-memory` must be greater than
+{ref}`prop-resource-query-max-memory`.
+:::
+
+:::{note}
+Does not apply for queries with task level retries enabled (`retry-policy=TASK`)
+:::
+
+(prop-resource-memory-heap-headroom-per-node)=
+
+## `memory.heap-headroom-per-node`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** (JVM max memory * 0.3)
+
+This is the amount of memory set aside as headroom/buffer in the JVM heap
+for allocations that are not tracked by Trino.
+
+:::{warning}
+The sum of {ref}`prop-resource-query-max-memory-per-node` and
+{ref}`prop-resource-memory-heap-headroom-per-node` must be less than the
+maximum heap size in the JVM on the node. See {ref}`jvm-config`.
+:::
+
+(prop-resource-exchange-deduplication-buffer-size)=
+
+## `exchange.deduplication-buffer-size`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `32MB`
+
+Size of the buffer used for spooled data during
+{doc}`/admin/fault-tolerant-execution`.
diff --git a/docs/src/main/sphinx/admin/properties-resource-management.rst b/docs/src/main/sphinx/admin/properties-resource-management.rst
deleted file mode 100644
index ecc496efeaa5..000000000000
--- a/docs/src/main/sphinx/admin/properties-resource-management.rst
+++ /dev/null
@@ -1,113 +0,0 @@
-==============================
-Resource management properties
-==============================
-
-.. _prop-resource-query-max-cpu-time:
-
-``query.max-cpu-time``
-^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Default value:** ``1_000_000_000d``
-
-This is the max amount of CPU time that a query can use across the entire
-cluster. Queries that exceed this limit are killed.
-
-.. _prop-resource-query-max-memory-per-node:
-
-``query.max-memory-per-node``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** (JVM max memory * 0.3)
-
-This is the max amount of user memory a query can use on a worker.
-User memory is allocated during execution for things that are directly
-attributable to, or controllable by, a user query. For example, memory used
-by the hash tables built during execution, memory used during sorting, etc.
-When the user memory allocation of a query on any worker hits this limit,
-it is killed.
-
-.. warning::
-
-   The sum of :ref:`prop-resource-query-max-memory-per-node` and
-   :ref:`prop-resource-memory-heap-headroom-per-node` must be less than the
-   maximum heap size in the JVM on the node. See :ref:`jvm_config`.
-
-.. note::
-
-    Does not apply for queries with task level retries enabled (``retry-policy=TASK``)
-
-.. _prop-resource-query-max-memory:
-
-``query.max-memory``
-^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``20GB``
-
-This is the max amount of user memory a query can use across the entire cluster.
-User memory is allocated during execution for things that are directly
-attributable to, or controllable by, a user query. For example, memory used
-by the hash tables built during execution, memory used during sorting, etc.
-When the user memory allocation of a query across all workers hits this limit
-it is killed.
-
-.. warning::
-
-   :ref:`prop-resource-query-max-total-memory` must be greater than
-   :ref:`prop-resource-query-max-memory`.
-
-.. note::
-
-    Does not apply for queries with task level retries enabled (``retry-policy=TASK``)
-
-.. _prop-resource-query-max-total-memory:
-
-``query.max-total-memory``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** (``query.max-memory`` * 2)
-
-This is the max amount of memory a query can use across the entire cluster,
-including revocable memory. When the memory allocated by a query across all
-workers hits this limit it is killed. The value of ``query.max-total-memory``
-must be greater than ``query.max-memory``.
-
-.. warning::
-
-   :ref:`prop-resource-query-max-total-memory` must be greater than
-   :ref:`prop-resource-query-max-memory`.
-
-.. note::
-
-    Does not apply for queries with task level retries enabled (``retry-policy=TASK``)
-
-.. _prop-resource-memory-heap-headroom-per-node:
-
-``memory.heap-headroom-per-node``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** (JVM max memory * 0.3)
-
-This is the amount of memory set aside as headroom/buffer in the JVM heap
-for allocations that are not tracked by Trino.
-
-.. warning::
-
-   The sum of :ref:`prop-resource-query-max-memory-per-node` and
-   :ref:`prop-resource-memory-heap-headroom-per-node` must be less than the
-   maximum heap size in the JVM on the node. See :ref:`jvm_config`.
-
-.. _prop-resource-exchange-deduplication-buffer-size:
-
-``exchange.deduplication-buffer-size``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``32MB``
-
-Size of the buffer used for spooled data during
-:doc:`/admin/fault-tolerant-execution`.
diff --git a/docs/src/main/sphinx/admin/properties-spilling.md b/docs/src/main/sphinx/admin/properties-spilling.md
new file mode 100644
index 000000000000..62b4ad71d08b
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-spilling.md
@@ -0,0 +1,81 @@
+# Spilling properties
+
+These properties control {doc}`spill`.
+
+## `spill-enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `false`
+- **Session property:** `spill_enabled`
+
+Try spilling memory to disk to avoid exceeding memory limits for the query.
+
+Spilling works by offloading memory to disk. This process can allow a query with a large memory
+footprint to pass at the cost of slower execution times. Spilling is supported for
+aggregations, joins (inner and outer), sorting, and window functions. This property does not
+reduce memory usage required for other join types.
+
+## `spiller-spill-path`
+
+- **Type:** {ref}`prop-type-string`
+- **No default value.** Must be set when spilling is enabled
+
+Directory where spilled content is written. It can be a comma separated
+list to spill simultaneously to multiple directories, which helps to utilize
+multiple drives installed in the system.
+
+It is not recommended to spill to system drives. Most importantly, do not spill
+to the drive on which the JVM logs are written, as disk overutilization might
+cause JVM to pause for lengthy periods, causing queries to fail.
+
+## `spiller-max-used-space-threshold`
+
+- **Type:** {ref}`prop-type-double`
+- **Default value:** `0.9`
+
+If disk space usage ratio of a given spill path is above this threshold,
+this spill path is not eligible for spilling.
+
+## `spiller-threads`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `4`
+
+Number of spiller threads. Increase this value if the default is not able
+to saturate the underlying spilling device (for example, when using RAID).
+
+## `max-spill-per-node`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `100GB`
+
+Max spill space to be used by all queries on a single node.
+
+## `query-max-spill-per-node`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `100GB`
+
+Max spill space to be used by a single query on a single node.
+
+## `aggregation-operator-unspill-memory-limit`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `4MB`
+
+Limit for memory used for unspilling a single aggregation operator instance.
+
+## `spill-compression-enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `false`
+
+Enables data compression for pages spilled to disk.
+
+## `spill-encryption-enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `false`
+
+Enables using a randomly generated secret key (per spill file) to encrypt and decrypt
+data spilled to disk.
diff --git a/docs/src/main/sphinx/admin/properties-spilling.rst b/docs/src/main/sphinx/admin/properties-spilling.rst
deleted file mode 100644
index 745dd16050a4..000000000000
--- a/docs/src/main/sphinx/admin/properties-spilling.rst
+++ /dev/null
@@ -1,93 +0,0 @@
-===================
-Spilling properties
-===================
-
-These properties control :doc:`spill`.
-
-``spill-enabled``
-^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``false``
-
-Try spilling memory to disk to avoid exceeding memory limits for the query.
-
-Spilling works by offloading memory to disk. This process can allow a query with a large memory
-footprint to pass at the cost of slower execution times. Spilling is supported for
-aggregations, joins (inner and outer), sorting, and window functions. This property does not
-reduce memory usage required for other join types.
-
-This config property can be overridden by the ``spill_enabled`` session property.
-
-``spiller-spill-path``
-^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **No default value.** Must be set when spilling is enabled
-
-Directory where spilled content is written. It can be a comma separated
-list to spill simultaneously to multiple directories, which helps to utilize
-multiple drives installed in the system.
-
-It is not recommended to spill to system drives. Most importantly, do not spill
-to the drive on which the JVM logs are written, as disk overutilization might
-cause JVM to pause for lengthy periods, causing queries to fail.
-
-``spiller-max-used-space-threshold``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-double`
-* **Default value:** ``0.9``
-
-If disk space usage ratio of a given spill path is above this threshold,
-this spill path is not eligible for spilling.
-
-``spiller-threads``
-^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``4``
-
-Number of spiller threads. Increase this value if the default is not able
-to saturate the underlying spilling device (for example, when using RAID).
-
-``max-spill-per-node``
-^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``100GB``
-
-Max spill space to be used by all queries on a single node.
-
-``query-max-spill-per-node``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``100GB``
-
-Max spill space to be used by a single query on a single node.
-
-``aggregation-operator-unspill-memory-limit``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``4MB``
-
-Limit for memory used for unspilling a single aggregation operator instance.
-
-``spill-compression-enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``false``
-
-Enables data compression for pages spilled to disk.
-
-``spill-encryption-enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``false``
-
-Enables using a randomly generated secret key (per spill file) to encrypt and decrypt
-data spilled to disk.
diff --git a/docs/src/main/sphinx/admin/properties-sql-environment.md b/docs/src/main/sphinx/admin/properties-sql-environment.md
new file mode 100644
index 000000000000..a4092cef9ace
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-sql-environment.md
@@ -0,0 +1,65 @@
+# SQL environment properties
+
+SQL environment properties allow you to globally configure parameters relevant
+to all SQL queries and the context they are processed in.
+
+## `sql.forced-session-time-zone`
+
+- **Type:** [](prop-type-string)
+
+Force the time zone for any query processing to the configured value, and
+therefore override the time zone of the client. The time zone must be specified
+as a string such as `UTC` or [other valid
+values](timestamp-p-with-time-zone-data-type).
+
+## `sql.default-catalog`
+
+- **Type:** [](prop-type-string)
+
+Set the default catalog for all clients. Any default catalog configuration
+provided by a client overrides this default.
+
+## `sql.default-schema`
+
+- **Type:** [](prop-type-string)
+
+Set the default schema for all clients. Must be set to a schema name that is
+valid for the default catalog. Any default schema configuration provided by a
+client overrides this default.
+
+## `sql.default-function-catalog`
+
+- **Type:** [](prop-type-string)
+
+Set the default catalog for [SQL routine](/routines) storage for all clients.
+The connector used in the catalog must support [](sql-routine-management). Any
+usage of a fully qualified name for a routine overrides this default.
+
+The default catalog and schema for SQL routine storage must be configured
+together, and the resulting entry must be set as part of the path. For example,
+the following example section for [](config-properties) uses the `functions`
+schema in the `brain` catalog for routine storage, and adds it as the only entry
+on the path:
+
+```properties
+sql.default-function-catalog=brain
+sql.default-function-schema=default
+sql.path=brain.default
+```
+
+## `sql.default-function-schema`
+
+- **Type:** [](prop-type-string)
+
+Set the default schema for SQL routine storage for all clients. Must be set to a
+schema name that is valid for the default function catalog. Any usage of a fully
+qualified name for a routine overrides this default.
+
+## `sql.path`
+
+- **Type:** [](prop-type-string)
+
+Define the default collection of paths to functions or table functions in
+specific catalogs and schemas. Paths are specified as
+`catalog_name.schema_name`. Multiple paths must be separated by commas. Find
+more details about the path in [](/sql/set-path).
diff --git a/docs/src/main/sphinx/admin/properties-task.md b/docs/src/main/sphinx/admin/properties-task.md
new file mode 100644
index 000000000000..02f22788ccb2
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-task.md
@@ -0,0 +1,180 @@
+# Task properties
+
+## `task.concurrency`
+
+- **Type:** {ref}`prop-type-integer`
+- **Restrictions:** Must be a power of two
+- **Default value:** The number of physical CPUs of the node, with a minimum value of 2 and a maximum of 32
+- **Session property:** `task_concurrency`
+
+Default local concurrency for parallel operators, such as joins and aggregations.
+This value should be adjusted up or down based on the query concurrency and worker
+resource utilization. Lower values are better for clusters that run many queries
+concurrently, because the cluster is already utilized by all the running
+queries, so adding more concurrency results in slow downs due to context
+switching and other overhead. Higher values are better for clusters that only run
+one or a few queries at a time.
+
+## `task.http-response-threads`
+
+- **Type:** {ref}`prop-type-integer`
+- **Minimum value:** `1`
+- **Default value:** `100`
+
+Maximum number of threads that may be created to handle HTTP responses. Threads are
+created on demand and are cleaned up when idle, thus there is no overhead to a large
+value, if the number of requests to be handled is small. More threads may be helpful
+on clusters with a high number of concurrent queries, or on clusters with hundreds
+or thousands of workers.
+
+## `task.http-timeout-threads`
+
+- **Type:** {ref}`prop-type-integer`
+- **Minimum value:** `1`
+- **Default value:** `3`
+
+Number of threads used to handle timeouts when generating HTTP responses. This value
+should be increased if all the threads are frequently in use. This can be monitored
+via the `trino.server:name=AsyncHttpExecutionMBean:TimeoutExecutor`
+JMX object. If `ActiveCount` is always the same as `PoolSize`, increase the
+number of threads.
+
+## `task.info-update-interval`
+
+- **Type:** {ref}`prop-type-duration`
+- **Minimum value:** `1ms`
+- **Maximum value:** `10s`
+- **Default value:** `3s`
+
+Controls staleness of task information, which is used in scheduling. Larger values
+can reduce coordinator CPU load, but may result in suboptimal split scheduling.
+
+## `task.max-drivers-per-task`
+
+- **Type:** {ref}`prop-type-integer`
+- **Minimum value:** `1`
+- **Default Value:** `2147483647`
+
+Controls the maximum number of drivers a task runs concurrently. Setting this value
+reduces the likelihood that a task uses too many drivers and can improve concurrent query
+performance. This can lead to resource waste if it runs too few concurrent queries.
+
+## `task.max-partial-aggregation-memory`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `16MB`
+
+Maximum size of partial aggregation results for distributed aggregations. Increasing this
+value can result in less network transfer and lower CPU utilization, by allowing more
+groups to be kept locally before being flushed, at the cost of additional memory usage.
+
+## `task.max-worker-threads`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** (Node CPUs * 2)
+
+Sets the number of threads used by workers to process splits. Increasing this number
+can improve throughput, if worker CPU utilization is low and all the threads are in use,
+but it causes increased heap space usage. Setting the value too high may cause a drop
+in performance due to a context switching. The number of active threads is available
+via the `RunningSplits` property of the
+`trino.execution.executor:name=TaskExecutor.RunningSplits` JMX object.
+
+## `task.min-drivers`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** (`task.max-worker-threads` * 2)
+
+The target number of running leaf splits on a worker. This is a minimum value because
+each leaf task is guaranteed at least `3` running splits. Non-leaf tasks are also
+guaranteed to run in order to prevent deadlocks. A lower value may improve responsiveness
+for new tasks, but can result in underutilized resources. A higher value can increase
+resource utilization, but uses additional memory.
+
+## `task.min-drivers-per-task`
+
+- **Type:** {ref}`prop-type-integer`
+- **Minimum value:** `1`
+- **Default Value:** `3`
+
+The minimum number of drivers guaranteed to run concurrently for a single task given
+the task has remaining splits to process.
+
+## `task.scale-writers.enabled`
+
+- **Description:** see details at {ref}`prop-task-scale-writers`
+
+(prop-task-min-writer-count)=
+## `task.min-writer-count`
+
+- **Type:** {ref}`prop-type-integer`
+- **Default value:** `1`
+- **Session property:** `task_min_writer_count`
+
+The number of concurrent writer threads per worker per query when
+{ref}`preferred partitioning <preferred-write-partitioning>` and
+{ref}`task writer scaling <prop-task-scale-writers>` are not used. Increasing this value may
+increase write speed, especially when a query is not I/O bound and can take advantage of
+additional CPU for parallel writes.
+
+Some connectors can be bottlenecked on the CPU when writing due to compression or other factors.
+Setting this too high may cause the cluster to become overloaded due to excessive resource
+utilization. Especially when the engine is inserting into a partitioned table without using
+{ref}`preferred partitioning <preferred-write-partitioning>`. In such case, each writer thread
+could write to all partitions. This can lead to out of memory error since writing to a partition
+allocates a certain amount of memory for buffering.
+
+(prop-task-max-writer-count)=
+## `task.max-writer-count`
+
+- **Type:** {ref}`prop-type-integer`
+- **Restrictions:** Must be a power of two
+- **Default value:** The number of physical CPUs of the node, with a minimum value of 2 and a maximum of 64
+- **Session property:** `task_max_writer_count`
+
+The number of concurrent writer threads per worker per query when either
+{ref}`task writer scaling <prop-task-scale-writers>` or
+{ref}`preferred partitioning <preferred-write-partitioning>` is used. Increasing this value may
+increase write speed, especially when a query is not I/O bound and can take advantage of additional
+CPU for parallel writes. Some connectors can be bottlenecked on CPU when writing due to compression
+or other factors. Setting this too high may cause the cluster to become overloaded due to excessive
+resource utilization.
+
+## `task.interrupt-stuck-split-tasks-enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+
+Enables Trino detecting and failing tasks containing splits that have been stuck. Can be
+specified by `task.interrupt-stuck-split-tasks-timeout` and
+`task.interrupt-stuck-split-tasks-detection-interval`. Only applies to threads that
+are blocked by the third-party Joni regular expression library.
+
+## `task.interrupt-stuck-split-tasks-warning-threshold`
+
+- **Type:** {ref}`prop-type-duration`
+- **Minimum value:** `1m`
+- **Default value:** `10m`
+
+Print out call stacks at `/v1/maxActiveSplits` endpoint and generate JMX metrics
+for splits running longer than the threshold.
+
+## `task.interrupt-stuck-split-tasks-timeout`
+
+- **Type:** {ref}`prop-type-duration`
+- **Minimum value:** `3m`
+- **Default value:** `10m`
+
+The length of time Trino waits for a blocked split processing thread before failing the
+task. Only applies to threads that are blocked by the third-party Joni regular
+expression library.
+
+## `task.interrupt-stuck-split-tasks-detection-interval`
+
+- **Type:** {ref}`prop-type-duration`
+- **Minimum value:** `1m`
+- **Default value:** `2m`
+
+The interval of Trino checks for splits that have processing time exceeding
+`task.interrupt-stuck-split-tasks-timeout`. Only applies to threads that are blocked
+by the third-party Joni regular expression library.
diff --git a/docs/src/main/sphinx/admin/properties-task.rst b/docs/src/main/sphinx/admin/properties-task.rst
deleted file mode 100644
index ec94e42a366a..000000000000
--- a/docs/src/main/sphinx/admin/properties-task.rst
+++ /dev/null
@@ -1,202 +0,0 @@
-===============
-Task properties
-===============
-
-``task.concurrency``
-^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Restrictions:** Must be a power of two
-* **Default value:** The number of physical CPUs of the node, with a minimum value of 2 and a maximum of 32
-
-Default local concurrency for parallel operators, such as joins and aggregations.
-This value should be adjusted up or down based on the query concurrency and worker
-resource utilization. Lower values are better for clusters that run many queries
-concurrently, because the cluster is already utilized by all the running
-queries, so adding more concurrency results in slow downs due to context
-switching and other overhead. Higher values are better for clusters that only run
-one or a few queries at a time. This can also be specified on a per-query basis
-using the ``task_concurrency`` session property.
-
-``task.http-response-threads``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Minimum value:** ``1``
-* **Default value:** ``100``
-
-Maximum number of threads that may be created to handle HTTP responses. Threads are
-created on demand and are cleaned up when idle, thus there is no overhead to a large
-value, if the number of requests to be handled is small. More threads may be helpful
-on clusters with a high number of concurrent queries, or on clusters with hundreds
-or thousands of workers.
-
-``task.http-timeout-threads``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Minimum value:** ``1``
-* **Default value:** ``3``
-
-Number of threads used to handle timeouts when generating HTTP responses. This value
-should be increased if all the threads are frequently in use. This can be monitored
-via the ``trino.server:name=AsyncHttpExecutionMBean:TimeoutExecutor``
-JMX object. If ``ActiveCount`` is always the same as ``PoolSize``, increase the
-number of threads.
-
-``task.info-update-interval``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Minimum value:** ``1ms``
-* **Maximum value:** ``10s``
-* **Default value:** ``3s``
-
-Controls staleness of task information, which is used in scheduling. Larger values
-can reduce coordinator CPU load, but may result in suboptimal split scheduling.
-
-``task.max-drivers-per-task``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Minimum value:** ``1``
-* **Default Value:** ``2147483647``
-
-Controls the maximum number of drivers a task runs concurrently. Setting this value
-reduces the likelihood that a task uses too many drivers and can improve concurrent query
-performance. This can lead to resource waste if it runs too few concurrent queries.
-
-``task.max-partial-aggregation-memory``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``16MB``
-
-Maximum size of partial aggregation results for distributed aggregations. Increasing this
-value can result in less network transfer and lower CPU utilization, by allowing more
-groups to be kept locally before being flushed, at the cost of additional memory usage.
-
-``task.max-worker-threads``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** (Node CPUs * 2)
-
-Sets the number of threads used by workers to process splits. Increasing this number
-can improve throughput, if worker CPU utilization is low and all the threads are in use,
-but it causes increased heap space usage. Setting the value too high may cause a drop
-in performance due to a context switching. The number of active threads is available
-via the ``RunningSplits`` property of the
-``trino.execution.executor:name=TaskExecutor.RunningSplits`` JMX object.
-
-``task.min-drivers``
-^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** (``task.max-worker-threads`` * 2)
-
-The target number of running leaf splits on a worker. This is a minimum value because
-each leaf task is guaranteed at least ``3`` running splits. Non-leaf tasks are also
-guaranteed to run in order to prevent deadlocks. A lower value may improve responsiveness
-for new tasks, but can result in underutilized resources. A higher value can increase
-resource utilization, but uses additional memory.
-
-``task.min-drivers-per-task``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Minimum value:** ``1``
-* **Default Value:** ``3``
-
-The minimum number of drivers guaranteed to run concurrently for a single task given
-the task has remaining splits to process.
-
-``task.scale-writers.enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Description:** :ref:`prop-task-scale-writers`
-
-``task.scale-writers.max-writer-count``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Description:** :ref:`prop-task-scale-writers-max-writer-count`
-
-``task.writer-count``
-^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``1``
-
-The number of concurrent writer threads per worker per query when
-:ref:`preferred partitioning <preferred-write-partitioning>` and
-:ref:`task writer scaling <prop-task-scale-writers>` are not used. Increasing this value may
-increase write speed, especially when a query is not I/O bound and can take advantage of
-additional CPU for parallel writes.
-
-Some connectors can be bottlenecked on the CPU when writing due to compression or other factors.
-Setting this too high may cause the cluster to become overloaded due to excessive resource
-utilization. Especially when the engine is inserting into a partitioned table without using
-:ref:`preferred partitioning <preferred-write-partitioning>`. In such case, each writer thread
-could write to all partitions. This can lead to out of memory error since writing to a partition
-allocates a certain amount of memory for buffering.
-
-This can also be specified on a per-query basis using the ``task_writer_count`` session property.
-
-``task.partitioned-writer-count``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Restrictions:** Must be a power of two
-* **Default value:** The number of physical CPUs of the node, with a minimum value of 2 and a maximum of 32
-
-The number of concurrent writer threads per worker per query when
-:ref:`preferred partitioning <preferred-write-partitioning>` is used. Increasing this value may
-increase write speed, especially when a query is not I/O bound and can take advantage of additional
-CPU for parallel writes. Some connectors can be bottlenecked on CPU when writing due to compression
-or other factors. Setting this too high may cause the cluster to become overloaded due to excessive
-resource utilization. This can also be specified on a per-query basis using the
-``task_partitioned_writer_count`` session property.
-
-``task.interrupt-stuck-split-tasks-enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Enables Trino detecting and failing tasks containing splits that have been stuck. Can be
-specified by ``task.interrupt-stuck-split-tasks-timeout`` and
-``task.interrupt-stuck-split-tasks-detection-interval``. Only applies to threads that
-are blocked by the third-party Joni regular expression library.
-
-
-``task.interrupt-stuck-split-tasks-warning-threshold``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Minimum value:** ``1m``
-* **Default value:** ``10m``
-
-Print out call stacks at ``/v1/maxActiveSplits`` endpoint and generate JMX metrics
-for splits running longer than the threshold.
-
-``task.interrupt-stuck-split-tasks-timeout``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Minimum value:** ``3m``
-* **Default value:** ``10m``
-
-The length of time Trino waits for a blocked split processing thread before failing the
-task. Only applies to threads that are blocked by the third-party Joni regular
-expression library.
-
-``task.interrupt-stuck-split-tasks-detection-interval``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Minimum value:** ``1m``
-* **Default value:** ``2m``
-
-The interval of Trino checks for splits that have processing time exceeding
-``task.interrupt-stuck-split-tasks-timeout``. Only applies to threads that are blocked
-by the third-party Joni regular expression library.
diff --git a/docs/src/main/sphinx/admin/properties-web-interface.md b/docs/src/main/sphinx/admin/properties-web-interface.md
new file mode 100644
index 000000000000..95c608756e83
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-web-interface.md
@@ -0,0 +1,45 @@
+# Web UI properties
+
+The following properties can be used to configure the {doc}`web-interface`.
+
+## `web-ui.authentication.type`
+
+- **Type:** {ref}`prop-type-string`
+- **Allowed values:** `FORM`, `FIXED`, `CERTIFICATE`, `KERBEROS`, `JWT`, `OAUTH2`
+- **Default value:** `FORM`
+
+The authentication mechanism to allow user access to the Web UI. See
+{ref}`Web UI Authentication <web-ui-authentication>`.
+
+## `web-ui.enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+
+This property controls whether or not the Web UI is available.
+
+## `web-ui.shared-secret`
+
+- **Type:** {ref}`prop-type-string`
+- **Default value:** randomly generated unless set
+
+The shared secret is used to generate authentication cookies for users of
+the Web UI. If not set to a static value, any coordinator restart generates
+a new random value, which in turn invalidates the session of any currently
+logged in Web UI user.
+
+## `web-ui.session-timeout`
+
+- **Type:** {ref}`prop-type-duration`
+- **Default value:** `1d`
+
+The duration how long a user can be logged into the Web UI, before the
+session times out, which forces an automatic log-out.
+
+## `web-ui.user`
+
+- **Type:** {ref}`prop-type-string`
+- **Default value:** None
+
+The username automatically used for authentication to the Web UI with the `fixed`
+authentication type. See {ref}`Web UI Authentication <web-ui-authentication>`.
diff --git a/docs/src/main/sphinx/admin/properties-web-interface.rst b/docs/src/main/sphinx/admin/properties-web-interface.rst
deleted file mode 100644
index 87a119b17573..000000000000
--- a/docs/src/main/sphinx/admin/properties-web-interface.rst
+++ /dev/null
@@ -1,51 +0,0 @@
-Web UI properties
------------------
-
-The following properties can be used to configure the :doc:`web-interface`.
-
-``web-ui.authentication.type``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Allowed values:** ``form``, ``fixed``, ``certificate``, ``kerberos``, ``jwt``, ``oauth2``
-* **Default value:** ``form``
-
-The authentication mechanism to allow user access to the Web UI. See
-:ref:`Web UI Authentication <web-ui-authentication>`.
-
-``web-ui.enabled``
-^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-This property controls whether or not the Web UI is available.
-
-``web-ui.shared-secret``
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Default value:** randomly generated unless set
-
-The shared secret is used to generate authentication cookies for users of
-the Web UI. If not set to a static value, any coordinator restart generates
-a new random value, which in turn invalidates the session of any currently
-logged in Web UI user.
-
-``web-ui.session-timeout``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-duration`
-* **Default value:** ``1d``
-
-The duration how long a user can be logged into the Web UI, before the
-session times out, which forces an automatic log-out.
-
-``web-ui.user``
-^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-string`
-* **Default value:** None
-
-The username automatically used for authentication to the Web UI with the ``fixed``
-authentication type. See :ref:`Web UI Authentication <web-ui-authentication>`.
diff --git a/docs/src/main/sphinx/admin/properties-write-partitioning.md b/docs/src/main/sphinx/admin/properties-write-partitioning.md
new file mode 100644
index 000000000000..cdd4487c3926
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-write-partitioning.md
@@ -0,0 +1,15 @@
+# Write partitioning properties
+
+(preferred-write-partitioning)=
+
+## `use-preferred-write-partitioning`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+- **Session property:** `use_preferred_write_partitioning`
+
+Enable preferred write partitioning. When set to `true`, each partition is
+written by a separate writer. For some connectors such as the Hive connector,
+only a single new file is written per partition, instead of multiple files.
+Partition writer assignments are distributed across worker nodes for parallel
+processing.
diff --git a/docs/src/main/sphinx/admin/properties-write-partitioning.rst b/docs/src/main/sphinx/admin/properties-write-partitioning.rst
deleted file mode 100644
index 4a7b1759f3bd..000000000000
--- a/docs/src/main/sphinx/admin/properties-write-partitioning.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-=============================
-Write partitioning properties
-=============================
-
-.. _preferred-write-partitioning:
-
-``use-preferred-write-partitioning``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Enable preferred write partitioning. When set to ``true`` and more than the
-minimum number of partitions, set in ``preferred-write-partitioning-min-number-of-partitions``,
-are written, each partition is written by a separate writer. As a result, for some connectors such as the
-Hive connector, only a single new file is written per partition, instead of
-multiple files. Partition writer assignments are distributed across worker
-nodes for parallel processing. ``use-preferred-write-partitioning`` can be
-specified on a per-query basis using the ``use_preferred_write_partitioning``
-session property.
-
-``preferred-write-partitioning-min-number-of-partitions``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** ``50``
-
-Use the connector's preferred write partitioning when the optimizer's estimate
-of the number of partitions that will be written by the query is greater than
-the configured value. If the number of partitions cannot be estimated from the
-statistics, then preferred write partitioning is not used.
-If the threshold value is ``1`` then preferred write partitioning is always used.
-``preferred-write-partitioning-min-number-of-partitions`` can be specified on a
-per-query basis using the ``preferred_write_partitioning_min_number_of_partitions``
-session property.
diff --git a/docs/src/main/sphinx/admin/properties-writer-scaling.md b/docs/src/main/sphinx/admin/properties-writer-scaling.md
new file mode 100644
index 000000000000..2e8bda93c2fd
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties-writer-scaling.md
@@ -0,0 +1,45 @@
+# Writer scaling properties
+
+Writer scaling allows Trino to dynamically scale out the number of writer tasks
+rather than allocating a fixed number of tasks. Additional tasks are added when
+the average amount of physical data per writer is above a minimum threshold, but
+only if the query is bottlenecked on writing.
+
+Writer scaling is useful with connectors like Hive that produce one or more
+files per writer -- reducing the number of writers results in a larger average
+file size. However, writer scaling can have a small impact on query wall time
+due to the decreased writer parallelism while the writer count ramps up to match
+the needs of the query.
+
+## `scale-writers`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+- **Session property:** `scale_writers`
+
+Enable writer scaling by dynamically increasing the number of writer tasks on
+the cluster.
+
+(prop-task-scale-writers)=
+
+## `task.scale-writers.enabled`
+
+- **Type:** {ref}`prop-type-boolean`
+- **Default value:** `true`
+- **Session property:** `task_scale_writers_enabled`
+
+Enable scaling the number of concurrent writers within a task. The maximum
+writer count per task for scaling is [](prop-task-max-writer-count). Additional
+writers are added only when the average amount of uncompressed data processed
+per writer is above the minimum threshold of `writer-scaling-min-data-processed`
+and query is bottlenecked on writing.
+
+(writer-scaling-min-data-processed)=
+## `writer-scaling-min-data-processed`
+
+- **Type:** {ref}`prop-type-data-size`
+- **Default value:** `100MB`
+- **Session property:** `writer_scaling_min_data_processed`
+
+The minimum amount of uncompressed data that must be processed by a writer
+before another writer can be added.
diff --git a/docs/src/main/sphinx/admin/properties-writer-scaling.rst b/docs/src/main/sphinx/admin/properties-writer-scaling.rst
deleted file mode 100644
index aa093b65cb68..000000000000
--- a/docs/src/main/sphinx/admin/properties-writer-scaling.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-=========================
-Writer scaling properties
-=========================
-
-Writer scaling allows Trino to dynamically scale out the number of writer tasks
-rather than allocating a fixed number of tasks. Additional tasks are added when
-the average amount of physical data per writer is above a minimum threshold, but
-only if the query is bottlenecked on writing.
-
-Writer scaling is useful with connectors like Hive that produce one or more
-files per writer -- reducing the number of writers results in a larger average
-file size. However, writer scaling can have a small impact on query wall time
-due to the decreased writer parallelism while the writer count ramps up to match
-the needs of the query.
-
-``scale-writers``
-^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Enable writer scaling by dynamically increasing the number of writer tasks on
-the cluster. This can be specified on a per-query basis using the ``scale_writers``
-session property.
-
-.. _prop-task-scale-writers:
-
-``task.scale-writers.enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-boolean`
-* **Default value:** ``true``
-
-Enable scaling the number of concurrent writers within a task. The maximum writer
-count per task for scaling is ``task.scale-writers.max-writer-count``. Additional
-writers are added only when the average amount of physical data written per writer
-is above the minimum threshold of ``writer-min-size`` and query is bottlenecked on
-writing. This can be specified on a per-query basis using the ``task_scale_writers_enabled``
-session property.
-
-.. _prop-task-scale-writers-max-writer-count:
-
-``task.scale-writers.max-writer-count``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** :ref:`prop-type-integer`
-* **Default value:** The number of physical CPUs of the node with a maximum of 32
-
-Maximum number of concurrent writers per task upto which the task can be scaled when
-``task.scale-writers.enabled`` is set. Increasing this value may improve the
-performance of writes when the query is bottlenecked on writing. Setting this too high
-may cause the cluster to become overloaded due to excessive resource utilization.
-
-``writer-min-size``
-^^^^^^^^^^^^^^^^^^^
-* **Type:** :ref:`prop-type-data-size`
-* **Default value:** ``32MB``
-
-The minimum amount of data that must be written by a writer task before
-another writer is eligible to be added. Each writer task may have multiple
-writers, controlled by ``task.writer-count``, thus this value is effectively
-divided by the number of writers per task. This can be specified on a
-per-query basis using the ``writer_min_size`` session property.
diff --git a/docs/src/main/sphinx/admin/properties.md b/docs/src/main/sphinx/admin/properties.md
new file mode 100644
index 000000000000..c0965221a0ae
--- /dev/null
+++ b/docs/src/main/sphinx/admin/properties.md
@@ -0,0 +1,115 @@
+# Properties reference
+
+This section describes the most important configuration properties and (where
+applicable) their corresponding {ref}`session properties
+<session-properties-definition>`, that may be used to tune Trino or alter its
+behavior when required. Unless specified otherwise, configuration properties
+must be set on the coordinator and all worker nodes.
+
+The following pages are not a complete list of all configuration and
+session properties available in Trino, and do not include any connector-specific
+catalog configuration properties. For more information on catalog configuration
+properties, refer to the {doc}`connector documentation </connector/>`.
+
+```{toctree}
+:titlesonly: true
+
+General <properties-general>
+Resource management <properties-resource-management>
+Query management <properties-query-management>
+SQL environment <properties-sql-environment>
+Spilling <properties-spilling>
+Exchange <properties-exchange>
+Task <properties-task>
+Write partitioning <properties-write-partitioning>
+Writer scaling <properties-writer-scaling>
+Node scheduler <properties-node-scheduler>
+Optimizer <properties-optimizer>
+Logging <properties-logging>
+Web UI <properties-web-interface>
+Regular expression function <properties-regexp-function>
+HTTP client <properties-http-client>
+```
+
+## Property value types
+
+Trino configuration properties support different value types with their own
+allowed values and syntax. Additional limitations apply on a per-property basis,
+and disallowed values result in a validation error.
+
+(prop-type-boolean)=
+
+### `boolean`
+
+The properties of type `boolean` support two values, `true` or `false`.
+
+(prop-type-data-size)=
+
+### `data size`
+
+The properties of type `data size` support values that describe an amount of
+data, measured in byte-based units. These units are incremented in multiples of
+1024, so one megabyte is 1024 kilobytes, one kilobyte is 1024 bytes, and so on.
+For example, the value `6GB` describes six gigabytes, which is
+(6 * 1024 * 1024 * 1024) = 6442450944 bytes.
+
+The `data size` type supports the following units:
+
+- `B`: Bytes
+- `kB`: Kilobytes
+- `MB`: Megabytes
+- `GB`: Gigabytes
+- `TB`: Terabytes
+- `PB`: Petabytes
+
+(prop-type-double)=
+
+### `double`
+
+The properties of type `double` support numerical values including decimals,
+such as `1.6`. `double` type values can be negative, if supported by the
+specific property.
+
+(prop-type-duration)=
+
+### `duration`
+
+The properties of type `duration` support values describing an
+amount of time, using the syntax of a non-negative number followed by a time
+unit. For example, the value `7m` describes seven minutes.
+
+The `duration` type supports the following units:
+
+- `ns`: Nanoseconds
+- `us`: Microseconds
+- `ms`: Milliseconds
+- `s`: Seconds
+- `m`: Minutes
+- `h`: Hours
+- `d`: Days
+
+A duration of `0` is treated as zero regardless of the unit that follows.
+For example, `0s` and `0m` both mean the same thing.
+
+Properties of type `duration` also support decimal values, such as `2.25d`.
+These are handled as a fractional value of the specified unit. For example, the
+value `1.5m` equals one and a half minutes, or 90 seconds.
+
+(prop-type-integer)=
+
+### `integer`
+
+The properties of type `integer` support whole numeric values, such as `5`
+and `1000`. Negative values are supported as well, for example `-7`.
+`integer` type values must be whole numbers, decimal values such as `2.5`
+are not supported.
+
+Some `integer` type properties enforce their own minimum and maximum values.
+
+(prop-type-string)=
+
+### `string`
+
+The properties of type `string` support a set of values that consist of a
+sequence of characters. Allowed values are defined on a property-by-property
+basis, refer to the specific property for its supported and default values.
diff --git a/docs/src/main/sphinx/admin/properties.rst b/docs/src/main/sphinx/admin/properties.rst
deleted file mode 100644
index f6b46bffcead..000000000000
--- a/docs/src/main/sphinx/admin/properties.rst
+++ /dev/null
@@ -1,122 +0,0 @@
-====================
-Properties reference
-====================
-
-This section describes the most important configuration properties and (where
-applicable) their corresponding :ref:`session properties
-<session-properties-definition>`, that may be used to tune Trino or alter its
-behavior when required. Unless specified otherwise, configuration properties
-must be set on the coordinator and all worker nodes.
-
-The following pages are not a complete list of all configuration and
-session properties available in Trino, and do not include any connector-specific
-catalog configuration properties. For more information on catalog configuration
-properties, refer to the :doc:`connector documentation </connector/>`.
-
-.. toctree::
-    :titlesonly:
-
-    General <properties-general>
-    Resource management <properties-resource-management>
-    Query management <properties-query-management>
-    Spilling <properties-spilling>
-    Exchange <properties-exchange>
-    Task <properties-task>
-    Write partitioning <properties-write-partitioning>
-    Writer scaling <properties-writer-scaling>
-    Node scheduler <properties-node-scheduler>
-    Optimizer <properties-optimizer>
-    Logging <properties-logging>
-    Web UI <properties-web-interface>
-    Regular expression function <properties-regexp-function>
-    HTTP client <properties-http-client>
-
-Property value types
---------------------
-
-Trino configuration properties support different value types with their own
-allowed values and syntax. Additional limitations apply on a per-property basis,
-and disallowed values result in a validation error.
-
-.. _prop-type-boolean:
-
-``boolean``
-^^^^^^^^^^^
-
-The properties of type ``boolean`` support two values, ``true`` or ``false``.
-
-.. _prop-type-data-size:
-
-``data size``
-^^^^^^^^^^^^^
-
-The properties of type ``data size`` support values that describe an amount of
-data, measured in byte-based units. These units are incremented in multiples of
-1024, so one megabyte is 1024 kilobytes, one kilobyte is 1024 bytes, and so on.
-For example, the value ``6GB`` describes six gigabytes, which is
-(6 * 1024 * 1024 * 1024) = 6442450944 bytes.
-
-The ``data size`` type supports the following units:
-
-* ``B``: Bytes
-* ``kB``: Kilobytes
-* ``MB``: Megabytes
-* ``GB``: Gigabytes
-* ``TB``: Terabytes
-* ``PB``: Petabytes
-
-.. _prop-type-double:
-
-``double``
-^^^^^^^^^^
-
-The properties of type ``double`` support numerical values including decimals,
-such as ``1.6``. ``double`` type values can be negative, if supported by the
-specific property.
-
-.. _prop-type-duration:
-
-``duration``
-^^^^^^^^^^^^
-
-The properties of type ``duration`` support values describing an
-amount of time, using the syntax of a non-negative number followed by a time
-unit. For example, the value ``7m`` describes seven minutes.
-
-The ``duration`` type supports the following units:
-
-* ``ns``: Nanoseconds
-* ``us``: Microseconds
-* ``ms``: Milliseconds
-* ``s``: Seconds
-* ``m``: Minutes
-* ``h``: Hours
-* ``d``: Days
-
-A duration of ``0`` is treated as zero regardless of the unit that follows.
-For example, ``0s`` and ``0m`` both mean the same thing.
-
-Properties of type ``duration`` also support decimal values, such as ``2.25d``.
-These are handled as a fractional value of the specified unit. For example, the
-value ``1.5m`` equals one and a half minutes, or 90 seconds.
-
-.. _prop-type-integer:
-
-``integer``
-^^^^^^^^^^^
-
-The properties of type ``integer`` support whole numeric values, such as ``5``
-and ``1000``. Negative values are supported as well, for example ``-7``.
-``integer`` type values must be whole numbers, decimal values such as ``2.5``
-are not supported.
-
-Some ``integer`` type properties enforce their own minimum and maximum values.
-
-.. _prop-type-string:
-
-``string``
-^^^^^^^^^^
-
-The properties of type ``string`` support a set of values that consist of a
-sequence of characters. Allowed values are defined on a property-by-property
-basis, refer to the specific property for its supported and default values.
diff --git a/docs/src/main/sphinx/admin/resource-groups.md b/docs/src/main/sphinx/admin/resource-groups.md
new file mode 100644
index 000000000000..241b5b552c13
--- /dev/null
+++ b/docs/src/main/sphinx/admin/resource-groups.md
@@ -0,0 +1,343 @@
+# Resource groups
+
+Resource groups place limits on resource usage, and can enforce queueing policies on
+queries that run within them, or divide their resources among sub-groups. A query
+belongs to a single resource group, and consumes resources from that group (and its ancestors).
+Except for the limit on queued queries, when a resource group runs out of a resource
+it does not cause running queries to fail; instead new queries become queued.
+A resource group may have sub-groups or may accept queries, but may not do both.
+
+The resource groups and associated selection rules are configured by a manager, which is pluggable.
+
+You can use a file-based or a database-based resource group manager:
+
+- Add a file `etc/resource-groups.properties`
+- Set the `resource-groups.configuration-manager` property to `file` or `db`
+- Add further configuration properties for the desired manager.
+
+## File resource group manager
+
+The file resource group manager reads a JSON configuration file, specified with
+`resource-groups.config-file`:
+
+```text
+resource-groups.configuration-manager=file
+resource-groups.config-file=etc/resource-groups.json
+```
+
+The path to the JSON file can be an absolute path, or a path relative to the Trino
+data directory. The JSON file only needs to be present on the coordinator.
+
+## Database resource group manager
+
+The database resource group manager loads the configuration from a relational database. The
+supported databases are MySQL, PostgreSQL, and Oracle.
+
+```text
+resource-groups.configuration-manager=db
+resource-groups.config-db-url=jdbc:mysql://localhost:3306/resource_groups
+resource-groups.config-db-user=username
+resource-groups.config-db-password=password
+```
+
+The resource group configuration must be populated through tables
+`resource_groups_global_properties`, `resource_groups`, and
+`selectors`. If any of the tables do not exist when Trino starts, they
+will be created automatically.
+
+The rules in the `selectors` table are processed in descending order of the
+values in the `priority` field.
+
+The `resource_groups` table also contains an `environment` field which is
+matched with the value contained in the `node.environment` property in
+{ref}`node-properties`. This allows the resource group configuration for different
+Trino clusters to be stored in the same database if required.
+
+The configuration is reloaded from the database every second, and the changes
+are reflected automatically for incoming queries.
+
+:::{list-table} Database resource group manager properties
+:widths: 40, 50, 10
+:header-rows: 1
+
+* - Property name
+  - Description
+  - Default value
+* - `resource-groups.config-db-url`
+  - Database URL to load configuration from.
+  - `none`
+* - `resource-groups.config-db-user`
+  - Database user to connect with.
+  - `none`
+* - `resource-groups.config-db-password`
+  - Password for database user to connect with.
+  - `none`
+* - `resource-groups.max-refresh-interval`
+  - The maximum time period for which the cluster will continue to accept
+    queries after refresh failures, causing configuration to become stale.
+  - `1h`
+* - `resource-groups.refresh-interval`
+  -  How often the cluster reloads from the database
+  - `1s`
+* - `resource-groups.exact-match-selector-enabled`
+  - Setting this flag enables usage of an additional
+    `exact_match_source_selectors` table to configure resource group selection
+    rules defined exact name based matches for source, environment and query
+    type. By default, the rules are only loaded from the `selectors` table, with
+    a regex-based filter for `source`, among other filters.
+  - `false`
+:::
+
+## Resource group properties
+
+- `name` (required): name of the group. May be a template (see below).
+
+- `maxQueued` (required): maximum number of queued queries. Once this limit is reached
+  new queries are rejected.
+
+- `softConcurrencyLimit` (optional): number of concurrently running queries after which
+  new queries will only run if all peer resource groups below their soft limits are ineligible
+  or if all eligible peers are above soft limits.
+
+- `hardConcurrencyLimit` (required): maximum number of running queries.
+
+- `softMemoryLimit` (required): maximum amount of distributed memory this
+  group may use, before new queries become queued. May be specified as
+  an absolute value (i.e. `1GB`) or as a percentage (i.e. `10%`) of the cluster's memory.
+
+- `softCpuLimit` (optional): maximum amount of CPU time this
+  group may use in a period (see `cpuQuotaPeriod`), before a penalty is applied to
+  the maximum number of running queries. `hardCpuLimit` must also be specified.
+
+- `hardCpuLimit` (optional): maximum amount of CPU time this
+  group may use in a period.
+
+- `schedulingPolicy` (optional): specifies how queued queries are selected to run,
+  and how sub-groups become eligible to start their queries. May be one of three values:
+
+  - `fair` (default): queued queries are processed first-in-first-out, and sub-groups
+    must take turns starting new queries, if they have any queued.
+  - `weighted_fair`: sub-groups are selected based on their `schedulingWeight` and the number of
+    queries they are already running concurrently. The expected share of running queries for a
+    sub-group is computed based on the weights for all currently eligible sub-groups. The sub-group
+    with the least concurrency relative to its share is selected to start the next query.
+  - `weighted`: queued queries are selected stochastically in proportion to their priority,
+    specified via the `query_priority` {doc}`session property </sql/set-session>`. Sub groups are selected
+    to start new queries in proportion to their `schedulingWeight`.
+  - `query_priority`: all sub-groups must also be configured with `query_priority`.
+    Queued queries are selected strictly according to their priority.
+
+- `schedulingWeight` (optional): weight of this sub-group used in `weighted`
+  and the `weighted_fair` scheduling policy. Defaults to `1`. See
+  {ref}`scheduleweight-example`.
+
+- `jmxExport` (optional): If true, group statistics are exported to JMX for monitoring.
+  Defaults to `false`.
+
+- `subGroups` (optional): list of sub-groups.
+
+(scheduleweight-example)=
+
+### Scheduling weight example
+
+Schedule weighting is a method of assigning a priority to a resource. Sub-groups
+with a higher scheduling weight are given higher priority. For example, to
+ensure timely execution of scheduled pipelines queries, weight them higher than
+adhoc queries.
+
+In the following example, pipeline queries are weighted with a value of `350`,
+which is higher than the adhoc queries that have a scheduling weight of `150`.
+This means that approximately 70% (350 out of 500 queries) of your queries come
+from the pipeline sub-group, and 30% (150 out of 500 queries) come from the adhoc
+sub-group in a given timeframe. Alternatively, if you set each sub-group value to
+`1`, the weight of the queries for the pipeline and adhoc sub-groups are split
+evenly and each receive 50% of the queries in a given timeframe.
+
+```{literalinclude} schedule-weight-example.json
+:language: text
+```
+
+## Selector rules
+
+- `user` (optional): regex to match against user name.
+
+- `userGroup` (optional): regex to match against every user group the user belongs to.
+
+- `source` (optional): regex to match against source string.
+
+- `queryType` (optional): string to match against the type of the query submitted:
+
+  - `SELECT`: `SELECT` queries.
+  - `EXPLAIN`: `EXPLAIN` queries (but not `EXPLAIN ANALYZE`).
+  - `DESCRIBE`: `DESCRIBE`, `DESCRIBE INPUT`, `DESCRIBE OUTPUT`, and `SHOW` queries.
+  - `INSERT`: `INSERT`, `CREATE TABLE AS`, and `REFRESH MATERIALIZED VIEW` queries.
+  - `UPDATE`: `UPDATE` queries.
+  - `DELETE`: `DELETE` queries.
+  - `ANALYZE`: `ANALYZE` queries.
+  - `DATA_DEFINITION`: Queries that alter/create/drop the metadata of schemas/tables/views,
+    and that manage prepared statements, privileges, sessions, and transactions.
+
+- `clientTags` (optional): list of tags. To match, every tag in this list must be in the list of
+  client-provided tags associated with the query.
+
+- `group` (required): the group these queries will run in.
+
+Selectors are processed sequentially and the first one that matches will be used.
+
+## Global properties
+
+- `cpuQuotaPeriod` (optional): the period in which cpu quotas are enforced.
+
+## Providing selector properties
+
+The source name can be set as follows:
+
+- CLI: use the `--source` option.
+- JDBC driver when used in client apps: add the `source` property to the
+  connection configuration and set the value when using a Java application that
+  uses the JDBC Driver.
+- JDBC driver used with Java programs: add a property with the key `source`
+  and the value on the `Connection` instance as shown in {ref}`the example
+  <jdbc-java-connection>`.
+
+Client tags can be set as follows:
+
+- CLI: use the `--client-tags` option.
+- JDBC driver when used in client apps: add the `clientTags` property to the
+  connection configuration and set the value when using a Java application that
+  uses the JDBC Driver.
+- JDBC driver used with Java programs: add a property with the key
+  `clientTags` and the value on the `Connection` instance as shown in
+  {ref}`the example <jdbc-parameter-reference>`.
+
+## Example
+
+In the example configuration below, there are several resource groups, some of which are templates.
+Templates allow administrators to construct resource group trees dynamically. For example, in
+the `pipeline_${USER}` group, `${USER}` is expanded to the name of the user that submitted
+the query. `${SOURCE}` is also supported, which is expanded to the source that submitted the
+query. You may also use custom named variables in the `source` and `user` regular expressions.
+
+There are four selectors, that define which queries run in which resource group:
+
+- The first selector matches queries from `bob` and places them in the admin group.
+- The second selector matches queries from `admin` user group and places them in the admin group.
+- The third selector matches all data definition (DDL) queries from a source name that includes `pipeline`
+  and places them in the `global.data_definition` group. This could help reduce queue times for this
+  class of queries, since they are expected to be fast.
+- The fourth selector matches queries from a source name that includes `pipeline`, and places them in a
+  dynamically-created per-user pipeline group under the `global.pipeline` group.
+- The fifth selector matches queries that come from BI tools which have a source matching the regular
+  expression `jdbc#(?<toolname>.*)` and have client provided tags that are a superset of `hipri`.
+  These are placed in a dynamically-created sub-group under the `global.adhoc` group.
+  The dynamic sub-groups are created based on the values of named variables `toolname` and `user`.
+  The values are derived from the source regular expression and the query user respectively.
+  Consider a query with a source `jdbc#powerfulbi`, user `kayla`, and client tags `hipri` and `fast`.
+  This query is routed to the `global.adhoc.bi-powerfulbi.kayla` resource group.
+- The last selector is a catch-all, which places all queries that have not yet been matched into a per-user
+  adhoc group.
+
+Together, these selectors implement the following policy:
+
+- The user `bob` and any user belonging to user group `admin`
+  is an admin and can run up to 50 concurrent queries.
+  Queries will be run based on user-provided priority.
+
+For the remaining users:
+
+- No more than 100 total queries may run concurrently.
+- Up to 5 concurrent DDL queries with a source `pipeline` can run. Queries are run in FIFO order.
+- Non-DDL queries will run under the `global.pipeline` group, with a total concurrency of 45, and a per-user
+  concurrency of 5. Queries are run in FIFO order.
+- For BI tools, each tool can run up to 10 concurrent queries, and each user can run up to 3. If the total demand
+  exceeds the limit of 10, the user with the fewest running queries gets the next concurrency slot. This policy
+  results in fairness when under contention.
+- All remaining queries are placed into a per-user group under `global.adhoc.other` that behaves similarly.
+
+### File resource group manager
+
+```{literalinclude} resource-groups-example.json
+:language: json
+```
+
+### Database resource group manager
+
+This example is for a MySQL database.
+
+```sql
+-- global properties
+INSERT INTO resource_groups_global_properties (name, value) VALUES ('cpu_quota_period', '1h');
+
+-- Every row in resource_groups table indicates a resource group.
+-- The enviroment name is 'test_environment', make sure it matches `node.environment` in your cluster.
+-- The parent-child relationship is indicated by the ID in 'parent' column.
+
+-- create a root group 'global' with NULL parent
+INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_policy, jmx_export, environment) VALUES ('global', '80%', 100, 1000, 'weighted', true, 'test_environment');
+
+-- get ID of 'global' group
+SELECT resource_group_id FROM resource_groups WHERE name = 'global';  -- 1
+-- create two new groups with 'global' as parent
+INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_weight, environment, parent) VALUES ('data_definition', '10%', 5, 100, 1, 'test_environment', 1);
+INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_weight, environment, parent) VALUES ('adhoc', '10%', 50, 1, 10, 'test_environment', 1);
+
+-- get ID of 'adhoc' group
+SELECT resource_group_id FROM resource_groups WHERE name = 'adhoc';   -- 3
+-- create 'other' group with 'adhoc' as parent
+INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_weight, scheduling_policy, environment, parent) VALUES ('other', '10%', 2, 1, 10, 'weighted_fair', 'test_environment', 3);
+
+-- get ID of 'other' group
+SELECT resource_group_id FROM resource_groups WHERE name = 'other';  -- 4
+-- create '${USER}' group with 'other' as parent.
+INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, environment, parent) VALUES ('${USER}', '10%', 1, 100, 'test_environment', 4);
+
+-- create 'bi-${toolname}' group with 'adhoc' as parent
+INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_weight, scheduling_policy, environment, parent) VALUES ('bi-${toolname}', '10%', 10, 100, 10, 'weighted_fair', 'test_environment', 3);
+
+-- get ID of 'bi-${toolname}' group
+SELECT resource_group_id FROM resource_groups WHERE name = 'bi-${toolname}';  -- 6
+-- create '${USER}' group with 'bi-${toolname}' as parent. This indicates
+-- nested group 'global.adhoc.bi-${toolname}.${USER}', and will have a
+-- different ID than 'global.adhoc.other.${USER}' created above.
+INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued,  environment, parent) VALUES ('${USER}', '10%', 3, 10, 'test_environment', 6);
+
+-- create 'pipeline' group with 'global' as parent
+INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_weight, jmx_export, environment, parent) VALUES ('pipeline', '80%', 45, 100, 1, true, 'test_environment', 1);
+
+-- get ID of 'pipeline' group
+SELECT resource_group_id FROM resource_groups WHERE name = 'pipeline'; -- 8
+-- create 'pipeline_${USER}' group with 'pipeline' as parent
+INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued,  environment, parent) VALUES ('pipeline_${USER}', '50%', 5, 100, 'test_environment', 8);
+
+-- create a root group 'admin' with NULL parent
+INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_policy, environment, jmx_export) VALUES ('admin', '100%', 50, 100, 'query_priority', 'test_environment', true);
+
+
+-- Selectors
+
+-- use ID of 'admin' resource group for selector
+INSERT INTO selectors (resource_group_id, user_regex, priority) VALUES ((SELECT resource_group_id FROM resource_groups WHERE name = 'admin'), 'bob', 6);
+
+-- use ID of 'admin' resource group for selector
+INSERT INTO selectors (resource_group_id, user_group_regex, priority) VALUES ((SELECT resource_group_id FROM resource_groups WHERE name = 'admin'), 'admin', 5);
+
+-- use ID of 'global.data_definition' resource group for selector
+INSERT INTO selectors (resource_group_id, source_regex, query_type, priority) VALUES ((SELECT resource_group_id FROM resource_groups WHERE name = 'data_definition'), '.*pipeline.*', 'DATA_DEFINITION', 4);
+
+-- use ID of 'global.pipeline.pipeline_${USER}' resource group for selector
+INSERT INTO selectors (resource_group_id, source_regex, priority) VALUES ((SELECT resource_group_id FROM resource_groups WHERE name = 'pipeline_${USER}'), '.*pipeline.*', 3);
+
+-- get ID of 'global.adhoc.bi-${toolname}.${USER}' resource group by disambiguating group name using parent ID
+SELECT A.resource_group_id self_id, B.resource_group_id parent_id, concat(B.name, '.', A.name) name_with_parent
+FROM resource_groups A JOIN resource_groups B ON A.parent = B.resource_group_id
+WHERE A.name = '${USER}' AND B.name = 'bi-${toolname}';
+--  7 |         6 | bi-${toolname}.${USER}
+INSERT INTO selectors (resource_group_id, source_regex, client_tags, priority) VALUES (7, 'jdbc#(?<toolname>.*)', '["hipri"]', 2);
+
+-- get ID of 'global.adhoc.other.${USER}' resource group for by disambiguating group name using parent ID
+SELECT A.resource_group_id self_id, B.resource_group_id parent_id, concat(B.name, '.', A.name) name_with_parent
+FROM resource_groups A JOIN resource_groups B ON A.parent = B.resource_group_id
+WHERE A.name = '${USER}' AND B.name = 'other';
+-- |       5 |         4 | other.${USER}    |
+INSERT INTO selectors (resource_group_id, priority) VALUES (5, 1);
+```
diff --git a/docs/src/main/sphinx/admin/resource-groups.rst b/docs/src/main/sphinx/admin/resource-groups.rst
deleted file mode 100644
index aa5ee4f14857..000000000000
--- a/docs/src/main/sphinx/admin/resource-groups.rst
+++ /dev/null
@@ -1,364 +0,0 @@
-===============
-Resource groups
-===============
-
-Resource groups place limits on resource usage, and can enforce queueing policies on
-queries that run within them, or divide their resources among sub-groups. A query
-belongs to a single resource group, and consumes resources from that group (and its ancestors).
-Except for the limit on queued queries, when a resource group runs out of a resource
-it does not cause running queries to fail; instead new queries become queued.
-A resource group may have sub-groups or may accept queries, but may not do both.
-
-The resource groups and associated selection rules are configured by a manager, which is pluggable.
-
-You can use a file-based or a database-based resource group manager:
-
-* Add a file ``etc/resource-groups.properties``
-* Set the ``resource-groups.configuration-manager`` property to ``file`` or ``db``
-* Add further configuration properties for the desired manager.
-
-File resource group manager
----------------------------
-
-The file resource group manager reads a JSON configuration file, specified with
-``resource-groups.config-file``:
-
-.. code-block:: text
-
-    resource-groups.configuration-manager=file
-    resource-groups.config-file=etc/resource-groups.json
-
-The path to the JSON file can be an absolute path, or a path relative to the Trino
-data directory. The JSON file only needs to be present on the coordinator.
-
-Database resource group manager
--------------------------------
-
-The database resource group manager loads the configuration from a relational database. The
-supported databases are MySQL, PostgreSQL, and Oracle.
-
-.. code-block:: text
-
-    resource-groups.configuration-manager=db
-    resource-groups.config-db-url=jdbc:mysql://localhost:3306/resource_groups
-    resource-groups.config-db-user=username
-    resource-groups.config-db-password=password
-
-The resource group configuration must be populated through tables
-``resource_groups_global_properties``, ``resource_groups``, and
-``selectors``. If any of the tables do not exist when Trino starts, they
-will be created automatically.
-
-The rules in the ``selectors`` table are processed in descending order of the
-values in the ``priority`` field.
-
-The ``resource_groups`` table also contains an ``environment`` field which is
-matched with the value contained in the ``node.environment`` property in
-:ref:`node_properties`. This allows the resource group configuration for different
-Trino clusters to be stored in the same database if required.
-
-The configuration is reloaded from the database every second, and the changes
-are reflected automatically for incoming queries.
-
-Database resource group manager properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-================================================ =========================================================== ===============
-Property name                                    Description                                                 Default
-================================================ =========================================================== ===============
-``resource-groups.config-db-url``                Database URL to load configuration from.                    ``none``
-
-``resource-groups.config-db-user``               Database user to connect with.                              ``none``
-
-``resource-groups.config-db-password``           Password for database user to connect with.                 ``none``
-
-``resource-groups.max-refresh-interval``         The maximum time period for which the cluster will          ``1h``
-                                                 continue to accept queries after refresh failures,
-                                                 causing configuration to become stale.
-
-``resource-groups.refresh-interval``             How often the cluster reloads from the database             ``1s``
-
-``resource-groups.exact-match-selector-enabled`` Setting this flag enables usage of an additional            ``false``
-                                                 ``exact_match_source_selectors`` table to configure
-                                                 resource group selection rules defined exact name based
-                                                 matches for source, environment and query type. By
-                                                 default, the rules are only loaded from the ``selectors``
-                                                 table, with a regex-based filter for ``source``, among
-                                                 other filters.
-================================================ =========================================================== ===============
-
-Resource group properties
--------------------------
-
-* ``name`` (required): name of the group. May be a template (see below).
-
-* ``maxQueued`` (required): maximum number of queued queries. Once this limit is reached
-  new queries are rejected.
-
-* ``softConcurrencyLimit`` (optional): number of concurrently running queries after which
-  new queries will only run if all peer resource groups below their soft limits are ineligible
-  or if all eligible peers are above soft limits.
-
-* ``hardConcurrencyLimit`` (required): maximum number of running queries.
-
-* ``softMemoryLimit`` (required): maximum amount of distributed memory this
-  group may use, before new queries become queued. May be specified as
-  an absolute value (i.e. ``1GB``) or as a percentage (i.e. ``10%``) of the cluster's memory.
-
-* ``softCpuLimit`` (optional): maximum amount of CPU time this
-  group may use in a period (see ``cpuQuotaPeriod``), before a penalty is applied to
-  the maximum number of running queries. ``hardCpuLimit`` must also be specified.
-
-* ``hardCpuLimit`` (optional): maximum amount of CPU time this
-  group may use in a period.
-
-* ``schedulingPolicy`` (optional): specifies how queued queries are selected to run,
-  and how sub-groups become eligible to start their queries. May be one of three values:
-
-  * ``fair`` (default): queued queries are processed first-in-first-out, and sub-groups
-    must take turns starting new queries, if they have any queued.
-
-  * ``weighted_fair``: sub-groups are selected based on their ``schedulingWeight`` and the number of
-    queries they are already running concurrently. The expected share of running queries for a
-    sub-group is computed based on the weights for all currently eligible sub-groups. The sub-group
-    with the least concurrency relative to its share is selected to start the next query.
-
-  * ``weighted``: queued queries are selected stochastically in proportion to their priority,
-    specified via the ``query_priority`` :doc:`session property </sql/set-session>`. Sub groups are selected
-    to start new queries in proportion to their ``schedulingWeight``.
-
-  * ``query_priority``: all sub-groups must also be configured with ``query_priority``.
-    Queued queries are selected strictly according to their priority.
-
-* ``schedulingWeight`` (optional): weight of this sub-group used in ``weight``
-  and the ``weighted_fair`` scheduling policy. Defaults to ``1``. See
-  :ref:`scheduleweight-example`.
-
-* ``jmxExport`` (optional): If true, group statistics are exported to JMX for monitoring.
-  Defaults to ``false``.
-
-* ``subGroups`` (optional): list of sub-groups.
-
-.. _scheduleweight-example:
-
-Scheduling weight example
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Schedule weighting is a method of assigning a priority to a resource. Sub-groups
-with a higher scheduling weight are given higher priority. For example, to
-ensure timely execution of scheduled pipelines queries, weight them higher than
-adhoc queries.
-
-In the following example, pipeline queries are weighted with a value of ``350``,
-which is higher than the adhoc queries that have a scheduling weight of ``150``.
-This means that approximately 70% (350 out of 500 queries) of your queries come
-from the pipeline sub-group, and 30% (150 out of 500 queries) come from the adhoc
-sub-group in a given timeframe. Alternatively, if you set each sub-group value to
-``1``, the weight of the queries for the pipeline and adhoc sub-groups are split
-evenly and each receive 50% of the queries in a given timeframe.
-
-.. literalinclude:: schedule-weight-example.json
-    :language: text
-
-Selector rules
---------------
-
-* ``user`` (optional): regex to match against user name.
-
-* ``userGroup`` (optional): regex to match against every user group the user belongs to.
-
-* ``source`` (optional): regex to match against source string.
-
-* ``queryType`` (optional): string to match against the type of the query submitted:
-
-  * ``SELECT``: ``SELECT`` queries.
-  * ``EXPLAIN``: ``EXPLAIN`` queries (but not ``EXPLAIN ANALYZE``).
-  * ``DESCRIBE``: ``DESCRIBE``, ``DESCRIBE INPUT``, ``DESCRIBE OUTPUT``, and ``SHOW`` queries.
-  * ``INSERT``: ``INSERT``, ``CREATE TABLE AS``, and ``REFRESH MATERIALIZED VIEW`` queries.
-  * ``UPDATE``: ``UPDATE`` queries.
-  * ``DELETE``: ``DELETE`` queries.
-  * ``ANALYZE``: ``ANALYZE`` queries.
-  * ``DATA_DEFINITION``: Queries that alter/create/drop the metadata of schemas/tables/views,
-    and that manage prepared statements, privileges, sessions, and transactions.
-
-* ``clientTags`` (optional): list of tags. To match, every tag in this list must be in the list of
-  client-provided tags associated with the query.
-
-* ``group`` (required): the group these queries will run in.
-
-Selectors are processed sequentially and the first one that matches will be used.
-
-Global properties
------------------
-
-* ``cpuQuotaPeriod`` (optional): the period in which cpu quotas are enforced.
-
-Providing selector properties
------------------------------
-
-The source name can be set as follows:
-
-* CLI: use the ``--source`` option.
-
-* JDBC driver when used in client apps: add the ``source`` property to the
-  connection configuration and set the value when using a Java application that
-  uses the JDBC Driver.
-
-* JDBC driver used with Java programs: add a property with the key ``source``
-  and the value on the ``Connection`` instance as shown in :ref:`the example
-  <jdbc-java-connection>`.
-
-Client tags can be set as follows:
-
-* CLI: use the ``--client-tags`` option.
-
-* JDBC driver when used in client apps: add the ``clientTags`` property to the
-  connection configuration and set the value when using a Java application that
-  uses the JDBC Driver.
-
-* JDBC driver used with Java programs: add a property with the key
-  ``clientTags`` and the value on the ``Connection`` instance as shown in
-  :ref:`the example <jdbc-parameter-reference>`.
-
-Example
--------
-
-In the example configuration below, there are several resource groups, some of which are templates.
-Templates allow administrators to construct resource group trees dynamically. For example, in
-the ``pipeline_${USER}`` group, ``${USER}`` is expanded to the name of the user that submitted
-the query. ``${SOURCE}`` is also supported, which is expanded to the source that submitted the
-query. You may also use custom named variables in the ``source`` and ``user`` regular expressions.
-
-There are four selectors, that define which queries run in which resource group:
-
-* The first selector matches queries from ``bob`` and places them in the admin group.
-
-* The second selector matches queries from ``admin`` user group and places them in the admin group.
-
-* The third selector matches all data definition (DDL) queries from a source name that includes ``pipeline``
-  and places them in the ``global.data_definition`` group. This could help reduce queue times for this
-  class of queries, since they are expected to be fast.
-
-* The fourth selector matches queries from a source name that includes ``pipeline``, and places them in a
-  dynamically-created per-user pipeline group under the ``global.pipeline`` group.
-
-* The fifth selector matches queries that come from BI tools which have a source matching the regular
-  expression ``jdbc#(?<toolname>.*)`` and have client provided tags that are a superset of ``hipri``.
-  These are placed in a dynamically-created sub-group under the ``global.adhoc`` group.
-  The dynamic sub-groups are created based on the values of named variables ``toolname`` and ``user``.
-  The values are derived from the source regular expression and the query user respectively.
-  Consider a query with a source ``jdbc#powerfulbi``, user ``kayla``, and client tags ``hipri`` and ``fast``.
-  This query is routed to the ``global.adhoc.bi-powerfulbi.kayla`` resource group.
-
-* The last selector is a catch-all, which places all queries that have not yet been matched into a per-user
-  adhoc group.
-
-Together, these selectors implement the following policy:
-
-* The user ``bob`` and any user belonging to user group ``admin``
-  is an admin and can run up to 50 concurrent queries.
-  Queries will be run based on user-provided priority.
-
-For the remaining users:
-
-* No more than 100 total queries may run concurrently.
-
-* Up to 5 concurrent DDL queries with a source ``pipeline`` can run. Queries are run in FIFO order.
-
-* Non-DDL queries will run under the ``global.pipeline`` group, with a total concurrency of 45, and a per-user
-  concurrency of 5. Queries are run in FIFO order.
-
-* For BI tools, each tool can run up to 10 concurrent queries, and each user can run up to 3. If the total demand
-  exceeds the limit of 10, the user with the fewest running queries gets the next concurrency slot. This policy
-  results in fairness when under contention.
-
-* All remaining queries are placed into a per-user group under ``global.adhoc.other`` that behaves similarly.
-
-File resource group manager
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. literalinclude:: resource-groups-example.json
-    :language: json
-
-Database resource group manager
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This example is for a MySQL database.
-
-.. code-block:: sql
-
-    -- global properties
-    INSERT INTO resource_groups_global_properties (name, value) VALUES ('cpu_quota_period', '1h');
-
-    -- Every row in resource_groups table indicates a resource group. 
-    -- The enviroment name is 'test_environment', make sure it matches `node.environment` in your cluster.
-    -- The parent-child relationship is indicated by the ID in 'parent' column. 
-
-    -- create a root group 'global' with NULL parent
-    INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_policy, jmx_export, environment) VALUES ('global', '80%', 100, 1000, 'weighted', true, 'test_environment');
-
-    -- get ID of 'global' group
-    SELECT resource_group_id FROM resource_groups WHERE name = 'global';  -- 1
-    -- create two new groups with 'global' as parent
-    INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_weight, environment, parent) VALUES ('data_definition', '10%', 5, 100, 1, 'test_environment', 1);
-    INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_weight, environment, parent) VALUES ('adhoc', '10%', 50, 1, 10, 'test_environment', 1);
-
-    -- get ID of 'adhoc' group
-    SELECT resource_group_id FROM resource_groups WHERE name = 'adhoc';   -- 3
-    -- create 'other' group with 'adhoc' as parent
-    INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_weight, scheduling_policy, environment, parent) VALUES ('other', '10%', 2, 1, 10, 'weighted_fair', 'test_environment', 3);
-
-    -- get ID of 'other' group
-    SELECT resource_group_id FROM resource_groups WHERE name = 'other';  -- 4
-    -- create '${USER}' group with 'other' as parent.
-    INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, environment, parent) VALUES ('${USER}', '10%', 1, 100, 'test_environment', 4);
-
-    -- create 'bi-${toolname}' group with 'adhoc' as parent
-    INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_weight, scheduling_policy, environment, parent) VALUES ('bi-${toolname}', '10%', 10, 100, 10, 'weighted_fair', 'test_environment', 3);
-
-    -- get ID of 'bi-${toolname}' group
-    SELECT resource_group_id FROM resource_groups WHERE name = 'bi-${toolname}';  -- 6
-    -- create '${USER}' group with 'bi-${toolname}' as parent. This indicates
-    -- nested group 'global.adhoc.bi-${toolname}.${USER}', and will have a
-    -- different ID than 'global.adhoc.other.${USER}' created above.
-    INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued,  environment, parent) VALUES ('${USER}', '10%', 3, 10, 'test_environment', 6);
-
-    -- create 'pipeline' group with 'global' as parent
-    INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_weight, jmx_export, environment, parent) VALUES ('pipeline', '80%', 45, 100, 1, true, 'test_environment', 1);
-
-    -- get ID of 'pipeline' group
-    SELECT resource_group_id FROM resource_groups WHERE name = 'pipeline'; -- 8
-    -- create 'pipeline_${USER}' group with 'pipeline' as parent
-    INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued,  environment, parent) VALUES ('pipeline_${USER}', '50%', 5, 100, 'test_environment', 8);
-
-    -- create a root group 'admin' with NULL parent
-    INSERT INTO resource_groups (name, soft_memory_limit, hard_concurrency_limit, max_queued, scheduling_policy, environment, jmx_export) VALUES ('admin', '100%', 50, 100, 'query_priority', 'test_environment', true);
-
-
-    -- Selectors
-
-    -- use ID of 'admin' resource group for selector
-    INSERT INTO selectors (resource_group_id, user_regex, priority) VALUES ((SELECT resource_group_id FROM resource_groups WHERE name = 'admin'), 'bob', 6);
-
-    -- use ID of 'admin' resource group for selector
-    INSERT INTO selectors (resource_group_id, user_group_regex, priority) VALUES ((SELECT resource_group_id FROM resource_groups WHERE name = 'admin'), 'admin', 5);
-
-    -- use ID of 'global.data_definition' resource group for selector
-    INSERT INTO selectors (resource_group_id, source_regex, query_type, priority) VALUES ((SELECT resource_group_id FROM resource_groups WHERE name = 'data_definition'), '.*pipeline.*', 'DATA_DEFINITION', 4);
-
-    -- use ID of 'global.pipeline.pipeline_${USER}' resource group for selector
-    INSERT INTO selectors (resource_group_id, source_regex, priority) VALUES ((SELECT resource_group_id FROM resource_groups WHERE name = 'pipeline_${USER}'), '.*pipeline.*', 3);
-
-    -- get ID of 'global.adhoc.bi-${toolname}.${USER}' resource group by disambiguating group name using parent ID
-    SELECT A.resource_group_id self_id, B.resource_group_id parent_id, concat(B.name, '.', A.name) name_with_parent
-    FROM resource_groups A JOIN resource_groups B ON A.parent = B.resource_group_id
-    WHERE A.name = '${USER}' AND B.name = 'bi-${toolname}';
-    --  7 |         6 | bi-${toolname}.${USER}
-    INSERT INTO selectors (resource_group_id, source_regex, client_tags, priority) VALUES (7, 'jdbc#(?<toolname>.*)', '["hipri"]', 2);
-
-    -- get ID of 'global.adhoc.other.${USER}' resource group for by disambiguating group name using parent ID
-    SELECT A.resource_group_id self_id, B.resource_group_id parent_id, concat(B.name, '.', A.name) name_with_parent
-    FROM resource_groups A JOIN resource_groups B ON A.parent = B.resource_group_id
-    WHERE A.name = '${USER}' AND B.name = 'other';
-    -- |       5 |         4 | other.${USER}    |
-    INSERT INTO selectors (resource_group_id, priority) VALUES (5, 1);
diff --git a/docs/src/main/sphinx/admin/session-property-managers.md b/docs/src/main/sphinx/admin/session-property-managers.md
new file mode 100644
index 000000000000..456c16ca47cc
--- /dev/null
+++ b/docs/src/main/sphinx/admin/session-property-managers.md
@@ -0,0 +1,80 @@
+# Session property managers
+
+Administrators can add session properties to control the behavior for subsets of their workload.
+These properties are defaults, and can be overridden by users, if authorized to do so. Session
+properties can be used to control resource usage, enable or disable features, and change query
+characteristics. Session property managers are pluggable.
+
+Add an `etc/session-property-config.properties` file with the following contents to enable
+the built-in manager, that reads a JSON config file:
+
+```text
+session-property-config.configuration-manager=file
+session-property-manager.config-file=etc/session-property-config.json
+```
+
+Change the value of `session-property-manager.config-file` to point to a JSON config file,
+which can be an absolute path, or a path relative to the Trino data directory.
+
+This configuration file consists of a list of match rules, each of which specify a list of
+conditions that the query must meet, and a list of session properties that should be applied
+by default. All matching rules contribute to constructing a list of session properties. Rules
+are applied in the order they are specified. Rules specified later in the file override values
+for properties that have been previously encountered.
+
+## Match rules
+
+- `user` (optional): regex to match against user name.
+- `source` (optional): regex to match against source string.
+- `queryType` (optional): string to match against the type of the query submitted:
+  : - `DATA_DEFINITION`: Queries that alter/create/drop the metadata of schemas/tables/views, and that manage
+      prepared statements, privileges, sessions, and transactions.
+    - `DELETE`: `DELETE` queries.
+    - `DESCRIBE`: `DESCRIBE`, `DESCRIBE INPUT`, `DESCRIBE OUTPUT`, and `SHOW` queries.
+    - `EXPLAIN`: `EXPLAIN` queries.
+    - `INSERT`: `INSERT` and `CREATE TABLE AS` queries.
+    - `SELECT`: `SELECT` queries.
+- `clientTags` (optional): list of tags. To match, every tag in this list must be in the list of
+  client-provided tags associated with the query.
+- `group` (optional): regex to match against the fully qualified name of the resource group the query is
+  routed to.
+- `sessionProperties`: map with string keys and values. Each entry is a system or catalog property name and
+  corresponding value. Values must be specified as strings, no matter the actual data type.
+
+## Example
+
+Consider the following set of requirements:
+
+- All queries running under the `global` resource group must have an execution time limit of 8 hours.
+- All interactive queries are routed to sub-groups under the `global.interactive` group, and have an execution time
+  limit of 1 hour (tighter than the constraint on `global`).
+- All ETL queries (tagged with 'etl') are routed to sub-groups under the `global.pipeline` group, and must be
+  configured with certain properties to control writer behavior and a hive catalog property.
+
+These requirements can be expressed with the following rules:
+
+```json
+[
+  {
+    "group": "global.*",
+    "sessionProperties": {
+      "query_max_execution_time": "8h"
+    }
+  },
+  {
+    "group": "global.interactive.*",
+    "sessionProperties": {
+      "query_max_execution_time": "1h"
+    }
+  },
+  {
+    "group": "global.pipeline.*",
+    "clientTags": ["etl"],
+    "sessionProperties": {
+      "scale_writers": "true",
+      "writer_min_size": "1GB",
+      "hive.insert_existing_partitions_behavior": "overwrite"
+    }
+  }
+]
+```
diff --git a/docs/src/main/sphinx/admin/session-property-managers.rst b/docs/src/main/sphinx/admin/session-property-managers.rst
deleted file mode 100644
index d82b7f25cc39..000000000000
--- a/docs/src/main/sphinx/admin/session-property-managers.rst
+++ /dev/null
@@ -1,91 +0,0 @@
-=========================
-Session property managers
-=========================
-
-Administrators can add session properties to control the behavior for subsets of their workload.
-These properties are defaults, and can be overridden by users, if authorized to do so. Session
-properties can be used to control resource usage, enable or disable features, and change query
-characteristics. Session property managers are pluggable.
-
-Add an ``etc/session-property-config.properties`` file with the following contents to enable
-the built-in manager, that reads a JSON config file:
-
-.. code-block:: text
-
-    session-property-config.configuration-manager=file
-    session-property-manager.config-file=etc/session-property-config.json
-
-Change the value of ``session-property-manager.config-file`` to point to a JSON config file,
-which can be an absolute path, or a path relative to the Trino data directory.
-
-This configuration file consists of a list of match rules, each of which specify a list of
-conditions that the query must meet, and a list of session properties that should be applied
-by default. All matching rules contribute to constructing a list of session properties. Rules
-are applied in the order they are specified. Rules specified later in the file override values
-for properties that have been previously encountered.
-
-Match rules
------------
-
-* ``user`` (optional): regex to match against user name.
-
-* ``source`` (optional): regex to match against source string.
-
-* ``queryType`` (optional): string to match against the type of the query submitted:
-    * ``DATA_DEFINITION``: Queries that alter/create/drop the metadata of schemas/tables/views, and that manage
-      prepared statements, privileges, sessions, and transactions.
-    * ``DELETE``: ``DELETE`` queries.
-    * ``DESCRIBE``: ``DESCRIBE``, ``DESCRIBE INPUT``, ``DESCRIBE OUTPUT``, and ``SHOW`` queries.
-    * ``EXPLAIN``: ``EXPLAIN`` queries.
-    * ``INSERT``: ``INSERT`` and ``CREATE TABLE AS`` queries.
-    * ``SELECT``: ``SELECT`` queries.
-
-* ``clientTags`` (optional): list of tags. To match, every tag in this list must be in the list of
-  client-provided tags associated with the query.
-
-* ``group`` (optional): regex to match against the fully qualified name of the resource group the query is
-  routed to.
-
-* ``sessionProperties``: map with string keys and values. Each entry is a system or catalog property name and
-  corresponding value. Values must be specified as strings, no matter the actual data type.
-
-Example
--------
-
-Consider the following set of requirements:
-
-* All queries running under the ``global`` resource group must have an execution time limit of 8 hours.
-
-* All interactive queries are routed to sub-groups under the ``global.interactive`` group, and have an execution time
-  limit of 1 hour (tighter than the constraint on ``global``).
-
-* All ETL queries (tagged with 'etl') are routed to sub-groups under the ``global.pipeline`` group, and must be
-  configured with certain properties to control writer behavior and a hive catalog property.
-
-These requirements can be expressed with the following rules:
-
-.. code-block:: json
-
-    [
-      {
-        "group": "global.*",
-        "sessionProperties": {
-          "query_max_execution_time": "8h"
-        }
-      },
-      {
-        "group": "global.interactive.*",
-        "sessionProperties": {
-          "query_max_execution_time": "1h"
-        }
-      },
-      {
-        "group": "global.pipeline.*",
-        "clientTags": ["etl"],
-        "sessionProperties": {
-          "scale_writers": "true",
-          "writer_min_size": "1GB",
-          "hive.insert_existing_partitions_behavior": "overwrite"
-        }
-      }
-    ]
diff --git a/docs/src/main/sphinx/admin/spill.md b/docs/src/main/sphinx/admin/spill.md
new file mode 100644
index 000000000000..5ee1a9552794
--- /dev/null
+++ b/docs/src/main/sphinx/admin/spill.md
@@ -0,0 +1,125 @@
+# Spill to disk
+
+## Overview
+
+In the case of memory intensive operations, Trino allows offloading
+intermediate operation results to disk. The goal of this mechanism is to
+enable execution of queries that require amounts of memory exceeding per query
+or per node limits.
+
+The mechanism is similar to OS level page swapping. However, it is
+implemented on the application level to address specific needs of Trino.
+
+Properties related to spilling are described in {doc}`properties-spilling`.
+
+## Memory management and spill
+
+By default, Trino kills queries, if the memory requested by the query execution
+exceeds session properties `query_max_memory` or
+`query_max_memory_per_node`. This mechanism ensures fairness in allocation
+of memory to queries, and prevents deadlock caused by memory allocation.
+It is efficient when there is a lot of small queries in the cluster, but
+leads to killing large queries that don't stay within the limits.
+
+To overcome this inefficiency, the concept of revocable memory was introduced. A
+query can request memory that does not count toward the limits, but this memory
+can be revoked by the memory manager at any time. When memory is revoked, the
+query runner spills intermediate data from memory to disk and continues to
+process it later.
+
+In practice, when the cluster is idle, and all memory is available, a memory
+intensive query may use all of the memory in the cluster. On the other hand,
+when the cluster does not have much free memory, the same query may be forced to
+use disk as storage for intermediate data. A query, that is forced to spill to
+disk, may have a longer execution time by orders of magnitude than a query that
+runs completely in memory.
+
+Please note that enabling spill-to-disk does not guarantee execution of all
+memory intensive queries. It is still possible that the query runner fails
+to divide intermediate data into chunks small enough so that every chunk fits into
+memory, leading to `Out of memory` errors while loading the data from disk.
+
+## Spill disk space
+
+Spilling intermediate results to disk, and retrieving them back, is expensive
+in terms of IO operations. Thus, queries that use spill likely become
+throttled by disk. To increase query performance, it is recommended to
+provide multiple paths on separate local devices for spill (property
+`spiller-spill-path` in {doc}`properties-spilling`).
+
+The system drive should not be used for spilling, especially not to the drive where the JVM
+is running and writing logs. Doing so may lead to cluster instability. Additionally,
+it is recommended to monitor the disk saturation of the configured spill paths.
+
+Trino treats spill paths as independent disks (see [JBOD](https://wikipedia.org/wiki/Non-RAID_drive_architectures#JBOD)), so
+there is no need to use RAID for spill.
+
+## Spill compression
+
+When spill compression is enabled (`spill-compression-enabled` property in
+{doc}`properties-spilling`), spilled pages are compressed, before being
+written to disk. Enabling this feature can reduce disk IO at the cost
+of extra CPU load to compress and decompress spilled pages.
+
+## Spill encryption
+
+When spill encryption is enabled (`spill-encryption-enabled` property in
+{doc}`properties-spilling`), spill contents are encrypted with a randomly generated
+(per spill file) secret key. Enabling this increases CPU load and reduces throughput
+of spilling to disk, but can protect spilled data from being recovered from spill files.
+Consider reducing the value of `memory-revoking-threshold` when spill
+encryption is enabled, to account for the increase in latency of spilling.
+
+## Supported operations
+
+Not all operations support spilling to disk, and each handles spilling
+differently. Currently, the mechanism is implemented for the following
+operations.
+
+### Joins
+
+During the join operation, one of the tables being joined is stored in memory.
+This table is called the build table. The rows from the other table stream
+through and are passed onto the next operation, if they match rows in the build
+table. The most memory-intensive part of the join is this build table.
+
+When the task concurrency is greater than one, the build table is partitioned.
+The number of partitions is equal to the value of the `task.concurrency`
+configuration parameter (see {doc}`properties-task`).
+
+When the build table is partitioned, the spill-to-disk mechanism can decrease
+the peak memory usage needed by the join operation. When a query approaches the
+memory limit, a subset of the partitions of the build table gets spilled to disk,
+along with rows from the other table that fall into those same partitions. The
+number of partitions, that get spilled, influences the amount of disk space needed.
+
+Afterward, the spilled partitions are read back one-by-one to finish the join
+operation.
+
+With this mechanism, the peak memory used by the join operator can be decreased
+to the size of the largest build table partition. Assuming no data skew, this
+is `1 / task.concurrency` times the size of the whole build table.
+
+### Aggregations
+
+Aggregation functions perform an operation on a group of values and return one
+value. If the number of groups you're aggregating over is large, a significant
+amount of memory may be needed. When spill-to-disk is enabled, if there is not
+enough memory, intermediate cumulated aggregation results are written to disk.
+They are loaded back and merged with a lower memory footprint.
+
+### Order by
+
+If your trying to sort a larger amount of data, a significant amount of memory
+may be needed. When spill to disk for `order by` is enabled, if there is not enough
+memory, intermediate sorted results are written to disk. They are loaded back and
+merged with a lower memory footprint.
+
+### Window functions
+
+Window functions perform an operator over a window of rows, and return one value
+for each row. If this window of rows is large, a significant amount of memory may
+be needed. When spill to disk for window functions is enabled, if there is not enough
+memory, intermediate results are written to disk. They are loaded back and merged
+when memory is available. There is a current limitation that spill does not work
+in all cases, such as when a single window is very large.
diff --git a/docs/src/main/sphinx/admin/spill.rst b/docs/src/main/sphinx/admin/spill.rst
deleted file mode 100644
index 6461ad6d0890..000000000000
--- a/docs/src/main/sphinx/admin/spill.rst
+++ /dev/null
@@ -1,138 +0,0 @@
-=============
-Spill to disk
-=============
-
-Overview
---------
-
-In the case of memory intensive operations, Trino allows offloading
-intermediate operation results to disk. The goal of this mechanism is to
-enable execution of queries that require amounts of memory exceeding per query
-or per node limits.
-
-The mechanism is similar to OS level page swapping. However, it is
-implemented on the application level to address specific needs of Trino.
-
-Properties related to spilling are described in :doc:`properties-spilling`.
-
-Memory management and spill
----------------------------
-
-By default, Trino kills queries, if the memory requested by the query execution
-exceeds session properties ``query_max_memory`` or
-``query_max_memory_per_node``. This mechanism ensures fairness in allocation
-of memory to queries, and prevents deadlock caused by memory allocation.
-It is efficient when there is a lot of small queries in the cluster, but
-leads to killing large queries that don't stay within the limits.
-
-To overcome this inefficiency, the concept of revocable memory was introduced. A
-query can request memory that does not count toward the limits, but this memory
-can be revoked by the memory manager at any time. When memory is revoked, the
-query runner spills intermediate data from memory to disk and continues to
-process it later.
-
-In practice, when the cluster is idle, and all memory is available, a memory
-intensive query may use all of the memory in the cluster. On the other hand,
-when the cluster does not have much free memory, the same query may be forced to
-use disk as storage for intermediate data. A query, that is forced to spill to
-disk, may have a longer execution time by orders of magnitude than a query that
-runs completely in memory.
-
-Please note that enabling spill-to-disk does not guarantee execution of all
-memory intensive queries. It is still possible that the query runner fails
-to divide intermediate data into chunks small enough so that every chunk fits into
-memory, leading to ``Out of memory`` errors while loading the data from disk.
-
-Spill disk space
-----------------
-
-Spilling intermediate results to disk, and retrieving them back, is expensive
-in terms of IO operations. Thus, queries that use spill likely become
-throttled by disk. To increase query performance, it is recommended to
-provide multiple paths on separate local devices for spill (property
-``spiller-spill-path`` in :doc:`properties-spilling`).
-
-The system drive should not be used for spilling, especially not to the drive where the JVM
-is running and writing logs. Doing so may lead to cluster instability. Additionally,
-it is recommended to monitor the disk saturation of the configured spill paths.
-
-Trino treats spill paths as independent disks (see `JBOD
-<https://wikipedia.org/wiki/Non-RAID_drive_architectures#JBOD>`_), so
-there is no need to use RAID for spill.
-
-Spill compression
------------------
-
-When spill compression is enabled (``spill-compression-enabled`` property in
-:doc:`properties-spilling`), spilled pages are compressed, before being
-written to disk. Enabling this feature can reduce disk IO at the cost
-of extra CPU load to compress and decompress spilled pages.
-
-Spill encryption
-----------------
-
-When spill encryption is enabled (``spill-encryption-enabled`` property in
-:doc:`properties-spilling`), spill contents are encrypted with a randomly generated
-(per spill file) secret key. Enabling this increases CPU load and reduces throughput
-of spilling to disk, but can protect spilled data from being recovered from spill files.
-Consider reducing the value of ``memory-revoking-threshold`` when spill
-encryption is enabled, to account for the increase in latency of spilling.
-
-Supported operations
---------------------
-
-Not all operations support spilling to disk, and each handles spilling
-differently. Currently, the mechanism is implemented for the following
-operations.
-
-Joins
-^^^^^
-
-During the join operation, one of the tables being joined is stored in memory.
-This table is called the build table. The rows from the other table stream
-through and are passed onto the next operation, if they match rows in the build
-table. The most memory-intensive part of the join is this build table.
-
-When the task concurrency is greater than one, the build table is partitioned.
-The number of partitions is equal to the value of the ``task.concurrency``
-configuration parameter (see :doc:`properties-task`).
-
-When the build table is partitioned, the spill-to-disk mechanism can decrease
-the peak memory usage needed by the join operation. When a query approaches the
-memory limit, a subset of the partitions of the build table gets spilled to disk,
-along with rows from the other table that fall into those same partitions. The
-number of partitions, that get spilled, influences the amount of disk space needed.
-
-Afterward, the spilled partitions are read back one-by-one to finish the join
-operation.
-
-With this mechanism, the peak memory used by the join operator can be decreased
-to the size of the largest build table partition. Assuming no data skew, this
-is ``1 / task.concurrency`` times the size of the whole build table.
-
-Aggregations
-^^^^^^^^^^^^
-
-Aggregation functions perform an operation on a group of values and return one
-value. If the number of groups you're aggregating over is large, a significant
-amount of memory may be needed. When spill-to-disk is enabled, if there is not
-enough memory, intermediate cumulated aggregation results are written to disk.
-They are loaded back and merged with a lower memory footprint.
-
-Order by
-^^^^^^^^
-
-If your trying to sort a larger amount of data, a significant amount of memory
-may be needed. When spill to disk for ``order by`` is enabled, if there is not enough
-memory, intermediate sorted results are written to disk. They are loaded back and
-merged with a lower memory footprint.
-
-Window functions
-^^^^^^^^^^^^^^^^
-
-Window functions perform an operator over a window of rows, and return one value
-for each row. If this window of rows is large, a significant amount of memory may
-be needed. When spill to disk for window functions is enabled, if there is not enough
-memory, intermediate results are written to disk. They are loaded back and merged
-when memory is available. There is a current limitation that spill does not work
-in all cases, such as when a single window is very large.
diff --git a/docs/src/main/sphinx/admin/tuning.md b/docs/src/main/sphinx/admin/tuning.md
new file mode 100644
index 000000000000..2a3f4064391c
--- /dev/null
+++ b/docs/src/main/sphinx/admin/tuning.md
@@ -0,0 +1,16 @@
+# Tuning Trino
+
+The default Trino settings should work well for most workloads. The following
+information may help you, if your cluster is facing a specific performance problem.
+
+## Config properties
+
+See {doc}`/admin/properties`.
+
+## JVM settings
+
+The following can be helpful for diagnosing garbage collection (GC) issues:
+
+```text
+-Xlog:gc*,safepoint::time,level,tags,tid
+```
diff --git a/docs/src/main/sphinx/admin/tuning.rst b/docs/src/main/sphinx/admin/tuning.rst
deleted file mode 100644
index ac1aa7309199..000000000000
--- a/docs/src/main/sphinx/admin/tuning.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-=============
-Tuning Trino
-=============
-
-The default Trino settings should work well for most workloads. The following
-information may help you, if your cluster is facing a specific performance problem.
-
-Config properties
------------------
-
-See :doc:`/admin/properties`.
-
-JVM settings
-------------
-
-The following can be helpful for diagnosing garbage collection (GC) issues:
-
-.. code-block:: text
-
-    -Xlog:gc*,safepoint::time,level,tags,tid
diff --git a/docs/src/main/sphinx/admin/web-interface.md b/docs/src/main/sphinx/admin/web-interface.md
new file mode 100644
index 000000000000..68e453e4958f
--- /dev/null
+++ b/docs/src/main/sphinx/admin/web-interface.md
@@ -0,0 +1,93 @@
+# Web UI
+
+Trino provides a web-based user interface (UI) for monitoring a Trino cluster
+and managing queries. The Web UI is accessible on the coordinator via
+HTTP or HTTPS, using the corresponding port number specified in the coordinator
+{ref}`config-properties`. It can be configured with {doc}`/admin/properties-web-interface`.
+
+The Web UI can be disabled entirely with the `web-ui.enabled` property.
+
+(web-ui-authentication)=
+
+## Authentication
+
+The Web UI requires users to authenticate. If Trino is not configured to require
+authentication, then any username can be used, and no password is required or
+allowed. Typically, users login with the same username that they use for
+running queries.
+
+If no system access control is installed, then all users are able to view and kill
+any query. This can be restricted by using {ref}`query rules <query-rules>` with the
+{doc}`/security/built-in-system-access-control`. Users always have permission to view
+or kill their own queries.
+
+### Password authentication
+
+Typically, a password-based authentication method
+such as {doc}`LDAP </security/ldap>` or {doc}`password file </security/password-file>`
+is used to secure both the Trino server and the Web UI. When the Trino server
+is configured to use a password authenticator, the Web UI authentication type
+is automatically set to `FORM`. In this case, the Web UI displays a login form
+that accepts a username and password.
+
+### Fixed user authentication
+
+If you require the Web UI to be accessible without authentication, you can set a fixed
+username that will be used for all Web UI access by setting the authentication type to
+`FIXED` and setting the username with the `web-ui.user` configuration property.
+If there is a system access control installed, this user must have permission to view
+(and possibly to kill) queries.
+
+### Other authentication types
+
+The following Web UI authentication types are also supported:
+
+- `CERTIFICATE`, see details in {doc}`/security/certificate`
+- `KERBEROS`, see details in {doc}`/security/kerberos`
+- `JWT`, see details in {doc}`/security/jwt`
+- `OAUTH2`, see details in {doc}`/security/oauth2`
+
+For these authentication types, the username is defined by {doc}`/security/user-mapping`.
+
+(web-ui-overview)=
+
+## User interface overview
+
+The main page has a list of queries along with information like unique query ID, query text,
+query state, percentage completed, username and source from which this query originated.
+The currently running queries are at the top of the page, followed by the most recently
+completed or failed queries.
+
+The possible query states are as follows:
+
+- `QUEUED` -- Query has been accepted and is awaiting execution.
+- `PLANNING` -- Query is being planned.
+- `STARTING` -- Query execution is being started.
+- `RUNNING` -- Query has at least one running task.
+- `BLOCKED` -- Query is blocked and is waiting for resources (buffer space, memory, splits, etc.).
+- `FINISHING` -- Query is finishing (e.g. commit for autocommit queries).
+- `FINISHED` -- Query has finished executing and all output has been consumed.
+- `FAILED` -- Query execution failed.
+
+The `BLOCKED` state is normal, but if it is persistent, it should be investigated.
+It has many potential causes: insufficient memory or splits, disk or network I/O bottlenecks, data skew
+(all the data goes to a few workers), a lack of parallelism (only a few workers available), or computationally
+expensive stages of the query following a given stage.  Additionally, a query can be in
+the `BLOCKED` state if a client is not processing the data fast enough (common with "SELECT \*" queries).
+
+For more detailed information about a query, simply click the query ID link.
+The query detail page has a summary section, graphical representation of various stages of the
+query and a list of tasks. Each task ID can be clicked to get more information about that task.
+
+The summary section has a button to kill the currently running query. There are two visualizations
+available in the summary section: task execution and timeline. The full JSON document containing
+information and statistics about the query is available by clicking the *JSON* link. These visualizations
+and other statistics can be used to analyze where time is being spent for a query.
+
+## Configuring query history
+
+The following configuration properties affect {doc}`how query history
+is collected </admin/properties-query-management>` for display in the Web UI:
+
+- `query.min-expire-age`
+- `query.max-history`
diff --git a/docs/src/main/sphinx/admin/web-interface.rst b/docs/src/main/sphinx/admin/web-interface.rst
deleted file mode 100644
index 374973883076..000000000000
--- a/docs/src/main/sphinx/admin/web-interface.rst
+++ /dev/null
@@ -1,101 +0,0 @@
-======
-Web UI
-======
-
-Trino provides a web-based user interface (UI) for monitoring a Trino cluster
-and managing queries. The Web UI is accessible on the coordinator via
-HTTP or HTTPS, using the corresponding port number specified in the coordinator
-:ref:`config_properties`. It can be configured with :doc:`/admin/properties-web-interface`.
-
-The Web UI can be disabled entirely with the ``web-ui.enabled`` property.
-
-.. _web-ui-authentication:
-
-Authentication
---------------
-
-The Web UI requires users to authenticate. If Trino is not configured to require
-authentication, then any username can be used, and no password is required or
-allowed. Typically, users login with the same username that they use for
-running queries.
-
-If no system access control is installed, then all users are able to view and kill
-any query. This can be restricted by using :ref:`query rules <query_rules>` with the
-:doc:`/security/built-in-system-access-control`. Users always have permission to view
-or kill their own queries.
-
-Password authentication
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Typically, a password-based authentication method
-such as :doc:`LDAP </security/ldap>` or :doc:`password file </security/password-file>`
-is used to secure both the Trino server and the Web UI. When the Trino server
-is configured to use a password authenticator, the Web UI authentication type
-is automatically set to ``form``. In this case, the Web UI displays a login form
-that accepts a username and password.
-
-Fixed user authentication
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If you require the Web UI to be accessible without authentication, you can set a fixed
-username that will be used for all Web UI access by setting the authentication type to
-``fixed`` and setting the username with the ``web-ui.user`` configuration property.
-If there is a system access control installed, this user must have permission to view
-(and possibly to kill) queries.
-
-Other authentication types
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following Web UI authentication types are also supported:
-
-* ``certificate``, see details in :doc:`/security/certificate`
-* ``kerberos``, see details in :doc:`/security/kerberos`
-* ``jwt``, see details in :doc:`/security/jwt`
-* ``oauth2``, see details in :doc:`/security/oauth2`
-
-For these authentication types, the username is defined by :doc:`/security/user-mapping`.
-
-.. _web-ui-overview:
-
-User interface overview
------------------------
-
-The main page has a list of queries along with information like unique query ID, query text,
-query state, percentage completed, username and source from which this query originated.
-The currently running queries are at the top of the page, followed by the most recently
-completed or failed queries.
-
-The possible query states are as follows:
-
-* ``QUEUED`` -- Query has been accepted and is awaiting execution.
-* ``PLANNING`` -- Query is being planned.
-* ``STARTING`` -- Query execution is being started.
-* ``RUNNING`` -- Query has at least one running task.
-* ``BLOCKED`` -- Query is blocked and is waiting for resources (buffer space, memory, splits, etc.).
-* ``FINISHING`` -- Query is finishing (e.g. commit for autocommit queries).
-* ``FINISHED`` -- Query has finished executing and all output has been consumed.
-* ``FAILED`` -- Query execution failed.
-
-The ``BLOCKED`` state is normal, but if it is persistent, it should be investigated.
-It has many potential causes: insufficient memory or splits, disk or network I/O bottlenecks, data skew
-(all the data goes to a few workers), a lack of parallelism (only a few workers available), or computationally
-expensive stages of the query following a given stage.  Additionally, a query can be in
-the ``BLOCKED`` state if a client is not processing the data fast enough (common with "SELECT \*" queries).
-
-For more detailed information about a query, simply click the query ID link.
-The query detail page has a summary section, graphical representation of various stages of the
-query and a list of tasks. Each task ID can be clicked to get more information about that task.
-
-The summary section has a button to kill the currently running query. There are two visualizations
-available in the summary section: task execution and timeline. The full JSON document containing
-information and statistics about the query is available by clicking the *JSON* link. These visualizations
-and other statistics can be used to analyze where time is being spent for a query.
-
-Configuring query history
--------------------------
-
-The following configuration properties affect :doc:`how query history
-is collected </admin/properties-query-management>` for display in the Web UI:
-
-* ``query.min-expire-age``
-* ``query.max-history``
diff --git a/docs/src/main/sphinx/appendix.md b/docs/src/main/sphinx/appendix.md
new file mode 100644
index 000000000000..72fe770f3dfa
--- /dev/null
+++ b/docs/src/main/sphinx/appendix.md
@@ -0,0 +1,8 @@
+# Appendix
+
+```{toctree}
+:maxdepth: 1
+
+appendix/from-hive
+appendix/legal-notices
+```
diff --git a/docs/src/main/sphinx/appendix.rst b/docs/src/main/sphinx/appendix.rst
deleted file mode 100644
index a8dd5fb476b7..000000000000
--- a/docs/src/main/sphinx/appendix.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-*********
-Appendix
-*********
-
-.. toctree::
-    :maxdepth: 1
-
-    appendix/from-hive
-    appendix/legal-notices
-
diff --git a/docs/src/main/sphinx/appendix/from-hive.md b/docs/src/main/sphinx/appendix/from-hive.md
new file mode 100644
index 000000000000..03475abf0510
--- /dev/null
+++ b/docs/src/main/sphinx/appendix/from-hive.md
@@ -0,0 +1,188 @@
+# Migrating from Hive
+
+Trino uses ANSI SQL syntax and semantics, whereas Hive uses a language similar
+to SQL called HiveQL which is loosely modeled after MySQL (which itself has many
+differences from ANSI SQL).
+
+## Use subscript for accessing a dynamic index of an array instead of a udf
+
+The subscript operator in SQL supports full expressions, unlike Hive (which only supports constants). Therefore you can write queries like:
+
+```
+SELECT my_array[CARDINALITY(my_array)] as last_element
+FROM ...
+```
+
+## Avoid out of bounds access of arrays
+
+Accessing out of bounds elements of an array will result in an exception. You can avoid this with an `if` as follows:
+
+```
+SELECT IF(CARDINALITY(my_array) >= 3, my_array[3], NULL)
+FROM ...
+```
+
+## Use ANSI SQL syntax for arrays
+
+Arrays are indexed starting from 1, not from 0:
+
+```
+SELECT my_array[1] AS first_element
+FROM ...
+```
+
+Construct arrays with ANSI syntax:
+
+```
+SELECT ARRAY[1, 2, 3] AS my_array
+```
+
+## Use ANSI SQL syntax for identifiers and strings
+
+Strings are delimited with single quotes and identifiers are quoted with double quotes, not backquotes:
+
+```
+SELECT name AS "User Name"
+FROM "7day_active"
+WHERE name = 'foo'
+```
+
+## Quote identifiers that start with numbers
+
+Identifiers that start with numbers are not legal in ANSI SQL and must be quoted using double quotes:
+
+```
+SELECT *
+FROM "7day_active"
+```
+
+## Use the standard string concatenation operator
+
+Use the ANSI SQL string concatenation operator:
+
+```
+SELECT a || b || c
+FROM ...
+```
+
+## Use standard types for CAST targets
+
+The following standard types are supported for `CAST` targets:
+
+```
+SELECT
+  CAST(x AS varchar)
+, CAST(x AS bigint)
+, CAST(x AS double)
+, CAST(x AS boolean)
+FROM ...
+```
+
+In particular, use `VARCHAR` instead of `STRING`.
+
+## Use CAST when dividing integers
+
+Trino follows the standard behavior of performing integer division when dividing two integers. For example, dividing `7` by `2` will result in `3`, not `3.5`.
+To perform floating point division on two integers, cast one of them to a double:
+
+```
+SELECT CAST(5 AS DOUBLE) / 2
+```
+
+## Use WITH for complex expressions or queries
+
+When you want to re-use a complex output expression as a filter, use either an inline subquery or factor it out using the `WITH` clause:
+
+```
+WITH a AS (
+  SELECT substr(name, 1, 3) x
+  FROM ...
+)
+SELECT *
+FROM a
+WHERE x = 'foo'
+```
+
+## Use UNNEST to expand arrays and maps
+
+Trino supports {ref}`unnest` for expanding arrays and maps.
+Use `UNNEST` instead of `LATERAL VIEW explode()`.
+
+Hive query:
+
+```
+SELECT student, score
+FROM tests
+LATERAL VIEW explode(scores) t AS score;
+```
+
+Trino query:
+
+```
+SELECT student, score
+FROM tests
+CROSS JOIN UNNEST(scores) AS t (score);
+```
+
+## Use ANSI SQL syntax for date and time INTERVAL expressions
+
+Trino supports the ANSI SQL style `INTERVAL` expressions that differs from the implementation used in Hive.
+
+- The `INTERVAL` keyword is required and is not optional.
+- Date and time units must be singular. For example `day` and not `days`.
+- Values must be quoted.
+
+Hive query:
+
+```
+SELECT cast('2000-08-19' as date) + 14 days;
+```
+
+Equivalent Trino query:
+
+```
+SELECT cast('2000-08-19' as date) + INTERVAL '14' day;
+```
+
+## Caution with datediff
+
+The Hive `datediff` function returns the difference between the two dates in
+days and is declared as:
+
+```text
+datediff(string enddate, string startdate)  -> integer
+```
+
+The equivalent Trino function {ref}`date_diff<datetime-interval-functions>`
+uses a reverse order for the two date parameters and requires a unit. This has
+to be taken into account when migrating:
+
+Hive query:
+
+```
+datediff(enddate, startdate)
+```
+
+Trino query:
+
+```
+date_diff('day', startdate, enddate)
+```
+
+## Overwriting data on insert
+
+By default, `INSERT` queries are not allowed to overwrite existing data. You
+can use the catalog session property `insert_existing_partitions_behavior` to
+allow overwrites. Prepend the name of the catalog using the Hive connector, for
+example `hdfs`, and set the property in the session before you run the insert
+query:
+
+```
+SET SESSION hdfs.insert_existing_partitions_behavior = 'OVERWRITE';
+INSERT INTO hdfs.schema.table ...
+```
+
+The resulting behavior is equivalent to using [INSERT OVERWRITE](https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DML) in Hive.
+
+Insert overwrite operation is not supported by Trino when the table is stored on
+encrypted HDFS, when the table is unpartitioned or table is transactional.
diff --git a/docs/src/main/sphinx/appendix/from-hive.rst b/docs/src/main/sphinx/appendix/from-hive.rst
deleted file mode 100644
index 2fa7b6f7aa14..000000000000
--- a/docs/src/main/sphinx/appendix/from-hive.rst
+++ /dev/null
@@ -1,170 +0,0 @@
-===================
-Migrating from Hive
-===================
-
-Trino uses ANSI SQL syntax and semantics, whereas Hive uses a language similar
-to SQL called HiveQL which is loosely modeled after MySQL (which itself has many
-differences from ANSI SQL).
-
-Use subscript for accessing a dynamic index of an array instead of a udf
-------------------------------------------------------------------------
-
-The subscript operator in SQL supports full expressions, unlike Hive (which only supports constants). Therefore you can write queries like::
-
-    SELECT my_array[CARDINALITY(my_array)] as last_element
-    FROM ...
-
-Avoid out of bounds access of arrays
-------------------------------------
-
-Accessing out of bounds elements of an array will result in an exception. You can avoid this with an ``if`` as follows::
-
-    SELECT IF(CARDINALITY(my_array) >= 3, my_array[3], NULL)
-    FROM ...
-
-Use ANSI SQL syntax for arrays
-------------------------------
-
-Arrays are indexed starting from 1, not from 0::
-
-    SELECT my_array[1] AS first_element
-    FROM ...
-
-Construct arrays with ANSI syntax::
-
-    SELECT ARRAY[1, 2, 3] AS my_array
-
-Use ANSI SQL syntax for identifiers and strings
------------------------------------------------
-
-Strings are delimited with single quotes and identifiers are quoted with double quotes, not backquotes::
-
-    SELECT name AS "User Name"
-    FROM "7day_active"
-    WHERE name = 'foo'
-
-Quote identifiers that start with numbers
------------------------------------------
-
-Identifiers that start with numbers are not legal in ANSI SQL and must be quoted using double quotes::
-
-    SELECT *
-    FROM "7day_active"
-
-Use the standard string concatenation operator
-----------------------------------------------
-
-Use the ANSI SQL string concatenation operator::
-
-    SELECT a || b || c
-    FROM ...
-
-Use standard types for CAST targets
------------------------------------
-
-The following standard types are supported for ``CAST`` targets::
-
-    SELECT
-      CAST(x AS varchar)
-    , CAST(x AS bigint)
-    , CAST(x AS double)
-    , CAST(x AS boolean)
-    FROM ...
-
-In particular, use ``VARCHAR`` instead of ``STRING``.
-
-Use CAST when dividing integers
--------------------------------
-
-Trino follows the standard behavior of performing integer division when dividing two integers. For example, dividing ``7`` by ``2`` will result in ``3``, not ``3.5``.
-To perform floating point division on two integers, cast one of them to a double::
-
-    SELECT CAST(5 AS DOUBLE) / 2
-
-Use WITH for complex expressions or queries
--------------------------------------------
-
-When you want to re-use a complex output expression as a filter, use either an inline subquery or factor it out using the ``WITH`` clause::
-
-    WITH a AS (
-      SELECT substr(name, 1, 3) x
-      FROM ...
-    )
-    SELECT *
-    FROM a
-    WHERE x = 'foo'
-
-Use UNNEST to expand arrays and maps
-------------------------------------
-
-Trino supports :ref:`unnest` for expanding arrays and maps.
-Use ``UNNEST`` instead of ``LATERAL VIEW explode()``.
-
-Hive query::
-
-    SELECT student, score
-    FROM tests
-    LATERAL VIEW explode(scores) t AS score;
-
-Trino query::
-
-    SELECT student, score
-    FROM tests
-    CROSS JOIN UNNEST(scores) AS t (score);
-
-Use ANSI SQL syntax for date and time INTERVAL expressions
-----------------------------------------------------------
-
-Trino supports the ANSI SQL style ``INTERVAL`` expressions that differs from the implementation used in Hive.
-
-* The ``INTERVAL`` keyword is required and is not optional.
-* Date and time units must be singular. For example ``day`` and not ``days``.
-* Values must be quoted.
-
-Hive query::
-
-    SELECT cast('2000-08-19' as date) + 14 days;
-
-Equivalent Trino query::
-
-    SELECT cast('2000-08-19' as date) + INTERVAL '14' day;
-
-Caution with datediff
----------------------
-
-The Hive ``datediff`` function returns the difference between the two dates in
-days and is declared as:
-
-.. code-block:: text
-
-    datediff(string enddate, string startdate)  -> integer
-
-The equivalent Trino function :ref:`date_diff<datetime-interval-functions>`
-uses a reverse order for the two date parameters and requires a unit. This has
-to be taken into account when migrating:
-
-Hive query::
-
-    datediff(enddate, startdate)
-
-Trino query::
-
-    date_diff('day', startdate, enddate)
-
-Overwriting data on insert
---------------------------
-
-By default, ``INSERT`` queries are not allowed to overwrite existing data. You
-can use the catalog session property ``insert_existing_partitions_behavior`` to
-allow overwrites. Prepend the name of the catalog using the Hive connector, for
-example ``hdfs``, and set the property in the session before you run the insert
-query::
-
-    SET SESSION hdfs.insert_existing_partitions_behavior = 'OVERWRITE';
-    INSERT INTO hdfs.schema.table ...
-
-The resulting behavior is equivalent to using `INSERT OVERWRITE
-<https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DML>`_ in Hive.
-
-Insert overwrite operation is not supported by Trino when the table is stored on
-encrypted HDFS, when the table is unpartitioned or table is transactional.
diff --git a/docs/src/main/sphinx/appendix/legal-notices.md b/docs/src/main/sphinx/appendix/legal-notices.md
new file mode 100644
index 000000000000..2d462dc22603
--- /dev/null
+++ b/docs/src/main/sphinx/appendix/legal-notices.md
@@ -0,0 +1,57 @@
+# Legal notices
+
+## License
+
+Trino is open source software licensed under the
+[Apache License 2.0](https://github.com/trinodb/trino/blob/master/LICENSE).
+
+## Code
+
+Source code is available at [https://github.com/trinodb](https://github.com/trinodb).
+
+## Governance
+
+The project is run by volunteer contributions and supported by the [Trino
+Software Foundation](https://trino.io/foundation.html).
+
+## Trademarks
+
+Product names, other names, logos and other material used on this site are
+registered trademarks of various entities including, but not limited to, the
+following trademark owners and names:
+
+[American National Standards Institute](https://www.ansi.org/)
+
+- ANSI, and other names
+
+[Apache Software Foundation](https://apache.org/)
+
+- Apache Hadoop, Apache Hive, Apache Iceberg, Apache Kafka, and other names
+
+[Amazon](https://trademarks.amazon.com/)
+
+- AWS, S3, Glue, EMR, and other names
+
+[Docker Inc.](https://www.docker.com/)
+
+- Docker
+
+[Google](https://www.google.com/permissions/trademark/trademark-list/)
+
+- GCP, YouTube and other names
+
+[Linux Mark Institute](http://www.linuxmark.org/)
+
+- Linux
+
+[Microsoft](https://www.microsoft.com/en-us/legal/intellectualproperty/Trademarks/EN-US.aspx)
+
+- Azure, AKS, and others
+
+[Oracle](https://www.oracle.com/)
+
+- Java, JVM, OpenJDK, and other names
+
+[The Linux Foundation](https://www.linuxfoundation.org/trademark-list/)
+
+- Kubernetes, Presto, and other names
diff --git a/docs/src/main/sphinx/appendix/legal-notices.rst b/docs/src/main/sphinx/appendix/legal-notices.rst
deleted file mode 100644
index b5960fa502ac..000000000000
--- a/docs/src/main/sphinx/appendix/legal-notices.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-=============
-Legal notices
-=============
-
-
-License
--------
-
-Trino is open source software licensed under the
-`Apache License 2.0 <https://github.com/trinodb/trino/blob/master/LICENSE>`_.
-
-Code
-----
-
-Source code is available at `https://github.com/trinodb
-<https://github.com/trinodb>`_.
-
-Governance
-----------
-
-The project is run by volunteer contributions and supported by the `Trino
-Software Foundation <https://trino.io/foundation.html>`_.
-
-Trademarks
-----------
-
-Product names, other names, logos and other material used on this site are
-registered trademarks of various entities including, but not limited to, the
-following trademark owners and names:
-
-`American National Standards Institute <https://www.ansi.org/>`_
-
-* ANSI, and other names
-
-`Apache Software Foundation <https://apache.org/>`_
-
-* Apache Hadoop, Apache Hive, Apache Iceberg, Apache Kafka, and other names
-
-`Amazon <https://trademarks.amazon.com/>`_
-
-* AWS, S3, Glue, EMR, and other names
-
-`Docker Inc. <https://www.docker.com/>`_
-
-* Docker
-
-`Google <https://www.google.com/permissions/trademark/trademark-list/>`_
-
-* GCP, YouTube and other names
-
-`Linux Mark Institute <http://www.linuxmark.org/>`_
-
-* Linux
-
-`Microsoft <https://www.microsoft.com/en-us/legal/intellectualproperty/Trademarks/EN-US.aspx>`_
-
-* Azure, AKS, and others
-
-`Oracle <https://www.oracle.com/>`_
-
-* Java, JVM, OpenJDK, and other names
-
-`The Linux Foundation <https://www.linuxfoundation.org/trademark-list/>`_
-
-* Kubernetes, Presto, and other names
-
diff --git a/docs/src/main/sphinx/client.md b/docs/src/main/sphinx/client.md
new file mode 100644
index 000000000000..f458859783ae
--- /dev/null
+++ b/docs/src/main/sphinx/client.md
@@ -0,0 +1,20 @@
+# Clients
+
+A client is used to send queries to Trino and receive results, or otherwise
+interact with Trino and the connected data sources.
+
+Some clients, such as the {doc}`command line interface </client/cli>`, can
+provide a user interface directly. Clients like the {doc}`JDBC driver
+</client/jdbc>`, provide a mechanism for other tools to connect to Trino.
+
+The following clients are available:
+
+```{toctree}
+:maxdepth: 1
+
+client/cli
+client/jdbc
+```
+
+In addition, the community provides [numerous other clients](https://trino.io/resources.html) for platforms such as Python, and these
+can in turn be used to connect applications using these platforms.
diff --git a/docs/src/main/sphinx/client.rst b/docs/src/main/sphinx/client.rst
deleted file mode 100644
index 4515bbc48059..000000000000
--- a/docs/src/main/sphinx/client.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-*******
-Clients
-*******
-
-A client is used to send queries to Trino and receive results, or otherwise
-interact with Trino and the connected data sources.
-
-Some clients, such as the :doc:`command line interface </client/cli>`, can
-provide a user interface directly. Clients like the :doc:`JDBC driver
-</client/jdbc>`, provide a mechanism for other tools to connect to Trino.
-
-The following clients are available:
-
-.. toctree::
-    :maxdepth: 1
-
-    client/cli
-    client/jdbc
-
-In addition, the community provides `numerous other clients
-<https://trino.io/resources.html>`_ for platforms such as Python, and these
-can in turn be used to connect applications using these platforms.
diff --git a/docs/src/main/sphinx/client/cli.md b/docs/src/main/sphinx/client/cli.md
new file mode 100644
index 000000000000..2d09a0eabaa2
--- /dev/null
+++ b/docs/src/main/sphinx/client/cli.md
@@ -0,0 +1,673 @@
+# Command line interface
+
+The Trino CLI provides a terminal-based, interactive shell for running
+queries. The CLI is a
+[self-executing](http://skife.org/java/unix/2011/06/20/really_executable_jars.html)
+JAR file, which means it acts like a normal UNIX executable.
+
+## Requirements
+
+The CLI requires a Java virtual machine available on the path.
+It can be used with Java version 8 and higher.
+
+The CLI uses the {doc}`Trino client REST API </develop/client-protocol>` over
+HTTP/HTTPS to communicate with the coordinator on the cluster.
+
+The CLI version should be identical to the version of the Trino cluster, or
+newer. Older versions typically work, but only a subset is regularly tested.
+Versions before 350 are not supported.
+
+(cli-installation)=
+
+## Installation
+
+Download {maven_download}`cli`, rename it to `trino`, make it executable with
+`chmod +x`, and run it to show the version of the CLI:
+
+```text
+./trino --version
+```
+
+Run the CLI with `--help` or `-h` to see all available options.
+
+Windows users, and users unable to execute the preceeding steps, can use the
+equivalent `java` command with the `-jar` option to run the CLI, and show
+the version:
+
+```text
+java -jar trino-cli-*-executable.jar --version
+```
+
+The syntax can be used for the examples in the following sections. In addition,
+using the `java` command allows you to add configuration options for the Java
+runtime with the `-D` syntax. You can use this for debugging and
+troubleshooting, such as when {ref}`specifying additional Kerberos debug options
+<cli-kerberos-debug>`.
+
+## Running the CLI
+
+The minimal command to start the CLI in interactive mode specifies the URL of
+the coordinator in the Trino cluster:
+
+```text
+./trino http://trino.example.com:8080
+```
+
+If successful, you will get a prompt to execute commands. Use the `help`
+command to see a list of supported commands. Use the `clear` command to clear
+the terminal. To stop and exit the CLI, run `exit` or `quit`.:
+
+```text
+trino> help
+
+Supported commands:
+QUIT
+EXIT
+CLEAR
+EXPLAIN [ ( option [, ...] ) ] <query>
+    options: FORMAT { TEXT | GRAPHVIZ | JSON }
+            TYPE { LOGICAL | DISTRIBUTED | VALIDATE | IO }
+DESCRIBE <table>
+SHOW COLUMNS FROM <table>
+SHOW FUNCTIONS
+SHOW CATALOGS [LIKE <pattern>]
+SHOW SCHEMAS [FROM <catalog>] [LIKE <pattern>]
+SHOW TABLES [FROM <schema>] [LIKE <pattern>]
+USE [<catalog>.]<schema>
+```
+
+You can now run SQL statements. After processing, the CLI will show results and
+statistics.
+
+```text
+trino> SELECT count(*) FROM tpch.tiny.nation;
+
+_col0
+-------
+    25
+(1 row)
+
+Query 20220324_213359_00007_w6hbk, FINISHED, 1 node
+Splits: 13 total, 13 done (100.00%)
+2.92 [25 rows, 0B] [8 rows/s, 0B/s]
+```
+
+As part of starting the CLI, you can set the default catalog and schema. This
+allows you to query tables directly without specifying catalog and schema.
+
+```text
+./trino http://trino.example.com:8080/tpch/tiny
+
+trino:tiny> SHOW TABLES;
+
+  Table
+----------
+customer
+lineitem
+nation
+orders
+part
+partsupp
+region
+supplier
+(8 rows)
+```
+
+You can also set the default catalog and schema with the {doc}`/sql/use`
+statement.
+
+```text
+trino> USE tpch.tiny;
+USE
+trino:tiny>
+```
+
+Many other options are available to further configure the CLI in interactive
+mode:
+
+:::{list-table}
+:widths: 40, 60
+:header-rows: 1
+
+* - Option
+  - Description
+* - `--catalog`
+  - Sets the default catalog. You can change the default catalog and schema with
+    [](/sql/use).
+* - `--client-info`
+  - Adds arbitrary text as extra information about the client.
+* - `--client-request-timeout`
+  - Sets the duration for query processing, after which, the client request is
+    terminated. Defaults to `2m`.
+* - `--client-tags`
+  - Adds extra tags information about the client and the CLI user. Separate
+    multiple tags with commas. The tags can be used as input for
+    [](/admin/resource-groups).
+* - `--debug`
+  - Enables display of debug information during CLI usage for
+    [](cli-troubleshooting). Displays more information about query
+    processing statistics.
+* - `--disable-auto-suggestion`
+  - Disables autocomplete suggestions.
+* - `--disable-compression`
+  - Disables compression of query results.
+* - `--editing-mode`
+  - Sets key bindings in the CLI to be compatible with VI or
+    EMACS editors. Defaults to `EMACS`.
+* - `--http-proxy`
+  - Configures the URL of the HTTP proxy to connect to Trino.
+* - `--history-file`
+  - Path to the [history file](cli-history). Defaults to `~/.trino_history`.
+* - `--network-logging`
+  - Configures the level of detail provided for network logging of the CLI.
+    Defaults to `NONE`, other options are `BASIC`, `HEADERS`, or `BODY`.
+* - `--output-format-interactive=<format>`
+  - Specify the [format](cli-output-format) to use for printing query results.
+    Defaults to `ALIGNED`.
+* - `--pager=<pager>`
+  - Path to the pager program used to display the query results. Set to an empty
+    value to completely disable pagination. Defaults to `less` with a carefully
+    selected set of options.
+* - `--no-progress`
+  - Do not show query processing progress.
+* - `--password`
+  - Prompts for a password. Use if your Trino server requires password
+    authentication. You can set the `TRINO_PASSWORD` environment variable with
+    the password value to avoid the prompt. For more information, see
+    [](cli-username-password-auth).
+* - `--schema`
+  - Sets the default schema. You can change the default catalog and schema
+    with [](/sql/use).
+* - `--server`
+  - The HTTP/HTTPS address and port of the Trino coordinator. The port must be
+    set to the port the Trino coordinator is listening for connections on. Trino
+    server location defaults to `http://localhost:8080`. Can only be set if URL
+    is not specified.
+* - `--session`
+  - Sets one or more [session properties](session-properties-definition).
+    Property can be used multiple times with the format
+    `session_property_name=value`.
+* - `--socks-proxy`
+  - Configures the URL of the SOCKS proxy to connect to Trino.
+* - `--source`
+  - Specifies the name of the application or source connecting to Trino.
+    Defaults to `trino-cli`. The value can be used as input for
+    [](/admin/resource-groups).
+* - `--timezone`
+  - Sets the time zone for the session using the [time zone name](
+    <https://wikipedia.org/wiki/List_of_tz_database_time_zones>). Defaults to
+    the timezone set on your workstation.
+* - `--user`
+  - Sets the username for [](cli-username-password-auth). Defaults to your
+    operating system username. You can override the default username, if your
+    cluster uses a different username or authentication mechanism. 
+:::
+
+Most of the options can also be set as parameters in the URL. This means
+a JDBC URL can be used in the CLI after removing the `jdbc:` prefix.
+However, the same parameter may not be specified using both methods.
+See {doc}`the JDBC driver parameter reference </client/jdbc>`
+to find out URL parameter names. For example:
+
+```text
+./trino 'https://trino.example.com?SSL=true&SSLVerification=FULL&clientInfo=extra'
+```
+
+(cli-tls)=
+
+## TLS/HTTPS
+
+Trino is typically available with an HTTPS URL. This means that all network
+traffic between the CLI and Trino uses TLS. {doc}`TLS configuration
+</security/tls>` is common, since it is a requirement for {ref}`any
+authentication <cli-authentication>`.
+
+Use the HTTPS URL to connect to the server:
+
+```text
+./trino https://trino.example.com
+```
+
+The recommended TLS implementation is to use a globally trusted certificate. In
+this case, no other options are necessary, since the JVM running the CLI
+recognizes these certificates.
+
+Use the options from the following table to further configure TLS and
+certificate usage:
+
+:::{list-table}
+:widths: 40, 60
+:header-rows: 1
+
+* - Option
+  - Description
+* - `--insecure`
+  - Skip certificate validation when connecting with TLS/HTTPS (should only be
+    used for debugging).
+* - `--keystore-path`
+  - The location of the Java Keystore file that contains the certificate of the
+    server to connect with TLS.
+* - `--keystore-password`
+  - The password for the keystore. This must match the password you specified
+    when creating the keystore.
+* - `--keystore-type`
+  - Determined by the keystore file format. The default keystore type is JKS.
+    This advanced option is only necessary if you use a custom Java Cryptography
+    Architecture (JCA) provider implementation.
+* - `--truststore-password`
+  - The password for the truststore. This must match the password you specified
+    when creating the truststore.
+* - `--truststore-path`
+  - The location of the Java truststore file that will be used to secure TLS.
+* - `--truststore-type`
+  - Determined by the truststore file format. The default keystore type is JKS.
+    This advanced option is only necessary if you use a custom Java Cryptography
+    Architecture (JCA) provider implementation.
+* - `--use-system-truststore`
+  - Verify the server certificate using the system truststore of the operating
+    system. Windows and macOS are supported. For other operating systems, the
+    default Java truststore is used. The truststore type can be overridden using
+    `--truststore-type`.
+:::
+
+(cli-authentication)=
+
+## Authentication
+
+The Trino CLI supports many {doc}`/security/authentication-types` detailed in
+the following sections:
+
+(cli-username-password-auth)=
+
+### Username and password authentication
+
+Username and password authentication is typically configured in a cluster using
+the `PASSWORD` {doc}`authentication type </security/authentication-types>`,
+for example with {doc}`/security/ldap` or {doc}`/security/password-file`.
+
+The following code example connects to the server, establishes your user name,
+and prompts the CLI for your password:
+
+```text
+./trino https://trino.example.com --user=exampleusername --password
+```
+
+Alternatively, set the password as the value of the `TRINO_PASSWORD`
+environment variable. Typically use single quotes to avoid problems with
+special characters such as `$`:
+
+```text
+export TRINO_PASSWORD='LongSecurePassword123!@#'
+```
+
+If the `TRINO_PASSWORD` environment variable is set, you are not prompted
+to provide a password to connect with the CLI.
+
+```text
+./trino https://trino.example.com --user=exampleusername --password
+```
+
+(cli-external-sso-auth)=
+
+### External authentication - SSO
+
+Use the `--external-authentication` option for browser-based SSO
+authentication, as detailed in {doc}`/security/oauth2`. With this configuration,
+the CLI displays a URL that you must open in a web browser for authentication.
+
+The detailed behavior is as follows:
+
+- Start the CLI with the `--external-authentication` option and execute a
+  query.
+- The CLI starts and connects to Trino.
+- A message appears in the CLI directing you to open a browser with a specified
+  URL when the first query is submitted.
+- Open the URL in a browser and follow through the authentication process.
+- The CLI automatically receives a token.
+- When successfully authenticated in the browser, the CLI proceeds to execute
+  the query.
+- Further queries in the CLI session do not require additional logins while the
+  authentication token remains valid. Token expiration depends on the external
+  authentication type configuration.
+- Expired tokens force you to log in again.
+
+(cli-certificate-auth)=
+
+### Certificate authentication
+
+Use the following CLI arguments to connect to a cluster that uses
+{doc}`certificate authentication </security/certificate>`.
+
+:::{list-table} CLI options for certificate authentication
+:widths: 35 65
+:header-rows: 1
+
+* - Option
+  - Description
+* - `--keystore-path=<path>`
+  - Absolute or relative path to a [PEM](/security/inspect-pem) or
+    [JKS](/security/inspect-jks) file, which must contain a certificate
+    that is trusted by the Trino cluster you are connecting to.
+* - `--keystore-password=<password>`
+  - Only required if the keystore has a password.
+:::
+
+The truststore related options are independent of client certificate
+authentication with the CLI; instead, they control the client's trust of the
+server's certificate.
+
+(cli-jwt-auth)=
+
+### JWT authentication
+
+To access a Trino cluster configured to use {doc}`/security/jwt`, use the
+`--access-token=<token>` option to pass a JWT to the server.
+
+(cli-kerberos-auth)=
+
+### Kerberos authentication
+
+The Trino CLI can connect to a Trino cluster that has {doc}`/security/kerberos`
+enabled.
+
+Invoking the CLI with Kerberos support enabled requires a number of additional
+command line options. You also need the {ref}`Kerberos configuration files
+<server-kerberos-principals>` for your user on the machine running the CLI. The
+simplest way to invoke the CLI is with a wrapper script:
+
+```text
+#!/bin/bash
+
+./trino \
+  --server https://trino.example.com \
+  --krb5-config-path /etc/krb5.conf \
+  --krb5-principal someuser@EXAMPLE.COM \
+  --krb5-keytab-path /home/someuser/someuser.keytab \
+  --krb5-remote-service-name trino
+```
+
+When using Kerberos authentication, access to the Trino coordinator must be
+through {doc}`TLS and HTTPS </security/tls>`.
+
+The following table lists the available options for Kerberos authentication:
+
+:::{list-table} CLI options for Kerberos authentication
+:widths: 40, 60
+:header-rows: 1
+
+* - Option
+  - Description
+* - `--krb5-config-path`
+  - Path to Kerberos configuration files.
+* - `--krb5-credential-cache-path`
+  - Kerberos credential cache path.
+* - `--krb5-disable-remote-service-hostname-canonicalization`
+  - Disable service hostname canonicalization using the DNS reverse lookup.
+* - `--krb5-keytab-path`
+  - The location of the keytab that can be used to authenticate the principal
+    specified by `--krb5-principal`.
+* - `--krb5-principal`
+  - The principal to use when authenticating to the coordinator.
+* - `--krb5-remote-service-name`
+  - Trino coordinator Kerberos service name.
+* - `--krb5-service-principal-pattern`
+  - Remote kerberos service principal pattern. Defaults to `${SERVICE}@${HOST}`.
+:::
+
+(cli-kerberos-debug)=
+
+#### Additional Kerberos debugging information
+
+You can enable additional Kerberos debugging information for the Trino CLI
+process by passing `-Dsun.security.krb5.debug=true`,
+`-Dtrino.client.debugKerberos=true`, and
+`-Djava.security.debug=gssloginconfig,configfile,configparser,logincontext`
+as a JVM argument when {ref}`starting the CLI process <cli-installation>`:
+
+```text
+java \
+  -Dsun.security.krb5.debug=true \
+  -Djava.security.debug=gssloginconfig,configfile,configparser,logincontext \
+  -Dtrino.client.debugKerberos=true \
+  -jar trino-cli-*-executable.jar \
+  --server https://trino.example.com \
+  --krb5-config-path /etc/krb5.conf \
+  --krb5-principal someuser@EXAMPLE.COM \
+  --krb5-keytab-path /home/someuser/someuser.keytab \
+  --krb5-remote-service-name trino
+```
+
+For help with interpreting Kerberos debugging messages, see {ref}`additional
+resources <kerberos-debug>`.
+
+## Pagination
+
+By default, the results of queries are paginated using the `less` program
+which is configured with a carefully selected set of options. This behavior
+can be overridden by setting the `--pager` option or
+the `TRINO_PAGER` environment variable to the name of a different program
+such as `more` or [pspg](https://github.com/okbob/pspg),
+or it can be set to an empty value to completely disable pagination.
+
+(cli-history)=
+
+## History
+
+The CLI keeps a history of your previously used commands. You can access your
+history by scrolling or searching. Use the up and down arrows to scroll and
+{kbd}`Control+S` and {kbd}`Control+R` to search. To execute a query again,
+press {kbd}`Enter`.
+
+By default, you can locate the Trino history file in `~/.trino_history`.
+Use the `--history-file` option or the `` `TRINO_HISTORY_FILE `` environment variable
+to change the default.
+
+### Auto suggestion
+
+The CLI generates autocomplete suggestions based on command history.
+
+Press {kbd}`→` to accept the suggestion and replace the current command line
+buffer. Press {kbd}`Ctrl+→` ({kbd}`Option+→` on Mac) to accept only the next
+keyword. Continue typing to reject the suggestion.
+
+## Configuration file
+
+The CLI can read default values for all options from a file. It uses the first
+file found from the ordered list of locations:
+
+- File path set as value of the `TRINO_CONFIG` environment variable.
+- `.trino_config` in the current users home directory.
+- `$XDG_CONFIG_HOME/trino/config`.
+
+For example, you could create separate configuration files with different
+authentication options, like `kerberos-cli.properties` and `ldap-cli.properties`.
+Assuming they're located in the current directory, you can set the
+`TRINO_CONFIG` environment variable for a single invocation of the CLI by
+adding it before the `trino` command:
+
+```text
+TRINO_CONFIG=kerberos-cli.properties trino https://first-cluster.example.com:8443
+TRINO_CONFIG=ldap-cli.properties trino https://second-cluster.example.com:8443
+```
+
+In the preceding example, the default configuration files are not used.
+
+You can use all supported options without the `--` prefix in the configuration
+properties file. Options that normally don't take an argument are boolean, so
+set them to either `true` or `false`. For example:
+
+```properties
+output-format-interactive=AUTO
+timezone=Europe/Warsaw
+user=trino-client
+network-logging=BASIC
+krb5-disable-remote-service-hostname-canonicalization=true
+```
+
+## Batch mode
+
+Running the Trino CLI with the `--execute`, `--file`, or passing queries to
+the standard input uses the batch (non-interactive) mode. In this mode
+the CLI does not report progress, and exits after processing the supplied
+queries. Results are printed in `CSV` format by default. You can configure
+other formats and redirect the output to a file.
+
+The following options are available to further configure the CLI in batch
+mode:
+
+:::{list-table}
+:widths: 40, 60
+:header-rows: 1
+
+* - Option
+  - Description
+* - `--execute=<execute>`
+  - Execute specified statements and exit.
+* - `-f`, `--file=<file>`
+  - Execute statements from file and exit.
+* - `--ignore-errors`
+  - Continue processing in batch mode when an error occurs. Default is to exit
+    immediately.
+* - `--output-format=<format>`
+  - Specify the [format](cli-output-format) to use for printing query results.
+    Defaults to `CSV`.
+* - `--progress`
+  - Show query progress in batch mode. It does not affect the output, which, for
+    example can be safely redirected to a file.
+:::
+
+### Examples
+
+Consider the following command run as shown, or with the
+`--output-format=CSV` option, which is the default for non-interactive usage:
+
+```text
+trino --execute 'SELECT nationkey, name, regionkey FROM tpch.sf1.nation LIMIT 3'
+```
+
+The output is as follows:
+
+```text
+"0","ALGERIA","0"
+"1","ARGENTINA","1"
+"2","BRAZIL","1"
+```
+
+The output with the `--output-format=JSON` option:
+
+```json
+{"nationkey":0,"name":"ALGERIA","regionkey":0}
+{"nationkey":1,"name":"ARGENTINA","regionkey":1}
+{"nationkey":2,"name":"BRAZIL","regionkey":1}
+```
+
+The output with the `--output-format=ALIGNED` option, which is the default
+for interactive usage:
+
+```text
+nationkey |   name    | regionkey
+----------+-----------+----------
+        0 | ALGERIA   |         0
+        1 | ARGENTINA |         1
+        2 | BRAZIL    |         1
+```
+
+The output with the `--output-format=VERTICAL` option:
+
+```text
+-[ RECORD 1 ]--------
+nationkey | 0
+name      | ALGERIA
+regionkey | 0
+-[ RECORD 2 ]--------
+nationkey | 1
+name      | ARGENTINA
+regionkey | 1
+-[ RECORD 3 ]--------
+nationkey | 2
+name      | BRAZIL
+regionkey | 1
+```
+
+The preceding command with `--output-format=NULL` produces no output.
+However, if you have an error in the query, such as incorrectly using
+`region` instead of `regionkey`, the command has an exit status of 1
+and displays an error message (which is unaffected by the output format):
+
+```text
+Query 20200707_170726_00030_2iup9 failed: line 1:25: Column 'region' cannot be resolved
+SELECT nationkey, name, region FROM tpch.sf1.nation LIMIT 3
+```
+
+(cli-output-format)=
+
+## Output formats
+
+The Trino CLI provides the options `--output-format`
+and `--output-format-interactive` to control how the output is displayed.
+The available options shown in the following table must be entered
+in uppercase. The default value is `ALIGNED` in interactive mode,
+and `CSV` in non-interactive mode.
+
+:::{list-table} Output format options
+:widths: 25, 75
+:header-rows: 1
+
+* - Option
+  - Description
+* - `CSV`
+  - Comma-separated values, each value quoted. No header row.
+* - `CSV_HEADER`
+  - Comma-separated values, quoted with header row.
+* - `CSV_UNQUOTED`
+  - Comma-separated values without quotes.
+* - `CSV_HEADER_UNQUOTED`
+  - Comma-separated values with header row but no quotes.
+* - `TSV`
+  - Tab-separated values.
+* - `TSV_HEADER`
+  - Tab-separated values with header row.
+* - `JSON`
+  - Output rows emitted as JSON objects with name-value pairs.
+* - `ALIGNED`
+  - Output emitted as an ASCII character table with values.
+* - `VERTICAL`
+  - Output emitted as record-oriented top-down lines, one per value.
+* - `AUTO`
+  - Same as `ALIGNED` if output would fit the current terminal width,
+    and `VERTICAL` otherwise.
+* - `MARKDOWN`
+  - Output emitted as a Markdown table.
+* - `NULL`
+  - Suppresses normal query results. This can be useful during development to
+    test a query's shell return code or to see whether it results in error
+    messages. 
+:::
+
+(cli-troubleshooting)=
+
+## Troubleshooting
+
+If something goes wrong, you see an error message:
+
+```text
+$ trino
+trino> select count(*) from tpch.tiny.nations;
+Query 20200804_201646_00003_f5f6c failed: line 1:22: Table 'tpch.tiny.nations' does not exist
+select count(*) from tpch.tiny.nations
+```
+
+To view debug information, including the stack trace for failures, use the
+`--debug` option:
+
+```text
+$ trino --debug
+trino> select count(*) from tpch.tiny.nations;
+Query 20200804_201629_00002_f5f6c failed: line 1:22: Table 'tpch.tiny.nations' does not exist
+io.trino.spi.TrinoException: line 1:22: Table 'tpch.tiny.nations' does not exist
+at io.trino.sql.analyzer.SemanticExceptions.semanticException(SemanticExceptions.java:48)
+at io.trino.sql.analyzer.SemanticExceptions.semanticException(SemanticExceptions.java:43)
+...
+at java.base/java.lang.Thread.run(Thread.java:834)
+select count(*) from tpch.tiny.nations
+```
diff --git a/docs/src/main/sphinx/client/cli.rst b/docs/src/main/sphinx/client/cli.rst
deleted file mode 100644
index 577cfed299c9..000000000000
--- a/docs/src/main/sphinx/client/cli.rst
+++ /dev/null
@@ -1,675 +0,0 @@
-======================
-Command line interface
-======================
-
-The Trino CLI provides a terminal-based, interactive shell for running
-queries. The CLI is a
-`self-executing <http://skife.org/java/unix/2011/06/20/really_executable_jars.html>`_
-JAR file, which means it acts like a normal UNIX executable.
-
-Requirements
-------------
-
-The CLI requires a Java virtual machine available on the path.
-It can be used with Java version 8 and higher.
-
-The CLI uses the :doc:`Trino client REST API </develop/client-protocol>` over
-HTTP/HTTPS to communicate with the coordinator on the cluster.
-
-The CLI version should be identical to the version of the Trino cluster, or
-newer. Older versions typically work, but only a subset is regularly tested.
-Versions before 350 are not supported.
-
-.. _cli-installation:
-
-Installation
-------------
-
-Download :maven_download:`cli`, rename it to ``trino``, make it executable with
-``chmod +x``, and run it to show the version of the CLI:
-
-.. code-block:: text
-
-    ./trino --version
-
-Run the CLI with ``--help`` or ``-h`` to see all available options.
-
-Windows users, and users unable to execute the preceeding steps, can use the
-equivalent ``java`` command with the ``-jar`` option to run the CLI, and show
-the version:
-
-.. code-block:: text
-
-    java -jar trino-cli-*-executable.jar --version
-
-The syntax can be used for the examples in the following sections. In addition,
-using the ``java`` command allows you to add configuration options for the Java
-runtime with the ``-D`` syntax. You can use this for debugging and
-troubleshooting, such as when :ref:`specifying additional Kerberos debug options
-<cli-kerberos-debug>`.
-
-Running the CLI
----------------
-
-The minimal command to start the CLI in interactive mode specifies the URL of
-the coordinator in the Trino cluster:
-
-.. code-block:: text
-
-    ./trino --server http://trino.example.com:8080
-
-If successful, you will get a prompt to execute commands. Use the ``help``
-command to see a list of supported commands. Use the ``clear`` command to clear
-the terminal. To stop and exit the CLI, run ``exit`` or ``quit``.:
-
-.. code-block:: text
-
-    trino> help
-
-    Supported commands:
-    QUIT
-    EXIT
-    CLEAR
-    EXPLAIN [ ( option [, ...] ) ] <query>
-        options: FORMAT { TEXT | GRAPHVIZ | JSON }
-                TYPE { LOGICAL | DISTRIBUTED | VALIDATE | IO }
-    DESCRIBE <table>
-    SHOW COLUMNS FROM <table>
-    SHOW FUNCTIONS
-    SHOW CATALOGS [LIKE <pattern>]
-    SHOW SCHEMAS [FROM <catalog>] [LIKE <pattern>]
-    SHOW TABLES [FROM <schema>] [LIKE <pattern>]
-    USE [<catalog>.]<schema>
-
-You can now run SQL statements. After processing, the CLI will show results and
-statistics.
-
-.. code-block:: text
-
-  trino> SELECT count(*) FROM tpch.tiny.nation;
-
-  _col0
-  -------
-      25
-  (1 row)
-
-  Query 20220324_213359_00007_w6hbk, FINISHED, 1 node
-  Splits: 13 total, 13 done (100.00%)
-  2.92 [25 rows, 0B] [8 rows/s, 0B/s]
-
-As part of starting the CLI, you can set the default catalog and schema. This
-allows you to query tables directly without specifying catalog and schema.
-
-.. code-block:: text
-
-  ./trino --server http://trino.example.com:8080 --catalog tpch --schema tiny
-
-  trino:tiny> SHOW TABLES;
-
-    Table
-  ----------
-  customer
-  lineitem
-  nation
-  orders
-  part
-  partsupp
-  region
-  supplier
-  (8 rows)
-
-You can also set the default catalog and schema with the :doc:`/sql/use`
-statement.
-
-.. code-block:: text
-
-  trino> USE tpch.tiny;
-  USE
-  trino:tiny>
-
-Many other options are available to further configure the CLI in interactive
-mode:
-
-.. list-table::
-  :widths: 40, 60
-  :header-rows: 1
-
-  * - Option
-    - Description
-  * - ``--catalog``
-    - Sets the default catalog. You can change the default catalog and schema
-      with :doc:`/sql/use`.
-  * - ``--client-info``
-    - Adds arbitrary text as extra information about the client.
-  * - ``--client-request-timeout``
-    - Sets the duration for query processing, after which, the client request is
-      terminated. Defaults to ``2m``.
-  * - ``--client-tags``
-    - Adds extra tags information about the client and the CLI user. Separate
-      multiple tags with commas. The tags can be used as input for
-      :doc:`/admin/resource-groups`.
-  * - ``--debug``
-    - Enables display of debug information during CLI usage for
-      :ref:`cli-troubleshooting`. Displays more information about query
-      processing statistics.
-  * - ``--disable-auto-suggestion``
-    - Disables autocomplete suggestions.
-  * - ``--disable-compression``
-    - Disables compression of query results.
-  * - ``--editing-mode``
-    - Sets key bindings in the CLI to be compatible with VI or
-      EMACS editors. Defaults to ``EMACS``.
-  * - ``--http-proxy``
-    - Configures the URL of the HTTP proxy to connect to Trino.
-  * - ``--history-file``
-    - Path to the :ref:`history file <cli-history>`. Defaults to ``~/.trino_history``.
-  * - ``--network-logging``
-    - Configures the level of detail provided for network logging of the CLI.
-      Defaults to ``NONE``, other options are ``BASIC``, ``HEADERS``, or
-      ``BODY``.
-  * - ``--output-format-interactive=<format>``
-    - Specify the :ref:`format <cli-output-format>` to use
-      for printing query results. Defaults to ``ALIGNED``.
-  * - ``--pager=<pager>``
-    - Path to the pager program used to display the query results. Set to
-      an empty value to completely disable pagination. Defaults to ``less``
-      with a carefully selected set of options.
-  * - ``--no-progress``
-    - Do not show query processing progress.
-  * - ``--password``
-    - Prompts for a password. Use if your Trino server requires password
-      authentication. You can set the ``TRINO_PASSWORD`` environment variable
-      with the password value to avoid the prompt. For more information, see :ref:`cli-username-password-auth`.
-  * - ``--schema``
-    - Sets the default schema. You can change the default catalog and schema
-      with :doc:`/sql/use`.
-  * - ``--server``
-    - The HTTP/HTTPS address and port of the Trino coordinator. The port must be
-      set to the port the Trino coordinator is listening for connections on.
-      Trino server location defaults to ``http://localhost:8080``.
-  * - ``--session``
-    - Sets one or more :ref:`session properties
-      <session-properties-definition>`. Property can be used multiple times with
-      the format ``session_property_name=value``.
-  * - ``--socks-proxy``
-    - Configures the URL of the SOCKS proxy to connect to Trino.
-  * - ``--source``
-    - Specifies the name of the application or source connecting to Trino.
-      Defaults to ``trino-cli``. The value can be used as input for
-      :doc:`/admin/resource-groups`.
-  * - ``--timezone``
-    - Sets the time zone for the session using the `time zone name
-      <https://wikipedia.org/wiki/List_of_tz_database_time_zones>`_. Defaults
-      to the timezone set on your workstation.
-  * - ``--user``
-    - Sets the username for :ref:`cli-username-password-auth`. Defaults to your
-      operating system username. You can override the default username,
-      if your cluster uses a different username or authentication mechanism.
-
-.. _cli-tls:
-
-TLS/HTTPS
----------
-
-Trino is typically available with an HTTPS URL. This means that all network
-traffic between the CLI and Trino uses TLS. :doc:`TLS configuration
-</security/tls>` is common, since it is a requirement for :ref:`any
-authentication <cli-authentication>`.
-
-Use the HTTPS URL to connect to the server:
-
-.. code-block:: text
-
-    ./trino --server https://trino.example.com
-
-The recommended TLS implementation is to use a globally trusted certificate. In
-this case, no other options are necessary, since the JVM running the CLI
-recognizes these certificates.
-
-Use the options from the following table to further configure TLS and
-certificate usage:
-
-.. list-table::
-  :widths: 40, 60
-  :header-rows: 1
-
-  * - Option
-    - Description
-  * - ``--insecure``
-    - Skip certificate validation when connecting with TLS/HTTPS (should only be
-      used for debugging).
-  * - ``--keystore-path``
-    - The location of the Java Keystore file that contains the certificate of
-      the server to connect with TLS.
-  * - ``--keystore-password``
-    - The password for the keystore. This must match the password you specified
-      when creating the keystore.
-  * - ``--keystore-type``
-    - Determined by the keystore file format. The default keystore type is JKS.
-      This advanced option is only necessary if you use a custom Java
-      Cryptography Architecture (JCA) provider implementation.
-  * - ``--truststore-password``
-    - The password for the truststore. This must match the password you
-      specified when creating the truststore.
-  * - ``--truststore-path``
-    - The location of the Java truststore file that will be used to secure TLS.
-  * - ``--truststore-type``
-    - Determined by the truststore file format. The default keystore type is
-      JKS. This advanced option is only necessary if you use a custom Java
-      Cryptography Architecture (JCA) provider implementation.
-  * - ``--use-system-truststore``
-    - Verify the server certificate using the system truststore of the
-      operating system. Windows and macOS are supported. For other operating
-      systems, the default Java truststore is used. The truststore type can
-      be overridden using ``--truststore-type``.
-
-.. _cli-authentication:
-
-Authentication
---------------
-
-The Trino CLI supports many :doc:`/security/authentication-types` detailed in
-the following sections:
-
-.. _cli-username-password-auth:
-
-Username and password authentication
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Username and password authentication is typically configured in a cluster using
-the ``PASSWORD`` :doc:`authentication type </security/authentication-types>`,
-for example with :doc:`/security/ldap` or :doc:`/security/password-file`.
-
-The following code example connects to the server, establishes your user name,
-and prompts the CLI for your password:
-
-.. code-block:: text
-
-  ./trino --server https://trino.example.com --user=exampleusername --password
-
-Alternatively, set the password as the value of the ``TRINO_PASSWORD``
-environment variables. Typically use single quotes to avoid problems with
-special characters such as ``$``:
-
-.. code-block:: text
-
-  export TRINO_PASSWORD='LongSecurePassword123!@#'
-
-The password is automatically used in any following start of the CLI:
-
-.. code-block:: text
-
-  ./trino --server https://trino.example.com --user=exampleusername
-
-.. _cli-external-sso-auth:
-
-External authentication - SSO
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Use the ``--external-authentication`` option for browser-based SSO
-authentication, as detailed in :doc:`/security/oauth2`. With this configuration,
-the CLI displays a URL that you must open in a web browser for authentication.
-
-The detailed behavior is as follows:
-
-* Start the CLI with the ``--external-authentication`` option and execute a
-  query.
-* The CLI starts and connects to Trino.
-* A message appears in the CLI directing you to open a browser with a specified
-  URL when the first query is submitted.
-* Open the URL in a browser and follow through the authentication process.
-* The CLI automatically receives a token.
-* When successfully authenticated in the browser, the CLI proceeds to execute
-  the query.
-* Further queries in the CLI session do not require additional logins while the
-  authentication token remains valid. Token expiration depends on the external
-  authentication type configuration.
-* Expired tokens force you to log in again.
-
-.. _cli-certificate-auth:
-
-Certificate authentication
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Use the following CLI arguments to connect to a cluster that uses
-:doc:`certificate authentication </security/certificate>`.
-
-.. list-table:: CLI options for certificate authentication
-   :widths: 35 65
-   :header-rows: 1
-
-   * - Option
-     - Description
-   * - ``--keystore-path=<path>``
-     - Absolute or relative path to a :doc:`PEM </security/inspect-pem>` or
-       :doc:`JKS </security/inspect-jks>` file, which must contain a certificate
-       that is trusted by the Trino cluster you are connecting to.
-   * - ``--keystore-password=<password>``
-     - Only required if the keystore has a password.
-
-The truststore related options are independent of client certificate
-authentication with the CLI; instead, they control the client's trust of the
-server's certificate.
-
-.. _cli-jwt-auth:
-
-JWT authentication
-^^^^^^^^^^^^^^^^^^
-
-To access a Trino cluster configured to use :doc:`/security/jwt`, use the
-``--access-token=<token>`` option to pass a JWT to the server.
-
-.. _cli-kerberos-auth:
-
-Kerberos authentication
-^^^^^^^^^^^^^^^^^^^^^^^
-
-The Trino CLI can connect to a Trino cluster that has :doc:`/security/kerberos`
-enabled.
-
-Invoking the CLI with Kerberos support enabled requires a number of additional
-command line options. You also need the :ref:`Kerberos configuration files
-<server_kerberos_principals>` for your user on the machine running the CLI. The
-simplest way to invoke the CLI is with a wrapper script:
-
-.. code-block:: text
-
-    #!/bin/bash
-
-    ./trino \
-      --server https://trino.example.com \
-      --krb5-config-path /etc/krb5.conf \
-      --krb5-principal someuser@EXAMPLE.COM \
-      --krb5-keytab-path /home/someuser/someuser.keytab \
-      --krb5-remote-service-name trino
-
-When using Kerberos authentication, access to the Trino coordinator must be
-through :doc:`TLS and HTTPS </security/tls>`.
-
-The following table lists the available options for Kerberos authentication:
-
-.. list-table:: CLI options for Kerberos authentication
-  :widths: 40, 60
-  :header-rows: 1
-
-  * - Option
-    - Description
-  * - ``--krb5-config-path``
-    - Path to Kerberos configuration files.
-  * - ``--krb5-credential-cache-path``
-    - Kerberos credential cache path.
-  * - ``--krb5-disable-remote-service-hostname-canonicalization``
-    - Disable service hostname canonicalization using the DNS reverse lookup.
-  * - ``--krb5-keytab-path``
-    - The location of the keytab that can be used to authenticate the principal
-      specified by ``--krb5-principal``.
-  * - ``--krb5-principal``
-    - The principal to use when authenticating to the coordinator.
-  * - ``--krb5-remote-service-name``
-    - Trino coordinator Kerberos service name.
-  * - ``--krb5-service-principal-pattern``
-    - Remote kerberos service principal pattern. Defaults to
-      ``${SERVICE}@${HOST}``.
-
-.. _cli-kerberos-debug:
-
-Additional Kerberos debugging information
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You can enable additional Kerberos debugging information for the Trino CLI
-process by passing ``-Dsun.security.krb5.debug=true``,
-``-Dtrino.client.debugKerberos=true``, and
-``-Djava.security.debug=gssloginconfig,configfile,configparser,logincontext``
-as a JVM argument when :ref:`starting the CLI process <cli-installation>`:
-
-.. code-block:: text
-
-    java \
-      -Dsun.security.krb5.debug=true \
-      -Djava.security.debug=gssloginconfig,configfile,configparser,logincontext \
-      -Dtrino.client.debugKerberos=true \
-      -jar trino-cli-*-executable.jar \
-      --server https://trino.example.com \
-      --krb5-config-path /etc/krb5.conf \
-      --krb5-principal someuser@EXAMPLE.COM \
-      --krb5-keytab-path /home/someuser/someuser.keytab \
-      --krb5-remote-service-name trino
-
-For help with interpreting Kerberos debugging messages, see :ref:`additional
-resources <kerberos-debug>`.
-
-Pagination
-----------
-
-By default, the results of queries are paginated using the ``less`` program
-which is configured with a carefully selected set of options. This behavior
-can be overridden by setting the ``--pager`` option or
-the ``TRINO_PAGER`` environment variable to the name of a different program
-such as ``more`` or `pspg <https://github.com/okbob/pspg>`_,
-or it can be set to an empty value to completely disable pagination.
-
-.. _cli-history:
-
-History
--------
-
-The CLI keeps a history of your previously used commands. You can access your
-history by scrolling or searching. Use the up and down arrows to scroll and
-:kbd:`Control+S` and :kbd:`Control+R` to search. To execute a query again,
-press :kbd:`Enter`.
-
-By default, you can locate the Trino history file in ``~/.trino_history``.
-Use the ``--history-file`` option or the ```TRINO_HISTORY_FILE`` environment variable
-to change the default.
-
-Auto suggestion
-^^^^^^^^^^^^^^^
-
-The CLI generates autocomplete suggestions based on command history.
-
-Press :kbd:`→` to accept the suggestion and replace the current command line
-buffer. Press :kbd:`Ctrl+→` (:kbd:`Option+→` on Mac) to accept only the next
-keyword. Continue typing to reject the suggestion.
-
-Configuration file
-------------------
-
-The CLI can read default values for all options from a file. It uses the first
-file found from the ordered list of locations:
-
-* File path set as value of the ``TRINO_CONFIG`` environment variable.
-* ``.trino_config`` in the current users home directory.
-* ``$XDG_CONFIG_HOME/trino/config``.
-
-For example, you could create separate configuration files with different
-authentication options, like ``kerberos-cli.properties`` and ``ldap-cli.properties``.
-Assuming they're located in the current directory, you can set the
-``TRINO_CONFIG`` environment variable for a single invocation of the CLI by
-adding it before the ``trino`` command:
-
-.. code-block:: text
-
-    TRINO_CONFIG=kerberos-cli.properties trino --server https://first-cluster.example.com:8443
-    TRINO_CONFIG=ldap-cli.properties trino --server https://second-cluster.example.com:8443
-
-In the preceding example, the default configuration files are not used.
-
-You can use all supported options without the ``--`` prefix in the configuration
-properties file. Options that normally don't take an argument are boolean, so
-set them to either ``true`` or ``false``. For example:
-
-.. code-block:: properties
-
-    output-format-interactive=AUTO
-    timezone=Europe/Warsaw
-    user=trino-client
-    network-logging=BASIC
-    krb5-disable-remote-service-hostname-canonicalization=true
-
-Batch mode
-----------
-
-Running the Trino CLI with the ``--execute``, ``--file``, or passing queries to
-the standard input uses the batch (non-interactive) mode. In this mode
-the CLI does not report progress, and exits after processing the supplied
-queries. Results are printed in ``CSV`` format by default. You can configure
-other formats and redirect the output to a file.
-
-The following options are available to further configure the CLI in batch
-mode:
-
-.. list-table::
-  :widths: 40, 60
-  :header-rows: 1
-
-  * - Option
-    - Description
-  * - ``--execute=<execute>``
-    - Execute specified statements and exit.
-  * - ``-f``, ``--file=<file>``
-    - Execute statements from file and exit.
-  * - ``--ignore-errors``
-    - Continue processing in batch mode when an error occurs. Default is to
-      exit immediately.
-  * - ``--output-format=<format>``
-    - Specify the :ref:`format <cli-output-format>` to use
-      for printing query results. Defaults to ``CSV``.
-  * - ``--progress``
-    - Show query progress in batch mode. It does not affect the output,
-      which, for example can be safely redirected to a file.
-
-Examples
-^^^^^^^^
-
-Consider the following command run as shown, or with the
-``--output-format=CSV`` option, which is the default for non-interactive usage:
-
-.. code-block:: text
-
-    trino --execute 'SELECT nationkey, name, regionkey FROM tpch.sf1.nation LIMIT 3'
-
-The output is as follows:
-
-.. code-block:: text
-
-    "0","ALGERIA","0"
-    "1","ARGENTINA","1"
-    "2","BRAZIL","1"
-
-The output with the ``--output-format=JSON`` option:
-
-.. code-block:: json
-
-    {"nationkey":0,"name":"ALGERIA","regionkey":0}
-    {"nationkey":1,"name":"ARGENTINA","regionkey":1}
-    {"nationkey":2,"name":"BRAZIL","regionkey":1}
-
-The output with the ``--output-format=ALIGNED`` option, which is the default
-for interactive usage:
-
-.. code-block:: text
-
-    nationkey |   name    | regionkey
-    ----------+-----------+----------
-            0 | ALGERIA   |         0
-            1 | ARGENTINA |         1
-            2 | BRAZIL    |         1
-
-The output with the ``--output-format=VERTICAL`` option:
-
-.. code-block:: text
-
-    -[ RECORD 1 ]--------
-    nationkey | 0
-    name      | ALGERIA
-    regionkey | 0
-    -[ RECORD 2 ]--------
-    nationkey | 1
-    name      | ARGENTINA
-    regionkey | 1
-    -[ RECORD 3 ]--------
-    nationkey | 2
-    name      | BRAZIL
-    regionkey | 1
-
-The preceding command with ``--output-format=NULL`` produces no output.
-However, if you have an error in the query, such as incorrectly using
-``region`` instead of ``regionkey``, the command has an exit status of 1
-and displays an error message (which is unaffected by the output format):
-
-.. code-block:: text
-
-    Query 20200707_170726_00030_2iup9 failed: line 1:25: Column 'region' cannot be resolved
-    SELECT nationkey, name, region FROM tpch.sf1.nation LIMIT 3
-
-.. _cli-output-format:
-
-Output formats
---------------
-
-The Trino CLI provides the options ``--output-format``
-and ``--output-format-interactive`` to control how the output is displayed.
-The available options shown in the following table must be entered
-in uppercase. The default value is ``ALIGNED`` in interactive mode,
-and ``CSV`` in non-interactive mode.
-
-.. list-table:: Output format options
-  :widths: 25, 75
-  :header-rows: 1
-
-  * - Option
-    - Description
-  * - ``CSV``
-    - Comma-separated values, each value quoted. No header row.
-  * - ``CSV_HEADER``
-    - Comma-separated values, quoted with header row.
-  * - ``CSV_UNQUOTED``
-    - Comma-separated values without quotes.
-  * - ``CSV_HEADER_UNQUOTED``
-    - Comma-separated values with header row but no quotes.
-  * - ``TSV``
-    - Tab-separated values.
-  * - ``TSV_HEADER``
-    - Tab-separated values with header row.
-  * - ``JSON``
-    - Output rows emitted as JSON objects with name-value pairs.
-  * - ``ALIGNED``
-    - Output emitted as an ASCII character table with values.
-  * - ``VERTICAL``
-    - Output emitted as record-oriented top-down lines, one per value.
-  * - ``AUTO``
-    - Same as ``ALIGNED`` if output would fit the current terminal width,
-      and ``VERTICAL`` otherwise.
-  * - ``NULL``
-    - Suppresses normal query results. This can be useful during development
-      to test a query's shell return code or to see whether it results in
-      error messages.
-
-.. _cli-troubleshooting:
-
-Troubleshooting
----------------
-
-If something goes wrong, you see an error message:
-
-.. code-block:: text
-
-    $ trino
-    trino> select count(*) from tpch.tiny.nations;
-    Query 20200804_201646_00003_f5f6c failed: line 1:22: Table 'tpch.tiny.nations' does not exist
-    select count(*) from tpch.tiny.nations
-
-To view debug information, including the stack trace for failures, use the
-``--debug`` option:
-
-.. code-block:: text
-
-    $ trino --debug
-    trino> select count(*) from tpch.tiny.nations;
-    Query 20200804_201629_00002_f5f6c failed: line 1:22: Table 'tpch.tiny.nations' does not exist
-    io.trino.spi.TrinoException: line 1:22: Table 'tpch.tiny.nations' does not exist
-    at io.trino.sql.analyzer.SemanticExceptions.semanticException(SemanticExceptions.java:48)
-    at io.trino.sql.analyzer.SemanticExceptions.semanticException(SemanticExceptions.java:43)
-    ...
-    at java.base/java.lang.Thread.run(Thread.java:834)
-    select count(*) from tpch.tiny.nations
diff --git a/docs/src/main/sphinx/client/jdbc.md b/docs/src/main/sphinx/client/jdbc.md
new file mode 100644
index 000000000000..cf974490f9cb
--- /dev/null
+++ b/docs/src/main/sphinx/client/jdbc.md
@@ -0,0 +1,254 @@
+# JDBC driver
+
+The Trino [JDBC driver](https://wikipedia.org/wiki/JDBC_driver) allows
+users to access Trino using Java-based applications, and other non-Java
+applications running in a JVM. Both desktop and server-side applications, such
+as those used for reporting and database development, use the JDBC driver.
+
+## Requirements
+
+The Trino JDBC driver has the following requirements:
+
+- Java version 8 or higher.
+- All users that connect to Trino with the JDBC driver must be granted access to
+  query tables in the `system.jdbc` schema.
+
+The JDBC driver version should be identical to the version of the Trino cluster,
+or newer. Older versions typically work, but only a subset is regularly tested.
+Versions before 350 are not supported.
+
+## Installing
+
+Download {maven_download}`jdbc` and add it to the classpath of your Java application.
+
+The driver is also available from Maven Central:
+
+```{eval-rst}
+.. parsed-literal::
+
+    <dependency>
+        <groupId>io.trino</groupId>
+        <artifactId>trino-jdbc</artifactId>
+        <version>\ |version|\ </version>
+    </dependency>
+```
+
+We recommend using the latest version of the JDBC driver. A list of all
+available versions can be found in the [Maven Central Repository](https://repo1.maven.org/maven2/io/trino/trino-jdbc/). Navigate to the
+directory for the desired version, and select the `trino-jdbc-xxx.jar` file
+to download, where `xxx` is the version number.
+
+Once downloaded, you must add the JAR file to a directory in the classpath
+of users on systems where they will access Trino.
+
+After you have downloaded the JDBC driver and added it to your
+classpath, you'll typically need to restart your application in order to
+recognize the new driver. Then, depending on your application, you
+may need to manually register and configure the driver.
+
+The CLI uses the HTTP protocol and the
+{doc}`Trino client REST API </develop/client-protocol>` to communicate
+with Trino.
+
+## Registering and configuring the driver
+
+Drivers are commonly loaded automatically by applications once they are added to
+its classpath. If your application does not, such as is the case for some
+GUI-based SQL editors, read this section. The steps to register the JDBC driver
+in a UI or on the command line depend upon the specific application you are
+using. Please check your application's documentation.
+
+Once registered, you must also configure the connection information as described
+in the following section.
+
+## Connecting
+
+When your driver is loaded, registered and configured, you are ready to connect
+to Trino from your application. The following JDBC URL formats are supported:
+
+```text
+jdbc:trino://host:port
+jdbc:trino://host:port/catalog
+jdbc:trino://host:port/catalog/schema
+```
+
+The following is an example of a JDBC URL used to create a connection:
+
+```text
+jdbc:trino://example.net:8080/hive/sales
+```
+
+This example JDBC URL locates a Trino instance running on port `8080` on
+`example.net`, with the catalog `hive` and the schema `sales` defined.
+
+:::{note}
+Typically, the JDBC driver classname is configured automatically by your
+client. If it is not, use `io.trino.jdbc.TrinoDriver` wherever a driver
+classname is required.
+:::
+
+(jdbc-java-connection)=
+
+## Connection parameters
+
+The driver supports various parameters that may be set as URL parameters,
+or as properties passed to `DriverManager`. Both of the following
+examples are equivalent:
+
+```java
+// properties
+String url = "jdbc:trino://example.net:8080/hive/sales";
+Properties properties = new Properties();
+properties.setProperty("user", "test");
+properties.setProperty("password", "secret");
+properties.setProperty("SSL", "true");
+Connection connection = DriverManager.getConnection(url, properties);
+
+// URL parameters
+String url = "jdbc:trino://example.net:8443/hive/sales?user=test&password=secret&SSL=true";
+Connection connection = DriverManager.getConnection(url);
+```
+
+These methods may be mixed; some parameters may be specified in the URL,
+while others are specified using properties. However, the same parameter
+may not be specified using both methods.
+
+(jdbc-parameter-reference)=
+
+## Parameter reference
+
+:::{list-table}
+:widths: 35, 65
+:header-rows: 1
+
+* - Name
+  - Description
+* - `user`
+  - Username to use for authentication and authorization.
+* - `password`
+  - Password to use for LDAP authentication.
+* - `sessionUser`
+  - Session username override, used for impersonation.
+* - `socksProxy`
+  - SOCKS proxy host and port. Example: `localhost:1080`
+* - `httpProxy`
+  - HTTP proxy host and port. Example: `localhost:8888`
+* - `clientInfo`
+  - Extra information about the client.
+* - `clientTags`
+  - Client tags for selecting resource groups. Example: `abc,xyz`
+* - `traceToken`
+  - Trace token for correlating requests across systems.
+* - `source`
+  - Source name for the Trino query. This parameter should be used in preference
+    to `ApplicationName`. Thus, it takes precedence over `ApplicationName`
+    and/or `applicationNamePrefix`.
+* - `applicationNamePrefix`
+  - Prefix to append to any specified `ApplicationName` client info property,
+    which is used to set the source name for the Trino query if the `source`
+    parameter has not been set. If neither this property nor `ApplicationName`
+    or `source` are set, the source name for the query is `trino-jdbc`.
+* - `accessToken`
+  - [JWT](/security/jwt) access token for token based authentication.
+* - `SSL`
+  - Set `true` to specify using TLS/HTTPS for connections.
+* - `SSLVerification`
+  - The method of TLS verification. There are three modes: `FULL`
+    (default), `CA` and `NONE`. For `FULL`, the normal TLS verification
+    is performed. For `CA`, only the CA is verified but hostname mismatch
+    is allowed. For `NONE`, there is no verification.
+* - `SSLKeyStorePath`
+  - Use only when connecting to a Trino cluster that has [certificate
+    authentication](/security/certificate) enabled. Specifies the path to a
+    [PEM](/security/inspect-pem) or [JKS](/security/inspect-jks) file, which must
+    contain a certificate that is trusted by the Trino cluster you connect to.
+* - `SSLKeyStorePassword`
+  - The password for the KeyStore, if any.
+* - `SSLKeyStoreType`
+  - The type of the KeyStore. The default type is provided by the Java
+    `keystore.type` security property or `jks` if none exists.
+* - `SSLTrustStorePath`
+  - The location of the Java TrustStore file to use to validate HTTPS server
+    certificates.
+* - `SSLTrustStorePassword`
+  - The password for the TrustStore.
+* - `SSLTrustStoreType`
+  - The type of the TrustStore. The default type is provided by the Java
+    `keystore.type` security property or `jks` if none exists.
+* - `SSLUseSystemTrustStore`
+  - Set `true` to automatically use the system TrustStore based on the operating
+    system. The supported OSes are Windows and macOS. For Windows, the
+    `Windows-ROOT` TrustStore is selected. For macOS, the `KeychainStore`
+    TrustStore is selected. For other OSes, the default Java TrustStore is
+    loaded. The TrustStore specification can be overridden using
+    `SSLTrustStoreType`.
+* - `hostnameInCertificate`
+  - Expected hostname in the certificate presented by the Trino server. Only
+    applicable with full SSL verification enabled.
+* - `KerberosRemoteServiceName`
+  - Trino coordinator Kerberos service name. This parameter is required for
+    Kerberos authentication.
+* - `KerberosPrincipal`
+  - The principal to use when authenticating to the Trino coordinator.
+* - `KerberosUseCanonicalHostname`
+  - Use the canonical hostname of the Trino coordinator for the Kerberos service
+    principal by first resolving the hostname to an IP address and then doing a
+    reverse DNS lookup for that IP address. This is enabled by default.
+* - `KerberosServicePrincipalPattern`
+  - Trino coordinator Kerberos service principal pattern. The default is
+    `${SERVICE}@${HOST}`. `${SERVICE}` is replaced with the value of
+    `KerberosRemoteServiceName` and `${HOST}` is replaced with the hostname of
+    the coordinator (after canonicalization if enabled).
+* - `KerberosConfigPath`
+  - Kerberos configuration file.
+* - `KerberosKeytabPath`
+  - Kerberos keytab file.
+* - `KerberosCredentialCachePath`
+  - Kerberos credential cache.
+* - `KerberosDelegation`
+  - Set to `true` to use the token from an existing Kerberos context. This
+    allows client to use Kerberos authentication without passing the Keytab or
+    credential cache. Defaults to `false`.
+* - `extraCredentials`
+  - Extra credentials for connecting to external services, specified as a list
+    of key-value pairs. For example, `foo:bar;abc:xyz` creates the credential
+    named `abc` with value `xyz` and the credential named `foo` with value
+    `bar`.
+* - `roles`
+  - Authorization roles to use for catalogs, specified as a list of key-value
+    pairs for the catalog and role. For example, `catalog1:roleA;catalog2:roleB`
+    sets `roleA` for `catalog1` and `roleB` for `catalog2`.
+* - `sessionProperties`
+  - Session properties to set for the system and for catalogs, specified as a
+    list of key-value pairs. For example, `abc:xyz;example.foo:bar` sets the
+    system property `abc` to the value `xyz` and the `foo` property for catalog
+    `example` to the value `bar`.
+* - `externalAuthentication`
+  - Set to true if you want to use external authentication via
+    [](/security/oauth2). Use a local web browser to authenticate with an
+    identity provider (IdP) that has been configured for the Trino coordinator.
+* - `externalAuthenticationTokenCache`
+  - Allows the sharing of external authentication tokens between different
+    connections for the same authenticated user until the cache is invalidated,
+    such as when a client is restarted or when the classloader reloads the JDBC
+    driver. This is disabled by default, with a value of `NONE`. To enable, set
+    the value to `MEMORY`. If the JDBC driver is used in a shared mode by
+    different users, the first registered token is stored and authenticates all
+    users.
+* - `disableCompression`
+  -  Whether compression should be enabled.
+* - `assumeLiteralUnderscoreInMetadataCallsForNonConformingClients`
+  - When enabled, the name patterns passed to `DatabaseMetaData` methods are
+    treated as underscores. You can use this as a workaround for applications
+    that do not escape schema or table names when passing them to
+    `DatabaseMetaData` methods as schema or table name patterns. :::
+* - `timezone`
+  - Sets the time zone for the session using the [time zone
+    passed](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/ZoneId.html#of(java.lang.String)).
+    Defaults to the timezone of the JVM running the JDBC driver.
+* - `explicitPrepare`
+  - Defaults to `true`. When set to `false`, prepared statements are executed
+    calling a single `EXECUTE IMMEDIATE` query instead of the standard
+    `PREPARE <statement>` followed by `EXECUTE <statement>`. This reduces
+    network overhead and uses smaller HTTP headers and requires Trino 431 or
+    greater.
diff --git a/docs/src/main/sphinx/client/jdbc.rst b/docs/src/main/sphinx/client/jdbc.rst
deleted file mode 100644
index 98ccc4b97028..000000000000
--- a/docs/src/main/sphinx/client/jdbc.rst
+++ /dev/null
@@ -1,215 +0,0 @@
-===========
-JDBC driver
-===========
-
-The Trino `JDBC driver <https://wikipedia.org/wiki/JDBC_driver>`_ allows
-users to access Trino using Java-based applications, and other non-Java
-applications running in a JVM. Both desktop and server-side applications, such
-as those used for reporting and database development, use the JDBC driver.
-
-Requirements
-------------
-
-The Trino JDBC driver has the following requirements:
-
-* Java version 8 or higher.
-* All users that connect to Trino with the JDBC driver must be granted access to
-  query tables in the ``system.jdbc`` schema.
-
-The JDBC driver version should be identical to the version of the Trino cluster,
-or newer. Older versions typically work, but only a subset is regularly tested.
-Versions before 350 are not supported.
-
-Installing
-----------
-
-Download :maven_download:`jdbc` and add it to the classpath of your Java application.
-
-The driver is also available from Maven Central:
-
-.. parsed-literal::
-
-    <dependency>
-        <groupId>io.trino</groupId>
-        <artifactId>trino-jdbc</artifactId>
-        <version>\ |version|\ </version>
-    </dependency>
-
-We recommend using the latest version of the JDBC driver. A list of all
-available versions can be found in the `Maven Central Repository
-<https://repo1.maven.org/maven2/io/trino/trino-jdbc/>`_. Navigate to the
-directory for the desired version, and select the ``trino-jdbc-xxx.jar`` file
-to download, where ``xxx`` is the version number.
-
-Once downloaded, you must add the JAR file to a directory in the classpath
-of users on systems where they will access Trino.
-
-After you have downloaded the JDBC driver and added it to your
-classpath, you'll typically need to restart your application in order to
-recognize the new driver. Then, depending on your application, you
-may need to manually register and configure the driver.
-
-The CLI uses the HTTP protocol and the
-:doc:`Trino client REST API </develop/client-protocol>` to communicate
-with Trino.
-
-Registering and configuring the driver
---------------------------------------
-
-Drivers are commonly loaded automatically by applications once they are added to
-its classpath. If your application does not, such as is the case for some
-GUI-based SQL editors, read this section. The steps to register the JDBC driver
-in a UI or on the command line depend upon the specific application you are
-using. Please check your application's documentation.
-
-Once registered, you must also configure the connection information as described
-in the following section.
-
-Connecting
-----------
-
-When your driver is loaded, registered and configured, you are ready to connect
-to Trino from your application. The following JDBC URL formats are supported:
-
-.. code-block:: text
-
-    jdbc:trino://host:port
-    jdbc:trino://host:port/catalog
-    jdbc:trino://host:port/catalog/schema
-
-The following is an example of a JDBC URL used to create a connection:
-
-.. code-block:: text
-
-    jdbc:trino://example.net:8080/hive/sales
-
-This example JDBC URL locates a Trino instance running on port ``8080`` on
-``example.net``, with the catalog ``hive`` and the schema ``sales`` defined.
-
-.. note::
-
-  Typically, the JDBC driver classname is configured automatically by your
-  client. If it is not, use ``io.trino.jdbc.TrinoDriver`` wherever a driver
-  classname is required.
-
-.. _jdbc-java-connection:
-
-Connection parameters
----------------------
-
-The driver supports various parameters that may be set as URL parameters,
-or as properties passed to ``DriverManager``. Both of the following
-examples are equivalent:
-
-.. code-block:: java
-
-    // properties
-    String url = "jdbc:trino://example.net:8080/hive/sales";
-    Properties properties = new Properties();
-    properties.setProperty("user", "test");
-    properties.setProperty("password", "secret");
-    properties.setProperty("SSL", "true");
-    Connection connection = DriverManager.getConnection(url, properties);
-
-    // URL parameters
-    String url = "jdbc:trino://example.net:8443/hive/sales?user=test&password=secret&SSL=true";
-    Connection connection = DriverManager.getConnection(url);
-
-These methods may be mixed; some parameters may be specified in the URL,
-while others are specified using properties. However, the same parameter
-may not be specified using both methods.
-
-.. _jdbc-parameter-reference:
-
-Parameter reference
--------------------
-
-================================================================= =======================================================================
-Name                                                              Description
-================================================================= =======================================================================
-``user``                                                          Username to use for authentication and authorization.
-``password``                                                      Password to use for LDAP authentication.
-``sessionUser``                                                   Session username override, used for impersonation.
-``socksProxy``                                                    SOCKS proxy host and port. Example: ``localhost:1080``
-``httpProxy``                                                     HTTP proxy host and port. Example: ``localhost:8888``
-``clientInfo``                                                    Extra information about the client.
-``clientTags``                                                    Client tags for selecting resource groups. Example: ``abc,xyz``
-``traceToken``                                                    Trace token for correlating requests across systems.
-``source``                                                        Source name for the Trino query. This parameter should be used in
-                                                                  preference to ``ApplicationName``. Thus, it takes precedence
-                                                                  over ``ApplicationName`` and/or ``applicationNamePrefix``.
-``applicationNamePrefix``                                         Prefix to append to any specified ``ApplicationName`` client info
-                                                                  property, which is used to set the source name for the Trino query
-                                                                  if the ``source`` parameter has not been set. If neither this
-                                                                  property nor ``ApplicationName`` or ``source`` are set, the source
-                                                                  name for the query is ``trino-jdbc``.
-``accessToken``                                                   :doc:`JWT </security/jwt>` access token for token based authentication.
-``SSL``                                                           Set ``true`` to specify using TLS/HTTPS for connections.
-``SSLVerification``                                               The method of TLS verification. There are three modes: ``FULL``
-                                                                  (default), ``CA`` and ``NONE``. For ``FULL``, the normal TLS
-                                                                  verification is performed. For ``CA``, only the CA is verified but
-                                                                  hostname mismatch is allowed. For ``NONE``, there is no verification.
-``SSLKeyStorePath``                                               Use only when connecting to a Trino cluster that has :doc:`certificate
-                                                                  authentication </security/certificate>` enabled.
-                                                                  Specifies the path to a :doc:`PEM </security/inspect-pem>` or :doc:`JKS
-                                                                  </security/inspect-jks>` file, which must contain a certificate that
-                                                                  is trusted by the Trino cluster you connect to.
-``SSLKeyStorePassword``                                           The password for the KeyStore, if any.
-``SSLKeyStoreType``                                               The type of the KeyStore. The default type is provided by the Java
-                                                                  ``keystore.type`` security property or ``jks`` if none exists.
-``SSLTrustStorePath``                                             The location of the Java TrustStore file to use.
-                                                                  to validate HTTPS server certificates.
-``SSLTrustStorePassword``                                         The password for the TrustStore.
-``SSLTrustStoreType``                                             The type of the TrustStore. The default type is provided by the Java
-                                                                  ``keystore.type`` security property or ``jks`` if none exists.
-``SSLUseSystemTrustStore``                                        Set ``true`` to automatically use the system TrustStore based on the operating system.
-                                                                  The supported OSes are Windows and macOS. For Windows, the ``Windows-ROOT``
-                                                                  TrustStore is selected. For macOS, the ``KeychainStore`` TrustStore is selected.
-                                                                  For other OSes, the default Java TrustStore is loaded.
-                                                                  The TrustStore specification can be overridden using ``SSLTrustStoreType``.
-``KerberosRemoteServiceName``                                     Trino coordinator Kerberos service name. This parameter is
-                                                                  required for Kerberos authentication.
-``KerberosPrincipal``                                             The principal to use when authenticating to the Trino coordinator.
-``KerberosUseCanonicalHostname``                                  Use the canonical hostname of the Trino coordinator for the Kerberos
-                                                                  service principal by first resolving the hostname to an IP address
-                                                                  and then doing a reverse DNS lookup for that IP address.
-                                                                  This is enabled by default.
-``KerberosServicePrincipalPattern``                               Trino coordinator Kerberos service principal pattern. The default is
-                                                                  ``${SERVICE}@${HOST}``. ``${SERVICE}`` is replaced with the value of
-                                                                  ``KerberosRemoteServiceName`` and ``${HOST}`` is replaced with the
-                                                                  hostname of the coordinator (after canonicalization if enabled).
-``KerberosConfigPath``                                            Kerberos configuration file.
-``KerberosKeytabPath``                                            Kerberos keytab file.
-``KerberosCredentialCachePath``                                   Kerberos credential cache.
-``KerberosDelegation``                                            Set to ``true`` to use the token from an existing Kerberos context.
-                                                                  This allows client to use Kerberos authentication without passing
-                                                                  the Keytab or credential cache. Defaults to ``false``.
-``extraCredentials``                                              Extra credentials for connecting to external services,
-                                                                  specified as a list of key-value pairs. For example,
-                                                                  ``foo:bar;abc:xyz`` creates the credential named ``abc``
-                                                                  with value ``xyz`` and the credential named ``foo`` with value ``bar``.
-``roles``                                                         Authorization roles to use for catalogs, specified as a list of
-                                                                  key-value pairs for the catalog and role. For example,
-                                                                  ``catalog1:roleA;catalog2:roleB`` sets ``roleA``
-                                                                  for ``catalog1`` and ``roleB`` for ``catalog2``.
-``sessionProperties``                                             Session properties to set for the system and for catalogs,
-                                                                  specified as a list of key-value pairs.
-                                                                  For example, ``abc:xyz;example.foo:bar`` sets the system property
-                                                                  ``abc`` to the value ``xyz`` and the ``foo`` property for
-                                                                  catalog ``example`` to the value ``bar``.
-``externalAuthentication``                                        Set to true if you want to use external authentication via
-                                                                  :doc:`/security/oauth2`. Use a local web browser to authenticate with an
-                                                                  identity provider (IdP) that has been configured for the Trino coordinator.
-``externalAuthenticationTokenCache``                              Allows the sharing of external authentication tokens between different
-                                                                  connections for the same authenticated user until the cache is
-                                                                  invalidated, such as when a client is restarted or when the classloader
-                                                                  reloads the JDBC driver. This is disabled by default, with a value of
-                                                                  ``NONE``. To enable, set the value to ``MEMORY``. If the JDBC driver is used
-                                                                  in a shared mode by different users, the first registered token is stored
-                                                                  and authenticates all users.
-``disableCompression``                                            Whether compression should be enabled.
-``assumeLiteralUnderscoreInMetadataCallsForNonConformingClients`` When enabled, the name patterns passed to ``DatabaseMetaData`` methods
-                                                                  are treated as underscores. You can use this as a workaround for
-                                                                  applications that do not escape schema or table names when passing them
-                                                                  to ``DatabaseMetaData`` methods as schema or table name patterns.
-================================================================= =======================================================================
diff --git a/docs/src/main/sphinx/conf.py b/docs/src/main/sphinx/conf.py
index 71c2574ab727..158fe1f2792a 100644
--- a/docs/src/main/sphinx/conf.py
+++ b/docs/src/main/sphinx/conf.py
@@ -74,7 +74,16 @@ def setup(app):
 
 needs_sphinx = '3.0'
 
-extensions = ['myst_parser', 'backquote', 'download', 'issue', 'sphinx_copybutton']
+extensions = [
+    'myst_parser',
+    'backquote',
+    'download',
+    'issue',
+    'sphinx_copybutton',
+    'redirects',
+]
+
+redirects_file = 'redirects.txt'
 
 templates_path = ['templates']
 
@@ -104,6 +113,11 @@ def setup(app):
     "|trino_version|" : version
 }
 
+myst_enable_extensions = [
+    "colon_fence",
+    "deflist",
+    "substitution"
+]
 
 # -- Options for HTML output ---------------------------------------------------
 
@@ -125,7 +139,7 @@ def setup(app):
 }
 
 html_theme_options = {
-    'base_url': '/',
+    'base_url': 'https://trino.io/docs/current/',
     'globaltoc_depth': -1,
     'theme_color': '2196f3',
     'color_primary': '',  # set in CSS
diff --git a/docs/src/main/sphinx/connector.md b/docs/src/main/sphinx/connector.md
new file mode 100644
index 000000000000..3b86e28f3d56
--- /dev/null
+++ b/docs/src/main/sphinx/connector.md
@@ -0,0 +1,45 @@
+# Connectors
+
+This section describes the connectors available in Trino to access data
+from different data sources.
+
+```{toctree}
+:maxdepth: 1
+
+Accumulo        <connector/accumulo>
+Atop            <connector/atop>
+BigQuery        <connector/bigquery>
+Black Hole      <connector/blackhole>
+Cassandra       <connector/cassandra>
+ClickHouse      <connector/clickhouse>
+Delta Lake      <connector/delta-lake>
+Druid           <connector/druid>
+Elasticsearch   <connector/elasticsearch>
+Google Sheets   <connector/googlesheets>
+Hive            <connector/hive>
+Hudi            <connector/hudi>
+Iceberg         <connector/iceberg>
+Ignite          <connector/ignite>
+JMX             <connector/jmx>
+Kafka           <connector/kafka>
+Kinesis         <connector/kinesis>
+Kudu            <connector/kudu>
+Local File      <connector/localfile>
+MariaDB         <connector/mariadb>
+Memory          <connector/memory>
+MongoDB         <connector/mongodb>
+MySQL           <connector/mysql>
+Oracle          <connector/oracle>
+Phoenix         <connector/phoenix>
+Pinot           <connector/pinot>
+PostgreSQL      <connector/postgresql>
+Prometheus      <connector/prometheus>
+Redis           <connector/redis>
+Redshift        <connector/redshift>
+SingleStore     <connector/singlestore>
+SQL Server      <connector/sqlserver>
+System          <connector/system>
+Thrift          <connector/thrift>
+TPCDS           <connector/tpcds>
+TPCH            <connector/tpch>
+```
diff --git a/docs/src/main/sphinx/connector.rst b/docs/src/main/sphinx/connector.rst
deleted file mode 100644
index 302f64cf0f9f..000000000000
--- a/docs/src/main/sphinx/connector.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-**********
-Connectors
-**********
-
-This chapter describes the connectors available in Trino to access data
-from different data sources.
-
-.. toctree::
-    :maxdepth: 1
-
-    Accumulo        <connector/accumulo>
-    Atop            <connector/atop>
-    BigQuery        <connector/bigquery>
-    Black Hole      <connector/blackhole>
-    Cassandra       <connector/cassandra>
-    ClickHouse      <connector/clickhouse>
-    Delta Lake      <connector/delta-lake>
-    Druid           <connector/druid>
-    Elasticsearch   <connector/elasticsearch>
-    Google Sheets   <connector/googlesheets>
-    Hive            <connector/hive>
-    Hudi            <connector/hudi>
-    Iceberg         <connector/iceberg>
-    Ignite          <connector/ignite>
-    JMX             <connector/jmx>
-    Kafka           <connector/kafka>
-    Kinesis         <connector/kinesis>
-    Kudu            <connector/kudu>
-    Local File      <connector/localfile>
-    MariaDB         <connector/mariadb>
-    Memory          <connector/memory>
-    MongoDB         <connector/mongodb>
-    MySQL           <connector/mysql>
-    Oracle          <connector/oracle>
-    Phoenix         <connector/phoenix>
-    Pinot           <connector/pinot>
-    PostgreSQL      <connector/postgresql>
-    Prometheus      <connector/prometheus>
-    Redis           <connector/redis>
-    Redshift        <connector/redshift>
-    SingleStore     <connector/memsql>
-    SQL Server      <connector/sqlserver>
-    System          <connector/system>
-    Thrift          <connector/thrift>
-    TPCDS           <connector/tpcds>
-    TPCH            <connector/tpch>
diff --git a/docs/src/main/sphinx/connector/accumulo.md b/docs/src/main/sphinx/connector/accumulo.md
new file mode 100644
index 000000000000..55813bee3723
--- /dev/null
+++ b/docs/src/main/sphinx/connector/accumulo.md
@@ -0,0 +1,792 @@
+# Accumulo connector
+
+```{raw} html
+<img src="../_static/img/accumulo.png" class="connector-logo">
+```
+
+The Accumulo connector supports reading and writing data from
+[Apache Accumulo](https://accumulo.apache.org/).
+Please read this page thoroughly to understand the capabilities and features of the connector.
+
+## Installing the iterator dependency
+
+The Accumulo connector uses custom Accumulo iterators in
+order to push various information in SQL predicate clauses to Accumulo for
+server-side filtering, known as *predicate pushdown*. In order
+for the server-side iterators to work, you need to add the `trino-accumulo-iterators`
+JAR file to Accumulo's `lib/ext` directory on each TabletServer node.
+
+```bash
+# For each TabletServer node:
+scp $TRINO_HOME/plugins/accumulo/trino-accumulo-iterators-*.jar [tabletserver_address]:$ACCUMULO_HOME/lib/ext
+
+# TabletServer should pick up new JAR files in ext directory, but may require restart
+```
+
+## Requirements
+
+To connect to Accumulo, you need:
+
+- Accumulo versions 1.x starting with 1.7.4. Versions 2.x are not supported.
+- Network access from the Trino coordinator and workers to the Accumulo
+  Zookeeper server. Port 2181 is the default port.
+
+## Connector configuration
+
+Create `etc/catalog/example.properties` to mount the `accumulo` connector as
+the `example` catalog, with the following connector properties as appropriate
+for your setup:
+
+```text
+connector.name=accumulo
+accumulo.instance=xxx
+accumulo.zookeepers=xxx
+accumulo.username=username
+accumulo.password=password
+```
+
+Replace the `accumulo.xxx` properties as required.
+
+## Configuration variables
+
+| Property name                                | Default value     | Required | Description                                                                      |
+| -------------------------------------------- | ----------------- | -------- | -------------------------------------------------------------------------------- |
+| `accumulo.instance`                          | (none)            | Yes      | Name of the Accumulo instance                                                    |
+| `accumulo.zookeepers`                        | (none)            | Yes      | ZooKeeper connect string                                                         |
+| `accumulo.username`                          | (none)            | Yes      | Accumulo user for Trino                                                          |
+| `accumulo.password`                          | (none)            | Yes      | Accumulo password for user                                                       |
+| `accumulo.zookeeper.metadata.root`           | `/trino-accumulo` | No       | Root znode for storing metadata. Only relevant if using default Metadata Manager |
+| `accumulo.cardinality.cache.size`            | `100000`          | No       | Sets the size of the index cardinality cache                                     |
+| `accumulo.cardinality.cache.expire.duration` | `5m`              | No       | Sets the expiration duration of the cardinality cache.                           |
+
+## Usage
+
+Simply begin using SQL to create a new table in Accumulo to begin
+working with data. By default, the first column of the table definition
+is set to the Accumulo row ID. This should be the primary key of your
+table, and keep in mind that any `INSERT` statements containing the same
+row ID is effectively an UPDATE as far as Accumulo is concerned, as any
+previous data in the cell is overwritten. The row ID can be
+any valid Trino datatype. If the first column is not your primary key, you
+can set the row ID column using the `row_id` table property within the `WITH`
+clause of your table definition.
+
+Simply issue a `CREATE TABLE` statement to create a new Trino/Accumulo table:
+
+```
+CREATE TABLE example_schema.scientists (
+  recordkey VARCHAR,
+  name VARCHAR,
+  age BIGINT,
+  birthday DATE
+);
+```
+
+```sql
+DESCRIBE example_schema.scientists;
+```
+
+```text
+  Column   |  Type   | Extra |                      Comment
+-----------+---------+-------+---------------------------------------------------
+ recordkey | varchar |       | Accumulo row ID
+ name      | varchar |       | Accumulo column name:name. Indexed: false
+ age       | bigint  |       | Accumulo column age:age. Indexed: false
+ birthday  | date    |       | Accumulo column birthday:birthday. Indexed: false
+```
+
+This command creates a new Accumulo table with the `recordkey` column
+as the Accumulo row ID. The name, age, and birthday columns are mapped to
+auto-generated column family and qualifier values (which, in practice,
+are both identical to the Trino column name).
+
+When creating a table using SQL, you can optionally specify a
+`column_mapping` table property. The value of this property is a
+comma-delimited list of triples, Trino column **:** Accumulo column
+family **:** accumulo column qualifier, with one triple for every
+non-row ID column. This sets the mapping of the Trino column name to
+the corresponding Accumulo column family and column qualifier.
+
+If you don't specify the `column_mapping` table property, then the
+connector auto-generates column names (respecting any configured locality groups).
+Auto-generation of column names is only available for internal tables, so if your
+table is external you must specify the column_mapping property.
+
+For a full list of table properties, see [Table Properties](accumulo-table-properties).
+
+For example:
+
+```sql
+CREATE TABLE example_schema.scientists (
+  recordkey VARCHAR,
+  name VARCHAR,
+  age BIGINT,
+  birthday DATE
+)
+WITH (
+  column_mapping = 'name:metadata:name,age:metadata:age,birthday:metadata:date'
+);
+```
+
+```sql
+DESCRIBE example_schema.scientists;
+```
+
+```text
+  Column   |  Type   | Extra |                    Comment
+-----------+---------+-------+-----------------------------------------------
+ recordkey | varchar |       | Accumulo row ID
+ name      | varchar |       | Accumulo column metadata:name. Indexed: false
+ age       | bigint  |       | Accumulo column metadata:age. Indexed: false
+ birthday  | date    |       | Accumulo column metadata:date. Indexed: false
+```
+
+You can then issue `INSERT` statements to put data into Accumulo.
+
+:::{note}
+While issuing `INSERT` statements is convenient,
+this method of loading data into Accumulo is low-throughput. You want
+to use the Accumulo APIs to write `Mutations` directly to the tables.
+See the section on [Loading Data](accumulo-loading-data) for more details.
+:::
+
+```sql
+INSERT INTO example_schema.scientists VALUES
+('row1', 'Grace Hopper', 109, DATE '1906-12-09' ),
+('row2', 'Alan Turing', 103, DATE '1912-06-23' );
+```
+
+```sql
+SELECT * FROM example_schema.scientists;
+```
+
+```text
+ recordkey |     name     | age |  birthday
+-----------+--------------+-----+------------
+ row1      | Grace Hopper | 109 | 1906-12-09
+ row2      | Alan Turing  | 103 | 1912-06-23
+(2 rows)
+```
+
+As you'd expect, rows inserted into Accumulo via the shell or
+programmatically will also show up when queried. (The Accumulo shell
+thinks "-5321" is an option and not a number... so we'll just make TBL a
+little younger.)
+
+```bash
+$ accumulo shell -u root -p secret
+root@default> table example_schema.scientists
+root@default example_schema.scientists> insert row3 metadata name "Tim Berners-Lee"
+root@default example_schema.scientists> insert row3 metadata age 60
+root@default example_schema.scientists> insert row3 metadata date 5321
+```
+
+```sql
+SELECT * FROM example_schema.scientists;
+```
+
+```text
+ recordkey |      name       | age |  birthday
+-----------+-----------------+-----+------------
+ row1      | Grace Hopper    | 109 | 1906-12-09
+ row2      | Alan Turing     | 103 | 1912-06-23
+ row3      | Tim Berners-Lee |  60 | 1984-07-27
+(3 rows)
+```
+
+You can also drop tables using `DROP TABLE`. This command drops both
+metadata and the tables. See the below section on [External
+Tables](accumulo-external-tables) for more details on internal and external
+tables.
+
+```sql
+DROP TABLE example_schema.scientists;
+```
+
+## Indexing columns
+
+Internally, the connector creates an Accumulo `Range` and packs it in
+a split. This split gets passed to a Trino Worker to read the data from
+the `Range` via a `BatchScanner`. When issuing a query that results
+in a full table scan, each Trino Worker gets a single `Range` that
+maps to a single tablet of the table. When issuing a query with a
+predicate (i.e. `WHERE x = 10` clause), Trino passes the values
+within the predicate (`10`) to the connector so it can use this
+information to scan less data. When the Accumulo row ID is used as part
+of the predicate clause, this narrows down the `Range` lookup to quickly
+retrieve a subset of data from Accumulo.
+
+But what about the other columns? If you're frequently querying on
+non-row ID columns, you should consider using the **indexing**
+feature built into the Accumulo connector. This feature can drastically
+reduce query runtime when selecting a handful of values from the table,
+and the heavy lifting is done for you when loading data via Trino
+`INSERT` statements. Keep in mind writing data to Accumulo via
+`INSERT` does not have high throughput.
+
+To enable indexing, add the `index_columns` table property and specify
+a comma-delimited list of Trino column names you wish to index (we use the
+`string` serializer here to help with this example -- you
+should be using the default `lexicoder` serializer).
+
+```sql
+CREATE TABLE example_schema.scientists (
+  recordkey VARCHAR,
+  name VARCHAR,
+  age BIGINT,
+  birthday DATE
+)
+WITH (
+  serializer = 'string',
+  index_columns='name,age,birthday'
+);
+```
+
+After creating the table, we see there are an additional two Accumulo
+tables to store the index and metrics.
+
+```text
+root@default> tables
+accumulo.metadata
+accumulo.root
+example_schema.scientists
+example_schema.scientists_idx
+example_schema.scientists_idx_metrics
+trace
+```
+
+After inserting data, we can look at the index table and see there are
+indexed values for the name, age, and birthday columns. The connector
+queries this index table
+
+```sql
+INSERT INTO example_schema.scientists VALUES
+('row1', 'Grace Hopper', 109, DATE '1906-12-09'),
+('row2', 'Alan Turing', 103, DATE '1912-06-23');
+```
+
+```text
+root@default> scan -t example_schema.scientists_idx
+-21011 metadata_date:row2 []
+-23034 metadata_date:row1 []
+103 metadata_age:row2 []
+109 metadata_age:row1 []
+Alan Turing metadata_name:row2 []
+Grace Hopper metadata_name:row1 []
+```
+
+When issuing a query with a `WHERE` clause against indexed columns,
+the connector searches the index table for all row IDs that contain the
+value within the predicate. These row IDs are bundled into a Trino
+split as single-value `Range` objects, the number of row IDs per split
+is controlled by the value of `accumulo.index_rows_per_split`, and
+passed to a Trino worker to be configured in the `BatchScanner` which
+scans the data table.
+
+```sql
+SELECT * FROM example_schema.scientists WHERE age = 109;
+```
+
+```text
+ recordkey |     name     | age |  birthday
+-----------+--------------+-----+------------
+ row1      | Grace Hopper | 109 | 1906-12-09
+(1 row)
+```
+
+(accumulo-loading-data)=
+## Loading data
+
+The Accumulo connector supports loading data via INSERT statements, however
+this method tends to be low-throughput and should not be relied on when
+throughput is a concern.
+
+(accumulo-external-tables)=
+## External tables
+
+By default, the tables created using SQL statements via Trino are
+*internal* tables, that is both the Trino table metadata and the
+Accumulo tables are managed by Trino. When you create an internal
+table, the Accumulo table is created as well. You receive an error
+if the Accumulo table already exists. When an internal table is dropped
+via Trino, the Accumulo table, and any index tables, are dropped as
+well.
+
+To change this behavior, set the `external` property to `true` when
+issuing the `CREATE` statement. This makes the table an *external*
+table, and a `DROP TABLE` command **only** deletes the metadata
+associated with the table.  If the Accumulo tables do not already exist,
+they are created by the connector.
+
+Creating an external table *will* set any configured locality groups as well
+as the iterators on the index and metrics tables, if the table is indexed.
+In short, the only difference between an external table and an internal table,
+is that the connector deletes the Accumulo tables when a `DROP TABLE` command
+is issued.
+
+External tables can be a bit more difficult to work with, as the data is stored
+in an expected format. If the data is not stored correctly, then you're
+gonna have a bad time. Users must provide a `column_mapping` property
+when creating the table. This creates the mapping of Trino column name
+to the column family/qualifier for the cell of the table. The value of the
+cell is stored in the `Value` of the Accumulo key/value pair. By default,
+this value is expected to be serialized using Accumulo's *lexicoder* API.
+If you are storing values as strings, you can specify a different serializer
+using the `serializer` property of the table. See the section on
+[Table Properties](accumulo-table-properties) for more information.
+
+Next, we create the Trino external table.
+
+```sql
+CREATE TABLE external_table (
+  a VARCHAR,
+  b BIGINT,
+  c DATE
+)
+WITH (
+  column_mapping = 'a:md:a,b:md:b,c:md:c',
+  external = true,
+  index_columns = 'b,c',
+  locality_groups = 'foo:b,c'
+);
+```
+
+After creating the table, usage of the table continues as usual:
+
+```sql
+INSERT INTO external_table VALUES
+('1', 1, DATE '2015-03-06'),
+('2', 2, DATE '2015-03-07');
+```
+
+```sql
+SELECT * FROM external_table;
+```
+
+```text
+ a | b |     c
+---+---+------------
+ 1 | 1 | 2015-03-06
+ 2 | 2 | 2015-03-06
+(2 rows)
+```
+
+```sql
+DROP TABLE external_table;
+```
+
+After dropping the table, the table still exists in Accumulo because it is *external*.
+
+```text
+root@default> tables
+accumulo.metadata
+accumulo.root
+external_table
+external_table_idx
+external_table_idx_metrics
+trace
+```
+
+If we wanted to add a new column to the table, we can create the table again and specify a new column.
+Any existing rows in the table have a value of NULL. This command re-configures the Accumulo
+tables, setting the locality groups and iterator configuration.
+
+```sql
+CREATE TABLE external_table (
+  a VARCHAR,
+  b BIGINT,
+  c DATE,
+  d INTEGER
+)
+WITH (
+  column_mapping = 'a:md:a,b:md:b,c:md:c,d:md:d',
+  external = true,
+  index_columns = 'b,c,d',
+  locality_groups = 'foo:b,c,d'
+);
+
+SELECT * FROM external_table;
+```
+
+```sql
+ a | b |     c      |  d
+---+---+------------+------
+ 1 | 1 | 2015-03-06 | NULL
+ 2 | 2 | 2015-03-07 | NULL
+(2 rows)
+```
+
+(accumulo-table-properties)=
+## Table properties
+
+Table property usage example:
+
+```sql
+CREATE TABLE example_schema.scientists (
+  recordkey VARCHAR,
+  name VARCHAR,
+  age BIGINT,
+  birthday DATE
+)
+WITH (
+  column_mapping = 'name:metadata:name,age:metadata:age,birthday:metadata:date',
+  index_columns = 'name,age'
+);
+```
+
+| Property name     | Default value  | Description                                                                                                                                                                                                                                                                            |
+| ----------------- | -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `column_mapping`  | (generated)    | Comma-delimited list of column metadata: `col_name:col_family:col_qualifier,[...]`. Required for external tables.  Not setting this property results in auto-generated column names.                                                                                                   |
+| `index_columns`   | (none)         | A comma-delimited list of Trino columns that are indexed in this table's corresponding index table                                                                                                                                                                                     |
+| `external`        | `false`        | If true, Trino will only do metadata operations for the table. Otherwise, Trino will create and drop Accumulo tables where appropriate.                                                                                                                                                |
+| `locality_groups` | (none)         | List of locality groups to set on the Accumulo table. Only valid on internal tables. String format is locality group name, colon, comma delimited list of column families in the group. Groups are delimited by pipes. Example: `group1:famA,famB,famC\|group2:famD,famE,famF\|etc...` |
+| `row_id`          | (first column) | Trino column name that maps to the Accumulo row ID.                                                                                                                                                                                                                                    |
+| `serializer`      | `default`      | Serializer for Accumulo data encodings. Can either be `default`, `string`, `lexicoder` or a Java class name. Default is `default`, i.e. the value from `AccumuloRowSerializer.getDefault()`, i.e. `lexicoder`.                                                                         |
+| `scan_auths`      | (user auths)   | Scan-time authorizations set on the batch scanner.                                                                                                                                                                                                                                     |
+
+## Session properties
+
+You can change the default value of a session property by using {doc}`/sql/set-session`.
+Note that session properties are prefixed with the catalog name:
+
+```
+SET SESSION example.column_filter_optimizations_enabled = false;
+```
+
+| Property name                              | Default value | Description                                                                                                                                                          |
+| ------------------------------------------ | ------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `optimize_locality_enabled`                | `true`        | Set to true to enable data locality for non-indexed scans                                                                                                            |
+| `optimize_split_ranges_enabled`            | `true`        | Set to true to split non-indexed queries by tablet splits. Should generally be true.                                                                                 |
+| `optimize_index_enabled`                   | `true`        | Set to true to enable usage of the secondary index on query                                                                                                          |
+| `index_rows_per_split`                     | `10000`       | The number of Accumulo row IDs that are packed into a single Trino split                                                                                             |
+| `index_threshold`                          | `0.2`         | The ratio between number of rows to be scanned based on the index over the total number of rows. If the ratio is below this threshold, the index will be used.        |
+| `index_lowest_cardinality_threshold`       | `0.01`        | The threshold where the column with the lowest cardinality will be used instead of computing an intersection of ranges in the index. Secondary index must be enabled |
+| `index_metrics_enabled`                    | `true`        | Set to true to enable usage of the metrics table to optimize usage of the index                                                                                      |
+| `scan_username`                            | (config)      | User to impersonate when scanning the tables. This property trumps the `scan_auths` table property                                                                   |
+| `index_short_circuit_cardinality_fetch`    | `true`        | Short circuit the retrieval of index metrics once any column is less than the lowest cardinality threshold                                                           |
+| `index_cardinality_cache_polling_duration` | `10ms`        | Sets the cardinality cache polling duration for short circuit retrieval of index metrics                                                                             |
+
+## Adding columns
+
+Adding a new column to an existing table cannot be done today via
+`ALTER TABLE [table] ADD COLUMN [name] [type]` because of the additional
+metadata required for the columns to work; the column family, qualifier,
+and if the column is indexed.
+
+## Serializers
+
+The Trino connector for Accumulo has a pluggable serializer framework
+for handling I/O between Trino and Accumulo. This enables end-users the
+ability to programmatically serialized and deserialize their special data
+formats within Accumulo, while abstracting away the complexity of the
+connector itself.
+
+There are two types of serializers currently available; a `string`
+serializer that treats values as Java `String`, and a `lexicoder`
+serializer that leverages Accumulo's Lexicoder API to store values. The
+default serializer is the `lexicoder` serializer, as this serializer
+does not require expensive conversion operations back and forth between
+`String` objects and the Trino types -- the cell's value is encoded as a
+byte array.
+
+Additionally, the `lexicoder` serializer does proper lexigraphical ordering of
+numerical types like `BIGINT` or `TIMESTAMP`.  This is essential for the connector
+to properly leverage the secondary index when querying for data.
+
+You can change the default the serializer by specifying the
+`serializer` table property, using either `default` (which is
+`lexicoder`), `string` or `lexicoder` for the built-in types, or
+you could provide your own implementation by extending
+`AccumuloRowSerializer`, adding it to the Trino `CLASSPATH`, and
+specifying the fully-qualified Java class name in the connector configuration.
+
+```sql
+CREATE TABLE example_schema.scientists (
+  recordkey VARCHAR,
+  name VARCHAR,
+  age BIGINT,
+  birthday DATE
+)
+WITH (
+  column_mapping = 'name:metadata:name,age:metadata:age,birthday:metadata:date',
+  serializer = 'default'
+);
+```
+
+```sql
+INSERT INTO example_schema.scientists VALUES
+('row1', 'Grace Hopper', 109, DATE '1906-12-09' ),
+('row2', 'Alan Turing', 103, DATE '1912-06-23' );
+```
+
+```text
+root@default> scan -t example_schema.scientists
+row1 metadata:age []    \x08\x80\x00\x00\x00\x00\x00\x00m
+row1 metadata:date []    \x08\x7F\xFF\xFF\xFF\xFF\xFF\xA6\x06
+row1 metadata:name []    Grace Hopper
+row2 metadata:age []    \x08\x80\x00\x00\x00\x00\x00\x00g
+row2 metadata:date []    \x08\x7F\xFF\xFF\xFF\xFF\xFF\xAD\xED
+row2 metadata:name []    Alan Turing
+```
+
+```sql
+CREATE TABLE example_schema.stringy_scientists (
+  recordkey VARCHAR,
+  name VARCHAR,
+  age BIGINT,
+  birthday DATE
+)
+WITH (
+  column_mapping = 'name:metadata:name,age:metadata:age,birthday:metadata:date',
+  serializer = 'string'
+);
+```
+
+```sql
+INSERT INTO example_schema.stringy_scientists VALUES
+('row1', 'Grace Hopper', 109, DATE '1906-12-09' ),
+('row2', 'Alan Turing', 103, DATE '1912-06-23' );
+```
+
+```text
+root@default> scan -t example_schema.stringy_scientists
+row1 metadata:age []    109
+row1 metadata:date []    -23034
+row1 metadata:name []    Grace Hopper
+row2 metadata:age []    103
+row2 metadata:date []    -21011
+row2 metadata:name []    Alan Turing
+```
+
+```sql
+CREATE TABLE example_schema.custom_scientists (
+  recordkey VARCHAR,
+  name VARCHAR,
+  age BIGINT,
+  birthday DATE
+)
+WITH (
+  column_mapping = 'name:metadata:name,age:metadata:age,birthday:metadata:date',
+  serializer = 'my.serializer.package.MySerializer'
+);
+```
+
+## Metadata management
+
+Metadata for the Trino/Accumulo tables is stored in ZooKeeper. You can,
+and should, issue SQL statements in Trino to create and drop tables.
+This is the easiest method of creating the metadata required to make the
+connector work. It is best to not mess with the metadata, but here are
+the details of how it is stored.
+
+A root node in ZooKeeper holds all the mappings, and the format is as
+follows:
+
+```text
+/metadata-root/schema/table
+```
+
+Where `metadata-root` is the value of `zookeeper.metadata.root` in
+the config file (default is `/trino-accumulo`), `schema` is the
+Trino schema (which is identical to the Accumulo namespace name), and
+`table` is the Trino table name (again, identical to Accumulo name).
+The data of the `table` ZooKeeper node is a serialized
+`AccumuloTable` Java object (which resides in the connector code).
+This table contains the schema (namespace) name, table name, column
+definitions, the serializer to use for the table, and any additional
+table properties.
+
+If you have a need to programmatically manipulate the ZooKeeper metadata
+for Accumulo, take a look at
+`io.trino.plugin.accumulo.metadata.ZooKeeperMetadataManager` for some
+Java code to simplify the process.
+
+## Converting table from internal to external
+
+If your table is *internal*, you can convert it to an external table by deleting
+the corresponding znode in ZooKeeper, effectively making the table no longer exist as
+far as Trino is concerned.  Then, create the table again using the same DDL, but adding the
+`external = true` table property.
+
+For example:
+
+1\. We're starting with an internal table `foo.bar` that was created with the below DDL.
+If you have not previously defined a table property for `column_mapping` (like this example),
+be sure to describe the table **before** deleting the metadata.  We need the column mappings
+when creating the external table.
+
+```sql
+CREATE TABLE foo.bar (a VARCHAR, b BIGINT, c DATE)
+WITH (
+    index_columns = 'b,c'
+);
+```
+
+```sql
+DESCRIBE foo.bar;
+```
+
+```text
+ Column |  Type   | Extra |               Comment
+--------+---------+-------+-------------------------------------
+ a      | varchar |       | Accumulo row ID
+ b      | bigint  |       | Accumulo column b:b. Indexed: true
+ c      | date    |       | Accumulo column c:c. Indexed: true
+```
+
+2\. Using the ZooKeeper CLI, delete the corresponding znode.  Note this uses the default ZooKeeper
+metadata root of `/trino-accumulo`
+
+```text
+$ zkCli.sh
+[zk: localhost:2181(CONNECTED) 1] delete /trino-accumulo/foo/bar
+```
+
+3\. Re-create the table using the same DDL as before, but adding the `external=true` property.
+Note that if you had not previously defined the column_mapping, you need to add the property
+to the new DDL (external tables require this property to be set).  The column mappings are in
+the output of the `DESCRIBE` statement.
+
+```sql
+CREATE TABLE foo.bar (
+  a VARCHAR,
+  b BIGINT,
+  c DATE
+)
+WITH (
+  column_mapping = 'a:a:a,b:b:b,c:c:c',
+  index_columns = 'b,c',
+  external = true
+);
+```
+
+(accumulo-type-mapping)=
+
+## Type mapping
+
+Because Trino and Accumulo each support types that the other does not, this
+connector modifies some types when reading or writing data. Data types may not
+map the same way in both directions between Trino and the data source. Refer to
+the following sections for type mapping in each direction.
+
+### Accumulo type to Trino type mapping
+
+The connector maps Accumulo types to the corresponding Trino types following
+this table:
+
+```{eval-rst}
+.. list-table:: Accumulo type to Trino type mapping
+  :widths: 30, 20, 50
+  :header-rows: 1
+
+  * - Accumulo type
+    - Trino type
+    - Notes
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+    -
+  * - ``TINYINT``
+    - ``TINYINT``
+    -
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``INTEGER``
+    - ``INTEGER``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``REAL``
+    - ``REAL``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``VARCHAR(n)``
+    - ``VARCHAR(n)``
+    -
+  * - ``VARBINARY``
+    - ``VARBINARY``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME(n)``
+    - ``TIME(n)``
+    -
+  * - ``TIMESTAMP(n)``
+    - ``TIMESTAMP(n)``
+    -
+```
+
+No other types are supported
+
+### Trino type to Accumulo type mapping
+
+The connector maps Trino types to the corresponding Trino type to Accumulo type
+mapping types following this table:
+
+```{eval-rst}
+.. list-table:: Trino type to Accumulo type mapping
+  :widths: 30, 20, 50
+  :header-rows: 1
+
+  * - Trino type
+    - Accumulo type
+    - Notes
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+    -
+  * - ``TINYINT``
+    - ``TINYINT``
+    - Trino only supports writing values belonging to ``[0, 127]``
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``INTEGER``
+    - ``INTEGER``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``REAL``
+    - ``REAL``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``VARCHAR(n)``
+    - ``VARCHAR(n)``
+    -
+  * - ``VARBINARY``
+    - ``VARBINARY``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME(n)``
+    - ``TIME(n)``
+    -
+  * - ``TIMESTAMP(n)``
+    - ``TIMESTAMP(n)``
+    -
+```
+
+No other types are supported
+
+(accumulo-sql-support)=
+
+## SQL support
+
+The connector provides read and write access to data and metadata in
+the Accumulo database. In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/create-schema`
+- {doc}`/sql/drop-schema`
diff --git a/docs/src/main/sphinx/connector/accumulo.rst b/docs/src/main/sphinx/connector/accumulo.rst
deleted file mode 100644
index 7f3d27bf6d71..000000000000
--- a/docs/src/main/sphinx/connector/accumulo.rst
+++ /dev/null
@@ -1,814 +0,0 @@
-Accumulo connector
-==================
-
-.. raw:: html
-
-  <img src="../_static/img/accumulo.png" class="connector-logo">
-
-The Accumulo connector supports reading and writing data from
-`Apache Accumulo <https://accumulo.apache.org/>`_.
-Please read this page thoroughly to understand the capabilities and features of the connector.
-
-Installing the iterator dependency
-----------------------------------
-
-The Accumulo connector uses custom Accumulo iterators in
-order to push various information in SQL predicate clauses to Accumulo for
-server-side filtering, known as *predicate pushdown*. In order
-for the server-side iterators to work, you need to add the ``trino-accumulo-iterators``
-JAR file to Accumulo's ``lib/ext`` directory on each TabletServer node.
-
-.. code-block:: bash
-
-    # For each TabletServer node:
-    scp $TRINO_HOME/plugins/accumulo/trino-accumulo-iterators-*.jar [tabletserver_address]:$ACCUMULO_HOME/lib/ext
-
-    # TabletServer should pick up new JAR files in ext directory, but may require restart
-
-Requirements
-------------
-
-To connect to Accumulo, you need:
-
-* Accumulo versions 1.x starting with 1.7.4. Versions 2.x are not supported.
-* Network access from the Trino coordinator and workers to the Accumulo
-  Zookeeper server. Port 2181 is the default port.
-
-Connector configuration
------------------------
-
-Create ``etc/catalog/example.properties`` to mount the ``accumulo`` connector as
-the ``example`` catalog, with the following connector properties as appropriate
-for your setup:
-
-.. code-block:: text
-
-    connector.name=accumulo
-    accumulo.instance=xxx
-    accumulo.zookeepers=xxx
-    accumulo.username=username
-    accumulo.password=password
-
-Replace the ``accumulo.xxx`` properties as required.
-
-Configuration variables
------------------------
-
-================================================ ====================== ========== =====================================================================================
-Property name                                    Default value          Required   Description
-================================================ ====================== ========== =====================================================================================
-``accumulo.instance``                            (none)                 Yes        Name of the Accumulo instance
-``accumulo.zookeepers``                          (none)                 Yes        ZooKeeper connect string
-``accumulo.username``                            (none)                 Yes        Accumulo user for Trino
-``accumulo.password``                            (none)                 Yes        Accumulo password for user
-``accumulo.zookeeper.metadata.root``             ``/trino-accumulo``    No         Root znode for storing metadata. Only relevant if using default Metadata Manager
-``accumulo.cardinality.cache.size``              ``100000``             No         Sets the size of the index cardinality cache
-``accumulo.cardinality.cache.expire.duration``   ``5m``                 No         Sets the expiration duration of the cardinality cache.
-================================================ ====================== ========== =====================================================================================
-
-Usage
------
-
-Simply begin using SQL to create a new table in Accumulo to begin
-working with data. By default, the first column of the table definition
-is set to the Accumulo row ID. This should be the primary key of your
-table, and keep in mind that any ``INSERT`` statements containing the same
-row ID is effectively an UPDATE as far as Accumulo is concerned, as any
-previous data in the cell is overwritten. The row ID can be
-any valid Trino datatype. If the first column is not your primary key, you
-can set the row ID column using the ``row_id`` table property within the ``WITH``
-clause of your table definition.
-
-Simply issue a ``CREATE TABLE`` statement to create a new Trino/Accumulo table::
-
-    CREATE TABLE example_schema.scientists (
-      recordkey VARCHAR,
-      name VARCHAR,
-      age BIGINT,
-      birthday DATE
-    );
-
-.. code-block:: sql
-
-    DESCRIBE example_schema.scientists;
-
-.. code-block:: text
-
-      Column   |  Type   | Extra |                      Comment
-    -----------+---------+-------+---------------------------------------------------
-     recordkey | varchar |       | Accumulo row ID
-     name      | varchar |       | Accumulo column name:name. Indexed: false
-     age       | bigint  |       | Accumulo column age:age. Indexed: false
-     birthday  | date    |       | Accumulo column birthday:birthday. Indexed: false
-
-This command creates a new Accumulo table with the ``recordkey`` column
-as the Accumulo row ID. The name, age, and birthday columns are mapped to
-auto-generated column family and qualifier values (which, in practice,
-are both identical to the Trino column name).
-
-When creating a table using SQL, you can optionally specify a
-``column_mapping`` table property. The value of this property is a
-comma-delimited list of triples, Trino column **:** Accumulo column
-family **:** accumulo column qualifier, with one triple for every
-non-row ID column. This sets the mapping of the Trino column name to
-the corresponding Accumulo column family and column qualifier.
-
-If you don't specify the ``column_mapping`` table property, then the
-connector auto-generates column names (respecting any configured locality groups).
-Auto-generation of column names is only available for internal tables, so if your
-table is external you must specify the column_mapping property.
-
-For a full list of table properties, see `Table Properties <#table-properties>`__.
-
-For example:
-
-.. code-block:: sql
-
-    CREATE TABLE example_schema.scientists (
-      recordkey VARCHAR,
-      name VARCHAR,
-      age BIGINT,
-      birthday DATE
-    )
-    WITH (
-      column_mapping = 'name:metadata:name,age:metadata:age,birthday:metadata:date'
-    );
-
-.. code-block:: sql
-
-    DESCRIBE example_schema.scientists;
-
-.. code-block:: text
-
-      Column   |  Type   | Extra |                    Comment
-    -----------+---------+-------+-----------------------------------------------
-     recordkey | varchar |       | Accumulo row ID
-     name      | varchar |       | Accumulo column metadata:name. Indexed: false
-     age       | bigint  |       | Accumulo column metadata:age. Indexed: false
-     birthday  | date    |       | Accumulo column metadata:date. Indexed: false
-
-You can then issue ``INSERT`` statements to put data into Accumulo.
-
-.. note::
-
-    While issuing ``INSERT`` statements is convenient,
-    this method of loading data into Accumulo is low-throughput. You want
-    to use the Accumulo APIs to write ``Mutations`` directly to the tables.
-    See the section on `Loading Data <#loading-data>`__ for more details.
-
-.. code-block:: sql
-
-    INSERT INTO example_schema.scientists VALUES
-    ('row1', 'Grace Hopper', 109, DATE '1906-12-09' ),
-    ('row2', 'Alan Turing', 103, DATE '1912-06-23' );
-
-.. code-block:: sql
-
-    SELECT * FROM example_schema.scientists;
-
-.. code-block:: text
-
-     recordkey |     name     | age |  birthday
-    -----------+--------------+-----+------------
-     row1      | Grace Hopper | 109 | 1906-12-09
-     row2      | Alan Turing  | 103 | 1912-06-23
-    (2 rows)
-
-As you'd expect, rows inserted into Accumulo via the shell or
-programmatically will also show up when queried. (The Accumulo shell
-thinks "-5321" is an option and not a number... so we'll just make TBL a
-little younger.)
-
-.. code-block:: bash
-
-    $ accumulo shell -u root -p secret
-    root@default> table example_schema.scientists
-    root@default example_schema.scientists> insert row3 metadata name "Tim Berners-Lee"
-    root@default example_schema.scientists> insert row3 metadata age 60
-    root@default example_schema.scientists> insert row3 metadata date 5321
-
-.. code-block:: sql
-
-    SELECT * FROM example_schema.scientists;
-
-.. code-block:: text
-
-     recordkey |      name       | age |  birthday
-    -----------+-----------------+-----+------------
-     row1      | Grace Hopper    | 109 | 1906-12-09
-     row2      | Alan Turing     | 103 | 1912-06-23
-     row3      | Tim Berners-Lee |  60 | 1984-07-27
-    (3 rows)
-
-You can also drop tables using ``DROP TABLE``. This command drops both
-metadata and the tables. See the below section on `External
-Tables <#external-tables>`__ for more details on internal and external
-tables.
-
-.. code-block:: sql
-
-    DROP TABLE example_schema.scientists;
-
-Indexing columns
-----------------
-
-Internally, the connector creates an Accumulo ``Range`` and packs it in
-a split. This split gets passed to a Trino Worker to read the data from
-the ``Range`` via a ``BatchScanner``. When issuing a query that results
-in a full table scan, each Trino Worker gets a single ``Range`` that
-maps to a single tablet of the table. When issuing a query with a
-predicate (i.e. ``WHERE x = 10`` clause), Trino passes the values
-within the predicate (``10``) to the connector so it can use this
-information to scan less data. When the Accumulo row ID is used as part
-of the predicate clause, this narrows down the ``Range`` lookup to quickly
-retrieve a subset of data from Accumulo.
-
-But what about the other columns? If you're frequently querying on
-non-row ID columns, you should consider using the **indexing**
-feature built into the Accumulo connector. This feature can drastically
-reduce query runtime when selecting a handful of values from the table,
-and the heavy lifting is done for you when loading data via Trino
-``INSERT`` statements. Keep in mind writing data to Accumulo via
-``INSERT`` does not have high throughput.
-
-To enable indexing, add the ``index_columns`` table property and specify
-a comma-delimited list of Trino column names you wish to index (we use the
-``string`` serializer here to help with this example -- you
-should be using the default ``lexicoder`` serializer).
-
-.. code-block:: sql
-
-    CREATE TABLE example_schema.scientists (
-      recordkey VARCHAR,
-      name VARCHAR,
-      age BIGINT,
-      birthday DATE
-    )
-    WITH (
-      serializer = 'string',
-      index_columns='name,age,birthday'
-    );
-
-After creating the table, we see there are an additional two Accumulo
-tables to store the index and metrics.
-
-.. code-block:: text
-
-    root@default> tables
-    accumulo.metadata
-    accumulo.root
-    example_schema.scientists
-    example_schema.scientists_idx
-    example_schema.scientists_idx_metrics
-    trace
-
-After inserting data, we can look at the index table and see there are
-indexed values for the name, age, and birthday columns. The connector
-queries this index table
-
-.. code-block:: sql
-
-    INSERT INTO example_schema.scientists VALUES
-    ('row1', 'Grace Hopper', 109, DATE '1906-12-09'),
-    ('row2', 'Alan Turing', 103, DATE '1912-06-23');
-
-.. code-block:: text
-
-    root@default> scan -t example_schema.scientists_idx
-    -21011 metadata_date:row2 []
-    -23034 metadata_date:row1 []
-    103 metadata_age:row2 []
-    109 metadata_age:row1 []
-    Alan Turing metadata_name:row2 []
-    Grace Hopper metadata_name:row1 []
-
-When issuing a query with a ``WHERE`` clause against indexed columns,
-the connector searches the index table for all row IDs that contain the
-value within the predicate. These row IDs are bundled into a Trino
-split as single-value ``Range`` objects, the number of row IDs per split
-is controlled by the value of ``accumulo.index_rows_per_split``, and
-passed to a Trino worker to be configured in the ``BatchScanner`` which
-scans the data table.
-
-.. code-block:: sql
-
-    SELECT * FROM example_schema.scientists WHERE age = 109;
-
-.. code-block:: text
-
-     recordkey |     name     | age |  birthday
-    -----------+--------------+-----+------------
-     row1      | Grace Hopper | 109 | 1906-12-09
-    (1 row)
-
-Loading data
-------------
-
-The Accumulo connector supports loading data via INSERT statements, however
-this method tends to be low-throughput and should not be relied on when
-throughput is a concern.
-
-External tables
----------------
-
-By default, the tables created using SQL statements via Trino are
-*internal* tables, that is both the Trino table metadata and the
-Accumulo tables are managed by Trino. When you create an internal
-table, the Accumulo table is created as well. You receive an error
-if the Accumulo table already exists. When an internal table is dropped
-via Trino, the Accumulo table, and any index tables, are dropped as
-well.
-
-To change this behavior, set the ``external`` property to ``true`` when
-issuing the ``CREATE`` statement. This makes the table an *external*
-table, and a ``DROP TABLE`` command **only** deletes the metadata
-associated with the table.  If the Accumulo tables do not already exist,
-they are created by the connector.
-
-Creating an external table *will* set any configured locality groups as well
-as the iterators on the index and metrics tables, if the table is indexed.
-In short, the only difference between an external table and an internal table,
-is that the connector deletes the Accumulo tables when a ``DROP TABLE`` command
-is issued.
-
-External tables can be a bit more difficult to work with, as the data is stored
-in an expected format. If the data is not stored correctly, then you're
-gonna have a bad time. Users must provide a ``column_mapping`` property
-when creating the table. This creates the mapping of Trino column name
-to the column family/qualifier for the cell of the table. The value of the
-cell is stored in the ``Value`` of the Accumulo key/value pair. By default,
-this value is expected to be serialized using Accumulo's *lexicoder* API.
-If you are storing values as strings, you can specify a different serializer
-using the ``serializer`` property of the table. See the section on
-`Table Properties <#table-properties>`__ for more information.
-
-Next, we create the Trino external table.
-
-.. code-block:: sql
-
-    CREATE TABLE external_table (
-      a VARCHAR,
-      b BIGINT,
-      c DATE
-    )
-    WITH (
-      column_mapping = 'a:md:a,b:md:b,c:md:c',
-      external = true,
-      index_columns = 'b,c',
-      locality_groups = 'foo:b,c'
-    );
-
-After creating the table, usage of the table continues as usual:
-
-.. code-block:: sql
-
-    INSERT INTO external_table VALUES
-    ('1', 1, DATE '2015-03-06'),
-    ('2', 2, DATE '2015-03-07');
-
-.. code-block:: sql
-
-    SELECT * FROM external_table;
-
-.. code-block:: text
-
-     a | b |     c
-    ---+---+------------
-     1 | 1 | 2015-03-06
-     2 | 2 | 2015-03-06
-    (2 rows)
-
-.. code-block:: sql
-
-    DROP TABLE external_table;
-
-After dropping the table, the table still exists in Accumulo because it is *external*.
-
-.. code-block:: text
-
-    root@default> tables
-    accumulo.metadata
-    accumulo.root
-    external_table
-    external_table_idx
-    external_table_idx_metrics
-    trace
-
-If we wanted to add a new column to the table, we can create the table again and specify a new column.
-Any existing rows in the table have a value of NULL. This command re-configures the Accumulo
-tables, setting the locality groups and iterator configuration.
-
-.. code-block:: sql
-
-    CREATE TABLE external_table (
-      a VARCHAR,
-      b BIGINT,
-      c DATE,
-      d INTEGER
-    )
-    WITH (
-      column_mapping = 'a:md:a,b:md:b,c:md:c,d:md:d',
-      external = true,
-      index_columns = 'b,c,d',
-      locality_groups = 'foo:b,c,d'
-    );
-
-    SELECT * FROM external_table;
-
-.. code-block:: sql
-
-     a | b |     c      |  d
-    ---+---+------------+------
-     1 | 1 | 2015-03-06 | NULL
-     2 | 2 | 2015-03-07 | NULL
-    (2 rows)
-
-Table properties
-----------------
-
-Table property usage example:
-
-.. code-block:: sql
-
-    CREATE TABLE example_schema.scientists (
-      recordkey VARCHAR,
-      name VARCHAR,
-      age BIGINT,
-      birthday DATE
-    )
-    WITH (
-      column_mapping = 'name:metadata:name,age:metadata:age,birthday:metadata:date',
-      index_columns = 'name,age'
-    );
-
-==================== ================ ======================================================================================================
-Property name        Default value    Description
-==================== ================ ======================================================================================================
-``column_mapping``   (generated)      Comma-delimited list of column metadata: ``col_name:col_family:col_qualifier,[...]``.
-                                      Required for external tables.  Not setting this property results in auto-generated column names.
-``index_columns``    (none)           A comma-delimited list of Trino columns that are indexed in this table's corresponding index table
-``external``         ``false``        If true, Trino will only do metadata operations for the table.
-                                      Otherwise, Trino will create and drop Accumulo tables where appropriate.
-``locality_groups``  (none)           List of locality groups to set on the Accumulo table. Only valid on internal tables.
-                                      String format is locality group name, colon, comma delimited list of column families in the group.
-                                      Groups are delimited by pipes. Example: ``group1:famA,famB,famC|group2:famD,famE,famF|etc...``
-``row_id``           (first column)   Trino column name that maps to the Accumulo row ID.
-``serializer``       ``default``      Serializer for Accumulo data encodings. Can either be ``default``, ``string``, ``lexicoder``
-                                      or a Java class name. Default is ``default``,
-                                      i.e. the value from ``AccumuloRowSerializer.getDefault()``, i.e. ``lexicoder``.
-``scan_auths``       (user auths)     Scan-time authorizations set on the batch scanner.
-==================== ================ ======================================================================================================
-
-Session properties
-------------------
-
-You can change the default value of a session property by using :doc:`/sql/set-session`.
-Note that session properties are prefixed with the catalog name::
-
-    SET SESSION example.column_filter_optimizations_enabled = false;
-
-============================================= ============= =======================================================================================================
-Property name                                 Default value Description
-============================================= ============= =======================================================================================================
-``optimize_locality_enabled``                 ``true``      Set to true to enable data locality for non-indexed scans
-``optimize_split_ranges_enabled``             ``true``      Set to true to split non-indexed queries by tablet splits. Should generally be true.
-``optimize_index_enabled``                    ``true``      Set to true to enable usage of the secondary index on query
-``index_rows_per_split``                      ``10000``     The number of Accumulo row IDs that are packed into a single Trino split
-``index_threshold``                           ``0.2``       The ratio between number of rows to be scanned based on the index over the total number of rows
-                                                            If the ratio is below this threshold, the index will be used.
-``index_lowest_cardinality_threshold``        ``0.01``      The threshold where the column with the lowest cardinality will be used instead of computing an
-                                                            intersection of ranges in the index. Secondary index must be enabled
-``index_metrics_enabled``                     ``true``      Set to true to enable usage of the metrics table to optimize usage of the index
-``scan_username``                             (config)      User to impersonate when scanning the tables. This property trumps the ``scan_auths`` table property
-``index_short_circuit_cardinality_fetch``     ``true``      Short circuit the retrieval of index metrics once any column is less than the lowest cardinality threshold
-``index_cardinality_cache_polling_duration``  ``10ms``      Sets the cardinality cache polling duration for short circuit retrieval of index metrics
-============================================= ============= =======================================================================================================
-
-Adding columns
---------------
-
-Adding a new column to an existing table cannot be done today via
-``ALTER TABLE [table] ADD COLUMN [name] [type]`` because of the additional
-metadata required for the columns to work; the column family, qualifier,
-and if the column is indexed.
-
-Serializers
------------
-
-The Trino connector for Accumulo has a pluggable serializer framework
-for handling I/O between Trino and Accumulo. This enables end-users the
-ability to programmatically serialized and deserialize their special data
-formats within Accumulo, while abstracting away the complexity of the
-connector itself.
-
-There are two types of serializers currently available; a ``string``
-serializer that treats values as Java ``String``, and a ``lexicoder``
-serializer that leverages Accumulo's Lexicoder API to store values. The
-default serializer is the ``lexicoder`` serializer, as this serializer
-does not require expensive conversion operations back and forth between
-``String`` objects and the Trino types -- the cell's value is encoded as a
-byte array.
-
-Additionally, the ``lexicoder`` serializer does proper lexigraphical ordering of
-numerical types like ``BIGINT`` or ``TIMESTAMP``.  This is essential for the connector
-to properly leverage the secondary index when querying for data.
-
-You can change the default the serializer by specifying the
-``serializer`` table property, using either ``default`` (which is
-``lexicoder``), ``string`` or ``lexicoder`` for the built-in types, or
-you could provide your own implementation by extending
-``AccumuloRowSerializer``, adding it to the Trino ``CLASSPATH``, and
-specifying the fully-qualified Java class name in the connector configuration.
-
-.. code-block:: sql
-
-    CREATE TABLE example_schema.scientists (
-      recordkey VARCHAR,
-      name VARCHAR,
-      age BIGINT,
-      birthday DATE
-    )
-    WITH (
-      column_mapping = 'name:metadata:name,age:metadata:age,birthday:metadata:date',
-      serializer = 'default'
-    );
-
-.. code-block:: sql
-
-    INSERT INTO example_schema.scientists VALUES
-    ('row1', 'Grace Hopper', 109, DATE '1906-12-09' ),
-    ('row2', 'Alan Turing', 103, DATE '1912-06-23' );
-
-.. code-block:: text
-
-    root@default> scan -t example_schema.scientists
-    row1 metadata:age []    \x08\x80\x00\x00\x00\x00\x00\x00m
-    row1 metadata:date []    \x08\x7F\xFF\xFF\xFF\xFF\xFF\xA6\x06
-    row1 metadata:name []    Grace Hopper
-    row2 metadata:age []    \x08\x80\x00\x00\x00\x00\x00\x00g
-    row2 metadata:date []    \x08\x7F\xFF\xFF\xFF\xFF\xFF\xAD\xED
-    row2 metadata:name []    Alan Turing
-
-.. code-block:: sql
-
-    CREATE TABLE example_schema.stringy_scientists (
-      recordkey VARCHAR,
-      name VARCHAR,
-      age BIGINT,
-      birthday DATE
-    )
-    WITH (
-      column_mapping = 'name:metadata:name,age:metadata:age,birthday:metadata:date',
-      serializer = 'string'
-    );
-
-.. code-block:: sql
-
-    INSERT INTO example_schema.stringy_scientists VALUES
-    ('row1', 'Grace Hopper', 109, DATE '1906-12-09' ),
-    ('row2', 'Alan Turing', 103, DATE '1912-06-23' );
-
-.. code-block:: text
-
-    root@default> scan -t example_schema.stringy_scientists
-    row1 metadata:age []    109
-    row1 metadata:date []    -23034
-    row1 metadata:name []    Grace Hopper
-    row2 metadata:age []    103
-    row2 metadata:date []    -21011
-    row2 metadata:name []    Alan Turing
-
-.. code-block:: sql
-
-    CREATE TABLE example_schema.custom_scientists (
-      recordkey VARCHAR,
-      name VARCHAR,
-      age BIGINT,
-      birthday DATE
-    )
-    WITH (
-      column_mapping = 'name:metadata:name,age:metadata:age,birthday:metadata:date',
-      serializer = 'my.serializer.package.MySerializer'
-    );
-
-Metadata management
--------------------
-
-Metadata for the Trino/Accumulo tables is stored in ZooKeeper. You can,
-and should, issue SQL statements in Trino to create and drop tables.
-This is the easiest method of creating the metadata required to make the
-connector work. It is best to not mess with the metadata, but here are
-the details of how it is stored.
-
-A root node in ZooKeeper holds all the mappings, and the format is as
-follows:
-
-.. code-block:: text
-
-    /metadata-root/schema/table
-
-Where ``metadata-root`` is the value of ``zookeeper.metadata.root`` in
-the config file (default is ``/trino-accumulo``), ``schema`` is the
-Trino schema (which is identical to the Accumulo namespace name), and
-``table`` is the Trino table name (again, identical to Accumulo name).
-The data of the ``table`` ZooKeeper node is a serialized
-``AccumuloTable`` Java object (which resides in the connector code).
-This table contains the schema (namespace) name, table name, column
-definitions, the serializer to use for the table, and any additional
-table properties.
-
-If you have a need to programmatically manipulate the ZooKeeper metadata
-for Accumulo, take a look at
-``io.trino.plugin.accumulo.metadata.ZooKeeperMetadataManager`` for some
-Java code to simplify the process.
-
-Converting table from internal to external
-------------------------------------------
-
-If your table is *internal*, you can convert it to an external table by deleting
-the corresponding znode in ZooKeeper, effectively making the table no longer exist as
-far as Trino is concerned.  Then, create the table again using the same DDL, but adding the
-``external = true`` table property.
-
-For example:
-
-1. We're starting with an internal table ``foo.bar`` that was created with the below DDL.
-If you have not previously defined a table property for ``column_mapping`` (like this example),
-be sure to describe the table **before** deleting the metadata.  We need the column mappings
-when creating the external table.
-
-.. code-block:: sql
-
-    CREATE TABLE foo.bar (a VARCHAR, b BIGINT, c DATE)
-    WITH (
-        index_columns = 'b,c'
-    );
-
-.. code-block:: sql
-
-    DESCRIBE foo.bar;
-
-.. code-block:: text
-
-     Column |  Type   | Extra |               Comment
-    --------+---------+-------+-------------------------------------
-     a      | varchar |       | Accumulo row ID
-     b      | bigint  |       | Accumulo column b:b. Indexed: true
-     c      | date    |       | Accumulo column c:c. Indexed: true
-
-2. Using the ZooKeeper CLI, delete the corresponding znode.  Note this uses the default ZooKeeper
-metadata root of ``/trino-accumulo``
-
-.. code-block:: text
-
-    $ zkCli.sh
-    [zk: localhost:2181(CONNECTED) 1] delete /trino-accumulo/foo/bar
-
-3. Re-create the table using the same DDL as before, but adding the ``external=true`` property.
-Note that if you had not previously defined the column_mapping, you need to add the property
-to the new DDL (external tables require this property to be set).  The column mappings are in
-the output of the ``DESCRIBE`` statement.
-
-.. code-block:: sql
-
-    CREATE TABLE foo.bar (
-      a VARCHAR,
-      b BIGINT,
-      c DATE
-    )
-    WITH (
-      column_mapping = 'a:a:a,b:b:b,c:c:c',
-      index_columns = 'b,c',
-      external = true
-    );
-
-.. _accumulo-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and Accumulo each support types that the other does not, this
-connector modifies some types when reading or writing data. Data types may not
-map the same way in both directions between Trino and the data source. Refer to
-the following sections for type mapping in each direction.
-
-Accumulo type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Accumulo types to the corresponding Trino types following
-this table:
-
-.. list-table:: Accumulo type to Trino type mapping
-  :widths: 30, 20, 50
-  :header-rows: 1
-
-  * - Accumulo type
-    - Trino type
-    - Notes
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-    -
-  * - ``TINYINT``
-    - ``TINYINT``
-    -
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``INTEGER``
-    - ``INTEGER``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``REAL``
-    - ``REAL``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``VARCHAR(n)``
-    - ``VARCHAR(n)``
-    -
-  * - ``VARBINARY``
-    - ``VARBINARY``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME(n)``
-    - ``TIME(n)``
-    -
-  * - ``TIMESTAMP(n)``
-    - ``TIMESTAMP(n)``
-    -
-
-No other types are supported
-
-Trino type to Accumulo type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding Trino type to Accumulo type
-mapping types following this table:
-
-.. list-table:: Trino type to Accumulo type mapping
-  :widths: 30, 20, 50
-  :header-rows: 1
-
-  * - Trino type
-    - Accumulo type
-    - Notes
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-    -
-  * - ``TINYINT``
-    - ``TINYINT``
-    - Trino only supports writing values belonging to ``[0, 127]``
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``INTEGER``
-    - ``INTEGER``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``REAL``
-    - ``REAL``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``VARCHAR(n)``
-    - ``VARCHAR(n)``
-    -
-  * - ``VARBINARY``
-    - ``VARBINARY``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME(n)``
-    - ``TIME(n)``
-    -
-  * - ``TIMESTAMP(n)``
-    - ``TIMESTAMP(n)``
-    -
-
-No other types are supported
-
-.. _accumulo-sql-support:
-
-SQL support
------------
-
-The connector provides read and write access to data and metadata in
-the Accumulo database. In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/create-schema`
-* :doc:`/sql/drop-schema`
diff --git a/docs/src/main/sphinx/connector/alter-schema-limitation.fragment b/docs/src/main/sphinx/connector/alter-schema-limitation.fragment
index 501301f4a663..39065f900324 100644
--- a/docs/src/main/sphinx/connector/alter-schema-limitation.fragment
+++ b/docs/src/main/sphinx/connector/alter-schema-limitation.fragment
@@ -1,5 +1,4 @@
-ALTER SCHEMA
-^^^^^^^^^^^^
+### ALTER SCHEMA
 
-The connector supports renaming a schema with the ``ALTER SCHEMA RENAME``
-statement. ``ALTER SCHEMA SET AUTHORIZATION`` is not supported.
+The connector supports renaming a schema with the `ALTER SCHEMA RENAME`
+statement. `ALTER SCHEMA SET AUTHORIZATION` is not supported.
diff --git a/docs/src/main/sphinx/connector/alter-table-limitation.fragment b/docs/src/main/sphinx/connector/alter-table-limitation.fragment
index f6de252f1d5c..de64a02a9c3b 100644
--- a/docs/src/main/sphinx/connector/alter-table-limitation.fragment
+++ b/docs/src/main/sphinx/connector/alter-table-limitation.fragment
@@ -1,16 +1,15 @@
-ALTER TABLE
-^^^^^^^^^^^
+### ALTER TABLE RENAME TO
 
 The connector does not support renaming tables across multiple schemas. For
 example, the following statement is supported:
 
-.. code-block:: sql
-
-    ALTER TABLE example.schema_one.table_one RENAME TO example.schema_one.table_two
+```sql
+ALTER TABLE example.schema_one.table_one RENAME TO example.schema_one.table_two
+```
 
 The following statement attempts to rename a table across schemas, and therefore
 is not supported:
 
-.. code-block:: sql
-
-    ALTER TABLE example.schema_one.table_one RENAME TO example.schema_two.table_two
+```sql
+ALTER TABLE example.schema_one.table_one RENAME TO example.schema_two.table_two
+```
diff --git a/docs/src/main/sphinx/connector/atop.md b/docs/src/main/sphinx/connector/atop.md
new file mode 100644
index 000000000000..64eca21db683
--- /dev/null
+++ b/docs/src/main/sphinx/connector/atop.md
@@ -0,0 +1,146 @@
+# Atop connector
+
+The Atop connector supports reading disk utilization statistics from the [Atop](https://www.atoptool.nl/)
+(Advanced System and Process Monitor) Linux server performance analysis tool.
+
+## Requirements
+
+In order to use this connector, the host on which the Trino worker is running
+needs to have the `atop` tool installed locally.
+
+## Connector configuration
+
+The connector can read disk utilization statistics on the Trino cluster.
+Create a catalog properties file that specifies the Atop connector by
+setting the `connector.name` to `atop`.
+
+For example, create the file `etc/catalog/example.properties` with the
+following connector properties as appropriate for your setup:
+
+```text
+connector.name=atop
+atop.executable-path=/usr/bin/atop
+```
+
+## Configuration properties
+
+```{eval-rst}
+.. list-table::
+  :widths: 42, 18, 5, 35
+  :header-rows: 1
+
+  * - Property name
+    - Default value
+    - Required
+    - Description
+  * - ``atop.concurrent-readers-per-node``
+    - ``1``
+    - Yes
+    - The number of concurrent read operations allowed per node.
+  * - ``atop.executable-path``
+    - (none)
+    - Yes
+    - The file path on the local file system for the ``atop`` utility.
+  * - ``atop.executable-read-timeout``
+    - ``1ms``
+    - Yes
+    - The timeout when reading from the atop process.
+  * - ``atop.max-history-days``
+    - ``30``
+    - Yes
+    - The maximum number of days in the past to take into account for statistics.
+  * - ``atop.security``
+    - ``ALLOW_ALL``
+    - Yes
+    - The :doc:`access control </security/built-in-system-access-control>` for the connector.
+  * - ``atop.time-zone``
+    - System default
+    - Yes
+    - The time zone identifier in which the atop data is collected. Generally the timezone of the host.
+      Sample time zone identifiers: ``Europe/Vienna``, ``+0100``, ``UTC``.
+```
+
+## Usage
+
+The Atop connector provides a `default` schema.
+
+The tables exposed by this connector can be retrieved by running `SHOW TABLES`:
+
+```
+SHOW TABLES FROM example.default;
+```
+
+```text
+  Table
+---------
+ disks
+ reboots
+(2 rows)
+```
+
+The `disks` table offers disk utilization statistics recorded on the Trino node.
+
+```{eval-rst}
+.. list-table:: Disks columns
+  :widths: 30, 30, 40
+  :header-rows: 1
+
+  * - Name
+    - Type
+    - Description
+  * - ``host_ip``
+    - ``VARCHAR``
+    - Trino worker IP
+  * - ``start_time``
+    - ``TIMESTAMP(3) WITH TIME ZONE``
+    - Interval start time for the statistics
+  * - ``end_time``
+    - ``TIMESTAMP(3) WITH TIME ZONE``
+    - Interval end time for the statistics
+  * - ``device_name``
+    - ``VARCHAR``
+    - Logical volume/hard disk name
+  * - ``utilization_percent``
+    - ``DOUBLE``
+    - The percentage of time the unit was busy handling requests
+  * - ``io_time``
+    - ``INTERVAL DAY TO SECOND``
+    - Time spent for I/O
+  * - ``read_requests``
+    - ``BIGINT``
+    - Number of reads issued
+  * - ``sectors_read``
+    - ``BIGINT``
+    - Number of sectors transferred for reads
+  * - ``write_requests``
+    - ``BIGINT``
+    - Number of writes issued
+  * - ``sectors_written``
+    - ``BIGINT``
+    - Number of sectors transferred for write
+```
+
+The `reboots` table offers information about the system reboots performed on the Trino node.
+
+```{eval-rst}
+.. list-table:: Reboots columns
+  :widths: 30, 30, 40
+  :header-rows: 1
+
+  * - Name
+    - Type
+    - Description
+  * - ``host_ip``
+    - ``VARCHAR``
+    - Trino worker IP
+  * - ``power_on_time``
+    - ``TIMESTAMP(3) WITH TIME ZONE``
+    - The boot/reboot timestamp
+
+```
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements to access system and process monitor
+information on your Trino nodes.
diff --git a/docs/src/main/sphinx/connector/atop.rst b/docs/src/main/sphinx/connector/atop.rst
deleted file mode 100644
index 89cd9e8f3082..000000000000
--- a/docs/src/main/sphinx/connector/atop.rst
+++ /dev/null
@@ -1,146 +0,0 @@
-==============
-Atop connector
-==============
-
-The Atop connector supports reading disk utilization statistics from the `Atop <https://www.atoptool.nl/>`_
-(Advanced System and Process Monitor) Linux server performance analysis tool.
-
-Requirements
-------------
-
-In order to use this connector, the host on which the Trino worker is running
-needs to have the ``atop`` tool installed locally.
-
-Connector configuration
------------------------
-
-The connector can read disk utilization statistics on the Trino cluster.
-Create a catalog properties file that specifies the Atop connector by
-setting the ``connector.name`` to ``atop``.
-
-For example, create the file ``etc/catalog/example.properties`` with the
-following connector properties as appropriate for your setup:
-
-.. code-block:: text
-
-    connector.name=atop
-    atop.executable-path=/usr/bin/atop
-
-Configuration properties
-------------------------
-
-.. list-table::
-  :widths: 42, 18, 5, 35
-  :header-rows: 1
-
-  * - Property name
-    - Default value
-    - Required
-    - Description
-  * - ``atop.concurrent-readers-per-node``
-    - ``1``
-    - Yes
-    - The number of concurrent read operations allowed per node.
-  * - ``atop.executable-path``
-    - (none)
-    - Yes
-    - The file path on the local file system for the ``atop`` utility.
-  * - ``atop.executable-read-timeout``
-    - ``1ms``
-    - Yes
-    - The timeout when reading from the atop process.
-  * - ``atop.max-history-days``
-    - ``30``
-    - Yes
-    - The maximum number of days in the past to take into account for statistics.
-  * - ``atop.security``
-    - ``ALLOW_ALL``
-    - Yes
-    - The :doc:`access control </security/built-in-system-access-control>` for the connector.
-  * - ``atop.time-zone``
-    - System default
-    - Yes
-    - The time zone identifier in which the atop data is collected. Generally the timezone of the host.
-      Sample time zone identifiers: ``Europe/Vienna``, ``+0100``, ``UTC``.
-
-Usage
------
-
-The Atop connector provides a ``default`` schema.
-
-The tables exposed by this connector can be retrieved by running ``SHOW TABLES``::
-
-    SHOW TABLES FROM example.default;
-
-.. code-block:: text
-
-      Table
-    ---------
-     disks
-     reboots
-    (2 rows)
-
-
-The ``disks`` table offers disk utilization statistics recorded on the Trino node.
-
-.. list-table:: Disks columns
-  :widths: 30, 30, 40
-  :header-rows: 1
-
-  * - Name
-    - Type
-    - Description
-  * - ``host_ip``
-    - ``varchar``
-    - Trino worker IP
-  * - ``start_time``
-    - ``timestamp(3) with time zone``
-    - Interval start time for the statistics
-  * - ``end_time``
-    - ``timestamp(3) with time zone``
-    - Interval end time for the statistics
-  * - ``device_name``
-    - ``varchar``
-    - Logical volume/hard disk name
-  * - ``utilization_percent``
-    - ``double``
-    - The percentage of time the unit was busy handling requests
-  * - ``io_time``
-    - ``interval day to second``
-    - Time spent for I/O
-  * - ``read_requests``
-    - ``bigint``
-    - Number of reads issued
-  * - ``sectors_read``
-    - ``bigint``
-    - Number of sectors transferred for reads
-  * - ``write_requests``
-    - ``bigint``
-    - Number of writes issued
-  * - ``sectors_written``
-    - ``bigint``
-    - Number of sectors transferred for write
-
-The ``reboots`` table offers information about the system reboots performed on the Trino node.
-
-.. list-table:: Reboots columns
-  :widths: 30, 30, 40
-  :header-rows: 1
-
-  * - Name
-    - Type
-    - Description
-  * - ``host_ip``
-    - ``varchar``
-    - Trino worker IP
-  * - ``power_on_time``
-    - ``timestamp(3) with time zone``
-    - The boot/reboot timestamp
-
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access system and process monitor
-information on your Trino nodes.
diff --git a/docs/src/main/sphinx/connector/avro-decoder.fragment b/docs/src/main/sphinx/connector/avro-decoder.fragment
new file mode 100644
index 000000000000..f4e995e73037
--- /dev/null
+++ b/docs/src/main/sphinx/connector/avro-decoder.fragment
@@ -0,0 +1,69 @@
+#### Avro decoder
+
+The Avro decoder converts the bytes representing a message or key in Avro format
+based on a schema. The message must have the Avro schema embedded. Trino does
+not support schemaless Avro decoding.
+
+The `dataSchema` must be defined for any key or message using `Avro`
+decoder. `Avro` decoder should point to the location of a valid Avro
+schema file of the message which must be decoded. This location can be a remote
+web server (e.g.: `dataSchema: 'http://example.org/schema/avro_data.avsc'`) or
+local file system(e.g.: `dataSchema: '/usr/local/schema/avro_data.avsc'`). The
+decoder fails if this location is not accessible from the Trino cluster.
+
+The following attributes are supported:
+
+- `name` - Name of the column in the Trino table.
+- `type` - Trino data type of column.
+- `mapping` - A slash-separated list of field names to select a field from the
+  Avro schema. If the field specified in `mapping` does not exist in the
+  original Avro schema, a read operation returns `NULL`.
+
+The following table lists the supported Trino types that can be used in `type`
+for the equivalent Avro field types:
+
+```{eval-rst}
+.. list-table::
+  :widths: 40, 60
+  :header-rows: 1
+
+  * - Trino data type
+    - Allowed Avro data type
+  * - ``BIGINT``
+    - ``INT``, ``LONG``
+  * - ``DOUBLE``
+    - ``DOUBLE``, ``FLOAT``
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+  * - ``VARCHAR`` / ``VARCHAR(x)``
+    - ``STRING``
+  * - ``VARBINARY``
+    - ``FIXED``, ``BYTES``
+  * - ``ARRAY``
+    - ``ARRAY``
+  * - ``MAP``
+    - ``MAP``
+```
+
+No other types are supported.
+
+##### Avro schema evolution
+
+The Avro decoder supports schema evolution with backward compatibility. With
+backward compatibility, a newer schema can be used to read Avro data created
+with an older schema. Any change in the Avro schema must also be reflected in
+Trino's topic definition file. Newly added or renamed fields must have a
+default value in the Avro schema file.
+
+The schema evolution behavior is as follows:
+
+- Column added in new schema: Data created with an older schema produces a
+  *default* value when the table is using the new schema.
+- Column removed in new schema: Data created with an older schema no longer
+  outputs the data from the column that was removed.
+- Column is renamed in the new schema: This is equivalent to removing the column
+  and adding a new one, and data created with an older schema produces a
+  *default* value when the table is using the new schema.
+- Changing type of column in the new schema: If the type coercion is supported
+  by Avro, then the conversion happens. An error is thrown for incompatible
+  types.
diff --git a/docs/src/main/sphinx/connector/bigquery.md b/docs/src/main/sphinx/connector/bigquery.md
new file mode 100644
index 000000000000..6cdfef2c3e19
--- /dev/null
+++ b/docs/src/main/sphinx/connector/bigquery.md
@@ -0,0 +1,374 @@
+# BigQuery connector
+
+```{raw} html
+<img src="../_static/img/bigquery.png" class="connector-logo">
+```
+
+The BigQuery connector allows querying the data stored in [BigQuery](https://cloud.google.com/bigquery/). This can be used to join data between
+different systems like BigQuery and Hive. The connector uses the [BigQuery
+Storage API](https://cloud.google.com/bigquery/docs/reference/storage/) to
+read the data from the tables.
+
+## BigQuery Storage API
+
+The Storage API streams data in parallel directly from BigQuery via gRPC without
+using Google Cloud Storage as an intermediary.
+It has a number of advantages over using the previous export-based read flow
+that should generally lead to better read performance:
+
+**Direct Streaming**
+
+: It does not leave any temporary files in Google Cloud Storage. Rows are read
+  directly from BigQuery servers using an Avro wire format.
+
+**Column Filtering**
+
+: The new API allows column filtering to only read the data you are interested in.
+  [Backed by a columnar datastore](https://cloud.google.com/blog/products/bigquery/inside-capacitor-bigquerys-next-generation-columnar-storage-format),
+  it can efficiently stream data without reading all columns.
+
+**Dynamic Sharding**
+
+: The API rebalances records between readers until they all complete. This means
+  that all Map phases will finish nearly concurrently. See this blog article on
+  [how dynamic sharding is similarly used in Google Cloud Dataflow](https://cloud.google.com/blog/products/gcp/no-shard-left-behind-dynamic-work-rebalancing-in-google-cloud-dataflow).
+
+(bigquery-requirements)=
+## Requirements
+
+To connect to BigQuery, you need:
+
+- To enable the [BigQuery Storage Read API](https://cloud.google.com/bigquery/docs/reference/storage/#enabling_the_api).
+
+- Network access from your Trino coordinator and workers to the
+  Google Cloud API service endpoint. This endpoint uses HTTPS, or port 443.
+
+- To configure BigQuery so that the Trino coordinator and workers have [permissions
+  in BigQuery](https://cloud.google.com/bigquery/docs/reference/storage#permissions).
+
+- To set up authentication. Your authentiation options differ depending on whether
+  you are using Dataproc/Google Compute Engine (GCE) or not.
+
+  **On Dataproc/GCE** the authentication is done from the machine's role.
+
+  **Outside Dataproc/GCE** you have 3 options:
+
+  - Use a service account JSON key and `GOOGLE_APPLICATION_CREDENTIALS` as
+    described in the Google Cloud authentication [getting started guide](https://cloud.google.com/docs/authentication/getting-started).
+  - Set `bigquery.credentials-key` in the catalog properties file. It should
+    contain the contents of the JSON file, encoded using base64.
+  - Set `bigquery.credentials-file` in the catalog properties file. It should
+    point to the location of the JSON file.
+
+## Configuration
+
+To configure the BigQuery connector, create a catalog properties file in
+`etc/catalog` named `example.properties`, to mount the BigQuery connector as
+the `example` catalog. Create the file with the following contents, replacing
+the connection properties as appropriate for your setup:
+
+```text
+connector.name=bigquery
+bigquery.project-id=<your Google Cloud Platform project id>
+```
+
+### Multiple GCP projects
+
+The BigQuery connector can only access a single GCP project.Thus, if you have
+data in multiple GCP projects, You need to create several catalogs, each
+pointing to a different GCP project. For example, if you have two GCP projects,
+one for the sales and one for analytics, you can create two properties files in
+`etc/catalog` named `sales.properties` and `analytics.properties`, both
+having `connector.name=bigquery` but with different `project-id`. This will
+create the two catalogs, `sales` and `analytics` respectively.
+
+### Configuring partitioning
+
+By default the connector creates one partition per 400MB in the table being
+read (before filtering). This should roughly correspond to the maximum number
+of readers supported by the BigQuery Storage API. This can be configured
+explicitly with the `bigquery.parallelism` property. BigQuery may limit the
+number of partitions based on server constraints.
+
+(bigquery-arrow-serialization-support)=
+### Arrow serialization support
+
+This is an experimental feature which introduces support for using Apache Arrow
+as the serialization format when reading from BigQuery.  Please note there are
+a few caveats:
+
+- Using Apache Arrow serialization is disabled by default. In order to enable
+  it, set the `bigquery.experimental.arrow-serialization.enabled`
+  configuration property to `true` and add
+  `--add-opens=java.base/java.nio=ALL-UNNAMED` to the Trino
+  {ref}`jvm-config`.
+
+(bigquery-reading-from-views)=
+### Reading from views
+
+The connector has a preliminary support for reading from [BigQuery views](https://cloud.google.com/bigquery/docs/views-intro). Please note there are
+a few caveats:
+
+- Reading from views is disabled by default. In order to enable it, set the
+  `bigquery.views-enabled` configuration property to `true`.
+- BigQuery views are not materialized by default, which means that the
+  connector needs to materialize them before it can read them. This process
+  affects the read performance.
+- The materialization process can also incur additional costs to your BigQuery bill.
+- By default, the materialized views are created in the same project and
+  dataset. Those can be configured by the optional `bigquery.view-materialization-project`
+  and `bigquery.view-materialization-dataset` properties, respectively. The
+  service account must have write permission to the project and the dataset in
+  order to materialize the view.
+
+### Configuration properties
+
+| Property                                            | Description                                                                                                                                                     | Default                                              |
+| --------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------- |
+| `bigquery.project-id`                               | The Google Cloud Project ID where the data reside                                                                                                               | Taken from the service account                       |
+| `bigquery.parent-project-id`                        | The project ID Google Cloud Project to bill for the export                                                                                                      | Taken from the service account                       |
+| `bigquery.parallelism`                              | The number of partitions to split the data into                                                                                                                 | The number of executors                              |
+| `bigquery.views-enabled`                            | Enables the connector to read from views and not only tables. Please read [this section](bigquery-reading-from-views) before enabling this feature.                     | `false`                                              |
+| `bigquery.view-expire-duration`                     | Expire duration for the materialized view.                                                                                                                      | `24h`                                                |
+| `bigquery.view-materialization-project`             | The project where the materialized view is going to be created                                                                                                  | The view's project                                   |
+| `bigquery.view-materialization-dataset`             | The dataset where the materialized view is going to be created                                                                                                  | The view's dataset                                   |
+| `bigquery.skip-view-materialization`                | Use REST API to access views instead of Storage API. BigQuery `BIGNUMERIC` and `TIMESTAMP` types are unsupported.                                               | `false`                                              |
+| `bigquery.views-cache-ttl`                          | Duration for which the materialization of a view will be cached and reused. Set to `0ms` to disable the cache.                                                  | `15m`                                                |
+| `bigquery.metadata.cache-ttl`                       | Duration for which metadata retrieved from BigQuery is cached and reused. Set to `0ms` to disable the cache.                                                    | `0ms`                                                |
+| `bigquery.max-read-rows-retries`                    | The number of retries in case of retryable server issues                                                                                                        | `3`                                                  |
+| `bigquery.credentials-key`                          | The base64 encoded credentials key                                                                                                                              | None. See the [requirements](bigquery-requirements) section. |
+| `bigquery.credentials-file`                         | The path to the JSON credentials file                                                                                                                           | None. See the [requirements](bigquery-requirements) section. |
+| `bigquery.case-insensitive-name-matching`           | Match dataset and table names case-insensitively                                                                                                                | `false`                                              |
+| `bigquery.query-results-cache.enabled`              | Enable [query results cache](https://cloud.google.com/bigquery/docs/cached-results)                                                                             | `false`                                              |
+| `bigquery.experimental.arrow-serialization.enabled` | Enable using Apache Arrow serialization when reading data from BigQuery. Please read this [section](bigquery-arrow-serialization-support) before enabling this feature. | `false`                                              |
+| `bigquery.rpc-proxy.enabled`                        | Use a proxy for communication with BigQuery.                                                                                                                    | `false`                                              |
+| `bigquery.rpc-proxy.uri`                            | Proxy URI to use if connecting through a proxy.                                                                                                                 |                                                      |
+| `bigquery.rpc-proxy.username`                       | Proxy user name to use if connecting through a proxy.                                                                                                           |                                                      |
+| `bigquery.rpc-proxy.password`                       | Proxy password to use if connecting through a proxy.                                                                                                            |                                                      |
+| `bigquery.rpc-proxy.keystore-path`                  | Keystore containing client certificates to present to proxy if connecting through a proxy. Only required if proxy uses mutual TLS.                              |                                                      |
+| `bigquery.rpc-proxy.keystore-password`              | Password of the keystore specified by `bigquery.rpc-proxy.keystore-path`.                                                                                       |                                                      |
+| `bigquery.rpc-proxy.truststore-path`                | Truststore containing certificates of the proxy server if connecting through a proxy.                                                                           |                                                      |
+| `bigquery.rpc-proxy.truststore-password`            | Password of the truststore specified by `bigquery.rpc-proxy.truststore-path`.                                                                                   |                                                      |
+
+(bigquery-type-mapping)=
+
+## Type mapping
+
+Because Trino and BigQuery each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+### BigQuery type to Trino type mapping
+
+The connector maps BigQuery types to the corresponding Trino types according
+to the following table:
+
+```{eval-rst}
+.. list-table:: BigQuery type to Trino type mapping
+  :widths: 30, 30, 50
+  :header-rows: 1
+
+  * - BigQuery type
+    - Trino type
+    - Notes
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+    -
+  * - ``INT64``
+    - ``BIGINT``
+    - ``INT``, ``SMALLINT``, ``INTEGER``, ``BIGINT``, ``TINYINT``, and
+      ``BYTEINT`` are aliases for ``INT64`` in BigQuery.
+  * - ``FLOAT64``
+    - ``DOUBLE``
+    -
+  * - ``NUMERIC``
+    - ``DECIMAL(P,S)``
+    - The default precision and scale of ``NUMERIC`` is ``(38, 9)``.
+  * - ``BIGNUMERIC``
+    - ``DECIMAL(P,S)``
+    - Precision > 38 is not supported. The default precision and scale of
+      ``BIGNUMERIC`` is ``(77, 38)``.
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``DATETIME``
+    - ``TIMESTAMP(6)``
+    -
+  * - ``STRING``
+    - ``VARCHAR``
+    -
+  * - ``BYTES``
+    - ``VARBINARY``
+    -
+  * - ``TIME``
+    - ``TIME(6)``
+    -
+  * - ``TIMESTAMP``
+    - ``TIMESTAMP(6) WITH TIME ZONE``
+    - Time zone is UTC
+  * - ``GEOGRAPHY``
+    - ``VARCHAR``
+    - In `Well-known text (WKT) <https://wikipedia.org/wiki/Well-known_text_representation_of_geometry>`_ format
+  * - ``ARRAY``
+    - ``ARRAY``
+    -
+  * - ``RECORD``
+    - ``ROW``
+    -
+```
+
+No other types are supported.
+
+### Trino type to BigQuery type mapping
+
+The connector maps Trino types to the corresponding BigQuery types according
+to the following table:
+
+```{eval-rst}
+.. list-table:: Trino type to BigQuery type mapping
+  :widths: 30, 30, 50
+  :header-rows: 1
+
+  * - Trino type
+    - BigQuery type
+    - Notes
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+    -
+  * - ``VARBINARY``
+    - ``BYTES``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``DOUBLE``
+    - ``FLOAT``
+    -
+  * - ``BIGINT``
+    - ``INT64``
+    - ``INT``, ``SMALLINT``, ``INTEGER``, ``BIGINT``, ``TINYINT``, and
+      ``BYTEINT`` are aliases for ``INT64`` in BigQuery.
+  * - ``DECIMAL(P,S)``
+    - ``NUMERIC``
+    - The default precision and scale of ``NUMERIC`` is ``(38, 9)``.
+  * - ``VARCHAR``
+    - ``STRING``
+    -
+  * - ``TIMESTAMP(6)``
+    - ``DATETIME``
+    -
+```
+
+No other types are supported.
+
+## System tables
+
+For each Trino table which maps to BigQuery view there exists a system table
+which exposes BigQuery view definition. Given a BigQuery view `example_view`
+you can send query `SELECT * example_view$view_definition` to see the SQL
+which defines view in BigQuery.
+
+(bigquery-special-columns)=
+
+## Special columns
+
+In addition to the defined columns, the BigQuery connector exposes
+partition information in a number of hidden columns:
+
+- `$partition_date`: Equivalent to `_PARTITIONDATE` pseudo-column in BigQuery
+- `$partition_time`: Equivalent to `_PARTITIONTIME` pseudo-column in BigQuery
+
+You can use these columns in your SQL statements like any other column. They
+can be selected directly, or used in conditional statements. For example, you
+can inspect the partition date and time for each record:
+
+```
+SELECT *, "$partition_date", "$partition_time"
+FROM example.web.page_views;
+```
+
+Retrieve all records stored in the partition `_PARTITIONDATE = '2022-04-07'`:
+
+```
+SELECT *
+FROM example.web.page_views
+WHERE "$partition_date" = date '2022-04-07';
+```
+
+:::{note}
+Two special partitions `__NULL__` and `__UNPARTITIONED__` are not supported.
+:::
+
+(bigquery-sql-support)=
+
+## SQL support
+
+The connector provides read and write access to data and metadata in the
+BigQuery database. In addition to the
+{ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements, the connector supports
+the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/truncate`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/create-schema`
+- {doc}`/sql/drop-schema`
+- {doc}`/sql/comment`
+
+(bigquery-fte-support)=
+
+## Fault-tolerant execution support
+
+The connector supports {doc}`/admin/fault-tolerant-execution` of query
+processing. Read and write operations are both supported with any retry policy.
+
+## Table functions
+
+The connector provides specific {doc}`table functions </functions/table>` to
+access BigQuery.
+
+(bigquery-query-function)=
+
+### `query(varchar) -> table`
+
+The `query` function allows you to query the underlying BigQuery directly. It
+requires syntax native to BigQuery, because the full query is pushed down and
+processed by BigQuery. This can be useful for accessing native features which are
+not available in Trino or for improving query performance in situations where
+running a query natively may be faster.
+
+```{include} query-passthrough-warning.fragment
+```
+
+For example, query the `example` catalog and group and concatenate all
+employee IDs by manager ID:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    example.system.query(
+      query => 'SELECT
+        manager_id, STRING_AGG(employee_id)
+      FROM
+        company.employees
+      GROUP BY
+        manager_id'
+    )
+  );
+```
+
+```{include} query-table-function-ordering.fragment
+```
+
+## FAQ
+
+### What is the Pricing for the Storage API?
+
+See the [BigQuery pricing documentation](https://cloud.google.com/bigquery/pricing#storage-api).
diff --git a/docs/src/main/sphinx/connector/bigquery.rst b/docs/src/main/sphinx/connector/bigquery.rst
deleted file mode 100644
index f09894a00186..000000000000
--- a/docs/src/main/sphinx/connector/bigquery.rst
+++ /dev/null
@@ -1,374 +0,0 @@
-==================
-BigQuery connector
-==================
-
-.. raw:: html
-
-  <img src="../_static/img/bigquery.png" class="connector-logo">
-
-The BigQuery connector allows querying the data stored in `BigQuery
-<https://cloud.google.com/bigquery/>`_. This can be used to join data between
-different systems like BigQuery and Hive. The connector uses the `BigQuery
-Storage API <https://cloud.google.com/bigquery/docs/reference/storage/>`_ to
-read the data from the tables.
-
-BigQuery Storage API
---------------------
-
-The Storage API streams data in parallel directly from BigQuery via gRPC without
-using Google Cloud Storage as an intermediary.
-It has a number of advantages over using the previous export-based read flow
-that should generally lead to better read performance:
-
-**Direct Streaming**
-    It does not leave any temporary files in Google Cloud Storage. Rows are read
-    directly from BigQuery servers using an Avro wire format.
-
-**Column Filtering**
-    The new API allows column filtering to only read the data you are interested in.
-    `Backed by a columnar datastore <https://cloud.google.com/blog/products/bigquery/inside-capacitor-bigquerys-next-generation-columnar-storage-format>`_,
-    it can efficiently stream data without reading all columns.
-
-**Dynamic Sharding**
-    The API rebalances records between readers until they all complete. This means
-    that all Map phases will finish nearly concurrently. See this blog article on
-    `how dynamic sharding is similarly used in Google Cloud Dataflow
-    <https://cloud.google.com/blog/products/gcp/no-shard-left-behind-dynamic-work-rebalancing-in-google-cloud-dataflow>`_.
-
-Requirements
-------------
-
-To connect to BigQuery, you need:
-
-* To enable the `BigQuery Storage Read API
-  <https://cloud.google.com/bigquery/docs/reference/storage/#enabling_the_api>`_.
-* Network access from your Trino coordinator and workers to the
-  Google Cloud API service endpoint. This endpoint uses HTTPS, or port 443.
-* To configure BigQuery so that the Trino coordinator and workers have `permissions
-  in BigQuery <https://cloud.google.com/bigquery/docs/reference/storage#permissions>`_.
-* To set up authentication. Your authentiation options differ depending on whether
-  you are using Dataproc/Google Compute Engine (GCE) or not.
-
-  **On Dataproc/GCE** the authentication is done from the machine's role.
-
-  **Outside Dataproc/GCE** you have 3 options:
-
-  * Use a service account JSON key and ``GOOGLE_APPLICATION_CREDENTIALS`` as
-    described in the Google Cloud authentication `getting started guide
-    <https://cloud.google.com/docs/authentication/getting-started>`_.
-  * Set ``bigquery.credentials-key`` in the catalog properties file. It should
-    contain the contents of the JSON file, encoded using base64.
-  * Set ``bigquery.credentials-file`` in the catalog properties file. It should
-    point to the location of the JSON file.
-
-Configuration
--------------
-
-To configure the BigQuery connector, create a catalog properties file in
-``etc/catalog`` named ``example.properties``, to mount the BigQuery connector as
-the ``example`` catalog. Create the file with the following contents, replacing
-the connection properties as appropriate for your setup:
-
-.. code-block:: text
-
-    connector.name=bigquery
-    bigquery.project-id=<your Google Cloud Platform project id>
-
-Multiple GCP projects
-^^^^^^^^^^^^^^^^^^^^^
-
-The BigQuery connector can only access a single GCP project.Thus, if you have
-data in multiple GCP projects, You need to create several catalogs, each
-pointing to a different GCP project. For example, if you have two GCP projects,
-one for the sales and one for analytics, you can create two properties files in
-``etc/catalog`` named ``sales.properties`` and ``analytics.properties``, both
-having ``connector.name=bigquery`` but with different ``project-id``. This will
-create the two catalogs, ``sales`` and ``analytics`` respectively.
-
-Configuring partitioning
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-By default the connector creates one partition per 400MB in the table being
-read (before filtering). This should roughly correspond to the maximum number
-of readers supported by the BigQuery Storage API. This can be configured
-explicitly with the ``bigquery.parallelism`` property. BigQuery may limit the
-number of partitions based on server constraints.
-
-Arrow serialization support
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This is an experimental feature which introduces support for using Apache Arrow
-as the serialization format when reading from BigQuery.  Please note there are
-a few caveats:
-
-* Using Apache Arrow serialization is disabled by default. In order to enable
-  it, set the ``bigquery.experimental.arrow-serialization.enabled``
-  configuration property to ``true`` and add
-  ``--add-opens=java.base/java.nio=ALL-UNNAMED`` to the Trino
-  :ref:`jvm_config`.
-
-Reading from views
-^^^^^^^^^^^^^^^^^^
-
-The connector has a preliminary support for reading from `BigQuery views
-<https://cloud.google.com/bigquery/docs/views-intro>`_. Please note there are
-a few caveats:
-
-* Reading from views is disabled by default. In order to enable it, set the
-  ``bigquery.views-enabled`` configuration property to ``true``.
-* BigQuery views are not materialized by default, which means that the
-  connector needs to materialize them before it can read them. This process
-  affects the read performance.
-* The materialization process can also incur additional costs to your BigQuery bill.
-* By default, the materialized views are created in the same project and
-  dataset. Those can be configured by the optional ``bigquery.view-materialization-project``
-  and ``bigquery.view-materialization-dataset`` properties, respectively. The
-  service account must have write permission to the project and the dataset in
-  order to materialize the view.
-
-Configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-===================================================== ============================================================== ======================================================
-Property                                              Description                                                    Default
-===================================================== ============================================================== ======================================================
-``bigquery.project-id``                               The Google Cloud Project ID where the data reside              Taken from the service account
-``bigquery.parent-project-id``                        The project ID Google Cloud Project to bill for the export     Taken from the service account
-``bigquery.parallelism``                              The number of partitions to split the data into                The number of executors
-``bigquery.views-enabled``                            Enables the connector to read from views and not only tables.  ``false``
-                                                      Please read `this section <#reading-from-views>`_ before
-                                                      enabling this feature.
-``bigquery.view-expire-duration``                     Expire duration for the materialized view.                     ``24h``
-``bigquery.view-materialization-project``             The project where the materialized view is going to be created The view's project
-``bigquery.view-materialization-dataset``             The dataset where the materialized view is going to be created The view's dataset
-``bigquery.skip-view-materialization``                Use REST API to access views instead of Storage API. BigQuery
-                                                      ``BIGNUMERIC`` and ``TIMESTAMP`` types are unsupported.        ``false``
-``bigquery.views-cache-ttl``                          Duration for which the materialization of a view will be       ``15m``
-                                                      cached and reused. Set to ``0ms`` to disable the cache.
-``bigquery.metadata.cache-ttl``                       Duration for which metadata retrieved from BigQuery            ``0ms``
-                                                      is cached and reused. Set to ``0ms`` to disable the cache.
-``bigquery.max-read-rows-retries``                    The number of retries in case of retryable server issues       ``3``
-``bigquery.credentials-key``                          The base64 encoded credentials key                             None. See the `requirements <#requirements>`_ section.
-``bigquery.credentials-file``                         The path to the JSON credentials file                          None. See the `requirements <#requirements>`_ section.
-``bigquery.case-insensitive-name-matching``           Match dataset and table names case-insensitively               ``false``
-``bigquery.query-results-cache.enabled``              Enable `query results cache
-                                                      <https://cloud.google.com/bigquery/docs/cached-results>`_      ``false``
-``bigquery.experimental.arrow-serialization.enabled`` Enable using Apache Arrow serialization when reading data      ``false``
-                                                      from BigQuery.
-                                                      Please read this `section <#arrow-serialization-support>`_
-                                                      before enabling this feature.
-===================================================== ============================================================== ======================================================
-
-.. _bigquery-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and BigQuery each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-BigQuery type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps BigQuery types to the corresponding Trino types according
-to the following table:
-
-.. list-table:: BigQuery type to Trino type mapping
-  :widths: 30, 30, 50
-  :header-rows: 1
-
-  * - BigQuery type
-    - Trino type
-    - Notes
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-    -
-  * - ``INT64``
-    - ``BIGINT``
-    - ``INT``, ``SMALLINT``, ``INTEGER``, ``BIGINT``, ``TINYINT``, and
-      ``BYTEINT`` are aliases for ``INT64`` in BigQuery.
-  * - ``FLOAT64``
-    - ``DOUBLE``
-    -
-  * - ``NUMERIC``
-    - ``DECIMAL(P,S)``
-    - The default precision and scale of ``NUMERIC`` is ``(38, 9)``.
-  * - ``BIGNUMERIC``
-    - ``DECIMAL(P,S)``
-    - Precision > 38 is not supported. The default precision and scale of
-      ``BIGNUMERIC`` is ``(77, 38)``.
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``DATETIME``
-    - ``TIMESTAMP(6)``
-    -
-  * - ``STRING``
-    - ``VARCHAR``
-    -
-  * - ``BYTES``
-    - ``VARBINARY``
-    -
-  * - ``TIME``
-    - ``TIME(6)``
-    -
-  * - ``TIMESTAMP``
-    - ``TIMESTAMP(6) WITH TIME ZONE``
-    - Time zone is UTC
-  * - ``GEOGRAPHY``
-    - ``VARCHAR``
-    - In `Well-known text (WKT) <https://wikipedia.org/wiki/Well-known_text_representation_of_geometry>`_ format
-  * - ``ARRAY``
-    - ``ARRAY``
-    -
-  * - ``RECORD``
-    - ``ROW``
-    -
-
-No other types are supported.
-
-Trino type to BigQuery type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding BigQuery types according
-to the following table:
-
-.. list-table:: Trino type to BigQuery type mapping
-  :widths: 30, 30, 50
-  :header-rows: 1
-
-  * - Trino type
-    - BigQuery type
-    - Notes
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-    -
-  * - ``VARBINARY``
-    - ``BYTES``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``DOUBLE``
-    - ``FLOAT``
-    -
-  * - ``BIGINT``
-    - ``INT64``
-    - ``INT``, ``SMALLINT``, ``INTEGER``, ``BIGINT``, ``TINYINT``, and
-      ``BYTEINT`` are aliases for ``INT64`` in BigQuery.
-  * - ``DECIMAL(P,S)``
-    - ``NUMERIC``
-    - The default precision and scale of ``NUMERIC`` is ``(38, 9)``.
-  * - ``VARCHAR``
-    - ``STRING``
-    -
-  * - ``TIMESTAMP(6)``
-    - ``DATETIME``
-    -
-
-No other types are supported.
-
-System tables
--------------
-
-For each Trino table which maps to BigQuery view there exists a system table
-which exposes BigQuery view definition. Given a BigQuery view ``example_view``
-you can send query ``SELECT * example_view$view_definition`` to see the SQL
-which defines view in BigQuery.
-
-.. _bigquery_special_columns:
-
-Special columns
----------------
-
-In addition to the defined columns, the BigQuery connector exposes
-partition information in a number of hidden columns:
-
-* ``$partition_date``: Equivalent to ``_PARTITIONDATE`` pseudo-column in BigQuery
-
-* ``$partition_time``: Equivalent to ``_PARTITIONTIME`` pseudo-column in BigQuery
-
-You can use these columns in your SQL statements like any other column. They
-can be selected directly, or used in conditional statements. For example, you
-can inspect the partition date and time for each record::
-
-    SELECT *, "$partition_date", "$partition_time"
-    FROM example.web.page_views;
-
-Retrieve all records stored in the partition ``_PARTITIONDATE = '2022-04-07'``::
-
-    SELECT *
-    FROM example.web.page_views
-    WHERE "$partition_date" = date '2022-04-07';
-
-.. note::
-
-  Two special partitions ``__NULL__`` and ``__UNPARTITIONED__`` are not supported.
-
-.. _bigquery-sql-support:
-
-SQL support
------------
-
-The connector provides read and write access to data and metadata in the
-BigQuery database. In addition to the
-:ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements, the connector supports
-the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/truncate`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/create-schema`
-* :doc:`/sql/drop-schema`
-* :doc:`/sql/comment`
-
-Table functions
----------------
-
-The connector provides specific :doc:`table functions </functions/table>` to
-access BigQuery.
-
-.. _bigquery-query-function:
-
-``query(varchar) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``query`` function allows you to query the underlying BigQuery directly. It
-requires syntax native to BigQuery, because the full query is pushed down and
-processed by BigQuery. This can be useful for accessing native features which are
-not available in Trino or for improving query performance in situations where
-running a query natively may be faster.
-
-.. include:: polymorphic-table-function-ordering.fragment
-
-For example, query the ``example`` catalog and group and concatenate all
-employee IDs by manager ID::
-
-    SELECT
-      *
-    FROM
-      TABLE(
-        example.system.query(
-          query => 'SELECT
-            manager_id, STRING_AGG(employee_id)
-          FROM
-            company.employees
-          GROUP BY
-            manager_id'
-        )
-      );
-
-FAQ
----
-
-What is the Pricing for the Storage API?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-See the `BigQuery pricing documentation
-<https://cloud.google.com/bigquery/pricing#storage-api>`_.
diff --git a/docs/src/main/sphinx/connector/blackhole.md b/docs/src/main/sphinx/connector/blackhole.md
new file mode 100644
index 000000000000..707c20af3d02
--- /dev/null
+++ b/docs/src/main/sphinx/connector/blackhole.md
@@ -0,0 +1,132 @@
+# Black Hole connector
+
+Primarily Black Hole connector is designed for high performance testing of
+other components. It works like the `/dev/null` device on Unix-like
+operating systems for data writing and like `/dev/null` or `/dev/zero`
+for data reading. However, it also has some other features that allow testing Trino
+in a more controlled manner. Metadata for any tables created via this connector
+is kept in memory on the coordinator and discarded when Trino restarts.
+Created tables are by default always empty, and any data written to them
+is ignored and data reads return no rows.
+
+During table creation, a desired rows number can be specified.
+In such cases, writes behave in the same way, but reads
+always return the specified number of some constant rows.
+You shouldn't rely on the content of such rows.
+
+## Configuration
+
+Create `etc/catalog/example.properties` to mount the `blackhole` connector
+as the `example` catalog, with the following contents:
+
+```text
+connector.name=blackhole
+```
+
+## Examples
+
+Create a table using the blackhole connector:
+
+```
+CREATE TABLE example.test.nation AS
+SELECT * from tpch.tiny.nation;
+```
+
+Insert data into a table in the blackhole connector:
+
+```
+INSERT INTO example.test.nation
+SELECT * FROM tpch.tiny.nation;
+```
+
+Select from the blackhole connector:
+
+```
+SELECT count(*) FROM example.test.nation;
+```
+
+The above query always returns zero.
+
+Create a table with a constant number of rows (500 * 1000 * 2000):
+
+```
+CREATE TABLE example.test.nation (
+  nationkey BIGINT,
+  name VARCHAR
+)
+WITH (
+  split_count = 500,
+  pages_per_split = 1000,
+  rows_per_page = 2000
+);
+```
+
+Now query it:
+
+```
+SELECT count(*) FROM example.test.nation;
+```
+
+The above query returns 1,000,000,000.
+
+Length of variable length columns can be controlled using the `field_length`
+table property (default value is equal to 16):
+
+```
+CREATE TABLE example.test.nation (
+  nationkey BIGINT,
+  name VARCHAR
+)
+WITH (
+  split_count = 500,
+  pages_per_split = 1000,
+  rows_per_page = 2000,
+  field_length = 100
+);
+```
+
+The consuming and producing rate can be slowed down
+using the `page_processing_delay` table property.
+Setting this property to `5s` leads to a 5 second
+delay before consuming or producing a new page:
+
+```
+CREATE TABLE example.test.delay (
+  dummy BIGINT
+)
+WITH (
+  split_count = 1,
+  pages_per_split = 1,
+  rows_per_page = 1,
+  page_processing_delay = '5s'
+);
+```
+
+(blackhole-sql-support)=
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>`,
+{ref}`read operation <sql-read-operations>`, and supports the following
+additional features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/update`
+- {doc}`/sql/delete`
+- {doc}`/sql/merge`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/show-create-table`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/comment`
+- {doc}`/sql/create-schema`
+- {doc}`/sql/drop-schema`
+- {doc}`/sql/create-view`
+- {doc}`/sql/show-create-view`
+- {doc}`/sql/drop-view`
+
+:::{note}
+The connector discards all written data. While read operations are supported,
+they return rows with all NULL values, with the number of rows controlled
+via table properties.
+:::
diff --git a/docs/src/main/sphinx/connector/blackhole.rst b/docs/src/main/sphinx/connector/blackhole.rst
deleted file mode 100644
index b1da97b1670e..000000000000
--- a/docs/src/main/sphinx/connector/blackhole.rst
+++ /dev/null
@@ -1,123 +0,0 @@
-====================
-Black Hole connector
-====================
-
-Primarily Black Hole connector is designed for high performance testing of
-other components. It works like the ``/dev/null`` device on Unix-like
-operating systems for data writing and like ``/dev/null`` or ``/dev/zero``
-for data reading. However, it also has some other features that allow testing Trino
-in a more controlled manner. Metadata for any tables created via this connector
-is kept in memory on the coordinator and discarded when Trino restarts.
-Created tables are by default always empty, and any data written to them
-is ignored and data reads return no rows.
-
-During table creation, a desired rows number can be specified.
-In such cases, writes behave in the same way, but reads
-always return the specified number of some constant rows.
-You shouldn't rely on the content of such rows.
-
-.. warning::
-
-    This connector does not work properly with multiple coordinators,
-    since each coordinator has different metadata.
-
-Configuration
--------------
-
-Create ``etc/catalog/example.properties`` to mount the ``blackhole`` connector
-as the ``example`` catalog, with the following contents:
-
-.. code-block:: text
-
-    connector.name=blackhole
-
-Examples
---------
-
-Create a table using the blackhole connector::
-
-    CREATE TABLE example.test.nation AS
-    SELECT * from tpch.tiny.nation;
-
-Insert data into a table in the blackhole connector::
-
-    INSERT INTO example.test.nation
-    SELECT * FROM tpch.tiny.nation;
-
-Select from the blackhole connector::
-
-    SELECT count(*) FROM example.test.nation;
-
-The above query always returns zero.
-
-Create a table with a constant number of rows (500 * 1000 * 2000)::
-
-    CREATE TABLE example.test.nation (
-      nationkey bigint,
-      name varchar
-    )
-    WITH (
-      split_count = 500,
-      pages_per_split = 1000,
-      rows_per_page = 2000
-    );
-
-Now query it::
-
-    SELECT count(*) FROM example.test.nation;
-
-The above query returns 1,000,000,000.
-
-Length of variable length columns can be controlled using the ``field_length``
-table property (default value is equal to 16)::
-
-    CREATE TABLE example.test.nation (
-      nationkey bigint,
-      name varchar
-    )
-    WITH (
-      split_count = 500,
-      pages_per_split = 1000,
-      rows_per_page = 2000,
-      field_length = 100
-    );
-
-The consuming and producing rate can be slowed down
-using the ``page_processing_delay`` table property.
-Setting this property to ``5s`` leads to a 5 second
-delay before consuming or producing a new page::
-
-    CREATE TABLE example.test.delay (
-      dummy bigint
-    )
-    WITH (
-      split_count = 1,
-      pages_per_split = 1,
-      rows_per_page = 1,
-      page_processing_delay = '5s'
-    );
-
-.. _blackhole-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>`,
-:ref:`read operation <sql-read-operations>`, and supports the following
-additional features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/update`
-* :doc:`/sql/delete`
-* :doc:`/sql/merge`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/create-schema`
-* :doc:`/sql/drop-schema`
-
-.. note::
-
-  The connector discards all written data. While read operations are supported,
-  they will return rows with all NULL values, with the number of rows controlled
-  via table properties.
diff --git a/docs/src/main/sphinx/connector/cassandra.md b/docs/src/main/sphinx/connector/cassandra.md
new file mode 100644
index 000000000000..9fd93052117e
--- /dev/null
+++ b/docs/src/main/sphinx/connector/cassandra.md
@@ -0,0 +1,371 @@
+# Cassandra connector
+
+```{raw} html
+<img src="../_static/img/cassandra.png" class="connector-logo">
+```
+
+The Cassandra connector allows querying data stored in
+[Apache Cassandra](https://cassandra.apache.org/).
+
+## Requirements
+
+To connect to Cassandra, you need:
+
+- Cassandra version 3.0 or higher.
+- Network access from the Trino coordinator and workers to Cassandra.
+  Port 9042 is the default port.
+
+## Configuration
+
+To configure the Cassandra connector, create a catalog properties file
+`etc/catalog/example.properties` with the following contents, replacing
+`host1,host2` with a comma-separated list of the Cassandra nodes, used to
+discovery the cluster topology:
+
+```text
+connector.name=cassandra
+cassandra.contact-points=host1,host2
+cassandra.load-policy.dc-aware.local-dc=datacenter1
+```
+
+You also need to set `cassandra.native-protocol-port`, if your
+Cassandra nodes are not using the default port 9042.
+
+### Multiple Cassandra clusters
+
+You can have as many catalogs as you need, so if you have additional
+Cassandra clusters, simply add another properties file to `etc/catalog`
+with a different name, making sure it ends in `.properties`. For
+example, if you name the property file `sales.properties`, Trino
+creates a catalog named `sales` using the configured connector.
+
+## Configuration properties
+
+The following configuration properties are available:
+
+| Property name                    | Description                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| -------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `cassandra.contact-points`       | Comma-separated list of hosts in a Cassandra cluster. The Cassandra driver uses these contact points to discover cluster topology. At least one Cassandra host is required.                                                                                                                                                                                                                                                 |
+| `cassandra.native-protocol-port` | The Cassandra server port running the native client protocol, defaults to `9042`.                                                                                                                                                                                                                                                                                                                                           |
+| `cassandra.consistency-level`    | Consistency levels in Cassandra refer to the level of consistency to be used for both read and write operations.  More information about consistency levels can be found in the [Cassandra consistency] documentation. This property defaults to a consistency level of `ONE`. Possible values include `ALL`, `EACH_QUORUM`, `QUORUM`, `LOCAL_QUORUM`, `ONE`, `TWO`, `THREE`, `LOCAL_ONE`, `ANY`, `SERIAL`, `LOCAL_SERIAL`. |
+| `cassandra.allow-drop-table`     | Enables {doc}`/sql/drop-table` operations. Defaults to `false`.                                                                                                                                                                                                                                                                                                                                                             |
+| `cassandra.username`             | Username used for authentication to the Cassandra cluster. This is a global setting used for all connections, regardless of the user connected to Trino.                                                                                                                                                                                                                                                                    |
+| `cassandra.password`             | Password used for authentication to the Cassandra cluster. This is a global setting used for all connections, regardless of the user connected to Trino.                                                                                                                                                                                                                                                                    |
+| `cassandra.protocol-version`     | It is possible to override the protocol version for older Cassandra clusters. By default, the value corresponds to the default protocol version used in the underlying Cassandra java driver. Possible values include `V3`, `V4`, `V5`, `V6`.                                                                                                                                                                               |
+
+:::{note}
+If authorization is enabled, `cassandra.username` must have enough permissions to perform `SELECT` queries on
+the `system.size_estimates` table.
+:::
+
+The following advanced configuration properties are available:
+
+| Property name                                              | Description                                                                                                                                                                                                                                                                                                                                                                                    |
+| ---------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `cassandra.fetch-size`                                     | Number of rows fetched at a time in a Cassandra query.                                                                                                                                                                                                                                                                                                                                         |
+| `cassandra.partition-size-for-batch-select`                | Number of partitions batched together into a single select for a single partion key column table.                                                                                                                                                                                                                                                                                              |
+| `cassandra.split-size`                                     | Number of keys per split when querying Cassandra.                                                                                                                                                                                                                                                                                                                                              |
+| `cassandra.splits-per-node`                                | Number of splits per node. By default, the values from the `system.size_estimates` table are used. Only override when connecting to Cassandra versions \< 2.1.5, which lacks the `system.size_estimates` table.                                                                                                                                                                                |
+| `cassandra.batch-size`                                     | Maximum number of statements to execute in one batch.                                                                                                                                                                                                                                                                                                                                          |
+| `cassandra.client.read-timeout`                            | Maximum time the Cassandra driver waits for an answer to a query from one Cassandra node. Note that the underlying Cassandra driver may retry a query against more than one node in the event of a read timeout. Increasing this may help with queries that use an index.                                                                                                                      |
+| `cassandra.client.connect-timeout`                         | Maximum time the Cassandra driver waits to establish a connection to a Cassandra node. Increasing this may help with heavily loaded Cassandra clusters.                                                                                                                                                                                                                                        |
+| `cassandra.client.so-linger`                               | Number of seconds to linger on close if unsent data is queued. If set to zero, the socket will be closed immediately. When this option is non-zero, a socket lingers that many seconds for an acknowledgement that all data was written to a peer. This option can be used to avoid consuming sockets on a Cassandra server by immediately closing connections when they are no longer needed. |
+| `cassandra.retry-policy`                                   | Policy used to retry failed requests to Cassandra. This property defaults to `DEFAULT`. Using `BACKOFF` may help when queries fail with *"not enough replicas"*. The other possible values are `DOWNGRADING_CONSISTENCY` and `FALLTHROUGH`.                                                                                                                                                    |
+| `cassandra.load-policy.use-dc-aware`                       | Set to `true` if the load balancing policy requires a local datacenter, defaults to `true`.                                                                                                                                                                                                                                                                                                    |
+| `cassandra.load-policy.dc-aware.local-dc`                  | The name of the datacenter considered "local".                                                                                                                                                                                                                                                                                                                                                 |
+| `cassandra.load-policy.dc-aware.used-hosts-per-remote-dc`  | Uses the provided number of host per remote datacenter as failover for the local hosts for `DefaultLoadBalancingPolicy`.                                                                                                                                                                                                                                                                       |
+| `cassandra.load-policy.dc-aware.allow-remote-dc-for-local` | Set to `true` to allow to use hosts of remote datacenter for local consistency level.                                                                                                                                                                                                                                                                                                          |
+| `cassandra.no-host-available-retry-timeout`                | Retry timeout for `AllNodesFailedException`, defaults to `1m`.                                                                                                                                                                                                                                                                                                                                 |
+| `cassandra.speculative-execution.limit`                    | The number of speculative executions. This is disabled by default.                                                                                                                                                                                                                                                                                                                             |
+| `cassandra.speculative-execution.delay`                    | The delay between each speculative execution, defaults to `500ms`.                                                                                                                                                                                                                                                                                                                             |
+| `cassandra.tls.enabled`                                    | Whether TLS security is enabled, defaults to `false`.                                                                                                                                                                                                                                                                                                                                          |
+| `cassandra.tls.keystore-path`                              | Path to the {doc}`PEM </security/inspect-pem>` or {doc}`JKS </security/inspect-jks>` key store file.                                                                                                                                                                                                                                                                                           |
+| `cassandra.tls.truststore-path`                            | Path to the {doc}`PEM </security/inspect-pem>` or {doc}`JKS </security/inspect-jks>` trust store file.                                                                                                                                                                                                                                                                                         |
+| `cassandra.tls.keystore-password`                          | Password for the key store.                                                                                                                                                                                                                                                                                                                                                                    |
+| `cassandra.tls.truststore-password`                        | Password for the trust store.                                                                                                                                                                                                                                                                                                                                                                  |
+
+## Querying Cassandra tables
+
+The `users` table is an example Cassandra table from the Cassandra
+[Getting Started] guide. It can be created along with the `example_keyspace`
+keyspace using Cassandra's cqlsh (CQL interactive terminal):
+
+```text
+cqlsh> CREATE KEYSPACE example_keyspace
+   ... WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
+cqlsh> USE example_keyspace;
+cqlsh:example_keyspace> CREATE TABLE users (
+              ...   user_id int PRIMARY KEY,
+              ...   fname text,
+              ...   lname text
+              ... );
+```
+
+This table can be described in Trino:
+
+```
+DESCRIBE example.example_keyspace.users;
+```
+
+```text
+ Column  |  Type   | Extra | Comment
+---------+---------+-------+---------
+ user_id | bigint  |       |
+ fname   | varchar |       |
+ lname   | varchar |       |
+(3 rows)
+```
+
+This table can then be queried in Trino:
+
+```
+SELECT * FROM example.example_keyspace.users;
+```
+
+(cassandra-type-mapping)=
+
+## Type mapping
+
+Because Trino and Cassandra each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+### Cassandra type to Trino type mapping
+
+The connector maps Cassandra types to the corresponding Trino types according to
+the following table:
+
+```{eval-rst}
+.. list-table:: Cassandra type to Trino type mapping
+  :widths: 30, 25, 50
+  :header-rows: 1
+
+  * - Cassandra type
+    - Trino type
+    - Notes
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+    -
+  * - ``TINYINT``
+    - ``TINYINT``
+    -
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``INT``
+    - ``INTEGER``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``FLOAT``
+    - ``REAL``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``DECIMAL``
+    - ``DOUBLE``
+    -
+  * - ``ASCII``
+    - ``VARCHAR``
+    - US-ASCII character string
+  * - ``TEXT``
+    - ``VARCHAR``
+    - UTF-8 encoded string
+  * - ``VARCHAR``
+    - ``VARCHAR``
+    - UTF-8 encoded string
+  * - ``VARINT``
+    - ``VARCHAR``
+    - Arbitrary-precision integer
+  * - ``BLOB``
+    - ``VARBINARY``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME``
+    - ``TIME(9)``
+    -
+  * - ``TIMESTAMP``
+    - ``TIMESTAMP(3) WITH TIME ZONE``
+    -
+  * - ``LIST<?>``
+    - ``VARCHAR``
+    -
+  * - ``MAP<?, ?>``
+    - ``VARCHAR``
+    -
+  * - ``SET<?>``
+    - ``VARCHAR``
+    -
+  * - ``TUPLE``
+    - ``ROW`` with anonymous fields
+    -
+  * - ``UDT``
+    - ``ROW`` with field names
+    -
+  * - ``INET``
+    - ``IPADDRESS``
+    -
+  * - ``UUID``
+    - ``UUID``
+    -
+  * - ``TIMEUUID``
+    - ``UUID``
+    -
+```
+
+No other types are supported.
+
+### Trino type to Cassandra type mapping
+
+The connector maps Trino types to the corresponding Cassandra types according to
+the following table:
+
+```{eval-rst}
+.. list-table:: Trino type to Cassandra type mapping
+  :widths: 30, 25, 50
+  :header-rows: 1
+
+  * - Trino type
+    - Cassandra type
+    - Notes
+
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+    -
+  * - ``TINYINT``
+    - ``TINYINT``
+    -
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``INTEGER``
+    - ``INT``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``REAL``
+    - ``FLOAT``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``VARCHAR``
+    - ``TEXT``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIMESTAMP(3) WITH TIME ZONE``
+    - ``TIMESTAMP``
+    -
+  * - ``IPADDRESS``
+    - ``INET``
+    -
+  * - ``UUID``
+    - ``UUID``
+    -
+
+```
+
+No other types are supported.
+
+## Partition key types
+
+Partition keys can only be of the following types:
+
+- ASCII
+- TEXT
+- VARCHAR
+- BIGINT
+- BOOLEAN
+- DOUBLE
+- INET
+- INT
+- FLOAT
+- DECIMAL
+- TIMESTAMP
+- UUID
+- TIMEUUID
+
+## Limitations
+
+- Queries without filters containing the partition key result in fetching all partitions.
+  This causes a full scan of the entire data set, and is therefore much slower compared to a similar
+  query with a partition key as a filter.
+- `IN` list filters are only allowed on index (that is, partition key or clustering key) columns.
+- Range (`<` or `>` and `BETWEEN`) filters can be applied only to the partition keys.
+
+(cassandra-sql-support)=
+
+## SQL support
+
+The connector provides read and write access to data and metadata in
+the Cassandra database. In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/delete` see {ref}`sql-delete-limitation`
+- {doc}`/sql/truncate`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+
+## Table functions
+
+The connector provides specific {doc}`table functions </functions/table>` to
+access Cassandra.
+.. \_cassandra-query-function:
+
+### `query(varchar) -> table`
+
+The `query` function allows you to query the underlying Cassandra directly. It
+requires syntax native to Cassandra, because the full query is pushed down and
+processed by Cassandra. This can be useful for accessing native features which are
+not available in Trino or for improving query performance in situations where
+running a query natively may be faster.
+
+```{include} query-table-function-ordering.fragment
+```
+
+As a simple example, to select an entire table:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    example.system.query(
+      query => 'SELECT
+        *
+      FROM
+        tpch.nation'
+    )
+  );
+```
+
+### DROP TABLE
+
+By default, `DROP TABLE` operations are disabled on Cassandra catalogs. To
+enable `DROP TABLE`, set the `cassandra.allow-drop-table` catalog
+configuration property to `true`:
+
+```properties
+cassandra.allow-drop-table=true
+```
+
+(sql-delete-limitation)=
+
+### SQL delete limitation
+
+`DELETE` is only supported if the `WHERE` clause matches entire partitions.
+
+[cassandra consistency]: https://docs.datastax.com/en/cassandra-oss/2.2/cassandra/dml/dmlConfigConsistency.html
+[getting started]: https://cassandra.apache.org/doc/latest/cassandra/getting_started/index.html
diff --git a/docs/src/main/sphinx/connector/cassandra.rst b/docs/src/main/sphinx/connector/cassandra.rst
deleted file mode 100644
index 2f8816408d7f..000000000000
--- a/docs/src/main/sphinx/connector/cassandra.rst
+++ /dev/null
@@ -1,448 +0,0 @@
-===================
-Cassandra connector
-===================
-
-.. raw:: html
-
-  <img src="../_static/img/cassandra.png" class="connector-logo">
-
-The Cassandra connector allows querying data stored in
-`Apache Cassandra <https://cassandra.apache.org/>`_.
-
-Requirements
-------------
-
-To connect to Cassandra, you need:
-
-* Cassandra version 3.0 or higher.
-* Network access from the Trino coordinator and workers to Cassandra.
-  Port 9042 is the default port.
-
-Configuration
--------------
-
-To configure the Cassandra connector, create a catalog properties file
-``etc/catalog/example.properties`` with the following contents, replacing
-``host1,host2`` with a comma-separated list of the Cassandra nodes, used to
-discovery the cluster topology:
-
-.. code-block:: text
-
-    connector.name=cassandra
-    cassandra.contact-points=host1,host2
-    cassandra.load-policy.dc-aware.local-dc=datacenter1
-
-You also need to set ``cassandra.native-protocol-port``, if your
-Cassandra nodes are not using the default port 9042.
-
-Multiple Cassandra clusters
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can have as many catalogs as you need, so if you have additional
-Cassandra clusters, simply add another properties file to ``etc/catalog``
-with a different name, making sure it ends in ``.properties``. For
-example, if you name the property file ``sales.properties``, Trino
-creates a catalog named ``sales`` using the configured connector.
-
-Configuration properties
-------------------------
-
-The following configuration properties are available:
-
-================================================== ======================================================================
-Property name                                      Description
-================================================== ======================================================================
-``cassandra.contact-points``                       Comma-separated list of hosts in a Cassandra cluster. The Cassandra
-                                                   driver uses these contact points to discover cluster topology.
-                                                   At least one Cassandra host is required.
-
-``cassandra.native-protocol-port``                 The Cassandra server port running the native client protocol,
-                                                   defaults to ``9042``.
-
-``cassandra.consistency-level``                    Consistency levels in Cassandra refer to the level of consistency
-                                                   to be used for both read and write operations.  More information
-                                                   about consistency levels can be found in the
-                                                   `Cassandra consistency`_ documentation. This property defaults to
-                                                   a consistency level of ``ONE``. Possible values include ``ALL``,
-                                                   ``EACH_QUORUM``, ``QUORUM``, ``LOCAL_QUORUM``, ``ONE``, ``TWO``,
-                                                   ``THREE``, ``LOCAL_ONE``, ``ANY``, ``SERIAL``, ``LOCAL_SERIAL``.
-
-``cassandra.allow-drop-table``                     Enables :doc:`/sql/drop-table` operations. Defaults to ``false``.
-
-``cassandra.username``                             Username used for authentication to the Cassandra cluster.
-                                                   This is a global setting used for all connections, regardless
-                                                   of the user connected to Trino.
-
-``cassandra.password``                             Password used for authentication to the Cassandra cluster.
-                                                   This is a global setting used for all connections, regardless
-                                                   of the user connected to Trino.
-
-``cassandra.protocol-version``                     It is possible to override the protocol version for older Cassandra
-                                                   clusters.
-                                                   By default, the value corresponds to the default protocol version
-                                                   used in the underlying Cassandra java driver.
-                                                   Possible values include ``V3``, ``V4``, ``V5``, ``V6``.
-================================================== ======================================================================
-
-.. note::
-
-        If authorization is enabled, ``cassandra.username`` must have enough permissions to perform ``SELECT`` queries on
-        the ``system.size_estimates`` table.
-
-.. _Cassandra consistency: https://docs.datastax.com/en/cassandra-oss/2.2/cassandra/dml/dmlConfigConsistency.html
-
-The following advanced configuration properties are available:
-
-============================================================= ======================================================================
-Property name                                                 Description
-============================================================= ======================================================================
-``cassandra.fetch-size``                                      Number of rows fetched at a time in a Cassandra query.
-
-``cassandra.partition-size-for-batch-select``                 Number of partitions batched together into a single select for a
-                                                              single partion key column table.
-
-``cassandra.split-size``                                      Number of keys per split when querying Cassandra.
-
-``cassandra.splits-per-node``                                 Number of splits per node. By default, the values from the
-                                                              ``system.size_estimates`` table are used. Only override when
-                                                              connecting to Cassandra versions < 2.1.5, which lacks
-                                                              the ``system.size_estimates`` table.
-
-``cassandra.batch-size``                                      Maximum number of statements to execute in one batch.
-
-``cassandra.client.read-timeout``                             Maximum time the Cassandra driver waits for an
-                                                              answer to a query from one Cassandra node. Note that the underlying
-                                                              Cassandra driver may retry a query against more than one node in
-                                                              the event of a read timeout. Increasing this may help with queries
-                                                              that use an index.
-
-``cassandra.client.connect-timeout``                          Maximum time the Cassandra driver waits to establish
-                                                              a connection to a Cassandra node. Increasing this may help with
-                                                              heavily loaded Cassandra clusters.
-
-``cassandra.client.so-linger``                                Number of seconds to linger on close if unsent data is queued.
-                                                              If set to zero, the socket will be closed immediately.
-                                                              When this option is non-zero, a socket lingers that many
-                                                              seconds for an acknowledgement that all data was written to a
-                                                              peer. This option can be used to avoid consuming sockets on a
-                                                              Cassandra server by immediately closing connections when they
-                                                              are no longer needed.
-
-``cassandra.retry-policy``                                    Policy used to retry failed requests to Cassandra. This property
-                                                              defaults to ``DEFAULT``. Using ``BACKOFF`` may help when
-                                                              queries fail with *"not enough replicas"*. The other possible
-                                                              values are ``DOWNGRADING_CONSISTENCY`` and ``FALLTHROUGH``.
-
-``cassandra.load-policy.use-dc-aware``                        Set to ``true`` if the load balancing policy requires a local
-                                                              datacenter, defaults to ``true``.
-
-``cassandra.load-policy.dc-aware.local-dc``                   The name of the datacenter considered "local".
-
-``cassandra.load-policy.dc-aware.used-hosts-per-remote-dc``   Uses the provided number of host per remote datacenter
-                                                              as failover for the local hosts for ``DefaultLoadBalancingPolicy``.
-
-``cassandra.load-policy.dc-aware.allow-remote-dc-for-local``  Set to ``true`` to allow to use hosts of
-                                                              remote datacenter for local consistency level.
-
-``cassandra.no-host-available-retry-timeout``                 Retry timeout for ``AllNodesFailedException``, defaults to ``1m``.
-
-``cassandra.speculative-execution.limit``                     The number of speculative executions. This is disabled by default.
-
-``cassandra.speculative-execution.delay``                     The delay between each speculative execution, defaults to ``500ms``.
-
-``cassandra.tls.enabled``                                     Whether TLS security is enabled, defaults to ``false``.
-
-``cassandra.tls.keystore-path``                               Path to the PEM or JKS key store.
-
-``cassandra.tls.truststore-path``                             Path to the PEM or JKS trust store.
-
-``cassandra.tls.keystore-password``                           Password for the key store.
-
-``cassandra.tls.truststore-password``                         Password for the trust store.
-============================================================= ======================================================================
-
-Querying Cassandra tables
--------------------------
-
-The ``users`` table is an example Cassandra table from the Cassandra
-`Getting Started`_ guide. It can be created along with the ``example_keyspace``
-keyspace using Cassandra's cqlsh (CQL interactive terminal):
-
-.. _Getting Started: https://cassandra.apache.org/doc/latest/cassandra/getting_started/index.html
-
-.. code-block:: text
-
-    cqlsh> CREATE KEYSPACE example_keyspace
-       ... WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
-    cqlsh> USE example_keyspace;
-    cqlsh:example_keyspace> CREATE TABLE users (
-                  ...   user_id int PRIMARY KEY,
-                  ...   fname text,
-                  ...   lname text
-                  ... );
-
-This table can be described in Trino::
-
-    DESCRIBE example.example_keyspace.users;
-
-.. code-block:: text
-
-     Column  |  Type   | Extra | Comment
-    ---------+---------+-------+---------
-     user_id | bigint  |       |
-     fname   | varchar |       |
-     lname   | varchar |       |
-    (3 rows)
-
-This table can then be queried in Trino::
-
-    SELECT * FROM example.example_keyspace.users;
-
-.. _cassandra-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and Cassandra each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-Cassandra type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Cassandra types to the corresponding Trino types according to
-the following table:
-
-.. list-table:: Cassandra type to Trino type mapping
-  :widths: 30, 25, 50
-  :header-rows: 1
-
-  * - Cassandra type
-    - Trino type
-    - Notes
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-    -
-  * - ``TINYINT``
-    - ``TINYINT``
-    -
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``INT``
-    - ``INTEGER``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``FLOAT``
-    - ``REAL``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``DECIMAL``
-    - ``DOUBLE``
-    -
-  * - ``ASCII``
-    - ``VARCHAR``
-    - US-ASCII character string
-  * - ``TEXT``
-    - ``VARCHAR``
-    - UTF-8 encoded string
-  * - ``VARCHAR``
-    - ``VARCHAR``
-    - UTF-8 encoded string
-  * - ``VARINT``
-    - ``VARCHAR``
-    - Arbitrary-precision integer
-  * - ``BLOB``
-    - ``VARBINARY``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME``
-    - ``TIME(9)``
-    -
-  * - ``TIMESTAMP``
-    - ``TIMESTAMP(3) WITH TIME ZONE``
-    -
-  * - ``LIST<?>``
-    - ``VARCHAR``
-    -
-  * - ``MAP<?, ?>``
-    - ``VARCHAR``
-    -
-  * - ``SET<?>``
-    - ``VARCHAR``
-    -
-  * - ``TUPLE``
-    - ``ROW`` with anonymous fields
-    -
-  * - ``UDT``
-    - ``ROW`` with field names
-    -
-  * - ``INET``
-    - ``IPADDRESS``
-    -
-  * - ``UUID``
-    - ``UUID``
-    -
-  * - ``TIMEUUID``
-    - ``UUID``
-    -
-
-No other types are supported.
-
-Trino type to Cassandra type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding Cassandra types according to
-the following table:
-
-.. list-table:: Trino type to Cassandra type mapping
-  :widths: 30, 25, 50
-  :header-rows: 1
-
-  * - Trino type
-    - Cassandra type
-    - Notes
-
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-    -
-  * - ``TINYINT``
-    - ``TINYINT``
-    -
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``INTEGER``
-    - ``INT``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``REAL``
-    - ``FLOAT``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``VARCHAR``
-    - ``TEXT``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIMESTAMP(3) WITH TIME ZONE``
-    - ``TIMESTAMP``
-    -
-  * - ``IPADDRESS``
-    - ``INET``
-    -
-  * - ``UUID``
-    - ``UUID``
-    -
-
-
-No other types are supported.
-
-Partition key types
--------------------
-
-Partition keys can only be of the following types:
-
-* ASCII
-* TEXT
-* VARCHAR
-* BIGINT
-* BOOLEAN
-* DOUBLE
-* INET
-* INT
-* FLOAT
-* DECIMAL
-* TIMESTAMP
-* UUID
-* TIMEUUID
-
-Limitations
------------
-
-* Queries without filters containing the partition key result in fetching all partitions.
-  This causes a full scan of the entire data set, and is therefore much slower compared to a similar
-  query with a partition key as a filter.
-* ``IN`` list filters are only allowed on index (that is, partition key or clustering key) columns.
-* Range (``<`` or ``>`` and ``BETWEEN``) filters can be applied only to the partition keys.
-
-.. _cassandra-sql-support:
-
-SQL support
------------
-
-The connector provides read and write access to data and metadata in
-the Cassandra database. In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/delete` see :ref:`sql-delete-limitation`
-* :doc:`/sql/truncate`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-
-Table functions
----------------
-
-The connector provides specific :doc:`table functions </functions/table>` to
-access Cassandra.
-.. _cassandra-query-function:
-
-``query(varchar) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``query`` function allows you to query the underlying Cassandra directly. It
-requires syntax native to Cassandra, because the full query is pushed down and
-processed by Cassandra. This can be useful for accessing native features which are
-not available in Trino or for improving query performance in situations where
-running a query natively may be faster.
-
-.. include:: polymorphic-table-function-ordering.fragment
-
-As a simple example, to select an entire table::
-
-    SELECT
-      *
-    FROM
-      TABLE(
-        example.system.query(
-          query => 'SELECT
-            *
-          FROM
-            tpch.nation'
-        )
-      );
-
-DROP TABLE
-^^^^^^^^^^
-
-By default, ``DROP TABLE`` operations are disabled on Cassandra catalogs. To
-enable ``DROP TABLE``, set the ``cassandra.allow-drop-table`` catalog
-configuration property to ``true``:
-
-.. code-block:: properties
-
-  cassandra.allow-drop-table=true
-
-
-.. _sql-delete-limitation:
-
-SQL delete limitation
-^^^^^^^^^^^^^^^^^^^^^
-
-``DELETE`` is only supported if the ``WHERE`` clause matches entire partitions.
diff --git a/docs/src/main/sphinx/connector/clickhouse.md b/docs/src/main/sphinx/connector/clickhouse.md
new file mode 100644
index 000000000000..e01b664aa336
--- /dev/null
+++ b/docs/src/main/sphinx/connector/clickhouse.md
@@ -0,0 +1,366 @@
+---
+myst:
+  substitutions:
+    default_domain_compaction_threshold: "`1000`"
+---
+
+# ClickHouse connector
+
+```{raw} html
+<img src="../_static/img/clickhouse.png" class="connector-logo">
+```
+
+The ClickHouse connector allows querying tables in an external
+[ClickHouse](https://clickhouse.com/) server. This can be used to
+query data in the databases on that server, or combine it with other data
+from different catalogs accessing ClickHouse or any other supported data source.
+
+## Requirements
+
+To connect to a ClickHouse server, you need:
+
+- ClickHouse (version 21.8 or higher) or Altinity (version 20.8 or higher).
+- Network access from the Trino coordinator and workers to the ClickHouse
+  server. Port 8123 is the default port.
+
+## Configuration
+
+The connector can query a ClickHouse server. Create a catalog properties file
+that specifies the ClickHouse connector by setting the `connector.name` to
+`clickhouse`.
+
+For example, create the file `etc/catalog/example.properties`. Replace the
+connection properties as appropriate for your setup:
+
+```none
+connector.name=clickhouse
+connection-url=jdbc:clickhouse://host1:8123/
+connection-user=exampleuser
+connection-password=examplepassword
+```
+
+The `connection-url` defines the connection information and parameters to pass
+to the ClickHouse JDBC driver. The supported parameters for the URL are
+available in the [ClickHouse JDBC driver configuration](https://clickhouse.com/docs/en/integrations/java#configuration).
+
+The `connection-user` and `connection-password` are typically required and
+determine the user credentials for the connection, often a service user. You can
+use {doc}`secrets </security/secrets>` to avoid actual values in the catalog
+properties files.
+
+(clickhouse-tls)=
+
+### Connection security
+
+If you have TLS configured with a globally-trusted certificate installed on your
+data source, you can enable TLS between your cluster and the data
+source by appending a parameter to the JDBC connection string set in the
+`connection-url` catalog configuration property.
+
+For example, with version 2.6.4 of the ClickHouse JDBC driver, enable TLS by
+appending the `ssl=true` parameter to the `connection-url` configuration
+property:
+
+```properties
+connection-url=jdbc:clickhouse://host1:8443/?ssl=true
+```
+
+For more information on TLS configuration options, see the [Clickhouse JDBC
+driver documentation](https://clickhouse.com/docs/en/interfaces/jdbc/)
+
+```{include} jdbc-authentication.fragment
+```
+
+### Multiple ClickHouse servers
+
+If you have multiple ClickHouse servers you need to configure one
+catalog for each server. To add another catalog:
+
+- Add another properties file to `etc/catalog`
+- Save it with a different name that ends in `.properties`
+
+For example, if you name the property file `sales.properties`, Trino uses the
+configured connector to create a catalog named `sales`.
+
+```{include} jdbc-common-configurations.fragment
+```
+
+```{include} query-comment-format.fragment
+```
+
+```{include} jdbc-domain-compaction-threshold.fragment
+```
+
+```{include} jdbc-procedures.fragment
+```
+
+```{include} jdbc-case-insensitive-matching.fragment
+```
+
+```{include} non-transactional-insert.fragment
+```
+
+## Querying ClickHouse
+
+The ClickHouse connector provides a schema for every ClickHouse *database*.
+Run `SHOW SCHEMAS` to see the available ClickHouse databases:
+
+```
+SHOW SCHEMAS FROM example;
+```
+
+If you have a ClickHouse database named `web`, run `SHOW TABLES` to view the
+tables in this database:
+
+```
+SHOW TABLES FROM example.web;
+```
+
+Run `DESCRIBE` or `SHOW COLUMNS` to list the columns in the `clicks` table
+in the `web` databases:
+
+```
+DESCRIBE example.web.clicks;
+SHOW COLUMNS FROM example.web.clicks;
+```
+
+Run `SELECT` to access the `clicks` table in the `web` database:
+
+```
+SELECT * FROM example.web.clicks;
+```
+
+:::{note}
+If you used a different name for your catalog properties file, use
+that catalog name instead of `example` in the above examples.
+:::
+
+## Table properties
+
+Table property usage example:
+
+```
+CREATE TABLE default.trino_ck (
+  id int NOT NULL,
+  birthday DATE NOT NULL,
+  name VARCHAR,
+  age BIGINT,
+  logdate DATE NOT NULL
+)
+WITH (
+  engine = 'MergeTree',
+  order_by = ARRAY['id', 'birthday'],
+  partition_by = ARRAY['toYYYYMM(logdate)'],
+  primary_key = ARRAY['id'],
+  sample_by = 'id'
+);
+```
+
+The following are supported ClickHouse table properties from [https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/](https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/)
+
+| Property name  | Default value | Description                                                                                                             |
+| -------------- | ------------- | ----------------------------------------------------------------------------------------------------------------------- |
+| `engine`       | `Log`         | Name and parameters of the engine.                                                                                      |
+| `order_by`     | (none)        | Array of columns or expressions to concatenate to create the sorting key. Required if `engine` is `MergeTree`.          |
+| `partition_by` | (none)        | Array of columns or expressions to use as nested partition keys. Optional.                                              |
+| `primary_key`  | (none)        | Array of columns or expressions to concatenate to create the primary key. Optional.                                     |
+| `sample_by`    | (none)        | An expression to use for [sampling](https://clickhouse.tech/docs/en/sql-reference/statements/select/sample/). Optional. |
+
+Currently the connector only supports `Log` and `MergeTree` table engines
+in create table statement. `ReplicatedMergeTree` engine is not yet supported.
+
+(clickhouse-type-mapping)=
+
+## Type mapping
+
+Because Trino and ClickHouse each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+### ClickHouse type to Trino type mapping
+
+The connector maps ClickHouse types to the corresponding Trino types according
+to the following table:
+
+```{eval-rst}
+.. list-table:: ClickHouse type to Trino type mapping
+  :widths: 30, 25, 50
+  :header-rows: 1
+
+  * - ClickHouse type
+    - Trino type
+    - Notes
+  * - ``Int8``
+    - ``TINYINT``
+    - ``TINYINT``, ``BOOL``, ``BOOLEAN``, and ``INT1`` are aliases of ``Int8``
+  * - ``Int16``
+    - ``SMALLINT``
+    -  ``SMALLINT`` and ``INT2`` are aliases of ``Int16``
+  * - ``Int32``
+    - ``INTEGER``
+    - ``INT``, ``INT4``, and ``INTEGER`` are aliases of ``Int32``
+  * - ``Int64``
+    - ``BIGINT``
+    - ``BIGINT`` is an alias of ``Int64``
+  * - ``UInt8``
+    - ``SMALLINT``
+    -
+  * - ``UInt16``
+    - ``INTEGER``
+    -
+  * - ``UInt32``
+    - ``BIGINT``
+    -
+  * - ``UInt64``
+    - ``DECIMAL(20,0)``
+    -
+  * - ``Float32``
+    - ``REAL``
+    - ``FLOAT`` is an alias of ``Float32``
+  * - ``Float64``
+    - ``DOUBLE``
+    - ``DOUBLE`` is an alias of ``Float64``
+  * - ``Decimal``
+    - ``DECIMAL``
+    -
+  * - ``FixedString``
+    - ``VARBINARY``
+    - Enabling ``clickhouse.map-string-as-varchar`` config property changes the
+      mapping to ``VARCHAR``
+  * - ``String``
+    - ``VARBINARY``
+    - Enabling ``clickhouse.map-string-as-varchar`` config property changes the
+      mapping to ``VARCHAR``
+  * - ``Date``
+    - ``DATE``
+    -
+  * - ``DateTime[(timezone)]``
+    - ``TIMESTAMP(0) [WITH TIME ZONE]``
+    -
+  * - ``IPv4``
+    - ``IPADDRESS``
+    -
+  * - ``IPv6``
+    - ``IPADDRESS``
+    -
+  * - ``Enum8``
+    - ``VARCHAR``
+    -
+  * - ``Enum16``
+    - ``VARCHAR``
+    -
+  * - ``UUID``
+    - ``UUID``
+    -
+```
+
+No other types are supported.
+
+### Trino type to ClickHouse type mapping
+
+The connector maps Trino types to the corresponding ClickHouse types according
+to the following table:
+
+```{eval-rst}
+.. list-table:: Trino type to ClickHouse type mapping
+  :widths: 30, 25, 50
+  :header-rows: 1
+
+  * - Trino type
+    - ClickHouse type
+    - Notes
+  * - ``BOOLEAN``
+    - ``UInt8``
+    -
+  * - ``TINYINT``
+    - ``Int8``
+    - ``TINYINT``, ``BOOL``, ``BOOLEAN``, and ``INT1`` are aliases of ``Int8``
+  * - ``SMALLINT``
+    - ``Int16``
+    -  ``SMALLINT`` and ``INT2`` are aliases of ``Int16``
+  * - ``INTEGER``
+    - ``Int32``
+    - ``INT``, ``INT4``, and ``INTEGER`` are aliases of ``Int32``
+  * - ``BIGINT``
+    - ``Int64``
+    - ``BIGINT`` is an alias of ``Int64``
+  * - ``REAL``
+    - ``Float32``
+    - ``FLOAT`` is an alias of ``Float32``
+  * - ``DOUBLE``
+    - ``Float64``
+    - ``DOUBLE`` is an alias of ``Float64``
+  * - ``DECIMAL(p,s)``
+    - ``Decimal(p,s)``
+    -
+  * - ``VARCHAR``
+    - ``String``
+    -
+  * - ``CHAR``
+    - ``String``
+    -
+  * - ``VARBINARY``
+    - ``String``
+    - Enabling ``clickhouse.map-string-as-varchar`` config property changes the
+      mapping to ``VARCHAR``
+  * - ``DATE``
+    - ``Date``
+    -
+  * - ``TIMESTAMP(0)``
+    - ``DateTime``
+    -
+  * - ``UUID``
+    - ``UUID``
+    -
+```
+
+No other types are supported.
+
+```{include} jdbc-type-mapping.fragment
+```
+
+(clickhouse-sql-support)=
+
+## SQL support
+
+The connector provides read and write access to data and metadata in
+a ClickHouse catalog. In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/truncate`
+- {ref}`sql-schema-table-management`
+
+```{include} alter-schema-limitation.fragment
+```
+
+## Performance
+
+The connector includes a number of performance improvements, detailed in the
+following sections.
+
+(clickhouse-pushdown)=
+
+### Pushdown
+
+The connector supports pushdown for a number of operations:
+
+- {ref}`limit-pushdown`
+
+{ref}`Aggregate pushdown <aggregation-pushdown>` for the following functions:
+
+- {func}`avg`
+- {func}`count`
+- {func}`max`
+- {func}`min`
+- {func}`sum`
+
+
+```{include} pushdown-correctness-behavior.fragment
+```
+
+```{include} no-pushdown-text-type.fragment
+```
diff --git a/docs/src/main/sphinx/connector/clickhouse.rst b/docs/src/main/sphinx/connector/clickhouse.rst
deleted file mode 100644
index 668e3fdb54e8..000000000000
--- a/docs/src/main/sphinx/connector/clickhouse.rst
+++ /dev/null
@@ -1,356 +0,0 @@
-====================
-ClickHouse connector
-====================
-
-.. raw:: html
-
-  <img src="../_static/img/clickhouse.png" class="connector-logo">
-
-The ClickHouse connector allows querying tables in an external
-`ClickHouse <https://clickhouse.com/>`_ server. This can be used to
-query data in the databases on that server, or combine it with other data
-from different catalogs accessing ClickHouse or any other supported data source.
-
-Requirements
-------------
-
-To connect to a ClickHouse server, you need:
-
-* ClickHouse (version 21.8 or higher) or Altinity (version 20.8 or higher).
-* Network access from the Trino coordinator and workers to the ClickHouse
-  server. Port 8123 is the default port.
-
-Configuration
--------------
-
-The connector can query a ClickHouse server. Create a catalog properties file
-that specifies the ClickHouse connector by setting the ``connector.name`` to
-``clickhouse``.
-
-For example, create the file ``etc/catalog/example.properties``. Replace the
-connection properties as appropriate for your setup:
-
-.. code-block:: none
-
-    connector.name=clickhouse
-    connection-url=jdbc:clickhouse://host1:8123/
-    connection-user=exampleuser
-    connection-password=examplepassword
-
-The ``connection-url`` defines the connection information and parameters to pass
-to the ClickHouse JDBC driver. The supported parameters for the URL are
-available in the `ClickHouse JDBC driver configuration
-<https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-jdbc#Configuration>`_.
-
-The ``connection-user`` and ``connection-password`` are typically required and
-determine the user credentials for the connection, often a service user. You can
-use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
-properties files.
-
-.. _clickhouse-tls:
-
-Connection security
-^^^^^^^^^^^^^^^^^^^
-
-If you have TLS configured with a globally-trusted certificate installed on your
-data source, you can enable TLS between your cluster and the data
-source by appending a parameter to the JDBC connection string set in the
-``connection-url`` catalog configuration property.
-
-For example, with version 2.6.4 of the ClickHouse JDBC driver, enable TLS by
-appending the ``ssl=true`` parameter to the ``connection-url`` configuration
-property:
-
-.. code-block:: properties
-
-  connection-url=jdbc:clickhouse://host1:8443/?ssl=true
-
-For more information on TLS configuration options, see the `Clickhouse JDBC
-driver documentation <https://clickhouse.com/docs/en/interfaces/jdbc/>`_
-
-.. include:: jdbc-authentication.fragment
-
-Multiple ClickHouse servers
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If you have multiple ClickHouse servers you need to configure one
-catalog for each server. To add another catalog:
-
-* Add another properties file to ``etc/catalog``
-* Save it with a different name that ends in ``.properties``
-
-For example, if you name the property file ``sales.properties``, Trino uses the
-configured connector to create a catalog named ``sales``.
-
-.. include:: jdbc-common-configurations.fragment
-
-.. |default_domain_compaction_threshold| replace:: ``1000``
-.. include:: jdbc-domain-compaction-threshold.fragment
-
-.. include:: jdbc-procedures.fragment
-
-.. include:: jdbc-case-insensitive-matching.fragment
-
-.. include:: non-transactional-insert.fragment
-
-Querying ClickHouse
--------------------
-
-The ClickHouse connector provides a schema for every ClickHouse *database*.
-Run ``SHOW SCHEMAS`` to see the available ClickHouse databases::
-
-    SHOW SCHEMAS FROM example;
-
-If you have a ClickHouse database named ``web``, run ``SHOW TABLES`` to view the
-tables in this database::
-
-    SHOW TABLES FROM example.web;
-
-Run ``DESCRIBE`` or ``SHOW COLUMNS`` to list the columns in the ``clicks`` table
-in the ``web`` databases::
-
-    DESCRIBE example.web.clicks;
-    SHOW COLUMNS FROM example.web.clicks;
-
-Run ``SELECT`` to access the ``clicks`` table in the ``web`` database::
-
-    SELECT * FROM example.web.clicks;
-
-.. note::
-
-    If you used a different name for your catalog properties file, use
-    that catalog name instead of ``example`` in the above examples.
-
-Table properties
-----------------
-
-Table property usage example::
-
-    CREATE TABLE default.trino_ck (
-      id int NOT NULL,
-      birthday DATE NOT NULL,
-      name VARCHAR,
-      age BIGINT,
-      logdate DATE NOT NULL
-    )
-    WITH (
-      engine = 'MergeTree',
-      order_by = ARRAY['id', 'birthday'],
-      partition_by = ARRAY['toYYYYMM(logdate)'],
-      primary_key = ARRAY['id'],
-      sample_by = 'id'
-    );
-
-The following are supported ClickHouse table properties from `<https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/>`_
-
-=========================== ================ ==============================================================================================================
-Property name               Default value    Description
-=========================== ================ ==============================================================================================================
-``engine``                  ``Log``          Name and parameters of the engine.
-
-``order_by``                (none)           Array of columns or expressions to concatenate to create the sorting key. Required if ``engine`` is ``MergeTree``.
-
-``partition_by``            (none)           Array of columns or expressions to use as nested partition keys. Optional.
-
-``primary_key``             (none)           Array of columns or expressions to concatenate to create the primary key. Optional.
-
-``sample_by``               (none)           An expression to use for `sampling <https://clickhouse.tech/docs/en/sql-reference/statements/select/sample/>`_.
-                                             Optional.
-
-=========================== ================ ==============================================================================================================
-
-Currently the connector only supports ``Log`` and ``MergeTree`` table engines
-in create table statement. ``ReplicatedMergeTree`` engine is not yet supported.
-
-.. _clickhouse-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and ClickHouse each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-ClickHouse type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps ClickHouse types to the corresponding Trino types according
-to the following table:
-
-.. list-table:: ClickHouse type to Trino type mapping
-  :widths: 30, 25, 50
-  :header-rows: 1
-
-  * - ClickHouse type
-    - Trino type
-    - Notes
-  * - ``Int8``
-    - ``TINYINT``
-    - ``TINYINT``, ``BOOL``, ``BOOLEAN``, and ``INT1`` are aliases of ``Int8``
-  * - ``Int16``
-    - ``SMALLINT``
-    -  ``SMALLINT`` and ``INT2`` are aliases of ``Int16``
-  * - ``Int32``
-    - ``INTEGER``
-    - ``INT``, ``INT4``, and ``INTEGER`` are aliases of ``Int32``
-  * - ``Int64``
-    - ``BIGINT``
-    - ``BIGINT`` is an alias of ``Int64``
-  * - ``UInt8``
-    - ``SMALLINT``
-    -
-  * - ``UInt16``
-    - ``INTEGER``
-    -
-  * - ``UInt32``
-    - ``BIGINT``
-    -
-  * - ``UInt64``
-    - ``DECIMAL(20,0)``
-    -
-  * - ``Float32``
-    - ``REAL``
-    - ``FLOAT`` is an alias of ``Float32``
-  * - ``Float64``
-    - ``DOUBLE``
-    - ``DOUBLE`` is an alias of ``Float64``
-  * - ``Decimal``
-    - ``DECIMAL``
-    -
-  * - ``FixedString``
-    - ``VARBINARY``
-    - Enabling ``clickhouse.map-string-as-varchar`` config property changes the
-      mapping to ``VARCHAR``
-  * - ``String``
-    - ``VARBINARY``
-    - Enabling ``clickhouse.map-string-as-varchar`` config property changes the
-      mapping to ``VARCHAR``
-  * - ``Date``
-    - ``DATE``
-    -
-  * - ``DateTime[(timezone)]``
-    - ``TIMESTAMP(0) [WITH TIME ZONE]``
-    -
-  * - ``IPv4``
-    - ``IPADDRESS``
-    -
-  * - ``IPv6``
-    - ``IPADDRESS``
-    -
-  * - ``Enum8``
-    - ``VARCHAR``
-    -
-  * - ``Enum16``
-    - ``VARCHAR``
-    -
-  * - ``UUID``
-    - ``UUID``
-    -
-
-No other types are supported.
-
-Trino type to ClickHouse type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding ClickHouse types according
-to the following table:
-
-.. list-table:: Trino type to ClickHouse type mapping
-  :widths: 30, 25, 50
-  :header-rows: 1
-
-  * - Trino type
-    - ClickHouse type
-    - Notes
-  * - ``BOOLEAN``
-    - ``UInt8``
-    -
-  * - ``TINYINT``
-    - ``Int8``
-    - ``TINYINT``, ``BOOL``, ``BOOLEAN``, and ``INT1`` are aliases of ``Int8``
-  * - ``SMALLINT``
-    - ``Int16``
-    -  ``SMALLINT`` and ``INT2`` are aliases of ``Int16``
-  * - ``INTEGER``
-    - ``Int32``
-    - ``INT``, ``INT4``, and ``INTEGER`` are aliases of ``Int32``
-  * - ``BIGINT``
-    - ``Int64``
-    - ``BIGINT`` is an alias of ``Int64``
-  * - ``REAL``
-    - ``Float32``
-    - ``FLOAT`` is an alias of ``Float32``
-  * - ``DOUBLE``
-    - ``Float64``
-    - ``DOUBLE`` is an alias of ``Float64``
-  * - ``DECIMAL(p,s)``
-    - ``Decimal(p,s)``
-    -
-  * - ``VARCHAR``
-    - ``String``
-    -
-  * - ``CHAR``
-    - ``String``
-    -
-  * - ``VARBINARY``
-    - ``String``
-    - Enabling ``clickhouse.map-string-as-varchar`` config property changes the
-      mapping to ``VARCHAR``
-  * - ``DATE``
-    - ``Date``
-    -
-  * - ``TIMESTAMP(0)``
-    - ``DateTime``
-    -
-  * - ``UUID``
-    - ``UUID``
-    -
-
-No other types are supported.
-
-.. include:: jdbc-type-mapping.fragment
-
-.. _clickhouse-sql-support:
-
-SQL support
------------
-
-The connector provides read and write access to data and metadata in
-a ClickHouse catalog. In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/truncate`
-* :ref:`sql-schema-table-management`
-
-.. include:: alter-schema-limitation.fragment
-
-Performance
------------
-
-The connector includes a number of performance improvements, detailed in the
-following sections.
-
-.. _clickhouse-pushdown:
-
-Pushdown
-^^^^^^^^
-
-The connector supports pushdown for a number of operations:
-
-* :ref:`limit-pushdown`
-
-:ref:`Aggregate pushdown <aggregation-pushdown>` for the following functions:
-
-* :func:`avg`
-* :func:`count`
-* :func:`max`
-* :func:`min`
-* :func:`sum`
-
-.. include:: pushdown-correctness-behavior.fragment
-
-.. include:: no-pushdown-text-type.fragment
diff --git a/docs/src/main/sphinx/connector/csv-decoder.fragment b/docs/src/main/sphinx/connector/csv-decoder.fragment
new file mode 100644
index 000000000000..f6e9044aa0e1
--- /dev/null
+++ b/docs/src/main/sphinx/connector/csv-decoder.fragment
@@ -0,0 +1,34 @@
+#### CSV decoder
+
+The CSV decoder converts the bytes representing a message or key into a string
+using UTF-8 encoding, and interprets the result as a link of comma-separated
+values.
+
+For fields, the `type` and `mapping` attributes must be defined:
+
+- `type` - Trino data type. See the following table for a list of supported
+  data types.
+- `mapping` - The index of the field in the CSV record.
+
+The `dataFormat` and `formatHint` attributes are not supported and must be
+omitted.
+
+```{eval-rst}
+.. list-table::
+  :widths: 40, 60
+  :header-rows: 1
+
+  * - Trino data type
+    - Decoding rules
+  * - ``BIGINT``, ``INTEGER``, ``SMALLINT``, ``TINYINT``
+    - Decoded using Java ``Long.parseLong()``
+  * - ``DOUBLE``
+    - Decoded using Java ``Double.parseDouble()``
+  * - ``BOOLEAN``
+    - "true" character sequence maps to ``true``. Other character sequences map
+      to ``false``
+  * - ``VARCHAR`` / ``VARCHAR(x)``
+    - Used as is
+```
+
+No other types are supported.
diff --git a/docs/src/main/sphinx/connector/decimal-type-handling.fragment b/docs/src/main/sphinx/connector/decimal-type-handling.fragment
index e1bfe1b984ef..260438ea4629 100644
--- a/docs/src/main/sphinx/connector/decimal-type-handling.fragment
+++ b/docs/src/main/sphinx/connector/decimal-type-handling.fragment
@@ -1,18 +1,16 @@
-Decimal type handling
-^^^^^^^^^^^^^^^^^^^^^
+### Decimal type handling
 
-``DECIMAL`` types with unspecified precision or scale are mapped to a Trino
-``DECIMAL`` with a default precision of 38 and default scale of 0. The scale can
-be changed by setting the ``decimal-mapping`` configuration property or the
-``decimal_mapping`` session property to ``allow_overflow``. The scale of the
-resulting type is controlled via the ``decimal-default-scale`` configuration
-property or the ``decimal-rounding-mode`` session property. The precision is
+`DECIMAL` types with unspecified precision or scale are mapped to a Trino
+`DECIMAL` with a default precision of 38 and default scale of 0. The scale can
+be changed by setting the `decimal-mapping` configuration property or the
+`decimal_mapping` session property to `allow_overflow`. The scale of the
+resulting type is controlled via the `decimal-default-scale` configuration
+property or the `decimal-rounding-mode` session property. The precision is
 always 38.
 
 By default, values that require rounding or truncation to fit will cause a
 failure at runtime. This behavior is controlled via the
-``decimal-rounding-mode`` configuration property or the
-``decimal_rounding_mode`` session property, which can be set to ``UNNECESSARY``
-(the default), ``UP``, ``DOWN``, ``CEILING``, ``FLOOR``, ``HALF_UP``,
-``HALF_DOWN``, or ``HALF_EVEN`` (see `RoundingMode
-<https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/RoundingMode.html#enum.constant.summary>`_).
\ No newline at end of file
+`decimal-rounding-mode` configuration property or the
+`decimal_rounding_mode` session property, which can be set to `UNNECESSARY`
+(the default), `UP`, `DOWN`, `CEILING`, `FLOOR`, `HALF_UP`,
+`HALF_DOWN`, or `HALF_EVEN` (see [RoundingMode](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/RoundingMode.html#enum.constant.summary)).
diff --git a/docs/src/main/sphinx/connector/delta-lake.md b/docs/src/main/sphinx/connector/delta-lake.md
new file mode 100644
index 000000000000..0bcbbc91fea7
--- /dev/null
+++ b/docs/src/main/sphinx/connector/delta-lake.md
@@ -0,0 +1,1096 @@
+# Delta Lake connector
+
+```{raw} html
+<img src="../_static/img/delta-lake.png" class="connector-logo">
+```
+
+The Delta Lake connector allows querying data stored in the [Delta Lake](https://delta.io) format, including [Databricks Delta Lake](https://docs.databricks.com/delta/index.html). The connector can natively
+read the Delta Lake transaction log and thus detect when external systems change
+data.
+
+## Requirements
+
+To connect to Databricks Delta Lake, you need:
+
+- Tables written by Databricks Runtime 7.3 LTS, 9.1 LTS, 10.4 LTS, 11.3 LTS,
+  12.2 LTS and 13.3 LTS are supported.
+- Deployments using AWS, HDFS, Azure Storage, and Google Cloud Storage (GCS) are
+  fully supported.
+- Network access from the coordinator and workers to the Delta Lake storage.
+- Access to the Hive metastore service (HMS) of Delta Lake or a separate HMS,
+  or a Glue metastore.
+- Network access to the HMS from the coordinator and workers. Port 9083 is the
+  default port for the Thrift protocol used by the HMS.
+- Data files stored in the Parquet file format. These can be configured using
+  {ref}`file format configuration properties <hive-parquet-configuration>` per
+  catalog.
+
+## General configuration
+
+To configure the Delta Lake connector, create a catalog properties file
+`etc/catalog/example.properties` that references the `delta_lake`
+connector and defines a metastore. You must configure a metastore for table
+metadata.  If you are using a {ref}`Hive metastore <hive-thrift-metastore>`,
+`hive.metastore.uri` must be configured:
+
+```properties
+connector.name=delta_lake
+hive.metastore.uri=thrift://example.net:9083
+```
+
+If you are using {ref}`AWS Glue <hive-glue-metastore>` as your metastore, you
+must instead set `hive.metastore` to `glue`:
+
+```properties
+connector.name=delta_lake
+hive.metastore=glue
+```
+
+Each metastore type has specific configuration properties along with
+{ref}`general metastore configuration properties <general-metastore-properties>`.
+
+The connector recognizes Delta Lake tables created in the metastore by the Databricks
+runtime. If non-Delta Lake tables are present in the metastore as well, they are not
+visible to the connector.
+
+To configure access to S3 and S3-compatible storage, Azure storage, and others,
+consult the appropriate section of the Hive documentation:
+
+- {doc}`Amazon S3 </connector/hive-s3>`
+- {doc}`Azure storage documentation </connector/hive-azure>`
+- {ref}`GCS <hive-google-cloud-storage-configuration>`
+
+### Delta Lake general configuration properties
+
+The following configuration properties are all using reasonable, tested default
+values. Typical usage does not require you to configure them.
+
+```{eval-rst}
+.. list-table:: Delta Lake configuration properties
+    :widths: 30, 55, 15
+    :header-rows: 1
+
+    * - Property name
+      - Description
+      - Default
+    * - ``delta.metadata.cache-ttl``
+      - Frequency of checks for metadata updates equivalent to transactions to
+        update the metadata cache specified in :ref:`prop-type-duration`.
+      - ``5m``
+    * - ``delta.metadata.cache-size``
+      - The maximum number of Delta table metadata entries to cache.
+      - ``1000``
+    * - ``delta.metadata.live-files.cache-size``
+      - Amount of memory allocated for caching information about files. Must
+        be specified in :ref:`prop-type-data-size` values such as ``64MB``.
+        Default is calculated to 10% of the maximum memory allocated to the JVM.
+      -
+    * - ``delta.metadata.live-files.cache-ttl``
+      - Caching duration for active files that correspond to the Delta Lake
+        tables.
+      - ``30m``
+    * - ``delta.compression-codec``
+      - The compression codec to be used when writing new data files.
+        Possible values are:
+
+        * ``NONE``
+        * ``SNAPPY``
+        * ``ZSTD``
+        * ``GZIP``
+
+        The equivalent catalog session property is ``compression_codec``.
+      - ``SNAPPY``
+    * - ``delta.max-partitions-per-writer``
+      - Maximum number of partitions per writer.
+      - ``100``
+    * - ``delta.hide-non-delta-lake-tables``
+      - Hide information about tables that are not managed by Delta Lake. Hiding
+        only applies to tables with the metadata managed in a Glue catalog, and
+        does not apply to usage with a Hive metastore service.
+      - ``false``
+    * - ``delta.enable-non-concurrent-writes``
+      - Enable :ref:`write support <delta-lake-data-management>` for all
+        supported file systems. Specifically, take note of the warning about
+        concurrency and checkpoints.
+      - ``false``
+    * - ``delta.default-checkpoint-writing-interval``
+      - Default integer count to write transaction log checkpoint entries. If
+        the value is set to N, then checkpoints are written after every Nth
+        statement performing table writes. The value can be overridden for a
+        specific table with the ``checkpoint_interval`` table property.
+      - ``10``
+    * - ``delta.hive-catalog-name``
+      - Name of the catalog to which ``SELECT`` queries are redirected when a
+        Hive table is detected.
+      -
+    * - ``delta.checkpoint-row-statistics-writing.enabled``
+      - Enable writing row statistics to checkpoint files.
+      - ``true``
+    * - ``delta.dynamic-filtering.wait-timeout``
+      - Duration to wait for completion of :doc:`dynamic filtering
+        </admin/dynamic-filtering>` during split generation.
+        The equivalent catalog session property is
+        ``dynamic_filtering_wait_timeout``.
+      -
+    * - ``delta.table-statistics-enabled``
+      - Enables :ref:`Table statistics <delta-lake-table-statistics>` for
+        performance improvements. The equivalent catalog session property
+        is ``statistics_enabled``.
+      - ``true``
+    * - ``delta.extended-statistics.enabled``
+      - Enable statistics collection with :doc:`/sql/analyze` and
+        use of extended statistics. The equivalent catalog session property
+        is ``extended_statistics_enabled``.
+      - ``true``
+    * - ``delta.extended-statistics.collect-on-write``
+      - Enable collection of extended statistics for write operations.
+        The equivalent catalog session property is
+        ``extended_statistics_collect_on_write``.
+      - ``true``
+    * - ``delta.per-transaction-metastore-cache-maximum-size``
+      - Maximum number of metastore data objects per transaction in
+        the Hive metastore cache.
+      - ``1000``
+    * - ``delta.delete-schema-locations-fallback``
+      - Whether schema locations are deleted when Trino can't
+        determine whether they contain external files.
+      - ``false``
+    * - ``delta.parquet.time-zone``
+      - Time zone for Parquet read and write.
+      - JVM default
+    * - ``delta.target-max-file-size``
+      - Target maximum size of written files; the actual size could be larger.
+        The equivalent catalog session property is ``target_max_file_size``.
+      - ``1GB``
+    * - ``delta.unique-table-location``
+      - Use randomized, unique table locations.
+      - ``true``
+    * - ``delta.register-table-procedure.enabled``
+      - Enable to allow users to call the ``register_table`` procedure.
+      - ``false``
+    * - ``delta.vacuum.min-retention``
+      - Minimum retention threshold for the files taken into account
+        for removal by the :ref:`VACUUM<delta-lake-vacuum>` procedure.
+        The equivalent catalog session property is
+        ``vacuum_min_retention``.
+      - ``7 DAYS``
+```
+
+### Catalog session properties
+
+The following table describes {ref}`catalog session properties
+<session-properties-definition>` supported by the Delta Lake connector:
+
+```{eval-rst}
+.. list-table:: Catalog session properties
+    :widths: 40, 60, 20
+    :header-rows: 1
+
+    * - Property name
+      - Description
+      - Default
+    * - ``parquet_max_read_block_size``
+      - The maximum block size used when reading Parquet files.
+      - ``16MB``
+    * - ``parquet_writer_block_size``
+      - The maximum block size created by the Parquet writer.
+      - ``128MB``
+    * - ``parquet_writer_page_size``
+      - The maximum page size created by the Parquet writer.
+      - ``1MB``
+    * - ``parquet_writer_batch_size``
+      - Maximum number of rows processed by the Parquet writer in a batch.
+      - ``10000``
+    * - ``projection_pushdown_enabled``
+      - Read only projected fields from row columns while performing ``SELECT`` queries
+      - ``true``
+```
+
+(delta-lake-type-mapping)=
+
+## Type mapping
+
+Because Trino and Delta Lake each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types might not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+See the [Delta Transaction Log specification](https://github.com/delta-io/delta/blob/master/PROTOCOL.md#primitive-types)
+for more information about supported data types in the Delta Lake table format
+specification.
+
+### Delta Lake to Trino type mapping
+
+The connector maps Delta Lake types to the corresponding Trino types following
+this table:
+
+```{eval-rst}
+.. list-table:: Delta Lake to Trino type mapping
+  :widths: 40, 60
+  :header-rows: 1
+
+  * - Delta Lake type
+    - Trino type
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+  * - ``INTEGER``
+    - ``INTEGER``
+  * - ``BYTE``
+    - ``TINYINT``
+  * - ``SHORT``
+    - ``SMALLINT``
+  * - ``LONG``
+    - ``BIGINT``
+  * - ``FLOAT``
+    - ``REAL``
+  * - ``DOUBLE``
+    - ``DOUBLE``
+  * - ``DECIMAL(p,s)``
+    - ``DECIMAL(p,s)``
+  * - ``STRING``
+    - ``VARCHAR``
+  * - ``BINARY``
+    - ``VARBINARY``
+  * - ``DATE``
+    - ``DATE``
+  * - ``TIMESTAMPNTZ`` (``TIMESTAMP_NTZ``)
+    - ``TIMESTAMP(6)``
+  * - ``TIMESTAMP``
+    - ``TIMESTAMP(3) WITH TIME ZONE``
+  * - ``ARRAY``
+    - ``ARRAY``
+  * - ``MAP``
+    - ``MAP``
+  * - ``STRUCT(...)``
+    - ``ROW(...)``
+```
+
+No other types are supported.
+
+### Trino to Delta Lake type mapping
+
+The connector maps Trino types to the corresponding Delta Lake types following
+this table:
+
+```{eval-rst}
+.. list-table:: Trino to Delta Lake type mapping
+  :widths: 60, 40
+  :header-rows: 1
+
+  * - Trino type
+    - Delta Lake type
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+  * - ``INTEGER``
+    - ``INTEGER``
+  * - ``TINYINT``
+    - ``BYTE``
+  * - ``SMALLINT``
+    - ``SHORT``
+  * - ``BIGINT``
+    - ``LONG``
+  * - ``REAL``
+    - ``FLOAT``
+  * - ``DOUBLE``
+    - ``DOUBLE``
+  * - ``DECIMAL(p,s)``
+    - ``DECIMAL(p,s)``
+  * - ``VARCHAR``
+    - ``STRING``
+  * - ``VARBINARY``
+    - ``BINARY``
+  * - ``DATE``
+    - ``DATE``
+  * - ``TIMESTAMP``
+    - ``TIMESTAMPNTZ`` (``TIMESTAMP_NTZ``)
+  * - ``TIMESTAMP(3) WITH TIME ZONE``
+    - ``TIMESTAMP``
+  * - ``ARRAY``
+    - ``ARRAY``
+  * - ``MAP``
+    - ``MAP``
+  * - ``ROW(...)``
+    - ``STRUCT(...)``
+```
+
+No other types are supported.
+
+## Security
+
+The Delta Lake connector allows you to choose one of several means of providing
+authorization at the catalog level. You can select a different type of
+authorization check in different Delta Lake catalog files.
+
+(delta-lake-authorization)=
+
+### Authorization checks
+
+Enable authorization checks for the connector by setting the `delta.security`
+property in the catalog properties file. This property must be one of the
+security values in the following table:
+
+```{eval-rst}
+.. list-table:: Delta Lake security values
+  :widths: 30, 60
+  :header-rows: 1
+
+  * - Property value
+    - Description
+  * - ``ALLOW_ALL`` (default value)
+    - No authorization checks are enforced.
+  * - ``SYSTEM``
+    - The connector relies on system-level access control.
+  * - ``READ_ONLY``
+    - Operations that read data or metadata, such as :doc:`/sql/select` are
+      permitted. No operations that write data or metadata, such as
+      :doc:`/sql/create-table`, :doc:`/sql/insert`, or :doc:`/sql/delete` are
+      allowed.
+  * - ``FILE``
+    - Authorization checks are enforced using a catalog-level access control
+      configuration file whose path is specified in the ``security.config-file``
+      catalog configuration property. See
+      :ref:`catalog-file-based-access-control` for information on the
+      authorization configuration file.
+```
+
+(delta-lake-sql-support)=
+
+## SQL support
+
+The connector provides read and write access to data and metadata in
+Delta Lake. In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {ref}`sql-write-operations`:
+
+  - {ref}`sql-data-management`, see details for  {ref}`Delta Lake data
+    management <delta-lake-data-management>`
+  - {ref}`sql-schema-table-management`, see details for  {ref}`Delta Lake schema
+    and table management <delta-lake-schema-table-management>`
+  - {ref}`sql-view-management`
+
+### Procedures
+
+Use the {doc}`/sql/call` statement to perform data manipulation or
+administrative tasks. Procedures are available in the system schema of each
+catalog. The following code snippet displays how to call the
+`example_procedure` in the `examplecatalog` catalog:
+
+```
+CALL examplecatalog.system.example_procedure()
+```
+
+(delta-lake-register-table)=
+
+#### Register table
+
+The connector can register table into the metastore with existing transaction
+logs and data files.
+
+The `system.register_table` procedure allows the caller to register an
+existing Delta Lake table in the metastore, using its existing transaction logs
+and data files:
+
+```
+CALL example.system.register_table(schema_name => 'testdb', table_name => 'customer_orders', table_location => 's3://my-bucket/a/path')
+```
+
+To prevent unauthorized users from accessing data, this procedure is disabled by
+default. The procedure is enabled only when
+`delta.register-table-procedure.enabled` is set to `true`.
+
+(delta-lake-unregister-table)=
+
+#### Unregister table
+
+The connector can unregister existing Delta Lake tables from the metastore.
+
+The procedure `system.unregister_table` allows the caller to unregister an
+existing Delta Lake table from the metastores without deleting the data:
+
+```
+CALL example.system.unregister_table(schema_name => 'testdb', table_name => 'customer_orders')
+```
+
+(delta-lake-flush-metadata-cache)=
+
+#### Flush metadata cache
+
+- `system.flush_metadata_cache()`
+
+  Flushes all metadata caches.
+
+- `system.flush_metadata_cache(schema_name => ..., table_name => ...)`
+
+  Flushes metadata cache entries of a specific table.
+  Procedure requires passing named parameters.
+
+(delta-lake-vacuum)=
+
+#### `VACUUM`
+
+The `VACUUM` procedure removes all old files that are not in the transaction
+log, as well as files that are not needed to read table snapshots newer than the
+current time minus the retention period defined by the `retention period`
+parameter.
+
+Users with `INSERT` and `DELETE` permissions on a table can run `VACUUM`
+as follows:
+
+```shell
+CALL example.system.vacuum('exampleschemaname', 'exampletablename', '7d');
+```
+
+All parameters are required and must be presented in the following order:
+
+- Schema name
+- Table name
+- Retention period
+
+The `delta.vacuum.min-retention` configuration property provides a safety
+measure to ensure that files are retained as expected. The minimum value for
+this property is `0s`. There is a minimum retention session property as well,
+`vacuum_min_retention`.
+
+(delta-lake-data-management)=
+
+### Data management
+
+You can use the connector to {doc}`/sql/insert`, {doc}`/sql/delete`,
+{doc}`/sql/update`, and {doc}`/sql/merge` data in Delta Lake tables.
+
+Write operations are supported for tables stored on the following systems:
+
+- Azure ADLS Gen2, Google Cloud Storage
+
+  Writes to the Azure ADLS Gen2 and Google Cloud Storage are
+  enabled by default. Trino detects write collisions on these storage systems
+  when writing from multiple Trino clusters, or from other query engines.
+
+- S3 and S3-compatible storage
+
+  Writes to {doc}`Amazon S3 <hive-s3>` and S3-compatible storage must be enabled
+  with the `delta.enable-non-concurrent-writes` property. Writes to S3 can
+  safely be made from multiple Trino clusters; however, write collisions are not
+  detected when writing concurrently from other Delta Lake engines. You must
+  make sure that no concurrent data modifications are run to avoid data
+  corruption.
+
+(delta-lake-schema-table-management)=
+
+### Schema and table management
+
+The {ref}`sql-schema-table-management` functionality includes support for:
+
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/alter-table`, see details for {ref}`Delta Lake ALTER TABLE
+  <delta-lake-alter-table>`
+- {doc}`/sql/create-schema`
+- {doc}`/sql/drop-schema`
+- {doc}`/sql/alter-schema`
+- {doc}`/sql/comment`
+
+The connector supports creating schemas. You can create a schema with or without
+a specified location.
+
+You can create a schema with the {doc}`/sql/create-schema` statement and the
+`location` schema property. Tables in this schema are located in a
+subdirectory under the schema location. Data files for tables in this schema
+using the default location are cleaned up if the table is dropped:
+
+```
+CREATE SCHEMA example.example_schema
+WITH (location = 's3://my-bucket/a/path');
+```
+
+Optionally, the location can be omitted. Tables in this schema must have a
+location included when you create them. The data files for these tables are not
+removed if the table is dropped:
+
+```
+CREATE SCHEMA example.example_schema;
+```
+
+When Delta Lake tables exist in storage but not in the metastore, Trino can be
+used to register the tables:
+
+```
+CREATE TABLE example.default.example_table (
+  dummy BIGINT
+)
+WITH (
+  location = '...'
+)
+```
+
+Columns listed in the DDL, such as `dummy` in the preceding example, are
+ignored. The table schema is read from the transaction log instead. If the
+schema is changed by an external system, Trino automatically uses the new
+schema.
+
+:::{warning}
+Using `CREATE TABLE` with an existing table content is deprecated, instead
+use the `system.register_table` procedure. The `CREATE TABLE ... WITH
+(location=...)` syntax can be temporarily re-enabled using the
+`delta.legacy-create-table-with-existing-location.enabled` catalog
+configuration property or
+`legacy_create_table_with_existing_location_enabled` catalog session
+property.
+:::
+
+If the specified location does not already contain a Delta table, the connector
+automatically writes the initial transaction log entries and registers the table
+in the metastore. As a result, any Databricks engine can write to the table:
+
+```
+CREATE TABLE example.default.new_table (id BIGINT, address VARCHAR);
+```
+
+The Delta Lake connector also supports creating tables using the {doc}`CREATE
+TABLE AS </sql/create-table-as>` syntax.
+
+(delta-lake-alter-table)=
+
+The connector supports the following [](/sql/alter-table) statements.
+
+#### ALTER TABLE EXECUTE
+
+The connector supports the following commands for use with {ref}`ALTER TABLE
+EXECUTE <alter-table-execute>`.
+
+```{include} optimize.fragment
+```
+
+(delta-lake-alter-table-rename-to)=
+
+#### ALTER TABLE RENAME TO
+
+The connector only supports the `ALTER TABLE RENAME TO` statement when met with
+one of the following conditions:
+
+* The table type is external.
+* The table is backed by a metastore that does not perform object storage
+  operations, for example, AWS Glue or Thrift.
+
+#### Table properties
+
+The following table properties are available for use:
+
+```{eval-rst}
+.. list-table:: Delta Lake table properties
+  :widths: 40, 60
+  :header-rows: 1
+
+  * - Property name
+    - Description
+  * - ``location``
+    - File system location URI for the table.
+  * - ``partitioned_by``
+    - Set partition columns.
+  * - ``checkpoint_interval``
+    - Set the checkpoint interval in number of table writes.
+  * - ``change_data_feed_enabled``
+    - Enables storing change data feed entries.
+  * - ``column_mapping_mode``
+    - Column mapping mode. Possible values are:
+
+      * ``ID``
+      * ``NAME``
+      * ``NONE``
+
+      Defaults to ``NONE``.
+```
+
+The following example uses all available table properties:
+
+```
+CREATE TABLE example.default.example_partitioned_table
+WITH (
+  location = 's3://my-bucket/a/path',
+  partitioned_by = ARRAY['regionkey'],
+  checkpoint_interval = 5,
+  change_data_feed_enabled = false,
+  column_mapping_mode = 'name'
+)
+AS SELECT name, comment, regionkey FROM tpch.tiny.nation;
+```
+
+#### Metadata tables
+
+The connector exposes several metadata tables for each Delta Lake table.
+These metadata tables contain information about the internal structure
+of the Delta Lake table. You can query each metadata table by appending the
+metadata table name to the table name:
+
+```
+SELECT * FROM "test_table$history"
+```
+
+##### `$history` table
+
+The `$history` table provides a log of the metadata changes performed on
+the Delta Lake table.
+
+You can retrieve the changelog of the Delta Lake table `test_table`
+by using the following query:
+
+```
+SELECT * FROM "test_table$history"
+```
+
+```text
+ version |               timestamp               | user_id | user_name |  operation   |         operation_parameters          |                 cluster_id      | read_version |  isolation_level  | is_blind_append
+---------+---------------------------------------+---------+-----------+--------------+---------------------------------------+---------------------------------+--------------+-------------------+----------------
+       2 | 2023-01-19 07:40:54.684 Europe/Vienna | trino   | trino     | WRITE        | {queryId=20230119_064054_00008_4vq5t} | trino-406-trino-coordinator     |            2 | WriteSerializable | true
+       1 | 2023-01-19 07:40:41.373 Europe/Vienna | trino   | trino     | ADD COLUMNS  | {queryId=20230119_064041_00007_4vq5t} | trino-406-trino-coordinator     |            0 | WriteSerializable | true
+       0 | 2023-01-19 07:40:10.497 Europe/Vienna | trino   | trino     | CREATE TABLE | {queryId=20230119_064010_00005_4vq5t} | trino-406-trino-coordinator     |            0 | WriteSerializable | true
+```
+
+The output of the query has the following history columns:
+
+```{eval-rst}
+.. list-table:: History columns
+  :widths: 30, 30, 40
+  :header-rows: 1
+
+  * - Name
+    - Type
+    - Description
+  * - ``version``
+    - ``BIGINT``
+    - The version of the table corresponding to the operation
+  * - ``timestamp``
+    - ``TIMESTAMP(3) WITH TIME ZONE``
+    - The time when the table version became active
+  * - ``user_id``
+    - ``VARCHAR``
+    - The identifier for the user which performed the operation
+  * - ``user_name``
+    - ``VARCHAR``
+    - The username for the user which performed the operation
+  * - ``operation``
+    - ``VARCHAR``
+    - The name of the operation performed on the table
+  * - ``operation_parameters``
+    - ``map(VARCHAR, VARCHAR)``
+    - Parameters of the operation
+  * - ``cluster_id``
+    - ``VARCHAR``
+    - The ID of the cluster which ran the operation
+  * - ``read_version``
+    - ``BIGINT``
+    - The version of the table which was read in order to perform the operation
+  * - ``isolation_level``
+    - ``VARCHAR``
+    - The level of isolation used to perform the operation
+  * - ``is_blind_append``
+    - ``BOOLEAN``
+    - Whether or not the operation appended data
+```
+
+##### `$properties` table
+
+The `$properties` table provides access to Delta Lake table configuration,
+table features and table properties. The table rows are key/value pairs.
+
+You can retrieve the properties of the Delta
+table `test_table` by using the following query:
+
+```
+SELECT * FROM "test_table$properties"
+```
+
+```text
+ key                        | value           |
+----------------------------+-----------------+
+delta.minReaderVersion      | 1               |
+delta.minWriterVersion      | 4               |
+delta.columnMapping.mode    | name            |
+delta.feature.columnMapping | supported       |
+```
+
+(delta-lake-special-columns)=
+
+#### Metadata columns
+
+In addition to the defined columns, the Delta Lake connector automatically
+exposes metadata in a number of hidden columns in each table. You can use these
+columns in your SQL statements like any other column, e.g., they can be selected
+directly or used in conditional statements.
+
+- `$path`
+  : Full file system path name of the file for this row.
+- `$file_modified_time`
+  : Date and time of the last modification of the file for this row.
+- `$file_size`
+  : Size of the file for this row.
+
+(delta-lake-fte-support)=
+
+## Fault-tolerant execution support
+
+The connector supports {doc}`/admin/fault-tolerant-execution` of query
+processing. Read and write operations are both supported with any retry policy.
+
+## Table functions
+
+The connector provides the following table functions:
+
+### table_changes
+
+Allows reading Change Data Feed (CDF) entries to expose row-level changes
+between two versions of a Delta Lake table. When the `change_data_feed_enabled`
+table property is set to `true` on a specific Delta Lake table,
+the connector records change events for all data changes on the table.
+This is how these changes can be read:
+
+```sql
+SELECT
+  *
+FROM
+  TABLE(
+    system.table_changes(
+      schema_name => 'test_schema',
+      table_name => 'tableName',
+      since_version => 0
+    )
+  );
+```
+
+`schema_name` - type `VARCHAR`, required, name of the schema for which the function is called
+
+`table_name` - type `VARCHAR`, required, name of the table for which the function is called
+
+`since_version` - type `BIGINT`, optional, version from which changes are shown, exclusive
+
+In addition to returning the columns present in the table, the function
+returns the following values for each change event:
+
+- `_change_type`
+  : Gives the type of change that occurred. Possible values are `insert`,
+    `delete`, `update_preimage` and `update_postimage`.
+- `_commit_version`
+  : Shows the table version for which the change occurred.
+- `_commit_timestamp`
+  : Represents the timestamp for the commit in which the specified change happened.
+
+This is how it would be normally used:
+
+Create table:
+
+```sql
+CREATE TABLE test_schema.pages (page_url VARCHAR, domain VARCHAR, views INTEGER)
+    WITH (change_data_feed_enabled = true);
+```
+
+Insert data:
+
+```sql
+INSERT INTO test_schema.pages
+    VALUES
+        ('url1', 'domain1', 1),
+        ('url2', 'domain2', 2),
+        ('url3', 'domain1', 3);
+INSERT INTO test_schema.pages
+    VALUES
+        ('url4', 'domain1', 400),
+        ('url5', 'domain2', 500),
+        ('url6', 'domain3', 2);
+```
+
+Update data:
+
+```sql
+UPDATE test_schema.pages
+    SET domain = 'domain4'
+    WHERE views = 2;
+```
+
+Select changes:
+
+```sql
+SELECT
+  *
+FROM
+  TABLE(
+    system.table_changes(
+      schema_name => 'test_schema',
+      table_name => 'pages',
+      since_version => 1
+    )
+  )
+ORDER BY _commit_version ASC;
+```
+
+The preceding sequence of SQL statements returns the following result:
+
+```text
+page_url    |     domain     |    views    |    _change_type     |    _commit_version    |    _commit_timestamp
+url4        |     domain1    |    400      |    insert           |     2                 |    2023-03-10T21:22:23.000+0000
+url5        |     domain2    |    500      |    insert           |     2                 |    2023-03-10T21:22:23.000+0000
+url6        |     domain3    |    2        |    insert           |     2                 |    2023-03-10T21:22:23.000+0000
+url2        |     domain2    |    2        |    update_preimage  |     3                 |    2023-03-10T22:23:24.000+0000
+url2        |     domain4    |    2        |    update_postimage |     3                 |    2023-03-10T22:23:24.000+0000
+url6        |     domain3    |    2        |    update_preimage  |     3                 |    2023-03-10T22:23:24.000+0000
+url6        |     domain4    |    2        |    update_postimage |     3                 |    2023-03-10T22:23:24.000+0000
+```
+
+The output shows what changes happen in which version.
+For example in version 3 two rows were modified, first one changed from
+`('url2', 'domain2', 2)` into `('url2', 'domain4', 2)` and the second from
+`('url6', 'domain2', 2)` into `('url6', 'domain4', 2)`.
+
+If `since_version` is not provided the function produces change events
+starting from when the table was created.
+
+```sql
+SELECT
+  *
+FROM
+  TABLE(
+    system.table_changes(
+      schema_name => 'test_schema',
+      table_name => 'pages'
+    )
+  )
+ORDER BY _commit_version ASC;
+```
+
+The preceding SQL statement returns the following result:
+
+```text
+page_url    |     domain     |    views    |    _change_type     |    _commit_version    |    _commit_timestamp
+url1        |     domain1    |    1        |    insert           |     1                 |    2023-03-10T20:21:22.000+0000
+url2        |     domain2    |    2        |    insert           |     1                 |    2023-03-10T20:21:22.000+0000
+url3        |     domain1    |    3        |    insert           |     1                 |    2023-03-10T20:21:22.000+0000
+url4        |     domain1    |    400      |    insert           |     2                 |    2023-03-10T21:22:23.000+0000
+url5        |     domain2    |    500      |    insert           |     2                 |    2023-03-10T21:22:23.000+0000
+url6        |     domain3    |    2        |    insert           |     2                 |    2023-03-10T21:22:23.000+0000
+url2        |     domain2    |    2        |    update_preimage  |     3                 |    2023-03-10T22:23:24.000+0000
+url2        |     domain4    |    2        |    update_postimage |     3                 |    2023-03-10T22:23:24.000+0000
+url6        |     domain3    |    2        |    update_preimage  |     3                 |    2023-03-10T22:23:24.000+0000
+url6        |     domain4    |    2        |    update_postimage |     3                 |    2023-03-10T22:23:24.000+0000
+```
+
+You can see changes that occurred at version 1 as three inserts. They are
+not visible in the previous statement when `since_version` value was set to 1.
+
+## Performance
+
+The connector includes a number of performance improvements detailed in the
+following sections:
+
+- Support for {doc}`write partitioning </admin/properties-write-partitioning>`.
+
+(delta-lake-table-statistics)=
+
+### Table statistics
+
+Use {doc}`/sql/analyze` statements in Trino to populate data size and
+number of distinct values (NDV) extended table statistics in Delta Lake.
+The minimum value, maximum value, value count, and null value count
+statistics are computed on the fly out of the transaction log of the
+Delta Lake table. The {doc}`cost-based optimizer
+</optimizer/cost-based-optimizations>` then uses these statistics to improve
+query performance.
+
+Extended statistics enable a broader set of optimizations, including join
+reordering. The controlling catalog property `delta.table-statistics-enabled`
+is enabled by default. The equivalent {ref}`catalog session property
+<session-properties-definition>` is `statistics_enabled`.
+
+Each `ANALYZE` statement updates the table statistics incrementally, so only
+the data changed since the last `ANALYZE` is counted. The table statistics are
+not automatically updated by write operations such as `INSERT`, `UPDATE`,
+and `DELETE`. You must manually run `ANALYZE` again to update the table
+statistics.
+
+To collect statistics for a table, execute the following statement:
+
+```
+ANALYZE table_schema.table_name;
+```
+
+To recalculate from scratch the statistics for the table use additional parameter `mode`:
+
+> ANALYZE table_schema.table_name WITH(mode = 'full_refresh');
+
+There are two modes available `full_refresh` and `incremental`.
+The procedure use `incremental` by default.
+
+To gain the most benefit from cost-based optimizations, run periodic `ANALYZE`
+statements on every large table that is frequently queried.
+
+#### Fine-tuning
+
+The `files_modified_after` property is useful if you want to run the
+`ANALYZE` statement on a table that was previously analyzed. You can use it to
+limit the amount of data used to generate the table statistics:
+
+```SQL
+ANALYZE example_table WITH(files_modified_after = TIMESTAMP '2021-08-23
+16:43:01.321 Z')
+```
+
+As a result, only files newer than the specified time stamp are used in the
+analysis.
+
+You can also specify a set or subset of columns to analyze using the `columns`
+property:
+
+```SQL
+ANALYZE example_table WITH(columns = ARRAY['nationkey', 'regionkey'])
+```
+
+To run `ANALYZE` with `columns` more than once, the next `ANALYZE` must
+run on the same set or a subset of the original columns used.
+
+To broaden the set of `columns`, drop the statistics and reanalyze the table.
+
+#### Disable and drop extended statistics
+
+You can disable extended statistics with the catalog configuration property
+`delta.extended-statistics.enabled` set to `false`. Alternatively, you can
+disable it for a session, with the {doc}`catalog session property
+</sql/set-session>` `extended_statistics_enabled` set to `false`.
+
+If a table is changed with many delete and update operation, calling `ANALYZE`
+does not result in accurate statistics. To correct the statistics, you have to
+drop the extended statistics and analyze the table again.
+
+Use the `system.drop_extended_stats` procedure in the catalog to drop the
+extended statistics for a specified table in a specified schema:
+
+```
+CALL example.system.drop_extended_stats('example_schema', 'example_table')
+```
+
+### Memory usage
+
+The Delta Lake connector is memory intensive and the amount of required memory
+grows with the size of Delta Lake transaction logs of any accessed tables. It is
+important to take that into account when provisioning the coordinator.
+
+You must decrease memory usage by keeping the number of active data files in
+the table low by regularly running `OPTIMIZE` and `VACUUM` in Delta Lake.
+
+#### Memory monitoring
+
+When using the Delta Lake connector, you must monitor memory usage on the
+coordinator. Specifically, monitor JVM heap utilization using standard tools as
+part of routine operation of the cluster.
+
+A good proxy for memory usage is the cache utilization of Delta Lake caches. It
+is exposed by the connector with the
+`plugin.deltalake.transactionlog:name=<catalog-name>,type=transactionlogaccess`
+JMX bean.
+
+You can access it with any standard monitoring software with JMX support, or use
+the {doc}`/connector/jmx` with the following query:
+
+```
+SELECT * FROM jmx.current."*.plugin.deltalake.transactionlog:name=<catalog-name>,type=transactionlogaccess"
+```
+
+Following is an example result:
+
+```text
+datafilemetadatacachestats.hitrate      | 0.97
+datafilemetadatacachestats.missrate     | 0.03
+datafilemetadatacachestats.requestcount | 3232
+metadatacachestats.hitrate              | 0.98
+metadatacachestats.missrate             | 0.02
+metadatacachestats.requestcount         | 6783
+node                                    | trino-master
+object_name                             | io.trino.plugin.deltalake.transactionlog:type=TransactionLogAccess,name=delta
+```
+
+In a healthy system, both `datafilemetadatacachestats.hitrate` and
+`metadatacachestats.hitrate` are close to `1.0`.
+
+(delta-lake-table-redirection)=
+
+### Table redirection
+
+```{include} table-redirection.fragment
+```
+
+The connector supports redirection from Delta Lake tables to Hive tables
+with the `delta.hive-catalog-name` catalog configuration property.
+
+### Performance tuning configuration properties
+
+The following table describes performance tuning catalog properties specific to
+the Delta Lake connector.
+
+:::{warning}
+Performance tuning configuration properties are considered expert-level
+features. Altering these properties from their default values is likely to
+cause instability and performance degradation. It is strongly suggested that
+you use them only to address non-trivial performance issues, and that you
+keep a backup of the original values if you change them.
+:::
+
+```{eval-rst}
+.. list-table:: Delta Lake performance tuning configuration properties
+    :widths: 30, 50, 20
+    :header-rows: 1
+
+    * - Property name
+      - Description
+      - Default
+    * - ``delta.domain-compaction-threshold``
+      - Minimum size of query predicates above which Trino compacts the
+        predicates. Pushing a large list of predicates down to the data source
+        can compromise performance. For optimization in that situation, Trino
+        can compact the large predicates. If necessary, adjust the threshold to
+        ensure a balance between performance and predicate pushdown.
+      - ``1000``
+    * - ``delta.max-outstanding-splits``
+      - The target number of buffered splits for each table scan in a query,
+        before the scheduler tries to pause.
+      - ``1000``
+    * - ``delta.max-splits-per-second``
+      - Sets the maximum number of splits used per second to access underlying
+        storage. Reduce this number if your limit is routinely exceeded, based
+        on your filesystem limits. This is set to the absolute maximum value,
+        which results in Trino maximizing the parallelization of data access
+        by default. Attempting to set it higher results in Trino not being
+        able to start.
+      - ``Integer.MAX_VALUE``
+    * - ``delta.max-initial-splits``
+      - For each query, the coordinator assigns file sections to read first
+        at the ``initial-split-size`` until the ``max-initial-splits`` is
+        reached. Then it starts issuing reads of the ``max-split-size`` size.
+      - ``200``
+    * - ``delta.max-initial-split-size``
+      - Sets the initial :ref:`prop-type-data-size` for a single read section
+        assigned to a worker until ``max-initial-splits`` have been processed.
+        You can also use the corresponding catalog session property
+        ``<catalog-name>.max_initial_split_size``.
+      - ``32MB``
+    * - ``delta.max-split-size``
+      - Sets the largest :ref:`prop-type-data-size` for a single read section
+        assigned to a worker after ``max-initial-splits`` have been processed.
+        You can also use the corresponding catalog session property
+        ``<catalog-name>.max_split_size``.
+      - ``64MB``
+    * - ``delta.minimum-assigned-split-weight``
+      - A decimal value in the range (0, 1] used as a minimum for weights
+        assigned to each split. A low value might improve performance on tables
+        with small files. A higher value might improve performance for queries
+        with highly skewed aggregations or joins.
+      - ``0.05``
+    * - ``delta.projection-pushdown-enabled``
+      - Read only projected fields from row columns while performing ``SELECT`` queries
+      - ``true``
+    * - ``delta.query-partition-filter-required``
+      - Set to ``true`` to force a query to use a partition filter. You can use
+        the ``query_partition_filter_required`` catalog session property for
+        temporary, catalog specific use.
+      - ``false``
+```
diff --git a/docs/src/main/sphinx/connector/delta-lake.rst b/docs/src/main/sphinx/connector/delta-lake.rst
deleted file mode 100644
index 85567cbc7090..000000000000
--- a/docs/src/main/sphinx/connector/delta-lake.rst
+++ /dev/null
@@ -1,938 +0,0 @@
-====================
-Delta Lake connector
-====================
-
-.. raw:: html
-
-  <img src="../_static/img/delta-lake.png" class="connector-logo">
-
-The Delta Lake connector allows querying data stored in `Delta Lake
-<https://delta.io>`_ format, including `Databricks Delta Lake
-<https://docs.databricks.com/delta/index.html>`_. It can natively read the Delta
-transaction log, and thus detect when external systems change data.
-
-Requirements
-------------
-
-To connect to Databricks Delta Lake, you need:
-
-* Tables written by Databricks Runtime 7.3 LTS, 9.1 LTS, 10.4 LTS and 11.3 LTS are supported.
-* Deployments using AWS, HDFS, Azure Storage, and Google Cloud Storage (GCS) are
-  fully supported.
-* Network access from the coordinator and workers to the Delta Lake storage.
-* Access to the Hive metastore service (HMS) of Delta Lake or a separate HMS.
-* Network access to the HMS from the coordinator and workers. Port 9083 is the
-  default port for the Thrift protocol used by the HMS.
-
-General configuration
----------------------
-
-The connector requires a Hive metastore for table metadata and supports the same
-metastore configuration properties as the :doc:`Hive connector
-</connector/hive>`. At a minimum, ``hive.metastore.uri`` must be configured.
-
-The connector recognizes Delta tables created in the metastore by the Databricks
-runtime. If non-Delta tables are present in the metastore, as well, they are not
-visible to the connector.
-
-To configure the Delta Lake connector, create a catalog properties file
-``etc/catalog/example.properties`` that references the ``delta_lake``
-connector. Update the ``hive.metastore.uri`` with the URI of your Hive metastore
-Thrift service:
-
-.. code-block:: properties
-
-    connector.name=delta_lake
-    hive.metastore.uri=thrift://example.net:9083
-
-If you are using AWS Glue as Hive metastore, you can simply set the metastore to
-``glue``:
-
-.. code-block:: properties
-
-    connector.name=delta_lake
-    hive.metastore=glue
-
-The Delta Lake connector reuses certain functionalities from the Hive connector,
-including the metastore :ref:`Thrift <hive-thrift-metastore>` and :ref:`Glue
-<hive-glue-metastore>` configuration, detailed in the :doc:`Hive connector
-documentation </connector/hive>`.
-
-To configure access to S3 and S3-compatible storage, Azure storage, and others,
-consult the appropriate section of the Hive documentation.
-
-* :doc:`Amazon S3 </connector/hive-s3>`
-* :doc:`Azure storage documentation </connector/hive-azure>`
-* :ref:`GCS <hive-google-cloud-storage-configuration>`
-
-Delta lake general configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following configuration properties are all using reasonable, tested default
-values. Typical usage does not require you to configure them.
-
-.. list-table:: Delta Lake configuration properties
-    :widths: 30, 55, 15
-    :header-rows: 1
-
-    * - Property name
-      - Description
-      - Default
-    * - ``delta.metadata.cache-ttl``
-      - Frequency of checks for metadata updates, equivalent to transactions, to
-        update the metadata cache specified in :ref:`prop-type-duration`.
-      - ``5m``
-    * - ``delta.metadata.cache-size``
-      - The maximum number of Delta table metadata entries to cache.
-      - 1000
-    * - ``delta.metadata.live-files.cache-size``
-      - Amount of memory allocated for caching information about files. Must
-        be specified in :ref:`prop-type-data-size` values such as ``64MB``.
-        Default is calculated to 10% of the maximum memory allocated to the JVM.
-      -
-    * - ``delta.metadata.live-files.cache-ttl``
-      - Caching duration for active files which correspond to the Delta Lake
-        tables.
-      - ``30m``
-    * - ``delta.compression-codec``
-      - The compression codec to be used when writing new data files.
-        Possible values are
-
-        * ``NONE``
-        * ``SNAPPY``
-        * ``ZSTD``
-        * ``GZIP``
-      - ``SNAPPY``
-    * - ``delta.max-partitions-per-writer``
-      - Maximum number of partitions per writer.
-      - 100
-    * - ``delta.hide-non-delta-lake-tables``
-      - Hide information about tables that are not managed by Delta Lake. Hiding
-        only applies to tables with the metadata managed in a Glue catalog, does
-        not apply to usage with a Hive metastore service.
-      - ``false``
-    * - ``delta.enable-non-concurrent-writes``
-      - Enable :ref:`write support <delta-lake-data-management>` for all
-        supported file systems, specifically take note of the warning about
-        concurrency and checkpoints.
-      - ``false``
-    * - ``delta.default-checkpoint-writing-interval``
-      - Default integer count to write transaction log checkpoint entries. If
-        the value is set to N, then checkpoints are written after every Nth
-        statement performing table writes. The value can be overridden for a
-        specific table with the ``checkpoint_interval`` table property.
-      - 10
-    * - ``delta.hive-catalog-name``
-      - Name of the catalog to which ``SELECT`` queries are redirected when a
-        Hive table is detected.
-      -
-    * - ``delta.checkpoint-row-statistics-writing.enabled``
-      - Enable writing row statistics to checkpoint files.
-      - ``true``
-    * - ``delta.dynamic-filtering.wait-timeout``
-      - Duration to wait for completion of :doc:`dynamic filtering
-        </admin/dynamic-filtering>` during split generation.
-      -
-    * - ``delta.table-statistics-enabled``
-      - Enables :ref:`Table statistics <delta-lake-table-statistics>` for
-        performance improvements.
-      - ``true``
-    * - ``delta.per-transaction-metastore-cache-maximum-size``
-      - Maximum number of metastore data objects per transaction in
-        the Hive metastore cache.
-      - ``1000``
-    * - ``delta.delete-schema-locations-fallback``
-      - Whether schema locations are deleted when Trino can't
-        determine whether they contain external files.
-      - ``false``
-    * - ``delta.parquet.time-zone``
-      - Time zone for Parquet read and write.
-      - JVM default
-    * - ``delta.target-max-file-size``
-      - Target maximum size of written files; the actual size may be larger.
-      - ``1GB``
-    * - ``delta.unique-table-location``
-      - Use randomized, unique table locations.
-      - ``true``
-    * - ``delta.register-table-procedure.enabled``
-      - Enable to allow users to call the ``register_table`` procedure
-      - ``false``
-
-Catalog session properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following table describes :ref:`catalog session properties
-<session-properties-definition>` supported by the Delta Lake connector to
-configure processing of Parquet files.
-
-.. list-table:: Parquet catalog session properties
-    :widths: 40, 60, 20
-    :header-rows: 1
-
-    * - Property name
-      - Description
-      - Default
-    * - ``parquet_optimized_reader_enabled``
-      - Whether batched column readers are used when reading Parquet files
-        for improved performance.
-      - ``true``
-    * - ``parquet_max_read_block_size``
-      - The maximum block size used when reading Parquet files.
-      - ``16MB``
-    * - ``parquet_writer_block_size``
-      - The maximum block size created by the Parquet writer.
-      - ``128MB``
-    * - ``parquet_writer_page_size``
-      - The maximum page size created by the Parquet writer.
-      - ``1MB``
-    * - ``parquet_writer_batch_size``
-      - Maximum number of rows processed by the parquet writer in a batch.
-      - ``10000``
-
-.. _delta-lake-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and Delta Lake each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-See the `Delta Transaction Log specification
-<https://github.com/delta-io/delta/blob/master/PROTOCOL.md#primitive-types>`_
-for more information about supported data types in the Delta Lake table format
-specification.
-
-Delta Lake to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Delta Lake types to the corresponding Trino types following
-this table:
-
-.. list-table:: Delta Lake to Trino type mapping
-  :widths: 40, 60
-  :header-rows: 1
-
-  * - Delta Lake type
-    - Trino type
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-  * - ``INTEGER``
-    - ``INTEGER``
-  * - ``BYTE``
-    - ``TINYINT``
-  * - ``SHORT``
-    - ``SMALLINT``
-  * - ``LONG``
-    - ``BIGINT``
-  * - ``FLOAT``
-    - ``REAL``
-  * - ``DOUBLE``
-    - ``DOUBLE``
-  * - ``DECIMAL(p,s)``
-    - ``DECIMAL(p,s)``
-  * - ``STRING``
-    - ``VARCHAR``
-  * - ``BINARY``
-    - ``VARBINARY``
-  * - ``DATE``
-    - ``DATE``
-  * - ``TIMESTAMP``
-    - ``TIMESTAMP(3) WITH TIME ZONE``
-  * - ``ARRAY``
-    - ``ARRAY``
-  * - ``MAP``
-    - ``MAP``
-  * - ``STRUCT(...)``
-    - ``ROW(...)``
-
-No other types are supported.
-
-Trino to Delta Lake type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding Delta Lake types following
-this table:
-
-.. list-table:: Trino to Delta Lake type mapping
-  :widths: 60, 40
-  :header-rows: 1
-
-  * - Trino type
-    - Delta Lake type
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-  * - ``INTEGER``
-    - ``INTEGER``
-  * - ``TINYINT``
-    - ``BYTE``
-  * - ``SMALLINT``
-    - ``SHORT``
-  * - ``BIGINT``
-    - ``LONG``
-  * - ``REAL``
-    - ``FLOAT``
-  * - ``DOUBLE``
-    - ``DOUBLE``
-  * - ``DECIMAL(p,s)``
-    - ``DECIMAL(p,s)``
-  * - ``VARCHAR``
-    - ``STRING``
-  * - ``VARBINARY``
-    - ``BINARY``
-  * - ``DATE``
-    - ``DATE``
-  * - ``TIMESTAMP(3) WITH TIME ZONE``
-    - ``TIMESTAMP``
-  * - ``ARRAY``
-    - ``ARRAY``
-  * - ``MAP``
-    - ``MAP``
-  * - ``ROW(...)``
-    - ``STRUCT(...)``
-
-No other types are supported.
-
-Security
---------
-
-The Delta Lake connector allows you to choose one of several means of providing 
-autorization at the catalog level. You can select a different type of 
-authorization check in different Delta Lake catalog files.
-
-.. _delta-lake-authorization:
-
-Authorization checks
-^^^^^^^^^^^^^^^^^^^^
-
-You can enable authorization checks for the connector by setting
-the ``delta.security`` property in the catalog properties file. This
-property must be one of the following values:
-
-.. list-table:: Delta Lake security values
-  :widths: 30, 60
-  :header-rows: 1
-
-  * - Property value
-    - Description
-  * - ``ALLOW_ALL`` (default value)
-    - No authorization checks are enforced.
-  * - ``SYSTEM``
-    - The connector relies on system-level access control.
-  * - ``READ_ONLY``
-    - Operations that read data or metadata, such as :doc:`/sql/select` are
-      permitted. No operations that write data or metadata, such as
-      :doc:`/sql/create-table`, :doc:`/sql/insert`, or :doc:`/sql/delete` are
-      allowed.
-  * - ``FILE``
-    - Authorization checks are enforced using a catalog-level access control
-      configuration file whose path is specified in the ``security.config-file``
-      catalog configuration property. See
-      :ref:`catalog-file-based-access-control` for information on the
-      authorization configuration file.
-
-.. _delta-lake-sql-support:
-
-SQL support
------------
-
-The connector provides read and write access to data and metadata in
-Delta Lake. In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :ref:`sql-data-management`, see also :ref:`delta-lake-data-management`
-* :ref:`sql-view-management`
-* :doc:`/sql/create-schema`, see also :ref:`delta-lake-sql-basic-usage`
-* :doc:`/sql/create-table`, see also :ref:`delta-lake-sql-basic-usage`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/alter-table`
-* :doc:`/sql/drop-schema`
-* :doc:`/sql/show-create-schema`
-* :doc:`/sql/show-create-table`
-* :doc:`/sql/comment`
-
-.. _delta-lake-sql-basic-usage:
-
-Basic usage examples
-^^^^^^^^^^^^^^^^^^^^
-
-The connector supports creating schemas. You can create a schema with or without
-a specified location.
-
-You can create a schema with the :doc:`/sql/create-schema` statement and the
-``location`` schema property. Tables in this schema are located in a
-subdirectory under the schema location. Data files for tables in this schema
-using the default location are cleaned up if the table is dropped::
-
-  CREATE SCHEMA example.example_schema
-  WITH (location = 's3://my-bucket/a/path');
-
-Optionally, the location can be omitted. Tables in this schema must have a
-location included when you create them. The data files for these tables are not
-removed if the table is dropped::
-
-  CREATE SCHEMA example.example_schema;
-
-
-When Delta tables exist in storage, but not in the metastore, Trino can be used
-to register them::
-
-  CREATE TABLE example.default.example_table (
-    dummy bigint
-  )
-  WITH (
-    location = '...'
-  )
-
-Columns listed in the DDL, such as ``dummy`` in the preceeding example, are
-ignored. The table schema is read from the transaction log, instead. If the
-schema is changed by an external system, Trino automatically uses the new
-schema.
-
-.. warning::
-
-   Using ``CREATE TABLE`` with an existing table content is deprecated, instead use the
-   ``system.register_table`` procedure. The ``CREATE TABLE ... WITH (location=...)``
-   syntax can be temporarily re-enabled using the ``delta.legacy-create-table-with-existing-location.enabled``
-   config property or ``legacy_create_table_with_existing_location_enabled`` session property.
-
-If the specified location does not already contain a Delta table, the connector
-automatically writes the initial transaction log entries and registers the table
-in the metastore. As a result, any Databricks engine can write to the table::
-
-   CREATE TABLE example.default.new_table (id bigint, address varchar);
-
-The Delta Lake connector also supports creating tables using the :doc:`CREATE
-TABLE AS </sql/create-table-as>` syntax.
-
-Procedures
-^^^^^^^^^^
-
-Use the :doc:`/sql/call` statement to perform data manipulation or
-administrative tasks. Procedures are available in the system schema of each
-catalog. The following code snippet displays how to call the
-``example_procedure`` in the ``examplecatalog`` catalog::
-
-    CALL examplecatalog.system.example_procedure()
-
-.. _delta-lake-register-table:
-
-Register table
-""""""""""""""
-
-The connector can register table into the metastore with existing transaction logs and data files.
-
-The ``system.register_table`` procedure allows the caller to register an existing delta lake
-table in the metastore, using its existing transaction logs and data files::
-
-    CALL example.system.register_table(schema_name => 'testdb', table_name => 'customer_orders', table_location => 's3://my-bucket/a/path')
-
-To prevent unauthorized users from accessing data, this procedure is disabled by default.
-The procedure is enabled only when ``delta.register-table-procedure.enabled`` is set to ``true``.
-
-.. _delta-lake-unregister-table:
-
-Unregister table
-""""""""""""""""
-The connector can unregister existing Delta Lake tables from the metastore.
-
-The procedure ``system.unregister_table`` allows the caller to unregister an
-existing Delta Lake table from the metastores without deleting the data::
-
-    CALL example.system.unregister_table(schema_name => 'testdb', table_name => 'customer_orders')
-
-.. _delta-lake-flush-metadata-cache:
-
-Flush metadata cache
-""""""""""""""""""""
-
-* ``system.flush_metadata_cache()``
-
-  Flush all metadata caches.
-
-* ``system.flush_metadata_cache(schema_name => ..., table_name => ...)``
-
-  Flush metadata caches entries connected with selected table.
-  Procedure requires named parameters to be passed
-
-.. _delta-lake-write-support:
-
-Updating data
-"""""""""""""
-
-You can use the connector to :doc:`/sql/insert`, :doc:`/sql/delete`,
-:doc:`/sql/update`, and :doc:`/sql/merge` data in Delta Lake tables.
-
-Write operations are supported for tables stored on the following systems:
-
-* Azure ADLS Gen2, Google Cloud Storage
-
-  Writes to the Azure ADLS Gen2 and Google Cloud Storage are
-  enabled by default. Trino detects write collisions on these storage systems
-  when writing from multiple Trino clusters, or from other query engines.
-
-* S3 and S3-compatible storage
-
-  Writes to :doc:`Amazon S3 <hive-s3>` and S3-compatible storage must be enabled
-  with the ``delta.enable-non-concurrent-writes`` property. Writes to S3 can
-  safely be made from multiple Trino clusters, however write collisions are not
-  detected when writing concurrently from other Delta Lake engines. You need to
-  make sure that no concurrent data modifications are run to avoid data
-  corruption.
-
-.. _delta-lake-vacuum:
-
-``VACUUM``
-""""""""""
-
-The ``VACUUM`` procedure removes all old files that are not in the transaction
-log, as well as files that are not needed to read table snapshots newer than the
-current time minus the retention period defined by the ``retention period``
-parameter.
-
-Users with ``INSERT`` and ``DELETE`` permissions on a table can run ``VACUUM``
-as follows:
-
-.. code-block:: shell
-
-  CALL example.system.vacuum('exampleschemaname', 'exampletablename', '7d');
-
-All parameters are required, and must be presented in the following order:
-
-* Schema name
-* Table name
-* Retention period
-
-The ``delta.vacuum.min-retention`` config property provides a safety
-measure to ensure that files are retained as expected.  The minimum value for
-this property is ``0s``. There is a minimum retention session property as well,
-``vacuum_min_retention``.
-
-.. _delta-lake-data-management:
-
-Data management
-^^^^^^^^^^^^^^^
-
-You can use the connector to :doc:`/sql/insert`, :doc:`/sql/delete`,
-:doc:`/sql/update`, and :doc:`/sql/merge` data in Delta Lake tables.
-
-Write operations are supported for tables stored on the following systems:
-
-* Azure ADLS Gen2, Google Cloud Storage
-
-  Writes to the Azure ADLS Gen2 and Google Cloud Storage are
-  enabled by default. Trino detects write collisions on these storage systems
-  when writing from multiple Trino clusters, or from other query engines.
-
-* S3 and S3-compatible storage
-
-  Writes to :doc:`Amazon S3 <hive-s3>` and S3-compatible storage must be enabled
-  with the ``delta.enable-non-concurrent-writes`` property. Writes to S3 can
-  safely be made from multiple Trino clusters, however write collisions are not
-  detected when writing concurrently from other Delta Lake engines. You must
-  make sure that no concurrent data modifications are run to avoid data
-  corruption.
-
-Schema and table management
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The :ref:`sql-schema-table-management` functionality includes support for:
-
-* :doc:`/sql/create-schema`
-* :doc:`/sql/drop-schema`
-* :doc:`/sql/alter-schema`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/alter-table`
-* :doc:`/sql/comment`
-
-.. _delta-lake-alter-table-execute:
-
-ALTER TABLE EXECUTE
-"""""""""""""""""""
-
-The connector supports the following commands for use with
-:ref:`ALTER TABLE EXECUTE <alter-table-execute>`.
-
-optimize
-~~~~~~~~
-
-The ``optimize`` command is used for rewriting the content
-of the specified table so that it is merged into fewer but larger files.
-In case that the table is partitioned, the data compaction
-acts separately on each partition selected for optimization.
-This operation improves read performance.
-
-All files with a size below the optional ``file_size_threshold``
-parameter (default value for the threshold is ``100MB``) are
-merged:
-
-.. code-block:: sql
-
-    ALTER TABLE test_table EXECUTE optimize
-
-The following statement merges files in a table that are
-under 10 megabytes in size:
-
-.. code-block:: sql
-
-    ALTER TABLE test_table EXECUTE optimize(file_size_threshold => '10MB')
-
-You can use a ``WHERE`` clause with the columns used to partition the table,
-to filter which partitions are optimized:
-
-.. code-block:: sql
-
-    ALTER TABLE test_partitioned_table EXECUTE optimize
-    WHERE partition_key = 1
-
-Table properties
-""""""""""""""""
-The following properties are available for use:
-
-.. list-table:: Delta Lake table properties
-  :widths: 40, 60
-  :header-rows: 1
-
-  * - Property name
-    - Description
-  * - ``location``
-    - File system location URI for the table.
-  * - ``partitioned_by``
-    - Set partition columns.
-  * - ``checkpoint_interval``
-    - Set the checkpoint interval in seconds.
-  * - ``change_data_feed_enabled``
-    - Enables storing change data feed entries.
-
-The following example uses all available table properties::
-
-  CREATE TABLE example.default.example_partitioned_table
-  WITH (
-    location = 's3://my-bucket/a/path',
-    partitioned_by = ARRAY['regionkey'],
-    checkpoint_interval = 5,
-    change_data_feed_enabled = true
-  )
-  AS SELECT name, comment, regionkey FROM tpch.tiny.nation;
-
-Metadata tables
-"""""""""""""""
-
-The connector exposes several metadata tables for each Delta Lake table.
-These metadata tables contain information about the internal structure
-of the Delta Lake table. You can query each metadata table by appending the
-metadata table name to the table name::
-
-   SELECT * FROM "test_table$data"
-
-``$data`` table
-~~~~~~~~~~~~~~~
-
-The ``$data`` table is an alias for the Delta Lake table itself.
-
-The statement::
-
-    SELECT * FROM "test_table$data"
-
-is equivalent to::
-
-    SELECT * FROM test_table
-
-``$history`` table
-~~~~~~~~~~~~~~~~~~
-
-The ``$history`` table provides a log of the metadata changes performed on
-the Delta Lake table.
-
-You can retrieve the changelog of the Delta Lake table ``test_table``
-by using the following query::
-
-    SELECT * FROM "test_table$history"
-
-.. code-block:: text
-
-     version |               timestamp               | user_id | user_name |  operation   |         operation_parameters          |                 cluster_id      | read_version |  isolation_level  | is_blind_append
-    ---------+---------------------------------------+---------+-----------+--------------+---------------------------------------+---------------------------------+--------------+-------------------+----------------
-           2 | 2023-01-19 07:40:54.684 Europe/Vienna | trino   | trino     | WRITE        | {queryId=20230119_064054_00008_4vq5t} | trino-406-trino-coordinator     |            2 | WriteSerializable | true
-           1 | 2023-01-19 07:40:41.373 Europe/Vienna | trino   | trino     | ADD COLUMNS  | {queryId=20230119_064041_00007_4vq5t} | trino-406-trino-coordinator     |            0 | WriteSerializable | true
-           0 | 2023-01-19 07:40:10.497 Europe/Vienna | trino   | trino     | CREATE TABLE | {queryId=20230119_064010_00005_4vq5t} | trino-406-trino-coordinator     |            0 | WriteSerializable | true
-
-The output of the query has the following columns:
-
-.. list-table:: History columns
-  :widths: 30, 30, 40
-  :header-rows: 1
-
-  * - Name
-    - Type
-    - Description
-  * - ``version``
-    - ``bigint``
-    - The version of the table corresponding to the operation
-  * - ``timestamp``
-    - ``timestamp(3) with time zone``
-    - The time when the table version became active
-  * - ``user_id``
-    - ``varchar``
-    - The identifier for the user which performed the operation
-  * - ``user_name``
-    - ``varchar``
-    - The username for the user which performed the operation
-  * - ``operation``
-    - ``varchar``
-    - The name of the operation performed on the table
-  * - ``operation_parameters``
-    - ``map(varchar, varchar)``
-    - Parameters of the operation
-  * - ``cluster_id``
-    - ``varchar``
-    - The ID of the cluster which ran the operation
-  * - ``read_version``
-    - ``bigint``
-    - The version of the table which was read in order to perform the operation
-  * - ``isolation_level``
-    - ``varchar``
-    - The level of isolation used to perform the operation
-  * - ``is_blind_append``
-    - ``boolean``
-    - Whether or not the operation appended data
-
-.. _delta-lake-special-columns:
-
-Metadata columns
-""""""""""""""""
-
-In addition to the defined columns, the Delta Lake connector automatically
-exposes metadata in a number of hidden columns in each table. You can use these
-columns in your SQL statements like any other column, e.g., they can be selected
-directly or used in conditional statements.
-
-* ``$path``
-    Full file system path name of the file for this row.
-
-* ``$file_modified_time``
-    Date and time of the last modification of the file for this row.
-
-* ``$file_size``
-    Size of the file for this row.
-
-Performance
------------
-
-The connector includes a number of performance improvements, detailed in the
-following sections:
-
-* Support for :doc:`write partitioning </admin/properties-write-partitioning>`.
-
-.. _delta-lake-table-statistics:
-
-Table statistics
-^^^^^^^^^^^^^^^^
-
-You can use :doc:`/sql/analyze` statements in Trino to populate the table
-statistics in Delta Lake. Data size and number of distinct values (NDV)
-statistics are supported, while Minimum value, maximum value, and null value
-count statistics are not supported. The :doc:`cost-based optimizer
-</optimizer/cost-based-optimizations>` then uses these statistics to improve
-query performance.
-
-Extended statistics enable a broader set of optimizations, including join
-reordering. The controlling catalog property ``delta.table-statistics-enabled``
-is enabled by default. The equivalent :ref:`catalog session property
-<session-properties-definition>` is ``statistics_enabled``.
-
-Each ``ANALYZE`` statement updates the table statistics incrementally, so only
-the data changed since the last ``ANALYZE`` is counted. The table statistics are
-not automatically updated by write operations such as ``INSERT``, ``UPDATE``,
-and ``DELETE``. You must manually run ``ANALYZE`` again to update the table
-statistics.
-
-To collect statistics for a table, execute the following statement::
-
-  ANALYZE table_schema.table_name;
-
-To gain the most benefit from cost-based optimizations, run periodic ``ANALYZE``
-statements on every large table that is frequently queried.
-
-Fine tuning
-"""""""""""
-
-The ``files_modified_after`` property is useful if you want to run the
-``ANALYZE`` statement on a table that was previously analyzed. You can use it to
-limit the amount of data used to generate the table statistics:
-
-.. code-block:: SQL
-
-  ANALYZE example_table WITH(files_modified_after = TIMESTAMP '2021-08-23
-  16:43:01.321 Z')
-
-As a result, only files newer than the specified time stamp are used in the
-analysis.
-
-You can also specify a set or subset of columns to analyze using the ``columns``
-property:
-
-.. code-block:: SQL
-
-  ANALYZE example_table WITH(columns = ARRAY['nationkey', 'regionkey'])
-
-To run ``ANALYZE`` with ``columns`` more than once, the next ``ANALYZE`` must
-run on the same set or a subset of the original columns used.
-
-To broaden the set of ``columns``, drop the statistics and reanalyze the table.
-
-Disable and drop extended statistics
-""""""""""""""""""""""""""""""""""""
-
-You can disable extended statistics with the catalog configuration property
-``delta.extended-statistics.enabled`` set to ``false``. Alternatively, you can
-disable it for a session, with the :doc:`catalog session property
-</sql/set-session>` ``extended_statistics_enabled`` set to ``false``.
-
-If a table is changed with many delete and update operation, calling ``ANALYZE``
-does not result in accurate statistics. To correct the statistics you have to
-drop the extended stats and analyze table again.
-
-Use the ``system.drop_extended_stats`` procedure in the catalog to drop the
-extended statistics for a specified table in a specified schema:
-
-.. code-block::
-
-  CALL example.system.drop_extended_stats('example_schema', 'example_table')
-
-Memory usage
-^^^^^^^^^^^^
-
-The Delta Lake connector is memory intensive and the amount of required memory
-grows with the size of Delta Lake transaction logs of any accessed tables. It is
-important to take that into account when provisioning the coordinator.
-
-You must decrease memory usage by keeping the number of active data files in
-table low by running ``OPTIMIZE`` and ``VACUUM`` in Delta Lake regularly.
-
-Memory monitoring
-"""""""""""""""""
-
-When using the Delta Lake connector you must monitor memory usage on the
-coordinator. Specifically monitor JVM heap utilization using standard tools as
-part of routine operation of the cluster.
-
-A good proxy for memory usage is the cache utilization of Delta Lake caches. It
-is exposed by the connector with the
-``plugin.deltalake.transactionlog:name=<catalog-name>,type=transactionlogaccess``
-JMX bean.
-
-You can access it with any standard monitoring software with JMX support, or use
-the :doc:`/connector/jmx` with the following query::
-
-  SELECT * FROM jmx.current."*.plugin.deltalake.transactionlog:name=<catalog-name>,type=transactionlogaccess"
-
-Following is an example result:
-
-.. code-block:: text
-
-  datafilemetadatacachestats.hitrate      | 0.97
-  datafilemetadatacachestats.missrate     | 0.03
-  datafilemetadatacachestats.requestcount | 3232
-  metadatacachestats.hitrate              | 0.98
-  metadatacachestats.missrate             | 0.02
-  metadatacachestats.requestcount         | 6783
-  node                                    | trino-master
-  object_name                             | io.trino.plugin.deltalake.transactionlog:type=TransactionLogAccess,name=delta
-
-In a healthy system both ``datafilemetadatacachestats.hitrate`` and
-``metadatacachestats.hitrate`` are close to ``1.0``.
-
-.. _delta-lake-table-redirection:
-
-Table redirection
-^^^^^^^^^^^^^^^^^
-
-.. include:: table-redirection.fragment
-
-The connector supports redirection from Delta Lake tables to Hive tables
-with the ``delta.hive-catalog-name`` catalog configuration property.
-
-Performance tuning configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following table describes performance tuning catalog properties for the
-connector.
-
-.. warning::
-
-   Performance tuning configuration properties are considered expert-level
-   features. Altering these properties from their default values is likely to
-   cause instability and performance degradation. We strongly suggest that
-   you use them only to address non-trivial performance issues, and that you
-   keep a backup of the original values if you change them.
-
-.. list-table:: Delta Lake performance tuning configuration properties
-    :widths: 30, 50, 20
-    :header-rows: 1
-
-    * - Property name
-      - Description
-      - Default
-    * - ``delta.domain-compaction-threshold``
-      - Minimum size of query predicates above which Trino compacts the predicates.
-        Pushing a large list of predicates down to the data source can
-        compromise performance. For optimization in that situation, Trino can
-        compact the large predicates. If necessary, adjust the threshold to
-        ensure a balance between performance and predicate pushdown.
-      - 100
-    * - ``delta.max-outstanding-splits``
-      - The target number of buffered splits for each table scan in a query,
-        before the scheduler tries to pause.
-      - 1000
-    * - ``delta.max-splits-per-second``
-      - Sets the maximum number of splits used per second to access underlying
-        storage. Reduce this number if your limit is routinely exceeded, based
-        on your filesystem limits. This is set to the absolute maximum value,
-        which results in Trino maximizing the parallelization of data access
-        by default. Attempting to set it higher results in Trino not being
-        able to start.
-      - Integer.MAX_VALUE
-    * - ``delta.max-initial-splits``
-      - For each query, the coordinator assigns file sections to read first
-        at the ``initial-split-size`` until the ``max-initial-splits`` is
-        reached. Then, it starts issuing reads of the ``max-split-size`` size.
-      - 200
-    * - ``delta.max-initial-split-size``
-      - Sets the initial :ref:`prop-type-data-size` for a single read section
-        assigned to a worker until ``max-initial-splits`` have been processed.
-        You can also use the corresponding catalog session property
-        ``<catalog-name>.max_initial_split_size``.
-      - ``32MB``
-    * - ``delta.max-split-size``
-      - Sets the largest :ref:`prop-type-data-size` for a single read section
-        assigned to a worker after max-initial-splits have been processed. You
-        can also use the corresponding catalog session property
-        ``<catalog-name>.max_split_size``.
-      - ``64MB``
-    * - ``delta.minimum-assigned-split-weight``
-      - A decimal value in the range (0, 1] used as a minimum for weights assigned to each split. A low value may improve performance
-        on tables with small files. A higher value may improve performance for queries with highly skewed aggregations or joins.
-      - 0.05
-    * - ``parquet.max-read-block-row-count``
-      - Sets the maximum number of rows read in a batch.
-      - ``8192``
-    * - ``parquet.optimized-reader.enabled``
-      - Whether batched column readers are used when reading Parquet files
-        for improved performance. Set this property to ``false`` to disable the
-        optimized parquet reader by default. The equivalent catalog session
-        property is ``parquet_optimized_reader_enabled``.
-      - ``true``
-    * - ``parquet.optimized-nested-reader.enabled``
-      - Whether batched column readers are used when reading ARRAY, MAP
-        and ROW types from Parquet files for improved performance. Set this
-        property to ``false`` to disable the optimized parquet reader by default
-        for structural data types. The equivalent catalog session property is
-        ``parquet_optimized_nested_reader_enabled``.
-      - ``true``
\ No newline at end of file
diff --git a/docs/src/main/sphinx/connector/druid.md b/docs/src/main/sphinx/connector/druid.md
new file mode 100644
index 000000000000..a01f3b612611
--- /dev/null
+++ b/docs/src/main/sphinx/connector/druid.md
@@ -0,0 +1,167 @@
+---
+myst:
+  substitutions:
+      default_domain_compaction_threshold: '`32`'
+---
+
+# Druid connector
+
+```{raw} html
+<img src="../_static/img/druid.png" class="connector-logo">
+```
+
+The Druid connector allows querying an [Apache Druid](https://druid.apache.org/)
+database from Trino.
+
+## Requirements
+
+To connect to Druid, you need:
+
+- Druid version 0.18.0 or higher.
+- Network access from the Trino coordinator and workers to your Druid broker.
+  Port 8082 is the default port.
+
+## Configuration
+
+Create a catalog properties file that specifies the Druid connector by setting
+the `connector.name` to `druid` and configuring the `connection-url` with
+the JDBC string to connect to Druid.
+
+For example, to access a database as `example`, create the file
+`etc/catalog/example.properties`. Replace `BROKER:8082` with the correct
+host and port of your Druid broker.
+
+```properties
+connector.name=druid
+connection-url=jdbc:avatica:remote:url=http://BROKER:8082/druid/v2/sql/avatica/
+```
+
+You can add authentication details to connect to a Druid deployment that is
+secured by basic authentication by updating the URL and adding credentials:
+
+```properties
+connection-url=jdbc:avatica:remote:url=http://BROKER:port/druid/v2/sql/avatica/;authentication=BASIC
+connection-user=root
+connection-password=secret
+```
+
+Now you can access your Druid database in Trino with the `example` catalog
+name from the properties file.
+
+The `connection-user` and `connection-password` are typically required and
+determine the user credentials for the connection, often a service user. You can
+use {doc}`secrets </security/secrets>` to avoid actual values in the catalog
+properties files.
+
+```{include} jdbc-authentication.fragment
+```
+
+```{include} jdbc-common-configurations.fragment
+```
+
+```{include} query-comment-format.fragment
+```
+
+```{include} jdbc-domain-compaction-threshold.fragment
+```
+
+```{include} jdbc-procedures.fragment
+```
+
+```{include} jdbc-case-insensitive-matching.fragment
+```
+
+(druid-type-mapping)=
+
+## Type mapping
+
+Because Trino and Druid each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading data.
+
+### Druid type to Trino type mapping
+
+The connector maps Druid types to the corresponding Trino types according to the
+following table:
+
+```{eval-rst}
+.. list-table:: Druid type to Trino type mapping
+  :widths: 30, 30, 50
+  :header-rows: 1
+
+  * - Druid type
+    - Trino type
+    - Notes
+  * - ``STRING``
+    - ``VARCHAR``
+    -
+  * - ``FLOAT``
+    - ``REAL``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``LONG``
+    - ``BIGINT``
+    - Except for the special ``_time`` column, which is mapped to ``TIMESTAMP``.
+  * - ``TIMESTAMP``
+    - ``TIMESTAMP``
+    - Only applicable to the special ``_time`` column.
+```
+
+No other data types are supported.
+
+Druid does not have a real `NULL` value for any data type. By
+default, Druid treats `NULL` as the default value for a data type. For
+example, `LONG` would be `0`, `DOUBLE` would be `0.0`, `STRING` would
+be an empty string `''`, and so forth.
+
+```{include} jdbc-type-mapping.fragment
+```
+
+(druid-sql-support)=
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements to access data and
+metadata in the Druid database.
+
+## Table functions
+
+The connector provides specific {doc}`table functions </functions/table>` to
+access Druid.
+
+(druid-query-function)=
+
+### `query(varchar) -> table`
+
+The `query` function allows you to query the underlying database directly. It
+requires syntax native to Druid, because the full query is pushed down and
+processed in Druid. This can be useful for accessing native features which are
+not available in Trino or for improving query performance in situations where
+running a query natively may be faster.
+
+```{include} query-passthrough-warning.fragment
+```
+
+As an example, query the `example` catalog and use `STRING_TO_MV` and
+`MV_LENGTH` from [Druid SQL's multi-value string functions](https://druid.apache.org/docs/latest/querying/sql-multivalue-string-functions.html)
+to split and then count the number of comma-separated values in a column:
+
+```
+SELECT
+  num_reports
+FROM
+  TABLE(
+    example.system.query(
+      query => 'SELECT
+        MV_LENGTH(
+          STRING_TO_MV(direct_reports, ",")
+        ) AS num_reports
+      FROM company.managers'
+    )
+  );
+```
+
+```{include} query-table-function-ordering.fragment
+```
diff --git a/docs/src/main/sphinx/connector/druid.rst b/docs/src/main/sphinx/connector/druid.rst
deleted file mode 100644
index 1610074b6624..000000000000
--- a/docs/src/main/sphinx/connector/druid.rst
+++ /dev/null
@@ -1,156 +0,0 @@
-===============
-Druid connector
-===============
-
-.. raw:: html
-
-  <img src="../_static/img/druid.png" class="connector-logo">
-
-The Druid connector allows querying an `Apache Druid <https://druid.apache.org/>`_
-database from Trino.
-
-Requirements
-------------
-
-To connect to Druid, you need:
-
-* Druid version 0.18.0 or higher.
-* Network access from the Trino coordinator and workers to your Druid broker.
-  Port 8082 is the default port.
-
-Configuration
--------------
-
-Create a catalog properties file that specifies the Druid connector by setting
-the ``connector.name`` to ``druid`` and configuring the ``connection-url`` with
-the JDBC string to connect to Druid.
-
-For example, to access a database as ``example``, create the file
-``etc/catalog/example.properties``. Replace ``BROKER:8082`` with the correct
-host and port of your Druid broker.
-
-.. code-block:: properties
-
-    connector.name=druid
-    connection-url=jdbc:avatica:remote:url=http://BROKER:8082/druid/v2/sql/avatica/
-
-You can add authentication details to connect to a Druid deployment that is
-secured by basic authentication by updating the URL and adding credentials:
-
-.. code-block:: properties
-
-    connection-url=jdbc:avatica:remote:url=http://BROKER:port/druid/v2/sql/avatica/;authentication=BASIC
-    connection-user=root
-    connection-password=secret
-
-Now you can access your Druid database in Trino with the ``example`` catalog
-name from the properties file.
-
-The ``connection-user`` and ``connection-password`` are typically required and
-determine the user credentials for the connection, often a service user. You can
-use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
-properties files.
-
-.. include:: jdbc-authentication.fragment
-
-.. include:: jdbc-common-configurations.fragment
-
-.. |default_domain_compaction_threshold| replace:: ``32``
-.. include:: jdbc-domain-compaction-threshold.fragment
-
-.. include:: jdbc-procedures.fragment
-
-.. include:: jdbc-case-insensitive-matching.fragment
-
-.. _druid-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and Druid each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading data.
-
-Druid type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Druid types to the corresponding Trino types according to the
-following table:
-
-.. list-table:: Druid type to Trino type mapping
-  :widths: 30, 30, 50
-  :header-rows: 1
-
-  * - Druid type
-    - Trino type
-    - Notes
-  * - ``STRING``
-    - ``VARCHAR``
-    -
-  * - ``FLOAT``
-    - ``REAL``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``LONG``
-    - ``BIGINT``
-    - Except for the special ``_time`` column, which is mapped to ``TIMESTAMP``.
-  * - ``TIMESTAMP``
-    - ``TIMESTAMP``
-    - Only applicable to the special ``_time`` column.
-
-No other data types are supported.
-
-Druid does not have a real ``NULL`` value for any data type. By
-default, Druid treats ``NULL`` as the default value for a data type. For
-example, ``LONG`` would be ``0``, ``DOUBLE`` would be ``0.0``, ``STRING`` would
-be an empty string ``''``, and so forth.
-
-.. include:: jdbc-type-mapping.fragment
-
-.. _druid-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access data and
-metadata in the Druid database.
-
-Table functions
----------------
-
-The connector provides specific :doc:`table functions </functions/table>` to
-access Druid.
-
-.. _druid-query-function:
-
-``query(varchar) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``query`` function allows you to query the underlying database directly. It
-requires syntax native to Druid, because the full query is pushed down and
-processed in Druid. This can be useful for accessing native features which are
-not available in Trino or for improving query performance in situations where
-running a query natively may be faster.
-
-.. include:: polymorphic-table-function-ordering.fragment
-
-As an example, query the ``example`` catalog and use ``STRING_TO_MV`` and
-``MV_LENGTH`` from `Druid SQL's multi-value string functions
-<https://druid.apache.org/docs/latest/querying/sql-multivalue-string-functions.html>`_
-to split and then count the number of comma-separated values in a column::
-
-    SELECT
-      num_reports
-    FROM
-      TABLE(
-        example.system.query(
-          query => 'SELECT
-            MV_LENGTH(
-              STRING_TO_MV(direct_reports, ",")
-            ) AS num_reports
-          FROM company.managers'
-        )
-      );
-
diff --git a/docs/src/main/sphinx/connector/elasticsearch.md b/docs/src/main/sphinx/connector/elasticsearch.md
new file mode 100644
index 000000000000..5ec58563f055
--- /dev/null
+++ b/docs/src/main/sphinx/connector/elasticsearch.md
@@ -0,0 +1,447 @@
+# Elasticsearch connector
+
+```{raw} html
+<img src="../_static/img/elasticsearch.png" class="connector-logo">
+```
+
+The Elasticsearch Connector allows access to [Elasticsearch](https://www.elastic.co/products/elasticsearch) data from Trino.
+This document describes how to setup the Elasticsearch Connector to run SQL queries against Elasticsearch.
+
+:::{note}
+Elasticsearch (6.6.0 or later) or OpenSearch (1.1.0 or later) is required.
+:::
+
+## Configuration
+
+To configure the Elasticsearch connector, create a catalog properties file
+`etc/catalog/example.properties` with the following contents, replacing the
+properties as appropriate for your setup:
+
+```text
+connector.name=elasticsearch
+elasticsearch.host=localhost
+elasticsearch.port=9200
+elasticsearch.default-schema-name=default
+```
+
+### Configuration properties
+
+```{eval-rst}
+.. list-table:: Elasticsearch configuration properties
+    :widths: 35, 55, 10
+    :header-rows: 1
+
+    * - Property name
+      - Description
+      - Default
+    * - ``elasticsearch.host``
+      - The comma-separated list of host names for the Elasticsearch node to
+        connect to. This property is required.
+      -
+    * - ``elasticsearch.port``
+      - Port of the Elasticsearch node to connect to.
+      - ``9200``
+    * - ``elasticsearch.default-schema-name``
+      - The schema that contains all tables defined without a qualifying schema
+        name.
+      - ``default``
+    * - ``elasticsearch.scroll-size``
+      - Sets the maximum number of hits that can be returned with each
+        Elasticsearch scroll request.
+      - ``1000``
+    * - ``elasticsearch.scroll-timeout``
+      - Amount of time Elasticsearch keeps the
+        `search context <https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-scroll.html#scroll-search-context>`_
+        alive for scroll requests.
+      - ``1m``
+    * - ``elasticsearch.request-timeout``
+      - Timeout value for all Elasticsearch requests.
+      - ``10s``
+    * - ``elasticsearch.connect-timeout``
+      - Timeout value for all Elasticsearch connection attempts.
+      - ``1s``
+    * - ``elasticsearch.backoff-init-delay``
+      - The minimum duration between backpressure retry attempts for a single
+        request to Elasticsearch. Setting it too low might overwhelm an already
+        struggling ES cluster.
+      - ``500ms``
+    * - ``elasticsearch.backoff-max-delay``
+      - The maximum duration between backpressure retry attempts for a single
+        request to Elasticsearch.
+      - ``20s``
+    * - ``elasticsearch.max-retry-time``
+      - The maximum duration across all retry attempts for a single request to
+        Elasticsearch.
+      - ``20s``
+    * - ``elasticsearch.node-refresh-interval``
+      - How often the list of available Elasticsearch nodes is refreshed.
+      - ``1m``
+    * - ``elasticsearch.ignore-publish-address``
+      - Disables using the address published by Elasticsearch to connect for
+        queries.
+      -
+```
+
+## TLS security
+
+The Elasticsearch connector provides additional security options to support
+Elasticsearch clusters that have been configured to use TLS.
+
+If your cluster has globally-trusted certificates, you should only need to
+enable TLS. If you require custom configuration for certificates, the connector
+supports key stores and trust stores in PEM or Java Key Store (JKS) format.
+
+The allowed configuration values are:
+
+```{eval-rst}
+.. list-table:: TLS Security Properties
+    :widths: 40, 60
+    :header-rows: 1
+
+    * - Property name
+      - Description
+    * - ``elasticsearch.tls.enabled``
+      - Enables TLS security.
+    * - ``elasticsearch.tls.keystore-path``
+      - The path to the :doc:`PEM </security/inspect-pem>` or
+        :doc:`JKS </security/inspect-jks>` key store.
+    * - ``elasticsearch.tls.truststore-path``
+      - The path to :doc:`PEM </security/inspect-pem>` or
+        :doc:`JKS </security/inspect-jks>` trust store.
+    * - ``elasticsearch.tls.keystore-password``
+      - The key password for the key store specified by
+        ``elasticsearch.tls.keystore-path``.
+    * - ``elasticsearch.tls.truststore-password``
+      - The key password for the trust store specified by
+        ``elasticsearch.tls.truststore-path``.
+```
+
+(elasticesearch-type-mapping)=
+
+## Type mapping
+
+Because Trino and Elasticsearch each support types that the other does not, this
+connector {ref}`maps some types <type-mapping-overview>` when reading data.
+
+### Elasticsearch type to Trino type mapping
+
+The connector maps Elasticsearch types to the corresponding Trino types
+according to the following table:
+
+```{eval-rst}
+.. list-table:: Elasticsearch type to Trino type mapping
+  :widths: 30, 30, 50
+  :header-rows: 1
+
+  * - Elasticsearch type
+    - Trino type
+    - Notes
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``FLOAT``
+    - ``REAL``
+    -
+  * - ``BYTE``
+    - ``TINYINT``
+    -
+  * - ``SHORT``
+    - ``SMALLINT``
+    -
+  * - ``INTEGER``
+    - ``INTEGER``
+    -
+  * - ``LONG``
+    - ``BIGINT``
+    -
+  * - ``KEYWORD``
+    - ``VARCHAR``
+    -
+  * - ``TEXT``
+    - ``VARCHAR``
+    -
+  * - ``DATE``
+    - ``TIMESTAMP``
+    - For more information, see :ref:`elasticsearch-date-types`.
+  * - ``IPADDRESS``
+    - ``IP``
+    -
+```
+
+No other types are supported.
+
+(elasticsearch-array-types)=
+
+### Array types
+
+Fields in Elasticsearch can contain [zero or more values](https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html)
+, but there is no dedicated array type. To indicate a field contains an array, it can be annotated in a Trino-specific structure in
+the [\_meta](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-meta-field.html) section of the index mapping.
+
+For example, you can have an Elasticsearch index that contains documents with the following structure:
+
+```json
+{
+    "array_string_field": ["trino","the","lean","machine-ohs"],
+    "long_field": 314159265359,
+    "id_field": "564e6982-88ee-4498-aa98-df9e3f6b6109",
+    "timestamp_field": "1987-09-17T06:22:48.000Z",
+    "object_field": {
+        "array_int_field": [86,75,309],
+        "int_field": 2
+    }
+}
+```
+
+The array fields of this structure can be defined by using the following command to add the field
+property definition to the `_meta.trino` property of the target index mapping.
+
+```shell
+curl --request PUT \
+    --url localhost:9200/doc/_mapping \
+    --header 'content-type: application/json' \
+    --data '
+{
+    "_meta": {
+        "trino":{
+            "array_string_field":{
+                "isArray":true
+            },
+            "object_field":{
+                "array_int_field":{
+                    "isArray":true
+                }
+            },
+        }
+    }
+}'
+```
+
+:::{note}
+It is not allowed to use `asRawJson` and `isArray` flags simultaneously for the same column.
+:::
+
+(elasticsearch-date-types)=
+
+### Date types
+
+Elasticsearch supports a wide array of [date] formats including
+[built-in date formats] and also [custom date formats].
+The Elasticsearch connector supports only the default `date` type. All other
+date formats including [built-in date formats] and [custom date formats] are
+not supported. Dates with the [format] property are ignored.
+
+### Raw JSON transform
+
+There are many occurrences where documents in Elasticsearch have more complex
+structures that are not represented in the mapping. For example, a single
+`keyword` field can have widely different content including a single
+`keyword` value, an array, or a multidimensional `keyword` array with any
+level of nesting.
+
+```shell
+curl --request PUT \
+    --url localhost:9200/doc/_mapping \
+    --header 'content-type: application/json' \
+    --data '
+{
+    "properties": {
+        "array_string_field":{
+            "type": "keyword"
+        }
+    }
+}'
+```
+
+Notice for the `array_string_field` that all the following documents are legal
+for Elasticsearch. See the [Elasticsearch array documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html)
+for more details.
+
+```json
+[
+    {
+        "array_string_field": "trino"
+    },
+    {
+        "array_string_field": ["trino","is","the","besto"]
+    },
+    {
+        "array_string_field": ["trino",["is","the","besto"]]
+    },
+    {
+        "array_string_field": ["trino",["is",["the","besto"]]]
+    }
+]
+```
+
+Further, Elasticsearch supports types, such as
+[dense_vector](https://www.elastic.co/guide/en/elasticsearch/reference/current/dense-vector.html),
+that are not supported in Trino. New types are constantly emerging which can
+cause parsing exceptions for users that use of these types in Elasticsearch. To
+manage all of these scenarios, you can transform fields to raw JSON by
+annotating it in a Trino-specific structure in the [\_meta](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-meta-field.html)
+section of the index mapping. This indicates to Trino that the field, and all
+nested fields beneath, need to be cast to a `VARCHAR` field that contains
+the raw JSON content. These fields can be defined by using the following command
+to add the field property definition to the `_meta.presto` property of the
+target index mapping.
+
+```shell
+curl --request PUT \
+    --url localhost:9200/doc/_mapping \
+    --header 'content-type: application/json' \
+    --data '
+{
+    "_meta": {
+        "presto":{
+            "array_string_field":{
+                "asRawJson":true
+            }
+        }
+    }
+}'
+```
+
+This preceding configurations causes Trino to return the `array_string_field`
+field as a `VARCHAR` containing raw JSON. You can parse these fields with the
+{doc}`built-in JSON functions </functions/json>`.
+
+:::{note}
+It is not allowed to use `asRawJson` and `isArray` flags simultaneously for the same column.
+:::
+
+## Special columns
+
+The following hidden columns are available:
+
+| Column   | Description                                            |
+| -------- | ------------------------------------------------------ |
+| \_id     | The Elasticsearch document ID                          |
+| \_score  | The document score returned by the Elasticsearch query |
+| \_source | The source of the original document                    |
+
+(elasticsearch-full-text-queries)=
+
+## Full text queries
+
+Trino SQL queries can be combined with Elasticsearch queries by providing the [full text query]
+as part of the table name, separated by a colon. For example:
+
+```sql
+SELECT * FROM "tweets: +trino SQL^2"
+```
+
+## Predicate push down
+
+The connector supports predicate push down of below data types:
+
+| Elasticsearch | Trino         | Supports      |
+| ------------- | ------------- | ------------- |
+| `binary`      | `VARBINARY`   | `NO`          |
+| `boolean`     | `BOOLEAN`     | `YES`         |
+| `double`      | `DOUBLE`      | `YES`         |
+| `float`       | `REAL`        | `YES`         |
+| `byte`        | `TINYINT`     | `YES`         |
+| `short`       | `SMALLINT`    | `YES`         |
+| `integer`     | `INTEGER`     | `YES`         |
+| `long`        | `BIGINT`      | `YES`         |
+| `keyword`     | `VARCHAR`     | `YES`         |
+| `text`        | `VARCHAR`     | `NO`          |
+| `date`        | `TIMESTAMP`   | `YES`         |
+| `ip`          | `IPADDRESS`   | `NO`          |
+| (all others)  | (unsupported) | (unsupported) |
+
+## AWS authorization
+
+To enable AWS authorization using IAM policies, the `elasticsearch.security` option needs to be set to `AWS`.
+Additionally, the following options need to be configured appropriately:
+
+| Property name                   | Description                                                                                                                                     |
+| ------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
+| `elasticsearch.aws.region`      | AWS region or the Elasticsearch endpoint. This option is required.                                                                              |
+| `elasticsearch.aws.access-key`  | AWS access key to use to connect to the Elasticsearch domain. If not set, the Default AWS Credentials Provider chain will be used.              |
+| `elasticsearch.aws.secret-key`  | AWS secret key to use to connect to the Elasticsearch domain. If not set, the Default AWS Credentials Provider chain will be used.              |
+| `elasticsearch.aws.iam-role`    | Optional ARN of an IAM Role to assume to connect to the Elasticsearch domain. Note: the configured IAM user has to be able to assume this role. |
+| `elasticsearch.aws.external-id` | Optional external ID to pass while assuming an AWS IAM Role.                                                                                    |
+
+## Password authentication
+
+To enable password authentication, the `elasticsearch.security` option needs to be set to `PASSWORD`.
+Additionally the following options need to be configured appropriately:
+
+| Property name                 | Description                                   |
+| ----------------------------- | --------------------------------------------- |
+| `elasticsearch.auth.user`     | User name to use to connect to Elasticsearch. |
+| `elasticsearch.auth.password` | Password to use to connect to Elasticsearch.  |
+
+(elasticsearch-sql-support)=
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements to access data and
+metadata in the Elasticsearch catalog.
+
+## Table functions
+
+The connector provides specific {doc}`table functions </functions/table>` to
+access Elasticsearch.
+
+(elasticsearch-raw-query-function)=
+
+### `raw_query(varchar) -> table`
+
+The `raw_query` function allows you to query the underlying database directly.
+This function requires [Elastic Query DSL](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html)
+syntax, because the full query is pushed down and processed in Elasticsearch.
+This can be useful for accessing native features which are not available in
+Trino or for improving query performance in situations where running a query
+natively may be faster.
+
+```{eval-rst}
+.. include:: query-passthrough-warning.fragment
+```
+
+The `raw_query` function requires three parameters:
+
+- `schema`: The schema in the catalog that the query is to be executed on.
+- `index`: The index in Elasticsearch to be searched.
+- `query`: The query to be executed, written in Elastic Query DSL.
+
+Once executed, the query returns a single row containing the resulting JSON
+payload returned by Elasticsearch.
+
+For example, query the `example` catalog and use the `raw_query` table
+function to search for documents in the `orders` index where the country name
+is `ALGERIA`:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    example.system.raw_query(
+      schema => 'sales',
+      index => 'orders',
+      query => '{
+        "query": {
+          "match": {
+            "name": "ALGERIA"
+          }
+        }
+      }'
+    )
+  );
+```
+
+```{include} query-table-function-ordering.fragment
+```
+
+[built-in date formats]: https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#built-in-date-formats
+[custom date formats]: https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#custom-date-formats
+[date]: https://www.elastic.co/guide/en/elasticsearch/reference/current/date.html
+[format]: https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#mapping-date-format
+[full text query]: https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-string-syntax
diff --git a/docs/src/main/sphinx/connector/elasticsearch.rst b/docs/src/main/sphinx/connector/elasticsearch.rst
deleted file mode 100644
index bd95f39aa163..000000000000
--- a/docs/src/main/sphinx/connector/elasticsearch.rst
+++ /dev/null
@@ -1,473 +0,0 @@
-=======================
-Elasticsearch connector
-=======================
-
-.. raw:: html
-
-  <img src="../_static/img/elasticsearch.png" class="connector-logo">
-
-The Elasticsearch Connector allows access to `Elasticsearch <https://www.elastic.co/products/elasticsearch>`_ data from Trino.
-This document describes how to setup the Elasticsearch Connector to run SQL queries against Elasticsearch.
-
-.. note::
-
-    Elasticsearch (6.6.0 or later) or OpenSearch (1.1.0 or later) is required.
-
-Configuration
--------------
-
-To configure the Elasticsearch connector, create a catalog properties file
-``etc/catalog/example.properties`` with the following contents, replacing the
-properties as appropriate for your setup:
-
-.. code-block:: text
-
-    connector.name=elasticsearch
-    elasticsearch.host=localhost
-    elasticsearch.port=9200
-    elasticsearch.default-schema-name=default
-
-Configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. list-table:: Elasticsearch configuration properties
-    :widths: 35, 55, 10
-    :header-rows: 1
-
-    * - Property name
-      - Description
-      - Default
-    * - ``elasticsearch.host``
-      - The comma-separated list of host names for the Elasticsearch node to
-        connect to. This property is required.
-      -
-    * - ``elasticsearch.port``
-      - Port of the Elasticsearch node to connect to.
-      - ``9200``
-    * - ``elasticsearch.default-schema-name``
-      - The schema that contains all tables defined without a qualifying schema
-        name.
-      - ``default``
-    * - ``elasticsearch.scroll-size``
-      - Sets the maximum number of hits that can be returned with each
-        Elasticsearch scroll request.
-      - ``1000``
-    * - ``elasticsearch.scroll-timeout``
-      - Amount of time Elasticsearch keeps the
-        `search context <https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-scroll.html#scroll-search-context>`_
-        alive for scroll requests.
-      - ``1m``
-    * - ``elasticsearch.request-timeout``
-      - Timeout value for all Elasticsearch requests.
-      - ``10s``
-    * - ``elasticsearch.connect-timeout``
-      - Timeout value for all Elasticsearch connection attempts.
-      - ``1s``
-    * - ``elasticsearch.backoff-init-delay``
-      - The minimum duration between backpressure retry attempts for a single
-        request to Elasticsearch. Setting it too low might overwhelm an already
-        struggling ES cluster.
-      - ``500ms``
-    * - ``elasticsearch.backoff-max-delay``
-      - The maximum duration between backpressure retry attempts for a single
-        request to Elasticsearch.
-      - ``20s``
-    * - ``elasticsearch.max-retry-time``
-      - The maximum duration across all retry attempts for a single request to
-        Elasticsearch.
-      - ``20s``
-    * - ``elasticsearch.node-refresh-interval``
-      - How often the list of available Elasticsearch nodes is refreshed.
-      - ``1m``
-    * - ``elasticsearch.ignore-publish-address``
-      - Disables using the address published by Elasticsearch to connect for
-        queries.
-      -
-
-TLS security
-------------
-
-The Elasticsearch connector provides additional security options to support
-Elasticsearch clusters that have been configured to use TLS.
-
-If your cluster has globally-trusted certificates, you should only need to
-enable TLS. If you require custom configuration for certificates, the connector
-supports key stores and trust stores in PEM or Java Key Store (JKS) format.
-
-The allowed configuration values are:
-
-.. list-table:: TLS Security Properties
-    :widths: 40, 60
-    :header-rows: 1
-
-    * - Property name
-      - Description
-    * - ``elasticsearch.tls.enabled``
-      - Enables TLS security.
-    * - ``elasticsearch.tls.keystore-path``
-      - The path to the PEM or JKS key store. This file must be readable by the
-        operating system user running Trino.
-    * - ``elasticsearch.tls.truststore-path``
-      - The path to PEM or JKS trust store. This file must be readable by the
-        operating system user running Trino.
-    * - ``elasticsearch.tls.keystore-password``
-      - The key password for the key store specified by
-        ``elasticsearch.tls.keystore-path``.
-    * - ``elasticsearch.tls.truststore-password``
-      - The key password for the trust store specified by
-        ``elasticsearch.tls.truststore-path``.
-
-.. _elasticesearch-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and Elasticsearch each support types that the other does not, this
-connector :ref:`maps some types <type-mapping-overview>` when reading data.
-
-Elasticsearch type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Elasticsearch types to the corresponding Trino types
-according to the following table:
-
-.. list-table:: Elasticsearch type to Trino type mapping
-  :widths: 30, 30, 50
-  :header-rows: 1
-
-  * - Elasticsearch type
-    - Trino type
-    - Notes
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``FLOAT``
-    - ``REAL``
-    -
-  * - ``BYTE``
-    - ``TINYINT``
-    -
-  * - ``SHORT``
-    - ``SMALLINT``
-    -
-  * - ``INTEGER``
-    - ``INTEGER``
-    -
-  * - ``LONG``
-    - ``BIGINT``
-    -
-  * - ``KEYWORD``
-    - ``VARCHAR``
-    -
-  * - ``TEXT``
-    - ``VARCHAR``
-    -
-  * - ``DATE``
-    - ``TIMESTAMP``
-    - For more information, see :ref:`elasticsearch-date-types`.
-  * - ``IPADDRESS``
-    - ``IP``
-    -
-
-No other types are supported.
-
-.. _elasticsearch-array-types:
-
-Array types
-^^^^^^^^^^^
-
-Fields in Elasticsearch can contain `zero or more values <https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html>`_
-, but there is no dedicated array type. To indicate a field contains an array, it can be annotated in a Trino-specific structure in
-the `_meta <https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-meta-field.html>`_ section of the index mapping.
-
-For example, you can have an Elasticsearch index that contains documents with the following structure:
-
-.. code-block:: json
-
-    {
-        "array_string_field": ["trino","the","lean","machine-ohs"],
-        "long_field": 314159265359,
-        "id_field": "564e6982-88ee-4498-aa98-df9e3f6b6109",
-        "timestamp_field": "1987-09-17T06:22:48.000Z",
-        "object_field": {
-            "array_int_field": [86,75,309],
-            "int_field": 2
-        }
-    }
-
-The array fields of this structure can be defined by using the following command to add the field
-property definition to the ``_meta.trino`` property of the target index mapping.
-
-.. code-block:: shell
-
-    curl --request PUT \
-        --url localhost:9200/doc/_mapping \
-        --header 'content-type: application/json' \
-        --data '
-    {
-        "_meta": {
-            "trino":{
-                "array_string_field":{
-                    "isArray":true
-                },
-                "object_field":{
-                    "array_int_field":{
-                        "isArray":true
-                    }
-                },
-            }
-        }
-    }'
-
-.. note::
-
-    It is not allowed to use ``asRawJson`` and ``isArray`` flags simultaneously for the same column.
-
-.. _elasticsearch-date-types:
-
-Date types
-^^^^^^^^^^
-
-Elasticsearch supports a wide array of `date`_ formats including
-`built-in date formats`_ and also `custom date formats`_.
-The Elasticsearch connector supports only the default ``date`` type. All other
-date formats including `built-in date formats`_ and `custom date formats`_ are
-not supported. Dates with the `format`_ property are ignored.
-
-.. _date: https://www.elastic.co/guide/en/elasticsearch/reference/current/date.html
-.. _built-in date formats: https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#built-in-date-formats
-.. _custom date formats: https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#custom-date-formats
-.. _format: https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#mapping-date-format
-
-
-Raw JSON transform
-^^^^^^^^^^^^^^^^^^
-
-There are many occurrences where documents in Elasticsearch have more complex
-structures that are not represented in the mapping. For example, a single
-``keyword`` field can have widely different content including a single
-``keyword`` value, an array, or a multidimensional ``keyword`` array with any
-level of nesting.
-
-.. code-block:: shell
-
-    curl --request PUT \
-        --url localhost:9200/doc/_mapping \
-        --header 'content-type: application/json' \
-        --data '
-    {
-        "properties": {
-            "array_string_field":{
-                "type": "keyword"
-            }
-        }
-    }'
-
-Notice for the ``array_string_field`` that all the following documents are legal
-for Elasticsearch. See the `Elasticsearch array documentation
-<https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html>`_
-for more details.
-
-.. code-block:: json
-
-    [
-        {
-            "array_string_field": "trino"
-        },
-        {
-            "array_string_field": ["trino","is","the","besto"]
-        },
-        {
-            "array_string_field": ["trino",["is","the","besto"]]
-        },
-        {
-            "array_string_field": ["trino",["is",["the","besto"]]]
-        }
-    ]
-
-Further, Elasticsearch supports types, such as
-`dense_vector
-<https://www.elastic.co/guide/en/elasticsearch/reference/current/dense-vector.html>`_,
-that are not supported in Trino. New types are constantly emerging which can
-cause parsing exceptions for users that use of these types in Elasticsearch. To
-manage all of these scenarios, you can transform fields to raw JSON by
-annotating it in a Trino-specific structure in the `_meta
-<https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-meta-field.html>`_
-section of the index mapping. This indicates to Trino that the field, and all
-nested fields beneath, need to be cast to a ``VARCHAR`` field that contains
-the raw JSON content. These fields can be defined by using the following command
-to add the field property definition to the ``_meta.presto`` property of the
-target index mapping.
-
-.. code-block:: shell
-
-    curl --request PUT \
-        --url localhost:9200/doc/_mapping \
-        --header 'content-type: application/json' \
-        --data '
-    {
-        "_meta": {
-            "presto":{
-                "array_string_field":{
-                    "asRawJson":true
-                }
-            }
-        }
-    }'
-
-This preceding configurations causes Trino to return the ``array_string_field``
-field as a ``VARCHAR`` containing raw JSON. You can parse these fields with the
-:doc:`built-in JSON functions </functions/json>`.
-
-.. note::
-
-    It is not allowed to use ``asRawJson`` and ``isArray`` flags simultaneously for the same column.
-
-Special columns
----------------
-
-The following hidden columns are available:
-
-======= =======================================================
-Column  Description
-======= =======================================================
-_id     The Elasticsearch document ID
-_score  The document score returned by the Elasticsearch query
-_source The source of the original document
-======= =======================================================
-
-.. _elasticsearch-full-text-queries:
-
-Full text queries
------------------
-
-Trino SQL queries can be combined with Elasticsearch queries by providing the `full text query`_
-as part of the table name, separated by a colon. For example:
-
-.. code-block:: sql
-
-    SELECT * FROM "tweets: +trino SQL^2"
-
-.. _full text query: https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-string-syntax
-
-Predicate push down
--------------------
-
-The connector supports predicate push down of below data types:
-
-============= ============= =============
-Elasticsearch Trino         Supports
-============= ============= =============
-``binary``    ``VARBINARY`` ``NO``
-``boolean``   ``BOOLEAN``   ``YES``
-``double``    ``DOUBLE``    ``YES``
-``float``     ``REAL``      ``YES``
-``byte``      ``TINYINT``   ``YES``
-``short``     ``SMALLINT``  ``YES``
-``integer``   ``INTEGER``   ``YES``
-``long``      ``BIGINT``    ``YES``
-``keyword``   ``VARCHAR``   ``YES``
-``text``      ``VARCHAR``   ``NO``
-``date``      ``TIMESTAMP`` ``YES``
-``ip``        ``IPADDRESS`` ``NO``
-(all others)  (unsupported) (unsupported)
-============= ============= =============
-
-AWS authorization
------------------
-
-To enable AWS authorization using IAM policies, the ``elasticsearch.security`` option needs to be set to ``AWS``.
-Additionally, the following options need to be configured appropriately:
-
-================================================ ==================================================================
-Property name                                    Description
-================================================ ==================================================================
-``elasticsearch.aws.region``                     AWS region or the Elasticsearch endpoint. This option is required.
-
-``elasticsearch.aws.access-key``                 AWS access key to use to connect to the Elasticsearch domain.
-                                                 If not set, the Default AWS Credentials Provider chain will be used.
-
-``elasticsearch.aws.secret-key``                 AWS secret key to use to connect to the Elasticsearch domain.
-                                                 If not set, the Default AWS Credentials Provider chain will be used.
-
-``elasticsearch.aws.iam-role``                   Optional ARN of an IAM Role to assume to connect to the Elasticsearch domain.
-                                                 Note: the configured IAM user has to be able to assume this role.
-
-``elasticsearch.aws.external-id``                Optional external ID to pass while assuming an AWS IAM Role.
-================================================ ==================================================================
-
-Password authentication
------------------------
-
-To enable password authentication, the ``elasticsearch.security`` option needs to be set to ``PASSWORD``.
-Additionally the following options need to be configured appropriately:
-
-================================================ ==================================================================
-Property name                                    Description
-================================================ ==================================================================
-``elasticsearch.auth.user``                      User name to use to connect to Elasticsearch.
-``elasticsearch.auth.password``                  Password to use to connect to Elasticsearch.
-================================================ ==================================================================
-
-.. _elasticsearch-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access data and
-metadata in the Elasticsearch catalog.
-
-Table functions
----------------
-
-The connector provides specific :doc:`table functions </functions/table>` to
-access Elasticsearch.
-
-.. _elasticsearch-raw-query-function:
-
-``raw_query(varchar) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``raw_query`` function allows you to query the underlying database directly.
-This function requires `Elastic Query DSL
-<https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html>`_
-syntax, because the full query is pushed down and processed in Elasticsearch.
-This can be useful for accessing native features which are not available in
-Trino or for improving query performance in situations where running a query
-natively may be faster.
-
-.. include:: polymorphic-table-function-ordering.fragment
-
-The ``raw_query`` function requires three parameters:
-
-* ``schema``: The schema in the catalog that the query is to be executed on.
-* ``index``: The index in Elasticsearch to be searched.
-* ``query``: The query to be executed, written in Elastic Query DSL.
-
-Once executed, the query returns a single row containing the resulting JSON
-payload returned by Elasticsearch.
-
-For example, query the ``example`` catalog and use the ``raw_query`` table
-function to search for documents in the ``orders`` index where the country name
-is ``ALGERIA``::
-
-    SELECT
-      *
-    FROM
-      TABLE(
-        example.system.raw_query(
-          schema => 'sales',
-          index => 'orders',
-          query => '{
-            "query": {
-              "match": {
-                "name": "ALGERIA"
-              }
-            }
-          }'
-        )
-      );
diff --git a/docs/src/main/sphinx/connector/googlesheets.md b/docs/src/main/sphinx/connector/googlesheets.md
new file mode 100644
index 000000000000..8615d6d58637
--- /dev/null
+++ b/docs/src/main/sphinx/connector/googlesheets.md
@@ -0,0 +1,175 @@
+# Google Sheets connector
+
+```{raw} html
+<img src="../_static/img/google-sheets.png" class="connector-logo">
+```
+
+The Google Sheets connector allows reading and writing [Google Sheets](https://www.google.com/sheets/about/) spreadsheets as tables in Trino.
+
+## Configuration
+
+Create `etc/catalog/example.properties` to mount the Google Sheets connector
+as the `example` catalog, with the following contents:
+
+```text
+connector.name=gsheets
+gsheets.credentials-path=/path/to/google-sheets-credentials.json
+gsheets.metadata-sheet-id=exampleId
+```
+
+## Configuration properties
+
+The following configuration properties are available:
+
+| Property name                 | Description                                                      |
+| ----------------------------- | ---------------------------------------------------------------- |
+| `gsheets.credentials-path`    | Path to the Google API JSON key file                             |
+| `gsheets.credentials-key`     | The base64 encoded credentials key                               |
+| `gsheets.metadata-sheet-id`   | Sheet ID of the spreadsheet, that contains the table mapping     |
+| `gsheets.max-data-cache-size` | Maximum number of spreadsheets to cache, defaults to `1000`      |
+| `gsheets.data-cache-ttl`      | How long to cache spreadsheet data or metadata, defaults to `5m` |
+| `gsheets.connection-timeout`  | Timeout when connection to Google Sheets API, defaults to `20s`  |
+| `gsheets.read-timeout`        | Timeout when reading from Google Sheets API, defaults to `20s`   |
+| `gsheets.write-timeout`       | Timeout when writing to Google Sheets API, defaults to `20s`     |
+
+## Credentials
+
+The connector requires credentials in order to access the Google Sheets API.
+
+1. Open the [Google Sheets API](https://console.developers.google.com/apis/library/sheets.googleapis.com)
+   page and click the *Enable* button. This takes you to the API manager page.
+2. Select a project using the drop down menu at the top of the page.
+   Create a new project, if you do not already have one.
+3. Choose *Credentials* in the left panel.
+4. Click *Manage service accounts*, then create a service account for the connector.
+   On the *Create key* step, create and download a key in JSON format.
+
+The key file needs to be available on the Trino coordinator and workers.
+Set the `gsheets.credentials-path` configuration property to point to this file.
+The exact name of the file does not matter -- it can be named anything.
+
+Alternatively, set the `gsheets.credentials-key` configuration property.
+It should contain the contents of the JSON file, encoded using base64.
+
+## Metadata sheet
+
+The metadata sheet is used to map table names to sheet IDs.
+Create a new metadata sheet. The first row must be a header row
+containing the following columns in this order:
+
+- Table Name
+- Sheet ID
+- Owner (optional)
+- Notes (optional)
+
+See this [example sheet](https://docs.google.com/spreadsheets/d/1Es4HhWALUQjoa-bQh4a8B5HROz7dpGMfq_HbfoaW5LM)
+as a reference.
+
+The metadata sheet must be shared with the service account user,
+the one for which the key credentials file was created. Click the *Share*
+button to share the sheet with the email address of the service account.
+
+Set the `gsheets.metadata-sheet-id` configuration property to the ID of this sheet.
+
+## Querying sheets
+
+The service account user must have access to the sheet in order for Trino
+to query it. Click the *Share* button to share the sheet with the email
+address of the service account.
+
+The sheet needs to be mapped to a Trino table name. Specify a table name
+(column A) and the sheet ID (column B) in the metadata sheet. To refer
+to a specific range in the sheet, add the range after the sheet ID, separated
+with `#`. If a range is not provided, the connector loads only 10,000 rows by default from
+the first tab in the sheet.
+
+The first row of the provided sheet range is used as the header and will determine the column
+names of the Trino table.
+For more details on sheet range syntax see the [google sheets docs](https://developers.google.com/sheets/api/guides/concepts).
+
+## Writing to sheets
+
+The same way sheets can be queried, they can also be written by appending data to existing sheets.
+In this case the service account user must also have **Editor** permissions on the sheet.
+
+After data is written to a table, the table contents are removed from the cache
+described in [API usage limits](gsheets-api-usage). If the table is accessed
+immediately after the write, querying the Google Sheets API may not reflect the
+change yet. In that case the old version of the table is read and cached for the
+configured amount of time, and it might take some time for the written changes
+to propagate properly.
+
+Keep in mind that the Google Sheets API has [usage limits](https://developers.google.com/sheets/api/limits), that limit the speed of inserting data.
+If you run into timeouts you can increase timeout times to avoid `503: The service is currently unavailable` errors.
+
+(gsheets-api-usage)=
+## API usage limits
+
+The Google Sheets API has [usage limits](https://developers.google.com/sheets/api/limits),
+that may impact the usage of this connector. Increasing the cache duration and/or size
+may prevent the limit from being reached. Running queries on the `information_schema.columns`
+table without a schema and table name filter may lead to hitting the limit, as this requires
+fetching the sheet data for every table, unless it is already cached.
+
+## Type mapping
+
+Because Trino and Google Sheets each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading data.
+
+### Google Sheets type to Trino type mapping
+
+The connector maps Google Sheets types to the corresponding Trino types
+following this table:
+
+```{eval-rst}
+.. list-table:: Google Sheets type to Trino type mapping
+  :widths: 30, 20
+  :header-rows: 1
+
+  * - Google Sheets type
+    - Trino type
+  * - ``TEXT``
+    - ``VARCHAR``
+```
+
+No other types are supported.
+
+(google-sheets-sql-support)=
+
+## SQL support
+
+In addition to the {ref}`globally available <sql-globally-available>` and {ref}`read operation <sql-read-operations>` statements,
+this connector supports the following features:
+
+- {doc}`/sql/insert`
+
+## Table functions
+
+The connector provides specific {doc}`/functions/table` to access Google Sheets.
+
+(google-sheets-sheet-function)=
+
+### `sheet(id, range) -> table`
+
+The `sheet` function allows you to query a Google Sheet directly without
+specifying it as a named table in the metadata sheet.
+
+For example, for a catalog named 'example':
+
+```
+SELECT *
+FROM
+  TABLE(example.system.sheet(
+      id => 'googleSheetIdHere'));
+```
+
+A sheet range or named range can be provided as an optional `range` argument.
+The default sheet range is `$1:$10000` if one is not provided:
+
+```
+SELECT *
+FROM
+  TABLE(example.system.sheet(
+      id => 'googleSheetIdHere',
+      range => 'TabName!A1:B4'));
+```
diff --git a/docs/src/main/sphinx/connector/googlesheets.rst b/docs/src/main/sphinx/connector/googlesheets.rst
deleted file mode 100644
index 96554d9b8f5f..000000000000
--- a/docs/src/main/sphinx/connector/googlesheets.rst
+++ /dev/null
@@ -1,169 +0,0 @@
-=======================
-Google Sheets connector
-=======================
-
-.. raw:: html
-
-  <img src="../_static/img/google-sheets.png" class="connector-logo">
-
-The Google Sheets connector allows reading `Google Sheets <https://www.google.com/sheets/about/>`_ spreadsheets as tables in Trino.
-
-Configuration
--------------
-
-Create ``etc/catalog/example.properties`` to mount the Google Sheets connector
-as the ``example`` catalog, with the following contents:
-
-.. code-block:: text
-
-    connector.name=gsheets
-    gsheets.credentials-path=/path/to/google-sheets-credentials.json
-    gsheets.metadata-sheet-id=exampleId
-
-Configuration properties
-------------------------
-
-The following configuration properties are available:
-
-=================================== =====================================================================
-Property name                       Description
-=================================== =====================================================================
-``gsheets.credentials-path``        Path to the Google API JSON key file
-``gsheets.credentials-key``         The base64 encoded credentials key
-``gsheets.metadata-sheet-id``       Sheet ID of the spreadsheet, that contains the table mapping
-``gsheets.max-data-cache-size``     Maximum number of spreadsheets to cache, defaults to ``1000``
-``gsheets.data-cache-ttl``          How long to cache spreadsheet data or metadata, defaults to ``5m``
-``gsheets.read-timeout``            Timeout to read data from spreadsheet, defaults to ``20s``
-=================================== =====================================================================
-
-Credentials
------------
-
-The connector requires credentials in order to access the Google Sheets API.
-
-1. Open the `Google Sheets API <https://console.developers.google.com/apis/library/sheets.googleapis.com>`_
-   page and click the *Enable* button. This takes you to the API manager page.
-
-2. Select a project using the drop down menu at the top of the page.
-   Create a new project, if you do not already have one.
-
-3. Choose *Credentials* in the left panel.
-
-4. Click *Manage service accounts*, then create a service account for the connector.
-   On the *Create key* step, create and download a key in JSON format.
-
-The key file needs to be available on the Trino coordinator and workers.
-Set the ``gsheets.credentials-path`` configuration property to point to this file.
-The exact name of the file does not matter -- it can be named anything.
-
-Alternatively, set the ``gsheets.credentials-key`` configuration property.
-It should contain the contents of the JSON file, encoded using base64.
-
-Metadata sheet
---------------
-
-The metadata sheet is used to map table names to sheet IDs.
-Create a new metadata sheet. The first row must be a header row
-containing the following columns in this order:
-
-* Table Name
-* Sheet ID
-* Owner (optional)
-* Notes (optional)
-
-See this `example sheet <https://docs.google.com/spreadsheets/d/1Es4HhWALUQjoa-bQh4a8B5HROz7dpGMfq_HbfoaW5LM>`_
-as a reference.
-
-The metadata sheet must be shared with the service account user,
-the one for which the key credentials file was created. Click the *Share*
-button to share the sheet with the email address of the service account.
-
-Set the ``gsheets.metadata-sheet-id`` configuration property to the ID of this sheet.
-
-Querying sheets
----------------
-
-The service account user must have access to the sheet in order for Trino
-to query it. Click the *Share* button to share the sheet with the email
-address of the service account.
-
-The sheet needs to be mapped to a Trino table name. Specify a table name
-(column A) and the sheet ID (column B) in the metadata sheet. To refer
-to a specific range in the sheet, add the range after the sheet ID, separated
-with ``#``. If a range is not provided, the connector loads only 10,000 rows by default from
-the first tab in the sheet.
-
-The first row of the provided sheet range is used as the header and will determine the column
-names of the Trino table.
-For more details on sheet range syntax see the `google sheets docs <https://developers.google.com/sheets/api/guides/concepts>`_.
-
-API usage limits
-----------------
-
-The Google Sheets API has `usage limits <https://developers.google.com/sheets/api/limits>`_,
-that may impact the usage of this connector. Increasing the cache duration and/or size
-may prevent the limit from being reached. Running queries on the ``information_schema.columns``
-table without a schema and table name filter may lead to hitting the limit, as this requires
-fetching the sheet data for every table, unless it is already cached.
-
-Type mapping
-------------
-
-Because Trino and Google Sheets each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading data.
-
-Google Sheets type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Google Sheets types to the corresponding Trino types
-following this table:
-
-.. list-table:: Google Sheets type to Trino type mapping
-  :widths: 30, 20
-  :header-rows: 1
-
-  * - Google Sheets type
-    - Trino type
-  * - ``TEXT``
-    - ``VARCHAR``
-
-No other types are supported.
-
-.. _google-sheets-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access data and
-metadata in Google Sheets.
-
-Table functions
----------------
-
-The connector provides specific :doc:`table functions </functions/table>` to
-access Google Sheets.
-
-.. _google-sheets-sheet-function:
-
-``sheet(id, range) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``sheet`` function allows you to query a Google Sheet directly without
-specifying it as a named table in the metadata sheet.
-
-For example, for a catalog named 'example'::
-
-    SELECT *
-    FROM
-      TABLE(example.system.sheet(
-          id => 'googleSheetIdHere'));
-
-A sheet range or named range can be provided as an optional ``range`` argument.
-The default sheet range is ``$1:$10000`` if one is not provided::
-
-    SELECT *
-    FROM
-      TABLE(example.system.sheet(
-          id => 'googleSheetIdHere',
-          range => 'TabName!A1:B4'));
diff --git a/docs/src/main/sphinx/connector/hive-alluxio.md b/docs/src/main/sphinx/connector/hive-alluxio.md
new file mode 100644
index 000000000000..594295178119
--- /dev/null
+++ b/docs/src/main/sphinx/connector/hive-alluxio.md
@@ -0,0 +1,16 @@
+# Hive connector with Alluxio
+
+The {doc}`hive` can read and write tables stored in the [Alluxio Data Orchestration
+System](https://www.alluxio.io/),
+leveraging Alluxio's distributed block-level read/write caching functionality.
+The tables must be created in the Hive metastore with the `alluxio://`
+location prefix (see [Running Apache Hive with Alluxio](https://docs.alluxio.io/os/user/stable/en/compute/Hive.html)
+for details and examples).
+
+Trino queries will then transparently retrieve and cache files or objects from
+a variety of disparate storage systems including HDFS and S3.
+
+## Setting up Alluxio with Trino
+
+For information on how to setup, configure, and use Alluxio, refer to [Alluxio's
+documentation on using their platform with Trino](https://docs.alluxio.io/ee/user/stable/en/compute/Trino.html).
diff --git a/docs/src/main/sphinx/connector/hive-alluxio.rst b/docs/src/main/sphinx/connector/hive-alluxio.rst
deleted file mode 100644
index c9ad97ab6a9e..000000000000
--- a/docs/src/main/sphinx/connector/hive-alluxio.rst
+++ /dev/null
@@ -1,91 +0,0 @@
-===========================
-Hive connector with Alluxio
-===========================
-
-The :doc:`hive` can read and write tables stored in the `Alluxio Data Orchestration
-System <https://www.alluxio.io/?utm_source=trino&utm_medium=trinodocs>`_,
-leveraging Alluxio's distributed block-level read/write caching functionality.
-The tables must be created in the Hive metastore with the ``alluxio://``
-location prefix (see `Running Apache Hive with Alluxio
-<https://docs.alluxio.io/os/user/2.1/en/compute/Hive.html?utm_source=trino&utm_medium=trinodocs>`_
-for details and examples).
-
-Trino queries will then transparently retrieve and cache files or objects from
-a variety of disparate storage systems including HDFS and S3.
-
-Alluxio client-side configuration
----------------------------------
-
-To configure Alluxio client-side properties on Trino, append the Alluxio
-configuration directory (``${ALLUXIO_HOME}/conf``) to the Trino JVM classpath,
-so that the Alluxio properties file ``alluxio-site.properties`` can be loaded as
-a resource. Update the Trino :ref:`jvm_config` file ``etc/jvm.config``
-to include the following:
-
-.. code-block:: text
-
-  -Xbootclasspath/a:<path-to-alluxio-conf>
-
-The advantage of this approach is that all the Alluxio properties are set in
-the single ``alluxio-site.properties`` file. For details, see `Customize Alluxio Presto Properties
-<https://docs.alluxio.io/os/user/2.1/en/compute/Presto.html#customize-alluxio-user-properties?utm_source=trino&utm_medium=trinodocs>`_.
-
-Alternatively, add Alluxio configuration properties to the Hadoop configuration
-files (``core-site.xml``, ``hdfs-site.xml``) and configure the Hive connector
-to use the `Hadoop configuration files <#hdfs-configuration>`__ via the
-``hive.config.resources`` connector property.
-
-Deploy Alluxio with Trino
---------------------------
-
-To achieve the best performance running Trino on Alluxio, it is recommended
-to collocate Trino workers with Alluxio workers. This allows reads and writes
-to bypass the network (*short-circuit*). See `Performance Tuning Tips for Presto with Alluxio
-<https://www.alluxio.io/blog/top-5-performance-tuning-tips-for-running-presto-on-alluxio-1/?utm_source=trino&utm_medium=trinodocs>`_
-for more details.
-
-.. _alluxio_catalog_service:
-
-Alluxio catalog service
------------------------
-
-An alternative way for Trino to interact with Alluxio is via the
-`Alluxio catalog service <https://docs.alluxio.io/os/user/stable/en/core-services/Catalog.html?utm_source=trino&utm_medium=trinodocs>`_.
-The primary benefits for using the Alluxio catalog service are simpler
-deployment of Alluxio with Trino, and enabling schema-aware optimizations
-such as transparent caching and transformations. Currently, the catalog service
-supports read-only workloads.
-
-The Alluxio catalog service is a metastore that can cache the information
-from different underlying metastores. It currently supports the Hive metastore
-as an underlying metastore. In order for the Alluxio catalog to manage the metadata
-of other existing metastores, the other metastores must be "attached" to the
-Alluxio catalog. To attach an existing Hive metastore to the Alluxio
-catalog, simply use the
-`Alluxio CLI attachdb command <https://docs.alluxio.io/os/user/stable/en/operation/User-CLI.html?utm_source=trino&utm_medium=trinodocs#attachdb>`_.
-The appropriate Hive metastore location and Hive database name need to be
-provided.
-
-.. code-block:: text
-
-    ./bin/alluxio table attachdb hive thrift://HOSTNAME:9083 hive_db_name
-
-Once a metastore is attached, the Alluxio catalog can manage and serve the
-information to Trino. To configure the Hive connector for Alluxio
-catalog service, simply configure the connector to use the Alluxio
-metastore type, and provide the location to the Alluxio cluster.
-For example, your ``etc/catalog/alluxio.properties`` should include
-the following:
-
-.. code-block:: text
-
-    connector.name=hive
-    hive.metastore=alluxio-deprecated
-    hive.metastore.alluxio.master.address=HOSTNAME:PORT
-
-Replace ``HOSTNAME`` with the Alluxio master hostname, and replace ``PORT``
-with the Alluxio master port.
-An example of an Alluxio master address is ``master-node:19998``.
-Now, Trino queries can take advantage of the Alluxio catalog service, such as
-transparent caching and transparent transformations, without any modifications
-to existing Hive metastore deployments.
diff --git a/docs/src/main/sphinx/connector/hive-azure.md b/docs/src/main/sphinx/connector/hive-azure.md
new file mode 100644
index 000000000000..048d90fcf613
--- /dev/null
+++ b/docs/src/main/sphinx/connector/hive-azure.md
@@ -0,0 +1,250 @@
+# Hive connector with Azure Storage
+
+The {doc}`hive` can be configured to use [Azure Data Lake Storage (Gen2)](https://azure.microsoft.com/products/storage/data-lake-storage/). Trino
+supports Azure Blob File System (ABFS) to access data in ADLS Gen2.
+
+Trino also supports [ADLS Gen1](https://learn.microsoft.com/azure/data-lake-store/data-lake-store-overview)
+and Windows Azure Storage Blob driver (WASB), but we recommend [migrating to
+ADLS Gen2](https://learn.microsoft.com/azure/storage/blobs/data-lake-storage-migrate-gen1-to-gen2-azure-portal),
+as ADLS Gen1 and WASB are legacy options that will be removed in the future.
+Learn more from [the official documentation](https://docs.microsoft.com/azure/data-lake-store/data-lake-store-overview).
+
+## Hive connector configuration for Azure Storage credentials
+
+To configure Trino to use the Azure Storage credentials, set the following
+configuration properties in the catalog properties file. It is best to use this
+type of configuration if the primary storage account is linked to the cluster.
+
+The specific configuration depends on the type of storage and uses the
+properties from the following sections in the catalog properties file.
+
+For more complex use cases, such as configuring multiple secondary storage
+accounts using Hadoop's `core-site.xml`, see the
+{ref}`hive-azure-advanced-config` options.
+
+### ADLS Gen2 / ABFS storage
+
+To connect to ABFS storage, you may either use the storage account's access
+key, or a service principal. Do not use both sets of properties at the
+same time.
+
+```{eval-rst}
+.. list-table:: ABFS Access Key
+  :widths: 30, 70
+  :header-rows: 1
+
+  * - Property name
+    - Description
+  * - ``hive.azure.abfs-storage-account``
+    - The name of the ADLS Gen2 storage account
+  * - ``hive.azure.abfs-access-key``
+    - The decrypted access key for the ADLS Gen2 storage account
+```
+
+```{eval-rst}
+.. list-table:: ABFS Service Principal OAuth
+  :widths: 30, 70
+  :header-rows: 1
+
+  * - Property name
+    - Description
+  * - ``hive.azure.abfs.oauth.endpoint``
+    - The service principal / application's OAuth 2.0 token endpoint (v1).
+  * - ``hive.azure.abfs.oauth.client-id``
+    - The service principal's client/application ID.
+  * - ``hive.azure.abfs.oauth.secret``
+    - A client secret for the service principal.
+```
+
+When using a service principal, it must have the Storage Blob Data Owner,
+Contributor, or Reader role on the storage account you are using, depending on
+which operations you would like to use.
+
+### ADLS Gen1 (legacy)
+
+While it is advised to migrate to ADLS Gen2 whenever possible, if you still
+choose to use ADLS Gen1 you need to include the following properties in your
+catalog configuration.
+
+:::{note}
+Credentials for the filesystem can be configured using `ClientCredential`
+type. To authenticate with ADLS Gen1 you must create a new application
+secret for your ADLS Gen1 account's App Registration, and save this value
+because you won't able to retrieve the key later. Refer to the Azure
+[documentation](https://docs.microsoft.com/azure/data-lake-store/data-lake-store-service-to-service-authenticate-using-active-directory)
+for details.
+:::
+
+```{eval-rst}
+.. list-table:: ADLS properties
+  :widths: 30, 70
+  :header-rows: 1
+
+  * - Property name
+    - Description
+  * - ``hive.azure.adl-client-id``
+    - Client (Application) ID from the App Registrations for your storage
+      account
+  * - ``hive.azure.adl-credential``
+    - Value of the new client (application) secret created
+  * - ``hive.azure.adl-refresh-url``
+    - OAuth 2.0 token endpoint url
+  * - ``hive.azure.adl-proxy-host``
+    - Proxy host and port in ``host:port`` format. Use this property to connect
+      to an ADLS endpoint via a SOCKS proxy.
+```
+
+### WASB storage (legacy)
+
+```{eval-rst}
+.. list-table:: WASB properties
+  :widths: 30, 70
+  :header-rows: 1
+
+  * - Property name
+    - Description
+  * - ``hive.azure.wasb-storage-account``
+    - Storage account name of Azure Blob Storage
+  * - ``hive.azure.wasb-access-key``
+    - The decrypted access key for the Azure Blob Storage
+```
+
+(hive-azure-advanced-config)=
+
+### Advanced configuration
+
+All of the configuration properties for the Azure storage driver are stored in
+the Hadoop `core-site.xml` configuration file. When there are secondary
+storage accounts involved, we recommend configuring Trino using a
+`core-site.xml` containing the appropriate credentials for each account.
+
+The path to the file must be configured in the catalog properties file:
+
+```text
+hive.config.resources=<path_to_hadoop_core-site.xml>
+```
+
+One way to find your account key is to ask for the connection string for the
+storage account. The `abfsexample.dfs.core.windows.net` account refers to the
+storage account. The connection string contains the account key:
+
+```text
+az storage account  show-connection-string --name abfswales1
+{
+  "connectionString": "DefaultEndpointsProtocol=https;EndpointSuffix=core.windows.net;AccountName=abfsexample;AccountKey=examplekey..."
+}
+```
+
+When you have the account access key, you can add it to your `core-site.xml`
+or Java cryptography extension (JCEKS) file. Alternatively, you can have your
+cluster management tool to set the option
+`fs.azure.account.key.STORAGE-ACCOUNT` to the account key value:
+
+```text
+<property>
+  <name>fs.azure.account.key.abfsexample.dfs.core.windows.net</name>
+  <value>examplekey...</value>
+</property>
+```
+
+For more information, see [Hadoop Azure Support: ABFS](https://hadoop.apache.org/docs/stable/hadoop-azure/abfs.html).
+
+## Accessing Azure Storage data
+
+### URI scheme to reference data
+
+Consistent with other FileSystem implementations within Hadoop, the Azure
+Standard Blob and Azure Data Lake Storage Gen2 (ABFS) drivers define their own
+URI scheme so that resources (directories and files) may be distinctly
+addressed. You can access both primary and secondary storage accounts linked to
+the cluster with the same URI scheme. Following are example URIs for the
+different systems.
+
+ABFS URI:
+
+```text
+abfs[s]://<file_system>@<account_name>.dfs.core.windows.net/<path>/<path>/<file_name>
+```
+
+ADLS Gen1 URI:
+
+```text
+adl://<data_lake_storage_gen1_name>.azuredatalakestore.net/<path>/<file_name>
+```
+
+Azure Standard Blob URI:
+
+```text
+wasb[s]://<container>@<account_name>.blob.core.windows.net/<path>/<path>/<file_name>
+```
+
+### Querying Azure Storage
+
+You can query tables already configured in your Hive metastore used in your Hive
+catalog. To access Azure Storage data that is not yet mapped in the Hive
+metastore, you need to provide the schema of the data, the file format, and the
+data location.
+
+For example, if you have ORC or Parquet files in an ABFS `file_system`, you
+need to execute a query:
+
+```
+-- select schema in which the table is to be defined, must already exist
+USE hive.default;
+
+-- create table
+CREATE TABLE orders (
+     orderkey BIGINT,
+     custkey BIGINT,
+     orderstatus VARCHAR(1),
+     totalprice DOUBLE,
+     orderdate DATE,
+     orderpriority VARCHAR(15),
+     clerk VARCHAR(15),
+     shippriority INTEGER,
+     comment VARCHAR(79)
+) WITH (
+     external_location = 'abfs[s]://<file_system>@<account_name>.dfs.core.windows.net/<path>/<path>/',
+     format = 'ORC' -- or 'PARQUET'
+);
+```
+
+Now you can query the newly mapped table:
+
+```
+SELECT * FROM orders;
+```
+
+## Writing data
+
+### Prerequisites
+
+Before you attempt to write data to Azure Storage, make sure you have configured
+everything necessary to read data from the storage.
+
+### Create a write schema
+
+If the Hive metastore contains schema(s) mapped to Azure storage filesystems,
+you can use them to write data to Azure storage.
+
+If you don't want to use existing schemas, or there are no appropriate schemas
+in the Hive metastore, you need to create a new one:
+
+```
+CREATE SCHEMA hive.abfs_export
+WITH (location = 'abfs[s]://file_system@account_name.dfs.core.windows.net/<path>');
+```
+
+### Write data to Azure Storage
+
+Once you have a schema pointing to a location where you want to write the data,
+you can issue a `CREATE TABLE AS` statement and select your desired file
+format. The data will be written to one or more files within the
+`abfs[s]://file_system@account_name.dfs.core.windows.net/<path>/my_table`
+namespace. Example:
+
+```
+CREATE TABLE hive.abfs_export.orders_abfs
+WITH (format = 'ORC')
+AS SELECT * FROM tpch.sf1.orders;
+```
diff --git a/docs/src/main/sphinx/connector/hive-azure.rst b/docs/src/main/sphinx/connector/hive-azure.rst
deleted file mode 100644
index 032ae1544bfd..000000000000
--- a/docs/src/main/sphinx/connector/hive-azure.rst
+++ /dev/null
@@ -1,254 +0,0 @@
-=================================
-Hive connector with Azure Storage
-=================================
-
-The :doc:`hive` can be configured to use `Azure Data Lake Storage (Gen2)
-<https://azure.microsoft.com/products/storage/data-lake-storage/>`_. Trino
-supports Azure Blob File System (ABFS) to access data in ADLS Gen2.
-
-Trino also supports `ADLS Gen1
-<https://learn.microsoft.com/azure/data-lake-store/data-lake-store-overview>`_
-and Windows Azure Storage Blob driver (WASB), but we recommend `migrating to
-ADLS Gen2
-<https://learn.microsoft.com/azure/storage/blobs/data-lake-storage-migrate-gen1-to-gen2-azure-portal>`_,
-as ADLS Gen1 and WASB are legacy options that will be removed in the future.
-Learn more from `the official documentation
-<https://docs.microsoft.com/azure/data-lake-store/data-lake-store-overview>`_.
-
-Hive connector configuration for Azure Storage credentials
-----------------------------------------------------------
-
-To configure Trino to use the Azure Storage credentials, set the following
-configuration properties in the catalog properties file. It is best to use this
-type of configuration if the primary storage account is linked to the cluster.
-
-The specific configuration depends on the type of storage and uses the
-properties from the following sections in the catalog properties file.
-
-For more complex use cases, such as configuring multiple secondary storage
-accounts using Hadoop's ``core-site.xml``, see the
-:ref:`hive-azure-advanced-config` options.
-
-ADLS Gen2 / ABFS storage
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-To connect to ABFS storage, you may either use the storage account's access
-key, or a service principal. Do not use both sets of properties at the
-same time.
-
-.. list-table:: ABFS Access Key
-  :widths: 30, 70
-  :header-rows: 1
-
-  * - Property name
-    - Description
-  * - ``hive.azure.abfs-storage-account``
-    - The name of the ADLS Gen2 storage account
-  * - ``hive.azure.abfs-access-key``
-    - The decrypted access key for the ADLS Gen2 storage account
-
-.. list-table:: ABFS Service Principal OAuth
-  :widths: 30, 70
-  :header-rows: 1
-
-  * - Property name
-    - Description
-  * - ``hive.azure.abfs.oauth.endpoint``
-    - The service principal / application's OAuth 2.0 token endpoint (v1).
-  * - ``hive.azure.abfs.oauth.client-id``
-    - The service principal's client/application ID.
-  * - ``hive.azure.abfs.oauth.secret``
-    - A client secret for the service principal.
-
-When using a service principal, it must have the Storage Blob Data Owner,
-Contributor, or Reader role on the storage account you are using, depending on
-which operations you would like to use.
-
-ADLS Gen1 (legacy)
-^^^^^^^^^^^^^^^^^^
-
-While it is advised to migrate to ADLS Gen2 whenever possible, if you still
-choose to use ADLS Gen1 you need to include the following properties in your
-catalog configuration.
-
-.. note::
-
-    Credentials for the filesystem can be configured using ``ClientCredential``
-    type. To authenticate with ADLS Gen1 you must create a new application
-    secret for your ADLS Gen1 account's App Registration, and save this value
-    because you won't able to retrieve the key later. Refer to the Azure
-    `documentation
-    <https://docs.microsoft.com/azure/data-lake-store/data-lake-store-service-to-service-authenticate-using-active-directory>`_
-    for details.
-
-.. list-table:: ADLS properties
-  :widths: 30, 70
-  :header-rows: 1
-
-  * - Property name
-    - Description
-  * - ``hive.azure.adl-client-id``
-    - Client (Application) ID from the App Registrations for your storage
-      account
-  * - ``hive.azure.adl-credential``
-    - Value of the new client (application) secret created
-  * - ``hive.azure.adl-refresh-url``
-    - OAuth 2.0 token endpoint url
-  * - ``hive.azure.adl-proxy-host``
-    - Proxy host and port in ``host:port`` format. Use this property to connect
-      to an ADLS endpoint via a SOCKS proxy.
-
-WASB storage (legacy)
-^^^^^^^^^^^^^^^^^^^^^
-
-.. list-table:: WASB properties
-  :widths: 30, 70
-  :header-rows: 1
-
-  * - Property name
-    - Description
-  * - ``hive.azure.wasb-storage-account``
-    - Storage account name of Azure Blob Storage
-  * - ``hive.azure.wasb-access-key``
-    - The decrypted access key for the Azure Blob Storage
-
-.. _hive-azure-advanced-config:
-
-Advanced configuration
-^^^^^^^^^^^^^^^^^^^^^^
-
-All of the configuration properties for the Azure storage driver are stored in
-the Hadoop ``core-site.xml`` configuration file. When there are secondary
-storage accounts involved, we recommend configuring Trino using a
-``core-site.xml`` containing the appropriate credentials for each account.
-
-The path to the file must be configured in the catalog properties file:
-
-.. code-block:: text
-
-    hive.config.resources=<path_to_hadoop_core-site.xml>
-
-One way to find your account key is to ask for the connection string for the
-storage account. The ``abfsexample.dfs.core.windows.net`` account refers to the
-storage account. The connection string contains the account key:
-
-.. code-block:: text
-
-    az storage account  show-connection-string --name abfswales1
-    {
-      "connectionString": "DefaultEndpointsProtocol=https;EndpointSuffix=core.windows.net;AccountName=abfsexample;AccountKey=examplekey..."
-    }
-
-When you have the account access key, you can add it to your ``core-site.xml``
-or Java cryptography extension (JCEKS) file. Alternatively, you can have your
-cluster management tool to set the option
-``fs.azure.account.key.STORAGE-ACCOUNT`` to the account key value:
-
-.. code-block:: text
-
-    <property>
-      <name>fs.azure.account.key.abfsexample.dfs.core.windows.net</name>
-      <value>examplekey...</value>
-    </property>
-
-For more information, see `Hadoop Azure Support: ABFS
-<https://hadoop.apache.org/docs/stable/hadoop-azure/abfs.html>`_.
-
-Accessing Azure Storage data
-----------------------------
-
-URI scheme to reference data
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Consistent with other FileSystem implementations within Hadoop, the Azure
-Standard Blob and Azure Data Lake Storage Gen2 (ABFS) drivers define their own
-URI scheme so that resources (directories and files) may be distinctly
-addressed. You can access both primary and secondary storage accounts linked to
-the cluster with the same URI scheme. Following are example URIs for the
-different systems.
-
-ABFS URI:
-
-.. code-block:: text
-
-    abfs[s]://<file_system>@<account_name>.dfs.core.windows.net/<path>/<path>/<file_name>
-
-ADLS Gen1 URI:
-
-.. code-block:: text
-
-    adl://<data_lake_storage_gen1_name>.azuredatalakestore.net/<path>/<file_name>
-
-Azure Standard Blob URI:
-
-.. code-block:: text
-
-    wasb[s]://<container>@<account_name>.blob.core.windows.net/<path>/<path>/<file_name>
-
-Querying Azure Storage
-^^^^^^^^^^^^^^^^^^^^^^
-
-You can query tables already configured in your Hive metastore used in your Hive
-catalog. To access Azure Storage data that is not yet mapped in the Hive
-metastore, you need to provide the schema of the data, the file format, and the
-data location.
-
-For example, if you have ORC or Parquet files in an ABFS ``file_system``, you
-need to execute a query::
-
-    -- select schema in which the table is to be defined, must already exist
-    USE hive.default;
-
-    -- create table
-    CREATE TABLE orders (
-         orderkey bigint,
-         custkey bigint,
-         orderstatus varchar(1),
-         totalprice double,
-         orderdate date,
-         orderpriority varchar(15),
-         clerk varchar(15),
-         shippriority integer,
-         comment varchar(79)
-    ) WITH (
-         external_location = 'abfs[s]://<file_system>@<account_name>.dfs.core.windows.net/<path>/<path>/',
-         format = 'ORC' -- or 'PARQUET'
-    );
-
-Now you can query the newly mapped table::
-
-    SELECT * FROM orders;
-
-Writing data
-------------
-
-Prerequisites
-^^^^^^^^^^^^^
-
-Before you attempt to write data to Azure Storage, make sure you have configured
-everything necessary to read data from the storage.
-
-Create a write schema
-^^^^^^^^^^^^^^^^^^^^^
-
-If the Hive metastore contains schema(s) mapped to Azure storage filesystems,
-you can use them to write data to Azure storage.
-
-If you don't want to use existing schemas, or there are no appropriate schemas
-in the Hive metastore, you need to create a new one::
-
-    CREATE SCHEMA hive.abfs_export
-    WITH (location = 'abfs[s]://file_system@account_name.dfs.core.windows.net/<path>');
-
-Write data to Azure Storage
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Once you have a schema pointing to a location where you want to write the data,
-you can issue a ``CREATE TABLE AS`` statement and select your desired file
-format. The data will be written to one or more files within the
-``abfs[s]://file_system@account_name.dfs.core.windows.net/<path>/my_table``
-namespace. Example::
-
-    CREATE TABLE hive.abfs_export.orders_abfs
-    WITH (format = 'ORC')
-    AS SELECT * FROM tpch.sf1.orders;
diff --git a/docs/src/main/sphinx/connector/hive-caching.md b/docs/src/main/sphinx/connector/hive-caching.md
new file mode 100644
index 000000000000..edc3cf3f5048
--- /dev/null
+++ b/docs/src/main/sphinx/connector/hive-caching.md
@@ -0,0 +1,195 @@
+# Hive connector storage caching
+
+Querying object storage with the {doc}`/connector/hive` is a
+very common use case for Trino. It often involves the transfer of large amounts
+of data. The objects are retrieved from HDFS, or any other supported object
+storage, by multiple workers and processed on these workers. Repeated queries
+with different parameters, or even different queries from different users, often
+access, and therefore transfer, the same objects.
+
+## Benefits
+
+Enabling caching can result in significant benefits:
+
+**Reduced load on object storage**
+
+Every retrieved and cached object avoids repeated retrieval from the storage in
+subsequent queries. As a result the object storage system does not have to
+provide the object again and again.
+
+For example, if your query accesses 100MB of objects from the storage, the first
+time the query runs 100MB are downloaded and cached. Any following query uses
+these objects. If your users run another 100 queries accessing the same objects,
+your storage system does not have to do any significant work. Without caching it
+has to provide the same objects again and again, resulting in 10GB of total
+storage to serve.
+
+This reduced load on the object storage can also impact the sizing, and
+therefore the cost, of the object storage system.
+
+**Increased query performance**
+
+Caching can provide significant performance benefits, by avoiding the repeated
+network transfers and instead accessing copies of the objects from a local
+cache. Performance gains are more significant if the performance of directly
+accessing the object storage is low compared to accessing the cache.
+
+For example, if you access object storage in a different network, different data
+center or even different cloud-provider region query performance is slow. Adding
+caching using fast, local storage has a significant impact and makes your
+queries much faster.
+
+On the other hand, if your object storage is already running at very high
+performance for I/O and network access, and your local cache storage is at
+similar speeds, or even slower, performance benefits can be minimal.
+
+**Reduced query costs**
+
+A result of the reduced load on the object storage, mentioned earlier, is
+significantly reduced network traffic. Network traffic however is a considerable
+cost factor in an setup, specifically also when hosted in public cloud provider
+systems.
+
+## Architecture
+
+Caching can operate in two modes. The async mode provides the queried data
+directly and caches any objects asynchronously afterwards. Async is the default
+and recommended mode. The query doesn't pay the cost of warming up the cache.
+The cache is populated in the background and the query bypasses the cache if the
+cache is not already populated. Any following queries requesting the cached
+objects are served directly from the cache.
+
+The other mode is a read-through cache. In this mode, if an object is not found
+in the cache, it is read from the storage, placed in the cache, and then provided
+to the requesting query. In read-through mode, the query always reads from cache
+and must wait for the cache to be populated.
+
+In both modes, objects are cached on local storage of each worker. Workers can
+request cached objects from other workers to avoid requests from the object
+storage.
+
+The cache chunks are 1MB in size and are well suited for ORC or Parquet file
+formats.
+
+## Configuration
+
+The caching feature is part of the {doc}`/connector/hive` and
+can be activated in the catalog properties file:
+
+```text
+connector.name=hive
+hive.cache.enabled=true
+hive.cache.location=/opt/hive-cache
+```
+
+The cache operates on the coordinator and all workers accessing the object
+storage. The used networking ports for the managing BookKeeper and the data
+transfer, by default 8898 and 8899, need to be available.
+
+To use caching on multiple catalogs, you need to configure different caching
+directories  and different BookKeeper and data-transfer ports.
+
+```{eval-rst}
+.. list-table:: **Cache Configuration Parameters**
+  :widths: 25, 63, 12
+  :header-rows: 1
+
+  * - Property
+    - Description
+    - Default
+  * - ``hive.cache.enabled``
+    - Toggle to enable or disable caching
+    - ``false``
+  * - ``hive.cache.location``
+    - Required directory location to use for the cache storage on each worker.
+      Separate multiple directories, which can be mount points for separate
+      drives, with commas. More tips can be found in the :ref:`recommendations
+      <hive-cache-recommendations>`. Example:
+      ``hive.cache.location=/var/lib/trino/cache1,/var/lib/trino/cache2``
+    -
+  * - ``hive.cache.data-transfer-port``
+    -  The TCP/IP port used to transfer data managed by the cache.
+    - ``8898``
+  * - ``hive.cache.bookkeeper-port``
+    -  The TCP/IP port used by the BookKeeper managing the cache.
+    - ``8899``
+  * - ``hive.cache.read-mode``
+    - Operational mode for the cache as described earlier in the architecture
+      section. ``async`` and ``read-through`` are the supported modes.
+    - ``async``
+  * - ``hive.cache.ttl``
+    - Time to live for objects in the cache. Objects, which have not been
+      requested for the TTL value, are removed from the cache.
+    - ``7d``
+  * - ``hive.cache.disk-usage-percentage``
+    - Percentage of disk space used for cached data.
+    - 80
+```
+
+(hive-cache-recommendations)=
+
+## Recommendations
+
+The speed of the local cache storage is crucial to the performance of the cache.
+The most common and cost efficient approach is to attach high performance SSD
+disk or equivalents. Fast cache performance can be also be achieved with a RAM
+disk used as in-memory.
+
+In all cases, you should avoid using the root partition and disk of the node and
+instead attach at multiple dedicated storage devices for the cache on each node.
+The cache uses the disk up to a configurable percentage. Storage should be local
+on each coordinator and worker node. The directory needs to exist before Trino
+starts. We recommend using multiple devices to improve performance of the cache.
+
+The capacity of the attached storage devices should be about 20-30% larger than
+the size of the queried object storage workload. For example, your current query
+workload typically accesses partitions in your HDFS storage that encapsulate
+data for the last 3 months. The overall size of these partitions is currently at
+1TB. As a result your cache drives have to have a total capacity of 1.2 TB or
+more.
+
+Your deployment method for Trino decides how to create the directory for
+caching. Typically you need to connect a fast storage system, like an SSD drive,
+and ensure that is it mounted on the configured path. Kubernetes, CFT and other
+systems allow this via volumes.
+
+## Object storage systems
+
+The following object storage systems are tested:
+
+- HDFS
+- {doc}`Amazon S3 and S3-compatible systems <hive-s3>`
+- {doc}`Azure storage systems <hive-azure>`
+- Google Cloud Storage
+
+## Metrics
+
+In order to verify how caching works on your system you can take multiple
+approaches:
+
+- Inspect the disk usage on the cache storage drives on all nodes
+- Query the metrics of the caching system exposed by JMX
+
+The implementation of the cache exposes a [number of metrics](https://rubix.readthedocs.io/en/latest/metrics.html) via JMX. You can
+{doc}`inspect these and other metrics directly in Trino with the JMX connector
+or in external tools </admin/jmx>`.
+
+Basic caching statistics for the catalog are available in the
+`jmx.current."rubix:catalog=<catalog_name>,name=stats"` table.
+The table `jmx.current."rubix:catalog=<catalog_name>,type=detailed,name=stats`
+contains more detailed statistics.
+
+The following example query returns the average cache hit ratio for the `hive` catalog:
+
+```sql
+SELECT avg(cache_hit)
+FROM jmx.current."rubix:catalog=hive,name=stats"
+WHERE NOT is_nan(cache_hit);
+```
+
+## Limitations
+
+Caching does not support user impersonation and cannot be used with HDFS secured by Kerberos.
+It does not take any user-specific access rights to the object storage into account.
+The cached objects are simply transparent binary blobs to the caching system and full
+access to all content is available.
diff --git a/docs/src/main/sphinx/connector/hive-caching.rst b/docs/src/main/sphinx/connector/hive-caching.rst
deleted file mode 100644
index 8cdb76a9f0f9..000000000000
--- a/docs/src/main/sphinx/connector/hive-caching.rst
+++ /dev/null
@@ -1,203 +0,0 @@
-==============================
-Hive connector storage caching
-==============================
-
-Querying object storage with the :doc:`/connector/hive` is a
-very common use case for Trino. It often involves the transfer of large amounts
-of data. The objects are retrieved from HDFS, or any other supported object
-storage, by multiple workers and processed on these workers. Repeated queries
-with different parameters, or even different queries from different users, often
-access, and therefore transfer, the same objects.
-
-Benefits
---------
-
-Enabling caching can result in significant benefits:
-
-**Reduced load on object storage**
-
-Every retrieved and cached object avoids repeated retrieval from the storage in
-subsequent queries. As a result the object storage system does not have to
-provide the object again and again.
-
-For example, if your query accesses 100MB of objects from the storage, the first
-time the query runs 100MB are downloaded and cached. Any following query uses
-these objects. If your users run another 100 queries accessing the same objects,
-your storage system does not have to do any significant work. Without caching it
-has to provide the same objects again and again, resulting in 10GB of total
-storage to serve.
-
-This reduced load on the object storage can also impact the sizing, and
-therefore the cost, of the object storage system.
-
-**Increased query performance**
-
-Caching can provide significant performance benefits, by avoiding the repeated
-network transfers and instead accessing copies of the objects from a local
-cache. Performance gains are more significant if the performance of directly
-accessing the object storage is low compared to accessing the cache.
-
-For example, if you access object storage in a different network, different data
-center or even different cloud-provider region query performance is slow. Adding
-caching using fast, local storage has a significant impact and makes your
-queries much faster.
-
-On the other hand, if your object storage is already running at very high
-performance for I/O and network access, and your local cache storage is at
-similar speeds, or even slower, performance benefits can be minimal.
-
-**Reduced query costs**
-
-A result of the reduced load on the object storage, mentioned earlier, is
-significantly reduced network traffic. Network traffic however is a considerable
-cost factor in an setup, specifically also when hosted in public cloud provider
-systems.
-
-Architecture
-------------
-
-Caching can operate in two modes. The async mode provides the queried data
-directly and caches any objects asynchronously afterwards. Async is the default
-and recommended mode. The query doesn't pay the cost of warming up the cache.
-The cache is populated in the background and the query bypasses the cache if the
-cache is not already populated. Any following queries requesting the cached
-objects are served directly from the cache.
-
-The other mode is a read-through cache. In this mode, if an object is not found
-in the cache, it is read from the storage, placed in the cache, and then provided
-to the requesting query. In read-through mode, the query always reads from cache
-and must wait for the cache to be populated.
-
-In both modes, objects are cached on local storage of each worker. Workers can
-request cached objects from other workers to avoid requests from the object
-storage.
-
-The cache chunks are 1MB in size and are well suited for ORC or Parquet file
-formats.
-
-Configuration
--------------
-
-The caching feature is part of the :doc:`/connector/hive` and
-can be activated in the catalog properties file:
-
-.. code-block:: text
-
-    connector.name=hive
-    hive.cache.enabled=true
-    hive.cache.location=/opt/hive-cache
-
-The cache operates on the coordinator and all workers accessing the object
-storage. The used networking ports for the managing BookKeeper and the data
-transfer, by default 8898 and 8899, need to be available.
-
-To use caching on multiple catalogs, you need to configure different caching
-directories  and different BookKeeper and data-transfer ports.
-
-.. list-table:: **Cache Configuration Parameters**
-  :widths: 25, 63, 12
-  :header-rows: 1
-
-  * - Property
-    - Description
-    - Default
-  * - ``hive.cache.enabled``
-    - Toggle to enable or disable caching
-    - ``false``
-  * - ``hive.cache.location``
-    - Required directory location to use for the cache storage on each worker.
-      Separate multiple directories, which can be mount points for separate
-      drives, with commas. More tips can be found in the :ref:`recommendations
-      <hive-cache-recommendations>`. Example:
-      ``hive.cache.location=/var/lib/trino/cache1,/var/lib/trino/cache2``
-    -
-  * - ``hive.cache.data-transfer-port``
-    -  The TCP/IP port used to transfer data managed by the cache.
-    - ``8898``
-  * - ``hive.cache.bookkeeper-port``
-    -  The TCP/IP port used by the BookKeeper managing the cache.
-    - ``8899``
-  * - ``hive.cache.read-mode``
-    - Operational mode for the cache as described earlier in the architecture
-      section. ``async`` and ``read-through`` are the supported modes.
-    - ``async``
-  * - ``hive.cache.ttl``
-    - Time to live for objects in the cache. Objects, which have not been
-      requested for the TTL value, are removed from the cache.
-    - ``7d``
-  * - ``hive.cache.disk-usage-percentage``
-    - Percentage of disk space used for cached data.
-    - 80
-
-.. _hive-cache-recommendations:
-
-Recommendations
----------------
-
-The speed of the local cache storage is crucial to the performance of the cache.
-The most common and cost efficient approach is to attach high performance SSD
-disk or equivalents. Fast cache performance can be also be achieved with a RAM
-disk used as in-memory.
-
-In all cases, you should avoid using the root partition and disk of the node and
-instead attach at multiple dedicated storage devices for the cache on each node.
-The cache uses the disk up to a configurable percentage. Storage should be local
-on each coordinator and worker node. The directory needs to exist before Trino
-starts. We recommend using multiple devices to improve performance of the cache.
-
-The capacity of the attached storage devices should be about 20-30% larger than
-the size of the queried object storage workload. For example, your current query
-workload typically accesses partitions in your HDFS storage that encapsulate
-data for the last 3 months. The overall size of these partitions is currently at
-1TB. As a result your cache drives have to have a total capacity of 1.2 TB or
-more.
-
-Your deployment method for Trino decides how to create the directory for
-caching. Typically you need to connect a fast storage system, like an SSD drive,
-and ensure that is it mounted on the configured path. Kubernetes, CFT and other
-systems allow this via volumes.
-
-Object storage systems
-----------------------
-
-The following object storage systems are tested:
-
-* HDFS
-* :doc:`Amazon S3 and S3-compatible systems <hive-s3>`
-* :doc:`Azure storage systems <hive-azure>`
-* Google Cloud Storage
-
-Metrics
--------
-
-In order to verify how caching works on your system you can take multiple
-approaches:
-
-* Inspect the disk usage on the cache storage drives on all nodes
-* Query the metrics of the caching system exposed by JMX
-
-The implementation of the cache exposes a `number of metrics
-<https://rubix.readthedocs.io/en/latest/metrics.html>`_ via JMX. You can
-:doc:`inspect these and other metrics directly in Trino with the JMX connector
-or in external tools </admin/jmx>`.
-
-Basic caching statistics for the catalog are available in the
-``jmx.current."rubix:catalog=<catalog_name>,name=stats"`` table.
-The table ``jmx.current."rubix:catalog=<catalog_name>,type=detailed,name=stats``
-contains more detailed statistics.
-
-The following example query returns the average cache hit ratio for the ``hive`` catalog:
-
-.. code-block:: sql
-
-  SELECT avg(cache_hit)
-  FROM jmx.current."rubix:catalog=hive,name=stats"
-  WHERE NOT is_nan(cache_hit);
-
-Limitations
------------
-
-Caching does not support user impersonation and cannot be used with HDFS secured by Kerberos.
-It does not take any user-specific access rights to the object storage into account.
-The cached objects are simply transparent binary blobs to the caching system and full
-access to all content is available.
diff --git a/docs/src/main/sphinx/connector/hive-cos.md b/docs/src/main/sphinx/connector/hive-cos.md
new file mode 100644
index 000000000000..b9b9a83e75a0
--- /dev/null
+++ b/docs/src/main/sphinx/connector/hive-cos.md
@@ -0,0 +1,98 @@
+# Hive connector with IBM Cloud Object Storage
+
+Configure the {doc}`hive` to support [IBM Cloud Object Storage COS](https://www.ibm.com/cloud/object-storage) access.
+
+## Configuration
+
+To use COS, you need to configure a catalog file to use the Hive
+connector. For example, create a file `etc/ibmcos.properties` and
+specify the path to the COS service config file with the
+`hive.cos.service-config` property.
+
+```properties
+connector.name=hive
+hive.cos.service-config=etc/cos-service.properties
+```
+
+The service configuration file contains the access and secret keys, as well as
+the endpoints for one or multiple COS services:
+
+```properties
+service1.access-key=<your-access-key1>
+service1.secret-key=<your-secret-key1>
+service1.endpoint=<endpoint1>
+service2.access-key=<your-access-key2>
+service2.secret-key=<your-secret-key2>
+service2.endpoint=<endpoint2>
+```
+
+The endpoints property is optional. `service1` and `service2` are
+placeholders for unique COS service names. The granularity for providing access
+credentials is at the COS service level.
+
+To use IBM COS service, specify the service name, for example: `service1` in
+the COS path. The general URI path pattern is
+`cos://<bucket>.<service>/object(s)`.
+
+```
+cos://example-bucket.service1/orders_tiny
+```
+
+Trino translates the COS path, and uses the `service1` endpoint and
+credentials from `cos-service.properties` to access
+`cos://example-bucket.service1/object`.
+
+The Hive Metastore (HMS) does not support the IBM COS filesystem, by default.
+The [Stocator library](https://github.com/CODAIT/stocator) is a possible
+solution to this problem. Download the [Stocator JAR](https://repo1.maven.org/maven2/com/ibm/stocator/stocator/1.1.4/stocator-1.1.4.jar),
+and place it in Hadoop PATH. The [Stocator IBM COS configuration](https://github.com/CODAIT/stocator#reference-stocator-in-the-core-sitexml)
+should be placed in `core-site.xml`. For example:
+
+```
+<property>
+        <name>fs.stocator.scheme.list</name>
+        <value>cos</value>
+</property>
+<property>
+        <name>fs.cos.impl</name>
+        <value>com.ibm.stocator.fs.ObjectStoreFileSystem</value>
+</property>
+<property>
+        <name>fs.stocator.cos.impl</name>
+        <value>com.ibm.stocator.fs.cos.COSAPIClient</value>
+</property>
+<property>
+        <name>fs.stocator.cos.scheme</name>
+        <value>cos</value>
+</property>
+<property>
+    <name>fs.cos.service1.endpoint</name>
+    <value>http://s3.eu-de.cloud-object-storage.appdomain.cloud</value>
+</property>
+<property>
+    <name>fs.cos.service1.access.key</name>
+    <value>access-key</value>
+</property>
+<property>
+    <name>fs.cos.service1.secret.key</name>
+    <value>secret-key</value>
+</property>
+```
+
+## Alternative configuration using S3 compatibility
+
+Use the S3 properties for the Hive connector in the catalog file. If only one
+IBM Cloud Object Storage endpoint is used, then the configuration can be
+simplified:
+
+```
+hive.s3.endpoint=http://s3.eu-de.cloud-object-storage.appdomain.cloud
+hive.s3.aws-access-key=access-key
+hive.s3.aws-secret-key=secret-key
+```
+
+Use `s3` protocol instead of `cos` for the table location:
+
+```
+s3://example-bucket/object/
+```
diff --git a/docs/src/main/sphinx/connector/hive-cos.rst b/docs/src/main/sphinx/connector/hive-cos.rst
deleted file mode 100644
index d877da076954..000000000000
--- a/docs/src/main/sphinx/connector/hive-cos.rst
+++ /dev/null
@@ -1,105 +0,0 @@
-============================================
-Hive connector with IBM Cloud Object Storage
-============================================
-
-Configure the :doc:`hive` to support `IBM Cloud Object Storage COS
-<https://www.ibm.com/cloud/object-storage>`_ access.
-
-Configuration
--------------
-
-To use COS, you need to configure a catalog file to use the Hive
-connector. For example, create a file ``etc/ibmcos.properties`` and
-specify the path to the COS service config file with the
-``hive.cos.service-config`` property.
-
-.. code-block:: properties
-
-    connector.name=hive
-    hive.cos.service-config=etc/cos-service.properties
-
-The service configuration file contains the access and secret keys, as well as
-the endpoints for one or multiple COS services:
-
-.. code-block:: properties
-
-    service1.access-key=<your-access-key1>
-    service1.secret-key=<your-secret-key1>
-    service1.endpoint=<endpoint1>
-    service2.access-key=<your-access-key2>
-    service2.secret-key=<your-secret-key2>
-    service2.endpoint=<endpoint2>
-
-The endpoints property is optional. ``service1`` and ``service2`` are
-placeholders for unique COS service names. The granularity for providing access
-credentials is at the COS service level.
-
-To use IBM COS service, specify the service name, for example: ``service1`` in
-the COS path. The general URI path pattern is
-``cos://<bucket>.<service>/object(s)``.
-
-.. code-block::
-
-    cos://example-bucket.service1/orders_tiny
-
-Trino translates the COS path, and uses the ``service1`` endpoint and
-credentials from ``cos-service.properties`` to access
-``cos://example-bucket.service1/object``.
-
-The Hive Metastore (HMS) does not support the IBM COS filesystem, by default.
-The `Stocator library <https://github.com/CODAIT/stocator>`_ is a possible
-solution to this problem. Download the `Stocator JAR
-<https://repo1.maven.org/maven2/com/ibm/stocator/stocator/1.1.4/stocator-1.1.4.jar>`_,
-and place it in Hadoop PATH. The `Stocator IBM COS configuration
-<https://github.com/CODAIT/stocator#reference-stocator-in-the-core-sitexml>`_
-should be placed in ``core-site.xml``. For example:
-
-.. code-block::
-
-    <property>
-	    <name>fs.stocator.scheme.list</name>
-	    <value>cos</value>
-    </property>
-    <property>
-	    <name>fs.cos.impl</name>
-	    <value>com.ibm.stocator.fs.ObjectStoreFileSystem</value>
-    </property>
-    <property>
-	    <name>fs.stocator.cos.impl</name>
-	    <value>com.ibm.stocator.fs.cos.COSAPIClient</value>
-    </property>
-    <property>
-	    <name>fs.stocator.cos.scheme</name>
-	    <value>cos</value>
-    </property>
-    <property>
-        <name>fs.cos.service1.endpoint</name>
-        <value>http://s3.eu-de.cloud-object-storage.appdomain.cloud</value>
-    </property>
-    <property>
-        <name>fs.cos.service1.access.key</name>
-        <value>access-key</value>
-    </property>
-    <property>
-        <name>fs.cos.service1.secret.key</name>
-        <value>secret-key</value>
-    </property>
-
-Alternative configuration using S3 compatibility
-------------------------------------------------
-
-Use the S3 properties for the Hive connector in the catalog file. If only one
-IBM Cloud Object Storage endpoint is used, then the configuration can be
-simplified:
-
-.. code-block::
-
-    hive.s3.endpoint=http://s3.eu-de.cloud-object-storage.appdomain.cloud
-    hive.s3.aws-access-key=access-key
-    hive.s3.aws-secret-key=secret-key
-
-Use ``s3`` protocol instead of ``cos`` for the table location:
-
-.. code-block::
-
-    s3://example-bucket/object/
diff --git a/docs/src/main/sphinx/connector/hive-gcs-tutorial.md b/docs/src/main/sphinx/connector/hive-gcs-tutorial.md
new file mode 100644
index 000000000000..3c5c3a9fa5a6
--- /dev/null
+++ b/docs/src/main/sphinx/connector/hive-gcs-tutorial.md
@@ -0,0 +1,81 @@
+# Google Cloud Storage
+
+Object storage connectors can access
+[Google Cloud Storage](https://cloud.google.com/storage/) data using the
+`gs://` URI prefix.
+
+## Requirements
+
+To use Google Cloud Storage with non-anonymous access objects, you need:
+
+- A [Google Cloud service account](https://console.cloud.google.com/projectselector2/iam-admin/serviceaccounts)
+- The key for the service account in JSON format
+
+(hive-google-cloud-storage-configuration)=
+
+## Configuration
+
+The use of Google Cloud Storage as a storage location for an object storage
+catalog requires setting a configuration property that defines the
+[authentication method for any non-anonymous access object](https://cloud.google.com/storage/docs/authentication). Access methods cannot
+be combined.
+
+The default root path used by the `gs:\\` prefix is set in the catalog by the
+contents of the specified key file, or the key file used to create the OAuth
+token.
+
+```{eval-rst}
+.. list-table:: Google Cloud Storage configuration properties
+    :widths: 35, 65
+    :header-rows: 1
+
+    * - Property Name
+      - Description
+    * - ``hive.gcs.json-key-file-path``
+      - JSON key file used to authenticate your Google Cloud service account
+        with Google Cloud Storage.
+    * - ``hive.gcs.use-access-token``
+      - Use client-provided OAuth token to access Google Cloud Storage.
+```
+
+The following uses the Delta Lake connector in an example of a minimal
+configuration file for an object storage catalog using a JSON key file:
+
+```properties
+connector.name=delta_lake
+hive.metastore.uri=thrift://example.net:9083
+hive.gcs.json-key-file-path=${ENV:GCP_CREDENTIALS_FILE_PATH}
+```
+
+## General usage
+
+Create a schema to use if one does not already exist, as in the following
+example:
+
+```sql
+CREATE SCHEMA storage_catalog.sales_data_in_gcs WITH (location = 'gs://example_location');
+```
+
+Once you have created a schema, you can create tables in the schema, as in the
+following example:
+
+```sql
+CREATE TABLE storage_catalog.sales_data_in_gcs.orders (
+    orderkey BIGINT,
+    custkey BIGINT,
+    orderstatus VARCHAR(1),
+    totalprice DOUBLE,
+    orderdate DATE,
+    orderpriority VARCHAR(15),
+    clerk VARCHAR(15),
+    shippriority INTEGER,
+    comment VARCHAR(79)
+);
+```
+
+This statement creates the folder `gs://sales_data_in_gcs/orders` in the root
+folder defined in the JSON key file.
+
+Your table is now ready to populate with data using `INSERT` statements.
+Alternatively, you can use `CREATE TABLE AS` statements to create and
+populate the table in a single statement.
diff --git a/docs/src/main/sphinx/connector/hive-gcs-tutorial.rst b/docs/src/main/sphinx/connector/hive-gcs-tutorial.rst
deleted file mode 100644
index 8b94b5a73463..000000000000
--- a/docs/src/main/sphinx/connector/hive-gcs-tutorial.rst
+++ /dev/null
@@ -1,154 +0,0 @@
-Hive connector GCS tutorial
-===========================
-
-Preliminary steps
------------------
-
-Ensure access to GCS
-^^^^^^^^^^^^^^^^^^^^
-
-The :doc:`hive` can access
-`Google Cloud Storage <https://cloud.google.com/storage/>`_ data using the
-`Cloud Storage connector <https://cloud.google.com/dataproc/docs/concepts/connectors/cloud-storage>`_.
-
-If your data is publicly available, you do not need to do anything here.
-However, in most cases data is not publicly available, and the Trino cluster needs to have access to it.
-This is typically achieved by creating a service account, which has permissions to access your data.
-You can do this on the
-`service accounts page in GCP <https://console.cloud.google.com/projectselector2/iam-admin/serviceaccounts>`_.
-Once you create a service account, create a key for it and download the key in JSON format.
-
-Hive connector configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Another requirement is that you have enabled and configured a Hive connector in Trino.
-The connector uses Hive metastore for data discovery and is not limited to data residing on HDFS.
-
-**Configuring Hive Connector**
-
-* URL to Hive metastore:
-
-  * New Hive metastore on GCP:
-
-    If your Trino nodes are provisioned by GCP, your Hive metastore should also be on GCP
-    to minimize latency and costs. The simplest way to create a new Hive metastore on GCP
-    is to create a small Cloud DataProc cluster (1 master, 0 workers), accessible from
-    your Trino cluster. Follow the steps for existing Hive metastore after finishing this step.
-
-  * Existing Hive metastore:
-
-    To use an existing Hive metastore with a Trino cluster, you need to set the
-    ``hive.metastore.uri`` property in your Hive catalog properties file to
-    ``thrift://${METASTORE_ADDRESS}:${METASTORE_THRIFT_PORT}``.
-    If the metastore uses authentication, please refer to :doc:`hive-security`.
-
-* GCS access:
-
-  Here are example values for all GCS configuration properties which can be set in Hive
-  catalog properties file:
-
-  .. code-block:: properties
-
-      # JSON key file used to access Google Cloud Storage
-      hive.gcs.json-key-file-path=/path/to/gcs_keyfile.json
-
-      # Use client-provided OAuth token to access Google Cloud Storage
-      hive.gcs.use-access-token=false
-
-Hive Metastore configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If your Hive metastore uses StorageBasedAuthorization, it needs to access GCS
-to perform POSIX permission checks.
-Configuring GCS access for Hive is outside the scope of this tutorial, but there
-are some excellent guides online:
-
-* `Google: Installing the Cloud Storage connector <https://cloud.google.com/dataproc/docs/concepts/connectors/install-storage-connector>`_
-* `HortonWorks: Working with Google Cloud Storage <https://docs.hortonworks.com/HDPDocuments/HDP3/HDP-3.1.0/bk_cloud-data-access/content/gcp-get-started.html>`_
-* `Cloudera: Configuring Google Cloud Storage Connectivity <https://www.cloudera.com/documentation/enterprise/latest/topics/admin_gcs_config.html>`_
-
-GCS access is typically configured in ``core-site.xml``, to be used by all components using Apache Hadoop.
-
-GCS connector for Hadoop provides an implementation of a Hadoop FileSystem.
-Unfortunately GCS IAM permissions don't map to POSIX permissions required by Hadoop FileSystem,
-so the GCS connector presents fake POSIX file permissions.
-
-When Hive metastore accesses GCS, it see fake POSIX permissions equal to ``0700`` by default.
-If Trino and Hive metastore are running as different user accounts, this causes Hive metastore
-to deny Trino data access.
-There are two possible solutions to this problem:
-
-* Run Trino service and Hive service as the same user.
-* Make sure Hive GCS configuration includes a ``fs.gs.reported.permissions`` property
-  with a value of ``777``.
-
-Accessing GCS data from Trino for the first time
--------------------------------------------------
-
-Accessing data already mapped in the Hive metastore
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If you migrate to Trino from Hive, chances are that your GCS data is already mapped to
-SQL tables in the metastore.
-In that case, you should be able to query it.
-
-Accessing data not yet mapped in the Hive metastore
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-To access GCS data that is not yet mapped in the Hive metastore you need to provide the
-schema of the data, the file format, and the data location.
-For example, if you have ORC or Parquet files in an GCS bucket ``my_bucket``, you need to execute a query::
-
-    -- select schema in which the table will be defined, must already exist
-    USE hive.default;
-
-    -- create table
-    CREATE TABLE orders (
-         orderkey bigint,
-         custkey bigint,
-         orderstatus varchar(1),
-         totalprice double,
-         orderdate date,
-         orderpriority varchar(15),
-         clerk varchar(15),
-         shippriority integer,
-         comment varchar(79)
-    ) WITH (
-         external_location = 'gs://my_bucket/path/to/folder',
-         format = 'ORC' -- or 'PARQUET'
-    );
-
-Now you should be able to query the newly mapped table::
-
-    SELECT * FROM orders;
-
-Writing GCS data with Trino
-----------------------------
-
-Prerequisites
-^^^^^^^^^^^^^
-
-Before you attempt to write data to GCS, make sure you have configured everything
-necessary to read data from GCS.
-
-Create export schema
-^^^^^^^^^^^^^^^^^^^^
-
-If Hive metastore contains schema(s) mapped to GCS locations, you can use them to
-export data to GCS.
-If you don't want to use existing schemas, or there are no appropriate schemas in
-the Hive metastore, you need to create a new one::
-
-    CREATE SCHEMA hive.gcs_export WITH (location = 'gs://my_bucket/some/path');
-
-Export data to GCS
-^^^^^^^^^^^^^^^^^^
-
-Once you have a schema pointing to a location, where you want to export the data, you can issue
-the export using a ``CREATE TABLE AS`` statement and select your desired file format. The data
-is written to one or more files within the ``gs://my_bucket/some/path/my_table`` namespace.
-Example::
-
-    CREATE TABLE hive.gcs_export.orders_export
-    WITH (format = 'ORC')
-    AS SELECT * FROM tpch.sf1.orders;
diff --git a/docs/src/main/sphinx/connector/hive-s3.md b/docs/src/main/sphinx/connector/hive-s3.md
new file mode 100644
index 000000000000..8cfdfb450de7
--- /dev/null
+++ b/docs/src/main/sphinx/connector/hive-s3.md
@@ -0,0 +1,314 @@
+# Hive connector with Amazon S3
+
+The {doc}`hive` can read and write tables that are stored in
+[Amazon S3](https://aws.amazon.com/s3/) or S3-compatible systems.
+This is accomplished by having a table or database location that
+uses an S3 prefix, rather than an HDFS prefix.
+
+Trino uses its own S3 filesystem for the URI prefixes
+`s3://`, `s3n://` and  `s3a://`.
+
+(hive-s3-configuration)=
+
+## S3 configuration properties
+
+```{eval-rst}
+.. list-table::
+    :widths: 35, 65
+    :header-rows: 1
+
+    * - Property name
+      - Description
+    * - ``hive.s3.aws-access-key``
+      - Default AWS access key to use.
+    * - ``hive.s3.aws-secret-key``
+      - Default AWS secret key to use.
+    * - ``hive.s3.iam-role``
+      - IAM role to assume.
+    * - ``hive.s3.external-id``
+      - External ID for the IAM role trust policy.
+    * - ``hive.s3.endpoint``
+      - The S3 storage endpoint server. This can be used to connect to an
+        S3-compatible storage system instead of AWS. When using v4 signatures,
+        it is recommended to set this to the AWS region-specific endpoint
+        (e.g., ``http[s]://s3.<AWS-region>.amazonaws.com``).
+    * - ``hive.s3.region``
+      - Optional property to force the S3 client to connect to the specified
+        region only.
+    * - ``hive.s3.storage-class``
+      - The S3 storage class to use when writing the data. Currently only
+        ``STANDARD`` and ``INTELLIGENT_TIERING`` storage classes are supported.
+        Default storage class is ``STANDARD``
+    * - ``hive.s3.signer-type``
+      - Specify a different signer type for S3-compatible storage.
+        Example: ``S3SignerType`` for v2 signer type
+    * - ``hive.s3.signer-class``
+      - Specify a different signer class for S3-compatible storage.
+    * - ``hive.s3.path-style-access``
+      - Use path-style access for all requests to the S3-compatible storage.
+        This is for S3-compatible storage that doesn't support
+        virtual-hosted-style access, defaults to ``false``.
+    * - ``hive.s3.staging-directory``
+      - Local staging directory for data written to S3. This defaults to the
+        Java temporary directory specified by the JVM system property
+        ``java.io.tmpdir``.
+    * - ``hive.s3.pin-client-to-current-region``
+      - Pin S3 requests to the same region as the EC2 instance where Trino is
+        running, defaults to ``false``.
+    * - ``hive.s3.ssl.enabled``
+      - Use HTTPS to communicate with the S3 API, defaults to ``true``.
+    * - ``hive.s3.sse.enabled``
+      - Use S3 server-side encryption, defaults to ``false``.
+    * - ``hive.s3.sse.type``
+      - The type of key management for S3 server-side encryption. Use ``S3``
+        for S3 managed or ``KMS`` for KMS-managed keys, defaults to ``S3``.
+    * - ``hive.s3.sse.kms-key-id``
+      - The KMS Key ID to use for S3 server-side encryption with KMS-managed
+        keys. If not set, the default key is used.
+    * - ``hive.s3.kms-key-id``
+      - If set, use S3 client-side encryption and use the AWS KMS to store
+        encryption keys and use the value of this property as the KMS Key ID for
+        newly created objects.
+    * - ``hive.s3.encryption-materials-provider``
+      - If set, use S3 client-side encryption and use the value of this property
+        as the fully qualified name of a Java class which implements the AWS
+        SDK's ``EncryptionMaterialsProvider`` interface. If the class also
+        implements ``Configurable`` from the Hadoop API, the Hadoop
+        configuration will be passed in after the object has been created.
+    * - ``hive.s3.upload-acl-type``
+      - Canned ACL to use while uploading files to S3, defaults to ``PRIVATE``.
+        If the files are to be uploaded to an S3 bucket owned by a different AWS
+        user, the canned ACL has to be set to one of the following:
+        ``AUTHENTICATED_READ``, ``AWS_EXEC_READ``, ``BUCKET_OWNER_FULL_CONTROL``,
+        ``BUCKET_OWNER_READ``, ``LOG_DELIVERY_WRITE``, ``PUBLIC_READ``,
+        ``PUBLIC_READ_WRITE``. Refer to the `AWS canned ACL <https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-s3-acls.html>`_
+        guide to understand each option's definition.
+    * - ``hive.s3.skip-glacier-objects``
+      - Ignore Glacier objects rather than failing the query. This skips data
+        that may be expected to be part of the table or partition. Defaults to
+        ``false``.
+    * - ``hive.s3.streaming.enabled``
+      - Use S3 multipart upload API to upload file in streaming way, without
+        staging file to be created in the local file system.
+    * - ``hive.s3.streaming.part-size``
+      - The part size for S3 streaming upload. Defaults to ``16MB``.
+    * - ``hive.s3.proxy.host``
+      - Proxy host to use if connecting through a proxy.
+    * - ``hive.s3.proxy.port``
+      - Proxy port to use if connecting through a proxy.
+    * - ``hive.s3.proxy.protocol``
+      - Proxy protocol. HTTP or HTTPS , defaults to ``HTTPS``.
+    * - ``hive.s3.proxy.non-proxy-hosts``
+      - Hosts list to access without going through the proxy.
+    * - ``hive.s3.proxy.username``
+      - Proxy user name to use if connecting through a proxy.
+    * - ``hive.s3.proxy.password``
+      - Proxy password to use if connecting through a proxy.
+    * - ``hive.s3.proxy.preemptive-basic-auth``
+      - Whether to attempt to authenticate preemptively against proxy when using
+        base authorization, defaults to ``false``.
+    * - ``hive.s3.sts.endpoint``
+      - Optional override for the sts endpoint given that IAM role based
+        authentication via sts is used.
+    * - ``hive.s3.sts.region``
+      - Optional override for the sts region given that IAM role based
+        authentication via sts is used.
+```
+
+(hive-s3-credentials)=
+
+## S3 credentials
+
+If you are running Trino on Amazon EC2, using EMR or another facility,
+it is recommended that you use IAM Roles for EC2 to govern access to S3.
+To enable this, your EC2 instances need to be assigned an IAM Role which
+grants appropriate access to the data stored in the S3 bucket(s) you wish
+to use. It is also possible to configure an IAM role with `hive.s3.iam-role`
+that is used for accessing any S3 bucket. This is much cleaner than
+setting AWS access and secret keys in the `hive.s3.aws-access-key`
+and `hive.s3.aws-secret-key` settings, and also allows EC2 to automatically
+rotate credentials on a regular basis without any additional work on your part.
+
+## Custom S3 credentials provider
+
+You can configure a custom S3 credentials provider by setting the configuration
+property `trino.s3.credentials-provider` to the fully qualified class name of
+a custom AWS credentials provider implementation. The property must be set in
+the Hadoop configuration files referenced by the `hive.config.resources` Hive
+connector property.
+
+The class must implement the
+[AWSCredentialsProvider](http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html)
+interface and provide a two-argument constructor that takes a
+`java.net.URI` and a Hadoop `org.apache.hadoop.conf.Configuration`
+as arguments. A custom credentials provider can be used to provide
+temporary credentials from STS (using `STSSessionCredentialsProvider`),
+IAM role-based credentials (using `STSAssumeRoleSessionCredentialsProvider`),
+or credentials for a specific use case (e.g., bucket/user specific credentials).
+
+(hive-s3-security-mapping)=
+
+## S3 security mapping
+
+Trino supports flexible security mapping for S3, allowing for separate
+credentials or IAM roles for specific users or buckets/paths. The IAM role
+for a specific query can be selected from a list of allowed roles by providing
+it as an *extra credential*.
+
+Each security mapping entry may specify one or more match criteria. If multiple
+criteria are specified, all criteria must match. Available match criteria:
+
+- `user`: Regular expression to match against username. Example: `alice|bob`
+- `group`: Regular expression to match against any of the groups that the user
+  belongs to. Example: `finance|sales`
+- `prefix`: S3 URL prefix. It can specify an entire bucket or a path within a
+  bucket. The URL must start with `s3://` but will also match `s3a` or `s3n`.
+  Example: `s3://bucket-name/abc/xyz/`
+
+The security mapping must provide one or more configuration settings:
+
+- `accessKey` and `secretKey`: AWS access key and secret key. This overrides
+  any globally configured credentials, such as access key or instance credentials.
+- `iamRole`: IAM role to use if no user provided role is specified as an
+  extra credential. This overrides any globally configured IAM role. This role
+  is allowed to be specified as an extra credential, although specifying it
+  explicitly has no effect, as it would be used anyway.
+- `roleSessionName`: Optional role session name to use with `iamRole`. This can only
+  be used when `iamRole` is specified. If `roleSessionName` includes the string
+  `${USER}`, then the `${USER}` portion of the string will be replaced with the
+  current session's username. If `roleSessionName` is not specified, it defaults
+  to `trino-session`.
+- `allowedIamRoles`: IAM roles that are allowed to be specified as an extra
+  credential. This is useful because a particular AWS account may have permissions
+  to use many roles, but a specific user should only be allowed to use a subset
+  of those roles.
+- `kmsKeyId`: ID of KMS-managed key to be used for client-side encryption.
+- `allowedKmsKeyIds`: KMS-managed key IDs that are allowed to be specified as an extra
+  credential. If list cotains "\*", then any key can be specified via extra credential.
+
+The security mapping entries are processed in the order listed in the configuration
+JSON. More specific mappings should thus be specified before less specific mappings.
+For example, the mapping list might have URL prefix `s3://abc/xyz/` followed by
+`s3://abc/` to allow different configuration for a specific path within a bucket
+than for other paths within the bucket. You can set default configuration by not
+including any match criteria for the last entry in the list.
+
+In addition to the rules above, the default mapping can contain the optional
+`useClusterDefault` boolean property with the following behavior:
+
+- `false` - (is set by default) property is ignored.
+
+- `true` - This causes the default cluster role to be used as a fallback option.
+  It can not be used with the following configuration properties:
+
+  - `accessKey`
+  - `secretKey`
+  - `iamRole`
+  - `allowedIamRoles`
+
+If no mapping entry matches and no default is configured, the access is denied.
+
+The configuration JSON can either be retrieved from a file or REST-endpoint specified via
+`hive.s3.security-mapping.config-file`.
+
+Example JSON configuration:
+
+```json
+{
+  "mappings": [
+    {
+      "prefix": "s3://bucket-name/abc/",
+      "iamRole": "arn:aws:iam::123456789101:role/test_path"
+    },
+    {
+      "user": "bob|charlie",
+      "iamRole": "arn:aws:iam::123456789101:role/test_default",
+      "allowedIamRoles": [
+        "arn:aws:iam::123456789101:role/test1",
+        "arn:aws:iam::123456789101:role/test2",
+        "arn:aws:iam::123456789101:role/test3"
+      ]
+    },
+    {
+      "prefix": "s3://special-bucket/",
+      "accessKey": "AKIAxxxaccess",
+      "secretKey": "iXbXxxxsecret"
+    },
+    {
+      "prefix": "s3://encrypted-bucket/",
+      "kmsKeyId": "kmsKey_10",
+    },
+    {
+      "user": "test.*",
+      "iamRole": "arn:aws:iam::123456789101:role/test_users"
+    },
+    {
+      "group": "finance",
+      "iamRole": "arn:aws:iam::123456789101:role/finance_users"
+    },
+    {
+      "iamRole": "arn:aws:iam::123456789101:role/default"
+    }
+  ]
+}
+```
+
+| Property name                                         | Description                                                                                                                                                                                                                                                                                        |
+| ----------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `hive.s3.security-mapping.config-file`                | The JSON configuration file or REST-endpoint URI containing security mappings.                                                                                                                                                                                                                     |
+| `hive.s3.security-mapping.json-pointer`               | A JSON pointer (RFC 6901) to mappings inside the JSON retrieved from the config file or REST-endpont. The whole document ("") by default.                                                                                                                                                          |
+| `hive.s3.security-mapping.iam-role-credential-name`   | The name of the *extra credential* used to provide the IAM role.                                                                                                                                                                                                                                   |
+| `hive.s3.security-mapping.kms-key-id-credential-name` | The name of the *extra credential* used to provide the KMS-managed key ID.                                                                                                                                                                                                                         |
+| `hive.s3.security-mapping.refresh-period`             | How often to refresh the security mapping configuration.                                                                                                                                                                                                                                           |
+| `hive.s3.security-mapping.colon-replacement`          | The character or characters to be used in place of the colon (`:`) character when specifying an IAM role name as an extra credential. Any instances of this replacement value in the extra credential value will be converted to a colon. Choose a value that is not used in any of your IAM ARNs. |
+
+(hive-s3-tuning-configuration)=
+
+## Tuning properties
+
+The following tuning properties affect the behavior of the client
+used by the Trino S3 filesystem when communicating with S3.
+Most of these parameters affect settings on the `ClientConfiguration`
+object associated with the `AmazonS3Client`.
+
+| Property name                     | Description                                                                                       | Default                    |
+| --------------------------------- | ------------------------------------------------------------------------------------------------- | -------------------------- |
+| `hive.s3.max-error-retries`       | Maximum number of error retries, set on the S3 client.                                            | `10`                       |
+| `hive.s3.max-client-retries`      | Maximum number of read attempts to retry.                                                         | `5`                        |
+| `hive.s3.max-backoff-time`        | Use exponential backoff starting at 1 second up to this maximum value when communicating with S3. | `10 minutes`               |
+| `hive.s3.max-retry-time`          | Maximum time to retry communicating with S3.                                                      | `10 minutes`               |
+| `hive.s3.connect-timeout`         | TCP connect timeout.                                                                              | `5 seconds`                |
+| `hive.s3.connect-ttl`             | TCP connect TTL, which affects connection reusage.                                                | Connections do not expire. |
+| `hive.s3.socket-timeout`          | TCP socket read timeout.                                                                          | `5 seconds`                |
+| `hive.s3.max-connections`         | Maximum number of simultaneous open connections to S3.                                            | `500`                      |
+| `hive.s3.multipart.min-file-size` | Minimum file size before multi-part upload to S3 is used.                                         | `16 MB`                    |
+| `hive.s3.multipart.min-part-size` | Minimum multi-part upload part size.                                                              | `5 MB`                     |
+
+(hive-s3-data-encryption)=
+
+## S3 data encryption
+
+Trino supports reading and writing encrypted data in S3 using both
+server-side encryption with S3 managed keys and client-side encryption using
+either the Amazon KMS or a software plugin to manage AES encryption keys.
+
+With [S3 server-side encryption](http://docs.aws.amazon.com/AmazonS3/latest/dev/serv-side-encryption.html),
+called *SSE-S3* in the Amazon documentation, the S3 infrastructure takes care of all encryption and decryption
+work. One exception is SSL to the client, assuming you have `hive.s3.ssl.enabled` set to `true`.
+S3 also manages all the encryption keys for you. To enable this, set `hive.s3.sse.enabled` to `true`.
+
+With [S3 client-side encryption](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingClientSideEncryption.html),
+S3 stores encrypted data and the encryption keys are managed outside of the S3 infrastructure. Data is encrypted
+and decrypted by Trino instead of in the S3 infrastructure. In this case, encryption keys can be managed
+either by using the AWS KMS, or your own key management system. To use the AWS KMS for key management, set
+`hive.s3.kms-key-id` to the UUID of a KMS key. Your AWS credentials or EC2 IAM role will need to be
+granted permission to use the given key as well.
+
+To use a custom encryption key management system, set `hive.s3.encryption-materials-provider` to the
+fully qualified name of a class which implements the
+[EncryptionMaterialsProvider](http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/services/s3/model/EncryptionMaterialsProvider.html)
+interface from the AWS Java SDK. This class has to be accessible to the Hive Connector through the
+classpath and must be able to communicate with your custom key management system. If this class also implements
+the `org.apache.hadoop.conf.Configurable` interface from the Hadoop Java API, then the Hadoop configuration
+is passed in after the object instance is created, and before it is asked to provision or retrieve any
+encryption keys.
diff --git a/docs/src/main/sphinx/connector/hive-s3.rst b/docs/src/main/sphinx/connector/hive-s3.rst
deleted file mode 100644
index 3d95acf5cb4a..000000000000
--- a/docs/src/main/sphinx/connector/hive-s3.rst
+++ /dev/null
@@ -1,435 +0,0 @@
-=============================
-Hive connector with Amazon S3
-=============================
-
-The :doc:`hive` can read and write tables that are stored in
-`Amazon S3  <https://aws.amazon.com/s3/>`_ or S3-compatible systems.
-This is accomplished by having a table or database location that
-uses an S3 prefix, rather than an HDFS prefix.
-
-Trino uses its own S3 filesystem for the URI prefixes
-``s3://``, ``s3n://`` and  ``s3a://``.
-
-.. _hive-s3-configuration:
-
-S3 configuration properties
----------------------------
-
-.. list-table::
-    :widths: 35, 65
-    :header-rows: 1
-
-    * - Property name
-      - Description
-    * - ``hive.s3.aws-access-key``
-      - Default AWS access key to use.
-    * - ``hive.s3.aws-secret-key``
-      - Default AWS secret key to use.
-    * - ``hive.s3.iam-role``
-      - IAM role to assume.
-    * - ``hive.s3.external-id``
-      - External ID for the IAM role trust policy.
-    * - ``hive.s3.endpoint``
-      - The S3 storage endpoint server. This can be used to connect to an
-        S3-compatible storage system instead of AWS. When using v4 signatures,
-        it is recommended to set this to the AWS region-specific endpoint
-        (e.g., ``http[s]://s3.<AWS-region>.amazonaws.com``).
-    * - ``hive.s3.region``
-      - Optional property to force the S3 client to connect to the specified
-        region only.
-    * - ``hive.s3.storage-class``
-      - The S3 storage class to use when writing the data. Currently only
-        ``STANDARD`` and ``INTELLIGENT_TIERING`` storage classes are supported.
-        Default storage class is ``STANDARD``
-    * - ``hive.s3.signer-type``
-      - Specify a different signer type for S3-compatible storage.
-        Example: ``S3SignerType`` for v2 signer type
-    * - ``hive.s3.signer-class``
-      - Specify a different signer class for S3-compatible storage.
-    * - ``hive.s3.path-style-access``
-      - Use path-style access for all requests to the S3-compatible storage.
-        This is for S3-compatible storage that doesn't support
-        virtual-hosted-style access, defaults to ``false``.
-    * - ``hive.s3.staging-directory``
-      - Local staging directory for data written to S3. This defaults to the
-        Java temporary directory specified by the JVM system property
-        ``java.io.tmpdir``.
-    * - ``hive.s3.pin-client-to-current-region``
-      - Pin S3 requests to the same region as the EC2 instance where Trino is
-        running, defaults to ``false``.
-    * - ``hive.s3.ssl.enabled``
-      - Use HTTPS to communicate with the S3 API, defaults to ``true``.
-    * - ``hive.s3.sse.enabled``
-      - Use S3 server-side encryption, defaults to ``false``.
-    * - ``hive.s3.sse.type``
-      - The type of key management for S3 server-side encryption. Use ``S3``
-        for S3 managed or ``KMS`` for KMS-managed keys, defaults to ``S3``.
-    * - ``hive.s3.sse.kms-key-id``
-      - The KMS Key ID to use for S3 server-side encryption with KMS-managed
-        keys. If not set, the default key is used.
-    * - ``hive.s3.kms-key-id``
-      - If set, use S3 client-side encryption and use the AWS KMS to store
-        encryption keys and use the value of this property as the KMS Key ID for
-        newly created objects.
-    * - ``hive.s3.encryption-materials-provider``
-      - If set, use S3 client-side encryption and use the value of this property
-        as the fully qualified name of a Java class which implements the AWS
-        SDK's ``EncryptionMaterialsProvider`` interface. If the class also
-        implements ``Configurable`` from the Hadoop API, the Hadoop
-        configuration will be passed in after the object has been created.
-    * - ``hive.s3.upload-acl-type``
-      - Canned ACL to use while uploading files to S3, defaults to ``PRIVATE``.
-        If the files are to be uploaded to an S3 bucket owned by a different AWS
-        user, the canned ACL has to be set to one of the following:
-        ``AUTHENTICATED_READ``, ``AWS_EXEC_READ``, ``BUCKET_OWNER_FULL_CONTROL``,
-        ``BUCKET_OWNER_READ``, ``LOG_DELIVERY_WRITE``, ``PUBLIC_READ``,
-        ``PUBLIC_READ_WRITE``. Refer to the `AWS canned ACL <https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-s3-acls.html>`_
-        guide to understand each option's definition.
-    * - ``hive.s3.skip-glacier-objects``
-      - Ignore Glacier objects rather than failing the query. This skips data
-        that may be expected to be part of the table or partition. Defaults to
-        ``false``.
-    * - ``hive.s3.streaming.enabled``
-      - Use S3 multipart upload API to upload file in streaming way, without
-        staging file to be created in the local file system.
-    * - ``hive.s3.streaming.part-size``
-      - The part size for S3 streaming upload. Defaults to ``16MB``.
-    * - ``hive.s3.proxy.host``
-      - Proxy host to use if connecting through a proxy
-    * - ``hive.s3.proxy.port``
-      - Proxy port to use if connecting through a proxy
-    * - ``hive.s3.proxy.protocol``
-      - Proxy protocol. HTTP or HTTPS , defaults to ``HTTPS``.
-    * - ``hive.s3.proxy.non-proxy-hosts``
-      - Hosts list to access without going through the proxy.
-    * - ``hive.s3.proxy.username``
-      - Proxy user name to use if connecting through a proxy
-    * - ``hive.s3.proxy.password``
-      - Proxy password name to use if connecting through a proxy
-    * - ``hive.s3.proxy.preemptive-basic-auth``
-      - Whether to attempt to authenticate preemptively against proxy when using
-        base authorization, defaults to ``false``.
-    * - ``hive.s3.sts.endpoint``
-      - Optional override for the sts endpoint given that IAM role based
-        authentication via sts is used.
-    * - ``hive.s3.sts.region``
-      - Optional override for the sts region given that IAM role based
-        authentication via sts is used.
-
-.. _hive-s3-credentials:
-
-S3 credentials
---------------
-
-If you are running Trino on Amazon EC2, using EMR or another facility,
-it is recommended that you use IAM Roles for EC2 to govern access to S3.
-To enable this, your EC2 instances need to be assigned an IAM Role which
-grants appropriate access to the data stored in the S3 bucket(s) you wish
-to use. It is also possible to configure an IAM role with ``hive.s3.iam-role``
-that is used for accessing any S3 bucket. This is much cleaner than
-setting AWS access and secret keys in the ``hive.s3.aws-access-key``
-and ``hive.s3.aws-secret-key`` settings, and also allows EC2 to automatically
-rotate credentials on a regular basis without any additional work on your part.
-
-Custom S3 credentials provider
-------------------------------
-
-You can configure a custom S3 credentials provider by setting the configuration
-property ``trino.s3.credentials-provider`` to the fully qualified class name of
-a custom AWS credentials provider implementation. The property must be set in
-the Hadoop configuration files referenced by the ``hive.config.resources`` Hive
-connector property.
-
-The class must implement the
-`AWSCredentialsProvider <http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html>`_
-interface and provide a two-argument constructor that takes a
-``java.net.URI`` and a Hadoop ``org.apache.hadoop.conf.Configuration``
-as arguments. A custom credentials provider can be used to provide
-temporary credentials from STS (using ``STSSessionCredentialsProvider``),
-IAM role-based credentials (using ``STSAssumeRoleSessionCredentialsProvider``),
-or credentials for a specific use case (e.g., bucket/user specific credentials).
-
-
-.. _hive-s3-security-mapping:
-
-S3 security mapping
--------------------
-
-Trino supports flexible security mapping for S3, allowing for separate
-credentials or IAM roles for specific users or buckets/paths. The IAM role
-for a specific query can be selected from a list of allowed roles by providing
-it as an *extra credential*.
-
-Each security mapping entry may specify one or more match criteria. If multiple
-criteria are specified, all criteria must match. Available match criteria:
-
-* ``user``: Regular expression to match against username. Example: ``alice|bob``
-
-* ``group``: Regular expression to match against any of the groups that the user
-  belongs to. Example: ``finance|sales``
-
-* ``prefix``: S3 URL prefix. It can specify an entire bucket or a path within a
-  bucket. The URL must start with ``s3://`` but will also match ``s3a`` or ``s3n``.
-  Example: ``s3://bucket-name/abc/xyz/``
-
-The security mapping must provide one or more configuration settings:
-
-* ``accessKey`` and ``secretKey``: AWS access key and secret key. This overrides
-  any globally configured credentials, such as access key or instance credentials.
-
-* ``iamRole``: IAM role to use if no user provided role is specified as an
-  extra credential. This overrides any globally configured IAM role. This role
-  is allowed to be specified as an extra credential, although specifying it
-  explicitly has no effect, as it would be used anyway.
-
-* ``roleSessionName``: Optional role session name to use with ``iamRole``. This can only
-  be used when ``iamRole`` is specified. If ``roleSessionName`` includes the string
-  ``${USER}``, then the ``${USER}`` portion of the string will be replaced with the
-  current session's username. If ``roleSessionName`` is not specified, it defaults
-  to ``trino-session``.
-
-* ``allowedIamRoles``: IAM roles that are allowed to be specified as an extra
-  credential. This is useful because a particular AWS account may have permissions
-  to use many roles, but a specific user should only be allowed to use a subset
-  of those roles.
-
-* ``kmsKeyId``: ID of KMS-managed key to be used for client-side encryption.
-
-* ``allowedKmsKeyIds``: KMS-managed key IDs that are allowed to be specified as an extra
-  credential. If list cotains "*", then any key can be specified via extra credential.
-
-The security mapping entries are processed in the order listed in the configuration
-JSON. More specific mappings should thus be specified before less specific mappings.
-For example, the mapping list might have URL prefix ``s3://abc/xyz/`` followed by
-``s3://abc/`` to allow different configuration for a specific path within a bucket
-than for other paths within the bucket. You can set default configuration by not
-including any match criteria for the last entry in the list.
-
-In addition to the rules above, the default mapping can contain the optional
-``useClusterDefault`` boolean property with the following behavior:
-
-- ``false`` - (is set by default) property is ignored.
-- ``true`` - This causes the default cluster role to be used as a fallback option.
-  It can not be used with the following configuration properties:
-
-  - ``accessKey``
-  - ``secretKey``
-  - ``iamRole``
-  - ``allowedIamRoles``
-
-If no mapping entry matches and no default is configured, the access is denied.
-
-The configuration JSON can either be retrieved from a file or REST-endpoint specified via
-``hive.s3.security-mapping.config-file``.
-
-Example JSON configuration:
-
-.. code-block:: json
-
-    {
-      "mappings": [
-        {
-          "prefix": "s3://bucket-name/abc/",
-          "iamRole": "arn:aws:iam::123456789101:role/test_path"
-        },
-        {
-          "user": "bob|charlie",
-          "iamRole": "arn:aws:iam::123456789101:role/test_default",
-          "allowedIamRoles": [
-            "arn:aws:iam::123456789101:role/test1",
-            "arn:aws:iam::123456789101:role/test2",
-            "arn:aws:iam::123456789101:role/test3"
-          ]
-        },
-        {
-          "prefix": "s3://special-bucket/",
-          "accessKey": "AKIAxxxaccess",
-          "secretKey": "iXbXxxxsecret"
-        },
-        {
-          "prefix": "s3://encrypted-bucket/",
-          "kmsKeyId": "kmsKey_10",
-        },
-        {
-          "user": "test.*",
-          "iamRole": "arn:aws:iam::123456789101:role/test_users"
-        },
-        {
-          "group": "finance",
-          "iamRole": "arn:aws:iam::123456789101:role/finance_users"
-        },
-        {
-          "iamRole": "arn:aws:iam::123456789101:role/default"
-        }
-      ]
-    }
-
-======================================================= =================================================================
-Property name                                           Description
-======================================================= =================================================================
-``hive.s3.security-mapping.config-file``                The JSON configuration file or REST-endpoint URI containing
-                                                        security mappings.
-``hive.s3.security-mapping.json-pointer``               A JSON pointer (RFC 6901) to mappings inside the JSON retrieved from
-                                                        the config file or REST-endpont. The whole document ("") by default.
-
-``hive.s3.security-mapping.iam-role-credential-name``   The name of the *extra credential* used to provide the IAM role.
-
-``hive.s3.security-mapping.kms-key-id-credential-name`` The name of the *extra credential* used to provide the
-                                                        KMS-managed key ID.
-
-``hive.s3.security-mapping.refresh-period``             How often to refresh the security mapping configuration.
-
-``hive.s3.security-mapping.colon-replacement``          The character or characters to be used in place of the colon
-                                                        (``:``) character when specifying an IAM role name as an
-                                                        extra credential. Any instances of this replacement value in the
-                                                        extra credential value will be converted to a colon. Choose a
-                                                        value that is not used in any of your IAM ARNs.
-======================================================= =================================================================
-
-.. _hive-s3-tuning-configuration:
-
-Tuning properties
------------------
-
-The following tuning properties affect the behavior of the client
-used by the Trino S3 filesystem when communicating with S3.
-Most of these parameters affect settings on the ``ClientConfiguration``
-object associated with the ``AmazonS3Client``.
-
-===================================== =========================================================== ==========================
-Property name                         Description                                                 Default
-===================================== =========================================================== ==========================
-``hive.s3.max-error-retries``         Maximum number of error retries, set on the S3 client.      ``10``
-
-``hive.s3.max-client-retries``        Maximum number of read attempts to retry.                   ``5``
-
-``hive.s3.max-backoff-time``          Use exponential backoff starting at 1 second up to          ``10 minutes``
-                                      this maximum value when communicating with S3.
-
-``hive.s3.max-retry-time``            Maximum time to retry communicating with S3.                ``10 minutes``
-
-``hive.s3.connect-timeout``           TCP connect timeout.                                        ``5 seconds``
-
-``hive.s3.connect-ttl``               TCP connect TTL, which affects connection reusage.          Connections do not expire.
-
-``hive.s3.socket-timeout``            TCP socket read timeout.                                    ``5 seconds``
-
-``hive.s3.max-connections``           Maximum number of simultaneous open connections to S3.      ``500``
-
-``hive.s3.multipart.min-file-size``   Minimum file size before multi-part upload to S3 is used.   ``16 MB``
-
-``hive.s3.multipart.min-part-size``   Minimum multi-part upload part size.                        ``5 MB``
-===================================== =========================================================== ==========================
-
-.. _hive-s3-data-encryption:
-
-S3 data encryption
-------------------
-
-Trino supports reading and writing encrypted data in S3 using both
-server-side encryption with S3 managed keys and client-side encryption using
-either the Amazon KMS or a software plugin to manage AES encryption keys.
-
-With `S3 server-side encryption <http://docs.aws.amazon.com/AmazonS3/latest/dev/serv-side-encryption.html>`_,
-called *SSE-S3* in the Amazon documentation, the S3 infrastructure takes care of all encryption and decryption
-work. One exception is SSL to the client, assuming you have ``hive.s3.ssl.enabled`` set to ``true``.
-S3 also manages all the encryption keys for you. To enable this, set ``hive.s3.sse.enabled`` to ``true``.
-
-With `S3 client-side encryption <http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingClientSideEncryption.html>`_,
-S3 stores encrypted data and the encryption keys are managed outside of the S3 infrastructure. Data is encrypted
-and decrypted by Trino instead of in the S3 infrastructure. In this case, encryption keys can be managed
-either by using the AWS KMS, or your own key management system. To use the AWS KMS for key management, set
-``hive.s3.kms-key-id`` to the UUID of a KMS key. Your AWS credentials or EC2 IAM role will need to be
-granted permission to use the given key as well.
-
-To use a custom encryption key management system, set ``hive.s3.encryption-materials-provider`` to the
-fully qualified name of a class which implements the
-`EncryptionMaterialsProvider <http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/services/s3/model/EncryptionMaterialsProvider.html>`_
-interface from the AWS Java SDK. This class has to be accessible to the Hive Connector through the
-classpath and must be able to communicate with your custom key management system. If this class also implements
-the ``org.apache.hadoop.conf.Configurable`` interface from the Hadoop Java API, then the Hadoop configuration
-is passed in after the object instance is created, and before it is asked to provision or retrieve any
-encryption keys.
-
-.. _s3selectpushdown:
-
-S3 Select pushdown
-------------------
-
-S3 Select pushdown enables pushing down projection (SELECT) and predicate (WHERE)
-processing to `S3 Select <https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectSELECTContent.html>`_.
-With S3 Select Pushdown, Trino only retrieves the required data from S3 instead
-of entire S3 objects, reducing both latency and network usage.
-
-Is S3 Select a good fit for my workload?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Performance of S3 Select pushdown depends on the amount of data filtered by the
-query. Filtering a large number of rows should result in better performance. If
-the query doesn't filter any data, then pushdown may not add any additional value
-and the user is charged for S3 Select requests. Thus, we recommend that you
-benchmark your workloads with and without S3 Select to see if using it may be
-suitable for your workload. By default, S3 Select Pushdown is disabled and you
-should enable it in production after proper benchmarking and cost analysis. For
-more information on S3 Select request cost, please see
-`Amazon S3 Cloud Storage Pricing <https://aws.amazon.com/s3/pricing/>`_.
-
-Use the following guidelines to determine if S3 Select is a good fit for your
-workload:
-
-* Your query filters out more than half of the original data set.
-* Your query filter predicates use columns that have a data type supported by
-  Trino and S3 Select.
-  The ``TIMESTAMP``, ``REAL``, and ``DOUBLE`` data types are not supported by S3
-  Select Pushdown. We recommend using the decimal data type for numerical data.
-  For more information about supported data types for S3 Select, see the
-  `Data Types documentation <https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-glacier-select-sql-reference-data-types.html>`_.
-* Your network connection between Amazon S3 and the Amazon EMR cluster has good
-  transfer speed and available bandwidth. Amazon S3 Select does not compress
-  HTTP responses, so the response size may increase for compressed input files.
-
-Considerations and limitations
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* Only objects stored in CSV and JSON format are supported. Objects can be uncompressed,
-  or optionally compressed with gzip or bzip2.
-* The "AllowQuotedRecordDelimiters" property is not supported. If this property
-  is specified, the query fails.
-* Amazon S3 server-side encryption with customer-provided encryption keys
-  (SSE-C) and client-side encryption are not supported.
-* S3 Select Pushdown is not a substitute for using columnar or compressed file
-  formats such as ORC and Parquet.
-
-Enabling S3 Select pushdown
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can enable S3 Select Pushdown using the ``s3_select_pushdown_enabled``
-Hive session property, or using the ``hive.s3select-pushdown.enabled``
-configuration property. The session property overrides the config
-property, allowing you enable or disable on a per-query basis. Non-filtering
-queries (``SELECT * FROM table``) are not pushed down to S3 Select,
-as they retrieve the entire object content.
-
-For uncompressed files, S3 Select scans ranges of bytes in parallel. The scan range
-requests run across the byte ranges of the internal Hive splits for the query fragments
-pushed down to S3 Select. Changes in the Hive connector :ref:`performance tuning
-configuration properties <hive-performance-tuning-configuration>` are likely to impact
-S3 Select pushdown performance.
-
-
-Understanding and tuning the maximum connections
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Trino can use its native S3 file system or EMRFS. When using the native FS, the
-maximum connections is configured via the ``hive.s3.max-connections``
-configuration property. When using EMRFS, the maximum connections is configured
-via the ``fs.s3.maxConnections`` Hadoop configuration property.
-
-S3 Select Pushdown bypasses the file systems, when accessing Amazon S3 for
-predicate operations. In this case, the value of
-``hive.s3select-pushdown.max-connections`` determines the maximum number of
-client connections allowed for those operations from worker nodes.
-
-If your workload experiences the error *Timeout waiting for connection from
-pool*, increase the value of both ``hive.s3select-pushdown.max-connections`` and
-the maximum connections configuration for the file system you are using.
diff --git a/docs/src/main/sphinx/connector/hive-security.md b/docs/src/main/sphinx/connector/hive-security.md
new file mode 100644
index 000000000000..9ebdd748baa1
--- /dev/null
+++ b/docs/src/main/sphinx/connector/hive-security.md
@@ -0,0 +1,407 @@
+# Hive connector security configuration
+
+(hive-security-impersonation)=
+
+## Overview
+
+The Hive connector supports both authentication and authorization.
+
+Trino can impersonate the end user who is running a query. In the case of a
+user running a query from the command line interface, the end user is the
+username associated with the Trino CLI process or argument to the optional
+`--user` option.
+
+Authentication can be configured with or without user impersonation on
+Kerberized Hadoop clusters.
+
+## Requirements
+
+End user authentication limited to Kerberized Hadoop clusters. Authentication
+user impersonation is available for both Kerberized and non-Kerberized clusters.
+
+You must ensure that you meet the Kerberos, user impersonation and keytab
+requirements described in this section that apply to your configuration.
+
+(hive-security-kerberos-support)=
+
+### Kerberos
+
+In order to use the Hive connector with a Hadoop cluster that uses `kerberos`
+authentication, you must configure the connector to work with two services on
+the Hadoop cluster:
+
+- The Hive metastore Thrift service
+- The Hadoop Distributed File System (HDFS)
+
+Access to these services by the Hive connector is configured in the properties
+file that contains the general Hive connector configuration.
+
+Kerberos authentication by ticket cache is not yet supported.
+
+:::{note}
+If your `krb5.conf` location is different from `/etc/krb5.conf` you
+must set it explicitly using the `java.security.krb5.conf` JVM property
+in `jvm.config` file.
+
+Example: `-Djava.security.krb5.conf=/example/path/krb5.conf`.
+:::
+
+:::{warning}
+Access to the Trino coordinator must be secured e.g., using Kerberos or
+password authentication, when using Kerberos authentication to Hadoop services.
+Failure to secure access to the Trino coordinator could result in unauthorized
+access to sensitive data on the Hadoop cluster. Refer to {doc}`/security` for
+further information.
+
+See {doc}`/security/kerberos` for information on setting up Kerberos authentication.
+:::
+
+(hive-security-additional-keytab)=
+
+#### Keytab files
+
+Keytab files contain encryption keys that are used to authenticate principals
+to the Kerberos {abbr}`KDC (Key Distribution Center)`. These encryption keys
+must be stored securely; you must take the same precautions to protect them
+that you take to protect ssh private keys.
+
+In particular, access to keytab files must be limited to only the accounts
+that must use them to authenticate. In practice, this is the user that
+the Trino process runs as. The ownership and permissions on keytab files
+must be set to prevent other users from reading or modifying the files.
+
+Keytab files must be distributed to every node running Trino. Under common
+deployment situations, the Hive connector configuration is the same on all
+nodes. This means that the keytab needs to be in the same location on every
+node.
+
+You must ensure that the keytab files have the correct permissions on every
+node after distributing them.
+
+(configuring-hadoop-impersonation)=
+
+### Impersonation in Hadoop
+
+In order to use impersonation, the Hadoop cluster must be
+configured to allow the user or principal that Trino is running as to
+impersonate the users who log in to Trino. Impersonation in Hadoop is
+configured in the file {file}`core-site.xml`. A complete description of the
+configuration options can be found in the [Hadoop documentation](https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/Superusers.html#Configurations).
+
+## Authentication
+
+The default security configuration of the {doc}`/connector/hive` does not use
+authentication when connecting to a Hadoop cluster. All queries are executed as
+the user who runs the Trino process, regardless of which user submits the
+query.
+
+The Hive connector provides additional security options to support Hadoop
+clusters that have been configured to use {ref}`Kerberos
+<hive-security-kerberos-support>`.
+
+When accessing {abbr}`HDFS (Hadoop Distributed File System)`, Trino can
+{ref}`impersonate<hive-security-impersonation>` the end user who is running the
+query. This can be used with HDFS permissions and {abbr}`ACLs (Access Control
+Lists)` to provide additional security for data.
+
+### Hive metastore Thrift service authentication
+
+In a Kerberized Hadoop cluster, Trino connects to the Hive metastore Thrift
+service using {abbr}`SASL (Simple Authentication and Security Layer)` and
+authenticates using Kerberos. Kerberos authentication for the metastore is
+configured in the connector's properties file using the following optional
+properties:
+
+```{eval-rst}
+.. list-table:: Hive metastore Thrift service authentication properties
+  :widths: 30, 55, 15
+  :header-rows: 1
+
+  * - Property value
+    - Description
+    - Default
+  * - ``hive.metastore.authentication.type``
+    - Hive metastore authentication type. One of ``NONE`` or ``KERBEROS``. When
+      using the default value of ``NONE``, Kerberos authentication is disabled,
+      and no other properties must be configured.
+
+      When set to ``KERBEROS`` the Hive connector connects to the Hive metastore
+      Thrift service using SASL and authenticate using Kerberos.
+    - ``NONE``
+  * - ``hive.metastore.thrift.impersonation.enabled``
+    - Enable Hive metastore end user impersonation. See
+      :ref:`hive-security-metastore-impersonation` for more information.
+    - ``false``
+  * - ``hive.metastore.service.principal``
+    - The Kerberos principal of the Hive metastore service. The coordinator
+      uses this to authenticate the Hive metastore.
+
+      The ``_HOST`` placeholder can be used in this property value. When
+      connecting to the Hive metastore, the Hive connector substitutes in the
+      hostname of the **metastore** server it is connecting to. This is useful
+      if the metastore runs on multiple hosts.
+
+      Example: ``hive/hive-server-host@EXAMPLE.COM`` or
+      ``hive/_HOST@EXAMPLE.COM``.
+    -
+  * - ``hive.metastore.client.principal``
+    - The Kerberos principal that Trino uses when connecting to the Hive
+      metastore service.
+
+      Example: ``trino/trino-server-node@EXAMPLE.COM`` or
+      ``trino/_HOST@EXAMPLE.COM``.
+
+      The ``_HOST`` placeholder can be used in this property value. When
+      connecting to the Hive metastore, the Hive connector substitutes in the
+      hostname of the **worker** node Trino is running on. This is useful if
+      each worker node has its own Kerberos principal.
+
+      Unless :ref:`hive-security-metastore-impersonation` is enabled,
+      the principal specified by ``hive.metastore.client.principal`` must have
+      sufficient privileges to remove files and directories within the
+      ``hive/warehouse`` directory.
+
+      **Warning:** If the principal does have sufficient permissions, only the
+      metadata is removed, and the data continues to consume disk space. This
+      occurs because the Hive metastore is responsible for deleting the
+      internal table data. When the metastore is configured to use Kerberos
+      authentication, all of the HDFS operations performed by the metastore are
+      impersonated. Errors deleting data are silently ignored.
+    -
+  * - ``hive.metastore.client.keytab``
+    - The path to the keytab file that contains a key for the principal
+      specified by ``hive.metastore.client.principal``. This file must be
+      readable by the operating system user running Trino.
+    -
+```
+
+#### Configuration examples
+
+The following sections describe the configuration properties and values needed
+for the various authentication configurations needed to use the Hive metastore
+Thrift service with the Hive connector.
+
+##### Default `NONE` authentication without impersonation
+
+```text
+hive.metastore.authentication.type=NONE
+```
+
+The default authentication type for the Hive metastore is `NONE`. When the
+authentication type is `NONE`, Trino connects to an unsecured Hive
+metastore. Kerberos is not used.
+
+(hive-security-metastore-impersonation)=
+
+##### `KERBEROS` authentication with impersonation
+
+```text
+hive.metastore.authentication.type=KERBEROS
+hive.metastore.thrift.impersonation.enabled=true
+hive.metastore.service.principal=hive/hive-metastore-host.example.com@EXAMPLE.COM
+hive.metastore.client.principal=trino@EXAMPLE.COM
+hive.metastore.client.keytab=/etc/trino/hive.keytab
+```
+
+When the authentication type for the Hive metastore Thrift service is
+`KERBEROS`, Trino connects as the Kerberos principal specified by the
+property `hive.metastore.client.principal`. Trino authenticates this
+principal using the keytab specified by the `hive.metastore.client.keytab`
+property, and verifies that the identity of the metastore matches
+`hive.metastore.service.principal`.
+
+When using `KERBEROS` Metastore authentication with impersonation, the
+principal specified by the `hive.metastore.client.principal` property must be
+allowed to impersonate the current Trino user, as discussed in the section
+{ref}`configuring-hadoop-impersonation`.
+
+Keytab files must be distributed to every node in the cluster that runs Trino.
+
+{ref}`Additional Information About Keytab Files.<hive-security-additional-keytab>`
+
+### HDFS authentication
+
+In a Kerberized Hadoop cluster, Trino authenticates to HDFS using Kerberos.
+Kerberos authentication for HDFS is configured in the connector's properties
+file using the following optional properties:
+
+```{eval-rst}
+.. list-table:: HDFS authentication properties
+  :widths: 30, 55, 15
+  :header-rows: 1
+
+  * - Property value
+    - Description
+    - Default
+  * - ``hive.hdfs.authentication.type``
+    - HDFS authentication type; one of ``NONE`` or ``KERBEROS``. When using the
+      default value of ``NONE``, Kerberos authentication is disabled, and no
+      other properties must be configured.
+
+      When set to ``KERBEROS``, the Hive connector authenticates to HDFS using
+      Kerberos.
+    - ``NONE``
+  * - ``hive.hdfs.impersonation.enabled``
+    - Enable HDFS end-user impersonation. Impersonating the end user can provide
+      additional security when accessing HDFS if HDFS permissions or ACLs are
+      used.
+
+      HDFS Permissions and ACLs are explained in the `HDFS Permissions Guide
+      <https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/HdfsPermissionsGuide.html>`_.
+    - ``false``
+  * - ``hive.hdfs.trino.principal``
+    - The Kerberos principal Trino uses when connecting to HDFS.
+
+      Example: ``trino-hdfs-superuser/trino-server-node@EXAMPLE.COM`` or
+      ``trino-hdfs-superuser/_HOST@EXAMPLE.COM``.
+
+      The ``_HOST`` placeholder can be used in this property value. When
+      connecting to HDFS, the Hive connector substitutes in the hostname of the
+      **worker** node Trino is running on. This is useful if each worker node
+      has its own Kerberos principal.
+    -
+  * - ``hive.hdfs.trino.keytab``
+    - The path to the keytab file that contains a key for the principal
+      specified by ``hive.hdfs.trino.principal``. This file must be readable by
+      the operating system user running Trino.
+    -
+  * - ``hive.hdfs.wire-encryption.enabled``
+    - Enable HDFS wire encryption. In a Kerberized Hadoop cluster that uses HDFS
+      wire encryption, this must be set to ``true`` to enable Trino to access
+      HDFS. Note that using wire encryption may impact query execution
+      performance.
+    -
+```
+
+#### Configuration examples
+
+The following sections describe the configuration properties and values needed
+for the various authentication configurations with HDFS and the Hive connector.
+
+(hive-security-simple)=
+
+##### Default `NONE` authentication without impersonation
+
+```text
+hive.hdfs.authentication.type=NONE
+```
+
+The default authentication type for HDFS is `NONE`. When the authentication
+type is `NONE`, Trino connects to HDFS using Hadoop's simple authentication
+mechanism. Kerberos is not used.
+
+(hive-security-simple-impersonation)=
+
+##### `NONE` authentication with impersonation
+
+```text
+hive.hdfs.authentication.type=NONE
+hive.hdfs.impersonation.enabled=true
+```
+
+When using `NONE` authentication with impersonation, Trino impersonates
+the user who is running the query when accessing HDFS. The user Trino is
+running as must be allowed to impersonate this user, as discussed in the
+section {ref}`configuring-hadoop-impersonation`. Kerberos is not used.
+
+(hive-security-kerberos)=
+
+##### `KERBEROS` authentication without impersonation
+
+```text
+hive.hdfs.authentication.type=KERBEROS
+hive.hdfs.trino.principal=hdfs@EXAMPLE.COM
+hive.hdfs.trino.keytab=/etc/trino/hdfs.keytab
+```
+
+When the authentication type is `KERBEROS`, Trino accesses HDFS as the
+principal specified by the `hive.hdfs.trino.principal` property. Trino
+authenticates this principal using the keytab specified by the
+`hive.hdfs.trino.keytab` keytab.
+
+Keytab files must be distributed to every node in the cluster that runs Trino.
+
+{ref}`Additional Information About Keytab Files.<hive-security-additional-keytab>`
+
+(hive-security-kerberos-impersonation)=
+
+##### `KERBEROS` authentication with impersonation
+
+```text
+hive.hdfs.authentication.type=KERBEROS
+hive.hdfs.impersonation.enabled=true
+hive.hdfs.trino.principal=trino@EXAMPLE.COM
+hive.hdfs.trino.keytab=/etc/trino/hdfs.keytab
+```
+
+When using `KERBEROS` authentication with impersonation, Trino impersonates
+the user who is running the query when accessing HDFS. The principal
+specified by the `hive.hdfs.trino.principal` property must be allowed to
+impersonate the current Trino user, as discussed in the section
+{ref}`configuring-hadoop-impersonation`. Trino authenticates
+`hive.hdfs.trino.principal` using the keytab specified by
+`hive.hdfs.trino.keytab`.
+
+Keytab files must be distributed to every node in the cluster that runs Trino.
+
+{ref}`Additional Information About Keytab Files.<hive-security-additional-keytab>`
+
+## Authorization
+
+You can enable authorization checks for the {doc}`hive` by setting
+the `hive.security` property in the Hive catalog properties file. This
+property must be one of the following values:
+
+```{eval-rst}
+.. list-table:: ``hive.security`` property values
+  :widths: 30, 60
+  :header-rows: 1
+
+  * - Property value
+    - Description
+  * - ``legacy`` (default value)
+    - Few authorization checks are enforced, thus allowing most operations. The
+      config properties ``hive.allow-drop-table``, ``hive.allow-rename-table``,
+      ``hive.allow-add-column``, ``hive.allow-drop-column`` and
+      ``hive.allow-rename-column`` are used.
+  * - ``read-only``
+    - Operations that read data or metadata, such as ``SELECT``, are permitted,
+      but none of the operations that write data or metadata, such as
+      ``CREATE``, ``INSERT`` or ``DELETE``, are allowed.
+  * - ``file``
+    - Authorization checks are enforced using a catalog-level access control
+      configuration file whose path is specified in the ``security.config-file``
+      catalog configuration property. See
+      :ref:`catalog-file-based-access-control` for details.
+  * - ``sql-standard``
+    - Users are permitted to perform the operations as long as they have the
+      required privileges as per the SQL standard. In this mode, Trino enforces
+      the authorization checks for queries based on the privileges defined in
+      Hive metastore. To alter these privileges, use the :doc:`/sql/grant` and
+      :doc:`/sql/revoke` commands.
+
+      See the :ref:`hive-sql-standard-based-authorization` section for details.
+  * - ``allow-all``
+    - No authorization checks are enforced.
+```
+
+(hive-sql-standard-based-authorization)=
+
+### SQL standard based authorization
+
+When `sql-standard` security is enabled, Trino enforces the same SQL
+standard-based authorization as Hive does.
+
+Since Trino's `ROLE` syntax support matches the SQL standard, and
+Hive does not exactly follow the SQL standard, there are the following
+limitations and differences:
+
+- `CREATE ROLE role WITH ADMIN` is not supported.
+- The `admin` role must be enabled to execute `CREATE ROLE`, `DROP ROLE` or `CREATE SCHEMA`.
+- `GRANT role TO user GRANTED BY someone` is not supported.
+- `REVOKE role FROM user GRANTED BY someone` is not supported.
+- By default, all a user's roles, except `admin`, are enabled in a new user session.
+- One particular role can be selected by executing `SET ROLE role`.
+- `SET ROLE ALL` enables all of a user's roles except `admin`.
+- The `admin` role must be enabled explicitly by executing `SET ROLE admin`.
+- `GRANT privilege ON SCHEMA schema` is not supported. Schema ownership can be changed with `ALTER SCHEMA schema SET AUTHORIZATION user`
diff --git a/docs/src/main/sphinx/connector/hive-security.rst b/docs/src/main/sphinx/connector/hive-security.rst
deleted file mode 100644
index 9ae33fec80fa..000000000000
--- a/docs/src/main/sphinx/connector/hive-security.rst
+++ /dev/null
@@ -1,422 +0,0 @@
-=====================================
-Hive connector security configuration
-=====================================
-
-.. _hive-security-impersonation:
-
-Overview
-========
-
-The Hive connector supports both authentication and authorization.
-
-Trino can impersonate the end user who is running a query. In the case of a
-user running a query from the command line interface, the end user is the
-username associated with the Trino CLI process or argument to the optional
-``--user`` option.
-
-Authentication can be configured with or without user impersonation on
-Kerberized Hadoop clusters.
-
-Requirements
-============
-
-End user authentication limited to Kerberized Hadoop clusters. Authentication
-user impersonation is available for both Kerberized and non-Kerberized clusters.
-
-You must ensure that you meet the Kerberos, user impersonation and keytab
-requirements described in this section that apply to your configuration.
-
-.. _hive-security-kerberos-support:
-
-Kerberos
---------
-
-In order to use the Hive connector with a Hadoop cluster that uses ``kerberos``
-authentication, you must configure the connector to work with two services on
-the Hadoop cluster:
-
-* The Hive metastore Thrift service
-* The Hadoop Distributed File System (HDFS)
-
-Access to these services by the Hive connector is configured in the properties
-file that contains the general Hive connector configuration.
-
-Kerberos authentication by ticket cache is not yet supported.
-
-.. note::
-
-    If your ``krb5.conf`` location is different from ``/etc/krb5.conf`` you
-    must set it explicitly using the ``java.security.krb5.conf`` JVM property
-    in ``jvm.config`` file.
-
-    Example: ``-Djava.security.krb5.conf=/example/path/krb5.conf``.
-
-.. warning::
-
-  Access to the Trino coordinator must be secured e.g., using Kerberos or
-  password authentication, when using Kerberos authentication to Hadoop services.
-  Failure to secure access to the Trino coordinator could result in unauthorized
-  access to sensitive data on the Hadoop cluster. Refer to :doc:`/security` for
-  further information.
-
-  See :doc:`/security/kerberos` for information on setting up Kerberos authentication.
-
-.. _hive-security-additional-keytab:
-
-Keytab files
-^^^^^^^^^^^^
-
-Keytab files contain encryption keys that are used to authenticate principals
-to the Kerberos :abbr:`KDC (Key Distribution Center)`. These encryption keys
-must be stored securely; you must take the same precautions to protect them
-that you take to protect ssh private keys.
-
-In particular, access to keytab files must be limited to only the accounts
-that must use them to authenticate. In practice, this is the user that
-the Trino process runs as. The ownership and permissions on keytab files
-must be set to prevent other users from reading or modifying the files.
-
-Keytab files must be distributed to every node running Trino. Under common
-deployment situations, the Hive connector configuration is the same on all
-nodes. This means that the keytab needs to be in the same location on every
-node.
-
-You must ensure that the keytab files have the correct permissions on every
-node after distributing them.
-
-.. _configuring-hadoop-impersonation:
-
-Impersonation in Hadoop
------------------------
-
-In order to use impersonation, the Hadoop cluster must be
-configured to allow the user or principal that Trino is running as to
-impersonate the users who log in to Trino. Impersonation in Hadoop is
-configured in the file :file:`core-site.xml`. A complete description of the
-configuration options can be found in the `Hadoop documentation
-<https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/Superusers.html#Configurations>`_.
-
-Authentication
-==============
-
-The default security configuration of the :doc:`/connector/hive` does not use
-authentication when connecting to a Hadoop cluster. All queries are executed as
-the user who runs the Trino process, regardless of which user submits the
-query.
-
-The Hive connector provides additional security options to support Hadoop
-clusters that have been configured to use :ref:`Kerberos
-<hive-security-kerberos-support>`.
-
-When accessing :abbr:`HDFS (Hadoop Distributed File System)`, Trino can
-:ref:`impersonate<hive-security-impersonation>` the end user who is running the
-query. This can be used with HDFS permissions and :abbr:`ACLs (Access Control
-Lists)` to provide additional security for data.
-
-Hive metastore Thrift service authentication
---------------------------------------------
-
-In a Kerberized Hadoop cluster, Trino connects to the Hive metastore Thrift
-service using :abbr:`SASL (Simple Authentication and Security Layer)` and
-authenticates using Kerberos. Kerberos authentication for the metastore is
-configured in the connector's properties file using the following optional
-properties:
-
-.. list-table:: Hive metastore Thrift service authentication properties
-  :widths: 30, 55, 15
-  :header-rows: 1
-
-  * - Property value
-    - Description
-    - Default
-  * - ``hive.metastore.authentication.type``
-    - Hive metastore authentication type. One of ``NONE`` or ``KERBEROS``. When
-      using the default value of ``NONE``, Kerberos authentication is disabled,
-      and no other properties must be configured.
-
-      When set to ``KERBEROS`` the Hive connector connects to the Hive metastore
-      Thrift service using SASL and authenticate using Kerberos.
-    - ``NONE``
-  * - ``hive.metastore.thrift.impersonation.enabled``
-    - Enable Hive metastore end user impersonation. See
-      :ref:`hive-security-metastore-impersonation` for more information.
-    - ``false``
-  * - ``hive.metastore.service.principal``
-    - The Kerberos principal of the Hive metastore service. The coordinator
-      uses this to authenticate the Hive metastore.
-
-      The ``_HOST`` placeholder can be used in this property value. When
-      connecting to the Hive metastore, the Hive connector substitutes in the
-      hostname of the **metastore** server it is connecting to. This is useful
-      if the metastore runs on multiple hosts.
-
-      Example: ``hive/hive-server-host@EXAMPLE.COM`` or
-      ``hive/_HOST@EXAMPLE.COM``.
-    -
-  * - ``hive.metastore.client.principal``
-    - The Kerberos principal that Trino uses when connecting to the Hive
-      metastore service.
-
-      Example: ``trino/trino-server-node@EXAMPLE.COM`` or
-      ``trino/_HOST@EXAMPLE.COM``.
-
-      The ``_HOST`` placeholder can be used in this property value. When
-      connecting to the Hive metastore, the Hive connector substitutes in the
-      hostname of the **worker** node Trino is running on. This is useful if
-      each worker node has its own Kerberos principal.
-
-      Unless :ref:`hive-security-metastore-impersonation` is enabled,
-      the principal specified by ``hive.metastore.client.principal`` must have
-      sufficient privileges to remove files and directories within the
-      ``hive/warehouse`` directory.
-
-      **Warning:** If the principal does have sufficient permissions, only the
-      metadata is removed, and the data continues to consume disk space. This
-      occurs because the Hive metastore is responsible for deleting the
-      internal table data. When the metastore is configured to use Kerberos
-      authentication, all of the HDFS operations performed by the metastore are
-      impersonated. Errors deleting data are silently ignored.
-    -
-  * - ``hive.metastore.client.keytab``
-    - The path to the keytab file that contains a key for the principal
-      specified by ``hive.metastore.client.principal``. This file must be
-      readable by the operating system user running Trino.
-    -
-
-Configuration examples
-^^^^^^^^^^^^^^^^^^^^^^
-
-The following sections describe the configuration properties and values needed
-for the various authentication configurations needed to use the Hive metastore
-Thrift service with the Hive connector.
-
-Default ``NONE`` authentication without impersonation
-"""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-.. code-block:: text
-
-    hive.metastore.authentication.type=NONE
-
-The default authentication type for the Hive metastore is ``NONE``. When the
-authentication type is ``NONE``, Trino connects to an unsecured Hive
-metastore. Kerberos is not used.
-
-.. _hive-security-metastore-impersonation:
-
-``KERBEROS`` authentication with impersonation
-""""""""""""""""""""""""""""""""""""""""""""""
-
-.. code-block:: text
-
-    hive.metastore.authentication.type=KERBEROS
-    hive.metastore.thrift.impersonation.enabled=true
-    hive.metastore.service.principal=hive/hive-metastore-host.example.com@EXAMPLE.COM
-    hive.metastore.client.principal=trino@EXAMPLE.COM
-    hive.metastore.client.keytab=/etc/trino/hive.keytab
-
-When the authentication type for the Hive metastore Thrift service is
-``KERBEROS``, Trino connects as the Kerberos principal specified by the
-property ``hive.metastore.client.principal``. Trino authenticates this
-principal using the keytab specified by the ``hive.metastore.client.keytab``
-property, and verifies that the identity of the metastore matches
-``hive.metastore.service.principal``.
-
-When using ``KERBEROS`` Metastore authentication with impersonation, the
-principal specified by the ``hive.metastore.client.principal`` property must be
-allowed to impersonate the current Trino user, as discussed in the section
-:ref:`configuring-hadoop-impersonation`.
-
-Keytab files must be distributed to every node in the cluster that runs Trino.
-
-:ref:`Additional Information About Keytab Files.<hive-security-additional-keytab>`
-
-HDFS authentication
--------------------
-
-In a Kerberized Hadoop cluster, Trino authenticates to HDFS using Kerberos.
-Kerberos authentication for HDFS is configured in the connector's properties
-file using the following optional properties:
-
-.. list-table:: HDFS authentication properties
-  :widths: 30, 55, 15
-  :header-rows: 1
-
-  * - Property value
-    - Description
-    - Default
-  * - ``hive.hdfs.authentication.type``
-    - HDFS authentication type; one of ``NONE`` or ``KERBEROS``. When using the
-      default value of ``NONE``, Kerberos authentication is disabled, and no
-      other properties must be configured.
-
-      When set to ``KERBEROS``, the Hive connector authenticates to HDFS using
-      Kerberos.
-    - ``NONE``
-  * - ``hive.hdfs.impersonation.enabled``
-    - Enable HDFS end-user impersonation. Impersonating the end user can provide
-      additional security when accessing HDFS if HDFS permissions or ACLs are
-      used.
-
-      HDFS Permissions and ACLs are explained in the `HDFS Permissions Guide
-      <https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/HdfsPermissionsGuide.html>`_.
-    - ``false``
-  * - ``hive.hdfs.trino.principal``
-    - The Kerberos principal Trino uses when connecting to HDFS.
-
-      Example: ``trino-hdfs-superuser/trino-server-node@EXAMPLE.COM`` or
-      ``trino-hdfs-superuser/_HOST@EXAMPLE.COM``.
-
-      The ``_HOST`` placeholder can be used in this property value. When
-      connecting to HDFS, the Hive connector substitutes in the hostname of the
-      **worker** node Trino is running on. This is useful if each worker node
-      has its own Kerberos principal.
-    -
-  * - ``hive.hdfs.trino.keytab``
-    - The path to the keytab file that contains a key for the principal
-      specified by ``hive.hdfs.trino.principal``. This file must be readable by
-      the operating system user running Trino.
-    -
-  * - ``hive.hdfs.wire-encryption.enabled``
-    - Enable HDFS wire encryption. In a Kerberized Hadoop cluster that uses HDFS
-      wire encryption, this must be set to ``true`` to enable Trino to access
-      HDFS. Note that using wire encryption may impact query execution
-      performance.
-    -
-
-Configuration examples
-^^^^^^^^^^^^^^^^^^^^^^
-
-The following sections describe the configuration properties and values needed
-for the various authentication configurations with HDFS and the Hive connector.
-
-.. _hive-security-simple:
-
-Default ``NONE`` authentication without impersonation
-"""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-.. code-block:: text
-
-    hive.hdfs.authentication.type=NONE
-
-The default authentication type for HDFS is ``NONE``. When the authentication
-type is ``NONE``, Trino connects to HDFS using Hadoop's simple authentication
-mechanism. Kerberos is not used.
-
-.. _hive-security-simple-impersonation:
-
-``NONE`` authentication with impersonation
-""""""""""""""""""""""""""""""""""""""""""
-
-.. code-block:: text
-
-    hive.hdfs.authentication.type=NONE
-    hive.hdfs.impersonation.enabled=true
-
-When using ``NONE`` authentication with impersonation, Trino impersonates
-the user who is running the query when accessing HDFS. The user Trino is
-running as must be allowed to impersonate this user, as discussed in the
-section :ref:`configuring-hadoop-impersonation`. Kerberos is not used.
-
-.. _hive-security-kerberos:
-
-``KERBEROS`` authentication without impersonation
-"""""""""""""""""""""""""""""""""""""""""""""""""
-
-.. code-block:: text
-
-    hive.hdfs.authentication.type=KERBEROS
-    hive.hdfs.trino.principal=hdfs@EXAMPLE.COM
-    hive.hdfs.trino.keytab=/etc/trino/hdfs.keytab
-
-When the authentication type is ``KERBEROS``, Trino accesses HDFS as the
-principal specified by the ``hive.hdfs.trino.principal`` property. Trino
-authenticates this principal using the keytab specified by the
-``hive.hdfs.trino.keytab`` keytab.
-
-Keytab files must be distributed to every node in the cluster that runs Trino.
-
-:ref:`Additional Information About Keytab Files.<hive-security-additional-keytab>`
-
-.. _hive-security-kerberos-impersonation:
-
-``KERBEROS`` authentication with impersonation
-""""""""""""""""""""""""""""""""""""""""""""""
-
-.. code-block:: text
-
-    hive.hdfs.authentication.type=KERBEROS
-    hive.hdfs.impersonation.enabled=true
-    hive.hdfs.trino.principal=trino@EXAMPLE.COM
-    hive.hdfs.trino.keytab=/etc/trino/hdfs.keytab
-
-When using ``KERBEROS`` authentication with impersonation, Trino impersonates
-the user who is running the query when accessing HDFS. The principal
-specified by the ``hive.hdfs.trino.principal`` property must be allowed to
-impersonate the current Trino user, as discussed in the section
-:ref:`configuring-hadoop-impersonation`. Trino authenticates
-``hive.hdfs.trino.principal`` using the keytab specified by
-``hive.hdfs.trino.keytab``.
-
-Keytab files must be distributed to every node in the cluster that runs Trino.
-
-:ref:`Additional Information About Keytab Files.<hive-security-additional-keytab>`
-
-Authorization
-=============
-
-You can enable authorization checks for the :doc:`hive` by setting
-the ``hive.security`` property in the Hive catalog properties file. This
-property must be one of the following values:
-
-.. list-table:: ``hive.security`` property values
-  :widths: 30, 60
-  :header-rows: 1
-
-  * - Property value
-    - Description
-  * - ``legacy`` (default value)
-    - Few authorization checks are enforced, thus allowing most operations. The
-      config properties ``hive.allow-drop-table``, ``hive.allow-rename-table``,
-      ``hive.allow-add-column``, ``hive.allow-drop-column`` and
-      ``hive.allow-rename-column`` are used.
-  * - ``read-only``
-    - Operations that read data or metadata, such as ``SELECT``, are permitted,
-      but none of the operations that write data or metadata, such as
-      ``CREATE``, ``INSERT`` or ``DELETE``, are allowed.
-  * - ``file``
-    - Authorization checks are enforced using a catalog-level access control
-      configuration file whose path is specified in the ``security.config-file``
-      catalog configuration property. See
-      :ref:`catalog-file-based-access-control` for details.
-  * - ``sql-standard``
-    - Users are permitted to perform the operations as long as they have the
-      required privileges as per the SQL standard. In this mode, Trino enforces
-      the authorization checks for queries based on the privileges defined in
-      Hive metastore. To alter these privileges, use the :doc:`/sql/grant` and
-      :doc:`/sql/revoke` commands.
-
-      See the :ref:`hive-sql-standard-based-authorization` section for details.
-  * - ``allow-all``
-    - No authorization checks are enforced.
-
-.. _hive-sql-standard-based-authorization:
-
-SQL standard based authorization
---------------------------------
-
-When ``sql-standard`` security is enabled, Trino enforces the same SQL
-standard-based authorization as Hive does.
-
-Since Trino's ``ROLE`` syntax support matches the SQL standard, and
-Hive does not exactly follow the SQL standard, there are the following
-limitations and differences:
-
-* ``CREATE ROLE role WITH ADMIN`` is not supported.
-* The ``admin`` role must be enabled to execute ``CREATE ROLE``, ``DROP ROLE`` or ``CREATE SCHEMA``.
-* ``GRANT role TO user GRANTED BY someone`` is not supported.
-* ``REVOKE role FROM user GRANTED BY someone`` is not supported.
-* By default, all a user's roles, except ``admin``, are enabled in a new user session.
-* One particular role can be selected by executing ``SET ROLE role``.
-* ``SET ROLE ALL`` enables all of a user's roles except ``admin``.
-* The ``admin`` role must be enabled explicitly by executing ``SET ROLE admin``.
-* ``GRANT privilege ON SCHEMA schema`` is not supported. Schema ownership can be changed with ``ALTER SCHEMA schema SET AUTHORIZATION user``
\ No newline at end of file
diff --git a/docs/src/main/sphinx/connector/hive.md b/docs/src/main/sphinx/connector/hive.md
new file mode 100644
index 000000000000..3a4f630c9358
--- /dev/null
+++ b/docs/src/main/sphinx/connector/hive.md
@@ -0,0 +1,1360 @@
+# Hive connector
+
+```{raw} html
+<img src="../_static/img/hive.png" class="connector-logo">
+```
+
+```{toctree}
+:hidden: true
+:maxdepth: 1
+
+Metastores <metastores>
+Security <hive-security>
+Amazon S3 <hive-s3>
+Azure Storage <hive-azure>
+Google Cloud Storage <hive-gcs-tutorial>
+IBM Cloud Object Storage <hive-cos>
+Storage Caching <hive-caching>
+Alluxio <hive-alluxio>
+Object storage file formats <object-storage-file-formats>
+```
+
+The Hive connector allows querying data stored in an
+[Apache Hive](https://hive.apache.org/)
+data warehouse. Hive is a combination of three components:
+
+- Data files in varying formats, that are typically stored in the
+  Hadoop Distributed File System (HDFS) or in object storage systems
+  such as Amazon S3.
+- Metadata about how the data files are mapped to schemas and tables. This
+  metadata is stored in a database, such as MySQL, and is accessed via the Hive
+  metastore service.
+- A query language called HiveQL. This query language is executed on a
+  distributed computing framework such as MapReduce or Tez.
+
+Trino only uses the first two components: the data and the metadata.
+It does not use HiveQL or any part of Hive's execution environment.
+
+## Requirements
+
+The Hive connector requires a
+{ref}`Hive metastore service <hive-thrift-metastore>` (HMS), or a compatible
+implementation of the Hive metastore, such as
+{ref}`AWS Glue <hive-glue-metastore>`.
+
+Apache Hadoop HDFS 2.x and 3.x are supported.
+
+Many distributed storage systems including HDFS,
+{doc}`Amazon S3 <hive-s3>` or S3-compatible systems,
+[Google Cloud Storage](hive-gcs-tutorial),
+{doc}`Azure Storage <hive-azure>`, and
+{doc}`IBM Cloud Object Storage<hive-cos>` can be queried with the Hive
+connector.
+
+The coordinator and all workers must have network access to the Hive metastore
+and the storage system. Hive metastore access with the Thrift protocol defaults
+to using port 9083.
+
+Data files must be in a supported file format. Some file formats can be
+configured using file format configuration properties per catalog:
+
+- {ref}`ORC <hive-orc-configuration>`
+- {ref}`Parquet <hive-parquet-configuration>`
+- Avro
+- RCText (RCFile using ColumnarSerDe)
+- RCBinary (RCFile using LazyBinaryColumnarSerDe)
+- SequenceFile
+- JSON (using org.apache.hive.hcatalog.data.JsonSerDe)
+- CSV (using org.apache.hadoop.hive.serde2.OpenCSVSerde)
+- TextFile
+
+## General configuration
+
+To configure the Hive connector, create a catalog properties file
+`etc/catalog/example.properties` that references the `hive`
+connector and defines a metastore. You must configure a metastore for table
+metadata. If you are using a {ref}`Hive metastore <hive-thrift-metastore>`,
+`hive.metastore.uri` must be configured:
+
+```properties
+connector.name=hive
+hive.metastore.uri=thrift://example.net:9083
+```
+
+If you are using {ref}`AWS Glue <hive-glue-metastore>` as your metastore, you
+must instead set `hive.metastore` to `glue`:
+
+```properties
+connector.name=hive
+hive.metastore=glue
+```
+
+Each metastore type has specific configuration properties along with
+{ref}`general metastore configuration properties <general-metastore-properties>`.
+
+### Multiple Hive clusters
+
+You can have as many catalogs as you need, so if you have additional
+Hive clusters, simply add another properties file to `etc/catalog`
+with a different name, making sure it ends in `.properties`. For
+example, if you name the property file `sales.properties`, Trino
+creates a catalog named `sales` using the configured connector.
+
+### HDFS configuration
+
+For basic setups, Trino configures the HDFS client automatically and
+does not require any configuration files. In some cases, such as when using
+federated HDFS or NameNode high availability, it is necessary to specify
+additional HDFS client options in order to access your HDFS cluster. To do so,
+add the `hive.config.resources` property to reference your HDFS config files:
+
+```text
+hive.config.resources=/etc/hadoop/conf/core-site.xml,/etc/hadoop/conf/hdfs-site.xml
+```
+
+Only specify additional configuration files if necessary for your setup.
+We recommend reducing the configuration files to have the minimum
+set of required properties, as additional properties may cause problems.
+
+The configuration files must exist on all Trino nodes. If you are
+referencing existing Hadoop config files, make sure to copy them to
+any Trino nodes that are not running Hadoop.
+
+### HDFS username and permissions
+
+Before running any `CREATE TABLE` or `CREATE TABLE AS` statements
+for Hive tables in Trino, you must check that the user Trino is
+using to access HDFS has access to the Hive warehouse directory. The Hive
+warehouse directory is specified by the configuration variable
+`hive.metastore.warehouse.dir` in `hive-site.xml`, and the default
+value is `/user/hive/warehouse`.
+
+When not using Kerberos with HDFS, Trino accesses HDFS using the
+OS user of the Trino process. For example, if Trino is running as
+`nobody`, it accesses HDFS as `nobody`. You can override this
+username by setting the `HADOOP_USER_NAME` system property in the
+Trino {ref}`jvm-config`, replacing `hdfs_user` with the
+appropriate username:
+
+```text
+-DHADOOP_USER_NAME=hdfs_user
+```
+
+The `hive` user generally works, since Hive is often started with
+the `hive` user and this user has access to the Hive warehouse.
+
+Whenever you change the user Trino is using to access HDFS, remove
+`/tmp/presto-*` on HDFS, as the new user may not have access to
+the existing temporary directories.
+
+(hive-configuration-properties)=
+
+### Hive general configuration properties
+
+The following table lists general configuration properties for the Hive
+connector. There are additional sets of configuration properties throughout the
+Hive connector documentation.
+
+```{eval-rst}
+.. list-table:: Hive general configuration properties
+    :widths: 35, 50, 15
+    :header-rows: 1
+
+    * - Property Name
+      - Description
+      - Default
+    * - ``hive.config.resources``
+      - An optional comma-separated list of HDFS configuration files. These
+        files must exist on the machines running Trino. Only specify this if
+        absolutely necessary to access HDFS. Example: ``/etc/hdfs-site.xml``
+      -
+    * - ``hive.recursive-directories``
+      - Enable reading data from subdirectories of table or partition locations.
+        If disabled, subdirectories are ignored. This is equivalent to the
+        ``hive.mapred.supports.subdirectories`` property in Hive.
+      - ``false``
+    * - ``hive.ignore-absent-partitions``
+      - Ignore partitions when the file system location does not exist rather
+        than failing the query. This skips data that may be expected to be part
+        of the table.
+      - ``false``
+    * - ``hive.storage-format``
+      - The default file format used when creating new tables.
+      - ``ORC``
+    * - ``hive.compression-codec``
+      - The compression codec to use when writing files. Possible values are
+        ``NONE``, ``SNAPPY``, ``LZ4``, ``ZSTD``, or ``GZIP``.
+      - ``GZIP``
+    * - ``hive.force-local-scheduling``
+      - Force splits to be scheduled on the same node as the Hadoop DataNode
+        process serving the split data. This is useful for installations where
+        Trino is collocated with every DataNode.
+      - ``false``
+    * - ``hive.respect-table-format``
+      - Should new partitions be written using the existing table format or the
+        default Trino format?
+      - ``true``
+    * - ``hive.immutable-partitions``
+      - Can new data be inserted into existing partitions? If ``true`` then
+        setting ``hive.insert-existing-partitions-behavior`` to ``APPEND`` is
+        not allowed. This also affects the ``insert_existing_partitions_behavior``
+        session property in the same way.
+      - ``false``
+    * - ``hive.insert-existing-partitions-behavior``
+      - What happens when data is inserted into an existing partition? Possible
+        values are
+
+            * ``APPEND`` - appends data to existing partitions
+            * ``OVERWRITE`` - overwrites existing partitions
+            * ``ERROR`` - modifying existing partitions is not allowed
+      - ``APPEND``
+    * - ``hive.target-max-file-size``
+      - Best effort maximum size of new files.
+      - ``1GB``
+    * - ``hive.create-empty-bucket-files``
+      - Should empty files be created for buckets that have no data?
+      - ``false``
+    * - ``hive.validate-bucketing``
+      - Enables validation that data is in the correct bucket when reading
+        bucketed tables.
+      - ``true``
+    * - ``hive.partition-statistics-sample-size``
+      - Specifies the number of partitions to analyze when computing table
+        statistics.
+      - 100
+    * - ``hive.max-partitions-per-writers``
+      - Maximum number of partitions per writer.
+      - 100
+    * - ``hive.max-partitions-for-eager-load``
+      - The maximum number of partitions for a single table scan to load eagerly
+        on the coordinator. Certain optimizations are not possible without eager
+        loading.
+      - 100,000
+    * - ``hive.max-partitions-per-scan``
+      - Maximum number of partitions for a single table scan.
+      - 1,000,000
+    * - ``hive.dfs.replication``
+      - Hadoop file system replication factor.
+      -
+    * - ``hive.security``
+      - See :doc:`hive-security`.
+      -
+    * - ``security.config-file``
+      - Path of config file to use when ``hive.security=file``. See
+        :ref:`catalog-file-based-access-control` for details.
+      -
+    * - ``hive.non-managed-table-writes-enabled``
+      - Enable writes to non-managed (external) Hive tables.
+      - ``false``
+    * - ``hive.non-managed-table-creates-enabled``
+      - Enable creating non-managed (external) Hive tables.
+      - ``true``
+    * - ``hive.collect-column-statistics-on-write``
+      - Enables automatic column level statistics collection on write. See
+        `Table Statistics <#table-statistics>`__ for details.
+      - ``true``
+    * - ``hive.file-status-cache-tables``
+      - Cache directory listing for specific tables. Examples:
+
+            * ``fruit.apple,fruit.orange`` to cache listings only for tables
+              ``apple`` and ``orange`` in schema ``fruit``
+            * ``fruit.*,vegetable.*`` to cache listings for all tables
+              in schemas ``fruit`` and ``vegetable``
+            * ``*`` to cache listings for all tables in all schemas
+      -
+    * - ``hive.file-status-cache.max-retained-size``
+      - Maximum retained size of cached file status entries.
+      - ``1GB``
+    * - ``hive.file-status-cache-expire-time``
+      - How long a cached directory listing is considered valid.
+      - ``1m``
+    * - ``hive.per-transaction-file-status-cache.max-retained-size``
+      - Maximum retained size of all entries in per transaction file status cache.
+        Retained size limit is shared across all running queries.
+      - ``100MB``
+    * - ``hive.rcfile.time-zone``
+      - Adjusts binary encoded timestamp values to a specific time zone. For
+        Hive 3.1+, this must be set to UTC.
+      - JVM default
+    * - ``hive.timestamp-precision``
+      - Specifies the precision to use for Hive columns of type ``TIMESTAMP``.
+        Possible values are ``MILLISECONDS``, ``MICROSECONDS`` and ``NANOSECONDS``.
+        Values with higher precision than configured are rounded.
+      - ``MILLISECONDS``
+    * - ``hive.temporary-staging-directory-enabled``
+      - Controls whether the temporary staging directory configured at
+        ``hive.temporary-staging-directory-path`` is used for write
+        operations. Temporary staging directory is never used for writes to
+        non-sorted tables on S3, encrypted HDFS or external location. Writes to
+        sorted tables will utilize this path for staging temporary files during
+        sorting operation. When disabled, the target storage will be used for
+        staging while writing sorted tables which can be inefficient when
+        writing to object stores like S3.
+      - ``true``
+    * - ``hive.temporary-staging-directory-path``
+      - Controls the location of temporary staging directory that is used for
+        write operations. The ``${USER}`` placeholder can be used to use a
+        different location for each user.
+      - ``/tmp/presto-${USER}``
+    * - ``hive.hive-views.enabled``
+      - Enable translation for :ref:`Hive views <hive-views>`.
+      - ``false``
+    * - ``hive.hive-views.legacy-translation``
+      - Use the legacy algorithm to translate :ref:`Hive views <hive-views>`.
+        You can use the ``hive_views_legacy_translation`` catalog session
+        property for temporary, catalog specific use.
+      - ``false``
+    * - ``hive.parallel-partitioned-bucketed-writes``
+      - Improve parallelism of partitioned and bucketed table writes. When
+        disabled, the number of writing threads is limited to number of buckets.
+      - ``true``
+    * - ``hive.fs.new-directory-permissions``
+      - Controls the permissions set on new directories created for tables. It
+        must be either 'skip' or an octal number, with a leading 0. If set to
+        'skip', permissions of newly created directories will not be set by
+        Trino.
+      - ``0777``
+    * - ``hive.fs.cache.max-size``
+      - Maximum number of cached file system objects.
+      - 1000
+    * - ``hive.query-partition-filter-required``
+      - Set to ``true`` to force a query to use a partition filter. You can use
+        the ``query_partition_filter_required`` catalog session property for
+        temporary, catalog specific use.
+      - ``false``
+    * - ``hive.table-statistics-enabled``
+      - Enables :doc:`/optimizer/statistics`. The equivalent
+        :doc:`catalog session property </sql/set-session>` is
+        ``statistics_enabled`` for session specific use. Set to ``false`` to
+        disable statistics. Disabling statistics means that
+        :doc:`/optimizer/cost-based-optimizations` can not make smart decisions
+        about the query plan.
+      - ``true``
+    * - ``hive.auto-purge``
+      - Set the default value for the auto_purge table property for managed
+        tables. See the :ref:`hive-table-properties` for more information on
+        auto_purge.
+      - ``false``
+    * - ``hive.partition-projection-enabled``
+      - Enables Athena partition projection support
+      - ``false``
+    * - ``hive.max-partition-drops-per-query``
+      - Maximum number of partitions to drop in a single query.
+      - 100,000
+    * - ``hive.single-statement-writes``
+      - Enables auto-commit for all writes. This can be used to disallow
+        multi-statement write transactions.
+      - ``false``
+```
+
+## Storage
+
+The Hive connector supports the following storage options:
+
+- {doc}`Amazon S3 <hive-s3>`
+- {doc}`Azure Storage <hive-azure>`
+- {doc}`Google Cloud Storage <hive-gcs-tutorial>`
+- {doc}`IBM Cloud Object Storage <hive-cos>`
+
+The Hive connector also supports {doc}`storage caching <hive-caching>`.
+
+## Security
+
+Please see the {doc}`/connector/hive-security` section for information on the
+security options available for the Hive connector.
+
+(hive-sql-support)=
+
+## SQL support
+
+The connector provides read access and write access to data and metadata in the
+configured object storage system and metadata stores:
+
+- {ref}`Globally available statements <sql-globally-available>`; see also
+  {ref}`Globally available statements <hive-procedures>`
+
+- {ref}`Read operations <sql-read-operations>`
+
+- {ref}`sql-write-operations`:
+
+  - {ref}`sql-data-management`; see also
+    {ref}`Hive-specific data management <hive-data-management>`
+  - {ref}`sql-schema-table-management`; see also
+    {ref}`Hive-specific schema and table management <hive-schema-and-table-management>`
+  - {ref}`sql-view-management`; see also
+    {ref}`Hive-specific view management <hive-sql-view-management>`
+
+- [](sql-routine-management)
+- {ref}`sql-security-operations`: see also
+  {ref}`SQL standard-based authorization for object storage <hive-sql-standard-based-authorization>`
+
+- {ref}`sql-transactions`
+
+Refer to {doc}`the migration guide </appendix/from-hive>` for practical advice
+on migrating from Hive to Trino.
+
+The following sections provide Hive-specific information regarding SQL support.
+
+(hive-examples)=
+
+### Basic usage examples
+
+The examples shown here work on Google Cloud Storage by replacing `s3://` with
+`gs://`.
+
+Create a new Hive table named `page_views` in the `web` schema
+that is stored using the ORC file format, partitioned by date and
+country, and bucketed by user into `50` buckets. Note that Hive
+requires the partition columns to be the last columns in the table:
+
+```
+CREATE TABLE example.web.page_views (
+  view_time TIMESTAMP,
+  user_id BIGINT,
+  page_url VARCHAR,
+  ds DATE,
+  country VARCHAR
+)
+WITH (
+  format = 'ORC',
+  partitioned_by = ARRAY['ds', 'country'],
+  bucketed_by = ARRAY['user_id'],
+  bucket_count = 50
+)
+```
+
+Create a new Hive schema named `web` that stores tables in an
+S3 bucket named `my-bucket`:
+
+```
+CREATE SCHEMA example.web
+WITH (location = 's3://my-bucket/')
+```
+
+Drop a schema:
+
+```
+DROP SCHEMA example.web
+```
+
+Drop a partition from the `page_views` table:
+
+```
+DELETE FROM example.web.page_views
+WHERE ds = DATE '2016-08-09'
+  AND country = 'US'
+```
+
+Query the `page_views` table:
+
+```
+SELECT * FROM example.web.page_views
+```
+
+List the partitions of the `page_views` table:
+
+```
+SELECT * FROM example.web."page_views$partitions"
+```
+
+Create an external Hive table named `request_logs` that points at
+existing data in S3:
+
+```
+CREATE TABLE example.web.request_logs (
+  request_time TIMESTAMP,
+  url VARCHAR,
+  ip VARCHAR,
+  user_agent VARCHAR
+)
+WITH (
+  format = 'TEXTFILE',
+  external_location = 's3://my-bucket/data/logs/'
+)
+```
+
+Collect statistics for the `request_logs` table:
+
+```
+ANALYZE example.web.request_logs;
+```
+
+Drop the external table `request_logs`. This only drops the metadata
+for the table. The referenced data directory is not deleted:
+
+```
+DROP TABLE example.web.request_logs
+```
+
+- {doc}`/sql/create-table-as` can be used to create transactional tables in ORC format like this:
+
+  ```
+  CREATE TABLE <name>
+  WITH (
+      format='ORC',
+      transactional=true
+  )
+  AS <query>
+  ```
+
+Add an empty partition to the `page_views` table:
+
+```
+CALL system.create_empty_partition(
+    schema_name => 'web',
+    table_name => 'page_views',
+    partition_columns => ARRAY['ds', 'country'],
+    partition_values => ARRAY['2016-08-09', 'US']);
+```
+
+Drop stats for a partition of the `page_views` table:
+
+```
+CALL system.drop_stats(
+    schema_name => 'web',
+    table_name => 'page_views',
+    partition_values => ARRAY[ARRAY['2016-08-09', 'US']]);
+```
+
+(hive-procedures)=
+
+### Procedures
+
+Use the {doc}`/sql/call` statement to perform data manipulation or
+administrative tasks. Procedures must include a qualified catalog name, if your
+Hive catalog is called `web`:
+
+```
+CALL web.system.example_procedure()
+```
+
+The following procedures are available:
+
+- `system.create_empty_partition(schema_name, table_name, partition_columns, partition_values)`
+
+  Create an empty partition in the specified table.
+
+- `system.sync_partition_metadata(schema_name, table_name, mode, case_sensitive)`
+
+  Check and update partitions list in metastore. There are three modes available:
+
+  - `ADD` : add any partitions that exist on the file system, but not in the metastore.
+  - `DROP`: drop any partitions that exist in the metastore, but not on the file system.
+  - `FULL`: perform both `ADD` and `DROP`.
+
+  The `case_sensitive` argument is optional. The default value is `true` for compatibility
+  with Hive's `MSCK REPAIR TABLE` behavior, which expects the partition column names in
+  file system paths to use lowercase (e.g. `col_x=SomeValue`). Partitions on the file system
+  not conforming to this convention are ignored, unless the argument is set to `false`.
+
+- `system.drop_stats(schema_name, table_name, partition_values)`
+
+  Drops statistics for a subset of partitions or the entire table. The partitions are specified as an
+  array whose elements are arrays of partition values (similar to the `partition_values` argument in
+  `create_empty_partition`). If `partition_values` argument is omitted, stats are dropped for the
+  entire table.
+
+(register-partition)=
+
+- `system.register_partition(schema_name, table_name, partition_columns, partition_values, location)`
+
+  Registers existing location as a new partition in the metastore for the specified table.
+
+  When the `location` argument is omitted, the partition location is
+  constructed using `partition_columns` and `partition_values`.
+
+  Due to security reasons, the procedure is enabled only when `hive.allow-register-partition-procedure`
+  is set to `true`.
+
+(unregister-partition)=
+
+- `system.unregister_partition(schema_name, table_name, partition_columns, partition_values)`
+
+  Unregisters given, existing partition in the metastore for the specified table.
+  The partition data is not deleted.
+
+(hive-flush-metadata-cache)=
+
+- `system.flush_metadata_cache()`
+
+  Flush all Hive metadata caches.
+
+- `system.flush_metadata_cache(schema_name => ..., table_name => ...)`
+
+  Flush Hive metadata caches entries connected with selected table.
+  Procedure requires named parameters to be passed
+
+- `system.flush_metadata_cache(schema_name => ..., table_name => ..., partition_columns => ARRAY[...], partition_values => ARRAY[...])`
+
+  Flush Hive metadata cache entries connected with selected partition.
+  Procedure requires named parameters to be passed.
+
+(hive-data-management)=
+
+### Data management
+
+Some {ref}`data management <sql-data-management>` statements may be affected by
+the Hive catalog's authorization check policy. In the default `legacy` policy,
+some statements are disabled by default. See {doc}`hive-security` for more
+information.
+
+The {ref}`sql-data-management` functionality includes support for `INSERT`,
+`UPDATE`, `DELETE`, and `MERGE` statements, with the exact support
+depending on the storage system, file format, and metastore.
+
+When connecting to a Hive metastore version 3.x, the Hive connector supports
+reading from and writing to insert-only and ACID tables, with full support for
+partitioning and bucketing.
+
+{doc}`/sql/delete` applied to non-transactional tables is only supported if the
+table is partitioned and the `WHERE` clause matches entire partitions.
+Transactional Hive tables with ORC format support "row-by-row" deletion, in
+which the `WHERE` clause may match arbitrary sets of rows.
+
+{doc}`/sql/update` is only supported for transactional Hive tables with format
+ORC. `UPDATE` of partition or bucket columns is not supported.
+
+{doc}`/sql/merge` is only supported for ACID tables.
+
+ACID tables created with [Hive Streaming Ingest](https://cwiki.apache.org/confluence/display/Hive/Streaming+Data+Ingest)
+are not supported.
+
+(hive-schema-and-table-management)=
+
+### Schema and table management
+
+The Hive connector supports querying and manipulating Hive tables and schemas
+(databases). While some uncommon operations must be performed using
+Hive directly, most operations can be performed using Trino.
+
+#### Schema evolution
+
+Hive table partitions can differ from the current table schema. This occurs when
+the data types of columns of a table are changed from the data types of columns
+of preexisting partitions. The Hive connector supports this schema evolution by
+allowing the same conversions as Hive. The following table lists possible data
+type conversions.
+
+:::{list-table} Hive schema evolution type conversion
+:widths: 25, 75
+:header-rows: 1
+
+* - Data type
+  - Converted to
+* - `VARCHAR`
+  - `TINYINT`, `SMALLINT`, `INTEGER`, `BIGINT`, `TIMESTAMP`, `DATE`, as well as
+    narrowing conversions for `VARCHAR`
+* - `CHAR`
+  - narrowing conversions for `CHAR`
+* - `TINYINT`
+  - `VARCHAR`, `SMALLINT`, `INTEGER`, `BIGINT`
+* - `SMALLINT`
+  - `VARCHAR`, `INTEGER`, `BIGINT`
+* - `INTEGER`
+  - `VARCHAR`, `BIGINT`
+* - `BIGINT`
+  - `VARCHAR`
+* - `REAL`
+  - `DOUBLE`, `DECIMAL`
+* - `DOUBLE`
+  - `FLOAT`, `DECIMAL`
+* - `DECIMAL`
+  - `DOUBLE`, `REAL`, `VARCHAR`, `TINYINT`, `SMALLINT`, `INTEGER`, `BIGINT`, as
+    well as narrowing and widening conversions for `DECIMAL`
+* - `TIMESTAMP`
+  - `VARCHAR`
+:::
+
+Any conversion failure results in null, which is the same behavior
+as Hive. For example, converting the string `'foo'` to a number,
+or converting the string `'1234'` to a `TINYINT` (which has a
+maximum value of `127`).
+
+(hive-avro-schema)=
+
+#### Avro schema evolution
+
+Trino supports querying and manipulating Hive tables with the Avro storage
+format, which has the schema set based on an Avro schema file/literal. Trino is
+also capable of creating the tables in Trino by infering the schema from a
+valid Avro schema file located locally, or remotely in HDFS/Web server.
+
+To specify that the Avro schema should be used for interpreting table data, use
+the `avro_schema_url` table property.
+
+The schema can be placed in the local file system or remotely in the following
+locations:
+
+- HDFS (e.g. `avro_schema_url = 'hdfs://user/avro/schema/avro_data.avsc'`)
+- S3 (e.g. `avro_schema_url = 's3n:///schema_bucket/schema/avro_data.avsc'`)
+- A web server (e.g. `avro_schema_url = 'http://example.org/schema/avro_data.avsc'`)
+
+The URL, where the schema is located, must be accessible from the Hive metastore
+and Trino coordinator/worker nodes.
+
+Alternatively, you can use the table property `avro_schema_literal` to define
+the Avro schema.
+
+The table created in Trino using the `avro_schema_url` or
+`avro_schema_literal` property behaves the same way as a Hive table with
+`avro.schema.url` or `avro.schema.literal` set.
+
+Example:
+
+```
+CREATE TABLE example.avro.avro_data (
+   id BIGINT
+ )
+WITH (
+   format = 'AVRO',
+   avro_schema_url = '/usr/local/avro_data.avsc'
+)
+```
+
+The columns listed in the DDL (`id` in the above example) is ignored if `avro_schema_url` is specified.
+The table schema matches the schema in the Avro schema file. Before any read operation, the Avro schema is
+accessed so the query result reflects any changes in schema. Thus Trino takes advantage of Avro's backward compatibility abilities.
+
+If the schema of the table changes in the Avro schema file, the new schema can still be used to read old data.
+Newly added/renamed fields *must* have a default value in the Avro schema file.
+
+The schema evolution behavior is as follows:
+
+- Column added in new schema:
+  Data created with an older schema produces a *default* value when table is using the new schema.
+- Column removed in new schema:
+  Data created with an older schema no longer outputs the data from the column that was removed.
+- Column is renamed in the new schema:
+  This is equivalent to removing the column and adding a new one, and data created with an older schema
+  produces a *default* value when table is using the new schema.
+- Changing type of column in the new schema:
+  If the type coercion is supported by Avro or the Hive connector, then the conversion happens.
+  An error is thrown for incompatible types.
+
+##### Limitations
+
+The following operations are not supported when `avro_schema_url` is set:
+
+- `CREATE TABLE AS` is not supported.
+- Bucketing(`bucketed_by`) columns are not supported in `CREATE TABLE`.
+- `ALTER TABLE` commands modifying columns are not supported.
+
+(hive-alter-table-execute)=
+
+#### ALTER TABLE EXECUTE
+
+The connector supports the following commands for use with {ref}`ALTER TABLE
+EXECUTE <alter-table-execute>`.
+
+```{include} optimize.fragment
+```
+
+The `optimize` command is disabled by default, and can be enabled for a
+catalog with the `<catalog-name>.non_transactional_optimize_enabled`
+session property:
+
+```sql
+SET SESSION <catalog_name>.non_transactional_optimize_enabled=true
+```
+
+:::{warning}
+Because Hive tables are non-transactional, take note of the following possible
+outcomes:
+
+- If queries are run against tables that are currently being optimized,
+  duplicate rows may be read.
+- In rare cases where exceptions occur during the `optimize` operation,
+  a manual cleanup of the table directory is needed. In this situation, refer
+  to the Trino logs and query failure messages to see which files must be
+  deleted.
+:::
+
+(hive-table-properties)=
+
+#### Table properties
+
+Table properties supply or set metadata for the underlying tables. This
+is key for {doc}`/sql/create-table-as` statements. Table properties are passed
+to the connector using a {doc}`WITH </sql/create-table-as>` clause:
+
+```
+CREATE TABLE tablename
+WITH (format='CSV',
+      csv_escape = '"')
+```
+
+```{eval-rst}
+.. list-table:: Hive connector table properties
+  :widths: 20, 60, 20
+  :header-rows: 1
+
+  * - Property name
+    - Description
+    - Default
+  * - ``auto_purge``
+    - Indicates to the configured metastore to perform a purge when a table or
+      partition is deleted instead of a soft deletion using the trash.
+    -
+  * - ``avro_schema_url``
+    - The URI pointing to :ref:`hive-avro-schema` for the table.
+    -
+  * - ``bucket_count``
+    - The number of buckets to group data into. Only valid if used with
+      ``bucketed_by``.
+    - 0
+  * - ``bucketed_by``
+    - The bucketing column for the storage table. Only valid if used with
+      ``bucket_count``.
+    - ``[]``
+  * - ``bucketing_version``
+    - Specifies which Hive bucketing version to use. Valid values are ``1``
+      or ``2``.
+    -
+  * - ``csv_escape``
+    - The CSV escape character. Requires CSV format.
+    -
+  * - ``csv_quote``
+    - The CSV quote character. Requires CSV format.
+    -
+  * - ``csv_separator``
+    - The CSV separator character. Requires CSV format. You can use other
+      separators such as ``|`` or use Unicode to configure invisible separators
+      such tabs with ``U&'\0009'``.
+    - ``,``
+  * - ``external_location``
+    - The URI for an external Hive table on S3, Azure Blob Storage, etc. See the
+      :ref:`hive-examples` for more information.
+    -
+  * - ``format``
+    - The table file format. Valid values include ``ORC``, ``PARQUET``,
+      ``AVRO``, ``RCBINARY``, ``RCTEXT``, ``SEQUENCEFILE``, ``JSON``,
+      ``TEXTFILE``, ``CSV``, and ``REGEX``. The catalog property
+      ``hive.storage-format`` sets the default value and can change it to a
+      different default.
+    -
+  * - ``null_format``
+    - The serialization format for ``NULL`` value. Requires TextFile, RCText,
+      or SequenceFile format.
+    -
+  * - ``orc_bloom_filter_columns``
+    - Comma separated list of columns to use for ORC bloom filter. It improves
+      the performance of queries using range predicates when reading ORC files.
+      Requires ORC format.
+    - ``[]``
+  * - ``orc_bloom_filter_fpp``
+    - The ORC bloom filters false positive probability. Requires ORC format.
+    - 0.05
+  * - ``partitioned_by``
+    - The partitioning column for the storage table. The columns listed in the
+      ``partitioned_by`` clause must be the last columns as defined in the DDL.
+    - ``[]``
+  * - ``skip_footer_line_count``
+    - The number of footer lines to ignore when parsing the file for data.
+      Requires TextFile or CSV format tables.
+    -
+  * - ``skip_header_line_count``
+    - The number of header lines to ignore when parsing the file for data.
+      Requires TextFile or CSV format tables.
+    -
+  * - ``sorted_by``
+    - The column to sort by to determine bucketing for row. Only valid if
+      ``bucketed_by`` and ``bucket_count`` are specified as well.
+    - ``[]``
+  * - ``textfile_field_separator``
+    - Allows the use of custom field separators, such as '|', for TextFile
+      formatted tables.
+    -
+  * - ``textfile_field_separator_escape``
+    - Allows the use of a custom escape character for TextFile formatted tables.
+    -
+  * - ``transactional``
+    - Set this property to ``true`` to create an ORC ACID transactional table.
+      Requires ORC format. This property may be shown as true for insert-only
+      tables created using older versions of Hive.
+    -
+  * - ``partition_projection_enabled``
+    - Enables partition projection for selected table.
+      Mapped from AWS Athena table property
+      `projection.enabled <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-setting-up.html>`_.
+    -
+  * - ``partition_projection_ignore``
+    - Ignore any partition projection properties stored in the metastore for
+      the selected table. This is a Trino-only property which allows you to
+      work around compatibility issues on a specific table, and if enabled,
+      Trino ignores all other configuration options related to partition
+      projection.
+    -
+  * - ``partition_projection_location_template``
+    - Projected partition location template, such as
+      ``s3a://test/name=${name}/``. Mapped from the AWS Athena table property
+      `storage.location.template <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-setting-up.html#partition-projection-specifying-custom-s3-storage-locations>`_
+    - ``${table_location}/${partition_name}``
+  * - ``extra_properties``
+    - Additional properties added to a Hive table. The properties are not used by Trino,
+      and are available in the ``$properties`` metadata table.
+      The properties are not included in the output of ``SHOW CREATE TABLE`` statements.
+    -
+```
+
+(hive-special-tables)=
+
+#### Metadata tables
+
+The raw Hive table properties are available as a hidden table, containing a
+separate column per table property, with a single row containing the property
+values.
+
+##### `$properties` table
+
+The properties table name is composed with the table name and `$properties` appended.
+It exposes the parameters of the table in the metastore.
+
+You can inspect the property names and values with a simple query:
+
+```
+SELECT * FROM example.web."page_views$properties";
+```
+
+```text
+       stats_generated_via_stats_task        | auto.purge |       presto_query_id       | presto_version | transactional
+---------------------------------------------+------------+-----------------------------+----------------+---------------
+ workaround for potential lack of HIVE-12730 | false      | 20230705_152456_00001_nfugi | 423            | false
+```
+
+##### `$partitions` table
+
+The `$partitions` table provides a list of all partition values
+of a partitioned table.
+
+The following example query returns all partition values from the
+`page_views` table in the `web` schema of the `example` catalog:
+
+```
+SELECT * FROM example.web."page_views$partitions";
+```
+
+```text
+     day    | country
+------------+---------
+ 2023-07-01 | POL
+ 2023-07-02 | POL
+ 2023-07-03 | POL
+ 2023-03-01 | USA
+ 2023-03-02 | USA
+```
+
+(hive-column-properties)=
+
+#### Column properties
+
+```{eval-rst}
+.. list-table:: Hive connector column properties
+  :widths: 20, 60, 20
+  :header-rows: 1
+
+  * - Property name
+    - Description
+    - Default
+  * - ``partition_projection_type``
+    - Defines the type of partition projection to use on this column.
+      May be used only on partition columns. Available types:
+      ``ENUM``, ``INTEGER``, ``DATE``, ``INJECTED``.
+      Mapped from the AWS Athena table property
+      `projection.${columnName}.type <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
+    -
+  * - ``partition_projection_values``
+    - Used with ``partition_projection_type`` set to ``ENUM``. Contains a static
+      list of values used to generate partitions.
+      Mapped from the AWS Athena table property
+      `projection.${columnName}.values <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
+    -
+  * - ``partition_projection_range``
+    - Used with ``partition_projection_type`` set to ``INTEGER`` or ``DATE`` to
+      define a range. It is a two-element array, describing the minimum and
+      maximum range values used to generate partitions. Generation starts from
+      the minimum, then increments by the defined
+      ``partition_projection_interval`` to the maximum. For example, the format
+      is ``['1', '4']`` for a ``partition_projection_type`` of ``INTEGER`` and
+      ``['2001-01-01', '2001-01-07']`` or ``['NOW-3DAYS', 'NOW']`` for a
+      ``partition_projection_type`` of ``DATE``. Mapped from the AWS Athena
+      table property
+      `projection.${columnName}.range <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
+    -
+  * - ``partition_projection_interval``
+    - Used with ``partition_projection_type`` set to ``INTEGER`` or ``DATE``. It
+      represents the interval used to generate partitions within
+      the given range ``partition_projection_range``. Mapped from the AWS Athena
+      table property
+      `projection.${columnName}.interval <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
+    -
+  * - ``partition_projection_digits``
+    - Used with ``partition_projection_type`` set to ``INTEGER``.
+      The number of digits to be used with integer column projection.
+      Mapped from the AWS Athena table property
+      `projection.${columnName}.digits <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
+    -
+  * - ``partition_projection_format``
+    - Used with ``partition_projection_type`` set to ``DATE``.
+      The date column projection format, defined as a string such as ``yyyy MM``
+      or ``MM-dd-yy HH:mm:ss`` for use with the
+      `Java DateTimeFormatter class <https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html>`_.
+      Mapped from the AWS Athena table property
+      `projection.${columnName}.format <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
+    -
+  * - ``partition_projection_interval_unit``
+    - Used with ``partition_projection_type=DATA``.
+      The date column projection range interval unit
+      given in ``partition_projection_interval``.
+      Mapped from the AWS Athena table property
+      `projection.${columnName}.interval.unit <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
+    -
+```
+
+(hive-special-columns)=
+
+#### Metadata columns
+
+In addition to the defined columns, the Hive connector automatically exposes
+metadata in a number of hidden columns in each table:
+
+- `$bucket`: Bucket number for this row
+- `$path`: Full file system path name of the file for this row
+- `$file_modified_time`: Date and time of the last modification of the file for this row
+- `$file_size`: Size of the file for this row
+- `$partition`: Partition name for this row
+
+You can use these columns in your SQL statements like any other column. They
+can be selected directly, or used in conditional statements. For example, you
+can inspect the file size, location and partition for each record:
+
+```
+SELECT *, "$path", "$file_size", "$partition"
+FROM example.web.page_views;
+```
+
+Retrieve all records that belong to files stored in the partition
+`ds=2016-08-09/country=US`:
+
+```
+SELECT *, "$path", "$file_size"
+FROM example.web.page_views
+WHERE "$partition" = 'ds=2016-08-09/country=US'
+```
+
+(hive-sql-view-management)=
+
+### View management
+
+Trino allows reading from Hive materialized views, and can be configured to
+support reading Hive views.
+
+#### Materialized views
+
+The Hive connector supports reading from Hive materialized views.
+In Trino, these views are presented as regular, read-only tables.
+
+(hive-views)=
+
+#### Hive views
+
+Hive views are defined in HiveQL and stored in the Hive Metastore Service. They
+are analyzed to allow read access to the data.
+
+The Hive connector includes support for reading Hive views with three different
+modes.
+
+- Disabled
+- Legacy
+- Experimental
+
+If using Hive views from Trino is required, you must compare results in Hive and
+Trino for each view definition to ensure identical results. Use the experimental
+mode whenever possible. Avoid using the legacy mode. Leave Hive views support
+disabled, if you are not accessing any Hive views from Trino.
+
+You can configure the behavior in your catalog properties file.
+
+By default, Hive views are executed with the `RUN AS DEFINER` security mode.
+Set the  `hive.hive-views.run-as-invoker` catalog configuration property to
+`true` to use `RUN AS INVOKER` semantics.
+
+**Disabled**
+
+The default behavior is to ignore Hive views. This means that your business
+logic and data encoded in the views is not available in Trino.
+
+**Legacy**
+
+A very simple implementation to execute Hive views, and therefore allow read
+access to the data in Trino, can be enabled with
+`hive.hive-views.enabled=true` and
+`hive.hive-views.legacy-translation=true`.
+
+For temporary usage of the legacy behavior for a specific catalog, you can set
+the `hive_views_legacy_translation` {doc}`catalog session property
+</sql/set-session>` to `true`.
+
+This legacy behavior interprets any HiveQL query that defines a view as if it
+is written in SQL. It does not do any translation, but instead relies on the
+fact that HiveQL is very similar to SQL.
+
+This works for very simple Hive views, but can lead to problems for more complex
+queries. For example, if a HiveQL function has an identical signature but
+different behaviors to the SQL version, the returned results may differ. In more
+extreme cases the queries might fail, or not even be able to be parsed and
+executed.
+
+**Experimental**
+
+The new behavior is better engineered and has the potential to become a lot
+more powerful than the legacy implementation. It can analyze, process, and
+rewrite Hive views and contained expressions and statements.
+
+It supports the following Hive view functionality:
+
+- `UNION [DISTINCT]` and `UNION ALL` against Hive views
+- Nested `GROUP BY` clauses
+- `current_user()`
+- `LATERAL VIEW OUTER EXPLODE`
+- `LATERAL VIEW [OUTER] EXPLODE` on array of struct
+- `LATERAL VIEW json_tuple`
+
+You can enable the experimental behavior with
+`hive.hive-views.enabled=true`. Remove the
+`hive.hive-views.legacy-translation` property or set it to `false` to make
+sure legacy is not enabled.
+
+Keep in mind that numerous features are not yet implemented when experimenting
+with this feature. The following is an incomplete list of **missing**
+functionality:
+
+- HiveQL `current_date`, `current_timestamp`, and others
+- Hive function calls including `translate()`, window functions, and others
+- Common table expressions and simple case expressions
+- Honor timestamp precision setting
+- Support all Hive data types and correct mapping to Trino types
+- Ability to process custom UDFs
+
+(hive-fte-support)=
+
+## Fault-tolerant execution support
+
+The connector supports {doc}`/admin/fault-tolerant-execution` of query
+processing. Read and write operations are both supported with any retry policy
+on non-transactional tables.
+
+Read operations are supported with any retry policy on transactional tables.
+Write operations and `CREATE TABLE ... AS` operations are not supported with
+any retry policy on transactional tables.
+
+## Performance
+
+The connector includes a number of performance improvements, detailed in the
+following sections.
+
+### Table statistics
+
+The Hive connector supports collecting and managing {doc}`table statistics
+</optimizer/statistics>` to improve query processing performance.
+
+When writing data, the Hive connector always collects basic statistics
+(`numFiles`, `numRows`, `rawDataSize`, `totalSize`)
+and by default will also collect column level statistics:
+
+```{eval-rst}
+.. list-table:: Available table statistics
+    :widths: 35, 65
+    :header-rows: 1
+
+    * - Column type
+      - Collectible statistics
+    * - ``TINYINT``
+      - Number of nulls, number of distinct values, min/max values
+    * - ``SMALLINT``
+      - Number of nulls, number of distinct values, min/max values
+    * - ``INTEGER``
+      - Number of nulls, number of distinct values, min/max values
+    * - ``BIGINT``
+      - Number of nulls, number of distinct values, min/max values
+    * - ``DOUBLE``
+      - Number of nulls, number of distinct values, min/max values
+    * - ``REAL``
+      - Number of nulls, number of distinct values, min/max values
+    * - ``DECIMAL``
+      - Number of nulls, number of distinct values, min/max values
+    * - ``DATE``
+      - Number of nulls, number of distinct values, min/max values
+    * - ``TIMESTAMP``
+      - Number of nulls, number of distinct values, min/max values
+    * - ``VARCHAR``
+      - Number of nulls, number of distinct values
+    * - ``CHAR``
+      - Number of nulls, number of distinct values
+    * - ``VARBINARY``
+      - Number of nulls
+    * - ``BOOLEAN``
+      - Number of nulls, number of true/false values
+```
+
+(hive-analyze)=
+
+#### Updating table and partition statistics
+
+If your queries are complex and include joining large data sets,
+running {doc}`/sql/analyze` on tables/partitions may improve query performance
+by collecting statistical information about the data.
+
+When analyzing a partitioned table, the partitions to analyze can be specified
+via the optional `partitions` property, which is an array containing
+the values of the partition keys in the order they are declared in the table schema:
+
+```
+ANALYZE table_name WITH (
+    partitions = ARRAY[
+        ARRAY['p1_value1', 'p1_value2'],
+        ARRAY['p2_value1', 'p2_value2']])
+```
+
+This query will collect statistics for two partitions with keys
+`p1_value1, p1_value2` and `p2_value1, p2_value2`.
+
+On wide tables, collecting statistics for all columns can be expensive and can have a
+detrimental effect on query planning. It is also typically unnecessary - statistics are
+only useful on specific columns, like join keys, predicates, grouping keys. One can
+specify a subset of columns to be analyzed via the optional `columns` property:
+
+```
+ANALYZE table_name WITH (
+    partitions = ARRAY[ARRAY['p2_value1', 'p2_value2']],
+    columns = ARRAY['col_1', 'col_2'])
+```
+
+This query collects statistics for columns `col_1` and `col_2` for the partition
+with keys `p2_value1, p2_value2`.
+
+Note that if statistics were previously collected for all columns, they must be dropped
+before re-analyzing just a subset:
+
+```
+CALL system.drop_stats('schema_name', 'table_name')
+```
+
+You can also drop statistics for selected partitions only:
+
+```
+CALL system.drop_stats(
+    schema_name => 'schema',
+    table_name => 'table',
+    partition_values => ARRAY[ARRAY['p2_value1', 'p2_value2']])
+```
+
+(hive-dynamic-filtering)=
+
+### Dynamic filtering
+
+The Hive connector supports the {doc}`dynamic filtering </admin/dynamic-filtering>` optimization.
+Dynamic partition pruning is supported for partitioned tables stored in any file format
+for broadcast as well as partitioned joins.
+Dynamic bucket pruning is supported for bucketed tables stored in any file format for
+broadcast joins only.
+
+For tables stored in ORC or Parquet file format, dynamic filters are also pushed into
+local table scan on worker nodes for broadcast joins. Dynamic filter predicates
+pushed into the ORC and Parquet readers are used to perform stripe or row-group pruning
+and save on disk I/O. Sorting the data within ORC or Parquet files by the columns used in
+join criteria significantly improves the effectiveness of stripe or row-group pruning.
+This is because grouping similar data within the same stripe or row-group
+greatly improves the selectivity of the min/max indexes maintained at stripe or
+row-group level.
+
+#### Delaying execution for dynamic filters
+
+It can often be beneficial to wait for the collection of dynamic filters before starting
+a table scan. This extra wait time can potentially result in significant overall savings
+in query and CPU time, if dynamic filtering is able to reduce the amount of scanned data.
+
+For the Hive connector, a table scan can be delayed for a configured amount of
+time until the collection of dynamic filters by using the configuration property
+`hive.dynamic-filtering.wait-timeout` in the catalog file or the catalog
+session property `<hive-catalog>.dynamic_filtering_wait_timeout`.
+
+(hive-table-redirection)=
+
+### Table redirection
+
+```{include} table-redirection.fragment
+```
+
+The connector supports redirection from Hive tables to Iceberg
+and Delta Lake tables with the following catalog configuration properties:
+
+- `hive.iceberg-catalog-name` for redirecting the query to {doc}`/connector/iceberg`
+- `hive.delta-lake-catalog-name` for redirecting the query to {doc}`/connector/delta-lake`
+
+(hive-performance-tuning-configuration)=
+
+### Performance tuning configuration properties
+
+The following table describes performance tuning properties for the Hive
+connector.
+
+:::{warning}
+Performance tuning configuration properties are considered expert-level
+features. Altering these properties from their default values is likely to
+cause instability and performance degradation.
+:::
+
+```{eval-rst}
+.. list-table::
+    :widths: 30, 50, 20
+    :header-rows: 1
+
+    * - Property name
+      - Description
+      - Default value
+    * - ``hive.max-outstanding-splits``
+      - The target number of buffered splits for each table scan in a query,
+        before the scheduler tries to pause.
+      - ``1000``
+    * - ``hive.max-outstanding-splits-size``
+      - The maximum size allowed for buffered splits for each table scan
+        in a query, before the query fails.
+      - ``256 MB``
+    * - ``hive.max-splits-per-second``
+      - The maximum number of splits generated per second per table scan. This
+        can be used to reduce the load on the storage system. By default, there
+        is no limit, which results in Trino maximizing the parallelization of
+        data access.
+      -
+    * - ``hive.max-initial-splits``
+      - For each table scan, the coordinator first assigns file sections of up
+        to ``max-initial-split-size``. After ``max-initial-splits`` have been
+        assigned, ``max-split-size`` is used for the remaining splits.
+      - ``200``
+    * - ``hive.max-initial-split-size``
+      - The size of a single file section assigned to a worker until
+        ``max-initial-splits`` have been assigned. Smaller splits results in
+        more parallelism, which gives a boost to smaller queries.
+      - ``32 MB``
+    * - ``hive.max-split-size``
+      - The largest size of a single file section assigned to a worker. Smaller
+        splits result in more parallelism and thus can decrease latency, but
+        also have more overhead and increase load on the system.
+      - ``64 MB``
+```
+
+## Hive 3-related limitations
+
+- For security reasons, the `sys` system catalog is not accessible.
+- Hive's `timestamp with local zone` data type is mapped to
+  `timestamp with time zone` with UTC timezone. It only supports reading
+  values - writing to tables with columns of this type is not supported.
+- Due to Hive issues [HIVE-21002](https://issues.apache.org/jira/browse/HIVE-21002)
+  and [HIVE-22167](https://issues.apache.org/jira/browse/HIVE-22167), Trino does
+  not correctly read `TIMESTAMP` values from Parquet, RCBinary, or Avro
+  file formats created by Hive 3.1 or later. When reading from these file formats,
+  Trino returns different results than Hive.
+- Trino does not support gathering table statistics for Hive transactional tables.
+  You must use Hive to gather table statistics with
+  [ANALYZE statement](https://cwiki.apache.org/confluence/display/hive/statsdev#StatsDev-ExistingTables%E2%80%93ANALYZE)
+  after table creation.
diff --git a/docs/src/main/sphinx/connector/hive.rst b/docs/src/main/sphinx/connector/hive.rst
deleted file mode 100644
index 96d918ac122f..000000000000
--- a/docs/src/main/sphinx/connector/hive.rst
+++ /dev/null
@@ -1,1691 +0,0 @@
-==============
-Hive connector
-==============
-
-.. raw:: html
-
-  <img src="../_static/img/hive.png" class="connector-logo">
-
-.. toctree::
-    :maxdepth: 1
-    :hidden:
-
-    Security <hive-security>
-    Amazon S3 <hive-s3>
-    Azure Storage <hive-azure>
-    GCS Tutorial <hive-gcs-tutorial>
-    IBM Cloud Object Storage <hive-cos>
-    Storage Caching <hive-caching>
-    Alluxio <hive-alluxio>
-
-The Hive connector allows querying data stored in an
-`Apache Hive <https://hive.apache.org/>`_
-data warehouse. Hive is a combination of three components:
-
-* Data files in varying formats, that are typically stored in the
-  Hadoop Distributed File System (HDFS) or in object storage systems
-  such as Amazon S3.
-* Metadata about how the data files are mapped to schemas and tables. This
-  metadata is stored in a database, such as MySQL, and is accessed via the Hive
-  metastore service.
-* A query language called HiveQL. This query language is executed on a
-  distributed computing framework such as MapReduce or Tez.
-
-Trino only uses the first two components: the data and the metadata.
-It does not use HiveQL or any part of Hive's execution environment.
-
-Requirements
-------------
-
-The Hive connector requires a Hive metastore service (HMS), or a compatible
-implementation of the Hive metastore, such as
-`AWS Glue Data Catalog <https://aws.amazon.com/glue/>`_.
-
-Apache Hadoop HDFS 2.x and 3.x are supported.
-
-Many distributed storage systems including HDFS,
-:doc:`Amazon S3 <hive-s3>` or S3-compatible systems,
-`Google Cloud Storage <#google-cloud-storage-configuration>`__,
-:doc:`Azure Storage <hive-azure>`, and
-:doc:`IBM Cloud Object Storage<hive-cos>` can be queried with the Hive
-connector.
-
-The coordinator and all workers must have network access to the Hive metastore
-and the storage system. Hive metastore access with the Thrift protocol defaults
-to using port 9083.
-
-General configuration
----------------------
-
-Create ``etc/catalog/example.properties`` with the following contents
-to mount the ``hive`` connector as the ``example`` catalog,
-replacing ``example.net:9083`` with the correct host and port
-for your Hive metastore Thrift service:
-
-.. code-block:: text
-
-    connector.name=hive
-    hive.metastore.uri=thrift://example.net:9083
-
-Multiple Hive clusters
-^^^^^^^^^^^^^^^^^^^^^^
-
-You can have as many catalogs as you need, so if you have additional
-Hive clusters, simply add another properties file to ``etc/catalog``
-with a different name, making sure it ends in ``.properties``. For
-example, if you name the property file ``sales.properties``, Trino
-creates a catalog named ``sales`` using the configured connector.
-
-HDFS configuration
-^^^^^^^^^^^^^^^^^^
-
-For basic setups, Trino configures the HDFS client automatically and
-does not require any configuration files. In some cases, such as when using
-federated HDFS or NameNode high availability, it is necessary to specify
-additional HDFS client options in order to access your HDFS cluster. To do so,
-add the ``hive.config.resources`` property to reference your HDFS config files:
-
-.. code-block:: text
-
-    hive.config.resources=/etc/hadoop/conf/core-site.xml,/etc/hadoop/conf/hdfs-site.xml
-
-Only specify additional configuration files if necessary for your setup.
-We recommend reducing the configuration files to have the minimum
-set of required properties, as additional properties may cause problems.
-
-The configuration files must exist on all Trino nodes. If you are
-referencing existing Hadoop config files, make sure to copy them to
-any Trino nodes that are not running Hadoop.
-
-HDFS username and permissions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Before running any ``CREATE TABLE`` or ``CREATE TABLE AS`` statements
-for Hive tables in Trino, you must check that the user Trino is
-using to access HDFS has access to the Hive warehouse directory. The Hive
-warehouse directory is specified by the configuration variable
-``hive.metastore.warehouse.dir`` in ``hive-site.xml``, and the default
-value is ``/user/hive/warehouse``.
-
-When not using Kerberos with HDFS, Trino accesses HDFS using the
-OS user of the Trino process. For example, if Trino is running as
-``nobody``, it accesses HDFS as ``nobody``. You can override this
-username by setting the ``HADOOP_USER_NAME`` system property in the
-Trino :ref:`jvm_config`, replacing ``hdfs_user`` with the
-appropriate username:
-
-.. code-block:: text
-
-    -DHADOOP_USER_NAME=hdfs_user
-
-The ``hive`` user generally works, since Hive is often started with
-the ``hive`` user and this user has access to the Hive warehouse.
-
-Whenever you change the user Trino is using to access HDFS, remove
-``/tmp/presto-*`` on HDFS, as the new user may not have access to
-the existing temporary directories.
-
-.. _hive_configuration_properties:
-
-Hive general configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following table lists general configuration properties for the Hive
-connector. There are additional sets of configuration properties throughout the
-Hive connector documentation.
-
-.. list-table:: Hive general configuration properties
-    :widths: 35, 50, 15
-    :header-rows: 1
-
-    * - Property Name
-      - Description
-      - Default
-    * - ``hive.config.resources``
-      - An optional comma-separated list of HDFS configuration files. These
-        files must exist on the machines running Trino. Only specify this if
-        absolutely necessary to access HDFS. Example: ``/etc/hdfs-site.xml``
-      -
-    * - ``hive.recursive-directories``
-      - Enable reading data from subdirectories of table or partition locations.
-        If disabled, subdirectories are ignored. This is equivalent to the
-        ``hive.mapred.supports.subdirectories`` property in Hive.
-      - ``false``
-    * - ``hive.ignore-absent-partitions``
-      - Ignore partitions when the file system location does not exist rather
-        than failing the query. This skips data that may be expected to be part
-        of the table.
-      - ``false``
-    * - ``hive.storage-format``
-      - The default file format used when creating new tables.
-      - ``ORC``
-    * - ``hive.compression-codec``
-      - The compression codec to use when writing files. Possible values are
-        ``NONE``, ``SNAPPY``, ``LZ4``, ``ZSTD``, or ``GZIP``.
-      - ``GZIP``
-    * - ``hive.force-local-scheduling``
-      - Force splits to be scheduled on the same node as the Hadoop DataNode
-        process serving the split data. This is useful for installations where
-        Trino is collocated with every DataNode.
-      - ``false``
-    * - ``hive.respect-table-format``
-      - Should new partitions be written using the existing table format or the
-        default Trino format?
-      - ``true``
-    * - ``hive.immutable-partitions``
-      - Can new data be inserted into existing partitions? If ``true`` then
-        setting ``hive.insert-existing-partitions-behavior`` to ``APPEND`` is
-        not allowed. This also affects the ``insert_existing_partitions_behavior``
-        session property in the same way.
-      - ``false``
-    * - ``hive.insert-existing-partitions-behavior``
-      - What happens when data is inserted into an existing partition? Possible
-        values are
-
-            * ``APPEND`` - appends data to existing partitions
-            * ``OVERWRITE`` - overwrites existing partitions
-            * ``ERROR`` - modifying existing partitions is not allowed
-      - ``APPEND``
-    * - ``hive.target-max-file-size``
-      - Best effort maximum size of new files.
-      - ``1GB``
-    * - ``hive.create-empty-bucket-files``
-      - Should empty files be created for buckets that have no data?
-      - ``false``
-    * - ``hive.validate-bucketing``
-      - Enables validation that data is in the correct bucket when reading
-        bucketed tables.
-      - ``true``
-    * - ``hive.partition-statistics-sample-size``
-      - Specifies the number of partitions to analyze when computing table
-        statistics.
-      - 100
-    * - ``hive.max-partitions-per-writers``
-      - Maximum number of partitions per writer.
-      - 100
-    * - ``hive.max-partitions-for-eager-load``
-      - The maximum number of partitions for a single table scan to load eagerly
-        on the coordinator. Certain optimizations are not possible without eager
-        loading.
-      - 100,000
-    * - ``hive.max-partitions-per-scan``
-      - Maximum number of partitions for a single table scan.
-      - 1,000,000
-    * - ``hive.dfs.replication``
-      - Hadoop file system replication factor.
-      -
-    * - ``hive.security``
-      - See :doc:`hive-security`.
-      -
-    * - ``security.config-file``
-      - Path of config file to use when ``hive.security=file``. See
-        :ref:`catalog-file-based-access-control` for details.
-      -
-    * - ``hive.non-managed-table-writes-enabled``
-      - Enable writes to non-managed (external) Hive tables.
-      - ``false``
-    * - ``hive.non-managed-table-creates-enabled``
-      - Enable creating non-managed (external) Hive tables.
-      - ``true``
-    * - ``hive.collect-column-statistics-on-write``
-      - Enables automatic column level statistics collection on write. See
-        `Table Statistics <#table-statistics>`__ for details.
-      - ``true``
-    * - ``hive.s3select-pushdown.enabled``
-      - Enable query pushdown to AWS S3 Select service.
-      - ``false``
-    * - ``hive.s3select-pushdown.max-connections``
-      - Maximum number of simultaneously open connections to S3 for
-        :ref:`s3selectpushdown`.
-      - 500
-    * - ``hive.file-status-cache-tables``
-      - Cache directory listing for specific tables. Examples:
-
-            * ``fruit.apple,fruit.orange`` to cache listings only for tables
-              ``apple`` and ``orange`` in schema ``fruit``
-            * ``fruit.*,vegetable.*`` to cache listings for all tables
-              in schemas ``fruit`` and ``vegetable``
-            * ``*`` to cache listings for all tables in all schemas
-      -
-    * - ``hive.file-status-cache-size``
-      - Maximum total number of cached file status entries.
-      - 1,000,000
-    * - ``hive.file-status-cache-expire-time``
-      - How long a cached directory listing is considered valid.
-      - ``1m``
-    * - ``hive.rcfile.time-zone``
-      - Adjusts binary encoded timestamp values to a specific time zone. For
-        Hive 3.1+, this must be set to UTC.
-      - JVM default
-    * - ``hive.timestamp-precision``
-      - Specifies the precision to use for Hive columns of type ``timestamp``.
-        Possible values are ``MILLISECONDS``, ``MICROSECONDS`` and ``NANOSECONDS``.
-        Values with higher precision than configured are rounded.
-      - ``MILLISECONDS``
-    * - ``hive.temporary-staging-directory-enabled``
-      - Controls whether the temporary staging directory configured at
-        ``hive.temporary-staging-directory-path`` is used for write
-        operations. Temporary staging directory is never used for writes to
-        non-sorted tables on S3, encrypted HDFS or external location. Writes to
-        sorted tables will utilize this path for staging temporary files during
-        sorting operation. When disabled, the target storage will be used for
-        staging while writing sorted tables which can be inefficient when
-        writing to object stores like S3.
-      - ``true``
-    * - ``hive.temporary-staging-directory-path``
-      - Controls the location of temporary staging directory that is used for
-        write operations. The ``${USER}`` placeholder can be used to use a
-        different location for each user.
-      - ``/tmp/presto-${USER}``
-    * - ``hive.hive-views.enabled``
-      - Enable translation for :ref:`Hive views <hive-views>`.
-      - ``false``
-    * - ``hive.hive-views.legacy-translation``
-      - Use the legacy algorithm to translate :ref:`Hive views <hive-views>`.
-        You can use the ``hive_views_legacy_translation`` catalog session
-        property for temporary, catalog specific use.
-      - ``false``
-    * - ``hive.parallel-partitioned-bucketed-writes``
-      - Improve parallelism of partitioned and bucketed table writes. When
-        disabled, the number of writing threads is limited to number of buckets.
-      - ``true``
-    * - ``hive.fs.new-directory-permissions``
-      - Controls the permissions set on new directories created for tables. It
-        must be either 'skip' or an octal number, with a leading 0. If set to
-        'skip', permissions of newly created directories will not be set by
-        Trino.
-      - ``0777``
-    * - ``hive.fs.cache.max-size``
-      - Maximum number of cached file system objects.
-      - 1000
-    * - ``hive.query-partition-filter-required``
-      - Set to ``true`` to force a query to use a partition filter. You can use
-        the ``query_partition_filter_required`` catalog session property for
-        temporary, catalog specific use.
-      - ``false``
-    * - ``hive.table-statistics-enabled``
-      - Enables :doc:`/optimizer/statistics`. The equivalent
-        :doc:`catalog session property </sql/set-session>` is
-        ``statistics_enabled`` for session specific use. Set to ``false`` to
-        disable statistics. Disabling statistics means that
-        :doc:`/optimizer/cost-based-optimizations` can not make smart decisions
-        about the query plan.
-      - ``true``
-    * - ``hive.auto-purge``
-      - Set the default value for the auto_purge table property for managed
-        tables. See the :ref:`hive_table_properties` for more information on
-        auto_purge.
-      - ``false``
-    * - ``hive.partition-projection-enabled``
-      - Enables Athena partition projection support
-      - ``false``
-    * - ``hive.max-partition-drops-per-query``
-      - Maximum number of partitions to drop in a single query.
-      - 100,000
-    * - ``hive.single-statement-writes``
-      - Enables auto-commit for all writes. This can be used to disallow
-        multi-statement write transactions.
-      - ``false``
-
-Metastores
-----------
-
-The Hive connector supports the use of the Hive Metastore Service (HMS) and AWS
-Glue data catalog.
-
-Additionally, accessing tables with Athena partition projection metadata, as
-well as first class support for Avro tables, are available with additional
-configuration.
-
-General metastore configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The required Hive metastore can be configured with a number of properties.
-Specific properties can be used to further configure the
-`Thrift <#thrift-metastore-configuration-properties>`__ or
-`Glue <#aws-glue-catalog-configuration-properties>`__ metastore.
-
-.. list-table:: General metastore configuration properties
-    :widths: 35, 50, 15
-    :header-rows: 1
-
-    * - Property Name
-      - Description
-      - Default
-    * - ``hive.metastore``
-      - The type of Hive metastore to use. Trino currently supports the default
-        Hive Thrift metastore (``thrift``), and the AWS Glue Catalog (``glue``)
-        as metadata sources.
-      - ``thrift``
-    * - ``hive.metastore-cache.cache-partitions``
-      - Enable caching for partition metadata. You can disable caching to avoid
-        inconsistent behavior that results from it.
-      - ``true``
-    * - ``hive.metastore-cache-ttl``
-      - Duration of how long cached metastore data is considered valid.
-      - ``0s``
-    * - ``hive.metastore-stats-cache-ttl``
-      - Duration of how long cached metastore statistics are considered valid.
-        If ``hive.metastore-cache-ttl`` is larger then it takes precedence
-        over ``hive.metastore-stats-cache-ttl``.
-      - ``5m``
-    * - ``hive.metastore-cache-maximum-size``
-      - Maximum number of metastore data objects in the Hive metastore cache.
-      - ``10000``
-    * - ``hive.metastore-refresh-interval``
-      - Asynchronously refresh cached metastore data after access if it is older
-        than this but is not yet expired, allowing subsequent accesses to see
-        fresh data.
-      -
-    * - ``hive.metastore-refresh-max-threads``
-      - Maximum threads used to refresh cached metastore data.
-      - ``10``
-    * - ``hive.metastore-timeout``
-      - Timeout for Hive metastore requests.
-      - ``10s``
-    * - ``hive.hide-delta-lake-tables``
-      - Controls whether to hide Delta Lake tables in table listings. Currently
-        applies only when using the AWS Glue metastore.
-      - ``false``
-
-.. _hive-thrift-metastore:
-
-Thrift metastore configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In order to use a Hive Thrisft metastore, you must configure the metastore with
-``hive.metastore=thrift`` and provide further details with the following
-properties:
-
-.. list-table:: Thrift metastore configuration properties
-   :widths: 35, 50, 15
-   :header-rows: 1
-
-   * - Property name
-     - Description
-     - Default
-   * - ``hive.metastore.uri``
-     - The URIs of the Hive metastore to connect to using the Thrift protocol.
-       If a comma-separated list of URIs is provided, the first URI is used by
-       default, and the rest of the URIs are fallback metastores. This property
-       is required. Example: ``thrift://192.0.2.3:9083`` or
-       ``thrift://192.0.2.3:9083,thrift://192.0.2.4:9083``
-     -
-   * - ``hive.metastore.username``
-     - The username Trino uses to access the Hive metastore.
-     -
-   * - ``hive.metastore.authentication.type``
-     - Hive metastore authentication type. Possible values are ``NONE`` or
-       ``KERBEROS``.
-     - ``NONE``
-   * - ``hive.metastore.thrift.impersonation.enabled``
-     - Enable Hive metastore end user impersonation.
-     -
-   * - ``hive.metastore.thrift.use-spark-table-statistics-fallback``
-     - Enable usage of table statistics generated by Apache Spark when Hive
-       table statistics are not available.
-     - ``true``
-   * - ``hive.metastore.thrift.delegation-token.cache-ttl``
-     - Time to live delegation token cache for metastore.
-     - ``1h``
-   * - ``hive.metastore.thrift.delegation-token.cache-maximum-size``
-     - Delegation token cache maximum size.
-     - ``1000``
-   * - ``hive.metastore.thrift.client.ssl.enabled``
-     - Use SSL when connecting to metastore.
-     - ``false``
-   * - ``hive.metastore.thrift.client.ssl.key``
-     - Path to private key and client certification (key store).
-     -
-   * - ``hive.metastore.thrift.client.ssl.key-password``
-     - Password for the private key.
-     -
-   * - ``hive.metastore.thrift.client.ssl.trust-certificate``
-     - Path to the server certificate chain (trust store). Required when SSL is
-       enabled.
-     -
-   * - ``hive.metastore.thrift.client.ssl.trust-certificate-password``
-     - Password for the trust store.
-     -
-   * - ``hive.metastore.service.principal``
-     - The Kerberos principal of the Hive metastore service.
-     -
-   * - ``hive.metastore.client.principal``
-     - The Kerberos principal that Trino uses when connecting to the Hive
-       metastore service.
-     -
-   * - ``hive.metastore.client.keytab``
-     - Hive metastore client keytab location.
-     -
-   * - ``hive.metastore.thrift.delete-files-on-drop``
-     - Actively delete the files for managed tables when performing drop table
-       or partition operations, for cases when the metastore does not delete the
-       files.
-     - ``false``
-   * - ``hive.metastore.thrift.assume-canonical-partition-keys``
-     - Allow the metastore to assume that the values of partition columns can be
-       converted to string values. This can lead to performance improvements in
-       queries which apply filters on the partition columns. Partition keys with
-       a ``timestamp`` type do not get canonicalized.
-     - ``false``
-   * - ``hive.metastore.thrift.client.socks-proxy``
-     - SOCKS proxy to use for the Thrift Hive metastore.
-     -
-   * - ``hive.metastore.thrift.client.max-retries``
-     - Maximum number of retry attempts for metastore requests.
-     - ``9``
-   * - ``hive.metastore.thrift.client.backoff-scale-factor``
-     - Scale factor for metastore request retry delay.
-     - ``2.0``
-   * - ``hive.metastore.thrift.client.max-retry-time``
-     - Total allowed time limit for a metastore request to be retried.
-     - ``30s``
-   * - ``hive.metastore.thrift.client.min-backoff-delay``
-     - Minimum delay between metastore request retries.
-     - ``1s``
-   * - ``hive.metastore.thrift.client.max-backoff-delay``
-     - Maximum delay between metastore request retries.
-     - ``1s``
-   * - ``hive.metastore.thrift.txn-lock-max-wait``
-     - Maximum time to wait to acquire hive transaction lock.
-     - ``10m``
-
-.. _hive-glue-metastore:
-
-AWS Glue catalog configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In order to use a Glue catalog, you must configure the metastore with
-``hive.metastore=glue`` and provide further details with the following
-properties:
-
-.. list-table:: AWS Glue catalog configuration properties
-    :widths: 35, 50, 15
-    :header-rows: 1
-
-    * - Property Name
-      - Description
-      - Default
-    * - ``hive.metastore.glue.region``
-      - AWS region of the Glue Catalog. This is required when not running in
-        EC2, or when the catalog is in a different region. Example:
-        ``us-east-1``
-      -
-    * - ``hive.metastore.glue.endpoint-url``
-      - Glue API endpoint URL (optional). Example:
-        ``https://glue.us-east-1.amazonaws.com``
-      -
-    * - ``hive.metastore.glue.sts.region``
-      - AWS region of the STS service to authenticate with. This is required
-        when running in a GovCloud region. Example: ``us-gov-east-1``
-      -
-    * - ``hive.metastore.glue.proxy-api-id``
-      - The ID of the Glue Proxy API, when accessing Glue via an VPC endpoint in
-        API Gateway.
-      -
-    * - ``hive.metastore.glue.sts.endpoint``
-      - STS endpoint URL to use when authenticating to Glue (optional). Example:
-        ``https://sts.us-gov-east-1.amazonaws.com``
-      -
-    * - ``hive.metastore.glue.pin-client-to-current-region``
-      - Pin Glue requests to the same region as the EC2 instance where Trino is
-        running.
-      - ``false``
-    * - ``hive.metastore.glue.max-connections``
-      - Max number of concurrent connections to Glue.
-      - ``30``
-    * - ``hive.metastore.glue.max-error-retries``
-      - Maximum number of error retries for the Glue client.
-      - ``10``
-    * - ``hive.metastore.glue.default-warehouse-dir``
-      - Default warehouse directory for schemas created without an explicit
-        ``location`` property.
-      -
-    * - ``hive.metastore.glue.aws-credentials-provider``
-      - Fully qualified name of the Java class to use for obtaining AWS
-        credentials. Can be used to supply a custom credentials provider.
-      -
-    * - ``hive.metastore.glue.aws-access-key``
-      - AWS access key to use to connect to the Glue Catalog. If specified along
-        with ``hive.metastore.glue.aws-secret-key``, this parameter takes
-        precedence over ``hive.metastore.glue.iam-role``.
-      -
-    * - ``hive.metastore.glue.aws-secret-key``
-      - AWS secret key to use to connect to the Glue Catalog. If specified along
-        with ``hive.metastore.glue.aws-access-key``, this parameter takes
-        precedence over ``hive.metastore.glue.iam-role``.
-      -
-    * - ``hive.metastore.glue.catalogid``
-      - The ID of the Glue Catalog in which the metadata database resides.
-      -
-    * - ``hive.metastore.glue.iam-role``
-      - ARN of an IAM role to assume when connecting to the Glue Catalog.
-      -
-    * - ``hive.metastore.glue.external-id``
-      - External ID for the IAM role trust policy when connecting to the Glue
-        Catalog.
-      -
-    * - ``hive.metastore.glue.partitions-segments``
-      - Number of segments for partitioned Glue tables.
-      - ``5``
-    * - ``hive.metastore.glue.get-partition-threads``
-      - Number of threads for parallel partition fetches from Glue.
-      - ``20``
-    * - ``hive.metastore.glue.read-statistics-threads``
-      - Number of threads for parallel statistic fetches from Glue.
-      - ``5``
-    * - ``hive.metastore.glue.write-statistics-threads``
-      - Number of threads for parallel statistic writes to Glue.
-      - ``5``
-
-.. _partition_projection:
-
-Accessing tables with Athena partition projection metadata
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-`Partition projection <https://docs.aws.amazon.com/athena/latest/ug/partition-projection.html>`_
-is a feature of AWS Athena often used to speed up query processing with highly
-partitioned tables.
-
-Trino supports partition projection table properties stored in the metastore,
-and it reimplements this functionality. Currently, there is a limitation in
-comparison to AWS Athena for date projection, as it only supports intervals of
-``DAYS``, ``HOURS``, ``MINUTES``, and ``SECONDS``.
-
-If there are any compatibility issues blocking access to a requested table when
-you have partition projection enabled, you can set the
-``partition_projection_ignore`` table property to ``true`` for a table to bypass
-any errors.
-
-Refer to :ref:`hive_table_properties` and :ref:`hive_column_properties` for
-configuration of partition projection.
-
-Metastore configuration for Avro
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In order to enable first-class support for Avro tables when using
-Hive 3.x, you must add the following property definition to the Hive metastore
-configuration file ``hive-site.xml`` and restart the metastore service:
-
-.. code-block:: xml
-
-   <property>
-        <!-- https://community.hortonworks.com/content/supportkb/247055/errorjavalangunsupportedoperationexception-storage.html -->
-        <name>metastore.storage.schema.reader.impl</name>
-        <value>org.apache.hadoop.hive.metastore.SerDeStorageSchemaReader</value>
-    </property>
-
-Storage
--------
-
-The Hive connector supports the following storage options:
-
-* :doc:`Amazon S3 <hive-s3>`
-* :doc:`Azure Storage <hive-azure>`
-* Google Cloud Storage
-
-  * :ref:`properties <hive-google-cloud-storage-configuration>`
-  * :doc:`tutorial <hive-gcs-tutorial>`
-
-* :doc:`IBM Cloud Object Storage <hive-cos>`
-
-The Hive connector also supports :doc:`storage caching <hive-caching>`.
-
-.. _hive-google-cloud-storage-configuration:
-
-Google Cloud Storage configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The Hive connector can access data stored in GCS, using the ``gs://`` URI prefix.
-Please refer to the :doc:`hive-gcs-tutorial` for step-by-step instructions.
-
-GCS configuration properties
-""""""""""""""""""""""""""""
-
-.. list-table:: Google Cloud Storage configuration properties
-    :widths: 35, 65
-    :header-rows: 1
-
-    * - Property Name
-      - Description
-    * - ``hive.gcs.json-key-file-path``
-      - JSON key file used to authenticate with Google Cloud Storage.
-    * - ``hive.gcs.use-access-token``
-      - Use client-provided OAuth token to access Google Cloud Storage. This is
-        mutually exclusive with a global JSON key file.
-
-Security
---------
-
-Please see the :doc:`/connector/hive-security` section for information on the
-security options available for the Hive connector.
-
-.. _hive-sql-support:
-
-SQL support
------------
-
-The connector provides read access and write access to data and metadata in the
-configured object storage system and metadata stores:
-
-* :ref:`Globally available statements <sql-globally-available>`; see also
-  :ref:`Globally available statements <hive-procedures>`
-* :ref:`Read operations <sql-read-operations>`
-* :ref:`sql-write-operations`:
-
-  * :ref:`sql-data-management`; see also
-    :ref:`Hive-specific data management <hive-data-management>`
-  * :ref:`sql-schema-table-management`; see also
-    :ref:`Hive-specific schema and table management <hive-schema-and-table-management>`
-  * :ref:`sql-view-management`; see also
-    :ref:`Hive-specific view management <hive-sql-view-management>`
-
-* :ref:`sql-security-operations`: see also
-  :ref:`SQL standard-based authorization for object storage <hive-sql-standard-based-authorization>`
-* :ref:`sql-transactions`
-
-Refer to :doc:`the migration guide </appendix/from-hive>` for practical advice
-on migrating from Hive to Trino.
-
-The following sections provide Hive-specific information regarding SQL support.
-
-.. _hive_examples:
-
-Basic usage examples
-^^^^^^^^^^^^^^^^^^^^
-
-The examples shown here work on Google Cloud Storage by replacing ``s3://`` with
-``gs://``.
-
-Create a new Hive table named ``page_views`` in the ``web`` schema
-that is stored using the ORC file format, partitioned by date and
-country, and bucketed by user into ``50`` buckets. Note that Hive
-requires the partition columns to be the last columns in the table::
-
-    CREATE TABLE example.web.page_views (
-      view_time timestamp,
-      user_id bigint,
-      page_url varchar,
-      ds date,
-      country varchar
-    )
-    WITH (
-      format = 'ORC',
-      partitioned_by = ARRAY['ds', 'country'],
-      bucketed_by = ARRAY['user_id'],
-      bucket_count = 50
-    )
-
-Create a new Hive schema named ``web`` that stores tables in an
-S3 bucket named ``my-bucket``::
-
-    CREATE SCHEMA example.web
-    WITH (location = 's3://my-bucket/')
-
-Drop a schema::
-
-    DROP SCHEMA example.web
-
-Drop a partition from the ``page_views`` table::
-
-    DELETE FROM example.web.page_views
-    WHERE ds = DATE '2016-08-09'
-      AND country = 'US'
-
-Query the ``page_views`` table::
-
-    SELECT * FROM example.web.page_views
-
-List the partitions of the ``page_views`` table::
-
-    SELECT * FROM example.web."page_views$partitions"
-
-Create an external Hive table named ``request_logs`` that points at
-existing data in S3::
-
-    CREATE TABLE example.web.request_logs (
-      request_time timestamp,
-      url varchar,
-      ip varchar,
-      user_agent varchar
-    )
-    WITH (
-      format = 'TEXTFILE',
-      external_location = 's3://my-bucket/data/logs/'
-    )
-
-Collect statistics for the ``request_logs`` table::
-
-    ANALYZE example.web.request_logs;
-
-Drop the external table ``request_logs``. This only drops the metadata
-for the table. The referenced data directory is not deleted::
-
-    DROP TABLE example.web.request_logs
-
-* :doc:`/sql/create-table-as` can be used to create transactional tables in ORC format like this::
-
-      CREATE TABLE <name>
-      WITH (
-          format='ORC',
-          transactional=true
-      )
-      AS <query>
-
-
-Add an empty partition to the ``page_views`` table::
-
-    CALL system.create_empty_partition(
-        schema_name => 'web',
-        table_name => 'page_views',
-        partition_columns => ARRAY['ds', 'country'],
-        partition_values => ARRAY['2016-08-09', 'US']);
-
-Drop stats for a partition of the ``page_views`` table::
-
-    CALL system.drop_stats(
-        schema_name => 'web',
-        table_name => 'page_views',
-        partition_values => ARRAY['2016-08-09', 'US']);
-
-.. _hive-procedures:
-
-Procedures
-^^^^^^^^^^
-
-Use the :doc:`/sql/call` statement to perform data manipulation or
-administrative tasks. Procedures must include a qualified catalog name, if your
-Hive catalog is called ``web``::
-
-    CALL web.system.example_procedure()
-
-The following procedures are available:
-
-* ``system.create_empty_partition(schema_name, table_name, partition_columns, partition_values)``
-
-  Create an empty partition in the specified table.
-
-* ``system.sync_partition_metadata(schema_name, table_name, mode, case_sensitive)``
-
-  Check and update partitions list in metastore. There are three modes available:
-
-  * ``ADD`` : add any partitions that exist on the file system, but not in the metastore.
-  * ``DROP``: drop any partitions that exist in the metastore, but not on the file system.
-  * ``FULL``: perform both ``ADD`` and ``DROP``.
-
-  The ``case_sensitive`` argument is optional. The default value is ``true`` for compatibility
-  with Hive's ``MSCK REPAIR TABLE`` behavior, which expects the partition column names in
-  file system paths to use lowercase (e.g. ``col_x=SomeValue``). Partitions on the file system
-  not conforming to this convention are ignored, unless the argument is set to ``false``.
-
-* ``system.drop_stats(schema_name, table_name, partition_values)``
-
-  Drops statistics for a subset of partitions or the entire table. The partitions are specified as an
-  array whose elements are arrays of partition values (similar to the ``partition_values`` argument in
-  ``create_empty_partition``). If ``partition_values`` argument is omitted, stats are dropped for the
-  entire table.
-
-.. _register_partition:
-
-* ``system.register_partition(schema_name, table_name, partition_columns, partition_values, location)``
-
-  Registers existing location as a new partition in the metastore for the specified table.
-
-  When the ``location`` argument is omitted, the partition location is
-  constructed using ``partition_columns`` and ``partition_values``.
-
-  Due to security reasons, the procedure is enabled only when ``hive.allow-register-partition-procedure``
-  is set to ``true``.
-
-.. _unregister_partition:
-
-* ``system.unregister_partition(schema_name, table_name, partition_columns, partition_values)``
-
-  Unregisters given, existing partition in the metastore for the specified table.
-  The partition data is not deleted.
-
-.. _hive_flush_metadata_cache:
-
-* ``system.flush_metadata_cache()``
-
-  Flush all Hive metadata caches.
-
-* ``system.flush_metadata_cache(schema_name => ..., table_name => ...)``
-
-  Flush Hive metadata caches entries connected with selected table.
-  Procedure requires named parameters to be passed
-
-* ``system.flush_metadata_cache(schema_name => ..., table_name => ..., partition_columns => ARRAY[...], partition_values => ARRAY[...])``
-
-  Flush Hive metadata cache entries connected with selected partition.
-  Procedure requires named parameters to be passed.
-
-.. _hive-data-management:
-
-Data management
-^^^^^^^^^^^^^^^
-
-Some :ref:`data management <sql-data-management>` statements may be affected by
-the Hive catalog's authorization check policy. In the default ``legacy`` policy,
-some statements are disabled by default. See :doc:`hive-security` for more
-information.
-
-The :ref:`sql-data-management` functionality includes support for ``INSERT``,
-``UPDATE``, ``DELETE``, and ``MERGE`` statements, with the exact support
-depending on the storage system, file format, and metastore.
-
-When connecting to a Hive metastore version 3.x, the Hive connector supports
-reading from and writing to insert-only and ACID tables, with full support for
-partitioning and bucketing.
-
-:doc:`/sql/delete` applied to non-transactional tables is only supported if the
-table is partitioned and the ``WHERE`` clause matches entire partitions.
-Transactional Hive tables with ORC format support "row-by-row" deletion, in
-which the ``WHERE`` clause may match arbitrary sets of rows.
-
-:doc:`/sql/update` is only supported for transactional Hive tables with format
-ORC. ``UPDATE`` of partition or bucket columns is not supported.
-
-:doc:`/sql/merge` is only supported for ACID tables.
-
-ACID tables created with `Hive Streaming Ingest <https://cwiki.apache.org/confluence/display/Hive/Streaming+Data+Ingest>`_
-are not supported.
-
-.. _hive-schema-and-table-management:
-
-Schema and table management
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The Hive connector supports querying and manipulating Hive tables and schemas
-(databases). While some uncommon operations must be performed using
-Hive directly, most operations can be performed using Trino.
-
-Schema evolution
-""""""""""""""""
-
-Hive allows the partitions in a table to have a different schema than the
-table. This occurs when the column types of a table are changed after
-partitions already exist (that use the original column types). The Hive
-connector supports this by allowing the same conversions as Hive:
-
-* ``varchar`` to and from ``tinyint``, ``smallint``, ``integer`` and ``bigint``
-* ``real`` to ``double``
-* Widening conversions for integers, such as ``tinyint`` to ``smallint``
-
-Any conversion failure results in null, which is the same behavior
-as Hive. For example, converting the string ``'foo'`` to a number,
-or converting the string ``'1234'`` to a ``tinyint`` (which has a
-maximum value of ``127``).
-
-.. _hive_avro_schema:
-
-Avro schema evolution
-"""""""""""""""""""""
-
-Trino supports querying and manipulating Hive tables with the Avro storage
-format, which has the schema set based on an Avro schema file/literal. Trino is
-also capable of creating the tables in Trino by infering the schema from a
-valid Avro schema file located locally, or remotely in HDFS/Web server.
-
-To specify that the Avro schema should be used for interpreting table data, use
-the ``avro_schema_url`` table property.
-
-The schema can be placed in the local file system or remotely in the following
-locations:
-
-- HDFS (e.g. ``avro_schema_url = 'hdfs://user/avro/schema/avro_data.avsc'``)
-- S3 (e.g. ``avro_schema_url = 's3n:///schema_bucket/schema/avro_data.avsc'``)
-- A web server (e.g. ``avro_schema_url = 'http://example.org/schema/avro_data.avsc'``)
-
-The URL, where the schema is located, must be accessible from the Hive metastore
-and Trino coordinator/worker nodes.
-
-Alternatively, you can use the table property ``avro_schema_literal`` to define
-the Avro schema.
-
-The table created in Trino using the ``avro_schema_url`` or
-``avro_schema_literal`` property behaves the same way as a Hive table with
-``avro.schema.url`` or ``avro.schema.literal`` set.
-
-Example::
-
-   CREATE TABLE example.avro.avro_data (
-      id bigint
-    )
-   WITH (
-      format = 'AVRO',
-      avro_schema_url = '/usr/local/avro_data.avsc'
-   )
-
-The columns listed in the DDL (``id`` in the above example) is ignored if ``avro_schema_url`` is specified.
-The table schema matches the schema in the Avro schema file. Before any read operation, the Avro schema is
-accessed so the query result reflects any changes in schema. Thus Trino takes advantage of Avro's backward compatibility abilities.
-
-If the schema of the table changes in the Avro schema file, the new schema can still be used to read old data.
-Newly added/renamed fields *must* have a default value in the Avro schema file.
-
-The schema evolution behavior is as follows:
-
-* Column added in new schema:
-  Data created with an older schema produces a *default* value when table is using the new schema.
-
-* Column removed in new schema:
-  Data created with an older schema no longer outputs the data from the column that was removed.
-
-* Column is renamed in the new schema:
-  This is equivalent to removing the column and adding a new one, and data created with an older schema
-  produces a *default* value when table is using the new schema.
-
-* Changing type of column in the new schema:
-  If the type coercion is supported by Avro or the Hive connector, then the conversion happens.
-  An error is thrown for incompatible types.
-
-Limitations
-~~~~~~~~~~~
-
-The following operations are not supported when ``avro_schema_url`` is set:
-
-* ``CREATE TABLE AS`` is not supported.
-* Bucketing(``bucketed_by``) columns are not supported in ``CREATE TABLE``.
-* ``ALTER TABLE`` commands modifying columns are not supported.
-
-.. _hive-alter-table-execute:
-
-ALTER TABLE EXECUTE
-"""""""""""""""""""
-
-The connector supports the ``optimize`` command for use with
-:ref:`ALTER TABLE EXECUTE <alter-table-execute>`.
-
-The ``optimize`` command is used for rewriting the content
-of the specified non-transactional table so that it is merged
-into fewer but larger files.
-In case that the table is partitioned, the data compaction
-acts separately on each partition selected for optimization.
-This operation improves read performance.
-
-All files with a size below the optional ``file_size_threshold``
-parameter (default value for the threshold is ``100MB``) are
-merged:
-
-.. code-block:: sql
-
-    ALTER TABLE test_table EXECUTE optimize
-
-The following statement merges files in a table that are
-under 10 megabytes in size:
-
-.. code-block:: sql
-
-    ALTER TABLE test_table EXECUTE optimize(file_size_threshold => '10MB')
-
-You can use a ``WHERE`` clause with the columns used to partition the table,
-to filter which partitions are optimized:
-
-.. code-block:: sql
-
-    ALTER TABLE test_partitioned_table EXECUTE optimize
-    WHERE partition_key = 1
-
-The ``optimize`` command is disabled by default, and can be enabled for a
-catalog with the ``<catalog-name>.non_transactional_optimize_enabled``
-session property:
-
-.. code-block:: sql
-
-    SET SESSION <catalog_name>.non_transactional_optimize_enabled=true
-
-.. warning::
-
-  Because Hive tables are non-transactional, take note of the following possible
-  outcomes:
-
-  * If queries are run against tables that are currently being optimized,
-    duplicate rows may be read.
-  * In rare cases where exceptions occur during the ``optimize`` operation,
-    a manual cleanup of the table directory is needed. In this situation, refer
-    to the Trino logs and query failure messages to see which files must be
-    deleted.
-
-.. _hive_table_properties:
-
-Table properties
-""""""""""""""""
-
-Table properties supply or set metadata for the underlying tables. This
-is key for :doc:`/sql/create-table-as` statements. Table properties are passed
-to the connector using a :doc:`WITH </sql/create-table-as>` clause::
-
-  CREATE TABLE tablename
-  WITH (format='CSV',
-        csv_escape = '"')
-
-.. list-table:: Hive connector table properties
-  :widths: 20, 60, 20
-  :header-rows: 1
-
-  * - Property name
-    - Description
-    - Default
-  * - ``auto_purge``
-    - Indicates to the configured metastore to perform a purge when a table or
-      partition is deleted instead of a soft deletion using the trash.
-    -
-  * - ``avro_schema_url``
-    - The URI pointing to :ref:`hive_avro_schema` for the table.
-    -
-  * - ``bucket_count``
-    - The number of buckets to group data into. Only valid if used with
-      ``bucketed_by``.
-    - 0
-  * - ``bucketed_by``
-    - The bucketing column for the storage table. Only valid if used with
-      ``bucket_count``.
-    - ``[]``
-  * - ``bucketing_version``
-    - Specifies which Hive bucketing version to use. Valid values are ``1``
-      or ``2``.
-    -
-  * - ``csv_escape``
-    - The CSV escape character. Requires CSV format.
-    -
-  * - ``csv_quote``
-    - The CSV quote character. Requires CSV format.
-    -
-  * - ``csv_separator``
-    - The CSV separator character. Requires CSV format. You can use other
-      separators such as ``|`` or use Unicode to configure invisible separators
-      such tabs with ``U&'\0009'``.
-    - ``,``
-  * - ``external_location``
-    - The URI for an external Hive table on S3, Azure Blob Storage, etc. See the
-      :ref:`hive_examples` for more information.
-    -
-  * - ``format``
-    - The table file format. Valid values include ``ORC``, ``PARQUET``,
-      ``AVRO``, ``RCBINARY``, ``RCTEXT``, ``SEQUENCEFILE``, ``JSON``,
-      ``TEXTFILE``, ``CSV``, and ``REGEX``. The catalog property
-      ``hive.storage-format`` sets the default value and can change it to a
-      different default.
-    -
-  * - ``null_format``
-    - The serialization format for ``NULL`` value. Requires TextFile, RCText,
-      or SequenceFile format.
-    -
-  * - ``orc_bloom_filter_columns``
-    - Comma separated list of columns to use for ORC bloom filter. It improves
-      the performance of queries using range predicates when reading ORC files.
-      Requires ORC format.
-    - ``[]``
-  * - ``orc_bloom_filter_fpp``
-    - The ORC bloom filters false positive probability. Requires ORC format.
-    - 0.05
-  * - ``partitioned_by``
-    - The partitioning column for the storage table. The columns listed in the
-      ``partitioned_by`` clause must be the last columns as defined in the DDL.
-    - ``[]``
-  * - ``skip_footer_line_count``
-    - The number of footer lines to ignore when parsing the file for data.
-      Requires TextFile or CSV format tables.
-    -
-  * - ``skip_header_line_count``
-    - The number of header lines to ignore when parsing the file for data.
-      Requires TextFile or CSV format tables.
-    -
-  * - ``sorted_by``
-    - The column to sort by to determine bucketing for row. Only valid if
-      ``bucketed_by`` and ``bucket_count`` are specified as well.
-    - ``[]``
-  * - ``textfile_field_separator``
-    - Allows the use of custom field separators, such as '|', for TextFile
-      formatted tables.
-    -
-  * - ``textfile_field_separator_escape``
-    - Allows the use of a custom escape character for TextFile formatted tables.
-    -
-  * - ``transactional``
-    - Set this property to ``true`` to create an ORC ACID transactional table.
-      Requires ORC format. This property may be shown as true for insert-only
-      tables created using older versions of Hive.
-    -
-  * - ``partition_projection_enabled``
-    - Enables partition projection for selected table.
-      Mapped from AWS Athena table property
-      `projection.enabled <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-setting-up.html>`_.
-    -
-  * - ``partition_projection_ignore``
-    - Ignore any partition projection properties stored in the metastore for
-      the selected table. This is a Trino-only property which allows you to
-      work around compatibility issues on a specific table, and if enabled,
-      Trino ignores all other configuration options related to partition
-      projection.
-    -
-  * - ``partition_projection_location_template``
-    - Projected partition location template, such as
-      ``s3a://test/name=${name}/``. Mapped from the AWS Athena table property
-      `storage.location.template <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-setting-up.html#partition-projection-specifying-custom-s3-storage-locations>`_
-    - ``${table_location}/${partition_name}``
-
-.. _hive_special_tables:
-
-Metadata tables
-"""""""""""""""
-
-The raw Hive table properties are available as a hidden table, containing a
-separate column per table property, with a single row containing the property
-values. The properties table name is the same as the table name with
-``$properties`` appended.
-
-You can inspect the property names and values with a simple query::
-
-    SELECT * FROM example.web."page_views$properties";
-
-.. _hive_column_properties:
-
-Column properties
-"""""""""""""""""
-
-.. list-table:: Hive connector column properties
-  :widths: 20, 60, 20
-  :header-rows: 1
-
-  * - Property name
-    - Description
-    - Default
-  * - ``partition_projection_type``
-    - Defines the type of partition projection to use on this column.
-      May be used only on partition columns. Available types:
-      ``ENUM``, ``INTEGER``, ``DATE``, ``INJECTED``.
-      Mapped from the AWS Athena table property
-      `projection.${columnName}.type <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
-    -
-  * - ``partition_projection_values``
-    - Used with ``partition_projection_type`` set to ``ENUM``. Contains a static
-      list of values used to generate partitions.
-      Mapped from the AWS Athena table property
-      `projection.${columnName}.values <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
-    -
-  * - ``partition_projection_range``
-    - Used with ``partition_projection_type`` set to ``INTEGER`` or ``DATE`` to
-      define a range. It is a two-element array, describing the minimum and
-      maximum range values used to generate partitions. Generation starts from
-      the minimum, then increments by the defined
-      ``partition_projection_interval`` to the maximum. For example, the format
-      is ``['1', '4']`` for a ``partition_projection_type`` of ``INTEGER`` and
-      ``['2001-01-01', '2001-01-07']`` or ``['NOW-3DAYS', 'NOW']`` for a
-      ``partition_projection_type`` of ``DATE``. Mapped from the AWS Athena
-      table property
-      `projection.${columnName}.range <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
-    -
-  * - ``partition_projection_interval``
-    - Used with ``partition_projection_type`` set to ``INTEGER`` or ``DATE``. It
-      represents the interval used to generate partitions within
-      the given range ``partition_projection_range``. Mapped from the AWS Athena
-      table property
-      `projection.${columnName}.interval <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
-    -
-  * - ``partition_projection_digits``
-    - Used with ``partition_projection_type`` set to ``INTEGER``.
-      The number of digits to be used with integer column projection.
-      Mapped from the AWS Athena table property
-      `projection.${columnName}.digits <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
-    -
-  * - ``partition_projection_format``
-    - Used with ``partition_projection_type`` set to ``DATE``.
-      The date column projection format, defined as a string such as ``yyyy MM``
-      or ``MM-dd-yy HH:mm:ss`` for use with the
-      `Java DateTimeFormatter class <https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html>`_.
-      Mapped from the AWS Athena table property
-      `projection.${columnName}.format <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
-    -
-  * - ``partition_projection_interval_unit``
-    - Used with ``partition_projection_type=DATA``.
-      The date column projection range interval unit
-      given in ``partition_projection_interval``.
-      Mapped from the AWS Athena table property
-      `projection.${columnName}.interval.unit <https://docs.aws.amazon.com/athena/latest/ug/partition-projection-supported-types.html>`_.
-    -
-
-.. _hive_special_columns:
-
-Metadata columns
-""""""""""""""""
-
-In addition to the defined columns, the Hive connector automatically exposes
-metadata in a number of hidden columns in each table:
-
-* ``$bucket``: Bucket number for this row
-
-* ``$path``: Full file system path name of the file for this row
-
-* ``$file_modified_time``: Date and time of the last modification of the file for this row
-
-* ``$file_size``: Size of the file for this row
-
-* ``$partition``: Partition name for this row
-
-You can use these columns in your SQL statements like any other column. They
-can be selected directly, or used in conditional statements. For example, you
-can inspect the file size, location and partition for each record::
-
-    SELECT *, "$path", "$file_size", "$partition"
-    FROM example.web.page_views;
-
-Retrieve all records that belong to files stored in the partition
-``ds=2016-08-09/country=US``::
-
-    SELECT *, "$path", "$file_size"
-    FROM example.web.page_views
-    WHERE "$partition" = 'ds=2016-08-09/country=US'
-
-.. _hive-sql-view-management:
-
-View management
-^^^^^^^^^^^^^^^
-
-Trino allows reading from Hive materialized views, and can be configured to
-support reading Hive views.
-
-Materialized views
-""""""""""""""""""
-
-The Hive connector supports reading from Hive materialized views.
-In Trino, these views are presented as regular, read-only tables.
-
-.. _hive-views:
-
-Hive views
-""""""""""
-
-Hive views are defined in HiveQL and stored in the Hive Metastore Service. They
-are analyzed to allow read access to the data.
-
-The Hive connector includes support for reading Hive views with three different
-modes.
-
-* Disabled
-* Legacy
-* Experimental
-
-You can configure the behavior in your catalog properties file.
-
-By default, Hive views are executed with the ``RUN AS DEFINER`` security mode.
-Set the  ``hive.hive-views.run-as-invoker`` catalog configuration property to
-``true`` to use ``RUN AS INVOKER`` semantics.
-
-**Disabled**
-
-The default behavior is to ignore Hive views. This means that your business
-logic and data encoded in the views is not available in Trino.
-
-**Legacy**
-
-A very simple implementation to execute Hive views, and therefore allow read
-access to the data in Trino, can be enabled with
-``hive.hive-views.enabled=true`` and
-``hive.hive-views.legacy-translation=true``.
-
-For temporary usage of the legacy behavior for a specific catalog, you can set
-the ``hive_views_legacy_translation`` :doc:`catalog session property
-</sql/set-session>` to ``true``.
-
-This legacy behavior interprets any HiveQL query that defines a view as if it
-is written in SQL. It does not do any translation, but instead relies on the
-fact that HiveQL is very similar to SQL.
-
-This works for very simple Hive views, but can lead to problems for more complex
-queries. For example, if a HiveQL function has an identical signature but
-different behaviors to the SQL version, the returned results may differ. In more
-extreme cases the queries might fail, or not even be able to be parsed and
-executed.
-
-**Experimental**
-
-The new behavior is better engineered and has the potential to become a lot
-more powerful than the legacy implementation. It can analyze, process, and
-rewrite Hive views and contained expressions and statements.
-
-It supports the following Hive view functionality:
-
-* ``UNION [DISTINCT]`` and ``UNION ALL`` against Hive views
-* Nested ``GROUP BY`` clauses
-* ``current_user()``
-* ``LATERAL VIEW OUTER EXPLODE``
-* ``LATERAL VIEW [OUTER] EXPLODE`` on array of struct
-* ``LATERAL VIEW json_tuple``
-
-You can enable the experimental behavior with
-``hive.hive-views.enabled=true``. Remove the
-``hive.hive-views.legacy-translation`` property or set it to ``false`` to make
-sure legacy is not enabled.
-
-Keep in mind that numerous features are not yet implemented when experimenting
-with this feature. The following is an incomplete list of **missing**
-functionality:
-
-* HiveQL ``current_date``, ``current_timestamp``, and others
-* Hive function calls including ``translate()``, window functions, and others
-* Common table expressions and simple case expressions
-* Honor timestamp precision setting
-* Support all Hive data types and correct mapping to Trino types
-* Ability to process custom UDFs
-
-Performance
------------
-
-The connector includes a number of performance improvements, detailed in the
-following sections.
-
-Table statistics
-^^^^^^^^^^^^^^^^
-
-The Hive connector supports collecting and managing :doc:`table statistics
-</optimizer/statistics>` to improve query processing performance.
-
-When writing data, the Hive connector always collects basic statistics
-(``numFiles``, ``numRows``, ``rawDataSize``, ``totalSize``)
-and by default will also collect column level statistics:
-
-.. list-table:: Available table statistics
-    :widths: 35, 65
-    :header-rows: 1
-
-    * - Column type
-      - Collectible statistics
-    * - ``TINYINT``
-      - Number of nulls, number of distinct values, min/max values
-    * - ``SMALLINT``
-      - Number of nulls, number of distinct values, min/max values
-    * - ``INTEGER``
-      - Number of nulls, number of distinct values, min/max values
-    * - ``BIGINT``
-      - Number of nulls, number of distinct values, min/max values
-    * - ``DOUBLE``
-      - Number of nulls, number of distinct values, min/max values
-    * - ``REAL``
-      - Number of nulls, number of distinct values, min/max values
-    * - ``DECIMAL``
-      - Number of nulls, number of distinct values, min/max values
-    * - ``DATE``
-      - Number of nulls, number of distinct values, min/max values
-    * - ``TIMESTAMP``
-      - Number of nulls, number of distinct values, min/max values
-    * - ``VARCHAR``
-      - Number of nulls, number of distinct values
-    * - ``CHAR``
-      - Number of nulls, number of distinct values
-    * - ``VARBINARY``
-      - Number of nulls
-    * - ``BOOLEAN``
-      - Number of nulls, number of true/false values
-
-.. _hive_analyze:
-
-Updating table and partition statistics
-"""""""""""""""""""""""""""""""""""""""
-
-If your queries are complex and include joining large data sets,
-running :doc:`/sql/analyze` on tables/partitions may improve query performance
-by collecting statistical information about the data.
-
-When analyzing a partitioned table, the partitions to analyze can be specified
-via the optional ``partitions`` property, which is an array containing
-the values of the partition keys in the order they are declared in the table schema::
-
-    ANALYZE table_name WITH (
-        partitions = ARRAY[
-            ARRAY['p1_value1', 'p1_value2'],
-            ARRAY['p2_value1', 'p2_value2']])
-
-This query will collect statistics for two partitions with keys
-``p1_value1, p1_value2`` and ``p2_value1, p2_value2``.
-
-On wide tables, collecting statistics for all columns can be expensive and can have a
-detrimental effect on query planning. It is also typically unnecessary - statistics are
-only useful on specific columns, like join keys, predicates, grouping keys. One can
-specify a subset of columns to be analyzed via the optional ``columns`` property::
-
-    ANALYZE table_name WITH (
-        partitions = ARRAY[ARRAY['p2_value1', 'p2_value2']],
-        columns = ARRAY['col_1', 'col_2'])
-
-This query collects statistics for columns ``col_1`` and ``col_2`` for the partition
-with keys ``p2_value1, p2_value2``.
-
-Note that if statistics were previously collected for all columns, they must be dropped
-before re-analyzing just a subset::
-
-    CALL system.drop_stats('schema_name', 'table_name')
-
-You can also drop statistics for selected partitions only::
-
-    CALL system.drop_stats(
-        schema_name => 'schema',
-        table_name => 'table',
-        partition_values => ARRAY[ARRAY['p2_value1', 'p2_value2']])
-
-.. _hive_dynamic_filtering:
-
-Dynamic filtering
-^^^^^^^^^^^^^^^^^
-
-The Hive connector supports the :doc:`dynamic filtering </admin/dynamic-filtering>` optimization.
-Dynamic partition pruning is supported for partitioned tables stored in any file format
-for broadcast as well as partitioned joins.
-Dynamic bucket pruning is supported for bucketed tables stored in any file format for
-broadcast joins only.
-
-For tables stored in ORC or Parquet file format, dynamic filters are also pushed into
-local table scan on worker nodes for broadcast joins. Dynamic filter predicates
-pushed into the ORC and Parquet readers are used to perform stripe or row-group pruning
-and save on disk I/O. Sorting the data within ORC or Parquet files by the columns used in
-join criteria significantly improves the effectiveness of stripe or row-group pruning.
-This is because grouping similar data within the same stripe or row-group
-greatly improves the selectivity of the min/max indexes maintained at stripe or
-row-group level.
-
-Delaying execution for dynamic filters
-""""""""""""""""""""""""""""""""""""""
-
-It can often be beneficial to wait for the collection of dynamic filters before starting
-a table scan. This extra wait time can potentially result in significant overall savings
-in query and CPU time, if dynamic filtering is able to reduce the amount of scanned data.
-
-For the Hive connector, a table scan can be delayed for a configured amount of
-time until the collection of dynamic filters by using the configuration property
-``hive.dynamic-filtering.wait-timeout`` in the catalog file or the catalog
-session property ``<hive-catalog>.dynamic_filtering_wait_timeout``.
-
-.. _hive-table-redirection:
-
-Table redirection
-^^^^^^^^^^^^^^^^^
-
-.. include:: table-redirection.fragment
-
-The connector supports redirection from Hive tables to Iceberg
-and Delta Lake tables with the following catalog configuration properties:
-
-- ``hive.iceberg-catalog-name`` for redirecting the query to :doc:`/connector/iceberg`
-- ``hive.delta-lake-catalog-name`` for redirecting the query to :doc:`/connector/delta-lake`
-
-.. _hive-performance-tuning-configuration:
-
-Performance tuning configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following table describes performance tuning properties for the Hive
-connector.
-
-.. warning::
-
-   Performance tuning configuration properties are considered expert-level
-   features. Altering these properties from their default values is likely to
-   cause instability and performance degradation.
-
-.. list-table::
-    :widths: 30, 50, 20
-    :header-rows: 1
-
-    * - Property name
-      - Description
-      - Default value
-    * - ``hive.max-outstanding-splits``
-      - The target number of buffered splits for each table scan in a query,
-        before the scheduler tries to pause.
-      - ``1000``
-    * - ``hive.max-outstanding-splits-size``
-      - The maximum size allowed for buffered splits for each table scan
-        in a query, before the query fails.
-      - ``256 MB``
-    * - ``hive.max-splits-per-second``
-      - The maximum number of splits generated per second per table scan. This
-        can be used to reduce the load on the storage system. By default, there
-        is no limit, which results in Trino maximizing the parallelization of
-        data access.
-      -
-    * - ``hive.max-initial-splits``
-      - For each table scan, the coordinator first assigns file sections of up
-        to ``max-initial-split-size``. After ``max-initial-splits`` have been
-        assigned, ``max-split-size`` is used for the remaining splits.
-      - ``200``
-    * - ``hive.max-initial-split-size``
-      - The size of a single file section assigned to a worker until
-        ``max-initial-splits`` have been assigned. Smaller splits results in
-        more parallelism, which gives a boost to smaller queries.
-      - ``32 MB``
-    * - ``hive.max-split-size``
-      - The largest size of a single file section assigned to a worker. Smaller
-        splits result in more parallelism and thus can decrease latency, but
-        also have more overhead and increase load on the system.
-      - ``64 MB``
-
-File formats
-------------
-
-The following file types and formats are supported for the Hive connector:
-
-* ORC
-* Parquet
-* Avro
-* RCText (RCFile using ``ColumnarSerDe``)
-* RCBinary (RCFile using ``LazyBinaryColumnarSerDe``)
-* SequenceFile
-* JSON (using ``org.apache.hive.hcatalog.data.JsonSerDe``)
-* CSV (using ``org.apache.hadoop.hive.serde2.OpenCSVSerde``)
-* TextFile
-
-ORC format configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following properties are used to configure the read and write operations
-with ORC files performed by the Hive connector.
-
-.. list-table:: ORC format configuration properties
-    :widths: 30, 50, 20
-    :header-rows: 1
-
-    * - Property Name
-      - Description
-      - Default
-    * - ``hive.orc.time-zone``
-      - Sets the default time zone for legacy ORC files that did not declare a
-        time zone.
-      - JVM default
-    * - ``hive.orc.use-column-names``
-      - Access ORC columns by name. By default, columns in ORC files are
-        accessed by their ordinal position in the Hive table definition. The
-        equivalent catalog session property is ``orc_use_column_names``.
-      - ``false``
-    * - ``hive.orc.bloom-filters.enabled``
-      - Enable bloom filters for predicate pushdown.
-      - ``false``
-
-.. _hive-parquet-configuration:
-
-Parquet format configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following properties are used to configure the read and write operations
-with Parquet files performed by the Hive connector.
-
-.. list-table:: Parquet format configuration properties
-    :widths: 30, 50, 20
-    :header-rows: 1
-
-    * - Property Name
-      - Description
-      - Default
-    * - ``hive.parquet.time-zone``
-      - Adjusts timestamp values to a specific time zone. For Hive 3.1+, set
-        this to UTC.
-      - JVM default
-    * - ``hive.parquet.use-column-names``
-      - Access Parquet columns by name by default. Set this property to
-        ``false`` to access columns by their ordinal position in the Hive table
-        definition. The equivalent catalog session property is
-        ``parquet_use_column_names``.
-      - ``true``
-    * - ``parquet.optimized-reader.enabled``
-      - Whether batched column readers are used when reading Parquet files
-        for improved performance. Set this property to ``false`` to disable the
-        optimized parquet reader by default. The equivalent catalog session
-        property is ``parquet_optimized_reader_enabled``.
-      - ``true``
-    * - ``parquet.optimized-writer.enabled``
-      - Whether the optimized writer is used when writing Parquet files.
-        Set this property to ``true`` to use the optimized parquet writer by
-        default. The equivalent catalog session property is
-        ``parquet_optimized_writer_enabled``.
-      - ``false``
-    * - ``parquet.optimized-writer.validation-percentage``
-      - Percentage of parquet files to validate after write by re-reading the whole file
-        when ``parquet.optimized-writer.enabled`` is set to ``true``.
-        The equivalent catalog session property is ``parquet_optimized_writer_validation_percentage``.
-        Validation can be turned off by setting this property to ``0``.
-      - ``5``
-    * - ``parquet.writer.page-size``
-      - Maximum page size for the Parquet writer.
-      - ``1 MB``
-    * - ``parquet.writer.block-size``
-      - Maximum row group size for the Parquet writer.
-      - ``128 MB``
-    * - ``parquet.writer.batch-size``
-      - Maximum number of rows processed by the parquet writer in a batch.
-      - ``10000``
-    * - ``parquet.use-bloom-filter``
-      - Whether bloom filters are used for predicate pushdown when reading
-        Parquet files. Set this property to ``false`` to disable the usage of
-        bloom filters by default. The equivalent catalog session property is
-        ``parquet_use_bloom_filter``.
-      - ``true``
-    * - ``parquet.max-read-block-row-count``
-      - Sets the maximum number of rows read in a batch.
-      - ``8192``
-    * - ``parquet.optimized-nested-reader.enabled``
-      - Whether batched column readers should be used when reading ARRAY, MAP
-        and ROW types from Parquet files for improved performance. Set this
-        property to ``false`` to disable the optimized parquet reader by default
-        for structural data types. The equivalent catalog session property is
-        ``parquet_optimized_nested_reader_enabled``.
-      - ``true``
-
-Hive 3-related limitations
---------------------------
-
-* For security reasons, the ``sys`` system catalog is not accessible.
-
-* Hive's ``timestamp with local zone`` data type is not supported.
-  It is possible to read from a table with a column of this type, but the column
-  data is not accessible. Writing to such a table is not supported.
-
-* Due to Hive issues `HIVE-21002 <https://issues.apache.org/jira/browse/HIVE-21002>`_
-  and `HIVE-22167 <https://issues.apache.org/jira/browse/HIVE-22167>`_, Trino does
-  not correctly read ``timestamp`` values from Parquet, RCBinary, or Avro
-  file formats created by Hive 3.1 or later. When reading from these file formats,
-  Trino returns different results than Hive.
-
-* Trino does not support gathering table statistics for Hive transactional tables.
-  You must use Hive to gather table statistics with
-  `ANALYZE statement <https://cwiki.apache.org/confluence/display/hive/statsdev#StatsDev-ExistingTables%E2%80%93ANALYZE>`_
-  after table creation.
diff --git a/docs/src/main/sphinx/connector/hudi.md b/docs/src/main/sphinx/connector/hudi.md
new file mode 100644
index 000000000000..1236a4b21375
--- /dev/null
+++ b/docs/src/main/sphinx/connector/hudi.md
@@ -0,0 +1,211 @@
+# Hudi connector
+
+```{raw} html
+<img src="../_static/img/hudi.png" class="connector-logo">
+```
+
+The Hudi connector enables querying [Hudi](https://hudi.apache.org/docs/overview/) tables.
+
+## Requirements
+
+To use the Hudi connector, you need:
+
+- Hudi version 0.12.3 or higher.
+- Network access from the Trino coordinator and workers to the Hudi storage.
+- Access to a Hive metastore service (HMS).
+- Network access from the Trino coordinator to the HMS.
+- Data files stored in the Parquet file format. These can be configured using
+  {ref}`file format configuration properties <hive-parquet-configuration>` per
+  catalog.
+
+## General configuration
+
+To configure the Hive connector, create a catalog properties file
+`etc/catalog/example.properties` that references the `hudi`
+connector and defines the HMS to use with the `hive.metastore.uri`
+configuration property:
+
+```properties
+connector.name=hudi
+hive.metastore.uri=thrift://example.net:9083
+```
+
+There are {ref}`HMS configuration properties <general-metastore-properties>`
+available for use with the Hudi connector. The connector recognizes Hudi tables
+synced to the metastore by the [Hudi sync tool](https://hudi.apache.org/docs/syncing_metastore).
+
+Additionally, following configuration properties can be set depending on the use-case:
+
+```{eval-rst}
+.. list-table:: Hudi configuration properties
+    :widths: 30, 55, 15
+    :header-rows: 1
+
+    * - Property name
+      - Description
+      - Default
+    * - ``hudi.columns-to-hide``
+      - List of column names that are hidden from the query output.
+        It can be used to hide Hudi meta fields. By default, no fields are hidden.
+      -
+    * - ``hudi.parquet.use-column-names``
+      - Access Parquet columns using names from the file. If disabled, then columns
+        are accessed using the index. Only applicable to Parquet file format.
+      - ``true``
+    * - ``hudi.split-generator-parallelism``
+      - Number of threads to generate splits from partitions.
+      - ``4``
+    * - ``hudi.split-loader-parallelism``
+      - Number of threads to run background split loader.
+        A single background split loader is needed per query.
+      - ``4``
+    * - ``hudi.size-based-split-weights-enabled``
+      - Unlike uniform splitting, size-based splitting ensures that each batch of splits
+        has enough data to process. By default, it is enabled to improve performance.
+      - ``true``
+    * - ``hudi.standard-split-weight-size``
+      - The split size corresponding to the standard weight (1.0)
+        when size-based split weights are enabled.
+      - ``128MB``
+    * - ``hudi.minimum-assigned-split-weight``
+      - Minimum weight that a split can be assigned
+        when size-based split weights are enabled.
+      - ``0.05``
+    * - ``hudi.max-splits-per-second``
+      - Rate at which splits are queued for processing.
+        The queue is throttled if this rate limit is breached.
+      - ``Integer.MAX_VALUE``
+    * - ``hudi.max-outstanding-splits``
+      - Maximum outstanding splits in a batch enqueued for processing.
+      - ``1000``
+    * - ``hudi.per-transaction-metastore-cache-maximum-size``
+      - Maximum number of metastore data objects per transaction in
+        the Hive metastore cache.
+      - ``2000``
+
+```
+
+## SQL support
+
+The connector provides read access to data in the Hudi table that has been synced to
+Hive metastore. The {ref}`globally available <sql-globally-available>`
+and {ref}`read operation <sql-read-operations>` statements are supported.
+
+### Basic usage examples
+
+In the following example queries, `stock_ticks_cow` is the Hudi copy-on-write
+table referred to in the Hudi [quickstart guide](https://hudi.apache.org/docs/docker_demo/).
+
+```sql
+USE example.example_schema;
+
+SELECT symbol, max(ts)
+FROM stock_ticks_cow
+GROUP BY symbol
+HAVING symbol = 'GOOG';
+```
+
+```text
+  symbol   |        _col1         |
+-----------+----------------------+
+ GOOG      | 2018-08-31 10:59:00  |
+(1 rows)
+```
+
+```sql
+SELECT dt, symbol
+FROM stock_ticks_cow
+WHERE symbol = 'GOOG';
+```
+
+```text
+    dt      | symbol |
+------------+--------+
+ 2018-08-31 |  GOOG  |
+(1 rows)
+```
+
+```sql
+SELECT dt, count(*)
+FROM stock_ticks_cow
+GROUP BY dt;
+```
+
+```text
+    dt      | _col1 |
+------------+--------+
+ 2018-08-31 |  99  |
+(1 rows)
+```
+
+### Schema and table management
+
+Hudi supports [two types of tables](https://hudi.apache.org/docs/table_types)
+depending on how the data is indexed and laid out on the file system. The following
+table displays a support matrix of tables types and query types for the connector:
+
+```{eval-rst}
+.. list-table:: Hudi configuration properties
+    :widths: 45, 55
+    :header-rows: 1
+
+    * - Table type
+      - Supported query type
+    * - Copy on write
+      - Snapshot queries
+    * - Merge on read
+      - Read-optimized queries
+```
+
+(hudi-metadata-tables)=
+
+#### Metadata tables
+
+The connector exposes a metadata table for each Hudi table.
+The metadata table contains information about the internal structure
+of the Hudi table. You can query each metadata table by appending the
+metadata table name to the table name:
+
+```
+SELECT * FROM "test_table$timeline"
+```
+
+##### `$timeline` table
+
+The `$timeline` table provides a detailed view of meta-data instants
+in the Hudi table. Instants are specific points in time.
+
+You can retrieve the information about the timeline of the Hudi table
+`test_table` by using the following query:
+
+```
+SELECT * FROM "test_table$timeline"
+```
+
+```text
+ timestamp          | action  | state
+--------------------+---------+-----------
+8667764846443717831 | commit  | COMPLETED
+7860805980949777961 | commit  | COMPLETED
+```
+
+The output of the query has the following columns:
+
+```{eval-rst}
+.. list-table:: Timeline columns
+  :widths: 20, 30, 50
+  :header-rows: 1
+
+  * - Name
+    - Type
+    - Description
+  * - ``timestamp``
+    - ``VARCHAR``
+    - Instant time is typically a timestamp when the actions performed.
+  * - ``action``
+    - ``VARCHAR``
+    - `Type of action <https://hudi.apache.org/docs/concepts/#timeline>`_ performed on the table.
+  * - ``state``
+    - ``VARCHAR``
+    - Current state of the instant.
+```
diff --git a/docs/src/main/sphinx/connector/hudi.rst b/docs/src/main/sphinx/connector/hudi.rst
deleted file mode 100644
index 1de9ed6f7a31..000000000000
--- a/docs/src/main/sphinx/connector/hudi.rst
+++ /dev/null
@@ -1,226 +0,0 @@
-==============
-Hudi connector
-==============
-
-.. raw:: html
-
-  <img src="../_static/img/hudi.png" class="connector-logo">
-
-The Hudi connector enables querying `Hudi <https://hudi.apache.org/docs/overview/>`_ tables.
-
-Requirements
-------------
-
-To use the Hudi connector, you need:
-
-* Hudi version 0.12.2 or higher.
-* Network access from the Trino coordinator and workers to the Hudi storage.
-* Access to the Hive metastore service (HMS).
-* Network access from the Trino coordinator to the HMS.
-
-General configuration
----------------------
-
-The connector requires a Hive metastore for table metadata and supports the same
-metastore configuration properties as the :doc:`Hive connector
-</connector/hive>`. At a minimum, ``hive.metastore.uri`` must be configured.
-The connector recognizes Hudi tables synced to the metastore by the
-`Hudi sync tool <https://hudi.apache.org/docs/syncing_metastore>`_.
-
-To create a catalog that uses the Hudi connector, create a catalog properties
-file ``etc/catalog/example.properties`` that references the ``hudi`` connector.
-Update the ``hive.metastore.uri`` with the URI of your Hive metastore Thrift
-service:
-
-.. code-block:: properties
-
-    connector.name=hudi
-    hive.metastore.uri=thrift://example.net:9083
-
-Additionally, following configuration properties can be set depending on the use-case:
-
-.. list-table:: Hudi configuration properties
-    :widths: 30, 55, 15
-    :header-rows: 1
-
-    * - Property name
-      - Description
-      - Default
-    * - ``hudi.metadata-enabled``
-      - Fetch the list of file names and sizes from metadata rather than storage.
-      - ``false``
-    * - ``hudi.columns-to-hide``
-      - List of column names that are hidden from the query output.
-        It can be used to hide Hudi meta fields. By default, no fields are hidden.
-      -
-    * - ``hudi.parquet.use-column-names``
-      - Access Parquet columns using names from the file. If disabled, then columns
-        are accessed using the index. Only applicable to Parquet file format.
-      - ``true``
-    * - ``parquet.optimized-reader.enabled``
-      - Whether batched column readers must be used when reading Parquet files
-        for improved performance. Set this property to ``false`` to disable the
-        optimized parquet reader by default. The equivalent catalog session
-        property is ``parquet_optimized_reader_enabled``.
-      - ``true``
-    * - ``parquet.optimized-nested-reader.enabled``
-      - Whether batched column readers must be used when reading ARRAY, MAP
-        and ROW types from Parquet files for improved performance. Set this
-        property to ``false`` to disable the optimized parquet reader by default
-        for structural data types. The equivalent catalog session property is
-        ``parquet_optimized_nested_reader_enabled``.
-      - ``true``
-    * - ``hudi.min-partition-batch-size``
-      - Minimum number of partitions returned in a single batch.
-      - ``10``
-    * - ``hudi.max-partition-batch-size``
-      - Maximum number of partitions returned in a single batch.
-      - ``100``
-    * - ``hudi.size-based-split-weights-enabled``
-      - Unlike uniform splitting, size-based splitting ensures that each batch of splits
-        has enough data to process. By default, it is enabled to improve performance.
-      - ``true``
-    * - ``hudi.standard-split-weight-size``
-      - The split size corresponding to the standard weight (1.0)
-        when size-based split weights are enabled.
-      - ``128MB``
-    * - ``hudi.minimum-assigned-split-weight``
-      - Minimum weight that a split can be assigned
-        when size-based split weights are enabled.
-      - ``0.05``
-    * - ``hudi.max-splits-per-second``
-      - Rate at which splits are queued for processing.
-        The queue is throttled if this rate limit is breached.
-      - ``Integer.MAX_VALUE``
-    * - ``hudi.max-outstanding-splits``
-      - Maximum outstanding splits in a batch enqueued for processing.
-      - ``1000``
-
-
-SQL support
------------
-
-The connector provides read access to data in the Hudi table that has been synced to
-Hive metastore. The :ref:`globally available <sql-globally-available>`
-and :ref:`read operation <sql-read-operations>` statements are supported.
-
-Basic usage examples
-^^^^^^^^^^^^^^^^^^^^
-
-In the following example queries, ``stock_ticks_cow`` is the Hudi copy-on-write
-table referred to in the Hudi `quickstart guide
-<https://hudi.apache.org/docs/docker_demo/>`_.
-
-.. code-block:: sql
-
-    USE example.example_schema;
-
-    SELECT symbol, max(ts)
-    FROM stock_ticks_cow
-    GROUP BY symbol
-    HAVING symbol = 'GOOG';
-
-.. code-block:: text
-
-      symbol   |        _col1         |
-    -----------+----------------------+
-     GOOG      | 2018-08-31 10:59:00  |
-    (1 rows)
-
-.. code-block:: sql
-
-    SELECT dt, symbol
-    FROM stock_ticks_cow
-    WHERE symbol = 'GOOG';
-
-.. code-block:: text
-
-        dt      | symbol |
-    ------------+--------+
-     2018-08-31 |  GOOG  |
-    (1 rows)
-
-.. code-block:: sql
-
-    SELECT dt, count(*)
-    FROM stock_ticks_cow
-    GROUP BY dt;
-
-.. code-block:: text
-
-        dt      | _col1 |
-    ------------+--------+
-     2018-08-31 |  99  |
-    (1 rows)
-
-Schema and table management
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Hudi supports `two types of tables <https://hudi.apache.org/docs/table_types>`_
-depending on how the data is indexed and laid out on the file system. The following
-table displays a support matrix of tables types and query types for the connector:
-
-.. list-table:: Hudi configuration properties
-    :widths: 45, 55
-    :header-rows: 1
-
-    * - Table type
-      - Supported query type
-    * - Copy on write
-      - Snapshot queries
-    * - Merge on read
-      - Read-optimized queries
-
-.. _hudi-metadata-tables:
-
-Metadata tables
-"""""""""""""""
-
-The connector exposes a metadata table for each Hudi table.
-The metadata table contains information about the internal structure
-of the Hudi table. You can query each metadata table by appending the
-metadata table name to the table name::
-
-   SELECT * FROM "test_table$timeline"
-
-``$timeline`` table
-~~~~~~~~~~~~~~~~~~~
-
-The ``$timeline`` table provides a detailed view of meta-data instants
-in the Hudi table. Instants are specific points in time.
-
-You can retrieve the information about the timeline of the Hudi table
-``test_table`` by using the following query::
-
-    SELECT * FROM "test_table$timeline"
-
-.. code-block:: text
-
-     timestamp          | action  | state
-    --------------------+---------+-----------
-    8667764846443717831 | commit  | COMPLETED
-    7860805980949777961 | commit  | COMPLETED
-
-The output of the query has the following columns:
-
-.. list-table:: Timeline columns
-  :widths: 20, 30, 50
-  :header-rows: 1
-
-  * - Name
-    - Type
-    - Description
-  * - ``timestamp``
-    - ``varchar``
-    - Instant time is typically a timestamp when the actions performed
-  * - ``action``
-    - ``varchar``
-    - `Type of action <https://hudi.apache.org/docs/concepts/#timeline>`_ performed on the table
-  * - ``state``
-    - ``varchar``
-    - Current state of the instant
-
-File formats
-------------
-
-The connector supports Parquet file format.
\ No newline at end of file
diff --git a/docs/src/main/sphinx/connector/iceberg.md b/docs/src/main/sphinx/connector/iceberg.md
new file mode 100644
index 000000000000..2658e31af157
--- /dev/null
+++ b/docs/src/main/sphinx/connector/iceberg.md
@@ -0,0 +1,1516 @@
+# Iceberg connector
+
+```{raw} html
+<img src="../_static/img/iceberg.png" class="connector-logo">
+```
+
+Apache Iceberg is an open table format for huge analytic datasets. The Iceberg
+connector allows querying data stored in files written in Iceberg format, as
+defined in the [Iceberg Table Spec](https://iceberg.apache.org/spec/). The
+connector supports Apache Iceberg table spec versions 1 and 2.
+
+The table state is maintained in metadata files. All changes to table
+state create a new metadata file and replace the old metadata with an atomic
+swap. The table metadata file tracks the table schema, partitioning
+configuration, custom properties, and snapshots of the table contents.
+
+Iceberg data files are stored in either Parquet, ORC, or Avro format, as
+determined by the `format` property in the table definition.
+
+Iceberg is designed to improve on the known scalability limitations of Hive,
+which stores table metadata in a metastore that is backed by a relational
+database such as MySQL.  It tracks partition locations in the metastore, but not
+individual data files.  Trino queries using the {doc}`/connector/hive` must
+first call the metastore to get partition locations, then call the underlying
+file system to list all data files inside each partition, and then read metadata
+from each data file.
+
+Since Iceberg stores the paths to data files in the metadata files, it only
+consults the underlying file system for files that must be read.
+
+## Requirements
+
+To use Iceberg, you need:
+
+- Network access from the Trino coordinator and workers to the distributed
+  object storage.
+
+- Access to a {ref}`Hive metastore service (HMS) <hive-thrift-metastore>`, an
+  {ref}`AWS Glue catalog <iceberg-glue-catalog>`, a {ref}`JDBC catalog
+  <iceberg-jdbc-catalog>`, a {ref}`REST catalog <iceberg-rest-catalog>`, or a
+  {ref}`Nessie server <iceberg-nessie-catalog>`.
+
+- Data files stored in a supported file format. These can be configured using
+  file format configuration properties per catalog:
+
+  - {ref}`ORC <hive-orc-configuration>`
+  - {ref}`Parquet <hive-parquet-configuration>` (default)
+
+## General configuration
+
+To configure the Iceberg connector, create a catalog properties file
+`etc/catalog/example.properties` that references the `iceberg`
+connector and defines a metastore type. The Hive metastore catalog is the
+default implementation. To use a {ref}`Hive metastore <hive-thrift-metastore>`,
+`iceberg.catalog.type` must be set to `hive_metastore` and
+`hive.metastore.uri` must be configured:
+
+```properties
+connector.name=iceberg
+iceberg.catalog.type=hive_metastore
+hive.metastore.uri=thrift://example.net:9083
+```
+
+Other metadata catalog types as listed in the requirements section of this topic
+are available. Each metastore type has specific configuration properties along
+with {ref}`general metastore configuration properties
+<general-metastore-properties>`.
+
+The following configuration properties are independent of which catalog
+implementation is used:
+
+```{eval-rst}
+.. list-table:: Iceberg general configuration properties
+  :widths: 30, 58, 12
+  :header-rows: 1
+
+  * - Property name
+    - Description
+    - Default
+  * - ``iceberg.catalog.type``
+    - Define the metastore type to use. Possible values are:
+
+      * ``hive_metastore``
+      * ``glue``
+      * ``jdbc``
+      * ``rest``
+      * ``nessie``
+    -
+  * - ``iceberg.file-format``
+    - Define the data storage file format for Iceberg tables.
+      Possible values are:
+
+      * ``PARQUET``
+      * ``ORC``
+      * ``AVRO``
+    - ``PARQUET``
+  * - ``iceberg.compression-codec``
+    - The compression codec used when writing files.
+      Possible values are:
+
+      * ``NONE``
+      * ``SNAPPY``
+      * ``LZ4``
+      * ``ZSTD``
+      * ``GZIP``
+    - ``ZSTD``
+  * - ``iceberg.use-file-size-from-metadata``
+    - Read file sizes from metadata instead of file system. This property must
+      only be used as a workaround for `this issue
+      <https://github.com/apache/iceberg/issues/1980>`_. The problem was fixed
+      in Iceberg version 0.11.0.
+    - ``true``
+  * - ``iceberg.max-partitions-per-writer``
+    - Maximum number of partitions handled per writer.
+    - ``100``
+  * - ``iceberg.target-max-file-size``
+    - Target maximum size of written files; the actual size may be larger.
+    - ``1GB``
+  * - ``iceberg.unique-table-location``
+    - Use randomized, unique table locations.
+    - ``true``
+  * - ``iceberg.dynamic-filtering.wait-timeout``
+    - Maximum duration to wait for completion of dynamic filters during split
+      generation.
+    - ``0s``
+  * - ``iceberg.delete-schema-locations-fallback``
+    - Whether schema locations are deleted when Trino can't determine whether
+      they contain external files.
+    - ``false``
+  * - ``iceberg.minimum-assigned-split-weight``
+    - A decimal value in the range (0, 1] used as a minimum for weights assigned
+      to each split. A low value may improve performance on tables with small
+      files. A higher value may improve performance for queries with highly
+      skewed aggregations or joins.
+    - 0.05
+  * - ``iceberg.table-statistics-enabled``
+    - Enables :doc:`/optimizer/statistics`. The equivalent :doc:`catalog session
+      property </sql/set-session>` is ``statistics_enabled`` for session
+      specific use. Set to ``false`` to disable statistics. Disabling statistics
+      means that :doc:`/optimizer/cost-based-optimizations` cannot make better
+      decisions about the query plan.
+    - ``true``
+  * - ``iceberg.projection-pushdown-enabled``
+    - Enable :doc:`projection pushdown </optimizer/pushdown>`
+    - ``true``
+  * - ``iceberg.hive-catalog-name``
+    - Catalog to redirect to when a Hive table is referenced.
+    -
+  * - ``iceberg.materialized-views.storage-schema``
+    - Schema for creating materialized views storage tables. When this property
+      is not configured, storage tables are created in the same schema as the
+      materialized view definition. When the ``storage_schema`` materialized
+      view property is specified, it takes precedence over this catalog
+      property.
+    - Empty
+  * - ``iceberg.register-table-procedure.enabled``
+    - Enable to allow user to call ``register_table`` procedure.
+    - ``false``
+  * - ``iceberg.query-partition-filter-required``
+    - Set to ``true`` to force a query to use a partition filter. 
+      You can use the ``query_partition_filter_required`` catalog session property for temporary, catalog specific use. 
+    - ``false``
+```
+
+## Type mapping
+
+The connector reads and writes data into the supported data file formats Avro,
+ORC, and Parquet, following the Iceberg specification.
+
+Because Trino and Iceberg each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+The Iceberg specification includes supported data types and the mapping to the
+formating in the Avro, ORC, or Parquet files:
+
+- [Iceberg to Avro](https://iceberg.apache.org/spec/#avro)
+- [Iceberg to ORC](https://iceberg.apache.org/spec/#orc)
+- [Iceberg to Parquet](https://iceberg.apache.org/spec/#parquet)
+
+### Iceberg to Trino type mapping
+
+The connector maps Iceberg types to the corresponding Trino types according to
+the following table:
+
+```{eval-rst}
+.. list-table:: Iceberg to Trino type mapping
+  :widths: 40, 60
+  :header-rows: 1
+
+  * - Iceberg type
+    - Trino type
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+  * - ``INT``
+    - ``INTEGER``
+  * - ``LONG``
+    - ``BIGINT``
+  * - ``FLOAT``
+    - ``REAL``
+  * - ``DOUBLE``
+    - ``DOUBLE``
+  * - ``DECIMAL(p,s)``
+    - ``DECIMAL(p,s)``
+  * - ``DATE``
+    - ``DATE``
+  * - ``TIME``
+    - ``TIME(6)``
+  * - ``TIMESTAMP``
+    - ``TIMESTAMP(6)``
+  * - ``TIMESTAMPTZ``
+    - ``TIMESTAMP(6) WITH TIME ZONE``
+  * - ``STRING``
+    - ``VARCHAR``
+  * - ``UUID``
+    - ``UUID``
+  * - ``BINARY``
+    - ``VARBINARY``
+  * - ``FIXED (L)``
+    - ``VARBINARY``
+  * - ``STRUCT(...)``
+    - ``ROW(...)``
+  * - ``LIST(e)``
+    - ``ARRAY(e)``
+  * - ``MAP(k,v)``
+    - ``MAP(k,v)``
+```
+
+No other types are supported.
+
+### Trino to Iceberg type mapping
+
+The connector maps Trino types to the corresponding Iceberg types according to
+the following table:
+
+```{eval-rst}
+.. list-table:: Trino to Iceberg type mapping
+  :widths: 40, 60
+  :header-rows: 1
+
+  * - Trino type
+    - Iceberg type
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+  * - ``INTEGER``
+    - ``INT``
+  * - ``BIGINT``
+    - ``LONG``
+  * - ``REAL``
+    - ``FLOAT``
+  * - ``DOUBLE``
+    - ``DOUBLE``
+  * - ``DECIMAL(p,s)``
+    - ``DECIMAL(p,s)``
+  * - ``DATE``
+    - ``DATE``
+  * - ``TIME(6)``
+    - ``TIME``
+  * - ``TIMESTAMP(6)``
+    - ``TIMESTAMP``
+  * - ``TIMESTAMP(6) WITH TIME ZONE``
+    - ``TIMESTAMPTZ``
+  * - ``VARCHAR``
+    - ``STRING``
+  * - ``UUID``
+    - ``UUID``
+  * - ``VARBINARY``
+    - ``BINARY``
+  * - ``ROW(...)``
+    - ``STRUCT(...)``
+  * - ``ARRAY(e)``
+    - ``LIST(e)``
+  * - ``MAP(k,v)``
+    - ``MAP(k,v)``
+```
+
+No other types are supported.
+
+## Security
+
+The Iceberg connector allows you to choose one of several means of providing
+authorization at the catalog level.
+
+(iceberg-authorization)=
+
+### Authorization checks
+
+You can enable authorization checks for the connector by setting the
+`iceberg.security` property in the catalog properties file. This property must
+be one of the following values:
+
+```{eval-rst}
+.. list-table:: Iceberg security values
+  :widths: 30, 60
+  :header-rows: 1
+
+  * - Property value
+    - Description
+  * - ``ALLOW_ALL``
+    - No authorization checks are enforced.
+  * - ``SYSTEM``
+    - The connector relies on system-level access control.
+  * - ``READ_ONLY``
+    - Operations that read data or metadata, such as :doc:`/sql/select` are
+      permitted. No operations that write data or metadata, such as
+      :doc:`/sql/create-table`, :doc:`/sql/insert`, or :doc:`/sql/delete` are
+      allowed.
+  * - ``FILE``
+    - Authorization checks are enforced using a catalog-level access control
+      configuration file whose path is specified in the ``security.config-file``
+      catalog configuration property. See
+      :ref:`catalog-file-based-access-control` for information on the
+      authorization configuration file.
+```
+
+(iceberg-sql-support)=
+
+## SQL support
+
+This connector provides read access and write access to data and metadata in
+Iceberg. In addition to the {ref}`globally available <sql-globally-available>`
+and {ref}`read operation <sql-read-operations>` statements, the connector
+supports the following features:
+
+- {ref}`sql-write-operations`:
+
+  - {ref}`iceberg-schema-table-management` and {ref}`iceberg-tables`
+  - {ref}`iceberg-data-management`
+  - {ref}`sql-view-management`
+  - {ref}`sql-materialized-view-management`, see also {ref}`iceberg-materialized-views`
+
+### Basic usage examples
+
+The connector supports creating schemas. You can create a schema with or without
+a specified location.
+
+You can create a schema with the {doc}`/sql/create-schema` statement and the
+`location` schema property. The tables in this schema, which have no explicit
+`location` set in {doc}`/sql/create-table` statement, are located in a
+subdirectory under the directory corresponding to the schema location.
+
+Create a schema on S3:
+
+```
+CREATE SCHEMA example.example_s3_schema
+WITH (location = 's3://my-bucket/a/path/');
+```
+
+Create a schema on an S3-compatible object storage such as MinIO:
+
+```
+CREATE SCHEMA example.example_s3a_schema
+WITH (location = 's3a://my-bucket/a/path/');
+```
+
+Create a schema on HDFS:
+
+```
+CREATE SCHEMA example.example_hdfs_schema
+WITH (location='hdfs://hadoop-master:9000/user/hive/warehouse/a/path/');
+```
+
+Optionally, on HDFS, the location can be omitted:
+
+```
+CREATE SCHEMA example.example_hdfs_schema;
+```
+
+The Iceberg connector supports creating tables using the {doc}`CREATE TABLE
+</sql/create-table>` syntax. Optionally, specify the {ref}`table properties
+<iceberg-table-properties>` supported by this connector:
+
+```
+CREATE TABLE example_table (
+    c1 INTEGER,
+    c2 DATE,
+    c3 DOUBLE
+)
+WITH (
+    format = 'PARQUET',
+    partitioning = ARRAY['c1', 'c2'],
+    sorted_by = ARRAY['c3'],
+    location = 's3://my-bucket/a/path/'
+);
+```
+
+When the `location` table property is omitted, the content of the table is
+stored in a subdirectory under the directory corresponding to the schema
+location.
+
+The Iceberg connector supports creating tables using the {doc}`CREATE TABLE AS
+</sql/create-table-as>` with {doc}`SELECT </sql/select>` syntax:
+
+```
+CREATE TABLE tiny_nation
+WITH (
+    format = 'PARQUET'
+)
+AS
+    SELECT *
+    FROM nation
+    WHERE nationkey < 10;
+```
+
+Another flavor of creating tables with {doc}`CREATE TABLE AS
+</sql/create-table-as>` is with {doc}`VALUES </sql/values>` syntax:
+
+```
+CREATE TABLE yearly_clicks (
+    year,
+    clicks
+)
+WITH (
+    partitioning = ARRAY['year']
+)
+AS VALUES
+    (2021, 10000),
+    (2022, 20000);
+```
+
+### Procedures
+
+Use the {doc}`/sql/call` statement to perform data manipulation or
+administrative tasks. Procedures are available in the system schema of each
+catalog. The following code snippet displays how to call the
+`example_procedure` in the `examplecatalog` catalog:
+
+```
+CALL examplecatalog.system.example_procedure()
+```
+
+(iceberg-register-table)=
+
+#### Register table
+
+The connector can register existing Iceberg tables with the catalog.
+
+The procedure `system.register_table` allows the caller to register an
+existing Iceberg table in the metastore, using its existing metadata and data
+files:
+
+```
+CALL example.system.register_table(schema_name => 'testdb', table_name => 'customer_orders', table_location => 'hdfs://hadoop-master:9000/user/hive/warehouse/customer_orders-581fad8517934af6be1857a903559d44')
+```
+
+In addition, you can provide a file name to register a table with specific
+metadata. This may be used to register the table with some specific table state,
+or may be necessary if the connector cannot automatically figure out the
+metadata version to use:
+
+```
+CALL example.system.register_table(schema_name => 'testdb', table_name => 'customer_orders', table_location => 'hdfs://hadoop-master:9000/user/hive/warehouse/customer_orders-581fad8517934af6be1857a903559d44', metadata_file_name => '00003-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json')
+```
+
+To prevent unauthorized users from accessing data, this procedure is disabled by
+default. The procedure is enabled only when
+`iceberg.register-table-procedure.enabled` is set to `true`.
+
+(iceberg-unregister-table)=
+
+#### Unregister table
+
+The connector can unregister existing Iceberg tables from the catalog.
+
+The procedure `system.unregister_table` allows the caller to unregister an
+existing Iceberg table from the metastores without deleting the data:
+
+```
+CALL example.system.unregister_table(schema_name => 'testdb', table_name => 'customer_orders')
+```
+
+#### Migrate table
+
+The connector can read from or write to Hive tables that have been migrated to
+Iceberg.
+
+Use the procedure `system.migrate` to move a table from the Hive format to the
+Iceberg format, loaded with the source’s data files. Table schema, partitioning,
+properties, and location are copied from the source table. A bucketed Hive table
+will be migrated as a non-bucketed Iceberg table. The data files in the Hive table
+must use the Parquet, ORC, or Avro file format.
+
+The procedure must be called for a specific catalog `example` with the
+relevant schema and table names supplied with the required parameters
+`schema_name` and `table_name`:
+
+```
+CALL example.system.migrate(
+    schema_name => 'testdb',
+    table_name => 'customer_orders')
+```
+
+Migrate fails if any table partition uses an unsupported file format.
+
+In addition, you can provide a `recursive_directory` argument to migrate a
+Hive table that contains subdirectories:
+
+```
+CALL example.system.migrate(
+    schema_name => 'testdb',
+    table_name => 'customer_orders',
+    recursive_directory => 'true')
+```
+
+The default value is `fail`, which causes the migrate procedure to throw an
+exception if subdirectories are found. Set the value to `true` to migrate
+nested directories, or `false` to ignore them.
+
+(iceberg-data-management)=
+
+### Data management
+
+The {ref}`sql-data-management` functionality includes support for `INSERT`,
+`UPDATE`, `DELETE`, and `MERGE` statements.
+
+(iceberg-delete)=
+
+#### Deletion by partition
+
+For partitioned tables, the Iceberg connector supports the deletion of entire
+partitions if the `WHERE` clause specifies filters only on the
+identity-transformed partitioning columns, that can match entire partitions.
+Given the table definition from {ref}`Partitioned Tables <iceberg-tables>`
+section, the following SQL statement deletes all partitions for which
+`country` is `US`:
+
+```
+DELETE FROM example.testdb.customer_orders
+WHERE country = 'US'
+```
+
+A partition delete is performed if the `WHERE` clause meets these conditions.
+
+#### Row level deletion
+
+Tables using v2 of the Iceberg specification support deletion of individual rows
+by writing position delete files.
+
+(iceberg-schema-table-management)=
+
+### Schema and table management
+
+The {ref}`sql-schema-table-management` functionality includes support for:
+
+- {doc}`/sql/create-schema`
+- {doc}`/sql/drop-schema`
+- {doc}`/sql/alter-schema`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/alter-table`
+- {doc}`/sql/comment`
+
+#### Schema evolution
+
+Iceberg supports schema evolution, with safe column add, drop, reorder, and
+rename operations, including in nested structures. Table partitioning can also
+be changed and the connector can still query data created before the
+partitioning change.
+
+(iceberg-alter-table-execute)=
+
+#### ALTER TABLE EXECUTE
+
+The connector supports the following commands for use with {ref}`ALTER TABLE
+EXECUTE <alter-table-execute>`.
+
+```{include} optimize.fragment
+```
+
+##### expire_snapshots
+
+The `expire_snapshots` command removes all snapshots and all related metadata
+and data files. Regularly expiring snapshots is recommended to delete data files
+that are no longer needed, and to keep the size of table metadata small. The
+procedure affects all snapshots that are older than the time period configured
+with the `retention_threshold` parameter.
+
+`expire_snapshots` can be run as follows:
+
+```sql
+ALTER TABLE test_table EXECUTE expire_snapshots(retention_threshold => '7d')
+```
+
+The value for `retention_threshold` must be higher than or equal to
+`iceberg.expire_snapshots.min-retention` in the catalog, otherwise the
+procedure fails with a similar message: `Retention specified (1.00d) is shorter
+than the minimum retention configured in the system (7.00d)`. The default value
+for this property is `7d`.
+
+##### remove_orphan_files
+
+The `remove_orphan_files` command removes all files from a table's data
+directory that are not linked from metadata files and that are older than the
+value of `retention_threshold` parameter. Deleting orphan files from time to
+time is recommended to keep size of a table's data directory under control.
+
+`remove_orphan_files` can be run as follows:
+
+```sql
+ALTER TABLE test_table EXECUTE remove_orphan_files(retention_threshold => '7d')
+```
+
+The value for `retention_threshold` must be higher than or equal to
+`iceberg.remove_orphan_files.min-retention` in the catalog otherwise the
+procedure fails with a similar message: `Retention specified (1.00d) is shorter
+than the minimum retention configured in the system (7.00d)`. The default value
+for this property is `7d`.
+
+(drop-extended-stats)=
+
+##### drop_extended_stats
+
+The `drop_extended_stats` command removes all extended statistics information
+from the table.
+
+`drop_extended_stats` can be run as follows:
+
+```sql
+ALTER TABLE test_table EXECUTE drop_extended_stats
+```
+
+(iceberg-alter-table-set-properties)=
+
+#### ALTER TABLE SET PROPERTIES
+
+The connector supports modifying the properties on existing tables using
+{ref}`ALTER TABLE SET PROPERTIES <alter-table-set-properties>`.
+
+The following table properties can be updated after a table is created:
+
+- `format`
+- `format_version`
+- `partitioning`
+- `sorted_by`
+
+For example, to update a table from v1 of the Iceberg specification to v2:
+
+```sql
+ALTER TABLE table_name SET PROPERTIES format_version = 2;
+```
+
+Or to set the column `my_new_partition_column` as a partition column on a
+table:
+
+```sql
+ALTER TABLE table_name SET PROPERTIES partitioning = ARRAY[<existing partition columns>, 'my_new_partition_column'];
+```
+
+The current values of a table's properties can be shown using {doc}`SHOW CREATE
+TABLE </sql/show-create-table>`.
+
+(iceberg-table-properties)=
+
+##### Table properties
+
+Table properties supply or set metadata for the underlying tables. This is key
+for {doc}`/sql/create-table-as` statements. Table properties are passed to the
+connector using a {doc}`WITH </sql/create-table-as>` clause.
+
+
+```{eval-rst}
+.. list-table:: Iceberg table properties
+  :widths: 40, 60
+  :header-rows: 1
+
+  * - Property name
+    - Description
+  * - ``format``
+    - Optionally specifies the format of table data files; either ``PARQUET``,
+      ``ORC`, or ``AVRO``. Defaults to the value of the ``iceberg.file-format``
+      catalog configuration property, which defaults to ``PARQUET``.
+  * - ``partitioning``
+    - Optionally specifies table partitioning. If a table is partitioned by
+      columns ``c1`` and ``c2``, the partitioning property is ``partitioning =
+      ARRAY['c1', 'c2']``.
+  * - ``location``
+    - Optionally specifies the file system location URI for the table.
+  * - ``format_version``
+    - Optionally specifies the format version of the Iceberg specification to
+      use for new tables; either ``1`` or ``2``. Defaults to ``2``. Version
+      ``2`` is required for row level deletes.
+  * - ``orc_bloom_filter_columns``
+    - Comma-separated list of columns to use for ORC bloom filter. It improves
+      the performance of queries using Equality and IN predicates when reading
+      ORC files. Requires ORC format. Defaults to ``[]``.
+  * - ``orc_bloom_filter_fpp``
+    - The ORC bloom filters false positive probability. Requires ORC format.
+      Defaults to ``0.05``.
+```
+
+The table definition below specifies to use Parquet files, partitioning by columns
+`c1` and `c2`, and a file system location of
+`/var/example_tables/test_table`:
+
+```
+CREATE TABLE test_table (
+    c1 INTEGER,
+    c2 DATE,
+    c3 DOUBLE)
+WITH (
+    format = 'PARQUET',
+    partitioning = ARRAY['c1', 'c2'],
+    location = '/var/example_tables/test_table')
+```
+
+The table definition below specifies to use ORC files, bloom filter index by columns
+`c1` and `c2`, fpp is 0.05, and a file system location of
+`/var/example_tables/test_table`:
+
+```
+CREATE TABLE test_table (
+    c1 INTEGER,
+    c2 DATE,
+    c3 DOUBLE)
+WITH (
+    format = 'ORC',
+    location = '/var/example_tables/test_table',
+    orc_bloom_filter_columns = ARRAY['c1', 'c2'],
+    orc_bloom_filter_fpp = 0.05)
+```
+
+(iceberg-metadata-tables)=
+
+#### Metadata tables
+
+The connector exposes several metadata tables for each Iceberg table. These
+metadata tables contain information about the internal structure of the Iceberg
+table. You can query each metadata table by appending the metadata table name to
+the table name:
+
+```
+SELECT * FROM "test_table$properties"
+```
+
+##### `$properties` table
+
+The `$properties` table provides access to general information about Iceberg
+table configuration and any additional metadata key/value pairs that the table
+is tagged with.
+
+You can retrieve the properties of the current snapshot of the Iceberg table
+`test_table` by using the following query:
+
+```
+SELECT * FROM "test_table$properties"
+```
+
+```text
+ key                   | value    |
+-----------------------+----------+
+write.format.default   | PARQUET  |
+```
+
+##### `$history` table
+
+The `$history` table provides a log of the metadata changes performed on the
+Iceberg table.
+
+You can retrieve the changelog of the Iceberg table `test_table` by using the
+following query:
+
+```
+SELECT * FROM "test_table$history"
+```
+
+```text
+ made_current_at                  | snapshot_id          | parent_id            | is_current_ancestor
+----------------------------------+----------------------+----------------------+--------------------
+2022-01-10 08:11:20 Europe/Vienna | 8667764846443717831  |  <null>              |  true
+2022-01-10 08:11:34 Europe/Vienna | 7860805980949777961  | 8667764846443717831  |  true
+```
+
+The output of the query has the following columns:
+
+```{eval-rst}
+.. list-table:: History columns
+  :widths: 30, 30, 40
+  :header-rows: 1
+
+  * - Name
+    - Type
+    - Description
+  * - ``made_current_at``
+    - ``TIMESTAMP(3) WITH TIME ZONE``
+    - The time when the snapshot became active.
+  * - ``snapshot_id``
+    - ``BIGINT``
+    - The identifier of the snapshot.
+  * - ``parent_id``
+    - ``BIGINT``
+    - The identifier of the parent snapshot.
+  * - ``is_current_ancestor``
+    - ``BOOLEAN``
+    - Whether or not this snapshot is an ancestor of the current snapshot.
+```
+
+##### `$snapshots` table
+
+The `$snapshots` table provides a detailed view of snapshots of the Iceberg
+table. A snapshot consists of one or more file manifests, and the complete table
+contents are represented by the union of all the data files in those manifests.
+
+You can retrieve the information about the snapshots of the Iceberg table
+`test_table` by using the following query:
+
+```
+SELECT * FROM "test_table$snapshots"
+```
+
+```text
+ committed_at                      | snapshot_id          | parent_id            | operation          |  manifest_list                                                                                                                           |   summary
+----------------------------------+----------------------+----------------------+--------------------+------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+2022-01-10 08:11:20 Europe/Vienna | 8667764846443717831  |  <null>              |  append            |   hdfs://hadoop-master:9000/user/hive/warehouse/test_table/metadata/snap-8667764846443717831-1-100cf97e-6d56-446e-8961-afdaded63bc4.avro | {changed-partition-count=0, total-equality-deletes=0, total-position-deletes=0, total-delete-files=0, total-files-size=0, total-records=0, total-data-files=0}
+2022-01-10 08:11:34 Europe/Vienna | 7860805980949777961  | 8667764846443717831  |  append            |   hdfs://hadoop-master:9000/user/hive/warehouse/test_table/metadata/snap-7860805980949777961-1-faa19903-1455-4bb8-855a-61a1bbafbaa7.avro | {changed-partition-count=1, added-data-files=1, total-equality-deletes=0, added-records=1, total-position-deletes=0, added-files-size=442, total-delete-files=0, total-files-size=442, total-records=1, total-data-files=1}
+```
+
+The output of the query has the following columns:
+
+```{eval-rst}
+.. list-table:: Snapshots columns
+  :widths: 20, 30, 50
+  :header-rows: 1
+
+  * - Name
+    - Type
+    - Description
+  * - ``committed_at``
+    - ``TIMESTAMP(3) WITH TIME ZONE``
+    - The time when the snapshot became active.
+  * - ``snapshot_id``
+    - ``BIGINT``
+    - The identifier for the snapshot.
+  * - ``parent_id``
+    - ``BIGINT``
+    - The identifier for the parent snapshot.
+  * - ``operation``
+    - ``VARCHAR``
+    - The type of operation performed on the Iceberg table. The supported
+      operation types in Iceberg are:
+
+      * ``append`` when new data is appended.
+      * ``replace`` when files are removed and replaced without changing the
+        data in the table.
+      * ``overwrite`` when new data is added to overwrite existing data.
+      * ``delete`` when data is deleted from the table and no new data is added.
+  * - ``manifest_list``
+    - ``VARCHAR``
+    - The list of Avro manifest files containing the detailed information about
+      the snapshot changes.
+  * - ``summary``
+    - ``map(VARCHAR, VARCHAR)``
+    - A summary of the changes made from the previous snapshot to the current
+      snapshot.
+```
+
+##### `$manifests` table
+
+The `$manifests` table provides a detailed overview of the manifests
+corresponding to the snapshots performed in the log of the Iceberg table.
+
+You can retrieve the information about the manifests of the Iceberg table
+`test_table` by using the following query:
+
+```
+SELECT * FROM "test_table$manifests"
+```
+
+```text
+ path                                                                                                           | length          | partition_spec_id    | added_snapshot_id     | added_data_files_count  | added_rows_count | existing_data_files_count   | existing_rows_count | deleted_data_files_count    | deleted_rows_count | partitions
+----------------------------------------------------------------------------------------------------------------+-----------------+----------------------+-----------------------+-------------------------+------------------+-----------------------------+---------------------+-----------------------------+--------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ hdfs://hadoop-master:9000/user/hive/warehouse/test_table/metadata/faa19903-1455-4bb8-855a-61a1bbafbaa7-m0.avro |  6277           |   0                  | 7860805980949777961   | 1                       | 100              | 0                           | 0                   | 0                           | 0                  | {{contains_null=false, contains_nan= false, lower_bound=1, upper_bound=1},{contains_null=false, contains_nan= false, lower_bound=2021-01-12, upper_bound=2021-01-12}}
+```
+
+The output of the query has the following columns:
+
+```{eval-rst}
+.. list-table:: Manifests columns
+  :widths: 30, 30, 40
+  :header-rows: 1
+
+  * - Name
+    - Type
+    - Description
+  * - ``path``
+    - ``VARCHAR``
+    - The manifest file location.
+  * - ``length``
+    - ``BIGINT``
+    - The manifest file length.
+  * - ``partition_spec_id``
+    - ``INTEGER``
+    - The identifier for the partition specification used to write the manifest
+      file.
+  * - ``added_snapshot_id``
+    - ``BIGINT``
+    - The identifier of the snapshot during which this manifest entry has been
+      added.
+  * - ``added_data_files_count``
+    - ``INTEGER``
+    - The number of data files with status ``ADDED`` in the manifest file.
+  * - ``added_rows_count``
+    - ``BIGINT``
+    - The total number of rows in all data files with status ``ADDED`` in the
+      manifest file.
+  * - ``existing_data_files_count``
+    - ``INTEGER``
+    - The number of data files with status ``EXISTING`` in the manifest file.
+  * - ``existing_rows_count``
+    - ``BIGINT``
+    - The total number of rows in all data files with status ``EXISTING`` in the
+      manifest file.
+  * - ``deleted_data_files_count``
+    - ``INTEGER``
+    - The number of data files with status ``DELETED`` in the manifest file.
+  * - ``deleted_rows_count``
+    - ``BIGINT``
+    - The total number of rows in all data files with status ``DELETED`` in the
+      manifest file.
+  * - ``partitions``
+    - ``ARRAY(row(contains_null BOOLEAN, contains_nan BOOLEAN, lower_bound VARCHAR, upper_bound VARCHAR))``
+    - Partition range metadata.
+```
+
+##### `$partitions` table
+
+The `$partitions` table provides a detailed overview of the partitions of the
+Iceberg table.
+
+You can retrieve the information about the partitions of the Iceberg table
+`test_table` by using the following query:
+
+```
+SELECT * FROM "test_table$partitions"
+```
+
+```text
+ partition             | record_count  | file_count    | total_size    |  data
+-----------------------+---------------+---------------+---------------+------------------------------------------------------
+{c1=1, c2=2021-01-12}  |  2            | 2             |  884          | {c3={min=1.0, max=2.0, null_count=0, nan_count=NULL}}
+{c1=1, c2=2021-01-13}  |  1            | 1             |  442          | {c3={min=1.0, max=1.0, null_count=0, nan_count=NULL}}
+```
+
+The output of the query has the following columns:
+
+```{eval-rst}
+.. list-table:: Partitions columns
+  :widths: 20, 30, 50
+  :header-rows: 1
+
+  * - Name
+    - Type
+    - Description
+  * - ``partition``
+    - ``ROW(...)``
+    - A row that contains the mapping of the partition column names to the
+      partition column values.
+  * - ``record_count``
+    - ``BIGINT``
+    - The number of records in the partition.
+  * - ``file_count``
+    - ``BIGINT``
+    - The number of files mapped in the partition.
+  * - ``total_size``
+    - ``BIGINT``
+    - The size of all the files in the partition.
+  * - ``data``
+    - ``ROW(... ROW (min ..., max ... , null_count BIGINT, nan_count BIGINT))``
+    - Partition range metadata.
+```
+
+##### `$files` table
+
+The `$files` table provides a detailed overview of the data files in current
+snapshot of the  Iceberg table.
+
+To retrieve the information about the data files of the Iceberg table
+`test_table`, use the following query:
+
+```
+SELECT * FROM "test_table$files"
+```
+
+```text
+ content  | file_path                                                                                                                     | record_count    | file_format   | file_size_in_bytes   |  column_sizes        |  value_counts     |  null_value_counts | nan_value_counts  | lower_bounds                |  upper_bounds               |  key_metadata  | split_offsets  |  equality_ids
+----------+-------------------------------------------------------------------------------------------------------------------------------+-----------------+---------------+----------------------+----------------------+-------------------+--------------------+-------------------+-----------------------------+-----------------------------+----------------+----------------+---------------
+ 0        | hdfs://hadoop-master:9000/user/hive/warehouse/test_table/data/c1=3/c2=2021-01-14/af9872b2-40f3-428f-9c87-186d2750d84e.parquet |  1              |  PARQUET      |  442                 | {1=40, 2=40, 3=44}   |  {1=1, 2=1, 3=1}  |  {1=0, 2=0, 3=0}   | <null>            |  {1=3, 2=2021-01-14, 3=1.3} |  {1=3, 2=2021-01-14, 3=1.3} |  <null>        | <null>         |   <null>
+```
+
+The output of the query has the following columns:
+
+```{eval-rst}
+.. list-table:: Files columns
+  :widths: 25, 30, 45
+  :header-rows: 1
+
+  * - Name
+    - Type
+    - Description
+  * - ``content``
+    - ``INTEGER``
+    - Type of content stored in the file. The supported content types in Iceberg
+      are:
+
+      * ``DATA(0)``
+      * ``POSITION_DELETES(1)``
+      * ``EQUALITY_DELETES(2)``
+  * - ``file_path``
+    - ``VARCHAR``
+    - The data file location.
+  * - ``file_format``
+    - ``VARCHAR``
+    - The format of the data file.
+  * - ``record_count``
+    - ``BIGINT``
+    - The number of entries contained in the data file.
+  * - ``file_size_in_bytes``
+    - ``BIGINT``
+    - The data file size
+  * - ``column_sizes``
+    - ``map(INTEGER, BIGINT)``
+    - Mapping between the Iceberg column ID and its corresponding size in the
+      file.
+  * - ``value_counts``
+    - ``map(INTEGER, BIGINT)``
+    - Mapping between the Iceberg column ID and its corresponding count of
+      entries in the file.
+  * - ``null_value_counts``
+    - ``map(INTEGER, BIGINT)``
+    - Mapping between the Iceberg column ID and its corresponding count of
+      ``NULL`` values in the file.
+  * - ``nan_value_counts``
+    - ``map(INTEGER, BIGINT)``
+    - Mapping between the Iceberg column ID and its corresponding count of non-
+      numerical values in the file.
+  * - ``lower_bounds``
+    - ``map(INTEGER, BIGINT)``
+    - Mapping between the Iceberg column ID and its corresponding lower bound in
+      the file.
+  * - ``upper_bounds``
+    - ``map(INTEGER, BIGINT)``
+    - Mapping between the Iceberg column ID and its corresponding upper bound in
+      the file.
+  * - ``key_metadata``
+    - ``VARBINARY``
+    - Metadata about the encryption key used to encrypt this file, if applicable.
+  * - ``split_offsets``
+    - ``array(BIGINT)``
+    - List of recommended split locations.
+  * - ``equality_ids``
+    - ``array(INTEGER)``
+    - The set of field IDs used for equality comparison in equality delete files.
+```
+
+##### `$refs` table
+
+The `$refs` table provides information about Iceberg references including
+branches and tags.
+
+You can retrieve the references of the Iceberg table `test_table` by using the
+following query:
+
+```
+SELECT * FROM "test_table$refs"
+```
+
+```text
+name            | type   | snapshot_id | max_reference_age_in_ms | min_snapshots_to_keep | max_snapshot_age_in_ms |
+----------------+--------+-------------+-------------------------+-----------------------+------------------------+
+example_tag     | TAG    | 10000000000 | 10000                   | null                  | null                   |
+example_branch  | BRANCH | 20000000000 | 20000                   | 2                     | 30000                  |
+```
+
+The output of the query has the following columns:
+
+```{eval-rst}
+.. list-table:: Refs columns
+  :widths: 20, 30, 50
+  :header-rows: 1
+
+  * - Name
+    - Type
+    - Description
+  * - ``name``
+    - ``VARCHAR``
+    - Name of the reference.
+  * - ``type``
+    - ``VARCHAR``
+    - Type of the reference, either ``BRANCH`` or ``TAG``.
+  * - ``snapshot_id``
+    - ``BIGINT``
+    - The snapshot ID of the reference.
+  * - ``max_reference_age_in_ms``
+    - ``BIGINT``
+    - The maximum age of the reference before it could be expired.
+  * - ``min_snapshots_to_keep``
+    - ``INTEGER``
+    - For branch only, the minimum number of snapshots to keep in a branch.
+  * - ``max_snapshot_age_in_ms``
+    - ``BIGINT``
+    - For branch only, the max snapshot age allowed in a branch. Older snapshots
+      in the branch will be expired.
+```
+
+(iceberg-metadata-columns)=
+
+#### Metadata columns
+
+In addition to the defined columns, the Iceberg connector automatically exposes
+path metadata as a hidden column in each table:
+
+- `$path`: Full file system path name of the file for this row
+- `$file_modified_time`: Timestamp of the last modification of the file for
+  this row
+
+You can use these columns in your SQL statements like any other column. This can
+be selected directly, or used in conditional statements. For example, you can
+inspect the file path for each record:
+
+```
+SELECT *, "$path", "$file_modified_time"
+FROM example.web.page_views;
+```
+
+Retrieve all records that belong to a specific file using `"$path"` filter:
+
+```
+SELECT *
+FROM example.web.page_views
+WHERE "$path" = '/usr/iceberg/table/web.page_views/data/file_01.parquet'
+```
+
+Retrieve all records that belong to a specific file using
+`"$file_modified_time"` filter:
+
+```
+SELECT *
+FROM example.web.page_views
+WHERE "$file_modified_time" = CAST('2022-07-01 01:02:03.456 UTC' AS TIMESTAMP WIOTH TIMEZONE)
+```
+
+#### DROP TABLE
+
+The Iceberg connector supports dropping a table by using the
+{doc}`/sql/drop-table` syntax. When the command succeeds, both the data of the
+Iceberg table and also the information related to the table in the metastore
+service are removed. Dropping tables that have their data/metadata stored in a
+different location than the table's corresponding base directory on the object
+store is not supported.
+
+(iceberg-comment)=
+
+#### COMMENT
+
+The Iceberg connector supports setting comments on the following objects:
+
+- tables
+- views
+- table columns
+- materialized view columns
+
+The `COMMENT` option is supported on both the table and the table columns for
+the {doc}`/sql/create-table` operation.
+
+The `COMMENT` option is supported for adding table columns through the
+{doc}`/sql/alter-table` operations.
+
+The connector supports the command {doc}`COMMENT </sql/comment>` for setting
+comments on existing entities.
+
+(iceberg-tables)=
+
+#### Partitioned tables
+
+Iceberg supports partitioning by specifying transforms over the table columns. A
+partition is created for each unique tuple value produced by the transforms.
+Identity transforms are simply the column name. Other transforms are:
+
+```{eval-rst}
+.. list-table:: Iceberg column transforms
+  :widths: 40, 60
+  :header-rows: 1
+
+  * - Transform
+    - Description
+  * - ``year(ts)``
+    - A partition is created for each year.  The partition value is the integer
+      difference in years between ``ts`` and January 1 1970.
+  * - ``month(ts)``
+    - A partition is created for each month of each year.  The partition value
+      is the integer difference in months between ``ts`` and January 1 1970.
+  * - ``day(ts)``
+    - A partition is created for each day of each year.  The partition value is
+      the integer difference in days between ``ts`` and January 1 1970.
+  * - ``hour(ts)``
+    - A partition is created hour of each day.  The partition value is a
+      timestamp with the minutes and seconds set to zero.
+  * - ``bucket(x, nbuckets)``
+    - The data is hashed into the specified number of buckets.  The partition
+      value is an integer hash of ``x``, with a value between 0 and ``nbuckets -
+      1`` inclusive.
+  * - ``truncate(s, nchars)``
+    - The partition value is the first ``nchars`` characters of ``s``.
+```
+
+In this example, the table is partitioned by the month of `order_date`, a hash
+of `account_number` (with 10 buckets), and `country`:
+
+```
+CREATE TABLE example.testdb.customer_orders (
+    order_id BIGINT,
+    order_date DATE,
+    account_number BIGINT,
+    customer VARCHAR,
+    country VARCHAR)
+WITH (partitioning = ARRAY['month(order_date)', 'bucket(account_number, 10)', 'country'])
+```
+
+#### Sorted tables
+
+The connector supports sorted files as a performance improvement. Data is sorted
+during writes within each file based on the specified array of one or more
+columns.
+
+Sorting is particularly beneficial when the sorted columns show a high
+cardinality and are used as a filter for selective reads.
+
+The sort order is configured with the `sorted_by` table property. Specify an
+array of one or more columns to use for sorting when creating the table. The
+following example configures the `order_date` column of the `orders` table
+in the `customers` schema in the `example` catalog:
+
+```
+CREATE TABLE example.customers.orders (
+    order_id BIGINT,
+    order_date DATE,
+    account_number BIGINT,
+    customer VARCHAR,
+    country VARCHAR)
+WITH (sorted_by = ARRAY['order_date'])
+```
+
+Sorting can be combined with partitioning on the same column. For example:
+
+```
+CREATE TABLE example.customers.orders (
+    order_id BIGINT,
+    order_date DATE,
+    account_number BIGINT,
+    customer VARCHAR,
+    country VARCHAR)
+WITH (
+    partitioning = ARRAY['month(order_date)'],
+    sorted_by = ARRAY['order_date']
+)
+```
+
+You can disable sorted writing with the session property
+`sorted_writing_enabled` set to `false`.
+
+#### Using snapshots
+
+Iceberg supports a snapshot model of data, where table snapshots are
+identified by a snapshot ID.
+
+The connector provides a system table exposing snapshot information for every
+Iceberg table. Snapshots are identified by `BIGINT` snapshot IDs. For example,
+you can find the snapshot IDs for the `customer_orders` table by running the
+following query:
+
+```
+SELECT snapshot_id
+FROM example.testdb."customer_orders$snapshots"
+ORDER BY committed_at DESC
+```
+
+(iceberg-create-or-replace)=
+
+#### Replacing tables
+
+The connector supports replacing a table as an atomic operation. Atomic table
+replacement creates a new snapshot with the new table definition (see
+{doc}`/sql/create-table` and {doc}`/sql/create-table-as`), but keeps table history.
+
+The new table after replacement is completely new and separate from the old table.
+Only the name of the table remains identical. Earlier snapshots can be retrieved 
+through Iceberg's [time travel](iceberg-time-travel).
+
+For example a partitioned table `my_table` can be replaced by completely new
+definition.
+
+```
+CREATE TABLE my_table (
+    a BIGINT,
+    b DATE,
+    c BIGINT)
+WITH (partitioning = ARRAY['a']);
+
+CREATE OR REPLACE TABLE my_table
+WITH (sorted_by = ARRAY['a'])
+AS SELECT * from another_table;
+```
+
+Earlier snapshots can be retrieved through Iceberg's [time travel](iceberg-time-travel).
+
+(iceberg-time-travel)=
+
+##### Time travel queries
+
+The connector offers the ability to query historical data. This allows you to
+query the table as it was when a previous snapshot of the table was taken, even
+if the data has since been modified or deleted.
+
+The historical data of the table can be retrieved by specifying the snapshot
+identifier corresponding to the version of the table to be retrieved:
+
+```
+SELECT *
+FROM example.testdb.customer_orders FOR VERSION AS OF 8954597067493422955
+```
+
+A different approach of retrieving historical data is to specify a point in time
+in the past, such as a day or week ago. The latest snapshot of the table taken
+before or at the specified timestamp in the query is internally used for
+providing the previous state of the table:
+
+```
+SELECT *
+FROM example.testdb.customer_orders FOR TIMESTAMP AS OF TIMESTAMP '2022-03-23 09:59:29.803 Europe/Vienna'
+```
+
+The connector allows to create a new snapshot through Iceberg's [replace table](iceberg-create-or-replace).
+
+```
+CREATE OR REPLACE TABLE example.testdb.customer_orders AS 
+SELECT *
+FROM example.testdb.customer_orders FOR TIMESTAMP AS OF TIMESTAMP '2022-03-23 09:59:29.803 Europe/Vienna'
+```
+
+You can use a date to specify a point a time in the past for using a snapshot of a table in a query.
+Assuming that the session time zone is `Europe/Vienna` the following queries are equivalent:
+
+```
+SELECT *
+FROM example.testdb.customer_orders FOR TIMESTAMP AS OF DATE '2022-03-23'
+```
+
+```
+SELECT *
+FROM example.testdb.customer_orders FOR TIMESTAMP AS OF TIMESTAMP '2022-03-23 00:00:00'
+```
+
+```
+SELECT *
+FROM example.testdb.customer_orders FOR TIMESTAMP AS OF TIMESTAMP '2022-03-23 00:00:00.000 Europe/Vienna'
+```
+
+Iceberg supports named references of snapshots via branches and tags.
+Time travel can be performed to branches and tags in the table.
+
+```
+SELECT *
+FROM example.testdb.customer_orders FOR VERSION AS OF 'historical-tag'
+
+SELECT *
+FROM example.testdb.customer_orders FOR VERSION AS OF 'test-branch'
+```
+
+##### Rolling back to a previous snapshot
+
+Use the `$snapshots` metadata table to determine the latest snapshot ID of the
+table like in the following query:
+
+```
+SELECT snapshot_id
+FROM example.testdb."customer_orders$snapshots"
+ORDER BY committed_at DESC LIMIT 1
+```
+
+The procedure `system.rollback_to_snapshot` allows the caller to roll back the
+state of the table to a previous snapshot id:
+
+```
+CALL example.system.rollback_to_snapshot('testdb', 'customer_orders', 8954597067493422955)
+```
+
+#### `NOT NULL` column constraint
+
+The Iceberg connector supports setting `NOT NULL` constraints on the table
+columns.
+
+The `NOT NULL` constraint can be set on the columns, while creating tables by
+using the {doc}`CREATE TABLE </sql/create-table>` syntax:
+
+```
+CREATE TABLE example_table (
+    year INTEGER NOT NULL,
+    name VARCHAR NOT NULL,
+    age INTEGER,
+    address VARCHAR
+);
+```
+
+When trying to insert/update data in the table, the query fails if trying to set
+`NULL` value on a column having the `NOT NULL` constraint.
+
+### View management
+
+Trino allows reading from Iceberg materialized views.
+
+(iceberg-materialized-views)=
+
+#### Materialized views
+
+The Iceberg connector supports {ref}`sql-materialized-view-management`. In the
+underlying system, each materialized view consists of a view definition and an
+Iceberg storage table. The storage table name is stored as a materialized view
+property. The data is stored in that storage table.
+
+You can use the {ref}`iceberg-table-properties` to control the created storage
+table and therefore the layout and performance. For example, you can use the
+following clause with {doc}`/sql/create-materialized-view` to use the ORC format
+for the data files and partition the storage per day using the column
+`_date`:
+
+```
+WITH ( format = 'ORC', partitioning = ARRAY['event_date'] )
+```
+
+By default, the storage table is created in the same schema as the materialized
+view definition. The `iceberg.materialized-views.storage-schema` catalog
+configuration property or `storage_schema` materialized view property can be
+used to specify the schema where the storage table is created.
+
+Creating a materialized view does not automatically populate it with data. You
+must run {doc}`/sql/refresh-materialized-view` to populate data in the
+materialized view.
+
+Updating the data in the materialized view with `REFRESH MATERIALIZED VIEW`
+deletes the data from the storage table, and inserts the data that is the result
+of executing the materialized view query into the existing table. Data is
+replaced atomically, so users can continue to query the materialized view while
+it is being refreshed. Refreshing a materialized view also stores the
+snapshot-ids of all Iceberg tables that are part of the materialized view's
+query in the materialized view metadata. When the materialized view is queried,
+the snapshot-ids are used to check if the data in the storage table is up to
+date. If the data is outdated, the materialized view behaves like a normal view,
+and the data is queried directly from the base tables. Detecting outdated data
+is possible only when the materialized view uses Iceberg tables only, or when it
+uses a mix of Iceberg and non-Iceberg tables but some Iceberg tables are outdated.
+When the materialized view is based on non-Iceberg tables, querying it can
+return outdated data, since the connector has no information whether the
+underlying non-Iceberg tables have changed.
+
+Dropping a materialized view with {doc}`/sql/drop-materialized-view` removes
+the definition and the storage table.
+
+(iceberg-fte-support)=
+
+## Fault-tolerant execution support
+
+The connector supports {doc}`/admin/fault-tolerant-execution` of query
+processing. Read and write operations are both supported with any retry policy.
+
+## Performance
+
+The connector includes a number of performance improvements, detailed in the
+following sections.
+
+### Table statistics
+
+The Iceberg connector can collect column statistics using {doc}`/sql/analyze`
+statement. This can be disabled using `iceberg.extended-statistics.enabled`
+catalog configuration property, or the corresponding
+`extended_statistics_enabled` session property.
+
+(iceberg-analyze)=
+
+#### Updating table statistics
+
+If your queries are complex and include joining large data sets, running
+{doc}`/sql/analyze` on tables may improve query performance by collecting
+statistical information about the data:
+
+```
+ANALYZE table_name
+```
+
+This query collects statistics for all columns.
+
+On wide tables, collecting statistics for all columns can be expensive. It is
+also typically unnecessary - statistics are only useful on specific columns,
+like join keys, predicates, or grouping keys. You can specify a subset of
+columns to analyzed with the optional `columns` property:
+
+```
+ANALYZE table_name WITH (columns = ARRAY['col_1', 'col_2'])
+```
+
+This query collects statistics for columns `col_1` and `col_2`.
+
+Note that if statistics were previously collected for all columns, they must be
+dropped using the {ref}`drop_extended_stats <drop-extended-stats>` command
+before re-analyzing.
+
+(iceberg-table-redirection)=
+
+### Table redirection
+
+```{include} table-redirection.fragment
+```
+
+The connector supports redirection from Iceberg tables to Hive tables with the
+`iceberg.hive-catalog-name` catalog configuration property.
diff --git a/docs/src/main/sphinx/connector/iceberg.rst b/docs/src/main/sphinx/connector/iceberg.rst
deleted file mode 100644
index 19f49372d37d..000000000000
--- a/docs/src/main/sphinx/connector/iceberg.rst
+++ /dev/null
@@ -1,1530 +0,0 @@
-=================
-Iceberg connector
-=================
-
-.. raw:: html
-
-  <img src="../_static/img/iceberg.png" class="connector-logo">
-
-Apache Iceberg is an open table format for huge analytic datasets.
-The Iceberg connector allows querying data stored in
-files written in Iceberg format, as defined in the
-`Iceberg Table Spec <https://iceberg.apache.org/spec/>`_. It supports Apache
-Iceberg table spec version 1 and 2.
-
-The Iceberg table state is maintained in metadata files. All changes to table state
-create a new metadata file and replace the old metadata with an atomic swap.
-The table metadata file tracks the table schema, partitioning config,
-custom properties, and snapshots of the table contents.
-
-Iceberg data files can be stored in either Parquet, ORC or Avro format, as
-determined by the ``format`` property in the table definition.  The
-table ``format`` defaults to ``ORC``.
-
-Iceberg is designed to improve on the known scalability limitations of Hive, which stores
-table metadata in a metastore that is backed by a relational database such as MySQL.  It tracks
-partition locations in the metastore, but not individual data files.  Trino queries
-using the :doc:`/connector/hive` must first call the metastore to get partition locations,
-then call the underlying filesystem to list all data files inside each partition,
-and then read metadata from each data file.
-
-Since Iceberg stores the paths to data files in the metadata files, it
-only consults the underlying file system for files that must be read.
-
-Requirements
-------------
-
-To use Iceberg, you need:
-
-* Network access from the Trino coordinator and workers to the distributed
-  object storage.
-* Access to a Hive metastore service (HMS) or AWS Glue.
-* Network access from the Trino coordinator to the HMS. Hive
-  metastore access with the Thrift protocol defaults to using port 9083.
-
-General configuration
----------------------
-
-These configuration properties are independent of which catalog implementation
-is used.
-
-.. list-table:: Iceberg general configuration properties
-  :widths: 30, 58, 12
-  :header-rows: 1
-
-  * - Property name
-    - Description
-    - Default
-  * - ``iceberg.file-format``
-    - Define the data storage file format for Iceberg tables.
-      Possible values are
-
-      * ``PARQUET``
-      * ``ORC``
-      * ``AVRO``
-    - ``ORC``
-  * - ``iceberg.compression-codec``
-    - The compression codec used when writing files.
-      Possible values are
-
-      * ``NONE``
-      * ``SNAPPY``
-      * ``LZ4``
-      * ``ZSTD``
-      * ``GZIP``
-    - ``ZSTD``
-  * - ``iceberg.use-file-size-from-metadata``
-    - Read file sizes from metadata instead of file system.
-      This property must only be used as a workaround for
-      `this issue <https://github.com/apache/iceberg/issues/1980>`_.
-      The problem was fixed in Iceberg version 0.11.0.
-    - ``true``
-  * - ``iceberg.max-partitions-per-writer``
-    - Maximum number of partitions handled per writer.
-    - 100
-  * - ``iceberg.target-max-file-size``
-    - Target maximum size of written files; the actual size may be larger.
-    - ``1GB``
-  * - ``iceberg.unique-table-location``
-    - Use randomized, unique table locations.
-    - ``true``
-  * - ``iceberg.dynamic-filtering.wait-timeout``
-    - Maximum duration to wait for completion of dynamic filters during split generation.
-    - ``0s``
-  * - ``iceberg.delete-schema-locations-fallback``
-    - Whether schema locations are deleted when Trino can't determine whether they contain external files.
-    - ``false``
-  * - ``iceberg.minimum-assigned-split-weight``
-    - A decimal value in the range (0, 1] used as a minimum for weights assigned to each split. A low value may improve performance
-      on tables with small files. A higher value may improve performance for queries with highly skewed aggregations or joins.
-    - 0.05
-  * - ``iceberg.table-statistics-enabled``
-    - Enables :doc:`/optimizer/statistics`. The equivalent
-      :doc:`catalog session property </sql/set-session>`
-      is ``statistics_enabled`` for session specific use.
-      Set to ``false`` to disable statistics. Disabling statistics
-      means that :doc:`/optimizer/cost-based-optimizations` can
-      not make smart decisions about the query plan.
-    - ``true``
-  * - ``iceberg.projection-pushdown-enabled``
-    - Enable :doc:`projection pushdown </optimizer/pushdown>`
-    - ``true``
-  * - ``iceberg.hive-catalog-name``
-    - Catalog to redirect to when a Hive table is referenced.
-    -
-  * - ``iceberg.materialized-views.storage-schema``
-    - Schema for creating materialized views storage tables. When this property
-      is not configured, storage tables are created in the same schema as the
-      materialized view definition. When the ``storage_schema`` materialized
-      view property is specified, it takes precedence over this catalog property.
-    - Empty
-  * - ``iceberg.register-table-procedure.enabled``
-    - Enable to allow user to call ``register_table`` procedure
-    - ``false``
-
-Metastores
-----------
-
-The Iceberg table format manages most metadata in metadata files in the object
-storage itself. A small amount of metadata, however, still requires the use of a
-metastore. In the Iceberg ecosystem, these smaller metastores are called Iceberg
-metadata catalogs, or just catalogs. The examples in each subsection depict the
-contents of a Trino catalog file that uses the the Iceberg connector to
-configures different Iceberg metadata catalogs.
-
-The connector supports multiple Iceberg catalog types; you may use
-either a Hive metastore service (HMS), AWS Glue, or a REST catalog. The catalog
-type is determined by the ``iceberg.catalog.type`` property. It can be set to
-``HIVE_METASTORE``, ``GLUE``, ``JDBC``, or ``REST``.
-
-.. _iceberg-hive-catalog:
-
-Hive metastore catalog
-^^^^^^^^^^^^^^^^^^^^^^
-
-The Hive metastore catalog is the default implementation.
-When using it, the Iceberg connector supports the same metastore
-configuration properties as the Hive connector. At a minimum,
-``hive.metastore.uri`` must be configured, see
-:ref:`Thrift metastore configuration<hive-thrift-metastore>`.
-
-.. code-block:: text
-
-    connector.name=iceberg
-    hive.metastore.uri=thrift://localhost:9083
-
-.. _iceberg-glue-catalog:
-
-Glue catalog
-^^^^^^^^^^^^
-
-When using the Glue catalog, the Iceberg connector supports the same
-configuration properties as the Hive connector's Glue setup. See
-:ref:`AWS Glue metastore configuration<hive-glue-metastore>`.
-
-.. code-block:: text
-
-    connector.name=iceberg
-    iceberg.catalog.type=glue
-
-.. list-table:: Iceberg Glue catalog configuration properties
-  :widths: 35, 50, 15
-  :header-rows: 1
-
-  * - Property name
-    - Description
-    - Default
-  * - ``iceberg.glue.skip-archive``
-    - Skip archiving an old table version when creating a new version in a
-      commit. See `AWS Glue Skip Archive
-      <https://iceberg.apache.org/docs/latest/aws/#skip-archive>`_.
-    - ``false``
-
-.. _iceberg-rest-catalog:
-
-REST catalog
-^^^^^^^^^^^^^^
-
-In order to use the Iceberg REST catalog, ensure to configure the catalog type with
-``iceberg.catalog.type=rest`` and provide further details with the following
-properties:
-
-.. list-table:: Iceberg REST catalog configuration properties
-  :widths: 40, 60
-  :header-rows: 1
-
-  * - Property name
-    - Description
-  * - ``iceberg.rest-catalog.uri``
-    - REST server API endpoint URI (required).
-      Example: ``http://iceberg-with-rest:8181``
-  * - ``iceberg.rest-catalog.warehouse``
-    - Warehouse identifier/location for the catalog (optional).
-      Example: ``s3://my_bucket/warehouse_location``
-  * - ``iceberg.rest-catalog.security``
-    - The type of security to use (default: ``NONE``).  ``OAUTH2`` requires
-      either a ``token`` or ``credential``. Example: ``OAUTH2``
-  * - ``iceberg.rest-catalog.session``
-    - Session information included when communicating with the REST Catalog.
-      Options are ``NONE`` or ``USER`` (default: ``NONE``).
-  * - ``iceberg.rest-catalog.oauth2.token``
-    - The bearer token used for interactions with the server. A
-      ``token`` or ``credential`` is required for ``OAUTH2`` security.
-      Example: ``AbCdEf123456``
-  * - ``iceberg.rest-catalog.oauth2.credential``
-    - The credential to exchange for a token in the OAuth2 client credentials
-      flow with the server. A ``token`` or ``credential`` is required for
-      ``OAUTH2`` security. Example: ``AbCdEf123456``
-
-.. code-block:: text
-
-    connector.name=iceberg
-    iceberg.catalog.type=rest
-    iceberg.rest-catalog.uri=http://iceberg-with-rest:8181
-
-REST catalog does not support :doc:`views</sql/create-view>` or
-:doc:`materialized views</sql/create-materialized-view>`.
-
-.. _iceberg-jdbc-catalog:
-
-JDBC catalog
-^^^^^^^^^^^^
-
-.. warning::
-
-  The JDBC catalog may face the compatibility issue if Iceberg introduces breaking changes in the future.
-  Consider the :ref:`REST catalog <iceberg-rest-catalog>` as an alternative solution.
-
-At a minimum, ``iceberg.jdbc-catalog.driver-class``, ``iceberg.jdbc-catalog.connection-url`` and
-``iceberg.jdbc-catalog.catalog-name`` must be configured.
-When using any database besides PostgreSQL, a JDBC driver jar file must be placed in the plugin directory.
-
-.. code-block:: text
-
-    connector.name=iceberg
-    iceberg.catalog.type=jdbc
-    iceberg.jdbc-catalog.catalog-name=test
-    iceberg.jdbc-catalog.driver-class=org.postgresql.Driver
-    iceberg.jdbc-catalog.connection-url=jdbc:postgresql://example.net:5432/database
-    iceberg.jdbc-catalog.connection-user=admin
-    iceberg.jdbc-catalog.connection-password=test
-    iceberg.jdbc-catalog.default-warehouse-dir=s3://bucket
-
-JDBC catalog does not support :doc:`views</sql/create-view>` or
-:doc:`materialized views</sql/create-materialized-view>`.
-
-Type mapping
-------------
-
-The connector reads and writes data into the supported data file formats Avro,
-ORC, and Parquet, following the Iceberg specification.
-
-Because Trino and Iceberg each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-The Iceberg specification includes supported data types and the mapping to the
-formating in the Avro, ORC, or Parquet files:
-
-* `Iceberg to Avro <https://iceberg.apache.org/spec/#avro>`_
-* `Iceberg to ORC <https://iceberg.apache.org/spec/#orc>`_
-* `Iceberg to Parquet <https://iceberg.apache.org/spec/#parquet>`_
-
-Iceberg to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Iceberg types to the corresponding Trino types following this
-table:
-
-.. list-table:: Iceberg to Trino type mapping
-  :widths: 40, 60
-  :header-rows: 1
-
-  * - Iceberg type
-    - Trino type
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-  * - ``INT``
-    - ``INTEGER``
-  * - ``LONG``
-    - ``BIGINT``
-  * - ``FLOAT``
-    - ``REAL``
-  * - ``DOUBLE``
-    - ``DOUBLE``
-  * - ``DECIMAL(p,s)``
-    - ``DECIMAL(p,s)``
-  * - ``DATE``
-    - ``DATE``
-  * - ``TIME``
-    - ``TIME(6)``
-  * - ``TIMESTAMP``
-    - ``TIMESTAMP(6)``
-  * - ``TIMESTAMPTZ``
-    - ``TIMESTAMP(6) WITH TIME ZONE``
-  * - ``STRING``
-    - ``VARCHAR``
-  * - ``UUID``
-    - ``UUID``
-  * - ``BINARY``
-    - ``VARBINARY``
-  * - ``FIXED (L)``
-    - ``VARBINARY``
-  * - ``STRUCT(...)``
-    - ``ROW(...)``
-  * - ``LIST(e)``
-    - ``ARRAY(e)``
-  * - ``MAP(k,v)``
-    - ``MAP(k,v)``
-
-No other types are supported.
-
-Trino to Iceberg type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding Iceberg types following
-this table:
-
-.. list-table:: Trino to Iceberg type mapping
-  :widths: 40, 60
-  :header-rows: 1
-
-  * - Trino type
-    - Iceberg type
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-  * - ``INTEGER``
-    - ``INT``
-  * - ``BIGINT``
-    - ``LONG``
-  * - ``REAL``
-    - ``FLOAT``
-  * - ``DOUBLE``
-    - ``DOUBLE``
-  * - ``DECIMAL(p,s)``
-    - ``DECIMAL(p,s)``
-  * - ``DATE``
-    - ``DATE``
-  * - ``TIME(6)``
-    - ``TIME``
-  * - ``TIMESTAMP(6)``
-    - ``TIMESTAMP``
-  * - ``TIMESTAMP(6) WITH TIME ZONE``
-    - ``TIMESTAMPTZ``
-  * - ``VARCHAR``
-    - ``STRING``
-  * - ``UUID``
-    - ``UUID``
-  * - ``VARBINARY``
-    - ``BINARY``
-  * - ``ROW(...)``
-    - ``STRUCT(...)``
-  * - ``ARRAY(e)``
-    - ``LIST(e)``
-  * - ``MAP(k,v)``
-    - ``MAP(k,v)``
-
-No other types are supported.
-
-Security
---------
-
-The Iceberg connector allows you to choose one of several means of providing
-authorization at the catalog level.
-
-.. _iceberg-authorization:
-
-Authorization checks
-^^^^^^^^^^^^^^^^^^^^
-
-You can enable authorization checks for the connector by setting
-the ``iceberg.security`` property in the catalog properties file. This
-property must be one of the following values:
-
-.. list-table:: Iceberg security values
-  :widths: 30, 60
-  :header-rows: 1
-
-  * - Property value
-    - Description
-  * - ``ALLOW_ALL``
-    - No authorization checks are enforced.
-  * - ``SYSTEM``
-    - The connector relies on system-level access control.
-  * - ``READ_ONLY``
-    - Operations that read data or metadata, such as :doc:`/sql/select` are
-      permitted. No operations that write data or metadata, such as
-      :doc:`/sql/create-table`, :doc:`/sql/insert`, or :doc:`/sql/delete` are
-      allowed.
-  * - ``FILE``
-    - Authorization checks are enforced using a catalog-level access control
-      configuration file whose path is specified in the ``security.config-file``
-      catalog configuration property. See
-      :ref:`catalog-file-based-access-control` for information on the
-      authorization configuration file.
-
-.. _iceberg-sql-support:
-
-SQL support
------------
-
-This connector provides read access and write access to data and metadata in
-Iceberg. In addition to the :ref:`globally available <sql-globally-available>`
-and :ref:`read operation <sql-read-operations>` statements, the connector
-supports the following features:
-
-* :ref:`sql-write-operations`:
-
-  * :ref:`iceberg-schema-table-management` and :ref:`iceberg-tables`
-  * :ref:`iceberg-data-management`
-  * :ref:`sql-view-management`
-  * :ref:`sql-materialized-view-management`, see also :ref:`iceberg-materialized-views`
-
-Basic usage examples
-^^^^^^^^^^^^^^^^^^^^
-
-The connector supports creating schemas. You can create a schema with or without
-a specified location.
-
-You can create a schema with the :doc:`/sql/create-schema` statement and the
-``location`` schema property. The tables in this schema, which have no explicit
-``location`` set in :doc:`/sql/create-table` statement, are located in a
-subdirectory under the directory corresponding to the schema location.
-
-Create a schema on S3::
-
-  CREATE SCHEMA example.example_s3_schema
-  WITH (location = 's3://my-bucket/a/path/');
-
-Create a schema on a S3 compatible object storage such as MinIO::
-
-  CREATE SCHEMA example.example_s3a_schema
-  WITH (location = 's3a://my-bucket/a/path/');
-
-Create a schema on HDFS::
-
-  CREATE SCHEMA example.example_hdfs_schema
-  WITH (location='hdfs://hadoop-master:9000/user/hive/warehouse/a/path/');
-
-Optionally, on HDFS, the location can be omitted::
-
-  CREATE SCHEMA example.example_hdfs_schema;
-
-The Iceberg connector supports creating tables using the :doc:`CREATE
-TABLE </sql/create-table>` syntax. Optionally specify the
-:ref:`table properties <iceberg-table-properties>` supported by this connector::
-
-    CREATE TABLE example_table (
-        c1 integer,
-        c2 date,
-        c3 double
-    )
-    WITH (
-        format = 'PARQUET',
-        partitioning = ARRAY['c1', 'c2'],
-        sorted_by = ARRAY['c3'],
-        location = 's3://my-bucket/a/path/'
-    );
-
-When the ``location`` table property is omitted, the content of the table
-is stored in a subdirectory under the directory corresponding to the
-schema location.
-
-The Iceberg connector supports creating tables using the :doc:`CREATE
-TABLE AS </sql/create-table-as>` with :doc:`SELECT </sql/select>` syntax::
-
-    CREATE TABLE tiny_nation
-    WITH (
-        format = 'PARQUET'
-    )
-    AS
-        SELECT *
-        FROM nation
-        WHERE nationkey < 10;
-
-Another flavor of creating tables with :doc:`CREATE TABLE AS </sql/create-table-as>`
-is with :doc:`VALUES </sql/values>` syntax::
-
-    CREATE TABLE yearly_clicks (
-        year,
-        clicks
-    )
-    WITH (
-        partitioning = ARRAY['year']
-    )
-    AS VALUES
-        (2021, 10000),
-        (2022, 20000);
-
-Procedures
-^^^^^^^^^^
-
-Use the :doc:`/sql/call` statement to perform data manipulation or
-administrative tasks. Procedures are available in the system schema of each
-catalog. The following code snippet displays how to call the
-``example_procedure`` in the ``examplecatalog`` catalog::
-
-    CALL examplecatalog.system.example_procedure()
-
-.. _iceberg-register-table:
-
-Register table
-""""""""""""""
-The connector can register existing Iceberg tables with the catalog.
-
-The procedure ``system.register_table`` allows the caller to register an
-existing Iceberg table in the metastore, using its existing metadata and data
-files::
-
-    CALL example.system.register_table(schema_name => 'testdb', table_name => 'customer_orders', table_location => 'hdfs://hadoop-master:9000/user/hive/warehouse/customer_orders-581fad8517934af6be1857a903559d44')
-
-In addition, you can provide a file name to register a table
-with specific metadata. This may be used to register the table with
-some specific table state, or may be necessary if the connector cannot
-automatically figure out the metadata version to use::
-
-    CALL example.system.register_table(schema_name => 'testdb', table_name => 'customer_orders', table_location => 'hdfs://hadoop-master:9000/user/hive/warehouse/customer_orders-581fad8517934af6be1857a903559d44', metadata_file_name => '00003-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json')
-
-To prevent unauthorized users from accessing data, this procedure is disabled by default.
-The procedure is enabled only when ``iceberg.register-table-procedure.enabled`` is set to ``true``.
-
-.. _iceberg-unregister-table:
-
-Unregister table
-""""""""""""""""
-The connector can unregister existing Iceberg tables from the catalog.
-
-The procedure ``system.unregister_table`` allows the caller to unregister an
-existing Iceberg table from the metastores without deleting the data::
-
-    CALL example.system.unregister_table(schema_name => 'testdb', table_name => 'customer_orders')
-
-Migrate table
-"""""""""""""
-
-The connector can read from or write to Hive tables that have been migrated to Iceberg.
-An SQL procedure ``system.migrate`` allows the caller to replace
-a Hive table with an Iceberg table, loaded with the source’s data files.
-Table schema, partitioning, properties, and location will be copied from the source table.
-Migrate will fail if any table partition uses an unsupported format::
-
-    CALL iceberg.system.migrate(schema_name => 'testdb', table_name => 'customer_orders')
-
-In addition, you can provide a ``recursive_directory`` argument to migrate the table with recursive directories.
-The possible values are ``true``, ``false`` and ``fail``. The default value is ``fail`` that throws an exception
-if nested directory exists::
-
-    CALL iceberg.system.migrate(schema_name => 'testdb', table_name => 'customer_orders', recursive_directory => 'true')
-
-.. _iceberg-data-management:
-
-Data management
-^^^^^^^^^^^^^^^
-
-The :ref:`sql-data-management` functionality includes support for ``INSERT``,
-``UPDATE``, ``DELETE``, and ``MERGE`` statements.
-
-.. _iceberg-delete:
-
-Deletion by partition
-"""""""""""""""""""""
-
-For partitioned tables, the Iceberg connector supports the deletion of entire
-partitions if the ``WHERE`` clause specifies filters only on the identity-transformed
-partitioning columns, that can match entire partitions. Given the table definition
-from :ref:`Partitioned Tables <iceberg-tables>` section,
-the following SQL statement deletes all partitions for which ``country`` is ``US``::
-
-    DELETE FROM example.testdb.customer_orders
-    WHERE country = 'US'
-
-A partition delete is performed if the ``WHERE`` clause meets these conditions.
-
-Row level deletion
-""""""""""""""""""
-
-Tables using v2 of the Iceberg specification support deletion of individual rows
-by writing position delete files.
-
-.. _iceberg-schema-table-management:
-
-Schema and table management
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The :ref:`sql-schema-table-management` functionality includes support for:
-
-* :doc:`/sql/create-schema`
-* :doc:`/sql/drop-schema`
-* :doc:`/sql/alter-schema`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/alter-table`
-* :doc:`/sql/comment`
-
-Schema evolution
-""""""""""""""""
-
-Iceberg supports schema evolution, with safe column add, drop, reorder
-and rename operations, including in nested structures.
-Table partitioning can also be changed and the connector can still
-query data created before the partitioning change.
-
-.. _iceberg-alter-table-execute:
-
-ALTER TABLE EXECUTE
-"""""""""""""""""""
-
-The connector supports the following commands for use with
-:ref:`ALTER TABLE EXECUTE <alter-table-execute>`.
-
-optimize
-~~~~~~~~
-
-The ``optimize`` command is used for rewriting the active content
-of the specified table so that it is merged into fewer but
-larger files.
-In case that the table is partitioned, the data compaction
-acts separately on each partition selected for optimization.
-This operation improves read performance.
-
-All files with a size below the optional ``file_size_threshold``
-parameter (default value for the threshold is ``100MB``) are
-merged:
-
-.. code-block:: sql
-
-    ALTER TABLE test_table EXECUTE optimize
-
-The following statement merges the files in a table that
-are under 10 megabytes in size:
-
-.. code-block:: sql
-
-    ALTER TABLE test_table EXECUTE optimize(file_size_threshold => '10MB')
-
-You can use a ``WHERE`` clause with the columns used to partition
-the table, to apply ``optimize`` only on the partition(s) corresponding
-to the filter:
-
-.. code-block:: sql
-
-    ALTER TABLE test_partitioned_table EXECUTE optimize
-    WHERE partition_key = 1
-
-expire_snapshots
-~~~~~~~~~~~~~~~~
-
-The ``expire_snapshots`` command removes all snapshots and all related metadata and data files.
-Regularly expiring snapshots is recommended to delete data files that are no longer needed,
-and to keep the size of table metadata small.
-The procedure affects all snapshots that are older than the time period configured with the ``retention_threshold`` parameter.
-
-``expire_snapshots`` can be run as follows:
-
-.. code-block:: sql
-
-  ALTER TABLE test_table EXECUTE expire_snapshots(retention_threshold => '7d')
-
-The value for ``retention_threshold`` must be higher than or equal to ``iceberg.expire_snapshots.min-retention`` in the catalog
-otherwise the procedure fails with a similar message:
-``Retention specified (1.00d) is shorter than the minimum retention configured in the system (7.00d)``.
-The default value for this property is ``7d``.
-
-remove_orphan_files
-~~~~~~~~~~~~~~~~~~~
-
-The ``remove_orphan_files`` command removes all files from table's data directory which are
-not linked from metadata files and that are older than the value of ``retention_threshold`` parameter.
-Deleting orphan files from time to time is recommended to keep size of table's data directory under control.
-
-``remove_orphan_files`` can be run as follows:
-
-.. code-block:: sql
-
-  ALTER TABLE test_table EXECUTE remove_orphan_files(retention_threshold => '7d')
-
-The value for ``retention_threshold`` must be higher than or equal to ``iceberg.remove_orphan_files.min-retention`` in the catalog
-otherwise the procedure fails with a similar message:
-``Retention specified (1.00d) is shorter than the minimum retention configured in the system (7.00d)``.
-The default value for this property is ``7d``.
-
-.. _drop-extended-stats:
-
-drop_extended_stats
-~~~~~~~~~~~~~~~~~~~
-
-The ``drop_extended_stats`` command removes all extended statistics information from
-the table.
-
-``drop_extended_stats`` can be run as follows:
-
-.. code-block:: sql
-
-  ALTER TABLE test_table EXECUTE drop_extended_stats
-
-.. _iceberg-alter-table-set-properties:
-
-ALTER TABLE SET PROPERTIES
-""""""""""""""""""""""""""
-
-The connector supports modifying the properties on existing tables using
-:ref:`ALTER TABLE SET PROPERTIES <alter-table-set-properties>`.
-
-The following table properties can be updated after a table is created:
-
-* ``format``
-* ``format_version``
-* ``partitioning``
-* ``sorted_by``
-
-For example, to update a table from v1 of the Iceberg specification to v2:
-
-.. code-block:: sql
-
-    ALTER TABLE table_name SET PROPERTIES format_version = 2;
-
-Or to set the column ``my_new_partition_column`` as a partition column on a table:
-
-.. code-block:: sql
-
-    ALTER TABLE table_name SET PROPERTIES partitioning = ARRAY[<existing partition columns>, 'my_new_partition_column'];
-
-The current values of a table's properties can be shown using :doc:`SHOW CREATE TABLE </sql/show-create-table>`.
-
-.. _iceberg-table-properties:
-
-Table properties
-~~~~~~~~~~~~~~~~
-
-Table properties supply or set metadata for the underlying tables. This
-is key for :doc:`/sql/create-table-as` statements. Table properties are passed
-to the connector using a :doc:`WITH </sql/create-table-as>` clause::
-
-  CREATE TABLE tablename
-  WITH (format='CSV',
-        csv_escape = '"')
-
-.. list-table:: Iceberg table properties
-  :widths: 40, 60
-  :header-rows: 1
-
-  * - Property name
-    - Description
-  * - ``format``
-    - Optionally specifies the format of table data files; either ``PARQUET``,
-      ``ORC`` or ``AVRO``.  Defaults to ``ORC``.
-  * - ``partitioning``
-    - Optionally specifies table partitioning. If a table is partitioned by
-      columns ``c1`` and ``c2``, the partitioning property is
-      ``partitioning = ARRAY['c1', 'c2']``.
-  * - ``location``
-    - Optionally specifies the file system location URI for the table.
-  * - ``format_version``
-    - Optionally specifies the format version of the Iceberg specification to
-      use for new tables; either ``1`` or ``2``. Defaults to ``2``. Version
-      ``2`` is required for row level deletes.
-  * - ``orc_bloom_filter_columns``
-    - Comma separated list of columns to use for ORC bloom filter. It improves
-      the performance of queries using Equality and IN predicates when reading
-      ORC file. Requires ORC format. Defaults to ``[]``.
-  * - ``orc_bloom_filter_fpp``
-    - The ORC bloom filters false positive probability. Requires ORC format.
-      Defaults to ``0.05``.
-
-The table definition below specifies format Parquet, partitioning by columns ``c1`` and ``c2``,
-and a file system location of ``/var/example_tables/test_table``::
-
-    CREATE TABLE test_table (
-        c1 integer,
-        c2 date,
-        c3 double)
-    WITH (
-        format = 'PARQUET',
-        partitioning = ARRAY['c1', 'c2'],
-        location = '/var/example_tables/test_table')
-
-The table definition below specifies format ORC, bloom filter index by columns ``c1`` and ``c2``,
-fpp is 0.05, and a file system location of ``/var/example_tables/test_table``::
-
-    CREATE TABLE test_table (
-        c1 integer,
-        c2 date,
-        c3 double)
-    WITH (
-        format = 'ORC',
-        location = '/var/example_tables/test_table',
-        orc_bloom_filter_columns = ARRAY['c1', 'c2'],
-        orc_bloom_filter_fpp = 0.05)
-
-.. _iceberg-metadata-tables:
-
-Metadata tables
-"""""""""""""""
-
-The connector exposes several metadata tables for each Iceberg table.
-These metadata tables contain information about the internal structure
-of the Iceberg table. You can query each metadata table by appending the
-metadata table name to the table name::
-
-   SELECT * FROM "test_table$data"
-
-``$data`` table
-~~~~~~~~~~~~~~~
-
-The ``$data`` table is an alias for the Iceberg table itself.
-
-The statement::
-
-    SELECT * FROM "test_table$data"
-
-is equivalent to::
-
-    SELECT * FROM test_table
-
-``$properties`` table
-~~~~~~~~~~~~~~~~~~~~~
-
-The ``$properties`` table provides access to general information about Iceberg
-table configuration and any additional metadata key/value pairs that the table
-is tagged with.
-
-You can retrieve the properties of the current snapshot of the Iceberg
-table ``test_table`` by using the following query::
-
-    SELECT * FROM "test_table$properties"
-
-.. code-block:: text
-
-     key                   | value    |
-    -----------------------+----------+
-    write.format.default   | PARQUET  |
-
-``$history`` table
-~~~~~~~~~~~~~~~~~~
-
-The ``$history`` table provides a log of the metadata changes performed on
-the Iceberg table.
-
-You can retrieve the changelog of the Iceberg table ``test_table``
-by using the following query::
-
-    SELECT * FROM "test_table$history"
-
-.. code-block:: text
-
-     made_current_at                  | snapshot_id          | parent_id            | is_current_ancestor
-    ----------------------------------+----------------------+----------------------+--------------------
-    2022-01-10 08:11:20 Europe/Vienna | 8667764846443717831  |  <null>              |  true
-    2022-01-10 08:11:34 Europe/Vienna | 7860805980949777961  | 8667764846443717831  |  true
-
-The output of the query has the following columns:
-
-.. list-table:: History columns
-  :widths: 30, 30, 40
-  :header-rows: 1
-
-  * - Name
-    - Type
-    - Description
-  * - ``made_current_at``
-    - ``timestamp(3) with time zone``
-    - The time when the snapshot became active
-  * - ``snapshot_id``
-    - ``bigint``
-    - The identifier of the snapshot
-  * - ``parent_id``
-    - ``bigint``
-    - The identifier of the parent snapshot
-  * - ``is_current_ancestor``
-    - ``boolean``
-    - Whether or not this snapshot is an ancestor of the current snapshot
-
-``$snapshots`` table
-~~~~~~~~~~~~~~~~~~~~
-
-The ``$snapshots`` table provides a detailed view of snapshots of the
-Iceberg table. A snapshot consists of one or more file manifests,
-and the complete table contents is represented by the union
-of all the data files in those manifests.
-
-You can retrieve the information about the snapshots of the Iceberg table
-``test_table`` by using the following query::
-
-    SELECT * FROM "test_table$snapshots"
-
-.. code-block:: text
-
-     committed_at                      | snapshot_id          | parent_id            | operation          |  manifest_list                                                                                                                           |   summary
-    ----------------------------------+----------------------+----------------------+--------------------+------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    2022-01-10 08:11:20 Europe/Vienna | 8667764846443717831  |  <null>              |  append            |   hdfs://hadoop-master:9000/user/hive/warehouse/test_table/metadata/snap-8667764846443717831-1-100cf97e-6d56-446e-8961-afdaded63bc4.avro | {changed-partition-count=0, total-equality-deletes=0, total-position-deletes=0, total-delete-files=0, total-files-size=0, total-records=0, total-data-files=0}
-    2022-01-10 08:11:34 Europe/Vienna | 7860805980949777961  | 8667764846443717831  |  append            |   hdfs://hadoop-master:9000/user/hive/warehouse/test_table/metadata/snap-7860805980949777961-1-faa19903-1455-4bb8-855a-61a1bbafbaa7.avro | {changed-partition-count=1, added-data-files=1, total-equality-deletes=0, added-records=1, total-position-deletes=0, added-files-size=442, total-delete-files=0, total-files-size=442, total-records=1, total-data-files=1}
-
-The output of the query has the following columns:
-
-.. list-table:: Snapshots columns
-  :widths: 20, 30, 50
-  :header-rows: 1
-
-  * - Name
-    - Type
-    - Description
-  * - ``committed_at``
-    - ``timestamp(3) with time zone``
-    - The time when the snapshot became active
-  * - ``snapshot_id``
-    - ``bigint``
-    - The identifier for the snapshot
-  * - ``parent_id``
-    - ``bigint``
-    - The identifier for the parent snapshot
-  * - ``operation``
-    - ``varchar``
-    - The type of operation performed on the Iceberg table.
-      The supported operation types in Iceberg are:
-
-      * ``append`` when new data is appended
-      * ``replace`` when files are removed and replaced without changing the data in the table
-      * ``overwrite`` when new data is added to overwrite existing data
-      * ``delete`` when data is deleted from the table  and no new data is added
-  * - ``manifest_list``
-    - ``varchar``
-    - The list of avro manifest files containing the detailed information about the snapshot changes.
-  * - ``summary``
-    - ``map(varchar, varchar)``
-    - A summary of the changes made from the previous snapshot to the current snapshot
-
-``$manifests`` table
-~~~~~~~~~~~~~~~~~~~~
-
-The ``$manifests`` table provides a detailed overview of the manifests
-corresponding to the snapshots performed in the log of the Iceberg table.
-
-You can retrieve the information about the manifests of the Iceberg table
-``test_table`` by using the following query::
-
-    SELECT * FROM "test_table$manifests"
-
-.. code-block:: text
-
-     path                                                                                                           | length          | partition_spec_id    | added_snapshot_id     | added_data_files_count  | added_rows_count | existing_data_files_count   | existing_rows_count | deleted_data_files_count    | deleted_rows_count | partitions
-    ----------------------------------------------------------------------------------------------------------------+-----------------+----------------------+-----------------------+-------------------------+------------------+-----------------------------+---------------------+-----------------------------+--------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-     hdfs://hadoop-master:9000/user/hive/warehouse/test_table/metadata/faa19903-1455-4bb8-855a-61a1bbafbaa7-m0.avro |  6277           |   0                  | 7860805980949777961   | 1                       | 100              | 0                           | 0                   | 0                           | 0                  | {{contains_null=false, contains_nan= false, lower_bound=1, upper_bound=1},{contains_null=false, contains_nan= false, lower_bound=2021-01-12, upper_bound=2021-01-12}}
-
-The output of the query has the following columns:
-
-.. list-table:: Manifests columns
-  :widths: 30, 30, 40
-  :header-rows: 1
-
-  * - Name
-    - Type
-    - Description
-  * - ``path``
-    - ``varchar``
-    - The manifest file location
-  * - ``length``
-    - ``bigint``
-    - The manifest file length
-  * - ``partition_spec_id``
-    - ``integer``
-    - The identifier for the partition specification used to write the manifest file
-  * - ``added_snapshot_id``
-    - ``bigint``
-    - The identifier of the snapshot during which this manifest entry has been added
-  * - ``added_data_files_count``
-    - ``integer``
-    - The number of data files with status ``ADDED`` in the manifest file
-  * - ``added_rows_count``
-    - ``bigint``
-    - The total number of rows in all data files with status ``ADDED`` in the manifest file.
-  * - ``existing_data_files_count``
-    - ``integer``
-    - The number of data files with status ``EXISTING`` in the manifest file
-  * - ``existing_rows_count``
-    - ``bigint``
-    - The total number of rows in all data files with status ``EXISTING`` in the manifest file.
-  * - ``deleted_data_files_count``
-    - ``integer``
-    - The number of data files with status ``DELETED`` in the manifest file
-  * - ``deleted_rows_count``
-    - ``bigint``
-    - The total number of rows in all data files with status ``DELETED`` in the manifest file.
-  * - ``partitions``
-    - ``array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar))``
-    - Partition range metadata
-
-``$partitions`` table
-~~~~~~~~~~~~~~~~~~~~~
-
-The ``$partitions`` table provides a detailed overview of the partitions
-of the  Iceberg table.
-
-You can retrieve the information about the partitions of the Iceberg table
-``test_table`` by using the following query::
-
-    SELECT * FROM "test_table$partitions"
-
-.. code-block:: text
-
-     partition             | record_count  | file_count    | total_size    |  data
-    -----------------------+---------------+---------------+---------------+------------------------------------------------------
-    {c1=1, c2=2021-01-12}  |  2            | 2             |  884          | {c3={min=1.0, max=2.0, null_count=0, nan_count=NULL}}
-    {c1=1, c2=2021-01-13}  |  1            | 1             |  442          | {c3={min=1.0, max=1.0, null_count=0, nan_count=NULL}}
-
-The output of the query has the following columns:
-
-.. list-table:: Partitions columns
-  :widths: 20, 30, 50
-  :header-rows: 1
-
-  * - Name
-    - Type
-    - Description
-  * - ``partition``
-    - ``row(...)``
-    - A row which contains the mapping of the partition column name(s) to the partition column value(s)
-  * - ``record_count``
-    - ``bigint``
-    - The number of records in the partition
-  * - ``file_count``
-    - ``bigint``
-    - The number of files mapped in the partition
-  * - ``total_size``
-    - ``bigint``
-    - The size of all the files in the partition
-  * - ``data``
-    - ``row(... row (min ..., max ... , null_count bigint, nan_count bigint))``
-    - Partition range metadata
-
-``$files`` table
-~~~~~~~~~~~~~~~~
-
-The ``$files`` table provides a detailed overview of the data files in current snapshot of the  Iceberg table.
-
-To retrieve the information about the data files of the Iceberg table ``test_table`` use the following query::
-
-    SELECT * FROM "test_table$files"
-
-.. code-block:: text
-
-     content  | file_path                                                                                                                     | record_count    | file_format   | file_size_in_bytes   |  column_sizes        |  value_counts     |  null_value_counts | nan_value_counts  | lower_bounds                |  upper_bounds               |  key_metadata  | split_offsets  |  equality_ids
-    ----------+-------------------------------------------------------------------------------------------------------------------------------+-----------------+---------------+----------------------+----------------------+-------------------+--------------------+-------------------+-----------------------------+-----------------------------+----------------+----------------+---------------
-     0        | hdfs://hadoop-master:9000/user/hive/warehouse/test_table/data/c1=3/c2=2021-01-14/af9872b2-40f3-428f-9c87-186d2750d84e.parquet |  1              |  PARQUET      |  442                 | {1=40, 2=40, 3=44}   |  {1=1, 2=1, 3=1}  |  {1=0, 2=0, 3=0}   | <null>            |  {1=3, 2=2021-01-14, 3=1.3} |  {1=3, 2=2021-01-14, 3=1.3} |  <null>        | <null>         |   <null>
-
-The output of the query has the following columns:
-
-.. list-table:: Files columns
-  :widths: 25, 30, 45
-  :header-rows: 1
-
-  * - Name
-    - Type
-    - Description
-  * - ``content``
-    - ``integer``
-    - Type of content stored in the file.
-      The supported content types in Iceberg are:
-
-      * ``DATA(0)``
-      * ``POSITION_DELETES(1)``
-      * ``EQUALITY_DELETES(2)``
-  * - ``file_path``
-    - ``varchar``
-    - The data file location
-  * - ``file_format``
-    - ``varchar``
-    - The format of the data file
-  * - ``record_count``
-    - ``bigint``
-    - The number of entries contained in the data file
-  * - ``file_size_in_bytes``
-    - ``bigint``
-    - The data file size
-  * - ``column_sizes``
-    - ``map(integer, bigint)``
-    - Mapping between the Iceberg column ID and its corresponding size in the file
-  * - ``value_counts``
-    - ``map(integer, bigint)``
-    - Mapping between the Iceberg column ID and its corresponding count of entries in the file
-  * - ``null_value_counts``
-    - ``map(integer, bigint)``
-    - Mapping between the Iceberg column ID and its corresponding count of ``NULL`` values in the file
-  * - ``nan_value_counts``
-    - ``map(integer, bigint)``
-    - Mapping between the Iceberg column ID and its corresponding count of non numerical values in the file
-  * - ``lower_bounds``
-    - ``map(integer, bigint)``
-    - Mapping between the Iceberg column ID and its corresponding lower bound in the file
-  * - ``upper_bounds``
-    - ``map(integer, bigint)``
-    - Mapping between the Iceberg column ID and its corresponding upper bound in the file
-  * - ``key_metadata``
-    - ``varbinary``
-    - Metadata about the encryption key used to encrypt this file, if applicable
-  * - ``split_offsets``
-    - ``array(bigint)``
-    - List of recommended split locations
-  * - ``equality_ids``
-    - ``array(integer)``
-    - The set of field IDs used for equality comparison in equality delete files
-
-``$refs`` table
-^^^^^^^^^^^^^^^
-
-The ``$refs`` table provides information about Iceberg references including branches and tags.
-
-You can retrieve the references of the Iceberg table ``test_table`` by using the following query::
-
-    SELECT * FROM "test_table$refs"
-
-.. code-block:: text
-
-    name            | type   | snapshot_id | max_reference_age_in_ms | min_snapshots_to_keep | max_snapshot_age_in_ms |
-    ----------------+--------+-------------+-------------------------+-----------------------+------------------------+
-    example_tag     | TAG    | 10000000000 | 10000                   | null                  | null                   |
-    example_branch  | BRANCH | 20000000000 | 20000                   | 2                     | 30000                  |
-
-The output of the query has the following columns:
-
-.. list-table:: Refs columns
-  :widths: 20, 30, 50
-  :header-rows: 1
-
-  * - Name
-    - Type
-    - Description
-  * - ``name``
-    - ``varchar``
-    - Name of the reference
-  * - ``type``
-    - ``varchar``
-    - Type of the reference, either ``BRANCH`` or ``TAG``
-  * - ``snapshot_id``
-    - ``bigint``
-    - The snapshot ID of the reference
-  * - ``max_reference_age_in_ms``
-    - ``bigint``
-    - The maximum age of the reference before it could be expired.
-  * - ``min_snapshots_to_keep``
-    - ``integer``
-    - For branch only, the minimum number of snapshots to keep in a branch.
-  * - ``max_snapshot_age_in_ms``
-    - ``bigint``
-    - For branch only, the max snapshot age allowed in a branch. Older snapshots in the branch will be expired.
-
-.. _iceberg_metadata_columns:
-
-Metadata columns
-""""""""""""""""
-
-In addition to the defined columns, the Iceberg connector automatically exposes
-path metadata as a hidden column in each table:
-
-* ``$path``: Full file system path name of the file for this row
-
-* ``$file_modified_time``: Timestamp of the last modification of the file for this row
-
-You can use these columns in your SQL statements like any other column. This
-can be selected directly, or used in conditional statements. For example, you
-can inspect the file path for each record::
-
-    SELECT *, "$path", "$file_modified_time"
-    FROM example.web.page_views;
-
-Retrieve all records that belong to a specific file using ``"$path"`` filter::
-
-    SELECT *
-    FROM example.web.page_views
-    WHERE "$path" = '/usr/iceberg/table/web.page_views/data/file_01.parquet'
-
-Retrieve all records that belong to a specific file using ``"$file_modified_time"`` filter::
-
-    SELECT *
-    FROM example.web.page_views
-    WHERE "$file_modified_time" = CAST('2022-07-01 01:02:03.456 UTC' AS timestamp with time zone)
-
-DROP TABLE
-""""""""""
-
-The Iceberg connector supports dropping a table by using the :doc:`/sql/drop-table`
-syntax. When the command succeeds, both the data of the Iceberg table and also the
-information related to the table in the metastore service are removed.
-Dropping tables which have their data/metadata stored in a different location than
-the table's corresponding base directory on the object store is not supported.
-
-.. _iceberg-comment:
-
-COMMENT
-"""""""
-
-The Iceberg connector supports setting comments on the following objects:
-
-- tables
-- views
-- table columns
-
-The ``COMMENT`` option is supported on both the table and
-the table columns for the :doc:`/sql/create-table` operation.
-
-The ``COMMENT`` option is supported for adding table columns
-through the :doc:`/sql/alter-table` operations.
-
-The connector supports the command :doc:`COMMENT </sql/comment>` for setting
-comments on existing entities.
-
-.. _iceberg-tables:
-
-Partitioned tables
-""""""""""""""""""
-
-Iceberg supports partitioning by specifying transforms over the table columns.
-A partition is created for each unique tuple value produced by the transforms.
-Identity transforms are simply the column name. Other transforms are:
-
-.. list-table:: Iceberg column transforms
-  :widths: 40, 60
-  :header-rows: 1
-
-  * - Transform
-    - Description
-  * - ``year(ts)``
-    - A partition is created for each year.  The partition value is the integer
-      difference in years between ``ts`` and January 1 1970.
-  * - ``month(ts)``
-    - A partition is created for each month of each year.  The partition value
-      is the integer difference in months between ``ts`` and January 1 1970.
-  * - ``day(ts)``
-    - A partition is created for each day of each year.  The partition value is
-      the integer difference in days between ``ts`` and January 1 1970.
-  * - ``hour(ts)``
-    - A partition is created hour of each day.  The partition value is a
-      timestamp with the minutes and seconds set to zero.
-  * - ``bucket(x, nbuckets)``
-    - The data is hashed into the specified number of buckets.  The partition
-      value is an integer hash of ``x``, with a value between 0 and
-      ``nbuckets - 1`` inclusive.
-  * - ``truncate(s, nchars)``
-    - The partition value is the first ``nchars`` characters of ``s``.
-
-In this example, the table is partitioned by the month of ``order_date``, a hash of
-``account_number`` (with 10 buckets), and ``country``::
-
-    CREATE TABLE example.testdb.customer_orders (
-        order_id BIGINT,
-        order_date DATE,
-        account_number BIGINT,
-        customer VARCHAR,
-        country VARCHAR)
-    WITH (partitioning = ARRAY['month(order_date)', 'bucket(account_number, 10)', 'country'])
-
-Sorted tables
-"""""""""""""
-
-The connector supports sorted files as a performance improvement. Data is
-sorted during writes within each file based on the specified array of one
-or more columns.
-
-Sorting is particularly beneficial when the sorted columns show a
-high cardinality and are used as a filter for selective reads.
-
-The sort order is configured with the ``sorted_by`` table property.
-Specify an array of one or more columns to use for sorting
-when creating the table. The following example configures the
-``order_date`` column of the ``orders`` table in the ``customers``
-schema in the ``example`` catalog::
-
-    CREATE TABLE example.customers.orders (
-        order_id BIGINT,
-        order_date DATE,
-        account_number BIGINT,
-        customer VARCHAR,
-        country VARCHAR)
-    WITH (sorted_by = ARRAY['order_date'])
-
-Sorting can be combined with partitioning on the same column. For example::
-
-    CREATE TABLE example.customers.orders (
-        order_id BIGINT,
-        order_date DATE,
-        account_number BIGINT,
-        customer VARCHAR,
-        country VARCHAR)
-    WITH (
-        partitioning = ARRAY['month(order_date)'],
-        sorted_by = ARRAY['order_date']
-    )
-
-You can disable sorted writing with the session property
-``sorted_writing_enabled`` set to ``false``.
-
-Using snapshots
-"""""""""""""""
-
-Iceberg supports a "snapshot" model of data, where table snapshots are
-identified by a snapshot ID.
-
-The connector provides a system table exposing snapshot information for every
-Iceberg table. Snapshots are identified by ``BIGINT`` snapshot IDs.
-For example, you can find the snapshot IDs for the ``customer_orders`` table
-by running the following query::
-
-    SELECT snapshot_id
-    FROM example.testdb."customer_orders$snapshots"
-    ORDER BY committed_at DESC
-
-.. _iceberg-time-travel:
-
-Time travel queries
-~~~~~~~~~~~~~~~~~~~
-
-The connector offers the ability to query historical data.
-This allows you to query the table as it was when a previous snapshot
-of the table was taken, even if the data has since been modified or deleted.
-
-The historical data of the table can be retrieved by specifying the
-snapshot identifier corresponding to the version of the table to be retrieved::
-
-   SELECT *
-   FROM example.testdb.customer_orders FOR VERSION AS OF 8954597067493422955
-
-A different approach of retrieving historical data is to specify
-a point in time in the past, such as a day or week ago. The latest snapshot
-of the table taken before or at the specified timestamp in the query is
-internally used for providing the previous state of the table::
-
-   SELECT *
-   FROM example.testdb.customer_orders FOR TIMESTAMP AS OF TIMESTAMP '2022-03-23 09:59:29.803 Europe/Vienna'
-
-Rolling back to a previous snapshot
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Use the ``$snapshots`` metadata table to determine the latest snapshot ID of the table like in the following query::
-
-    SELECT snapshot_id
-    FROM example.testdb."customer_orders$snapshots"
-    ORDER BY committed_at DESC LIMIT 1
-
-The procedure ``system.rollback_to_snapshot`` allows the caller to roll back
-the state of the table to a previous snapshot id::
-
-    CALL example.system.rollback_to_snapshot('testdb', 'customer_orders', 8954597067493422955)
-
-Migrating existing tables
-"""""""""""""""""""""""""
-
-The connector can read from or write to Hive tables that have been migrated to Iceberg.
-There is no Trino support for migrating Hive tables to Iceberg, so you must either use
-the Iceberg API or Apache Spark.
-
-``NOT NULL`` column constraint
-""""""""""""""""""""""""""""""
-
-The Iceberg connector supports setting ``NOT NULL`` constraints on the table columns.
-
-The ``NOT NULL`` constraint can be set on the columns, while creating tables by
-using the :doc:`CREATE TABLE </sql/create-table>` syntax::
-
-    CREATE TABLE example_table (
-        year INTEGER NOT NULL,
-        name VARCHAR NOT NULL,
-        age INTEGER,
-        address VARCHAR
-    );
-
-When trying to insert/update data in the table, the query fails if trying
-to set ``NULL`` value on a column having the ``NOT NULL`` constraint.
-
-View management
-^^^^^^^^^^^^^^^
-
-Trino allows reading from Iceberg materialized views.
-
-.. _iceberg-materialized-views:
-
-Materialized views
-""""""""""""""""""
-
-The Iceberg connector supports :ref:`sql-materialized-view-management`. In the
-underlying system each materialized view consists of a view definition and an
-Iceberg storage table. The storage table name is stored as a materialized view
-property. The data is stored in that storage table.
-
-You can use the :ref:`iceberg-table-properties` to control the created storage
-table and therefore the layout and performance. For example, you can use the
-following clause with :doc:`/sql/create-materialized-view` to use the ORC format
-for the data files and partition the storage per day using the column
-``_date``::
-
-    WITH ( format = 'ORC', partitioning = ARRAY['event_date'] )
-
-By default, the storage table is created in the same schema as the materialized
-view definition. The ``iceberg.materialized-views.storage-schema`` catalog
-configuration property or ``storage_schema`` materialized view property can be
-used to specify the schema where the storage table is created.
-
-Updating the data in the materialized view with
-:doc:`/sql/refresh-materialized-view` deletes the data from the storage table,
-and inserts the data that is the result of executing the materialized view
-query into the existing table. Data is replaced atomically, so users can
-continue to query the materialized view while it is being refreshed.
-Refreshing a materialized view also stores
-the snapshot-ids of all Iceberg tables that are part of the materialized
-view's query in the materialized view metadata. When the materialized
-view is queried, the snapshot-ids are used to check if the data in the storage
-table is up to date. If the data is outdated, the materialized view behaves
-like a normal view, and the data is queried directly from the base tables.
-Detecting outdated data is possible only when the materialized view uses
-Iceberg tables only, or when it uses mix of Iceberg and non-Iceberg tables
-but some Iceberg tables are outdated. When the materialized view is based
-on non-Iceberg tables, querying it can return outdated data, since the connector
-has no information whether the underlying non-Iceberg tables have changed.
-
-Dropping a materialized view with :doc:`/sql/drop-materialized-view` removes
-the definition and the storage table.
-
-Performance
------------
-
-The connector includes a number of performance improvements, detailed in the
-following sections.
-
-Table statistics
-^^^^^^^^^^^^^^^^
-
-The Iceberg connector can collect column statistics using :doc:`/sql/analyze`
-statement. This can be disabled using ``iceberg.extended-statistics.enabled``
-catalog configuration property, or the corresponding
-``extended_statistics_enabled`` session property.
-
-.. _iceberg_analyze:
-
-Updating table statistics
-"""""""""""""""""""""""""
-
-If your queries are complex and include joining large data sets,
-running :doc:`/sql/analyze` on tables may improve query performance
-by collecting statistical information about the data::
-
-    ANALYZE table_name
-
-This query collects statistics for all columns.
-
-On wide tables, collecting statistics for all columns can be expensive.
-It is also typically unnecessary - statistics are
-only useful on specific columns, like join keys, predicates, or grouping keys. You can
-specify a subset of columns to analyzed with the optional ``columns`` property::
-
-    ANALYZE table_name WITH (columns = ARRAY['col_1', 'col_2'])
-
-This query collects statistics for columns ``col_1`` and ``col_2``.
-
-Note that if statistics were previously collected for all columns, they must be dropped
-using :ref:`drop_extended_stats <drop-extended-stats>` command before re-analyzing.
-
-.. _iceberg-table-redirection:
-
-Table redirection
-^^^^^^^^^^^^^^^^^
-
-.. include:: table-redirection.fragment
-
-The connector supports redirection from Iceberg tables to Hive tables
-with the ``iceberg.hive-catalog-name`` catalog configuration property.
-
-File formats
-------------
-
-The following file types and formats are supported for the Iceberg connector:
-
-* ORC
-* Parquet
-
-ORC format configuration
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following properties are used to configure the read and write operations
-with ORC files performed by the Iceberg connector.
-
-.. list-table:: ORC format configuration properties
-  :widths: 30, 58, 12
-  :header-rows: 1
-
-  * - Property name
-    - Description
-    - Default
-  * - ``hive.orc.bloom-filters.enabled``
-    - Enable bloom filters for predicate pushdown.
-    - ``false``
-
-Parquet format configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following properties are used to configure the read and write operations
-with Parquet files performed by the Iceberg connector.
-
-.. list-table:: Parquet format configuration properties
-    :widths: 30, 50, 20
-    :header-rows: 1
-
-    * - Property Name
-      - Description
-      - Default
-    * - ``parquet.max-read-block-row-count``
-      - Sets the maximum number of rows read in a batch.
-      - ``8192``
-    * - ``parquet.optimized-reader.enabled``
-      - Whether batched column readers are used when reading Parquet files
-        for improved performance. Set this property to ``false`` to disable the
-        optimized parquet reader by default. The equivalent catalog session
-        property is ``parquet_optimized_reader_enabled``.
-      - ``true``
-    * - ``parquet.optimized-nested-reader.enabled``
-      - Whether batched column readers are used when reading ARRAY, MAP
-        and ROW types from Parquet files for improved performance. Set this
-        property to ``false`` to disable the optimized parquet reader by default
-        for structural data types. The equivalent catalog session property is
-        ``parquet_optimized_nested_reader_enabled``.
-      - ``true``
diff --git a/docs/src/main/sphinx/connector/ignite.md b/docs/src/main/sphinx/connector/ignite.md
new file mode 100644
index 000000000000..77793bfee44f
--- /dev/null
+++ b/docs/src/main/sphinx/connector/ignite.md
@@ -0,0 +1,216 @@
+---
+myst:
+  substitutions:
+    default_domain_compaction_threshold: '`1000`'
+---
+
+# Ignite connector
+
+```{raw} html
+<img src="../_static/img/ignite.png" class="connector-logo">
+```
+
+The Ignite connector allows querying an [Apache Ignite](https://ignite.apache.org/)
+database from Trino.
+
+## Requirements
+
+To connect to a Ignite server, you need:
+
+- Ignite version 2.9.0 or latter
+- Network access from the Trino coordinator and workers to the Ignite
+  server. Port 10800 is the default port.
+- Specify `--add-opens=java.base/java.nio=ALL-UNNAMED` in the `jvm.config` when starting the Trino server.
+
+## Configuration
+
+The Ignite connector expose `public` schema by default.
+
+The connector can query a Ignite instance. Create a catalog properties file
+that specifies the Ignite connector by setting the `connector.name` to
+`ignite`.
+
+For example, to access an instance as `example`, create the file
+`etc/catalog/example.properties`. Replace the connection properties as
+appropriate for your setup:
+
+```text
+connector.name=ignite
+connection-url=jdbc:ignite:thin://host1:10800/
+connection-user=exampleuser
+connection-password=examplepassword
+```
+
+The `connection-url` defines the connection information and parameters to pass
+to the Ignite JDBC driver. The parameters for the URL are available in the
+[Ignite JDBC driver documentation](https://ignite.apache.org/docs/latest/SQL/JDBC/jdbc-driver).
+Some parameters can have adverse effects on the connector behavior or not work
+with the connector.
+
+The `connection-user` and `connection-password` are typically required and
+determine the user credentials for the connection, often a service user. You can
+use {doc}`secrets </security/secrets>` to avoid actual values in the catalog
+properties files.
+
+### Multiple Ignite servers
+
+If you have multiple Ignite servers you need to configure one
+catalog for each server. To add another catalog:
+
+- Add another properties file to `etc/catalog`
+- Save it with a different name that ends in `.properties`
+
+For example, if you name the property file `sales.properties`, Trino uses the
+configured connector to create a catalog named `sales`.
+
+```{include} jdbc-common-configurations.fragment
+```
+
+```{include} query-comment-format.fragment
+```
+
+```{include} jdbc-domain-compaction-threshold.fragment
+```
+
+```{include} jdbc-procedures.fragment
+```
+
+```{include} jdbc-case-insensitive-matching.fragment
+```
+
+```{include} non-transactional-insert.fragment
+```
+
+## Table properties
+
+Table property usage example:
+
+```
+CREATE TABLE public.person (
+  id BIGINT NOT NULL,
+  birthday DATE NOT NULL,
+  name VARCHAR(26),
+  age BIGINT,
+  logdate DATE
+)
+WITH (
+  primary_key = ARRAY['id', 'birthday']
+);
+```
+
+The following are supported Ignite table properties from [https://ignite.apache.org/docs/latest/sql-reference/ddl](https://ignite.apache.org/docs/latest/sql-reference/ddl)
+
+```{eval-rst}
+.. list-table::
+    :widths: 30, 10, 100
+    :header-rows: 1
+
+    * - Property name
+      - Required
+      - Description
+    * - ``primary_key``
+      - No
+      - ``The primary key of the table, can chose multi columns as the table primary key. Table at least contains one column not in primary key.``
+```
+
+### `primary_key`
+
+This is a list of columns to be used as the table's primary key. If not specified, a `VARCHAR` primary key column named `DUMMY_ID` is generated,
+the value is derived from the value generated by the `UUID` function in Ignite.
+
+(ignite-type-mapping)=
+
+## Type mapping
+
+The following are supported Ignite SQL data types from [https://ignite.apache.org/docs/latest/sql-reference/data-types](https://ignite.apache.org/docs/latest/sql-reference/data-types)
+
+````{eval-rst}
+.. list-table::
+    :widths: 30, 30, 20
+    :header-rows: 1
+
+    * - Ignite SQL data type name
+      - Map to Trino type
+      - Possible values
+    * - ``BOOLEAN``
+      - ``BOOLEAN``
+      - ``TRUE`` and ``FALSE``
+    * - ``BIGINT``
+      - ``BIGINT``
+      - ``-9223372036854775808``, ``9223372036854775807``, etc.
+    * - ``DECIMAL``
+      - ``DECIMAL``
+      - Data type with fixed precision and scale
+    * - ``DOUBLE``
+      - ``DOUBLE``
+      - ``3.14``, ``-10.24``, etc.
+    * - ``INT``
+      - ``INT``
+      - ``-2147483648``, ``2147483647``, etc.
+    * - ``REAL``
+      - ``REAL```
+      - ``3.14``, ``-10.24``, etc.
+    * - ``SMALLINT``
+      - ``SMALLINT``
+      - ``-32768``, ``32767``, etc.
+    * - ``TINYINT``
+      - ``TINYINT``
+      - ``-128``, ``127``, etc.
+    * - ``CHAR``
+      - ``CHAR``
+      - ``hello``, ``Trino``, etc.
+    * - ``VARCHAR``
+      - ``VARCHAR``
+      - ``hello``, ``Trino``, etc.
+    * - ``DATE``
+      - ``DATE``
+      - ``1972-01-01``, ``2021-07-15``, etc.
+    * - ``BINARY``
+      - ``VARBINARY``
+      - Represents a byte array.
+````
+
+(ignite-sql-support)=
+
+## SQL support
+
+The connector provides read access and write access to data and metadata in
+Ignite.  In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/update`
+- {doc}`/sql/delete`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/alter-table`
+
+```{include} sql-update-limitation.fragment
+```
+
+```{include} alter-table-limitation.fragment
+```
+
+(ignite-pushdown)=
+
+### Pushdown
+
+The connector supports pushdown for a number of operations:
+
+- {ref}`join-pushdown`
+- {ref}`limit-pushdown`
+- {ref}`topn-pushdown`
+
+{ref}`Aggregate pushdown <aggregation-pushdown>` for the following functions:
+
+- {func}`avg`
+- {func}`count`
+- {func}`max`
+- {func}`min`
+- {func}`sum`
+
+
+```{include} no-pushdown-text-type.fragment
+```
diff --git a/docs/src/main/sphinx/connector/ignite.rst b/docs/src/main/sphinx/connector/ignite.rst
deleted file mode 100644
index 873311517f17..000000000000
--- a/docs/src/main/sphinx/connector/ignite.rst
+++ /dev/null
@@ -1,201 +0,0 @@
-================
-Ignite connector
-================
-
-.. raw:: html
-
-  <img src="../_static/img/ignite.png" class="connector-logo">
-
-The Ignite connector allows querying an `Apache Ignite <https://ignite.apache.org/>`_
-database from Trino.
-
-Requirements
-------------
-
-To connect to a Ignite server, you need:
-
-* Ignite version 2.8.0 or latter
-* Network access from the Trino coordinator and workers to the Ignite
-  server. Port 10800 is the default port.
-* Specify ``--add-opens=java.base/java.nio=ALL-UNNAMED`` in the ``jvm.config`` when starting the Trino server.
-
-Configuration
--------------
-
-The Ignite connector expose ``public`` schema by default.
-
-The connector can query a Ignite instance. Create a catalog properties file
-that specifies the Ignite connector by setting the ``connector.name`` to
-``ignite``.
-
-For example, to access an instance as ``example``, create the file
-``etc/catalog/example.properties``. Replace the connection properties as
-appropriate for your setup:
-
-.. code-block:: text
-
-    connector.name=ignite
-    connection-url=jdbc:ignite:thin://host1:10800/
-    connection-user=exampleuser
-    connection-password=examplepassword
-
-The ``connection-url`` defines the connection information and parameters to pass
-to the Ignite JDBC driver. The parameters for the URL are available in the
-`Ignite JDBC driver documentation
-<https://ignite.apache.org/docs/latest/SQL/JDBC/jdbc-driver>`__.
-Some parameters can have adverse effects on the connector behavior or not work
-with the connector.
-
-The ``connection-user`` and ``connection-password`` are typically required and
-determine the user credentials for the connection, often a service user. You can
-use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
-properties files.
-
-Multiple Ignite servers
-^^^^^^^^^^^^^^^^^^^^^^^
-
-If you have multiple Ignite servers you need to configure one
-catalog for each server. To add another catalog:
-
-* Add another properties file to ``etc/catalog``
-* Save it with a different name that ends in ``.properties``
-
-For example, if you name the property file ``sales.properties``, Trino uses the
-configured connector to create a catalog named ``sales``.
-
-.. include:: jdbc-common-configurations.fragment
-
-.. |default_domain_compaction_threshold| replace:: ``1000``
-.. include:: jdbc-domain-compaction-threshold.fragment
-
-.. include:: jdbc-procedures.fragment
-
-.. include:: jdbc-case-insensitive-matching.fragment
-
-.. include:: non-transactional-insert.fragment
-
-Table properties
-----------------
-
-Table property usage example::
-
-    CREATE TABLE public.person (
-      id bigint NOT NULL,
-      birthday DATE NOT NULL,
-      name VARCHAR(26),
-      age BIGINT,
-      logdate DATE
-    )
-    WITH (
-      primary_key = ARRAY['id', 'birthday']
-    );
-
-The following are supported Ignite table properties from `<https://ignite.apache.org/docs/latest/sql-reference/ddl>`_
-
-.. list-table::
-    :widths: 30, 10, 100
-    :header-rows: 1
-
-    * - Property name
-      - Required
-      - Description
-    * - ``primary_key``
-      - No
-      - ``The primary key of the table, can chose multi columns as the table primary key. Table at least contains one column not in primary key.``
-
-``primary_key``
-^^^^^^^^^^^^^^^
-
-This is a list of columns to be used as the table's primary key. If not specified, a ``VARCHAR`` primary key column named ``DUMMY_ID`` is generated,
-the value is derived from the value generated by the ``UUID`` function in Ignite.
-
-.. _ignite-type-mapping:
-
-Type mapping
-------------
-
-The following are supported Ignite SQL data types from `<https://ignite.apache.org/docs/latest/sql-reference/data-types>`_
-
-.. list-table::
-    :widths: 30, 30, 20
-    :header-rows: 1
-
-    * - Ignite SQL data type name
-      - Map to Trino type
-      - Possible values
-    * - ``BOOLEAN``
-      - ``BOOLEAN``
-      - ``TRUE`` and ``FALSE``
-    * - ``BIGINT``
-      - ``BIGINT``
-      - ``-9223372036854775808``, ``9223372036854775807``, etc.
-    * - ``DECIMAL``
-      - ``DECIMAL``
-      - Data type with fixed precision and scale
-    * - ``DOUBLE``
-      - ``DOUBLE``
-      - ``3.14``, ``-10.24``, etc.
-    * - ``INT``
-      - ``INT``
-      - ``-2147483648``, ``2147483647``, etc.
-    * - ``REAL``
-      - ``REAL```
-      - ``3.14``, ``-10.24``, etc.
-    * - ``SMALLINT``
-      - ``SMALLINT``
-      - ``-32768``, ``32767``, etc.
-    * - ``TINYINT``
-      - ``TINYINT``
-      - ``-128``, ``127``, etc.
-    * - ``CHAR``
-      - ``CHAR``
-      - ``hello``, ``Trino``, etc.
-    * - ``VARCHAR``
-      - ``VARCHAR``
-      - ``hello``, ``Trino``, etc.
-    * - ``DATE``
-      - ``DATE``
-      - ``1972-01-01``, ``2021-07-15``, etc.
-    * - ``BINARY``
-      - ``VARBINARY``
-      - Represents a byte array.
-
-.. _ignite-sql-support:
-
-SQL support
------------
-
-The connector provides read access and write access to data and metadata in
-Ignite.  In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/delete`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/alter-table`
-
-.. include:: alter-table-limitation.fragment
-
-.. _ignite-pushdown:
-
-Pushdown
-^^^^^^^^
-
-The connector supports pushdown for a number of operations:
-
-* :ref:`join-pushdown`
-* :ref:`limit-pushdown`
-* :ref:`topn-pushdown`
-
-:ref:`Aggregate pushdown <aggregation-pushdown>` for the following functions:
-
-* :func:`avg`
-* :func:`count`
-* :func:`max`
-* :func:`min`
-* :func:`sum`
-
-.. include:: no-pushdown-text-type.fragment
diff --git a/docs/src/main/sphinx/connector/jdbc-authentication.fragment b/docs/src/main/sphinx/connector/jdbc-authentication.fragment
index 50e17f91433e..33f570348e03 100644
--- a/docs/src/main/sphinx/connector/jdbc-authentication.fragment
+++ b/docs/src/main/sphinx/connector/jdbc-authentication.fragment
@@ -1,53 +1,54 @@
-Data source authentication
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+### Data source authentication
 
 The connector can provide credentials for the data source connection
 in multiple ways:
 
-* inline, in the connector configuration file
-* in a separate properties file
-* in a key store file
-* as extra credentials set when connecting to Trino
+- inline, in the connector configuration file
+- in a separate properties file
+- in a key store file
+- as extra credentials set when connecting to Trino
 
-You can use :doc:`secrets </security/secrets>` to avoid storing sensitive
+You can use {doc}`secrets </security/secrets>` to avoid storing sensitive
 values in the catalog properties files.
 
 The following table describes configuration properties
 for connection credentials:
 
-.. list-table::
-  :widths: 40, 60
-  :header-rows: 1
+:::{list-table}
+:widths: 40, 60
+:header-rows: 1
 
-  * - Property name
-    - Description
-  * - ``credential-provider.type``
-    - Type of the credential provider. Must be one of ``INLINE``, ``FILE``, or
-      ``KEYSTORE``; defaults to ``INLINE``.
-  * - ``connection-user``
-    - Connection user name.
-  * - ``connection-password``
-    - Connection password.
-  * - ``user-credential-name``
-    - Name of the extra credentials property, whose value to use as the user
-      name. See ``extraCredentials`` in :ref:`jdbc-parameter-reference`.
-  * - ``password-credential-name``
-    - Name of the extra credentials property, whose value to use as the
-      password.
-  * - ``connection-credential-file``
-    - Location of the properties file where credentials are present. It must
-      contain the ``connection-user`` and ``connection-password`` properties.
-  * - ``keystore-file-path``
-    - The location of the Java Keystore file, from which to read credentials.
-  * - ``keystore-type``
-    - File format of the keystore file, for example ``JKS`` or ``PEM``.
-  * - ``keystore-password``
-    - Password for the key store.
-  * - ``keystore-user-credential-name``
-    - Name of the key store entity to use as the user name.
-  * - ``keystore-user-credential-password``
-    - Password for the user name key store entity.
-  * - ``keystore-password-credential-name``
-    - Name of the key store entity to use as the password.
-  * - ``keystore-password-credential-password``
-    - Password for the password key store entity.
+* - Property name
+  - Description
+* - ``credential-provider.type``
+  - Type of the credential provider. Must be one of ``INLINE``, ``FILE``, or
+    ``KEYSTORE``; defaults to ``INLINE``.
+* - ``connection-user``
+  - Connection user name.
+* - ``connection-password``
+  - Connection password.
+* - ``user-credential-name``
+  - Name of the extra credentials property, whose value to use as the user
+    name. See ``extraCredentials`` in [Parameter
+    reference](jdbc-parameter-reference).
+* - ``password-credential-name``
+  - Name of the extra credentials property, whose value to use as the
+    password.
+* - ``connection-credential-file``
+  - Location of the properties file where credentials are present. It must
+    contain the ``connection-user`` and ``connection-password`` properties.
+* - ``keystore-file-path``
+  - The location of the Java Keystore file, from which to read credentials.
+* - ``keystore-type``
+  - File format of the keystore file, for example ``JKS`` or ``PEM``.
+* - ``keystore-password``
+  - Password for the key store.
+* - ``keystore-user-credential-name``
+  - Name of the key store entity to use as the user name.
+* - ``keystore-user-credential-password``
+  - Password for the user name key store entity.
+* - ``keystore-password-credential-name``
+  - Name of the key store entity to use as the password.
+* - ``keystore-password-credential-password``
+  - Password for the password key store entity.
+:::
diff --git a/docs/src/main/sphinx/connector/jdbc-case-insensitive-matching.fragment b/docs/src/main/sphinx/connector/jdbc-case-insensitive-matching.fragment
index 9007821aaa59..a51cef34d69b 100644
--- a/docs/src/main/sphinx/connector/jdbc-case-insensitive-matching.fragment
+++ b/docs/src/main/sphinx/connector/jdbc-case-insensitive-matching.fragment
@@ -1,56 +1,55 @@
-Case insensitive matching
-"""""""""""""""""""""""""
+### Case insensitive matching
 
-When ``case-insensitive-name-matching`` is set to ``true``, Trino
+When `case-insensitive-name-matching` is set to `true`, Trino
 is able to query non-lowercase schemas and tables by maintaining a mapping of
 the lowercase name to the actual name in the remote system. However, if two
 schemas and/or tables have names that differ only in case (such as "customers"
 and "Customers") then Trino fails to query them due to ambiguity.
 
-In these cases, use the ``case-insensitive-name-matching.config-file`` catalog
+In these cases, use the `case-insensitive-name-matching.config-file` catalog
 configuration property to specify a configuration file that maps these remote
 schemas/tables to their respective Trino schemas/tables:
 
-.. code-block:: json
-
-  {
-    "schemas": [
-      {
-        "remoteSchema": "CaseSensitiveName",
-        "mapping": "case_insensitive_1"
-      },
-      {
-        "remoteSchema": "cASEsENSITIVEnAME",
-        "mapping": "case_insensitive_2"
-      }],
-    "tables": [
-      {
-        "remoteSchema": "CaseSensitiveName",
-        "remoteTable": "tablex",
-        "mapping": "table_1"
-      },
-      {
-        "remoteSchema": "CaseSensitiveName",
-        "remoteTable": "TABLEX",
-        "mapping": "table_2"
-      }]
-  }
-
-Queries against one of the tables or schemes defined in the ``mapping``
+```json
+{
+  "schemas": [
+    {
+      "remoteSchema": "CaseSensitiveName",
+      "mapping": "case_insensitive_1"
+    },
+    {
+      "remoteSchema": "cASEsENSITIVEnAME",
+      "mapping": "case_insensitive_2"
+    }],
+  "tables": [
+    {
+      "remoteSchema": "CaseSensitiveName",
+      "remoteTable": "tablex",
+      "mapping": "table_1"
+    },
+    {
+      "remoteSchema": "CaseSensitiveName",
+      "remoteTable": "TABLEX",
+      "mapping": "table_2"
+    }]
+}
+```
+
+Queries against one of the tables or schemes defined in the `mapping`
 attributes are run against the corresponding remote entity. For example, a query
-against tables in the ``case_insensitive_1`` schema is forwarded to the
-CaseSensitiveName schema and a query against ``case_insensitive_2`` is forwarded
-to the ``cASEsENSITIVEnAME`` schema.
+against tables in the `case_insensitive_1` schema is forwarded to the
+CaseSensitiveName schema and a query against `case_insensitive_2` is forwarded
+to the `cASEsENSITIVEnAME` schema.
 
-At the table mapping level, a query on ``case_insensitive_1.table_1`` as
-configured above is forwarded to ``CaseSensitiveName.tablex``, and a query on
-``case_insensitive_1.table_2`` is forwarded to ``CaseSensitiveName.TABLEX``.
+At the table mapping level, a query on `case_insensitive_1.table_1` as
+configured above is forwarded to `CaseSensitiveName.tablex`, and a query on
+`case_insensitive_1.table_2` is forwarded to `CaseSensitiveName.TABLEX`.
 
 By default, when a change is made to the mapping configuration file, Trino must
 be restarted to load the changes. Optionally, you can set the
-``case-insensitive-name-mapping.refresh-period`` to have Trino refresh the
+`case-insensitive-name-mapping.refresh-period` to have Trino refresh the
 properties without requiring a restart:
 
-.. code-block:: properties
-
-  case-insensitive-name-mapping.refresh-period=30s
+```properties
+case-insensitive-name-mapping.refresh-period=30s
+```
diff --git a/docs/src/main/sphinx/connector/jdbc-common-configurations.fragment b/docs/src/main/sphinx/connector/jdbc-common-configurations.fragment
index 70ac91fb414a..9846f44595e0 100644
--- a/docs/src/main/sphinx/connector/jdbc-common-configurations.fragment
+++ b/docs/src/main/sphinx/connector/jdbc-common-configurations.fragment
@@ -1,9 +1,9 @@
-General configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+### General configuration properties
 
 The following table describes general catalog configuration properties for the
 connector:
 
+```{eval-rst}
 .. list-table::
   :widths: 30, 40, 30
   :header-rows: 1
@@ -51,3 +51,4 @@ connector:
       JDBC query. Using a large timeout can potentially result in more detailed
       dynamic filters. However, it can also increase latency for some queries.
     - ``20s``
+```
diff --git a/docs/src/main/sphinx/connector/jdbc-domain-compaction-threshold.fragment b/docs/src/main/sphinx/connector/jdbc-domain-compaction-threshold.fragment
index 73b077f45836..919468c1e036 100644
--- a/docs/src/main/sphinx/connector/jdbc-domain-compaction-threshold.fragment
+++ b/docs/src/main/sphinx/connector/jdbc-domain-compaction-threshold.fragment
@@ -1,5 +1,4 @@
-Domain compaction threshold
-"""""""""""""""""""""""""""
+### Domain compaction threshold
 
 Pushing down a large list of predicates to the data source can compromise
 performance. Trino compacts large predicates into a simpler range predicate
@@ -7,8 +6,8 @@ by default to ensure a balance between performance and predicate pushdown.
 If necessary, the threshold for this compaction can be increased to improve
 performance when the data source is capable of taking advantage of large
 predicates. Increasing this threshold may improve pushdown of large
-:doc:`dynamic filters </admin/dynamic-filtering>`.
-The ``domain-compaction-threshold`` catalog configuration property or the
-``domain_compaction_threshold`` :ref:`catalog session property
+{doc}`dynamic filters </admin/dynamic-filtering>`.
+The `domain-compaction-threshold` catalog configuration property or the
+`domain_compaction_threshold` {ref}`catalog session property
 <session-properties-definition>` can be used to adjust the default value of
-|default_domain_compaction_threshold| for this threshold.
+{{default_domain_compaction_threshold}} for this threshold.
diff --git a/docs/src/main/sphinx/connector/jdbc-procedures.fragment b/docs/src/main/sphinx/connector/jdbc-procedures.fragment
index d1f50b8a1c81..e2e4f5262de0 100644
--- a/docs/src/main/sphinx/connector/jdbc-procedures.fragment
+++ b/docs/src/main/sphinx/connector/jdbc-procedures.fragment
@@ -1,12 +1,11 @@
-Procedures
-^^^^^^^^^^
+### Procedures
 
-* ``system.flush_metadata_cache()``
+- `system.flush_metadata_cache()`
 
   Flush JDBC metadata caches. For example, the following system call
-  flushes the metadata caches for all schemas in the ``example`` catalog
+  flushes the metadata caches for all schemas in the `example` catalog
 
-  .. code-block:: sql
-
-      USE example.example_schema;
-      CALL system.flush_metadata_cache();
+  ```sql
+  USE example.example_schema;
+  CALL system.flush_metadata_cache();
+  ```
diff --git a/docs/src/main/sphinx/connector/jdbc-type-mapping.fragment b/docs/src/main/sphinx/connector/jdbc-type-mapping.fragment
index fbbd7209bc4d..7ed0fd0a0bf8 100644
--- a/docs/src/main/sphinx/connector/jdbc-type-mapping.fragment
+++ b/docs/src/main/sphinx/connector/jdbc-type-mapping.fragment
@@ -1,26 +1,26 @@
-Type mapping configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+### Type mapping configuration properties
 
 The following properties can be used to configure how data types from the
 connected data source are mapped to Trino data types and how the metadata is
 cached in Trino.
 
-.. list-table::
-  :widths: 30, 40, 30
-  :header-rows: 1
+:::{list-table}
+:widths: 30, 40, 30
+:header-rows: 1
 
-  * - Property name
-    - Description
-    - Default value
-  * - ``unsupported-type-handling``
-    - Configure how unsupported column data types are handled:
+* - Property name
+  - Description
+  - Default value
+* - ``unsupported-type-handling``
+  - Configure how unsupported column data types are handled:
 
-      * ``IGNORE``, column is not accessible.
-      * ``CONVERT_TO_VARCHAR``, column is converted to unbounded ``VARCHAR``.
+    * ``IGNORE``, column is not accessible.
+    * ``CONVERT_TO_VARCHAR``, column is converted to unbounded ``VARCHAR``.
 
-      The respective catalog session property is ``unsupported_type_handling``.
-    - ``IGNORE``
-  * - ``jdbc-types-mapped-to-varchar``
-    - Allow forced mapping of comma separated lists of data types to convert to
+    The respective catalog session property is ``unsupported_type_handling``.
+  - ``IGNORE``
+* - ``jdbc-types-mapped-to-varchar``
+  - Allow forced mapping of comma separated lists of data types to convert to
       unbounded ``VARCHAR``
-    -
+  -
+:::
diff --git a/docs/src/main/sphinx/connector/jmx.md b/docs/src/main/sphinx/connector/jmx.md
new file mode 100644
index 000000000000..ab6cf6e83baf
--- /dev/null
+++ b/docs/src/main/sphinx/connector/jmx.md
@@ -0,0 +1,137 @@
+# JMX connector
+
+The JMX connector provides the ability to query Java Management Extensions (JMX)
+information from all
+nodes in a Trino cluster. This is very useful for monitoring or debugging.
+JMX provides information about the Java
+Virtual Machine and all of the software running inside it. Trino itself
+is heavily instrumented via JMX.
+
+This connector can be configured so that chosen JMX information is
+periodically dumped and stored in memory for later access.
+
+## Configuration
+
+To configure the JMX connector, create a catalog properties file
+`etc/catalog/example.properties` with the following contents:
+
+```text
+connector.name=jmx
+```
+
+To enable periodical dumps, define the following properties:
+
+```text
+connector.name=jmx
+jmx.dump-tables=java.lang:type=Runtime,trino.execution.scheduler:name=NodeScheduler
+jmx.dump-period=10s
+jmx.max-entries=86400
+```
+
+`dump-tables` is a comma separated list of Managed Beans (MBean). It specifies
+which MBeans are sampled and stored in memory every `dump-period`. You can
+configure the maximum number of history entries with `max-entries` and it
+defaults to `86400`. The time between dumps can be configured using
+`dump-period` and it defaults to `10s`.
+
+Commas in MBean names must be escaped using double backslashes (`\\`) in the
+following manner:
+
+```text
+connector.name=jmx
+jmx.dump-tables=trino.memory:name=general\\,type=memorypool,trino.memory:name=reserved\\,type=memorypool
+```
+
+Double backslashes are required because a single backslash (`\`) is used to
+split the value across multiple lines in the following manner:
+
+```text
+connector.name=jmx
+jmx.dump-tables=trino.memory:name=general\\,type=memorypool,\
+    trino.memory:name=reserved\\,type=memorypool
+```
+
+## Querying JMX
+
+The JMX connector provides two schemas.
+
+The first one is `current` that contains every MBean from every node in the Trino
+cluster. You can see all of the available MBeans by running `SHOW TABLES`:
+
+```
+SHOW TABLES FROM example.current;
+```
+
+MBean names map to non-standard table names, and must be quoted with
+double quotes when referencing them in a query. For example, the
+following query shows the JVM version of every node:
+
+```
+SELECT node, vmname, vmversion
+FROM example.current."java.lang:type=runtime";
+```
+
+```text
+                 node                 |              vmname               | vmversion
+--------------------------------------+-----------------------------------+-----------
+ ddc4df17-0b8e-4843-bb14-1b8af1a7451a | Java HotSpot(TM) 64-Bit Server VM | 24.60-b09
+(1 row)
+```
+
+The following query shows the open and maximum file descriptor counts
+for each node:
+
+```
+SELECT openfiledescriptorcount, maxfiledescriptorcount
+FROM example.current."java.lang:type=operatingsystem";
+```
+
+```text
+ openfiledescriptorcount | maxfiledescriptorcount
+-------------------------+------------------------
+                     329 |                  10240
+(1 row)
+```
+
+The wildcard character `*` may be used with table names in the `current` schema.
+This allows matching several MBean objects within a single query. The following query
+returns information from the different Trino memory pools on each node:
+
+```
+SELECT freebytes, node, object_name
+FROM example.current."trino.memory:*type=memorypool*";
+```
+
+```text
+ freebytes  |  node   |                       object_name
+------------+---------+----------------------------------------------------------
+  214748364 | example | trino.memory:type=MemoryPool,name=reserved
+ 1073741825 | example | trino.memory:type=MemoryPool,name=general
+  858993459 | example | trino.memory:type=MemoryPool,name=system
+(3 rows)
+```
+
+The `history` schema contains the list of tables configured in the connector properties file.
+The tables have the same columns as those in the current schema, but with an additional
+timestamp column that stores the time at which the snapshot was taken:
+
+```
+SELECT "timestamp", "uptime" FROM example.history."java.lang:type=runtime";
+```
+
+```text
+        timestamp        | uptime
+-------------------------+--------
+ 2016-01-28 10:18:50.000 |  11420
+ 2016-01-28 10:19:00.000 |  21422
+ 2016-01-28 10:19:10.000 |  31412
+(3 rows)
+```
+
+(jmx-sql-support)=
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements to access JMX information
+on your Trino nodes.
diff --git a/docs/src/main/sphinx/connector/jmx.rst b/docs/src/main/sphinx/connector/jmx.rst
deleted file mode 100644
index 780d7810ec29..000000000000
--- a/docs/src/main/sphinx/connector/jmx.rst
+++ /dev/null
@@ -1,132 +0,0 @@
-=============
-JMX connector
-=============
-
-The JMX connector provides the ability to query Java Management Extensions (JMX)
-information from all
-nodes in a Trino cluster. This is very useful for monitoring or debugging.
-JMX provides information about the Java
-Virtual Machine and all of the software running inside it. Trino itself
-is heavily instrumented via JMX.
-
-This connector can be configured so that chosen JMX information is
-periodically dumped and stored in memory for later access.
-
-Configuration
--------------
-
-To configure the JMX connector, create a catalog properties file
-``etc/catalog/example.properties`` with the following contents:
-
-.. code-block:: text
-
-    connector.name=jmx
-
-To enable periodical dumps, define the following properties:
-
-.. code-block:: text
-
-    connector.name=jmx
-    jmx.dump-tables=java.lang:type=Runtime,trino.execution.scheduler:name=NodeScheduler
-    jmx.dump-period=10s
-    jmx.max-entries=86400
-
-``dump-tables`` is a comma separated list of Managed Beans (MBean). It specifies
-which MBeans are sampled and stored in memory every ``dump-period``. You can
-configure the maximum number of history entries with ``max-entries`` and it
-defaults to ``86400``. The time between dumps can be configured using
-``dump-period`` and it defaults to ``10s``.
-
-Commas in MBean names must be escaped using double backslashes (``\\``) in the
-following manner:
-
-.. code-block:: text
-
-    connector.name=jmx
-    jmx.dump-tables=trino.memory:name=general\\,type=memorypool,trino.memory:name=reserved\\,type=memorypool
-
-Double backslashes are required because a single backslash (``\``) is used to
-split the value across multiple lines in the following manner:
-
-.. code-block:: text
-
-    connector.name=jmx
-    jmx.dump-tables=trino.memory:name=general\\,type=memorypool,\
-        trino.memory:name=reserved\\,type=memorypool
-
-Querying JMX
-------------
-
-The JMX connector provides two schemas.
-
-The first one is ``current`` that contains every MBean from every node in the Trino
-cluster. You can see all of the available MBeans by running ``SHOW TABLES``::
-
-    SHOW TABLES FROM example.current;
-
-MBean names map to non-standard table names, and must be quoted with
-double quotes when referencing them in a query. For example, the
-following query shows the JVM version of every node::
-
-    SELECT node, vmname, vmversion
-    FROM example.current."java.lang:type=runtime";
-
-.. code-block:: text
-
-                     node                 |              vmname               | vmversion
-    --------------------------------------+-----------------------------------+-----------
-     ddc4df17-0b8e-4843-bb14-1b8af1a7451a | Java HotSpot(TM) 64-Bit Server VM | 24.60-b09
-    (1 row)
-
-The following query shows the open and maximum file descriptor counts
-for each node::
-
-    SELECT openfiledescriptorcount, maxfiledescriptorcount
-    FROM example.current."java.lang:type=operatingsystem";
-
-.. code-block:: text
-
-     openfiledescriptorcount | maxfiledescriptorcount
-    -------------------------+------------------------
-                         329 |                  10240
-    (1 row)
-
-The wildcard character ``*`` may be used with table names in the ``current`` schema.
-This allows matching several MBean objects within a single query. The following query
-returns information from the different Trino memory pools on each node::
-
-    SELECT freebytes, node, object_name
-    FROM example.current."trino.memory:*type=memorypool*";
-
-.. code-block:: text
-
-     freebytes  |  node   |                       object_name
-    ------------+---------+----------------------------------------------------------
-      214748364 | example | trino.memory:type=MemoryPool,name=reserved
-     1073741825 | example | trino.memory:type=MemoryPool,name=general
-      858993459 | example | trino.memory:type=MemoryPool,name=system
-    (3 rows)
-
-The ``history`` schema contains the list of tables configured in the connector properties file.
-The tables have the same columns as those in the current schema, but with an additional
-timestamp column that stores the time at which the snapshot was taken::
-
-    SELECT "timestamp", "uptime" FROM example.history."java.lang:type=runtime";
-
-.. code-block:: text
-
-            timestamp        | uptime
-    -------------------------+--------
-     2016-01-28 10:18:50.000 |  11420
-     2016-01-28 10:19:00.000 |  21422
-     2016-01-28 10:19:10.000 |  31412
-    (3 rows)
-
-.. _jmx-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access JMX information
-on your Trino nodes.
diff --git a/docs/src/main/sphinx/connector/join-pushdown-enabled-false.fragment b/docs/src/main/sphinx/connector/join-pushdown-enabled-false.fragment
index b13e18ba3e6a..a7f849cf1288 100644
--- a/docs/src/main/sphinx/connector/join-pushdown-enabled-false.fragment
+++ b/docs/src/main/sphinx/connector/join-pushdown-enabled-false.fragment
@@ -1,8 +1,7 @@
-Join pushdown
-"""""""""""""
+#### Join pushdown
 
-The ``join-pushdown.enabled`` catalog configuration property or
-``join_pushdown_enabled`` :ref:`catalog session property
+The `join-pushdown.enabled` catalog configuration property or
+`join_pushdown_enabled` {ref}`catalog session property
 <session-properties-definition>` control whether the connector pushes
-down join operations. The property defaults to ``false``, and enabling join
+down join operations. The property defaults to `false`, and enabling join
 pushdowns may negatively impact performance for some queries.
diff --git a/docs/src/main/sphinx/connector/join-pushdown-enabled-true.fragment b/docs/src/main/sphinx/connector/join-pushdown-enabled-true.fragment
index 637a5c065dfd..abc68ba054b1 100644
--- a/docs/src/main/sphinx/connector/join-pushdown-enabled-true.fragment
+++ b/docs/src/main/sphinx/connector/join-pushdown-enabled-true.fragment
@@ -1,11 +1,10 @@
-Cost-based join pushdown
-""""""""""""""""""""""""
+#### Cost-based join pushdown
 
-The connector supports cost-based :ref:`join-pushdown` to make intelligent
+The connector supports cost-based {ref}`join-pushdown` to make intelligent
 decisions about whether to push down a join operation to the data source.
 
 When cost-based join pushdown is enabled, the connector only pushes down join
-operations if the available :doc:`/optimizer/statistics` suggest that doing so
+operations if the available {doc}`/optimizer/statistics` suggest that doing so
 improves performance. Note that if no table statistics are available, join
 operation pushdown does not occur to avoid a potential decrease in query
 performance.
@@ -13,6 +12,7 @@ performance.
 The following table describes catalog configuration properties for
 join pushdown:
 
+```{eval-rst}
 .. list-table::
   :widths: 30, 40, 30
   :header-rows: 1
@@ -33,3 +33,4 @@ join pushdown:
       query performance. Because of this, ``EAGER`` is only recommended for
       testing and troubleshooting purposes.
     - ``AUTOMATIC``
+```
diff --git a/docs/src/main/sphinx/connector/json-decoder.fragment b/docs/src/main/sphinx/connector/json-decoder.fragment
new file mode 100644
index 000000000000..197be96f200d
--- /dev/null
+++ b/docs/src/main/sphinx/connector/json-decoder.fragment
@@ -0,0 +1,75 @@
+#### JSON decoder
+
+The JSON decoder converts the bytes representing a message or key into
+Javascript Object Notaion (JSON) according to {rfc}`4627`. The message or key
+must convert into a JSON object, not an array or simple type.
+
+For fields, the following attributes are supported:
+
+- `type` - Trino data type of column.
+- `dataFormat` - Field decoder to be used for column.
+- `mapping` - Slash-separated list of field names to select a field from the
+  JSON object.
+- `formatHint` - Only for `custom-date-time`.
+
+The JSON decoder supports multiple field decoders with `_default` being used
+for standard table columns and a number of decoders for date and time-based
+types.
+
+The following table lists Trino data types, which can be used in `type` and
+matching field decoders, and specified via `dataFormat` attribute:
+
+```{eval-rst}
+.. list-table::
+  :widths: 40, 60
+  :header-rows: 1
+
+  * - Trino data type
+    - Allowed ``dataFormat`` values
+  * - ``BIGINT``, ``INTEGER``, ``SMALLINT``, ``TINYINT``, ``DOUBLE``,
+      ``BOOLEAN``, ``VARCHAR``, ``VARCHAR(x)``
+    - Default field decoder (omitted ``dataFormat`` attribute)
+  * - ``DATE``
+    - ``custom-date-time``, ``iso8601``
+  * - ``TIME``
+    - ``custom-date-time``, ``iso8601``, ``milliseconds-since-epoch``,
+      ``seconds-since-epoch``
+  * - ``TIME WITH TIME ZONE``
+    - ``custom-date-time``, ``iso8601``
+  * - ``TIMESTAMP``
+    - ``custom-date-time``, ``iso8601``, ``rfc2822``,
+      ``milliseconds-since-epoch``, ``seconds-since-epoch``
+  * - ``TIMESTAMP WITH TIME ZONE``
+    - ``custom-date-time``, ``iso8601``, ``rfc2822``,
+      ``milliseconds-since-epoch``, ``seconds-since-epoch``
+```
+
+No other types are supported.
+
+##### Default field decoder
+
+This is the standard field decoder. It supports all the Trino physical data
+types. A field value is transformed under JSON conversion rules into boolean,
+long, double, or string values. This decoder should be used for columns that are
+not date or time based.
+
+##### Date and time decoders
+
+To convert values from JSON objects to Trino `DATE`, `TIME`, `TIME WITH
+TIME ZONE`, `TIMESTAMP` or `TIMESTAMP WITH TIME ZONE` columns, select
+special decoders using the `dataFormat` attribute of a field definition.
+
+- `iso8601` - Text based, parses a text field as an ISO 8601 timestamp.
+- `rfc2822` - Text based, parses a text field as an {rfc}`2822` timestamp.
+- `custom-date-time` - Text based, parses a text field according to Joda
+  format pattern specified via `formatHint` attribute. The format pattern
+  should conform to
+  <https://www.joda.org/joda-time/apidocs/org/joda/time/format/DateTimeFormat.html>.
+- `milliseconds-since-epoch` - Number-based, interprets a text or number as
+  number of milliseconds since the epoch.
+- `seconds-since-epoch` - Number-based, interprets a text or number as number
+  of milliseconds since the epoch.
+
+For `TIMESTAMP WITH TIME ZONE` and `TIME WITH TIME ZONE` data types, if
+timezone information is present in decoded value, it is used as a Trino value.
+Otherwise, the result time zone is set to `UTC`.
diff --git a/docs/src/main/sphinx/connector/kafka-tutorial.md b/docs/src/main/sphinx/connector/kafka-tutorial.md
new file mode 100644
index 000000000000..918f24b1b001
--- /dev/null
+++ b/docs/src/main/sphinx/connector/kafka-tutorial.md
@@ -0,0 +1,591 @@
+# Kafka connector tutorial
+
+## Introduction
+
+The {doc}`kafka` for Trino allows access to live topic data from
+Apache Kafka using Trino. This tutorial shows how to set up topics, and
+how to create the topic description files that back Trino tables.
+
+## Installation
+
+This tutorial assumes familiarity with Trino and a working local Trino
+installation (see {doc}`/installation/deployment`). It focuses on
+setting up Apache Kafka and integrating it with Trino.
+
+### Step 1: Install Apache Kafka
+
+Download and extract [Apache Kafka](https://kafka.apache.org/).
+
+:::{note}
+This tutorial was tested with Apache Kafka 0.8.1.
+It should work with any 0.8.x version of Apache Kafka.
+:::
+
+Start ZooKeeper and the Kafka server:
+
+```text
+$ bin/zookeeper-server-start.sh config/zookeeper.properties
+[2013-04-22 15:01:37,495] INFO Reading configuration from: config/zookeeper.properties (org.apache.zookeeper.server.quorum.QuorumPeerConfig)
+...
+```
+
+```text
+$ bin/kafka-server-start.sh config/server.properties
+[2013-04-22 15:01:47,028] INFO Verifying properties (kafka.utils.VerifiableProperties)
+[2013-04-22 15:01:47,051] INFO Property socket.send.buffer.bytes is overridden to 1048576 (kafka.utils.VerifiableProperties)
+...
+```
+
+This starts Zookeeper on port `2181` and Kafka on port `9092`.
+
+### Step 2: Load data
+
+Download the tpch-kafka loader from Maven Central:
+
+```text
+$ curl -o kafka-tpch https://repo1.maven.org/maven2/de/softwareforge/kafka_tpch_0811/1.0/kafka_tpch_0811-1.0.sh
+$ chmod 755 kafka-tpch
+```
+
+Now run the `kafka-tpch` program to preload a number of topics with tpch data:
+
+```text
+$ ./kafka-tpch load --brokers localhost:9092 --prefix tpch. --tpch-type tiny
+2014-07-28T17:17:07.594-0700     INFO    main    io.airlift.log.Logging    Logging to stderr
+2014-07-28T17:17:07.623-0700     INFO    main    de.softwareforge.kafka.LoadCommand    Processing tables: [customer, orders, lineitem, part, partsupp, supplier, nation, region]
+2014-07-28T17:17:07.981-0700     INFO    pool-1-thread-1    de.softwareforge.kafka.LoadCommand    Loading table 'customer' into topic 'tpch.customer'...
+2014-07-28T17:17:07.981-0700     INFO    pool-1-thread-2    de.softwareforge.kafka.LoadCommand    Loading table 'orders' into topic 'tpch.orders'...
+2014-07-28T17:17:07.981-0700     INFO    pool-1-thread-3    de.softwareforge.kafka.LoadCommand    Loading table 'lineitem' into topic 'tpch.lineitem'...
+2014-07-28T17:17:07.982-0700     INFO    pool-1-thread-4    de.softwareforge.kafka.LoadCommand    Loading table 'part' into topic 'tpch.part'...
+2014-07-28T17:17:07.982-0700     INFO    pool-1-thread-5    de.softwareforge.kafka.LoadCommand    Loading table 'partsupp' into topic 'tpch.partsupp'...
+2014-07-28T17:17:07.982-0700     INFO    pool-1-thread-6    de.softwareforge.kafka.LoadCommand    Loading table 'supplier' into topic 'tpch.supplier'...
+2014-07-28T17:17:07.982-0700     INFO    pool-1-thread-7    de.softwareforge.kafka.LoadCommand    Loading table 'nation' into topic 'tpch.nation'...
+2014-07-28T17:17:07.982-0700     INFO    pool-1-thread-8    de.softwareforge.kafka.LoadCommand    Loading table 'region' into topic 'tpch.region'...
+2014-07-28T17:17:10.612-0700    ERROR    pool-1-thread-8    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.region
+2014-07-28T17:17:10.781-0700     INFO    pool-1-thread-8    de.softwareforge.kafka.LoadCommand    Generated 5 rows for table 'region'.
+2014-07-28T17:17:10.797-0700    ERROR    pool-1-thread-3    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.lineitem
+2014-07-28T17:17:10.932-0700    ERROR    pool-1-thread-1    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.customer
+2014-07-28T17:17:11.068-0700    ERROR    pool-1-thread-2    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.orders
+2014-07-28T17:17:11.200-0700    ERROR    pool-1-thread-6    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.supplier
+2014-07-28T17:17:11.319-0700     INFO    pool-1-thread-6    de.softwareforge.kafka.LoadCommand    Generated 100 rows for table 'supplier'.
+2014-07-28T17:17:11.333-0700    ERROR    pool-1-thread-4    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.part
+2014-07-28T17:17:11.466-0700    ERROR    pool-1-thread-5    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.partsupp
+2014-07-28T17:17:11.597-0700    ERROR    pool-1-thread-7    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.nation
+2014-07-28T17:17:11.706-0700     INFO    pool-1-thread-7    de.softwareforge.kafka.LoadCommand    Generated 25 rows for table 'nation'.
+2014-07-28T17:17:12.180-0700     INFO    pool-1-thread-1    de.softwareforge.kafka.LoadCommand    Generated 1500 rows for table 'customer'.
+2014-07-28T17:17:12.251-0700     INFO    pool-1-thread-4    de.softwareforge.kafka.LoadCommand    Generated 2000 rows for table 'part'.
+2014-07-28T17:17:12.905-0700     INFO    pool-1-thread-2    de.softwareforge.kafka.LoadCommand    Generated 15000 rows for table 'orders'.
+2014-07-28T17:17:12.919-0700     INFO    pool-1-thread-5    de.softwareforge.kafka.LoadCommand    Generated 8000 rows for table 'partsupp'.
+2014-07-28T17:17:13.877-0700     INFO    pool-1-thread-3    de.softwareforge.kafka.LoadCommand    Generated 60175 rows for table 'lineitem'.
+```
+
+Kafka now has a number of topics that are preloaded with data to query.
+
+### Step 3: Make the Kafka topics known to Trino
+
+In your Trino installation, add a catalog properties file
+`etc/catalog/kafka.properties` for the Kafka connector.
+This file lists the Kafka nodes and topics:
+
+```text
+connector.name=kafka
+kafka.nodes=localhost:9092
+kafka.table-names=tpch.customer,tpch.orders,tpch.lineitem,tpch.part,tpch.partsupp,tpch.supplier,tpch.nation,tpch.region
+kafka.hide-internal-columns=false
+```
+
+Now start Trino:
+
+```text
+$ bin/launcher start
+```
+
+Because the Kafka tables all have the `tpch.` prefix in the configuration,
+the tables are in the `tpch` schema. The connector is mounted into the
+`kafka` catalog, because the properties file is named `kafka.properties`.
+
+Start the {doc}`Trino CLI </client/cli>`:
+
+```text
+$ ./trino --catalog kafka --schema tpch
+```
+
+List the tables to verify that things are working:
+
+```text
+trino:tpch> SHOW TABLES;
+  Table
+----------
+ customer
+ lineitem
+ nation
+ orders
+ part
+ partsupp
+ region
+ supplier
+(8 rows)
+```
+
+### Step 4: Basic data querying
+
+Kafka data is unstructured, and it has no metadata to describe the format of
+the messages. Without further configuration, the Kafka connector can access
+the data, and map it in raw form. However there are no actual columns besides the
+built-in ones:
+
+```text
+trino:tpch> DESCRIBE customer;
+      Column       |  Type      | Extra |                   Comment
+-------------------+------------+-------+---------------------------------------------
+ _partition_id     | bigint     |       | Partition Id
+ _partition_offset | bigint     |       | Offset for the message within the partition
+ _key              | varchar    |       | Key text
+ _key_corrupt      | boolean    |       | Key data is corrupt
+ _key_length       | bigint     |       | Total number of key bytes
+ _message          | varchar    |       | Message text
+ _message_corrupt  | boolean    |       | Message data is corrupt
+ _message_length   | bigint     |       | Total number of message bytes
+ _timestamp        | timestamp  |       | Message timestamp
+(11 rows)
+
+trino:tpch> SELECT count(*) FROM customer;
+ _col0
+-------
+  1500
+
+trino:tpch> SELECT _message FROM customer LIMIT 5;
+                                                                                                                                                 _message
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ {"rowNumber":1,"customerKey":1,"name":"Customer#000000001","address":"IVhzIApeRb ot,c,E","nationKey":15,"phone":"25-989-741-2988","accountBalance":711.56,"marketSegment":"BUILDING","comment":"to the even, regular platelets. regular, ironic epitaphs nag e"}
+ {"rowNumber":3,"customerKey":3,"name":"Customer#000000003","address":"MG9kdTD2WBHm","nationKey":1,"phone":"11-719-748-3364","accountBalance":7498.12,"marketSegment":"AUTOMOBILE","comment":" deposits eat slyly ironic, even instructions. express foxes detect slyly. blithel
+ {"rowNumber":5,"customerKey":5,"name":"Customer#000000005","address":"KvpyuHCplrB84WgAiGV6sYpZq7Tj","nationKey":3,"phone":"13-750-942-6364","accountBalance":794.47,"marketSegment":"HOUSEHOLD","comment":"n accounts will have to unwind. foxes cajole accor"}
+ {"rowNumber":7,"customerKey":7,"name":"Customer#000000007","address":"TcGe5gaZNgVePxU5kRrvXBfkasDTea","nationKey":18,"phone":"28-190-982-9759","accountBalance":9561.95,"marketSegment":"AUTOMOBILE","comment":"ainst the ironic, express theodolites. express, even pinto bean
+ {"rowNumber":9,"customerKey":9,"name":"Customer#000000009","address":"xKiAFTjUsCuxfeleNqefumTrjS","nationKey":8,"phone":"18-338-906-3675","accountBalance":8324.07,"marketSegment":"FURNITURE","comment":"r theodolites according to the requests wake thinly excuses: pending
+(5 rows)
+
+trino:tpch> SELECT sum(cast(json_extract_scalar(_message, '$.accountBalance') AS DOUBLE)) FROM customer LIMIT 10;
+   _col0
+------------
+ 6681865.59
+(1 row)
+```
+
+The data from Kafka can be queried using Trino, but it is not yet in
+actual table shape. The raw data is available through the `_message` and
+`_key` columns, but it is not decoded into columns. As the sample data is
+in JSON format, the {doc}`/functions/json` built into Trino can be used
+to slice the data.
+
+### Step 5: Add a topic description file
+
+The Kafka connector supports topic description files to turn raw data into
+table format. These files are located in the `etc/kafka` folder in the
+Trino installation and must end with `.json`. It is recommended that
+the file name matches the table name, but this is not necessary.
+
+Add the following file as `etc/kafka/tpch.customer.json` and restart Trino:
+
+```json
+{
+    "tableName": "customer",
+    "schemaName": "tpch",
+    "topicName": "tpch.customer",
+    "key": {
+        "dataFormat": "raw",
+        "fields": [
+            {
+                "name": "kafka_key",
+                "dataFormat": "LONG",
+                "type": "BIGINT",
+                "hidden": "false"
+            }
+        ]
+    }
+}
+```
+
+The customer table now has an additional column: `kafka_key`.
+
+```text
+trino:tpch> DESCRIBE customer;
+      Column       |  Type      | Extra |                   Comment
+-------------------+------------+-------+---------------------------------------------
+ kafka_key         | bigint     |       |
+ _partition_id     | bigint     |       | Partition Id
+ _partition_offset | bigint     |       | Offset for the message within the partition
+ _key              | varchar    |       | Key text
+ _key_corrupt      | boolean    |       | Key data is corrupt
+ _key_length       | bigint     |       | Total number of key bytes
+ _message          | varchar    |       | Message text
+ _message_corrupt  | boolean    |       | Message data is corrupt
+ _message_length   | bigint     |       | Total number of message bytes
+ _timestamp        | timestamp  |       | Message timestamp
+(12 rows)
+
+trino:tpch> SELECT kafka_key FROM customer ORDER BY kafka_key LIMIT 10;
+ kafka_key
+-----------
+         0
+         1
+         2
+         3
+         4
+         5
+         6
+         7
+         8
+         9
+(10 rows)
+```
+
+The topic definition file maps the internal Kafka key, which is a raw long
+in eight bytes, onto a Trino `BIGINT` column.
+
+### Step 6: Map all the values from the topic message onto columns
+
+Update the `etc/kafka/tpch.customer.json` file to add fields for the
+message, and restart Trino. As the fields in the message are JSON, it uses
+the `JSON` data format. This is an example, where different data formats
+are used for the key and the message.
+
+```json
+{
+    "tableName": "customer",
+    "schemaName": "tpch",
+    "topicName": "tpch.customer",
+    "key": {
+        "dataFormat": "raw",
+        "fields": [
+            {
+                "name": "kafka_key",
+                "dataFormat": "LONG",
+                "type": "BIGINT",
+                "hidden": "false"
+            }
+        ]
+    },
+    "message": {
+        "dataFormat": "json",
+        "fields": [
+            {
+                "name": "row_number",
+                "mapping": "rowNumber",
+                "type": "BIGINT"
+            },
+            {
+                "name": "customer_key",
+                "mapping": "customerKey",
+                "type": "BIGINT"
+            },
+            {
+                "name": "name",
+                "mapping": "name",
+                "type": "VARCHAR"
+            },
+            {
+                "name": "address",
+                "mapping": "address",
+                "type": "VARCHAR"
+            },
+            {
+                "name": "nation_key",
+                "mapping": "nationKey",
+                "type": "BIGINT"
+            },
+            {
+                "name": "phone",
+                "mapping": "phone",
+                "type": "VARCHAR"
+            },
+            {
+                "name": "account_balance",
+                "mapping": "accountBalance",
+                "type": "DOUBLE"
+            },
+            {
+                "name": "market_segment",
+                "mapping": "marketSegment",
+                "type": "VARCHAR"
+            },
+            {
+                "name": "comment",
+                "mapping": "comment",
+                "type": "VARCHAR"
+            }
+        ]
+    }
+}
+```
+
+Now for all the fields in the JSON of the message, columns are defined and
+the sum query from earlier can operate on the `account_balance` column directly:
+
+```text
+trino:tpch> DESCRIBE customer;
+      Column       |  Type      | Extra |                   Comment
+-------------------+------------+-------+---------------------------------------------
+ kafka_key         | bigint     |       |
+ row_number        | bigint     |       |
+ customer_key      | bigint     |       |
+ name              | varchar    |       |
+ address           | varchar    |       |
+ nation_key        | bigint     |       |
+ phone             | varchar    |       |
+ account_balance   | double     |       |
+ market_segment    | varchar    |       |
+ comment           | varchar    |       |
+ _partition_id     | bigint     |       | Partition Id
+ _partition_offset | bigint     |       | Offset for the message within the partition
+ _key              | varchar    |       | Key text
+ _key_corrupt      | boolean    |       | Key data is corrupt
+ _key_length       | bigint     |       | Total number of key bytes
+ _message          | varchar    |       | Message text
+ _message_corrupt  | boolean    |       | Message data is corrupt
+ _message_length   | bigint     |       | Total number of message bytes
+ _timestamp        | timestamp  |       | Message timestamp
+(21 rows)
+
+trino:tpch> SELECT * FROM customer LIMIT 5;
+ kafka_key | row_number | customer_key |        name        |                address                | nation_key |      phone      | account_balance | market_segment |                                                      comment
+-----------+------------+--------------+--------------------+---------------------------------------+------------+-----------------+-----------------+----------------+---------------------------------------------------------------------------------------------------------
+         1 |          2 |            2 | Customer#000000002 | XSTf4,NCwDVaWNe6tEgvwfmRchLXak        |         13 | 23-768-687-3665 |          121.65 | AUTOMOBILE     | l accounts. blithely ironic theodolites integrate boldly: caref
+         3 |          4 |            4 | Customer#000000004 | XxVSJsLAGtn                           |          4 | 14-128-190-5944 |         2866.83 | MACHINERY      |  requests. final, regular ideas sleep final accou
+         5 |          6 |            6 | Customer#000000006 | sKZz0CsnMD7mp4Xd0YrBvx,LREYKUWAh yVn  |         20 | 30-114-968-4951 |         7638.57 | AUTOMOBILE     | tions. even deposits boost according to the slyly bold packages. final accounts cajole requests. furious
+         7 |          8 |            8 | Customer#000000008 | I0B10bB0AymmC, 0PrRYBCP1yGJ8xcBPmWhl5 |         17 | 27-147-574-9335 |         6819.74 | BUILDING       | among the slyly regular theodolites kindle blithely courts. carefully even theodolites haggle slyly alon
+         9 |         10 |           10 | Customer#000000010 | 6LrEaV6KR6PLVcgl2ArL Q3rqzLzcT1 v2    |          5 | 15-741-346-9870 |         2753.54 | HOUSEHOLD      | es regular deposits haggle. fur
+(5 rows)
+
+trino:tpch> SELECT sum(account_balance) FROM customer LIMIT 10;
+   _col0
+------------
+ 6681865.59
+(1 row)
+```
+
+Now all the fields from the `customer` topic messages are available as
+Trino table columns.
+
+### Step 7: Use live data
+
+Trino can query live data in Kafka as it arrives. To simulate a live feed
+of data, this tutorial sets up a feed of live tweets into Kafka.
+
+#### Setup a live Twitter feed
+
+- Download the twistr tool
+
+```text
+$ curl -o twistr https://repo1.maven.org/maven2/de/softwareforge/twistr_kafka_0811/1.2/twistr_kafka_0811-1.2.sh
+$ chmod 755 twistr
+```
+
+- Create a developer account at <https://dev.twitter.com/> and set up an
+  access and consumer token.
+- Create a `twistr.properties` file and put the access and consumer key
+  and secrets into it:
+
+```text
+twistr.access-token-key=...
+twistr.access-token-secret=...
+twistr.consumer-key=...
+twistr.consumer-secret=...
+twistr.kafka.brokers=localhost:9092
+```
+
+#### Create a tweets table on Trino
+
+Add the tweets table to the `etc/catalog/kafka.properties` file:
+
+```text
+connector.name=kafka
+kafka.nodes=localhost:9092
+kafka.table-names=tpch.customer,tpch.orders,tpch.lineitem,tpch.part,tpch.partsupp,tpch.supplier,tpch.nation,tpch.region,tweets
+kafka.hide-internal-columns=false
+```
+
+Add a topic definition file for the Twitter feed as `etc/kafka/tweets.json`:
+
+```json
+{
+    "tableName": "tweets",
+    "topicName": "twitter_feed",
+    "dataFormat": "json",
+    "key": {
+        "dataFormat": "raw",
+        "fields": [
+            {
+                "name": "kafka_key",
+                "dataFormat": "LONG",
+                "type": "BIGINT",
+                "hidden": "false"
+            }
+        ]
+    },
+    "message": {
+        "dataFormat":"json",
+        "fields": [
+            {
+                "name": "text",
+                "mapping": "text",
+                "type": "VARCHAR"
+            },
+            {
+                "name": "user_name",
+                "mapping": "user/screen_name",
+                "type": "VARCHAR"
+            },
+            {
+                "name": "lang",
+                "mapping": "lang",
+                "type": "VARCHAR"
+            },
+            {
+                "name": "created_at",
+                "mapping": "created_at",
+                "type": "TIMESTAMP",
+                "dataFormat": "rfc2822"
+            },
+            {
+                "name": "favorite_count",
+                "mapping": "favorite_count",
+                "type": "BIGINT"
+            },
+            {
+                "name": "retweet_count",
+                "mapping": "retweet_count",
+                "type": "BIGINT"
+            },
+            {
+                "name": "favorited",
+                "mapping": "favorited",
+                    "type": "BOOLEAN"
+            },
+            {
+                "name": "id",
+                "mapping": "id_str",
+                "type": "VARCHAR"
+            },
+            {
+                "name": "in_reply_to_screen_name",
+                "mapping": "in_reply_to_screen_name",
+                "type": "VARCHAR"
+            },
+            {
+                "name": "place_name",
+                "mapping": "place/full_name",
+                "type": "VARCHAR"
+            }
+        ]
+    }
+}
+```
+
+As this table does not have an explicit schema name, it is placed
+into the `default` schema.
+
+#### Feed live data
+
+Start the twistr tool:
+
+```text
+$ java -Dness.config.location=file:$(pwd) -Dness.config=twistr -jar ./twistr
+```
+
+`twistr` connects to the Twitter API and feeds the "sample tweet" feed
+into a Kafka topic called `twitter_feed`.
+
+Now run queries against live data:
+
+```text
+$ ./trino --catalog kafka --schema default
+
+trino:default> SELECT count(*) FROM tweets;
+ _col0
+-------
+  4467
+(1 row)
+
+trino:default> SELECT count(*) FROM tweets;
+ _col0
+-------
+  4517
+(1 row)
+
+trino:default> SELECT count(*) FROM tweets;
+ _col0
+-------
+  4572
+(1 row)
+
+trino:default> SELECT kafka_key, user_name, lang, created_at FROM tweets LIMIT 10;
+     kafka_key      |    user_name    | lang |       created_at
+--------------------+-----------------+------+-------------------------
+ 494227746231685121 | burncaniff      | en   | 2014-07-29 14:07:31.000
+ 494227746214535169 | gu8tn           | ja   | 2014-07-29 14:07:31.000
+ 494227746219126785 | pequitamedicen  | es   | 2014-07-29 14:07:31.000
+ 494227746201931777 | josnyS          | ht   | 2014-07-29 14:07:31.000
+ 494227746219110401 | Cafe510         | en   | 2014-07-29 14:07:31.000
+ 494227746210332673 | Da_JuanAnd_Only | en   | 2014-07-29 14:07:31.000
+ 494227746193956865 | Smile_Kidrauhl6 | pt   | 2014-07-29 14:07:31.000
+ 494227750426017793 | CashforeverCD   | en   | 2014-07-29 14:07:32.000
+ 494227750396653569 | FilmArsivimiz   | tr   | 2014-07-29 14:07:32.000
+ 494227750388256769 | jmolas          | es   | 2014-07-29 14:07:32.000
+(10 rows)
+```
+
+There is now a live feed into Kafka, which can be queried using Trino.
+
+### Epilogue: Time stamps
+
+The tweets feed, that was set up in the last step, contains a timestamp in
+RFC 2822 format as `created_at` attribute in each tweet.
+
+```text
+trino:default> SELECT DISTINCT json_extract_scalar(_message, '$.created_at')) AS raw_date
+             -> FROM tweets LIMIT 5;
+            raw_date
+--------------------------------
+ Tue Jul 29 21:07:31 +0000 2014
+ Tue Jul 29 21:07:32 +0000 2014
+ Tue Jul 29 21:07:33 +0000 2014
+ Tue Jul 29 21:07:34 +0000 2014
+ Tue Jul 29 21:07:35 +0000 2014
+(5 rows)
+```
+
+The topic definition file for the tweets table contains a mapping onto a
+timestamp using the `rfc2822` converter:
+
+```text
+...
+{
+    "name": "created_at",
+    "mapping": "created_at",
+    "type": "TIMESTAMP",
+    "dataFormat": "rfc2822"
+},
+...
+```
+
+This allows the raw data to be mapped onto a Trino TIMESTAMP column:
+
+```text
+trino:default> SELECT created_at, raw_date FROM (
+             ->   SELECT created_at, json_extract_scalar(_message, '$.created_at') AS raw_date
+             ->   FROM tweets)
+             -> GROUP BY 1, 2 LIMIT 5;
+       created_at        |            raw_date
+-------------------------+--------------------------------
+ 2014-07-29 14:07:20.000 | Tue Jul 29 21:07:20 +0000 2014
+ 2014-07-29 14:07:21.000 | Tue Jul 29 21:07:21 +0000 2014
+ 2014-07-29 14:07:22.000 | Tue Jul 29 21:07:22 +0000 2014
+ 2014-07-29 14:07:23.000 | Tue Jul 29 21:07:23 +0000 2014
+ 2014-07-29 14:07:24.000 | Tue Jul 29 21:07:24 +0000 2014
+(5 rows)
+```
+
+The Kafka connector contains converters for ISO 8601, RFC 2822 text
+formats and for number-based timestamps using seconds or miilliseconds
+since the epoch. There is also a generic, text-based formatter, which uses
+Joda-Time format strings to parse text columns.
diff --git a/docs/src/main/sphinx/connector/kafka-tutorial.rst b/docs/src/main/sphinx/connector/kafka-tutorial.rst
deleted file mode 100644
index 035a8965e537..000000000000
--- a/docs/src/main/sphinx/connector/kafka-tutorial.rst
+++ /dev/null
@@ -1,607 +0,0 @@
-========================
-Kafka connector tutorial
-========================
-
-Introduction
-============
-
-The :doc:`kafka` for Trino allows access to live topic data from
-Apache Kafka using Trino. This tutorial shows how to set up topics, and
-how to create the topic description files that back Trino tables.
-
-Installation
-============
-
-This tutorial assumes familiarity with Trino and a working local Trino
-installation (see :doc:`/installation/deployment`). It focuses on
-setting up Apache Kafka and integrating it with Trino.
-
-Step 1: Install Apache Kafka
-----------------------------
-
-Download and extract `Apache Kafka <https://kafka.apache.org/>`_.
-
-.. note::
-
-    This tutorial was tested with Apache Kafka 0.8.1.
-    It should work with any 0.8.x version of Apache Kafka.
-
-Start ZooKeeper and the Kafka server:
-
-.. code-block:: text
-
-    $ bin/zookeeper-server-start.sh config/zookeeper.properties
-    [2013-04-22 15:01:37,495] INFO Reading configuration from: config/zookeeper.properties (org.apache.zookeeper.server.quorum.QuorumPeerConfig)
-    ...
-
-.. code-block:: text
-
-    $ bin/kafka-server-start.sh config/server.properties
-    [2013-04-22 15:01:47,028] INFO Verifying properties (kafka.utils.VerifiableProperties)
-    [2013-04-22 15:01:47,051] INFO Property socket.send.buffer.bytes is overridden to 1048576 (kafka.utils.VerifiableProperties)
-    ...
-
-This starts Zookeeper on port ``2181`` and Kafka on port ``9092``.
-
-Step 2: Load data
------------------
-
-Download the tpch-kafka loader from Maven Central:
-
-.. code-block:: text
-
-    $ curl -o kafka-tpch https://repo1.maven.org/maven2/de/softwareforge/kafka_tpch_0811/1.0/kafka_tpch_0811-1.0.sh
-    $ chmod 755 kafka-tpch
-
-Now run the ``kafka-tpch`` program to preload a number of topics with tpch data:
-
-.. code-block:: text
-
-    $ ./kafka-tpch load --brokers localhost:9092 --prefix tpch. --tpch-type tiny
-    2014-07-28T17:17:07.594-0700     INFO    main    io.airlift.log.Logging    Logging to stderr
-    2014-07-28T17:17:07.623-0700     INFO    main    de.softwareforge.kafka.LoadCommand    Processing tables: [customer, orders, lineitem, part, partsupp, supplier, nation, region]
-    2014-07-28T17:17:07.981-0700     INFO    pool-1-thread-1    de.softwareforge.kafka.LoadCommand    Loading table 'customer' into topic 'tpch.customer'...
-    2014-07-28T17:17:07.981-0700     INFO    pool-1-thread-2    de.softwareforge.kafka.LoadCommand    Loading table 'orders' into topic 'tpch.orders'...
-    2014-07-28T17:17:07.981-0700     INFO    pool-1-thread-3    de.softwareforge.kafka.LoadCommand    Loading table 'lineitem' into topic 'tpch.lineitem'...
-    2014-07-28T17:17:07.982-0700     INFO    pool-1-thread-4    de.softwareforge.kafka.LoadCommand    Loading table 'part' into topic 'tpch.part'...
-    2014-07-28T17:17:07.982-0700     INFO    pool-1-thread-5    de.softwareforge.kafka.LoadCommand    Loading table 'partsupp' into topic 'tpch.partsupp'...
-    2014-07-28T17:17:07.982-0700     INFO    pool-1-thread-6    de.softwareforge.kafka.LoadCommand    Loading table 'supplier' into topic 'tpch.supplier'...
-    2014-07-28T17:17:07.982-0700     INFO    pool-1-thread-7    de.softwareforge.kafka.LoadCommand    Loading table 'nation' into topic 'tpch.nation'...
-    2014-07-28T17:17:07.982-0700     INFO    pool-1-thread-8    de.softwareforge.kafka.LoadCommand    Loading table 'region' into topic 'tpch.region'...
-    2014-07-28T17:17:10.612-0700    ERROR    pool-1-thread-8    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.region
-    2014-07-28T17:17:10.781-0700     INFO    pool-1-thread-8    de.softwareforge.kafka.LoadCommand    Generated 5 rows for table 'region'.
-    2014-07-28T17:17:10.797-0700    ERROR    pool-1-thread-3    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.lineitem
-    2014-07-28T17:17:10.932-0700    ERROR    pool-1-thread-1    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.customer
-    2014-07-28T17:17:11.068-0700    ERROR    pool-1-thread-2    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.orders
-    2014-07-28T17:17:11.200-0700    ERROR    pool-1-thread-6    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.supplier
-    2014-07-28T17:17:11.319-0700     INFO    pool-1-thread-6    de.softwareforge.kafka.LoadCommand    Generated 100 rows for table 'supplier'.
-    2014-07-28T17:17:11.333-0700    ERROR    pool-1-thread-4    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.part
-    2014-07-28T17:17:11.466-0700    ERROR    pool-1-thread-5    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.partsupp
-    2014-07-28T17:17:11.597-0700    ERROR    pool-1-thread-7    kafka.producer.async.DefaultEventHandler    Failed to collate messages by topic, partition due to: Failed to fetch topic metadata for topic: tpch.nation
-    2014-07-28T17:17:11.706-0700     INFO    pool-1-thread-7    de.softwareforge.kafka.LoadCommand    Generated 25 rows for table 'nation'.
-    2014-07-28T17:17:12.180-0700     INFO    pool-1-thread-1    de.softwareforge.kafka.LoadCommand    Generated 1500 rows for table 'customer'.
-    2014-07-28T17:17:12.251-0700     INFO    pool-1-thread-4    de.softwareforge.kafka.LoadCommand    Generated 2000 rows for table 'part'.
-    2014-07-28T17:17:12.905-0700     INFO    pool-1-thread-2    de.softwareforge.kafka.LoadCommand    Generated 15000 rows for table 'orders'.
-    2014-07-28T17:17:12.919-0700     INFO    pool-1-thread-5    de.softwareforge.kafka.LoadCommand    Generated 8000 rows for table 'partsupp'.
-    2014-07-28T17:17:13.877-0700     INFO    pool-1-thread-3    de.softwareforge.kafka.LoadCommand    Generated 60175 rows for table 'lineitem'.
-
-Kafka now has a number of topics that are preloaded with data to query.
-
-Step 3: Make the Kafka topics known to Trino
----------------------------------------------
-
-In your Trino installation, add a catalog properties file
-``etc/catalog/kafka.properties`` for the Kafka connector.
-This file lists the Kafka nodes and topics:
-
-.. code-block:: text
-
-    connector.name=kafka
-    kafka.nodes=localhost:9092
-    kafka.table-names=tpch.customer,tpch.orders,tpch.lineitem,tpch.part,tpch.partsupp,tpch.supplier,tpch.nation,tpch.region
-    kafka.hide-internal-columns=false
-
-Now start Trino:
-
-.. code-block:: text
-
-    $ bin/launcher start
-
-Because the Kafka tables all have the ``tpch.`` prefix in the configuration,
-the tables are in the ``tpch`` schema. The connector is mounted into the
-``kafka`` catalog, because the properties file is named ``kafka.properties``.
-
-Start the :doc:`Trino CLI </client/cli>`:
-
-.. code-block:: text
-
-    $ ./trino --catalog kafka --schema tpch
-
-List the tables to verify that things are working:
-
-.. code-block:: text
-
-    trino:tpch> SHOW TABLES;
-      Table
-    ----------
-     customer
-     lineitem
-     nation
-     orders
-     part
-     partsupp
-     region
-     supplier
-    (8 rows)
-
-Step 4: Basic data querying
----------------------------
-
-Kafka data is unstructured, and it has no metadata to describe the format of
-the messages. Without further configuration, the Kafka connector can access
-the data, and map it in raw form. However there are no actual columns besides the
-built-in ones:
-
-.. code-block:: text
-
-    trino:tpch> DESCRIBE customer;
-          Column       |  Type      | Extra |                   Comment
-    -------------------+------------+-------+---------------------------------------------
-     _partition_id     | bigint     |       | Partition Id
-     _partition_offset | bigint     |       | Offset for the message within the partition
-     _key              | varchar    |       | Key text
-     _key_corrupt      | boolean    |       | Key data is corrupt
-     _key_length       | bigint     |       | Total number of key bytes
-     _message          | varchar    |       | Message text
-     _message_corrupt  | boolean    |       | Message data is corrupt
-     _message_length   | bigint     |       | Total number of message bytes
-     _timestamp        | timestamp  |       | Message timestamp
-    (11 rows)
-
-    trino:tpch> SELECT count(*) FROM customer;
-     _col0
-    -------
-      1500
-
-    trino:tpch> SELECT _message FROM customer LIMIT 5;
-                                                                                                                                                     _message
-    --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-     {"rowNumber":1,"customerKey":1,"name":"Customer#000000001","address":"IVhzIApeRb ot,c,E","nationKey":15,"phone":"25-989-741-2988","accountBalance":711.56,"marketSegment":"BUILDING","comment":"to the even, regular platelets. regular, ironic epitaphs nag e"}
-     {"rowNumber":3,"customerKey":3,"name":"Customer#000000003","address":"MG9kdTD2WBHm","nationKey":1,"phone":"11-719-748-3364","accountBalance":7498.12,"marketSegment":"AUTOMOBILE","comment":" deposits eat slyly ironic, even instructions. express foxes detect slyly. blithel
-     {"rowNumber":5,"customerKey":5,"name":"Customer#000000005","address":"KvpyuHCplrB84WgAiGV6sYpZq7Tj","nationKey":3,"phone":"13-750-942-6364","accountBalance":794.47,"marketSegment":"HOUSEHOLD","comment":"n accounts will have to unwind. foxes cajole accor"}
-     {"rowNumber":7,"customerKey":7,"name":"Customer#000000007","address":"TcGe5gaZNgVePxU5kRrvXBfkasDTea","nationKey":18,"phone":"28-190-982-9759","accountBalance":9561.95,"marketSegment":"AUTOMOBILE","comment":"ainst the ironic, express theodolites. express, even pinto bean
-     {"rowNumber":9,"customerKey":9,"name":"Customer#000000009","address":"xKiAFTjUsCuxfeleNqefumTrjS","nationKey":8,"phone":"18-338-906-3675","accountBalance":8324.07,"marketSegment":"FURNITURE","comment":"r theodolites according to the requests wake thinly excuses: pending
-    (5 rows)
-
-    trino:tpch> SELECT sum(cast(json_extract_scalar(_message, '$.accountBalance') AS double)) FROM customer LIMIT 10;
-       _col0
-    ------------
-     6681865.59
-    (1 row)
-
-The data from Kafka can be queried using Trino, but it is not yet in
-actual table shape. The raw data is available through the ``_message`` and
-``_key`` columns, but it is not decoded into columns. As the sample data is
-in JSON format, the :doc:`/functions/json` built into Trino can be used
-to slice the data.
-
-Step 5: Add a topic description file
-------------------------------------
-
-The Kafka connector supports topic description files to turn raw data into
-table format. These files are located in the ``etc/kafka`` folder in the
-Trino installation and must end with ``.json``. It is recommended that
-the file name matches the table name, but this is not necessary.
-
-Add the following file as ``etc/kafka/tpch.customer.json`` and restart Trino:
-
-.. code-block:: json
-
-    {
-        "tableName": "customer",
-        "schemaName": "tpch",
-        "topicName": "tpch.customer",
-        "key": {
-            "dataFormat": "raw",
-            "fields": [
-                {
-                    "name": "kafka_key",
-                    "dataFormat": "LONG",
-                    "type": "BIGINT",
-                    "hidden": "false"
-                }
-            ]
-        }
-    }
-
-The customer table now has an additional column: ``kafka_key``.
-
-.. code-block:: text
-
-    trino:tpch> DESCRIBE customer;
-          Column       |  Type      | Extra |                   Comment
-    -------------------+------------+-------+---------------------------------------------
-     kafka_key         | bigint     |       |
-     _partition_id     | bigint     |       | Partition Id
-     _partition_offset | bigint     |       | Offset for the message within the partition
-     _key              | varchar    |       | Key text
-     _key_corrupt      | boolean    |       | Key data is corrupt
-     _key_length       | bigint     |       | Total number of key bytes
-     _message          | varchar    |       | Message text
-     _message_corrupt  | boolean    |       | Message data is corrupt
-     _message_length   | bigint     |       | Total number of message bytes
-     _timestamp        | timestamp  |       | Message timestamp
-    (12 rows)
-
-    trino:tpch> SELECT kafka_key FROM customer ORDER BY kafka_key LIMIT 10;
-     kafka_key
-    -----------
-             0
-             1
-             2
-             3
-             4
-             5
-             6
-             7
-             8
-             9
-    (10 rows)
-
-The topic definition file maps the internal Kafka key, which is a raw long
-in eight bytes, onto a Trino ``BIGINT`` column.
-
-Step 6: Map all the values from the topic message onto columns
---------------------------------------------------------------
-
-Update the ``etc/kafka/tpch.customer.json`` file to add fields for the
-message, and restart Trino. As the fields in the message are JSON, it uses
-the ``json`` data format. This is an example, where different data formats
-are used for the key and the message.
-
-.. code-block:: json
-
-    {
-        "tableName": "customer",
-        "schemaName": "tpch",
-        "topicName": "tpch.customer",
-        "key": {
-            "dataFormat": "raw",
-            "fields": [
-                {
-                    "name": "kafka_key",
-                    "dataFormat": "LONG",
-                    "type": "BIGINT",
-                    "hidden": "false"
-                }
-            ]
-        },
-        "message": {
-            "dataFormat": "json",
-            "fields": [
-                {
-                    "name": "row_number",
-                    "mapping": "rowNumber",
-                    "type": "BIGINT"
-                },
-                {
-                    "name": "customer_key",
-                    "mapping": "customerKey",
-                    "type": "BIGINT"
-                },
-                {
-                    "name": "name",
-                    "mapping": "name",
-                    "type": "VARCHAR"
-                },
-                {
-                    "name": "address",
-                    "mapping": "address",
-                    "type": "VARCHAR"
-                },
-                {
-                    "name": "nation_key",
-                    "mapping": "nationKey",
-                    "type": "BIGINT"
-                },
-                {
-                    "name": "phone",
-                    "mapping": "phone",
-                    "type": "VARCHAR"
-                },
-                {
-                    "name": "account_balance",
-                    "mapping": "accountBalance",
-                    "type": "DOUBLE"
-                },
-                {
-                    "name": "market_segment",
-                    "mapping": "marketSegment",
-                    "type": "VARCHAR"
-                },
-                {
-                    "name": "comment",
-                    "mapping": "comment",
-                    "type": "VARCHAR"
-                }
-            ]
-        }
-    }
-
-Now for all the fields in the JSON of the message, columns are defined and
-the sum query from earlier can operate on the ``account_balance`` column directly:
-
-.. code-block:: text
-
-    trino:tpch> DESCRIBE customer;
-          Column       |  Type      | Extra |                   Comment
-    -------------------+------------+-------+---------------------------------------------
-     kafka_key         | bigint     |       |
-     row_number        | bigint     |       |
-     customer_key      | bigint     |       |
-     name              | varchar    |       |
-     address           | varchar    |       |
-     nation_key        | bigint     |       |
-     phone             | varchar    |       |
-     account_balance   | double     |       |
-     market_segment    | varchar    |       |
-     comment           | varchar    |       |
-     _partition_id     | bigint     |       | Partition Id
-     _partition_offset | bigint     |       | Offset for the message within the partition
-     _key              | varchar    |       | Key text
-     _key_corrupt      | boolean    |       | Key data is corrupt
-     _key_length       | bigint     |       | Total number of key bytes
-     _message          | varchar    |       | Message text
-     _message_corrupt  | boolean    |       | Message data is corrupt
-     _message_length   | bigint     |       | Total number of message bytes
-     _timestamp        | timestamp  |       | Message timestamp
-    (21 rows)
-
-    trino:tpch> SELECT * FROM customer LIMIT 5;
-     kafka_key | row_number | customer_key |        name        |                address                | nation_key |      phone      | account_balance | market_segment |                                                      comment
-    -----------+------------+--------------+--------------------+---------------------------------------+------------+-----------------+-----------------+----------------+---------------------------------------------------------------------------------------------------------
-             1 |          2 |            2 | Customer#000000002 | XSTf4,NCwDVaWNe6tEgvwfmRchLXak        |         13 | 23-768-687-3665 |          121.65 | AUTOMOBILE     | l accounts. blithely ironic theodolites integrate boldly: caref
-             3 |          4 |            4 | Customer#000000004 | XxVSJsLAGtn                           |          4 | 14-128-190-5944 |         2866.83 | MACHINERY      |  requests. final, regular ideas sleep final accou
-             5 |          6 |            6 | Customer#000000006 | sKZz0CsnMD7mp4Xd0YrBvx,LREYKUWAh yVn  |         20 | 30-114-968-4951 |         7638.57 | AUTOMOBILE     | tions. even deposits boost according to the slyly bold packages. final accounts cajole requests. furious
-             7 |          8 |            8 | Customer#000000008 | I0B10bB0AymmC, 0PrRYBCP1yGJ8xcBPmWhl5 |         17 | 27-147-574-9335 |         6819.74 | BUILDING       | among the slyly regular theodolites kindle blithely courts. carefully even theodolites haggle slyly alon
-             9 |         10 |           10 | Customer#000000010 | 6LrEaV6KR6PLVcgl2ArL Q3rqzLzcT1 v2    |          5 | 15-741-346-9870 |         2753.54 | HOUSEHOLD      | es regular deposits haggle. fur
-    (5 rows)
-
-    trino:tpch> SELECT sum(account_balance) FROM customer LIMIT 10;
-       _col0
-    ------------
-     6681865.59
-    (1 row)
-
-Now all the fields from the ``customer`` topic messages are available as
-Trino table columns.
-
-Step 7: Use live data
----------------------
-
-Trino can query live data in Kafka as it arrives. To simulate a live feed
-of data, this tutorial sets up a feed of live tweets into Kafka.
-
-Setup a live Twitter feed
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* Download the twistr tool
-
-.. code-block:: text
-
-    $ curl -o twistr https://repo1.maven.org/maven2/de/softwareforge/twistr_kafka_0811/1.2/twistr_kafka_0811-1.2.sh
-    $ chmod 755 twistr
-
-* Create a developer account at https://dev.twitter.com/ and set up an
-  access and consumer token.
-
-* Create a ``twistr.properties`` file and put the access and consumer key
-  and secrets into it:
-
-.. code-block:: text
-
-    twistr.access-token-key=...
-    twistr.access-token-secret=...
-    twistr.consumer-key=...
-    twistr.consumer-secret=...
-    twistr.kafka.brokers=localhost:9092
-
-Create a tweets table on Trino
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Add the tweets table to the ``etc/catalog/kafka.properties`` file:
-
-.. code-block:: text
-
-    connector.name=kafka
-    kafka.nodes=localhost:9092
-    kafka.table-names=tpch.customer,tpch.orders,tpch.lineitem,tpch.part,tpch.partsupp,tpch.supplier,tpch.nation,tpch.region,tweets
-    kafka.hide-internal-columns=false
-
-Add a topic definition file for the Twitter feed as ``etc/kafka/tweets.json``:
-
-.. code-block:: json
-
-    {
-        "tableName": "tweets",
-        "topicName": "twitter_feed",
-        "dataFormat": "json",
-        "key": {
-            "dataFormat": "raw",
-            "fields": [
-                {
-                    "name": "kafka_key",
-                    "dataFormat": "LONG",
-                    "type": "BIGINT",
-                    "hidden": "false"
-                }
-            ]
-        },
-        "message": {
-            "dataFormat":"json",
-            "fields": [
-                {
-                    "name": "text",
-                    "mapping": "text",
-                    "type": "VARCHAR"
-                },
-                {
-                    "name": "user_name",
-                    "mapping": "user/screen_name",
-                    "type": "VARCHAR"
-                },
-                {
-                    "name": "lang",
-                    "mapping": "lang",
-                    "type": "VARCHAR"
-                },
-                {
-                    "name": "created_at",
-                    "mapping": "created_at",
-                    "type": "TIMESTAMP",
-                    "dataFormat": "rfc2822"
-                },
-                {
-                    "name": "favorite_count",
-                    "mapping": "favorite_count",
-                    "type": "BIGINT"
-                },
-                {
-                    "name": "retweet_count",
-                    "mapping": "retweet_count",
-                    "type": "BIGINT"
-                },
-                {
-                    "name": "favorited",
-                    "mapping": "favorited",
-                        "type": "BOOLEAN"
-                },
-                {
-                    "name": "id",
-                    "mapping": "id_str",
-                    "type": "VARCHAR"
-                },
-                {
-                    "name": "in_reply_to_screen_name",
-                    "mapping": "in_reply_to_screen_name",
-                    "type": "VARCHAR"
-                },
-                {
-                    "name": "place_name",
-                    "mapping": "place/full_name",
-                    "type": "VARCHAR"
-                }
-            ]
-        }
-    }
-
-As this table does not have an explicit schema name, it is placed
-into the ``default`` schema.
-
-Feed live data
-^^^^^^^^^^^^^^
-
-Start the twistr tool:
-
-.. code-block:: text
-
-    $ java -Dness.config.location=file:$(pwd) -Dness.config=twistr -jar ./twistr
-
-``twistr`` connects to the Twitter API and feeds the "sample tweet" feed
-into a Kafka topic called ``twitter_feed``.
-
-Now run queries against live data:
-
-.. code-block:: text
-
-    $ ./trino --catalog kafka --schema default
-
-    trino:default> SELECT count(*) FROM tweets;
-     _col0
-    -------
-      4467
-    (1 row)
-
-    trino:default> SELECT count(*) FROM tweets;
-     _col0
-    -------
-      4517
-    (1 row)
-
-    trino:default> SELECT count(*) FROM tweets;
-     _col0
-    -------
-      4572
-    (1 row)
-
-    trino:default> SELECT kafka_key, user_name, lang, created_at FROM tweets LIMIT 10;
-         kafka_key      |    user_name    | lang |       created_at
-    --------------------+-----------------+------+-------------------------
-     494227746231685121 | burncaniff      | en   | 2014-07-29 14:07:31.000
-     494227746214535169 | gu8tn           | ja   | 2014-07-29 14:07:31.000
-     494227746219126785 | pequitamedicen  | es   | 2014-07-29 14:07:31.000
-     494227746201931777 | josnyS          | ht   | 2014-07-29 14:07:31.000
-     494227746219110401 | Cafe510         | en   | 2014-07-29 14:07:31.000
-     494227746210332673 | Da_JuanAnd_Only | en   | 2014-07-29 14:07:31.000
-     494227746193956865 | Smile_Kidrauhl6 | pt   | 2014-07-29 14:07:31.000
-     494227750426017793 | CashforeverCD   | en   | 2014-07-29 14:07:32.000
-     494227750396653569 | FilmArsivimiz   | tr   | 2014-07-29 14:07:32.000
-     494227750388256769 | jmolas          | es   | 2014-07-29 14:07:32.000
-    (10 rows)
-
-There is now a live feed into Kafka, which can be queried using Trino.
-
-Epilogue: Time stamps
----------------------
-
-The tweets feed, that was set up in the last step, contains a time stamp in
-RFC 2822 format as ``created_at`` attribute in each tweet.
-
-.. code-block:: text
-
-    trino:default> SELECT DISTINCT json_extract_scalar(_message, '$.created_at')) AS raw_date
-                 -> FROM tweets LIMIT 5;
-                raw_date
-    --------------------------------
-     Tue Jul 29 21:07:31 +0000 2014
-     Tue Jul 29 21:07:32 +0000 2014
-     Tue Jul 29 21:07:33 +0000 2014
-     Tue Jul 29 21:07:34 +0000 2014
-     Tue Jul 29 21:07:35 +0000 2014
-    (5 rows)
-
-The topic definition file for the tweets table contains a mapping onto a
-timestamp using the ``rfc2822`` converter:
-
-.. code-block:: text
-
-    ...
-    {
-        "name": "created_at",
-        "mapping": "created_at",
-        "type": "TIMESTAMP",
-        "dataFormat": "rfc2822"
-    },
-    ...
-
-This allows the raw data to be mapped onto a Trino timestamp column:
-
-.. code-block:: text
-
-    trino:default> SELECT created_at, raw_date FROM (
-                 ->   SELECT created_at, json_extract_scalar(_message, '$.created_at') AS raw_date
-                 ->   FROM tweets)
-                 -> GROUP BY 1, 2 LIMIT 5;
-           created_at        |            raw_date
-    -------------------------+--------------------------------
-     2014-07-29 14:07:20.000 | Tue Jul 29 21:07:20 +0000 2014
-     2014-07-29 14:07:21.000 | Tue Jul 29 21:07:21 +0000 2014
-     2014-07-29 14:07:22.000 | Tue Jul 29 21:07:22 +0000 2014
-     2014-07-29 14:07:23.000 | Tue Jul 29 21:07:23 +0000 2014
-     2014-07-29 14:07:24.000 | Tue Jul 29 21:07:24 +0000 2014
-    (5 rows)
-
-The Kafka connector contains converters for ISO 8601, RFC 2822 text
-formats and for number-based timestamps using seconds or miilliseconds
-since the epoch. There is also a generic, text-based formatter, which uses
-Joda-Time format strings to parse text columns.
diff --git a/docs/src/main/sphinx/connector/kafka.md b/docs/src/main/sphinx/connector/kafka.md
new file mode 100644
index 000000000000..051063df37f8
--- /dev/null
+++ b/docs/src/main/sphinx/connector/kafka.md
@@ -0,0 +1,1448 @@
+# Kafka connector
+
+```{raw} html
+<img src="../_static/img/kafka.png" class="connector-logo">
+```
+
+```{toctree}
+:hidden: true
+:maxdepth: 1
+
+Tutorial <kafka-tutorial>
+```
+
+This connector allows the use of [Apache Kafka](https://kafka.apache.org/)
+topics as tables in Trino. Each message is presented as a row in Trino.
+
+Topics can be live. Rows appear as data arrives, and disappear as
+segments get dropped. This can result in strange behavior if accessing the
+same table multiple times in a single query (e.g., performing a self join).
+
+The connector reads and writes message data from Kafka topics in parallel across
+workers to achieve a significant performance gain. The size of data sets for this
+parallelization is configurable and can therefore be adapted to your specific
+needs.
+
+See the {doc}`kafka-tutorial`.
+
+(kafka-requirements)=
+
+## Requirements
+
+To connect to Kafka, you need:
+
+- Kafka broker version 0.10.0 or higher.
+- Network access from the Trino coordinator and workers to the Kafka nodes.
+  Port 9092 is the default port.
+
+When using Protobuf decoder with the {ref}`Confluent table description
+supplier<confluent-table-description-supplier>`, the following additional steps
+must be taken:
+
+- Copy the `kafka-protobuf-provider` and `kafka-protobuf-types` JAR files
+  from [Confluent](https://packages.confluent.io/maven/io/confluent/) for
+  Confluent version 7.3.1 to the Kafka connector plugin directory (`<install
+  directory>/plugin/kafka`) on all nodes in the cluster.
+  The plugin directory depends on the {doc}`/installation` method.
+- By copying those JARs and using them, you agree to the terms of the [Confluent
+  Community License Agreement](https://github.com/confluentinc/schema-registry/blob/master/LICENSE-ConfluentCommunity)
+  under which Confluent makes them available.
+
+These steps are not required if you are not using Protobuf and Confluent table
+description supplier.
+
+## Configuration
+
+To configure the Kafka connector, create a catalog properties file
+`etc/catalog/example.properties` with the following content, replacing the
+properties as appropriate.
+
+In some cases, such as when using specialized authentication methods, it is necessary to specify
+additional Kafka client properties in order to access your Kafka cluster. To do so,
+add the `kafka.config.resources` property to reference your Kafka config files. Note that configs
+can be overwritten if defined explicitly in `kafka.properties`:
+
+```text
+connector.name=kafka
+kafka.table-names=table1,table2
+kafka.nodes=host1:port,host2:port
+kafka.config.resources=/etc/kafka-configuration.properties
+```
+
+### Multiple Kafka clusters
+
+You can have as many catalogs as you need, so if you have additional
+Kafka clusters, simply add another properties file to `etc/catalog`
+with a different name (making sure it ends in `.properties`). For
+example, if you name the property file `sales.properties`, Trino
+creates a catalog named `sales` using the configured connector.
+
+### Log levels
+
+Kafka consumer logging can be verbose and pollute Trino logs. To lower the
+{ref}`log level <log-levels>`, simply add the following to `etc/log.properties`:
+
+```text
+org.apache.kafka=WARN
+```
+
+## Configuration properties
+
+The following configuration properties are available:
+
+| Property name                                         | Description                                                                                                                                                                                                                 |
+| ----------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `kafka.default-schema`                                | Default schema name for tables.                                                                                                                                                                                             |
+| `kafka.nodes`                                         | List of nodes in the Kafka cluster.                                                                                                                                                                                         |
+| `kafka.buffer-size`                                   | Kafka read buffer size.                                                                                                                                                                                                     |
+| `kafka.hide-internal-columns`                         | Controls whether internal columns are part of the table schema or not.                                                                                                                                                      |
+| `kafka.internal-column-prefix`                        | Prefix for internal columns, defaults to `_`                                                                                                                                                                                |
+| `kafka.messages-per-split`                            | Number of messages that are processed by each Trino split; defaults to `100000`.                                                                                                                                            |
+| `kafka.protobuf-any-support-enabled`                  | Enable support for encoding Protobuf `any` types to `JSON` by setting the property to `true`, defaults to `false`.                                                                                                          |
+| `kafka.timestamp-upper-bound-force-push-down-enabled` | Controls if upper bound timestamp pushdown is enabled for topics using `CreateTime` mode.                                                                                                                                   |
+| `kafka.security-protocol`                             | Security protocol for connection to Kafka cluster; defaults to `PLAINTEXT`.                                                                                                                                                 |
+| `kafka.ssl.keystore.location`                         | Location of the keystore file.                                                                                                                                                                                              |
+| `kafka.ssl.keystore.password`                         | Password for the keystore file.                                                                                                                                                                                             |
+| `kafka.ssl.keystore.type`                             | File format of the keystore file; defaults to `JKS`.                                                                                                                                                                        |
+| `kafka.ssl.truststore.location`                       | Location of the truststore file.                                                                                                                                                                                            |
+| `kafka.ssl.truststore.password`                       | Password for the truststore file.                                                                                                                                                                                           |
+| `kafka.ssl.truststore.type`                           | File format of the truststore file; defaults to `JKS`.                                                                                                                                                                      |
+| `kafka.ssl.key.password`                              | Password for the private key in the keystore file.                                                                                                                                                                          |
+| `kafka.ssl.endpoint-identification-algorithm`         | Endpoint identification algorithm used by clients to validate server host name; defaults to `https`.                                                                                                                        |
+| `kafka.config.resources`                              | A comma-separated list of Kafka client configuration files. These files must exist on the machines running Trino. Only specify this if absolutely necessary to access Kafka. Example: `/etc/kafka-configuration.properties` |
+
+In addition, you must configure {ref}`table schema and schema registry usage
+<kafka-table-schema-registry>` with the relevant properties.
+
+### `kafka.default-schema`
+
+Defines the schema which contains all tables that were defined without
+a qualifying schema name.
+
+This property is optional; the default is `default`.
+
+### `kafka.nodes`
+
+A comma separated list of `hostname:port` pairs for the Kafka data nodes.
+
+This property is required; there is no default and at least one node must be defined.
+
+:::{note}
+Trino must still be able to connect to all nodes of the cluster
+even if only a subset is specified here, as segment files may be
+located only on a specific node.
+:::
+
+### `kafka.buffer-size`
+
+Size of the internal data buffer for reading data from Kafka. The data
+buffer must be able to hold at least one message and ideally can hold many
+messages. There is one data buffer allocated per worker and data node.
+
+This property is optional; the default is `64kb`.
+
+### `kafka.timestamp-upper-bound-force-push-down-enabled`
+
+The upper bound predicate on `_timestamp` column
+is pushed down only for topics using `LogAppendTime` mode.
+
+For topics using `CreateTime` mode, upper bound pushdown must be explicitly
+enabled via `kafka.timestamp-upper-bound-force-push-down-enabled` config property
+or `timestamp_upper_bound_force_push_down_enabled` session property.
+
+This property is optional; the default is `false`.
+
+### `kafka.hide-internal-columns`
+
+In addition to the data columns defined in a table description file, the
+connector maintains a number of additional columns for each table. If
+these columns are hidden, they can still be used in queries but do not
+show up in `DESCRIBE <table-name>` or `SELECT *`.
+
+This property is optional; the default is `true`.
+
+### `kafka.security-protocol`
+
+Protocol used to communicate with brokers.
+Valid values are: `PLAINTEXT`, `SSL`.
+
+This property is optional; default is `PLAINTEXT`.
+
+### `kafka.ssl.keystore.location`
+
+Location of the keystore file used for connection to Kafka cluster.
+
+This property is optional.
+
+### `kafka.ssl.keystore.password`
+
+Password for the keystore file used for connection to Kafka cluster.
+
+This property is optional, but required when `kafka.ssl.keystore.location` is given.
+
+### `kafka.ssl.keystore.type`
+
+File format of the keystore file.
+Valid values are: `JKS`, `PKCS12`.
+
+This property is optional; default is `JKS`.
+
+### `kafka.ssl.truststore.location`
+
+Location of the truststore file used for connection to Kafka cluster.
+
+This property is optional.
+
+### `kafka.ssl.truststore.password`
+
+Password for the truststore file used for connection to Kafka cluster.
+
+This property is optional, but required when `kafka.ssl.truststore.location` is given.
+
+### `kafka.ssl.truststore.type`
+
+File format of the truststore file.
+Valid values are: JKS, PKCS12.
+
+This property is optional; default is `JKS`.
+
+### `kafka.ssl.key.password`
+
+Password for the private key in the keystore file used for connection to Kafka cluster.
+
+This property is optional. This is required for clients only if two-way authentication is configured, i.e. `ssl.client.auth=required`.
+
+### `kafka.ssl.endpoint-identification-algorithm`
+
+The endpoint identification algorithm used by clients to validate server host name for connection to Kafka cluster.
+Kafka uses `https` as default. Use `disabled` to disable server host name validation.
+
+This property is optional; default is `https`.
+
+## Internal columns
+
+The internal column prefix is configurable by `kafka.internal-column-prefix`
+configuration property and defaults to `_`. A different prefix affects the
+internal column names in the following sections. For example, a value of
+`internal_` changes the partition ID column name from `_partition_id`
+to `internal_partition_id`.
+
+For each defined table, the connector maintains the following columns:
+
+| Column name         | Type                           | Description                                                                                                                                                                         |
+| ------------------- | ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `_partition_id`     | BIGINT                         | ID of the Kafka partition which contains this row.                                                                                                                                  |
+| `_partition_offset` | BIGINT                         | Offset within the Kafka partition for this row.                                                                                                                                     |
+| `_segment_start`    | BIGINT                         | Lowest offset in the segment (inclusive) which contains this row. This offset is partition specific.                                                                                |
+| `_segment_end`      | BIGINT                         | Highest offset in the segment (exclusive) which contains this row. The offset is partition specific. This is the same value as `_segment_start` of the next segment (if it exists). |
+| `_segment_count`    | BIGINT                         | Running count for the current row within the segment. For an uncompacted topic, `_segment_start + _segment_count` is equal to `_partition_offset`.                                  |
+| `_message_corrupt`  | BOOLEAN                        | True if the decoder could not decode the message for this row. When true, data columns mapped from the message should be treated as invalid.                                        |
+| `_message`          | VARCHAR                        | Message bytes as a UTF-8 encoded string. This is only useful for a text topic.                                                                                                      |
+| `_message_length`   | BIGINT                         | Number of bytes in the message.                                                                                                                                                     |
+| `_headers`          | map(VARCHAR, array(VARBINARY)) | Headers of the message where values with the same key are grouped as array.                                                                                                         |
+| `_key_corrupt`      | BOOLEAN                        | True if the key decoder could not decode the key for this row. When true, data columns mapped from the key should be treated as invalid.                                            |
+| `_key`              | VARCHAR                        | Key bytes as a UTF-8 encoded string. This is only useful for textual keys.                                                                                                          |
+| `_key_length`       | BIGINT                         | Number of bytes in the key.                                                                                                                                                         |
+| `_timestamp`        | TIMESTAMP                      | Message timestamp.                                                                                                                                                                  |
+
+For tables without a table definition file, the `_key_corrupt` and
+`_message_corrupt` columns will always be `false`.
+
+(kafka-table-schema-registry)=
+
+## Table schema and schema registry usage
+
+The table schema for the messages can be supplied to the connector with a
+configuration file or a schema registry. It also provides a mechanism for the
+connector to discover tables.
+
+You must configure the supplier with the `kafka.table-description-supplier`
+property, setting it to `FILE` or `CONFLUENT`. Each table description
+supplier has a separate set of configuration properties.
+
+Refer to the following subsections for more detail. The `FILE` table
+description supplier is the default, and the value is case insensitive.
+
+### File table description supplier
+
+In order to use the file-based table description supplier, the
+`kafka.table-description-supplier` must be set to `FILE`, which is the
+default.
+
+In addition, you must set `kafka.table-names` and
+`kafka.table-description-dir` as described in the following sections:
+
+#### `kafka.table-names`
+
+Comma-separated list of all tables provided by this catalog. A table name can be
+unqualified (simple name), and is placed into the default schema (see
+below), or it can be qualified with a schema name
+(`<schema-name>.<table-name>`).
+
+For each table defined here, a table description file (see below) may exist. If
+no table description file exists, the table name is used as the topic name on
+Kafka, and no data columns are mapped into the table. The table still contains
+all internal columns (see below).
+
+This property is required; there is no default and at least one table must be
+defined.
+
+#### `kafka.table-description-dir`
+
+References a folder within Trino deployment that holds one or more JSON files
+(must end with `.json`) which contain table description files.
+
+This property is optional; the default is `etc/kafka`.
+
+(table-definition-files)=
+#### Table definition files
+
+Kafka maintains topics only as byte messages and leaves it to producers
+and consumers to define how a message should be interpreted. For Trino,
+this data must be mapped into columns to allow queries against the data.
+
+:::{note}
+For textual topics that contain JSON data, it is entirely possible to not
+use any table definition files, but instead use the Trino
+{doc}`/functions/json` to parse the `_message` column which contains
+the bytes mapped into a UTF-8 string. This is cumbersome and makes it
+difficult to write SQL queries. This only works when reading data.
+:::
+
+A table definition file consists of a JSON definition for a table. The
+name of the file can be arbitrary but must end in `.json`. Place the
+file in the directory configured with the `kafka.table-description-dir`
+property. The table definition file must be accessible from all Trino nodes.
+
+```text
+{
+    "tableName": ...,
+    "schemaName": ...,
+    "topicName": ...,
+    "key": {
+        "dataFormat": ...,
+        "fields": [
+            ...
+        ]
+    },
+    "message": {
+        "dataFormat": ...,
+        "fields": [
+            ...
+       ]
+    }
+}
+```
+
+| Field        | Required | Type        | Description                                                               |
+| ------------ | -------- | ----------- | ------------------------------------------------------------------------- |
+| `tableName`  | required | string      | Trino table name defined by this file.                                    |
+| `schemaName` | optional | string      | Schema containing the table. If omitted, the default schema name is used. |
+| `topicName`  | required | string      | Kafka topic that is mapped.                                               |
+| `key`        | optional | JSON object | Field definitions for data columns mapped to the message key.             |
+| `message`    | optional | JSON object | Field definitions for data columns mapped to the message itself.          |
+
+#### Key and message in Kafka
+
+Starting with Kafka 0.8, each message in a topic can have an optional key.
+A table definition file contains sections for both key and message to map
+the data onto table columns.
+
+Each of the `key` and `message` fields in the table definition is a
+JSON object that must contain two fields:
+
+| Field        | Required | Type       | Description                                                                                 |
+| ------------ | -------- | ---------- | ------------------------------------------------------------------------------------------- |
+| `dataFormat` | required | string     | Selects the decoder for this group of fields.                                               |
+| `fields`     | required | JSON array | A list of field definitions. Each field definition creates a new column in the Trino table. |
+
+Each field definition is a JSON object:
+
+```text
+{
+    "name": ...,
+    "type": ...,
+    "dataFormat": ...,
+    "mapping": ...,
+    "formatHint": ...,
+    "hidden": ...,
+    "comment": ...
+}
+```
+
+| Field        | Required | Type    | Description                                                                                                          |
+| ------------ | -------- | ------- | -------------------------------------------------------------------------------------------------------------------- |
+| `name`       | required | string  | Name of the column in the Trino table.                                                                               |
+| `type`       | required | string  | Trino type of the column.                                                                                            |
+| `dataFormat` | optional | string  | Selects the column decoder for this field. Defaults to the default decoder for this row data format and column type. |
+| `dataSchema` | optional | string  | The path or URL where the Avro schema resides. Used only for Avro decoder.                                           |
+| `mapping`    | optional | string  | Mapping information for the column. This is decoder specific, see below.                                             |
+| `formatHint` | optional | string  | Sets a column-specific format hint to the column decoder.                                                            |
+| `hidden`     | optional | boolean | Hides the column from `DESCRIBE <table name>` and `SELECT *`. Defaults to `false`.                                   |
+| `comment`    | optional | string  | Adds a column comment, which is shown with `DESCRIBE <table name>`.                                                  |
+
+There is no limit on field descriptions for either key or message.
+
+(confluent-table-description-supplier)=
+
+### Confluent table description supplier
+
+The Confluent table description supplier uses the [Confluent Schema Registry](https://docs.confluent.io/1.0/schema-registry/docs/intro.html) to discover
+table definitions. It is only tested to work with the Confluent Schema
+Registry.
+
+The benefits of using the Confluent table description supplier over the file
+table description supplier are:
+
+- New tables can be defined without a cluster restart.
+- Schema updates are detected automatically.
+- There is no need to define tables manually.
+- Some Protobuf specific types like `oneof` and `any` are supported and mapped to JSON.
+
+When using Protobuf decoder with the Confluent table description supplier, some
+additional steps are necessary. For details, refer to {ref}`kafka-requirements`.
+
+Set `kafka.table-description-supplier` to `CONFLUENT` to use the
+schema registry. You must also configure the additional properties in the following table:
+
+:::{note}
+Inserts are not supported, and the only data format supported is AVRO.
+:::
+
+```{eval-rst}
+.. list-table:: Confluent table description supplier properties
+  :widths: 30, 55, 15
+  :header-rows: 1
+
+  * - Property name
+    - Description
+    - Default value
+  * - ``kafka.confluent-schema-registry-url``
+    - Comma-separated list of URL addresses for the Confluent schema registry.
+      For example, ``http://schema-registry-1.example.org:8081,http://schema-registry-2.example.org:8081``
+    -
+  * - ``kafka.confluent-schema-registry-client-cache-size``
+    - The maximum number of subjects that can be stored in the local cache. The
+      cache stores the schemas locally by subjectId, and is provided by the
+      Confluent ``CachingSchemaRegistry`` client.
+    - 1000
+  * - ``kafka.empty-field-strategy``
+    - Avro allows empty struct fields, but this is not allowed in Trino.
+      There are three strategies for handling empty struct fields:
+
+        * ``IGNORE`` - Ignore structs with no fields. This propagates to parents.
+          For example, an array of structs with no fields is ignored.
+        * ``FAIL`` - Fail the query if a struct with no fields is defined.
+        * ``MARK`` - Add a marker field named ``$empty_field_marker``, which of type boolean with a null value.
+          This may be desired if the struct represents a marker field.
+          
+      This can also be modified via the ``empty_field_strategy`` session property.    
+    - ``IGNORE``
+  * - ``kafka.confluent-subjects-cache-refresh-interval``
+    - The interval used for refreshing the list of subjects and the definition
+      of the schema for the subject in the subject's cache.
+    - ``1s``
+
+```
+
+#### Confluent subject to table name mapping
+
+The [subject naming strategy](https://docs.confluent.io/platform/current/schema-registry/serdes-develop/index.html#sr-schemas-subject-name-strategy)
+determines how a subject is resolved from the table name.
+
+The default strategy is the `TopicNameStrategy`, where the key subject is
+defined as `<topic-name>-key` and the value subject is defined as
+`<topic-name>-value`. If other strategies are used there is no way to
+determine the subject name beforehand, so it must be specified manually in the
+table name.
+
+To manually specify the key and value subjects, append to the topic name,
+for example: `<topic name>&key-subject=<key subject>&value-subject=<value
+subject>`. Both the `key-subject` and `value-subject` parameters are
+optional. If neither is specified, then the default `TopicNameStrategy` is
+used to resolve the subject name via the topic name. Note that a case
+insensitive match must be done, as identifiers cannot contain upper case
+characters.
+
+#### Protobuf-specific type handling in Confluent table description supplier
+
+When using the Confluent table description supplier, the following Protobuf
+specific types are supported in addition to the {ref}`normally supported types
+<kafka-protobuf-decoding>`:
+
+##### oneof
+
+Protobuf schemas containing `oneof` fields are mapped to a `JSON` field in
+Trino.
+
+For example, given the following Protobuf schema:
+
+```text
+syntax = "proto3";
+
+message schema {
+    oneof test_oneof_column {
+        string string_column = 1;
+        uint32 integer_column = 2;
+        uint64 long_column = 3;
+        double double_column = 4;
+        float float_column = 5;
+        bool boolean_column = 6;
+    }
+}
+```
+
+The corresponding Trino row is a `JSON` field `test_oneof_column`
+containing a JSON object with a single key. The value of the key matches
+the name of the `oneof` type that is present.
+
+In the above example, if the Protobuf message has the
+`test_oneof_column` containing `string_column` set to a value `Trino`
+then the corresponding Trino row includes a column named
+`test_oneof_column` with the value `JSON '{"string_column": "Trino"}'`.
+
+(kafka-sql-inserts)=
+
+## Kafka inserts
+
+The Kafka connector supports the use of {doc}`/sql/insert` statements to write
+data to a Kafka topic. Table column data is mapped to Kafka messages as defined
+in the [table definition file](#table-definition-files). There are
+five supported data formats for key and message encoding:
+
+- [raw format](raw-encoder)
+- [CSV format](csv-encoder)
+- [JSON format](json-encoder)
+- [Avro format](avro-encoder)
+- [Protobuf format](kafka-protobuf-encoding)
+
+These data formats each have an encoder that maps column values into bytes to be
+sent to a Kafka topic.
+
+Trino supports at-least-once delivery for Kafka producers. This means that
+messages are guaranteed to be sent to Kafka topics at least once. If a producer
+acknowledgement times out, or if the producer receives an error, it might retry
+sending the message. This could result in a duplicate message being sent to the
+Kafka topic.
+
+The Kafka connector does not allow the user to define which partition will be
+used as the target for a message. If a message includes a key, the producer will
+use a hash algorithm to choose the target partition for the message. The same
+key will always be assigned the same partition.
+
+(kafka-type-mapping)=
+
+## Type mapping
+
+Because Trino and Kafka each support types that the other does not, this
+connector {ref}`maps some types <type-mapping-overview>` when reading
+({ref}`decoding <kafka-row-decoding>`) or writing ({ref}`encoding
+<kafka-row-encoding>`) data. Type mapping depends on the format (Raw, Avro,
+JSON, CSV).
+
+(kafka-row-encoding)=
+
+### Row encoding
+
+Encoding is required to allow writing data; it defines how table columns in
+Trino map to Kafka keys and message data.
+
+The Kafka connector contains the following encoders:
+
+- [raw encoder](raw-encoder) - Table columns are mapped to a Kafka
+  message as raw bytes.
+- [CSV encoder](csv-encoder) - Kafka message is formatted as a
+  comma-separated value.
+- [JSON encoder](json-encoder) - Table columns are mapped to JSON
+  fields.
+- [Avro encoder](avro-encoder) - Table columns are mapped to Avro
+  fields based on an Avro schema.
+- [Protobuf encoder](kafka-protobuf-encoding) - Table columns are mapped to
+  Protobuf fields based on a Protobuf schema.
+
+:::{note}
+A [table definition file](#table-definition-files) must be defined
+for the encoder to work.
+:::
+
+(raw-encoder)=
+#### Raw encoder
+
+The raw encoder formats the table columns as raw bytes using the mapping
+information specified in the
+[table definition file](#table-definition-files).
+
+The following field attributes are supported:
+
+- `dataFormat` - Specifies the width of the column data type.
+- `type` - Trino data type.
+- `mapping` - start and optional end position of bytes to convert
+  (specified as `start` or `start:end`).
+
+The `dataFormat` attribute selects the number of bytes converted.
+If absent, `BYTE` is assumed. All values are signed.
+
+Supported values:
+
+- `BYTE` - one byte
+- `SHORT` - two bytes (big-endian)
+- `INT` - four bytes (big-endian)
+- `LONG` - eight bytes (big-endian)
+- `FLOAT` - four bytes (IEEE 754 format, big-endian)
+- `DOUBLE` - eight bytes (IEEE 754 format, big-endian)
+
+The `type` attribute defines the Trino data type.
+
+Different values of `dataFormat` are supported, depending on the Trino data
+type:
+
+| Trino data type          | `dataFormat` values            |
+| ------------------------ | ------------------------------ |
+| `BIGINT`                 | `BYTE`, `SHORT`, `INT`, `LONG` |
+| `INTEGER`                | `BYTE`, `SHORT`, `INT`         |
+| `SMALLINT`               | `BYTE`, `SHORT`                |
+| `TINYINT`                | `BYTE`                         |
+| `REAL`                   | `FLOAT`                        |
+| `DOUBLE`                 | `FLOAT`, `DOUBLE`              |
+| `BOOLEAN`                | `BYTE`, `SHORT`, `INT`, `LONG` |
+| `VARCHAR` / `VARCHAR(x)` | `BYTE`                         |
+
+No other types are supported.
+
+The `mapping` attribute specifies the range of bytes in a key or
+message used for encoding.
+
+:::{note}
+Both a start and end position must be defined for `VARCHAR` types.
+Otherwise, there is no way to know how many bytes the message contains. The
+raw format mapping information is static and cannot be dynamically changed
+to fit the variable width of some Trino data types.
+:::
+
+If only a start position is given:
+
+- For fixed width types, the appropriate number of bytes are used for the
+  specified `dataFormat` (see above).
+
+If both a start and end position are given, then:
+
+- For fixed width types, the size must be equal to number of bytes used by
+  specified `dataFormat`.
+- All bytes between start (inclusive) and end (exclusive) are used.
+
+:::{note}
+All mappings must include a start position for encoding to work.
+:::
+
+The encoding for numeric data types (`BIGINT`, `INTEGER`, `SMALLINT`,
+`TINYINT`, `REAL`, `DOUBLE`) is straightforward. All numeric types use
+big-endian. Floating point types use IEEE 754 format.
+
+Example raw field definition in a [table definition file](#table-definition-files)
+for a Kafka message:
+
+```json
+{
+  "tableName": "example_table_name",
+  "schemaName": "example_schema_name",
+  "topicName": "example_topic_name",
+  "key": { "..." },
+  "message": {
+    "dataFormat": "raw",
+    "fields": [
+      {
+        "name": "field1",
+        "type": "BIGINT",
+        "dataFormat": "LONG",
+        "mapping": "0"
+      },
+      {
+        "name": "field2",
+        "type": "INTEGER",
+        "dataFormat": "INT",
+        "mapping": "8"
+      },
+      {
+        "name": "field3",
+        "type": "SMALLINT",
+        "dataFormat": "LONG",
+        "mapping": "12"
+      },
+      {
+        "name": "field4",
+        "type": "VARCHAR(6)",
+        "dataFormat": "BYTE",
+        "mapping": "20:26"
+      }
+    ]
+  }
+}
+```
+
+Columns should be defined in the same order they are mapped. There can be no
+gaps or overlaps between column mappings. The width of the column as defined by
+the column mapping must be equivalent to the width of the `dataFormat` for all
+types except for variable width types.
+
+Example insert query for the above table definition:
+
+```
+INSERT INTO example_raw_table (field1, field2, field3, field4)
+  VALUES (123456789, 123456, 1234, 'abcdef');
+```
+
+:::{note}
+The raw encoder requires the field size to be known ahead of time, including
+for variable width data types like `VARCHAR`. It also disallows inserting
+values that do not match the width defined in the table definition
+file. This is done to ensure correctness, as otherwise longer values are
+truncated, and shorter values are read back incorrectly due to an undefined
+padding character.
+:::
+
+(csv-encoder)=
+#### CSV encoder
+
+The CSV encoder formats the values for each row as a line of
+comma-separated-values (CSV) using UTF-8 encoding. The CSV line is formatted
+with a comma `,` as the column delimiter.
+
+The `type` and `mapping` attributes must be defined for each field:
+
+- `type` - Trino data type
+- `mapping` - The integer index of the column in the CSV line (the first
+  column is 0, the second is 1, and so on)
+
+`dataFormat` and `formatHint` are not supported and must be omitted.
+
+The following Trino data types are supported by the CSV encoder:
+
+- `BIGINT`
+- `INTEGER`
+- `SMALLINT`
+- `TINYINT`
+- `DOUBLE`
+- `REAL`
+- `BOOLEAN`
+- `VARCHAR` / `VARCHAR(x)`
+
+No other types are supported.
+
+Column values are converted to strings before they are formatted as a CSV line.
+
+The following is an example CSV field definition in a [table definition file](#table-definition-files) for a Kafka message:
+
+```json
+{
+  "tableName": "example_table_name",
+  "schemaName": "example_schema_name",
+  "topicName": "example_topic_name",
+  "key": { "..." },
+  "message": {
+    "dataFormat": "csv",
+    "fields": [
+      {
+        "name": "field1",
+        "type": "BIGINT",
+        "mapping": "0"
+      },
+      {
+        "name": "field2",
+        "type": "VARCHAR",
+        "mapping": "1"
+      },
+      {
+        "name": "field3",
+        "type": "BOOLEAN",
+        "mapping": "2"
+      }
+    ]
+  }
+}
+```
+
+Example insert query for the above table definition:
+
+```
+INSERT INTO example_csv_table (field1, field2, field3)
+  VALUES (123456789, 'example text', TRUE);
+```
+
+(json-encoder)=
+#### JSON encoder
+
+The JSON encoder maps table columns to JSON fields defined in the
+[table definition file](#table-definition-files) according to
+{rfc}`4627`.
+
+For fields, the following attributes are supported:
+
+- `type` - Trino data type of column.
+- `mapping` - A slash-separated list of field names to select a field from the
+  JSON object.
+- `dataFormat` - Name of formatter. Required for temporal types.
+- `formatHint` - Pattern to format temporal data. Only use with
+  `custom-date-time` formatter.
+
+The following Trino data types are supported by the JSON encoder:
+
+- `BIGINT`
+- `INTEGER`
+- `SMALLINT`
+- `TINYINT`
+- `DOUBLE`
+- `REAL`
+- `BOOLEAN`
+- `VARCHAR`
+- `DATE`
+- `TIME`
+- `TIME WITH TIME ZONE`
+- `TIMESTAMP`
+- `TIMESTAMP WITH TIME ZONE`
+
+No other types are supported.
+
+The following `dataFormats` are available for temporal data:
+
+- `iso8601`
+- `rfc2822`
+- `custom-date-time` - Formats temporal data according to
+  [Joda Time](https://www.joda.org/joda-time/key_format.html)
+  pattern given by `formatHint` field.
+- `milliseconds-since-epoch`
+- `seconds-since-epoch`
+
+All temporal data in Kafka supports milliseconds precision.
+
+The following table defines which temporal data types are supported by
+`dataFormats`:
+
+| Trino data type            | Decoding rules                                                                              |
+| -------------------------- | ------------------------------------------------------------------------------------------- |
+| `DATE`                     | `custom-date-time`, `iso8601`                                                               |
+| `TIME`                     | `custom-date-time`, `iso8601`, `milliseconds-since-epoch`, `seconds-since-epoch`            |
+| `TIME WITH TIME ZONE`      | `custom-date-time`, `iso8601`                                                               |
+| `TIMESTAMP`                | `custom-date-time`, `iso8601`, `rfc2822`, `milliseconds-since-epoch`, `seconds-since-epoch` |
+| `TIMESTAMP WITH TIME ZONE` | `custom-date-time`, `iso8601`, `rfc2822`, `milliseconds-since-epoch`, `seconds-since-epoch` |
+
+The following is an example JSON field definition in a [table definition file](#table-definition-files) for a Kafka message:
+
+```json
+{
+  "tableName": "example_table_name",
+  "schemaName": "example_schema_name",
+  "topicName": "example_topic_name",
+  "key": { "..." },
+  "message": {
+    "dataFormat": "json",
+    "fields": [
+      {
+        "name": "field1",
+        "type": "BIGINT",
+        "mapping": "field1"
+      },
+      {
+        "name": "field2",
+        "type": "VARCHAR",
+        "mapping": "field2"
+      },
+      {
+        "name": "field3",
+        "type": "TIMESTAMP",
+        "dataFormat": "custom-date-time",
+        "formatHint": "yyyy-dd-MM HH:mm:ss.SSS",
+        "mapping": "field3"
+      }
+    ]
+  }
+}
+```
+
+The following shows an example insert query for the preceding table definition:
+
+```
+INSERT INTO example_json_table (field1, field2, field3)
+  VALUES (123456789, 'example text', TIMESTAMP '2020-07-15 01:02:03.456');
+```
+
+(avro-encoder)=
+#### Avro encoder
+
+The Avro encoder serializes rows to Avro records as defined by the
+[Avro schema](https://avro.apache.org/docs/current/).
+Trino does not support schemaless Avro encoding.
+
+:::{note}
+The Avro schema is encoded with the table column values in each Kafka message.
+:::
+
+The `dataSchema` must be defined in the table definition file to use the Avro
+encoder. It points to the location of the Avro schema file for the key or message.
+
+Avro schema files can be retrieved via HTTP or HTTPS from remote server with the
+syntax:
+
+`"dataSchema": "http://example.org/schema/avro_data.avsc"`
+
+Local files need to be available on all Trino nodes and use an absolute path in
+the syntax, for example:
+
+`"dataSchema": "/usr/local/schema/avro_data.avsc"`
+
+The following field attributes are supported:
+
+- `name` - Name of the column in the Trino table.
+- `type` - Trino data type of column.
+- `mapping` - A slash-separated list of field names to select a field from the
+  Avro schema. If the field specified in `mapping` does not exist
+  in the original Avro schema, then a write operation fails.
+
+The following table lists supported Trino data types, which can be used in `type`
+for the equivalent Avro field type.
+
+| Trino data type          | Avro data type    |
+| ------------------------ | ----------------- |
+| `BIGINT`                 | `INT`, `LONG`     |
+| `REAL`                   | `FLOAT`           |
+| `DOUBLE`                 | `FLOAT`, `DOUBLE` |
+| `BOOLEAN`                | `BOOLEAN`         |
+| `VARCHAR` / `VARCHAR(x)` | `STRING`          |
+
+No other types are supported.
+
+The following example shows an Avro field definition in a [kafka.table-description-dirition file](#table-definition-files) for a Kafka message:
+
+```json
+{
+  "tableName": "example_table_name",
+  "schemaName": "example_schema_name",
+  "topicName": "example_topic_name",
+  "key": { "..." },
+  "message":
+  {
+    "dataFormat": "avro",
+    "dataSchema": "/avro_message_schema.avsc",
+    "fields":
+    [
+      {
+        "name": "field1",
+        "type": "BIGINT",
+        "mapping": "field1"
+      },
+      {
+        "name": "field2",
+        "type": "VARCHAR",
+        "mapping": "field2"
+      },
+      {
+        "name": "field3",
+        "type": "BOOLEAN",
+        "mapping": "field3"
+      }
+    ]
+  }
+}
+```
+
+In the following example, an Avro schema definition for the preceding table
+definition is shown:
+
+```json
+{
+  "type" : "record",
+  "name" : "example_avro_message",
+  "namespace" : "io.trino.plugin.kafka",
+  "fields" :
+  [
+    {
+      "name":"field1",
+      "type":["null", "long"],
+      "default": null
+    },
+    {
+      "name": "field2",
+      "type":["null", "string"],
+      "default": null
+    },
+    {
+      "name":"field3",
+      "type":["null", "boolean"],
+      "default": null
+    }
+  ],
+  "doc:" : "A basic avro schema"
+}
+```
+
+The following is an example insert query for the preceding table definition:
+
+> INSERT INTO example_avro_table (field1, field2, field3)
+>
+> : VALUES (123456789, 'example text', FALSE);
+
+(kafka-protobuf-encoding)=
+
+#### Protobuf encoder
+
+The Protobuf encoder serializes rows to Protobuf DynamicMessages as defined by
+the [Protobuf schema](https://developers.google.com/protocol-buffers/docs/overview).
+
+:::{note}
+The Protobuf schema is encoded with the table column values in each Kafka message.
+:::
+
+The `dataSchema` must be defined in the table definition file to use the
+Protobuf encoder. It points to the location of the `proto` file for the key
+or message.
+
+Protobuf schema files can be retrieved via HTTP or HTTPS from a remote server
+with the syntax:
+
+`"dataSchema": "http://example.org/schema/schema.proto"`
+
+Local files need to be available on all Trino nodes and use an absolute path in
+the syntax, for example:
+
+`"dataSchema": "/usr/local/schema/schema.proto"`
+
+The following field attributes are supported:
+
+- `name` - Name of the column in the Trino table.
+- `type` - Trino type of column.
+- `mapping` - slash-separated list of field names to select a field from the
+  Protobuf schema. If the field specified in `mapping` does not exist in the
+  original Protobuf schema, then a write operation fails.
+
+The following table lists supported Trino data types, which can be used in `type`
+for the equivalent Protobuf field type.
+
+| Trino data type          | Protobuf data type                                 |
+| ------------------------ | -------------------------------------------------- |
+| `BOOLEAN`                | `bool`                                             |
+| `INTEGER`                | `int32`, `uint32`, `sint32`, `fixed32`, `sfixed32` |
+| `BIGINT`                 | `int64`, `uint64`, `sint64`, `fixed64`, `sfixed64` |
+| `DOUBLE`                 | `double`                                           |
+| `REAL`                   | `float`                                            |
+| `VARCHAR` / `VARCHAR(x)` | `string`                                           |
+| `VARBINARY`              | `bytes`                                            |
+| `ROW`                    | `Message`                                          |
+| `ARRAY`                  | Protobuf type with `repeated` field                |
+| `MAP`                    | `Map`                                              |
+| `TIMESTAMP`              | `Timestamp`, predefined in `timestamp.proto`       |
+
+The following example shows a Protobuf field definition in a [table definition
+file](#table-definition-files) for a Kafka message:
+
+```json
+{
+  "tableName": "example_table_name",
+  "schemaName": "example_schema_name",
+  "topicName": "example_topic_name",
+  "key": { "..." },
+  "message":
+  {
+    "dataFormat": "protobuf",
+    "dataSchema": "/message_schema.proto",
+    "fields":
+    [
+      {
+        "name": "field1",
+        "type": "BIGINT",
+        "mapping": "field1"
+      },
+      {
+        "name": "field2",
+        "type": "VARCHAR",
+        "mapping": "field2"
+      },
+      {
+        "name": "field3",
+        "type": "BOOLEAN",
+        "mapping": "field3"
+      }
+    ]
+  }
+}
+```
+
+In the following example, a Protobuf schema definition for the preceding table
+definition is shown:
+
+```text
+syntax = "proto3";
+
+message schema {
+  uint64 field1 = 1 ;
+  string field2 = 2;
+  bool field3 = 3;
+}
+```
+
+The following is an example insert query for the preceding table definition:
+
+```sql
+INSERT INTO example_protobuf_table (field1, field2, field3)
+  VALUES (123456789, 'example text', FALSE);
+```
+
+(kafka-row-decoding)=
+
+### Row decoding
+
+For key and message, a decoder is used to map message and key data onto table columns.
+
+The Kafka connector contains the following decoders:
+
+- `raw` - Kafka message is not interpreted; ranges of raw message bytes are mapped to table columns.
+- `csv` - Kafka message is interpreted as comma separated message, and fields are mapped to table columns.
+- `json` - Kafka message is parsed as JSON, and JSON fields are mapped to table columns.
+- `avro` - Kafka message is parsed based on an Avro schema, and Avro fields are mapped to table columns.
+- `protobuf` - Kafka message is parsed based on a Protobuf schema, and Protobuf fields are mapped to table columns.
+
+:::{note}
+If no table definition file exists for a table, the `dummy` decoder is used,
+which does not expose any columns.
+:::
+
+#### Raw decoder
+
+The raw decoder supports reading of raw byte-based values from Kafka message
+or key, and converting it into Trino columns.
+
+For fields, the following attributes are supported:
+
+- `dataFormat` - Selects the width of the data type converted.
+- `type` - Trino data type. See table later min this document for list of
+  supported data types.
+- `mapping` - `<start>[:<end>]` - Start and end position of bytes to convert (optional).
+
+The `dataFormat` attribute selects the number of bytes converted.
+If absent, `BYTE` is assumed. All values are signed.
+
+Supported values are:
+
+- `BYTE` - one byte
+- `SHORT` - two bytes (big-endian)
+- `INT` - four bytes (big-endian)
+- `LONG` - eight bytes (big-endian)
+- `FLOAT` - four bytes (IEEE 754 format)
+- `DOUBLE` - eight bytes (IEEE 754 format)
+
+The `type` attribute defines the Trino data type on which the value is mapped.
+
+Depending on the Trino type assigned to a column, different values of dataFormat can be used:
+
+| Trino data type          | Allowed `dataFormat` values    |
+| ------------------------ | ------------------------------ |
+| `BIGINT`                 | `BYTE`, `SHORT`, `INT`, `LONG` |
+| `INTEGER`                | `BYTE`, `SHORT`, `INT`         |
+| `SMALLINT`               | `BYTE`, `SHORT`                |
+| `TINYINT`                | `BYTE`                         |
+| `DOUBLE`                 | `DOUBLE`, `FLOAT`              |
+| `BOOLEAN`                | `BYTE`, `SHORT`, `INT`, `LONG` |
+| `VARCHAR` / `VARCHAR(x)` | `BYTE`                         |
+
+No other types are supported.
+
+The `mapping` attribute specifies the range of the bytes in a key or
+message used for decoding. It can be one or two numbers separated by a colon (`<start>[:<end>]`).
+
+If only a start position is given:
+
+- For fixed width types, the column will use the appropriate number of bytes for the specified `dataFormat` (see above).
+- When `VARCHAR` value is decoded, all bytes from start position till the end of the message will be used.
+
+If start and end position are given:
+
+- For fixed width types, the size must be equal to number of bytes used by specified `dataFormat`.
+- For `VARCHAR` all bytes between start (inclusive) and end (exclusive) are used.
+
+If no `mapping` attribute is specified, it is equivalent to setting start position to 0 and leaving end position undefined.
+
+The decoding scheme of numeric data types (`BIGINT`, `INTEGER`, `SMALLINT`, `TINYINT`, `DOUBLE`) is straightforward.
+A sequence of bytes is read from input message and decoded according to either:
+
+- big-endian encoding (for integer types)
+- IEEE 754 format for (for `DOUBLE`).
+
+Length of decoded byte sequence is implied by the `dataFormat`.
+
+For `VARCHAR` data type a sequence of bytes is interpreted according to UTF-8
+encoding.
+
+#### CSV decoder
+
+The CSV decoder converts the bytes representing a message or key into a
+string using UTF-8 encoding and then interprets the result as a CSV
+(comma-separated value) line.
+
+For fields, the `type` and `mapping` attributes must be defined:
+
+- `type` - Trino data type. See the following table for a list of supported data types.
+- `mapping` - The index of the field in the CSV record.
+
+The `dataFormat` and `formatHint` attributes are not supported and must be omitted.
+
+Table below lists supported Trino types, which can be used in `type` and decoding scheme:
+
+:::{list-table}
+:header-rows: 1
+
+* - Trino data type
+  - Decoding rules
+* - `BIGINT`, `INTEGER`, `SMALLINT`, `TINYINT`
+  - Decoded using Java `Long.parseLong()`
+* - `DOUBLE`
+  - Decoded using Java `Double.parseDouble()`
+* - `BOOLEAN`
+  - "true" character sequence maps to `true`; Other character sequences map to `false`
+* - `VARCHAR`, `VARCHAR(x)`
+  - Used as is
+:::
+
+No other types are supported.
+
+#### JSON decoder
+
+The JSON decoder converts the bytes representing a message or key into a
+JSON according to {rfc}`4627`. Note that the message or key *MUST* convert
+into a JSON object, not an array or simple type.
+
+For fields, the following attributes are supported:
+
+- `type` - Trino data type of column.
+- `dataFormat` - Field decoder to be used for column.
+- `mapping` - slash-separated list of field names to select a field from the JSON object.
+- `formatHint` - Only for `custom-date-time`.
+
+The JSON decoder supports multiple field decoders, with `_default` being
+used for standard table columns and a number of decoders for date- and
+time-based types.
+
+The following table lists Trino data types, which can be used as in `type`, and matching field decoders,
+which can be specified via `dataFormat` attribute.
+
+:::{list-table}
+:header-rows: 1
+
+* - Trino data type
+  - Allowed `dataFormat` values
+* - `BIGINT`, `INTEGER`, `SMALLINT`, `TINYINT`, `DOUBLE`, `BOOLEAN`, `VARCHAR`, `VARCHAR(x)`
+  - Default field decoder (omitted `dataFormat` attribute)
+* - `DATE`
+  - `custom-date-time`, `iso8601`
+* - `TIME`
+  - `custom-date-time`, `iso8601`, `milliseconds-since-epoch`, `seconds-since-epoch`
+* - `TIME WITH TIME ZONE`
+  - `custom-date-time`, `iso8601`
+* - `TIMESTAMP`
+  - `custom-date-time`, `iso8601`, `rfc2822`, `milliseconds-since-epoch`, `seconds-since-epoch`
+* - `TIMESTAMP WITH TIME ZONE`
+  - `custom-date-time`, `iso8601`, `rfc2822`, `milliseconds-since-epoch` `seconds-since-epoch`
+:::
+
+No other types are supported.
+
+##### Default field decoder
+
+This is the standard field decoder, supporting all the Trino physical data
+types. A field value is transformed under JSON conversion rules into
+boolean, long, double or string values. For non-date/time based columns,
+this decoder should be used.
+
+##### Date and time decoders
+
+To convert values from JSON objects into Trino `DATE`, `TIME`, `TIME WITH TIME ZONE`,
+`TIMESTAMP` or `TIMESTAMP WITH TIME ZONE` columns, special decoders must be selected using the
+`dataFormat` attribute of a field definition.
+
+- `iso8601` - Text based, parses a text field as an ISO 8601 timestamp.
+- `rfc2822` - Text based, parses a text field as an {rfc}`2822` timestamp.
+- `custom-date-time` - Text based, parses a text field according to Joda format pattern
+  : specified via `formatHint` attribute. Format pattern should conform
+    to <https://www.joda.org/joda-time/apidocs/org/joda/time/format/DateTimeFormat.html>.
+- `milliseconds-since-epoch` - Number-based; interprets a text or number as number of milliseconds since the epoch.
+- `seconds-since-epoch` - Number-based; interprets a text or number as number of milliseconds since the epoch.
+
+For `TIMESTAMP WITH TIME ZONE` and `TIME WITH TIME ZONE` data types, if timezone information is present in decoded value, it will
+be used as Trino value. Otherwise result time zone will be set to `UTC`.
+
+#### Avro decoder
+
+The Avro decoder converts the bytes representing a message or key in
+Avro format based on a schema. The message must have the Avro schema embedded.
+Trino does not support schemaless Avro decoding.
+
+For key/message, using `avro` decoder, the `dataSchema` must be defined.
+This should point to the location of a valid Avro schema file of the message which needs to be decoded. This location can be a remote web server
+(e.g.: `dataSchema: 'http://example.org/schema/avro_data.avsc'`) or local file system(e.g.: `dataSchema: '/usr/local/schema/avro_data.avsc'`).
+The decoder fails if this location is not accessible from the Trino coordinator node.
+
+For fields, the following attributes are supported:
+
+- `name` - Name of the column in the Trino table.
+- `type` - Trino data type of column.
+- `mapping` - A slash-separated list of field names to select a field from the Avro schema. If field specified in `mapping` does not exist in the original Avro schema, then a read operation returns `NULL`.
+
+The following table lists the supported Trino types which can be used in `type` for the equivalent Avro field types:
+
+| Trino data type          | Allowed Avro data type |
+| ------------------------ | ---------------------- |
+| `BIGINT`                 | `INT`, `LONG`          |
+| `DOUBLE`                 | `DOUBLE`, `FLOAT`      |
+| `BOOLEAN`                | `BOOLEAN`              |
+| `VARCHAR` / `VARCHAR(x)` | `STRING`               |
+| `VARBINARY`              | `FIXED`, `BYTES`       |
+| `ARRAY`                  | `ARRAY`                |
+| `MAP`                    | `MAP`                  |
+
+No other types are supported.
+
+##### Avro schema evolution
+
+The Avro decoder supports schema evolution feature with backward compatibility. With backward compatibility,
+a newer schema can be used to read Avro data created with an older schema. Any change in the Avro schema must also be
+reflected in Trino's topic definition file. Newly added/renamed fields *must* have a default value in the Avro schema file.
+
+The schema evolution behavior is as follows:
+
+- Column added in new schema:
+  Data created with an older schema produces a *default* value when the table is using the new schema.
+- Column removed in new schema:
+  Data created with an older schema no longer outputs the data from the column that was removed.
+- Column is renamed in the new schema:
+  This is equivalent to removing the column and adding a new one, and data created with an older schema
+  produces a *default* value when table is using the new schema.
+- Changing type of column in the new schema:
+  If the type coercion is supported by Avro, then the conversion happens. An
+  error is thrown for incompatible types.
+
+(kafka-protobuf-decoding)=
+
+#### Protobuf decoder
+
+The Protobuf decoder converts the bytes representing a message or key in
+Protobuf formatted message based on a schema.
+
+For key/message, using the `protobuf` decoder, the `dataSchema` must be
+defined. It points to the location of a valid `proto` file of the message
+which needs to be decoded. This location can be a remote web server,
+`dataSchema: 'http://example.org/schema/schema.proto'`,  or local file,
+`dataSchema: '/usr/local/schema/schema.proto'`. The decoder fails if the
+location is not accessible from the coordinator.
+
+For fields, the following attributes are supported:
+
+- `name` - Name of the column in the Trino table.
+- `type` - Trino data type of column.
+- `mapping` - slash-separated list of field names to select a field from the
+  Protobuf schema. If field specified in `mapping` does not exist in the
+  original `proto` file then a read operation returns NULL.
+
+The following table lists the supported Trino types which can be used in
+`type` for the equivalent Protobuf field types:
+
+| Trino data type          | Allowed Protobuf data type                         |
+| ------------------------ | -------------------------------------------------- |
+| `BOOLEAN`                | `bool`                                             |
+| `INTEGER`                | `int32`, `uint32`, `sint32`, `fixed32`, `sfixed32` |
+| `BIGINT`                 | `int64`, `uint64`, `sint64`, `fixed64`, `sfixed64` |
+| `DOUBLE`                 | `double`                                           |
+| `REAL`                   | `float`                                            |
+| `VARCHAR` / `VARCHAR(x)` | `string`                                           |
+| `VARBINARY`              | `bytes`                                            |
+| `ROW`                    | `Message`                                          |
+| `ARRAY`                  | Protobuf type with `repeated` field                |
+| `MAP`                    | `Map`                                              |
+| `TIMESTAMP`              | `Timestamp`, predefined in `timestamp.proto`       |
+| `JSON`                   | `oneof` (Confluent table supplier only), `Any`     |
+
+##### any
+
+Message types with an [Any](https://protobuf.dev/programming-guides/proto3/#any)
+field contain an arbitrary serialized message as bytes and a type URL to resolve
+that message's type with a scheme of `file://`, `http://`, or `https://`.
+The connector reads the contents of the URL to create the type descriptor
+for the `Any` message and convert the message to JSON. This behavior is enabled
+by setting `kafka.protobuf-any-support-enabled` to `true`.
+
+The descriptors for each distinct URL are cached for performance reasons and
+any modifications made to the type returned by the URL requires a restart of
+Trino.
+
+For example, given the following Protobuf schema which defines `MyMessage`
+with three columns:
+
+```text
+syntax = "proto3";
+
+message MyMessage {
+  string stringColumn = 1;
+  uint32 integerColumn = 2;
+  uint64 longColumn = 3;
+}
+```
+
+And a separate schema which uses an `Any` type which is a packed message
+of the above type and a valid URL:
+
+```text
+syntax = "proto3";
+
+import "google/protobuf/any.proto";
+
+message schema {
+    google.protobuf.Any any_message = 1;
+}
+```
+
+The corresponding Trino column is named `any_message` of type `JSON`
+containing a JSON-serialized representation of the Protobuf message:
+
+```text
+{
+  "@type":"file:///path/to/schemas/MyMessage",
+  "longColumn":"493857959588286460",
+  "numberColumn":"ONE",
+  "stringColumn":"Trino"
+}
+```
+
+##### Protobuf schema evolution
+
+The Protobuf decoder supports the schema evolution feature with backward
+compatibility. With backward compatibility, a newer schema can be used to read
+Protobuf data created with an older schema. Any change in the Protobuf schema
+*must* also be reflected in the topic definition file.
+
+The schema evolution behavior is as follows:
+
+- Column added in new schema:
+  Data created with an older schema produces a *default* value when the table is using the new schema.
+- Column removed in new schema:
+  Data created with an older schema no longer outputs the data from the column that was removed.
+- Column is renamed in the new schema:
+  This is equivalent to removing the column and adding a new one, and data created with an older schema
+  produces a *default* value when table is using the new schema.
+- Changing type of column in the new schema:
+  If the type coercion is supported by Protobuf, then the conversion happens. An error is thrown for incompatible types.
+
+##### Protobuf limitations
+
+- Protobuf Timestamp has a nanosecond precision but Trino supports
+  decoding/encoding at microsecond precision.
+
+(kafka-sql-support)=
+
+## SQL support
+
+The connector provides read and write access to data and metadata in Trino
+tables populated by Kafka topics. See {ref}`kafka-row-decoding` for more
+information.
+
+In addition to the {ref}`globally available <sql-globally-available>`
+and {ref}`read operation <sql-read-operations>` statements, the connector
+supports the following features:
+
+- {doc}`/sql/insert`, encoded to a specified data format. See also
+  {ref}`kafka-sql-inserts`.
diff --git a/docs/src/main/sphinx/connector/kafka.rst b/docs/src/main/sphinx/connector/kafka.rst
deleted file mode 100644
index c4f7e848714e..000000000000
--- a/docs/src/main/sphinx/connector/kafka.rst
+++ /dev/null
@@ -1,1437 +0,0 @@
-===============
-Kafka connector
-===============
-
-.. raw:: html
-
-  <img src="../_static/img/kafka.png" class="connector-logo">
-
-.. toctree::
-    :maxdepth: 1
-    :hidden:
-
-    Tutorial <kafka-tutorial>
-
-This connector allows the use of `Apache Kafka <https://kafka.apache.org/>`_
-topics as tables in Trino. Each message is presented as a row in Trino.
-
-Topics can be live. Rows appear as data arrives, and disappear as
-segments get dropped. This can result in strange behavior if accessing the
-same table multiple times in a single query (e.g., performing a self join).
-
-The connector reads and writes message data from Kafka topics in parallel across
-workers to achieve a significant performance gain. The size of data sets for this
-parallelization is configurable and can therefore be adapted to your specific
-needs.
-
-See the :doc:`kafka-tutorial`.
-
-Requirements
-------------
-
-To connect to Kafka, you need:
-
-* Kafka broker version 0.10.0 or higher.
-* Network access from the Trino coordinator and workers to the Kafka nodes.
-  Port 9092 is the default port.
-
-Configuration
--------------
-
-To configure the Kafka connector, create a catalog properties file
-``etc/catalog/example.properties`` with the following content, replacing the
-properties as appropriate.
-
-In some cases, such as when using specialized authentication methods, it is necessary to specify
-additional Kafka client properties in order to access your Kafka cluster. To do so,
-add the ``kafka.config.resources`` property to reference your Kafka config files. Note that configs
-can be overwritten if defined explicitly in ``kafka.properties``:
-
-.. code-block:: text
-
-    connector.name=kafka
-    kafka.table-names=table1,table2
-    kafka.nodes=host1:port,host2:port
-    kafka.config.resources=/etc/kafka-configuration.properties
-
-Multiple Kafka clusters
-^^^^^^^^^^^^^^^^^^^^^^^
-
-You can have as many catalogs as you need, so if you have additional
-Kafka clusters, simply add another properties file to ``etc/catalog``
-with a different name (making sure it ends in ``.properties``). For
-example, if you name the property file ``sales.properties``, Trino
-creates a catalog named ``sales`` using the configured connector.
-
-Log levels
-^^^^^^^^^^
-
-Kafka consumer logging can be verbose and pollute Trino logs. To lower the
-:ref:`log level <log-levels>`, simply add the following to ``etc/log.properties``:
-
-.. code-block:: text
-
-   org.apache.kafka=WARN
-
-
-Configuration properties
-------------------------
-
-The following configuration properties are available:
-
-========================================================== ======================================================================================================
-Property name                                              Description
-========================================================== ======================================================================================================
-``kafka.default-schema``                                   Default schema name for tables.
-``kafka.nodes``                                            List of nodes in the Kafka cluster.
-``kafka.buffer-size``                                      Kafka read buffer size.
-``kafka.hide-internal-columns``                            Controls whether internal columns are part of the table schema or not.
-``kafka.internal-column-prefix``                           Prefix for internal columns, defaults to ``_``
-``kafka.messages-per-split``                               Number of messages that are processed by each Trino split; defaults to ``100000``.
-``kafka.timestamp-upper-bound-force-push-down-enabled``    Controls if upper bound timestamp pushdown is enabled for topics using ``CreateTime`` mode.
-``kafka.security-protocol``                                Security protocol for connection to Kafka cluster; defaults to ``PLAINTEXT``.
-``kafka.ssl.keystore.location``                            Location of the keystore file.
-``kafka.ssl.keystore.password``                            Password for the keystore file.
-``kafka.ssl.keystore.type``                                File format of the keystore file; defaults to ``JKS``.
-``kafka.ssl.truststore.location``                          Location of the truststore file.
-``kafka.ssl.truststore.password``                          Password for the truststore file.
-``kafka.ssl.truststore.type``                              File format of the truststore file; defaults to ``JKS``.
-``kafka.ssl.key.password``                                 Password for the private key in the keystore file.
-``kafka.ssl.endpoint-identification-algorithm``            Endpoint identification algorithm used by clients to validate server host name; defaults to ``https``.
-``kafka.config.resources``                                 A comma-separated list of Kafka client configuration files. These files must exist on the
-                                                           machines running Trino. Only specify this if absolutely necessary to access Kafka.
-                                                           Example: ``/etc/kafka-configuration.properties``
-========================================================== ======================================================================================================
-
-In addition, you must configure :ref:`table schema and schema registry usage
-<kafka-table-schema-registry>` with the relevant properties.
-
-
-``kafka.default-schema``
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-Defines the schema which contains all tables that were defined without
-a qualifying schema name.
-
-This property is optional; the default is ``default``.
-
-``kafka.nodes``
-^^^^^^^^^^^^^^^
-
-A comma separated list of ``hostname:port`` pairs for the Kafka data nodes.
-
-This property is required; there is no default and at least one node must be defined.
-
-.. note::
-
-    Trino must still be able to connect to all nodes of the cluster
-    even if only a subset is specified here, as segment files may be
-    located only on a specific node.
-
-``kafka.buffer-size``
-^^^^^^^^^^^^^^^^^^^^^
-
-Size of the internal data buffer for reading data from Kafka. The data
-buffer must be able to hold at least one message and ideally can hold many
-messages. There is one data buffer allocated per worker and data node.
-
-This property is optional; the default is ``64kb``.
-
-``kafka.timestamp-upper-bound-force-push-down-enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The upper bound predicate on ``_timestamp`` column
-is pushed down only for topics using ``LogAppendTime`` mode.
-
-For topics using ``CreateTime`` mode, upper bound pushdown must be explicitly
-enabled via ``kafka.timestamp-upper-bound-force-push-down-enabled`` config property
-or ``timestamp_upper_bound_force_push_down_enabled`` session property.
-
-This property is optional; the default is ``false``.
-
-``kafka.hide-internal-columns``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In addition to the data columns defined in a table description file, the
-connector maintains a number of additional columns for each table. If
-these columns are hidden, they can still be used in queries but do not
-show up in ``DESCRIBE <table-name>`` or ``SELECT *``.
-
-This property is optional; the default is ``true``.
-
-``kafka.security-protocol``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Protocol used to communicate with brokers.
-Valid values are: ``PLAINTEXT``, ``SSL``.
-
-This property is optional; default is ``PLAINTEXT``.
-
-``kafka.ssl.keystore.location``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Location of the keystore file used for connection to Kafka cluster.
-
-This property is optional.
-
-``kafka.ssl.keystore.password``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Password for the keystore file used for connection to Kafka cluster.
-
-This property is optional, but required when ``kafka.ssl.keystore.location`` is given.
-
-``kafka.ssl.keystore.type``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-File format of the keystore file.
-Valid values are: ``JKS``, ``PKCS12``.
-
-This property is optional; default is ``JKS``.
-
-``kafka.ssl.truststore.location``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Location of the truststore file used for connection to Kafka cluster.
-
-This property is optional.
-
-``kafka.ssl.truststore.password``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Password for the truststore file used for connection to Kafka cluster.
-
-This property is optional, but required when ``kafka.ssl.truststore.location`` is given.
-
-``kafka.ssl.truststore.type``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-File format of the truststore file.
-Valid values are: JKS, PKCS12.
-
-This property is optional; default is ``JKS``.
-
-``kafka.ssl.key.password``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Password for the private key in the keystore file used for connection to Kafka cluster.
-
-This property is optional. This is required for clients only if two-way authentication is configured, i.e. ``ssl.client.auth=required``.
-
-``kafka.ssl.endpoint-identification-algorithm``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The endpoint identification algorithm used by clients to validate server host name for connection to Kafka cluster.
-Kafka uses ``https`` as default. Use ``disabled`` to disable server host name validation.
-
-This property is optional; default is ``https``.
-
-Internal columns
-----------------
-
-The internal column prefix is configurable by ``kafka.internal-column-prefix``
-configuration property and defaults to ``_``. A different prefix affects the
-internal column names in the following sections. For example, a value of
-``internal_`` changes the partition ID column name from ``_partition_id``
-to ``internal_partition_id``.
-
-For each defined table, the connector maintains the following columns:
-
-======================= =============================== =============================
-Column name             Type                            Description
-======================= =============================== =============================
-``_partition_id``       BIGINT                          ID of the Kafka partition which contains this row.
-``_partition_offset``   BIGINT                          Offset within the Kafka partition for this row.
-``_segment_start``      BIGINT                          Lowest offset in the segment (inclusive) which contains this row. This offset is partition specific.
-``_segment_end``        BIGINT                          Highest offset in the segment (exclusive) which contains this row. The offset is partition specific. This is the same value as ``_segment_start`` of the next segment (if it exists).
-``_segment_count``      BIGINT                          Running count for the current row within the segment. For an uncompacted topic, ``_segment_start + _segment_count`` is equal to ``_partition_offset``.
-``_message_corrupt``    BOOLEAN                         True if the decoder could not decode the message for this row. When true, data columns mapped from the message should be treated as invalid.
-``_message``            VARCHAR                         Message bytes as a UTF-8 encoded string. This is only useful for a text topic.
-``_message_length``     BIGINT                          Number of bytes in the message.
-``_headers``            map(VARCHAR, array(VARBINARY))  Headers of the message where values with the same key are grouped as array.
-``_key_corrupt``        BOOLEAN                         True if the key decoder could not decode the key for this row. When true, data columns mapped from the key should be treated as invalid.
-``_key``                VARCHAR                         Key bytes as a UTF-8 encoded string. This is only useful for textual keys.
-``_key_length``         BIGINT                          Number of bytes in the key.
-``_timestamp``          TIMESTAMP                       Message timestamp.
-======================= =============================== =============================
-
-For tables without a table definition file, the ``_key_corrupt`` and
-``_message_corrupt`` columns will always be ``false``.
-
-.. _kafka-table-schema-registry:
-
-Table schema and schema registry usage
---------------------------------------
-
-The table schema for the messages can be supplied to the connector with a
-configuration file or a schema registry. It also provides a mechanism for the
-connector to discover tables.
-
-You must configure the supplier with the ``kafka.table-description-supplier``
-property, setting it to ``FILE`` or ``CONFLUENT``. Each table description
-supplier has a separate set of configuration properties.
-
-Refer to the following subsections for more detail. The ``FILE`` table
-description supplier is the default, and the value is case insensitive.
-
-File table description supplier
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In order to use the file-based table description supplier, the
-``kafka.table-description-supplier`` must be set to ``FILE``, which is the
-default.
-
-In addition, you must set ``kafka.table-names`` and
-``kafka.table-description-dir`` as described in the following sections:
-
-``kafka.table-names``
-"""""""""""""""""""""
-
-Comma-separated list of all tables provided by this catalog. A table name can be
-unqualified (simple name), and is placed into the default schema (see
-below), or it can be qualified with a schema name
-(``<schema-name>.<table-name>``).
-
-For each table defined here, a table description file (see below) may exist. If
-no table description file exists, the table name is used as the topic name on
-Kafka, and no data columns are mapped into the table. The table still contains
-all internal columns (see below).
-
-This property is required; there is no default and at least one table must be
-defined.
-
-``kafka.table-description-dir``
-"""""""""""""""""""""""""""""""
-
-References a folder within Trino deployment that holds one or more JSON files
-(must end with ``.json``) which contain table description files.
-
-This property is optional; the default is ``etc/kafka``.
-
-Table definition files
-""""""""""""""""""""""
-
-Kafka maintains topics only as byte messages and leaves it to producers
-and consumers to define how a message should be interpreted. For Trino,
-this data must be mapped into columns to allow queries against the data.
-
-.. note::
-
-    For textual topics that contain JSON data, it is entirely possible to not
-    use any table definition files, but instead use the Trino
-    :doc:`/functions/json` to parse the ``_message`` column which contains
-    the bytes mapped into a UTF-8 string. This is cumbersome and makes it
-    difficult to write SQL queries. This only works when reading data.
-
-A table definition file consists of a JSON definition for a table. The
-name of the file can be arbitrary but must end in ``.json``. Place the
-file in the directory configured with the ``kafka.table-description-dir``
-property. The table definition file must be accessible from all Trino nodes.
-
-.. code-block:: text
-
-    {
-        "tableName": ...,
-        "schemaName": ...,
-        "topicName": ...,
-        "key": {
-            "dataFormat": ...,
-            "fields": [
-                ...
-            ]
-        },
-        "message": {
-            "dataFormat": ...,
-            "fields": [
-                ...
-           ]
-        }
-    }
-
-=============== ========= ============== =============================
-Field           Required  Type           Description
-=============== ========= ============== =============================
-``tableName``   required  string         Trino table name defined by this file.
-``schemaName``  optional  string         Schema containing the table. If omitted, the default schema name is used.
-``topicName``   required  string         Kafka topic that is mapped.
-``key``         optional  JSON object    Field definitions for data columns mapped to the message key.
-``message``     optional  JSON object    Field definitions for data columns mapped to the message itself.
-=============== ========= ============== =============================
-
-Key and message in Kafka
-""""""""""""""""""""""""
-
-Starting with Kafka 0.8, each message in a topic can have an optional key.
-A table definition file contains sections for both key and message to map
-the data onto table columns.
-
-Each of the ``key`` and ``message`` fields in the table definition is a
-JSON object that must contain two fields:
-
-=============== ========= ============== =============================
-Field           Required  Type           Description
-=============== ========= ============== =============================
-``dataFormat``  required  string         Selects the decoder for this group of fields.
-``fields``      required  JSON array     A list of field definitions. Each field definition creates a new column in the Trino table.
-=============== ========= ============== =============================
-
-Each field definition is a JSON object:
-
-.. code-block:: text
-
-    {
-        "name": ...,
-        "type": ...,
-        "dataFormat": ...,
-        "mapping": ...,
-        "formatHint": ...,
-        "hidden": ...,
-        "comment": ...
-    }
-
-=============== ========= ========= =============================
-Field           Required  Type      Description
-=============== ========= ========= =============================
-``name``        required  string    Name of the column in the Trino table.
-``type``        required  string    Trino type of the column.
-``dataFormat``  optional  string    Selects the column decoder for this field. Defaults to the default decoder for this row data format and column type.
-``dataSchema``  optional  string    The path or URL where the Avro schema resides. Used only for Avro decoder.
-``mapping``     optional  string    Mapping information for the column. This is decoder specific, see below.
-``formatHint``  optional  string    Sets a column-specific format hint to the column decoder.
-``hidden``      optional  boolean   Hides the column from ``DESCRIBE <table name>`` and ``SELECT *``. Defaults to ``false``.
-``comment``     optional  string    Adds a column comment, which is shown with ``DESCRIBE <table name>``.
-=============== ========= ========= =============================
-
-There is no limit on field descriptions for either key or message.
-
-Confluent table description supplier
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The Confluent table description supplier uses the `Confluent Schema Registry
-<https://docs.confluent.io/1.0/schema-registry/docs/intro.html>`_ to discover
-table definitions. It is only tested to work with the Confluent Schema
-Registry.
-
-The benefits of using the Confluent table description supplier over the file
-table description supplier are:
-
-* New tables can be defined without a cluster restart.
-* Schema updates are detected automatically.
-* There is no need to define tables manually.
-
-Set ``kafka.table-description-supplier`` to ``CONFLUENT`` to use the
-schema registry. You must also configure the additional properties in the following table:
-
-.. note::
-
-    Inserts are not supported, and the only data format supported is AVRO.
-
-.. list-table:: Confluent table description supplier properties
-  :widths: 30, 55, 15
-  :header-rows: 1
-
-  * - Property name
-    - Description
-    - Default value
-  * - ``kafka.confluent-schema-registry-url``
-    - Comma-separated list of URL addresses for the Confluent schema registry.
-      For example, ``http://schema-registry-1.example.org:8081,http://schema-registry-2.example.org:8081``
-    -
-  * - ``kafka.confluent-schema-registry-client-cache-size``
-    - The maximum number of subjects that can be stored in the local cache. The
-      cache stores the schemas locally by subjectId, and is provided by the
-      Confluent ``CachingSchemaRegistry`` client.
-    - 1000
-  * - ``kafka.empty-field-strategy``
-    - Avro allows empty struct fields, but this is not allowed in Trino. There
-      are three strategies for handling empty struct fields:
-
-        * ``IGNORE`` - Ignore structs with no fields. This propagates to parents.
-          For example, an array of structs with no fields is ignored.
-        * ``FAIL`` - Fail the query if a struct with no fields is defined.
-        * ``DUMMY`` - Add a dummy boolean field called ``dummy``, which is null.
-          This may be desired if the struct represents a marker field.
-    - ``IGNORE``
-  * - ``kafka.confluent-subjects-cache-refresh-interval``
-    - The interval used for refreshing the list of subjects and the definition
-      of the schema for the subject in the subject's cache.
-    - ``1s``
-
-
-Confluent subject to table name mapping
-"""""""""""""""""""""""""""""""""""""""
-
-The `subject naming strategy
-<https://docs.confluent.io/platform/current/schema-registry/serdes-develop/index.html#sr-schemas-subject-name-strategy>`_
-determines how a subject is resolved from the table name.
-
-The default strategy is the ``TopicNameStrategy``, where the key subject is
-defined as ``<topic-name>-key`` and the value subject is defined as
-``<topic-name>-value``. If other strategies are used there is no way to
-determine the subject name beforehand, so it must be specified manually in the
-table name.
-
-To manually specify the key and value subjects, append to the topic name,
-for example: ``<topic name>&key-subject=<key subject>&value-subject=<value
-subject>``. Both the ``key-subject`` and ``value-subject`` parameters are
-optional. If neither is specified, then the default ``TopicNameStrategy`` is
-used to resolve the subject name via the topic name. Note that a case
-insensitive match must be done, as identifiers cannot contain upper case
-characters.
-
-.. _kafka-sql-inserts:
-
-Kafka inserts
--------------
-
-The Kafka connector supports the use of :doc:`/sql/insert` statements to write
-data to a Kafka topic. Table column data is mapped to Kafka messages as defined
-in the `table definition file <#table-definition-files>`__. There are
-five supported data formats for key and message encoding:
-
-* `raw format <#raw-encoder>`__
-* `CSV format <#csv-encoder>`__
-* `JSON format <#json-encoder>`__
-* `Avro format <#avro-encoder>`__
-* `Protobuf format <#protobuf-encoder>`__
-
-These data formats each have an encoder that maps column values into bytes to be
-sent to a Kafka topic.
-
-Trino supports at-least-once delivery for Kafka producers. This means that
-messages are guaranteed to be sent to Kafka topics at least once. If a producer
-acknowledgement times out, or if the producer receives an error, it might retry
-sending the message. This could result in a duplicate message being sent to the
-Kafka topic.
-
-The Kafka connector does not allow the user to define which partition will be
-used as the target for a message. If a message includes a key, the producer will
-use a hash algorithm to choose the target partition for the message. The same
-key will always be assigned the same partition.
-
-.. _kafka-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and Kafka each support types that the other does not, this
-connector :ref:`maps some types <type-mapping-overview>` when reading
-(:ref:`decoding <kafka-row-decoding>`) or writing (:ref:`encoding
-<kafka-row-encoding>`) data. Type mapping depends on the format (Raw, Avro,
-JSON, CSV).
-
-.. _kafka-row-encoding:
-
-Row encoding
-^^^^^^^^^^^^
-
-Encoding is required to allow writing data; it defines how table columns in
-Trino map to Kafka keys and message data.
-
-The Kafka connector contains the following encoders:
-
-* `raw encoder <#raw-encoder>`__ - Table columns are mapped to a Kafka
-  message as raw bytes.
-* `CSV encoder <#csv-encoder>`__ - Kafka message is formatted as a
-  comma-separated value.
-* `JSON encoder <#json-encoder>`__ - Table columns are mapped to JSON
-  fields.
-* `Avro encoder <#avro-encoder>`__ - Table columns are mapped to Avro
-  fields based on an Avro schema.
-* `Protobuf encoder <#protobuf-encoder>`__ - Table columns are mapped to
-  Protobuf fields based on a Protobuf schema.
-
-.. note::
-
-    A `table definition file <#table-definition-files>`__ must be defined
-    for the encoder to work.
-
-Raw encoder
-"""""""""""
-
-The raw encoder formats the table columns as raw bytes using the mapping
-information specified in the
-`table definition file <#table-definition-files>`__.
-
-The following field attributes are supported:
-
-* ``dataFormat`` - Specifies the width of the column data type.
-* ``type`` - Trino data type.
-* ``mapping`` - start and optional end position of bytes to convert
-  (specified as ``start`` or ``start:end``).
-
-The ``dataFormat`` attribute selects the number of bytes converted.
-If absent, ``BYTE`` is assumed. All values are signed.
-
-Supported values:
-
-* ``BYTE`` - one byte
-* ``SHORT`` - two bytes (big-endian)
-* ``INT`` - four bytes (big-endian)
-* ``LONG`` - eight bytes (big-endian)
-* ``FLOAT`` - four bytes (IEEE 754 format, big-endian)
-* ``DOUBLE`` - eight bytes (IEEE 754 format, big-endian)
-
-The ``type`` attribute defines the Trino data type.
-
-Different values of ``dataFormat`` are supported, depending on the Trino data
-type:
-
-===================================== =======================================
-Trino data type                       ``dataFormat`` values
-===================================== =======================================
-``BIGINT``                            ``BYTE``, ``SHORT``, ``INT``, ``LONG``
-``INTEGER``                           ``BYTE``, ``SHORT``, ``INT``
-``SMALLINT``                          ``BYTE``, ``SHORT``
-``TINYINT``                           ``BYTE``
-``REAL``                              ``FLOAT``
-``DOUBLE``                            ``FLOAT``, ``DOUBLE``
-``BOOLEAN``                           ``BYTE``, ``SHORT``, ``INT``, ``LONG``
-``VARCHAR`` / ``VARCHAR(x)``          ``BYTE``
-===================================== =======================================
-
-No other types are supported.
-
-The ``mapping`` attribute specifies the range of bytes in a key or
-message used for encoding.
-
-.. note::
-
-    Both a start and end position must be defined for ``VARCHAR`` types.
-    Otherwise, there is no way to know how many bytes the message contains. The
-    raw format mapping information is static and cannot be dynamically changed
-    to fit the variable width of some Trino data types.
-
-If only a start position is given:
-
-* For fixed width types, the appropriate number of bytes are used for the
-  specified ``dataFormat`` (see above).
-
-If both a start and end position are given, then:
-
-* For fixed width types, the size must be equal to number of bytes used by
-  specified ``dataFormat``.
-* All bytes between start (inclusive) and end (exclusive) are used.
-
-.. note::
-
-    All mappings must include a start position for encoding to work.
-
-The encoding for numeric data types (``BIGINT``, ``INTEGER``, ``SMALLINT``,
-``TINYINT``, ``REAL``, ``DOUBLE``) is straightforward. All numeric types use
-big-endian. Floating point types use IEEE 754 format.
-
-Example raw field definition in a `table definition file <#table-definition-files>`__
-for a Kafka message:
-
-.. code-block:: json
-
-    {
-      "tableName": "example_table_name",
-      "schemaName": "example_schema_name",
-      "topicName": "example_topic_name",
-      "key": { "..." },
-      "message": {
-        "dataFormat": "raw",
-        "fields": [
-          {
-            "name": "field1",
-            "type": "BIGINT",
-            "dataFormat": "LONG",
-            "mapping": "0"
-          },
-          {
-            "name": "field2",
-            "type": "INTEGER",
-            "dataFormat": "INT",
-            "mapping": "8"
-          },
-          {
-            "name": "field3",
-            "type": "SMALLINT",
-            "dataFormat": "LONG",
-            "mapping": "12"
-          },
-          {
-            "name": "field4",
-            "type": "VARCHAR(6)",
-            "dataFormat": "BYTE",
-            "mapping": "20:26"
-          }
-        ]
-      }
-    }
-
-Columns should be defined in the same order they are mapped. There can be no
-gaps or overlaps between column mappings. The width of the column as defined by
-the column mapping must be equivalent to the width of the ``dataFormat`` for all
-types except for variable width types.
-
-Example insert query for the above table definition::
-
-    INSERT INTO example_raw_table (field1, field2, field3, field4)
-      VALUES (123456789, 123456, 1234, 'abcdef');
-
-.. note::
-
-    The raw encoder requires the field size to be known ahead of time, including
-    for variable width data types like ``VARCHAR``. It also disallows inserting
-    values that do not match the width defined in the table definition
-    file. This is done to ensure correctness, as otherwise longer values are
-    truncated, and shorter values are read back incorrectly due to an undefined
-    padding character.
-
-CSV encoder
-"""""""""""
-
-The CSV encoder formats the values for each row as a line of
-comma-separated-values (CSV) using UTF-8 encoding. The CSV line is formatted
-with a comma ``,`` as the column delimiter.
-
-The ``type`` and ``mapping`` attributes must be defined for each field:
-
-* ``type`` - Trino data type
-* ``mapping`` - The integer index of the column in the CSV line (the first
-  column is 0, the second is 1, and so on)
-
-``dataFormat`` and ``formatHint`` are not supported and must be omitted.
-
-The following Trino data types are supported by the CSV encoder:
-
-* ``BIGINT``
-* ``INTEGER``
-* ``SMALLINT``
-* ``TINYINT``
-* ``DOUBLE``
-* ``REAL``
-* ``BOOLEAN``
-* ``VARCHAR`` / ``VARCHAR(x)``
-
-No other types are supported.
-
-Column values are converted to strings before they are formatted as a CSV line.
-
-The following is an example CSV field definition in a `table definition file
-<#table-definition-files>`__ for a Kafka message:
-
-.. code-block:: json
-
-    {
-      "tableName": "example_table_name",
-      "schemaName": "example_schema_name",
-      "topicName": "example_topic_name",
-      "key": { "..." },
-      "message": {
-        "dataFormat": "csv",
-        "fields": [
-          {
-            "name": "field1",
-            "type": "BIGINT",
-            "mapping": "0"
-          },
-          {
-            "name": "field2",
-            "type": "VARCHAR",
-            "mapping": "1"
-          },
-          {
-            "name": "field3",
-            "type": "BOOLEAN",
-            "mapping": "2"
-          }
-        ]
-      }
-    }
-
-Example insert query for the above table definition::
-
-    INSERT INTO example_csv_table (field1, field2, field3)
-      VALUES (123456789, 'example text', TRUE);
-
-JSON encoder
-""""""""""""
-
-The JSON encoder maps table columns to JSON fields defined in the
-`table definition file <#table-definition-files>`__ according to
-:rfc:`4627`.
-
-For fields, the following attributes are supported:
-
-* ``type`` - Trino data type of column.
-* ``mapping`` - A slash-separated list of field names to select a field from the
-  JSON object.
-* ``dataFormat`` - Name of formatter. Required for temporal types.
-* ``formatHint`` - Pattern to format temporal data. Only use with
-  ``custom-date-time`` formatter.
-
-The following Trino data types are supported by the JSON encoder:
-
-+-------------------------------------+
-| Trino data types                    |
-+=====================================+
-| ``BIGINT``                          |
-|                                     |
-| ``INTEGER``                         |
-|                                     |
-| ``SMALLINT``                        |
-|                                     |
-| ``TINYINT``                         |
-|                                     |
-| ``DOUBLE``                          |
-|                                     |
-| ``REAL``                            |
-|                                     |
-| ``BOOLEAN``                         |
-|                                     |
-| ``VARCHAR``                         |
-|                                     |
-| ``DATE``                            |
-|                                     |
-| ``TIME``                            |
-|                                     |
-| ``TIME WITH TIME ZONE``             |
-|                                     |
-| ``TIMESTAMP``                       |
-|                                     |
-| ``TIMESTAMP WITH TIME ZONE``        |
-+-------------------------------------+
-
-No other types are supported.
-
-The following ``dataFormats`` are available for temporal data:
-
-* ``iso8601``
-* ``rfc2822``
-* ``custom-date-time`` - Formats temporal data according to
-  `Joda Time <https://www.joda.org/joda-time/key_format.html>`__
-  pattern given by ``formatHint`` field.
-* ``milliseconds-since-epoch``
-* ``seconds-since-epoch``
-
-All temporal data in Kafka supports milliseconds precision.
-
-The following table defines which temporal data types are supported by
-``dataFormats``:
-
-+-------------------------------------+--------------------------------------------------------------------------------+
-| Trino data type                     | Decoding rules                                                                 |
-+=====================================+================================================================================+
-| ``DATE``                            | ``custom-date-time``, ``iso8601``                                              |
-+-------------------------------------+--------------------------------------------------------------------------------+
-| ``TIME``                            | ``custom-date-time``, ``iso8601``, ``milliseconds-since-epoch``,               |
-|                                     | ``seconds-since-epoch``                                                        |
-+-------------------------------------+--------------------------------------------------------------------------------+
-| ``TIME WITH TIME ZONE``             | ``custom-date-time``, ``iso8601``                                              |
-+-------------------------------------+--------------------------------------------------------------------------------+
-| ``TIMESTAMP``                       | ``custom-date-time``, ``iso8601``, ``rfc2822``,                                |
-|                                     | ``milliseconds-since-epoch``, ``seconds-since-epoch``                          |
-+-------------------------------------+--------------------------------------------------------------------------------+
-| ``TIMESTAMP WITH TIME ZONE``        | ``custom-date-time``, ``iso8601``, ``rfc2822``, ``milliseconds-since-epoch``,  |
-|                                     | ``seconds-since-epoch``                                                        |
-+-------------------------------------+--------------------------------------------------------------------------------+
-
-The following is an example JSON field definition in a `table definition file
-<#table-definition-files>`__ for a Kafka message:
-
-.. code-block:: json
-
-    {
-      "tableName": "example_table_name",
-      "schemaName": "example_schema_name",
-      "topicName": "example_topic_name",
-      "key": { "..." },
-      "message": {
-        "dataFormat": "json",
-        "fields": [
-          {
-            "name": "field1",
-            "type": "BIGINT",
-            "mapping": "field1"
-          },
-          {
-            "name": "field2",
-            "type": "VARCHAR",
-            "mapping": "field2"
-          },
-          {
-            "name": "field3",
-            "type": "TIMESTAMP",
-            "dataFormat": "custom-date-time",
-            "formatHint": "yyyy-dd-MM HH:mm:ss.SSS",
-            "mapping": "field3"
-          }
-        ]
-      }
-    }
-
-The following shows an example insert query for the preceding table definition::
-
-    INSERT INTO example_json_table (field1, field2, field3)
-      VALUES (123456789, 'example text', TIMESTAMP '2020-07-15 01:02:03.456');
-
-Avro encoder
-""""""""""""
-
-The Avro encoder serializes rows to Avro records as defined by the
-`Avro schema <https://avro.apache.org/docs/current/>`_.
-Trino does not support schemaless Avro encoding.
-
-.. note::
-
-    The Avro schema is encoded with the table column values in each Kafka message.
-
-The ``dataSchema`` must be defined in the table definition file to use the Avro
-encoder. It points to the location of the Avro schema file for the key or message.
-
-Avro schema files can be retrieved via HTTP or HTTPS from remote server with the
-syntax:
-
-``"dataSchema": "http://example.org/schema/avro_data.avsc"``
-
-Local files need to be available on all Trino nodes and use an absolute path in
-the syntax, for example:
-
-``"dataSchema": "/usr/local/schema/avro_data.avsc"``
-
-The following field attributes are supported:
-
-* ``name`` - Name of the column in the Trino table.
-* ``type`` - Trino data type of column.
-* ``mapping`` - A slash-separated list of field names to select a field from the
-  Avro schema. If the field specified in ``mapping`` does not exist
-  in the original Avro schema, then a write operation fails.
-
-The following table lists supported Trino data types, which can be used in ``type``
-for the equivalent Avro field type.
-
-===================================== =======================================
-Trino data type                       Avro data type
-===================================== =======================================
-``BIGINT``                            ``INT``, ``LONG``
-``REAL``                              ``FLOAT``
-``DOUBLE``                            ``FLOAT``, ``DOUBLE``
-``BOOLEAN``                           ``BOOLEAN``
-``VARCHAR`` / ``VARCHAR(x)``          ``STRING``
-===================================== =======================================
-
-No other types are supported.
-
-The following example shows an Avro field definition in a `table definition file
-<#table-definition-files>`__ for a Kafka message:
-
-.. code-block:: json
-
-    {
-      "tableName": "example_table_name",
-      "schemaName": "example_schema_name",
-      "topicName": "example_topic_name",
-      "key": { "..." },
-      "message":
-      {
-        "dataFormat": "avro",
-        "dataSchema": "/avro_message_schema.avsc",
-        "fields":
-        [
-          {
-            "name": "field1",
-            "type": "BIGINT",
-            "mapping": "field1"
-          },
-          {
-            "name": "field2",
-            "type": "VARCHAR",
-            "mapping": "field2"
-          },
-          {
-            "name": "field3",
-            "type": "BOOLEAN",
-            "mapping": "field3"
-          }
-        ]
-      }
-    }
-
-In the following example, an Avro schema definition for the preceding table
-definition is shown:
-
-.. code-block:: json
-
-    {
-      "type" : "record",
-      "name" : "example_avro_message",
-      "namespace" : "io.trino.plugin.kafka",
-      "fields" :
-      [
-        {
-          "name":"field1",
-          "type":["null", "long"],
-          "default": null
-        },
-        {
-          "name": "field2",
-          "type":["null", "string"],
-          "default": null
-        },
-        {
-          "name":"field3",
-          "type":["null", "boolean"],
-          "default": null
-        }
-      ],
-      "doc:" : "A basic avro schema"
-    }
-
-The following is an example insert query for the preceding table definition:
-
-    INSERT INTO example_avro_table (field1, field2, field3)
-      VALUES (123456789, 'example text', FALSE);
-
-.. _kafka-protobuf-encoding:
-
-Protobuf encoder
-""""""""""""""""
-
-The Protobuf encoder serializes rows to Protobuf DynamicMessages as defined by
-the `Protobuf schema <https://developers.google.com/protocol-buffers/docs/overview>`_.
-
-.. note::
-
-    The Protobuf schema is encoded with the table column values in each Kafka message.
-
-The ``dataSchema`` must be defined in the table definition file to use the
-Protobuf encoder. It points to the location of the ``proto`` file for the key
-or message.
-
-Protobuf schema files can be retrieved via HTTP or HTTPS from a remote server
-with the syntax:
-
-``"dataSchema": "http://example.org/schema/schema.proto"``
-
-Local files need to be available on all Trino nodes and use an absolute path in
-the syntax, for example:
-
-``"dataSchema": "/usr/local/schema/schema.proto"``
-
-The following field attributes are supported:
-
-* ``name`` - Name of the column in the Trino table.
-* ``type`` - Trino type of column.
-* ``mapping`` - slash-separated list of field names to select a field from the
-  Protobuf schema. If the field specified in ``mapping`` does not exist in the
-  original Protobuf schema, then a write operation fails.
-
-The following table lists supported Trino data types, which can be used in ``type``
-for the equivalent Protobuf field type.
-
-===================================== =======================================
-Trino data type                       Protobuf data type
-===================================== =======================================
-``BOOLEAN``                           ``bool``
-``INTEGER``                           ``int32``, ``uint32``, ``sint32``, ``fixed32``, ``sfixed32``
-``BIGINT``                            ``int64``, ``uint64``, ``sint64``, ``fixed64``, ``sfixed64``
-``DOUBLE``                            ``double``
-``REAL``                              ``float``
-``VARCHAR`` / ``VARCHAR(x)``          ``string``
-``VARBINARY``                         ``bytes``
-``ROW``                               ``Message``
-``ARRAY``                             Protobuf type with ``repeated`` field
-``MAP``                               ``Map``
-``TIMESTAMP``                         ``Timestamp``, predefined in ``timestamp.proto``
-===================================== =======================================
-
-The following example shows a Protobuf field definition in a `table definition
-file <#table-definition-files>`__ for a Kafka message:
-
-
-.. code-block:: json
-
-    {
-      "tableName": "example_table_name",
-      "schemaName": "example_schema_name",
-      "topicName": "example_topic_name",
-      "key": { "..." },
-      "message":
-      {
-        "dataFormat": "protobuf",
-        "dataSchema": "/message_schema.proto",
-        "fields":
-        [
-          {
-            "name": "field1",
-            "type": "BIGINT",
-            "mapping": "field1"
-          },
-          {
-            "name": "field2",
-            "type": "VARCHAR",
-            "mapping": "field2"
-          },
-          {
-            "name": "field3",
-            "type": "BOOLEAN",
-            "mapping": "field3"
-          }
-        ]
-      }
-    }
-
-In the following example, a Protobuf schema definition for the preceding table
-definition is shown:
-
-.. code-block:: text
-
-    syntax = "proto3";
-
-    message schema {
-      uint64 field1 = 1 ;
-      string field2 = 2;
-      bool field3 = 3;
-    }
-
-The following is an example insert query for the preceding table definition:
-
-.. code-block:: sql
-
-    INSERT INTO example_protobuf_table (field1, field2, field3)
-      VALUES (123456789, 'example text', FALSE);
-
-.. _kafka-row-decoding:
-
-Row decoding
-^^^^^^^^^^^^
-
-For key and message, a decoder is used to map message and key data onto table columns.
-
-The Kafka connector contains the following decoders:
-
-* ``raw`` - Kafka message is not interpreted; ranges of raw message bytes are mapped to table columns.
-* ``csv`` - Kafka message is interpreted as comma separated message, and fields are mapped to table columns.
-* ``json`` - Kafka message is parsed as JSON, and JSON fields are mapped to table columns.
-* ``avro`` - Kafka message is parsed based on an Avro schema, and Avro fields are mapped to table columns.
-* ``protobuf`` - Kafka message is parsed based on a Protobuf schema, and Protobuf fields are mapped to table columns.
-
-.. note::
-
-    If no table definition file exists for a table, the ``dummy`` decoder is used,
-    which does not expose any columns.
-
-Raw decoder
-"""""""""""
-
-The raw decoder supports reading of raw byte-based values from Kafka message
-or key, and converting it into Trino columns.
-
-For fields, the following attributes are supported:
-
-* ``dataFormat`` - Selects the width of the data type converted.
-* ``type`` - Trino data type. See table later min this document for list of
-  supported data types.
-* ``mapping`` - ``<start>[:<end>]`` - Start and end position of bytes to convert (optional).
-
-The ``dataFormat`` attribute selects the number of bytes converted.
-If absent, ``BYTE`` is assumed. All values are signed.
-
-Supported values are:
-
-* ``BYTE`` - one byte
-* ``SHORT`` - two bytes (big-endian)
-* ``INT`` - four bytes (big-endian)
-* ``LONG`` - eight bytes (big-endian)
-* ``FLOAT`` - four bytes (IEEE 754 format)
-* ``DOUBLE`` - eight bytes (IEEE 754 format)
-
-The ``type`` attribute defines the Trino data type on which the value is mapped.
-
-Depending on the Trino type assigned to a column, different values of dataFormat can be used:
-
-===================================== =======================================
-Trino data type                       Allowed ``dataFormat`` values
-===================================== =======================================
-``BIGINT``                            ``BYTE``, ``SHORT``, ``INT``, ``LONG``
-``INTEGER``                           ``BYTE``, ``SHORT``, ``INT``
-``SMALLINT``                          ``BYTE``, ``SHORT``
-``TINYINT``                           ``BYTE``
-``DOUBLE``                            ``DOUBLE``, ``FLOAT``
-``BOOLEAN``                           ``BYTE``, ``SHORT``, ``INT``, ``LONG``
-``VARCHAR`` / ``VARCHAR(x)``          ``BYTE``
-===================================== =======================================
-
-No other types are supported.
-
-The ``mapping`` attribute specifies the range of the bytes in a key or
-message used for decoding. It can be one or two numbers separated by a colon (``<start>[:<end>]``).
-
-If only a start position is given:
-
-* For fixed width types, the column will use the appropriate number of bytes for the specified ``dataFormat`` (see above).
-* When ``VARCHAR`` value is decoded, all bytes from start position till the end of the message will be used.
-
-If start and end position are given:
-
-* For fixed width types, the size must be equal to number of bytes used by specified ``dataFormat``.
-* For ``VARCHAR`` all bytes between start (inclusive) and end (exclusive) are used.
-
-If no ``mapping`` attribute is specified, it is equivalent to setting start position to 0 and leaving end position undefined.
-
-The decoding scheme of numeric data types (``BIGINT``, ``INTEGER``, ``SMALLINT``, ``TINYINT``, ``DOUBLE``) is straightforward.
-A sequence of bytes is read from input message and decoded according to either:
-
-* big-endian encoding (for integer types)
-* IEEE 754 format for (for ``DOUBLE``).
-
-Length of decoded byte sequence is implied by the ``dataFormat``.
-
-For ``VARCHAR`` data type a sequence of bytes is interpreted according to UTF-8
-encoding.
-
-CSV decoder
-"""""""""""
-
-The CSV decoder converts the bytes representing a message or key into a
-string using UTF-8 encoding and then interprets the result as a CSV
-(comma-separated value) line.
-
-For fields, the ``type`` and ``mapping`` attributes must be defined:
-
-* ``type`` - Trino data type. See the following table for a list of supported data types.
-* ``mapping`` - The index of the field in the CSV record.
-
-The ``dataFormat`` and ``formatHint`` attributes are not supported and must be omitted.
-
-Table below lists supported Trino types, which can be used in ``type`` and decoding scheme:
-
-+-------------------------------------+--------------------------------------------------------------------------------+
-| Trino data type                     | Decoding rules                                                                 |
-+=====================================+================================================================================+
-| | ``BIGINT``                        | Decoded using Java ``Long.parseLong()``                                        |
-| | ``INTEGER``                       |                                                                                |
-| | ``SMALLINT``                      |                                                                                |
-| | ``TINYINT``                       |                                                                                |
-+-------------------------------------+--------------------------------------------------------------------------------+
-| ``DOUBLE``                          | Decoded using Java ``Double.parseDouble()``                                    |
-+-------------------------------------+--------------------------------------------------------------------------------+
-| ``BOOLEAN``                         | "true" character sequence maps to ``true``;                                    |
-|                                     | Other character sequences map to ``false``                                     |
-+-------------------------------------+--------------------------------------------------------------------------------+
-| ``VARCHAR`` / ``VARCHAR(x)``        | Used as is                                                                     |
-+-------------------------------------+--------------------------------------------------------------------------------+
-
-No other types are supported.
-
-JSON decoder
-""""""""""""
-
-The JSON decoder converts the bytes representing a message or key into a
-JSON according to :rfc:`4627`. Note that the message or key *MUST* convert
-into a JSON object, not an array or simple type.
-
-For fields, the following attributes are supported:
-
-* ``type`` - Trino data type of column.
-* ``dataFormat`` - Field decoder to be used for column.
-* ``mapping`` - slash-separated list of field names to select a field from the JSON object.
-* ``formatHint`` - Only for ``custom-date-time``.
-
-The JSON decoder supports multiple field decoders, with ``_default`` being
-used for standard table columns and a number of decoders for date- and
-time-based types.
-
-The following table lists Trino data types, which can be used as in ``type``, and matching field decoders,
-which can be specified via ``dataFormat`` attribute.
-
-+-------------------------------------+--------------------------------------------------------------------------------+
-| Trino data type                     | Allowed ``dataFormat`` values                                                  |
-+=====================================+================================================================================+
-| | ``BIGINT``                        | Default field decoder (omitted ``dataFormat`` attribute)                       |
-| | ``INTEGER``                       |                                                                                |
-| | ``SMALLINT``                      |                                                                                |
-| | ``TINYINT``                       |                                                                                |
-| | ``DOUBLE``                        |                                                                                |
-| | ``BOOLEAN``                       |                                                                                |
-| | ``VARCHAR``                       |                                                                                |
-| | ``VARCHAR(x)``                    |                                                                                |
-+-------------------------------------+--------------------------------------------------------------------------------+
-| | ``DATE``                          | ``custom-date-time``, ``iso8601``                                              |
-+-------------------------------------+--------------------------------------------------------------------------------+
-| | ``TIME``                          | ``custom-date-time``, ``iso8601``, ``milliseconds-since-epoch``,               |
-| |                                   | ``seconds-since-epoch``                                                        |
-+-------------------------------------+--------------------------------------------------------------------------------+
-| | ``TIME WITH TIME ZONE``           | ``custom-date-time``, ``iso8601``                                              |
-+-------------------------------------+--------------------------------------------------------------------------------+
-| | ``TIMESTAMP``                     | ``custom-date-time``, ``iso8601``, ``rfc2822``,                                |
-| |                                   | ``milliseconds-since-epoch``, ``seconds-since-epoch``                          |
-+-------------------------------------+--------------------------------------------------------------------------------+
-| | ``TIMESTAMP WITH TIME ZONE``      | ``custom-date-time``, ``iso8601``, ``rfc2822``, ``milliseconds-since-epoch``   |
-| |                                   | ``seconds-since-epoch``                                                        |
-+-------------------------------------+--------------------------------------------------------------------------------+
-
-No other types are supported.
-
-Default field decoder
-+++++++++++++++++++++
-
-This is the standard field decoder, supporting all the Trino physical data
-types. A field value is transformed under JSON conversion rules into
-boolean, long, double or string values. For non-date/time based columns,
-this decoder should be used.
-
-Date and time decoders
-++++++++++++++++++++++
-
-To convert values from JSON objects into Trino ``DATE``, ``TIME``, ``TIME WITH TIME ZONE``,
-``TIMESTAMP`` or ``TIMESTAMP WITH TIME ZONE`` columns, special decoders must be selected using the
-``dataFormat`` attribute of a field definition.
-
-* ``iso8601`` - Text based, parses a text field as an ISO 8601 timestamp.
-* ``rfc2822`` - Text based, parses a text field as an :rfc:`2822` timestamp.
-* ``custom-date-time`` - Text based, parses a text field according to Joda format pattern
-                         specified via ``formatHint`` attribute. Format pattern should conform
-                         to https://www.joda.org/joda-time/apidocs/org/joda/time/format/DateTimeFormat.html.
-* ``milliseconds-since-epoch`` - Number-based; interprets a text or number as number of milliseconds since the epoch.
-* ``seconds-since-epoch`` - Number-based; interprets a text or number as number of milliseconds since the epoch.
-
-For ``TIMESTAMP WITH TIME ZONE`` and ``TIME WITH TIME ZONE`` data types, if timezone information is present in decoded value, it will
-be used as Trino value. Otherwise result time zone will be set to ``UTC``.
-
-Avro decoder
-""""""""""""
-
-The Avro decoder converts the bytes representing a message or key in
-Avro format based on a schema. The message must have the Avro schema embedded.
-Trino does not support schemaless Avro decoding.
-
-For key/message, using ``avro`` decoder, the ``dataSchema`` must be defined.
-This should point to the location of a valid Avro schema file of the message which needs to be decoded. This location can be a remote web server
-(e.g.: ``dataSchema: 'http://example.org/schema/avro_data.avsc'``) or local file system(e.g.: ``dataSchema: '/usr/local/schema/avro_data.avsc'``).
-The decoder fails if this location is not accessible from the Trino coordinator node.
-
-For fields, the following attributes are supported:
-
-* ``name`` - Name of the column in the Trino table.
-* ``type`` - Trino data type of column.
-* ``mapping`` - A slash-separated list of field names to select a field from the Avro schema. If field specified in ``mapping`` does not exist in the original Avro schema, then a read operation returns ``NULL``.
-
-The following table lists the supported Trino types which can be used in ``type`` for the equivalent Avro field types:
-
-===================================== =======================================
-Trino data type                       Allowed Avro data type
-===================================== =======================================
-``BIGINT``                            ``INT``, ``LONG``
-``DOUBLE``                            ``DOUBLE``, ``FLOAT``
-``BOOLEAN``                           ``BOOLEAN``
-``VARCHAR`` / ``VARCHAR(x)``          ``STRING``
-``VARBINARY``                         ``FIXED``, ``BYTES``
-``ARRAY``                             ``ARRAY``
-``MAP``                               ``MAP``
-===================================== =======================================
-
-No other types are supported.
-
-Avro schema evolution
-+++++++++++++++++++++
-
-The Avro decoder supports schema evolution feature with backward compatibility. With backward compatibility,
-a newer schema can be used to read Avro data created with an older schema. Any change in the Avro schema must also be
-reflected in Trino's topic definition file. Newly added/renamed fields *must* have a default value in the Avro schema file.
-
-The schema evolution behavior is as follows:
-
-* Column added in new schema:
-  Data created with an older schema produces a *default* value when the table is using the new schema.
-
-* Column removed in new schema:
-  Data created with an older schema no longer outputs the data from the column that was removed.
-
-* Column is renamed in the new schema:
-  This is equivalent to removing the column and adding a new one, and data created with an older schema
-  produces a *default* value when table is using the new schema.
-
-* Changing type of column in the new schema:
-  If the type coercion is supported by Avro, then the conversion happens. An
-  error is thrown for incompatible types.
-
-Protobuf decoder
-""""""""""""""""
-
-The Protobuf decoder converts the bytes representing a message or key in
-Protobuf formatted message based on a schema.
-
-For key/message, using the ``protobuf`` decoder, the ``dataSchema`` must be
-defined. It points to the location of a valid ``proto`` file of the message
-which needs to be decoded. This location can be a remote web server,
-``dataSchema: 'http://example.org/schema/schema.proto'``,  or local file,
-``dataSchema: '/usr/local/schema/schema.proto'``. The decoder fails if the
-location is not accessible from the coordinator.
-
-For fields, the following attributes are supported:
-
-* ``name`` - Name of the column in the Trino table.
-* ``type`` - Trino data type of column.
-* ``mapping`` - slash-separated list of field names to select a field from the
-  Protobuf schema. If field specified in ``mapping`` does not exist in the
-  original ``proto`` file then a read operation returns NULL.
-
-The following table lists the supported Trino types which can be used in
-``type`` for the equivalent Protobuf field types:
-
-===================================== =======================================
-Trino data type                       Allowed Protobuf data type
-===================================== =======================================
-``BOOLEAN``                           ``bool``
-``INTEGER``                           ``int32``, ``uint32``, ``sint32``, ``fixed32``, ``sfixed32``
-``BIGINT``                            ``int64``, ``uint64``, ``sint64``, ``fixed64``, ``sfixed64``
-``DOUBLE``                            ``double``
-``REAL``                              ``float``
-``VARCHAR`` / ``VARCHAR(x)``          ``string``
-``VARBINARY``                         ``bytes``
-``ROW``                               ``Message``
-``ARRAY``                             Protobuf type with ``repeated`` field
-``MAP``                               ``Map``
-``TIMESTAMP``                         ``Timestamp``, predefined in ``timestamp.proto``
-===================================== =======================================
-
-Protobuf schema evolution
-+++++++++++++++++++++++++
-
-The Protobuf decoder supports the schema evolution feature with backward
-compatibility. With backward compatibility, a newer schema can be used to read
-Protobuf data created with an older schema. Any change in the Protobuf schema
-*must* also be reflected in the topic definition file.
-
-The schema evolution behavior is as follows:
-
-* Column added in new schema:
-  Data created with an older schema produces a *default* value when the table is using the new schema.
-
-* Column removed in new schema:
-  Data created with an older schema no longer outputs the data from the column that was removed.
-
-* Column is renamed in the new schema:
-  This is equivalent to removing the column and adding a new one, and data created with an older schema
-  produces a *default* value when table is using the new schema.
-
-* Changing type of column in the new schema:
-  If the type coercion is supported by Protobuf, then the conversion happens. An error is thrown for incompatible types.
-
-Protobuf limitations
-++++++++++++++++++++
-
-* Protobuf specific types like ``any``, ``oneof`` are not supported.
-* Protobuf Timestamp has a nanosecond precision but Trino supports
-  decoding/encoding at microsecond precision.
-
-.. _kafka-sql-support:
-
-SQL support
------------
-
-The connector provides read and write access to data and metadata in Trino
-tables populated by Kafka topics. See :ref:`kafka-row-decoding` for more
-information.
-
-In addition to the :ref:`globally available <sql-globally-available>`
-and :ref:`read operation <sql-read-operations>` statements, the connector
-supports the following features:
-
-* :doc:`/sql/insert`, encoded to a specified data format. See also
-  :ref:`kafka-sql-inserts`.
diff --git a/docs/src/main/sphinx/connector/kinesis.md b/docs/src/main/sphinx/connector/kinesis.md
new file mode 100644
index 000000000000..116cbfd0e901
--- /dev/null
+++ b/docs/src/main/sphinx/connector/kinesis.md
@@ -0,0 +1,276 @@
+# Kinesis connector
+
+```{raw} html
+<img src="../_static/img/kinesis.png" class="connector-logo">
+```
+
+[Kinesis](https://aws.amazon.com/kinesis/) is Amazon's fully managed cloud-based service for real-time processing of large, distributed data streams.
+
+This connector allows the use of Kinesis streams as tables in Trino, such that each data-blob/message
+in a Kinesis stream is presented as a row in Trino. A flexible table mapping approach lets us
+treat fields of the messages as columns in the table.
+
+Under the hood, a Kinesis
+[shard iterator](https://docs.aws.amazon.com/kinesis/latest/APIReference/API_GetShardIterator.html)
+is used to retrieve the records, along with a series of
+[GetRecords](https://docs.aws.amazon.com/kinesis/latest/APIReference/API_GetRecords.html) calls.
+The shard iterator starts by default 24 hours before the current time, and works its way forward.
+To be able to query a stream, table mappings are needed. These table definitions can be
+stored on Amazon S3 (preferred), or stored in a local directory on each Trino node.
+
+This connector is a **read-only** connector. It can only fetch data from Kinesis streams,
+but cannot create streams or push data into existing streams.
+
+To configure the Kinesis connector, create a catalog properties file
+`etc/catalog/example.properties` with the following contents, replacing the
+properties as appropriate:
+
+```text
+connector.name=kinesis
+kinesis.access-key=XXXXXX
+kinesis.secret-key=XXXXXX
+```
+
+## Configuration properties
+
+The following configuration properties are available:
+
+| Property name                                | Description                                                           |
+| -------------------------------------------- | --------------------------------------------------------------------- |
+| `kinesis.access-key`                         | Access key to AWS account or blank to use default provider chain      |
+| `kinesis.secret-key`                         | Secret key to AWS account or blank to use default provider chain      |
+| `kinesis.aws-region`                         | AWS region to be used to read kinesis stream from                     |
+| `kinesis.default-schema`                     | Default schema name for tables                                        |
+| `kinesis.table-description-location`         | Directory containing table description files                          |
+| `kinesis.table-description-refresh-interval` | How often to get the table description from S3                        |
+| `kinesis.hide-internal-columns`              | Controls whether internal columns are part of the table schema or not |
+| `kinesis.batch-size`                         | Maximum number of records to return in one batch                      |
+| `kinesis.fetch-attempts`                     | Read attempts made when no records returned and not caught up         |
+| `kinesis.max-batches`                        | Maximum batches to read from Kinesis in one single query              |
+| `kinesis.sleep-time`                         | Time for thread to sleep waiting to make next attempt to fetch batch  |
+| `kinesis.iterator-from-timestamp`            | Begin iterating from a given timestamp instead of the trim horizon    |
+| `kinesis.iterator-offset-seconds`            | Number of seconds before current time to start iterating              |
+
+### `kinesis.access-key`
+
+Defines the access key ID for AWS root account or IAM roles, which is used to sign programmatic requests to AWS Kinesis.
+
+This property is optional; if not defined, the connector tries to follow `Default-Credential-Provider-Chain` provided by AWS in the following order:
+
+- Environment Variable: Load credentials from environment variables `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`.
+- Java System Variable: Load from java system as `aws.accessKeyId` and `aws.secretKey`.
+- Profile Credentials File: Load from file typically located at `~/.aws/credentials`.
+- Instance profile credentials: These credentials can be used on EC2 instances, and are delivered through the Amazon EC2 metadata service.
+
+### `kinesis.secret-key`
+
+Defines the secret key for AWS root account or IAM roles, which together with Access Key ID, is used to sign programmatic requests to AWS Kinesis.
+
+This property is optional; if not defined, connector will try to follow `Default-Credential-Provider-Chain` same as above.
+
+### `kinesis.aws-region`
+
+Defines AWS Kinesis regional endpoint. Selecting appropriate region may reduce latency in fetching data.
+
+This field is optional; The default region is `us-east-1` referring to end point 'kinesis.us-east-1.amazonaws.com'.
+
+See [Kinesis Data Streams regions](https://docs.aws.amazon.com/general/latest/gr/rande.html#ak_region)
+for a current list of available regions.
+
+### `kinesis.default-schema`
+
+Defines the schema which contains all tables that were defined without a qualifying schema name.
+
+This property is optional; the default is `default`.
+
+### `kinesis.table-description-location`
+
+References an S3 URL or a folder within Trino deployment that holds one or more JSON files ending with `.json`, which contain table description files.
+The S3 bucket and folder will be checked every 10 minutes for updates and changed files.
+
+This property is optional; the default is `etc/kinesis`.
+
+### `kinesis.table-description-refresh-interval`
+
+This property controls how often the table description is refreshed from S3.
+
+This property is optional; the default is `10m`.
+
+### `kinesis.batch-size`
+
+Defines the maximum number of records to return in one request to Kinesis Streams. Maximum limit is `10000` records.
+
+This field is optional; the default value is `10000`.
+
+### `kinesis.max-batches`
+
+The maximum number of batches to read in a single query. The default value is `1000`.
+
+### `kinesis.fetch-attempts`
+
+Defines the number of attempts made to read a batch from Kinesis Streams, when no records are returned and the *millis behind latest*
+parameter shows we are not yet caught up. When records are returned no additional attempts are necessary.
+`GetRecords` has been observed to return no records even though the shard is not empty.
+That is why multiple attempts need to be made.
+
+This field is optional; the default value is `2`.
+
+### `kinesis.sleep-time`
+
+Defines the duration for which a thread needs to sleep between `kinesis.fetch-attempts` made to fetch data.
+
+This field is optional; the default value is `1000ms`.
+
+### `kinesis.iterator-from-timestamp`
+
+Use an initial shard iterator type of `AT_TIMESTAMP` starting `kinesis.iterator-offset-seconds` before the current time.
+When this is false, an iterator type of `TRIM_HORIZON` is used, meaning it starts from the oldest record in the stream.
+
+The default is true.
+
+### `kinesis.iterator-offset-seconds`
+
+When `kinesis.iterator-from-timestamp` is true, the shard iterator starts at `kinesis.iterator-offset-seconds` before the current time.
+
+The default is `86400` seconds (24 hours).
+
+### `kinesis.hide-internal-columns`
+
+In addition to the data columns defined in a table description file, the connector maintains a number of additional columns for each table.
+If these columns are hidden, they can still be used in queries, but they do not show up in `DESCRIBE <table-name>` or `SELECT *`.
+
+This property is optional; the default is true.
+
+## Internal columns
+
+For each defined table, the connector maintains the following columns:
+
+| Column name          | Type        | Description                                                                                                                                                                         |
+| -------------------- | ----------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `_shard_id`          | `VARCHAR`   | ID of the Kinesis stream shard which contains this row.                                                                                                                             |
+| `_shard_sequence_id` | `VARCHAR`   | Sequence id within the Kinesis shard for this row.                                                                                                                                  |
+| `_segment_start`     | `BIGINT`    | Lowest offset in the segment (inclusive) which contains this row. This offset is partition specific.                                                                                |
+| `_segment_end`       | `BIGINT`    | Highest offset in the segment (exclusive) which contains this row. The offset is partition specific. This is the same value as `_segment_start` of the next segment (if it exists). |
+| `_segment_count`     | `BIGINT`    | Running count for the current row within the segment. For an uncompacted topic, `_segment_start + _segment_count` is equal to `_partition_offset`.                                  |
+| `_message_valid`     | `BOOLEAN`   | True if the decoder could decode the message successfully for this row. When false, data columns mapped from the message should be treated as invalid.                              |
+| `_message`           | `VARCHAR`   | Message bytes as an UTF-8 encoded string. This is only useful for a text topic.                                                                                                     |
+| `_message_length`    | `BIGINT`    | Number of bytes in the message.                                                                                                                                                     |
+| `_message_timestamp` | `TIMESTAMP` | Approximate arrival time of the message (milliseconds granularity).                                                                                                                 |
+| `_key`               | `VARCHAR`   | Key bytes as an UTF-8 encoded string. This is only useful for textual keys.                                                                                                         |
+| `_partition_key`     | `VARCHAR`   | Partition Key bytes as a UTF-8 encoded string.                                                                                                                                      |
+
+For tables without a table definition file, the `_message_valid` column is always `true`.
+
+## Table definition
+
+A table definition file consists of a JSON definition for a table, which corresponds to one stream in Kinesis.
+The name of the file can be arbitrary but must end in `.json`. The structure of the table definition is as follows:
+
+```text
+{
+      "tableName": ...,
+      "schemaName": ...,
+      "streamName": ...,
+      "message": {
+          "dataFormat": ...,
+          "fields": [
+              ...
+         ]
+      }
+  }
+```
+
+| Field        | Required | Type        | Description                                                                   |
+| ------------ | -------- | ----------- | ----------------------------------------------------------------------------- |
+| `tableName`  | required | string      | Trino table name defined by this file.                                        |
+| `schemaName` | optional | string      | Schema which contains the table. If omitted, the default schema name is used. |
+| `streamName` | required | string      | Name of the Kinesis Stream that is mapped                                     |
+| `message`    | optional | JSON object | Field definitions for data columns mapped to the message itself.              |
+
+Every message in a Kinesis stream can be decoded using the definition provided in the message object.
+The JSON object message in the table definition contains two fields:
+
+| Field        | Required | Type       | Description                                                                                 |
+| ------------ | -------- | ---------- | ------------------------------------------------------------------------------------------- |
+| `dataFormat` | required | string     | Selects the decoder for this group of fields.                                               |
+| `fields`     | required | JSON array | A list of field definitions. Each field definition creates a new column in the Trino table. |
+
+Each field definition is a JSON object. At a minimum, a name, type, and mapping must be provided.
+The overall structure looks like this:
+
+```text
+{
+    "name": ...,
+    "type": ...,
+    "dataFormat": ...,
+    "mapping": ...,
+    "formatHint": ...,
+    "hidden": ...,
+    "comment": ...
+}
+```
+
+| Field        | Required | Type    | Description                                                                                                          |
+| ------------ | -------- | ------- | -------------------------------------------------------------------------------------------------------------------- |
+| `name`       | required | string  | Name of the column in the Trino table.                                                                               |
+| `type`       | required | string  | Trino type of the column.                                                                                            |
+| `dataFormat` | optional | string  | Selects the column decoder for this field. Defaults to the default decoder for this row data format and column type. |
+| `mapping`    | optional | string  | Mapping information for the column. This is decoder specific -- see below.                                           |
+| `formatHint` | optional | string  | Sets a column specific format hint to the column decoder.                                                            |
+| `hidden`     | optional | boolean | Hides the column from `DESCRIBE <table name>` and `SELECT *`. Defaults to `false`.                                   |
+| `comment`    | optional | string  | Adds a column comment which is shown with `DESCRIBE <table name>`.                                                   |
+
+The name field is exposed to Trino as the column name, while the mapping field is the portion of the message that gets
+mapped to that column. For JSON object messages, this refers to the field name of an object, and can be a path that drills
+into the object structure of the message. Additionally, you can map a field of the JSON object to a string column type,
+and if it is a more complex type (JSON array or JSON object) then the JSON itself becomes the field value.
+
+There is no limit on field descriptions for either key or message.
+
+(kinesis-type-mapping)=
+
+## Type mapping
+
+Because Trino and Kinesis each support types that the other does not, this
+connector {ref}`maps some types <type-mapping-overview>` when reading data. Type
+mapping depends on the RAW, CSV, JSON, and AVRO file formats.
+
+### Row decoding
+
+A decoder is used to map data to table columns.
+
+The connector contains the following decoders:
+
+- `raw`: Message is not interpreted; ranges of raw message bytes are mapped
+  to table columns.
+- `csv`: Message is interpreted as comma separated message, and fields are
+  mapped to table columns.
+- `json`: Message is parsed as JSON, and JSON fields are mapped to table
+  columns.
+- `avro`: Message is parsed based on an Avro schema, and Avro fields are
+  mapped to table columns.
+
+:::{note}
+If no table definition file exists for a table, the `dummy` decoder is
+used, which does not expose any columns.
+:::
+
+```{include} raw-decoder.fragment
+```
+
+```{include} csv-decoder.fragment
+```
+
+```{include} json-decoder.fragment
+```
+
+```{include} avro-decoder.fragment
+```
+
+(kinesis-sql-support)=
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements to access data and
+metadata from Kinesis streams.
diff --git a/docs/src/main/sphinx/connector/kinesis.rst b/docs/src/main/sphinx/connector/kinesis.rst
deleted file mode 100644
index ce11ef92779c..000000000000
--- a/docs/src/main/sphinx/connector/kinesis.rst
+++ /dev/null
@@ -1,271 +0,0 @@
-=================
-Kinesis connector
-=================
-
-.. raw:: html
-
-  <img src="../_static/img/kinesis.png" class="connector-logo">
-
-`Kinesis <https://aws.amazon.com/kinesis/>`_ is Amazon's fully managed cloud-based service for real-time processing of large, distributed data streams.
-
-This connector allows the use of Kinesis streams as tables in Trino, such that each data-blob/message
-in a Kinesis stream is presented as a row in Trino. A flexible table mapping approach lets us
-treat fields of the messages as columns in the table.
-
-Under the hood, a Kinesis
-`shard iterator <https://docs.aws.amazon.com/kinesis/latest/APIReference/API_GetShardIterator.html>`_
-is used to retrieve the records, along with a series of
-`GetRecords <https://docs.aws.amazon.com/kinesis/latest/APIReference/API_GetRecords.html>`_ calls.
-The shard iterator starts by default 24 hours before the current time, and works its way forward.
-To be able to query a stream, table mappings are needed. These table definitions can be
-stored on Amazon S3 (preferred), or stored in a local directory on each Trino node.
-
-This connector is a **read-only** connector. It can only fetch data from Kinesis streams,
-but cannot create streams or push data into existing streams.
-
-To configure the Kinesis connector, create a catalog properties file
-``etc/catalog/example.properties`` with the following contents, replacing the
-properties as appropriate:
-
-.. code-block:: text
-
-    connector.name=kinesis
-    kinesis.access-key=XXXXXX
-    kinesis.secret-key=XXXXXX
-
-Configuration properties
-------------------------
-
-The following configuration properties are available:
-
-==============================================  =======================================================================
-Property name                                   Description
-==============================================  =======================================================================
-``kinesis.access-key``                          Access key to AWS account or blank to use default provider chain
-``kinesis.secret-key``                          Secret key to AWS account or blank to use default provider chain
-``kinesis.aws-region``                          AWS region to be used to read kinesis stream from
-``kinesis.default-schema``                      Default schema name for tables
-``kinesis.table-description-location``          Directory containing table description files
-``kinesis.table-description-refresh-interval``  How often to get the table description from S3
-``kinesis.hide-internal-columns``               Controls whether internal columns are part of the table schema or not
-``kinesis.batch-size``                          Maximum number of records to return in one batch
-``kinesis.fetch-attempts``                      Read attempts made when no records returned and not caught up
-``kinesis.max-batches``                         Maximum batches to read from Kinesis in one single query
-``kinesis.sleep-time``                          Time for thread to sleep waiting to make next attempt to fetch batch
-``kinesis.iterator-from-timestamp``             Begin iterating from a given timestamp instead of the trim horizon
-``kinesis.iterator-offset-seconds``             Number of seconds before current time to start iterating
-==============================================  =======================================================================
-
-``kinesis.access-key``
-^^^^^^^^^^^^^^^^^^^^^^
-
-Defines the access key ID for AWS root account or IAM roles, which is used to sign programmatic requests to AWS Kinesis.
-
-This property is optional; if not defined, the connector tries to follow ``Default-Credential-Provider-Chain`` provided by AWS in the following order:
-
-* Environment Variable: Load credentials from environment variables ``AWS_ACCESS_KEY_ID`` and ``AWS_SECRET_ACCESS_KEY``.
-* Java System Variable: Load from java system as ``aws.accessKeyId`` and ``aws.secretKey``.
-* Profile Credentials File: Load from file typically located at ``~/.aws/credentials``.
-* Instance profile credentials: These credentials can be used on EC2 instances, and are delivered through the Amazon EC2 metadata service.
-
-``kinesis.secret-key``
-^^^^^^^^^^^^^^^^^^^^^^
-
-Defines the secret key for AWS root account or IAM roles, which together with Access Key ID, is used to sign programmatic requests to AWS Kinesis.
-
-This property is optional; if not defined, connector will try to follow ``Default-Credential-Provider-Chain`` same as above.
-
-``kinesis.aws-region``
-^^^^^^^^^^^^^^^^^^^^^^
-
-Defines AWS Kinesis regional endpoint. Selecting appropriate region may reduce latency in fetching data.
-
-This field is optional; The default region is ``us-east-1`` referring to end point 'kinesis.us-east-1.amazonaws.com'.
-
-See `Kinesis Data Streams regions <https://docs.aws.amazon.com/general/latest/gr/rande.html#ak_region>`_
-for a current list of available regions.
-
-
-``kinesis.default-schema``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Defines the schema which contains all tables that were defined without a qualifying schema name.
-
-This property is optional; the default is ``default``.
-
-``kinesis.table-description-location``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-References an S3 URL or a folder within Trino deployment that holds one or more JSON files ending with ``.json``, which contain table description files.
-The S3 bucket and folder will be checked every 10 minutes for updates and changed files.
-
-This property is optional; the default is ``etc/kinesis``.
-
-``kinesis.table-description-refresh-interval``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This property controls how often the table description is refreshed from S3.
-
-This property is optional; the default is ``10m``.
-
-``kinesis.batch-size``
-^^^^^^^^^^^^^^^^^^^^^^
-
-Defines the maximum number of records to return in one request to Kinesis Streams. Maximum limit is ``10000`` records.
-
-This field is optional; the default value is ``10000``.
-
-``kinesis.max-batches``
-^^^^^^^^^^^^^^^^^^^^^^^
-
-The maximum number of batches to read in a single query. The default value is ``1000``.
-
-``kinesis.fetch-attempts``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Defines the number of attempts made to read a batch from Kinesis Streams, when no records are returned and the *millis behind latest*
-parameter shows we are not yet caught up. When records are returned no additional attempts are necessary.
-``GetRecords`` has been observed to return no records even though the shard is not empty.
-That is why multiple attempts need to be made.
-
-This field is optional; the default value is ``2``.
-
-``kinesis.sleep-time``
-^^^^^^^^^^^^^^^^^^^^^^
-
-Defines the duration for which a thread needs to sleep between ``kinesis.fetch-attempts`` made to fetch data.
-
-This field is optional; the default value is ``1000ms``.
-
-``kinesis.iterator-from-timestamp``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Use an initial shard iterator type of ``AT_TIMESTAMP`` starting ``kinesis.iterator-offset-seconds`` before the current time.
-When this is false, an iterator type of ``TRIM_HORIZON`` is used, meaning it starts from the oldest record in the stream.
-
-The default is true.
-
-``kinesis.iterator-offset-seconds``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-When ``kinesis.iterator-from-timestamp`` is true, the shard iterator starts at ``kinesis.iterator-offset-seconds`` before the current time.
-
-The default is ``86400`` seconds (24 hours).
-
-``kinesis.hide-internal-columns``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In addition to the data columns defined in a table description file, the connector maintains a number of additional columns for each table.
-If these columns are hidden, they can still be used in queries, but they do not show up in ``DESCRIBE <table-name>`` or ``SELECT *``.
-
-This property is optional; the default is true.
-
-Internal columns
-----------------
-For each defined table, the connector maintains the following columns:
-
-========================= ============= ==================================================================================
-Column name               Type          Description
-========================= ============= ==================================================================================
-``_shard_id``             ``VARCHAR``   ID of the Kinesis stream shard which contains this row.
-``_shard_sequence_id``    ``VARCHAR``   Sequence id within the Kinesis shard for this row.
-``_segment_start``        ``BIGINT``    Lowest offset in the segment (inclusive) which contains this row.
-                                        This offset is partition specific.
-``_segment_end``          ``BIGINT``    Highest offset in the segment (exclusive) which contains this row.
-                                        The offset is partition specific.
-                                        This is the same value as ``_segment_start`` of the next segment (if it exists).
-``_segment_count``        ``BIGINT``    Running count for the current row within the segment. For an uncompacted topic,
-                                        ``_segment_start + _segment_count`` is equal to ``_partition_offset``.
-``_message_valid``        ``BOOLEAN``   True if the decoder could decode the message successfully for this row.
-                                        When false, data columns mapped from the message should be treated as invalid.
-``_message``              ``VARCHAR``   Message bytes as an UTF-8 encoded string. This is only useful for a text topic.
-``_message_length``       ``BIGINT``    Number of bytes in the message.
-``_message_timestamp``    ``TIMESTAMP`` Approximate arrival time of the message (milliseconds granularity).
-``_key``                  ``VARCHAR``   Key bytes as an UTF-8 encoded string. This is only useful for textual keys.
-``_partition_key``        ``VARCHAR``   Partition Key bytes as a UTF-8 encoded string.
-========================= ============= ==================================================================================
-
-For tables without a table definition file, the ``_message_valid`` column is always ``true``.
-
-Table definition
-----------------
-
-A table definition file consists of a JSON definition for a table, which corresponds to one stream in Kinesis.
-The name of the file can be arbitrary but must end in ``.json``. The structure of the table definition is as follows:
-
-.. code-block:: text
-
-  {
-        "tableName": ...,
-        "schemaName": ...,
-        "streamName": ...,
-        "message": {
-            "dataFormat": ...,
-            "fields": [
-                ...
-           ]
-        }
-    }
-
-==============  ========  ===========  ==================================================================================
-Field           Required  Type         Description
-==============  ========  ===========  ==================================================================================
-``tableName``   required  string       Trino table name defined by this file.
-``schemaName``  optional  string       Schema which contains the table. If omitted, the default schema name is used.
-``streamName``  required  string       Name of the Kinesis Stream that is mapped
-``message``     optional  JSON object  Field definitions for data columns mapped to the message itself.
-==============  ========  ===========  ==================================================================================
-
-Every message in a Kinesis stream can be decoded using the definition provided in the message object.
-The JSON object message in the table definition contains two fields:
-
-==============  ========  ===========  ==============================================================================================
-Field           Required  Type         Description
-==============  ========  ===========  ==============================================================================================
-``dataFormat``  required  string       Selects the decoder for this group of fields.
-``fields``      required  JSON array   A list of field definitions. Each field definition creates a new column in the Trino table.
-==============  ========  ===========  ==============================================================================================
-
-Each field definition is a JSON object. At a minimum, a name, type, and mapping must be provided.
-The overall structure looks like this:
-
-.. code-block:: text
-
-    {
-        "name": ...,
-        "type": ...,
-        "dataFormat": ...,
-        "mapping": ...,
-        "formatHint": ...,
-        "hidden": ...,
-        "comment": ...
-    }
-
-==============  ========  ===========  =========================================================================================
-Field           Required  Type         Description
-==============  ========  ===========  =========================================================================================
-``name``        required  string       Name of the column in the Trino table.
-``type``        required  string       Trino type of the column.
-``dataFormat``  optional  string       Selects the column decoder for this field. Defaults to
-                                       the default decoder for this row data format and column type.
-``mapping``     optional  string       Mapping information for the column. This is decoder specific -- see below.
-``formatHint``  optional  string       Sets a column specific format hint to the column decoder.
-``hidden``      optional  boolean      Hides the column from ``DESCRIBE <table name>`` and ``SELECT *``. Defaults to ``false``.
-``comment``     optional  string       Adds a column comment which is shown with ``DESCRIBE <table name>``.
-==============  ========  ===========  =========================================================================================
-
-The name field is exposed to Trino as the column name, while the mapping field is the portion of the message that gets
-mapped to that column. For JSON object messages, this refers to the field name of an object, and can be a path that drills
-into the object structure of the message. Additionally, you can map a field of the JSON object to a string column type,
-and if it is a more complex type (JSON array or JSON object) then the JSON itself becomes the field value.
-
-There is no limit on field descriptions for either key or message.
-
-.. _kinesis-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access data and
-metadata from Kinesis streams.
diff --git a/docs/src/main/sphinx/connector/kudu.md b/docs/src/main/sphinx/connector/kudu.md
new file mode 100644
index 000000000000..70fab26ba2ce
--- /dev/null
+++ b/docs/src/main/sphinx/connector/kudu.md
@@ -0,0 +1,610 @@
+# Kudu connector
+
+```{raw} html
+<img src="../_static/img/kudu.png" class="connector-logo">
+```
+
+The Kudu connector allows querying, inserting and deleting data in [Apache Kudu].
+
+## Requirements
+
+To connect to Kudu, you need:
+
+- Kudu version 1.13.0 or higher.
+- Network access from the Trino coordinator and workers to Kudu. Port 7051 is
+  the default port.
+
+## Configuration
+
+To configure the Kudu connector, create a catalog properties file
+`etc/catalog/kudu.properties` with the following contents,
+replacing the properties as appropriate:
+
+```properties
+connector.name=kudu
+
+## Defaults to NONE
+kudu.authentication.type = NONE
+
+## List of Kudu master addresses, at least one is needed (comma separated)
+## Supported formats: example.com, example.com:7051, 192.0.2.1, 192.0.2.1:7051,
+##                    [2001:db8::1], [2001:db8::1]:7051, 2001:db8::1
+kudu.client.master-addresses=localhost
+
+## Kudu does not support schemas, but the connector can emulate them optionally.
+## By default, this feature is disabled, and all tables belong to the default schema.
+## For more details see connector documentation.
+#kudu.schema-emulation.enabled=false
+
+## Prefix to use for schema emulation (only relevant if `kudu.schema-emulation.enabled=true`)
+## The standard prefix is `presto::`. Empty prefix is also supported.
+## For more details see connector documentation.
+#kudu.schema-emulation.prefix=
+
+###########################################
+### Advanced Kudu Java client configuration
+###########################################
+
+## Default timeout used for administrative operations (e.g. createTable, deleteTable, etc.)
+#kudu.client.default-admin-operation-timeout = 30s
+
+## Default timeout used for user operations
+#kudu.client.default-operation-timeout = 30s
+
+## Disable Kudu client's collection of statistics.
+#kudu.client.disable-statistics = false
+
+## Assign Kudu splits to replica host if worker and kudu share the same cluster
+#kudu.allow-local-scheduling = false
+```
+
+## Kerberos support
+
+In order to connect to a kudu cluster that uses `kerberos`
+authentication, you need to configure the following kudu properties:
+
+```properties
+kudu.authentication.type = KERBEROS
+
+## The kerberos client principal name
+kudu.authentication.client.principal = clientprincipalname
+
+## The path to the kerberos keytab file
+## The configured client principal must exist in this keytab file
+kudu.authentication.client.keytab = /path/to/keytab/file.keytab
+
+## The path to the krb5.conf kerberos config file
+kudu.authentication.config = /path/to/kerberos/krb5.conf
+
+## Optional and defaults to "kudu"
+## If kudu is running with a custom SPN this needs to be configured
+kudu.authentication.server.principal.primary = kudu
+```
+
+## Querying data
+
+Apache Kudu does not support schemas, i.e. namespaces for tables.
+The connector can optionally emulate schemas by table naming conventions.
+
+### Default behaviour (without schema emulation)
+
+The emulation of schemas is disabled by default.
+In this case all Kudu tables are part of the `default` schema.
+
+For example, a Kudu table named `orders` can be queried in Trino
+with `SELECT * FROM example.default.orders` or simple with `SELECT * FROM orders`
+if catalog and schema are set to `kudu` and `default` respectively.
+
+Table names can contain any characters in Kudu. In this case, use double quotes.
+E.g. To query a Kudu table named `special.table!` use `SELECT * FROM example.default."special.table!"`.
+
+#### Example
+
+- Create a users table in the default schema:
+
+  ```
+  CREATE TABLE example.default.users (
+    user_id int WITH (primary_key = true),
+    first_name VARCHAR,
+    last_name VARCHAR
+  ) WITH (
+    partition_by_hash_columns = ARRAY['user_id'],
+    partition_by_hash_buckets = 2
+  );
+  ```
+
+  On creating a Kudu table you must/can specify additional information about
+  the primary key, encoding, and compression of columns and hash or range
+  partitioning. For details see the {ref}`kudu-create-table` section.
+
+- Describe the table:
+
+  ```
+  DESCRIBE example.default.users;
+  ```
+
+  ```text
+     Column   |  Type   |                      Extra                      | Comment
+  ------------+---------+-------------------------------------------------+---------
+   user_id    | integer | primary_key, encoding=auto, compression=default |
+   first_name | varchar | nullable, encoding=auto, compression=default    |
+   last_name  | varchar | nullable, encoding=auto, compression=default    |
+  (3 rows)
+  ```
+
+- Insert some data:
+
+  ```
+  INSERT INTO example.default.users VALUES (1, 'Donald', 'Duck'), (2, 'Mickey', 'Mouse');
+  ```
+
+- Select the inserted data:
+
+  ```
+  SELECT * FROM example.default.users;
+  ```
+
+(behavior-with-schema-emulation)=
+
+### Behavior with schema emulation
+
+If schema emulation has been enabled in the connector properties, i.e.
+`etc/catalog/example.properties`, tables are mapped to schemas depending on
+some conventions.
+
+- With `kudu.schema-emulation.enabled=true` and `kudu.schema-emulation.prefix=`,
+  the mapping works like:
+
+  | Kudu table name | Trino qualified name  |
+  | --------------- | --------------------- |
+  | `orders`        | `kudu.default.orders` |
+  | `part1.part2`   | `kudu.part1.part2`    |
+  | `x.y.z`         | `kudu.x."y.z"`        |
+
+  As schemas are not directly supported by Kudu, a special table named
+  `$schemas` is created for managing the schemas.
+
+- With `kudu.schema-emulation.enabled=true` and `kudu.schema-emulation.prefix=presto::`,
+  the mapping works like:
+
+  | Kudu table name       | Trino qualified name         |
+  | --------------------- | ---------------------------- |
+  | `orders`              | `kudu.default.orders`        |
+  | `part1.part2`         | `kudu.default."part1.part2"` |
+  | `x.y.z`               | `kudu.default."x.y.z"`       |
+  | `presto::part1.part2` | `kudu.part1.part2`           |
+  | `presto:x.y.z`        | `kudu.x."y.z"`               |
+
+  As schemas are not directly supported by Kudu, a special table named
+  `presto::$schemas` is created for managing the schemas.
+
+(kudu-type-mapping)=
+
+## Type mapping
+
+Because Trino and Kudu each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+### Kudu type to Trino type mapping
+
+The connector maps Kudu types to the corresponding Trino types following
+this table:
+
+```{eval-rst}
+.. list-table:: Kudu type to Trino type mapping
+  :widths: 30, 20
+  :header-rows: 1
+
+  * - Kudu type
+    - Trino type
+  * - ``BOOL``
+    - ``BOOLEAN``
+  * - ``INT8``
+    - ``TINYINT``
+  * - ``INT16``
+    - ``SMALLINT``
+  * - ``INT32``
+    - ``INTEGER``
+  * - ``INT64``
+    - ``BIGINT``
+  * - ``FLOAT``
+    - ``REAL``
+  * - ``DOUBLE``
+    - ``DOUBLE``
+  * - ``DECIMAL(p,s)``
+    - ``DECIMAL(p,s)``
+  * - ``STRING``
+    - ``VARCHAR``
+  * - ``BINARY``
+    - ``VARBINARY``
+  * - ``UNIXTIME_MICROS``
+    - ``TIMESTAMP(3)``
+```
+
+No other types are supported.
+
+### Trino type to Kudu type mapping
+
+The connector maps Trino types to the corresponding Kudu types following
+this table:
+
+```{eval-rst}
+.. list-table:: Trino type to Kudu type mapping
+  :widths: 30, 20, 50
+  :header-rows: 1
+
+  * - Trino type
+    - Kudu type
+    - Notes
+  * - ``BOOLEAN``
+    - ``BOOL``
+    -
+  * - ``TINYINT``
+    - ``INT8``
+    -
+  * - ``SMALLINT``
+    - ``INT16``
+    -
+  * - ``INTEGER``
+    - ``INT32``
+    -
+  * - ``BIGINT``
+    - ``INT64``
+    -
+  * - ``REAL``
+    - ``FLOAT``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``DECIMAL(p,s)``
+    - ``DECIMAL(p,s)``
+    - Only supported for Kudu server >= 1.7.0
+  * - ``VARCHAR``
+    - ``STRING``
+    - The optional maximum length is lost
+  * - ``VARBINARY``
+    - ``BINARY``
+    -
+  * - ``DATE``
+    - ``STRING``
+    -
+  * - ``TIMESTAMP(3)``
+    - ``UNIXTIME_MICROS``
+    - µs resolution in Kudu column is reduced to ms resolution
+```
+
+No other types are supported.
+
+(kudu-sql-support)=
+
+## SQL support
+
+The connector provides read and write access to data and metadata in
+Kudu. In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {doc}`/sql/insert`, see also {ref}`kudu-insert`
+- {doc}`/sql/delete`
+- {doc}`/sql/merge`
+- {doc}`/sql/create-table`, see also {ref}`kudu-create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/alter-table`, see also {ref}`kudu-alter-table`
+- {doc}`/sql/create-schema`, see also {ref}`kudu-create-schema`
+- {doc}`/sql/drop-schema`, see also {ref}`kudu-drop-schema`
+
+(kudu-insert)=
+
+### Inserting into tables
+
+`INSERT INTO ... values` and `INSERT INTO ... select` behave like
+`UPSERT`.
+
+```{include} sql-delete-limitation.fragment
+```
+
+(kudu-create-schema)=
+
+### Creating schemas
+
+`CREATE SCHEMA` is only allowed if schema emulation is enabled. See the
+{ref}`behavior-with-schema-emulation` section.
+
+(kudu-drop-schema)=
+
+### Dropping schemas
+
+`DROP SCHEMA` is only allowed if schema emulation is enabled. See the
+{ref}`behavior-with-schema-emulation` section.
+
+(kudu-create-table)=
+
+### Creating a table
+
+On creating a Kudu table, you need to provide the columns and their types, of
+course, but Kudu needs information about partitioning and optionally
+for column encoding and compression.
+
+Simple Example:
+
+```
+CREATE TABLE user_events (
+  user_id INTEGER WITH (primary_key = true),
+  event_name VARCHAR WITH (primary_key = true),
+  message VARCHAR,
+  details VARCHAR WITH (nullable = true, encoding = 'plain')
+) WITH (
+  partition_by_hash_columns = ARRAY['user_id'],
+  partition_by_hash_buckets = 5,
+  number_of_replicas = 3
+);
+```
+
+The primary key consists of `user_id` and `event_name`. The table is partitioned into
+five partitions by hash values of the column `user_id`, and the `number_of_replicas` is
+explicitly set to 3.
+
+The primary key columns must always be the first columns of the column list.
+All columns used in partitions must be part of the primary key.
+
+The table property `number_of_replicas` is optional. It defines the
+number of tablet replicas, and must be an odd number. If it is not specified,
+the default replication factor from the Kudu master configuration is used.
+
+Kudu supports two different kinds of partitioning: hash and range partitioning.
+Hash partitioning distributes rows by hash value into one of many buckets.
+Range partitions distributes rows using a totally-ordered range partition key.
+The concrete range partitions must be created explicitly.
+Kudu also supports multi-level partitioning. A table must have at least one
+partitioning, either hash or range. It can have at most one range partitioning,
+but multiple hash partitioning 'levels'.
+
+For more details see [Partitioning design](kudu-partitioning-design).
+
+(kudu-column-properties)=
+### Column properties
+
+Besides column name and type, you can specify some more properties of a column.
+
+| Column property name | Type      | Description                                                                                                                                                                                                                                                                                                                              |
+| -------------------- | --------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `primary_key`        | `BOOLEAN` | If `true`, the column belongs to primary key columns. The Kudu primary key enforces a uniqueness constraint. Inserting a second row with the same primary key results in updating the existing row ('UPSERT'). See also [Primary Key Design] in the Kudu documentation.                                                                  |
+| `nullable`           | `BOOLEAN` | If `true`, the value can be null. Primary key columns must not be nullable.                                                                                                                                                                                                                                                              |
+| `encoding`           | `VARCHAR` | The column encoding can help to save storage space and to improve query performance. Kudu uses an auto encoding depending on the column type if not specified. Valid values are: `'auto'`, `'plain'`, `'bitshuffle'`, `'runlength'`, `'prefix'`, `'dictionary'`, `'group_varint'`. See also [Column encoding] in the Kudu documentation. |
+| `compression`        | `VARCHAR` | The encoded column values can be compressed. Kudu uses a default compression if not specified. Valid values are: `'default'`, `'no'`, `'lz4'`, `'snappy'`, `'zlib'`. See also [Column compression] in the Kudu documentation.                                                                                                            |
+
+Example:
+
+```sql
+CREATE TABLE example_table (
+  name VARCHAR WITH (primary_key = true, encoding = 'dictionary', compression = 'snappy'),
+  index BIGINT WITH (nullable = true, encoding = 'runlength', compression = 'lz4'),
+  comment VARCHAR WITH (nullable = true, encoding = 'plain', compression = 'default'),
+   ...
+) WITH (...);
+```
+
+(kudu-alter-table)=
+
+### Changing tables
+
+Adding a column to an existing table uses the SQL statement `ALTER TABLE ... ADD COLUMN ...`.
+You can specify the same column properties as on creating a table.
+
+Example:
+
+```
+ALTER TABLE example_table ADD COLUMN extraInfo VARCHAR WITH (nullable = true, encoding = 'plain')
+```
+
+See also [Column properties](kudu-column-properties).
+
+`ALTER TABLE ... RENAME COLUMN` is only allowed if not part of a primary key.
+
+`ALTER TABLE ... DROP COLUMN` is only allowed if not part of a primary key.
+
+## Procedures
+
+- `CALL example.system.add_range_partition` see {ref}`managing-range-partitions`
+- `CALL example.system.drop_range_partition` see {ref}`managing-range-partitions`
+
+
+(kudu-partitioning-design)=
+### Partitioning design
+
+A table must have at least one partitioning (either hash or range).
+It can have at most one range partitioning, but multiple hash partitioning 'levels'.
+For more details see Apache Kudu documentation: [Partitioning].
+
+If you create a Kudu table in Trino, the partitioning design is given by
+several table properties.
+
+#### Hash partitioning
+
+You can provide the first hash partition group with two table properties:
+
+The `partition_by_hash_columns` defines the column(s) belonging to the
+partition group and `partition_by_hash_buckets` the number of partitions to
+split the hash values range into. All partition columns must be part of the
+primary key.
+
+Example:
+
+```
+CREATE TABLE example_table (
+  col1 VARCHAR WITH (primary_key=true),
+  col2 VARCHAR WITH (primary_key=true),
+  ...
+) WITH (
+  partition_by_hash_columns = ARRAY['col1', 'col2'],
+  partition_by_hash_buckets = 4
+)
+```
+
+This defines a hash partitioning with the columns `col1` and `col2`
+distributed over 4 partitions.
+
+To define two separate hash partition groups, also use the second pair
+of table properties named `partition_by_second_hash_columns` and
+`partition_by_second_hash_buckets`.
+
+Example:
+
+```
+CREATE TABLE example_table (
+  col1 VARCHAR WITH (primary_key=true),
+  col2 VARCHAR WITH (primary_key=true),
+  ...
+) WITH (
+  partition_by_hash_columns = ARRAY['col1'],
+  partition_by_hash_buckets = 2,
+  partition_by_second_hash_columns = ARRAY['col2'],
+  partition_by_second_hash_buckets = 3
+)
+```
+
+This defines a two-level hash partitioning, with the first hash partition group
+over the column `col1` distributed over 2 buckets, and the second
+hash partition group over the column `col2` distributed over 3 buckets.
+As a result you have table with 2 x 3 = 6 partitions.
+
+#### Range partitioning
+
+You can provide at most one range partitioning in Apache Kudu. The columns
+are defined with the table property `partition_by_range_columns`.
+The ranges themselves are given either in the
+table property `range_partitions` on creating the table.
+Or alternatively, the procedures `kudu.system.add_range_partition` and
+`kudu.system.drop_range_partition` can be used to manage range
+partitions for existing tables. For both ways see below for more
+details.
+
+Example:
+
+```
+CREATE TABLE events (
+  rack VARCHAR WITH (primary_key=true),
+  machine VARCHAR WITH (primary_key=true),
+  event_time TIMESTAMP WITH (primary_key=true),
+  ...
+) WITH (
+  partition_by_hash_columns = ARRAY['rack'],
+  partition_by_hash_buckets = 2,
+  partition_by_second_hash_columns = ARRAY['machine'],
+  partition_by_second_hash_buckets = 3,
+  partition_by_range_columns = ARRAY['event_time'],
+  range_partitions = '[{"lower": null, "upper": "2018-01-01T00:00:00"},
+                       {"lower": "2018-01-01T00:00:00", "upper": null}]'
+)
+```
+
+This defines a tree-level partitioning with two hash partition groups and
+one range partitioning on the `event_time` column.
+Two range partitions are created with a split at “2018-01-01T00:00:00”.
+
+### Table property `range_partitions`
+
+With the `range_partitions` table property you specify the concrete
+range partitions to be created. The range partition definition itself
+must be given in the table property `partition_design` separately.
+
+Example:
+
+```
+CREATE TABLE events (
+  serialno VARCHAR WITH (primary_key = true),
+  event_time TIMESTAMP WITH (primary_key = true),
+  message VARCHAR
+) WITH (
+  partition_by_hash_columns = ARRAY['serialno'],
+  partition_by_hash_buckets = 4,
+  partition_by_range_columns = ARRAY['event_time'],
+  range_partitions = '[{"lower": null, "upper": "2017-01-01T00:00:00"},
+                       {"lower": "2017-01-01T00:00:00", "upper": "2017-07-01T00:00:00"},
+                       {"lower": "2017-07-01T00:00:00", "upper": "2018-01-01T00:00:00"}]'
+);
+```
+
+This creates a table with a hash partition on column `serialno` with 4
+buckets and range partitioning on column `event_time`. Additionally,
+three range partitions are created:
+
+1. for all event_times before the year 2017, lower bound = `null` means it is unbound
+2. for the first half of the year 2017
+3. for the second half the year 2017
+
+This means any attempt to add rows with `event_time` of year 2018 or greater fails, as no partition is defined.
+The next section shows how to define a new range partition for an existing table.
+
+(managing-range-partitions)=
+
+#### Managing range partitions
+
+For existing tables, there are procedures to add and drop a range
+partition.
+
+- adding a range partition
+
+  ```sql
+  CALL example.system.add_range_partition(<schema>, <table>, <range_partition_as_json_string>)
+  ```
+
+- dropping a range partition
+
+  ```sql
+  CALL example.system.drop_range_partition(<schema>, <table>, <range_partition_as_json_string>)
+  ```
+
+  - `<schema>`: schema of the table
+
+  - `<table>`: table names
+
+  - `<range_partition_as_json_string>`: lower and upper bound of the
+    range partition as JSON string in the form
+    `'{"lower": <value>, "upper": <value>}'`, or if the range partition
+    has multiple columns:
+    `'{"lower": [<value_col1>,...], "upper": [<value_col1>,...]}'`. The
+    concrete literal for lower and upper bound values are depending on
+    the column types.
+
+    Examples:
+
+    | Trino data Type | JSON string example                                                          |
+    | --------------- | ---------------------------------------------------------------------------- |
+    | `BIGINT`        | `‘{“lower”: 0, “upper”: 1000000}’`                                           |
+    | `SMALLINT`      | `‘{“lower”: 10, “upper”: null}’`                                             |
+    | `VARCHAR`       | `‘{“lower”: “A”, “upper”: “M”}’`                                             |
+    | `TIMESTAMP`     | `‘{“lower”: “2018-02-01T00:00:00.000”, “upper”: “2018-02-01T12:00:00.000”}’` |
+    | `BOOLEAN`       | `‘{“lower”: false, “upper”: true}’`                                          |
+    | `VARBINARY`     | values encoded as base64 strings                                             |
+
+    To specified an unbounded bound, use the value `null`.
+
+Example:
+
+```
+CALL example.system.add_range_partition('example_schema', 'events', '{"lower": "2018-01-01", "upper": "2018-06-01"}')
+```
+
+This adds a range partition for a table `events` in the schema
+`example_schema` with the lower bound `2018-01-01`, more exactly
+`2018-01-01T00:00:00.000`, and the upper bound `2018-07-01`.
+
+Use the SQL statement `SHOW CREATE TABLE` to query the existing
+range partitions (they are shown in the table property
+`range_partitions`).
+
+## Limitations
+
+- Only lower case table and column names in Kudu are supported.
+
+[apache kudu]: https://kudu.apache.org/
+[column compression]: https://kudu.apache.org/docs/schema_design.html#compression
+[column encoding]: https://kudu.apache.org/docs/schema_design.html#encoding
+[partitioning]: https://kudu.apache.org/docs/schema_design.html#partitioning
+[primary key design]: http://kudu.apache.org/docs/schema_design.html#primary-keys
diff --git a/docs/src/main/sphinx/connector/kudu.rst b/docs/src/main/sphinx/connector/kudu.rst
deleted file mode 100644
index 436188f9fbcf..000000000000
--- a/docs/src/main/sphinx/connector/kudu.rst
+++ /dev/null
@@ -1,655 +0,0 @@
-==============
-Kudu connector
-==============
-
-.. raw:: html
-
-  <img src="../_static/img/kudu.png" class="connector-logo">
-
-The Kudu connector allows querying, inserting and deleting data in `Apache Kudu`_.
-
-.. _Apache Kudu: https://kudu.apache.org/
-
-Requirements
-------------
-
-To connect to Kudu, you need:
-
-* Kudu version 1.13.0 or higher.
-* Network access from the Trino coordinator and workers to Kudu. Port 7051 is
-  the default port.
-
-Configuration
--------------
-
-To configure the Kudu connector, create a catalog properties file
-``etc/catalog/kudu.properties`` with the following contents,
-replacing the properties as appropriate:
-
-.. code-block:: properties
-
-   connector.name=kudu
-
-   ## Defaults to NONE
-   kudu.authentication.type = NONE
-
-   ## List of Kudu master addresses, at least one is needed (comma separated)
-   ## Supported formats: example.com, example.com:7051, 192.0.2.1, 192.0.2.1:7051,
-   ##                    [2001:db8::1], [2001:db8::1]:7051, 2001:db8::1
-   kudu.client.master-addresses=localhost
-
-   ## Kudu does not support schemas, but the connector can emulate them optionally.
-   ## By default, this feature is disabled, and all tables belong to the default schema.
-   ## For more details see connector documentation.
-   #kudu.schema-emulation.enabled=false
-
-   ## Prefix to use for schema emulation (only relevant if `kudu.schema-emulation.enabled=true`)
-   ## The standard prefix is `presto::`. Empty prefix is also supported.
-   ## For more details see connector documentation.
-   #kudu.schema-emulation.prefix=
-
-   ###########################################
-   ### Advanced Kudu Java client configuration
-   ###########################################
-
-   ## Default timeout used for administrative operations (e.g. createTable, deleteTable, etc.)
-   #kudu.client.default-admin-operation-timeout = 30s
-
-   ## Default timeout used for user operations
-   #kudu.client.default-operation-timeout = 30s
-
-   ## Disable Kudu client's collection of statistics.
-   #kudu.client.disable-statistics = false
-
-Kerberos support
-----------------
-
-In order to connect to a kudu cluster that uses ``kerberos``
-authentication, you need to configure the following kudu properties:
-
-.. code-block:: properties
-
-   kudu.authentication.type = KERBEROS
-
-   ## The kerberos client principal name
-   kudu.authentication.client.principal = clientprincipalname
-
-   ## The path to the kerberos keytab file
-   ## The configured client principal must exist in this keytab file
-   kudu.authentication.client.keytab = /path/to/keytab/file.keytab
-
-   ## The path to the krb5.conf kerberos config file
-   kudu.authentication.config = /path/to/kerberos/krb5.conf
-
-   ## Optional and defaults to "kudu"
-   ## If kudu is running with a custom SPN this needs to be configured
-   kudu.authentication.server.principal.primary = kudu
-
-Querying data
--------------
-
-Apache Kudu does not support schemas, i.e. namespaces for tables.
-The connector can optionally emulate schemas by table naming conventions.
-
-Default behaviour (without schema emulation)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The emulation of schemas is disabled by default.
-In this case all Kudu tables are part of the ``default`` schema.
-
-For example, a Kudu table named ``orders`` can be queried in Trino
-with ``SELECT * FROM example.default.orders`` or simple with ``SELECT * FROM orders``
-if catalog and schema are set to ``kudu`` and ``default`` respectively.
-
-Table names can contain any characters in Kudu. In this case, use double quotes.
-E.g. To query a Kudu table named ``special.table!`` use ``SELECT * FROM example.default."special.table!"``.
-
-
-Example
-~~~~~~~
-
-* Create a users table in the default schema::
-
-    CREATE TABLE example.default.users (
-      user_id int WITH (primary_key = true),
-      first_name varchar,
-      last_name varchar
-    ) WITH (
-      partition_by_hash_columns = ARRAY['user_id'],
-      partition_by_hash_buckets = 2
-    );
-
-  On creating a Kudu table you must/can specify additional information about
-  the primary key, encoding, and compression of columns and hash or range
-  partitioning. For details see the :ref:`kudu-create-table` section.
-
-* Describe the table::
-
-      DESCRIBE example.default.users;
-
-  .. code-block:: text
-
-         Column   |  Type   |                      Extra                      | Comment
-      ------------+---------+-------------------------------------------------+---------
-       user_id    | integer | primary_key, encoding=auto, compression=default |
-       first_name | varchar | nullable, encoding=auto, compression=default    |
-       last_name  | varchar | nullable, encoding=auto, compression=default    |
-      (3 rows)
-
-*  Insert some data::
-
-    INSERT INTO example.default.users VALUES (1, 'Donald', 'Duck'), (2, 'Mickey', 'Mouse');
-
-*  Select the inserted data::
-
-    SELECT * FROM example.default.users;
-
-.. _behavior-with-schema-emulation:
-
-Behavior with schema emulation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If schema emulation has been enabled in the connector properties, i.e.
-``etc/catalog/example.properties``, tables are mapped to schemas depending on
-some conventions.
-
-* With ``kudu.schema-emulation.enabled=true`` and ``kudu.schema-emulation.prefix=``,
-  the mapping works like:
-
-  +----------------------------+---------------------------------+
-  | Kudu table name            | Trino qualified name            |
-  +============================+=================================+
-  | ``orders``                 | ``kudu.default.orders``         |
-  +----------------------------+---------------------------------+
-  | ``part1.part2``            | ``kudu.part1.part2``            |
-  +----------------------------+---------------------------------+
-  | ``x.y.z``                  | ``kudu.x."y.z"``                |
-  +----------------------------+---------------------------------+
-
-  As schemas are not directly supported by Kudu, a special table named
-  ``$schemas`` is created for managing the schemas.
-
-
-* With ``kudu.schema-emulation.enabled=true`` and ``kudu.schema-emulation.prefix=presto::``,
-  the mapping works like:
-
-  +----------------------------+---------------------------------+
-  | Kudu table name            | Trino qualified name            |
-  +============================+=================================+
-  | ``orders``                 | ``kudu.default.orders``         |
-  +----------------------------+---------------------------------+
-  | ``part1.part2``            | ``kudu.default."part1.part2"``  |
-  +----------------------------+---------------------------------+
-  | ``x.y.z``                  | ``kudu.default."x.y.z"``        |
-  +----------------------------+---------------------------------+
-  | ``presto::part1.part2``    | ``kudu.part1.part2``            |
-  +----------------------------+---------------------------------+
-  | ``presto:x.y.z``           | ``kudu.x."y.z"``                |
-  +----------------------------+---------------------------------+
-
-  As schemas are not directly supported by Kudu, a special table named
-  ``presto::$schemas`` is created for managing the schemas.
-
-.. _kudu-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and Kudu each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-Kudu type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Kudu types to the corresponding Trino types following
-this table:
-
-.. list-table:: Kudu type to Trino type mapping
-  :widths: 30, 20
-  :header-rows: 1
-
-  * - Kudu type
-    - Trino type
-  * - ``BOOL``
-    - ``BOOLEAN``
-  * - ``INT8``
-    - ``TINYINT``
-  * - ``INT16``
-    - ``SMALLINT``
-  * - ``INT32``
-    - ``INTEGER``
-  * - ``INT64``
-    - ``BIGINT``
-  * - ``FLOAT``
-    - ``REAL``
-  * - ``DOUBLE``
-    - ``DOUBLE``
-  * - ``DECIMAL(p,s)``
-    - ``DECIMAL(p,s)``
-  * - ``STRING``
-    - ``VARCHAR``
-  * - ``BINARY``
-    - ``VARBINARY``
-  * - ``UNIXTIME_MICROS``
-    - ``TIMESTAMP(3)``
-
-No other types are supported.
-
-Trino type to Kudu type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding Kudu types following
-this table:
-
-.. list-table:: Trino type to Kudu type mapping
-  :widths: 30, 20, 50
-  :header-rows: 1
-
-  * - Trino type
-    - Kudu type
-    - Notes
-  * - ``BOOLEAN``
-    - ``BOOL``
-    -
-  * - ``TINYINT``
-    - ``INT8``
-    -
-  * - ``SMALLINT``
-    - ``INT16``
-    -
-  * - ``INTEGER``
-    - ``INT32``
-    -
-  * - ``BIGINT``
-    - ``INT64``
-    -
-  * - ``REAL``
-    - ``FLOAT``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``DECIMAL(p,s)``
-    - ``DECIMAL(p,s)``
-    - Only supported for Kudu server >= 1.7.0
-  * - ``VARCHAR``
-    - ``STRING``
-    - The optional maximum length is lost
-  * - ``VARBINARY``
-    - ``BINARY``
-    -
-  * - ``DATE``
-    - ``STRING``
-    -
-  * - ``TIMESTAMP(3)``
-    - ``UNIXTIME_MICROS``
-    - µs resolution in Kudu column is reduced to ms resolution
-
-No other types are supported.
-
-.. _kudu-sql-support:
-
-SQL support
------------
-
-The connector provides read and write access to data and metadata in
-Kudu. In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :doc:`/sql/insert`, see also :ref:`kudu-insert`
-* :doc:`/sql/delete`
-* :doc:`/sql/merge`
-* :doc:`/sql/create-table`, see also :ref:`kudu-create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/alter-table`, see also :ref:`kudu-alter-table`
-* :doc:`/sql/create-schema`, see also :ref:`kudu-create-schema`
-* :doc:`/sql/drop-schema`, see also :ref:`kudu-drop-schema`
-
-.. _kudu-insert:
-
-Inserting into tables
-^^^^^^^^^^^^^^^^^^^^^
-
-``INSERT INTO ... values`` and ``INSERT INTO ... select`` behave like
-``UPSERT``.
-
-.. include:: sql-delete-limitation.fragment
-
-.. _kudu-create-schema:
-
-Creating schemas
-^^^^^^^^^^^^^^^^
-
-``CREATE SCHEMA`` is only allowed if schema emulation is enabled. See the
-:ref:`behavior-with-schema-emulation` section.
-
-.. _kudu-drop-schema:
-
-Dropping schemas
-^^^^^^^^^^^^^^^^
-
-``DROP SCHEMA`` is only allowed if schema emulation is enabled. See the
-:ref:`behavior-with-schema-emulation` section.
-
-.. _kudu-create-table:
-
-Creating a table
-^^^^^^^^^^^^^^^^
-
-On creating a Kudu table, you need to provide the columns and their types, of
-course, but Kudu needs information about partitioning and optionally
-for column encoding and compression.
-
-Simple Example::
-
-    CREATE TABLE user_events (
-      user_id int WITH (primary_key = true),
-      event_name varchar WITH (primary_key = true),
-      message varchar,
-      details varchar WITH (nullable = true, encoding = 'plain')
-    ) WITH (
-      partition_by_hash_columns = ARRAY['user_id'],
-      partition_by_hash_buckets = 5,
-      number_of_replicas = 3
-    );
-
-The primary key consists of ``user_id`` and ``event_name``. The table is partitioned into
-five partitions by hash values of the column ``user_id``, and the ``number_of_replicas`` is
-explicitly set to 3.
-
-The primary key columns must always be the first columns of the column list.
-All columns used in partitions must be part of the primary key.
-
-The table property ``number_of_replicas`` is optional. It defines the
-number of tablet replicas, and must be an odd number. If it is not specified,
-the default replication factor from the Kudu master configuration is used.
-
-Kudu supports two different kinds of partitioning: hash and range partitioning.
-Hash partitioning distributes rows by hash value into one of many buckets.
-Range partitions distributes rows using a totally-ordered range partition key.
-The concrete range partitions must be created explicitly.
-Kudu also supports multi-level partitioning. A table must have at least one
-partitioning, either hash or range. It can have at most one range partitioning,
-but multiple hash partitioning 'levels'.
-
-For more details see `Partitioning Design`_.
-
-
-Column properties
-^^^^^^^^^^^^^^^^^
-
-Besides column name and type, you can specify some more properties of a column.
-
-+----------------------+---------------+---------------------------------------------------------+
-| Column property name | Type          | Description                                             |
-+======================+===============+=========================================================+
-| ``primary_key``      | ``BOOLEAN``   | If ``true``, the column belongs to primary key columns. |
-|                      |               | The Kudu primary key enforces a uniqueness constraint.  |
-|                      |               | Inserting a second row with the same primary key        |
-|                      |               | results in updating the existing row ('UPSERT').        |
-|                      |               | See also `Primary Key Design`_ in the Kudu              |
-|                      |               | documentation.                                          |
-+----------------------+---------------+---------------------------------------------------------+
-| ``nullable``         | ``BOOLEAN``   | If ``true``, the value can be null. Primary key         |
-|                      |               | columns must not be nullable.                           |
-+----------------------+---------------+---------------------------------------------------------+
-| ``encoding``         | ``VARCHAR``   | The column encoding can help to save storage space and  |
-|                      |               | to improve query performance. Kudu uses an auto         |
-|                      |               | encoding depending on the column type if not specified. |
-|                      |               | Valid values are:                                       |
-|                      |               | ``'auto'``, ``'plain'``, ``'bitshuffle'``,              |
-|                      |               | ``'runlength'``, ``'prefix'``, ``'dictionary'``,        |
-|                      |               | ``'group_varint'``.                                     |
-|                      |               | See also `Column encoding`_ in the Kudu documentation.  |
-+----------------------+---------------+---------------------------------------------------------+
-| ``compression``      | ``VARCHAR``   | The encoded column values can be compressed. Kudu uses  |
-|                      |               | a default compression if not specified.                 |
-|                      |               | Valid values are:                                       |
-|                      |               | ``'default'``, ``'no'``, ``'lz4'``, ``'snappy'``,       |
-|                      |               | ``'zlib'``.                                             |
-|                      |               | See also `Column compression`_ in the Kudu              |
-|                      |               | documentation.                                          |
-+----------------------+---------------+---------------------------------------------------------+
-
-.. _`Primary Key Design`: http://kudu.apache.org/docs/schema_design.html#primary-keys
-.. _`Column encoding`: https://kudu.apache.org/docs/schema_design.html#encoding
-.. _`Column compression`: https://kudu.apache.org/docs/schema_design.html#compression
-
-
-Example:
-
-.. code-block:: sql
-
-    CREATE TABLE example_table (
-      name varchar WITH (primary_key = true, encoding = 'dictionary', compression = 'snappy'),
-      index bigint WITH (nullable = true, encoding = 'runlength', compression = 'lz4'),
-      comment varchar WITH (nullable = true, encoding = 'plain', compression = 'default'),
-       ...
-    ) WITH (...);
-
-.. _kudu-alter-table:
-
-Changing tables
-^^^^^^^^^^^^^^^
-
-Adding a column to an existing table uses the SQL statement ``ALTER TABLE ... ADD COLUMN ...``.
-You can specify the same column properties as on creating a table.
-
-Example::
-
-    ALTER TABLE example_table ADD COLUMN extraInfo varchar WITH (nullable = true, encoding = 'plain')
-
-See also `Column Properties`_.
-
-``ALTER TABLE ... RENAME COLUMN`` is only allowed if not part of a primary key.
-
-``ALTER TABLE ... DROP COLUMN`` is only allowed if not part of a primary key.
-
-Procedures
-----------
-
-* ``CALL example.system.add_range_partition`` see :ref:`managing-range-partitions`
-
-* ``CALL example.system.drop_range_partition`` see :ref:`managing-range-partitions`
-
-Partitioning design
-^^^^^^^^^^^^^^^^^^^
-
-A table must have at least one partitioning (either hash or range).
-It can have at most one range partitioning, but multiple hash partitioning 'levels'.
-For more details see Apache Kudu documentation: `Partitioning`_.
-
-If you create a Kudu table in Trino, the partitioning design is given by
-several table properties.
-
-.. _Partitioning: https://kudu.apache.org/docs/schema_design.html#partitioning
-
-
-Hash partitioning
-~~~~~~~~~~~~~~~~~
-
-You can provide the first hash partition group with two table properties:
-
-The ``partition_by_hash_columns`` defines the column(s) belonging to the
-partition group and ``partition_by_hash_buckets`` the number of partitions to
-split the hash values range into. All partition columns must be part of the
-primary key.
-
-Example::
-
-    CREATE TABLE example_table (
-      col1 varchar WITH (primary_key=true),
-      col2 varchar WITH (primary_key=true),
-      ...
-    ) WITH (
-      partition_by_hash_columns = ARRAY['col1', 'col2'],
-      partition_by_hash_buckets = 4
-    )
-
-This defines a hash partitioning with the columns ``col1`` and ``col2``
-distributed over 4 partitions.
-
-To define two separate hash partition groups, also use the second pair
-of table properties named ``partition_by_second_hash_columns`` and
-``partition_by_second_hash_buckets``.
-
-Example::
-
-    CREATE TABLE example_table (
-      col1 varchar WITH (primary_key=true),
-      col2 varchar WITH (primary_key=true),
-      ...
-    ) WITH (
-      partition_by_hash_columns = ARRAY['col1'],
-      partition_by_hash_buckets = 2,
-      partition_by_second_hash_columns = ARRAY['col2'],
-      partition_by_second_hash_buckets = 3
-    )
-
-This defines a two-level hash partitioning, with the first hash partition group
-over the column ``col1`` distributed over 2 buckets, and the second
-hash partition group over the column ``col2`` distributed over 3 buckets.
-As a result you have table with 2 x 3 = 6 partitions.
-
-
-Range partitioning
-~~~~~~~~~~~~~~~~~~
-
-You can provide at most one range partitioning in Apache Kudu. The columns
-are defined with the table property ``partition_by_range_columns``.
-The ranges themselves are given either in the
-table property ``range_partitions`` on creating the table.
-Or alternatively, the procedures ``kudu.system.add_range_partition`` and
-``kudu.system.drop_range_partition`` can be used to manage range
-partitions for existing tables. For both ways see below for more
-details.
-
-Example::
-
-    CREATE TABLE events (
-      rack varchar WITH (primary_key=true),
-      machine varchar WITH (primary_key=true),
-      event_time timestamp WITH (primary_key=true),
-      ...
-    ) WITH (
-      partition_by_hash_columns = ARRAY['rack'],
-      partition_by_hash_buckets = 2,
-      partition_by_second_hash_columns = ARRAY['machine'],
-      partition_by_second_hash_buckets = 3,
-      partition_by_range_columns = ARRAY['event_time'],
-      range_partitions = '[{"lower": null, "upper": "2018-01-01T00:00:00"},
-                           {"lower": "2018-01-01T00:00:00", "upper": null}]'
-    )
-
-This defines a tree-level partitioning with two hash partition groups and
-one range partitioning on the ``event_time`` column.
-Two range partitions are created with a split at “2018-01-01T00:00:00”.
-
-
-Table property ``range_partitions``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-With the ``range_partitions`` table property you specify the concrete
-range partitions to be created. The range partition definition itself
-must be given in the table property ``partition_design`` separately.
-
-Example::
-
-    CREATE TABLE events (
-      serialno varchar WITH (primary_key = true),
-      event_time timestamp WITH (primary_key = true),
-      message varchar
-    ) WITH (
-      partition_by_hash_columns = ARRAY['serialno'],
-      partition_by_hash_buckets = 4,
-      partition_by_range_columns = ARRAY['event_time'],
-      range_partitions = '[{"lower": null, "upper": "2017-01-01T00:00:00"},
-                           {"lower": "2017-01-01T00:00:00", "upper": "2017-07-01T00:00:00"},
-                           {"lower": "2017-07-01T00:00:00", "upper": "2018-01-01T00:00:00"}]'
-    );
-
-This creates a table with a hash partition on column ``serialno`` with 4
-buckets and range partitioning on column ``event_time``. Additionally,
-three range partitions are created:
-
-1. for all event_times before the year 2017, lower bound = ``null`` means it is unbound
-2. for the first half of the year 2017
-3. for the second half the year 2017
-
-This means any attempt to add rows with ``event_time`` of year 2018 or greater fails, as no partition is defined.
-The next section shows how to define a new range partition for an existing table.
-
-.. _managing-range-partitions:
-
-Managing range partitions
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-For existing tables, there are procedures to add and drop a range
-partition.
-
-- adding a range partition
-
-  .. code-block:: sql
-
-      CALL example.system.add_range_partition(<schema>, <table>, <range_partition_as_json_string>)
-
-- dropping a range partition
-
-  .. code-block:: sql
-
-      CALL example.system.drop_range_partition(<schema>, <table>, <range_partition_as_json_string>)
-
-  - ``<schema>``: schema of the table
-
-  - ``<table>``: table names
-
-  - ``<range_partition_as_json_string>``: lower and upper bound of the
-    range partition as json string in the form
-    ``'{"lower": <value>, "upper": <value>}'``, or if the range partition
-    has multiple columns:
-    ``'{"lower": [<value_col1>,...], "upper": [<value_col1>,...]}'``. The
-    concrete literal for lower and upper bound values are depending on
-    the column types.
-
-    Examples:
-
-    +-------------------------------+----------------------------------------------+
-    | Trino data Type               | JSON string example                          |
-    +===============================+==============================================+
-    | ``BIGINT``                    | ``‘{“lower”: 0, “upper”: 1000000}’``         |
-    +-------------------------------+----------------------------------------------+
-    | ``SMALLINT``                  | ``‘{“lower”: 10, “upper”: null}’``           |
-    +-------------------------------+----------------------------------------------+
-    | ``VARCHAR``                   | ``‘{“lower”: “A”, “upper”: “M”}’``           |
-    +-------------------------------+----------------------------------------------+
-    | ``TIMESTAMP``                 | ``‘{“lower”: “2018-02-01T00:00:00.000”,      |
-    |                               | “upper”: “2018-02-01T12:00:00.000”}’``       |
-    +-------------------------------+----------------------------------------------+
-    | ``BOOLEAN``                   | ``‘{“lower”: false, “upper”: true}’``        |
-    +-------------------------------+----------------------------------------------+
-    | ``VARBINARY``                 | values encoded as base64 strings             |
-    +-------------------------------+----------------------------------------------+
-
-    To specified an unbounded bound, use the value ``null``.
-
-Example::
-
-    CALL example.system.add_range_partition('example_schema', 'events', '{"lower": "2018-01-01", "upper": "2018-06-01"}')
-
-This adds a range partition for a table ``events`` in the schema
-``example_schema`` with the lower bound ``2018-01-01``, more exactly
-``2018-01-01T00:00:00.000``, and the upper bound ``2018-07-01``.
-
-Use the SQL statement ``SHOW CREATE TABLE`` to query the existing
-range partitions (they are shown in the table property
-``range_partitions``).
-
-Limitations
------------
-
--  Only lower case table and column names in Kudu are supported.
diff --git a/docs/src/main/sphinx/connector/localfile.md b/docs/src/main/sphinx/connector/localfile.md
new file mode 100644
index 000000000000..6c3e7663ad7a
--- /dev/null
+++ b/docs/src/main/sphinx/connector/localfile.md
@@ -0,0 +1,34 @@
+# Local file connector
+
+The local file connector allows querying the HTTP request log files stored on
+the local file system of each worker.
+
+## Configuration
+
+To configure the local file connector, create a catalog properties file under
+`etc/catalog` named, for example, `example.properties` with the following
+contents:
+
+```text
+connector.name=localfile
+```
+
+## Configuration properties
+
+| Property name                          | Description                                                                                |
+| -------------------------------------- | ------------------------------------------------------------------------------------------ |
+| `trino-logs.http-request-log.location` | Directory or file where HTTP request logs are written                                      |
+| `trino-logs.http-request-log.pattern`  | If the log location is a directory, this glob is used to match file names in the directory |
+
+## Local file connector schemas and tables
+
+The local file connector provides a single schema named `logs`.
+You can see all the available tables by running `SHOW TABLES`:
+
+```
+SHOW TABLES FROM example.logs;
+```
+
+### `http_request_log`
+
+This table contains the HTTP request logs from each node on the cluster.
diff --git a/docs/src/main/sphinx/connector/localfile.rst b/docs/src/main/sphinx/connector/localfile.rst
deleted file mode 100644
index 736146b11723..000000000000
--- a/docs/src/main/sphinx/connector/localfile.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-====================
-Local file connector
-====================
-
-The local file connector allows querying the HTTP request log files stored on
-the local file system of each worker.
-
-Configuration
--------------
-
-To configure the local file connector, create a catalog properties file under
-``etc/catalog`` named, for example, ``example.properties`` with the following
-contents:
-
-.. code-block:: text
-
-    connector.name=localfile
-
-Configuration properties
-------------------------
-
-=========================================   ==============================================================
-Property name                               Description
-=========================================   ==============================================================
-``trino-logs.http-request-log.location``    Directory or file where HTTP request logs are written
-``trino-logs.http-request-log.pattern``     If the log location is a directory, this glob is used
-                                            to match file names in the directory
-=========================================   ==============================================================
-
-Local file connector schemas and tables
----------------------------------------
-
-The local file connector provides a single schema named ``logs``.
-You can see all the available tables by running ``SHOW TABLES``::
-
-    SHOW TABLES FROM example.logs;
-
-``http_request_log``
-^^^^^^^^^^^^^^^^^^^^
-This table contains the HTTP request logs from each node on the cluster.
diff --git a/docs/src/main/sphinx/connector/mariadb.md b/docs/src/main/sphinx/connector/mariadb.md
new file mode 100644
index 000000000000..2f78a0d702d5
--- /dev/null
+++ b/docs/src/main/sphinx/connector/mariadb.md
@@ -0,0 +1,397 @@
+---
+myst:
+  substitutions:
+    default_domain_compaction_threshold: '`32`'
+---
+
+# MariaDB connector
+
+```{raw} html
+<img src="../_static/img/mariadb.png" class="connector-logo">
+```
+
+The MariaDB connector allows querying and creating tables in an external MariaDB
+database.
+
+## Requirements
+
+To connect to MariaDB, you need:
+
+- MariaDB version 10.2 or higher.
+- Network access from the Trino coordinator and workers to MariaDB. Port
+  3306 is the default port.
+
+## Configuration
+
+To configure the MariaDB connector, create a catalog properties file in
+`etc/catalog` named, for example, `example.properties`, to mount the MariaDB
+connector as the `example` catalog. Create the file with the following
+contents, replacing the connection properties as appropriate for your setup:
+
+```text
+connector.name=mariadb
+connection-url=jdbc:mariadb://example.net:3306
+connection-user=root
+connection-password=secret
+```
+
+The `connection-user` and `connection-password` are typically required and
+determine the user credentials for the connection, often a service user. You can
+use {doc}`secrets </security/secrets>` to avoid actual values in the catalog
+properties files.
+
+```{include} jdbc-authentication.fragment
+```
+
+```{include} jdbc-common-configurations.fragment
+```
+
+```{include} jdbc-domain-compaction-threshold.fragment
+```
+
+```{include} jdbc-case-insensitive-matching.fragment
+```
+
+```{include} non-transactional-insert.fragment
+```
+
+## Querying MariaDB
+
+The MariaDB connector provides a schema for every MariaDB *database*.
+You can see the available MariaDB databases by running `SHOW SCHEMAS`:
+
+```
+SHOW SCHEMAS FROM example;
+```
+
+If you have a MariaDB database named `web`, you can view the tables
+in this database by running `SHOW TABLES`:
+
+```
+SHOW TABLES FROM example.web;
+```
+
+You can see a list of the columns in the `clicks` table in the `web`
+database using either of the following:
+
+```
+DESCRIBE example.web.clicks;
+SHOW COLUMNS FROM example.web.clicks;
+```
+
+Finally, you can access the `clicks` table in the `web` database:
+
+```
+SELECT * FROM example.web.clicks;
+```
+
+If you used a different name for your catalog properties file, use
+that catalog name instead of `example` in the above examples.
+
+% mariadb-type-mapping:
+
+## Type mapping
+
+Because Trino and MariaDB each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+### MariaDB type to Trino type mapping
+
+The connector maps MariaDB types to the corresponding Trino types according
+to the following table:
+
+```{eval-rst}
+.. list-table:: MariaDB type to Trino type mapping
+  :widths: 30, 30, 50
+  :header-rows: 1
+
+  * - MariaDB type
+    - Trino type
+    - Notes
+  * - ``BOOLEAN``
+    - ``TINYINT``
+    - ``BOOL`` and ``BOOLEAN`` are aliases of ``TINYINT(1)``
+  * - ``TINYINT``
+    - ``TINYINT``
+    -
+  * - ``TINYINT UNSIGNED``
+    - ``SMALLINT``
+    -
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``SMALLINT UNSIGNED``
+    - ``INTEGER``
+    -
+  * - ``INT``
+    - ``INTEGER``
+    -
+  * - ``INT UNSIGNED``
+    - ``BIGINT``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``BIGINT UNSIGNED``
+    - ``DECIMAL(20, 0)``
+    -
+  * - ``FLOAT``
+    - ``REAL``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``DECIMAL(p,s)``
+    - ``DECIMAL(p,s)``
+    -
+  * - ``CHAR(n)``
+    - ``CHAR(n)``
+    -
+  * - ``TINYTEXT``
+    - ``VARCHAR(255)``
+    -
+  * - ``TEXT``
+    - ``VARCHAR(65535)``
+    -
+  * - ``MEDIUMTEXT``
+    - ``VARCHAR(16777215)``
+    -
+  * - ``LONGTEXT``
+    - ``VARCHAR``
+    -
+  * - ``VARCHAR(n)``
+    - ``VARCHAR(n)``
+    -
+  * - ``TINYBLOB``
+    - ``VARBINARY``
+    -
+  * - ``BLOB``
+    - ``VARBINARY``
+    -
+  * - ``MEDIUMBLOB``
+    - ``VARBINARY``
+    -
+  * - ``LONGBLOB``
+    - ``VARBINARY``
+    -
+  * - ``VARBINARY(n)``
+    - ``VARBINARY``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME(n)``
+    - ``TIME(n)``
+    -
+  * - ``TIMESTAMP(n)``
+    - ``TIMESTAMP(n)``
+    - MariaDB stores the current timestamp by default. Enable
+      `explicit_defaults_for_timestamp
+      <https://mariadb.com/docs/reference/mdb/system-variables/explicit_defaults_for_timestamp/>`_
+      to avoid implicit default values and use ``NULL`` as the default value.
+```
+
+No other types are supported.
+
+### Trino type mapping to MariaDB type mapping
+
+The connector maps Trino types to the corresponding MariaDB types according
+to the following table:
+
+```{eval-rst}
+.. list-table:: Trino type mapping to MariaDB type mapping
+  :widths: 30, 25, 50
+  :header-rows: 1
+
+  * - Trino type
+    - MariaDB type
+    - Notes
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+    -
+  * - ``TINYINT``
+    - ``TINYINT``
+    -
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``INTEGER``
+    - ``INT``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``REAL``
+    - ``FLOAT``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``DECIMAL(p,s)``
+    - ``DECIMAL(p,s)``
+    -
+  * - ``CHAR(n)``
+    - ``CHAR(n)``
+    -
+  * - ``VARCHAR(255)``
+    - ``TINYTEXT``
+    - Maps on ``VARCHAR`` of length 255 or less.
+  * - ``VARCHAR(65535)``
+    - ``TEXT``
+    - Maps on ``VARCHAR`` of length between 256 and 65535, inclusive.
+  * - ``VARCHAR(16777215)``
+    - ``MEDIUMTEXT``
+    - Maps on ``VARCHAR`` of length between 65536 and 16777215, inclusive.
+  * - ``VARCHAR``
+    - ``LONGTEXT``
+    - ``VARCHAR`` of length greater than 16777215 and unbounded ``VARCHAR`` map
+      to ``LONGTEXT``.
+  * - ``VARBINARY``
+    - ``MEDIUMBLOB``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME(n)``
+    - ``TIME(n)``
+    -
+  * - ``TIMESTAMP(n)``
+    - ``TIMESTAMP(n)``
+    - MariaDB stores the current timestamp by default. Enable
+      `explicit_defaults_for_timestamp
+      <https://mariadb.com/docs/reference/mdb/system-variables/explicit_defaults_for_timestamp/>`_
+      to avoid implicit default values and use ``NULL`` as the default value.
+```
+
+No other types are supported.
+
+Complete list of [MariaDB data types](https://mariadb.com/kb/en/data-types/).
+
+```{include} jdbc-type-mapping.fragment
+```
+
+(mariadb-sql-support)=
+
+## SQL support
+
+The connector provides read access and write access to data and metadata in
+a MariaDB database.  In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/update`
+- {doc}`/sql/delete`
+- {doc}`/sql/truncate`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/alter-table`
+- {doc}`/sql/create-schema`
+- {doc}`/sql/drop-schema`
+
+```{include} sql-update-limitation.fragment
+```
+
+```{include} sql-delete-limitation.fragment
+```
+
+## Table functions
+
+The connector provides specific {doc}`table functions </functions/table>` to
+access MariaDB.
+
+(mariadb-query-function)=
+
+### `query(varchar) -> table`
+
+The `query` function allows you to query the underlying database directly. It
+requires syntax native to MariaDB, because the full query is pushed down and
+processed in MariaDB. This can be useful for accessing native features which are
+not available in Trino or for improving query performance in situations where
+running a query natively may be faster.
+
+```{include} query-passthrough-warning.fragment
+```
+
+As an example, query the `example` catalog and select the age of employees by
+using `TIMESTAMPDIFF` and `CURDATE`:
+
+```
+SELECT
+  age
+FROM
+  TABLE(
+    example.system.query(
+      query => 'SELECT
+        TIMESTAMPDIFF(
+          YEAR,
+          date_of_birth,
+          CURDATE()
+        ) AS age
+      FROM
+        tiny.employees'
+    )
+  );
+```
+
+```{include} query-table-function-ordering.fragment
+```
+
+## Performance
+
+The connector includes a number of performance improvements, detailed in the
+following sections.
+
+(mariadb-table-statistics)=
+### Table statistics
+
+The MariaDB connector can use [table and column
+statistics](/optimizer/statistics) for [cost based
+optimizations](/optimizer/cost-based-optimizations) to improve query processing
+performance based on the actual data in the data source.
+
+The statistics are collected by MariaDB and retrieved by the connector.
+
+To collect statistics for a table, execute the following statement in
+MariaDB.
+
+```text
+ANALYZE TABLE table_name;
+```
+
+Refer to [MariaDB documentation](https://mariadb.com/kb/en/analyze-table/) for
+additional information.
+
+(mariadb-pushdown)=
+
+### Pushdown
+
+The connector supports pushdown for a number of operations:
+
+- {ref}`join-pushdown`
+- {ref}`limit-pushdown`
+- {ref}`topn-pushdown`
+
+{ref}`Aggregate pushdown <aggregation-pushdown>` for the following functions:
+
+- {func}`avg`
+- {func}`count`
+- {func}`max`
+- {func}`min`
+- {func}`sum`
+- {func}`stddev`
+- {func}`stddev_pop`
+- {func}`stddev_samp`
+- {func}`variance`
+- {func}`var_pop`
+- {func}`var_samp`
+
+```{include} pushdown-correctness-behavior.fragment
+```
+
+```{include} no-pushdown-text-type.fragment
+```
diff --git a/docs/src/main/sphinx/connector/mariadb.rst b/docs/src/main/sphinx/connector/mariadb.rst
deleted file mode 100644
index 9d353992f59c..000000000000
--- a/docs/src/main/sphinx/connector/mariadb.rst
+++ /dev/null
@@ -1,345 +0,0 @@
-=================
-MariaDB connector
-=================
-
-.. raw:: html
-
-  <img src="../_static/img/mariadb.png" class="connector-logo">
-
-The MariaDB connector allows querying and creating tables in an external MariaDB
-database.
-
-Requirements
-------------
-
-To connect to MariaDB, you need:
-
-* MariaDB version 10.2 or higher.
-* Network access from the Trino coordinator and workers to MariaDB. Port
-  3306 is the default port.
-
-Configuration
--------------
-
-To configure the MariaDB connector, create a catalog properties file in
-``etc/catalog`` named, for example, ``example.properties``, to mount the MariaDB
-connector as the ``example`` catalog. Create the file with the following
-contents, replacing the connection properties as appropriate for your setup:
-
-.. code-block:: text
-
-    connector.name=mariadb
-    connection-url=jdbc:mariadb://example.net:3306
-    connection-user=root
-    connection-password=secret
-
-The ``connection-user`` and ``connection-password`` are typically required and
-determine the user credentials for the connection, often a service user. You can
-use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
-properties files.
-
-.. include:: jdbc-authentication.fragment
-
-.. include:: jdbc-common-configurations.fragment
-
-.. |default_domain_compaction_threshold| replace:: ``32``
-.. include:: jdbc-domain-compaction-threshold.fragment
-
-.. include:: jdbc-case-insensitive-matching.fragment
-
-.. include:: non-transactional-insert.fragment
-
-Querying MariaDB
-----------------
-
-The MariaDB connector provides a schema for every MariaDB *database*.
-You can see the available MariaDB databases by running ``SHOW SCHEMAS``::
-
-    SHOW SCHEMAS FROM example;
-
-If you have a MariaDB database named ``web``, you can view the tables
-in this database by running ``SHOW TABLES``::
-
-    SHOW TABLES FROM example.web;
-
-You can see a list of the columns in the ``clicks`` table in the ``web``
-database using either of the following::
-
-    DESCRIBE example.web.clicks;
-    SHOW COLUMNS FROM example.web.clicks;
-
-Finally, you can access the ``clicks`` table in the ``web`` database::
-
-    SELECT * FROM example.web.clicks;
-
-If you used a different name for your catalog properties file, use
-that catalog name instead of ``example`` in the above examples.
-
-.. mariadb-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and MariaDB each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-MariaDB type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps MariaDB types to the corresponding Trino types according
-to the following table:
-
-.. list-table:: MariaDB type to Trino type mapping
-  :widths: 30, 30, 50
-  :header-rows: 1
-
-  * - MariaDB type
-    - Trino type
-    - Notes
-  * - ``BOOLEAN``
-    - ``TINYINT``
-    - ``BOOL`` and ``BOOLEAN`` are aliases of ``TINYINT(1)``
-  * - ``TINYINT``
-    - ``TINYINT``
-    -
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``INT``
-    - ``INTEGER``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``FLOAT``
-    - ``REAL``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``DECIMAL(p,s)``
-    - ``DECIMAL(p,s)``
-    -
-  * - ``CHAR(n)``
-    - ``CHAR(n)``
-    -
-  * - ``TINYTEXT``
-    - ``VARCHAR(255)``
-    -
-  * - ``TEXT``
-    - ``VARCHAR(65535)``
-    -
-  * - ``MEDIUMTEXT``
-    - ``VARCHAR(16777215)``
-    -
-  * - ``LONGTEXT``
-    - ``VARCHAR``
-    -
-  * - ``VARCHAR(n)``
-    - ``VARCHAR(n)``
-    -
-  * - ``TINYBLOB``
-    - ``VARBINARY``
-    -
-  * - ``BLOB``
-    - ``VARBINARY``
-    -
-  * - ``MEDIUMBLOB``
-    - ``VARBINARY``
-    -
-  * - ``LONGBLOB``
-    - ``VARBINARY``
-    -
-  * - ``VARBINARY(n)``
-    - ``VARBINARY``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME(n)``
-    - ``TIME(n)``
-    -
-  * - ``TIMESTAMP(n)``
-    - ``TIMESTAMP(n)``
-    - MariaDB stores the current timestamp by default. Enable
-      `explicit_defaults_for_timestamp
-      <https://mariadb.com/docs/reference/mdb/system-variables/explicit_defaults_for_timestamp/>`_
-      to avoid implicit default values and use ``NULL`` as the default value.
-
-No other types are supported.
-
-Trino type mapping to MariaDB type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding MariaDB types according
-to the following table:
-
-.. list-table:: Trino type mapping to MariaDB type mapping
-  :widths: 30, 25, 50
-  :header-rows: 1
-
-  * - Trino type
-    - MariaDB type
-    - Notes
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-    -
-  * - ``TINYINT``
-    - ``TINYINT``
-    -
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``INTEGER``
-    - ``INT``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``REAL``
-    - ``FLOAT``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``DECIMAL(p,s)``
-    - ``DECIMAL(p,s)``
-    -
-  * - ``CHAR(n)``
-    - ``CHAR(n)``
-    -
-  * - ``VARCHAR(255)``
-    - ``TINYTEXT``
-    - Maps on ``VARCHAR`` of length 255 or less.
-  * - ``VARCHAR(65535)``
-    - ``TEXT``
-    - Maps on ``VARCHAR`` of length between 256 and 65535, inclusive.
-  * - ``VARCHAR(16777215)``
-    - ``MEDIUMTEXT``
-    - Maps on ``VARCHAR`` of length between 65536 and 16777215, inclusive.
-  * - ``VARCHAR``
-    - ``LONGTEXT``
-    - ``VARCHAR`` of length greater than 16777215 and unbounded ``VARCHAR`` map
-      to ``LONGTEXT``.
-  * - ``VARBINARY``
-    - ``MEDIUMBLOB``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME(n)``
-    - ``TIME(n)``
-    -
-  * - ``TIMESTAMP(n)``
-    - ``TIMESTAMP(n)``
-    - MariaDB stores the current timestamp by default. Enable
-      `explicit_defaults_for_timestamp
-      <https://mariadb.com/docs/reference/mdb/system-variables/explicit_defaults_for_timestamp/>`_
-      to avoid implicit default values and use ``NULL`` as the default value.
-
-No other types are supported.
-
-
-Complete list of `MariaDB data types
-<https://mariadb.com/kb/en/data-types/>`_.
-
-
-.. include:: jdbc-type-mapping.fragment
-
-.. _mariadb-sql-support:
-
-SQL support
------------
-
-The connector provides read access and write access to data and metadata in
-a MariaDB database.  In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/delete`
-* :doc:`/sql/truncate`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/alter-table`
-* :doc:`/sql/create-schema`
-* :doc:`/sql/drop-schema`
-
-.. include:: sql-delete-limitation.fragment
-
-Table functions
----------------
-
-The connector provides specific :doc:`table functions </functions/table>` to
-access MariaDB.
-
-.. _mariadb-query-function:
-
-``query(varchar) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``query`` function allows you to query the underlying database directly. It
-requires syntax native to MariaDB, because the full query is pushed down and
-processed in MariaDB. This can be useful for accessing native features which are
-not available in Trino or for improving query performance in situations where
-running a query natively may be faster.
-
-.. include:: polymorphic-table-function-ordering.fragment
-
-As an example, query the ``example`` catalog and select the age of employees by
-using ``TIMESTAMPDIFF`` and ``CURDATE``::
-
-    SELECT
-      age
-    FROM
-      TABLE(
-        example.system.query(
-          query => 'SELECT
-            TIMESTAMPDIFF(
-              YEAR,
-              date_of_birth,
-              CURDATE()
-            ) AS age
-          FROM
-            tiny.employees'
-        )
-      );
-
-Performance
------------
-
-The connector includes a number of performance improvements, detailed in the
-following sections.
-
-.. _mariadb-pushdown:
-
-Pushdown
-^^^^^^^^
-
-The connector supports pushdown for a number of operations:
-
-* :ref:`join-pushdown`
-* :ref:`limit-pushdown`
-* :ref:`topn-pushdown`
-
-:ref:`Aggregate pushdown <aggregation-pushdown>` for the following functions:
-
-* :func:`avg`
-* :func:`count`
-* :func:`max`
-* :func:`min`
-* :func:`sum`
-* :func:`stddev`
-* :func:`stddev_pop`
-* :func:`stddev_samp`
-* :func:`variance`
-* :func:`var_pop`
-* :func:`var_samp`
-
-.. include:: pushdown-correctness-behavior.fragment
-
-.. include:: no-pushdown-text-type.fragment
diff --git a/docs/src/main/sphinx/connector/memory.md b/docs/src/main/sphinx/connector/memory.md
new file mode 100644
index 000000000000..c4d116d50231
--- /dev/null
+++ b/docs/src/main/sphinx/connector/memory.md
@@ -0,0 +1,105 @@
+# Memory connector
+
+The Memory connector stores all data and metadata in RAM on workers
+and both are discarded when Trino restarts.
+
+## Configuration
+
+To configure the Memory connector, create a catalog properties file
+`etc/catalog/example.properties` with the following contents:
+
+```text
+connector.name=memory
+memory.max-data-per-node=128MB
+```
+
+`memory.max-data-per-node` defines memory limit for pages stored in this
+connector per each node (default value is 128MB).
+
+## Examples
+
+Create a table using the Memory connector:
+
+```
+CREATE TABLE example.default.nation AS
+SELECT * from tpch.tiny.nation;
+```
+
+Insert data into a table in the Memory connector:
+
+```
+INSERT INTO example.default.nation
+SELECT * FROM tpch.tiny.nation;
+```
+
+Select from the Memory connector:
+
+```
+SELECT * FROM example.default.nation;
+```
+
+Drop table:
+
+```
+DROP TABLE example.default.nation;
+```
+
+(memory-type-mapping)=
+
+## Type mapping
+
+Trino supports all data types used within the Memory schemas so no mapping is
+required.
+
+(memory-sql-support)=
+
+## SQL support
+
+The connector provides read and write access to temporary data and metadata
+stored in memory. In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/create-schema`
+- {doc}`/sql/drop-schema`
+- {doc}`/sql/comment`
+- [](sql-routine-management)
+
+### DROP TABLE
+
+Upon execution of a `DROP TABLE` operation, memory is not released
+immediately. It is instead released after the next write operation to the
+catalog.
+
+(memory-dynamic-filtering)=
+
+## Dynamic filtering
+
+The Memory connector supports the {doc}`dynamic filtering </admin/dynamic-filtering>` optimization.
+Dynamic filters are pushed into local table scan on worker nodes for broadcast joins.
+
+### Delayed execution for dynamic filters
+
+For the Memory connector, a table scan is delayed until the collection of dynamic filters.
+This can be disabled by using the configuration property `memory.enable-lazy-dynamic-filtering`
+in the catalog file.
+
+## Limitations
+
+- When one worker fails/restarts, all data that was stored in its
+  memory is lost. To prevent silent data loss the
+  connector throws an error on any read access to such
+  corrupted table.
+- When a query fails for any reason during writing to memory table,
+  the table enters an undefined state. The table should be dropped
+  and recreated manually. Reading attempts from the table may fail,
+  or may return partial data.
+- When the coordinator fails/restarts, all metadata about tables is
+  lost. The tables remain on the workers, but become inaccessible.
+- This connector does not work properly with multiple
+  coordinators, since each coordinator has different
+  metadata.
diff --git a/docs/src/main/sphinx/connector/memory.rst b/docs/src/main/sphinx/connector/memory.rst
deleted file mode 100644
index 0fe01e5da590..000000000000
--- a/docs/src/main/sphinx/connector/memory.rst
+++ /dev/null
@@ -1,106 +0,0 @@
-================
-Memory connector
-================
-
-The Memory connector stores all data and metadata in RAM on workers
-and both are discarded when Trino restarts.
-
-Configuration
--------------
-
-To configure the Memory connector, create a catalog properties file
-``etc/catalog/example.properties`` with the following contents:
-
-.. code-block:: text
-
-    connector.name=memory
-    memory.max-data-per-node=128MB
-
-``memory.max-data-per-node`` defines memory limit for pages stored in this
-connector per each node (default value is 128MB).
-
-Examples
---------
-
-Create a table using the Memory connector::
-
-    CREATE TABLE example.default.nation AS
-    SELECT * from tpch.tiny.nation;
-
-Insert data into a table in the Memory connector::
-
-    INSERT INTO example.default.nation
-    SELECT * FROM tpch.tiny.nation;
-
-Select from the Memory connector::
-
-    SELECT * FROM example.default.nation;
-
-Drop table::
-
-    DROP TABLE example.default.nation;
-
-.. _memory-type-mapping:
-
-Type mapping
-------------
-
-Trino supports all data types used within the Memory schemas so no mapping is
-required.
-
-.. _memory-sql-support:
-
-SQL support
------------
-
-The connector provides read and write access to temporary data and metadata
-stored in memory. In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/create-schema`
-* :doc:`/sql/drop-schema`
-* :doc:`/sql/comment`
-
-DROP TABLE
-^^^^^^^^^^
-
-Upon execution of a ``DROP TABLE`` operation, memory is not released
-immediately. It is instead released after the next write operation to the
-catalog.
-
-.. _memory_dynamic_filtering:
-
-Dynamic filtering
------------------
-
-The Memory connector supports the :doc:`dynamic filtering </admin/dynamic-filtering>` optimization.
-Dynamic filters are pushed into local table scan on worker nodes for broadcast joins.
-
-Delayed execution for dynamic filters
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-For the Memory connector, a table scan is delayed until the collection of dynamic filters.
-This can be disabled by using the configuration property ``memory.enable-lazy-dynamic-filtering``
-in the catalog file.
-
-Limitations
------------
-
-* When one worker fails/restarts, all data that was stored in its
-  memory is lost. To prevent silent data loss the
-  connector throws an error on any read access to such
-  corrupted table.
-* When a query fails for any reason during writing to memory table,
-  the table enters an undefined state. The table should be dropped
-  and recreated manually. Reading attempts from the table may fail,
-  or may return partial data.
-* When the coordinator fails/restarts, all metadata about tables is
-  lost. The tables remain on the workers, but become inaccessible.
-* This connector does not work properly with multiple
-  coordinators, since each coordinator has different
-  metadata.
diff --git a/docs/src/main/sphinx/connector/memsql.rst b/docs/src/main/sphinx/connector/memsql.rst
deleted file mode 100644
index deba99dd7532..000000000000
--- a/docs/src/main/sphinx/connector/memsql.rst
+++ /dev/null
@@ -1,348 +0,0 @@
-=====================
-SingleStore connector
-=====================
-
-.. raw:: html
-
-  <img src="../_static/img/singlestore.png" class="connector-logo">
-
-The SingleStore (formerly known as MemSQL) connector allows querying and
-creating tables in an external SingleStore database.
-
-Requirements
-------------
-
-To connect to SingleStore, you need:
-
-* SingleStore version 7.1.4 or higher.
-* Network access from the Trino coordinator and workers to SingleStore. Port
-  3306 is the default port.
-
-.. _singlestore-configuration:
-
-Configuration
--------------
-
-To configure the SingleStore connector, create a catalog properties file in
-``etc/catalog`` named, for example, ``example.properties``, to mount the
-SingleStore connector as the ``example`` catalog. Create the file with the
-following contents, replacing the connection properties as appropriate for your
-setup:
-
-.. code-block:: text
-
-    connector.name=singlestore
-    connection-url=jdbc:singlestore://example.net:3306
-    connection-user=root
-    connection-password=secret
-
-The ``connection-url`` defines the connection information and parameters to pass
-to the SingleStore JDBC driver. The supported parameters for the URL are
-available in the `SingleStore JDBC driver documentation
-<https://docs.singlestore.com/db/v7.6/en/developer-resources/connect-with-application-development-tools/connect-with-java-jdbc/the-singlestore-jdbc-driver.html#connection-string-parameters>`_.
-
-The ``connection-user`` and ``connection-password`` are typically required and
-determine the user credentials for the connection, often a service user. You can
-use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
-properties files.
-
-
-.. _singlestore-tls:
-
-Connection security
-^^^^^^^^^^^^^^^^^^^
-
-If you have TLS configured with a globally-trusted certificate installed on your
-data source, you can enable TLS between your cluster and the data
-source by appending a parameter to the JDBC connection string set in the
-``connection-url`` catalog configuration property.
-
-Enable TLS between your cluster and SingleStore by appending the ``useSsl=true``
-parameter to the ``connection-url`` configuration property:
-
-.. code-block:: properties
-
-  connection-url=jdbc:singlestore://example.net:3306/?useSsl=true
-
-For more information on TLS configuration options, see the `JDBC driver
-documentation <https://docs.singlestore.com/db/v7.6/en/developer-resources/connect-with-application-development-tools/connect-with-java-jdbc/the-singlestore-jdbc-driver.html#tls-parameters>`_.
-
-Multiple SingleStore servers
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can have as many catalogs as you need, so if you have additional
-SingleStore servers, simply add another properties file to ``etc/catalog``
-with a different name (making sure it ends in ``.properties``). For
-example, if you name the property file ``sales.properties``, Trino
-will create a catalog named ``sales`` using the configured connector.
-
-.. include:: jdbc-common-configurations.fragment
-
-.. |default_domain_compaction_threshold| replace:: ``32``
-.. include:: jdbc-domain-compaction-threshold.fragment
-
-.. include:: jdbc-procedures.fragment
-
-.. include:: jdbc-case-insensitive-matching.fragment
-
-.. include:: non-transactional-insert.fragment
-
-Querying SingleStore
---------------------
-
-The SingleStore connector provides a schema for every SingleStore *database*.
-You can see the available SingleStore databases by running ``SHOW SCHEMAS``::
-
-    SHOW SCHEMAS FROM example;
-
-If you have a SingleStore database named ``web``, you can view the tables
-in this database by running ``SHOW TABLES``::
-
-    SHOW TABLES FROM example.web;
-
-You can see a list of the columns in the ``clicks`` table in the ``web``
-database using either of the following::
-
-    DESCRIBE example.web.clicks;
-    SHOW COLUMNS FROM example.web.clicks;
-
-Finally, you can access the ``clicks`` table in the ``web`` database::
-
-    SELECT * FROM example.web.clicks;
-
-If you used a different name for your catalog properties file, use
-that catalog name instead of ``example`` in the above examples.
-
-.. _singlestore-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and Singlestore each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-Singlestore to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Singlestore types to the corresponding Trino types following
-this table:
-
-.. list-table:: Singlestore to Trino type mapping
-  :widths: 30, 20, 50
-  :header-rows: 1
-
-  * - Singlestore type
-    - Trino type
-    - Notes
-  * - ``BIT``
-    - ``BOOLEAN``
-    -
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-    -
-  * - ``TINYINT``
-    - ``TINYINT``
-    -
-  * - ``TINYINT UNSIGNED``
-    - ``SMALLINT``
-    -
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``SMALLINT UNSIGNED``
-    - ``INTEGER``
-    -
-  * - ``INTEGER``
-    - ``INTEGER``
-    -
-  * - ``INTEGER UNSIGNED``
-    - ``BIGINT``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``BIGINT UNSIGNED``
-    - ``DECIMAL(20, 0)``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``REAL``
-    - ``DOUBLE``
-    -
-  * - ``DECIMAL(p, s)``
-    - ``DECIMAL(p, s)``
-    - See :ref:`Singlestore DECIMAL type handling <singlestore-decimal-handling>`
-  * - ``CHAR(n)``
-    - ``CHAR(n)``
-    -
-  * - ``TINYTEXT``
-    - ``VARCHAR(255)``
-    -
-  * - ``TEXT``
-    - ``VARCHAR(65535)``
-    -
-  * - ``MEDIUMTEXT``
-    - ``VARCHAR(16777215)``
-    -
-  * - ``LONGTEXT``
-    - ``VARCHAR``
-    -
-  * - ``VARCHAR(n)``
-    - ``VARCHAR(n)``
-    -
-  * - ``LONGBLOB``
-    - ``VARBINARY``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME``
-    - ``TIME(0)``
-    -
-  * - ``TIME(6)``
-    - ``TIME(6)``
-    -
-  * - ``DATETIME``
-    - ``TIMESTAMP(0)``
-    -
-  * - ``DATETIME(6)``
-    - ``TIMESTAMP(6)``
-    -
-  * - ``JSON``
-    - ``JSON``
-    -
-
-No other types are supported.
-
-Trino to Singlestore type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding Singlestore types following
-this table:
-
-.. list-table:: Trino to Singlestore type mapping
-  :widths: 30, 20, 50
-  :header-rows: 1
-
-  * - Trino type
-    - Singlestore type
-    - Notes
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-    -
-  * - ``TINYINT``
-    - ``TINYINT``
-    -
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``INTEGER``
-    - ``INTEGER``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``REAL``
-    - ``FLOAT``
-    -
-  * - ``DECIMAL(p, s)``
-    - ``DECIMAL(p, s)``
-    - See :ref:`Singlestore DECIMAL type handling <singlestore-decimal-handling>`
-  * - ``CHAR(n)``
-    - ``CHAR(n)``
-    -
-  * - ``VARCHAR(65535)``
-    - ``TEXT``
-    -
-  * - ``VARCHAR(16777215)``
-    - ``MEDIUMTEXT``
-    -
-  * - ``VARCHAR``
-    - ``LONGTEXT``
-    -
-  * - ``VARCHAR(n)``
-    - ``VARCHAR(n)``
-    -
-  * - ``VARBINARY``
-    - ``LONGBLOB``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME(0)``
-    - ``TIME``
-    -
-  * - ``TIME(6)``
-    - ``TIME(6)``
-    -
-  * - ``TIMESTAMP(0)``
-    - ``DATETIME``
-    -
-  * - ``TIMESTAMP(6)``
-    - ``DATETIME(6)``
-    -
-  * - ``JSON``
-    - ``JSON``
-    -
-
-No other types are supported.
-
-.. _singlestore-decimal-handling:
-
-.. include:: decimal-type-handling.fragment
-
-.. include:: jdbc-type-mapping.fragment
-
-.. _singlestore-sql-support:
-
-SQL support
------------
-
-The connector provides read access and write access to data and metadata in
-a SingleStore database.  In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/delete`
-* :doc:`/sql/truncate`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/alter-table`
-* :doc:`/sql/create-schema`
-* :doc:`/sql/drop-schema`
-
-.. include:: sql-delete-limitation.fragment
-
-.. include:: alter-table-limitation.fragment
-
-Performance
------------
-
-The connector includes a number of performance improvements, detailed in the
-following sections.
-
-.. _singlestore-pushdown:
-
-Pushdown
-^^^^^^^^
-
-The connector supports pushdown for a number of operations:
-
-* :ref:`join-pushdown`
-* :ref:`limit-pushdown`
-* :ref:`topn-pushdown`
-
-.. include:: pushdown-correctness-behavior.fragment
-
-.. include:: join-pushdown-enabled-false.fragment
-
-.. include:: no-pushdown-text-type.fragment
diff --git a/docs/src/main/sphinx/connector/metastores.md b/docs/src/main/sphinx/connector/metastores.md
new file mode 100644
index 000000000000..c0f2a8d22c8b
--- /dev/null
+++ b/docs/src/main/sphinx/connector/metastores.md
@@ -0,0 +1,472 @@
+# Metastores
+
+Object storage access is mediated through a *metastore*. Metastores provide
+information on directory structure, file format, and metadata about the stored
+data. Object storage connectors support the use of one or more metastores. A
+supported metastore is required to use any object storage connector.
+
+Additional configuration is required in order to access tables with Athena
+partition projection metadata or implement first class support for Avro tables.
+These requirements are discussed later in this topic.
+
+(general-metastore-properties)=
+
+## General metastore configuration properties
+
+The following table describes general metastore configuration properties, most
+of which are used with either metastore.
+
+At a minimum, each Delta Lake, Hive or Hudi object storage catalog file must set
+the `hive.metastore` configuration property to define the type of metastore to
+use. Iceberg catalogs instead use the `iceberg.catalog.type` configuration
+property to define the type of metastore to use.
+
+Additional configuration properties specific to the Thrift and Glue Metastores
+are also available. They are discussed later in this topic.
+
+```{eval-rst}
+.. list-table:: General metastore configuration properties
+    :widths: 35, 50, 15
+    :header-rows: 1
+
+    * - Property Name
+      - Description
+      - Default
+    * - ``hive.metastore``
+      - The type of Hive metastore to use. Trino currently supports the default
+        Hive Thrift metastore (``thrift``), and the AWS Glue Catalog (``glue``)
+        as metadata sources. You must use this for all object storage catalogs
+        except Iceberg.
+      - ``thrift``
+    * - ``iceberg.catalog.type``
+      - The Iceberg table format manages most metadata in metadata files in the
+        object storage itself. A small amount of metadata, however, still
+        requires the use of a metastore. In the Iceberg ecosystem, these smaller
+        metastores are called Iceberg metadata catalogs, or just catalogs. The
+        examples in each subsection depict the contents of a Trino catalog file
+        that uses the the Iceberg connector to configures different Iceberg
+        metadata catalogs.
+
+        You must set this property in all Iceberg catalog property files.
+        Valid values are ``HIVE_METASTORE``, ``GLUE``, ``JDBC``, ``REST``, and
+        ``NESSIE``.
+      -
+    * - ``hive.metastore-cache.cache-partitions``
+      - Enable caching for partition metadata. You can disable caching to avoid
+        inconsistent behavior that results from it.
+      - ``true``
+    * - ``hive.metastore-cache-ttl``
+      - Duration of how long cached metastore data is considered valid.
+      - ``0s``
+    * - ``hive.metastore-stats-cache-ttl``
+      - Duration of how long cached metastore statistics are considered valid.
+        If ``hive.metastore-cache-ttl`` is larger then it takes precedence
+        over ``hive.metastore-stats-cache-ttl``.
+      - ``5m``
+    * - ``hive.metastore-cache-maximum-size``
+      - Maximum number of metastore data objects in the Hive metastore cache.
+      - ``10000``
+    * - ``hive.metastore-refresh-interval``
+      - Asynchronously refresh cached metastore data after access if it is older
+        than this but is not yet expired, allowing subsequent accesses to see
+        fresh data.
+      -
+    * - ``hive.metastore-refresh-max-threads``
+      - Maximum threads used to refresh cached metastore data.
+      - ``10``
+    * - ``hive.hide-delta-lake-tables``
+      - Controls whether to hide Delta Lake tables in table listings. Currently
+        applies only when using the AWS Glue metastore.
+      - ``false``
+```
+
+(hive-thrift-metastore)=
+
+## Thrift metastore configuration properties
+
+In order to use a Hive Thrift metastore, you must configure the metastore with
+`hive.metastore=thrift` and provide further details with the following
+properties:
+
+```{eval-rst}
+.. list-table:: Thrift metastore configuration properties
+   :widths: 35, 50, 15
+   :header-rows: 1
+
+   * - Property name
+     - Description
+     - Default
+   * - ``hive.metastore.uri``
+     - The URIs of the Hive metastore to connect to using the Thrift protocol.
+       If a comma-separated list of URIs is provided, the first URI is used by
+       default, and the rest of the URIs are fallback metastores. This property
+       is required. Example: ``thrift://192.0.2.3:9083`` or
+       ``thrift://192.0.2.3:9083,thrift://192.0.2.4:9083``
+     -
+   * - ``hive.metastore.username``
+     - The username Trino uses to access the Hive metastore.
+     -
+   * - ``hive.metastore.authentication.type``
+     - Hive metastore authentication type. Possible values are ``NONE`` or
+       ``KERBEROS``.
+     - ``NONE``
+   * - ``hive.metastore.thrift.client.connect-timeout``
+     - Socket connect timeout for metastore client.
+     - ``10s``
+   * - ``hive.metastore.thrift.client.read-timeout``
+     - Socket read timeout for metastore client.
+     - ``10s``
+   * - ``hive.metastore.thrift.impersonation.enabled``
+     - Enable Hive metastore end user impersonation.
+     -
+   * - ``hive.metastore.thrift.use-spark-table-statistics-fallback``
+     - Enable usage of table statistics generated by Apache Spark when Hive
+       table statistics are not available.
+     - ``true``
+   * - ``hive.metastore.thrift.delegation-token.cache-ttl``
+     - Time to live delegation token cache for metastore.
+     - ``1h``
+   * - ``hive.metastore.thrift.delegation-token.cache-maximum-size``
+     - Delegation token cache maximum size.
+     - ``1000``
+   * - ``hive.metastore.thrift.client.ssl.enabled``
+     - Use SSL when connecting to metastore.
+     - ``false``
+   * - ``hive.metastore.thrift.client.ssl.key``
+     - Path to private key and client certification (key store).
+     -
+   * - ``hive.metastore.thrift.client.ssl.key-password``
+     - Password for the private key.
+     -
+   * - ``hive.metastore.thrift.client.ssl.trust-certificate``
+     - Path to the server certificate chain (trust store). Required when SSL is
+       enabled.
+     -
+   * - ``hive.metastore.thrift.client.ssl.trust-certificate-password``
+     - Password for the trust store.
+     -
+   * - ``hive.metastore.thrift.batch-fetch.enabled``
+     - Enable fetching tables and views from all schemas in a single request.
+     - ``true``
+   * - ``hive.metastore.service.principal``
+     - The Kerberos principal of the Hive metastore service.
+     -
+   * - ``hive.metastore.client.principal``
+     - The Kerberos principal that Trino uses when connecting to the Hive
+       metastore service.
+     -
+   * - ``hive.metastore.client.keytab``
+     - Hive metastore client keytab location.
+     -
+   * - ``hive.metastore.thrift.delete-files-on-drop``
+     - Actively delete the files for managed tables when performing drop table
+       or partition operations, for cases when the metastore does not delete the
+       files.
+     - ``false``
+   * - ``hive.metastore.thrift.assume-canonical-partition-keys``
+     - Allow the metastore to assume that the values of partition columns can be
+       converted to string values. This can lead to performance improvements in
+       queries which apply filters on the partition columns. Partition keys with
+       a ``TIMESTAMP`` type do not get canonicalized.
+     - ``false``
+   * - ``hive.metastore.thrift.client.socks-proxy``
+     - SOCKS proxy to use for the Thrift Hive metastore.
+     -
+   * - ``hive.metastore.thrift.client.max-retries``
+     - Maximum number of retry attempts for metastore requests.
+     - ``9``
+   * - ``hive.metastore.thrift.client.backoff-scale-factor``
+     - Scale factor for metastore request retry delay.
+     - ``2.0``
+   * - ``hive.metastore.thrift.client.max-retry-time``
+     - Total allowed time limit for a metastore request to be retried.
+     - ``30s``
+   * - ``hive.metastore.thrift.client.min-backoff-delay``
+     - Minimum delay between metastore request retries.
+     - ``1s``
+   * - ``hive.metastore.thrift.client.max-backoff-delay``
+     - Maximum delay between metastore request retries.
+     - ``1s``
+   * - ``hive.metastore.thrift.txn-lock-max-wait``
+     - Maximum time to wait to acquire hive transaction lock.
+     - ``10m``
+```
+
+(hive-glue-metastore)=
+
+## AWS Glue catalog configuration properties
+
+In order to use an AWS Glue catalog, you must configure your catalog file as
+follows:
+
+`hive.metastore=glue` and provide further details with the following
+properties:
+
+```{eval-rst}
+.. list-table:: AWS Glue catalog configuration properties
+    :widths: 35, 50, 15
+    :header-rows: 1
+
+    * - Property Name
+      - Description
+      - Default
+    * - ``hive.metastore.glue.region``
+      - AWS region of the Glue Catalog. This is required when not running in
+        EC2, or when the catalog is in a different region. Example:
+        ``us-east-1``
+      -
+    * - ``hive.metastore.glue.endpoint-url``
+      - Glue API endpoint URL (optional). Example:
+        ``https://glue.us-east-1.amazonaws.com``
+      -
+    * - ``hive.metastore.glue.sts.region``
+      - AWS region of the STS service to authenticate with. This is required
+        when running in a GovCloud region. Example: ``us-gov-east-1``
+      -
+    * - ``hive.metastore.glue.proxy-api-id``
+      - The ID of the Glue Proxy API, when accessing Glue via an VPC endpoint in
+        API Gateway.
+      -
+    * - ``hive.metastore.glue.sts.endpoint``
+      - STS endpoint URL to use when authenticating to Glue (optional). Example:
+        ``https://sts.us-gov-east-1.amazonaws.com``
+      -
+    * - ``hive.metastore.glue.pin-client-to-current-region``
+      - Pin Glue requests to the same region as the EC2 instance where Trino is
+        running.
+      - ``false``
+    * - ``hive.metastore.glue.max-connections``
+      - Max number of concurrent connections to Glue.
+      - ``30``
+    * - ``hive.metastore.glue.max-error-retries``
+      - Maximum number of error retries for the Glue client.
+      - ``10``
+    * - ``hive.metastore.glue.default-warehouse-dir``
+      - Default warehouse directory for schemas created without an explicit
+        ``location`` property.
+      -
+    * - ``hive.metastore.glue.aws-credentials-provider``
+      - Fully qualified name of the Java class to use for obtaining AWS
+        credentials. Can be used to supply a custom credentials provider.
+      -
+    * - ``hive.metastore.glue.aws-access-key``
+      - AWS access key to use to connect to the Glue Catalog. If specified along
+        with ``hive.metastore.glue.aws-secret-key``, this parameter takes
+        precedence over ``hive.metastore.glue.iam-role``.
+      -
+    * - ``hive.metastore.glue.aws-secret-key``
+      - AWS secret key to use to connect to the Glue Catalog. If specified along
+        with ``hive.metastore.glue.aws-access-key``, this parameter takes
+        precedence over ``hive.metastore.glue.iam-role``.
+      -
+    * - ``hive.metastore.glue.catalogid``
+      - The ID of the Glue Catalog in which the metadata database resides.
+      -
+    * - ``hive.metastore.glue.iam-role``
+      - ARN of an IAM role to assume when connecting to the Glue Catalog.
+      -
+    * - ``hive.metastore.glue.external-id``
+      - External ID for the IAM role trust policy when connecting to the Glue
+        Catalog.
+      -
+    * - ``hive.metastore.glue.partitions-segments``
+      - Number of segments for partitioned Glue tables.
+      - ``5``
+    * - ``hive.metastore.glue.get-partition-threads``
+      - Number of threads for parallel partition fetches from Glue.
+      - ``20``
+    * - ``hive.metastore.glue.read-statistics-threads``
+      - Number of threads for parallel statistic fetches from Glue.
+      - ``5``
+    * - ``hive.metastore.glue.write-statistics-threads``
+      - Number of threads for parallel statistic writes to Glue.
+      - ``5``
+```
+
+(iceberg-glue-catalog)=
+
+### Iceberg-specific Glue catalog configuration properties
+
+When using the Glue catalog, the Iceberg connector supports the same
+{ref}`general Glue configuration properties <hive-glue-metastore>` as previously
+described with the following additional property:
+
+```{eval-rst}
+.. list-table:: Iceberg Glue catalog configuration property
+  :widths: 35, 50, 15
+  :header-rows: 1
+
+  * - Property name
+    - Description
+    - Default
+  * - ``iceberg.glue.skip-archive``
+    - Skip archiving an old table version when creating a new version in a
+      commit. See `AWS Glue Skip Archive
+      <https://iceberg.apache.org/docs/latest/aws/#skip-archive>`_.
+    - ``false``
+```
+
+## Iceberg-specific metastores
+
+The Iceberg table format manages most metadata in metadata files in the object
+storage itself. A small amount of metadata, however, still requires the use of a
+metastore. In the Iceberg ecosystem, these smaller metastores are called Iceberg
+metadata catalogs, or just catalogs.
+
+You can use a general metastore such as an HMS or AWS Glue, or you can use the
+Iceberg-specific REST, Nessie or JDBC metadata catalogs, as discussed in this
+section.
+
+(iceberg-rest-catalog)=
+
+### REST catalog
+
+In order to use the Iceberg REST catalog, configure the catalog type
+with `iceberg.catalog.type=rest`, and provide further details with the
+following properties:
+
+```{eval-rst}
+.. list-table:: Iceberg REST catalog configuration properties
+  :widths: 40, 60
+  :header-rows: 1
+
+  * - Property name
+    - Description
+  * - ``iceberg.rest-catalog.uri``
+    - REST server API endpoint URI (required).
+      Example: ``http://iceberg-with-rest:8181``
+  * - ``iceberg.rest-catalog.warehouse``
+    - Warehouse identifier/location for the catalog (optional).
+      Example: ``s3://my_bucket/warehouse_location``
+  * - ``iceberg.rest-catalog.security``
+    - The type of security to use (default: ``NONE``).  ``OAUTH2`` requires
+      either a ``token`` or ``credential``. Example: ``OAUTH2``
+  * - ``iceberg.rest-catalog.session``
+    - Session information included when communicating with the REST Catalog.
+      Options are ``NONE`` or ``USER`` (default: ``NONE``).
+  * - ``iceberg.rest-catalog.oauth2.token``
+    - The bearer token used for interactions with the server. A
+      ``token`` or ``credential`` is required for ``OAUTH2`` security.
+      Example: ``AbCdEf123456``
+  * - ``iceberg.rest-catalog.oauth2.credential``
+    - The credential to exchange for a token in the OAuth2 client credentials
+      flow with the server. A ``token`` or ``credential`` is required for
+      ``OAUTH2`` security. Example: ``AbCdEf123456``
+```
+
+The following example shows a minimal catalog configuration using an Iceberg
+REST metadata catalog:
+
+```properties
+connector.name=iceberg
+iceberg.catalog.type=rest
+iceberg.rest-catalog.uri=http://iceberg-with-rest:8181
+```
+
+The REST catalog does not support {doc}`views</sql/create-view>` or
+{doc}`materialized views</sql/create-materialized-view>`.
+
+(iceberg-jdbc-catalog)=
+
+### JDBC catalog
+
+The Iceberg REST catalog is supported for the Iceberg connector.  At a minimum,
+`iceberg.jdbc-catalog.driver-class`, `iceberg.jdbc-catalog.connection-url`
+and `iceberg.jdbc-catalog.catalog-name` must be configured. When using any
+database besides PostgreSQL, a JDBC driver jar file must be placed in the plugin
+directory.
+
+:::{warning}
+The JDBC catalog may have compatibility issues if Iceberg introduces breaking
+changes in the future. Consider the {ref}`REST catalog
+<iceberg-rest-catalog>` as an alternative solution.
+:::
+
+At a minimum, `iceberg.jdbc-catalog.driver-class`,
+`iceberg.jdbc-catalog.connection-url`, and
+`iceberg.jdbc-catalog.catalog-name` must be configured. When using any
+database besides PostgreSQL, a JDBC driver jar file must be placed in the plugin
+directory. The following example shows a minimal catalog configuration using an
+Iceberg REST metadata catalog:
+
+```text
+connector.name=iceberg
+iceberg.catalog.type=jdbc
+iceberg.jdbc-catalog.catalog-name=test
+iceberg.jdbc-catalog.driver-class=org.postgresql.Driver
+iceberg.jdbc-catalog.connection-url=jdbc:postgresql://example.net:5432/database
+iceberg.jdbc-catalog.connection-user=admin
+iceberg.jdbc-catalog.connection-password=test
+iceberg.jdbc-catalog.default-warehouse-dir=s3://bucket
+```
+
+The JDBC catalog does not support {doc}`views</sql/create-view>` or
+{doc}`materialized views</sql/create-materialized-view>`.
+
+(iceberg-nessie-catalog)=
+
+### Nessie catalog
+
+In order to use a Nessie catalog, configure the catalog type with
+`iceberg.catalog.type=nessie` and provide further details with the following
+properties:
+
+```{eval-rst}
+.. list-table:: Nessie catalog configuration properties
+  :widths: 40, 60
+  :header-rows: 1
+
+  * - Property name
+    - Description
+  * - ``iceberg.nessie-catalog.uri``
+    - Nessie API endpoint URI (required).
+      Example: ``https://localhost:19120/api/v1``
+  * - ``iceberg.nessie-catalog.ref``
+    - The branch/tag to use for Nessie, defaults to ``main``.
+  * - ``iceberg.nessie-catalog.default-warehouse-dir``
+    - Default warehouse directory for schemas created without an explicit
+      ``location`` property. Example: ``/tmp``
+```
+
+```text
+connector.name=iceberg
+iceberg.catalog.type=nessie
+iceberg.nessie-catalog.uri=https://localhost:19120/api/v1
+iceberg.nessie-catalog.default-warehouse-dir=/tmp
+```
+
+(partition-projection)=
+
+## Access tables with Athena partition projection metadata
+
+[Partition projection](https://docs.aws.amazon.com/athena/latest/ug/partition-projection.html)
+is a feature of AWS Athena often used to speed up query processing with highly
+partitioned tables when using the Hive connector.
+
+Trino supports partition projection table properties stored in the Hive
+metastore or Glue catalog, and it reimplements this functionality. Currently,
+there is a limitation in comparison to AWS Athena for date projection, as it
+only supports intervals of `DAYS`, `HOURS`, `MINUTES`, and `SECONDS`.
+
+If there are any compatibility issues blocking access to a requested table when
+partition projection is enabled, set the
+`partition_projection_ignore` table property to `true` for a table to bypass
+any errors.
+
+Refer to {ref}`hive-table-properties` and {ref}`hive-column-properties` for
+configuration of partition projection.
+
+## Configure metastore for Avro
+
+For catalogs using the Hive connector, you must add the following property
+definition to the Hive metastore configuration file `hive-site.xml` and
+restart the metastore service to enable first-class support for Avro tables when
+using Hive 3.x:
+
+```xml
+<property>
+     <!-- https://community.hortonworks.com/content/supportkb/247055/errorjavalangunsupportedoperationexception-storage.html -->
+     <name>metastore.storage.schema.reader.impl</name>
+     <value>org.apache.hadoop.hive.metastore.SerDeStorageSchemaReader</value>
+ </property>
+```
diff --git a/docs/src/main/sphinx/connector/mongodb.md b/docs/src/main/sphinx/connector/mongodb.md
new file mode 100644
index 000000000000..d0953d936f9c
--- /dev/null
+++ b/docs/src/main/sphinx/connector/mongodb.md
@@ -0,0 +1,510 @@
+# MongoDB connector
+
+```{raw} html
+<img src="../_static/img/mongodb.png" class="connector-logo">
+```
+
+The `mongodb` connector allows the use of [MongoDB](https://www.mongodb.com/) collections as tables in Trino.
+
+## Requirements
+
+To connect to MongoDB, you need:
+
+- MongoDB 4.2 or higher.
+- Network access from the Trino coordinator and workers to MongoDB.
+  Port 27017 is the default port.
+- Write access to the {ref}`schema information collection <table-definition-label>`
+  in MongoDB.
+
+## Configuration
+
+To configure the MongoDB connector, create a catalog properties file
+`etc/catalog/example.properties` with the following contents,
+replacing the properties as appropriate:
+
+```text
+connector.name=mongodb
+mongodb.connection-url=mongodb://user:pass@sample.host:27017/
+```
+
+### Multiple MongoDB clusters
+
+You can have as many catalogs as you need, so if you have additional
+MongoDB clusters, simply add another properties file to `etc/catalog`
+with a different name, making sure it ends in `.properties`). For
+example, if you name the property file `sales.properties`, Trino
+will create a catalog named `sales` using the configured connector.
+
+## Configuration properties
+
+The following configuration properties are available:
+
+| Property name                            | Description                                                                |
+| ---------------------------------------- | -------------------------------------------------------------------------- |
+| `mongodb.connection-url`                 | The connection url that the driver uses to connect to a MongoDB deployment |
+| `mongodb.schema-collection`              | A collection which contains schema information                             |
+| `mongodb.case-insensitive-name-matching` | Match database and collection names case insensitively                     |
+| `mongodb.min-connections-per-host`       | The minimum size of the connection pool per host                           |
+| `mongodb.connections-per-host`           | The maximum size of the connection pool per host                           |
+| `mongodb.max-wait-time`                  | The maximum wait time                                                      |
+| `mongodb.max-connection-idle-time`       | The maximum idle time of a pooled connection                               |
+| `mongodb.connection-timeout`             | The socket connect timeout                                                 |
+| `mongodb.socket-timeout`                 | The socket timeout                                                         |
+| `mongodb.tls.enabled`                    | Use TLS/SSL for connections to mongod/mongos                               |
+| `mongodb.tls.keystore-path`              | Path to the  or JKS key store                                              |
+| `mongodb.tls.truststore-path`            | Path to the  or JKS trust store                                            |
+| `mongodb.tls.keystore-password`          | Password for the key store                                                 |
+| `mongodb.tls.truststore-password`        | Password for the trust store                                               |
+| `mongodb.read-preference`                | The read preference                                                        |
+| `mongodb.write-concern`                  | The write concern                                                          |
+| `mongodb.required-replica-set`           | The required replica set name                                              |
+| `mongodb.cursor-batch-size`              | The number of elements to return in a batch                                |
+
+### `mongodb.connection-url`
+
+A connection string containing the protocol, credential, and host info for use
+inconnection to your MongoDB deployment.
+
+For example, the connection string may use the format
+`mongodb://<user>:<pass>@<host>:<port>/?<options>` or
+`mongodb+srv://<user>:<pass>@<host>/?<options>`, depending on the protocol
+used. The user/pass credentials must be for a user with write access to the
+{ref}`schema information collection <table-definition-label>`.
+
+See the [MongoDB Connection URI](https://docs.mongodb.com/drivers/java/sync/current/fundamentals/connection/#connection-uri) for more information.
+
+This property is required; there is no default. A connection URL must be
+provided to connect to a MongoDB deployment.
+
+### `mongodb.schema-collection`
+
+As MongoDB is a document database, there is no fixed schema information in the system. So a special collection in each MongoDB database should define the schema of all tables. Please refer the {ref}`table-definition-label` section for the details.
+
+At startup, the connector tries to guess the data type of fields based on the {ref}`type mapping <mongodb-type-mapping>`.
+
+The initial guess can be incorrect for your specific collection. In that case, you need to modify it manually. Please refer the {ref}`table-definition-label` section for the details.
+
+Creating new tables using `CREATE TABLE` and `CREATE TABLE AS SELECT` automatically create an entry for you.
+
+This property is optional; the default is `_schema`.
+
+### `mongodb.case-insensitive-name-matching`
+
+Match database and collection names case insensitively.
+
+This property is optional; the default is `false`.
+
+### `mongodb.min-connections-per-host`
+
+The minimum number of connections per host for this MongoClient instance. Those connections are kept in a pool when idle, and the pool ensures over time that it contains at least this minimum number.
+
+This property is optional; the default is `0`.
+
+### `mongodb.connections-per-host`
+
+The maximum number of connections allowed per host for this MongoClient instance. Those connections are kept in a pool when idle. Once the pool is exhausted, any operation requiring a connection blocks waiting for an available connection.
+
+This property is optional; the default is `100`.
+
+### `mongodb.max-wait-time`
+
+The maximum wait time in milliseconds, that a thread may wait for a connection to become available.
+A value of `0` means that it does not wait. A negative value means to wait indefinitely for a connection to become available.
+
+This property is optional; the default is `120000`.
+
+### `mongodb.max-connection-idle-time`
+
+The maximum idle time of a pooled connection in milliseconds. A value of `0` indicates no limit to the idle time.
+A pooled connection that has exceeded its idle time will be closed and replaced when necessary by a new connection.
+
+This property is optional; the default is `0`.
+
+### `mongodb.connection-timeout`
+
+The connection timeout in milliseconds. A value of `0` means no timeout. It is used solely when establishing a new connection.
+
+This property is optional; the default is `10000`.
+
+### `mongodb.socket-timeout`
+
+The socket timeout in milliseconds. It is used for I/O socket read and write operations.
+
+This property is optional; the default is `0` and means no timeout.
+
+### `mongodb.tls.enabled`
+
+This flag enables TLS connections to MongoDB servers.
+
+This property is optional; the default is `false`.
+
+### `mongodb.tls.keystore-path`
+
+The path to the {doc}`PEM </security/inspect-pem>` or
+{doc}`JKS </security/inspect-jks>` key store.
+
+This property is optional.
+
+### `mongodb.tls.truststore-path`
+
+The path to {doc}`PEM </security/inspect-pem>` or
+{doc}`JKS </security/inspect-jks>` trust store.
+
+This property is optional.
+
+### `mongodb.tls.keystore-password`
+
+The key password for the key store specified by `mongodb.tls.keystore-path`.
+
+This property is optional.
+
+### `mongodb.tls.truststore-password`
+
+The key password for the trust store specified by `mongodb.tls.truststore-path`.
+
+This property is optional.
+
+### `mongodb.read-preference`
+
+The read preference to use for queries, map-reduce, aggregation, and count.
+The available values are `PRIMARY`, `PRIMARY_PREFERRED`, `SECONDARY`, `SECONDARY_PREFERRED` and `NEAREST`.
+
+This property is optional; the default is `PRIMARY`.
+
+### `mongodb.write-concern`
+
+The write concern to use. The available values are
+`ACKNOWLEDGED`, `JOURNALED`, `MAJORITY` and `UNACKNOWLEDGED`.
+
+This property is optional; the default is `ACKNOWLEDGED`.
+
+### `mongodb.required-replica-set`
+
+The required replica set name. With this option set, the MongoClient instance performs the following actions:
+
+```
+#. Connect in replica set mode, and discover all members of the set based on the given servers
+#. Make sure that the set name reported by all members matches the required set name.
+#. Refuse to service any requests, if authenticated user is not part of a replica set with the required name.
+```
+
+This property is optional; no default value.
+
+### `mongodb.cursor-batch-size`
+
+Limits the number of elements returned in one batch. A cursor typically fetches a batch of result objects and stores them locally.
+If batchSize is 0, Driver's default are used.
+If batchSize is positive, it represents the size of each batch of objects retrieved. It can be adjusted to optimize performance and limit data transfer.
+If batchSize is negative, it limits the number of objects returned, that fit within the max batch size limit (usually 4MB), and the cursor is closed. For example if batchSize is -10, then the server returns a maximum of 10 documents, and as many as can fit in 4MB, then closes the cursor.
+
+:::{note}
+Do not use a batch size of `1`.
+:::
+
+This property is optional; the default is `0`.
+
+(table-definition-label)=
+
+## Table definition
+
+MongoDB maintains table definitions on the special collection where `mongodb.schema-collection` configuration value specifies.
+
+:::{note}
+The plugin cannot detect that a collection has been deleted. You must
+delete the entry by executing `db.getCollection("_schema").remove( { table:
+deleted_table_name })` in the MongoDB Shell. You can also drop a collection in
+Trino by running `DROP TABLE table_name`.
+:::
+
+A schema collection consists of a MongoDB document for a table.
+
+```text
+{
+    "table": ...,
+    "fields": [
+          { "name" : ...,
+            "type" : "varchar|bigint|boolean|double|date|array(bigint)|...",
+            "hidden" : false },
+            ...
+        ]
+    }
+}
+```
+
+The connector quotes the fields for a row type when auto-generating the schema;
+however, the auto-generated schema must be corrected manually in the collection
+to match the information in the tables.
+
+Manually altered fields must be explicitly quoted, for example, `row("UpperCase"
+varchar)`.
+
+| Field    | Required | Type   | Description                                                                                 |
+| -------- | -------- | ------ | ------------------------------------------------------------------------------------------- |
+| `table`  | required | string | Trino table name                                                                            |
+| `fields` | required | array  | A list of field definitions. Each field definition creates a new column in the Trino table. |
+
+Each field definition:
+
+```text
+{
+    "name": ...,
+    "type": ...,
+    "hidden": ...
+}
+```
+
+| Field    | Required | Type    | Description                                                                        |
+| -------- | -------- | ------- | ---------------------------------------------------------------------------------- |
+| `name`   | required | string  | Name of the column in the Trino table.                                             |
+| `type`   | required | string  | Trino type of the column.                                                          |
+| `hidden` | optional | boolean | Hides the column from `DESCRIBE <table name>` and `SELECT *`. Defaults to `false`. |
+
+There is no limit on field descriptions for either key or message.
+
+## ObjectId
+
+MongoDB collection has the special field `_id`. The connector tries to follow the same rules for this special field, so there will be hidden field `_id`.
+
+```sql
+CREATE TABLE IF NOT EXISTS orders (
+    orderkey BIGINT,
+    orderstatus VARCHAR,
+    totalprice DOUBLE,
+    orderdate DATE
+);
+
+INSERT INTO orders VALUES(1, 'bad', 50.0, current_date);
+INSERT INTO orders VALUES(2, 'good', 100.0, current_date);
+SELECT _id, * FROM orders;
+```
+
+```text
+                 _id                 | orderkey | orderstatus | totalprice | orderdate
+-------------------------------------+----------+-------------+------------+------------
+ 55 b1 51 63 38 64 d6 43 8c 61 a9 ce |        1 | bad         |       50.0 | 2015-07-23
+ 55 b1 51 67 38 64 d6 43 8c 61 a9 cf |        2 | good        |      100.0 | 2015-07-23
+(2 rows)
+```
+
+```sql
+SELECT _id, * FROM orders WHERE _id = ObjectId('55b151633864d6438c61a9ce');
+```
+
+```text
+                 _id                 | orderkey | orderstatus | totalprice | orderdate
+-------------------------------------+----------+-------------+------------+------------
+ 55 b1 51 63 38 64 d6 43 8c 61 a9 ce |        1 | bad         |       50.0 | 2015-07-23
+(1 row)
+```
+
+You can render the `_id` field to readable values with a cast to `VARCHAR`:
+
+```sql
+SELECT CAST(_id AS VARCHAR), * FROM orders WHERE _id = ObjectId('55b151633864d6438c61a9ce');
+```
+
+```text
+           _id             | orderkey | orderstatus | totalprice | orderdate
+---------------------------+----------+-------------+------------+------------
+ 55b151633864d6438c61a9ce  |        1 | bad         |       50.0 | 2015-07-23
+(1 row)
+```
+
+### ObjectId timestamp functions
+
+The first four bytes of each [ObjectId](https://docs.mongodb.com/manual/reference/method/ObjectId) represent
+an embedded timestamp of its creation time. Trino provides a couple of functions to take advantage of this MongoDB feature.
+
+```{eval-rst}
+.. function:: objectid_timestamp(ObjectId) -> timestamp
+
+    Extracts the TIMESTAMP WITH TIME ZONE from a given ObjectId::
+
+        SELECT objectid_timestamp(ObjectId('507f191e810c19729de860ea'));
+        -- 2012-10-17 20:46:22.000 UTC
+```
+
+```{eval-rst}
+.. function:: timestamp_objectid(timestamp) -> ObjectId
+
+    Creates an ObjectId from a TIMESTAMP WITH TIME ZONE::
+
+        SELECT timestamp_objectid(TIMESTAMP '2021-08-07 17:51:36 +00:00');
+        -- 61 0e c8 28 00 00 00 00 00 00 00 00
+```
+
+In MongoDB, you can filter all the documents created after `2021-08-07 17:51:36`
+with a query like this:
+
+```text
+db.collection.find({"_id": {"$gt": ObjectId("610ec8280000000000000000")}})
+```
+
+In Trino, the same can be achieved with this query:
+
+```sql
+SELECT *
+FROM collection
+WHERE _id > timestamp_objectid(TIMESTAMP '2021-08-07 17:51:36 +00:00');
+```
+
+(mongodb-type-mapping)=
+
+## Type mapping
+
+Because Trino and MongoDB each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+### MongoDB to Trino type mapping
+
+The connector maps MongoDB types to the corresponding Trino types following
+this table:
+
+```{eval-rst}
+.. list-table:: MongoDB to Trino type mapping
+  :widths: 30, 20, 50
+  :header-rows: 1
+
+  * - MongoDB type
+    - Trino type
+    - Notes
+  * - ``Boolean``
+    - ``BOOLEAN``
+    -
+  * - ``Int32``
+    - ``BIGINT``
+    -
+  * - ``Int64``
+    - ``BIGINT``
+    -
+  * - ``Double``
+    - ``DOUBLE``
+    -
+  * - ``Decimal128``
+    - ``DECIMAL(p, s)``
+    -
+  * - ``Date``
+    - ``TIMESTAMP(3)``
+    -
+  * - ``String``
+    - ``VARCHAR``
+    -
+  * - ``Binary``
+    - ``VARBINARY``
+    -
+  * - ``ObjectId``
+    - ``ObjectId``
+    -
+  * - ``Object``
+    - ``ROW``
+    -
+  * - ``Array``
+    - ``ARRAY``
+    -   Map to ``ROW`` if the element type is not unique.
+  * - ``DBRef``
+    - ``ROW``
+    -
+```
+
+No other types are supported.
+
+### Trino to MongoDB type mapping
+
+The connector maps Trino types to the corresponding MongoDB types following
+this table:
+
+```{eval-rst}
+.. list-table:: Trino to MongoDB type mapping
+  :widths: 30, 20
+  :header-rows: 1
+
+  * - Trino type
+    - MongoDB type
+  * - ``BOOLEAN``
+    - ``Boolean``
+  * - ``BIGINT``
+    - ``Int64``
+  * - ``DOUBLE``
+    - ``Double``
+  * - ``DECIMAL(p, s)``
+    - ``Decimal128``
+  * - ``TIMESTAMP(3)``
+    - ``Date``
+  * - ``VARCHAR``
+    - ``String``
+  * - ``VARBINARY``
+    - ``Binary``
+  * - ``ObjectId``
+    - ``ObjectId``
+  * - ``ROW``
+    - ``Object``
+  * - ``ARRAY``
+    - ``Array``
+```
+
+No other types are supported.
+
+(mongodb-sql-support)=
+
+## SQL support
+
+The connector provides read and write access to data and metadata in
+MongoDB. In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/delete`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/alter-table`
+- {doc}`/sql/create-schema`
+- {doc}`/sql/drop-schema`
+- {doc}`/sql/comment`
+
+### ALTER TABLE
+
+The connector supports `ALTER TABLE RENAME TO`, `ALTER TABLE ADD COLUMN`
+and `ALTER TABLE DROP COLUMN` operations.
+Other uses of `ALTER TABLE` are not supported.
+
+(mongodb-fte-support)=
+
+## Fault-tolerant execution support
+
+The connector supports {doc}`/admin/fault-tolerant-execution` of query
+processing. Read and write operations are both supported with any retry policy.
+
+## Table functions
+
+The connector provides specific {doc}`table functions </functions/table>` to
+access MongoDB.
+
+(mongodb-query-function)=
+
+### `query(database, collection, filter) -> table`
+
+The `query` function allows you to query the underlying MongoDB directly. It
+requires syntax native to MongoDB, because the full query is pushed down and
+processed by MongoDB. This can be useful for accessing native features which are
+not available in Trino or for improving query performance in situations where
+running a query natively may be faster.
+
+For example, get all rows where `regionkey` field is 0:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    example.system.query(
+      database => 'tpch',
+      collection => 'region',
+      filter => '{ regionkey: 0 }'
+    )
+  );
+```
diff --git a/docs/src/main/sphinx/connector/mongodb.rst b/docs/src/main/sphinx/connector/mongodb.rst
deleted file mode 100644
index c7772c60b976..000000000000
--- a/docs/src/main/sphinx/connector/mongodb.rst
+++ /dev/null
@@ -1,519 +0,0 @@
-=================
-MongoDB connector
-=================
-
-.. raw:: html
-
-  <img src="../_static/img/mongodb.png" class="connector-logo">
-
-The ``mongodb`` connector allows the use of `MongoDB <https://www.mongodb.com/>`_ collections as tables in Trino.
-
-
-Requirements
-------------
-
-To connect to MongoDB, you need:
-
-* MongoDB 4.2 or higher.
-* Network access from the Trino coordinator and workers to MongoDB.
-  Port 27017 is the default port.
-* Write access to the :ref:`schema information collection <table-definition-label>`
-  in MongoDB.
-
-Configuration
--------------
-
-To configure the MongoDB connector, create a catalog properties file
-``etc/catalog/example.properties`` with the following contents,
-replacing the properties as appropriate:
-
-.. code-block:: text
-
-    connector.name=mongodb
-    mongodb.connection-url=mongodb://user:pass@sample.host:27017/
-
-Multiple MongoDB clusters
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can have as many catalogs as you need, so if you have additional
-MongoDB clusters, simply add another properties file to ``etc/catalog``
-with a different name, making sure it ends in ``.properties``). For
-example, if you name the property file ``sales.properties``, Trino
-will create a catalog named ``sales`` using the configured connector.
-
-Configuration properties
-------------------------
-
-The following configuration properties are available:
-
-========================================== ==============================================================
-Property name                              Description
-========================================== ==============================================================
-``mongodb.connection-url``                 The connection url that the driver uses to connect to a MongoDB deployment
-``mongodb.schema-collection``              A collection which contains schema information
-``mongodb.case-insensitive-name-matching`` Match database and collection names case insensitively
-``mongodb.min-connections-per-host``       The minimum size of the connection pool per host
-``mongodb.connections-per-host``           The maximum size of the connection pool per host
-``mongodb.max-wait-time``                  The maximum wait time
-``mongodb.max-connection-idle-time``       The maximum idle time of a pooled connection
-``mongodb.connection-timeout``             The socket connect timeout
-``mongodb.socket-timeout``                 The socket timeout
-``mongodb.tls.enabled``                    Use TLS/SSL for connections to mongod/mongos
-``mongodb.tls.keystore-path``              Path to the PEM or JKS key store
-``mongodb.tls.truststore-path``            Path to the PEM or JKS trust store
-``mongodb.tls.keystore-password``          Password for the key store
-``mongodb.tls.truststore-password``        Password for the trust store
-``mongodb.read-preference``                The read preference
-``mongodb.write-concern``                  The write concern
-``mongodb.required-replica-set``           The required replica set name
-``mongodb.cursor-batch-size``              The number of elements to return in a batch
-========================================== ==============================================================
-
-``mongodb.connection-url``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-A connection string containing the protocol, credential, and host info for use
-inconnection to your MongoDB deployment.
-
-For example, the connection string may use the format
-``mongodb://<user>:<pass>@<host>:<port>/?<options>`` or
-``mongodb+srv://<user>:<pass>@<host>/?<options>``, depending on the protocol
-used. The user/pass credentials must be for a user with write access to the
-:ref:`schema information collection <table-definition-label>`.
-
-See the `MongoDB Connection URI <https://docs.mongodb.com/drivers/java/sync/current/fundamentals/connection/#connection-uri>`_ for more information.
-
-This property is required; there is no default. A connection URL must be
-provided to connect to a MongoDB deployment.
-
-``mongodb.schema-collection``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-As MongoDB is a document database, there is no fixed schema information in the system. So a special collection in each MongoDB database should define the schema of all tables. Please refer the :ref:`table-definition-label` section for the details.
-
-At startup, the connector tries to guess the data type of fields based on the :ref:`type mapping <mongodb-type-mapping>`.
-
-The initial guess can be incorrect for your specific collection. In that case, you need to modify it manually. Please refer the :ref:`table-definition-label` section for the details.
-
-Creating new tables using ``CREATE TABLE`` and ``CREATE TABLE AS SELECT`` automatically create an entry for you.
-
-This property is optional; the default is ``_schema``.
-
-``mongodb.case-insensitive-name-matching``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Match database and collection names case insensitively.
-
-This property is optional; the default is ``false``.
-
-``mongodb.min-connections-per-host``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The minimum number of connections per host for this MongoClient instance. Those connections are kept in a pool when idle, and the pool ensures over time that it contains at least this minimum number.
-
-This property is optional; the default is ``0``.
-
-``mongodb.connections-per-host``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The maximum number of connections allowed per host for this MongoClient instance. Those connections are kept in a pool when idle. Once the pool is exhausted, any operation requiring a connection blocks waiting for an available connection.
-
-This property is optional; the default is ``100``.
-
-``mongodb.max-wait-time``
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The maximum wait time in milliseconds, that a thread may wait for a connection to become available.
-A value of ``0`` means that it does not wait. A negative value means to wait indefinitely for a connection to become available.
-
-This property is optional; the default is ``120000``.
-
-``mongodb.max-connection-idle-time``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The maximum idle time of a pooled connection in milliseconds. A value of ``0`` indicates no limit to the idle time.
-A pooled connection that has exceeded its idle time will be closed and replaced when necessary by a new connection.
-
-This property is optional; the default is ``0``.
-
-``mongodb.connection-timeout``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connection timeout in milliseconds. A value of ``0`` means no timeout. It is used solely when establishing a new connection.
-
-This property is optional; the default is ``10000``.
-
-``mongodb.socket-timeout``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The socket timeout in milliseconds. It is used for I/O socket read and write operations.
-
-This property is optional; the default is ``0`` and means no timeout.
-
-``mongodb.tls.enabled``
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-This flag enables TLS connections to MongoDB servers.
-
-This property is optional; the default is ``false``.
-
-``mongodb.tls.keystore-path``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The path to the PEM or JKS key store. This file must be readable by the operating system user running Trino.
-
-This property is optional.
-
-``mongodb.tls.truststore-path``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The path to PEM or JKS trust store. This file must be readable by the operating system user running Trino.
-
-This property is optional.
-
-``mongodb.tls.keystore-password``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The key password for the key store specified by ``mongodb.tls.keystore-path``.
-
-This property is optional.
-
-``mongodb.tls.truststore-password``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The key password for the trust store specified by ``mongodb.tls.truststore-path``.
-
-This property is optional.
-
-``mongodb.read-preference``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The read preference to use for queries, map-reduce, aggregation, and count.
-The available values are ``PRIMARY``, ``PRIMARY_PREFERRED``, ``SECONDARY``, ``SECONDARY_PREFERRED`` and ``NEAREST``.
-
-This property is optional; the default is ``PRIMARY``.
-
-``mongodb.write-concern``
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The write concern to use. The available values are
-``ACKNOWLEDGED``, ``JOURNALED``, ``MAJORITY`` and ``UNACKNOWLEDGED``.
-
-This property is optional; the default is ``ACKNOWLEDGED``.
-
-``mongodb.required-replica-set``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The required replica set name. With this option set, the MongoClient instance performs the following actions::
-
-#. Connect in replica set mode, and discover all members of the set based on the given servers
-#. Make sure that the set name reported by all members matches the required set name.
-#. Refuse to service any requests, if authenticated user is not part of a replica set with the required name.
-
-This property is optional; no default value.
-
-``mongodb.cursor-batch-size``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Limits the number of elements returned in one batch. A cursor typically fetches a batch of result objects and stores them locally.
-If batchSize is 0, Driver's default are used.
-If batchSize is positive, it represents the size of each batch of objects retrieved. It can be adjusted to optimize performance and limit data transfer.
-If batchSize is negative, it limits the number of objects returned, that fit within the max batch size limit (usually 4MB), and the cursor is closed. For example if batchSize is -10, then the server returns a maximum of 10 documents, and as many as can fit in 4MB, then closes the cursor.
-
-.. note:: Do not use a batch size of ``1``.
-
-This property is optional; the default is ``0``.
-
-.. _table-definition-label:
-
-Table definition
-----------------
-
-MongoDB maintains table definitions on the special collection where ``mongodb.schema-collection`` configuration value specifies.
-
-.. note::
-
-    There's no way for the plugin to detect a collection is deleted.
-    You need to delete the entry by ``db.getCollection("_schema").remove( { table: deleted_table_name })`` in the Mongo Shell.
-    Or drop a collection by running ``DROP TABLE table_name`` using Trino.
-
-A schema collection consists of a MongoDB document for a table.
-
-.. code-block:: text
-
-    {
-        "table": ...,
-        "fields": [
-              { "name" : ...,
-                "type" : "varchar|bigint|boolean|double|date|array(bigint)|...",
-                "hidden" : false },
-                ...
-            ]
-        }
-    }
-
-The connector quotes the fields for a row type when auto-generating the schema.
-However, if the schema is being fixed manually in the collection then
-the fields need to be explicitly quoted. ``row("UpperCase" varchar)``
-
-=============== ========= ============== =============================
-Field           Required  Type           Description
-=============== ========= ============== =============================
-``table``       required  string         Trino table name
-``fields``      required  array          A list of field definitions. Each field definition creates a new column in the Trino table.
-=============== ========= ============== =============================
-
-Each field definition:
-
-.. code-block:: text
-
-    {
-        "name": ...,
-        "type": ...,
-        "hidden": ...
-    }
-
-=============== ========= ========= =============================
-Field           Required  Type      Description
-=============== ========= ========= =============================
-``name``        required  string    Name of the column in the Trino table.
-``type``        required  string    Trino type of the column.
-``hidden``      optional  boolean   Hides the column from ``DESCRIBE <table name>`` and ``SELECT *``. Defaults to ``false``.
-=============== ========= ========= =============================
-
-There is no limit on field descriptions for either key or message.
-
-ObjectId
---------
-
-MongoDB collection has the special field ``_id``. The connector tries to follow the same rules for this special field, so there will be hidden field ``_id``.
-
-.. code-block:: sql
-
-    CREATE TABLE IF NOT EXISTS orders (
-        orderkey bigint,
-        orderstatus varchar,
-        totalprice double,
-        orderdate date
-    );
-
-    INSERT INTO orders VALUES(1, 'bad', 50.0, current_date);
-    INSERT INTO orders VALUES(2, 'good', 100.0, current_date);
-    SELECT _id, * FROM orders;
-
-.. code-block:: text
-
-                     _id                 | orderkey | orderstatus | totalprice | orderdate
-    -------------------------------------+----------+-------------+------------+------------
-     55 b1 51 63 38 64 d6 43 8c 61 a9 ce |        1 | bad         |       50.0 | 2015-07-23
-     55 b1 51 67 38 64 d6 43 8c 61 a9 cf |        2 | good        |      100.0 | 2015-07-23
-    (2 rows)
-
-.. code-block:: sql
-
-    SELECT _id, * FROM orders WHERE _id = ObjectId('55b151633864d6438c61a9ce');
-
-.. code-block:: text
-
-                     _id                 | orderkey | orderstatus | totalprice | orderdate
-    -------------------------------------+----------+-------------+------------+------------
-     55 b1 51 63 38 64 d6 43 8c 61 a9 ce |        1 | bad         |       50.0 | 2015-07-23
-    (1 row)
-
-You can render the ``_id`` field to readable values with a cast to ``VARCHAR``:
-
-.. code-block:: sql
-
-    SELECT CAST(_id AS VARCHAR), * FROM orders WHERE _id = ObjectId('55b151633864d6438c61a9ce');
-
-.. code-block:: text
-
-               _id             | orderkey | orderstatus | totalprice | orderdate
-    ---------------------------+----------+-------------+------------+------------
-     55b151633864d6438c61a9ce  |        1 | bad         |       50.0 | 2015-07-23
-    (1 row)
-
-ObjectId timestamp functions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The first four bytes of each `ObjectId <https://docs.mongodb.com/manual/reference/method/ObjectId>`_ represent
-an embedded timestamp of its creation time. Trino provides a couple of functions to take advantage of this MongoDB feature.
-
-.. function:: objectid_timestamp(ObjectId) -> timestamp
-
-    Extracts the timestamp with time zone from a given ObjectId::
-
-        SELECT objectid_timestamp(ObjectId('507f191e810c19729de860ea'));
-        -- 2012-10-17 20:46:22.000 UTC
-
-.. function:: timestamp_objectid(timestamp) -> ObjectId
-
-    Creates an ObjectId from a timestamp with time zone::
-
-        SELECT timestamp_objectid(TIMESTAMP '2021-08-07 17:51:36 +00:00');
-        -- 61 0e c8 28 00 00 00 00 00 00 00 00
-
-In MongoDB, you can filter all the documents created after ``2021-08-07 17:51:36``
-with a query like this:
-
-.. code-block:: text
-
-    db.collection.find({"_id": {"$gt": ObjectId("610ec8280000000000000000")}})
-
-In Trino, the same can be achieved with this query:
-
-.. code-block:: sql
-
-    SELECT *
-    FROM collection
-    WHERE _id > timestamp_objectid(TIMESTAMP '2021-08-07 17:51:36 +00:00');
-
-.. _mongodb-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and MongoDB each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-MongoDB to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps MongoDB types to the corresponding Trino types following
-this table:
-
-.. list-table:: MongoDB to Trino type mapping
-  :widths: 30, 20, 50
-  :header-rows: 1
-
-  * - MongoDB type
-    - Trino type
-    - Notes
-  * - ``Boolean``
-    - ``BOOLEAN``
-    -
-  * - ``Int32``
-    - ``BIGINT``
-    -
-  * - ``Int64``
-    - ``BIGINT``
-    -
-  * - ``Double``
-    - ``DOUBLE``
-    -
-  * - ``Date``
-    - ``TIMESTAMP(3)``
-    -
-  * - ``String``
-    - ``VARCHAR``
-    -
-  * - ``Binary``
-    - ``VARBINARY``
-    -
-  * - ``ObjectId``
-    - ``ObjectId``
-    -
-  * - ``Object``
-    - ``ROW``
-    -
-  * - ``Array``
-    - ``ARRAY``
-    -   Map to ``ROW`` if the element type is not unique.
-  * - ``DBRef``
-    - ``ROW``
-    -
-
-No other types are supported.
-
-Trino to MongoDB type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding MongoDB types following
-this table:
-
-.. list-table:: Trino to MongoDB type mapping
-  :widths: 30, 20
-  :header-rows: 1
-
-  * - Trino type
-    - MongoDB type
-  * - ``BOOLEAN``
-    - ``Boolean``
-  * - ``BIGINT``
-    - ``Int64``
-  * - ``DOUBLE``
-    - ``Double``
-  * - ``TIMESTAMP(3)``
-    - ``Date``
-  * - ``VARCHAR``
-    - ``String``
-  * - ``VARBINARY``
-    - ``Binary``
-  * - ``ObjectId``
-    - ``ObjectId``
-  * - ``ROW``
-    - ``Object``
-  * - ``ARRAY``
-    - ``Array``
-
-No other types are supported.
-
-.. _mongodb-sql-support:
-
-SQL support
------------
-
-The connector provides read and write access to data and metadata in
-MongoDB. In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/delete`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/alter-table`
-* :doc:`/sql/create-schema`
-* :doc:`/sql/drop-schema`
-* :doc:`/sql/comment`
-
-ALTER TABLE
-^^^^^^^^^^^
-
-The connector supports ``ALTER TABLE RENAME TO``, ``ALTER TABLE ADD COLUMN``
-and ``ALTER TABLE DROP COLUMN`` operations.
-Other uses of ``ALTER TABLE`` are not supported.
-
-Table functions
----------------
-
-The connector provides specific :doc:`table functions </functions/table>` to
-access MongoDB.
-
-.. _mongodb-query-function:
-
-``query(database, collection, filter) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``query`` function allows you to query the underlying MongoDB directly. It
-requires syntax native to MongoDB, because the full query is pushed down and
-processed by MongoDB. This can be useful for accessing native features which are
-not available in Trino or for improving query performance in situations where
-running a query natively may be faster.
-
-For example, get all rows where ``regionkey`` field is 0::
-
-    SELECT
-      *
-    FROM
-      TABLE(
-        example.system.query(
-          database => 'tpch',
-          collection => 'region',
-          filter => '{ regionkey: 0 }'
-        )
-      );
diff --git a/docs/src/main/sphinx/connector/mysql.md b/docs/src/main/sphinx/connector/mysql.md
new file mode 100644
index 000000000000..a2e9fd42d2bc
--- /dev/null
+++ b/docs/src/main/sphinx/connector/mysql.md
@@ -0,0 +1,487 @@
+---
+myst:
+  substitutions:
+    default_domain_compaction_threshold: '`32`'
+---
+
+# MySQL connector
+
+```{raw} html
+<img src="../_static/img/mysql.png" class="connector-logo">
+```
+
+The MySQL connector allows querying and creating tables in an external
+[MySQL](https://www.mysql.com/) instance. This can be used to join data between different
+systems like MySQL and Hive, or between two different MySQL instances.
+
+## Requirements
+
+To connect to MySQL, you need:
+
+- MySQL 5.7, 8.0 or higher.
+- Network access from the Trino coordinator and workers to MySQL.
+  Port 3306 is the default port.
+
+## Configuration
+
+To configure the MySQL connector, create a catalog properties file in
+`etc/catalog` named, for example, `example.properties`, to mount the MySQL
+connector as the `mysql` catalog. Create the file with the following contents,
+replacing the connection properties as appropriate for your setup:
+
+```text
+connector.name=mysql
+connection-url=jdbc:mysql://example.net:3306
+connection-user=root
+connection-password=secret
+```
+
+The `connection-url` defines the connection information and parameters to pass
+to the MySQL JDBC driver. The supported parameters for the URL are
+available in the [MySQL Developer Guide](https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-reference-configuration-properties.html).
+
+For example, the following `connection-url` allows you to require encrypted
+connections to the MySQL server:
+
+```text
+connection-url=jdbc:mysql://example.net:3306?sslMode=REQUIRED
+```
+
+The `connection-user` and `connection-password` are typically required and
+determine the user credentials for the connection, often a service user. You can
+use {doc}`secrets </security/secrets>` to avoid actual values in the catalog
+properties files.
+
+(mysql-tls)=
+
+### Connection security
+
+If you have TLS configured with a globally-trusted certificate installed on your
+data source, you can enable TLS between your cluster and the data
+source by appending a parameter to the JDBC connection string set in the
+`connection-url` catalog configuration property.
+
+For example, with version 8.0 of MySQL Connector/J, use the `sslMode`
+parameter to secure the connection with TLS. By default the parameter is set to
+`PREFERRED` which secures the connection if enabled by the server. You can
+also set this parameter to `REQUIRED` which causes the connection to fail if
+TLS is not established.
+
+You can set the `sslMode` parameter in the catalog configuration file by
+appending it to the `connection-url` configuration property:
+
+```properties
+connection-url=jdbc:mysql://example.net:3306/?sslMode=REQUIRED
+```
+
+For more information on TLS configuration options, see the [MySQL JDBC security
+documentation](https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-connp-props-security.html#cj-conn-prop_sslMode).
+
+```{include} jdbc-authentication.fragment
+```
+
+### Multiple MySQL servers
+
+You can have as many catalogs as you need, so if you have additional
+MySQL servers, simply add another properties file to `etc/catalog`
+with a different name, making sure it ends in `.properties`. For
+example, if you name the property file `sales.properties`, Trino
+creates a catalog named `sales` using the configured connector.
+
+```{include} jdbc-common-configurations.fragment
+```
+
+```{include} query-comment-format.fragment
+```
+
+```{include} jdbc-domain-compaction-threshold.fragment
+```
+
+```{include} jdbc-procedures.fragment
+```
+
+```{include} jdbc-case-insensitive-matching.fragment
+```
+
+```{include} non-transactional-insert.fragment
+```
+
+(mysql-type-mapping)=
+
+## Type mapping
+
+Because Trino and MySQL each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+### MySQL to Trino type mapping
+
+The connector maps MySQL types to the corresponding Trino types following
+this table:
+
+```{eval-rst}
+.. list-table:: MySQL to Trino type mapping
+  :widths: 30, 20, 50
+  :header-rows: 1
+
+  * - MySQL database type
+    - Trino type
+    - Notes
+  * - ``BIT``
+    - ``BOOLEAN``
+    -
+  * - ``BOOLEAN``
+    - ``TINYINT``
+    -
+  * - ``TINYINT``
+    - ``TINYINT``
+    -
+  * - ``TINYINT UNSIGNED``
+    - ``SMALLINT``
+    -
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``SMALLINT UNSIGNED``
+    - ``INTEGER``
+    -
+  * - ``INTEGER``
+    - ``INTEGER``
+    -
+  * - ``INTEGER UNSIGNED``
+    - ``BIGINT``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``BIGINT UNSIGNED``
+    - ``DECIMAL(20, 0)``
+    -
+  * - ``DOUBLE PRECISION``
+    - ``DOUBLE``
+    -
+  * - ``FLOAT``
+    - ``REAL``
+    -
+  * - ``REAL``
+    - ``REAL``
+    -
+  * - ``DECIMAL(p, s)``
+    - ``DECIMAL(p, s)``
+    - See :ref:`MySQL DECIMAL type handling <mysql-decimal-handling>`
+  * - ``CHAR(n)``
+    - ``CHAR(n)``
+    -
+  * - ``VARCHAR(n)``
+    - ``VARCHAR(n)``
+    -
+  * - ``TINYTEXT``
+    - ``VARCHAR(255)``
+    -
+  * - ``TEXT``
+    - ``VARCHAR(65535)``
+    -
+  * - ``MEDIUMTEXT``
+    - ``VARCHAR(16777215)``
+    -
+  * - ``LONGTEXT``
+    - ``VARCHAR``
+    -
+  * - ``ENUM(n)``
+    - ``VARCHAR(n)``
+    -
+  * - ``BINARY``, ``VARBINARY``, ``TINYBLOB``, ``BLOB``, ``MEDIUMBLOB``, ``LONGBLOB``
+    - ``VARBINARY``
+    -
+  * - ``JSON``
+    - ``JSON``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME(n)``
+    - ``TIME(n)``
+    -
+  * - ``DATETIME(n)``
+    - ``TIMESTAMP(n)``
+    -
+  * - ``TIMESTAMP(n)``
+    - ``TIMESTAMP(n) WITH TIME ZONE``
+    -
+```
+
+No other types are supported.
+
+### Trino to MySQL type mapping
+
+The connector maps Trino types to the corresponding MySQL types following
+this table:
+
+```{eval-rst}
+.. list-table:: Trino to MySQL type mapping
+  :widths: 30, 20, 50
+  :header-rows: 1
+
+  * - Trino type
+    - MySQL type
+    - Notes
+  * - ``BOOLEAN``
+    - ``TINYINT``
+    -
+  * - ``TINYINT``
+    - ``TINYINT``
+    -
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``INTEGER``
+    - ``INTEGER``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``REAL``
+    - ``REAL``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE PRECISION``
+    -
+  * - ``DECIMAL(p, s)``
+    - ``DECIMAL(p, s)``
+    - :ref:`MySQL DECIMAL type handling <mysql-decimal-handling>`
+  * - ``CHAR(n)``
+    - ``CHAR(n)``
+    -
+  * - ``VARCHAR(n)``
+    - ``VARCHAR(n)``
+    -
+  * - ``JSON``
+    - ``JSON``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME(n)``
+    - ``TIME(n)``
+    -
+  * - ``TIMESTAMP(n)``
+    - ``DATETIME(n)``
+    -
+  * - ``TIMESTAMP(n) WITH TIME ZONE``
+    - ``TIMESTAMP(n)``
+    -
+```
+
+No other types are supported.
+
+### Timestamp type handling
+
+MySQL `TIMESTAMP` types are mapped to Trino `TIMESTAMP WITH TIME ZONE`.
+To preserve time instants, Trino sets the session time zone
+of the MySQL connection to match the JVM time zone.
+As a result, error messages similar to the following example occur when
+a timezone from the JVM does not exist on the MySQL server:
+
+```
+com.mysql.cj.exceptions.CJException: Unknown or incorrect time zone: 'UTC'
+```
+
+To avoid the errors, you must use a time zone that is known on both systems,
+or [install the missing time zone on the MySQL server](https://dev.mysql.com/doc/refman/8.0/en/time-zone-support.html#time-zone-installation).
+
+(mysql-decimal-handling)=
+
+```{include} decimal-type-handling.fragment
+```
+
+```{include} jdbc-type-mapping.fragment
+```
+
+## Querying MySQL
+
+The MySQL connector provides a schema for every MySQL *database*.
+You can see the available MySQL databases by running `SHOW SCHEMAS`:
+
+```
+SHOW SCHEMAS FROM example;
+```
+
+If you have a MySQL database named `web`, you can view the tables
+in this database by running `SHOW TABLES`:
+
+```
+SHOW TABLES FROM example.web;
+```
+
+You can see a list of the columns in the `clicks` table in the `web` database
+using either of the following:
+
+```
+DESCRIBE example.web.clicks;
+SHOW COLUMNS FROM example.web.clicks;
+```
+
+Finally, you can access the `clicks` table in the `web` database:
+
+```
+SELECT * FROM example.web.clicks;
+```
+
+If you used a different name for your catalog properties file, use
+that catalog name instead of `example` in the above examples.
+
+(mysql-sql-support)=
+
+## SQL support
+
+The connector provides read access and write access to data and metadata in the
+MySQL database. In addition to the {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements, the connector supports
+the following statements:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/update`
+- {doc}`/sql/delete`
+- {doc}`/sql/truncate`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/create-schema`
+- {doc}`/sql/drop-schema`
+
+```{include} sql-update-limitation.fragment
+```
+
+```{include} sql-delete-limitation.fragment
+```
+
+(mysql-fte-support)=
+
+## Fault-tolerant execution support
+
+The connector supports {doc}`/admin/fault-tolerant-execution` of query
+processing. Read and write operations are both supported with any retry policy.
+
+## Table functions
+
+The connector provides specific {doc}`table functions </functions/table>` to
+access MySQL.
+
+(mysql-query-function)=
+
+### `query(varchar) -> table`
+
+The `query` function allows you to query the underlying database directly. It
+requires syntax native to MySQL, because the full query is pushed down and
+processed in MySQL. This can be useful for accessing native features which are
+not available in Trino or for improving query performance in situations where
+running a query natively may be faster.
+
+```{include} query-passthrough-warning.fragment
+```
+
+For example, query the `example` catalog and group and concatenate all
+employee IDs by manager ID:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    example.system.query(
+      query => 'SELECT
+        manager_id, GROUP_CONCAT(employee_id)
+      FROM
+        company.employees
+      GROUP BY
+        manager_id'
+    )
+  );
+```
+
+```{include} query-table-function-ordering.fragment
+```
+
+## Performance
+
+The connector includes a number of performance improvements, detailed in the
+following sections.
+
+(mysql-table-statistics)=
+
+### Table statistics
+
+The MySQL connector can use {doc}`table and column statistics
+</optimizer/statistics>` for {doc}`cost based optimizations
+</optimizer/cost-based-optimizations>`, to improve query processing performance
+based on the actual data in the data source.
+
+The statistics are collected by MySQL and retrieved by the connector.
+
+The table-level statistics are based on MySQL's `INFORMATION_SCHEMA.TABLES`
+table. The column-level statistics are based on MySQL's index statistics
+`INFORMATION_SCHEMA.STATISTICS` table. The connector can return column-level
+statistics only when the column is the first column in some index.
+
+MySQL database can automatically update its table and index statistics. In some
+cases, you may want to force statistics update, for example after creating new
+index, or after changing data in the table. You can do that by executing the
+following statement in MySQL Database.
+
+```text
+ANALYZE TABLE table_name;
+```
+
+:::{note}
+MySQL and Trino may use statistics information in different ways. For this
+reason, the accuracy of table and column statistics returned by the MySQL
+connector might be lower than than that of others connectors.
+:::
+
+**Improving statistics accuracy**
+
+You can improve statistics accuracy with histogram statistics (available since
+MySQL 8.0). To create histogram statistics execute the following statement in
+MySQL Database.
+
+```text
+ANALYZE TABLE table_name UPDATE HISTOGRAM ON column_name1, column_name2, ...;
+```
+
+Refer to MySQL documentation for information about options, limitations
+and additional considerations.
+
+(mysql-pushdown)=
+
+### Pushdown
+
+The connector supports pushdown for a number of operations:
+
+- {ref}`join-pushdown`
+- {ref}`limit-pushdown`
+- {ref}`topn-pushdown`
+
+{ref}`Aggregate pushdown <aggregation-pushdown>` for the following functions:
+
+- {func}`avg`
+- {func}`count`
+- {func}`max`
+- {func}`min`
+- {func}`sum`
+- {func}`stddev`
+- {func}`stddev_pop`
+- {func}`stddev_samp`
+- {func}`variance`
+- {func}`var_pop`
+- {func}`var_samp`
+
+```{include} pushdown-correctness-behavior.fragment
+```
+
+```{include} join-pushdown-enabled-true.fragment
+```
+
+```{include} no-pushdown-text-type.fragment
+```
diff --git a/docs/src/main/sphinx/connector/mysql.rst b/docs/src/main/sphinx/connector/mysql.rst
deleted file mode 100644
index f2867500d527..000000000000
--- a/docs/src/main/sphinx/connector/mysql.rst
+++ /dev/null
@@ -1,425 +0,0 @@
-===============
-MySQL connector
-===============
-
-.. raw:: html
-
-  <img src="../_static/img/mysql.png" class="connector-logo">
-
-The MySQL connector allows querying and creating tables in an external
-`MySQL <https://www.mysql.com/>`_ instance. This can be used to join data between different
-systems like MySQL and Hive, or between two different MySQL instances.
-
-Requirements
-------------
-
-To connect to MySQL, you need:
-
-* MySQL 5.7, 8.0 or higher.
-* Network access from the Trino coordinator and workers to MySQL.
-  Port 3306 is the default port.
-
-Configuration
--------------
-
-To configure the MySQL connector, create a catalog properties file in
-``etc/catalog`` named, for example, ``example.properties``, to mount the MySQL
-connector as the ``mysql`` catalog. Create the file with the following contents,
-replacing the connection properties as appropriate for your setup:
-
-.. code-block:: text
-
-    connector.name=mysql
-    connection-url=jdbc:mysql://example.net:3306
-    connection-user=root
-    connection-password=secret
-
-The ``connection-url`` defines the connection information and parameters to pass
-to the MySQL JDBC driver. The supported parameters for the URL are
-available in the `MySQL Developer Guide
-<https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-reference-configuration-properties.html>`_.
-
-For example, the following ``connection-url`` allows you to require encrypted
-connections to the MySQL server:
-
-.. code-block:: text
-
-    connection-url=jdbc:mysql://example.net:3306?sslMode=REQUIRED
-
-The ``connection-user`` and ``connection-password`` are typically required and
-determine the user credentials for the connection, often a service user. You can
-use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
-properties files.
-
-.. _mysql-tls:
-
-Connection security
-^^^^^^^^^^^^^^^^^^^
-
-If you have TLS configured with a globally-trusted certificate installed on your
-data source, you can enable TLS between your cluster and the data
-source by appending a parameter to the JDBC connection string set in the
-``connection-url`` catalog configuration property.
-
-For example, with version 8.0 of MySQL Connector/J, use the ``sslMode``
-parameter to secure the connection with TLS. By default the parameter is set to
-``PREFERRED`` which secures the connection if enabled by the server. You can
-also set this parameter to ``REQUIRED`` which causes the connection to fail if
-TLS is not established.
-
-You can set the ``sslMode`` paremeter in the catalog configuration file by
-appending it to the ``connection-url`` configuration property:
-
-.. code-block:: properties
-
-  connection-url=jdbc:mysql://example.net:3306/?sslMode=REQUIRED
-
-For more information on TLS configuration options, see the `MySQL JDBC security
-documentation <https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-connp-props-security.html#cj-conn-prop_sslMode>`_.
-
-.. include:: jdbc-authentication.fragment
-
-Multiple MySQL servers
-^^^^^^^^^^^^^^^^^^^^^^
-
-You can have as many catalogs as you need, so if you have additional
-MySQL servers, simply add another properties file to ``etc/catalog``
-with a different name, making sure it ends in ``.properties``. For
-example, if you name the property file ``sales.properties``, Trino
-creates a catalog named ``sales`` using the configured connector.
-
-.. include:: jdbc-common-configurations.fragment
-
-.. |default_domain_compaction_threshold| replace:: ``32``
-.. include:: jdbc-domain-compaction-threshold.fragment
-
-.. include:: jdbc-procedures.fragment
-
-.. include:: jdbc-case-insensitive-matching.fragment
-
-.. include:: non-transactional-insert.fragment
-
-.. _mysql-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and MySQL each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-MySQL to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps MySQL types to the corresponding Trino types following
-this table:
-
-.. list-table:: MySQL to Trino type mapping
-  :widths: 30, 20, 50
-  :header-rows: 1
-
-  * - MySQL database type
-    - Trino type
-    - Notes
-  * - ``BIT``
-    - ``BOOLEAN``
-    -
-  * - ``BOOLEAN``
-    - ``TINYINT``
-    -
-  * - ``TINYINT``
-    - ``TINYINT``
-    -
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``INTEGER``
-    - ``INTEGER``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``DOUBLE PRECISION``
-    - ``DOUBLE``
-    -
-  * - ``FLOAT``
-    - ``REAL``
-    -
-  * - ``REAL``
-    - ``REAL``
-    -
-  * - ``DECIMAL(p, s)``
-    - ``DECIMAL(p, s)``
-    - See :ref:`MySQL DECIMAL type handling <mysql-decimal-handling>`
-  * - ``CHAR(n)``
-    - ``CHAR(n)``
-    -
-  * - ``VARCHAR(n)``
-    - ``VARCHAR(n)``
-    -
-  * - ``TINYTEXT``
-    - ``VARCHAR(255)``
-    -
-  * - ``TEXT``
-    - ``VARCHAR(65535)``
-    -
-  * - ``MEDIUMTEXT``
-    - ``VARCHAR(16777215)``
-    -
-  * - ``LONGTEXT``
-    - ``VARCHAR``
-    -
-  * - ``ENUM(n)``
-    - ``VARCHAR(n)``
-    -
-  * - ``BINARY``, ``VARBINARY``, ``TINYBLOB``, ``BLOB``, ``MEDIUMBLOB``, ``LONGBLOB``
-    - ``VARBINARY``
-    -
-  * - ``JSON``
-    - ``JSON``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME(n)``
-    - ``TIME(n)``
-    -
-  * - ``DATETIME(n)``
-    - ``DATETIME(n)``
-    -
-  * - ``TIMESTAMP(n)``
-    - ``TIMESTAMP(n)``
-    -
-
-No other types are supported.
-
-Trino to MySQL type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding MySQL types following
-this table:
-
-.. list-table:: Trino to MySQL type mapping
-  :widths: 30, 20, 50
-  :header-rows: 1
-
-  * - Trino type
-    - MySQL type
-    - Notes
-  * - ``BOOLEAN``
-    - ``TINYINT``
-    -
-  * - ``TINYINT``
-    - ``TINYINT``
-    -
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``INTEGER``
-    - ``INTEGER``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``REAL``
-    - ``REAL``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE PRECISION``
-    -
-  * - ``DECIMAL(p, s)``
-    - ``DECIMAL(p, s)``
-    - :ref:`MySQL DECIMAL type handling <mysql-decimal-handling>`
-  * - ``CHAR(n)``
-    - ``CHAR(n)``
-    -
-  * - ``VARCHAR(n)``
-    - ``VARCHAR(n)``
-    -
-  * - ``JSON``
-    - ``JSON``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME(n)``
-    - ``TIME(n)``
-    -
-  * - ``TIMESTAMP(n)``
-    - ``TIMESTAMP(n)``
-    -
-
-No other types are supported.
-
-.. _mysql-decimal-handling:
-
-.. include:: decimal-type-handling.fragment
-
-.. include:: jdbc-type-mapping.fragment
-
-Querying MySQL
---------------
-
-The MySQL connector provides a schema for every MySQL *database*.
-You can see the available MySQL databases by running ``SHOW SCHEMAS``::
-
-    SHOW SCHEMAS FROM example;
-
-If you have a MySQL database named ``web``, you can view the tables
-in this database by running ``SHOW TABLES``::
-
-    SHOW TABLES FROM example.web;
-
-You can see a list of the columns in the ``clicks`` table in the ``web`` database
-using either of the following::
-
-    DESCRIBE example.web.clicks;
-    SHOW COLUMNS FROM example.web.clicks;
-
-Finally, you can access the ``clicks`` table in the ``web`` database::
-
-    SELECT * FROM example.web.clicks;
-
-If you used a different name for your catalog properties file, use
-that catalog name instead of ``example`` in the above examples.
-
-.. _mysql-sql-support:
-
-SQL support
------------
-
-The connector provides read access and write access to data and metadata in the
-MySQL database. In addition to the :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements, the connector supports
-the following statements:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/delete`
-* :doc:`/sql/truncate`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/create-schema`
-* :doc:`/sql/drop-schema`
-
-.. include:: sql-delete-limitation.fragment
-
-Table functions
----------------
-
-The connector provides specific :doc:`table functions </functions/table>` to
-access MySQL.
-
-.. _mysql-query-function:
-
-``query(varchar) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``query`` function allows you to query the underlying database directly. It
-requires syntax native to MySQL, because the full query is pushed down and
-processed in MySQL. This can be useful for accessing native features which are
-not available in Trino or for improving query performance in situations where
-running a query natively may be faster.
-
-.. include:: polymorphic-table-function-ordering.fragment
-
-For example, query the ``example`` catalog and group and concatenate all
-employee IDs by manager ID::
-
-    SELECT
-      *
-    FROM
-      TABLE(
-        example.system.query(
-          query => 'SELECT
-            manager_id, GROUP_CONCAT(employee_id)
-          FROM
-            company.employees
-          GROUP BY
-            manager_id'
-        )
-      );
-
-Performance
------------
-
-The connector includes a number of performance improvements, detailed in the
-following sections.
-
-.. _mysql-table-statistics:
-
-Table statistics
-^^^^^^^^^^^^^^^^
-
-The MySQL connector can use :doc:`table and column statistics
-</optimizer/statistics>` for :doc:`cost based optimizations
-</optimizer/cost-based-optimizations>`, to improve query processing performance
-based on the actual data in the data source.
-
-The statistics are collected by MySQL and retrieved by the connector.
-
-The table-level statistics are based on MySQL's ``INFORMATION_SCHEMA.TABLES``
-table. The column-level statistics are based on MySQL's index statistics
-``INFORMATION_SCHEMA.STATISTICS`` table. The connector can return column-level
-statistics only when the column is the first column in some index.
-
-MySQL database can automatically update its table and index statistics. In some
-cases, you may want to force statistics update, for example after creating new
-index, or after changing data in the table. You can do that by executing the
-following statement in MySQL Database.
-
-.. code-block:: text
-
-    ANALYZE TABLE table_name;
-
-.. note::
-
-    MySQL and Trino may use statistics information in different ways. For this
-    reason, the accuracy of table and column statistics returned by the MySQL
-    connector might be lower than than that of others connectors.
-
-**Improving statistics accuracy**
-
-You can improve statistics accuracy with histogram statistics (available since
-MySQL 8.0). To create histogram statistics execute the following statement in
-MySQL Database.
-
-.. code-block:: text
-
-    ANALYZE TABLE table_name UPDATE HISTOGRAM ON column_name1, column_name2, ...;
-
-Refer to MySQL documentation for information about options, limitations
-and additional considerations.
-
-.. _mysql-pushdown:
-
-Pushdown
-^^^^^^^^
-
-The connector supports pushdown for a number of operations:
-
-* :ref:`join-pushdown`
-* :ref:`limit-pushdown`
-* :ref:`topn-pushdown`
-
-:ref:`Aggregate pushdown <aggregation-pushdown>` for the following functions:
-
-* :func:`avg`
-* :func:`count`
-* :func:`max`
-* :func:`min`
-* :func:`sum`
-* :func:`stddev`
-* :func:`stddev_pop`
-* :func:`stddev_samp`
-* :func:`variance`
-* :func:`var_pop`
-* :func:`var_samp`
-
-.. include:: pushdown-correctness-behavior.fragment
-
-.. include:: join-pushdown-enabled-true.fragment
-
-.. include:: no-pushdown-text-type.fragment
diff --git a/docs/src/main/sphinx/connector/no-inequality-pushdown-text-type.fragment b/docs/src/main/sphinx/connector/no-inequality-pushdown-text-type.fragment
index aeee37e582fd..4fcac76773dc 100644
--- a/docs/src/main/sphinx/connector/no-inequality-pushdown-text-type.fragment
+++ b/docs/src/main/sphinx/connector/no-inequality-pushdown-text-type.fragment
@@ -1,22 +1,21 @@
-Predicate pushdown support
-""""""""""""""""""""""""""
+#### Predicate pushdown support
 
 The connector does not support pushdown of inequality predicates, such as
-``!=``, and range predicates such as ``>``, or ``BETWEEN``, on columns with
-:ref:`character string types <string-data-types>` like ``CHAR`` or ``VARCHAR``.
-Equality predicates, such as ``IN`` or ``=``, on columns with character string
+`!=`, and range predicates such as `>`, or `BETWEEN`, on columns with
+{ref}`character string types <string-data-types>` like `CHAR` or `VARCHAR`.
+Equality predicates, such as `IN` or `=`, on columns with character string
 types are pushed down. This ensures correctness of results since the remote data
 source may sort strings differently than Trino.
 
 In the following example, the predicate of the first and second query is not
-pushed down since ``name`` is a column of type ``VARCHAR`` and ``>`` and ``!=``
+pushed down since `name` is a column of type `VARCHAR` and `>` and `!=`
 are range and inequality predicates respectively. The last query is pushed
 down.
 
-.. code-block:: sql
-
-    -- Not pushed down
-    SELECT * FROM nation WHERE name > 'CANADA';
-    SELECT * FROM nation WHERE name != 'CANADA';
-    -- Pushed down
-    SELECT * FROM nation WHERE name = 'CANADA';
+```sql
+-- Not pushed down
+SELECT * FROM nation WHERE name > 'CANADA';
+SELECT * FROM nation WHERE name != 'CANADA';
+-- Pushed down
+SELECT * FROM nation WHERE name = 'CANADA';
+```
diff --git a/docs/src/main/sphinx/connector/no-pushdown-text-type.fragment b/docs/src/main/sphinx/connector/no-pushdown-text-type.fragment
index 848462645e3f..350a4a5ef831 100644
--- a/docs/src/main/sphinx/connector/no-pushdown-text-type.fragment
+++ b/docs/src/main/sphinx/connector/no-pushdown-text-type.fragment
@@ -1,15 +1,14 @@
-Predicate pushdown support
-""""""""""""""""""""""""""
+#### Predicate pushdown support
 
 The connector does not support pushdown of any predicates on columns with
-:ref:`textual types <string-data-types>` like ``CHAR`` or ``VARCHAR``.
+{ref}`textual types <string-data-types>` like `CHAR` or `VARCHAR`.
 This ensures correctness of results since the data source may compare strings
 case-insensitively.
 
 In the following example, the predicate is not pushed down for either query
-since ``name`` is a column of type ``VARCHAR``:
+since `name` is a column of type `VARCHAR`:
 
-.. code-block:: sql
-
-    SELECT * FROM nation WHERE name > 'CANADA';
-    SELECT * FROM nation WHERE name = 'CANADA';
+```sql
+SELECT * FROM nation WHERE name > 'CANADA';
+SELECT * FROM nation WHERE name = 'CANADA';
+```
diff --git a/docs/src/main/sphinx/connector/non-transactional-insert.fragment b/docs/src/main/sphinx/connector/non-transactional-insert.fragment
index a372d5424011..244d85661bb0 100644
--- a/docs/src/main/sphinx/connector/non-transactional-insert.fragment
+++ b/docs/src/main/sphinx/connector/non-transactional-insert.fragment
@@ -1,12 +1,11 @@
-Non-transactional INSERT
-^^^^^^^^^^^^^^^^^^^^^^^^
+### Non-transactional INSERT
 
-The connector supports adding rows using :doc:`INSERT statements </sql/insert>`.
+The connector supports adding rows using {doc}`INSERT statements </sql/insert>`.
 By default, data insertion is performed by writing data to a temporary table.
 You can skip this step to improve performance and write directly to the target
-table. Set the ``insert.non-transactional-insert.enabled`` catalog property
-or the corresponding ``non_transactional_insert`` catalog session property to
-``true``.
+table. Set the `insert.non-transactional-insert.enabled` catalog property
+or the corresponding `non_transactional_insert` catalog session property to
+`true`.
 
 Note that with this property enabled, data can be corrupted in rare cases where
 exceptions occur during the insert operation. With transactions disabled, no
diff --git a/docs/src/main/sphinx/connector/object-storage-file-formats.md b/docs/src/main/sphinx/connector/object-storage-file-formats.md
new file mode 100644
index 000000000000..cfa5c23712a7
--- /dev/null
+++ b/docs/src/main/sphinx/connector/object-storage-file-formats.md
@@ -0,0 +1,105 @@
+# Object storage file formats
+
+Object storage connectors support one or more file formats specified by the
+underlying data source.
+
+In the case of serializable formats, only specific
+[SerDes](https://www.wikipedia.org/wiki/SerDes) are allowed:
+
+- RCText - RCFile `ColumnarSerDe`
+- RCBinary - RCFile `LazyBinaryColumnarSerDe`
+- JSON - `org.apache.hive.hcatalog.data.JsonSerDe`
+- CSV - `org.apache.hadoop.hive.serde2.OpenCSVSerde`
+
+(hive-orc-configuration)=
+
+## ORC format configuration properties
+
+The following properties are used to configure the read and write operations
+with ORC files performed by supported object storage connectors:
+
+```{eval-rst}
+.. list-table:: ORC format configuration properties
+    :widths: 30, 50, 20
+    :header-rows: 1
+
+    * - Property Name
+      - Description
+      - Default
+    * - ``hive.orc.time-zone``
+      - Sets the default time zone for legacy ORC files that did not declare a
+        time zone.
+      - JVM default
+    * - ``hive.orc.use-column-names``
+      - Access ORC columns by name. By default, columns in ORC files are
+        accessed by their ordinal position in the Hive table definition. The
+        equivalent catalog session property is ``orc_use_column_names``.
+      - ``false``
+    * - ``hive.orc.bloom-filters.enabled``
+      - Enable bloom filters for predicate pushdown.
+      - ``false``
+    * - ``hive.orc.read-legacy-short-zone-id``
+      - Allow reads on ORC files with short zone ID in the stripe footer.
+      - ``false``
+```
+
+(hive-parquet-configuration)=
+
+## Parquet format configuration properties
+
+The following properties are used to configure the read and write operations
+with Parquet files performed by supported object storage connectors:
+
+```{eval-rst}
+.. list-table:: Parquet format configuration properties
+    :widths: 30, 50, 20
+    :header-rows: 1
+
+    * - Property Name
+      - Description
+      - Default
+    * - ``hive.parquet.time-zone``
+      - Adjusts timestamp values to a specific time zone. For Hive 3.1+, set
+        this to UTC.
+      - JVM default
+    * - ``hive.parquet.use-column-names``
+      - Access Parquet columns by name by default. Set this property to
+        ``false`` to access columns by their ordinal position in the Hive table
+        definition. The equivalent catalog session property is
+        ``parquet_use_column_names``.
+      - ``true``
+    * - ``parquet.writer.validation-percentage``
+      - Percentage of parquet files to validate after write by re-reading the whole file.
+        The equivalent catalog session property is ``parquet_optimized_writer_validation_percentage``.
+        Validation can be turned off by setting this property to ``0``.
+      - ``5``
+    * - ``parquet.writer.page-size``
+      - Maximum page size for the Parquet writer.
+      - ``1 MB``
+    * - ``parquet.writer.block-size``
+      - Maximum row group size for the Parquet writer.
+      - ``128 MB``
+    * - ``parquet.writer.batch-size``
+      - Maximum number of rows processed by the parquet writer in a batch.
+      - ``10000``
+    * - ``parquet.use-bloom-filter``
+      - Whether bloom filters are used for predicate pushdown when reading
+        Parquet files. Set this property to ``false`` to disable the usage of
+        bloom filters by default. The equivalent catalog session property is
+        ``parquet_use_bloom_filter``.
+      - ``true``
+    * - ``parquet.use-column-index``
+      - Skip reading Parquet pages by using Parquet column indices. The
+        equivalent catalog session property is ``parquet_use_column_index``.
+        Only supported by the Delta Lake and Hive connectors.
+      - ``true``
+    * - ``parquet.max-read-block-row-count``
+      - Sets the maximum number of rows read in a batch. The equivalent catalog
+        session property is named ``parquet_max_read_block_row_count`` and
+        supported by the Delta Lake, Hive, and Iceberg connectors.
+      - ``8192``
+    * - ``parquet.small-file-threshold``
+      - :ref:`Data size <prop-type-data-size>` below which a Parquet file is
+        read entirely. The equivalent catalog session property is named
+        ``parquet_small_file_threshold``.
+      - ``3MB``
diff --git a/docs/src/main/sphinx/connector/optimize.fragment b/docs/src/main/sphinx/connector/optimize.fragment
new file mode 100644
index 000000000000..476b5579892a
--- /dev/null
+++ b/docs/src/main/sphinx/connector/optimize.fragment
@@ -0,0 +1,28 @@
+##### optimize
+
+The `optimize` command is used for rewriting the content of the specified
+table so that it is merged into fewer but larger files. If the table is
+partitioned, the data compaction acts separately on each partition selected for
+optimization. This operation improves read performance.
+
+All files with a size below the optional `file_size_threshold` parameter
+(default value for the threshold is `100MB`) are merged:
+
+```sql
+ALTER TABLE test_table EXECUTE optimize
+```
+
+The following statement merges files in a table that are
+under 10 megabytes in size:
+
+```sql
+ALTER TABLE test_table EXECUTE optimize(file_size_threshold => '10MB')
+```
+
+You can use a `WHERE` clause with the columns used to partition the table
+to filter which partitions are optimized:
+
+```sql
+ALTER TABLE test_partitioned_table EXECUTE optimize
+WHERE partition_key = 1
+```
diff --git a/docs/src/main/sphinx/connector/oracle.md b/docs/src/main/sphinx/connector/oracle.md
new file mode 100644
index 000000000000..4c42bf339cc0
--- /dev/null
+++ b/docs/src/main/sphinx/connector/oracle.md
@@ -0,0 +1,608 @@
+---
+myst:
+  substitutions:
+    default_domain_compaction_threshold: '`32`'
+---
+
+# Oracle connector
+
+```{raw} html
+<img src="../_static/img/oracle.png" class="connector-logo">
+```
+
+The Oracle connector allows querying and creating tables in an external Oracle
+database. Connectors let Trino join data provided by different databases,
+like Oracle and Hive, or different Oracle database instances.
+
+## Requirements
+
+To connect to Oracle, you need:
+
+- Oracle 12 or higher.
+- Network access from the Trino coordinator and workers to Oracle.
+  Port 1521 is the default port.
+
+## Configuration
+
+To configure the Oracle connector as the `example` catalog, create a file
+named `example.properties` in `etc/catalog`. Include the following
+connection properties in the file:
+
+```text
+connector.name=oracle
+# The correct syntax of the connection-url varies by Oracle version and
+# configuration. The following example URL connects to an Oracle SID named
+# "orcl".
+connection-url=jdbc:oracle:thin:@example.net:1521:orcl
+connection-user=root
+connection-password=secret
+```
+
+The `connection-url` defines the connection information and parameters to pass
+to the JDBC driver. The Oracle connector uses the Oracle JDBC Thin driver,
+and the syntax of the URL may be different depending on your Oracle
+configuration. For example, the connection URL is different if you are
+connecting to an Oracle SID or an Oracle service name. See the [Oracle
+Database JDBC driver documentation](https://docs.oracle.com/en/database/oracle/oracle-database/21/jjdbc/data-sources-and-URLs.html#GUID-088B1600-C6C2-4F19-A020-2DAF8FE1F1C3)
+for more information.
+
+The `connection-user` and `connection-password` are typically required and
+determine the user credentials for the connection, often a service user. You can
+use {doc}`secrets </security/secrets>` to avoid actual values in the catalog
+properties files.
+
+:::{note}
+Oracle does not expose metadata comment via `REMARKS` column by default
+in JDBC driver. You can enable it using `oracle.remarks-reporting.enabled`
+config option. See [Additional Oracle Performance Extensions](https://docs.oracle.com/en/database/oracle/oracle-database/19/jjdbc/performance-extensions.html#GUID-96A38C6D-A288-4E0B-9F03-E711C146632B)
+for more details.
+:::
+
+By default, the Oracle connector uses connection pooling for performance
+improvement. The below configuration shows the typical default values. To update
+them, change the properties in the catalog configuration file:
+
+```properties
+oracle.connection-pool.max-size=30
+oracle.connection-pool.min-size=1
+oracle.connection-pool.inactive-timeout=20m
+```
+
+To disable connection pooling, update properties to include the following:
+
+```text
+oracle.connection-pool.enabled=false
+```
+
+```{include} jdbc-authentication.fragment
+```
+
+### Multiple Oracle servers
+
+If you want to connect to multiple Oracle servers, configure another instance of
+the Oracle connector as a separate catalog.
+
+To add another Oracle catalog, create a new properties file. For example, if
+you name the property file `sales.properties`, Trino creates a catalog named
+`sales`.
+
+```{include} jdbc-common-configurations.fragment
+```
+
+```{include} query-comment-format.fragment
+```
+
+```{include} jdbc-domain-compaction-threshold.fragment
+```
+
+```{include} jdbc-procedures.fragment
+```
+
+```{include} jdbc-case-insensitive-matching.fragment
+```
+
+```{include} non-transactional-insert.fragment
+```
+
+## Querying Oracle
+
+The Oracle connector provides a schema for every Oracle database.
+
+Run `SHOW SCHEMAS` to see the available Oracle databases:
+
+```
+SHOW SCHEMAS FROM example;
+```
+
+If you used a different name for your catalog properties file, use that catalog
+name instead of `example`.
+
+:::{note}
+The Oracle user must have access to the table in order to access it from Trino.
+The user configuration, in the connection properties file, determines your
+privileges in these schemas.
+:::
+
+### Examples
+
+If you have an Oracle database named `web`, run `SHOW TABLES` to see the
+tables it contains:
+
+```
+SHOW TABLES FROM example.web;
+```
+
+To see a list of the columns in the `clicks` table in the `web`
+database, run either of the following:
+
+```
+DESCRIBE example.web.clicks;
+SHOW COLUMNS FROM example.web.clicks;
+```
+
+To access the clicks table in the web database, run the following:
+
+```
+SELECT * FROM example.web.clicks;
+```
+
+(oracle-type-mapping)=
+
+## Type mapping
+
+Because Trino and Oracle each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+### Oracle to Trino type mapping
+
+Trino supports selecting Oracle database types. This table shows the Oracle to
+Trino data type mapping:
+
+```{eval-rst}
+.. list-table:: Oracle to Trino type mapping
+  :widths: 30, 25, 50
+  :header-rows: 1
+
+  * - Oracle database type
+    - Trino type
+    - Notes
+  * - ``NUMBER(p, s)``
+    - ``DECIMAL(p, s)``
+    -  See :ref:`oracle-number-mapping`
+  * - ``NUMBER(p)``
+    - ``DECIMAL(p, 0)``
+    - See :ref:`oracle-number-mapping`
+  * - ``FLOAT[(p)]``
+    - ``DOUBLE``
+    -
+  * - ``BINARY_FLOAT``
+    - ``REAL``
+    -
+  * - ``BINARY_DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``VARCHAR2(n CHAR)``
+    - ``VARCHAR(n)``
+    -
+  * - ``VARCHAR2(n BYTE)``
+    - ``VARCHAR(n)``
+    -
+  * - ``NVARCHAR2(n)``
+    - ``VARCHAR(n)``
+    -
+  * - ``CHAR(n)``
+    - ``CHAR(n)``
+    -
+  * - ``NCHAR(n)``
+    - ``CHAR(n)``
+    -
+  * - ``CLOB``
+    - ``VARCHAR``
+    -
+  * - ``NCLOB``
+    - ``VARCHAR``
+    -
+  * - ``RAW(n)``
+    - ``VARBINARY``
+    -
+  * - ``BLOB``
+    - ``VARBINARY``
+    -
+  * - ``DATE``
+    - ``TIMESTAMP(0)``
+    - See :ref:`oracle-datetime-mapping`
+  * - ``TIMESTAMP(p)``
+    - ``TIMESTAMP(p)``
+    - See :ref:`oracle-datetime-mapping`
+  * - ``TIMESTAMP(p) WITH TIME ZONE``
+    - ``TIMESTAMP WITH TIME ZONE``
+    - See :ref:`oracle-datetime-mapping`
+```
+
+No other types are supported.
+
+### Trino to Oracle type mapping
+
+Trino supports creating tables with the following types in an Oracle database.
+The table shows the mappings from Trino to Oracle data types:
+
+:::{note}
+For types not listed in the table below, Trino can't perform the `CREATE
+TABLE <table> AS SELECT` operations. When data is inserted into existing
+tables, `Oracle to Trino` type mapping is used.
+:::
+
+```{eval-rst}
+.. list-table:: Trino to Oracle Type Mapping
+  :widths: 30, 25, 50
+  :header-rows: 1
+
+  * - Trino type
+    - Oracle database type
+    - Notes
+  * - ``TINYINT``
+    - ``NUMBER(3)``
+    -
+  * - ``SMALLINT``
+    - ``NUMBER(5)``
+    -
+  * - ``INTEGER``
+    - ``NUMBER(10)``
+    -
+  * - ``BIGINT``
+    - ``NUMBER(19)``
+    -
+  * - ``DECIMAL(p, s)``
+    - ``NUMBER(p, s)``
+    -
+  * - ``REAL``
+    - ``BINARY_FLOAT``
+    -
+  * - ``DOUBLE``
+    - ``BINARY_DOUBLE``
+    -
+  * - ``VARCHAR``
+    - ``NCLOB``
+    -
+  * - ``VARCHAR(n)``
+    - ``VARCHAR2(n CHAR)`` or ``NCLOB``
+    - See :ref:`oracle-character-mapping`
+  * - ``CHAR(n)``
+    - ``CHAR(n CHAR)`` or ``NCLOB``
+    - See :ref:`oracle-character-mapping`
+  * - ``VARBINARY``
+    - ``BLOB``
+    -
+  * - ``DATE``
+    - ``DATE``
+    - See :ref:`oracle-datetime-mapping`
+  * - ``TIMESTAMP``
+    - ``TIMESTAMP(3)``
+    - See :ref:`oracle-datetime-mapping`
+  * - ``TIMESTAMP WITH TIME ZONE``
+    - ``TIMESTAMP(3) WITH TIME ZONE``
+    - See :ref:`oracle-datetime-mapping`
+```
+
+No other types are supported.
+
+(oracle-number-mapping)=
+### Mapping numeric types
+
+An Oracle `NUMBER(p, s)` maps to Trino's `DECIMAL(p, s)` except in these
+conditions:
+
+- No precision is specified for the column (example: `NUMBER` or
+  `NUMBER(*)`), unless `oracle.number.default-scale` is set.
+- Scale (`s` ) is greater than precision.
+- Precision (`p` ) is greater than 38.
+- Scale is negative and the difference between `p` and `s` is greater than
+  38, unless `oracle.number.rounding-mode` is set to a different value than
+  `UNNECESSARY`.
+
+If `s` is negative, `NUMBER(p, s)` maps to `DECIMAL(p + s, 0)`.
+
+For Oracle `NUMBER` (without precision and scale), you can change
+`oracle.number.default-scale=s` and map the column to `DECIMAL(38, s)`.
+
+(oracle-datetime-mapping)=
+### Mapping datetime types
+
+Writing a timestamp with fractional second precision (`p`) greater than 9
+rounds the fractional seconds to nine digits.
+
+Oracle `DATE` type stores hours, minutes, and seconds, so it is mapped
+to Trino `TIMESTAMP(0)`.
+
+:::{warning}
+Due to date and time differences in the libraries used by Trino and the
+Oracle JDBC driver, attempting to insert or select a datetime value earlier
+than `1582-10-15` results in an incorrect date inserted.
+:::
+
+(oracle-character-mapping)=
+### Mapping character types
+
+Trino's `VARCHAR(n)` maps to `VARCHAR2(n CHAR)` if `n` is no greater
+than 4000. A larger or unbounded `VARCHAR` maps to `NCLOB`.
+
+Trino's `CHAR(n)` maps to `CHAR(n CHAR)` if `n` is no greater than 2000.
+A larger `CHAR` maps to `NCLOB`.
+
+Using `CREATE TABLE AS` to create an `NCLOB` column from a `CHAR` value
+removes the trailing spaces from the initial values for the column. Inserting
+`CHAR` values into existing `NCLOB` columns keeps the trailing spaces. For
+example:
+
+```
+CREATE TABLE vals AS SELECT CAST('A' as CHAR(2001)) col;
+INSERT INTO vals (col) VALUES (CAST('BB' as CHAR(2001)));
+SELECT LENGTH(col) FROM vals;
+```
+
+```text
+ _col0
+-------
+  2001
+     1
+(2 rows)
+```
+
+Attempting to write a `CHAR` that doesn't fit in the column's actual size
+fails. This is also true for the equivalent `VARCHAR` types.
+
+```{include} jdbc-type-mapping.fragment
+```
+
+### Number to decimal configuration properties
+
+```{eval-rst}
+.. list-table::
+  :widths: 20, 20, 50, 10
+  :header-rows: 1
+
+  * - Configuration property name
+    - Session property name
+    - Description
+    - Default
+  * - ``oracle.number.default-scale``
+    - ``number_default_scale``
+    - Default Trino ``DECIMAL`` scale for Oracle ``NUMBER`` (without precision
+      and scale) date type. When not set then such column is treated as not
+      supported.
+    - not set
+  * - ``oracle.number.rounding-mode``
+    - ``number_rounding_mode``
+    - Rounding mode for the Oracle ``NUMBER`` data type. This is useful when
+      Oracle ``NUMBER`` data type specifies higher scale than is supported in
+      Trino. Possible values are:
+
+      - ``UNNECESSARY`` - Rounding mode to assert that the
+        requested operation has an exact result,
+        hence no rounding is necessary.
+      - ``CEILING`` - Rounding mode to round towards
+        positive infinity.
+      - ``FLOOR`` - Rounding mode to round towards negative
+        infinity.
+      - ``HALF_DOWN`` - Rounding mode to round towards
+        ``nearest neighbor`` unless both neighbors are
+        equidistant, in which case rounding down is used.
+      - ``HALF_EVEN`` - Rounding mode to round towards the
+        ``nearest neighbor`` unless both neighbors are equidistant,
+        in which case rounding towards the even neighbor is
+        performed.
+      - ``HALF_UP`` - Rounding mode to round towards
+        ``nearest neighbor`` unless both neighbors are
+        equidistant, in which case rounding up is used
+      - ``UP`` - Rounding mode to round towards zero.
+      - ``DOWN`` - Rounding mode to round towards zero.
+
+    - ``UNNECESSARY``
+```
+
+(oracle-sql-support)=
+
+## SQL support
+
+The connector provides read access and write access to data and metadata in
+Oracle. In addition to the {ref}`globally available <sql-globally-available>`
+and {ref}`read operation <sql-read-operations>` statements, the connector
+supports the following statements:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/update`
+- {doc}`/sql/delete`
+- {doc}`/sql/truncate`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/alter-table`
+- {doc}`/sql/comment`
+
+```{include} sql-update-limitation.fragment
+```
+
+```{include} sql-delete-limitation.fragment
+```
+
+```{include} alter-table-limitation.fragment
+```
+
+(oracle-fte-support)=
+
+## Fault-tolerant execution support
+
+The connector supports {doc}`/admin/fault-tolerant-execution` of query
+processing. Read and write operations are both supported with any retry policy.
+
+## Table functions
+
+The connector provides specific {doc}`table functions </functions/table>` to
+access Oracle.
+
+(oracle-query-function)=
+
+### `query(varchar) -> table`
+
+The `query` function allows you to query the underlying database directly. It
+requires syntax native to Oracle, because the full query is pushed down and
+processed in Oracle. This can be useful for accessing native features which are
+not available in Trino or for improving query performance in situations where
+running a query natively may be faster.
+
+```{include} query-passthrough-warning.fragment
+```
+
+As a simple example, query the `example` catalog and select an entire table:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    example.system.query(
+      query => 'SELECT
+        *
+      FROM
+        tpch.nation'
+    )
+  );
+```
+
+As a practical example, you can use the
+[MODEL clause from Oracle SQL](https://docs.oracle.com/cd/B19306_01/server.102/b14223/sqlmodel.htm):
+
+```
+SELECT
+  SUBSTR(country, 1, 20) country,
+  SUBSTR(product, 1, 15) product,
+  year,
+  sales
+FROM
+  TABLE(
+    example.system.query(
+      query => 'SELECT
+        *
+      FROM
+        sales_view
+      MODEL
+        RETURN UPDATED ROWS
+        MAIN
+          simple_model
+        PARTITION BY
+          country
+        MEASURES
+          sales
+        RULES
+          (sales['Bounce', 2001] = 1000,
+          sales['Bounce', 2002] = sales['Bounce', 2001] + sales['Bounce', 2000],
+          sales['Y Box', 2002] = sales['Y Box', 2001])
+      ORDER BY
+        country'
+    )
+  );
+```
+
+```{include} query-table-function-ordering.fragment
+```
+
+## Performance
+
+The connector includes a number of performance improvements, detailed in the
+following sections.
+
+### Synonyms
+
+Based on performance reasons, Trino disables support for Oracle `SYNONYM`. To
+include `SYNONYM`, add the following configuration property:
+
+```text
+oracle.synonyms.enabled=true
+```
+
+(oracle-pushdown)=
+
+### Pushdown
+
+The connector supports pushdown for a number of operations:
+
+- {ref}`join-pushdown`
+- {ref}`limit-pushdown`
+- {ref}`topn-pushdown`
+
+In addition, the connector supports {ref}`aggregation-pushdown` for the
+following functions:
+
+- {func}`avg()`
+- {func}`count()`, also `count(distinct x)`
+- {func}`max()`
+- {func}`min()`
+- {func}`sum()`
+
+Pushdown is only supported for `DOUBLE` type columns with the
+following functions:
+
+- {func}`stddev()` and {func}`stddev_samp()`
+- {func}`stddev_pop()`
+- {func}`var_pop()`
+- {func}`variance()` and {func}`var_samp()`
+
+Pushdown is only supported for `REAL` or `DOUBLE` type column
+with the following functions:
+
+- {func}`covar_samp()`
+- {func}`covar_pop()`
+
+
+```{include} pushdown-correctness-behavior.fragment
+```
+
+```{include} join-pushdown-enabled-false.fragment
+```
+
+(oracle-predicate-pushdown)=
+
+#### Predicate pushdown support
+
+The connector does not support pushdown of any predicates on columns that use
+the `CLOB`, `NCLOB`, `BLOB`, or `RAW(n)` Oracle database types, or Trino
+data types that {ref}`map <oracle-type-mapping>` to these Oracle database types.
+
+In the following example, the predicate is not pushed down for either query
+since `name` is a column of type `VARCHAR`, which maps to `NCLOB` in
+Oracle:
+
+```sql
+SHOW CREATE TABLE nation;
+
+--             Create Table
+----------------------------------------
+-- CREATE TABLE oracle.trino_test.nation (
+--    name VARCHAR
+-- )
+-- (1 row)
+
+SELECT * FROM nation WHERE name > 'CANADA';
+SELECT * FROM nation WHERE name = 'CANADA';
+```
+
+In the following example, the predicate is pushed down for both queries
+since `name` is a column of type `VARCHAR(25)`, which maps to
+`VARCHAR2(25)` in Oracle:
+
+```sql
+SHOW CREATE TABLE nation;
+
+--             Create Table
+----------------------------------------
+-- CREATE TABLE oracle.trino_test.nation (
+--    name VARCHAR(25)
+-- )
+-- (1 row)
+
+SELECT * FROM nation WHERE name > 'CANADA';
+SELECT * FROM nation WHERE name = 'CANADA';
+```
diff --git a/docs/src/main/sphinx/connector/oracle.rst b/docs/src/main/sphinx/connector/oracle.rst
deleted file mode 100644
index 971779d372cb..000000000000
--- a/docs/src/main/sphinx/connector/oracle.rst
+++ /dev/null
@@ -1,576 +0,0 @@
-================
-Oracle connector
-================
-
-.. raw:: html
-
-  <img src="../_static/img/oracle.png" class="connector-logo">
-
-The Oracle connector allows querying and creating tables in an external Oracle
-database. Connectors let Trino join data provided by different databases,
-like Oracle and Hive, or different Oracle database instances.
-
-Requirements
-------------
-
-To connect to Oracle, you need:
-
-* Oracle 12 or higher.
-* Network access from the Trino coordinator and workers to Oracle.
-  Port 1521 is the default port.
-
-Configuration
--------------
-
-To configure the Oracle connector as the ``example`` catalog, create a file
-named ``example.properties`` in ``etc/catalog``. Include the following
-connection properties in the file:
-
-.. code-block:: text
-
-    connector.name=oracle
-    # The correct syntax of the connection-url varies by Oracle version and
-    # configuration. The following example URL connects to an Oracle SID named
-    # "orcl".
-    connection-url=jdbc:oracle:thin:@example.net:1521:orcl
-    connection-user=root
-    connection-password=secret
-
-The ``connection-url`` defines the connection information and parameters to pass
-to the JDBC driver. The Oracle connector uses the Oracle JDBC Thin driver,
-and the syntax of the URL may be different depending on your Oracle
-configuration. For example, the connection URL is different if you are
-connecting to an Oracle SID or an Oracle service name. See the `Oracle
-Database JDBC driver documentation
-<https://docs.oracle.com/en/database/oracle/oracle-database/21/jjdbc/data-sources-and-URLs.html#GUID-088B1600-C6C2-4F19-A020-2DAF8FE1F1C3>`_
-for more information.
-
-The ``connection-user`` and ``connection-password`` are typically required and
-determine the user credentials for the connection, often a service user. You can
-use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
-properties files.
-
-.. note::
-    Oracle does not expose metadata comment via ``REMARKS`` column by default
-    in JDBC driver. You can enable it using ``oracle.remarks-reporting.enabled``
-    config option. See `Additional Oracle Performance Extensions
-    <https://docs.oracle.com/en/database/oracle/oracle-database/19/jjdbc/performance-extensions.html#GUID-96A38C6D-A288-4E0B-9F03-E711C146632B>`_
-    for more details.
-
-By default, the Oracle connector uses connection pooling for performance
-improvement. The below configuration shows the typical default values. To update
-them, change the properties in the catalog configuration file:
-
-.. code-block:: properties
-
-    oracle.connection-pool.max-size=30
-    oracle.connection-pool.min-size=1
-    oracle.connection-pool.inactive-timeout=20m
-
-To disable connection pooling, update properties to include the following:
-
-.. code-block:: text
-
-    oracle.connection-pool.enabled=false
-
-.. include:: jdbc-authentication.fragment
-
-Multiple Oracle servers
-^^^^^^^^^^^^^^^^^^^^^^^
-
-If you want to connect to multiple Oracle servers, configure another instance of
-the Oracle connector as a separate catalog.
-
-To add another Oracle catalog, create a new properties file. For example, if
-you name the property file ``sales.properties``, Trino creates a catalog named
-``sales``.
-
-.. include:: jdbc-common-configurations.fragment
-
-.. |default_domain_compaction_threshold| replace:: ``32``
-.. include:: jdbc-domain-compaction-threshold.fragment
-
-.. include:: jdbc-procedures.fragment
-
-.. include:: jdbc-case-insensitive-matching.fragment
-
-.. include:: non-transactional-insert.fragment
-
-Querying Oracle
----------------
-
-The Oracle connector provides a schema for every Oracle database.
-
-Run ``SHOW SCHEMAS`` to see the available Oracle databases::
-
-    SHOW SCHEMAS FROM example;
-
-If you used a different name for your catalog properties file, use that catalog
-name instead of ``example``.
-
-.. note::
-    The Oracle user must have access to the table in order to access it from Trino.
-    The user configuration, in the connection properties file, determines your
-    privileges in these schemas.
-
-Examples
-^^^^^^^^
-
-If you have an Oracle database named ``web``, run ``SHOW TABLES`` to see the
-tables it contains::
-
-    SHOW TABLES FROM example.web;
-
-To see a list of the columns in the ``clicks`` table in the ``web``
-database, run either of the following::
-
-    DESCRIBE example.web.clicks;
-    SHOW COLUMNS FROM example.web.clicks;
-
-To access the clicks table in the web database, run the following::
-
-    SELECT * FROM example.web.clicks;
-
-.. _oracle-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and Oracle each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-Oracle to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Trino supports selecting Oracle database types. This table shows the Oracle to
-Trino data type mapping:
-
-.. list-table:: Oracle to Trino type mapping
-  :widths: 30, 25, 50
-  :header-rows: 1
-
-  * - Oracle database type
-    - Trino type
-    - Notes
-  * - ``NUMBER(p, s)``
-    - ``DECIMAL(p, s)``
-    -  See :ref:`number mapping`
-  * - ``NUMBER(p)``
-    - ``DECIMAL(p, 0)``
-    - See :ref:`number mapping`
-  * - ``FLOAT[(p)]``
-    - ``DOUBLE``
-    -
-  * - ``BINARY_FLOAT``
-    - ``REAL``
-    -
-  * - ``BINARY_DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``VARCHAR2(n CHAR)``
-    - ``VARCHAR(n)``
-    -
-  * - ``VARCHAR2(n BYTE)``
-    - ``VARCHAR(n)``
-    -
-  * - ``NVARCHAR2(n)``
-    - ``VARCHAR(n)``
-    -
-  * - ``CHAR(n)``
-    - ``CHAR(n)``
-    -
-  * - ``NCHAR(n)``
-    - ``CHAR(n)``
-    -
-  * - ``CLOB``
-    - ``VARCHAR``
-    -
-  * - ``NCLOB``
-    - ``VARCHAR``
-    -
-  * - ``RAW(n)``
-    - ``VARBINARY``
-    -
-  * - ``BLOB``
-    - ``VARBINARY``
-    -
-  * - ``DATE``
-    - ``TIMESTAMP(0)``
-    - See :ref:`datetime mapping`
-  * - ``TIMESTAMP(p)``
-    - ``TIMESTAMP``
-    - See :ref:`datetime mapping`
-  * - ``TIMESTAMP(p) WITH TIME ZONE``
-    - ``TIMESTAMP WITH TIME ZONE``
-    - See :ref:`datetime mapping`
-
-No other types are supported.
-
-Trino to Oracle type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Trino supports creating tables with the following types in an Oracle database.
-The table shows the mappings from Trino to Oracle data types:
-
-.. note::
-   For types not listed in the table below, Trino can't perform the ``CREATE
-   TABLE <table> AS SELECT`` operations. When data is inserted into existing
-   tables, ``Oracle to Trino`` type mapping is used.
-
-.. list-table:: Trino to Oracle Type Mapping
-  :widths: 30, 25, 50
-  :header-rows: 1
-
-  * - Trino type
-    - Oracle database type
-    - Notes
-  * - ``TINYINT``
-    - ``NUMBER(3)``
-    -
-  * - ``SMALLINT``
-    - ``NUMBER(5)``
-    -
-  * - ``INTEGER``
-    - ``NUMBER(10)``
-    -
-  * - ``BIGINT``
-    - ``NUMBER(19)``
-    -
-  * - ``DECIMAL(p, s)``
-    - ``NUMBER(p, s)``
-    -
-  * - ``REAL``
-    - ``BINARY_FLOAT``
-    -
-  * - ``DOUBLE``
-    - ``BINARY_DOUBLE``
-    -
-  * - ``VARCHAR``
-    - ``NCLOB``
-    -
-  * - ``VARCHAR(n)``
-    - ``VARCHAR2(n CHAR)`` or ``NCLOB``
-    - See :ref:`character mapping`
-  * - ``CHAR(n)``
-    - ``CHAR(n CHAR)`` or ``NCLOB``
-    - See :ref:`character mapping`
-  * - ``VARBINARY``
-    - ``BLOB``
-    -
-  * - ``DATE``
-    - ``DATE``
-    - See :ref:`datetime mapping`
-  * - ``TIMESTAMP``
-    - ``TIMESTAMP(3)``
-    - See :ref:`datetime mapping`
-  * - ``TIMESTAMP WITH TIME ZONE``
-    - ``TIMESTAMP(3) WITH TIME ZONE``
-    - See :ref:`datetime mapping`
-
-No other types are supported.
-
-.. _number mapping:
-
-Mapping numeric types
-^^^^^^^^^^^^^^^^^^^^^
-
-An Oracle ``NUMBER(p, s)`` maps to Trino's ``DECIMAL(p, s)`` except in these
-conditions:
-
-- No precision is specified for the column (example: ``NUMBER`` or
-  ``NUMBER(*)``), unless ``oracle.number.default-scale`` is set.
-- Scale (``s`` ) is greater than precision.
-- Precision (``p`` ) is greater than 38.
-- Scale is negative and the difference between ``p`` and ``s`` is greater than
-  38, unless ``oracle.number.rounding-mode`` is set to a different value than
-  ``UNNECESSARY``.
-
-If ``s`` is negative, ``NUMBER(p, s)`` maps to ``DECIMAL(p + s, 0)``.
-
-For Oracle ``NUMBER`` (without precision and scale), you can change
-``oracle.number.default-scale=s`` and map the column to ``DECIMAL(38, s)``.
-
-.. _datetime mapping:
-
-Mapping datetime types
-^^^^^^^^^^^^^^^^^^^^^^
-
-Selecting a timestamp with fractional second precision (``p``) greater than 3
-truncates the fractional seconds to three digits instead of rounding it.
-
-Oracle ``DATE`` type stores hours, minutes, and seconds, so it is mapped
-to Trino ``TIMESTAMP(0)``.
-
-.. warning::
-
-  Due to date and time differences in the libraries used by Trino and the
-  Oracle JDBC driver, attempting to insert or select a datetime value earlier
-  than ``1582-10-15`` results in an incorrect date inserted.
-
-.. _character mapping:
-
-Mapping character types
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Trino's ``VARCHAR(n)`` maps to ``VARCHAR2(n CHAR)`` if ``n`` is no greater
-than 4000. A larger or unbounded ``VARCHAR`` maps to ``NCLOB``.
-
-Trino's ``CHAR(n)`` maps to ``CHAR(n CHAR)`` if ``n`` is no greater than 2000.
-A larger ``CHAR`` maps to ``NCLOB``.
-
-Using ``CREATE TABLE AS`` to create an ``NCLOB`` column from a ``CHAR`` value
-removes the trailing spaces from the initial values for the column. Inserting
-``CHAR`` values into existing ``NCLOB`` columns keeps the trailing spaces. For
-example::
-
-    CREATE TABLE vals AS SELECT CAST('A' as CHAR(2001)) col;
-    INSERT INTO vals (col) VALUES (CAST('BB' as CHAR(2001)));
-    SELECT LENGTH(col) FROM vals;
-
-.. code-block:: text
-
-     _col0
-    -------
-      2001
-         1
-    (2 rows)
-
-Attempting to write a ``CHAR`` that doesn't fit in the column's actual size
-fails. This is also true for the equivalent ``VARCHAR`` types.
-
-.. include:: jdbc-type-mapping.fragment
-
-Number to decimal configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. list-table::
-  :widths: 20, 20, 50, 10
-  :header-rows: 1
-
-  * - Configuration property name
-    - Session property name
-    - Description
-    - Default
-  * - ``oracle.number.default-scale``
-    - ``number_default_scale``
-    - Default Trino ``DECIMAL`` scale for Oracle ``NUMBER`` (without precision
-      and scale) date type. When not set then such column is treated as not
-      supported.
-    - not set
-  * - ``oracle.number.rounding-mode``
-    - ``number_rounding_mode``
-    - Rounding mode for the Oracle ``NUMBER`` data type. This is useful when
-      Oracle ``NUMBER`` data type specifies higher scale than is supported in
-      Trino. Possible values are:
-
-      - ``UNNECESSARY`` - Rounding mode to assert that the
-        requested operation has an exact result,
-        hence no rounding is necessary.
-      - ``CEILING`` - Rounding mode to round towards
-        positive infinity.
-      - ``FLOOR`` - Rounding mode to round towards negative
-        infinity.
-      - ``HALF_DOWN`` - Rounding mode to round towards
-        ``nearest neighbor`` unless both neighbors are
-        equidistant, in which case rounding down is used.
-      - ``HALF_EVEN`` - Rounding mode to round towards the
-        ``nearest neighbor`` unless both neighbors are equidistant,
-        in which case rounding towards the even neighbor is
-        performed.
-      - ``HALF_UP`` - Rounding mode to round towards
-        ``nearest neighbor`` unless both neighbors are
-        equidistant, in which case rounding up is used
-      - ``UP`` - Rounding mode to round towards zero.
-      - ``DOWN`` - Rounding mode to round towards zero.
-
-    - ``UNNECESSARY``
-
-.. _oracle-sql-support:
-
-SQL support
------------
-
-The connector provides read access and write access to data and metadata in
-Oracle. In addition to the :ref:`globally available <sql-globally-available>`
-and :ref:`read operation <sql-read-operations>` statements, the connector
-supports the following statements:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/delete`
-* :doc:`/sql/truncate`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/alter-table`
-* :doc:`/sql/comment`
-
-.. include:: sql-delete-limitation.fragment
-
-.. include:: alter-table-limitation.fragment
-
-Table functions
----------------
-
-The connector provides specific :doc:`table functions </functions/table>` to
-access Oracle.
-
-.. _oracle-query-function:
-
-``query(varchar) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``query`` function allows you to query the underlying database directly. It
-requires syntax native to Oracle, because the full query is pushed down and
-processed in Oracle. This can be useful for accessing native features which are
-not available in Trino or for improving query performance in situations where
-running a query natively may be faster.
-
-.. include:: polymorphic-table-function-ordering.fragment
-
-As a simple example, query the ``example`` catalog and select an entire table::
-
-    SELECT
-      *
-    FROM
-      TABLE(
-        example.system.query(
-          query => 'SELECT
-            *
-          FROM
-            tpch.nation'
-        )
-      );
-
-As a practical example, you can use the
-`MODEL clause from Oracle SQL <https://docs.oracle.com/cd/B19306_01/server.102/b14223/sqlmodel.htm>`_::
-
-    SELECT
-      SUBSTR(country, 1, 20) country,
-      SUBSTR(product, 1, 15) product,
-      year,
-      sales
-    FROM
-      TABLE(
-        example.system.query(
-          query => 'SELECT
-            *
-          FROM
-            sales_view
-          MODEL
-            RETURN UPDATED ROWS
-            MAIN
-              simple_model
-            PARTITION BY
-              country
-            MEASURES
-              sales
-            RULES
-              (sales['Bounce', 2001] = 1000,
-              sales['Bounce', 2002] = sales['Bounce', 2001] + sales['Bounce', 2000],
-              sales['Y Box', 2002] = sales['Y Box', 2001])
-          ORDER BY
-            country'
-        )
-      );
-
-Performance
------------
-
-The connector includes a number of performance improvements, detailed in the
-following sections.
-
-Synonyms
-^^^^^^^^
-
-Based on performance reasons, Trino disables support for Oracle ``SYNONYM``. To
-include ``SYNONYM``, add the following configuration property:
-
-.. code-block:: text
-
-    oracle.synonyms.enabled=true
-
-.. _oracle-pushdown:
-
-Pushdown
-^^^^^^^^
-
-The connector supports pushdown for a number of operations:
-
-* :ref:`join-pushdown`
-* :ref:`limit-pushdown`
-* :ref:`topn-pushdown`
-
-In addition, the connector supports :ref:`aggregation-pushdown` for the
-following functions:
-
-* :func:`avg()`
-* :func:`count()`, also ``count(distinct x)``
-* :func:`max()`
-* :func:`min()`
-* :func:`sum()`
-
-Pushdown is only supported for ``DOUBLE`` type columns with the
-following functions:
-
-* :func:`stddev()` and :func:`stddev_samp()`
-* :func:`stddev_pop()`
-* :func:`var_pop()`
-* :func:`variance()` and :func:`var_samp()`
-
-Pushdown is only supported for ``REAL`` or ``DOUBLE`` type column
-with the following functions:
-
-* :func:`covar_samp()`
-* :func:`covar_pop()`
-
-.. include:: pushdown-correctness-behavior.fragment
-
-.. include:: join-pushdown-enabled-false.fragment
-
-.. _oracle-predicate-pushdown:
-
-Predicate pushdown support
-""""""""""""""""""""""""""
-
-The connector does not support pushdown of any predicates on columns that use
-the ``CLOB``, ``NCLOB``, ``BLOB``, or ``RAW(n)`` Oracle database types, or Trino
-data types that :ref:`map <oracle-type-mapping>` to these Oracle database types.
-
-In the following example, the predicate is not pushed down for either query
-since ``name`` is a column of type ``VARCHAR``, which maps to ``NCLOB`` in
-Oracle:
-
-.. code-block:: sql
-
-    SHOW CREATE TABLE nation;
-
-    --             Create Table
-    ----------------------------------------
-    -- CREATE TABLE oracle.trino_test.nation (
-    --    name varchar
-    -- )
-    -- (1 row)
-
-    SELECT * FROM nation WHERE name > 'CANADA';
-    SELECT * FROM nation WHERE name = 'CANADA';
-
-In the following example, the predicate is pushed down for both queries
-since ``name`` is a column of type ``VARCHAR(25)``, which maps to
-``VARCHAR2(25)`` in Oracle:
-
-.. code-block:: sql
-
-    SHOW CREATE TABLE nation;
-
-    --             Create Table
-    ----------------------------------------
-    -- CREATE TABLE oracle.trino_test.nation (
-    --    name varchar(25)
-    -- )
-    -- (1 row)
-
-    SELECT * FROM nation WHERE name > 'CANADA';
-    SELECT * FROM nation WHERE name = 'CANADA';
diff --git a/docs/src/main/sphinx/connector/phoenix.md b/docs/src/main/sphinx/connector/phoenix.md
new file mode 100644
index 000000000000..850368af18aa
--- /dev/null
+++ b/docs/src/main/sphinx/connector/phoenix.md
@@ -0,0 +1,290 @@
+---
+myst:
+  substitutions:
+    default_domain_compaction_threshold: '`5000`'
+---
+
+# Phoenix connector
+
+```{raw} html
+<img src="../_static/img/phoenix.png" class="connector-logo">
+```
+
+The Phoenix connector allows querying data stored in
+[Apache HBase](https://hbase.apache.org/) using
+[Apache Phoenix](https://phoenix.apache.org/).
+
+## Requirements
+
+To query HBase data through Phoenix, you need:
+
+- Network access from the Trino coordinator and workers to the ZooKeeper
+  servers. The default port is 2181.
+- A compatible version of Phoenix: all 5.x versions starting from 5.1.0 are supported.
+
+## Configuration
+
+To configure the Phoenix connector, create a catalog properties file
+`etc/catalog/example.properties` with the following contents,
+replacing `host1,host2,host3` with a comma-separated list of the ZooKeeper
+nodes used for discovery of the HBase cluster:
+
+```text
+connector.name=phoenix5
+phoenix.connection-url=jdbc:phoenix:host1,host2,host3:2181:/hbase
+phoenix.config.resources=/path/to/hbase-site.xml
+```
+
+The optional paths to Hadoop resource files, such as `hbase-site.xml` are used
+to load custom Phoenix client connection properties.
+
+The following Phoenix-specific configuration properties are available:
+
+| Property name                 | Required | Description                                                                                                                                                                                                                                                                                                                                                                                      |
+| ----------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `phoenix.connection-url`      | Yes      | `jdbc:phoenix[:zk_quorum][:zk_port][:zk_hbase_path]`. The `zk_quorum` is a comma separated list of ZooKeeper servers. The `zk_port` is the ZooKeeper port. The `zk_hbase_path` is the HBase root znode path, that is configurable using `hbase-site.xml`.  By default the location is `/hbase`                                                                                                   |
+| `phoenix.config.resources`    | No       | Comma-separated list of configuration files (e.g. `hbase-site.xml`) to use for connection properties.  These files must exist on the machines running Trino.                                                                                                                                                                                                                                     |
+| `phoenix.max-scans-per-split` | No       | Maximum number of HBase scans that will be performed in a single split. Default is 20. Lower values will lead to more splits in Trino. Can also be set via session propery `max_scans_per_split`. For details see: [https://phoenix.apache.org/update_statistics.html](https://phoenix.apache.org/update_statistics.html). (This setting has no effect when guideposts are disabled in Phoenix.) |
+
+```{include} jdbc-common-configurations.fragment
+```
+
+```{include} query-comment-format.fragment
+```
+
+```{include} jdbc-domain-compaction-threshold.fragment
+```
+
+```{include} jdbc-procedures.fragment
+```
+
+```{include} jdbc-case-insensitive-matching.fragment
+```
+
+```{include} non-transactional-insert.fragment
+```
+
+## Querying Phoenix tables
+
+The default empty schema in Phoenix maps to a schema named `default` in Trino.
+You can see the available Phoenix schemas by running `SHOW SCHEMAS`:
+
+```
+SHOW SCHEMAS FROM example;
+```
+
+If you have a Phoenix schema named `web`, you can view the tables
+in this schema by running `SHOW TABLES`:
+
+```
+SHOW TABLES FROM example.web;
+```
+
+You can see a list of the columns in the `clicks` table in the `web` schema
+using either of the following:
+
+```
+DESCRIBE example.web.clicks;
+SHOW COLUMNS FROM example.web.clicks;
+```
+
+Finally, you can access the `clicks` table in the `web` schema:
+
+```
+SELECT * FROM example.web.clicks;
+```
+
+If you used a different name for your catalog properties file, use
+that catalog name instead of `example` in the above examples.
+
+(phoenix-type-mapping)=
+
+## Type mapping
+
+Because Trino and Phoenix each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+### Phoenix type to Trino type mapping
+
+The connector maps Phoenix types to the corresponding Trino types following this
+table:
+
+```{eval-rst}
+.. list-table:: Phoenix type to Trino type mapping
+  :widths: 30, 20
+  :header-rows: 1
+
+  * - Phoenix database type
+    - Trino type
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+  * - ``TINYINT``
+    - ``TINYINT``
+  * - ``UNSIGNED_TINYINT``
+    - ``TINYINT``
+  * - ``SMALLINT``
+    - ``SMALLINT``
+  * - ``UNSIGNED_SMALLINT``
+    - ``SMALLINT``
+  * - ``INTEGER``
+    - ``INTEGER``
+  * - ``UNSIGNED_INT``
+    - ``INTEGER``
+  * - ``BIGINT``
+    - ``BIGINT``
+  * - ``UNSIGNED_LONG``
+    - ``BIGINT``
+  * - ``FLOAT``
+    - ``REAL``
+  * - ``UNSIGNED_FLOAT``
+    - ``REAL``
+  * - ``DOUBLE``
+    - ``DOUBLE``
+  * - ``UNSIGNED_DOUBLE``
+    - ``DOUBLE``
+  * - ``DECIMAL(p,s)``
+    - ``DECIMAL(p,s)``
+  * - ``CHAR(n)``
+    - ``CHAR(n)``
+  * - ``VARCHAR(n)``
+    - ``VARCHAR(n)``
+  * - ``BINARY``
+    - ``VARBINARY``
+  * - ``VARBINARY``
+    - ``VARBINARY``
+  * - ``DATE``
+    - ``DATE``
+  * - ``UNSIGNED_DATE``
+    - ``DATE``
+  * - ``ARRAY``
+    - ``ARRAY``
+```
+
+No other types are supported.
+
+### Trino type to Phoenix type mapping
+
+The Phoenix fixed length `BINARY` data type is mapped to the Trino variable
+length `VARBINARY` data type. There is no way to create a Phoenix table in
+Trino that uses the `BINARY` data type, as Trino does not have an equivalent
+type.
+
+The connector maps Trino types to the corresponding Phoenix types following this
+table:
+
+```{eval-rst}
+.. list-table:: Trino type to Phoenix type mapping
+  :widths: 30, 20
+  :header-rows: 1
+
+  * - Trino database type
+    - Phoenix type
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+  * - ``TINYINT``
+    - ``TINYINT``
+  * - ``SMALLINT``
+    - ``SMALLINT``
+  * - ``INTEGER``
+    - ``INTEGER``
+  * - ``BIGINT``
+    - ``BIGINT``
+  * - ``REAL``
+    - ``FLOAT``
+  * - ``DOUBLE``
+    - ``DOUBLE``
+  * - ``DECIMAL(p,s)``
+    - ``DECIMAL(p,s)``
+  * - ``CHAR(n)``
+    - ``CHAR(n)``
+  * - ``VARCHAR(n)``
+    - ``VARCHAR(n)``
+  * - ``VARBINARY``
+    - ``VARBINARY``
+  * - ``TIME``
+    - ``TIME``
+  * - ``DATE``
+    - ``DATE``
+  * - ``ARRAY``
+    - ``ARRAY``
+```
+
+No other types are supported.
+
+```{include} decimal-type-handling.fragment
+```
+
+```{include} jdbc-type-mapping.fragment
+```
+
+## Table properties - Phoenix
+
+Table property usage example:
+
+```
+CREATE TABLE example_schema.scientists (
+  recordkey VARCHAR,
+  birthday DATE,
+  name VARCHAR,
+  age BIGINT
+)
+WITH (
+  rowkeys = 'recordkey,birthday',
+  salt_buckets = 10
+);
+```
+
+The following are supported Phoenix table properties from [https://phoenix.apache.org/language/index.html#options](https://phoenix.apache.org/language/index.html#options)
+
+| Property name           | Default value | Description                                                                                                           |
+| ----------------------- | ------------- | --------------------------------------------------------------------------------------------------------------------- |
+| `rowkeys`               | `ROWKEY`      | Comma-separated list of primary key columns.  See further description below                                           |
+| `split_on`              | (none)        | List of keys to presplit the table on. See [Split Point](https://phoenix.apache.org/language/index.html#split_point). |
+| `salt_buckets`          | (none)        | Number of salt buckets for this table.                                                                                |
+| `disable_wal`           | false         | Whether to disable WAL writes in HBase for this table.                                                                |
+| `immutable_rows`        | false         | Declares whether this table has rows which are write-once, append-only.                                               |
+| `default_column_family` | `0`           | Default column family name to use for this table.                                                                     |
+
+### `rowkeys`
+
+This is a comma-separated list of columns to be used as the table's primary key. If not specified, a `BIGINT` primary key column named `ROWKEY` is generated
+, as well as a sequence with the same name as the table suffixed with `_seq` (i.e. `<schema>.<table>_seq`)
+, which is used to automatically populate the `ROWKEY` for each row during insertion.
+
+## Table properties - HBase
+
+The following are the supported HBase table properties that are passed through by Phoenix during table creation.
+Use them in the same way as above: in the `WITH` clause of the `CREATE TABLE` statement.
+
+| Property name         | Default value | Description                                                                                                            |
+| --------------------- | ------------- | ---------------------------------------------------------------------------------------------------------------------- |
+| `versions`            | `1`           | The maximum number of versions of each cell to keep.                                                                   |
+| `min_versions`        | `0`           | The minimum number of cell versions to keep.                                                                           |
+| `compression`         | `NONE`        | Compression algorithm to use.  Valid values are `NONE` (default), `SNAPPY`, `LZO`, `LZ4`, or `GZ`.                     |
+| `data_block_encoding` | `FAST_DIFF`   | Block encoding algorithm to use. Valid values are: `NONE`, `PREFIX`, `DIFF`, `FAST_DIFF` (default), or `ROW_INDEX_V1`. |
+| `ttl`                 | `FOREVER`     | Time To Live for each cell.                                                                                            |
+| `bloomfilter`         | `NONE`        | Bloomfilter to use. Valid values are `NONE` (default), `ROW`, or `ROWCOL`.                                             |
+
+(phoenix-sql-support)=
+
+## SQL support
+
+The connector provides read and write access to data and metadata in
+Phoenix. In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/delete`
+- {doc}`/sql/merge`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/create-schema`
+- {doc}`/sql/drop-schema`
+
+```{include} sql-delete-limitation.fragment
+```
diff --git a/docs/src/main/sphinx/connector/phoenix.rst b/docs/src/main/sphinx/connector/phoenix.rst
deleted file mode 100644
index b16df3d3863f..000000000000
--- a/docs/src/main/sphinx/connector/phoenix.rst
+++ /dev/null
@@ -1,294 +0,0 @@
-=================
-Phoenix connector
-=================
-
-.. raw:: html
-
-  <img src="../_static/img/phoenix.png" class="connector-logo">
-
-The Phoenix connector allows querying data stored in
-`Apache HBase <https://hbase.apache.org/>`_ using
-`Apache Phoenix <https://phoenix.apache.org/>`_.
-
-Requirements
-------------
-
-To query HBase data through Phoenix, you need:
-
-*  Network access from the Trino coordinator and workers to the ZooKeeper
-   servers. The default port is 2181.
-*  A compatible version of Phoenix: all 5.x versions starting from 5.1.0 are supported.
-
-Configuration
--------------
-
-To configure the Phoenix connector, create a catalog properties file
-``etc/catalog/example.properties`` with the following contents,
-replacing ``host1,host2,host3`` with a comma-separated list of the ZooKeeper
-nodes used for discovery of the HBase cluster:
-
-.. code-block:: text
-
-    connector.name=phoenix5
-    phoenix.connection-url=jdbc:phoenix:host1,host2,host3:2181:/hbase
-    phoenix.config.resources=/path/to/hbase-site.xml
-
-The optional paths to Hadoop resource files, such as ``hbase-site.xml`` are used
-to load custom Phoenix client connection properties.
-
-The following Phoenix-specific configuration properties are available:
-
-================================================== ========== ===================================================================================
-Property name                                      Required   Description
-================================================== ========== ===================================================================================
-``phoenix.connection-url``                         Yes        ``jdbc:phoenix[:zk_quorum][:zk_port][:zk_hbase_path]``.
-                                                              The ``zk_quorum`` is a comma separated list of ZooKeeper servers.
-                                                              The ``zk_port`` is the ZooKeeper port. The ``zk_hbase_path`` is the HBase
-                                                              root znode path, that is configurable using ``hbase-site.xml``.  By
-                                                              default the location is ``/hbase``
-``phoenix.config.resources``                       No         Comma-separated list of configuration files (e.g. ``hbase-site.xml``) to use for
-                                                              connection properties.  These files must exist on the machines running Trino.
-``phoenix.max-scans-per-split``                    No         Maximum number of HBase scans that will be performed in a single split. Default is 20.
-                                                              Lower values will lead to more splits in Trino.
-                                                              Can also be set via session propery ``max_scans_per_split``.
-                                                              For details see: `<https://phoenix.apache.org/update_statistics.html>`_.
-                                                              (This setting has no effect when guideposts are disabled in Phoenix.)
-================================================== ========== ===================================================================================
-
-.. include:: jdbc-common-configurations.fragment
-
-.. |default_domain_compaction_threshold| replace:: ``5000``
-.. include:: jdbc-domain-compaction-threshold.fragment
-
-.. include:: jdbc-procedures.fragment
-
-.. include:: jdbc-case-insensitive-matching.fragment
-
-.. include:: non-transactional-insert.fragment
-
-Querying Phoenix tables
--------------------------
-
-The default empty schema in Phoenix maps to a schema named ``default`` in Trino.
-You can see the available Phoenix schemas by running ``SHOW SCHEMAS``::
-
-    SHOW SCHEMAS FROM example;
-
-If you have a Phoenix schema named ``web``, you can view the tables
-in this schema by running ``SHOW TABLES``::
-
-    SHOW TABLES FROM example.web;
-
-You can see a list of the columns in the ``clicks`` table in the ``web`` schema
-using either of the following::
-
-    DESCRIBE example.web.clicks;
-    SHOW COLUMNS FROM example.web.clicks;
-
-Finally, you can access the ``clicks`` table in the ``web`` schema::
-
-    SELECT * FROM example.web.clicks;
-
-If you used a different name for your catalog properties file, use
-that catalog name instead of ``example`` in the above examples.
-
-.. _phoenix-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and Phoenix each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-Phoenix type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Phoenix types to the corresponding Trino types following this
-table:
-
-.. list-table:: Phoenix type to Trino type mapping
-  :widths: 30, 20
-  :header-rows: 1
-
-  * - Phoenix database type
-    - Trino type
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-  * - ``TINYINT``
-    - ``TINYINT``
-  * - ``UNSIGNED_TINYINT``
-    - ``TINYINT``
-  * - ``SMALLINT``
-    - ``SMALLINT``
-  * - ``UNSIGNED_SMALLINT``
-    - ``SMALLINT``
-  * - ``INTEGER``
-    - ``INTEGER``
-  * - ``UNSIGNED_INT``
-    - ``INTEGER``
-  * - ``BIGINT``
-    - ``BIGINT``
-  * - ``UNSIGNED_LONG``
-    - ``BIGINT``
-  * - ``FLOAT``
-    - ``REAL``
-  * - ``UNSIGNED_FLOAT``
-    - ``REAL``
-  * - ``DOUBLE``
-    - ``DOUBLE``
-  * - ``UNSIGNED_DOUBLE``
-    - ``DOUBLE``
-  * - ``DECIMAL(p,s)``
-    - ``DECIMAL(p,s)``
-  * - ``CHAR(n)``
-    - ``CHAR(n)``
-  * - ``VARCHAR(n)``
-    - ``VARCHAR(n)``
-  * - ``BINARY``
-    - ``VARBINARY``
-  * - ``VARBINARY``
-    - ``VARBINARY``
-  * - ``DATE``
-    - ``DATE``
-  * - ``UNSIGNED_DATE``
-    - ``DATE``
-  * - ``ARRAY``
-    - ``ARRAY``
-
-No other types are supported.
-
-Trino type to Phoenix type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-The Phoenix fixed length ``BINARY`` data type is mapped to the Trino variable
-length ``VARBINARY`` data type. There is no way to create a Phoenix table in
-Trino that uses the ``BINARY`` data type, as Trino does not have an equivalent
-type.
-
-The connector maps Trino types to the corresponding Phoenix types following this
-table:
-
-.. list-table:: Trino type to Phoenix type mapping
-  :widths: 30, 20
-  :header-rows: 1
-
-  * - Trino database type
-    - Phoenix type
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-  * - ``TINYINT``
-    - ``TINYINT``
-  * - ``SMALLINT``
-    - ``SMALLINT``
-  * - ``INTEGER``
-    - ``INTEGER``
-  * - ``BIGINT``
-    - ``BIGINT``
-  * - ``REAL``
-    - ``FLOAT``
-  * - ``DOUBLE``
-    - ``DOUBLE``
-  * - ``DECIMAL(p,s)``
-    - ``DECIMAL(p,s)``
-  * - ``CHAR(n)``
-    - ``CHAR(n)``
-  * - ``VARCHAR(n)``
-    - ``VARCHAR(n)``
-  * - ``VARBINARY``
-    - ``VARBINARY``
-  * - ``TIME``
-    - ``TIME``
-  * - ``DATE``
-    - ``DATE``
-  * - ``ARRAY``
-    - ``ARRAY``
-
-No other types are supported.
-
-.. include:: decimal-type-handling.fragment
-
-.. include:: jdbc-type-mapping.fragment
-
-Table properties - Phoenix
---------------------------
-
-Table property usage example::
-
-    CREATE TABLE example_schema.scientists (
-      recordkey VARCHAR,
-      birthday DATE,
-      name VARCHAR,
-      age BIGINT
-    )
-    WITH (
-      rowkeys = 'recordkey,birthday',
-      salt_buckets = 10
-    );
-
-The following are supported Phoenix table properties from `<https://phoenix.apache.org/language/index.html#options>`_
-
-=========================== ================ ==============================================================================================================
-Property name               Default value    Description
-=========================== ================ ==============================================================================================================
-``rowkeys``                 ``ROWKEY``       Comma-separated list of primary key columns.  See further description below
-
-``split_on``                (none)           List of keys to presplit the table on.
-                                             See `Split Point <https://phoenix.apache.org/language/index.html#split_point>`_.
-
-``salt_buckets``            (none)           Number of salt buckets for this table.
-
-``disable_wal``             false            Whether to disable WAL writes in HBase for this table.
-
-``immutable_rows``          false            Declares whether this table has rows which are write-once, append-only.
-
-``default_column_family``   ``0``            Default column family name to use for this table.
-=========================== ================ ==============================================================================================================
-
-``rowkeys``
-^^^^^^^^^^^
-This is a comma-separated list of columns to be used as the table's primary key. If not specified, a ``BIGINT`` primary key column named ``ROWKEY`` is generated
-, as well as a sequence with the same name as the table suffixed with ``_seq`` (i.e. ``<schema>.<table>_seq``)
-, which is used to automatically populate the ``ROWKEY`` for each row during insertion.
-
-Table properties - HBase
-------------------------
-The following are the supported HBase table properties that are passed through by Phoenix during table creation.
-Use them in the same way as above: in the ``WITH`` clause of the ``CREATE TABLE`` statement.
-
-=========================== ================ ==============================================================================================================
-Property name               Default value    Description
-=========================== ================ ==============================================================================================================
-``versions``                ``1``            The maximum number of versions of each cell to keep.
-
-``min_versions``            ``0``            The minimum number of cell versions to keep.
-
-``compression``             ``NONE``         Compression algorithm to use.  Valid values are ``NONE`` (default), ``SNAPPY``, ``LZO``, ``LZ4``, or ``GZ``.
-
-``data_block_encoding``     ``FAST_DIFF``    Block encoding algorithm to use. Valid values are: ``NONE``, ``PREFIX``, ``DIFF``, ``FAST_DIFF`` (default), or ``ROW_INDEX_V1``.
-
-``ttl``                     ``FOREVER``      Time To Live for each cell.
-
-``bloomfilter``             ``NONE``         Bloomfilter to use. Valid values are ``NONE`` (default), ``ROW``, or ``ROWCOL``.
-=========================== ================ ==============================================================================================================
-
-.. _phoenix-sql-support:
-
-SQL support
------------
-
-The connector provides read and write access to data and metadata in
-Phoenix. In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/delete`
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/create-schema`
-* :doc:`/sql/drop-schema`
-
-.. include:: sql-delete-limitation.fragment
diff --git a/docs/src/main/sphinx/connector/pinot.md b/docs/src/main/sphinx/connector/pinot.md
new file mode 100644
index 000000000000..e6013f161bcb
--- /dev/null
+++ b/docs/src/main/sphinx/connector/pinot.md
@@ -0,0 +1,228 @@
+# Pinot connector
+
+```{raw} html
+<img src="../_static/img/pinot.png" class="connector-logo">
+```
+
+The Pinot connector allows Trino to query data stored in
+[Apache Pinot™](https://pinot.apache.org/).
+
+## Requirements
+
+To connect to Pinot, you need:
+
+- Pinot 0.11.0 or higher.
+- Network access from the Trino coordinator and workers to the Pinot controller
+  nodes. Port 8098 is the default port.
+
+## Configuration
+
+To configure the Pinot connector, create a catalog properties file
+e.g. `etc/catalog/example.properties` with at least the following contents:
+
+```text
+connector.name=pinot
+pinot.controller-urls=host1:8098,host2:8098
+```
+
+Replace `host1:8098,host2:8098` with a comma-separated list of Pinot controller nodes.
+This can be the ip or the FDQN, the url scheme (`http://`) is optional.
+
+## Configuration properties
+
+### General configuration properties
+
+| Property name                                          | Required | Description                                                                                                                                                                                                                                                               |
+| ------------------------------------------------------ | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `pinot.controller-urls`                                | Yes      | A comma separated list of controller hosts. If Pinot is deployed via [Kubernetes](https://kubernetes.io/) this needs to point to the controller service endpoint. The Pinot broker and server must be accessible via DNS as Pinot returns hostnames and not IP addresses. |
+| `pinot.connection-timeout`                             | No       | Pinot connection timeout, default is `15s`.                                                                                                                                                                                                                               |
+| `pinot.metadata-expiry`                                | No       | Pinot metadata expiration time, default is `2m`.                                                                                                                                                                                                                          |
+| `pinot.controller.authentication.type`                 | No       | Pinot authentication method for controller requests. Allowed values are `NONE` and `PASSWORD` - defaults to `NONE` which is no authentication.                                                                                                                            |
+| `pinot.controller.authentication.user`                 | No       | Controller username for basic authentication method.                                                                                                                                                                                                                      |
+| `pinot.controller.authentication.password`             | No       | Controller password for basic authentication method.                                                                                                                                                                                                                      |
+| `pinot.broker.authentication.type`                     | No       | Pinot authentication method for broker requests. Allowed values are `NONE` and `PASSWORD` - defaults to `NONE` which is no authentication.                                                                                                                                |
+| `pinot.broker.authentication.user`                     | No       | Broker username for basic authentication method.                                                                                                                                                                                                                          |
+| `pinot.broker.authentication.password`                 | No       | Broker password for basic authentication method.                                                                                                                                                                                                                          |
+| `pinot.max-rows-per-split-for-segment-queries`         | No       | Fail query if Pinot server split returns more rows than configured, default to `50,000` for non-gRPC connection, `2,147,483,647` for gRPC connection.                                                                                                                     |
+| `pinot.estimated-size-in-bytes-for-non-numeric-column` | No       | Estimated byte size for non-numeric column for page pre-allocation in non-gRPC connection, default is `20`.                                                                                                                                                               |
+| `pinot.prefer-broker-queries`                          | No       | Pinot query plan prefers to query Pinot broker, default is `true`.                                                                                                                                                                                                        |
+| `pinot.forbid-segment-queries`                         | No       | Forbid parallel querying and force all querying to happen via the broker, default is `false`.                                                                                                                                                                             |
+| `pinot.segments-per-split`                             | No       | The number of segments processed in a split. Setting this higher reduces the number of requests made to Pinot. This is useful for smaller Pinot clusters, default is `1`.                                                                                                 |
+| `pinot.fetch-retry-count`                              | No       | Retry count for retriable Pinot data fetch calls, default is `2`.                                                                                                                                                                                                         |
+| `pinot.non-aggregate-limit-for-broker-queries`         | No       | Max limit for non aggregate queries to the Pinot broker, default is `25,000`.                                                                                                                                                                                             |
+| `pinot.max-rows-for-broker-queries`                    | No       | Max rows for a broker query can return, default is `50,000`.                                                                                                                                                                                                              |
+| `pinot.aggregation-pushdown.enabled`                   | No       | Push down aggregation queries, default is `true`.                                                                                                                                                                                                                         |
+| `pinot.count-distinct-pushdown.enabled`                | No       | Push down count distinct queries to Pinot, default is `true`.                                                                                                                                                                                                             |
+| `pinot.target-segment-page-size`                       | No       | Max allowed page size for segment query, default is `1MB`.                                                                                                                                                                                                                |
+| `pinot.proxy.enabled`                                  | No       | Use Pinot Proxy for controller and broker requests, default is `false`.                                                                                                                                                                                                   |
+
+If `pinot.controller.authentication.type` is set to `PASSWORD` then both `pinot.controller.authentication.user` and
+`pinot.controller.authentication.password` are required.
+
+If `pinot.broker.authentication.type` is set to `PASSWORD` then both `pinot.broker.authentication.user` and
+`pinot.broker.authentication.password` are required.
+
+If `pinot.controller-urls` uses `https` scheme then TLS is enabled for all connections including brokers.
+
+### gRPC configuration properties
+
+| Property name                         | Required | Description                                                          |
+| ------------------------------------- | -------- | -------------------------------------------------------------------- |
+| `pinot.grpc.enabled`                  | No       | Use gRPC endpoint for Pinot server queries, default is `true`.       |
+| `pinot.grpc.port`                     | No       | Pinot gRPC port, default to `8090`.                                  |
+| `pinot.grpc.max-inbound-message-size` | No       | Max inbound message bytes when init gRPC client, default is `128MB`. |
+| `pinot.grpc.use-plain-text`           | No       | Use plain text for gRPC communication, default to `true`.            |
+| `pinot.grpc.tls.keystore-type`        | No       | TLS keystore type for gRPC connection, default is `JKS`.             |
+| `pinot.grpc.tls.keystore-path`        | No       | TLS keystore file location for gRPC connection, default is empty.    |
+| `pinot.grpc.tls.keystore-password`    | No       | TLS keystore password, default is empty.                             |
+| `pinot.grpc.tls.truststore-type`      | No       | TLS truststore type for gRPC connection, default is `JKS`.           |
+| `pinot.grpc.tls.truststore-path`      | No       | TLS truststore file location for gRPC connection, default is empty.  |
+| `pinot.grpc.tls.truststore-password`  | No       | TLS truststore password, default is empty.                           |
+| `pinot.grpc.tls.ssl-provider`         | No       | SSL provider, default is `JDK`.                                      |
+| `pinot.grpc.proxy-uri`                | No       | Pinot Rest Proxy gRPC endpoint URI, default is null.                 |
+
+For more Apache Pinot TLS configurations, please also refer to [Configuring TLS/SSL](https://docs.pinot.apache.org/operators/tutorials/configuring-tls-ssl).
+
+You can use {doc}`secrets </security/secrets>` to avoid actual values in the catalog properties files.
+
+## Querying Pinot tables
+
+The Pinot connector automatically exposes all tables in the default schema of the catalog.
+You can list all tables in the pinot catalog with the following query:
+
+```
+SHOW TABLES FROM example.default;
+```
+
+You can list columns in the flight_status table:
+
+```
+DESCRIBE example.default.flight_status;
+SHOW COLUMNS FROM example.default.flight_status;
+```
+
+Queries written with SQL are fully supported and can include filters and limits:
+
+```
+SELECT foo
+FROM pinot_table
+WHERE bar = 3 AND baz IN ('ONE', 'TWO', 'THREE')
+LIMIT 25000;
+```
+
+## Dynamic tables
+
+To leverage Pinot's fast aggregation, a Pinot query written in PQL can be used as the table name.
+Filters and limits in the outer query are pushed down to Pinot.
+Let's look at an example query:
+
+```
+SELECT *
+FROM example.default."SELECT MAX(col1), COUNT(col2) FROM pinot_table GROUP BY col3, col4"
+WHERE col3 IN ('FOO', 'BAR') AND col4 > 50
+LIMIT 30000
+```
+
+Filtering and limit processing is pushed down to Pinot.
+
+The queries are routed to the broker and are more suitable to aggregate queries.
+
+For `SELECT` queries without aggregates it is more performant to issue a regular SQL query.
+Processing is routed directly to the servers that store the data.
+
+The above query is translated to the following Pinot PQL query:
+
+```
+SELECT MAX(col1), COUNT(col2)
+FROM pinot_table
+WHERE col3 IN('FOO', 'BAR') and col4 > 50
+TOP 30000
+```
+
+(pinot-type-mapping)=
+
+## Type mapping
+
+Because Trino and Pinot each support types that the other does not, this
+connector {ref}`maps some types <type-mapping-overview>` when reading data.
+
+### Pinot type to Trino type mapping
+
+The connector maps Pinot types to the corresponding Trino types
+according to the following table:
+
+```{eval-rst}
+.. list-table:: Pinot type to Trino type mapping
+  :widths: 75,60
+  :header-rows: 1
+
+  * - Pinot type
+    - Trino type
+  * - ``INT``
+    - ``INTEGER``
+  * - ``LONG``
+    - ``BIGINT``
+  * - ``FLOAT``
+    - ``REAL``
+  * - ``DOUBLE``
+    - ``DOUBLE``
+  * - ``STRING``
+    - ``VARCHAR``
+  * - ``BYTES``
+    - ``VARBINARY``
+  * - ``JSON``
+    - ``JSON``
+  * - ``TIMESTAMP``
+    - ``TIMESTAMP``
+  * - ``INT_ARRAY``
+    - ``VARCHAR``
+  * - ``LONG_ARRAY``
+    - ``VARCHAR``
+  * - ``FLOAT_ARRAY``
+    - ``VARCHAR``
+  * - ``DOUBLE_ARRAY``
+    - ``VARCHAR``
+  * - ``STRING_ARRAY``
+    - ``VARCHAR``
+```
+
+Pinot does not allow null values in any data type.
+
+No other types are supported.
+
+(pinot-sql-support)=
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements to access data and
+metadata in Pinot.
+
+(pinot-pushdown)=
+
+## Pushdown
+
+The connector supports pushdown for a number of operations:
+
+- {ref}`limit-pushdown`
+
+{ref}`Aggregate pushdown <aggregation-pushdown>` for the following functions:
+
+- {func}`avg`
+- {func}`approx_distinct`
+- `count(*)` and `count(distinct)` variations of {func}`count`
+- {func}`max`
+- {func}`min`
+- {func}`sum`
+
+Aggregate function pushdown is enabled by default, but can be disabled with the
+catalog property `pinot.aggregation-pushdown.enabled` or the catalog session
+property `aggregation_pushdown_enabled`.
+
+A `count(distint)` pushdown may cause Pinot to run a full table scan with
+significant performance impact. If you encounter this problem, you can disable
+it with the catalog property `pinot.count-distinct-pushdown.enabled` or the
+catalog session property `count_distinct_pushdown_enabled`.
+
+```{include} pushdown-correctness-behavior.fragment
+```
diff --git a/docs/src/main/sphinx/connector/pinot.rst b/docs/src/main/sphinx/connector/pinot.rst
deleted file mode 100644
index b70c735200cc..000000000000
--- a/docs/src/main/sphinx/connector/pinot.rst
+++ /dev/null
@@ -1,245 +0,0 @@
-===============
-Pinot connector
-===============
-
-.. raw:: html
-
-  <img src="../_static/img/pinot.png" class="connector-logo">
-
-The Pinot connector allows Trino to query data stored in
-`Apache Pinot™ <https://pinot.apache.org/>`_.
-
-Requirements
-------------
-
-To connect to Pinot, you need:
-
-* Pinot 0.11.0 or higher.
-* Network access from the Trino coordinator and workers to the Pinot controller
-  nodes. Port 8098 is the default port.
-
-Configuration
--------------
-
-To configure the Pinot connector, create a catalog properties file
-e.g. ``etc/catalog/example.properties`` with at least the following contents:
-
-.. code-block:: text
-
-    connector.name=pinot
-    pinot.controller-urls=host1:8098,host2:8098
-
-Replace ``host1:8098,host2:8098`` with a comma-separated list of Pinot controller nodes.
-This can be the ip or the FDQN, the url scheme (``http://``) is optional.
-
-Configuration properties
-------------------------
-
-General configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-========================================================= ========== ==============================================================================
-Property name                                             Required   Description
-========================================================= ========== ==============================================================================
-``pinot.controller-urls``                                 Yes        A comma separated list of controller hosts. If Pinot is deployed via
-                                                                     `Kubernetes <https://kubernetes.io/>`_ this needs to point to the controller
-                                                                     service endpoint. The Pinot broker and server must be accessible via DNS as
-                                                                     Pinot returns hostnames and not IP addresses.
-``pinot.connection-timeout``                              No         Pinot connection timeout, default is ``15s``.
-``pinot.metadata-expiry``                                 No         Pinot metadata expiration time, default is ``2m``.
-``pinot.request-timeout``                                 No         The timeout for Pinot requests. Increasing this can reduce timeouts if DNS
-                                                                     resolution is slow.
-``pinot.controller.authentication.type``                  No         Pinot authentication method for controller requests. Allowed values are
-                                                                     ``NONE`` and ``PASSWORD`` - defaults to ``NONE`` which is no authentication.
-``pinot.controller.authentication.user``                  No         Controller username for basic authentication method.
-``pinot.controller.authentication.password``              No         Controller password for basic authentication method.
-``pinot.broker.authentication.type``                      No         Pinot authentication method for broker requests. Allowed values are
-                                                                     ``NONE`` and ``PASSWORD`` - defaults to ``NONE`` which is no
-                                                                     authentication.
-``pinot.broker.authentication.user``                      No         Broker username for basic authentication method.
-``pinot.broker.authentication.password``                  No         Broker password for basic authentication method.
-``pinot.max-rows-per-split-for-segment-queries``          No         Fail query if Pinot server split returns more rows than configured, default to
-                                                                     ``50,000`` for non-gRPC connection, ``2,147,483,647`` for gRPC connection.
-``pinot.estimated-size-in-bytes-for-non-numeric-column``  No         Estimated byte size for non-numeric column for page pre-allocation in non-gRPC
-                                                                     connection, default is ``20``.
-``pinot.prefer-broker-queries``                           No         Pinot query plan prefers to query Pinot broker, default is ``true``.
-``pinot.forbid-segment-queries``                          No         Forbid parallel querying and force all querying to happen via the broker,
-                                                                     default is ``false``.
-``pinot.segments-per-split``                              No         The number of segments processed in a split. Setting this higher reduces the
-                                                                     number of requests made to Pinot. This is useful for smaller Pinot clusters,
-                                                                     default is ``1``.
-``pinot.fetch-retry-count``                               No         Retry count for retriable Pinot data fetch calls, default is ``2``.
-``pinot.non-aggregate-limit-for-broker-queries``          No         Max limit for non aggregate queries to the Pinot broker, default is ``25,000``.
-``pinot.max-rows-for-broker-queries``                     No         Max rows for a broker query can return, default is ``50,000``.
-``pinot.aggregation-pushdown.enabled``                    No         Push down aggregation queries, default is ``true``.
-``pinot.count-distinct-pushdown.enabled``                 No         Push down count distinct queries to Pinot, default is ``true``.
-``pinot.target-segment-page-size``                        No         Max allowed page size for segment query, default is ``1MB``.
-``pinot.proxy.enabled``                                   No         Use Pinot Proxy for controller and broker requests, default is ``false``.
-========================================================= ========== ==============================================================================
-
-If ``pinot.controller.authentication.type`` is set to ``PASSWORD`` then both ``pinot.controller.authentication.user`` and
-``pinot.controller.authentication.password`` are required.
-
-If ``pinot.broker.authentication.type`` is set to ``PASSWORD`` then both ``pinot.broker.authentication.user`` and
-``pinot.broker.authentication.password`` are required.
-
-If ``pinot.controller-urls`` uses ``https`` scheme then TLS is enabled for all connections including brokers.
-
-gRPC configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-========================================================= ========== ==============================================================================
-Property name                                             Required   Description
-========================================================= ========== ==============================================================================
-``pinot.grpc.enabled``                                    No         Use gRPC endpoint for Pinot server queries, default is ``true``.
-``pinot.grpc.port``                                       No         Pinot gRPC port, default to ``8090``.
-``pinot.grpc.max-inbound-message-size``                   No         Max inbound message bytes when init gRPC client, default is ``128MB``.
-``pinot.grpc.use-plain-text``                             No         Use plain text for gRPC communication, default to ``true``.
-``pinot.grpc.tls.keystore-type``                          No         TLS keystore type for gRPC connection, default is ``JKS``.
-``pinot.grpc.tls.keystore-path``                          No         TLS keystore file location for gRPC connection, default is empty.
-``pinot.grpc.tls.keystore-password``                      No         TLS keystore password, default is empty.
-``pinot.grpc.tls.truststore-type``                        No         TLS truststore type for gRPC connection, default is ``JKS``.
-``pinot.grpc.tls.truststore-path``                        No         TLS truststore file location for gRPC connection, default is empty.
-``pinot.grpc.tls.truststore-password``                    No         TLS truststore password, default is empty.
-``pinot.grpc.tls.ssl-provider``                           No         SSL provider, default is ``JDK``.
-``pinot.grpc.proxy-uri``                                  No         Pinot Rest Proxy gRPC endpoint URI, default is null.
-========================================================= ========== ==============================================================================
-
-For more Apache Pinot TLS configurations, please also refer to `Configuring TLS/SSL <https://docs.pinot.apache.org/operators/tutorials/configuring-tls-ssl>`_.
-
-You can use :doc:`secrets </security/secrets>` to avoid actual values in the catalog properties files.
-
-Querying Pinot tables
----------------------
-
-The Pinot connector automatically exposes all tables in the default schema of the catalog.
-You can list all tables in the pinot catalog with the following query::
-
-    SHOW TABLES FROM example.default;
-
-You can list columns in the flight_status table::
-
-    DESCRIBE example.default.flight_status;
-    SHOW COLUMNS FROM example.default.flight_status;
-
-Queries written with SQL are fully supported and can include filters and limits::
-
-    SELECT foo
-    FROM pinot_table
-    WHERE bar = 3 AND baz IN ('ONE', 'TWO', 'THREE')
-    LIMIT 25000;
-
-Dynamic tables
---------------
-
-To leverage Pinot's fast aggregation, a Pinot query written in PQL can be used as the table name.
-Filters and limits in the outer query are pushed down to Pinot.
-Let's look at an example query::
-
-    SELECT *
-    FROM example.default."SELECT MAX(col1), COUNT(col2) FROM pinot_table GROUP BY col3, col4"
-    WHERE col3 IN ('FOO', 'BAR') AND col4 > 50
-    LIMIT 30000
-
-Filtering and limit processing is pushed down to Pinot.
-
-The queries are routed to the broker and are more suitable to aggregate queries.
-
-For ``SELECT`` queries without aggregates it is more performant to issue a regular SQL query.
-Processing is routed directly to the servers that store the data.
-
-The above query is translated to the following Pinot PQL query::
-
-    SELECT MAX(col1), COUNT(col2)
-    FROM pinot_table
-    WHERE col3 IN('FOO', 'BAR') and col4 > 50
-    TOP 30000
-
-.. _pinot-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and Pinot each support types that the other does not, this
-connector :ref:`maps some types <type-mapping-overview>` when reading data.
-
-Pinot type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Pinot types to the corresponding Trino types
-according to the following table:
-
-.. list-table:: Pinot type to Trino type mapping
-  :widths: 75,60
-  :header-rows: 1
-
-  * - Pinot type
-    - Trino type
-  * - ``INT``
-    - ``INTEGER``
-  * - ``LONG``
-    - ``BIGINT``
-  * - ``FLOAT``
-    - ``REAL``
-  * - ``DOUBLE``
-    - ``DOUBLE``
-  * - ``STRING``
-    - ``VARCHAR``
-  * - ``BYTES``
-    - ``VARBINARY``
-  * - ``JSON``
-    - ``JSON``
-  * - ``TIMESTAMP``
-    - ``TIMESTAMP``
-  * - ``INT_ARRAY``
-    - ``VARCHAR``
-  * - ``LONG_ARRAY``
-    - ``VARCHAR``
-  * - ``FLOAT_ARRAY``
-    - ``VARCHAR``
-  * - ``DOUBLE_ARRAY``
-    - ``VARCHAR``
-  * - ``STRING_ARRAY``
-    - ``VARCHAR``
-
-Pinot does not allow null values in any data type.
-
-No other types are supported.
-
-.. _pinot-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access data and
-metadata in Pinot.
-
-.. _pinot-pushdown:
-
-Pushdown
---------
-
-The connector supports pushdown for a number of operations:
-
-* :ref:`limit-pushdown`
-
-:ref:`Aggregate pushdown <aggregation-pushdown>` for the following functions:
-
-* :func:`avg`
-* :func:`approx_distinct`
-* ``count(*)`` and ``count(distinct)`` variations of :func:`count`
-* :func:`max`
-* :func:`min`
-* :func:`sum`
-
-Aggregate function pushdown is enabled by default, but can be disabled with the
-catalog property ``pinot.aggregation-pushdown.enabled`` or the catalog session
-property ``aggregation_pushdown_enabled``.
-
-A ``count(distint)`` pushdown may cause Pinot to run a full table scan with
-significant performance impact. If you encounter this problem, you can disable
-it with the catalog property ``pinot.count-distinct-pushdown.enabled`` or the
-catalog session property ``count_distinct_pushdown_enabled``.
-
-.. include:: pushdown-correctness-behavior.fragment
diff --git a/docs/src/main/sphinx/connector/polymorphic-table-function-ordering.fragment b/docs/src/main/sphinx/connector/polymorphic-table-function-ordering.fragment
deleted file mode 100644
index b9c69e4c007b..000000000000
--- a/docs/src/main/sphinx/connector/polymorphic-table-function-ordering.fragment
+++ /dev/null
@@ -1,5 +0,0 @@
-.. note::
-
-    Polymorphic table functions may not preserve the order of the query result.
-    If the table function contains a query with an ``ORDER BY`` clause, the
-    function result may not be ordered as expected.
\ No newline at end of file
diff --git a/docs/src/main/sphinx/connector/postgresql.md b/docs/src/main/sphinx/connector/postgresql.md
new file mode 100644
index 000000000000..9ca7f46fed81
--- /dev/null
+++ b/docs/src/main/sphinx/connector/postgresql.md
@@ -0,0 +1,535 @@
+---
+myst:
+  substitutions:
+    default_domain_compaction_threshold: '`32`'
+---
+
+# PostgreSQL connector
+
+```{raw} html
+<img src="../_static/img/postgresql.png" class="connector-logo">
+```
+
+The PostgreSQL connector allows querying and creating tables in an
+external [PostgreSQL](https://www.postgresql.org/) database. This can be used to join data between
+different systems like PostgreSQL and Hive, or between different
+PostgreSQL instances.
+
+## Requirements
+
+To connect to PostgreSQL, you need:
+
+- PostgreSQL 11.x or higher.
+- Network access from the Trino coordinator and workers to PostgreSQL.
+  Port 5432 is the default port.
+
+## Configuration
+
+The connector can query a database on a PostgreSQL server. Create a catalog
+properties file that specifies the PostgreSQL connector by setting the
+`connector.name` to `postgresql`.
+
+For example, to access a database as the `example` catalog, create the file
+`etc/catalog/example.properties`. Replace the connection properties as
+appropriate for your setup:
+
+```text
+connector.name=postgresql
+connection-url=jdbc:postgresql://example.net:5432/database
+connection-user=root
+connection-password=secret
+```
+
+The `connection-url` defines the connection information and parameters to pass
+to the PostgreSQL JDBC driver. The parameters for the URL are available in the
+[PostgreSQL JDBC driver documentation](https://jdbc.postgresql.org/documentation/use/#connecting-to-the-database).
+Some parameters can have adverse effects on the connector behavior or not work
+with the connector.
+
+The `connection-user` and `connection-password` are typically required and
+determine the user credentials for the connection, often a service user. You can
+use {doc}`secrets </security/secrets>` to avoid actual values in the catalog
+properties files.
+
+### Access to system tables
+
+The PostgreSQL connector supports reading [PostgreSQ catalog
+tables](https://www.postgresql.org/docs/current/catalogs.html), such as
+`pg_namespace`. The functionality is turned off by default, and can be enabled
+using the `postgresql.include-system-tables` configuration property.
+
+You can see more details in the `pg_catalog` schema in the `example` catalog,
+for example about the `pg_namespace` system table:
+
+```sql
+SHOW TABLES FROM example.pg_catalog;
+SELECT * FROM example.pg_catalog.pg_namespace;
+```
+
+(postgresql-tls)=
+
+### Connection security
+
+If you have TLS configured with a globally-trusted certificate installed on your
+data source, you can enable TLS between your cluster and the data
+source by appending a parameter to the JDBC connection string set in the
+`connection-url` catalog configuration property.
+
+For example, with version 42 of the PostgreSQL JDBC driver, enable TLS by
+appending the `ssl=true` parameter to the `connection-url` configuration
+property:
+
+```properties
+connection-url=jdbc:postgresql://example.net:5432/database?ssl=true
+```
+
+For more information on TLS configuration options, see the [PostgreSQL JDBC
+driver documentation](https://jdbc.postgresql.org/documentation/use/#connecting-to-the-database).
+
+```{include} jdbc-authentication.fragment
+```
+
+### Multiple PostgreSQL databases or servers
+
+The PostgreSQL connector can only access a single database within
+a PostgreSQL server. Thus, if you have multiple PostgreSQL databases,
+or want to connect to multiple PostgreSQL servers, you must configure
+multiple instances of the PostgreSQL connector.
+
+To add another catalog, simply add another properties file to `etc/catalog`
+with a different name, making sure it ends in `.properties`. For example,
+if you name the property file `sales.properties`, Trino creates a
+catalog named `sales` using the configured connector.
+
+```{include} jdbc-common-configurations.fragment
+```
+
+```{include} query-comment-format.fragment
+```
+
+```{include} jdbc-domain-compaction-threshold.fragment
+```
+
+```{include} jdbc-procedures.fragment
+```
+
+```{include} jdbc-case-insensitive-matching.fragment
+```
+
+```{include} non-transactional-insert.fragment
+```
+
+(postgresql-type-mapping)=
+
+## Type mapping
+
+Because Trino and PostgreSQL each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+### PostgreSQL type to Trino type mapping
+
+The connector maps PostgreSQL types to the corresponding Trino types following
+this table:
+
+```{eval-rst}
+.. list-table:: PostgreSQL type to Trino type mapping
+  :widths: 30, 20, 50
+  :header-rows: 1
+
+  * - PostgreSQL type
+    - Trino type
+    - Notes
+  * - ``BIT``
+    - ``BOOLEAN``
+    -
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+    -
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``INTEGER``
+    - ``INTEGER``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``REAL``
+    - ``REAL``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``NUMERIC(p, s)``
+    - ``DECIMAL(p, s)``
+    - ``DECIMAL(p, s)`` is an alias of  ``NUMERIC(p, s)``. See
+      :ref:`postgresql-decimal-type-handling` for more information.
+  * - ``CHAR(n)``
+    - ``CHAR(n)``
+    -
+  * - ``VARCHAR(n)``
+    - ``VARCHAR(n)``
+    -
+  * - ``ENUM``
+    - ``VARCHAR``
+    -
+  * - ``BYTEA``
+    - ``VARBINARY``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME(n)``
+    - ``TIME(n)``
+    -
+  * - ``TIMESTAMP(n)``
+    - ``TIMESTAMP(n)``
+    -
+  * - ``TIMESTAMPTZ(n)``
+    - ``TIMESTAMP(n) WITH TIME ZONE``
+    -
+  * - ``MONEY``
+    - ``VARCHAR``
+    -
+  * - ``UUID``
+    - ``UUID``
+    -
+  * - ``JSON``
+    - ``JSON``
+    -
+  * - ``JSONB``
+    - ``JSON``
+    -
+  * - ``HSTORE``
+    - ``MAP(VARCHAR, VARCHAR)``
+    -
+  * - ``ARRAY``
+    - Disabled, ``ARRAY``, or ``JSON``
+    - See :ref:`postgresql-array-type-handling` for more information.
+```
+
+No other types are supported.
+
+### Trino type to PostgreSQL type mapping
+
+The connector maps Trino types to the corresponding PostgreSQL types following
+this table:
+
+```{eval-rst}
+.. list-table:: Trino type to PostgreSQL type mapping
+  :widths: 30, 20, 50
+  :header-rows: 1
+
+  * - Trino type
+    - PostgreSQL type
+    - Notes
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+    -
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``TINYINT``
+    - ``SMALLINT``
+    -
+  * - ``INTEGER``
+    - ``INTEGER``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``DECIMAL(p, s)``
+    - ``NUMERIC(p, s)``
+    - ``DECIMAL(p, s)`` is an alias of  ``NUMERIC(p, s)``. See
+      :ref:`postgresql-decimal-type-handling` for more information.
+  * - ``CHAR(n)``
+    - ``CHAR(n)``
+    -
+  * - ``VARCHAR(n)``
+    - ``VARCHAR(n)``
+    -
+  * - ``VARBINARY``
+    - ``BYTEA``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME(n)``
+    - ``TIME(n)``
+    -
+  * - ``TIMESTAMP(n)``
+    - ``TIMESTAMP(n)``
+    -
+  * - ``TIMESTAMP(n) WITH TIME ZONE``
+    - ``TIMESTAMPTZ(n)``
+    -
+  * - ``UUID``
+    - ``UUID``
+    -
+  * - ``JSON``
+    - ``JSONB``
+    -
+  * - ``ARRAY``
+    - ``ARRAY``
+    - See :ref:`postgresql-array-type-handling` for more information.
+```
+
+No other types are supported.
+
+(postgresql-decimal-type-handling)=
+
+```{include} decimal-type-handling.fragment
+```
+
+(postgresql-array-type-handling)=
+
+### Array type handling
+
+The PostgreSQL array implementation does not support fixed dimensions whereas Trino
+support only arrays with fixed dimensions.
+You can configure how the PostgreSQL connector handles arrays with the `postgresql.array-mapping` configuration property in your catalog file
+or the `array_mapping` session property.
+The following values are accepted for this property:
+
+- `DISABLED` (default): array columns are skipped.
+- `AS_ARRAY`: array columns are interpreted as Trino `ARRAY` type, for array columns with fixed dimensions.
+- `AS_JSON`: array columns are interpreted as Trino `JSON` type, with no constraint on dimensions.
+
+```{include} jdbc-type-mapping.fragment
+```
+
+## Querying PostgreSQL
+
+The PostgreSQL connector provides a schema for every PostgreSQL schema.
+You can see the available PostgreSQL schemas by running `SHOW SCHEMAS`:
+
+```
+SHOW SCHEMAS FROM example;
+```
+
+If you have a PostgreSQL schema named `web`, you can view the tables
+in this schema by running `SHOW TABLES`:
+
+```
+SHOW TABLES FROM example.web;
+```
+
+You can see a list of the columns in the `clicks` table in the `web` database
+using either of the following:
+
+```
+DESCRIBE example.web.clicks;
+SHOW COLUMNS FROM example.web.clicks;
+```
+
+Finally, you can access the `clicks` table in the `web` schema:
+
+```
+SELECT * FROM example.web.clicks;
+```
+
+If you used a different name for your catalog properties file, use
+that catalog name instead of `example` in the above examples.
+
+(postgresql-sql-support)=
+
+## SQL support
+
+The connector provides read access and write access to data and metadata in
+PostgreSQL.  In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/update`
+- {doc}`/sql/delete`
+- {doc}`/sql/truncate`
+- {ref}`sql-schema-table-management`
+
+```{include} sql-update-limitation.fragment
+```
+
+```{include} sql-delete-limitation.fragment
+```
+
+```{include} alter-table-limitation.fragment
+```
+
+```{include} alter-schema-limitation.fragment
+```
+
+(postgresql-fte-support)=
+
+## Fault-tolerant execution support
+
+The connector supports {doc}`/admin/fault-tolerant-execution` of query
+processing. Read and write operations are both supported with any retry policy.
+
+## Table functions
+
+The connector provides specific {doc}`table functions </functions/table>` to
+access PostgreSQL.
+
+(postgresql-query-function)=
+
+### `query(varchar) -> table`
+
+The `query` function allows you to query the underlying database directly. It
+requires syntax native to PostgreSQL, because the full query is pushed down and
+processed in PostgreSQL. This can be useful for accessing native features which
+are not available in Trino or for improving query performance in situations
+where running a query natively may be faster.
+
+```{include} query-passthrough-warning.fragment
+```
+
+As a simple example, query the `example` catalog and select an entire table:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    example.system.query(
+      query => 'SELECT
+        *
+      FROM
+        tpch.nation'
+    )
+  );
+```
+
+As a practical example, you can leverage
+[frame exclusion from PostgresQL](https://www.postgresql.org/docs/current/sql-expressions.html#SYNTAX-WINDOW-FUNCTIONS)
+when using window functions:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    example.system.query(
+      query => 'SELECT
+        *,
+        array_agg(week) OVER (
+          ORDER BY
+            week
+          ROWS
+            BETWEEN 2 PRECEDING
+            AND 2 FOLLOWING
+            EXCLUDE GROUP
+        ) AS week,
+        array_agg(week) OVER (
+          ORDER BY
+            day
+          ROWS
+            BETWEEN 2 PRECEDING
+            AND 2 FOLLOWING
+            EXCLUDE GROUP
+        ) AS all
+      FROM
+        test.time_data'
+    )
+  );
+```
+
+```{include} query-table-function-ordering.fragment
+```
+
+## Performance
+
+The connector includes a number of performance improvements, detailed in the
+following sections.
+
+(postgresql-table-statistics)=
+
+### Table statistics
+
+The PostgreSQL connector can use {doc}`table and column statistics
+</optimizer/statistics>` for {doc}`cost based optimizations
+</optimizer/cost-based-optimizations>`, to improve query processing performance
+based on the actual data in the data source.
+
+The statistics are collected by PostgreSQL and retrieved by the connector.
+
+To collect statistics for a table, execute the following statement in
+PostgreSQL.
+
+```text
+ANALYZE table_schema.table_name;
+```
+
+Refer to PostgreSQL documentation for additional `ANALYZE` options.
+
+(postgresql-pushdown)=
+
+### Pushdown
+
+The connector supports pushdown for a number of operations:
+
+- {ref}`join-pushdown`
+- {ref}`limit-pushdown`
+- {ref}`topn-pushdown`
+
+{ref}`Aggregate pushdown <aggregation-pushdown>` for the following functions:
+
+- {func}`avg`
+- {func}`count`
+- {func}`max`
+- {func}`min`
+- {func}`sum`
+- {func}`stddev`
+- {func}`stddev_pop`
+- {func}`stddev_samp`
+- {func}`variance`
+- {func}`var_pop`
+- {func}`var_samp`
+- {func}`covar_pop`
+- {func}`covar_samp`
+- {func}`corr`
+- {func}`regr_intercept`
+- {func}`regr_slope`
+
+```{include} pushdown-correctness-behavior.fragment
+```
+
+```{include} join-pushdown-enabled-true.fragment
+```
+
+### Predicate pushdown support
+
+Predicates are pushed down for most types, including `UUID` and temporal
+types, such as `DATE`.
+
+The connector does not support pushdown of range predicates, such as `>`,
+`<`, or `BETWEEN`, on columns with {ref}`character string types
+<string-data-types>` like `CHAR` or `VARCHAR`.  Equality predicates, such as
+`IN` or `=`, and inequality predicates, such as `!=` on columns with
+textual types are pushed down. This ensures correctness of results since the
+remote data source may sort strings differently than Trino.
+
+In the following example, the predicate of the first query is not pushed down
+since `name` is a column of type `VARCHAR` and `>` is a range predicate.
+The other queries are pushed down.
+
+```sql
+-- Not pushed down
+SELECT * FROM nation WHERE name > 'CANADA';
+-- Pushed down
+SELECT * FROM nation WHERE name != 'CANADA';
+SELECT * FROM nation WHERE name = 'CANADA';
+```
+
+There is experimental support to enable pushdown of range predicates on columns
+with character string types which can be enabled by setting the
+`postgresql.experimental.enable-string-pushdown-with-collate` catalog
+configuration property or the corresponding
+`enable_string_pushdown_with_collate` session property to `true`.
+Enabling this configuration will make the predicate of all the queries in the
+above example get pushed down.
diff --git a/docs/src/main/sphinx/connector/postgresql.rst b/docs/src/main/sphinx/connector/postgresql.rst
deleted file mode 100644
index 6db7491d2029..000000000000
--- a/docs/src/main/sphinx/connector/postgresql.rst
+++ /dev/null
@@ -1,488 +0,0 @@
-====================
-PostgreSQL connector
-====================
-
-.. raw:: html
-
-  <img src="../_static/img/postgresql.png" class="connector-logo">
-
-The PostgreSQL connector allows querying and creating tables in an
-external `PostgreSQL <https://www.postgresql.org/>`_ database. This can be used to join data between
-different systems like PostgreSQL and Hive, or between different
-PostgreSQL instances.
-
-Requirements
-------------
-
-To connect to PostgreSQL, you need:
-
-* PostgreSQL 10.x or higher.
-* Network access from the Trino coordinator and workers to PostgreSQL.
-  Port 5432 is the default port.
-
-Configuration
--------------
-
-The connector can query a database on a PostgreSQL server. Create a catalog
-properties file that specifies the PostgreSQL connector by setting the
-``connector.name`` to ``postgresql``.
-
-For example, to access a database as the ``example`` catalog, create the file
-``etc/catalog/example.properties``. Replace the connection properties as
-appropriate for your setup:
-
-.. code-block:: text
-
-    connector.name=postgresql
-    connection-url=jdbc:postgresql://example.net:5432/database
-    connection-user=root
-    connection-password=secret
-
-The ``connection-url`` defines the connection information and parameters to pass
-to the PostgreSQL JDBC driver. The parameters for the URL are available in the
-`PostgreSQL JDBC driver documentation
-<https://jdbc.postgresql.org/documentation/use/#connecting-to-the-database>`__.
-Some parameters can have adverse effects on the connector behavior or not work
-with the connector.
-
-The ``connection-user`` and ``connection-password`` are typically required and
-determine the user credentials for the connection, often a service user. You can
-use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
-properties files.
-
-.. _postgresql-tls:
-
-Connection security
-^^^^^^^^^^^^^^^^^^^
-
-If you have TLS configured with a globally-trusted certificate installed on your
-data source, you can enable TLS between your cluster and the data
-source by appending a parameter to the JDBC connection string set in the
-``connection-url`` catalog configuration property.
-
-For example, with version 42 of the PostgreSQL JDBC driver, enable TLS by
-appending the ``ssl=true`` parameter to the ``connection-url`` configuration
-property:
-
-.. code-block:: properties
-
-  connection-url=jdbc:postgresql://example.net:5432/database?ssl=true
-
-For more information on TLS configuration options, see the `PostgreSQL JDBC
-driver documentation <https://jdbc.postgresql.org/documentation/use/#connecting-to-the-database>`__.
-
-.. include:: jdbc-authentication.fragment
-
-Multiple PostgreSQL databases or servers
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The PostgreSQL connector can only access a single database within
-a PostgreSQL server. Thus, if you have multiple PostgreSQL databases,
-or want to connect to multiple PostgreSQL servers, you must configure
-multiple instances of the PostgreSQL connector.
-
-To add another catalog, simply add another properties file to ``etc/catalog``
-with a different name, making sure it ends in ``.properties``. For example,
-if you name the property file ``sales.properties``, Trino creates a
-catalog named ``sales`` using the configured connector.
-
-.. include:: jdbc-common-configurations.fragment
-
-.. |default_domain_compaction_threshold| replace:: ``32``
-.. include:: jdbc-domain-compaction-threshold.fragment
-
-.. include:: jdbc-procedures.fragment
-
-.. include:: jdbc-case-insensitive-matching.fragment
-
-.. include:: non-transactional-insert.fragment
-
-.. _postgresql-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and PostgreSQL each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-PostgreSQL type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps PostgreSQL types to the corresponding Trino types following
-this table:
-
-.. list-table:: PostgreSQL type to Trino type mapping
-  :widths: 30, 20, 50
-  :header-rows: 1
-
-  * - PostgreSQL type
-    - Trino type
-    - Notes
-  * - ``BIT``
-    - ``BOOLEAN``
-    -
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-    -
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``INTEGER``
-    - ``INTEGER``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``REAL``
-    - ``REAL``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``NUMERIC(p, s)``
-    - ``DECIMAL(p, s)``
-    - ``DECIMAL(p, s)`` is an alias of  ``NUMERIC(p, s)``. See
-      :ref:`postgresql-decimal-type-handling` for more information.
-  * - ``CHAR(n)``
-    - ``CHAR(n)``
-    -
-  * - ``VARCHAR(n)``
-    - ``VARCHAR(n)``
-    -
-  * - ``ENUM``
-    - ``VARCHAR``
-    -
-  * - ``BYTEA``
-    - ``VARBINARY``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME(n)``
-    - ``TIME(n)``
-    -
-  * - ``TIMESTAMP(n)``
-    - ``TIMESTAMP(n)``
-    -
-  * - ``TIMESTAMPTZ(n)``
-    - ``TIMESTAMP(n) WITH TIME ZONE``
-    -
-  * - ``MONEY``
-    - ``VARCHAR``
-    -
-  * - ``UUID``
-    - ``UUID``
-    -
-  * - ``JSON``
-    - ``JSON``
-    -
-  * - ``JSONB``
-    - ``JSON``
-    -
-  * - ``HSTORE``
-    - ``MAP(VARCHAR, VARCHAR)``
-    -
-  * - ``ARRAY``
-    - Disabled, ``ARRAY``, or ``JSON``
-    - See :ref:`postgresql-array-type-handling` for more information.
-
-No other types are supported.
-
-Trino type to PostgreSQL type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding PostgreSQL types following
-this table:
-
-.. list-table:: Trino type to PostgreSQL type mapping
-  :widths: 30, 20, 50
-  :header-rows: 1
-
-  * - Trino type
-    - PostgreSQL type
-    - Notes
-  * - ``BOOLEAN``
-    - ``BOOLEAN``
-    -
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``TINYINT``
-    - ``SMALLINT``
-    -
-  * - ``INTEGER``
-    - ``INTEGER``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE``
-    -
-  * - ``DECIMAL(p, s)``
-    - ``NUMERIC(p, s)``
-    - ``DECIMAL(p, s)`` is an alias of  ``NUMERIC(p, s)``. See
-      :ref:`postgresql-decimal-type-handling` for more information.
-  * - ``CHAR(n)``
-    - ``CHAR(n)``
-    -
-  * - ``VARCHAR(n)``
-    - ``VARCHAR(n)``
-    -
-  * - ``VARBINARY``
-    - ``BYTEA``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME(n)``
-    - ``TIME(n)``
-    -
-  * - ``TIMESTAMP(n)``
-    - ``TIMESTAMP(n)``
-    -
-  * - ``TIMESTAMP(n) WITH TIME ZONE``
-    - ``TIMESTAMPTZ(n)``
-    -
-  * - ``UUID``
-    - ``UUID``
-    -
-  * - ``JSON``
-    - ``JSONB``
-    -
-  * - ``ARRAY``
-    - ``ARRAY``
-    - See :ref:`postgresql-array-type-handling` for more information.
-
-No other types are supported.
-
-.. _postgresql-decimal-type-handling:
-
-.. include:: decimal-type-handling.fragment
-
-.. _postgresql-array-type-handling:
-
-Array type handling
-^^^^^^^^^^^^^^^^^^^
-
-The PostgreSQL array implementation does not support fixed dimensions whereas Trino
-support only arrays with fixed dimensions.
-You can configure how the PostgreSQL connector handles arrays with the ``postgresql.array-mapping`` configuration property in your catalog file
-or the ``array_mapping`` session property.
-The following values are accepted for this property:
-
-* ``DISABLED`` (default): array columns are skipped.
-* ``AS_ARRAY``: array columns are interpreted as Trino ``ARRAY`` type, for array columns with fixed dimensions.
-* ``AS_JSON``: array columns are interpreted as Trino ``JSON`` type, with no constraint on dimensions.
-
-.. include:: jdbc-type-mapping.fragment
-
-Querying PostgreSQL
--------------------
-
-The PostgreSQL connector provides a schema for every PostgreSQL schema.
-You can see the available PostgreSQL schemas by running ``SHOW SCHEMAS``::
-
-    SHOW SCHEMAS FROM example;
-
-If you have a PostgreSQL schema named ``web``, you can view the tables
-in this schema by running ``SHOW TABLES``::
-
-    SHOW TABLES FROM example.web;
-
-You can see a list of the columns in the ``clicks`` table in the ``web`` database
-using either of the following::
-
-    DESCRIBE example.web.clicks;
-    SHOW COLUMNS FROM example.web.clicks;
-
-Finally, you can access the ``clicks`` table in the ``web`` schema::
-
-    SELECT * FROM example.web.clicks;
-
-If you used a different name for your catalog properties file, use
-that catalog name instead of ``example`` in the above examples.
-
-.. _postgresql-sql-support:
-
-SQL support
------------
-
-The connector provides read access and write access to data and metadata in
-PostgreSQL.  In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/delete`
-* :doc:`/sql/truncate`
-* :ref:`sql-schema-table-management`
-
-.. include:: sql-delete-limitation.fragment
-
-.. include:: alter-table-limitation.fragment
-
-.. include:: alter-schema-limitation.fragment
-
-Table functions
----------------
-
-The connector provides specific :doc:`table functions </functions/table>` to
-access PostgreSQL.
-
-.. _postgresql-query-function:
-
-``query(varchar) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``query`` function allows you to query the underlying database directly. It
-requires syntax native to PostgreSQL, because the full query is pushed down and
-processed in PostgreSQL. This can be useful for accessing native features which
-are not available in Trino or for improving query performance in situations
-where running a query natively may be faster.
-
-.. include:: polymorphic-table-function-ordering.fragment
-
-As a simple example, query the ``example`` catalog and select an entire table::
-
-    SELECT
-      *
-    FROM
-      TABLE(
-        example.system.query(
-          query => 'SELECT
-            *
-          FROM
-            tpch.nation'
-        )
-      );
-
-As a practical example, you can leverage
-`frame exclusion from PostgresQL <https://www.postgresql.org/docs/current/sql-expressions.html#SYNTAX-WINDOW-FUNCTIONS>`_
-when using window functions::
-
-    SELECT
-      *
-    FROM
-      TABLE(
-        example.system.query(
-          query => 'SELECT
-            *,
-            array_agg(week) OVER (
-              ORDER BY
-                week
-              ROWS
-                BETWEEN 2 PRECEDING
-                AND 2 FOLLOWING
-                EXCLUDE GROUP
-            ) AS week,
-            array_agg(week) OVER (
-              ORDER BY
-                day
-              ROWS
-                BETWEEN 2 PRECEDING
-                AND 2 FOLLOWING
-                EXCLUDE GROUP
-            ) AS all
-          FROM
-            test.time_data'
-        )
-      );
-
-
-Performance
------------
-
-The connector includes a number of performance improvements, detailed in the
-following sections.
-
-.. _postgresql-table-statistics:
-
-Table statistics
-^^^^^^^^^^^^^^^^
-
-The PostgreSQL connector can use :doc:`table and column statistics
-</optimizer/statistics>` for :doc:`cost based optimizations
-</optimizer/cost-based-optimizations>`, to improve query processing performance
-based on the actual data in the data source.
-
-The statistics are collected by PostgreSQL and retrieved by the connector.
-
-To collect statistics for a table, execute the following statement in
-PostgreSQL.
-
-.. code-block:: text
-
-    ANALYZE table_schema.table_name;
-
-Refer to PostgreSQL documentation for additional ``ANALYZE`` options.
-
-.. _postgresql-pushdown:
-
-Pushdown
-^^^^^^^^
-
-The connector supports pushdown for a number of operations:
-
-* :ref:`join-pushdown`
-* :ref:`limit-pushdown`
-* :ref:`topn-pushdown`
-
-:ref:`Aggregate pushdown <aggregation-pushdown>` for the following functions:
-
-* :func:`avg`
-* :func:`count`
-* :func:`max`
-* :func:`min`
-* :func:`sum`
-* :func:`stddev`
-* :func:`stddev_pop`
-* :func:`stddev_samp`
-* :func:`variance`
-* :func:`var_pop`
-* :func:`var_samp`
-* :func:`covar_pop`
-* :func:`covar_samp`
-* :func:`corr`
-* :func:`regr_intercept`
-* :func:`regr_slope`
-
-.. include:: pushdown-correctness-behavior.fragment
-
-.. include:: join-pushdown-enabled-true.fragment
-
-Predicate pushdown support
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Predicates are pushed down for most types, including ``UUID`` and temporal
-types, such as ``DATE``.
-
-The connector does not support pushdown of range predicates, such as ``>``,
-``<``, or ``BETWEEN``, on columns with :ref:`character string types
-<string-data-types>` like ``CHAR`` or ``VARCHAR``.  Equality predicates, such as
-``IN`` or ``=``, and inequality predicates, such as ``!=`` on columns with
-textual types are pushed down. This ensures correctness of results since the
-remote data source may sort strings differently than Trino.
-
-In the following example, the predicate of the first query is not pushed down
-since ``name`` is a column of type ``VARCHAR`` and ``>`` is a range predicate.
-The other queries are pushed down.
-
-.. code-block:: sql
-
-    -- Not pushed down
-    SELECT * FROM nation WHERE name > 'CANADA';
-    -- Pushed down
-    SELECT * FROM nation WHERE name != 'CANADA';
-    SELECT * FROM nation WHERE name = 'CANADA';
-
-There is experimental support to enable pushdown of range predicates on columns
-with character string types which can be enabled by setting the
-``postgresql.experimental.enable-string-pushdown-with-collate`` catalog
-configuration property or the corresponding
-``enable_string_pushdown_with_collate`` session property to ``true``.
-Enabling this configuration will make the predicate of all the queries in the
-above example get pushed down.
diff --git a/docs/src/main/sphinx/connector/prometheus.md b/docs/src/main/sphinx/connector/prometheus.md
new file mode 100644
index 000000000000..357c68236eb1
--- /dev/null
+++ b/docs/src/main/sphinx/connector/prometheus.md
@@ -0,0 +1,132 @@
+# Prometheus connector
+
+```{raw} html
+<img src="../_static/img/prometheus.png" class="connector-logo">
+```
+
+The Prometheus connector allows reading
+[Prometheus](https://prometheus.io/)
+metrics as tables in Trino.
+
+The mechanism for querying Prometheus is to use the Prometheus HTTP API. Specifically, all queries are resolved to Prometheus Instant queries
+with a form like: <http://localhost:9090/api/v1/query?query=up[21d]&time=1568229904.000>.
+In this case the `up` metric is taken from the Trino query table name, `21d` is the duration of the query. The Prometheus `time` value
+corresponds to the `TIMESTAMP` field. Trino queries are translated from their use of the `TIMESTAMP` field to a duration and time value
+as needed. Trino splits are generated by dividing the query range into attempted equal chunks.
+
+## Requirements
+
+To query Prometheus, you need:
+
+- Network access from the Trino coordinator and workers to the Prometheus
+  server. The default port is 9090.
+- Prometheus version 2.15.1 or later.
+
+## Configuration
+
+Create `etc/catalog/example.properties` to mount the Prometheus connector as
+the `example` catalog, replacing the properties as appropriate:
+
+```text
+connector.name=prometheus
+prometheus.uri=http://localhost:9090
+prometheus.query.chunk.size.duration=1d
+prometheus.max.query.range.duration=21d
+prometheus.cache.ttl=30s
+prometheus.bearer.token.file=/path/to/bearer/token/file
+prometheus.read-timeout=10s
+```
+
+## Configuration properties
+
+The following configuration properties are available:
+
+| Property name                               | Description                                                                                  |
+| ------------------------------------------- | -------------------------------------------------------------------------------------------- |
+| `prometheus.uri`                            | Where to find Prometheus coordinator host                                                    |
+| `prometheus.query.chunk.size.duration`      | The duration of each query to Prometheus                                                     |
+| `prometheus.max.query.range.duration`       | Width of overall query to Prometheus, will be divided into query-chunk-size-duration queries |
+| `prometheus.cache.ttl`                      | How long values from this config file are cached                                             |
+| `prometheus.auth.user`                      | Username for basic authentication                                                            |
+| `prometheus.auth.password`                  | Password for basic authentication                                                            |
+| `prometheus.bearer.token.file`              | File holding bearer token if needed for access to Prometheus                                 |
+| `prometheus.read-timeout`                   | How much time a query to Prometheus has before timing out                                    |
+| `prometheus.case-insensitive-name-matching` | Match Prometheus metric names case insensitively. Defaults to `false`                        |
+
+## Not exhausting your Trino available heap
+
+The `prometheus.query.chunk.size.duration` and `prometheus.max.query.range.duration` are values to protect Trino from
+too much data coming back from Prometheus. The `prometheus.max.query.range.duration` is the item of
+particular interest.
+
+On a Prometheus instance that has been running for awhile and depending
+on data retention settings, `21d` might be far too much. Perhaps `1h` might be a more reasonable setting.
+In the case of `1h` it might be then useful to set `prometheus.query.chunk.size.duration` to `10m`, dividing the
+query window into 6 queries each of which can be handled in a Trino split.
+
+Primarily query issuers can limit the amount of data returned by Prometheus by taking
+advantage of `WHERE` clause limits on `TIMESTAMP`, setting an upper bound and lower bound that define
+a relatively small window. For example:
+
+```sql
+SELECT * FROM example.default.up WHERE TIMESTAMP > (NOW() - INTERVAL '10' second);
+```
+
+If the query does not include a WHERE clause limit, these config
+settings are meant to protect against an unlimited query.
+
+## Bearer token authentication
+
+Prometheus can be setup to require a Authorization header with every query. The value in
+`prometheus.bearer.token.file` allows for a bearer token to be read from the configured file. This file
+is optional and not required unless your Prometheus setup requires it.
+
+(prometheus-type-mapping)=
+
+## Type mapping
+
+Because Trino and Prometheus each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading data.
+
+The connector returns fixed columns that have a defined mapping to Trino types
+according to the following table:
+
+```{eval-rst}
+.. list-table:: Prometheus column to Trino type mapping
+  :widths: 50, 50
+  :header-rows: 1
+
+  * - Prometheus column
+    - Trino type
+  * - ``labels``
+    - ``MAP(VARCHAR,VARCHAR)``
+  * - ``TIMESTAMP``
+    - ``TIMESTAMP(3) WITH TIMEZONE``
+  * - ``value``
+    - ``DOUBLE``
+```
+
+No other types are supported.
+
+The following example query result shows how the Prometheus `up` metric is
+represented in Trino:
+
+```sql
+SELECT * FROM example.default.up;
+```
+
+```text
+                        labels                         |           timestamp            | value
+--------------------------------------------------------+--------------------------------+-------
+{instance=localhost:9090, job=prometheus, __name__=up} | 2022-09-01 06:18:54.481 +09:00 |   1.0
+{instance=localhost:9090, job=prometheus, __name__=up} | 2022-09-01 06:19:09.446 +09:00 |   1.0
+(2 rows)
+```
+
+(prometheus-sql-support)=
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements to access data and
+metadata in Prometheus.
diff --git a/docs/src/main/sphinx/connector/prometheus.rst b/docs/src/main/sphinx/connector/prometheus.rst
deleted file mode 100644
index 81c305f00d18..000000000000
--- a/docs/src/main/sphinx/connector/prometheus.rst
+++ /dev/null
@@ -1,142 +0,0 @@
-====================
-Prometheus connector
-====================
-
-.. raw:: html
-
-  <img src="../_static/img/prometheus.png" class="connector-logo">
-
-The Prometheus connector allows reading
-`Prometheus <https://prometheus.io/>`_
-metrics as tables in Trino.
-
-The mechanism for querying Prometheus is to use the Prometheus HTTP API. Specifically, all queries are resolved to Prometheus Instant queries
-with a form like: http://localhost:9090/api/v1/query?query=up[21d]&time=1568229904.000.
-In this case the ``up`` metric is taken from the Trino query table name, ``21d`` is the duration of the query. The Prometheus ``time`` value
-corresponds to the ``timestamp`` field. Trino queries are translated from their use of the ``timestamp`` field to a duration and time value
-as needed. Trino splits are generated by dividing the query range into attempted equal chunks.
-
-Requirements
-------------
-
-To query Prometheus, you need:
-
-* Network access from the Trino coordinator and workers to the Prometheus
-  server. The default port is 9090.
-* Prometheus version 2.15.1 or later.
-
-Configuration
--------------
-
-Create ``etc/catalog/example.properties`` to mount the Prometheus connector as
-the ``example`` catalog, replacing the properties as appropriate:
-
-.. code-block:: text
-
-    connector.name=prometheus
-    prometheus.uri=http://localhost:9090
-    prometheus.query.chunk.size.duration=1d
-    prometheus.max.query.range.duration=21d
-    prometheus.cache.ttl=30s
-    prometheus.bearer.token.file=/path/to/bearer/token/file
-    prometheus.read-timeout=10s
-
-Configuration properties
-------------------------
-
-The following configuration properties are available:
-
-============================================= ============================================================================================
-Property name                                 Description
-============================================= ============================================================================================
-``prometheus.uri``                            Where to find Prometheus coordinator host
-``prometheus.query.chunk.size.duration``      The duration of each query to Prometheus
-``prometheus.max.query.range.duration``       Width of overall query to Prometheus, will be divided into query-chunk-size-duration queries
-``prometheus.cache.ttl``                      How long values from this config file are cached
-``prometheus.auth.user``                      Username for basic authentication
-``prometheus.auth.password``                  Password for basic authentication
-``prometheus.bearer.token.file``              File holding bearer token if needed for access to Prometheus
-``prometheus.read-timeout``                   How much time a query to Prometheus has before timing out
-``prometheus.case-insensitive-name-matching`` Match Prometheus metric names case insensitively. Defaults to ``false``
-============================================= ============================================================================================
-
-Not exhausting your Trino available heap
------------------------------------------
-
-The ``prometheus.query.chunk.size.duration`` and ``prometheus.max.query.range.duration`` are values to protect Trino from
-too much data coming back from Prometheus. The ``prometheus.max.query.range.duration`` is the item of
-particular interest.
-
-On a Prometheus instance that has been running for awhile and depending
-on data retention settings, ``21d`` might be far too much. Perhaps ``1h`` might be a more reasonable setting.
-In the case of ``1h`` it might be then useful to set ``prometheus.query.chunk.size.duration`` to ``10m``, dividing the
-query window into 6 queries each of which can be handled in a Trino split.
-
-Primarily query issuers can limit the amount of data returned by Prometheus by taking
-advantage of ``WHERE`` clause limits on ``timestamp``, setting an upper bound and lower bound that define
-a relatively small window. For example:
-
-.. code-block:: sql
-
-    SELECT * FROM example.default.up WHERE timestamp > (NOW() - INTERVAL '10' second);
-
-If the query does not include a WHERE clause limit, these config
-settings are meant to protect against an unlimited query.
-
-
-Bearer token authentication
----------------------------
-
-Prometheus can be setup to require a Authorization header with every query. The value in
-``prometheus.bearer.token.file`` allows for a bearer token to be read from the configured file. This file
-is optional and not required unless your Prometheus setup requires it.
-
-.. _prometheus-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and Prometheus each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading data.
-
-The connector returns fixed columns that have a defined mapping to Trino types
-according to the following table:
-
-.. list-table:: Prometheus column to Trino type mapping
-  :widths: 50, 50
-  :header-rows: 1
-
-  * - Prometheus column
-    - Trino type
-  * - ``labels``
-    - ``MAP(VARCHAR,VARCHAR)``
-  * - ``timestamp``
-    - ``TIMESTAMP(3) WITH TIMEZONE``
-  * - ``value``
-    - ``DOUBLE``
-
-No other types are supported.
-
-The following example query result shows how the Prometheus ``up`` metric is
-represented in Trino:
-
-.. code-block:: sql
-
-    SELECT * FROM example.default.up;
-
-.. code-block:: text
-
-                            labels                         |           timestamp            | value
-    --------------------------------------------------------+--------------------------------+-------
-    {instance=localhost:9090, job=prometheus, __name__=up} | 2022-09-01 06:18:54.481 +09:00 |   1.0
-    {instance=localhost:9090, job=prometheus, __name__=up} | 2022-09-01 06:19:09.446 +09:00 |   1.0
-    (2 rows)
-
-.. _prometheus-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access data and
-metadata in Prometheus.
diff --git a/docs/src/main/sphinx/connector/pushdown-correctness-behavior.fragment b/docs/src/main/sphinx/connector/pushdown-correctness-behavior.fragment
index 72414eefc3b2..cb858aa94278 100644
--- a/docs/src/main/sphinx/connector/pushdown-correctness-behavior.fragment
+++ b/docs/src/main/sphinx/connector/pushdown-correctness-behavior.fragment
@@ -1,6 +1,7 @@
-.. note::
 
-  The connector performs pushdown where performance may be improved, but in
-  order to preserve correctness an operation may not be pushed down. When
-  pushdown of an operation may result in better performance but risks
-  correctness, the connector prioritizes correctness.
\ No newline at end of file
+:::{note}
+The connector performs pushdown where performance may be improved, but in
+order to preserve correctness an operation may not be pushed down. When
+pushdown of an operation may result in better performance but risks
+correctness, the connector prioritizes correctness.
+:::
diff --git a/docs/src/main/sphinx/connector/query-comment-format.fragment b/docs/src/main/sphinx/connector/query-comment-format.fragment
new file mode 100644
index 000000000000..cd8c3bd91e12
--- /dev/null
+++ b/docs/src/main/sphinx/connector/query-comment-format.fragment
@@ -0,0 +1,49 @@
+### Appending query metadata
+
+The optional parameter `query.comment-format` allows you to configure a SQL
+comment that is sent to the datasource with each query. The format of this
+comment can contain any characters and the following metadata:
+
+- `$QUERY_ID`: The identifier of the query.
+- `$USER`: The name of the user who submits the query to Trino.
+- `$SOURCE`: The identifier of the client tool used to submit the query, for
+  example `trino-cli`.
+- `$TRACE_TOKEN`: The trace token configured with the client tool.
+
+The comment can provide more context about the query. This additional
+information is available in the logs of the datasource. To include environment
+variables from the Trino cluster with the comment , use the
+`${ENV:VARIABLE-NAME}` syntax.
+
+The following example sets a simple comment that identifies each query sent by
+Trino:
+
+```text
+query.comment-format=Query sent by Trino.
+```
+
+With this configuration, a query such as `SELECT * FROM example_table;` is
+sent to the datasource with the comment appended:
+
+```text
+SELECT * FROM example_table; /*Query sent by Trino.*/
+```
+
+The following example improves on the preceding example by using metadata:
+
+```text
+query.comment-format=Query $QUERY_ID sent by user $USER from Trino.
+```
+
+If `Jane` sent the query with the query identifier
+`20230622_180528_00000_bkizg`, the following comment string is sent to the
+datasource:
+
+```text
+SELECT * FROM example_table; /*Query 20230622_180528_00000_bkizg sent by user Jane from Trino.*/
+```
+
+:::{note}
+Certain JDBC driver settings and logging configurations might cause the
+comment to be removed.
+:::
diff --git a/docs/src/main/sphinx/connector/query-passthrough-warning.fragment b/docs/src/main/sphinx/connector/query-passthrough-warning.fragment
new file mode 100644
index 000000000000..7373b10c11cc
--- /dev/null
+++ b/docs/src/main/sphinx/connector/query-passthrough-warning.fragment
@@ -0,0 +1,4 @@
+The native query passed to the underlying data source is required to return a
+table as a result set. Only the data source performs validation or security
+checks for these queries using its own configuration. Trino does not perform
+these tasks. Only use passthrough queries to read data.
diff --git a/docs/src/main/sphinx/connector/query-table-function-ordering.fragment b/docs/src/main/sphinx/connector/query-table-function-ordering.fragment
new file mode 100644
index 000000000000..14995ce85d76
--- /dev/null
+++ b/docs/src/main/sphinx/connector/query-table-function-ordering.fragment
@@ -0,0 +1,5 @@
+:::{note}
+The query engine does not preserve the order of the results of this
+function. If the passed query contains an ``ORDER BY`` clause, the
+function result may not be ordered as expected.
+:::
diff --git a/docs/src/main/sphinx/connector/raw-decoder.fragment b/docs/src/main/sphinx/connector/raw-decoder.fragment
new file mode 100644
index 000000000000..68d2de457445
--- /dev/null
+++ b/docs/src/main/sphinx/connector/raw-decoder.fragment
@@ -0,0 +1,85 @@
+#### Raw decoder
+
+The raw decoder supports reading of raw byte-based values from message or key,
+and converting it into Trino columns.
+
+For fields, the following attributes are supported:
+
+- `dataFormat` - Selects the width of the data type converted.
+- `type` - Trino data type. See the following table for a list of supported
+  data types.
+- `mapping` - `<start>[:<end>]` - Start and end position of bytes to convert
+  (optional).
+
+The `dataFormat` attribute selects the number of bytes converted. If absent,
+`BYTE` is assumed. All values are signed.
+
+Supported values are:
+
+- `BYTE` - one byte
+- `SHORT` - two bytes (big-endian)
+- `INT` - four bytes (big-endian)
+- `LONG` - eight bytes (big-endian)
+- `FLOAT` - four bytes (IEEE 754 format)
+- `DOUBLE` - eight bytes (IEEE 754 format)
+
+The `type` attribute defines the Trino data type on which the value is mapped.
+
+Depending on the Trino type assigned to a column, different values of dataFormat
+can be used:
+
+```{eval-rst}
+.. list-table::
+  :widths: 40, 60
+  :header-rows: 1
+
+  * - Trino data type
+    - Allowed ``dataFormat`` values
+  * - ``BIGINT``
+    - ``BYTE``, ``SHORT``, ``INT``, ``LONG``
+  * - ``INTEGER``
+    - ``BYTE``, ``SHORT``, ``INT``
+  * - ``SMALLINT``
+    - ``BYTE``, ``SHORT``
+  * - ``DOUBLE``
+    - ``DOUBLE``, ``FLOAT``
+  * - ``BOOLEAN``
+    - ``BYTE``, ``SHORT``, ``INT``, ``LONG``
+  * - ``VARCHAR`` / ``VARCHAR(x)``
+    - ``BYTE``
+```
+
+No other types are supported.
+
+The `mapping` attribute specifies the range of the bytes in a key or message
+used for decoding. It can be one or two numbers separated by a colon
+(`<start>[:<end>]`).
+
+If only a start position is given:
+
+- For fixed width types, the column uses the appropriate number of bytes for
+  the specified `dataFormat` (see above).
+- When the `VARCHAR` value is decoded, all bytes from the start position to
+  the end of the message is used.
+
+If start and end position are given:
+
+- For fixed width types, the size must be equal to the number of bytes used by
+  specified `dataFormat`.
+- For the `VARCHAR` data type all bytes between start (inclusive) and end
+  (exclusive) are used.
+
+If no `mapping` attribute is specified, it is equivalent to setting the start
+position to 0 and leaving the end position undefined.
+
+The decoding scheme of numeric data types (`BIGINT`, `INTEGER`,
+`SMALLINT`, `TINYINT`, `DOUBLE`) is straightforward. A sequence of bytes
+is read from input message and decoded according to either:
+
+- big-endian encoding (for integer types)
+- IEEE 754 format for (for `DOUBLE`).
+
+The length of a decoded byte sequence is implied by the `dataFormat`.
+
+For the `VARCHAR` data type, a sequence of bytes is interpreted according to
+UTF-8 encoding.
diff --git a/docs/src/main/sphinx/connector/redis.md b/docs/src/main/sphinx/connector/redis.md
new file mode 100644
index 000000000000..2b3051cf01fa
--- /dev/null
+++ b/docs/src/main/sphinx/connector/redis.md
@@ -0,0 +1,316 @@
+# Redis connector
+
+```{raw} html
+<img src="../_static/img/redis.png" class="connector-logo">
+```
+
+The Redis connector allows querying of live data stored in [Redis](https://redis.io/). This can be
+used to join data between different systems like Redis and Hive.
+
+Each Redis key/value pair is presented as a single row in Trino. Rows can be
+broken down into cells by using table definition files.
+
+Currently, only Redis key of string and zset types are supported, only Redis value of
+string and hash types are supported.
+
+## Requirements
+
+Requirements for using the connector in a catalog to connect to a Redis data
+source are:
+
+- Redis 2.8.0 or higher (Redis Cluster is not supported)
+- Network access, by default on port 6379, from the Trino coordinator and
+  workers to Redis.
+
+## Configuration
+
+To configure the Redis connector, create a catalog properties file
+`etc/catalog/example.properties` with the following content, replacing the
+properties as appropriate:
+
+```text
+connector.name=redis
+redis.table-names=schema1.table1,schema1.table2
+redis.nodes=host:port
+```
+
+### Multiple Redis servers
+
+You can have as many catalogs as you need. If you have additional
+Redis servers, simply add another properties file to `etc/catalog`
+with a different name, making sure it ends in `.properties`.
+
+## Configuration properties
+
+The following configuration properties are available:
+
+| Property name                       | Description                                                                                       |
+| ----------------------------------- | ------------------------------------------------------------------------------------------------- |
+| `redis.table-names`                 | List of all tables provided by the catalog                                                        |
+| `redis.default-schema`              | Default schema name for tables                                                                    |
+| `redis.nodes`                       | Location of the Redis server                                                                      |
+| `redis.scan-count`                  | Redis parameter for scanning of the keys                                                          |
+| `redis.max-keys-per-fetch`          | Get values associated with the specified number of keys in the redis command such as MGET(key...) |
+| `redis.key-prefix-schema-table`     | Redis keys have schema-name:table-name prefix                                                     |
+| `redis.key-delimiter`               | Delimiter separating schema_name and table_name if redis.key-prefix-schema-table is used          |
+| `redis.table-description-dir`       | Directory containing table description files                                                      |
+| `redis.table-description-cache-ttl` | The cache time for table description files                                                        |
+| `redis.hide-internal-columns`       | Controls whether internal columns are part of the table schema or not                             |
+| `redis.database-index`              | Redis database index                                                                              |
+| `redis.user`                        | Redis server username                                                                             |
+| `redis.password`                    | Redis server password                                                                             |
+
+### `redis.table-names`
+
+Comma-separated list of all tables provided by this catalog. A table name
+can be unqualified (simple name) and is placed into the default schema
+(see below), or qualified with a schema name (`<schema-name>.<table-name>`).
+
+For each table defined, a table description file (see below) may
+exist. If no table description file exists, the
+table only contains internal columns (see below).
+
+This property is optional; the connector relies on the table description files
+specified in the `redis.table-description-dir` property.
+
+### `redis.default-schema`
+
+Defines the schema which will contain all tables that were defined without
+a qualifying schema name.
+
+This property is optional; the default is `default`.
+
+### `redis.nodes`
+
+The `hostname:port` pair for the Redis server.
+
+This property is required; there is no default.
+
+Redis Cluster is not supported.
+
+### `redis.scan-count`
+
+The internal COUNT parameter for the Redis SCAN command when connector is using
+SCAN to find keys for the data. This parameter can be used to tune performance
+of the Redis connector.
+
+This property is optional; the default is `100`.
+
+### `redis.max-keys-per-fetch`
+
+The internal number of keys for the Redis MGET command and Pipeline HGETALL command
+when connector is using these commands to find values of keys. This parameter can be
+used to tune performance of the Redis connector.
+
+This property is optional; the default is `100`.
+
+### `redis.key-prefix-schema-table`
+
+If true, only keys prefixed with the `schema-name:table-name` are scanned
+for a table, and all other keys are filtered out.  If false, all keys are
+scanned.
+
+This property is optional; the default is `false`.
+
+### `redis.key-delimiter`
+
+The character used for separating `schema-name` and `table-name` when
+`redis.key-prefix-schema-table` is `true`
+
+This property is optional; the default is `:`.
+
+### `redis.table-description-dir`
+
+References a folder within Trino deployment that holds one or more JSON
+files, which must end with `.json` and contain table description files.
+
+Note that the table description files will only be used by the Trino coordinator
+node.
+
+This property is optional; the default is `etc/redis`.
+
+### `redis.table-description-cache-ttl`
+
+The Redis connector dynamically loads the table description files after waiting
+for the time specified by this property. Therefore, there is no need to update
+the `redis.table-names` property and restart the Trino service when adding,
+updating, or deleting a file end with `.json` to `redis.table-description-dir`
+folder.
+
+This property is optional; the default is `5m`.
+
+### `redis.hide-internal-columns`
+
+In addition to the data columns defined in a table description file, the
+connector maintains a number of additional columns for each table. If
+these columns are hidden, they can still be used in queries, but they do not
+show up in `DESCRIBE <table-name>` or `SELECT *`.
+
+This property is optional; the default is `true`.
+
+### `redis.database-index`
+
+The Redis database to query.
+
+This property is optional; the default is `0`.
+
+### `redis.user`
+
+The username for Redis server.
+
+This property is optional; the default is `null`.
+
+### `redis.password`
+
+The password for password-protected Redis server.
+
+This property is optional; the default is `null`.
+
+## Internal columns
+
+For each defined table, the connector maintains the following columns:
+
+| Column name      | Type    | Description                                                                                                                                |
+| ---------------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| `_key`           | VARCHAR | Redis key.                                                                                                                                 |
+| `_value`         | VARCHAR | Redis value corresponding to the key.                                                                                                      |
+| `_key_length`    | BIGINT  | Number of bytes in the key.                                                                                                                |
+| `_value_length`  | BIGINT  | Number of bytes in the value.                                                                                                              |
+| `_key_corrupt`   | BOOLEAN | True if the decoder could not decode the key for this row. When true, data columns mapped from the key should be treated as invalid.       |
+| `_value_corrupt` | BOOLEAN | True if the decoder could not decode the message for this row. When true, data columns mapped from the value should be treated as invalid. |
+
+For tables without a table definition file, the `_key_corrupt` and
+`_value_corrupt` columns are `false`.
+
+## Table definition files
+
+With the Redis connector it is possible to further reduce Redis key/value pairs into
+granular cells, provided the key/value string follows a particular format. This process
+defines new columns that can be further queried from Trino.
+
+A table definition file consists of a JSON definition for a table. The
+name of the file can be arbitrary, but must end in `.json`.
+
+```text
+{
+    "tableName": ...,
+    "schemaName": ...,
+    "key": {
+        "dataFormat": ...,
+        "fields": [
+            ...
+        ]
+    },
+    "value": {
+        "dataFormat": ...,
+        "fields": [
+            ...
+       ]
+    }
+}
+```
+
+| Field        | Required | Type        | Description                                                                       |
+| ------------ | -------- | ----------- | --------------------------------------------------------------------------------- |
+| `tableName`  | required | string      | Trino table name defined by this file.                                            |
+| `schemaName` | optional | string      | Schema which will contain the table. If omitted, the default schema name is used. |
+| `key`        | optional | JSON object | Field definitions for data columns mapped to the value key.                       |
+| `value`      | optional | JSON object | Field definitions for data columns mapped to the value itself.                    |
+
+Please refer to the [Kafka connector](/connector/kafka) page for the description of the `dataFormat` as well as various available decoders.
+
+In addition to the above Kafka types, the Redis connector supports `hash` type for the `value` field which represent data stored in the Redis hash.
+
+```text
+{
+    "tableName": ...,
+    "schemaName": ...,
+    "value": {
+        "dataFormat": "hash",
+        "fields": [
+            ...
+       ]
+    }
+}
+```
+
+## Type mapping
+
+Because Trino and Redis each support types that the other does not, this
+connector {ref}`maps some types <type-mapping-overview>` when reading data. Type
+mapping depends on the RAW, CSV, JSON, and AVRO file formats.
+
+### Row decoding
+
+A decoder is used to map data to table columns.
+
+The connector contains the following decoders:
+
+- `raw`: Message is not interpreted; ranges of raw message bytes are mapped
+  to table columns.
+- `csv`: Message is interpreted as comma separated message, and fields are
+  mapped to table columns.
+- `json`: Message is parsed as JSON, and JSON fields are mapped to table
+  columns.
+- `avro`: Message is parsed based on an Avro schema, and Avro fields are
+  mapped to table columns.
+
+:::{note}
+If no table definition file exists for a table, the `dummy` decoder is
+used, which does not expose any columns.
+:::
+
+```{include} raw-decoder.fragment
+```
+
+```{include} csv-decoder.fragment
+```
+
+```{include} json-decoder.fragment
+```
+
+```{include} avro-decoder.fragment
+```
+
+(redis-sql-support)=
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements to access data and
+metadata in Redis.
+
+## Performance
+
+The connector includes a number of performance improvements, detailed in the
+following sections.
+
+(redis-pushdown)=
+
+### Pushdown
+
+```{include} pushdown-correctness-behavior.fragment
+```
+
+(redis-predicate-pushdown)=
+
+#### Predicate pushdown support
+
+The connector supports pushdown of keys of `string` type only, the `zset`
+type is not supported. Key pushdown is not supported when multiple key fields
+are defined in the table definition file.
+
+The connector supports pushdown of equality predicates, such as `IN` or `=`.
+Inequality predicates, such as `!=`, and range predicates, such as `>`,
+`<`, or `BETWEEN` are not pushed down.
+
+In the following example, the predicate of the first query is not pushed down
+since `>` is a range predicate. The other queries are pushed down:
+
+```sql
+-- Not pushed down
+SELECT * FROM nation WHERE redis_key > 'CANADA';
+-- Pushed down
+SELECT * FROM nation WHERE redis_key = 'CANADA';
+SELECT * FROM nation WHERE redis_key IN ('CANADA', 'POLAND');
+```
diff --git a/docs/src/main/sphinx/connector/redis.rst b/docs/src/main/sphinx/connector/redis.rst
deleted file mode 100644
index ccacc8ecd8b0..000000000000
--- a/docs/src/main/sphinx/connector/redis.rst
+++ /dev/null
@@ -1,312 +0,0 @@
-===============
-Redis connector
-===============
-
-.. raw:: html
-
-  <img src="../_static/img/redis.png" class="connector-logo">
-
-The Redis connector allows querying of live data stored in `Redis <https://redis.io/>`_. This can be
-used to join data between different systems like Redis and Hive.
-
-Each Redis key/value pair is presented as a single row in Trino. Rows can be
-broken down into cells by using table definition files.
-
-Currently, only Redis key of string and zset types are supported, only Redis value of
-string and hash types are supported.
-
-Requirements
-------------
-
-Requirements for using the connector in a catalog to connect to a Redis data
-source are:
-
-* Redis 2.8.0 or higher (Redis Cluster is not supported)
-* Network access, by default on port 6379, from the Trino coordinator and
-  workers to Redis.
-
-Configuration
--------------
-
-To configure the Redis connector, create a catalog properties file
-``etc/catalog/example.properties`` with the following content, replacing the
-properties as appropriate:
-
-.. code-block:: text
-
-    connector.name=redis
-    redis.table-names=schema1.table1,schema1.table2
-    redis.nodes=host:port
-
-Multiple Redis servers
-^^^^^^^^^^^^^^^^^^^^^^^
-
-You can have as many catalogs as you need. If you have additional
-Redis servers, simply add another properties file to ``etc/catalog``
-with a different name, making sure it ends in ``.properties``.
-
-Configuration properties
-------------------------
-
-The following configuration properties are available:
-
-======================================  ==============================================================
-Property name                           Description
-======================================  ==============================================================
-``redis.table-names``                   List of all tables provided by the catalog
-``redis.default-schema``                Default schema name for tables
-``redis.nodes``                         Location of the Redis server
-``redis.scan-count``                    Redis parameter for scanning of the keys
-``redis.max-keys-per-fetch``            Get values associated with the specified number of keys in the redis command such as MGET(key...)
-``redis.key-prefix-schema-table``       Redis keys have schema-name:table-name prefix
-``redis.key-delimiter``                 Delimiter separating schema_name and table_name if redis.key-prefix-schema-table is used
-``redis.table-description-dir``         Directory containing table description files
-``redis.table-description-cache-ttl``   The cache time for table description files
-``redis.hide-internal-columns``         Controls whether internal columns are part of the table schema or not
-``redis.database-index``                Redis database index
-``redis.user``                          Redis server username
-``redis.password``                      Redis server password
-======================================  ==============================================================
-
-``redis.table-names``
-^^^^^^^^^^^^^^^^^^^^^
-
-Comma-separated list of all tables provided by this catalog. A table name
-can be unqualified (simple name) and is placed into the default schema
-(see below), or qualified with a schema name (``<schema-name>.<table-name>``).
-
-For each table defined, a table description file (see below) may
-exist. If no table description file exists, the
-table only contains internal columns (see below).
-
-This property is optional; the connector relies on the table description files
-specified in the ``redis.table-description-dir`` property.
-
-``redis.default-schema``
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-Defines the schema which will contain all tables that were defined without
-a qualifying schema name.
-
-This property is optional; the default is ``default``.
-
-``redis.nodes``
-^^^^^^^^^^^^^^^
-
-The ``hostname:port`` pair for the Redis server.
-
-This property is required; there is no default.
-
-Redis Cluster is not supported.
-
-``redis.scan-count``
-^^^^^^^^^^^^^^^^^^^^
-
-The internal COUNT parameter for the Redis SCAN command when connector is using
-SCAN to find keys for the data. This parameter can be used to tune performance
-of the Redis connector.
-
-This property is optional; the default is ``100``.
-
-``redis.max-keys-per-fetch``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The internal number of keys for the Redis MGET command and Pipeline HGETALL command
-when connector is using these commands to find values of keys. This parameter can be
-used to tune performance of the Redis connector.
-
-This property is optional; the default is ``100``.
-
-``redis.key-prefix-schema-table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If true, only keys prefixed with the ``schema-name:table-name`` are scanned
-for a table, and all other keys are filtered out.  If false, all keys are
-scanned.
-
-This property is optional; the default is ``false``.
-
-``redis.key-delimiter``
-^^^^^^^^^^^^^^^^^^^^^^^
-
-The character used for separating ``schema-name`` and ``table-name`` when
-``redis.key-prefix-schema-table`` is ``true``
-
-This property is optional; the default is ``:``.
-
-``redis.table-description-dir``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-References a folder within Trino deployment that holds one or more JSON
-files, which must end with ``.json`` and contain table description files.
-
-Note that the table description files will only be used by the Trino coordinator
-node.
-
-This property is optional; the default is ``etc/redis``.
-
-``redis.table-description-cache-ttl``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The Redis connector dynamically loads the table description files after waiting
-for the time specified by this property. Therefore, there is no need to update
-the ``redis.table-names`` property and restart the Trino service when adding,
-updating, or deleting a file end with ``.json`` to ``redis.table-description-dir``
-folder.
-
-This property is optional; the default is ``5m``.
-
-``redis.hide-internal-columns``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In addition to the data columns defined in a table description file, the
-connector maintains a number of additional columns for each table. If
-these columns are hidden, they can still be used in queries, but they do not
-show up in ``DESCRIBE <table-name>`` or ``SELECT *``.
-
-This property is optional; the default is ``true``.
-
-``redis.database-index``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The Redis database to query.
-
-This property is optional; the default is ``0``.
-
-``redis.user``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The username for Redis server.
-
-This property is optional; the default is ``null``.
-
-
-``redis.password``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The password for password-protected Redis server.
-
-This property is optional; the default is ``null``.
-
-
-Internal columns
-----------------
-
-For each defined table, the connector maintains the following columns:
-
-======================= ========= =============================
-Column name             Type      Description
-======================= ========= =============================
-``_key``                VARCHAR   Redis key.
-``_value``              VARCHAR   Redis value corresponding to the key.
-``_key_length``         BIGINT    Number of bytes in the key.
-``_value_length``       BIGINT    Number of bytes in the value.
-``_key_corrupt``        BOOLEAN   True if the decoder could not decode the key for this row. When true, data columns mapped from the key should be treated as invalid.
-``_value_corrupt``      BOOLEAN   True if the decoder could not decode the message for this row. When true, data columns mapped from the value should be treated as invalid.
-======================= ========= =============================
-
-For tables without a table definition file, the ``_key_corrupt`` and
-``_value_corrupt`` columns are ``false``.
-
-Table definition files
-----------------------
-
-With the Redis connector it is possible to further reduce Redis key/value pairs into
-granular cells, provided the key/value string follows a particular format. This process
-defines new columns that can be further queried from Trino.
-
-A table definition file consists of a JSON definition for a table. The
-name of the file can be arbitrary, but must end in ``.json``.
-
-.. code-block:: text
-
-    {
-        "tableName": ...,
-        "schemaName": ...,
-        "key": {
-            "dataFormat": ...,
-            "fields": [
-                ...
-            ]
-        },
-        "value": {
-            "dataFormat": ...,
-            "fields": [
-                ...
-           ]
-        }
-    }
-
-=============== ========= ============== =============================
-Field           Required  Type           Description
-=============== ========= ============== =============================
-``tableName``   required  string         Trino table name defined by this file.
-``schemaName``  optional  string         Schema which will contain the table. If omitted, the default schema name is used.
-``key``         optional  JSON object    Field definitions for data columns mapped to the value key.
-``value``       optional  JSON object    Field definitions for data columns mapped to the value itself.
-=============== ========= ============== =============================
-
-Please refer to the `Kafka connector`_ page for the description of the ``dataFormat`` as well as various available decoders.
-
-In addition to the above Kafka types, the Redis connector supports ``hash`` type for the ``value`` field which represent data stored in the Redis hash.
-
-.. code-block:: text
-
-    {
-        "tableName": ...,
-        "schemaName": ...,
-        "value": {
-            "dataFormat": "hash",
-            "fields": [
-                ...
-           ]
-        }
-    }
-
-.. _Kafka connector: ./kafka.html
-
-.. _redis-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access data and
-metadata in Redis.
-
-Performance
------------
-
-The connector includes a number of performance improvements, detailed in the
-following sections.
-
-.. _redis-pushdown:
-
-Pushdown
-^^^^^^^^
-
-.. include:: pushdown-correctness-behavior.fragment
-
-.. _redis-predicate-pushdown:
-
-Predicate pushdown support
-""""""""""""""""""""""""""
-
-The connector supports pushdown of keys of ``string`` type only, the ``zset``
-type is not supported. Key pushdown is not supported when multiple key fields
-are defined in the table definition file.
-
-The connector supports pushdown of equality predicates, such as ``IN`` or ``=``.
-Inequality predicates, such as ``!=``, and range predicates, such as ``>``,
-``<``, or ``BETWEEN`` are not pushed down.
-
-In the following example, the predicate of the first query is not pushed down
-since ``>`` is a range predicate. The other queries are pushed down:
-
-.. code-block:: sql
-
-    -- Not pushed down
-    SELECT * FROM nation WHERE redis_key > 'CANADA';
-    -- Pushed down
-    SELECT * FROM nation WHERE redis_key = 'CANADA';
-    SELECT * FROM nation WHERE redis_key IN ('CANADA', 'POLAND');
diff --git a/docs/src/main/sphinx/connector/redshift.md b/docs/src/main/sphinx/connector/redshift.md
new file mode 100644
index 000000000000..84d9a14055e2
--- /dev/null
+++ b/docs/src/main/sphinx/connector/redshift.md
@@ -0,0 +1,210 @@
+---
+myst:
+  substitutions:
+    default_domain_compaction_threshold: '`32`'
+---
+
+# Redshift connector
+
+```{raw} html
+<img src="../_static/img/redshift.png" class="connector-logo">
+```
+
+The Redshift connector allows querying and creating tables in an
+external [Amazon Redshift](https://aws.amazon.com/redshift/) cluster. This can be used to join data between
+different systems like Redshift and Hive, or between two different
+Redshift clusters.
+
+## Requirements
+
+To connect to Redshift, you need:
+
+- Network access from the Trino coordinator and workers to Redshift.
+  Port 5439 is the default port.
+
+## Configuration
+
+To configure the Redshift connector, create a catalog properties file in
+`etc/catalog` named, for example, `example.properties`, to mount the
+Redshift connector as the `example` catalog. Create the file with the
+following contents, replacing the connection properties as appropriate for your
+setup:
+
+```text
+connector.name=redshift
+connection-url=jdbc:redshift://example.net:5439/database
+connection-user=root
+connection-password=secret
+```
+
+The `connection-user` and `connection-password` are typically required and
+determine the user credentials for the connection, often a service user. You can
+use {doc}`secrets </security/secrets>` to avoid actual values in the catalog
+properties files.
+
+(redshift-tls)=
+
+### Connection security
+
+If you have TLS configured with a globally-trusted certificate installed on your
+data source, you can enable TLS between your cluster and the data
+source by appending a parameter to the JDBC connection string set in the
+`connection-url` catalog configuration property.
+
+For example, on version 2.1 of the Redshift JDBC driver, TLS/SSL is enabled by
+default with the `SSL` parameter. You can disable or further configure TLS
+by appending parameters to the `connection-url` configuration property:
+
+```properties
+connection-url=jdbc:redshift://example.net:5439/database;SSL=TRUE;
+```
+
+For more information on TLS configuration options, see the [Redshift JDBC driver
+documentation](https://docs.aws.amazon.com/redshift/latest/mgmt/jdbc20-configuration-options.html#jdbc20-ssl-option).
+
+```{include} jdbc-authentication.fragment
+```
+
+### Multiple Redshift databases or clusters
+
+The Redshift connector can only access a single database within
+a Redshift cluster. Thus, if you have multiple Redshift databases,
+or want to connect to multiple Redshift clusters, you must configure
+multiple instances of the Redshift connector.
+
+To add another catalog, simply add another properties file to `etc/catalog`
+with a different name, making sure it ends in `.properties`. For example,
+if you name the property file `sales.properties`, Trino creates a
+catalog named `sales` using the configured connector.
+
+```{include} jdbc-common-configurations.fragment
+```
+
+```{include} query-comment-format.fragment
+```
+
+```{include} jdbc-domain-compaction-threshold.fragment
+```
+
+```{include} jdbc-procedures.fragment
+```
+
+```{include} jdbc-case-insensitive-matching.fragment
+```
+
+```{include} non-transactional-insert.fragment
+```
+
+## Querying Redshift
+
+The Redshift connector provides a schema for every Redshift schema.
+You can see the available Redshift schemas by running `SHOW SCHEMAS`:
+
+```
+SHOW SCHEMAS FROM example;
+```
+
+If you have a Redshift schema named `web`, you can view the tables
+in this schema by running `SHOW TABLES`:
+
+```
+SHOW TABLES FROM example.web;
+```
+
+You can see a list of the columns in the `clicks` table in the `web` database
+using either of the following:
+
+```
+DESCRIBE example.web.clicks;
+SHOW COLUMNS FROM example.web.clicks;
+```
+
+Finally, you can access the `clicks` table in the `web` schema:
+
+```
+SELECT * FROM example.web.clicks;
+```
+
+If you used a different name for your catalog properties file, use that catalog
+name instead of `example` in the above examples.
+
+(redshift-type-mapping)=
+
+## Type mapping
+
+```{include} jdbc-type-mapping.fragment
+```
+
+(redshift-sql-support)=
+
+## SQL support
+
+The connector provides read access and write access to data and metadata in
+Redshift. In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/update`
+- {doc}`/sql/delete`
+- {doc}`/sql/truncate`
+- {ref}`sql-schema-table-management`
+
+```{include} sql-update-limitation.fragment
+```
+
+```{include} sql-delete-limitation.fragment
+```
+
+```{include} alter-table-limitation.fragment
+```
+
+```{include} alter-schema-limitation.fragment
+```
+
+(redshift-fte-support)=
+
+## Fault-tolerant execution support
+
+The connector supports {doc}`/admin/fault-tolerant-execution` of query
+processing. Read and write operations are both supported with any retry policy.
+
+## Table functions
+
+The connector provides specific {doc}`table functions </functions/table>` to
+access Redshift.
+
+(redshift-query-function)=
+
+### `query(varchar) -> table`
+
+The `query` function allows you to query the underlying database directly. It
+requires syntax native to Redshift, because the full query is pushed down and
+processed in Redshift. This can be useful for accessing native features which
+are not implemented in Trino or for improving query performance in situations
+where running a query natively may be faster.
+
+```{include} query-passthrough-warning.fragment
+```
+
+For example, query the `example` catalog and select the top 10 nations by
+population:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    example.system.query(
+      query => 'SELECT
+        TOP 10 *
+      FROM
+        tpch.nation
+      ORDER BY
+        population DESC'
+    )
+  );
+```
+
+```{include} query-table-function-ordering.fragment
+```
diff --git a/docs/src/main/sphinx/connector/redshift.rst b/docs/src/main/sphinx/connector/redshift.rst
deleted file mode 100644
index f45604cae33b..000000000000
--- a/docs/src/main/sphinx/connector/redshift.rst
+++ /dev/null
@@ -1,180 +0,0 @@
-==================
-Redshift connector
-==================
-
-.. raw:: html
-
-  <img src="../_static/img/redshift.png" class="connector-logo">
-
-The Redshift connector allows querying and creating tables in an
-external `Amazon Redshift <https://aws.amazon.com/redshift/>`_ cluster. This can be used to join data between
-different systems like Redshift and Hive, or between two different
-Redshift clusters.
-
-Requirements
-------------
-
-To connect to Redshift, you need:
-
-* Network access from the Trino coordinator and workers to Redshift.
-  Port 5439 is the default port.
-
-Configuration
--------------
-
-To configure the Redshift connector, create a catalog properties file in
-``etc/catalog`` named, for example, ``example.properties``, to mount the
-Redshift connector as the ``example`` catalog. Create the file with the
-following contents, replacing the connection properties as appropriate for your
-setup:
-
-.. code-block:: text
-
-    connector.name=redshift
-    connection-url=jdbc:redshift://example.net:5439/database
-    connection-user=root
-    connection-password=secret
-
-The ``connection-user`` and ``connection-password`` are typically required and
-determine the user credentials for the connection, often a service user. You can
-use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
-properties files.
-
-.. _redshift-tls:
-
-Connection security
-^^^^^^^^^^^^^^^^^^^
-
-If you have TLS configured with a globally-trusted certificate installed on your
-data source, you can enable TLS between your cluster and the data
-source by appending a parameter to the JDBC connection string set in the
-``connection-url`` catalog configuration property.
-
-For example, on version 2.1 of the Redshift JDBC driver, TLS/SSL is enabled by
-default with the ``SSL`` parameter. You can disable or further configure TLS
-by appending parameters to the ``connection-url`` configuration property:
-
-.. code-block:: properties
-
-  connection-url=jdbc:redshift://example.net:5439/database;SSL=TRUE;
-
-For more information on TLS configuration options, see the `Redshift JDBC driver
-documentation
-<https://docs.aws.amazon.com/redshift/latest/mgmt/jdbc20-configuration-options.html#jdbc20-ssl-option>`_.
-
-.. include:: jdbc-authentication.fragment
-
-Multiple Redshift databases or clusters
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The Redshift connector can only access a single database within
-a Redshift cluster. Thus, if you have multiple Redshift databases,
-or want to connect to multiple Redshift clusters, you must configure
-multiple instances of the Redshift connector.
-
-To add another catalog, simply add another properties file to ``etc/catalog``
-with a different name, making sure it ends in ``.properties``. For example,
-if you name the property file ``sales.properties``, Trino creates a
-catalog named ``sales`` using the configured connector.
-
-.. include:: jdbc-common-configurations.fragment
-
-.. |default_domain_compaction_threshold| replace:: ``32``
-.. include:: jdbc-domain-compaction-threshold.fragment
-
-.. include:: jdbc-procedures.fragment
-
-.. include:: jdbc-case-insensitive-matching.fragment
-
-.. include:: non-transactional-insert.fragment
-
-Querying Redshift
------------------
-
-The Redshift connector provides a schema for every Redshift schema.
-You can see the available Redshift schemas by running ``SHOW SCHEMAS``::
-
-    SHOW SCHEMAS FROM example;
-
-If you have a Redshift schema named ``web``, you can view the tables
-in this schema by running ``SHOW TABLES``::
-
-    SHOW TABLES FROM example.web;
-
-You can see a list of the columns in the ``clicks`` table in the ``web`` database
-using either of the following::
-
-    DESCRIBE example.web.clicks;
-    SHOW COLUMNS FROM example.web.clicks;
-
-Finally, you can access the ``clicks`` table in the ``web`` schema::
-
-    SELECT * FROM example.web.clicks;
-
-If you used a different name for your catalog properties file, use that catalog
-name instead of ``example`` in the above examples.
-
-.. _redshift-type-mapping:
-
-Type mapping
-------------
-
-.. include:: jdbc-type-mapping.fragment
-
-.. _redshift-sql-support:
-
-SQL support
------------
-
-The connector provides read access and write access to data and metadata in
-Redshift. In addition to the :ref:`globally available
-<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
-statements, the connector supports the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/delete`
-* :doc:`/sql/truncate`
-* :ref:`sql-schema-table-management`
-
-.. include:: sql-delete-limitation.fragment
-
-.. include:: alter-table-limitation.fragment
-
-.. include:: alter-schema-limitation.fragment
-
-Table functions
----------------
-
-The connector provides specific :doc:`table functions </functions/table>` to
-access Redshift.
-
-.. _redshift-query-function:
-
-``query(varchar) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``query`` function allows you to query the underlying database directly. It
-requires syntax native to Redshift, because the full query is pushed down and
-processed in Redshift. This can be useful for accessing native features which
-are not implemented in Trino or for improving query performance in situations
-where running a query natively may be faster.
-
-.. include:: polymorphic-table-function-ordering.fragment
-
-For example, query the ``example`` catalog and select the top 10 nations by
-population::
-
-    SELECT
-      *
-    FROM
-      TABLE(
-        example.system.query(
-          query => 'SELECT
-            TOP 10 *
-          FROM
-            tpch.nation
-          ORDER BY
-            population DESC'
-        )
-      );
-
diff --git a/docs/src/main/sphinx/connector/singlestore.md b/docs/src/main/sphinx/connector/singlestore.md
new file mode 100644
index 000000000000..b3512d9f094e
--- /dev/null
+++ b/docs/src/main/sphinx/connector/singlestore.md
@@ -0,0 +1,369 @@
+---
+myst:
+  substitutions:
+    default_domain_compaction_threshold: '`32`'
+---
+
+# SingleStore connector
+
+```{raw} html
+<img src="../_static/img/singlestore.png" class="connector-logo">
+```
+
+The SingleStore (formerly known as MemSQL) connector allows querying and
+creating tables in an external SingleStore database.
+
+## Requirements
+
+To connect to SingleStore, you need:
+
+- SingleStore version 7.1.4 or higher.
+- Network access from the Trino coordinator and workers to SingleStore. Port
+  3306 is the default port.
+
+(singlestore-configuration)=
+
+## Configuration
+
+To configure the SingleStore connector, create a catalog properties file in
+`etc/catalog` named, for example, `example.properties`, to mount the
+SingleStore connector as the `example` catalog. Create the file with the
+following contents, replacing the connection properties as appropriate for your
+setup:
+
+```text
+connector.name=singlestore
+connection-url=jdbc:singlestore://example.net:3306
+connection-user=root
+connection-password=secret
+```
+
+The `connection-url` defines the connection information and parameters to pass
+to the SingleStore JDBC driver. The supported parameters for the URL are
+available in the [SingleStore JDBC driver documentation](https://docs.singlestore.com/db/v7.6/en/developer-resources/connect-with-application-development-tools/connect-with-java-jdbc/the-singlestore-jdbc-driver.html#connection-string-parameters).
+
+The `connection-user` and `connection-password` are typically required and
+determine the user credentials for the connection, often a service user. You can
+use {doc}`secrets </security/secrets>` to avoid actual values in the catalog
+properties files.
+
+(singlestore-tls)=
+
+### Connection security
+
+If you have TLS configured with a globally-trusted certificate installed on your
+data source, you can enable TLS between your cluster and the data
+source by appending a parameter to the JDBC connection string set in the
+`connection-url` catalog configuration property.
+
+Enable TLS between your cluster and SingleStore by appending the `useSsl=true`
+parameter to the `connection-url` configuration property:
+
+```properties
+connection-url=jdbc:singlestore://example.net:3306/?useSsl=true
+```
+
+For more information on TLS configuration options, see the [JDBC driver
+documentation](https://docs.singlestore.com/db/v7.6/en/developer-resources/connect-with-application-development-tools/connect-with-java-jdbc/the-singlestore-jdbc-driver.html#tls-parameters).
+
+### Multiple SingleStore servers
+
+You can have as many catalogs as you need, so if you have additional
+SingleStore servers, simply add another properties file to `etc/catalog`
+with a different name (making sure it ends in `.properties`). For
+example, if you name the property file `sales.properties`, Trino
+will create a catalog named `sales` using the configured connector.
+
+```{include} jdbc-common-configurations.fragment
+```
+
+```{include} query-comment-format.fragment
+```
+
+```{include} jdbc-domain-compaction-threshold.fragment
+```
+
+```{include} jdbc-procedures.fragment
+```
+
+```{include} jdbc-case-insensitive-matching.fragment
+```
+
+```{include} non-transactional-insert.fragment
+```
+
+## Querying SingleStore
+
+The SingleStore connector provides a schema for every SingleStore *database*.
+You can see the available SingleStore databases by running `SHOW SCHEMAS`:
+
+```
+SHOW SCHEMAS FROM example;
+```
+
+If you have a SingleStore database named `web`, you can view the tables
+in this database by running `SHOW TABLES`:
+
+```
+SHOW TABLES FROM example.web;
+```
+
+You can see a list of the columns in the `clicks` table in the `web`
+database using either of the following:
+
+```
+DESCRIBE example.web.clicks;
+SHOW COLUMNS FROM example.web.clicks;
+```
+
+Finally, you can access the `clicks` table in the `web` database:
+
+```
+SELECT * FROM example.web.clicks;
+```
+
+If you used a different name for your catalog properties file, use
+that catalog name instead of `example` in the above examples.
+
+(singlestore-type-mapping)=
+
+## Type mapping
+
+Because Trino and Singlestore each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+### Singlestore to Trino type mapping
+
+The connector maps Singlestore types to the corresponding Trino types following
+this table:
+
+```{eval-rst}
+.. list-table:: Singlestore to Trino type mapping
+  :widths: 30, 20, 50
+  :header-rows: 1
+
+  * - Singlestore type
+    - Trino type
+    - Notes
+  * - ``BIT``
+    - ``BOOLEAN``
+    -
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+    -
+  * - ``TINYINT``
+    - ``TINYINT``
+    -
+  * - ``TINYINT UNSIGNED``
+    - ``SMALLINT``
+    -
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``SMALLINT UNSIGNED``
+    - ``INTEGER``
+    -
+  * - ``INTEGER``
+    - ``INTEGER``
+    -
+  * - ``INTEGER UNSIGNED``
+    - ``BIGINT``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``BIGINT UNSIGNED``
+    - ``DECIMAL(20, 0)``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``REAL``
+    - ``DOUBLE``
+    -
+  * - ``DECIMAL(p, s)``
+    - ``DECIMAL(p, s)``
+    - See :ref:`Singlestore DECIMAL type handling <singlestore-decimal-handling>`
+  * - ``CHAR(n)``
+    - ``CHAR(n)``
+    -
+  * - ``TINYTEXT``
+    - ``VARCHAR(255)``
+    -
+  * - ``TEXT``
+    - ``VARCHAR(65535)``
+    -
+  * - ``MEDIUMTEXT``
+    - ``VARCHAR(16777215)``
+    -
+  * - ``LONGTEXT``
+    - ``VARCHAR``
+    -
+  * - ``VARCHAR(n)``
+    - ``VARCHAR(n)``
+    -
+  * - ``LONGBLOB``
+    - ``VARBINARY``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME``
+    - ``TIME(0)``
+    -
+  * - ``TIME(6)``
+    - ``TIME(6)``
+    -
+  * - ``DATETIME``
+    - ``TIMESTAMP(0)``
+    -
+  * - ``DATETIME(6)``
+    - ``TIMESTAMP(6)``
+    -
+  * - ``JSON``
+    - ``JSON``
+    -
+```
+
+No other types are supported.
+
+### Trino to Singlestore type mapping
+
+The connector maps Trino types to the corresponding Singlestore types following
+this table:
+
+```{eval-rst}
+.. list-table:: Trino to Singlestore type mapping
+  :widths: 30, 20, 50
+  :header-rows: 1
+
+  * - Trino type
+    - Singlestore type
+    - Notes
+  * - ``BOOLEAN``
+    - ``BOOLEAN``
+    -
+  * - ``TINYINT``
+    - ``TINYINT``
+    -
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``INTEGER``
+    - ``INTEGER``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE``
+    -
+  * - ``REAL``
+    - ``FLOAT``
+    -
+  * - ``DECIMAL(p, s)``
+    - ``DECIMAL(p, s)``
+    - See :ref:`Singlestore DECIMAL type handling <singlestore-decimal-handling>`
+  * - ``CHAR(n)``
+    - ``CHAR(n)``
+    -
+  * - ``VARCHAR(65535)``
+    - ``TEXT``
+    -
+  * - ``VARCHAR(16777215)``
+    - ``MEDIUMTEXT``
+    -
+  * - ``VARCHAR``
+    - ``LONGTEXT``
+    -
+  * - ``VARCHAR(n)``
+    - ``VARCHAR(n)``
+    -
+  * - ``VARBINARY``
+    - ``LONGBLOB``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME(0)``
+    - ``TIME``
+    -
+  * - ``TIME(6)``
+    - ``TIME(6)``
+    -
+  * - ``TIMESTAMP(0)``
+    - ``DATETIME``
+    -
+  * - ``TIMESTAMP(6)``
+    - ``DATETIME(6)``
+    -
+  * - ``JSON``
+    - ``JSON``
+    -
+```
+
+No other types are supported.
+
+(singlestore-decimal-handling)=
+
+```{include} decimal-type-handling.fragment
+```
+
+```{include} jdbc-type-mapping.fragment
+```
+
+(singlestore-sql-support)=
+
+## SQL support
+
+The connector provides read access and write access to data and metadata in
+a SingleStore database.  In addition to the {ref}`globally available
+<sql-globally-available>` and {ref}`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/update`
+- {doc}`/sql/delete`
+- {doc}`/sql/truncate`
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/alter-table`
+- {doc}`/sql/create-schema`
+- {doc}`/sql/drop-schema`
+
+```{include} sql-update-limitation.fragment
+```
+
+```{include} sql-delete-limitation.fragment
+```
+
+```{include} alter-table-limitation.fragment
+```
+
+## Performance
+
+The connector includes a number of performance improvements, detailed in the
+following sections.
+
+(singlestore-pushdown)=
+
+### Pushdown
+
+The connector supports pushdown for a number of operations:
+
+- {ref}`join-pushdown`
+- {ref}`limit-pushdown`
+- {ref}`topn-pushdown`
+
+```{include} pushdown-correctness-behavior.fragment
+```
+
+```{include} join-pushdown-enabled-false.fragment
+```
+
+```{include} no-pushdown-text-type.fragment
+```
diff --git a/docs/src/main/sphinx/connector/snowflake.rst b/docs/src/main/sphinx/connector/snowflake.rst
new file mode 100644
index 000000000000..fc9462ff37c7
--- /dev/null
+++ b/docs/src/main/sphinx/connector/snowflake.rst
@@ -0,0 +1,107 @@
+===================
+Snowflake connector
+===================
+
+.. raw:: html
+
+  <img src="../_static/img/snowflake.png" class="connector-logo">
+
+The Snowflake connector allows querying and creating tables in an
+external `Snowflake <https://www.snowflake.com/>`_ account. This can be used to join data between
+different systems like Snowflake and Hive, or between two different
+Snowflake accounts.
+
+Configuration
+-------------
+
+To configure the Snowflake connector, create a catalog properties file
+in ``etc/catalog`` named, for example, ``example.properties``, to
+mount the Snowflake connector as the ``snowflake`` catalog.
+Create the file with the following contents, replacing the
+connection properties as appropriate for your setup:
+
+.. code-block:: none
+
+    connector.name=snowflake
+    connection-url=jdbc:snowflake://<account>.snowflakecomputing.com
+    connection-user=root
+    connection-password=secret
+    snowflake.account=account
+    snowflake.database=database
+    snowflake.role=role
+    snowflake.warehouse=warehouse
+
+Arrow serialization support
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This is an experimental feature which introduces support for using Apache Arrow
+as the serialization format when reading from Snowflake.  Please note there are
+a few caveats:
+
+* Using Apache Arrow serialization is disabled by default. In order to enable
+  it,  add ``--add-opens=java.base/java.nio=ALL-UNNAMED`` to the Trino
+  :ref:`jvm-config`.
+
+
+Multiple Snowflake databases or accounts
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The Snowflake connector can only access a single database within
+a Snowflake account. Thus, if you have multiple Snowflake databases,
+or want to connect to multiple Snowflake accounts, you must configure
+multiple instances of the Snowflake connector.
+
+.. snowflake-type-mapping:
+
+Type mapping
+------------
+
+Trino supports the following Snowflake data types:
+
+==================================  ===============================
+Snowflake Type                      Trino Type
+==================================  ===============================
+``boolean``                         ``boolean``
+``tinyint``                         ``bigint``
+``smallint``                        ``bigint``
+``byteint``                         ``bigint``
+``int``                             ``bigint``
+``integer``                         ``bigint``
+``bigint``                          ``bigint``
+``float``                           ``real``
+``real``                            ``real``
+``double``                          ``double``
+``decimal``                         ``decimal(P,S)``
+``varchar(n)``                      ``varchar(n)``
+``char(n)``                         ``varchar(n)``
+``binary(n)``                       ``varbinary``
+``varbinary``                       ``varbinary``
+``date``                            ``date``
+``time``                            ``time``
+``timestampntz``                    ``timestamp``
+``timestamptz``                     ``timestampTZ``
+``timestampltz``                    ``timestampTZ``
+==================================  ===============================
+
+Complete list of `Snowflake data types
+<https://docs.snowflake.com/en/sql-reference/intro-summary-data-types.html>`_.
+
+.. _snowflake-sql-support:
+
+SQL support
+-----------
+
+The connector provides read access and write access to data and metadata in
+a Snowflake database.  In addition to the :ref:`globally available
+<sql-globally-available>` and :ref:`read operation <sql-read-operations>`
+statements, the connector supports the following features:
+
+* :doc:`/sql/insert`
+* :doc:`/sql/delete`
+* :doc:`/sql/truncate`
+* :doc:`/sql/create-table`
+* :doc:`/sql/create-table-as`
+* :doc:`/sql/drop-table`
+* :doc:`/sql/alter-table`
+* :doc:`/sql/create-schema`
+* :doc:`/sql/drop-schema`
diff --git a/docs/src/main/sphinx/connector/sql-delete-limitation.fragment b/docs/src/main/sphinx/connector/sql-delete-limitation.fragment
index 3d34446ee6f3..5c3a201ca369 100644
--- a/docs/src/main/sphinx/connector/sql-delete-limitation.fragment
+++ b/docs/src/main/sphinx/connector/sql-delete-limitation.fragment
@@ -1,5 +1,4 @@
-SQL DELETE
-^^^^^^^^^^
+### SQL DELETE
 
 If a ``WHERE`` clause is specified, the ``DELETE`` operation only works if the
 predicate in the clause can be fully pushed down to the data source.
diff --git a/docs/src/main/sphinx/connector/sql-update-limitation.fragment b/docs/src/main/sphinx/connector/sql-update-limitation.fragment
new file mode 100644
index 000000000000..a929d56325d3
--- /dev/null
+++ b/docs/src/main/sphinx/connector/sql-update-limitation.fragment
@@ -0,0 +1,33 @@
+### UPDATE
+
+Only `UPDATE` statements with constant assignments and predicates are
+supported. For example, the following statement is supported because the values
+assigned are constants:
+
+```sql
+UPDATE table SET col1 = 1 WHERE col3 = 1
+```
+
+Arithmetic expressions, function calls, and other non-constant `UPDATE`
+statements are not supported. For example, the following statement is not
+supported because arithmetic expressions cannot be used with the `SET`
+command:
+
+```sql
+UPDATE table SET col1 = col2 + 2 WHERE col3 = 1
+```
+
+The `=`, `!=`, `>`, `<`, `>=`, `<=`, `IN`, `NOT IN` operators are supported in
+predicates. The following statement is not supported because the `AND` operator
+cannot be used in predicates:
+
+```sql
+UPDATE table SET col1 = 1 WHERE col3 = 1 AND col2 = 3
+```
+
+All column values of a table row cannot be updated simultaneously. For a three
+column table, the following statement is not supported:
+
+```sql
+UPDATE table SET col1 = 1, col2 = 2, col3 = 3 WHERE col3 = 1
+```
diff --git a/docs/src/main/sphinx/connector/sqlserver.md b/docs/src/main/sphinx/connector/sqlserver.md
new file mode 100644
index 000000000000..592141a76e0f
--- /dev/null
+++ b/docs/src/main/sphinx/connector/sqlserver.md
@@ -0,0 +1,581 @@
+---
+myst:
+  substitutions:
+    default_domain_compaction_threshold: '`32`'
+---
+
+# SQL Server connector
+
+```{raw} html
+<img src="../_static/img/sqlserver.png" class="connector-logo">
+```
+
+The SQL Server connector allows querying and creating tables in an external
+[Microsoft SQL Server](https://www.microsoft.com/sql-server/) database. This
+can be used to join data between different systems like SQL Server and Hive, or
+between two different SQL Server instances.
+
+## Requirements
+
+To connect to SQL Server, you need:
+
+- SQL Server 2012 or higher, or Azure SQL Database.
+- Network access from the Trino coordinator and workers to SQL Server.
+  Port 1433 is the default port.
+
+## Configuration
+
+The connector can query a single database on a given SQL Server instance. Create
+a catalog properties file that specifies the SQL server connector by setting the
+`connector.name` to `sqlserver`.
+
+For example, to access a database as `example`, create the file
+`etc/catalog/example.properties`. Replace the connection properties as
+appropriate for your setup:
+
+```properties
+connector.name=sqlserver
+connection-url=jdbc:sqlserver://<host>:<port>;databaseName=<databaseName>;encrypt=false
+connection-user=root
+connection-password=secret
+```
+
+The `connection-url` defines the connection information and parameters to pass
+to the SQL Server JDBC driver. The supported parameters for the URL are
+available in the [SQL Server JDBC driver documentation](https://docs.microsoft.com/sql/connect/jdbc/building-the-connection-url).
+
+The `connection-user` and `connection-password` are typically required and
+determine the user credentials for the connection, often a service user. You can
+use {doc}`secrets </security/secrets>` to avoid actual values in the catalog
+properties files.
+
+(sqlserver-tls)=
+
+### Connection security
+
+The JDBC driver, and therefore the connector, automatically use Transport Layer
+Security (TLS) encryption and certificate validation. This requires a suitable
+TLS certificate configured on your SQL Server database host.
+
+If you do not have the necessary configuration established, you can disable
+encryption in the connection string with the `encrypt` property:
+
+```properties
+connection-url=jdbc:sqlserver://<host>:<port>;databaseName=<databaseName>;encrypt=false
+```
+
+Further parameters like `trustServerCertificate`, `hostNameInCertificate`,
+`trustStore`, and `trustStorePassword` are details in the [TLS section of
+SQL Server JDBC driver documentation](https://docs.microsoft.com/sql/connect/jdbc/using-ssl-encryption).
+
+```{include} jdbc-authentication.fragment
+```
+
+### Multiple SQL Server databases or servers
+
+The SQL Server connector can only access a single SQL Server database
+within a single catalog. Thus, if you have multiple SQL Server databases,
+or want to connect to multiple SQL Server instances, you must configure
+multiple instances of the SQL Server connector.
+
+To add another catalog, simply add another properties file to `etc/catalog`
+with a different name, making sure it ends in `.properties`. For example,
+if you name the property file `sales.properties`, Trino creates a
+catalog named `sales` using the configured connector.
+
+```{include} jdbc-common-configurations.fragment
+```
+
+```{include} query-comment-format.fragment
+```
+
+```{include} jdbc-domain-compaction-threshold.fragment
+```
+
+### Specific configuration properties
+
+The SQL Server connector supports additional catalog properties to configure the
+behavior of the connector and the issues queries to the database.
+
+```{eval-rst}
+.. list-table::
+  :widths: 45, 55
+  :header-rows: 1
+
+  * - Property name
+    - Description
+  * - ``sqlserver.snapshot-isolation.disabled``
+    - Control the automatic use of snapshot isolation for transactions issued by
+      Trino in SQL Server. Defaults to ``false``, which means that snapshot
+      isolation is enabled.
+```
+
+```{include} jdbc-procedures.fragment
+```
+
+```{include} jdbc-case-insensitive-matching.fragment
+```
+
+```{include} non-transactional-insert.fragment
+```
+
+## Querying SQL Server
+
+The SQL Server connector provides access to all schemas visible to the specified
+user in the configured database. For the following examples, assume the SQL
+Server catalog is `example`.
+
+You can see the available schemas by running `SHOW SCHEMAS`:
+
+```
+SHOW SCHEMAS FROM example;
+```
+
+If you have a schema named `web`, you can view the tables
+in this schema by running `SHOW TABLES`:
+
+```
+SHOW TABLES FROM example.web;
+```
+
+You can see a list of the columns in the `clicks` table in the `web` database
+using either of the following:
+
+```
+DESCRIBE example.web.clicks;
+SHOW COLUMNS FROM example.web.clicks;
+```
+
+Finally, you can query the `clicks` table in the `web` schema:
+
+```
+SELECT * FROM example.web.clicks;
+```
+
+If you used a different name for your catalog properties file, use
+that catalog name instead of `example` in the above examples.
+
+(sqlserver-type-mapping)=
+
+## Type mapping
+
+Because Trino and SQL Server each support types that the other does not, this
+connector {ref}`modifies some types <type-mapping-overview>` when reading or
+writing data. Data types may not map the same way in both directions between
+Trino and the data source. Refer to the following sections for type mapping in
+each direction.
+
+### SQL Server type to Trino type mapping
+
+The connector maps SQL Server types to the corresponding Trino types following this table:
+
+```{eval-rst}
+.. list-table:: SQL Server type to Trino type mapping
+  :widths: 30, 20, 50
+  :header-rows: 1
+
+  * - SQL Server database type
+    - Trino type
+    - Notes
+  * - ``BIT``
+    - ``BOOLEAN``
+    -
+  * - ``TINYINT``
+    - ``SMALLINT``
+    - SQL Server ``TINYINT`` is actually ``unsigned TINYINT``
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``INTEGER``
+    - ``INTEGER``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``DOUBLE PRECISION``
+    - ``DOUBLE``
+    -
+  * - ``FLOAT[(n)]``
+    - ``REAL`` or ``DOUBLE``
+    -  See :ref:`sqlserver-numeric-mapping`
+  * - ``REAL``
+    - ``REAL``
+    -
+  * - ``DECIMAL[(p[, s])]``, ``NUMERIC[(p[, s])]``
+    - ``DECIMAL(p, s)``
+    -
+  * - ``CHAR[(n)]``
+    - ``CHAR(n)``
+    - ``1 <= n <= 8000``
+  * - ``NCHAR[(n)]``
+    - ``CHAR(n)``
+    - ``1 <= n <= 4000``
+  * - ``VARCHAR[(n | max)]``, ``NVARCHAR[(n | max)]``
+    - ``VARCHAR(n)``
+    - ``1 <= n <= 8000``, ``max = 2147483647``
+  * - ``TEXT``
+    - ``VARCHAR(2147483647)``
+    -
+  * - ``NTEXT``
+    - ``VARCHAR(1073741823)``
+    -
+  * - ``VARBINARY[(n | max)]``
+    - ``VARBINARY``
+    - ``1 <= n <= 8000``, ``max = 2147483647``
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME[(n)]``
+    - ``TIME(n)``
+    - ``0 <= n <= 7``
+  * - ``DATETIME2[(n)]``
+    - ``TIMESTAMP(n)``
+    - ``0 <= n <= 7``
+  * - ``SMALLDATETIME``
+    - ``TIMESTAMP(0)``
+    -
+  * - ``DATETIMEOFFSET[(n)]``
+    - ``TIMESTAMP(n) WITH TIME ZONE``
+    - ``0 <= n <= 7``
+```
+
+### Trino type to SQL Server type mapping
+
+The connector maps Trino types to the corresponding SQL Server types following this table:
+
+```{eval-rst}
+.. list-table:: Trino type to SQL Server type mapping
+  :widths: 30, 20, 50
+  :header-rows: 1
+
+  * - Trino type
+    - SQL Server type
+    - Notes
+  * - ``BOOLEAN``
+    - ``BIT``
+    -
+  * - ``TINYINT``
+    - ``TINYINT``
+    - Trino only supports writing values belonging to ``[0, 127]``
+  * - ``SMALLINT``
+    - ``SMALLINT``
+    -
+  * - ``INTEGER``
+    - ``INTEGER``
+    -
+  * - ``BIGINT``
+    - ``BIGINT``
+    -
+  * - ``REAL``
+    - ``REAL``
+    -
+  * - ``DOUBLE``
+    - ``DOUBLE PRECISION``
+    -
+  * - ``DECIMAL(p, s)``
+    - ``DECIMAL(p, s)``
+    -
+  * - ``CHAR(n)``
+    - ``NCHAR(n)`` or ``NVARCHAR(max)``
+    -  See :ref:`sqlserver-character-mapping`
+  * - ``VARCHAR(n)``
+    - ``NVARCHAR(n)`` or ``NVARCHAR(max)``
+    -  See :ref:`sqlserver-character-mapping`
+  * - ``VARBINARY``
+    - ``VARBINARY(max)``
+    -
+  * - ``DATE``
+    - ``DATE``
+    -
+  * - ``TIME(n)``
+    - ``TIME(n)``
+    - ``0 <= n <= 7``
+  * - ``TIMESTAMP(n)``
+    - ``DATETIME2(n)``
+    - ``0 <= n <= 7``
+```
+
+Complete list of [SQL Server data types](https://msdn.microsoft.com/library/ms187752.aspx).
+
+(sqlserver-numeric-mapping)=
+
+### Numeric type mapping
+
+For SQL Server `FLOAT[(n)]`:
+
+- If `n` is not specified maps to Trino `Double`
+- If `1 <= n <= 24` maps to Trino `REAL`
+- If `24 < n <= 53` maps to Trino `DOUBLE`
+
+(sqlserver-character-mapping)=
+
+### Character type mapping
+
+For Trino `CHAR(n)`:
+
+- If `1 <= n <= 4000` maps SQL Server `NCHAR(n)`
+- If `n > 4000` maps SQL Server `NVARCHAR(max)`
+
+For Trino `VARCHAR(n)`:
+
+- If `1 <= n <= 4000` maps SQL Server `NVARCHAR(n)`
+- If `n > 4000` maps SQL Server `NVARCHAR(max)`
+
+```{include} jdbc-type-mapping.fragment
+```
+
+(sqlserver-sql-support)=
+
+## SQL support
+
+The connector provides read access and write access to data and metadata in SQL
+Server. In addition to the {ref}`globally available <sql-globally-available>`
+and {ref}`read operation <sql-read-operations>` statements, the connector
+supports the following features:
+
+- {doc}`/sql/insert`
+- {doc}`/sql/update`
+- {doc}`/sql/delete`
+- {doc}`/sql/truncate`
+- {ref}`sql-schema-table-management`
+
+```{include} sql-update-limitation.fragment
+```
+
+```{include} sql-delete-limitation.fragment
+```
+
+```{include} alter-table-limitation.fragment
+```
+
+(sqlserver-fte-support)=
+
+## Fault-tolerant execution support
+
+The connector supports {doc}`/admin/fault-tolerant-execution` of query
+processing. Read and write operations are both supported with any retry policy.
+
+## Table functions
+
+The connector provides specific {doc}`table functions </functions/table>` to
+access SQL Server.
+
+(sqlserver-query-function)=
+
+### `query(varchar) -> table`
+
+The `query` function allows you to query the underlying database directly. It
+requires syntax native to SQL Server, because the full query is pushed down and
+processed in SQL Server. This can be useful for accessing native features which
+are not implemented in Trino or for improving query performance in situations
+where running a query natively may be faster.
+
+```{include} query-passthrough-warning.fragment
+```
+
+For example, query the `example` catalog and select the top 10 percent of
+nations by population:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    example.system.query(
+      query => 'SELECT
+        TOP(10) PERCENT *
+      FROM
+        tpch.nation
+      ORDER BY
+        population DESC'
+    )
+  );
+```
+
+(sqlserver-procedure-function)=
+
+### `procedure(varchar) -> table`
+
+The `procedure` function allows you to run stored procedures on the underlying
+database directly. It requires syntax native to SQL Server, because the full query
+is pushed down and processed in SQL Server. In order to use this table function set
+`sqlserver.experimental.stored-procedure-table-function-enabled` to `true`.
+
+:::{note}
+The `procedure` function does not support running StoredProcedures that return multiple statements,
+use a non-select statement, use output parameters, or use conditional statements.
+:::
+
+:::{warning}
+This feature is experimental only. The function has security implication and syntax might change and
+be backward incompatible.
+:::
+
+The follow example runs the stored procedure `employee_sp` in the `example` catalog and the
+`example_schema` schema in the underlying SQL Server database:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    example.system.procedure(
+      query => 'EXECUTE example_schema.employee_sp'
+    )
+  );
+```
+
+If the stored procedure `employee_sp` requires any input
+append the parameter value to the procedure statement:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    example.system.procedure(
+      query => 'EXECUTE example_schema.employee_sp 0'
+    )
+  );
+```
+
+```{include} query-table-function-ordering.fragment
+```
+
+## Performance
+
+The connector includes a number of performance improvements, detailed in the
+following sections.
+
+(sqlserver-table-statistics)=
+
+### Table statistics
+
+The SQL Server connector can use {doc}`table and column statistics
+</optimizer/statistics>` for {doc}`cost based optimizations
+</optimizer/cost-based-optimizations>`, to improve query processing performance
+based on the actual data in the data source.
+
+The statistics are collected by SQL Server and retrieved by the connector.
+
+The connector can use information stored in single-column statistics. SQL Server
+Database can automatically create column statistics for certain columns. If
+column statistics are not created automatically for a certain column, you can
+create them by executing the following statement in SQL Server Database.
+
+```sql
+CREATE STATISTICS example_statistics_name ON table_schema.table_name (column_name);
+```
+
+SQL Server Database routinely updates the statistics. In some cases, you may
+want to force statistics update (e.g. after defining new column statistics or
+after changing data in the table). You can do that by executing the following
+statement in SQL Server Database.
+
+```sql
+UPDATE STATISTICS table_schema.table_name;
+```
+
+Refer to SQL Server documentation for information about options, limitations and
+additional considerations.
+
+(sqlserver-pushdown)=
+
+### Pushdown
+
+The connector supports pushdown for a number of operations:
+
+- {ref}`join-pushdown`
+- {ref}`limit-pushdown`
+- {ref}`topn-pushdown`
+
+{ref}`Aggregate pushdown <aggregation-pushdown>` for the following functions:
+
+- {func}`avg`
+- {func}`count`
+- {func}`max`
+- {func}`min`
+- {func}`sum`
+- {func}`stddev`
+- {func}`stddev_pop`
+- {func}`stddev_samp`
+- {func}`variance`
+- {func}`var_pop`
+- {func}`var_samp`
+
+```{include} pushdown-correctness-behavior.fragment
+```
+
+```{include} join-pushdown-enabled-true.fragment
+```
+
+#### Predicate pushdown support
+
+The connector supports pushdown of predicates on `VARCHAR` and `NVARCHAR`
+columns if the underlying columns in SQL Server use a case-sensitive [collation](https://learn.microsoft.com/en-us/sql/relational-databases/collations/collation-and-unicode-support?view=sql-server-ver16).
+
+The following operators are pushed down:
+
+- `=`
+- `<>`
+- `IN`
+- `NOT IN`
+
+To ensure correct results, operators are not pushed down for columns using a
+case-insensitive collation.
+
+(sqlserver-bulk-insert)=
+
+### Bulk insert
+
+You can optionally use the [bulk copy API](https://docs.microsoft.com/sql/connect/jdbc/use-bulk-copy-api-batch-insert-operation)
+to drastically speed up write operations.
+
+Enable bulk copying and a lock on the destination table to meet [minimal
+logging requirements](https://docs.microsoft.com/sql/relational-databases/import-export/prerequisites-for-minimal-logging-in-bulk-import).
+
+The following table shows the relevant catalog configuration properties and
+their default values:
+
+```{eval-rst}
+.. list-table:: Bulk load properties
+  :widths: 30, 60, 10
+  :header-rows: 1
+
+  * - Property name
+    - Description
+    - Default
+  * - ``sqlserver.bulk-copy-for-write.enabled``
+    - Use the SQL Server bulk copy API for writes. The corresponding catalog
+      session property is ``bulk_copy_for_write``.
+    - ``false``
+  * - ``sqlserver.bulk-copy-for-write.lock-destination-table``
+    - Obtain a bulk update lock on the destination table for write operations.
+      The corresponding catalog session property is
+      ``bulk_copy_for_write_lock_destination_table``. Setting is only used when
+      ``bulk-copy-for-write.enabled=true``.
+    - ``false``
+```
+
+Limitations:
+
+- Column names with leading and trailing spaces are not supported.
+
+## Data compression
+
+You can specify the [data compression policy for SQL Server tables](https://docs.microsoft.com/sql/relational-databases/data-compression/data-compression)
+with the `data_compression` table property. Valid policies are `NONE`, `ROW` or `PAGE`.
+
+Example:
+
+```
+CREATE TABLE example_schema.scientists (
+  recordkey VARCHAR,
+  name VARCHAR,
+  age BIGINT,
+  birthday DATE
+)
+WITH (
+  data_compression = 'ROW'
+);
+```
diff --git a/docs/src/main/sphinx/connector/sqlserver.rst b/docs/src/main/sphinx/connector/sqlserver.rst
deleted file mode 100644
index 02af1dffcf7d..000000000000
--- a/docs/src/main/sphinx/connector/sqlserver.rst
+++ /dev/null
@@ -1,556 +0,0 @@
-====================
-SQL Server connector
-====================
-
-.. raw:: html
-
-  <img src="../_static/img/sqlserver.png" class="connector-logo">
-
-The SQL Server connector allows querying and creating tables in an external
-`Microsoft SQL Server <https://www.microsoft.com/sql-server/>`_ database. This
-can be used to join data between different systems like SQL Server and Hive, or
-between two different SQL Server instances.
-
-Requirements
-------------
-
-To connect to SQL Server, you need:
-
-* SQL Server 2012 or higher, or Azure SQL Database.
-* Network access from the Trino coordinator and workers to SQL Server.
-  Port 1433 is the default port.
-
-Configuration
--------------
-
-The connector can query a single database on a given SQL Server instance. Create
-a catalog properties file that specifies the SQL server connector by setting the
-``connector.name`` to ``sqlserver``.
-
-For example, to access a database as ``example``, create the file
-``etc/catalog/example.properties``. Replace the connection properties as
-appropriate for your setup:
-
-.. code-block:: properties
-
-    connector.name=sqlserver
-    connection-url=jdbc:sqlserver://<host>:<port>;databaseName=<databaseName>;encrypt=false
-    connection-user=root
-    connection-password=secret
-
-The ``connection-url`` defines the connection information and parameters to pass
-to the SQL Server JDBC driver. The supported parameters for the URL are
-available in the `SQL Server JDBC driver documentation
-<https://docs.microsoft.com/sql/connect/jdbc/building-the-connection-url>`_.
-
-The ``connection-user`` and ``connection-password`` are typically required and
-determine the user credentials for the connection, often a service user. You can
-use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
-properties files.
-
-.. _sqlserver-tls:
-
-Connection security
-^^^^^^^^^^^^^^^^^^^
-
-The JDBC driver, and therefore the connector, automatically use Transport Layer
-Security (TLS) encryption and certificate validation. This requires a suitable
-TLS certificate configured on your SQL Server database host.
-
-If you do not have the necessary configuration established, you can disable
-encryption in the connection string with the ``encrypt`` property:
-
-.. code-block:: properties
-
-  connection-url=jdbc:sqlserver://<host>:<port>;databaseName=<databaseName>;encrypt=false
-
-Further parameters like ``trustServerCertificate``, ``hostNameInCertificate``,
-``trustStore``, and ``trustStorePassword`` are details in the `TLS section of
-SQL Server JDBC driver documentation
-<https://docs.microsoft.com/sql/connect/jdbc/using-ssl-encryption>`_.
-
-.. include:: jdbc-authentication.fragment
-
-Multiple SQL Server databases or servers
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The SQL Server connector can only access a single SQL Server database
-within a single catalog. Thus, if you have multiple SQL Server databases,
-or want to connect to multiple SQL Server instances, you must configure
-multiple instances of the SQL Server connector.
-
-To add another catalog, simply add another properties file to ``etc/catalog``
-with a different name, making sure it ends in ``.properties``. For example,
-if you name the property file ``sales.properties``, Trino creates a
-catalog named ``sales`` using the configured connector.
-
-.. include:: jdbc-common-configurations.fragment
-
-.. |default_domain_compaction_threshold| replace:: ``32``
-.. include:: jdbc-domain-compaction-threshold.fragment
-
-Specific configuration properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The SQL Server connector supports additional catalog properties to configure the
-behavior of the connector and the issues queries to the database.
-
-.. list-table::
-  :widths: 45, 55
-  :header-rows: 1
-
-  * - Property name
-    - Description
-  * - ``sqlserver.snapshot-isolation.disabled``
-    - Control the automatic use of snapshot isolation for transactions issued by
-      Trino in SQL Server. Defaults to ``false``, which means that snapshot
-      isolation is enabled.
-
-.. include:: jdbc-procedures.fragment
-
-.. include:: jdbc-case-insensitive-matching.fragment
-
-.. include:: non-transactional-insert.fragment
-
-Querying SQL Server
--------------------
-
-The SQL Server connector provides access to all schemas visible to the specified
-user in the configured database. For the following examples, assume the SQL
-Server catalog is ``example``.
-
-You can see the available schemas by running ``SHOW SCHEMAS``::
-
-    SHOW SCHEMAS FROM example;
-
-If you have a schema named ``web``, you can view the tables
-in this schema by running ``SHOW TABLES``::
-
-    SHOW TABLES FROM example.web;
-
-You can see a list of the columns in the ``clicks`` table in the ``web`` database
-using either of the following::
-
-    DESCRIBE example.web.clicks;
-    SHOW COLUMNS FROM example.web.clicks;
-
-Finally, you can query the ``clicks`` table in the ``web`` schema::
-
-    SELECT * FROM example.web.clicks;
-
-If you used a different name for your catalog properties file, use
-that catalog name instead of ``example`` in the above examples.
-
-.. _sqlserver-type-mapping:
-
-Type mapping
-------------
-
-Because Trino and SQL Server each support types that the other does not, this
-connector :ref:`modifies some types <type-mapping-overview>` when reading or
-writing data. Data types may not map the same way in both directions between
-Trino and the data source. Refer to the following sections for type mapping in
-each direction.
-
-SQL Server type to Trino type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps SQL Server types to the corresponding Trino types following this table:
-
-.. list-table:: SQL Server type to Trino type mapping
-  :widths: 30, 20, 50
-  :header-rows: 1
-
-  * - SQL Server database type
-    - Trino type
-    - Notes
-  * - ``BIT``
-    - ``BOOLEAN``
-    -
-  * - ``TINYINT``
-    - ``SMALLINT``
-    - SQL Server ``TINYINT`` is actually ``unsigned tinyint``
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``INTEGER``
-    - ``INTEGER``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``DOUBLE PRECISION``
-    - ``DOUBLE``
-    -
-  * - ``FLOAT[(n)]``
-    - ``REAL`` or ``DOUBLE``
-    -  See :ref:`sqlserver-numeric-mapping`
-  * - ``REAL``
-    - ``REAL``
-    -
-  * - ``DECIMAL[(p[, s])]``, ``NUMERIC[(p[, s])]``
-    - ``DECIMAL(p, s)``
-    -
-  * - ``CHAR[(n)]``
-    - ``CHAR(n)``
-    - ``1 <= n <= 8000``
-  * - ``NCHAR[(n)]``
-    - ``CHAR(n)``
-    - ``1 <= n <= 4000``
-  * - ``VARCHAR[(n | max)]``, ``NVARCHAR[(n | max)]``
-    - ``VARCHAR(n)``
-    - ``1 <= n <= 8000``, ``max = 2147483647``
-  * - ``TEXT``
-    - ``VARCHAR(2147483647)``
-    -
-  * - ``NTEXT``
-    - ``VARCHAR(1073741823)``
-    -
-  * - ``VARBINARY[(n | max)]``
-    - ``VARBINARY``
-    - ``1 <= n <= 8000``, ``max = 2147483647``
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME[(n)]``
-    - ``TIME(n)``
-    - ``0 <= n <= 7``
-  * - ``DATETIME2[(n)]``
-    - ``TIMESTAMP(n)``
-    - ``0 <= n <= 7``
-  * - ``SMALLDATETIME``
-    - ``TIMESTAMP(0)``
-    -
-  * - ``DATETIMEOFFSET[(n)]``
-    - ``TIMESTAMP(n) WITH TIME ZONE``
-    - ``0 <= n <= 7``
-
-Trino type to SQL Server type mapping
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The connector maps Trino types to the corresponding SQL Server types following this table:
-
-.. list-table:: Trino type to SQL Server type mapping
-  :widths: 30, 20, 50
-  :header-rows: 1
-
-  * - Trino type
-    - SQL Server type
-    - Notes
-  * - ``BOOLEAN``
-    - ``BIT``
-    -
-  * - ``TINYINT``
-    - ``TINYINT``
-    - Trino only supports writing values belonging to ``[0, 127]``
-  * - ``SMALLINT``
-    - ``SMALLINT``
-    -
-  * - ``INTEGER``
-    - ``INTEGER``
-    -
-  * - ``BIGINT``
-    - ``BIGINT``
-    -
-  * - ``REAL``
-    - ``REAL``
-    -
-  * - ``DOUBLE``
-    - ``DOUBLE PRECISION``
-    -
-  * - ``DECIMAL(p, s)``
-    - ``DECIMAL(p, s)``
-    -
-  * - ``CHAR(n)``
-    - ``NCHAR(n)`` or ``NVARCHAR(max)``
-    -  See :ref:`sqlserver-character-mapping`
-  * - ``VARCHAR(n)``
-    - ``NVARCHAR(n)`` or ``NVARCHAR(max)``
-    -  See :ref:`sqlserver-character-mapping`
-  * - ``VARBINARY``
-    - ``VARBINARY(max)``
-    -
-  * - ``DATE``
-    - ``DATE``
-    -
-  * - ``TIME(n)``
-    - ``TIME(n)``
-    - ``0 <= n <= 7``
-  * - ``TIMESTAMP(n)``
-    - ``DATETIME2(n)``
-    - ``0 <= n <= 7``
-
-Complete list of `SQL Server data types
-<https://msdn.microsoft.com/library/ms187752.aspx>`_.
-
-.. _sqlserver-numeric-mapping:
-
-Numeric type mapping
-^^^^^^^^^^^^^^^^^^^^
-
-For SQL Server ``FLOAT[(n)]``:
-
-- If ``n`` is not specified maps to Trino ``Double``
-- If ``1 <= n <= 24`` maps to Trino ``REAL``
-- If ``24 < n <= 53`` maps to Trino ``DOUBLE``
-
-.. _sqlserver-character-mapping:
-
-Character type mapping
-^^^^^^^^^^^^^^^^^^^^^^
-
-For Trino ``CHAR(n)``:
-
-- If ``1 <= n <= 4000`` maps SQL Server ``NCHAR(n)``
-- If ``n > 4000`` maps SQL Server ``NVARCHAR(max)``
-
-
-For Trino ``VARCHAR(n)``:
-
-- If ``1 <= n <= 4000`` maps SQL Server ``NVARCHAR(n)``
-- If ``n > 4000`` maps SQL Server ``NVARCHAR(max)``
-
-.. include:: jdbc-type-mapping.fragment
-
-.. _sqlserver-sql-support:
-
-SQL support
------------
-
-The connector provides read access and write access to data and metadata in SQL
-Server. In addition to the :ref:`globally available <sql-globally-available>`
-and :ref:`read operation <sql-read-operations>` statements, the connector
-supports the following features:
-
-* :doc:`/sql/insert`
-* :doc:`/sql/delete`
-* :doc:`/sql/truncate`
-* :ref:`sql-schema-table-management`
-
-.. include:: sql-delete-limitation.fragment
-
-.. include:: alter-table-limitation.fragment
-
-Table functions
----------------
-
-The connector provides specific :doc:`table functions </functions/table>` to
-access SQL Server.
-
-.. _sqlserver-query-function:
-
-``query(varchar) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``query`` function allows you to query the underlying database directly. It
-requires syntax native to SQL Server, because the full query is pushed down and
-processed in SQL Server. This can be useful for accessing native features which
-are not implemented in Trino or for improving query performance in situations
-where running a query natively may be faster.
-
-.. include:: polymorphic-table-function-ordering.fragment
-
-For example, query the ``example`` catalog and select the top 10 percent of
-nations by population::
-
-    SELECT
-      *
-    FROM
-      TABLE(
-        example.system.query(
-          query => 'SELECT
-            TOP(10) PERCENT *
-          FROM
-            tpch.nation
-          ORDER BY
-            population DESC'
-        )
-      );
-
-.. _sqlserver-procedure-function:
-
-``procedure(varchar) -> table``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``procedure`` function allows you to run stored procedures on the underlying
-database directly. It requires syntax native to SQL Server, because the full query
-is pushed down and processed in SQL Server. In order to use this table function set
-``sqlserver.experimental.stored-procedure-table-function-enabled`` to ``true``.
-
-.. note::
-
-    The ``procedure`` function does not support running StoredProcedures that return multiple statements,
-    use a non-select statement, use output parameters, or use conditional statements.
-
-.. warning::
-
-    This feature is experimental only. The function has security implication and syntax might change and
-    be backward incompatible.
-
-
-The follow example runs the stored procedure ``employee_sp`` in the ``example`` catalog and the
-``example_schema`` schema in the underlying SQL Server database::
-
-    SELECT
-      *
-    FROM
-      TABLE(
-        example.system.procedure(
-          query => 'EXECUTE example_schema.employee_sp'
-        )
-      );
-
-If the stored procedure ``employee_sp`` requires any input
-append the parameter value to the procedure statement::
-
-    SELECT
-      *
-    FROM
-      TABLE(
-        example.system.procedure(
-          query => 'EXECUTE example_schema.employee_sp 0'
-        )
-      );
-
-Performance
------------
-
-The connector includes a number of performance improvements, detailed in the
-following sections.
-
-.. _sqlserver-table-statistics:
-
-Table statistics
-^^^^^^^^^^^^^^^^
-
-The SQL Server connector can use :doc:`table and column statistics
-</optimizer/statistics>` for :doc:`cost based optimizations
-</optimizer/cost-based-optimizations>`, to improve query processing performance
-based on the actual data in the data source.
-
-The statistics are collected by SQL Server and retrieved by the connector.
-
-The connector can use information stored in single-column statistics. SQL Server
-Database can automatically create column statistics for certain columns. If
-column statistics are not created automatically for a certain column, you can
-create them by executing the following statement in SQL Server Database.
-
-.. code-block:: sql
-
-    CREATE STATISTICS example_statistics_name ON table_schema.table_name (column_name);
-
-SQL Server Database routinely updates the statistics. In some cases, you may
-want to force statistics update (e.g. after defining new column statistics or
-after changing data in the table). You can do that by executing the following
-statement in SQL Server Database.
-
-.. code-block:: sql
-
-    UPDATE STATISTICS table_schema.table_name;
-
-Refer to SQL Server documentation for information about options, limitations and
-additional considerations.
-
-.. _sqlserver-pushdown:
-
-Pushdown
-^^^^^^^^
-
-The connector supports pushdown for a number of operations:
-
-* :ref:`join-pushdown`
-* :ref:`limit-pushdown`
-* :ref:`topn-pushdown`
-
-:ref:`Aggregate pushdown <aggregation-pushdown>` for the following functions:
-
-* :func:`avg`
-* :func:`count`
-* :func:`max`
-* :func:`min`
-* :func:`sum`
-* :func:`stddev`
-* :func:`stddev_pop`
-* :func:`stddev_samp`
-* :func:`variance`
-* :func:`var_pop`
-* :func:`var_samp`
-
-.. include:: pushdown-correctness-behavior.fragment
-
-.. include:: join-pushdown-enabled-true.fragment
-
-Predicate pushdown support
-""""""""""""""""""""""""""
-
-The connector supports pushdown of predicates on ``VARCHAR`` and ``NVARCHAR``
-columns if the underlying columns in SQL Server use a case-sensitive `collation
-<https://learn.microsoft.com/en-us/sql/relational-databases/collations/collation-and-unicode-support?view=sql-server-ver16>`_.
-
-The following operators are pushed down:
-
-- ``=``
-- ``<>``
-- ``IN``
-- ``NOT IN``
-
-To ensure correct results, operators are not pushed down for columns using a
-case-insensitive collation.
-
-.. _sqlserver-bulk-insert:
-
-Bulk insert
-^^^^^^^^^^^
-
-You can optionally use the `bulk copy API
-<https://docs.microsoft.com/sql/connect/jdbc/use-bulk-copy-api-batch-insert-operation>`_
-to drastically speed up write operations.
-
-Enable bulk copying and a lock on the destination table to meet `minimal
-logging requirements
-<https://docs.microsoft.com/sql/relational-databases/import-export/prerequisites-for-minimal-logging-in-bulk-import>`_.
-
-The following table shows the relevant catalog configuration properties and
-their default values:
-
-.. list-table:: Bulk load properties
-  :widths: 30, 60, 10
-  :header-rows: 1
-
-  * - Property name
-    - Description
-    - Default
-  * - ``sqlserver.bulk-copy-for-write.enabled``
-    - Use the SQL Server bulk copy API for writes. The corresponding catalog
-      session property is ``bulk_copy_for_write``.
-    - ``false``
-  * - ``sqlserver.bulk-copy-for-write.lock-destination-table``
-    - Obtain a bulk update lock on the destination table for write operations.
-      The corresponding catalog session property is
-      ``bulk_copy_for_write_lock_destination_table``. Setting is only used when
-      ``bulk-copy-for-write.enabled=true``.
-    - ``false``
-
-Limitations:
-
-* Column names with leading and trailing spaces are not supported.
-
-
-Data compression
-----------------
-
-You can specify the `data compression policy for SQL Server tables
-<https://docs.microsoft.com/sql/relational-databases/data-compression/data-compression>`_
-with the ``data_compression`` table property. Valid policies are ``NONE``, ``ROW`` or ``PAGE``.
-
-Example::
-
-    CREATE TABLE example_schema.scientists (
-      recordkey VARCHAR,
-      name VARCHAR,
-      age BIGINT,
-      birthday DATE
-    )
-    WITH (
-      data_compression = 'ROW'
-    );
diff --git a/docs/src/main/sphinx/connector/system.md b/docs/src/main/sphinx/connector/system.md
new file mode 100644
index 000000000000..a4f034bbe515
--- /dev/null
+++ b/docs/src/main/sphinx/connector/system.md
@@ -0,0 +1,162 @@
+# System connector
+
+The System connector provides information and metrics about the currently
+running Trino cluster. It makes this available via normal SQL queries.
+
+## Configuration
+
+The System connector doesn't need to be configured: it is automatically
+available via a catalog named `system`.
+
+## Using the System connector
+
+List the available system schemas:
+
+```
+SHOW SCHEMAS FROM system;
+```
+
+List the tables in one of the schemas:
+
+```
+SHOW TABLES FROM system.runtime;
+```
+
+Query one of the tables:
+
+```
+SELECT * FROM system.runtime.nodes;
+```
+
+Kill a running query:
+
+```
+CALL system.runtime.kill_query(query_id => '20151207_215727_00146_tx3nr', message => 'Using too many resources');
+```
+
+## System connector tables
+
+### `metadata.catalogs`
+
+The catalogs table contains the list of available catalogs.
+
+### `metadata.schema_properties`
+
+The schema properties table contains the list of available properties
+that can be set when creating a new schema.
+
+### `metadata.table_properties`
+
+The table properties table contains the list of available properties
+that can be set when creating a new table.
+
+(system-metadata-materialized-views)=
+
+### `metadata.materialized_views`
+
+The materialized views table contains the following information about all
+{ref}`materialized views <sql-materialized-view-management>`:
+
+```{eval-rst}
+.. list-table:: Metadata for materialized views
+  :widths: 30, 70
+  :header-rows: 1
+
+  * - Column
+    - Description
+  * - ``catalog_name``
+    - Name of the catalog containing the materialized view.
+  * - ``schema_name``
+    - Name of the schema in ``catalog_name`` containing the materialized view.
+  * - ``name``
+    - Name of the materialized view.
+  * - ``storage_catalog``
+    - Name of the catalog used for the storage table backing the materialized
+      view.
+  * - ``storage_schema``
+    - Name of the schema in ``storage_catalog`` used for the storage table
+      backing the materialized view.
+  * - ``storage_table``
+    - Name of the storage table backing the materialized view.
+  * - ``freshness``
+    - Freshness of data in the storage table. Queries on the
+      materialized view access the storage table if not ``STALE``, otherwise
+      the ``definition`` is used to access the underlying data in the source
+      tables.
+  * - ``owner``
+    - Username of the creator and owner of the materialized view.
+  * - ``comment``
+    - User supplied text about the materialized view.
+  * - ``definition``
+    - SQL query that defines the data provided by the materialized view.
+```
+
+### `metadata.materialized_view_properties`
+
+The materialized view properties table contains the list of available properties
+that can be set when creating a new materialized view.
+
+### `metadata.table_comments`
+
+The table comments table contains the list of table comment.
+
+### `runtime.nodes`
+
+The nodes table contains the list of visible nodes in the Trino
+cluster along with their status.
+
+(optimizer-rule-stats)=
+
+### `runtime.optimizer_rule_stats`
+
+The `optimizer_rule_stats` table contains the statistics for optimizer
+rule invocations during the query planning phase. The statistics are
+aggregated over all queries since the server start-up. The table contains
+information about invocation frequency, failure rates and performance for
+optimizer rules. For example, you can look at the multiplication of columns
+`invocations` and `average_time` to get an idea about which rules
+generally impact query planning times the most.
+
+### `runtime.queries`
+
+The queries table contains information about currently and recently
+running queries on the Trino cluster. From this table you can find out
+the original query SQL text, the identity of the user who ran the query,
+and performance information about the query, including how long the query
+was queued and analyzed.
+
+### `runtime.tasks`
+
+The tasks table contains information about the tasks involved in a
+Trino query, including where they were executed, and how many rows
+and bytes each task processed.
+
+### `runtime.transactions`
+
+The transactions table contains the list of currently open transactions
+and related metadata. This includes information such as the create time,
+idle time, initialization parameters, and accessed catalogs.
+
+## System connector procedures
+
+```{eval-rst}
+.. function:: runtime.kill_query(query_id, message)
+
+    Kill the query identified by ``query_id``. The query failure message
+    includes the specified ``message``. ``message`` is optional.
+```
+
+(system-type-mapping)=
+
+## Type mapping
+
+Trino supports all data types used within the System schemas so no mapping
+is required.
+
+(system-sql-support)=
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements to access Trino system
+data and metadata.
diff --git a/docs/src/main/sphinx/connector/system.rst b/docs/src/main/sphinx/connector/system.rst
deleted file mode 100644
index 801b84102c4a..000000000000
--- a/docs/src/main/sphinx/connector/system.rst
+++ /dev/null
@@ -1,169 +0,0 @@
-================
-System connector
-================
-
-The System connector provides information and metrics about the currently
-running Trino cluster. It makes this available via normal SQL queries.
-
-Configuration
--------------
-
-The System connector doesn't need to be configured: it is automatically
-available via a catalog named ``system``.
-
-Using the System connector
---------------------------
-
-List the available system schemas::
-
-    SHOW SCHEMAS FROM system;
-
-List the tables in one of the schemas::
-
-    SHOW TABLES FROM system.runtime;
-
-Query one of the tables::
-
-    SELECT * FROM system.runtime.nodes;
-
-Kill a running query::
-
-    CALL system.runtime.kill_query(query_id => '20151207_215727_00146_tx3nr', message => 'Using too many resources');
-
-System connector tables
------------------------
-
-``metadata.catalogs``
-^^^^^^^^^^^^^^^^^^^^^
-
-The catalogs table contains the list of available catalogs.
-
-``metadata.schema_properties``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The schema properties table contains the list of available properties
-that can be set when creating a new schema.
-
-``metadata.table_properties``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The table properties table contains the list of available properties
-that can be set when creating a new table.
-
-.. _system_metadata_materialized_views:
-
-``metadata.materialized_views``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The materialized views table contains the following information about all
-:ref:`materialized views <sql-materialized-view-management>`:
-
-.. list-table:: Metadata for materialized views
-  :widths: 30, 70
-  :header-rows: 1
-
-  * - Column
-    - Description
-  * - ``catalog_name``
-    - Name of the catalog containing the materialized view.
-  * - ``schema_name``
-    - Name of the schema in ``catalog_name`` containing the materialized view.
-  * - ``name``
-    - Name of the materialized view.
-  * - ``storage_catalog``
-    - Name of the catalog used for the storage table backing the materialized
-      view.
-  * - ``storage_schema``
-    - Name of the schema in ``storage_catalog`` used for the storage table
-      backing the materialized view.
-  * - ``storage_table``
-    - Name of the storage table backing the materialized view.
-  * - ``freshness``
-    - Freshness of data in the storage table. Queries on the
-      materialized view access the storage table if not ``STALE``, otherwise
-      the ``definition`` is used to access the underlying data in the source
-      tables.
-  * - ``owner``
-    - Username of the creator and owner of the materialized view.
-  * - ``comment``
-    - User supplied text about the materialized view.
-  * - ``definition``
-    - SQL query that defines the data provided by the materialized view.
-
-``metadata.materialized_view_properties``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The materialized view properties table contains the list of available properties
-that can be set when creating a new materialized view.
-
-``metadata.table_comments``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The table comments table contains the list of table comment.
-
-``runtime.nodes``
-^^^^^^^^^^^^^^^^^
-
-The nodes table contains the list of visible nodes in the Trino
-cluster along with their status.
-
-.. _optimizer_rule_stats:
-
-``runtime.optimizer_rule_stats``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``optimizer_rule_stats`` table contains the statistics for optimizer
-rule invocations during the query planning phase. The statistics are
-aggregated over all queries since the server start-up. The table contains
-information about invocation frequency, failure rates and performance for
-optimizer rules. For example, you can look at the multiplication of columns
-``invocations`` and ``average_time`` to get an idea about which rules
-generally impact query planning times the most.
-
-``runtime.queries``
-^^^^^^^^^^^^^^^^^^^
-
-The queries table contains information about currently and recently
-running queries on the Trino cluster. From this table you can find out
-the original query SQL text, the identity of the user who ran the query,
-and performance information about the query, including how long the query
-was queued and analyzed.
-
-``runtime.tasks``
-^^^^^^^^^^^^^^^^^
-
-The tasks table contains information about the tasks involved in a
-Trino query, including where they were executed, and how many rows
-and bytes each task processed.
-
-``runtime.transactions``
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-The transactions table contains the list of currently open transactions
-and related metadata. This includes information such as the create time,
-idle time, initialization parameters, and accessed catalogs.
-
-System connector procedures
----------------------------
-
-.. function:: runtime.kill_query(query_id, message)
-
-    Kill the query identified by ``query_id``. The query failure message
-    includes the specified ``message``. ``message`` is optional.
-
-.. _system-type-mapping:
-
-Type mapping
-------------
-
-Trino supports all data types used within the System schemas so no mapping
-is required.
-
-.. _system-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access Trino system
-data and metadata.
diff --git a/docs/src/main/sphinx/connector/table-redirection.fragment b/docs/src/main/sphinx/connector/table-redirection.fragment
index eb743737aa5c..83fd58f4142a 100644
--- a/docs/src/main/sphinx/connector/table-redirection.fragment
+++ b/docs/src/main/sphinx/connector/table-redirection.fragment
@@ -2,66 +2,72 @@ Trino offers the possibility to transparently redirect operations on an existing
 table to the appropriate catalog based on the format of the table and catalog configuration.
 
 In the context of connectors which depend on a metastore service
-(for example, :doc:`/connector/hive`, :doc:`/connector/iceberg` and :doc:`/connector/delta-lake`),
-the metastore (Hive metastore service, `AWS Glue Data Catalog <https://aws.amazon.com/glue/>`_)
+(for example, {doc}`/connector/hive`, {doc}`/connector/iceberg` and {doc}`/connector/delta-lake`),
+the metastore (Hive metastore service, [AWS Glue Data Catalog](https://aws.amazon.com/glue/))
 can be used to accustom tables with different table formats.
 Therefore, a metastore database can hold a variety of tables with different table formats.
 
 As a concrete example, let's use the following
-simple scenario which makes use of table redirection::
+simple scenario which makes use of table redirection:
 
-    USE example.example_schema;
+```
+USE example.example_schema;
 
-    EXPLAIN SELECT * FROM example_table;
+EXPLAIN SELECT * FROM example_table;
+```
 
-.. code-block:: text
+```text
+                               Query Plan
+-------------------------------------------------------------------------
+Fragment 0 [SOURCE]
+     ...
+     Output[columnNames = [...]]
+     │   ...
+     └─ TableScan[table = another_catalog:example_schema:example_table]
+            ...
+```
 
-                                   Query Plan
-    -------------------------------------------------------------------------
-    Fragment 0 [SOURCE]
-         ...
-         Output[columnNames = [...]]
-         │   ...
-         └─ TableScan[table = another_catalog:example_schema:example_table]
-                ...
-
-The output of the ``EXPLAIN`` statement points out the actual
-catalog which is handling the ``SELECT`` query over the table ``example_table``.
+The output of the `EXPLAIN` statement points out the actual
+catalog which is handling the `SELECT` query over the table `example_table`.
 
 The table redirection functionality works also when using
-fully qualified names for the tables::
-
-    EXPLAIN SELECT * FROM example.example_schema.example_table;
+fully qualified names for the tables:
+
+```
+EXPLAIN SELECT * FROM example.example_schema.example_table;
+```
+
+```text
+                               Query Plan
+-------------------------------------------------------------------------
+Fragment 0 [SOURCE]
+     ...
+     Output[columnNames = [...]]
+     │   ...
+     └─ TableScan[table = another_catalog:example_schema:example_table]
+            ...
+```
 
-.. code-block:: text
+Trino offers table redirection support for the following operations:
 
-                                   Query Plan
-    -------------------------------------------------------------------------
-    Fragment 0 [SOURCE]
-         ...
-         Output[columnNames = [...]]
-         │   ...
-         └─ TableScan[table = another_catalog:example_schema:example_table]
-                ...
+- Table read operations
 
-Trino offers table redirection support for the following operations:
+  - {doc}`/sql/select`
+  - {doc}`/sql/describe`
+  - {doc}`/sql/show-stats`
+  - {doc}`/sql/show-create-table`
 
-* Table read operations
+- Table write operations
 
-  * :doc:`/sql/select`
-  * :doc:`/sql/describe`
-  * :doc:`/sql/show-stats`
-  * :doc:`/sql/show-create-table`
-* Table write operations
+  - {doc}`/sql/insert`
+  - {doc}`/sql/update`
+  - {doc}`/sql/merge`
+  - {doc}`/sql/delete`
 
-  * :doc:`/sql/insert`
-  * :doc:`/sql/update`
-  * :doc:`/sql/merge`
-  * :doc:`/sql/delete`
-* Table management operations
+- Table management operations
 
-  * :doc:`/sql/alter-table`
-  * :doc:`/sql/drop-table`
-  * :doc:`/sql/comment`
+  - {doc}`/sql/alter-table`
+  - {doc}`/sql/drop-table`
+  - {doc}`/sql/comment`
 
 Trino does not offer view redirection support.
diff --git a/docs/src/main/sphinx/connector/thrift.md b/docs/src/main/sphinx/connector/thrift.md
new file mode 100644
index 000000000000..db9a5dbd58da
--- /dev/null
+++ b/docs/src/main/sphinx/connector/thrift.md
@@ -0,0 +1,108 @@
+# Thrift connector
+
+The Thrift connector makes it possible to integrate with external storage systems
+without a custom Trino connector implementation by using
+[Apache Thrift](https://thrift.apache.org/) on these servers. It is therefore
+generic and can provide access to any backend, as long as it exposes the expected
+API by using Thrift.
+
+In order to use the Thrift connector with an external system, you need to implement
+the `TrinoThriftService` interface, found below. Next, you configure the Thrift connector
+to point to a set of machines, called Thrift servers, that implement the interface.
+As part of the interface implementation, the Thrift servers provide metadata,
+splits and data. The connector randomly chooses a server to talk to from the available
+instances for metadata calls, or for data calls unless the splits include a list of addresses.
+All requests are assumed to be idempotent and can be retried freely among any server.
+
+## Requirements
+
+To connect to your custom servers with the Thrift protocol, you need:
+
+- Network access from the Trino coordinator and workers to the Thrift servers.
+- A {ref}`trino-thrift-service` for your system.
+
+## Configuration
+
+To configure the Thrift connector, create a catalog properties file
+`etc/catalog/example.properties` with the following content, replacing the
+properties as appropriate:
+
+```text
+connector.name=trino_thrift
+trino.thrift.client.addresses=host:port,host:port
+```
+
+### Multiple Thrift systems
+
+You can have as many catalogs as you need, so if you have additional
+Thrift systems to connect to, simply add another properties file to `etc/catalog`
+with a different name, making sure it ends in `.properties`.
+
+## Configuration properties
+
+The following configuration properties are available:
+
+| Property name                              | Description                                              |
+| ------------------------------------------ | -------------------------------------------------------- |
+| `trino.thrift.client.addresses`            | Location of Thrift servers                               |
+| `trino-thrift.max-response-size`           | Maximum size of data returned from Thrift server         |
+| `trino-thrift.metadata-refresh-threads`    | Number of refresh threads for metadata cache             |
+| `trino.thrift.client.max-retries`          | Maximum number of retries for failed Thrift requests     |
+| `trino.thrift.client.max-backoff-delay`    | Maximum interval between retry attempts                  |
+| `trino.thrift.client.min-backoff-delay`    | Minimum interval between retry attempts                  |
+| `trino.thrift.client.max-retry-time`       | Maximum duration across all attempts of a Thrift request |
+| `trino.thrift.client.backoff-scale-factor` | Scale factor for exponential back off                    |
+| `trino.thrift.client.connect-timeout`      | Connect timeout                                          |
+| `trino.thrift.client.request-timeout`      | Request timeout                                          |
+| `trino.thrift.client.socks-proxy`          | SOCKS proxy address                                      |
+| `trino.thrift.client.max-frame-size`       | Maximum size of a raw Thrift response                    |
+| `trino.thrift.client.transport`            | Thrift transport type (`UNFRAMED`, `FRAMED`, `HEADER`)   |
+| `trino.thrift.client.protocol`             | Thrift protocol type (`BINARY`, `COMPACT`, `FB_COMPACT`) |
+
+### `trino.thrift.client.addresses`
+
+Comma-separated list of thrift servers in the form of `host:port`. For example:
+
+```text
+trino.thrift.client.addresses=192.0.2.3:7777,192.0.2.4:7779
+```
+
+This property is required; there is no default.
+
+### `trino-thrift.max-response-size`
+
+Maximum size of a data response that the connector accepts. This value is sent
+by the connector to the Thrift server when requesting data, allowing it to size
+the response appropriately.
+
+This property is optional; the default is `16MB`.
+
+### `trino-thrift.metadata-refresh-threads`
+
+Number of refresh threads for metadata cache.
+
+This property is optional; the default is `1`.
+
+(trino-thrift-service)=
+
+## TrinoThriftService implementation
+
+The following IDL describes the `TrinoThriftService` that must be implemented:
+
+```{literalinclude} /include/TrinoThriftService.thrift
+:language: thrift
+```
+
+(thrift-type-mapping)=
+
+## Type mapping
+
+The Thrift service defines data type support and mappings to Trino data types.
+
+(thrift-sql-support)=
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements to access data and
+metadata in your Thrift service.
diff --git a/docs/src/main/sphinx/connector/thrift.rst b/docs/src/main/sphinx/connector/thrift.rst
deleted file mode 100644
index cb86822b2328..000000000000
--- a/docs/src/main/sphinx/connector/thrift.rst
+++ /dev/null
@@ -1,121 +0,0 @@
-================
-Thrift connector
-================
-
-The Thrift connector makes it possible to integrate with external storage systems
-without a custom Trino connector implementation by using
-`Apache Thrift <https://thrift.apache.org/>`_ on these servers. It is therefore
-generic and can provide access to any backend, as long as it exposes the expected
-API by using Thrift.
-
-In order to use the Thrift connector with an external system, you need to implement
-the ``TrinoThriftService`` interface, found below. Next, you configure the Thrift connector
-to point to a set of machines, called Thrift servers, that implement the interface.
-As part of the interface implementation, the Thrift servers provide metadata,
-splits and data. The connector randomly chooses a server to talk to from the available
-instances for metadata calls, or for data calls unless the splits include a list of addresses.
-All requests are assumed to be idempotent and can be retried freely among any server.
-
-Requirements
-------------
-
-To connect to your custom servers with the Thrift protocol, you need:
-
-* Network access from the Trino coordinator and workers to the Thrift servers.
-* A :ref:`trino-thrift-service` for your system.
-
-Configuration
--------------
-
-To configure the Thrift connector, create a catalog properties file
-``etc/catalog/example.properties`` with the following content, replacing the
-properties as appropriate:
-
-.. code-block:: text
-
-    connector.name=trino_thrift
-    trino.thrift.client.addresses=host:port,host:port
-
-Multiple Thrift systems
-^^^^^^^^^^^^^^^^^^^^^^^
-
-You can have as many catalogs as you need, so if you have additional
-Thrift systems to connect to, simply add another properties file to ``etc/catalog``
-with a different name, making sure it ends in ``.properties``.
-
-Configuration properties
-------------------------
-
-The following configuration properties are available:
-
-=============================================  ==============================================================
-Property name                                  Description
-=============================================  ==============================================================
-``trino.thrift.client.addresses``               Location of Thrift servers
-``trino-thrift.max-response-size``              Maximum size of data returned from Thrift server
-``trino-thrift.metadata-refresh-threads``       Number of refresh threads for metadata cache
-``trino.thrift.client.max-retries``             Maximum number of retries for failed Thrift requests
-``trino.thrift.client.max-backoff-delay``       Maximum interval between retry attempts
-``trino.thrift.client.min-backoff-delay``       Minimum interval between retry attempts
-``trino.thrift.client.max-retry-time``          Maximum duration across all attempts of a Thrift request
-``trino.thrift.client.backoff-scale-factor``    Scale factor for exponential back off
-``trino.thrift.client.connect-timeout``         Connect timeout
-``trino.thrift.client.request-timeout``         Request timeout
-``trino.thrift.client.socks-proxy``             SOCKS proxy address
-``trino.thrift.client.max-frame-size``          Maximum size of a raw Thrift response
-``trino.thrift.client.transport``               Thrift transport type (``UNFRAMED``, ``FRAMED``, ``HEADER``)
-``trino.thrift.client.protocol``                Thrift protocol type (``BINARY``, ``COMPACT``, ``FB_COMPACT``)
-=============================================  ==============================================================
-
-``trino.thrift.client.addresses``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Comma-separated list of thrift servers in the form of ``host:port``. For example:
-
-.. code-block:: text
-
-    trino.thrift.client.addresses=192.0.2.3:7777,192.0.2.4:7779
-
-This property is required; there is no default.
-
-``trino-thrift.max-response-size``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Maximum size of a data response that the connector accepts. This value is sent
-by the connector to the Thrift server when requesting data, allowing it to size
-the response appropriately.
-
-This property is optional; the default is ``16MB``.
-
-``trino-thrift.metadata-refresh-threads``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Number of refresh threads for metadata cache.
-
-This property is optional; the default is ``1``.
-
-.. _trino-thrift-service:
-
-TrinoThriftService implementation
----------------------------------
-
-The following IDL describes the ``TrinoThriftService`` that must be implemented:
-
-.. literalinclude:: /include/TrinoThriftService.thrift
-    :language: thrift
-
-.. _thrift-type-mapping:
-
-Type mapping
-------------
-
-The Thrift service defines data type support and mappings to Trino data types.
-
-.. _thrift-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access data and
-metadata in your Thrift service.
diff --git a/docs/src/main/sphinx/connector/tpcds.md b/docs/src/main/sphinx/connector/tpcds.md
new file mode 100644
index 000000000000..ac1db6560ecf
--- /dev/null
+++ b/docs/src/main/sphinx/connector/tpcds.md
@@ -0,0 +1,72 @@
+# TPCDS connector
+
+The TPCDS connector provides a set of schemas to support the
+[TPC Benchmark™ DS (TPC-DS)](http://www.tpc.org/tpcds/). TPC-DS is a database
+benchmark used to measure the performance of complex decision support databases.
+
+This connector can be used to test the capabilities and query
+syntax of Trino without configuring access to an external data
+source. When you query a TPCDS schema, the connector generates the
+data on the fly using a deterministic algorithm.
+
+## Configuration
+
+To configure the TPCDS connector, create a catalog properties file
+`etc/catalog/example.properties` with the following contents:
+
+```text
+connector.name=tpcds
+```
+
+## TPCDS schemas
+
+The TPCDS connector supplies several schemas:
+
+```
+SHOW SCHEMAS FROM example;
+```
+
+```text
+       Schema
+--------------------
+ information_schema
+ sf1
+ sf10
+ sf100
+ sf1000
+ sf10000
+ sf100000
+ sf300
+ sf3000
+ sf30000
+ tiny
+(11 rows)
+```
+
+Ignore the standard schema `information_schema`, which exists in every
+catalog, and is not directly provided by the TPCDS connector.
+
+Every TPCDS schema provides the same set of tables. Some tables are
+identical in all schemas. The *scale factor* of the tables in a particular
+schema is determined from the schema name. For example, the schema
+`sf1` corresponds to scale factor `1` and the schema `sf300`
+corresponds to scale factor `300`. Every unit in the scale factor
+corresponds to a gigabyte of data. For example, for scale factor `300`,
+a total of `300` gigabytes are generated. The `tiny` schema is an
+alias for scale factor `0.01`, which is a very small data set useful for
+testing.
+
+(tpcds-type-mapping)=
+
+## Type mapping
+
+Trino supports all data types used within the TPCDS schemas so no mapping is
+required.
+
+(tpcds-sql-support)=
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements to access data and
+metadata in the TPC-DS dataset.
diff --git a/docs/src/main/sphinx/connector/tpcds.rst b/docs/src/main/sphinx/connector/tpcds.rst
deleted file mode 100644
index 155d4b2427af..000000000000
--- a/docs/src/main/sphinx/connector/tpcds.rst
+++ /dev/null
@@ -1,76 +0,0 @@
-===============
-TPCDS connector
-===============
-
-The TPCDS connector provides a set of schemas to support the
-`TPC Benchmark™ DS (TPC-DS) <http://www.tpc.org/tpcds/>`_. TPC-DS is a database
-benchmark used to measure the performance of complex decision support databases.
-
-This connector can be used to test the capabilities and query
-syntax of Trino without configuring access to an external data
-source. When you query a TPCDS schema, the connector generates the
-data on the fly using a deterministic algorithm.
-
-Configuration
--------------
-
-To configure the TPCDS connector, create a catalog properties file
-``etc/catalog/example.properties`` with the following contents:
-
-.. code-block:: text
-
-    connector.name=tpcds
-
-TPCDS schemas
--------------
-
-The TPCDS connector supplies several schemas::
-
-    SHOW SCHEMAS FROM example;
-
-.. code-block:: text
-
-           Schema
-    --------------------
-     information_schema
-     sf1
-     sf10
-     sf100
-     sf1000
-     sf10000
-     sf100000
-     sf300
-     sf3000
-     sf30000
-     tiny
-    (11 rows)
-
-Ignore the standard schema ``information_schema``, which exists in every
-catalog, and is not directly provided by the TPCDS connector.
-
-Every TPCDS schema provides the same set of tables. Some tables are
-identical in all schemas. The *scale factor* of the tables in a particular
-schema is determined from the schema name. For example, the schema
-``sf1`` corresponds to scale factor ``1`` and the schema ``sf300``
-corresponds to scale factor ``300``. Every unit in the scale factor
-corresponds to a gigabyte of data. For example, for scale factor ``300``,
-a total of ``300`` gigabytes are generated. The ``tiny`` schema is an
-alias for scale factor ``0.01``, which is a very small data set useful for
-testing.
-
-.. _tpcds-type-mapping:
-
-Type mapping
-------------
-
-Trino supports all data types used within the TPCDS schemas so no mapping is
-required.
-
-.. _tpcds-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access data and
-metadata in the TPC-DS dataset.
diff --git a/docs/src/main/sphinx/connector/tpch.md b/docs/src/main/sphinx/connector/tpch.md
new file mode 100644
index 000000000000..c55de00b9139
--- /dev/null
+++ b/docs/src/main/sphinx/connector/tpch.md
@@ -0,0 +1,80 @@
+# TPCH connector
+
+The TPCH connector provides a set of schemas to support the
+[TPC Benchmark™ H (TPC-H)](http://www.tpc.org/tpch/). TPC-H is a database
+benchmark used to measure the performance of highly-complex decision support databases.
+
+This connector can be used to test the capabilities and query
+syntax of Trino without configuring access to an external data
+source. When you query a TPCH schema, the connector generates the
+data on the fly using a deterministic algorithm.
+
+## Configuration
+
+To configure the TPCH connector, create a catalog properties file
+`etc/catalog/example.properties` with the following contents:
+
+```text
+connector.name=tpch
+```
+
+In the TPC-H specification, each column is assigned a prefix based on its
+corresponding table name, such as `l_` for the `lineitem` table. By default, the
+TPCH connector simplifies column names by excluding these prefixes with the
+default of `tpch.column-naming` to `SIMPLIFIED`. To use the long, standard
+column names, use the configuration in the catalog properties file:
+
+```text
+tpch.column-naming=STANDARD
+```
+
+## TPCH schemas
+
+The TPCH connector supplies several schemas:
+
+```
+SHOW SCHEMAS FROM example;
+```
+
+```text
+       Schema
+--------------------
+ information_schema
+ sf1
+ sf100
+ sf1000
+ sf10000
+ sf100000
+ sf300
+ sf3000
+ sf30000
+ tiny
+(11 rows)
+```
+
+Ignore the standard schema `information_schema`, which exists in every
+catalog, and is not directly provided by the TPCH connector.
+
+Every TPCH schema provides the same set of tables. Some tables are
+identical in all schemas. Other tables vary based on the *scale factor*,
+which is determined based on the schema name. For example, the schema
+`sf1` corresponds to scale factor `1` and the schema `sf300`
+corresponds to scale factor `300`. The TPCH connector provides an
+infinite number of schemas for any scale factor, not just the few common
+ones listed by `SHOW SCHEMAS`. The `tiny` schema is an alias for scale
+factor `0.01`, which is a very small data set useful for testing.
+
+(tpch-type-mapping)=
+
+## Type mapping
+
+Trino supports all data types used within the TPCH schemas so no mapping
+is required.
+
+(tpch-sql-support)=
+
+## SQL support
+
+The connector provides {ref}`globally available <sql-globally-available>` and
+{ref}`read operation <sql-read-operations>` statements to access data and
+metadata in the TPC-H dataset.
diff --git a/docs/src/main/sphinx/connector/tpch.rst b/docs/src/main/sphinx/connector/tpch.rst
deleted file mode 100644
index 7bec8f9926ff..000000000000
--- a/docs/src/main/sphinx/connector/tpch.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-==============
-TPCH connector
-==============
-
-The TPCH connector provides a set of schemas to support the
-`TPC Benchmark™ H (TPC-H) <http://www.tpc.org/tpch/>`_. TPC-H is a database
-benchmark used to measure the performance of highly-complex decision support databases.
-
-This connector can be used to test the capabilities and query
-syntax of Trino without configuring access to an external data
-source. When you query a TPCH schema, the connector generates the
-data on the fly using a deterministic algorithm.
-
-Configuration
--------------
-
-To configure the TPCH connector, create a catalog properties file
-``etc/catalog/example.properties`` with the following contents:
-
-.. code-block:: text
-
-    connector.name=tpch
-
-TPCH schemas
-------------
-
-The TPCH connector supplies several schemas::
-
-    SHOW SCHEMAS FROM example;
-
-.. code-block:: text
-
-           Schema
-    --------------------
-     information_schema
-     sf1
-     sf100
-     sf1000
-     sf10000
-     sf100000
-     sf300
-     sf3000
-     sf30000
-     tiny
-    (11 rows)
-
-Ignore the standard schema ``information_schema``, which exists in every
-catalog, and is not directly provided by the TPCH connector.
-
-Every TPCH schema provides the same set of tables. Some tables are
-identical in all schemas. Other tables vary based on the *scale factor*,
-which is determined based on the schema name. For example, the schema
-``sf1`` corresponds to scale factor ``1`` and the schema ``sf300``
-corresponds to scale factor ``300``. The TPCH connector provides an
-infinite number of schemas for any scale factor, not just the few common
-ones listed by ``SHOW SCHEMAS``. The ``tiny`` schema is an alias for scale
-factor ``0.01``, which is a very small data set useful for testing.
-
-.. _tpch-type-mapping:
-
-Type mapping
-------------
-
-Trino supports all data types used within the TPCH schemas so no mapping
-is required.
-
-.. _tpch-sql-support:
-
-SQL support
------------
-
-The connector provides :ref:`globally available <sql-globally-available>` and
-:ref:`read operation <sql-read-operations>` statements to access data and
-metadata in the TPC-H dataset.
diff --git a/docs/src/main/sphinx/develop.md b/docs/src/main/sphinx/develop.md
new file mode 100644
index 000000000000..5f3667c50fa7
--- /dev/null
+++ b/docs/src/main/sphinx/develop.md
@@ -0,0 +1,24 @@
+# Developer guide
+
+This guide is intended for Trino contributors and plugin developers.
+
+```{toctree}
+:maxdepth: 1
+
+develop/spi-overview
+develop/connectors
+develop/example-http
+develop/example-jdbc
+develop/insert
+develop/supporting-merge
+develop/types
+develop/functions
+develop/table-functions
+develop/system-access-control
+develop/password-authenticator
+develop/certificate-authenticator
+develop/header-authenticator
+develop/group-provider
+develop/event-listener
+develop/client-protocol
+```
diff --git a/docs/src/main/sphinx/develop.rst b/docs/src/main/sphinx/develop.rst
deleted file mode 100644
index 210e78813dc4..000000000000
--- a/docs/src/main/sphinx/develop.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-***************
-Developer guide
-***************
-
-This guide is intended for Trino contributors and plugin developers.
-
-.. toctree::
-    :maxdepth: 1
-
-    develop/spi-overview
-    develop/connectors
-    develop/example-http
-    develop/example-jdbc
-    develop/insert
-    develop/supporting-merge
-    develop/types
-    develop/functions
-    develop/table-functions
-    develop/system-access-control
-    develop/password-authenticator
-    develop/certificate-authenticator
-    develop/header-authenticator
-    develop/group-provider
-    develop/event-listener
-    develop/client-protocol
diff --git a/docs/src/main/sphinx/develop/certificate-authenticator.md b/docs/src/main/sphinx/develop/certificate-authenticator.md
new file mode 100644
index 000000000000..722773e86e19
--- /dev/null
+++ b/docs/src/main/sphinx/develop/certificate-authenticator.md
@@ -0,0 +1,41 @@
+# Certificate authenticator
+
+Trino supports TLS-based authentication with X509 certificates via a custom
+certificate authenticator that extracts the principal from a client certificate.
+
+## Implementation
+
+`CertificateAuthenticatorFactory` is responsible for creating a
+`CertificateAuthenticator` instance. It also defines the name of this
+authenticator which is used by the administrator in a Trino configuration.
+
+`CertificateAuthenticator` contains a single method, `authenticate()`,
+which authenticates the client certificate and returns a `Principal`, which is then
+authorized by the {doc}`system-access-control`.
+
+The implementation of `CertificateAuthenticatorFactory` must be wrapped
+as a plugin and installed on the Trino cluster.
+
+## Configuration
+
+After a plugin that implements `CertificateAuthenticatorFactory` has been
+installed on the coordinator, it is configured using an
+`etc/certificate-authenticator.properties` file. All of the
+properties other than `certificate-authenticator.name` are specific to the
+`CertificateAuthenticatorFactory` implementation.
+
+The `certificate-authenticator.name` property is used by Trino to find a
+registered `CertificateAuthenticatorFactory` based on the name returned by
+`CertificateAuthenticatorFactory.getName()`. The remaining properties are
+passed as a map to `CertificateAuthenticatorFactory.create()`.
+
+Example configuration file:
+
+```text
+certificate-authenticator.name=custom
+custom-property1=custom-value1
+custom-property2=custom-value2
+```
+
+Additionally, the coordinator must be configured to use certificate authentication
+and have HTTPS enabled (or HTTPS forwarding enabled).
diff --git a/docs/src/main/sphinx/develop/certificate-authenticator.rst b/docs/src/main/sphinx/develop/certificate-authenticator.rst
deleted file mode 100644
index e213194e909e..000000000000
--- a/docs/src/main/sphinx/develop/certificate-authenticator.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-=========================
-Certificate authenticator
-=========================
-
-Trino supports TLS-based authentication with X509 certificates via a custom
-certificate authenticator that extracts the principal from a client certificate.
-
-Implementation
---------------
-
-``CertificateAuthenticatorFactory`` is responsible for creating a
-``CertificateAuthenticator`` instance. It also defines the name of this
-authenticator which is used by the administrator in a Trino configuration.
-
-``CertificateAuthenticator`` contains a single method, ``authenticate()``,
-which authenticates the client certificate and returns a ``Principal``, which is then
-authorized by the :doc:`system-access-control`.
-
-The implementation of ``CertificateAuthenticatorFactory`` must be wrapped
-as a plugin and installed on the Trino cluster.
-
-Configuration
--------------
-
-After a plugin that implements ``CertificateAuthenticatorFactory`` has been
-installed on the coordinator, it is configured using an
-``etc/certificate-authenticator.properties`` file. All of the
-properties other than ``certificate-authenticator.name`` are specific to the
-``CertificateAuthenticatorFactory`` implementation.
-
-The ``certificate-authenticator.name`` property is used by Trino to find a
-registered ``CertificateAuthenticatorFactory`` based on the name returned by
-``CertificateAuthenticatorFactory.getName()``. The remaining properties are
-passed as a map to ``CertificateAuthenticatorFactory.create()``.
-
-Example configuration file:
-
-.. code-block:: text
-
-    certificate-authenticator.name=custom
-    custom-property1=custom-value1
-    custom-property2=custom-value2
-
-Additionally, the coordinator must be configured to use certificate authentication
-and have HTTPS enabled (or HTTPS forwarding enabled).
diff --git a/docs/src/main/sphinx/develop/client-protocol.md b/docs/src/main/sphinx/develop/client-protocol.md
new file mode 100644
index 000000000000..93fffc9dd9b9
--- /dev/null
+++ b/docs/src/main/sphinx/develop/client-protocol.md
@@ -0,0 +1,278 @@
+# Trino client REST API
+
+The REST API allows clients to submit SQL queries to Trino and receive the
+results. Clients include the CLI, the JDBC driver, and others provided by
+the community. The preferred method to interact with Trino is using these
+existing clients. This document provides details about the API for reference.
+It can also be used to implement your own client, if necessary.
+
+## HTTP methods
+
+- A `POST` to `/v1/statement` runs the query string in the `POST` body,
+  and returns a JSON document containing the query results.  If there are more
+  results, the JSON document contains a `nextUri` URL attribute.
+- A `GET` to the `nextUri` attribute returns the next batch of query results.
+- A `DELETE` to `nextUri` terminates a running query.
+
+## Overview of query processing
+
+A Trino client request is initiated by an HTTP `POST` to the endpoint
+`/v1/statement`, with a `POST` body consisting of the SQL query string.
+The caller may set various {ref}`client-request-headers`. The headers are
+only required on the initial `POST` request, and not when following the
+`nextUri` links.
+
+If the client request returns an HTTP 502, 503 or 504, that means there was
+intermittent problem processing request and the client should try again
+in 50-100 milliseconds. Trino does not generate those codes by itself
+but those can be generated by gateways/load balancers in front of Trino.
+Any HTTP status other than 502, 503, 504 or 200 means that query processing
+has failed.
+
+The `/v1/statement` `POST` request returns a JSON document of type
+`QueryResults`, as well as a collection of response headers.  The
+`QueryResults` document contains an `error` field of type
+`QueryError` if the query has failed, and if that object is not present,
+the query succeeded.  Important members of `QueryResults` are documented
+in the following sections.
+
+If the `data` field of the JSON document is set, it contains a list of the
+rows of data.  The `columns` field is set to a list of the
+names and types of the columns returned by the query.  Most of the response
+headers are treated like browser cookies by the client, and echoed back
+as request headers in subsequent client requests, as documented below.
+
+If the JSON document returned by the `POST` to `/v1/statement` does not
+contain a `nextUri` link, the query has completed, either successfully or
+unsuccessfully, and no additional requests need to be made.  If the
+`nextUri` link is present in the document, there are more query results
+to be fetched.  The client should loop executing a `GET` request
+to the `nextUri` returned in the `QueryResults` response object until
+`nextUri` is absent from the response.
+
+The `status` field of the JSON document is for human consumption only, and
+provides a hint about the query state.  It can not be used to tell if the
+query is finished.
+
+## Important `QueryResults` attributes
+
+The most important attributes of the `QueryResults` JSON document returned by
+the REST API endpoints are listed in this table. For more details, refer to the
+class `io.trino.client.QueryResults` in module `trino-client` in the
+`client` directory of the Trino source code.
+
+```{eval-rst}
+.. list-table:: ``QueryResults attributes``
+  :widths: 25, 55
+  :header-rows: 1
+
+  * - Attribute
+    - Description
+  * - ``id``
+    - The ID of the query.
+  * - ``nextUri``
+    - If present, the URL to use for subsequent ``GET`` or
+      ``DELETE`` requests.  If not present, the query is complete or
+      ended in error.
+  * - ``columns``
+    - A list of the names and types of the columns returned by the query.
+  * - ``data``
+    - The ``data`` attribute contains a list of the rows returned by the
+      query request.  Each row is itself a list that holds values of the
+      columns in the row, in the order specified by the ``columns``
+      attribute.
+  * - ``updateType``
+    - A human-readable string representing the operation.  For a
+      ``CREATE TABLE`` request, the ``updateType`` is
+      "CREATE TABLE"; for ``SET SESSION`` it is "SET SESSION"; etc.
+  * - ``error``
+    - If query failed, the ``error`` attribute contains a ``QueryError`` object.
+      That object contains a ``message``, an ``errorCode`` and other information
+      about the error.  See the ``io.trino.client.QueryError`` class in module
+      ``trino-client`` in the ``client`` directory for more details.
+
+```
+
+## `QueryResults` diagnostic attributes
+
+These `QueryResults` data members may be useful in tracking down problems:
+
+```{eval-rst}
+.. list-table:: ``QueryResults diagnostic attributes``
+  :widths: 20, 20, 40
+  :header-rows: 1
+
+  * - Attribute
+    - Type
+    - Description
+  * - ``queryError``
+    - ``QueryError``
+    - Non-null only if the query resulted in an error.
+  * - ``failureInfo``
+    - ``FailureInfo``
+    - ``failureInfo`` has detail on the reason for the failure, including
+      a stack trace, and ``FailureInfo.errorLocation``, providing the
+      query line number and column number where the failure was detected.
+  * - ``warnings``
+    - ``List<TrinoWarning>``
+    - A usually-empty list of warnings.
+  * - ``statementStats``
+    - ``StatementStats``
+    - A class containing statistics about the query execution.  Of
+      particular interest is ``StatementStats.rootStage``, of type
+      ``StageStats``, providing statistics on the execution of each of
+      the stages of query processing.
+```
+
+(client-request-headers)=
+
+## Client request headers
+
+This table lists all supported client request headers.  Many of the
+headers can be updated in the client as response headers, and supplied
+in subsequent requests, just like browser cookies.
+
+```{eval-rst}
+.. list-table:: Client request headers
+  :widths: 30, 50
+  :header-rows: 1
+
+  * - Header name
+    - Description
+  * - ``X-Trino-User``
+    - Specifies the session user. If not supplied, the session user is
+      automatically determined via :doc:`/security/user-mapping`.
+  * - ``X-Trino-Original-User``
+    - Specifies the session's original user.
+  * - ``X-Trino-Source``
+    - For reporting purposes, this supplies the name of the software
+      that submitted the query.
+  * - ``X-Trino-Catalog``
+    - The catalog context for query processing.  Set by response
+      header ``X-Trino-Set-Catalog``.
+  * - ``X-Trino-Schema``
+    - The schema context for query processing.  Set by response
+      header ``X-Trino-Set-Schema``.
+  * - ``X-Trino-Time-Zone``
+    - The timezone for query processing. Defaults to the timezone
+      of the Trino cluster, and not the timezone of the client.
+  * - ``X-Trino-Language``
+    - The language to use when processing the query and formatting
+      results, formatted as a Java ``Locale`` string, e.g., ``en-US``
+      for US English.  The language of the
+      session can be set on a per-query basis using the
+      ``X-Trino-Language`` HTTP header.
+  * - ``X-Trino-Trace-Token``
+    - Supplies a trace token to the Trino engine to help identify
+      log lines that originate with this query request.
+  * - ``X-Trino-Session``
+    - Supplies a comma-separated list of name=value pairs as session
+      properties.  When the Trino client run a
+      ``SET SESSION name=value`` query, the name=value pair
+      is returned in the ``X-Set-Trino-Session`` response header,
+      and added to the client's list of session properties.
+      If the response header ``X-Trino-Clear-Session`` is returned,
+      its value is the name of a session property that is
+      removed from the client's accumulated list.
+  * - ``X-Trino-Role``
+    - Sets the "role" for query processing. A "role" represents
+      a collection of permissions. Set by response header
+      ``X-Trino-Set-Role``. See :doc:`/sql/create-role` to
+      understand roles.
+  * - ``X-Trino-Prepared-Statement``
+    - A comma-separated list of the name=value pairs, where the
+      names are names of previously prepared SQL statements, and
+      the values are keys that identify the executable form of the
+      named prepared statements.
+  * - ``X-Trino-Transaction-Id``
+    - The transaction ID to use for query processing.  Set
+      by response header ``X-Trino-Started-Transaction-Id`` and
+      cleared by ``X-Trino-Clear-Transaction-Id``.
+  * - ``X-Trino-Client-Info``
+    - Contains arbitrary information about the client program
+      submitting the query.
+  * - ``X-Trino-Client-Tags``
+    - A comma-separated list of "tag" strings, used to identify
+      Trino resource groups.
+  * - ``X-Trino-Resource-Estimate``
+    - A comma-separated list of ``resource=value`` type
+      assigments.  The possible choices of ``resource`` are
+      ``EXECUTION_TIME``, ``CPU_TIME``,  ``PEAK_MEMORY`` and
+      ``PEAK_TASK_MEMORY``.  ``EXECUTION_TIME`` and ``CPU_TIME``
+      have values specified as airlift ``Duration`` strings
+      The format is a double precision number followed by
+      a ``TimeUnit`` string, e.g., of ``s`` for seconds,
+      ``m`` for minutes, ``h`` for hours, etc.  "PEAK_MEMORY" and
+      "PEAK_TASK_MEMORY" are specified as as airlift ``DataSize`` strings,
+      whose format is an integer followed by ``B`` for bytes; ``kB`` for
+      kilobytes; ``mB`` for megabytes, ``gB`` for gigabytes, etc.
+  * - ``X-Trino-Extra-Credential``
+    - Provides extra credentials to the connector.  The header is
+      a name=value string that is saved in the session ``Identity``
+      object.  The name and value are only meaningful to the connector.
+```
+
+## Client response headers
+
+This table lists the supported client response headers.  After receiving a
+response, a client must update the request headers used in
+subsequent requests to be consistent with the response headers received.
+
+```{eval-rst}
+.. list-table:: Client response headers
+  :widths: 30, 50
+  :header-rows: 1
+
+  * - Header name
+    - Description
+  * - ``X-Trino-Set-Catalog``
+    - Instructs the client to set the catalog in the
+      ``X-Trino-Catalog`` request header in subsequent client requests.
+  * - ``X-Trino-Set-Schema``
+    - Instructs the client to set the schema in the
+      ``X-Trino-Schema`` request header in subsequent client requests.
+  * - ``X-Trino-Set-Authorization-User``
+    - Instructs the client to set the session authorization user in the
+      ``X-Trino-Authorization-User`` request header in subsequent client requests.
+  * - ``X-Trino-Reset-Authorization-User``
+    - Instructs the client to remove ``X-Trino-Authorization-User`` request header
+      in subsequent client requests to reset the authorization user back to the
+      original user.
+  * - ``X-Trino-Set-Session``
+    - The value of the ``X-Trino-Set-Session`` response header is a
+      string of the form *property* = *value*.  It
+      instructs the client include session property *property* with value
+      *value* in the ``X-Trino-Session`` header of subsequent
+      client requests.
+  * - ``X-Trino-Clear-Session``
+    - Instructs the client to remove the session property with the
+      whose name is the value of the ``X-Trino-Clear-Session`` header
+      from the list of session properties
+      in the ``X-Trino-Session`` header in subsequent client requests.
+  * - ``X-Trino-Set-Role``
+    - Instructs the client to set ``X-Trino-Role`` request header to the
+      catalog role supplied by the ``X-Trino-Set-Role`` header
+      in subsequent client requests.
+  * - ``X-Trino-Added-Prepare``
+    - Instructs the client to add the name=value pair to the set of
+      prepared statements in the ``X-Trino-Prepared-Statement``
+      request header in subsequent client requests.
+  * - ``X-Trino-Deallocated-Prepare``
+    - Instructs the client to remove the prepared statement whose name
+      is the value of the ``X-Trino-Deallocated-Prepare`` header from
+      the client's list of prepared statements sent in the
+      ``X-Trino-Prepared-Statement`` request header in subsequent client
+      requests.
+  * - ``X-Trino-Started-Transaction-Id``
+    - Provides the transaction ID that the client should pass back in the
+      ``X-Trino-Transaction-Id`` request header in subsequent requests.
+  * - ``X-Trino-Clear-Transaction-Id``
+    - Instructs the client to clear the ``X-Trino-Transaction-Id`` request
+      header in subsequent requests.
+```
+
+## `ProtocolHeaders`
+
+Class `io.trino.client.ProtocolHeaders` in module `trino-client` in the
+`client` directory of Trino source enumerates all the HTTP request and
+response headers allowed by the Trino client REST API.
diff --git a/docs/src/main/sphinx/develop/client-protocol.rst b/docs/src/main/sphinx/develop/client-protocol.rst
deleted file mode 100644
index fc0f6304d1cf..000000000000
--- a/docs/src/main/sphinx/develop/client-protocol.rst
+++ /dev/null
@@ -1,270 +0,0 @@
-======================
-Trino client REST API
-======================
-
-The REST API allows clients to submit SQL queries to Trino and receive the
-results. Clients include the CLI, the JDBC driver, and others provided by
-the community. The preferred method to interact with Trino is using these
-existing clients. This document provides details about the API for reference.
-It can also be used to implement your own client, if necessary.
-
-HTTP methods
-------------
-
-* A ``POST`` to ``/v1/statement`` runs the query string in the ``POST`` body,
-  and returns a JSON document containing the query results.  If there are more
-  results, the JSON document contains a ``nextUri`` URL attribute.
-* A ``GET`` to the ``nextUri`` attribute returns the next batch of query results.
-* A ``DELETE`` to ``nextUri`` terminates a running query.
-
-Overview of query processing
-----------------------------
-
-A Trino client request is initiated by an HTTP ``POST`` to the endpoint
-``/v1/statement``, with a ``POST`` body consisting of the SQL query string.
-The caller may set various :ref:`client-request-headers`. The headers are
-only required on the initial ``POST`` request, and not when following the
-``nextUri`` links.
-
-If the client request returns an HTTP 502, 503 or 504, that means there was
-intermittent problem processing request and the client should try again
-in 50-100 milliseconds. Trino does not generate those codes by itself
-but those can be generated by gateways/load balancers in front of Trino.
-Any HTTP status other than 502, 503, 504 or 200 means that query processing
-has failed.
-
-The ``/v1/statement`` ``POST`` request returns a JSON document of type
-``QueryResults``, as well as a collection of response headers.  The
-``QueryResults`` document contains an ``error`` field of type
-``QueryError`` if the query has failed, and if that object is not present,
-the query succeeded.  Important members of ``QueryResults`` are documented
-in the following sections.
-
-If the ``data`` field of the JSON document is set, it contains a list of the
-rows of data.  The ``columns`` field is set to a list of the
-names and types of the columns returned by the query.  Most of the response
-headers are treated like browser cookies by the client, and echoed back
-as request headers in subsequent client requests, as documented below.
-
-If the JSON document returned by the ``POST`` to ``/v1/statement`` does not
-contain a ``nextUri`` link, the query has completed, either successfully or
-unsuccessfully, and no additional requests need to be made.  If the
-``nextUri`` link is present in the document, there are more query results
-to be fetched.  The client should loop executing a ``GET`` request
-to the ``nextUri`` returned in the ``QueryResults`` response object until
-``nextUri`` is absent from the response.
-
-The ``status`` field of the JSON document is for human consumption only, and
-provides a hint about the query state.  It can not be used to tell if the
-query is finished.
-
-Important ``QueryResults`` attributes
--------------------------------------
-
-The most important attributes of the ``QueryResults`` JSON document returned by
-the REST API endpoints are listed in this table. For more details, refer to the
-class ``io.trino.client.QueryResults`` in module ``trino-client`` in the
-``client`` directory of the Trino source code.
-
-.. list-table:: ``QueryResults attributes``
-  :widths: 25, 55
-  :header-rows: 1
-
-  * - Attribute
-    - Description
-  * - ``id``
-    - The ID of the query.
-  * - ``nextUri``
-    - If present, the URL to use for subsequent ``GET`` or
-      ``DELETE`` requests.  If not present, the query is complete or
-      ended in error.
-  * - ``columns``
-    - A list of the names and types of the columns returned by the query.
-  * - ``data``
-    - The ``data`` attribute contains a list of the rows returned by the
-      query request.  Each row is itself a list that holds values of the
-      columns in the row, in the order specified by the ``columns``
-      attribute.
-  * - ``updateType``
-    - A human-readable string representing the operation.  For a
-      ``CREATE TABLE`` request, the ``updateType`` is
-      "CREATE TABLE"; for ``SET SESSION`` it is "SET SESSION"; etc.
-  * - ``error``
-    - If query failed, the ``error`` attribute contains a ``QueryError`` object.
-      That object contains a ``message``, an ``errorCode`` and other information
-      about the error.  See the ``io.trino.client.QueryError`` class in module
-      ``trino-client`` in the ``client`` directory for more details.
-
-
-``QueryResults`` diagnostic attributes
---------------------------------------
-
-These ``QueryResults`` data members may be useful in tracking down problems:
-
-.. list-table:: ``QueryResults diagnostic attributes``
-  :widths: 20, 20, 40
-  :header-rows: 1
-
-  * - Attribute
-    - Type
-    - Description
-  * - ``queryError``
-    - ``QueryError``
-    - Non-null only if the query resulted in an error.
-  * - ``failureInfo``
-    - ``FailureInfo``
-    - ``failureInfo`` has detail on the reason for the failure, including
-      a stack trace, and ``FailureInfo.errorLocation``, providing the
-      query line number and column number where the failure was detected.
-  * - ``warnings``
-    - ``List<TrinoWarning>``
-    - A usually-empty list of warnings.
-  * - ``statementStats``
-    - ``StatementStats``
-    - A class containing statistics about the query execution.  Of
-      particular interest is ``StatementStats.rootStage``, of type
-      ``StageStats``, providing statistics on the execution of each of
-      the stages of query processing.
-
-.. _client-request-headers:
-
-Client request headers
-----------------------
-
-This table lists all supported client request headers.  Many of the
-headers can be updated in the client as response headers, and supplied
-in subsequent requests, just like browser cookies.
-
-.. list-table:: Client request headers
-  :widths: 30, 50
-  :header-rows: 1
-
-  * - Header name
-    - Description
-  * - ``X-Trino-User``
-    - Specifies the session user. If not supplied, the session user is
-      automatically determined via :doc:`/security/user-mapping`.
-  * - ``X-Trino-Source``
-    - For reporting purposes, this supplies the name of the software
-      that submitted the query.
-  * - ``X-Trino-Catalog``
-    - The catalog context for query processing.  Set by response
-      header ``X-Trino-Set-Catalog``.
-  * - ``X-Trino-Schema``
-    - The schema context for query processing.  Set by response
-      header ``X-Trino-Set-Schema``.
-  * - ``X-Trino-Time-Zone``
-    - The timezone for query processing. Defaults to the timezone
-      of the Trino cluster, and not the timezone of the client.
-  * - ``X-Trino-Language``
-    - The language to use when processing the query and formatting
-      results, formatted as a Java ``Locale`` string, e.g., ``en-US``
-      for US English.  The language of the
-      session can be set on a per-query basis using the
-      ``X-Trino-Language`` HTTP header.
-  * - ``X-Trino-Trace-Token``
-    - Supplies a trace token to the Trino engine to help identify
-      log lines that originate with this query request.
-  * - ``X-Trino-Session``
-    - Supplies a comma-separated list of name=value pairs as session
-      properties.  When the Trino client run a
-      ``SET SESSION name=value`` query, the name=value pair
-      is returned in the ``X-Set-Trino-Session`` response header,
-      and added to the client's list of session properties.
-      If the response header ``X-Trino-Clear-Session`` is returned,
-      its value is the name of a session property that is
-      removed from the client's accumulated list.
-  * - ``X-Trino-Role``
-    - Sets the "role" for query processing. A "role" represents
-      a collection of permissions. Set by response header
-      ``X-Trino-Set-Role``. See :doc:`/sql/create-role` to
-      understand roles.
-  * - ``X-Trino-Prepared-Statement``
-    - A comma-separated list of the name=value pairs, where the
-      names are names of previously prepared SQL statements, and
-      the values are keys that identify the executable form of the
-      named prepared statements.
-  * - ``X-Trino-Transaction-Id``
-    - The transaction ID to use for query processing.  Set
-      by response header ``X-Trino-Started-Transaction-Id`` and
-      cleared by ``X-Trino-Clear-Transaction-Id``.
-  * - ``X-Trino-Client-Info``
-    - Contains arbitrary information about the client program
-      submitting the query.
-  * - ``X-Trino-Client-Tags``
-    - A comma-separated list of "tag" strings, used to identify
-      Trino resource groups.
-  * - ``X-Trino-Resource-Estimate``
-    - A comma-separated list of ``resource=value`` type
-      assigments.  The possible choices of ``resource`` are
-      ``EXECUTION_TIME``, ``CPU_TIME``,  ``PEAK_MEMORY`` and
-      ``PEAK_TASK_MEMORY``.  ``EXECUTION_TIME`` and ``CPU_TIME``
-      have values specified as airlift ``Duration`` strings
-      The format is a double precision number followed by
-      a ``TimeUnit`` string, e.g., of ``s`` for seconds,
-      ``m`` for minutes, ``h`` for hours, etc.  "PEAK_MEMORY" and
-      "PEAK_TASK_MEMORY" are specified as as airlift ``DataSize`` strings,
-      whose format is an integer followed by ``B`` for bytes; ``kB`` for
-      kilobytes; ``mB`` for megabytes, ``gB`` for gigabytes, etc.
-  * - ``X-Trino-Extra-Credential``
-    - Provides extra credentials to the connector.  The header is
-      a name=value string that is saved in the session ``Identity``
-      object.  The name and value are only meaningful to the connector.
-
-Client response headers
------------------------
-
-This table lists the supported client response headers.  After receiving a
-response, a client must update the request headers used in
-subsequent requests to be consistent with the response headers received.
-
-.. list-table:: Client response headers
-  :widths: 30, 50
-  :header-rows: 1
-
-  * - Header name
-    - Description
-  * - ``X-Trino-Set-Catalog``
-    - Instructs the client to set the catalog in the
-      ``X-Trino-Catalog`` request header in subsequent client requests.
-  * - ``X-Trino-Set-Schema``
-    - Instructs the client to set the schema in the
-      ``X-Trino-Schema`` request header in subsequent client requests.
-  * - ``X-Trino-Set-Session``
-    - The value of the ``X-Trino-Set-Session`` response header is a
-      string of the form *property* = *value*.  It
-      instructs the client include session property *property* with value
-      *value* in the ``X-Trino-Session`` header of subsequent
-      client requests.
-  * - ``X-Trino-Clear-Session``
-    - Instructs the client to remove the session property with the
-      whose name is the value of the ``X-Trino-Clear-Session`` header
-      from the list of session properties
-      in the ``X-Trino-Session`` header in subsequent client requests.
-  * - ``X-Trino-Set-Role``
-    - Instructs the client to set ``X-Trino-Role`` request header to the
-      catalog role supplied by the ``X-Trino-Set-Role`` header
-      in subsequent client requests.
-  * - ``X-Trino-Added-Prepare``
-    - Instructs the client to add the name=value pair to the set of
-      prepared statements in the ``X-Trino-Prepared-Statement``
-      request header in subsequent client requests.
-  * - ``X-Trino-Deallocated-Prepare``
-    - Instructs the client to remove the prepared statement whose name
-      is the value of the ``X-Trino-Deallocated-Prepare`` header from
-      the client's list of prepared statements sent in the
-      ``X-Trino-Prepared-Statement`` request header in subsequent client
-      requests.
-  * - ``X-Trino-Started-Transaction-Id``
-    - Provides the transaction ID that the client should pass back in the
-      ``X-Trino-Transaction-Id`` request header in subsequent requests.
-  * - ``X-Trino-Clear-Transaction-Id``
-    - Instructs the client to clear the ``X-Trino-Transaction-Id`` request
-      header in subsequent requests.
-
-``ProtocolHeaders``
--------------------
-
-Class ``io.trino.client.ProtocolHeaders`` in module ``trino-client`` in the
-``client`` directory of Trino source enumerates all the HTTP request and
-response headers allowed by the Trino client REST API.
diff --git a/docs/src/main/sphinx/develop/connectors.md b/docs/src/main/sphinx/develop/connectors.md
new file mode 100644
index 000000000000..b3612eb35a92
--- /dev/null
+++ b/docs/src/main/sphinx/develop/connectors.md
@@ -0,0 +1,847 @@
+# Connectors
+
+Connectors are the source of all data for queries in Trino. Even if your data
+source doesn't have underlying tables backing it, as long as you adapt your data
+source to the API expected by Trino, you can write queries against this data.
+
+## ConnectorFactory
+
+Instances of your connector are created by a `ConnectorFactory` instance which
+is created when Trino calls `getConnectorFactory()` on the plugin. The
+connector factory is a simple interface responsible for providing the connector
+name and creating an instance of a `Connector` object. A basic connector
+implementation that only supports reading, but not writing data, should return
+instances of the following services:
+
+- {ref}`connector-metadata`
+- {ref}`connector-split-manager`
+- {ref}`connector-record-set-provider` or {ref}`connector-page-source-provider`
+
+### Configuration
+
+The `create()` method of the connector factory receives a `config` map,
+containing all properties from the catalog properties file. It can be used
+to configure the connector, but because all the values are strings, they
+might require additional processing if they represent other data types.
+It also doesn't validate if all the provided properties are known. This
+can lead to the connector behaving differently than expected when a
+connector ignores a property due to the user making a mistake in
+typing the name of the property.
+
+To make the configuration more robust, define a Configuration class. This
+class describes all the available properties, their types, and additional
+validation rules.
+
+```java
+import io.airlift.configuration.Config;
+import io.airlift.configuration.ConfigDescription;
+import io.airlift.configuration.ConfigSecuritySensitive;
+import io.airlift.units.Duration;
+import io.airlift.units.MaxDuration;
+import io.airlift.units.MinDuration;
+
+import javax.validation.constraints.NotNull;
+
+public class ExampleConfig
+{
+    private String secret;
+    private Duration timeout = Duration.succinctDuration(10, TimeUnit.SECONDS);
+
+    public String getSecret()
+    {
+        return secret;
+    }
+
+    @Config("secret")
+    @ConfigDescription("Secret required to access the data source")
+    @ConfigSecuritySensitive
+    public ExampleConfig setSecret(String secret)
+    {
+        this.secret = secret;
+        return this;
+    }
+
+    @NotNull
+    @MaxDuration("10m")
+    @MinDuration("1ms")
+    public Duration getTimeout()
+    {
+        return timeout;
+    }
+
+    @Config("timeout")
+    public ExampleConfig setTimeout(Duration timeout)
+    {
+        this.timeout = timeout;
+        return this;
+    }
+}
+```
+
+The preceding example defines two configuration properties and makes
+the connector more robust by:
+
+- defining all supported properties, which allows detecting spelling mistakes
+  in the configuration on server startup
+- defining a default timeout value, to prevent connections getting stuck
+  indefinitely
+- preventing invalid timeout values, like 0 ms, that would make
+  all requests fail
+- parsing timeout values in different units, detecting invalid values
+- preventing logging the secret value in plain text
+
+The configuration class needs to be bound in a Guice module:
+
+```java
+import com.google.inject.Binder;
+import com.google.inject.Module;
+
+import static io.airlift.configuration.ConfigBinder.configBinder;
+
+public class ExampleModule
+        implements Module
+{
+    public ExampleModule()
+    {
+    }
+
+    @Override
+    public void configure(Binder binder)
+    {
+        configBinder(binder).bindConfig(ExampleConfig.class);
+    }
+}
+```
+
+And then the module needs to be initialized in the connector factory, when
+creating a new instance of the connector:
+
+```java
+@Override
+public Connector create(String connectorName, Map<String, String> config, ConnectorContext context)
+{
+    requireNonNull(config, "config is null");
+    Bootstrap app = new Bootstrap(new ExampleModule());
+    Injector injector = app
+            .doNotInitializeLogging()
+            .setRequiredConfigurationProperties(config)
+            .initialize();
+
+    return injector.getInstance(ExampleConnector.class);
+}
+```
+
+:::{note}
+Environment variables in the catalog properties file
+(ex. `secret=${ENV:SECRET}`) are resolved only when using
+the `io.airlift.bootstrap.Bootstrap` class to initialize the module.
+See {doc}`/security/secrets` for more information.
+:::
+
+If you end up needing to define multiple catalogs using the same connector
+just to change one property, consider adding support for schema and/or
+table properties. That would allow a more fine-grained configuration.
+If a connector doesn't support managing the schema, query predicates for
+selected columns could be used as a way of passing the required configuration
+at run time.
+
+For example, when building a connector to read commits from a Git repository,
+the repository URL could be a configuration property. But this would result
+in a catalog being able to return data only from a single repository.
+Alternatively, it can be a column, where every select query would require
+a predicate for it:
+
+```sql
+SELECT *
+FROM git.default.commits
+WHERE url = 'https://github.com/trinodb/trino.git'
+```
+
+(connector-metadata)=
+
+## ConnectorMetadata
+
+The connector metadata interface allows Trino to get a lists of schemas,
+tables, columns, and other metadata about a particular data source.
+
+A basic read-only connector should implement the following methods:
+
+- `listSchemaNames`
+- `listTables`
+- `streamTableColumns`
+- `getTableHandle`
+- `getTableMetadata`
+- `getColumnHandles`
+- `getColumnMetadata`
+
+If you are interested in seeing strategies for implementing more methods,
+look at the {doc}`example-http` and the Cassandra connector. If your underlying
+data source supports schemas, tables, and columns, this interface should be
+straightforward to implement. If you are attempting to adapt something that
+isn't a relational database, as the Example HTTP connector does, you may
+need to get creative about how you map your data source to Trino's schema,
+table, and column concepts.
+
+The connector metadata interface allows to also implement other connector
+features, like:
+
+- Schema management, which is creating, altering and dropping schemas, tables,
+  table columns, views, and materialized views.
+
+- Support for table and column comments, and properties.
+
+- Schema, table and view authorization.
+
+- Executing {doc}`table-functions`.
+
+- Providing table statistics used by the Cost Based Optimizer (CBO)
+  and collecting statistics during writes and when analyzing selected tables.
+
+- Data modification, which is:
+
+  - inserting, updating, and deleting rows in tables,
+  - refreshing materialized views,
+  - truncating whole tables,
+  - and creating tables from query results.
+
+- Role and grant management.
+
+- Pushing down:
+
+  - {ref}`Limit and Top N - limit with sort items <connector-limit-pushdown>`
+  - {ref}`Predicates <dev-predicate-pushdown>`
+  - Projections
+  - Sampling
+  - Aggregations
+  - Joins
+  - Table function invocation
+
+Note that data modification also requires implementing
+a {ref}`connector-page-sink-provider`.
+
+When Trino receives a `SELECT` query, it parses it into an Intermediate
+Representation (IR). Then, during optimization, it checks if connectors
+can handle operations related to SQL clauses by calling one of the following
+methods of the `ConnectorMetadata` service:
+
+- `applyLimit`
+- `applyTopN`
+- `applyFilter`
+- `applyProjection`
+- `applySample`
+- `applyAggregation`
+- `applyJoin`
+- `applyTableFunction`
+- `applyTableScanRedirect`
+
+Connectors can indicate that they don't support a particular pushdown or that
+the action had no effect by returning `Optional.empty()`. Connectors should
+expect these methods to be called multiple times during the optimization of
+a given query.
+
+:::{warning}
+It's critical for connectors to return `Optional.empty()` if calling
+this method has no effect for that invocation, even if the connector generally
+supports a particular pushdown. Doing otherwise can cause the optimizer
+to loop indefinitely.
+:::
+
+Otherwise, these methods return a result object containing a new table handle.
+The new table handle represents the virtual table derived from applying the
+operation (filter, project, limit, etc.) to the table produced by the table
+scan node. Once the query actually runs, `ConnectorRecordSetProvider` or
+`ConnectorPageSourceProvider` can use whatever optimizations were pushed down to
+`ConnectorTableHandle`.
+
+The returned table handle is later passed to other services that the connector
+implements, like the `ConnectorRecordSetProvider` or
+`ConnectorPageSourceProvider`.
+
+(connector-limit-pushdown)=
+
+### Limit and top-N pushdown
+
+When executing a `SELECT` query with `LIMIT` or `ORDER BY` clauses,
+the query plan may contain a `Sort` or `Limit` operations.
+
+When the plan contains a `Sort` and `Limit` operations, the engine
+tries to push down the limit into the connector by calling the `applyTopN`
+method of the connector metadata service. If there's no `Sort` operation, but
+only a `Limit`, the `applyLimit` method is called, and the connector can
+return results in an arbitrary order.
+
+If the connector could benefit from the information passed to these methods but
+can't guarantee that it's be able to produce fewer rows than the provided
+limit, it should return a non-empty result containing a new handle for the
+derived table and the `limitGuaranteed` (in `LimitApplicationResult`) or
+`topNGuaranteed` (in `TopNApplicationResult`) flag set to false.
+
+If the connector can guarantee to produce fewer rows than the provided
+limit, it should return a non-empty result with the "limit guaranteed" or
+"topN guaranteed" flag set to true.
+
+:::{note}
+The `applyTopN` is the only method that receives sort items from the
+`Sort` operation.
+:::
+
+In a query, the `ORDER BY` section can include any column with any order.
+But the data source for the connector might only support limited combinations.
+Plugin authors have to decide if the connector should ignore the pushdown,
+return all the data and let the engine sort it, or throw an exception
+to inform the user that particular order isn't supported, if fetching all
+the data would be too expensive or time consuming. When throwing
+an exception, use the `TrinoException` class with the `INVALID_ORDER_BY`
+error code and an actionable message, to let users know how to write a valid
+query.
+
+(dev-predicate-pushdown)=
+
+### Predicate pushdown
+
+When executing a query with a `WHERE` clause, the query plan can
+contain a `ScanFilterProject` plan node/node with a predicate constraint.
+
+A predicate constraint is a description of the constraint imposed on the
+results of the stage/fragment as expressed in the `WHERE` clause. For example,
+`WHERE x > 5 AND y = 3` translates into a constraint where the
+`summary` field means the `x` column's domain must be greater than
+`5` and the `y` column domain equals `3`.
+
+When the query plan contains a `ScanFilterProject` operation, Trino
+tries to optimize the query by pushing down the predicate constraint
+into the connector by calling the `applyFilter` method of the
+connector metadata service. This method receives a table handle with
+all optimizations applied thus far, and returns either
+`Optional.empty()` or a response with a new table handle derived from
+the old one.
+
+The query optimizer may call `applyFilter` for a single query multiple times,
+as it searches for an optimal query plan. Connectors must
+return `Optional.empty()` from `applyFilter` if they cannot apply the
+constraint for this invocation, even if they support `ScanFilterProject`
+pushdown in general. Connectors must also return `Optional.empty()` if the
+constraint has already been applied.
+
+A constraint contains the following elements:
+
+- A `TupleDomain` defining the mapping between columns and their domains.
+  A `Domain` is either a list of possible values, or a list of ranges, and
+  also contains information about nullability.
+- Expression for pushing down function calls.
+- Map of assignments from variables in the expression to columns.
+- (optional) Predicate which tests a map of columns and their values;
+  it cannot be held on to after the `applyFilter` call returns.
+- (optional) Set of columns the predicate depends on; must be present
+  if predicate is present.
+
+If both a predicate and a summary are available, the predicate is guaranteed to
+be more strict in filtering of values, and can provide a significant boost to
+query performance if used.
+
+However it is not possible to store a predicate in the table handle and use
+it later, as the predicate cannot be held on to after the `applyFilter`
+call returns. It is used for filtering of entire partitions, and is not pushed
+down. The summary can be pushed down instead by storing it in the table handle.
+
+This overlap between the predicate and summary is due to historical reasons,
+as simple comparison pushdown was implemented first via summary, and more
+complex filters such as `LIKE` which required more expressive predicates
+were added later.
+
+If a constraint can only be partially pushed down, for example when a connector
+for a database that does not support range matching is used in a query with
+`WHERE x = 2 AND y > 5`, the `y` column constraint must be
+returned in the `ConstraintApplicationResult` from `applyFilter`.
+In this case the `y > 5` condition is applied in Trino,
+and not pushed down.
+
+The following is a simple example which only looks at `TupleDomain`:
+
+```java
+@Override
+public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(
+        ConnectorSession session,
+        ConnectorTableHandle tableHandle,
+        Constraint constraint)
+{
+    ExampleTableHandle handle = (ExampleTableHandle) tableHandle;
+
+    TupleDomain<ColumnHandle> oldDomain = handle.getConstraint();
+    TupleDomain<ColumnHandle> newDomain = oldDomain.intersect(constraint.getSummary());
+    if (oldDomain.equals(newDomain)) {
+        // Nothing has changed, return empty Option
+        return Optional.empty();
+    }
+
+    handle = new ExampleTableHandle(newDomain);
+    return Optional.of(new ConstraintApplicationResult<>(handle, TupleDomain.all(), false));
+}
+```
+
+The `TupleDomain` from the constraint is intersected with the `TupleDomain`
+already applied to the `TableHandle` to form `newDomain`.
+If filtering has not changed, an `Optional.empty()` result is returned to
+notify the planner that this optimization path has reached its end.
+
+In this example, the connector pushes down the `TupleDomain`
+with all Trino data types supported with same semantics in the
+data source. As a result, no filters are needed in Trino,
+and the `ConstraintApplicationResult` sets `remainingFilter` to
+`TupleDomain.all()`.
+
+This pushdown implementation is quite similar to many Trino connectors,
+including  `MongoMetadata`, `BigQueryMetadata`, `KafkaMetadata`.
+
+The following, more complex example shows data types from Trino that are
+not available directly in the underlying data source, and must be mapped:
+
+```java
+@Override
+public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(
+        ConnectorSession session,
+        ConnectorTableHandle table,
+        Constraint constraint)
+{
+    JdbcTableHandle handle = (JdbcTableHandle) table;
+
+    TupleDomain<ColumnHandle> oldDomain = handle.getConstraint();
+    TupleDomain<ColumnHandle> newDomain = oldDomain.intersect(constraint.getSummary());
+    TupleDomain<ColumnHandle> remainingFilter;
+    if (newDomain.isNone()) {
+        newConstraintExpressions = ImmutableList.of();
+        remainingFilter = TupleDomain.all();
+        remainingExpression = Optional.of(Constant.TRUE);
+    }
+    else {
+        // We need to decide which columns to push down.
+        // Since this is a base class for many JDBC-based connectors, each
+        // having different Trino type mappings and comparison semantics
+        // it needs to be flexible.
+
+        Map<ColumnHandle, Domain> domains = newDomain.getDomains().orElseThrow();
+        List<JdbcColumnHandle> columnHandles = domains.keySet().stream()
+                .map(JdbcColumnHandle.class::cast)
+                .collect(toImmutableList());
+
+        // Get information about how to push down every column based on its
+        // JDBC data type
+        List<ColumnMapping> columnMappings = jdbcClient.toColumnMappings(
+                session,
+                columnHandles.stream()
+                        .map(JdbcColumnHandle::getJdbcTypeHandle)
+                        .collect(toImmutableList()));
+
+        // Calculate the domains which can be safely pushed down (supported)
+        // and those which need to be filtered in Trino (unsupported)
+        Map<ColumnHandle, Domain> supported = new HashMap<>();
+        Map<ColumnHandle, Domain> unsupported = new HashMap<>();
+        for (int i = 0; i < columnHandles.size(); i++) {
+            JdbcColumnHandle column = columnHandles.get(i);
+            DomainPushdownResult pushdownResult =
+                columnMappings.get(i).getPredicatePushdownController().apply(
+                    session,
+                    domains.get(column));
+            supported.put(column, pushdownResult.getPushedDown());
+            unsupported.put(column, pushdownResult.getRemainingFilter());
+        }
+
+        newDomain = TupleDomain.withColumnDomains(supported);
+        remainingFilter = TupleDomain.withColumnDomains(unsupported);
+    }
+
+    // Return empty Optional if nothing changed in filtering
+    if (oldDomain.equals(newDomain)) {
+        return Optional.empty();
+    }
+
+    handle = new JdbcTableHandle(
+            handle.getRelationHandle(),
+            newDomain,
+            ...);
+
+    return Optional.of(
+            new ConstraintApplicationResult<>(
+                handle,
+                remainingFilter));
+}
+```
+
+This example illustrates implementing a base class for many JDBC connectors
+while handling the specific requirements of multiple JDBC-compliant data sources.
+It ensures that if a constraint gets pushed down, it works exactly the same in
+the underlying data source, and produces the same results as it would in Trino.
+For example, in databases where string comparisons are case-insensitive,
+pushdown does not work, as string comparison operations in Trino are
+case-sensitive.
+
+The `PredicatePushdownController` interface determines if a column domain can
+be pushed down in JDBC-compliant data sources. In the preceding example, it is
+called from a `JdbcClient` implementation specific to that database.
+In non-JDBC-compliant data sources, type-based push downs are implemented
+directly, without going through the `PredicatePushdownController` interface.
+
+The following example adds expression pushdown enabled by a session flag:
+
+```java
+@Override
+public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(
+        ConnectorSession session,
+        ConnectorTableHandle table,
+        Constraint constraint)
+{
+    JdbcTableHandle handle = (JdbcTableHandle) table;
+
+    TupleDomain<ColumnHandle> oldDomain = handle.getConstraint();
+    TupleDomain<ColumnHandle> newDomain = oldDomain.intersect(constraint.getSummary());
+    List<String> newConstraintExpressions;
+    TupleDomain<ColumnHandle> remainingFilter;
+    Optional<ConnectorExpression> remainingExpression;
+    if (newDomain.isNone()) {
+        newConstraintExpressions = ImmutableList.of();
+        remainingFilter = TupleDomain.all();
+        remainingExpression = Optional.of(Constant.TRUE);
+    }
+    else {
+        // We need to decide which columns to push down.
+        // Since this is a base class for many JDBC-based connectors, each
+        // having different Trino type mappings and comparison semantics
+        // it needs to be flexible.
+
+        Map<ColumnHandle, Domain> domains = newDomain.getDomains().orElseThrow();
+        List<JdbcColumnHandle> columnHandles = domains.keySet().stream()
+                .map(JdbcColumnHandle.class::cast)
+                .collect(toImmutableList());
+
+        // Get information about how to push down every column based on its
+        // JDBC data type
+        List<ColumnMapping> columnMappings = jdbcClient.toColumnMappings(
+                session,
+                columnHandles.stream()
+                        .map(JdbcColumnHandle::getJdbcTypeHandle)
+                        .collect(toImmutableList()));
+
+        // Calculate the domains which can be safely pushed down (supported)
+        // and those which need to be filtered in Trino (unsupported)
+        Map<ColumnHandle, Domain> supported = new HashMap<>();
+        Map<ColumnHandle, Domain> unsupported = new HashMap<>();
+        for (int i = 0; i < columnHandles.size(); i++) {
+            JdbcColumnHandle column = columnHandles.get(i);
+            DomainPushdownResult pushdownResult =
+                columnMappings.get(i).getPredicatePushdownController().apply(
+                    session,
+                    domains.get(column));
+            supported.put(column, pushdownResult.getPushedDown());
+            unsupported.put(column, pushdownResult.getRemainingFilter());
+        }
+
+        newDomain = TupleDomain.withColumnDomains(supported);
+        remainingFilter = TupleDomain.withColumnDomains(unsupported);
+
+        // Do we want to handle expression pushdown?
+        if (isComplexExpressionPushdown(session)) {
+            List<String> newExpressions = new ArrayList<>();
+            List<ConnectorExpression> remainingExpressions = new ArrayList<>();
+            // Each expression can be broken down into a list of conjuncts
+            // joined with AND. We handle each conjunct separately.
+            for (ConnectorExpression expression : extractConjuncts(constraint.getExpression())) {
+                // Try to convert the conjunct into something which is
+                // understood by the underlying JDBC data source
+                Optional<String> converted = jdbcClient.convertPredicate(
+                    session,
+                    expression,
+                    constraint.getAssignments());
+                if (converted.isPresent()) {
+                    newExpressions.add(converted.get());
+                }
+                else {
+                    remainingExpressions.add(expression);
+                }
+            }
+            // Calculate which parts of the expression can be pushed down
+            // and which need to be calculated in Trino engine
+            newConstraintExpressions = ImmutableSet.<String>builder()
+                    .addAll(handle.getConstraintExpressions())
+                    .addAll(newExpressions)
+                    .build().asList();
+            remainingExpression = Optional.of(and(remainingExpressions));
+        }
+        else {
+            newConstraintExpressions = ImmutableList.of();
+            remainingExpression = Optional.empty();
+        }
+    }
+
+    // Return empty Optional if nothing changed in filtering
+    if (oldDomain.equals(newDomain) &&
+            handle.getConstraintExpressions().equals(newConstraintExpressions)) {
+        return Optional.empty();
+    }
+
+    handle = new JdbcTableHandle(
+            handle.getRelationHandle(),
+            newDomain,
+            newConstraintExpressions,
+            ...);
+
+    return Optional.of(
+            remainingExpression.isPresent()
+                    ? new ConstraintApplicationResult<>(
+                        handle,
+                        remainingFilter,
+                        remainingExpression.get())
+                    : new ConstraintApplicationResult<>(
+                        handle,
+                        remainingFilter));
+}
+```
+
+`ConnectorExpression` is split similarly to `TupleDomain`.
+Each expression can be broken down into independent *conjuncts*. Conjuncts are
+smaller expressions which, if joined together using an `AND` operator, are
+equivalent to the original expression. Every conjunct can be handled
+individually. Each one is converted using connector-specific rules, as defined
+by the `JdbcClient` implementation, to be more flexible. Unconverted
+conjuncts are returned as `remainingExpression` and are evaluated by
+the Trino engine.
+
+(connector-split-manager)=
+
+## ConnectorSplitManager
+
+The split manager partitions the data for a table into the individual chunks
+that Trino distributes to workers for processing. For example, the Hive
+connector lists the files for each Hive partition and creates one or more
+splits per file. For data sources that don't have partitioned data, a good
+strategy here is to simply return a single split for the entire table. This is
+the strategy employed by the Example HTTP connector.
+
+(connector-record-set-provider)=
+
+## ConnectorRecordSetProvider
+
+Given a split, a table handle, and a list of columns, the record set provider
+is responsible for delivering data to the Trino execution engine.
+
+The table and column handles represent a virtual table. They're created by the
+connector's metadata service, called by Trino during query planning and
+optimization. Such a virtual table doesn't have to map directly to a single
+collection in the connector's data source. If the connector supports pushdowns,
+there can be multiple virtual tables derived from others, presenting a different
+view of the underlying data.
+
+The provider creates a `RecordSet`, which in turn creates a `RecordCursor`
+that's used by Trino to read the column values for each row.
+
+The provided record set must only include requested columns in the order
+matching the list of column handles passed to the
+`ConnectorRecordSetProvider.getRecordSet()` method. The record set must return
+all the rows contained in the "virtual table" represented by the TableHandle
+associated with the TableScan operation.
+
+For simple connectors, where performance isn't critical, the record set
+provider can return an instance of `InMemoryRecordSet`. The in-memory record
+set can be built using lists of values for every row, which can be simpler than
+implementing a `RecordCursor`.
+
+A `RecordCursor` implementation needs to keep track of the current record.
+It return values for columns by a numerical position, in the data type matching
+the column definition in the table. When the engine is done reading the current
+record it calls `advanceNextPosition` on the cursor.
+
+### Type mapping
+
+The built-in SQL data types use different Java types as carrier types.
+
+```{eval-rst}
+.. list-table:: SQL type to carrier type mapping
+  :widths: 45, 55
+  :header-rows: 1
+
+  * - SQL type
+    - Java type
+  * - ``BOOLEAN``
+    - ``boolean``
+  * - ``TINYINT``
+    - ``long``
+  * - ``SMALLINT``
+    - ``long``
+  * - ``INTEGER``
+    - ``long``
+  * - ``BIGINT``
+    - ``long``
+  * - ``REAL``
+    - ``double``
+  * - ``DOUBLE``
+    - ``double``
+  * - ``DECIMAL``
+    - ``long`` for precision up to 19, inclusive;
+      ``Int128`` for precision greater than 19
+  * - ``VARCHAR``
+    - ``Slice``
+  * - ``CHAR``
+    - ``Slice``
+  * - ``VARBINARY``
+    - ``Slice``
+  * - ``JSON``
+    - ``Slice``
+  * - ``DATE``
+    - ``long``
+  * - ``TIME(P)``
+    - ``long``
+  * - ``TIME WITH TIME ZONE``
+    - ``long`` for precision up to 9;
+      ``LongTimeWithTimeZone`` for precision greater than 9
+  * - ``TIMESTAMP(P)``
+    - ``long`` for precision up to 6;
+      ``LongTimestamp`` for precision greater than 6
+  * - ``TIMESTAMP(P) WITH TIME ZONE``
+    - ``long`` for precision up to 3;
+      ``LongTimestampWithTimeZone`` for precision greater than 3
+  * - ``INTERVAL YEAR TO MONTH``
+    - ``long``
+  * - ``INTERVAL DAY TO SECOND``
+    - ``long``
+  * - ``ARRAY``
+    - ``Block``
+  * - ``MAP``
+    - ``Block``
+  * - ``ROW``
+    - ``Block``
+  * - ``IPADDRESS``
+    - ``Slice``
+  * - ``UUID``
+    - ``Slice``
+  * - ``HyperLogLog``
+    - ``Slice``
+  * - ``P4HyperLogLog``
+    - ``Slice``
+  * - ``SetDigest``
+    - ``Slice``
+  * - ``QDigest``
+    - ``Slice``
+  * - ``TDigest``
+    - ``TDigest``
+```
+
+The `RecordCursor.getType(int field)` method returns the SQL type for a field
+and the field value is returned by one of the following methods, matching
+the carrier type:
+
+- `getBoolean(int field)`
+- `getLong(int field)`
+- `getDouble(int field)`
+- `getSlice(int field)`
+- `getObject(int field)`
+
+Values for the `timestamp(p) with time zone` and `time(p) with time zone`
+types of regular precision can be converted into `long` using static methods
+from the `io.trino.spi.type.DateTimeEncoding` class, like `pack()` or
+`packDateTimeWithZone()`.
+
+UTF-8 encoded strings can be converted to Slices using
+the `Slices.utf8Slice()` static method.
+
+:::{note}
+The `Slice` class is provided by the `io.airlift:slice` package.
+:::
+
+`Int128` objects can be created using the `Int128.valueOf()` method.
+
+The following example creates a block for an `array(varchar)`  column:
+
+```java
+private Block encodeArray(List<String> names)
+{
+    BlockBuilder builder = VARCHAR.createBlockBuilder(null, names.size());
+    for (String name : names) {
+        if (name == null) {
+            builder.appendNull();
+        }
+        else {
+            VARCHAR.writeString(builder, name);
+        }
+    }
+    return builder.build();
+}
+```
+
+The following example creates a block for a `map(varchar, varchar)` column:
+
+```java
+private Block encodeMap(Map<String, ?> map)
+{
+    MapType mapType = typeManager.getType(TypeSignature.mapType(
+                            VARCHAR.getTypeSignature(),
+                            VARCHAR.getTypeSignature()));
+    BlockBuilder values = mapType.createBlockBuilder(null, map != null ? map.size() : 0);
+    if (map == null) {
+        values.appendNull();
+        return values.build().getObject(0, Block.class);
+    }
+    BlockBuilder builder = values.beginBlockEntry();
+    for (Map.Entry<String, ?> entry : map.entrySet()) {
+        VARCHAR.writeString(builder, entry.getKey());
+        Object value = entry.getValue();
+        if (value == null) {
+            builder.appendNull();
+        }
+        else {
+            VARCHAR.writeString(builder, value.toString());
+        }
+    }
+    values.closeEntry();
+    return values.build().getObject(0, Block.class);
+}
+```
+
+(connector-page-source-provider)=
+
+## ConnectorPageSourceProvider
+
+Given a split, a table handle, and a list of columns, the page source provider
+is responsible for delivering data to the Trino execution engine. It creates
+a `ConnectorPageSource`, which in turn creates `Page` objects that are used
+by Trino to read the column values.
+
+If not implemented, a default `RecordPageSourceProvider` is used.
+Given a record set provider, it returns an instance of `RecordPageSource`
+that builds `Page` objects from records in a record set.
+
+A connector should implement a page source provider instead of a record set
+provider when it's possible to create pages directly. The conversion of
+individual records from a record set provider into pages adds overheads during
+query execution.
+
+(connector-page-sink-provider)=
+
+## ConnectorPageSinkProvider
+
+Given an insert table handle, the page sink provider is responsible for
+consuming data from the Trino execution engine.
+It creates a `ConnectorPageSink`, which in turn accepts `Page` objects
+that contains the column values.
+
+Example that shows how to iterate over the page to access single values:
+
+```java
+@Override
+public CompletableFuture<?> appendPage(Page page)
+{
+    for (int channel = 0; channel < page.getChannelCount(); channel++) {
+        Block block = page.getBlock(channel);
+        for (int position = 0; position < page.getPositionCount(); position++) {
+            if (block.isNull(position)) {
+                // or handle this differently
+                continue;
+            }
+
+            // channel should match the column number in the table
+            // use it to determine the expected column type
+            String value = VARCHAR.getSlice(block, position).toStringUtf8();
+            // TODO do something with the value
+        }
+    }
+    return NOT_BLOCKED;
+}
+```
diff --git a/docs/src/main/sphinx/develop/connectors.rst b/docs/src/main/sphinx/develop/connectors.rst
deleted file mode 100644
index 5ccd361c6ba0..000000000000
--- a/docs/src/main/sphinx/develop/connectors.rst
+++ /dev/null
@@ -1,854 +0,0 @@
-==========
-Connectors
-==========
-
-Connectors are the source of all data for queries in Trino. Even if your data
-source doesn't have underlying tables backing it, as long as you adapt your data
-source to the API expected by Trino, you can write queries against this data.
-
-ConnectorFactory
-----------------
-
-Instances of your connector are created by a ``ConnectorFactory`` instance which
-is created when Trino calls ``getConnectorFactory()`` on the plugin. The
-connector factory is a simple interface responsible for providing the connector
-name and creating an instance of a ``Connector`` object. A basic connector
-implementation that only supports reading, but not writing data, should return
-instances of the following services:
-
-* :ref:`connector-metadata`
-* :ref:`connector-split-manager`
-* :ref:`connector-record-set-provider` or :ref:`connector-page-source-provider`
-
-Configuration
-^^^^^^^^^^^^^
-
-The ``create()`` method of the connector factory receives a ``config`` map,
-containing all properties from the catalog properties file. It can be used
-to configure the connector, but because all the values are strings, they
-might require additional processing if they represent other data types.
-It also doesn't validate if all the provided properties are known. This
-can lead to the connector behaving differently than expected when a
-connector ignores a property due to the user making a mistake in
-typing the name of the property.
-
-To make the configuration more robust, define a Configuration class. This
-class describes all the available properties, their types, and additional
-validation rules.
-
-
-.. code-block:: java
-
-  import io.airlift.configuration.Config;
-  import io.airlift.configuration.ConfigDescription;
-  import io.airlift.configuration.ConfigSecuritySensitive;
-  import io.airlift.units.Duration;
-  import io.airlift.units.MaxDuration;
-  import io.airlift.units.MinDuration;
-
-  import javax.validation.constraints.NotNull;
-
-  public class ExampleConfig
-  {
-      private String secret;
-      private Duration timeout = Duration.succinctDuration(10, TimeUnit.SECONDS);
-
-      public String getSecret()
-      {
-          return secret;
-      }
-
-      @Config("secret")
-      @ConfigDescription("Secret required to access the data source")
-      @ConfigSecuritySensitive
-      public ExampleConfig setSecret(String secret)
-      {
-          this.secret = secret;
-          return this;
-      }
-
-      @NotNull
-      @MaxDuration("10m")
-      @MinDuration("1ms")
-      public Duration getTimeout()
-      {
-          return timeout;
-      }
-
-      @Config("timeout")
-      public ExampleConfig setTimeout(Duration timeout)
-      {
-          this.timeout = timeout;
-          return this;
-      }
-  }
-
-The preceding example defines two configuration properties and makes
-the connector more robust by:
-
-* defining all supported properties, which allows detecting spelling mistakes
-  in the configuration on server startup
-* defining a default timeout value, to prevent connections getting stuck
-  indefinitely
-* preventing invalid timeout values, like 0 ms, that would make
-  all requests fail
-* parsing timeout values in different units, detecting invalid values
-* preventing logging the secret value in plain text
-
-The configuration class needs to be bound in a Guice module:
-
-.. code-block:: java
-
-  import com.google.inject.Binder;
-  import com.google.inject.Module;
-
-  import static io.airlift.configuration.ConfigBinder.configBinder;
-
-  public class ExampleModule
-          implements Module
-  {
-      public ExampleModule()
-      {
-      }
-
-      @Override
-      public void configure(Binder binder)
-      {
-          configBinder(binder).bindConfig(ExampleConfig.class);
-      }
-  }
-
-
-And then the module needs to be initialized in the connector factory, when
-creating a new instance of the connector:
-
-.. code-block:: java
-
-  @Override
-  public Connector create(String connectorName, Map<String, String> config, ConnectorContext context)
-  {
-      requireNonNull(config, "config is null");
-      Bootstrap app = new Bootstrap(new ExampleModule());
-      Injector injector = app
-              .doNotInitializeLogging()
-              .setRequiredConfigurationProperties(config)
-              .initialize();
-
-      return injector.getInstance(ExampleConnector.class);
-  }
-
-.. note::
-
-  Environment variables in the catalog properties file
-  (ex. ``secret=${ENV:SECRET}``) are resolved only when using
-  the ``io.airlift.bootstrap.Bootstrap`` class to initialize the module.
-  See :doc:`/security/secrets` for more information.
-
-If you end up needing to define multiple catalogs using the same connector
-just to change one property, consider adding support for schema and/or
-table properties. That would allow a more fine-grained configuration.
-If a connector doesn't support managing the schema, query predicates for
-selected columns could be used as a way of passing the required configuration
-at run time.
-
-For example, when building a connector to read commits from a Git repository,
-the repository URL could be a configuration property. But this would result
-in a catalog being able to return data only from a single repository.
-Alternatively, it can be a column, where every select query would require
-a predicate for it:
-
-.. code-block:: sql
-
-  SELECT *
-  FROM git.default.commits
-  WHERE url = 'https://github.com/trinodb/trino.git'
-
-
-.. _connector-metadata:
-
-ConnectorMetadata
------------------
-
-The connector metadata interface allows Trino to get a lists of schemas,
-tables, columns, and other metadata about a particular data source.
-
-A basic read-only connector should implement the following methods:
-
-* ``listSchemaNames``
-* ``listTables``
-* ``streamTableColumns``
-* ``getTableHandle``
-* ``getTableMetadata``
-* ``getColumnHandles``
-* ``getColumnMetadata``
-
-If you are interested in seeing strategies for implementing more methods,
-look at the :doc:`example-http` and the Cassandra connector. If your underlying
-data source supports schemas, tables, and columns, this interface should be
-straightforward to implement. If you are attempting to adapt something that
-isn't a relational database, as the Example HTTP connector does, you may
-need to get creative about how you map your data source to Trino's schema,
-table, and column concepts.
-
-The connector metadata interface allows to also implement other connector
-features, like:
-
-* Schema management, which is creating, altering and dropping schemas, tables,
-  table columns, views, and materialized views.
-* Support for table and column comments, and properties.
-* Schema, table and view authorization.
-* Executing :doc:`table-functions`.
-* Providing table statistics used by the Cost Based Optimizer (CBO)
-  and collecting statistics during writes and when analyzing selected tables.
-* Data modification, which is:
-
-  * inserting, updating, and deleting rows in tables,
-  * refreshing materialized views,
-  * truncating whole tables,
-  * and creating tables from query results.
-
-* Role and grant management.
-* Pushing down:
-
-  * :ref:`Limit and Top N - limit with sort items <connector-limit-pushdown>`
-  * :ref:`Predicates <dev-predicate-pushdown>`
-  * Projections
-  * Sampling
-  * Aggregations
-  * Joins
-  * Table function invocation
-
-Note that data modification also requires implementing
-a :ref:`connector-page-sink-provider`.
-
-When Trino receives a ``SELECT`` query, it parses it into an Intermediate
-Representation (IR). Then, during optimization, it checks if connectors
-can handle operations related to SQL clauses by calling one of the following
-methods of the ``ConnectorMetadata`` service:
-
-* ``applyLimit``
-* ``applyTopN``
-* ``applyFilter``
-* ``applyProjection``
-* ``applySample``
-* ``applyAggregation``
-* ``applyJoin``
-* ``applyTableFunction``
-* ``applyTableScanRedirect``
-
-Connectors can indicate that they don't support a particular pushdown or that
-the action had no effect by returning ``Optional.empty()``. Connectors should
-expect these methods to be called multiple times during the optimization of
-a given query.
-
-.. warning::
-
-  It's critical for connectors to return ``Optional.empty()`` if calling
-  this method has no effect for that invocation, even if the connector generally
-  supports a particular pushdown. Doing otherwise can cause the optimizer
-  to loop indefinitely.
-
-Otherwise, these methods return a result object containing a new table handle.
-The new table handle represents the virtual table derived from applying the
-operation (filter, project, limit, etc.) to the table produced by the table
-scan node. Once the query actually runs, ``ConnectorRecordSetProvider`` or
-``ConnectorPageSourceProvider`` can use whatever optimizations were pushed down to
-``ConnectorTableHandle``.
-
-The returned table handle is later passed to other services that the connector
-implements, like the ``ConnectorRecordSetProvider`` or
-``ConnectorPageSourceProvider``.
-
-.. _connector-limit-pushdown:
-
-Limit and top-N pushdown
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-When executing a ``SELECT`` query with ``LIMIT`` or ``ORDER BY`` clauses,
-the query plan may contain a ``Sort`` or ``Limit`` operations.
-
-When the plan contains a ``Sort`` and ``Limit`` operations, the engine
-tries to push down the limit into the connector by calling the ``applyTopN``
-method of the connector metadata service. If there's no ``Sort`` operation, but
-only a ``Limit``, the ``applyLimit`` method is called, and the connector can
-return results in an arbitrary order.
-
-If the connector could benefit from the information passed to these methods but
-can't guarantee that it's be able to produce fewer rows than the provided
-limit, it should return a non-empty result containing a new handle for the
-derived table and the ``limitGuaranteed`` (in ``LimitApplicationResult``) or
-``topNGuaranteed`` (in ``TopNApplicationResult``) flag set to false.
-
-If the connector can guarantee to produce fewer rows than the provided
-limit, it should return a non-empty result with the "limit guaranteed" or
-"topN guaranteed" flag set to true.
-
-.. note::
-
-  The ``applyTopN`` is the only method that receives sort items from the
-  ``Sort`` operation.
-
-In a query, the ``ORDER BY`` section can include any column with any order.
-But the data source for the connector might only support limited combinations.
-Plugin authors have to decide if the connector should ignore the pushdown,
-return all the data and let the engine sort it, or throw an exception
-to inform the user that particular order isn't supported, if fetching all
-the data would be too expensive or time consuming. When throwing
-an exception, use the ``TrinoException`` class with the ``INVALID_ORDER_BY``
-error code and an actionable message, to let users know how to write a valid
-query.
-
-.. _dev-predicate-pushdown:
-
-Predicate pushdown
-^^^^^^^^^^^^^^^^^^
-
-When executing a query with a ``WHERE`` clause, the query plan can
-contain a ``ScanFilterProject`` plan node/node with a predicate constraint.
-
-A predicate constraint is a description of the constraint imposed on the
-results of the stage/fragment as expressed in the ``WHERE`` clause. For example,
-``WHERE x > 5 AND y = 3`` translates into a constraint where the
-``summary`` field means the ``x`` column's domain must be greater than
-``5`` and the ``y`` column domain equals ``3``.
-
-When the query plan contains a ``ScanFilterProject`` operation, Trino
-tries to optimize the query by pushing down the predicate constraint
-into the connector by calling the ``applyFilter`` method of the
-connector metadata service. This method receives a table handle with
-all optimizations applied thus far, and returns either
-``Optional.empty()`` or a response with a new table handle derived from
-the old one.
-
-The query optimizer may call ``applyFilter`` for a single query multiple times,
-as it searches for an optimal query plan. Connectors must
-return ``Optional.empty()`` from ``applyFilter`` if they cannot apply the
-constraint for this invocation, even if they support ``ScanFilterProject``
-pushdown in general. Connectors must also return ``Optional.empty()`` if the
-constraint has already been applied.
-
-A constraint contains the following elements:
-
-* A ``TupleDomain`` defining the mapping between columns and their domains.
-  A ``Domain`` is either a list of possible values, or a list of ranges, and
-  also contains information about nullability.
-* Expression for pushing down function calls.
-* Map of assignments from variables in the expression to columns.
-* (optional) Predicate which tests a map of columns and their values;
-  it cannot be held on to after the ``applyFilter`` call returns.
-* (optional) Set of columns the predicate depends on; must be present
-  if predicate is present.
-
-If both a predicate and a summary are available, the predicate is guaranteed to
-be more strict in filtering of values, and can provide a significant boost to
-query performance if used.
-
-However it is not possible to store a predicate in the table handle and use
-it later, as the predicate cannot be held on to after the ``applyFilter``
-call returns. It is used for filtering of entire partitions, and is not pushed
-down. The summary can be pushed down instead by storing it in the table handle.
-
-This overlap between the predicate and summary is due to historical reasons,
-as simple comparison pushdown was implemented first via summary, and more
-complex filters such as ``LIKE`` which required more expressive predicates
-were added later.
-
-If a constraint can only be partially pushed down, for example when a connector
-for a database that does not support range matching is used in a query with
-``WHERE x = 2 AND y > 5``, the ``y`` column constraint must be
-returned in the ``ConstraintApplicationResult`` from ``applyFilter``.
-In this case the ``y > 5`` condition is applied in Trino,
-and not pushed down.
-
-The following is a simple example which only looks at ``TupleDomain``:
-
-.. code-block:: java
-
-    @Override
-    public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(
-            ConnectorSession session,
-            ConnectorTableHandle tableHandle,
-            Constraint constraint)
-    {
-        ExampleTableHandle handle = (ExampleTableHandle) tableHandle;
-
-        TupleDomain<ColumnHandle> oldDomain = handle.getConstraint();
-        TupleDomain<ColumnHandle> newDomain = oldDomain.intersect(constraint.getSummary());
-        if (oldDomain.equals(newDomain)) {
-            // Nothing has changed, return empty Option
-            return Optional.empty();
-        }
-
-        handle = new ExampleTableHandle(newDomain);
-        return Optional.of(new ConstraintApplicationResult<>(handle, TupleDomain.all(), false));
-    }
-
-The ``TupleDomain`` from the constraint is intersected with the ``TupleDomain``
-already applied to the ``TableHandle`` to form ``newDomain``.
-If filtering has not changed, an ``Optional.empty()`` result is returned to
-notify the planner that this optimization path has reached its end.
-
-In this example, the connector pushes down the ``TupleDomain``
-with all Trino data types supported with same semantics in the
-data source. As a result, no filters are needed in Trino,
-and the ``ConstraintApplicationResult`` sets ``remainingFilter`` to
-``TupleDomain.all()``.
-
-This pushdown implementation is quite similar to many Trino connectors,
-including  ``MongoMetadata``, ``BigQueryMetadata``, ``KafkaMetadata``.
-
-The following, more complex example shows data types from Trino that are
-not available directly in the underlying data source, and must be mapped:
-
-.. code-block:: java
-
-    @Override
-    public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(
-            ConnectorSession session,
-            ConnectorTableHandle table,
-            Constraint constraint)
-    {
-        JdbcTableHandle handle = (JdbcTableHandle) table;
-
-        TupleDomain<ColumnHandle> oldDomain = handle.getConstraint();
-        TupleDomain<ColumnHandle> newDomain = oldDomain.intersect(constraint.getSummary());
-        TupleDomain<ColumnHandle> remainingFilter;
-        if (newDomain.isNone()) {
-            newConstraintExpressions = ImmutableList.of();
-            remainingFilter = TupleDomain.all();
-            remainingExpression = Optional.of(Constant.TRUE);
-        }
-        else {
-            // We need to decide which columns to push down.
-            // Since this is a base class for many JDBC-based connectors, each
-            // having different Trino type mappings and comparison semantics
-            // it needs to be flexible.
-
-            Map<ColumnHandle, Domain> domains = newDomain.getDomains().orElseThrow();
-            List<JdbcColumnHandle> columnHandles = domains.keySet().stream()
-                    .map(JdbcColumnHandle.class::cast)
-                    .collect(toImmutableList());
-
-            // Get information about how to push down every column based on its
-            // JDBC data type
-            List<ColumnMapping> columnMappings = jdbcClient.toColumnMappings(
-                    session,
-                    columnHandles.stream()
-                            .map(JdbcColumnHandle::getJdbcTypeHandle)
-                            .collect(toImmutableList()));
-
-            // Calculate the domains which can be safely pushed down (supported)
-            // and those which need to be filtered in Trino (unsupported)
-            Map<ColumnHandle, Domain> supported = new HashMap<>();
-            Map<ColumnHandle, Domain> unsupported = new HashMap<>();
-            for (int i = 0; i < columnHandles.size(); i++) {
-                JdbcColumnHandle column = columnHandles.get(i);
-                DomainPushdownResult pushdownResult =
-                    columnMappings.get(i).getPredicatePushdownController().apply(
-                        session,
-                        domains.get(column));
-                supported.put(column, pushdownResult.getPushedDown());
-                unsupported.put(column, pushdownResult.getRemainingFilter());
-            }
-
-            newDomain = TupleDomain.withColumnDomains(supported);
-            remainingFilter = TupleDomain.withColumnDomains(unsupported);
-        }
-
-        // Return empty Optional if nothing changed in filtering
-        if (oldDomain.equals(newDomain)) {
-            return Optional.empty();
-        }
-
-        handle = new JdbcTableHandle(
-                handle.getRelationHandle(),
-                newDomain,
-                ...);
-
-        return Optional.of(
-                new ConstraintApplicationResult<>(
-                    handle,
-                    remainingFilter));
-    }
-
-This example illustrates implementing a base class for many JDBC connectors
-while handling the specific requirements of multiple JDBC-compliant data sources.
-It ensures that if a constraint gets pushed down, it works exactly the same in
-the underlying data source, and produces the same results as it would in Trino.
-For example, in databases where string comparisons are case-insensitive,
-pushdown does not work, as string comparison operations in Trino are
-case-sensitive.
-
-The ``PredicatePushdownController`` interface determines if a column domain can
-be pushed down in JDBC-compliant data sources. In the preceding example, it is
-called from a ``JdbcClient`` implementation specific to that database.
-In non-JDBC-compliant data sources, type-based push downs are implemented
-directly, without going through the ``PredicatePushdownController`` interface.
-
-The following example adds expression pushdown enabled by a session flag:
-
-.. code-block:: java
-
-    @Override
-    public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(
-            ConnectorSession session,
-            ConnectorTableHandle table,
-            Constraint constraint)
-    {
-        JdbcTableHandle handle = (JdbcTableHandle) table;
-
-        TupleDomain<ColumnHandle> oldDomain = handle.getConstraint();
-        TupleDomain<ColumnHandle> newDomain = oldDomain.intersect(constraint.getSummary());
-        List<String> newConstraintExpressions;
-        TupleDomain<ColumnHandle> remainingFilter;
-        Optional<ConnectorExpression> remainingExpression;
-        if (newDomain.isNone()) {
-            newConstraintExpressions = ImmutableList.of();
-            remainingFilter = TupleDomain.all();
-            remainingExpression = Optional.of(Constant.TRUE);
-        }
-        else {
-            // We need to decide which columns to push down.
-            // Since this is a base class for many JDBC-based connectors, each
-            // having different Trino type mappings and comparison semantics
-            // it needs to be flexible.
-
-            Map<ColumnHandle, Domain> domains = newDomain.getDomains().orElseThrow();
-            List<JdbcColumnHandle> columnHandles = domains.keySet().stream()
-                    .map(JdbcColumnHandle.class::cast)
-                    .collect(toImmutableList());
-
-            // Get information about how to push down every column based on its
-            // JDBC data type
-            List<ColumnMapping> columnMappings = jdbcClient.toColumnMappings(
-                    session,
-                    columnHandles.stream()
-                            .map(JdbcColumnHandle::getJdbcTypeHandle)
-                            .collect(toImmutableList()));
-
-            // Calculate the domains which can be safely pushed down (supported)
-            // and those which need to be filtered in Trino (unsupported)
-            Map<ColumnHandle, Domain> supported = new HashMap<>();
-            Map<ColumnHandle, Domain> unsupported = new HashMap<>();
-            for (int i = 0; i < columnHandles.size(); i++) {
-                JdbcColumnHandle column = columnHandles.get(i);
-                DomainPushdownResult pushdownResult =
-                    columnMappings.get(i).getPredicatePushdownController().apply(
-                        session,
-                        domains.get(column));
-                supported.put(column, pushdownResult.getPushedDown());
-                unsupported.put(column, pushdownResult.getRemainingFilter());
-            }
-
-            newDomain = TupleDomain.withColumnDomains(supported);
-            remainingFilter = TupleDomain.withColumnDomains(unsupported);
-
-            // Do we want to handle expression pushdown?
-            if (isComplexExpressionPushdown(session)) {
-                List<String> newExpressions = new ArrayList<>();
-                List<ConnectorExpression> remainingExpressions = new ArrayList<>();
-                // Each expression can be broken down into a list of conjuncts
-                // joined with AND. We handle each conjunct separately.
-                for (ConnectorExpression expression : extractConjuncts(constraint.getExpression())) {
-                    // Try to convert the conjunct into something which is
-                    // understood by the underlying JDBC data source
-                    Optional<String> converted = jdbcClient.convertPredicate(
-                        session,
-                        expression,
-                        constraint.getAssignments());
-                    if (converted.isPresent()) {
-                        newExpressions.add(converted.get());
-                    }
-                    else {
-                        remainingExpressions.add(expression);
-                    }
-                }
-                // Calculate which parts of the expression can be pushed down
-                // and which need to be calculated in Trino engine
-                newConstraintExpressions = ImmutableSet.<String>builder()
-                        .addAll(handle.getConstraintExpressions())
-                        .addAll(newExpressions)
-                        .build().asList();
-                remainingExpression = Optional.of(and(remainingExpressions));
-            }
-            else {
-                newConstraintExpressions = ImmutableList.of();
-                remainingExpression = Optional.empty();
-            }
-        }
-
-        // Return empty Optional if nothing changed in filtering
-        if (oldDomain.equals(newDomain) &&
-                handle.getConstraintExpressions().equals(newConstraintExpressions)) {
-            return Optional.empty();
-        }
-
-        handle = new JdbcTableHandle(
-                handle.getRelationHandle(),
-                newDomain,
-                newConstraintExpressions,
-                ...);
-
-        return Optional.of(
-                remainingExpression.isPresent()
-                        ? new ConstraintApplicationResult<>(
-                            handle,
-                            remainingFilter,
-                            remainingExpression.get())
-                        : new ConstraintApplicationResult<>(
-                            handle,
-                            remainingFilter));
-    }
-
-``ConnectorExpression`` is split similarly to ``TupleDomain``.
-Each expression can be broken down into independent *conjuncts*. Conjuncts are
-smaller expressions which, if joined together using an ``AND`` operator, are
-equivalent to the original expression. Every conjunct can be handled
-individually. Each one is converted using connector-specific rules, as defined
-by the ``JdbcClient`` implementation, to be more flexible. Unconverted
-conjuncts are returned as ``remainingExpression`` and are evaluated by
-the Trino engine.
-
-.. _connector-split-manager:
-
-ConnectorSplitManager
----------------------
-
-The split manager partitions the data for a table into the individual chunks
-that Trino distributes to workers for processing. For example, the Hive
-connector lists the files for each Hive partition and creates one or more
-splits per file. For data sources that don't have partitioned data, a good
-strategy here is to simply return a single split for the entire table. This is
-the strategy employed by the Example HTTP connector.
-
-.. _connector-record-set-provider:
-
-ConnectorRecordSetProvider
---------------------------
-
-Given a split, a table handle, and a list of columns, the record set provider
-is responsible for delivering data to the Trino execution engine.
-
-The table and column handles represent a virtual table. They're created by the
-connector's metadata service, called by Trino during query planning and
-optimization. Such a virtual table doesn't have to map directly to a single
-collection in the connector's data source. If the connector supports pushdowns,
-there can be multiple virtual tables derived from others, presenting a different
-view of the underlying data.
-
-The provider creates a ``RecordSet``, which in turn creates a ``RecordCursor``
-that's used by Trino to read the column values for each row.
-
-The provided record set must only include requested columns in the order
-matching the list of column handles passed to the
-``ConnectorRecordSetProvider.getRecordSet()`` method. The record set must return
-all the rows contained in the "virtual table" represented by the TableHandle
-associated with the TableScan operation.
-
-For simple connectors, where performance isn't critical, the record set
-provider can return an instance of ``InMemoryRecordSet``. The in-memory record
-set can be built using lists of values for every row, which can be simpler than
-implementing a ``RecordCursor``.
-
-A ``RecordCursor`` implementation needs to keep track of the current record.
-It return values for columns by a numerical position, in the data type matching
-the column definition in the table. When the engine is done reading the current
-record it calls ``advanceNextPosition`` on the cursor.
-
-Type mapping
-^^^^^^^^^^^^
-
-The built-in SQL data types use different Java types as carrier types.
-
-.. list-table:: SQL type to carrier type mapping
-  :widths: 45, 55
-  :header-rows: 1
-
-  * - SQL type
-    - Java type
-  * - ``BOOLEAN``
-    - ``boolean``
-  * - ``TINYINT``
-    - ``long``
-  * - ``SMALLINT``
-    - ``long``
-  * - ``INTEGER``
-    - ``long``
-  * - ``BIGINT``
-    - ``long``
-  * - ``REAL``
-    - ``double``
-  * - ``DOUBLE``
-    - ``double``
-  * - ``DECIMAL``
-    - ``long`` for precision up to 19, inclusive;
-      ``Int128`` for precision greater than 19
-  * - ``VARCHAR``
-    - ``Slice``
-  * - ``CHAR``
-    - ``Slice``
-  * - ``VARBINARY``
-    - ``Slice``
-  * - ``JSON``
-    - ``Slice``
-  * - ``DATE``
-    - ``long``
-  * - ``TIME(P)``
-    - ``long``
-  * - ``TIME WITH TIME ZONE``
-    - ``long`` for precision up to 9;
-      ``LongTimeWithTimeZone`` for precision greater than 9
-  * - ``TIMESTAMP(P)``
-    - ``long`` for precision up to 6;
-      ``LongTimestamp`` for precision greater than 6
-  * - ``TIMESTAMP(P) WITH TIME ZONE``
-    - ``long`` for precision up to 3;
-      ``LongTimestampWithTimeZone`` for precision greater than 3
-  * - ``INTERVAL YEAR TO MONTH``
-    - ``long``
-  * - ``INTERVAL DAY TO SECOND``
-    - ``long``
-  * - ``ARRAY``
-    - ``Block``
-  * - ``MAP``
-    - ``Block``
-  * - ``ROW``
-    - ``Block``
-  * - ``IPADDRESS``
-    - ``Slice``
-  * - ``UUID``
-    - ``Slice``
-  * - ``HyperLogLog``
-    - ``Slice``
-  * - ``P4HyperLogLog``
-    - ``Slice``
-  * - ``SetDigest``
-    - ``Slice``
-  * - ``QDigest``
-    - ``Slice``
-  * - ``TDigest``
-    - ``TDigest``
-
-The ``RecordCursor.getType(int field)`` method returns the SQL type for a field
-and the field value is returned by one of the following methods, matching
-the carrier type:
-
-* ``getBoolean(int field)``
-* ``getLong(int field)``
-* ``getDouble(int field)``
-* ``getSlice(int field)``
-* ``getObject(int field)``
-
-Values for the ``timestamp(p) with time zone`` and ``time(p) with time zone``
-types of regular precision can be converted into ``long`` using static methods
-from the ``io.trino.spi.type.DateTimeEncoding`` class, like ``pack()`` or
-``packDateTimeWithZone()``.
-
-UTF-8 encoded strings can be converted to Slices using
-the ``Slices.utf8Slice()`` static method.
-
-.. note::
-
-  The ``Slice`` class is provided by the ``io.airlift:slice`` package.
-
-``Int128`` objects can be created using the ``Int128.valueOf()`` method.
-
-The following example creates a block for an ``array(varchar)``  column:
-
-.. code-block:: java
-
-    private Block encodeArray(List<String> names)
-    {
-        BlockBuilder builder = VARCHAR.createBlockBuilder(null, names.size());
-        for (String name : names) {
-            if (name == null) {
-                builder.appendNull();
-            }
-            else {
-                VARCHAR.writeString(builder, name);
-            }
-        }
-        return builder.build();
-    }
-
-The following example creates a block for a ``map(varchar, varchar)`` column:
-
-.. code-block:: java
-
-    private Block encodeMap(Map<String, ?> map)
-    {
-        MapType mapType = typeManager.getType(TypeSignature.mapType(
-                                VARCHAR.getTypeSignature(),
-                                VARCHAR.getTypeSignature()));
-        BlockBuilder values = mapType.createBlockBuilder(null, map != null ? map.size() : 0);
-        if (map == null) {
-            values.appendNull();
-            return values.build().getObject(0, Block.class);
-        }
-        BlockBuilder builder = values.beginBlockEntry();
-        for (Map.Entry<String, ?> entry : map.entrySet()) {
-            VARCHAR.writeString(builder, entry.getKey());
-            Object value = entry.getValue();
-            if (value == null) {
-                builder.appendNull();
-            }
-            else {
-                VARCHAR.writeString(builder, value.toString());
-            }
-        }
-        values.closeEntry();
-        return values.build().getObject(0, Block.class);
-    }
-
-.. _connector-page-source-provider:
-
-ConnectorPageSourceProvider
----------------------------
-
-Given a split, a table handle, and a list of columns, the page source provider
-is responsible for delivering data to the Trino execution engine. It creates
-a ``ConnectorPageSource``, which in turn creates ``Page`` objects that are used
-by Trino to read the column values.
-
-If not implemented, a default ``RecordPageSourceProvider`` is used.
-Given a record set provider, it returns an instance of ``RecordPageSource``
-that builds ``Page`` objects from records in a record set.
-
-A connector should implement a page source provider instead of a record set
-provider when it's possible to create pages directly. The conversion of
-individual records from a record set provider into pages adds overheads during
-query execution.
-
-.. _connector-page-sink-provider:
-
-ConnectorPageSinkProvider
--------------------------
-
-Given an insert table handle, the page sink provider is responsible for
-consuming data from the Trino execution engine.
-It creates a ``ConnectorPageSink``, which in turn accepts ``Page`` objects
-that contains the column values.
-
-Example that shows how to iterate over the page to access single values:
-
-.. code-block:: java
-
-  @Override
-  public CompletableFuture<?> appendPage(Page page)
-  {
-      for (int channel = 0; channel < page.getChannelCount(); channel++) {
-          Block block = page.getBlock(channel);
-          for (int position = 0; position < page.getPositionCount(); position++) {
-              if (block.isNull(position)) {
-                  // or handle this differently
-                  continue;
-              }
-
-              // channel should match the column number in the table
-              // use it to determine the expected column type
-              String value = VARCHAR.getSlice(block, position).toStringUtf8();
-              // TODO do something with the value
-          }
-      }
-      return NOT_BLOCKED;
-  }
diff --git a/docs/src/main/sphinx/develop/event-listener.md b/docs/src/main/sphinx/develop/event-listener.md
new file mode 100644
index 000000000000..72f22d644165
--- /dev/null
+++ b/docs/src/main/sphinx/develop/event-listener.md
@@ -0,0 +1,59 @@
+# Event listener
+
+Trino supports custom event listeners that are invoked for the following
+events:
+
+- Query creation
+- Query completion (success or failure)
+- Split completion (success or failure)
+
+Event details include session, query execution, resource utilization, timeline,
+and more.
+
+This functionality enables development of custom logging, debugging and
+performance analysis plugins.
+
+## Implementation
+
+`EventListenerFactory` is responsible for creating an
+`EventListener` instance. It also defines an `EventListener`
+name which is used by the administrator in a Trino configuration.
+Implementations of `EventListener` implement methods for the event types
+they are interested in handling.
+
+The implementation of `EventListener` and `EventListenerFactory`
+must be wrapped as a plugin and installed on the Trino cluster.
+
+## Configuration
+
+After a plugin that implements `EventListener` and
+`EventListenerFactory` has been installed on the coordinator, it is
+configured using an `etc/event-listener.properties` file. All of the
+properties other than `event-listener.name` are specific to the
+`EventListener` implementation.
+
+The `event-listener.name` property is used by Trino to find a registered
+`EventListenerFactory` based on the name returned by
+`EventListenerFactory.getName()`. The remaining properties are passed
+as a map to `EventListenerFactory.create()`.
+
+Example configuration file:
+
+```text
+event-listener.name=custom-event-listener
+custom-property1=custom-value1
+custom-property2=custom-value2
+```
+
+(multiple-listeners)=
+
+## Multiple event listeners
+
+Trino supports multiple instances of the same or different event listeners.
+Install and configure multiple instances by setting
+`event-listener.config-files` in {ref}`config-properties` to a comma-separated
+list of the event listener configuration files:
+
+```text
+event-listener.config-files=etc/event-listener.properties,etc/event-listener-second.properties
+```
diff --git a/docs/src/main/sphinx/develop/event-listener.rst b/docs/src/main/sphinx/develop/event-listener.rst
deleted file mode 100644
index 4633e2f8adc9..000000000000
--- a/docs/src/main/sphinx/develop/event-listener.rst
+++ /dev/null
@@ -1,64 +0,0 @@
-==============
-Event listener
-==============
-
-Trino supports custom event listeners that are invoked for the following
-events:
-
-* Query creation
-* Query completion (success or failure)
-* Split completion (success or failure)
-
-Event details include session, query execution, resource utilization, timeline,
-and more.
-
-This functionality enables development of custom logging, debugging and
-performance analysis plugins.
-
-Implementation
---------------
-
-``EventListenerFactory`` is responsible for creating an
-``EventListener`` instance. It also defines an ``EventListener``
-name which is used by the administrator in a Trino configuration.
-Implementations of ``EventListener`` implement methods for the event types
-they are interested in handling.
-
-The implementation of ``EventListener`` and ``EventListenerFactory``
-must be wrapped as a plugin and installed on the Trino cluster.
-
-Configuration
--------------
-
-After a plugin that implements ``EventListener`` and
-``EventListenerFactory`` has been installed on the coordinator, it is
-configured using an ``etc/event-listener.properties`` file. All of the
-properties other than ``event-listener.name`` are specific to the
-``EventListener`` implementation.
-
-The ``event-listener.name`` property is used by Trino to find a registered
-``EventListenerFactory`` based on the name returned by
-``EventListenerFactory.getName()``. The remaining properties are passed
-as a map to ``EventListenerFactory.create()``.
-
-Example configuration file:
-
-.. code-block:: text
-
-    event-listener.name=custom-event-listener
-    custom-property1=custom-value1
-    custom-property2=custom-value2
-
-.. _multiple_listeners:
-
-Multiple event listeners
-------------------------
-
-Trino supports multiple instances of the same or different event listeners.
-Install and configure multiple instances by setting
-``event-listener.config-files`` in :ref:`config_properties` to a comma-separated
-list of the event listener configuration files:
-
-.. code-block:: text
-
-    event-listener.config-files=etc/event-listener.properties,etc/event-listener-second.properties
diff --git a/docs/src/main/sphinx/develop/example-http.md b/docs/src/main/sphinx/develop/example-http.md
new file mode 100644
index 000000000000..d68d5bb00a8d
--- /dev/null
+++ b/docs/src/main/sphinx/develop/example-http.md
@@ -0,0 +1,102 @@
+# Example HTTP connector
+
+The Example HTTP connector has a simple goal: it reads comma-separated
+data over HTTP. For example, if you have a large amount of data in a
+CSV format, you can point the example HTTP connector at this data and
+write a query to process it.
+
+## Code
+
+The Example HTTP connector can be found in the [trino-example-http](https://github.com/trinodb/trino/tree/master/plugin/trino-example-http)
+directory within the Trino source tree.
+
+## Plugin implementation
+
+The plugin implementation in the Example HTTP connector looks very
+similar to other plugin implementations.  Most of the implementation is
+devoted to handling optional configuration and the only function of
+interest is the following:
+
+```java
+@Override
+public Iterable<ConnectorFactory> getConnectorFactories()
+{
+    return ImmutableList.of(new ExampleConnectorFactory());
+}
+```
+
+Note that the `ImmutableList` class is a utility class from Guava.
+
+As with all connectors, this plugin overrides the `getConnectorFactories()` method
+and returns an `ExampleConnectorFactory`.
+
+## ConnectorFactory implementation
+
+In Trino, the primary object that handles the connection between
+Trino and a particular type of data source is the `Connector` object,
+which are created using `ConnectorFactory`.
+
+This implementation is available in the class `ExampleConnectorFactory`.
+The first thing the connector factory implementation does is specify the
+name of this connector. This is the same string used to reference this
+connector in Trino configuration.
+
+```java
+@Override
+public String getName()
+{
+    return "example_http";
+}
+```
+
+The real work in a connector factory happens in the `create()`
+method. In the `ExampleConnectorFactory` class, the `create()` method
+configures the connector and then asks Guice to create the object.
+This is the meat of the `create()` method without parameter validation
+and exception handling:
+
+```java
+// A plugin is not required to use Guice; it is just very convenient
+Bootstrap app = new Bootstrap(
+        new JsonModule(),
+        new ExampleModule(catalogName));
+
+Injector injector = app
+        .doNotInitializeLogging()
+        .setRequiredConfigurationProperties(requiredConfig)
+        .initialize();
+
+return injector.getInstance(ExampleConnector.class);
+```
+
+### Connector: ExampleConnector
+
+This class allows Trino to obtain references to the various services
+provided by the connector.
+
+### Metadata: ExampleMetadata
+
+This class is responsible for reporting table names, table metadata,
+column names, column metadata and other information about the schemas
+that are provided by this connector. `ConnectorMetadata` is also called
+by Trino to ensure that a particular connector can understand and
+handle a given table name.
+
+The `ExampleMetadata` implementation delegates many of these calls to
+`ExampleClient`, a class that implements much of the core functionality
+of the connector.
+
+### Split manager: ExampleSplitManager
+
+The split manager partitions the data for a table into the individual
+chunks that Trino will distribute to workers for processing.
+In the case of the Example HTTP connector, each table contains one or
+more URIs pointing at the actual data. One split is created per URI.
+
+### Record set provider: ExampleRecordSetProvider
+
+The record set provider creates a record set which in turn creates a
+record cursor that returns the actual data to Trino.
+`ExampleRecordCursor` reads data from a URI via HTTP. Each line
+corresponds to a single row. Lines are split on comma into individual
+field values which are then returned to Trino.
diff --git a/docs/src/main/sphinx/develop/example-http.rst b/docs/src/main/sphinx/develop/example-http.rst
deleted file mode 100644
index 07cfa66eedf0..000000000000
--- a/docs/src/main/sphinx/develop/example-http.rst
+++ /dev/null
@@ -1,112 +0,0 @@
-======================
-Example HTTP connector
-======================
-
-The Example HTTP connector has a simple goal: it reads comma-separated
-data over HTTP. For example, if you have a large amount of data in a
-CSV format, you can point the example HTTP connector at this data and
-write a query to process it.
-
-Code
-----
-
-The Example HTTP connector can be found in the `trino-example-http
-<https://github.com/trinodb/trino/tree/master/plugin/trino-example-http>`_
-directory within the Trino source tree.
-
-Plugin implementation
----------------------
-
-The plugin implementation in the Example HTTP connector looks very
-similar to other plugin implementations.  Most of the implementation is
-devoted to handling optional configuration and the only function of
-interest is the following:
-
-.. code-block:: java
-
-    @Override
-    public Iterable<ConnectorFactory> getConnectorFactories()
-    {
-        return ImmutableList.of(new ExampleConnectorFactory());
-    }
-
-Note that the ``ImmutableList`` class is a utility class from Guava.
-
-As with all connectors, this plugin overrides the ``getConnectorFactories()`` method
-and returns an ``ExampleConnectorFactory``.
-
-ConnectorFactory implementation
--------------------------------
-
-In Trino, the primary object that handles the connection between
-Trino and a particular type of data source is the ``Connector`` object,
-which are created using ``ConnectorFactory``.
-
-This implementation is available in the class ``ExampleConnectorFactory``.
-The first thing the connector factory implementation does is specify the
-name of this connector. This is the same string used to reference this
-connector in Trino configuration.
-
-.. code-block:: java
-
-    @Override
-    public String getName()
-    {
-        return "example_http";
-    }
-
-The real work in a connector factory happens in the ``create()``
-method. In the ``ExampleConnectorFactory`` class, the ``create()`` method
-configures the connector and then asks Guice to create the object.
-This is the meat of the ``create()`` method without parameter validation
-and exception handling:
-
-.. code-block:: java
-
-    // A plugin is not required to use Guice; it is just very convenient
-    Bootstrap app = new Bootstrap(
-            new JsonModule(),
-            new ExampleModule(catalogName));
-
-    Injector injector = app
-            .doNotInitializeLogging()
-            .setRequiredConfigurationProperties(requiredConfig)
-            .initialize();
-
-    return injector.getInstance(ExampleConnector.class);
-
-Connector: ExampleConnector
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This class allows Trino to obtain references to the various services
-provided by the connector.
-
-Metadata: ExampleMetadata
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This class is responsible for reporting table names, table metadata,
-column names, column metadata and other information about the schemas
-that are provided by this connector. ``ConnectorMetadata`` is also called
-by Trino to ensure that a particular connector can understand and
-handle a given table name.
-
-The ``ExampleMetadata`` implementation delegates many of these calls to
-``ExampleClient``, a class that implements much of the core functionality
-of the connector.
-
-Split manager: ExampleSplitManager
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The split manager partitions the data for a table into the individual
-chunks that Trino will distribute to workers for processing.
-In the case of the Example HTTP connector, each table contains one or
-more URIs pointing at the actual data. One split is created per URI.
-
-Record set provider: ExampleRecordSetProvider
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The record set provider creates a record set which in turn creates a
-record cursor that returns the actual data to Trino.
-``ExampleRecordCursor`` reads data from a URI via HTTP. Each line
-corresponds to a single row. Lines are split on comma into individual
-field values which are then returned to Trino.
diff --git a/docs/src/main/sphinx/develop/example-jdbc.md b/docs/src/main/sphinx/develop/example-jdbc.md
new file mode 100644
index 000000000000..a3b2314589c7
--- /dev/null
+++ b/docs/src/main/sphinx/develop/example-jdbc.md
@@ -0,0 +1,64 @@
+# Example JDBC connector
+
+The Example JDBC connector shows how to extend the base `JdbcPlugin`
+to read data from a source using a JDBC driver, without having
+to implement different Trino SPI services, like `ConnectorMetadata`
+or `ConnectorRecordSetProvider`.
+
+:::{note}
+This connector is just an example. It supports a very limited set of data
+types and does not support any advanced functions, like predicacte or other
+kind of pushdowns.
+:::
+
+## Code
+
+The Example JDBC connector can be found in the [trino-example-jdbc](https://github.com/trinodb/trino/tree/master/plugin/trino-example-jdbc)
+directory within the Trino source tree.
+
+## Plugin implementation
+
+The plugin implementation in the Example JDBC connector extends
+the `JdbcPlugin` class and uses the `ExampleClientModule`.
+
+The module:
+
+- binds the `ExampleClient` class so it can be used by the base JDBC
+  connector;
+- provides a connection factory that will create new connections using a JDBC
+  driver based on the JDBC URL specified in configuration properties.
+
+## JdbcClient implementation
+
+The base JDBC plugin maps the Trino SPI calls to the JDBC API. Operations like
+reading table and columns names are well defined in JDBC so the base JDBC plugin
+can implement it in a way that works for most JDBC drivers.
+
+One behavior that is not implemented by default is mapping of the data types
+when reading and writing data. The Example JDBC connector implements
+the `JdbcClient` interface in the `ExampleClient` class that extends
+the `BaseJdbcClient` and implements two methods.
+
+### toColumnMapping
+
+`toColumnMapping` is used when reading data from the connector.
+Given a `ConnectorSession`, `Connection` and a `JdbcTypeHandle`,
+it returns a `ColumnMapping`, if there is a matching data type.
+
+The column mapping includes:
+
+- a Trino type,
+- a write function, used to set query parameter values when preparing a
+  JDBC statement to execute in the data source,
+- and a read function, used to read a value from the JDBC statement result set,
+  and return it using an internal Trino representation (for example, a Slice).
+
+### toWriteMapping
+
+`toWriteMapping` is used when writing data to the connector. Given a
+`ConnectorSession` and a Trino type, it returns a `WriteMapping`.
+
+The mapping includes:
+
+- a data type name
+- a write function
diff --git a/docs/src/main/sphinx/develop/example-jdbc.rst b/docs/src/main/sphinx/develop/example-jdbc.rst
deleted file mode 100644
index 777fea49074f..000000000000
--- a/docs/src/main/sphinx/develop/example-jdbc.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-======================
-Example JDBC connector
-======================
-
-The Example JDBC connector shows how to extend the base ``JdbcPlugin``
-to read data from a source using a JDBC driver, without having
-to implement different Trino SPI services, like ``ConnectorMetadata``
-or ``ConnectorRecordSetProvider``.
-
-.. note::
-
-  This connector is just an example. It supports a very limited set of data
-  types and does not support any advanced functions, like predicacte or other
-  kind of pushdowns.
-
-Code
-----
-
-The Example JDBC connector can be found in the `trino-example-jdbc
-<https://github.com/trinodb/trino/tree/master/plugin/trino-example-jdbc>`_
-directory within the Trino source tree.
-
-Plugin implementation
----------------------
-
-The plugin implementation in the Example JDBC connector extends
-the ``JdbcPlugin`` class and uses the ``ExampleClientModule``.
-
-The module:
-
-* binds the ``ExampleClient`` class so it can be used by the base JDBC
-  connector;
-* provides a connection factory that will create new connections using a JDBC
-  driver based on the JDBC URL specified in configuration properties.
-
-JdbcClient implementation
--------------------------
-
-The base JDBC plugin maps the Trino SPI calls to the JDBC API. Operations like
-reading table and columns names are well defined in JDBC so the base JDBC plugin
-can implement it in a way that works for most JDBC drivers.
-
-One behavior that is not implemented by default is mapping of the data types
-when reading and writing data. The Example JDBC connector implements
-the ``JdbcClient`` interface in the ``ExampleClient`` class that extends
-the ``BaseJdbcClient`` and implements two methods.
-
-toColumnMapping
-^^^^^^^^^^^^^^^
-
-``toColumnMapping`` is used when reading data from the connector.
-Given a ``ConnectorSession``, ``Connection`` and a ``JdbcTypeHandle``,
-it returns a ``ColumnMapping``, if there is a matching data type.
-
-The column mapping includes:
-
-* a Trino type,
-* a write function, used to set query parameter values when preparing a
-  JDBC statement to execute in the data source,
-* and a read function, used to read a value from the JDBC statement result set,
-  and return it using an internal Trino representation (for example, a Slice).
-
-toWriteMapping
-^^^^^^^^^^^^^^
-
-``toWriteMapping`` is used when writing data to the connector. Given a
-``ConnectorSession`` and a Trino type, it returns a ``WriteMapping``.
-
-The mapping includes:
-
-* a data type name
-* a write function
diff --git a/docs/src/main/sphinx/develop/functions.md b/docs/src/main/sphinx/develop/functions.md
new file mode 100644
index 000000000000..26555000b6ed
--- /dev/null
+++ b/docs/src/main/sphinx/develop/functions.md
@@ -0,0 +1,320 @@
+# Functions
+
+## Plugin implementation
+
+The function framework is used to implement SQL functions. Trino includes a
+number of built-in functions. In order to implement new functions, you can
+write a plugin that returns one or more functions from `getFunctions()`:
+
+```java
+public class ExampleFunctionsPlugin
+        implements Plugin
+{
+    @Override
+    public Set<Class<?>> getFunctions()
+    {
+        return ImmutableSet.<Class<?>>builder()
+                .add(ExampleNullFunction.class)
+                .add(IsNullFunction.class)
+                .add(IsEqualOrNullFunction.class)
+                .add(ExampleStringFunction.class)
+                .add(ExampleAverageFunction.class)
+                .build();
+    }
+}
+```
+
+Note that the `ImmutableSet` class is a utility class from Guava.
+The `getFunctions()` method contains all of the classes for the functions
+that we will implement below in this tutorial.
+
+For a full example in the codebase, see either the `trino-ml` module for
+machine learning functions or the `trino-teradata-functions` module for
+Teradata-compatible functions, both in the `plugin` directory of the Trino
+source.
+
+## Scalar function implementation
+
+The function framework uses annotations to indicate relevant information
+about functions, including name, description, return type and parameter
+types. Below is a sample function which implements `is_null`:
+
+```java
+public class ExampleNullFunction
+{
+    @ScalarFunction("is_null", deterministic = true)
+    @Description("Returns TRUE if the argument is NULL")
+    @SqlType(StandardTypes.BOOLEAN)
+    public static boolean isNull(
+            @SqlNullable @SqlType(StandardTypes.VARCHAR) Slice string)
+    {
+        return (string == null);
+    }
+}
+```
+
+The function `is_null` takes a single `VARCHAR` argument and returns a
+`BOOLEAN` indicating if the argument was `NULL`. Note that the argument to
+the function is of type `Slice`. `VARCHAR` uses `Slice`, which is essentially
+a wrapper around `byte[]`, rather than `String` for its native container type.
+
+The `deterministic` argument indicates that a function has no side effects and,
+for subsequent calls with the same argument(s), the function returns the exact
+same value(s).
+
+In Trino, deterministic functions don't rely on any changing state
+and don't modify any state. The `deterministic` flag is optional and defaults
+to `true`.
+
+For example, the function {func}`shuffle` is non-deterministic, since it uses random
+values. On the other hand, {func}`now` is deterministic, because subsequent calls in a
+single query return the same timestamp.
+
+Any function with non-deterministic behavior is required to set `deterministic = false`
+to avoid unexpected results.
+
+- `@SqlType`:
+
+  The `@SqlType` annotation is used to declare the return type and the argument
+  types. Note that the return type and arguments of the Java code must match
+  the native container types of the corresponding annotations.
+
+- `@SqlNullable`:
+
+  The `@SqlNullable` annotation indicates that the argument may be `NULL`. Without
+  this annotation the framework assumes that all functions return `NULL` if
+  any of their arguments are `NULL`. When working with a `Type` that has a
+  primitive native container type, such as `BigintType`, use the object wrapper for the
+  native container type when using `@SqlNullable`. The method must be annotated with
+  `@SqlNullable` if it can return `NULL` when the arguments are non-null.
+
+## Parametric scalar functions
+
+Scalar functions that have type parameters have some additional complexity.
+To make our previous example work with any type we need the following:
+
+```java
+@ScalarFunction(name = "is_null")
+@Description("Returns TRUE if the argument is NULL")
+public final class IsNullFunction
+{
+    @TypeParameter("T")
+    @SqlType(StandardTypes.BOOLEAN)
+    public static boolean isNullSlice(@SqlNullable @SqlType("T") Slice value)
+    {
+        return (value == null);
+    }
+
+    @TypeParameter("T")
+    @SqlType(StandardTypes.BOOLEAN)
+    public static boolean isNullLong(@SqlNullable @SqlType("T") Long value)
+    {
+        return (value == null);
+    }
+
+    @TypeParameter("T")
+    @SqlType(StandardTypes.BOOLEAN)
+    public static boolean isNullDouble(@SqlNullable @SqlType("T") Double value)
+    {
+        return (value == null);
+    }
+
+    // ...and so on for each native container type
+}
+```
+
+- `@TypeParameter`:
+
+  The `@TypeParameter` annotation is used to declare a type parameter which can
+  be used in the argument types `@SqlType` annotation, or return type of the function.
+  It can also be used to annotate a parameter of type `Type`. At runtime, the engine
+  will bind the concrete type to this parameter. `@OperatorDependency` may be used
+  to declare that an additional function for operating on the given type parameter is needed.
+  For example, the following function will only bind to types which have an equals function
+  defined:
+
+```java
+@ScalarFunction(name = "is_equal_or_null")
+@Description("Returns TRUE if arguments are equal or both NULL")
+public final class IsEqualOrNullFunction
+{
+    @TypeParameter("T")
+    @SqlType(StandardTypes.BOOLEAN)
+    public static boolean isEqualOrNullSlice(
+            @OperatorDependency(
+                    operator = OperatorType.EQUAL,
+                    returnType = StandardTypes.BOOLEAN,
+                    argumentTypes = {"T", "T"}) MethodHandle equals,
+            @SqlNullable @SqlType("T") Slice value1,
+            @SqlNullable @SqlType("T") Slice value2)
+    {
+        if (value1 == null && value2 == null) {
+            return true;
+        }
+        if (value1 == null || value2 == null) {
+            return false;
+        }
+        return (boolean) equals.invokeExact(value1, value2);
+    }
+
+    // ...and so on for each native container type
+}
+```
+
+## Another scalar function example
+
+The `lowercaser` function takes a single `VARCHAR` argument and returns a
+`VARCHAR`, which is the argument converted to lower case:
+
+```java
+public class ExampleStringFunction
+{
+    @ScalarFunction("lowercaser")
+    @Description("Converts the string to alternating case")
+    @SqlType(StandardTypes.VARCHAR)
+    public static Slice lowercaser(@SqlType(StandardTypes.VARCHAR) Slice slice)
+    {
+        String argument = slice.toStringUtf8();
+        return Slices.utf8Slice(argument.toLowerCase());
+    }
+}
+```
+
+Note that for most common string functions, including converting a string to
+lower case, the Slice library also provides implementations that work directly
+on the underlying `byte[]`, which have much better performance. This function
+has no `@SqlNullable` annotations, meaning that if the argument is `NULL`,
+the result will automatically be `NULL` (the function will not be called).
+
+## Aggregation function implementation
+
+Aggregation functions use a similar framework to scalar functions, but are
+a bit more complex.
+
+- `AccumulatorState`:
+
+  All aggregation functions accumulate input rows into a state object; this
+  object must implement `AccumulatorState`. For simple aggregations, just
+  extend `AccumulatorState` into a new interface with the getters and setters
+  you want, and the framework will generate all the implementations and
+  serializers for you. If you need a more complex state object, you will need
+  to implement `AccumulatorStateFactory` and `AccumulatorStateSerializer`
+  and provide these via the `AccumulatorStateMetadata` annotation.
+
+The following code implements the aggregation function `avg_double` which computes the
+average of a `DOUBLE` column:
+
+```java
+@AggregationFunction("avg_double")
+public class AverageAggregation
+{
+    @InputFunction
+    public static void input(
+            LongAndDoubleState state,
+            @SqlType(StandardTypes.DOUBLE) double value)
+    {
+        state.setLong(state.getLong() + 1);
+        state.setDouble(state.getDouble() + value);
+    }
+
+    @CombineFunction
+    public static void combine(
+            LongAndDoubleState state,
+            LongAndDoubleState otherState)
+    {
+        state.setLong(state.getLong() + otherState.getLong());
+        state.setDouble(state.getDouble() + otherState.getDouble());
+    }
+
+    @OutputFunction(StandardTypes.DOUBLE)
+    public static void output(LongAndDoubleState state, BlockBuilder out)
+    {
+        long count = state.getLong();
+        if (count == 0) {
+            out.appendNull();
+        }
+        else {
+            double value = state.getDouble();
+            DOUBLE.writeDouble(out, value / count);
+        }
+    }
+}
+```
+
+The average has two parts: the sum of the `DOUBLE` in each row of the column
+and the `LONG` count of the number of rows seen. `LongAndDoubleState` is an interface
+which extends `AccumulatorState`:
+
+```java
+public interface LongAndDoubleState
+        extends AccumulatorState
+{
+    long getLong();
+
+    void setLong(long value);
+
+    double getDouble();
+
+    void setDouble(double value);
+}
+```
+
+As stated above, for simple `AccumulatorState` objects, it is sufficient to
+just to define the interface with the getters and setters, and the framework
+will generate the implementation for you.
+
+An in-depth look at the various annotations relevant to writing an aggregation
+function follows:
+
+- `@InputFunction`:
+
+  The `@InputFunction` annotation declares the function which accepts input
+  rows and stores them in the `AccumulatorState`. Similar to scalar functions
+  you must annotate the arguments with `@SqlType`.  Note that, unlike in the above
+  scalar example where `Slice` is used to hold `VARCHAR`, the primitive
+  `double` type is used for the argument to input. In this example, the input
+  function simply keeps track of the running count of rows (via `setLong()`)
+  and the running sum (via `setDouble()`).
+
+- `@CombineFunction`:
+
+  The `@CombineFunction` annotation declares the function used to combine two
+  state objects. This function is used to merge all the partial aggregation states.
+  It takes two state objects, and merges the results into the first one (in the
+  above example, just by adding them together).
+
+- `@OutputFunction`:
+
+  The `@OutputFunction` is the last function called when computing an
+  aggregation. It takes the final state object (the result of merging all
+  partial states) and writes the result to a `BlockBuilder`.
+
+- Where does serialization happen, and what is `GroupedAccumulatorState`?
+
+  The `@InputFunction` is usually run on a different worker from the
+  `@CombineFunction`, so the state objects are serialized and transported
+  between these workers by the aggregation framework. `GroupedAccumulatorState`
+  is used when performing a `GROUP BY` aggregation, and an implementation
+  will be automatically generated for you, if you don't specify a
+  `AccumulatorStateFactory`
+
+## Deprecated function
+
+The `@Deprecated` annotation has to be used on any function that should no longer be
+used. The annotation causes Trino to generate a warning whenever SQL statements
+use a deprecated function. When a function is deprecated, the `@Description`
+needs to be replaced with a note about the deprecation and the replacement function:
+
+```java
+public class ExampleDeprecatedFunction
+{
+    @Deprecated
+    @ScalarFunction("bad_function")
+    @Description("(DEPRECATED) Use good_function() instead")
+    @SqlType(StandardTypes.BOOLEAN)
+    public static boolean bad_function()
+    {
+        return false;
+    }
+}
+```
diff --git a/docs/src/main/sphinx/develop/functions.rst b/docs/src/main/sphinx/develop/functions.rst
deleted file mode 100644
index a814166ab23b..000000000000
--- a/docs/src/main/sphinx/develop/functions.rst
+++ /dev/null
@@ -1,329 +0,0 @@
-=========
-Functions
-=========
-
-Plugin implementation
----------------------
-
-The function framework is used to implement SQL functions. Trino includes a
-number of built-in functions. In order to implement new functions, you can
-write a plugin that returns one or more functions from ``getFunctions()``:
-
-.. code-block:: java
-
-    public class ExampleFunctionsPlugin
-            implements Plugin
-    {
-        @Override
-        public Set<Class<?>> getFunctions()
-        {
-            return ImmutableSet.<Class<?>>builder()
-                    .add(ExampleNullFunction.class)
-                    .add(IsNullFunction.class)
-                    .add(IsEqualOrNullFunction.class)
-                    .add(ExampleStringFunction.class)
-                    .add(ExampleAverageFunction.class)
-                    .build();
-        }
-    }
-
-Note that the ``ImmutableSet`` class is a utility class from Guava.
-The ``getFunctions()`` method contains all of the classes for the functions
-that we will implement below in this tutorial.
-
-For a full example in the codebase, see either the ``trino-ml`` module for
-machine learning functions or the ``trino-teradata-functions`` module for
-Teradata-compatible functions, both in the ``plugin`` directory of the Trino
-source.
-
-Scalar function implementation
-------------------------------
-
-The function framework uses annotations to indicate relevant information
-about functions, including name, description, return type and parameter
-types. Below is a sample function which implements ``is_null``:
-
-.. code-block:: java
-
-    public class ExampleNullFunction
-    {
-        @ScalarFunction("is_null", deterministic = true)
-        @Description("Returns TRUE if the argument is NULL")
-        @SqlType(StandardTypes.BOOLEAN)
-        public static boolean isNull(
-                @SqlNullable @SqlType(StandardTypes.VARCHAR) Slice string)
-        {
-            return (string == null);
-        }
-    }
-
-The function ``is_null`` takes a single ``VARCHAR`` argument and returns a
-``BOOLEAN`` indicating if the argument was ``NULL``. Note that the argument to
-the function is of type ``Slice``. ``VARCHAR`` uses ``Slice``, which is essentially
-a wrapper around ``byte[]``, rather than ``String`` for its native container type.
-
-The ``deterministic`` argument indicates that a function has no side effects and,
-for subsequent calls with the same argument(s), the function returns the exact
-same value(s).
-
-In Trino, deterministic functions don't rely on any changing state
-and don't modify any state. The ``deterministic`` flag is optional and defaults
-to ``true``.
-
-For example, the function :func:`shuffle` is non-deterministic, since it uses random
-values. On the other hand, :func:`now` is deterministic, because subsequent calls in a
-single query return the same timestamp.
-
-Any function with non-deterministic behavior is required to set ``deterministic = false``
-to avoid unexpected results.
-
-* ``@SqlType``:
-
-  The ``@SqlType`` annotation is used to declare the return type and the argument
-  types. Note that the return type and arguments of the Java code must match
-  the native container types of the corresponding annotations.
-
-* ``@SqlNullable``:
-
-  The ``@SqlNullable`` annotation indicates that the argument may be ``NULL``. Without
-  this annotation the framework assumes that all functions return ``NULL`` if
-  any of their arguments are ``NULL``. When working with a ``Type`` that has a
-  primitive native container type, such as ``BigintType``, use the object wrapper for the
-  native container type when using ``@SqlNullable``. The method must be annotated with
-  ``@SqlNullable`` if it can return ``NULL`` when the arguments are non-null.
-
-Parametric scalar functions
----------------------------
-
-Scalar functions that have type parameters have some additional complexity.
-To make our previous example work with any type we need the following:
-
-.. code-block:: java
-
-    @ScalarFunction(name = "is_null")
-    @Description("Returns TRUE if the argument is NULL")
-    public final class IsNullFunction
-    {
-        @TypeParameter("T")
-        @SqlType(StandardTypes.BOOLEAN)
-        public static boolean isNullSlice(@SqlNullable @SqlType("T") Slice value)
-        {
-            return (value == null);
-        }
-
-        @TypeParameter("T")
-        @SqlType(StandardTypes.BOOLEAN)
-        public static boolean isNullLong(@SqlNullable @SqlType("T") Long value)
-        {
-            return (value == null);
-        }
-
-        @TypeParameter("T")
-        @SqlType(StandardTypes.BOOLEAN)
-        public static boolean isNullDouble(@SqlNullable @SqlType("T") Double value)
-        {
-            return (value == null);
-        }
-
-        // ...and so on for each native container type
-    }
-
-* ``@TypeParameter``:
-
-  The ``@TypeParameter`` annotation is used to declare a type parameter which can
-  be used in the argument types ``@SqlType`` annotation, or return type of the function.
-  It can also be used to annotate a parameter of type ``Type``. At runtime, the engine
-  will bind the concrete type to this parameter. ``@OperatorDependency`` may be used
-  to declare that an additional function for operating on the given type parameter is needed.
-  For example, the following function will only bind to types which have an equals function
-  defined:
-
-.. code-block:: java
-
-    @ScalarFunction(name = "is_equal_or_null")
-    @Description("Returns TRUE if arguments are equal or both NULL")
-    public final class IsEqualOrNullFunction
-    {
-        @TypeParameter("T")
-        @SqlType(StandardTypes.BOOLEAN)
-        public static boolean isEqualOrNullSlice(
-                @OperatorDependency(
-                        operator = OperatorType.EQUAL,
-                        returnType = StandardTypes.BOOLEAN,
-                        argumentTypes = {"T", "T"}) MethodHandle equals,
-                @SqlNullable @SqlType("T") Slice value1,
-                @SqlNullable @SqlType("T") Slice value2)
-        {
-            if (value1 == null && value2 == null) {
-                return true;
-            }
-            if (value1 == null || value2 == null) {
-                return false;
-            }
-            return (boolean) equals.invokeExact(value1, value2);
-        }
-
-        // ...and so on for each native container type
-    }
-
-Another scalar function example
--------------------------------
-
-The ``lowercaser`` function takes a single ``VARCHAR`` argument and returns a
-``VARCHAR``, which is the argument converted to lower case:
-
-.. code-block:: java
-
-    public class ExampleStringFunction
-    {
-        @ScalarFunction("lowercaser")
-        @Description("Converts the string to alternating case")
-        @SqlType(StandardTypes.VARCHAR)
-        public static Slice lowercaser(@SqlType(StandardTypes.VARCHAR) Slice slice)
-        {
-            String argument = slice.toStringUtf8();
-            return Slices.utf8Slice(argument.toLowerCase());
-        }
-    }
-
-Note that for most common string functions, including converting a string to
-lower case, the Slice library also provides implementations that work directly
-on the underlying ``byte[]``, which have much better performance. This function
-has no ``@SqlNullable`` annotations, meaning that if the argument is ``NULL``,
-the result will automatically be ``NULL`` (the function will not be called).
-
-Aggregation function implementation
------------------------------------
-
-Aggregation functions use a similar framework to scalar functions, but are
-a bit more complex.
-
-* ``AccumulatorState``:
-
-  All aggregation functions accumulate input rows into a state object; this
-  object must implement ``AccumulatorState``. For simple aggregations, just
-  extend ``AccumulatorState`` into a new interface with the getters and setters
-  you want, and the framework will generate all the implementations and
-  serializers for you. If you need a more complex state object, you will need
-  to implement ``AccumulatorStateFactory`` and ``AccumulatorStateSerializer``
-  and provide these via the ``AccumulatorStateMetadata`` annotation.
-
-The following code implements the aggregation function ``avg_double`` which computes the
-average of a ``DOUBLE`` column:
-
-.. code-block:: java
-
-    @AggregationFunction("avg_double")
-    public class AverageAggregation
-    {
-        @InputFunction
-        public static void input(
-                LongAndDoubleState state,
-                @SqlType(StandardTypes.DOUBLE) double value)
-        {
-            state.setLong(state.getLong() + 1);
-            state.setDouble(state.getDouble() + value);
-        }
-
-        @CombineFunction
-        public static void combine(
-                LongAndDoubleState state,
-                LongAndDoubleState otherState)
-        {
-            state.setLong(state.getLong() + otherState.getLong());
-            state.setDouble(state.getDouble() + otherState.getDouble());
-        }
-
-        @OutputFunction(StandardTypes.DOUBLE)
-        public static void output(LongAndDoubleState state, BlockBuilder out)
-        {
-            long count = state.getLong();
-            if (count == 0) {
-                out.appendNull();
-            }
-            else {
-                double value = state.getDouble();
-                DOUBLE.writeDouble(out, value / count);
-            }
-        }
-    }
-
-
-The average has two parts: the sum of the ``DOUBLE`` in each row of the column
-and the ``LONG`` count of the number of rows seen. ``LongAndDoubleState`` is an interface
-which extends ``AccumulatorState``:
-
-.. code-block:: java
-
-    public interface LongAndDoubleState
-            extends AccumulatorState
-    {
-        long getLong();
-
-        void setLong(long value);
-
-        double getDouble();
-
-        void setDouble(double value);
-    }
-
-As stated above, for simple ``AccumulatorState`` objects, it is sufficient to
-just to define the interface with the getters and setters, and the framework
-will generate the implementation for you.
-
-An in-depth look at the various annotations relevant to writing an aggregation
-function follows:
-
-* ``@InputFunction``:
-
-  The ``@InputFunction`` annotation declares the function which accepts input
-  rows and stores them in the ``AccumulatorState``. Similar to scalar functions
-  you must annotate the arguments with ``@SqlType``.  Note that, unlike in the above
-  scalar example where ``Slice`` is used to hold ``VARCHAR``, the primitive
-  ``double`` type is used for the argument to input. In this example, the input
-  function simply keeps track of the running count of rows (via ``setLong()``)
-  and the running sum (via ``setDouble()``).
-
-* ``@CombineFunction``:
-
-  The ``@CombineFunction`` annotation declares the function used to combine two
-  state objects. This function is used to merge all the partial aggregation states.
-  It takes two state objects, and merges the results into the first one (in the
-  above example, just by adding them together).
-
-* ``@OutputFunction``:
-
-  The ``@OutputFunction`` is the last function called when computing an
-  aggregation. It takes the final state object (the result of merging all
-  partial states) and writes the result to a ``BlockBuilder``.
-
-* Where does serialization happen, and what is ``GroupedAccumulatorState``?
-
-  The ``@InputFunction`` is usually run on a different worker from the
-  ``@CombineFunction``, so the state objects are serialized and transported
-  between these workers by the aggregation framework. ``GroupedAccumulatorState``
-  is used when performing a ``GROUP BY`` aggregation, and an implementation
-  will be automatically generated for you, if you don't specify a
-  ``AccumulatorStateFactory``
-
-Deprecated function
--------------------
-
-The ``@Deprecated`` annotation has to be used on any function that should no longer be
-used. The annotation causes Trino to generate a warning whenever SQL statements
-use a deprecated function. When a function is deprecated, the ``@Description``
-needs to be replaced with a note about the deprecation and the replacement function:
-
-.. code-block:: java
-
-    public class ExampleDeprecatedFunction
-    {
-        @Deprecated
-        @ScalarFunction("bad_function")
-        @Description("(DEPRECATED) Use good_function() instead")
-        @SqlType(StandardTypes.BOOLEAN)
-        public static boolean bad_function()
-        {
-            return false;
-        }
-    }
diff --git a/docs/src/main/sphinx/develop/group-provider.md b/docs/src/main/sphinx/develop/group-provider.md
new file mode 100644
index 000000000000..63915ce803fa
--- /dev/null
+++ b/docs/src/main/sphinx/develop/group-provider.md
@@ -0,0 +1,40 @@
+# Group provider
+
+Trino can map user names onto groups for easier access control management.
+This mapping is performed by a `GroupProvider` implementation.
+
+## Implementation
+
+`GroupProviderFactory` is responsible for creating a `GroupProvider` instance.
+It also defines the name of the group provider as used in the configuration file.
+
+`GroupProvider` contains a one method, `getGroups(String user)`
+which returns a `Set<String>` of group names.
+This set of group names becomes part of the `Identity` and `ConnectorIdentity`
+objects representing the user, and can then be used by {doc}`system-access-control`.
+
+The implementation of `GroupProvider` and its corresponding `GroupProviderFactory`
+must be wrapped as a Trino plugin and installed on the cluster.
+
+## Configuration
+
+After a plugin that implements `GroupProviderFactory` has been installed on the coordinator,
+it is configured using an `etc/group-provider.properties` file.
+All of the properties other than `group-provider.name` are specific to
+the `GroupProviderFactory` implementation.
+
+The `group-provider.name` property is used by Trino to find a registered
+`GroupProviderFactory` based on the name returned by `GroupProviderFactory.getName()`.
+The remaining properties are passed as a map to
+`GroupProviderFactory.create(Map<String, String>)`.
+
+Example configuration file:
+
+```text
+group-provider.name=custom-group-provider
+custom-property1=custom-value1
+custom-property2=custom-value2
+```
+
+With that file in place, Trino will attempt user group name resolution,
+and will be able to use the group names while evaluating access control rules.
diff --git a/docs/src/main/sphinx/develop/group-provider.rst b/docs/src/main/sphinx/develop/group-provider.rst
deleted file mode 100644
index a183f996ec27..000000000000
--- a/docs/src/main/sphinx/develop/group-provider.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-==============
-Group provider
-==============
-
-Trino can map user names onto groups for easier access control management.
-This mapping is performed by a ``GroupProvider`` implementation.
-
-Implementation
---------------
-
-``GroupProviderFactory`` is responsible for creating a ``GroupProvider`` instance.
-It also defines the name of the group provider as used in the configuration file.
-
-``GroupProvider`` contains a one method, ``getGroups(String user)``
-which returns a ``Set<String>`` of group names.
-This set of group names becomes part of the ``Identity`` and ``ConnectorIdentity``
-objects representing the user, and can then be used by :doc:`system-access-control`.
-
-The implementation of ``GroupProvider`` and its corresponding ``GroupProviderFactory``
-must be wrapped as a Trino plugin and installed on the cluster.
-
-Configuration
--------------
-
-After a plugin that implements ``GroupProviderFactory`` has been installed on the coordinator,
-it is configured using an ``etc/group-provider.properties`` file.
-All of the properties other than ``group-provider.name`` are specific to
-the ``GroupProviderFactory`` implementation.
-
-The ``group-provider.name`` property is used by Trino to find a registered
-``GroupProviderFactory`` based on the name returned by ``GroupProviderFactory.getName()``.
-The remaining properties are passed as a map to
-``GroupProviderFactory.create(Map<String, String>)``.
-
-Example configuration file:
-
-.. code-block:: text
-
-    group-provider.name=custom-group-provider
-    custom-property1=custom-value1
-    custom-property2=custom-value2
-
-With that file in place, Trino will attempt user group name resolution,
-and will be able to use the group names while evaluating access control rules.
diff --git a/docs/src/main/sphinx/develop/header-authenticator.md b/docs/src/main/sphinx/develop/header-authenticator.md
new file mode 100644
index 000000000000..ec8777222dd2
--- /dev/null
+++ b/docs/src/main/sphinx/develop/header-authenticator.md
@@ -0,0 +1,42 @@
+# Header authenticator
+
+Trino supports header authentication over TLS via a custom header authenticator
+that extracts the principal from a predefined header(s), performs any validation it needs and creates
+an authenticated principal.
+
+## Implementation
+
+`HeaderAuthenticatorFactory` is responsible for creating a
+`HeaderAuthenticator` instance. It also defines the name of this
+authenticator which is used by the administrator in a Trino configuration.
+
+`HeaderAuthenticator` contains a single method, `createAuthenticatedPrincipal()`,
+which validates the request headers wrapped by the Headers interface; has the method getHeader(String name)
+and returns a `Principal`, which is then authorized by the {doc}`system-access-control`.
+
+The implementation of `HeaderAuthenticatorFactory` must be wrapped
+as a plugin and installed on the Trino cluster.
+
+## Configuration
+
+After a plugin that implements `HeaderAuthenticatorFactory` has been
+installed on the coordinator, it is configured using an
+`etc/header-authenticator.properties` file. All of the
+properties other than `header-authenticator.name` are specific to the
+`HeaderAuthenticatorFactory` implementation.
+
+The `header-authenticator.name` property is used by Trino to find a
+registered `HeaderAuthenticatorFactory` based on the name returned by
+`HeaderAuthenticatorFactory.getName()`. The remaining properties are
+passed as a map to `HeaderAuthenticatorFactory.create()`.
+
+Example configuration file:
+
+```none
+header-authenticator.name=custom
+custom-property1=custom-value1
+custom-property2=custom-value2
+```
+
+Additionally, the coordinator must be configured to use header authentication
+and have HTTPS enabled (or HTTPS forwarding enabled).
diff --git a/docs/src/main/sphinx/develop/header-authenticator.rst b/docs/src/main/sphinx/develop/header-authenticator.rst
deleted file mode 100644
index ab915d108aed..000000000000
--- a/docs/src/main/sphinx/develop/header-authenticator.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-====================
-Header authenticator
-====================
-
-Trino supports header authentication over TLS via a custom header authenticator
-that extracts the principal from a predefined header(s), performs any validation it needs and creates
-an authenticated principal.
-
-Implementation
---------------
-
-``HeaderAuthenticatorFactory`` is responsible for creating a
-``HeaderAuthenticator`` instance. It also defines the name of this
-authenticator which is used by the administrator in a Trino configuration.
-
-``HeaderAuthenticator`` contains a single method, ``createAuthenticatedPrincipal()``,
-which validates the request headers wrapped by the Headers interface; has the method getHeader(String name)
-and returns a ``Principal``, which is then authorized by the :doc:`system-access-control`.
-
-The implementation of ``HeaderAuthenticatorFactory`` must be wrapped
-as a plugin and installed on the Trino cluster.
-
-Configuration
--------------
-
-After a plugin that implements ``HeaderAuthenticatorFactory`` has been
-installed on the coordinator, it is configured using an
-``etc/header-authenticator.properties`` file. All of the
-properties other than ``header-authenticator.name`` are specific to the
-``HeaderAuthenticatorFactory`` implementation.
-
-The ``header-authenticator.name`` property is used by Trino to find a
-registered ``HeaderAuthenticatorFactory`` based on the name returned by
-``HeaderAuthenticatorFactory.getName()``. The remaining properties are
-passed as a map to ``HeaderAuthenticatorFactory.create()``.
-
-Example configuration file:
-
-.. code-block:: none
-
-    header-authenticator.name=custom
-    custom-property1=custom-value1
-    custom-property2=custom-value2
-
-Additionally, the coordinator must be configured to use header authentication
-and have HTTPS enabled (or HTTPS forwarding enabled).
diff --git a/docs/src/main/sphinx/develop/insert.md b/docs/src/main/sphinx/develop/insert.md
new file mode 100644
index 000000000000..cab389ee48a3
--- /dev/null
+++ b/docs/src/main/sphinx/develop/insert.md
@@ -0,0 +1,28 @@
+# Supporting `INSERT` and `CREATE TABLE AS`
+
+To support `INSERT`, a connector must implement:
+
+- `beginInsert()` and `finishInsert()` from the `ConnectorMetadata`
+  interface;
+- a `ConnectorPageSinkProvider` that receives a table handle and returns
+  a `ConnectorPageSink`.
+
+When executing an `INSERT` statement, the engine calls the `beginInsert()`
+method in the connector, which receives a table handle and a list of columns.
+It should return a `ConnectorInsertTableHandle`, that can carry any
+connector specific information, and it's passed to the page sink provider.
+The `PageSinkProvider` creates a page sink, that accepts `Page` objects.
+
+When all the pages for a specific split have been processed, Trino calls
+`ConnectorPageSink.finish()`, which returns a `Collection<Slice>`
+of fragments representing connector-specific information about the processed
+rows.
+
+When all pages for all splits have been processed, Trino calls
+`ConnectorMetadata.finishInsert()`, passing a collection containing all
+the fragments from all the splits. The connector does what is required
+to finalize the operation, for example, committing the transaction.
+
+To support `CREATE TABLE AS`, the `ConnectorPageSinkProvider` must also
+return a page sink when receiving a `ConnectorOutputTableHandle`. This handle
+is returned from `ConnectorMetadata.beginCreateTable()`.
diff --git a/docs/src/main/sphinx/develop/insert.rst b/docs/src/main/sphinx/develop/insert.rst
deleted file mode 100644
index 87403ae769d7..000000000000
--- a/docs/src/main/sphinx/develop/insert.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-=============================================
-Supporting ``INSERT`` and ``CREATE TABLE AS``
-=============================================
-
-To support ``INSERT``, a connector must implement:
-
-* ``beginInsert()`` and ``finishInsert()`` from the ``ConnectorMetadata``
-  interface;
-* a ``ConnectorPageSinkProvider`` that receives a table handle and returns
-  a ``ConnectorPageSink``.
-
-When executing an ``INSERT`` statement, the engine calls the ``beginInsert()``
-method in the connector, which receives a table handle and a list of columns.
-It should return a ``ConnectorInsertTableHandle``, that can carry any
-connector specific information, and it's passed to the page sink provider.
-The ``PageSinkProvider`` creates a page sink, that accepts ``Page`` objects.
-
-When all the pages for a specific split have been processed, Trino calls
-``ConnectorPageSink.finish()``, which returns a ``Collection<Slice>``
-of fragments representing connector-specific information about the processed
-rows.
-
-When all pages for all splits have been processed, Trino calls
-``ConnectorMetadata.finishInsert()``, passing a collection containing all
-the fragments from all the splits. The connector does what is required
-to finalize the operation, for example, committing the transaction.
-
-To support ``CREATE TABLE AS``, the ``ConnectorPageSinkProvider`` must also
-return a page sink when receiving a ``ConnectorOutputTableHandle``. This handle
-is returned from ``ConnectorMetadata.beginCreateTable()``.
diff --git a/docs/src/main/sphinx/develop/password-authenticator.md b/docs/src/main/sphinx/develop/password-authenticator.md
new file mode 100644
index 000000000000..8095e39abbff
--- /dev/null
+++ b/docs/src/main/sphinx/develop/password-authenticator.md
@@ -0,0 +1,41 @@
+# Password authenticator
+
+Trino supports authentication with a username and password via a custom
+password authenticator that validates the credentials and creates a principal.
+
+## Implementation
+
+`PasswordAuthenticatorFactory` is responsible for creating a
+`PasswordAuthenticator` instance. It also defines the name of this
+authenticator which is used by the administrator in a Trino configuration.
+
+`PasswordAuthenticator` contains a single method, `createAuthenticatedPrincipal()`,
+that validates the credential and returns a `Principal`, which is then
+authorized by the {doc}`system-access-control`.
+
+The implementation of `PasswordAuthenticatorFactory` must be wrapped
+as a plugin and installed on the Trino cluster.
+
+## Configuration
+
+After a plugin that implements `PasswordAuthenticatorFactory` has been
+installed on the coordinator, it is configured using an
+`etc/password-authenticator.properties` file. All of the
+properties other than `password-authenticator.name` are specific to the
+`PasswordAuthenticatorFactory` implementation.
+
+The `password-authenticator.name` property is used by Trino to find a
+registered `PasswordAuthenticatorFactory` based on the name returned by
+`PasswordAuthenticatorFactory.getName()`. The remaining properties are
+passed as a map to `PasswordAuthenticatorFactory.create()`.
+
+Example configuration file:
+
+```text
+password-authenticator.name=custom-access-control
+custom-property1=custom-value1
+custom-property2=custom-value2
+```
+
+Additionally, the coordinator must be configured to use password authentication
+and have HTTPS enabled (or HTTPS forwarding enabled).
diff --git a/docs/src/main/sphinx/develop/password-authenticator.rst b/docs/src/main/sphinx/develop/password-authenticator.rst
deleted file mode 100644
index b7b21255e06e..000000000000
--- a/docs/src/main/sphinx/develop/password-authenticator.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-======================
-Password authenticator
-======================
-
-Trino supports authentication with a username and password via a custom
-password authenticator that validates the credentials and creates a principal.
-
-Implementation
---------------
-
-``PasswordAuthenticatorFactory`` is responsible for creating a
-``PasswordAuthenticator`` instance. It also defines the name of this
-authenticator which is used by the administrator in a Trino configuration.
-
-``PasswordAuthenticator`` contains a single method, ``createAuthenticatedPrincipal()``,
-that validates the credential and returns a ``Principal``, which is then
-authorized by the :doc:`system-access-control`.
-
-The implementation of ``PasswordAuthenticatorFactory`` must be wrapped
-as a plugin and installed on the Trino cluster.
-
-Configuration
--------------
-
-After a plugin that implements ``PasswordAuthenticatorFactory`` has been
-installed on the coordinator, it is configured using an
-``etc/password-authenticator.properties`` file. All of the
-properties other than ``password-authenticator.name`` are specific to the
-``PasswordAuthenticatorFactory`` implementation.
-
-The ``password-authenticator.name`` property is used by Trino to find a
-registered ``PasswordAuthenticatorFactory`` based on the name returned by
-``PasswordAuthenticatorFactory.getName()``. The remaining properties are
-passed as a map to ``PasswordAuthenticatorFactory.create()``.
-
-Example configuration file:
-
-.. code-block:: text
-
-    password-authenticator.name=custom-access-control
-    custom-property1=custom-value1
-    custom-property2=custom-value2
-
-Additionally, the coordinator must be configured to use password authentication
-and have HTTPS enabled (or HTTPS forwarding enabled).
diff --git a/docs/src/main/sphinx/develop/spi-overview.md b/docs/src/main/sphinx/develop/spi-overview.md
new file mode 100644
index 000000000000..872619f2dda1
--- /dev/null
+++ b/docs/src/main/sphinx/develop/spi-overview.md
@@ -0,0 +1,113 @@
+# SPI overview
+
+When you implement a new Trino plugin, you implement interfaces and
+override methods defined by the Service Provider Interface (SPI).
+
+Plugins can provide additional:
+
+- {doc}`connectors`,
+- block encodings,
+- {doc}`types`,
+- {doc}`functions`,
+- {doc}`system-access-control`,
+- {doc}`group-provider`,
+- {doc}`password-authenticator`,
+- {doc}`header-authenticator`,
+- {doc}`certificate-authenticator`,
+- {doc}`event-listener`,
+- resource group configuration managers,
+- session property configuration managers,
+- and exchange managers.
+
+In particular, connectors are the source of all data for queries in
+Trino: they back each catalog available to Trino.
+
+## Code
+
+The SPI source can be found in the `core/trino-spi` directory in the Trino
+source tree.
+
+## Plugin metadata
+
+Each plugin identifies an entry point: an implementation of the
+`Plugin` interface. This class name is provided to Trino via
+the standard Java `ServiceLoader` interface: the classpath contains
+a resource file named `io.trino.spi.Plugin` in the
+`META-INF/services` directory. The content of this file is a
+single line listing the name of the plugin class:
+
+```text
+com.example.plugin.ExamplePlugin
+```
+
+For a built-in plugin that is included in the Trino source code,
+this resource file is created whenever the `pom.xml` file of a plugin
+contains the following line:
+
+```xml
+<packaging>trino-plugin</packaging>
+```
+
+## Plugin
+
+The `Plugin` interface is a good starting place for developers looking
+to understand the Trino SPI. It contains access methods to retrieve
+various classes that a Plugin can provide. For example, the `getConnectorFactories()`
+method is a top-level function that Trino calls to retrieve a `ConnectorFactory` when Trino
+is ready to create an instance of a connector to back a catalog. There are similar
+methods for `Type`, `ParametricType`, `Function`, `SystemAccessControl`, and
+`EventListenerFactory` objects.
+
+## Building plugins via Maven
+
+Plugins depend on the SPI from Trino:
+
+```xml
+<dependency>
+    <groupId>io.trino</groupId>
+    <artifactId>trino-spi</artifactId>
+    <scope>provided</scope>
+</dependency>
+```
+
+The plugin uses the Maven `provided` scope because Trino provides
+the classes from the SPI at runtime and thus the plugin should not
+include them in the plugin assembly.
+
+There are a few other dependencies that are provided by Trino,
+including Slice and Jackson annotations. In particular, Jackson is
+used for serializing connector handles and thus plugins must use the
+annotations version provided by Trino.
+
+All other dependencies are based on what the plugin needs for its
+own implementation. Plugins are loaded in a separate class loader
+to provide isolation and to allow plugins to use a different version
+of a library that Trino uses internally.
+
+For an example `pom.xml` file, see the example HTTP connector in the
+`plugin/trino-example-http` directory in the Trino source tree.
+
+## Deploying a custom plugin
+
+Because Trino plugins use the `trino-plugin` packaging type, building
+a plugin will create a ZIP file in the `target` directory. This file
+contains the plugin JAR and all its dependencies JAR files.
+
+In order to add a custom plugin to a Trino installation, extract the plugin
+ZIP file and move the extracted directory into the Trino plugin directory.
+For example, for a plugin called `my-functions`, with a version of 1.0,
+you would extract `my-functions-1.0.zip` and then move `my-functions-1.0`
+to `my-functions` in the Trino plugin directory.
+
+:::{note}
+Every Trino plugin should be in a separate directory. Do not put JAR files
+directly into the `plugin` directory. Plugins should only contain JAR files,
+so any subdirectories will not be traversed and will be ignored.
+:::
+
+By default, the plugin directory is the `plugin` directory relative to the
+directory in which Trino is installed, but it is configurable using the
+configuration variable `plugin.dir`. In order for Trino to pick up
+the new plugin, you must restart Trino.
+
+Plugins must be installed on all nodes in the Trino cluster (coordinator and workers).
diff --git a/docs/src/main/sphinx/develop/spi-overview.rst b/docs/src/main/sphinx/develop/spi-overview.rst
deleted file mode 100644
index d2646e260be1..000000000000
--- a/docs/src/main/sphinx/develop/spi-overview.rst
+++ /dev/null
@@ -1,120 +0,0 @@
-============
-SPI overview
-============
-
-When you implement a new Trino plugin, you implement interfaces and
-override methods defined by the Service Provider Interface (SPI).
-
-Plugins can provide additional:
-
-* :doc:`connectors`,
-* block encodings,
-* :doc:`types`,
-* :doc:`functions`,
-* :doc:`system-access-control`,
-* :doc:`group-provider`,
-* :doc:`password-authenticator`,
-* :doc:`header-authenticator`,
-* :doc:`certificate-authenticator`,
-* :doc:`event-listener`,
-* resource group configuration managers,
-* session property configuration managers,
-* and exchange managers.
-
-In particular, connectors are the source of all data for queries in
-Trino: they back each catalog available to Trino.
-
-Code
-----
-
-The SPI source can be found in the ``core/trino-spi`` directory in the Trino
-source tree.
-
-Plugin metadata
----------------
-
-Each plugin identifies an entry point: an implementation of the
-``Plugin`` interface. This class name is provided to Trino via
-the standard Java ``ServiceLoader`` interface: the classpath contains
-a resource file named ``io.trino.spi.Plugin`` in the
-``META-INF/services`` directory. The content of this file is a
-single line listing the name of the plugin class:
-
-.. code-block:: text
-
-    com.example.plugin.ExamplePlugin
-
-For a built-in plugin that is included in the Trino source code,
-this resource file is created whenever the ``pom.xml`` file of a plugin
-contains the following line:
-
-.. code-block:: xml
-
-    <packaging>trino-plugin</packaging>
-
-Plugin
-------
-
-The ``Plugin`` interface is a good starting place for developers looking
-to understand the Trino SPI. It contains access methods to retrieve
-various classes that a Plugin can provide. For example, the ``getConnectorFactories()``
-method is a top-level function that Trino calls to retrieve a ``ConnectorFactory`` when Trino
-is ready to create an instance of a connector to back a catalog. There are similar
-methods for ``Type``, ``ParametricType``, ``Function``, ``SystemAccessControl``, and
-``EventListenerFactory`` objects.
-
-Building plugins via Maven
---------------------------
-
-Plugins depend on the SPI from Trino:
-
-.. code-block:: xml
-
-    <dependency>
-        <groupId>io.trino</groupId>
-        <artifactId>trino-spi</artifactId>
-        <scope>provided</scope>
-    </dependency>
-
-The plugin uses the Maven ``provided`` scope because Trino provides
-the classes from the SPI at runtime and thus the plugin should not
-include them in the plugin assembly.
-
-There are a few other dependencies that are provided by Trino,
-including Slice and Jackson annotations. In particular, Jackson is
-used for serializing connector handles and thus plugins must use the
-annotations version provided by Trino.
-
-All other dependencies are based on what the plugin needs for its
-own implementation. Plugins are loaded in a separate class loader
-to provide isolation and to allow plugins to use a different version
-of a library that Trino uses internally.
-
-For an example ``pom.xml`` file, see the example HTTP connector in the
-``plugin/trino-example-http`` directory in the Trino source tree.
-
-Deploying a custom plugin
--------------------------
-
-Because Trino plugins use the ``trino-plugin`` packaging type, building
-a plugin will create a ZIP file in the ``target`` directory. This file
-contains the plugin JAR and all its dependencies JAR files.
-
-In order to add a custom plugin to a Trino installation, extract the plugin
-ZIP file and move the extracted directory into the Trino plugin directory.
-For example, for a plugin called ``my-functions``, with a version of 1.0,
-you would extract ``my-functions-1.0.zip`` and then move ``my-functions-1.0``
-to ``my-functions`` in the Trino plugin directory.
-
-.. note::
-
-  Every Trino plugin should be in a separate directory. Do not put JAR files
-  directly into the ``plugin`` directory. Plugins should only contain JAR files,
-  so any subdirectories will not be traversed and will be ignored.
-
-By default, the plugin directory is the ``plugin`` directory relative to the
-directory in which Trino is installed, but it is configurable using the
-configuration variable ``plugin.dir``. In order for Trino to pick up
-the new plugin, you must restart Trino.
-
-Plugins must be installed on all nodes in the Trino cluster (coordinator and workers).
diff --git a/docs/src/main/sphinx/develop/supporting-merge.md b/docs/src/main/sphinx/develop/supporting-merge.md
new file mode 100644
index 000000000000..b33d2b5e1f4c
--- /dev/null
+++ b/docs/src/main/sphinx/develop/supporting-merge.md
@@ -0,0 +1,431 @@
+# Supporting `MERGE`
+
+The Trino engine provides APIs to support row-level SQL `MERGE`.
+To implement `MERGE`, a connector must provide the following:
+
+- An implementation of `ConnectorMergeSink`, which is typically
+  layered on top of a `ConnectorPageSink`.
+- Methods in `ConnectorMetadata` to get a "rowId" column handle, get the
+  row change paradigm, and to start and complete the `MERGE` operation.
+
+The Trino engine machinery used to implement SQL `MERGE` is also used to
+support SQL `DELETE` and `UPDATE`. This means that all a connector needs to
+do is implement support for SQL `MERGE`, and the connector gets all the Data
+Modification Language (DML) operations.
+
+## Standard SQL `MERGE`
+
+Different query engines support varying definitions of SQL `MERGE`.
+Trino supports the strict SQL specification `ISO/IEC 9075`, published
+in 2016. As a simple example, given tables `target_table` and
+`source_table` defined as:
+
+```
+CREATE TABLE accounts (
+    customer VARCHAR,
+    purchases DECIMAL,
+    address VARCHAR);
+INSERT INTO accounts (customer, purchases, address) VALUES ...;
+CREATE TABLE monthly_accounts_update (
+    customer VARCHAR,
+    purchases DECIMAL,
+    address VARCHAR);
+INSERT INTO monthly_accounts_update (customer, purchases, address) VALUES ...;
+```
+
+Here is a possible `MERGE` operation, from `monthly_accounts_update` to
+`accounts`:
+
+```
+MERGE INTO accounts t USING monthly_accounts_update s
+    ON (t.customer = s.customer)
+    WHEN MATCHED AND s.address = 'Berkeley' THEN
+        DELETE
+    WHEN MATCHED AND s.customer = 'Joe Shmoe' THEN
+        UPDATE SET purchases = purchases + 100.0
+    WHEN MATCHED THEN
+        UPDATE
+            SET purchases = s.purchases + t.purchases, address = s.address
+    WHEN NOT MATCHED THEN
+        INSERT (customer, purchases, address)
+            VALUES (s.customer, s.purchases, s.address);
+```
+
+SQL `MERGE` tries to match each `WHEN` clause in source order. When
+a match is found, the corresponding `DELETE`, `INSERT` or `UPDATE`
+is executed and subsequent `WHEN` clauses are ignored.
+
+SQL `MERGE` supports two operations on the target table and source
+when a row from the source table or query matches a row in the target table:
+
+- `UPDATE`, in which the columns in the target row are updated.
+- `DELETE`, in which the target row is deleted.
+
+In the `NOT MATCHED` case, SQL `MERGE` supports only `INSERT`
+operations. The values inserted are arbitrary but usually come from
+the unmatched row of the source table or query.
+
+## `RowChangeParadigm`
+
+Different connectors have different ways of representing row updates,
+imposed by the underlying storage systems. The  Trino engine classifies
+these different paradigms as elements of the `RowChangeParadigm`
+enumeration, returned by enumeration, returned by method
+`ConnectorMetadata.getRowChangeParadigm(...)`.
+
+The `RowChangeParadigm` enumeration values are:
+
+- `CHANGE_ONLY_UPDATED_COLUMNS`, intended for connectors that can update
+  individual columns of rows identified by a `rowId`. The corresponding
+  merge processor class is `ChangeOnlyUpdatedColumnsMergeProcessor`.
+- `DELETE_ROW_AND_INSERT_ROW`, intended for connectors that represent a
+  row change as a row deletion paired with a row insertion. The corresponding
+  merge processor class is `DeleteAndInsertMergeProcessor`.
+
+## Overview of `MERGE` processing
+
+A `MERGE` statement is processed by creating a `RIGHT JOIN` between the
+target table and the source, on the `MERGE` criteria. The source may be
+a table or an arbitrary query. For each row in the source table or query,
+`MERGE` produces a `ROW` object containing:
+
+- the data column values from the `UPDATE` or `INSERT` cases. For the
+  `DELETE` cases, only the partition columns, which determine
+  partitioning and bucketing, are non-null.
+- a boolean column containing `true` for source rows that matched some
+  target row, and `false` otherwise.
+- an integer that identifies whether the merge case operation is `UPDATE`,
+  `DELETE` or `INSERT`, or a source row for which no case matched. If a
+  source row doesn't match any merge case, all data column values except
+  those that determine distribution are null, and the operation number
+  is -1.
+
+A `SearchedCaseExpression` is constructed from `RIGHT JOIN` result
+to represent the `WHEN` clauses of the `MERGE`. In the example preceding
+the `MERGE` is executed as if the `SearchedCaseExpression` were written as:
+
+```
+SELECT
+ CASE
+   WHEN present AND s.address = 'Berkeley' THEN
+       -- Null values for delete; present=true; operation DELETE=2, case_number=0
+       row(null, null, null, true, 2, 0)
+   WHEN present AND s.customer = 'Joe Shmoe' THEN
+       -- Update column values; present=true; operation UPDATE=3, case_number=1
+       row(t.customer, t.purchases + 100.0, t.address, true, 3, 1)
+   WHEN present THEN
+       -- Update column values; present=true; operation UPDATE=3, case_number=2
+       row(t.customer, s.purchases + t.purchases, s.address, true, 3, 2)
+   WHEN (present IS NULL) THEN
+       -- Insert column values; present=false; operation INSERT=1, case_number=3
+       row(s.customer, s.purchases, s.address, false, 1, 3)
+   ELSE
+       -- Null values for no case matched; present=false; operation=-1,
+       --     case_number=-1
+       row(null, null, null, false, -1, -1)
+ END
+ FROM (SELECT *, true AS present FROM target_table) t
+   RIGHT JOIN source_table s ON s.customer = t.customer;
+```
+
+The Trino engine executes the `RIGHT JOIN` and `CASE` expression,
+and ensures that no target table row matches more than one source expression
+row, and ultimately creates a sequence of pages to be routed to the node that
+runs the `ConnectorMergeSink.storeMergedRows(...)` method.
+
+Like `DELETE` and `UPDATE`, `MERGE` target table rows are identified by
+a connector-specific `rowId` column handle. For `MERGE`, the `rowId`
+handle is returned by `ConnectorMetadata.getMergeRowIdColumnHandle(...)`.
+
+## `MERGE` redistribution
+
+The Trino `MERGE` implementation allows `UPDATE` to change
+the values of columns that determine partitioning and/or bucketing, and so
+it must "redistribute" rows from the `MERGE` operation to the worker
+nodes responsible for writing rows with the merged partitioning and/or
+bucketing columns.
+
+Since the `MERGE` process in general requires redistribution of
+merged rows among Trino nodes, the order of rows in pages to be stored
+are indeterminate. Connectors like Hive that depend on an ascending
+rowId order for deleted rows must sort the deleted rows before storing
+them.
+
+To ensure that all inserted rows for a given partition end up on a
+single node, the redistribution hash on the partition key/bucket columns
+is applied to the page partition keys. As a result of the hash, all
+rows for a specific partition/bucket hash together, whether they
+were `MATCHED` rows or `NOT MATCHED` rows.
+
+For connectors whose `RowChangeParadigm` is `DELETE_ROW_AND_INSERT_ROW`,
+inserted rows are distributed using the layout supplied by
+`ConnectorMetadata.getInsertLayout()`. For some connectors, the same
+layout is used for updated rows. Other connectors require a special
+layout for updated rows, supplied by `ConnectorMetadata.getUpdateLayout()`.
+
+### Connector support for `MERGE`
+
+To start `MERGE` processing, the Trino engine calls:
+
+- `ConnectorMetadata.getMergeRowIdColumnHandle(...)` to get the
+  `rowId` column handle.
+- `ConnectorMetadata.getRowChangeParadigm(...)` to get the paradigm
+  supported by the connector for changing existing table rows.
+- `ConnectorMetadata.beginMerge(...)` to get the a
+  `ConnectorMergeTableHandle` for the merge operation. That
+  `ConnectorMergeTableHandle` object contains whatever information the
+  connector needs to specify the `MERGE` operation.
+- `ConnectorMetadata.getInsertLayout(...)`, from which it extracts the
+  the list of partition or table columns that impact write redistribution.
+- `ConnectorMetadata.getUpdateLayout(...)`. If that layout is non-empty,
+  it is used to distribute updated rows resulting from the `MERGE`
+  operation.
+
+On nodes that are targets of the hash, the Trino engine calls
+`ConnectorPageSinkProvider.createMergeSink(...)` to create a
+`ConnectorMergeSink`.
+
+To write out each page of merged rows, the Trino engine calls
+`ConnectorMergeSink.storeMergedRows(Page)`. The `storeMergedRows(Page)`
+method iterates over the rows in the page, performing updates and deletes
+in the `MATCHED` cases, and inserts in the `NOT MATCHED` cases.
+
+When using `RowChangeParadigm.DELETE_ROW_AND_INSERT_ROW`, the engine
+translates `UPDATE` operations into a pair of `DELETE` and `INSERT`
+operations before `storeMergedRows(Page)` is called.
+
+To complete the `MERGE` operation, the Trino engine calls
+`ConnectorMetadata.finishMerge(...)`, passing the table handle
+and a collection of JSON objects encoded as `Slice` instances. These
+objects contain connector-specific information specifying what was changed
+by the `MERGE` operation. Typically this JSON object contains the files
+written and table and partition statistics generated by the `MERGE`
+operation. The connector takes appropriate actions, if any.
+
+## `RowChangeProcessor` implementation for `MERGE`
+
+In the `MERGE` implementation, each `RowChangeParadigm`
+corresponds to an internal Trino engine class that implements interface
+`RowChangeProcessor`. `RowChangeProcessor` has one interesting method:
+`Page transformPage(Page)`. The format of the output page depends
+on the `RowChangeParadigm`.
+
+The connector has no access to the `RowChangeProcessor` instance -- it
+is used inside the Trino engine to transform the merge page rows into rows
+to be stored, based on the connector's choice of `RowChangeParadigm`.
+
+The page supplied to `transformPage()` consists of:
+
+- The write redistribution columns if any
+- For partitioned or bucketed tables, a long hash value column.
+- The `rowId` column for the row from the target table if matched, or
+  null if not matched
+- The merge case `RowBlock`
+- The integer case number block
+- The byte `is_distinct` block, with value 0 if not distinct.
+
+The merge case `RowBlock` has the following layout:
+
+- Blocks for each column in the table, including partition columns, in
+  table column order.
+- A block containing the boolean "present" value which is true if the
+  source row matched a target row, and false otherwise.
+- A block containing the `MERGE` case operation number, encoded as
+  `INSERT` = 1, `DELETE` = 2, `UPDATE` = 3 and if no `MERGE`
+  case matched, -1.
+- A block containing the number, starting with 0, for the
+  `WHEN` clause that matched for the row, or -1 if no clause
+  matched.
+
+The page returned from `transformPage` consists of:
+
+- All table columns, in table column order.
+- The merge case operation block.
+- The rowId block.
+- A byte block containing 1 if the row is an insert derived from an
+  update operation, and 0 otherwise. This block is used to correctly
+  calculate the count of rows changed for connectors that represent
+  updates and deletes plus inserts.
+
+`transformPage`
+must ensure that there are no rows whose operation number is -1 in
+the page it returns.
+
+## Detecting duplicate matching target rows
+
+The SQL `MERGE` specification requires that in each `MERGE` case,
+a single target table row must match at most one source row, after
+applying the `MERGE` case condition expression. The first step
+toward finding these error is done by labeling each row in the target
+table with a unique id, using an `AssignUniqueId` node above the
+target table scan. The projected results from the `RIGHT JOIN`
+have these unique ids for matched target table rows as well as
+the `WHEN` clause number. A `MarkDistinct` node adds an
+`is_distinct` column which is true if no other row has the same
+unique id and `WHEN` clause number, and false otherwise. If
+any row has `is_distinct` equal to false, a
+`MERGE_TARGET_ROW_MULTIPLE_MATCHES` exception is raised and
+the `MERGE` operation fails.
+
+## `ConnectorMergeTableHandle` API
+
+Interface `ConnectorMergeTableHandle` defines one method,
+`getTableHandle()` to retrieve the `ConnectorTableHandle`
+originally passed to `ConnectorMetadata.beginMerge()`.
+
+## `ConnectorPageSinkProvider` API
+
+To support SQL `MERGE`, `ConnectorPageSinkProvider` must implement
+the method that creates the `ConnectorMergeSink`:
+
+- `createMergeSink`:
+
+  ```
+  ConnectorMergeSink createMergeSink(
+      ConnectorTransactionHandle transactionHandle,
+      ConnectorSession session,
+      ConnectorMergeTableHandle mergeHandle)
+  ```
+
+## `ConnectorMergeSink` API
+
+To support `MERGE`, the connector must define an
+implementation of `ConnectorMergeSink`, usually layered over the
+connector's `ConnectorPageSink`.
+
+The `ConnectorMergeSink` is created by a call to
+`ConnectorPageSinkProvider.createMergeSink()`.
+
+The only interesting methods are:
+
+- `storeMergedRows`:
+
+  ```
+  void storeMergedRows(Page page)
+  ```
+
+  The Trino engine calls the `storeMergedRows(Page)` method of the
+  `ConnectorMergeSink` instance returned by
+  `ConnectorPageSinkProvider.createMergeSink()`, passing the page
+  generated by the `RowChangeProcessor.transformPage()` method.
+  That page consists of all table columns, in table column order,
+  followed by the `TINYINT` operation column, followed by the rowId column.
+
+  The job of `storeMergedRows()` is iterate over the rows in the page,
+  and process them based on the value of the operation column, `INSERT`,
+  `DELETE`, `UPDATE`, or ignore the row. By choosing appropriate
+  paradigm, the connector can request that the UPDATE operation be
+  transformed into `DELETE` and `INSERT` operations.
+
+- `finish`:
+
+  ```
+  CompletableFuture<Collection<Slice>> finish()
+  ```
+
+  The Trino engine calls `finish()` when all the data has been processed by
+  a specific `ConnectorMergeSink` instance. The connector returns a future
+  containing a collection of `Slice`, representing connector-specific
+  information about the rows processed. Usually this includes the row count,
+  and might include information like the files or partitions created or
+  changed.
+
+## `ConnectorMetadata` `MERGE` API
+
+A connector implementing `MERGE` must implement these `ConnectorMetadata`
+methods.
+
+- `getRowChangeParadigm()`:
+
+  ```
+  RowChangeParadigm getRowChangeParadigm(
+      ConnectorSession session,
+      ConnectorTableHandle tableHandle)
+  ```
+
+  This method is called as the engine starts processing a `MERGE` statement.
+  The connector must return a `RowChangeParadigm` enumeration instance. If
+  the connector doesn't support `MERGE`, then it should throw a
+  `NOT_SUPPORTED` exception to indicate that SQL `MERGE` isn't supported by
+  the connector. Note that the default implementation already throws this
+  exception when the method isn't implemented.
+
+- `getMergeRowIdColumnHandle()`:
+
+  ```
+  ColumnHandle getMergeRowIdColumnHandle(
+      ConnectorSession session,
+      ConnectorTableHandle tableHandle)
+  ```
+
+  This method is called in the early stages of query planning for `MERGE`
+  statements. The ColumnHandle returned provides the `rowId` used by the
+  connector to identify rows to be merged, as well as any other fields of
+  the row that the connector needs to complete the `MERGE` operation.
+
+- `getInsertLayout()`:
+
+  ```
+  Optional<ConnectorTableLayout> getInsertLayout(
+      ConnectorSession session,
+      ConnectorTableHandle tableHandle)
+  ```
+
+  This method is called during query planning to get the table layout to be
+  used for rows inserted by the `MERGE` operation. For some connectors,
+  this layout is used for rows deleted as well.
+
+- `getUpdateLayout()`:
+
+  ```
+  Optional<ConnectorTableLayout> getUpdateLayout(
+      ConnectorSession session,
+      ConnectorTableHandle tableHandle)
+  ```
+
+  This method is called during query planning to get the table layout to be
+  used for rows deleted by the `MERGE` operation. If the optional return
+  value is present, the Trino engine uses the layout for updated rows.
+  Otherwise, it uses the result of `ConnectorMetadata.getInsertLayout` to
+  distribute updated rows.
+
+- `beginMerge()`:
+
+  ```
+  ConnectorMergeTableHandle beginMerge(
+       ConnectorSession session,
+       ConnectorTableHandle tableHandle)
+  ```
+
+  As the last step in creating the `MERGE` execution plan, the connector's
+  `beginMerge()` method is called, passing the `session`, and the
+  `tableHandle`.
+
+  `beginMerge()` performs any orchestration needed in the connector to
+  start processing the `MERGE`. This orchestration varies from connector
+  to connector. In the case of Hive connector operating on transactional tables,
+  for example, `beginMerge()` checks that the table is transactional and
+  starts a Hive Metastore transaction.
+
+  `beginMerge()` returns a `ConnectorMergeTableHandle` with any added
+  information the connector needs when the handle is passed back to
+  `finishMerge()` and the split generation machinery. For most
+  connectors, the returned table handle contains at least a flag identifying
+  the table handle as a table handle for a `MERGE` operation.
+
+- `finishMerge()`:
+
+  ```
+  void finishMerge(
+      ConnectorSession session,
+      ConnectorMergeTableHandle tableHandle,
+      Collection<Slice> fragments)
+  ```
+
+  During `MERGE` processing, the Trino engine accumulates the `Slice`
+  collections returned by `ConnectorMergeSink.finish()`. The engine calls
+  `finishMerge()`, passing the table handle and that collection of
+  `Slice` fragments. In response, the connector takes appropriate actions
+  to complete the `MERGE` operation. Those actions might include
+  committing an underlying transaction, if any, or freeing any other
+  resources.
diff --git a/docs/src/main/sphinx/develop/supporting-merge.rst b/docs/src/main/sphinx/develop/supporting-merge.rst
deleted file mode 100644
index 7d838f6a55fa..000000000000
--- a/docs/src/main/sphinx/develop/supporting-merge.rst
+++ /dev/null
@@ -1,420 +0,0 @@
-====================
-Supporting ``MERGE``
-====================
-
-The Trino engine provides APIs to support row-level SQL ``MERGE``.
-To implement ``MERGE``, a connector must provide the following:
-
-* An implementation of ``ConnectorMergeSink``, which is typically
-  layered on top of a ``ConnectorPageSink``.
-* Methods in ``ConnectorMetadata`` to get a "rowId" column handle, get the
-  row change paradigm, and to start and complete the ``MERGE`` operation.
-
-The Trino engine machinery used to implement SQL ``MERGE`` is also used to
-support SQL ``DELETE`` and ``UPDATE``. This means that all a connector needs to
-do is implement support for SQL ``MERGE``, and the connector gets all the Data
-Modification Language (DML) operations.
-
-Standard SQL ``MERGE``
-----------------------
-
-Different query engines support varying definitions of SQL ``MERGE``.
-Trino supports the strict SQL specification ``ISO/IEC 9075``, published
-in 2016. As a simple example, given tables ``target_table`` and
-``source_table`` defined as::
-
-    CREATE TABLE accounts (
-        customer VARCHAR,
-        purchases DECIMAL,
-        address VARCHAR);
-    INSERT INTO accounts (customer, purchases, address) VALUES ...;
-    CREATE TABLE monthly_accounts_update (
-        customer VARCHAR,
-        purchases DECIMAL,
-        address VARCHAR);
-    INSERT INTO monthly_accounts_update (customer, purchases, address) VALUES ...;
-
-Here is a possible ``MERGE`` operation, from ``monthly_accounts_update`` to
-``accounts``::
-
-    MERGE INTO accounts t USING monthly_accounts_update s
-        ON (t.customer = s.customer)
-        WHEN MATCHED AND s.address = 'Berkeley' THEN
-            DELETE
-        WHEN MATCHED AND s.customer = 'Joe Shmoe' THEN
-            UPDATE SET purchases = purchases + 100.0
-        WHEN MATCHED THEN
-            UPDATE
-                SET purchases = s.purchases + t.purchases, address = s.address
-        WHEN NOT MATCHED THEN
-            INSERT (customer, purchases, address)
-                VALUES (s.customer, s.purchases, s.address);
-
-SQL ``MERGE`` tries to match each ``WHEN`` clause in source order. When
-a match is found, the corresponding ``DELETE``, ``INSERT`` or ``UPDATE``
-is executed and subsequent ``WHEN`` clauses are ignored.
-
-SQL ``MERGE`` supports two operations on the target table and source
-when a row from the source table or query matches a row in the target table:
-
-* ``UPDATE``, in which the columns in the target row are updated.
-* ``DELETE``, in which the target row is deleted.
-
-In the ``NOT MATCHED`` case, SQL ``MERGE`` supports only ``INSERT``
-operations. The values inserted are arbitrary but usually come from
-the unmatched row of the source table or query.
-
-``RowChangeParadigm``
----------------------
-
-Different connectors have different ways of representing row updates,
-imposed by the underlying storage systems. The  Trino engine classifies
-these different paradigms as elements of the ``RowChangeParadigm``
-enumeration, returned by enumeration, returned by method
-``ConnectorMetadata.getRowChangeParadigm(...)``.
-
-The ``RowChangeParadigm`` enumeration values are:
-
-* ``CHANGE_ONLY_UPDATED_COLUMNS``, intended for connectors that can update
-  individual columns of rows identified by a ``rowId``. The corresponding
-  merge processor class is ``ChangeOnlyUpdatedColumnsMergeProcessor``.
-* ``DELETE_ROW_AND_INSERT_ROW``, intended for connectors that represent a
-  row change as a row deletion paired with a row insertion. The corresponding
-  merge processor class is ``DeleteAndInsertMergeProcessor``.
-
-Overview of ``MERGE`` processing
---------------------------------
-
-A ``MERGE`` statement is processed by creating a ``RIGHT JOIN`` between the
-target table and the source, on the ``MERGE`` criteria. The source may be
-a table or an arbitrary query. For each row in the source table or query,
-``MERGE`` produces a ``ROW`` object containing:
-
-* the data column values from the ``UPDATE`` or ``INSERT`` cases. For the
-  ``DELETE`` cases, only the partition columns, which determine
-  partitioning and bucketing, are non-null.
-* a boolean column containing ``true`` for source rows that matched some
-  target row, and ``false`` otherwise.
-* an integer that identifies whether the merge case operation is ``UPDATE``,
-  ``DELETE`` or ``INSERT``, or a source row for which no case matched. If a
-  source row doesn't match any merge case, all data column values except
-  those that determine distribution are null, and the operation number
-  is -1.
-
-A ``SearchedCaseExpression`` is constructed from ``RIGHT JOIN`` result
-to represent the ``WHEN`` clauses of the ``MERGE``. In the example preceding
-the ``MERGE`` is executed as if the ``SearchedCaseExpression`` were written as::
-
-   SELECT
-    CASE
-      WHEN present AND s.address = 'Berkeley' THEN
-          -- Null values for delete; present=true; operation DELETE=2, case_number=0
-          row(null, null, null, true, 2, 0)
-      WHEN present AND s.customer = 'Joe Shmoe' THEN
-          -- Update column values; present=true; operation UPDATE=3, case_number=1
-          row(t.customer, t.purchases + 100.0, t.address, true, 3, 1)
-      WHEN present THEN
-          -- Update column values; present=true; operation UPDATE=3, case_number=2
-          row(t.customer, s.purchases + t.purchases, s.address, true, 3, 2)
-      WHEN (present IS NULL) THEN
-          -- Insert column values; present=false; operation INSERT=1, case_number=3
-          row(s.customer, s.purchases, s.address, false, 1, 3)
-      ELSE
-          -- Null values for no case matched; present=false; operation=-1,
-          --     case_number=-1
-          row(null, null, null, false, -1, -1)
-    END
-    FROM (SELECT *, true AS present FROM target_table) t
-      RIGHT JOIN source_table s ON s.customer = t.customer;
-
-The Trino engine executes the ``RIGHT JOIN`` and ``CASE`` expression,
-and ensures that no target table row matches more than one source expression
-row, and ultimately creates a sequence of pages to be routed to the node that
-runs the ``ConnectorMergeSink.storeMergedRows(...)`` method.
-
-Like ``DELETE`` and ``UPDATE``, ``MERGE`` target table rows are identified by
-a connector-specific ``rowId`` column handle. For ``MERGE``, the ``rowId``
-handle is returned by ``ConnectorMetadata.getMergeRowIdColumnHandle(...)``.
-
-``MERGE`` redistribution
-------------------------
-
-The Trino ``MERGE`` implementation allows ``UPDATE`` to change
-the values of columns that determine partitioning and/or bucketing, and so
-it must "redistribute" rows from the ``MERGE`` operation to the worker
-nodes responsible for writing rows with the merged partitioning and/or
-bucketing columns.
-
-Since the ``MERGE`` process in general requires redistribution of
-merged rows among Trino nodes, the order of rows in pages to be stored
-are indeterminate. Connectors like Hive that depend on an ascending
-rowId order for deleted rows must sort the deleted rows before storing
-them.
-
-To ensure that all inserted rows for a given partition end up on a
-single node, the redistribution hash on the partition key/bucket columns
-is applied to the page partition keys. As a result of the hash, all
-rows for a specific partition/bucket hash together, whether they
-were ``MATCHED`` rows or ``NOT MATCHED`` rows.
-
-For connectors whose ``RowChangeParadigm`` is ``DELETE_ROW_AND_INSERT_ROW``,
-inserted rows are distributed using the layout supplied by
-``ConnectorMetadata.getInsertLayout()``. For some connectors, the same
-layout is used for updated rows. Other connectors require a special
-layout for updated rows, supplied by ``ConnectorMetadata.getUpdateLayout()``.
-
-Connector support for ``MERGE``
-===============================
-
-To start ``MERGE`` processing, the Trino engine calls:
-
-* ``ConnectorMetadata.getMergeRowIdColumnHandle(...)`` to get the
-  ``rowId`` column handle.
-* ``ConnectorMetadata.getRowChangeParadigm(...)`` to get the paradigm
-  supported by the connector for changing existing table rows.
-* ``ConnectorMetadata.beginMerge(...)`` to get the a
-  ``ConnectorMergeTableHandle`` for the merge operation. That
-  ``ConnectorMergeTableHandle`` object contains whatever information the
-  connector needs to specify the ``MERGE`` operation.
-* ``ConnectorMetadata.getInsertLayout(...)``, from which it extracts the
-  the list of partition or table columns that impact write redistribution.
-* ``ConnectorMetadata.getUpdateLayout(...)``. If that layout is non-empty,
-  it is used to distribute updated rows resulting from the ``MERGE``
-  operation.
-
-On nodes that are targets of the hash, the Trino engine calls
-``ConnectorPageSinkProvider.createMergeSink(...)`` to create a
-``ConnectorMergeSink``.
-
-To write out each page of merged rows, the Trino engine calls
-``ConnectorMergeSink.storeMergedRows(Page)``. The ``storeMergedRows(Page)``
-method iterates over the rows in the page, performing updates and deletes
-in the ``MATCHED`` cases, and inserts in the ``NOT MATCHED`` cases.
-
-When using ``RowChangeParadigm.DELETE_ROW_AND_INSERT_ROW``, the engine
-translates ``UPDATE`` operations into a pair of ``DELETE`` and ``INSERT``
-operations before ``storeMergedRows(Page)`` is called.
-
-To complete the ``MERGE`` operation, the Trino engine calls
-``ConnectorMetadata.finishMerge(...)``, passing the table handle
-and a collection of JSON objects encoded as ``Slice`` instances. These
-objects contain connector-specific information specifying what was changed
-by the ``MERGE`` operation. Typically this JSON object contains the files
-written and table and partition statistics generated by the ``MERGE``
-operation. The connector takes appropriate actions, if any.
-
-``RowChangeProcessor`` implementation for ``MERGE``
----------------------------------------------------
-
-In the ``MERGE`` implementation, each ``RowChangeParadigm``
-corresponds to an internal Trino engine class that implements interface
-``RowChangeProcessor``. ``RowChangeProcessor`` has one interesting method:
-``Page transformPage(Page)``. The format of the output page depends
-on the ``RowChangeParadigm``.
-
-The connector has no access to the ``RowChangeProcessor`` instance -- it
-is used inside the Trino engine to transform the merge page rows into rows
-to be stored, based on the connector's choice of ``RowChangeParadigm``.
-
-The page supplied to ``transformPage()`` consists of:
-
-* The write redistribution columns if any
-* For partitioned or bucketed tables, a long hash value column.
-* The ``rowId`` column for the row from the target table if matched, or
-  null if not matched
-* The merge case ``RowBlock``
-* The integer case number block
-* The byte ``is_distinct`` block, with value 0 if not distinct.
-
-The merge case ``RowBlock`` has the following layout:
-
-* Blocks for each column in the table, including partition columns, in
-  table column order.
-* A block containing the boolean "present" value which is true if the
-  source row matched a target row, and false otherwise.
-* A block containing the ``MERGE`` case operation number, encoded as
-  ``INSERT`` = 1, ``DELETE`` = 2, ``UPDATE`` = 3 and if no ``MERGE``
-  case matched, -1.
-* A block containing the number, starting with 0, for the
-  ``WHEN`` clause that matched for the row, or -1 if no clause
-  matched.
-
-The page returned from ``transformPage`` consists of:
-
-* All table columns, in table column order.
-* The merge case operation block.
-* The rowId block.
-* A byte block containing 1 if the row is an insert derived from an
-  update operation, and 0 otherwise. This block is used to correctly
-  calculate the count of rows changed for connectors that represent
-  updates and deletes plus inserts.
-
-``transformPage``
-must ensure that there are no rows whose operation number is -1 in
-the page it returns.
-
-Detecting duplicate matching target rows
-----------------------------------------
-
-The SQL ``MERGE`` specification requires that in each ``MERGE`` case,
-a single target table row must match at most one source row, after
-applying the ``MERGE`` case condition expression. The first step
-toward finding these error is done by labeling each row in the target
-table with a unique id, using an ``AssignUniqueId`` node above the
-target table scan. The projected results from the ``RIGHT JOIN``
-have these unique ids for matched target table rows as well as
-the ``WHEN`` clause number. A ``MarkDistinct`` node adds an
-``is_distinct`` column which is true if no other row has the same
-unique id and ``WHEN`` clause number, and false otherwise. If
-any row has ``is_distinct`` equal to false, a
-``MERGE_TARGET_ROW_MULTIPLE_MATCHES`` exception is raised and
-the ``MERGE`` operation fails.
-
-``ConnectorMergeTableHandle`` API
----------------------------------
-
-Interface ``ConnectorMergeTableHandle`` defines one method,
-``getTableHandle()`` to retrieve the ``ConnectorTableHandle``
-originally passed to ``ConnectorMetadata.beginMerge()``.
-
-``ConnectorPageSinkProvider`` API
----------------------------------
-
-To support SQL ``MERGE``, ``ConnectorPageSinkProvider`` must implement
-the method that creates the ``ConnectorMergeSink``:
-
-* ``createMergeSink``::
-
-    ConnectorMergeSink createMergeSink(
-        ConnectorTransactionHandle transactionHandle,
-        ConnectorSession session,
-        ConnectorMergeTableHandle mergeHandle)
-
-``ConnectorMergeSink`` API
---------------------------
-
-To support ``MERGE``, the connector must define an
-implementation of ``ConnectorMergeSink``, usually layered over the
-connector's ``ConnectorPageSink``.
-
-The ``ConnectorMergeSink`` is created by a call to
-``ConnectorPageSinkProvider.createMergeSink()``.
-
-The only interesting methods are:
-
-* ``storeMergedRows``::
-
-    void storeMergedRows(Page page)
-
-  The Trino engine calls the ``storeMergedRows(Page)`` method of the
-  ``ConnectorMergeSink`` instance returned by
-  ``ConnectorPageSinkProvider.createMergeSink()``, passing the page
-  generated by the ``RowChangeProcessor.transformPage()`` method.
-  That page consists of all table columns, in table column order,
-  followed by the ``TINYINT`` operation column, followed by the rowId column.
-
-  The job of ``storeMergedRows()`` is iterate over the rows in the page,
-  and process them based on the value of the operation column, ``INSERT``,
-  ``DELETE``, ``UPDATE``, or ignore the row. By choosing appropriate
-  paradigm, the connector can request that the UPDATE operation be
-  transformed into ``DELETE`` and ``INSERT`` operations.
-
-* ``finish``::
-
-    CompletableFuture<Collection<Slice>> finish()
-
-  The Trino engine calls ``finish()`` when all the data has been processed by
-  a specific ``ConnectorMergeSink`` instance. The connector returns a future
-  containing a collection of ``Slice``, representing connector-specific
-  information about the rows processed. Usually this includes the row count,
-  and might include information like the files or partitions created or
-  changed.
-
-``ConnectorMetadata`` ``MERGE`` API
------------------------------------
-
-A connector implementing ``MERGE`` must implement these ``ConnectorMetadata``
-methods.
-
-* ``getRowChangeParadigm()``::
-
-    RowChangeParadigm getRowChangeParadigm(
-        ConnectorSession session,
-        ConnectorTableHandle tableHandle)
-
-  This method is called as the engine starts processing a ``MERGE`` statement.
-  The connector must return a ``RowChangeParadigm`` enumeration instance. If
-  the connector doesn't support ``MERGE``, then it should throw a
-  ``NOT_SUPPORTED`` exception to indicate that SQL ``MERGE`` isn't supported by
-  the connector. Note that the default implementation already throws this
-  exception when the method isn't implemented.
-
-* ``getMergeRowIdColumnHandle()``::
-
-    ColumnHandle getMergeRowIdColumnHandle(
-        ConnectorSession session,
-        ConnectorTableHandle tableHandle)
-
-  This method is called in the early stages of query planning for ``MERGE``
-  statements. The ColumnHandle returned provides the ``rowId`` used by the
-  connector to identify rows to be merged, as well as any other fields of
-  the row that the connector needs to complete the ``MERGE`` operation.
-
-* ``getInsertLayout()``::
-
-    Optional<ConnectorTableLayout> getInsertLayout(
-        ConnectorSession session,
-        ConnectorTableHandle tableHandle)
-
-  This method is called during query planning to get the table layout to be
-  used for rows inserted by the ``MERGE`` operation. For some connectors,
-  this layout is used for rows deleted as well.
-
-* ``getUpdateLayout()``::
-
-    Optional<ConnectorTableLayout> getUpdateLayout(
-        ConnectorSession session,
-        ConnectorTableHandle tableHandle)
-
-  This method is called during query planning to get the table layout to be
-  used for rows deleted by the ``MERGE`` operation. If the optional return
-  value is present, the Trino engine uses the layout for updated rows.
-  Otherwise, it uses the result of ``ConnectorMetadata.getInsertLayout`` to
-  distribute updated rows.
-
-* ``beginMerge()``::
-
-    ConnectorMergeTableHandle beginMerge(
-         ConnectorSession session,
-         ConnectorTableHandle tableHandle)
-
-  As the last step in creating the ``MERGE`` execution plan, the connector's
-  ``beginMerge()`` method is called, passing the ``session``, and the
-  ``tableHandle``.
-
-  ``beginMerge()`` performs any orchestration needed in the connector to
-  start processing the ``MERGE``. This orchestration varies from connector
-  to connector. In the case of Hive connector operating on transactional tables,
-  for example, ``beginMerge()`` checks that the table is transactional and
-  starts a Hive Metastore transaction.
-
-  ``beginMerge()`` returns a ``ConnectorMergeTableHandle`` with any added
-  information the connector needs when the handle is passed back to
-  ``finishMerge()`` and the split generation machinery. For most
-  connectors, the returned table handle contains at least a flag identifying
-  the table handle as a table handle for a ``MERGE`` operation.
-
-* ``finishMerge()``::
-
-      void finishMerge(
-          ConnectorSession session,
-          ConnectorMergeTableHandle tableHandle,
-          Collection<Slice> fragments)
-
-  During ``MERGE`` processing, the Trino engine accumulates the ``Slice``
-  collections returned by ``ConnectorMergeSink.finish()``. The engine calls
-  ``finishMerge()``, passing the table handle and that collection of
-  ``Slice`` fragments. In response, the connector takes appropriate actions
-  to complete the ``MERGE`` operation. Those actions might include
-  committing an underlying transaction, if any, or freeing any other
-  resources.
diff --git a/docs/src/main/sphinx/develop/system-access-control.md b/docs/src/main/sphinx/develop/system-access-control.md
new file mode 100644
index 000000000000..54050491d894
--- /dev/null
+++ b/docs/src/main/sphinx/develop/system-access-control.md
@@ -0,0 +1,49 @@
+# System access control
+
+Trino separates the concept of the principal who authenticates to the
+coordinator from the username that is responsible for running queries. When
+running the Trino CLI, for example, the Trino username can be specified using
+the `--user` option.
+
+By default, the Trino coordinator allows any principal to run queries as any
+Trino user. In a secure environment, this is probably not desirable behavior
+and likely requires customization.
+
+## Implementation
+
+`SystemAccessControlFactory` is responsible for creating a
+`SystemAccessControl` instance. It also defines a `SystemAccessControl`
+name which is used by the administrator in a Trino configuration.
+
+`SystemAccessControl` implementations have several responsibilities:
+
+- Verifying whether or not a given principal is authorized to execute queries as a specific user.
+- Determining whether or not a given user can alter values for a given system property.
+- Performing access checks across all catalogs. These access checks happen before
+  any connector specific checks and thus can deny permissions that would otherwise
+  be allowed by `ConnectorAccessControl`.
+
+The implementation of `SystemAccessControl` and `SystemAccessControlFactory`
+must be wrapped as a plugin and installed on the Trino cluster.
+
+## Configuration
+
+After a plugin that implements `SystemAccessControl` and
+`SystemAccessControlFactory` has been installed on the coordinator, it is
+configured using the file(s) specified by the `access-control.config-files`
+property (the default is a single `etc/access-control.properties` file).
+All of the properties other than `access-control.name` are specific to
+the `SystemAccessControl` implementation.
+
+The `access-control.name` property is used by Trino to find a registered
+`SystemAccessControlFactory` based on the name returned by
+`SystemAccessControlFactory.getName()`. The remaining properties are passed
+as a map to `SystemAccessControlFactory.create()`.
+
+Example configuration file:
+
+```text
+access-control.name=custom-access-control
+custom-property1=custom-value1
+custom-property2=custom-value2
+```
diff --git a/docs/src/main/sphinx/develop/system-access-control.rst b/docs/src/main/sphinx/develop/system-access-control.rst
deleted file mode 100644
index fbe1013bef97..000000000000
--- a/docs/src/main/sphinx/develop/system-access-control.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-=====================
-System access control
-=====================
-
-Trino separates the concept of the principal who authenticates to the
-coordinator from the username that is responsible for running queries. When
-running the Trino CLI, for example, the Trino username can be specified using
-the ``--user`` option.
-
-By default, the Trino coordinator allows any principal to run queries as any
-Trino user. In a secure environment, this is probably not desirable behavior
-and likely requires customization.
-
-Implementation
---------------
-
-``SystemAccessControlFactory`` is responsible for creating a
-``SystemAccessControl`` instance. It also defines a ``SystemAccessControl``
-name which is used by the administrator in a Trino configuration.
-
-``SystemAccessControl`` implementations have several responsibilities:
-
-* Verifying whether or not a given principal is authorized to execute queries as a specific user.
-* Determining whether or not a given user can alter values for a given system property.
-* Performing access checks across all catalogs. These access checks happen before
-  any connector specific checks and thus can deny permissions that would otherwise
-  be allowed by ``ConnectorAccessControl``.
-
-The implementation of ``SystemAccessControl`` and ``SystemAccessControlFactory``
-must be wrapped as a plugin and installed on the Trino cluster.
-
-Configuration
--------------
-
-After a plugin that implements ``SystemAccessControl`` and
-``SystemAccessControlFactory`` has been installed on the coordinator, it is
-configured using the file(s) specified by the ``access-control.config-files``
-property (the default is a single ``etc/access-control.properties`` file).
-All of the properties other than ``access-control.name`` are specific to
-the ``SystemAccessControl`` implementation.
-
-The ``access-control.name`` property is used by Trino to find a registered
-``SystemAccessControlFactory`` based on the name returned by
-``SystemAccessControlFactory.getName()``. The remaining properties are passed
-as a map to ``SystemAccessControlFactory.create()``.
-
-Example configuration file:
-
-.. code-block:: text
-
-    access-control.name=custom-access-control
-    custom-property1=custom-value1
-    custom-property2=custom-value2
diff --git a/docs/src/main/sphinx/develop/table-functions.md b/docs/src/main/sphinx/develop/table-functions.md
new file mode 100644
index 000000000000..7b5048fa2767
--- /dev/null
+++ b/docs/src/main/sphinx/develop/table-functions.md
@@ -0,0 +1,274 @@
+# Table functions
+
+Table functions return tables. They allow users to dynamically invoke custom
+logic from within the SQL query. They are invoked in the `FROM` clause of a
+query, and the calling convention is similar to a scalar function call. For
+description of table functions usage, see
+{doc}`table functions</functions/table>`.
+
+Trino supports adding custom table functions. They are declared by connectors
+through implementing dedicated interfaces.
+
+## Table function declaration
+
+To declare a table function, you need to implement `ConnectorTableFunction`.
+Subclassing `AbstractConnectorTableFunction` is a convenient way to do it.
+The connector's `getTableFunctions()` method must return a set of your
+implementations.
+
+### The constructor
+
+```java
+public class MyFunction
+        extends AbstractConnectorTableFunction
+{
+    public MyFunction()
+    {
+        super(
+                "system",
+                "my_function",
+                List.of(
+                        ScalarArgumentSpecification.builder()
+                                .name("COLUMN_COUNT")
+                                .type(INTEGER)
+                                .defaultValue(2)
+                                .build(),
+                        ScalarArgumentSpecification.builder()
+                                .name("ROW_COUNT")
+                                .type(INTEGER)
+                                .build()),
+                GENERIC_TABLE);
+    }
+}
+```
+
+The constructor takes the following arguments:
+
+- **schema name**
+
+The schema name helps you organize functions, and it is used for function
+resolution. When a table function is invoked, the right implementation is
+identified by the catalog name, the schema name, and the function name.
+
+The function can use the schema name, for example to use data from the
+indicated schema, or ignore it.
+
+- **function name**
+- **list of expected arguments**
+
+Three different types of arguments are supported: scalar arguments, descriptor
+arguments, and table arguments. See {ref}`tf-argument-types` for details. You can
+specify default values for scalar and descriptor arguments. The arguments with
+specified default can be skipped during table function invocation.
+
+- **returned row type**
+
+It describes the row type produced by the table function.
+
+If a table function takes table arguments, it can additionally pass the columns
+of the input tables to output using the *pass-through mechanism*. The returned
+row type is supposed to describe only the columns produced by the function, as
+opposed to the pass-through columns.
+
+In the example, the returned row type is `GENERIC_TABLE`, which means that
+the row type is not known statically, and it is determined dynamically based on
+the passed arguments.
+
+When the returned row type is known statically, you can declare it using:
+
+```java
+new DescribedTable(descriptor)
+```
+
+If a table function does not produce any columns, and it only outputs the
+pass-through columns, use `ONLY_PASS_THROUGH` as the returned row type.
+
+:::{note}
+A table function must return at least one column. It can either be a proper
+column, i.e. produced by the function, or a pass-through column.
+:::
+
+(tf-argument-types)=
+
+### Argument types
+
+Table functions take three types of arguments:
+{ref}`scalar arguments<tf-scalar-arguments>`,
+{ref}`descriptor arguments<tf-descriptor-arguments>`, and
+{ref}`table arguments<tf-table-arguments>`.
+
+(tf-scalar-arguments)=
+
+#### Scalar arguments
+
+They can be of any supported data type. You can specify a default value.
+
+```java
+ScalarArgumentSpecification.builder()
+        .name("COLUMN_COUNT")
+        .type(INTEGER)
+        .defaultValue(2)
+        .build()
+```
+
+```java
+ScalarArgumentSpecification.builder()
+        .name("ROW_COUNT")
+        .type(INTEGER)
+        .build()
+```
+
+(tf-descriptor-arguments)=
+
+#### Descriptor arguments
+
+Descriptors consist of fields with names and optional data types. They are a
+convenient way to pass the required result row type to the function, or for
+example inform the function which input columns it should use. You can specify
+default values for descriptor arguments. Descriptor argument can be `null`.
+
+```java
+DescriptorArgumentSpecification.builder()
+        .name("SCHEMA")
+        .defaultValue(null)
+        .build()
+```
+
+(tf-table-arguments)=
+
+#### Table arguments
+
+A table function can take any number of input relations. It allows you to
+process multiple data sources simultaneously.
+
+When declaring a table argument, you must specify characteristics to determine
+how the input table is processed. Also note that you cannot specify a default
+value for a table argument.
+
+```java
+TableArgumentSpecification.builder()
+        .name("INPUT")
+        .rowSemantics()
+        .pruneWhenEmpty()
+        .passThroughColumns()
+        .build()
+```
+
+(tf-set-or-row-semantics)=
+
+##### Set or row semantics
+
+Set semantics is the default for table arguments. A table argument with set
+semantics is processed on a partition-by-partition basis. During function
+invocation, the user can specify partitioning and ordering for the argument. If
+no partitioning is specified, the argument is processed as a single partition.
+
+A table argument with row semantics is processed on a row-by-row basis.
+Partitioning or ordering is not applicable.
+
+##### Prune or keep when empty
+
+The *prune when empty* property indicates that if the given table argument is
+empty, the function returns empty result. This property is used to optimize
+queries involving table functions. The *keep when empty* property indicates
+that the function should be executed even if the table argument is empty. The
+user can override this property when invoking the function. Using the *keep
+when empty* property can negatively affect performance when the table argument
+is not empty.
+
+##### Pass-through columns
+
+If a table argument has *pass-through columns*, all of its columns are passed
+on output. For a table argument without this property, only the partitioning
+columns are passed on output.
+
+### The `analyze()` method
+
+In order to provide all the necessary information to the Trino engine, the
+class must implement the `analyze()` method. This method is called by the
+engine during the analysis phase of query processing. The `analyze()` method
+is also the place to perform custom checks on the arguments:
+
+```java
+@Override
+public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+{
+    long columnCount = (long) ((ScalarArgument) arguments.get("COLUMN_COUNT")).getValue();
+    long rowCount = (long) ((ScalarArgument) arguments.get("ROW_COUNT")).getValue();
+
+    // custom validation of arguments
+    if (columnCount < 1 || columnCount > 3) {
+         throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "column_count must be in range [1, 3]");
+    }
+
+    if (rowCount < 1) {
+        throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "row_count must be positive");
+    }
+
+    // determine the returned row type
+    List<Descriptor.Field> fields = List.of("col_a", "col_b", "col_c").subList(0, (int) columnCount).stream()
+            .map(name -> new Descriptor.Field(name, Optional.of(BIGINT)))
+            .collect(toList());
+
+    Descriptor returnedType = new Descriptor(fields);
+
+    return TableFunctionAnalysis.builder()
+            .returnedType(returnedType)
+            .handle(new MyHandle(columnCount, rowCount))
+            .build();
+}
+```
+
+The `analyze()` method returns a `TableFunctionAnalysis` object, which
+comprises all the information required by the engine to analyze, plan, and
+execute the table function invocation:
+
+- The returned row type, specified as an optional `Descriptor`. It should be
+  passed if and only if the table function is declared with the
+  `GENERIC_TABLE` returned type.
+- Required columns from the table arguments, specified as a map of table
+  argument names to lists of column indexes.
+- Any information gathered during analysis that is useful during planning or
+  execution, in the form of a `ConnectorTableFunctionHandle`.
+  `ConnectorTableFunctionHandle` is a marker interface intended to carry
+  information throughout subsequent phases of query processing in a manner that
+  is opaque to the engine.
+
+## Table function execution
+
+There are two paths of execution available for table functions.
+
+1. Pushdown to the connector
+
+The connector that provides the table function implements the
+`applyTableFunction()` method. This method is called during the optimization
+phase of query processing. It returns a `ConnectorTableHandle` and a list of
+`ColumnHandle` s representing the table function result. The table function
+invocation is then replaced with a `TableScanNode`.
+
+This execution path is convenient for table functions whose results are easy to
+represent as a `ConnectorTableHandle`, for example query pass-through. It
+only supports scalar and descriptor arguments.
+
+2. Execution by operator
+
+Trino has a dedicated operator for table functions. It can handle table
+functions with any number of table arguments as well as scalar and descriptor
+arguments. To use this execution path, you provide an implementation of a
+processor.
+
+If your table function has one or more table arguments, you must implement
+`TableFunctionDataProcessor`. It processes pages of input data.
+
+If your table function is a source operator (it does not have table arguments),
+you must implement `TableFunctionSplitProcessor`. It processes splits. The
+connector that provides the function must provide a `ConnectorSplitSource`
+for the function. With splits, the task can be divided so that each split
+represents a subtask.
+
+## Access control
+
+The access control for table functions can be provided both on system and
+connector level. It is based on the fully qualified table function name,
+which consists of the catalog name, the schema name, and the function name,
+in the syntax of `catalog.schema.function`.
diff --git a/docs/src/main/sphinx/develop/table-functions.rst b/docs/src/main/sphinx/develop/table-functions.rst
deleted file mode 100644
index 9289595ca3b2..000000000000
--- a/docs/src/main/sphinx/develop/table-functions.rst
+++ /dev/null
@@ -1,289 +0,0 @@
-
-===============
-Table functions
-===============
-
-Table functions return tables. They allow users to dynamically invoke custom
-logic from within the SQL query. They are invoked in the ``FROM`` clause of a
-query, and the calling convention is similar to a scalar function call. For
-description of table functions usage, see
-:doc:`table functions</functions/table>`.
-
-Trino supports adding custom table functions. They are declared by connectors
-through implementing dedicated interfaces.
-
-Table function declaration
---------------------------
-
-To declare a table function, you need to implement ``ConnectorTableFunction``.
-Subclassing ``AbstractConnectorTableFunction`` is a convenient way to do it.
-The connector's ``getTableFunctions()`` method must return a set of your
-implementations.
-
-The constructor
-^^^^^^^^^^^^^^^
-
-.. code-block:: java
-
-    public class MyFunction
-            extends AbstractConnectorTableFunction
-    {
-        public MyFunction()
-        {
-            super(
-                    "system",
-                    "my_function",
-                    List.of(
-                            ScalarArgumentSpecification.builder()
-                                    .name("COLUMN_COUNT")
-                                    .type(INTEGER)
-                                    .defaultValue(2)
-                                    .build(),
-                            ScalarArgumentSpecification.builder()
-                                    .name("ROW_COUNT")
-                                    .type(INTEGER)
-                                    .build()),
-                    GENERIC_TABLE);
-        }
-    }
-
-The constructor takes the following arguments:
-
-- **schema name**
-
-The schema name helps you organize functions, and it is used for function
-resolution. When a table function is invoked, the right implementation is
-identified by the catalog name, the schema name, and the function name.
-
-The function can use the schema name, for example to use data from the
-indicated schema, or ignore it.
-
-- **function name**
-- **list of expected arguments**
-
-Three different types of arguments are supported: scalar arguments, descriptor
-arguments, and table arguments. See :ref:`tf_argument_types` for details. You can
-specify default values for scalar and descriptor arguments. The arguments with
-specified default can be skipped during table function invocation.
-
-- **returned row type**
-
-It describes the row type produced by the table function.
-
-If a table function takes table arguments, it can additionally pass the columns
-of the input tables to output using the *pass-through mechanism*. The returned
-row type is supposed to describe only the columns produced by the function, as
-opposed to the pass-through columns.
-
-In the example, the returned row type is ``GENERIC_TABLE``, which means that
-the row type is not known statically, and it is determined dynamically based on
-the passed arguments.
-
-When the returned row type is known statically, you can declare it using:
-
-.. code-block:: java
-
-    new DescribedTable(descriptor)
-
-If a table function does not produce any columns, and it only outputs the
-pass-through columns, use ``ONLY_PASS_THROUGH`` as the returned row type.
-
-.. note::
-
-    A table function must return at least one column. It can either be a proper
-    column, i.e. produced by the function, or a pass-through column.
-
-.. _tf_argument_types:
-
-Argument types
-^^^^^^^^^^^^^^
-
-Table functions take three types of arguments:
-:ref:`scalar arguments<tf_scalar_arguments>`,
-:ref:`descriptor arguments<tf_descriptor_arguments>`, and
-:ref:`table arguments<tf_table_arguments>`.
-
-.. _tf_scalar_arguments:
-
-Scalar arguments
-++++++++++++++++
-
-They can be of any supported data type. You can specify a default value.
-
-.. code-block:: java
-
-    ScalarArgumentSpecification.builder()
-            .name("COLUMN_COUNT")
-            .type(INTEGER)
-            .defaultValue(2)
-            .build()
-
-.. code-block:: java
-
-    ScalarArgumentSpecification.builder()
-            .name("ROW_COUNT")
-            .type(INTEGER)
-            .build()
-
-.. _tf_descriptor_arguments:
-
-Descriptor arguments
-++++++++++++++++++++
-
-Descriptors consist of fields with names and optional data types. They are a
-convenient way to pass the required result row type to the function, or for
-example inform the function which input columns it should use. You can specify
-default values for descriptor arguments. Descriptor argument can be ``null``.
-
-.. code-block:: java
-
-    DescriptorArgumentSpecification.builder()
-            .name("SCHEMA")
-            .defaultValue(null)
-            .build()
-
-.. _tf_table_arguments:
-
-Table arguments
-+++++++++++++++
-
-A table function can take any number of input relations. It allows you to
-process multiple data sources simultaneously.
-
-When declaring a table argument, you must specify characteristics to determine
-how the input table is processed. Also note that you cannot specify a default
-value for a table argument.
-
-.. code-block:: java
-
-    TableArgumentSpecification.builder()
-            .name("INPUT")
-            .rowSemantics()
-            .pruneWhenEmpty()
-            .passThroughColumns()
-            .build()
-
-.. _tf_set_or_row_semantics:
-
-Set or row semantics
-====================
-
-Set semantics is the default for table arguments. A table argument with set
-semantics is processed on a partition-by-partition basis. During function
-invocation, the user can specify partitioning and ordering for the argument. If
-no partitioning is specified, the argument is processed as a single partition.
-
-A table argument with row semantics is processed on a row-by-row basis.
-Partitioning or ordering is not applicable.
-
-Prune or keep when empty
-========================
-
-The *prune when empty* property indicates that if the given table argument is
-empty, the function returns empty result. This property is used to optimize
-queries involving table functions. The *keep when empty* property indicates
-that the function should be executed even if the table argument is empty. The
-user can override this property when invoking the function. Using the *keep
-when empty* property can negatively affect performance when the table argument
-is not empty.
-
-Pass-through columns
-====================
-
-If a table argument has *pass-through columns*, all of its columns are passed
-on output. For a table argument without this property, only the partitioning
-columns are passed on output.
-
-The ``analyze()`` method
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-In order to provide all the necessary information to the Trino engine, the
-class must implement the ``analyze()`` method. This method is called by the
-engine during the analysis phase of query processing. The ``analyze()`` method
-is also the place to perform custom checks on the arguments:
-
-.. code-block:: java
-
-    @Override
-    public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
-    {
-        long columnCount = (long) ((ScalarArgument) arguments.get("COLUMN_COUNT")).getValue();
-        long rowCount = (long) ((ScalarArgument) arguments.get("ROW_COUNT")).getValue();
-
-        // custom validation of arguments
-        if (columnCount < 1 || columnCount > 3) {
-             throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "column_count must be in range [1, 3]");
-        }
-
-        if (rowCount < 1) {
-            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "row_count must be positive");
-        }
-
-        // determine the returned row type
-        List<Descriptor.Field> fields = List.of("col_a", "col_b", "col_c").subList(0, (int) columnCount).stream()
-                .map(name -> new Descriptor.Field(name, Optional.of(BIGINT)))
-                .collect(toList());
-
-        Descriptor returnedType = new Descriptor(fields);
-
-        return TableFunctionAnalysis.builder()
-                .returnedType(returnedType)
-                .handle(new MyHandle(columnCount, rowCount))
-                .build();
-    }
-
-The ``analyze()`` method returns a ``TableFunctionAnalysis`` object, which
-comprises all the information required by the engine to analyze, plan, and
-execute the table function invocation:
-
-- The returned row type, specified as an optional ``Descriptor``. It should be
-  passed if and only if the table function is declared with the
-  ``GENERIC_TABLE`` returned type.
-- Required columns from the table arguments, specified as a map of table
-  argument names to lists of column indexes.
-- Any information gathered during analysis that is useful during planning or
-  execution, in the form of a ``ConnectorTableFunctionHandle``.
-  ``ConnectorTableFunctionHandle`` is a marker interface intended to carry
-  information throughout subsequent phases of query processing in a manner that
-  is opaque to the engine.
-
-Table function execution
-------------------------
-
-There are two paths of execution available for table functions.
-
-1. Pushdown to the connector
-
-The connector that provides the table function implements the
-``applyTableFunction()`` method. This method is called during the optimization
-phase of query processing. It returns a ``ConnectorTableHandle`` and a list of
-``ColumnHandle`` s representing the table function result. The table function
-invocation is then replaced with a ``TableScanNode``.
-
-This execution path is convenient for table functions whose results are easy to
-represent as a ``ConnectorTableHandle``, for example query pass-through. It
-only supports scalar and descriptor arguments.
-
-2. Execution by operator
-
-Trino has a dedicated operator for table functions. It can handle table
-functions with any number of table arguments as well as scalar and descriptor
-arguments. To use this execution path, you provide an implementation of a
-processor.
-
-If your table function has one or more table arguments, you must implement
-``TableFunctionDataProcessor``. It processes pages of input data.
-
-If your table function is a source operator (it does not have table arguments),
-you must implement ``TableFunctionSplitProcessor``. It processes splits. The
-connector that provides the function must provide a ``ConnectorSplitSource``
-for the function. With splits, the task can be divided so that each split
-represents a subtask.
-
-Access control
---------------
-
-The access control for table functions can be provided both on system and
-connector level. It is based on the fully qualified table function name,
-which consists of the catalog name, the schema name, and the function name,
-in the syntax of ``catalog.schema.function``.
diff --git a/docs/src/main/sphinx/develop/types.md b/docs/src/main/sphinx/develop/types.md
new file mode 100644
index 000000000000..1ae357d27de1
--- /dev/null
+++ b/docs/src/main/sphinx/develop/types.md
@@ -0,0 +1,36 @@
+# Types
+
+The `Type` interface in Trino is used to implement a type in the SQL language.
+Trino ships with a number of built-in types, like `VarcharType` and `BigintType`.
+The `ParametricType` interface is used to provide type parameters for types, to
+allow types like `VARCHAR(10)` or `DECIMAL(22, 5)`. A `Plugin` can provide
+new `Type` objects by returning them from `getTypes()` and new `ParametricType`
+objects by returning them from `getParametricTypes()`.
+
+Below is a high level overview of the `Type` interface. For more details, see the
+JavaDocs for `Type`.
+
+## Native container type
+
+All types define the `getJavaType()` method, frequently referred to as the
+"native container type". This is the Java type used to hold values during execution
+and to store them in a `Block`. For example, this is the type used in
+the Java code that implements functions that produce or consume this `Type`.
+
+## Native encoding
+
+The interpretation of a value in its native container type form is defined by its
+`Type`. For some types, such as `BigintType`, it matches the Java
+interpretation of the native container type (64bit 2's complement). However, for other
+types such as `TimestampWithTimeZoneType`, which also uses `long` for its
+native container type, the value stored in the `long` is a 8byte binary value
+combining the timezone and the milliseconds since the unix epoch. In particular,
+this means that you cannot compare two native values and expect a meaningful
+result, without knowing the native encoding.
+
+## Type signature
+
+The signature of a type defines its identity, and also encodes some general
+information about the type, such as its type parameters (if it's parametric),
+and its literal parameters. The literal parameters are used in types like
+`VARCHAR(10)`.
diff --git a/docs/src/main/sphinx/develop/types.rst b/docs/src/main/sphinx/develop/types.rst
deleted file mode 100644
index 77add5472cf0..000000000000
--- a/docs/src/main/sphinx/develop/types.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-=====
-Types
-=====
-
-The ``Type`` interface in Trino is used to implement a type in the SQL language.
-Trino ships with a number of built-in types, like ``VarcharType`` and ``BigintType``.
-The ``ParametricType`` interface is used to provide type parameters for types, to
-allow types like ``VARCHAR(10)`` or ``DECIMAL(22, 5)``. A ``Plugin`` can provide
-new ``Type`` objects by returning them from ``getTypes()`` and new ``ParametricType``
-objects by returning them from ``getParametricTypes()``.
-
-Below is a high level overview of the ``Type`` interface. For more details, see the
-JavaDocs for ``Type``.
-
-Native container type
-----------------------
-
-All types define the ``getJavaType()`` method, frequently referred to as the
-"native container type". This is the Java type used to hold values during execution
-and to store them in a ``Block``. For example, this is the type used in
-the Java code that implements functions that produce or consume this ``Type``.
-
-Native encoding
----------------
-
-The interpretation of a value in its native container type form is defined by its
-``Type``. For some types, such as ``BigintType``, it matches the Java
-interpretation of the native container type (64bit 2's complement). However, for other
-types such as ``TimestampWithTimeZoneType``, which also uses ``long`` for its
-native container type, the value stored in the ``long`` is a 8byte binary value
-combining the timezone and the milliseconds since the unix epoch. In particular,
-this means that you cannot compare two native values and expect a meaningful
-result, without knowing the native encoding.
-
-Type signature
---------------
-
-The signature of a type defines its identity, and also encodes some general
-information about the type, such as its type parameters (if it's parametric),
-and its literal parameters. The literal parameters are used in types like
-``VARCHAR(10)``.
diff --git a/docs/src/main/sphinx/ext/redirects.py b/docs/src/main/sphinx/ext/redirects.py
new file mode 100644
index 000000000000..126160824c5f
--- /dev/null
+++ b/docs/src/main/sphinx/ext/redirects.py
@@ -0,0 +1,94 @@
+#
+# Licensed 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.
+#
+
+# Copyright (c) 2017 Stephen Finucane.
+# Version 0.1.0 modified April 10, 2023 for Trino use.
+# See https://github.com/sphinx-contrib/redirects/pull/6
+
+import os
+
+from sphinx.builders import html as html_builder
+from sphinx.builders import dirhtml as dirhtml_builder
+from sphinx.util import logging
+
+logger = logging.getLogger(__name__)
+
+TEMPLATE = """<html>
+  <head><meta http-equiv="refresh" content="0; url=%s"/></head>
+</html>
+"""
+
+
+def generate_redirects(app):
+
+    path = os.path.join(app.srcdir, app.config.redirects_file)
+    if not os.path.exists(path):
+        logger.info("Could not find redirects file at '%s'", path)
+        return
+
+    if isinstance(app.config.source_suffix, dict):
+        in_suffixes = list(app.config.source_suffix)
+    else:
+        in_suffixes = app.config.source_suffix
+
+    if not isinstance(app.builder, html_builder.StandaloneHTMLBuilder):
+        logger.warn(
+            "The 'sphinxcontib-redirects' plugin is only supported "
+            "for the 'html' and 'dirhtml' builder, but you are using '%s'. "
+            "Skipping...", type(app.builder)
+        )
+        return
+
+    from_suffix = to_suffix = '.html'
+    if type(app.builder) == dirhtml_builder.DirectoryHTMLBuilder:
+        from_suffix = '/index.html'
+        to_suffix = '/'
+
+    with open(path) as redirects:
+        for line in redirects.readlines():
+            from_path, to_path = line.rstrip().split(' ')
+
+            logger.debug("Redirecting '%s' to '%s'", from_path, to_path)
+
+            for in_suffix in in_suffixes:
+                if from_path.endswith(in_suffix):
+                    from_path = from_path.replace(in_suffix, from_suffix)
+                    to_path_prefix = (
+                            '..%s'
+                            % os.path.sep
+                            * (len(from_path.split(os.path.sep)) - 1)
+                    )
+                    to_path = to_path_prefix + to_path.replace(
+                        in_suffix, to_suffix
+                    )
+
+            if not to_path:
+                raise Exception('failed to find input file!')
+
+            redirected_filename = os.path.join(app.builder.outdir, from_path)
+            redirected_directory = os.path.dirname(redirected_filename)
+            if not os.path.exists(redirected_directory):
+                os.makedirs(redirected_directory)
+
+            with open(redirected_filename, 'w') as f:
+                f.write(TEMPLATE % to_path)
+
+
+def setup(app):
+    app.add_config_value('redirects_file', 'redirects', 'env')
+    app.connect('builder-inited', generate_redirects)
+    return {
+        'parallel_read_safe': True,
+        'parallel_write_safe': True,
+    }
diff --git a/docs/src/main/sphinx/functions.md b/docs/src/main/sphinx/functions.md
new file mode 100644
index 000000000000..3478e1a92786
--- /dev/null
+++ b/docs/src/main/sphinx/functions.md
@@ -0,0 +1,60 @@
+# Functions and operators
+
+This section describes the built-in SQL functions and operators supported by
+Trino. They allow you to implement complex capabilities and behavior of the
+queries executed by Trino operating on the underlying data sources.
+
+Refer to the following sections for further details:
+
+* [SQL data types and other general aspects](/language)
+* [SQL statement and syntax reference](/sql)
+
+## Functions by name
+
+If you are looking for a specific function or operator by name use
+[](/sql/show-functions), or refer the to the following resources:
+
+:::{toctree}
+:maxdepth: 1
+
+functions/list
+functions/list-by-topic
+:::
+
+## Functions per topic
+
+```{toctree}
+:maxdepth: 1
+
+Aggregate           <functions/aggregate>
+Array               <functions/array>
+Binary              <functions/binary>
+Bitwise             <functions/bitwise>
+Color               <functions/color>
+Comparison          <functions/comparison>
+Conditional         <functions/conditional>
+Conversion          <functions/conversion>
+Date and time       <functions/datetime>
+Decimal             <functions/decimal>
+Geospatial          <functions/geospatial>
+HyperLogLog         <functions/hyperloglog>
+IP Address          <functions/ipaddress>
+JSON                <functions/json>
+Lambda              <functions/lambda>
+Logical             <functions/logical>
+Machine learning    <functions/ml>
+Map                 <functions/map>
+Math                <functions/math>
+Quantile digest     <functions/qdigest>
+Regular expression  <functions/regexp>
+Session             <functions/session>
+Set Digest          <functions/setdigest>
+String              <functions/string>
+System              <functions/system>
+Table               <functions/table>
+Teradata            <functions/teradata>
+T-Digest            <functions/tdigest>
+URL                 <functions/url>
+UUID                <functions/uuid>
+Window              <functions/window>
+```
diff --git a/docs/src/main/sphinx/functions.rst b/docs/src/main/sphinx/functions.rst
deleted file mode 100644
index fa48e62d326d..000000000000
--- a/docs/src/main/sphinx/functions.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-***********************
-Functions and operators
-***********************
-
-This chapter describes the built-in SQL functions and operators supported by
-Trino. They allow you to implement complex functionality and behavior of the SQL
-executed by Trino operating on the underlying data sources.
-
-If you are looking for a specific function or operator, see the :doc:`full
-alphabetical list</functions/list>` or the :doc:`full list by
-topic</functions/list-by-topic>`. Using :doc:`SHOW FUNCTIONS
-</sql/show-functions>` returns a list of all available functions, including
-custom functions, with all supported arguments and a short description.
-
-Also see the :doc:`SQL data types</language>`
-and the :doc:`SQL statement and syntax reference</sql>`.
-
-.. toctree::
-    :maxdepth: 1
-
-    Aggregate           <functions/aggregate>
-    Array               <functions/array>
-    Binary              <functions/binary>
-    Bitwise             <functions/bitwise>
-    Color               <functions/color>
-    Comparison          <functions/comparison>
-    Conditional         <functions/conditional>
-    Conversion          <functions/conversion>
-    Date and time       <functions/datetime>
-    Decimal             <functions/decimal>
-    Geospatial          <functions/geospatial>
-    HyperLogLog         <functions/hyperloglog>
-    IP Address          <functions/ipaddress>
-    JSON                <functions/json>
-    Lambda              <functions/lambda>
-    Logical             <functions/logical>
-    Machine learning    <functions/ml>
-    Map                 <functions/map>
-    Math                <functions/math>
-    Quantile digest     <functions/qdigest>
-    Regular expression  <functions/regexp>
-    Session             <functions/session>
-    Set Digest          <functions/setdigest>
-    String              <functions/string>
-    System              <functions/system>
-    Table               <functions/table>
-    Teradata            <functions/teradata>
-    T-Digest            <functions/tdigest>
-    URL                 <functions/url>
-    UUID                <functions/uuid>
-    Window              <functions/window>
-    functions/list
-    functions/list-by-topic
diff --git a/docs/src/main/sphinx/functions/aggregate.md b/docs/src/main/sphinx/functions/aggregate.md
new file mode 100644
index 000000000000..fc59ce710c20
--- /dev/null
+++ b/docs/src/main/sphinx/functions/aggregate.md
@@ -0,0 +1,606 @@
+# Aggregate functions
+
+Aggregate functions operate on a set of values to compute a single result.
+
+Except for {func}`count`, {func}`count_if`, {func}`max_by`, {func}`min_by` and
+{func}`approx_distinct`, all of these aggregate functions ignore null values
+and return null for no input rows or when all values are null. For example,
+{func}`sum` returns null rather than zero and {func}`avg` does not include null
+values in the count. The `coalesce` function can be used to convert null into
+zero.
+
+(aggregate-function-ordering-during-aggregation)=
+
+## Ordering during aggregation
+
+Some aggregate functions such as {func}`array_agg` produce different results
+depending on the order of input values. This ordering can be specified by writing
+an {ref}`order-by-clause` within the aggregate function:
+
+```
+array_agg(x ORDER BY y DESC)
+array_agg(x ORDER BY x, y, z)
+```
+
+(aggregate-function-filtering-during-aggregation)=
+
+## Filtering during aggregation
+
+The `FILTER` keyword can be used to remove rows from aggregation processing
+with a condition expressed using a `WHERE` clause. This is evaluated for each
+row before it is used in the aggregation and is supported for all aggregate
+functions.
+
+```text
+aggregate_function(...) FILTER (WHERE <condition>)
+```
+
+A common and very useful example is to use `FILTER` to remove nulls from
+consideration when using `array_agg`:
+
+```
+SELECT array_agg(name) FILTER (WHERE name IS NOT NULL)
+FROM region;
+```
+
+As another example, imagine you want to add a condition on the count for Iris
+flowers, modifying the following query:
+
+```
+SELECT species,
+       count(*) AS count
+FROM iris
+GROUP BY species;
+```
+
+```text
+species    | count
+-----------+-------
+setosa     |   50
+virginica  |   50
+versicolor |   50
+```
+
+If you just use a normal `WHERE` statement you lose information:
+
+```
+SELECT species,
+    count(*) AS count
+FROM iris
+WHERE petal_length_cm > 4
+GROUP BY species;
+```
+
+```text
+species    | count
+-----------+-------
+virginica  |   50
+versicolor |   34
+```
+
+Using a filter you retain all information:
+
+```
+SELECT species,
+       count(*) FILTER (where petal_length_cm > 4) AS count
+FROM iris
+GROUP BY species;
+```
+
+```text
+species    | count
+-----------+-------
+virginica  |   50
+setosa     |    0
+versicolor |   34
+```
+
+## General aggregate functions
+
+:::{function} any_value(x) -> [same as input]
+Returns an arbitrary non-null value `x`, if one exists. `x` can be any
+valid expression. This allows you to return values from columns that are not
+directly part of the aggregation, inluding expressions using these columns,
+in a query.
+
+For example, the following query returns the customer name from the `name`
+column, and returns the sum of all total prices as customer spend. The
+aggregation however uses the rows grouped by the customer identifier
+`custkey` a required, since only that column is guaranteed to be unique:
+
+```
+SELECT sum(o.totalprice) as spend,
+    any_value(c.name)
+FROM tpch.tiny.orders o
+JOIN tpch.tiny.customer c
+ON o.custkey  = c.custkey
+GROUP BY c.custkey;
+ORDER BY spend;
+```
+:::
+
+:::{function} arbitrary(x) -> [same as input]
+Returns an arbitrary non-null value of `x`, if one exists. Identical to
+{func}`any_value`.
+:::
+
+:::{function} array_agg(x) -> array<[same as input]>
+Returns an array created from the input `x` elements.
+:::
+
+:::{function} avg(x) -> double
+Returns the average (arithmetic mean) of all input values.
+:::
+
+:::{function} avg(time interval type) -> time interval type
+:noindex: true
+
+Returns the average interval length of all input values.
+:::
+
+:::{function} bool_and(boolean) -> boolean
+Returns `TRUE` if every input value is `TRUE`, otherwise `FALSE`.
+:::
+
+:::{function} bool_or(boolean) -> boolean
+Returns `TRUE` if any input value is `TRUE`, otherwise `FALSE`.
+:::
+
+:::{function} checksum(x) -> varbinary
+Returns an order-insensitive checksum of the given values.
+:::
+
+:::{function} count(*) -> bigint
+Returns the number of input rows.
+:::
+
+:::{function} count(x) -> bigint
+:noindex: true
+
+Returns the number of non-null input values.
+:::
+
+:::{function} count_if(x) -> bigint
+Returns the number of `TRUE` input values.
+This function is equivalent to `count(CASE WHEN x THEN 1 END)`.
+:::
+
+:::{function} every(boolean) -> boolean
+This is an alias for {func}`bool_and`.
+:::
+
+:::{function} geometric_mean(x) -> double
+Returns the geometric mean of all input values.
+:::
+
+:::{function} listagg(x, separator) -> varchar
+Returns the concatenated input values, separated by the `separator` string.
+
+Synopsis:
+
+```
+LISTAGG( expression [, separator] [ON OVERFLOW overflow_behaviour])
+    WITHIN GROUP (ORDER BY sort_item, [...])
+```
+
+If `separator` is not specified, the empty string will be used as `separator`.
+
+In its simplest form the function looks like:
+
+```
+SELECT listagg(value, ',') WITHIN GROUP (ORDER BY value) csv_value
+FROM (VALUES 'a', 'c', 'b') t(value);
+```
+
+and results in:
+
+```
+csv_value
+-----------
+'a,b,c'
+```
+
+The overflow behaviour is by default to throw an error in case that the length of the output
+of the function exceeds `1048576` bytes:
+
+```
+SELECT listagg(value, ',' ON OVERFLOW ERROR) WITHIN GROUP (ORDER BY value) csv_value
+FROM (VALUES 'a', 'b', 'c') t(value);
+```
+
+There exists also the possibility to truncate the output `WITH COUNT` or `WITHOUT COUNT`
+of omitted non-null values in case that the length of the output of the
+function exceeds `1048576` bytes:
+
+```
+SELECT LISTAGG(value, ',' ON OVERFLOW TRUNCATE '.....' WITH COUNT) WITHIN GROUP (ORDER BY value)
+FROM (VALUES 'a', 'b', 'c') t(value);
+```
+
+If not specified, the truncation filler string is by default `'...'`.
+
+This aggregation function can be also used in a scenario involving grouping:
+
+```
+SELECT id, LISTAGG(value, ',') WITHIN GROUP (ORDER BY o) csv_value
+FROM (VALUES
+    (100, 1, 'a'),
+    (200, 3, 'c'),
+    (200, 2, 'b')
+) t(id, o, value)
+GROUP BY id
+ORDER BY id;
+```
+
+results in:
+
+```text
+ id  | csv_value
+-----+-----------
+ 100 | a
+ 200 | b,c
+```
+
+The current implementation of `LISTAGG` function does not support window frames.
+:::
+
+:::{function} max(x) -> [same as input]
+Returns the maximum value of all input values.
+:::
+
+:::{function} max(x, n) -> array<[same as x]>
+:noindex: true
+
+Returns `n` largest values of all input values of `x`.
+:::
+
+:::{function} max_by(x, y) -> [same as x]
+Returns the value of `x` associated with the maximum value of `y` over all input values.
+:::
+
+:::{function} max_by(x, y, n) -> array<[same as x]>
+:noindex: true
+
+Returns `n` values of `x` associated with the `n` largest of all input values of `y`
+in descending order of `y`.
+:::
+
+:::{function} min(x) -> [same as input]
+Returns the minimum value of all input values.
+:::
+
+:::{function} min(x, n) -> array<[same as x]>
+:noindex: true
+
+Returns `n` smallest values of all input values of `x`.
+:::
+
+:::{function} min_by(x, y) -> [same as x]
+Returns the value of `x` associated with the minimum value of `y` over all input values.
+:::
+
+:::{function} min_by(x, y, n) -> array<[same as x]>
+:noindex: true
+
+Returns `n` values of `x` associated with the `n` smallest of all input values of `y`
+in ascending order of `y`.
+:::
+
+:::{function} sum(x) -> [same as input]
+Returns the sum of all input values.
+:::
+
+## Bitwise aggregate functions
+
+:::{function} bitwise_and_agg(x) -> bigint
+Returns the bitwise AND of all input values in 2's complement representation.
+:::
+
+:::{function} bitwise_or_agg(x) -> bigint
+Returns the bitwise OR of all input values in 2's complement representation.
+:::
+
+## Map aggregate functions
+
+:::{function} histogram(x) -> map<K,bigint>
+Returns a map containing the count of the number of times each input value occurs.
+:::
+
+:::{function} map_agg(key, value) -> map<K,V>
+Returns a map created from the input `key` / `value` pairs.
+:::
+
+:::{function} map_union(x(K,V)) -> map<K,V>
+Returns the union of all the input maps. If a key is found in multiple
+input maps, that key's value in the resulting map comes from an arbitrary input map.
+
+For example, take the following histogram function that creates multiple maps from the Iris dataset:
+
+```
+SELECT histogram(floor(petal_length_cm)) petal_data
+FROM memory.default.iris
+GROUP BY species;
+
+        petal_data
+-- {4.0=6, 5.0=33, 6.0=11}
+-- {4.0=37, 5.0=2, 3.0=11}
+-- {1.0=50}
+```
+
+You can combine these maps using `map_union`:
+
+```
+SELECT map_union(petal_data) petal_data_union
+FROM (
+       SELECT histogram(floor(petal_length_cm)) petal_data
+       FROM memory.default.iris
+       GROUP BY species
+       );
+
+             petal_data_union
+--{4.0=6, 5.0=2, 6.0=11, 1.0=50, 3.0=11}
+```
+:::
+
+:::{function} multimap_agg(key, value) -> map<K,array(V)>
+Returns a multimap created from the input `key` / `value` pairs.
+Each key can be associated with multiple values.
+:::
+
+## Approximate aggregate functions
+
+:::{function} approx_distinct(x) -> bigint
+Returns the approximate number of distinct input values.
+This function provides an approximation of `count(DISTINCT x)`.
+Zero is returned if all input values are null.
+
+This function should produce a standard error of 2.3%, which is the
+standard deviation of the (approximately normal) error distribution over
+all possible sets. It does not guarantee an upper bound on the error for
+any specific input set.
+:::
+
+:::{function} approx_distinct(x, e) -> bigint
+:noindex: true
+
+Returns the approximate number of distinct input values.
+This function provides an approximation of `count(DISTINCT x)`.
+Zero is returned if all input values are null.
+
+This function should produce a standard error of no more than `e`, which
+is the standard deviation of the (approximately normal) error distribution
+over all possible sets. It does not guarantee an upper bound on the error
+for any specific input set. The current implementation of this function
+requires that `e` be in the range of `[0.0040625, 0.26000]`.
+:::
+
+:::{function} approx_most_frequent(buckets, value, capacity) -> map<[same as value], bigint>
+Computes the top frequent values up to `buckets` elements approximately.
+Approximate estimation of the function enables us to pick up the frequent
+values with less memory. Larger `capacity` improves the accuracy of
+underlying algorithm with sacrificing the memory capacity. The returned
+value is a map containing the top elements with corresponding estimated
+frequency.
+
+The error of the function depends on the permutation of the values and its
+cardinality. We can set the capacity same as the cardinality of the
+underlying data to achieve the least error.
+
+`buckets` and `capacity` must be `bigint`. `value` can be numeric
+or string type.
+
+The function uses the stream summary data structure proposed in the paper
+[Efficient Computation of Frequent and Top-k Elements in Data Streams](https://www.cse.ust.hk/~raywong/comp5331/References/EfficientComputationOfFrequentAndTop-kElementsInDataStreams.pdf)
+by A. Metwalley, D. Agrawl and A. Abbadi.
+:::
+
+:::{function} approx_percentile(x, percentage) -> [same as x]
+Returns the approximate percentile for all input values of `x` at the
+given `percentage`. The value of `percentage` must be between zero and
+one and must be constant for all input rows.
+:::
+
+:::{function} approx_percentile(x, percentages) -> array<[same as x]>
+:noindex: true
+
+Returns the approximate percentile for all input values of `x` at each of
+the specified percentages. Each element of the `percentages` array must be
+between zero and one, and the array must be constant for all input rows.
+:::
+
+:::{function} approx_percentile(x, w, percentage) -> [same as x]
+:noindex: true
+
+Returns the approximate weighed percentile for all input values of `x`
+using the per-item weight `w` at the percentage `percentage`. Weights must be
+greater or equal to 1. Integer-value weights can be thought of as a replication
+count for the value `x` in the percentile set. The value of `percentage` must be
+between zero and one and must be constant for all input rows.
+:::
+
+:::{function} approx_percentile(x, w, percentages) -> array<[same as x]>
+:noindex: true
+
+Returns the approximate weighed percentile for all input values of `x`
+using the per-item weight `w` at each of the given percentages specified
+in the array. Weights must be greater or equal to 1. Integer-value weights can
+be thought of as a replication count for the value `x` in the percentile
+set. Each element of the `percentages` array must be between zero and one, and the array
+must be constant for all input rows.
+:::
+
+:::{function} approx_set(x) -> HyperLogLog
+:noindex: true
+
+See {doc}`hyperloglog`.
+:::
+
+:::{function} merge(x) -> HyperLogLog
+:noindex: true
+
+See {doc}`hyperloglog`.
+:::
+
+:::{function} merge(qdigest(T)) -> qdigest(T)
+:noindex: true
+
+See {doc}`qdigest`.
+:::
+
+:::{function} merge(tdigest) -> tdigest
+:noindex: true
+
+See {doc}`tdigest`.
+:::
+
+:::{function} numeric_histogram(buckets, value) -> map<double, double>
+:noindex: true
+
+Computes an approximate histogram with up to `buckets` number of buckets
+for all `value`s. This function is equivalent to the variant of
+{func}`numeric_histogram` that takes a `weight`, with a per-item weight of `1`.
+:::
+
+:::{function} numeric_histogram(buckets, value, weight) -> map<double, double>
+Computes an approximate histogram with up to `buckets` number of buckets
+for all `value`s with a per-item weight of `weight`. The algorithm
+is based loosely on:
+
+```text
+Yael Ben-Haim and Elad Tom-Tov, "A streaming parallel decision tree algorithm",
+J. Machine Learning Research 11 (2010), pp. 849--872.
+```
+
+`buckets` must be a `bigint`. `value` and `weight` must be numeric.
+:::
+
+:::{function} qdigest_agg(x) -> qdigest([same as x])
+:noindex: true
+
+See {doc}`qdigest`.
+:::
+
+:::{function} qdigest_agg(x, w) -> qdigest([same as x])
+:noindex: true
+
+See {doc}`qdigest`.
+:::
+
+:::{function} qdigest_agg(x, w, accuracy) -> qdigest([same as x])
+:noindex: true
+
+See {doc}`qdigest`.
+:::
+
+:::{function} tdigest_agg(x) -> tdigest
+:noindex: true
+
+See {doc}`tdigest`.
+:::
+
+:::{function} tdigest_agg(x, w) -> tdigest
+:noindex: true
+
+See {doc}`tdigest`.
+:::
+
+## Statistical aggregate functions
+
+:::{function} corr(y, x) -> double
+Returns correlation coefficient of input values.
+:::
+
+:::{function} covar_pop(y, x) -> double
+Returns the population covariance of input values.
+:::
+
+:::{function} covar_samp(y, x) -> double
+Returns the sample covariance of input values.
+:::
+
+:::{function} kurtosis(x) -> double
+Returns the excess kurtosis of all input values. Unbiased estimate using
+the following expression:
+
+```text
+kurtosis(x) = n(n+1)/((n-1)(n-2)(n-3))sum[(x_i-mean)^4]/stddev(x)^4-3(n-1)^2/((n-2)(n-3))
+```
+:::
+
+:::{function} regr_intercept(y, x) -> double
+Returns linear regression intercept of input values. `y` is the dependent
+value. `x` is the independent value.
+:::
+
+:::{function} regr_slope(y, x) -> double
+Returns linear regression slope of input values. `y` is the dependent
+value. `x` is the independent value.
+:::
+
+:::{function} skewness(x) -> double
+Returns the Fisher’s moment coefficient of [skewness](https://wikipedia.org/wiki/Skewness) of all input values.
+:::
+
+:::{function} stddev(x) -> double
+This is an alias for {func}`stddev_samp`.
+:::
+
+:::{function} stddev_pop(x) -> double
+Returns the population standard deviation of all input values.
+:::
+
+:::{function} stddev_samp(x) -> double
+Returns the sample standard deviation of all input values.
+:::
+
+:::{function} variance(x) -> double
+This is an alias for {func}`var_samp`.
+:::
+
+:::{function} var_pop(x) -> double
+Returns the population variance of all input values.
+:::
+
+:::{function} var_samp(x) -> double
+Returns the sample variance of all input values.
+:::
+
+## Lambda aggregate functions
+
+:::{function} reduce_agg(inputValue T, initialState S, inputFunction(S, T, S), combineFunction(S, S, S)) -> S
+Reduces all input values into a single value. `inputFunction` will be invoked
+for each non-null input value. In addition to taking the input value, `inputFunction`
+takes the current state, initially `initialState`, and returns the new state.
+`combineFunction` will be invoked to combine two states into a new state.
+The final state is returned:
+
+```
+SELECT id, reduce_agg(value, 0, (a, b) -> a + b, (a, b) -> a + b)
+FROM (
+    VALUES
+        (1, 3),
+        (1, 4),
+        (1, 5),
+        (2, 6),
+        (2, 7)
+) AS t(id, value)
+GROUP BY id;
+-- (1, 12)
+-- (2, 13)
+
+SELECT id, reduce_agg(value, 1, (a, b) -> a * b, (a, b) -> a * b)
+FROM (
+    VALUES
+        (1, 3),
+        (1, 4),
+        (1, 5),
+        (2, 6),
+        (2, 7)
+) AS t(id, value)
+GROUP BY id;
+-- (1, 60)
+-- (2, 42)
+```
+
+The state type must be a boolean, integer, floating-point, or date/time/interval.
+:::
diff --git a/docs/src/main/sphinx/functions/aggregate.rst b/docs/src/main/sphinx/functions/aggregate.rst
deleted file mode 100644
index 78a6756e5b87..000000000000
--- a/docs/src/main/sphinx/functions/aggregate.rst
+++ /dev/null
@@ -1,552 +0,0 @@
-===================
-Aggregate functions
-===================
-
-Aggregate functions operate on a set of values to compute a single result.
-
-Except for :func:`count`, :func:`count_if`, :func:`max_by`, :func:`min_by` and
-:func:`approx_distinct`, all of these aggregate functions ignore null values
-and return null for no input rows or when all values are null. For example,
-:func:`sum` returns null rather than zero and :func:`avg` does not include null
-values in the count. The ``coalesce`` function can be used to convert null into
-zero.
-
-.. _aggregate-function-ordering-during-aggregation:
-
-Ordering during aggregation
-----------------------------
-
-Some aggregate functions such as :func:`array_agg` produce different results
-depending on the order of input values. This ordering can be specified by writing
-an :ref:`order-by-clause` within the aggregate function::
-
-    array_agg(x ORDER BY y DESC)
-    array_agg(x ORDER BY x, y, z)
-
-.. _aggregate-function-filtering-during-aggregation:
-
-Filtering during aggregation
-----------------------------
-
-The ``FILTER`` keyword can be used to remove rows from aggregation processing
-with a condition expressed using a ``WHERE`` clause. This is evaluated for each
-row before it is used in the aggregation and is supported for all aggregate
-functions.
-
-.. code-block:: text
-
-    aggregate_function(...) FILTER (WHERE <condition>)
-
-A common and very useful example is to use ``FILTER`` to remove nulls from
-consideration when using ``array_agg``::
-
-    SELECT array_agg(name) FILTER (WHERE name IS NOT NULL)
-    FROM region;
-
-As another example, imagine you want to add a condition on the count for Iris
-flowers, modifying the following query::
-
-    SELECT species,
-           count(*) AS count
-    FROM iris
-    GROUP BY species;
-
-.. code-block:: text
-
-    species    | count
-    -----------+-------
-    setosa     |   50
-    virginica  |   50
-    versicolor |   50
-
-If you just use a normal ``WHERE`` statement you lose information::
-
-    SELECT species,
-        count(*) AS count
-    FROM iris
-    WHERE petal_length_cm > 4
-    GROUP BY species;
-
-.. code-block:: text
-
-    species    | count
-    -----------+-------
-    virginica  |   50
-    versicolor |   34
-
-Using a filter you retain all information::
-
-    SELECT species,
-           count(*) FILTER (where petal_length_cm > 4) AS count
-    FROM iris
-    GROUP BY species;
-
-.. code-block:: text
-
-    species    | count
-    -----------+-------
-    virginica  |   50
-    setosa     |    0
-    versicolor |   34
-
-
-General aggregate functions
----------------------------
-
-.. function:: arbitrary(x) -> [same as input]
-
-    Returns an arbitrary non-null value of ``x``, if one exists.
-
-.. function:: array_agg(x) -> array<[same as input]>
-
-    Returns an array created from the input ``x`` elements.
-
-.. function:: avg(x) -> double
-
-    Returns the average (arithmetic mean) of all input values.
-
-.. function:: avg(time interval type) -> time interval type
-    :noindex:
-
-    Returns the average interval length of all input values.
-
-.. function:: bool_and(boolean) -> boolean
-
-    Returns ``TRUE`` if every input value is ``TRUE``, otherwise ``FALSE``.
-
-.. function:: bool_or(boolean) -> boolean
-
-    Returns ``TRUE`` if any input value is ``TRUE``, otherwise ``FALSE``.
-
-.. function:: checksum(x) -> varbinary
-
-    Returns an order-insensitive checksum of the given values.
-
-.. function:: count(*) -> bigint
-
-    Returns the number of input rows.
-
-.. function:: count(x) -> bigint
-    :noindex:
-
-    Returns the number of non-null input values.
-
-.. function:: count_if(x) -> bigint
-
-    Returns the number of ``TRUE`` input values.
-    This function is equivalent to ``count(CASE WHEN x THEN 1 END)``.
-
-.. function:: every(boolean) -> boolean
-
-    This is an alias for :func:`bool_and`.
-
-.. function:: geometric_mean(x) -> double
-
-    Returns the geometric mean of all input values.
-
-.. function:: listagg(x, separator) -> varchar
-
-    Returns the concatenated input values, separated by the ``separator`` string.
-
-    Synopsis::
-
-        LISTAGG( expression [, separator] [ON OVERFLOW overflow_behaviour])
-            WITHIN GROUP (ORDER BY sort_item, [...])
-
-
-    If ``separator`` is not specified, the empty string will be used as ``separator``.
-
-    In its simplest form the function looks like::
-
-            SELECT listagg(value, ',') WITHIN GROUP (ORDER BY value) csv_value
-            FROM (VALUES 'a', 'c', 'b') t(value);
-
-    and results in::
-
-            csv_value
-            -----------
-            'a,b,c'
-
-    The overflow behaviour is by default to throw an error in case that the length of the output
-    of the function exceeds ``1048576`` bytes::
-
-            SELECT listagg(value, ',' ON OVERFLOW ERROR) WITHIN GROUP (ORDER BY value) csv_value
-            FROM (VALUES 'a', 'b', 'c') t(value);
-
-    There exists also the possibility to truncate the output ``WITH COUNT`` or ``WITHOUT COUNT``
-    of omitted non-null values in case that the length of the output of the
-    function exceeds ``1048576`` bytes::
-
-            SELECT LISTAGG(value, ',' ON OVERFLOW TRUNCATE '.....' WITH COUNT) WITHIN GROUP (ORDER BY value)
-            FROM (VALUES 'a', 'b', 'c') t(value);
-
-    If not specified, the truncation filler string is by default ``'...'``.
-
-    This aggregation function can be also used in a scenario involving grouping::
-
-            SELECT id, LISTAGG(value, ',') WITHIN GROUP (ORDER BY o) csv_value
-            FROM (VALUES
-                (100, 1, 'a'),
-                (200, 3, 'c'),
-                (200, 2, 'b')
-            ) t(id, o, value)
-            GROUP BY id
-            ORDER BY id;
-
-    results in:
-
-    .. code-block:: text
-
-         id  | csv_value
-        -----+-----------
-         100 | a
-         200 | b,c
-
-    The current implementation of ``LISTAGG`` function does not support window frames.
-
-.. function:: max(x) -> [same as input]
-
-    Returns the maximum value of all input values.
-
-.. function:: max(x, n) -> array<[same as x]>
-    :noindex:
-
-    Returns ``n`` largest values of all input values of ``x``.
-
-.. function:: max_by(x, y) -> [same as x]
-
-    Returns the value of ``x`` associated with the maximum value of ``y`` over all input values.
-
-.. function:: max_by(x, y, n) -> array<[same as x]>
-    :noindex:
-
-    Returns ``n`` values of ``x`` associated with the ``n`` largest of all input values of ``y``
-    in descending order of ``y``.
-
-.. function:: min(x) -> [same as input]
-
-    Returns the minimum value of all input values.
-
-.. function:: min(x, n) -> array<[same as x]>
-    :noindex:
-
-    Returns ``n`` smallest values of all input values of ``x``.
-
-.. function:: min_by(x, y) -> [same as x]
-
-    Returns the value of ``x`` associated with the minimum value of ``y`` over all input values.
-
-.. function:: min_by(x, y, n) -> array<[same as x]>
-    :noindex:
-
-    Returns ``n`` values of ``x`` associated with the ``n`` smallest of all input values of ``y``
-    in ascending order of ``y``.
-
-.. function:: sum(x) -> [same as input]
-
-    Returns the sum of all input values.
-
-Bitwise aggregate functions
----------------------------
-
-.. function:: bitwise_and_agg(x) -> bigint
-
-    Returns the bitwise AND of all input values in 2's complement representation.
-
-.. function:: bitwise_or_agg(x) -> bigint
-
-    Returns the bitwise OR of all input values in 2's complement representation.
-
-Map aggregate functions
------------------------
-
-.. function:: histogram(x) -> map<K,bigint>
-
-    Returns a map containing the count of the number of times each input value occurs.
-
-.. function:: map_agg(key, value) -> map<K,V>
-
-    Returns a map created from the input ``key`` / ``value`` pairs.
-
-.. function:: map_union(x(K,V)) -> map<K,V>
-
-   Returns the union of all the input maps. If a key is found in multiple
-   input maps, that key's value in the resulting map comes from an arbitrary input map.
-
-   For example, take the following histogram function that creates multiple maps from the Iris dataset::
-
-        SELECT histogram(floor(petal_length_cm)) petal_data
-        FROM memory.default.iris
-        GROUP BY species;
-
-                petal_data
-        -- {4.0=6, 5.0=33, 6.0=11}
-        -- {4.0=37, 5.0=2, 3.0=11}
-        -- {1.0=50}
-
-   You can combine these maps using ``map_union``::
-
-        SELECT map_union(petal_data) petal_data_union
-        FROM (
-               SELECT histogram(floor(petal_length_cm)) petal_data
-               FROM memory.default.iris
-               GROUP BY species
-               );
-
-                     petal_data_union
-        --{4.0=6, 5.0=2, 6.0=11, 1.0=50, 3.0=11}
-
-
-.. function:: multimap_agg(key, value) -> map<K,array(V)>
-
-    Returns a multimap created from the input ``key`` / ``value`` pairs.
-    Each key can be associated with multiple values.
-
-Approximate aggregate functions
--------------------------------
-
-.. function:: approx_distinct(x) -> bigint
-
-    Returns the approximate number of distinct input values.
-    This function provides an approximation of ``count(DISTINCT x)``.
-    Zero is returned if all input values are null.
-
-    This function should produce a standard error of 2.3%, which is the
-    standard deviation of the (approximately normal) error distribution over
-    all possible sets. It does not guarantee an upper bound on the error for
-    any specific input set.
-
-.. function:: approx_distinct(x, e) -> bigint
-    :noindex:
-
-    Returns the approximate number of distinct input values.
-    This function provides an approximation of ``count(DISTINCT x)``.
-    Zero is returned if all input values are null.
-
-    This function should produce a standard error of no more than ``e``, which
-    is the standard deviation of the (approximately normal) error distribution
-    over all possible sets. It does not guarantee an upper bound on the error
-    for any specific input set. The current implementation of this function
-    requires that ``e`` be in the range of ``[0.0040625, 0.26000]``.
-
-.. function:: approx_most_frequent(buckets, value, capacity) -> map<[same as value], bigint>
-
-    Computes the top frequent values up to ``buckets`` elements approximately.
-    Approximate estimation of the function enables us to pick up the frequent
-    values with less memory. Larger ``capacity`` improves the accuracy of
-    underlying algorithm with sacrificing the memory capacity. The returned
-    value is a map containing the top elements with corresponding estimated
-    frequency.
-
-    The error of the function depends on the permutation of the values and its
-    cardinality. We can set the capacity same as the cardinality of the
-    underlying data to achieve the least error.
-
-    ``buckets`` and ``capacity`` must be ``bigint``. ``value`` can be numeric
-    or string type.
-
-    The function uses the stream summary data structure proposed in the paper
-    `Efficient Computation of Frequent and Top-k Elements in Data Streams
-    <https://www.cse.ust.hk/~raywong/comp5331/References/EfficientComputationOfFrequentAndTop-kElementsInDataStreams.pdf>`_
-    by A. Metwalley, D. Agrawl and A. Abbadi.
-
-.. function:: approx_percentile(x, percentage) -> [same as x]
-
-    Returns the approximate percentile for all input values of ``x`` at the
-    given ``percentage``. The value of ``percentage`` must be between zero and
-    one and must be constant for all input rows.
-
-.. function:: approx_percentile(x, percentages) -> array<[same as x]>
-    :noindex:
-
-    Returns the approximate percentile for all input values of ``x`` at each of
-    the specified percentages. Each element of the ``percentages`` array must be
-    between zero and one, and the array must be constant for all input rows.
-
-.. function:: approx_percentile(x, w, percentage) -> [same as x]
-    :noindex:
-
-    Returns the approximate weighed percentile for all input values of ``x``
-    using the per-item weight ``w`` at the percentage ``percentage``. Weights must be
-    greater or equal to 1. Integer-value weights can be thought of as a replication
-    count for the value ``x`` in the percentile set. The value of ``percentage`` must be
-    between zero and one and must be constant for all input rows.
-
-.. function:: approx_percentile(x, w, percentages) -> array<[same as x]>
-    :noindex:
-
-    Returns the approximate weighed percentile for all input values of ``x``
-    using the per-item weight ``w`` at each of the given percentages specified
-    in the array. Weights must be greater or equal to 1. Integer-value weights can
-    be thought of as a replication count for the value ``x`` in the percentile
-    set. Each element of the ``percentages`` array must be between zero and one, and the array
-    must be constant for all input rows.
-
-.. function:: approx_set(x) -> HyperLogLog
-    :noindex:
-
-    See :doc:`hyperloglog`.
-
-.. function:: merge(x) -> HyperLogLog
-    :noindex:
-
-    See :doc:`hyperloglog`.
-
-.. function:: merge(qdigest(T)) -> qdigest(T)
-    :noindex:
-
-    See :doc:`qdigest`.
-
-.. function:: merge(tdigest) -> tdigest
-    :noindex:
-
-    See :doc:`tdigest`.
-
-.. function:: numeric_histogram(buckets, value) -> map<double, double>
-    :noindex:
-
-    Computes an approximate histogram with up to ``buckets`` number of buckets
-    for all ``value``\ s. This function is equivalent to the variant of
-    :func:`numeric_histogram` that takes a ``weight``, with a per-item weight of ``1``.
-
-.. function:: numeric_histogram(buckets, value, weight) -> map<double, double>
-
-    Computes an approximate histogram with up to ``buckets`` number of buckets
-    for all ``value``\ s with a per-item weight of ``weight``. The algorithm
-    is based loosely on:
-
-    .. code-block:: text
-
-        Yael Ben-Haim and Elad Tom-Tov, "A streaming parallel decision tree algorithm",
-        J. Machine Learning Research 11 (2010), pp. 849--872.
-
-    ``buckets`` must be a ``bigint``. ``value`` and ``weight`` must be numeric.
-
-.. function:: qdigest_agg(x) -> qdigest([same as x])
-    :noindex:
-
-    See :doc:`qdigest`.
-
-.. function:: qdigest_agg(x, w) -> qdigest([same as x])
-    :noindex:
-
-    See :doc:`qdigest`.
-
-.. function:: qdigest_agg(x, w, accuracy) -> qdigest([same as x])
-    :noindex:
-
-    See :doc:`qdigest`.
-
-.. function:: tdigest_agg(x) -> tdigest
-    :noindex:
-
-    See :doc:`tdigest`.
-
-.. function:: tdigest_agg(x, w) -> tdigest
-    :noindex:
-
-    See :doc:`tdigest`.
-
-Statistical aggregate functions
--------------------------------
-
-.. function:: corr(y, x) -> double
-
-    Returns correlation coefficient of input values.
-
-.. function:: covar_pop(y, x) -> double
-
-    Returns the population covariance of input values.
-
-.. function:: covar_samp(y, x) -> double
-
-    Returns the sample covariance of input values.
-
-.. function:: kurtosis(x) -> double
-
-    Returns the excess kurtosis of all input values. Unbiased estimate using
-    the following expression:
-
-    .. code-block:: text
-
-        kurtosis(x) = n(n+1)/((n-1)(n-2)(n-3))sum[(x_i-mean)^4]/stddev(x)^4-3(n-1)^2/((n-2)(n-3))
-
-.. function:: regr_intercept(y, x) -> double
-
-    Returns linear regression intercept of input values. ``y`` is the dependent
-    value. ``x`` is the independent value.
-
-.. function:: regr_slope(y, x) -> double
-
-    Returns linear regression slope of input values. ``y`` is the dependent
-    value. ``x`` is the independent value.
-
-.. function:: skewness(x) -> double
-
-    Returns the Fisher’s moment coefficient of `skewness
-    <https://wikipedia.org/wiki/Skewness>`_ of all input values.
-
-.. function:: stddev(x) -> double
-
-    This is an alias for :func:`stddev_samp`.
-
-.. function:: stddev_pop(x) -> double
-
-    Returns the population standard deviation of all input values.
-
-.. function:: stddev_samp(x) -> double
-
-    Returns the sample standard deviation of all input values.
-
-.. function:: variance(x) -> double
-
-    This is an alias for :func:`var_samp`.
-
-.. function:: var_pop(x) -> double
-
-    Returns the population variance of all input values.
-
-.. function:: var_samp(x) -> double
-
-    Returns the sample variance of all input values.
-
-Lambda aggregate functions
---------------------------
-
-.. function:: reduce_agg(inputValue T, initialState S, inputFunction(S, T, S), combineFunction(S, S, S)) -> S
-
-    Reduces all input values into a single value. ``inputFunction`` will be invoked
-    for each non-null input value. In addition to taking the input value, ``inputFunction``
-    takes the current state, initially ``initialState``, and returns the new state.
-    ``combineFunction`` will be invoked to combine two states into a new state.
-    The final state is returned::
-
-        SELECT id, reduce_agg(value, 0, (a, b) -> a + b, (a, b) -> a + b)
-        FROM (
-            VALUES
-                (1, 3),
-                (1, 4),
-                (1, 5),
-                (2, 6),
-                (2, 7)
-        ) AS t(id, value)
-        GROUP BY id;
-        -- (1, 12)
-        -- (2, 13)
-
-        SELECT id, reduce_agg(value, 1, (a, b) -> a * b, (a, b) -> a * b)
-        FROM (
-            VALUES
-                (1, 3),
-                (1, 4),
-                (1, 5),
-                (2, 6),
-                (2, 7)
-        ) AS t(id, value)
-        GROUP BY id;
-        -- (1, 60)
-        -- (2, 42)
-
-    The state type must be a boolean, integer, floating-point, or date/time/interval.
-
-
diff --git a/docs/src/main/sphinx/functions/array.md b/docs/src/main/sphinx/functions/array.md
new file mode 100644
index 000000000000..0b4252284d2f
--- /dev/null
+++ b/docs/src/main/sphinx/functions/array.md
@@ -0,0 +1,423 @@
+# Array functions and operators
+
+(subscript-operator)=
+
+## Subscript operator: \[\]
+
+The `[]` operator is used to access an element of an array and is indexed starting from one:
+
+```
+SELECT my_array[1] AS first_element
+```
+
+(concatenation-operator)=
+
+## Concatenation operator: ||
+
+The `||` operator is used to concatenate an array with an array or an element of the same type:
+
+```
+SELECT ARRAY[1] || ARRAY[2];
+-- [1, 2]
+
+SELECT ARRAY[1] || 2;
+-- [1, 2]
+
+SELECT 2 || ARRAY[1];
+-- [2, 1]
+```
+
+## Array functions
+
+:::{function} all_match(array(T), function(T,boolean)) -> boolean
+Returns whether all elements of an array match the given predicate. Returns `true` if all the elements
+match the predicate (a special case is when the array is empty); `false` if one or more elements don't
+match; `NULL` if the predicate function returns `NULL` for one or more elements and `true` for all
+other elements.
+:::
+
+:::{function} any_match(array(T), function(T,boolean)) -> boolean
+Returns whether any elements of an array match the given predicate. Returns `true` if one or more
+elements match the predicate; `false` if none of the elements matches (a special case is when the
+array is empty); `NULL` if the predicate function returns `NULL` for one or more elements and `false`
+for all other elements.
+:::
+
+:::{function} array_distinct(x) -> array
+Remove duplicate values from the array `x`.
+:::
+
+:::{function} array_intersect(x, y) -> array
+Returns an array of the elements in the intersection of `x` and `y`, without duplicates.
+:::
+
+:::{function} array_union(x, y) -> array
+Returns an array of the elements in the union of `x` and `y`, without duplicates.
+:::
+
+:::{function} array_except(x, y) -> array
+Returns an array of elements in `x` but not in `y`, without duplicates.
+:::
+
+:::{function} array_histogram(x) -> map<K, bigint>
+Returns a map where the keys are the unique elements in the input array
+`x` and the values are the number of times that each element appears in
+`x`. Null values are ignored.
+
+```
+SELECT array_histogram(ARRAY[42, 7, 42, NULL]);
+-- {42=2, 7=1}
+```
+
+Returns an empty map if the input array has no non-null elements.
+
+```
+SELECT array_histogram(ARRAY[NULL, NULL]);
+-- {}
+```
+:::
+
+:::{function} array_join(x, delimiter, null_replacement) -> varchar
+Concatenates the elements of the given array using the delimiter and an optional string to replace nulls.
+:::
+
+:::{function} array_max(x) -> x
+Returns the maximum value of input array.
+:::
+
+:::{function} array_min(x) -> x
+Returns the minimum value of input array.
+:::
+
+:::{function} array_position(x, element) -> bigint
+Returns the position of the first occurrence of the `element` in array `x` (or 0 if not found).
+:::
+
+:::{function} array_remove(x, element) -> array
+Remove all elements that equal `element` from array `x`.
+:::
+
+:::{function} array_sort(x) -> array
+Sorts and returns the array `x`. The elements of `x` must be orderable.
+Null elements will be placed at the end of the returned array.
+:::
+
+:::{function} array_sort(array(T), function(T,T,int)) -> array(T)
+:noindex: true
+
+Sorts and returns the `array` based on the given comparator `function`.
+The comparator will take two nullable arguments representing two nullable
+elements of the `array`. It returns -1, 0, or 1 as the first nullable
+element is less than, equal to, or greater than the second nullable element.
+If the comparator function returns other values (including `NULL`), the
+query will fail and raise an error.
+
+```
+SELECT array_sort(ARRAY[3, 2, 5, 1, 2],
+                  (x, y) -> IF(x < y, 1, IF(x = y, 0, -1)));
+-- [5, 3, 2, 2, 1]
+
+SELECT array_sort(ARRAY['bc', 'ab', 'dc'],
+                  (x, y) -> IF(x < y, 1, IF(x = y, 0, -1)));
+-- ['dc', 'bc', 'ab']
+
+
+SELECT array_sort(ARRAY[3, 2, null, 5, null, 1, 2],
+                  -- sort null first with descending order
+                  (x, y) -> CASE WHEN x IS NULL THEN -1
+                                 WHEN y IS NULL THEN 1
+                                 WHEN x < y THEN 1
+                                 WHEN x = y THEN 0
+                                 ELSE -1 END);
+-- [null, null, 5, 3, 2, 2, 1]
+
+SELECT array_sort(ARRAY[3, 2, null, 5, null, 1, 2],
+                  -- sort null last with descending order
+                  (x, y) -> CASE WHEN x IS NULL THEN 1
+                                 WHEN y IS NULL THEN -1
+                                 WHEN x < y THEN 1
+                                 WHEN x = y THEN 0
+                                 ELSE -1 END);
+-- [5, 3, 2, 2, 1, null, null]
+
+SELECT array_sort(ARRAY['a', 'abcd', 'abc'],
+                  -- sort by string length
+                  (x, y) -> IF(length(x) < length(y), -1,
+                               IF(length(x) = length(y), 0, 1)));
+-- ['a', 'abc', 'abcd']
+
+SELECT array_sort(ARRAY[ARRAY[2, 3, 1], ARRAY[4, 2, 1, 4], ARRAY[1, 2]],
+                  -- sort by array length
+                  (x, y) -> IF(cardinality(x) < cardinality(y), -1,
+                               IF(cardinality(x) = cardinality(y), 0, 1)));
+-- [[1, 2], [2, 3, 1], [4, 2, 1, 4]]
+```
+:::
+
+:::{function} arrays_overlap(x, y) -> boolean
+Tests if arrays `x` and `y` have any non-null elements in common.
+Returns null if there are no non-null elements in common but either array contains null.
+:::
+
+:::{function} cardinality(x) -> bigint
+Returns the cardinality (size) of the array `x`.
+:::
+
+:::{function} concat(array1, array2, ..., arrayN) -> array
+:noindex: true
+
+Concatenates the arrays `array1`, `array2`, `...`, `arrayN`.
+This function provides the same functionality as the SQL-standard concatenation operator (`||`).
+:::
+
+:::{function} combinations(array(T), n) -> array(array(T))
+Returns n-element sub-groups of input array. If the input array has no duplicates,
+`combinations` returns n-element subsets.
+
+```
+SELECT combinations(ARRAY['foo', 'bar', 'baz'], 2);
+-- [['foo', 'bar'], ['foo', 'baz'], ['bar', 'baz']]
+
+SELECT combinations(ARRAY[1, 2, 3], 2);
+-- [[1, 2], [1, 3], [2, 3]]
+
+SELECT combinations(ARRAY[1, 2, 2], 2);
+-- [[1, 2], [1, 2], [2, 2]]
+```
+
+Order of sub-groups is deterministic but unspecified. Order of elements within
+a sub-group deterministic but unspecified. `n` must be not be greater than 5,
+and the total size of sub-groups generated must be smaller than 100,000.
+:::
+
+:::{function} contains(x, element) -> boolean
+Returns true if the array `x` contains the `element`.
+:::
+
+:::{function} contains_sequence(x, seq) -> boolean
+Return true if array `x` contains all of array `seq` as a subsequence (all values in the same consecutive order).
+:::
+
+:::{function} element_at(array(E), index) -> E
+Returns element of `array` at given `index`.
+If `index` > 0, this function provides the same functionality as the SQL-standard subscript operator (`[]`),
+except that the function returns `NULL` when accessing an `index` larger than array length, whereas
+the subscript operator would fail in such a case.
+If `index` \< 0, `element_at` accesses elements from the last to the first.
+:::
+
+:::{function} filter(array(T), function(T,boolean)) -> array(T)
+Constructs an array from those elements of `array` for which `function` returns true:
+
+```
+SELECT filter(ARRAY[], x -> true);
+-- []
+
+SELECT filter(ARRAY[5, -6, NULL, 7], x -> x > 0);
+-- [5, 7]
+
+SELECT filter(ARRAY[5, NULL, 7, NULL], x -> x IS NOT NULL);
+-- [5, 7]
+```
+:::
+
+:::{function} flatten(x) -> array
+Flattens an `array(array(T))` to an `array(T)` by concatenating the contained arrays.
+:::
+
+:::{function} ngrams(array(T), n) -> array(array(T))
+Returns `n`-grams (sub-sequences of adjacent `n` elements) for the `array`.
+The order of the `n`-grams in the result is unspecified.
+
+```
+SELECT ngrams(ARRAY['foo', 'bar', 'baz', 'foo'], 2);
+-- [['foo', 'bar'], ['bar', 'baz'], ['baz', 'foo']]
+
+SELECT ngrams(ARRAY['foo', 'bar', 'baz', 'foo'], 3);
+-- [['foo', 'bar', 'baz'], ['bar', 'baz', 'foo']]
+
+SELECT ngrams(ARRAY['foo', 'bar', 'baz', 'foo'], 4);
+-- [['foo', 'bar', 'baz', 'foo']]
+
+SELECT ngrams(ARRAY['foo', 'bar', 'baz', 'foo'], 5);
+-- [['foo', 'bar', 'baz', 'foo']]
+
+SELECT ngrams(ARRAY[1, 2, 3, 4], 2);
+-- [[1, 2], [2, 3], [3, 4]]
+```
+:::
+
+:::{function} none_match(array(T), function(T,boolean)) -> boolean
+Returns whether no elements of an array match the given predicate. Returns `true` if none of the elements
+matches the predicate (a special case is when the array is empty); `false` if one or more elements match;
+`NULL` if the predicate function returns `NULL` for one or more elements and `false` for all other elements.
+:::
+
+:::{function} reduce(array(T), initialState S, inputFunction(S,T,S), outputFunction(S,R)) -> R
+Returns a single value reduced from `array`. `inputFunction` will
+be invoked for each element in `array` in order. In addition to taking
+the element, `inputFunction` takes the current state, initially
+`initialState`, and returns the new state. `outputFunction` will be
+invoked to turn the final state into the result value. It may be the
+identity function (`i -> i`).
+
+```
+SELECT reduce(ARRAY[], 0,
+              (s, x) -> s + x,
+              s -> s);
+-- 0
+
+SELECT reduce(ARRAY[5, 20, 50], 0,
+              (s, x) -> s + x,
+              s -> s);
+-- 75
+
+SELECT reduce(ARRAY[5, 20, NULL, 50], 0,
+              (s, x) -> s + x,
+              s -> s);
+-- NULL
+
+SELECT reduce(ARRAY[5, 20, NULL, 50], 0,
+              (s, x) -> s + coalesce(x, 0),
+              s -> s);
+-- 75
+
+SELECT reduce(ARRAY[5, 20, NULL, 50], 0,
+              (s, x) -> IF(x IS NULL, s, s + x),
+              s -> s);
+-- 75
+
+SELECT reduce(ARRAY[2147483647, 1], BIGINT '0',
+              (s, x) -> s + x,
+              s -> s);
+-- 2147483648
+
+-- calculates arithmetic average
+SELECT reduce(ARRAY[5, 6, 10, 20],
+              CAST(ROW(0.0, 0) AS ROW(sum DOUBLE, count INTEGER)),
+              (s, x) -> CAST(ROW(x + s.sum, s.count + 1) AS
+                             ROW(sum DOUBLE, count INTEGER)),
+              s -> IF(s.count = 0, NULL, s.sum / s.count));
+-- 10.25
+```
+:::
+
+:::{function} repeat(element, count) -> array
+Repeat `element` for `count` times.
+:::
+
+:::{function} reverse(x) -> array
+:noindex: true
+
+Returns an array which has the reversed order of array `x`.
+:::
+
+:::{function} sequence(start, stop) -> array(bigint)
+Generate a sequence of integers from `start` to `stop`, incrementing
+by `1` if `start` is less than or equal to `stop`, otherwise `-1`.
+:::
+
+:::{function} sequence(start, stop, step) -> array(bigint)
+:noindex: true
+
+Generate a sequence of integers from `start` to `stop`, incrementing by `step`.
+:::
+
+:::{function} sequence(start, stop) -> array(date)
+:noindex: true
+
+Generate a sequence of dates from `start` date to `stop` date, incrementing
+by `1` day if `start` date is less than or equal to `stop` date, otherwise `-1` day.
+:::
+
+:::{function} sequence(start, stop, step) -> array(date)
+:noindex: true
+
+Generate a sequence of dates from `start` to `stop`, incrementing by `step`.
+The type of `step` can be either `INTERVAL DAY TO SECOND` or `INTERVAL YEAR TO MONTH`.
+:::
+
+:::{function} sequence(start, stop, step) -> array(timestamp)
+:noindex: true
+
+Generate a sequence of timestamps from `start` to `stop`, incrementing by `step`.
+The type of `step` can be either `INTERVAL DAY TO SECOND` or `INTERVAL YEAR TO MONTH`.
+:::
+
+:::{function} shuffle(x) -> array
+Generate a random permutation of the given array `x`.
+:::
+
+:::{function} slice(x, start, length) -> array
+Subsets array `x` starting from index `start` (or starting from the end
+if `start` is negative) with a length of `length`.
+:::
+
+:::{function} trim_array(x, n) -> array
+Remove `n` elements from the end of array:
+
+```
+SELECT trim_array(ARRAY[1, 2, 3, 4], 1);
+-- [1, 2, 3]
+
+SELECT trim_array(ARRAY[1, 2, 3, 4], 2);
+-- [1, 2]
+```
+:::
+
+:::{function} transform(array(T), function(T,U)) -> array(U)
+Returns an array that is the result of applying `function` to each element of `array`:
+
+```
+SELECT transform(ARRAY[], x -> x + 1);
+-- []
+
+SELECT transform(ARRAY[5, 6], x -> x + 1);
+-- [6, 7]
+
+SELECT transform(ARRAY[5, NULL, 6], x -> coalesce(x, 0) + 1);
+-- [6, 1, 7]
+
+SELECT transform(ARRAY['x', 'abc', 'z'], x -> x || '0');
+-- ['x0', 'abc0', 'z0']
+
+SELECT transform(ARRAY[ARRAY[1, NULL, 2], ARRAY[3, NULL]],
+                 a -> filter(a, x -> x IS NOT NULL));
+-- [[1, 2], [3]]
+```
+:::
+
+:::{function} zip(array1, array2[, ...]) -> array(row)
+Merges the given arrays, element-wise, into a single array of rows. The M-th element of
+the N-th argument will be the N-th field of the M-th output element.
+If the arguments have an uneven length, missing values are filled with `NULL`.
+
+```
+SELECT zip(ARRAY[1, 2], ARRAY['1b', null, '3b']);
+-- [ROW(1, '1b'), ROW(2, null), ROW(null, '3b')]
+```
+:::
+
+:::{function} zip_with(array(T), array(U), function(T,U,R)) -> array(R)
+Merges the two given arrays, element-wise, into a single array using `function`.
+If one array is shorter, nulls are appended at the end to match the length of the
+longer array, before applying `function`.
+
+```
+SELECT zip_with(ARRAY[1, 3, 5], ARRAY['a', 'b', 'c'],
+                (x, y) -> (y, x));
+-- [ROW('a', 1), ROW('b', 3), ROW('c', 5)]
+
+SELECT zip_with(ARRAY[1, 2], ARRAY[3, 4],
+                (x, y) -> x + y);
+-- [4, 6]
+
+SELECT zip_with(ARRAY['a', 'b', 'c'], ARRAY['d', 'e', 'f'],
+                (x, y) -> concat(x, y));
+-- ['ad', 'be', 'cf']
+
+SELECT zip_with(ARRAY['a'], ARRAY['d', null, 'f'],
+                (x, y) -> coalesce(x, y));
+-- ['a', null, 'f']
+```
+:::
diff --git a/docs/src/main/sphinx/functions/array.rst b/docs/src/main/sphinx/functions/array.rst
deleted file mode 100644
index 87b9f4179665..000000000000
--- a/docs/src/main/sphinx/functions/array.rst
+++ /dev/null
@@ -1,381 +0,0 @@
-=============================
-Array functions and operators
-=============================
-
-.. _subscript_operator:
-
-Subscript operator: []
-----------------------
-
-The ``[]`` operator is used to access an element of an array and is indexed starting from one::
-
-    SELECT my_array[1] AS first_element
-
-.. _concatenation_operator:
-
-Concatenation operator: ||
---------------------------
-
-The ``||`` operator is used to concatenate an array with an array or an element of the same type::
-
-    SELECT ARRAY[1] || ARRAY[2];
-    -- [1, 2]
-
-    SELECT ARRAY[1] || 2;
-    -- [1, 2]
-
-    SELECT 2 || ARRAY[1];
-    -- [2, 1]
-
-Array functions
----------------
-
-.. function:: all_match(array(T), function(T,boolean)) -> boolean
-
-    Returns whether all elements of an array match the given predicate. Returns ``true`` if all the elements
-    match the predicate (a special case is when the array is empty); ``false`` if one or more elements don't
-    match; ``NULL`` if the predicate function returns ``NULL`` for one or more elements and ``true`` for all
-    other elements.
-
-.. function:: any_match(array(T), function(T,boolean)) -> boolean
-
-    Returns whether any elements of an array match the given predicate. Returns ``true`` if one or more
-    elements match the predicate; ``false`` if none of the elements matches (a special case is when the
-    array is empty); ``NULL`` if the predicate function returns ``NULL`` for one or more elements and ``false``
-    for all other elements.
-
-.. function:: array_distinct(x) -> array
-
-    Remove duplicate values from the array ``x``.
-
-.. function:: array_intersect(x, y) -> array
-
-    Returns an array of the elements in the intersection of ``x`` and ``y``, without duplicates.
-
-.. function:: array_union(x, y) -> array
-
-    Returns an array of the elements in the union of ``x`` and ``y``, without duplicates.
-
-.. function:: array_except(x, y) -> array
-
-    Returns an array of elements in ``x`` but not in ``y``, without duplicates.
-
-.. function:: array_join(x, delimiter, null_replacement) -> varchar
-
-    Concatenates the elements of the given array using the delimiter and an optional string to replace nulls.
-
-.. function:: array_max(x) -> x
-
-    Returns the maximum value of input array.
-
-.. function:: array_min(x) -> x
-
-    Returns the minimum value of input array.
-
-.. function:: array_position(x, element) -> bigint
-
-    Returns the position of the first occurrence of the ``element`` in array ``x`` (or 0 if not found).
-
-.. function:: array_remove(x, element) -> array
-
-    Remove all elements that equal ``element`` from array ``x``.
-
-.. function:: array_sort(x) -> array
-
-    Sorts and returns the array ``x``. The elements of ``x`` must be orderable.
-    Null elements will be placed at the end of the returned array.
-
-.. function:: array_sort(array(T), function(T,T,int)) -> array(T)
-    :noindex:
-
-    Sorts and returns the ``array`` based on the given comparator ``function``.
-    The comparator will take two nullable arguments representing two nullable
-    elements of the ``array``. It returns -1, 0, or 1 as the first nullable
-    element is less than, equal to, or greater than the second nullable element.
-    If the comparator function returns other values (including ``NULL``), the
-    query will fail and raise an error. ::
-
-        SELECT array_sort(ARRAY[3, 2, 5, 1, 2],
-                          (x, y) -> IF(x < y, 1, IF(x = y, 0, -1)));
-        -- [5, 3, 2, 2, 1]
-
-        SELECT array_sort(ARRAY['bc', 'ab', 'dc'],
-                          (x, y) -> IF(x < y, 1, IF(x = y, 0, -1)));
-        -- ['dc', 'bc', 'ab']
-
-
-        SELECT array_sort(ARRAY[3, 2, null, 5, null, 1, 2],
-                          -- sort null first with descending order
-                          (x, y) -> CASE WHEN x IS NULL THEN -1
-                                         WHEN y IS NULL THEN 1
-                                         WHEN x < y THEN 1
-                                         WHEN x = y THEN 0
-                                         ELSE -1 END);
-        -- [null, null, 5, 3, 2, 2, 1]
-
-        SELECT array_sort(ARRAY[3, 2, null, 5, null, 1, 2],
-                          -- sort null last with descending order
-                          (x, y) -> CASE WHEN x IS NULL THEN 1
-                                         WHEN y IS NULL THEN -1
-                                         WHEN x < y THEN 1
-                                         WHEN x = y THEN 0
-                                         ELSE -1 END);
-        -- [5, 3, 2, 2, 1, null, null]
-
-        SELECT array_sort(ARRAY['a', 'abcd', 'abc'],
-                          -- sort by string length
-                          (x, y) -> IF(length(x) < length(y), -1,
-                                       IF(length(x) = length(y), 0, 1)));
-        -- ['a', 'abc', 'abcd']
-
-        SELECT array_sort(ARRAY[ARRAY[2, 3, 1], ARRAY[4, 2, 1, 4], ARRAY[1, 2]],
-                          -- sort by array length
-                          (x, y) -> IF(cardinality(x) < cardinality(y), -1,
-                                       IF(cardinality(x) = cardinality(y), 0, 1)));
-        -- [[1, 2], [2, 3, 1], [4, 2, 1, 4]]
-
-.. function:: arrays_overlap(x, y) -> boolean
-
-    Tests if arrays ``x`` and ``y`` have any non-null elements in common.
-    Returns null if there are no non-null elements in common but either array contains null.
-
-.. function:: cardinality(x) -> bigint
-
-    Returns the cardinality (size) of the array ``x``.
-
-.. function:: concat(array1, array2, ..., arrayN) -> array
-    :noindex:
-
-    Concatenates the arrays ``array1``, ``array2``, ``...``, ``arrayN``.
-    This function provides the same functionality as the SQL-standard concatenation operator (``||``).
-
-.. function:: combinations(array(T), n) -> array(array(T))
-
-    Returns n-element sub-groups of input array. If the input array has no duplicates,
-    ``combinations`` returns n-element subsets. ::
-
-         SELECT combinations(ARRAY['foo', 'bar', 'baz'], 2);
-         -- [['foo', 'bar'], ['foo', 'baz'], ['bar', 'baz']]
-
-         SELECT combinations(ARRAY[1, 2, 3], 2);
-         -- [[1, 2], [1, 3], [2, 3]]
-
-         SELECT combinations(ARRAY[1, 2, 2], 2);
-         -- [[1, 2], [1, 2], [2, 2]]
-
-    Order of sub-groups is deterministic but unspecified. Order of elements within
-    a sub-group deterministic but unspecified. ``n`` must be not be greater than 5,
-    and the total size of sub-groups generated must be smaller than 100,000.
-
-.. function:: contains(x, element) -> boolean
-
-    Returns true if the array ``x`` contains the ``element``.
-
-.. function:: contains_sequence(x, seq) -> boolean
-
-    Return true if array ``x`` contains all of array ``seq`` as a subsequence (all values in the same consecutive order).
-
-.. function:: element_at(array(E), index) -> E
-
-    Returns element of ``array`` at given ``index``.
-    If ``index`` > 0, this function provides the same functionality as the SQL-standard subscript operator (``[]``),
-    except that the function returns ``NULL`` when accessing an ``index`` larger than array length, whereas
-    the subscript operator would fail in such a case.
-    If ``index`` < 0, ``element_at`` accesses elements from the last to the first.
-
-.. function:: filter(array(T), function(T,boolean)) -> array(T)
-
-    Constructs an array from those elements of ``array`` for which ``function`` returns true::
-
-        SELECT filter(ARRAY[], x -> true);
-        -- []
-
-        SELECT filter(ARRAY[5, -6, NULL, 7], x -> x > 0);
-        -- [5, 7]
-
-        SELECT filter(ARRAY[5, NULL, 7, NULL], x -> x IS NOT NULL);
-        -- [5, 7]
-
-.. function:: flatten(x) -> array
-
-    Flattens an ``array(array(T))`` to an ``array(T)`` by concatenating the contained arrays.
-
-.. function:: ngrams(array(T), n) -> array(array(T))
-
-    Returns ``n``-grams (sub-sequences of adjacent ``n`` elements) for the ``array``.
-    The order of the ``n``-grams in the result is unspecified. ::
-
-        SELECT ngrams(ARRAY['foo', 'bar', 'baz', 'foo'], 2);
-        -- [['foo', 'bar'], ['bar', 'baz'], ['baz', 'foo']]
-
-        SELECT ngrams(ARRAY['foo', 'bar', 'baz', 'foo'], 3);
-        -- [['foo', 'bar', 'baz'], ['bar', 'baz', 'foo']]
-
-        SELECT ngrams(ARRAY['foo', 'bar', 'baz', 'foo'], 4);
-        -- [['foo', 'bar', 'baz', 'foo']]
-
-        SELECT ngrams(ARRAY['foo', 'bar', 'baz', 'foo'], 5);
-        -- [['foo', 'bar', 'baz', 'foo']]
-
-        SELECT ngrams(ARRAY[1, 2, 3, 4], 2);
-        -- [[1, 2], [2, 3], [3, 4]]
-
-.. function:: none_match(array(T), function(T,boolean)) -> boolean
-
-    Returns whether no elements of an array match the given predicate. Returns ``true`` if none of the elements
-    matches the predicate (a special case is when the array is empty); ``false`` if one or more elements match;
-    ``NULL`` if the predicate function returns ``NULL`` for one or more elements and ``false`` for all other elements.
-
-.. function:: reduce(array(T), initialState S, inputFunction(S,T,S), outputFunction(S,R)) -> R
-
-    Returns a single value reduced from ``array``. ``inputFunction`` will
-    be invoked for each element in ``array`` in order. In addition to taking
-    the element, ``inputFunction`` takes the current state, initially
-    ``initialState``, and returns the new state. ``outputFunction`` will be
-    invoked to turn the final state into the result value. It may be the
-    identity function (``i -> i``). ::
-
-        SELECT reduce(ARRAY[], 0,
-                      (s, x) -> s + x,
-                      s -> s);
-        -- 0
-
-        SELECT reduce(ARRAY[5, 20, 50], 0,
-                      (s, x) -> s + x,
-                      s -> s);
-        -- 75
-
-        SELECT reduce(ARRAY[5, 20, NULL, 50], 0,
-                      (s, x) -> s + x,
-                      s -> s);
-        -- NULL
-
-        SELECT reduce(ARRAY[5, 20, NULL, 50], 0,
-                      (s, x) -> s + coalesce(x, 0),
-                      s -> s);
-        -- 75
-
-        SELECT reduce(ARRAY[5, 20, NULL, 50], 0,
-                      (s, x) -> IF(x IS NULL, s, s + x),
-                      s -> s);
-        -- 75
-
-        SELECT reduce(ARRAY[2147483647, 1], BIGINT '0',
-                      (s, x) -> s + x,
-                      s -> s);
-        -- 2147483648
-
-        -- calculates arithmetic average
-        SELECT reduce(ARRAY[5, 6, 10, 20],
-                      CAST(ROW(0.0, 0) AS ROW(sum DOUBLE, count INTEGER)),
-                      (s, x) -> CAST(ROW(x + s.sum, s.count + 1) AS
-                                     ROW(sum DOUBLE, count INTEGER)),
-                      s -> IF(s.count = 0, NULL, s.sum / s.count));
-        -- 10.25
-
-.. function:: repeat(element, count) -> array
-
-    Repeat ``element`` for ``count`` times.
-
-.. function:: reverse(x) -> array
-    :noindex:
-
-    Returns an array which has the reversed order of array ``x``.
-
-.. function:: sequence(start, stop) -> array(bigint)
-
-    Generate a sequence of integers from ``start`` to ``stop``, incrementing
-    by ``1`` if ``start`` is less than or equal to ``stop``, otherwise ``-1``.
-
-.. function:: sequence(start, stop, step) -> array(bigint)
-    :noindex:
-
-    Generate a sequence of integers from ``start`` to ``stop``, incrementing by ``step``.
-
-.. function:: sequence(start, stop) -> array(date)
-    :noindex:
-
-    Generate a sequence of dates from ``start`` date to ``stop`` date, incrementing
-    by ``1`` day if ``start`` date is less than or equal to ``stop`` date, otherwise ``-1`` day.
-
-.. function:: sequence(start, stop, step) -> array(date)
-    :noindex:
-
-    Generate a sequence of dates from ``start`` to ``stop``, incrementing by ``step``.
-    The type of ``step`` can be either ``INTERVAL DAY TO SECOND`` or ``INTERVAL YEAR TO MONTH``.
-
-.. function:: sequence(start, stop, step) -> array(timestamp)
-    :noindex:
-
-    Generate a sequence of timestamps from ``start`` to ``stop``, incrementing by ``step``.
-    The type of ``step`` can be either ``INTERVAL DAY TO SECOND`` or ``INTERVAL YEAR TO MONTH``.
-
-.. function:: shuffle(x) -> array
-
-    Generate a random permutation of the given array ``x``.
-
-.. function:: slice(x, start, length) -> array
-
-    Subsets array ``x`` starting from index ``start`` (or starting from the end
-    if ``start`` is negative) with a length of ``length``.
-
-.. function:: trim_array(x, n) -> array
-
-    Remove ``n`` elements from the end of array::
-
-        SELECT trim_array(ARRAY[1, 2, 3, 4], 1);
-        -- [1, 2, 3]
-
-        SELECT trim_array(ARRAY[1, 2, 3, 4], 2);
-        -- [1, 2]
-
-.. function:: transform(array(T), function(T,U)) -> array(U)
-
-    Returns an array that is the result of applying ``function`` to each element of ``array``::
-
-        SELECT transform(ARRAY[], x -> x + 1);
-        -- []
-
-        SELECT transform(ARRAY[5, 6], x -> x + 1);
-        -- [6, 7]
-
-        SELECT transform(ARRAY[5, NULL, 6], x -> coalesce(x, 0) + 1);
-        -- [6, 1, 7]
-
-        SELECT transform(ARRAY['x', 'abc', 'z'], x -> x || '0');
-        -- ['x0', 'abc0', 'z0']
-
-        SELECT transform(ARRAY[ARRAY[1, NULL, 2], ARRAY[3, NULL]],
-                         a -> filter(a, x -> x IS NOT NULL));
-        -- [[1, 2], [3]]
-
-.. function:: zip(array1, array2[, ...]) -> array(row)
-
-    Merges the given arrays, element-wise, into a single array of rows. The M-th element of
-    the N-th argument will be the N-th field of the M-th output element.
-    If the arguments have an uneven length, missing values are filled with ``NULL``. ::
-
-        SELECT zip(ARRAY[1, 2], ARRAY['1b', null, '3b']);
-        -- [ROW(1, '1b'), ROW(2, null), ROW(null, '3b')]
-
-.. function:: zip_with(array(T), array(U), function(T,U,R)) -> array(R)
-
-    Merges the two given arrays, element-wise, into a single array using ``function``.
-    If one array is shorter, nulls are appended at the end to match the length of the
-    longer array, before applying ``function``. ::
-
-        SELECT zip_with(ARRAY[1, 3, 5], ARRAY['a', 'b', 'c'],
-                        (x, y) -> (y, x));
-        -- [ROW('a', 1), ROW('b', 3), ROW('c', 5)]
-
-        SELECT zip_with(ARRAY[1, 2], ARRAY[3, 4],
-                        (x, y) -> x + y);
-        -- [4, 6]
-
-        SELECT zip_with(ARRAY['a', 'b', 'c'], ARRAY['d', 'e', 'f'],
-                        (x, y) -> concat(x, y));
-        -- ['ad', 'be', 'cf']
-
-        SELECT zip_with(ARRAY['a'], ARRAY['d', null, 'f'],
-                        (x, y) -> coalesce(x, y));
-        -- ['a', null, 'f']
diff --git a/docs/src/main/sphinx/functions/binary.md b/docs/src/main/sphinx/functions/binary.md
new file mode 100644
index 000000000000..8d86f06bde52
--- /dev/null
+++ b/docs/src/main/sphinx/functions/binary.md
@@ -0,0 +1,203 @@
+# Binary functions and operators
+
+## Binary operators
+
+The `||` operator performs concatenation.
+
+## Binary functions
+
+:::{function} concat(binary1, ..., binaryN) -> varbinary
+:noindex: true
+
+Returns the concatenation of `binary1`, `binary2`, `...`, `binaryN`.
+This function provides the same functionality as the
+SQL-standard concatenation operator (`||`).
+:::
+
+:::{function} length(binary) -> bigint
+:noindex: true
+
+Returns the length of `binary` in bytes.
+:::
+
+:::{function} lpad(binary, size, padbinary) -> varbinary
+:noindex: true
+
+Left pads `binary` to `size` bytes with `padbinary`.
+If `size` is less than the length of `binary`, the result is
+truncated to `size` characters. `size` must not be negative
+and `padbinary` must be non-empty.
+:::
+
+:::{function} rpad(binary, size, padbinary) -> varbinary
+:noindex: true
+
+Right pads `binary` to `size` bytes with `padbinary`.
+If `size` is less than the length of `binary`, the result is
+truncated to `size` characters. `size` must not be negative
+and `padbinary` must be non-empty.
+:::
+
+:::{function} substr(binary, start) -> varbinary
+:noindex: true
+
+Returns the rest of `binary` from the starting position `start`,
+measured in bytes. Positions start with `1`. A negative starting position
+is interpreted as being relative to the end of the string.
+:::
+
+:::{function} substr(binary, start, length) -> varbinary
+:noindex: true
+
+Returns a substring from `binary` of length `length` from the starting
+position `start`, measured in bytes. Positions start with `1`. A
+negative starting position is interpreted as being relative to the end of
+the string.
+:::
+
+(function-reverse-varbinary)=
+
+:::{function} reverse(binary) -> varbinary
+:noindex: true
+
+Returns `binary` with the bytes in reverse order.
+:::
+
+## Base64 encoding functions
+
+The Base64 functions implement the encoding specified in {rfc}`4648`.
+
+:::{function} from_base64(string) -> varbinary
+Decodes binary data from the base64 encoded `string`.
+:::
+
+:::{function} to_base64(binary) -> varchar
+Encodes `binary` into a base64 string representation.
+:::
+
+:::{function} from_base64url(string) -> varbinary
+Decodes binary data from the base64 encoded `string` using the URL safe alphabet.
+:::
+
+:::{function} to_base64url(binary) -> varchar
+Encodes `binary` into a base64 string representation using the URL safe alphabet.
+:::
+
+:::{function} from_base32(string) -> varbinary
+Decodes binary data from the base32 encoded `string`.
+:::
+
+:::{function} to_base32(binary) -> varchar
+Encodes `binary` into a base32 string representation.
+:::
+
+## Hex encoding functions
+
+:::{function} from_hex(string) -> varbinary
+Decodes binary data from the hex encoded `string`.
+:::
+
+:::{function} to_hex(binary) -> varchar
+Encodes `binary` into a hex string representation.
+:::
+
+## Integer encoding functions
+
+:::{function} from_big_endian_32(binary) -> integer
+Decodes the 32-bit two's complement big-endian `binary`.
+The input must be exactly 4 bytes.
+:::
+
+:::{function} to_big_endian_32(integer) -> varbinary
+Encodes `integer` into a 32-bit two's complement big-endian format.
+:::
+
+:::{function} from_big_endian_64(binary) -> bigint
+Decodes the 64-bit two's complement big-endian `binary`.
+The input must be exactly 8 bytes.
+:::
+
+:::{function} to_big_endian_64(bigint) -> varbinary
+Encodes `bigint` into a 64-bit two's complement big-endian format.
+:::
+
+## Floating-point encoding functions
+
+:::{function} from_ieee754_32(binary) -> real
+Decodes the 32-bit big-endian `binary` in IEEE 754 single-precision floating-point format.
+The input must be exactly 4 bytes.
+:::
+
+:::{function} to_ieee754_32(real) -> varbinary
+Encodes `real` into a 32-bit big-endian binary according to IEEE 754 single-precision floating-point format.
+:::
+
+:::{function} from_ieee754_64(binary) -> double
+Decodes the 64-bit big-endian `binary` in IEEE 754 double-precision floating-point format.
+The input must be exactly 8 bytes.
+:::
+
+:::{function} to_ieee754_64(double) -> varbinary
+Encodes `double` into a 64-bit big-endian binary according to IEEE 754 double-precision floating-point format.
+:::
+
+## Hashing functions
+
+:::{function} crc32(binary) -> bigint
+Computes the CRC-32 of `binary`. For general purpose hashing, use
+{func}`xxhash64`, as it is much faster and produces a better quality hash.
+:::
+
+:::{function} md5(binary) -> varbinary
+Computes the MD5 hash of `binary`.
+:::
+
+:::{function} sha1(binary) -> varbinary
+Computes the SHA1 hash of `binary`.
+:::
+
+:::{function} sha256(binary) -> varbinary
+Computes the SHA256 hash of `binary`.
+:::
+
+:::{function} sha512(binary) -> varbinary
+Computes the SHA512 hash of `binary`.
+:::
+
+:::{function} spooky_hash_v2_32(binary) -> varbinary
+Computes the 32-bit SpookyHashV2 hash of `binary`.
+:::
+
+:::{function} spooky_hash_v2_64(binary) -> varbinary
+Computes the 64-bit SpookyHashV2 hash of `binary`.
+:::
+
+:::{function} xxhash64(binary) -> varbinary
+Computes the xxHash64 hash of `binary`.
+:::
+
+:::{function} murmur3(binary) -> varbinary
+Computes the 128-bit [MurmurHash3](https://wikipedia.org/wiki/MurmurHash)
+hash of `binary`.
+
+> SELECT murmur3(from_base64('aaaaaa'));
+> -- ba 58 55 63 55 69 b4 2f 49 20 37 2c a0 e3 96 ef
+:::
+
+## HMAC functions
+
+:::{function} hmac_md5(binary, key) -> varbinary
+Computes HMAC with MD5 of `binary` with the given `key`.
+:::
+
+:::{function} hmac_sha1(binary, key) -> varbinary
+Computes HMAC with SHA1 of `binary` with the given `key`.
+:::
+
+:::{function} hmac_sha256(binary, key) -> varbinary
+Computes HMAC with SHA256 of `binary` with the given `key`.
+:::
+
+:::{function} hmac_sha512(binary, key) -> varbinary
+Computes HMAC with SHA512 of `binary` with the given `key`.
+:::
diff --git a/docs/src/main/sphinx/functions/binary.rst b/docs/src/main/sphinx/functions/binary.rst
deleted file mode 100644
index 4d444b4bfd15..000000000000
--- a/docs/src/main/sphinx/functions/binary.rst
+++ /dev/null
@@ -1,206 +0,0 @@
-==============================
-Binary functions and operators
-==============================
-
-Binary operators
-----------------
-
-The ``||`` operator performs concatenation.
-
-Binary functions
-----------------
-
-.. function:: concat(binary1, ..., binaryN) -> varbinary
-    :noindex:
-
-    Returns the concatenation of ``binary1``, ``binary2``, ``...``, ``binaryN``.
-    This function provides the same functionality as the
-    SQL-standard concatenation operator (``||``).
-
-.. function:: length(binary) -> bigint
-    :noindex:
-
-    Returns the length of ``binary`` in bytes.
-
-.. function:: lpad(binary, size, padbinary) -> varbinary
-    :noindex:
-
-    Left pads ``binary`` to ``size`` bytes with ``padbinary``.
-    If ``size`` is less than the length of ``binary``, the result is
-    truncated to ``size`` characters. ``size`` must not be negative
-    and ``padbinary`` must be non-empty.
-
-.. function:: rpad(binary, size, padbinary) -> varbinary
-    :noindex:
-
-    Right pads ``binary`` to ``size`` bytes with ``padbinary``.
-    If ``size`` is less than the length of ``binary``, the result is
-    truncated to ``size`` characters. ``size`` must not be negative
-    and ``padbinary`` must be non-empty.
-
-.. function:: substr(binary, start) -> varbinary
-    :noindex:
-
-    Returns the rest of ``binary`` from the starting position ``start``,
-    measured in bytes. Positions start with ``1``. A negative starting position
-    is interpreted as being relative to the end of the string.
-
-.. function:: substr(binary, start, length) -> varbinary
-    :noindex:
-
-    Returns a substring from ``binary`` of length ``length`` from the starting
-    position ``start``, measured in bytes. Positions start with ``1``. A
-    negative starting position is interpreted as being relative to the end of
-    the string.
-
-.. _function_reverse_varbinary:
-
-.. function:: reverse(binary) -> varbinary
-    :noindex:
-
-    Returns ``binary`` with the bytes in reverse order.
-
-Base64 encoding functions
--------------------------
-
-The Base64 functions implement the encoding specified in :rfc:`4648`.
-
-.. function:: from_base64(string) -> varbinary
-
-    Decodes binary data from the base64 encoded ``string``.
-
-.. function:: to_base64(binary) -> varchar
-
-    Encodes ``binary`` into a base64 string representation.
-
-.. function:: from_base64url(string) -> varbinary
-
-    Decodes binary data from the base64 encoded ``string`` using the URL safe alphabet.
-
-.. function:: to_base64url(binary) -> varchar
-
-    Encodes ``binary`` into a base64 string representation using the URL safe alphabet.
-
-.. function:: from_base32(string) -> varbinary
-
-    Decodes binary data from the base32 encoded ``string``.
-
-.. function:: to_base32(binary) -> varchar
-
-    Encodes ``binary`` into a base32 string representation.
-
-Hex encoding functions
-----------------------
-
-.. function:: from_hex(string) -> varbinary
-
-    Decodes binary data from the hex encoded ``string``.
-
-.. function:: to_hex(binary) -> varchar
-
-    Encodes ``binary`` into a hex string representation.
-
-Integer encoding functions
---------------------------
-
-.. function:: from_big_endian_32(binary) -> integer
-
-    Decodes the 32-bit two's complement big-endian ``binary``.
-    The input must be exactly 4 bytes.
-
-.. function:: to_big_endian_32(integer) -> varbinary
-
-    Encodes ``integer`` into a 32-bit two's complement big-endian format.
-
-.. function:: from_big_endian_64(binary) -> bigint
-
-    Decodes the 64-bit two's complement big-endian ``binary``.
-    The input must be exactly 8 bytes.
-
-.. function:: to_big_endian_64(bigint) -> varbinary
-
-    Encodes ``bigint`` into a 64-bit two's complement big-endian format.
-
-Floating-point encoding functions
----------------------------------
-
-.. function:: from_ieee754_32(binary) -> real
-
-    Decodes the 32-bit big-endian ``binary`` in IEEE 754 single-precision floating-point format.
-    The input must be exactly 4 bytes.
-
-.. function:: to_ieee754_32(real) -> varbinary
-
-    Encodes ``real`` into a 32-bit big-endian binary according to IEEE 754 single-precision floating-point format.
-
-.. function:: from_ieee754_64(binary) -> double
-
-    Decodes the 64-bit big-endian ``binary`` in IEEE 754 double-precision floating-point format.
-    The input must be exactly 8 bytes.
-
-.. function:: to_ieee754_64(double) -> varbinary
-
-    Encodes ``double`` into a 64-bit big-endian binary according to IEEE 754 double-precision floating-point format.
-
-Hashing functions
------------------
-
-.. function:: crc32(binary) -> bigint
-
-    Computes the CRC-32 of ``binary``. For general purpose hashing, use
-    :func:`xxhash64`, as it is much faster and produces a better quality hash.
-
-.. function:: md5(binary) -> varbinary
-
-    Computes the MD5 hash of ``binary``.
-
-.. function:: sha1(binary) -> varbinary
-
-    Computes the SHA1 hash of ``binary``.
-
-.. function:: sha256(binary) -> varbinary
-
-    Computes the SHA256 hash of ``binary``.
-
-.. function:: sha512(binary) -> varbinary
-
-    Computes the SHA512 hash of ``binary``.
-
-.. function:: spooky_hash_v2_32(binary) -> varbinary
-
-    Computes the 32-bit SpookyHashV2 hash of ``binary``.
-
-.. function:: spooky_hash_v2_64(binary) -> varbinary
-
-    Computes the 64-bit SpookyHashV2 hash of ``binary``.
-
-.. function:: xxhash64(binary) -> varbinary
-
-    Computes the xxHash64 hash of ``binary``.
-
-.. function:: murmur3(binary) -> varbinary
-
-    Computes the 128-bit `MurmurHash3 <https://wikipedia.org/wiki/MurmurHash>`_
-    hash of ``binary``.
-
-        SELECT murmur3(from_base64('aaaaaa'));
-        -- ba 58 55 63 55 69 b4 2f 49 20 37 2c a0 e3 96 ef
-
-HMAC functions
---------------
-
-.. function:: hmac_md5(binary, key) -> varbinary
-
-    Computes HMAC with MD5 of ``binary`` with the given ``key``.
-
-.. function:: hmac_sha1(binary, key) -> varbinary
-
-    Computes HMAC with SHA1 of ``binary`` with the given ``key``.
-
-.. function:: hmac_sha256(binary, key) -> varbinary
-
-    Computes HMAC with SHA256 of ``binary`` with the given ``key``.
-
-.. function:: hmac_sha512(binary, key) -> varbinary
-
-    Computes HMAC with SHA512 of ``binary`` with the given ``key``.
diff --git a/docs/src/main/sphinx/functions/bitwise.md b/docs/src/main/sphinx/functions/bitwise.md
new file mode 100644
index 000000000000..246d481d894f
--- /dev/null
+++ b/docs/src/main/sphinx/functions/bitwise.md
@@ -0,0 +1,139 @@
+# Bitwise functions
+
+:::{function} bit_count(x, bits) -> bigint
+Count the number of bits set in `x` (treated as `bits`-bit signed
+integer) in 2's complement representation:
+
+```
+SELECT bit_count(9, 64); -- 2
+SELECT bit_count(9, 8); -- 2
+SELECT bit_count(-7, 64); -- 62
+SELECT bit_count(-7, 8); -- 6
+```
+:::
+
+:::{function} bitwise_and(x, y) -> bigint
+Returns the bitwise AND of `x` and `y` in 2's complement representation.
+
+Bitwise AND of `19` (binary: `10011`) and `25` (binary: `11001`) results in
+`17` (binary: `10001`):
+
+```
+SELECT bitwise_and(19,25); -- 17
+```
+:::
+
+:::{function} bitwise_not(x) -> bigint
+Returns the bitwise NOT of `x` in 2's complement representation
+(`NOT x = -x - 1`):
+
+```
+SELECT bitwise_not(-12); --  11
+SELECT bitwise_not(19);  -- -20
+SELECT bitwise_not(25);  -- -26
+```
+:::
+
+:::{function} bitwise_or(x, y) -> bigint
+Returns the bitwise OR of `x` and `y` in 2's complement representation.
+
+Bitwise OR of `19` (binary: `10011`) and `25` (binary: `11001`) results in
+`27` (binary: `11011`):
+
+```
+SELECT bitwise_or(19,25); -- 27
+```
+:::
+
+:::{function} bitwise_xor(x, y) -> bigint
+Returns the bitwise XOR of `x` and `y` in 2's complement representation.
+
+Bitwise XOR of `19` (binary: `10011`) and `25` (binary: `11001`) results in
+`10` (binary: `01010`):
+
+```
+SELECT bitwise_xor(19,25); -- 10
+```
+:::
+
+:::{function} bitwise_left_shift(value, shift) -> [same as value]
+Returns the left shifted value of `value`.
+
+Shifting `1` (binary: `001`) by two bits results in `4` (binary: `00100`):
+
+```
+SELECT bitwise_left_shift(1, 2); -- 4
+```
+
+Shifting `5` (binary: `0101`) by two bits results in `20` (binary: `010100`):
+
+```
+SELECT bitwise_left_shift(5, 2); -- 20
+```
+
+Shifting a `value` by `0` always results in the original `value`:
+
+```
+SELECT bitwise_left_shift(20, 0); -- 20
+SELECT bitwise_left_shift(42, 0); -- 42
+```
+
+Shifting `0` by a `shift` always results in `0`:
+
+```
+SELECT bitwise_left_shift(0, 1); -- 0
+SELECT bitwise_left_shift(0, 2); -- 0
+```
+:::
+
+:::{function} bitwise_right_shift(value, shift) -> [same as value]
+Returns the logical right shifted value of `value`.
+
+Shifting `8` (binary: `1000`) by three bits results in `1` (binary: `001`):
+
+```
+SELECT bitwise_right_shift(8, 3); -- 1
+```
+
+Shifting `9` (binary: `1001`) by one bit results in `4` (binary: `100`):
+
+```
+SELECT bitwise_right_shift(9, 1); -- 4
+```
+
+Shifting a `value` by `0` always results in the original `value`:
+
+```
+SELECT bitwise_right_shift(20, 0); -- 20
+SELECT bitwise_right_shift(42, 0); -- 42
+```
+
+Shifting a `value` by `64` or more bits results in `0`:
+
+```
+SELECT bitwise_right_shift( 12, 64); -- 0
+SELECT bitwise_right_shift(-45, 64); -- 0
+```
+
+Shifting `0` by a `shift` always results in `0`:
+
+```
+SELECT bitwise_right_shift(0, 1); -- 0
+SELECT bitwise_right_shift(0, 2); -- 0
+```
+:::
+
+:::{function} bitwise_right_shift_arithmetic(value, shift) -> [same as value]
+Returns the arithmetic right shifted value of `value`.
+
+Returns the same values as {func}`bitwise_right_shift` when shifting by less than
+`64` bits. Shifting by `64` or more bits results in `0` for a positive and
+`-1` for a negative `value`:
+
+```
+SELECT bitwise_right_shift_arithmetic( 12, 64); --  0
+SELECT bitwise_right_shift_arithmetic(-45, 64); -- -1
+```
+:::
+
+See also {func}`bitwise_and_agg` and {func}`bitwise_or_agg`.
diff --git a/docs/src/main/sphinx/functions/bitwise.rst b/docs/src/main/sphinx/functions/bitwise.rst
deleted file mode 100644
index 320ac7e97ae8..000000000000
--- a/docs/src/main/sphinx/functions/bitwise.rst
+++ /dev/null
@@ -1,111 +0,0 @@
-=================
-Bitwise functions
-=================
-
-.. function:: bit_count(x, bits) -> bigint
-
-    Count the number of bits set in ``x`` (treated as ``bits``-bit signed
-    integer) in 2's complement representation::
-
-        SELECT bit_count(9, 64); -- 2
-        SELECT bit_count(9, 8); -- 2
-        SELECT bit_count(-7, 64); -- 62
-        SELECT bit_count(-7, 8); -- 6
-
-.. function:: bitwise_and(x, y) -> bigint
-
-    Returns the bitwise AND of ``x`` and ``y`` in 2's complement representation.
-
-    Bitwise AND of ``19`` (binary: ``10011``) and ``25`` (binary: ``11001``) results in
-    ``17`` (binary: ``10001``)::
-
-      SELECT bitwise_and(19,25); -- 17
-
-.. function:: bitwise_not(x) -> bigint
-
-    Returns the bitwise NOT of ``x`` in 2's complement representation
-    (``NOT x = -x - 1``)::
-
-        SELECT bitwise_not(-12); --  11
-        SELECT bitwise_not(19);  -- -20
-        SELECT bitwise_not(25);  -- -26
-
-.. function:: bitwise_or(x, y) -> bigint
-
-    Returns the bitwise OR of ``x`` and ``y`` in 2's complement representation.
-
-    Bitwise OR of ``19`` (binary: ``10011``) and ``25`` (binary: ``11001``) results in
-    ``27`` (binary: ``11011``)::
-
-      SELECT bitwise_or(19,25); -- 27
-
-.. function:: bitwise_xor(x, y) -> bigint
-
-    Returns the bitwise XOR of ``x`` and ``y`` in 2's complement representation.
-
-    Bitwise XOR of ``19`` (binary: ``10011``) and ``25`` (binary: ``11001``) results in
-    ``10`` (binary: ``01010``)::
-
-      SELECT bitwise_xor(19,25); -- 10
-
-.. function:: bitwise_left_shift(value, shift) -> [same as value]
-
-    Returns the left shifted value of ``value``.
-
-    Shifting ``1`` (binary: ``001``) by two bits results in ``4`` (binary: ``00100``)::
-
-      SELECT bitwise_left_shift(1, 2); -- 4
-
-    Shifting ``5`` (binary: ``0101``) by two bits results in ``20`` (binary: ``010100``)::
-
-      SELECT bitwise_left_shift(5, 2); -- 20
-
-    Shifting a ``value`` by ``0`` always results in the original ``value``::
-
-      SELECT bitwise_left_shift(20, 0); -- 20
-      SELECT bitwise_left_shift(42, 0); -- 42
-
-    Shifting ``0`` by a ``shift`` always results in ``0``::
-
-      SELECT bitwise_left_shift(0, 1); -- 0
-      SELECT bitwise_left_shift(0, 2); -- 0
-
-.. function:: bitwise_right_shift(value, shift) -> [same as value]
-
-    Returns the logical right shifted value of ``value``.
-
-    Shifting ``8`` (binary: ``1000``) by three bits results in ``1`` (binary: ``001``)::
-
-      SELECT bitwise_right_shift(8, 3); -- 1
-
-    Shifting ``9`` (binary: ``1001``) by one bit results in ``4`` (binary: ``100``)::
-
-      SELECT bitwise_right_shift(9, 1); -- 4
-
-    Shifting a ``value`` by ``0`` always results in the original ``value``::
-
-      SELECT bitwise_right_shift(20, 0); -- 20
-      SELECT bitwise_right_shift(42, 0); -- 42
-
-    Shifting a ``value`` by ``64`` or more bits results in ``0``::
-
-      SELECT bitwise_right_shift( 12, 64); -- 0
-      SELECT bitwise_right_shift(-45, 64); -- 0
-
-    Shifting ``0`` by a ``shift`` always results in ``0``::
-
-      SELECT bitwise_right_shift(0, 1); -- 0
-      SELECT bitwise_right_shift(0, 2); -- 0
-
-.. function:: bitwise_right_shift_arithmetic(value, shift) -> [same as value]
-
-    Returns the arithmetic right shifted value of ``value``.
-
-    Returns the same values as :func:`bitwise_right_shift` when shifting by less than
-    ``64`` bits. Shifting by ``64`` or more bits results in ``0`` for a positive and
-    ``-1`` for a negative ``value``::
-
-      SELECT bitwise_right_shift_arithmetic( 12, 64); --  0
-      SELECT bitwise_right_shift_arithmetic(-45, 64); -- -1
-
-See also :func:`bitwise_and_agg` and :func:`bitwise_or_agg`.
diff --git a/docs/src/main/sphinx/functions/color.md b/docs/src/main/sphinx/functions/color.md
new file mode 100644
index 000000000000..746a2f7e8647
--- /dev/null
+++ b/docs/src/main/sphinx/functions/color.md
@@ -0,0 +1,75 @@
+# Color functions
+
+:::{function} bar(x, width) -> varchar
+Renders a single bar in an ANSI bar chart using a default
+`low_color` of red and a `high_color` of green.  For example,
+if `x` of 25% and width of 40 are passed to this function. A
+10-character red bar will be drawn followed by 30 spaces to create
+a bar of 40 characters.
+:::
+
+::::{function} bar(x, width, low_color, high_color) -> varchar
+:noindex: true
+
+Renders a single line in an ANSI bar chart of the specified
+`width`. The parameter `x` is a double value between 0 and 1.
+Values of `x` that fall outside the range \[0, 1\] will be
+truncated to either a 0 or a 1 value. The `low_color` and
+`high_color` capture the color to use for either end of
+the horizontal bar chart.  For example, if `x` is 0.5, `width`
+is 80, `low_color` is 0xFF0000, and `high_color` is 0x00FF00
+this function will return a 40 character bar that varies from red
+(0xFF0000) and yellow (0xFFFF00) and the remainder of the 80
+character bar will be padded with spaces.
+
+:::{figure} ../images/functions_color_bar.png
+:align: center
+:::
+::::
+
+:::{function} color(string) -> color
+Returns a color capturing a decoded RGB value from a 4-character
+string of the format "#000".  The input string should be varchar
+containing a CSS-style short rgb string or one of `black`,
+`red`, `green`, `yellow`, `blue`, `magenta`, `cyan`,
+`white`.
+:::
+
+:::{function} color(x, low, high, low_color, high_color) -> color
+:noindex: true
+
+Returns a color interpolated between `low_color` and
+`high_color` using the double parameters `x`, `low`, and
+`high` to calculate a fraction which is then passed to the
+`color(fraction, low_color, high_color)` function shown below.
+If `x` falls outside the range defined by `low` and `high`
+its value is truncated to fit within this range.
+:::
+
+:::{function} color(x, low_color, high_color) -> color
+:noindex: true
+
+Returns a color interpolated between `low_color` and
+`high_color` according to the double argument `x` between 0
+and 1.  The parameter `x` is a double value between 0 and 1.
+Values of `x` that fall outside the range \[0, 1\] will be
+truncated to either a 0 or a 1 value.
+:::
+
+:::{function} render(x, color) -> varchar
+Renders value `x` using the specific color using ANSI
+color codes. `x` can be either a double, bigint, or varchar.
+:::
+
+:::{function} render(b) -> varchar
+:noindex: true
+
+Accepts boolean value `b` and renders a green true or a red
+false using ANSI color codes.
+:::
+
+:::{function} rgb(red, green, blue) -> color
+Returns a color value capturing the RGB value of three
+component color values supplied as int parameters ranging from 0
+to 255: `red`, `green`, `blue`.
+:::
diff --git a/docs/src/main/sphinx/functions/color.rst b/docs/src/main/sphinx/functions/color.rst
deleted file mode 100644
index 511af84073af..000000000000
--- a/docs/src/main/sphinx/functions/color.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-===============
-Color functions
-===============
-
-.. function:: bar(x, width) -> varchar
-
-    Renders a single bar in an ANSI bar chart using a default
-    ``low_color`` of red and a ``high_color`` of green.  For example,
-    if ``x`` of 25% and width of 40 are passed to this function. A
-    10-character red bar will be drawn followed by 30 spaces to create
-    a bar of 40 characters.
-
-.. function:: bar(x, width, low_color, high_color) -> varchar
-    :noindex:
-
-    Renders a single line in an ANSI bar chart of the specified
-    ``width``. The parameter ``x`` is a double value between 0 and 1.
-    Values of ``x`` that fall outside the range [0, 1] will be
-    truncated to either a 0 or a 1 value. The ``low_color`` and
-    ``high_color`` capture the color to use for either end of
-    the horizontal bar chart.  For example, if ``x`` is 0.5, ``width``
-    is 80, ``low_color`` is 0xFF0000, and ``high_color`` is 0x00FF00
-    this function will return a 40 character bar that varies from red
-    (0xFF0000) and yellow (0xFFFF00) and the remainder of the 80
-    character bar will be padded with spaces.
-
-    .. figure:: ../images/functions_color_bar.png
-       :align: center
-
-.. function:: color(string) -> color
-
-    Returns a color capturing a decoded RGB value from a 4-character
-    string of the format "#000".  The input string should be varchar
-    containing a CSS-style short rgb string or one of ``black``,
-    ``red``, ``green``, ``yellow``, ``blue``, ``magenta``, ``cyan``,
-    ``white``.
-
-.. function:: color(x, low, high, low_color, high_color) -> color
-    :noindex:
-
-    Returns a color interpolated between ``low_color`` and
-    ``high_color`` using the double parameters ``x``, ``low``, and
-    ``high`` to calculate a fraction which is then passed to the
-    ``color(fraction, low_color, high_color)`` function shown below.
-    If ``x`` falls outside the range defined by ``low`` and ``high``
-    its value is truncated to fit within this range.
-
-.. function:: color(x, low_color, high_color) -> color
-    :noindex:
-
-    Returns a color interpolated between ``low_color`` and
-    ``high_color`` according to the double argument ``x`` between 0
-    and 1.  The parameter ``x`` is a double value between 0 and 1.
-    Values of ``x`` that fall outside the range [0, 1] will be
-    truncated to either a 0 or a 1 value.
-
-.. function:: render(x, color) -> varchar
-
-    Renders value ``x`` using the specific color using ANSI
-    color codes. ``x`` can be either a double, bigint, or varchar.
-
-.. function:: render(b) -> varchar
-    :noindex:
-
-    Accepts boolean value ``b`` and renders a green true or a red
-    false using ANSI color codes.
-
-.. function:: rgb(red, green, blue) -> color
-
-    Returns a color value capturing the RGB value of three
-    component color values supplied as int parameters ranging from 0
-    to 255: ``red``, ``green``, ``blue``.
diff --git a/docs/src/main/sphinx/functions/comparison.md b/docs/src/main/sphinx/functions/comparison.md
new file mode 100644
index 000000000000..bb137c267aac
--- /dev/null
+++ b/docs/src/main/sphinx/functions/comparison.md
@@ -0,0 +1,303 @@
+# Comparison functions and operators
+
+(comparison-operators)=
+
+## Comparison operators
+
+:::{list-table}
+:widths: 30, 70
+:header-rows: 1
+
+* - Operator
+  - Description
+* - `<`
+  - Less than
+* - `>`
+  - Greater than
+* - `<=`
+  - Less than or equal to
+* - `>=`
+  - Greater than or equal to
+* - `=`
+  - Equal
+* - `<>`
+  - Not equal
+* - `!=`
+  - Not equal (non-standard but popular syntax)
+:::
+
+(range-operator)=
+
+## Range operator: BETWEEN
+
+The `BETWEEN` operator tests if a value is within a specified range.
+It uses the syntax `value BETWEEN min AND max`:
+
+```
+SELECT 3 BETWEEN 2 AND 6;
+```
+
+The statement shown above is equivalent to the following statement:
+
+```
+SELECT 3 >= 2 AND 3 <= 6;
+```
+
+To test if a value does not fall within the specified range
+use `NOT BETWEEN`:
+
+```
+SELECT 3 NOT BETWEEN 2 AND 6;
+```
+
+The statement shown above is equivalent to the following statement:
+
+```
+SELECT 3 < 2 OR 3 > 6;
+```
+
+A `NULL` in a `BETWEEN` or `NOT BETWEEN` statement is evaluated
+using the standard `NULL` evaluation rules applied to the equivalent
+expression above:
+
+```
+SELECT NULL BETWEEN 2 AND 4; -- null
+
+SELECT 2 BETWEEN NULL AND 6; -- null
+
+SELECT 2 BETWEEN 3 AND NULL; -- false
+
+SELECT 8 BETWEEN NULL AND 6; -- false
+```
+
+The `BETWEEN` and `NOT BETWEEN` operators can also be used to
+evaluate any orderable type.  For example, a `VARCHAR`:
+
+```
+SELECT 'Paul' BETWEEN 'John' AND 'Ringo'; -- true
+```
+
+Note that the value, min, and max parameters to `BETWEEN` and `NOT
+BETWEEN` must be the same type.  For example, Trino will produce an
+error if you ask it if John is between 2.3 and 35.2.
+
+(is-null-operator)=
+
+## IS NULL and IS NOT NULL
+
+The `IS NULL` and `IS NOT NULL` operators test whether a value
+is null (undefined).  Both operators work for all data types.
+
+Using `NULL` with `IS NULL` evaluates to true:
+
+```
+select NULL IS NULL; -- true
+```
+
+But any other constant does not:
+
+```
+SELECT 3.0 IS NULL; -- false
+```
+
+(is-distinct-operator)=
+
+## IS DISTINCT FROM and IS NOT DISTINCT FROM
+
+In SQL a `NULL` value signifies an unknown value, so any comparison
+involving a `NULL` will produce `NULL`.  The  `IS DISTINCT FROM`
+and `IS NOT DISTINCT FROM` operators treat `NULL` as a known value
+and both operators guarantee either a true or false outcome even in
+the presence of `NULL` input:
+
+```
+SELECT NULL IS DISTINCT FROM NULL; -- false
+
+SELECT NULL IS NOT DISTINCT FROM NULL; -- true
+```
+
+In the example shown above, a `NULL` value is not considered
+distinct from `NULL`.  When you are comparing values which may
+include `NULL` use these operators to guarantee either a `TRUE` or
+`FALSE` result.
+
+The following truth table demonstrate the handling of `NULL` in
+`IS DISTINCT FROM` and `IS NOT DISTINCT FROM`:
+
+| a      | b      | a = b   | a \<> b | a DISTINCT b | a NOT DISTINCT b |
+| ------ | ------ | ------- | ------- | ------------ | ---------------- |
+| `1`    | `1`    | `TRUE`  | `FALSE` | `FALSE`      | `TRUE`           |
+| `1`    | `2`    | `FALSE` | `TRUE`  | `TRUE`       | `FALSE`          |
+| `1`    | `NULL` | `NULL`  | `NULL`  | `TRUE`       | `FALSE`          |
+| `NULL` | `NULL` | `NULL`  | `NULL`  | `FALSE`      | `TRUE`           |
+
+## GREATEST and LEAST
+
+These functions are not in the SQL standard, but are a common extension.
+Like most other functions in Trino, they return null if any argument is
+null. Note that in some other databases, such as PostgreSQL, they only
+return null if all arguments are null.
+
+The following types are supported:
+`DOUBLE`,
+`BIGINT`,
+`VARCHAR`,
+`TIMESTAMP`,
+`TIMESTAMP WITH TIME ZONE`,
+`DATE`
+
+:::{function} greatest(value1, value2, ..., valueN) -> [same as input]
+Returns the largest of the provided values.
+:::
+
+:::{function} least(value1, value2, ..., valueN) -> [same as input]
+Returns the smallest of the provided values.
+:::
+
+(quantified-comparison-predicates)=
+
+## Quantified comparison predicates: ALL, ANY and SOME
+
+The `ALL`, `ANY` and `SOME` quantifiers can be used together with comparison operators in the
+following way:
+
+```text
+expression operator quantifier ( subquery )
+```
+
+For example:
+
+```
+SELECT 'hello' = ANY (VALUES 'hello', 'world'); -- true
+
+SELECT 21 < ALL (VALUES 19, 20, 21); -- false
+
+SELECT 42 >= SOME (SELECT 41 UNION ALL SELECT 42 UNION ALL SELECT 43); -- true
+```
+
+Here are the meanings of some quantifier and comparison operator combinations:
+
+:::{list-table}
+:widths: 40, 60
+:header-rows: 1
+
+* - Expression
+  - Meaning
+* - `A = ALL (...)`
+  - Evaluates to `true` when `A` is equal to all values.
+* - `A <> ALL (...)`
+  - Evaluates to `true` when `A` doesn't match any value.
+* - `A < ALL (...)`
+  - Evaluates to `true` when `A` is smaller than the smallest value.
+* - `A = ANY (...)`
+  - Evaluates to `true` when `A` is equal to any of the values. This form
+    is equivalent to `A IN (...)`.
+* - `A <> ANY (...)`
+  - Evaluates to `true` when `A` doesn't match one or more values.
+* - `A < ANY (...)`
+  - Evaluates to `true` when `A` is smaller than the biggest value.
+:::
+
+`ANY` and `SOME` have the same meaning and can be used interchangeably.
+
+(like-operator)=
+
+## Pattern comparison: LIKE
+
+The `LIKE` operator can be used to compare values with a pattern:
+
+```
+... column [NOT] LIKE 'pattern' ESCAPE 'character';
+```
+
+Matching characters is case sensitive, and the pattern supports two symbols for
+matching:
+
+- `_` matches any single character
+- `%` matches zero or more characters
+
+Typically it is often used as a condition in `WHERE` statements. An example is
+a query to find all continents starting with `E`, which returns `Europe`:
+
+```
+SELECT * FROM (VALUES 'America', 'Asia', 'Africa', 'Europe', 'Australia', 'Antarctica') AS t (continent)
+WHERE continent LIKE 'E%';
+```
+
+You can negate the result by adding `NOT`, and get all other continents, all
+not starting with `E`:
+
+```
+SELECT * FROM (VALUES 'America', 'Asia', 'Africa', 'Europe', 'Australia', 'Antarctica') AS t (continent)
+WHERE continent NOT LIKE 'E%';
+```
+
+If you only have one specific character to match, you can use the `_` symbol
+for each character. The following query uses two underscores and produces only
+`Asia` as result:
+
+```
+SELECT * FROM (VALUES 'America', 'Asia', 'Africa', 'Europe', 'Australia', 'Antarctica') AS t (continent)
+WHERE continent LIKE 'A__A';
+```
+
+The wildcard characters `_` and `%` must be escaped to allow you to match
+them as literals. This can be achieved by specifying the `ESCAPE` character to
+use:
+
+```
+SELECT 'South_America' LIKE 'South\_America' ESCAPE '\';
+```
+
+The above query returns `true` since the escaped underscore symbol matches. If
+you need to match the used escape character as well, you can escape it.
+
+If you want to match for the chosen escape character, you simply escape itself.
+For example, you can use `\\` to match for `\`.
+
+(in-operator)=
+
+## Row comparison: IN
+
+The `IN` operator can be used in a `WHERE` clause to compare column values with 
+a list of values. The list of values can be supplied by a subquery or directly 
+as static values in an array:
+
+```sql
+... WHERE column [NOT] IN ('value1','value2');
+... WHERE column [NOT] IN ( subquery );
+```
+
+Use the optional `NOT` keyword to negate the condition.
+
+The following example shows a simple usage with a static array:
+
+```sql
+SELECT * FROM region WHERE name IN ('AMERICA', 'EUROPE');
+```
+
+The values in the clause are used for multiple comparisons that are combined as
+a logical `OR`. The preceding query is equivalent to the following query:
+
+```sql
+SELECT * FROM region WHERE name = 'AMERICA' OR name = 'EUROPE';
+```
+
+You can negate the comparisons by adding `NOT`, and get all other regions
+except the values in list:
+
+```sql
+SELECT * FROM region WHERE name NOT IN ('AMERICA', 'EUROPE');
+```
+
+When using a subquery to determine the values to use in the comparison, the
+subquery must return a single column and one or more rows.
+
+```sql
+SELECT name
+FROM nation
+WHERE regionkey IN (
+    SELECT starts_with(regionkey,"A") AS regionkey
+    FROM region
+);
+```
diff --git a/docs/src/main/sphinx/functions/comparison.rst b/docs/src/main/sphinx/functions/comparison.rst
deleted file mode 100644
index ebe334708284..000000000000
--- a/docs/src/main/sphinx/functions/comparison.rst
+++ /dev/null
@@ -1,216 +0,0 @@
-==================================
-Comparison functions and operators
-==================================
-
-.. _comparison_operators:
-
-Comparison operators
---------------------
-
-======== ===========
-Operator Description
-======== ===========
-``<``    Less than
-``>``    Greater than
-``<=``   Less than or equal to
-``>=``   Greater than or equal to
-``=``    Equal
-``<>``   Not equal
-``!=``   Not equal (non-standard but popular syntax)
-======== ===========
-
-.. _range_operator:
-
-Range operator: BETWEEN
------------------------
-
-The ``BETWEEN`` operator tests if a value is within a specified range.
-It uses the syntax ``value BETWEEN min AND max``::
-
-    SELECT 3 BETWEEN 2 AND 6;
-
-The statement shown above is equivalent to the following statement::
-
-    SELECT 3 >= 2 AND 3 <= 6;
-
-To test if a value does not fall within the specified range
-use ``NOT BETWEEN``::
-
-    SELECT 3 NOT BETWEEN 2 AND 6;
-
-The statement shown above is equivalent to the following statement::
-
-    SELECT 3 < 2 OR 3 > 6;
-
-A ``NULL`` in a ``BETWEEN`` or ``NOT BETWEEN`` statement is evaluated
-using the standard ``NULL`` evaluation rules applied to the equivalent
-expression above::
-
-    SELECT NULL BETWEEN 2 AND 4; -- null
-
-    SELECT 2 BETWEEN NULL AND 6; -- null
-
-    SELECT 2 BETWEEN 1 AND NULL; -- false
-
-    SELECT 8 BETWEEN NULL AND 6; -- false
-
-The ``BETWEEN`` and ``NOT BETWEEN`` operators can also be used to
-evaluate any orderable type.  For example, a ``VARCHAR``::
-
-    SELECT 'Paul' BETWEEN 'John' AND 'Ringo'; -- true
-
-Note that the value, min, and max parameters to ``BETWEEN`` and ``NOT
-BETWEEN`` must be the same type.  For example, Trino will produce an
-error if you ask it if John is between 2.3 and 35.2.
-
-.. _is_null_operator:
-
-IS NULL and IS NOT NULL
------------------------
-The ``IS NULL`` and ``IS NOT NULL`` operators test whether a value
-is null (undefined).  Both operators work for all data types.
-
-Using ``NULL`` with ``IS NULL`` evaluates to true::
-
-    select NULL IS NULL; -- true
-
-But any other constant does not::
-
-    SELECT 3.0 IS NULL; -- false
-
-.. _is_distinct_operator:
-
-IS DISTINCT FROM and IS NOT DISTINCT FROM
------------------------------------------
-
-In SQL a ``NULL`` value signifies an unknown value, so any comparison
-involving a ``NULL`` will produce ``NULL``.  The  ``IS DISTINCT FROM``
-and ``IS NOT DISTINCT FROM`` operators treat ``NULL`` as a known value
-and both operators guarantee either a true or false outcome even in
-the presence of ``NULL`` input::
-
-    SELECT NULL IS DISTINCT FROM NULL; -- false
-
-    SELECT NULL IS NOT DISTINCT FROM NULL; -- true
-
-In the example shown above, a ``NULL`` value is not considered
-distinct from ``NULL``.  When you are comparing values which may
-include ``NULL`` use these operators to guarantee either a ``TRUE`` or
-``FALSE`` result.
-
-The following truth table demonstrate the handling of ``NULL`` in
-``IS DISTINCT FROM`` and ``IS NOT DISTINCT FROM``:
-
-======== ======== ========= ========= ============ ================
-a        b        a = b     a <> b    a DISTINCT b a NOT DISTINCT b
-======== ======== ========= ========= ============ ================
-``1``    ``1``    ``TRUE``  ``FALSE`` ``FALSE``       ``TRUE``
-``1``    ``2``    ``FALSE`` ``TRUE``  ``TRUE``        ``FALSE``
-``1``    ``NULL`` ``NULL``  ``NULL``  ``TRUE``        ``FALSE``
-``NULL`` ``NULL`` ``NULL``  ``NULL``  ``FALSE``       ``TRUE``
-======== ======== ========= ========= ============ ================
-
-GREATEST and LEAST
-------------------
-
-These functions are not in the SQL standard, but are a common extension.
-Like most other functions in Trino, they return null if any argument is
-null. Note that in some other databases, such as PostgreSQL, they only
-return null if all arguments are null.
-
-The following types are supported:
-``DOUBLE``,
-``BIGINT``,
-``VARCHAR``,
-``TIMESTAMP``,
-``TIMESTAMP WITH TIME ZONE``,
-``DATE``
-
-.. function:: greatest(value1, value2, ..., valueN) -> [same as input]
-
-    Returns the largest of the provided values.
-
-.. function:: least(value1, value2, ..., valueN) -> [same as input]
-
-    Returns the smallest of the provided values.
-
-.. _quantified_comparison_predicates:
-
-Quantified comparison predicates: ALL, ANY and SOME
----------------------------------------------------
-
-The ``ALL``, ``ANY`` and ``SOME`` quantifiers can be used together with comparison operators in the
-following way:
-
-.. code-block:: text
-
-    expression operator quantifier ( subquery )
-
-For example::
-
-    SELECT 'hello' = ANY (VALUES 'hello', 'world'); -- true
-
-    SELECT 21 < ALL (VALUES 19, 20, 21); -- false
-
-    SELECT 42 >= SOME (SELECT 41 UNION ALL SELECT 42 UNION ALL SELECT 43); -- true
-
-Here are the meanings of some quantifier and comparison operator combinations:
-
-====================    ===========
-Expression              Meaning
-====================    ===========
-``A = ALL (...)``       Evaluates to ``true`` when ``A`` is equal to all values.
-``A <> ALL (...)``      Evaluates to ``true`` when ``A`` doesn't match any value.
-``A < ALL (...)``       Evaluates to ``true`` when ``A`` is smaller than the smallest value.
-``A = ANY (...)``       Evaluates to ``true`` when ``A`` is equal to any of the values. This form is equivalent to ``A IN (...)``.
-``A <> ANY (...)``      Evaluates to ``true`` when ``A`` doesn't match one or more values.
-``A < ANY (...)``       Evaluates to ``true`` when ``A`` is smaller than the biggest value.
-====================    ===========
-
-``ANY`` and ``SOME`` have the same meaning and can be used interchangeably.
-
-.. _like_operator:
-
-Pattern comparison: LIKE
-------------------------
-
-The ``LIKE`` operator can be used to compare values with a pattern::
-
-    ... column [NOT] LIKE 'pattern' ESCAPE 'character';
-
-Matching characters is case sensitive, and the pattern supports two symbols for
-matching:
-
-- ``_`` matches any single character
-- ``%`` matches zero or more characters
-
-Typically it is often used as a condition in ``WHERE`` statements. An example is
-a query to find all continents starting with ``E``, which returns ``Europe``::
-
-    SELECT * FROM (VALUES 'America', 'Asia', 'Africa', 'Europe', 'Australia', 'Antarctica') AS t (continent)
-    WHERE continent LIKE 'E%';
-
-You can negate the result by adding ``NOT``, and get all other continents, all
-not starting with ``E``::
-
-    SELECT * FROM (VALUES 'America', 'Asia', 'Africa', 'Europe', 'Australia', 'Antarctica') AS t (continent)
-    WHERE continent NOT LIKE 'E%';
-
-If you only have one specific character to match, you can use the ``_`` symbol
-for each character. The following query uses two underscores and produces only
-``Asia`` as result::
-
-    SELECT * FROM (VALUES 'America', 'Asia', 'Africa', 'Europe', 'Australia', 'Antarctica') AS t (continent)
-    WHERE continent LIKE 'A__A';
-
-The wildcard characters ``_`` and ``%`` must be escaped to allow you to match
-them as literals. This can be achieved by specifying the ``ESCAPE`` character to
-use::
-
-    SELECT 'South_America' LIKE 'South\_America' ESCAPE '\';
-
-The above query returns ``true`` since the escaped underscore symbol matches. If
-you need to match the used escape character as well, you can escape it.
-
-If you want to match for the chosen escape character, you simply escape itself.
-For example, you can use ``\\`` to match for ''\''.
diff --git a/docs/src/main/sphinx/functions/conditional.md b/docs/src/main/sphinx/functions/conditional.md
new file mode 100644
index 000000000000..3e07ed29347c
--- /dev/null
+++ b/docs/src/main/sphinx/functions/conditional.md
@@ -0,0 +1,201 @@
+# Conditional expressions
+
+(case-expression)=
+
+## CASE
+
+The standard SQL `CASE` expression has two forms.
+The "simple" form searches each `value` expression from left to right
+until it finds one that equals `expression`:
+
+```text
+CASE expression
+    WHEN value THEN result
+    [ WHEN ... ]
+    [ ELSE result ]
+END
+```
+
+The `result` for the matching `value` is returned.
+If no match is found, the `result` from the `ELSE` clause is
+returned if it exists, otherwise null is returned. Example:
+
+```
+SELECT a,
+       CASE a
+           WHEN 1 THEN 'one'
+           WHEN 2 THEN 'two'
+           ELSE 'many'
+       END
+```
+
+The "searched" form evaluates each boolean `condition` from left
+to right until one is true and returns the matching `result`:
+
+```text
+CASE
+    WHEN condition THEN result
+    [ WHEN ... ]
+    [ ELSE result ]
+END
+```
+
+If no conditions are true, the `result` from the `ELSE` clause is
+returned if it exists, otherwise null is returned. Example:
+
+```
+SELECT a, b,
+       CASE
+           WHEN a = 1 THEN 'aaa'
+           WHEN b = 2 THEN 'bbb'
+           ELSE 'ccc'
+       END
+```
+
+(if-function)=
+
+## IF
+
+The `IF` expression has two forms, one supplying only a
+`true_value` and the other supplying both a `true_value` and a
+`false_value`:
+
+:::{function} if(condition, true_value)
+Evaluates and returns `true_value` if `condition` is true,
+otherwise null is returned and `true_value` is not evaluated.
+:::
+
+:::{function} if(condition, true_value, false_value)
+:noindex: true
+
+Evaluates and returns `true_value` if `condition` is true,
+otherwise evaluates and returns `false_value`.
+:::
+
+The following `IF` and `CASE` expressions are equivalent:
+
+```sql
+SELECT
+  orderkey,
+  totalprice,
+  IF(totalprice >= 150000, 'High Value', 'Low Value')
+FROM tpch.sf1.orders;
+```
+
+```sql
+SELECT
+  orderkey,
+  totalprice,
+  CASE
+    WHEN totalprice >= 150000 THEN 'High Value'
+    ELSE 'Low Value'
+  END
+FROM tpch.sf1.orders;
+```
+
+(coalesce-function)=
+
+## COALESCE
+
+:::{function} coalesce(value1, value2[, ...])
+Returns the first non-null `value` in the argument list.
+Like a `CASE` expression, arguments are only evaluated if necessary.
+:::
+
+(nullif-function)=
+
+## NULLIF
+
+:::{function} nullif(value1, value2)
+Returns null if `value1` equals `value2`, otherwise returns `value1`.
+:::
+
+(try-function)=
+
+## TRY
+
+:::{function} try(expression)
+Evaluate an expression and handle certain types of errors by returning
+`NULL`.
+:::
+
+In cases where it is preferable that queries produce `NULL` or default values
+instead of failing when corrupt or invalid data is encountered, the `TRY`
+function may be useful. To specify default values, the `TRY` function can be
+used in conjunction with the `COALESCE` function.
+
+The following errors are handled by `TRY`:
+
+- Division by zero
+- Invalid cast or function argument
+- Numeric value out of range
+
+### Examples
+
+Source table with some invalid data:
+
+```sql
+SELECT * FROM shipping;
+```
+
+```text
+ origin_state | origin_zip | packages | total_cost
+--------------+------------+----------+------------
+ California   |      94131 |       25 |        100
+ California   |      P332a |        5 |         72
+ California   |      94025 |        0 |        155
+ New Jersey   |      08544 |      225 |        490
+(4 rows)
+```
+
+Query failure without `TRY`:
+
+```sql
+SELECT CAST(origin_zip AS BIGINT) FROM shipping;
+```
+
+```text
+Query failed: Cannot cast 'P332a' to BIGINT
+```
+
+`NULL` values with `TRY`:
+
+```sql
+SELECT TRY(CAST(origin_zip AS BIGINT)) FROM shipping;
+```
+
+```text
+ origin_zip
+------------
+      94131
+ NULL
+      94025
+      08544
+(4 rows)
+```
+
+Query failure without `TRY`:
+
+```sql
+SELECT total_cost / packages AS per_package FROM shipping;
+```
+
+```text
+Query failed: Division by zero
+```
+
+Default values with `TRY` and `COALESCE`:
+
+```sql
+SELECT COALESCE(TRY(total_cost / packages), 0) AS per_package FROM shipping;
+```
+
+```text
+ per_package
+-------------
+          4
+         14
+          0
+         19
+(4 rows)
+```
diff --git a/docs/src/main/sphinx/functions/conditional.rst b/docs/src/main/sphinx/functions/conditional.rst
deleted file mode 100644
index be57c60e0007..000000000000
--- a/docs/src/main/sphinx/functions/conditional.rst
+++ /dev/null
@@ -1,205 +0,0 @@
-=======================
-Conditional expressions
-=======================
-
-.. _case_expression:
-
-CASE
-----
-
-The standard SQL ``CASE`` expression has two forms.
-The "simple" form searches each ``value`` expression from left to right
-until it finds one that equals ``expression``:
-
-.. code-block:: text
-
-    CASE expression
-        WHEN value THEN result
-        [ WHEN ... ]
-        [ ELSE result ]
-    END
-
-The ``result`` for the matching ``value`` is returned.
-If no match is found, the ``result`` from the ``ELSE`` clause is
-returned if it exists, otherwise null is returned. Example::
-
-    SELECT a,
-           CASE a
-               WHEN 1 THEN 'one'
-               WHEN 2 THEN 'two'
-               ELSE 'many'
-           END
-
-The "searched" form evaluates each boolean ``condition`` from left
-to right until one is true and returns the matching ``result``:
-
-.. code-block:: text
-
-    CASE
-        WHEN condition THEN result
-        [ WHEN ... ]
-        [ ELSE result ]
-    END
-
-If no conditions are true, the ``result`` from the ``ELSE`` clause is
-returned if it exists, otherwise null is returned. Example::
-
-    SELECT a, b,
-           CASE
-               WHEN a = 1 THEN 'aaa'
-               WHEN b = 2 THEN 'bbb'
-               ELSE 'ccc'
-           END
-
-.. _if_function:
-
-IF
---
-
-The ``IF`` expression has two forms, one supplying only a
-``true_value`` and the other supplying both a ``true_value`` and a
-``false_value``:
-
-.. function:: if(condition, true_value)
-
-    Evaluates and returns ``true_value`` if ``condition`` is true,
-    otherwise null is returned and ``true_value`` is not evaluated.
-
-.. function:: if(condition, true_value, false_value)
-    :noindex:
-
-    Evaluates and returns ``true_value`` if ``condition`` is true,
-    otherwise evaluates and returns ``false_value``.
-
-The following ``IF`` and ``CASE`` expressions are equivalent:
-
-.. code-block:: sql
-
-  SELECT
-    orderkey,
-    totalprice,
-    IF(totalprice >= 150000, 'High Value', 'Low Value')
-  FROM tpch.sf1.orders;
-
-.. code-block:: sql
-
-  SELECT
-    orderkey,
-    totalprice,
-    CASE
-      WHEN totalprice >= 150000 THEN 'High Value'
-      ELSE 'Low Value'
-    END
-  FROM tpch.sf1.orders;
-
-.. _coalesce_function:
-
-COALESCE
---------
-
-
-.. function:: coalesce(value1, value2[, ...])
-
-    Returns the first non-null ``value`` in the argument list.
-    Like a ``CASE`` expression, arguments are only evaluated if necessary.
-
-.. _nullif_function:
-
-NULLIF
-------
-
-.. function:: nullif(value1, value2)
-
-    Returns null if ``value1`` equals ``value2``, otherwise returns ``value1``.
-
-.. _try_function:
-
-TRY
----
-
-.. function:: try(expression)
-
-    Evaluate an expression and handle certain types of errors by returning
-    ``NULL``.
-
-In cases where it is preferable that queries produce ``NULL`` or default values
-instead of failing when corrupt or invalid data is encountered, the ``TRY``
-function may be useful. To specify default values, the ``TRY`` function can be
-used in conjunction with the ``COALESCE`` function.
-
-The following errors are handled by ``TRY``:
-
-* Division by zero
-* Invalid cast or function argument
-* Numeric value out of range
-
-Examples
-~~~~~~~~
-
-Source table with some invalid data:
-
-.. code-block:: sql
-
-    SELECT * FROM shipping;
-
-.. code-block:: text
-
-     origin_state | origin_zip | packages | total_cost
-    --------------+------------+----------+------------
-     California   |      94131 |       25 |        100
-     California   |      P332a |        5 |         72
-     California   |      94025 |        0 |        155
-     New Jersey   |      08544 |      225 |        490
-    (4 rows)
-
-Query failure without ``TRY``:
-
-.. code-block:: sql
-
-    SELECT CAST(origin_zip AS BIGINT) FROM shipping;
-
-.. code-block:: text
-
-    Query failed: Cannot cast 'P332a' to BIGINT
-
-``NULL`` values with ``TRY``:
-
-.. code-block:: sql
-
-    SELECT TRY(CAST(origin_zip AS BIGINT)) FROM shipping;
-
-.. code-block:: text
-
-     origin_zip
-    ------------
-          94131
-     NULL
-          94025
-          08544
-    (4 rows)
-
-Query failure without ``TRY``:
-
-.. code-block:: sql
-
-    SELECT total_cost / packages AS per_package FROM shipping;
-
-.. code-block:: text
-
-    Query failed: Division by zero
-
-Default values with ``TRY`` and ``COALESCE``:
-
-.. code-block:: sql
-
-    SELECT COALESCE(TRY(total_cost / packages), 0) AS per_package FROM shipping;
-
-.. code-block:: text
-
-     per_package
-    -------------
-              4
-             14
-              0
-             19
-    (4 rows)
diff --git a/docs/src/main/sphinx/functions/conversion.md b/docs/src/main/sphinx/functions/conversion.md
new file mode 100644
index 000000000000..7de546ab7ed8
--- /dev/null
+++ b/docs/src/main/sphinx/functions/conversion.md
@@ -0,0 +1,123 @@
+# Conversion functions
+
+Trino will implicitly convert numeric and character values to the
+correct type if such a conversion is possible. Trino will not convert
+between character and numeric types. For example, a query that expects
+a varchar will not automatically convert a bigint value to an
+equivalent varchar.
+
+When necessary, values can be explicitly cast to a particular type.
+
+## Conversion functions
+
+:::{function} cast(value AS type) -> type
+Explicitly cast a value as a type. This can be used to cast a
+varchar to a numeric value type and vice versa.
+:::
+
+:::{function} try_cast(value AS type) -> type
+Like {func}`cast`, but returns null if the cast fails.
+:::
+
+## Formatting
+
+:::{function} format(format, args...) -> varchar
+Returns a formatted string using the specified [format string](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Formatter.html#syntax)
+and arguments:
+
+```
+SELECT format('%s%%', 123);
+-- '123%'
+
+SELECT format('%.5f', pi());
+-- '3.14159'
+
+SELECT format('%03d', 8);
+-- '008'
+
+SELECT format('%,.2f', 1234567.89);
+-- '1,234,567.89'
+
+SELECT format('%-7s,%7s', 'hello', 'world');
+-- 'hello  ,  world'
+
+SELECT format('%2$s %3$s %1$s', 'a', 'b', 'c');
+-- 'b c a'
+
+SELECT format('%1$tA, %1$tB %1$te, %1$tY', date '2006-07-04');
+-- 'Tuesday, July 4, 2006'
+```
+:::
+
+:::{function} format_number(number) -> varchar
+Returns a formatted string using a unit symbol:
+
+```
+SELECT format_number(123456); -- '123K'
+SELECT format_number(1000000); -- '1M'
+```
+:::
+
+## Data size
+
+The `parse_data_size` function supports the following units:
+
+:::{list-table}
+:widths: 30, 40, 30
+:header-rows: 1
+
+* - Unit
+  - Description
+  - Value
+* - ``B``
+  - Bytes
+  - 1
+* - ``kB``
+  - Kilobytes
+  - 1024
+* - ``MB``
+  - Megabytes
+  - 1024{sup}`2`
+* - ``GB``
+  - Gigabytes
+  - 1024{sup}`3`
+* - ``TB``
+  - Terabytes
+  - 1024{sup}`4`
+* - ``PB``
+  - Petabytes
+  - 1024{sup}`5`
+* - ``EB``
+  - Exabytes
+  - 1024{sup}`6`
+* - ``ZB``
+  - Zettabytes
+  - 1024{sup}`7`
+* - ``YB``
+  - Yottabytes
+  - 1024{sup}`8`
+:::
+
+:::{function} parse_data_size(string) -> decimal(38)
+Parses `string` of format `value unit` into a number, where
+`value` is the fractional number of `unit` values:
+
+```
+SELECT parse_data_size('1B'); -- 1
+SELECT parse_data_size('1kB'); -- 1024
+SELECT parse_data_size('1MB'); -- 1048576
+SELECT parse_data_size('2.3MB'); -- 2411724
+```
+:::
+
+## Miscellaneous
+
+:::{function} typeof(expr) -> varchar
+Returns the name of the type of the provided expression:
+
+```
+SELECT typeof(123); -- integer
+SELECT typeof('cat'); -- varchar(3)
+SELECT typeof(cos(2) + 1.5); -- double
+```
+:::
diff --git a/docs/src/main/sphinx/functions/conversion.rst b/docs/src/main/sphinx/functions/conversion.rst
deleted file mode 100644
index a5a495ed7a14..000000000000
--- a/docs/src/main/sphinx/functions/conversion.rst
+++ /dev/null
@@ -1,100 +0,0 @@
-====================
-Conversion functions
-====================
-
-Trino will implicitly convert numeric and character values to the
-correct type if such a conversion is possible. Trino will not convert
-between character and numeric types. For example, a query that expects
-a varchar will not automatically convert a bigint value to an
-equivalent varchar.
-
-When necessary, values can be explicitly cast to a particular type.
-
-Conversion functions
---------------------
-
-.. function:: cast(value AS type) -> type
-
-    Explicitly cast a value as a type. This can be used to cast a
-    varchar to a numeric value type and vice versa.
-
-.. function:: try_cast(value AS type) -> type
-
-    Like :func:`cast`, but returns null if the cast fails.
-
-Formatting
-----------
-
-.. function:: format(format, args...) -> varchar
-
-    Returns a formatted string using the specified `format string
-    <https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Formatter.html#syntax>`_
-    and arguments::
-
-        SELECT format('%s%%', 123);
-        -- '123%'
-
-        SELECT format('%.5f', pi());
-        -- '3.14159'
-
-        SELECT format('%03d', 8);
-        -- '008'
-
-        SELECT format('%,.2f', 1234567.89);
-        -- '1,234,567.89'
-
-        SELECT format('%-7s,%7s', 'hello', 'world');
-        -- 'hello  ,  world'
-
-        SELECT format('%2$s %3$s %1$s', 'a', 'b', 'c');
-        -- 'b c a'
-
-        SELECT format('%1$tA, %1$tB %1$te, %1$tY', date '2006-07-04');
-        -- 'Tuesday, July 4, 2006'
-
-.. function:: format_number(number) -> varchar
-
-    Returns a formatted string using a unit symbol::
-
-        SELECT format_number(123456); -- '123K'
-        SELECT format_number(1000000); -- '1M'
-
-Data size
----------
-
-The ``parse_data_size`` function supports the following units:
-
-======= ============= ==============
-Unit    Description   Value
-======= ============= ==============
-``B``   Bytes         1
-``kB``  Kilobytes     1024
-``MB``  Megabytes     1024\ :sup:`2`
-``GB``  Gigabytes     1024\ :sup:`3`
-``TB``  Terabytes     1024\ :sup:`4`
-``PB``  Petabytes     1024\ :sup:`5`
-``EB``  Exabytes      1024\ :sup:`6`
-``ZB``  Zettabytes    1024\ :sup:`7`
-``YB``  Yottabytes    1024\ :sup:`8`
-======= ============= ==============
-
-.. function:: parse_data_size(string) -> decimal(38)
-
-    Parses ``string`` of format ``value unit`` into a number, where
-    ``value`` is the fractional number of ``unit`` values::
-
-        SELECT parse_data_size('1B'); -- 1
-        SELECT parse_data_size('1kB'); -- 1024
-        SELECT parse_data_size('1MB'); -- 1048576
-        SELECT parse_data_size('2.3MB'); -- 2411724
-
-Miscellaneous
--------------
-
-.. function:: typeof(expr) -> varchar
-
-    Returns the name of the type of the provided expression::
-
-        SELECT typeof(123); -- integer
-        SELECT typeof('cat'); -- varchar(3)
-        SELECT typeof(cos(2) + 1.5); -- double
diff --git a/docs/src/main/sphinx/functions/datetime.md b/docs/src/main/sphinx/functions/datetime.md
new file mode 100644
index 000000000000..d599874e8f56
--- /dev/null
+++ b/docs/src/main/sphinx/functions/datetime.md
@@ -0,0 +1,575 @@
+# Date and time functions and operators
+
+These functions and operators operate on {ref}`date and time data types <date-time-data-types>`.
+
+## Date and time operators
+
+| Operator | Example                                             | Result                    |
+| -------- | --------------------------------------------------- | ------------------------- |
+| `+`      | `date '2012-08-08' + interval '2' day`              | `2012-08-10`              |
+| `+`      | `time '01:00' + interval '3' hour`                  | `04:00:00.000`            |
+| `+`      | `timestamp '2012-08-08 01:00' + interval '29' hour` | `2012-08-09 06:00:00.000` |
+| `+`      | `timestamp '2012-10-31 01:00' + interval '1' month` | `2012-11-30 01:00:00.000` |
+| `+`      | `interval '2' day + interval '3' hour`              | `2 03:00:00.000`          |
+| `+`      | `interval '3' year + interval '5' month`            | `3-5`                     |
+| `-`      | `date '2012-08-08' - interval '2' day`              | `2012-08-06`              |
+| `-`      | `time '01:00' - interval '3' hour`                  | `22:00:00.000`            |
+| `-`      | `timestamp '2012-08-08 01:00' - interval '29' hour` | `2012-08-06 20:00:00.000` |
+| `-`      | `timestamp '2012-10-31 01:00' - interval '1' month` | `2012-09-30 01:00:00.000` |
+| `-`      | `interval '2' day - interval '3' hour`              | `1 21:00:00.000`          |
+| `-`      | `interval '3' year - interval '5' month`            | `2-7`                     |
+
+(at-time-zone-operator)=
+
+## Time zone conversion
+
+The `AT TIME ZONE` operator sets the time zone of a timestamp:
+
+```
+SELECT timestamp '2012-10-31 01:00 UTC';
+-- 2012-10-31 01:00:00.000 UTC
+
+SELECT timestamp '2012-10-31 01:00 UTC' AT TIME ZONE 'America/Los_Angeles';
+-- 2012-10-30 18:00:00.000 America/Los_Angeles
+```
+
+## Date and time functions
+
+:::{data} current_date
+Returns the current date as of the start of the query.
+:::
+
+:::{data} current_time
+Returns the current time with time zone as of the start of the query.
+:::
+
+:::{data} current_timestamp
+Returns the current timestamp with time zone as of the start of the query,
+with `3` digits of subsecond precision,
+:::
+
+:::{data} current_timestamp(p)
+:noindex: true
+
+Returns the current {ref}`timestamp with time zone
+<timestamp-with-time-zone-data-type>` as of the start of the query, with
+`p` digits of subsecond precision:
+
+```
+SELECT current_timestamp(6);
+-- 2020-06-24 08:25:31.759993 America/Los_Angeles
+```
+:::
+
+:::{function} current_timezone() -> varchar
+Returns the current time zone in the format defined by IANA
+(e.g., `America/Los_Angeles`) or as fixed offset from UTC (e.g., `+08:35`)
+:::
+
+:::{function} date(x) -> date
+This is an alias for `CAST(x AS date)`.
+:::
+
+:::{function} last_day_of_month(x) -> date
+Returns the last day of the month.
+:::
+
+:::{function} from_iso8601_timestamp(string) -> timestamp(3) with time zone
+Parses the ISO 8601 formatted date `string`, optionally with time and time
+zone, into a `timestamp(3) with time zone`. The time defaults to
+`00:00:00.000`, and the time zone defaults to the session time zone:
+
+```
+SELECT from_iso8601_timestamp('2020-05-11');
+-- 2020-05-11 00:00:00.000 America/Vancouver
+
+SELECT from_iso8601_timestamp('2020-05-11T11:15:05');
+-- 2020-05-11 11:15:05.000 America/Vancouver
+
+SELECT from_iso8601_timestamp('2020-05-11T11:15:05.055+01:00');
+-- 2020-05-11 11:15:05.055 +01:00
+```
+:::
+
+:::{function} from_iso8601_timestamp_nanos(string) -> timestamp(9) with time zone
+Parses the ISO 8601 formatted date and time `string`. The time zone
+defaults to the session time zone:
+
+```
+SELECT from_iso8601_timestamp_nanos('2020-05-11T11:15:05');
+-- 2020-05-11 11:15:05.000000000 America/Vancouver
+
+SELECT from_iso8601_timestamp_nanos('2020-05-11T11:15:05.123456789+01:00');
+-- 2020-05-11 11:15:05.123456789 +01:00
+```
+:::
+
+:::{function} from_iso8601_date(string) -> date
+Parses the ISO 8601 formatted date `string` into a `date`. The date can
+be a calendar date, a week date using ISO week numbering, or year and day
+of year combined:
+
+```
+SELECT from_iso8601_date('2020-05-11');
+-- 2020-05-11
+
+SELECT from_iso8601_date('2020-W10');
+-- 2020-03-02
+
+SELECT from_iso8601_date('2020-123');
+-- 2020-05-02
+```
+:::
+
+:::{function} at_timezone(timestamp(p), zone) -> timestamp(p) with time zone
+Returns the timestamp specified in `timestamp` with the time zone
+converted from the session time zone to the time zone specified in `zone`
+with precision `p`. In the following example, the session time zone is set
+to `America/New_York`, which is three hours ahead of
+`America/Los_Angeles`:
+
+```
+SELECT current_timezone()
+-- America/New_York
+
+SELECT at_timezone(TIMESTAMP '2022-11-01 09:08:07.321', 'America/Los_Angeles')
+-- 2022-11-01 06:08:07.321 America/Los_Angeles
+```
+:::
+
+:::{function} with_timezone(timestamp(p), zone) -> timestamp(p) with time zone
+Returns the timestamp specified in `timestamp` with the time zone
+specified in `zone` with precision `p`:
+
+```
+SELECT current_timezone()
+-- America/New_York
+
+SELECT with_timezone(TIMESTAMP '2022-11-01 09:08:07.321', 'America/Los_Angeles')
+-- 2022-11-01 09:08:07.321 America/Los_Angeles
+```
+:::
+
+:::{function} from_unixtime(unixtime) -> timestamp(3) with time zone
+Returns the UNIX timestamp `unixtime` as a timestamp with time zone. `unixtime` is the
+number of seconds since `1970-01-01 00:00:00 UTC`.
+:::
+
+:::{function} from_unixtime(unixtime, zone) -> timestamp(3) with time zone
+:noindex: true
+
+Returns the UNIX timestamp `unixtime` as a timestamp with time zone
+using `zone` for the time zone. `unixtime` is the number of seconds
+since `1970-01-01 00:00:00 UTC`.
+:::
+
+:::{function} from_unixtime(unixtime, hours, minutes) -> timestamp(3) with time zone
+:noindex: true
+
+Returns the UNIX timestamp `unixtime` as a timestamp with time zone
+using `hours` and `minutes` for the time zone offset. `unixtime` is
+the number of seconds since `1970-01-01 00:00:00` in `double` data type.
+:::
+
+:::{function} from_unixtime_nanos(unixtime) -> timestamp(9) with time zone
+Returns the UNIX timestamp `unixtime` as a timestamp with time zone. `unixtime` is the
+number of nanoseconds since `1970-01-01 00:00:00.000000000 UTC`:
+
+```
+SELECT from_unixtime_nanos(100);
+-- 1970-01-01 00:00:00.000000100 UTC
+
+SELECT from_unixtime_nanos(DECIMAL '1234');
+-- 1970-01-01 00:00:00.000001234 UTC
+
+SELECT from_unixtime_nanos(DECIMAL '1234.499');
+-- 1970-01-01 00:00:00.000001234 UTC
+
+SELECT from_unixtime_nanos(DECIMAL '-1234');
+-- 1969-12-31 23:59:59.999998766 UTC
+```
+:::
+
+:::{data} localtime
+Returns the current time as of the start of the query.
+:::
+
+:::{data} localtimestamp
+Returns the current timestamp as of the start of the query, with `3`
+digits of subsecond precision.
+:::
+
+:::{data} localtimestamp(p)
+:noindex: true
+
+Returns the current {ref}`timestamp <timestamp-data-type>` as of the start
+of the query, with `p` digits of subsecond precision:
+
+```
+SELECT localtimestamp(6);
+-- 2020-06-10 15:55:23.383628
+```
+:::
+
+:::{function} now() -> timestamp(3) with time zone
+This is an alias for `current_timestamp`.
+:::
+
+:::{function} to_iso8601(x) -> varchar
+Formats `x` as an ISO 8601 string. `x` can be date, timestamp, or
+timestamp with time zone.
+:::
+
+:::{function} to_milliseconds(interval) -> bigint
+Returns the day-to-second `interval` as milliseconds.
+:::
+
+:::{function} to_unixtime(timestamp) -> double
+Returns `timestamp` as a UNIX timestamp.
+:::
+
+:::{note}
+The following SQL-standard functions do not use parenthesis:
+
+- `current_date`
+- `current_time`
+- `current_timestamp`
+- `localtime`
+- `localtimestamp`
+:::
+
+## Truncation function
+
+The `date_trunc` function supports the following units:
+
+| Unit      | Example Truncated Value   |
+| --------- | ------------------------- |
+| `second`  | `2001-08-22 03:04:05.000` |
+| `minute`  | `2001-08-22 03:04:00.000` |
+| `hour`    | `2001-08-22 03:00:00.000` |
+| `day`     | `2001-08-22 00:00:00.000` |
+| `week`    | `2001-08-20 00:00:00.000` |
+| `month`   | `2001-08-01 00:00:00.000` |
+| `quarter` | `2001-07-01 00:00:00.000` |
+| `year`    | `2001-01-01 00:00:00.000` |
+
+The above examples use the timestamp `2001-08-22 03:04:05.321` as the input.
+
+:::{function} date_trunc(unit, x) -> [same as input]
+Returns `x` truncated to `unit`:
+
+```
+SELECT date_trunc('day' , TIMESTAMP '2022-10-20 05:10:00');
+-- 2022-10-20 00:00:00.000
+
+SELECT date_trunc('month' , TIMESTAMP '2022-10-20 05:10:00');
+-- 2022-10-01 00:00:00.000
+
+SELECT date_trunc('year', TIMESTAMP '2022-10-20 05:10:00');
+-- 2022-01-01 00:00:00.000
+```
+:::
+
+(datetime-interval-functions)=
+
+## Interval functions
+
+The functions in this section support the following interval units:
+
+| Unit          | Description        |
+| ------------- | ------------------ |
+| `millisecond` | Milliseconds       |
+| `second`      | Seconds            |
+| `minute`      | Minutes            |
+| `hour`        | Hours              |
+| `day`         | Days               |
+| `week`        | Weeks              |
+| `month`       | Months             |
+| `quarter`     | Quarters of a year |
+| `year`        | Years              |
+
+:::{function} date_add(unit, value, timestamp) -> [same as input]
+Adds an interval `value` of type `unit` to `timestamp`.
+Subtraction can be performed by using a negative value:
+
+```
+SELECT date_add('second', 86, TIMESTAMP '2020-03-01 00:00:00');
+-- 2020-03-01 00:01:26.000
+
+SELECT date_add('hour', 9, TIMESTAMP '2020-03-01 00:00:00');
+-- 2020-03-01 09:00:00.000
+
+SELECT date_add('day', -1, TIMESTAMP '2020-03-01 00:00:00 UTC');
+-- 2020-02-29 00:00:00.000 UTC
+```
+:::
+
+:::{function} date_diff(unit, timestamp1, timestamp2) -> bigint
+Returns `timestamp2 - timestamp1` expressed in terms of `unit`:
+
+```
+SELECT date_diff('second', TIMESTAMP '2020-03-01 00:00:00', TIMESTAMP '2020-03-02 00:00:00');
+-- 86400
+
+SELECT date_diff('hour', TIMESTAMP '2020-03-01 00:00:00 UTC', TIMESTAMP '2020-03-02 00:00:00 UTC');
+-- 24
+
+SELECT date_diff('day', DATE '2020-03-01', DATE '2020-03-02');
+-- 1
+
+SELECT date_diff('second', TIMESTAMP '2020-06-01 12:30:45.000000000', TIMESTAMP '2020-06-02 12:30:45.123456789');
+-- 86400
+
+SELECT date_diff('millisecond', TIMESTAMP '2020-06-01 12:30:45.000000000', TIMESTAMP '2020-06-02 12:30:45.123456789');
+-- 86400123
+```
+:::
+
+## Duration function
+
+The `parse_duration` function supports the following units:
+
+| Unit | Description  |
+| ---- | ------------ |
+| `ns` | Nanoseconds  |
+| `us` | Microseconds |
+| `ms` | Milliseconds |
+| `s`  | Seconds      |
+| `m`  | Minutes      |
+| `h`  | Hours        |
+| `d`  | Days         |
+
+:::{function} parse_duration(string) -> interval
+Parses `string` of format `value unit` into an interval, where
+`value` is fractional number of `unit` values:
+
+```
+SELECT parse_duration('42.8ms');
+-- 0 00:00:00.043
+
+SELECT parse_duration('3.81 d');
+-- 3 19:26:24.000
+
+SELECT parse_duration('5m');
+-- 0 00:05:00.000
+```
+:::
+
+:::{function} human_readable_seconds(double) -> varchar
+Formats the double value of `seconds` into a human readable string containing
+`weeks`, `days`, `hours`, `minutes`, and `seconds`:
+
+```
+SELECT human_readable_seconds(96);
+-- 1 minute, 36 seconds
+
+SELECT human_readable_seconds(3762);
+-- 1 hour, 2 minutes, 42 seconds
+
+SELECT human_readable_seconds(56363463);
+-- 93 weeks, 1 day, 8 hours, 31 minutes, 3 seconds
+```
+:::
+
+## MySQL date functions
+
+The functions in this section use a format string that is compatible with
+the MySQL `date_parse` and `str_to_date` functions. The following table,
+based on the MySQL manual, describes the format specifiers:
+
+| Specifier | Description                                                                                                         |
+| --------- | ------------------------------------------------------------------------------------------------------------------- |
+| `%a`      | Abbreviated weekday name (`Sun` .. `Sat`)                                                                           |
+| `%b`      | Abbreviated month name (`Jan` .. `Dec`)                                                                             |
+| `%c`      | Month, numeric (`1` .. `12`), this specifier does not support `0` as a month.                                                                                  |
+| `%D`      | Day of the month with English suffix (`0th`, `1st`, `2nd`, `3rd`, ...)                                              |
+| `%d`      | Day of the month, numeric (`01` .. `31`), this specifier does not support `0` as a month or day.                                                                       |
+| `%e`      | Day of the month, numeric (`1` .. `31`), this specifier does not support `0` as a day.                                                                        |
+| `%f`      | Fraction of second (6 digits for printing: `000000` .. `999000`; 1 - 9 digits for parsing: `0` .. `999999999`), timestamp is truncated to milliseconds. |
+| `%H`      | Hour (`00` .. `23`)                                                                                                 |
+| `%h`      | Hour (`01` .. `12`)                                                                                                 |
+| `%I`      | Hour (`01` .. `12`)                                                                                                 |
+| `%i`      | Minutes, numeric (`00` .. `59`)                                                                                     |
+| `%j`      | Day of year (`001` .. `366`)                                                                                        |
+| `%k`      | Hour (`0` .. `23`)                                                                                                  |
+| `%l`      | Hour (`1` .. `12`)                                                                                                  |
+| `%M`      | Month name (`January` .. `December`)                                                                                |
+| `%m`      | Month, numeric (`01` .. `12`), this specifier does not support `0` as a month.                                                                                 |
+| `%p`      | `AM` or `PM`                                                                                                        |
+| `%r`      | Time of day, 12-hour (equivalent to `%h:%i:%s %p`)                                                                  |
+| `%S`      | Seconds (`00` .. `59`)                                                                                              |
+| `%s`      | Seconds (`00` .. `59`)                                                                                              |
+| `%T`      | Time of day, 24-hour (equivalent to `%H:%i:%s`)                                                                     |
+| `%U`      | Week (`00` .. `53`), where Sunday is the first day of the week                                                      |
+| `%u`      | Week (`00` .. `53`), where Monday is the first day of the week                                                      |
+| `%V`      | Week (`01` .. `53`), where Sunday is the first day of the week; used with `%X`                                      |
+| `%v`      | Week (`01` .. `53`), where Monday is the first day of the week; used with `%x`                                      |
+| `%W`      | Weekday name (`Sunday` .. `Saturday`)                                                                               |
+| `%w`      | Day of the week (`0` .. `6`), where Sunday is the first day of the week, this specifier is not supported,consider using {func}`day_of_week` (it uses `1-7` instead of `0-6`). |
+| `%X`      | Year for the week where Sunday is the first day of the week, numeric, four digits; used with `%V`                   |
+| `%x`      | Year for the week, where Monday is the first day of the week, numeric, four digits; used with `%v`                  |
+| `%Y`      | Year, numeric, four digits                                                                                          |
+| `%y`      | Year, numeric (two digits), when parsing, two-digit year format assumes range `1970` .. `2069`, so "70" will result in year `1970` but "69" will produce `2069`. |
+| `%%`      | A literal `%` character                                                                                             |
+| `%x`      | `x`, for any `x` not listed above                                                                                   |
+
+:::{warning}
+The following specifiers are not currently supported: `%D %U %u %V %w %X`
+:::
+
+:::{function} date_format(timestamp, format) -> varchar
+Formats `timestamp` as a string using `format`:
+
+```
+SELECT date_format(TIMESTAMP '2022-10-20 05:10:00', '%m-%d-%Y %H');
+-- 10-20-2022 05
+```
+:::
+
+:::{function} date_parse(string, format) -> timestamp(3)
+Parses `string` into a timestamp using `format`:
+
+```
+SELECT date_parse('2022/10/20/05', '%Y/%m/%d/%H');
+-- 2022-10-20 05:00:00.000
+```
+:::
+
+## Java date functions
+
+The functions in this section use a format string that is compatible with
+JodaTime's [DateTimeFormat] pattern format.
+
+:::{function} format_datetime(timestamp, format) -> varchar
+Formats `timestamp` as a string using `format`.
+:::
+
+:::{function} parse_datetime(string, format) -> timestamp with time zone
+Parses `string` into a timestamp with time zone using `format`.
+:::
+
+## Extraction function
+
+The `extract` function supports the following fields:
+
+| Field             | Description             |
+| ----------------- | ----------------------- |
+| `YEAR`            | {func}`year`            |
+| `QUARTER`         | {func}`quarter`         |
+| `MONTH`           | {func}`month`           |
+| `WEEK`            | {func}`week`            |
+| `DAY`             | {func}`day`             |
+| `DAY_OF_MONTH`    | {func}`day`             |
+| `DAY_OF_WEEK`     | {func}`day_of_week`     |
+| `DOW`             | {func}`day_of_week`     |
+| `DAY_OF_YEAR`     | {func}`day_of_year`     |
+| `DOY`             | {func}`day_of_year`     |
+| `YEAR_OF_WEEK`    | {func}`year_of_week`    |
+| `YOW`             | {func}`year_of_week`    |
+| `HOUR`            | {func}`hour`            |
+| `MINUTE`          | {func}`minute`          |
+| `SECOND`          | {func}`second`          |
+| `TIMEZONE_HOUR`   | {func}`timezone_hour`   |
+| `TIMEZONE_MINUTE` | {func}`timezone_minute` |
+
+The types supported by the `extract` function vary depending on the
+field to be extracted. Most fields support all date and time types.
+
+::::{function} extract(field FROM x) -> bigint
+Returns `field` from `x`:
+
+```
+SELECT extract(YEAR FROM TIMESTAMP '2022-10-20 05:10:00');
+-- 2022
+```
+
+:::{note}
+This SQL-standard function uses special syntax for specifying the arguments.
+:::
+::::
+
+## Convenience extraction functions
+
+:::{function} day(x) -> bigint
+Returns the day of the month from `x`.
+:::
+
+:::{function} day_of_month(x) -> bigint
+This is an alias for {func}`day`.
+:::
+
+:::{function} day_of_week(x) -> bigint
+Returns the ISO day of the week from `x`.
+The value ranges from `1` (Monday) to `7` (Sunday).
+:::
+
+:::{function} day_of_year(x) -> bigint
+Returns the day of the year from `x`.
+The value ranges from `1` to `366`.
+:::
+
+:::{function} dow(x) -> bigint
+This is an alias for {func}`day_of_week`.
+:::
+
+:::{function} doy(x) -> bigint
+This is an alias for {func}`day_of_year`.
+:::
+
+:::{function} hour(x) -> bigint
+Returns the hour of the day from `x`.
+The value ranges from `0` to `23`.
+:::
+
+:::{function} millisecond(x) -> bigint
+Returns the millisecond of the second from `x`.
+:::
+
+:::{function} minute(x) -> bigint
+Returns the minute of the hour from `x`.
+:::
+
+:::{function} month(x) -> bigint
+Returns the month of the year from `x`.
+:::
+
+:::{function} quarter(x) -> bigint
+Returns the quarter of the year from `x`.
+The value ranges from `1` to `4`.
+:::
+
+:::{function} second(x) -> bigint
+Returns the second of the minute from `x`.
+:::
+
+:::{function} timezone_hour(timestamp) -> bigint
+Returns the hour of the time zone offset from `timestamp`.
+:::
+
+:::{function} timezone_minute(timestamp) -> bigint
+Returns the minute of the time zone offset from `timestamp`.
+:::
+
+:::{function} week(x) -> bigint
+Returns the [ISO week] of the year from `x`.
+The value ranges from `1` to `53`.
+:::
+
+:::{function} week_of_year(x) -> bigint
+This is an alias for {func}`week`.
+:::
+
+:::{function} year(x) -> bigint
+Returns the year from `x`.
+:::
+
+:::{function} year_of_week(x) -> bigint
+Returns the year of the [ISO week] from `x`.
+:::
+
+:::{function} yow(x) -> bigint
+This is an alias for {func}`year_of_week`.
+:::
+
+[datetimeformat]: http://joda-time.sourceforge.net/apidocs/org/joda/time/format/DateTimeFormat.html
+[iso week]: https://wikipedia.org/wiki/ISO_week_date
diff --git a/docs/src/main/sphinx/functions/datetime.rst b/docs/src/main/sphinx/functions/datetime.rst
deleted file mode 100644
index bea9d12b0a72..000000000000
--- a/docs/src/main/sphinx/functions/datetime.rst
+++ /dev/null
@@ -1,546 +0,0 @@
-=====================================
-Date and time functions and operators
-=====================================
-
-These functions and operators operate on :ref:`date and time data types <date-time-data-types>`.
-
-Date and time operators
------------------------
-
-======== ===================================================== ===========================
-Operator Example                                               Result
-======== ===================================================== ===========================
-``+``    ``date '2012-08-08' + interval '2' day``              ``2012-08-10``
-``+``    ``time '01:00' + interval '3' hour``                  ``04:00:00.000``
-``+``    ``timestamp '2012-08-08 01:00' + interval '29' hour`` ``2012-08-09 06:00:00.000``
-``+``    ``timestamp '2012-10-31 01:00' + interval '1' month`` ``2012-11-30 01:00:00.000``
-``+``    ``interval '2' day + interval '3' hour``              ``2 03:00:00.000``
-``+``    ``interval '3' year + interval '5' month``            ``3-5``
-``-``    ``date '2012-08-08' - interval '2' day``              ``2012-08-06``
-``-``    ``time '01:00' - interval '3' hour``                  ``22:00:00.000``
-``-``    ``timestamp '2012-08-08 01:00' - interval '29' hour`` ``2012-08-06 20:00:00.000``
-``-``    ``timestamp '2012-10-31 01:00' - interval '1' month`` ``2012-09-30 01:00:00.000``
-``-``    ``interval '2' day - interval '3' hour``              ``1 21:00:00.000``
-``-``    ``interval '3' year - interval '5' month``            ``2-7``
-======== ===================================================== ===========================
-
-.. _at_time_zone_operator:
-
-Time zone conversion
---------------------
-
-The ``AT TIME ZONE`` operator sets the time zone of a timestamp::
-
-    SELECT timestamp '2012-10-31 01:00 UTC';
-    -- 2012-10-31 01:00:00.000 UTC
-
-    SELECT timestamp '2012-10-31 01:00 UTC' AT TIME ZONE 'America/Los_Angeles';
-    -- 2012-10-30 18:00:00.000 America/Los_Angeles
-
-Date and time functions
------------------------
-
-.. data:: current_date
-
-    Returns the current date as of the start of the query.
-
-.. data:: current_time
-
-    Returns the current time with time zone as of the start of the query.
-
-.. data:: current_timestamp
-
-    Returns the current timestamp with time zone as of the start of the query,
-    with ``3`` digits of subsecond precision,
-
-.. data:: current_timestamp(p)
-    :noindex:
-
-    Returns the current :ref:`timestamp with time zone
-    <timestamp-with-time-zone-data-type>` as of the start of the query, with
-    ``p`` digits of subsecond precision::
-
-        SELECT current_timestamp(6);
-        -- 2020-06-24 08:25:31.759993 America/Los_Angeles
-
-.. function:: current_timezone() -> varchar
-
-    Returns the current time zone in the format defined by IANA
-    (e.g., ``America/Los_Angeles``) or as fixed offset from UTC (e.g., ``+08:35``)
-
-.. function:: date(x) -> date
-
-    This is an alias for ``CAST(x AS date)``.
-
-.. function:: last_day_of_month(x) -> date
-
-    Returns the last day of the month.
-
-.. function:: from_iso8601_timestamp(string) -> timestamp(3) with time zone
-
-    Parses the ISO 8601 formatted date ``string``, optionally with time and time
-    zone, into a ``timestamp(3) with time zone``. The time defaults to
-    ``00:00:00.000``, and the time zone defaults to the session time zone::
-
-        SELECT from_iso8601_timestamp('2020-05-11');
-        -- 2020-05-11 00:00:00.000 America/Vancouver
-
-        SELECT from_iso8601_timestamp('2020-05-11T11:15:05');
-        -- 2020-05-11 11:15:05.000 America/Vancouver
-
-        SELECT from_iso8601_timestamp('2020-05-11T11:15:05.055+01:00');
-        -- 2020-05-11 11:15:05.055 +01:00
-
-.. function:: from_iso8601_timestamp_nanos(string) -> timestamp(9) with time zone
-
-    Parses the ISO 8601 formatted date and time ``string``. The time zone
-    defaults to the session time zone::
-
-        SELECT from_iso8601_timestamp_nanos('2020-05-11T11:15:05');
-        -- 2020-05-11 11:15:05.000000000 America/Vancouver
-
-        SELECT from_iso8601_timestamp_nanos('2020-05-11T11:15:05.123456789+01:00');
-        -- 2020-05-11 11:15:05.123456789 +01:00
-
-.. function:: from_iso8601_date(string) -> date
-
-    Parses the ISO 8601 formatted date ``string`` into a ``date``. The date can
-    be a calendar date, a week date using ISO week numbering, or year and day
-    of year combined::
-
-        SELECT from_iso8601_date('2020-05-11');
-        -- 2020-05-11
-
-        SELECT from_iso8601_date('2020-W10');
-        -- 2020-03-02
-
-        SELECT from_iso8601_date('2020-123');
-        -- 2020-05-02
-
-.. function:: at_timezone(timestamp, zone) -> timestamp(p) with time zone
-
-    Change the time zone component of ``timestamp`` with precision ``p`` to
-    ``zone`` while preserving the instant in time.
-
-.. function:: with_timezone(timestamp, zone) -> timestamp(p) with time zone
-
-    Returns a timestamp with time zone from ``timestamp`` with precision ``p``
-    and ``zone``.
-
-.. function:: from_unixtime(unixtime) -> timestamp(3) with time zone
-
-    Returns the UNIX timestamp ``unixtime`` as a timestamp with time zone. ``unixtime`` is the
-    number of seconds since ``1970-01-01 00:00:00 UTC``.
-
-.. function:: from_unixtime(unixtime, zone) -> timestamp(3) with time zone
-    :noindex:
-
-    Returns the UNIX timestamp ``unixtime`` as a timestamp with time zone
-    using ``zone`` for the time zone. ``unixtime`` is the number of seconds
-    since ``1970-01-01 00:00:00 UTC``.
-
-.. function:: from_unixtime(unixtime, hours, minutes) -> timestamp(3) with time zone
-    :noindex:
-
-    Returns the UNIX timestamp ``unixtime`` as a timestamp with time zone
-    using ``hours`` and ``minutes`` for the time zone offset. ``unixtime`` is
-    the number of seconds since ``1970-01-01 00:00:00`` in ``double`` data type.
-
-.. function:: from_unixtime_nanos(unixtime) -> timestamp(9) with time zone
-
-    Returns the UNIX timestamp ``unixtime`` as a timestamp with time zone. ``unixtime`` is the
-    number of nanoseconds since ``1970-01-01 00:00:00.000000000 UTC``::
-
-        SELECT from_unixtime_nanos(100);
-        -- 1970-01-01 00:00:00.000000100 UTC
-
-        SELECT from_unixtime_nanos(DECIMAL '1234');
-        -- 1970-01-01 00:00:00.000001234 UTC
-
-        SELECT from_unixtime_nanos(DECIMAL '1234.499');
-        -- 1970-01-01 00:00:00.000001234 UTC
-
-        SELECT from_unixtime_nanos(DECIMAL '-1234');
-        -- 1969-12-31 23:59:59.999998766 UTC
-
-.. data:: localtime
-
-    Returns the current time as of the start of the query.
-
-.. data:: localtimestamp
-
-    Returns the current timestamp as of the start of the query, with ``3``
-    digits of subsecond precision.
-
-.. data:: localtimestamp(p)
-    :noindex:
-
-    Returns the current :ref:`timestamp <timestamp-data-type>` as of the start
-    of the query, with ``p`` digits of subsecond precision::
-
-        SELECT localtimestamp(6);
-        -- 2020-06-10 15:55:23.383628
-
-.. function:: now() -> timestamp(3) with time zone
-
-    This is an alias for ``current_timestamp``.
-
-.. function:: to_iso8601(x) -> varchar
-
-    Formats ``x`` as an ISO 8601 string. ``x`` can be date, timestamp, or
-    timestamp with time zone.
-
-.. function:: to_milliseconds(interval) -> bigint
-
-    Returns the day-to-second ``interval`` as milliseconds.
-
-.. function:: to_unixtime(timestamp) -> double
-
-    Returns ``timestamp`` as a UNIX timestamp.
-
-.. note:: The following SQL-standard functions do not use parenthesis:
-
-    - ``current_date``
-    - ``current_time``
-    - ``current_timestamp``
-    - ``localtime``
-    - ``localtimestamp``
-
-Truncation function
--------------------
-
-The ``date_trunc`` function supports the following units:
-
-=========== ===========================
-Unit        Example Truncated Value
-=========== ===========================
-``second``  ``2001-08-22 03:04:05.000``
-``minute``  ``2001-08-22 03:04:00.000``
-``hour``    ``2001-08-22 03:00:00.000``
-``day``     ``2001-08-22 00:00:00.000``
-``week``    ``2001-08-20 00:00:00.000``
-``month``   ``2001-08-01 00:00:00.000``
-``quarter`` ``2001-07-01 00:00:00.000``
-``year``    ``2001-01-01 00:00:00.000``
-=========== ===========================
-
-The above examples use the timestamp ``2001-08-22 03:04:05.321`` as the input.
-
-.. function:: date_trunc(unit, x) -> [same as input]
-
-    Returns ``x`` truncated to ``unit``::
-
-        SELECT date_trunc('day' , TIMESTAMP '2022-10-20 05:10:00');
-        -- 2022-10-20 00:00:00.000
-
-        SELECT date_trunc('month' , TIMESTAMP '2022-10-20 05:10:00');
-        -- 2022-10-01 00:00:00.000
-
-        SELECT date_trunc('year', TIMESTAMP '2022-10-20 05:10:00');
-        -- 2022-01-01 00:00:00.000
-
-.. _datetime-interval-functions:
-
-Interval functions
-------------------
-
-The functions in this section support the following interval units:
-
-================= ==================
-Unit              Description
-================= ==================
-``millisecond``   Milliseconds
-``second``        Seconds
-``minute``        Minutes
-``hour``          Hours
-``day``           Days
-``week``          Weeks
-``month``         Months
-``quarter``       Quarters of a year
-``year``          Years
-================= ==================
-
-.. function:: date_add(unit, value, timestamp) -> [same as input]
-
-    Adds an interval ``value`` of type ``unit`` to ``timestamp``.
-    Subtraction can be performed by using a negative value::
-
-        SELECT date_add('second', 86, TIMESTAMP '2020-03-01 00:00:00');
-        -- 2020-03-01 00:01:26.000
-
-        SELECT date_add('hour', 9, TIMESTAMP '2020-03-01 00:00:00');
-        -- 2020-03-01 09:00:00.000
-
-        SELECT date_add('day', -1, TIMESTAMP '2020-03-01 00:00:00 UTC');
-        -- 2020-02-29 00:00:00.000 UTC
-
-.. function:: date_diff(unit, timestamp1, timestamp2) -> bigint
-
-    Returns ``timestamp2 - timestamp1`` expressed in terms of ``unit``::
-
-        SELECT date_diff('second', TIMESTAMP '2020-03-01 00:00:00', TIMESTAMP '2020-03-02 00:00:00');
-        -- 86400
-
-        SELECT date_diff('hour', TIMESTAMP '2020-03-01 00:00:00 UTC', TIMESTAMP '2020-03-02 00:00:00 UTC');
-        -- 24
-
-        SELECT date_diff('day', DATE '2020-03-01', DATE '2020-03-02');
-        -- 1
-
-        SELECT date_diff('second', TIMESTAMP '2020-06-01 12:30:45.000000000', TIMESTAMP '2020-06-02 12:30:45.123456789');
-        -- 86400
-
-        SELECT date_diff('millisecond', TIMESTAMP '2020-06-01 12:30:45.000000000', TIMESTAMP '2020-06-02 12:30:45.123456789');
-        -- 86400123
-
-Duration function
------------------
-
-The ``parse_duration`` function supports the following units:
-
-======= =============
-Unit    Description
-======= =============
-``ns``  Nanoseconds
-``us``  Microseconds
-``ms``  Milliseconds
-``s``   Seconds
-``m``   Minutes
-``h``   Hours
-``d``   Days
-======= =============
-
-.. function:: parse_duration(string) -> interval
-
-    Parses ``string`` of format ``value unit`` into an interval, where
-    ``value`` is fractional number of ``unit`` values::
-
-        SELECT parse_duration('42.8ms');
-        -- 0 00:00:00.043
-
-        SELECT parse_duration('3.81 d');
-        -- 3 19:26:24.000
-
-        SELECT parse_duration('5m');
-        -- 0 00:05:00.000
-
-.. function:: human_readable_seconds(double) -> varchar
-
-    Formats the double value of ``seconds`` into a human readable string containing
-    ``weeks``, ``days``, ``hours``, ``minutes``, and ``seconds``::
-
-        SELECT human_readable_seconds(96);
-        -- 1 minute, 36 seconds
-
-        SELECT human_readable_seconds(3762);
-        -- 1 hour, 2 minutes, 42 seconds
-
-        SELECT human_readable_seconds(56363463);
-        -- 93 weeks, 1 day, 8 hours, 31 minutes, 3 seconds
-
-MySQL date functions
---------------------
-
-The functions in this section use a format string that is compatible with
-the MySQL ``date_parse`` and ``str_to_date`` functions. The following table,
-based on the MySQL manual, describes the format specifiers:
-
-========= ===========
-Specifier Description
-========= ===========
-``%a``    Abbreviated weekday name (``Sun`` .. ``Sat``)
-``%b``    Abbreviated month name (``Jan`` .. ``Dec``)
-``%c``    Month, numeric (``1`` .. ``12``) [#z]_
-``%D``    Day of the month with English suffix (``0th``, ``1st``, ``2nd``, ``3rd``, ...)
-``%d``    Day of the month, numeric (``01`` .. ``31``) [#z]_
-``%e``    Day of the month, numeric (``1`` .. ``31``) [#z]_
-``%f``    Fraction of second (6 digits for printing: ``000000`` .. ``999000``; 1 - 9 digits for parsing: ``0`` .. ``999999999``) [#f]_
-``%H``    Hour (``00`` .. ``23``)
-``%h``    Hour (``01`` .. ``12``)
-``%I``    Hour (``01`` .. ``12``)
-``%i``    Minutes, numeric (``00`` .. ``59``)
-``%j``    Day of year (``001`` .. ``366``)
-``%k``    Hour (``0`` .. ``23``)
-``%l``    Hour (``1`` .. ``12``)
-``%M``    Month name (``January`` .. ``December``)
-``%m``    Month, numeric (``01`` .. ``12``) [#z]_
-``%p``    ``AM`` or ``PM``
-``%r``    Time of day, 12-hour (equivalent to ``%h:%i:%s %p``)
-``%S``    Seconds (``00`` .. ``59``)
-``%s``    Seconds (``00`` .. ``59``)
-``%T``    Time of day, 24-hour (equivalent to ``%H:%i:%s``)
-``%U``    Week (``00`` .. ``53``), where Sunday is the first day of the week
-``%u``    Week (``00`` .. ``53``), where Monday is the first day of the week
-``%V``    Week (``01`` .. ``53``), where Sunday is the first day of the week; used with ``%X``
-``%v``    Week (``01`` .. ``53``), where Monday is the first day of the week; used with ``%x``
-``%W``    Weekday name (``Sunday`` .. ``Saturday``)
-``%w``    Day of the week (``0`` .. ``6``), where Sunday is the first day of the week [#w]_
-``%X``    Year for the week where Sunday is the first day of the week, numeric, four digits; used with ``%V``
-``%x``    Year for the week, where Monday is the first day of the week, numeric, four digits; used with ``%v``
-``%Y``    Year, numeric, four digits
-``%y``    Year, numeric (two digits) [#y]_
-``%%``    A literal ``%`` character
-``%x``    ``x``, for any ``x`` not listed above
-========= ===========
-
-.. [#f] Timestamp is truncated to milliseconds.
-.. [#y] When parsing, two-digit year format assumes range ``1970`` .. ``2069``, so "70" will result in year ``1970`` but "69" will produce ``2069``.
-.. [#w] This specifier is not supported yet. Consider using :func:`day_of_week` (it uses ``1-7`` instead of ``0-6``).
-.. [#z] This specifier does not support ``0`` as a month or day.
-
-.. warning:: The following specifiers are not currently supported: ``%D %U %u %V %w %X``
-
-.. function:: date_format(timestamp, format) -> varchar
-
-    Formats ``timestamp`` as a string using ``format``::
-
-        SELECT date_format(TIMESTAMP '2022-10-20 05:10:00', '%m-%d-%Y %H');
-        -- 10-20-2022 05
-
-.. function:: date_parse(string, format) -> timestamp(3)
-
-    Parses ``string`` into a timestamp using ``format``::
-
-        SELECT date_parse('2022/10/20/05', '%Y/%m/%d/%H');
-        -- 2022-10-20 05:00:00.000
-
-Java date functions
--------------------
-
-The functions in this section use a format string that is compatible with
-JodaTime's `DateTimeFormat`_ pattern format.
-
-.. _DateTimeFormat: http://joda-time.sourceforge.net/apidocs/org/joda/time/format/DateTimeFormat.html
-
-.. function:: format_datetime(timestamp, format) -> varchar
-
-    Formats ``timestamp`` as a string using ``format``.
-
-.. function:: parse_datetime(string, format) -> timestamp with time zone
-
-    Parses ``string`` into a timestamp with time zone using ``format``.
-
-Extraction function
--------------------
-
-The ``extract`` function supports the following fields:
-
-=================== ===========
-Field               Description
-=================== ===========
-``YEAR``            :func:`year`
-``QUARTER``         :func:`quarter`
-``MONTH``           :func:`month`
-``WEEK``            :func:`week`
-``DAY``             :func:`day`
-``DAY_OF_MONTH``    :func:`day`
-``DAY_OF_WEEK``     :func:`day_of_week`
-``DOW``             :func:`day_of_week`
-``DAY_OF_YEAR``     :func:`day_of_year`
-``DOY``             :func:`day_of_year`
-``YEAR_OF_WEEK``    :func:`year_of_week`
-``YOW``             :func:`year_of_week`
-``HOUR``            :func:`hour`
-``MINUTE``          :func:`minute`
-``SECOND``          :func:`second`
-``TIMEZONE_HOUR``   :func:`timezone_hour`
-``TIMEZONE_MINUTE`` :func:`timezone_minute`
-=================== ===========
-
-The types supported by the ``extract`` function vary depending on the
-field to be extracted. Most fields support all date and time types.
-
-.. function:: extract(field FROM x) -> bigint
-
-    Returns ``field`` from ``x``::
-
-        SELECT extract(YEAR FROM TIMESTAMP '2022-10-20 05:10:00');
-        -- 2022
-
-    .. note:: This SQL-standard function uses special syntax for specifying the arguments.
-
-Convenience extraction functions
---------------------------------
-
-.. function:: day(x) -> bigint
-
-    Returns the day of the month from ``x``.
-
-.. function:: day_of_month(x) -> bigint
-
-    This is an alias for :func:`day`.
-
-.. function:: day_of_week(x) -> bigint
-
-    Returns the ISO day of the week from ``x``.
-    The value ranges from ``1`` (Monday) to ``7`` (Sunday).
-
-.. function:: day_of_year(x) -> bigint
-
-    Returns the day of the year from ``x``.
-    The value ranges from ``1`` to ``366``.
-
-.. function:: dow(x) -> bigint
-
-    This is an alias for :func:`day_of_week`.
-
-.. function:: doy(x) -> bigint
-
-    This is an alias for :func:`day_of_year`.
-
-.. function:: hour(x) -> bigint
-
-    Returns the hour of the day from ``x``.
-    The value ranges from ``0`` to ``23``.
-
-.. function:: millisecond(x) -> bigint
-
-    Returns the millisecond of the second from ``x``.
-
-.. function:: minute(x) -> bigint
-
-    Returns the minute of the hour from ``x``.
-
-.. function:: month(x) -> bigint
-
-    Returns the month of the year from ``x``.
-
-.. function:: quarter(x) -> bigint
-
-    Returns the quarter of the year from ``x``.
-    The value ranges from ``1`` to ``4``.
-
-.. function:: second(x) -> bigint
-
-    Returns the second of the minute from ``x``.
-
-.. function:: timezone_hour(timestamp) -> bigint
-
-    Returns the hour of the time zone offset from ``timestamp``.
-
-.. function:: timezone_minute(timestamp) -> bigint
-
-    Returns the minute of the time zone offset from ``timestamp``.
-
-.. function:: week(x) -> bigint
-
-    Returns the `ISO week`_ of the year from ``x``.
-    The value ranges from ``1`` to ``53``.
-
-    .. _ISO week: https://wikipedia.org/wiki/ISO_week_date
-
-.. function:: week_of_year(x) -> bigint
-
-    This is an alias for :func:`week`.
-
-.. function:: year(x) -> bigint
-
-    Returns the year from ``x``.
-
-.. function:: year_of_week(x) -> bigint
-
-    Returns the year of the `ISO week`_ from ``x``.
-
-.. function:: yow(x) -> bigint
-
-    This is an alias for :func:`year_of_week`.
diff --git a/docs/src/main/sphinx/functions/decimal.md b/docs/src/main/sphinx/functions/decimal.md
new file mode 100644
index 000000000000..d6371f309261
--- /dev/null
+++ b/docs/src/main/sphinx/functions/decimal.md
@@ -0,0 +1,89 @@
+# Decimal functions and operators
+
+(decimal-literal)=
+
+## Decimal literals
+
+Use the `DECIMAL 'xxxxxxx.yyyyyyy'` syntax to define a decimal literal.
+
+The precision of a decimal type for a literal will be equal to the number of digits
+in the literal (including trailing and leading zeros). The scale will be equal
+to the number of digits in the fractional part (including trailing zeros).
+
+:::{list-table}
+:widths: 50, 50
+:header-rows: 1
+
+* - Example literal
+  - Data type
+* - `DECIMAL '0'`
+  - `DECIMAL(1)`
+* - `DECIMAL '12345'`
+  - `DECIMAL(5)`
+* - `DECIMAL '0000012345.1234500000'`
+  - `DECIMAL(20, 10)`
+:::
+
+## Binary arithmetic decimal operators
+
+Standard mathematical operators are supported. The table below explains
+precision and scale calculation rules for result.
+Assuming `x` is of type `DECIMAL(xp, xs)` and `y` is of type `DECIMAL(yp, ys)`.
+
+:::{list-table}
+:widths: 30, 40, 30
+:header-rows: 1
+
+* - Operation
+  - Result type precision
+  - Result type scale
+* - `x + y` and `x - y`
+  -
+    ```
+    min(38,
+        1 +
+        max(xs, ys) +
+        max(xp - xs, yp - ys)
+    )
+    ```
+  - `max(xs, ys)`
+* - `x * y`
+  - ```
+    min(38, xp + yp)
+    ```
+  - `xs + ys`
+* - `x / y`
+  -
+    ```
+    min(38,
+        xp + ys-xs
+        + max(0, ys-xs)
+        )
+    ```
+  - `max(xs, ys)`
+* - `x % y`
+  - ```
+    min(xp - xs, yp - ys) +
+    max(xs, bs)
+    ```
+  - `max(xs, ys)`
+:::
+
+If the mathematical result of the operation is not exactly representable with
+the precision and scale of the result data type,
+then an exception condition is raised: `Value is out of range`.
+
+When operating on decimal types with different scale and precision, the values are
+first coerced to a common super type. For types near the largest representable precision (38),
+this can result in Value is out of range errors when one of the operands doesn't fit
+in the common super type. For example, the common super type of decimal(38, 0) and
+decimal(38, 1) is decimal(38, 1), but certain values that fit in decimal(38, 0)
+cannot be represented as a decimal(38, 1).
+
+## Comparison operators
+
+All standard {doc}`comparison` work for the decimal type.
+
+## Unary decimal operators
+
+The `-` operator performs negation. The type of result is same as type of argument.
diff --git a/docs/src/main/sphinx/functions/decimal.rst b/docs/src/main/sphinx/functions/decimal.rst
deleted file mode 100644
index df477af3b386..000000000000
--- a/docs/src/main/sphinx/functions/decimal.rst
+++ /dev/null
@@ -1,76 +0,0 @@
-===============================
-Decimal functions and operators
-===============================
-
-.. _decimal_literal:
-
-Decimal literals
-----------------
-
-Use the ``DECIMAL 'xxxxxxx.yyyyyyy'`` syntax to define a decimal literal.
-
-The precision of a decimal type for a literal will be equal to the number of digits
-in the literal (including trailing and leading zeros). The scale will be equal
-to the number of digits in the fractional part (including trailing zeros).
-
-=========================================== =============================
-Example literal                             Data type
-=========================================== =============================
-``DECIMAL '0'``                             ``DECIMAL(1)``
-``DECIMAL '12345'``                         ``DECIMAL(5)``
-``DECIMAL '0000012345.1234500000'``         ``DECIMAL(20, 10)``
-=========================================== =============================
-
-Binary arithmetic decimal operators
------------------------------------
-
-Standard mathematical operators are supported. The table below explains
-precision and scale calculation rules for result.
-Assuming ``x`` is of type ``DECIMAL(xp, xs)`` and ``y`` is of type ``DECIMAL(yp, ys)``.
-
-+---------------+-----------------------------------+-----------------------------------+
-| Operation     | Result type precision             | Result type scale                 |
-+---------------+-----------------------------------+-----------------------------------+
-| ``x + y``     | ::                                |                                   |
-|               |                                   |                                   |
-| and           |   min(38,                         | ``max(xs, ys)``                   |
-|               |       1 +                         |                                   |
-| ``x - y``     |         max(xs, ys) +             |                                   |
-|               |         max(xp - xs, yp - ys)     |                                   |
-|               |      )                            |                                   |
-+---------------+-----------------------------------+-----------------------------------+
-| ``x * y``     | ``min(38, xp + yp)``              | ``xs + ys``                       |
-+---------------+-----------------------------------+-----------------------------------+
-| ``x / y``     | ::                                |                                   |
-|               |                                   |                                   |
-|               |   min(38,                         | ``max(xs, ys)``                   |
-|               |       xp + ys                     |                                   |
-|               |          + max(0, ys-xs)          |                                   |
-|               |      )                            |                                   |
-+---------------+-----------------------------------+-----------------------------------+
-| ``x % y``     | ::                                |                                   |
-|               |                                   |                                   |
-|               |   min(xp - xs, yp - ys) +         | ``max(xs, ys)``                   |
-|               |   max(xs, bs)                     |                                   |
-+---------------+-----------------------------------+-----------------------------------+
-
-If the mathematical result of the operation is not exactly representable with
-the precision and scale of the result data type,
-then an exception condition is raised: ``Value is out of range``.
-
-When operating on decimal types with different scale and precision, the values are
-first coerced to a common super type. For types near the largest representable precision (38),
-this can result in Value is out of range errors when one of the operands doesn't fit
-in the common super type. For example, the common super type of decimal(38, 0) and
-decimal(38, 1) is decimal(38, 1), but certain values that fit in decimal(38, 0)
-cannot be represented as a decimal(38, 1).
-
-Comparison operators
---------------------
-
-All standard :doc:`comparison` work for the decimal type.
-
-Unary decimal operators
------------------------
-
-The ``-`` operator performs negation. The type of result is same as type of argument.
diff --git a/docs/src/main/sphinx/functions/geospatial.md b/docs/src/main/sphinx/functions/geospatial.md
new file mode 100644
index 000000000000..448bc8f2e202
--- /dev/null
+++ b/docs/src/main/sphinx/functions/geospatial.md
@@ -0,0 +1,499 @@
+# Geospatial functions
+
+Trino Geospatial functions that begin with the `ST_` prefix support the SQL/MM specification
+and are compliant with the Open Geospatial Consortium’s (OGC) OpenGIS Specifications.
+As such, many Trino Geospatial functions require, or more accurately, assume that
+geometries that are operated on are both simple and valid. For example, it does not
+make sense to calculate the area of a polygon that has a hole defined outside of the
+polygon, or to construct a polygon from a non-simple boundary line.
+
+Trino Geospatial functions support the Well-Known Text (WKT) and Well-Known Binary (WKB) form of spatial objects:
+
+- `POINT (0 0)`
+- `LINESTRING (0 0, 1 1, 1 2)`
+- `POLYGON ((0 0, 4 0, 4 4, 0 4, 0 0), (1 1, 2 1, 2 2, 1 2, 1 1))`
+- `MULTIPOINT (0 0, 1 2)`
+- `MULTILINESTRING ((0 0, 1 1, 1 2), (2 3, 3 2, 5 4))`
+- `MULTIPOLYGON (((0 0, 4 0, 4 4, 0 4, 0 0), (1 1, 2 1, 2 2, 1 2, 1 1)), ((-1 -1, -1 -2, -2 -2, -2 -1, -1 -1)))`
+- `GEOMETRYCOLLECTION (POINT(2 3), LINESTRING (2 3, 3 4))`
+
+Use {func}`ST_GeometryFromText` and {func}`ST_GeomFromBinary` functions to create geometry
+objects from WKT or WKB.
+
+The `SphericalGeography` type provides native support for spatial features represented on
+*geographic* coordinates (sometimes called *geodetic* coordinates, or *lat/lon*, or *lon/lat*).
+Geographic coordinates are spherical coordinates expressed in angular units (degrees).
+
+The basis for the `Geometry` type is a plane. The shortest path between two points on the plane is a
+straight line. That means calculations on geometries (areas, distances, lengths, intersections, etc)
+can be calculated using cartesian mathematics and straight line vectors.
+
+The basis for the `SphericalGeography` type is a sphere. The shortest path between two points on the
+sphere is a great circle arc. That means that calculations on geographies (areas, distances,
+lengths, intersections, etc) must be calculated on the sphere, using more complicated mathematics.
+More accurate measurements that take the actual spheroidal shape of the world into account are not
+supported.
+
+Values returned by the measurement functions {func}`ST_Distance` and {func}`ST_Length` are in the unit of meters;
+values returned by {func}`ST_Area` are in square meters.
+
+Use {func}`to_spherical_geography()` function to convert a geometry object to geography object.
+
+For example, `ST_Distance(ST_Point(-71.0882, 42.3607), ST_Point(-74.1197, 40.6976))` returns
+`3.4577` in the unit of the passed-in values on the euclidean plane, while
+`ST_Distance(to_spherical_geography(ST_Point(-71.0882, 42.3607)), to_spherical_geography(ST_Point(-74.1197, 40.6976)))`
+returns `312822.179` in meters.
+
+## Constructors
+
+:::{function} ST_AsBinary(Geometry) -> varbinary
+Returns the WKB representation of the geometry.
+:::
+
+:::{function} ST_AsText(Geometry) -> varchar
+Returns the WKT representation of the geometry. For empty geometries,
+`ST_AsText(ST_LineFromText('LINESTRING EMPTY'))` will produce `'MULTILINESTRING EMPTY'`
+and `ST_AsText(ST_Polygon('POLYGON EMPTY'))` will produce `'MULTIPOLYGON EMPTY'`.
+:::
+
+:::{function} ST_GeometryFromText(varchar) -> Geometry
+Returns a geometry type object from WKT representation.
+:::
+
+:::{function} ST_GeomFromBinary(varbinary) -> Geometry
+Returns a geometry type object from WKB representation.
+:::
+
+:::{function} geometry_from_hadoop_shape(varbinary) -> Geometry
+Returns a geometry type object from Spatial Framework for Hadoop representation.
+:::
+
+:::{function} ST_LineFromText(varchar) -> LineString
+Returns a geometry type linestring object from WKT representation.
+:::
+
+:::{function} ST_LineString(array(Point)) -> LineString
+Returns a LineString formed from an array of points. If there are fewer than
+two non-empty points in the input array, an empty LineString will be returned.
+Array elements must not be `NULL` or the same as the previous element.
+The returned geometry may not be simple, e.g. may self-intersect or may contain
+duplicate vertexes depending on the input.
+:::
+
+:::{function} ST_MultiPoint(array(Point)) -> MultiPoint
+Returns a MultiPoint geometry object formed from the specified points. Returns `NULL` if input array is empty.
+Array elements must not be `NULL` or empty.
+The returned geometry may not be simple and may contain duplicate points if input array has duplicates.
+:::
+
+:::{function} ST_Point(double, double) -> Point
+Returns a geometry type point object with the given coordinate values.
+:::
+
+:::{function} ST_Polygon(varchar) -> Polygon
+Returns a geometry type polygon object from WKT representation.
+:::
+
+:::{function} to_spherical_geography(Geometry) -> SphericalGeography
+Converts a Geometry object to a SphericalGeography object on the sphere of the Earth's radius. This
+function is only applicable to `POINT`, `MULTIPOINT`, `LINESTRING`, `MULTILINESTRING`,
+`POLYGON`, `MULTIPOLYGON` geometries defined in 2D space, or `GEOMETRYCOLLECTION` of such
+geometries. For each point of the input geometry, it verifies that `point.x` is within
+`[-180.0, 180.0]` and `point.y` is within `[-90.0, 90.0]`, and uses them as (longitude, latitude)
+degrees to construct the shape of the `SphericalGeography` result.
+:::
+
+:::{function} to_geometry(SphericalGeography) -> Geometry
+Converts a SphericalGeography object to a Geometry object.
+:::
+
+## Relationship tests
+
+:::{function} ST_Contains(Geometry, Geometry) -> boolean
+Returns `true` if and only if no points of the second geometry lie in the exterior
+of the first geometry, and at least one point of the interior of the first geometry
+lies in the interior of the second geometry.
+:::
+
+:::{function} ST_Crosses(Geometry, Geometry) -> boolean
+Returns `true` if the supplied geometries have some, but not all, interior points in common.
+:::
+
+:::{function} ST_Disjoint(Geometry, Geometry) -> boolean
+Returns `true` if the give geometries do not *spatially intersect* --
+if they do not share any space together.
+:::
+
+:::{function} ST_Equals(Geometry, Geometry) -> boolean
+Returns `true` if the given geometries represent the same geometry.
+:::
+
+:::{function} ST_Intersects(Geometry, Geometry) -> boolean
+Returns `true` if the given geometries spatially intersect in two dimensions
+(share any portion of space) and `false` if they do not (they are disjoint).
+:::
+
+:::{function} ST_Overlaps(Geometry, Geometry) -> boolean
+Returns `true` if the given geometries share space, are of the same dimension,
+but are not completely contained by each other.
+:::
+
+:::{function} ST_Relate(Geometry, Geometry) -> boolean
+Returns `true` if first geometry is spatially related to second geometry.
+:::
+
+:::{function} ST_Touches(Geometry, Geometry) -> boolean
+Returns `true` if the given geometries have at least one point in common,
+but their interiors do not intersect.
+:::
+
+:::{function} ST_Within(Geometry, Geometry) -> boolean
+Returns `true` if first geometry is completely inside second geometry.
+:::
+
+## Operations
+
+:::{function} geometry_nearest_points(Geometry, Geometry) -> row(Point, Point)
+Returns the points on each geometry nearest the other.  If either geometry
+is empty, return `NULL`.  Otherwise, return a row of two Points that have
+the minimum distance of any two points on the geometries.  The first Point
+will be from the first Geometry argument, the second from the second Geometry
+argument.  If there are multiple pairs with the minimum distance, one pair
+is chosen arbitrarily.
+:::
+
+:::{function} geometry_union(array(Geometry)) -> Geometry
+Returns a geometry that represents the point set union of the input geometries. Performance
+of this function, in conjunction with {func}`array_agg` to first aggregate the input geometries,
+may be better than {func}`geometry_union_agg`, at the expense of higher memory utilization.
+:::
+
+:::{function} ST_Boundary(Geometry) -> Geometry
+Returns the closure of the combinatorial boundary of this geometry.
+:::
+
+:::{function} ST_Buffer(Geometry, distance) -> Geometry
+Returns the geometry that represents all points whose distance from the specified geometry
+is less than or equal to the specified distance.
+:::
+
+:::{function} ST_Difference(Geometry, Geometry) -> Geometry
+Returns the geometry value that represents the point set difference of the given geometries.
+:::
+
+:::{function} ST_Envelope(Geometry) -> Geometry
+Returns the bounding rectangular polygon of a geometry.
+:::
+
+:::{function} ST_EnvelopeAsPts(Geometry) -> array(Geometry)
+Returns an array of two points: the lower left and upper right corners of the bounding
+rectangular polygon of a geometry. Returns `NULL` if input geometry is empty.
+:::
+
+:::{function} ST_ExteriorRing(Geometry) -> Geometry
+Returns a line string representing the exterior ring of the input polygon.
+:::
+
+:::{function} ST_Intersection(Geometry, Geometry) -> Geometry
+Returns the geometry value that represents the point set intersection of two geometries.
+:::
+
+:::{function} ST_SymDifference(Geometry, Geometry) -> Geometry
+Returns the geometry value that represents the point set symmetric difference of two geometries.
+:::
+
+:::{function} ST_Union(Geometry, Geometry) -> Geometry
+Returns a geometry that represents the point set union of the input geometries.
+
+See also:  {func}`geometry_union`, {func}`geometry_union_agg`
+:::
+
+## Accessors
+
+:::{function} ST_Area(Geometry) -> double
+Returns the 2D Euclidean area of a geometry.
+
+For Point and LineString types, returns 0.0.
+For GeometryCollection types, returns the sum of the areas of the individual
+geometries.
+:::
+
+:::{function} ST_Area(SphericalGeography) -> double
+:noindex: true
+
+Returns the area of a polygon or multi-polygon in square meters using a spherical model for Earth.
+:::
+
+:::{function} ST_Centroid(Geometry) -> Geometry
+Returns the point value that is the mathematical centroid of a geometry.
+:::
+
+:::{function} ST_ConvexHull(Geometry) -> Geometry
+Returns the minimum convex geometry that encloses all input geometries.
+:::
+
+:::{function} ST_CoordDim(Geometry) -> bigint
+Returns the coordinate dimension of the geometry.
+:::
+
+:::{function} ST_Dimension(Geometry) -> bigint
+Returns the inherent dimension of this geometry object, which must be
+less than or equal to the coordinate dimension.
+:::
+
+:::{function} ST_Distance(Geometry, Geometry) -> double
+:noindex: true
+
+Returns the 2-dimensional cartesian minimum distance (based on spatial ref)
+between two geometries in projected units.
+:::
+
+:::{function} ST_Distance(SphericalGeography, SphericalGeography) -> double
+Returns the great-circle distance in meters between two SphericalGeography points.
+:::
+
+:::{function} ST_GeometryN(Geometry, index) -> Geometry
+Returns the geometry element at a given index (indices start at 1).
+If the geometry is a collection of geometries (e.g., GEOMETRYCOLLECTION or MULTI\*),
+returns the geometry at a given index.
+If the given index is less than 1 or greater than the total number of elements in the collection,
+returns `NULL`.
+Use {func}`ST_NumGeometries` to find out the total number of elements.
+Singular geometries (e.g., POINT, LINESTRING, POLYGON), are treated as collections of one element.
+Empty geometries are treated as empty collections.
+:::
+
+:::{function} ST_InteriorRingN(Geometry, index) -> Geometry
+Returns the interior ring element at the specified index (indices start at 1). If
+the given index is less than 1 or greater than the total number of interior rings
+in the input geometry, returns `NULL`. The input geometry must be a polygon.
+Use {func}`ST_NumInteriorRing` to find out the total number of elements.
+:::
+
+:::{function} ST_GeometryType(Geometry) -> varchar
+Returns the type of the geometry.
+:::
+
+:::{function} ST_IsClosed(Geometry) -> boolean
+Returns `true` if the linestring's start and end points are coincident.
+:::
+
+:::{function} ST_IsEmpty(Geometry) -> boolean
+Returns `true` if this Geometry is an empty geometrycollection, polygon, point etc.
+:::
+
+:::{function} ST_IsSimple(Geometry) -> boolean
+Returns `true` if this Geometry has no anomalous geometric points, such as self intersection or self tangency.
+:::
+
+:::{function} ST_IsRing(Geometry) -> boolean
+Returns `true` if and only if the line is closed and simple.
+:::
+
+:::{function} ST_IsValid(Geometry) -> boolean
+Returns `true` if and only if the input geometry is well formed.
+Use {func}`geometry_invalid_reason` to determine why the geometry is not well formed.
+:::
+
+:::{function} ST_Length(Geometry) -> double
+Returns the length of a linestring or multi-linestring using Euclidean measurement on a
+two dimensional plane (based on spatial ref) in projected units.
+:::
+
+:::{function} ST_Length(SphericalGeography) -> double
+:noindex: true
+
+Returns the length of a linestring or multi-linestring on a spherical model of the Earth.
+This is equivalent to the sum of great-circle distances between adjacent points on the linestring.
+:::
+
+:::{function} ST_PointN(LineString, index) -> Point
+Returns the vertex of a linestring at a given index (indices start at 1).
+If the given index is less than 1 or greater than the total number of elements in the collection,
+returns `NULL`.
+Use {func}`ST_NumPoints` to find out the total number of elements.
+:::
+
+:::{function} ST_Points(Geometry) -> array(Point)
+Returns an array of points in a linestring.
+:::
+
+:::{function} ST_XMax(Geometry) -> double
+Returns X maxima of a bounding box of a geometry.
+:::
+
+:::{function} ST_YMax(Geometry) -> double
+Returns Y maxima of a bounding box of a geometry.
+:::
+
+:::{function} ST_XMin(Geometry) -> double
+Returns X minima of a bounding box of a geometry.
+:::
+
+:::{function} ST_YMin(Geometry) -> double
+Returns Y minima of a bounding box of a geometry.
+:::
+
+:::{function} ST_StartPoint(Geometry) -> point
+Returns the first point of a LineString geometry as a Point.
+This is a shortcut for `ST_PointN(geometry, 1)`.
+:::
+
+:::{function} simplify_geometry(Geometry, double) -> Geometry
+Returns a "simplified" version of the input geometry using the Douglas-Peucker algorithm.
+Will avoid creating derived geometries (polygons in particular) that are invalid.
+:::
+
+:::{function} ST_EndPoint(Geometry) -> point
+Returns the last point of a LineString geometry as a Point.
+This is a shortcut for `ST_PointN(geometry, ST_NumPoints(geometry))`.
+:::
+
+:::{function} ST_X(Point) -> double
+Returns the X coordinate of the point.
+:::
+
+:::{function} ST_Y(Point) -> double
+Returns the Y coordinate of the point.
+:::
+
+:::{function} ST_InteriorRings(Geometry) -> array(Geometry)
+Returns an array of all interior rings found in the input geometry, or an empty
+array if the polygon has no interior rings. Returns `NULL` if the input geometry
+is empty. The input geometry must be a polygon.
+:::
+
+:::{function} ST_NumGeometries(Geometry) -> bigint
+Returns the number of geometries in the collection.
+If the geometry is a collection of geometries (e.g., GEOMETRYCOLLECTION or MULTI\*),
+returns the number of geometries,
+for single geometries returns 1,
+for empty geometries returns 0.
+:::
+
+:::{function} ST_Geometries(Geometry) -> array(Geometry)
+Returns an array of geometries in the specified collection. Returns a one-element array
+if the input geometry is not a multi-geometry. Returns `NULL` if input geometry is empty.
+:::
+
+:::{function} ST_NumPoints(Geometry) -> bigint
+Returns the number of points in a geometry. This is an extension to the SQL/MM
+`ST_NumPoints` function which only applies to point and linestring.
+:::
+
+:::{function} ST_NumInteriorRing(Geometry) -> bigint
+Returns the cardinality of the collection of interior rings of a polygon.
+:::
+
+:::{function} line_interpolate_point(LineString, double) -> Geometry
+Returns a Point interpolated along a LineString at the fraction given. The fraction
+must be between 0 and 1, inclusive.
+:::
+
+:::{function} line_interpolate_points(LineString, double, repeated) -> array(Geometry)
+Returns an array of Points interpolated along a LineString. The fraction must be
+between 0 and 1, inclusive.
+:::
+
+:::{function} line_locate_point(LineString, Point) -> double
+Returns a float between 0 and 1 representing the location of the closest point on
+the LineString to the given Point, as a fraction of total 2d line length.
+
+Returns `NULL` if a LineString or a Point is empty or `NULL`.
+:::
+
+:::{function} geometry_invalid_reason(Geometry) -> varchar
+Returns the reason for why the input geometry is not valid.
+Returns `NULL` if the input is valid.
+:::
+
+:::{function} great_circle_distance(latitude1, longitude1, latitude2, longitude2) -> double
+Returns the great-circle distance between two points on Earth's surface in kilometers.
+:::
+
+:::{function} to_geojson_geometry(SphericalGeography) -> varchar
+Returns the GeoJSON encoded defined by the input spherical geography.
+:::
+
+:::{function} from_geojson_geometry(varchar) -> SphericalGeography
+Returns the spherical geography type object from the GeoJSON representation stripping non geometry key/values.
+Feature and FeatureCollection are not supported.
+:::
+
+## Aggregations
+
+:::{function} convex_hull_agg(Geometry) -> Geometry
+Returns the minimum convex geometry that encloses all input geometries.
+:::
+
+:::{function} geometry_union_agg(Geometry) -> Geometry
+Returns a geometry that represents the point set union of all input geometries.
+:::
+
+## Bing tiles
+
+These functions convert between geometries and
+[Bing tiles](https://msdn.microsoft.com/library/bb259689.aspx).
+
+:::{function} bing_tile(x, y, zoom_level) -> BingTile
+Creates a Bing tile object from XY coordinates and a zoom level.
+Zoom levels from 1 to 23 are supported.
+:::
+
+:::{function} bing_tile(quadKey) -> BingTile
+:noindex: true
+
+Creates a Bing tile object from a quadkey.
+:::
+
+:::{function} bing_tile_at(latitude, longitude, zoom_level) -> BingTile
+Returns a Bing tile at a given zoom level containing a point at a given latitude
+and longitude. Latitude must be within `[-85.05112878, 85.05112878]` range.
+Longitude must be within `[-180, 180]` range. Zoom levels from 1 to 23 are supported.
+:::
+
+:::{function} bing_tiles_around(latitude, longitude, zoom_level) -> array(BingTile)
+Returns a collection of Bing tiles that surround the point specified
+by the latitude and longitude arguments at a given zoom level.
+:::
+
+:::{function} bing_tiles_around(latitude, longitude, zoom_level, radius_in_km) -> array(BingTile)
+:noindex: true
+
+Returns a minimum set of Bing tiles at specified zoom level that cover a circle of specified
+radius in km around a specified (latitude, longitude) point.
+:::
+
+:::{function} bing_tile_coordinates(tile) -> row<x, y>
+Returns the XY coordinates of a given Bing tile.
+:::
+
+:::{function} bing_tile_polygon(tile) -> Geometry
+Returns the polygon representation of a given Bing tile.
+:::
+
+:::{function} bing_tile_quadkey(tile) -> varchar
+Returns the quadkey of a given Bing tile.
+:::
+
+:::{function} bing_tile_zoom_level(tile) -> tinyint
+Returns the zoom level of a given Bing tile.
+:::
+
+:::{function} geometry_to_bing_tiles(geometry, zoom_level) -> array(BingTile)
+Returns the minimum set of Bing tiles that fully covers a given geometry at
+a given zoom level. Zoom levels from 1 to 23 are supported.
+:::
+
+## Encoded polylines
+
+These functions convert between geometries and
+[encoded polylines](https://developers.google.com/maps/documentation/utilities/polylinealgorithm).
+
+:::{function} to_encoded_polyline(Geometry) -> varchar
+Encodes a linestring or multipoint to a polyline.
+:::
+
+:::{function} from_encoded_polyline(varchar) -> Geometry
+Decodes a polyline to a linestring.
+:::
diff --git a/docs/src/main/sphinx/functions/geospatial.rst b/docs/src/main/sphinx/functions/geospatial.rst
deleted file mode 100644
index 8519bfefe533..000000000000
--- a/docs/src/main/sphinx/functions/geospatial.rst
+++ /dev/null
@@ -1,504 +0,0 @@
-====================
-Geospatial functions
-====================
-
-Trino Geospatial functions that begin with the ``ST_`` prefix support the SQL/MM specification
-and are compliant with the Open Geospatial Consortium’s (OGC) OpenGIS Specifications.
-As such, many Trino Geospatial functions require, or more accurately, assume that
-geometries that are operated on are both simple and valid. For example, it does not
-make sense to calculate the area of a polygon that has a hole defined outside of the
-polygon, or to construct a polygon from a non-simple boundary line.
-
-Trino Geospatial functions support the Well-Known Text (WKT) and Well-Known Binary (WKB) form of spatial objects:
-
-* ``POINT (0 0)``
-* ``LINESTRING (0 0, 1 1, 1 2)``
-* ``POLYGON ((0 0, 4 0, 4 4, 0 4, 0 0), (1 1, 2 1, 2 2, 1 2, 1 1))``
-* ``MULTIPOINT (0 0, 1 2)``
-* ``MULTILINESTRING ((0 0, 1 1, 1 2), (2 3, 3 2, 5 4))``
-* ``MULTIPOLYGON (((0 0, 4 0, 4 4, 0 4, 0 0), (1 1, 2 1, 2 2, 1 2, 1 1)), ((-1 -1, -1 -2, -2 -2, -2 -1, -1 -1)))``
-* ``GEOMETRYCOLLECTION (POINT(2 3), LINESTRING (2 3, 3 4))``
-
-Use :func:`ST_GeometryFromText` and :func:`ST_GeomFromBinary` functions to create geometry
-objects from WKT or WKB.
-
-The ``SphericalGeography`` type provides native support for spatial features represented on
-*geographic* coordinates (sometimes called *geodetic* coordinates, or *lat/lon*, or *lon/lat*).
-Geographic coordinates are spherical coordinates expressed in angular units (degrees).
-
-The basis for the ``Geometry`` type is a plane. The shortest path between two points on the plane is a
-straight line. That means calculations on geometries (areas, distances, lengths, intersections, etc)
-can be calculated using cartesian mathematics and straight line vectors.
-
-The basis for the ``SphericalGeography`` type is a sphere. The shortest path between two points on the
-sphere is a great circle arc. That means that calculations on geographies (areas, distances,
-lengths, intersections, etc) must be calculated on the sphere, using more complicated mathematics.
-More accurate measurements that take the actual spheroidal shape of the world into account are not
-supported.
-
-Values returned by the measurement functions :func:`ST_Distance` and :func:`ST_Length` are in the unit of meters;
-values returned by :func:`ST_Area` are in square meters.
-
-Use :func:`to_spherical_geography()` function to convert a geometry object to geography object.
-
-For example, ``ST_Distance(ST_Point(-71.0882, 42.3607), ST_Point(-74.1197, 40.6976))`` returns
-``3.4577`` in the unit of the passed-in values on the euclidean plane, while
-``ST_Distance(to_spherical_geography(ST_Point(-71.0882, 42.3607)), to_spherical_geography(ST_Point(-74.1197, 40.6976)))``
-returns ``312822.179`` in meters.
-
-
-Constructors
-------------
-
-.. function:: ST_AsBinary(Geometry) -> varbinary
-
-    Returns the WKB representation of the geometry.
-
-.. function:: ST_AsText(Geometry) -> varchar
-
-    Returns the WKT representation of the geometry. For empty geometries,
-    ``ST_AsText(ST_LineFromText('LINESTRING EMPTY'))`` will produce ``'MULTILINESTRING EMPTY'``
-    and ``ST_AsText(ST_Polygon('POLYGON EMPTY'))`` will produce ``'MULTIPOLYGON EMPTY'``.
-
-.. function:: ST_GeometryFromText(varchar) -> Geometry
-
-    Returns a geometry type object from WKT representation.
-
-.. function:: ST_GeomFromBinary(varbinary) -> Geometry
-
-    Returns a geometry type object from WKB representation.
-
-.. function:: geometry_from_hadoop_shape(varbinary) -> Geometry
-
-    Returns a geometry type object from Spatial Framework for Hadoop representation.
-
-.. function:: ST_LineFromText(varchar) -> LineString
-
-    Returns a geometry type linestring object from WKT representation.
-
-.. function:: ST_LineString(array(Point)) -> LineString
-
-    Returns a LineString formed from an array of points. If there are fewer than
-    two non-empty points in the input array, an empty LineString will be returned.
-    Array elements must not be ``NULL`` or the same as the previous element.
-    The returned geometry may not be simple, e.g. may self-intersect or may contain
-    duplicate vertexes depending on the input.
-
-.. function:: ST_MultiPoint(array(Point)) -> MultiPoint
-
-    Returns a MultiPoint geometry object formed from the specified points. Returns ``NULL`` if input array is empty.
-    Array elements must not be ``NULL`` or empty.
-    The returned geometry may not be simple and may contain duplicate points if input array has duplicates.
-
-.. function:: ST_Point(double, double) -> Point
-
-    Returns a geometry type point object with the given coordinate values.
-
-.. function:: ST_Polygon(varchar) -> Polygon
-
-    Returns a geometry type polygon object from WKT representation.
-
-.. function:: to_spherical_geography(Geometry) -> SphericalGeography
-
-    Converts a Geometry object to a SphericalGeography object on the sphere of the Earth's radius. This
-    function is only applicable to ``POINT``, ``MULTIPOINT``, ``LINESTRING``, ``MULTILINESTRING``,
-    ``POLYGON``, ``MULTIPOLYGON`` geometries defined in 2D space, or ``GEOMETRYCOLLECTION`` of such
-    geometries. For each point of the input geometry, it verifies that ``point.x`` is within
-    ``[-180.0, 180.0]`` and ``point.y`` is within ``[-90.0, 90.0]``, and uses them as (longitude, latitude)
-    degrees to construct the shape of the ``SphericalGeography`` result.
-
-.. function:: to_geometry(SphericalGeography) -> Geometry
-
-    Converts a SphericalGeography object to a Geometry object.
-
-Relationship tests
-------------------
-
-.. function:: ST_Contains(Geometry, Geometry) -> boolean
-
-    Returns ``true`` if and only if no points of the second geometry lie in the exterior
-    of the first geometry, and at least one point of the interior of the first geometry
-    lies in the interior of the second geometry.
-
-.. function:: ST_Crosses(Geometry, Geometry) -> boolean
-
-    Returns ``true`` if the supplied geometries have some, but not all, interior points in common.
-
-.. function:: ST_Disjoint(Geometry, Geometry) -> boolean
-
-    Returns ``true`` if the give geometries do not *spatially intersect* --
-    if they do not share any space together.
-
-.. function:: ST_Equals(Geometry, Geometry) -> boolean
-
-    Returns ``true`` if the given geometries represent the same geometry.
-
-.. function:: ST_Intersects(Geometry, Geometry) -> boolean
-
-    Returns ``true`` if the given geometries spatially intersect in two dimensions
-    (share any portion of space) and ``false`` if they do not (they are disjoint).
-
-.. function:: ST_Overlaps(Geometry, Geometry) -> boolean
-
-    Returns ``true`` if the given geometries share space, are of the same dimension,
-    but are not completely contained by each other.
-
-.. function:: ST_Relate(Geometry, Geometry) -> boolean
-
-    Returns ``true`` if first geometry is spatially related to second geometry.
-
-.. function:: ST_Touches(Geometry, Geometry) -> boolean
-
-    Returns ``true`` if the given geometries have at least one point in common,
-    but their interiors do not intersect.
-
-.. function:: ST_Within(Geometry, Geometry) -> boolean
-
-    Returns ``true`` if first geometry is completely inside second geometry.
-
-Operations
-----------
-
-.. function:: geometry_nearest_points(Geometry, Geometry) -> row(Point, Point)
-
-    Returns the points on each geometry nearest the other.  If either geometry
-    is empty, return ``NULL``.  Otherwise, return a row of two Points that have
-    the minimum distance of any two points on the geometries.  The first Point
-    will be from the first Geometry argument, the second from the second Geometry
-    argument.  If there are multiple pairs with the minimum distance, one pair
-    is chosen arbitrarily.
-
-.. function:: geometry_union(array(Geometry)) -> Geometry
-
-    Returns a geometry that represents the point set union of the input geometries. Performance
-    of this function, in conjunction with :func:`array_agg` to first aggregate the input geometries,
-    may be better than :func:`geometry_union_agg`, at the expense of higher memory utilization.
-
-.. function:: ST_Boundary(Geometry) -> Geometry
-
-    Returns the closure of the combinatorial boundary of this geometry.
-
-.. function:: ST_Buffer(Geometry, distance) -> Geometry
-
-    Returns the geometry that represents all points whose distance from the specified geometry
-    is less than or equal to the specified distance.
-
-.. function:: ST_Difference(Geometry, Geometry) -> Geometry
-
-    Returns the geometry value that represents the point set difference of the given geometries.
-
-.. function:: ST_Envelope(Geometry) -> Geometry
-
-    Returns the bounding rectangular polygon of a geometry.
-
-.. function:: ST_EnvelopeAsPts(Geometry) -> array(Geometry)
-
-    Returns an array of two points: the lower left and upper right corners of the bounding
-    rectangular polygon of a geometry. Returns ``NULL`` if input geometry is empty.
-
-.. function:: ST_ExteriorRing(Geometry) -> Geometry
-
-    Returns a line string representing the exterior ring of the input polygon.
-
-.. function:: ST_Intersection(Geometry, Geometry) -> Geometry
-
-    Returns the geometry value that represents the point set intersection of two geometries.
-
-.. function:: ST_SymDifference(Geometry, Geometry) -> Geometry
-
-    Returns the geometry value that represents the point set symmetric difference of two geometries.
-
-.. function:: ST_Union(Geometry, Geometry) -> Geometry
-
-    Returns a geometry that represents the point set union of the input geometries.
-
-    See also:  :func:`geometry_union`, :func:`geometry_union_agg`
-
-
-Accessors
----------
-
-.. function:: ST_Area(Geometry) -> double
-
-    Returns the 2D Euclidean area of a geometry.
-
-    For Point and LineString types, returns 0.0.
-    For GeometryCollection types, returns the sum of the areas of the individual
-    geometries.
-
-.. function:: ST_Area(SphericalGeography) -> double
-    :noindex:
-
-    Returns the area of a polygon or multi-polygon in square meters using a spherical model for Earth.
-
-.. function:: ST_Centroid(Geometry) -> Geometry
-
-    Returns the point value that is the mathematical centroid of a geometry.
-
-.. function:: ST_ConvexHull(Geometry) -> Geometry
-
-    Returns the minimum convex geometry that encloses all input geometries.
-
-.. function:: ST_CoordDim(Geometry) -> bigint
-
-    Returns the coordinate dimension of the geometry.
-
-.. function:: ST_Dimension(Geometry) -> bigint
-
-    Returns the inherent dimension of this geometry object, which must be
-    less than or equal to the coordinate dimension.
-
-.. function:: ST_Distance(Geometry, Geometry) -> double
-    :noindex:
-
-    Returns the 2-dimensional cartesian minimum distance (based on spatial ref)
-    between two geometries in projected units.
-
-.. function:: ST_Distance(SphericalGeography, SphericalGeography) -> double
-
-    Returns the great-circle distance in meters between two SphericalGeography points.
-
-.. function:: ST_GeometryN(Geometry, index) -> Geometry
-
-    Returns the geometry element at a given index (indices start at 1).
-    If the geometry is a collection of geometries (e.g., GEOMETRYCOLLECTION or MULTI*),
-    returns the geometry at a given index.
-    If the given index is less than 1 or greater than the total number of elements in the collection,
-    returns ``NULL``.
-    Use :func:`ST_NumGeometries` to find out the total number of elements.
-    Singular geometries (e.g., POINT, LINESTRING, POLYGON), are treated as collections of one element.
-    Empty geometries are treated as empty collections.
-
-.. function:: ST_InteriorRingN(Geometry, index) -> Geometry
-
-   Returns the interior ring element at the specified index (indices start at 1). If
-   the given index is less than 1 or greater than the total number of interior rings
-   in the input geometry, returns ``NULL``. The input geometry must be a polygon.
-   Use :func:`ST_NumInteriorRing` to find out the total number of elements.
-
-.. function:: ST_GeometryType(Geometry) -> varchar
-
-    Returns the type of the geometry.
-
-.. function:: ST_IsClosed(Geometry) -> boolean
-
-    Returns ``true`` if the linestring's start and end points are coincident.
-
-.. function:: ST_IsEmpty(Geometry) -> boolean
-
-    Returns ``true`` if this Geometry is an empty geometrycollection, polygon, point etc.
-
-.. function:: ST_IsSimple(Geometry) -> boolean
-
-    Returns ``true`` if this Geometry has no anomalous geometric points, such as self intersection or self tangency.
-
-.. function:: ST_IsRing(Geometry) -> boolean
-
-    Returns ``true`` if and only if the line is closed and simple.
-
-.. function:: ST_IsValid(Geometry) -> boolean
-
-    Returns ``true`` if and only if the input geometry is well formed.
-    Use :func:`geometry_invalid_reason` to determine why the geometry is not well formed.
-
-.. function:: ST_Length(Geometry) -> double
-
-    Returns the length of a linestring or multi-linestring using Euclidean measurement on a
-    two dimensional plane (based on spatial ref) in projected units.
-
-.. function:: ST_Length(SphericalGeography) -> double
-    :noindex:
-
-    Returns the length of a linestring or multi-linestring on a spherical model of the Earth.
-    This is equivalent to the sum of great-circle distances between adjacent points on the linestring.
-
-.. function:: ST_PointN(LineString, index) -> Point
-
-    Returns the vertex of a linestring at a given index (indices start at 1).
-    If the given index is less than 1 or greater than the total number of elements in the collection,
-    returns ``NULL``.
-    Use :func:`ST_NumPoints` to find out the total number of elements.
-
-.. function:: ST_Points(Geometry) -> array(Point)
-
-    Returns an array of points in a linestring.
-
-.. function:: ST_XMax(Geometry) -> double
-
-    Returns X maxima of a bounding box of a geometry.
-
-.. function:: ST_YMax(Geometry) -> double
-
-    Returns Y maxima of a bounding box of a geometry.
-
-.. function:: ST_XMin(Geometry) -> double
-
-    Returns X minima of a bounding box of a geometry.
-
-.. function:: ST_YMin(Geometry) -> double
-
-    Returns Y minima of a bounding box of a geometry.
-
-.. function:: ST_StartPoint(Geometry) -> point
-
-    Returns the first point of a LineString geometry as a Point.
-    This is a shortcut for ``ST_PointN(geometry, 1)``.
-
-.. function:: simplify_geometry(Geometry, double) -> Geometry
-
-    Returns a "simplified" version of the input geometry using the Douglas-Peucker algorithm.
-    Will avoid creating derived geometries (polygons in particular) that are invalid.
-
-.. function:: ST_EndPoint(Geometry) -> point
-
-    Returns the last point of a LineString geometry as a Point.
-    This is a shortcut for ``ST_PointN(geometry, ST_NumPoints(geometry))``.
-
-.. function:: ST_X(Point) -> double
-
-    Returns the X coordinate of the point.
-
-.. function:: ST_Y(Point) -> double
-
-    Returns the Y coordinate of the point.
-
-.. function:: ST_InteriorRings(Geometry) -> array(Geometry)
-
-   Returns an array of all interior rings found in the input geometry, or an empty
-   array if the polygon has no interior rings. Returns ``NULL`` if the input geometry
-   is empty. The input geometry must be a polygon.
-
-.. function:: ST_NumGeometries(Geometry) -> bigint
-
-    Returns the number of geometries in the collection.
-    If the geometry is a collection of geometries (e.g., GEOMETRYCOLLECTION or MULTI*),
-    returns the number of geometries,
-    for single geometries returns 1,
-    for empty geometries returns 0.
-
-.. function:: ST_Geometries(Geometry) -> array(Geometry)
-
-   Returns an array of geometries in the specified collection. Returns a one-element array
-   if the input geometry is not a multi-geometry. Returns ``NULL`` if input geometry is empty.
-
-.. function:: ST_NumPoints(Geometry) -> bigint
-
-    Returns the number of points in a geometry. This is an extension to the SQL/MM
-    ``ST_NumPoints`` function which only applies to point and linestring.
-
-.. function:: ST_NumInteriorRing(Geometry) -> bigint
-
-    Returns the cardinality of the collection of interior rings of a polygon.
-
-.. function:: line_interpolate_point(LineString, double) -> Geometry
-
-    Returns a Point interpolated along a LineString at the fraction given. The fraction
-    must be between 0 and 1, inclusive.
-
-.. function:: line_interpolate_points(LineString, double, repeated) -> array(Geometry)
-
-    Returns an array of Points interpolated along a LineString. The fraction must be
-    between 0 and 1, inclusive.
-
-.. function:: line_locate_point(LineString, Point) -> double
-
-    Returns a float between 0 and 1 representing the location of the closest point on
-    the LineString to the given Point, as a fraction of total 2d line length.
-
-    Returns ``NULL`` if a LineString or a Point is empty or ``NULL``.
-
-.. function:: geometry_invalid_reason(Geometry) -> varchar
-
-    Returns the reason for why the input geometry is not valid.
-    Returns ``NULL`` if the input is valid.
-
-.. function:: great_circle_distance(latitude1, longitude1, latitude2, longitude2) -> double
-
-    Returns the great-circle distance between two points on Earth's surface in kilometers.
-
-.. function:: to_geojson_geometry(SphericalGeography) -> varchar
-
-    Returns the GeoJSON encoded defined by the input spherical geography.
-
-.. function:: from_geojson_geometry(varchar) -> SphericalGeography
-
-    Returns the spherical geography type object from the GeoJSON representation stripping non geometry key/values.
-    Feature and FeatureCollection are not supported.
-
-Aggregations
-------------
-.. function:: convex_hull_agg(Geometry) -> Geometry
-
-    Returns the minimum convex geometry that encloses all input geometries.
-
-.. function:: geometry_union_agg(Geometry) -> Geometry
-
-    Returns a geometry that represents the point set union of all input geometries.
-
-Bing tiles
-----------
-
-These functions convert between geometries and
-`Bing tiles <https://msdn.microsoft.com/library/bb259689.aspx>`_.
-
-.. function:: bing_tile(x, y, zoom_level) -> BingTile
-
-    Creates a Bing tile object from XY coordinates and a zoom level.
-    Zoom levels from 1 to 23 are supported.
-
-.. function:: bing_tile(quadKey) -> BingTile
-    :noindex:
-
-    Creates a Bing tile object from a quadkey.
-
-.. function:: bing_tile_at(latitude, longitude, zoom_level) -> BingTile
-
-    Returns a Bing tile at a given zoom level containing a point at a given latitude
-    and longitude. Latitude must be within ``[-85.05112878, 85.05112878]`` range.
-    Longitude must be within ``[-180, 180]`` range. Zoom levels from 1 to 23 are supported.
-
-.. function:: bing_tiles_around(latitude, longitude, zoom_level) -> array(BingTile)
-
-    Returns a collection of Bing tiles that surround the point specified
-    by the latitude and longitude arguments at a given zoom level.
-
-.. function:: bing_tiles_around(latitude, longitude, zoom_level, radius_in_km) -> array(BingTile)
-    :noindex:
-
-    Returns a minimum set of Bing tiles at specified zoom level that cover a circle of specified
-    radius in km around a specified (latitude, longitude) point.
-
-.. function:: bing_tile_coordinates(tile) -> row<x, y>
-
-    Returns the XY coordinates of a given Bing tile.
-
-.. function:: bing_tile_polygon(tile) -> Geometry
-
-    Returns the polygon representation of a given Bing tile.
-
-.. function:: bing_tile_quadkey(tile) -> varchar
-
-    Returns the quadkey of a given Bing tile.
-
-.. function:: bing_tile_zoom_level(tile) -> tinyint
-
-    Returns the zoom level of a given Bing tile.
-
-.. function:: geometry_to_bing_tiles(geometry, zoom_level) -> array(BingTile)
-
-    Returns the minimum set of Bing tiles that fully covers a given geometry at
-    a given zoom level. Zoom levels from 1 to 23 are supported.
-
-Encoded polylines
------------------
-
-These functions convert between geometries and
-`encoded polylines <https://developers.google.com/maps/documentation/utilities/polylinealgorithm>`_.
-
-.. function:: to_encoded_polyline(Geometry) -> varchar
-
-    Encodes a linestring or multipoint to a polyline.
-
-.. function:: from_encoded_polyline(varchar) -> Geometry
-
-    Decodes a polyline to a linestring.
diff --git a/docs/src/main/sphinx/functions/hyperloglog.md b/docs/src/main/sphinx/functions/hyperloglog.md
new file mode 100644
index 000000000000..9a6a977999e1
--- /dev/null
+++ b/docs/src/main/sphinx/functions/hyperloglog.md
@@ -0,0 +1,74 @@
+# HyperLogLog functions
+
+Trino implements the {func}`approx_distinct` function using the
+[HyperLogLog](https://wikipedia.org/wiki/HyperLogLog) data structure.
+
+## Data structures
+
+Trino implements HyperLogLog data sketches as a set of 32-bit buckets which
+store a *maximum hash*. They can be stored sparsely (as a map from bucket ID
+to bucket), or densely (as a contiguous memory block). The HyperLogLog data
+structure starts as the sparse representation, switching to dense when it is
+more efficient. The P4HyperLogLog structure is initialized densely and
+remains dense for its lifetime.
+
+{ref}`hyperloglog-type` implicitly casts to {ref}`p4hyperloglog-type`,
+while one can explicitly cast `HyperLogLog` to `P4HyperLogLog`:
+
+```
+cast(hll AS P4HyperLogLog)
+```
+
+## Serialization
+
+Data sketches can be serialized to and deserialized from `varbinary`. This
+allows them to be stored for later use.  Combined with the ability to merge
+multiple sketches, this allows one to calculate {func}`approx_distinct` of the
+elements of a partition of a query, then for the entirety of a query with very
+little cost.
+
+For example, calculating the `HyperLogLog` for daily unique users will allow
+weekly or monthly unique users to be calculated incrementally by combining the
+dailies. This is similar to computing weekly revenue by summing daily revenue.
+Uses of {func}`approx_distinct` with `GROUPING SETS` can be converted to use
+`HyperLogLog`.  Examples:
+
+```
+CREATE TABLE visit_summaries (
+  visit_date date,
+  hll varbinary
+);
+
+INSERT INTO visit_summaries
+SELECT visit_date, cast(approx_set(user_id) AS varbinary)
+FROM user_visits
+GROUP BY visit_date;
+
+SELECT cardinality(merge(cast(hll AS HyperLogLog))) AS weekly_unique_users
+FROM visit_summaries
+WHERE visit_date >= current_date - interval '7' day;
+```
+
+## Functions
+
+:::{function} approx_set(x) -> HyperLogLog
+Returns the `HyperLogLog` sketch of the input data set of `x`. This
+data sketch underlies {func}`approx_distinct` and can be stored and
+used later by calling `cardinality()`.
+:::
+
+:::{function} cardinality(hll) -> bigint
+:noindex: true
+
+This will perform {func}`approx_distinct` on the data summarized by the
+`hll` HyperLogLog data sketch.
+:::
+
+:::{function} empty_approx_set() -> HyperLogLog
+Returns an empty `HyperLogLog`.
+:::
+
+:::{function} merge(HyperLogLog) -> HyperLogLog
+Returns the `HyperLogLog` of the aggregate union of the individual `hll`
+HyperLogLog structures.
+:::
diff --git a/docs/src/main/sphinx/functions/hyperloglog.rst b/docs/src/main/sphinx/functions/hyperloglog.rst
deleted file mode 100644
index 548e4133f456..000000000000
--- a/docs/src/main/sphinx/functions/hyperloglog.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-=====================
-HyperLogLog functions
-=====================
-
-Trino implements the :func:`approx_distinct` function using the
-`HyperLogLog <https://wikipedia.org/wiki/HyperLogLog>`_ data structure.
-
-Data structures
----------------
-
-Trino implements HyperLogLog data sketches as a set of 32-bit buckets which
-store a *maximum hash*. They can be stored sparsely (as a map from bucket ID
-to bucket), or densely (as a contiguous memory block). The HyperLogLog data
-structure starts as the sparse representation, switching to dense when it is
-more efficient. The P4HyperLogLog structure is initialized densely and
-remains dense for its lifetime.
-
-:ref:`hyperloglog_type` implicitly casts to :ref:`p4hyperloglog_type`,
-while one can explicitly cast ``HyperLogLog`` to ``P4HyperLogLog``::
-
-    cast(hll AS P4HyperLogLog)
-
-Serialization
--------------
-
-Data sketches can be serialized to and deserialized from ``varbinary``. This
-allows them to be stored for later use.  Combined with the ability to merge
-multiple sketches, this allows one to calculate :func:`approx_distinct` of the
-elements of a partition of a query, then for the entirety of a query with very
-little cost.
-
-For example, calculating the ``HyperLogLog`` for daily unique users will allow
-weekly or monthly unique users to be calculated incrementally by combining the
-dailies. This is similar to computing weekly revenue by summing daily revenue.
-Uses of :func:`approx_distinct` with ``GROUPING SETS`` can be converted to use
-``HyperLogLog``.  Examples::
-
-    CREATE TABLE visit_summaries (
-      visit_date date,
-      hll varbinary
-    );
-
-    INSERT INTO visit_summaries
-    SELECT visit_date, cast(approx_set(user_id) AS varbinary)
-    FROM user_visits
-    GROUP BY visit_date;
-
-    SELECT cardinality(merge(cast(hll AS HyperLogLog))) AS weekly_unique_users
-    FROM visit_summaries
-    WHERE visit_date >= current_date - interval '7' day;
-
-Functions
----------
-
-.. function:: approx_set(x) -> HyperLogLog
-
-    Returns the ``HyperLogLog`` sketch of the input data set of ``x``. This
-    data sketch underlies :func:`approx_distinct` and can be stored and
-    used later by calling ``cardinality()``.
-
-.. function:: cardinality(hll) -> bigint
-    :noindex:
-
-    This will perform :func:`approx_distinct` on the data summarized by the
-    ``hll`` HyperLogLog data sketch.
-
-.. function:: empty_approx_set() -> HyperLogLog
-
-    Returns an empty ``HyperLogLog``.
-
-.. function:: merge(HyperLogLog) -> HyperLogLog
-
-    Returns the ``HyperLogLog`` of the aggregate union of the individual ``hll``
-    HyperLogLog structures.
diff --git a/docs/src/main/sphinx/functions/ipaddress.md b/docs/src/main/sphinx/functions/ipaddress.md
new file mode 100644
index 000000000000..91fe20a9872f
--- /dev/null
+++ b/docs/src/main/sphinx/functions/ipaddress.md
@@ -0,0 +1,17 @@
+# IP Address Functions
+
+(ip-address-contains)=
+
+:::{function} contains(network, address) -> boolean
+:noindex: true
+
+Returns true if the `address` exists in the CIDR `network`:
+
+```
+SELECT contains('10.0.0.0/8', IPADDRESS '10.255.255.255'); -- true
+SELECT contains('10.0.0.0/8', IPADDRESS '11.255.255.255'); -- false
+
+SELECT contains('2001:0db8:0:0:0:ff00:0042:8329/128', IPADDRESS '2001:0db8:0:0:0:ff00:0042:8329'); -- true
+SELECT contains('2001:0db8:0:0:0:ff00:0042:8329/128', IPADDRESS '2001:0db8:0:0:0:ff00:0042:8328'); -- false
+```
+:::
diff --git a/docs/src/main/sphinx/functions/ipaddress.rst b/docs/src/main/sphinx/functions/ipaddress.rst
deleted file mode 100644
index c99232066525..000000000000
--- a/docs/src/main/sphinx/functions/ipaddress.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-====================
-IP Address Functions
-====================
-
-.. _ip_address_contains:
-
-.. function:: contains(network, address) -> boolean
-    :noindex:
-
-    Returns true if the ``address`` exists in the CIDR ``network``::
-
-        SELECT contains('10.0.0.0/8', IPADDRESS '10.255.255.255'); -- true
-        SELECT contains('10.0.0.0/8', IPADDRESS '11.255.255.255'); -- false
-
-        SELECT contains('2001:0db8:0:0:0:ff00:0042:8329/128', IPADDRESS '2001:0db8:0:0:0:ff00:0042:8329'); -- true
-        SELECT contains('2001:0db8:0:0:0:ff00:0042:8329/128', IPADDRESS '2001:0db8:0:0:0:ff00:0042:8328'); -- false
diff --git a/docs/src/main/sphinx/functions/json.md b/docs/src/main/sphinx/functions/json.md
new file mode 100644
index 000000000000..249db0af144c
--- /dev/null
+++ b/docs/src/main/sphinx/functions/json.md
@@ -0,0 +1,1760 @@
+# JSON functions and operators
+
+The SQL standard describes functions and operators to process JSON data. They
+allow you to access JSON data according to its structure, generate JSON data,
+and store it persistently in SQL tables.
+
+Importantly, the SQL standard imposes that there is no dedicated data type to
+represent JSON data in SQL. Instead, JSON data is represented as character or
+binary strings. Although Trino supports `JSON` type, it is not used or
+produced by the following functions.
+
+Trino supports three functions for querying JSON data:
+{ref}`json_exists<json-exists>`,
+{ref}`json_query<json-query>`, and {ref}`json_value<json-value>`. Each of them
+is based on the same mechanism of exploring and processing JSON input using
+JSON path.
+
+Trino also supports two functions for generating JSON data --
+{ref}`json_array<json-array>`, and {ref}`json_object<json-object>`.
+
+(json-path-language)=
+
+## JSON path language
+
+The JSON path language is a special language, used exclusively by certain SQL
+operators to specify the query to perform on the JSON input. Although JSON path
+expressions are embedded in SQL queries, their syntax significantly differs
+from SQL. The semantics of predicates, operators, etc. in JSON path expressions
+generally follow the semantics of SQL. The JSON path language is case-sensitive
+for keywords and identifiers.
+
+(json-path-syntax-and-semantics)=
+
+### JSON path syntax and semantics
+
+JSON path expressions are recursive structures. Although the name "path"
+suggests a linear sequence of operations going step by step deeper into the JSON
+structure, a JSON path expression is in fact a tree. It can access the input
+JSON item multiple times, in multiple ways, and combine the results. Moreover,
+the result of a JSON path expression is not a single item, but an ordered
+sequence of items. Each of the sub-expressions takes one or more input
+sequences, and returns a sequence as the result.
+
+:::{note}
+In the lax mode, most path operations first unnest all JSON arrays in the
+input sequence. Any divergence from this rule is mentioned in the following
+listing. Path modes are explained in {ref}`json-path-modes`.
+:::
+
+The JSON path language features are divided into: literals, variables,
+arithmetic binary expressions, arithmetic unary expressions, and a group of
+operators collectively known as accessors.
+
+#### literals
+
+- numeric literals
+
+  They include exact and approximate numbers, and are interpreted as if they
+  were SQL values.
+
+```text
+-1, 1.2e3, NaN
+```
+
+- string literals
+
+  They are enclosed in double quotes.
+
+```text
+"Some text"
+```
+
+- boolean literals
+
+```text
+true, false
+```
+
+- null literal
+
+  It has the semantics of the JSON null, not of SQL null. See {ref}`json-comparison-rules`.
+
+```text
+null
+```
+
+#### variables
+
+- context variable
+
+  It refers to the currently processed input of the JSON
+  function.
+
+```text
+$
+```
+
+- named variable
+
+  It refers to a named parameter by its name.
+
+```text
+$param
+```
+
+- current item variable
+
+  It is used inside the filter expression to refer to the currently processed
+  item from the input sequence.
+
+```text
+@
+```
+
+- last subscript variable
+
+  It refers to the last index of the innermost enclosing array. Array indexes
+  in JSON path expressions are zero-based.
+
+```text
+last
+```
+
+#### arithmetic binary expressions
+
+The JSON path language supports five arithmetic binary operators:
+
+```text
+<path1> + <path2>
+<path1> - <path2>
+<path1> * <path2>
+<path1> / <path2>
+<path1> % <path2>
+```
+
+Both operands, `<path1>` and `<path2>`, are evaluated to sequences of
+items. For arithmetic binary operators, each input sequence must contain a
+single numeric item. The arithmetic operation is performed according to SQL
+semantics, and it returns a sequence containing a single element with the
+result.
+
+The operators follow the same precedence rules as in SQL arithmetic operations,
+and parentheses can be used for grouping.
+
+#### arithmetic unary expressions
+
+```text
++ <path>
+- <path>
+```
+
+The operand `<path>` is evaluated to a sequence of items. Every item must be
+a numeric value. The unary plus or minus is applied to every item in the
+sequence, following SQL semantics, and the results form the returned sequence.
+
+#### member accessor
+
+The member accessor returns the value of the member with the specified key for
+each JSON object in the input sequence.
+
+```text
+<path>.key
+<path>."key"
+```
+
+The condition when a JSON object does not have such a member is called a
+structural error. In the lax mode, it is suppressed, and the faulty object is
+excluded from the result.
+
+Let `<path>` return a sequence of three JSON objects:
+
+```text
+{"customer" : 100, "region" : "AFRICA"},
+{"region" : "ASIA"},
+{"customer" : 300, "region" : "AFRICA", "comment" : null}
+```
+
+the expression `<path>.customer` succeeds in the first and the third object,
+but the second object lacks the required member. In strict mode, path
+evaluation fails. In lax mode, the second object is silently skipped, and the
+resulting sequence is `100, 300`.
+
+All items in the input sequence must be JSON objects.
+
+:::{note}
+Trino does not support JSON objects with duplicate keys.
+:::
+
+#### wildcard member accessor
+
+Returns values from all key-value pairs for each JSON object in the input
+sequence. All the partial results are concatenated into the returned sequence.
+
+```text
+<path>.*
+```
+
+Let `<path>` return a sequence of three JSON objects:
+
+```text
+{"customer" : 100, "region" : "AFRICA"},
+{"region" : "ASIA"},
+{"customer" : 300, "region" : "AFRICA", "comment" : null}
+```
+
+The results is:
+
+```text
+100, "AFRICA", "ASIA", 300, "AFRICA", null
+```
+
+All items in the input sequence must be JSON objects.
+
+The order of values returned from a single JSON object is arbitrary. The
+sub-sequences from all JSON objects are concatenated in the same order in which
+the JSON objects appear in the input sequence.
+
+(json-descendant-member-accessor)=
+
+#### descendant member accessor
+
+Returns the values associated with the specified key in all JSON objects on all
+levels of nesting in the input sequence.
+
+```text
+<path>..key
+<path>.."key"
+```
+
+The order of returned values is that of preorder depth first search. First, the
+enclosing object is visited, and then all child nodes are visited.
+
+This method does not perform array unwrapping in the lax mode. The results
+are the same in the lax and strict modes. The method traverses into JSON
+arrays and JSON objects. Non-structural JSON items are skipped.
+
+Let `<path>` be a sequence containing a JSON object:
+
+```text
+{
+    "id" : 1,
+    "notes" : [{"type" : 1, "comment" : "foo"}, {"type" : 2, "comment" : null}],
+    "comment" : ["bar", "baz"]
+}
+```
+
+```text
+<path>..comment --> ["bar", "baz"], "foo", null
+```
+
+#### array accessor
+
+Returns the elements at the specified indexes for each JSON array in the input
+sequence. Indexes are zero-based.
+
+```text
+<path>[ <subscripts> ]
+```
+
+The `<subscripts>` list contains one or more subscripts. Each subscript
+specifies a single index or a range (ends inclusive):
+
+```text
+<path>[<path1>, <path2> to <path3>, <path4>,...]
+```
+
+In lax mode, any non-array items resulting from the evaluation of the input
+sequence are wrapped into single-element arrays. Note that this is an exception
+to the rule of automatic array wrapping.
+
+Each array in the input sequence is processed in the following way:
+
+- The variable `last` is set to the last index of the array.
+- All subscript indexes are computed in order of declaration. For a
+  singleton subscript `<path1>`, the result must be a singleton numeric item.
+  For a range subscript `<path2> to <path3>`, two numeric items are expected.
+- The specified array elements are added in order to the output sequence.
+
+Let `<path>` return a sequence of three JSON arrays:
+
+```text
+[0, 1, 2], ["a", "b", "c", "d"], [null, null]
+```
+
+The following expression returns a sequence containing the last element from
+every array:
+
+```text
+<path>[last] --> 2, "d", null
+```
+
+The following expression returns the third and fourth element from every array:
+
+```text
+<path>[2 to 3] --> 2, "c", "d"
+```
+
+Note that the first array does not have the fourth element, and the last array
+does not have the third or fourth element. Accessing non-existent elements is a
+structural error. In strict mode, it causes the path expression to fail. In lax
+mode, such errors are suppressed, and only the existing elements are returned.
+
+Another example of a structural error is an improper range specification such
+as `5 to 3`.
+
+Note that the subscripts may overlap, and they do not need to follow the
+element order. The order in the returned sequence follows the subscripts:
+
+```text
+<path>[1, 0, 0] --> 1, 0, 0, "b", "a", "a", null, null, null
+```
+
+#### wildcard array accessor
+
+Returns all elements of each JSON array in the input sequence.
+
+```text
+<path>[*]
+```
+
+In lax mode, any non-array items resulting from the evaluation of the input
+sequence are wrapped into single-element arrays. Note that this is an exception
+to the rule of automatic array wrapping.
+
+The output order follows the order of the original JSON arrays. Also, the order
+of elements within the arrays is preserved.
+
+Let `<path>` return a sequence of three JSON arrays:
+
+```text
+[0, 1, 2], ["a", "b", "c", "d"], [null, null]
+<path>[*] --> 0, 1, 2, "a", "b", "c", "d", null, null
+```
+
+#### filter
+
+Retrieves the items from the input sequence which satisfy the predicate.
+
+```text
+<path>?( <predicate> )
+```
+
+JSON path predicates are syntactically similar to boolean expressions in SQL.
+However, the semantics are different in many aspects:
+
+- They operate on sequences of items.
+- They have their own error handling (they never fail).
+- They behave different depending on the lax or strict mode.
+
+The predicate evaluates to `true`, `false`, or `unknown`. Note that some
+predicate expressions involve nested JSON path expression. When evaluating the
+nested path, the variable `@` refers to the currently examined item from the
+input sequence.
+
+The following predicate expressions are supported:
+
+- Conjunction
+
+```text
+<predicate1> && <predicate2>
+```
+
+- Disjunction
+
+```text
+<predicate1> || <predicate2>
+```
+
+- Negation
+
+```text
+! <predicate>
+```
+
+- `exists` predicate
+
+```text
+exists( <path> )
+```
+
+Returns `true` if the nested path evaluates to a non-empty sequence, and
+`false` when the nested path evaluates to an empty sequence. If the path
+evaluation throws an error, returns `unknown`.
+
+- `starts with` predicate
+
+```text
+<path> starts with "Some text"
+<path> starts with $variable
+```
+
+The nested `<path>` must evaluate to a sequence of textual items, and the
+other operand must evaluate to a single textual item. If evaluating of either
+operand throws an error, the result is `unknown`. All items from the sequence
+are checked for starting with the right operand. The result is `true` if a
+match is found, otherwise `false`. However, if any of the comparisons throws
+an error, the result in the strict mode is `unknown`. The result in the lax
+mode depends on whether the match or the error was found first.
+
+- `is unknown` predicate
+
+```text
+( <predicate> ) is unknown
+```
+
+Returns `true` if the nested predicate evaluates to `unknown`, and
+`false` otherwise.
+
+- Comparisons
+
+```text
+<path1> == <path2>
+<path1> <> <path2>
+<path1> != <path2>
+<path1> < <path2>
+<path1> > <path2>
+<path1> <= <path2>
+<path1> >= <path2>
+```
+
+Both operands of a comparison evaluate to sequences of items. If either
+evaluation throws an error, the result is `unknown`. Items from the left and
+right sequence are then compared pairwise. Similarly to the `starts with`
+predicate, the result is `true` if any of the comparisons returns `true`,
+otherwise `false`. However, if any of the comparisons throws an error, for
+example because the compared types are not compatible, the result in the strict
+mode is `unknown`. The result in the lax mode depends on whether the `true`
+comparison or the error was found first.
+
+(json-comparison-rules)=
+
+##### Comparison rules
+
+Null values in the context of comparison behave different than SQL null:
+
+- null == null --> `true`
+- null != null, null \< null, ... --> `false`
+- null compared to a scalar value --> `false`
+- null compared to a JSON array or a JSON object --> `false`
+
+When comparing two scalar values, `true` or `false` is returned if the
+comparison is successfully performed. The semantics of the comparison is the
+same as in SQL. In case of an error, e.g. comparing text and number,
+`unknown` is returned.
+
+Comparing a scalar value with a JSON array or a JSON object, and comparing JSON
+arrays/objects is an error, so `unknown` is returned.
+
+##### Examples of filter
+
+Let `<path>` return a sequence of three JSON objects:
+
+```text
+{"customer" : 100, "region" : "AFRICA"},
+{"region" : "ASIA"},
+{"customer" : 300, "region" : "AFRICA", "comment" : null}
+```
+
+```text
+<path>?(@.region != "ASIA") --> {"customer" : 100, "region" : "AFRICA"},
+                                {"customer" : 300, "region" : "AFRICA", "comment" : null}
+<path>?(!exists(@.customer)) --> {"region" : "ASIA"}
+```
+
+The following accessors are collectively referred to as **item methods**.
+
+#### double()
+
+Converts numeric or text values into double values.
+
+```text
+<path>.double()
+```
+
+Let `<path>` return a sequence `-1, 23e4, "5.6"`:
+
+```text
+<path>.double() --> -1e0, 23e4, 5.6e0
+```
+
+#### ceiling(), floor(), and abs()
+
+Gets the ceiling, the floor or the absolute value for every numeric item in the
+sequence. The semantics of the operations is the same as in SQL.
+
+Let `<path>` return a sequence `-1.5, -1, 1.3`:
+
+```text
+<path>.ceiling() --> -1.0, -1, 2.0
+<path>.floor() --> -2.0, -1, 1.0
+<path>.abs() --> 1.5, 1, 1.3
+```
+
+#### keyvalue()
+
+Returns a collection of JSON objects including one object per every member of
+the original object for every JSON object in the sequence.
+
+```text
+<path>.keyvalue()
+```
+
+The returned objects have three members:
+
+- "name", which is the original key,
+- "value", which is the original bound value,
+- "id", which is the unique number, specific to an input object.
+
+Let `<path>` be a sequence of three JSON objects:
+
+```text
+{"customer" : 100, "region" : "AFRICA"},
+{"region" : "ASIA"},
+{"customer" : 300, "region" : "AFRICA", "comment" : null}
+```
+
+```text
+<path>.keyvalue() --> {"name" : "customer", "value" : 100, "id" : 0},
+                      {"name" : "region", "value" : "AFRICA", "id" : 0},
+                      {"name" : "region", "value" : "ASIA", "id" : 1},
+                      {"name" : "customer", "value" : 300, "id" : 2},
+                      {"name" : "region", "value" : "AFRICA", "id" : 2},
+                      {"name" : "comment", "value" : null, "id" : 2}
+```
+
+It is required that all items in the input sequence are JSON objects.
+
+The order of the returned values follows the order of the original JSON
+objects. However, within objects, the order of returned entries is arbitrary.
+
+#### type()
+
+Returns a textual value containing the type name for every item in the
+sequence.
+
+```text
+<path>.type()
+```
+
+This method does not perform array unwrapping in the lax mode.
+
+The returned values are:
+
+- `"null"` for JSON null,
+- `"number"` for a numeric item,
+- `"string"` for a textual item,
+- `"boolean"` for a boolean item,
+- `"date"` for an item of type date,
+- `"time without time zone"` for an item of type time,
+- `"time with time zone"` for an item of type time with time zone,
+- `"timestamp without time zone"` for an item of type timestamp,
+- `"timestamp with time zone"` for an item of type timestamp with time zone,
+- `"array"` for JSON array,
+- `"object"` for JSON object,
+
+#### size()
+
+Returns a numeric value containing the size for every JSON array in the
+sequence.
+
+```text
+<path>.size()
+```
+
+This method does not perform array unwrapping in the lax mode. Instead, all
+non-array items are wrapped in singleton JSON arrays, so their size is `1`.
+
+It is required that all items in the input sequence are JSON arrays.
+
+Let `<path>` return a sequence of three JSON arrays:
+
+```text
+[0, 1, 2], ["a", "b", "c", "d"], [null, null]
+<path>.size() --> 3, 4, 2
+```
+
+### Limitations
+
+The SQL standard describes the `datetime()` JSON path item method and the
+`like_regex()` JSON path predicate. Trino does not support them.
+
+(json-path-modes)=
+
+### JSON path modes
+
+The JSON path expression can be evaluated in two modes: strict and lax. In the
+strict mode, it is required that the input JSON data strictly fits the schema
+required by the path expression. In the lax mode, the input JSON data can
+diverge from the expected schema.
+
+The following table shows the differences between the two modes.
+
+:::{list-table}
+:widths: 40 20 40
+:header-rows: 1
+
+* - Condition
+  - strict mode
+  - lax mode
+* - Performing an operation which requires a non-array on an array, e.g.:
+
+    `$.key` requires a JSON object
+
+    `$.floor()` requires a numeric value
+  - ERROR
+  - The array is automatically unnested, and the operation is performed on
+    each array element.
+* - Performing an operation which requires an array on an non-array, e.g.:
+
+    `$[0]`, `$[*]`, `$.size()`
+  - ERROR
+  - The non-array item is automatically wrapped in a singleton array, and
+    the operation is performed on the array.
+* - A structural error: accessing a non-existent element of an array or a
+    non-existent member of a JSON object, e.g.:
+
+    `$[-1]` (array index out of bounds)
+
+    `$.key`, where the input JSON object does not have a member `key`
+  - ERROR
+  - The error is suppressed, and the operation results in an empty sequence.
+:::
+
+#### Examples of the lax mode behavior
+
+Let `<path>` return a sequence of three items, a JSON array, a JSON object,
+and a scalar numeric value:
+
+```text
+[1, "a", null], {"key1" : 1.0, "key2" : true}, -2e3
+```
+
+The following example shows the wildcard array accessor in the lax mode. The
+JSON array returns all its elements, while the JSON object and the number are
+wrapped in singleton arrays and then unnested, so effectively they appear
+unchanged in the output sequence:
+
+```text
+<path>[*] --> 1, "a", null, {"key1" : 1.0, "key2" : true}, -2e3
+```
+
+When calling the `size()` method, the JSON object and the number are also
+wrapped in singleton arrays:
+
+```text
+<path>.size() --> 3, 1, 1
+```
+
+In some cases, the lax mode cannot prevent failure. In the following example,
+even though the JSON array is unwrapped prior to calling the `floor()`
+method, the item `"a"` causes type mismatch.
+
+```text
+<path>.floor() --> ERROR
+```
+
+(json-exists)=
+
+## json_exists
+
+The `json_exists` function determines whether a JSON value satisfies a JSON
+path specification.
+
+```text
+JSON_EXISTS(
+    json_input [ FORMAT JSON [ ENCODING { UTF8 | UTF16 | UTF32 } ] ],
+    json_path
+    [ PASSING json_argument [, ...] ]
+    [ { TRUE | FALSE | UNKNOWN | ERROR } ON ERROR ]
+    )
+```
+
+The `json_path` is evaluated using the `json_input` as the context variable
+(`$`), and the passed arguments as the named variables (`$variable_name`).
+The returned value is `true` if the path returns a non-empty sequence, and
+`false` if the path returns an empty sequence. If an error occurs, the
+returned value depends on the `ON ERROR` clause. The default value returned
+`ON ERROR` is `FALSE`. The `ON ERROR` clause is applied for the following
+kinds of errors:
+
+- Input conversion errors, such as malformed JSON
+- JSON path evaluation errors, e.g. division by zero
+
+`json_input` is a character string or a binary string. It should contain
+a single JSON item. For a binary string, you can specify encoding.
+
+`json_path` is a string literal, containing the path mode specification, and
+the path expression, following the syntax rules described in
+{ref}`json-path-syntax-and-semantics`.
+
+```text
+'strict ($.price + $.tax)?(@ > 99.9)'
+'lax $[0 to 1].floor()?(@ > 10)'
+```
+
+In the `PASSING` clause you can pass arbitrary expressions to be used by the
+path expression.
+
+```text
+PASSING orders.totalprice AS O_PRICE,
+        orders.tax % 10 AS O_TAX
+```
+
+The passed parameters can be referenced in the path expression by named
+variables, prefixed with `$`.
+
+```text
+'lax $?(@.price > $O_PRICE || @.tax > $O_TAX)'
+```
+
+Additionally to SQL values, you can pass JSON values, specifying the format and
+optional encoding:
+
+```text
+PASSING orders.json_desc FORMAT JSON AS o_desc,
+        orders.binary_record FORMAT JSON ENCODING UTF16 AS o_rec
+```
+
+Note that the JSON path language is case-sensitive, while the unquoted SQL
+identifiers are upper-cased. Therefore, it is recommended to use quoted
+identifiers in the `PASSING` clause:
+
+```text
+'lax $.$KeyName' PASSING nation.name AS KeyName --> ERROR; no passed value found
+'lax $.$KeyName' PASSING nation.name AS "KeyName" --> correct
+```
+
+### Examples
+
+Let `customers` be a table containing two columns: `id:bigint`,
+`description:varchar`.
+
+| id  | description                                           |
+| --- | ----------------------------------------------------- |
+| 101 | '{"comment" : "nice", "children" : \[10, 13, 16\]}'   |
+| 102 | '{"comment" : "problematic", "children" : \[8, 11\]}' |
+| 103 | '{"comment" : "knows best", "children" : \[2\]}'      |
+
+The following query checks which customers have children above the age of 10:
+
+```text
+SELECT
+      id,
+      json_exists(
+                  description,
+                  'lax $.children[*]?(@ > 10)'
+                 ) AS children_above_ten
+FROM customers
+```
+
+| id  | children_above_ten |
+| --- | ------------------ |
+| 101 | true               |
+| 102 | true               |
+| 103 | false              |
+
+In the following query, the path mode is strict. We check the third child for
+each customer. This should cause a structural error for the customers who do
+not have three or more children. This error is handled according to the `ON
+ERROR` clause.
+
+```text
+SELECT
+      id,
+      json_exists(
+                  description,
+                  'strict $.children[2]?(@ > 10)'
+                  UNKNOWN ON ERROR
+                 ) AS child_3_above_ten
+FROM customers
+```
+
+| id  | child_3_above_ten |
+| --- | ----------------- |
+| 101 | true              |
+| 102 | NULL              |
+| 103 | NULL              |
+
+(json-query)=
+
+## json_query
+
+The `json_query` function extracts a JSON value from a JSON value.
+
+```text
+JSON_QUERY(
+    json_input [ FORMAT JSON [ ENCODING { UTF8 | UTF16 | UTF32 } ] ],
+    json_path
+    [ PASSING json_argument [, ...] ]
+    [ RETURNING type [ FORMAT JSON [ ENCODING { UTF8 | UTF16 | UTF32 } ] ] ]
+    [ WITHOUT [ ARRAY ] WRAPPER |
+      WITH [ { CONDITIONAL | UNCONDITIONAL } ] [ ARRAY ] WRAPPER ]
+    [ { KEEP | OMIT } QUOTES [ ON SCALAR STRING ] ]
+    [ { ERROR | NULL | EMPTY ARRAY | EMPTY OBJECT } ON EMPTY ]
+    [ { ERROR | NULL | EMPTY ARRAY | EMPTY OBJECT } ON ERROR ]
+    )
+```
+
+The `json_path` is evaluated using the `json_input` as the context variable
+(`$`), and the passed arguments as the named variables (`$variable_name`).
+
+The returned value is a JSON item returned by the path. By default, it is
+represented as a character string (`varchar`). In the `RETURNING` clause,
+you can specify other character string type or `varbinary`. With
+`varbinary`, you can also specify the desired encoding.
+
+`json_input` is a character string or a binary string. It should contain
+a single JSON item. For a binary string, you can specify encoding.
+
+`json_path` is a string literal, containing the path mode specification, and
+the path expression, following the syntax rules described in
+{ref}`json-path-syntax-and-semantics`.
+
+```text
+'strict $.keyvalue()?(@.name == $cust_id)'
+'lax $[5 to last]'
+```
+
+In the `PASSING` clause you can pass arbitrary expressions to be used by the
+path expression.
+
+```text
+PASSING orders.custkey AS CUST_ID
+```
+
+The passed parameters can be referenced in the path expression by named
+variables, prefixed with `$`.
+
+```text
+'strict $.keyvalue()?(@.value == $CUST_ID)'
+```
+
+Additionally to SQL values, you can pass JSON values, specifying the format and
+optional encoding:
+
+```text
+PASSING orders.json_desc FORMAT JSON AS o_desc,
+        orders.binary_record FORMAT JSON ENCODING UTF16 AS o_rec
+```
+
+Note that the JSON path language is case-sensitive, while the unquoted SQL
+identifiers are upper-cased. Therefore, it is recommended to use quoted
+identifiers in the `PASSING` clause:
+
+```text
+'lax $.$KeyName' PASSING nation.name AS KeyName --> ERROR; no passed value found
+'lax $.$KeyName' PASSING nation.name AS "KeyName" --> correct
+```
+
+The `ARRAY WRAPPER` clause lets you modify the output by wrapping the results
+in a JSON array. `WITHOUT ARRAY WRAPPER` is the default option. `WITH
+CONDITIONAL ARRAY WRAPPER` wraps every result which is not a singleton JSON
+array or JSON object. `WITH UNCONDITIONAL ARRAY WRAPPER` wraps every result.
+
+The `QUOTES` clause lets you modify the result for a scalar string by
+removing the double quotes being part of the JSON string representation.
+
+### Examples
+
+Let `customers` be a table containing two columns: `id:bigint`,
+`description:varchar`.
+
+| id  | description                                           |
+| --- | ----------------------------------------------------- |
+| 101 | '{"comment" : "nice", "children" : \[10, 13, 16\]}'   |
+| 102 | '{"comment" : "problematic", "children" : \[8, 11\]}' |
+| 103 | '{"comment" : "knows best", "children" : \[2\]}'      |
+
+The following query gets the `children` array for each customer:
+
+```text
+SELECT
+      id,
+      json_query(
+                 description,
+                 'lax $.children'
+                ) AS children
+FROM customers
+```
+
+| id  | children       |
+| --- | -------------- |
+| 101 | '\[10,13,16\]' |
+| 102 | '\[8,11\]'     |
+| 103 | '\[2\]'        |
+
+The following query gets the collection of children for each customer.
+Note that the `json_query` function can only output a single JSON item. If
+you don't use array wrapper, you get an error for every customer with multiple
+children. The error is handled according to the `ON ERROR` clause.
+
+```text
+SELECT
+      id,
+      json_query(
+                 description,
+                 'lax $.children[*]'
+                 WITHOUT ARRAY WRAPPER
+                 NULL ON ERROR
+                ) AS children
+FROM customers
+```
+
+| id  | children |
+| --- | -------- |
+| 101 | NULL     |
+| 102 | NULL     |
+| 103 | '2'      |
+
+The following query gets the last child for each customer, wrapped in a JSON
+array:
+
+```text
+SELECT
+      id,
+      json_query(
+                 description,
+                 'lax $.children[last]'
+                 WITH ARRAY WRAPPER
+                ) AS last_child
+FROM customers
+```
+
+| id  | last_child |
+| --- | ---------- |
+| 101 | '\[16\]'   |
+| 102 | '\[11\]'   |
+| 103 | '\[2\]'    |
+
+The following query gets all children above the age of 12 for each customer,
+wrapped in a JSON array. The second and the third customer don't have children
+of this age. Such case is handled according to the `ON EMPTY` clause. The
+default value returned `ON EMPTY` is `NULL`. In the following example,
+`EMPTY ARRAY ON EMPTY` is specified.
+
+```text
+SELECT
+      id,
+      json_query(
+                 description,
+                 'strict $.children[*]?(@ > 12)'
+                 WITH ARRAY WRAPPER
+                 EMPTY ARRAY ON EMPTY
+                ) AS children
+FROM customers
+```
+
+| id  | children    |
+| --- | ----------- |
+| 101 | '\[13,16\]' |
+| 102 | '\[\]'      |
+| 103 | '\[\]'      |
+
+The following query shows the result of the `QUOTES` clause. Note that `KEEP
+QUOTES` is the default.
+
+```text
+SELECT
+      id,
+      json_query(description, 'strict $.comment' KEEP QUOTES) AS quoted_comment,
+      json_query(description, 'strict $.comment' OMIT QUOTES) AS unquoted_comment
+FROM customers
+```
+
+| id  | quoted_comment  | unquoted_comment |
+| --- | --------------- | ---------------- |
+| 101 | '"nice"'        | 'nice'           |
+| 102 | '"problematic"' | 'problematic'    |
+| 103 | '"knows best"'  | 'knows best'     |
+
+If an error occurs, the returned value depends on the `ON ERROR` clause. The
+default value returned `ON ERROR` is `NULL`. One example of error is
+multiple items returned by the path. Other errors caught and handled according
+to the `ON ERROR` clause are:
+
+- Input conversion errors, such as malformed JSON
+- JSON path evaluation errors, e.g. division by zero
+- Output conversion errors
+
+(json-value)=
+
+## json_value
+
+The `json_value` function extracts a scalar SQL value from a JSON value.
+
+```text
+JSON_VALUE(
+    json_input [ FORMAT JSON [ ENCODING { UTF8 | UTF16 | UTF32 } ] ],
+    json_path
+    [ PASSING json_argument [, ...] ]
+    [ RETURNING type ]
+    [ { ERROR | NULL | DEFAULT expression } ON EMPTY ]
+    [ { ERROR | NULL | DEFAULT expression } ON ERROR ]
+    )
+```
+
+The `json_path` is evaluated using the `json_input` as the context variable
+(`$`), and the passed arguments as the named variables (`$variable_name`).
+
+The returned value is the SQL scalar returned by the path. By default, it is
+converted to string (`varchar`). In the `RETURNING` clause, you can specify
+other desired type: a character string type, numeric, boolean or datetime type.
+
+`json_input` is a character string or a binary string. It should contain
+a single JSON item. For a binary string, you can specify encoding.
+
+`json_path` is a string literal, containing the path mode specification, and
+the path expression, following the syntax rules described in
+{ref}`json-path-syntax-and-semantics`.
+
+```text
+'strict $.price + $tax'
+'lax $[last].abs().floor()'
+```
+
+In the `PASSING` clause you can pass arbitrary expressions to be used by the
+path expression.
+
+```text
+PASSING orders.tax AS O_TAX
+```
+
+The passed parameters can be referenced in the path expression by named
+variables, prefixed with `$`.
+
+```text
+'strict $[last].price + $O_TAX'
+```
+
+Additionally to SQL values, you can pass JSON values, specifying the format and
+optional encoding:
+
+```text
+PASSING orders.json_desc FORMAT JSON AS o_desc,
+        orders.binary_record FORMAT JSON ENCODING UTF16 AS o_rec
+```
+
+Note that the JSON path language is case-sensitive, while the unquoted SQL
+identifiers are upper-cased. Therefore, it is recommended to use quoted
+identifiers in the `PASSING` clause:
+
+```text
+'lax $.$KeyName' PASSING nation.name AS KeyName --> ERROR; no passed value found
+'lax $.$KeyName' PASSING nation.name AS "KeyName" --> correct
+```
+
+If the path returns an empty sequence, the `ON EMPTY` clause is applied. The
+default value returned `ON EMPTY` is `NULL`. You can also specify the
+default value:
+
+```text
+DEFAULT -1 ON EMPTY
+```
+
+If an error occurs, the returned value depends on the `ON ERROR` clause. The
+default value returned `ON ERROR` is `NULL`. One example of error is
+multiple items returned by the path. Other errors caught and handled according
+to the `ON ERROR` clause are:
+
+- Input conversion errors, such as malformed JSON
+- JSON path evaluation errors, e.g. division by zero
+- Returned scalar not convertible to the desired type
+
+### Examples
+
+Let `customers` be a table containing two columns: `id:bigint`,
+`description:varchar`.
+
+| id  | description                                           |
+| --- | ----------------------------------------------------- |
+| 101 | '{"comment" : "nice", "children" : \[10, 13, 16\]}'   |
+| 102 | '{"comment" : "problematic", "children" : \[8, 11\]}' |
+| 103 | '{"comment" : "knows best", "children" : \[2\]}'      |
+
+The following query gets the `comment` for each customer as `char(12)`:
+
+```text
+SELECT id, json_value(
+                      description,
+                      'lax $.comment'
+                      RETURNING char(12)
+                     ) AS comment
+FROM customers
+```
+
+| id  | comment        |
+| --- | -------------- |
+| 101 | 'nice        ' |
+| 102 | 'problematic ' |
+| 103 | 'knows best  ' |
+
+The following query gets the first child's age for each customer as
+`tinyint`:
+
+```text
+SELECT id, json_value(
+                      description,
+                      'lax $.children[0]'
+                      RETURNING tinyint
+                     ) AS child
+FROM customers
+```
+
+| id  | child |
+| --- | ----- |
+| 101 | 10    |
+| 102 | 8     |
+| 103 | 2     |
+
+The following query gets the third child's age for each customer. In the strict
+mode, this should cause a structural error for the customers who do not have
+the third child. This error is handled according to the `ON ERROR` clause.
+
+```text
+SELECT id, json_value(
+                      description,
+                      'strict $.children[2]'
+                      DEFAULT 'err' ON ERROR
+                     ) AS child
+FROM customers
+```
+
+| id  | child |
+| --- | ----- |
+| 101 | '16'  |
+| 102 | 'err' |
+| 103 | 'err' |
+
+After changing the mode to lax, the structural error is suppressed, and the
+customers without a third child produce empty sequence. This case is handled
+according to the `ON EMPTY` clause.
+
+```text
+SELECT id, json_value(
+                      description,
+                      'lax $.children[2]'
+                      DEFAULT 'missing' ON EMPTY
+                     ) AS child
+FROM customers
+```
+
+| id  | child     |
+| --- | --------- |
+| 101 | '16'      |
+| 102 | 'missing' |
+| 103 | 'missing' |
+
+(json-array)=
+
+## json_array
+
+The `json_array` function creates a JSON array containing given elements.
+
+```text
+JSON_ARRAY(
+    [ array_element [, ...]
+      [ { NULL ON NULL | ABSENT ON NULL } ] ],
+    [ RETURNING type [ FORMAT JSON [ ENCODING { UTF8 | UTF16 | UTF32 } ] ] ]
+    )
+```
+
+### Argument types
+
+The array elements can be arbitrary expressions. Each passed value is converted
+into a JSON item according to its type, and optional `FORMAT` and
+`ENCODING` specification.
+
+You can pass SQL values of types boolean, numeric, and character string. They
+are converted to corresponding JSON literals:
+
+```
+SELECT json_array(true, 12e-1, 'text')
+--> '[true,1.2,"text"]'
+```
+
+Additionally to SQL values, you can pass JSON values. They are character or
+binary strings with a specified format and optional encoding:
+
+```
+SELECT json_array(
+                  '[  "text"  ] ' FORMAT JSON,
+                  X'5B0035005D00' FORMAT JSON ENCODING UTF16
+                 )
+--> '[["text"],[5]]'
+```
+
+You can also nest other JSON-returning functions. In that case, the `FORMAT`
+option is implicit:
+
+```
+SELECT json_array(
+                  json_query('{"key" : [  "value"  ]}', 'lax $.key')
+                 )
+--> '[["value"]]'
+```
+
+Other passed values are cast to varchar, and they become JSON text literals:
+
+```
+SELECT json_array(
+                  DATE '2001-01-31',
+                  UUID '12151fd2-7586-11e9-8f9e-2a86e4085a59'
+                 )
+--> '["2001-01-31","12151fd2-7586-11e9-8f9e-2a86e4085a59"]'
+```
+
+You can omit the arguments altogether to get an empty array:
+
+```
+SELECT json_array() --> '[]'
+```
+
+### Null handling
+
+If a value passed for an array element is `null`, it is treated according to
+the specified null treatment option. If `ABSENT ON NULL` is specified, the
+null element is omitted in the result. If `NULL ON NULL` is specified, JSON
+`null` is added to the result. `ABSENT ON NULL` is the default
+configuration:
+
+```
+SELECT json_array(true, null, 1)
+--> '[true,1]'
+
+SELECT json_array(true, null, 1 ABSENT ON NULL)
+--> '[true,1]'
+
+SELECT json_array(true, null, 1 NULL ON NULL)
+--> '[true,null,1]'
+```
+
+### Returned type
+
+The SQL standard imposes that there is no dedicated data type to represent JSON
+data in SQL. Instead, JSON data is represented as character or binary strings.
+By default, the `json_array` function returns varchar containing the textual
+representation of the JSON array. With the `RETURNING` clause, you can
+specify other character string type:
+
+```
+SELECT json_array(true, 1 RETURNING VARCHAR(100))
+--> '[true,1]'
+```
+
+You can also specify to use varbinary and the required encoding as return type.
+The default encoding is UTF8:
+
+```
+SELECT json_array(true, 1 RETURNING VARBINARY)
+--> X'5b 74 72 75 65 2c 31 5d'
+
+SELECT json_array(true, 1 RETURNING VARBINARY FORMAT JSON ENCODING UTF8)
+--> X'5b 74 72 75 65 2c 31 5d'
+
+SELECT json_array(true, 1 RETURNING VARBINARY FORMAT JSON ENCODING UTF16)
+--> X'5b 00 74 00 72 00 75 00 65 00 2c 00 31 00 5d 00'
+
+SELECT json_array(true, 1 RETURNING VARBINARY FORMAT JSON ENCODING UTF32)
+--> X'5b 00 00 00 74 00 00 00 72 00 00 00 75 00 00 00 65 00 00 00 2c 00 00 00 31 00 00 00 5d 00 00 00'
+```
+
+(json-object)=
+
+## json_object
+
+The `json_object` function creates a JSON object containing given key-value pairs.
+
+```text
+JSON_OBJECT(
+    [ key_value [, ...]
+      [ { NULL ON NULL | ABSENT ON NULL } ] ],
+      [ { WITH UNIQUE [ KEYS ] | WITHOUT UNIQUE [ KEYS ] } ]
+    [ RETURNING type [ FORMAT JSON [ ENCODING { UTF8 | UTF16 | UTF32 } ] ] ]
+    )
+```
+
+### Argument passing conventions
+
+There are two conventions for passing keys and values:
+
+```
+SELECT json_object('key1' : 1, 'key2' : true)
+--> '{"key1":1,"key2":true}'
+
+SELECT json_object(KEY 'key1' VALUE 1, KEY 'key2' VALUE true)
+--> '{"key1":1,"key2":true}'
+```
+
+In the second convention, you can omit the `KEY` keyword:
+
+```
+SELECT json_object('key1' VALUE 1, 'key2' VALUE true)
+--> '{"key1":1,"key2":true}'
+```
+
+### Argument types
+
+The keys can be arbitrary expressions. They must be of character string type.
+Each key is converted into a JSON text item, and it becomes a key in the
+created JSON object. Keys must not be null.
+
+The values can be arbitrary expressions. Each passed value is converted
+into a JSON item according to its type, and optional `FORMAT` and
+`ENCODING` specification.
+
+You can pass SQL values of types boolean, numeric, and character string. They
+are converted to corresponding JSON literals:
+
+```
+SELECT json_object('x' : true, 'y' : 12e-1, 'z' : 'text')
+--> '{"x":true,"y":1.2,"z":"text"}'
+```
+
+Additionally to SQL values, you can pass JSON values. They are character or
+binary strings with a specified format and optional encoding:
+
+```
+SELECT json_object(
+                   'x' : '[  "text"  ] ' FORMAT JSON,
+                   'y' : X'5B0035005D00' FORMAT JSON ENCODING UTF16
+                  )
+--> '{"x":["text"],"y":[5]}'
+```
+
+You can also nest other JSON-returning functions. In that case, the `FORMAT`
+option is implicit:
+
+```
+SELECT json_object(
+                   'x' : json_query('{"key" : [  "value"  ]}', 'lax $.key')
+                  )
+--> '{"x":["value"]}'
+```
+
+Other passed values are cast to varchar, and they become JSON text literals:
+
+```
+SELECT json_object(
+                   'x' : DATE '2001-01-31',
+                   'y' : UUID '12151fd2-7586-11e9-8f9e-2a86e4085a59'
+                  )
+--> '{"x":"2001-01-31","y":"12151fd2-7586-11e9-8f9e-2a86e4085a59"}'
+```
+
+You can omit the arguments altogether to get an empty object:
+
+```
+SELECT json_object() --> '{}'
+```
+
+### Null handling
+
+The values passed for JSON object keys must not be null. It is allowed to pass
+`null` for JSON object values. A null value is treated according to the
+specified null treatment option. If `NULL ON NULL` is specified, a JSON
+object entry with `null` value is added to the result. If `ABSENT ON NULL`
+is specified, the entry is omitted in the result. `NULL ON NULL` is the
+default configuration.:
+
+```
+SELECT json_object('x' : null, 'y' : 1)
+--> '{"x":null,"y":1}'
+
+SELECT json_object('x' : null, 'y' : 1 NULL ON NULL)
+--> '{"x":null,"y":1}'
+
+SELECT json_object('x' : null, 'y' : 1 ABSENT ON NULL)
+--> '{"y":1}'
+```
+
+### Key uniqueness
+
+If a duplicate key is encountered, it is handled according to the specified key
+uniqueness constraint.
+
+If `WITH UNIQUE KEYS` is specified, a duplicate key results in a query
+failure:
+
+```
+SELECT json_object('x' : null, 'x' : 1 WITH UNIQUE KEYS)
+--> failure: "duplicate key passed to JSON_OBJECT function"
+```
+
+Note that this option is not supported if any of the arguments has a
+`FORMAT` specification.
+
+If `WITHOUT UNIQUE KEYS` is specified, duplicate keys are not supported due
+to implementation limitation. `WITHOUT UNIQUE KEYS` is the default
+configuration.
+
+### Returned type
+
+The SQL standard imposes that there is no dedicated data type to represent JSON
+data in SQL. Instead, JSON data is represented as character or binary strings.
+By default, the `json_object` function returns varchar containing the textual
+representation of the JSON object. With the `RETURNING` clause, you can
+specify other character string type:
+
+```
+SELECT json_object('x' : 1 RETURNING VARCHAR(100))
+--> '{"x":1}'
+```
+
+You can also specify to use varbinary and the required encoding as return type.
+The default encoding is UTF8:
+
+```
+SELECT json_object('x' : 1 RETURNING VARBINARY)
+--> X'7b 22 78 22 3a 31 7d'
+
+SELECT json_object('x' : 1 RETURNING VARBINARY FORMAT JSON ENCODING UTF8)
+--> X'7b 22 78 22 3a 31 7d'
+
+SELECT json_object('x' : 1 RETURNING VARBINARY FORMAT JSON ENCODING UTF16)
+--> X'7b 00 22 00 78 00 22 00 3a 00 31 00 7d 00'
+
+SELECT json_object('x' : 1 RETURNING VARBINARY FORMAT JSON ENCODING UTF32)
+--> X'7b 00 00 00 22 00 00 00 78 00 00 00 22 00 00 00 3a 00 00 00 31 00 00 00 7d 00 00 00'
+```
+
+:::{warning}
+The following functions and operators are not compliant with the SQL
+standard, and should be considered deprecated. According to the SQL
+standard, there shall be no `JSON` data type. Instead, JSON values
+should be represented as string values. The remaining functionality of the
+following functions is covered by the functions described previously.
+:::
+
+## Cast to JSON
+
+The following types can be cast to JSON:
+
+- `BOOLEAN`
+- `TINYINT`
+- `SMALLINT`
+- `INTEGER`
+- `BIGINT`
+- `REAL`
+- `DOUBLE`
+- `VARCHAR`
+
+Additionally, `ARRAY`, `MAP`, and `ROW` types can be cast to JSON when
+the following requirements are met:
+
+- `ARRAY` types can be cast when the element type of the array is one
+  of the supported types.
+- `MAP` types can be cast when the key type of the map is `VARCHAR` and
+  the value type of the map is a supported type,
+- `ROW` types can be cast when every field type of the row is a supported
+  type.
+
+:::{note}
+Cast operations with supported {ref}`character string types
+<string-data-types>` treat the input as a string, not validated as JSON.
+This means that a cast operation with a string-type input of invalid JSON
+results in a succesful cast to invalid JSON.
+
+Instead, consider using the {func}`json_parse` function to
+create validated JSON from a string.
+:::
+
+The following examples show the behavior of casting to JSON with these types:
+
+```
+SELECT CAST(NULL AS JSON);
+-- NULL
+
+SELECT CAST(1 AS JSON);
+-- JSON '1'
+
+SELECT CAST(9223372036854775807 AS JSON);
+-- JSON '9223372036854775807'
+
+SELECT CAST('abc' AS JSON);
+-- JSON '"abc"'
+
+SELECT CAST(true AS JSON);
+-- JSON 'true'
+
+SELECT CAST(1.234 AS JSON);
+-- JSON '1.234'
+
+SELECT CAST(ARRAY[1, 23, 456] AS JSON);
+-- JSON '[1,23,456]'
+
+SELECT CAST(ARRAY[1, NULL, 456] AS JSON);
+-- JSON '[1,null,456]'
+
+SELECT CAST(ARRAY[ARRAY[1, 23], ARRAY[456]] AS JSON);
+-- JSON '[[1,23],[456]]'
+
+SELECT CAST(MAP(ARRAY['k1', 'k2', 'k3'], ARRAY[1, 23, 456]) AS JSON);
+-- JSON '{"k1":1,"k2":23,"k3":456}'
+
+SELECT CAST(CAST(ROW(123, 'abc', true) AS
+            ROW(v1 BIGINT, v2 VARCHAR, v3 BOOLEAN)) AS JSON);
+-- JSON '{"v1":123,"v2":"abc","v3":true}'
+```
+
+Casting from NULL to `JSON` is not straightforward. Casting
+from a standalone `NULL` will produce SQL `NULL` instead of
+`JSON 'null'`. However, when casting from arrays or map containing
+`NULL`s, the produced `JSON` will have `null`s in it.
+
+## Cast from JSON
+
+Casting to `BOOLEAN`, `TINYINT`, `SMALLINT`, `INTEGER`,
+`BIGINT`, `REAL`, `DOUBLE` or `VARCHAR` is supported.
+Casting to `ARRAY` and `MAP` is supported when the element type of
+the array is one of the supported types, or when the key type of the map
+is `VARCHAR` and value type of the map is one of the supported types.
+Behaviors of the casts are shown with the examples below:
+
+```
+SELECT CAST(JSON 'null' AS VARCHAR);
+-- NULL
+
+SELECT CAST(JSON '1' AS INTEGER);
+-- 1
+
+SELECT CAST(JSON '9223372036854775807' AS BIGINT);
+-- 9223372036854775807
+
+SELECT CAST(JSON '"abc"' AS VARCHAR);
+-- abc
+
+SELECT CAST(JSON 'true' AS BOOLEAN);
+-- true
+
+SELECT CAST(JSON '1.234' AS DOUBLE);
+-- 1.234
+
+SELECT CAST(JSON '[1,23,456]' AS ARRAY(INTEGER));
+-- [1, 23, 456]
+
+SELECT CAST(JSON '[1,null,456]' AS ARRAY(INTEGER));
+-- [1, NULL, 456]
+
+SELECT CAST(JSON '[[1,23],[456]]' AS ARRAY(ARRAY(INTEGER)));
+-- [[1, 23], [456]]
+
+SELECT CAST(JSON '{"k1":1,"k2":23,"k3":456}' AS MAP(VARCHAR, INTEGER));
+-- {k1=1, k2=23, k3=456}
+
+SELECT CAST(JSON '{"v1":123,"v2":"abc","v3":true}' AS
+            ROW(v1 BIGINT, v2 VARCHAR, v3 BOOLEAN));
+-- {v1=123, v2=abc, v3=true}
+
+SELECT CAST(JSON '[123,"abc",true]' AS
+            ROW(v1 BIGINT, v2 VARCHAR, v3 BOOLEAN));
+-- {v1=123, v2=abc, v3=true}
+```
+
+JSON arrays can have mixed element types and JSON maps can have mixed
+value types. This makes it impossible to cast them to SQL arrays and maps in
+some cases. To address this, Trino supports partial casting of arrays and maps:
+
+```
+SELECT CAST(JSON '[[1, 23], 456]' AS ARRAY(JSON));
+-- [JSON '[1,23]', JSON '456']
+
+SELECT CAST(JSON '{"k1": [1, 23], "k2": 456}' AS MAP(VARCHAR, JSON));
+-- {k1 = JSON '[1,23]', k2 = JSON '456'}
+
+SELECT CAST(JSON '[null]' AS ARRAY(JSON));
+-- [JSON 'null']
+```
+
+When casting from `JSON` to `ROW`, both JSON array and JSON object are supported.
+
+## Other JSON functions
+
+In addition to the functions explained in more details in the preceding
+sections, the following functions are available:
+
+:::{function} is_json_scalar(json) -> boolean
+Determine if `json` is a scalar (i.e. a JSON number, a JSON string, `true`, `false` or `null`):
+
+```
+SELECT is_json_scalar('1');         -- true
+SELECT is_json_scalar('[1, 2, 3]'); -- false
+```
+:::
+
+:::{function} json_array_contains(json, value) -> boolean
+Determine if `value` exists in `json` (a string containing a JSON array):
+
+```
+SELECT json_array_contains('[1, 2, 3]', 2); -- true
+```
+:::
+
+::::{function} json_array_get(json_array, index) -> json
+
+:::{warning}
+The semantics of this function are broken. If the extracted element
+is a string, it will be converted into an invalid `JSON` value that
+is not properly quoted (the value will not be surrounded by quotes
+and any interior quotes will not be escaped).
+
+We recommend against using this function. It cannot be fixed without
+impacting existing usages and may be removed in a future release.
+:::
+
+Returns the element at the specified index into the `json_array`.
+The index is zero-based:
+
+```
+SELECT json_array_get('["a", [3, 9], "c"]', 0); -- JSON 'a' (invalid JSON)
+SELECT json_array_get('["a", [3, 9], "c"]', 1); -- JSON '[3,9]'
+```
+
+This function also supports negative indexes for fetching element indexed
+from the end of an array:
+
+```
+SELECT json_array_get('["c", [3, 9], "a"]', -1); -- JSON 'a' (invalid JSON)
+SELECT json_array_get('["c", [3, 9], "a"]', -2); -- JSON '[3,9]'
+```
+
+If the element at the specified index doesn't exist, the function returns null:
+
+```
+SELECT json_array_get('[]', 0);                -- NULL
+SELECT json_array_get('["a", "b", "c"]', 10);  -- NULL
+SELECT json_array_get('["c", "b", "a"]', -10); -- NULL
+```
+::::
+
+:::{function} json_array_length(json) -> bigint
+Returns the array length of `json` (a string containing a JSON array):
+
+```
+SELECT json_array_length('[1, 2, 3]'); -- 3
+```
+:::
+
+:::{function} json_extract(json, json_path) -> json
+Evaluates the [JSONPath]-like expression `json_path` on `json`
+(a string containing JSON) and returns the result as a JSON string:
+
+```
+SELECT json_extract(json, '$.store.book');
+SELECT json_extract(json, '$.store[book]');
+SELECT json_extract(json, '$.store["book name"]');
+```
+
+The {ref}`json_query function<json-query>` provides a more powerful and
+feature-rich alternative to parse and extract JSON data.
+:::
+
+:::{function} json_extract_scalar(json, json_path) -> varchar
+Like {func}`json_extract`, but returns the result value as a string (as opposed
+to being encoded as JSON). The value referenced by `json_path` must be a
+scalar (boolean, number or string).
+
+```
+SELECT json_extract_scalar('[1, 2, 3]', '$[2]');
+SELECT json_extract_scalar(json, '$.store.book[0].author');
+```
+:::
+
+::::{function} json_format(json) -> varchar
+Returns the JSON text serialized from the input JSON value.
+This is inverse function to {func}`json_parse`.
+
+```
+SELECT json_format(JSON '[1, 2, 3]'); -- '[1,2,3]'
+SELECT json_format(JSON '"a"');       -- '"a"'
+```
+
+:::{note}
+{func}`json_format` and `CAST(json AS VARCHAR)` have completely
+different semantics.
+
+{func}`json_format` serializes the input JSON value to JSON text conforming to
+{rfc}`7159`. The JSON value can be a JSON object, a JSON array, a JSON string,
+a JSON number, `true`, `false` or `null`.
+
+```
+SELECT json_format(JSON '{"a": 1, "b": 2}'); -- '{"a":1,"b":2}'
+SELECT json_format(JSON '[1, 2, 3]');        -- '[1,2,3]'
+SELECT json_format(JSON '"abc"');            -- '"abc"'
+SELECT json_format(JSON '42');               -- '42'
+SELECT json_format(JSON 'true');             -- 'true'
+SELECT json_format(JSON 'null');             -- 'null'
+```
+
+`CAST(json AS VARCHAR)` casts the JSON value to the corresponding SQL VARCHAR value.
+For JSON string, JSON number, `true`, `false` or `null`, the cast
+behavior is same as the corresponding SQL type. JSON object and JSON array
+cannot be cast to VARCHAR.
+
+```
+SELECT CAST(JSON '{"a": 1, "b": 2}' AS VARCHAR); -- ERROR!
+SELECT CAST(JSON '[1, 2, 3]' AS VARCHAR);        -- ERROR!
+SELECT CAST(JSON '"abc"' AS VARCHAR);            -- 'abc' (the double quote is gone)
+SELECT CAST(JSON '42' AS VARCHAR);               -- '42'
+SELECT CAST(JSON 'true' AS VARCHAR);             -- 'true'
+SELECT CAST(JSON 'null' AS VARCHAR);             -- NULL
+```
+:::
+::::
+
+::::{function} json_parse(string) -> json
+Returns the JSON value deserialized from the input JSON text.
+This is inverse function to {func}`json_format`:
+
+```
+SELECT json_parse('[1, 2, 3]');   -- JSON '[1,2,3]'
+SELECT json_parse('"abc"');       -- JSON '"abc"'
+```
+
+:::{note}
+{func}`json_parse` and `CAST(string AS JSON)` have completely
+different semantics.
+
+{func}`json_parse` expects a JSON text conforming to {rfc}`7159`, and returns
+the JSON value deserialized from the JSON text.
+The JSON value can be a JSON object, a JSON array, a JSON string, a JSON number,
+`true`, `false` or `null`.
+
+```
+SELECT json_parse('not_json');         -- ERROR!
+SELECT json_parse('["a": 1, "b": 2]'); -- JSON '["a": 1, "b": 2]'
+SELECT json_parse('[1, 2, 3]');        -- JSON '[1,2,3]'
+SELECT json_parse('"abc"');            -- JSON '"abc"'
+SELECT json_parse('42');               -- JSON '42'
+SELECT json_parse('true');             -- JSON 'true'
+SELECT json_parse('null');             -- JSON 'null'
+```
+
+`CAST(string AS JSON)` takes any VARCHAR value as input, and returns
+a JSON string with its value set to input string.
+
+```
+SELECT CAST('not_json' AS JSON);         -- JSON '"not_json"'
+SELECT CAST('["a": 1, "b": 2]' AS JSON); -- JSON '"[\"a\": 1, \"b\": 2]"'
+SELECT CAST('[1, 2, 3]' AS JSON);        -- JSON '"[1, 2, 3]"'
+SELECT CAST('"abc"' AS JSON);            -- JSON '"\"abc\""'
+SELECT CAST('42' AS JSON);               -- JSON '"42"'
+SELECT CAST('true' AS JSON);             -- JSON '"true"'
+SELECT CAST('null' AS JSON);             -- JSON '"null"'
+```
+:::
+::::
+
+:::{function} json_size(json, json_path) -> bigint
+Like {func}`json_extract`, but returns the size of the value.
+For objects or arrays, the size is the number of members,
+and the size of a scalar value is zero.
+
+```
+SELECT json_size('{"x": {"a": 1, "b": 2}}', '$.x');   -- 2
+SELECT json_size('{"x": [1, 2, 3]}', '$.x');          -- 3
+SELECT json_size('{"x": {"a": 1, "b": 2}}', '$.x.a'); -- 0
+```
+:::
+
+[jsonpath]: http://goessner.net/articles/JsonPath/
diff --git a/docs/src/main/sphinx/functions/json.rst b/docs/src/main/sphinx/functions/json.rst
deleted file mode 100644
index 4a1b8b3179ec..000000000000
--- a/docs/src/main/sphinx/functions/json.rst
+++ /dev/null
@@ -1,1718 +0,0 @@
-============================
-JSON functions and operators
-============================
-
-The SQL standard describes functions and operators to process JSON data. They
-allow you to access JSON data according to its structure, generate JSON data,
-and store it persistently in SQL tables.
-
-Importantly, the SQL standard imposes that there is no dedicated data type to
-represent JSON data in SQL. Instead, JSON data is represented as character or
-binary strings. Although Trino supports ``JSON`` type, it is not used or
-produced by the following functions.
-
-Trino supports three functions for querying JSON data:
-:ref:`json_exists<json_exists>`,
-:ref:`json_query<json_query>`, and :ref:`json_value<json_value>`. Each of them
-is based on the same mechanism of exploring and processing JSON input using
-JSON path.
-
-Trino also supports two functions for generating JSON data --
-:ref:`json_array<json_array>`, and :ref:`json_object<json_object>`.
-
-.. _json-path-language:
-
-JSON path language
-------------------
-
-The JSON path language is a special language, used exclusively by certain SQL
-operators to specify the query to perform on the JSON input. Although JSON path
-expressions are embedded in SQL queries, their syntax significantly differs
-from SQL. The semantics of predicates, operators, etc. in JSON path expressions
-generally follow the semantics of SQL. The JSON path language is case-sensitive
-for keywords and identifiers.
-
-.. _json_path_syntax_and_semantics:
-
-JSON path syntax and semantics
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-JSON path expressions are recursive structures. Although the name "path"
-suggests a linear sequence of operations going step by step deeper into the JSON
-structure, a JSON path expression is in fact a tree. It can access the input
-JSON item multiple times, in multiple ways, and combine the results. Moreover,
-the result of a JSON path expression is not a single item, but an ordered
-sequence of items. Each of the sub-expressions takes one or more input
-sequences, and returns a sequence as the result.
-
-.. note::
-
-    In the lax mode, most path operations first unnest all JSON arrays in the
-    input sequence. Any divergence from this rule is mentioned in the following
-    listing. Path modes are explained in :ref:`json_path_modes`.
-
-The JSON path language features are divided into: literals, variables,
-arithmetic binary expressions, arithmetic unary expressions, and a group of
-operators collectively known as accessors.
-
-literals
-''''''''
-
-- numeric literals
-
-  They include exact and approximate numbers, and are interpreted as if they
-  were SQL values.
-
-.. code-block:: text
-
-    -1, 1.2e3, NaN
-
-- string literals
-
-  They are enclosed in double quotes.
-
-.. code-block:: text
-
-    "Some text"
-
-- boolean literals
-
-.. code-block:: text
-
-    true, false
-
-- null literal
-
-  It has the semantics of the JSON null, not of SQL null. See :ref:`json_comparison_rules`.
-
-.. code-block:: text
-
-    null
-
-variables
-'''''''''
-
-- context variable
-
-  It refers to the currently processed input of the JSON
-  function.
-
-.. code-block:: text
-
-    $
-
-- named variable
-
-  It refers to a named parameter by its name.
-
-.. code-block:: text
-
-    $param
-
-- current item variable
-
-  It is used inside the filter expression to refer to the currently processed
-  item from the input sequence.
-
-.. code-block:: text
-
-    @
-
-- last subscript variable
-
-  It refers to the last index of the innermost enclosing array. Array indexes
-  in JSON path expressions are zero-based.
-
-.. code-block:: text
-
-    last
-
-arithmetic binary expressions
-'''''''''''''''''''''''''''''
-
-The JSON path language supports five arithmetic binary operators:
-
-.. code-block:: text
-
-    <path1> + <path2>
-    <path1> - <path2>
-    <path1> * <path2>
-    <path1> / <path2>
-    <path1> % <path2>
-
-Both operands, ``<path1>`` and ``<path2>``, are evaluated to sequences of
-items. For arithmetic binary operators, each input sequence must contain a
-single numeric item. The arithmetic operation is performed according to SQL
-semantics, and it returns a sequence containing a single element with the
-result.
-
-The operators follow the same precedence rules as in SQL arithmetic operations,
-and parentheses can be used for grouping.
-
-arithmetic unary expressions
-''''''''''''''''''''''''''''
-
-.. code-block:: text
-
-    + <path>
-    - <path>
-
-The operand ``<path>`` is evaluated to a sequence of items. Every item must be
-a numeric value. The unary plus or minus is applied to every item in the
-sequence, following SQL semantics, and the results form the returned sequence.
-
-member accessor
-'''''''''''''''
-
-The member accessor returns the value of the member with the specified key for
-each JSON object in the input sequence.
-
-.. code-block:: text
-
-    <path>.key
-    <path>."key"
-
-The condition when a JSON object does not have such a member is called a
-structural error. In the lax mode, it is suppressed, and the faulty object is
-excluded from the result.
-
-Let ``<path>`` return a sequence of three JSON objects:
-
-.. code-block:: text
-
-    {"customer" : 100, "region" : "AFRICA"},
-    {"region" : "ASIA"},
-    {"customer" : 300, "region" : "AFRICA", "comment" : null}
-
-the expression ``<path>.customer`` succeeds in the first and the third object,
-but the second object lacks the required member. In strict mode, path
-evaluation fails. In lax mode, the second object is silently skipped, and the
-resulting sequence is ``100, 300``.
-
-All items in the input sequence must be JSON objects.
-
-.. note::
-
-    Trino does not support JSON objects with duplicate keys.
-
-wildcard member accessor
-''''''''''''''''''''''''
-
-Returns values from all key-value pairs for each JSON object in the input
-sequence. All the partial results are concatenated into the returned sequence.
-
-.. code-block:: text
-
-    <path>.*
-
-Let ``<path>`` return a sequence of three JSON objects:
-
-.. code-block:: text
-
-    {"customer" : 100, "region" : "AFRICA"},
-    {"region" : "ASIA"},
-    {"customer" : 300, "region" : "AFRICA", "comment" : null}
-
-The results is:
-
-.. code-block:: text
-
-    100, "AFRICA", "ASIA", 300, "AFRICA", null
-
-All items in the input sequence must be JSON objects.
-
-The order of values returned from a single JSON object is arbitrary. The
-sub-sequences from all JSON objects are concatenated in the same order in which
-the JSON objects appear in the input sequence.
-
-array accessor
-''''''''''''''
-
-Returns the elements at the specified indexes for each JSON array in the input
-sequence. Indexes are zero-based.
-
-.. code-block:: text
-
-    <path>[ <subscripts> ]
-
-The ``<subscripts>`` list contains one or more subscripts. Each subscript
-specifies a single index or a range (ends inclusive):
-
-.. code-block:: text
-
-    <path>[<path1>, <path2> to <path3>, <path4>,...]
-
-In lax mode, any non-array items resulting from the evaluation of the input
-sequence are wrapped into single-element arrays. Note that this is an exception
-to the rule of automatic array wrapping.
-
-Each array in the input sequence is processed in the following way:
-
-- The variable ``last`` is set to the last index of the array.
-- All subscript indexes are computed in order of declaration. For a
-  singleton subscript ``<path1>``, the result must be a singleton numeric item.
-  For a range subscript ``<path2> to <path3>``, two numeric items are expected.
-- The specified array elements are added in order to the output sequence.
-
-Let ``<path>`` return a sequence of three JSON arrays:
-
-.. code-block:: text
-
-    [0, 1, 2], ["a", "b", "c", "d"], [null, null]
-
-The following expression returns a sequence containing the last element from
-every array:
-
-.. code-block:: text
-
-    <path>[last] --> 2, "d", null
-
-The following expression returns the third and fourth element from every array:
-
-.. code-block:: text
-
-    <path>[2 to 3] --> 2, "c", "d"
-
-Note that the first array does not have the fourth element, and the last array
-does not have the third or fourth element. Accessing non-existent elements is a
-structural error. In strict mode, it causes the path expression to fail. In lax
-mode, such errors are suppressed, and only the existing elements are returned.
-
-Another example of a structural error is an improper range specification such
-as ``5 to 3``.
-
-Note that the subscripts may overlap, and they do not need to follow the
-element order. The order in the returned sequence follows the subscripts:
-
-.. code-block:: text
-
-    <path>[1, 0, 0] --> 1, 0, 0, "b", "a", "a", null, null, null
-
-wildcard array accessor
-'''''''''''''''''''''''
-
-Returns all elements of each JSON array in the input sequence.
-
-.. code-block:: text
-
-    <path>[*]
-
-In lax mode, any non-array items resulting from the evaluation of the input
-sequence are wrapped into single-element arrays. Note that this is an exception
-to the rule of automatic array wrapping.
-
-The output order follows the order of the original JSON arrays. Also, the order
-of elements within the arrays is preserved.
-
-Let ``<path>`` return a sequence of three JSON arrays:
-
-.. code-block:: text
-
-    [0, 1, 2], ["a", "b", "c", "d"], [null, null]
-    <path>[*] --> 0, 1, 2, "a", "b", "c", "d", null, null
-
-filter
-''''''
-
-Retrieves the items from the input sequence which satisfy the predicate.
-
-.. code-block:: text
-
-    <path>?( <predicate> )
-
-JSON path predicates are syntactically similar to boolean expressions in SQL.
-However, the semantics are different in many aspects:
-
-- They operate on sequences of items.
-- They have their own error handling (they never fail).
-- They behave different depending on the lax or strict mode.
-
-The predicate evaluates to ``true``, ``false``, or ``unknown``. Note that some
-predicate expressions involve nested JSON path expression. When evaluating the
-nested path, the variable ``@`` refers to the currently examined item from the
-input sequence.
-
-The following predicate expressions are supported:
-
-- Conjunction
-
-.. code-block:: text
-
-    <predicate1> && <predicate2>
-
-- Disjunction
-
-.. code-block:: text
-
-    <predicate1> || <predicate2>
-
-- Negation
-
-.. code-block:: text
-
-    ! <predicate>
-
-- ``exists`` predicate
-
-.. code-block:: text
-
-    exists( <path> )
-
-Returns ``true`` if the nested path evaluates to a non-empty sequence, and
-``false`` when the nested path evaluates to an empty sequence. If the path
-evaluation throws an error, returns ``unknown``.
-
-- ``starts with`` predicate
-
-.. code-block:: text
-
-    <path> starts with "Some text"
-    <path> starts with $variable
-
-The nested ``<path>`` must evaluate to a sequence of textual items, and the
-other operand must evaluate to a single textual item. If evaluating of either
-operand throws an error, the result is ``unknown``. All items from the sequence
-are checked for starting with the right operand. The result is ``true`` if a
-match is found, otherwise ``false``. However, if any of the comparisons throws
-an error, the result in the strict mode is ``unknown``. The result in the lax
-mode depends on whether the match or the error was found first.
-
-- ``is unknown`` predicate
-
-.. code-block:: text
-
-    ( <predicate> ) is unknown
-
-Returns ``true`` if the nested predicate evaluates to ``unknown``, and
-``false`` otherwise.
-
-- Comparisons
-
-.. code-block:: text
-
-    <path1> == <path2>
-    <path1> <> <path2>
-    <path1> != <path2>
-    <path1> < <path2>
-    <path1> > <path2>
-    <path1> <= <path2>
-    <path1> >= <path2>
-
-Both operands of a comparison evaluate to sequences of items. If either
-evaluation throws an error, the result is ``unknown``. Items from the left and
-right sequence are then compared pairwise. Similarly to the ``starts with``
-predicate, the result is ``true`` if any of the comparisons returns ``true``,
-otherwise ``false``. However, if any of the comparisons throws an error, for
-example because the compared types are not compatible, the result in the strict
-mode is ``unknown``. The result in the lax mode depends on whether the ``true``
-comparison or the error was found first.
-
-.. _json_comparison_rules:
-
-Comparison rules
-****************
-
-Null values in the context of comparison behave different than SQL null:
-
-- null == null --> ``true``
-- null != null, null < null, ... --> ``false``
-- null compared to a scalar value --> ``false``
-- null compared to a JSON array or a JSON object --> ``false``
-
-When comparing two scalar values, ``true`` or ``false`` is returned if the
-comparison is successfully performed. The semantics of the comparison is the
-same as in SQL. In case of an error, e.g. comparing text and number,
-``unknown`` is returned.
-
-Comparing a scalar value with a JSON array or a JSON object, and comparing JSON
-arrays/objects is an error, so ``unknown`` is returned.
-
-Examples of filter
-******************
-
-Let ``<path>`` return a sequence of three JSON objects:
-
-.. code-block:: text
-
-    {"customer" : 100, "region" : "AFRICA"},
-    {"region" : "ASIA"},
-    {"customer" : 300, "region" : "AFRICA", "comment" : null}
-
-.. code-block:: text
-
-    <path>?(@.region != "ASIA") --> {"customer" : 100, "region" : "AFRICA"},
-                                    {"customer" : 300, "region" : "AFRICA", "comment" : null}
-    <path>?(!exists(@.customer)) --> {"region" : "ASIA"}
-
-The following accessors are collectively referred to as **item methods**.
-
-double()
-''''''''
-
-Converts numeric or text values into double values.
-
-.. code-block:: text
-
-    <path>.double()
-
-Let ``<path>`` return a sequence ``-1, 23e4, "5.6"``:
-
-.. code-block:: text
-
-    <path>.double() --> -1e0, 23e4, 5.6e0
-
-ceiling(), floor(), and abs()
-'''''''''''''''''''''''''''''
-
-Gets the ceiling, the floor or the absolute value for every numeric item in the
-sequence. The semantics of the operations is the same as in SQL.
-
-Let ``<path>`` return a sequence ``-1.5, -1, 1.3``:
-
-.. code-block:: text
-
-    <path>.ceiling() --> -1.0, -1, 2.0
-    <path>.floor() --> -2.0, -1, 1.0
-    <path>.abs() --> 1.5, 1, 1.3
-
-keyvalue()
-''''''''''
-
-Returns a collection of JSON objects including one object per every member of
-the original object for every JSON object in the sequence.
-
-.. code-block:: text
-
-    <path>.keyvalue()
-
-The returned objects have three members:
-
-- "name", which is the original key,
-- "value", which is the original bound value,
-- "id", which is the unique number, specific to an input object.
-
-Let ``<path>`` be a sequence of three JSON objects:
-
-.. code-block:: text
-
-    {"customer" : 100, "region" : "AFRICA"},
-    {"region" : "ASIA"},
-    {"customer" : 300, "region" : "AFRICA", "comment" : null}
-
-.. code-block:: text
-
-    <path>.keyvalue() --> {"name" : "customer", "value" : 100, "id" : 0},
-                          {"name" : "region", "value" : "AFRICA", "id" : 0},
-                          {"name" : "region", "value" : "ASIA", "id" : 1},
-                          {"name" : "customer", "value" : 300, "id" : 2},
-                          {"name" : "region", "value" : "AFRICA", "id" : 2},
-                          {"name" : "comment", "value" : null, "id" : 2}
-
-It is required that all items in the input sequence are JSON objects.
-
-The order of the returned values follows the order of the original JSON
-objects. However, within objects, the order of returned entries is arbitrary.
-
-type()
-''''''
-
-Returns a textual value containing the type name for every item in the
-sequence.
-
-.. code-block:: text
-
-    <path>.type()
-
-This method does not perform array unwrapping in the lax mode.
-
-The returned values are:
-
-- ``"null"`` for JSON null,
-- ``"number"`` for a numeric item,
-- ``"string"`` for a textual item,
-- ``"boolean"`` for a boolean item,
-- ``"date"`` for an item of type date,
-- ``"time without time zone"`` for an item of type time,
-- ``"time with time zone"`` for an item of type time with time zone,
-- ``"timestamp without time zone"`` for an item of type timestamp,
-- ``"timestamp with time zone"`` for an item of type timestamp with time zone,
-- ``"array"`` for JSON array,
-- ``"object"`` for JSON object,
-
-size()
-''''''
-
-Returns a numeric value containing the size for every JSON array in the
-sequence.
-
-.. code-block:: text
-
-    <path>.size()
-
-This method does not perform array unwrapping in the lax mode. Instead, all
-non-array items are wrapped in singleton JSON arrays, so their size is ``1``.
-
-It is required that all items in the input sequence are JSON arrays.
-
-Let ``<path>`` return a sequence of three JSON arrays:
-
-.. code-block:: text
-
-    [0, 1, 2], ["a", "b", "c", "d"], [null, null]
-    <path>.size() --> 3, 4, 2
-
-Limitations
-^^^^^^^^^^^
-
-The SQL standard describes the ``datetime()`` JSON path item method and the
-``like_regex()`` JSON path predicate. Trino does not support them.
-
-.. _json_path_modes:
-
-JSON path modes
-^^^^^^^^^^^^^^^
-
-The JSON path expression can be evaluated in two modes: strict and lax. In the
-strict mode, it is required that the input JSON data strictly fits the schema
-required by the path expression. In the lax mode, the input JSON data can
-diverge from the expected schema.
-
-The following table shows the differences between the two modes.
-
-.. list-table::
-   :widths: 40 20 40
-   :header-rows: 1
-
-   * - Condition
-     - strict mode
-     - lax mode
-   * - Performing an operation which requires a non-array on an array, e.g.:
-
-       ``$.key`` requires a JSON object
-
-       ``$.floor()`` requires a numeric value
-     - ERROR
-     - The array is automatically unnested, and the operation is performed on
-       each array element.
-   * - Performing an operation which requires an array on an non-array, e.g.:
-
-       ``$[0]``, ``$[*]``, ``$.size()``
-     - ERROR
-     - The non-array item is automatically wrapped in a singleton array, and
-       the operation is performed on the array.
-   * - A structural error: accessing a non-existent element of an array or a
-       non-existent member of a JSON object, e.g.:
-
-       ``$[-1]`` (array index out of bounds)
-
-       ``$.key``, where the input JSON object does not have a member ``key``
-     - ERROR
-     - The error is suppressed, and the operation results in an empty sequence.
-
-Examples of the lax mode behavior
-'''''''''''''''''''''''''''''''''
-
-Let ``<path>`` return a sequence of three items, a JSON array, a JSON object,
-and a scalar numeric value:
-
-.. code-block:: text
-
-    [1, "a", null], {"key1" : 1.0, "key2" : true}, -2e3
-
-The following example shows the wildcard array accessor in the lax mode. The
-JSON array returns all its elements, while the JSON object and the number are
-wrapped in singleton arrays and then unnested, so effectively they appear
-unchanged in the output sequence:
-
-.. code-block:: text
-
-    <path>[*] --> 1, "a", null, {"key1" : 1.0, "key2" : true}, -2e3
-
-When calling the ``size()`` method, the JSON object and the number are also
-wrapped in singleton arrays:
-
-.. code-block:: text
-
-    <path>.size() --> 3, 1, 1
-
-In some cases, the lax mode cannot prevent failure. In the following example,
-even though the JSON array is unwrapped prior to calling the ``floor()``
-method, the item ``"a"`` causes type mismatch.
-
-.. code-block:: text
-
-    <path>.floor() --> ERROR
-
-.. _json_exists:
-
-json_exists
------------
-
-The ``json_exists`` function determines whether a JSON value satisfies a JSON
-path specification.
-
-.. code-block:: text
-
-    JSON_EXISTS(
-        json_input [ FORMAT JSON [ ENCODING { UTF8 | UTF16 | UTF32 } ] ],
-        json_path
-        [ PASSING json_argument [, ...] ]
-        [ { TRUE | FALSE | UNKNOWN | ERROR } ON ERROR ]
-        )
-
-The ``json_path`` is evaluated using the ``json_input`` as the context variable
-(``$``), and the passed arguments as the named variables (``$variable_name``).
-The returned value is ``true`` if the path returns a non-empty sequence, and
-``false`` if the path returns an empty sequence. If an error occurs, the
-returned value depends on the ``ON ERROR`` clause. The default value returned
-``ON ERROR`` is ``FALSE``. The ``ON ERROR`` clause is applied for the following
-kinds of errors:
-
-- Input conversion errors, such as malformed JSON
-- JSON path evaluation errors, e.g. division by zero
-
-``json_input`` is a character string or a binary string. It should contain
-a single JSON item. For a binary string, you can specify encoding.
-
-``json_path`` is a string literal, containing the path mode specification, and
-the path expression, following the syntax rules described in
-:ref:`json_path_syntax_and_semantics`.
-
-.. code-block:: text
-
-    'strict ($.price + $.tax)?(@ > 99.9)'
-    'lax $[0 to 1].floor()?(@ > 10)'
-
-In the ``PASSING`` clause you can pass arbitrary expressions to be used by the
-path expression.
-
-.. code-block:: text
-
-    PASSING orders.totalprice AS O_PRICE,
-            orders.tax % 10 AS O_TAX
-
-The passed parameters can be referenced in the path expression by named
-variables, prefixed with ``$``.
-
-.. code-block:: text
-
-    'lax $?(@.price > $O_PRICE || @.tax > $O_TAX)'
-
-Additionally to SQL values, you can pass JSON values, specifying the format and
-optional encoding:
-
-.. code-block:: text
-
-    PASSING orders.json_desc FORMAT JSON AS o_desc,
-            orders.binary_record FORMAT JSON ENCODING UTF16 AS o_rec
-
-Note that the JSON path language is case-sensitive, while the unquoted SQL
-identifiers are upper-cased. Therefore, it is recommended to use quoted
-identifiers in the ``PASSING`` clause:
-
-.. code-block:: text
-
-    'lax $.$KeyName' PASSING nation.name AS KeyName --> ERROR; no passed value found
-    'lax $.$KeyName' PASSING nation.name AS "KeyName" --> correct
-
-Examples
-^^^^^^^^
-
-Let ``customers`` be a table containing two columns: ``id:bigint``,
-``description:varchar``.
-
-========== ======================================================
-id         description
-========== ======================================================
-101        '{"comment" : "nice", "children" : [10, 13, 16]}'
-102        '{"comment" : "problematic", "children" : [8, 11]}'
-103        '{"comment" : "knows best", "children" : [2]}'
-========== ======================================================
-
-The following query checks which customers have children above the age of 10:
-
-.. code-block:: text
-
-    SELECT
-          id,
-          json_exists(
-                      description,
-                      'lax $.children[*]?(@ > 10)'
-                     ) AS children_above_ten
-    FROM customers
-
-========== ====================
-id         children_above_ten
-========== ====================
-101        true
-102        true
-103        false
-========== ====================
-
-In the following query, the path mode is strict. We check the third child for
-each customer. This should cause a structural error for the customers who do
-not have three or more children. This error is handled according to the ``ON
-ERROR`` clause.
-
-.. code-block:: text
-
-    SELECT
-          id,
-          json_exists(
-                      description,
-                      'strict $.children[2]?(@ > 10)'
-                      UNKNOWN ON ERROR
-                     ) AS child_3_above_ten
-    FROM customers
-
-========== ==================
-id         child_3_above_ten
-========== ==================
-101        true
-102        NULL
-103        NULL
-========== ==================
-
-.. _json_query:
-
-json_query
-----------
-
-The ``json_query`` function extracts a JSON value from a JSON value.
-
-.. code-block:: text
-
-    JSON_QUERY(
-        json_input [ FORMAT JSON [ ENCODING { UTF8 | UTF16 | UTF32 } ] ],
-        json_path
-        [ PASSING json_argument [, ...] ]
-        [ RETURNING type [ FORMAT JSON [ ENCODING { UTF8 | UTF16 | UTF32 } ] ] ]
-        [ WITHOUT [ ARRAY ] WRAPPER |
-          WITH [ { CONDITIONAL | UNCONDITIONAL } ] [ ARRAY ] WRAPPER ]
-        [ { KEEP | OMIT } QUOTES [ ON SCALAR STRING ] ]
-        [ { ERROR | NULL | EMPTY ARRAY | EMPTY OBJECT } ON EMPTY ]
-        [ { ERROR | NULL | EMPTY ARRAY | EMPTY OBJECT } ON ERROR ]
-        )
-
-The ``json_path`` is evaluated using the ``json_input`` as the context variable
-(``$``), and the passed arguments as the named variables (``$variable_name``).
-
-The returned value is a JSON item returned by the path. By default, it is
-represented as a character string (``varchar``). In the ``RETURNING`` clause,
-you can specify other character string type or ``varbinary``. With
-``varbinary``, you can also specify the desired encoding.
-
-``json_input`` is a character string or a binary string. It should contain
-a single JSON item. For a binary string, you can specify encoding.
-
-``json_path`` is a string literal, containing the path mode specification, and
-the path expression, following the syntax rules described in
-:ref:`json_path_syntax_and_semantics`.
-
-.. code-block:: text
-
-    'strict $.keyvalue()?(@.name == $cust_id)'
-    'lax $[5 to last]'
-
-In the ``PASSING`` clause you can pass arbitrary expressions to be used by the
-path expression.
-
-.. code-block:: text
-
-    PASSING orders.custkey AS CUST_ID
-
-The passed parameters can be referenced in the path expression by named
-variables, prefixed with ``$``.
-
-.. code-block:: text
-
-    'strict $.keyvalue()?(@.value == $CUST_ID)'
-
-Additionally to SQL values, you can pass JSON values, specifying the format and
-optional encoding:
-
-.. code-block:: text
-
-    PASSING orders.json_desc FORMAT JSON AS o_desc,
-            orders.binary_record FORMAT JSON ENCODING UTF16 AS o_rec
-
-Note that the JSON path language is case-sensitive, while the unquoted SQL
-identifiers are upper-cased. Therefore, it is recommended to use quoted
-identifiers in the ``PASSING`` clause:
-
-.. code-block:: text
-
-    'lax $.$KeyName' PASSING nation.name AS KeyName --> ERROR; no passed value found
-    'lax $.$KeyName' PASSING nation.name AS "KeyName" --> correct
-
-The ``ARRAY WRAPPER`` clause lets you modify the output by wrapping the results
-in a JSON array. ``WITHOUT ARRAY WRAPPER`` is the default option. ``WITH
-CONDITIONAL ARRAY WRAPPER`` wraps every result which is not a singleton JSON
-array or JSON object. ``WITH UNCONDITIONAL ARRAY WRAPPER`` wraps every result.
-
-The ``QUOTES`` clause lets you modify the result for a scalar string by
-removing the double quotes being part of the JSON string representation.
-
-Examples
-^^^^^^^^
-
-Let ``customers`` be a table containing two columns: ``id:bigint``,
-``description:varchar``.
-
-========== ======================================================
-id         description
-========== ======================================================
-101        '{"comment" : "nice", "children" : [10, 13, 16]}'
-102        '{"comment" : "problematic", "children" : [8, 11]}'
-103        '{"comment" : "knows best", "children" : [2]}'
-========== ======================================================
-
-The following query gets the ``children`` array for each customer:
-
-.. code-block:: text
-
-    SELECT
-          id,
-          json_query(
-                     description,
-                     'lax $.children'
-                    ) AS children
-    FROM customers
-
-========== ================
-id         children
-========== ================
-101        '[10,13,16]'
-102        '[8,11]'
-103        '[2]'
-========== ================
-
-The following query gets the collection of children for each customer.
-Note that the ``json_query`` function can only output a single JSON item. If
-you don't use array wrapper, you get an error for every customer with multiple
-children. The error is handled according to the ``ON ERROR`` clause.
-
-.. code-block:: text
-
-    SELECT
-          id,
-          json_query(
-                     description,
-                     'lax $.children[*]'
-                     WITHOUT ARRAY WRAPPER
-                     NULL ON ERROR
-                    ) AS children
-    FROM customers
-
-========== ================
-id         children
-========== ================
-101        NULL
-102        NULL
-103        '2'
-========== ================
-
-The following query gets the last child for each customer, wrapped in a JSON
-array:
-
-.. code-block:: text
-
-    SELECT
-          id,
-          json_query(
-                     description,
-                     'lax $.children[last]'
-                     WITH ARRAY WRAPPER
-                    ) AS last_child
-    FROM customers
-
-========== ================
-id         last_child
-========== ================
-101        '[16]'
-102        '[11]'
-103        '[2]'
-========== ================
-
-The following query gets all children above the age of 12 for each customer,
-wrapped in a JSON array. The second and the third customer don't have children
-of this age. Such case is handled according to the ``ON EMPTY`` clause. The
-default value returned ``ON EMPTY`` is ``NULL``. In the following example,
-``EMPTY ARRAY ON EMPTY`` is specified.
-
-.. code-block:: text
-
-    SELECT
-          id,
-          json_query(
-                     description,
-                     'strict $.children[*]?(@ > 12)'
-                     WITH ARRAY WRAPPER
-                     EMPTY ARRAY ON EMPTY
-                    ) AS children
-    FROM customers
-
-========== ================
-id         children
-========== ================
-101        '[13,16]'
-102        '[]'
-103        '[]'
-========== ================
-
-The following query shows the result of the ``QUOTES`` clause. Note that ``KEEP
-QUOTES`` is the default.
-
-.. code-block:: text
-
-    SELECT
-          id,
-          json_query(description, 'strict $.comment' KEEP QUOTES) AS quoted_comment,
-          json_query(description, 'strict $.comment' OMIT QUOTES) AS unquoted_comment
-    FROM customers
-
-========== ================ ================
-id         quoted_comment   unquoted_comment
-========== ================ ================
-101        '"nice"'         'nice'
-102        '"problematic"'  'problematic'
-103        '"knows best"'   'knows best'
-========== ================ ================
-
-If an error occurs, the returned value depends on the ``ON ERROR`` clause. The
-default value returned ``ON ERROR`` is ``NULL``. One example of error is
-multiple items returned by the path. Other errors caught and handled according
-to the ``ON ERROR`` clause are:
-
-- Input conversion errors, such as malformed JSON
-- JSON path evaluation errors, e.g. division by zero
-- Output conversion errors
-
-.. _json_value:
-
-json_value
-----------
-
-The ``json_value`` function extracts a scalar SQL value from a JSON value.
-
-.. code-block:: text
-
-    JSON_VALUE(
-        json_input [ FORMAT JSON [ ENCODING { UTF8 | UTF16 | UTF32 } ] ],
-        json_path
-        [ PASSING json_argument [, ...] ]
-        [ RETURNING type ]
-        [ { ERROR | NULL | DEFAULT expression } ON EMPTY ]
-        [ { ERROR | NULL | DEFAULT expression } ON ERROR ]
-        )
-
-The ``json_path`` is evaluated using the ``json_input`` as the context variable
-(``$``), and the passed arguments as the named variables (``$variable_name``).
-
-The returned value is the SQL scalar returned by the path. By default, it is
-converted to string (``varchar``). In the ``RETURNING`` clause, you can specify
-other desired type: a character string type, numeric, boolean or datetime type.
-
-``json_input`` is a character string or a binary string. It should contain
-a single JSON item. For a binary string, you can specify encoding.
-
-``json_path`` is a string literal, containing the path mode specification, and
-the path expression, following the syntax rules described in
-:ref:`json_path_syntax_and_semantics`.
-
-.. code-block:: text
-
-    'strict $.price + $tax'
-    'lax $[last].abs().floor()'
-
-In the ``PASSING`` clause you can pass arbitrary expressions to be used by the
-path expression.
-
-.. code-block:: text
-
-    PASSING orders.tax AS O_TAX
-
-The passed parameters can be referenced in the path expression by named
-variables, prefixed with ``$``.
-
-.. code-block:: text
-
-    'strict $[last].price + $O_TAX'
-
-Additionally to SQL values, you can pass JSON values, specifying the format and
-optional encoding:
-
-.. code-block:: text
-
-    PASSING orders.json_desc FORMAT JSON AS o_desc,
-            orders.binary_record FORMAT JSON ENCODING UTF16 AS o_rec
-
-Note that the JSON path language is case-sensitive, while the unquoted SQL
-identifiers are upper-cased. Therefore, it is recommended to use quoted
-identifiers in the ``PASSING`` clause:
-
-.. code-block:: text
-
-    'lax $.$KeyName' PASSING nation.name AS KeyName --> ERROR; no passed value found
-    'lax $.$KeyName' PASSING nation.name AS "KeyName" --> correct
-
-If the path returns an empty sequence, the ``ON EMPTY`` clause is applied. The
-default value returned ``ON EMPTY`` is ``NULL``. You can also specify the
-default value:
-
-.. code-block:: text
-
-    DEFAULT -1 ON EMPTY
-
-If an error occurs, the returned value depends on the ``ON ERROR`` clause. The
-default value returned ``ON ERROR`` is ``NULL``. One example of error is
-multiple items returned by the path. Other errors caught and handled according
-to the ``ON ERROR`` clause are:
-
-- Input conversion errors, such as malformed JSON
-- JSON path evaluation errors, e.g. division by zero
-- Returned scalar not convertible to the desired type
-
-Examples
-^^^^^^^^
-
-Let ``customers`` be a table containing two columns: ``id:bigint``,
-``description:varchar``.
-
-========== ======================================================
-id         description
-========== ======================================================
-101        '{"comment" : "nice", "children" : [10, 13, 16]}'
-102        '{"comment" : "problematic", "children" : [8, 11]}'
-103        '{"comment" : "knows best", "children" : [2]}'
-========== ======================================================
-
-The following query gets the ``comment`` for each customer as ``char(12)``:
-
-.. code-block:: text
-
-    SELECT id, json_value(
-                          description,
-                          'lax $.comment'
-                          RETURNING char(12)
-                         ) AS comment
-    FROM customers
-
-========== ================
-id         comment
-========== ================
-101        'nice        '
-102        'problematic '
-103        'knows best  '
-========== ================
-
-The following query gets the first child's age for each customer as
-``tinyint``:
-
-.. code-block:: text
-
-    SELECT id, json_value(
-                          description,
-                          'lax $.children[0]'
-                          RETURNING tinyint
-                         ) AS child
-    FROM customers
-
-========== ================
-id         child
-========== ================
-101        10
-102        8
-103        2
-========== ================
-
-The following query gets the third child's age for each customer. In the strict
-mode, this should cause a structural error for the customers who do not have
-the third child. This error is handled according to the ``ON ERROR`` clause.
-
-.. code-block:: text
-
-    SELECT id, json_value(
-                          description,
-                          'strict $.children[2]'
-                          DEFAULT 'err' ON ERROR
-                         ) AS child
-    FROM customers
-
-========== ================
-id         child
-========== ================
-101        '16'
-102        'err'
-103        'err'
-========== ================
-
-After changing the mode to lax, the structural error is suppressed, and the
-customers without a third child produce empty sequence. This case is handled
-according to the ``ON EMPTY`` clause.
-
-.. code-block:: text
-
-    SELECT id, json_value(
-                          description,
-                          'lax $.children[2]'
-                          DEFAULT 'missing' ON EMPTY
-                         ) AS child
-    FROM customers
-
-========== ================
-id         child
-========== ================
-101        '16'
-102        'missing'
-103        'missing'
-========== ================
-
-.. _json_array:
-
-json_array
-----------
-
-The ``json_array`` function creates a JSON array containing given elements.
-
-.. code-block:: text
-
-    JSON_ARRAY(
-        [ array_element [, ...]
-          [ { NULL ON NULL | ABSENT ON NULL } ] ],
-        [ RETURNING type [ FORMAT JSON [ ENCODING { UTF8 | UTF16 | UTF32 } ] ] ]
-        )
-
-Argument types
-^^^^^^^^^^^^^^
-
-The array elements can be arbitrary expressions. Each passed value is converted
-into a JSON item according to its type, and optional ``FORMAT`` and
-``ENCODING`` specification.
-
-You can pass SQL values of types boolean, numeric, and character string. They
-are converted to corresponding JSON literals::
-
-    SELECT json_array(true, 12e-1, 'text')
-    --> '[true,1.2,"text"]'
-
-Additionally to SQL values, you can pass JSON values. They are character or
-binary strings with a specified format and optional encoding::
-
-    SELECT json_array(
-                      '[  "text"  ] ' FORMAT JSON,
-                      X'5B0035005D00' FORMAT JSON ENCODING UTF16
-                     )
-    --> '[["text"],[5]]'
-
-You can also nest other JSON-returning functions. In that case, the ``FORMAT``
-option is implicit::
-
-    SELECT json_array(
-                      json_query('{"key" : [  "value"  ]}', 'lax $.key')
-                     )
-    --> '[["value"]]'
-
-Other passed values are cast to varchar, and they become JSON text literals::
-
-    SELECT json_array(
-                      DATE '2001-01-31',
-                      UUID '12151fd2-7586-11e9-8f9e-2a86e4085a59'
-                     )
-    --> '["2001-01-31","12151fd2-7586-11e9-8f9e-2a86e4085a59"]'
-
-You can omit the arguments altogether to get an empty array::
-
-    SELECT json_array() --> '[]'
-
-Null handling
-^^^^^^^^^^^^^
-
-If a value passed for an array element is ``null``, it is treated according to
-the specified null treatment option. If ``ABSENT ON NULL`` is specified, the
-null element is omitted in the result. If ``NULL ON NULL`` is specified, JSON
-``null`` is added to the result. ``ABSENT ON NULL`` is the default
-configuration::
-
-    SELECT json_array(true, null, 1)
-    --> '[true,1]'
-
-    SELECT json_array(true, null, 1 ABSENT ON NULL)
-    --> '[true,1]'
-
-    SELECT json_array(true, null, 1 NULL ON NULL)
-    --> '[true,null,1]'
-
-Returned type
-^^^^^^^^^^^^^
-
-The SQL standard imposes that there is no dedicated data type to represent JSON
-data in SQL. Instead, JSON data is represented as character or binary strings.
-By default, the ``json_array`` function returns varchar containing the textual
-representation of the JSON array. With the ``RETURNING`` clause, you can
-specify other character string type::
-
-    SELECT json_array(true, 1 RETURNING VARCHAR(100))
-    --> '[true,1]'
-
-You can also specify to use varbinary and the required encoding as return type.
-The default encoding is UTF8::
-
-    SELECT json_array(true, 1 RETURNING VARBINARY)
-    --> X'5b 74 72 75 65 2c 31 5d'
-
-    SELECT json_array(true, 1 RETURNING VARBINARY FORMAT JSON ENCODING UTF8)
-    --> X'5b 74 72 75 65 2c 31 5d'
-
-    SELECT json_array(true, 1 RETURNING VARBINARY FORMAT JSON ENCODING UTF16)
-    --> X'5b 00 74 00 72 00 75 00 65 00 2c 00 31 00 5d 00'
-
-    SELECT json_array(true, 1 RETURNING VARBINARY FORMAT JSON ENCODING UTF32)
-    --> X'5b 00 00 00 74 00 00 00 72 00 00 00 75 00 00 00 65 00 00 00 2c 00 00 00 31 00 00 00 5d 00 00 00'
-
-.. _json_object:
-
-json_object
------------
-
-The ``json_object`` function creates a JSON object containing given key-value pairs.
-
-.. code-block:: text
-
-    JSON_OBJECT(
-        [ key_value [, ...]
-          [ { NULL ON NULL | ABSENT ON NULL } ] ],
-          [ { WITH UNIQUE [ KEYS ] | WITHOUT UNIQUE [ KEYS ] } ]
-        [ RETURNING type [ FORMAT JSON [ ENCODING { UTF8 | UTF16 | UTF32 } ] ] ]
-        )
-
-Argument passing conventions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-There are two conventions for passing keys and values::
-
-    SELECT json_object('key1' : 1, 'key2' : true)
-    --> '{"key1":1,"key2":true}'
-
-    SELECT json_object(KEY 'key1' VALUE 1, KEY 'key2' VALUE true)
-    --> '{"key1":1,"key2":true}'
-
-In the second convention, you can omit the ``KEY`` keyword::
-
-    SELECT json_object('key1' VALUE 1, 'key2' VALUE true)
-    --> '{"key1":1,"key2":true}'
-
-Argument types
-^^^^^^^^^^^^^^
-
-The keys can be arbitrary expressions. They must be of character string type.
-Each key is converted into a JSON text item, and it becomes a key in the
-created JSON object. Keys must not be null.
-
-The values can be arbitrary expressions. Each passed value is converted
-into a JSON item according to its type, and optional ``FORMAT`` and
-``ENCODING`` specification.
-
-You can pass SQL values of types boolean, numeric, and character string. They
-are converted to corresponding JSON literals::
-
-    SELECT json_object('x' : true, 'y' : 12e-1, 'z' : 'text')
-    --> '{"x":true,"y":1.2,"z":"text"}'
-
-Additionally to SQL values, you can pass JSON values. They are character or
-binary strings with a specified format and optional encoding::
-
-    SELECT json_object(
-                       'x' : '[  "text"  ] ' FORMAT JSON,
-                       'y' : X'5B0035005D00' FORMAT JSON ENCODING UTF16
-                      )
-    --> '{"x":["text"],"y":[5]}'
-
-You can also nest other JSON-returning functions. In that case, the ``FORMAT``
-option is implicit::
-
-    SELECT json_object(
-                       'x' : json_query('{"key" : [  "value"  ]}', 'lax $.key')
-                      )
-    --> '{"x":["value"]}'
-
-Other passed values are cast to varchar, and they become JSON text literals::
-
-    SELECT json_object(
-                       'x' : DATE '2001-01-31',
-                       'y' : UUID '12151fd2-7586-11e9-8f9e-2a86e4085a59'
-                      )
-    --> '{"x":"2001-01-31","y":"12151fd2-7586-11e9-8f9e-2a86e4085a59"}'
-
-You can omit the arguments altogether to get an empty object::
-
-    SELECT json_object() --> '{}'
-
-Null handling
-^^^^^^^^^^^^^
-
-The values passed for JSON object keys must not be null. It is allowed to pass
-``null`` for JSON object values. A null value is treated according to the
-specified null treatment option. If ``NULL ON NULL`` is specified, a JSON
-object entry with ``null`` value is added to the result. If ``ABSENT ON NULL``
-is specified, the entry is omitted in the result. ``NULL ON NULL`` is the
-default configuration.::
-
-    SELECT json_object('x' : null, 'y' : 1)
-    --> '{"x":null,"y":1}'
-
-    SELECT json_object('x' : null, 'y' : 1 NULL ON NULL)
-    --> '{"x":null,"y":1}'
-
-    SELECT json_object('x' : null, 'y' : 1 ABSENT ON NULL)
-    --> '{"y":1}'
-
-Key uniqueness
-^^^^^^^^^^^^^^
-
-If a duplicate key is encountered, it is handled according to the specified key
-uniqueness constraint.
-
-If ``WITH UNIQUE KEYS`` is specified, a duplicate key results in a query
-failure::
-
-    SELECT json_object('x' : null, 'x' : 1 WITH UNIQUE KEYS)
-    --> failure: "duplicate key passed to JSON_OBJECT function"
-
-Note that this option is not supported if any of the arguments has a
-``FORMAT`` specification.
-
-If ``WITHOUT UNIQUE KEYS`` is specified, duplicate keys are not supported due
-to implementation limitation. ``WITHOUT UNIQUE KEYS`` is the default
-configuration.
-
-Returned type
-^^^^^^^^^^^^^
-
-The SQL standard imposes that there is no dedicated data type to represent JSON
-data in SQL. Instead, JSON data is represented as character or binary strings.
-By default, the ``json_object`` function returns varchar containing the textual
-representation of the JSON object. With the ``RETURNING`` clause, you can
-specify other character string type::
-
-    SELECT json_object('x' : 1 RETURNING VARCHAR(100))
-    --> '{"x":1}'
-
-You can also specify to use varbinary and the required encoding as return type.
-The default encoding is UTF8::
-
-    SELECT json_object('x' : 1 RETURNING VARBINARY)
-    --> X'7b 22 78 22 3a 31 7d'
-
-    SELECT json_object('x' : 1 RETURNING VARBINARY FORMAT JSON ENCODING UTF8)
-    --> X'7b 22 78 22 3a 31 7d'
-
-    SELECT json_object('x' : 1 RETURNING VARBINARY FORMAT JSON ENCODING UTF16)
-    --> X'7b 00 22 00 78 00 22 00 3a 00 31 00 7d 00'
-
-    SELECT json_object('x' : 1 RETURNING VARBINARY FORMAT JSON ENCODING UTF32)
-    --> X'7b 00 00 00 22 00 00 00 78 00 00 00 22 00 00 00 3a 00 00 00 31 00 00 00 7d 00 00 00'
-
-.. warning::
-
-    The following functions and operators are not compliant with the SQL
-    standard, and should be considered deprecated. According to the SQL
-    standard, there shall be no ``JSON`` data type. Instead, JSON values
-    should be represented as string values. The remaining functionality of the
-    following functions is covered by the functions described previously.
-
-Cast to JSON
-------------
-
-The following types can be cast to JSON:
-
-* ``BOOLEAN``
-* ``TINYINT``
-* ``SMALLINT``
-* ``INTEGER``
-* ``BIGINT``
-* ``REAL``
-* ``DOUBLE``
-* ``VARCHAR``
-
-Additionally, ``ARRAY``, ``MAP``, and ``ROW`` types can be cast to JSON when
-the following requirements are met:
-
-* ``ARRAY`` types can be cast when the element type of the array is one
-  of the supported types.
-* ``MAP`` types can be cast when the key type of the map is ``VARCHAR`` and
-  the value type of the map is a supported type,
-* ``ROW`` types can be cast when every field type of the row is a supported
-  type.
-
-.. note::
-
-    Cast operations with supported :ref:`character string types
-    <string-data-types>` treat the input as a string, not validated as JSON.
-    This means that a cast operation with a string-type input of invalid JSON
-    results in a succesful cast to invalid JSON.
-
-    Instead, consider using the :func:`json_parse` function to
-    create validated JSON from a string.
-
-The following examples show the behavior of casting to JSON with these types::
-
-    SELECT CAST(NULL AS JSON);
-    -- NULL
-
-    SELECT CAST(1 AS JSON);
-    -- JSON '1'
-
-    SELECT CAST(9223372036854775807 AS JSON);
-    -- JSON '9223372036854775807'
-
-    SELECT CAST('abc' AS JSON);
-    -- JSON '"abc"'
-
-    SELECT CAST(true AS JSON);
-    -- JSON 'true'
-
-    SELECT CAST(1.234 AS JSON);
-    -- JSON '1.234'
-
-    SELECT CAST(ARRAY[1, 23, 456] AS JSON);
-    -- JSON '[1,23,456]'
-
-    SELECT CAST(ARRAY[1, NULL, 456] AS JSON);
-    -- JSON '[1,null,456]'
-
-    SELECT CAST(ARRAY[ARRAY[1, 23], ARRAY[456]] AS JSON);
-    -- JSON '[[1,23],[456]]'
-
-    SELECT CAST(MAP(ARRAY['k1', 'k2', 'k3'], ARRAY[1, 23, 456]) AS JSON);
-    -- JSON '{"k1":1,"k2":23,"k3":456}'
-
-    SELECT CAST(CAST(ROW(123, 'abc', true) AS
-                ROW(v1 BIGINT, v2 VARCHAR, v3 BOOLEAN)) AS JSON);
-    -- JSON '{"v1":123,"v2":"abc","v3":true}'
-
-Casting from NULL to ``JSON`` is not straightforward. Casting
-from a standalone ``NULL`` will produce SQL ``NULL`` instead of
-``JSON 'null'``. However, when casting from arrays or map containing
-``NULL``\s, the produced ``JSON`` will have ``null``\s in it.
-
-Cast from JSON
---------------
-
-Casting to ``BOOLEAN``, ``TINYINT``, ``SMALLINT``, ``INTEGER``,
-``BIGINT``, ``REAL``, ``DOUBLE`` or ``VARCHAR`` is supported.
-Casting to ``ARRAY`` and ``MAP`` is supported when the element type of
-the array is one of the supported types, or when the key type of the map
-is ``VARCHAR`` and value type of the map is one of the supported types.
-Behaviors of the casts are shown with the examples below::
-
-    SELECT CAST(JSON 'null' AS VARCHAR);
-    -- NULL
-
-    SELECT CAST(JSON '1' AS INTEGER);
-    -- 1
-
-    SELECT CAST(JSON '9223372036854775807' AS BIGINT);
-    -- 9223372036854775807
-
-    SELECT CAST(JSON '"abc"' AS VARCHAR);
-    -- abc
-
-    SELECT CAST(JSON 'true' AS BOOLEAN);
-    -- true
-
-    SELECT CAST(JSON '1.234' AS DOUBLE);
-    -- 1.234
-
-    SELECT CAST(JSON '[1,23,456]' AS ARRAY(INTEGER));
-    -- [1, 23, 456]
-
-    SELECT CAST(JSON '[1,null,456]' AS ARRAY(INTEGER));
-    -- [1, NULL, 456]
-
-    SELECT CAST(JSON '[[1,23],[456]]' AS ARRAY(ARRAY(INTEGER)));
-    -- [[1, 23], [456]]
-
-    SELECT CAST(JSON '{"k1":1,"k2":23,"k3":456}' AS MAP(VARCHAR, INTEGER));
-    -- {k1=1, k2=23, k3=456}
-
-    SELECT CAST(JSON '{"v1":123,"v2":"abc","v3":true}' AS
-                ROW(v1 BIGINT, v2 VARCHAR, v3 BOOLEAN));
-    -- {v1=123, v2=abc, v3=true}
-
-    SELECT CAST(JSON '[123,"abc",true]' AS
-                ROW(v1 BIGINT, v2 VARCHAR, v3 BOOLEAN));
-    -- {v1=123, v2=abc, v3=true}
-
-JSON arrays can have mixed element types and JSON maps can have mixed
-value types. This makes it impossible to cast them to SQL arrays and maps in
-some cases. To address this, Trino supports partial casting of arrays and maps::
-
-    SELECT CAST(JSON '[[1, 23], 456]' AS ARRAY(JSON));
-    -- [JSON '[1,23]', JSON '456']
-
-    SELECT CAST(JSON '{"k1": [1, 23], "k2": 456}' AS MAP(VARCHAR, JSON));
-    -- {k1 = JSON '[1,23]', k2 = JSON '456'}
-
-    SELECT CAST(JSON '[null]' AS ARRAY(JSON));
-    -- [JSON 'null']
-
-When casting from ``JSON`` to ``ROW``, both JSON array and JSON object are supported.
-
-Other JSON functions
---------------------
-
-In addition to the functions explained in more details in the preceding
-sections, the following functions are available:
-
-.. function:: is_json_scalar(json) -> boolean
-
-    Determine if ``json`` is a scalar (i.e. a JSON number, a JSON string, ``true``, ``false`` or ``null``)::
-
-        SELECT is_json_scalar('1');         -- true
-        SELECT is_json_scalar('[1, 2, 3]'); -- false
-
-.. function:: json_array_contains(json, value) -> boolean
-
-    Determine if ``value`` exists in ``json`` (a string containing a JSON array)::
-
-        SELECT json_array_contains('[1, 2, 3]', 2); -- true
-
-.. function:: json_array_get(json_array, index) -> json
-
-   .. warning::
-
-       The semantics of this function are broken. If the extracted element
-       is a string, it will be converted into an invalid ``JSON`` value that
-       is not properly quoted (the value will not be surrounded by quotes
-       and any interior quotes will not be escaped).
-
-       We recommend against using this function. It cannot be fixed without
-       impacting existing usages and may be removed in a future release.
-
-   Returns the element at the specified index into the ``json_array``.
-   The index is zero-based::
-
-        SELECT json_array_get('["a", [3, 9], "c"]', 0); -- JSON 'a' (invalid JSON)
-        SELECT json_array_get('["a", [3, 9], "c"]', 1); -- JSON '[3,9]'
-
-   This function also supports negative indexes for fetching element indexed
-   from the end of an array::
-
-        SELECT json_array_get('["c", [3, 9], "a"]', -1); -- JSON 'a' (invalid JSON)
-        SELECT json_array_get('["c", [3, 9], "a"]', -2); -- JSON '[3,9]'
-
-   If the element at the specified index doesn't exist, the function returns null::
-
-        SELECT json_array_get('[]', 0);                -- NULL
-        SELECT json_array_get('["a", "b", "c"]', 10);  -- NULL
-        SELECT json_array_get('["c", "b", "a"]', -10); -- NULL
-
-.. function:: json_array_length(json) -> bigint
-
-    Returns the array length of ``json`` (a string containing a JSON array)::
-
-        SELECT json_array_length('[1, 2, 3]'); -- 3
-
-.. function:: json_extract(json, json_path) -> json
-
-    Evaluates the `JSONPath`_-like expression ``json_path`` on ``json``
-    (a string containing JSON) and returns the result as a JSON string::
-
-        SELECT json_extract(json, '$.store.book');
-        SELECT json_extract(json, '$.store[book]');
-        SELECT json_extract(json, '$.store["book name"]');
-
-    .. _JSONPath: http://goessner.net/articles/JsonPath/
-
-.. function:: json_extract_scalar(json, json_path) -> varchar
-
-    Like :func:`json_extract`, but returns the result value as a string (as opposed
-    to being encoded as JSON). The value referenced by ``json_path`` must be a
-    scalar (boolean, number or string). ::
-
-        SELECT json_extract_scalar('[1, 2, 3]', '$[2]');
-        SELECT json_extract_scalar(json, '$.store.book[0].author');
-
-.. function:: json_format(json) -> varchar
-
-    Returns the JSON text serialized from the input JSON value.
-    This is inverse function to :func:`json_parse`. ::
-
-        SELECT json_format(JSON '[1, 2, 3]'); -- '[1,2,3]'
-        SELECT json_format(JSON '"a"');       -- '"a"'
-
-    .. note::
-
-        :func:`json_format` and ``CAST(json AS VARCHAR)`` have completely
-        different semantics.
-
-        :func:`json_format` serializes the input JSON value to JSON text conforming to
-        :rfc:`7159`. The JSON value can be a JSON object, a JSON array, a JSON string,
-        a JSON number, ``true``, ``false`` or ``null``. ::
-
-            SELECT json_format(JSON '{"a": 1, "b": 2}'); -- '{"a":1,"b":2}'
-            SELECT json_format(JSON '[1, 2, 3]');        -- '[1,2,3]'
-            SELECT json_format(JSON '"abc"');            -- '"abc"'
-            SELECT json_format(JSON '42');               -- '42'
-            SELECT json_format(JSON 'true');             -- 'true'
-            SELECT json_format(JSON 'null');             -- 'null'
-
-        ``CAST(json AS VARCHAR)`` casts the JSON value to the corresponding SQL VARCHAR value.
-        For JSON string, JSON number, ``true``, ``false`` or ``null``, the cast
-        behavior is same as the corresponding SQL type. JSON object and JSON array
-        cannot be cast to VARCHAR. ::
-
-            SELECT CAST(JSON '{"a": 1, "b": 2}' AS VARCHAR); -- ERROR!
-            SELECT CAST(JSON '[1, 2, 3]' AS VARCHAR);        -- ERROR!
-            SELECT CAST(JSON '"abc"' AS VARCHAR);            -- 'abc' (the double quote is gone)
-            SELECT CAST(JSON '42' AS VARCHAR);               -- '42'
-            SELECT CAST(JSON 'true' AS VARCHAR);             -- 'true'
-            SELECT CAST(JSON 'null' AS VARCHAR);             -- NULL
-
-.. function:: json_parse(string) -> json
-
-    Returns the JSON value deserialized from the input JSON text.
-    This is inverse function to :func:`json_format`::
-
-        SELECT json_parse('[1, 2, 3]');   -- JSON '[1,2,3]'
-        SELECT json_parse('"abc"');       -- JSON '"abc"'
-
-    .. note::
-
-        :func:`json_parse` and ``CAST(string AS JSON)`` have completely
-        different semantics.
-
-        :func:`json_parse` expects a JSON text conforming to :rfc:`7159`, and returns
-        the JSON value deserialized from the JSON text.
-        The JSON value can be a JSON object, a JSON array, a JSON string, a JSON number,
-        ``true``, ``false`` or ``null``. ::
-
-            SELECT json_parse('not_json');         -- ERROR!
-            SELECT json_parse('["a": 1, "b": 2]'); -- JSON '["a": 1, "b": 2]'
-            SELECT json_parse('[1, 2, 3]');        -- JSON '[1,2,3]'
-            SELECT json_parse('"abc"');            -- JSON '"abc"'
-            SELECT json_parse('42');               -- JSON '42'
-            SELECT json_parse('true');             -- JSON 'true'
-            SELECT json_parse('null');             -- JSON 'null'
-
-        ``CAST(string AS JSON)`` takes any VARCHAR value as input, and returns
-        a JSON string with its value set to input string. ::
-
-            SELECT CAST('not_json' AS JSON);         -- JSON '"not_json"'
-            SELECT CAST('["a": 1, "b": 2]' AS JSON); -- JSON '"[\"a\": 1, \"b\": 2]"'
-            SELECT CAST('[1, 2, 3]' AS JSON);        -- JSON '"[1, 2, 3]"'
-            SELECT CAST('"abc"' AS JSON);            -- JSON '"\"abc\""'
-            SELECT CAST('42' AS JSON);               -- JSON '"42"'
-            SELECT CAST('true' AS JSON);             -- JSON '"true"'
-            SELECT CAST('null' AS JSON);             -- JSON '"null"'
-
-.. function:: json_size(json, json_path) -> bigint
-
-    Like :func:`json_extract`, but returns the size of the value.
-    For objects or arrays, the size is the number of members,
-    and the size of a scalar value is zero. ::
-
-        SELECT json_size('{"x": {"a": 1, "b": 2}}', '$.x');   -- 2
-        SELECT json_size('{"x": [1, 2, 3]}', '$.x');          -- 3
-        SELECT json_size('{"x": {"a": 1, "b": 2}}', '$.x.a'); -- 0
diff --git a/docs/src/main/sphinx/functions/lambda.md b/docs/src/main/sphinx/functions/lambda.md
new file mode 100644
index 000000000000..26f36f43989c
--- /dev/null
+++ b/docs/src/main/sphinx/functions/lambda.md
@@ -0,0 +1,130 @@
+(lambda-expressions)=
+
+# Lambda expressions
+
+Lambda expressions are anonymous functions which are passed as
+arguments to higher-order SQL functions.
+
+Lambda expressions are written with `->`:
+
+```
+x -> x + 1
+(x, y) -> x + y
+x -> regexp_like(x, 'a+')
+x -> x[1] / x[2]
+x -> IF(x > 0, x, -x)
+x -> COALESCE(x, 0)
+x -> CAST(x AS JSON)
+x -> x + TRY(1 / 0)
+```
+
+## Limitations
+
+Most SQL expressions can be used in a lambda body, with a few exceptions:
+
+- Subqueries are not supported: `x -> 2 + (SELECT 3)`
+- Aggregations are not supported: `x -> max(y)`
+
+## Examples
+
+Obtain the squared elements of an array column with {func}`transform`:
+
+```
+SELECT numbers,
+       transform(numbers, n -> n * n) as squared_numbers
+FROM (
+    VALUES
+        (ARRAY[1, 2]),
+        (ARRAY[3, 4]),
+        (ARRAY[5, 6, 7])
+) AS t(numbers);
+```
+
+```text
+  numbers  | squared_numbers
+-----------+-----------------
+ [1, 2]    | [1, 4]
+ [3, 4]    | [9, 16]
+ [5, 6, 7] | [25, 36, 49]
+(3 rows)
+```
+
+The function {func}`transform` can be also employed to safely cast the elements
+of an array to strings:
+
+```
+SELECT transform(prices, n -> TRY_CAST(n AS VARCHAR) || '$') as price_tags
+FROM (
+    VALUES
+        (ARRAY[100, 200]),
+        (ARRAY[30, 4])
+) AS t(prices);
+```
+
+```text
+  price_tags
+--------------
+ [100$, 200$]
+ [30$, 4$]
+(2 rows)
+```
+
+Besides the array column being manipulated,
+other columns can be captured as well within the lambda expression.
+The following statement provides a showcase of this feature
+for calculating the value of the linear function `f(x) = ax + b`
+with {func}`transform`:
+
+```
+SELECT xvalues,
+       a,
+       b,
+       transform(xvalues, x -> a * x + b) as linear_function_values
+FROM (
+    VALUES
+        (ARRAY[1, 2], 10, 5),
+        (ARRAY[3, 4], 4, 2)
+) AS t(xvalues, a, b);
+```
+
+```text
+ xvalues | a  | b | linear_function_values
+---------+----+---+------------------------
+ [1, 2]  | 10 | 5 | [15, 25]
+ [3, 4]  |  4 | 2 | [14, 18]
+(2 rows)
+```
+
+Find the array elements containing at least one value greater than `100`
+with {func}`any_match`:
+
+```
+SELECT numbers
+FROM (
+    VALUES
+        (ARRAY[1,NULL,3]),
+        (ARRAY[10,20,30]),
+        (ARRAY[100,200,300])
+) AS t(numbers)
+WHERE any_match(numbers, n ->  COALESCE(n, 0) > 100);
+-- [100, 200, 300]
+```
+
+Capitalize the first word in a string via {func}`regexp_replace`:
+
+```
+SELECT regexp_replace('once upon a time ...', '^(\w)(\w*)(\s+.*)$',x -> upper(x[1]) || x[2] || x[3]);
+-- Once upon a time ...
+```
+
+Lambda expressions can be also applied in aggregation functions.
+Following statement is a sample the overly complex calculation of the sum of all elements of a column
+by making use of {func}`reduce_agg`:
+
+```
+SELECT reduce_agg(value, 0, (a, b) -> a + b, (a, b) -> a + b) sum_values
+FROM (
+    VALUES (1), (2), (3), (4), (5)
+) AS t(value);
+-- 15
+```
diff --git a/docs/src/main/sphinx/functions/lambda.rst b/docs/src/main/sphinx/functions/lambda.rst
deleted file mode 100644
index 66ea4e412b81..000000000000
--- a/docs/src/main/sphinx/functions/lambda.rst
+++ /dev/null
@@ -1,124 +0,0 @@
-.. _lambda_expressions:
-
-==================
-Lambda expressions
-==================
-
-Lambda expressions are anonymous functions which are passed as
-arguments to higher-order SQL functions.
-
-Lambda expressions are written with ``->``::
-
-    x -> x + 1
-    (x, y) -> x + y
-    x -> regexp_like(x, 'a+')
-    x -> x[1] / x[2]
-    x -> IF(x > 0, x, -x)
-    x -> COALESCE(x, 0)
-    x -> CAST(x AS JSON)
-    x -> x + TRY(1 / 0)
-
-Limitations
------------
-
-Most SQL expressions can be used in a lambda body, with a few exceptions:
-
-* Subqueries are not supported: ``x -> 2 + (SELECT 3)``
-* Aggregations are not supported: ``x -> max(y)``
-
-Examples
---------
-
-Obtain the squared elements of an array column with :func:`transform`::
-
-    SELECT numbers,
-           transform(numbers, n -> n * n) as squared_numbers
-    FROM (
-        VALUES
-            (ARRAY[1, 2]),
-            (ARRAY[3, 4]),
-            (ARRAY[5, 6, 7])
-    ) AS t(numbers);
-
-.. code-block:: text
-
-      numbers  | squared_numbers
-    -----------+-----------------
-     [1, 2]    | [1, 4]
-     [3, 4]    | [9, 16]
-     [5, 6, 7] | [25, 36, 49]
-    (3 rows)
-
-The function :func:`transform` can be also employed to safely cast the elements
-of an array to strings::
-
-    SELECT transform(prices, n -> TRY_CAST(n AS VARCHAR) || '$') as price_tags
-    FROM (
-        VALUES
-            (ARRAY[100, 200]),
-            (ARRAY[30, 4])
-    ) AS t(prices);
-
-
-.. code-block:: text
-
-      price_tags
-    --------------
-     [100$, 200$]
-     [30$, 4$]
-    (2 rows)
-
-Besides the array column being manipulated,
-other columns can be captured as well within the lambda expression.
-The following statement provides a showcase of this feature
-for calculating the value of the linear function ``f(x) = ax + b``
-with :func:`transform`::
-
-    SELECT xvalues,
-           a,
-           b,
-           transform(xvalues, x -> a * x + b) as linear_function_values
-    FROM (
-        VALUES
-            (ARRAY[1, 2], 10, 5),
-            (ARRAY[3, 4], 4, 2)
-    ) AS t(xvalues, a, b);
-
-.. code-block:: text
-
-     xvalues | a  | b | linear_function_values
-    ---------+----+---+------------------------
-     [1, 2]  | 10 | 5 | [15, 25]
-     [3, 4]  |  4 | 2 | [14, 18]
-    (2 rows)
-
-
-Find the array elements containing at least one value greater than ``100``
-with :func:`any_match`::
-
-    SELECT numbers
-    FROM (
-        VALUES
-            (ARRAY[1,NULL,3]),
-            (ARRAY[10,20,30]),
-            (ARRAY[100,200,300])
-    ) AS t(numbers)
-    WHERE any_match(numbers, n ->  COALESCE(n, 0) > 100);
-    -- [100, 200, 300]
-
-
-Capitalize the first word in a string via :func:`regexp_replace`::
-
-    SELECT regexp_replace('once upon a time ...', '^(\w)(\w*)(\s+.*)$',x -> upper(x[1]) || x[2] || x[3]);
-    -- Once upon a time ...
-
-Lambda expressions can be also applied in aggregation functions.
-Following statement is a sample the overly complex calculation of the sum of all elements of a column
-by making use of :func:`reduce_agg`::
-
-    SELECT reduce_agg(value, 0, (a, b) -> a + b, (a, b) -> a + b) sum_values
-    FROM (
-        VALUES (1), (2), (3), (4), (5)
-    ) AS t(value);
-    -- 15
-
diff --git a/docs/src/main/sphinx/functions/list-by-topic.md b/docs/src/main/sphinx/functions/list-by-topic.md
new file mode 100644
index 000000000000..d55aafbcba6b
--- /dev/null
+++ b/docs/src/main/sphinx/functions/list-by-topic.md
@@ -0,0 +1,555 @@
+# List of functions by topic
+
+## Aggregate
+
+For more details, see {doc}`aggregate`
+
+- {func}`any_value`
+- {func}`approx_distinct`
+- {func}`approx_most_frequent`
+- {func}`approx_percentile`
+- `approx_set()`
+- {func}`arbitrary`
+- {func}`array_agg`
+- {func}`avg`
+- {func}`bitwise_and_agg`
+- {func}`bitwise_or_agg`
+- {func}`bool_and`
+- {func}`bool_or`
+- {func}`checksum`
+- {func}`corr`
+- {func}`count`
+- {func}`count_if`
+- {func}`covar_pop`
+- {func}`covar_samp`
+- {func}`every`
+- {func}`geometric_mean`
+- {func}`histogram`
+- {func}`kurtosis`
+- {func}`map_agg`
+- {func}`map_union`
+- {func}`max`
+- {func}`max_by`
+- `merge()`
+- {func}`min`
+- {func}`min_by`
+- {func}`multimap_agg`
+- {func}`numeric_histogram`
+- `qdigest_agg()`
+- {func}`regr_intercept`
+- {func}`regr_slope`
+- {func}`skewness`
+- {func}`sum`
+- {func}`stddev`
+- {func}`stddev_pop`
+- {func}`stddev_samp`
+- `tdigest_agg()`
+- {func}`variance`
+- {func}`var_pop`
+- {func}`var_samp`
+
+## Array
+
+For more details, see {doc}`array`
+
+- {func}`all_match`
+- {func}`any_match`
+- {func}`array_distinct`
+- {func}`array_except`
+- {func}`array_intersect`
+- {func}`array_join`
+- {func}`array_max`
+- {func}`array_min`
+- {func}`array_position`
+- {func}`array_remove`
+- {func}`array_sort`
+- {func}`array_union`
+- {func}`arrays_overlap`
+- {func}`cardinality`
+- {func}`combinations`
+- `concat()`
+- {func}`contains`
+- {func}`element_at`
+- {func}`filter`
+- {func}`flatten`
+- {func}`ngrams`
+- {func}`none_match`
+- {func}`reduce`
+- {func}`repeat`
+- `reverse()`
+- {func}`sequence`
+- {func}`shuffle`
+- {func}`slice`
+- {func}`transform`
+- {func}`trim_array`
+- {func}`zip`
+- {func}`zip_with`
+
+## Binary
+
+For more details, see {doc}`binary`
+
+- `concat()`
+- {func}`crc32`
+- {func}`from_base32`
+- {func}`from_base64`
+- {func}`from_base64url`
+- {func}`from_big_endian_32`
+- {func}`from_big_endian_64`
+- {func}`from_hex`
+- {func}`from_ieee754_32`
+- {func}`from_ieee754_64`
+- {func}`hmac_md5`
+- {func}`hmac_sha1`
+- {func}`hmac_sha256`
+- {func}`hmac_sha512`
+- `length()`
+- `lpad()`
+- {func}`md5`
+- {func}`murmur3`
+- `reverse()`
+- `rpad()`
+- {func}`sha1`
+- {func}`sha256`
+- {func}`sha512`
+- {func}`spooky_hash_v2_32`
+- {func}`spooky_hash_v2_64`
+- `substr()`
+- {func}`to_base32`
+- {func}`to_base64`
+- {func}`to_base64url`
+- {func}`to_big_endian_32`
+- {func}`to_big_endian_64`
+- {func}`to_hex`
+- {func}`to_ieee754_32`
+- {func}`to_ieee754_64`
+- {func}`xxhash64`
+
+## Bitwise
+
+For more details, see {doc}`bitwise`
+
+- {func}`bit_count`
+- {func}`bitwise_and`
+- {func}`bitwise_left_shift`
+- {func}`bitwise_not`
+- {func}`bitwise_or`
+- {func}`bitwise_right_shift`
+- {func}`bitwise_right_shift_arithmetic`
+- {func}`bitwise_xor`
+
+## Color
+
+For more details, see {doc}`color`
+
+- {func}`bar`
+- {func}`color`
+- {func}`render`
+- {func}`rgb`
+
+## Comparison
+
+For more details, see {doc}`comparison`
+
+- {func}`greatest`
+- {func}`least`
+
+## Conditional
+
+For more details, see {doc}`conditional`
+
+- {ref}`coalesce <coalesce-function>`
+- {ref}`if <if-function>`
+- {ref}`nullif <nullif-function>`
+- {ref}`try <try-function>`
+
+## Conversion
+
+For more details, see {doc}`conversion`
+
+- {func}`cast`
+- {func}`format`
+- {func}`try_cast`
+- {func}`typeof`
+
+## Date and time
+
+For more details, see {doc}`datetime`
+
+- {ref}`AT TIME ZONE <at-time-zone-operator>`
+- {data}`current_date`
+- {data}`current_time`
+- {data}`current_timestamp`
+- {data}`localtime`
+- {data}`localtimestamp`
+- {func}`current_timezone`
+- {func}`date`
+- {func}`date_add`
+- {func}`date_diff`
+- {func}`date_format`
+- {func}`date_parse`
+- {func}`date_trunc`
+- {func}`format_datetime`
+- {func}`from_iso8601_date`
+- {func}`from_iso8601_timestamp`
+- {func}`from_unixtime`
+- {func}`from_unixtime_nanos`
+- {func}`human_readable_seconds`
+- {func}`last_day_of_month`
+- {func}`now`
+- {func}`parse_duration`
+- {func}`to_iso8601`
+- {func}`to_milliseconds`
+- {func}`to_unixtime`
+- {func}`with_timezone`
+
+## Geospatial
+
+For more details, see {doc}`geospatial`
+
+- {func}`bing_tile`
+- {func}`bing_tile_at`
+- {func}`bing_tile_coordinates`
+- {func}`bing_tile_polygon`
+- {func}`bing_tile_quadkey`
+- {func}`bing_tile_zoom_level`
+- {func}`bing_tiles_around`
+- {func}`convex_hull_agg`
+- {func}`from_encoded_polyline`
+- {func}`from_geojson_geometry`
+- {func}`geometry_from_hadoop_shape`
+- {func}`geometry_invalid_reason`
+- {func}`geometry_nearest_points`
+- {func}`geometry_to_bing_tiles`
+- {func}`geometry_union`
+- {func}`geometry_union_agg`
+- {func}`great_circle_distance`
+- {func}`line_interpolate_point`
+- {func}`line_locate_point`
+- {func}`simplify_geometry`
+- {func}`ST_Area`
+- {func}`ST_AsBinary`
+- {func}`ST_AsText`
+- {func}`ST_Boundary`
+- {func}`ST_Buffer`
+- {func}`ST_Centroid`
+- {func}`ST_Contains`
+- {func}`ST_ConvexHull`
+- {func}`ST_CoordDim`
+- {func}`ST_Crosses`
+- {func}`ST_Difference`
+- {func}`ST_Dimension`
+- {func}`ST_Disjoint`
+- {func}`ST_Distance`
+- {func}`ST_EndPoint`
+- {func}`ST_Envelope`
+- {func}`ST_Equals`
+- {func}`ST_ExteriorRing`
+- {func}`ST_Geometries`
+- {func}`ST_GeometryFromText`
+- {func}`ST_GeometryN`
+- {func}`ST_GeometryType`
+- {func}`ST_GeomFromBinary`
+- {func}`ST_InteriorRings`
+- {func}`ST_InteriorRingN`
+- {func}`ST_Intersects`
+- {func}`ST_Intersection`
+- {func}`ST_IsClosed`
+- {func}`ST_IsEmpty`
+- {func}`ST_IsSimple`
+- {func}`ST_IsRing`
+- {func}`ST_IsValid`
+- {func}`ST_Length`
+- {func}`ST_LineFromText`
+- {func}`ST_LineString`
+- {func}`ST_MultiPoint`
+- {func}`ST_NumGeometries`
+- {func}`ST_NumInteriorRing`
+- {func}`ST_NumPoints`
+- {func}`ST_Overlaps`
+- {func}`ST_Point`
+- {func}`ST_PointN`
+- {func}`ST_Points`
+- {func}`ST_Polygon`
+- {func}`ST_Relate`
+- {func}`ST_StartPoint`
+- {func}`ST_SymDifference`
+- {func}`ST_Touches`
+- {func}`ST_Union`
+- {func}`ST_Within`
+- {func}`ST_X`
+- {func}`ST_XMax`
+- {func}`ST_XMin`
+- {func}`ST_Y`
+- {func}`ST_YMax`
+- {func}`ST_YMin`
+- {func}`to_encoded_polyline`
+- {func}`to_geojson_geometry`
+- {func}`to_geometry`
+- {func}`to_spherical_geography`
+
+## HyperLogLog
+
+For more details, see {doc}`hyperloglog`
+
+- {func}`approx_set`
+- `cardinality()`
+- {func}`empty_approx_set`
+- {func}`merge`
+
+## JSON
+
+For more details, see {doc}`json`
+
+- {func}`is_json_scalar`
+- {ref}`json_array() <json-array>`
+- {func}`json_array_contains`
+- {func}`json_array_get`
+- {func}`json_array_length`
+- {ref}`json_exists() <json-exists>`
+- {func}`json_extract`
+- {func}`json_extract_scalar`
+- {func}`json_format`
+- {func}`json_parse`
+- {ref}`json_object() <json-object>`
+- {ref}`json_query() <json-query>`
+- {func}`json_size`
+- {ref}`json_value() <json-value>`
+
+## Lambda
+
+For more details, see {doc}`lambda`
+
+- {func}`any_match`
+- {func}`reduce_agg`
+- {func}`regexp_replace`
+- {func}`transform`
+
+## Machine learning
+
+For more details, see {doc}`ml`
+
+- {func}`classify`
+- {func}`features`
+- {func}`learn_classifier`
+- {func}`learn_libsvm_classifier`
+- {func}`learn_libsvm_regressor`
+- {func}`learn_regressor`
+- {func}`regress`
+
+## Map
+
+For more details, see {doc}`map`
+
+- {func}`cardinality`
+- {func}`element_at`
+- {func}`map`
+- {func}`map_concat`
+- {func}`map_entries`
+- {func}`map_filter`
+- {func}`map_from_entries`
+- {func}`map_keys`
+- {func}`map_values`
+- {func}`map_zip_with`
+- {func}`multimap_from_entries`
+- {func}`transform_keys`
+- {func}`transform_values`
+
+## Math
+
+For more details, see {doc}`math`
+
+- {func}`abs`
+- {func}`acos`
+- {func}`asin`
+- {func}`atan`
+- {func}`beta_cdf`
+- {func}`cbrt`
+- {func}`ceil`
+- {func}`cos`
+- {func}`cosh`
+- {func}`cosine_similarity`
+- {func}`degrees`
+- {func}`e`
+- {func}`exp`
+- {func}`floor`
+- {func}`from_base`
+- {func}`infinity`
+- {func}`inverse_beta_cdf`
+- {func}`inverse_normal_cdf`
+- {func}`is_finite`
+- {func}`is_nan`
+- {func}`ln`
+- {func}`log`
+- {func}`log2`
+- {func}`log10`
+- {func}`mod`
+- {func}`nan`
+- {func}`normal_cdf`
+- {func}`pi`
+- {func}`pow`
+- {func}`power`
+- {func}`radians`
+- {func}`rand`
+- {func}`random`
+- {func}`round`
+- {func}`sign`
+- {func}`sin`
+- {func}`sinh`
+- {func}`sqrt`
+- {func}`tan`
+- {func}`tanh`
+- {func}`to_base`
+- {func}`truncate`
+- {func}`width_bucket`
+- {func}`wilson_interval_lower`
+- {func}`wilson_interval_upper`
+
+## Quantile digest
+
+For more details, see {doc}`qdigest`
+
+- `merge()`
+- {func}`qdigest_agg`
+- {func}`value_at_quantile`
+- {func}`values_at_quantiles`
+
+## Regular expression
+
+For more details, see {doc}`regexp`
+
+- {func}`regexp_count`
+- {func}`regexp_extract`
+- {func}`regexp_extract_all`
+- {func}`regexp_like`
+- {func}`regexp_position`
+- {func}`regexp_replace`
+- {func}`regexp_split`
+
+## Row pattern recognition expressions
+
+- {ref}`classifier <classifier-function>`
+- {ref}`first <logical-navigation-functions>`
+- {ref}`last <logical-navigation-functions>`
+- {ref}`match_number <match-number-function>`
+- {ref}`next <physical-navigation-functions>`
+- {ref}`permute <permute-function>`
+- {ref}`prev <physical-navigation-functions>`
+
+## Session
+
+For more details, see {doc}`session`
+
+- {data}`current_catalog`
+- {func}`current_groups`
+- {data}`current_schema`
+- {data}`current_user`
+
+## Set Digest
+
+For more details, see {doc}`setdigest`
+
+- {func}`make_set_digest`
+- {func}`merge_set_digest`
+- {ref}`cardinality() <setdigest-cardinality>`
+- {func}`intersection_cardinality`
+- {func}`jaccard_index`
+- {func}`hash_counts`
+
+## String
+
+For more details, see {doc}`string`
+
+- {func}`chr`
+- {func}`codepoint`
+- {func}`concat`
+- {func}`concat_ws`
+- {func}`format`
+- {func}`from_utf8`
+- {func}`hamming_distance`
+- {func}`length`
+- {func}`levenshtein_distance`
+- {func}`lower`
+- {func}`lpad`
+- {func}`ltrim`
+- {func}`luhn_check`
+- {func}`normalize`
+- {func}`position`
+- {func}`replace`
+- {func}`reverse`
+- {func}`rpad`
+- {func}`rtrim`
+- {func}`soundex`
+- {func}`split`
+- {func}`split_part`
+- {func}`split_to_map`
+- {func}`split_to_multimap`
+- {func}`starts_with`
+- {func}`strpos`
+- {func}`substr`
+- {func}`substring`
+- {func}`to_utf8`
+- {func}`translate`
+- {func}`trim`
+- {func}`upper`
+- {func}`word_stem`
+
+## System
+
+For more details, see {doc}`system`
+
+- {func}`version`
+
+## T-Digest
+
+For more details, see {doc}`tdigest`
+
+- `merge()`
+- {func}`tdigest_agg`
+- `value_at_quantile()`
+
+## Teradata
+
+For more details, see {doc}`teradata`
+
+- {func}`char2hexint`
+- {func}`index`
+- {func}`to_char`
+- {func}`to_timestamp`
+- {func}`to_date`
+
+## URL
+
+For more details, see {doc}`url`
+
+- {func}`url_decode`
+- {func}`url_encode`
+- {func}`url_extract_fragment`
+- {func}`url_extract_host`
+- {func}`url_extract_parameter`
+- {func}`url_extract_path`
+- {func}`url_extract_port`
+- {func}`url_extract_protocol`
+- {func}`url_extract_query`
+
+## UUID
+
+For more details, see {doc}`uuid`
+
+- {func}`uuid`
+
+## Window
+
+For more details, see {doc}`window`
+
+- {func}`cume_dist`
+- {func}`dense_rank`
+- {func}`first_value`
+- {func}`lag`
+- {func}`last_value`
+- {func}`lead`
+- {func}`nth_value`
+- {func}`ntile`
+- {func}`percent_rank`
+- {func}`rank`
+- {func}`row_number`
diff --git a/docs/src/main/sphinx/functions/list-by-topic.rst b/docs/src/main/sphinx/functions/list-by-topic.rst
deleted file mode 100644
index 0878e371ec3c..000000000000
--- a/docs/src/main/sphinx/functions/list-by-topic.rst
+++ /dev/null
@@ -1,574 +0,0 @@
-=========================================
-List of functions by topic
-=========================================
-
-Aggregate
----------
-
-For more details, see :doc:`aggregate`
-
-* :func:`approx_distinct`
-* :func:`approx_most_frequent`
-* :func:`approx_percentile`
-* ``approx_set()``
-* :func:`arbitrary`
-* :func:`array_agg`
-* :func:`avg`
-* :func:`bitwise_and_agg`
-* :func:`bitwise_or_agg`
-* :func:`bool_and`
-* :func:`bool_or`
-* :func:`checksum`
-* :func:`corr`
-* :func:`count`
-* :func:`count_if`
-* :func:`covar_pop`
-* :func:`covar_samp`
-* :func:`every`
-* :func:`geometric_mean`
-* :func:`histogram`
-* :func:`kurtosis`
-* :func:`map_agg`
-* :func:`map_union`
-* :func:`max`
-* :func:`max_by`
-* ``merge()``
-* :func:`min`
-* :func:`min_by`
-* :func:`multimap_agg`
-* :func:`numeric_histogram`
-* ``qdigest_agg()``
-* :func:`regr_intercept`
-* :func:`regr_slope`
-* :func:`skewness`
-* :func:`sum`
-* :func:`stddev`
-* :func:`stddev_pop`
-* :func:`stddev_samp`
-* ``tdigest_agg()``
-* :func:`variance`
-* :func:`var_pop`
-* :func:`var_samp`
-
-Array
------
-
-For more details, see :doc:`array`
-
-* :func:`all_match`
-* :func:`any_match`
-* :func:`array_distinct`
-* :func:`array_except`
-* :func:`array_intersect`
-* :func:`array_join`
-* :func:`array_max`
-* :func:`array_min`
-* :func:`array_position`
-* :func:`array_remove`
-* :func:`array_sort`
-* :func:`array_union`
-* :func:`arrays_overlap`
-* :func:`cardinality`
-* :func:`combinations`
-* ``concat()``
-* :func:`contains`
-* :func:`element_at`
-* :func:`filter`
-* :func:`flatten`
-* :func:`ngrams`
-* :func:`none_match`
-* :func:`reduce`
-* :func:`repeat`
-* ``reverse()``
-* :func:`sequence`
-* :func:`shuffle`
-* :func:`slice`
-* :func:`transform`
-* :func:`trim_array`
-* :func:`zip`
-* :func:`zip_with`
-
-Binary
-------
-
-For more details, see :doc:`binary`
-
-* ``concat()``
-* :func:`crc32`
-* :func:`from_base32`
-* :func:`from_base64`
-* :func:`from_base64url`
-* :func:`from_big_endian_32`
-* :func:`from_big_endian_64`
-* :func:`from_hex`
-* :func:`from_ieee754_32`
-* :func:`from_ieee754_64`
-* :func:`hmac_md5`
-* :func:`hmac_sha1`
-* :func:`hmac_sha256`
-* :func:`hmac_sha512`
-* ``length()``
-* ``lpad()``
-* :func:`md5`
-* :func:`murmur3`
-* ``reverse()``
-* ``rpad()``
-* :func:`sha1`
-* :func:`sha256`
-* :func:`sha512`
-* :func:`spooky_hash_v2_32`
-* :func:`spooky_hash_v2_64`
-* ``substr()``
-* :func:`to_base32`
-* :func:`to_base64`
-* :func:`to_base64url`
-* :func:`to_big_endian_32`
-* :func:`to_big_endian_64`
-* :func:`to_hex`
-* :func:`to_ieee754_32`
-* :func:`to_ieee754_64`
-* :func:`xxhash64`
-
-Bitwise
--------
-
-For more details, see :doc:`bitwise`
-
-* :func:`bit_count`
-* :func:`bitwise_and`
-* :func:`bitwise_left_shift`
-* :func:`bitwise_not`
-* :func:`bitwise_or`
-* :func:`bitwise_right_shift`
-* :func:`bitwise_right_shift_arithmetic`
-* :func:`bitwise_xor`
-
-Color
------
-
-For more details, see :doc:`color`
-
-* :func:`bar`
-* :func:`color`
-* :func:`render`
-* :func:`rgb`
-
-Comparison
-----------
-
-For more details, see :doc:`comparison`
-
-* :func:`greatest`
-* :func:`least`
-
-Conditional
------------
-
-For more details, see :doc:`conditional`
-
-* :ref:`coalesce <coalesce_function>`
-* :ref:`if <if_function>`
-* :ref:`nullif <nullif_function>`
-* :ref:`try <try_function>`
-
-Conversion
-----------
-
-For more details, see :doc:`conversion`
-
-* :func:`cast`
-* :func:`format`
-* :func:`try_cast`
-* :func:`typeof`
-
-Date and time
--------------
-
-For more details, see :doc:`datetime`
-
-* :ref:`AT TIME ZONE <at_time_zone_operator>`
-* :data:`current_date`
-* :data:`current_time`
-* :data:`current_timestamp`
-* :data:`localtime`
-* :data:`localtimestamp`
-* :func:`current_timezone`
-* :func:`date`
-* :func:`date_add`
-* :func:`date_diff`
-* :func:`date_format`
-* :func:`date_parse`
-* :func:`date_trunc`
-* :func:`format_datetime`
-* :func:`from_iso8601_date`
-* :func:`from_iso8601_timestamp`
-* :func:`from_unixtime`
-* :func:`from_unixtime_nanos`
-* :func:`human_readable_seconds`
-* :func:`last_day_of_month`
-* :func:`now`
-* :func:`parse_duration`
-* :func:`to_iso8601`
-* :func:`to_milliseconds`
-* :func:`to_unixtime`
-* :func:`with_timezone`
-
-Geospatial
-----------
-
-For more details, see :doc:`geospatial`
-
-* :func:`bing_tile`
-* :func:`bing_tile_at`
-* :func:`bing_tile_coordinates`
-* :func:`bing_tile_polygon`
-* :func:`bing_tile_quadkey`
-* :func:`bing_tile_zoom_level`
-* :func:`bing_tiles_around`
-* :func:`convex_hull_agg`
-* :func:`from_encoded_polyline`
-* :func:`from_geojson_geometry`
-* :func:`geometry_from_hadoop_shape`
-* :func:`geometry_invalid_reason`
-* :func:`geometry_nearest_points`
-* :func:`geometry_to_bing_tiles`
-* :func:`geometry_union`
-* :func:`geometry_union_agg`
-* :func:`great_circle_distance`
-* :func:`line_interpolate_point`
-* :func:`line_locate_point`
-* :func:`simplify_geometry`
-* :func:`ST_Area`
-* :func:`ST_AsBinary`
-* :func:`ST_AsText`
-* :func:`ST_Boundary`
-* :func:`ST_Buffer`
-* :func:`ST_Centroid`
-* :func:`ST_Contains`
-* :func:`ST_ConvexHull`
-* :func:`ST_CoordDim`
-* :func:`ST_Crosses`
-* :func:`ST_Difference`
-* :func:`ST_Dimension`
-* :func:`ST_Disjoint`
-* :func:`ST_Distance`
-* :func:`ST_EndPoint`
-* :func:`ST_Envelope`
-* :func:`ST_Equals`
-* :func:`ST_ExteriorRing`
-* :func:`ST_Geometries`
-* :func:`ST_GeometryFromText`
-* :func:`ST_GeometryN`
-* :func:`ST_GeometryType`
-* :func:`ST_GeomFromBinary`
-* :func:`ST_InteriorRings`
-* :func:`ST_InteriorRingN`
-* :func:`ST_Intersects`
-* :func:`ST_Intersection`
-* :func:`ST_IsClosed`
-* :func:`ST_IsEmpty`
-* :func:`ST_IsSimple`
-* :func:`ST_IsRing`
-* :func:`ST_IsValid`
-* :func:`ST_Length`
-* :func:`ST_LineFromText`
-* :func:`ST_LineString`
-* :func:`ST_MultiPoint`
-* :func:`ST_NumGeometries`
-* :func:`ST_NumInteriorRing`
-* :func:`ST_NumPoints`
-* :func:`ST_Overlaps`
-* :func:`ST_Point`
-* :func:`ST_PointN`
-* :func:`ST_Points`
-* :func:`ST_Polygon`
-* :func:`ST_Relate`
-* :func:`ST_StartPoint`
-* :func:`ST_SymDifference`
-* :func:`ST_Touches`
-* :func:`ST_Union`
-* :func:`ST_Within`
-* :func:`ST_X`
-* :func:`ST_XMax`
-* :func:`ST_XMin`
-* :func:`ST_Y`
-* :func:`ST_YMax`
-* :func:`ST_YMin`
-* :func:`to_encoded_polyline`
-* :func:`to_geojson_geometry`
-* :func:`to_geometry`
-* :func:`to_spherical_geography`
-
-HyperLogLog
------------
-
-For more details, see :doc:`hyperloglog`
-
-* :func:`approx_set`
-* ``cardinality()``
-* :func:`empty_approx_set`
-* :func:`merge`
-
-JSON
-----
-
-For more details, see :doc:`json`
-
-* :func:`is_json_scalar`
-* :ref:`json_array() <json_array>`
-* :func:`json_array_contains`
-* :func:`json_array_get`
-* :func:`json_array_length`
-* :ref:`json_exists() <json_exists>`
-* :func:`json_extract`
-* :func:`json_extract_scalar`
-* :func:`json_format`
-* :func:`json_parse`
-* :ref:`json_object() <json_object>`
-* :ref:`json_query() <json_query>`
-* :func:`json_size`
-* :ref:`json_value() <json_value>`
-
-Lambda
-------
-
-For more details, see :doc:`lambda`
-
-* :func:`any_match`
-* :func:`reduce_agg`
-* :func:`regexp_replace`
-* :func:`transform`
-
-Machine learning
-----------------
-
-For more details, see :doc:`ml`
-
-* :func:`classify`
-* :func:`features`
-* :func:`learn_classifier`
-* :func:`learn_libsvm_classifier`
-* :func:`learn_libsvm_regressor`
-* :func:`learn_regressor`
-* :func:`regress`
-
-Map
----
-
-For more details, see :doc:`map`
-
-* :func:`cardinality`
-* :func:`element_at`
-* :func:`map`
-* :func:`map_concat`
-* :func:`map_entries`
-* :func:`map_filter`
-* :func:`map_from_entries`
-* :func:`map_keys`
-* :func:`map_values`
-* :func:`map_zip_with`
-* :func:`multimap_from_entries`
-* :func:`transform_keys`
-* :func:`transform_values`
-
-Math
-----
-
-For more details, see :doc:`math`
-
-* :func:`abs`
-* :func:`acos`
-* :func:`asin`
-* :func:`atan`
-* :func:`beta_cdf`
-* :func:`cbrt`
-* :func:`ceil`
-* :func:`cos`
-* :func:`cosh`
-* :func:`cosine_similarity`
-* :func:`degrees`
-* :func:`e`
-* :func:`exp`
-* :func:`floor`
-* :func:`from_base`
-* :func:`infinity`
-* :func:`inverse_beta_cdf`
-* :func:`inverse_normal_cdf`
-* :func:`is_finite`
-* :func:`is_nan`
-* :func:`ln`
-* :func:`log`
-* :func:`log2`
-* :func:`log10`
-* :func:`mod`
-* :func:`nan`
-* :func:`normal_cdf`
-* :func:`pi`
-* :func:`pow`
-* :func:`power`
-* :func:`radians`
-* :func:`rand`
-* :func:`random`
-* :func:`round`
-* :func:`sign`
-* :func:`sin`
-* :func:`sinh`
-* :func:`sqrt`
-* :func:`tan`
-* :func:`tanh`
-* :func:`to_base`
-* :func:`truncate`
-* :func:`width_bucket`
-* :func:`wilson_interval_lower`
-* :func:`wilson_interval_upper`
-
-Quantile digest
----------------
-
-For more details, see :doc:`qdigest`
-
-* ``merge()``
-* :func:`qdigest_agg`
-* :func:`value_at_quantile`
-* :func:`values_at_quantiles`
-
-Regular expression
-------------------
-
-For more details, see :doc:`regexp`
-
-* :func:`regexp_count`
-* :func:`regexp_extract`
-* :func:`regexp_extract_all`
-* :func:`regexp_like`
-* :func:`regexp_position`
-* :func:`regexp_replace`
-* :func:`regexp_split`
-
-Session
--------
-
-For more details, see :doc:`session`
-
-* :data:`current_catalog`
-* :func:`current_groups`
-* :data:`current_schema`
-* :data:`current_user`
-
-Set Digest
-----------
-
-For more details, see :doc:`setdigest`
-
-* :func:`make_set_digest`
-* :func:`merge_set_digest`
-* :ref:`cardinality() <setdigest-cardinality>`
-* :func:`intersection_cardinality`
-* :func:`jaccard_index`
-* :func:`hash_counts`
-
-
-String
-------
-
-For more details, see :doc:`string`
-
-* :func:`chr`
-* :func:`codepoint`
-* :func:`concat`
-* :func:`concat_ws`
-* :func:`format`
-* :func:`from_utf8`
-* :func:`hamming_distance`
-* :func:`length`
-* :func:`levenshtein_distance`
-* :func:`lower`
-* :func:`lpad`
-* :func:`ltrim`
-* :func:`luhn_check`
-* :func:`normalize`
-* :func:`position`
-* :func:`replace`
-* :func:`reverse`
-* :func:`rpad`
-* :func:`rtrim`
-* :func:`soundex`
-* :func:`split`
-* :func:`split_part`
-* :func:`split_to_map`
-* :func:`split_to_multimap`
-* :func:`starts_with`
-* :func:`strpos`
-* :func:`substr`
-* :func:`substring`
-* :func:`to_utf8`
-* :func:`translate`
-* :func:`trim`
-* :func:`upper`
-* :func:`word_stem`
-
-System
-------
-
-For more details, see :doc:`system`
-
-* :func:`version`
-
-T-Digest
---------
-
-For more details, see :doc:`tdigest`
-
-* ``merge()``
-* :func:`tdigest_agg`
-* ``value_at_quantile()``
-
-Teradata
---------
-
-For more details, see :doc:`teradata`
-
-* :func:`char2hexint`
-* :func:`index`
-* :func:`to_char`
-* :func:`to_timestamp`
-* :func:`to_date`
-
-URL
----
-
-For more details, see :doc:`url`
-
-* :func:`url_decode`
-* :func:`url_encode`
-* :func:`url_extract_fragment`
-* :func:`url_extract_host`
-* :func:`url_extract_parameter`
-* :func:`url_extract_path`
-* :func:`url_extract_port`
-* :func:`url_extract_protocol`
-* :func:`url_extract_query`
-
-UUID
-----
-
-For more details, see :doc:`uuid`
-
-* :func:`uuid`
-
-Window
-------
-
-For more details, see :doc:`window`
-
-* :func:`cume_dist`
-* :func:`dense_rank`
-* :func:`first_value`
-* :func:`lag`
-* :func:`last_value`
-* :func:`lead`
-* :func:`nth_value`
-* :func:`ntile`
-* :func:`percent_rank`
-* :func:`rank`
-* :func:`row_number`
diff --git a/docs/src/main/sphinx/functions/list.md b/docs/src/main/sphinx/functions/list.md
new file mode 100644
index 000000000000..e69699448ed7
--- /dev/null
+++ b/docs/src/main/sphinx/functions/list.md
@@ -0,0 +1,542 @@
+# List of functions and operators
+
+## \#
+
+- [\[\] substring operator](subscript-operator)
+- [|| concatenation operator](concatenation-operator)
+- [< comparison operator](comparison-operators)
+- [> comparison operator](comparison-operators)
+- [<= comparison operator](comparison-operators)
+- [>= comparison operator](comparison-operators)
+- [= comparison operator](comparison-operators)
+- [<> comparison operator](comparison-operators)
+- [!= comparison operator](comparison-operators)
+- [-> lambda expression](lambda-expressions)
+- [+ mathematical operator](mathematical-operators)
+- [- mathematical operator](mathematical-operators)
+- [* mathematical operator](mathematical-operators)
+- [/ mathematical operator](mathematical-operators)
+- [% mathematical operator](mathematical-operators)
+
+## A
+
+- {func}`abs`
+- {func}`acos`
+- [ALL](quantified-comparison-predicates)
+- {func}`all_match`
+- [AND](logical-operators)
+- [ANY](quantified-comparison-predicates)
+- {func}`any_match`
+- {func}`any_value`
+- {func}`approx_distinct`
+- {func}`approx_most_frequent`
+- {func}`approx_percentile`
+- {func}`approx_set`
+- {func}`arbitrary`
+- {func}`array_agg`
+- {func}`array_distinct`
+- {func}`array_except`
+- {func}`array_intersect`
+- {func}`array_join`
+- {func}`array_max`
+- {func}`array_min`
+- {func}`array_position`
+- {func}`array_remove`
+- {func}`array_sort`
+- {func}`array_union`
+- {func}`arrays_overlap`
+- {func}`asin`
+- [AT TIME ZONE](at-time-zone-operator)
+- {func}`at_timezone`
+- {func}`atan`
+- {func}`atan2`
+- {func}`avg`
+
+## B
+
+- {func}`bar`
+- {func}`beta_cdf`
+- [BETWEEN](range-operator)
+- {func}`bing_tile`
+- {func}`bing_tile_at`
+- {func}`bing_tile_coordinates`
+- {func}`bing_tile_polygon`
+- {func}`bing_tile_quadkey`
+- {func}`bing_tile_zoom_level`
+- {func}`bing_tiles_around`
+- {func}`bit_count`
+- {func}`bitwise_and`
+- {func}`bitwise_and_agg`
+- {func}`bitwise_left_shift`
+- {func}`bitwise_not`
+- {func}`bitwise_or`
+- {func}`bitwise_or_agg`
+- {func}`bitwise_right_shift`
+- {func}`bitwise_right_shift_arithmetic`
+- {func}`bitwise_xor`
+- {func}`bool_and`
+- {func}`bool_or`
+
+## C
+
+- {func}`cardinality`
+- [CASE](case-expression)
+- {func}`cast`
+- {func}`cbrt`
+- {func}`ceil`
+- {func}`ceiling`
+- {func}`char2hexint`
+- {func}`checksum`
+- {func}`chr`
+- {func}`classify`
+- [classifier](classifier-function)
+- [coalesce](coalesce-function)
+- {func}`codepoint`
+- {func}`color`
+- {func}`combinations`
+- {func}`concat`
+- {func}`concat_ws`
+- {func}`contains`
+- {func}`contains_sequence`
+- {func}`convex_hull_agg`
+- {func}`corr`
+- {func}`cos`
+- {func}`cosh`
+- {func}`cosine_similarity`
+- {func}`count`
+- {func}`count_if`
+- {func}`covar_pop`
+- {func}`covar_samp`
+- {func}`crc32`
+- {func}`cume_dist`
+- {data}`current_date`
+- {func}`current_groups`
+- {data}`current_time`
+- {data}`current_timestamp`
+- {func}`current_timezone`
+- {data}`current_user`
+
+## D
+
+- {func}`date`
+- {func}`date_add`
+- {func}`date_diff`
+- {func}`date_format`
+- {func}`date_parse`
+- {func}`date_trunc`
+- {func}`day`
+- {func}`day_of_month`
+- {func}`day_of_week`
+- {func}`day_of_year`
+- [DECIMAL](decimal-literal)
+- {func}`degrees`
+- {func}`dense_rank`
+- {func}`dow`
+- {func}`doy`
+
+## E
+
+- {func}`e`
+- {func}`element_at`
+- {func}`empty_approx_set`
+- `evaluate_classifier_predictions`
+- {func}`every`
+- {func}`exclude_columns`
+- {func}`extract`
+- {func}`exp`
+
+## F
+
+- {func}`features`
+- {func}`filter`
+- [first](logical-navigation-functions)
+- {func}`first_value`
+- {func}`flatten`
+- {func}`floor`
+- {func}`format`
+- {func}`format_datetime`
+- {func}`format_number`
+- {func}`from_base`
+- {func}`from_base32`
+- {func}`from_base64`
+- {func}`from_base64url`
+- {func}`from_big_endian_32`
+- {func}`from_big_endian_64`
+- {func}`from_encoded_polyline`
+- `from_geojson_geometry`
+- {func}`from_hex`
+- {func}`from_ieee754_32`
+- {func}`from_ieee754_64`
+- {func}`from_iso8601_date`
+- {func}`from_iso8601_timestamp`
+- {func}`from_iso8601_timestamp_nanos`
+- {func}`from_unixtime`
+- {func}`from_unixtime_nanos`
+- {func}`from_utf8`
+
+## G
+
+- {func}`geometric_mean`
+- {func}`geometry_from_hadoop_shape`
+- {func}`geometry_invalid_reason`
+- {func}`geometry_nearest_points`
+- {func}`geometry_to_bing_tiles`
+- {func}`geometry_union`
+- {func}`geometry_union_agg`
+- {func}`great_circle_distance`
+- {func}`greatest`
+
+## H
+
+- {func}`hamming_distance`
+- {func}`hash_counts`
+- {func}`histogram`
+- {func}`hmac_md5`
+- {func}`hmac_sha1`
+- {func}`hmac_sha256`
+- {func}`hmac_sha512`
+- {func}`hour`
+- {func}`human_readable_seconds`
+
+## I
+
+- [if](if-function)
+- {func}`index`
+- {func}`infinity`
+- {func}`intersection_cardinality`
+- {func}`inverse_beta_cdf`
+- {func}`inverse_normal_cdf`
+- {func}`is_finite`
+- {func}`is_infinite`
+- {func}`is_json_scalar`
+- {func}`is_nan`
+- [IS NOT DISTINCT](is-distinct-operator)
+- [IS NOT NULL](is-null-operator)
+- [IS DISTINCT](is-distinct-operator)
+- [IS NULL](is-null-operator)
+
+## J
+
+- {func}`jaccard_index`
+- [json_array()](json-array)
+- {func}`json_array_contains`
+- {func}`json_array_get`
+- {func}`json_array_length`
+- [json_exists()](json-exists)
+- {func}`json_extract`
+- {func}`json_extract_scalar`
+- {func}`json_format`
+- [json_object()](json-object)
+- {func}`json_parse`
+- [json_query()](json-query)
+- {func}`json_size`
+- [json_value()](json-value)
+
+## K
+
+- {func}`kurtosis`
+
+## L
+
+- {func}`lag`
+- [last](logical-navigation-functions)
+- {func}`last_day_of_month`
+- {func}`last_value`
+- {func}`lead`
+- {func}`learn_classifier`
+- {func}`learn_libsvm_classifier`
+- {func}`learn_libsvm_regressor`
+- {func}`learn_regressor`
+- {func}`least`
+- {func}`length`
+- {func}`levenshtein_distance`
+- {func}`line_interpolate_point`
+- {func}`line_interpolate_points`
+- {func}`line_locate_point`
+- {func}`listagg`
+- {func}`ln`
+- {data}`localtime`
+- {data}`localtimestamp`
+- {func}`log`
+- {func}`log10`
+- {func}`log2`
+- {func}`lower`
+- {func}`lpad`
+- {func}`ltrim`
+- {func}`luhn_check`
+
+## M
+
+- {func}`make_set_digest`
+- {func}`map`
+- {func}`map_agg`
+- {func}`map_concat`
+- {func}`map_entries`
+- {func}`map_filter`
+- {func}`map_from_entries`
+- {func}`map_keys`
+- {func}`map_union`
+- {func}`map_values`
+- {func}`map_zip_with`
+- [match_number](match-number-function)
+- {func}`max`
+- {func}`max_by`
+- {func}`md5`
+- {func}`merge`
+- {func}`merge_set_digest`
+- {func}`millisecond`
+- {func}`min`
+- {func}`min_by`
+- {func}`minute`
+- {func}`mod`
+- {func}`month`
+- {func}`multimap_agg`
+- {func}`multimap_from_entries`
+- {func}`murmur3`
+
+## N
+
+- {func}`nan`
+- [next](physical-navigation-functions)
+- {func}`ngrams`
+- {func}`none_match`
+- {func}`normal_cdf`
+- {func}`normalize`
+- [NOT](logical-operators)
+- [NOT BETWEEN](range-operator)
+- {func}`now`
+- {func}`nth_value`
+- {func}`ntile`
+- [nullif](nullif-function)
+- {func}`numeric_histogram`
+
+## O
+
+- `objectid`
+- {func}`objectid_timestamp`
+- [OR](logical-operators)
+
+## P
+
+- {func}`parse_datetime`
+- {func}`parse_duration`
+- {func}`parse_data_size`
+- {func}`percent_rank`
+- [permute](permute-function)
+- {func}`pi`
+- {func}`position`
+- {func}`pow`
+- {func}`power`
+- [prev](physical-navigation-functions)
+
+## Q
+
+- {func}`qdigest_agg`
+- {func}`quarter`
+
+## R
+
+- {func}`radians`
+- {func}`rand`
+- {func}`random`
+- {func}`rank`
+- {func}`reduce`
+- {func}`reduce_agg`
+- {func}`regexp_count`
+- {func}`regexp_extract`
+- {func}`regexp_extract_all`
+- {func}`regexp_like`
+- {func}`regexp_position`
+- {func}`regexp_replace`
+- {func}`regexp_split`
+- {func}`regress`
+- {func}`regr_intercept`
+- {func}`regr_slope`
+- {func}`render`
+- {func}`repeat`
+- {func}`replace`
+- {func}`reverse`
+- {func}`rgb`
+- {func}`round`
+- {func}`row_number`
+- {func}`rpad`
+- {func}`rtrim`
+
+## S
+
+- {func}`second`
+- {func}`sequence` (scalar function)
+- [sequence()](sequence-table-function) (table function)
+- {func}`sha1`
+- {func}`sha256`
+- {func}`sha512`
+- {func}`shuffle`
+- {func}`sign`
+- {func}`simplify_geometry`
+- {func}`sin`
+- {func}`sinh`
+- {func}`skewness`
+- {func}`slice`
+- [SOME](quantified-comparison-predicates)
+- {func}`soundex`
+- `spatial_partitioning`
+- `spatial_partitions`
+- {func}`split`
+- {func}`split_part`
+- {func}`split_to_map`
+- {func}`split_to_multimap`
+- {func}`spooky_hash_v2_32`
+- {func}`spooky_hash_v2_64`
+- {func}`sqrt`
+- {func}`ST_Area`
+- {func}`ST_AsBinary`
+- {func}`ST_AsText`
+- {func}`ST_Boundary`
+- {func}`ST_Buffer`
+- {func}`ST_Centroid`
+- {func}`ST_Contains`
+- {func}`ST_ConvexHull`
+- {func}`ST_CoordDim`
+- {func}`ST_Crosses`
+- {func}`ST_Difference`
+- {func}`ST_Dimension`
+- {func}`ST_Disjoint`
+- {func}`ST_Distance`
+- {func}`ST_EndPoint`
+- {func}`ST_Envelope`
+- {func}`ST_EnvelopeAsPts`
+- {func}`ST_Equals`
+- {func}`ST_ExteriorRing`
+- {func}`ST_Geometries`
+- {func}`ST_GeometryFromText`
+- {func}`ST_GeometryN`
+- {func}`ST_GeometryType`
+- {func}`ST_GeomFromBinary`
+- {func}`ST_InteriorRingN`
+- {func}`ST_InteriorRings`
+- {func}`ST_Intersection`
+- {func}`ST_Intersects`
+- {func}`ST_IsClosed`
+- {func}`ST_IsEmpty`
+- {func}`ST_IsRing`
+- {func}`ST_IsSimple`
+- {func}`ST_IsValid`
+- {func}`ST_Length`
+- {func}`ST_LineFromText`
+- {func}`ST_LineString`
+- {func}`ST_MultiPoint`
+- {func}`ST_NumGeometries`
+- `ST_NumInteriorRing`
+- {func}`ST_NumPoints`
+- {func}`ST_Overlaps`
+- {func}`ST_Point`
+- {func}`ST_PointN`
+- {func}`ST_Points`
+- {func}`ST_Polygon`
+- {func}`ST_Relate`
+- {func}`ST_StartPoint`
+- {func}`ST_SymDifference`
+- {func}`ST_Touches`
+- {func}`ST_Union`
+- {func}`ST_Within`
+- {func}`ST_X`
+- {func}`ST_XMax`
+- {func}`ST_XMin`
+- {func}`ST_Y`
+- {func}`ST_YMax`
+- {func}`ST_YMin`
+- {func}`starts_with`
+- {func}`stddev`
+- {func}`stddev_pop`
+- {func}`stddev_samp`
+- {func}`strpos`
+- {func}`substr`
+- {func}`substring`
+- {func}`sum`
+
+## T
+
+- {func}`tan`
+- {func}`tanh`
+- {func}`tdigest_agg`
+- {func}`timestamp_objectid`
+- {func}`timezone_hour`
+- {func}`timezone_minute`
+- {func}`to_base`
+- {func}`to_base32`
+- {func}`to_base64`
+- {func}`to_base64url`
+- {func}`to_big_endian_32`
+- {func}`to_big_endian_64`
+- {func}`to_char`
+- {func}`to_date`
+- {func}`to_encoded_polyline`
+- `to_geojson_geometry`
+- {func}`to_geometry`
+- {func}`to_hex`
+- {func}`to_ieee754_32`
+- {func}`to_ieee754_64`
+- {func}`to_iso8601`
+- {func}`to_milliseconds`
+- {func}`to_spherical_geography`
+- {func}`to_timestamp`
+- {func}`to_unixtime`
+- {func}`to_utf8`
+- {func}`transform`
+- {func}`transform_keys`
+- {func}`transform_values`
+- {func}`translate`
+- {func}`trim`
+- {func}`trim_array`
+- {func}`truncate`
+- [try](try-function)
+- {func}`try_cast`
+- {func}`typeof`
+
+## U
+
+- {func}`upper`
+- {func}`url_decode`
+- {func}`url_encode`
+- {func}`url_extract_fragment`
+- {func}`url_extract_host`
+- {func}`url_extract_parameter`
+- {func}`url_extract_path`
+- {func}`url_extract_protocol`
+- {func}`url_extract_port`
+- {func}`url_extract_query`
+- {func}`uuid`
+
+## V
+
+- {func}`value_at_quantile`
+- {func}`values_at_quantiles`
+- {func}`var_pop`
+- {func}`var_samp`
+- {func}`variance`
+- {func}`version`
+
+## W
+
+- {func}`week`
+- {func}`week_of_year`
+- {func}`width_bucket`
+- {func}`wilson_interval_lower`
+- {func}`wilson_interval_upper`
+- {func}`with_timezone`
+- {func}`word_stem`
+
+## X
+
+- {func}`xxhash64`
+
+## Y
+
+- {func}`year`
+- {func}`year_of_week`
+- {func}`yow`
+
+## Z
+
+- {func}`zip`
+- {func}`zip_with`
diff --git a/docs/src/main/sphinx/functions/list.rst b/docs/src/main/sphinx/functions/list.rst
deleted file mode 100644
index 9217e852246e..000000000000
--- a/docs/src/main/sphinx/functions/list.rst
+++ /dev/null
@@ -1,561 +0,0 @@
-===============================
-List of functions and operators
-===============================
-
-#
--
-
-- :ref:`[] substring operator <subscript_operator>`
-- :ref:`|| concatenation operator <concatenation_operator>`
-- :ref:`\< comparison operator <comparison_operators>`
-- :ref:`\> comparison operator <comparison_operators>`
-- :ref:`<= comparison operator <comparison_operators>`
-- :ref:`>= comparison operator <comparison_operators>`
-- :ref:`= comparison operator <comparison_operators>`
-- :ref:`<> comparison operator <comparison_operators>`
-- :ref:`\!= comparison operator <comparison_operators>`
-- :ref:`-> lambda expression <lambda_expressions>`
-- :ref:`+ mathematical operator <mathematical_operators>`
-- :ref:`- mathematical operator <mathematical_operators>`
-- :ref:`* mathematical operator <mathematical_operators>`
-- :ref:`/ mathematical operator <mathematical_operators>`
-- :ref:`% mathematical operator <mathematical_operators>`
-
-A
--
-
-- :func:`abs`
-- :func:`acos`
-- :ref:`ALL <quantified_comparison_predicates>`
-- :func:`all_match`
-- :ref:`AND <logical_operators>`
-- :ref:`ANY <quantified_comparison_predicates>`
-- :func:`any_match`
-- :func:`approx_distinct`
-- :func:`approx_most_frequent`
-- :func:`approx_percentile`
-- :func:`approx_set`
-- :func:`arbitrary`
-- :func:`array_agg`
-- :func:`array_distinct`
-- :func:`array_except`
-- :func:`array_intersect`
-- :func:`array_join`
-- :func:`array_max`
-- :func:`array_min`
-- :func:`array_position`
-- :func:`array_remove`
-- :func:`array_sort`
-- :func:`array_union`
-- :func:`arrays_overlap`
-- :func:`asin`
-- :ref:`AT TIME ZONE <at_time_zone_operator>`
-- :func:`at_timezone`
-- :func:`atan`
-- :func:`atan2`
-- :func:`avg`
-
-B
--
-
-- :func:`bar`
-- :func:`beta_cdf`
-- :ref:`BETWEEN <range_operator>`
-- :func:`bing_tile`
-- :func:`bing_tile_at`
-- :func:`bing_tile_coordinates`
-- :func:`bing_tile_polygon`
-- :func:`bing_tile_quadkey`
-- :func:`bing_tile_zoom_level`
-- :func:`bing_tiles_around`
-- :func:`bit_count`
-- :func:`bitwise_and`
-- :func:`bitwise_and_agg`
-- :func:`bitwise_left_shift`
-- :func:`bitwise_not`
-- :func:`bitwise_or`
-- :func:`bitwise_or_agg`
-- :func:`bitwise_right_shift`
-- :func:`bitwise_right_shift_arithmetic`
-- :func:`bitwise_xor`
-- :func:`bool_and`
-- :func:`bool_or`
-
-C
--
-
-- :func:`cardinality`
-- :ref:`CASE <case_expression>`
-- :func:`cast`
-- :func:`cbrt`
-- :func:`ceil`
-- :func:`ceiling`
-- :func:`char2hexint`
-- :func:`checksum`
-- :func:`chr`
-- :func:`classify`
-- :ref:`coalesce <coalesce_function>`
-- :func:`codepoint`
-- :func:`color`
-- :func:`combinations`
-- :func:`concat`
-- :func:`concat_ws`
-- :func:`contains`
-- :func:`contains_sequence`
-- :func:`convex_hull_agg`
-- :func:`corr`
-- :func:`cos`
-- :func:`cosh`
-- :func:`cosine_similarity`
-- :func:`count`
-- :func:`count_if`
-- :func:`covar_pop`
-- :func:`covar_samp`
-- :func:`crc32`
-- :func:`cume_dist`
-- :data:`current_date`
-- :func:`current_groups`
-- :data:`current_time`
-- :data:`current_timestamp`
-- :func:`current_timezone`
-- :data:`current_user`
-
-D
--
-
-- :func:`date`
-- :func:`date_add`
-- :func:`date_diff`
-- :func:`date_format`
-- :func:`date_parse`
-- :func:`date_trunc`
-- :func:`day`
-- :func:`day_of_month`
-- :func:`day_of_week`
-- :func:`day_of_year`
-- :ref:`DECIMAL <decimal_literal>`
-- :func:`degrees`
-- :func:`dense_rank`
-- :func:`dow`
-- :func:`doy`
-
-E
--
-
-- :func:`e`
-- :func:`element_at`
-- :func:`empty_approx_set`
-- ``evaluate_classifier_predictions``
-- :func:`every`
-- :func:`extract`
-- :func:`exp`
-
-F
--
-
-- :func:`features`
-- :func:`filter`
-- :func:`first_value`
-- :func:`flatten`
-- :func:`floor`
-- :func:`format`
-- :func:`format_datetime`
-- :func:`format_number`
-- :func:`from_base`
-- :func:`from_base32`
-- :func:`from_base64`
-- :func:`from_base64url`
-- :func:`from_big_endian_32`
-- :func:`from_big_endian_64`
-- :func:`from_encoded_polyline`
-- ``from_geojson_geometry``
-- :func:`from_hex`
-- :func:`from_ieee754_32`
-- :func:`from_ieee754_64`
-- :func:`from_iso8601_date`
-- :func:`from_iso8601_timestamp`
-- :func:`from_iso8601_timestamp_nanos`
-- :func:`from_unixtime`
-- :func:`from_unixtime_nanos`
-- :func:`from_utf8`
-
-G
--
-
-- :func:`geometric_mean`
-- :func:`geometry_from_hadoop_shape`
-- :func:`geometry_invalid_reason`
-- :func:`geometry_nearest_points`
-- :func:`geometry_to_bing_tiles`
-- :func:`geometry_union`
-- :func:`geometry_union_agg`
-- :func:`great_circle_distance`
-- :func:`greatest`
-
-H
--
-
-- :func:`hamming_distance`
-- :func:`hash_counts`
-- :func:`histogram`
-- :func:`hmac_md5`
-- :func:`hmac_sha1`
-- :func:`hmac_sha256`
-- :func:`hmac_sha512`
-- :func:`hour`
-- :func:`human_readable_seconds`
-
-I
--
-
-- :ref:`if <if_function>`
-- :func:`index`
-- :func:`infinity`
-- :func:`intersection_cardinality`
-- :func:`inverse_beta_cdf`
-- :func:`inverse_normal_cdf`
-- :func:`is_finite`
-- :func:`is_infinite`
-- :func:`is_json_scalar`
-- :func:`is_nan`
-- :ref:`IS NOT DISTINCT <is_distinct_operator>`
-- :ref:`IS NOT NULL <is_null_operator>`
-- :ref:`IS DISTINCT <is_distinct_operator>`
-- :ref:`IS NULL <is_null_operator>`
-
-J
--
-
-- :func:`jaccard_index`
-- :ref:`json_array() <json_array>`
-- :func:`json_array_contains`
-- :func:`json_array_get`
-- :func:`json_array_length`
-- :ref:`json_exists() <json_exists>`
-- :func:`json_extract`
-- :func:`json_extract_scalar`
-- :func:`json_format`
-- :ref:`json_object() <json_object>`
-- :func:`json_parse`
-- :ref:`json_query() <json_query>`
-- :func:`json_size`
-- :ref:`json_value() <json_value>`
-
-K
--
-
-- :func:`kurtosis`
-
-L
--
-
-- :func:`lag`
-- :func:`last_day_of_month`
-- :func:`last_value`
-- :func:`lead`
-- :func:`learn_classifier`
-- :func:`learn_libsvm_classifier`
-- :func:`learn_libsvm_regressor`
-- :func:`learn_regressor`
-- :func:`least`
-- :func:`length`
-- :func:`levenshtein_distance`
-- :func:`line_interpolate_point`
-- :func:`line_interpolate_points`
-- :func:`line_locate_point`
-- :func:`listagg`
-- :func:`ln`
-- :data:`localtime`
-- :data:`localtimestamp`
-- :func:`log`
-- :func:`log10`
-- :func:`log2`
-- :func:`lower`
-- :func:`lpad`
-- :func:`ltrim`
-- :func:`luhn_check`
-
-M
--
-
-- :func:`make_set_digest`
-- :func:`map`
-- :func:`map_agg`
-- :func:`map_concat`
-- :func:`map_entries`
-- :func:`map_filter`
-- :func:`map_from_entries`
-- :func:`map_keys`
-- :func:`map_union`
-- :func:`map_values`
-- :func:`map_zip_with`
-- :func:`max`
-- :func:`max_by`
-- :func:`md5`
-- :func:`merge`
-- :func:`merge_set_digest`
-- :func:`millisecond`
-- :func:`min`
-- :func:`min_by`
-- :func:`minute`
-- :func:`mod`
-- :func:`month`
-- :func:`multimap_agg`
-- :func:`multimap_from_entries`
-- :func:`murmur3`
-
-N
--
-
-- :func:`nan`
-- :func:`ngrams`
-- :func:`none_match`
-- :func:`normal_cdf`
-- :func:`normalize`
-- :ref:`NOT <logical_operators>`
-- :ref:`NOT BETWEEN <range_operator>`
-- :func:`now`
-- :func:`nth_value`
-- :func:`ntile`
-- :ref:`nullif <nullif_function>`
-- :func:`numeric_histogram`
-
-O
--
-
-- ``objectid``
-- :func:`objectid_timestamp`
-- :ref:`OR <logical_operators>`
-
-P
--
-
-- :func:`parse_datetime`
-- :func:`parse_duration`
-- :func:`parse_data_size`
-- :func:`percent_rank`
-- :func:`pi`
-- :func:`position`
-- :func:`pow`
-- :func:`power`
-
-Q
--
-
-- :func:`qdigest_agg`
-- :func:`quarter`
-
-R
--
-
-- :func:`radians`
-- :func:`rand`
-- :func:`random`
-- :func:`rank`
-- :func:`reduce`
-- :func:`reduce_agg`
-- :func:`regexp_count`
-- :func:`regexp_extract`
-- :func:`regexp_extract_all`
-- :func:`regexp_like`
-- :func:`regexp_position`
-- :func:`regexp_replace`
-- :func:`regexp_split`
-- :func:`regress`
-- :func:`regr_intercept`
-- :func:`regr_slope`
-- :func:`render`
-- :func:`repeat`
-- :func:`replace`
-- :func:`reverse`
-- :func:`rgb`
-- :func:`round`
-- :func:`row_number`
-- :func:`rpad`
-- :func:`rtrim`
-
-S
--
-
-- :func:`second`
-- :func:`sequence`
-- :func:`sha1`
-- :func:`sha256`
-- :func:`sha512`
-- :func:`shuffle`
-- :func:`sign`
-- :func:`simplify_geometry`
-- :func:`sin`
-- :func:`sinh`
-- :func:`skewness`
-- :func:`slice`
-- :ref:`SOME <quantified_comparison_predicates>`
-- :func:`soundex`
-- ``spatial_partitioning``
-- ``spatial_partitions``
-- :func:`split`
-- :func:`split_part`
-- :func:`split_to_map`
-- :func:`split_to_multimap`
-- :func:`spooky_hash_v2_32`
-- :func:`spooky_hash_v2_64`
-- :func:`sqrt`
-- :func:`ST_Area`
-- :func:`ST_AsBinary`
-- :func:`ST_AsText`
-- :func:`ST_Boundary`
-- :func:`ST_Buffer`
-- :func:`ST_Centroid`
-- :func:`ST_Contains`
-- :func:`ST_ConvexHull`
-- :func:`ST_CoordDim`
-- :func:`ST_Crosses`
-- :func:`ST_Difference`
-- :func:`ST_Dimension`
-- :func:`ST_Disjoint`
-- :func:`ST_Distance`
-- :func:`ST_EndPoint`
-- :func:`ST_Envelope`
-- :func:`ST_EnvelopeAsPts`
-- :func:`ST_Equals`
-- :func:`ST_ExteriorRing`
-- :func:`ST_Geometries`
-- :func:`ST_GeometryFromText`
-- :func:`ST_GeometryN`
-- :func:`ST_GeometryType`
-- :func:`ST_GeomFromBinary`
-- :func:`ST_InteriorRingN`
-- :func:`ST_InteriorRings`
-- :func:`ST_Intersection`
-- :func:`ST_Intersects`
-- :func:`ST_IsClosed`
-- :func:`ST_IsEmpty`
-- :func:`ST_IsRing`
-- :func:`ST_IsSimple`
-- :func:`ST_IsValid`
-- :func:`ST_Length`
-- :func:`ST_LineFromText`
-- :func:`ST_LineString`
-- :func:`ST_MultiPoint`
-- :func:`ST_NumGeometries`
-- ``ST_NumInteriorRing``
-- :func:`ST_NumPoints`
-- :func:`ST_Overlaps`
-- :func:`ST_Point`
-- :func:`ST_PointN`
-- :func:`ST_Points`
-- :func:`ST_Polygon`
-- :func:`ST_Relate`
-- :func:`ST_StartPoint`
-- :func:`ST_SymDifference`
-- :func:`ST_Touches`
-- :func:`ST_Union`
-- :func:`ST_Within`
-- :func:`ST_X`
-- :func:`ST_XMax`
-- :func:`ST_XMin`
-- :func:`ST_Y`
-- :func:`ST_YMax`
-- :func:`ST_YMin`
-- :func:`starts_with`
-- :func:`stddev`
-- :func:`stddev_pop`
-- :func:`stddev_samp`
-- :func:`strpos`
-- :func:`substr`
-- :func:`substring`
-- :func:`sum`
-
-T
--
-
-- :func:`tan`
-- :func:`tanh`
-- :func:`tdigest_agg`
-- :func:`timestamp_objectid`
-- :func:`timezone_hour`
-- :func:`timezone_minute`
-- :func:`to_base`
-- :func:`to_base32`
-- :func:`to_base64`
-- :func:`to_base64url`
-- :func:`to_big_endian_32`
-- :func:`to_big_endian_64`
-- :func:`to_char`
-- :func:`to_date`
-- :func:`to_encoded_polyline`
-- ``to_geojson_geometry``
-- :func:`to_geometry`
-- :func:`to_hex`
-- :func:`to_ieee754_32`
-- :func:`to_ieee754_64`
-- :func:`to_iso8601`
-- :func:`to_milliseconds`
-- :func:`to_spherical_geography`
-- :func:`to_timestamp`
-- :func:`to_unixtime`
-- :func:`to_utf8`
-- :func:`transform`
-- :func:`transform_keys`
-- :func:`transform_values`
-- :func:`translate`
-- :func:`trim`
-- :func:`trim_array`
-- :func:`truncate`
-- :ref:`try <try_function>`
-- :func:`try_cast`
-- :func:`typeof`
-
-U
--
-
-- :func:`upper`
-- :func:`url_decode`
-- :func:`url_encode`
-- :func:`url_extract_fragment`
-- :func:`url_extract_host`
-- :func:`url_extract_parameter`
-- :func:`url_extract_path`
-- :func:`url_extract_protocol`
-- :func:`url_extract_port`
-- :func:`url_extract_query`
-- :func:`uuid`
-
-V
--
-
-- :func:`value_at_quantile`
-- :func:`values_at_quantiles`
-- :func:`var_pop`
-- :func:`var_samp`
-- :func:`variance`
-- :func:`version`
-
-W
--
-
-- :func:`week`
-- :func:`week_of_year`
-- :func:`width_bucket`
-- :func:`wilson_interval_lower`
-- :func:`wilson_interval_upper`
-- :func:`with_timezone`
-- :func:`word_stem`
-
-X
--
-
-- :func:`xxhash64`
-
-Y
--
-
-- :func:`year`
-- :func:`year_of_week`
-- :func:`yow`
-
-Z
--
-
-- :func:`zip`
-- :func:`zip_with`
diff --git a/docs/src/main/sphinx/functions/logical.md b/docs/src/main/sphinx/functions/logical.md
new file mode 100644
index 000000000000..7704bfc2a7e6
--- /dev/null
+++ b/docs/src/main/sphinx/functions/logical.md
@@ -0,0 +1,66 @@
+(logical-operators)=
+
+# Logical operators
+
+## Logical operators
+
+| Operator | Description                  | Example |
+| -------- | ---------------------------- | ------- |
+| `AND`    | True if both values are true | a AND b |
+| `OR`     | True if either value is true | a OR b  |
+| `NOT`    | True if the value is false   | NOT a   |
+
+## Effect of NULL on logical operators
+
+The result of an `AND` comparison may be `NULL` if one or both
+sides of the expression are `NULL`. If at least one side of an
+`AND` operator is `FALSE` the expression evaluates to `FALSE`:
+
+```
+SELECT CAST(null AS boolean) AND true; -- null
+
+SELECT CAST(null AS boolean) AND false; -- false
+
+SELECT CAST(null AS boolean) AND CAST(null AS boolean); -- null
+```
+
+The result of an `OR` comparison may be `NULL` if one or both
+sides of the expression are `NULL`.  If at least one side of an
+`OR` operator is `TRUE` the expression evaluates to `TRUE`:
+
+```
+SELECT CAST(null AS boolean) OR CAST(null AS boolean); -- null
+
+SELECT CAST(null AS boolean) OR false; -- null
+
+SELECT CAST(null AS boolean) OR true; -- true
+```
+
+The following truth table demonstrates the handling of
+`NULL` in `AND` and `OR`:
+
+| a       | b       | a AND b | a OR b  |
+| ------- | ------- | ------- | ------- |
+| `TRUE`  | `TRUE`  | `TRUE`  | `TRUE`  |
+| `TRUE`  | `FALSE` | `FALSE` | `TRUE`  |
+| `TRUE`  | `NULL`  | `NULL`  | `TRUE`  |
+| `FALSE` | `TRUE`  | `FALSE` | `TRUE`  |
+| `FALSE` | `FALSE` | `FALSE` | `FALSE` |
+| `FALSE` | `NULL`  | `FALSE` | `NULL`  |
+| `NULL`  | `TRUE`  | `NULL`  | `TRUE`  |
+| `NULL`  | `FALSE` | `FALSE` | `NULL`  |
+| `NULL`  | `NULL`  | `NULL`  | `NULL`  |
+
+The logical complement of `NULL` is `NULL` as shown in the following example:
+
+```
+SELECT NOT CAST(null AS boolean); -- null
+```
+
+The following truth table demonstrates the handling of `NULL` in `NOT`:
+
+| a       | NOT a   |
+| ------- | ------- |
+| `TRUE`  | `FALSE` |
+| `FALSE` | `TRUE`  |
+| `NULL`  | `NULL`  |
diff --git a/docs/src/main/sphinx/functions/logical.rst b/docs/src/main/sphinx/functions/logical.rst
deleted file mode 100644
index 2f1a96c623d6..000000000000
--- a/docs/src/main/sphinx/functions/logical.rst
+++ /dev/null
@@ -1,70 +0,0 @@
-.. _logical_operators:
-
-=================
-Logical operators
-=================
-
-Logical operators
------------------
-
-======== ============================ =======
-Operator Description                  Example
-======== ============================ =======
-``AND``  True if both values are true a AND b
-``OR``   True if either value is true a OR b
-``NOT``  True if the value is false   NOT a
-======== ============================ =======
-
-Effect of NULL on logical operators
------------------------------------
-
-The result of an ``AND`` comparison may be ``NULL`` if one or both
-sides of the expression are ``NULL``. If at least one side of an
-``AND`` operator is ``FALSE`` the expression evaluates to ``FALSE``::
-
-    SELECT CAST(null AS boolean) AND true; -- null
-
-    SELECT CAST(null AS boolean) AND false; -- false
-
-    SELECT CAST(null AS boolean) AND CAST(null AS boolean); -- null
-
-The result of an ``OR`` comparison may be ``NULL`` if one or both
-sides of the expression are ``NULL``.  If at least one side of an
-``OR`` operator is ``TRUE`` the expression evaluates to ``TRUE``::
-
-    SELECT CAST(null AS boolean) OR CAST(null AS boolean); -- null
-
-    SELECT CAST(null AS boolean) OR false; -- null
-
-    SELECT CAST(null AS boolean) OR true; -- true
-
-The following truth table demonstrates the handling of
-``NULL`` in ``AND`` and ``OR``:
-
-=========  =========  =========  =========
-a          b          a AND b    a OR b
-=========  =========  =========  =========
-``TRUE``   ``TRUE``   ``TRUE``   ``TRUE``
-``TRUE``   ``FALSE``  ``FALSE``  ``TRUE``
-``TRUE``   ``NULL``   ``NULL``   ``TRUE``
-``FALSE``  ``TRUE``   ``FALSE``  ``TRUE``
-``FALSE``  ``FALSE``  ``FALSE``  ``FALSE``
-``FALSE``  ``NULL``   ``FALSE``  ``NULL``
-``NULL``   ``TRUE``   ``NULL``   ``TRUE``
-``NULL``   ``FALSE``  ``FALSE``  ``NULL``
-``NULL``   ``NULL``   ``NULL``   ``NULL``
-=========  =========  =========  =========
-
-The logical complement of ``NULL`` is ``NULL`` as shown in the following example::
-
-    SELECT NOT CAST(null AS boolean); -- null
-
-The following truth table demonstrates the handling of ``NULL`` in ``NOT``:
-
-=========  =========
-a          NOT a
-=========  =========
-``TRUE``   ``FALSE``
-``FALSE``  ``TRUE``
-``NULL``   ``NULL``
-=========  =========
diff --git a/docs/src/main/sphinx/functions/map.md b/docs/src/main/sphinx/functions/map.md
new file mode 100644
index 000000000000..c8cfb508ba86
--- /dev/null
+++ b/docs/src/main/sphinx/functions/map.md
@@ -0,0 +1,175 @@
+# Map functions and operators
+
+## Subscript operator: \[\]
+
+The `[]` operator is used to retrieve the value corresponding to a given key from a map:
+
+```
+SELECT name_to_age_map['Bob'] AS bob_age;
+```
+
+## Map functions
+
+:::{function} cardinality(x) -> bigint
+:noindex: true
+
+Returns the cardinality (size) of the map `x`.
+:::
+
+:::{function} element_at(map(K,V), key) -> V
+:noindex: true
+
+Returns value for given `key`, or `NULL` if the key is not contained in the map.
+:::
+
+:::{function} map() -> map<unknown, unknown>
+Returns an empty map.
+
+```
+SELECT map();
+-- {}
+```
+:::
+
+:::{function} map(array(K), array(V)) -> map(K,V)
+:noindex: true
+
+Returns a map created using the given key/value arrays.
+
+```
+SELECT map(ARRAY[1,3], ARRAY[2,4]);
+-- {1 -> 2, 3 -> 4}
+```
+
+See also {func}`map_agg` and {func}`multimap_agg` for creating a map as an aggregation.
+:::
+
+:::{function} map_from_entries(array(row(K,V))) -> map(K,V)
+Returns a map created from the given array of entries.
+
+```
+SELECT map_from_entries(ARRAY[(1, 'x'), (2, 'y')]);
+-- {1 -> 'x', 2 -> 'y'}
+```
+:::
+
+:::{function} multimap_from_entries(array(row(K,V))) -> map(K,array(V))
+Returns a multimap created from the given array of entries. Each key can be associated with multiple values.
+
+```
+SELECT multimap_from_entries(ARRAY[(1, 'x'), (2, 'y'), (1, 'z')]);
+-- {1 -> ['x', 'z'], 2 -> ['y']}
+```
+:::
+
+:::{function} map_entries(map(K,V)) -> array(row(K,V))
+Returns an array of all entries in the given map.
+
+```
+SELECT map_entries(MAP(ARRAY[1, 2], ARRAY['x', 'y']));
+-- [ROW(1, 'x'), ROW(2, 'y')]
+```
+:::
+
+:::{function} map_concat(map1(K,V), map2(K,V), ..., mapN(K,V)) -> map(K,V)
+Returns the union of all the given maps. If a key is found in multiple given maps,
+that key's value in the resulting map comes from the last one of those maps.
+:::
+
+:::{function} map_filter(map(K,V), function(K,V,boolean)) -> map(K,V)
+Constructs a map from those entries of `map` for which `function` returns true:
+
+```
+SELECT map_filter(MAP(ARRAY[], ARRAY[]), (k, v) -> true);
+-- {}
+
+SELECT map_filter(MAP(ARRAY[10, 20, 30], ARRAY['a', NULL, 'c']),
+                  (k, v) -> v IS NOT NULL);
+-- {10 -> a, 30 -> c}
+
+SELECT map_filter(MAP(ARRAY['k1', 'k2', 'k3'], ARRAY[20, 3, 15]),
+                  (k, v) -> v > 10);
+-- {k1 -> 20, k3 -> 15}
+```
+:::
+
+:::{function} map_keys(x(K,V)) -> array(K)
+Returns all the keys in the map `x`.
+:::
+
+:::{function} map_values(x(K,V)) -> array(V)
+Returns all the values in the map `x`.
+:::
+
+:::{function} map_zip_with(map(K,V1), map(K,V2), function(K,V1,V2,V3)) -> map(K,V3)
+Merges the two given maps into a single map by applying `function` to the pair of values with the same key.
+For keys only presented in one map, NULL will be passed as the value for the missing key.
+
+```
+SELECT map_zip_with(MAP(ARRAY[1, 2, 3], ARRAY['a', 'b', 'c']),
+                    MAP(ARRAY[1, 2, 3], ARRAY['d', 'e', 'f']),
+                    (k, v1, v2) -> concat(v1, v2));
+-- {1 -> ad, 2 -> be, 3 -> cf}
+
+SELECT map_zip_with(MAP(ARRAY['k1', 'k2'], ARRAY[1, 2]),
+                    MAP(ARRAY['k2', 'k3'], ARRAY[4, 9]),
+                    (k, v1, v2) -> (v1, v2));
+-- {k1 -> ROW(1, null), k2 -> ROW(2, 4), k3 -> ROW(null, 9)}
+
+SELECT map_zip_with(MAP(ARRAY['a', 'b', 'c'], ARRAY[1, 8, 27]),
+                    MAP(ARRAY['a', 'b', 'c'], ARRAY[1, 2, 3]),
+                    (k, v1, v2) -> k || CAST(v1 / v2 AS VARCHAR));
+-- {a -> a1, b -> b4, c -> c9}
+```
+:::
+
+:::{function} transform_keys(map(K1,V), function(K1,V,K2)) -> map(K2,V)
+Returns a map that applies `function` to each entry of `map` and transforms the keys:
+
+```
+SELECT transform_keys(MAP(ARRAY[], ARRAY[]), (k, v) -> k + 1);
+-- {}
+
+SELECT transform_keys(MAP(ARRAY [1, 2, 3], ARRAY ['a', 'b', 'c']),
+                      (k, v) -> k + 1);
+-- {2 -> a, 3 -> b, 4 -> c}
+
+SELECT transform_keys(MAP(ARRAY ['a', 'b', 'c'], ARRAY [1, 2, 3]),
+                      (k, v) -> v * v);
+-- {1 -> 1, 4 -> 2, 9 -> 3}
+
+SELECT transform_keys(MAP(ARRAY ['a', 'b'], ARRAY [1, 2]),
+                      (k, v) -> k || CAST(v as VARCHAR));
+-- {a1 -> 1, b2 -> 2}
+
+SELECT transform_keys(MAP(ARRAY [1, 2], ARRAY [1.0, 1.4]),
+                      (k, v) -> MAP(ARRAY[1, 2], ARRAY['one', 'two'])[k]);
+-- {one -> 1.0, two -> 1.4}
+```
+:::
+
+:::{function} transform_values(map(K,V1), function(K,V1,V2)) -> map(K,V2)
+Returns a map that applies `function` to each entry of `map` and transforms the values:
+
+```
+SELECT transform_values(MAP(ARRAY[], ARRAY[]), (k, v) -> v + 1);
+-- {}
+
+SELECT transform_values(MAP(ARRAY [1, 2, 3], ARRAY [10, 20, 30]),
+                        (k, v) -> v + k);
+-- {1 -> 11, 2 -> 22, 3 -> 33}
+
+SELECT transform_values(MAP(ARRAY [1, 2, 3], ARRAY ['a', 'b', 'c']),
+                        (k, v) -> k * k);
+-- {1 -> 1, 2 -> 4, 3 -> 9}
+
+SELECT transform_values(MAP(ARRAY ['a', 'b'], ARRAY [1, 2]),
+                        (k, v) -> k || CAST(v as VARCHAR));
+-- {a -> a1, b -> b2}
+
+SELECT transform_values(MAP(ARRAY [1, 2], ARRAY [1.0, 1.4]),
+                        (k, v) -> MAP(ARRAY[1, 2], ARRAY['one', 'two'])[k]
+                          || '_' || CAST(v AS VARCHAR));
+-- {1 -> one_1.0, 2 -> two_1.4}
+```
+:::
diff --git a/docs/src/main/sphinx/functions/map.rst b/docs/src/main/sphinx/functions/map.rst
deleted file mode 100644
index 75c2763eccd3..000000000000
--- a/docs/src/main/sphinx/functions/map.rst
+++ /dev/null
@@ -1,156 +0,0 @@
-===========================
-Map functions and operators
-===========================
-
-Subscript operator: []
-----------------------
-
-The ``[]`` operator is used to retrieve the value corresponding to a given key from a map::
-
-    SELECT name_to_age_map['Bob'] AS bob_age;
-
-Map functions
--------------
-
-.. function:: cardinality(x) -> bigint
-    :noindex:
-
-    Returns the cardinality (size) of the map ``x``.
-
-.. function:: element_at(map(K,V), key) -> V
-    :noindex:
-
-    Returns value for given ``key``, or ``NULL`` if the key is not contained in the map.
-
-.. function:: map() -> map<unknown, unknown>
-
-    Returns an empty map. ::
-
-        SELECT map();
-        -- {}
-
-.. function:: map(array(K), array(V)) -> map(K,V)
-    :noindex:
-
-    Returns a map created using the given key/value arrays. ::
-
-        SELECT map(ARRAY[1,3], ARRAY[2,4]);
-        -- {1 -> 2, 3 -> 4}
-
-    See also :func:`map_agg` and :func:`multimap_agg` for creating a map as an aggregation.
-
-.. function:: map_from_entries(array(row(K,V))) -> map(K,V)
-
-    Returns a map created from the given array of entries. ::
-
-        SELECT map_from_entries(ARRAY[(1, 'x'), (2, 'y')]);
-        -- {1 -> 'x', 2 -> 'y'}
-
-.. function:: multimap_from_entries(array(row(K,V))) -> map(K,array(V))
-
-    Returns a multimap created from the given array of entries. Each key can be associated with multiple values. ::
-
-        SELECT multimap_from_entries(ARRAY[(1, 'x'), (2, 'y'), (1, 'z')]);
-        -- {1 -> ['x', 'z'], 2 -> ['y']}
-
-.. function:: map_entries(map(K,V)) -> array(row(K,V))
-
-    Returns an array of all entries in the given map. ::
-
-        SELECT map_entries(MAP(ARRAY[1, 2], ARRAY['x', 'y']));
-        -- [ROW(1, 'x'), ROW(2, 'y')]
-
-.. function:: map_concat(map1(K,V), map2(K,V), ..., mapN(K,V)) -> map(K,V)
-
-   Returns the union of all the given maps. If a key is found in multiple given maps,
-   that key's value in the resulting map comes from the last one of those maps.
-
-.. function:: map_filter(map(K,V), function(K,V,boolean)) -> map(K,V)
-
-    Constructs a map from those entries of ``map`` for which ``function`` returns true::
-
-        SELECT map_filter(MAP(ARRAY[], ARRAY[]), (k, v) -> true);
-        -- {}
-
-        SELECT map_filter(MAP(ARRAY[10, 20, 30], ARRAY['a', NULL, 'c']),
-                          (k, v) -> v IS NOT NULL);
-        -- {10 -> a, 30 -> c}
-
-        SELECT map_filter(MAP(ARRAY['k1', 'k2', 'k3'], ARRAY[20, 3, 15]),
-                          (k, v) -> v > 10);
-        -- {k1 -> 20, k3 -> 15}
-
-.. function:: map_keys(x(K,V)) -> array(K)
-
-    Returns all the keys in the map ``x``.
-
-.. function:: map_values(x(K,V)) -> array(V)
-
-    Returns all the values in the map ``x``.
-
-.. function:: map_zip_with(map(K,V1), map(K,V2), function(K,V1,V2,V3)) -> map(K,V3)
-
-    Merges the two given maps into a single map by applying ``function`` to the pair of values with the same key.
-    For keys only presented in one map, NULL will be passed as the value for the missing key. ::
-
-        SELECT map_zip_with(MAP(ARRAY[1, 2, 3], ARRAY['a', 'b', 'c']),
-                            MAP(ARRAY[1, 2, 3], ARRAY['d', 'e', 'f']),
-                            (k, v1, v2) -> concat(v1, v2));
-        -- {1 -> ad, 2 -> be, 3 -> cf}
-
-        SELECT map_zip_with(MAP(ARRAY['k1', 'k2'], ARRAY[1, 2]),
-                            MAP(ARRAY['k2', 'k3'], ARRAY[4, 9]),
-                            (k, v1, v2) -> (v1, v2));
-        -- {k1 -> ROW(1, null), k2 -> ROW(2, 4), k3 -> ROW(null, 9)}
-
-        SELECT map_zip_with(MAP(ARRAY['a', 'b', 'c'], ARRAY[1, 8, 27]),
-                            MAP(ARRAY['a', 'b', 'c'], ARRAY[1, 2, 3]),
-                            (k, v1, v2) -> k || CAST(v1 / v2 AS VARCHAR));
-        -- {a -> a1, b -> b4, c -> c9}
-
-.. function:: transform_keys(map(K1,V), function(K1,V,K2)) -> map(K2,V)
-
-    Returns a map that applies ``function`` to each entry of ``map`` and transforms the keys::
-
-        SELECT transform_keys(MAP(ARRAY[], ARRAY[]), (k, v) -> k + 1);
-        -- {}
-
-        SELECT transform_keys(MAP(ARRAY [1, 2, 3], ARRAY ['a', 'b', 'c']),
-                              (k, v) -> k + 1);
-        -- {2 -> a, 3 -> b, 4 -> c}
-
-        SELECT transform_keys(MAP(ARRAY ['a', 'b', 'c'], ARRAY [1, 2, 3]),
-                              (k, v) -> v * v);
-        -- {1 -> 1, 4 -> 2, 9 -> 3}
-
-        SELECT transform_keys(MAP(ARRAY ['a', 'b'], ARRAY [1, 2]),
-                              (k, v) -> k || CAST(v as VARCHAR));
-        -- {a1 -> 1, b2 -> 2}
-
-        SELECT transform_keys(MAP(ARRAY [1, 2], ARRAY [1.0, 1.4]),
-                              (k, v) -> MAP(ARRAY[1, 2], ARRAY['one', 'two'])[k]);
-        -- {one -> 1.0, two -> 1.4}
-
-.. function:: transform_values(map(K,V1), function(K,V1,V2)) -> map(K,V2)
-
-    Returns a map that applies ``function`` to each entry of ``map`` and transforms the values::
-
-        SELECT transform_values(MAP(ARRAY[], ARRAY[]), (k, v) -> v + 1);
-        -- {}
-
-        SELECT transform_values(MAP(ARRAY [1, 2, 3], ARRAY [10, 20, 30]),
-                                (k, v) -> v + k);
-        -- {1 -> 11, 2 -> 22, 3 -> 33}
-
-        SELECT transform_values(MAP(ARRAY [1, 2, 3], ARRAY ['a', 'b', 'c']),
-                                (k, v) -> k * k);
-        -- {1 -> 1, 2 -> 4, 3 -> 9}
-
-        SELECT transform_values(MAP(ARRAY ['a', 'b'], ARRAY [1, 2]),
-                                (k, v) -> k || CAST(v as VARCHAR));
-        -- {a -> a1, b -> b2}
-
-        SELECT transform_values(MAP(ARRAY [1, 2], ARRAY [1.0, 1.4]),
-                                (k, v) -> MAP(ARRAY[1, 2], ARRAY['one', 'two'])[k]
-                                  || '_' || CAST(v AS VARCHAR));
-        -- {1 -> one_1.0, 2 -> two_1.4}
diff --git a/docs/src/main/sphinx/functions/math.md b/docs/src/main/sphinx/functions/math.md
new file mode 100644
index 000000000000..d0a8ece21c3a
--- /dev/null
+++ b/docs/src/main/sphinx/functions/math.md
@@ -0,0 +1,274 @@
+# Mathematical functions and operators
+
+(mathematical-operators)=
+
+## Mathematical operators
+
+| Operator | Description                                     |
+| -------- | ----------------------------------------------- |
+| `+`      | Addition                                        |
+| `-`      | Subtraction                                     |
+| `*`      | Multiplication                                  |
+| `/`      | Division (integer division performs truncation) |
+| `%`      | Modulus (remainder)                             |
+
+## Mathematical functions
+
+:::{function} abs(x) -> [same as input]
+Returns the absolute value of `x`.
+:::
+
+:::{function} cbrt(x) -> double
+Returns the cube root of `x`.
+:::
+
+:::{function} ceil(x) -> [same as input]
+This is an alias for {func}`ceiling`.
+:::
+
+:::{function} ceiling(x) -> [same as input]
+Returns `x` rounded up to the nearest integer.
+:::
+
+:::{function} degrees(x) -> double
+Converts angle `x` in radians to degrees.
+:::
+
+:::{function} e() -> double
+Returns the constant Euler's number.
+:::
+
+:::{function} exp(x) -> double
+Returns Euler's number raised to the power of `x`.
+:::
+
+:::{function} floor(x) -> [same as input]
+Returns `x` rounded down to the nearest integer.
+:::
+
+:::{function} ln(x) -> double
+Returns the natural logarithm of `x`.
+:::
+
+:::{function} log(b, x) -> double
+Returns the base `b` logarithm of `x`.
+:::
+
+:::{function} log2(x) -> double
+Returns the base 2 logarithm of `x`.
+:::
+
+:::{function} log10(x) -> double
+Returns the base 10 logarithm of `x`.
+:::
+
+:::{function} mod(n, m) -> [same as input]
+Returns the modulus (remainder) of `n` divided by `m`.
+:::
+
+:::{function} pi() -> double
+Returns the constant Pi.
+:::
+
+:::{function} pow(x, p) -> double
+This is an alias for {func}`power`.
+:::
+
+:::{function} power(x, p) -> double
+Returns `x` raised to the power of `p`.
+:::
+
+:::{function} radians(x) -> double
+Converts angle `x` in degrees to radians.
+:::
+
+:::{function} round(x) -> [same as input]
+Returns `x` rounded to the nearest integer.
+:::
+
+:::{function} round(x, d) -> [same as input]
+:noindex: true
+
+Returns `x` rounded to `d` decimal places.
+:::
+
+:::{function} sign(x) -> [same as input]
+Returns the signum function of `x`, that is:
+
+- 0 if the argument is 0,
+- 1 if the argument is greater than 0,
+- -1 if the argument is less than 0.
+
+For double arguments, the function additionally returns:
+
+- NaN if the argument is NaN,
+- 1 if the argument is +Infinity,
+- -1 if the argument is -Infinity.
+:::
+
+:::{function} sqrt(x) -> double
+Returns the square root of `x`.
+:::
+
+:::{function} truncate(x) -> double
+Returns `x` rounded to integer by dropping digits after decimal point.
+:::
+
+:::{function} width_bucket(x, bound1, bound2, n) -> bigint
+Returns the bin number of `x` in an equi-width histogram with the
+specified `bound1` and `bound2` bounds and `n` number of buckets.
+:::
+
+:::{function} width_bucket(x, bins) -> bigint
+:noindex: true
+
+Returns the bin number of `x` according to the bins specified by the
+array `bins`. The `bins` parameter must be an array of doubles and is
+assumed to be in sorted ascending order.
+:::
+
+## Random functions
+
+:::{function} rand() -> double
+This is an alias for {func}`random()`.
+:::
+
+:::{function} random() -> double
+Returns a pseudo-random value in the range 0.0 \<= x \< 1.0.
+:::
+
+:::{function} random(n) -> [same as input]
+:noindex: true
+
+Returns a pseudo-random number between 0 and n (exclusive).
+:::
+
+:::{function} random(m, n) -> [same as input]
+:noindex: true
+
+Returns a pseudo-random number between m and n (exclusive).
+:::
+
+## Trigonometric functions
+
+All trigonometric function arguments are expressed in radians.
+See unit conversion functions {func}`degrees` and {func}`radians`.
+
+:::{function} acos(x) -> double
+Returns the arc cosine of `x`.
+:::
+
+:::{function} asin(x) -> double
+Returns the arc sine of `x`.
+:::
+
+:::{function} atan(x) -> double
+Returns the arc tangent of `x`.
+:::
+
+:::{function} atan2(y, x) -> double
+Returns the arc tangent of `y / x`.
+:::
+
+:::{function} cos(x) -> double
+Returns the cosine of `x`.
+:::
+
+:::{function} cosh(x) -> double
+Returns the hyperbolic cosine of `x`.
+:::
+
+:::{function} sin(x) -> double
+Returns the sine of `x`.
+:::
+
+:::{function} sinh(x) -> double
+Returns the hyperbolic sine of `x`.
+:::
+
+:::{function} tan(x) -> double
+Returns the tangent of `x`.
+:::
+
+:::{function} tanh(x) -> double
+Returns the hyperbolic tangent of `x`.
+:::
+
+## Floating point functions
+
+:::{function} infinity() -> double
+Returns the constant representing positive infinity.
+:::
+
+:::{function} is_finite(x) -> boolean
+Determine if `x` is finite.
+:::
+
+:::{function} is_infinite(x) -> boolean
+Determine if `x` is infinite.
+:::
+
+:::{function} is_nan(x) -> boolean
+Determine if `x` is not-a-number.
+:::
+
+:::{function} nan() -> double
+Returns the constant representing not-a-number.
+:::
+
+## Base conversion functions
+
+:::{function} from_base(string, radix) -> bigint
+Returns the value of `string` interpreted as a base-`radix` number.
+:::
+
+:::{function} to_base(x, radix) -> varchar
+Returns the base-`radix` representation of `x`.
+:::
+
+## Statistical functions
+
+:::{function} cosine_similarity(x, y) -> double
+Returns the cosine similarity between the sparse vectors `x` and `y`:
+
+```
+SELECT cosine_similarity(MAP(ARRAY['a'], ARRAY[1.0]), MAP(ARRAY['a'], ARRAY[2.0])); -- 1.0
+```
+:::
+
+:::{function} wilson_interval_lower(successes, trials, z) -> double
+Returns the lower bound of the Wilson score interval of a Bernoulli trial process
+at a confidence specified by the z-score `z`.
+:::
+
+:::{function} wilson_interval_upper(successes, trials, z) -> double
+Returns the upper bound of the Wilson score interval of a Bernoulli trial process
+at a confidence specified by the z-score `z`.
+:::
+
+## Cumulative distribution functions
+
+:::{function} beta_cdf(a, b, v) -> double
+Compute the Beta cdf with given a, b parameters:  P(N \< v; a, b).
+The a, b parameters must be positive real numbers and value v must be a real value.
+The value v must lie on the interval \[0, 1\].
+:::
+
+:::{function} inverse_beta_cdf(a, b, p) -> double
+Compute the inverse of the Beta cdf with given a, b parameters for the cumulative
+probability (p): P(N \< n). The a, b parameters must be positive real values.
+The probability p must lie on the interval \[0, 1\].
+:::
+
+:::{function} inverse_normal_cdf(mean, sd, p) -> double
+Compute the inverse of the Normal cdf with given mean and standard
+deviation (sd) for the cumulative probability (p): P(N \< n). The mean must be
+a real value and the standard deviation must be a real and positive value.
+The probability p must lie on the interval (0, 1).
+:::
+
+:::{function} normal_cdf(mean, sd, v) -> double
+Compute the Normal cdf with given mean and standard deviation (sd):  P(N \< v; mean, sd).
+The mean and value v must be real values and the standard deviation must be a real
+and positive value.
+:::
diff --git a/docs/src/main/sphinx/functions/math.rst b/docs/src/main/sphinx/functions/math.rst
deleted file mode 100644
index c6b6d31318c0..000000000000
--- a/docs/src/main/sphinx/functions/math.rst
+++ /dev/null
@@ -1,280 +0,0 @@
-====================================
-Mathematical functions and operators
-====================================
-
-.. _mathematical_operators:
-
-Mathematical operators
-----------------------
-
-======== ===========
-Operator Description
-======== ===========
-``+``    Addition
-``-``    Subtraction
-``*``    Multiplication
-``/``    Division (integer division performs truncation)
-``%``    Modulus (remainder)
-======== ===========
-
-Mathematical functions
-----------------------
-
-.. function:: abs(x) -> [same as input]
-
-    Returns the absolute value of ``x``.
-
-.. function:: cbrt(x) -> double
-
-    Returns the cube root of ``x``.
-
-.. function:: ceil(x) -> [same as input]
-
-    This is an alias for :func:`ceiling`.
-
-.. function:: ceiling(x) -> [same as input]
-
-    Returns ``x`` rounded up to the nearest integer.
-
-.. function:: degrees(x) -> double
-
-    Converts angle ``x`` in radians to degrees.
-
-.. function:: e() -> double
-
-    Returns the constant Euler's number.
-
-.. function:: exp(x) -> double
-
-    Returns Euler's number raised to the power of ``x``.
-
-.. function:: floor(x) -> [same as input]
-
-    Returns ``x`` rounded down to the nearest integer.
-
-.. function:: ln(x) -> double
-
-    Returns the natural logarithm of ``x``.
-
-.. function:: log(b, x) -> double
-
-    Returns the base ``b`` logarithm of ``x``.
-
-.. function:: log2(x) -> double
-
-    Returns the base 2 logarithm of ``x``.
-
-.. function:: log10(x) -> double
-
-    Returns the base 10 logarithm of ``x``.
-
-.. function:: mod(n, m) -> [same as input]
-
-    Returns the modulus (remainder) of ``n`` divided by ``m``.
-
-.. function:: pi() -> double
-
-    Returns the constant Pi.
-
-.. function:: pow(x, p) -> double
-
-    This is an alias for :func:`power`.
-
-.. function:: power(x, p) -> double
-
-    Returns ``x`` raised to the power of ``p``.
-
-.. function:: radians(x) -> double
-
-    Converts angle ``x`` in degrees to radians.
-
-.. function:: round(x) -> [same as input]
-
-    Returns ``x`` rounded to the nearest integer.
-
-.. function:: round(x, d) -> [same as input]
-    :noindex:
-
-    Returns ``x`` rounded to ``d`` decimal places.
-
-.. function:: sign(x) -> [same as input]
-
-    Returns the signum function of ``x``, that is:
-
-    * 0 if the argument is 0,
-    * 1 if the argument is greater than 0,
-    * -1 if the argument is less than 0.
-
-    For double arguments, the function additionally returns:
-
-    * NaN if the argument is NaN,
-    * 1 if the argument is +Infinity,
-    * -1 if the argument is -Infinity.
-
-.. function:: sqrt(x) -> double
-
-    Returns the square root of ``x``.
-
-.. function:: truncate(x) -> double
-
-    Returns ``x`` rounded to integer by dropping digits after decimal point.
-
-.. function:: width_bucket(x, bound1, bound2, n) -> bigint
-
-    Returns the bin number of ``x`` in an equi-width histogram with the
-    specified ``bound1`` and ``bound2`` bounds and ``n`` number of buckets.
-
-.. function:: width_bucket(x, bins) -> bigint
-    :noindex:
-
-    Returns the bin number of ``x`` according to the bins specified by the
-    array ``bins``. The ``bins`` parameter must be an array of doubles and is
-    assumed to be in sorted ascending order.
-
-Random functions
-----------------
-
-.. function:: rand() -> double
-
-    This is an alias for :func:`random()`.
-
-.. function:: random() -> double
-
-    Returns a pseudo-random value in the range 0.0 <= x < 1.0.
-
-.. function:: random(n) -> [same as input]
-    :noindex:
-
-    Returns a pseudo-random number between 0 and n (exclusive).
-
-.. function:: random(m, n) -> [same as input]
-    :noindex:
-
-    Returns a pseudo-random number between m and n (exclusive).
-
-Trigonometric functions
------------------------
-
-All trigonometric function arguments are expressed in radians.
-See unit conversion functions :func:`degrees` and :func:`radians`.
-
-.. function:: acos(x) -> double
-
-    Returns the arc cosine of ``x``.
-
-.. function:: asin(x) -> double
-
-    Returns the arc sine of ``x``.
-
-.. function:: atan(x) -> double
-
-    Returns the arc tangent of ``x``.
-
-.. function:: atan2(y, x) -> double
-
-    Returns the arc tangent of ``y / x``.
-
-.. function:: cos(x) -> double
-
-    Returns the cosine of ``x``.
-
-.. function:: cosh(x) -> double
-
-    Returns the hyperbolic cosine of ``x``.
-
-.. function:: sin(x) -> double
-
-    Returns the sine of ``x``.
-
-.. function:: sinh(x) -> double
-
-    Returns the hyperbolic sine of ``x``.
-
-.. function:: tan(x) -> double
-
-    Returns the tangent of ``x``.
-
-.. function:: tanh(x) -> double
-
-    Returns the hyperbolic tangent of ``x``.
-
-Floating point functions
-------------------------
-
-.. function:: infinity() -> double
-
-    Returns the constant representing positive infinity.
-
-.. function:: is_finite(x) -> boolean
-
-    Determine if ``x`` is finite.
-
-.. function:: is_infinite(x) -> boolean
-
-    Determine if ``x`` is infinite.
-
-.. function:: is_nan(x) -> boolean
-
-    Determine if ``x`` is not-a-number.
-
-.. function:: nan() -> double
-
-    Returns the constant representing not-a-number.
-
-Base conversion functions
--------------------------
-
-.. function:: from_base(string, radix) -> bigint
-
-    Returns the value of ``string`` interpreted as a base-``radix`` number.
-
-.. function:: to_base(x, radix) -> varchar
-
-    Returns the base-``radix`` representation of ``x``.
-
-Statistical functions
----------------------
-
-.. function:: cosine_similarity(x, y) -> double
-
-    Returns the cosine similarity between the sparse vectors ``x`` and ``y``::
-
-        SELECT cosine_similarity(MAP(ARRAY['a'], ARRAY[1.0]), MAP(ARRAY['a'], ARRAY[2.0])); -- 1.0
-
-.. function:: wilson_interval_lower(successes, trials, z) -> double
-
-    Returns the lower bound of the Wilson score interval of a Bernoulli trial process
-    at a confidence specified by the z-score ``z``.
-
-.. function:: wilson_interval_upper(successes, trials, z) -> double
-
-    Returns the upper bound of the Wilson score interval of a Bernoulli trial process
-    at a confidence specified by the z-score ``z``.
-
-Cumulative distribution functions
----------------------------------
-
-.. function:: beta_cdf(a, b, v) -> double
-
-    Compute the Beta cdf with given a, b parameters:  P(N < v; a, b).
-    The a, b parameters must be positive real numbers and value v must be a real value.
-    The value v must lie on the interval [0, 1].
-
-.. function:: inverse_beta_cdf(a, b, p) -> double
-
-    Compute the inverse of the Beta cdf with given a, b parameters for the cumulative
-    probability (p): P(N < n). The a, b parameters must be positive real values.
-    The probability p must lie on the interval [0, 1].
-
-.. function:: inverse_normal_cdf(mean, sd, p) -> double
-
-    Compute the inverse of the Normal cdf with given mean and standard
-    deviation (sd) for the cumulative probability (p): P(N < n). The mean must be
-    a real value and the standard deviation must be a real and positive value.
-    The probability p must lie on the interval (0, 1).
-
-.. function:: normal_cdf(mean, sd, v) -> double
-
-    Compute the Normal cdf with given mean and standard deviation (sd):  P(N < v; mean, sd).
-    The mean and value v must be real values and the standard deviation must be a real
-    and positive value.
diff --git a/docs/src/main/sphinx/functions/ml.md b/docs/src/main/sphinx/functions/ml.md
new file mode 100644
index 000000000000..44f4c46f8baa
--- /dev/null
+++ b/docs/src/main/sphinx/functions/ml.md
@@ -0,0 +1,157 @@
+# Machine learning functions
+
+The machine learning plugin provides machine learning functionality
+as an aggregation function. It enables you to train Support Vector Machine (SVM)
+based classifiers and regressors for the supervised learning problems.
+
+:::{note}
+The machine learning functions are not optimized for distributed processing.
+The capability to train large data sets is limited by this execution of the
+final training on a single instance.
+:::
+
+## Feature vector
+
+To solve a problem with the machine learning technique, especially as a
+supervised learning problem, it is necessary to represent the data set
+with the sequence of pairs of labels and feature vector. A label is a
+target value you want to predict from the unseen feature and a feature is a
+A N-dimensional vector whose elements are numerical values. In Trino, a
+feature vector is represented as a map-type value, whose key is an index
+of each feature, so that it can express a sparse vector.
+Since classifiers and regressors can recognize the map-type feature
+vector, there is a function to construct the feature from the existing
+numerical values, {func}`features`:
+
+```
+SELECT features(1.0, 2.0, 3.0) AS features;
+```
+
+```text
+       features
+-----------------------
+ {0=1.0, 1=2.0, 2=3.0}
+```
+
+The output from {func}`features` can be directly passed to ML functions.
+
+## Classification
+
+Classification is a type of supervised learning problem to predict the distinct
+label from the given feature vector. The interface looks similar to the
+construction of the SVM model from the sequence of pairs of labels and features
+implemented in Teradata Aster or [BigQuery ML](https://cloud.google.com/bigquery-ml/docs/bigqueryml-intro).
+The function to train a classification model looks like as follows:
+
+```
+SELECT
+  learn_classifier(
+    species,
+    features(sepal_length, sepal_width, petal_length, petal_width)
+  ) AS model
+FROM
+  iris
+```
+
+It returns the trained model in a serialized format.
+
+```text
+                      model
+-------------------------------------------------
+ 3c 43 6c 61 73 73 69 66 69 65 72 28 76 61 72 63
+ 68 61 72 29 3e
+```
+
+{func}`classify` returns the predicted label by using the trained model.
+The trained model can not be saved natively, and needs to be passed in
+the format of a nested query:
+
+```
+SELECT
+  classify(features(5.9, 3, 5.1, 1.8), model) AS predicted_label
+FROM (
+  SELECT
+    learn_classifier(species, features(sepal_length, sepal_width, petal_length, petal_width)) AS model
+  FROM
+    iris
+) t
+```
+
+```text
+ predicted_label
+-----------------
+ Iris-virginica
+```
+
+As a result you need to run the training process at the same time when predicting values.
+Internally, the model is trained by [libsvm](https://www.csie.ntu.edu.tw/~cjlin/libsvm/).
+You can use {func}`learn_libsvm_classifier` to control the internal parameters of the model.
+
+## Regression
+
+Regression is another type of supervised learning problem, predicting continuous
+value, unlike the classification problem. The target must be numerical values that can
+be described as `double`.
+
+The following code shows the creation of the model predicting `sepal_length`
+from the other 3 features:
+
+```
+SELECT
+  learn_regressor(sepal_length, features(sepal_width, petal_length, petal_width)) AS model
+FROM
+  iris
+```
+
+The way to use the model is similar to the classification case:
+
+```
+SELECT
+  regress(features(3, 5.1, 1.8), model) AS predicted_target
+FROM (
+  SELECT
+    learn_regressor(sepal_length, features(sepal_width, petal_length, petal_width)) AS model
+  FROM iris
+) t;
+```
+
+```text
+ predicted_target
+-------------------
+ 6.407376822560477
+```
+
+Internally, the model is trained by [libsvm](https://www.csie.ntu.edu.tw/~cjlin/libsvm/).
+{func}`learn_libsvm_regressor` provides you a way to control the training process.
+
+## Machine learning functions
+
+:::{function} features(double, ...) -> map(bigint, double)
+Returns the map representing the feature vector.
+:::
+
+:::{function} learn_classifier(label, features) -> Classifier
+Returns an SVM-based classifier model, trained with the given label and feature data sets.
+:::
+
+:::{function} learn_libsvm_classifier(label, features, params) -> Classifier
+Returns an SVM-based classifier model, trained with the given label and feature data sets.
+You can control the training process by libsvm parameters.
+:::
+
+:::{function} classify(features, model) -> label
+Returns a label predicted by the given classifier SVM model.
+:::
+
+:::{function} learn_regressor(target, features) -> Regressor
+Returns an SVM-based regressor model, trained with the given target and feature data sets.
+:::
+
+:::{function} learn_libsvm_regressor(target, features, params) -> Regressor
+Returns an SVM-based regressor model, trained with the given target and feature data sets.
+You can control the training process by libsvm parameters.
+:::
+
+:::{function} regress(features, model) -> target
+Returns a predicted target value by the given regressor SVM model.
+:::
diff --git a/docs/src/main/sphinx/functions/ml.rst b/docs/src/main/sphinx/functions/ml.rst
deleted file mode 100644
index 7c023753f003..000000000000
--- a/docs/src/main/sphinx/functions/ml.rst
+++ /dev/null
@@ -1,153 +0,0 @@
-==========================
-Machine learning functions
-==========================
-
-The machine learning plugin provides machine learning functionality
-as an aggregation function. It enables you to train Support Vector Machine (SVM)
-based classifiers and regressors for the supervised learning problems.
-
-.. note::
-
-  The machine learning functions are not optimized for distributed processing.
-  The capability to train large data sets is limited by this execution of the
-  final training on a single instance.
-
-Feature vector
---------------
-
-To solve a problem with the machine learning technique, especially as a
-supervised learning problem, it is necessary to represent the data set
-with the sequence of pairs of labels and feature vector. A label is a
-target value you want to predict from the unseen feature and a feature is a
-A N-dimensional vector whose elements are numerical values. In Trino, a
-feature vector is represented as a map-type value, whose key is an index
-of each feature, so that it can express a sparse vector.
-Since classifiers and regressors can recognize the map-type feature
-vector, there is a function to construct the feature from the existing
-numerical values, :func:`features`::
-
-    SELECT features(1.0, 2.0, 3.0) AS features;
-
-.. code-block:: text
-
-           features
-    -----------------------
-     {0=1.0, 1=2.0, 2=3.0}
-
-The output from :func:`features` can be directly passed to ML functions.
-
-Classification
---------------
-
-Classification is a type of supervised learning problem to predict the distinct
-label from the given feature vector. The interface looks similar to the
-construction of the SVM model from the sequence of pairs of labels and features
-implemented in Teradata Aster or `BigQuery ML <https://cloud.google.com/bigquery-ml/docs/bigqueryml-intro>`_.
-The function to train a classification model looks like as follows::
-
-    SELECT
-      learn_classifier(
-        species,
-        features(sepal_length, sepal_width, petal_length, petal_width)
-      ) AS model
-    FROM
-      iris
-
-It returns the trained model in a serialized format.
-
-.. code-block:: text
-
-                          model
-    -------------------------------------------------
-     3c 43 6c 61 73 73 69 66 69 65 72 28 76 61 72 63
-     68 61 72 29 3e
-
-:func:`classify` returns the predicted label by using the trained model.
-The trained model can not be saved natively, and needs to be passed in
-the format of a nested query::
-
-    SELECT
-      classify(features(5.9, 3, 5.1, 1.8), model) AS predicted_label
-    FROM (
-      SELECT
-        learn_classifier(species, features(sepal_length, sepal_width, petal_length, petal_width)) AS model
-      FROM
-        iris
-    ) t
-
-.. code-block:: text
-
-     predicted_label
-    -----------------
-     Iris-virginica
-
-As a result you need to run the training process at the same time when predicting values.
-Internally, the model is trained by `libsvm <https://www.csie.ntu.edu.tw/~cjlin/libsvm/>`_.
-You can use :func:`learn_libsvm_classifier` to control the internal parameters of the model.
-
-Regression
-----------
-
-Regression is another type of supervised learning problem, predicting continuous
-value, unlike the classification problem. The target must be numerical values that can
-be described as ``double``.
-
-The following code shows the creation of the model predicting ``sepal_length``
-from the other 3 features::
-
-    SELECT
-      learn_regressor(sepal_length, features(sepal_width, petal_length, petal_width)) AS model
-    FROM
-      iris
-
-The way to use the model is similar to the classification case::
-
-    SELECT
-      regress(features(3, 5.1, 1.8), model) AS predicted_target
-    FROM (
-      SELECT
-        learn_regressor(sepal_length, features(sepal_width, petal_length, petal_width)) AS model
-      FROM iris
-    ) t;
-
-.. code-block:: text
-
-     predicted_target
-    -------------------
-     6.407376822560477
-
-Internally, the model is trained by `libsvm <https://www.csie.ntu.edu.tw/~cjlin/libsvm/>`_.
-:func:`learn_libsvm_regressor` provides you a way to control the training process.
-
-Machine learning functions
---------------------------
-
-.. function:: features(double, ...) -> map(bigint, double)
-
-    Returns the map representing the feature vector.
-
-.. function:: learn_classifier(label, features) -> Classifier
-
-    Returns an SVM-based classifier model, trained with the given label and feature data sets.
-
-.. function:: learn_libsvm_classifier(label, features, params) -> Classifier
-
-    Returns an SVM-based classifier model, trained with the given label and feature data sets.
-    You can control the training process by libsvm parameters.
-
-.. function:: classify(features, model) -> label
-
-    Returns a label predicted by the given classifier SVM model.
-
-.. function:: learn_regressor(target, features) -> Regressor
-
-    Returns an SVM-based regressor model, trained with the given target and feature data sets.
-
-.. function:: learn_libsvm_regressor(target, features, params) -> Regressor
-
-    Returns an SVM-based regressor model, trained with the given target and feature data sets.
-    You can control the training process by libsvm parameters.
-
-.. function:: regress(features, model) -> target
-
-    Returns a predicted target value by the given regressor SVM model.
diff --git a/docs/src/main/sphinx/functions/qdigest.md b/docs/src/main/sphinx/functions/qdigest.md
new file mode 100644
index 000000000000..d454ff2387e2
--- /dev/null
+++ b/docs/src/main/sphinx/functions/qdigest.md
@@ -0,0 +1,55 @@
+# Quantile digest functions
+
+## Data structures
+
+A quantile digest is a data sketch which stores approximate percentile
+information.  The Trino type for this data structure is called `qdigest`,
+and it takes a parameter which must be one of `bigint`, `double` or
+`real` which represent the set of numbers that may be ingested by the
+`qdigest`.  They may be merged without losing precision, and for storage
+and retrieval they may be cast to/from `VARBINARY`.
+
+## Functions
+
+:::{function} merge(qdigest) -> qdigest
+:noindex: true
+
+Merges all input `qdigest`s into a single `qdigest`.
+:::
+
+:::{function} value_at_quantile(qdigest(T), quantile) -> T
+Returns the approximate percentile value from the quantile digest given
+the number `quantile` between 0 and 1.
+:::
+
+:::{function} quantile_at_value(qdigest(T), T) -> quantile
+Returns the approximate `quantile` number between 0 and 1 from the
+quantile digest given an input value. Null is returned if the quantile digest
+is empty or the input value is outside of the range of the quantile digest.
+:::
+
+:::{function} values_at_quantiles(qdigest(T), quantiles) -> array(T)
+Returns the approximate percentile values as an array given the input
+quantile digest and array of values between 0 and 1 which
+represent the quantiles to return.
+:::
+
+:::{function} qdigest_agg(x) -> qdigest([same as x])
+Returns the `qdigest` which is composed of  all input values of `x`.
+:::
+
+:::{function} qdigest_agg(x, w) -> qdigest([same as x])
+:noindex: true
+
+Returns the `qdigest` which is composed of  all input values of `x` using
+the per-item weight `w`.
+:::
+
+:::{function} qdigest_agg(x, w, accuracy) -> qdigest([same as x])
+:noindex: true
+
+Returns the `qdigest` which is composed of  all input values of `x` using
+the per-item weight `w` and maximum error of `accuracy`. `accuracy`
+must be a value greater than zero and less than one, and it must be constant
+for all input rows.
+:::
diff --git a/docs/src/main/sphinx/functions/qdigest.rst b/docs/src/main/sphinx/functions/qdigest.rst
deleted file mode 100644
index b7a85897398f..000000000000
--- a/docs/src/main/sphinx/functions/qdigest.rst
+++ /dev/null
@@ -1,56 +0,0 @@
-=========================
-Quantile digest functions
-=========================
-
-Data structures
----------------
-
-A quantile digest is a data sketch which stores approximate percentile
-information.  The Trino type for this data structure is called ``qdigest``,
-and it takes a parameter which must be one of ``bigint``, ``double`` or
-``real`` which represent the set of numbers that may be ingested by the
-``qdigest``.  They may be merged without losing precision, and for storage
-and retrieval they may be cast to/from ``VARBINARY``.
-
-Functions
----------
-
-.. function:: merge(qdigest) -> qdigest
-    :noindex:
-
-    Merges all input ``qdigest``\ s into a single ``qdigest``.
-
-.. function:: value_at_quantile(qdigest(T), quantile) -> T
-
-    Returns the approximate percentile value from the quantile digest given
-    the number ``quantile`` between 0 and 1.
-
-.. function:: quantile_at_value(qdigest(T), T) -> quantile
-
-    Returns the approximate ``quantile`` number between 0 and 1 from the
-    quantile digest given an input value. Null is returned if the quantile digest
-    is empty or the input value is outside of the range of the quantile digest.
-
-.. function:: values_at_quantiles(qdigest(T), quantiles) -> array(T)
-
-    Returns the approximate percentile values as an array given the input
-    quantile digest and array of values between 0 and 1 which
-    represent the quantiles to return.
-
-.. function:: qdigest_agg(x) -> qdigest([same as x])
-
-    Returns the ``qdigest`` which is composed of  all input values of ``x``.
-
-.. function:: qdigest_agg(x, w) -> qdigest([same as x])
-    :noindex:
-
-    Returns the ``qdigest`` which is composed of  all input values of ``x`` using
-    the per-item weight ``w``.
-
-.. function:: qdigest_agg(x, w, accuracy) -> qdigest([same as x])
-    :noindex:
-
-    Returns the ``qdigest`` which is composed of  all input values of ``x`` using
-    the per-item weight ``w`` and maximum error of ``accuracy``. ``accuracy``
-    must be a value greater than zero and less than one, and it must be constant
-    for all input rows.
diff --git a/docs/src/main/sphinx/functions/regexp.md b/docs/src/main/sphinx/functions/regexp.md
new file mode 100644
index 000000000000..cbc853e0ecc7
--- /dev/null
+++ b/docs/src/main/sphinx/functions/regexp.md
@@ -0,0 +1,189 @@
+# Regular expression functions
+
+All of the regular expression functions use the [Java pattern] syntax,
+with a few notable exceptions:
+
+- When using multi-line mode (enabled via the `(?m)` flag),
+  only `\n` is recognized as a line terminator. Additionally,
+  the `(?d)` flag is not supported and must not be used.
+
+- Case-insensitive matching (enabled via the `(?i)` flag) is always
+  performed in a Unicode-aware manner. However, context-sensitive and
+  local-sensitive matching is not supported. Additionally, the
+  `(?u)` flag is not supported and must not be used.
+
+- Surrogate pairs are not supported. For example, `\uD800\uDC00` is
+  not treated as `U+10000` and must be specified as `\x{10000}`.
+
+- Boundaries (`\b`) are incorrectly handled for a non-spacing mark
+  without a base character.
+
+- `\Q` and `\E` are not supported in character classes
+  (such as `[A-Z123]`) and are instead treated as literals.
+
+- Unicode character classes (`\p{prop}`) are supported with
+  the following differences:
+
+  - All underscores in names must be removed. For example, use
+    `OldItalic` instead of `Old_Italic`.
+
+  - Scripts must be specified directly, without the
+    `Is`, `script=` or `sc=` prefixes.
+    Example: `\p{Hiragana}`
+
+  - Blocks must be specified with the `In` prefix.
+    The `block=` and `blk=` prefixes are not supported.
+    Example: `\p{Mongolian}`
+
+  - Categories must be specified directly, without the `Is`,
+    `general_category=` or `gc=` prefixes.
+    Example: `\p{L}`
+
+  - Binary properties must be specified directly, without the `Is`.
+    Example: `\p{NoncharacterCodePoint}`
+
+:::{function} regexp_count(string, pattern) -> bigint
+Returns the number of occurrence of `pattern` in `string`:
+
+```
+SELECT regexp_count('1a 2b 14m', '\s*[a-z]+\s*'); -- 3
+```
+:::
+
+:::{function} regexp_extract_all(string, pattern) -> array(varchar)
+Returns the substring(s) matched by the regular expression `pattern`
+in `string`:
+
+```
+SELECT regexp_extract_all('1a 2b 14m', '\d+'); -- [1, 2, 14]
+```
+:::
+
+:::{function} regexp_extract_all(string, pattern, group) -> array(varchar)
+:noindex: true
+
+Finds all occurrences of the regular expression `pattern` in `string`
+and returns the [capturing group number] `group`:
+
+```
+SELECT regexp_extract_all('1a 2b 14m', '(\d+)([a-z]+)', 2); -- ['a', 'b', 'm']
+```
+:::
+
+:::{function} regexp_extract(string, pattern) -> varchar
+Returns the first substring matched by the regular expression `pattern`
+in `string`:
+
+```
+SELECT regexp_extract('1a 2b 14m', '\d+'); -- 1
+```
+:::
+
+:::{function} regexp_extract(string, pattern, group) -> varchar
+:noindex: true
+
+Finds the first occurrence of the regular expression `pattern` in
+`string` and returns the [capturing group number] `group`:
+
+```
+SELECT regexp_extract('1a 2b 14m', '(\d+)([a-z]+)', 2); -- 'a'
+```
+:::
+
+:::{function} regexp_like(string, pattern) -> boolean
+Evaluates the regular expression `pattern` and determines if it is
+contained within `string`.
+
+The `pattern` only needs to be contained within
+`string`, rather than needing to match all of `string`. In other words,
+this performs a *contains* operation rather than a *match* operation. You can
+match the entire string by anchoring the pattern using `^` and `$`:
+
+```
+SELECT regexp_like('1a 2b 14m', '\d+b'); -- true
+```
+:::
+
+:::{function} regexp_position(string, pattern) -> integer
+Returns the index of the first occurrence (counting from 1) of `pattern` in `string`.
+Returns -1 if not found:
+
+```
+SELECT regexp_position('I have 23 apples, 5 pears and 13 oranges', '\b\d+\b'); -- 8
+```
+:::
+
+:::{function} regexp_position(string, pattern, start) -> integer
+:noindex: true
+
+Returns the index of the first occurrence of `pattern` in `string`,
+starting from `start` (include `start`). Returns -1 if not found:
+
+```
+SELECT regexp_position('I have 23 apples, 5 pears and 13 oranges', '\b\d+\b', 5); -- 8
+SELECT regexp_position('I have 23 apples, 5 pears and 13 oranges', '\b\d+\b', 12); -- 19
+```
+:::
+
+:::{function} regexp_position(string, pattern, start, occurrence) -> integer
+:noindex: true
+
+Returns the index of the nth `occurrence` of `pattern` in `string`,
+starting from `start` (include `start`). Returns -1 if not found:
+
+```
+SELECT regexp_position('I have 23 apples, 5 pears and 13 oranges', '\b\d+\b', 12, 1); -- 19
+SELECT regexp_position('I have 23 apples, 5 pears and 13 oranges', '\b\d+\b', 12, 2); -- 31
+SELECT regexp_position('I have 23 apples, 5 pears and 13 oranges', '\b\d+\b', 12, 3); -- -1
+```
+:::
+
+:::{function} regexp_replace(string, pattern) -> varchar
+Removes every instance of the substring matched by the regular expression
+`pattern` from `string`:
+
+```
+SELECT regexp_replace('1a 2b 14m', '\d+[ab] '); -- '14m'
+```
+:::
+
+:::{function} regexp_replace(string, pattern, replacement) -> varchar
+:noindex: true
+
+Replaces every instance of the substring matched by the regular expression
+`pattern` in `string` with `replacement`. [Capturing groups] can be
+referenced in `replacement` using `$g` for a numbered group or
+`${name}` for a named group. A dollar sign (`$`) may be included in the
+replacement by escaping it with a backslash (`\$`):
+
+```
+SELECT regexp_replace('1a 2b 14m', '(\d+)([ab]) ', '3c$2 '); -- '3ca 3cb 14m'
+```
+:::
+
+:::{function} regexp_replace(string, pattern, function) -> varchar
+:noindex: true
+
+Replaces every instance of the substring matched by the regular expression
+`pattern` in `string` using `function`. The {doc}`lambda expression <lambda>`
+`function` is invoked for each match with the [capturing groups] passed as an
+array. Capturing group numbers start at one; there is no group for the entire match
+(if you need this, surround the entire expression with parenthesis).
+
+```
+SELECT regexp_replace('new york', '(\w)(\w*)', x -> upper(x[1]) || lower(x[2])); --'New York'
+```
+:::
+
+:::{function} regexp_split(string, pattern) -> array(varchar)
+Splits `string` using the regular expression `pattern` and returns an
+array. Trailing empty strings are preserved:
+
+```
+SELECT regexp_split('1a 2b 14m', '\s*[a-z]+\s*'); -- [1, 2, 14, ]
+```
+:::
+
+[capturing group number]: https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/regex/Pattern.html#gnumber
+[capturing groups]: https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/regex/Pattern.html#cg
+[java pattern]: https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/regex/Pattern.html
diff --git a/docs/src/main/sphinx/functions/regexp.rst b/docs/src/main/sphinx/functions/regexp.rst
deleted file mode 100644
index 775252294d30..000000000000
--- a/docs/src/main/sphinx/functions/regexp.rst
+++ /dev/null
@@ -1,152 +0,0 @@
-============================
-Regular expression functions
-============================
-
-All of the regular expression functions use the `Java pattern`_ syntax,
-with a few notable exceptions:
-
-* When using multi-line mode (enabled via the ``(?m)`` flag),
-  only ``\n`` is recognized as a line terminator. Additionally,
-  the ``(?d)`` flag is not supported and must not be used.
-* Case-insensitive matching (enabled via the ``(?i)`` flag) is always
-  performed in a Unicode-aware manner. However, context-sensitive and
-  local-sensitive matching is not supported. Additionally, the
-  ``(?u)`` flag is not supported and must not be used.
-* Surrogate pairs are not supported. For example, ``\uD800\uDC00`` is
-  not treated as ``U+10000`` and must be specified as ``\x{10000}``.
-* Boundaries (``\b``) are incorrectly handled for a non-spacing mark
-  without a base character.
-* ``\Q`` and ``\E`` are not supported in character classes
-  (such as ``[A-Z123]``) and are instead treated as literals.
-* Unicode character classes (``\p{prop}``) are supported with
-  the following differences:
-
-  * All underscores in names must be removed. For example, use
-    ``OldItalic`` instead of ``Old_Italic``.
-  * Scripts must be specified directly, without the
-    ``Is``, ``script=`` or ``sc=`` prefixes.
-    Example: ``\p{Hiragana}``
-  * Blocks must be specified with the ``In`` prefix.
-    The ``block=`` and ``blk=`` prefixes are not supported.
-    Example: ``\p{Mongolian}``
-  * Categories must be specified directly, without the ``Is``,
-    ``general_category=`` or ``gc=`` prefixes.
-    Example: ``\p{L}``
-  * Binary properties must be specified directly, without the ``Is``.
-    Example: ``\p{NoncharacterCodePoint}``
-
-    .. _Java pattern: https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/regex/Pattern.html
-
-    .. _capturing group number: https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/regex/Pattern.html#gnumber
-
-    .. _Capturing groups: https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/regex/Pattern.html#cg
-
-.. function:: regexp_count(string, pattern) -> bigint
-
-    Returns the number of occurrence of ``pattern`` in ``string``::
-
-        SELECT regexp_count('1a 2b 14m', '\s*[a-z]+\s*'); -- 3
-
-.. function:: regexp_extract_all(string, pattern) -> array(varchar)
-
-    Returns the substring(s) matched by the regular expression ``pattern``
-    in ``string``::
-
-        SELECT regexp_extract_all('1a 2b 14m', '\d+'); -- [1, 2, 14]
-
-.. function:: regexp_extract_all(string, pattern, group) -> array(varchar)
-    :noindex:
-
-    Finds all occurrences of the regular expression ``pattern`` in ``string``
-    and returns the `capturing group number`_ ``group``::
-
-        SELECT regexp_extract_all('1a 2b 14m', '(\d+)([a-z]+)', 2); -- ['a', 'b', 'm']
-
-.. function:: regexp_extract(string, pattern) -> varchar
-
-    Returns the first substring matched by the regular expression ``pattern``
-    in ``string``::
-
-        SELECT regexp_extract('1a 2b 14m', '\d+'); -- 1
-
-.. function:: regexp_extract(string, pattern, group) -> varchar
-    :noindex:
-
-    Finds the first occurrence of the regular expression ``pattern`` in
-    ``string`` and returns the `capturing group number`_ ``group``::
-
-        SELECT regexp_extract('1a 2b 14m', '(\d+)([a-z]+)', 2); -- 'a'
-
-.. function:: regexp_like(string, pattern) -> boolean
-
-    Evaluates the regular expression ``pattern`` and determines if it is
-    contained within ``string``.
-
-    The ``pattern`` only needs to be contained within
-    ``string``, rather than needing to match all of ``string``. In other words,
-    this performs a *contains* operation rather than a *match* operation. You can
-    match the entire string by anchoring the pattern using ``^`` and ``$``::
-
-        SELECT regexp_like('1a 2b 14m', '\d+b'); -- true
-
-.. function:: regexp_position(string, pattern) -> integer
-
-    Returns the index of the first occurrence (counting from 1) of ``pattern`` in ``string``.
-    Returns -1 if not found::
-
-        SELECT regexp_position('I have 23 apples, 5 pears and 13 oranges', '\b\d+\b'); -- 8
-
-.. function:: regexp_position(string, pattern, start) -> integer
-    :noindex:
-
-    Returns the index of the first occurrence of ``pattern`` in ``string``,
-    starting from ``start`` (include ``start``). Returns -1 if not found::
-
-        SELECT regexp_position('I have 23 apples, 5 pears and 13 oranges', '\b\d+\b', 5); -- 8
-        SELECT regexp_position('I have 23 apples, 5 pears and 13 oranges', '\b\d+\b', 12); -- 19
-
-.. function:: regexp_position(string, pattern, start, occurrence) -> integer
-    :noindex:
-
-    Returns the index of the nth ``occurrence`` of ``pattern`` in ``string``,
-    starting from ``start`` (include ``start``). Returns -1 if not found::
-
-        SELECT regexp_position('I have 23 apples, 5 pears and 13 oranges', '\b\d+\b', 12, 1); -- 19
-        SELECT regexp_position('I have 23 apples, 5 pears and 13 oranges', '\b\d+\b', 12, 2); -- 31
-        SELECT regexp_position('I have 23 apples, 5 pears and 13 oranges', '\b\d+\b', 12, 3); -- -1
-
-.. function:: regexp_replace(string, pattern) -> varchar
-
-    Removes every instance of the substring matched by the regular expression
-    ``pattern`` from ``string``::
-
-        SELECT regexp_replace('1a 2b 14m', '\d+[ab] '); -- '14m'
-
-.. function:: regexp_replace(string, pattern, replacement) -> varchar
-    :noindex:
-
-    Replaces every instance of the substring matched by the regular expression
-    ``pattern`` in ``string`` with ``replacement``. `Capturing groups`_ can be
-    referenced in ``replacement`` using ``$g`` for a numbered group or
-    ``${name}`` for a named group. A dollar sign (``$``) may be included in the
-    replacement by escaping it with a backslash (``\$``)::
-
-        SELECT regexp_replace('1a 2b 14m', '(\d+)([ab]) ', '3c$2 '); -- '3ca 3cb 14m'
-
-.. function:: regexp_replace(string, pattern, function) -> varchar
-    :noindex:
-
-    Replaces every instance of the substring matched by the regular expression
-    ``pattern`` in ``string`` using ``function``. The :doc:`lambda expression <lambda>`
-    ``function`` is invoked for each match with the `capturing groups`_ passed as an
-    array. Capturing group numbers start at one; there is no group for the entire match
-    (if you need this, surround the entire expression with parenthesis). ::
-
-        SELECT regexp_replace('new york', '(\w)(\w*)', x -> upper(x[1]) || lower(x[2])); --'New York'
-
-.. function:: regexp_split(string, pattern) -> array(varchar)
-
-    Splits ``string`` using the regular expression ``pattern`` and returns an
-    array. Trailing empty strings are preserved::
-
-        SELECT regexp_split('1a 2b 14m', '\s*[a-z]+\s*'); -- [1, 2, 14, ]
diff --git a/docs/src/main/sphinx/functions/session.md b/docs/src/main/sphinx/functions/session.md
new file mode 100644
index 000000000000..206a333fe20b
--- /dev/null
+++ b/docs/src/main/sphinx/functions/session.md
@@ -0,0 +1,23 @@
+# Session information
+
+Functions providing information about the query execution environment.
+
+:::{data} current_user
+Returns the current user running the query.
+:::
+
+:::{function} current_groups
+Returns the list of groups for the current user running the query.
+:::
+
+:::{data} current_catalog
+Returns a character string that represents the current catalog name.
+:::
+
+::::{data} current_schema
+Returns a character string that represents the current unqualified schema name.
+
+:::{note}
+This is part of the SQL standard and does not use parenthesis.
+:::
+::::
diff --git a/docs/src/main/sphinx/functions/session.rst b/docs/src/main/sphinx/functions/session.rst
deleted file mode 100644
index d641dd0fb6ec..000000000000
--- a/docs/src/main/sphinx/functions/session.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-===================
-Session information
-===================
-
-Functions providing information about the query execution environment.
-
-.. data:: current_user
-
-    Returns the current user running the query.
-
-.. function:: current_groups
-
-    Returns the list of groups for the current user running the query.
-
-.. data:: current_catalog
-
-    Returns a character string that represents the current catalog name.
-
-.. data:: current_schema
-
-    Returns a character string that represents the current unqualified schema name.
-
-    .. note:: This is part of the SQL standard and does not use parenthesis.
diff --git a/docs/src/main/sphinx/functions/setdigest.md b/docs/src/main/sphinx/functions/setdigest.md
new file mode 100644
index 000000000000..37bef87b2316
--- /dev/null
+++ b/docs/src/main/sphinx/functions/setdigest.md
@@ -0,0 +1,187 @@
+# Set Digest functions
+
+Trino offers several functions that deal with the
+[MinHash](https://wikipedia.org/wiki/MinHash) technique.
+
+MinHash is used to quickly estimate the
+[Jaccard similarity coefficient](https://wikipedia.org/wiki/Jaccard_index)
+between two sets.
+
+It is commonly used in data mining to detect near-duplicate web pages at scale.
+By using this information, the search engines efficiently avoid showing
+within the search results two pages that are nearly identical.
+
+The following example showcases how the Set Digest functions can be
+used to naively estimate the similarity between texts. The input texts
+are split by using the function {func}`ngrams` to
+[4-shingles](https://wikipedia.org/wiki/W-shingling) which are
+used as input for creating a set digest of each initial text.
+The set digests are compared to each other to get an
+approximation of the similarity of their corresponding
+initial texts:
+
+```
+WITH text_input(id, text) AS (
+         VALUES
+             (1, 'The quick brown fox jumps over the lazy dog'),
+             (2, 'The quick and the lazy'),
+             (3, 'The quick brown fox jumps over the dog')
+     ),
+     text_ngrams(id, ngrams) AS (
+         SELECT id,
+                transform(
+                  ngrams(
+                    split(text, ' '),
+                    4
+                  ),
+                  token -> array_join(token, ' ')
+                )
+         FROM text_input
+     ),
+     minhash_digest(id, digest) AS (
+         SELECT id,
+                (SELECT make_set_digest(v) FROM unnest(ngrams) u(v))
+         FROM text_ngrams
+     ),
+     setdigest_side_by_side(id1, digest1, id2, digest2) AS (
+         SELECT m1.id as id1,
+                m1.digest as digest1,
+                m2.id as id2,
+                m2.digest as digest2
+         FROM (SELECT id, digest FROM minhash_digest) m1
+         JOIN (SELECT id, digest FROM minhash_digest) m2
+           ON m1.id != m2.id AND m1.id < m2.id
+     )
+SELECT id1,
+       id2,
+       intersection_cardinality(digest1, digest2) AS intersection_cardinality,
+       jaccard_index(digest1, digest2)            AS jaccard_index
+FROM setdigest_side_by_side
+ORDER BY id1, id2;
+```
+
+```text
+ id1 | id2 | intersection_cardinality | jaccard_index
+-----+-----+--------------------------+---------------
+   1 |   2 |                        0 |           0.0
+   1 |   3 |                        4 |           0.6
+   2 |   3 |                        0 |           0.0
+```
+
+The above result listing points out, as expected, that the texts
+with the id `1` and `3` are quite similar.
+
+One may argue that the text with the id `2` is somewhat similar to
+the texts with the id `1` and `3`. Due to the fact in the example above
+*4-shingles* are taken into account for measuring the similarity of the texts,
+there are no intersections found for the text pairs `1` and `2`, respectively
+`3` and `2` and therefore there the similarity index for these text pairs
+is `0`.
+
+## Data structures
+
+Trino implements Set Digest data sketches by encapsulating the following components:
+
+- [HyperLogLog](https://wikipedia.org/wiki/HyperLogLog)
+- [MinHash with a single hash function](http://wikipedia.org/wiki/MinHash#Variant_with_a_single_hash_function)
+
+The HyperLogLog structure is used for the approximation of the distinct elements
+in the original set.
+
+The MinHash structure is used to store a low memory footprint signature of the original set.
+The similarity of any two sets is estimated by comparing their signatures.
+
+The Trino type for this data structure is called `setdigest`.
+Trino offers the ability to merge multiple Set Digest data sketches.
+
+## Serialization
+
+Data sketches can be serialized to and deserialized from `varbinary`. This
+allows them to be stored for later use.
+
+## Functions
+
+:::{function} make_set_digest(x) -> setdigest
+Composes all input values of `x` into a `setdigest`.
+
+Create a `setdigest` corresponding to a `bigint` array:
+
+```
+SELECT make_set_digest(value)
+FROM (VALUES 1, 2, 3) T(value);
+```
+
+Create a `setdigest` corresponding to a `varchar` array:
+
+```
+SELECT make_set_digest(value)
+FROM (VALUES 'Trino', 'SQL', 'on', 'everything') T(value);
+```
+:::
+
+:::{function} merge_set_digest(setdigest) -> setdigest
+Returns the `setdigest` of the aggregate union of the individual `setdigest`
+Set Digest structures.
+:::
+
+(setdigest-cardinality)=
+
+:::{function} cardinality(setdigest) -> long
+:noindex: true
+
+Returns the cardinality of the set digest from its internal
+`HyperLogLog` component.
+
+Examples:
+
+```
+SELECT cardinality(make_set_digest(value))
+FROM (VALUES 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5) T(value);
+-- 5
+```
+:::
+
+:::{function} intersection_cardinality(x,y) -> long
+Returns the estimation for the cardinality of the intersection of the two set digests.
+
+`x` and `y` must be of type  `setdigest`
+
+Examples:
+
+```
+SELECT intersection_cardinality(make_set_digest(v1), make_set_digest(v2))
+FROM (VALUES (1, 1), (NULL, 2), (2, 3), (3, 4)) T(v1, v2);
+-- 3
+```
+:::
+
+:::{function} jaccard_index(x, y) -> double
+Returns the estimation of [Jaccard index](https://wikipedia.org/wiki/Jaccard_index) for
+the two set digests.
+
+`x` and `y` must be of type  `setdigest`.
+
+Examples:
+
+```
+SELECT jaccard_index(make_set_digest(v1), make_set_digest(v2))
+FROM (VALUES (1, 1), (NULL,2), (2, 3), (NULL, 4)) T(v1, v2);
+-- 0.5
+```
+:::
+
+:::{function} hash_counts(x) -> map(bigint, smallint)
+Returns a map containing the [Murmur3Hash128](https://wikipedia.org/wiki/MurmurHash#MurmurHash3)
+hashed values and the count of their occurences within
+the internal `MinHash` structure belonging to `x`.
+
+`x` must be of type  `setdigest`.
+
+Examples:
+
+```
+SELECT hash_counts(make_set_digest(value))
+FROM (VALUES 1, 1, 1, 2, 2) T(value);
+-- {19144387141682250=3, -2447670524089286488=2}
+```
+:::
diff --git a/docs/src/main/sphinx/functions/setdigest.rst b/docs/src/main/sphinx/functions/setdigest.rst
deleted file mode 100644
index 24d38cf2c9c6..000000000000
--- a/docs/src/main/sphinx/functions/setdigest.rst
+++ /dev/null
@@ -1,178 +0,0 @@
-====================
-Set Digest functions
-====================
-
-Trino offers several functions that deal with the
-`MinHash <https://wikipedia.org/wiki/MinHash>`_ technique.
-
-MinHash is used to quickly estimate the
-`Jaccard similarity coefficient <https://wikipedia.org/wiki/Jaccard_index>`_
-between two sets.
-
-It is commonly used in data mining to detect near-duplicate web pages at scale.
-By using this information, the search engines efficiently avoid showing
-within the search results two pages that are nearly identical.
-
-The following example showcases how the Set Digest functions can be
-used to naively estimate the similarity between texts. The input texts
-are split by using the function :func:`ngrams` to
-`4-shingles <https://wikipedia.org/wiki/W-shingling>`_ which are
-used as input for creating a set digest of each initial text.
-The set digests are compared to each other to get an
-approximation of the similarity of their corresponding
-initial texts::
-
-
-    WITH text_input(id, text) AS (
-             VALUES
-                 (1, 'The quick brown fox jumps over the lazy dog'),
-                 (2, 'The quick and the lazy'),
-                 (3, 'The quick brown fox jumps over the dog')
-         ),
-         text_ngrams(id, ngrams) AS (
-             SELECT id,
-                    transform(
-                      ngrams(
-                        split(text, ' '),
-                        4
-                      ),
-                      token -> array_join(token, ' ')
-                    )
-             FROM text_input
-         ),
-         minhash_digest(id, digest) AS (
-             SELECT id,
-                    (SELECT make_set_digest(v) FROM unnest(ngrams) u(v))
-             FROM text_ngrams
-         ),
-         setdigest_side_by_side(id1, digest1, id2, digest2) AS (
-             SELECT m1.id as id1,
-                    m1.digest as digest1,
-                    m2.id as id2,
-                    m2.digest as digest2
-             FROM (SELECT id, digest FROM minhash_digest) m1
-             JOIN (SELECT id, digest FROM minhash_digest) m2
-               ON m1.id != m2.id AND m1.id < m2.id
-         )
-    SELECT id1,
-           id2,
-           intersection_cardinality(digest1, digest2) AS intersection_cardinality,
-           jaccard_index(digest1, digest2)            AS jaccard_index
-    FROM setdigest_side_by_side
-    ORDER BY id1, id2;
-
-
-.. code-block:: text
-
-     id1 | id2 | intersection_cardinality | jaccard_index
-    -----+-----+--------------------------+---------------
-       1 |   2 |                        0 |           0.0
-       1 |   3 |                        4 |           0.6
-       2 |   3 |                        0 |           0.0
-
-The above result listing points out, as expected, that the texts
-with the id ``1`` and ``3`` are quite similar.
-
-One may argue that the text with the id ``2`` is somewhat similar to
-the texts with the id ``1`` and ``3``. Due to the fact in the example above
-*4-shingles* are taken into account for measuring the similarity of the texts,
-there are no intersections found for the text pairs ``1`` and ``2``, respectively
-``3`` and ``2`` and therefore there the similarity index for these text pairs
-is ``0``.
-
-Data structures
----------------
-
-Trino implements Set Digest data sketches by encapsulating the following components:
-
-- `HyperLogLog <https://wikipedia.org/wiki/HyperLogLog>`_
-- `MinHash with a single hash function <http://wikipedia.org/wiki/MinHash#Variant_with_a_single_hash_function>`_
-
-The HyperLogLog structure is used for the approximation of the distinct elements
-in the original set.
-
-The MinHash structure is used to store a low memory footprint signature of the original set.
-The similarity of any two sets is estimated by comparing their signatures.
-
-The Trino type for this data structure is called ``setdigest``.
-Trino offers the ability to merge multiple Set Digest data sketches.
-
-Serialization
--------------
-
-Data sketches can be serialized to and deserialized from ``varbinary``. This
-allows them to be stored for later use.
-
-Functions
----------
-
-.. function:: make_set_digest(x) -> setdigest
-
-    Composes all input values of ``x`` into a ``setdigest``.
-
-    Create a ``setdigest`` corresponding to a ``bigint`` array::
-
-        SELECT make_set_digest(value)
-        FROM (VALUES 1, 2, 3) T(value);
-
-    Create a ``setdigest`` corresponding to a ``varchar`` array::
-
-        SELECT make_set_digest(value)
-        FROM (VALUES 'Trino', 'SQL', 'on', 'everything') T(value);
-
-.. function:: merge_set_digest(setdigest) -> setdigest
-
-    Returns the ``setdigest`` of the aggregate union of the individual ``setdigest``
-    Set Digest structures.
-
-.. _setdigest-cardinality:
-.. function:: cardinality(setdigest) -> long
-    :noindex:
-
-    Returns the cardinality of the set digest from its internal
-    ``HyperLogLog`` component.
-
-    Examples::
-
-        SELECT cardinality(make_set_digest(value))
-        FROM (VALUES 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5) T(value);
-        -- 5
-
-.. function:: intersection_cardinality(x,y) -> long
-
-    Returns the estimation for the cardinality of the intersection of the two set digests.
-
-    ``x`` and ``y`` must be of type  ``setdigest``
-
-    Examples::
-
-        SELECT intersection_cardinality(make_set_digest(v1), make_set_digest(v2))
-        FROM (VALUES (1, 1), (NULL, 2), (2, 3), (3, 4)) T(v1, v2);
-        -- 3
-
-.. function:: jaccard_index(x, y) -> double
-
-    Returns the estimation of `Jaccard index <https://wikipedia.org/wiki/Jaccard_index>`_ for
-    the two set digests.
-
-    ``x`` and ``y`` must be of type  ``setdigest``.
-
-    Examples::
-
-        SELECT jaccard_index(make_set_digest(v1), make_set_digest(v2))
-        FROM (VALUES (1, 1), (NULL,2), (2, 3), (NULL, 4)) T(v1, v2);
-        -- 0.5
-
-.. function:: hash_counts(x) -> map(bigint, smallint)
-
-    Returns a map containing the `Murmur3Hash128 <https://wikipedia.org/wiki/MurmurHash#MurmurHash3>`_
-    hashed values and the count of their occurences within
-    the internal ``MinHash`` structure belonging to ``x``.
-
-    ``x`` must be of type  ``setdigest``.
-
-    Examples::
-
-        SELECT hash_counts(make_set_digest(value))
-        FROM (VALUES 1, 1, 1, 2, 2) T(value);
-        -- {19144387141682250=3, -2447670524089286488=2}
diff --git a/docs/src/main/sphinx/functions/string.md b/docs/src/main/sphinx/functions/string.md
new file mode 100644
index 000000000000..81e7b07555dd
--- /dev/null
+++ b/docs/src/main/sphinx/functions/string.md
@@ -0,0 +1,341 @@
+# String functions and operators
+
+## String operators
+
+The `||` operator performs concatenation.
+
+The `LIKE` statement can be used for pattern matching and is documented in
+{ref}`like-operator`.
+
+## String functions
+
+:::{note}
+These functions assume that the input strings contain valid UTF-8 encoded
+Unicode code points.  There are no explicit checks for valid UTF-8 and
+the functions may return incorrect results on invalid UTF-8.
+Invalid UTF-8 data can be corrected with {func}`from_utf8`.
+
+Additionally, the functions operate on Unicode code points and not user
+visible *characters* (or *grapheme clusters*).  Some languages combine
+multiple code points into a single user-perceived *character*, the basic
+unit of a writing system for a language, but the functions will treat each
+code point as a separate unit.
+
+The {func}`lower` and {func}`upper` functions do not perform
+locale-sensitive, context-sensitive, or one-to-many mappings required for
+some languages. Specifically, this will return incorrect results for
+Lithuanian, Turkish and Azeri.
+:::
+
+:::{function} chr(n) -> varchar
+Returns the Unicode code point `n` as a single character string.
+:::
+
+:::{function} codepoint(string) -> integer
+Returns the Unicode code point of the only character of `string`.
+:::
+
+:::{function} concat(string1, ..., stringN) -> varchar
+Returns the concatenation of `string1`, `string2`, `...`, `stringN`.
+This function provides the same functionality as the
+SQL-standard concatenation operator (`||`).
+:::
+
+:::{function} concat_ws(string0, string1, ..., stringN) -> varchar
+Returns the concatenation of `string1`, `string2`, `...`, `stringN`
+using `string0` as a separator. If `string0` is null, then the return
+value is null. Any null values provided in the arguments after the
+separator are skipped.
+:::
+
+:::{function} concat_ws(string0, array(varchar)) -> varchar
+:noindex: true
+
+Returns the concatenation of elements in the array using `string0` as a
+separator. If `string0` is null, then the return value is null. Any
+null values in the array are skipped.
+:::
+
+:::{function} format(format, args...) -> varchar
+:noindex: true
+
+See {func}`format`.
+:::
+
+:::{function} hamming_distance(string1, string2) -> bigint
+Returns the Hamming distance of `string1` and `string2`,
+i.e. the number of positions at which the corresponding characters are different.
+Note that the two strings must have the same length.
+:::
+
+:::{function} length(string) -> bigint
+Returns the length of `string` in characters.
+:::
+
+:::{function} levenshtein_distance(string1, string2) -> bigint
+Returns the Levenshtein edit distance of `string1` and `string2`,
+i.e. the minimum number of single-character edits (insertions,
+deletions or substitutions) needed to change `string1` into `string2`.
+:::
+
+:::{function} lower(string) -> varchar
+Converts `string` to lowercase.
+:::
+
+:::{function} lpad(string, size, padstring) -> varchar
+Left pads `string` to `size` characters with `padstring`.
+If `size` is less than the length of `string`, the result is
+truncated to `size` characters. `size` must not be negative
+and `padstring` must be non-empty.
+:::
+
+:::{function} ltrim(string) -> varchar
+Removes leading whitespace from `string`.
+:::
+
+:::{function} luhn_check(string) -> boolean
+Tests whether a `string` of digits is valid according to the
+[Luhn algorithm](https://wikipedia.org/wiki/Luhn_algorithm).
+
+This checksum function, also known as `modulo 10` or `mod 10`, is
+widely applied on credit card numbers and government identification numbers
+to distinguish valid numbers from mistyped, incorrect numbers.
+
+Valid identification number:
+
+```
+select luhn_check('79927398713');
+-- true
+```
+
+Invalid identification number:
+
+```
+select luhn_check('79927398714');
+-- false
+```
+:::
+
+::::{function} position(substring IN string) -> bigint
+Returns the starting position of the first instance of `substring` in
+`string`. Positions start with `1`. If not found, `0` is returned.
+
+:::{note}
+This SQL-standard function has special syntax and uses the
+`IN` keyword for the arguments. See also {func}`strpos`.
+:::
+::::
+
+:::{function} replace(string, search) -> varchar
+Removes all instances of `search` from `string`.
+:::
+
+:::{function} replace(string, search, replace) -> varchar
+:noindex: true
+
+Replaces all instances of `search` with `replace` in `string`.
+:::
+
+:::{function} reverse(string) -> varchar
+Returns `string` with the characters in reverse order.
+:::
+
+:::{function} rpad(string, size, padstring) -> varchar
+Right pads `string` to `size` characters with `padstring`.
+If `size` is less than the length of `string`, the result is
+truncated to `size` characters. `size` must not be negative
+and `padstring` must be non-empty.
+:::
+
+:::{function} rtrim(string) -> varchar
+Removes trailing whitespace from `string`.
+:::
+
+:::{function} soundex(char) -> string
+`soundex` returns a character string containing the phonetic representation of `char`.
+
+: It is typically used to evaluate the similarity of two expressions phonetically, that is
+  how the string sounds when spoken:
+
+  ```
+  SELECT name
+  FROM nation
+  WHERE SOUNDEX(name)  = SOUNDEX('CHYNA');
+
+   name  |
+  -------+----
+   CHINA |
+  (1 row)
+  ```
+:::
+
+:::{function} split(string, delimiter) -> array(varchar)
+Splits `string` on `delimiter` and returns an array.
+:::
+
+:::{function} split(string, delimiter, limit) -> array(varchar)
+:noindex: true
+
+Splits `string` on `delimiter` and returns an array of size at most
+`limit`. The last element in the array always contain everything
+left in the `string`. `limit` must be a positive number.
+:::
+
+:::{function} split_part(string, delimiter, index) -> varchar
+Splits `string` on `delimiter` and returns the field `index`.
+Field indexes start with `1`. If the index is larger than
+the number of fields, then null is returned.
+:::
+
+:::{function} split_to_map(string, entryDelimiter, keyValueDelimiter) -> map<varchar, varchar>
+Splits `string` by `entryDelimiter` and `keyValueDelimiter` and returns a map.
+`entryDelimiter` splits `string` into key-value pairs. `keyValueDelimiter` splits
+each pair into key and value.
+:::
+
+:::{function} split_to_multimap(string, entryDelimiter, keyValueDelimiter) -> map(varchar, array(varchar))
+Splits `string` by `entryDelimiter` and `keyValueDelimiter` and returns a map
+containing an array of values for each unique key. `entryDelimiter` splits `string`
+into key-value pairs. `keyValueDelimiter` splits each pair into key and value. The
+values for each key will be in the same order as they appeared in `string`.
+:::
+
+:::{function} strpos(string, substring) -> bigint
+Returns the starting position of the first instance of `substring` in
+`string`. Positions start with `1`. If not found, `0` is returned.
+:::
+
+:::{function} strpos(string, substring, instance) -> bigint
+:noindex: true
+
+Returns the position of the N-th `instance` of `substring` in `string`.
+When `instance` is a negative number the search will start from the end of `string`.
+Positions start with `1`. If not found, `0` is returned.
+:::
+
+:::{function} starts_with(string, substring) -> boolean
+Tests whether `substring` is a prefix of `string`.
+:::
+
+:::{function} substr(string, start) -> varchar
+This is an alias for {func}`substring`.
+:::
+
+:::{function} substring(string, start) -> varchar
+Returns the rest of `string` from the starting position `start`.
+Positions start with `1`. A negative starting position is interpreted
+as being relative to the end of the string.
+:::
+
+:::{function} substr(string, start, length) -> varchar
+:noindex: true
+
+This is an alias for {func}`substring`.
+:::
+
+:::{function} substring(string, start, length) -> varchar
+:noindex: true
+
+Returns a substring from `string` of length `length` from the starting
+position `start`. Positions start with `1`. A negative starting
+position is interpreted as being relative to the end of the string.
+:::
+
+:::{function} translate(source, from, to) -> varchar
+Returns the `source` string translated by replacing characters found in the
+`from` string with the corresponding characters in the `to` string.  If the `from`
+string contains duplicates, only the first is used.  If the `source` character
+does not exist in the `from` string, the `source` character will be copied
+without translation.  If the index of the matching character in the `from`
+string is beyond the length of the `to` string, the `source` character will
+be omitted from the resulting string.
+
+Here are some examples illustrating the translate function:
+
+```
+SELECT translate('abcd', '', ''); -- 'abcd'
+SELECT translate('abcd', 'a', 'z'); -- 'zbcd'
+SELECT translate('abcda', 'a', 'z'); -- 'zbcdz'
+SELECT translate('Palhoça', 'ç','c'); -- 'Palhoca'
+SELECT translate('abcd', 'b', U&'\+01F600'); -- a😀cd
+SELECT translate('abcd', 'a', ''); -- 'bcd'
+SELECT translate('abcd', 'a', 'zy'); -- 'zbcd'
+SELECT translate('abcd', 'ac', 'z'); -- 'zbd'
+SELECT translate('abcd', 'aac', 'zq'); -- 'zbd'
+```
+:::
+
+:::{function} trim(string) -> varchar
+:noindex: true
+
+Removes leading and trailing whitespace from `string`.
+:::
+
+:::{function} trim( [ [ specification ] [ string ] FROM ] source ) -> varchar
+Removes any leading and/or trailing characters as specified up to and
+including `string` from `source`:
+
+```
+SELECT trim('!' FROM '!foo!'); -- 'foo'
+SELECT trim(LEADING FROM '  abcd');  -- 'abcd'
+SELECT trim(BOTH '$' FROM '$var$'); -- 'var'
+SELECT trim(TRAILING 'ER' FROM upper('worker')); -- 'WORK'
+```
+:::
+
+:::{function} upper(string) -> varchar
+Converts `string` to uppercase.
+:::
+
+:::{function} word_stem(word) -> varchar
+Returns the stem of `word` in the English language.
+:::
+
+:::{function} word_stem(word, lang) -> varchar
+:noindex: true
+
+Returns the stem of `word` in the `lang` language.
+:::
+
+## Unicode functions
+
+:::{function} normalize(string) -> varchar
+Transforms `string` with NFC normalization form.
+:::
+
+::::{function} normalize(string, form) -> varchar
+:noindex: true
+
+Transforms `string` with the specified normalization form.
+`form` must be one of the following keywords:
+
+| Form   | Description                                                    |
+| ------ | -------------------------------------------------------------- |
+| `NFD`  | Canonical Decomposition                                        |
+| `NFC`  | Canonical Decomposition, followed by Canonical Composition     |
+| `NFKD` | Compatibility Decomposition                                    |
+| `NFKC` | Compatibility Decomposition, followed by Canonical Composition |
+
+:::{note}
+This SQL-standard function has special syntax and requires
+specifying `form` as a keyword, not as a string.
+:::
+::::
+
+:::{function} to_utf8(string) -> varbinary
+Encodes `string` into a UTF-8 varbinary representation.
+:::
+
+:::{function} from_utf8(binary) -> varchar
+Decodes a UTF-8 encoded string from `binary`. Invalid UTF-8 sequences
+are replaced with the Unicode replacement character `U+FFFD`.
+:::
+
+:::{function} from_utf8(binary, replace) -> varchar
+:noindex: true
+
+Decodes a UTF-8 encoded string from `binary`. Invalid UTF-8 sequences
+are replaced with `replace`. The replacement string `replace` must either
+be a single character or empty (in which case invalid characters are
+removed).
+:::
diff --git a/docs/src/main/sphinx/functions/string.rst b/docs/src/main/sphinx/functions/string.rst
deleted file mode 100644
index fa374ca62556..000000000000
--- a/docs/src/main/sphinx/functions/string.rst
+++ /dev/null
@@ -1,327 +0,0 @@
-==============================
-String functions and operators
-==============================
-
-String operators
-----------------
-
-The ``||`` operator performs concatenation.
-
-The ``LIKE`` statement can be used for pattern matching and is documented in
-:ref:`like_operator`.
-
-String functions
-----------------
-
-.. note::
-
-    These functions assume that the input strings contain valid UTF-8 encoded
-    Unicode code points.  There are no explicit checks for valid UTF-8 and
-    the functions may return incorrect results on invalid UTF-8.
-    Invalid UTF-8 data can be corrected with :func:`from_utf8`.
-
-    Additionally, the functions operate on Unicode code points and not user
-    visible *characters* (or *grapheme clusters*).  Some languages combine
-    multiple code points into a single user-perceived *character*, the basic
-    unit of a writing system for a language, but the functions will treat each
-    code point as a separate unit.
-
-    The :func:`lower` and :func:`upper` functions do not perform
-    locale-sensitive, context-sensitive, or one-to-many mappings required for
-    some languages. Specifically, this will return incorrect results for
-    Lithuanian, Turkish and Azeri.
-
-.. function:: chr(n) -> varchar
-
-    Returns the Unicode code point ``n`` as a single character string.
-
-.. function:: codepoint(string) -> integer
-
-    Returns the Unicode code point of the only character of ``string``.
-
-.. function:: concat(string1, ..., stringN) -> varchar
-
-    Returns the concatenation of ``string1``, ``string2``, ``...``, ``stringN``.
-    This function provides the same functionality as the
-    SQL-standard concatenation operator (``||``).
-
-.. function:: concat_ws(string0, string1, ..., stringN) -> varchar
-
-    Returns the concatenation of ``string1``, ``string2``, ``...``, ``stringN``
-    using ``string0`` as a separator. If ``string0`` is null, then the return
-    value is null. Any null values provided in the arguments after the
-    separator are skipped.
-
-.. function:: concat_ws(string0, array(varchar)) -> varchar
-    :noindex:
-
-    Returns the concatenation of elements in the array using ``string0`` as a
-    separator. If ``string0`` is null, then the return value is null. Any
-    null values in the array are skipped.
-
-.. function:: format(format, args...) -> varchar
-    :noindex:
-
-    See :func:`format`.
-
-.. function:: hamming_distance(string1, string2) -> bigint
-
-    Returns the Hamming distance of ``string1`` and ``string2``,
-    i.e. the number of positions at which the corresponding characters are different.
-    Note that the two strings must have the same length.
-
-.. function:: length(string) -> bigint
-
-    Returns the length of ``string`` in characters.
-
-.. function:: levenshtein_distance(string1, string2) -> bigint
-
-    Returns the Levenshtein edit distance of ``string1`` and ``string2``,
-    i.e. the minimum number of single-character edits (insertions,
-    deletions or substitutions) needed to change ``string1`` into ``string2``.
-
-.. function:: lower(string) -> varchar
-
-    Converts ``string`` to lowercase.
-
-.. function:: lpad(string, size, padstring) -> varchar
-
-    Left pads ``string`` to ``size`` characters with ``padstring``.
-    If ``size`` is less than the length of ``string``, the result is
-    truncated to ``size`` characters. ``size`` must not be negative
-    and ``padstring`` must be non-empty.
-
-.. function:: ltrim(string) -> varchar
-
-    Removes leading whitespace from ``string``.
-
-.. function:: luhn_check(string) -> boolean
-
-    Tests whether a ``string`` of digits is valid according to the
-    `Luhn algorithm <https://wikipedia.org/wiki/Luhn_algorithm>`_.
-
-    This checksum function, also known as ``modulo 10`` or ``mod 10``, is
-    widely applied on credit card numbers and government identification numbers
-    to distinguish valid numbers from mistyped, incorrect numbers.
-
-    Valid identification number::
-
-        select luhn_check('79927398713');
-        -- true
-
-    Invalid identification number::
-
-        select luhn_check('79927398714');
-        -- false
-
-
-.. function:: position(substring IN string) -> bigint
-
-    Returns the starting position of the first instance of ``substring`` in
-    ``string``. Positions start with ``1``. If not found, ``0`` is returned.
-
-    .. note::
-
-        This SQL-standard function has special syntax and uses the
-        ``IN`` keyword for the arguments. See also :func:`strpos`.
-
-.. function:: replace(string, search) -> varchar
-
-    Removes all instances of ``search`` from ``string``.
-
-.. function:: replace(string, search, replace) -> varchar
-    :noindex:
-
-    Replaces all instances of ``search`` with ``replace`` in ``string``.
-
-.. function:: reverse(string) -> varchar
-
-    Returns ``string`` with the characters in reverse order.
-
-.. function:: rpad(string, size, padstring) -> varchar
-
-    Right pads ``string`` to ``size`` characters with ``padstring``.
-    If ``size`` is less than the length of ``string``, the result is
-    truncated to ``size`` characters. ``size`` must not be negative
-    and ``padstring`` must be non-empty.
-
-.. function:: rtrim(string) -> varchar
-
-    Removes trailing whitespace from ``string``.
-
-.. function:: soundex(char) -> string
-
-   ``soundex`` returns a character string containing the phonetic representation of ``char``.
-    It is typically used to evaluate the similarity of two expressions phonetically, that is
-    how the string sounds when spoken::
-
-        SELECT name
-        FROM nation
-        WHERE SOUNDEX(name)  = SOUNDEX('CHYNA');
-
-         name  |
-        -------+----
-         CHINA |
-        (1 row)
-
-.. function:: split(string, delimiter) -> array(varchar)
-
-    Splits ``string`` on ``delimiter`` and returns an array.
-
-.. function:: split(string, delimiter, limit) -> array(varchar)
-    :noindex:
-
-    Splits ``string`` on ``delimiter`` and returns an array of size at most
-    ``limit``. The last element in the array always contain everything
-    left in the ``string``. ``limit`` must be a positive number.
-
-.. function:: split_part(string, delimiter, index) -> varchar
-
-    Splits ``string`` on ``delimiter`` and returns the field ``index``.
-    Field indexes start with ``1``. If the index is larger than
-    the number of fields, then null is returned.
-
-.. function:: split_to_map(string, entryDelimiter, keyValueDelimiter) -> map<varchar, varchar>
-
-    Splits ``string`` by ``entryDelimiter`` and ``keyValueDelimiter`` and returns a map.
-    ``entryDelimiter`` splits ``string`` into key-value pairs. ``keyValueDelimiter`` splits
-    each pair into key and value.
-
-.. function:: split_to_multimap(string, entryDelimiter, keyValueDelimiter) -> map(varchar, array(varchar))
-
-    Splits ``string`` by ``entryDelimiter`` and ``keyValueDelimiter`` and returns a map
-    containing an array of values for each unique key. ``entryDelimiter`` splits ``string``
-    into key-value pairs. ``keyValueDelimiter`` splits each pair into key and value. The
-    values for each key will be in the same order as they appeared in ``string``.
-
-.. function:: strpos(string, substring) -> bigint
-
-    Returns the starting position of the first instance of ``substring`` in
-    ``string``. Positions start with ``1``. If not found, ``0`` is returned.
-
-.. function:: strpos(string, substring, instance) -> bigint
-    :noindex:
-
-    Returns the position of the N-th ``instance`` of ``substring`` in ``string``.
-    When ``instance`` is a negative number the search will start from the end of ``string``.
-    Positions start with ``1``. If not found, ``0`` is returned.
-
-.. function:: starts_with(string, substring) -> boolean
-
-    Tests whether ``substring`` is a prefix of ``string``.
-
-.. function:: substr(string, start) -> varchar
-
-    This is an alias for :func:`substring`.
-
-.. function:: substring(string, start) -> varchar
-
-    Returns the rest of ``string`` from the starting position ``start``.
-    Positions start with ``1``. A negative starting position is interpreted
-    as being relative to the end of the string.
-
-.. function:: substr(string, start, length) -> varchar
-    :noindex:
-
-    This is an alias for :func:`substring`.
-
-.. function:: substring(string, start, length) -> varchar
-    :noindex:
-
-    Returns a substring from ``string`` of length ``length`` from the starting
-    position ``start``. Positions start with ``1``. A negative starting
-    position is interpreted as being relative to the end of the string.
-
-.. function:: translate(source, from, to) -> varchar
-
-   Returns the ``source`` string translated by replacing characters found in the
-   ``from`` string with the corresponding characters in the ``to`` string.  If the ``from``
-   string contains duplicates, only the first is used.  If the ``source`` character
-   does not exist in the ``from`` string, the ``source`` character will be copied
-   without translation.  If the index of the matching character in the ``from``
-   string is beyond the length of the ``to`` string, the ``source`` character will
-   be omitted from the resulting string.
-
-   Here are some examples illustrating the translate function::
-
-       SELECT translate('abcd', '', ''); -- 'abcd'
-       SELECT translate('abcd', 'a', 'z'); -- 'zbcd'
-       SELECT translate('abcda', 'a', 'z'); -- 'zbcdz'
-       SELECT translate('Palhoça', 'ç','c'); -- 'Palhoca'
-       SELECT translate('abcd', 'b', U&'\+01F600'); -- a😀cd
-       SELECT translate('abcd', 'a', ''); -- 'bcd'
-       SELECT translate('abcd', 'a', 'zy'); -- 'zbcd'
-       SELECT translate('abcd', 'ac', 'z'); -- 'zbd'
-       SELECT translate('abcd', 'aac', 'zq'); -- 'zbd'
-
-.. function:: trim(string) -> varchar
-    :noindex:
-
-    Removes leading and trailing whitespace from ``string``.
-
-.. function:: trim( [ [ specification ] [ string ] FROM ] source ) -> varchar
-
-    Removes any leading and/or trailing characters as specified up to and
-    including ``string`` from ``source``::
-
-      SELECT trim('!' FROM '!foo!'); -- 'foo'
-      SELECT trim(LEADING FROM '  abcd');  -- 'abcd'
-      SELECT trim(BOTH '$' FROM '$var$'); -- 'var'
-      SELECT trim(TRAILING 'ER' FROM upper('worker')); -- 'WORK'
-
-.. function:: upper(string) -> varchar
-
-    Converts ``string`` to uppercase.
-
-.. function:: word_stem(word) -> varchar
-
-    Returns the stem of ``word`` in the English language.
-
-.. function:: word_stem(word, lang) -> varchar
-    :noindex:
-
-    Returns the stem of ``word`` in the ``lang`` language.
-
-Unicode functions
------------------
-
-.. function:: normalize(string) -> varchar
-
-    Transforms ``string`` with NFC normalization form.
-
-.. function:: normalize(string, form) -> varchar
-    :noindex:
-
-    Transforms ``string`` with the specified normalization form.
-    ``form`` must be one of the following keywords:
-
-    ======== ===========
-    Form     Description
-    ======== ===========
-    ``NFD``  Canonical Decomposition
-    ``NFC``  Canonical Decomposition, followed by Canonical Composition
-    ``NFKD`` Compatibility Decomposition
-    ``NFKC`` Compatibility Decomposition, followed by Canonical Composition
-    ======== ===========
-
-    .. note::
-
-        This SQL-standard function has special syntax and requires
-        specifying ``form`` as a keyword, not as a string.
-
-.. function:: to_utf8(string) -> varbinary
-
-    Encodes ``string`` into a UTF-8 varbinary representation.
-
-.. function:: from_utf8(binary) -> varchar
-
-    Decodes a UTF-8 encoded string from ``binary``. Invalid UTF-8 sequences
-    are replaced with the Unicode replacement character ``U+FFFD``.
-
-.. function:: from_utf8(binary, replace) -> varchar
-    :noindex:
-
-    Decodes a UTF-8 encoded string from ``binary``. Invalid UTF-8 sequences
-    are replaced with ``replace``. The replacement string ``replace`` must either
-    be a single character or empty (in which case invalid characters are
-    removed).
diff --git a/docs/src/main/sphinx/functions/system.md b/docs/src/main/sphinx/functions/system.md
new file mode 100644
index 000000000000..c88dd45b5231
--- /dev/null
+++ b/docs/src/main/sphinx/functions/system.md
@@ -0,0 +1,10 @@
+# System information
+
+Functions providing information about the Trino cluster system environment. More
+information is available by querying the various schemas and tables exposed by
+the {doc}`/connector/system`.
+
+:::{function} version() -> varchar
+Returns the Trino version used on the cluster. Equivalent to the value of
+the `node_version` column in the `system.runtime.nodes` table.
+:::
diff --git a/docs/src/main/sphinx/functions/system.rst b/docs/src/main/sphinx/functions/system.rst
deleted file mode 100644
index 7d176eb2a572..000000000000
--- a/docs/src/main/sphinx/functions/system.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-==================
-System information
-==================
-
-Functions providing information about the Trino cluster system environment. More
-information is available by querying the various schemas and tables exposed by
-the :doc:`/connector/system`.
-
-.. function:: version() -> varchar
-
-    Returns the Trino version used on the cluster. Equivalent to the value of
-    the ``node_version`` column in the ``system.runtime.nodes`` table.
diff --git a/docs/src/main/sphinx/functions/table.md b/docs/src/main/sphinx/functions/table.md
new file mode 100644
index 000000000000..a06fa4f13efb
--- /dev/null
+++ b/docs/src/main/sphinx/functions/table.md
@@ -0,0 +1,192 @@
+# Table functions
+
+A table function is a function returning a table. It can be invoked inside the
+`FROM` clause of a query:
+
+```
+SELECT * FROM TABLE(my_function(1, 100))
+```
+
+The row type of the returned table can depend on the arguments passed with
+invocation of the function. If different row types can be returned, the
+function is a **polymorphic table function**.
+
+Polymorphic table functions allow you to dynamically invoke custom logic from
+within the SQL query. They can be used for working with external systems as
+well as for enhancing Trino with capabilities going beyond the SQL standard.
+
+For the list of built-in table functions available in Trino, see {ref}`built in
+table functions<built-in-table-functions>`.
+
+Trino supports adding custom table functions. They are declared by connectors
+through implementing dedicated interfaces. For guidance on adding new table
+functions, see the {doc}`developer guide</develop/table-functions>`.
+
+Connectors offer support for different functions on a per-connector basis. For
+more information about supported table functions, refer to the {doc}`connector
+documentation <../../connector>`.
+
+(built-in-table-functions)=
+
+## Built-in table functions
+
+:::{function} exclude_columns(input => table, columns => descriptor) -> table
+Excludes from `table` all columns listed in `descriptor`:
+
+```
+SELECT *
+FROM TABLE(exclude_columns(
+                        input => TABLE(orders),
+                        columns => DESCRIPTOR(clerk, comment)))
+```
+
+The argument `input` is a table or a query.
+The argument `columns` is a descriptor without types.
+:::
+
+(sequence-table-function)=
+
+:::{function} sequence(start => bigint, stop => bigint, step => bigint) -> table(sequential_number bigint)
+:noindex: true
+
+Returns a single column `sequential_number` containing a sequence of
+bigint:
+
+```
+SELECT *
+FROM TABLE(sequence(
+                start => 1000000,
+                stop => -2000000,
+                step => -3))
+```
+
+`start` is the first element in te sequence. The default value is `0`.
+
+`stop` is the end of the range, inclusive. The last element in the
+sequence is equal to `stop`, or it is the last value within range,
+reachable by steps.
+
+`step` is the difference between subsequent values. The default value is
+`1`.
+:::
+
+:::{note}
+The result of the `sequence` table function might not be ordered.
+:::
+
+## Table function invocation
+
+You invoke a table function in the `FROM` clause of a query. Table function
+invocation syntax is similar to a scalar function call.
+
+### Function resolution
+
+Every table function is provided by a catalog, and it belongs to a schema in
+the catalog. You can qualify the function name with a schema name, or with
+catalog and schema names:
+
+```
+SELECT * FROM TABLE(schema_name.my_function(1, 100))
+SELECT * FROM TABLE(catalog_name.schema_name.my_function(1, 100))
+```
+
+Otherwise, the standard Trino name resolution is applied. The connection
+between the function and the catalog must be identified, because the function
+is executed by the corresponding connector. If the function is not registered
+by the specified catalog, the query fails.
+
+The table function name is resolved case-insensitive, analogically to scalar
+function and table resolution in Trino.
+
+### Arguments
+
+There are three types of arguments.
+
+1. Scalar arguments
+
+They must be constant expressions, and they can be of any SQL type, which is
+compatible with the declared argument type:
+
+```
+factor => 42
+```
+
+2. Descriptor arguments
+
+Descriptors consist of fields with names and optional data types:
+
+```
+schema => DESCRIPTOR(id BIGINT, name VARCHAR)
+columns => DESCRIPTOR(date, status, comment)
+```
+
+To pass `null` for a descriptor, use:
+
+```
+schema => CAST(null AS DESCRIPTOR)
+```
+
+3. Table arguments
+
+You can pass a table name, or a query. Use the keyword `TABLE`:
+
+```
+input => TABLE(orders)
+data => TABLE(SELECT * FROM region, nation WHERE region.regionkey = nation.regionkey)
+```
+
+If the table argument is declared as {ref}`set semantics<tf-set-or-row-semantics>`,
+you can specify partitioning and ordering. Each partition is processed
+independently by the table function. If you do not specify partitioning, the
+argument is processed as a single partition. You can also specify
+`PRUNE WHEN EMPTY` or `KEEP WHEN EMPTY`. With `PRUNE WHEN EMPTY` you
+declare that you are not interested in the function result if the argument is
+empty. This information is used by the Trino engine to optimize the query. The
+`KEEP WHEN EMPTY` option indicates that the function should be executed even
+if the table argument is empty. Note that by specifying `KEEP WHEN EMPTY` or
+`PRUNE WHEN EMPTY`, you override the property set for the argument by the
+function author.
+
+The following example shows how the table argument properties should be ordered:
+
+```
+input => TABLE(orders)
+                    PARTITION BY orderstatus
+                    KEEP WHEN EMPTY
+                    ORDER BY orderdate
+```
+
+### Argument passing conventions
+
+There are two conventions of passing arguments to a table function:
+
+- **Arguments passed by name**:
+
+  ```
+  SELECT * FROM TABLE(my_function(row_count => 100, column_count => 1))
+  ```
+
+In this convention, you can pass the arguments in arbitrary order. Arguments
+declared with default values can be skipped. Argument names are resolved
+case-sensitive, and with automatic uppercasing of unquoted names.
+
+- **Arguments passed positionally**:
+
+  ```
+  SELECT * FROM TABLE(my_function(1, 100))
+  ```
+
+In this convention, you must follow the order in which the arguments are
+declared. You can skip a suffix of the argument list, provided that all the
+skipped arguments are declared with default values.
+
+You cannot mix the argument conventions in one invocation.
+
+You can also use parameters in arguments:
+
+```
+PREPARE stmt FROM
+SELECT * FROM TABLE(my_function(row_count => ? + 1, column_count => ?));
+
+EXECUTE stmt USING 100, 1;
+```
diff --git a/docs/src/main/sphinx/functions/table.rst b/docs/src/main/sphinx/functions/table.rst
deleted file mode 100644
index b53068728174..000000000000
--- a/docs/src/main/sphinx/functions/table.rst
+++ /dev/null
@@ -1,147 +0,0 @@
-===============
-Table functions
-===============
-
-A table function is a function returning a table. It can be invoked inside the
-``FROM`` clause of a query::
-
-    SELECT * FROM TABLE(my_function(1, 100))
-
-The row type of the returned table can depend on the arguments passed with
-invocation of the function. If different row types can be returned, the
-function is a **polymorphic table function**.
-
-Polymorphic table functions allow you to dynamically invoke custom logic from
-within the SQL query. They can be used for working with external systems as
-well as for enhancing Trino with capabilities going beyond the SQL standard.
-
-For the list of built-in table functions available in Trino, see :ref:`built in
-table functions<built_in_table_functions>`.
-
-Trino supports adding custom table functions. They are declared by connectors
-through implementing dedicated interfaces. For guidance on adding new table
-functions, see the :doc:`developer guide</develop/table-functions>`.
-
-Connectors offer support for different functions on a per-connector basis. For
-more information about supported table functions, refer to the :doc:`connector
-documentation <../../connector>`.
-
-.. _built_in_table_functions:
-
-Built-in table functions
-------------------------
-
-.. function:: exclude_columns(input => table, columns => descriptor) -> table
-
-    Excludes from ``table`` all columns listed in ``descriptor``::
-
-        SELECT *
-        FROM TABLE(exclude_columns(
-                                input => TABLE(orders),
-                                columns => DESCRIPTOR(clerk, comment)))
-
-    The argument ``input`` is a table or a query.
-    The argument ``columns`` is a descriptor without types.
-
-Table function invocation
--------------------------
-
-You invoke a table function in the ``FROM`` clause of a query. Table function
-invocation syntax is similar to a scalar function call.
-
-Function resolution
-^^^^^^^^^^^^^^^^^^^
-
-Every table function is provided by a catalog, and it belongs to a schema in
-the catalog. You can qualify the function name with a schema name, or with
-catalog and schema names::
-
-    SELECT * FROM TABLE(schema_name.my_function(1, 100))
-    SELECT * FROM TABLE(catalog_name.schema_name.my_function(1, 100))
-
-Otherwise, the standard Trino name resolution is applied. The connection
-between the function and the catalog must be identified, because the function
-is executed by the corresponding connector. If the function is not registered
-by the specified catalog, the query fails.
-
-The table function name is resolved case-insensitive, analogically to scalar
-function and table resolution in Trino.
-
-Arguments
-^^^^^^^^^
-
-There are three types of arguments.
-
-1. Scalar arguments
-
-They must be constant expressions, and they can be of any SQL type, which is
-compatible with the declared argument type::
-
-    factor => 42
-
-2. Descriptor arguments
-
-Descriptors consist of fields with names and optional data types::
-
-    schema => DESCRIPTOR(id BIGINT, name VARCHAR)
-    columns => DESCRIPTOR(date, status, comment)
-
-To pass ``null`` for a descriptor, use::
-
-    schema => CAST(null AS DESCRIPTOR)
-
-3. Table arguments
-
-You can pass a table name, or a query. Use the keyword ``TABLE``::
-
-    input => TABLE(orders)
-    data => TABLE(SELECT * FROM region, nation WHERE region.regionkey = nation.regionkey)
-
-If the table argument is declared as :ref:`set semantics<tf_set_or_row_semantics>`,
-you can specify partitioning and ordering. Each partition is processed
-independently by the table function. If you do not specify partitioning, the
-argument is processed as a single partition. You can also specify
-``PRUNE WHEN EMPTY`` or ``KEEP WHEN EMPTY``. With ``PRUNE WHEN EMPTY`` you
-declare that you are not interested in the function result if the argument is
-empty. This information is used by the Trino engine to optimize the query. The
-``KEEP WHEN EMPTY`` option indicates that the function should be executed even
-if the table argument is empty. Note that by specifying ``KEEP WHEN EMPTY`` or
-``PRUNE WHEN EMPTY``, you override the property set for the argument by the
-function author.
-
-The following example shows how the table argument properties should be ordered::
-
-    input => TABLE(orders)
-                        PARTITION BY orderstatus
-                        KEEP WHEN EMPTY
-                        ORDER BY orderdate
-
-Argument passing conventions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-There are two conventions of passing arguments to a table function:
-
-- **Arguments passed by name**::
-
-    SELECT * FROM TABLE(my_function(row_count => 100, column_count => 1))
-
-In this convention, you can pass the arguments in arbitrary order. Arguments
-declared with default values can be skipped. Argument names are resolved
-case-sensitive, and with automatic uppercasing of unquoted names.
-
-- **Arguments passed positionally**::
-
-    SELECT * FROM TABLE(my_function(1, 100))
-
-In this convention, you must follow the order in which the arguments are
-declared. You can skip a suffix of the argument list, provided that all the
-skipped arguments are declared with default values.
-
-You cannot mix the argument conventions in one invocation.
-
-You can also use parameters in arguments::
-
-    PREPARE stmt FROM
-    SELECT * FROM TABLE(my_function(row_count => ? + 1, column_count => ?));
-
-    EXECUTE stmt USING 100, 1;
diff --git a/docs/src/main/sphinx/functions/tdigest.md b/docs/src/main/sphinx/functions/tdigest.md
new file mode 100644
index 000000000000..84d5d3a1e71b
--- /dev/null
+++ b/docs/src/main/sphinx/functions/tdigest.md
@@ -0,0 +1,44 @@
+# T-Digest functions
+
+## Data structures
+
+A T-digest is a data sketch which stores approximate percentile
+information.  The Trino type for this data structure is called `tdigest`.
+T-digests can be merged, and for storage and retrieval they can be cast
+to and from `VARBINARY`.
+
+## Functions
+
+:::{function} merge(tdigest) -> tdigest
+:noindex: true
+
+Aggregates all inputs into a single `tdigest`.
+:::
+
+:::{function} value_at_quantile(tdigest, quantile) -> double
+:noindex: true
+
+Returns the approximate percentile value from the T-digest, given
+the number `quantile` between 0 and 1.
+:::
+
+:::{function} values_at_quantiles(tdigest, quantiles) -> array(double)
+:noindex: true
+
+Returns the approximate percentile values as an array, given the input
+T-digest and an array of values between 0 and 1, which
+represent the quantiles to return.
+:::
+
+:::{function} tdigest_agg(x) -> tdigest
+Composes all input values of `x` into a `tdigest`. `x` can be
+of any numeric type.
+:::
+
+:::{function} tdigest_agg(x, w) -> tdigest
+:noindex: true
+
+Composes all input values of `x` into a `tdigest` using
+the per-item weight `w`. `w` must be greater or equal than 1.
+`x` and `w` can be of any numeric type.
+:::
diff --git a/docs/src/main/sphinx/functions/tdigest.rst b/docs/src/main/sphinx/functions/tdigest.rst
deleted file mode 100644
index 8419591c28e6..000000000000
--- a/docs/src/main/sphinx/functions/tdigest.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-=========================
-T-Digest functions
-=========================
-
-Data structures
----------------
-
-A T-digest is a data sketch which stores approximate percentile
-information.  The Trino type for this data structure is called ``tdigest``.
-T-digests can be merged, and for storage and retrieval they can be cast
-to and from ``VARBINARY``.
-
-Functions
----------
-
-.. function:: merge(tdigest) -> tdigest
-    :noindex:
-
-    Aggregates all inputs into a single ``tdigest``.
-
-.. function:: value_at_quantile(tdigest, quantile) -> double
-    :noindex:
-
-    Returns the approximate percentile value from the T-digest, given
-    the number ``quantile`` between 0 and 1.
-
-.. function:: values_at_quantiles(tdigest, quantiles) -> array(double)
-    :noindex:
-
-    Returns the approximate percentile values as an array, given the input
-    T-digest and an array of values between 0 and 1, which
-    represent the quantiles to return.
-
-.. function:: tdigest_agg(x) -> tdigest
-
-    Composes all input values of ``x`` into a ``tdigest``. ``x`` can be
-    of any numeric type.
-
-.. function:: tdigest_agg(x, w) -> tdigest
-    :noindex:
-
-    Composes all input values of ``x`` into a ``tdigest`` using
-    the per-item weight ``w``. ``w`` must be greater or equal than 1.
-    ``x`` and ``w`` can be of any numeric type.
diff --git a/docs/src/main/sphinx/functions/teradata.md b/docs/src/main/sphinx/functions/teradata.md
new file mode 100644
index 000000000000..d1218deb0cd6
--- /dev/null
+++ b/docs/src/main/sphinx/functions/teradata.md
@@ -0,0 +1,47 @@
+# Teradata functions
+
+These functions provide compatibility with Teradata SQL.
+
+## String functions
+
+:::{function} char2hexint(string) -> varchar
+Returns the hexadecimal representation of the UTF-16BE encoding of the string.
+:::
+
+:::{function} index(string, substring) -> bigint
+Alias for {func}`strpos` function.
+:::
+
+## Date functions
+
+The functions in this section use a format string that is compatible with
+the Teradata datetime functions. The following table, based on the
+Teradata reference manual, describes the supported format specifiers:
+
+| Specifier     | Description                        |
+| ------------- | ---------------------------------- |
+| `- / , . ; :` | Punctuation characters are ignored |
+| `dd`          | Day of month (1-31)                |
+| `hh`          | Hour of day (1-12)                 |
+| `hh24`        | Hour of the day (0-23)             |
+| `mi`          | Minute (0-59)                      |
+| `mm`          | Month (01-12)                      |
+| `ss`          | Second (0-59)                      |
+| `yyyy`        | 4-digit year                       |
+| `yy`          | 2-digit year                       |
+
+:::{warning}
+Case insensitivity is not currently supported. All specifiers must be lowercase.
+:::
+
+:::{function} to_char(timestamp, format) -> varchar
+Formats `timestamp` as a string using `format`.
+:::
+
+:::{function} to_timestamp(string, format) -> timestamp
+Parses `string` into a `TIMESTAMP` using `format`.
+:::
+
+:::{function} to_date(string, format) -> date
+Parses `string` into a `DATE` using `format`.
+:::
diff --git a/docs/src/main/sphinx/functions/teradata.rst b/docs/src/main/sphinx/functions/teradata.rst
deleted file mode 100644
index 19870d0a1c1c..000000000000
--- a/docs/src/main/sphinx/functions/teradata.rst
+++ /dev/null
@@ -1,51 +0,0 @@
-==================
-Teradata functions
-==================
-
-These functions provide compatibility with Teradata SQL.
-
-String functions
-----------------
-
-.. function:: char2hexint(string) -> varchar
-
-    Returns the hexadecimal representation of the UTF-16BE encoding of the string.
-
-.. function:: index(string, substring) -> bigint
-
-    Alias for :func:`strpos` function.
-
-Date functions
---------------
-
-The functions in this section use a format string that is compatible with
-the Teradata datetime functions. The following table, based on the
-Teradata reference manual, describes the supported format specifiers:
-
-=============== ===========
-Specifier       Description
-=============== ===========
-``- / , . ; :`` Punctuation characters are ignored
-``dd``          Day of month (1-31)
-``hh``          Hour of day (1-12)
-``hh24``        Hour of the day (0-23)
-``mi``          Minute (0-59)
-``mm``          Month (01-12)
-``ss``          Second (0-59)
-``yyyy``        4-digit year
-``yy``          2-digit year
-=============== ===========
-
-.. warning:: Case insensitivity is not currently supported. All specifiers must be lowercase.
-
-.. function:: to_char(timestamp, format) -> varchar
-
-    Formats ``timestamp`` as a string using ``format``.
-
-.. function:: to_timestamp(string, format) -> timestamp
-
-    Parses ``string`` into a ``TIMESTAMP`` using ``format``.
-
-.. function:: to_date(string, format) -> date
-
-    Parses ``string`` into a ``DATE`` using ``format``.
diff --git a/docs/src/main/sphinx/functions/url.md b/docs/src/main/sphinx/functions/url.md
new file mode 100644
index 000000000000..9455784bdb3f
--- /dev/null
+++ b/docs/src/main/sphinx/functions/url.md
@@ -0,0 +1,74 @@
+# URL functions
+
+## Extraction functions
+
+The URL extraction functions extract components from HTTP URLs
+(or any valid URIs conforming to {rfc}`2396`).
+The following syntax is supported:
+
+```text
+[protocol:][//host[:port]][path][?query][#fragment]
+```
+
+The extracted components do not contain URI syntax separators
+such as `:` or `?`.
+
+:::{function} url_extract_fragment(url) -> varchar
+Returns the fragment identifier from `url`.
+:::
+
+:::{function} url_extract_host(url) -> varchar
+Returns the host from `url`.
+:::
+
+:::{function} url_extract_parameter(url, name) -> varchar
+Returns the value of the first query string parameter named `name`
+from `url`. Parameter extraction is handled in the typical manner
+as specified by {rfc}`1866#section-8.2.1`.
+:::
+
+:::{function} url_extract_path(url) -> varchar
+Returns the path from `url`.
+:::
+
+:::{function} url_extract_port(url) -> bigint
+Returns the port number from `url`.
+:::
+
+:::{function} url_extract_protocol(url) -> varchar
+Returns the protocol from `url`:
+
+```
+SELECT url_extract_protocol('http://localhost:8080/req_path');
+-- http
+
+SELECT url_extract_protocol('https://127.0.0.1:8080/req_path');
+-- https
+
+SELECT url_extract_protocol('ftp://path/file');
+-- ftp
+```
+:::
+
+:::{function} url_extract_query(url) -> varchar
+Returns the query string from `url`.
+:::
+
+## Encoding functions
+
+:::{function} url_encode(value) -> varchar
+Escapes `value` by encoding it so that it can be safely included in
+URL query parameter names and values:
+
+- Alphanumeric characters are not encoded.
+- The characters `.`, `-`, `*` and `_` are not encoded.
+- The ASCII space character is encoded as `+`.
+- All other characters are converted to UTF-8 and the bytes are encoded
+  as the string `%XX` where `XX` is the uppercase hexadecimal
+  value of the UTF-8 byte.
+:::
+
+:::{function} url_decode(value) -> varchar
+Unescapes the URL encoded `value`.
+This function is the inverse of {func}`url_encode`.
+:::
diff --git a/docs/src/main/sphinx/functions/url.rst b/docs/src/main/sphinx/functions/url.rst
deleted file mode 100644
index 0cd1622f80af..000000000000
--- a/docs/src/main/sphinx/functions/url.rst
+++ /dev/null
@@ -1,76 +0,0 @@
-=============
-URL functions
-=============
-
-Extraction functions
---------------------
-
-The URL extraction functions extract components from HTTP URLs
-(or any valid URIs conforming to :rfc:`2396`).
-The following syntax is supported:
-
-.. code-block:: text
-
-    [protocol:][//host[:port]][path][?query][#fragment]
-
-The extracted components do not contain URI syntax separators
-such as ``:`` or ``?``.
-
-.. function:: url_extract_fragment(url) -> varchar
-
-    Returns the fragment identifier from ``url``.
-
-.. function:: url_extract_host(url) -> varchar
-
-    Returns the host from ``url``.
-
-.. function:: url_extract_parameter(url, name) -> varchar
-
-    Returns the value of the first query string parameter named ``name``
-    from ``url``. Parameter extraction is handled in the typical manner
-    as specified by :rfc:`1866#section-8.2.1`.
-
-.. function:: url_extract_path(url) -> varchar
-
-    Returns the path from ``url``.
-
-.. function:: url_extract_port(url) -> bigint
-
-    Returns the port number from ``url``.
-
-.. function:: url_extract_protocol(url) -> varchar
-
-    Returns the protocol from ``url``::
-
-        SELECT url_extract_protocol('http://localhost:8080/req_path');
-        -- http
-
-        SELECT url_extract_protocol('https://127.0.0.1:8080/req_path');
-        -- https
-
-        SELECT url_extract_protocol('ftp://path/file');
-        -- ftp
-
-.. function:: url_extract_query(url) -> varchar
-
-    Returns the query string from ``url``.
-
-Encoding functions
-------------------
-
-.. function:: url_encode(value) -> varchar
-
-    Escapes ``value`` by encoding it so that it can be safely included in
-    URL query parameter names and values:
-
-    * Alphanumeric characters are not encoded.
-    * The characters ``.``, ``-``, ``*`` and ``_`` are not encoded.
-    * The ASCII space character is encoded as ``+``.
-    * All other characters are converted to UTF-8 and the bytes are encoded
-      as the string ``%XX`` where ``XX`` is the uppercase hexadecimal
-      value of the UTF-8 byte.
-
-.. function:: url_decode(value) -> varchar
-
-    Unescapes the URL encoded ``value``.
-    This function is the inverse of :func:`url_encode`.
diff --git a/docs/src/main/sphinx/functions/uuid.md b/docs/src/main/sphinx/functions/uuid.md
new file mode 100644
index 000000000000..c0cf1dc34d3d
--- /dev/null
+++ b/docs/src/main/sphinx/functions/uuid.md
@@ -0,0 +1,5 @@
+# UUID functions
+
+:::{function} uuid() -> uuid
+Returns a pseudo randomly generated {ref}`uuid-type` (type 4).
+:::
diff --git a/docs/src/main/sphinx/functions/uuid.rst b/docs/src/main/sphinx/functions/uuid.rst
deleted file mode 100644
index 046319546f05..000000000000
--- a/docs/src/main/sphinx/functions/uuid.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-==============
-UUID functions
-==============
-
-.. function:: uuid() -> uuid
-
-    Returns a pseudo randomly generated :ref:`uuid_type` (type 4).
diff --git a/docs/src/main/sphinx/functions/window.md b/docs/src/main/sphinx/functions/window.md
new file mode 100644
index 000000000000..f5b786b6b9a6
--- /dev/null
+++ b/docs/src/main/sphinx/functions/window.md
@@ -0,0 +1,127 @@
+# Window functions
+
+Window functions perform calculations across rows of the query result.
+They run after the `HAVING` clause but before the `ORDER BY` clause.
+Invoking a window function requires special syntax using the `OVER`
+clause to specify the window.
+For example, the following query ranks orders for each clerk by price:
+
+```
+SELECT orderkey, clerk, totalprice,
+       rank() OVER (PARTITION BY clerk
+                    ORDER BY totalprice DESC) AS rnk
+FROM orders
+ORDER BY clerk, rnk
+```
+
+The window can be specified in two ways (see {ref}`window-clause`):
+
+- By a reference to a named window specification defined in the `WINDOW` clause,
+- By an in-line window specification which allows to define window components
+  as well as refer to the window components pre-defined in the `WINDOW` clause.
+
+## Aggregate functions
+
+All {doc}`aggregate` can be used as window functions by adding the `OVER`
+clause. The aggregate function is computed for each row over the rows within
+the current row's window frame.
+
+For example, the following query produces a rolling sum of order prices
+by day for each clerk:
+
+```
+SELECT clerk, orderdate, orderkey, totalprice,
+       sum(totalprice) OVER (PARTITION BY clerk
+                             ORDER BY orderdate) AS rolling_sum
+FROM orders
+ORDER BY clerk, orderdate, orderkey
+```
+
+## Ranking functions
+
+:::{function} cume_dist() -> bigint
+Returns the cumulative distribution of a value in a group of values.
+The result is the number of rows preceding or peer with the row in the
+window ordering of the window partition divided by the total number of
+rows in the window partition. Thus, any tie values in the ordering will
+evaluate to the same distribution value.
+:::
+
+:::{function} dense_rank() -> bigint
+Returns the rank of a value in a group of values. This is similar to
+{func}`rank`, except that tie values do not produce gaps in the sequence.
+:::
+
+:::{function} ntile(n) -> bigint
+Divides the rows for each window partition into `n` buckets ranging
+from `1` to at most `n`. Bucket values will differ by at most `1`.
+If the number of rows in the partition does not divide evenly into the
+number of buckets, then the remainder values are distributed one per
+bucket, starting with the first bucket.
+
+For example, with `6` rows and `4` buckets, the bucket values would
+be as follows: `1` `1` `2` `2` `3` `4`
+:::
+
+:::{function} percent_rank() -> double
+Returns the percentage ranking of a value in group of values. The result
+is `(r - 1) / (n - 1)` where `r` is the {func}`rank` of the row and
+`n` is the total number of rows in the window partition.
+:::
+
+:::{function} rank() -> bigint
+Returns the rank of a value in a group of values. The rank is one plus
+the number of rows preceding the row that are not peer with the row.
+Thus, tie values in the ordering will produce gaps in the sequence.
+The ranking is performed for each window partition.
+:::
+
+:::{function} row_number() -> bigint
+Returns a unique, sequential number for each row, starting with one,
+according to the ordering of rows within the window partition.
+:::
+
+## Value functions
+
+By default, null values are respected. If `IGNORE NULLS` is specified, all rows where
+`x` is null are excluded from the calculation. If `IGNORE NULLS` is specified and `x`
+is null for all rows, the `default_value` is returned, or if it is not specified,
+`null` is returned.
+
+:::{function} first_value(x) -> [same as input]
+Returns the first value of the window.
+:::
+
+:::{function} last_value(x) -> [same as input]
+Returns the last value of the window.
+:::
+
+:::{function} nth_value(x, offset) -> [same as input]
+Returns the value at the specified offset from the beginning of the window.
+Offsets start at `1`. The offset can be any scalar
+expression.  If the offset is null or greater than the number of values in
+the window, `null` is returned.  It is an error for the offset to be zero or
+negative.
+:::
+
+:::{function} lead(x[, offset [, default_value]]) -> [same as input]
+Returns the value at `offset` rows after the current row in the window partition.
+Offsets start at `0`, which is the current row. The
+offset can be any scalar expression.  The default `offset` is `1`. If the
+offset is null, an error is raised. If the offset refers to a row that is not
+within the partition, the `default_value` is returned, or if it is not specified
+`null` is returned.
+The {func}`lead` function requires that the window ordering be specified.
+Window frame must not be specified.
+:::
+
+:::{function} lag(x[, offset [, default_value]]) -> [same as input]
+Returns the value at `offset` rows before the current row in the window partition.
+Offsets start at `0`, which is the current row. The
+offset can be any scalar expression.  The default `offset` is `1`. If the
+offset is null, an error is raised. If the offset refers to a row that is not
+within the partition, the `default_value` is returned, or if it is not specified
+`null` is returned.
+The {func}`lag` function requires that the window ordering be specified.
+Window frame must not be specified.
+:::
diff --git a/docs/src/main/sphinx/functions/window.rst b/docs/src/main/sphinx/functions/window.rst
deleted file mode 100644
index 65e855cc094c..000000000000
--- a/docs/src/main/sphinx/functions/window.rst
+++ /dev/null
@@ -1,128 +0,0 @@
-================
-Window functions
-================
-
-Window functions perform calculations across rows of the query result.
-They run after the ``HAVING`` clause but before the ``ORDER BY`` clause.
-Invoking a window function requires special syntax using the ``OVER``
-clause to specify the window.
-For example, the following query ranks orders for each clerk by price::
-
-    SELECT orderkey, clerk, totalprice,
-           rank() OVER (PARTITION BY clerk
-                        ORDER BY totalprice DESC) AS rnk
-    FROM orders
-    ORDER BY clerk, rnk
-
-The window can be specified in two ways (see :ref:`window_clause`):
-
-* By a reference to a named window specification defined in the ``WINDOW`` clause,
-* By an in-line window specification which allows to define window components
-  as well as refer to the window components pre-defined in the ``WINDOW`` clause.
-
-Aggregate functions
--------------------
-
-All :doc:`aggregate` can be used as window functions by adding the ``OVER``
-clause. The aggregate function is computed for each row over the rows within
-the current row's window frame.
-
-For example, the following query produces a rolling sum of order prices
-by day for each clerk::
-
-    SELECT clerk, orderdate, orderkey, totalprice,
-           sum(totalprice) OVER (PARTITION BY clerk
-                                 ORDER BY orderdate) AS rolling_sum
-    FROM orders
-    ORDER BY clerk, orderdate, orderkey
-
-Ranking functions
------------------
-
-.. function:: cume_dist() -> bigint
-
-    Returns the cumulative distribution of a value in a group of values.
-    The result is the number of rows preceding or peer with the row in the
-    window ordering of the window partition divided by the total number of
-    rows in the window partition. Thus, any tie values in the ordering will
-    evaluate to the same distribution value.
-
-.. function:: dense_rank() -> bigint
-
-    Returns the rank of a value in a group of values. This is similar to
-    :func:`rank`, except that tie values do not produce gaps in the sequence.
-
-.. function:: ntile(n) -> bigint
-
-    Divides the rows for each window partition into ``n`` buckets ranging
-    from ``1`` to at most ``n``. Bucket values will differ by at most ``1``.
-    If the number of rows in the partition does not divide evenly into the
-    number of buckets, then the remainder values are distributed one per
-    bucket, starting with the first bucket.
-
-    For example, with ``6`` rows and ``4`` buckets, the bucket values would
-    be as follows: ``1`` ``1`` ``2`` ``2`` ``3`` ``4``
-
-.. function:: percent_rank() -> double
-
-    Returns the percentage ranking of a value in group of values. The result
-    is ``(r - 1) / (n - 1)`` where ``r`` is the :func:`rank` of the row and
-    ``n`` is the total number of rows in the window partition.
-
-.. function:: rank() -> bigint
-
-    Returns the rank of a value in a group of values. The rank is one plus
-    the number of rows preceding the row that are not peer with the row.
-    Thus, tie values in the ordering will produce gaps in the sequence.
-    The ranking is performed for each window partition.
-
-.. function:: row_number() -> bigint
-
-    Returns a unique, sequential number for each row, starting with one,
-    according to the ordering of rows within the window partition.
-
-Value functions
----------------
-
-By default, null values are respected. If ``IGNORE NULLS`` is specified, all rows where
-``x`` is null are excluded from the calculation. If ``IGNORE NULLS`` is specified and ``x``
-is null for all rows, the ``default_value`` is returned, or if it is not specified,
-``null`` is returned.
-
-.. function:: first_value(x) -> [same as input]
-
-    Returns the first value of the window.
-
-.. function:: last_value(x) -> [same as input]
-
-    Returns the last value of the window.
-
-.. function:: nth_value(x, offset) -> [same as input]
-
-    Returns the value at the specified offset from the beginning of the window.
-    Offsets start at ``1``. The offset can be any scalar
-    expression.  If the offset is null or greater than the number of values in
-    the window, ``null`` is returned.  It is an error for the offset to be zero or
-    negative.
-
-.. function:: lead(x[, offset [, default_value]]) -> [same as input]
-
-    Returns the value at ``offset`` rows after the current row in the window partition.
-    Offsets start at ``0``, which is the current row. The
-    offset can be any scalar expression.  The default ``offset`` is ``1``. If the
-    offset is null, ``null`` is returned. If the offset refers to a row that is not
-    within the partition, the ``default_value`` is returned, or if it is not specified
-    ``null`` is returned.
-    The :func:`lead` function requires that the window ordering be specified.
-    Window frame must not be specified.
-
-.. function:: lag(x[, offset [, default_value]]) -> [same as input]
-
-    Returns the value at ``offset`` rows before the current row in the window partition.
-    Offsets start at ``0``, which is the current row. The
-    offset can be any scalar expression.  The default ``offset`` is ``1``. If the
-    offset is null, ``null`` is returned. If the offset refers to a row that is not
-    within the partition, the ``default_value`` is returned, or if it is not specified
-    ``null`` is returned.
-    The :func:`lag` function requires that the window ordering be specified.
-    Window frame must not be specified.
diff --git a/docs/src/main/sphinx/glossary.md b/docs/src/main/sphinx/glossary.md
new file mode 100644
index 000000000000..a47d746740b1
--- /dev/null
+++ b/docs/src/main/sphinx/glossary.md
@@ -0,0 +1,213 @@
+# Glossary
+
+The glossary contains a list of key Trino terms and definitions.
+
+(glosscatalog)=
+
+Catalog
+
+: Catalogs define and name a configuration for connecting to a data source,
+  allowing users to query the connected data. Each catalog's configuration
+  specifies a {ref}`connector <glossConnector>` to define which data source
+  the catalog connects to. For more information about catalogs, see
+  {ref}`trino-concept-catalog`.
+
+(glosscert)=
+
+Certificate
+
+: A public key [certificate](https://wikipedia.org/wiki/Public_key_certificate) issued by a {ref}`CA
+  <glossCA>`, sometimes abbreviated as cert, that verifies the ownership of a
+  server's private keys. Certificate format is specified in the [X.509](https://wikipedia.org/wiki/X.509) standard.
+
+(glossca)=
+
+Certificate Authority (CA)
+
+: A trusted organization that signs and issues certificates. Its signatures
+  can be used to verify the validity of {ref}`certificates <glossCert>`.
+
+Cluster
+
+: A Trino cluster provides the resources to run queries against numerous data
+  sources. Clusters define the number of nodes, the configuration for the JVM
+  runtime, configured data sources, and others aspects. For more information,
+  see {ref}`trino-concept-cluster`.
+
+(glossconnector)=
+
+Connector
+
+: Translates data from a data source into Trino schemas, tables, columns,
+  rows, and data types. A {doc}`connector </connector>` is specific to a data
+  source, and is used in {ref}`catalog <glossCatalog>` configurations to
+  define what data source the catalog connects to. A connector is one of many
+  types of {ref}`plugins <glossPlugin>`
+
+Container
+
+: A lightweight virtual package of software that contains libraries, binaries,
+  code, configuration files, and other dependencies needed to deploy an
+  application. A running container does not include an operating system,
+  instead using the operating system of the host machine. To learn more, read
+  read about [containers](https://kubernetes.io/docs/concepts/containers/)
+  in the Kubernetes documentation.
+
+(glossdatasource)=
+
+Data source
+
+: A system from which data is retrieved - for example, PostgreSQL or Iceberg
+  on S3 data. In Trino, users query data sources with {ref}`catalogs
+  <glossCatalog>` that connect to each source. See
+  {ref}`trino-concept-data-sources` for more information.
+
+(glossdatavirtualization)=
+
+Data virtualization
+
+: [Data virtualization](https://wikipedia.org/wiki/Data_virtualization) is a
+  method of abstracting an interaction with multiple {ref}`heterogeneous data
+  sources <glossDataSource>`, without needing to know the distributed nature
+  of the data, its format, or any other technical details involved in
+  presenting the data.
+
+(glossgzip)=
+
+gzip
+
+: [gzip](https://wikipedia.org/wiki/Gzip) is a compression format and
+  software that compresses and decompresses files. This format is used several
+  ways in Trino, including deployment and compressing files in {ref}`object
+  storage <glossObjectStorage>`. The most common extension for gzip-compressed
+  files is `.gz`.
+
+(glosshdfs)=
+
+HDFS
+
+: [Hadoop Distributed Filesystem (HDFS)](https://wikipedia.org/wiki/Apache_Hadoop#HDFS) is a scalable {ref}`open
+  source <glossOpenSource>` filesystem that was one of the earliest
+  distributed big data systems created to store large amounts of data for the
+  [Hadoop ecosystem](https://wikipedia.org/wiki/Apache_Hadoop).
+
+(glossjks)=
+
+Java KeyStore (JKS)
+
+: The system of public key cryptography supported as one part of the Java
+  security APIs. The legacy JKS system recognizes keys and {ref}`certificates
+  <glossCert>` stored in *keystore* files, typically with the `.jks`
+  extension, and by default relies on a system-level list of {ref}`CAs
+  <glossCA>` in *truststore* files installed as part of the current Java
+  installation.
+
+Key
+
+: A cryptographic key specified as a pair of public and private strings
+  generally used in the context of {ref}`TLS <glossTLS>` to secure public
+  network traffic.
+
+(glosslb)=
+
+Load Balancer (LB)
+
+: Software or a hardware device that sits on a network edge and accepts
+  network connections on behalf of servers behind that wall, distributing
+  traffic across network and server infrastructure to balance the load on
+  networked services.
+
+(glossobjectstorage)=
+
+Object storage
+
+: [Object storage](https://en.wikipedia.org/wiki/Object_storage) is a file
+  storage mechanism. Examples of compatible object stores include the
+  following:
+
+  - [Amazon S3](https://aws.amazon.com/s3)
+  - [Google Cloud Storage](https://cloud.google.com/storage)
+  - [Azure Blob Storage](https://azure.microsoft.com/en-us/products/storage/blobs)
+  - [MinIO](https://min.io/) and other S3-compatible stores
+  - {ref}`HDFS <glossHDFS>`
+
+(glossopensource)=
+
+Open-source
+
+: Typically refers to [open-source software](https://wikipedia.org/wiki/Open-source_software). which is software that
+  has the source code made available for others to see, use, and contribute
+  to. Allowed usage varies depending on the license that the software is
+  licensed under. Trino is licensed under the [Apache license](https://wikipedia.org/wiki/Apache_License), and is therefore maintained
+  by a community of contributors from all across the globe.
+
+(glosspem)=
+
+PEM file format
+
+: A format for storing and sending cryptographic keys and certificates. PEM
+  format can contain both a key and its certificate, plus the chain of
+  certificates from authorities back to the root {ref}`CA <glossCA>`, or back
+  to a CA vendor's intermediate CA.
+
+(glosspkcs12)=
+
+PKCS #12
+
+: A binary archive used to store keys and certificates or certificate chains
+  that validate a key. [PKCS #12](https://wikipedia.org/wiki/PKCS_12) files
+  have `.p12` or `.pfx` extensions. This format is a less popular
+  alternative to {ref}`PEM <glossPEM>`.
+
+(glossplugin)=
+
+Plugin
+
+: A bundle of code implementing the Trino {doc}`Service Provider Interface
+  (SPI) </develop/spi-overview>` that is used to add new {ref}`connectors
+  <glossConnector>`, {doc}`data types </develop/types>`, {doc}`functions`,
+  {doc}`access control implementations </develop/system-access-control>`, and
+  other features of Trino.
+
+Presto and PrestoSQL
+
+: The old name for Trino. To learn more about the name change to Trino, read
+  [the history](<https://wikipedia.org/wiki/Trino_(SQL_query_engine)#History>).
+
+Query federation
+
+: A type of {ref}`data virtualization <glossDataVirtualization>` that provides a
+  common access point and data model across two or more heterogeneous data
+  sources. A popular data model used by many query federation engines is
+  translating different data sources to {ref}`SQL <glossSQL>` tables.
+
+(glossssl)=
+
+Secure Sockets Layer (SSL)
+
+: Now superseded by {ref}`TLS <glossTLS>`, but still recognized as the term
+  for what TLS does.
+
+(glosssql)=
+
+Structured Query Language (SQL)
+
+: The standard language used with relational databases. For more information,
+  see {doc}`SQL </language>`.
+
+Tarball
+
+: A common abbreviation for [TAR file](<https://wikipedia.org/wiki/Tar_(computing)>), which is a common software
+  distribution mechanism. This file format is a collection of multiple files
+  distributed as a single file, commonly compressed using {ref}`gzip
+  <glossGzip>` compression.
+
+(glosstls)=
+
+Transport Layer Security (TLS)
+
+: [TLS](https://wikipedia.org/wiki/Transport_Layer_Security) is a security
+  protocol designed to provide secure communications over a network. It is the
+  successor to {ref}`SSL <glossSSL>`, and used in many applications like
+  HTTPS, email, and Trino. These security topics use the term TLS to refer to
+  both TLS and SSL.
diff --git a/docs/src/main/sphinx/glossary.rst b/docs/src/main/sphinx/glossary.rst
deleted file mode 100644
index 2bedaff9c39a..000000000000
--- a/docs/src/main/sphinx/glossary.rst
+++ /dev/null
@@ -1,198 +0,0 @@
-========
-Glossary
-========
-
-The glossary contains a list of key Trino terms and definitions.
-
-.. _glossCatalog:
-
-Catalog
-    Catalogs define and name a configuration for connecting to a data source,
-    allowing users to query the connected data. Each catalog's configuration
-    specifies a :ref:`connector <glossConnector>` to define which data source
-    the catalog connects to. For more information about catalogs, see
-    :ref:`trino-concept-catalog`.
-
-.. _glossCert:
-
-Certificate
-    A public key `certificate
-    <https://wikipedia.org/wiki/Public_key_certificate>`_ issued by a :ref:`CA
-    <glossCA>`, sometimes abbreviated as cert, that verifies the ownership of a
-    server's private keys. Certificate format is specified in the `X.509
-    <https://wikipedia.org/wiki/X.509>`_ standard.
-
-.. _glossCA:
-
-Certificate Authority (CA)
-    A trusted organization that signs and issues certificates. Its signatures
-    can be used to verify the validity of :ref:`certificates <glossCert>`.
-
-Cluster
-    A Trino cluster provides the resources to run queries against numerous data
-    sources. Clusters define the number of nodes, the configuration for the JVM
-    runtime, configured data sources, and others aspects. For more information,
-    see :ref:`trino-concept-cluster`.
-
-.. _glossConnector:
-
-Connector
-    Translates data from a data source into Trino schemas, tables, columns,
-    rows, and data types. A :doc:`connector </connector>` is specific to a data
-    source, and is used in :ref:`catalog <glossCatalog>` configurations to
-    define what data source the catalog connects to. A connector is one of many
-    types of :ref:`plugins <glossPlugin>`
-
-Container
-    A lightweight virtual package of software that contains libraries, binaries,
-    code, configuration files, and other dependencies needed to deploy an
-    application. A running container does not include an operating system,
-    instead using the operating system of the host machine. To learn more, read
-    read about `containers <https://kubernetes.io/docs/concepts/containers/>`_
-    in the Kubernetes documentation.
-
-.. _glossDataSource:
-
-Data source
-    A system from which data is retrieved, for example, PostgreSQL or Iceberg on
-    S3 data. In Trino, users query data sources with :ref:`catalogs
-    <glossCatalog>` that connect to each source. See
-    :ref:`trino-concept-data-sources` for more information.
-
-.. _glossDataVirtualization:
-
-Data virtualization
-    `Data virtualization <https://wikipedia.org/wiki/Data_virtualization>`_ is a
-    method of abstracting an interaction with multiple :ref:`heterogeneous data
-    sources <glossDataSource>`, without needing to know the distributed nature
-    of the data, its format, or any other technical details involved in
-    presenting the data.
-
-.. _glossGzip:
-
-gzip
-    `gzip <https://wikipedia.org/wiki/Gzip>`_ is a compression format and
-    software that compresses and decompresses files. This format is used several
-    ways in Trino, including deployment and compressing files in :ref:`object
-    storage <glossObjectStorage>`. The most common extension for gzip-compressed
-    files is ``.gz``.
-
-.. _glossHDFS:
-
-HDFS
-    `Hadoop Distributed Filesystem (HDFS)
-    <https://wikipedia.org/wiki/Apache_Hadoop#HDFS>`_ is a scalable :ref:`open
-    source <glossOpenSource>` filesystem that was one of the earliest
-    distributed big data systems created to store large amounts of data for the
-    `Hadoop ecosystem <https://wikipedia.org/wiki/Apache_Hadoop>`_.
-
-.. _glossJKS:
-
-Java KeyStore (JKS)
-    The system of public key cryptography supported as one part of the Java
-    security APIs. The legacy JKS system recognizes keys and :ref:`certificates
-    <glossCert>` stored in *keystore* files, typically with the ``.jks``
-    extension, and by default relies on a system-level list of :ref:`CAs
-    <glossCA>` in *truststore* files installed as part of the current Java
-    installation.
-
-Key
-    A cryptographic key specified as a pair of public and private strings
-    generally used in the context of :ref:`TLS <glossTLS>` to secure public
-    network traffic.
-
-.. _glossLB:
-
-Load Balancer (LB)
-    Software or a hardware device that sits on a network edge and accepts
-    network connections on behalf of servers behind that wall, distributing
-    traffic across network and server infrastructure to balance the load on
-    networked services.
-
-.. _glossObjectStorage:
-
-Object storage
-    `Object storage <https://en.wikipedia.org/wiki/Object_storage>`_ is a file
-    storage mechanism. Examples of compatible object stores include the
-    following:
-
-    * `Amazon S3 <https://aws.amazon.com/s3>`_
-    * `Google Cloud Storage <https://cloud.google.com/storage>`_
-    * `Azure Blob Storage <https://azure.microsoft.com/en-us/products/storage/blobs>`_
-    * `MinIO <https://min.io/>`_ and other S3-compatible stores
-    * :ref:`HDFS <glossHDFS>`
-
-.. _glossOpenSource:
-
-Open-source
-    Typically refers to `open-source software
-    <https://wikipedia.org/wiki/Open-source_software>`_. which is software that
-    has the source code made available for others to see, use, and contribute
-    to. Allowed usage varies depending on the license that the software is
-    licensed under. Trino is licensed under the `Apache license
-    <https://wikipedia.org/wiki/Apache_License>`_, and is therefore maintained
-    by a community of contributors from all across the globe.
-
-.. _glossPEM:
-
-PEM file format
-    A format for storing and sending cryptographic keys and certificates. PEM
-    format can contain both a key and its certificate, plus the chain of
-    certificates from authorities back to the root :ref:`CA <glossCA>`, or back
-    to a CA vendor's intermediate CA.
-
-.. _glossPKCS12:
-
-PKCS #12
-    A binary archive used to store keys and certificates or certificate chains
-    that validate a key. `PKCS #12 <https://wikipedia.org/wiki/PKCS_12>`_ files
-    have ``.p12`` or ``.pfx`` extensions. This format is a less popular
-    alternative to :ref:`PEM <glossPEM>`.
-
-.. _glossPlugin:
-
-Plugin
-    A bundle of code implementing the Trino :doc:`Service Provider Interface
-    (SPI) </develop/spi-overview>` that is used to add new :ref:`connectors
-    <glossConnector>`, :doc:`data types </develop/types>`, :doc:`functions`,
-    :doc:`access control implementations </develop/system-access-control>`, and
-    other features of Trino.
-
-Presto and PrestoSQL
-    The old name for Trino. To learn more about the name change to Trino, read
-    `the history
-    <https://wikipedia.org/wiki/Trino_(SQL_query_engine)#History>`_.
-
-Query Federation
-  A type of :ref:`data virtualization <glossDataVirtualization>` that provides a
-  common access point and data model across two or more heterogeneous data
-  sources. A popular data model used by many query federation engines is
-  translating different data sources to :ref:`SQL <glossSQL>` tables.
-
-.. _glossSSL:
-
-Secure Sockets Layer (SSL)
-    Now superseded by :ref:`TLS <glossTLS>`, but still recognized as the term
-    for what TLS does.
-
-.. _glossSQL:
-
-Structured Query Language (SQL)
-    The standard language used with relational databases. For more information,
-    see :doc:`SQL </language>`.
-
-Tarball
-    A common abbreviation for `TAR file
-    <https://wikipedia.org/wiki/Tar_(computing)>`_, which is a common software
-    distribution mechanism. This file format is a collection of multiple files
-    distributed as a single file, commonly compressed using :ref:`gzip
-    <glossGzip>` compression.
-
-.. _glossTLS:
-
-Transport Layer Security (TLS)
-    `TLS <https://wikipedia.org/wiki/Transport_Layer_Security>`_ is a security
-    protocol designed to provide secure communications over a network. It is the
-    successor to :ref:`SSL <glossSSL>`, and used in many applications like
-    HTTPS, email, and Trino. These security topics use the term TLS to refer to
-    both TLS and SSL.
diff --git a/docs/src/main/sphinx/index.md b/docs/src/main/sphinx/index.md
new file mode 100644
index 000000000000..694534859bae
--- /dev/null
+++ b/docs/src/main/sphinx/index.md
@@ -0,0 +1,27 @@
+# Trino documentation
+
+```{toctree}
+:titlesonly: true
+
+overview
+installation
+client
+security
+admin
+optimizer
+connector
+functions
+language
+sql
+routines
+develop
+glossary
+appendix
+```
+
+```{toctree}
+:maxdepth: 1
+:titlesonly: true
+
+release
+```
diff --git a/docs/src/main/sphinx/index.rst b/docs/src/main/sphinx/index.rst
deleted file mode 100644
index 3abf7a78c0a2..000000000000
--- a/docs/src/main/sphinx/index.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-####################
-Trino documentation
-####################
-
-.. toctree::
-    :titlesonly:
-
-    overview
-    installation
-    client
-    security
-    admin
-    optimizer
-    connector
-    functions
-    language
-    sql
-    develop
-    glossary
-    appendix
-
-.. toctree::
-    :titlesonly:
-    :maxdepth: 1
-
-    release
diff --git a/docs/src/main/sphinx/installation.md b/docs/src/main/sphinx/installation.md
new file mode 100644
index 000000000000..01c76e095819
--- /dev/null
+++ b/docs/src/main/sphinx/installation.md
@@ -0,0 +1,20 @@
+# Installation
+
+A Trino server can be installed and deployed on a number of different
+platforms. Typically you run a cluster of machines with one coordinator and many
+workers. You can find instructions for deploying such a cluster, and related
+information, in the following sections:
+
+```{toctree}
+:maxdepth: 1
+
+installation/deployment
+installation/containers
+installation/kubernetes
+installation/rpm
+installation/query-resiliency
+```
+
+Once you have a completed the deployment, or if you have access to a running
+cluster already, you can proceed to configure your {doc}`client application
+</client>`.
diff --git a/docs/src/main/sphinx/installation.rst b/docs/src/main/sphinx/installation.rst
deleted file mode 100644
index c8b6200ccf6f..000000000000
--- a/docs/src/main/sphinx/installation.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-************
-Installation
-************
-
-A Trino server can be installed and deployed on a number of different
-platforms. Typically you run a cluster of machines with one coordinator and many
-workers. You can find instructions for deploying such a cluster, and related
-information, in the following sections:
-
-.. toctree::
-    :maxdepth: 1
-
-    installation/deployment
-    installation/containers
-    installation/kubernetes
-    installation/rpm
-    installation/query-resiliency
-
-Once you have a completed the deployment, or if you have access to a running
-cluster already, you can proceed to configure your :doc:`client application
-</client>`.
diff --git a/docs/src/main/sphinx/installation/containers.md b/docs/src/main/sphinx/installation/containers.md
new file mode 100644
index 000000000000..1ae1cd1dbed9
--- /dev/null
+++ b/docs/src/main/sphinx/installation/containers.md
@@ -0,0 +1,95 @@
+# Trino in a Docker container
+
+The Trino project provides the [trinodb/trino](https://hub.docker.com/r/trinodb/trino)
+Docker image that includes the Trino server and a default configuration. The
+Docker image is published to Docker Hub and can be used with the Docker runtime,
+among several others.
+
+## Running the container
+
+To run Trino in Docker, you must have the Docker engine installed on your
+machine. You can download Docker from the [Docker website](https://www.docker.com),
+or use the packaging system of your operating systems.
+
+Use the `docker` command to create a container from the `trinodb/trino`
+image. Assign it the `trino` name, to make it easier to reference it later.
+Run it in the background, and map the default Trino port, which is 8080,
+from inside the container to port 8080 on your workstation.
+
+```text
+docker run --name trino -d -p 8080:8080 trinodb/trino
+```
+
+Without specifying the container image tag, it defaults to `latest`,
+but a number of any released Trino version can be used, for example
+`trinodb/trino:|trino_version|`.
+
+Run `docker ps` to see all the containers running in the background.
+
+```text
+% docker ps
+CONTAINER ID   IMAGE               COMMAND                  CREATED        STATUS                  PORTS                    NAMES
+955c3b3d3d0a   trinodb/trino:390   "/usr/lib/trino/bin/…"   39 hours ago   Up 39 hours (healthy)   0.0.0.0:8080->8080/tcp   trino
+```
+
+When Trino is still starting, it shows `(health: starting)`,
+and `(healthy)` when it's ready.
+
+:::{note}
+There are multiple ways to use Trino within containers. You can either run
+Trino in Docker containers locally, as explained in the following sections,
+or use a container orchestration platform like Kubernetes. For the Kubernetes
+instructions see {doc}`/installation/kubernetes`.
+:::
+
+## Executing queries
+
+The image includes the Trino command-line interface (CLI) client, `trino`.
+Execute it in the existing container to connect to the Trino server running
+inside it. After starting the client, type and execute a query on a table
+of the `tpch` catalog, which includes example data:
+
+```text
+$ docker exec -it trino trino
+trino> select count(*) from tpch.sf1.nation;
+ _col0
+-------
+    25
+(1 row)
+
+Query 20181105_001601_00002_e6r6y, FINISHED, 1 node
+Splits: 21 total, 21 done (100.00%)
+0:06 [25 rows, 0B] [4 rows/s, 0B/s]
+```
+
+Once you are done with your exploration, enter the `quit` command.
+
+Alternatively, you can use the Trino CLI installed directly on your workstation.
+The default server URL in the CLI of <http://localhost:8080> matches the port used
+in the command to start the container. More information about using the CLI can
+be found in {doc}`/client/cli`. You can also connect with any other client
+application using the {doc}`/client/jdbc`.
+
+## Configuring Trino
+
+The image already contains a default configuration to get started, and some
+catalogs to allow you to explore Trino. You can also use the container with your
+custom configuration files in a local `etc` directory structure as created in
+the {doc}`/installation/deployment`. If you mount this directory as a volume
+in the path `/etc/trino` when starting the container, your configuration
+is used instead of the default in the image.
+
+```text
+$ docker run --name trino -d -p 8080:8080 --volume $PWD/etc:/etc/trino trinodb/trino
+```
+
+To keep the default configuration and only configure catalogs, mount a folder
+at `/etc/trino/catalog`, or individual catalog property files in it.
+
+If you want to use additional plugins, mount them at `/usr/lib/trino/plugin`.
+
+## Cleaning up
+
+You can stop and start the container, using the `docker stop trino` and
+`docker start trino` commands. To fully remove the stopped container, run
+`docker rm trino`.
diff --git a/docs/src/main/sphinx/installation/containers.rst b/docs/src/main/sphinx/installation/containers.rst
deleted file mode 100644
index 0cf265dae268..000000000000
--- a/docs/src/main/sphinx/installation/containers.rst
+++ /dev/null
@@ -1,101 +0,0 @@
-===========================
-Trino in a Docker container
-===========================
-
-The Trino project provides the `trinodb/trino <https://hub.docker.com/r/trinodb/trino>`_
-Docker image that includes the Trino server and a default configuration. The
-Docker image is published to Docker Hub and can be used with the Docker runtime,
-among several others.
-
-Running the container
----------------------
-
-To run Trino in Docker, you must have the Docker engine installed on your
-machine. You can download Docker from the `Docker website <https://www.docker.com>`_,
-or use the packaging system of your operating systems.
-
-Use the ``docker`` command to create a container from the ``trinodb/trino``
-image. Assign it the ``trino`` name, to make it easier to reference it later.
-Run it in the background, and map the default Trino port, which is 8080,
-from inside the container to port 8080 on your workstation.
-
-.. code-block:: text
-
-    docker run --name trino -d -p 8080:8080 trinodb/trino
-
-Without specifying the container image tag, it defaults to ``latest``,
-but a number of any released Trino version can be used, for example
-``trinodb/trino:|trino_version|``.
-
-Run ``docker ps`` to see all the containers running in the background.
-
-.. code-block:: text
-
-    % docker ps
-    CONTAINER ID   IMAGE               COMMAND                  CREATED        STATUS                  PORTS                    NAMES
-    955c3b3d3d0a   trinodb/trino:390   "/usr/lib/trino/bin/…"   39 hours ago   Up 39 hours (healthy)   0.0.0.0:8080->8080/tcp   trino
-
-When Trino is still starting, it shows ``(health: starting)``,
-and ``(healthy)`` when it's ready.
-
-.. note::
-
-   There are multiple ways to use Trino within containers. You can either run
-   Trino in Docker containers locally, as explained in the following sections,
-   or use a container orchestration platform like Kubernetes. For the Kubernetes
-   instructions see :doc:`/installation/kubernetes`.
-
-Executing queries
------------------
-
-The image includes the Trino command-line interface (CLI) client, ``trino``.
-Execute it in the existing container to connect to the Trino server running
-inside it. After starting the client, type and execute a query on a table
-of the ``tpch`` catalog, which includes example data:
-
-.. code-block:: text
-
-    $ docker exec -it trino trino
-    trino> select count(*) from tpch.sf1.nation;
-     _col0
-    -------
-        25
-    (1 row)
-
-    Query 20181105_001601_00002_e6r6y, FINISHED, 1 node
-    Splits: 21 total, 21 done (100.00%)
-    0:06 [25 rows, 0B] [4 rows/s, 0B/s]
-
-Once you are done with your exploration, enter the ``quit`` command.
-
-Alternatively, you can use the Trino CLI installed directly on your workstation.
-The default server URL in the CLI of http://localhost:8080 matches the port used
-in the command to start the container. More information about using the CLI can
-be found in :doc:`/client/cli`. You can also connect with any other client
-application using the :doc:`/client/jdbc`.
-
-Configuring Trino
------------------
-
-The image already contains a default configuration to get started, and some
-catalogs to allow you to explore Trino. You can also use the container with your
-custom configuration files in a local ``etc`` directory structure as created in
-the :doc:`/installation/deployment`. If you mount this directory as a volume
-in the path ``/etc/trino`` when starting the container, your configuration
-is used instead of the default in the image.
-
-.. code-block:: text
-
-    $ docker run --name trino -d -p 8080:8080 --volume $PWD/etc:/etc/trino trinodb/trino
-
-To keep the default configuration and only configure catalogs, mount a folder
-at ``/etc/trino/catalog``, or individual catalog property files in it.
-
-If you want to use additional plugins, mount them at ``/usr/lib/trino/plugin``.
-
-Cleaning up
------------
-
-You can stop and start the container, using the ``docker stop trino`` and
-``docker start trino`` commands. To fully remove the stopped container, run
-``docker rm trino``.
diff --git a/docs/src/main/sphinx/installation/deployment.md b/docs/src/main/sphinx/installation/deployment.md
new file mode 100644
index 000000000000..c82c6b423484
--- /dev/null
+++ b/docs/src/main/sphinx/installation/deployment.md
@@ -0,0 +1,373 @@
+# Deploying Trino
+
+(requirements)=
+
+## Requirements
+
+(requirements-linux)=
+
+### Linux operating system
+
+- 64-bit required
+
+- newer release preferred, especially when running on containers
+
+- adequate ulimits for the user that runs the Trino process. These limits may
+  depend on the specific Linux distribution you are using. The number of open
+  file descriptors needed for a particular Trino instance scales as roughly the
+  number of machines in the cluster, times some factor depending on the
+  workload. The `nofile` limit sets the maximum number of file descriptors
+  that a process can have, while the `nproc` limit restricts the number of
+  processes, and therefore threads on the JVM, a user can create. We recommend
+  setting limits to the following values at a minimum. Typically, this
+  configuration is located in `/etc/security/limits.conf`:
+
+  ```text
+  trino soft nofile 131072
+  trino hard nofile 131072
+  trino soft nproc 128000
+  trino hard nproc 128000
+  ```
+
+% These values are used in core/trino-server-rpm/src/main/resources/dist/etc/init.d/trino
+
+(requirements-java)=
+
+### Java runtime environment
+
+Trino requires a 64-bit version of Java 17, with a minimum required version of 17.0.3.
+Earlier major versions such as Java 8 or Java 11 do not work.
+Newer major versions such as Java 18 or 19, are not supported -- they may work, but are not tested.
+
+We recommend using the Eclipse Temurin OpenJDK distribution from
+[Adoptium](https://adoptium.net/) as the JDK for Trino, as Trino is tested
+against that distribution. Eclipse Temurin is also the JDK used by the [Trino
+Docker image](https://hub.docker.com/r/trinodb/trino).
+
+If you are using Java 17 or 18, the JVM must be configured to use UTF-8 as the default charset by
+adding `-Dfile.encoding=UTF-8` to `etc/jvm.config`. Starting with Java 19, the Java default 
+charset is UTF-8, so this configuration is not needed.
+
+(requirements-python)=
+
+### Python
+
+- version 2.6.x, 2.7.x, or 3.x
+- required by the `bin/launcher` script only
+
+## Installing Trino
+
+Download the Trino server tarball, {maven_download}`server`, and unpack it. The
+tarball contains a single top-level directory, `trino-server-|trino_version|`,
+which we call the *installation* directory.
+
+Trino needs a *data* directory for storing logs, etc.
+We recommend creating a data directory outside of the installation directory,
+which allows it to be easily preserved when upgrading Trino.
+
+## Configuring Trino
+
+Create an `etc` directory inside the installation directory.
+This holds the following configuration:
+
+- Node Properties: environmental configuration specific to each node
+- JVM Config: command line options for the Java Virtual Machine
+- Config Properties: configuration for the Trino server. See the
+  {doc}`/admin/properties` for available configuration properties.
+- Catalog Properties: configuration for {doc}`/connector` (data sources).
+  The available catalog configuration properties for a connector are described
+  in the respective connector documentation.
+
+(node-properties)=
+
+### Node properties
+
+The node properties file, `etc/node.properties`, contains configuration
+specific to each node. A *node* is a single installed instance of Trino
+on a machine. This file is typically created by the deployment system when
+Trino is first installed. The following is a minimal `etc/node.properties`:
+
+```text
+node.environment=production
+node.id=ffffffff-ffff-ffff-ffff-ffffffffffff
+node.data-dir=/var/trino/data
+```
+
+The above properties are described below:
+
+- `node.environment`:
+  The name of the environment. All Trino nodes in a cluster must have the same
+  environment name. The name must start with a lowercase alphanumeric character
+  and only contain lowercase alphanumeric or underscore (`_`) characters.
+- `node.id`:
+  The unique identifier for this installation of Trino. This must be
+  unique for every node. This identifier should remain consistent across
+  reboots or upgrades of Trino. If running multiple installations of
+  Trino on a single machine (i.e. multiple nodes on the same machine),
+  each installation must have a unique identifier. The identifier must start
+  with an alphanumeric character and only contain alphanumeric, `-`, or `_`
+  characters.
+- `node.data-dir`:
+  The location (filesystem path) of the data directory. Trino stores
+  logs and other data here.
+
+(jvm-config)=
+
+### JVM config
+
+The JVM config file, `etc/jvm.config`, contains a list of command line
+options used for launching the Java Virtual Machine. The format of the file
+is a list of options, one per line. These options are not interpreted by
+the shell, so options containing spaces or other special characters should
+not be quoted.
+
+The following provides a good starting point for creating `etc/jvm.config`:
+
+```text
+-server
+-Xmx16G
+-XX:InitialRAMPercentage=80
+-XX:MaxRAMPercentage=80
+-XX:G1HeapRegionSize=32M
+-XX:+ExplicitGCInvokesConcurrent
+-XX:+ExitOnOutOfMemoryError
+-XX:+HeapDumpOnOutOfMemoryError
+-XX:-OmitStackTraceInFastThrow
+-XX:ReservedCodeCacheSize=512M
+-XX:PerMethodRecompilationCutoff=10000
+-XX:PerBytecodeRecompilationCutoff=10000
+-Djdk.attach.allowAttachSelf=true
+-Djdk.nio.maxCachedBufferSize=2000000
+-XX:+UnlockDiagnosticVMOptions
+-XX:+UseAESCTRIntrinsics
+-Dfile.encoding=UTF-8
+# Disable Preventive GC for performance reasons (JDK-8293861)
+-XX:-G1UsePreventiveGC  
+# Reduce starvation of threads by GClocker, recommend to set about the number of cpu cores (JDK-8192647)
+-XX:GCLockerRetryAllocationCount=32
+```
+
+You must adjust the value for the memory used by Trino, specified with `-Xmx`
+to the available memory on your nodes. Typically, values representing 70 to 85
+percent of the total available memory is recommended. For example, if all
+workers and the coordinator use nodes with 64GB of RAM, you can use `-Xmx54G`.
+Trino uses most of the allocated memory for processing, with a small percentage
+used by JVM-internal processes such as garbage collection.
+
+The rest of the available node memory must be sufficient for the operating
+system and other running services, as well as off-heap memory used for native
+code initiated the JVM process.
+
+On larger nodes, the percentage value can be lower. Allocation of all memory  to
+the JVM or using swap space is not supported, and disabling swap space on the
+operating system level is recommended.
+
+Large memory allocation beyond 32GB is recommended for production clusters.
+
+Because an `OutOfMemoryError` typically leaves the JVM in an
+inconsistent state, we write a heap dump, for debugging, and forcibly
+terminate the process when this occurs.
+
+The temporary directory used by the JVM must allow execution of code.
+Specifically, the mount must not have the `noexec` flag set. The default
+`/tmp` directory is mounted with this flag in some installations, which
+prevents Trino from starting. You can workaround this by overriding the
+temporary directory by adding `-Djava.io.tmpdir=/path/to/other/tmpdir` to the
+list of JVM options.
+
+We enable `-XX:+UnlockDiagnosticVMOptions` and `-XX:+UseAESCTRIntrinsics` to improve AES performance for S3, etc. on ARM64 ([JDK-8271567](https://bugs.openjdk.java.net/browse/JDK-8271567))  
+We disable Preventive GC (`-XX:-G1UsePreventiveGC`) for performance reasons (see [JDK-8293861](https://bugs.openjdk.org/browse/JDK-8293861))  
+We set GCLocker retry allocation count (`-XX:GCLockerRetryAllocationCount=32`) to avoid OOM too early (see [JDK-8192647](https://bugs.openjdk.org/browse/JDK-8192647))
+
+(config-properties)=
+
+### Config properties
+
+The config properties file, `etc/config.properties`, contains the
+configuration for the Trino server. Every Trino server can function as both a
+coordinator and a worker. A cluster is required to include one coordinator, and
+dedicating a machine to only perform coordination work provides the best
+performance on larger clusters. Scaling and parallelization is achieved by using
+many workers.
+
+The following is a minimal configuration for the coordinator:
+
+```text
+coordinator=true
+node-scheduler.include-coordinator=false
+http-server.http.port=8080
+discovery.uri=http://example.net:8080
+```
+
+And this is a minimal configuration for the workers:
+
+```text
+coordinator=false
+http-server.http.port=8080
+discovery.uri=http://example.net:8080
+```
+
+Alternatively, if you are setting up a single machine for testing, that
+functions as both a coordinator and worker, use this configuration:
+
+```text
+coordinator=true
+node-scheduler.include-coordinator=true
+http-server.http.port=8080
+discovery.uri=http://example.net:8080
+```
+
+These properties require some explanation:
+
+- `coordinator`:
+  Allow this Trino instance to function as a coordinator, so to
+  accept queries from clients and manage query execution.
+- `node-scheduler.include-coordinator`:
+  Allow scheduling work on the coordinator.
+  For larger clusters, processing work on the coordinator
+  can impact query performance because the machine's resources are not
+  available for the critical task of scheduling, managing and monitoring
+  query execution.
+- `http-server.http.port`:
+  Specifies the port for the HTTP server. Trino uses HTTP for all
+  communication, internal and external.
+- `discovery.uri`:
+  The Trino coordinator has a discovery service that is used by all the nodes
+  to find each other. Every Trino instance registers itself with the discovery
+  service on startup and continuously heartbeats to keep its registration
+  active. The discovery service shares the HTTP server with Trino and thus
+  uses the same port. Replace `example.net:8080` to match the host and
+  port of the Trino coordinator. If you have disabled HTTP on the coordinator,
+  the URI scheme must be `https`, not `http`.
+
+The above configuration properties are a *minimal set* to help you get started.
+All additional configuration is optional and varies widely based on the specific
+cluster and supported use cases. The {doc}`/admin` and {doc}`/security` sections
+contain documentation for many aspects, including {doc}`/admin/resource-groups`
+for configuring queuing policies and {doc}`/admin/fault-tolerant-execution`.
+
+The {doc}`/admin/properties` provides a comprehensive list of the supported
+properties for topics such as {doc}`/admin/properties-general`,
+{doc}`/admin/properties-resource-management`,
+{doc}`/admin/properties-query-management`,
+{doc}`/admin/properties-web-interface`, and others.
+
+(log-levels)=
+
+### Log levels
+
+The optional log levels file, `etc/log.properties`, allows setting the
+minimum log level for named logger hierarchies. Every logger has a name,
+which is typically the fully qualified name of the class that uses the logger.
+Loggers have a hierarchy based on the dots in the name, like Java packages.
+For example, consider the following log levels file:
+
+```text
+io.trino=INFO
+```
+
+This would set the minimum level to `INFO` for both
+`io.trino.server` and `io.trino.plugin.hive`.
+The default minimum level is `INFO`,
+thus the above example does not actually change anything.
+There are four levels: `DEBUG`, `INFO`, `WARN` and `ERROR`.
+
+(catalog-properties)=
+
+### Catalog properties
+
+Trino accesses data via *connectors*, which are mounted in catalogs.
+The connector provides all of the schemas and tables inside of the catalog.
+For example, the Hive connector maps each Hive database to a schema.
+If the Hive connector is mounted as the `hive` catalog, and Hive
+contains a table `clicks` in database `web`, that table can be accessed
+in Trino as `hive.web.clicks`.
+
+Catalogs are registered by creating a catalog properties file
+in the `etc/catalog` directory.
+For example, create `etc/catalog/jmx.properties` with the following
+contents to mount the `jmx` connector as the `jmx` catalog:
+
+```text
+connector.name=jmx
+```
+
+See {doc}`/connector` for more information about configuring connectors.
+
+(running-trino)=
+
+## Running Trino
+
+The installation provides a `bin/launcher` script, which requires Python in
+the `PATH`. The script can be used manually or as a daemon startup script. It
+accepts the following commands:
+
+:::{list-table} `launcher` commands
+:widths: 15, 85
+:header-rows: 1
+
+* - Command
+  - Action
+* - `run`
+  - Starts the server in the foreground and leaves it running. To shut down
+    the server, use Ctrl+C in this terminal or the `stop` command from
+    another terminal.
+* - `start`
+  - Starts the server as a daemon and returns its process ID.
+* - `stop`
+  - Shuts down a server started with either `start` or `run`. Sends the
+    SIGTERM signal.
+* - `restart`
+  - Stops then restarts a running server, or starts a stopped server,
+    assigning a new process ID.
+* - `kill`
+  - Shuts down a possibly hung server by sending the SIGKILL signal.
+* - `status`
+  - Prints a status line, either *Stopped pid* or *Running as pid*.
+:::
+
+A number of additional options allow you to specify configuration file and
+directory locations, as well as Java options. Run the launcher with `--help`
+to see the supported commands and command line options.
+
+The `-v` or `--verbose` option for each command prepends the server's
+current settings before the command's usual output.
+
+Trino can be started as a daemon by running the following:
+
+```text
+bin/launcher start
+```
+
+Alternatively, it can be run in the foreground, with the logs and other
+output written to stdout/stderr. Both streams should be captured
+if using a supervision system like daemontools:
+
+```text
+bin/launcher run
+```
+
+The launcher configures default values for the configuration
+directory `etc`, configuration files, the data directory `var`,
+and log files in the data directory. You can change these values
+to adjust your Trino usage to any requirements, such as using a
+directory outside the installation directory, specific mount points
+or locations, and even using other file names. For example, the Trino
+RPM adjusts the used directories to better follow the Linux Filesystem
+Hierarchy Standard (FHS).
+
+After starting Trino, you can find log files in the `log` directory inside
+the data directory `var`:
+
+- `launcher.log`:
+  This log is created by the launcher and is connected to the stdout
+  and stderr streams of the server. It contains a few log messages
+  that occur while the server logging is being initialized, and any
+  errors or diagnostics produced by the JVM.
+- `server.log`:
+  This is the main log file used by Trino. It typically contains
+  the relevant information if the server fails during initialization.
+  It is automatically rotated and compressed.
+- `http-request.log`:
+  This is the HTTP request log which contains every HTTP request
+  received by the server. It is automatically rotated and compressed.
diff --git a/docs/src/main/sphinx/installation/deployment.rst b/docs/src/main/sphinx/installation/deployment.rst
deleted file mode 100644
index 5cce16570520..000000000000
--- a/docs/src/main/sphinx/installation/deployment.rst
+++ /dev/null
@@ -1,362 +0,0 @@
-================
-Deploying Trino
-================
-
-.. _requirements:
-
-Requirements
-------------
-
-.. _requirements-linux:
-
-Linux operating system
-^^^^^^^^^^^^^^^^^^^^^^
-
-* 64-bit required
-* newer release preferred, especially when running on containers
-* adequate ulimits for the user that runs the Trino process. These limits
-  may depend on the specific Linux distribution you are using. The number
-  of open file descriptors needed for a particular Trino instance scales
-  as roughly the number of machines in the cluster, times some factor
-  depending on the workload. We recommend the following limits, which can
-  typically be set in ``/etc/security/limits.conf``:
-
-  .. code-block:: text
-
-      trino soft nofile 131072
-      trino hard nofile 131072
-
-..
-   These values are used in core/trino-server-rpm/src/main/resources/dist/etc/init.d/trino
-
-.. _requirements-java:
-
-Java runtime environment
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-Trino requires a 64-bit version of Java 17, with a minimum required version of 17.0.3.
-Earlier major versions such as Java 8 or Java 11 do not work.
-Newer major versions such as Java 18 or 19, are not supported -- they may work, but are not tested.
-
-We recommend using `Azul Zulu <https://www.azul.com/downloads/zulu-community/>`_
-as the JDK for Trino, as Trino is tested against that distribution.
-Zulu is also the JDK used by the
-`Trino Docker image <https://hub.docker.com/r/trinodb/trino>`_.
-
-.. _requirements-python:
-
-Python
-^^^^^^
-
-* version 2.6.x, 2.7.x, or 3.x
-* required by the ``bin/launcher`` script only
-
-Installing Trino
------------------
-
-Download the Trino server tarball, :maven_download:`server`, and unpack it.
-The tarball contains a single top-level directory,
-|trino_server_release|, which we call the *installation* directory.
-
-Trino needs a *data* directory for storing logs, etc.
-We recommend creating a data directory outside of the installation directory,
-which allows it to be easily preserved when upgrading Trino.
-
-Configuring Trino
-------------------
-
-Create an ``etc`` directory inside the installation directory.
-This holds the following configuration:
-
-* Node Properties: environmental configuration specific to each node
-* JVM Config: command line options for the Java Virtual Machine
-* Config Properties: configuration for the Trino server. See the
-  :doc:`/admin/properties` for available configuration properties.
-* Catalog Properties: configuration for :doc:`/connector` (data sources).
-  The available catalog configuration properties for a connector are described
-  in the respective connector documentation.
-
-.. _node_properties:
-
-Node properties
-^^^^^^^^^^^^^^^
-
-The node properties file, ``etc/node.properties``, contains configuration
-specific to each node. A *node* is a single installed instance of Trino
-on a machine. This file is typically created by the deployment system when
-Trino is first installed. The following is a minimal ``etc/node.properties``:
-
-.. code-block:: text
-
-    node.environment=production
-    node.id=ffffffff-ffff-ffff-ffff-ffffffffffff
-    node.data-dir=/var/trino/data
-
-The above properties are described below:
-
-* ``node.environment``:
-  The name of the environment. All Trino nodes in a cluster must have the same
-  environment name. The name must start with a lowercase alphanumeric character
-  and only contain lowercase alphanumeric or underscore (``_``) characters.
-
-* ``node.id``:
-  The unique identifier for this installation of Trino. This must be
-  unique for every node. This identifier should remain consistent across
-  reboots or upgrades of Trino. If running multiple installations of
-  Trino on a single machine (i.e. multiple nodes on the same machine),
-  each installation must have a unique identifier. The identifier must start
-  with an alphanumeric character and only contain alphanumeric, ``-``, or ``_``
-  characters.
-
-* ``node.data-dir``:
-  The location (filesystem path) of the data directory. Trino stores
-  logs and other data here.
-
-.. _jvm_config:
-
-JVM config
-^^^^^^^^^^
-
-The JVM config file, ``etc/jvm.config``, contains a list of command line
-options used for launching the Java Virtual Machine. The format of the file
-is a list of options, one per line. These options are not interpreted by
-the shell, so options containing spaces or other special characters should
-not be quoted.
-
-The following provides a good starting point for creating ``etc/jvm.config``:
-
-.. code-block:: text
-
-    -server
-    -Xmx16G
-    -XX:InitialRAMPercentage=80
-    -XX:MaxRAMPercentage=80
-    -XX:G1HeapRegionSize=32M
-    -XX:+ExplicitGCInvokesConcurrent
-    -XX:+ExitOnOutOfMemoryError
-    -XX:+HeapDumpOnOutOfMemoryError
-    -XX:-OmitStackTraceInFastThrow
-    -XX:ReservedCodeCacheSize=512M
-    -XX:PerMethodRecompilationCutoff=10000
-    -XX:PerBytecodeRecompilationCutoff=10000
-    -Djdk.attach.allowAttachSelf=true
-    -Djdk.nio.maxCachedBufferSize=2000000
-    -XX:+UnlockDiagnosticVMOptions
-    -XX:+UseAESCTRIntrinsics
-    # Disable Preventive GC for performance reasons (JDK-8293861)
-    -XX:-G1UsePreventiveGC
-
-Because an ``OutOfMemoryError`` typically leaves the JVM in an
-inconsistent state, we write a heap dump, for debugging, and forcibly
-terminate the process when this occurs.
-
-The temporary directory used by the JVM must allow execution of code.
-Specifically, the mount must not have the ``noexec`` flag set. The default
-``/tmp`` directory is mounted with this flag in some installations, which
-prevents Trino from starting. You can workaround this by overriding the
-temporary directory by adding ``-Djava.io.tmpdir=/path/to/other/tmpdir`` to the
-list of JVM options.
-
-We enable ``-XX:+UnlockDiagnosticVMOptions`` and ``-XX:+UseAESCTRIntrinsics`` to improve AES performance for S3, etc. on ARM64 (`JDK-8271567 <https://bugs.openjdk.java.net/browse/JDK-8271567>`_)
-We disable Preventive GC (``-XX:-G1UsePreventiveGC``) for performance reasons (see `JDK-8293861 <https://bugs.openjdk.org/browse/JDK-8293861>`_)
-
-.. _config_properties:
-
-Config properties
-^^^^^^^^^^^^^^^^^
-
-The config properties file, ``etc/config.properties``, contains the
-configuration for the Trino server. Every Trino server can function as both a
-coordinator and a worker. A cluster is required to include one coordinator, and
-dedicating a machine to only perform coordination work provides the best
-performance on larger clusters. Scaling and parallelization is achieved by using
-many workers.
-
-The following is a minimal configuration for the coordinator:
-
-.. code-block:: text
-
-    coordinator=true
-    node-scheduler.include-coordinator=false
-    http-server.http.port=8080
-    discovery.uri=http://example.net:8080
-
-And this is a minimal configuration for the workers:
-
-.. code-block:: text
-
-    coordinator=false
-    http-server.http.port=8080
-    discovery.uri=http://example.net:8080
-
-Alternatively, if you are setting up a single machine for testing, that
-functions as both a coordinator and worker, use this configuration:
-
-.. code-block:: text
-
-    coordinator=true
-    node-scheduler.include-coordinator=true
-    http-server.http.port=8080
-    discovery.uri=http://example.net:8080
-
-These properties require some explanation:
-
-* ``coordinator``:
-  Allow this Trino instance to function as a coordinator, so to
-  accept queries from clients and manage query execution.
-
-* ``node-scheduler.include-coordinator``:
-  Allow scheduling work on the coordinator.
-  For larger clusters, processing work on the coordinator
-  can impact query performance because the machine's resources are not
-  available for the critical task of scheduling, managing and monitoring
-  query execution.
-
-* ``http-server.http.port``:
-  Specifies the port for the HTTP server. Trino uses HTTP for all
-  communication, internal and external.
-
-* ``discovery.uri``:
-  The Trino coordinator has a discovery service that is used by all the nodes
-  to find each other. Every Trino instance registers itself with the discovery
-  service on startup and continuously heartbeats to keep its registration
-  active. The discovery service shares the HTTP server with Trino and thus
-  uses the same port. Replace ``example.net:8080`` to match the host and
-  port of the Trino coordinator. If you have disabled HTTP on the coordinator,
-  the URI scheme must be ``https``, not ``http``.
-
-The above configuration properties are a *minimal set* to help you get started.
-All additional configuration is optional and varies widely based on the specific
-cluster and supported use cases. The :doc:`/admin` and :doc:`/security` sections
-contain documentation for many aspects, including :doc:`/admin/resource-groups`
-for configuring queuing policies and :doc:`/admin/fault-tolerant-execution`.
-
-The :doc:`/admin/properties` provides a comprehensive list of the supported
-properties for topics such as :doc:`/admin/properties-general`,
-:doc:`/admin/properties-resource-management`,
-:doc:`/admin/properties-query-management`,
-:doc:`/admin/properties-web-interface`, and others.
-
-.. _log-levels:
-
-Log levels
-^^^^^^^^^^
-
-The optional log levels file, ``etc/log.properties``, allows setting the
-minimum log level for named logger hierarchies. Every logger has a name,
-which is typically the fully qualified name of the class that uses the logger.
-Loggers have a hierarchy based on the dots in the name, like Java packages.
-For example, consider the following log levels file:
-
-.. code-block:: text
-
-    io.trino=INFO
-
-This would set the minimum level to ``INFO`` for both
-``io.trino.server`` and ``io.trino.plugin.hive``.
-The default minimum level is ``INFO``,
-thus the above example does not actually change anything.
-There are four levels: ``DEBUG``, ``INFO``, ``WARN`` and ``ERROR``.
-
-.. _catalog_properties:
-
-Catalog properties
-^^^^^^^^^^^^^^^^^^
-
-Trino accesses data via *connectors*, which are mounted in catalogs.
-The connector provides all of the schemas and tables inside of the catalog.
-For example, the Hive connector maps each Hive database to a schema.
-If the Hive connector is mounted as the ``hive`` catalog, and Hive
-contains a table ``clicks`` in database ``web``, that table can be accessed
-in Trino as ``hive.web.clicks``.
-
-Catalogs are registered by creating a catalog properties file
-in the ``etc/catalog`` directory.
-For example, create ``etc/catalog/jmx.properties`` with the following
-contents to mount the ``jmx`` connector as the ``jmx`` catalog:
-
-.. code-block:: text
-
-    connector.name=jmx
-
-See :doc:`/connector` for more information about configuring connectors.
-
-.. _running_trino:
-
-Running Trino
---------------
-
-The installation provides a ``bin/launcher`` script, which requires Python in
-the ``PATH``. The script can be used manually or as a daemon startup script. It
-accepts the following commands:
-
-.. list-table:: ``launcher`` commands
-  :widths: 15, 85
-  :header-rows: 1
-
-  * - Command
-    - Action
-  * - ``run``
-    - Starts the server in the foreground and leaves it running. To shut down
-      the server, use Ctrl+C in this terminal or the ``stop`` command from
-      another terminal.
-  * - ``start``
-    - Starts the server as a daemon and returns its process ID.
-  * - ``stop``
-    - Shuts down a server started with either ``start`` or ``run``. Sends the
-      SIGTERM signal.
-  * - ``restart``
-    - Stops then restarts a running server, or starts a stopped server,
-      assigning a new process ID.
-  * - ``kill``
-    - Shuts down a possibly hung server by sending the SIGKILL signal.
-  * - ``status``
-    - Prints a status line, either *Stopped pid* or *Running as pid*.
-
-A number of additional options allow you to specify configuration file and
-directory locations, as well as Java options. Run the launcher with ``--help``
-to see the supported commands and command line options.
-
-The ``-v`` or ``--verbose`` option for each command prepends the server's
-current settings before the command's usual output.
-
-Trino can be started as a daemon by running the following:
-
-.. code-block:: text
-
-    bin/launcher start
-
-Alternatively, it can be run in the foreground, with the logs and other
-output written to stdout/stderr. Both streams should be captured
-if using a supervision system like daemontools:
-
-.. code-block:: text
-
-    bin/launcher run
-
-The launcher configures default values for the configuration
-directory ``etc``, configuration files, the data directory ``var``,
-and log files in the data directory. You can change these values
-to adjust your Trino usage to any requirements, such as using a
-directory outside the installation directory, specific mount points
-or locations, and even using other file names. For example, the Trino
-RPM adjusts the used directories to better follow the Linux Filesystem
-Hierarchy Standard (FHS).
-
-After starting Trino, you can find log files in the ``log`` directory inside
-the data directory ``var``:
-
-* ``launcher.log``:
-  This log is created by the launcher and is connected to the stdout
-  and stderr streams of the server. It contains a few log messages
-  that occur while the server logging is being initialized, and any
-  errors or diagnostics produced by the JVM.
-
-* ``server.log``:
-  This is the main log file used by Trino. It typically contains
-  the relevant information if the server fails during initialization.
-  It is automatically rotated and compressed.
-
-* ``http-request.log``:
-  This is the HTTP request log which contains every HTTP request
-  received by the server. It is automatically rotated and compressed.
diff --git a/docs/src/main/sphinx/installation/kubernetes.md b/docs/src/main/sphinx/installation/kubernetes.md
new file mode 100644
index 000000000000..277226c5138a
--- /dev/null
+++ b/docs/src/main/sphinx/installation/kubernetes.md
@@ -0,0 +1,386 @@
+# Trino on Kubernetes with Helm
+
+[Kubernetes](https://kubernetes.io) is a container orchestration platform that
+allows you to deploy Trino and other applications in a repeatable manner across
+different types of infrastructure. This can range from deploying on your laptop
+using tools like [kind](https://kind.sigs.k8s.io), to running on a managed
+Kubernetes service on cloud services like
+[Amazon Elastic Kubernetes Service](https://aws.amazon.com/eks),
+[Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine),
+[Azure Kubernetes Service](https://azure.microsoft.com/services/kubernetes-service),
+and others.
+
+The fastest way to run Trino on Kubernetes is to use the
+[Trino Helm chart](https://github.com/trinodb/charts).
+[Helm](https://helm.sh) is a package manager for Kubernetes applications that
+allows for simpler installation and versioning by templating Kubernetes
+configuration files. This allows you to prototype on your local or on-premise
+cluster and use the same deployment mechanism to deploy to the cloud to scale
+up.
+
+## Requirements
+
+- A Kubernetes cluster with a
+  [supported version](https://kubernetes.io/releases/) of Kubernetes.
+
+  - If you don't have a Kubernetes cluster, you can
+    {ref}`run one locally using kind <running-a-local-kubernetes-cluster-with-kind>`.
+
+- [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl) with a version
+  that adheres to the
+  [Kubernetes version skew policy](https://kubernetes.io/releases/version-skew-policy/)
+  installed on the machine managing the Kubernetes deployment.
+
+- [helm](https://helm.sh) with a version that adheres to the
+  [Helm version skew policy](https://helm.sh/docs/topics/version_skew/)
+  installed on the machine managing the Kubernetes deployment.
+
+(running-trino-using-helm)=
+
+## Running Trino using Helm
+
+Run the following commands from the system with `helm` and `kubectl`
+installed and configured to connect to your running Kubernetes cluster:
+
+1. Validate `kubectl` is pointing to the correct cluster by running the
+   command:
+
+   ```text
+   kubectl cluster-info
+   ```
+
+   You should see output that shows the correct Kubernetes control plane
+   address.
+
+2. Add the Trino Helm chart repository to Helm if you haven't done so already.
+   This tells Helm where to find the Trino charts. You can name the repository
+   whatever you want, `trino` is a good choice.
+
+   ```text
+   helm repo add trino https://trinodb.github.io/charts
+   ```
+
+3. Install Trino on the Kubernetes cluster using the Helm chart. Start by
+   running the `install` command to use all default values and create
+   a cluster called `example-trino-cluster`.
+
+   ```text
+   helm install example-trino-cluster trino/trino
+   ```
+
+   This generates the Kubernetes configuration files by inserting properties
+   into helm templates. The Helm chart contains
+   [default values](https://trinodb.github.io/charts/charts/trino/)
+   that can be overridden by a YAML file to update default settings.
+
+   1. *(Optional)* To override the default values,
+      {ref}`create your own YAML configuration <creating-your-own-yaml>` to
+      define the parameters of your deployment. To run the install command using
+      the `example.yaml`, add the `f` parameter in you `install` command.
+      Be sure to follow
+      {ref}`best practices and naming conventions <kubernetes-configuration-best-practices>`
+      for your configuration files.
+
+      ```text
+      helm install -f example.yaml example-trino-cluster trino/trino
+      ```
+
+   You should see output as follows:
+
+   ```text
+   NAME: example-trino-cluster
+   LAST DEPLOYED: Tue Sep 13 14:12:09 2022
+   NAMESPACE: default
+   STATUS: deployed
+   REVISION: 1
+   TEST SUITE: None
+   NOTES:
+   Get the application URL by running these commands:
+     export POD_NAME=$(kubectl get pods --namespace default -l "app=trino,release=example-trino-cluster,component=coordinator" -o jsonpath="{.items[0].metadata.name}")
+     echo "Visit http://127.0.0.1:8080 to use your application"
+     kubectl port-forward $POD_NAME 8080:8080
+   ```
+
+   This output depends on your configuration and cluster name. For example, the
+   port `8080` is set by the `.service.port` in the `example.yaml`.
+
+4. Run the following command to check that all pods, deployments, and services
+   are running properly.
+
+   ```text
+   kubectl get all
+   ```
+
+   You should expect to see output that shows running pods, deployments, and
+   replica sets. A good indicator that everything is running properly is to see
+   all pods are returning a ready status in the  `READY` column.
+
+   ```text
+   NAME                                               READY   STATUS    RESTARTS   AGE
+   pod/example-trino-cluster-coordinator-bfb74c98d-rnrxd   1/1     Running   0          161m
+   pod/example-trino-cluster-worker-76f6bf54d6-hvl8n       1/1     Running   0          161m
+   pod/example-trino-cluster-worker-76f6bf54d6-tcqgb       1/1     Running   0          161m
+
+   NAME                       TYPE        CLUSTER-IP    EXTERNAL-IP   PORT(S)    AGE
+   service/example-trino-cluster   ClusterIP   10.96.25.35   <none>        8080/TCP   161m
+
+   NAME                                           READY   UP-TO-DATE   AVAILABLE   AGE
+   deployment.apps/example-trino-cluster-coordinator   1/1     1            1           161m
+   deployment.apps/example-trino-cluster-worker        2/2     2            2           161m
+
+   NAME                                                     DESIRED   CURRENT   READY   AGE
+   replicaset.apps/example-trino-cluster-coordinator-bfb74c98d   1         1         1       161m
+   replicaset.apps/example-trino-cluster-worker-76f6bf54d6       2         2         2       161m
+   ```
+
+   The output shows running pods. These include the actual Trino containers. To
+   better understand this output, check out the following resources:
+
+   1. [kubectl get command reference](https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#get).
+   2. [kubectl get command example](https://kubernetes.io/docs/reference/kubectl/docker-cli-to-kubectl/#docker-ps).
+   3. [Debugging Kubernetes reference](https://kubernetes.io/docs/tasks/debug/).
+
+5. If all pods, deployments, and replica sets are running and in the ready
+   state, Trino has been successfully deployed.
+
+:::{note}
+Unlike some Kubernetes applications, where it's better to have many small
+pods, Trino works best with fewer pods each having more resources
+available. We strongly recommend to avoid having multiple Trino pods on a
+single physical host to avoid contention for resources.
+:::
+
+(executing-queries)=
+
+## Executing queries
+
+The pods running the Trino containers are all running on a private network
+internal to Kubernetes. In order to access them, specifically the coordinator,
+you need to create a tunnel to the coordinator pod and your computer. You can do
+this by running the commands generated upon installation.
+
+1. Store the coordinator pod name in a shell variable called `POD_NAME`.
+
+   ```text
+   POD_NAME=$(kubectl get pods -l "app=trino,release=example-trino-cluster,component=coordinator" -o name)
+   ```
+
+2. Create the tunnel from the coordinator pod to the client.
+
+   ```text
+   kubectl port-forward $POD_NAME 8080:8080
+   ```
+
+   Now you can connect to the Trino coordinator at `http://localhost:8080`.
+
+3. To connect to Trino, you can use the
+   {doc}`command-line interface </client/cli>`, a
+   {doc}`JDBC client </client/jdbc>`, or any of the
+   {doc}`other clients </client>`. For this example,
+   {ref}`install the command-line interface <cli-installation>`, and connect to
+   Trino in a new console session.
+
+   ```text
+   trino --server http://localhost:8080
+   ```
+
+4. Using the sample data in the `tpch` catalog, type and execute a query on
+   the `nation` table using the `tiny` schema:
+
+   ```text
+   trino> select count(*) from tpch.tiny.nation;
+    _col0
+   -------
+     25
+   (1 row)
+
+   Query 20181105_001601_00002_e6r6y, FINISHED, 1 node
+   Splits: 21 total, 21 done (100.00%)
+   0:06 [25 rows, 0B] [4 rows/s, 0B/s]
+   ```
+
+   Try other SQL queries to explore the data set and test your cluster.
+
+5. Once you are done with your exploration, enter the `quit` command in the
+   CLI.
+
+6. Kill the tunnel to the coordinator pod. The is only available while the
+   `kubectl` process is running, so you can just kill the `kubectl` process
+   that's forwarding the port. In most cases that means pressing `CTRL` +
+   `C` in the terminal where the port-forward command is running.
+
+## Configuration
+
+The Helm chart uses the {doc}`Trino container image </installation/containers>`.
+The Docker image already contains a default configuration to get started, and
+some catalogs to allow you to explore Trino. Kubernetes allows you to mimic a
+{doc}`traditional deployment </installation/deployment>` by supplying
+configuration in YAML files. It's important to understand how files such as the
+Trino configuration, JVM, and various {doc}`catalog properties </connector>` are
+configured in Trino before updating the values.
+
+(creating-your-own-yaml)=
+
+### Creating your own YAML configuration
+
+When you use your own YAML Kubernetes configuration, you only override the values you specify.
+The remaining properties use their default values. Add an `example.yaml` with
+the following configuration:
+
+```yaml
+image:
+  tag: "|trino_version|"
+server:
+  workers: 3
+coordinator:
+  jvm:
+    maxHeapSize: "8G"
+worker:
+  jvm:
+    maxHeapSize: "8G"
+```
+
+These values are higher than the defaults and allow Trino to use more memory
+and run more demanding queries. If the values are too high, Kubernetes might
+not be able to schedule some Trino pods, depending on other applications
+deployed in this cluster and the size of the cluster nodes.
+
+1. `.image.tag` is set to the current version, |trino_version|. Set
+   this value if you need to use a specific version of Trino. The default is
+   `latest`, which is not recommended. Using `latest` will publish a new
+   version of Trino with each release and a following Kubernetes deployment.
+2. `.server.workers` is set to `3`. This value sets the number of
+   workers, in this case, a coordinator and three worker nodes are deployed.
+3. `.coordinator.jvm.maxHeapSize` is set to `8GB`.
+   This sets the maximum heap size in the JVM of the coordinator. See
+   {ref}`jvm-config`.
+4. `.worker.jvm.maxHeapSize` is set to `8GB`.
+   This sets the maximum heap size in the JVM of the worker. See
+   {ref}`jvm-config`.
+
+:::{warning}
+Some memory settings need to be tuned carefully as setting some values
+outside of the range of the maximum heap size will cause Trino startup to
+fail. See the warnings listed on {doc}`/admin/properties-resource-management`.
+:::
+
+Reference [the full list of properties](https://trinodb.github.io/charts/charts/trino/)
+that can be overridden in the Helm chart.
+
+(kubernetes-configuration-best-practices)=
+
+:::{note}
+Although `example.yaml` is used to refer to the Kubernetes configuration
+file in this document, you should use clear naming guidelines for the cluster
+and deployment you are managing. For example,
+`cluster-example-trino-etl.yaml` might refer to a Trino deployment for a
+cluster used primarily for extract-transform-load queries deployed on the
+`example` Kubernetes cluster. See
+[Configuration Best Practices](https://kubernetes.io/docs/concepts/configuration/overview/)
+for more tips on configuring Kubernetes deployments.
+:::
+
+### Adding catalogs
+
+A common use-case is to add custom catalogs. You can do this by adding values to
+the `additionalCatalogs` property in the `example.yaml` file.
+
+```yaml
+additionalCatalogs:
+  lakehouse: |-
+    connector.name=iceberg
+    hive.metastore.uri=thrift://example.net:9083
+  rdbms: |-
+    connector.name=postgresql
+    connection-url=jdbc:postgresql://example.net:5432/database
+    connection-user=root
+    connection-password=secret
+```
+
+This adds both `lakehouse` and `rdbms` catalogs to the Kubernetes deployment
+configuration.
+
+(running-a-local-kubernetes-cluster-with-kind)=
+
+## Running a local Kubernetes cluster with kind
+
+For local deployments, you can use
+[kind (Kubernetes in Docker)](https://kind.sigs.k8s.io). Follow the steps
+below to run `kind` on your system.
+
+1. `kind` runs on [Docker](https://www.docker.com), so first check if Docker
+   is installed:
+
+   ```text
+   docker --version
+   ```
+
+   If this command fails, install Docker by following
+   [Docker installation instructions](https://docs.docker.com/engine/install/).
+
+2. Install `kind` by following the
+   [kind installation instructions](https://kind.sigs.k8s.io/docs/user/quick-start/#installation).
+
+3. Run a Kubernetes cluster in `kind` by running the command:
+
+   ```text
+   kind create cluster --name trino
+   ```
+
+   :::{note}
+   The `name` parameter is optional but is used to showcase how the
+   namespace is applied in future commands. The cluster name defaults to
+   `kind` if no parameter is added. Use `trino` to make the application
+   on this cluster obvious.
+   :::
+
+4. Verify that `kubectl` is running against the correct Kubernetes cluster.
+
+   ```text
+   kubectl cluster-info --context kind-trino
+   ```
+
+   If you have multiple Kubernetes clusters already configured within
+   `~/.kube/config`, you need to pass the `context` parameter to the
+   `kubectl` commands to operate with the local `kind` cluster. `kubectl`
+   uses the
+   [default context](https://kubernetes.io/docs/reference/kubectl/cheatsheet/#kubectl-context-and-configuration)
+   if this parameter isn't supplied. Notice the context is the name of the
+   cluster with the `kind-` prefix added. Now you can look at all the
+   Kubernetes objects running on your `kind` cluster.
+
+5. Set up Trino by folling the {ref}`running-trino-using-helm` steps. When
+   running the `kubectl get all` command, add the `context` parameter.
+
+   ```text
+   kubectl get all --context kind-trino
+   ```
+
+6. Run some queries by following the [Executing queries](#executing-queries) steps.
+
+7. Once you are done with the cluster using kind, you can delete the cluster.
+
+   ```text
+   kind delete cluster -n trino
+   ```
+
+## Cleaning up
+
+To uninstall Trino from the Kubernetes cluster, run the following command:
+
+```text
+helm uninstall my-trino-cluster
+```
+
+You should expect to see the following output:
+
+```text
+release "my-trino-cluster" uninstalled
+```
+
+To validate that this worked, you can run this `kubectl` command to make sure
+there are no remaining Kubernetes objects related to the Trino cluster.
+
+```text
+kubectl get all
+```
diff --git a/docs/src/main/sphinx/installation/kubernetes.rst b/docs/src/main/sphinx/installation/kubernetes.rst
deleted file mode 100644
index e7b5aeee5b22..000000000000
--- a/docs/src/main/sphinx/installation/kubernetes.rst
+++ /dev/null
@@ -1,394 +0,0 @@
-=============================
-Trino on Kubernetes with Helm
-=============================
-
-`Kubernetes <https://kubernetes.io>`_ is a container orchestration platform that
-allows you to deploy Trino and other applications in a repeatable manner across
-different types of infrastructure. This can range from deploying on your laptop
-using tools like `kind <https://kind.sigs.k8s.io>`_, to running on a managed
-Kubernetes service on cloud services like
-`Amazon Elastic Kubernetes Service <https://aws.amazon.com/eks>`_,
-`Google Kubernetes Engine <https://cloud.google.com/kubernetes-engine>`_,
-`Azure Kubernetes Service <https://azure.microsoft.com/services/kubernetes-service>`_,
-and others.
-
-The fastest way to run Trino on Kubernetes is to use the
-`Trino Helm chart <https://github.com/trinodb/charts>`_.
-`Helm <https://helm.sh>`_ is a package manager for Kubernetes applications that
-allows for simpler installation and versioning by templating Kubernetes
-configuration files. This allows you to prototype on your local or on-premise
-cluster and use the same deployment mechanism to deploy to the cloud to scale
-up.
-
-Requirements
-------------
-
-* A Kubernetes cluster with a
-  `supported version <https://kubernetes.io/releases/>`_ of Kubernetes.
-
-  * If you don't have a Kubernetes cluster, you can
-    :ref:`run one locally using kind <running-a-local-kubernetes-cluster-with-kind>`.
-
-* `kubectl <https://kubernetes.io/docs/tasks/tools/#kubectl>`_ with a version
-   that adheres to the
-   `Kubernetes version skew policy <https://kubernetes.io/releases/version-skew-policy/>`_
-   installed on the machine managing the Kubernetes deployment.
-
-* `helm <https://helm.sh>`_ with a version that adheres to the
-  `Helm version skew policy <https://helm.sh/docs/topics/version_skew/>`_
-  installed on the machine managing the Kubernetes deployment.
-
-.. _running-trino-using-helm:
-
-Running Trino using Helm
-------------------------
-
-Run the following commands from the system with ``helm`` and ``kubectl``
-installed and configured to connect to your running Kubernetes cluster:
-
-#. Validate ``kubectl`` is pointing to the correct cluster by running the
-   command:
-
-   .. code-block:: text
-
-      kubectl cluster-info
-
-   You should see output that shows the correct Kubernetes control plane
-   address.
-
-#. Add the Trino Helm chart repository to Helm if you haven't done so already.
-   This tells Helm where to find the Trino charts. You can name the repository
-   whatever you want, ``trino`` is a good choice.
-
-   .. code-block:: text
-
-       helm repo add trino https://trinodb.github.io/charts
-
-#. Install Trino on the Kubernetes cluster using the Helm chart. Start by
-   running the ``install`` command to use all default values and create
-   a cluster called ``example-trino-cluster``.
-
-   .. code-block:: text
-
-       helm install example-trino-cluster trino/trino
-
-   This generates the Kubernetes configuration files by inserting properties
-   into helm templates. The Helm chart contains
-   `default values <https://trinodb.github.io/charts/charts/trino/>`_
-   that can be overridden by a YAML file to update default settings.
-
-   #. *(Optional)* To override the default values,
-      :ref:`create your own YAML configuration <creating-your-own-yaml>` to
-      define the parameters of your deployment. To run the install command using
-      the ``example.yaml``, add the ``f`` parameter in you ``install`` command.
-      Be sure to follow
-      :ref:`best practices and naming conventions <kubernetes-configuration-best-practices>`
-      for your configuration files.
-
-      .. code-block:: text
-
-          helm install -f example.yaml example-trino-cluster trino/trino
-
-   You should see output as follows:
-
-   .. code-block:: text
-
-       NAME: example-trino-cluster
-       LAST DEPLOYED: Tue Sep 13 14:12:09 2022
-       NAMESPACE: default
-       STATUS: deployed
-       REVISION: 1
-       TEST SUITE: None
-       NOTES:
-       Get the application URL by running these commands:
-         export POD_NAME=$(kubectl get pods --namespace default -l "app=trino,release=example-trino-cluster,component=coordinator" -o jsonpath="{.items[0].metadata.name}")
-         echo "Visit http://127.0.0.1:8080 to use your application"
-         kubectl port-forward $POD_NAME 8080:8080
-
-   This output depends on your configuration and cluster name. For example, the
-   port ``8080`` is set by the ``.service.port`` in the ``example.yaml``.
-
-#. Run the following command to check that all pods, deployments, and services
-   are running properly.
-
-   .. code-block:: text
-
-      kubectl get all
-
-   You should expect to see output that shows running pods, deployments, and
-   replica sets. A good indicator that everything is running properly is to see
-   all pods are returning a ready status in the  ``READY`` column.
-
-   .. code-block:: text
-
-       NAME                                               READY   STATUS    RESTARTS   AGE
-       pod/example-trino-cluster-coordinator-bfb74c98d-rnrxd   1/1     Running   0          161m
-       pod/example-trino-cluster-worker-76f6bf54d6-hvl8n       1/1     Running   0          161m
-       pod/example-trino-cluster-worker-76f6bf54d6-tcqgb       1/1     Running   0          161m
-
-       NAME                       TYPE        CLUSTER-IP    EXTERNAL-IP   PORT(S)    AGE
-       service/example-trino-cluster   ClusterIP   10.96.25.35   <none>        8080/TCP   161m
-
-       NAME                                           READY   UP-TO-DATE   AVAILABLE   AGE
-       deployment.apps/example-trino-cluster-coordinator   1/1     1            1           161m
-       deployment.apps/example-trino-cluster-worker        2/2     2            2           161m
-
-       NAME                                                     DESIRED   CURRENT   READY   AGE
-       replicaset.apps/example-trino-cluster-coordinator-bfb74c98d   1         1         1       161m
-       replicaset.apps/example-trino-cluster-worker-76f6bf54d6       2         2         2       161m
-
-   The output shows running pods. These include the actual Trino containers. To
-   better understand this output, check out the following resources:
-
-   #. `kubectl get command reference <https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#get>`_.
-   #. `kubectl get command example <https://kubernetes.io/docs/reference/kubectl/docker-cli-to-kubectl/#docker-ps>`_.
-   #. `Debugging Kubernetes reference <https://kubernetes.io/docs/tasks/debug/>`_.
-
-#. If all pods, deployments, and replica sets are running and in the ready
-   state, Trino has been successfully deployed.
-
-.. note::
-
-      Unlike some Kubernetes applications, where it's better to have many small
-      pods, Trino works best with fewer pods each having more resources
-      available. We strongly recommend to avoid having multiple Trino pods on a
-      single physical host to avoid contention for resources.
-
-Executing queries
------------------
-
-The pods running the Trino containers are all running on a private network
-internal to Kubernetes. In order to access them, specifically the coordinator,
-you need to create a tunnel to the coordinator pod and your computer. You can do
-this by running the commands generated upon installation.
-
-#. Store the coordinator pod name in a shell variable called ``POD_NAME``.
-
-   .. code-block:: text
-
-       POD_NAME=$(kubectl get pods -l "app=trino,release=example-trino-cluster,component=coordinator" -o name)
-
-#. Create the tunnel from the coordinator pod to the client.
-
-   .. code-block:: text
-
-       kubectl port-forward $POD_NAME 8080:8080
-
-   Now you can connect to the Trino coordinator at ``http://localhost:8080``.
-
-#. To connect to Trino, you can use the
-   :doc:`command-line interface </client/cli>`, a
-   :doc:`JDBC client </client/jdbc>`, or any of the
-   :doc:`other clients </client>`. For this example,
-   :ref:`install the command-line interface <cli-installation>`, and connect to
-   Trino in a new console session.
-
-   .. code-block:: text
-
-       trino --server http://localhost:8080
-
-#. Using the sample data in the ``tpch`` catalog, type and execute a query on
-   the ``nation`` table using the ``tiny`` schema:
-
-   .. code-block:: text
-
-       trino> select count(*) from tpch.tiny.nation;
-        _col0
-       -------
-         25
-       (1 row)
-
-       Query 20181105_001601_00002_e6r6y, FINISHED, 1 node
-       Splits: 21 total, 21 done (100.00%)
-       0:06 [25 rows, 0B] [4 rows/s, 0B/s]
-
-   Try other SQL queries to explore the data set and test your cluster.
-
-#. Once you are done with your exploration, enter the ``quit`` command in the
-   CLI.
-
-#. Kill the tunnel to the coordinator pod. The is only available while the
-   ``kubectl`` process is running, so you can just kill the ``kubectl`` process
-   that's forwarding the port. In most cases that means pressing ``CTRL`` +
-   ``C`` in the terminal where the port-forward command is running.
-
-Configuration
--------------
-
-The Helm chart uses the :doc:`Trino container image </installation/containers>`.
-The Docker image already contains a default configuration to get started, and
-some catalogs to allow you to explore Trino. Kubernetes allows you to mimic a
-:doc:`traditional deployment </installation/deployment>` by supplying
-configuration in YAML files. It's important to understand how files such as the
-Trino configuration, JVM, and various :doc:`catalog properties </connector>` are
-configured in Trino before updating the values.
-
-.. _creating-your-own-yaml:
-
-Creating your own YAML configuration
-""""""""""""""""""""""""""""""""""""
-
-When you use your own YAML Kubernetes configuration, you only override the values you specify.
-The remaining properties use their default values. Add an ``example.yaml`` with
-the following configuration:
-
-.. code-block:: yaml
-
-   image:
-     tag: "|trino_version|"
-   server:
-     workers: 3
-   coordinator:
-     jvm:
-       maxHeapSize: "8G"
-   worker:
-     jvm:
-       maxHeapSize: "8G"
-
-These values are higher than the defaults and allow Trino to use more memory
-and run more demanding queries. If the values are too high, Kubernetes might
-not be able to schedule some Trino pods, depending on other applications
-deployed in this cluster and the size of the cluster nodes.
-
-#. ``.image.tag`` is set to the current version, |trino_version|. Set
-   this value if you need to use a specific version of Trino. The default is
-   ``latest``, which is not recommended. Using ``latest`` will publish a new
-   version of Trino with each release and a following Kubernetes deployment.
-#. ``.server.workers`` is set to ``3``. This value sets the number of
-   workers, in this case, a coordinator and three worker nodes are deployed.
-#. ``.coordinator.jvm.maxHeapSize`` is set to ``8GB``.
-   This sets the maximum heap size in the JVM of the coordinator. See
-   :ref:`jvm_config`.
-#. ``.worker.jvm.maxHeapSize`` is set to ``8GB``.
-   This sets the maximum heap size in the JVM of the worker. See
-   :ref:`jvm_config`.
-
-.. warning::
-
-  Some memory settings need to be tuned carefully as setting some values
-  outside of the range of the maximum heap size will cause Trino startup to
-  fail. See the warnings listed on :doc:`/admin/properties-resource-management`.
-
-Reference `the full list of properties <https://trinodb.github.io/charts/charts/trino/>`_
-that can be overridden in the Helm chart.
-
-.. _kubernetes-configuration-best-practices:
-
-.. note::
-
-   Although ``example.yaml`` is used to refer to the Kubernetes configuration
-   file in this document, you should use clear naming guidelines for the cluster
-   and deployment you are managing. For example,
-   ``cluster-example-trino-etl.yaml`` might refer to a Trino deployment for a
-   cluster used primarily for extract-transform-load queries deployed on the
-   ``example`` Kubernetes cluster. See
-   `Configuration Best Practices <https://kubernetes.io/docs/concepts/configuration/overview/>`_
-   for more tips on configuring Kubernetes deployments.
-
-Adding catalogs
-"""""""""""""""
-
-A common use-case is to add custom catalogs. You can do this by adding values to
-the ``additionalCatalogs`` property in the ``example.yaml`` file.
-
-.. code-block:: yaml
-
-    additionalCatalogs:
-      lakehouse.properties: |-
-        connector.name=iceberg
-        hive.metastore.uri=thrift://example.net:9083
-      rdbms.properties: |-
-        connector.name=postgresql
-        connection-url=jdbc:postgresql://example.net:5432/database
-        connection-user=root
-        connection-password=secret
-
-This adds both ``lakehouse`` and ``rdbms`` catalogs to the Kubernetes deployment
-configuration.
-
-.. _running-a-local-kubernetes-cluster-with-kind:
-
-Running a local Kubernetes cluster with kind
---------------------------------------------
-
-For local deployments, you can use
-`kind (Kubernetes in Docker) <https://kind.sigs.k8s.io>`_. Follow the steps
-below to run ``kind`` on your system.
-
-#. ``kind`` runs on `Docker <https://www.docker.com>`_, so first check if Docker
-   is installed:
-
-   .. code-block:: text
-
-      docker --version
-
-   If this command fails, install Docker by following
-   `Docker installation instructions <https://docs.docker.com/engine/install/>`_.
-
-#. Install ``kind`` by following the
-   `kind installation instructions <https://kind.sigs.k8s.io/docs/user/quick-start/#installation>`_.
-
-#. Run a Kubernetes cluster in ``kind`` by running the command:
-
-   .. code-block:: text
-
-      kind create cluster --name trino
-
-   .. note::
-
-      The ``name`` parameter is optional but is used to showcase how the
-      namespace is applied in future commands. The cluster name defaults to
-      ``kind`` if no parameter is added. Use ``trino`` to make the application
-      on this cluster obvious.
-
-#. Verify that ``kubectl`` is running against the correct Kubernetes cluster.
-
-   .. code-block:: text
-
-      kubectl cluster-info --context kind-trino
-
-   If you have multiple Kubernetes clusters already configured within
-   ``~/.kube/config``, you need to pass the ``context`` parameter to the
-   ``kubectl`` commands to operate with the local ``kind`` cluster. ``kubectl``
-   uses the
-   `default context <https://kubernetes.io/docs/reference/kubectl/cheatsheet/#kubectl-context-and-configuration>`_
-   if this parameter isn't supplied. Notice the context is the name of the
-   cluster with the ``kind-`` prefix added. Now you can look at all the
-   Kubernetes objects running on your ``kind`` cluster.
-
-#. Set up Trino by folling the :ref:`running-trino-using-helm` steps. When
-   running the ``kubectl get all`` command, add the ``context`` parameter.
-
-   .. code-block:: text
-
-      kubectl get all --context kind-trino
-
-#. Run some queries by following the `Executing queries`_ steps.
-
-#. Once you are done with the cluster using kind, you can delete the cluster.
-
-   .. code-block:: text
-
-      kind delete cluster -n trino
-
-Cleaning up
------------
-
-To uninstall Trino from the Kubernetes cluster, run the following command:
-
-.. code-block:: text
-
-    helm uninstall my-trino-cluster
-
-You should expect to see the following output:
-
-.. code-block:: text
-
-    release "my-trino-cluster" uninstalled
-
-To validate that this worked, you can run this ``kubectl`` command to make sure
-there are no remaining Kubernetes objects related to the Trino cluster.
-
-.. code-block:: text
-
-     kubectl get all
diff --git a/docs/src/main/sphinx/installation/query-resiliency.md b/docs/src/main/sphinx/installation/query-resiliency.md
new file mode 100644
index 000000000000..0fc718bb1d8d
--- /dev/null
+++ b/docs/src/main/sphinx/installation/query-resiliency.md
@@ -0,0 +1,110 @@
+# Improve query processing resilience
+
+You can configure Trino to be more resilient against failures during query
+processing by enabling fault-tolerant execution. This allows Trino to handle
+larger queries such as batch operations without worker node interruptions
+causing the query to fail.
+
+When configured, the Trino cluster buffers data used by workers during query
+processing. If processing on a worker node fails for any reason, such as a
+network outage or running out of available resources, the coordinator
+reschedules processing of the failed piece of work on another worker. This
+allows query processing to continue using buffered data.
+
+## Architecture
+
+The coordinator node uses a configured exchange manager service that buffers
+data during query processing in an external location, such as an S3 object
+storage bucket. Worker nodes send data to the buffer as they execute their
+query tasks.
+
+## Best practices and considerations
+
+A fault-tolerant cluster is best suited for large batch queries. Users may
+experience latency or similar behavior if they issue a high volume of
+short-running queries on a fault-tolerant cluster. As such, it is recommended to
+run a dedicated fault-tolerant cluster for handling batch operations, separate
+from a cluster that is designated for a higher query volume.
+
+Catalogs using the following connectors support fault-tolerant execution of read
+and write operations:
+
+- {doc}`/connector/delta-lake`
+- {doc}`/connector/hive`
+- {doc}`/connector/iceberg`
+- {doc}`/connector/mysql`
+- {doc}`/connector/postgresql`
+- {doc}`/connector/sqlserver`
+
+Catalogs using other connectors only support fault-tolerant execution of read
+operations. When fault-tolerant execution is enabled on a cluster, write
+operations fail on any catalogs that do not support fault-tolerant
+execution of those operations.
+
+The exchange manager may send a large amount of data to the exchange storage,
+resulting in high I/O load on that storage. You can configure multiple storage
+locations for use by the exchange manager to help balance the I/O load between
+them.
+
+## Configuration
+
+The following steps describe how to configure a Trino cluster for
+fault-tolerant execution with an S3-based exchange:
+
+1. Set up an S3 bucket to use as the exchange storage. For this example we are
+   using an AWS S3 bucket, but other storage options are described in the
+   {doc}`reference documentation </admin/fault-tolerant-execution>`
+   as well. You can use multiple S3 buckets for exchange storage.
+
+   For each bucket in AWS, collect the following information:
+
+   - S3 URI location for the bucket, such as `s3://exchange-spooling-bucket`
+   - Region that the bucket is located in, such as `us-west-1`
+   - AWS access and secret keys for the bucket
+
+2. For a {doc}`Kubernetes deployment of Trino </installation/kubernetes>`, add
+   the following exchange manager configuration in the
+   `server.exchangeManager` and `additionalExchangeManagerProperties`
+   sections of the Helm chart, using the gathered S3 bucket information:
+
+   ```yaml
+   server:
+     exchangeManager:
+       name=filesystem
+       base-directories=s3://exchange-spooling-bucket-1,s3://exchange-spooling-bucket-2
+
+   additionalExchangeManagerProperties:
+     s3.region=us-west-1
+     s3.aws-access-key=example-access-key
+     s3.aws-secret-key=example-secret-key
+   ```
+
+   In non-Kubernetes installations, the same properties must be defined in an
+   `exchange-manager.properties` configuration file on the coordinator and
+   all worker nodes.
+
+3. Add the following configuration for fault-tolerant execution in the
+   `additionalConfigProperties:` section of the Helm chart:
+
+   ```yaml
+   additionalConfigProperties:
+     retry-policy=TASK
+   ```
+
+   In non-Kubernetes installations, the same property must be defined in the
+   `config.properties` file on the coordinator and all worker nodes.
+
+4. Re-deploy your instance of Trino or, for non-Kubernetes
+   installations, restart the cluster.
+
+Your Trino cluster is now configured with fault-tolerant query
+execution. If a query run on the cluster would normally fail due to an
+interruption of query processing, fault-tolerant execution now resumes the
+query processing to ensure successful execution of the query.
+
+## Next steps
+
+For more information about fault-tolerant execution, including simple query
+retries that do not require an exchange manager and advanced configuration
+operations, see the {doc}`reference documentation
+</admin/fault-tolerant-execution>`.
diff --git a/docs/src/main/sphinx/installation/query-resiliency.rst b/docs/src/main/sphinx/installation/query-resiliency.rst
deleted file mode 100644
index 8fa0fe4cc923..000000000000
--- a/docs/src/main/sphinx/installation/query-resiliency.rst
+++ /dev/null
@@ -1,118 +0,0 @@
-===================================
-Improve query processing resilience
-===================================
-
-You can configure Trino to be more resilient against failures during query
-processing by enabling fault-tolerant execution. This allows Trino to handle
-larger queries such as batch operations without worker node interruptions
-causing the query to fail.
-
-When configured, the Trino cluster buffers data used by workers during query
-processing. If processing on a worker node fails for any reason, such as a
-network outage or running out of available resources, the coordinator
-reschedules processing of the failed piece of work on another worker. This
-allows query processing to continue using buffered data.
-
-Architecture
-------------
-
-The coordinator node uses a configured exchange manager service that buffers
-data during query processing in an external location, such as an S3 object
-storage bucket. Worker nodes send data to the buffer as they execute their
-query tasks.
-
-Best practices and considerations
----------------------------------
-
-A fault-tolerant cluster is best suited for large batch queries. Users may
-experience latency or similar behavior if they issue a high volume of
-short-running queries on a fault-tolerant cluster. As such, it is recommended to
-run a dedicated fault-tolerant cluster for handling batch operations, separate
-from a cluster that is designated for a higher query volume.
-
-Catalogs using the following connectors support fault-tolerant execution of read
-and write operations:
-
-* :doc:`/connector/delta-lake`
-* :doc:`/connector/hive`
-* :doc:`/connector/iceberg`
-* :doc:`/connector/mysql`
-* :doc:`/connector/postgresql`
-* :doc:`/connector/sqlserver`
-
-Catalogs using other connectors only support fault-tolerant execution of read
-operations. When fault-tolerant execution is enabled on a cluster, write
-operations fail on any catalogs that do not support fault-tolerant
-execution of those operations.
-
-The exchange manager may send a large amount of data to the exchange storage,
-resulting in high I/O load on that storage. You can configure multiple storage
-locations for use by the exchange manager to help balance the I/O load between
-them.
-
-Configuration
--------------
-
-The following steps describe how to configure a Trino cluster for
-fault-tolerant execution with an S3-based exchange:
-
-1. Set up an S3 bucket to use as the exchange storage. For this example we are
-   using an AWS S3 bucket, but other storage options are described in the
-   :doc:`reference documentation </admin/fault-tolerant-execution>`
-   as well. You can use multiple S3 buckets for exchange storage.
-
-   For each bucket in AWS, collect the following information:
-
-   * S3 URI location for the bucket, such as ``s3://exchange-spooling-bucket``
-
-   * Region that the bucket is located in, such as ``us-west-1``
-
-   * AWS access and secret keys for the bucket
-
-2. For a :doc:`Kubernetes deployment of Trino </installation/kubernetes>`, add
-   the following exchange manager configuration in the
-   ``server.exchangeManager`` and ``additionalExchangeManagerProperties``
-   sections of the Helm chart, using the gathered S3 bucket information:
-
-   .. code-block:: yaml
-
-       server:
-         exchangeManager:
-           name=filesystem
-           base-directories=s3://exchange-spooling-bucket-1,s3://exchange-spooling-bucket-2
-
-       additionalExchangeManagerProperties:
-         s3.region=us-west-1
-         s3.aws-access-key=example-access-key
-         s3.aws-secret-key=example-secret-key
-
-   In non-Kubernetes installations, the same properties must be defined in an
-   ``exchange-manager.properties`` configuration file on the coordinator and
-   all worker nodes.
-
-3. Add the following configuration for fault-tolerant execution in the
-   ``additionalConfigProperties:`` section of the Helm chart:
-
-   .. code-block:: yaml
-
-       additionalConfigProperties:
-         retry-policy=TASK
-
-   In non-Kubernetes installations, the same property must be defined in the
-   ``config.properties`` file on the coordinator and all worker nodes.
-
-4. Re-deploy your instance of Trino or, for non-Kubernetes
-   installations, restart the cluster.
-
-Your Trino cluster is now configured with fault-tolerant query
-execution. If a query run on the cluster would normally fail due to an
-interruption of query processing, fault-tolerant execution now resumes the
-query processing to ensure successful execution of the query.
-
-Next steps
-----------
-
-For more information about fault-tolerant execution, including simple query
-retries that do not require an exchange manager and advanced configuration
-operations, see the :doc:`reference documentation
-</admin/fault-tolerant-execution>`.
diff --git a/docs/src/main/sphinx/installation/rpm.md b/docs/src/main/sphinx/installation/rpm.md
new file mode 100644
index 000000000000..ca2ebe311014
--- /dev/null
+++ b/docs/src/main/sphinx/installation/rpm.md
@@ -0,0 +1,87 @@
+# RPM package
+
+Users can install Trino using the RPM Package Manager (RPM) on some Linux
+distributions that support RPM.
+
+The RPM archive contains the application, all plugins, the necessary default
+configuration files, default setups, and integration with the operating system
+to start as a service.
+
+:::{warning}
+It is recommended to deploy Trino with the {doc}`Helm chart <kubernetes>` on
+Kubernetes or manually with the {doc}`Docker containers <containers>` or the
+{doc}`tar archive <deployment>`. While the RPM is available for use, it is
+discouraged in favor of the tarball or Docker containers.
+:::
+
+## Installing Trino
+
+Download the Trino server RPM package {maven_download}`server-rpm`. Use the
+`rpm` command to install the package:
+
+```text
+rpm -i trino-server-rpm-*.rpm --nodeps
+```
+
+Installing the {ref}`required Java and Python setup <requirements>` must be
+managed separately.
+
+## Service script
+
+The RPM installation deploys a service script configured with `systemctl` so
+that the service can be started automatically on operating system boot. After
+installation, you can manage the Trino server with the `service` command:
+
+```text
+service trino [start|stop|restart|status]
+```
+
+:::{list-table} `service` commands
+:widths: 15, 85
+:header-rows: 1
+
+* - Command
+  - Action
+* - `start`
+  - Starts the server as a daemon and returns its process ID.
+* - `stop`
+  - Shuts down a server started with either `start` or `run`. Sends the
+    SIGTERM signal.
+* - `restart`
+  - Stops and then starts a running server, or starts a stopped server,
+    assigning a new process ID.
+* - `status`
+  - Prints a status line, either *Stopped pid* or *Running as pid*.
+:::
+
+## Installation directory structure
+
+The RPM installation places Trino files in accordance with the Linux Filesystem
+Hierarchy Standard using the following directory structure:
+
+- `/usr/lib/trino/lib/`: Contains the various libraries needed to run the
+  product. Plugins go in a `plugin` subdirectory.
+- `/etc/trino`: Contains the general Trino configuration files like
+  `node.properties`, `jvm.config`, `config.properties`. Catalog
+  configurations go in a `catalog` subdirectory.
+- `/etc/trino/env.sh`: Contains the Java installation path used by Trino,
+  allows configuring process environment variables, including {doc}`secrets
+  </security/secrets>`.
+- `/var/log/trino`: Contains the log files.
+- `/var/lib/trino/data`: The location of the data directory. Trino stores logs
+  and other data here.
+- `/etc/rc.d/init.d/trino`: Contains the service scripts for controlling the
+  server process, and launcher configuration for file paths.
+
+## Uninstalling
+
+Uninstalling the RPM is like uninstalling any other RPM, just run:
+
+```text
+rpm -e trino-server-rpm-<version>
+```
+
+Note: During uninstall, all Trino related files are deleted except for
+user-created configuration files, copies of the original configuration files
+`node.properties.rpmsave` and `env.sh.rpmsave` located in the `/etc/trino`
+directory, and the Trino logs directory `/var/log/trino`.
diff --git a/docs/src/main/sphinx/installation/rpm.rst b/docs/src/main/sphinx/installation/rpm.rst
deleted file mode 100644
index a65402a6f2d9..000000000000
--- a/docs/src/main/sphinx/installation/rpm.rst
+++ /dev/null
@@ -1,94 +0,0 @@
-================
-RPM package
-================
-
-Users can install Trino using the RPM Package Manager (RPM) on some Linux
-distributions that support RPM.
-
-The RPM archive contains the application, all plugins, the necessary default
-configuration files, default setups, and integration with the operating system
-to start as a service.
-
-..  warning::
-
-  It is recommended to deploy Trino with the :doc:`Helm chart <kubernetes>` on
-  Kubernetes or manually with the :doc:`Docker containers <containers>` or the
-  :doc:`tar archive <deployment>`. While the RPM is available for use, it is
-  discouraged in favor of the tarball or Docker containers.
-
-Installing Trino
-----------------
-
-Download the Trino server RPM package :maven_download:`server-rpm`. Use the
-``rpm`` command to install the package:
-
-.. code-block:: text
-
-    rpm -i trino-server-rpm-*.rpm --nodeps
-
-Installing the :ref:`required Java and Python setup <requirements>` must be
-managed separately.
-
-Service script
---------------
-
-The RPM installation deploys a service script configured with ``systemctl`` so
-that the service can be started automatically on operating system boot. After
-installation, you can manage the Trino server with the ``service`` command:
-
-.. code-block:: text
-
-    service trino [start|stop|restart|status]
-
-.. list-table:: ``service`` commands
-  :widths: 15, 85
-  :header-rows: 1
-
-  * - Command
-    - Action
-  * - ``start``
-    - Starts the server as a daemon and returns its process ID.
-  * - ``stop``
-    - Shuts down a server started with either ``start`` or ``run``. Sends the
-      SIGTERM signal.
-  * - ``restart``
-    - Stops and then starts a running server, or starts a stopped server,
-      assigning a new process ID.
-  * - ``status``
-    - Prints a status line, either *Stopped pid* or *Running as pid*.
-
-Installation directory structure
---------------------------------
-
-The RPM installation places Trino files in accordance with the Linux Filesystem
-Hierarchy Standard using the following directory structure:
-
-* ``/usr/lib/trino/lib/``: Contains the various libraries needed to run the
-  product. Plugins go in a ``plugin`` subdirectory.
-* ``/etc/trino``: Contains the general Trino configuration files like
-  ``node.properties``, ``jvm.config``, ``config.properties``. Catalog
-  configurations go in a ``catalog`` subdirectory.
-* ``/etc/trino/env.sh``: Contains the Java installation path used by Trino,
-  allows configuring process environment variables, including :doc:`secrets
-  </security/secrets>`.
-* ``/var/log/trino``: Contains the log files.
-* ``/var/lib/trino/data``: The location of the data directory. Trino stores logs
-  and other data here.
-* ``/etc/rc.d/init.d/trino``: Contains the service scripts for controlling the
-  server process, and launcher configuration for file paths.
-
-Uninstalling
-------------
-
-Uninstalling the RPM is like uninstalling any other RPM, just run:
-
-.. code-block:: text
-
-    rpm -e trino-server-rpm-<version>
-
-Note: During uninstall, all Trino related files are deleted except for
-user-created configuration files, copies of the original configuration files
-``node.properties.rpmsave`` and ``env.sh.rpmsave`` located in the ``/etc/trino``
-directory, and the Trino logs directory ``/var/log/trino``.
-
-
diff --git a/docs/src/main/sphinx/language.md b/docs/src/main/sphinx/language.md
new file mode 100644
index 000000000000..9c163f9252ef
--- /dev/null
+++ b/docs/src/main/sphinx/language.md
@@ -0,0 +1,31 @@
+# SQL language
+
+Trino is an ANSI SQL compliant query engine. This standard compliance allows
+Trino users to integrate their favorite data tools, including BI and ETL tools
+with any underlying data source.
+
+Trino validates and translates the received SQL statements into the necessary
+operations on the connected data source.
+
+This section provides a reference to the supported SQL data types and other
+general characteristics of the SQL support of Trino.
+
+Refer to the following sections for further details:
+
+* [SQL statement and syntax reference](/sql)
+* [SQL functions and operators](/functions)
+
+
+```{toctree}
+:maxdepth: 2
+
+language/sql-support
+language/types
+```
+
+```{toctree}
+:maxdepth: 1
+
+language/reserved
+language/comments
+```
diff --git a/docs/src/main/sphinx/language.rst b/docs/src/main/sphinx/language.rst
deleted file mode 100644
index 6b7d2857d953..000000000000
--- a/docs/src/main/sphinx/language.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-************
-SQL language
-************
-
-Trino is an ANSI SQL compliant query engine. This standard compliance allows
-Trino users to integrate their favorite data tools, including BI and ETL tools
-with any underlying data source.
-
-Trino validates and translates the received SQL statements into the necessary
-operations on the connected data source.
-
-This chapter provides a reference to the supported SQL data types and other
-general characteristics of the SQL support of Trino.
-
-A :doc:`full SQL statement and syntax reference<sql>` is
-available in a separate chapter.
-
-Trino also provides :doc:`numerous SQL functions and operators<functions>`.
-
-.. toctree::
-    :maxdepth: 2
-
-    language/sql-support
-    language/types
-    language/reserved
diff --git a/docs/src/main/sphinx/language/comments.md b/docs/src/main/sphinx/language/comments.md
new file mode 100644
index 000000000000..eb16146388c5
--- /dev/null
+++ b/docs/src/main/sphinx/language/comments.md
@@ -0,0 +1,26 @@
+# Comments
+
+## Synopsis
+
+Comments are part of a SQL statement or script that are ignored for processing.
+Comments begin with double dashes and extend to the end of the line. Block
+comments begin with `/*` and extend to the next occurrence of `*/`, possibly
+spanning over multiple lines.
+
+## Examples
+
+The following example displays a comment line, a comment after a valid
+statement, and a block comment:
+
+```sql
+-- This is a comment.
+SELECT * FROM table; -- This comment is ignored.
+
+/* This is a block comment
+   that spans multiple lines
+   until it is closed. */
+```
+
+## See also
+
+[](/sql/comment)
diff --git a/docs/src/main/sphinx/language/reserved.md b/docs/src/main/sphinx/language/reserved.md
new file mode 100644
index 000000000000..a33d122c8af9
--- /dev/null
+++ b/docs/src/main/sphinx/language/reserved.md
@@ -0,0 +1,125 @@
+# Keywords and identifiers
+
+(language-keywords)=
+## Reserved keywords
+
+The following table lists all of the keywords that are reserved in Trino,
+along with their status in the SQL standard. These reserved keywords must
+be quoted (using double quotes) in order to be used as an identifier.
+
+| Keyword             | SQL:2016 | SQL-92   |
+| ------------------- | -------- | -------- |
+| `ALTER`             | reserved | reserved |
+| `AND`               | reserved | reserved |
+| `AS`                | reserved | reserved |
+| `BETWEEN`           | reserved | reserved |
+| `BY`                | reserved | reserved |
+| `CASE`              | reserved | reserved |
+| `CAST`              | reserved | reserved |
+| `CONSTRAINT`        | reserved | reserved |
+| `CREATE`            | reserved | reserved |
+| `CROSS`             | reserved | reserved |
+| `CUBE`              | reserved |          |
+| `CURRENT_CATALOG`   | reserved |          |
+| `CURRENT_DATE`      | reserved | reserved |
+| `CURRENT_PATH`      | reserved |          |
+| `CURRENT_ROLE`      | reserved | reserved |
+| `CURRENT_SCHEMA`    | reserved |          |
+| `CURRENT_TIME`      | reserved | reserved |
+| `CURRENT_TIMESTAMP` | reserved | reserved |
+| `CURRENT_USER`      | reserved |          |
+| `DEALLOCATE`        | reserved | reserved |
+| `DELETE`            | reserved | reserved |
+| `DESCRIBE`          | reserved | reserved |
+| `DISTINCT`          | reserved | reserved |
+| `DROP`              | reserved | reserved |
+| `ELSE`              | reserved | reserved |
+| `END`               | reserved | reserved |
+| `ESCAPE`            | reserved | reserved |
+| `EXCEPT`            | reserved | reserved |
+| `EXECUTE`           | reserved | reserved |
+| `EXISTS`            | reserved | reserved |
+| `EXTRACT`           | reserved | reserved |
+| `FALSE`             | reserved | reserved |
+| `FOR`               | reserved | reserved |
+| `FROM`              | reserved | reserved |
+| `FULL`              | reserved | reserved |
+| `GROUP`             | reserved | reserved |
+| `GROUPING`          | reserved |          |
+| `HAVING`            | reserved | reserved |
+| `IN`                | reserved | reserved |
+| `INNER`             | reserved | reserved |
+| `INSERT`            | reserved | reserved |
+| `INTERSECT`         | reserved | reserved |
+| `INTO`              | reserved | reserved |
+| `IS`                | reserved | reserved |
+| `JOIN`              | reserved | reserved |
+| `JSON_ARRAY`        | reserved |          |
+| `JSON_EXISTS`       | reserved |          |
+| `JSON_OBJECT`       | reserved |          |
+| `JSON_QUERY`        | reserved |          |
+| `JSON_TABLE`        | reserved |          |
+| `JSON_VALUE`        | reserved |          |
+| `LEFT`              | reserved | reserved |
+| `LIKE`              | reserved | reserved |
+| `LISTAGG`           | reserved |          |
+| `LOCALTIME`         | reserved |          |
+| `LOCALTIMESTAMP`    | reserved |          |
+| `NATURAL`           | reserved | reserved |
+| `NORMALIZE`         | reserved |          |
+| `NOT`               | reserved | reserved |
+| `NULL`              | reserved | reserved |
+| `ON`                | reserved | reserved |
+| `OR`                | reserved | reserved |
+| `ORDER`             | reserved | reserved |
+| `OUTER`             | reserved | reserved |
+| `PREPARE`           | reserved | reserved |
+| `RECURSIVE`         | reserved |          |
+| `RIGHT`             | reserved | reserved |
+| `ROLLUP`            | reserved |          |
+| `SELECT`            | reserved | reserved |
+| `SKIP`              | reserved |          |
+| `TABLE`             | reserved | reserved |
+| `THEN`              | reserved | reserved |
+| `TRIM`              | reserved | reserved |
+| `TRUE`              | reserved | reserved |
+| `UESCAPE`           | reserved |          |
+| `UNION`             | reserved | reserved |
+| `UNNEST`            | reserved |          |
+| `USING`             | reserved | reserved |
+| `VALUES`            | reserved | reserved |
+| `WHEN`              | reserved | reserved |
+| `WHERE`             | reserved | reserved |
+| `WITH`              | reserved | reserved |
+
+(language-identifiers)=
+## Identifiers
+
+Tokens that identify names of catalogs, schemas, tables, columns, functions, or
+other objects, are identifiers.
+
+Identifiers must start with a letter, and subsequently include alphanumeric
+characters and underscores. Identifiers with other characters must be delimited
+with double quotes (`"`). When delimited with double quotes, identifiers can use
+any character. Escape a `"` with another preceding double quote in a delimited
+identifier.
+
+Identifiers are not treated as case sensitive.
+
+Following are some valid examples:
+
+```sql
+tablename
+SchemaName
+example_catalog.a_schema."table$partitions"
+"identifierWith""double""quotes"
+```
+
+The following identifiers are invalid in Trino and must be quoted when used:
+
+```text
+table-name
+123SchemaName
+colum$name@field
+```
+
diff --git a/docs/src/main/sphinx/language/reserved.rst b/docs/src/main/sphinx/language/reserved.rst
deleted file mode 100644
index 0bb6c42c6c80..000000000000
--- a/docs/src/main/sphinx/language/reserved.rst
+++ /dev/null
@@ -1,93 +0,0 @@
-=================
-Reserved keywords
-=================
-
-The following table lists all of the keywords that are reserved in Trino,
-along with their status in the SQL standard. These reserved keywords must
-be quoted (using double quotes) in order to be used as an identifier.
-
-============================== ============= =============
-Keyword                        SQL:2016      SQL-92
-============================== ============= =============
-``ALTER``                      reserved      reserved
-``AND``                        reserved      reserved
-``AS``                         reserved      reserved
-``BETWEEN``                    reserved      reserved
-``BY``                         reserved      reserved
-``CASE``                       reserved      reserved
-``CAST``                       reserved      reserved
-``CONSTRAINT``                 reserved      reserved
-``CREATE``                     reserved      reserved
-``CROSS``                      reserved      reserved
-``CUBE``                       reserved
-``CURRENT_CATALOG``            reserved
-``CURRENT_DATE``               reserved      reserved
-``CURRENT_PATH``               reserved
-``CURRENT_ROLE``               reserved      reserved
-``CURRENT_SCHEMA``             reserved
-``CURRENT_TIME``               reserved      reserved
-``CURRENT_TIMESTAMP``          reserved      reserved
-``CURRENT_USER``               reserved
-``DEALLOCATE``                 reserved      reserved
-``DELETE``                     reserved      reserved
-``DESCRIBE``                   reserved      reserved
-``DISTINCT``                   reserved      reserved
-``DROP``                       reserved      reserved
-``ELSE``                       reserved      reserved
-``END``                        reserved      reserved
-``ESCAPE``                     reserved      reserved
-``EXCEPT``                     reserved      reserved
-``EXECUTE``                    reserved      reserved
-``EXISTS``                     reserved      reserved
-``EXTRACT``                    reserved      reserved
-``FALSE``                      reserved      reserved
-``FOR``                        reserved      reserved
-``FROM``                       reserved      reserved
-``FULL``                       reserved      reserved
-``GROUP``                      reserved      reserved
-``GROUPING``                   reserved
-``HAVING``                     reserved      reserved
-``IN``                         reserved      reserved
-``INNER``                      reserved      reserved
-``INSERT``                     reserved      reserved
-``INTERSECT``                  reserved      reserved
-``INTO``                       reserved      reserved
-``IS``                         reserved      reserved
-``JOIN``                       reserved      reserved
-``JSON_ARRAY``                 reserved
-``JSON_EXISTS``                reserved
-``JSON_OBJECT``                reserved
-``JSON_QUERY``                 reserved
-``JSON_VALUE``                 reserved
-``LEFT``                       reserved      reserved
-``LIKE``                       reserved      reserved
-``LISTAGG``                    reserved
-``LOCALTIME``                  reserved
-``LOCALTIMESTAMP``             reserved
-``NATURAL``                    reserved      reserved
-``NORMALIZE``                  reserved
-``NOT``                        reserved      reserved
-``NULL``                       reserved      reserved
-``ON``                         reserved      reserved
-``OR``                         reserved      reserved
-``ORDER``                      reserved      reserved
-``OUTER``                      reserved      reserved
-``PREPARE``                    reserved      reserved
-``RECURSIVE``                  reserved
-``RIGHT``                      reserved      reserved
-``ROLLUP``                     reserved
-``SELECT``                     reserved      reserved
-``SKIP``                       reserved
-``TABLE``                      reserved      reserved
-``THEN``                       reserved      reserved
-``TRIM``                       reserved      reserved
-``TRUE``                       reserved      reserved
-``UESCAPE``                    reserved
-``UNION``                      reserved      reserved
-``UNNEST``                     reserved
-``USING``                      reserved      reserved
-``VALUES``                     reserved      reserved
-``WHEN``                       reserved      reserved
-``WHERE``                      reserved      reserved
-``WITH``                       reserved      reserved
-============================== ============= =============
diff --git a/docs/src/main/sphinx/language/sql-support.md b/docs/src/main/sphinx/language/sql-support.md
new file mode 100644
index 000000000000..209bbd1a6924
--- /dev/null
+++ b/docs/src/main/sphinx/language/sql-support.md
@@ -0,0 +1,160 @@
+# SQL statement support
+
+The SQL statement support in Trino can be categorized into several topics. Many
+statements are part of the core engine and therefore available in all use cases.
+For example, you can always set session properties or inspect an explain plan
+and perform other actions with the {ref}`globally available statements
+<sql-globally-available>`.
+
+However, the details and architecture of the connected data sources can limit
+some SQL functionality. For example, if the data source does not support any
+write operations, then a {doc}`/sql/delete` statement cannot be executed against
+the data source.
+
+Similarly, if the underlying system does not have any security concepts, SQL
+statements like {doc}`/sql/create-role` cannot be supported by Trino and the
+connector.
+
+The categories of these different topics are related to {ref}`read operations
+<sql-read-operations>`, {ref}`write operations <sql-write-operations>`,
+{ref}`security operations <sql-security-operations>` and {ref}`transactions
+<sql-transactions>`.
+
+Details of the support for specific statements is available with the
+documentation for each connector.
+
+(sql-globally-available)=
+
+## Globally available statements
+
+The following statements are implemented in the core engine and available with
+any connector:
+
+- {doc}`/sql/call`
+- {doc}`/sql/deallocate-prepare`
+- {doc}`/sql/describe-input`
+- {doc}`/sql/describe-output`
+- {doc}`/sql/execute`
+- {doc}`/sql/execute-immediate`
+- {doc}`/sql/explain`
+- {doc}`/sql/explain-analyze`
+- {doc}`/sql/prepare`
+- {doc}`/sql/reset-session`
+- {doc}`/sql/set-session`
+- {doc}`/sql/set-time-zone`
+- {doc}`/sql/show-functions`
+- {doc}`/sql/show-session`
+- {doc}`/sql/use`
+- {doc}`/sql/values`
+
+(sql-read-operations)=
+
+## Read operations
+
+The following statements provide read access to data and meta data exposed by a
+connector accessing a data source. They are supported by all connectors:
+
+- {doc}`/sql/select` including {doc}`/sql/match-recognize`
+- {doc}`/sql/describe`
+- {doc}`/sql/show-catalogs`
+- {doc}`/sql/show-columns`
+- {doc}`/sql/show-create-materialized-view`
+- {doc}`/sql/show-create-schema`
+- {doc}`/sql/show-create-table`
+- {doc}`/sql/show-create-view`
+- {doc}`/sql/show-grants`
+- {doc}`/sql/show-roles`
+- {doc}`/sql/show-schemas`
+- {doc}`/sql/show-tables`
+- {doc}`/sql/show-stats`
+
+(sql-write-operations)=
+
+## Write operations
+
+The following statements provide write access to data and meta data exposed
+by a connector accessing a data source. Availability varies widely from
+connector to connector:
+
+(sql-data-management)=
+
+### Data management
+
+- {doc}`/sql/insert`
+- {doc}`/sql/update`
+- {doc}`/sql/delete`
+- {doc}`/sql/truncate`
+- {doc}`/sql/merge`
+
+(sql-materialized-view-management)=
+
+### Materialized view management
+
+- {doc}`/sql/create-materialized-view`
+- {doc}`/sql/alter-materialized-view`
+- {doc}`/sql/drop-materialized-view`
+- {doc}`/sql/refresh-materialized-view`
+
+(sql-schema-table-management)=
+
+### Schema and table management
+
+- {doc}`/sql/create-table`
+- {doc}`/sql/create-table-as`
+- {doc}`/sql/drop-table`
+- {doc}`/sql/alter-table`
+- {doc}`/sql/create-schema`
+- {doc}`/sql/drop-schema`
+- {doc}`/sql/alter-schema`
+- {doc}`/sql/comment`
+
+(sql-view-management)=
+
+### View management
+
+- {doc}`/sql/create-view`
+- {doc}`/sql/drop-view`
+- {doc}`/sql/alter-view`
+
+(sql-routine-management)=
+### Routine management
+
+The following statements are used to manage [catalog routines](routine-catalog):
+
+- [](/sql/create-function)
+- [](/sql/drop-function)
+- [](/sql/show-functions)
+
+(sql-security-operations)=
+
+## Security operations
+
+The following statements provide security-related operations to security
+configuration, data, and meta data exposed by a connector accessing a data
+source. Most connectors do not support these operations:
+
+Connector roles:
+
+- {doc}`/sql/create-role`
+- {doc}`/sql/drop-role`
+- {doc}`/sql/grant-roles`
+- {doc}`/sql/revoke-roles`
+- {doc}`/sql/set-role`
+- {doc}`/sql/show-role-grants`
+
+Grants management:
+
+- {doc}`/sql/deny`
+- {doc}`/sql/grant`
+- {doc}`/sql/revoke`
+
+(sql-transactions)=
+
+## Transactions
+
+The following statements manage transactions. Most connectors do not support
+transactions:
+
+- {doc}`/sql/start-transaction`
+- {doc}`/sql/commit`
+- {doc}`/sql/rollback`
diff --git a/docs/src/main/sphinx/language/sql-support.rst b/docs/src/main/sphinx/language/sql-support.rst
deleted file mode 100644
index 3e35a8baa956..000000000000
--- a/docs/src/main/sphinx/language/sql-support.rst
+++ /dev/null
@@ -1,160 +0,0 @@
-=====================
-SQL statement support
-=====================
-
-The SQL statement support in Trino can be categorized into several topics. Many
-statements are part of the core engine and therefore available in all use cases.
-For example, you can always set session properties or inspect an explain plan
-and perform other actions with the :ref:`globally available statements
-<sql-globally-available>`.
-
-However, the details and architecture of the connected data sources can limit
-some SQL functionality. For example, if the data source does not support any
-write operations, then a :doc:`/sql/delete` statement cannot be executed against
-the data source.
-
-Similarly, if the underlying system does not have any security concepts, SQL
-statements like :doc:`/sql/create-role` cannot be supported by Trino and the
-connector.
-
-The categories of these different topics are related to :ref:`read operations
-<sql-read-operations>`, :ref:`write operations <sql-write-operations>`,
-:ref:`security operations <sql-security-operations>` and :ref:`transactions
-<sql-transactions>`.
-
-Details of the support for specific statements is available with the
-documentation for each connector.
-
-.. _sql-globally-available:
-
-Globally available statements
------------------------------
-
-The following statements are implemented in the core engine and available with
-any connector:
-
-* :doc:`/sql/call`
-* :doc:`/sql/deallocate-prepare`
-* :doc:`/sql/describe-input`
-* :doc:`/sql/describe-output`
-* :doc:`/sql/execute`
-* :doc:`/sql/explain`
-* :doc:`/sql/explain-analyze`
-* :doc:`/sql/prepare`
-* :doc:`/sql/reset-session`
-* :doc:`/sql/set-session`
-* :doc:`/sql/set-time-zone`
-* :doc:`/sql/show-functions`
-* :doc:`/sql/show-session`
-* :doc:`/sql/use`
-* :doc:`/sql/values`
-
-.. _sql-read-operations:
-
-Read operations
----------------
-
-The following statements provide read access to data and meta data exposed by a
-connector accessing a data source. They are supported by all connectors:
-
-* :doc:`/sql/select` including :doc:`/sql/match-recognize`
-* :doc:`/sql/describe`
-* :doc:`/sql/show-catalogs`
-* :doc:`/sql/show-columns`
-* :doc:`/sql/show-create-materialized-view`
-* :doc:`/sql/show-create-schema`
-* :doc:`/sql/show-create-table`
-* :doc:`/sql/show-create-view`
-* :doc:`/sql/show-grants`
-* :doc:`/sql/show-roles`
-* :doc:`/sql/show-schemas`
-* :doc:`/sql/show-tables`
-* :doc:`/sql/show-stats`
-
-.. _sql-write-operations:
-
-Write operations
-----------------
-
-The following statements provide write access to data and meta data exposed
-by a connector accessing a data source. Availability varies widely from
-connector to connector:
-
-.. _sql-data-management:
-
-Data management
-^^^^^^^^^^^^^^^
-
-* :doc:`/sql/insert`
-* :doc:`/sql/update`
-* :doc:`/sql/delete`
-* :doc:`/sql/truncate`
-* :doc:`/sql/merge`
-
-.. _sql-materialized-view-management:
-
-Materialized view management
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* :doc:`/sql/create-materialized-view`
-* :doc:`/sql/alter-materialized-view`
-* :doc:`/sql/drop-materialized-view`
-* :doc:`/sql/refresh-materialized-view`
-
-.. _sql-schema-table-management:
-
-Schema and table management
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* :doc:`/sql/create-table`
-* :doc:`/sql/create-table-as`
-* :doc:`/sql/drop-table`
-* :doc:`/sql/alter-table`
-* :doc:`/sql/create-schema`
-* :doc:`/sql/drop-schema`
-* :doc:`/sql/alter-schema`
-* :doc:`/sql/comment`
-
-.. _sql-view-management:
-
-View management
-^^^^^^^^^^^^^^^
-
-* :doc:`/sql/create-view`
-* :doc:`/sql/drop-view`
-* :doc:`/sql/alter-view`
-
-.. _sql-security-operations:
-
-Security operations
--------------------
-
-The following statements provide security-related operations to security
-configuration, data, and meta data exposed by a connector accessing a data
-source. Most connectors do not support these operations:
-
-Connector roles:
-
-* :doc:`/sql/create-role`
-* :doc:`/sql/drop-role`
-* :doc:`/sql/grant-roles`
-* :doc:`/sql/revoke-roles`
-* :doc:`/sql/set-role`
-* :doc:`/sql/show-role-grants`
-
-Grants management:
-
-* :doc:`/sql/grant`
-* :doc:`/sql/revoke`
-
-.. _sql-transactions:
-
-Transactions
-------------
-
-The following statements manage transactions. Most connectors do not support
-transactions:
-
-* :doc:`/sql/start-transaction`
-* :doc:`/sql/commit`
-* :doc:`/sql/rollback`
diff --git a/docs/src/main/sphinx/language/types.md b/docs/src/main/sphinx/language/types.md
new file mode 100644
index 000000000000..bf95d07ff3ba
--- /dev/null
+++ b/docs/src/main/sphinx/language/types.md
@@ -0,0 +1,462 @@
+# Data types
+
+Trino has a set of built-in data types, described below.
+Additional types can be provided by plugins.
+
+(type-mapping-overview)=
+
+## Trino type support and mapping
+
+Connectors to data sources are not required to support all Trino data types
+described on this page. If there are data types similar to Trino's that are used
+on the data source, the connector may map the Trino and remote data types to
+each other as needed.
+
+Depending on the connector and the data source, type mapping may apply
+in either direction as follows:
+
+- **Data source to Trino** mapping applies to any operation where columns in the
+  data source are read by Trino, such as a {doc}`/sql/select` statement, and the
+  underlying source data type needs to be represented by a Trino data type.
+- **Trino to data source** mapping applies to any operation where the columns
+  or expressions in Trino need to be translated into data types or expressions
+  compatible with the underlying data source. For example,
+  {doc}`/sql/create-table-as` statements specify Trino types that are then
+  mapped to types on the remote data source. Predicates like `WHERE` also use
+  these mappings in order to ensure that the predicate is translated to valid
+  syntax on the remote data source.
+
+Data type support and mappings vary depending on the connector. Refer to the
+{doc}`connector documentation </connector>` for more information.
+
+(boolean-data-types)=
+
+## Boolean
+
+### `BOOLEAN`
+
+This type captures boolean values `true` and `false`.
+
+(integer-data-types)=
+
+## Integer
+
+Integer numbers can be expressed as numeric literals in the following formats:
+
+* Decimal integer. Examples are `-7`, `0`, or `3`.
+* Hexadecimal integer composed of `0X` or `0x` and the value. Examples are
+  `0x0A` for decimal `10` or `0x11` for decimal `17`.
+* Octal integer composed of `0O` or `0o` and the value. Examples are `0o40` for
+  decimal `32` or `0o11` for decimal `9`.
+* Binary integer composed of `0B` or `0b` and the value. Examples are `0b1001`
+  for decimal `9` or `0b101010` for decimal `42``.
+
+Underscore characters are ignored within literal values, and can be used to
+increase readability. For example, decimal integer `123_456.789_123` is
+equivalent to `123456.789123`. Preceding and trailing underscores are not
+permitted.
+
+Integers are supported by the following data types.
+
+### `TINYINT`
+
+A 8-bit signed two's complement integer with a minimum value of
+`-2^7` or `-0x80` and a maximum value of `2^7 - 1` or `0x7F`.
+
+### `SMALLINT`
+
+A 16-bit signed two's complement integer with a minimum value of
+`-2^15` or `-0x8000` and a maximum value of `2^15 - 1` or `0x7FFF`.
+
+### `INTEGER` or `INT`
+
+A 32-bit signed two's complement integer with a minimum value of `-2^31` or
+`-0x80000000` and a maximum value of `2^31 - 1` or `0x7FFFFFFF`.  The names
+`INTEGER` and `INT` can both be used for this type.
+
+### `BIGINT`
+
+A 64-bit signed two's complement integer with a minimum value of `-2^63` or
+`-0x8000000000000000` and a maximum value of `2^63 - 1` or `0x7FFFFFFFFFFFFFFF`.
+
+(floating-point-data-types)=
+
+## Floating-point
+
+Floating-point, fixed-precision numbers can be expressed as numeric literal
+using scientific notation such as `1.03e1` and are cast as `DOUBLE` data type.
+Underscore characters are ignored within literal values, and can be used to
+increase readability. For example, value `123_456.789e4` is equivalent to
+`123456.789e4`. Preceding underscores, trailing underscores, and underscores
+beside the comma (`.`) are not permitted.
+
+### `REAL`
+
+A real is a 32-bit inexact, variable-precision implementing the
+IEEE Standard 754 for Binary Floating-Point Arithmetic.
+
+Example literals: `REAL '10.3'`, `REAL '10.3e0'`, `REAL '1.03e1'`
+
+### `DOUBLE`
+
+A double is a 64-bit inexact, variable-precision implementing the
+IEEE Standard 754 for Binary Floating-Point Arithmetic.
+
+Example literals: `DOUBLE '10.3'`, `DOUBLE '1.03e1'`, `10.3e0`, `1.03e1`
+
+(fixed-precision-data-types)=
+
+## Fixed-precision
+
+Fixed-precision numbers can be expressed as numeric literals such as `1.1`, and
+are supported by the `DECIMAL` data type.
+
+Underscore characters are ignored within literal values, and can be used to
+increase readability. For example, decimal `123_456.789_123` is equivalent to
+`123456.789123`. Preceding underscores, trailing underscores, and underscores
+beside the comma (`.`) are not permitted.
+
+Leading zeros in literal values are permitted and ignored. For example,
+`000123.456` is equivalent to `123.456`.
+
+### `DECIMAL`
+
+A fixed-precision decimal number. Precision up to 38 digits is supported
+but performance is best up to 18 digits.
+
+The decimal type takes two literal parameters:
+
+- **precision** - total number of digits
+- **scale** - number of digits in fractional part. Scale is optional and defaults to 0.
+
+Example type definitions: `DECIMAL(10,3)`, `DECIMAL(20)`
+
+Example literals: `DECIMAL '10.3'`, `DECIMAL '1234567890'`, `1.1`
+
+(string-data-types)=
+
+## String
+
+### `VARCHAR`
+
+Variable length character data with an optional maximum length.
+
+Example type definitions: `varchar`, `varchar(20)`
+
+SQL statements support simple literal, as well as Unicode usage:
+
+- literal string : `'Hello winter !'`
+- Unicode string with default escape character: `U&'Hello winter \2603 !'`
+- Unicode string with custom escape character: `U&'Hello winter #2603 !' UESCAPE '#'`
+
+A Unicode string is prefixed with `U&` and requires an escape character
+before any Unicode character usage with 4 digits. In the examples above
+`\2603` and `#2603` represent a snowman character. Long Unicode codes
+with 6 digits require usage of the plus symbol before the code. For example,
+you need to use `\+01F600` for a grinning face emoji.
+
+### `CHAR`
+
+Fixed length character data. A `CHAR` type without length specified has a default length of 1.
+A `CHAR(x)` value always has `x` characters. For example, casting `dog` to `CHAR(7)`
+adds 4 implicit trailing spaces. Leading and trailing spaces are included in comparisons of
+`CHAR` values. As a result, two character values with different lengths (`CHAR(x)` and
+`CHAR(y)` where `x != y`) will never be equal.
+
+Example type definitions: `char`, `char(20)`
+
+### `VARBINARY`
+
+Variable length binary data.
+
+SQL statements support usage of binary literal data with the prefix `X` or `x`.
+The binary data has to use hexadecimal format. For example, the binary form of
+`eh?` is `X'65683F'` as you can confirm with the following statement:
+
+```sql
+SELECT from_utf8(x'65683F');
+```
+
+:::{note}
+Binary strings with length are not yet supported: `varbinary(n)`
+:::
+
+### `JSON`
+
+JSON value type, which can be a JSON object, a JSON array, a JSON number, a JSON string,
+`true`, `false` or `null`.
+
+(date-time-data-types)=
+
+## Date and time
+
+See also {doc}`/functions/datetime`
+
+(date-data-type)=
+
+### `DATE`
+
+Calendar date (year, month, day).
+
+Example: `DATE '2001-08-22'`
+
+### `TIME`
+
+`TIME` is an alias for `TIME(3)` (millisecond precision).
+
+### `TIME(P)`
+
+Time of day (hour, minute, second) without a time zone with `P` digits of precision
+for the fraction of seconds. A precision of up to 12 (picoseconds) is supported.
+
+Example: `TIME '01:02:03.456'`
+
+### `TIME WITH TIME ZONE`
+
+Time of day (hour, minute, second, millisecond) with a time zone.
+Values of this type are rendered using the time zone from the value.
+Time zones are expressed as the numeric UTC offset value:
+
+```
+SELECT TIME '01:02:03.456 -08:00';
+-- 1:02:03.456-08:00
+```
+
+(timestamp-data-type)=
+
+### `TIMESTAMP`
+
+`TIMESTAMP` is an alias for `TIMESTAMP(3)` (millisecond precision).
+
+### `TIMESTAMP(P)`
+
+Calendar date and time of day without a time zone with `P` digits of precision
+for the fraction of seconds. A precision of up to 12 (picoseconds) is supported.
+This type is effectively a combination of the `DATE` and `TIME(P)` types.
+
+`TIMESTAMP(P) WITHOUT TIME ZONE` is an equivalent name.
+
+Timestamp values can be constructed with the `TIMESTAMP` literal
+expression. Alternatively, language constructs such as
+`localtimestamp(p)`, or a number of {doc}`date and time functions and
+operators </functions/datetime>` can return timestamp values.
+
+Casting to lower precision causes the value to be rounded, and not
+truncated. Casting to higher precision appends zeros for the additional
+digits.
+
+The following examples illustrate the behavior:
+
+```
+SELECT TIMESTAMP '2020-06-10 15:55:23';
+-- 2020-06-10 15:55:23
+
+SELECT TIMESTAMP '2020-06-10 15:55:23.383345';
+-- 2020-06-10 15:55:23.383345
+
+SELECT typeof(TIMESTAMP '2020-06-10 15:55:23.383345');
+-- timestamp(6)
+
+SELECT cast(TIMESTAMP '2020-06-10 15:55:23.383345' as TIMESTAMP(1));
+ -- 2020-06-10 15:55:23.4
+
+SELECT cast(TIMESTAMP '2020-06-10 15:55:23.383345' as TIMESTAMP(12));
+-- 2020-06-10 15:55:23.383345000000
+```
+
+(timestamp-with-time-zone-data-type)=
+
+### `TIMESTAMP WITH TIME ZONE`
+
+`TIMESTAMP WITH TIME ZONE` is an alias for `TIMESTAMP(3) WITH TIME ZONE`
+(millisecond precision).
+
+(timestamp-p-with-time-zone-data-type)=
+### `TIMESTAMP(P) WITH TIME ZONE`
+
+Instant in time that includes the date and time of day with `P` digits of
+precision for the fraction of seconds and with a time zone. Values of this type
+are rendered using the time zone from the value. Time zones can be expressed in
+the following ways:
+
+- `UTC`, with `GMT`, `Z`, or `UT` usable as aliases for UTC.
+- `+hh:mm` or `-hh:mm` with `hh:mm` as an hour and minute offset from UTC.
+  Can be written with or without `UTC`, `GMT`, or `UT` as an alias for
+  UTC.
+- An [IANA time zone name](https://www.iana.org/time-zones).
+
+The following examples demonstrate some of these syntax options:
+
+```
+SELECT TIMESTAMP '2001-08-22 03:04:05.321 UTC';
+-- 2001-08-22 03:04:05.321 UTC
+
+SELECT TIMESTAMP '2001-08-22 03:04:05.321 -08:30';
+-- 2001-08-22 03:04:05.321 -08:30
+
+SELECT TIMESTAMP '2001-08-22 03:04:05.321 GMT-08:30';
+-- 2001-08-22 03:04:05.321 -08:30
+
+SELECT TIMESTAMP '2001-08-22 03:04:05.321 America/New_York';
+-- 2001-08-22 03:04:05.321 America/New_York
+```
+
+### `INTERVAL YEAR TO MONTH`
+
+Span of years and months.
+
+Example: `INTERVAL '3' MONTH`
+
+### `INTERVAL DAY TO SECOND`
+
+Span of days, hours, minutes, seconds and milliseconds.
+
+Example: `INTERVAL '2' DAY`
+
+(structural-data-types)=
+
+## Structural
+
+(array-type)=
+
+### `ARRAY`
+
+An array of the given component type.
+
+Example: `ARRAY[1, 2, 3]`
+
+(map-type)=
+
+### `MAP`
+
+A map between the given component types.
+
+Example: `MAP(ARRAY['foo', 'bar'], ARRAY[1, 2])`
+
+(row-type)=
+
+### `ROW`
+
+A structure made up of fields that allows mixed types.
+The fields may be of any SQL type.
+
+By default, row fields are not named, but names can be assigned.
+
+Example: `CAST(ROW(1, 2e0) AS ROW(x BIGINT, y DOUBLE))`
+
+Named row fields are accessed with field reference operator (`.`).
+
+Example: `CAST(ROW(1, 2.0) AS ROW(x BIGINT, y DOUBLE)).x`
+
+Named or unnamed row fields are accessed by position with the subscript
+operator (`[]`). The position starts at `1` and must be a constant.
+
+Example: `ROW(1, 2.0)[1]`
+
+## Network address
+
+(ipaddress-type)=
+
+### `IPADDRESS`
+
+An IP address that can represent either an IPv4 or IPv6 address. Internally,
+the type is a pure IPv6 address. Support for IPv4 is handled using the
+*IPv4-mapped IPv6 address* range ({rfc}`4291#section-2.5.5.2`).
+When creating an `IPADDRESS`, IPv4 addresses will be mapped into that range.
+When formatting an `IPADDRESS`, any address within the mapped range will
+be formatted as an IPv4 address. Other addresses will be formatted as IPv6
+using the canonical format defined in {rfc}`5952`.
+
+Examples: `IPADDRESS '10.0.0.1'`, `IPADDRESS '2001:db8::1'`
+
+## UUID
+
+(uuid-type)=
+
+### `UUID`
+
+This type represents a UUID (Universally Unique IDentifier), also known as a
+GUID (Globally Unique IDentifier), using the format defined in {rfc}`4122`.
+
+Example: `UUID '12151fd2-7586-11e9-8f9e-2a86e4085a59'`
+
+## HyperLogLog
+
+Calculating the approximate distinct count can be done much more cheaply than an exact count using the
+[HyperLogLog](https://wikipedia.org/wiki/HyperLogLog) data sketch. See {doc}`/functions/hyperloglog`.
+
+(hyperloglog-type)=
+
+### `HyperLogLog`
+
+A HyperLogLog sketch allows efficient computation of {func}`approx_distinct`. It starts as a
+sparse representation, switching to a dense representation when it becomes more efficient.
+
+(p4hyperloglog-type)=
+
+### `P4HyperLogLog`
+
+A P4HyperLogLog sketch is similar to {ref}`hyperloglog-type`, but it starts (and remains)
+in the dense representation.
+
+## SetDigest
+
+(setdigest-type)=
+
+### `SetDigest`
+
+A SetDigest (setdigest) is a data sketch structure used
+in calculating [Jaccard similarity coefficient](https://wikipedia.org/wiki/Jaccard_index)
+between two sets.
+
+SetDigest encapsulates the following components:
+
+- [HyperLogLog](https://wikipedia.org/wiki/HyperLogLog)
+- [MinHash with a single hash function](http://wikipedia.org/wiki/MinHash#Variant_with_a_single_hash_function)
+
+The HyperLogLog structure is used for the approximation of the distinct elements
+in the original set.
+
+The MinHash structure is used to store a low memory footprint signature of the original set.
+The similarity of any two sets is estimated by comparing their signatures.
+
+SetDigests are additive, meaning they can be merged together.
+
+## Quantile digest
+
+(qdigest-type)=
+
+### `QDigest`
+
+A quantile digest (qdigest) is a summary structure which captures the approximate
+distribution of data for a given input set, and can be queried to retrieve approximate
+quantile values from the distribution.  The level of accuracy for a qdigest
+is tunable, allowing for more precise results at the expense of space.
+
+A qdigest can be used to give approximate answer to queries asking for what value
+belongs at a certain quantile.  A useful property of qdigests is that they are
+additive, meaning they can be merged together without losing precision.
+
+A qdigest may be helpful whenever the partial results of `approx_percentile`
+can be reused.  For example, one may be interested in a daily reading of the 99th
+percentile values that are read over the course of a week.  Instead of calculating
+the past week of data with `approx_percentile`, `qdigest`s could be stored
+daily, and quickly merged to retrieve the 99th percentile value.
+
+## T-Digest
+
+(tdigest-type)=
+
+### `TDigest`
+
+A T-digest (tdigest) is a summary structure which, similarly to qdigest, captures the
+approximate distribution of data for a given input set. It can be queried to retrieve
+approximate quantile values from the distribution.
+
+TDigest has the following advantages compared to QDigest:
+
+- higher performance
+- lower memory usage
+- higher accuracy at high and low percentiles
+
+T-digests are additive, meaning they can be merged together.
diff --git a/docs/src/main/sphinx/language/types.rst b/docs/src/main/sphinx/language/types.rst
deleted file mode 100644
index f4a424e7913c..000000000000
--- a/docs/src/main/sphinx/language/types.rst
+++ /dev/null
@@ -1,464 +0,0 @@
-==========
-Data types
-==========
-
-Trino has a set of built-in data types, described below.
-Additional types can be provided by plugins.
-
-.. _type-mapping-overview:
-
-Trino type support and mapping
-------------------------------
-
-Connectors to data sources are not required to support all Trino data types
-described on this page. If there are data types similar to Trino's that are used
-on the data source, the connector may map the Trino and remote data types to
-each other as needed.
-
-Depending on the connector and the data source, type mapping may apply
-in either direction as follows:
-
-* **Data source to Trino** mapping applies to any operation where columns in the
-  data source are read by Trino, such as a :doc:`/sql/select` statement, and the
-  underlying source data type needs to be represented by a Trino data type.
-
-* **Trino to data source** mapping applies to any operation where the columns
-  or expressions in Trino need to be translated into data types or expressions
-  compatible with the underlying data source. For example,
-  :doc:`/sql/create-table-as` statements specify Trino types that are then
-  mapped to types on the remote data source. Predicates like ``WHERE`` also use
-  these mappings in order to ensure that the predicate is translated to valid
-  syntax on the remote data source.
-
-Data type support and mappings vary depending on the connector. Refer to the
-:doc:`connector documentation </connector>` for more information.
-
-.. _boolean-data-types:
-
-Boolean
--------
-
-``BOOLEAN``
-^^^^^^^^^^^
-
-This type captures boolean values ``true`` and ``false``.
-
-.. _integer-data-types:
-
-Integer
--------
-
-``TINYINT``
-^^^^^^^^^^^
-
-A 8-bit signed two's complement integer with a minimum value of
-``-2^7`` and a maximum value of ``2^7 - 1``.
-
-``SMALLINT``
-^^^^^^^^^^^^
-
-A 16-bit signed two's complement integer with a minimum value of
-``-2^15`` and a maximum value of ``2^15 - 1``.
-
-``INTEGER``
-^^^^^^^^^^^
-
-A 32-bit signed two's complement integer with a minimum value of
-``-2^31`` and a maximum value of ``2^31 - 1``.  The name ``INT`` is
-also available for this type.
-
-``BIGINT``
-^^^^^^^^^^
-
-A 64-bit signed two's complement integer with a minimum value of
-``-2^63`` and a maximum value of ``2^63 - 1``.
-
-.. _floating-point-data-types:
-
-Floating-point
---------------
-
-``REAL``
-^^^^^^^^
-
-A real is a 32-bit inexact, variable-precision implementing the
-IEEE Standard 754 for Binary Floating-Point Arithmetic.
-
-Example literals: ``REAL '10.3'``, ``REAL '10.3e0'``, ``REAL '1.03e1'``
-
-``DOUBLE``
-^^^^^^^^^^
-
-A double is a 64-bit inexact, variable-precision implementing the
-IEEE Standard 754 for Binary Floating-Point Arithmetic.
-
-Example literals: ``DOUBLE '10.3'``, ``DOUBLE '1.03e1'``, ``10.3e0``, ``1.03e1``
-
-.. _fixed-precision-data-types:
-
-Fixed-precision
----------------
-
-``DECIMAL``
-^^^^^^^^^^^
-
-A fixed precision decimal number. Precision up to 38 digits is supported
-but performance is best up to 18 digits.
-
-The decimal type takes two literal parameters:
-
-- **precision** - total number of digits
-
-- **scale** - number of digits in fractional part. Scale is optional and defaults to 0.
-
-Example type definitions: ``DECIMAL(10,3)``, ``DECIMAL(20)``
-
-Example literals: ``DECIMAL '10.3'``, ``DECIMAL '1234567890'``, ``1.1``
-
-.. _string-data-types:
-
-String
-------
-
-``VARCHAR``
-^^^^^^^^^^^
-
-Variable length character data with an optional maximum length.
-
-Example type definitions: ``varchar``, ``varchar(20)``
-
-SQL statements support simple literal, as well as Unicode usage:
-
-- literal string : ``'Hello winter !'``
-- Unicode string with default escape character: ``U&'Hello winter \2603 !'``
-- Unicode string with custom escape character: ``U&'Hello winter #2603 !' UESCAPE '#'``
-
-A Unicode string is prefixed with ``U&`` and requires an escape character
-before any Unicode character usage with 4 digits. In the examples above
-``\2603`` and ``#2603`` represent a snowman character. Long Unicode codes
-with 6 digits require usage of the plus symbol before the code. For example,
-you need to use ``\+01F600`` for a grinning face emoji.
-
-``CHAR``
-^^^^^^^^
-
-Fixed length character data. A ``CHAR`` type without length specified has a default length of 1.
-A ``CHAR(x)`` value always has ``x`` characters. For example, casting ``dog`` to ``CHAR(7)``
-adds 4 implicit trailing spaces. Leading and trailing spaces are included in comparisons of
-``CHAR`` values. As a result, two character values with different lengths (``CHAR(x)`` and
-``CHAR(y)`` where ``x != y``) will never be equal.
-
-Example type definitions: ``char``, ``char(20)``
-
-``VARBINARY``
-^^^^^^^^^^^^^
-
-Variable length binary data.
-
-SQL statements support usage of binary data with the prefix ``X``. The
-binary data has to use hexadecimal format. For example, the binary form of
-``eh?`` is ``X'65683F'``.
-
-.. note::
-
-    Binary strings with length are not yet supported: ``varbinary(n)``
-
-``JSON``
-^^^^^^^^
-
-JSON value type, which can be a JSON object, a JSON array, a JSON number, a JSON string,
-``true``, ``false`` or ``null``.
-
-.. _date-time-data-types:
-
-Date and time
--------------
-
-See also :doc:`/functions/datetime`
-
-``DATE``
-^^^^^^^^
-
-Calendar date (year, month, day).
-
-Example: ``DATE '2001-08-22'``
-
-``TIME``
-^^^^^^^^
-
-``TIME`` is an alias for ``TIME(3)`` (millisecond precision).
-
-``TIME(P)``
-^^^^^^^^^^^
-
-Time of day (hour, minute, second) without a time zone with ``P`` digits of precision
-for the fraction of seconds. A precision of up to 12 (picoseconds) is supported.
-
-Example: ``TIME '01:02:03.456'``
-
-``TIME WITH TIME ZONE``
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Time of day (hour, minute, second, millisecond) with a time zone.
-Values of this type are rendered using the time zone from the value.
-Time zones are expressed as the numeric UTC offset value::
-
-    SELECT TIME '01:02:03.456 -08:00';
-    -- 1:02:03.456-08:00
-
-.. _timestamp-data-type:
-
-``TIMESTAMP``
-^^^^^^^^^^^^^
-
-``TIMESTAMP`` is an alias for ``TIMESTAMP(3)`` (millisecond precision).
-
-``TIMESTAMP(P)``
-^^^^^^^^^^^^^^^^
-
-Calendar date and time of day without a time zone with ``P`` digits of precision
-for the fraction of seconds. A precision of up to 12 (picoseconds) is supported.
-This type is effectively a combination of the ``DATE`` and ``TIME(P)`` types.
-
-``TIMESTAMP(P) WITHOUT TIME ZONE`` is an equivalent name.
-
-Timestamp values can be constructed with the ``TIMESTAMP`` literal
-expression. Alternatively, language constructs such as
-``localtimestamp(p)``, or a number of :doc:`date and time functions and
-operators </functions/datetime>` can return timestamp values.
-
-Casting to lower precision causes the value to be rounded, and not
-truncated. Casting to higher precision appends zeros for the additional
-digits.
-
-The following examples illustrate the behavior::
-
-    SELECT TIMESTAMP '2020-06-10 15:55:23';
-    -- 2020-06-10 15:55:23
-
-    SELECT TIMESTAMP '2020-06-10 15:55:23.383345';
-    -- 2020-06-10 15:55:23.383345
-
-    SELECT typeof(TIMESTAMP '2020-06-10 15:55:23.383345');
-    -- timestamp(6)
-
-    SELECT cast(TIMESTAMP '2020-06-10 15:55:23.383345' as TIMESTAMP(1));
-     -- 2020-06-10 15:55:23.4
-
-    SELECT cast(TIMESTAMP '2020-06-10 15:55:23.383345' as TIMESTAMP(12));
-    -- 2020-06-10 15:55:23.383345000000
-
-.. _timestamp-with-time-zone-data-type:
-
-``TIMESTAMP WITH TIME ZONE``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-``TIMESTAMP WITH TIME ZONE`` is an alias for ``TIMESTAMP(3) WITH TIME ZONE``
-(millisecond precision).
-
-``TIMESTAMP(P) WITH TIME ZONE``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Instant in time that includes the date and time of day with ``P`` digits of
-precision for the fraction of seconds and with a time zone. Values of this
-type are rendered using the time zone from the value.
-Time zones can be expressed in the following ways:
-
-* ``UTC``, with ``GMT``, ``Z``, or ``UT`` usable as aliases for UTC.
-* ``+hh:mm`` or ``-hh:mm`` with ``hh:mm`` as an hour and minute offset from UTC.
-  Can be written with or without ``UTC``, ``GMT``, or ``UT`` as an alias for
-  UTC.
-* An `IANA time zone name <https://www.iana.org/time-zones>`_.
-
-The following examples demonstrate some of these syntax options::
-
-    SELECT TIMESTAMP '2001-08-22 03:04:05.321 UTC';
-    -- 2001-08-22 03:04:05.321 UTC
-
-    SELECT TIMESTAMP '2001-08-22 03:04:05.321 -08:30';
-    -- 2001-08-22 03:04:05.321 -08:30
-
-    SELECT TIMESTAMP '2001-08-22 03:04:05.321 GMT-08:30';
-    -- 2001-08-22 03:04:05.321 -08:30
-
-    SELECT TIMESTAMP '2001-08-22 03:04:05.321 America/New_York';
-    -- 2001-08-22 03:04:05.321 America/New_York
-
-``INTERVAL YEAR TO MONTH``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Span of years and months.
-
-Example: ``INTERVAL '3' MONTH``
-
-``INTERVAL DAY TO SECOND``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Span of days, hours, minutes, seconds and milliseconds.
-
-Example: ``INTERVAL '2' DAY``
-
-.. _structural-data-types:
-
-Structural
-----------
-
-.. _array_type:
-
-``ARRAY``
-^^^^^^^^^
-
-An array of the given component type.
-
-Example: ``ARRAY[1, 2, 3]``
-
-.. _map_type:
-
-``MAP``
-^^^^^^^
-
-A map between the given component types.
-
-Example: ``MAP(ARRAY['foo', 'bar'], ARRAY[1, 2])``
-
-.. _row_type:
-
-``ROW``
-^^^^^^^
-
-A structure made up of fields that allows mixed types.
-The fields may be of any SQL type.
-
-By default, row fields are not named, but names can be assigned.
-
-Example: ``CAST(ROW(1, 2e0) AS ROW(x BIGINT, y DOUBLE))``
-
-Named row fields are accessed with field reference operator (``.``).
-
-Example: ``CAST(ROW(1, 2.0) AS ROW(x BIGINT, y DOUBLE)).x``
-
-Named or unnamed row fields are accessed by position with the subscript
-operator (``[]``). The position starts at ``1`` and must be a constant.
-
-Example: ``ROW(1, 2.0)[1]``
-
-Network address
----------------
-
-.. _ipaddress_type:
-
-``IPADDRESS``
-^^^^^^^^^^^^^
-
-An IP address that can represent either an IPv4 or IPv6 address. Internally,
-the type is a pure IPv6 address. Support for IPv4 is handled using the
-*IPv4-mapped IPv6 address* range (:rfc:`4291#section-2.5.5.2`).
-When creating an ``IPADDRESS``, IPv4 addresses will be mapped into that range.
-When formatting an ``IPADDRESS``, any address within the mapped range will
-be formatted as an IPv4 address. Other addresses will be formatted as IPv6
-using the canonical format defined in :rfc:`5952`.
-
-Examples: ``IPADDRESS '10.0.0.1'``, ``IPADDRESS '2001:db8::1'``
-
-UUID
-----
-
-.. _uuid_type:
-
-``UUID``
-^^^^^^^^
-
-This type represents a UUID (Universally Unique IDentifier), also known as a
-GUID (Globally Unique IDentifier), using the format defined in :rfc:`4122`.
-
-Example: ``UUID '12151fd2-7586-11e9-8f9e-2a86e4085a59'``
-
-HyperLogLog
------------
-
-Calculating the approximate distinct count can be done much more cheaply than an exact count using the
-`HyperLogLog <https://wikipedia.org/wiki/HyperLogLog>`_ data sketch. See :doc:`/functions/hyperloglog`.
-
-.. _hyperloglog_type:
-
-``HyperLogLog``
-^^^^^^^^^^^^^^^
-
-A HyperLogLog sketch allows efficient computation of :func:`approx_distinct`. It starts as a
-sparse representation, switching to a dense representation when it becomes more efficient.
-
-.. _p4hyperloglog_type:
-
-``P4HyperLogLog``
-^^^^^^^^^^^^^^^^^
-
-A P4HyperLogLog sketch is similar to :ref:`hyperloglog_type`, but it starts (and remains)
-in the dense representation.
-
-SetDigest
----------
-
-.. _setdigest_type:
-
-``SetDigest``
-^^^^^^^^^^^^^
-
-A SetDigest (setdigest) is a data sketch structure used
-in calculating `Jaccard similarity coefficient <https://wikipedia.org/wiki/Jaccard_index>`_
-between two sets.
-
-SetDigest encapsulates the following components:
-
-- `HyperLogLog <https://wikipedia.org/wiki/HyperLogLog>`_
-- `MinHash with a single hash function <http://wikipedia.org/wiki/MinHash#Variant_with_a_single_hash_function>`_
-
-The HyperLogLog structure is used for the approximation of the distinct elements
-in the original set.
-
-The MinHash structure is used to store a low memory footprint signature of the original set.
-The similarity of any two sets is estimated by comparing their signatures.
-
-SetDigests are additive, meaning they can be merged together.
-
-Quantile digest
----------------
-
-.. _qdigest_type:
-
-``QDigest``
-^^^^^^^^^^^
-
-A quantile digest (qdigest) is a summary structure which captures the approximate
-distribution of data for a given input set, and can be queried to retrieve approximate
-quantile values from the distribution.  The level of accuracy for a qdigest
-is tunable, allowing for more precise results at the expense of space.
-
-A qdigest can be used to give approximate answer to queries asking for what value
-belongs at a certain quantile.  A useful property of qdigests is that they are
-additive, meaning they can be merged together without losing precision.
-
-A qdigest may be helpful whenever the partial results of ``approx_percentile``
-can be reused.  For example, one may be interested in a daily reading of the 99th
-percentile values that are read over the course of a week.  Instead of calculating
-the past week of data with ``approx_percentile``, ``qdigest``\ s could be stored
-daily, and quickly merged to retrieve the 99th percentile value.
-
-T-Digest
---------
-
-.. _tdigest_type:
-
-``TDigest``
-^^^^^^^^^^^
-
-A T-digest (tdigest) is a summary structure which, similarly to qdigest, captures the
-approximate distribution of data for a given input set. It can be queried to retrieve
-approximate quantile values from the distribution.
-
-TDigest has the following advantages compared to QDigest:
-
-* higher performance
-* lower memory usage
-* higher accuracy at high and low percentiles
-
-T-digests are additive, meaning they can be merged together.
diff --git a/docs/src/main/sphinx/optimizer.md b/docs/src/main/sphinx/optimizer.md
new file mode 100644
index 000000000000..346d0fd82eed
--- /dev/null
+++ b/docs/src/main/sphinx/optimizer.md
@@ -0,0 +1,10 @@
+# Query optimizer
+
+```{toctree}
+:maxdepth: 1
+
+optimizer/statistics
+optimizer/cost-in-explain
+optimizer/cost-based-optimizations
+optimizer/pushdown
+```
diff --git a/docs/src/main/sphinx/optimizer.rst b/docs/src/main/sphinx/optimizer.rst
deleted file mode 100644
index e3b3bd64b319..000000000000
--- a/docs/src/main/sphinx/optimizer.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-***************
-Query optimizer
-***************
-
-.. toctree::
-    :maxdepth: 1
-
-    optimizer/statistics
-    optimizer/cost-in-explain
-    optimizer/cost-based-optimizations
-    optimizer/pushdown
diff --git a/docs/src/main/sphinx/optimizer/cost-based-optimizations.md b/docs/src/main/sphinx/optimizer/cost-based-optimizations.md
new file mode 100644
index 000000000000..f3946e79d1ce
--- /dev/null
+++ b/docs/src/main/sphinx/optimizer/cost-based-optimizations.md
@@ -0,0 +1,124 @@
+# Cost-based optimizations
+
+Trino supports several cost based optimizations, described below.
+
+## Join enumeration
+
+The order in which joins are executed in a query can have a significant impact
+on the query's performance. The aspect of join ordering that has the largest
+impact on performance is the size of the data being processed and transferred
+over the network. If a join which produces a lot of data is performed early in
+the query's execution, then subsequent stages need to process large amounts of
+data for longer than necessary, increasing the time and resources needed for
+processing the query.
+
+With cost-based join enumeration, Trino uses {doc}`/optimizer/statistics`
+provided by connectors to estimate the costs for different join orders and
+automatically picks the join order with the lowest computed costs.
+
+The join enumeration strategy is governed by the `join_reordering_strategy`
+{ref}`session property <session-properties-definition>`, with the
+`optimizer.join-reordering-strategy` configuration property providing the
+default value.
+
+The possible values are:
+
+> - `AUTOMATIC` (default) - enable full automatic join enumeration
+> - `ELIMINATE_CROSS_JOINS` - eliminate unnecessary cross joins
+> - `NONE` - purely syntactic join order
+
+If you are using `AUTOMATIC` join enumeration and statistics are not
+available or a cost can not be computed for any other reason, the
+`ELIMINATE_CROSS_JOINS` strategy is used instead.
+
+## Join distribution selection
+
+Trino uses a hash-based join algorithm. For each join operator, a hash table
+must be created from one join input, referred to as the build side. The other
+input, called the probe side, is then iterated on. For each row, the hash table
+is queried to find matching rows.
+
+There are two types of join distributions:
+
+> - Partitioned: each node participating in the query builds a hash table from
+>   only a fraction of the data
+> - Broadcast: each node participating in the query builds a hash table from all
+>   of the data. The data is replicated to each node.
+
+Each type has advantages and disadvantages. Partitioned joins require
+redistributing both tables using a hash of the join key. These joins can be much
+slower than broadcast joins, but they allow much larger joins overall. Broadcast
+joins are faster if the build side is much smaller than the probe side. However,
+broadcast joins require that the tables on the build side of the join after
+filtering fit in memory on each node, whereas distributed joins only need to fit
+in distributed memory across all nodes.
+
+With cost-based join distribution selection, Trino automatically chooses whether
+to use a partitioned or broadcast join. With cost-based join enumeration, Trino
+automatically chooses which sides are probe and build.
+
+The join distribution strategy is governed by the `join_distribution_type`
+session property, with the `join-distribution-type` configuration property
+providing the default value.
+
+The valid values are:
+
+> - `AUTOMATIC` (default) - join distribution type is determined automatically
+>   for each join
+> - `BROADCAST` - broadcast join distribution is used for all joins
+> - `PARTITIONED` - partitioned join distribution is used for all join
+
+### Capping replicated table size
+
+The join distribution type is automatically chosen when the join reordering
+strategy is set to `AUTOMATIC` or when the join distribution type is set to
+`AUTOMATIC`. In both cases, it is possible to cap the maximum size of the
+replicated table with the `join-max-broadcast-table-size` configuration
+property or with the `join_max_broadcast_table_size` session property. This
+allows you to improve cluster concurrency and prevent bad plans when the
+cost-based optimizer misestimates the size of the joined tables.
+
+By default, the replicated table size is capped to 100MB.
+
+## Syntactic join order
+
+If not using cost-based optimization, Trino defaults to syntactic join ordering.
+While there is no formal way to optimize queries for this case, it is possible
+to take advantage of how Trino implements joins to make them more performant.
+
+Trino uses in-memory hash joins. When processing a join statement, Trino loads
+the right-most table of the join into memory as the build side, then streams the
+next right-most table as the probe side to execute the join. If a query has
+multiple joins, the result of this first join stays in memory as the build side,
+and the third right-most table is then used as the probe side, and so on for
+additional joins. In the case where join order is made more complex, such as
+when using parentheses to specify specific parents for joins, Trino may execute
+multiple lower-level joins at once, but each step of that process follows the
+same logic, and the same applies when the results are ultimately joined
+together.
+
+Because of this behavior, it is optimal to syntactically order joins in your SQL
+queries from the largest tables to the smallest, as this minimizes memory usage.
+
+As an example, if you have a small, medium, and large table and are using left
+joins:
+
+```sql
+SELECT
+  *
+FROM
+  large_table l
+  LEFT JOIN medium_table m ON l.user_id = m.user_id
+  LEFT JOIN small_table s ON s.user_id = l.user_id
+```
+
+:::{warning}
+This means of optimization is not a feature of Trino. It is an artifact of
+how joins are implemented, and therefore this behavior may change without
+notice.
+:::
+
+## Connector implementations
+
+In order for the Trino optimizer to use the cost based strategies,
+the connector implementation must provide {doc}`statistics`.
diff --git a/docs/src/main/sphinx/optimizer/cost-based-optimizations.rst b/docs/src/main/sphinx/optimizer/cost-based-optimizations.rst
deleted file mode 100644
index 537bfebd54e0..000000000000
--- a/docs/src/main/sphinx/optimizer/cost-based-optimizations.rst
+++ /dev/null
@@ -1,132 +0,0 @@
-========================
-Cost-based optimizations
-========================
-
-Trino supports several cost based optimizations, described below.
-
-Join enumeration
-----------------
-
-The order in which joins are executed in a query can have a significant impact
-on the query's performance. The aspect of join ordering that has the largest
-impact on performance is the size of the data being processed and transferred
-over the network. If a join which produces a lot of data is performed early in
-the query's execution, then subsequent stages need to process large amounts of
-data for longer than necessary, increasing the time and resources needed for
-processing the query.
-
-With cost-based join enumeration, Trino uses :doc:`/optimizer/statistics`
-provided by connectors to estimate the costs for different join orders and
-automatically picks the join order with the lowest computed costs.
-
-The join enumeration strategy is governed by the ``join_reordering_strategy``
-:ref:`session property <session-properties-definition>`, with the
-``optimizer.join-reordering-strategy`` configuration property providing the
-default value.
-
-The possible values are:
-
- * ``AUTOMATIC`` (default) - enable full automatic join enumeration
- * ``ELIMINATE_CROSS_JOINS`` - eliminate unnecessary cross joins
- * ``NONE`` - purely syntactic join order
-
-If you are using ``AUTOMATIC`` join enumeration and statistics are not
-available or a cost can not be computed for any other reason, the
-``ELIMINATE_CROSS_JOINS`` strategy is used instead.
-
-Join distribution selection
----------------------------
-
-Trino uses a hash-based join algorithm. For each join operator, a hash table
-must be created from one join input, referred to as the build side. The other
-input, called the probe side, is then iterated on. For each row, the hash table
-is queried to find matching rows.
-
-There are two types of join distributions:
-
- * Partitioned: each node participating in the query builds a hash table from
-   only a fraction of the data
- * Broadcast: each node participating in the query builds a hash table from all
-   of the data. The data is replicated to each node.
-
-Each type has advantages and disadvantages. Partitioned joins require
-redistributing both tables using a hash of the join key. These joins can be much
-slower than broadcast joins, but they allow much larger joins overall. Broadcast
-joins are faster if the build side is much smaller than the probe side. However,
-broadcast joins require that the tables on the build side of the join after
-filtering fit in memory on each node, whereas distributed joins only need to fit
-in distributed memory across all nodes.
-
-With cost-based join distribution selection, Trino automatically chooses whether
-to use a partitioned or broadcast join. With cost-based join enumeration, Trino
-automatically chooses which sides are probe and build.
-
-The join distribution strategy is governed by the ``join_distribution_type``
-session property, with the ``join-distribution-type`` configuration property
-providing the default value.
-
-The valid values are:
-
- * ``AUTOMATIC`` (default) - join distribution type is determined automatically
-   for each join
- * ``BROADCAST`` - broadcast join distribution is used for all joins
- * ``PARTITIONED`` - partitioned join distribution is used for all join
-
------------------------------
-Capping replicated table size
------------------------------
-
-The join distribution type is automatically chosen when the join reordering
-strategy is set to ``AUTOMATIC`` or when the join distribution type is set to
-``AUTOMATIC``. In both cases, it is possible to cap the maximum size of the
-replicated table with the ``join-max-broadcast-table-size`` configuration
-property or with the ``join_max_broadcast_table_size`` session property. This
-allows you to improve cluster concurrency and prevent bad plans when the
-cost-based optimizer misestimates the size of the joined tables.
-
-By default, the replicated table size is capped to 100MB.
-
-Syntactic join order
---------------------
-
-If not using cost-based optimization, Trino defaults to syntactic join ordering.
-While there is no formal way to optimize queries for this case, it is possible
-to take advantage of how Trino implements joins to make them more performant.
-
-Trino uses in-memory hash joins. When processing a join statement, Trino loads
-the right-most table of the join into memory as the build side, then streams the
-next right-most table as the probe side to execute the join. If a query has
-multiple joins, the result of this first join stays in memory as the build side,
-and the third right-most table is then used as the probe side, and so on for
-additional joins. In the case where join order is made more complex, such as
-when using parentheses to specify specific parents for joins, Trino may execute
-multiple lower-level joins at once, but each step of that process follows the
-same logic, and the same applies when the results are ultimately joined
-together.
-
-Because of this behavior, it is optimal to syntactically order joins in your SQL
-queries from the largest tables to the smallest, as this minimizes memory usage.
-
-As an example, if you have a small, medium, and large table and are using left
-joins:
-
-.. code-block:: sql
-
-    SELECT
-      *
-    FROM
-      large_table l
-      LEFT JOIN medium_table m ON l.user_id = m.user_id
-      LEFT JOIN small_table s ON s.user_id = l.user_id
-
-.. warning::
-
-    This means of optimization is not a feature of Trino. It is an artifact of
-    how joins are implemented, and therefore this behavior may change without
-    notice.
-
-Connector implementations
--------------------------
-
-In order for the Trino optimizer to use the cost based strategies,
-the connector implementation must provide :doc:`statistics`.
diff --git a/docs/src/main/sphinx/optimizer/cost-in-explain.md b/docs/src/main/sphinx/optimizer/cost-in-explain.md
new file mode 100644
index 000000000000..5bd36ef9eafc
--- /dev/null
+++ b/docs/src/main/sphinx/optimizer/cost-in-explain.md
@@ -0,0 +1,43 @@
+# Cost in EXPLAIN
+
+During planning, the cost associated with each node of the plan is computed
+based on the table statistics for the tables in the query. This calculated
+cost is printed as part of the output of an {doc}`/sql/explain` statement.
+
+Cost information is displayed in the plan tree using the format `{rows: XX
+(XX), cpu: XX, memory: XX, network: XX}`.  `rows` refers to the expected
+number of rows output by each plan node during execution.  The value in the
+parentheses following the number of rows refers to the expected size of the data
+output by each plan node in bytes. Other parameters indicate the estimated
+amount of CPU, memory, and network utilized by the execution of a plan node.
+These values do not represent any actual unit, but are numbers that are used to
+compare the relative costs between plan nodes, allowing the optimizer to choose
+the best plan for executing a query. If any of the values is not known, a `?`
+is printed.
+
+For example:
+
+```
+EXPLAIN SELECT comment FROM tpch.sf1.nation WHERE nationkey > 3;
+```
+
+```text
+- Output[comment] => [[comment]]
+        Estimates: {rows: 22 (1.69kB), cpu: 6148.25, memory: 0.00, network: 1734.25}
+    - RemoteExchange[GATHER] => [[comment]]
+            Estimates: {rows: 22 (1.69kB), cpu: 6148.25, memory: 0.00, network: 1734.25}
+        - ScanFilterProject[table = tpch:nation:sf1.0, filterPredicate = ("nationkey" > BIGINT '3')] => [[comment]]
+                Estimates: {rows: 25 (1.94kB), cpu: 2207.00, memory: 0.00, network: 0.00}/{rows: 22 (1.69kB), cpu: 4414.00, memory: 0.00, network: 0.00}/{rows: 22 (1.69kB), cpu: 6148.25, memory: 0.00, network: 0.00}
+                nationkey := tpch:nationkey
+                comment := tpch:comment
+```
+
+Generally, there is only one cost printed for each plan node.  However, when a
+`Scan` operator is combined with a `Filter` and/or `Project` operator,
+then multiple cost structures are printed, each corresponding to an
+individual logical part of the combined operator. For example, three cost
+structures are printed for a `ScanFilterProject` operator, corresponding
+to the `Scan`, `Filter`, and `Project` parts of the operator, in that order.
+
+Estimated cost is also printed in {doc}`/sql/explain-analyze` in addition to actual
+runtime statistics.
diff --git a/docs/src/main/sphinx/optimizer/cost-in-explain.rst b/docs/src/main/sphinx/optimizer/cost-in-explain.rst
deleted file mode 100644
index 61e81232d037..000000000000
--- a/docs/src/main/sphinx/optimizer/cost-in-explain.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-===============
-Cost in EXPLAIN
-===============
-
-During planning, the cost associated with each node of the plan is computed
-based on the table statistics for the tables in the query. This calculated
-cost is printed as part of the output of an :doc:`/sql/explain` statement.
-
-Cost information is displayed in the plan tree using the format ``{rows: XX
-(XX), cpu: XX, memory: XX, network: XX}``.  ``rows`` refers to the expected
-number of rows output by each plan node during execution.  The value in the
-parentheses following the number of rows refers to the expected size of the data
-output by each plan node in bytes. Other parameters indicate the estimated
-amount of CPU, memory, and network utilized by the execution of a plan node.
-These values do not represent any actual unit, but are numbers that are used to
-compare the relative costs between plan nodes, allowing the optimizer to choose
-the best plan for executing a query. If any of the values is not known, a ``?``
-is printed.
-
-For example::
-
-    EXPLAIN SELECT comment FROM tpch.sf1.nation WHERE nationkey > 3;
-
-.. code-block:: text
-
-    - Output[comment] => [[comment]]
-            Estimates: {rows: 22 (1.69kB), cpu: 6148.25, memory: 0.00, network: 1734.25}
-        - RemoteExchange[GATHER] => [[comment]]
-                Estimates: {rows: 22 (1.69kB), cpu: 6148.25, memory: 0.00, network: 1734.25}
-            - ScanFilterProject[table = tpch:nation:sf1.0, filterPredicate = ("nationkey" > BIGINT '3')] => [[comment]]
-                    Estimates: {rows: 25 (1.94kB), cpu: 2207.00, memory: 0.00, network: 0.00}/{rows: 22 (1.69kB), cpu: 4414.00, memory: 0.00, network: 0.00}/{rows: 22 (1.69kB), cpu: 6148.25, memory: 0.00, network: 0.00}
-                    nationkey := tpch:nationkey
-                    comment := tpch:comment
-
-Generally, there is only one cost printed for each plan node.  However, when a
-``Scan`` operator is combined with a ``Filter`` and/or ``Project`` operator,
-then multiple cost structures are printed, each corresponding to an
-individual logical part of the combined operator. For example, three cost
-structures are printed for a ``ScanFilterProject`` operator, corresponding
-to the ``Scan``, ``Filter``, and ``Project`` parts of the operator, in that order.
-
-Estimated cost is also printed in :doc:`/sql/explain-analyze` in addition to actual
-runtime statistics.
-
diff --git a/docs/src/main/sphinx/optimizer/pushdown.md b/docs/src/main/sphinx/optimizer/pushdown.md
new file mode 100644
index 000000000000..960aa1953190
--- /dev/null
+++ b/docs/src/main/sphinx/optimizer/pushdown.md
@@ -0,0 +1,362 @@
+# Pushdown
+
+Trino can push down the processing of queries, or parts of queries, into the
+connected data source. This means that a specific predicate, aggregation
+function, or other operation, is passed through to the underlying database or
+storage system for processing.
+
+The results of this pushdown can include the following benefits:
+
+- Improved overall query performance
+- Reduced network traffic between Trino and the data source
+- Reduced load on the remote data source
+
+These benefits often result in significant cost reduction.
+
+Support for pushdown is specific to each connector and the relevant underlying
+database or storage system.
+
+(predicate-pushdown)=
+
+## Predicate pushdown
+
+Predicate pushdown optimizes row-based filtering. It uses the inferred filter,
+typically resulting from a condition in a `WHERE` clause to omit unnecessary
+rows. The processing is pushed down to the data source by the connector and then
+processed by the data source.
+
+If predicate pushdown for a specific clause is succesful, the `EXPLAIN` plan
+for the query does not include a `ScanFilterProject` operation for that
+clause.
+
+(projection-pushdown)=
+
+## Projection pushdown
+
+Projection pushdown optimizes column-based filtering. It uses the columns
+specified in the `SELECT` clause and other parts of the query to limit access
+to these columns. The processing is pushed down to the data source by the
+connector and then the data source only reads and returns the neccessary
+columns.
+
+If projection pushdown is succesful, the `EXPLAIN` plan for the query only
+accesses the relevant columns in the `Layout` of the `TableScan` operation.
+
+(dereference-pushdown)=
+
+## Dereference pushdown
+
+Projection pushdown and dereference pushdown limit access to relevant columns,
+except dereference pushdown is more selective. It limits access to only read the
+specified fields within a top level or nested `ROW` data type.
+
+For example, consider a table in the Hive connector that has a `ROW` type
+column with several fields. If a query only accesses one field, dereference
+pushdown allows the file reader to read only that single field within the row.
+The same applies to fields of a row nested within the top level row. This can
+result in significant savings in the amount of data read from the storage
+system.
+
+(aggregation-pushdown)=
+
+## Aggregation pushdown
+
+Aggregation pushdown can take place provided the following conditions are satisfied:
+
+- If aggregation pushdown is generally supported by the connector.
+- If pushdown of the specific function or functions is supported by the connector.
+- If the query structure allows pushdown to take place.
+
+You can check if pushdown for a specific query is performed by looking at the
+{doc}`EXPLAIN plan </sql/explain>` of the query. If an aggregate function is successfully
+pushed down to the connector, the explain plan does **not** show that `Aggregate` operator.
+The explain plan only shows the operations that are performed by Trino.
+
+As an example, we loaded the TPCH data set into a PostgreSQL database and then
+queried it using the PostgreSQL connector:
+
+```
+SELECT regionkey, count(*)
+FROM nation
+GROUP BY regionkey;
+```
+
+You can get the explain plan by prepending the above query with `EXPLAIN`:
+
+```
+EXPLAIN
+SELECT regionkey, count(*)
+FROM nation
+GROUP BY regionkey;
+```
+
+The explain plan for this query does not show any `Aggregate` operator with
+the `count` function, as this operation is now performed by the connector. You
+can see the `count(*)` function as part of the PostgreSQL `TableScan`
+operator. This shows you that the pushdown was successful.
+
+```text
+Fragment 0 [SINGLE]
+    Output layout: [regionkey_0, _generated_1]
+    Output partitioning: SINGLE []
+    Output[regionkey, _col1]
+    │   Layout: [regionkey_0:bigint, _generated_1:bigint]
+    │   Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: ?}
+    │   regionkey := regionkey_0
+    │   _col1 := _generated_1
+    └─ RemoteSource[1]
+            Layout: [regionkey_0:bigint, _generated_1:bigint]
+
+Fragment 1 [SOURCE]
+    Output layout: [regionkey_0, _generated_1]
+    Output partitioning: SINGLE []
+    TableScan[postgresql:tpch.nation tpch.nation columns=[regionkey:bigint:int8, count(*):_generated_1:bigint:bigint] groupingSets=[[regionkey:bigint:int8]], gro
+        Layout: [regionkey_0:bigint, _generated_1:bigint]
+        Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: 0B}
+        _generated_1 := count(*):_generated_1:bigint:bigint
+        regionkey_0 := regionkey:bigint:int8
+```
+
+A number of factors can prevent a push down:
+
+- adding a condition to the query
+- using a different aggregate function that cannot be pushed down into the connector
+- using a connector without pushdown support for the specific function
+
+As a result, the explain plan shows the `Aggregate` operation being performed
+by Trino. This is a clear sign that now pushdown to the remote data source is not
+performed, and instead Trino performs the aggregate processing.
+
+```text
+Fragment 0 [SINGLE]
+    Output layout: [regionkey, count]
+    Output partitioning: SINGLE []
+    Output[regionkey, _col1]
+    │   Layout: [regionkey:bigint, count:bigint]
+    │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+    │   _col1 := count
+    └─ RemoteSource[1]
+           Layout: [regionkey:bigint, count:bigint]
+
+Fragment 1 [HASH]
+    Output layout: [regionkey, count]
+    Output partitioning: SINGLE []
+    Aggregate(FINAL)[regionkey]
+    │   Layout: [regionkey:bigint, count:bigint]
+    │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+    │   count := count("count_0")
+    └─ LocalExchange[HASH][$hashvalue] ("regionkey")
+       │   Layout: [regionkey:bigint, count_0:bigint, $hashvalue:bigint]
+       │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+       └─ RemoteSource[2]
+              Layout: [regionkey:bigint, count_0:bigint, $hashvalue_1:bigint]
+
+Fragment 2 [SOURCE]
+    Output layout: [regionkey, count_0, $hashvalue_2]
+    Output partitioning: HASH [regionkey][$hashvalue_2]
+    Project[]
+    │   Layout: [regionkey:bigint, count_0:bigint, $hashvalue_2:bigint]
+    │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+    │   $hashvalue_2 := combine_hash(bigint '0', COALESCE("$operator$hash_code"("regionkey"), 0))
+    └─ Aggregate(PARTIAL)[regionkey]
+       │   Layout: [regionkey:bigint, count_0:bigint]
+       │   count_0 := count(*)
+       └─ TableScan[tpch:nation:sf0.01, grouped = false]
+              Layout: [regionkey:bigint]
+              Estimates: {rows: 25 (225B), cpu: 225, memory: 0B, network: 0B}
+              regionkey := tpch:regionkey
+```
+
+### Limitations
+
+Aggregation pushdown does not support a number of more complex statements:
+
+- complex grouping operations such as `ROLLUP`, `CUBE`, or `GROUPING SETS`
+- expressions inside the aggregation function call: `sum(a * b)`
+- coercions: `sum(integer_column)`
+- {ref}`aggregations with ordering <aggregate-function-ordering-during-aggregation>`
+- {ref}`aggregations with filter <aggregate-function-filtering-during-aggregation>`
+
+(join-pushdown)=
+
+## Join pushdown
+
+Join pushdown allows the connector to delegate the table join operation to the
+underlying data source. This can result in performance gains, and allows Trino
+to perform the remaining query processing on a smaller amount of data.
+
+The specifics for the supported pushdown of table joins varies for each data
+source, and therefore for each connector.
+
+However, there are some generic conditions that must be met in order for a join
+to be pushed down:
+
+- all predicates that are part of the join must be possible to be pushed down
+- the tables in the join must be from the same catalog
+
+You can verify if pushdown for a specific join is performed by looking at the
+{doc}`EXPLAIN </sql/explain>`  plan of the query. The explain plan does not
+show a `Join` operator, if the join is pushed down to the data source by the
+connector:
+
+```
+EXPLAIN SELECT c.custkey, o.orderkey
+FROM orders o JOIN customer c ON c.custkey = o.custkey;
+```
+
+The following plan results from the PostgreSQL connector querying TPCH
+data in a PostgreSQL database. It does not show any `Join` operator as a
+result of the successful join push down.
+
+```text
+Fragment 0 [SINGLE]
+    Output layout: [custkey, orderkey]
+    Output partitioning: SINGLE []
+    Output[custkey, orderkey]
+    │   Layout: [custkey:bigint, orderkey:bigint]
+    │   Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: ?}
+    └─ RemoteSource[1]
+           Layout: [orderkey:bigint, custkey:bigint]
+
+Fragment 1 [SOURCE]
+    Output layout: [orderkey, custkey]
+    Output partitioning: SINGLE []
+    TableScan[postgres:Query[SELECT l."orderkey" AS "orderkey_0", l."custkey" AS "custkey_1", r."custkey" AS "custkey_2" FROM (SELECT "orderkey", "custkey" FROM "tpch"."orders") l INNER JOIN (SELECT "custkey" FROM "tpch"."customer") r O
+        Layout: [orderkey:bigint, custkey:bigint]
+        Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: 0B}
+        orderkey := orderkey_0:bigint:int8
+        custkey := custkey_1:bigint:int8
+```
+
+It is typically beneficial to push down a join. Pushing down a join can also
+increase the row count compared to the size of the input to the join. This
+may impact performance.
+
+(limit-pushdown)=
+
+## Limit pushdown
+
+A {ref}`limit-clause` reduces the number of returned records for a statement.
+Limit pushdown enables a connector to push processing of such queries of
+unsorted record to the underlying data source.
+
+A pushdown of this clause can improve the performance of the query and
+significantly reduce the amount of data transferred from the data source to
+Trino.
+
+Queries include sections such as `LIMIT N` or `FETCH FIRST N ROWS`.
+
+Implementation and support is connector-specific since different data sources have varying capabilities.
+
+(topn-pushdown)=
+
+## Top-N pushdown
+
+The combination of a {ref}`limit-clause` with an {ref}`order-by-clause` creates
+a small set of records to return out of a large sorted dataset. It relies on the
+order to determine which records need to be returned, and is therefore quite
+different to optimize compared to a {ref}`limit-pushdown`.
+
+The pushdown for such a query is called a Top-N pushdown, since the operation is
+returning the top N rows. It enables a connector to push processing of such
+queries to the underlying data source, and therefore significantly reduces the
+amount of data transferred to and processed by Trino.
+
+Queries include sections such as `ORDER BY ... LIMIT N` or `ORDER BY ...
+FETCH FIRST N ROWS`.
+
+Implementation and support is connector-specific since different data sources
+support different SQL syntax and processing.
+
+For example, you can find two queries to learn how to identify Top-N pushdown behavior in the following section.
+
+First, a concrete example of a Top-N pushdown query on top of a PostgreSQL database:
+
+```
+SELECT id, name
+FROM postgresql.public.company
+ORDER BY id
+LIMIT 5;
+```
+
+You can get the explain plan by prepending the above query with `EXPLAIN`:
+
+```
+EXPLAIN SELECT id, name
+FROM postgresql.public.company
+ORDER BY id
+LIMIT 5;
+```
+
+```text
+Fragment 0 [SINGLE]
+    Output layout: [id, name]
+    Output partitioning: SINGLE []
+    Stage Execution Strategy: UNGROUPED_EXECUTION
+    Output[id, name]
+    │   Layout: [id:integer, name:varchar]
+    │   Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: ?}
+    └─ RemoteSource[1]
+           Layout: [id:integer, name:varchar]
+
+Fragment 1 [SOURCE]
+    Output layout: [id, name]
+    Output partitioning: SINGLE []
+    Stage Execution Strategy: UNGROUPED_EXECUTION
+    TableScan[postgresql:public.company public.company sortOrder=[id:integer:int4 ASC NULLS LAST] limit=5, grouped = false]
+        Layout: [id:integer, name:varchar]
+        Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: 0B}
+        name := name:varchar:text
+        id := id:integer:int4
+```
+
+Second, an example of a Top-N query on the `tpch` connector which does not support
+Top-N pushdown functionality:
+
+```
+SELECT custkey, name
+FROM tpch.sf1.customer
+ORDER BY custkey
+LIMIT 5;
+```
+
+The related query plan:
+
+```text
+Fragment 0 [SINGLE]
+    Output layout: [custkey, name]
+    Output partitioning: SINGLE []
+    Stage Execution Strategy: UNGROUPED_EXECUTION
+    Output[custkey, name]
+    │   Layout: [custkey:bigint, name:varchar(25)]
+    │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+    └─ TopN[5 by (custkey ASC NULLS LAST)]
+       │   Layout: [custkey:bigint, name:varchar(25)]
+       └─ LocalExchange[SINGLE] ()
+          │   Layout: [custkey:bigint, name:varchar(25)]
+          │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+          └─ RemoteSource[1]
+                 Layout: [custkey:bigint, name:varchar(25)]
+
+Fragment 1 [SOURCE]
+    Output layout: [custkey, name]
+    Output partitioning: SINGLE []
+    Stage Execution Strategy: UNGROUPED_EXECUTION
+    TopNPartial[5 by (custkey ASC NULLS LAST)]
+    │   Layout: [custkey:bigint, name:varchar(25)]
+    └─ TableScan[tpch:customer:sf1.0, grouped = false]
+           Layout: [custkey:bigint, name:varchar(25)]
+           Estimates: {rows: 150000 (4.58MB), cpu: 4.58M, memory: 0B, network: 0B}
+           custkey := tpch:custkey
+           name := tpch:name
+```
+
+In the preceding query plan, the Top-N operation `TopN[5 by (custkey ASC NULLS LAST)]`
+is being applied in the `Fragment 0` by Trino and not by the source database.
+
+Note that, compared to the query executed on top of the `tpch` connector,
+the explain plan of the query applied on top of the `postgresql` connector
+is missing the reference to the operation `TopN[5 by (id ASC NULLS LAST)]`
+in the `Fragment 0`.
+The absence of the `TopN` Trino operator in the `Fragment 0` from the query plan
+demonstrates that the query benefits of the Top-N pushdown optimization.
diff --git a/docs/src/main/sphinx/optimizer/pushdown.rst b/docs/src/main/sphinx/optimizer/pushdown.rst
deleted file mode 100644
index 4d40b7dca267..000000000000
--- a/docs/src/main/sphinx/optimizer/pushdown.rst
+++ /dev/null
@@ -1,360 +0,0 @@
-========
-Pushdown
-========
-
-Trino can push down the processing of queries, or parts of queries, into the
-connected data source. This means that a specific predicate, aggregation
-function, or other operation, is passed through to the underlying database or
-storage system for processing.
-
-The results of this pushdown can include the following benefits:
-
-* Improved overall query performance
-* Reduced network traffic between Trino and the data source
-* Reduced load on the remote data source
-
-These benefits often result in significant cost reduction.
-
-Support for pushdown is specific to each connector and the relevant underlying
-database or storage system.
-
-.. _predicate-pushdown:
-
-Predicate pushdown
-------------------
-
-Predicate pushdown optimizes row-based filtering. It uses the inferred filter,
-typically resulting from a condition in a ``WHERE`` clause to omit unnecessary
-rows. The processing is pushed down to the data source by the connector and then
-processed by the data source.
-
-If predicate pushdown for a specific clause is succesful, the ``EXPLAIN`` plan
-for the query does not include a ``ScanFilterProject`` operation for that
-clause.
-
-.. _projection-pushdown:
-
-Projection pushdown
--------------------
-
-Projection pushdown optimizes column-based filtering. It uses the columns
-specified in the ``SELECT`` clause and other parts of the query to limit access
-to these columns. The processing is pushed down to the data source by the
-connector and then the data source only reads and returns the neccessary
-columns.
-
-If projection pushdown is succesful, the ``EXPLAIN`` plan for the query only
-accesses the relevant columns in the ``Layout`` of the ``TableScan`` operation.
-
-.. _dereference-pushdown:
-
-Dereference pushdown
---------------------
-
-Projection pushdown and dereference pushdown limit access to relevant columns,
-except dereference pushdown is more selective. It limits access to only read the
-specified fields within a top level or nested ``ROW`` data type.
-
-For example, consider a table in the Hive connector that has a ``ROW`` type
-column with several fields. If a query only accesses one field, dereference
-pushdown allows the file reader to read only that single field within the row.
-The same applies to fields of a row nested within the top level row. This can
-result in significant savings in the amount of data read from the storage
-system.
-
-.. _aggregation-pushdown:
-
-Aggregation pushdown
---------------------
-
-Aggregation pushdown can take place provided the following conditions are satisfied:
-
-* If aggregation pushdown is generally supported by the connector.
-* If pushdown of the specific function or functions is supported by the connector.
-* If the query structure allows pushdown to take place.
-
-You can check if pushdown for a specific query is performed by looking at the
-:doc:`EXPLAIN plan </sql/explain>` of the query. If an aggregate function is successfully
-pushed down to the connector, the explain plan does **not** show that ``Aggregate`` operator.
-The explain plan only shows the operations that are performed by Trino.
-
-As an example, we loaded the TPCH data set into a PostgreSQL database and then
-queried it using the PostgreSQL connector::
-
-    SELECT regionkey, count(*)
-    FROM nation
-    GROUP BY regionkey;
-
-You can get the explain plan by prepending the above query with ``EXPLAIN``::
-
-    EXPLAIN
-    SELECT regionkey, count(*)
-    FROM nation
-    GROUP BY regionkey;
-
-The explain plan for this query does not show any ``Aggregate`` operator with
-the ``count`` function, as this operation is now performed by the connector. You
-can see the ``count(*)`` function as part of the PostgreSQL ``TableScan``
-operator. This shows you that the pushdown was successful.
-
-.. code-block:: text
-
-    Fragment 0 [SINGLE]
-        Output layout: [regionkey_0, _generated_1]
-        Output partitioning: SINGLE []
-        Output[regionkey, _col1]
-        │   Layout: [regionkey_0:bigint, _generated_1:bigint]
-        │   Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: ?}
-        │   regionkey := regionkey_0
-        │   _col1 := _generated_1
-        └─ RemoteSource[1]
-                Layout: [regionkey_0:bigint, _generated_1:bigint]
-
-    Fragment 1 [SOURCE]
-        Output layout: [regionkey_0, _generated_1]
-        Output partitioning: SINGLE []
-        TableScan[postgresql:tpch.nation tpch.nation columns=[regionkey:bigint:int8, count(*):_generated_1:bigint:bigint] groupingSets=[[regionkey:bigint:int8]], gro
-            Layout: [regionkey_0:bigint, _generated_1:bigint]
-            Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: 0B}
-            _generated_1 := count(*):_generated_1:bigint:bigint
-            regionkey_0 := regionkey:bigint:int8
-
-A number of factors can prevent a push down:
-
-* adding a condition to the query
-* using a different aggregate function that cannot be pushed down into the connector
-* using a connector without pushdown support for the specific function
-
-As a result, the explain plan shows the ``Aggregate`` operation being performed
-by Trino. This is a clear sign that now pushdown to the remote data source is not
-performed, and instead Trino performs the aggregate processing.
-
-.. code-block:: text
-
- Fragment 0 [SINGLE]
-     Output layout: [regionkey, count]
-     Output partitioning: SINGLE []
-     Output[regionkey, _col1]
-     │   Layout: [regionkey:bigint, count:bigint]
-     │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-     │   _col1 := count
-     └─ RemoteSource[1]
-            Layout: [regionkey:bigint, count:bigint]
-
- Fragment 1 [HASH]
-     Output layout: [regionkey, count]
-     Output partitioning: SINGLE []
-     Aggregate(FINAL)[regionkey]
-     │   Layout: [regionkey:bigint, count:bigint]
-     │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-     │   count := count("count_0")
-     └─ LocalExchange[HASH][$hashvalue] ("regionkey")
-        │   Layout: [regionkey:bigint, count_0:bigint, $hashvalue:bigint]
-        │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-        └─ RemoteSource[2]
-               Layout: [regionkey:bigint, count_0:bigint, $hashvalue_1:bigint]
-
- Fragment 2 [SOURCE]
-     Output layout: [regionkey, count_0, $hashvalue_2]
-     Output partitioning: HASH [regionkey][$hashvalue_2]
-     Project[]
-     │   Layout: [regionkey:bigint, count_0:bigint, $hashvalue_2:bigint]
-     │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-     │   $hashvalue_2 := combine_hash(bigint '0', COALESCE("$operator$hash_code"("regionkey"), 0))
-     └─ Aggregate(PARTIAL)[regionkey]
-        │   Layout: [regionkey:bigint, count_0:bigint]
-        │   count_0 := count(*)
-        └─ TableScan[tpch:nation:sf0.01, grouped = false]
-               Layout: [regionkey:bigint]
-               Estimates: {rows: 25 (225B), cpu: 225, memory: 0B, network: 0B}
-               regionkey := tpch:regionkey
-
-Limitations
-^^^^^^^^^^^
-
-Aggregation pushdown does not support a number of more complex statements:
-
-* complex grouping operations such as ``ROLLUP``, ``CUBE``, or ``GROUPING SETS``
-* expressions inside the aggregation function call: ``sum(a * b)``
-* coercions: ``sum(integer_column)``
-* :ref:`aggregations with ordering <aggregate-function-ordering-during-aggregation>`
-* :ref:`aggregations with filter <aggregate-function-filtering-during-aggregation>`
-
-.. _join-pushdown:
-
-Join pushdown
--------------
-
-Join pushdown allows the connector to delegate the table join operation to the
-underlying data source. This can result in performance gains, and allows Trino
-to perform the remaining query processing on a smaller amount of data.
-
-The specifics for the supported pushdown of table joins varies for each data
-source, and therefore for each connector.
-
-However, there are some generic conditions that must be met in order for a join
-to be pushed down:
-
-* all predicates that are part of the join must be possible to be pushed down
-* the tables in the join must be from the same catalog
-
-You can verify if pushdown for a specific join is performed by looking at the
-:doc:`EXPLAIN </sql/explain>`  plan of the query. The explain plan does not
-show a ``Join`` operator, if the join is pushed down to the data source by the
-connector::
-
-    EXPLAIN SELECT c.custkey, o.orderkey
-    FROM orders o JOIN customer c ON c.custkey = o.custkey;
-
-The following plan results from the PostgreSQL connector querying TPCH
-data in a PostgreSQL database. It does not show any ``Join`` operator as a
-result of the successful join push down.
-
-.. code-block:: text
-
- Fragment 0 [SINGLE]
-     Output layout: [custkey, orderkey]
-     Output partitioning: SINGLE []
-     Output[custkey, orderkey]
-     │   Layout: [custkey:bigint, orderkey:bigint]
-     │   Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: ?}
-     └─ RemoteSource[1]
-            Layout: [orderkey:bigint, custkey:bigint]
-
- Fragment 1 [SOURCE]
-     Output layout: [orderkey, custkey]
-     Output partitioning: SINGLE []
-     TableScan[postgres:Query[SELECT l."orderkey" AS "orderkey_0", l."custkey" AS "custkey_1", r."custkey" AS "custkey_2" FROM (SELECT "orderkey", "custkey" FROM "tpch"."orders") l INNER JOIN (SELECT "custkey" FROM "tpch"."customer") r O
-         Layout: [orderkey:bigint, custkey:bigint]
-         Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: 0B}
-         orderkey := orderkey_0:bigint:int8
-         custkey := custkey_1:bigint:int8
-
-It is typically beneficial to push down a join. Pushing down a join can also
-increase the row count compared to the size of the input to the join. This
-may impact performance.
-
-.. _limit-pushdown:
-
-Limit pushdown
---------------
-
-A :ref:`limit-clause` reduces the number of returned records for a statement.
-Limit pushdown enables a connector to push processing of such queries of
-unsorted record to the underlying data source.
-
-A pushdown of this clause can improve the performance of the query and
-significantly reduce the amount of data transferred from the data source to
-Trino.
-
-Queries include sections such as ``LIMIT N`` or ``FETCH FIRST N ROWS``.
-
-Implementation and support is connector-specific since different data sources have varying capabilities.
-
-.. _topn-pushdown:
-
-Top-N pushdown
---------------
-
-The combination of a :ref:`limit-clause` with an :ref:`order-by-clause` creates
-a small set of records to return out of a large sorted dataset. It relies on the
-order to determine which records need to be returned, and is therefore quite
-different to optimize compared to a :ref:`limit-pushdown`.
-
-The pushdown for such a query is called a Top-N pushdown, since the operation is
-returning the top N rows. It enables a connector to push processing of such
-queries to the underlying data source, and therefore significantly reduces the
-amount of data transferred to and processed by Trino.
-
-Queries include sections such as ``ORDER BY ... LIMIT N`` or ``ORDER BY ...
-FETCH FIRST N ROWS``.
-
-Implementation and support is connector-specific since different data sources
-support different SQL syntax and processing.
-
-For example, you can find two queries to learn how to identify Top-N pushdown behavior in the following section.
-
-First, a concrete example of a Top-N pushdown query on top of a PostgreSQL database::
-
-    SELECT id, name
-    FROM postgresql.public.company
-    ORDER BY id
-    LIMIT 5;
-
-You can get the explain plan by prepending the above query with ``EXPLAIN``::
-
-    EXPLAIN SELECT id, name
-    FROM postgresql.public.company
-    ORDER BY id
-    LIMIT 5;
-
-.. code-block:: text
-
- Fragment 0 [SINGLE]
-     Output layout: [id, name]
-     Output partitioning: SINGLE []
-     Stage Execution Strategy: UNGROUPED_EXECUTION
-     Output[id, name]
-     │   Layout: [id:integer, name:varchar]
-     │   Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: ?}
-     └─ RemoteSource[1]
-            Layout: [id:integer, name:varchar]
-
- Fragment 1 [SOURCE]
-     Output layout: [id, name]
-     Output partitioning: SINGLE []
-     Stage Execution Strategy: UNGROUPED_EXECUTION
-     TableScan[postgresql:public.company public.company sortOrder=[id:integer:int4 ASC NULLS LAST] limit=5, grouped = false]
-         Layout: [id:integer, name:varchar]
-         Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: 0B}
-         name := name:varchar:text
-         id := id:integer:int4
-
-Second, an example of a Top-N query on the ``tpch`` connector which does not support
-Top-N pushdown functionality::
-
-    SELECT custkey, name
-    FROM tpch.sf1.customer
-    ORDER BY custkey
-    LIMIT 5;
-
-The related query plan:
-
-.. code-block:: text
-
- Fragment 0 [SINGLE]
-     Output layout: [custkey, name]
-     Output partitioning: SINGLE []
-     Stage Execution Strategy: UNGROUPED_EXECUTION
-     Output[custkey, name]
-     │   Layout: [custkey:bigint, name:varchar(25)]
-     │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-     └─ TopN[5 by (custkey ASC NULLS LAST)]
-        │   Layout: [custkey:bigint, name:varchar(25)]
-        └─ LocalExchange[SINGLE] ()
-           │   Layout: [custkey:bigint, name:varchar(25)]
-           │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-           └─ RemoteSource[1]
-                  Layout: [custkey:bigint, name:varchar(25)]
-
- Fragment 1 [SOURCE]
-     Output layout: [custkey, name]
-     Output partitioning: SINGLE []
-     Stage Execution Strategy: UNGROUPED_EXECUTION
-     TopNPartial[5 by (custkey ASC NULLS LAST)]
-     │   Layout: [custkey:bigint, name:varchar(25)]
-     └─ TableScan[tpch:customer:sf1.0, grouped = false]
-            Layout: [custkey:bigint, name:varchar(25)]
-            Estimates: {rows: 150000 (4.58MB), cpu: 4.58M, memory: 0B, network: 0B}
-            custkey := tpch:custkey
-            name := tpch:name
-
-In the preceding query plan, the Top-N operation ``TopN[5 by (custkey ASC NULLS LAST)]``
-is being applied in the ``Fragment 0`` by Trino and not by the source database.
-
-Note that, compared to the query executed on top of the ``tpch`` connector,
-the explain plan of the query applied on top of the ``postgresql`` connector
-is missing the reference to the operation ``TopN[5 by (id ASC NULLS LAST)]``
-in the ``Fragment 0``.
-The absence of the ``TopN`` Trino operator in the ``Fragment 0`` from the query plan
-demonstrates that the query benefits of the Top-N pushdown optimization.
diff --git a/docs/src/main/sphinx/optimizer/statistics.md b/docs/src/main/sphinx/optimizer/statistics.md
new file mode 100644
index 000000000000..f3b026bca786
--- /dev/null
+++ b/docs/src/main/sphinx/optimizer/statistics.md
@@ -0,0 +1,32 @@
+# Table statistics
+
+Trino supports statistics based optimizations for queries. For a query to take
+advantage of these optimizations, Trino must have statistical information for
+the tables in that query.
+
+Table statistics are provided to the query planner by connectors.
+
+## Available statistics
+
+The following statistics are available in Trino:
+
+- For a table:
+
+  - **row count**: the total number of rows in the table
+
+- For each column in a table:
+
+  - **data size**: the size of the data that needs to be read
+  - **nulls fraction**: the fraction of null values
+  - **distinct value count**: the number of distinct values
+  - **low value**: the smallest value in the column
+  - **high value**: the largest value in the column
+
+The set of statistics available for a particular query depends on the connector
+being used and can also vary by table. For example, the
+Hive connector does not currently provide statistics on data size.
+
+Table statistics can be displayed via the Trino SQL interface using the
+{doc}`/sql/show-stats` command. For the Hive connector, refer to the
+{ref}`Hive connector <hive-analyze>` documentation to learn how to update table
+statistics.
diff --git a/docs/src/main/sphinx/optimizer/statistics.rst b/docs/src/main/sphinx/optimizer/statistics.rst
deleted file mode 100644
index 5fac98f50592..000000000000
--- a/docs/src/main/sphinx/optimizer/statistics.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-================
-Table statistics
-================
-
-Trino supports statistics based optimizations for queries. For a query to take
-advantage of these optimizations, Trino must have statistical information for
-the tables in that query.
-
-Table statistics are provided to the query planner by connectors.
-
-Available statistics
---------------------
-
-The following statistics are available in Trino:
-
-* For a table:
-
-  * **row count**: the total number of rows in the table
-
-* For each column in a table:
-
-  * **data size**: the size of the data that needs to be read
-  * **nulls fraction**: the fraction of null values
-  * **distinct value count**: the number of distinct values
-  * **low value**: the smallest value in the column
-  * **high value**: the largest value in the column
-
-The set of statistics available for a particular query depends on the connector
-being used and can also vary by table. For example, the
-Hive connector does not currently provide statistics on data size.
-
-Table statistics can be displayed via the Trino SQL interface using the
-:doc:`/sql/show-stats` command. For the Hive connector, refer to the
-:ref:`Hive connector <hive_analyze>` documentation to learn how to update table
-statistics.
diff --git a/docs/src/main/sphinx/overview.md b/docs/src/main/sphinx/overview.md
new file mode 100644
index 000000000000..4367ab6e6941
--- /dev/null
+++ b/docs/src/main/sphinx/overview.md
@@ -0,0 +1,11 @@
+# Overview
+
+Trino is a distributed SQL query engine designed to query large data sets
+distributed over one or more heterogeneous data sources.
+
+```{toctree}
+:maxdepth: 1
+
+overview/use-cases
+overview/concepts
+```
diff --git a/docs/src/main/sphinx/overview.rst b/docs/src/main/sphinx/overview.rst
deleted file mode 100644
index d7eb7d4ee082..000000000000
--- a/docs/src/main/sphinx/overview.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-********
-Overview
-********
-
-Trino is a distributed SQL query engine designed to query large data sets
-distributed over one or more heterogeneous data sources.
-
-.. toctree::
-    :maxdepth: 1
-
-    overview/use-cases
-    overview/concepts
diff --git a/docs/src/main/sphinx/overview/concepts.md b/docs/src/main/sphinx/overview/concepts.md
new file mode 100644
index 000000000000..b81439e07c00
--- /dev/null
+++ b/docs/src/main/sphinx/overview/concepts.md
@@ -0,0 +1,261 @@
+# Trino concepts
+
+## Overview
+
+To understand Trino, you must first understand the terms and concepts
+used throughout the Trino documentation.
+
+While it is easy to understand statements and queries, as an end-user
+you should have familiarity with concepts such as stages and splits to
+take full advantage of Trino to execute efficient queries. As a
+Trino administrator or a Trino contributor you should understand how
+Trino's concepts of stages map to tasks and how tasks contain a set
+of drivers which process data.
+
+This section provides a solid definition for the core concepts
+referenced throughout Trino, and these sections are sorted from most
+general to most specific.
+
+:::{note}
+The book [Trino: The Definitive Guide](https://trino.io/trino-the-definitive-guide.html) and the research
+paper [Presto: SQL on Everything](https://trino.io/paper.html) can
+provide further information about Trino and the concepts in use.
+:::
+
+(trino-concept-architecture)=
+
+## Architecture
+
+Trino is a distributed query engine that processes data in parallel across
+multiple servers. There are two types of Trino servers,
+{ref}`coordinators <trino-concept-coordinator>` and
+{ref}`workers <trino-concept-worker>`. The following sections describe these
+servers and other components of Trino's architecture.
+
+(trino-concept-cluster)=
+
+### Cluster
+
+A Trino cluster consists of a {ref}`coordinator <trino-concept-coordinator>` and
+many {ref}`workers <trino-concept-worker>`. Users connect to the coordinator
+with their {ref}`SQL <glossSQL>` query tool. The coordinator collaborates with the
+workers. The coordinator and the workers access the connected
+{ref}`data sources <trino-concept-data-sources>`. This access is configured in
+{ref}`catalogs <trino-concept-catalog>`.
+
+Processing each query is a stateful operation. The workload is orchestrated by
+the coordinator and spread parallel across all workers in the cluster. Each node
+runs Trino in one JVM instance, and processing is parallelized further using
+threads.
+
+(trino-concept-coordinator)=
+
+### Coordinator
+
+The Trino coordinator is the server that is responsible for parsing
+statements, planning queries, and managing Trino worker nodes.  It is
+the "brain" of a Trino installation and is also the node to which a
+client connects to submit statements for execution. Every Trino
+installation must have a Trino coordinator alongside one or more
+Trino workers. For development or testing purposes, a single
+instance of Trino can be configured to perform both roles.
+
+The coordinator keeps track of the activity on each worker and
+coordinates the execution of a query. The coordinator creates
+a logical model of a query involving a series of stages, which is then
+translated into a series of connected tasks running on a cluster of
+Trino workers.
+
+Coordinators communicate with workers and clients using a REST API.
+
+(trino-concept-worker)=
+
+### Worker
+
+A Trino worker is a server in a Trino installation, which is responsible
+for executing tasks and processing data. Worker nodes fetch data from
+connectors and exchange intermediate data with each other. The coordinator
+is responsible for fetching results from the workers and returning the
+final results to the client.
+
+When a Trino worker process starts up, it advertises itself to the discovery
+server in the coordinator, which makes it available to the Trino coordinator
+for task execution.
+
+Workers communicate with other workers and Trino coordinators
+using a REST API.
+
+(trino-concept-data-sources)=
+
+## Data sources
+
+Throughout this documentation, you'll read terms such as connector,
+catalog, schema, and table. These fundamental concepts cover Trino's
+model of a particular data source and are described in the following
+section.
+
+### Connector
+
+A connector adapts Trino to a data source such as Hive or a
+relational database. You can think of a connector the same way you
+think of a driver for a database. It is an implementation of Trino's
+{doc}`SPI </develop/spi-overview>`, which allows Trino to interact
+with a resource using a standard API.
+
+Trino contains several built-in connectors: a connector for
+{doc}`JMX </connector/jmx>`, a {doc}`System </connector/system>`
+connector which provides access to built-in system tables,
+a {doc}`Hive </connector/hive>` connector, and a
+{doc}`TPCH </connector/tpch>` connector designed to serve TPC-H benchmark
+data. Many third-party developers have contributed connectors so that
+Trino can access data in a variety of data sources.
+
+Every catalog is associated with a specific connector. If you examine
+a catalog configuration file, you see that each contains a
+mandatory property `connector.name`, which is used by the catalog
+manager to create a connector for a given catalog. It is possible
+to have more than one catalog use the same connector to access two
+different instances of a similar database. For example, if you have
+two Hive clusters, you can configure two catalogs in a single Trino
+cluster that both use the Hive connector, allowing you to query data
+from both Hive clusters, even within the same SQL query.
+
+(trino-concept-catalog)=
+
+### Catalog
+
+A Trino catalog contains schemas and references a data source via a
+connector.  For example, you can configure a JMX catalog to provide
+access to JMX information via the JMX connector. When you run SQL
+statements in Trino, you are running them against one or more catalogs.
+Other examples of catalogs include the Hive catalog to connect to a
+Hive data source.
+
+When addressing a table in Trino, the fully-qualified table name is
+always rooted in a catalog. For example, a fully-qualified table name
+of `hive.test_data.test` refers to the `test` table in the
+`test_data` schema in the `hive` catalog.
+
+Catalogs are defined in properties files stored in the Trino
+configuration directory.
+
+### Schema
+
+Schemas are a way to organize tables. Together, a catalog and schema
+define a set of tables that can be queried. When accessing Hive or a
+relational database such as MySQL with Trino, a schema translates to
+the same concept in the target database. Other types of connectors may
+choose to organize tables into schemas in a way that makes sense for
+the underlying data source.
+
+### Table
+
+A table is a set of unordered rows, which are organized into named columns
+with types. This is the same as in any relational database. The mapping
+from source data to tables is defined by the connector.
+
+## Query execution model
+
+Trino executes SQL statements and turns these statements into queries,
+that are executed across a distributed cluster of coordinator and workers.
+
+### Statement
+
+Trino executes ANSI-compatible SQL statements.  When the Trino
+documentation refers to a statement, it is referring to statements as
+defined in the ANSI SQL standard, which consists of clauses,
+expressions, and predicates.
+
+Some readers might be curious why this section lists separate concepts
+for statements and queries. This is necessary because, in Trino,
+statements simply refer to the textual representation of a statement written
+in SQL. When a statement is executed, Trino creates a query along
+with a query plan that is then distributed across a series of Trino
+workers.
+
+### Query
+
+When Trino parses a statement, it converts it into a query and creates
+a distributed query plan, which is then realized as a series of
+interconnected stages running on Trino workers. When you retrieve
+information about a query in Trino, you receive a snapshot of every
+component that is involved in producing a result set in response to a
+statement.
+
+The difference between a statement and a query is simple. A statement
+can be thought of as the SQL text that is passed to Trino, while a query
+refers to the configuration and components instantiated to execute
+that statement. A query encompasses stages, tasks, splits, connectors,
+and other components and data sources working in concert to produce a
+result.
+
+(trino-concept-stage)=
+
+### Stage
+
+When Trino executes a query, it does so by breaking up the execution
+into a hierarchy of stages. For example, if Trino needs to aggregate
+data from one billion rows stored in Hive, it does so by creating a
+root stage to aggregate the output of several other stages, all of
+which are designed to implement different sections of a distributed
+query plan.
+
+The hierarchy of stages that comprises a query resembles a tree.
+Every query has a root stage, which is responsible for aggregating
+the output from other stages. Stages are what the coordinator uses to
+model a distributed query plan, but stages themselves don't run on
+Trino workers.
+
+(trino-concept-task)=
+
+### Task
+
+As mentioned in the previous section, stages model a particular
+section of a distributed query plan, but stages themselves don't
+execute on Trino workers. To understand how a stage is executed,
+you need to understand that a stage is implemented as a series of
+tasks distributed over a network of Trino workers.
+
+Tasks are the "work horse" in the Trino architecture as a distributed
+query plan is deconstructed into a series of stages, which are then
+translated to tasks, which then act upon or process splits. A Trino
+task has inputs and outputs, and just as a stage can be executed in
+parallel by a series of tasks, a task is executing in parallel with a
+series of drivers.
+
+(trino-concept-splits)=
+
+### Split
+
+Tasks operate on splits, which are sections of a larger data
+set. Stages at the lowest level of a distributed query plan retrieve
+data via splits from connectors, and intermediate stages at a higher
+level of a distributed query plan retrieve data from other stages.
+
+When Trino is scheduling a query, the coordinator queries a
+connector for a list of all splits that are available for a table.
+The coordinator keeps track of which machines are running which tasks,
+and what splits are being processed by which tasks.
+
+### Driver
+
+Tasks contain one or more parallel drivers. Drivers act upon data and
+combine operators to produce output that is then aggregated by a task
+and then delivered to another task in another stage. A driver is a
+sequence of operator instances, or you can think of a driver as a
+physical set of operators in memory. It is the lowest level of
+parallelism in the Trino architecture. A driver has one input and
+one output.
+
+### Operator
+
+An operator consumes, transforms and produces data. For example, a table
+scan fetches data from a connector and produces data that can be consumed
+by other operators, and a filter operator consumes data and produces a
+subset by applying a predicate over the input data.
+
+### Exchange
+
+Exchanges transfer data between Trino nodes for different stages of
+a query. Tasks produce data into an output buffer and consume data
+from other tasks using an exchange client.
diff --git a/docs/src/main/sphinx/overview/concepts.rst b/docs/src/main/sphinx/overview/concepts.rst
deleted file mode 100644
index f82fc8c565a2..000000000000
--- a/docs/src/main/sphinx/overview/concepts.rst
+++ /dev/null
@@ -1,284 +0,0 @@
-==============
-Trino concepts
-==============
-
-Overview
---------
-
-To understand Trino, you must first understand the terms and concepts
-used throughout the Trino documentation.
-
-While it is easy to understand statements and queries, as an end-user
-you should have familiarity with concepts such as stages and splits to
-take full advantage of Trino to execute efficient queries. As a
-Trino administrator or a Trino contributor you should understand how
-Trino's concepts of stages map to tasks and how tasks contain a set
-of drivers which process data.
-
-This section provides a solid definition for the core concepts
-referenced throughout Trino, and these sections are sorted from most
-general to most specific.
-
-.. note::
-
-    The book `Trino: The Definitive Guide
-    <https://trino.io/trino-the-definitive-guide.html>`_ and the research
-    paper `Presto: SQL on Everything <https://trino.io/paper.html>`_ can
-    provide further information about Trino and the concepts in use.
-
-
-.. _trino-concept-architecture:
-
-Architecture
-------------
-
-Trino is a distributed query engine that processes data in parallel across
-multiple servers. There are two types of Trino servers,
-:ref:`coordinators <trino-concept-coordinator>` and
-:ref:`workers <trino-concept-worker>`. The following sections describe these
-servers and other components of Trino's architecture.
-
-.. _trino-concept-cluster:
-
-Cluster
-^^^^^^^
-
-A Trino cluster consists of a :ref:`coordinator <trino-concept-coordinator>` and
-many :ref:`workers <trino-concept-worker>`. Users connect to the coordinator
-with their :ref:`SQL <glossSQL>` query tool. The coordinator collaborates with the
-workers. The coordinator and the workers access the connected
-:ref:`data sources <trino-concept-data-sources>`. This access is configured in
-:ref:`catalogs <trino-concept-catalog>`.
-
-Processing each query is a stateful operation. The workload is orchestrated by
-the coordinator and spread parallel across all workers in the cluster. Each node
-runs Trino in one JVM instance, and processing is parallelized further using
-threads.
-
-.. _trino-concept-coordinator:
-
-Coordinator
-^^^^^^^^^^^
-
-The Trino coordinator is the server that is responsible for parsing
-statements, planning queries, and managing Trino worker nodes.  It is
-the "brain" of a Trino installation and is also the node to which a
-client connects to submit statements for execution. Every Trino
-installation must have a Trino coordinator alongside one or more
-Trino workers. For development or testing purposes, a single
-instance of Trino can be configured to perform both roles.
-
-The coordinator keeps track of the activity on each worker and
-coordinates the execution of a query. The coordinator creates
-a logical model of a query involving a series of stages, which is then
-translated into a series of connected tasks running on a cluster of
-Trino workers.
-
-Coordinators communicate with workers and clients using a REST API.
-
-.. _trino-concept-worker:
-
-Worker
-^^^^^^
-
-A Trino worker is a server in a Trino installation, which is responsible
-for executing tasks and processing data. Worker nodes fetch data from
-connectors and exchange intermediate data with each other. The coordinator
-is responsible for fetching results from the workers and returning the
-final results to the client.
-
-When a Trino worker process starts up, it advertises itself to the discovery
-server in the coordinator, which makes it available to the Trino coordinator
-for task execution.
-
-Workers communicate with other workers and Trino coordinators
-using a REST API.
-
-.. _trino-concept-data-sources:
-
-Data sources
-------------
-
-Throughout this documentation, you'll read terms such as connector,
-catalog, schema, and table. These fundamental concepts cover Trino's
-model of a particular data source and are described in the following
-section.
-
-Connector
-^^^^^^^^^
-
-A connector adapts Trino to a data source such as Hive or a
-relational database. You can think of a connector the same way you
-think of a driver for a database. It is an implementation of Trino's
-:doc:`SPI </develop/spi-overview>`, which allows Trino to interact
-with a resource using a standard API.
-
-Trino contains several built-in connectors: a connector for
-:doc:`JMX </connector/jmx>`, a :doc:`System </connector/system>`
-connector which provides access to built-in system tables,
-a :doc:`Hive </connector/hive>` connector, and a
-:doc:`TPCH </connector/tpch>` connector designed to serve TPC-H benchmark
-data. Many third-party developers have contributed connectors so that
-Trino can access data in a variety of data sources.
-
-Every catalog is associated with a specific connector. If you examine
-a catalog configuration file, you see that each contains a
-mandatory property ``connector.name``, which is used by the catalog
-manager to create a connector for a given catalog. It is possible
-to have more than one catalog use the same connector to access two
-different instances of a similar database. For example, if you have
-two Hive clusters, you can configure two catalogs in a single Trino
-cluster that both use the Hive connector, allowing you to query data
-from both Hive clusters, even within the same SQL query.
-
-.. _trino-concept-catalog:
-
-Catalog
-^^^^^^^
-
-A Trino catalog contains schemas and references a data source via a
-connector.  For example, you can configure a JMX catalog to provide
-access to JMX information via the JMX connector. When you run SQL
-statements in Trino, you are running them against one or more catalogs.
-Other examples of catalogs include the Hive catalog to connect to a
-Hive data source.
-
-When addressing a table in Trino, the fully-qualified table name is
-always rooted in a catalog. For example, a fully-qualified table name
-of ``hive.test_data.test`` refers to the ``test`` table in the
-``test_data`` schema in the ``hive`` catalog.
-
-Catalogs are defined in properties files stored in the Trino
-configuration directory.
-
-Schema
-^^^^^^
-
-Schemas are a way to organize tables. Together, a catalog and schema
-define a set of tables that can be queried. When accessing Hive or a
-relational database such as MySQL with Trino, a schema translates to
-the same concept in the target database. Other types of connectors may
-choose to organize tables into schemas in a way that makes sense for
-the underlying data source.
-
-Table
-^^^^^
-
-A table is a set of unordered rows, which are organized into named columns
-with types. This is the same as in any relational database. The mapping
-from source data to tables is defined by the connector.
-
-Query execution model
----------------------
-
-Trino executes SQL statements and turns these statements into queries,
-that are executed across a distributed cluster of coordinator and workers.
-
-Statement
-^^^^^^^^^
-
-Trino executes ANSI-compatible SQL statements.  When the Trino
-documentation refers to a statement, it is referring to statements as
-defined in the ANSI SQL standard, which consists of clauses,
-expressions, and predicates.
-
-Some readers might be curious why this section lists separate concepts
-for statements and queries. This is necessary because, in Trino,
-statements simply refer to the textual representation of a statement written
-in SQL. When a statement is executed, Trino creates a query along
-with a query plan that is then distributed across a series of Trino
-workers.
-
-Query
-^^^^^
-
-When Trino parses a statement, it converts it into a query and creates
-a distributed query plan, which is then realized as a series of
-interconnected stages running on Trino workers. When you retrieve
-information about a query in Trino, you receive a snapshot of every
-component that is involved in producing a result set in response to a
-statement.
-
-The difference between a statement and a query is simple. A statement
-can be thought of as the SQL text that is passed to Trino, while a query
-refers to the configuration and components instantiated to execute
-that statement. A query encompasses stages, tasks, splits, connectors,
-and other components and data sources working in concert to produce a
-result.
-
-.. _trino-concept-stage:
-
-Stage
-^^^^^
-
-When Trino executes a query, it does so by breaking up the execution
-into a hierarchy of stages. For example, if Trino needs to aggregate
-data from one billion rows stored in Hive, it does so by creating a
-root stage to aggregate the output of several other stages, all of
-which are designed to implement different sections of a distributed
-query plan.
-
-The hierarchy of stages that comprises a query resembles a tree.
-Every query has a root stage, which is responsible for aggregating
-the output from other stages. Stages are what the coordinator uses to
-model a distributed query plan, but stages themselves don't run on
-Trino workers.
-
-.. _trino-concept-task:
-
-Task
-^^^^
-
-As mentioned in the previous section, stages model a particular
-section of a distributed query plan, but stages themselves don't
-execute on Trino workers. To understand how a stage is executed,
-you need to understand that a stage is implemented as a series of
-tasks distributed over a network of Trino workers.
-
-Tasks are the "work horse" in the Trino architecture as a distributed
-query plan is deconstructed into a series of stages, which are then
-translated to tasks, which then act upon or process splits. A Trino
-task has inputs and outputs, and just as a stage can be executed in
-parallel by a series of tasks, a task is executing in parallel with a
-series of drivers.
-
-.. _trino-concept-splits:
-
-Split
-^^^^^
-
-Tasks operate on splits, which are sections of a larger data
-set. Stages at the lowest level of a distributed query plan retrieve
-data via splits from connectors, and intermediate stages at a higher
-level of a distributed query plan retrieve data from other stages.
-
-When Trino is scheduling a query, the coordinator queries a
-connector for a list of all splits that are available for a table.
-The coordinator keeps track of which machines are running which tasks,
-and what splits are being processed by which tasks.
-
-Driver
-^^^^^^
-
-Tasks contain one or more parallel drivers. Drivers act upon data and
-combine operators to produce output that is then aggregated by a task
-and then delivered to another task in another stage. A driver is a
-sequence of operator instances, or you can think of a driver as a
-physical set of operators in memory. It is the lowest level of
-parallelism in the Trino architecture. A driver has one input and
-one output.
-
-Operator
-^^^^^^^^
-
-An operator consumes, transforms and produces data. For example, a table
-scan fetches data from a connector and produces data that can be consumed
-by other operators, and a filter operator consumes data and produces a
-subset by applying a predicate over the input data.
-
-Exchange
-^^^^^^^^
-
-Exchanges transfer data between Trino nodes for different stages of
-a query. Tasks produce data into an output buffer and consume data
-from other tasks using an exchange client.
diff --git a/docs/src/main/sphinx/overview/use-cases.md b/docs/src/main/sphinx/overview/use-cases.md
new file mode 100644
index 000000000000..9ab8422a5824
--- /dev/null
+++ b/docs/src/main/sphinx/overview/use-cases.md
@@ -0,0 +1,31 @@
+# Use cases
+
+This section puts Trino into perspective, so that prospective
+administrators and end users know what to expect from Trino.
+
+## What Trino is not
+
+Since Trino is being called a *database* by many members of the community,
+it makes sense to begin with a definition of what Trino is not.
+
+Do not mistake the fact that Trino understands SQL with it providing
+the features of a standard database. Trino is not a general-purpose
+relational database. It is not a replacement for databases like MySQL,
+PostgreSQL or Oracle. Trino was not designed to handle Online
+Transaction Processing (OLTP). This is also true for many other
+databases designed and optimized for data warehousing or analytics.
+
+## What Trino is
+
+Trino is a tool designed to efficiently query vast amounts of data
+using distributed queries. If you work with terabytes or petabytes of
+data, you are likely using tools that interact with Hadoop and HDFS.
+Trino was designed as an alternative to tools that query HDFS
+using pipelines of MapReduce jobs, such as Hive or Pig, but Trino
+is not limited to accessing HDFS. Trino can be and has been extended
+to operate over different kinds of data sources, including traditional
+relational databases and other data sources such as Cassandra.
+
+Trino was designed to handle data warehousing and analytics: data analysis,
+aggregating large amounts of data and producing reports. These workloads
+are often classified as Online Analytical Processing (OLAP).
diff --git a/docs/src/main/sphinx/overview/use-cases.rst b/docs/src/main/sphinx/overview/use-cases.rst
deleted file mode 100644
index 47cb4bf4818e..000000000000
--- a/docs/src/main/sphinx/overview/use-cases.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-=========
-Use cases
-=========
-
-This section puts Trino into perspective, so that prospective
-administrators and end users know what to expect from Trino.
-
------------------
-What Trino is not
------------------
-
-Since Trino is being called a *database* by many members of the community,
-it makes sense to begin with a definition of what Trino is not.
-
-Do not mistake the fact that Trino understands SQL with it providing
-the features of a standard database. Trino is not a general-purpose
-relational database. It is not a replacement for databases like MySQL,
-PostgreSQL or Oracle. Trino was not designed to handle Online
-Transaction Processing (OLTP). This is also true for many other
-databases designed and optimized for data warehousing or analytics.
-
--------------
-What Trino is
--------------
-
-Trino is a tool designed to efficiently query vast amounts of data
-using distributed queries. If you work with terabytes or petabytes of
-data, you are likely using tools that interact with Hadoop and HDFS.
-Trino was designed as an alternative to tools that query HDFS
-using pipelines of MapReduce jobs, such as Hive or Pig, but Trino
-is not limited to accessing HDFS. Trino can be and has been extended
-to operate over different kinds of data sources, including traditional
-relational databases and other data sources such as Cassandra.
-
-Trino was designed to handle data warehousing and analytics: data analysis,
-aggregating large amounts of data and producing reports. These workloads
-are often classified as Online Analytical Processing (OLAP).
diff --git a/docs/src/main/sphinx/redirects.txt b/docs/src/main/sphinx/redirects.txt
new file mode 100644
index 000000000000..615b54c8a6ec
--- /dev/null
+++ b/docs/src/main/sphinx/redirects.txt
@@ -0,0 +1 @@
+connector/memsql.rst connector/singlestore.rst
diff --git a/docs/src/main/sphinx/release.md b/docs/src/main/sphinx/release.md
new file mode 100644
index 000000000000..4359ce3f1425
--- /dev/null
+++ b/docs/src/main/sphinx/release.md
@@ -0,0 +1,358 @@
+# Release notes
+
+(releases-2023)=
+
+## 2023
+
+```{toctree}
+:maxdepth: 1
+
+release/release-431
+release/release-430
+release/release-429
+release/release-428
+release/release-427
+release/release-426
+release/release-425
+release/release-424
+release/release-423
+release/release-422
+release/release-421
+release/release-420
+release/release-419
+release/release-418
+release/release-417
+release/release-416
+release/release-415
+release/release-414
+release/release-413
+release/release-412
+release/release-411
+release/release-410
+release/release-409
+release/release-408
+release/release-407
+release/release-406
+```
+
+(releases-2022)=
+
+## 2022
+
+```{toctree}
+:maxdepth: 1
+
+release/release-405
+release/release-404
+release/release-403
+release/release-402
+release/release-401
+release/release-400
+release/release-399
+release/release-398
+release/release-397
+release/release-396
+release/release-395
+release/release-394
+release/release-393
+release/release-392
+release/release-391
+release/release-390
+release/release-389
+release/release-388
+release/release-387
+release/release-386
+release/release-385
+release/release-384
+release/release-383
+release/release-382
+release/release-381
+release/release-380
+release/release-379
+release/release-378
+release/release-377
+release/release-376
+release/release-375
+release/release-374
+release/release-373
+release/release-372
+release/release-371
+release/release-370
+release/release-369
+release/release-368
+```
+
+(releases-2021)=
+
+## 2021
+
+```{toctree}
+:maxdepth: 1
+
+release/release-367
+release/release-366
+release/release-365
+release/release-364
+release/release-363
+release/release-362
+release/release-361
+release/release-360
+release/release-359
+release/release-358
+release/release-357
+release/release-356
+release/release-355
+release/release-354
+release/release-353
+release/release-352
+release/release-351
+```
+
+(releases-2020)=
+
+## 2020
+
+```{toctree}
+:maxdepth: 1
+
+release/release-350
+release/release-349
+release/release-348
+release/release-347
+release/release-346
+release/release-345
+release/release-344
+release/release-343
+release/release-342
+release/release-341
+release/release-340
+release/release-339
+release/release-338
+release/release-337
+release/release-336
+release/release-335
+release/release-334
+release/release-333
+release/release-332
+release/release-331
+release/release-330
+release/release-329
+release/release-328
+```
+
+(releases-2019)=
+
+## 2019
+
+```{toctree}
+:maxdepth: 1
+
+release/release-327
+release/release-326
+release/release-325
+release/release-324
+release/release-323
+release/release-322
+release/release-321
+release/release-320
+release/release-319
+release/release-318
+release/release-317
+release/release-316
+release/release-315
+release/release-314
+release/release-313
+release/release-312
+release/release-311
+release/release-310
+release/release-309
+release/release-308
+release/release-307
+release/release-306
+release/release-305
+release/release-304
+release/release-303
+release/release-302
+release/release-301
+release/release-300
+```
+
+## Before 2019
+
+```{toctree}
+:maxdepth: 1
+
+release/release-0.215
+release/release-0.214
+release/release-0.213
+release/release-0.212
+release/release-0.211
+release/release-0.210
+release/release-0.209
+release/release-0.208
+release/release-0.207
+release/release-0.206
+release/release-0.205
+release/release-0.204
+release/release-0.203
+release/release-0.202
+release/release-0.201
+release/release-0.200
+release/release-0.199
+release/release-0.198
+release/release-0.197
+release/release-0.196
+release/release-0.195
+release/release-0.194
+release/release-0.193
+release/release-0.192
+release/release-0.191
+release/release-0.190
+release/release-0.189
+release/release-0.188
+release/release-0.187
+release/release-0.186
+release/release-0.185
+release/release-0.184
+release/release-0.183
+release/release-0.182
+release/release-0.181
+release/release-0.180
+release/release-0.179
+release/release-0.178
+release/release-0.177
+release/release-0.176
+release/release-0.175
+release/release-0.174
+release/release-0.173
+release/release-0.172
+release/release-0.171
+release/release-0.170
+release/release-0.169
+release/release-0.168
+release/release-0.167
+release/release-0.166
+release/release-0.165
+release/release-0.164
+release/release-0.163
+release/release-0.162
+release/release-0.161
+release/release-0.160
+release/release-0.159
+release/release-0.158
+release/release-0.157.1
+release/release-0.157
+release/release-0.156
+release/release-0.155
+release/release-0.154
+release/release-0.153
+release/release-0.152.3
+release/release-0.152.2
+release/release-0.152.1
+release/release-0.152
+release/release-0.151
+release/release-0.150
+release/release-0.149
+release/release-0.148
+release/release-0.147
+release/release-0.146
+release/release-0.145
+release/release-0.144.7
+release/release-0.144.6
+release/release-0.144.5
+release/release-0.144.4
+release/release-0.144.3
+release/release-0.144.2
+release/release-0.144.1
+release/release-0.144
+release/release-0.143
+release/release-0.142
+release/release-0.141
+release/release-0.140
+release/release-0.139
+release/release-0.138
+release/release-0.137
+release/release-0.136
+release/release-0.135
+release/release-0.134
+release/release-0.133
+release/release-0.132
+release/release-0.131
+release/release-0.130
+release/release-0.129
+release/release-0.128
+release/release-0.127
+release/release-0.126
+release/release-0.125
+release/release-0.124
+release/release-0.123
+release/release-0.122
+release/release-0.121
+release/release-0.120
+release/release-0.119
+release/release-0.118
+release/release-0.117
+release/release-0.116
+release/release-0.115
+release/release-0.114
+release/release-0.113
+release/release-0.112
+release/release-0.111
+release/release-0.110
+release/release-0.109
+release/release-0.108
+release/release-0.107
+release/release-0.106
+release/release-0.105
+release/release-0.104
+release/release-0.103
+release/release-0.102
+release/release-0.101
+release/release-0.100
+release/release-0.99
+release/release-0.98
+release/release-0.97
+release/release-0.96
+release/release-0.95
+release/release-0.94
+release/release-0.93
+release/release-0.92
+release/release-0.91
+release/release-0.90
+release/release-0.89
+release/release-0.88
+release/release-0.87
+release/release-0.86
+release/release-0.85
+release/release-0.84
+release/release-0.83
+release/release-0.82
+release/release-0.81
+release/release-0.80
+release/release-0.79
+release/release-0.78
+release/release-0.77
+release/release-0.76
+release/release-0.75
+release/release-0.74
+release/release-0.73
+release/release-0.72
+release/release-0.71
+release/release-0.70
+release/release-0.69
+release/release-0.68
+release/release-0.67
+release/release-0.66
+release/release-0.65
+release/release-0.64
+release/release-0.63
+release/release-0.62
+release/release-0.61
+release/release-0.60
+release/release-0.59
+release/release-0.58
+release/release-0.57
+release/release-0.56
+release/release-0.55
+release/release-0.54
+```
diff --git a/docs/src/main/sphinx/release.rst b/docs/src/main/sphinx/release.rst
deleted file mode 100644
index 39603cf53f61..000000000000
--- a/docs/src/main/sphinx/release.rst
+++ /dev/null
@@ -1,341 +0,0 @@
-*************
-Release notes
-*************
-
-.. _releases_2023:
-
-2023
-====
-
-.. toctree::
-    :maxdepth: 1
-
-    release/release-412
-    release/release-411
-    release/release-410
-    release/release-409
-    release/release-408
-    release/release-407
-    release/release-406
-
-.. _releases_2022:
-
-2022
-====
-
-.. toctree::
-    :maxdepth: 1
-
-    release/release-405
-    release/release-404
-    release/release-403
-    release/release-402
-    release/release-401
-    release/release-400
-    release/release-399
-    release/release-398
-    release/release-397
-    release/release-396
-    release/release-395
-    release/release-394
-    release/release-393
-    release/release-392
-    release/release-391
-    release/release-390
-    release/release-389
-    release/release-388
-    release/release-387
-    release/release-386
-    release/release-385
-    release/release-384
-    release/release-383
-    release/release-382
-    release/release-381
-    release/release-380
-    release/release-379
-    release/release-378
-    release/release-377
-    release/release-376
-    release/release-375
-    release/release-374
-    release/release-373
-    release/release-372
-    release/release-371
-    release/release-370
-    release/release-369
-    release/release-368
-
-.. _releases_2021:
-
-2021
-====
-
-.. toctree::
-    :maxdepth: 1
-
-    release/release-367
-    release/release-366
-    release/release-365
-    release/release-364
-    release/release-363
-    release/release-362
-    release/release-361
-    release/release-360
-    release/release-359
-    release/release-358
-    release/release-357
-    release/release-356
-    release/release-355
-    release/release-354
-    release/release-353
-    release/release-352
-    release/release-351
-
-.. _releases_2020:
-
-2020
-====
-
-.. toctree::
-    :maxdepth: 1
-
-    release/release-350
-    release/release-349
-    release/release-348
-    release/release-347
-    release/release-346
-    release/release-345
-    release/release-344
-    release/release-343
-    release/release-342
-    release/release-341
-    release/release-340
-    release/release-339
-    release/release-338
-    release/release-337
-    release/release-336
-    release/release-335
-    release/release-334
-    release/release-333
-    release/release-332
-    release/release-331
-    release/release-330
-    release/release-329
-    release/release-328
-
-.. _releases_2019:
-
-2019
-====
-
-.. toctree::
-    :maxdepth: 1
-
-    release/release-327
-    release/release-326
-    release/release-325
-    release/release-324
-    release/release-323
-    release/release-322
-    release/release-321
-    release/release-320
-    release/release-319
-    release/release-318
-    release/release-317
-    release/release-316
-    release/release-315
-    release/release-314
-    release/release-313
-    release/release-312
-    release/release-311
-    release/release-310
-    release/release-309
-    release/release-308
-    release/release-307
-    release/release-306
-    release/release-305
-    release/release-304
-    release/release-303
-    release/release-302
-    release/release-301
-    release/release-300
-
-Before 2019
-===========
-
-.. toctree::
-    :maxdepth: 1
-
-    release/release-0.215
-    release/release-0.214
-    release/release-0.213
-    release/release-0.212
-    release/release-0.211
-    release/release-0.210
-    release/release-0.209
-    release/release-0.208
-    release/release-0.207
-    release/release-0.206
-    release/release-0.205
-    release/release-0.204
-    release/release-0.203
-    release/release-0.202
-    release/release-0.201
-    release/release-0.200
-    release/release-0.199
-    release/release-0.198
-    release/release-0.197
-    release/release-0.196
-    release/release-0.195
-    release/release-0.194
-    release/release-0.193
-    release/release-0.192
-    release/release-0.191
-    release/release-0.190
-    release/release-0.189
-    release/release-0.188
-    release/release-0.187
-    release/release-0.186
-    release/release-0.185
-    release/release-0.184
-    release/release-0.183
-    release/release-0.182
-    release/release-0.181
-    release/release-0.180
-    release/release-0.179
-    release/release-0.178
-    release/release-0.177
-    release/release-0.176
-    release/release-0.175
-    release/release-0.174
-    release/release-0.173
-    release/release-0.172
-    release/release-0.171
-    release/release-0.170
-    release/release-0.169
-    release/release-0.168
-    release/release-0.167
-    release/release-0.166
-    release/release-0.165
-    release/release-0.164
-    release/release-0.163
-    release/release-0.162
-    release/release-0.161
-    release/release-0.160
-    release/release-0.159
-    release/release-0.158
-    release/release-0.157.1
-    release/release-0.157
-    release/release-0.156
-    release/release-0.155
-    release/release-0.154
-    release/release-0.153
-    release/release-0.152.3
-    release/release-0.152.2
-    release/release-0.152.1
-    release/release-0.152
-    release/release-0.151
-    release/release-0.150
-    release/release-0.149
-    release/release-0.148
-    release/release-0.147
-    release/release-0.146
-    release/release-0.145
-    release/release-0.144.7
-    release/release-0.144.6
-    release/release-0.144.5
-    release/release-0.144.4
-    release/release-0.144.3
-    release/release-0.144.2
-    release/release-0.144.1
-    release/release-0.144
-    release/release-0.143
-    release/release-0.142
-    release/release-0.141
-    release/release-0.140
-    release/release-0.139
-    release/release-0.138
-    release/release-0.137
-    release/release-0.136
-    release/release-0.135
-    release/release-0.134
-    release/release-0.133
-    release/release-0.132
-    release/release-0.131
-    release/release-0.130
-    release/release-0.129
-    release/release-0.128
-    release/release-0.127
-    release/release-0.126
-    release/release-0.125
-    release/release-0.124
-    release/release-0.123
-    release/release-0.122
-    release/release-0.121
-    release/release-0.120
-    release/release-0.119
-    release/release-0.118
-    release/release-0.117
-    release/release-0.116
-    release/release-0.115
-    release/release-0.114
-    release/release-0.113
-    release/release-0.112
-    release/release-0.111
-    release/release-0.110
-    release/release-0.109
-    release/release-0.108
-    release/release-0.107
-    release/release-0.106
-    release/release-0.105
-    release/release-0.104
-    release/release-0.103
-    release/release-0.102
-    release/release-0.101
-    release/release-0.100
-    release/release-0.99
-    release/release-0.98
-    release/release-0.97
-    release/release-0.96
-    release/release-0.95
-    release/release-0.94
-    release/release-0.93
-    release/release-0.92
-    release/release-0.91
-    release/release-0.90
-    release/release-0.89
-    release/release-0.88
-    release/release-0.87
-    release/release-0.86
-    release/release-0.85
-    release/release-0.84
-    release/release-0.83
-    release/release-0.82
-    release/release-0.81
-    release/release-0.80
-    release/release-0.79
-    release/release-0.78
-    release/release-0.77
-    release/release-0.76
-    release/release-0.75
-    release/release-0.74
-    release/release-0.73
-    release/release-0.72
-    release/release-0.71
-    release/release-0.70
-    release/release-0.69
-    release/release-0.68
-    release/release-0.67
-    release/release-0.66
-    release/release-0.65
-    release/release-0.64
-    release/release-0.63
-    release/release-0.62
-    release/release-0.61
-    release/release-0.60
-    release/release-0.59
-    release/release-0.58
-    release/release-0.57
-    release/release-0.56
-    release/release-0.55
-    release/release-0.54
diff --git a/docs/src/main/sphinx/release/release-0.100.md b/docs/src/main/sphinx/release/release-0.100.md
new file mode 100644
index 000000000000..5b1c478980af
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.100.md
@@ -0,0 +1,25 @@
+# Release 0.100
+
+## System connector
+
+The {doc}`/connector/system` now works like other connectors: global system
+tables are only available in the `system` catalog, rather than in a special
+schema that is available in every catalog. Additionally, connectors may now
+provide system tables that are available within that connector's catalog by
+implementing the `getSystemTables()` method on the `Connector` interface.
+
+## General
+
+- Fix `%f` specifier in {func}`date_format` and {func}`date_parse`.
+- Add `WITH ORDINALITY` support to `UNNEST`.
+- Add {func}`array_distinct` function.
+- Add {func}`split` function.
+- Add {func}`degrees` and {func}`radians` functions.
+- Add {func}`to_base` and {func}`from_base` functions.
+- Rename config property `task.shard.max-threads` to `task.max-worker-threads`.
+  This property sets the number of threads used to concurrently process splits.
+  The old property name is deprecated and will be removed in a future release.
+- Fix referencing `NULL` values in {ref}`row-type`.
+- Make {ref}`map-type` comparable.
+- Fix leak of tasks blocked during query teardown.
+- Improve query queue config validation.
diff --git a/docs/src/main/sphinx/release/release-0.100.rst b/docs/src/main/sphinx/release/release-0.100.rst
deleted file mode 100644
index d832c8298c0e..000000000000
--- a/docs/src/main/sphinx/release/release-0.100.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-=============
-Release 0.100
-=============
-
-System connector
-----------------
-
-The :doc:`/connector/system` now works like other connectors: global system
-tables are only available in the ``system`` catalog, rather than in a special
-schema that is available in every catalog. Additionally, connectors may now
-provide system tables that are available within that connector's catalog by
-implementing the ``getSystemTables()`` method on the ``Connector`` interface.
-
-General
--------
-
-* Fix ``%f`` specifier in :func:`date_format` and :func:`date_parse`.
-* Add ``WITH ORDINALITY`` support to ``UNNEST``.
-* Add :func:`array_distinct` function.
-* Add :func:`split` function.
-* Add :func:`degrees` and :func:`radians` functions.
-* Add :func:`to_base` and :func:`from_base` functions.
-* Rename config property ``task.shard.max-threads`` to ``task.max-worker-threads``.
-  This property sets the number of threads used to concurrently process splits.
-  The old property name is deprecated and will be removed in a future release.
-* Fix referencing ``NULL`` values in :ref:`row_type`.
-* Make :ref:`map_type` comparable.
-* Fix leak of tasks blocked during query teardown.
-* Improve query queue config validation.
diff --git a/docs/src/main/sphinx/release/release-0.101.md b/docs/src/main/sphinx/release/release-0.101.md
new file mode 100644
index 000000000000..d9d6c4c426a3
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.101.md
@@ -0,0 +1,75 @@
+# Release 0.101
+
+## General
+
+- Add support for {doc}`/sql/create-table` (in addition to {doc}`/sql/create-table-as`).
+- Add `IF EXISTS` support to {doc}`/sql/drop-table` and {doc}`/sql/drop-view`.
+- Add {func}`array_agg` function.
+- Add {func}`array_intersect` function.
+- Add {func}`array_position` function.
+- Add {func}`regexp_split` function.
+- Add support for `millisecond` to {func}`date_diff` and {func}`date_add`.
+- Fix excessive memory usage in {func}`map_agg`.
+- Fix excessive memory usage in queries that perform partitioned top-N operations
+  with {func}`row_number`.
+- Optimize {ref}`array-type` comparison operators.
+- Fix analysis of `UNION` queries for tables with hidden columns.
+- Fix `JOIN` associativity to be left-associative instead of right-associative.
+- Add `source` column to `runtime.queries` table in {doc}`/connector/system`.
+- Add `coordinator` column to `runtime.nodes` table in {doc}`/connector/system`.
+- Add `errorCode`, `errorName` and `errorType` to `error` object in REST API
+  (`errorCode` previously existed but was always zero).
+- Fix `DatabaseMetaData.getIdentifierQuoteString()` in JDBC driver.
+- Handle thread interruption in JDBC driver `ResultSet`.
+- Add `history` command and support for running previous commands via `!n` to the CLI.
+- Change Driver to make as much progress as possible before blocking.  This improves
+  responsiveness of some limit queries.
+- Add predicate push down support to JMX connector.
+- Add support for unary `PLUS` operator.
+- Improve scheduling speed by reducing lock contention.
+- Extend optimizer to understand physical properties such as local grouping and sorting.
+- Add support for streaming execution of window functions.
+- Make `UNION` run partitioned, if underlying plan is partitioned.
+- Add `hash_partition_count` session property to control hash partitions.
+
+## Web UI
+
+The main page of the web UI has been completely rewritten to use ReactJS. It also has
+a number of new features, such as the ability to pause auto-refresh via the "Z" key and
+also with a toggle in the UI.
+
+## Hive
+
+- Add support for connecting to S3 using EC2 instance credentials.
+  This feature is enabled by default. To disable it, set
+  `hive.s3.use-instance-credentials=false` in your Hive catalog properties file.
+- Treat ORC files as splittable.
+- Change PrestoS3FileSystem to use lazy seeks, which improves ORC performance.
+- Fix ORC `DOUBLE` statistic for columns containing `NaN`.
+- Lower the Hive metadata refresh interval from two minutes to one second.
+- Invalidate Hive metadata cache for failed operations.
+- Support `s3a` file system scheme.
+- Fix discovery of splits to correctly backoff when the queue is full.
+- Add support for non-canonical Parquet structs.
+- Add support for accessing Parquet columns by name. By default, columns in Parquet
+  files are accessed by their ordinal position in the Hive table definition. To access
+  columns based on the names recorded in the Parquet file, set
+  `hive.parquet.use-column-names=true` in your Hive catalog properties file.
+- Add JMX stats to PrestoS3FileSystem.
+- Add `hive.recursive-directories` config option to recursively scan
+  partition directories for data.
+
+## SPI
+
+- Add connector callback for rollback of `INSERT` and `CREATE TABLE AS`.
+- Introduce an abstraction for representing physical organizations of a table
+  and describing properties such as partitioning, grouping, predicate and columns.
+  `ConnectorPartition` and related interfaces are deprecated and will be removed
+  in a future version.
+- Rename `ConnectorColumnHandle` to `ColumnHandle`.
+
+:::{note}
+This is a backwards incompatible change with the previous connector SPI.
+If you have written a connector, you will need to update your code
+before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.101.rst b/docs/src/main/sphinx/release/release-0.101.rst
deleted file mode 100644
index 8d86f6ea5b91..000000000000
--- a/docs/src/main/sphinx/release/release-0.101.rst
+++ /dev/null
@@ -1,80 +0,0 @@
-=============
-Release 0.101
-=============
-
-General
--------
-
-* Add support for :doc:`/sql/create-table` (in addition to :doc:`/sql/create-table-as`).
-* Add ``IF EXISTS`` support to :doc:`/sql/drop-table` and :doc:`/sql/drop-view`.
-* Add :func:`array_agg` function.
-* Add :func:`array_intersect` function.
-* Add :func:`array_position` function.
-* Add :func:`regexp_split` function.
-* Add support for ``millisecond`` to :func:`date_diff` and :func:`date_add`.
-* Fix excessive memory usage in :func:`map_agg`.
-* Fix excessive memory usage in queries that perform partitioned top-N operations
-  with :func:`row_number`.
-* Optimize :ref:`array_type` comparison operators.
-* Fix analysis of ``UNION`` queries for tables with hidden columns.
-* Fix ``JOIN`` associativity to be left-associative instead of right-associative.
-* Add ``source`` column to ``runtime.queries`` table in :doc:`/connector/system`.
-* Add ``coordinator`` column to ``runtime.nodes`` table in :doc:`/connector/system`.
-* Add ``errorCode``, ``errorName`` and ``errorType`` to ``error`` object in REST API
-  (``errorCode`` previously existed but was always zero).
-* Fix ``DatabaseMetaData.getIdentifierQuoteString()`` in JDBC driver.
-* Handle thread interruption in JDBC driver ``ResultSet``.
-* Add ``history`` command and support for running previous commands via ``!n`` to the CLI.
-* Change Driver to make as much progress as possible before blocking.  This improves
-  responsiveness of some limit queries.
-* Add predicate push down support to JMX connector.
-* Add support for unary ``PLUS`` operator.
-* Improve scheduling speed by reducing lock contention.
-* Extend optimizer to understand physical properties such as local grouping and sorting.
-* Add support for streaming execution of window functions.
-* Make ``UNION`` run partitioned, if underlying plan is partitioned.
-* Add ``hash_partition_count`` session property to control hash partitions.
-
-Web UI
-------
-
-The main page of the web UI has been completely rewritten to use ReactJS. It also has
-a number of new features, such as the ability to pause auto-refresh via the "Z" key and
-also with a toggle in the UI.
-
-Hive
-----
-
-* Add support for connecting to S3 using EC2 instance credentials.
-  This feature is enabled by default. To disable it, set
-  ``hive.s3.use-instance-credentials=false`` in your Hive catalog properties file.
-* Treat ORC files as splittable.
-* Change PrestoS3FileSystem to use lazy seeks, which improves ORC performance.
-* Fix ORC ``DOUBLE`` statistic for columns containing ``NaN``.
-* Lower the Hive metadata refresh interval from two minutes to one second.
-* Invalidate Hive metadata cache for failed operations.
-* Support ``s3a`` file system scheme.
-* Fix discovery of splits to correctly backoff when the queue is full.
-* Add support for non-canonical Parquet structs.
-* Add support for accessing Parquet columns by name. By default, columns in Parquet
-  files are accessed by their ordinal position in the Hive table definition. To access
-  columns based on the names recorded in the Parquet file, set
-  ``hive.parquet.use-column-names=true`` in your Hive catalog properties file.
-* Add JMX stats to PrestoS3FileSystem.
-* Add ``hive.recursive-directories`` config option to recursively scan
-  partition directories for data.
-
-SPI
----
-
-* Add connector callback for rollback of ``INSERT`` and ``CREATE TABLE AS``.
-* Introduce an abstraction for representing physical organizations of a table
-  and describing properties such as partitioning, grouping, predicate and columns.
-  ``ConnectorPartition`` and related interfaces are deprecated and will be removed
-  in a future version.
-* Rename ``ConnectorColumnHandle`` to ``ColumnHandle``.
-
-.. note::
-    This is a backwards incompatible change with the previous connector SPI.
-    If you have written a connector, you will need to update your code
-    before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-0.102.md b/docs/src/main/sphinx/release/release-0.102.md
new file mode 100644
index 000000000000..edc4c3671420
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.102.md
@@ -0,0 +1,47 @@
+# Release 0.102
+
+## Unicode support
+
+All string functions have been updated to support Unicode. The functions assume
+that the string contains valid UTF-8 encoded code points. There are no explicit
+checks for valid UTF-8, and the functions may return incorrect results on
+invalid UTF-8.  Invalid UTF-8 data can be corrected with {func}`from_utf8`.
+
+Additionally, the functions operate on Unicode code points and not user visible
+*characters* (or *grapheme clusters*).  Some languages combine multiple code points
+into a single user-perceived *character*, the basic unit of a writing system for a
+language, but the functions will treat each code point as a separate unit.
+
+## Regular expression functions
+
+All {doc}`/functions/regexp` have been rewritten to improve performance.
+The new versions are often twice as fast and in some cases can be many
+orders of magnitude faster (due to removal of quadratic behavior).
+This change introduced some minor incompatibilities that are explained
+in the documentation for the functions.
+
+## General
+
+- Add support for partitioned right outer joins, which allows for larger tables to
+  be joined on the inner side.
+- Add support for full outer joins.
+- Support returning booleans as numbers in JDBC driver
+- Fix {func}`contains` to return `NULL` if the value was not found, but a `NULL` was.
+- Fix nested {ref}`row-type` rendering in `DESCRIBE`.
+- Add {func}`array_join`.
+- Optimize map subscript operator.
+- Add {func}`from_utf8` and {func}`to_utf8` functions.
+- Add `task_writer_count` session property to set `task.writer-count`.
+- Add cast from `ARRAY(F)` to `ARRAY(T)`.
+- Extend implicit coercions to `ARRAY` element types.
+- Implement implicit coercions in `VALUES` expressions.
+- Fix potential deadlock in scheduler.
+
+## Hive
+
+- Collect more metrics from `PrestoS3FileSystem`.
+- Retry when seeking in `PrestoS3FileSystem`.
+- Ignore `InvalidRange` error in `PrestoS3FileSystem`.
+- Implement rename and delete in `PrestoS3FileSystem`.
+- Fix assertion failure when running `SHOW TABLES FROM schema`.
+- Fix S3 socket leak when reading ORC files.
diff --git a/docs/src/main/sphinx/release/release-0.102.rst b/docs/src/main/sphinx/release/release-0.102.rst
deleted file mode 100644
index b0dfd48a4aa2..000000000000
--- a/docs/src/main/sphinx/release/release-0.102.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-=============
-Release 0.102
-=============
-
-Unicode support
----------------
-
-All string functions have been updated to support Unicode. The functions assume
-that the string contains valid UTF-8 encoded code points. There are no explicit
-checks for valid UTF-8, and the functions may return incorrect results on
-invalid UTF-8.  Invalid UTF-8 data can be corrected with :func:`from_utf8`.
-
-Additionally, the functions operate on Unicode code points and not user visible
-*characters* (or *grapheme clusters*).  Some languages combine multiple code points
-into a single user-perceived *character*, the basic unit of a writing system for a
-language, but the functions will treat each code point as a separate unit.
-
-Regular expression functions
-----------------------------
-
-All :doc:`/functions/regexp` have been rewritten to improve performance.
-The new versions are often twice as fast and in some cases can be many
-orders of magnitude faster (due to removal of quadratic behavior).
-This change introduced some minor incompatibilities that are explained
-in the documentation for the functions.
-
-General
--------
-
-* Add support for partitioned right outer joins, which allows for larger tables to
-  be joined on the inner side.
-* Add support for full outer joins.
-* Support returning booleans as numbers in JDBC driver
-* Fix :func:`contains` to return ``NULL`` if the value was not found, but a ``NULL`` was.
-* Fix nested :ref:`row_type` rendering in ``DESCRIBE``.
-* Add :func:`array_join`.
-* Optimize map subscript operator.
-* Add :func:`from_utf8` and :func:`to_utf8` functions.
-* Add ``task_writer_count`` session property to set ``task.writer-count``.
-* Add cast from ``ARRAY(F)`` to ``ARRAY(T)``.
-* Extend implicit coercions to ``ARRAY`` element types.
-* Implement implicit coercions in ``VALUES`` expressions.
-* Fix potential deadlock in scheduler.
-
-Hive
-----
-
-* Collect more metrics from ``PrestoS3FileSystem``.
-* Retry when seeking in ``PrestoS3FileSystem``.
-* Ignore ``InvalidRange`` error in ``PrestoS3FileSystem``.
-* Implement rename and delete in ``PrestoS3FileSystem``.
-* Fix assertion failure when running ``SHOW TABLES FROM schema``.
-* Fix S3 socket leak when reading ORC files.
diff --git a/docs/src/main/sphinx/release/release-0.103.md b/docs/src/main/sphinx/release/release-0.103.md
new file mode 100644
index 000000000000..2fd5589d2933
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.103.md
@@ -0,0 +1,50 @@
+# Release 0.103
+
+## Cluster resource management
+
+There is a new cluster resource manager, which can be enabled via the
+`experimental.cluster-memory-manager-enabled` flag. Currently, the only
+resource that's tracked is memory, and the cluster resource manager guarantees
+that the cluster will not deadlock waiting for memory. However, in a low memory
+situation it is possible that only one query will make progress. Memory limits can
+now be configured via `query.max-memory` which controls the total distributed
+memory a query may use and `query.max-memory-per-node` which limits the amount
+of memory a query may use on any one node. On each worker, the
+`resources.reserved-system-memory` flags controls how much memory is reserved
+for internal Presto data structures and temporary allocations.
+
+## Task parallelism
+
+Queries involving a large number of aggregations or a large hash table for a
+join can be slow due to single threaded execution in the intermediate stages.
+This release adds experimental configuration and session properties to execute
+this single threaded work in parallel.  Depending on the exact query this may
+reduce wall time, but will likely increase CPU usage.
+
+Use the configuration parameter `task.default-concurrency` or the session
+property `task_default_concurrency` to set the default number of parallel
+workers to use for join probes, hash builds and final aggregations.
+Additionally, the session properties `task_join_concurrency`,
+`task_hash_build_concurrency` and `task_aggregation_concurrency` can be
+used to control the parallelism for each type of work.
+
+This is an experimental feature and will likely change in a future release.  It
+is also expected that this will eventually be handled automatically by the
+query planner and these options will be removed entirely.
+
+## Hive
+
+- Removed the `hive.max-split-iterator-threads` parameter and renamed
+  `hive.max-global-split-iterator-threads` to `hive.max-split-iterator-threads`.
+- Fix excessive object creation when querying tables with a large number of partitions.
+- Do not retry requests when an S3 path is not found.
+
+## General
+
+- Add {func}`array_remove`.
+- Fix NPE in {func}`max_by` and {func}`min_by` caused when few rows were present in the aggregation.
+- Reduce memory usage of {func}`map_agg`.
+- Change HTTP client defaults: 2 second idle timeout, 10 second request
+  timeout and 250 connections per host.
+- Add SQL command autocompletion to CLI.
+- Increase CLI history file size.
diff --git a/docs/src/main/sphinx/release/release-0.103.rst b/docs/src/main/sphinx/release/release-0.103.rst
deleted file mode 100644
index 857eedd406b2..000000000000
--- a/docs/src/main/sphinx/release/release-0.103.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-=============
-Release 0.103
-=============
-
-Cluster resource management
----------------------------
-
-There is a new cluster resource manager, which can be enabled via the
-``experimental.cluster-memory-manager-enabled`` flag. Currently, the only
-resource that's tracked is memory, and the cluster resource manager guarantees
-that the cluster will not deadlock waiting for memory. However, in a low memory
-situation it is possible that only one query will make progress. Memory limits can
-now be configured via ``query.max-memory`` which controls the total distributed
-memory a query may use and ``query.max-memory-per-node`` which limits the amount
-of memory a query may use on any one node. On each worker, the
-``resources.reserved-system-memory`` flags controls how much memory is reserved
-for internal Presto data structures and temporary allocations.
-
-Task parallelism
-----------------
-Queries involving a large number of aggregations or a large hash table for a
-join can be slow due to single threaded execution in the intermediate stages.
-This release adds experimental configuration and session properties to execute
-this single threaded work in parallel.  Depending on the exact query this may
-reduce wall time, but will likely increase CPU usage.
-
-Use the configuration parameter ``task.default-concurrency`` or the session
-property ``task_default_concurrency`` to set the default number of parallel
-workers to use for join probes, hash builds and final aggregations.
-Additionally, the session properties ``task_join_concurrency``,
-``task_hash_build_concurrency`` and ``task_aggregation_concurrency`` can be
-used to control the parallelism for each type of work.
-
-This is an experimental feature and will likely change in a future release.  It
-is also expected that this will eventually be handled automatically by the
-query planner and these options will be removed entirely.
-
-Hive
-----
-
-* Removed the ``hive.max-split-iterator-threads`` parameter and renamed
-  ``hive.max-global-split-iterator-threads`` to ``hive.max-split-iterator-threads``.
-* Fix excessive object creation when querying tables with a large number of partitions.
-* Do not retry requests when an S3 path is not found.
-
-General
--------
-
-* Add :func:`array_remove`.
-* Fix NPE in :func:`max_by` and :func:`min_by` caused when few rows were present in the aggregation.
-* Reduce memory usage of :func:`map_agg`.
-* Change HTTP client defaults: 2 second idle timeout, 10 second request
-  timeout and 250 connections per host.
-* Add SQL command autocompletion to CLI.
-* Increase CLI history file size.
diff --git a/docs/src/main/sphinx/release/release-0.104.md b/docs/src/main/sphinx/release/release-0.104.md
new file mode 100644
index 000000000000..0435127751c4
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.104.md
@@ -0,0 +1,26 @@
+# Release 0.104
+
+## General
+
+- Handle thread interruption in StatementClient.
+- Fix CLI hang when server becomes unreachable during a query.
+- Add {func}`covar_pop`, {func}`covar_samp`, {func}`corr`, {func}`regr_slope`,
+  and {func}`regr_intercept` functions.
+- Fix potential deadlock in cluster memory manager.
+- Add a visualization of query execution timeline.
+- Allow mixed case in input to {func}`from_hex`.
+- Display "BLOCKED" state in web UI.
+- Reduce CPU usage in coordinator.
+- Fix excess object retention in workers due to long running queries.
+- Reduce memory usage of {func}`array_distinct`.
+- Add optimizer for projection push down which can
+  improve the performance of certain query shapes.
+- Improve query performance by storing pre-partitioned pages.
+- Support `TIMESTAMP` for {func}`first_value`, {func}`last_value`,
+  {func}`nth_value`, {func}`lead` and {func}`lag`.
+
+## Hive
+
+- Upgrade to Parquet 1.6.0.
+- Collect request time and retry statistics in `PrestoS3FileSystem`.
+- Fix retry attempt counting for S3.
diff --git a/docs/src/main/sphinx/release/release-0.104.rst b/docs/src/main/sphinx/release/release-0.104.rst
deleted file mode 100644
index 33a13c54debc..000000000000
--- a/docs/src/main/sphinx/release/release-0.104.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-=============
-Release 0.104
-=============
-
-General
--------
-
-* Handle thread interruption in StatementClient.
-* Fix CLI hang when server becomes unreachable during a query.
-* Add :func:`covar_pop`, :func:`covar_samp`, :func:`corr`, :func:`regr_slope`,
-  and :func:`regr_intercept` functions.
-* Fix potential deadlock in cluster memory manager.
-* Add a visualization of query execution timeline.
-* Allow mixed case in input to :func:`from_hex`.
-* Display "BLOCKED" state in web UI.
-* Reduce CPU usage in coordinator.
-* Fix excess object retention in workers due to long running queries.
-* Reduce memory usage of :func:`array_distinct`.
-* Add optimizer for projection push down which can
-  improve the performance of certain query shapes.
-* Improve query performance by storing pre-partitioned pages.
-* Support ``TIMESTAMP`` for :func:`first_value`, :func:`last_value`,
-  :func:`nth_value`, :func:`lead` and :func:`lag`.
-
-Hive
-----
-
-* Upgrade to Parquet 1.6.0.
-* Collect request time and retry statistics in ``PrestoS3FileSystem``.
-* Fix retry attempt counting for S3.
diff --git a/docs/src/main/sphinx/release/release-0.105.md b/docs/src/main/sphinx/release/release-0.105.md
new file mode 100644
index 000000000000..732ed96e6076
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.105.md
@@ -0,0 +1,18 @@
+# Release 0.105
+
+## General
+
+- Fix issue which can cause queries to be blocked permanently.
+- Close connections correctly in JDBC connectors.
+- Add implicit coercions for values of equi-join criteria.
+- Fix detection of window function calls without an `OVER` clause.
+
+## SPI
+
+- Remove `ordinalPosition` from `ColumnMetadata`.
+
+:::{note}
+This is a backwards incompatible change with the previous connector SPI.
+If you have written a connector, you will need to update your code
+before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.105.rst b/docs/src/main/sphinx/release/release-0.105.rst
deleted file mode 100644
index b470462f8824..000000000000
--- a/docs/src/main/sphinx/release/release-0.105.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-=============
-Release 0.105
-=============
-
-General
--------
-
-* Fix issue which can cause queries to be blocked permanently.
-* Close connections correctly in JDBC connectors.
-* Add implicit coercions for values of equi-join criteria.
-* Fix detection of window function calls without an ``OVER`` clause.
-
-SPI
----
-
-* Remove ``ordinalPosition`` from ``ColumnMetadata``.
-
-.. note::
-    This is a backwards incompatible change with the previous connector SPI.
-    If you have written a connector, you will need to update your code
-    before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-0.106.md b/docs/src/main/sphinx/release/release-0.106.md
new file mode 100644
index 000000000000..212bc0b9c4b7
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.106.md
@@ -0,0 +1,12 @@
+# Release 0.106
+
+## General
+
+- Parallelize startup of table scan task splits.
+- Fixed index join driver resource leak.
+- Improve memory accounting for JOINs and GROUP BYs.
+- Improve CPU efficiency of coordinator.
+- Added `Asia/Chita`, `Asia/Srednekolymsk`, and `Pacific/Bougainville` time zones.
+- Fix task leak caused by race condition in stage state machine.
+- Fix blocking in Hive split source.
+- Free resources sooner for queries that finish prematurely.
diff --git a/docs/src/main/sphinx/release/release-0.106.rst b/docs/src/main/sphinx/release/release-0.106.rst
deleted file mode 100644
index 32b45b563193..000000000000
--- a/docs/src/main/sphinx/release/release-0.106.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-=============
-Release 0.106
-=============
-
-General
--------
-
-* Parallelize startup of table scan task splits.
-* Fixed index join driver resource leak.
-* Improve memory accounting for JOINs and GROUP BYs.
-* Improve CPU efficiency of coordinator.
-* Added ``Asia/Chita``, ``Asia/Srednekolymsk``, and ``Pacific/Bougainville`` time zones.
-* Fix task leak caused by race condition in stage state machine.
-* Fix blocking in Hive split source.
-* Free resources sooner for queries that finish prematurely.
diff --git a/docs/src/main/sphinx/release/release-0.107.md b/docs/src/main/sphinx/release/release-0.107.md
new file mode 100644
index 000000000000..a10dfaeae03b
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.107.md
@@ -0,0 +1,13 @@
+# Release 0.107
+
+## General
+
+- Added `query_max_memory` session property. Note: this session property cannot
+  increase the limit above the limit set by the `query.max-memory` configuration option.
+- Fixed task leak caused by queries that finish early, such as a `LIMIT` query
+  or cancelled query, when the cluster is under high load.
+- Added `task.info-refresh-max-wait` to configure task info freshness.
+- Add support for `DELETE` to language and connector SPI.
+- Reenable error classification code for syntax errors.
+- Fix out of bounds exception in {func}`lower` and {func}`upper`
+  when the string contains the code point `U+10FFFF`.
diff --git a/docs/src/main/sphinx/release/release-0.107.rst b/docs/src/main/sphinx/release/release-0.107.rst
deleted file mode 100644
index ebb1bea88b96..000000000000
--- a/docs/src/main/sphinx/release/release-0.107.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-=============
-Release 0.107
-=============
-
-General
--------
-
-* Added ``query_max_memory`` session property. Note: this session property cannot
-  increase the limit above the limit set by the ``query.max-memory`` configuration option.
-* Fixed task leak caused by queries that finish early, such as a ``LIMIT`` query
-  or cancelled query, when the cluster is under high load.
-* Added ``task.info-refresh-max-wait`` to configure task info freshness.
-* Add support for ``DELETE`` to language and connector SPI.
-* Reenable error classification code for syntax errors.
-* Fix out of bounds exception in :func:`lower` and :func:`upper`
-  when the string contains the code point ``U+10FFFF``.
diff --git a/docs/src/main/sphinx/release/release-0.108.md b/docs/src/main/sphinx/release/release-0.108.md
new file mode 100644
index 000000000000..fecf2a03e5bb
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.108.md
@@ -0,0 +1,34 @@
+# Release 0.108
+
+## General
+
+- Fix incorrect query results when a window function follows a {func}`row_number`
+  function and both are partitioned on the same column(s).
+- Fix planning issue where queries that apply a `false` predicate
+  to the result of a non-grouped aggregation produce incorrect results.
+- Fix exception when `ORDER BY` clause contains duplicate columns.
+- Fix issue where a query (read or write) that should fail can instead
+  complete successfully with zero rows.
+- Add {func}`normalize`, {func}`from_iso8601_timestamp`, {func}`from_iso8601_date`
+  and {func}`to_iso8601` functions.
+- Add support for {func}`position` syntax.
+- Add Teradata compatibility functions: {func}`index`, {func}`char2hexint`,
+  {func}`to_char`, {func}`to_date` and {func}`to_timestamp`.
+- Make `ctrl-C` in CLI cancel the query (rather than a partial cancel).
+- Allow calling `Connection.setReadOnly(false)` in the JDBC driver.
+  The read-only status for the connection is currently ignored.
+- Add missing `CAST` from `VARCHAR` to `TIMESTAMP WITH TIME ZONE`.
+- Allow optional time zone in `CAST` from `VARCHAR` to `TIMESTAMP` and
+  `TIMESTAMP WITH TIME ZONE`.
+- Trim values when converting from `VARCHAR` to date/time types.
+- Add support for fixed time zones `+00:00` and `-00:00`.
+- Properly account for query memory when using the {func}`row_number` function.
+- Skip execution of inner join when the join target is empty.
+- Improve query detail UI page.
+- Fix printing of table layouts in {doc}`/sql/explain`.
+- Add {doc}`/connector/blackhole`.
+
+## Cassandra
+
+- Randomly select Cassandra node for split generation.
+- Fix handling of `UUID` partition keys.
diff --git a/docs/src/main/sphinx/release/release-0.108.rst b/docs/src/main/sphinx/release/release-0.108.rst
deleted file mode 100644
index 4143d381428a..000000000000
--- a/docs/src/main/sphinx/release/release-0.108.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-=============
-Release 0.108
-=============
-
-General
--------
-
-* Fix incorrect query results when a window function follows a :func:`row_number`
-  function and both are partitioned on the same column(s).
-* Fix planning issue where queries that apply a ``false`` predicate
-  to the result of a non-grouped aggregation produce incorrect results.
-* Fix exception when ``ORDER BY`` clause contains duplicate columns.
-* Fix issue where a query (read or write) that should fail can instead
-  complete successfully with zero rows.
-* Add :func:`normalize`, :func:`from_iso8601_timestamp`, :func:`from_iso8601_date`
-  and :func:`to_iso8601` functions.
-* Add support for :func:`position` syntax.
-* Add Teradata compatibility functions: :func:`index`, :func:`char2hexint`,
-  :func:`to_char`, :func:`to_date` and :func:`to_timestamp`.
-* Make ``ctrl-C`` in CLI cancel the query (rather than a partial cancel).
-* Allow calling ``Connection.setReadOnly(false)`` in the JDBC driver.
-  The read-only status for the connection is currently ignored.
-* Add missing ``CAST`` from ``VARCHAR`` to ``TIMESTAMP WITH TIME ZONE``.
-* Allow optional time zone in ``CAST`` from ``VARCHAR`` to ``TIMESTAMP`` and
-  ``TIMESTAMP WITH TIME ZONE``.
-* Trim values when converting from ``VARCHAR`` to date/time types.
-* Add support for fixed time zones ``+00:00`` and ``-00:00``.
-* Properly account for query memory when using the :func:`row_number` function.
-* Skip execution of inner join when the join target is empty.
-* Improve query detail UI page.
-* Fix printing of table layouts in :doc:`/sql/explain`.
-* Add :doc:`/connector/blackhole`.
-
-Cassandra
----------
-
-* Randomly select Cassandra node for split generation.
-* Fix handling of ``UUID`` partition keys.
diff --git a/docs/src/main/sphinx/release/release-0.109.md b/docs/src/main/sphinx/release/release-0.109.md
new file mode 100644
index 000000000000..80cb6abd6f31
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.109.md
@@ -0,0 +1,23 @@
+# Release 0.109
+
+## General
+
+- Add {func}`slice`, {func}`md5`, {func}`array_min` and {func}`array_max` functions.
+- Fix bug that could cause queries submitted soon after startup to hang forever.
+- Fix bug that could cause `JOIN` queries to hang forever, if the right side of
+  the `JOIN` had too little data or skewed data.
+- Improve index join planning heuristics to favor streaming execution.
+- Improve validation of date/time literals.
+- Produce RPM package for Presto server.
+- Always redistribute data when writing tables to avoid skew. This can
+  be disabled by setting the session property `redistribute_writes`
+  or the config property `redistribute-writes` to false.
+
+## Remove "Big Query" support
+
+The experimental support for big queries has been removed in favor of
+the new resource manager which can be enabled via the
+`experimental.cluster-memory-manager-enabled` config option.
+The `experimental_big_query` session property and the following config
+options are no longer supported: `experimental.big-query-initial-hash-partitions`,
+`experimental.max-concurrent-big-queries` and `experimental.max-queued-big-queries`.
diff --git a/docs/src/main/sphinx/release/release-0.109.rst b/docs/src/main/sphinx/release/release-0.109.rst
deleted file mode 100644
index 46dc3b6d603c..000000000000
--- a/docs/src/main/sphinx/release/release-0.109.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-=============
-Release 0.109
-=============
-
-General
--------
-
-* Add :func:`slice`, :func:`md5`, :func:`array_min` and :func:`array_max` functions.
-* Fix bug that could cause queries submitted soon after startup to hang forever.
-* Fix bug that could cause ``JOIN`` queries to hang forever, if the right side of
-  the ``JOIN`` had too little data or skewed data.
-* Improve index join planning heuristics to favor streaming execution.
-* Improve validation of date/time literals.
-* Produce RPM package for Presto server.
-* Always redistribute data when writing tables to avoid skew. This can
-  be disabled by setting the session property ``redistribute_writes``
-  or the config property ``redistribute-writes`` to false.
-
-Remove "Big Query" support
---------------------------
-The experimental support for big queries has been removed in favor of
-the new resource manager which can be enabled via the
-``experimental.cluster-memory-manager-enabled`` config option.
-The ``experimental_big_query`` session property and the following config
-options are no longer supported: ``experimental.big-query-initial-hash-partitions``,
-``experimental.max-concurrent-big-queries`` and ``experimental.max-queued-big-queries``.
diff --git a/docs/src/main/sphinx/release/release-0.110.md b/docs/src/main/sphinx/release/release-0.110.md
new file mode 100644
index 000000000000..0d6fecabbaa7
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.110.md
@@ -0,0 +1,14 @@
+# Release 0.110
+
+## General
+
+- Fix result truncation bug in window function {func}`row_number` when performing a
+  partitioned top-N that chooses the maximum or minimum `N` rows. For example:
+
+  ```
+  SELECT * FROM (
+      SELECT row_number() OVER (PARTITION BY orderstatus ORDER BY orderdate) AS rn,
+          custkey, orderdate, orderstatus
+      FROM orders
+  ) WHERE rn <= 5;
+  ```
diff --git a/docs/src/main/sphinx/release/release-0.110.rst b/docs/src/main/sphinx/release/release-0.110.rst
deleted file mode 100644
index ce22ae605922..000000000000
--- a/docs/src/main/sphinx/release/release-0.110.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-=============
-Release 0.110
-=============
-
-General
--------
-
-* Fix result truncation bug in window function :func:`row_number` when performing a
-  partitioned top-N that chooses the maximum or minimum ``N`` rows. For example::
-
-    SELECT * FROM (
-        SELECT row_number() OVER (PARTITION BY orderstatus ORDER BY orderdate) AS rn,
-            custkey, orderdate, orderstatus
-        FROM orders
-    ) WHERE rn <= 5;
-
diff --git a/docs/src/main/sphinx/release/release-0.111.md b/docs/src/main/sphinx/release/release-0.111.md
new file mode 100644
index 000000000000..b0efb38bd5d4
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.111.md
@@ -0,0 +1,11 @@
+# Release 0.111
+
+## General
+
+- Add {func}`histogram` function.
+- Optimize `CASE` expressions on a constant.
+- Add basic support for `IF NOT EXISTS` for `CREATE TABLE`.
+- Semi-joins are hash-partitioned if `distributed_join` is turned on.
+- Add support for partial cast from JSON. For example, `json` can be cast to `array(json)`, `map(varchar, json)`, etc.
+- Add implicit coercions for `UNION`.
+- Expose query stats in the JDBC driver `ResultSet`.
diff --git a/docs/src/main/sphinx/release/release-0.111.rst b/docs/src/main/sphinx/release/release-0.111.rst
deleted file mode 100644
index b30058351251..000000000000
--- a/docs/src/main/sphinx/release/release-0.111.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-=============
-Release 0.111
-=============
-
-General
--------
-
-* Add :func:`histogram` function.
-* Optimize ``CASE`` expressions on a constant.
-* Add basic support for ``IF NOT EXISTS`` for ``CREATE TABLE``.
-* Semi-joins are hash-partitioned if ``distributed_join`` is turned on.
-* Add support for partial cast from JSON. For example, ``json`` can be cast to ``array(json)``, ``map(varchar, json)``, etc.
-* Add implicit coercions for ``UNION``.
-* Expose query stats in the JDBC driver ``ResultSet``.
diff --git a/docs/src/main/sphinx/release/release-0.112.md b/docs/src/main/sphinx/release/release-0.112.md
new file mode 100644
index 000000000000..bd3f5ce00e2a
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.112.md
@@ -0,0 +1,17 @@
+# Release 0.112
+
+## General
+
+- Fix incorrect handling of filters and limits in {func}`row_number` optimizer.
+  This caused certain query shapes to produce incorrect results.
+- Fix non-string object arrays in JMX connector.
+
+## Hive
+
+- Tables created using {doc}`/sql/create-table` (not {doc}`/sql/create-table-as`)
+  had invalid metadata and were not readable.
+- Improve performance of `IN` and `OR` clauses when reading `ORC` data.
+  Previously, the ranges for a column were always compacted into a single range
+  before being passed to the reader, preventing the reader from taking full
+  advantage of row skipping. The compaction only happens now if the number of
+  ranges exceeds the `hive.domain-compaction-threshold` config property.
diff --git a/docs/src/main/sphinx/release/release-0.112.rst b/docs/src/main/sphinx/release/release-0.112.rst
deleted file mode 100644
index f9478bb93d09..000000000000
--- a/docs/src/main/sphinx/release/release-0.112.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-=============
-Release 0.112
-=============
-
-General
--------
-
-* Fix incorrect handling of filters and limits in :func:`row_number` optimizer.
-  This caused certain query shapes to produce incorrect results.
-* Fix non-string object arrays in JMX connector.
-
-Hive
-----
-
-* Tables created using :doc:`/sql/create-table` (not :doc:`/sql/create-table-as`)
-  had invalid metadata and were not readable.
-* Improve performance of ``IN`` and ``OR`` clauses when reading ``ORC`` data.
-  Previously, the ranges for a column were always compacted into a single range
-  before being passed to the reader, preventing the reader from taking full
-  advantage of row skipping. The compaction only happens now if the number of
-  ranges exceeds the ``hive.domain-compaction-threshold`` config property.
diff --git a/docs/src/main/sphinx/release/release-0.113.md b/docs/src/main/sphinx/release/release-0.113.md
new file mode 100644
index 000000000000..8905cccb56f4
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.113.md
@@ -0,0 +1,64 @@
+# Release 0.113
+
+:::{warning}
+The ORC reader in the Hive connector is broken in this release.
+:::
+
+## Cluster resource management
+
+The cluster resource manager announced in {doc}`/release/release-0.103` is now enabled by default.
+You can disable it with the `experimental.cluster-memory-manager-enabled` flag.
+Memory limits can now be configured via `query.max-memory` which controls the total distributed
+memory a query may use and `query.max-memory-per-node` which limits the amount
+of memory a query may use on any one node. On each worker, the
+`resources.reserved-system-memory` config property controls how much memory is reserved
+for internal Presto data structures and temporary allocations.
+
+## Session properties
+
+All session properties have a type, default value, and description.
+The value for {doc}`/sql/set-session` can now be any constant expression, and
+the {doc}`/sql/show-session` command prints the current effective value and
+default value for all session properties.
+
+This type safety extends to the {doc}`SPI </develop/spi-overview>` where properties
+can be validated and converted to any Java type using
+`SessionPropertyMetadata`. For an example, see `HiveSessionProperties`.
+
+:::{note}
+This is a backwards incompatible change with the previous connector SPI.
+If you have written a connector that uses session properties, you will need
+to update your code to declare the properties in the `Connector`
+implementation and callers of `ConnectorSession.getProperty()` will now
+need the expected Java type of the property.
+:::
+
+## General
+
+- Allow using any type with value window functions {func}`first_value`,
+  {func}`last_value`, {func}`nth_value`, {func}`lead` and {func}`lag`.
+- Add {func}`element_at` function.
+- Add {func}`url_encode` and {func}`url_decode` functions.
+- {func}`concat` now allows arbitrary number of arguments.
+- Fix JMX connector. In the previous release it always returned zero rows.
+- Fix handling of literal `NULL` in `IS DISTINCT FROM`.
+- Fix an issue that caused some specific queries to fail in planning.
+
+## Hive
+
+- Fix the Hive metadata cache to properly handle negative responses.
+  This makes the background refresh work properly by clearing the cached
+  metadata entries when an object is dropped outside of Presto.
+  In particular, this fixes the common case where a table is dropped using
+  Hive but Presto thinks it still exists.
+- Fix metastore socket leak when SOCKS connect fails.
+
+## SPI
+
+- Changed the internal representation of structural types.
+
+:::{note}
+This is a backwards incompatible change with the previous connector SPI.
+If you have written a connector that uses structural types, you will need
+to update your code to the new APIs.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.113.rst b/docs/src/main/sphinx/release/release-0.113.rst
deleted file mode 100644
index 8cbdc0162e0f..000000000000
--- a/docs/src/main/sphinx/release/release-0.113.rst
+++ /dev/null
@@ -1,69 +0,0 @@
-=============
-Release 0.113
-=============
-
-.. warning::
-
-    The ORC reader in the Hive connector is broken in this release.
-
-Cluster resource management
----------------------------
-
-The cluster resource manager announced in :doc:`/release/release-0.103` is now enabled by default.
-You can disable it with the ``experimental.cluster-memory-manager-enabled`` flag.
-Memory limits can now be configured via ``query.max-memory`` which controls the total distributed
-memory a query may use and ``query.max-memory-per-node`` which limits the amount
-of memory a query may use on any one node. On each worker, the
-``resources.reserved-system-memory`` config property controls how much memory is reserved
-for internal Presto data structures and temporary allocations.
-
-Session properties
-------------------
-
-All session properties have a type, default value, and description.
-The value for :doc:`/sql/set-session` can now be any constant expression, and
-the :doc:`/sql/show-session` command prints the current effective value and
-default value for all session properties.
-
-This type safety extends to the :doc:`SPI </develop/spi-overview>` where properties
-can be validated and converted to any Java type using
-``SessionPropertyMetadata``. For an example, see ``HiveSessionProperties``.
-
-.. note::
-    This is a backwards incompatible change with the previous connector SPI.
-    If you have written a connector that uses session properties, you will need
-    to update your code to declare the properties in the ``Connector``
-    implementation and callers of ``ConnectorSession.getProperty()`` will now
-    need the expected Java type of the property.
-
-General
--------
-
-* Allow using any type with value window functions :func:`first_value`,
-  :func:`last_value`, :func:`nth_value`, :func:`lead` and :func:`lag`.
-* Add :func:`element_at` function.
-* Add :func:`url_encode` and :func:`url_decode` functions.
-* :func:`concat` now allows arbitrary number of arguments.
-* Fix JMX connector. In the previous release it always returned zero rows.
-* Fix handling of literal ``NULL`` in ``IS DISTINCT FROM``.
-* Fix an issue that caused some specific queries to fail in planning.
-
-Hive
-----
-
-* Fix the Hive metadata cache to properly handle negative responses.
-  This makes the background refresh work properly by clearing the cached
-  metadata entries when an object is dropped outside of Presto.
-  In particular, this fixes the common case where a table is dropped using
-  Hive but Presto thinks it still exists.
-* Fix metastore socket leak when SOCKS connect fails.
-
-SPI
----
-
-* Changed the internal representation of structural types.
-
-.. note::
-    This is a backwards incompatible change with the previous connector SPI.
-    If you have written a connector that uses structural types, you will need
-    to update your code to the new APIs.
diff --git a/docs/src/main/sphinx/release/release-0.114.md b/docs/src/main/sphinx/release/release-0.114.md
new file mode 100644
index 000000000000..cd90ff9308fb
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.114.md
@@ -0,0 +1,10 @@
+# Release 0.114
+
+## General
+
+- Fix `%k` specifier for {func}`date_format` and {func}`date_parse`.
+  It previously used `24` rather than `0` for the midnight hour.
+
+## Hive
+
+- Fix ORC reader for Hive connector.
diff --git a/docs/src/main/sphinx/release/release-0.114.rst b/docs/src/main/sphinx/release/release-0.114.rst
deleted file mode 100644
index 68bd2c1a7034..000000000000
--- a/docs/src/main/sphinx/release/release-0.114.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-=============
-Release 0.114
-=============
-
-General
--------
-
-* Fix ``%k`` specifier for :func:`date_format` and :func:`date_parse`.
-  It previously used ``24`` rather than ``0`` for the midnight hour.
-
-Hive
-----
-
-* Fix ORC reader for Hive connector.
diff --git a/docs/src/main/sphinx/release/release-0.115.md b/docs/src/main/sphinx/release/release-0.115.md
new file mode 100644
index 000000000000..4328e2e6e3d5
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.115.md
@@ -0,0 +1,14 @@
+# Release 0.115
+
+## General
+
+- Fix an issue with hierarchical queue rules where queries could be rejected after being accepted.
+- Add {func}`sha1`, {func}`sha256` and {func}`sha512` functions.
+- Add {func}`power` as an alias for {func}`pow`.
+- Add support for `LIMIT ALL` syntax.
+
+## Hive
+
+- Fix a race condition which could cause queries to finish without reading all the data.
+- Fix a bug in Parquet reader that causes failures while reading lists that has an element
+  schema name other than `array_element` in its Parquet-level schema.
diff --git a/docs/src/main/sphinx/release/release-0.115.rst b/docs/src/main/sphinx/release/release-0.115.rst
deleted file mode 100644
index 4b21918534b6..000000000000
--- a/docs/src/main/sphinx/release/release-0.115.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-=============
-Release 0.115
-=============
-
-General
--------
-
-* Fix an issue with hierarchical queue rules where queries could be rejected after being accepted.
-* Add :func:`sha1`, :func:`sha256` and :func:`sha512` functions.
-* Add :func:`power` as an alias for :func:`pow`.
-* Add support for ``LIMIT ALL`` syntax.
-
-Hive
-----
-
-* Fix a race condition which could cause queries to finish without reading all the data.
-* Fix a bug in Parquet reader that causes failures while reading lists that has an element
-  schema name other than ``array_element`` in its Parquet-level schema.
diff --git a/docs/src/main/sphinx/release/release-0.116.md b/docs/src/main/sphinx/release/release-0.116.md
new file mode 100644
index 000000000000..b2dde115f752
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.116.md
@@ -0,0 +1,40 @@
+# Release 0.116
+
+## Cast between JSON and VARCHAR
+
+Casts of both directions between JSON and VARCHAR have been removed. If you
+have such casts in your scripts or views, they will fail with a message when
+you move to release 0.116. To get the semantics of the current casts, use:
+
+- `JSON_PARSE(x)` instead of `CAST(x as JSON)`
+- `JSON_FORMAT(x)` instead of `CAST(x as VARCHAR)`
+
+In a future release, we intend to reintroduce casts between JSON and VARCHAR
+along with other casts involving JSON. The semantics of the new JSON and
+VARCHAR cast will be consistent with the other casts being introduced. But it
+will be different from the semantics in 0.115 and before. When that comes,
+cast between JSON and VARCHAR in old scripts and views will produce unexpected
+result.
+
+## Cluster memory manager improvements
+
+The cluster memory manager now has a low memory killer. If the cluster runs low
+on memory, the killer will kill queries to improve throughput. It can be enabled
+with the `query.low-memory-killer.enabled` config flag, and the delay between
+when the cluster runs low on memory and when the killer will be invoked can be
+configured with the `query.low-memory-killer.delay` option.
+
+## General
+
+- Add {func}`multimap_agg` function.
+- Add {func}`checksum` function.
+- Add {func}`max` and {func}`min` that takes a second argument and produces
+  `n` largest or `n` smallest values.
+- Add `query_max_run_time` session property and `query.max-run-time`
+  config. Queries are failed after the specified duration.
+- Removed `experimental.cluster-memory-manager-enabled` config. The cluster
+  memory manager is now always enabled.
+- Removed `task.max-memory` config.
+- `optimizer.optimize-hash-generation` and `distributed-joins-enabled` are
+  both enabled by default now.
+- Add optimization for `IF` on a constant condition.
diff --git a/docs/src/main/sphinx/release/release-0.116.rst b/docs/src/main/sphinx/release/release-0.116.rst
deleted file mode 100644
index 904d5a9d2590..000000000000
--- a/docs/src/main/sphinx/release/release-0.116.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-=============
-Release 0.116
-=============
-
-Cast between JSON and VARCHAR
------------------------------
-
-Casts of both directions between JSON and VARCHAR have been removed. If you
-have such casts in your scripts or views, they will fail with a message when
-you move to release 0.116. To get the semantics of the current casts, use:
-
-* ``JSON_PARSE(x)`` instead of ``CAST(x as JSON)``
-* ``JSON_FORMAT(x)`` instead of ``CAST(x as VARCHAR)``
-
-In a future release, we intend to reintroduce casts between JSON and VARCHAR
-along with other casts involving JSON. The semantics of the new JSON and
-VARCHAR cast will be consistent with the other casts being introduced. But it
-will be different from the semantics in 0.115 and before. When that comes,
-cast between JSON and VARCHAR in old scripts and views will produce unexpected
-result.
-
-Cluster memory manager improvements
------------------------------------
-
-The cluster memory manager now has a low memory killer. If the cluster runs low
-on memory, the killer will kill queries to improve throughput. It can be enabled
-with the ``query.low-memory-killer.enabled`` config flag, and the delay between
-when the cluster runs low on memory and when the killer will be invoked can be
-configured with the ``query.low-memory-killer.delay`` option.
-
-General
--------
-
-* Add :func:`multimap_agg` function.
-* Add :func:`checksum` function.
-* Add :func:`max` and :func:`min` that takes a second argument and produces
-  ``n`` largest or ``n`` smallest values.
-* Add ``query_max_run_time`` session property and ``query.max-run-time``
-  config. Queries are failed after the specified duration.
-* Removed ``experimental.cluster-memory-manager-enabled`` config. The cluster
-  memory manager is now always enabled.
-* Removed ``task.max-memory`` config.
-* ``optimizer.optimize-hash-generation`` and ``distributed-joins-enabled`` are
-  both enabled by default now.
-* Add optimization for ``IF`` on a constant condition.
diff --git a/docs/src/main/sphinx/release/release-0.117.md b/docs/src/main/sphinx/release/release-0.117.md
new file mode 100644
index 000000000000..84bed955c663
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.117.md
@@ -0,0 +1,9 @@
+# Release 0.117
+
+## General
+
+- Add back casts between JSON and VARCHAR to provide an easier migration path
+  to {func}`json_parse` and {func}`json_format`. These will be removed in a
+  future release.
+- Fix bug in semi joins and group bys on a single `BIGINT` column where
+  0 could match `NULL`.
diff --git a/docs/src/main/sphinx/release/release-0.117.rst b/docs/src/main/sphinx/release/release-0.117.rst
deleted file mode 100644
index 1231ed8f78db..000000000000
--- a/docs/src/main/sphinx/release/release-0.117.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-=============
-Release 0.117
-=============
-
-General
--------
-
-* Add back casts between JSON and VARCHAR to provide an easier migration path
-  to :func:`json_parse` and :func:`json_format`. These will be removed in a
-  future release.
-* Fix bug in semi joins and group bys on a single ``BIGINT`` column where
-  0 could match ``NULL``.
diff --git a/docs/src/main/sphinx/release/release-0.118.md b/docs/src/main/sphinx/release/release-0.118.md
new file mode 100644
index 000000000000..ec02e6db643e
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.118.md
@@ -0,0 +1,20 @@
+# Release 0.118
+
+## General
+
+- Fix planning error for `UNION` queries that require implicit coercions.
+- Fix null pointer exception when using {func}`checksum`.
+- Fix completion condition for `SqlTask` that can cause queries to be blocked.
+
+## Authorization
+
+We've added experimental support for authorization of SQL queries in Presto.
+This is currently only supported by the Hive connector. You can enable Hive
+checks by setting the `hive.security` property to `none`, `read-only`,
+or `sql-standard`.
+
+:::{note}
+The authentication support is experimental and only lightly tested. We are
+actively working on this feature, so expect backwards incompatible changes.
+See the `ConnectorAccessControl` interface the SPI for details.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.118.rst b/docs/src/main/sphinx/release/release-0.118.rst
deleted file mode 100644
index 5daf1653e831..000000000000
--- a/docs/src/main/sphinx/release/release-0.118.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-=============
-Release 0.118
-=============
-
-General
--------
-
-* Fix planning error for ``UNION`` queries that require implicit coercions.
-* Fix null pointer exception when using :func:`checksum`.
-* Fix completion condition for ``SqlTask`` that can cause queries to be blocked.
-
-Authorization
--------------
-
-We've added experimental support for authorization of SQL queries in Presto.
-This is currently only supported by the Hive connector. You can enable Hive
-checks by setting the ``hive.security`` property to ``none``, ``read-only``,
-or ``sql-standard``.
-
-.. note::
-
-    The authentication support is experimental and only lightly tested. We are
-    actively working on this feature, so expect backwards incompatible changes.
-    See the ``ConnectorAccessControl`` interface the SPI for details.
-
diff --git a/docs/src/main/sphinx/release/release-0.119.md b/docs/src/main/sphinx/release/release-0.119.md
new file mode 100644
index 000000000000..391c17278ff3
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.119.md
@@ -0,0 +1,65 @@
+# Release 0.119
+
+## General
+
+- Add {doc}`/connector/redis`.
+- Add {func}`geometric_mean` function.
+- Fix restoring interrupt status in `StatementClient`.
+- Support getting server version in JDBC driver.
+- Improve correctness and compliance of JDBC `DatabaseMetaData`.
+- Catalog and schema are now optional on the server. This allows connecting
+  and executing metadata commands or queries that use fully qualified names.
+  Previously, the CLI and JDBC driver would use a catalog and schema named
+  `default` if they were not specified.
+- Fix scheduler handling of partially canceled queries.
+- Execute views with the permissions of the view owner.
+- Replaced the `task.http-notification-threads` config option with two
+  independent options: `task.http-response-threads` and `task.http-timeout-threads`.
+- Improve handling of negated expressions in join criteria.
+- Fix {func}`arbitrary`, {func}`max_by` and {func}`min_by` functions when used
+  with an array, map or row type.
+- Fix union coercion when the same constant or column appears more than once on
+  the same side.
+- Support `RENAME COLUMN` in {doc}`/sql/alter-table`.
+
+## SPI
+
+- Add more system table distribution modes.
+- Add owner to view metadata.
+
+:::{note}
+These are backwards incompatible changes with the previous connector SPI.
+If you have written a connector, you may need to update your code to the
+new APIs.
+:::
+
+## CLI
+
+- Fix handling of full width characters.
+- Skip printing query URL if terminal is too narrow.
+- Allow performing a partial query cancel using `ctrl-P`.
+- Allow toggling debug mode during query by pressing `D`.
+- Fix handling of query abortion after result has been partially received.
+- Fix handling of `ctrl-C` when displaying results without a pager.
+
+## Verifier
+
+- Add `expected-double-precision` config to specify the expected level of
+  precision when comparing double values.
+- Return non-zero exit code when there are failures.
+
+## Cassandra
+
+- Add support for Cassandra blob types.
+
+## Hive
+
+- Support adding and renaming columns using {doc}`/sql/alter-table`.
+- Automatically configure the S3 region when running in EC2.
+- Allow configuring multiple Hive metastores for high availability.
+- Add support for `TIMESTAMP` and `VARBINARY` in Parquet.
+
+## MySQL and PostgreSQL
+
+- Enable streaming results instead of buffering everything in memory.
+- Fix handling of pattern characters when matching table or column names.
diff --git a/docs/src/main/sphinx/release/release-0.119.rst b/docs/src/main/sphinx/release/release-0.119.rst
deleted file mode 100644
index 56fe6d712f56..000000000000
--- a/docs/src/main/sphinx/release/release-0.119.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-=============
-Release 0.119
-=============
-
-General
--------
-
-* Add :doc:`/connector/redis`.
-* Add :func:`geometric_mean` function.
-* Fix restoring interrupt status in ``StatementClient``.
-* Support getting server version in JDBC driver.
-* Improve correctness and compliance of JDBC ``DatabaseMetaData``.
-* Catalog and schema are now optional on the server. This allows connecting
-  and executing metadata commands or queries that use fully qualified names.
-  Previously, the CLI and JDBC driver would use a catalog and schema named
-  ``default`` if they were not specified.
-* Fix scheduler handling of partially canceled queries.
-* Execute views with the permissions of the view owner.
-* Replaced the ``task.http-notification-threads`` config option with two
-  independent options: ``task.http-response-threads`` and ``task.http-timeout-threads``.
-* Improve handling of negated expressions in join criteria.
-* Fix :func:`arbitrary`, :func:`max_by` and :func:`min_by` functions when used
-  with an array, map or row type.
-* Fix union coercion when the same constant or column appears more than once on
-  the same side.
-* Support ``RENAME COLUMN`` in :doc:`/sql/alter-table`.
-
-SPI
----
-
-* Add more system table distribution modes.
-* Add owner to view metadata.
-
-.. note::
-    These are backwards incompatible changes with the previous connector SPI.
-    If you have written a connector, you may need to update your code to the
-    new APIs.
-
-
-CLI
----
-
-* Fix handling of full width characters.
-* Skip printing query URL if terminal is too narrow.
-* Allow performing a partial query cancel using ``ctrl-P``.
-* Allow toggling debug mode during query by pressing ``D``.
-* Fix handling of query abortion after result has been partially received.
-* Fix handling of ``ctrl-C`` when displaying results without a pager.
-
-Verifier
---------
-
-* Add ``expected-double-precision`` config to specify the expected level of
-  precision when comparing double values.
-* Return non-zero exit code when there are failures.
-
-Cassandra
----------
-
-* Add support for Cassandra blob types.
-
-Hive
-----
-
-* Support adding and renaming columns using :doc:`/sql/alter-table`.
-* Automatically configure the S3 region when running in EC2.
-* Allow configuring multiple Hive metastores for high availability.
-* Add support for ``TIMESTAMP`` and ``VARBINARY`` in Parquet.
-
-MySQL and PostgreSQL
---------------------
-
-* Enable streaming results instead of buffering everything in memory.
-* Fix handling of pattern characters when matching table or column names.
diff --git a/docs/src/main/sphinx/release/release-0.120.md b/docs/src/main/sphinx/release/release-0.120.md
new file mode 100644
index 000000000000..0abeb2ddf99c
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.120.md
@@ -0,0 +1,5 @@
+# Release 0.120
+
+:::{warning}
+This release is broken and should not be used.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.120.rst b/docs/src/main/sphinx/release/release-0.120.rst
deleted file mode 100644
index d31873485ca4..000000000000
--- a/docs/src/main/sphinx/release/release-0.120.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-=============
-Release 0.120
-=============
-.. warning::
-
-   This release is broken and should not be used.
diff --git a/docs/src/main/sphinx/release/release-0.121.md b/docs/src/main/sphinx/release/release-0.121.md
new file mode 100644
index 000000000000..fadd5f1bf1ab
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.121.md
@@ -0,0 +1,8 @@
+# Release 0.121
+
+## General
+
+- Fix regression that causes task scheduler to not retry requests in some cases.
+- Throttle task info refresher on errors.
+- Fix planning failure that prevented the use of large `IN` lists.
+- Fix comparison of `array(T)` where `T` is a comparable, non-orderable type.
diff --git a/docs/src/main/sphinx/release/release-0.121.rst b/docs/src/main/sphinx/release/release-0.121.rst
deleted file mode 100644
index a1bb602a7228..000000000000
--- a/docs/src/main/sphinx/release/release-0.121.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-=============
-Release 0.121
-=============
-
-General
--------
-
-* Fix regression that causes task scheduler to not retry requests in some cases.
-* Throttle task info refresher on errors.
-* Fix planning failure that prevented the use of large ``IN`` lists.
-* Fix comparison of ``array(T)`` where ``T`` is a comparable, non-orderable type.
diff --git a/docs/src/main/sphinx/release/release-0.122.md b/docs/src/main/sphinx/release/release-0.122.md
new file mode 100644
index 000000000000..9fa45215b1a8
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.122.md
@@ -0,0 +1,19 @@
+# Release 0.122
+
+:::{warning}
+There is a bug in this release that will cause queries to fail when the
+`optimizer.optimize-hash-generation` config is disabled.
+:::
+
+## General
+
+- The deprecated casts between JSON and VARCHAR will now fail and provide the
+  user with instructions to migrate their query. For more details, see
+  {doc}`/release/release-0.116`.
+- Fix `NoSuchElementException` when cross join is used inside `IN` query.
+- Fix `GROUP BY` to support maps of structural types.
+- The web interface now displays a lock icon next to authenticated users.
+- The {func}`min_by` and {func}`max_by` aggregations now have an additional form
+  that return multiple values.
+- Fix incorrect results when using `IN` lists of more than 1000 elements of
+  `timestamp with time zone`, `time with time zone` or structural types.
diff --git a/docs/src/main/sphinx/release/release-0.122.rst b/docs/src/main/sphinx/release/release-0.122.rst
deleted file mode 100644
index 7ae25b946e53..000000000000
--- a/docs/src/main/sphinx/release/release-0.122.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-=============
-Release 0.122
-=============
-
-.. warning::
-
-   There is a bug in this release that will cause queries to fail when the
-   ``optimizer.optimize-hash-generation`` config is disabled.
-
-General
--------
-
-* The deprecated casts between JSON and VARCHAR will now fail and provide the
-  user with instructions to migrate their query. For more details, see
-  :doc:`/release/release-0.116`.
-* Fix ``NoSuchElementException`` when cross join is used inside ``IN`` query.
-* Fix ``GROUP BY`` to support maps of structural types.
-* The web interface now displays a lock icon next to authenticated users.
-* The :func:`min_by` and :func:`max_by` aggregations now have an additional form
-  that return multiple values.
-* Fix incorrect results when using ``IN`` lists of more than 1000 elements of
-  ``timestamp with time zone``, ``time with time zone`` or structural types.
diff --git a/docs/src/main/sphinx/release/release-0.123.md b/docs/src/main/sphinx/release/release-0.123.md
new file mode 100644
index 000000000000..6dd65644f41b
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.123.md
@@ -0,0 +1,55 @@
+# Release 0.123
+
+## General
+
+- Remove `node-scheduler.location-aware-scheduling-enabled` config.
+- Fixed query failures that occur when the `optimizer.optimize-hash-generation`
+  config is disabled.
+- Fix exception when using the `ResultSet` returned from the
+  `DatabaseMetaData.getColumns` method in the JDBC driver.
+- Increase default value of `failure-detector.threshold` config.
+- Fix race in queueing system which could cause queries to fail with
+  "Entering secondary queue failed".
+- Fix issue with {func}`histogram` that can cause failures or incorrect results
+  when there are more than ten buckets.
+- Optimize execution of cross join.
+- Run Presto server as `presto` user in RPM init scripts.
+
+## Table properties
+
+When creating tables with {doc}`/sql/create-table` or {doc}`/sql/create-table-as`,
+you can now add connector specific properties to the new table.  For example, when
+creating a Hive table you can specify the file format.  To list all available table,
+properties, run the following query:
+
+```
+SELECT * FROM system.metadata.table_properties
+```
+
+## Hive
+
+We have implemented `INSERT` and `DELETE` for Hive.  Both `INSERT` and `CREATE`
+statements support partitioned tables.  For example, to create a partitioned table
+execute the following:
+
+```
+CREATE TABLE orders (
+   order_date VARCHAR,
+   order_region VARCHAR,
+   order_id BIGINT,
+   order_info VARCHAR
+) WITH (partitioned_by = ARRAY['order_date', 'order_region'])
+```
+
+To `DELETE` from a Hive table, you must specify a `WHERE` clause that matches
+entire partitions.  For example, to delete from the above table, execute the following:
+
+```
+DELETE FROM orders
+WHERE order_date = '2015-10-15' AND order_region = 'APAC'
+```
+
+:::{note}
+Currently, Hive deletion is only supported for partitioned tables.
+Additionally, partition keys must be of type VARCHAR.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.123.rst b/docs/src/main/sphinx/release/release-0.123.rst
deleted file mode 100644
index 0a583ad91f56..000000000000
--- a/docs/src/main/sphinx/release/release-0.123.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-=============
-Release 0.123
-=============
-
-General
--------
-
-* Remove ``node-scheduler.location-aware-scheduling-enabled`` config.
-* Fixed query failures that occur when the ``optimizer.optimize-hash-generation``
-  config is disabled.
-* Fix exception when using the ``ResultSet`` returned from the
-  ``DatabaseMetaData.getColumns`` method in the JDBC driver.
-* Increase default value of ``failure-detector.threshold`` config.
-* Fix race in queueing system which could cause queries to fail with
-  "Entering secondary queue failed".
-* Fix issue with :func:`histogram` that can cause failures or incorrect results
-  when there are more than ten buckets.
-* Optimize execution of cross join.
-* Run Presto server as ``presto`` user in RPM init scripts.
-
-Table properties
-----------------
-
-When creating tables with :doc:`/sql/create-table` or :doc:`/sql/create-table-as`,
-you can now add connector specific properties to the new table.  For example, when
-creating a Hive table you can specify the file format.  To list all available table,
-properties, run the following query::
-
-    SELECT * FROM system.metadata.table_properties
-
-Hive
-----
-
-We have implemented ``INSERT`` and ``DELETE`` for Hive.  Both ``INSERT`` and ``CREATE``
-statements support partitioned tables.  For example, to create a partitioned table
-execute the following::
-
-    CREATE TABLE orders (
-       order_date VARCHAR,
-       order_region VARCHAR,
-       order_id BIGINT,
-       order_info VARCHAR
-    ) WITH (partitioned_by = ARRAY['order_date', 'order_region'])
-
-To ``DELETE`` from a Hive table, you must specify a ``WHERE`` clause that matches
-entire partitions.  For example, to delete from the above table, execute the following::
-
-    DELETE FROM orders
-    WHERE order_date = '2015-10-15' AND order_region = 'APAC'
-
-.. note::
-
-    Currently, Hive deletion is only supported for partitioned tables.
-    Additionally, partition keys must be of type VARCHAR.
diff --git a/docs/src/main/sphinx/release/release-0.124.md b/docs/src/main/sphinx/release/release-0.124.md
new file mode 100644
index 000000000000..152cb6300406
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.124.md
@@ -0,0 +1,45 @@
+# Release 0.124
+
+## General
+
+- Fix race in memory tracking of `JOIN` which could cause the cluster to become over
+  committed and possibly crash.
+- The {func}`approx_percentile` aggregation now also accepts an array of percentages.
+- Allow nested row type references.
+- Fix correctness for some queries with `IN` lists. When all constants in the
+  list are in the range of 32-bit signed integers but the test value can be
+  outside of the range, `true` may be produced when the correct result should
+  be `false`.
+- Fail queries submitted while coordinator is starting.
+- Add JMX stats to track authentication and authorization successes and failures.
+- Add configuration support for the system access control plugin. The system access
+  controller can be selected and configured using `etc/access-control.properties`.
+  Note that Presto currently does not ship with any system access controller
+  implementations.
+- Add support for `WITH NO DATA` syntax in `CREATE TABLE ... AS SELECT`.
+- Fix issue where invalid plans are generated for queries with multiple aggregations
+  that require input values to be cast in different ways.
+- Fix performance issue due to redundant processing in queries involving `DISTINCT`
+  and `LIMIT`.
+- Add optimization that can reduce the amount of data sent over the network
+  for grouped aggregation queries. This feature can be enabled by
+  `optimizer.use-intermediate-aggregations` config property or
+  `task_intermediate_aggregation` session property.
+
+## Hive
+
+- Do not count expected exceptions as errors in the Hive metastore client stats.
+- Improve performance when reading ORC files with many tiny stripes.
+
+## Verifier
+
+- Add support for pre and post control and test queries.
+
+If you are upgrading, you need to alter your `verifier_queries` table:
+
+```
+ALTER TABLE verifier_queries ADD COLUMN test_postqueries text;
+ALTER TABLE verifier_queries ADD COLUMN test_prequeries text;
+ALTER TABLE verifier_queries ADD COLUMN control_postqueries text;
+ALTER TABLE verifier_queries ADD COLUMN control_prequeries text;
+```
diff --git a/docs/src/main/sphinx/release/release-0.124.rst b/docs/src/main/sphinx/release/release-0.124.rst
deleted file mode 100644
index 8ba9c4fe20dd..000000000000
--- a/docs/src/main/sphinx/release/release-0.124.rst
+++ /dev/null
@@ -1,48 +0,0 @@
-=============
-Release 0.124
-=============
-
-General
--------
-
-* Fix race in memory tracking of ``JOIN`` which could cause the cluster to become over
-  committed and possibly crash.
-* The :func:`approx_percentile` aggregation now also accepts an array of percentages.
-* Allow nested row type references.
-* Fix correctness for some queries with ``IN`` lists. When all constants in the
-  list are in the range of 32-bit signed integers but the test value can be
-  outside of the range, ``true`` may be produced when the correct result should
-  be ``false``.
-* Fail queries submitted while coordinator is starting.
-* Add JMX stats to track authentication and authorization successes and failures.
-* Add configuration support for the system access control plugin. The system access
-  controller can be selected and configured using ``etc/access-control.properties``.
-  Note that Presto currently does not ship with any system access controller
-  implementations.
-* Add support for ``WITH NO DATA`` syntax in ``CREATE TABLE ... AS SELECT``.
-* Fix issue where invalid plans are generated for queries with multiple aggregations
-  that require input values to be cast in different ways.
-* Fix performance issue due to redundant processing in queries involving ``DISTINCT``
-  and ``LIMIT``.
-* Add optimization that can reduce the amount of data sent over the network
-  for grouped aggregation queries. This feature can be enabled by
-  ``optimizer.use-intermediate-aggregations`` config property or
-  ``task_intermediate_aggregation`` session property.
-
-Hive
-----
-
-* Do not count expected exceptions as errors in the Hive metastore client stats.
-* Improve performance when reading ORC files with many tiny stripes.
-
-Verifier
---------
-
-* Add support for pre and post control and test queries.
-
-If you are upgrading, you need to alter your ``verifier_queries`` table::
-
-    ALTER TABLE verifier_queries ADD COLUMN test_postqueries text;
-    ALTER TABLE verifier_queries ADD COLUMN test_prequeries text;
-    ALTER TABLE verifier_queries ADD COLUMN control_postqueries text;
-    ALTER TABLE verifier_queries ADD COLUMN control_prequeries text;
diff --git a/docs/src/main/sphinx/release/release-0.125.md b/docs/src/main/sphinx/release/release-0.125.md
new file mode 100644
index 000000000000..3134c9d97a8a
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.125.md
@@ -0,0 +1,8 @@
+# Release 0.125
+
+## General
+
+- Fix an issue where certain operations such as `GROUP BY`, `DISTINCT`, etc. on the
+  output of a `RIGHT` or `FULL OUTER JOIN` can return incorrect results if they reference columns
+  from the left relation that are also used in the join clause, and not every row from the right relation
+  has a match.
diff --git a/docs/src/main/sphinx/release/release-0.125.rst b/docs/src/main/sphinx/release/release-0.125.rst
deleted file mode 100644
index e996cfe62145..000000000000
--- a/docs/src/main/sphinx/release/release-0.125.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-=============
-Release 0.125
-=============
-
-General
--------
-
-* Fix an issue where certain operations such as ``GROUP BY``, ``DISTINCT``, etc. on the
-  output of a ``RIGHT`` or ``FULL OUTER JOIN`` can return incorrect results if they reference columns
-  from the left relation that are also used in the join clause, and not every row from the right relation
-  has a match.
diff --git a/docs/src/main/sphinx/release/release-0.126.md b/docs/src/main/sphinx/release/release-0.126.md
new file mode 100644
index 000000000000..15d3bd2fb768
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.126.md
@@ -0,0 +1,47 @@
+# Release 0.126
+
+## General
+
+- Add error location information (line and column number) for semantic errors.
+- Fix a CLI crash during tab-completion when no schema is currently selected.
+- Fix reset of session properties in CLI when running {doc}`/sql/use`.
+- Fix occasional query planning failure due to a bug in the projection
+  push down optimizer.
+- Fix a parsing issue when expressions contain the form `POSITION(x in (y))`.
+- Add a new version of {func}`approx_percentile` that takes an `accuracy`
+  parameter.
+- Allow specifying columns names in {doc}`/sql/insert` queries.
+- Add `field_length` table property to blackhole connector to control the
+  size of generated `VARCHAR` and `VARBINARY` fields.
+- Bundle Teradata functions plugin in server package.
+- Improve handling of physical properties which can increase performance for
+  queries involving window functions.
+- Add ability to control whether index join lookups and caching are shared
+  within a task. This allows us to optimize for index cache hits or for more
+  CPU parallelism. This option is toggled by the `task.share-index-loading`
+  config property or the `task_share_index_loading` session property.
+- Add Tableau web connector.
+- Improve performance of queries that use an `IN` expression with a large
+  list of constant values.
+- Enable connector predicate push down for all comparable and equatable types.
+- Fix query planning failure when using certain operations such as `GROUP BY`,
+  `DISTINCT`, etc. on the output columns of `UNNEST`.
+- In `ExchangeClient` set `maxResponseSize` to be slightly smaller than
+  the configured value. This reduces the possibility of encountering
+  `PageTooLargeException`.
+- Fix memory leak in coordinator.
+- Add validation for names of table properties.
+
+## Hive
+
+- Fix reading structural types containing nulls in Parquet.
+- Fix writing DATE type when timezone offset is negative. Previous versions
+  would write the wrong date (off by one day).
+- Fix an issue where `VARCHAR` columns added to an existing table could not be
+  queried.
+- Fix over-creation of initial splits.
+- Fix `hive.immutable-partitions` config property to also apply to
+  unpartitioned tables.
+- Allow non-`VARCHAR` columns in `DELETE` query.
+- Support `DATE` columns as partition columns in parquet tables.
+- Improve error message for cases where partition columns are also table columns.
diff --git a/docs/src/main/sphinx/release/release-0.126.rst b/docs/src/main/sphinx/release/release-0.126.rst
deleted file mode 100644
index fa966007819a..000000000000
--- a/docs/src/main/sphinx/release/release-0.126.rst
+++ /dev/null
@@ -1,51 +0,0 @@
-=============
-Release 0.126
-=============
-
-General
--------
-
-* Add error location information (line and column number) for semantic errors.
-* Fix a CLI crash during tab-completion when no schema is currently selected.
-* Fix reset of session properties in CLI when running :doc:`/sql/use`.
-* Fix occasional query planning failure due to a bug in the projection
-  push down optimizer.
-* Fix a parsing issue when expressions contain the form ``POSITION(x in (y))``.
-* Add a new version of :func:`approx_percentile` that takes an ``accuracy``
-  parameter.
-* Allow specifying columns names in :doc:`/sql/insert` queries.
-* Add ``field_length`` table property to blackhole connector to control the
-  size of generated ``VARCHAR`` and ``VARBINARY`` fields.
-* Bundle Teradata functions plugin in server package.
-* Improve handling of physical properties which can increase performance for
-  queries involving window functions.
-* Add ability to control whether index join lookups and caching are shared
-  within a task. This allows us to optimize for index cache hits or for more
-  CPU parallelism. This option is toggled by the ``task.share-index-loading``
-  config property or the ``task_share_index_loading`` session property.
-* Add Tableau web connector.
-* Improve performance of queries that use an ``IN`` expression with a large
-  list of constant values.
-* Enable connector predicate push down for all comparable and equatable types.
-* Fix query planning failure when using certain operations such as ``GROUP BY``,
-  ``DISTINCT``, etc. on the output columns of ``UNNEST``.
-* In ``ExchangeClient`` set ``maxResponseSize`` to be slightly smaller than
-  the configured value. This reduces the possibility of encountering
-  ``PageTooLargeException``.
-* Fix memory leak in coordinator.
-* Add validation for names of table properties.
-
-Hive
-----
-
-* Fix reading structural types containing nulls in Parquet.
-* Fix writing DATE type when timezone offset is negative. Previous versions
-  would write the wrong date (off by one day).
-* Fix an issue where ``VARCHAR`` columns added to an existing table could not be
-  queried.
-* Fix over-creation of initial splits.
-* Fix ``hive.immutable-partitions`` config property to also apply to
-  unpartitioned tables.
-* Allow non-``VARCHAR`` columns in ``DELETE`` query.
-* Support ``DATE`` columns as partition columns in parquet tables.
-* Improve error message for cases where partition columns are also table columns.
diff --git a/docs/src/main/sphinx/release/release-0.127.md b/docs/src/main/sphinx/release/release-0.127.md
new file mode 100644
index 000000000000..2d0996fec653
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.127.md
@@ -0,0 +1,6 @@
+# Release 0.127
+
+## General
+
+- Disable index join repartitioning when it disrupts streaming execution.
+- Fix memory accounting leak in some `JOIN` queries.
diff --git a/docs/src/main/sphinx/release/release-0.127.rst b/docs/src/main/sphinx/release/release-0.127.rst
deleted file mode 100644
index fb983f97925d..000000000000
--- a/docs/src/main/sphinx/release/release-0.127.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-=============
-Release 0.127
-=============
-
-General
--------
-
-* Disable index join repartitioning when it disrupts streaming execution.
-* Fix memory accounting leak in some ``JOIN`` queries.
diff --git a/docs/src/main/sphinx/release/release-0.128.md b/docs/src/main/sphinx/release/release-0.128.md
new file mode 100644
index 000000000000..ec2b6d027c27
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.128.md
@@ -0,0 +1,24 @@
+# Release 0.128
+
+## Graceful shutdown
+
+Workers can now be instructed to shutdown. This is done by submiting a `PUT`
+request to `/v1/info/state` with the body `"SHUTTING_DOWN"`. Once instructed
+to shutdown, the worker will no longer receive new tasks, and will exit once
+all existing tasks have completed.
+
+## General
+
+- Fix cast from json to structural types when rows or maps have arrays,
+  rows, or maps nested in them.
+- Fix Example HTTP connector.
+  It would previously fail with a JSON deserialization error.
+- Optimize memory usage in TupleDomain.
+- Fix an issue that can occur when an `INNER JOIN` has equi-join clauses that
+  align with the grouping columns used by a preceding operation such as
+  `GROUP BY`, `DISTINCT`, etc. When this triggers, the join may fail to
+  produce some of the output rows.
+
+## MySQL
+
+- Fix handling of MySQL database names with underscores.
diff --git a/docs/src/main/sphinx/release/release-0.128.rst b/docs/src/main/sphinx/release/release-0.128.rst
deleted file mode 100644
index 606f086715c1..000000000000
--- a/docs/src/main/sphinx/release/release-0.128.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-=============
-Release 0.128
-=============
-
-Graceful shutdown
------------------
-
-Workers can now be instructed to shutdown. This is done by submiting a ``PUT``
-request to ``/v1/info/state`` with the body ``"SHUTTING_DOWN"``. Once instructed
-to shutdown, the worker will no longer receive new tasks, and will exit once
-all existing tasks have completed.
-
-General
--------
-
-* Fix cast from json to structural types when rows or maps have arrays,
-  rows, or maps nested in them.
-* Fix Example HTTP connector.
-  It would previously fail with a JSON deserialization error.
-* Optimize memory usage in TupleDomain.
-* Fix an issue that can occur when an ``INNER JOIN`` has equi-join clauses that
-  align with the grouping columns used by a preceding operation such as
-  ``GROUP BY``, ``DISTINCT``, etc. When this triggers, the join may fail to
-  produce some of the output rows.
-
-MySQL
------
-
-* Fix handling of MySQL database names with underscores.
diff --git a/docs/src/main/sphinx/release/release-0.129.md b/docs/src/main/sphinx/release/release-0.129.md
new file mode 100644
index 000000000000..521c2ba25f56
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.129.md
@@ -0,0 +1,57 @@
+# Release 0.129
+
+:::{warning}
+There is a performance regression in this release for `GROUP BY` and `JOIN`
+queries when the length of the keys is between 16 and 31 bytes. This is fixed
+in {doc}`/release/release-0.130`.
+:::
+
+## General
+
+- Fix a planner issue that could cause queries involving `OUTER JOIN` to
+  return incorrect results.
+- Some queries, particularly those using {func}`max_by` or {func}`min_by`, now
+  accurately reflect their true memory usage and thus appear to use more memory
+  than before.
+- Fix {doc}`/sql/show-session` to not show hidden session properties.
+- Fix hang in large queries with `ORDER BY` and `LIMIT`.
+- Fix an issue when casting empty arrays or arrays containing only `NULL` to
+  other types.
+- Table property names are now properly treated as case-insensitive.
+- Minor UI improvements for query detail page.
+- Do not display useless stack traces for expected exceptions in verifier.
+- Improve performance of queries involving `UNION ALL` that write data.
+- Introduce the `P4HyperLogLog` type, which uses an implementation of the HyperLogLog data
+  structure that trades off accuracy and memory requirements when handling small sets for an
+  improvement in performance.
+
+## JDBC driver
+
+- Throw exception when using {doc}`/sql/set-session` or {doc}`/sql/reset-session`
+  rather than silently ignoring the command.
+- The driver now properly supports non-query statements.
+  The `Statement` interface supports all variants of the `execute` methods.
+  It also supports the `getUpdateCount` and `getLargeUpdateCount` methods.
+
+## CLI
+
+- Always clear screen when canceling query with `ctrl-C`.
+- Make client request timeout configurable.
+
+## Network topology aware scheduling
+
+The scheduler can now be configured to take network topology into account when
+scheduling splits. This is set using the `node-scheduler.network-topology`
+config. See {doc}`/admin/tuning` for more information.
+
+## Hive
+
+- The S3 region is no longer automatically configured when running in EC2.
+  To enable this feature, use `hive.s3.pin-client-to-current-region=true`
+  in your Hive catalog properties file. Enabling this feature is required
+  to access S3 data in the China isolated region, but prevents accessing
+  data outside the current region.
+- Server-side encryption is now supported for S3. To enable this feature,
+  use `hive.s3.sse.enabled=true` in your Hive catalog properties file.
+- Add support for the `retention_days` table property.
+- Add support for S3 `EncryptionMaterialsProvider`.
diff --git a/docs/src/main/sphinx/release/release-0.129.rst b/docs/src/main/sphinx/release/release-0.129.rst
deleted file mode 100644
index c95ddc1009a6..000000000000
--- a/docs/src/main/sphinx/release/release-0.129.rst
+++ /dev/null
@@ -1,64 +0,0 @@
-=============
-Release 0.129
-=============
-
-.. warning::
-
-   There is a performance regression in this release for ``GROUP BY`` and ``JOIN``
-   queries when the length of the keys is between 16 and 31 bytes. This is fixed
-   in :doc:`/release/release-0.130`.
-
-General
--------
-
-* Fix a planner issue that could cause queries involving ``OUTER JOIN`` to
-  return incorrect results.
-* Some queries, particularly those using :func:`max_by` or :func:`min_by`, now
-  accurately reflect their true memory usage and thus appear to use more memory
-  than before.
-* Fix :doc:`/sql/show-session` to not show hidden session properties.
-* Fix hang in large queries with ``ORDER BY`` and ``LIMIT``.
-* Fix an issue when casting empty arrays or arrays containing only ``NULL`` to
-  other types.
-* Table property names are now properly treated as case-insensitive.
-* Minor UI improvements for query detail page.
-* Do not display useless stack traces for expected exceptions in verifier.
-* Improve performance of queries involving ``UNION ALL`` that write data.
-* Introduce the ``P4HyperLogLog`` type, which uses an implementation of the HyperLogLog data
-  structure that trades off accuracy and memory requirements when handling small sets for an
-  improvement in performance.
-
-JDBC driver
------------
-
-* Throw exception when using :doc:`/sql/set-session` or :doc:`/sql/reset-session`
-  rather than silently ignoring the command.
-* The driver now properly supports non-query statements.
-  The ``Statement`` interface supports all variants of the ``execute`` methods.
-  It also supports the ``getUpdateCount`` and ``getLargeUpdateCount`` methods.
-
-CLI
----
-
-* Always clear screen when canceling query with ``ctrl-C``.
-* Make client request timeout configurable.
-
-Network topology aware scheduling
----------------------------------
-
-The scheduler can now be configured to take network topology into account when
-scheduling splits. This is set using the ``node-scheduler.network-topology``
-config. See :doc:`/admin/tuning` for more information.
-
-Hive
-----
-
-* The S3 region is no longer automatically configured when running in EC2.
-  To enable this feature, use ``hive.s3.pin-client-to-current-region=true``
-  in your Hive catalog properties file. Enabling this feature is required
-  to access S3 data in the China isolated region, but prevents accessing
-  data outside the current region.
-* Server-side encryption is now supported for S3. To enable this feature,
-  use ``hive.s3.sse.enabled=true`` in your Hive catalog properties file.
-* Add support for the ``retention_days`` table property.
-* Add support for S3 ``EncryptionMaterialsProvider``.
diff --git a/docs/src/main/sphinx/release/release-0.130.md b/docs/src/main/sphinx/release/release-0.130.md
new file mode 100644
index 000000000000..7cae49c613fe
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.130.md
@@ -0,0 +1,14 @@
+# Release 0.130
+
+## General
+
+- Fix a performance regression in `GROUP BY` and `JOIN` queries when the
+  length of the keys is between 16 and 31 bytes.
+- Add {func}`map_concat` function.
+- Performance improvements for filters, projections and dictionary encoded data.
+  This optimization is turned off by default. It can be configured via the
+  `optimizer.columnar-processing-dictionary` config property or the
+  `columnar_processing_dictionary` session property.
+- Improve performance of aggregation queries with large numbers of groups.
+- Improve performance for queries that use {ref}`array-type` type.
+- Fix querying remote views in MySQL and PostgreSQL connectors.
diff --git a/docs/src/main/sphinx/release/release-0.130.rst b/docs/src/main/sphinx/release/release-0.130.rst
deleted file mode 100644
index 38b2c3e087aa..000000000000
--- a/docs/src/main/sphinx/release/release-0.130.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-=============
-Release 0.130
-=============
-
-General
--------
-
-* Fix a performance regression in ``GROUP BY`` and ``JOIN`` queries when the
-  length of the keys is between 16 and 31 bytes.
-* Add :func:`map_concat` function.
-* Performance improvements for filters, projections and dictionary encoded data.
-  This optimization is turned off by default. It can be configured via the
-  ``optimizer.columnar-processing-dictionary`` config property or the
-  ``columnar_processing_dictionary`` session property.
-* Improve performance of aggregation queries with large numbers of groups.
-* Improve performance for queries that use :ref:`array_type` type.
-* Fix querying remote views in MySQL and PostgreSQL connectors.
diff --git a/docs/src/main/sphinx/release/release-0.131.md b/docs/src/main/sphinx/release/release-0.131.md
new file mode 100644
index 000000000000..c697084bde85
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.131.md
@@ -0,0 +1,6 @@
+# Release 0.131
+
+## General
+
+- Fix poor performance of transporting dictionary encoded data over the network.
+- Fix code generator to prevent "Method code too large" error.
diff --git a/docs/src/main/sphinx/release/release-0.131.rst b/docs/src/main/sphinx/release/release-0.131.rst
deleted file mode 100644
index 1bae21632655..000000000000
--- a/docs/src/main/sphinx/release/release-0.131.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-=============
-Release 0.131
-=============
-
-General
--------
-
-* Fix poor performance of transporting dictionary encoded data over the network.
-* Fix code generator to prevent "Method code too large" error.
diff --git a/docs/src/main/sphinx/release/release-0.132.md b/docs/src/main/sphinx/release/release-0.132.md
new file mode 100644
index 000000000000..8d5c4d637a05
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.132.md
@@ -0,0 +1,40 @@
+# Release 0.132
+
+:::{warning}
+{func}`concat` on {ref}`array-type`, or enabling `columnar_processing_dictionary`
+may cause queries to fail in this release. This is fixed in {doc}`/release/release-0.133`.
+:::
+
+## General
+
+- Fix a correctness issue that can occur when any join depends on the output
+  of another outer join that has an inner side (or either side for the full outer
+  case) for which the connector declares that it has no data during planning.
+- Improve error messages for unresolved operators.
+- Add support for creating constant arrays with more than 255 elements.
+- Fix analyzer for queries with `GROUP BY ()` such that errors are raised
+  during analysis rather than execution.
+- Add `resource_overcommit` session property. This disables all memory
+  limits for the query. Instead it may be killed at any time, if the coordinator
+  needs to reclaim memory.
+- Add support for transactional connectors.
+- Add support for non-correlated scalar sub-queries.
+- Add support for SQL binary literals.
+- Add variant of {func}`random` that produces an integer number between 0 and a
+  specified upper bound.
+- Perform bounds checks when evaluating {func}`abs`.
+- Improve accuracy of memory accounting for {func}`map_agg` and {func}`array_agg`.
+  These functions will now appear to use more memory than before.
+- Various performance optimizations for functions operating on {ref}`array-type`.
+- Add server version to web UI.
+
+## CLI
+
+- Fix sporadic *"Failed to disable interrupt character"* error after exiting pager.
+
+## Hive
+
+- Report metastore and namenode latency in milliseconds rather than seconds in
+  JMX stats.
+- Fix `NullPointerException` when inserting a null value for a partition column.
+- Improve CPU efficiency when writing data.
diff --git a/docs/src/main/sphinx/release/release-0.132.rst b/docs/src/main/sphinx/release/release-0.132.rst
deleted file mode 100644
index 96e8d6ab5c63..000000000000
--- a/docs/src/main/sphinx/release/release-0.132.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-=============
-Release 0.132
-=============
-
-.. warning::
-
-   :func:`concat` on :ref:`array_type`, or enabling ``columnar_processing_dictionary``
-   may cause queries to fail in this release. This is fixed in :doc:`/release/release-0.133`.
-
-General
--------
-
-* Fix a correctness issue that can occur when any join depends on the output
-  of another outer join that has an inner side (or either side for the full outer
-  case) for which the connector declares that it has no data during planning.
-* Improve error messages for unresolved operators.
-* Add support for creating constant arrays with more than 255 elements.
-* Fix analyzer for queries with ``GROUP BY ()`` such that errors are raised
-  during analysis rather than execution.
-* Add ``resource_overcommit`` session property. This disables all memory
-  limits for the query. Instead it may be killed at any time, if the coordinator
-  needs to reclaim memory.
-* Add support for transactional connectors.
-* Add support for non-correlated scalar sub-queries.
-* Add support for SQL binary literals.
-* Add variant of :func:`random` that produces an integer number between 0 and a
-  specified upper bound.
-* Perform bounds checks when evaluating :func:`abs`.
-* Improve accuracy of memory accounting for :func:`map_agg` and :func:`array_agg`.
-  These functions will now appear to use more memory than before.
-* Various performance optimizations for functions operating on :ref:`array_type`.
-* Add server version to web UI.
-
-CLI
----
-
-* Fix sporadic *"Failed to disable interrupt character"* error after exiting pager.
-
-Hive
-----
-
-* Report metastore and namenode latency in milliseconds rather than seconds in
-  JMX stats.
-* Fix ``NullPointerException`` when inserting a null value for a partition column.
-* Improve CPU efficiency when writing data.
diff --git a/docs/src/main/sphinx/release/release-0.133.md b/docs/src/main/sphinx/release/release-0.133.md
new file mode 100644
index 000000000000..6754cee3fefb
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.133.md
@@ -0,0 +1,17 @@
+# Release 0.133
+
+## General
+
+- Add support for calling connector-defined procedures using {doc}`/sql/call`.
+- Add {doc}`/connector/system` procedure for killing running queries.
+- Properly expire idle transactions that consist of just the start transaction statement
+  and nothing else.
+- Fix possible deadlock in worker communication when task restart is detected.
+- Performance improvements for aggregations on dictionary encoded data.
+  This optimization is turned off by default. It can be configured via the
+  `optimizer.dictionary-aggregation` config property or the
+  `dictionary_aggregation` session property.
+- Fix race which could cause queries to fail when using {func}`concat` on
+  {ref}`array-type`, or when enabling `columnar_processing_dictionary`.
+- Add sticky headers and the ability to sort the tasks table on the query page
+  in the web interface.
diff --git a/docs/src/main/sphinx/release/release-0.133.rst b/docs/src/main/sphinx/release/release-0.133.rst
deleted file mode 100644
index 8e5f2b8e3e70..000000000000
--- a/docs/src/main/sphinx/release/release-0.133.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-=============
-Release 0.133
-=============
-
-General
--------
-
-* Add support for calling connector-defined procedures using :doc:`/sql/call`.
-* Add :doc:`/connector/system` procedure for killing running queries.
-* Properly expire idle transactions that consist of just the start transaction statement
-  and nothing else.
-* Fix possible deadlock in worker communication when task restart is detected.
-* Performance improvements for aggregations on dictionary encoded data.
-  This optimization is turned off by default. It can be configured via the
-  ``optimizer.dictionary-aggregation`` config property or the
-  ``dictionary_aggregation`` session property.
-* Fix race which could cause queries to fail when using :func:`concat` on
-  :ref:`array_type`, or when enabling ``columnar_processing_dictionary``.
-* Add sticky headers and the ability to sort the tasks table on the query page
-  in the web interface.
diff --git a/docs/src/main/sphinx/release/release-0.134.md b/docs/src/main/sphinx/release/release-0.134.md
new file mode 100644
index 000000000000..67032be0c404
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.134.md
@@ -0,0 +1,24 @@
+# Release 0.134
+
+## General
+
+- Add cumulative memory statistics tracking and expose the stat in the web interface.
+- Remove nullability and partition key flags from {doc}`/sql/show-columns`.
+- Remove non-standard `is_partition_key` column from `information_schema.columns`.
+- Fix performance regression in creation of `DictionaryBlock`.
+- Fix rare memory accounting leak in queries with `JOIN`.
+
+## Hive
+
+- The comment for partition keys is now prefixed with *"Partition Key"*.
+
+## SPI
+
+- Remove legacy partition API methods and classes.
+
+:::{note}
+This is a backwards incompatible change with the previous connector SPI.
+If you have written a connector and have not yet updated to the
+`TableLayout` API, you will need to update your code before deploying
+this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.134.rst b/docs/src/main/sphinx/release/release-0.134.rst
deleted file mode 100644
index 026fbcc9d08e..000000000000
--- a/docs/src/main/sphinx/release/release-0.134.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-=============
-Release 0.134
-=============
-
-General
--------
-
-* Add cumulative memory statistics tracking and expose the stat in the web interface.
-* Remove nullability and partition key flags from :doc:`/sql/show-columns`.
-* Remove non-standard ``is_partition_key`` column from ``information_schema.columns``.
-* Fix performance regression in creation of ``DictionaryBlock``.
-* Fix rare memory accounting leak in queries with ``JOIN``.
-
-Hive
-----
-
-* The comment for partition keys is now prefixed with *"Partition Key"*.
-
-SPI
----
-
-* Remove legacy partition API methods and classes.
-
-.. note::
-    This is a backwards incompatible change with the previous connector SPI.
-    If you have written a connector and have not yet updated to the
-    ``TableLayout`` API, you will need to update your code before deploying
-    this release.
diff --git a/docs/src/main/sphinx/release/release-0.135.md b/docs/src/main/sphinx/release/release-0.135.md
new file mode 100644
index 000000000000..566837688060
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.135.md
@@ -0,0 +1,10 @@
+# Release 0.135
+
+## General
+
+- Add summary of change in CPU usage to verifier output.
+- Add cast between JSON and VARCHAR, BOOLEAN, DOUBLE, BIGINT. For the old
+  behavior of cast between JSON and VARCHAR (pre-{doc}`/release/release-0.122`),
+  use {func}`json_parse` and {func}`json_format`.
+- Fix bug in 0.134 that prevented query page in web UI from displaying in
+  Safari.
diff --git a/docs/src/main/sphinx/release/release-0.135.rst b/docs/src/main/sphinx/release/release-0.135.rst
deleted file mode 100644
index 9fab2953f8c4..000000000000
--- a/docs/src/main/sphinx/release/release-0.135.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-=============
-Release 0.135
-=============
-
-General
--------
-
-* Add summary of change in CPU usage to verifier output.
-* Add cast between JSON and VARCHAR, BOOLEAN, DOUBLE, BIGINT. For the old
-  behavior of cast between JSON and VARCHAR (pre-:doc:`/release/release-0.122`),
-  use :func:`json_parse` and :func:`json_format`.
-* Fix bug in 0.134 that prevented query page in web UI from displaying in
-  Safari.
diff --git a/docs/src/main/sphinx/release/release-0.136.md b/docs/src/main/sphinx/release/release-0.136.md
new file mode 100644
index 000000000000..55b67f43943d
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.136.md
@@ -0,0 +1,9 @@
+# Release 0.136
+
+## General
+
+- Add `control.query-types` and `test.query-types` to verifier, which can
+  be used to select the type of queries to run.
+- Fix issue where queries with `ORDER BY LIMIT` with a limit greater than
+  2147483647 could fail or return incorrect results.
+- Add query plan visualization with live stats to the web UI.
diff --git a/docs/src/main/sphinx/release/release-0.136.rst b/docs/src/main/sphinx/release/release-0.136.rst
deleted file mode 100644
index f64eb02c35eb..000000000000
--- a/docs/src/main/sphinx/release/release-0.136.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-=============
-Release 0.136
-=============
-
-General
--------
-
-* Add ``control.query-types`` and ``test.query-types`` to verifier, which can
-  be used to select the type of queries to run.
-* Fix issue where queries with ``ORDER BY LIMIT`` with a limit greater than
-  2147483647 could fail or return incorrect results.
-* Add query plan visualization with live stats to the web UI.
diff --git a/docs/src/main/sphinx/release/release-0.137.md b/docs/src/main/sphinx/release/release-0.137.md
new file mode 100644
index 000000000000..c937b1f60a16
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.137.md
@@ -0,0 +1,34 @@
+# Release 0.137
+
+## General
+
+- Fix `current_date` to return correct results for all time zones.
+- Fix invalid plans when scalar subqueries use `GROUP BY`, `DISTINCT` or `JOIN`.
+- Do not allow creating views with a column type of `UNKNOWN`.
+- Improve expression optimizer to remove some redundant operations.
+- Add {func}`bit_count`, {func}`bitwise_not`, {func}`bitwise_and`,
+  {func}`bitwise_or`, and {func}`bitwise_xor` functions.
+- Add {func}`approx_distinct` aggregation support for `VARBINARY` input.
+- Add create time to query detail page in UI.
+- Add support for `VARCHAR(length)` type.
+- Track per-stage peak memory usage.
+- Allow using double input for {func}`approx_percentile` with an array of
+  percentiles.
+- Add API to JDBC driver to track query progress.
+
+## Hive
+
+- Do not allow inserting into tables when the Hive type does not match
+  the Presto type. Previously, Presto would insert data that did not
+  match the table or partition type and that data could not be read by
+  Hive. For example, Presto would write files containing `BIGINT`
+  data for a Hive column type of `INT`.
+- Add validation to {doc}`/sql/create-table` and {doc}`/sql/create-table-as`
+  to check that partition keys are the last columns in the table and in the same
+  order as the table properties.
+- Remove `retention_days` table property. This property is not used by Hive.
+- Fix Parquet decoding of `MAP` containing a null value.
+- Add support for accessing ORC columns by name. By default, columns in ORC
+  files are accessed by their ordinal position in the Hive table definition.
+  To access columns based on the names recorded in the ORC file, set
+  `hive.orc.use-column-names=true` in your Hive catalog properties file.
diff --git a/docs/src/main/sphinx/release/release-0.137.rst b/docs/src/main/sphinx/release/release-0.137.rst
deleted file mode 100644
index 859a50d445ed..000000000000
--- a/docs/src/main/sphinx/release/release-0.137.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-=============
-Release 0.137
-=============
-
-General
--------
-
-* Fix ``current_date`` to return correct results for all time zones.
-* Fix invalid plans when scalar subqueries use ``GROUP BY``, ``DISTINCT`` or ``JOIN``.
-* Do not allow creating views with a column type of ``UNKNOWN``.
-* Improve expression optimizer to remove some redundant operations.
-* Add :func:`bit_count`, :func:`bitwise_not`, :func:`bitwise_and`,
-  :func:`bitwise_or`, and :func:`bitwise_xor` functions.
-* Add :func:`approx_distinct` aggregation support for ``VARBINARY`` input.
-* Add create time to query detail page in UI.
-* Add support for ``VARCHAR(length)`` type.
-* Track per-stage peak memory usage.
-* Allow using double input for :func:`approx_percentile` with an array of
-  percentiles.
-* Add API to JDBC driver to track query progress.
-
-Hive
-----
-
-* Do not allow inserting into tables when the Hive type does not match
-  the Presto type. Previously, Presto would insert data that did not
-  match the table or partition type and that data could not be read by
-  Hive. For example, Presto would write files containing ``BIGINT``
-  data for a Hive column type of ``INT``.
-* Add validation to :doc:`/sql/create-table` and :doc:`/sql/create-table-as`
-  to check that partition keys are the last columns in the table and in the same
-  order as the table properties.
-* Remove ``retention_days`` table property. This property is not used by Hive.
-* Fix Parquet decoding of ``MAP`` containing a null value.
-* Add support for accessing ORC columns by name. By default, columns in ORC
-  files are accessed by their ordinal position in the Hive table definition.
-  To access columns based on the names recorded in the ORC file, set
-  ``hive.orc.use-column-names=true`` in your Hive catalog properties file.
diff --git a/docs/src/main/sphinx/release/release-0.138.md b/docs/src/main/sphinx/release/release-0.138.md
new file mode 100644
index 000000000000..6735e7f943a8
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.138.md
@@ -0,0 +1,20 @@
+# Release 0.138
+
+## General
+
+- Fix planning bug with `NULL` literal coercions.
+- Reduce query startup time by reducing lock contention in scheduler.
+
+## New Hive Parquet reader
+
+We have added a new Parquet reader implementation. The new reader supports vectorized
+reads, lazy loading, and predicate push down, all of which make the reader more
+efficient and typically reduces wall clock time for a query. Although the new
+reader has been heavily tested, it is an extensive rewrite of the Apache Hive
+Parquet reader, and may have some latent issues, so it is not enabled by default.
+If you are using Parquet we suggest you test out the new reader on a per-query basis
+by setting the `<hive-catalog>.parquet_optimized_reader_enabled` session property,
+or you can enable the reader by default by setting the Hive catalog property
+`hive.parquet-optimized-reader.enabled=true`.  To enable Parquet predicate push down
+there is a separate session property `<hive-catalog>.parquet_predicate_pushdown_enabled`
+and configuration property `hive.parquet-predicate-pushdown.enabled=true`.
diff --git a/docs/src/main/sphinx/release/release-0.138.rst b/docs/src/main/sphinx/release/release-0.138.rst
deleted file mode 100644
index 1a14397e9747..000000000000
--- a/docs/src/main/sphinx/release/release-0.138.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-=============
-Release 0.138
-=============
-
-General
--------
-
-* Fix planning bug with ``NULL`` literal coercions.
-* Reduce query startup time by reducing lock contention in scheduler.
-
-New Hive Parquet reader
------------------------
-
-We have added a new Parquet reader implementation. The new reader supports vectorized
-reads, lazy loading, and predicate push down, all of which make the reader more
-efficient and typically reduces wall clock time for a query. Although the new
-reader has been heavily tested, it is an extensive rewrite of the Apache Hive
-Parquet reader, and may have some latent issues, so it is not enabled by default.
-If you are using Parquet we suggest you test out the new reader on a per-query basis
-by setting the ``<hive-catalog>.parquet_optimized_reader_enabled`` session property,
-or you can enable the reader by default by setting the Hive catalog property
-``hive.parquet-optimized-reader.enabled=true``.  To enable Parquet predicate push down
-there is a separate session property ``<hive-catalog>.parquet_predicate_pushdown_enabled``
-and configuration property ``hive.parquet-predicate-pushdown.enabled=true``.
diff --git a/docs/src/main/sphinx/release/release-0.139.md b/docs/src/main/sphinx/release/release-0.139.md
new file mode 100644
index 000000000000..f907d05a9e77
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.139.md
@@ -0,0 +1,24 @@
+# Release 0.139
+
+## Dynamic split concurrency
+
+The number of running leaf splits per query is now dynamically adjusted to improve
+overall cluster throughput. `task.initial-splits-per-node` can be used to set
+the initial number of splits, and `task.split-concurrency-adjustment-interval`
+can be used to change how frequently adjustments happen. The session properties
+`initial_splits_per_node` and `split_concurrency_adjustment_interval` can
+also be used.
+
+## General
+
+- Fix planning bug that causes some joins to not be redistributed when
+  `distributed-joins-enabled` is true.
+- Fix rare leak of stage objects and tasks for queries using `LIMIT`.
+- Add experimental `task.join-concurrency` config which can be used to increase
+  concurrency for the probe side of joins.
+
+## Hive
+
+- Remove cursor-based readers for ORC and DWRF file formats, as they have been
+  replaced by page-based readers.
+- Fix creating tables on S3 with {doc}`/sql/create-table-as`.
diff --git a/docs/src/main/sphinx/release/release-0.139.rst b/docs/src/main/sphinx/release/release-0.139.rst
deleted file mode 100644
index b57871e7804f..000000000000
--- a/docs/src/main/sphinx/release/release-0.139.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-=============
-Release 0.139
-=============
-
-Dynamic split concurrency
--------------------------
-
-The number of running leaf splits per query is now dynamically adjusted to improve
-overall cluster throughput. ``task.initial-splits-per-node`` can be used to set
-the initial number of splits, and ``task.split-concurrency-adjustment-interval``
-can be used to change how frequently adjustments happen. The session properties
-``initial_splits_per_node`` and ``split_concurrency_adjustment_interval`` can
-also be used.
-
-General
--------
-
-* Fix planning bug that causes some joins to not be redistributed when
-  ``distributed-joins-enabled`` is true.
-* Fix rare leak of stage objects and tasks for queries using ``LIMIT``.
-* Add experimental ``task.join-concurrency`` config which can be used to increase
-  concurrency for the probe side of joins.
-
-Hive
-----
-
-* Remove cursor-based readers for ORC and DWRF file formats, as they have been
-  replaced by page-based readers.
-* Fix creating tables on S3 with :doc:`/sql/create-table-as`.
diff --git a/docs/src/main/sphinx/release/release-0.140.md b/docs/src/main/sphinx/release/release-0.140.md
new file mode 100644
index 000000000000..8a64e24218a7
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.140.md
@@ -0,0 +1,37 @@
+# Release 0.140
+
+## General
+
+- Add the `TRY` function to handle specific data exceptions. See
+  {doc}`/functions/conditional`.
+- Optimize predicate expressions to minimize redundancies.
+- Add environment name to UI.
+- Fix logging of `failure_host` and `failure_task` fields in
+  `QueryCompletionEvent`.
+- Fix race which can cause queries to fail with a `REMOTE_TASK_ERROR`.
+- Optimize {func}`array_distinct` for `array(bigint)`.
+- Optimize `>` operator for {ref}`array-type`.
+- Fix an optimization issue that could result in non-deterministic functions
+  being evaluated more than once producing unexpected results.
+- Fix incorrect result for rare `IN` lists that contain certain combinations
+  of non-constant expressions that are null and non-null.
+- Improve performance of joins, aggregations, etc. by removing unnecessarily
+  duplicated columns.
+- Optimize `NOT IN` queries to produce more compact predicates.
+
+## Hive
+
+- Remove bogus "from deserializer" column comments.
+- Change categorization of Hive writer errors to be more specific.
+- Add date and timestamp support to new Parquet Reader
+
+## SPI
+
+- Remove partition key from `ColumnMetadata`.
+- Change return type of `ConnectorTableLayout.getDiscretePredicates()`.
+
+:::{note}
+This is a backwards incompatible change with the previous connector SPI.
+If you have written a connector, you will need to update your code
+before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.140.rst b/docs/src/main/sphinx/release/release-0.140.rst
deleted file mode 100644
index cb2f65c7f303..000000000000
--- a/docs/src/main/sphinx/release/release-0.140.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-=============
-Release 0.140
-=============
-
-General
--------
-
-* Add the ``TRY`` function to handle specific data exceptions. See
-  :doc:`/functions/conditional`.
-* Optimize predicate expressions to minimize redundancies.
-* Add environment name to UI.
-* Fix logging of ``failure_host`` and ``failure_task`` fields in
-  ``QueryCompletionEvent``.
-* Fix race which can cause queries to fail with a ``REMOTE_TASK_ERROR``.
-* Optimize :func:`array_distinct` for ``array(bigint)``.
-* Optimize ``>`` operator for :ref:`array_type`.
-* Fix an optimization issue that could result in non-deterministic functions
-  being evaluated more than once producing unexpected results.
-* Fix incorrect result for rare ``IN`` lists that contain certain combinations
-  of non-constant expressions that are null and non-null.
-* Improve performance of joins, aggregations, etc. by removing unnecessarily
-  duplicated columns.
-* Optimize ``NOT IN`` queries to produce more compact predicates.
-
-Hive
-----
-
-* Remove bogus "from deserializer" column comments.
-* Change categorization of Hive writer errors to be more specific.
-* Add date and timestamp support to new Parquet Reader
-
-SPI
----
-
-* Remove partition key from ``ColumnMetadata``.
-* Change return type of ``ConnectorTableLayout.getDiscretePredicates()``.
-
-.. note::
-    This is a backwards incompatible change with the previous connector SPI.
-    If you have written a connector, you will need to update your code
-    before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-0.141.md b/docs/src/main/sphinx/release/release-0.141.md
new file mode 100644
index 000000000000..02c7dc22d8b1
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.141.md
@@ -0,0 +1,5 @@
+# Release 0.141
+
+## General
+
+- Fix server returning an HTTP 500 response for queries with parse errors.
diff --git a/docs/src/main/sphinx/release/release-0.141.rst b/docs/src/main/sphinx/release/release-0.141.rst
deleted file mode 100644
index dc62e849d8aa..000000000000
--- a/docs/src/main/sphinx/release/release-0.141.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-=============
-Release 0.141
-=============
-
-General
--------
-
-* Fix server returning an HTTP 500 response for queries with parse errors.
diff --git a/docs/src/main/sphinx/release/release-0.142.md b/docs/src/main/sphinx/release/release-0.142.md
new file mode 100644
index 000000000000..b3b451e2e2a2
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.142.md
@@ -0,0 +1,28 @@
+# Release 0.142
+
+## General
+
+- Fix planning bug for `JOIN` criteria that optimizes to a `FALSE` expression.
+- Fix planning bug when the output of `UNION` doesn't match the table column order
+  in `INSERT` queries.
+- Fix error when `ORDER BY` clause in window specification refers to the same column multiple times.
+- Add support for {ref}`complex grouping operations<complex-grouping-operations>`
+  \- `CUBE`, `ROLLUP` and `GROUPING SETS`.
+- Add support for `IF NOT EXISTS` in `CREATE TABLE AS` queries.
+- Add {func}`substring` function.
+- Add `http.server.authentication.krb5.keytab` config option to set the location of the Kerberos
+  keytab file explicitly.
+- Add `optimize_metadata_queries` session property to enable the metadata-only query optimization.
+- Improve support for non-equality predicates in `JOIN` criteria.
+- Add support for non-correlated subqueries in aggregation queries.
+- Improve performance of {func}`json_extract`.
+
+## Hive
+
+- Change ORC input format to report actual bytes read as opposed to estimated bytes.
+- Fix cache invalidation when renaming tables.
+- Fix Parquet reader to handle uppercase column names.
+- Fix issue where the `hive.respect-table-format` config option was being ignored.
+- Add {doc}`hive.compression-codec </connector/hive>` config option to control
+  compression used when writing. The default is now `GZIP` for all formats.
+- Collect and expose end-to-end execution time JMX metric for requests to AWS services.
diff --git a/docs/src/main/sphinx/release/release-0.142.rst b/docs/src/main/sphinx/release/release-0.142.rst
deleted file mode 100644
index 0629cf8a30c3..000000000000
--- a/docs/src/main/sphinx/release/release-0.142.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-=============
-Release 0.142
-=============
-
-General
--------
-
-* Fix planning bug for ``JOIN`` criteria that optimizes to a ``FALSE`` expression.
-* Fix planning bug when the output of ``UNION`` doesn't match the table column order
-  in ``INSERT`` queries.
-* Fix error when ``ORDER BY`` clause in window specification refers to the same column multiple times.
-* Add support for :ref:`complex grouping operations<complex_grouping_operations>`
-  - ``CUBE``, ``ROLLUP`` and ``GROUPING SETS``.
-* Add support for ``IF NOT EXISTS`` in ``CREATE TABLE AS`` queries.
-* Add :func:`substring` function.
-* Add ``http.server.authentication.krb5.keytab`` config option to set the location of the Kerberos
-  keytab file explicitly.
-* Add ``optimize_metadata_queries`` session property to enable the metadata-only query optimization.
-* Improve support for non-equality predicates in ``JOIN`` criteria.
-* Add support for non-correlated subqueries in aggregation queries.
-* Improve performance of :func:`json_extract`.
-
-Hive
-----
-
-* Change ORC input format to report actual bytes read as opposed to estimated bytes.
-* Fix cache invalidation when renaming tables.
-* Fix Parquet reader to handle uppercase column names.
-* Fix issue where the ``hive.respect-table-format`` config option was being ignored.
-* Add :doc:`hive.compression-codec </connector/hive>` config option to control
-  compression used when writing. The default is now ``GZIP`` for all formats.
-* Collect and expose end-to-end execution time JMX metric for requests to AWS services.
diff --git a/docs/src/main/sphinx/release/release-0.143.md b/docs/src/main/sphinx/release/release-0.143.md
new file mode 100644
index 000000000000..47fa04a62c3b
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.143.md
@@ -0,0 +1,26 @@
+# Release 0.143
+
+## General
+
+- Fix race condition in output buffer that can cause a page to be lost.
+- Fix case-sensitivity issue when de-referencing row fields.
+- Fix bug in phased scheduler that could cause queries to block forever.
+- Fix {doc}`/sql/delete` for predicates that optimize to false.
+- Add support for scalar subqueries in {doc}`/sql/delete` queries.
+- Add config option `query.max-cpu-time` to limit CPU time used by a query.
+- Add loading indicator and error message to query detail page in UI.
+- Add query teardown to query timeline visualizer.
+- Add string padding functions {func}`lpad` and {func}`rpad`.
+- Add {func}`width_bucket` function.
+- Add {func}`truncate` function.
+- Improve query startup time in large clusters.
+- Improve error messages for `CAST` and {func}`slice`.
+
+## Hive
+
+- Fix native memory leak when reading or writing gzip compressed data.
+- Fix performance regression due to complex expressions not being applied
+  when pruning partitions.
+- Fix data corruption in {doc}`/sql/create-table-as` when
+  `hive.respect-table-format` config is set to false and user-specified
+  storage format does not match default.
diff --git a/docs/src/main/sphinx/release/release-0.143.rst b/docs/src/main/sphinx/release/release-0.143.rst
deleted file mode 100644
index dbfa688313c2..000000000000
--- a/docs/src/main/sphinx/release/release-0.143.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-=============
-Release 0.143
-=============
-
-General
--------
-
-* Fix race condition in output buffer that can cause a page to be lost.
-* Fix case-sensitivity issue when de-referencing row fields.
-* Fix bug in phased scheduler that could cause queries to block forever.
-* Fix :doc:`/sql/delete` for predicates that optimize to false.
-* Add support for scalar subqueries in :doc:`/sql/delete` queries.
-* Add config option ``query.max-cpu-time`` to limit CPU time used by a query.
-* Add loading indicator and error message to query detail page in UI.
-* Add query teardown to query timeline visualizer.
-* Add string padding functions :func:`lpad` and :func:`rpad`.
-* Add :func:`width_bucket` function.
-* Add :func:`truncate` function.
-* Improve query startup time in large clusters.
-* Improve error messages for ``CAST`` and :func:`slice`.
-
-Hive
-----
-
-* Fix native memory leak when reading or writing gzip compressed data.
-* Fix performance regression due to complex expressions not being applied
-  when pruning partitions.
-* Fix data corruption in :doc:`/sql/create-table-as` when
-  ``hive.respect-table-format`` config is set to false and user-specified
-  storage format does not match default.
diff --git a/docs/src/main/sphinx/release/release-0.144.1.md b/docs/src/main/sphinx/release/release-0.144.1.md
new file mode 100644
index 000000000000..c923621cc2bf
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.144.1.md
@@ -0,0 +1,5 @@
+# Release 0.144.1
+
+## Hive
+
+- Fix bug when grouping on a bucketed column which causes incorrect results.
diff --git a/docs/src/main/sphinx/release/release-0.144.1.rst b/docs/src/main/sphinx/release/release-0.144.1.rst
deleted file mode 100644
index 1e88c63b8234..000000000000
--- a/docs/src/main/sphinx/release/release-0.144.1.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-===============
-Release 0.144.1
-===============
-
-Hive
-----
-
-* Fix bug when grouping on a bucketed column which causes incorrect results.
diff --git a/docs/src/main/sphinx/release/release-0.144.2.md b/docs/src/main/sphinx/release/release-0.144.2.md
new file mode 100644
index 000000000000..d46011e886ba
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.144.2.md
@@ -0,0 +1,7 @@
+# Release 0.144.2
+
+## General
+
+- Fix potential memory leak in coordinator query history.
+- Add `driver.max-page-partitioning-buffer-size` config to control buffer size
+  used to repartition pages for exchanges.
diff --git a/docs/src/main/sphinx/release/release-0.144.2.rst b/docs/src/main/sphinx/release/release-0.144.2.rst
deleted file mode 100644
index 3dbff6f31deb..000000000000
--- a/docs/src/main/sphinx/release/release-0.144.2.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-===============
-Release 0.144.2
-===============
-
-General
--------
-
-* Fix potential memory leak in coordinator query history.
-* Add ``driver.max-page-partitioning-buffer-size`` config to control buffer size
-  used to repartition pages for exchanges.
diff --git a/docs/src/main/sphinx/release/release-0.144.3.md b/docs/src/main/sphinx/release/release-0.144.3.md
new file mode 100644
index 000000000000..f2c51615e8a6
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.144.3.md
@@ -0,0 +1,14 @@
+# Release 0.144.3
+
+## General
+
+- Fix bugs in planner where coercions were not taken into account when computing
+  types.
+- Fix compiler failure when `TRY` is a sub-expression.
+- Fix compiler failure when `TRY` is called on a constant or an input reference.
+- Fix race condition that can cause queries that process data from non-columnar data
+  sources to fail.
+
+## Hive
+
+- Fix reading symlinks when the target is in a different HDFS instance.
diff --git a/docs/src/main/sphinx/release/release-0.144.3.rst b/docs/src/main/sphinx/release/release-0.144.3.rst
deleted file mode 100644
index 0183c12d4317..000000000000
--- a/docs/src/main/sphinx/release/release-0.144.3.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-===============
-Release 0.144.3
-===============
-
-General
--------
-
-* Fix bugs in planner where coercions were not taken into account when computing
-  types.
-* Fix compiler failure when ``TRY`` is a sub-expression.
-* Fix compiler failure when ``TRY`` is called on a constant or an input reference.
-* Fix race condition that can cause queries that process data from non-columnar data
-  sources to fail.
-
-Hive
-----
-
-* Fix reading symlinks when the target is in a different HDFS instance.
diff --git a/docs/src/main/sphinx/release/release-0.144.4.md b/docs/src/main/sphinx/release/release-0.144.4.md
new file mode 100644
index 000000000000..37fd64089c53
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.144.4.md
@@ -0,0 +1,5 @@
+# Release 0.144.4
+
+## General
+
+- Fix incorrect results for grouping sets for some queries with filters.
diff --git a/docs/src/main/sphinx/release/release-0.144.4.rst b/docs/src/main/sphinx/release/release-0.144.4.rst
deleted file mode 100644
index 8adeb8953e8f..000000000000
--- a/docs/src/main/sphinx/release/release-0.144.4.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-===============
-Release 0.144.4
-===============
-
-General
--------
-
-* Fix incorrect results for grouping sets for some queries with filters.
diff --git a/docs/src/main/sphinx/release/release-0.144.5.md b/docs/src/main/sphinx/release/release-0.144.5.md
new file mode 100644
index 000000000000..68c33c29de53
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.144.5.md
@@ -0,0 +1,10 @@
+# Release 0.144.5
+
+## General
+
+- Fix window functions to correctly handle empty frames between unbounded and
+  bounded in the same direction. For example, a frame such as
+  `ROWS BETWEEN UNBOUNDED PRECEDING AND 2 PRECEDING`
+  would incorrectly use the first row as the window frame for the first two
+  rows rather than using an empty frame.
+- Fix correctness issue when grouping on columns that are also arguments to aggregation functions.
diff --git a/docs/src/main/sphinx/release/release-0.144.5.rst b/docs/src/main/sphinx/release/release-0.144.5.rst
deleted file mode 100644
index 86fa93a186c7..000000000000
--- a/docs/src/main/sphinx/release/release-0.144.5.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-===============
-Release 0.144.5
-===============
-
-General
--------
-
-* Fix window functions to correctly handle empty frames between unbounded and
-  bounded in the same direction. For example, a frame such as
-  ``ROWS BETWEEN UNBOUNDED PRECEDING AND 2 PRECEDING``
-  would incorrectly use the first row as the window frame for the first two
-  rows rather than using an empty frame.
-* Fix correctness issue when grouping on columns that are also arguments to aggregation functions.
diff --git a/docs/src/main/sphinx/release/release-0.144.6.md b/docs/src/main/sphinx/release/release-0.144.6.md
new file mode 100644
index 000000000000..bac0618fb7a8
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.144.6.md
@@ -0,0 +1,24 @@
+# Release 0.144.6
+
+## General
+
+This release fixes several problems with large and negative intervals.
+
+- Fix parsing of negative interval literals. Previously, the sign of each field was treated
+  independently instead of applying to the entire interval value. For example, the literal
+  `INTERVAL '-2-3' YEAR TO MONTH` was interpreted as a negative interval of `21` months
+  rather than `27` months (positive `3` months was added to negative `24` months).
+- Fix handling of `INTERVAL DAY TO SECOND` type in REST API. Previously, intervals greater than
+  `2,147,483,647` milliseconds (about `24` days) were returned as the wrong value.
+- Fix handling of `INTERVAL YEAR TO MONTH` type. Previously, intervals greater than
+  `2,147,483,647` months were returned as the wrong value from the REST API
+  and parsed incorrectly when specified as a literal.
+- Fix formatting of negative intervals in REST API. Previously, negative intervals
+  had a negative sign before each component and could not be parsed.
+- Fix formatting of negative intervals in JDBC `PrestoInterval` classes.
+
+:::{note}
+Older versions of the JDBC driver will misinterpret most negative
+intervals from new servers. Make sure to update the JDBC driver
+along with the server.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.144.6.rst b/docs/src/main/sphinx/release/release-0.144.6.rst
deleted file mode 100644
index 95c31f57c3d1..000000000000
--- a/docs/src/main/sphinx/release/release-0.144.6.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-===============
-Release 0.144.6
-===============
-
-General
--------
-
-This release fixes several problems with large and negative intervals.
-
-* Fix parsing of negative interval literals. Previously, the sign of each field was treated
-  independently instead of applying to the entire interval value. For example, the literal
-  ``INTERVAL '-2-3' YEAR TO MONTH`` was interpreted as a negative interval of ``21`` months
-  rather than ``27`` months (positive ``3`` months was added to negative ``24`` months).
-* Fix handling of ``INTERVAL DAY TO SECOND`` type in REST API. Previously, intervals greater than
-  ``2,147,483,647`` milliseconds (about ``24`` days) were returned as the wrong value.
-* Fix handling of ``INTERVAL YEAR TO MONTH`` type. Previously, intervals greater than
-  ``2,147,483,647`` months were returned as the wrong value from the REST API
-  and parsed incorrectly when specified as a literal.
-* Fix formatting of negative intervals in REST API. Previously, negative intervals
-  had a negative sign before each component and could not be parsed.
-* Fix formatting of negative intervals in JDBC ``PrestoInterval`` classes.
-
-.. note::
-
-    Older versions of the JDBC driver will misinterpret most negative
-    intervals from new servers. Make sure to update the JDBC driver
-    along with the server.
diff --git a/docs/src/main/sphinx/release/release-0.144.7.md b/docs/src/main/sphinx/release/release-0.144.7.md
new file mode 100644
index 000000000000..2fd4e5fb1682
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.144.7.md
@@ -0,0 +1,7 @@
+# Release 0.144.7
+
+## General
+
+- Fail queries with non-equi conjuncts in `OUTER JOIN`s, instead of silently
+  dropping such conjuncts from the query and producing incorrect results.
+- Add {func}`cosine_similarity` function.
diff --git a/docs/src/main/sphinx/release/release-0.144.7.rst b/docs/src/main/sphinx/release/release-0.144.7.rst
deleted file mode 100644
index 4c2c8e648b76..000000000000
--- a/docs/src/main/sphinx/release/release-0.144.7.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-===============
-Release 0.144.7
-===============
-
-General
--------
-
-* Fail queries with non-equi conjuncts in ``OUTER JOIN``\s, instead of silently
-  dropping such conjuncts from the query and producing incorrect results.
-* Add :func:`cosine_similarity` function.
diff --git a/docs/src/main/sphinx/release/release-0.144.md b/docs/src/main/sphinx/release/release-0.144.md
new file mode 100644
index 000000000000..9e3ca19a336a
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.144.md
@@ -0,0 +1,27 @@
+# Release 0.144
+
+:::{warning}
+Querying bucketed tables in the Hive connector may produce incorrect results.
+This is fixed in {doc}`/release/release-0.144.1`, and {doc}`/release/release-0.145`.
+:::
+
+## General
+
+- Fix already exists check when adding a column to be case-insensitive.
+- Fix correctness issue when complex grouping operations have a partitioned source.
+- Fix missing coercion when using `INSERT` with `NULL` literals.
+- Fix regression that the queries fail when aggregation functions present in `AT TIME ZONE`.
+- Fix potential memory starvation when a query is run with `resource_overcommit=true`.
+- Queries run with `resource_overcommit=true` may now be killed before
+  they reach `query.max-memory` if the cluster is low on memory.
+- Discard output stage JSON from completion event when it is very long.
+  This limit can be configured with `event.max-output-stage-size`.
+- Add support for {doc}`/sql/explain-analyze`.
+- Change `infoUri` field of `/v1/statement` to point to query HTML page instead of JSON.
+- Improve performance when processing results in CLI and JDBC driver.
+- Improve performance of `GROUP BY` queries.
+
+## Hive
+
+- Fix ORC reader to actually use `hive.orc.stream-buffer-size` configuration property.
+- Add support for creating and inserting into bucketed tables.
diff --git a/docs/src/main/sphinx/release/release-0.144.rst b/docs/src/main/sphinx/release/release-0.144.rst
deleted file mode 100644
index f947605d7b3e..000000000000
--- a/docs/src/main/sphinx/release/release-0.144.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-=============
-Release 0.144
-=============
-
-.. warning::
-
-   Querying bucketed tables in the Hive connector may produce incorrect results.
-   This is fixed in :doc:`/release/release-0.144.1`, and :doc:`/release/release-0.145`.
-
-General
--------
-
-* Fix already exists check when adding a column to be case-insensitive.
-* Fix correctness issue when complex grouping operations have a partitioned source.
-* Fix missing coercion when using ``INSERT`` with ``NULL`` literals.
-* Fix regression that the queries fail when aggregation functions present in ``AT TIME ZONE``.
-* Fix potential memory starvation when a query is run with ``resource_overcommit=true``.
-* Queries run with ``resource_overcommit=true`` may now be killed before
-  they reach ``query.max-memory`` if the cluster is low on memory.
-* Discard output stage JSON from completion event when it is very long.
-  This limit can be configured with ``event.max-output-stage-size``.
-* Add support for :doc:`/sql/explain-analyze`.
-* Change ``infoUri`` field of ``/v1/statement`` to point to query HTML page instead of JSON.
-* Improve performance when processing results in CLI and JDBC driver.
-* Improve performance of ``GROUP BY`` queries.
-
-Hive
-----
-
-* Fix ORC reader to actually use ``hive.orc.stream-buffer-size`` configuration property.
-* Add support for creating and inserting into bucketed tables.
diff --git a/docs/src/main/sphinx/release/release-0.145.md b/docs/src/main/sphinx/release/release-0.145.md
new file mode 100644
index 000000000000..caa5be422a01
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.145.md
@@ -0,0 +1,38 @@
+# Release 0.145
+
+## General
+
+- Fix potential memory leak in coordinator query history.
+- Fix column resolution issue when qualified name refers to a view.
+- Fail arithmetic operations on overflow.
+- Fix bugs in planner where coercions were not taken into account when computing
+  types.
+- Fix compiler failure when `TRY` is a sub-expression.
+- Fix compiler failure when `TRY` is called on a constant or an input reference.
+- Add support for the `integer` type to the Presto engine and the Hive,
+  Raptor, Redis, Kafka, Cassandra and example-http connectors.
+- Add initial support for the `decimal` data type.
+- Add `driver.max-page-partitioning-buffer-size` config to control buffer size
+  used to repartition pages for exchanges.
+- Improve performance for distributed JOIN and GROUP BY queries with billions
+  of groups.
+- Improve reliability in highly congested networks by adjusting the default
+  connection idle timeouts.
+
+## Verifier
+
+- Change verifier to only run read-only queries by default. This behavior can be
+  changed with the `control.query-types` and `test.query-types` config flags.
+
+## CLI
+
+- Improve performance of output in batch mode.
+- Fix hex rendering in batch mode.
+- Abort running queries when CLI is terminated.
+
+## Hive
+
+- Fix bug when grouping on a bucketed column which causes incorrect results.
+- Add `max_split_size` and `max_initial_split_size` session properties to control
+  the size of generated splits.
+- Add retries to the metastore security calls.
diff --git a/docs/src/main/sphinx/release/release-0.145.rst b/docs/src/main/sphinx/release/release-0.145.rst
deleted file mode 100644
index 87542c95b636..000000000000
--- a/docs/src/main/sphinx/release/release-0.145.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-=============
-Release 0.145
-=============
-
-General
--------
-
-* Fix potential memory leak in coordinator query history.
-* Fix column resolution issue when qualified name refers to a view.
-* Fail arithmetic operations on overflow.
-* Fix bugs in planner where coercions were not taken into account when computing
-  types.
-* Fix compiler failure when ``TRY`` is a sub-expression.
-* Fix compiler failure when ``TRY`` is called on a constant or an input reference.
-* Add support for the ``integer`` type to the Presto engine and the Hive,
-  Raptor, Redis, Kafka, Cassandra and example-http connectors.
-* Add initial support for the ``decimal`` data type.
-* Add ``driver.max-page-partitioning-buffer-size`` config to control buffer size
-  used to repartition pages for exchanges.
-* Improve performance for distributed JOIN and GROUP BY queries with billions
-  of groups.
-* Improve reliability in highly congested networks by adjusting the default
-  connection idle timeouts.
-
-Verifier
---------
-
-* Change verifier to only run read-only queries by default. This behavior can be
-  changed with the ``control.query-types`` and ``test.query-types`` config flags.
-
-CLI
----
-
-* Improve performance of output in batch mode.
-* Fix hex rendering in batch mode.
-* Abort running queries when CLI is terminated.
-
-Hive
-----
-
-* Fix bug when grouping on a bucketed column which causes incorrect results.
-* Add ``max_split_size`` and ``max_initial_split_size`` session properties to control
-  the size of generated splits.
-* Add retries to the metastore security calls.
diff --git a/docs/src/main/sphinx/release/release-0.146.md b/docs/src/main/sphinx/release/release-0.146.md
new file mode 100644
index 000000000000..7332e00e3ba5
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.146.md
@@ -0,0 +1,27 @@
+# Release 0.146
+
+## General
+
+- Fix error in {func}`map_concat` when the second map is empty.
+- Require at least 4096 file descriptors to run Presto.
+- Support casting between map types.
+- Add {doc}`/connector/mongodb`.
+
+## Hive
+
+- Fix incorrect skipping of data in Parquet during predicate push-down.
+- Fix reading of Parquet maps and lists containing nulls.
+- Fix reading empty ORC file with `hive.orc.use-column-names` enabled.
+- Fix writing to S3 when the staging directory is a symlink to a directory.
+- Legacy authorization properties, such as `hive.allow-drop-table`, are now
+  only enforced when `hive.security=none` is set, which is the default
+  security system. Specifically, the `sql-standard` authorization system
+  does not enforce these settings.
+
+## Black Hole
+
+- Add support for `varchar(n)`.
+
+## Cassandra
+
+- Add support for Cassandra 3.0.
diff --git a/docs/src/main/sphinx/release/release-0.146.rst b/docs/src/main/sphinx/release/release-0.146.rst
deleted file mode 100644
index 5bdd31e8291f..000000000000
--- a/docs/src/main/sphinx/release/release-0.146.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-=============
-Release 0.146
-=============
-
-General
--------
-
-* Fix error in :func:`map_concat` when the second map is empty.
-* Require at least 4096 file descriptors to run Presto.
-* Support casting between map types.
-* Add :doc:`/connector/mongodb`.
-
-Hive
-----
-
-* Fix incorrect skipping of data in Parquet during predicate push-down.
-* Fix reading of Parquet maps and lists containing nulls.
-* Fix reading empty ORC file with ``hive.orc.use-column-names`` enabled.
-* Fix writing to S3 when the staging directory is a symlink to a directory.
-* Legacy authorization properties, such as ``hive.allow-drop-table``, are now
-  only enforced when ``hive.security=none`` is set, which is the default
-  security system. Specifically, the ``sql-standard`` authorization system
-  does not enforce these settings.
-
-Black Hole
-----------
-
-* Add support for ``varchar(n)``.
-
-Cassandra
----------
-
-* Add support for Cassandra 3.0.
diff --git a/docs/src/main/sphinx/release/release-0.147.md b/docs/src/main/sphinx/release/release-0.147.md
new file mode 100644
index 000000000000..ed35f9d6c4b1
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.147.md
@@ -0,0 +1,56 @@
+# Release 0.147
+
+## General
+
+- Fix race condition that can cause queries that process data from non-columnar
+  data sources to fail.
+- Fix incorrect formatting of dates and timestamps before year 1680.
+- Fix handling of syntax errors when parsing `EXTRACT`.
+- Fix potential scheduling deadlock for connectors that expose node-partitioned data.
+- Fix performance regression that increased planning time.
+- Fix incorrect results for grouping sets for some queries with filters.
+- Add {doc}`/sql/show-create-view` and {doc}`/sql/show-create-table`.
+- Add support for column aliases in `WITH` clause.
+- Support `LIKE` clause for {doc}`/sql/show-catalogs` and {doc}`/sql/show-schemas`.
+- Add support for `INTERSECT`.
+- Add support for casting row types.
+- Add {func}`sequence` function.
+- Add {func}`sign` function.
+- Add {func}`flatten` function.
+- Add experimental implementation of {doc}`resource groups </admin/resource-groups>`.
+- Add {doc}`/connector/localfile`.
+- Remove experimental intermediate aggregation optimizer. The `optimizer.use-intermediate-aggregations`
+  config option and `task_intermediate_aggregation` session property are no longer supported.
+- Add support for colocated joins for connectors that expose node-partitioned data.
+- Improve the performance of {func}`array_intersect`.
+- Generalize the intra-node parallel execution system to work with all query stages.
+  The `task.concurrency` configuration property replaces the old `task.join-concurrency`
+  and `task.default-concurrency` options. Similarly, the `task_concurrency` session
+  property replaces the `task_join_concurrency`, `task_hash_build_concurrency`, and
+  `task_aggregation_concurrency` properties.
+
+## Hive
+
+- Fix reading symlinks when the target is in a different HDFS instance.
+- Fix `NoClassDefFoundError` for `SubnetUtils` in HDFS client.
+- Fix error when reading from Hive tables with inconsistent bucketing metadata.
+- Correctly report read bytes when reading Parquet data.
+- Include path in unrecoverable S3 exception messages.
+- When replacing an existing Presto view, update the view data
+  in the Hive metastore rather than dropping and recreating it.
+- Rename table property `clustered_by` to `bucketed_by`.
+- Add support for `varchar(n)`.
+
+## Kafka
+
+- Fix `error code 6` when reading data from Kafka.
+- Add support for `varchar(n)`.
+
+## Redis
+
+- Add support for `varchar(n)`.
+
+## MySQL and PostgreSQL
+
+- Cleanup temporary data when a `CREATE TABLE AS` fails.
+- Add support for `varchar(n)`.
diff --git a/docs/src/main/sphinx/release/release-0.147.rst b/docs/src/main/sphinx/release/release-0.147.rst
deleted file mode 100644
index 260c1a402cc7..000000000000
--- a/docs/src/main/sphinx/release/release-0.147.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-=============
-Release 0.147
-=============
-
-General
--------
-
-* Fix race condition that can cause queries that process data from non-columnar
-  data sources to fail.
-* Fix incorrect formatting of dates and timestamps before year 1680.
-* Fix handling of syntax errors when parsing ``EXTRACT``.
-* Fix potential scheduling deadlock for connectors that expose node-partitioned data.
-* Fix performance regression that increased planning time.
-* Fix incorrect results for grouping sets for some queries with filters.
-* Add :doc:`/sql/show-create-view` and :doc:`/sql/show-create-table`.
-* Add support for column aliases in ``WITH`` clause.
-* Support ``LIKE`` clause for :doc:`/sql/show-catalogs` and :doc:`/sql/show-schemas`.
-* Add support for ``INTERSECT``.
-* Add support for casting row types.
-* Add :func:`sequence` function.
-* Add :func:`sign` function.
-* Add :func:`flatten` function.
-* Add experimental implementation of :doc:`resource groups </admin/resource-groups>`.
-* Add :doc:`/connector/localfile`.
-* Remove experimental intermediate aggregation optimizer. The ``optimizer.use-intermediate-aggregations``
-  config option and ``task_intermediate_aggregation`` session property are no longer supported.
-* Add support for colocated joins for connectors that expose node-partitioned data.
-* Improve the performance of :func:`array_intersect`.
-* Generalize the intra-node parallel execution system to work with all query stages.
-  The ``task.concurrency`` configuration property replaces the old ``task.join-concurrency``
-  and ``task.default-concurrency`` options. Similarly, the ``task_concurrency`` session
-  property replaces the ``task_join_concurrency``, ``task_hash_build_concurrency``, and
-  ``task_aggregation_concurrency`` properties.
-
-Hive
-----
-
-* Fix reading symlinks when the target is in a different HDFS instance.
-* Fix ``NoClassDefFoundError`` for ``SubnetUtils`` in HDFS client.
-* Fix error when reading from Hive tables with inconsistent bucketing metadata.
-* Correctly report read bytes when reading Parquet data.
-* Include path in unrecoverable S3 exception messages.
-* When replacing an existing Presto view, update the view data
-  in the Hive metastore rather than dropping and recreating it.
-* Rename table property ``clustered_by`` to ``bucketed_by``.
-* Add support for ``varchar(n)``.
-
-Kafka
------
-
-* Fix ``error code 6`` when reading data from Kafka.
-* Add support for ``varchar(n)``.
-
-Redis
------
-
-* Add support for ``varchar(n)``.
-
-MySQL and PostgreSQL
---------------------
-
-* Cleanup temporary data when a ``CREATE TABLE AS`` fails.
-* Add support for ``varchar(n)``.
diff --git a/docs/src/main/sphinx/release/release-0.148.md b/docs/src/main/sphinx/release/release-0.148.md
new file mode 100644
index 000000000000..ebbc95b76fe5
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.148.md
@@ -0,0 +1,107 @@
+# Release 0.148
+
+## General
+
+- Fix issue where auto-commit transaction can be rolled back for a successfully
+  completed query.
+- Fix detection of colocated joins.
+- Fix planning bug involving partitioning with constants.
+- Fix window functions to correctly handle empty frames between unbounded and
+  bounded in the same direction. For example, a frame such as
+  `ROWS BETWEEN UNBOUNDED PRECEDING AND 2 PRECEDING`
+  would incorrectly use the first row as the window frame for the first two
+  rows rather than using an empty frame.
+- Fix correctness issue when grouping on columns that are also arguments to aggregation functions.
+- Fix failure when chaining `AT TIME ZONE`, e.g.
+  `SELECT TIMESTAMP '2016-01-02 12:34:56' AT TIME ZONE 'America/Los_Angeles' AT TIME ZONE 'UTC'`.
+- Fix data duplication when `task.writer-count` configuration mismatches between coordinator and worker.
+- Fix bug where `node-scheduler.max-pending-splits-per-node-per-task` config is not always
+  honored by node scheduler. This bug could stop the cluster from making further progress.
+- Fix incorrect results for grouping sets with partitioned source.
+- Add `colocated-joins-enabled` to enable colocated joins by default for
+  connectors that expose node-partitioned data.
+- Add support for colocated unions.
+- Reduce initial memory usage of {func}`array_agg` function.
+- Improve planning of co-partitioned `JOIN` and `UNION`.
+- Improve planning of aggregations over partitioned data.
+- Improve the performance of the {func}`array_sort` function.
+- Improve outer join predicate push down.
+- Increase default value for `query.initial-hash-partitions` to `100`.
+- Change default value of `query.max-memory-per-node` to `10%` of the Java heap.
+- Change default `task.max-worker-threads` to `2` times the number of cores.
+- Use HTTPS in JDBC driver when using port 443.
+- Warn if Presto server is not using G1 garbage collector.
+- Move interval types out of SPI.
+
+## Interval fixes
+
+This release fixes several problems with large and negative intervals.
+
+- Fix parsing of negative interval literals. Previously, the sign of each field was treated
+  independently instead of applying to the entire interval value. For example, the literal
+  `INTERVAL '-2-3' YEAR TO MONTH` was interpreted as a negative interval of `21` months
+  rather than `27` months (positive `3` months was added to negative `24` months).
+- Fix handling of `INTERVAL DAY TO SECOND` type in REST API. Previously, intervals greater than
+  `2,147,483,647` milliseconds (about `24` days) were returned as the wrong value.
+- Fix handling of `INTERVAL YEAR TO MONTH` type. Previously, intervals greater than
+  `2,147,483,647` months were returned as the wrong value from the REST API
+  and parsed incorrectly when specified as a literal.
+- Fix formatting of negative intervals in REST API. Previously, negative intervals
+  had a negative sign before each component and could not be parsed.
+- Fix formatting of negative intervals in JDBC `PrestoInterval` classes.
+
+:::{note}
+Older versions of the JDBC driver will misinterpret most negative
+intervals from new servers. Make sure to update the JDBC driver
+along with the server.
+:::
+
+## Functions and language features
+
+- Add {func}`element_at` function for map type.
+- Add {func}`split_to_map` function.
+- Add {func}`zip` function.
+- Add {func}`map_union` aggregation function.
+- Add `ROW` syntax for constructing row types.
+- Add support for `REVOKE` permission syntax.
+- Add support for `SMALLINT` and `TINYINT` types.
+- Add support for non-equi outer joins.
+
+## Verifier
+
+- Add `skip-cpu-check-regex` config property which can be used to skip the CPU
+  time comparison for queries that match the given regex.
+- Add `check-cpu` config property which can be used to disable CPU time comparison.
+
+## Hive
+
+- Fix `NoClassDefFoundError` for `KMSClientProvider` in HDFS client.
+- Fix creating tables on S3 in an empty database.
+- Implement `REVOKE` permission syntax.
+- Add support for `SMALLINT` and `TINYINT`
+- Support `DELETE` from unpartitioned tables.
+- Add support for Kerberos authentication when talking to Hive/HDFS.
+- Push down filters for columns of type `DECIMAL`.
+- Improve CPU efficiency when reading ORC files.
+
+## Cassandra
+
+- Allow configuring load balancing policy and no host available retry.
+- Add support for `varchar(n)`.
+
+## Kafka
+
+- Update to Kafka client 0.8.2.2. This enables support for LZ4 data.
+
+## JMX
+
+- Add `jmx.history` schema with in-memory periodic samples of values from JMX MBeans.
+
+## MySQL and PostgreSQL
+
+- Push down predicates for `VARCHAR`, `DATE`, `TIME` and `TIMESTAMP` types.
+
+## Other connectors
+
+- Add support for `varchar(n)` to the Redis, TPCH, MongoDB, Local File
+  and Example HTTP connectors.
diff --git a/docs/src/main/sphinx/release/release-0.148.rst b/docs/src/main/sphinx/release/release-0.148.rst
deleted file mode 100644
index 75ccc9f49319..000000000000
--- a/docs/src/main/sphinx/release/release-0.148.rst
+++ /dev/null
@@ -1,119 +0,0 @@
-=============
-Release 0.148
-=============
-
-General
--------
-* Fix issue where auto-commit transaction can be rolled back for a successfully
-  completed query.
-* Fix detection of colocated joins.
-* Fix planning bug involving partitioning with constants.
-* Fix window functions to correctly handle empty frames between unbounded and
-  bounded in the same direction. For example, a frame such as
-  ``ROWS BETWEEN UNBOUNDED PRECEDING AND 2 PRECEDING``
-  would incorrectly use the first row as the window frame for the first two
-  rows rather than using an empty frame.
-* Fix correctness issue when grouping on columns that are also arguments to aggregation functions.
-* Fix failure when chaining ``AT TIME ZONE``, e.g.
-  ``SELECT TIMESTAMP '2016-01-02 12:34:56' AT TIME ZONE 'America/Los_Angeles' AT TIME ZONE 'UTC'``.
-* Fix data duplication when ``task.writer-count`` configuration mismatches between coordinator and worker.
-* Fix bug where ``node-scheduler.max-pending-splits-per-node-per-task`` config is not always
-  honored by node scheduler. This bug could stop the cluster from making further progress.
-* Fix incorrect results for grouping sets with partitioned source.
-* Add ``colocated-joins-enabled`` to enable colocated joins by default for
-  connectors that expose node-partitioned data.
-* Add support for colocated unions.
-* Reduce initial memory usage of :func:`array_agg` function.
-* Improve planning of co-partitioned ``JOIN`` and ``UNION``.
-* Improve planning of aggregations over partitioned data.
-* Improve the performance of the :func:`array_sort` function.
-* Improve outer join predicate push down.
-* Increase default value for ``query.initial-hash-partitions`` to ``100``.
-* Change default value of ``query.max-memory-per-node`` to ``10%`` of the Java heap.
-* Change default ``task.max-worker-threads`` to ``2`` times the number of cores.
-* Use HTTPS in JDBC driver when using port 443.
-* Warn if Presto server is not using G1 garbage collector.
-* Move interval types out of SPI.
-
-Interval fixes
---------------
-
-This release fixes several problems with large and negative intervals.
-
-* Fix parsing of negative interval literals. Previously, the sign of each field was treated
-  independently instead of applying to the entire interval value. For example, the literal
-  ``INTERVAL '-2-3' YEAR TO MONTH`` was interpreted as a negative interval of ``21`` months
-  rather than ``27`` months (positive ``3`` months was added to negative ``24`` months).
-* Fix handling of ``INTERVAL DAY TO SECOND`` type in REST API. Previously, intervals greater than
-  ``2,147,483,647`` milliseconds (about ``24`` days) were returned as the wrong value.
-* Fix handling of ``INTERVAL YEAR TO MONTH`` type. Previously, intervals greater than
-  ``2,147,483,647`` months were returned as the wrong value from the REST API
-  and parsed incorrectly when specified as a literal.
-* Fix formatting of negative intervals in REST API. Previously, negative intervals
-  had a negative sign before each component and could not be parsed.
-* Fix formatting of negative intervals in JDBC ``PrestoInterval`` classes.
-
-.. note::
-
-    Older versions of the JDBC driver will misinterpret most negative
-    intervals from new servers. Make sure to update the JDBC driver
-    along with the server.
-
-Functions and language features
--------------------------------
-
-* Add :func:`element_at` function for map type.
-* Add :func:`split_to_map` function.
-* Add :func:`zip` function.
-* Add :func:`map_union` aggregation function.
-* Add ``ROW`` syntax for constructing row types.
-* Add support for ``REVOKE`` permission syntax.
-* Add support for ``SMALLINT`` and ``TINYINT`` types.
-* Add support for non-equi outer joins.
-
-Verifier
---------
-
-* Add ``skip-cpu-check-regex`` config property which can be used to skip the CPU
-  time comparison for queries that match the given regex.
-* Add ``check-cpu`` config property which can be used to disable CPU time comparison.
-
-Hive
-----
-
-* Fix ``NoClassDefFoundError`` for ``KMSClientProvider`` in HDFS client.
-* Fix creating tables on S3 in an empty database.
-* Implement ``REVOKE`` permission syntax.
-* Add support for ``SMALLINT`` and ``TINYINT``
-* Support ``DELETE`` from unpartitioned tables.
-* Add support for Kerberos authentication when talking to Hive/HDFS.
-* Push down filters for columns of type ``DECIMAL``.
-* Improve CPU efficiency when reading ORC files.
-
-Cassandra
----------
-
-* Allow configuring load balancing policy and no host available retry.
-* Add support for ``varchar(n)``.
-
-Kafka
------
-
-* Update to Kafka client 0.8.2.2. This enables support for LZ4 data.
-
-JMX
----
-
-* Add ``jmx.history`` schema with in-memory periodic samples of values from JMX MBeans.
-
-MySQL and PostgreSQL
---------------------
-
-* Push down predicates for ``VARCHAR``, ``DATE``, ``TIME`` and ``TIMESTAMP`` types.
-
-Other connectors
-----------------
-
-* Add support for ``varchar(n)`` to the Redis, TPCH, MongoDB, Local File
-  and Example HTTP connectors.
-
diff --git a/docs/src/main/sphinx/release/release-0.149.md b/docs/src/main/sphinx/release/release-0.149.md
new file mode 100644
index 000000000000..faf6c4ad7474
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.149.md
@@ -0,0 +1,39 @@
+# Release 0.149
+
+## General
+
+- Fix runtime failure for queries that use grouping sets over unions.
+- Do not ignore null values in {func}`array_agg`.
+- Fix failure when casting row values that contain null fields.
+- Fix failure when using complex types as map keys.
+- Fix potential memory tracking leak when queries are cancelled.
+- Fix rejection of queries that do not match any queue/resource group rules.
+  Previously, a 500 error was returned to the client.
+- Fix {func}`trim` and {func}`rtrim` functions to produce more intuitive results
+  when the argument contains invalid `UTF-8` sequences.
+- Add a new web interface with cluster overview, realtime stats, and improved sorting
+  and filtering of queries.
+- Add support for `FLOAT` type.
+- Rename `query.max-age` to `query.min-expire-age`.
+- `optimizer.columnar-processing` and `optimizer.columnar-processing-dictionary`
+  properties were merged to `optimizer.processing-optimization` with possible
+  values `disabled`, `columnar` and `columnar_dictionary`
+- `columnar_processing` and `columnar_processing_dictionary` session
+  properties were merged to `processing_optimization` with possible values
+  `disabled`, `columnar` and `columnar_dictionary`
+- Change `%y` (2-digit year) in {func}`date_parse` to evaluate to a year between
+  1970 and 2069 inclusive.
+- Add `queued` flag to `StatementStats` in REST API.
+- Improve error messages for math operations.
+- Improve memory tracking in exchanges to avoid running out of Java heap space.
+- Improve performance of subscript operator for the `MAP` type.
+- Improve performance of `JOIN` and `GROUP BY` queries.
+
+## Hive
+
+- Clean up empty staging directories after inserts.
+- Add `hive.dfs.ipc-ping-interval` config for HDFS.
+- Change default value of `hive.dfs-timeout` to 60 seconds.
+- Fix ORC/DWRF reader to avoid repeatedly fetching the same data when stripes
+  are skipped.
+- Fix force local scheduling for S3 or other non-HDFS file systems.
diff --git a/docs/src/main/sphinx/release/release-0.149.rst b/docs/src/main/sphinx/release/release-0.149.rst
deleted file mode 100644
index 8f9cadec4751..000000000000
--- a/docs/src/main/sphinx/release/release-0.149.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-=============
-Release 0.149
-=============
-
-General
--------
-
-* Fix runtime failure for queries that use grouping sets over unions.
-* Do not ignore null values in :func:`array_agg`.
-* Fix failure when casting row values that contain null fields.
-* Fix failure when using complex types as map keys.
-* Fix potential memory tracking leak when queries are cancelled.
-* Fix rejection of queries that do not match any queue/resource group rules.
-  Previously, a 500 error was returned to the client.
-* Fix :func:`trim` and :func:`rtrim` functions to produce more intuitive results
-  when the argument contains invalid ``UTF-8`` sequences.
-* Add a new web interface with cluster overview, realtime stats, and improved sorting
-  and filtering of queries.
-* Add support for ``FLOAT`` type.
-* Rename ``query.max-age`` to ``query.min-expire-age``.
-* ``optimizer.columnar-processing`` and ``optimizer.columnar-processing-dictionary``
-  properties were merged to ``optimizer.processing-optimization`` with possible
-  values ``disabled``, ``columnar`` and ``columnar_dictionary``
-* ``columnar_processing`` and ``columnar_processing_dictionary`` session
-  properties were merged to ``processing_optimization`` with possible values
-  ``disabled``, ``columnar`` and ``columnar_dictionary``
-* Change ``%y`` (2-digit year) in :func:`date_parse` to evaluate to a year between
-  1970 and 2069 inclusive.
-* Add ``queued`` flag to ``StatementStats`` in REST API.
-* Improve error messages for math operations.
-* Improve memory tracking in exchanges to avoid running out of Java heap space.
-* Improve performance of subscript operator for the ``MAP`` type.
-* Improve performance of ``JOIN`` and ``GROUP BY`` queries.
-
-Hive
-----
-
-* Clean up empty staging directories after inserts.
-* Add ``hive.dfs.ipc-ping-interval`` config for HDFS.
-* Change default value of ``hive.dfs-timeout`` to 60 seconds.
-* Fix ORC/DWRF reader to avoid repeatedly fetching the same data when stripes
-  are skipped.
-* Fix force local scheduling for S3 or other non-HDFS file systems.
diff --git a/docs/src/main/sphinx/release/release-0.150.md b/docs/src/main/sphinx/release/release-0.150.md
new file mode 100644
index 000000000000..5c03eedb0ae7
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.150.md
@@ -0,0 +1,20 @@
+# Release 0.150
+
+:::{warning}
+The Hive bucketing optimizations are broken in this release. You should
+disable them by adding `hive.bucket-execution=false` to your
+Hive catalog properties.
+:::
+
+## General
+
+- Fix web UI bug that caused rendering to fail when a stage has no tasks.
+- Fix failure due to ambiguity when calling {func}`round` on `tinyint` arguments.
+- Fix race in exchange HTTP endpoint, which could cause queries to fail randomly.
+- Add support for parsing timestamps with nanosecond precision in {func}`date_parse`.
+- Add CPU quotas to resource groups.
+
+## Hive
+
+- Add support for writing to bucketed tables.
+- Add execution optimizations for bucketed tables.
diff --git a/docs/src/main/sphinx/release/release-0.150.rst b/docs/src/main/sphinx/release/release-0.150.rst
deleted file mode 100644
index 42bf0ba3cb8d..000000000000
--- a/docs/src/main/sphinx/release/release-0.150.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-=============
-Release 0.150
-=============
-
-.. warning::
-
-    The Hive bucketing optimizations are broken in this release. You should
-    disable them by adding ``hive.bucket-execution=false`` to your
-    Hive catalog properties.
-
-General
--------
-
-* Fix web UI bug that caused rendering to fail when a stage has no tasks.
-* Fix failure due to ambiguity when calling :func:`round` on ``tinyint`` arguments.
-* Fix race in exchange HTTP endpoint, which could cause queries to fail randomly.
-* Add support for parsing timestamps with nanosecond precision in :func:`date_parse`.
-* Add CPU quotas to resource groups.
-
-Hive
-----
-
-* Add support for writing to bucketed tables.
-* Add execution optimizations for bucketed tables.
diff --git a/docs/src/main/sphinx/release/release-0.151.md b/docs/src/main/sphinx/release/release-0.151.md
new file mode 100644
index 000000000000..a2f4a56999b3
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.151.md
@@ -0,0 +1,30 @@
+# Release 0.151
+
+## General
+
+- Fix issue where aggregations may produce the wrong result when `task.concurrency` is set to `1`.
+- Fix query failure when `array`, `map`, or `row` type is used in non-equi `JOIN`.
+- Fix performance regression for queries using `OUTER JOIN`.
+- Fix query failure when using the {func}`arbitrary` aggregation function on `integer` type.
+- Add various math functions that operate directly on `float` type.
+- Add flag `deprecated.legacy-array-agg` to restore legacy {func}`array_agg`
+  behavior (ignore `NULL` input). This flag will be removed in a future release.
+- Add support for uncorrelated `EXISTS` clause.
+- Add {func}`cosine_similarity` function.
+- Allow Tableau web connector to use catalogs other than `hive`.
+
+## Verifier
+
+- Add `shadow-writes.enabled` option which can be used to transform `CREATE TABLE AS SELECT`
+  queries to write to a temporary table (rather than the originally specified table).
+
+## SPI
+
+- Remove `getDataSourceName` from `ConnectorSplitSource`.
+- Remove `dataSourceName` constructor parameter from `FixedSplitSource`.
+
+:::{note}
+This is a backwards incompatible change with the previous connector SPI.
+If you have written a connector, you will need to update your code
+before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.151.rst b/docs/src/main/sphinx/release/release-0.151.rst
deleted file mode 100644
index 338fab31988e..000000000000
--- a/docs/src/main/sphinx/release/release-0.151.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-=============
-Release 0.151
-=============
-
-General
--------
-
-* Fix issue where aggregations may produce the wrong result when ``task.concurrency`` is set to ``1``.
-* Fix query failure when ``array``, ``map``, or ``row`` type is used in non-equi ``JOIN``.
-* Fix performance regression for queries using ``OUTER JOIN``.
-* Fix query failure when using the :func:`arbitrary` aggregation function on ``integer`` type.
-* Add various math functions that operate directly on ``float`` type.
-* Add flag ``deprecated.legacy-array-agg`` to restore legacy :func:`array_agg`
-  behavior (ignore ``NULL`` input). This flag will be removed in a future release.
-* Add support for uncorrelated ``EXISTS`` clause.
-* Add :func:`cosine_similarity` function.
-* Allow Tableau web connector to use catalogs other than ``hive``.
-
-Verifier
---------
-
-* Add ``shadow-writes.enabled`` option which can be used to transform ``CREATE TABLE AS SELECT``
-  queries to write to a temporary table (rather than the originally specified table).
-
-SPI
----
-
-* Remove ``getDataSourceName`` from ``ConnectorSplitSource``.
-* Remove ``dataSourceName`` constructor parameter from ``FixedSplitSource``.
-
-.. note::
-    This is a backwards incompatible change with the previous connector SPI.
-    If you have written a connector, you will need to update your code
-    before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-0.152.1.md b/docs/src/main/sphinx/release/release-0.152.1.md
new file mode 100644
index 000000000000..d00c48b1e7aa
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.152.1.md
@@ -0,0 +1,6 @@
+# Release 0.152.1
+
+## General
+
+- Fix race which could cause failed queries to have no error details.
+- Fix race in HTTP layer which could cause queries to fail.
diff --git a/docs/src/main/sphinx/release/release-0.152.1.rst b/docs/src/main/sphinx/release/release-0.152.1.rst
deleted file mode 100644
index f83b05e9d0b5..000000000000
--- a/docs/src/main/sphinx/release/release-0.152.1.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-===============
-Release 0.152.1
-===============
-
-General
--------
-
-* Fix race which could cause failed queries to have no error details.
-* Fix race in HTTP layer which could cause queries to fail.
diff --git a/docs/src/main/sphinx/release/release-0.152.2.md b/docs/src/main/sphinx/release/release-0.152.2.md
new file mode 100644
index 000000000000..09aafbefeda6
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.152.2.md
@@ -0,0 +1,5 @@
+# Release 0.152.2
+
+## Hive
+
+- Improve performance of ORC reader when decoding dictionary encoded {ref}`map-type`.
diff --git a/docs/src/main/sphinx/release/release-0.152.2.rst b/docs/src/main/sphinx/release/release-0.152.2.rst
deleted file mode 100644
index 38fcaa0a97f2..000000000000
--- a/docs/src/main/sphinx/release/release-0.152.2.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-===============
-Release 0.152.2
-===============
-
-Hive
-----
-
-* Improve performance of ORC reader when decoding dictionary encoded :ref:`map_type`.
diff --git a/docs/src/main/sphinx/release/release-0.152.3.md b/docs/src/main/sphinx/release/release-0.152.3.md
new file mode 100644
index 000000000000..843b349fda62
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.152.3.md
@@ -0,0 +1,5 @@
+# Release 0.152.3
+
+## General
+
+- Fix incorrect results for grouping sets when `task.concurrency` is greater than one.
diff --git a/docs/src/main/sphinx/release/release-0.152.3.rst b/docs/src/main/sphinx/release/release-0.152.3.rst
deleted file mode 100644
index 3df83a679c2a..000000000000
--- a/docs/src/main/sphinx/release/release-0.152.3.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-===============
-Release 0.152.3
-===============
-
-General
--------
-
-* Fix incorrect results for grouping sets when ``task.concurrency`` is greater than one.
diff --git a/docs/src/main/sphinx/release/release-0.152.md b/docs/src/main/sphinx/release/release-0.152.md
new file mode 100644
index 000000000000..c50811203357
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.152.md
@@ -0,0 +1,76 @@
+# Release 0.152
+
+## General
+
+- Add {func}`array_union` function.
+- Add {func}`reverse` function for arrays.
+- Fix issue that could cause queries with `varchar` literals to fail.
+- Fix categorization of errors from {func}`url_decode`, allowing it to be used with `TRY`.
+- Fix error reporting for invalid JSON paths provided to JSON functions.
+- Fix view creation for queries containing `GROUPING SETS`.
+- Fix query failure when referencing a field of a `NULL` row.
+- Improve query performance for multiple consecutive window functions.
+- Prevent web UI from breaking when query fails without an error code.
+- Display port on the task list in the web UI when multiple workers share the same host.
+- Add support for `EXCEPT`.
+- Rename `FLOAT` type to `REAL` for better compatibility with the SQL standard.
+- Fix potential performance regression when transporting rows between nodes.
+
+## JDBC driver
+
+- Fix sizes returned from `DatabaseMetaData.getColumns()` for
+  `COLUMN_SIZE`, `DECIMAL_DIGITS`, `NUM_PREC_RADIX` and `CHAR_OCTET_LENGTH`.
+
+## Hive
+
+- Fix resource leak in Parquet reader.
+- Rename JMX stat `AllViews` to `GetAllViews` in `ThriftHiveMetastore`.
+- Add file based security, which can be configured with the `hive.security`
+  and `security.config-file` config properties. See {doc}`/connector/hive-security`
+  for more details.
+- Add support for custom S3 credentials providers using the
+  `presto.s3.credentials-provider` Hadoop configuration property.
+
+## MySQL
+
+- Fix reading MySQL `tinyint(1)` columns. Previously, these columns were
+  incorrectly returned as a boolean rather than an integer.
+- Add support for `INSERT`.
+- Add support for reading data as `tinyint` and `smallint` types rather than `integer`.
+
+## PostgreSQL
+
+- Add support for `INSERT`.
+- Add support for reading data as `tinyint` and `smallint` types rather than `integer`.
+
+## SPI
+
+- Remove `owner` from `ConnectorTableMetadata`.
+
+- Replace the  generic `getServices()` method in `Plugin` with specific
+  methods such as `getConnectorFactories()`, `getTypes()`, etc.
+  Dependencies like `TypeManager` are now provided directly rather
+  than being injected into `Plugin`.
+
+- Add first-class support for functions in the SPI. This replaces the old
+  `FunctionFactory` interface. Plugins can return a list of classes from the
+  `getFunctions()` method:
+
+  - Scalar functions are methods or classes annotated with `@ScalarFunction`.
+  - Aggregation functions are methods or classes annotated with `@AggregationFunction`.
+  - Window functions are an implementation of `WindowFunction`. Most implementations
+    should be a subclass of `RankingWindowFunction` or `ValueWindowFunction`.
+
+:::{note}
+This is a backwards incompatible change with the previous SPI.
+If you have written a plugin, you will need to update your code
+before deploying this release.
+:::
+
+## Verifier
+
+- Fix handling of shadow write queries with a `LIMIT`.
+
+## Local file
+
+- Fix file descriptor leak.
diff --git a/docs/src/main/sphinx/release/release-0.152.rst b/docs/src/main/sphinx/release/release-0.152.rst
deleted file mode 100644
index 322bb53c5666..000000000000
--- a/docs/src/main/sphinx/release/release-0.152.rst
+++ /dev/null
@@ -1,83 +0,0 @@
-=============
-Release 0.152
-=============
-
-General
--------
-
-* Add :func:`array_union` function.
-* Add :func:`reverse` function for arrays.
-* Fix issue that could cause queries with ``varchar`` literals to fail.
-* Fix categorization of errors from :func:`url_decode`, allowing it to be used with ``TRY``.
-* Fix error reporting for invalid JSON paths provided to JSON functions.
-* Fix view creation for queries containing ``GROUPING SETS``.
-* Fix query failure when referencing a field of a ``NULL`` row.
-* Improve query performance for multiple consecutive window functions.
-* Prevent web UI from breaking when query fails without an error code.
-* Display port on the task list in the web UI when multiple workers share the same host.
-* Add support for ``EXCEPT``.
-* Rename ``FLOAT`` type to ``REAL`` for better compatibility with the SQL standard.
-* Fix potential performance regression when transporting rows between nodes.
-
-JDBC driver
------------
-
-* Fix sizes returned from ``DatabaseMetaData.getColumns()`` for
-  ``COLUMN_SIZE``, ``DECIMAL_DIGITS``, ``NUM_PREC_RADIX`` and ``CHAR_OCTET_LENGTH``.
-
-Hive
-----
-
-* Fix resource leak in Parquet reader.
-* Rename JMX stat ``AllViews`` to ``GetAllViews`` in ``ThriftHiveMetastore``.
-* Add file based security, which can be configured with the ``hive.security``
-  and ``security.config-file`` config properties. See :doc:`/connector/hive-security`
-  for more details.
-* Add support for custom S3 credentials providers using the
-  ``presto.s3.credentials-provider`` Hadoop configuration property.
-
-MySQL
------
-
-* Fix reading MySQL ``tinyint(1)`` columns. Previously, these columns were
-  incorrectly returned as a boolean rather than an integer.
-* Add support for ``INSERT``.
-* Add support for reading data as ``tinyint`` and ``smallint`` types rather than ``integer``.
-
-PostgreSQL
-----------
-
-* Add support for ``INSERT``.
-* Add support for reading data as ``tinyint`` and ``smallint`` types rather than ``integer``.
-
-SPI
----
-
-* Remove ``owner`` from ``ConnectorTableMetadata``.
-* Replace the  generic ``getServices()`` method in ``Plugin`` with specific
-  methods such as ``getConnectorFactories()``, ``getTypes()``, etc.
-  Dependencies like ``TypeManager`` are now provided directly rather
-  than being injected into ``Plugin``.
-* Add first-class support for functions in the SPI. This replaces the old
-  ``FunctionFactory`` interface. Plugins can return a list of classes from the
-  ``getFunctions()`` method:
-
-  * Scalar functions are methods or classes annotated with ``@ScalarFunction``.
-  * Aggregation functions are methods or classes annotated with ``@AggregationFunction``.
-  * Window functions are an implementation of ``WindowFunction``. Most implementations
-    should be a subclass of ``RankingWindowFunction`` or ``ValueWindowFunction``.
-
-.. note::
-    This is a backwards incompatible change with the previous SPI.
-    If you have written a plugin, you will need to update your code
-    before deploying this release.
-
-Verifier
---------
-
-* Fix handling of shadow write queries with a ``LIMIT``.
-
-Local file
-----------
-
-* Fix file descriptor leak.
diff --git a/docs/src/main/sphinx/release/release-0.153.md b/docs/src/main/sphinx/release/release-0.153.md
new file mode 100644
index 000000000000..6491bf47c7c1
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.153.md
@@ -0,0 +1,151 @@
+# Release 0.153
+
+## General
+
+- Fix incorrect results for grouping sets when `task.concurrency` is greater than one.
+- Fix silent numeric overflow when casting `INTEGER` to large `DECIMAL` types.
+- Fix issue where `GROUP BY ()` would produce no results if the input had no rows.
+- Fix null handling in {func}`array_distinct` when applied to the `array(bigint)` type.
+- Fix handling of `-2^63` as the element index for {func}`json_array_get`.
+- Fix correctness issue when the input to `TRY_CAST` evaluates to null.
+  For types such as booleans, numbers, dates, timestamps, etc., rather than
+  returning null, a default value specific to the type such as
+  `false`, `0` or `1970-01-01` was returned.
+- Fix potential thread deadlock in coordinator.
+- Fix rare correctness issue with an aggregation on a single threaded right join when
+  `task.concurrency` is `1`.
+- Fix query failure when casting a map with null values.
+- Fix failure when view column names contain upper-case letters.
+- Fix potential performance regression due to skew issue when
+  grouping or joining on columns of the following types: `TINYINT`,
+  `SMALLINT`, `INTEGER`, `BIGINT`, `REAL`, `DOUBLE`,
+  `COLOR`, `DATE`, `INTERVAL`, `TIME`, `TIMESTAMP`.
+- Fix potential memory leak for delete queries.
+- Fix query stats to not include queued time in planning time.
+- Fix query completion event to log final stats for the query.
+- Fix spurious log messages when queries are torn down.
+- Remove broken `%w` specifier for {func}`date_format` and {func}`date_parse`.
+- Improve performance of {ref}`array-type` when underlying data is dictionary encoded.
+- Improve performance of outer joins with non-equality criteria.
+- Require task concurrency and task writer count to be a power of two.
+- Use nulls-last ordering for {func}`array_sort`.
+- Validate that `TRY` is used with exactly one argument.
+- Allow running Presto with early-access Java versions.
+- Add {doc}`/connector/accumulo`.
+
+## Functions and language features
+
+- Allow subqueries in non-equality outer join criteria.
+- Add support for {doc}`/sql/create-schema`, {doc}`/sql/drop-schema`
+  and {doc}`/sql/alter-schema`.
+- Add initial support for correlated subqueries.
+- Add execution support for prepared statements.
+- Add `DOUBLE PRECISION` as an alias for the `DOUBLE` type.
+- Add {func}`typeof` for discovering expression types.
+- Add decimal support to {func}`avg`, {func}`ceil`, {func}`floor`, {func}`round`,
+  {func}`truncate`, {func}`abs`, {func}`mod` and {func}`sign`.
+- Add {func}`shuffle` function for arrays.
+
+## Pluggable resource groups
+
+Resource group management is now pluggable. A `Plugin` can
+provide management factories via `getResourceGroupConfigurationManagerFactories()`
+and the factory can be enabled via the `etc/resource-groups.properties`
+configuration file by setting the `resource-groups.configuration-manager`
+property. See the `presto-resource-group-managers` plugin for an example
+and {doc}`/admin/resource-groups` for more details.
+
+## Web UI
+
+- Fix rendering failures due to null nested data structures.
+- Do not include coordinator in active worker count on cluster overview page.
+- Replace buffer skew indicators on query details page with scheduled time skew.
+- Add stage total buffer, pending tasks and wall time to stage statistics on query details page.
+- Add option to filter task lists by status on query details page.
+- Add copy button for query text, query ID, and user to query details page.
+
+## JDBC driver
+
+- Add support for `real` data type, which corresponds to the Java `float` type.
+
+## CLI
+
+- Add support for configuring the HTTPS Truststore.
+
+## Hive
+
+- Fix permissions for new tables when using SQL-standard authorization.
+- Improve performance of ORC reader when decoding dictionary encoded {ref}`map-type`.
+- Allow certain combinations of queries to be executed in a transaction-ish manner,
+  for example, when dropping a partition and then recreating it. Atomicity is not
+  guaranteed due to fundamental limitations in the design of Hive.
+- Support per-transaction cache for Hive metastore.
+- Fail queries that attempt to rename partition columns.
+- Add support for ORC bloom filters in predicate push down.
+  This is can be enabled using the `hive.orc.bloom-filters.enabled`
+  configuration property or the `orc_bloom_filters_enabled` session property.
+- Add new optimized RCFile reader.
+  This can be enabled using the `hive.rcfile-optimized-reader.enabled`
+  configuration property or the `rcfile_optimized_reader_enabled` session property.
+- Add support for the Presto `real` type, which corresponds to the Hive `float` type.
+- Add support for `char(x)` type.
+- Add support for creating, dropping and renaming schemas (databases).
+  The filesystem location can be specified when creating a schema,
+  which allows, for example, easily creating tables on S3.
+- Record Presto query ID for tables or partitions written by Presto
+  using the `presto_query_id` table or partition property.
+- Include path name in error message when listing a directory fails.
+- Rename `allow-all` authorization method to `legacy`. This
+  method is deprecated and will be removed in a future release.
+- Do not retry S3 requests that are aborted intentionally.
+- Set the user agent suffix for S3 requests to `presto`.
+- Allow configuring the user agent prefix for S3 requests
+  using the `hive.s3.user-agent-prefix` configuration property.
+- Add support for S3-compatible storage using the `hive.s3.endpoint`
+  and `hive.s3.signer-type` configuration properties.
+- Add support for using AWS KMS with S3 as an encryption materials provider
+  using the `hive.s3.kms-key-id` configuration property.
+- Allow configuring a custom S3 encryption materials provider using the
+  `hive.s3.encryption-materials-provider` configuration property.
+
+## JMX
+
+- Make name configuration for history tables case-insensitive.
+
+## MySQL
+
+- Optimize fetching column names when describing a single table.
+- Add support for `char(x)` and `real` data types.
+
+## PostgreSQL
+
+- Optimize fetching column names when describing a single table.
+- Add support for `char(x)` and `real` data types.
+- Add support for querying materialized views.
+
+## Blackhole
+
+- Add `page_processing_delay` table property.
+
+## SPI
+
+- Add `schemaExists()` method to `ConnectorMetadata`.
+- Add transaction to grant/revoke in `ConnectorAccessControl`.
+- Add `isCoordinator()` and `getVersion()` methods to `Node`.
+- Remove `setOptionalConfig()` method from `Plugin`.
+- Remove `ServerInfo` class.
+- Make `NodeManager` specific to a connector instance.
+- Replace `ConnectorFactoryContext` with `ConnectorContext`.
+- Use `@SqlNullable` for functions instead of `@Nullable`.
+- Prevent plugins from seeing classes that are not part of the JDK (bootstrap classes) or the SPI.
+- Update `presto-maven-plugin`, which provides a Maven packaging and
+  lifecycle for plugins, to validate that every SPI dependency is marked
+  as `provided` scope and that only SPI dependencies use `provided`
+  scope. This helps find potential dependency and class loader issues
+  at build time rather than at runtime.
+
+:::{note}
+These are backwards incompatible changes with the previous SPI.
+If you have written a plugin, you will need to update your code
+before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.153.rst b/docs/src/main/sphinx/release/release-0.153.rst
deleted file mode 100644
index a1c7530668ea..000000000000
--- a/docs/src/main/sphinx/release/release-0.153.rst
+++ /dev/null
@@ -1,164 +0,0 @@
-=============
-Release 0.153
-=============
-
-General
--------
-
-* Fix incorrect results for grouping sets when ``task.concurrency`` is greater than one.
-* Fix silent numeric overflow when casting ``INTEGER`` to large ``DECIMAL`` types.
-* Fix issue where ``GROUP BY ()`` would produce no results if the input had no rows.
-* Fix null handling in :func:`array_distinct` when applied to the ``array(bigint)`` type.
-* Fix handling of ``-2^63`` as the element index for :func:`json_array_get`.
-* Fix correctness issue when the input to ``TRY_CAST`` evaluates to null.
-  For types such as booleans, numbers, dates, timestamps, etc., rather than
-  returning null, a default value specific to the type such as
-  ``false``, ``0`` or ``1970-01-01`` was returned.
-* Fix potential thread deadlock in coordinator.
-* Fix rare correctness issue with an aggregation on a single threaded right join when
-  ``task.concurrency`` is ``1``.
-* Fix query failure when casting a map with null values.
-* Fix failure when view column names contain upper-case letters.
-* Fix potential performance regression due to skew issue when
-  grouping or joining on columns of the following types: ``TINYINT``,
-  ``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``DOUBLE``,
-  ``COLOR``, ``DATE``, ``INTERVAL``, ``TIME``, ``TIMESTAMP``.
-* Fix potential memory leak for delete queries.
-* Fix query stats to not include queued time in planning time.
-* Fix query completion event to log final stats for the query.
-* Fix spurious log messages when queries are torn down.
-* Remove broken ``%w`` specifier for :func:`date_format` and :func:`date_parse`.
-* Improve performance of :ref:`array_type` when underlying data is dictionary encoded.
-* Improve performance of outer joins with non-equality criteria.
-* Require task concurrency and task writer count to be a power of two.
-* Use nulls-last ordering for :func:`array_sort`.
-* Validate that ``TRY`` is used with exactly one argument.
-* Allow running Presto with early-access Java versions.
-* Add :doc:`/connector/accumulo`.
-
-Functions and language features
--------------------------------
-
-* Allow subqueries in non-equality outer join criteria.
-* Add support for :doc:`/sql/create-schema`, :doc:`/sql/drop-schema`
-  and :doc:`/sql/alter-schema`.
-* Add initial support for correlated subqueries.
-* Add execution support for prepared statements.
-* Add ``DOUBLE PRECISION`` as an alias for the ``DOUBLE`` type.
-* Add :func:`typeof` for discovering expression types.
-* Add decimal support to :func:`avg`, :func:`ceil`, :func:`floor`, :func:`round`,
-  :func:`truncate`, :func:`abs`, :func:`mod` and :func:`sign`.
-* Add :func:`shuffle` function for arrays.
-
-Pluggable resource groups
--------------------------
-
-Resource group management is now pluggable. A ``Plugin`` can
-provide management factories via ``getResourceGroupConfigurationManagerFactories()``
-and the factory can be enabled via the ``etc/resource-groups.properties``
-configuration file by setting the ``resource-groups.configuration-manager``
-property. See the ``presto-resource-group-managers`` plugin for an example
-and :doc:`/admin/resource-groups` for more details.
-
-Web UI
-------
-
-* Fix rendering failures due to null nested data structures.
-* Do not include coordinator in active worker count on cluster overview page.
-* Replace buffer skew indicators on query details page with scheduled time skew.
-* Add stage total buffer, pending tasks and wall time to stage statistics on query details page.
-* Add option to filter task lists by status on query details page.
-* Add copy button for query text, query ID, and user to query details page.
-
-JDBC driver
------------
-
-* Add support for ``real`` data type, which corresponds to the Java ``float`` type.
-
-CLI
----
-
-* Add support for configuring the HTTPS Truststore.
-
-Hive
-----
-
-* Fix permissions for new tables when using SQL-standard authorization.
-* Improve performance of ORC reader when decoding dictionary encoded :ref:`map_type`.
-* Allow certain combinations of queries to be executed in a transaction-ish manner,
-  for example, when dropping a partition and then recreating it. Atomicity is not
-  guaranteed due to fundamental limitations in the design of Hive.
-* Support per-transaction cache for Hive metastore.
-* Fail queries that attempt to rename partition columns.
-* Add support for ORC bloom filters in predicate push down.
-  This is can be enabled using the ``hive.orc.bloom-filters.enabled``
-  configuration property or the ``orc_bloom_filters_enabled`` session property.
-* Add new optimized RCFile reader.
-  This can be enabled using the ``hive.rcfile-optimized-reader.enabled``
-  configuration property or the ``rcfile_optimized_reader_enabled`` session property.
-* Add support for the Presto ``real`` type, which corresponds to the Hive ``float`` type.
-* Add support for ``char(x)`` type.
-* Add support for creating, dropping and renaming schemas (databases).
-  The filesystem location can be specified when creating a schema,
-  which allows, for example, easily creating tables on S3.
-* Record Presto query ID for tables or partitions written by Presto
-  using the ``presto_query_id`` table or partition property.
-* Include path name in error message when listing a directory fails.
-* Rename ``allow-all`` authorization method to ``legacy``. This
-  method is deprecated and will be removed in a future release.
-* Do not retry S3 requests that are aborted intentionally.
-* Set the user agent suffix for S3 requests to ``presto``.
-* Allow configuring the user agent prefix for S3 requests
-  using the ``hive.s3.user-agent-prefix`` configuration property.
-* Add support for S3-compatible storage using the ``hive.s3.endpoint``
-  and ``hive.s3.signer-type`` configuration properties.
-* Add support for using AWS KMS with S3 as an encryption materials provider
-  using the ``hive.s3.kms-key-id`` configuration property.
-* Allow configuring a custom S3 encryption materials provider using the
-  ``hive.s3.encryption-materials-provider`` configuration property.
-
-JMX
----
-
-* Make name configuration for history tables case-insensitive.
-
-MySQL
------
-
-* Optimize fetching column names when describing a single table.
-* Add support for ``char(x)`` and ``real`` data types.
-
-PostgreSQL
-----------
-
-* Optimize fetching column names when describing a single table.
-* Add support for ``char(x)`` and ``real`` data types.
-* Add support for querying materialized views.
-
-Blackhole
----------
-
-* Add ``page_processing_delay`` table property.
-
-SPI
----
-
-* Add ``schemaExists()`` method to ``ConnectorMetadata``.
-* Add transaction to grant/revoke in ``ConnectorAccessControl``.
-* Add ``isCoordinator()`` and ``getVersion()`` methods to ``Node``.
-* Remove ``setOptionalConfig()`` method from ``Plugin``.
-* Remove ``ServerInfo`` class.
-* Make ``NodeManager`` specific to a connector instance.
-* Replace ``ConnectorFactoryContext`` with ``ConnectorContext``.
-* Use ``@SqlNullable`` for functions instead of ``@Nullable``.
-* Prevent plugins from seeing classes that are not part of the JDK (bootstrap classes) or the SPI.
-* Update ``presto-maven-plugin``, which provides a Maven packaging and
-  lifecycle for plugins, to validate that every SPI dependency is marked
-  as ``provided`` scope and that only SPI dependencies use ``provided``
-  scope. This helps find potential dependency and class loader issues
-  at build time rather than at runtime.
-
-.. note::
-    These are backwards incompatible changes with the previous SPI.
-    If you have written a plugin, you will need to update your code
-    before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-0.154.md b/docs/src/main/sphinx/release/release-0.154.md
new file mode 100644
index 000000000000..3e4c66dbaefe
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.154.md
@@ -0,0 +1,26 @@
+# Release 0.154
+
+## General
+
+- Fix planning issue that could cause `JOIN` queries involving functions
+  that return null on non-null input to produce incorrect results.
+- Fix regression that would cause certain queries involving uncorrelated
+  subqueries in `IN` predicates to fail during planning.
+- Fix potential *"Input symbols do not match output symbols"*
+  error when writing to bucketed tables.
+- Fix potential *"Requested array size exceeds VM limit"* error
+  that triggers the JVM's `OutOfMemoryError` handling.
+- Improve performance of window functions with identical partitioning and
+  ordering but different frame specifications.
+- Add `code-cache-collection-threshold` config which controls when Presto
+  will attempt to force collection of the JVM code cache and reduce the
+  default threshold to `40%`.
+- Add support for using `LIKE` with {doc}`/sql/create-table`.
+- Add support for `DESCRIBE INPUT` to describe the requirements for
+  the input parameters to a prepared statement.
+
+## Hive
+
+- Fix handling of metastore cache TTL. With the introduction of the
+  per-transaction cache, the cache timeout was reset after each access,
+  which means cache entries might never expire.
diff --git a/docs/src/main/sphinx/release/release-0.154.rst b/docs/src/main/sphinx/release/release-0.154.rst
deleted file mode 100644
index cca8a712ae5c..000000000000
--- a/docs/src/main/sphinx/release/release-0.154.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-=============
-Release 0.154
-=============
-
-General
--------
-
-* Fix planning issue that could cause ``JOIN`` queries involving functions
-  that return null on non-null input to produce incorrect results.
-* Fix regression that would cause certain queries involving uncorrelated
-  subqueries in ``IN`` predicates to fail during planning.
-* Fix potential *"Input symbols do not match output symbols"*
-  error when writing to bucketed tables.
-* Fix potential *"Requested array size exceeds VM limit"* error
-  that triggers the JVM's ``OutOfMemoryError`` handling.
-* Improve performance of window functions with identical partitioning and
-  ordering but different frame specifications.
-* Add ``code-cache-collection-threshold`` config which controls when Presto
-  will attempt to force collection of the JVM code cache and reduce the
-  default threshold to ``40%``.
-* Add support for using ``LIKE`` with :doc:`/sql/create-table`.
-* Add support for ``DESCRIBE INPUT`` to describe the requirements for
-  the input parameters to a prepared statement.
-
-Hive
-----
-
-* Fix handling of metastore cache TTL. With the introduction of the
-  per-transaction cache, the cache timeout was reset after each access,
-  which means cache entries might never expire.
diff --git a/docs/src/main/sphinx/release/release-0.155.md b/docs/src/main/sphinx/release/release-0.155.md
new file mode 100644
index 000000000000..a83d81f9a7e5
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.155.md
@@ -0,0 +1,29 @@
+# Release 0.155
+
+## General
+
+- Fix incorrect results when queries contain multiple grouping sets that
+  resolve to the same set.
+- Fix incorrect results when using `map` with `IN` predicates.
+- Fix compile failure for outer joins that have a complex join criteria.
+- Fix error messages for failures during commit.
+- Fix memory accounting for simple aggregation, top N and distinct queries.
+  These queries may now report higher memory usage than before.
+- Reduce unnecessary memory usage of {func}`map_agg`, {func}`multimap_agg`
+  and {func}`map_union`.
+- Make `INCLUDING`, `EXCLUDING` and `PROPERTIES` non-reserved keywords.
+- Remove support for the experimental feature to compute approximate queries
+  based on sampled tables.
+- Properly account for time spent creating page source.
+- Various optimizations to reduce coordinator CPU usage.
+
+## Hive
+
+- Fix schema evolution support in new Parquet reader.
+- Fix `NoClassDefFoundError` when using Hadoop KMS.
+- Add support for Avro file format.
+- Always produce dictionary blocks for DWRF dictionary encoded streams.
+
+## SPI
+
+- Remove legacy connector API.
diff --git a/docs/src/main/sphinx/release/release-0.155.rst b/docs/src/main/sphinx/release/release-0.155.rst
deleted file mode 100644
index ec570df770a3..000000000000
--- a/docs/src/main/sphinx/release/release-0.155.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-=============
-Release 0.155
-=============
-
-General
--------
-
-* Fix incorrect results when queries contain multiple grouping sets that
-  resolve to the same set.
-* Fix incorrect results when using ``map`` with ``IN`` predicates.
-* Fix compile failure for outer joins that have a complex join criteria.
-* Fix error messages for failures during commit.
-* Fix memory accounting for simple aggregation, top N and distinct queries.
-  These queries may now report higher memory usage than before.
-* Reduce unnecessary memory usage of :func:`map_agg`, :func:`multimap_agg`
-  and :func:`map_union`.
-* Make ``INCLUDING``, ``EXCLUDING`` and ``PROPERTIES`` non-reserved keywords.
-* Remove support for the experimental feature to compute approximate queries
-  based on sampled tables.
-* Properly account for time spent creating page source.
-* Various optimizations to reduce coordinator CPU usage.
-
-Hive
-----
-
-* Fix schema evolution support in new Parquet reader.
-* Fix ``NoClassDefFoundError`` when using Hadoop KMS.
-* Add support for Avro file format.
-* Always produce dictionary blocks for DWRF dictionary encoded streams.
-
-SPI
----
-
-* Remove legacy connector API.
diff --git a/docs/src/main/sphinx/release/release-0.156.md b/docs/src/main/sphinx/release/release-0.156.md
new file mode 100644
index 000000000000..fb72abd392f1
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.156.md
@@ -0,0 +1,40 @@
+# Release 0.156
+
+:::{warning}
+Query may incorrectly produce `NULL` when no row qualifies for the aggregation
+if the `optimize_mixed_distinct_aggregations` session property or
+the `optimizer.optimize-mixed-distinct-aggregations` config option is enabled.
+:::
+
+## General
+
+- Fix potential correctness issue in queries that contain correlated scalar aggregation subqueries.
+- Fix query failure when using `AT TIME ZONE` in `VALUES` list.
+- Add support for quantified comparison predicates: `ALL`, `ANY`, and `SOME`.
+- Add support for {ref}`array-type` and {ref}`row-type` that contain `NULL`
+  in {func}`checksum` aggregation.
+- Add support for filtered aggregations. Example: `SELECT sum(a) FILTER (WHERE b > 0) FROM ...`
+- Add a variant of {func}`from_unixtime` function that takes a timezone argument.
+- Improve performance of `GROUP BY` queries that compute a mix of distinct
+  and non-distinct aggregations. This optimization can be turned on by setting
+  the `optimizer.optimize-mixed-distinct-aggregations` configuration option or
+  via the `optimize_mixed_distinct_aggregations` session property.
+- Change default task concurrency to 16.
+
+## Hive
+
+- Add support for legacy RCFile header version in new RCFile reader.
+
+## Redis
+
+- Support `iso8601` data format for the `hash` row decoder.
+
+## SPI
+
+- Make `ConnectorPageSink#finish()` asynchronous.
+
+:::{note}
+These are backwards incompatible changes with the previous SPI.
+If you have written a plugin, you will need to update your code
+before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.156.rst b/docs/src/main/sphinx/release/release-0.156.rst
deleted file mode 100644
index b169bbe527d6..000000000000
--- a/docs/src/main/sphinx/release/release-0.156.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-=============
-Release 0.156
-=============
-
-.. warning::
-
-    Query may incorrectly produce ``NULL`` when no row qualifies for the aggregation
-    if the ``optimize_mixed_distinct_aggregations`` session property or
-    the ``optimizer.optimize-mixed-distinct-aggregations`` config option is enabled.
-
-General
--------
-
-* Fix potential correctness issue in queries that contain correlated scalar aggregation subqueries.
-* Fix query failure when using ``AT TIME ZONE`` in ``VALUES`` list.
-* Add support for quantified comparison predicates: ``ALL``, ``ANY``, and ``SOME``.
-* Add support for :ref:`array_type` and :ref:`row_type` that contain ``NULL``
-  in :func:`checksum` aggregation.
-* Add support for filtered aggregations. Example: ``SELECT sum(a) FILTER (WHERE b > 0) FROM ...``
-* Add a variant of :func:`from_unixtime` function that takes a timezone argument.
-* Improve performance of ``GROUP BY`` queries that compute a mix of distinct
-  and non-distinct aggregations. This optimization can be turned on by setting
-  the ``optimizer.optimize-mixed-distinct-aggregations`` configuration option or
-  via the ``optimize_mixed_distinct_aggregations`` session property.
-* Change default task concurrency to 16.
-
-Hive
-----
-
-* Add support for legacy RCFile header version in new RCFile reader.
-
-Redis
------
-
-* Support ``iso8601`` data format for the ``hash`` row decoder.
-
-SPI
----
-
-* Make ``ConnectorPageSink#finish()`` asynchronous.
-
-.. note::
-    These are backwards incompatible changes with the previous SPI.
-    If you have written a plugin, you will need to update your code
-    before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-0.157.1.md b/docs/src/main/sphinx/release/release-0.157.1.md
new file mode 100644
index 000000000000..ee3055c114d1
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.157.1.md
@@ -0,0 +1,6 @@
+# Release 0.157.1
+
+## General
+
+- Fix regression that could cause high CPU and heap usage on coordinator,
+  when processing certain types of long running queries.
diff --git a/docs/src/main/sphinx/release/release-0.157.1.rst b/docs/src/main/sphinx/release/release-0.157.1.rst
deleted file mode 100644
index 2dd36e46a831..000000000000
--- a/docs/src/main/sphinx/release/release-0.157.1.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-===============
-Release 0.157.1
-===============
-
-General
--------
-
-* Fix regression that could cause high CPU and heap usage on coordinator,
-  when processing certain types of long running queries.
diff --git a/docs/src/main/sphinx/release/release-0.157.md b/docs/src/main/sphinx/release/release-0.157.md
new file mode 100644
index 000000000000..4da11201a7a9
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.157.md
@@ -0,0 +1,23 @@
+# Release 0.157
+
+## General
+
+- Fix regression that could cause queries containing scalar subqueries to fail
+  during planning.
+- Reduce CPU usage of coordinator in large, heavily loaded clusters.
+- Add support for `DESCRIBE OUTPUT`.
+- Add {func}`bitwise_and_agg` and {func}`bitwise_or_agg` aggregation functions.
+- Add JMX stats for the scheduler.
+- Add `query.min-schedule-split-batch-size` config flag to set the minimum number of
+  splits to consider for scheduling per batch.
+- Remove support for scheduling multiple tasks in the same stage on a single worker.
+- Rename `node-scheduler.max-pending-splits-per-node-per-stage` to
+  `node-scheduler.max-pending-splits-per-task`. The old name may still be used, but is
+  deprecated and will be removed in a future version.
+
+## Hive
+
+- Fail attempts to create tables that are bucketed on non-existent columns.
+- Improve error message when trying to query tables that are bucketed on non-existent columns.
+- Add support for processing partitions whose schema does not match the table schema.
+- Add support for creating external Hive tables using the `external_location` table property.
diff --git a/docs/src/main/sphinx/release/release-0.157.rst b/docs/src/main/sphinx/release/release-0.157.rst
deleted file mode 100644
index 9bb5d3f2d144..000000000000
--- a/docs/src/main/sphinx/release/release-0.157.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-=============
-Release 0.157
-=============
-
-General
--------
-
-* Fix regression that could cause queries containing scalar subqueries to fail
-  during planning.
-* Reduce CPU usage of coordinator in large, heavily loaded clusters.
-* Add support for ``DESCRIBE OUTPUT``.
-* Add :func:`bitwise_and_agg` and :func:`bitwise_or_agg` aggregation functions.
-* Add JMX stats for the scheduler.
-* Add ``query.min-schedule-split-batch-size`` config flag to set the minimum number of
-  splits to consider for scheduling per batch.
-* Remove support for scheduling multiple tasks in the same stage on a single worker.
-* Rename ``node-scheduler.max-pending-splits-per-node-per-stage`` to
-  ``node-scheduler.max-pending-splits-per-task``. The old name may still be used, but is
-  deprecated and will be removed in a future version.
-
-Hive
-----
-
-* Fail attempts to create tables that are bucketed on non-existent columns.
-* Improve error message when trying to query tables that are bucketed on non-existent columns.
-* Add support for processing partitions whose schema does not match the table schema.
-* Add support for creating external Hive tables using the ``external_location`` table property.
diff --git a/docs/src/main/sphinx/release/release-0.158.md b/docs/src/main/sphinx/release/release-0.158.md
new file mode 100644
index 000000000000..f209f05a0b9c
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.158.md
@@ -0,0 +1,31 @@
+# Release 0.158
+
+## General
+
+- Fix regression that could cause high CPU and heap usage on coordinator
+  when processing certain types of long running queries.
+- Fix incorrect pruning of output columns in `EXPLAIN ANALYZE`.
+- Fix ordering of `CHAR` values so that trailing spaces are ordered after control characters.
+- Fix query failures for connectors that produce non-remotely accessible splits.
+- Fix non-linear performance issue when parsing certain SQL expressions.
+- Fix case-sensitivity issues when operating on columns of `ROW` data type.
+- Fix failure when creating views for tables names that need quoting.
+- Return `NULL` from {func}`element_at` for out-of-range indices instead of failing.
+- Remove redundancies in query plans, which can reduce data transfers over the network and reduce CPU requirements.
+- Validate resource groups configuration file on startup to ensure that all
+  selectors reference a configured resource group.
+- Add experimental on-disk merge sort for aggregations. This can be enabled with
+  the `experimental.spill-enabled` configuration flag.
+- Push down predicates for `DECIMAL`, `TINYINT`, `SMALLINT` and `REAL` data types.
+
+## Hive
+
+- Add hidden `$bucket` column for bucketed tables that
+  contains the bucket number for the current row.
+- Prevent inserting into non-managed (i.e., external) tables.
+- Add configurable size limit to Hive metastore cache to avoid using too much
+  coordinator memory.
+
+## Cassandra
+
+- Allow starting the server even if a contact point hostname cannot be resolved.
diff --git a/docs/src/main/sphinx/release/release-0.158.rst b/docs/src/main/sphinx/release/release-0.158.rst
deleted file mode 100644
index 4ae0d0095d31..000000000000
--- a/docs/src/main/sphinx/release/release-0.158.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-=============
-Release 0.158
-=============
-
-General
--------
-
-* Fix regression that could cause high CPU and heap usage on coordinator
-  when processing certain types of long running queries.
-* Fix incorrect pruning of output columns in ``EXPLAIN ANALYZE``.
-* Fix ordering of ``CHAR`` values so that trailing spaces are ordered after control characters.
-* Fix query failures for connectors that produce non-remotely accessible splits.
-* Fix non-linear performance issue when parsing certain SQL expressions.
-* Fix case-sensitivity issues when operating on columns of ``ROW`` data type.
-* Fix failure when creating views for tables names that need quoting.
-* Return ``NULL`` from :func:`element_at` for out-of-range indices instead of failing.
-* Remove redundancies in query plans, which can reduce data transfers over the network and reduce CPU requirements.
-* Validate resource groups configuration file on startup to ensure that all
-  selectors reference a configured resource group.
-* Add experimental on-disk merge sort for aggregations. This can be enabled with
-  the ``experimental.spill-enabled`` configuration flag.
-* Push down predicates for ``DECIMAL``, ``TINYINT``, ``SMALLINT`` and ``REAL`` data types.
-
-Hive
-----
-
-* Add hidden ``$bucket`` column for bucketed tables that
-  contains the bucket number for the current row.
-* Prevent inserting into non-managed (i.e., external) tables.
-* Add configurable size limit to Hive metastore cache to avoid using too much
-  coordinator memory.
-
-Cassandra
----------
-
-* Allow starting the server even if a contact point hostname cannot be resolved.
diff --git a/docs/src/main/sphinx/release/release-0.159.md b/docs/src/main/sphinx/release/release-0.159.md
new file mode 100644
index 000000000000..d251c00145d0
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.159.md
@@ -0,0 +1,11 @@
+# Release 0.159
+
+## General
+
+- Improve predicate performance for `JOIN` queries.
+
+## Hive
+
+- Optimize filtering of partition names to reduce object creation.
+- Add limit on the number of partitions that can potentially be read per table scan.
+  This limit is configured using `hive.max-partitions-per-scan` and defaults to 100,000.
diff --git a/docs/src/main/sphinx/release/release-0.159.rst b/docs/src/main/sphinx/release/release-0.159.rst
deleted file mode 100644
index de58cae648aa..000000000000
--- a/docs/src/main/sphinx/release/release-0.159.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-=============
-Release 0.159
-=============
-
-General
--------
-
-* Improve predicate performance for ``JOIN`` queries.
-
-Hive
-----
-
-* Optimize filtering of partition names to reduce object creation.
-* Add limit on the number of partitions that can potentially be read per table scan.
-  This limit is configured using ``hive.max-partitions-per-scan`` and defaults to 100,000.
diff --git a/docs/src/main/sphinx/release/release-0.160.md b/docs/src/main/sphinx/release/release-0.160.md
new file mode 100644
index 000000000000..a3433e61665d
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.160.md
@@ -0,0 +1,18 @@
+# Release 0.160
+
+## General
+
+- Fix planning failure when query has multiple unions with identical underlying columns.
+- Fix planning failure when multiple `IN` predicates contain an identical subquery.
+- Fix resource waste where coordinator floods rebooted workers if worker
+  comes back before coordinator times out the query.
+- Add {doc}`/functions/lambda`.
+
+## Hive
+
+- Fix planning failure when inserting into columns of struct types with uppercase field names.
+- Fix resource leak when using Kerberos authentication with impersonation.
+- Fix creating external tables so that they are properly recognized by the Hive metastore.
+  The Hive table property `EXTERNAL` is now set to `TRUE` in addition to the setting
+  the table type. Any previously created tables need to be modified to have this property.
+- Add `bucket_execution_enabled` session property.
diff --git a/docs/src/main/sphinx/release/release-0.160.rst b/docs/src/main/sphinx/release/release-0.160.rst
deleted file mode 100644
index 5a09538947f6..000000000000
--- a/docs/src/main/sphinx/release/release-0.160.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-=============
-Release 0.160
-=============
-
-General
--------
-
-* Fix planning failure when query has multiple unions with identical underlying columns.
-* Fix planning failure when multiple ``IN`` predicates contain an identical subquery.
-* Fix resource waste where coordinator floods rebooted workers if worker
-  comes back before coordinator times out the query.
-* Add :doc:`/functions/lambda`.
-
-Hive
-----
-
-* Fix planning failure when inserting into columns of struct types with uppercase field names.
-* Fix resource leak when using Kerberos authentication with impersonation.
-* Fix creating external tables so that they are properly recognized by the Hive metastore.
-  The Hive table property ``EXTERNAL`` is now set to ``TRUE`` in addition to the setting
-  the table type. Any previously created tables need to be modified to have this property.
-* Add ``bucket_execution_enabled`` session property.
diff --git a/docs/src/main/sphinx/release/release-0.161.md b/docs/src/main/sphinx/release/release-0.161.md
new file mode 100644
index 000000000000..eb84aa598d75
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.161.md
@@ -0,0 +1,32 @@
+# Release 0.161
+
+## General
+
+- Fix correctness issue for queries involving multiple nested EXCEPT clauses.
+  A query such as `a EXCEPT (b EXCEPT c)` was incorrectly evaluated as
+  `a EXCEPT b EXCEPT c` and thus could return the wrong result.
+- Fix failure when executing prepared statements that contain parameters in the join criteria.
+- Fix failure when describing the output of prepared statements that contain aggregations.
+- Fix planning failure when a lambda is used in the context of an aggregation or subquery.
+- Fix column resolution rules for `ORDER BY` to match the behavior expected
+  by the SQL standard. This is a change in semantics that breaks
+  backwards compatibility. To ease migration of existing queries, the legacy
+  behavior can be restored by the `deprecated.legacy-order-by` config option
+  or the `legacy_order_by` session property.
+- Improve error message when coordinator responds with `403 FORBIDDEN`.
+- Improve performance for queries containing expressions in the join criteria
+  that reference columns on one side of the join.
+- Improve performance of {func}`map_concat` when one argument is empty.
+- Remove `/v1/execute` resource.
+- Add new column to {doc}`/sql/show-columns` (and {doc}`/sql/describe`)
+  to show extra information from connectors.
+- Add {func}`map` to construct an empty {ref}`map-type`.
+
+## Hive connector
+
+- Remove `"Partition Key: "` prefix from column comments and
+  replace it with the new extra information field described above.
+
+## JMX connector
+
+- Add support for escaped commas in `jmx.dump-tables` config property.
diff --git a/docs/src/main/sphinx/release/release-0.161.rst b/docs/src/main/sphinx/release/release-0.161.rst
deleted file mode 100644
index 4190d406e900..000000000000
--- a/docs/src/main/sphinx/release/release-0.161.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-=============
-Release 0.161
-=============
-
-General
--------
-
-* Fix correctness issue for queries involving multiple nested EXCEPT clauses.
-  A query such as ``a EXCEPT (b EXCEPT c)`` was incorrectly evaluated as
-  ``a EXCEPT b EXCEPT c`` and thus could return the wrong result.
-* Fix failure when executing prepared statements that contain parameters in the join criteria.
-* Fix failure when describing the output of prepared statements that contain aggregations.
-* Fix planning failure when a lambda is used in the context of an aggregation or subquery.
-* Fix column resolution rules for ``ORDER BY`` to match the behavior expected
-  by the SQL standard. This is a change in semantics that breaks
-  backwards compatibility. To ease migration of existing queries, the legacy
-  behavior can be restored by the ``deprecated.legacy-order-by`` config option
-  or the ``legacy_order_by`` session property.
-* Improve error message when coordinator responds with ``403 FORBIDDEN``.
-* Improve performance for queries containing expressions in the join criteria
-  that reference columns on one side of the join.
-* Improve performance of :func:`map_concat` when one argument is empty.
-* Remove ``/v1/execute`` resource.
-* Add new column to :doc:`/sql/show-columns` (and :doc:`/sql/describe`)
-  to show extra information from connectors.
-* Add :func:`map` to construct an empty :ref:`map_type`.
-
-Hive connector
---------------
-
-* Remove ``"Partition Key: "`` prefix from column comments and
-  replace it with the new extra information field described above.
-
-JMX connector
--------------
-
-* Add support for escaped commas in ``jmx.dump-tables`` config property.
diff --git a/docs/src/main/sphinx/release/release-0.162.md b/docs/src/main/sphinx/release/release-0.162.md
new file mode 100644
index 000000000000..b4a8be54a84f
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.162.md
@@ -0,0 +1,34 @@
+# Release 0.162
+
+:::{warning}
+The {func}`xxhash64` function introduced in this release will return a
+varbinary instead of a bigint in the next release.
+:::
+
+## General
+
+- Fix correctness issue when the type of the value in the `IN` predicate does
+  not match the type of the elements in the subquery.
+- Fix correctness issue when the value on the left-hand side of an `IN`
+  expression or a quantified comparison is `NULL`.
+- Fix correctness issue when the subquery of a quantified comparison produces no rows.
+- Fix correctness issue due to improper inlining of TRY arguments.
+- Fix correctness issue when the right side of a JOIN produces a very large number of rows.
+- Fix correctness issue for expressions with multiple nested `AND` and `OR` conditions.
+- Improve performance of window functions with similar `PARTITION BY` clauses.
+- Improve performance of certain multi-way JOINs by automatically choosing the
+  best evaluation order. This feature is turned off by default and can be enabled
+  via the `reorder-joins` config option or `reorder_joins` session property.
+- Add {func}`xxhash64` and {func}`to_big_endian_64` functions.
+- Add aggregated operator statistics to final query statistics.
+- Allow specifying column comments for {doc}`/sql/create-table`.
+
+## Hive
+
+- Fix performance regression when querying Hive tables with large numbers of partitions.
+
+## SPI
+
+- Connectors can now return optional output metadata for write operations.
+- Add ability for event listeners to get connector-specific output metadata.
+- Add client-supplied payload field `X-Presto-Client-Info` to `EventListener`.
diff --git a/docs/src/main/sphinx/release/release-0.162.rst b/docs/src/main/sphinx/release/release-0.162.rst
deleted file mode 100644
index 8d7aed713a35..000000000000
--- a/docs/src/main/sphinx/release/release-0.162.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-=============
-Release 0.162
-=============
-
-.. warning::
-
-    The :func:`xxhash64` function introduced in this release will return a
-    varbinary instead of a bigint in the next release.
-
-General
--------
-
-* Fix correctness issue when the type of the value in the ``IN`` predicate does
-  not match the type of the elements in the subquery.
-* Fix correctness issue when the value on the left-hand side of an ``IN``
-  expression or a quantified comparison is ``NULL``.
-* Fix correctness issue when the subquery of a quantified comparison produces no rows.
-* Fix correctness issue due to improper inlining of TRY arguments.
-* Fix correctness issue when the right side of a JOIN produces a very large number of rows.
-* Fix correctness issue for expressions with multiple nested ``AND`` and ``OR`` conditions.
-* Improve performance of window functions with similar ``PARTITION BY`` clauses.
-* Improve performance of certain multi-way JOINs by automatically choosing the
-  best evaluation order. This feature is turned off by default and can be enabled
-  via the ``reorder-joins`` config option or ``reorder_joins`` session property.
-* Add :func:`xxhash64` and :func:`to_big_endian_64` functions.
-* Add aggregated operator statistics to final query statistics.
-* Allow specifying column comments for :doc:`/sql/create-table`.
-
-Hive
-----
-
-* Fix performance regression when querying Hive tables with large numbers of partitions.
-
-SPI
----
-
-* Connectors can now return optional output metadata for write operations.
-* Add ability for event listeners to get connector-specific output metadata.
-* Add client-supplied payload field ``X-Presto-Client-Info`` to ``EventListener``.
diff --git a/docs/src/main/sphinx/release/release-0.163.md b/docs/src/main/sphinx/release/release-0.163.md
new file mode 100644
index 000000000000..3a66d5f55c5a
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.163.md
@@ -0,0 +1,36 @@
+# Release 0.163
+
+## General
+
+- Fix data corruption when transporting dictionary-encoded data.
+- Fix potential deadlock when resource groups are configured with memory limits.
+- Improve performance for `OUTER JOIN` queries.
+- Improve exchange performance by reading from buffers in parallel.
+- Improve performance when only a subset of the columns resulting from a `JOIN` are referenced.
+- Make `ALL`, `SOME` and `ANY` non-reserved keywords.
+- Add {func}`from_big_endian_64` function.
+- Change {func}`xxhash64` return type from `BIGINT` to `VARBINARY`.
+- Change subscript operator for map types to fail if the key is not present in the map. The former
+  behavior (returning `NULL`) can be restored by setting the `deprecated.legacy-map-subscript`
+  config option.
+- Improve `EXPLAIN ANALYZE` to render stats more accurately and to include input statistics.
+- Improve tolerance to communication errors for long running queries. This can be adjusted
+  with the `query.remote-task.max-error-duration` config option.
+
+## Accumulo
+
+- Fix issue that could cause incorrect results for large rows.
+
+## MongoDB
+
+- Fix NullPointerException when a field contains a null.
+
+## Cassandra
+
+- Add support for `VARBINARY`, `TIMESTAMP` and `REAL` data types.
+
+## Hive
+
+- Fix issue that would prevent predicates from being pushed into Parquet reader.
+- Fix Hive metastore user permissions caching when tables are dropped or renamed.
+- Add experimental file based metastore which stores information in HDFS or S3 instead of a database.
diff --git a/docs/src/main/sphinx/release/release-0.163.rst b/docs/src/main/sphinx/release/release-0.163.rst
deleted file mode 100644
index e207dabe28e9..000000000000
--- a/docs/src/main/sphinx/release/release-0.163.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-=============
-Release 0.163
-=============
-
-General
--------
-
-* Fix data corruption when transporting dictionary-encoded data.
-* Fix potential deadlock when resource groups are configured with memory limits.
-* Improve performance for ``OUTER JOIN`` queries.
-* Improve exchange performance by reading from buffers in parallel.
-* Improve performance when only a subset of the columns resulting from a ``JOIN`` are referenced.
-* Make ``ALL``, ``SOME`` and ``ANY`` non-reserved keywords.
-* Add :func:`from_big_endian_64` function.
-* Change :func:`xxhash64` return type from ``BIGINT`` to ``VARBINARY``.
-* Change subscript operator for map types to fail if the key is not present in the map. The former
-  behavior (returning ``NULL``) can be restored by setting the ``deprecated.legacy-map-subscript``
-  config option.
-* Improve ``EXPLAIN ANALYZE`` to render stats more accurately and to include input statistics.
-* Improve tolerance to communication errors for long running queries. This can be adjusted
-  with the ``query.remote-task.max-error-duration`` config option.
-
-Accumulo
---------
-
-* Fix issue that could cause incorrect results for large rows.
-
-MongoDB
--------
-
-* Fix NullPointerException when a field contains a null.
-
-Cassandra
----------
-
-* Add support for ``VARBINARY``, ``TIMESTAMP`` and ``REAL`` data types.
-
-Hive
-----
-
-* Fix issue that would prevent predicates from being pushed into Parquet reader.
-* Fix Hive metastore user permissions caching when tables are dropped or renamed.
-* Add experimental file based metastore which stores information in HDFS or S3 instead of a database.
diff --git a/docs/src/main/sphinx/release/release-0.164.md b/docs/src/main/sphinx/release/release-0.164.md
new file mode 100644
index 000000000000..32c3fa6dc50c
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.164.md
@@ -0,0 +1,27 @@
+# Release 0.164
+
+## General
+
+- Fix correctness issue for queries that perform `DISTINCT` and `LIMIT` on the results of a `JOIN`.
+- Fix correctness issue when casting between maps where the key or value is the `REAL` type.
+- Fix correctness issue in {func}`min_by` and {func}`max_by` when nulls are present in the comparison column.
+- Fail queries when `FILTER` clause is specified for scalar functions.
+- Fix planning failure for certain correlated subqueries that contain aggregations.
+- Fix planning failure when arguments to selective aggregates are derived from other selective aggregates.
+- Fix boolean expression optimization bug that can cause long planning times, planning failures and coordinator instability.
+- Fix query failure when `TRY` or lambda expression with the exact same body is repeated in an expression.
+- Fix split source resource leak in coordinator that can occur when a query fails.
+- Improve {func}`array_join` performance.
+- Improve error message for map subscript operator when key is not present in the map.
+- Improve client error message for invalid session.
+- Add `VALIDATE` mode for {doc}`/sql/explain`.
+
+## Web UI
+
+- Add resource group to query detail page.
+
+## Hive
+
+- Fix handling of ORC files containing extremely large metadata.
+- Fix failure when creating views in file based metastore.
+- Improve performance for queries that read bucketed tables by optimizing scheduling.
diff --git a/docs/src/main/sphinx/release/release-0.164.rst b/docs/src/main/sphinx/release/release-0.164.rst
deleted file mode 100644
index 0d4144cb39b2..000000000000
--- a/docs/src/main/sphinx/release/release-0.164.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-=============
-Release 0.164
-=============
-
-General
--------
-
-* Fix correctness issue for queries that perform ``DISTINCT`` and ``LIMIT`` on the results of a ``JOIN``.
-* Fix correctness issue when casting between maps where the key or value is the ``REAL`` type.
-* Fix correctness issue in :func:`min_by` and :func:`max_by` when nulls are present in the comparison column.
-* Fail queries when ``FILTER`` clause is specified for scalar functions.
-* Fix planning failure for certain correlated subqueries that contain aggregations.
-* Fix planning failure when arguments to selective aggregates are derived from other selective aggregates.
-* Fix boolean expression optimization bug that can cause long planning times, planning failures and coordinator instability.
-* Fix query failure when ``TRY`` or lambda expression with the exact same body is repeated in an expression.
-* Fix split source resource leak in coordinator that can occur when a query fails.
-* Improve :func:`array_join` performance.
-* Improve error message for map subscript operator when key is not present in the map.
-* Improve client error message for invalid session.
-* Add ``VALIDATE`` mode for :doc:`/sql/explain`.
-
-Web UI
-------
-
-* Add resource group to query detail page.
-
-Hive
-----
-
-* Fix handling of ORC files containing extremely large metadata.
-* Fix failure when creating views in file based metastore.
-* Improve performance for queries that read bucketed tables by optimizing scheduling.
diff --git a/docs/src/main/sphinx/release/release-0.165.md b/docs/src/main/sphinx/release/release-0.165.md
new file mode 100644
index 000000000000..dd4f46ceee71
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.165.md
@@ -0,0 +1,18 @@
+# Release 0.165
+
+## General
+
+- Make `AT` a non-reserved keyword.
+- Improve performance of {func}`transform`.
+- Improve exchange performance by deserializing in parallel.
+- Add support for compressed exchanges. This can be enabled with the `exchange.compression-enabled`
+  config option.
+- Add input and hash collision statistics to {doc}`/sql/explain-analyze` output.
+
+## Hive
+
+- Add support for MAP and ARRAY types in optimized Parquet reader.
+
+## MySQL and PostgreSQL
+
+- Fix connection leak on workers.
diff --git a/docs/src/main/sphinx/release/release-0.165.rst b/docs/src/main/sphinx/release/release-0.165.rst
deleted file mode 100644
index 75b7791031e7..000000000000
--- a/docs/src/main/sphinx/release/release-0.165.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-=============
-Release 0.165
-=============
-
-General
--------
-
-* Make ``AT`` a non-reserved keyword.
-* Improve performance of :func:`transform`.
-* Improve exchange performance by deserializing in parallel.
-* Add support for compressed exchanges. This can be enabled with the ``exchange.compression-enabled``
-  config option.
-* Add input and hash collision statistics to :doc:`/sql/explain-analyze` output.
-
-Hive
-----
-
-* Add support for MAP and ARRAY types in optimized Parquet reader.
-
-MySQL and PostgreSQL
---------------------
-
-* Fix connection leak on workers.
diff --git a/docs/src/main/sphinx/release/release-0.166.md b/docs/src/main/sphinx/release/release-0.166.md
new file mode 100644
index 000000000000..3453e1df755a
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.166.md
@@ -0,0 +1,22 @@
+# Release 0.166
+
+## General
+
+- Fix failure due to implicit coercion issue in `IN` expressions for
+  certain combinations of data types (e.g., `double` and `decimal`).
+- Add `query.max-length` config flag to set the maximum length of a query.
+  The default maximum length is 1MB.
+- Improve performance of {func}`approx_percentile`.
+
+## Hive
+
+- Include original exception from metastore for `AlreadyExistsException` when adding partitions.
+- Add support for the Hive JSON file format (`org.apache.hive.hcatalog.data.JsonSerDe`).
+
+## Cassandra
+
+- Add configuration properties for speculative execution.
+
+## SPI
+
+- Add peak memory reservation to `SplitStatistics` in split completion events.
diff --git a/docs/src/main/sphinx/release/release-0.166.rst b/docs/src/main/sphinx/release/release-0.166.rst
deleted file mode 100644
index 794d3c77f954..000000000000
--- a/docs/src/main/sphinx/release/release-0.166.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-=============
-Release 0.166
-=============
-
-General
--------
-
-* Fix failure due to implicit coercion issue in ``IN`` expressions for
-  certain combinations of data types (e.g., ``double`` and ``decimal``).
-* Add ``query.max-length`` config flag to set the maximum length of a query.
-  The default maximum length is 1MB.
-* Improve performance of :func:`approx_percentile`.
-
-Hive
-----
-
-* Include original exception from metastore for ``AlreadyExistsException`` when adding partitions.
-* Add support for the Hive JSON file format (``org.apache.hive.hcatalog.data.JsonSerDe``).
-
-Cassandra
----------
-
-* Add configuration properties for speculative execution.
-
-SPI
----
-
-* Add peak memory reservation to ``SplitStatistics`` in split completion events.
diff --git a/docs/src/main/sphinx/release/release-0.167.md b/docs/src/main/sphinx/release/release-0.167.md
new file mode 100644
index 000000000000..479af9f2fc8d
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.167.md
@@ -0,0 +1,61 @@
+# Release 0.167
+
+## General
+
+- Fix planning failure when a window function depends on the output of another window function.
+- Fix planning failure for certain aggregation with both `DISTINCT` and `GROUP BY`.
+- Fix incorrect aggregation of operator summary statistics.
+- Fix a join issue that could cause joins that produce and filter many rows
+  to monopolize worker threads, even after the query has finished.
+- Expand plan predicate pushdown capabilities involving implicitly coerced types.
+- Short-circuit inner and right join when right side is empty.
+- Optimize constant patterns for `LIKE` predicates that use an escape character.
+- Validate escape sequences in `LIKE` predicates per the SQL standard.
+- Reduce memory usage of {func}`min_by` and {func}`max_by`.
+- Add {func}`transform_keys`, {func}`transform_values` and {func}`zip_with` lambda functions.
+- Add {func}`levenshtein_distance` function.
+- Add JMX stat for the elapsed time of the longest currently active split.
+- Add JMX stats for compiler caches.
+- Raise required Java version to 8u92.
+
+## Security
+
+- The `http.server.authentication.enabled` config option that previously enabled
+  Kerberos has been replaced with `http-server.authentication.type=KERBEROS`.
+- Add support for {doc}`/security/ldap` using username and password.
+- Add a read-only {doc}`/develop/system-access-control` named `read-only`.
+- Allow access controls to filter the results of listing catalogs, schemas and tables.
+- Add access control checks for {doc}`/sql/show-schemas` and {doc}`/sql/show-tables`.
+
+## Web UI
+
+- Add operator-level performance analysis.
+- Improve visibility of blocked and reserved query states.
+- Lots of minor improvements.
+
+## JDBC driver
+
+- Allow escaping in `DatabaseMetaData` patterns.
+
+## Hive
+
+- Fix write operations for `ViewFileSystem` by using a relative location.
+- Remove support for the `hive-cdh4` and `hive-hadoop1` connectors which
+  support CDH 4 and Hadoop 1.x, respectively.
+- Remove the `hive-cdh5` connector as an alias for `hive-hadoop2`.
+- Remove support for the legacy S3 block-based file system.
+- Add support for KMS-managed keys for S3 server-side encryption.
+
+## Cassandra
+
+- Add support for Cassandra 3.x by removing the deprecated Thrift interface used to
+  connect to Cassandra. The following config options are now defunct and must be removed:
+  `cassandra.thrift-port`, `cassandra.thrift-connection-factory-class`,
+  `cassandra.transport-factory-options` and `cassandra.partitioner`.
+
+## SPI
+
+- Add methods to `SystemAccessControl` and `ConnectorAccessControl` to
+  filter the list of catalogs, schemas and tables.
+- Add access control checks for {doc}`/sql/show-schemas` and {doc}`/sql/show-tables`.
+- Add `beginQuery` and `cleanupQuery` notifications to `ConnectorMetadata`.
diff --git a/docs/src/main/sphinx/release/release-0.167.rst b/docs/src/main/sphinx/release/release-0.167.rst
deleted file mode 100644
index 9752c43ff389..000000000000
--- a/docs/src/main/sphinx/release/release-0.167.rst
+++ /dev/null
@@ -1,70 +0,0 @@
-=============
-Release 0.167
-=============
-
-General
--------
-
-* Fix planning failure when a window function depends on the output of another window function.
-* Fix planning failure for certain aggregation with both ``DISTINCT`` and ``GROUP BY``.
-* Fix incorrect aggregation of operator summary statistics.
-* Fix a join issue that could cause joins that produce and filter many rows
-  to monopolize worker threads, even after the query has finished.
-* Expand plan predicate pushdown capabilities involving implicitly coerced types.
-* Short-circuit inner and right join when right side is empty.
-* Optimize constant patterns for ``LIKE`` predicates that use an escape character.
-* Validate escape sequences in ``LIKE`` predicates per the SQL standard.
-* Reduce memory usage of :func:`min_by` and :func:`max_by`.
-* Add :func:`transform_keys`, :func:`transform_values` and :func:`zip_with` lambda functions.
-* Add :func:`levenshtein_distance` function.
-* Add JMX stat for the elapsed time of the longest currently active split.
-* Add JMX stats for compiler caches.
-* Raise required Java version to 8u92.
-
-Security
---------
-
-* The ``http.server.authentication.enabled`` config option that previously enabled
-  Kerberos has been replaced with ``http-server.authentication.type=KERBEROS``.
-* Add support for :doc:`/security/ldap` using username and password.
-* Add a read-only :doc:`/develop/system-access-control` named ``read-only``.
-* Allow access controls to filter the results of listing catalogs, schemas and tables.
-* Add access control checks for :doc:`/sql/show-schemas` and :doc:`/sql/show-tables`.
-
-Web UI
-------
-
-* Add operator-level performance analysis.
-* Improve visibility of blocked and reserved query states.
-* Lots of minor improvements.
-
-JDBC driver
------------
-
-* Allow escaping in ``DatabaseMetaData`` patterns.
-
-Hive
-----
-
-* Fix write operations for ``ViewFileSystem`` by using a relative location.
-* Remove support for the ``hive-cdh4`` and ``hive-hadoop1`` connectors which
-  support CDH 4 and Hadoop 1.x, respectively.
-* Remove the ``hive-cdh5`` connector as an alias for ``hive-hadoop2``.
-* Remove support for the legacy S3 block-based file system.
-* Add support for KMS-managed keys for S3 server-side encryption.
-
-Cassandra
----------
-
-* Add support for Cassandra 3.x by removing the deprecated Thrift interface used to
-  connect to Cassandra. The following config options are now defunct and must be removed:
-  ``cassandra.thrift-port``, ``cassandra.thrift-connection-factory-class``,
-  ``cassandra.transport-factory-options`` and ``cassandra.partitioner``.
-
-SPI
----
-
-* Add methods to ``SystemAccessControl`` and ``ConnectorAccessControl`` to
-  filter the list of catalogs, schemas and tables.
-* Add access control checks for :doc:`/sql/show-schemas` and :doc:`/sql/show-tables`.
-* Add ``beginQuery`` and ``cleanupQuery`` notifications to ``ConnectorMetadata``.
diff --git a/docs/src/main/sphinx/release/release-0.168.md b/docs/src/main/sphinx/release/release-0.168.md
new file mode 100644
index 000000000000..8a199730d6c7
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.168.md
@@ -0,0 +1,53 @@
+# Release 0.168
+
+## General
+
+- Fix correctness issues for certain `JOIN` queries that require implicit coercions
+  for terms in the join criteria.
+- Fix invalid "No more locations already set" error.
+- Fix invalid "No more buffers already set" error.
+- Temporarily revert empty join short-circuit optimization due to issue with hanging queries.
+- Improve performance of `DECIMAL` type and operators.
+- Optimize window frame computation for empty frames.
+- {func}`json_extract` and {func}`json_extract_scalar` now support escaping double
+  quotes or backslashes using a backslash with a JSON path subscript. This changes
+  the semantics of any invocation using a backslash, as backslashes were previously
+  treated as normal characters.
+- Improve performance of {func}`filter` and {func}`map_filter` lambda functions.
+- Add {doc}`/connector/memory`.
+- Add {func}`arrays_overlap` and {func}`array_except` functions.
+- Allow concatenating more than two arrays with `concat()` or maps with {func}`map_concat`.
+- Add a time limit for the iterative optimizer. It can be adjusted via the `iterative_optimizer_timeout`
+  session property or `experimental.iterative-optimizer-timeout` configuration option.
+- `ROW` types are now orderable if all of the field types are orderable.
+  This allows using them in comparison expressions, `ORDER BY` and
+  functions that require orderable types (e.g., {func}`max`).
+
+## JDBC driver
+
+- Update `DatabaseMetaData` to reflect features that are now supported.
+- Update advertised JDBC version to 4.2, which part of Java 8.
+- Return correct driver and server versions rather than `1.0`.
+
+## Hive
+
+- Fix reading decimals for RCFile text format using non-optimized reader.
+- Fix bug which prevented the file based metastore from being used.
+- Enable optimized RCFile reader by default.
+- Common user errors are now correctly categorized.
+- Add new, experimental, RCFile writer optimized for Presto.  The new writer can be enabled with the
+  `rcfile_optimized_writer_enabled` session property or the `hive.rcfile-optimized-writer.enabled`
+  Hive catalog property.
+
+## Cassandra
+
+- Add predicate pushdown for clustering key.
+
+## MongoDB
+
+- Allow SSL connections using the `mongodb.ssl.enabled` config flag.
+
+## SPI
+
+- ConnectorIndex now returns `ConnectorPageSource` instead of `RecordSet`.  Existing connectors
+  that support index join can use the `RecordPageSource` to adapt to the new API.
diff --git a/docs/src/main/sphinx/release/release-0.168.rst b/docs/src/main/sphinx/release/release-0.168.rst
deleted file mode 100644
index 697d12b35725..000000000000
--- a/docs/src/main/sphinx/release/release-0.168.rst
+++ /dev/null
@@ -1,61 +0,0 @@
-=============
-Release 0.168
-=============
-
-General
--------
-
-* Fix correctness issues for certain ``JOIN`` queries that require implicit coercions
-  for terms in the join criteria.
-* Fix invalid "No more locations already set" error.
-* Fix invalid "No more buffers already set" error.
-* Temporarily revert empty join short-circuit optimization due to issue with hanging queries.
-* Improve performance of ``DECIMAL`` type and operators.
-* Optimize window frame computation for empty frames.
-* :func:`json_extract` and :func:`json_extract_scalar` now support escaping double
-  quotes or backslashes using a backslash with a JSON path subscript. This changes
-  the semantics of any invocation using a backslash, as backslashes were previously
-  treated as normal characters.
-* Improve performance of :func:`filter` and :func:`map_filter` lambda functions.
-* Add :doc:`/connector/memory`.
-* Add :func:`arrays_overlap` and :func:`array_except` functions.
-* Allow concatenating more than two arrays with ``concat()`` or maps with :func:`map_concat`.
-* Add a time limit for the iterative optimizer. It can be adjusted via the ``iterative_optimizer_timeout``
-  session property or ``experimental.iterative-optimizer-timeout`` configuration option.
-* ``ROW`` types are now orderable if all of the field types are orderable.
-  This allows using them in comparison expressions, ``ORDER BY`` and
-  functions that require orderable types (e.g., :func:`max`).
-
-JDBC driver
------------
-
-* Update ``DatabaseMetaData`` to reflect features that are now supported.
-* Update advertised JDBC version to 4.2, which part of Java 8.
-* Return correct driver and server versions rather than ``1.0``.
-
-Hive
-----
-
-* Fix reading decimals for RCFile text format using non-optimized reader.
-* Fix bug which prevented the file based metastore from being used.
-* Enable optimized RCFile reader by default.
-* Common user errors are now correctly categorized.
-* Add new, experimental, RCFile writer optimized for Presto.  The new writer can be enabled with the
-  ``rcfile_optimized_writer_enabled`` session property or the ``hive.rcfile-optimized-writer.enabled``
-  Hive catalog property.
-
-Cassandra
----------
-
-* Add predicate pushdown for clustering key.
-
-MongoDB
--------
-
-* Allow SSL connections using the ``mongodb.ssl.enabled`` config flag.
-
-SPI
----
-
-* ConnectorIndex now returns ``ConnectorPageSource`` instead of ``RecordSet``.  Existing connectors
-  that support index join can use the ``RecordPageSource`` to adapt to the new API.
diff --git a/docs/src/main/sphinx/release/release-0.169.md b/docs/src/main/sphinx/release/release-0.169.md
new file mode 100644
index 000000000000..03182f8a09cd
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.169.md
@@ -0,0 +1,21 @@
+# Release 0.169
+
+## General
+
+- Fix regression that could cause queries involving `JOIN` and certain language features
+  such as `current_date`, `current_time` or `extract` to fail during planning.
+- Limit the maximum allowed input size to {func}`levenshtein_distance`.
+- Improve performance of {func}`map_agg` and {func}`multimap_agg`.
+- Improve memory accounting when grouping on a single `BIGINT` column.
+
+## JDBC driver
+
+- Return correct class name for `ARRAY` type from `ResultSetMetaData.getColumnClassName()`.
+
+## CLI
+
+- Fix support for non-standard offset time zones (e.g., `GMT+01:00`).
+
+## Cassandra
+
+- Add custom error codes.
diff --git a/docs/src/main/sphinx/release/release-0.169.rst b/docs/src/main/sphinx/release/release-0.169.rst
deleted file mode 100644
index 32ea918f51d1..000000000000
--- a/docs/src/main/sphinx/release/release-0.169.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-=============
-Release 0.169
-=============
-
-General
--------
-
-* Fix regression that could cause queries involving ``JOIN`` and certain language features
-  such as ``current_date``, ``current_time`` or ``extract`` to fail during planning.
-* Limit the maximum allowed input size to :func:`levenshtein_distance`.
-* Improve performance of :func:`map_agg` and :func:`multimap_agg`.
-* Improve memory accounting when grouping on a single ``BIGINT`` column.
-
-JDBC driver
------------
-
-* Return correct class name for ``ARRAY`` type from ``ResultSetMetaData.getColumnClassName()``.
-
-CLI
----
-
-* Fix support for non-standard offset time zones (e.g., ``GMT+01:00``).
-
-Cassandra
----------
-
-* Add custom error codes.
diff --git a/docs/src/main/sphinx/release/release-0.170.md b/docs/src/main/sphinx/release/release-0.170.md
new file mode 100644
index 000000000000..17d8eeb99e2b
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.170.md
@@ -0,0 +1,38 @@
+# Release 0.170
+
+## General
+
+- Fix race condition that could cause queries to fail with `InterruptedException` in rare cases.
+- Fix a performance regression for `GROUP BY` queries over `UNION`.
+- Fix a performance regression that occurs when a significant number of exchange
+  sources produce no data during an exchange (e.g., in a skewed hash join).
+
+## Web UI
+
+- Fix broken rendering when catalog properties are set.
+- Fix rendering of live plan when query is queued.
+
+## JDBC driver
+
+- Add support for `DatabaseMetaData.getTypeInfo()`.
+
+## Hive
+
+- Improve decimal support for the Parquet reader.
+- Remove misleading "HDFS" string from error messages.
+
+## Cassandra
+
+- Fix an intermittent connection issue for Cassandra 2.1.
+- Remove support for selecting by partition key when the partition key is only partially specified.
+  The `cassandra.limit-for-partition-key-select` and `cassandra.fetch-size-for-partition-key-select`
+  config options are no longer supported.
+- Remove partition key cache to improve consistency and reduce load on the Cassandra cluster due to background cache refresh.
+- Reduce the number of connections opened to the Cassandra cluster. Now Presto opens a single connection from each node.
+- Use exponential backoff for retries when Cassandra hosts are down. The retry timeout can be controlled via the
+  `cassandra.no-host-available-retry-timeout` config option, which has a default value of `1m`.
+  The `cassandra.no-host-available-retry-count` config option is no longer supported.
+
+## Verifier
+
+- Add support for `INSERT` queries.
diff --git a/docs/src/main/sphinx/release/release-0.170.rst b/docs/src/main/sphinx/release/release-0.170.rst
deleted file mode 100644
index 5fea6f278df6..000000000000
--- a/docs/src/main/sphinx/release/release-0.170.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-=============
-Release 0.170
-=============
-
-General
--------
-
-* Fix race condition that could cause queries to fail with ``InterruptedException`` in rare cases.
-* Fix a performance regression for ``GROUP BY`` queries over ``UNION``.
-* Fix a performance regression that occurs when a significant number of exchange
-  sources produce no data during an exchange (e.g., in a skewed hash join).
-
-Web UI
-------
-
-* Fix broken rendering when catalog properties are set.
-* Fix rendering of live plan when query is queued.
-
-JDBC driver
------------
-
-* Add support for ``DatabaseMetaData.getTypeInfo()``.
-
-Hive
-----
-
-* Improve decimal support for the Parquet reader.
-* Remove misleading "HDFS" string from error messages.
-
-Cassandra
----------
-
-* Fix an intermittent connection issue for Cassandra 2.1.
-* Remove support for selecting by partition key when the partition key is only partially specified.
-  The ``cassandra.limit-for-partition-key-select`` and ``cassandra.fetch-size-for-partition-key-select``
-  config options are no longer supported.
-* Remove partition key cache to improve consistency and reduce load on the Cassandra cluster due to background cache refresh.
-* Reduce the number of connections opened to the Cassandra cluster. Now Presto opens a single connection from each node.
-* Use exponential backoff for retries when Cassandra hosts are down. The retry timeout can be controlled via the
-  ``cassandra.no-host-available-retry-timeout`` config option, which has a default value of ``1m``.
-  The ``cassandra.no-host-available-retry-count`` config option is no longer supported.
-
-Verifier
---------
-
-* Add support for ``INSERT`` queries.
diff --git a/docs/src/main/sphinx/release/release-0.171.md b/docs/src/main/sphinx/release/release-0.171.md
new file mode 100644
index 000000000000..36bd123a46b6
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.171.md
@@ -0,0 +1,24 @@
+# Release 0.171
+
+## General
+
+- Fix planning regression for queries that compute a mix of distinct and non-distinct aggregations.
+- Fix casting from certain complex types to `JSON` when source type contains `JSON` or `DECIMAL`.
+- Fix issue for data definition queries that prevented firing completion events or purging them from
+  the coordinator's memory.
+- Add support for capture in lambda expressions.
+- Add support for `ARRAY` and `ROW` type as the compared value in {func}`min_by` and {func}`max_by`.
+- Add support for `CHAR(n)` data type to common string functions.
+- Add {func}`codepoint`, {func}`skewness` and {func}`kurtosis` functions.
+- Improve validation of resource group configuration.
+- Fail queries when casting unsupported types to JSON; see {doc}`/functions/json` for supported types.
+
+## Web UI
+
+- Fix the threads UI (`/ui/thread`).
+
+## Hive
+
+- Fix issue where some files are not deleted on cancellation of `INSERT` or `CREATE` queries.
+- Allow writing to non-managed (external) Hive tables. This is disabled by default but can be
+  enabled via the `hive.non-managed-table-writes-enabled` configuration option.
diff --git a/docs/src/main/sphinx/release/release-0.171.rst b/docs/src/main/sphinx/release/release-0.171.rst
deleted file mode 100644
index ac97e78c48dc..000000000000
--- a/docs/src/main/sphinx/release/release-0.171.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-=============
-Release 0.171
-=============
-
-General
--------
-
-* Fix planning regression for queries that compute a mix of distinct and non-distinct aggregations.
-* Fix casting from certain complex types to ``JSON`` when source type contains ``JSON`` or ``DECIMAL``.
-* Fix issue for data definition queries that prevented firing completion events or purging them from
-  the coordinator's memory.
-* Add support for capture in lambda expressions.
-* Add support for ``ARRAY`` and ``ROW`` type as the compared value in :func:`min_by` and :func:`max_by`.
-* Add support for ``CHAR(n)`` data type to common string functions.
-* Add :func:`codepoint`, :func:`skewness` and :func:`kurtosis` functions.
-* Improve validation of resource group configuration.
-* Fail queries when casting unsupported types to JSON; see :doc:`/functions/json` for supported types.
-
-Web UI
-------
-
-* Fix the threads UI (``/ui/thread``).
-
-Hive
-----
-
-* Fix issue where some files are not deleted on cancellation of ``INSERT`` or ``CREATE`` queries.
-* Allow writing to non-managed (external) Hive tables. This is disabled by default but can be
-  enabled via the ``hive.non-managed-table-writes-enabled`` configuration option.
diff --git a/docs/src/main/sphinx/release/release-0.172.md b/docs/src/main/sphinx/release/release-0.172.md
new file mode 100644
index 000000000000..af85b147334b
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.172.md
@@ -0,0 +1,11 @@
+# Release 0.172
+
+## General
+
+- Fix correctness issue in `ORDER BY` queries due to improper implicit coercions.
+- Fix planning failure when `GROUP BY` queries contain lambda expressions.
+- Fix planning failure when left side of `IN` expression contains subqueries.
+- Fix incorrect permissions check for `SHOW TABLES`.
+- Fix planning failure when `JOIN` clause contains lambda expressions that reference columns or variables from the enclosing scope.
+- Reduce memory usage of {func}`map_agg` and {func}`map_union`.
+- Reduce memory usage of `GROUP BY` queries.
diff --git a/docs/src/main/sphinx/release/release-0.172.rst b/docs/src/main/sphinx/release/release-0.172.rst
deleted file mode 100644
index cb9c191886c5..000000000000
--- a/docs/src/main/sphinx/release/release-0.172.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-=============
-Release 0.172
-=============
-
-General
--------
-
-* Fix correctness issue in ``ORDER BY`` queries due to improper implicit coercions.
-* Fix planning failure when ``GROUP BY`` queries contain lambda expressions.
-* Fix planning failure when left side of ``IN`` expression contains subqueries.
-* Fix incorrect permissions check for ``SHOW TABLES``.
-* Fix planning failure when ``JOIN`` clause contains lambda expressions that reference columns or variables from the enclosing scope.
-* Reduce memory usage of :func:`map_agg` and :func:`map_union`.
-* Reduce memory usage of ``GROUP BY`` queries.
diff --git a/docs/src/main/sphinx/release/release-0.173.md b/docs/src/main/sphinx/release/release-0.173.md
new file mode 100644
index 000000000000..dda87247f993
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.173.md
@@ -0,0 +1,6 @@
+# Release 0.173
+
+## General
+
+- Fix issue where `FILTER` was ignored for {func}`count` with a constant argument.
+- Support table comments for {doc}`/sql/create-table` and {doc}`/sql/create-table-as`.
diff --git a/docs/src/main/sphinx/release/release-0.173.rst b/docs/src/main/sphinx/release/release-0.173.rst
deleted file mode 100644
index b5362cd6c697..000000000000
--- a/docs/src/main/sphinx/release/release-0.173.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-=============
-Release 0.173
-=============
-
-General
--------
-
-* Fix issue where ``FILTER`` was ignored for :func:`count` with a constant argument.
-* Support table comments for :doc:`/sql/create-table` and :doc:`/sql/create-table-as`.
diff --git a/docs/src/main/sphinx/release/release-0.174.md b/docs/src/main/sphinx/release/release-0.174.md
new file mode 100644
index 000000000000..914b3f1ffb9d
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.174.md
@@ -0,0 +1,38 @@
+# Release 0.174
+
+## General
+
+- Fix correctness issue for correlated subqueries containing a `LIMIT` clause.
+- Fix query failure when {func}`reduce` function is used with lambda expressions
+  containing {func}`array_sort`, {func}`shuffle`, {func}`reverse`, {func}`array_intersect`,
+  {func}`arrays_overlap`, {func}`concat` (for arrays) or {func}`map_concat`.
+- Fix a bug that causes underestimation of the amount of memory used by {func}`max_by`,
+  {func}`min_by`, {func}`max`, {func}`min`, and {func}`arbitrary` aggregations over
+  varchar/varbinary columns.
+- Fix a memory leak in the coordinator that causes long-running queries in highly loaded
+  clusters to consume unnecessary memory.
+- Improve performance of aggregate window functions.
+- Improve parallelism of queries involving `GROUPING SETS`, `CUBE` or `ROLLUP`.
+- Improve parallelism of `UNION` queries.
+- Filter and projection operations are now always processed columnar if possible, and Presto
+  will automatically take advantage of dictionary encodings where effective.
+  The `processing_optimization` session property and `optimizer.processing-optimization`
+  configuration option have been removed.
+- Add support for escaped unicode sequences in string literals.
+- Add {doc}`/sql/show-grants` and `information_schema.table_privileges` table.
+
+## Hive
+
+- Change default value of `hive.metastore-cache-ttl` and `hive.metastore-refresh-interval` to 0
+  to disable cross-transaction metadata caching.
+
+## Web UI
+
+- Fix ES6 compatibility issue with older browsers.
+- Display buffered bytes for every stage in the live plan UI.
+
+## SPI
+
+- Add support for retrieving table grants.
+- Rename SPI access control check from `checkCanShowTables` to `checkCanShowTablesMetadata`,
+  which is used for both {doc}`/sql/show-tables` and {doc}`/sql/show-grants`.
diff --git a/docs/src/main/sphinx/release/release-0.174.rst b/docs/src/main/sphinx/release/release-0.174.rst
deleted file mode 100644
index ea3f56e95e1b..000000000000
--- a/docs/src/main/sphinx/release/release-0.174.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-=============
-Release 0.174
-=============
-
-General
--------
-
-* Fix correctness issue for correlated subqueries containing a ``LIMIT`` clause.
-* Fix query failure when :func:`reduce` function is used with lambda expressions
-  containing :func:`array_sort`, :func:`shuffle`, :func:`reverse`, :func:`array_intersect`,
-  :func:`arrays_overlap`, :func:`concat` (for arrays) or :func:`map_concat`.
-* Fix a bug that causes underestimation of the amount of memory used by :func:`max_by`,
-  :func:`min_by`, :func:`max`, :func:`min`, and :func:`arbitrary` aggregations over
-  varchar/varbinary columns.
-* Fix a memory leak in the coordinator that causes long-running queries in highly loaded
-  clusters to consume unnecessary memory.
-* Improve performance of aggregate window functions.
-* Improve parallelism of queries involving ``GROUPING SETS``, ``CUBE`` or ``ROLLUP``.
-* Improve parallelism of ``UNION`` queries.
-* Filter and projection operations are now always processed columnar if possible, and Presto
-  will automatically take advantage of dictionary encodings where effective.
-  The ``processing_optimization`` session property and ``optimizer.processing-optimization``
-  configuration option have been removed.
-* Add support for escaped unicode sequences in string literals.
-* Add :doc:`/sql/show-grants` and ``information_schema.table_privileges`` table.
-
-Hive
-----
-
-* Change default value of ``hive.metastore-cache-ttl`` and ``hive.metastore-refresh-interval`` to 0
-  to disable cross-transaction metadata caching.
-
-Web UI
-------
-
-* Fix ES6 compatibility issue with older browsers.
-* Display buffered bytes for every stage in the live plan UI.
-
-SPI
----
-
-* Add support for retrieving table grants.
-* Rename SPI access control check from ``checkCanShowTables`` to ``checkCanShowTablesMetadata``,
-  which is used for both :doc:`/sql/show-tables` and :doc:`/sql/show-grants`.
diff --git a/docs/src/main/sphinx/release/release-0.175.md b/docs/src/main/sphinx/release/release-0.175.md
new file mode 100644
index 000000000000..c8ea7197ae85
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.175.md
@@ -0,0 +1,31 @@
+# Release 0.175
+
+## General
+
+- Fix *"position is not valid"* query execution failures.
+- Fix memory accounting bug that can potentially cause `OutOfMemoryError`.
+- Fix regression that could cause certain queries involving `UNION` and
+  `GROUP BY` or `JOIN` to fail during planning.
+- Fix planning failure for `GROUP BY` queries containing correlated
+  subqueries in the `SELECT` clause.
+- Fix execution failure for certain `DELETE` queries.
+- Reduce occurrences of *"Method code too large"* errors.
+- Reduce memory utilization for certain queries involving `ORDER BY`.
+- Improve performance of map subscript from O(n) to O(1) when the map is
+  produced by an eligible operation, including the map constructor and
+  Hive readers (except ORC and optimized Parquet). More read and write
+  operations will take advantage of this in future releases.
+- Add `enable_intermediate_aggregations` session property to enable the
+  use of intermediate aggregations within un-grouped aggregations.
+- Add support for `INTERVAL` data type to {func}`avg` and {func}`sum` aggregation functions.
+- Add support for `INT` as an alias for the `INTEGER` data type.
+- Add resource group information to query events.
+
+## Hive
+
+- Make table creation metastore operations idempotent, which allows
+  recovery when retrying timeouts or other errors.
+
+## MongoDB
+
+- Rename `mongodb.connection-per-host` config option to `mongodb.connections-per-host`.
diff --git a/docs/src/main/sphinx/release/release-0.175.rst b/docs/src/main/sphinx/release/release-0.175.rst
deleted file mode 100644
index 4352a4eca041..000000000000
--- a/docs/src/main/sphinx/release/release-0.175.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-=============
-Release 0.175
-=============
-
-General
--------
-
-* Fix *"position is not valid"* query execution failures.
-* Fix memory accounting bug that can potentially cause ``OutOfMemoryError``.
-* Fix regression that could cause certain queries involving ``UNION`` and
-  ``GROUP BY`` or ``JOIN`` to fail during planning.
-* Fix planning failure for ``GROUP BY`` queries containing correlated
-  subqueries in the ``SELECT`` clause.
-* Fix execution failure for certain ``DELETE`` queries.
-* Reduce occurrences of *"Method code too large"* errors.
-* Reduce memory utilization for certain queries involving ``ORDER BY``.
-* Improve performance of map subscript from O(n) to O(1) when the map is
-  produced by an eligible operation, including the map constructor and
-  Hive readers (except ORC and optimized Parquet). More read and write
-  operations will take advantage of this in future releases.
-* Add ``enable_intermediate_aggregations`` session property to enable the
-  use of intermediate aggregations within un-grouped aggregations.
-* Add support for ``INTERVAL`` data type to :func:`avg` and :func:`sum` aggregation functions.
-* Add support for ``INT`` as an alias for the ``INTEGER`` data type.
-* Add resource group information to query events.
-
-Hive
-----
-
-* Make table creation metastore operations idempotent, which allows
-  recovery when retrying timeouts or other errors.
-
-MongoDB
--------
-
-* Rename ``mongodb.connection-per-host`` config option to ``mongodb.connections-per-host``.
diff --git a/docs/src/main/sphinx/release/release-0.176.md b/docs/src/main/sphinx/release/release-0.176.md
new file mode 100644
index 000000000000..80b8c082a437
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.176.md
@@ -0,0 +1,23 @@
+# Release 0.176
+
+## General
+
+- Fix an issue where a query (and some of its tasks) continues to
+  consume CPU/memory on the coordinator and workers after the query fails.
+- Fix a regression that cause the GC overhead and pauses to increase significantly when processing maps.
+- Fix a memory tracking bug that causes the memory to be overestimated for `GROUP BY` queries on `bigint` columns.
+- Improve the performance of the {func}`transform_values` function.
+- Add support for casting from `JSON` to `REAL` type.
+- Add {func}`parse_duration` function.
+
+## MySQL
+
+- Disallow having a database in the `connection-url` config property.
+
+## Accumulo
+
+- Decrease planning time by fetching index metrics in parallel.
+
+## MongoDB
+
+- Allow predicate pushdown for ObjectID.
diff --git a/docs/src/main/sphinx/release/release-0.176.rst b/docs/src/main/sphinx/release/release-0.176.rst
deleted file mode 100644
index 877bd7f9cdba..000000000000
--- a/docs/src/main/sphinx/release/release-0.176.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-=============
-Release 0.176
-=============
-
-General
--------
-
-* Fix an issue where a query (and some of its tasks) continues to
-  consume CPU/memory on the coordinator and workers after the query fails.
-* Fix a regression that cause the GC overhead and pauses to increase significantly when processing maps.
-* Fix a memory tracking bug that causes the memory to be overestimated for ``GROUP BY`` queries on ``bigint`` columns.
-* Improve the performance of the :func:`transform_values` function.
-* Add support for casting from ``JSON`` to ``REAL`` type.
-* Add :func:`parse_duration` function.
-
-MySQL
------
-
-* Disallow having a database in the ``connection-url`` config property.
-
-Accumulo
---------
-
-* Decrease planning time by fetching index metrics in parallel.
-
-MongoDB
--------
-
-* Allow predicate pushdown for ObjectID.
diff --git a/docs/src/main/sphinx/release/release-0.177.md b/docs/src/main/sphinx/release/release-0.177.md
new file mode 100644
index 000000000000..2dcfa37c7458
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.177.md
@@ -0,0 +1,70 @@
+# Release 0.177
+
+:::{warning}
+Query may incorrectly produce `NULL` when no row qualifies for the aggregation
+if the `optimize_mixed_distinct_aggregations` session property or
+the `optimizer.optimize-mixed-distinct-aggregations` config option is enabled.
+This optimization was introduced in Presto version 0.156.
+:::
+
+## General
+
+- Fix correctness issue when performing range comparisons over columns of type `CHAR`.
+- Fix correctness issue due to mishandling of nulls and non-deterministic expressions in
+  inequality joins unless `fast_inequality_join` is disabled.
+- Fix excessive GC overhead caused by lambda expressions. There are still known GC issues
+  with captured lambda expressions. This will be fixed in a future release.
+- Check for duplicate columns in `CREATE TABLE` before asking the connector to create
+  the table. This improves the error message for most connectors and will prevent errors
+  for connectors that do not perform validation internally.
+- Add support for null values on the left-hand side of a semijoin (i.e., `IN` predicate
+  with subqueries).
+- Add `SHOW STATS` to display table and query statistics.
+- Improve implicit coercion support for functions involving lambda. Specifically, this makes
+  it easier to use the {func}`reduce` function.
+- Improve plans for queries involving `ORDER BY` and `LIMIT` by avoiding unnecessary
+  data exchanges.
+- Improve performance of queries containing window functions with identical `PARTITION BY`
+  and `ORDER BY` clauses.
+- Improve performance of certain queries involving `OUTER JOIN` and aggregations, or
+  containing certain forms of correlated subqueries. This optimization is experimental
+  and can be turned on via the `push_aggregation_through_join` session property or the
+  `optimizer.push-aggregation-through-join` config option.
+- Improve performance of certain queries involving joins and aggregations.  This optimization
+  is experimental and can be turned on via the `push_partial_aggregation_through_join`
+  session property.
+- Improve error message when a lambda expression has a different number of arguments than expected.
+- Improve error message when certain invalid `GROUP BY` expressions containing lambda expressions.
+
+## Hive
+
+- Fix handling of trailing spaces for the `CHAR` type when reading RCFile.
+- Allow inserts into tables that have more partitions than the partitions-per-scan limit.
+- Add support for exposing Hive table statistics to the engine. This option is experimental and
+  can be turned on via the `statistics_enabled` session property.
+- Ensure file name is always present for error messages about corrupt ORC files.
+
+## Cassandra
+
+- Remove caching of metadata in the Cassandra connector. Metadata caching makes Presto violate
+  the consistency defined by the Cassandra cluster. It's also unnecessary because the Cassandra
+  driver internally caches metadata. The `cassandra.max-schema-refresh-threads`,
+  `cassandra.schema-cache-ttl` and `cassandra.schema-refresh-interval` config options have
+  been removed.
+- Fix intermittent issue in the connection retry mechanism.
+
+## Web UI
+
+- Change cluster HUD realtime statistics to be aggregated across all running queries.
+- Change parallelism statistic on cluster HUD to be averaged per-worker.
+- Fix bug that always showed indeterminate progress bar in query list view.
+- Change running drivers statistic to exclude blocked drivers.
+- Change unit of CPU and scheduled time rate sparklines to seconds on query details page.
+- Change query details page refresh interval to three seconds.
+- Add uptime and connected status indicators to every page.
+
+## CLI
+
+- Add support for preprocessing commands.  When the `PRESTO_PREPROCESSOR` environment
+  variable is set, all commands are piped through the specified program before being sent to
+  the Presto server.
diff --git a/docs/src/main/sphinx/release/release-0.177.rst b/docs/src/main/sphinx/release/release-0.177.rst
deleted file mode 100644
index 434899030aa3..000000000000
--- a/docs/src/main/sphinx/release/release-0.177.rst
+++ /dev/null
@@ -1,77 +0,0 @@
-=============
-Release 0.177
-=============
-
-.. warning::
-
-    Query may incorrectly produce ``NULL`` when no row qualifies for the aggregation
-    if the ``optimize_mixed_distinct_aggregations`` session property or
-    the ``optimizer.optimize-mixed-distinct-aggregations`` config option is enabled.
-    This optimization was introduced in Presto version 0.156.
-
-General
--------
-
-* Fix correctness issue when performing range comparisons over columns of type ``CHAR``.
-* Fix correctness issue due to mishandling of nulls and non-deterministic expressions in
-  inequality joins unless ``fast_inequality_join`` is disabled.
-* Fix excessive GC overhead caused by lambda expressions. There are still known GC issues
-  with captured lambda expressions. This will be fixed in a future release.
-* Check for duplicate columns in ``CREATE TABLE`` before asking the connector to create
-  the table. This improves the error message for most connectors and will prevent errors
-  for connectors that do not perform validation internally.
-* Add support for null values on the left-hand side of a semijoin (i.e., ``IN`` predicate
-  with subqueries).
-* Add ``SHOW STATS`` to display table and query statistics.
-* Improve implicit coercion support for functions involving lambda. Specifically, this makes
-  it easier to use the :func:`reduce` function.
-* Improve plans for queries involving ``ORDER BY`` and ``LIMIT`` by avoiding unnecessary
-  data exchanges.
-* Improve performance of queries containing window functions with identical ``PARTITION BY``
-  and ``ORDER BY`` clauses.
-* Improve performance of certain queries involving ``OUTER JOIN`` and aggregations, or
-  containing certain forms of correlated subqueries. This optimization is experimental
-  and can be turned on via the ``push_aggregation_through_join`` session property or the
-  ``optimizer.push-aggregation-through-join`` config option.
-* Improve performance of certain queries involving joins and aggregations.  This optimization
-  is experimental and can be turned on via the ``push_partial_aggregation_through_join``
-  session property.
-* Improve error message when a lambda expression has a different number of arguments than expected.
-* Improve error message when certain invalid ``GROUP BY`` expressions containing lambda expressions.
-
-Hive
-----
-
-* Fix handling of trailing spaces for the ``CHAR`` type when reading RCFile.
-* Allow inserts into tables that have more partitions than the partitions-per-scan limit.
-* Add support for exposing Hive table statistics to the engine. This option is experimental and
-  can be turned on via the ``statistics_enabled`` session property.
-* Ensure file name is always present for error messages about corrupt ORC files.
-
-Cassandra
----------
-
-* Remove caching of metadata in the Cassandra connector. Metadata caching makes Presto violate
-  the consistency defined by the Cassandra cluster. It's also unnecessary because the Cassandra
-  driver internally caches metadata. The ``cassandra.max-schema-refresh-threads``,
-  ``cassandra.schema-cache-ttl`` and ``cassandra.schema-refresh-interval`` config options have
-  been removed.
-* Fix intermittent issue in the connection retry mechanism.
-
-Web UI
-------
-
-* Change cluster HUD realtime statistics to be aggregated across all running queries.
-* Change parallelism statistic on cluster HUD to be averaged per-worker.
-* Fix bug that always showed indeterminate progress bar in query list view.
-* Change running drivers statistic to exclude blocked drivers.
-* Change unit of CPU and scheduled time rate sparklines to seconds on query details page.
-* Change query details page refresh interval to three seconds.
-* Add uptime and connected status indicators to every page.
-
-CLI
----
-
-* Add support for preprocessing commands.  When the ``PRESTO_PREPROCESSOR`` environment
-  variable is set, all commands are piped through the specified program before being sent to
-  the Presto server.
diff --git a/docs/src/main/sphinx/release/release-0.178.md b/docs/src/main/sphinx/release/release-0.178.md
new file mode 100644
index 000000000000..24ee0591f4a8
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.178.md
@@ -0,0 +1,25 @@
+# Release 0.178
+
+## General
+
+- Fix various memory accounting bugs, which reduces the likelihood of full GCs/OOMs.
+- Fix a regression that causes queries that use the keyword "stats" to fail to parse.
+- Fix an issue where a query does not get cleaned up on the coordinator after query failure.
+- Add ability to cast to `JSON` from `REAL`, `TINYINT` or `SMALLINT`.
+- Add support for `GROUPING` operation to {ref}`complex grouping operations<complex-grouping-operations>`.
+- Add support for correlated subqueries in `IN` predicates.
+- Add {func}`to_ieee754_32` and {func}`to_ieee754_64` functions.
+
+## Hive
+
+- Fix high CPU usage due to schema caching when reading Avro files.
+- Preserve decompression error causes when decoding ORC files.
+
+## Memory connector
+
+- Fix a bug that prevented creating empty tables.
+
+## SPI
+
+- Make environment available to resource group configuration managers.
+- Add additional performance statistics to query completion event.
diff --git a/docs/src/main/sphinx/release/release-0.178.rst b/docs/src/main/sphinx/release/release-0.178.rst
deleted file mode 100644
index 63f080e65d51..000000000000
--- a/docs/src/main/sphinx/release/release-0.178.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-=============
-Release 0.178
-=============
-
-General
--------
-
-* Fix various memory accounting bugs, which reduces the likelihood of full GCs/OOMs.
-* Fix a regression that causes queries that use the keyword "stats" to fail to parse.
-* Fix an issue where a query does not get cleaned up on the coordinator after query failure.
-* Add ability to cast to ``JSON`` from ``REAL``, ``TINYINT`` or ``SMALLINT``.
-* Add support for ``GROUPING`` operation to :ref:`complex grouping operations<complex_grouping_operations>`.
-* Add support for correlated subqueries in ``IN`` predicates.
-* Add :func:`to_ieee754_32` and :func:`to_ieee754_64` functions.
-
-Hive
-----
-
-* Fix high CPU usage due to schema caching when reading Avro files.
-* Preserve decompression error causes when decoding ORC files.
-
-Memory connector
-----------------
-
-* Fix a bug that prevented creating empty tables.
-
-SPI
----
-
-* Make environment available to resource group configuration managers.
-* Add additional performance statistics to query completion event.
diff --git a/docs/src/main/sphinx/release/release-0.179.md b/docs/src/main/sphinx/release/release-0.179.md
new file mode 100644
index 000000000000..0a22c48e4b01
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.179.md
@@ -0,0 +1,34 @@
+# Release 0.179
+
+## General
+
+- Fix issue which could cause incorrect results when processing dictionary encoded data.
+  If the expression can fail on bad input, the results from filtered-out rows containing
+  bad input may be included in the query output ({issue}`x8262`).
+- Fix planning failure when similar expressions appear in the `ORDER BY` clause of a query that
+  contains `ORDER BY` and `LIMIT`.
+- Fix planning failure when `GROUPING()` is used with the `legacy_order_by` session property set to `true`.
+- Fix parsing failure when `NFD`, `NFC`, `NFKD` or `NFKC` are used as identifiers.
+- Fix a memory leak on the coordinator that manifests itself with canceled queries.
+- Fix excessive GC overhead caused by captured lambda expressions.
+- Reduce the memory usage of map/array aggregation functions.
+- Redact sensitive config property values in the server log.
+- Update timezone database to version 2017b.
+- Add {func}`repeat` function.
+- Add {func}`crc32` function.
+- Add file based global security, which can be configured with the `etc/access-control.properties`
+  and `security.config-file` config properties. See {doc}`/security/built-in-system-access-control`
+  for more details.
+- Add support for configuring query runtime and queueing time limits to resource groups.
+
+## Hive
+
+- Fail queries that access encrypted S3 objects that do not have their unencrypted content lengths set in their metadata.
+
+## JDBC driver
+
+- Add support for setting query timeout through `Statement.setQueryTimeout()`.
+
+## SPI
+
+- Add grantee and revokee to `GRANT` and `REVOKE` security checks.
diff --git a/docs/src/main/sphinx/release/release-0.179.rst b/docs/src/main/sphinx/release/release-0.179.rst
deleted file mode 100644
index d89cac41e93c..000000000000
--- a/docs/src/main/sphinx/release/release-0.179.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-=============
-Release 0.179
-=============
-
-General
--------
-
-* Fix issue which could cause incorrect results when processing dictionary encoded data.
-  If the expression can fail on bad input, the results from filtered-out rows containing
-  bad input may be included in the query output (:issue:`x8262`).
-* Fix planning failure when similar expressions appear in the ``ORDER BY`` clause of a query that
-  contains ``ORDER BY`` and ``LIMIT``.
-* Fix planning failure when ``GROUPING()`` is used with the ``legacy_order_by`` session property set to ``true``.
-* Fix parsing failure when ``NFD``, ``NFC``, ``NFKD`` or ``NFKC`` are used as identifiers.
-* Fix a memory leak on the coordinator that manifests itself with canceled queries.
-* Fix excessive GC overhead caused by captured lambda expressions.
-* Reduce the memory usage of map/array aggregation functions.
-* Redact sensitive config property values in the server log.
-* Update timezone database to version 2017b.
-* Add :func:`repeat` function.
-* Add :func:`crc32` function.
-* Add file based global security, which can be configured with the ``etc/access-control.properties``
-  and ``security.config-file`` config properties. See :doc:`/security/built-in-system-access-control`
-  for more details.
-* Add support for configuring query runtime and queueing time limits to resource groups.
-
-Hive
-----
-
-* Fail queries that access encrypted S3 objects that do not have their unencrypted content lengths set in their metadata.
-
-JDBC driver
------------
-
-* Add support for setting query timeout through ``Statement.setQueryTimeout()``.
-
-SPI
----
-
-* Add grantee and revokee to ``GRANT`` and ``REVOKE`` security checks.
diff --git a/docs/src/main/sphinx/release/release-0.180.md b/docs/src/main/sphinx/release/release-0.180.md
new file mode 100644
index 000000000000..e12bc07328d9
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.180.md
@@ -0,0 +1,55 @@
+# Release 0.180
+
+## General
+
+- Fix a rare bug where rows containing only `null` values are not returned
+  to the client. This only occurs when an entire result page contains only
+  `null` values. The only known case is a query over an ORC encoded Hive table
+  that does not perform any transformation of the data.
+- Fix incorrect results when performing comparisons between values of approximate
+  data types (`REAL`, `DOUBLE`) and columns of certain exact numeric types
+  (`INTEGER`, `BIGINT`, `DECIMAL`).
+- Fix memory accounting for {func}`min_by` and {func}`max_by` on complex types.
+- Fix query failure due to `NoClassDefFoundError` when scalar functions declared
+  in plugins are implemented with instance methods.
+- Improve performance of map subscript from O(n) to O(1) in all cases. Previously, only maps
+  produced by certain functions and readers could take advantage of this improvement.
+- Skip unknown costs in `EXPLAIN` output.
+- Support {doc}`/security/internal-communication` between Presto nodes.
+- Add initial support for `CROSS JOIN` against `LATERAL` derived tables.
+- Add support for `VARBINARY` concatenation.
+- Add {doc}`/connector/thrift` that makes it possible to use Presto with
+  external systems without the need to implement a custom connector.
+- Add experimental `/v1/resourceGroupState` REST endpoint on coordinator.
+
+## Hive
+
+- Fix skipping short decimal values in the optimized Parquet reader
+  when they are backed by the `int32` or `int64` types.
+- Ignore partition bucketing if table is not bucketed. This allows dropping
+  the bucketing from table metadata but leaving it for old partitions.
+- Improve error message for Hive partitions dropped during execution.
+- The optimized RCFile writer is enabled by default, but can be disabled
+  with the `hive.rcfile-optimized-writer.enabled` config option.
+  The writer supports validation which reads back the entire file after
+  writing. Validation is disabled by default, but can be enabled with the
+  `hive.rcfile.writer.validate` config option.
+
+## Cassandra
+
+- Add support for `INSERT`.
+- Add support for pushdown of non-equality predicates on clustering keys.
+
+## JDBC driver
+
+- Add support for authenticating using Kerberos.
+- Allow configuring SSL/TLS and Kerberos properties on a per-connection basis.
+- Add support for executing queries using a SOCKS or HTTP proxy.
+
+## CLI
+
+- Add support for executing queries using an HTTP proxy.
+
+## SPI
+
+- Add running time limit and queued time limit to `ResourceGroupInfo`.
diff --git a/docs/src/main/sphinx/release/release-0.180.rst b/docs/src/main/sphinx/release/release-0.180.rst
deleted file mode 100644
index 635df9f45795..000000000000
--- a/docs/src/main/sphinx/release/release-0.180.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-=============
-Release 0.180
-=============
-
-General
--------
-
-* Fix a rare bug where rows containing only ``null`` values are not returned
-  to the client. This only occurs when an entire result page contains only
-  ``null`` values. The only known case is a query over an ORC encoded Hive table
-  that does not perform any transformation of the data.
-* Fix incorrect results when performing comparisons between values of approximate
-  data types (``REAL``, ``DOUBLE``) and columns of certain exact numeric types
-  (``INTEGER``, ``BIGINT``, ``DECIMAL``).
-* Fix memory accounting for :func:`min_by` and :func:`max_by` on complex types.
-* Fix query failure due to ``NoClassDefFoundError`` when scalar functions declared
-  in plugins are implemented with instance methods.
-* Improve performance of map subscript from O(n) to O(1) in all cases. Previously, only maps
-  produced by certain functions and readers could take advantage of this improvement.
-* Skip unknown costs in ``EXPLAIN`` output.
-* Support :doc:`/security/internal-communication` between Presto nodes.
-* Add initial support for ``CROSS JOIN`` against ``LATERAL`` derived tables.
-* Add support for ``VARBINARY`` concatenation.
-* Add :doc:`/connector/thrift` that makes it possible to use Presto with
-  external systems without the need to implement a custom connector.
-* Add experimental ``/v1/resourceGroupState`` REST endpoint on coordinator.
-
-Hive
-----
-
-* Fix skipping short decimal values in the optimized Parquet reader
-  when they are backed by the ``int32`` or ``int64`` types.
-* Ignore partition bucketing if table is not bucketed. This allows dropping
-  the bucketing from table metadata but leaving it for old partitions.
-* Improve error message for Hive partitions dropped during execution.
-* The optimized RCFile writer is enabled by default, but can be disabled
-  with the ``hive.rcfile-optimized-writer.enabled`` config option.
-  The writer supports validation which reads back the entire file after
-  writing. Validation is disabled by default, but can be enabled with the
-  ``hive.rcfile.writer.validate`` config option.
-
-Cassandra
----------
-
-* Add support for ``INSERT``.
-* Add support for pushdown of non-equality predicates on clustering keys.
-
-JDBC driver
------------
-
-* Add support for authenticating using Kerberos.
-* Allow configuring SSL/TLS and Kerberos properties on a per-connection basis.
-* Add support for executing queries using a SOCKS or HTTP proxy.
-
-CLI
----
-
-* Add support for executing queries using an HTTP proxy.
-
-SPI
----
-
-* Add running time limit and queued time limit to ``ResourceGroupInfo``.
diff --git a/docs/src/main/sphinx/release/release-0.181.md b/docs/src/main/sphinx/release/release-0.181.md
new file mode 100644
index 000000000000..7928a1dbcee3
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.181.md
@@ -0,0 +1,58 @@
+# Release 0.181
+
+## General
+
+- Fix query failure and memory usage tracking when query contains
+  {func}`transform_keys` or {func}`transform_values`.
+- Prevent `CREATE TABLE IF NOT EXISTS` queries from ever failing with *"Table already exists"*.
+- Fix query failure when `ORDER BY` expressions reference columns that are used in
+  the `GROUP BY` clause by their fully-qualified name.
+- Fix excessive GC overhead caused by large arrays and maps containing `VARCHAR` elements.
+- Improve error handling when passing too many arguments to various
+  functions or operators that take a variable number of arguments.
+- Improve performance of `count(*)` aggregations over subqueries with known
+  constant cardinality.
+- Add `VERBOSE` option for {doc}`/sql/explain-analyze` that provides additional
+  low-level details about query performance.
+- Add per-task distribution information to the output of `EXPLAIN ANALYZE`.
+- Add support for `DROP COLUMN` in {doc}`/sql/alter-table`.
+- Change local scheduler to prevent starvation of long running queries
+  when the cluster is under constant load from short queries. The new
+  behavior is disabled by default and can be enabled by setting the
+  config property `task.level-absolute-priority=true`.
+- Improve the fairness of the local scheduler such that long-running queries
+  which spend more time on the CPU per scheduling quanta (e.g., due to
+  slow connectors) do not get a disproportionate share of CPU. The new
+  behavior is disabled by default and can be enabled by setting the
+  config property `task.legacy-scheduling-behavior=false`.
+- Add a config option to control the prioritization of queries based on
+  elapsed scheduled time. The `task.level-time-multiplier` property
+  controls the target scheduled time of a level relative to the next
+  level. Higher values for this property increase the fraction of CPU
+  that will be allocated to shorter queries. This config property only
+  has an effect when `task.level-absolute-priority=true` and
+  `task.legacy-scheduling-behavior=false`.
+
+## Hive
+
+- Fix potential native memory leak when writing tables using RCFile.
+- Correctly categorize certain errors when writing tables using RCFile.
+- Decrease the number of file system metadata calls when reading tables.
+- Add support for dropping columns.
+
+## JDBC driver
+
+- Add support for query cancellation using `Statement.cancel()`.
+
+## PostgreSQL
+
+- Add support for operations on external tables.
+
+## Accumulo
+
+- Improve query performance by scanning index ranges in parallel.
+
+## SPI
+
+- Fix regression that broke serialization for `SchemaTableName`.
+- Add access control check for `DROP COLUMN`.
diff --git a/docs/src/main/sphinx/release/release-0.181.rst b/docs/src/main/sphinx/release/release-0.181.rst
deleted file mode 100644
index eb1556391b78..000000000000
--- a/docs/src/main/sphinx/release/release-0.181.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-=============
-Release 0.181
-=============
-
-General
--------
-
-* Fix query failure and memory usage tracking when query contains
-  :func:`transform_keys` or :func:`transform_values`.
-* Prevent ``CREATE TABLE IF NOT EXISTS`` queries from ever failing with *"Table already exists"*.
-* Fix query failure when ``ORDER BY`` expressions reference columns that are used in
-  the ``GROUP BY`` clause by their fully-qualified name.
-* Fix excessive GC overhead caused by large arrays and maps containing ``VARCHAR`` elements.
-* Improve error handling when passing too many arguments to various
-  functions or operators that take a variable number of arguments.
-* Improve performance of ``count(*)`` aggregations over subqueries with known
-  constant cardinality.
-* Add ``VERBOSE`` option for :doc:`/sql/explain-analyze` that provides additional
-  low-level details about query performance.
-* Add per-task distribution information to the output of ``EXPLAIN ANALYZE``.
-* Add support for ``DROP COLUMN`` in :doc:`/sql/alter-table`.
-* Change local scheduler to prevent starvation of long running queries
-  when the cluster is under constant load from short queries. The new
-  behavior is disabled by default and can be enabled by setting the
-  config property ``task.level-absolute-priority=true``.
-* Improve the fairness of the local scheduler such that long-running queries
-  which spend more time on the CPU per scheduling quanta (e.g., due to
-  slow connectors) do not get a disproportionate share of CPU. The new
-  behavior is disabled by default and can be enabled by setting the
-  config property ``task.legacy-scheduling-behavior=false``.
-* Add a config option to control the prioritization of queries based on
-  elapsed scheduled time. The ``task.level-time-multiplier`` property
-  controls the target scheduled time of a level relative to the next
-  level. Higher values for this property increase the fraction of CPU
-  that will be allocated to shorter queries. This config property only
-  has an effect when ``task.level-absolute-priority=true`` and
-  ``task.legacy-scheduling-behavior=false``.
-
-Hive
-----
-
-* Fix potential native memory leak when writing tables using RCFile.
-* Correctly categorize certain errors when writing tables using RCFile.
-* Decrease the number of file system metadata calls when reading tables.
-* Add support for dropping columns.
-
-JDBC driver
------------
-
-* Add support for query cancellation using ``Statement.cancel()``.
-
-PostgreSQL
-----------
-
-* Add support for operations on external tables.
-
-Accumulo
---------
-
-* Improve query performance by scanning index ranges in parallel.
-
-SPI
----
-
-* Fix regression that broke serialization for ``SchemaTableName``.
-* Add access control check for ``DROP COLUMN``.
diff --git a/docs/src/main/sphinx/release/release-0.182.md b/docs/src/main/sphinx/release/release-0.182.md
new file mode 100644
index 000000000000..dabc78562603
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.182.md
@@ -0,0 +1,37 @@
+# Release 0.182
+
+## General
+
+- Fix correctness issue that causes {func}`corr` to return positive numbers for inverse correlations.
+- Fix the {doc}`/sql/explain` query plan for tables that are partitioned
+  on `TIMESTAMP` or `DATE` columns.
+- Fix query failure when using certain window functions that take arrays or maps as arguments (e.g., {func}`approx_percentile`).
+- Implement subtraction for all `TIME` and `TIMESTAMP` types.
+- Improve planning performance for queries that join multiple tables with
+  a large number columns.
+- Improve the performance of joins with only non-equality conditions by using
+  a nested loops join instead of a hash join.
+- Improve the performance of casting from `JSON` to `ARRAY` or `MAP` types.
+- Add a new {ref}`ipaddress-type` type to represent IP addresses.
+- Add {func}`to_milliseconds` function to convert intervals (day to second) to milliseconds.
+- Add support for column aliases in `CREATE TABLE AS` statements.
+- Add a config option to reject queries during cluster initialization.
+  Queries are rejected if the active worker count is less than the
+  `query-manager.initialization-required-workers` property while the
+  coordinator has been running for less than `query-manager.initialization-timeout`.
+- Add {doc}`/connector/tpcds`. This connector provides a set of schemas to
+  support the TPC Benchmark™ DS (TPC-DS).
+
+## CLI
+
+- Fix an issue that would sometimes prevent queries from being cancelled when exiting from the pager.
+
+## Hive
+
+- Fix reading decimal values in the optimized Parquet reader when they are backed
+  by the `int32` or `int64` types.
+- Add a new experimental ORC writer implementation optimized for Presto.
+  We have some upcoming improvements, so we recommend waiting a few releases before
+  using this in production. The new writer can be enabled with the
+  `hive.orc.optimized-writer.enabled` configuration property or with the
+  `orc_optimized_writer_enabled` session property.
diff --git a/docs/src/main/sphinx/release/release-0.182.rst b/docs/src/main/sphinx/release/release-0.182.rst
deleted file mode 100644
index 7082e5255874..000000000000
--- a/docs/src/main/sphinx/release/release-0.182.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-=============
-Release 0.182
-=============
-
-General
--------
-
-* Fix correctness issue that causes :func:`corr` to return positive numbers for inverse correlations.
-* Fix the :doc:`/sql/explain` query plan for tables that are partitioned
-  on ``TIMESTAMP`` or ``DATE`` columns.
-* Fix query failure when using certain window functions that take arrays or maps as arguments (e.g., :func:`approx_percentile`).
-* Implement subtraction for all ``TIME`` and ``TIMESTAMP`` types.
-* Improve planning performance for queries that join multiple tables with
-  a large number columns.
-* Improve the performance of joins with only non-equality conditions by using
-  a nested loops join instead of a hash join.
-* Improve the performance of casting from ``JSON`` to ``ARRAY`` or ``MAP`` types.
-* Add a new :ref:`ipaddress_type` type to represent IP addresses.
-* Add :func:`to_milliseconds` function to convert intervals (day to second) to milliseconds.
-* Add support for column aliases in ``CREATE TABLE AS`` statements.
-* Add a config option to reject queries during cluster initialization.
-  Queries are rejected if the active worker count is less than the
-  ``query-manager.initialization-required-workers`` property while the
-  coordinator has been running for less than ``query-manager.initialization-timeout``.
-* Add :doc:`/connector/tpcds`. This connector provides a set of schemas to
-  support the TPC Benchmark™ DS (TPC-DS).
-
-CLI
----
-
-* Fix an issue that would sometimes prevent queries from being cancelled when exiting from the pager.
-
-Hive
-----
-
-* Fix reading decimal values in the optimized Parquet reader when they are backed
-  by the ``int32`` or ``int64`` types.
-* Add a new experimental ORC writer implementation optimized for Presto.
-  We have some upcoming improvements, so we recommend waiting a few releases before
-  using this in production. The new writer can be enabled with the
-  ``hive.orc.optimized-writer.enabled`` configuration property or with the
-  ``orc_optimized_writer_enabled`` session property.
diff --git a/docs/src/main/sphinx/release/release-0.183.md b/docs/src/main/sphinx/release/release-0.183.md
new file mode 100644
index 000000000000..d58948064f7c
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.183.md
@@ -0,0 +1,53 @@
+# Release 0.183
+
+## General
+
+- Fix planning failure for queries that use `GROUPING` and contain aggregation expressions
+  that require implicit coercions.
+- Fix planning failure for queries that contains a non-equi left join that is semantically
+  equivalent to an inner join.
+- Fix issue where a query may have a reported memory that is higher than actual usage when
+  an aggregation is followed by other non-trivial work in the same stage. This can lead to failures
+  due to query memory limit, or lower cluster throughput due to perceived insufficient memory.
+- Fix query failure for `CHAR` functions {func}`trim`, {func}`rtrim`, and {func}`substr` when
+  the return value would have trailing spaces under `VARCHAR` semantics.
+- Fix formatting in `EXPLAIN ANALYZE` output.
+- Improve error message when a query contains an unsupported form of correlated subquery.
+- Improve performance of `CAST(json_parse(...) AS ...)`.
+- Add {func}`map_from_entries` and {func}`map_entries` functions.
+- Change spilling for aggregations to only occur when the cluster runs out of memory.
+- Remove the `experimental.operator-memory-limit-before-spill` config property
+  and the `operator_memory_limit_before_spill` session property.
+- Allow configuring the amount of memory that can be used for merging spilled aggregation data
+  from disk using the `experimental.aggregation-operator-unspill-memory-limit` config
+  property or the `aggregation_operator_unspill_memory_limit` session property.
+
+## Web UI
+
+- Add output rows, output size, written rows and written size to query detail page.
+
+## Hive
+
+- Work around [ORC-222](https://issues.apache.org/jira/browse/ORC-222) which results in
+  invalid summary statistics in ORC or DWRF files when the input data contains invalid string data.
+  Previously, this would usually cause the query to fail, but in rare cases it could
+  cause wrong results by incorrectly skipping data based on the invalid statistics.
+- Fix issue where reported memory is lower than actual usage for table columns containing
+  string values read from ORC or DWRF files. This can lead to high GC overhead or out-of-memory crash.
+- Improve error message for small ORC files that are completely corrupt or not actually ORC.
+- Add predicate pushdown for the hidden column `"$path"`.
+
+## TPCH
+
+- Add column statistics for schemas `tiny` and `sf1`.
+
+## TPCDS
+
+- Add column statistics for schemas `tiny` and `sf1`.
+
+## SPI
+
+- Map columns or values represented with `ArrayBlock` and `InterleavedBlock` are
+  no longer supported. They must be represented as `MapBlock` or `SingleMapBlock`.
+- Extend column statistics with minimal and maximal value.
+- Replace `nullsCount` with `nullsFraction` in column statistics.
diff --git a/docs/src/main/sphinx/release/release-0.183.rst b/docs/src/main/sphinx/release/release-0.183.rst
deleted file mode 100644
index 520dcfe362ac..000000000000
--- a/docs/src/main/sphinx/release/release-0.183.rst
+++ /dev/null
@@ -1,61 +0,0 @@
-=============
-Release 0.183
-=============
-
-General
--------
-
-* Fix planning failure for queries that use ``GROUPING`` and contain aggregation expressions
-  that require implicit coercions.
-* Fix planning failure for queries that contains a non-equi left join that is semantically
-  equivalent to an inner join.
-* Fix issue where a query may have a reported memory that is higher than actual usage when
-  an aggregation is followed by other non-trivial work in the same stage. This can lead to failures
-  due to query memory limit, or lower cluster throughput due to perceived insufficient memory.
-* Fix query failure for ``CHAR`` functions :func:`trim`, :func:`rtrim`, and :func:`substr` when
-  the return value would have trailing spaces under ``VARCHAR`` semantics.
-* Fix formatting in ``EXPLAIN ANALYZE`` output.
-* Improve error message when a query contains an unsupported form of correlated subquery.
-* Improve performance of ``CAST(json_parse(...) AS ...)``.
-* Add :func:`map_from_entries` and :func:`map_entries` functions.
-* Change spilling for aggregations to only occur when the cluster runs out of memory.
-* Remove the ``experimental.operator-memory-limit-before-spill`` config property
-  and the ``operator_memory_limit_before_spill`` session property.
-* Allow configuring the amount of memory that can be used for merging spilled aggregation data
-  from disk using the ``experimental.aggregation-operator-unspill-memory-limit`` config
-  property or the ``aggregation_operator_unspill_memory_limit`` session property.
-
-Web UI
-------
-
-* Add output rows, output size, written rows and written size to query detail page.
-
-Hive
-----
-
-* Work around `ORC-222 <https://issues.apache.org/jira/browse/ORC-222>`_ which results in
-  invalid summary statistics in ORC or DWRF files when the input data contains invalid string data.
-  Previously, this would usually cause the query to fail, but in rare cases it could
-  cause wrong results by incorrectly skipping data based on the invalid statistics.
-* Fix issue where reported memory is lower than actual usage for table columns containing
-  string values read from ORC or DWRF files. This can lead to high GC overhead or out-of-memory crash.
-* Improve error message for small ORC files that are completely corrupt or not actually ORC.
-* Add predicate pushdown for the hidden column ``"$path"``.
-
-TPCH
-----
-
-* Add column statistics for schemas ``tiny`` and ``sf1``.
-
-TPCDS
------
-
-* Add column statistics for schemas ``tiny`` and ``sf1``.
-
-SPI
----
-
-* Map columns or values represented with ``ArrayBlock`` and ``InterleavedBlock`` are
-  no longer supported. They must be represented as ``MapBlock`` or ``SingleMapBlock``.
-* Extend column statistics with minimal and maximal value.
-* Replace ``nullsCount`` with ``nullsFraction`` in column statistics.
diff --git a/docs/src/main/sphinx/release/release-0.184.md b/docs/src/main/sphinx/release/release-0.184.md
new file mode 100644
index 000000000000..1808c876d86f
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.184.md
@@ -0,0 +1,41 @@
+# Release 0.184
+
+## General
+
+- Fix query execution failure for `split_to_map(...)[...]`.
+- Fix issue that caused queries containing `CROSS JOIN` to continue using CPU resources
+  even after they were killed.
+- Fix planning failure for some query shapes containing `count(*)` and a non-empty
+  `GROUP BY` clause.
+- Fix communication failures caused by lock contention in the local scheduler.
+- Improve performance of {func}`element_at` for maps to be constant time rather than
+  proportional to the size of the map.
+- Improve performance of queries with gathering exchanges.
+- Require `coalesce()` to have at least two arguments, as mandated by the SQL standard.
+- Add {func}`hamming_distance` function.
+
+## JDBC driver
+
+- Always invoke the progress callback with the final stats at query completion.
+
+## Web UI
+
+- Add worker status page with information about currently running threads
+  and resource utilization (CPU, heap, memory pools). This page is accessible
+  by clicking a hostname on a query task list.
+
+## Hive
+
+- Fix partition filtering for keys of `CHAR`, `DECIMAL`, or `DATE` type.
+- Reduce system memory usage when reading table columns containing string values
+  from ORC or DWRF files. This can prevent high GC overhead or out-of-memory crashes.
+
+## TPCDS
+
+- Fix display of table statistics when running `SHOW STATS FOR ...`.
+
+## SPI
+
+- Row columns or values represented with `ArrayBlock` and `InterleavedBlock` are
+  no longer supported. They must be represented as `RowBlock` or `SingleRowBlock`.
+- Add `source` field to `ConnectorSession`.
diff --git a/docs/src/main/sphinx/release/release-0.184.rst b/docs/src/main/sphinx/release/release-0.184.rst
deleted file mode 100644
index b48cafe07ca3..000000000000
--- a/docs/src/main/sphinx/release/release-0.184.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-=============
-Release 0.184
-=============
-
-General
--------
-
-* Fix query execution failure for ``split_to_map(...)[...]``.
-* Fix issue that caused queries containing ``CROSS JOIN`` to continue using CPU resources
-  even after they were killed.
-* Fix planning failure for some query shapes containing ``count(*)`` and a non-empty
-  ``GROUP BY`` clause.
-* Fix communication failures caused by lock contention in the local scheduler.
-* Improve performance of :func:`element_at` for maps to be constant time rather than
-  proportional to the size of the map.
-* Improve performance of queries with gathering exchanges.
-* Require ``coalesce()`` to have at least two arguments, as mandated by the SQL standard.
-* Add :func:`hamming_distance` function.
-
-JDBC driver
------------
-
-* Always invoke the progress callback with the final stats at query completion.
-
-Web UI
-------
-
-* Add worker status page with information about currently running threads
-  and resource utilization (CPU, heap, memory pools). This page is accessible
-  by clicking a hostname on a query task list.
-
-Hive
-----
-
-* Fix partition filtering for keys of ``CHAR``, ``DECIMAL``, or ``DATE`` type.
-* Reduce system memory usage when reading table columns containing string values
-  from ORC or DWRF files. This can prevent high GC overhead or out-of-memory crashes.
-
-TPCDS
------
-
-* Fix display of table statistics when running ``SHOW STATS FOR ...``.
-
-SPI
----
-
-* Row columns or values represented with ``ArrayBlock`` and ``InterleavedBlock`` are
-  no longer supported. They must be represented as ``RowBlock`` or ``SingleRowBlock``.
-* Add ``source`` field to ``ConnectorSession``.
diff --git a/docs/src/main/sphinx/release/release-0.185.md b/docs/src/main/sphinx/release/release-0.185.md
new file mode 100644
index 000000000000..b1c28ea3c7c4
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.185.md
@@ -0,0 +1,32 @@
+# Release 0.185
+
+## General
+
+- Fix incorrect column names in `QueryCompletedEvent`.
+- Fix excessive CPU usage in coordinator for queries that have
+  large string literals containing non-ASCII characters.
+- Fix potential infinite loop during query optimization when constant
+  expressions fail during evaluation.
+- Fix incorrect ordering when the same field appears multiple times
+  with different ordering specifications in a window function `ORDER BY`
+  clause. For example: `OVER (ORDER BY x ASC, x DESC)`.
+- Do not allow dropping or renaming hidden columns.
+- When preparing to drop a column, ignore hidden columns when
+  checking if the table only has one column.
+- Improve performance of joins where the condition is a range over a function.
+  For example: `a JOIN b ON b.x < f(a.x) AND b.x > g(a.x)`
+- Improve performance of certain window functions (e.g., `LAG`) with similar specifications.
+- Extend {func}`substr` function to work on `VARBINARY` in addition to `CHAR` and `VARCHAR`.
+- Add cast from `JSON` to `ROW`.
+- Allow usage of `TRY` within lambda expressions.
+
+## Hive
+
+- Improve ORC reader efficiency by only reading small ORC streams when accessed in the query.
+- Improve RCFile IO efficiency by increasing the buffer size from 1 to 8 MB.
+- Fix native memory leak for optimized RCFile writer.
+- Fix potential native memory leak for optimized ORC writer.
+
+## Memory connector
+
+- Add support for views.
diff --git a/docs/src/main/sphinx/release/release-0.185.rst b/docs/src/main/sphinx/release/release-0.185.rst
deleted file mode 100644
index e8177943299d..000000000000
--- a/docs/src/main/sphinx/release/release-0.185.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-=============
-Release 0.185
-=============
-
-General
--------
-
-* Fix incorrect column names in ``QueryCompletedEvent``.
-* Fix excessive CPU usage in coordinator for queries that have
-  large string literals containing non-ASCII characters.
-* Fix potential infinite loop during query optimization when constant
-  expressions fail during evaluation.
-* Fix incorrect ordering when the same field appears multiple times
-  with different ordering specifications in a window function ``ORDER BY``
-  clause. For example: ``OVER (ORDER BY x ASC, x DESC)``.
-* Do not allow dropping or renaming hidden columns.
-* When preparing to drop a column, ignore hidden columns when
-  checking if the table only has one column.
-* Improve performance of joins where the condition is a range over a function.
-  For example: ``a JOIN b ON b.x < f(a.x) AND b.x > g(a.x)``
-* Improve performance of certain window functions (e.g., ``LAG``) with similar specifications.
-* Extend :func:`substr` function to work on ``VARBINARY`` in addition to ``CHAR`` and ``VARCHAR``.
-* Add cast from ``JSON`` to ``ROW``.
-* Allow usage of ``TRY`` within lambda expressions.
-
-Hive
-----
-
-* Improve ORC reader efficiency by only reading small ORC streams when accessed in the query.
-* Improve RCFile IO efficiency by increasing the buffer size from 1 to 8 MB.
-* Fix native memory leak for optimized RCFile writer.
-* Fix potential native memory leak for optimized ORC writer.
-
-Memory connector
-----------------
-
-* Add support for views.
diff --git a/docs/src/main/sphinx/release/release-0.186.md b/docs/src/main/sphinx/release/release-0.186.md
new file mode 100644
index 000000000000..a3c51abedab2
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.186.md
@@ -0,0 +1,59 @@
+# Release 0.186
+
+:::{warning}
+This release has a stability issue that may cause query failures in large deployments
+due to HTTP requests timing out.
+:::
+
+## General
+
+- Fix excessive GC overhead caused by map to map cast.
+- Fix implicit coercions for `ROW` types, allowing operations between
+  compatible types such as `ROW(INTEGER)` and `ROW(BIGINT)`.
+- Fix issue that may cause queries containing expensive functions, such as regular
+  expressions, to continue using CPU resources even after they are killed.
+- Fix performance issue caused by redundant casts.
+- Fix {func}`json_parse` to not ignore trailing characters. Previously,
+  input such as `[1,2]abc` would successfully parse as `[1,2]`.
+- Fix leak in running query counter for failed queries. The counter would
+  increment but never decrement for queries that failed before starting.
+- Reduce coordinator HTTP thread usage for queries that are queued or waiting for data.
+- Reduce memory usage when building data of `VARCHAR` or `VARBINARY` types.
+- Estimate memory usage for `GROUP BY` more precisely to avoid out of memory errors.
+- Add queued time and elapsed time to the client protocol.
+- Add `query_max_execution_time` session property and `query.max-execution-time` config
+  property. Queries will be aborted after they execute for more than the specified duration.
+- Add {func}`inverse_normal_cdf` function.
+- Add {doc}`/functions/geospatial` including functions for processing Bing tiles.
+- Add {doc}`/admin/spill` for joins.
+- Add {doc}`/connector/redshift`.
+
+## Resource groups
+
+- Query Queues are deprecated in favor of {doc}`/admin/resource-groups`
+  and will be removed in a future release.
+- Rename the `maxRunning` property to `hardConcurrencyLimit`. The old
+  property name is deprecated and will be removed in a future release.
+- Fail on unknown property names when loading the JSON config file.
+
+## JDBC driver
+
+- Allow specifying an empty password.
+- Add `getQueuedTimeMillis()` and `getElapsedTimeMillis()` to `QueryStats`.
+
+## Hive
+
+- Fix `FileSystem closed` errors when using Kerberos authentication.
+- Add support for path style access to the S3 file system. This can be enabled
+  by setting the `hive.s3.path-style-access=true` config property.
+
+## SPI
+
+- Add an `ignoreExisting` flag to `ConnectorMetadata::createTable()`.
+- Remove the `getTotalBytes()` method from `RecordCursor` and `ConnectorPageSource`.
+
+:::{note}
+These are backwards incompatible changes with the previous SPI.
+If you have written a connector, you will need to update your code
+before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.186.rst b/docs/src/main/sphinx/release/release-0.186.rst
deleted file mode 100644
index 2e27e64c5718..000000000000
--- a/docs/src/main/sphinx/release/release-0.186.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-=============
-Release 0.186
-=============
-
-.. warning::
-
-    This release has a stability issue that may cause query failures in large deployments
-    due to HTTP requests timing out.
-
-General
--------
-
-* Fix excessive GC overhead caused by map to map cast.
-* Fix implicit coercions for ``ROW`` types, allowing operations between
-  compatible types such as ``ROW(INTEGER)`` and ``ROW(BIGINT)``.
-* Fix issue that may cause queries containing expensive functions, such as regular
-  expressions, to continue using CPU resources even after they are killed.
-* Fix performance issue caused by redundant casts.
-* Fix :func:`json_parse` to not ignore trailing characters. Previously,
-  input such as ``[1,2]abc`` would successfully parse as ``[1,2]``.
-* Fix leak in running query counter for failed queries. The counter would
-  increment but never decrement for queries that failed before starting.
-* Reduce coordinator HTTP thread usage for queries that are queued or waiting for data.
-* Reduce memory usage when building data of ``VARCHAR`` or ``VARBINARY`` types.
-* Estimate memory usage for ``GROUP BY`` more precisely to avoid out of memory errors.
-* Add queued time and elapsed time to the client protocol.
-* Add ``query_max_execution_time`` session property and ``query.max-execution-time`` config
-  property. Queries will be aborted after they execute for more than the specified duration.
-* Add :func:`inverse_normal_cdf` function.
-* Add :doc:`/functions/geospatial` including functions for processing Bing tiles.
-* Add :doc:`/admin/spill` for joins.
-* Add :doc:`/connector/redshift`.
-
-Resource groups
----------------
-
-* Query Queues are deprecated in favor of :doc:`/admin/resource-groups`
-  and will be removed in a future release.
-* Rename the ``maxRunning`` property to ``hardConcurrencyLimit``. The old
-  property name is deprecated and will be removed in a future release.
-* Fail on unknown property names when loading the JSON config file.
-
-JDBC driver
------------
-
-* Allow specifying an empty password.
-* Add ``getQueuedTimeMillis()`` and ``getElapsedTimeMillis()`` to ``QueryStats``.
-
-Hive
-----
-
-* Fix ``FileSystem closed`` errors when using Kerberos authentication.
-* Add support for path style access to the S3 file system. This can be enabled
-  by setting the ``hive.s3.path-style-access=true`` config property.
-
-SPI
----
-
-* Add an ``ignoreExisting`` flag to ``ConnectorMetadata::createTable()``.
-* Remove the ``getTotalBytes()`` method from ``RecordCursor`` and ``ConnectorPageSource``.
-
-.. note::
-
-    These are backwards incompatible changes with the previous SPI.
-    If you have written a connector, you will need to update your code
-    before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-0.187.md b/docs/src/main/sphinx/release/release-0.187.md
new file mode 100644
index 000000000000..076531b96a43
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.187.md
@@ -0,0 +1,6 @@
+# Release 0.187
+
+## General
+
+- Fix a stability issue that may cause query failures due to a large number of HTTP requests timing out.
+  The issue has been observed in a large deployment under stress.
diff --git a/docs/src/main/sphinx/release/release-0.187.rst b/docs/src/main/sphinx/release/release-0.187.rst
deleted file mode 100644
index 6a6a12f48d93..000000000000
--- a/docs/src/main/sphinx/release/release-0.187.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-=============
-Release 0.187
-=============
-
-General
--------
-
-* Fix a stability issue that may cause query failures due to a large number of HTTP requests timing out.
-  The issue has been observed in a large deployment under stress.
diff --git a/docs/src/main/sphinx/release/release-0.188.md b/docs/src/main/sphinx/release/release-0.188.md
new file mode 100644
index 000000000000..33a4dcd30433
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.188.md
@@ -0,0 +1,39 @@
+# Release 0.188
+
+## General
+
+- Fix handling of negative start indexes in array {func}`slice` function.
+- Fix inverted sign for time zones `Etc/GMT-12`, `Etc/GMT-11`, ..., `Etc/GMT-1`,
+  `Etc/GMT+1`, ... `Etc/GMT+12`.
+- Improve performance of server logging and HTTP request logging.
+- Reduce GC spikes by compacting join memory over time instead of all at once
+  when memory is low. This can increase reliability at the cost of additional
+  CPU. This can be enabled via the `pages-index.eager-compaction-enabled`
+  config property.
+- Improve performance of and reduce GC overhead for compaction of in-memory data structures,
+  primarily used in joins.
+- Mitigate excessive GC and degraded query performance by forcing expiration of
+  generated classes for functions and expressions one hour after generation.
+- Mitigate performance issue caused by JVM when generated code is used
+  for multiple hours or days.
+
+## CLI
+
+- Fix transaction support. Previously, after the first statement in the
+  transaction, the transaction would be abandoned and the session would
+  silently revert to auto-commit mode.
+
+## JDBC driver
+
+- Support using `Statement.cancel()` for all types of statements.
+
+## Resource group
+
+- Add environment support to the `db` resource groups manager.
+  Previously, configurations for different clusters had to be stored in separate databases.
+  With this change, different cluster configurations can be stored in the same table and
+  Presto will use the new `environment` column to differentiate them.
+
+## SPI
+
+- Add query plan to the query completed event.
diff --git a/docs/src/main/sphinx/release/release-0.188.rst b/docs/src/main/sphinx/release/release-0.188.rst
deleted file mode 100644
index d6abd268daf4..000000000000
--- a/docs/src/main/sphinx/release/release-0.188.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-=============
-Release 0.188
-=============
-
-General
--------
-
-* Fix handling of negative start indexes in array :func:`slice` function.
-* Fix inverted sign for time zones ``Etc/GMT-12``, ``Etc/GMT-11``, ..., ``Etc/GMT-1``,
-  ``Etc/GMT+1``, ... ``Etc/GMT+12``.
-* Improve performance of server logging and HTTP request logging.
-* Reduce GC spikes by compacting join memory over time instead of all at once
-  when memory is low. This can increase reliability at the cost of additional
-  CPU. This can be enabled via the ``pages-index.eager-compaction-enabled``
-  config property.
-* Improve performance of and reduce GC overhead for compaction of in-memory data structures,
-  primarily used in joins.
-* Mitigate excessive GC and degraded query performance by forcing expiration of
-  generated classes for functions and expressions one hour after generation.
-* Mitigate performance issue caused by JVM when generated code is used
-  for multiple hours or days.
-
-CLI
----
-
-* Fix transaction support. Previously, after the first statement in the
-  transaction, the transaction would be abandoned and the session would
-  silently revert to auto-commit mode.
-
-JDBC driver
------------
-
-* Support using ``Statement.cancel()`` for all types of statements.
-
-Resource group
---------------
-
-* Add environment support to the ``db`` resource groups manager.
-  Previously, configurations for different clusters had to be stored in separate databases.
-  With this change, different cluster configurations can be stored in the same table and
-  Presto will use the new ``environment`` column to differentiate them.
-
-SPI
----
-
-* Add query plan to the query completed event.
diff --git a/docs/src/main/sphinx/release/release-0.189.md b/docs/src/main/sphinx/release/release-0.189.md
new file mode 100644
index 000000000000..fa5e1e7ad5ee
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.189.md
@@ -0,0 +1,73 @@
+# Release 0.189
+
+## General
+
+- Fix query failure while logging the query plan.
+- Fix a bug that causes clients to hang when executing `LIMIT` queries when
+  `optimizer.force-single-node-output` is disabled.
+- Fix a bug in the {func}`bing_tile_at` and {func}`bing_tile_polygon` functions
+  where incorrect results were produced for points close to tile edges.
+- Fix variable resolution when lambda argument has the same name as a table column.
+- Improve error message when running `SHOW TABLES` on a catalog that does not exist.
+- Improve performance for queries with highly selective filters.
+- Execute {doc}`/sql/use` on the server rather than in the CLI, allowing it
+  to be supported by any client. This requires clients to add support for
+  the protocol changes (otherwise the statement will be silently ignored).
+- Allow casting `JSON` to `ROW` even if the `JSON` does not contain every
+  field in the `ROW`.
+- Add support for dereferencing row fields in lambda expressions.
+
+## Security
+
+- Support configuring multiple authentication types, which allows supporting
+  clients that have different authentication requirements or gracefully
+  migrating between authentication types without needing to update all clients
+  at once. Specify multiple values for `http-server.authentication.type`,
+  separated with commas.
+- Add support for TLS client certificates as an authentication mechanism by
+  specifying `CERTIFICATE` for `http-server.authentication.type`.
+  The distinguished name from the validated certificate will be provided as a
+  `javax.security.auth.x500.X500Principal`. The certificate authority (CA)
+  used to sign client certificates will be need to be added to the HTTP server
+  KeyStore (should technically be a TrustStore but separating them out is not
+  yet supported).
+- Skip sending final leg of SPNEGO authentication when using Kerberos.
+
+## JDBC driver
+
+- Per the JDBC specification, close the `ResultSet` when `Statement` is closed.
+- Add support for TLS client certificate authentication by configuring the
+  `SSLKeyStorePath` and `SSLKeyStorePassword` parameters.
+- Add support for transactions using SQL statements or the standard JDBC mechanism.
+- Allow executing the `USE` statement. Note that this is primarily useful when
+  running arbitrary SQL on behalf of users. For programmatic use, continuing
+  to use `setCatalog()` and `setSchema()` on `Connection` is recommended.
+- Allow executing `SET SESSION` and `RESET SESSION`.
+
+## Resource group
+
+- Add `WEIGHTED_FAIR` resource group scheduling policy.
+
+## Hive
+
+- Do not require setting `hive.metastore.uri` when using the file metastore.
+- Reduce memory usage when reading string columns from ORC or DWRF files.
+
+## MySQL, PostgreSQL, Redshift, and SQL Server shanges
+
+- Change mapping for columns with `DECIMAL(p,s)` data type from Presto `DOUBLE`
+  type to the corresponding Presto `DECIMAL` type.
+
+## Kafka
+
+- Fix documentation for raw decoder.
+
+## Thrift connector
+
+- Add support for index joins.
+
+## SPI
+
+- Deprecate `SliceArrayBlock`.
+- Add `SessionPropertyConfigurationManager` plugin to enable overriding default
+  session properties dynamically.
diff --git a/docs/src/main/sphinx/release/release-0.189.rst b/docs/src/main/sphinx/release/release-0.189.rst
deleted file mode 100644
index b18a7c29d35a..000000000000
--- a/docs/src/main/sphinx/release/release-0.189.rst
+++ /dev/null
@@ -1,85 +0,0 @@
-=============
-Release 0.189
-=============
-
-General
--------
-
-* Fix query failure while logging the query plan.
-* Fix a bug that causes clients to hang when executing ``LIMIT`` queries when
-  ``optimizer.force-single-node-output`` is disabled.
-* Fix a bug in the :func:`bing_tile_at` and :func:`bing_tile_polygon` functions
-  where incorrect results were produced for points close to tile edges.
-* Fix variable resolution when lambda argument has the same name as a table column.
-* Improve error message when running ``SHOW TABLES`` on a catalog that does not exist.
-* Improve performance for queries with highly selective filters.
-* Execute :doc:`/sql/use` on the server rather than in the CLI, allowing it
-  to be supported by any client. This requires clients to add support for
-  the protocol changes (otherwise the statement will be silently ignored).
-* Allow casting ``JSON`` to ``ROW`` even if the ``JSON`` does not contain every
-  field in the ``ROW``.
-* Add support for dereferencing row fields in lambda expressions.
-
-Security
---------
-
-* Support configuring multiple authentication types, which allows supporting
-  clients that have different authentication requirements or gracefully
-  migrating between authentication types without needing to update all clients
-  at once. Specify multiple values for ``http-server.authentication.type``,
-  separated with commas.
-* Add support for TLS client certificates as an authentication mechanism by
-  specifying ``CERTIFICATE`` for ``http-server.authentication.type``.
-  The distinguished name from the validated certificate will be provided as a
-  ``javax.security.auth.x500.X500Principal``. The certificate authority (CA)
-  used to sign client certificates will be need to be added to the HTTP server
-  KeyStore (should technically be a TrustStore but separating them out is not
-  yet supported).
-* Skip sending final leg of SPNEGO authentication when using Kerberos.
-
-JDBC driver
------------
-
-* Per the JDBC specification, close the ``ResultSet`` when ``Statement`` is closed.
-* Add support for TLS client certificate authentication by configuring the
-  ``SSLKeyStorePath`` and ``SSLKeyStorePassword`` parameters.
-* Add support for transactions using SQL statements or the standard JDBC mechanism.
-* Allow executing the ``USE`` statement. Note that this is primarily useful when
-  running arbitrary SQL on behalf of users. For programmatic use, continuing
-  to use ``setCatalog()`` and ``setSchema()`` on ``Connection`` is recommended.
-* Allow executing ``SET SESSION`` and ``RESET SESSION``.
-
-Resource group
---------------
-
-* Add ``WEIGHTED_FAIR`` resource group scheduling policy.
-
-Hive
-----
-
-* Do not require setting ``hive.metastore.uri`` when using the file metastore.
-* Reduce memory usage when reading string columns from ORC or DWRF files.
-
-
-MySQL, PostgreSQL, Redshift, and SQL Server shanges
----------------------------------------------------
-
-* Change mapping for columns with ``DECIMAL(p,s)`` data type from Presto ``DOUBLE``
-  type to the corresponding Presto ``DECIMAL`` type.
-
-Kafka
------
-
-* Fix documentation for raw decoder.
-
-Thrift connector
-----------------
-
-* Add support for index joins.
-
-SPI
----
-
-* Deprecate ``SliceArrayBlock``.
-* Add ``SessionPropertyConfigurationManager`` plugin to enable overriding default
-  session properties dynamically.
diff --git a/docs/src/main/sphinx/release/release-0.190.md b/docs/src/main/sphinx/release/release-0.190.md
new file mode 100644
index 000000000000..23105c784fad
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.190.md
@@ -0,0 +1,71 @@
+# Release 0.190
+
+## General
+
+- Fix correctness issue for {func}`array_min` and {func}`array_max` when arrays contain `NaN`.
+- Fix planning failure for queries involving `GROUPING` that require implicit coercions
+  in expressions containing aggregate functions.
+- Fix potential workload imbalance when using topology-aware scheduling.
+- Fix performance regression for queries containing `DISTINCT` aggregates over the same column.
+- Fix a memory leak that occurs on workers.
+- Improve error handling when a `HAVING` clause contains window functions.
+- Avoid unnecessary data redistribution when writing when the target table has
+  the same partition property as the data being written.
+- Ignore case when sorting the output of `SHOW FUNCTIONS`.
+- Improve rendering of the `BingTile` type.
+- The {func}`approx_distinct` function now supports a standard error
+  in the range of `[0.0040625, 0.26000]`.
+- Add support for `ORDER BY` in aggregation functions.
+- Add dictionary processing for joins which can improve join performance up to 50%.
+  This optimization can be disabled using the `dictionary-processing-joins-enabled`
+  config property or the `dictionary_processing_join` session property.
+- Add support for casting to `INTERVAL` types.
+- Add {func}`ST_Buffer` geospatial function.
+- Allow treating decimal literals as values of the `DECIMAL` type rather than `DOUBLE`.
+  This behavior can be enabled by setting the `parse-decimal-literals-as-double`
+  config property or the `parse_decimal_literals_as_double` session property to `false`.
+- Add JMX counter to track the number of submitted queries.
+
+## Resource groups
+
+- Add priority column to the DB resource group selectors.
+- Add exact match source selector to the DB resource group selectors.
+
+## CLI
+
+- Add support for setting client tags.
+
+## JDBC driver
+
+- Add `getPeakMemoryBytes()` to `QueryStats`.
+
+## Accumulo
+
+- Improve table scan parallelism.
+
+## Hive
+
+- Fix query failures for the file-based metastore implementation when partition
+  column values contain a colon.
+- Improve performance for writing to bucketed tables when the data being written
+  is already partitioned appropriately (e.g., the output is from a bucketed join).
+- Add config property `hive.max-outstanding-splits-size` for the maximum
+  amount of memory used to buffer splits for a single table scan. Additionally,
+  the default value is substantially higher than the previous hard-coded limit,
+  which can prevent certain queries from failing.
+
+## Thrift connector
+
+- Make Thrift retry configurable.
+- Add JMX counters for Thrift requests.
+
+## SPI
+
+- Remove the `RecordSink` interface, which was difficult to use
+  correctly and had no advantages over the `PageSink` interface.
+
+:::{note}
+This is a backwards incompatible change with the previous connector SPI.
+If you have written a connector that uses the `RecordSink` interface,
+you will need to update your code before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.190.rst b/docs/src/main/sphinx/release/release-0.190.rst
deleted file mode 100644
index 44e57729841c..000000000000
--- a/docs/src/main/sphinx/release/release-0.190.rst
+++ /dev/null
@@ -1,81 +0,0 @@
-=============
-Release 0.190
-=============
-
-General
--------
-
-* Fix correctness issue for :func:`array_min` and :func:`array_max` when arrays contain ``NaN``.
-* Fix planning failure for queries involving ``GROUPING`` that require implicit coercions
-  in expressions containing aggregate functions.
-* Fix potential workload imbalance when using topology-aware scheduling.
-* Fix performance regression for queries containing ``DISTINCT`` aggregates over the same column.
-* Fix a memory leak that occurs on workers.
-* Improve error handling when a ``HAVING`` clause contains window functions.
-* Avoid unnecessary data redistribution when writing when the target table has
-  the same partition property as the data being written.
-* Ignore case when sorting the output of ``SHOW FUNCTIONS``.
-* Improve rendering of the ``BingTile`` type.
-* The :func:`approx_distinct` function now supports a standard error
-  in the range of ``[0.0040625, 0.26000]``.
-* Add support for ``ORDER BY`` in aggregation functions.
-* Add dictionary processing for joins which can improve join performance up to 50%.
-  This optimization can be disabled using the ``dictionary-processing-joins-enabled``
-  config property or the ``dictionary_processing_join`` session property.
-* Add support for casting to ``INTERVAL`` types.
-* Add :func:`ST_Buffer` geospatial function.
-* Allow treating decimal literals as values of the ``DECIMAL`` type rather than ``DOUBLE``.
-  This behavior can be enabled by setting the ``parse-decimal-literals-as-double``
-  config property or the ``parse_decimal_literals_as_double`` session property to ``false``.
-* Add JMX counter to track the number of submitted queries.
-
-Resource groups
----------------
-
-* Add priority column to the DB resource group selectors.
-* Add exact match source selector to the DB resource group selectors.
-
-CLI
----
-
-* Add support for setting client tags.
-
-JDBC driver
------------
-
-* Add ``getPeakMemoryBytes()`` to ``QueryStats``.
-
-Accumulo
---------
-
-* Improve table scan parallelism.
-
-Hive
-----
-
-* Fix query failures for the file-based metastore implementation when partition
-  column values contain a colon.
-* Improve performance for writing to bucketed tables when the data being written
-  is already partitioned appropriately (e.g., the output is from a bucketed join).
-* Add config property ``hive.max-outstanding-splits-size`` for the maximum
-  amount of memory used to buffer splits for a single table scan. Additionally,
-  the default value is substantially higher than the previous hard-coded limit,
-  which can prevent certain queries from failing.
-
-Thrift connector
-----------------
-
-* Make Thrift retry configurable.
-* Add JMX counters for Thrift requests.
-
-SPI
----
-
-* Remove the ``RecordSink`` interface, which was difficult to use
-  correctly and had no advantages over the ``PageSink`` interface.
-
-.. note::
-
-    This is a backwards incompatible change with the previous connector SPI.
-    If you have written a connector that uses the ``RecordSink`` interface,
-    you will need to update your code before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-0.191.md b/docs/src/main/sphinx/release/release-0.191.md
new file mode 100644
index 000000000000..ba78e6515b35
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.191.md
@@ -0,0 +1,55 @@
+# Release 0.191
+
+## General
+
+- Fix regression that could cause high CPU usage for join queries when dictionary
+  processing for joins is enabled.
+- Fix {func}`bit_count` for bits between 33 and 63.
+- The `query.low-memory-killer.enabled` config property has been replaced
+  with `query.low-memory-killer.policy`. Use `total-reservation` to continue
+  using the previous policy of killing the largest query. There is also a new
+  policy, `total-reservation-on-blocked-nodes`, which kills the query that
+  is using the most memory on nodes that are out of memory (blocked).
+- Add support for grouped join execution. When both sides of a join have the
+  same table partitioning and the partitioning is addressable, partial data
+  can be loaded into memory at a time, making it possible to execute the join
+  with less peak memory usage. The colocated join feature must be enabled with
+  the `colocated-joins-enabled` config property or the `colocated_join`
+  session property, and the `concurrent_lifespans_per_task` session property
+  must be specified.
+- Allow connectors to report the amount of physical written data.
+- Add ability to dynamically scale out the number of writer tasks rather
+  than allocating a fixed number of tasks. Additional tasks are added when the
+  the average amount of physical data per writer is above a minimum threshold.
+  Writer scaling can be enabled with the `scale-writers` config property or
+  the `scale_writers` session property. The minimum size can be set with the
+  `writer-min-size` config property or the `writer_min_size` session property.
+  The tradeoff for writer scaling is that write queries can take longer to run
+  due to the decreased writer parallelism while the writer count ramps up.
+
+## Resource groups
+
+- Add query type to the exact match source selector in the DB resource group selectors.
+
+## CLI
+
+- Improve display of values of the Geometry type.
+
+## Hive
+
+- Add support for grouped join execution for Hive tables when both
+  sides of a join have the same bucketing property.
+- Report physical written data for the legacy RCFile writer, optimized RCFile
+  writer, and optimized ORC writer. These writers thus support writer scaling,
+  which can both reduce the number of written files and create larger files.
+  This is especially important for tables that have many small partitions, as
+  small files can take a disproportionately longer time to read.
+
+## Thrift connector
+
+- Add page size distribution metrics.
+
+## MySQL, PostgreSQL, Redshift, and SQL Server
+
+- Fix querying `information_schema.columns` if there are tables with
+  no columns or no supported columns.
diff --git a/docs/src/main/sphinx/release/release-0.191.rst b/docs/src/main/sphinx/release/release-0.191.rst
deleted file mode 100644
index b0e1467253b1..000000000000
--- a/docs/src/main/sphinx/release/release-0.191.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-=============
-Release 0.191
-=============
-
-General
--------
-
-* Fix regression that could cause high CPU usage for join queries when dictionary
-  processing for joins is enabled.
-* Fix :func:`bit_count` for bits between 33 and 63.
-* The ``query.low-memory-killer.enabled`` config property has been replaced
-  with ``query.low-memory-killer.policy``. Use ``total-reservation`` to continue
-  using the previous policy of killing the largest query. There is also a new
-  policy, ``total-reservation-on-blocked-nodes``, which kills the query that
-  is using the most memory on nodes that are out of memory (blocked).
-* Add support for grouped join execution. When both sides of a join have the
-  same table partitioning and the partitioning is addressable, partial data
-  can be loaded into memory at a time, making it possible to execute the join
-  with less peak memory usage. The colocated join feature must be enabled with
-  the ``colocated-joins-enabled`` config property or the ``colocated_join``
-  session property, and the ``concurrent_lifespans_per_task`` session property
-  must be specified.
-* Allow connectors to report the amount of physical written data.
-* Add ability to dynamically scale out the number of writer tasks rather
-  than allocating a fixed number of tasks. Additional tasks are added when the
-  the average amount of physical data per writer is above a minimum threshold.
-  Writer scaling can be enabled with the ``scale-writers`` config property or
-  the ``scale_writers`` session property. The minimum size can be set with the
-  ``writer-min-size`` config property or the ``writer_min_size`` session property.
-  The tradeoff for writer scaling is that write queries can take longer to run
-  due to the decreased writer parallelism while the writer count ramps up.
-
-Resource groups
----------------
-
-*  Add query type to the exact match source selector in the DB resource group selectors.
-
-CLI
----
-
-* Improve display of values of the Geometry type.
-
-Hive
-----
-
-* Add support for grouped join execution for Hive tables when both
-  sides of a join have the same bucketing property.
-* Report physical written data for the legacy RCFile writer, optimized RCFile
-  writer, and optimized ORC writer. These writers thus support writer scaling,
-  which can both reduce the number of written files and create larger files.
-  This is especially important for tables that have many small partitions, as
-  small files can take a disproportionately longer time to read.
-
-Thrift connector
-----------------
-
-* Add page size distribution metrics.
-
-MySQL, PostgreSQL, Redshift, and SQL Server
--------------------------------------------
-
-* Fix querying ``information_schema.columns`` if there are tables with
-  no columns or no supported columns.
diff --git a/docs/src/main/sphinx/release/release-0.192.md b/docs/src/main/sphinx/release/release-0.192.md
new file mode 100644
index 000000000000..7b7510c49066
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.192.md
@@ -0,0 +1,78 @@
+# Release 0.192
+
+## General
+
+- Fix performance regression in split scheduling introduced in 0.191. If a query
+  scans a non-trivial number of splits (~1M splits in an hour), the coordinator
+  CPU utilization can be very high, leading to elevated communication failures.
+- Fix correctness issue in the {func}`geometry_to_bing_tiles` function that causes
+  it to return irrelevant tiles when bottom or right side of the bounding box of the
+  geometry is aligned with the tile border.
+- Fix handling of invalid WKT (well-known text) input in geospatial functions.
+- Fix an issue that can cause long-running queries to hang when writer scaling is enabled.
+- Fix cast from `REAL` or `DOUBLE` to `DECIMAL` to conform to the SQL standard.
+  For example, previously `cast (double '100000000000000000000000000000000' as decimal(38))`
+  would return `100000000000000005366162204393472`. Now it returns `100000000000000000000000000000000`.
+- Fix bug in validation of resource groups that prevented use of the `WEIGHTED_FAIR` policy.
+- Fail queries properly when the coordinator fails to fetch data from workers.
+  Previously, it would return an HTTP 500 error to the client.
+- Improve memory tracking for queries involving `DISTINCT` or {func}`row_number` that could cause
+  over-committing memory resources for short time periods.
+- Improve performance for queries involving `grouping()`.
+- Improve buffer utilization calculation for writer scaling.
+- Remove tracking of per-driver peak memory reservation.
+- Add `resource-groups.max-refresh-interval` config option to limit the maximum acceptable
+  staleness of resource group configuration.
+- Remove `dictionary-processing-joins-enabled` configuration option and `dictionary_processing_join`
+  session property.
+
+## Web UI
+
+- Fix incorrect reporting of input size and positions in live plan view.
+
+## CLI
+
+- Fix update of prompt after `USE` statement.
+- Fix correctness issue when rendering arrays of Bing tiles that causes
+  the first entry to be repeated multiple times.
+
+## Hive
+
+- Fix reading partitioned table statistics from newer Hive metastores.
+- Do not treat file system errors as corruptions for ORC.
+- Prevent reads from tables or partitions with `object_not_readable` attribute set.
+- Add support for validating ORC files after they have been written. This behavior can
+  be turned on via the `hive.orc.writer.validate` configuration property.
+- Expose ORC writer statistics via JMX.
+- Add configuration options to control ORC writer min/max rows per stripe and row group,
+  maximum stripe size, and memory limit for dictionaries.
+- Allow reading empty ORC files.
+- Handle ViewFs when checking file system cache expiration.
+- Improve error reporting when the target table of an insert query is dropped.
+- Remove retry when creating Hive record reader. This can help queries fail faster.
+
+## MySQL
+
+- Remove support for `TIME WITH TIME ZONE` and `TIMESTAMP WITH TIME ZONE`
+  types due to MySQL types not being able to store timezone information.
+- Add support for `REAL` type, which maps to MySQL's `FLOAT` type.
+
+## PostgreSQL
+
+- Add support for `VARBINARY` type, which maps to PostgreSQL's `BYTEA` type.
+
+## MongoDB
+
+- Fix support for pushing down inequality operators for string types.
+- Add support for reading documents as `MAP` values.
+- Add support for MongoDB's `Decimal128` type.
+- Treat document and array of documents as `JSON` instead of `VARCHAR`.
+
+## JMX
+
+- Allow nulls in history table values.
+
+## SPI
+
+- Remove `SliceArrayBlock` class.
+- Add `offset` and `length` parameters to `Block.getPositions()`.
diff --git a/docs/src/main/sphinx/release/release-0.192.rst b/docs/src/main/sphinx/release/release-0.192.rst
deleted file mode 100644
index 75d0f46709d2..000000000000
--- a/docs/src/main/sphinx/release/release-0.192.rst
+++ /dev/null
@@ -1,89 +0,0 @@
-=============
-Release 0.192
-=============
-
-General
--------
-
-* Fix performance regression in split scheduling introduced in 0.191. If a query
-  scans a non-trivial number of splits (~1M splits in an hour), the coordinator
-  CPU utilization can be very high, leading to elevated communication failures.
-* Fix correctness issue in the :func:`geometry_to_bing_tiles` function that causes
-  it to return irrelevant tiles when bottom or right side of the bounding box of the
-  geometry is aligned with the tile border.
-* Fix handling of invalid WKT (well-known text) input in geospatial functions.
-* Fix an issue that can cause long-running queries to hang when writer scaling is enabled.
-* Fix cast from ``REAL`` or ``DOUBLE`` to ``DECIMAL`` to conform to the SQL standard.
-  For example, previously ``cast (double '100000000000000000000000000000000' as decimal(38))``
-  would return ``100000000000000005366162204393472``. Now it returns ``100000000000000000000000000000000``.
-* Fix bug in validation of resource groups that prevented use of the ``WEIGHTED_FAIR`` policy.
-* Fail queries properly when the coordinator fails to fetch data from workers.
-  Previously, it would return an HTTP 500 error to the client.
-* Improve memory tracking for queries involving ``DISTINCT`` or :func:`row_number` that could cause
-  over-committing memory resources for short time periods.
-* Improve performance for queries involving ``grouping()``.
-* Improve buffer utilization calculation for writer scaling.
-* Remove tracking of per-driver peak memory reservation.
-* Add ``resource-groups.max-refresh-interval`` config option to limit the maximum acceptable
-  staleness of resource group configuration.
-* Remove ``dictionary-processing-joins-enabled`` configuration option and ``dictionary_processing_join``
-  session property.
-
-Web UI
-------
-
-* Fix incorrect reporting of input size and positions in live plan view.
-
-CLI
----
-
-* Fix update of prompt after ``USE`` statement.
-* Fix correctness issue when rendering arrays of Bing tiles that causes
-  the first entry to be repeated multiple times.
-
-Hive
-----
-
-* Fix reading partitioned table statistics from newer Hive metastores.
-* Do not treat file system errors as corruptions for ORC.
-* Prevent reads from tables or partitions with ``object_not_readable`` attribute set.
-* Add support for validating ORC files after they have been written. This behavior can
-  be turned on via the ``hive.orc.writer.validate`` configuration property.
-* Expose ORC writer statistics via JMX.
-* Add configuration options to control ORC writer min/max rows per stripe and row group,
-  maximum stripe size, and memory limit for dictionaries.
-* Allow reading empty ORC files.
-* Handle ViewFs when checking file system cache expiration.
-* Improve error reporting when the target table of an insert query is dropped.
-* Remove retry when creating Hive record reader. This can help queries fail faster.
-
-MySQL
------
-
-* Remove support for ``TIME WITH TIME ZONE`` and ``TIMESTAMP WITH TIME ZONE``
-  types due to MySQL types not being able to store timezone information.
-* Add support for ``REAL`` type, which maps to MySQL's ``FLOAT`` type.
-
-PostgreSQL
-----------
-
-* Add support for ``VARBINARY`` type, which maps to PostgreSQL's ``BYTEA`` type.
-
-MongoDB
--------
-
-* Fix support for pushing down inequality operators for string types.
-* Add support for reading documents as ``MAP`` values.
-* Add support for MongoDB's ``Decimal128`` type.
-* Treat document and array of documents as ``JSON`` instead of ``VARCHAR``.
-
-JMX
----
-
-* Allow nulls in history table values.
-
-SPI
----
-
-* Remove ``SliceArrayBlock`` class.
-* Add ``offset`` and ``length`` parameters to ``Block.getPositions()``.
diff --git a/docs/src/main/sphinx/release/release-0.193.md b/docs/src/main/sphinx/release/release-0.193.md
new file mode 100644
index 000000000000..c6f2d493249a
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.193.md
@@ -0,0 +1,60 @@
+# Release 0.193
+
+## General
+
+- Fix an infinite loop during planning for queries containing non-trivial predicates.
+- Fix `row_number()` optimization that causes query failure or incorrect results
+  for queries that constrain the result of `row_number()` to be less than one.
+- Fix failure during query planning when lambda expressions are used in `UNNEST` or `VALUES` clauses.
+- Fix `Tried to free more revocable memory than is reserved` error for queries that have spilling enabled
+  and run in the reserved memory pool.
+- Improve the performance of the {func}`ST_Contains` function.
+- Add {func}`map_zip_with` lambda function.
+- Add {func}`normal_cdf` function.
+- Add `SET_DIGEST` type and related functions.
+- Add query stat that tracks peak total memory.
+- Improve performance of queries that filter all data from a table up-front (e.g., due to partition pruning).
+- Turn on new local scheduling algorithm by default (see {doc}`release-0.181`).
+- Remove the `information_schema.__internal_partitions__` table.
+
+## Security
+
+- Apply the authentication methods in the order they are listed in the
+  `http-server.authentication.type` configuration.
+
+## CLI
+
+- Fix rendering of maps of Bing tiles.
+- Abort the query when the result pager exits.
+
+## JDBC driver
+
+- Use SSL by default for port 443.
+
+## Hive
+
+- Allow dropping any column in a table. Previously, dropping columns other
+  than the last one would fail with `ConcurrentModificationException`.
+- Correctly write files for text format tables that use non-default delimiters.
+  Previously, they were written with the default delimiter.
+- Fix reading data from S3 if the data is in a region other than `us-east-1`.
+  Previously, such queries would fail with
+  `"The authorization header is malformed; the region 'us-east-1' is wrong; expecting '<region_name>'"`,
+  where `<region_name>` is the S3 region hosting the bucket that is queried.
+- Enable `SHOW PARTITIONS FROM <table> WHERE <condition>` to work for tables
+  that have more than `hive.max-partitions-per-scan` partitions as long as
+  the specified `<condition>` reduces the number of partitions to below this limit.
+
+## Blackhole
+
+- Do not allow creating tables in a nonexistent schema.
+- Add support for `CREATE SCHEMA`.
+
+## Memory connector
+
+- Allow renaming tables across schemas. Previously, the target schema was ignored.
+- Do not allow creating tables in a nonexistent schema.
+
+## MongoDB
+
+- Add `INSERT` support. It was previously removed in 0.155.
diff --git a/docs/src/main/sphinx/release/release-0.193.rst b/docs/src/main/sphinx/release/release-0.193.rst
deleted file mode 100644
index 5f9e603d0aa6..000000000000
--- a/docs/src/main/sphinx/release/release-0.193.rst
+++ /dev/null
@@ -1,70 +0,0 @@
-=============
-Release 0.193
-=============
-
-General
--------
-
-* Fix an infinite loop during planning for queries containing non-trivial predicates.
-* Fix ``row_number()`` optimization that causes query failure or incorrect results
-  for queries that constrain the result of ``row_number()`` to be less than one.
-* Fix failure during query planning when lambda expressions are used in ``UNNEST`` or ``VALUES`` clauses.
-* Fix ``Tried to free more revocable memory than is reserved`` error for queries that have spilling enabled
-  and run in the reserved memory pool.
-* Improve the performance of the :func:`ST_Contains` function.
-* Add :func:`map_zip_with` lambda function.
-* Add :func:`normal_cdf` function.
-* Add ``SET_DIGEST`` type and related functions.
-* Add query stat that tracks peak total memory.
-* Improve performance of queries that filter all data from a table up-front (e.g., due to partition pruning).
-* Turn on new local scheduling algorithm by default (see :doc:`release-0.181`).
-* Remove the ``information_schema.__internal_partitions__`` table.
-
-Security
---------
-
-* Apply the authentication methods in the order they are listed in the
-  ``http-server.authentication.type`` configuration.
-
-CLI
----
-
-* Fix rendering of maps of Bing tiles.
-* Abort the query when the result pager exits.
-
-JDBC driver
------------
-
-* Use SSL by default for port 443.
-
-Hive
-----
-
-* Allow dropping any column in a table. Previously, dropping columns other
-  than the last one would fail with ``ConcurrentModificationException``.
-* Correctly write files for text format tables that use non-default delimiters.
-  Previously, they were written with the default delimiter.
-* Fix reading data from S3 if the data is in a region other than ``us-east-1``.
-  Previously, such queries would fail with
-  ``"The authorization header is malformed; the region 'us-east-1' is wrong; expecting '<region_name>'"``,
-  where ``<region_name>`` is the S3 region hosting the bucket that is queried.
-* Enable ``SHOW PARTITIONS FROM <table> WHERE <condition>`` to work for tables
-  that have more than ``hive.max-partitions-per-scan`` partitions as long as
-  the specified ``<condition>`` reduces the number of partitions to below this limit.
-
-Blackhole
----------
-
-* Do not allow creating tables in a nonexistent schema.
-* Add support for ``CREATE SCHEMA``.
-
-Memory connector
-----------------
-
-* Allow renaming tables across schemas. Previously, the target schema was ignored.
-* Do not allow creating tables in a nonexistent schema.
-
-MongoDB
--------
-
-* Add ``INSERT`` support. It was previously removed in 0.155.
diff --git a/docs/src/main/sphinx/release/release-0.194.md b/docs/src/main/sphinx/release/release-0.194.md
new file mode 100644
index 000000000000..0a77336ca880
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.194.md
@@ -0,0 +1,47 @@
+# Release 0.194
+
+## General
+
+- Fix planning performance regression that can affect queries over Hive tables
+  with many partitions.
+- Fix deadlock in memory management logic introduced in the previous release.
+- Add {func}`word_stem` function.
+- Restrict `n` (number of result elements) to 10,000 or less for
+  `min(col, n)`, `max(col, n)`, `min_by(col1, col2, n)`, and `max_by(col1, col2, n)`.
+- Improve error message when a session property references an invalid catalog.
+- Reduce memory usage of {func}`histogram` aggregation function.
+- Improve coordinator CPU efficiency when discovering splits.
+- Include minimum and maximum values for columns in `SHOW STATS`.
+
+## Web UI
+
+- Fix previously empty peak memory display in the query details page.
+
+## CLI
+
+- Fix regression in CLI that makes it always print "query aborted by user" when
+  the result is displayed with a pager, even if the query completes successfully.
+- Return a non-zero exit status when an error occurs.
+- Add `--client-info` option for specifying client info.
+- Add `--ignore-errors` option to continue processing in batch mode when an error occurs.
+
+## JDBC driver
+
+- Allow configuring connection network timeout with `setNetworkTimeout()`.
+- Allow setting client tags via the `ClientTags` client info property.
+- Expose update type via `getUpdateType()` on `PrestoStatement`.
+
+## Hive
+
+- Consistently fail queries that attempt to read partitions that are offline.
+  Previously, the query can have one of the following outcomes: fail as expected,
+  skip those partitions and finish successfully, or hang indefinitely.
+- Allow setting username used to access Hive metastore via the `hive.metastore.username` config property.
+- Add `hive_storage_format` and `respect_table_format` session properties, corresponding to
+  the `hive.storage-format` and `hive.respect-table-format` config properties.
+- Reduce ORC file reader memory consumption by allocating buffers lazily.
+  Buffers are only allocated for columns that are actually accessed.
+
+## Cassandra
+
+- Fix failure when querying `information_schema.columns` when there is no equality predicate on `table_name`.
diff --git a/docs/src/main/sphinx/release/release-0.194.rst b/docs/src/main/sphinx/release/release-0.194.rst
deleted file mode 100644
index ed2d5e149733..000000000000
--- a/docs/src/main/sphinx/release/release-0.194.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-=============
-Release 0.194
-=============
-
-General
--------
-
-* Fix planning performance regression that can affect queries over Hive tables
-  with many partitions.
-* Fix deadlock in memory management logic introduced in the previous release.
-* Add :func:`word_stem` function.
-* Restrict ``n`` (number of result elements) to 10,000 or less for
-  ``min(col, n)``, ``max(col, n)``, ``min_by(col1, col2, n)``, and ``max_by(col1, col2, n)``.
-* Improve error message when a session property references an invalid catalog.
-* Reduce memory usage of :func:`histogram` aggregation function.
-* Improve coordinator CPU efficiency when discovering splits.
-* Include minimum and maximum values for columns in ``SHOW STATS``.
-
-Web UI
-------
-
-* Fix previously empty peak memory display in the query details page.
-
-CLI
----
-
-* Fix regression in CLI that makes it always print "query aborted by user" when
-  the result is displayed with a pager, even if the query completes successfully.
-* Return a non-zero exit status when an error occurs.
-* Add ``--client-info`` option for specifying client info.
-* Add ``--ignore-errors`` option to continue processing in batch mode when an error occurs.
-
-JDBC driver
------------
-
-* Allow configuring connection network timeout with ``setNetworkTimeout()``.
-* Allow setting client tags via the ``ClientTags`` client info property.
-* Expose update type via ``getUpdateType()`` on ``PrestoStatement``.
-
-Hive
-----
-
-* Consistently fail queries that attempt to read partitions that are offline.
-  Previously, the query can have one of the following outcomes: fail as expected,
-  skip those partitions and finish successfully, or hang indefinitely.
-* Allow setting username used to access Hive metastore via the ``hive.metastore.username`` config property.
-* Add ``hive_storage_format`` and ``respect_table_format`` session properties, corresponding to
-  the ``hive.storage-format`` and ``hive.respect-table-format`` config properties.
-* Reduce ORC file reader memory consumption by allocating buffers lazily.
-  Buffers are only allocated for columns that are actually accessed.
-
-Cassandra
----------
-
-* Fix failure when querying ``information_schema.columns`` when there is no equality predicate on ``table_name``.
diff --git a/docs/src/main/sphinx/release/release-0.195.md b/docs/src/main/sphinx/release/release-0.195.md
new file mode 100644
index 000000000000..c4a3e2356689
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.195.md
@@ -0,0 +1,44 @@
+# Release 0.195
+
+## General
+
+- Fix {func}`histogram` for map type when type coercion is required.
+- Fix `nullif` for map type when type coercion is required.
+- Fix incorrect termination of queries when the coordinator to worker communication is under high load.
+- Fix race condition that causes queries with a right or full outer join to fail.
+- Change reference counting for varchar, varbinary, and complex types to be approximate. This
+  approximation reduces GC activity when computing large aggregations with these types.
+- Change communication system to be more resilient to issues such as long GC pauses or networking errors.
+  The min/max sliding scale of for timeouts has been removed and instead only max time is used.
+  The `exchange.min-error-duration` and `query.remote-task.min-error-duration` are now ignored and will be
+  removed in a future release.
+- Increase coordinator timeout for cleanup of worker tasks for failed queries.  This improves the health of
+  the system when workers are offline for long periods due to GC or network errors.
+- Remove the `compiler.interpreter-enabled` config property.
+
+## Security
+
+- Presto now supports generic password authentication using a pluggable {doc}`/develop/password-authenticator`.
+  Enable password authentication by setting `http-server.authentication.type` to include `PASSWORD` as an
+  authentication type.
+- {doc}`/security/ldap` is now implemented as a password authentication
+  plugin. You will need to update your configuration if you are using it.
+
+## CLI and JDBC
+
+- Provide a better error message when TLS client certificates are expired or not yet valid.
+
+## MySQL
+
+- Fix an error that can occur while listing tables if one of the listed tables is dropped.
+
+## Hive
+
+- Add support for LZ4 compressed ORC files.
+- Add support for reading Zstandard compressed ORC files.
+- Validate ORC compression block size when reading ORC files.
+- Set timeout of Thrift metastore client. This was accidentally removed in 0.191.
+
+## MySQL, Redis, Kafka, and MongoDB
+
+- Fix failure when querying `information_schema.columns` when there is no equality predicate on `table_name`.
diff --git a/docs/src/main/sphinx/release/release-0.195.rst b/docs/src/main/sphinx/release/release-0.195.rst
deleted file mode 100644
index 440f67bcb5f7..000000000000
--- a/docs/src/main/sphinx/release/release-0.195.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-=============
-Release 0.195
-=============
-
-General
--------
-
-* Fix :func:`histogram` for map type when type coercion is required.
-* Fix ``nullif`` for map type when type coercion is required.
-* Fix incorrect termination of queries when the coordinator to worker communication is under high load.
-* Fix race condition that causes queries with a right or full outer join to fail.
-* Change reference counting for varchar, varbinary, and complex types to be approximate. This
-  approximation reduces GC activity when computing large aggregations with these types.
-* Change communication system to be more resilient to issues such as long GC pauses or networking errors.
-  The min/max sliding scale of for timeouts has been removed and instead only max time is used.
-  The ``exchange.min-error-duration`` and ``query.remote-task.min-error-duration`` are now ignored and will be
-  removed in a future release.
-* Increase coordinator timeout for cleanup of worker tasks for failed queries.  This improves the health of
-  the system when workers are offline for long periods due to GC or network errors.
-* Remove the ``compiler.interpreter-enabled`` config property.
-
-Security
---------
-
-* Presto now supports generic password authentication using a pluggable :doc:`/develop/password-authenticator`.
-  Enable password authentication by setting ``http-server.authentication.type`` to include ``PASSWORD`` as an
-  authentication type.
-* :doc:`/security/ldap` is now implemented as a password authentication
-  plugin. You will need to update your configuration if you are using it.
-
-CLI and JDBC
-------------
-
-* Provide a better error message when TLS client certificates are expired or not yet valid.
-
-MySQL
------
-
-* Fix an error that can occur while listing tables if one of the listed tables is dropped.
-
-Hive
-----
-
-* Add support for LZ4 compressed ORC files.
-* Add support for reading Zstandard compressed ORC files.
-* Validate ORC compression block size when reading ORC files.
-* Set timeout of Thrift metastore client. This was accidentally removed in 0.191.
-
-MySQL, Redis, Kafka, and MongoDB
---------------------------------
-
-* Fix failure when querying ``information_schema.columns`` when there is no equality predicate on ``table_name``.
diff --git a/docs/src/main/sphinx/release/release-0.196.md b/docs/src/main/sphinx/release/release-0.196.md
new file mode 100644
index 000000000000..933acb0fc9d0
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.196.md
@@ -0,0 +1,47 @@
+# Release 0.196
+
+## General
+
+- Fix behavior of `JOIN ... USING` to conform to standard SQL semantics.
+  The old behavior can be restored by setting the `deprecated.legacy-join-using`
+  configuration option or the `legacy_join_using` session property.
+- Fix memory leak for queries with `ORDER BY`.
+- Fix tracking of query peak memory usage.
+- Fix skew in dynamic writer scaling by eagerly freeing memory in the source output
+  buffers. This can be disabled by setting `exchange.acknowledge-pages=false`.
+- Fix planning failure for lambda with capture in rare cases.
+- Fix decimal precision of `round(x, d)` when `x` is a `DECIMAL`.
+- Fix returned value from `round(x, d)` when `x` is a `DECIMAL` with
+  scale `0` and `d` is a negative integer. Previously, no rounding was done
+  in this case.
+- Improve performance of the {func}`array_join` function.
+- Improve performance of the {func}`ST_Envelope` function.
+- Optimize {func}`min_by` and {func}`max_by` by avoiding unnecessary object
+  creation in order to reduce GC overhead.
+- Show join partitioning explicitly in `EXPLAIN`.
+- Add {func}`is_json_scalar` function.
+- Add {func}`regexp_replace` function variant that executes a lambda for
+  each replacement.
+
+## Security
+
+- Add rules to the `file` {doc}`/security/built-in-system-access-control`
+  to enforce a specific matching between authentication credentials and a
+  executing username.
+
+## Hive
+
+- Fix a correctness issue where non-null values can be treated as null values
+  when writing dictionary-encoded strings to ORC files with the new ORC writer.
+- Fix invalid failure due to string statistics mismatch while validating ORC files
+  after they have been written with the new ORC writer. This happens when
+  the written strings contain invalid UTF-8 code points.
+- Add support for reading array, map, or row type columns from partitions
+  where the partition schema is different from the table schema. This can
+  occur when the table schema was updated after the partition was created.
+  The changed column types must be compatible. For rows types, trailing fields
+  may be added or dropped, but the corresponding fields (by ordinal)
+  must have the same name.
+- Add `hive.non-managed-table-creates-enabled` configuration option
+  that controls whether or not users may create non-managed (external) tables.
+  The default value is `true`.
diff --git a/docs/src/main/sphinx/release/release-0.196.rst b/docs/src/main/sphinx/release/release-0.196.rst
deleted file mode 100644
index 52fe8b208b20..000000000000
--- a/docs/src/main/sphinx/release/release-0.196.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-=============
-Release 0.196
-=============
-
-General
--------
-
-* Fix behavior of ``JOIN ... USING`` to conform to standard SQL semantics.
-  The old behavior can be restored by setting the ``deprecated.legacy-join-using``
-  configuration option or the ``legacy_join_using`` session property.
-* Fix memory leak for queries with ``ORDER BY``.
-* Fix tracking of query peak memory usage.
-* Fix skew in dynamic writer scaling by eagerly freeing memory in the source output
-  buffers. This can be disabled by setting ``exchange.acknowledge-pages=false``.
-* Fix planning failure for lambda with capture in rare cases.
-* Fix decimal precision of ``round(x, d)`` when ``x`` is a ``DECIMAL``.
-* Fix returned value from ``round(x, d)`` when ``x`` is a ``DECIMAL`` with
-  scale ``0`` and ``d`` is a negative integer. Previously, no rounding was done
-  in this case.
-* Improve performance of the :func:`array_join` function.
-* Improve performance of the :func:`ST_Envelope` function.
-* Optimize :func:`min_by` and :func:`max_by` by avoiding unnecessary object
-  creation in order to reduce GC overhead.
-* Show join partitioning explicitly in ``EXPLAIN``.
-* Add :func:`is_json_scalar` function.
-* Add :func:`regexp_replace` function variant that executes a lambda for
-  each replacement.
-
-Security
---------
-
-* Add rules to the ``file`` :doc:`/security/built-in-system-access-control`
-  to enforce a specific matching between authentication credentials and a
-  executing username.
-
-Hive
-----
-
-* Fix a correctness issue where non-null values can be treated as null values
-  when writing dictionary-encoded strings to ORC files with the new ORC writer.
-* Fix invalid failure due to string statistics mismatch while validating ORC files
-  after they have been written with the new ORC writer. This happens when
-  the written strings contain invalid UTF-8 code points.
-* Add support for reading array, map, or row type columns from partitions
-  where the partition schema is different from the table schema. This can
-  occur when the table schema was updated after the partition was created.
-  The changed column types must be compatible. For rows types, trailing fields
-  may be added or dropped, but the corresponding fields (by ordinal)
-  must have the same name.
-* Add ``hive.non-managed-table-creates-enabled`` configuration option
-  that controls whether or not users may create non-managed (external) tables.
-  The default value is ``true``.
diff --git a/docs/src/main/sphinx/release/release-0.197.md b/docs/src/main/sphinx/release/release-0.197.md
new file mode 100644
index 000000000000..df503a6575b1
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.197.md
@@ -0,0 +1,58 @@
+# Release 0.197
+
+## General
+
+- Fix query scheduling hang when the `concurrent_lifespans_per_task` session property is set.
+- Fix failure when a query contains a `TIMESTAMP` literal corresponding to a local time that
+  does not occur in the default time zone of the Presto JVM. For example, if Presto was running
+  in a CET zone (e.g., `Europe/Brussels`) and the client session was in UTC, an expression
+  such as `TIMESTAMP '2017-03-26 02:10:00'` would cause a failure.
+- Extend predicate inference and pushdown for queries using a `<symbol> IN <subquery>` predicate.
+- Support predicate pushdown for the `<column> IN <values list>` predicate
+  where values in the `values list` require casting to match the type of `column`.
+- Optimize {func}`min` and {func}`max` to avoid unnecessary object creation in order to reduce GC overhead.
+- Optimize the performance of {func}`ST_XMin`, {func}`ST_XMax`, {func}`ST_YMin`, and {func}`ST_YMax`.
+- Add `DATE` variant for {func}`sequence` function.
+- Add {func}`ST_IsSimple` geospatial function.
+- Add support for broadcast spatial joins.
+
+## Resource groups
+
+- Change configuration check for weights in resource group policy to validate that
+  either all of the sub-groups or none of the sub-groups have a scheduling weight configured.
+- Add support for named variables in source and user regular expressions that can be
+  used to parameterize resource group names.
+- Add support for optional fields in DB resource group exact match selectors.
+
+## Hive
+
+- Fix reading of Hive partition statistics with unset fields. Previously, unset fields
+  were incorrectly interpreted as having a value of zero.
+- Fix integer overflow when writing a single file greater than 2GB with optimized ORC writer.
+- Fix system memory accounting to include stripe statistics size and
+  writer validation size for the optimized ORC writer.
+- Dynamically allocate the compression buffer for the optimized ORC writer
+  to avoid unnecessary memory allocation. Add config property
+  `hive.orc.writer.max-compression-buffer-size` to limit the maximum size of the buffer.
+- Add session property `orc_optimized_writer_max_stripe_size` to tune the
+  maximum stipe size for the optimized ORC writer.
+- Add session property `orc_string_statistics_limit` to drop the string
+  statistics when writing ORC files if they exceed the limit.
+- Use the view owner returned from the metastore at the time of the query rather than
+  always using the user who created the view. This allows changing the owner of a view.
+
+## CLI
+
+- Fix hang when CLI fails to communicate with Presto server.
+
+## SPI
+
+- Include connector session properties for the connector metadata calls made
+  when running `SHOW` statements or querying `information_schema`.
+- Add count and time of full GC that occurred while query was running to `QueryCompletedEvent`.
+- Change the `ResourceGroupManager` interface to include a `match()` method and
+  remove the `getSelectors()` method and the `ResourceGroupSelector` interface.
+- Rename the existing `SelectionContext` class to be `SelectionCriteria` and
+  create a new `SelectionContext` class that is returned from the `match()` method
+  and contains the resource group ID and a manager-defined context field.
+- Use the view owner from `ConnectorViewDefinition` when present.
diff --git a/docs/src/main/sphinx/release/release-0.197.rst b/docs/src/main/sphinx/release/release-0.197.rst
deleted file mode 100644
index 5bc1d5b69d86..000000000000
--- a/docs/src/main/sphinx/release/release-0.197.rst
+++ /dev/null
@@ -1,65 +0,0 @@
-=============
-Release 0.197
-=============
-
-General
--------
-
-* Fix query scheduling hang when the ``concurrent_lifespans_per_task`` session property is set.
-* Fix failure when a query contains a ``TIMESTAMP`` literal corresponding to a local time that
-  does not occur in the default time zone of the Presto JVM. For example, if Presto was running
-  in a CET zone (e.g., ``Europe/Brussels``) and the client session was in UTC, an expression
-  such as ``TIMESTAMP '2017-03-26 02:10:00'`` would cause a failure.
-* Extend predicate inference and pushdown for queries using a ``<symbol> IN <subquery>`` predicate.
-* Support predicate pushdown for the ``<column> IN <values list>`` predicate
-  where values in the ``values list`` require casting to match the type of ``column``.
-* Optimize :func:`min` and :func:`max` to avoid unnecessary object creation in order to reduce GC overhead.
-* Optimize the performance of :func:`ST_XMin`, :func:`ST_XMax`, :func:`ST_YMin`, and :func:`ST_YMax`.
-* Add ``DATE`` variant for :func:`sequence` function.
-* Add :func:`ST_IsSimple` geospatial function.
-* Add support for broadcast spatial joins.
-
-Resource groups
----------------
-
-* Change configuration check for weights in resource group policy to validate that
-  either all of the sub-groups or none of the sub-groups have a scheduling weight configured.
-* Add support for named variables in source and user regular expressions that can be
-  used to parameterize resource group names.
-* Add support for optional fields in DB resource group exact match selectors.
-
-Hive
-----
-
-* Fix reading of Hive partition statistics with unset fields. Previously, unset fields
-  were incorrectly interpreted as having a value of zero.
-* Fix integer overflow when writing a single file greater than 2GB with optimized ORC writer.
-* Fix system memory accounting to include stripe statistics size and
-  writer validation size for the optimized ORC writer.
-* Dynamically allocate the compression buffer for the optimized ORC writer
-  to avoid unnecessary memory allocation. Add config property
-  ``hive.orc.writer.max-compression-buffer-size`` to limit the maximum size of the buffer.
-* Add session property ``orc_optimized_writer_max_stripe_size`` to tune the
-  maximum stipe size for the optimized ORC writer.
-* Add session property ``orc_string_statistics_limit`` to drop the string
-  statistics when writing ORC files if they exceed the limit.
-* Use the view owner returned from the metastore at the time of the query rather than
-  always using the user who created the view. This allows changing the owner of a view.
-
-CLI
----
-
-* Fix hang when CLI fails to communicate with Presto server.
-
-SPI
----
-
-* Include connector session properties for the connector metadata calls made
-  when running ``SHOW`` statements or querying ``information_schema``.
-* Add count and time of full GC that occurred while query was running to ``QueryCompletedEvent``.
-* Change the ``ResourceGroupManager`` interface to include a ``match()`` method and
-  remove the ``getSelectors()`` method and the ``ResourceGroupSelector`` interface.
-* Rename the existing ``SelectionContext`` class to be ``SelectionCriteria`` and
-  create a new ``SelectionContext`` class that is returned from the ``match()`` method
-  and contains the resource group ID and a manager-defined context field.
-* Use the view owner from ``ConnectorViewDefinition`` when present.
diff --git a/docs/src/main/sphinx/release/release-0.198.md b/docs/src/main/sphinx/release/release-0.198.md
new file mode 100644
index 000000000000..57f17b7f0bd8
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.198.md
@@ -0,0 +1,63 @@
+# Release 0.198
+
+## General
+
+- Perform semantic analysis before enqueuing queries.
+- Add support for selective aggregates (`FILTER`) with `DISTINCT` argument qualifiers.
+- Support `ESCAPE` for `LIKE` predicate in `SHOW SCHEMAS` and `SHOW TABLES` queries.
+- Parse decimal literals (e.g. `42.0`) as `DECIMAL` by default. Previously, they were parsed as
+  `DOUBLE`. This behavior can be turned off via the `parse-decimal-literals-as-double` config option or
+  the `parse_decimal_literals_as_double` session property.
+- Fix `current_date` failure when the session time zone has a "gap" at `1970-01-01 00:00:00`.
+  The time zone `America/Bahia_Banderas` is one such example.
+- Add variant of {func}`sequence` function for `DATE` with an implicit one-day step increment.
+- Increase the maximum number of arguments for the {func}`zip` function from 4 to 5.
+- Add {func}`ST_IsValid`, {func}`geometry_invalid_reason`, {func}`simplify_geometry`, and
+  {func}`great_circle_distance` functions.
+- Support {func}`min` and {func}`max` aggregation functions when the input type is unknown at query analysis time.
+  In particular, this allows using the functions with `NULL` literals.
+- Add configuration property `task.max-local-exchange-buffer-size` for setting local exchange buffer size.
+- Add trace token support to the scheduler and exchange HTTP clients. Each HTTP request sent
+  by the scheduler and exchange HTTP clients will have a "trace token" (a unique ID) in their
+  headers, which will be logged in the HTTP request logs. This information can be used to
+  correlate the requests and responses during debugging.
+- Improve query performance when dynamic writer scaling is enabled.
+- Improve performance of {func}`ST_Intersects`.
+- Improve query latency when tables are known to be empty during query planning.
+- Optimize {func}`array_agg` to avoid excessive object overhead and native memory usage with G1 GC.
+- Improve performance for high-cardinality aggregations with `DISTINCT` argument qualifiers. This
+  is an experimental optimization that can be activated by disabling the `use_mark_distinct` session
+  property or the `optimizer.use-mark-distinct` config option.
+- Improve parallelism of queries that have an empty grouping set.
+- Improve performance of join queries involving the {func}`ST_Distance` function.
+
+## Resource groups
+
+- Query Queues have been removed. Resource Groups are always enabled. The
+  config property `experimental.resource-groups-enabled` has been removed.
+- Change `WEIGHTED_FAIR` scheduling policy to select oldest eligible sub group
+  of groups where utilization and share are identical.
+
+## CLI
+
+- The `--enable-authentication` option has been removed. Kerberos authentication
+  is automatically enabled when `--krb5-remote-service-name` is specified.
+- Kerberos authentication now requires HTTPS.
+
+## Hive
+
+- Add support for using [AWS Glue](https://aws.amazon.com/glue/) as the metastore.
+  Enable it by setting the `hive.metastore` config property to `glue`.
+- Fix a bug in the ORC writer that will write incorrect data of type `VARCHAR` or `VARBINARY`
+  into files.
+
+## JMX
+
+- Add wildcard character `*` which allows querying several MBeans with a single query.
+
+## SPI
+
+- Add performance statistics to query plan in `QueryCompletedEvent`.
+- Remove `Page.getBlocks()`. This call was rarely used and performed an expensive copy.
+  Instead, use `Page.getBlock(channel)` or the new helper `Page.appendColumn()`.
+- Improve validation of `ArrayBlock`, `MapBlock`, and `RowBlock` during construction.
diff --git a/docs/src/main/sphinx/release/release-0.198.rst b/docs/src/main/sphinx/release/release-0.198.rst
deleted file mode 100644
index b5399ffa40ca..000000000000
--- a/docs/src/main/sphinx/release/release-0.198.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-=============
-Release 0.198
-=============
-
-General
--------
-
-* Perform semantic analysis before enqueuing queries.
-* Add support for selective aggregates (``FILTER``) with ``DISTINCT`` argument qualifiers.
-* Support ``ESCAPE`` for ``LIKE`` predicate in ``SHOW SCHEMAS`` and ``SHOW TABLES`` queries.
-* Parse decimal literals (e.g. ``42.0``) as ``DECIMAL`` by default. Previously, they were parsed as
-  ``DOUBLE``. This behavior can be turned off via the ``parse-decimal-literals-as-double`` config option or
-  the ``parse_decimal_literals_as_double`` session property.
-* Fix ``current_date`` failure when the session time zone has a "gap" at ``1970-01-01 00:00:00``.
-  The time zone ``America/Bahia_Banderas`` is one such example.
-* Add variant of :func:`sequence` function for ``DATE`` with an implicit one-day step increment.
-* Increase the maximum number of arguments for the :func:`zip` function from 4 to 5.
-* Add :func:`ST_IsValid`, :func:`geometry_invalid_reason`, :func:`simplify_geometry`, and
-  :func:`great_circle_distance` functions.
-* Support :func:`min` and :func:`max` aggregation functions when the input type is unknown at query analysis time.
-  In particular, this allows using the functions with ``NULL`` literals.
-* Add configuration property ``task.max-local-exchange-buffer-size`` for setting local exchange buffer size.
-* Add trace token support to the scheduler and exchange HTTP clients. Each HTTP request sent
-  by the scheduler and exchange HTTP clients will have a "trace token" (a unique ID) in their
-  headers, which will be logged in the HTTP request logs. This information can be used to
-  correlate the requests and responses during debugging.
-* Improve query performance when dynamic writer scaling is enabled.
-* Improve performance of :func:`ST_Intersects`.
-* Improve query latency when tables are known to be empty during query planning.
-* Optimize :func:`array_agg` to avoid excessive object overhead and native memory usage with G1 GC.
-* Improve performance for high-cardinality aggregations with ``DISTINCT`` argument qualifiers. This
-  is an experimental optimization that can be activated by disabling the ``use_mark_distinct`` session
-  property or the ``optimizer.use-mark-distinct`` config option.
-* Improve parallelism of queries that have an empty grouping set.
-* Improve performance of join queries involving the :func:`ST_Distance` function.
-
-Resource groups
----------------
-
-* Query Queues have been removed. Resource Groups are always enabled. The
-  config property ``experimental.resource-groups-enabled`` has been removed.
-* Change ``WEIGHTED_FAIR`` scheduling policy to select oldest eligible sub group
-  of groups where utilization and share are identical.
-
-CLI
----
-
-* The ``--enable-authentication`` option has been removed. Kerberos authentication
-  is automatically enabled when ``--krb5-remote-service-name`` is specified.
-* Kerberos authentication now requires HTTPS.
-
-Hive
-----
-
-* Add support for using `AWS Glue <https://aws.amazon.com/glue/>`_ as the metastore.
-  Enable it by setting the ``hive.metastore`` config property to ``glue``.
-* Fix a bug in the ORC writer that will write incorrect data of type ``VARCHAR`` or ``VARBINARY``
-  into files.
-
-JMX
----
-
-* Add wildcard character ``*`` which allows querying several MBeans with a single query.
-
-SPI
----
-
-* Add performance statistics to query plan in ``QueryCompletedEvent``.
-* Remove ``Page.getBlocks()``. This call was rarely used and performed an expensive copy.
-  Instead, use ``Page.getBlock(channel)`` or the new helper ``Page.appendColumn()``.
-* Improve validation of ``ArrayBlock``, ``MapBlock``, and ``RowBlock`` during construction.
diff --git a/docs/src/main/sphinx/release/release-0.199.md b/docs/src/main/sphinx/release/release-0.199.md
new file mode 100644
index 000000000000..09e366cce81f
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.199.md
@@ -0,0 +1,78 @@
+# Release 0.199
+
+## General
+
+- Allow users to create views for their own use when they do not have permission
+  to grant others access to the underlying tables or views. To enable this,
+  creation permission is now only checked at query time, not at creation time,
+  and the query time check is skipped if the user is the owner of the view.
+- Add support for spatial left join.
+- Add {func}`hmac_md5`, {func}`hmac_sha1`, {func}`hmac_sha256`, and {func}`hmac_sha512` functions.
+- Add {func}`array_sort` function that takes a lambda as a comparator.
+- Add {func}`line_locate_point` geospatial function.
+- Add support for `ORDER BY` clause in aggregations for queries that use grouping sets.
+- Add support for yielding when unspilling an aggregation.
+- Expand grouped execution support to `GROUP BY` and `UNION ALL`, making it possible
+  to execute aggregations with less peak memory usage.
+- Change the signature of `round(x, d)` and `truncate(x, d)` functions so that
+  `d` is of type `INTEGER`. Previously, `d` could be of type `BIGINT`.
+  This behavior can be restored with the `deprecated.legacy-round-n-bigint` config option
+  or the `legacy_round_n_bigint` session property.
+- Accessing anonymous row fields via `.field0`, `.field1`, etc., is no longer allowed.
+  This behavior can be restored with the `deprecated.legacy-row-field-ordinal-access`
+  config option or the `legacy_row_field_ordinal_access` session property.
+- Optimize the {func}`ST_Intersection` function for rectangles aligned with coordinate axes
+  (e.g., polygons produced by the {func}`ST_Envelope` and {func}`bing_tile_polygon` functions).
+- Finish joins early when possible if one side has no rows. This happens for
+  either side of an inner join, for the left side of a left join, and for the
+  right side of a right join.
+- Improve predicate evaluation performance during predicate pushdown in planning.
+- Improve the performance of queries that use `LIKE` predicates on the columns of `information_schema` tables.
+- Improve the performance of map-to-map cast.
+- Improve the performance of {func}`ST_Touches`, {func}`ST_Within`, {func}`ST_Overlaps`, {func}`ST_Disjoint`,
+  and {func}`ST_Crosses` functions.
+- Improve the serialization performance of geometry values.
+- Improve the performance of functions that return maps.
+- Improve the performance of joins and aggregations that include map columns.
+
+## Server RPM
+
+- Add support for installing on machines with OpenJDK.
+
+## Security
+
+- Add support for authentication with JWT access token.
+
+## JDBC driver
+
+- Make driver compatible with Java 9+. It previously failed with `IncompatibleClassChangeError`.
+
+## Hive
+
+- Fix ORC writer failure when writing `NULL` values into columns of type `ROW`, `MAP`,  or `ARRAY`.
+- Fix ORC writers incorrectly writing non-null values as `NULL` for all types.
+- Support reading Hive partitions that have a different bucket count than the table,
+  as long as the ratio is a power of two (`1:2^n` or `2^n:1`).
+- Add support for the `skip.header.line.count` table property.
+- Prevent reading from tables with the `skip.footer.line.count` table property.
+- Partitioned tables now have a hidden system table that contains the partition values.
+  A table named `example` will have a partitions table named `example$partitions`.
+  This provides the same functionality and data as `SHOW PARTITIONS`.
+- Partition name listings, both via the `$partitions` table and using
+  `SHOW PARTITIONS`, are no longer subject to the limit defined by the
+  `hive.max-partitions-per-scan` config option.
+- Allow marking partitions as offline via the `presto_offline` partition property.
+
+## Thrift connector
+
+- Most of the config property names are different due to replacing the
+  underlying Thrift client implementation. Please see {doc}`/connector/thrift`
+  for details on the new properties.
+
+## SPI
+
+- Allow connectors to provide system tables dynamically.
+- Add `resourceGroupId` and `queryType` fields to `SessionConfigurationContext`.
+- Simplify the constructor of `RowBlock`.
+- `Block.writePositionTo()` now closes the current entry.
+- Replace the `writeObject()` method in `BlockBuilder` with `appendStructure()`.
diff --git a/docs/src/main/sphinx/release/release-0.199.rst b/docs/src/main/sphinx/release/release-0.199.rst
deleted file mode 100644
index a1db18bb4a19..000000000000
--- a/docs/src/main/sphinx/release/release-0.199.rst
+++ /dev/null
@@ -1,87 +0,0 @@
-=============
-Release 0.199
-=============
-
-General
--------
-
-* Allow users to create views for their own use when they do not have permission
-  to grant others access to the underlying tables or views. To enable this,
-  creation permission is now only checked at query time, not at creation time,
-  and the query time check is skipped if the user is the owner of the view.
-* Add support for spatial left join.
-* Add :func:`hmac_md5`, :func:`hmac_sha1`, :func:`hmac_sha256`, and :func:`hmac_sha512` functions.
-* Add :func:`array_sort` function that takes a lambda as a comparator.
-* Add :func:`line_locate_point` geospatial function.
-* Add support for ``ORDER BY`` clause in aggregations for queries that use grouping sets.
-* Add support for yielding when unspilling an aggregation.
-* Expand grouped execution support to ``GROUP BY`` and ``UNION ALL``, making it possible
-  to execute aggregations with less peak memory usage.
-* Change the signature of ``round(x, d)`` and ``truncate(x, d)`` functions so that
-  ``d`` is of type ``INTEGER``. Previously, ``d`` could be of type ``BIGINT``.
-  This behavior can be restored with the ``deprecated.legacy-round-n-bigint`` config option
-  or the ``legacy_round_n_bigint`` session property.
-* Accessing anonymous row fields via ``.field0``, ``.field1``, etc., is no longer allowed.
-  This behavior can be restored with the ``deprecated.legacy-row-field-ordinal-access``
-  config option or the ``legacy_row_field_ordinal_access`` session property.
-* Optimize the :func:`ST_Intersection` function for rectangles aligned with coordinate axes
-  (e.g., polygons produced by the :func:`ST_Envelope` and :func:`bing_tile_polygon` functions).
-* Finish joins early when possible if one side has no rows. This happens for
-  either side of an inner join, for the left side of a left join, and for the
-  right side of a right join.
-* Improve predicate evaluation performance during predicate pushdown in planning.
-* Improve the performance of queries that use ``LIKE`` predicates on the columns of ``information_schema`` tables.
-* Improve the performance of map-to-map cast.
-* Improve the performance of :func:`ST_Touches`, :func:`ST_Within`, :func:`ST_Overlaps`, :func:`ST_Disjoint`,
-  and :func:`ST_Crosses` functions.
-* Improve the serialization performance of geometry values.
-* Improve the performance of functions that return maps.
-* Improve the performance of joins and aggregations that include map columns.
-
-Server RPM
-----------
-
-* Add support for installing on machines with OpenJDK.
-
-Security
---------
-
-* Add support for authentication with JWT access token.
-
-JDBC driver
------------
-
-* Make driver compatible with Java 9+. It previously failed with ``IncompatibleClassChangeError``.
-
-Hive
-----
-
-* Fix ORC writer failure when writing ``NULL`` values into columns of type ``ROW``, ``MAP``,  or ``ARRAY``.
-* Fix ORC writers incorrectly writing non-null values as ``NULL`` for all types.
-* Support reading Hive partitions that have a different bucket count than the table,
-  as long as the ratio is a power of two (``1:2^n`` or ``2^n:1``).
-* Add support for the ``skip.header.line.count`` table property.
-* Prevent reading from tables with the ``skip.footer.line.count`` table property.
-* Partitioned tables now have a hidden system table that contains the partition values.
-  A table named ``example`` will have a partitions table named ``example$partitions``.
-  This provides the same functionality and data as ``SHOW PARTITIONS``.
-* Partition name listings, both via the ``$partitions`` table and using
-  ``SHOW PARTITIONS``, are no longer subject to the limit defined by the
-  ``hive.max-partitions-per-scan`` config option.
-* Allow marking partitions as offline via the ``presto_offline`` partition property.
-
-Thrift connector
-----------------
-
-* Most of the config property names are different due to replacing the
-  underlying Thrift client implementation. Please see :doc:`/connector/thrift`
-  for details on the new properties.
-
-SPI
----
-
-* Allow connectors to provide system tables dynamically.
-* Add ``resourceGroupId`` and ``queryType`` fields to ``SessionConfigurationContext``.
-* Simplify the constructor of ``RowBlock``.
-* ``Block.writePositionTo()`` now closes the current entry.
-* Replace the ``writeObject()`` method in ``BlockBuilder`` with ``appendStructure()``.
diff --git a/docs/src/main/sphinx/release/release-0.200.md b/docs/src/main/sphinx/release/release-0.200.md
new file mode 100644
index 000000000000..3a0546be81fa
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.200.md
@@ -0,0 +1,31 @@
+# Release 0.200
+
+## General
+
+- Disable early termination of inner or right joins when the right side
+  has zero rows. This optimization can cause indefinite query hangs
+  for queries that join against a small number of rows.
+  This regression was introduced in 0.199.
+- Fix query execution failure for {func}`bing_tile_coordinates`.
+- Remove the `log()` function. The arguments to the function were in the
+  wrong order according to the SQL standard, resulting in incorrect results
+  when queries were translated to or from other SQL implementations. The
+  equivalent to `log(x, b)` is `ln(x) / ln(b)`. The function can be
+  restored with the `deprecated.legacy-log-function` config option.
+- Allow including a comment when adding a column to a table with `ALTER TABLE`.
+- Add {func}`from_ieee754_32` and {func}`from_ieee754_64` functions.
+- Add {func}`ST_GeometryType` geospatial function.
+
+## Hive
+
+- Fix reading min/max statistics for columns of `REAL` type in partitioned tables.
+- Fix failure when reading Parquet files with optimized Parquet reader
+  related with the predicate push down for structural types.
+  Predicates on structural types are now ignored for Parquet files.
+- Fix failure when reading ORC files that contain UTF-8 Bloom filter streams.
+  Such Bloom filters are now ignored.
+
+## MySQL
+
+- Avoid reading extra rows from MySQL at query completion.
+  This typically affects queries with a `LIMIT` clause.
diff --git a/docs/src/main/sphinx/release/release-0.200.rst b/docs/src/main/sphinx/release/release-0.200.rst
deleted file mode 100644
index ff679178f3a7..000000000000
--- a/docs/src/main/sphinx/release/release-0.200.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-=============
-Release 0.200
-=============
-
-General
--------
-
-* Disable early termination of inner or right joins when the right side
-  has zero rows. This optimization can cause indefinite query hangs
-  for queries that join against a small number of rows.
-  This regression was introduced in 0.199.
-* Fix query execution failure for :func:`bing_tile_coordinates`.
-* Remove the ``log()`` function. The arguments to the function were in the
-  wrong order according to the SQL standard, resulting in incorrect results
-  when queries were translated to or from other SQL implementations. The
-  equivalent to ``log(x, b)`` is ``ln(x) / ln(b)``. The function can be
-  restored with the ``deprecated.legacy-log-function`` config option.
-* Allow including a comment when adding a column to a table with ``ALTER TABLE``.
-* Add :func:`from_ieee754_32` and :func:`from_ieee754_64` functions.
-* Add :func:`ST_GeometryType` geospatial function.
-
-Hive
-----
-
-* Fix reading min/max statistics for columns of ``REAL`` type in partitioned tables.
-* Fix failure when reading Parquet files with optimized Parquet reader
-  related with the predicate push down for structural types.
-  Predicates on structural types are now ignored for Parquet files.
-* Fix failure when reading ORC files that contain UTF-8 Bloom filter streams.
-  Such Bloom filters are now ignored.
-
-MySQL
------
-
-* Avoid reading extra rows from MySQL at query completion.
-  This typically affects queries with a ``LIMIT`` clause.
diff --git a/docs/src/main/sphinx/release/release-0.201.md b/docs/src/main/sphinx/release/release-0.201.md
new file mode 100644
index 000000000000..9b1a7e2e6334
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.201.md
@@ -0,0 +1,41 @@
+# Release 0.201
+
+## General
+
+- Change grouped aggregations to use `IS NOT DISTINCT FROM` semantics rather than equality
+  semantics. This fixes incorrect results and degraded performance when grouping on `NaN`
+  floating point values, and adds support for grouping on structural types that contain nulls.
+- Fix planning error when column names are reused in `ORDER BY` query.
+- System memory pool is now unused by default and it will eventually be removed completely.
+  All memory allocations will now be served from the general/user memory pool. The old behavior
+  can be restored with the `deprecated.legacy-system-pool-enabled` config option.
+- Improve performance and memory usage for queries using {func}`row_number` followed by a
+  filter on the row numbers generated.
+- Improve performance and memory usage for queries using `ORDER BY` followed by a `LIMIT`.
+- Improve performance of queries that process structural types and contain joins, aggregations,
+  or table writes.
+- Add session property `prefer-partial-aggregation` to allow users to disable partial
+  aggregations for queries that do not benefit.
+- Add support for `current_user` (see {doc}`/functions/session`).
+
+## Security
+
+- Change rules in the {doc}`/security/built-in-system-access-control` for enforcing matches
+  between authentication credentials and a chosen username to allow more fine-grained
+  control and ability to define superuser-like credentials.
+
+## Hive
+
+- Replace ORC writer stripe minimum row configuration `hive.orc.writer.stripe-min-rows`
+  with stripe minimum data size `hive.orc.writer.stripe-min-size`.
+- Change ORC writer validation configuration `hive.orc.writer.validate` to switch to a
+  sampling percentage `hive.orc.writer.validation-percentage`.
+- Fix optimized ORC writer writing incorrect data of type `map` or `array`.
+- Fix `SHOW PARTITIONS` and the `$partitions` table for tables that have null partition
+  values.
+- Fix impersonation for the simple HDFS authentication to use login user rather than current
+  user.
+
+## SPI
+
+- Support resource group selection based on resource estimates.
diff --git a/docs/src/main/sphinx/release/release-0.201.rst b/docs/src/main/sphinx/release/release-0.201.rst
deleted file mode 100644
index fe3f4bc872b5..000000000000
--- a/docs/src/main/sphinx/release/release-0.201.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-=============
-Release 0.201
-=============
-
-General
--------
-
-* Change grouped aggregations to use ``IS NOT DISTINCT FROM`` semantics rather than equality
-  semantics. This fixes incorrect results and degraded performance when grouping on ``NaN``
-  floating point values, and adds support for grouping on structural types that contain nulls.
-* Fix planning error when column names are reused in ``ORDER BY`` query.
-* System memory pool is now unused by default and it will eventually be removed completely.
-  All memory allocations will now be served from the general/user memory pool. The old behavior
-  can be restored with the ``deprecated.legacy-system-pool-enabled`` config option.
-* Improve performance and memory usage for queries using :func:`row_number` followed by a
-  filter on the row numbers generated.
-* Improve performance and memory usage for queries using ``ORDER BY`` followed by a ``LIMIT``.
-* Improve performance of queries that process structural types and contain joins, aggregations,
-  or table writes.
-* Add session property ``prefer-partial-aggregation`` to allow users to disable partial
-  aggregations for queries that do not benefit.
-* Add support for ``current_user`` (see :doc:`/functions/session`).
-
-Security
---------
-
-* Change rules in the :doc:`/security/built-in-system-access-control` for enforcing matches
-  between authentication credentials and a chosen username to allow more fine-grained
-  control and ability to define superuser-like credentials.
-
-Hive
-----
-
-* Replace ORC writer stripe minimum row configuration ``hive.orc.writer.stripe-min-rows``
-  with stripe minimum data size ``hive.orc.writer.stripe-min-size``.
-* Change ORC writer validation configuration ``hive.orc.writer.validate`` to switch to a
-  sampling percentage ``hive.orc.writer.validation-percentage``.
-* Fix optimized ORC writer writing incorrect data of type ``map`` or ``array``.
-* Fix ``SHOW PARTITIONS`` and the ``$partitions`` table for tables that have null partition
-  values.
-* Fix impersonation for the simple HDFS authentication to use login user rather than current
-  user.
-
-SPI
----
-
-* Support resource group selection based on resource estimates.
diff --git a/docs/src/main/sphinx/release/release-0.202.md b/docs/src/main/sphinx/release/release-0.202.md
new file mode 100644
index 000000000000..2621b4f22d39
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.202.md
@@ -0,0 +1,62 @@
+# Release 0.202
+
+## General
+
+- Fix correctness issue for queries involving aggregations over the result of an outer join ({issue}`x10592`).
+- Fix {func}`map` to raise an error on duplicate keys rather than silently producing a corrupted map.
+- Fix {func}`map_from_entries` to raise an error when input array contains a `null` entry.
+- Fix out-of-memory error for bucketed execution by scheduling new splits on the same worker as
+  the recently finished one.
+- Fix query failure when performing a `GROUP BY` on `json` or `ipaddress` types.
+- Fix correctness issue in {func}`line_locate_point`, {func}`ST_IsValid`, and {func}`geometry_invalid_reason`
+  functions to not return values outside of the expected range.
+- Fix failure in {func}`geometry_to_bing_tiles` and {func}`ST_NumPoints` functions when
+  processing geometry collections.
+- Fix query failure in aggregation spilling ({issue}`x10587`).
+- Remove support for `SHOW PARTITIONS` statement.
+- Improve support for correlated subqueries containing equality predicates.
+- Improve performance of correlated `EXISTS` subqueries.
+- Limit the number of grouping sets in a `GROUP BY` clause.
+  The default limit is `2048` and can be set via the `analyzer.max-grouping-sets`
+  configuration property or the `max_grouping_sets` session property.
+- Allow coercion between row types regardless of field names.
+  Previously, a row type is coercible to another only if the field name in the source type
+  matches the target type, or when target type has anonymous field name.
+- Increase default value for `experimental.filter-and-project-min-output-page-size` to `500kB`.
+- Improve performance of equals operator on `array(bigint)` and `array(double)` types.
+- Respect `X-Forwarded-Proto` header in client protocol responses.
+- Add support for column-level access control.
+  Connectors have not yet been updated to take advantage of this support.
+- Add support for correlated subqueries with correlated `OR` predicates.
+- Add {func}`multimap_from_entries` function.
+- Add {func}`bing_tiles_around`, {func}`ST_NumGeometries`, {func}`ST_GeometryN`, and {func}`ST_ConvexHull` geospatial functions.
+- Add {func}`wilson_interval_lower` and {func}`wilson_interval_upper` functions.
+- Add `IS DISTINCT FROM` for `json` and `ipaddress` type.
+
+## Hive
+
+- Fix optimized ORC writer encoding of `TIMESTAMP` before `1970-01-01`.  Previously, the
+  written value was off by one second.
+- Fix query failure when a Hive bucket has no splits. This commonly happens when a
+  predicate filters some buckets out entirely.
+- Remove the `hive.bucket-writing` config property.
+- Add support for creating and writing bucketed sorted tables. The list of
+  sorting columns may be specified using the `sorted_by` table property.
+  Writing to sorted tables can be disabled using the `hive.sorted-writing`
+  config property or the `sorted_writing_enabled` session property. The
+  maximum number of temporary files for can be controlled using the
+  `hive.max-sort-files-per-bucket` property.
+- Collect and store basic table statistics (`rowCount`, `fileCount`, `rawDataSize`,
+  `totalSize`) when writing.
+- Add `hive.orc.tiny-stripe-threshold` config property and `orc_tiny_stripe_threshold`
+  session property to control the stripe/file size threshold when ORC reader decides to
+  read multiple consecutive stripes or entire fires at once. Previously, this feature
+  piggybacks on other properties.
+
+## CLI
+
+- Add peak memory usage to `--debug` output.
+
+## SPI
+
+- Make `PageSorter` and `PageIndexer` supported interfaces.
diff --git a/docs/src/main/sphinx/release/release-0.202.rst b/docs/src/main/sphinx/release/release-0.202.rst
deleted file mode 100644
index 2fd2ad8bc317..000000000000
--- a/docs/src/main/sphinx/release/release-0.202.rst
+++ /dev/null
@@ -1,68 +0,0 @@
-=============
-Release 0.202
-=============
-
-General
--------
-
-* Fix correctness issue for queries involving aggregations over the result of an outer join (:issue:`x10592`).
-* Fix :func:`map` to raise an error on duplicate keys rather than silently producing a corrupted map.
-* Fix :func:`map_from_entries` to raise an error when input array contains a ``null`` entry.
-* Fix out-of-memory error for bucketed execution by scheduling new splits on the same worker as
-  the recently finished one.
-* Fix query failure when performing a ``GROUP BY`` on ``json`` or ``ipaddress`` types.
-* Fix correctness issue in :func:`line_locate_point`, :func:`ST_IsValid`, and :func:`geometry_invalid_reason`
-  functions to not return values outside of the expected range.
-* Fix failure in :func:`geometry_to_bing_tiles` and :func:`ST_NumPoints` functions when
-  processing geometry collections.
-* Fix query failure in aggregation spilling (:issue:`x10587`).
-* Remove support for ``SHOW PARTITIONS`` statement.
-* Improve support for correlated subqueries containing equality predicates.
-* Improve performance of correlated ``EXISTS`` subqueries.
-* Limit the number of grouping sets in a ``GROUP BY`` clause.
-  The default limit is ``2048`` and can be set via the ``analyzer.max-grouping-sets``
-  configuration property or the ``max_grouping_sets`` session property.
-* Allow coercion between row types regardless of field names.
-  Previously, a row type is coercible to another only if the field name in the source type
-  matches the target type, or when target type has anonymous field name.
-* Increase default value for ``experimental.filter-and-project-min-output-page-size`` to ``500kB``.
-* Improve performance of equals operator on ``array(bigint)`` and ``array(double)`` types.
-* Respect ``X-Forwarded-Proto`` header in client protocol responses.
-* Add support for column-level access control.
-  Connectors have not yet been updated to take advantage of this support.
-* Add support for correlated subqueries with correlated ``OR`` predicates.
-* Add :func:`multimap_from_entries` function.
-* Add :func:`bing_tiles_around`, :func:`ST_NumGeometries`, :func:`ST_GeometryN`, and :func:`ST_ConvexHull` geospatial functions.
-* Add :func:`wilson_interval_lower` and :func:`wilson_interval_upper` functions.
-* Add ``IS DISTINCT FROM`` for ``json`` and ``ipaddress`` type.
-
-Hive
-----
-
-* Fix optimized ORC writer encoding of ``TIMESTAMP`` before ``1970-01-01``.  Previously, the
-  written value was off by one second.
-* Fix query failure when a Hive bucket has no splits. This commonly happens when a
-  predicate filters some buckets out entirely.
-* Remove the ``hive.bucket-writing`` config property.
-* Add support for creating and writing bucketed sorted tables. The list of
-  sorting columns may be specified using the ``sorted_by`` table property.
-  Writing to sorted tables can be disabled using the ``hive.sorted-writing``
-  config property or the ``sorted_writing_enabled`` session property. The
-  maximum number of temporary files for can be controlled using the
-  ``hive.max-sort-files-per-bucket`` property.
-* Collect and store basic table statistics (``rowCount``, ``fileCount``, ``rawDataSize``,
-  ``totalSize``) when writing.
-* Add ``hive.orc.tiny-stripe-threshold`` config property and ``orc_tiny_stripe_threshold``
-  session property to control the stripe/file size threshold when ORC reader decides to
-  read multiple consecutive stripes or entire fires at once. Previously, this feature
-  piggybacks on other properties.
-
-CLI
----
-
-* Add peak memory usage to ``--debug`` output.
-
-SPI
----
-
-* Make ``PageSorter`` and ``PageIndexer`` supported interfaces.
diff --git a/docs/src/main/sphinx/release/release-0.203.md b/docs/src/main/sphinx/release/release-0.203.md
new file mode 100644
index 000000000000..209fc57aae23
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.203.md
@@ -0,0 +1,49 @@
+# Release 0.203
+
+## General
+
+- Fix spurious duplicate key errors from {func}`map`.
+- Fix planning failure when a correlated subquery containing a `LIMIT`
+  clause is used within `EXISTS` ({issue}`x10696`).
+- Fix out of memory error caused by missing pushback checks in data exchanges.
+- Fix execution failure for queries containing a cross join when using bucketed execution.
+- Fix execution failure for queries containing an aggregation function
+  with `DISTINCT` and a highly selective aggregation filter.
+  For example: `sum(DISTINCT x) FILTER (WHERE y = 0)`
+- Fix quoting in error message for `SHOW PARTITIONS`.
+- Eliminate redundant calls to check column access permissions.
+- Improve query creation reliability by delaying query start until the client
+  acknowledges the query ID by fetching the first response link. This eliminates
+  timeouts during the initial request for queries that take a long time to analyze.
+- Remove support for legacy `ORDER BY` semantics.
+- Distinguish between inner and left spatial joins in explain plans.
+
+## Security
+
+- Fix sending authentication challenge when at least two of the
+  `KERBEROS`, `PASSWORD`, or `JWT` authentication types are configured.
+- Allow using PEM encoded (PKCS #8) keystore and truststore with the HTTP server
+  and the HTTP client used for internal communication. This was already supported
+  for the CLI and JDBC driver.
+
+## Server RPM
+
+- Declare a dependency on `uuidgen`. The `uuidgen` program is required during
+  installation of the Presto server RPM package and lack of it resulted in an invalid
+  config file being generated during installation.
+
+## Hive connector
+
+- Fix complex type handling in the optimized Parquet reader. Previously, null values,
+  optional fields, and Parquet backward compatibility rules were not handled correctly.
+- Fix an issue that could cause the optimized ORC writer to fail with a `LazyBlock` error.
+- Improve error message for max open writers.
+
+## Thrift connector
+
+- Fix retry of requests when the remote Thrift server indicates that the
+  error is retryable.
+
+## Local file connector
+
+- Fix parsing of timestamps when the JVM time zone is UTC ({issue}`x9601`).
diff --git a/docs/src/main/sphinx/release/release-0.203.rst b/docs/src/main/sphinx/release/release-0.203.rst
deleted file mode 100644
index 1fef87bd75cc..000000000000
--- a/docs/src/main/sphinx/release/release-0.203.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-=============
-Release 0.203
-=============
-
-General
--------
-
-* Fix spurious duplicate key errors from :func:`map`.
-* Fix planning failure when a correlated subquery containing a ``LIMIT``
-  clause is used within ``EXISTS`` (:issue:`x10696`).
-* Fix out of memory error caused by missing pushback checks in data exchanges.
-* Fix execution failure for queries containing a cross join when using bucketed execution.
-* Fix execution failure for queries containing an aggregation function
-  with ``DISTINCT`` and a highly selective aggregation filter.
-  For example: ``sum(DISTINCT x) FILTER (WHERE y = 0)``
-* Fix quoting in error message for ``SHOW PARTITIONS``.
-* Eliminate redundant calls to check column access permissions.
-* Improve query creation reliability by delaying query start until the client
-  acknowledges the query ID by fetching the first response link. This eliminates
-  timeouts during the initial request for queries that take a long time to analyze.
-* Remove support for legacy ``ORDER BY`` semantics.
-* Distinguish between inner and left spatial joins in explain plans.
-
-Security
---------
-
-* Fix sending authentication challenge when at least two of the
-  ``KERBEROS``, ``PASSWORD``, or ``JWT`` authentication types are configured.
-* Allow using PEM encoded (PKCS #8) keystore and truststore with the HTTP server
-  and the HTTP client used for internal communication. This was already supported
-  for the CLI and JDBC driver.
-
-Server RPM
-----------
-
-* Declare a dependency on ``uuidgen``. The ``uuidgen`` program is required during
-  installation of the Presto server RPM package and lack of it resulted in an invalid
-  config file being generated during installation.
-
-Hive connector
---------------
-
-* Fix complex type handling in the optimized Parquet reader. Previously, null values,
-  optional fields, and Parquet backward compatibility rules were not handled correctly.
-* Fix an issue that could cause the optimized ORC writer to fail with a ``LazyBlock`` error.
-* Improve error message for max open writers.
-
-Thrift connector
-----------------
-
-* Fix retry of requests when the remote Thrift server indicates that the
-  error is retryable.
-
-Local file connector
---------------------
-
-* Fix parsing of timestamps when the JVM time zone is UTC (:issue:`x9601`).
diff --git a/docs/src/main/sphinx/release/release-0.204.md b/docs/src/main/sphinx/release/release-0.204.md
new file mode 100644
index 000000000000..3f891b2ba28e
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.204.md
@@ -0,0 +1,45 @@
+# Release 0.204
+
+## General
+
+- Use distributed join if one side is naturally partitioned on join keys.
+- Improve performance of correlated subqueries when filters from outer query
+  can be propagated to the subquery.
+- Improve performance for correlated subqueries that contain inequalities.
+- Add support for all geometry types in {func}`ST_Area`.
+- Add {func}`ST_EnvelopeAsPts` function.
+- Add {func}`to_big_endian_32` and {func}`from_big_endian_32` functions.
+- Add cast between `VARBINARY` type and `IPADDRESS` type.
+- Make {func}`lpad` and {func}`rpad` functions support `VARBINARY` in addition to `VARCHAR`.
+- Allow using arrays of mismatched lengths with {func}`zip_with`.
+  The missing positions are filled with `NULL`.
+- Track execution statistics of `AddExchanges` and `PredicatePushdown` optimizer rules.
+
+## Event listener
+
+- Add resource estimates to query events.
+
+## Web UI
+
+- Fix kill query button.
+- Display resource estimates in Web UI query details page.
+
+## Resource group
+
+- Fix unnecessary queuing in deployments where no resource group configuration was specified.
+
+## Hive connector
+
+- Fix over-estimation of memory usage for scan operators when reading ORC files.
+- Fix memory accounting for sort buffer used for writing sorted bucketed tables.
+- Disallow creating tables with unsupported partition types.
+- Support overwriting partitions for insert queries. This behavior is controlled
+  by session property `insert_existing_partitions_behavior`.
+- Prevent the optimized ORC writer from writing excessively large stripes for
+  highly compressed, dictionary encoded columns.
+- Enable optimized Parquet reader and predicate pushdown by default.
+
+## Cassandra connector
+
+- Add support for reading from materialized views.
+- Optimize partition list retrieval for Cassandra 2.2+.
diff --git a/docs/src/main/sphinx/release/release-0.204.rst b/docs/src/main/sphinx/release/release-0.204.rst
deleted file mode 100644
index 2834a8521112..000000000000
--- a/docs/src/main/sphinx/release/release-0.204.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-=============
-Release 0.204
-=============
-
-General
--------
-
-* Use distributed join if one side is naturally partitioned on join keys.
-* Improve performance of correlated subqueries when filters from outer query
-  can be propagated to the subquery.
-* Improve performance for correlated subqueries that contain inequalities.
-* Add support for all geometry types in :func:`ST_Area`.
-* Add :func:`ST_EnvelopeAsPts` function.
-* Add :func:`to_big_endian_32` and :func:`from_big_endian_32` functions.
-* Add cast between ``VARBINARY`` type and ``IPADDRESS`` type.
-* Make :func:`lpad` and :func:`rpad` functions support ``VARBINARY`` in addition to ``VARCHAR``.
-* Allow using arrays of mismatched lengths with :func:`zip_with`.
-  The missing positions are filled with ``NULL``.
-* Track execution statistics of ``AddExchanges`` and ``PredicatePushdown`` optimizer rules.
-
-Event listener
---------------
-
-* Add resource estimates to query events.
-
-Web UI
-------
-
-* Fix kill query button.
-* Display resource estimates in Web UI query details page.
-
-Resource group
---------------
-
-* Fix unnecessary queuing in deployments where no resource group configuration was specified.
-
-Hive connector
---------------
-
-* Fix over-estimation of memory usage for scan operators when reading ORC files.
-* Fix memory accounting for sort buffer used for writing sorted bucketed tables.
-* Disallow creating tables with unsupported partition types.
-* Support overwriting partitions for insert queries. This behavior is controlled
-  by session property ``insert_existing_partitions_behavior``.
-* Prevent the optimized ORC writer from writing excessively large stripes for
-  highly compressed, dictionary encoded columns.
-* Enable optimized Parquet reader and predicate pushdown by default.
-
-Cassandra connector
--------------------
-
-* Add support for reading from materialized views.
-* Optimize partition list retrieval for Cassandra 2.2+.
diff --git a/docs/src/main/sphinx/release/release-0.205.md b/docs/src/main/sphinx/release/release-0.205.md
new file mode 100644
index 000000000000..0e51aeca5db4
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.205.md
@@ -0,0 +1,80 @@
+# Release 0.205
+
+## General
+
+- Fix parsing of row types where the field types contain spaces.
+  Previously, row expressions that included spaces would fail to parse.
+  For example: `cast(row(timestamp '2018-06-01') AS row(timestamp with time zone))`.
+- Fix distributed planning failure for complex queries when using bucketed execution.
+- Fix {func}`ST_ExteriorRing` to only accept polygons.
+  Previously, it erroneously accepted other geometries.
+- Add the `task.min-drivers-per-task` and `task.max-drivers-per-task` config options.
+  The former specifies the guaranteed minimum number of drivers a task will run concurrently
+  given that it has enough work to do. The latter specifies the maximum number of drivers
+  a task can run concurrently.
+- Add the `concurrent-lifespans-per-task` config property to control the default value
+  of the `concurrent_lifespans_per_task` session property.
+- Add the `query_max_total_memory` session property and the `query.max-total-memory`
+  config property. Queries will be aborted after their total (user + system) memory
+  reservation exceeds this threshold.
+- Improve stats calculation for outer joins and correlated subqueries.
+- Reduce memory usage when a `Block` contains all null or all non-null values.
+- Change the internal hash function used in  `approx_distinct`. The result of `approx_distinct`
+  may change in this version compared to the previous version for the same set of values. However,
+  the standard error of the results should still be within the configured bounds.
+- Improve efficiency and reduce memory usage for scalar correlated subqueries with aggregations.
+- Remove the legacy local scheduler and associated configuration properties,
+  `task.legacy-scheduling-behavior` and `task.level-absolute-priority`.
+- Do not allow using the `FILTER` clause for the `COALESCE`, `IF`, or `NULLIF` functions.
+  The syntax was previously allowed but was otherwise ignored.
+
+## Security
+
+- Remove unnecessary check for `SELECT` privileges for `DELETE` queries.
+  Previously, `DELETE` queries could fail if the user only has `DELETE`
+  privileges but not `SELECT` privileges.
+  This only affected connectors that implement `checkCanSelectFromColumns()`.
+- Add a check that the view owner has permission to create the view when
+  running `SELECT` queries against a view. This only affected connectors that
+  implement `checkCanCreateViewWithSelectFromColumns()`.
+- Change `DELETE FROM <table> WHERE <condition>` to check that the user has `SELECT`
+  privileges on the objects referenced by the `WHERE` condition as is required by the SQL standard.
+- Improve the error message when access is denied when selecting from a view due to the
+  view owner having insufficient permissions to create the view.
+
+## JDBC driver
+
+- Add support for prepared statements.
+- Add partial query cancellation via `partialCancel()` on `PrestoStatement`.
+- Use `VARCHAR` rather than `LONGNVARCHAR` for the Presto `varchar` type.
+- Use `VARBINARY` rather than `LONGVARBINARY` for the Presto `varbinary` type.
+
+## Hive connector
+
+- Improve the performance of `INSERT` queries when all partition column values are constants.
+- Improve stripe size estimation for the optimized ORC writer.
+  This reduces the number of cases where tiny ORC stripes will be written.
+- Respect the `skip.footer.line.count` Hive table property.
+
+## CLI
+
+- Prevent the CLI from crashing when running on certain 256 color terminals.
+
+## SPI
+
+- Add a context parameter to the `create()` method in `SessionPropertyConfigurationManagerFactory`.
+- Disallow non-static methods to be annotated with `@ScalarFunction`. Non-static SQL function
+  implementations must now be declared in a class annotated with `@ScalarFunction`.
+- Disallow having multiple public constructors in `@ScalarFunction` classes. All non-static
+  implementations of SQL functions will now be associated with a single constructor.
+  This improves support for providing specialized implementations of SQL functions with generic arguments.
+- Deprecate `checkCanSelectFromTable/checkCanSelectFromView` and
+  `checkCanCreateViewWithSelectFromTable/checkCanCreateViewWithSelectFromView` in `ConnectorAccessControl`
+  and `SystemAccessControl`. `checkCanSelectFromColumns` and `checkCanCreateViewWithSelectFromColumns`
+  should be used instead.
+
+:::{note}
+These are backwards incompatible changes with the previous SPI.
+If you have written a plugin using these features, you will need
+to update your code before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.205.rst b/docs/src/main/sphinx/release/release-0.205.rst
deleted file mode 100644
index abd9497aff49..000000000000
--- a/docs/src/main/sphinx/release/release-0.205.rst
+++ /dev/null
@@ -1,88 +0,0 @@
-=============
-Release 0.205
-=============
-
-General
--------
-
-* Fix parsing of row types where the field types contain spaces.
-  Previously, row expressions that included spaces would fail to parse.
-  For example: ``cast(row(timestamp '2018-06-01') AS row(timestamp with time zone))``.
-* Fix distributed planning failure for complex queries when using bucketed execution.
-* Fix :func:`ST_ExteriorRing` to only accept polygons.
-  Previously, it erroneously accepted other geometries.
-* Add the ``task.min-drivers-per-task`` and ``task.max-drivers-per-task`` config options.
-  The former specifies the guaranteed minimum number of drivers a task will run concurrently
-  given that it has enough work to do. The latter specifies the maximum number of drivers
-  a task can run concurrently.
-* Add the ``concurrent-lifespans-per-task`` config property to control the default value
-  of the ``concurrent_lifespans_per_task`` session property.
-* Add the ``query_max_total_memory`` session property and the ``query.max-total-memory``
-  config property. Queries will be aborted after their total (user + system) memory
-  reservation exceeds this threshold.
-* Improve stats calculation for outer joins and correlated subqueries.
-* Reduce memory usage when a ``Block`` contains all null or all non-null values.
-* Change the internal hash function used in  ``approx_distinct``. The result of ``approx_distinct``
-  may change in this version compared to the previous version for the same set of values. However,
-  the standard error of the results should still be within the configured bounds.
-* Improve efficiency and reduce memory usage for scalar correlated subqueries with aggregations.
-* Remove the legacy local scheduler and associated configuration properties,
-  ``task.legacy-scheduling-behavior`` and ``task.level-absolute-priority``.
-* Do not allow using the ``FILTER`` clause for the ``COALESCE``, ``IF``, or ``NULLIF`` functions.
-  The syntax was previously allowed but was otherwise ignored.
-
-Security
---------
-
-* Remove unnecessary check for ``SELECT`` privileges for ``DELETE`` queries.
-  Previously, ``DELETE`` queries could fail if the user only has ``DELETE``
-  privileges but not ``SELECT`` privileges.
-  This only affected connectors that implement ``checkCanSelectFromColumns()``.
-* Add a check that the view owner has permission to create the view when
-  running ``SELECT`` queries against a view. This only affected connectors that
-  implement ``checkCanCreateViewWithSelectFromColumns()``.
-* Change ``DELETE FROM <table> WHERE <condition>`` to check that the user has ``SELECT``
-  privileges on the objects referenced by the ``WHERE`` condition as is required by the SQL standard.
-* Improve the error message when access is denied when selecting from a view due to the
-  view owner having insufficient permissions to create the view.
-
-JDBC driver
------------
-
-* Add support for prepared statements.
-* Add partial query cancellation via ``partialCancel()`` on ``PrestoStatement``.
-* Use ``VARCHAR`` rather than ``LONGNVARCHAR`` for the Presto ``varchar`` type.
-* Use ``VARBINARY`` rather than ``LONGVARBINARY`` for the Presto ``varbinary`` type.
-
-Hive connector
---------------
-
-* Improve the performance of ``INSERT`` queries when all partition column values are constants.
-* Improve stripe size estimation for the optimized ORC writer.
-  This reduces the number of cases where tiny ORC stripes will be written.
-* Respect the ``skip.footer.line.count`` Hive table property.
-
-CLI
----
-
-* Prevent the CLI from crashing when running on certain 256 color terminals.
-
-SPI
----
-
-* Add a context parameter to the ``create()`` method in ``SessionPropertyConfigurationManagerFactory``.
-* Disallow non-static methods to be annotated with ``@ScalarFunction``. Non-static SQL function
-  implementations must now be declared in a class annotated with ``@ScalarFunction``.
-* Disallow having multiple public constructors in ``@ScalarFunction`` classes. All non-static
-  implementations of SQL functions will now be associated with a single constructor.
-  This improves support for providing specialized implementations of SQL functions with generic arguments.
-* Deprecate ``checkCanSelectFromTable/checkCanSelectFromView`` and
-  ``checkCanCreateViewWithSelectFromTable/checkCanCreateViewWithSelectFromView`` in ``ConnectorAccessControl``
-  and ``SystemAccessControl``. ``checkCanSelectFromColumns`` and ``checkCanCreateViewWithSelectFromColumns``
-  should be used instead.
-
-.. note::
-
-    These are backwards incompatible changes with the previous SPI.
-    If you have written a plugin using these features, you will need
-    to update your code before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-0.206.md b/docs/src/main/sphinx/release/release-0.206.md
new file mode 100644
index 000000000000..053bc8692274
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.206.md
@@ -0,0 +1,46 @@
+# Release 0.206
+
+## General
+
+- Fix execution failure for certain queries containing a join followed by an aggregation
+  when `dictionary_aggregation` is enabled.
+- Fix planning failure when a query contains a `GROUP BY`, but the cardinality of the
+  grouping columns is one. For example: `SELECT c1, sum(c2) FROM t WHERE c1 = 'foo' GROUP BY c1`
+- Fix high memory pressure on the coordinator during the execution of queries
+  using bucketed execution.
+- Add {func}`ST_Union`, {func}`ST_Geometries`, {func}`ST_PointN`, {func}`ST_InteriorRings`,
+  and {func}`ST_InteriorRingN` geospatial functions.
+- Add {func}`split_to_multimap` function.
+- Expand the {func}`approx_distinct` function to support the following types:
+  `INTEGER`, `SMALLINT`, `TINYINT`, `DECIMAL`, `REAL`, `DATE`,
+  `TIMESTAMP`, `TIMESTAMP WITH TIME ZONE`, `TIME`, `TIME WITH TIME ZONE`, `IPADDRESS`.
+- Add a resource group ID column to the `system.runtime.queries` table.
+- Add support for executing `ORDER BY` without `LIMIT` in a distributed manner.
+  This can be disabled with the `distributed-sort` configuration property
+  or the `distributed_sort` session property.
+- Add implicit coercion from `VARCHAR(n)` to `CHAR(n)`, and remove implicit coercion the other way around.
+  As a result, comparing a `CHAR` with a `VARCHAR` will now follow
+  trailing space insensitive `CHAR` comparison semantics.
+- Improve query cost estimation by only including non-null rows when computing average row size.
+- Improve query cost estimation to better account for overhead when estimating data size.
+- Add new semantics that conform to the SQL standard for temporal types.
+  It affects the `TIMESTAMP` (aka `TIMESTAMP WITHOUT TIME ZONE`) type,
+  `TIME` (aka `TIME WITHOUT TIME ZONE`) type, and `TIME WITH TIME ZONE` type.
+  The legacy behavior remains default.
+  At this time, it is not recommended to enable the new semantics.
+  For any connector that supports temporal types, code changes are required before the connector
+  can work correctly with the new semantics. No connectors have been updated yet.
+  In addition, the new semantics are not yet stable as more breaking changes are planned,
+  particularly around the `TIME WITH TIME ZONE` type.
+
+## JDBC driver
+
+- Add `applicationNamePrefix` parameter, which is combined with
+  the `ApplicationName` property to construct the client source name.
+
+## Hive connector
+
+- Reduce ORC reader memory usage by reducing unnecessarily large internal buffers.
+- Support reading from tables with `skip.footer.line.count` and `skip.header.line.count`
+  when using HDFS authentication with Kerberos.
+- Add support for case-insensitive column lookup for Parquet readers.
diff --git a/docs/src/main/sphinx/release/release-0.206.rst b/docs/src/main/sphinx/release/release-0.206.rst
deleted file mode 100644
index 4665ec2fe1c2..000000000000
--- a/docs/src/main/sphinx/release/release-0.206.rst
+++ /dev/null
@@ -1,51 +0,0 @@
-=============
-Release 0.206
-=============
-
-General
--------
-
-* Fix execution failure for certain queries containing a join followed by an aggregation
-  when ``dictionary_aggregation`` is enabled.
-* Fix planning failure when a query contains a ``GROUP BY``, but the cardinality of the
-  grouping columns is one. For example: ``SELECT c1, sum(c2) FROM t WHERE c1 = 'foo' GROUP BY c1``
-* Fix high memory pressure on the coordinator during the execution of queries
-  using bucketed execution.
-* Add :func:`ST_Union`, :func:`ST_Geometries`, :func:`ST_PointN`, :func:`ST_InteriorRings`,
-  and :func:`ST_InteriorRingN` geospatial functions.
-* Add :func:`split_to_multimap` function.
-* Expand the :func:`approx_distinct` function to support the following types:
-  ``INTEGER``, ``SMALLINT``, ``TINYINT``, ``DECIMAL``, ``REAL``, ``DATE``,
-  ``TIMESTAMP``, ``TIMESTAMP WITH TIME ZONE``, ``TIME``, ``TIME WITH TIME ZONE``, ``IPADDRESS``.
-* Add a resource group ID column to the ``system.runtime.queries`` table.
-* Add support for executing ``ORDER BY`` without ``LIMIT`` in a distributed manner.
-  This can be disabled with the ``distributed-sort`` configuration property
-  or the ``distributed_sort`` session property.
-* Add implicit coercion from ``VARCHAR(n)`` to ``CHAR(n)``, and remove implicit coercion the other way around.
-  As a result, comparing a ``CHAR`` with a ``VARCHAR`` will now follow
-  trailing space insensitive ``CHAR`` comparison semantics.
-* Improve query cost estimation by only including non-null rows when computing average row size.
-* Improve query cost estimation to better account for overhead when estimating data size.
-* Add new semantics that conform to the SQL standard for temporal types.
-  It affects the ``TIMESTAMP`` (aka ``TIMESTAMP WITHOUT TIME ZONE``) type,
-  ``TIME`` (aka ``TIME WITHOUT TIME ZONE``) type, and ``TIME WITH TIME ZONE`` type.
-  The legacy behavior remains default.
-  At this time, it is not recommended to enable the new semantics.
-  For any connector that supports temporal types, code changes are required before the connector
-  can work correctly with the new semantics. No connectors have been updated yet.
-  In addition, the new semantics are not yet stable as more breaking changes are planned,
-  particularly around the ``TIME WITH TIME ZONE`` type.
-
-JDBC driver
------------
-
-* Add ``applicationNamePrefix`` parameter, which is combined with
-  the ``ApplicationName`` property to construct the client source name.
-
-Hive connector
---------------
-
-* Reduce ORC reader memory usage by reducing unnecessarily large internal buffers.
-* Support reading from tables with ``skip.footer.line.count`` and ``skip.header.line.count``
-  when using HDFS authentication with Kerberos.
-* Add support for case-insensitive column lookup for Parquet readers.
diff --git a/docs/src/main/sphinx/release/release-0.207.md b/docs/src/main/sphinx/release/release-0.207.md
new file mode 100644
index 000000000000..9866266dcb45
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.207.md
@@ -0,0 +1,60 @@
+# Release 0.207
+
+## General
+
+- Fix a planning issue for queries where correlated references were used in `VALUES`.
+- Remove support for legacy `JOIN ... USING` behavior.
+- Change behavior for unnesting an array of `row` type to produce multiple columns.
+- Deprecate the `reorder_joins` session property and the `reorder-joins`
+  configuration property. They are replaced by the `join_reordering_strategy`
+  session property and the `optimizer.join-reordering-strategy` configuration
+  property. `NONE` maintains the order of the joins as written and is equivalent
+  to `reorder_joins=false`. `ELIMINATE_CROSS_JOINS` will eliminate any
+  unnecessary cross joins from the plan and is equivalent to `reorder_joins=true`.
+  `AUTOMATIC` will use the new cost-based optimizer to select the best join order.
+  To simplify migration, setting the `reorder_joins` session property overrides the
+  new session and configuration properties.
+- Deprecate the `distributed_joins` session property and the
+  `distributed-joins-enabled` configuration property. They are replaced by the
+  `join_distribution_type` session property and the `join-distribution-type`
+  configuration property. `PARTITIONED` turns on hash partitioned joins and
+  is equivalent to `distributed_joins-enabled=true`. `BROADCAST` changes the
+  join strategy to broadcast and is equivalent to `distributed_joins-enabled=false`.
+  `AUTOMATIC` will use the new cost-based optimizer to select the best join
+  strategy. If no statistics are available, `AUTOMATIC` is the same as
+  `REPARTITIONED`. To simplify migration, setting the `distributed_joins`
+  session property overrides the new session and configuration properties.
+- Add support for column properties.
+- Add `optimizer.max-reordered-joins` configuration property to set the maximum number of joins that
+  can be reordered at once using cost-based join reordering.
+- Add support for `char` type to {func}`approx_distinct`.
+
+## Security
+
+- Fail on startup when configuration for file based system access control is invalid.
+- Add support for securing communication between cluster nodes with Kerberos authentication.
+
+## Web UI
+
+- Add peak total (user + system) memory to query details UI.
+
+## Hive connector
+
+- Fix handling of `VARCHAR(length)` type in the optimized Parquet reader. Previously, predicate pushdown
+  failed with `Mismatched Domain types: varchar(length) vs varchar`.
+- Fail on startup when configuration for file based access control is invalid.
+- Add support for HDFS wire encryption.
+- Allow ORC files to have struct columns with missing fields. This allows the table schema to be changed
+  without rewriting the ORC files.
+- Change collector for columns statistics to only consider a sample of partitions. The sample size can be
+  changed by setting the `hive.partition-statistics-sample-size` property.
+
+## Memory connector
+
+- Add support for dropping schemas.
+
+## SPI
+
+- Remove deprecated table/view-level access control methods.
+- Change predicate in constraint for accessing table layout to be optional.
+- Change schema name in `ConnectorMetadata` to be optional rather than nullable.
diff --git a/docs/src/main/sphinx/release/release-0.207.rst b/docs/src/main/sphinx/release/release-0.207.rst
deleted file mode 100644
index eb785be061cd..000000000000
--- a/docs/src/main/sphinx/release/release-0.207.rst
+++ /dev/null
@@ -1,68 +0,0 @@
-=============
-Release 0.207
-=============
-
-General
--------
-
-* Fix a planning issue for queries where correlated references were used in ``VALUES``.
-* Remove support for legacy ``JOIN ... USING`` behavior.
-* Change behavior for unnesting an array of ``row`` type to produce multiple columns.
-* Deprecate the ``reorder_joins`` session property and the ``reorder-joins``
-  configuration property. They are replaced by the ``join_reordering_strategy``
-  session property and the ``optimizer.join-reordering-strategy`` configuration
-  property. ``NONE`` maintains the order of the joins as written and is equivalent
-  to ``reorder_joins=false``. ``ELIMINATE_CROSS_JOINS`` will eliminate any
-  unnecessary cross joins from the plan and is equivalent to ``reorder_joins=true``.
-  ``AUTOMATIC`` will use the new cost-based optimizer to select the best join order.
-  To simplify migration, setting the ``reorder_joins`` session property overrides the
-  new session and configuration properties.
-* Deprecate the ``distributed_joins`` session property and the
-  ``distributed-joins-enabled`` configuration property. They are replaced by the
-  ``join_distribution_type`` session property and the ``join-distribution-type``
-  configuration property. ``PARTITIONED`` turns on hash partitioned joins and
-  is equivalent to ``distributed_joins-enabled=true``. ``BROADCAST`` changes the
-  join strategy to broadcast and is equivalent to ``distributed_joins-enabled=false``.
-  ``AUTOMATIC`` will use the new cost-based optimizer to select the best join
-  strategy. If no statistics are available, ``AUTOMATIC`` is the same as
-  ``REPARTITIONED``. To simplify migration, setting the ``distributed_joins``
-  session property overrides the new session and configuration properties.
-* Add support for column properties.
-* Add ``optimizer.max-reordered-joins`` configuration property to set the maximum number of joins that
-  can be reordered at once using cost-based join reordering.
-* Add support for ``char`` type to :func:`approx_distinct`.
-
-Security
---------
-
-* Fail on startup when configuration for file based system access control is invalid.
-* Add support for securing communication between cluster nodes with Kerberos authentication.
-
-Web UI
-------
-
-* Add peak total (user + system) memory to query details UI.
-
-Hive connector
---------------
-
-* Fix handling of ``VARCHAR(length)`` type in the optimized Parquet reader. Previously, predicate pushdown
-  failed with ``Mismatched Domain types: varchar(length) vs varchar``.
-* Fail on startup when configuration for file based access control is invalid.
-* Add support for HDFS wire encryption.
-* Allow ORC files to have struct columns with missing fields. This allows the table schema to be changed
-  without rewriting the ORC files.
-* Change collector for columns statistics to only consider a sample of partitions. The sample size can be
-  changed by setting the ``hive.partition-statistics-sample-size`` property.
-
-Memory connector
-----------------
-
-* Add support for dropping schemas.
-
-SPI
----
-
-* Remove deprecated table/view-level access control methods.
-* Change predicate in constraint for accessing table layout to be optional.
-* Change schema name in ``ConnectorMetadata`` to be optional rather than nullable.
diff --git a/docs/src/main/sphinx/release/release-0.208.md b/docs/src/main/sphinx/release/release-0.208.md
new file mode 100644
index 000000000000..dafaf41c41f9
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.208.md
@@ -0,0 +1,45 @@
+# Release 0.208
+
+:::{warning}
+This release has the potential for data loss in the Hive connector
+when writing bucketed sorted tables.
+:::
+
+## General
+
+- Fix an issue with memory accounting that would lead to garbage collection pauses
+  and out of memory exceptions.
+- Fix an issue that produces incorrect results when `push_aggregation_through_join`
+  is enabled ({issue}`x10724`).
+- Preserve field names when unnesting columns of type `ROW`.
+- Make the cluster out of memory killer more resilient to memory accounting leaks.
+  Previously, memory accounting leaks on the workers could effectively disable
+  the out of memory killer.
+- Improve planning time for queries over tables with high column count.
+- Add a limit on the number of stages in a query.  The default is `100` and can
+  be changed with the `query.max-stage-count` configuration property and the
+  `query_max_stage_count` session property.
+- Add {func}`spooky_hash_v2_32` and {func}`spooky_hash_v2_64` functions.
+- Add a cluster memory leak detector that logs queries that have possibly accounted for
+  memory usage incorrectly on workers. This is a tool to for debugging internal errors.
+- Add support for correlated subqueries requiring coercions.
+- Add experimental support for running on Linux ppc64le.
+
+## CLI
+
+- Fix creation of the history file when it does not exist.
+- Add `PRESTO_HISTORY_FILE` environment variable to override location of history file.
+
+## Hive connector
+
+- Remove size limit for writing bucketed sorted tables.
+- Support writer scaling for Parquet.
+- Improve stripe size estimation for the optimized ORC writer. This reduces the
+  number of cases where tiny ORC stripes will be written.
+- Provide the actual size of CHAR, VARCHAR, and VARBINARY columns to the cost based optimizer.
+- Collect column level statistics when writing tables. This is disabled by default,
+  and can be enabled by setting the `hive.collect-column-statistics-on-write` property.
+
+## Thrift connector
+
+- Include error message from remote server in query failure message.
diff --git a/docs/src/main/sphinx/release/release-0.208.rst b/docs/src/main/sphinx/release/release-0.208.rst
deleted file mode 100644
index 42796aed4d27..000000000000
--- a/docs/src/main/sphinx/release/release-0.208.rst
+++ /dev/null
@@ -1,51 +0,0 @@
-=============
-Release 0.208
-=============
-
-.. warning::
-
-    This release has the potential for data loss in the Hive connector
-    when writing bucketed sorted tables.
-
-General
--------
-
-* Fix an issue with memory accounting that would lead to garbage collection pauses
-  and out of memory exceptions.
-* Fix an issue that produces incorrect results when ``push_aggregation_through_join``
-  is enabled (:issue:`x10724`).
-* Preserve field names when unnesting columns of type ``ROW``.
-* Make the cluster out of memory killer more resilient to memory accounting leaks.
-  Previously, memory accounting leaks on the workers could effectively disable
-  the out of memory killer.
-* Improve planning time for queries over tables with high column count.
-* Add a limit on the number of stages in a query.  The default is ``100`` and can
-  be changed with the ``query.max-stage-count`` configuration property and the
-  ``query_max_stage_count`` session property.
-* Add :func:`spooky_hash_v2_32` and :func:`spooky_hash_v2_64` functions.
-* Add a cluster memory leak detector that logs queries that have possibly accounted for
-  memory usage incorrectly on workers. This is a tool to for debugging internal errors.
-* Add support for correlated subqueries requiring coercions.
-* Add experimental support for running on Linux ppc64le.
-
-CLI
----
-
-* Fix creation of the history file when it does not exist.
-* Add ``PRESTO_HISTORY_FILE`` environment variable to override location of history file.
-
-Hive connector
---------------
-
-* Remove size limit for writing bucketed sorted tables.
-* Support writer scaling for Parquet.
-* Improve stripe size estimation for the optimized ORC writer. This reduces the
-  number of cases where tiny ORC stripes will be written.
-* Provide the actual size of CHAR, VARCHAR, and VARBINARY columns to the cost based optimizer.
-* Collect column level statistics when writing tables. This is disabled by default,
-  and can be enabled by setting the ``hive.collect-column-statistics-on-write`` property.
-
-Thrift connector
-----------------
-
-* Include error message from remote server in query failure message.
diff --git a/docs/src/main/sphinx/release/release-0.209.md b/docs/src/main/sphinx/release/release-0.209.md
new file mode 100644
index 000000000000..6d1c79d95c46
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.209.md
@@ -0,0 +1,68 @@
+# Release 0.209
+
+## General
+
+- Fix incorrect predicate pushdown when grouping sets contain the empty grouping set ({issue}`x11296`).
+- Fix `X-Forwarded-Proto` header handling for requests to the `/` path ({issue}`x11168`).
+- Fix a regression that results in execution failure when at least one
+  of the arguments to {func}`min_by` or {func}`max_by` is a constant `NULL`.
+- Fix failure when some buckets are completely filtered out during bucket-by-bucket execution.
+- Fix execution failure of queries due to a planning deficiency involving
+  complex nested joins where a join that is not eligible for bucket-by-bucket
+  execution feeds into the build side of a join that is eligible.
+- Improve numerical stability for {func}`corr`, {func}`covar_samp`,
+  {func}`regr_intercept`, and {func}`regr_slope`.
+- Do not include column aliases when checking column access permissions.
+- Eliminate unnecessary data redistribution for scalar correlated subqueries.
+- Remove table scan original constraint information from `EXPLAIN` output.
+- Introduce distinct error codes for global and per-node memory limit errors.
+- Include statistics and cost estimates for `EXPLAIN (TYPE DISTRIBUTED)` and `EXPLAIN ANALYZE`.
+- Support equality checks for `ARRAY`, `MAP`, and `ROW` values containing nulls.
+- Improve statistics estimation and fix potential negative nulls fraction
+  estimates for expressions that include `NOT` or `OR`.
+- Completely remove the `SHOW PARTITIONS` statement.
+- Add {func}`bing_tiles_around` variant that takes a radius.
+- Add the {func}`convex_hull_agg` and {func}`geometry_union_agg` geospatial aggregation functions.
+- Add `(TYPE IO, FORMAT JSON)` option for {doc}`/sql/explain` that shows
+  input tables with constraints and the output table in JSON format.
+- Add {doc}`/connector/kudu`.
+- Raise required Java version to 8u151. This avoids correctness issues for
+  map to map cast when running under some earlier JVM versions, including 8u92.
+
+## Web UI
+
+- Fix the kill query button on the live plan and stage performance pages.
+
+## CLI
+
+- Prevent spurious *"No route to host"* errors on macOS when using IPv6.
+
+## JDBC driver
+
+- Prevent spurious *"No route to host"* errors on macOS when using IPv6.
+
+## Hive connector
+
+- Fix data loss when writing bucketed sorted tables. Partitions would
+  be missing arbitrary rows if any of the temporary files for a bucket
+  had the same size. The `numRows` partition property contained the
+  correct number of rows and can be used to detect if this occurred.
+- Fix cleanup of temporary files when writing bucketed sorted tables.
+- Allow creating schemas when using `file` based security.
+- Reduce the number of cases where tiny ORC stripes will be written when
+  some columns are highly dictionary compressed.
+- Improve memory accounting when reading ORC files. Previously, buffer
+  memory and object overhead was not tracked for stream readers.
+- ORC struct columns are now mapped by name rather than ordinal.
+  This correctly handles missing or extra struct fields in the ORC file.
+- Add procedure `system.create_empty_partition()` for creating empty partitions.
+
+## Kafka connector
+
+- Support Avro formatted Kafka messages.
+- Support backward compatible Avro schema evolution.
+
+## SPI
+
+- Allow using `Object` as a parameter type or return type for SQL
+  functions when the corresponding SQL type is an unbounded generic.
diff --git a/docs/src/main/sphinx/release/release-0.209.rst b/docs/src/main/sphinx/release/release-0.209.rst
deleted file mode 100644
index faf3a5b33869..000000000000
--- a/docs/src/main/sphinx/release/release-0.209.rst
+++ /dev/null
@@ -1,77 +0,0 @@
-=============
-Release 0.209
-=============
-
-General
--------
-
-* Fix incorrect predicate pushdown when grouping sets contain the empty grouping set (:issue:`x11296`).
-* Fix ``X-Forwarded-Proto`` header handling for requests to the ``/`` path (:issue:`x11168`).
-* Fix a regression that results in execution failure when at least one
-  of the arguments to :func:`min_by` or :func:`max_by` is a constant ``NULL``.
-* Fix failure when some buckets are completely filtered out during bucket-by-bucket execution.
-* Fix execution failure of queries due to a planning deficiency involving
-  complex nested joins where a join that is not eligible for bucket-by-bucket
-  execution feeds into the build side of a join that is eligible.
-* Improve numerical stability for :func:`corr`, :func:`covar_samp`,
-  :func:`regr_intercept`, and :func:`regr_slope`.
-* Do not include column aliases when checking column access permissions.
-* Eliminate unnecessary data redistribution for scalar correlated subqueries.
-* Remove table scan original constraint information from ``EXPLAIN`` output.
-* Introduce distinct error codes for global and per-node memory limit errors.
-* Include statistics and cost estimates for ``EXPLAIN (TYPE DISTRIBUTED)`` and ``EXPLAIN ANALYZE``.
-* Support equality checks for ``ARRAY``, ``MAP``, and ``ROW`` values containing nulls.
-* Improve statistics estimation and fix potential negative nulls fraction
-  estimates for expressions that include ``NOT`` or ``OR``.
-* Completely remove the ``SHOW PARTITIONS`` statement.
-* Add :func:`bing_tiles_around` variant that takes a radius.
-* Add the :func:`convex_hull_agg` and :func:`geometry_union_agg` geospatial aggregation functions.
-* Add ``(TYPE IO, FORMAT JSON)`` option for :doc:`/sql/explain` that shows
-  input tables with constraints and the output table in JSON format.
-* Add :doc:`/connector/kudu`.
-* Raise required Java version to 8u151. This avoids correctness issues for
-  map to map cast when running under some earlier JVM versions, including 8u92.
-
-Web UI
-------
-
-* Fix the kill query button on the live plan and stage performance pages.
-
-CLI
----
-
-* Prevent spurious *"No route to host"* errors on macOS when using IPv6.
-
-JDBC driver
------------
-
-* Prevent spurious *"No route to host"* errors on macOS when using IPv6.
-
-Hive connector
---------------
-
-* Fix data loss when writing bucketed sorted tables. Partitions would
-  be missing arbitrary rows if any of the temporary files for a bucket
-  had the same size. The ``numRows`` partition property contained the
-  correct number of rows and can be used to detect if this occurred.
-* Fix cleanup of temporary files when writing bucketed sorted tables.
-* Allow creating schemas when using ``file`` based security.
-* Reduce the number of cases where tiny ORC stripes will be written when
-  some columns are highly dictionary compressed.
-* Improve memory accounting when reading ORC files. Previously, buffer
-  memory and object overhead was not tracked for stream readers.
-* ORC struct columns are now mapped by name rather than ordinal.
-  This correctly handles missing or extra struct fields in the ORC file.
-* Add procedure ``system.create_empty_partition()`` for creating empty partitions.
-
-Kafka connector
----------------
-
-* Support Avro formatted Kafka messages.
-* Support backward compatible Avro schema evolution.
-
-SPI
----
-
-* Allow using ``Object`` as a parameter type or return type for SQL
-  functions when the corresponding SQL type is an unbounded generic.
diff --git a/docs/src/main/sphinx/release/release-0.210.md b/docs/src/main/sphinx/release/release-0.210.md
new file mode 100644
index 000000000000..d93a10d9c6bc
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.210.md
@@ -0,0 +1,44 @@
+# Release 0.210
+
+## General
+
+- Fix planning failure when aliasing columns of tables containing hidden
+  columns ({issue}`x11385`).
+- Fix correctness issue when `GROUP BY DISTINCT` terms contain references to
+  the same column using different syntactic forms ({issue}`x11120`).
+- Fix failures when querying `information_schema` tables using capitalized names.
+- Improve performance when converting between `ROW` types.
+- Remove user CPU time tracking as introduces non-trivial overhead.
+- Select join distribution type automatically for queries involving outer joins.
+
+## Hive connector
+
+- Fix a security bug introduced in 0.209 when using `hive.security=file`,
+  which would allow any user to create, drop, or rename schemas.
+- Prevent ORC writer from writing stripes larger than the max configured size
+  when converting a highly dictionary compressed column to direct encoding.
+- Support creating Avro tables with a custom schema using the `avro_schema_url`
+  table property.
+- Support backward compatible Avro schema evolution.
+- Support cross-realm Kerberos authentication for HDFS and Hive Metastore.
+
+## JDBC driver
+
+- Deallocate prepared statement when `PreparedStatement` is closed. Previously,
+  `Connection` became unusable after many prepared statements were created.
+- Remove `getUserTimeMillis()` from `QueryStats` and `StageStats`.
+
+## SPI
+
+- `SystemAccessControl.checkCanSetUser()` now takes an `Optional<Principal>`
+  rather than a nullable `Principal`.
+- Rename `connectorId` to `catalogName` in `ConnectorFactory`,
+  `QueryInputMetadata`, and `QueryOutputMetadata`.
+- Pass `ConnectorTransactionHandle` to `ConnectorAccessControl.checkCanSetCatalogSessionProperty()`.
+- Remove `getUserTime()` from `SplitStatistics` (referenced in `SplitCompletedEvent`).
+
+:::{note}
+These are backwards incompatible changes with the previous SPI.
+If you have written a plugin, you will need to update your code
+before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.210.rst b/docs/src/main/sphinx/release/release-0.210.rst
deleted file mode 100644
index 6ccbbffeeb64..000000000000
--- a/docs/src/main/sphinx/release/release-0.210.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-=============
-Release 0.210
-=============
-
-General
--------
-
-* Fix planning failure when aliasing columns of tables containing hidden
-  columns (:issue:`x11385`).
-* Fix correctness issue when ``GROUP BY DISTINCT`` terms contain references to
-  the same column using different syntactic forms (:issue:`x11120`).
-* Fix failures when querying ``information_schema`` tables using capitalized names.
-* Improve performance when converting between ``ROW`` types.
-* Remove user CPU time tracking as introduces non-trivial overhead.
-* Select join distribution type automatically for queries involving outer joins.
-
-Hive connector
---------------
-
-* Fix a security bug introduced in 0.209 when using ``hive.security=file``,
-  which would allow any user to create, drop, or rename schemas.
-* Prevent ORC writer from writing stripes larger than the max configured size
-  when converting a highly dictionary compressed column to direct encoding.
-* Support creating Avro tables with a custom schema using the ``avro_schema_url``
-  table property.
-* Support backward compatible Avro schema evolution.
-* Support cross-realm Kerberos authentication for HDFS and Hive Metastore.
-
-JDBC driver
------------
-
-* Deallocate prepared statement when ``PreparedStatement`` is closed. Previously,
-  ``Connection`` became unusable after many prepared statements were created.
-* Remove ``getUserTimeMillis()`` from ``QueryStats`` and ``StageStats``.
-
-SPI
----
-
-* ``SystemAccessControl.checkCanSetUser()`` now takes an ``Optional<Principal>``
-  rather than a nullable ``Principal``.
-* Rename ``connectorId`` to ``catalogName`` in ``ConnectorFactory``,
-  ``QueryInputMetadata``, and ``QueryOutputMetadata``.
-* Pass ``ConnectorTransactionHandle`` to ``ConnectorAccessControl.checkCanSetCatalogSessionProperty()``.
-* Remove ``getUserTime()`` from ``SplitStatistics`` (referenced in ``SplitCompletedEvent``).
-
-.. note::
-    These are backwards incompatible changes with the previous SPI.
-    If you have written a plugin, you will need to update your code
-    before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-0.211.md b/docs/src/main/sphinx/release/release-0.211.md
new file mode 100644
index 000000000000..f0ca6e364ea8
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.211.md
@@ -0,0 +1,50 @@
+# Release 0.211
+
+## General
+
+- Fix missing final query plan in `QueryCompletedEvent`. Statistics and cost estimates
+  are removed from the plan text because they may not be available during event generation.
+- Update the default value of the `http-server.https.excluded-cipher` config
+  property to exclude cipher suites with a weak hash algorithm or without forward secrecy.
+  Specifically, this means all ciphers that use the RSA key exchange are excluded by default.
+  Consequently, TLS 1.0 or TLS 1.1 are no longer supported with the default configuration.
+  The `http-server.https.excluded-cipher` config property can be set to empty string
+  to restore the old behavior.
+- Add {func}`ST_GeomFromBinary` and {func}`ST_AsBinary` functions that convert
+  geometries to and from Well-Known Binary format.
+- Remove the `verbose_stats` session property, and rename the `task.verbose-stats`
+  configuration property to `task.per-operator-cpu-timer-enabled`.
+- Improve query planning performance for queries containing multiple joins
+  and a large number of columns ({issue}`x11196`).
+- Add built-in {doc}`file based property manager </admin/session-property-managers>`
+  to automate the setting of session properties based on query characteristics.
+- Allow running on a JVM from any vendor that meets the functional requirements.
+
+## Hive connector
+
+- Fix regression in 0.210 that causes query failure when writing ORC or DWRF files
+  that occurs for specific patterns of input data. When the writer attempts to give up
+  using dictionary encoding for a column that is highly compressed, the process of
+  transitioning to use direct encoding instead can fail.
+- Fix coordinator OOM when a query scans many partitions of a Hive table ({issue}`x11322`).
+- Improve readability of columns, partitioning, and transactions in explain plains.
+
+## Thrift connector
+
+- Fix lack of retry for network errors while sending requests.
+
+## Resource group
+
+- Add documentation for new resource group scheduling policies.
+- Remove running and queue time limits from resource group configuration.
+  Legacy behavior can be replicated by using the
+  {doc}`file based property manager </admin/session-property-managers>`
+  to set session properties.
+
+## SPI
+
+- Clarify semantics of `predicate` in `ConnectorTableLayout`.
+- Reduce flexibility of `unenforcedConstraint` that a connector can return in `getTableLayouts`.
+  For each column in the predicate, the connector must enforce the entire domain or none.
+- Make the null vector in `ArrayBlock`, `MapBlock`, and `RowBlock` optional.
+  When it is not present, all entries in the `Block` are non-null.
diff --git a/docs/src/main/sphinx/release/release-0.211.rst b/docs/src/main/sphinx/release/release-0.211.rst
deleted file mode 100644
index 2b001160f6ed..000000000000
--- a/docs/src/main/sphinx/release/release-0.211.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-=============
-Release 0.211
-=============
-
-General
--------
-
-* Fix missing final query plan in ``QueryCompletedEvent``. Statistics and cost estimates
-  are removed from the plan text because they may not be available during event generation.
-* Update the default value of the ``http-server.https.excluded-cipher`` config
-  property to exclude cipher suites with a weak hash algorithm or without forward secrecy.
-  Specifically, this means all ciphers that use the RSA key exchange are excluded by default.
-  Consequently, TLS 1.0 or TLS 1.1 are no longer supported with the default configuration.
-  The ``http-server.https.excluded-cipher`` config property can be set to empty string
-  to restore the old behavior.
-* Add :func:`ST_GeomFromBinary` and :func:`ST_AsBinary` functions that convert
-  geometries to and from Well-Known Binary format.
-* Remove the ``verbose_stats`` session property, and rename the ``task.verbose-stats``
-  configuration property to ``task.per-operator-cpu-timer-enabled``.
-* Improve query planning performance for queries containing multiple joins
-  and a large number of columns (:issue:`x11196`).
-* Add built-in :doc:`file based property manager </admin/session-property-managers>`
-  to automate the setting of session properties based on query characteristics.
-* Allow running on a JVM from any vendor that meets the functional requirements.
-
-Hive connector
---------------
-
-* Fix regression in 0.210 that causes query failure when writing ORC or DWRF files
-  that occurs for specific patterns of input data. When the writer attempts to give up
-  using dictionary encoding for a column that is highly compressed, the process of
-  transitioning to use direct encoding instead can fail.
-* Fix coordinator OOM when a query scans many partitions of a Hive table (:issue:`x11322`).
-* Improve readability of columns, partitioning, and transactions in explain plains.
-
-Thrift connector
-----------------
-
-* Fix lack of retry for network errors while sending requests.
-
-Resource group
---------------
-
-* Add documentation for new resource group scheduling policies.
-* Remove running and queue time limits from resource group configuration.
-  Legacy behavior can be replicated by using the
-  :doc:`file based property manager </admin/session-property-managers>`
-  to set session properties.
-
-SPI
----
-
-* Clarify semantics of ``predicate`` in ``ConnectorTableLayout``.
-* Reduce flexibility of ``unenforcedConstraint`` that a connector can return in ``getTableLayouts``.
-  For each column in the predicate, the connector must enforce the entire domain or none.
-* Make the null vector in ``ArrayBlock``, ``MapBlock``, and ``RowBlock`` optional.
-  When it is not present, all entries in the ``Block`` are non-null.
diff --git a/docs/src/main/sphinx/release/release-0.212.md b/docs/src/main/sphinx/release/release-0.212.md
new file mode 100644
index 000000000000..4766b40983ae
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.212.md
@@ -0,0 +1,31 @@
+# Release 0.212
+
+## General
+
+- Fix query failures when the {func}`ST_GeomFromBinary` function is run on multiple rows.
+- Fix memory accounting for the build side of broadcast joins.
+- Fix occasional query failures when running `EXPLAIN ANALYZE`.
+- Enhance {func}`ST_ConvexHull` and {func}`convex_hull_agg` functions to support geometry collections.
+- Improve performance for some queries using `DISTINCT`.
+- Improve performance for some queries that perform filtered global aggregations.
+- Remove `round(x, d)` and `truncate(x, d)` functions where `d` is a `BIGINT` ({issue}`x11462`).
+- Add {func}`ST_LineString` function to form a `LineString` from an array of points.
+
+## Hive connector
+
+- Prevent ORC writer from writing stripes larger than the max configured size for some rare data
+  patterns ({issue}`x11526`).
+- Restrict the maximum line length for text files. The default limit of 100MB can be changed
+  using the `hive.text.max-line-length` configuration property.
+- Add sanity checks that fail queries if statistics read from the metastore are corrupt. Corrupt
+  statistics can be ignored by setting the `hive.ignore-corrupted-statistics`
+  configuration property or the `ignore_corrupted_statistics` session property.
+
+## Thrift connector
+
+- Fix retry for network errors that occur while sending a Thrift request.
+- Remove failed connections from connection pool.
+
+## Verifier
+
+- Record the query ID of the test query regardless of query outcome.
diff --git a/docs/src/main/sphinx/release/release-0.212.rst b/docs/src/main/sphinx/release/release-0.212.rst
deleted file mode 100644
index 0e23dc8d50eb..000000000000
--- a/docs/src/main/sphinx/release/release-0.212.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-=============
-Release 0.212
-=============
-
-General
--------
-
-* Fix query failures when the :func:`ST_GeomFromBinary` function is run on multiple rows.
-* Fix memory accounting for the build side of broadcast joins.
-* Fix occasional query failures when running ``EXPLAIN ANALYZE``.
-* Enhance :func:`ST_ConvexHull` and :func:`convex_hull_agg` functions to support geometry collections.
-* Improve performance for some queries using ``DISTINCT``.
-* Improve performance for some queries that perform filtered global aggregations.
-* Remove ``round(x, d)`` and ``truncate(x, d)`` functions where ``d`` is a ``BIGINT`` (:issue:`x11462`).
-* Add :func:`ST_LineString` function to form a ``LineString`` from an array of points.
-
-Hive connector
---------------
-
-* Prevent ORC writer from writing stripes larger than the max configured size for some rare data
-  patterns (:issue:`x11526`).
-* Restrict the maximum line length for text files. The default limit of 100MB can be changed
-  using the ``hive.text.max-line-length`` configuration property.
-* Add sanity checks that fail queries if statistics read from the metastore are corrupt. Corrupt
-  statistics can be ignored by setting the ``hive.ignore-corrupted-statistics``
-  configuration property or the ``ignore_corrupted_statistics`` session property.
-
-Thrift connector
-----------------
-
-* Fix retry for network errors that occur while sending a Thrift request.
-* Remove failed connections from connection pool.
-
-Verifier
---------
-
-* Record the query ID of the test query regardless of query outcome.
diff --git a/docs/src/main/sphinx/release/release-0.213.md b/docs/src/main/sphinx/release/release-0.213.md
new file mode 100644
index 000000000000..b0c701411618
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.213.md
@@ -0,0 +1,95 @@
+# Release 0.213
+
+## General
+
+- Fix split scheduling backpressure when plan contains colocated join. Previously, splits
+  for the second and subsequent scan nodes (in scheduling order) were scheduled continuously
+  until completion, rather than pausing due to sufficient pending splits.
+- Fix query execution failure or indefinite hang during grouped execution when all splits
+  for any lifespan are completely filtered out.
+- Fix grouped execution to respect the configured concurrent lifespans per task.
+  Previously, it always used a single lifespan per task.
+- Fix execution failure when using grouped execution with right or full outer joins
+  where the right side is not partitioned on the join key.
+- Fix a scenario where too many rows are returned to clients in a single response.
+- Do not allow setting invalid property values with {doc}`/sql/set-session`.
+- Disable stats calculator by default as it can cause a planning failure for
+  certain complex queries. It can be enabled with the `experimental.enable-stats-calculator`
+  configuration property or the `enable_stats_calculator` session property.
+- Avoid making guesses when estimating filters for joins. Previously, if nothing
+  was known about the filter, a `0.9` coefficient was applied as a filter factor.
+  Now, if nothing is known about a filter, the estimate will be unknown. A `0.9`
+  coefficient will be applied for all additional conjuncts if at least a single
+  conjunct can be reasonably estimated.
+- Improve inference of predicates for inner joins.
+- Improve `EXPLAIN ANALYZE` output by adding CPU time and enhancing accuracy of CPU fraction.
+- Include stats and cost estimates in textual plans created on query completion.
+- Enhance `SHOW STATS` to support `IN` and `BETWEEN` predicates in the
+  `WHERE` condition of the `SELECT` clause.
+- Remove transaction from explain plan for indexes joins.
+- Add `max_drivers_per_task` session property, allowing users to limit concurrency by
+  specifying a number lower than the system configured maximum. This can cause the
+  query to run slower and consume less resources.
+- Add `join-max-broadcast-table-size` configuration property and
+  `join_max_broadcast_table_size` session property to control the maximum estimated size
+  of a table that can be broadcast when using `AUTOMATIC` join distribution type ({issue}`x11667`).
+- Add experimental config option `experimental.reserved-pool-enabled` to disable the reserved memory pool.
+- Add `targetResultSize` query parameter to `/v1/statement` endpoint to control response data size.
+
+## Geospatial
+
+- Fix {func}`ST_Distance` function to return `NULL` if any of the inputs is an
+  empty geometry as required by the SQL/MM specification.
+- Add {func}`ST_MultiPoint` function to construct multi-point geometry from an array of points.
+- Add {func}`geometry_union` function to efficiently union arrays of geometries.
+- Add support for distributed spatial joins ({issue}`x11072`).
+
+## Server RPM
+
+- Allow running on a JVM from any vendor.
+
+## Web UI
+
+- Remove legacy plan UI.
+- Add support for filtering queries by all error categories.
+- Add dialog to show errors refreshing data from coordinator.
+- Change worker thread list to not show thread stacks by default to improve page peformance.
+
+## Hive connector
+
+- Fix LZO and LZOP decompression to work with certain data compressed by Hadoop.
+- Fix ORC writer validation percentage so that zero does not result in 100% validation.
+- Fix potential out-of-bounds read for ZSTD on corrupted input.
+- Stop assuming no distinct values when column null fraction statistic is less than `1.0`.
+- Treat `-1` as an absent null count for compatibility with statistics written by
+  [Impala](https://issues.apache.org/jira/browse/IMPALA-7497).
+- Preserve original exception for metastore network errors.
+- Preserve exceptions from Avro deserializer
+- Categorize text line length exceeded error.
+- Remove the old Parquet reader. The `hive.parquet-optimized-reader.enabled`
+  configuration property and `parquet_optimized_reader_enabled` session property
+  no longer exist.
+- Remove the `hive.parquet-predicate-pushdown.enabled` configuration property
+  and `parquet_predicate_pushdown_enabled` session property.
+  Pushdown is always enabled now in the Parquet reader.
+- Enable optimized ORC writer by default. It can be disabled using the
+  `hive.orc.optimized-writer.enabled` configuration property or the
+  `orc_optimized_writer_enabled` session property.
+- Use ORC file format as the default for new tables or partitions.
+- Add support for Avro tables where the Avro schema URL is an HDFS location.
+- Add `hive.parquet.writer.block-size` and `hive.parquet.writer.page-size`
+  configuration properties and `parquet_writer_block_size` and
+  `parquet_writer_page_size` session properties for tuning Parquet writer options.
+
+## Memory connector
+
+- Improve table data size accounting.
+
+## Thrift connector
+
+- Include constraint in explain plan for index joins.
+- Improve readability of columns, tables, layouts, and indexes in explain plans.
+
+## Verifier
+
+- Rewrite queries in parallel when shadowing writes.
diff --git a/docs/src/main/sphinx/release/release-0.213.rst b/docs/src/main/sphinx/release/release-0.213.rst
deleted file mode 100644
index 75ac73d1c6c4..000000000000
--- a/docs/src/main/sphinx/release/release-0.213.rst
+++ /dev/null
@@ -1,105 +0,0 @@
-=============
-Release 0.213
-=============
-
-General
--------
-
-* Fix split scheduling backpressure when plan contains colocated join. Previously, splits
-  for the second and subsequent scan nodes (in scheduling order) were scheduled continuously
-  until completion, rather than pausing due to sufficient pending splits.
-* Fix query execution failure or indefinite hang during grouped execution when all splits
-  for any lifespan are completely filtered out.
-* Fix grouped execution to respect the configured concurrent lifespans per task.
-  Previously, it always used a single lifespan per task.
-* Fix execution failure when using grouped execution with right or full outer joins
-  where the right side is not partitioned on the join key.
-* Fix a scenario where too many rows are returned to clients in a single response.
-* Do not allow setting invalid property values with :doc:`/sql/set-session`.
-* Disable stats calculator by default as it can cause a planning failure for
-  certain complex queries. It can be enabled with the ``experimental.enable-stats-calculator``
-  configuration property or the ``enable_stats_calculator`` session property.
-* Avoid making guesses when estimating filters for joins. Previously, if nothing
-  was known about the filter, a ``0.9`` coefficient was applied as a filter factor.
-  Now, if nothing is known about a filter, the estimate will be unknown. A ``0.9``
-  coefficient will be applied for all additional conjuncts if at least a single
-  conjunct can be reasonably estimated.
-* Improve inference of predicates for inner joins.
-* Improve ``EXPLAIN ANALYZE`` output by adding CPU time and enhancing accuracy of CPU fraction.
-* Include stats and cost estimates in textual plans created on query completion.
-* Enhance ``SHOW STATS`` to support ``IN`` and ``BETWEEN`` predicates in the
-  ``WHERE`` condition of the ``SELECT`` clause.
-* Remove transaction from explain plan for indexes joins.
-* Add ``max_drivers_per_task`` session property, allowing users to limit concurrency by
-  specifying a number lower than the system configured maximum. This can cause the
-  query to run slower and consume less resources.
-* Add ``join-max-broadcast-table-size`` configuration property and
-  ``join_max_broadcast_table_size`` session property to control the maximum estimated size
-  of a table that can be broadcast when using ``AUTOMATIC`` join distribution type (:issue:`x11667`).
-* Add experimental config option ``experimental.reserved-pool-enabled`` to disable the reserved memory pool.
-* Add ``targetResultSize`` query parameter to ``/v1/statement`` endpoint to control response data size.
-
-Geospatial
-----------
-
-* Fix :func:`ST_Distance` function to return ``NULL`` if any of the inputs is an
-  empty geometry as required by the SQL/MM specification.
-* Add :func:`ST_MultiPoint` function to construct multi-point geometry from an array of points.
-* Add :func:`geometry_union` function to efficiently union arrays of geometries.
-* Add support for distributed spatial joins (:issue:`x11072`).
-
-Server RPM
-----------
-
-* Allow running on a JVM from any vendor.
-
-Web UI
-------
-
-* Remove legacy plan UI.
-* Add support for filtering queries by all error categories.
-* Add dialog to show errors refreshing data from coordinator.
-* Change worker thread list to not show thread stacks by default to improve page peformance.
-
-Hive connector
---------------
-
-* Fix LZO and LZOP decompression to work with certain data compressed by Hadoop.
-* Fix ORC writer validation percentage so that zero does not result in 100% validation.
-* Fix potential out-of-bounds read for ZSTD on corrupted input.
-* Stop assuming no distinct values when column null fraction statistic is less than ``1.0``.
-* Treat ``-1`` as an absent null count for compatibility with statistics written by
-  `Impala <https://issues.apache.org/jira/browse/IMPALA-7497>`_.
-* Preserve original exception for metastore network errors.
-* Preserve exceptions from Avro deserializer
-* Categorize text line length exceeded error.
-* Remove the old Parquet reader. The ``hive.parquet-optimized-reader.enabled``
-  configuration property and ``parquet_optimized_reader_enabled`` session property
-  no longer exist.
-* Remove the ``hive.parquet-predicate-pushdown.enabled`` configuration property
-  and ``parquet_predicate_pushdown_enabled`` session property.
-  Pushdown is always enabled now in the Parquet reader.
-* Enable optimized ORC writer by default. It can be disabled using the
-  ``hive.orc.optimized-writer.enabled`` configuration property or the
-  ``orc_optimized_writer_enabled`` session property.
-* Use ORC file format as the default for new tables or partitions.
-* Add support for Avro tables where the Avro schema URL is an HDFS location.
-* Add ``hive.parquet.writer.block-size`` and ``hive.parquet.writer.page-size``
-  configuration properties and ``parquet_writer_block_size`` and
-  ``parquet_writer_page_size`` session properties for tuning Parquet writer options.
-
-Memory connector
-----------------
-
-* Improve table data size accounting.
-
-Thrift connector
-----------------
-
-* Include constraint in explain plan for index joins.
-* Improve readability of columns, tables, layouts, and indexes in explain plans.
-
-Verifier
---------
-
-* Rewrite queries in parallel when shadowing writes.
diff --git a/docs/src/main/sphinx/release/release-0.214.md b/docs/src/main/sphinx/release/release-0.214.md
new file mode 100644
index 000000000000..cba298efe13b
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.214.md
@@ -0,0 +1,56 @@
+# Release 0.214
+
+## General
+
+- Fix history leak in coordinator for failed or canceled queries.
+- Fix memory leak related to query tracking in coordinator that was introduced
+  in {doc}`/release/release-0.213`.
+- Fix planning failures when lambdas are used in join filter expression.
+- Fix responses to client for certain types of errors that are encountered
+  during query creation.
+- Improve error message when an invalid comparator is provided to the
+  {func}`array_sort` function.
+- Improve performance of lookup operations on map data types.
+- Improve planning and query performance for queries with `TINYINT`,
+  `SMALLINT` and `VARBINARY` literals.
+- Fix issue where queries containing distributed `ORDER BY` and aggregation
+  could sometimes fail to make progress when data was spilled.
+- Make top N row number optimization work in some cases when columns are pruned.
+- Add session property `optimize-top-n-row-number` and configuration property
+  `optimizer.optimize-top-n-row-number` to toggle the top N row number
+  optimization.
+- Add {func}`ngrams` function to generate N-grams from an array.
+- Add {ref}`qdigest <qdigest-type>` type and associated {doc}`/functions/qdigest`.
+- Add functionality to delay query execution until a minimum number of workers
+  nodes are available. The minimum number of workers can be set with the
+  `query-manager.required-workers` configuration property, and the max wait
+  time with the `query-manager.required-workers-max-wait` configuration property.
+- Remove experimental pre-allocated memory system, and the related configuration
+  property `experimental.preallocate-memory-threshold`.
+
+## Security
+
+- Add functionality to refresh the configuration of file-based access controllers.
+  The refresh interval can be set using the `security.refresh-period`
+  configuration property.
+
+## JDBC driver
+
+- Clear update count after calling `Statement.getMoreResults()`.
+
+## Web UI
+
+- Show query warnings on the query detail page.
+- Allow selecting non-default sort orders in query list view.
+
+## Hive connector
+
+- Prevent ORC writer from writing stripes larger than the maximum configured size.
+- Add `hive.s3.upload-acl-type` configuration property to specify the type of
+  ACL to use while uploading files to S3.
+- Add Hive metastore API recording tool for remote debugging purposes.
+- Add support for retrying on metastore connection errors.
+
+## Verifier
+
+- Handle SQL execution timeouts while rewriting queries.
diff --git a/docs/src/main/sphinx/release/release-0.214.rst b/docs/src/main/sphinx/release/release-0.214.rst
deleted file mode 100644
index 9fa708745be9..000000000000
--- a/docs/src/main/sphinx/release/release-0.214.rst
+++ /dev/null
@@ -1,64 +0,0 @@
-=============
-Release 0.214
-=============
-
-General
--------
-
-* Fix history leak in coordinator for failed or canceled queries.
-* Fix memory leak related to query tracking in coordinator that was introduced
-  in :doc:`/release/release-0.213`.
-* Fix planning failures when lambdas are used in join filter expression.
-* Fix responses to client for certain types of errors that are encountered
-  during query creation.
-* Improve error message when an invalid comparator is provided to the
-  :func:`array_sort` function.
-* Improve performance of lookup operations on map data types.
-* Improve planning and query performance for queries with ``TINYINT``,
-  ``SMALLINT`` and ``VARBINARY`` literals.
-* Fix issue where queries containing distributed ``ORDER BY`` and aggregation
-  could sometimes fail to make progress when data was spilled.
-* Make top N row number optimization work in some cases when columns are pruned.
-* Add session property ``optimize-top-n-row-number`` and configuration property
-  ``optimizer.optimize-top-n-row-number`` to toggle the top N row number
-  optimization.
-* Add :func:`ngrams` function to generate N-grams from an array.
-* Add :ref:`qdigest <qdigest_type>` type and associated :doc:`/functions/qdigest`.
-* Add functionality to delay query execution until a minimum number of workers
-  nodes are available. The minimum number of workers can be set with the
-  ``query-manager.required-workers`` configuration property, and the max wait
-  time with the ``query-manager.required-workers-max-wait`` configuration property.
-* Remove experimental pre-allocated memory system, and the related configuration
-  property ``experimental.preallocate-memory-threshold``.
-
-Security
---------
-
-* Add functionality to refresh the configuration of file-based access controllers.
-  The refresh interval can be set using the ``security.refresh-period``
-  configuration property.
-
-JDBC driver
------------
-
-* Clear update count after calling ``Statement.getMoreResults()``.
-
-Web UI
-------
-
-* Show query warnings on the query detail page.
-* Allow selecting non-default sort orders in query list view.
-
-Hive connector
---------------
-
-* Prevent ORC writer from writing stripes larger than the maximum configured size.
-* Add ``hive.s3.upload-acl-type`` configuration property to specify the type of
-  ACL to use while uploading files to S3.
-* Add Hive metastore API recording tool for remote debugging purposes.
-* Add support for retrying on metastore connection errors.
-
-Verifier
---------
-
-* Handle SQL execution timeouts while rewriting queries.
diff --git a/docs/src/main/sphinx/release/release-0.215.md b/docs/src/main/sphinx/release/release-0.215.md
new file mode 100644
index 000000000000..9e138c73b01b
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.215.md
@@ -0,0 +1,52 @@
+# Release 0.215
+
+## General
+
+- Fix regression in 0.214 that could cause queries to produce incorrect results for queries
+  using map types.
+- Fix reporting of the processed input data for source stages in `EXPLAIN ANALYZE`.
+- Fail queries that use non-leaf resource groups. Previously, they would remain queued forever.
+- Improve CPU usage for specific queries ({issue}`x11757`).
+- Extend stats and cost model to support {func}`row_number` window function estimates.
+- Improve the join type selection and the reordering of join sides for cases where
+  the join output size cannot be estimated.
+- Add dynamic scheduling support to grouped execution. When a stage is executed
+  with grouped execution and the stage has no remote sources, table partitions can be
+  scheduled to tasks in a dynamic way, which can help mitigating skew for queries using
+  grouped execution. This feature can be enabled with the
+  `dynamic_schedule_for_grouped_execution` session property or the
+  `dynamic-schedule-for-grouped-execution` config property.
+- Add {func}`beta_cdf` and {func}`inverse_beta_cdf` functions.
+- Split the reporting of raw input data and processed input data for source operators.
+- Remove collection and reporting of raw input data statistics for the `Values`,
+  `Local Exchange`, and `Local Merge Sort` operators.
+- Simplify `EXPLAIN (TYPE IO)` output when there are too many discrete components.
+  This avoids large output at the cost of reduced granularity.
+- Add {func}`parse_presto_data_size` function.
+- Add support for `UNION ALL` to optimizer's cost model.
+- Add support for estimating the cost of filters by using a default filter factor.
+  The default value for the filter factor can be configured with the `default_filter_factor_enabled`
+  session property or the `optimizer.default-filter-factor-enabled`.
+
+## Geospatial
+
+- Add input validation checks to {func}`ST_LineString` to conform with the specification.
+- Improve spatial join performance.
+- Enable spatial joins for join conditions expressed with the {func}`ST_Within` function.
+
+## Web UI
+
+- Fix *Capture Snapshot* button for showing current thread stacks.
+- Fix dropdown for expanding stage skew component on the query details page.
+- Improve the performance of the thread snapshot component on the worker status page.
+- Make the reporting of *Cumulative Memory* usage consistent on the query list and query details pages.
+- Remove legacy thread UI.
+
+## Hive
+
+- Add predicate pushdown support for the `DATE` type to the Parquet reader. This change also fixes
+  a bug that may cause queries with predicates on `DATE` columns to fail with type mismatch errors.
+
+## Redis
+
+- Prevent printing the value of the `redis.password` configuration property to log files.
diff --git a/docs/src/main/sphinx/release/release-0.215.rst b/docs/src/main/sphinx/release/release-0.215.rst
deleted file mode 100644
index d21140544d51..000000000000
--- a/docs/src/main/sphinx/release/release-0.215.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-=============
-Release 0.215
-=============
-
-General
--------
-
-* Fix regression in 0.214 that could cause queries to produce incorrect results for queries
-  using map types.
-* Fix reporting of the processed input data for source stages in ``EXPLAIN ANALYZE``.
-* Fail queries that use non-leaf resource groups. Previously, they would remain queued forever.
-* Improve CPU usage for specific queries (:issue:`x11757`).
-* Extend stats and cost model to support :func:`row_number` window function estimates.
-* Improve the join type selection and the reordering of join sides for cases where
-  the join output size cannot be estimated.
-* Add dynamic scheduling support to grouped execution. When a stage is executed
-  with grouped execution and the stage has no remote sources, table partitions can be
-  scheduled to tasks in a dynamic way, which can help mitigating skew for queries using
-  grouped execution. This feature can be enabled with the
-  ``dynamic_schedule_for_grouped_execution`` session property or the
-  ``dynamic-schedule-for-grouped-execution`` config property.
-* Add :func:`beta_cdf` and :func:`inverse_beta_cdf` functions.
-* Split the reporting of raw input data and processed input data for source operators.
-* Remove collection and reporting of raw input data statistics for the ``Values``,
-  ``Local Exchange``, and ``Local Merge Sort`` operators.
-* Simplify ``EXPLAIN (TYPE IO)`` output when there are too many discrete components.
-  This avoids large output at the cost of reduced granularity.
-* Add :func:`parse_presto_data_size` function.
-* Add support for ``UNION ALL`` to optimizer's cost model.
-* Add support for estimating the cost of filters by using a default filter factor.
-  The default value for the filter factor can be configured with the ``default_filter_factor_enabled``
-  session property or the ``optimizer.default-filter-factor-enabled``.
-
-Geospatial
-----------
-
-* Add input validation checks to :func:`ST_LineString` to conform with the specification.
-* Improve spatial join performance.
-* Enable spatial joins for join conditions expressed with the :func:`ST_Within` function.
-
-Web UI
-------
-
-* Fix *Capture Snapshot* button for showing current thread stacks.
-* Fix dropdown for expanding stage skew component on the query details page.
-* Improve the performance of the thread snapshot component on the worker status page.
-* Make the reporting of *Cumulative Memory* usage consistent on the query list and query details pages.
-* Remove legacy thread UI.
-
-Hive
-----
-
-* Add predicate pushdown support for the ``DATE`` type to the Parquet reader. This change also fixes
-  a bug that may cause queries with predicates on ``DATE`` columns to fail with type mismatch errors.
-
-Redis
------
-
-* Prevent printing the value of the ``redis.password`` configuration property to log files.
diff --git a/docs/src/main/sphinx/release/release-0.54.md b/docs/src/main/sphinx/release/release-0.54.md
new file mode 100644
index 000000000000..cf715f7be088
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.54.md
@@ -0,0 +1,34 @@
+# Release 0.54
+
+- Restore binding for the node resource on the coordinator, which provides
+  the state of all nodes as seen by the coordinator's failure detector.
+  Access `/v1/node` to see all nodes, or `/v1/node/failed` to see failed nodes.
+
+- Prevent the {doc}`/client/cli` from hanging when the server goes away.
+
+- Add Hive connector `hive-hadoop1` for Apache Hadoop 1.x.
+
+- Add support for Snappy and LZ4 compression codecs for the `hive-cdh4` connector.
+
+- Add Example HTTP connector `example-http` that reads CSV data via HTTP.
+  The connector requires a metadata URI that returns a JSON document
+  describing the table metadata and the CSV files to read.
+
+  Its primary purpose is to serve as an example of how to write a connector,
+  but it can also be used directly. Create `etc/catalog/example.properties`
+  with the following contents to mount the `example-http` connector as the
+  `example` catalog:
+
+  ```text
+  connector.name=example-http
+  metadata-uri=http://s3.amazonaws.com/presto-example/v1/example-metadata.json
+  ```
+
+- Show correct error message when a catalog or schema does not exist.
+
+- Verify JVM requirements on startup.
+
+- Log an error when the JVM code cache is full.
+
+- Upgrade the embedded Discovery server to allow using
+  non-UUID values for the `node.id` property.
diff --git a/docs/src/main/sphinx/release/release-0.54.rst b/docs/src/main/sphinx/release/release-0.54.rst
deleted file mode 100644
index 034573d24daf..000000000000
--- a/docs/src/main/sphinx/release/release-0.54.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-============
-Release 0.54
-============
-
-* Restore binding for the node resource on the coordinator, which provides
-  the state of all nodes as seen by the coordinator's failure detector.
-  Access ``/v1/node`` to see all nodes, or ``/v1/node/failed`` to see failed nodes.
-
-* Prevent the :doc:`/client/cli` from hanging when the server goes away.
-
-* Add Hive connector ``hive-hadoop1`` for Apache Hadoop 1.x.
-
-* Add support for Snappy and LZ4 compression codecs for the ``hive-cdh4`` connector.
-
-* Add Example HTTP connector ``example-http`` that reads CSV data via HTTP.
-  The connector requires a metadata URI that returns a JSON document
-  describing the table metadata and the CSV files to read.
-
-  Its primary purpose is to serve as an example of how to write a connector,
-  but it can also be used directly. Create ``etc/catalog/example.properties``
-  with the following contents to mount the ``example-http`` connector as the
-  ``example`` catalog:
-
-  .. code-block:: text
-
-      connector.name=example-http
-      metadata-uri=http://s3.amazonaws.com/presto-example/v1/example-metadata.json
-
-* Show correct error message when a catalog or schema does not exist.
-
-* Verify JVM requirements on startup.
-
-* Log an error when the JVM code cache is full.
-
-* Upgrade the embedded Discovery server to allow using
-  non-UUID values for the ``node.id`` property.
diff --git a/docs/src/main/sphinx/release/release-0.55.md b/docs/src/main/sphinx/release/release-0.55.md
new file mode 100644
index 000000000000..94149c00d578
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.55.md
@@ -0,0 +1,103 @@
+# Release 0.55
+
+## RC binary 2-4x gain in CPU efficiency
+
+Presto uses custom fast-path decoding logic for specific Hive file
+formats.  In this release we have added a fast path for RCFile when using
+the Binary SerDe (`LazyBinaryColumnarSerDe`).  In our
+micro benchmarks, we see a gain between 2x and 4x in CPU efficiency compared
+to the generic (slow) path.  Since Hive data decoding accounts for a
+significant portion of the CPU time, this should
+result in measurable gains for most queries over RC Binary encoded data.
+Note that this optimization may not result in a reduction in latency
+if your cluster is network or disk I/O bound.
+
+## Hash distributed aggregations
+
+`GROUP BY` aggregations are now distributed across a fixed number of machines.
+This is controlled by the property `query.initial-hash-partitions`  set in
+`etc/config.properties` of the coordinator and workers. If the value is
+larger than the number of machines available during query scheduling, Presto
+will use all available machines.  The default value is `8`.
+
+The maximum memory size of an aggregation is now
+`query.initial-hash-partitions` times `task.max-memory`.
+
+## Simple distinct aggregations
+
+We have added support for the `DISTINCT` argument qualifier for aggregation
+functions. This is currently limited to queries without a `GROUP BY` clause and
+where all the aggregation functions have the same input expression. For example:
+
+```
+SELECT count(DISTINCT country)
+FROM users
+```
+
+Support for complete `DISTINCT` functionality is in our roadmap.
+
+## Range predicate pushdown
+
+We've modified the connector API to support range predicates in addition to simple equality predicates.
+This lays the ground work for adding connectors to systems that support range
+scans (e.g., HBase, Cassandra, JDBC, etc).
+
+In addition to receiving range predicates, the connector can also communicate
+back the ranges of each partition for use in the query optimizer.  This can be a
+major performance gain for `JOIN` queries where one side of the join has
+only a few partitions.  For example:
+
+```
+SELECT * FROM data_1_year JOIN data_1_week USING (ds)
+```
+
+If `data_1_year` and `data_1_week` are both partitioned on `ds`, the
+connector will report back that one table has partitions for 365 days and the
+other table has partitions for only 7 days.  Then the optimizer will limit
+the scan of the `data_1_year` table to only the 7 days that could possible
+match.  These constraints are combined with other predicates in the
+query to further limit the data scanned.
+
+:::{note}
+This is a backwards incompatible change with the previous connector SPI,
+so if you have written a connector, you will need to update your code
+before deploying this release.
+:::
+
+## json_array_get function
+
+The {func}`json_array_get` function makes it simple to fetch a single element from a
+scalar json array.
+
+## Non-reserved keywords
+
+The keywords `DATE`, `TIME`, `TIMESTAMP`, and `INTERVAL` are no longer
+reserved keywords in the grammar.  This means that you can access a column
+named `date` without quoting the identifier.
+
+## CLI source option
+
+The Presto CLI now has an option to set the query source.  The source
+value is shown in the UI and is recorded in events.   When using the CLI in
+shell scripts it is useful to set the `--source` option to distinguish shell
+scripts from normal users.
+
+## SHOW SCHEMAS FROM
+
+Although the documentation included the syntax `SHOW SCHEMAS [FROM catalog]`,
+it was not implemented.  This release now implements this statement correctly.
+
+## Hive bucketed table fixes
+
+For queries over Hive bucketed tables, Presto will attempt to limit scans to
+the buckets that could possible contain rows that match the WHERE clause.
+Unfortunately, the algorithm we were using to select the buckets was not
+correct, and sometimes we would either select the wrong files or fail to
+select any files.  We have aligned
+the algorithm with Hive and now the optimization works as expected.
+
+We have also improved the algorithm for detecting tables that are not properly
+bucketed.  It is common for tables to declare bucketing in the Hive metadata, but
+not actually be bucketed in HDFS.  When Presto detects this case, it fallback to a full scan of the
+partition.  Not only does this change make bucketing safer, but it makes it easier
+to migrate a table to use bucketing without rewriting all of the data.
diff --git a/docs/src/main/sphinx/release/release-0.55.rst b/docs/src/main/sphinx/release/release-0.55.rst
deleted file mode 100644
index dcd3244d6595..000000000000
--- a/docs/src/main/sphinx/release/release-0.55.rst
+++ /dev/null
@@ -1,109 +0,0 @@
-============
-Release 0.55
-============
-
-RC binary 2-4x gain in CPU efficiency
--------------------------------------
-
-Presto uses custom fast-path decoding logic for specific Hive file
-formats.  In this release we have added a fast path for RCFile when using
-the Binary SerDe (``LazyBinaryColumnarSerDe``).  In our
-micro benchmarks, we see a gain between 2x and 4x in CPU efficiency compared
-to the generic (slow) path.  Since Hive data decoding accounts for a
-significant portion of the CPU time, this should
-result in measurable gains for most queries over RC Binary encoded data.
-Note that this optimization may not result in a reduction in latency
-if your cluster is network or disk I/O bound.
-
-Hash distributed aggregations
------------------------------
-
-``GROUP BY`` aggregations are now distributed across a fixed number of machines.
-This is controlled by the property ``query.initial-hash-partitions``  set in
-``etc/config.properties`` of the coordinator and workers. If the value is
-larger than the number of machines available during query scheduling, Presto
-will use all available machines.  The default value is ``8``.
-
-The maximum memory size of an aggregation is now
-``query.initial-hash-partitions`` times ``task.max-memory``.
-
-Simple distinct aggregations
-----------------------------
-
-We have added support for the ``DISTINCT`` argument qualifier for aggregation
-functions. This is currently limited to queries without a ``GROUP BY`` clause and
-where all the aggregation functions have the same input expression. For example::
-
-    SELECT count(DISTINCT country)
-    FROM users
-
-Support for complete ``DISTINCT`` functionality is in our roadmap.
-
-Range predicate pushdown
-------------------------
-
-We've modified the connector API to support range predicates in addition to simple equality predicates.
-This lays the ground work for adding connectors to systems that support range
-scans (e.g., HBase, Cassandra, JDBC, etc).
-
-In addition to receiving range predicates, the connector can also communicate
-back the ranges of each partition for use in the query optimizer.  This can be a
-major performance gain for ``JOIN`` queries where one side of the join has
-only a few partitions.  For example::
-
-   SELECT * FROM data_1_year JOIN data_1_week USING (ds)
-
-If ``data_1_year`` and ``data_1_week`` are both partitioned on ``ds``, the
-connector will report back that one table has partitions for 365 days and the
-other table has partitions for only 7 days.  Then the optimizer will limit
-the scan of the ``data_1_year`` table to only the 7 days that could possible
-match.  These constraints are combined with other predicates in the
-query to further limit the data scanned.
-
-.. note::
-    This is a backwards incompatible change with the previous connector SPI,
-    so if you have written a connector, you will need to update your code
-    before deploying this release.
-
-json_array_get function
------------------------
-
-The :func:`json_array_get` function makes it simple to fetch a single element from a
-scalar json array.
-
-Non-reserved keywords
----------------------
-
-The keywords ``DATE``, ``TIME``, ``TIMESTAMP``, and ``INTERVAL`` are no longer
-reserved keywords in the grammar.  This means that you can access a column
-named ``date`` without quoting the identifier.
-
-CLI source option
------------------
-
-The Presto CLI now has an option to set the query source.  The source
-value is shown in the UI and is recorded in events.   When using the CLI in
-shell scripts it is useful to set the ``--source`` option to distinguish shell
-scripts from normal users.
-
-SHOW SCHEMAS FROM
------------------
-
-Although the documentation included the syntax ``SHOW SCHEMAS [FROM catalog]``,
-it was not implemented.  This release now implements this statement correctly.
-
-Hive bucketed table fixes
--------------------------
-
-For queries over Hive bucketed tables, Presto will attempt to limit scans to
-the buckets that could possible contain rows that match the WHERE clause.
-Unfortunately, the algorithm we were using to select the buckets was not
-correct, and sometimes we would either select the wrong files or fail to
-select any files.  We have aligned
-the algorithm with Hive and now the optimization works as expected.
-
-We have also improved the algorithm for detecting tables that are not properly
-bucketed.  It is common for tables to declare bucketing in the Hive metadata, but
-not actually be bucketed in HDFS.  When Presto detects this case, it fallback to a full scan of the
-partition.  Not only does this change make bucketing safer, but it makes it easier
-to migrate a table to use bucketing without rewriting all of the data.
diff --git a/docs/src/main/sphinx/release/release-0.56.md b/docs/src/main/sphinx/release/release-0.56.md
new file mode 100644
index 000000000000..fafb315da295
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.56.md
@@ -0,0 +1,37 @@
+# Release 0.56
+
+## Table creation
+
+Tables can be created from the result of a query:
+
+```
+CREATE TABLE orders_by_date AS
+SELECT orderdate, sum(totalprice) AS price
+FROM orders
+GROUP BY orderdate
+```
+
+Tables are created in Hive without partitions (unpartitioned) and use
+RCFile with the Binary SerDe (`LazyBinaryColumnarSerDe`) as this is
+currently the best format for Presto.
+
+:::{note}
+This is a backwards incompatible change to `ConnectorMetadata` in the SPI,
+so if you have written a connector, you will need to update your code before
+deploying this release. We recommend changing your connector to extend from
+the new `ReadOnlyConnectorMetadata` abstract base class unless you want to
+support table creation.
+:::
+
+## Cross joins
+
+Cross joins are supported using the standard ANSI SQL syntax:
+
+```
+SELECT *
+FROM a
+CROSS JOIN b
+```
+
+Inner joins that result in a cross join due to the join criteria evaluating
+to true at analysis time are also supported.
diff --git a/docs/src/main/sphinx/release/release-0.56.rst b/docs/src/main/sphinx/release/release-0.56.rst
deleted file mode 100644
index d15315a3ede2..000000000000
--- a/docs/src/main/sphinx/release/release-0.56.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-============
-Release 0.56
-============
-
-Table creation
---------------
-
-Tables can be created from the result of a query::
-
-    CREATE TABLE orders_by_date AS
-    SELECT orderdate, sum(totalprice) AS price
-    FROM orders
-    GROUP BY orderdate
-
-Tables are created in Hive without partitions (unpartitioned) and use
-RCFile with the Binary SerDe (``LazyBinaryColumnarSerDe``) as this is
-currently the best format for Presto.
-
-.. note::
-    This is a backwards incompatible change to ``ConnectorMetadata`` in the SPI,
-    so if you have written a connector, you will need to update your code before
-    deploying this release. We recommend changing your connector to extend from
-    the new ``ReadOnlyConnectorMetadata`` abstract base class unless you want to
-    support table creation.
-
-Cross joins
------------
-
-Cross joins are supported using the standard ANSI SQL syntax::
-
-    SELECT *
-    FROM a
-    CROSS JOIN b
-
-Inner joins that result in a cross join due to the join criteria evaluating
-to true at analysis time are also supported.
diff --git a/docs/src/main/sphinx/release/release-0.57.md b/docs/src/main/sphinx/release/release-0.57.md
new file mode 100644
index 000000000000..b18db674bc74
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.57.md
@@ -0,0 +1,47 @@
+# Release 0.57
+
+## Distinct aggregations
+
+The `DISTINCT` argument qualifier for aggregation functions is now
+fully supported. For example:
+
+```
+SELECT country, count(DISTINCT city), count(DISTINCT age)
+FROM users
+GROUP BY country
+```
+
+:::{note}
+{func}`approx_distinct` should be used in preference to this
+whenever an approximate answer is allowable as it is substantially
+faster and does not have any limits on the number of distinct items it
+can process. `COUNT(DISTINCT ...)` must transfer every item over the
+network and keep each distinct item in memory.
+:::
+
+## Hadoop 2.x
+
+Use the `hive-hadoop2` connector to read Hive data from Hadoop 2.x.
+See {doc}`/installation/deployment` for details.
+
+## Amazon S3
+
+All Hive connectors support reading data from
+[Amazon S3](http://aws.amazon.com/s3/).
+This requires two additional catalog properties for the Hive connector
+to specify your AWS Access Key ID and Secret Access Key:
+
+```text
+hive.s3.aws-access-key=AKIAIOSFODNN7EXAMPLE
+hive.s3.aws-secret-key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+```
+
+## Miscellaneous
+
+- Allow specifying catalog and schema in the {doc}`/client/jdbc` URL.
+- Implement more functionality in the JDBC driver.
+- Allow certain custom `InputFormat`s to work by propagating
+  Hive serialization properties to the `RecordReader`.
+- Many execution engine performance improvements.
+- Fix optimizer performance regression.
+- Fix weird `MethodHandle` exception.
diff --git a/docs/src/main/sphinx/release/release-0.57.rst b/docs/src/main/sphinx/release/release-0.57.rst
deleted file mode 100644
index 998ec5efc464..000000000000
--- a/docs/src/main/sphinx/release/release-0.57.rst
+++ /dev/null
@@ -1,56 +0,0 @@
-============
-Release 0.57
-============
-
-Distinct aggregations
----------------------
-
-The ``DISTINCT`` argument qualifier for aggregation functions is now
-fully supported. For example::
-
-    SELECT country, count(DISTINCT city), count(DISTINCT age)
-    FROM users
-    GROUP BY country
-
-.. note::
-
-    :func:`approx_distinct` should be used in preference to this
-    whenever an approximate answer is allowable as it is substantially
-    faster and does not have any limits on the number of distinct items it
-    can process. ``COUNT(DISTINCT ...)`` must transfer every item over the
-    network and keep each distinct item in memory.
-
-Hadoop 2.x
-----------
-
-Use the ``hive-hadoop2`` connector to read Hive data from Hadoop 2.x.
-See :doc:`/installation/deployment` for details.
-
-Amazon S3
----------
-
-All Hive connectors support reading data from
-`Amazon S3 <http://aws.amazon.com/s3/>`_.
-This requires two additional catalog properties for the Hive connector
-to specify your AWS Access Key ID and Secret Access Key:
-
-.. code-block:: text
-
-    hive.s3.aws-access-key=AKIAIOSFODNN7EXAMPLE
-    hive.s3.aws-secret-key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
-
-Miscellaneous
--------------
-
-* Allow specifying catalog and schema in the :doc:`/client/jdbc` URL.
-
-* Implement more functionality in the JDBC driver.
-
-* Allow certain custom ``InputFormat``\s to work by propagating
-  Hive serialization properties to the ``RecordReader``.
-
-* Many execution engine performance improvements.
-
-* Fix optimizer performance regression.
-
-* Fix weird ``MethodHandle`` exception.
diff --git a/docs/src/main/sphinx/release/release-0.58.md b/docs/src/main/sphinx/release/release-0.58.md
new file mode 100644
index 000000000000..d697c858e2ad
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.58.md
@@ -0,0 +1,11 @@
+# Release 0.58
+
+- Add first version of Cassandra connector. This plugin is still in
+  development and is not yet bundled with the server. See the `README`
+  in the plugin source directory for details.
+- Support UDFs for internal plugins. This is not yet part of the SPI
+  and is a stopgap feature intended for advanced users. UDFs must be
+  implemented using the internal Presto APIs which often change
+  substantially between releases.
+- Fix Hive connector semaphore release bug.
+- Fix handling of non-splittable files without blocks.
diff --git a/docs/src/main/sphinx/release/release-0.58.rst b/docs/src/main/sphinx/release/release-0.58.rst
deleted file mode 100644
index f239d6876310..000000000000
--- a/docs/src/main/sphinx/release/release-0.58.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-============
-Release 0.58
-============
-
-* Add first version of Cassandra connector. This plugin is still in
-  development and is not yet bundled with the server. See the ``README``
-  in the plugin source directory for details.
-
-* Support UDFs for internal plugins. This is not yet part of the SPI
-  and is a stopgap feature intended for advanced users. UDFs must be
-  implemented using the internal Presto APIs which often change
-  substantially between releases.
-
-* Fix Hive connector semaphore release bug.
-
-* Fix handling of non-splittable files without blocks.
diff --git a/docs/src/main/sphinx/release/release-0.59.md b/docs/src/main/sphinx/release/release-0.59.md
new file mode 100644
index 000000000000..b3d479ceaa8c
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.59.md
@@ -0,0 +1,4 @@
+# Release 0.59
+
+- Fix hang in `HiveSplitSource`.  A query over a large table can hang
+  in split discovery due to a bug introduced in 0.57.
diff --git a/docs/src/main/sphinx/release/release-0.59.rst b/docs/src/main/sphinx/release/release-0.59.rst
deleted file mode 100644
index ccc19e7b40ef..000000000000
--- a/docs/src/main/sphinx/release/release-0.59.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-============
-Release 0.59
-============
-
-* Fix hang in ``HiveSplitSource``.  A query over a large table can hang
-  in split discovery due to a bug introduced in 0.57.
diff --git a/docs/src/main/sphinx/release/release-0.60.md b/docs/src/main/sphinx/release/release-0.60.md
new file mode 100644
index 000000000000..b6c044f3f73f
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.60.md
@@ -0,0 +1,142 @@
+# Release 0.60
+
+## JDBC improvements
+
+The Presto version of the JDBC `DatabaseMetaData` interface now includes
+proper implementations of `getTables`, `getSchemas` and `getCatalogs`.
+
+The JDBC driver is now always packaged as a standalone jar without any
+dependencies.  Previously, this artifact was published with the Maven
+classifier `standalone`. The new build does not publish this artifact
+anymore.
+
+## USE CATALOG and USE SCHEMA
+
+The {doc}`/client/cli` now supports `USE CATALOG` and
+`USE SCHEMA`.
+
+## TPCH connector
+
+We have added a new connector that will generate synthetic data following the
+TPC-H specification. This connector makes it easy to generate large datasets for
+testing and bug reports. When generating bug reports, we encourage users to use
+this catalog since it eases the process of reproducing the issue. The data is
+generated dynamically for each query, so no disk space is used by this
+connector. To add the `tpch` catalog to your system, create the catalog
+property file `etc/catalog/tpch.properties` on both the coordinator and workers
+with the following contents:
+
+```text
+connector.name=tpch
+```
+
+Additionally, update the `datasources` property in the config properties file,
+`etc/config.properties`, for the workers to include `tpch`.
+
+## SPI
+
+The `Connector` interface now has explicit methods for supplying the services
+expected by the query engine. Previously, this was handled by a generic
+`getService` method.
+
+:::{note}
+This is a backwards incompatible change to `Connector` in the SPI,
+so if you have written a connector, you will need to update your code before
+deploying this release.
+:::
+
+Additionally, we have added the `NodeManager` interface to the SPI to allow a
+plugin to detect all nodes in the Presto cluster.  This is important for some
+connectors that can divide a table evenly between all nodes as long as the
+connector knows how many nodes exist.  To access the node manager, simply add
+the following to the `Plugin` class:
+
+```java
+@Inject
+public void setNodeManager(NodeManager nodeManager)
+{
+    this.nodeManager = nodeManager;
+}
+```
+
+## Optimizations
+
+### DISTINCT LIMIT
+
+For queries with the following form:
+
+```
+SELECT DISTINCT ...
+FROM T
+LIMIT N
+```
+
+We have added an optimization that stops the query as soon as `N` distinct
+rows are found.
+
+### Range predicates
+
+When optimizing a join, Presto analyzes the ranges of the partitions on each
+side of a join and pushes these ranges to the other side.  When tables have a
+lot of partitions, this can result in a very large filter with one expression
+for each partition.  The optimizer now summarizes the predicate ranges to reduce
+the complexity of the filters.
+
+### Compound filters
+
+Complex expressions involving `AND`, `OR`, or `NOT` are now optimized by
+the expression optimizer.
+
+### Window functions
+
+Window functions with a `PARTITION BY` clause are now distributed based on the
+partition key.
+
+## Bug fixes
+
+- Scheduling
+
+  In the changes to schedule splits in batches, we introduced two bugs that
+  resulted in an unbalanced workload across nodes which increases query latency.
+  The first problem was not inspecting the queued split count of the nodes while
+  scheduling the batch, and the second problem was not counting the splits
+  awaiting creation in the task executor.
+
+- JSON conversion of complex Hive types
+
+  Presto converts complex Hive types (array, map, struct and union) into JSON.
+  Previously, numeric keys in maps were converted to numbers, not strings,
+  which is invalid as JSON only allows strings for object keys. This prevented
+  the {doc}`/functions/json` from working.
+
+- Hive hidden files
+
+  Presto will now ignore files in Hive that start with an underscore `_` or
+  a dot `.`.  This matches the behavior of Hadoop MapReduce / Hive.
+
+- Failures incorrectly reported as no data
+
+  Certain types of failures would result in the query appearing to succeed and
+  return an incomplete result (often zero rows). There was a race condition
+  between the error propagation and query teardown. In some cases, the query
+  would be torn down before the exception made it to the coordinator. This was a
+  regression introduced during the query teardown optimization work. There are
+  now tests to catch this type of bug.
+
+- Exchange client leak
+
+  When a query finished early (e.g., limit or failure) and the exchange operator
+  was blocked waiting for data from other nodes, the exchange was not be closed
+  properly. This resulted in continuous failing HTTP requests which leaked
+  resources and produced large log files.
+
+- Hash partitioning
+
+  A query with many `GROUP BY` items could fail due to an overflow in the hash
+  function.
+
+- Compiled NULL literal
+
+  In some cases queries with a select expression like `CAST(NULL AS varchar)`
+  would fail due to a bug in the output type detection code in expression
+  compiler.
diff --git a/docs/src/main/sphinx/release/release-0.60.rst b/docs/src/main/sphinx/release/release-0.60.rst
deleted file mode 100644
index 30b3b1f76b92..000000000000
--- a/docs/src/main/sphinx/release/release-0.60.rst
+++ /dev/null
@@ -1,152 +0,0 @@
-============
-Release 0.60
-============
-
-JDBC improvements
------------------
-
-The Presto version of the JDBC ``DatabaseMetaData`` interface now includes
-proper implementations of ``getTables``, ``getSchemas`` and ``getCatalogs``.
-
-The JDBC driver is now always packaged as a standalone jar without any
-dependencies.  Previously, this artifact was published with the Maven
-classifier ``standalone``. The new build does not publish this artifact
-anymore.
-
-USE CATALOG and USE SCHEMA
---------------------------
-
-The :doc:`/client/cli` now supports ``USE CATALOG`` and
-``USE SCHEMA``.
-
-
-TPCH connector
---------------
-
-We have added a new connector that will generate synthetic data following the
-TPC-H specification. This connector makes it easy to generate large datasets for
-testing and bug reports. When generating bug reports, we encourage users to use
-this catalog since it eases the process of reproducing the issue. The data is
-generated dynamically for each query, so no disk space is used by this
-connector. To add the ``tpch`` catalog to your system, create the catalog
-property file ``etc/catalog/tpch.properties`` on both the coordinator and workers
-with the following contents:
-
-.. code-block:: text
-
-    connector.name=tpch
-
-Additionally, update the ``datasources`` property in the config properties file,
-``etc/config.properties``, for the workers to include ``tpch``.
-
-SPI
----
-
-The ``Connector`` interface now has explicit methods for supplying the services
-expected by the query engine. Previously, this was handled by a generic
-``getService`` method.
-
-.. note::
-    This is a backwards incompatible change to ``Connector`` in the SPI,
-    so if you have written a connector, you will need to update your code before
-    deploying this release.
-
-Additionally, we have added the ``NodeManager`` interface to the SPI to allow a
-plugin to detect all nodes in the Presto cluster.  This is important for some
-connectors that can divide a table evenly between all nodes as long as the
-connector knows how many nodes exist.  To access the node manager, simply add
-the following to the ``Plugin`` class:
-
-.. code-block:: java
-
-    @Inject
-    public void setNodeManager(NodeManager nodeManager)
-    {
-        this.nodeManager = nodeManager;
-    }
-
-Optimizations
--------------
-
-DISTINCT LIMIT
-~~~~~~~~~~~~~~
-
-For queries with the following form::
-
-    SELECT DISTINCT ...
-    FROM T
-    LIMIT N
-
-We have added an optimization that stops the query as soon as ``N`` distinct
-rows are found.
-
-Range predicates
-~~~~~~~~~~~~~~~~
-
-When optimizing a join, Presto analyzes the ranges of the partitions on each
-side of a join and pushes these ranges to the other side.  When tables have a
-lot of partitions, this can result in a very large filter with one expression
-for each partition.  The optimizer now summarizes the predicate ranges to reduce
-the complexity of the filters.
-
-Compound filters
-~~~~~~~~~~~~~~~~
-
-Complex expressions involving ``AND``, ``OR``, or ``NOT`` are now optimized by
-the expression optimizer.
-
-Window functions
-~~~~~~~~~~~~~~~~
-
-Window functions with a ``PARTITION BY`` clause are now distributed based on the
-partition key.
-
-Bug fixes
----------
-
-* Scheduling
-
-  In the changes to schedule splits in batches, we introduced two bugs that
-  resulted in an unbalanced workload across nodes which increases query latency.
-  The first problem was not inspecting the queued split count of the nodes while
-  scheduling the batch, and the second problem was not counting the splits
-  awaiting creation in the task executor.
-
-* JSON conversion of complex Hive types
-
-  Presto converts complex Hive types (array, map, struct and union) into JSON.
-  Previously, numeric keys in maps were converted to numbers, not strings,
-  which is invalid as JSON only allows strings for object keys. This prevented
-  the :doc:`/functions/json` from working.
-
-* Hive hidden files
-
-  Presto will now ignore files in Hive that start with an underscore ``_`` or
-  a dot ``.``.  This matches the behavior of Hadoop MapReduce / Hive.
-
-* Failures incorrectly reported as no data
-
-  Certain types of failures would result in the query appearing to succeed and
-  return an incomplete result (often zero rows). There was a race condition
-  between the error propagation and query teardown. In some cases, the query
-  would be torn down before the exception made it to the coordinator. This was a
-  regression introduced during the query teardown optimization work. There are
-  now tests to catch this type of bug.
-
-* Exchange client leak
-
-  When a query finished early (e.g., limit or failure) and the exchange operator
-  was blocked waiting for data from other nodes, the exchange was not be closed
-  properly. This resulted in continuous failing HTTP requests which leaked
-  resources and produced large log files.
-
-* Hash partitioning
-
-  A query with many ``GROUP BY`` items could fail due to an overflow in the hash
-  function.
-
-* Compiled NULL literal
-
-  In some cases queries with a select expression like ``CAST(NULL AS varchar)``
-  would fail due to a bug in the output type detection code in expression
-  compiler.
diff --git a/docs/src/main/sphinx/release/release-0.61.md b/docs/src/main/sphinx/release/release-0.61.md
new file mode 100644
index 000000000000..ed51fb85d8e4
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.61.md
@@ -0,0 +1,65 @@
+# Release 0.61
+
+## Add support for table value constructors
+
+Presto now supports the SQL table value constructor syntax to create inline tables.
+The `VALUES` clause can be used anywhere a `SELECT` statement is allowed.
+For example, as a top-level query:
+
+```
+VALUES ('a', 1), ('b', 2);
+```
+
+```text
+ _col0 | _col1
+-------+-------
+ a     |     1
+ b     |     2
+(2 rows)
+```
+
+Alternatively, in the `FROM` clause:
+
+```
+SELECT *
+FROM (
+  VALUES
+    ('a', 'ape'),
+    ('b', 'bear')
+) AS animal (letter, animal)
+JOIN (
+  VALUES
+    ('a', 'apple'),
+    ('b', 'banana')
+) AS fruit (letter, fruit)
+USING (letter);
+```
+
+```text
+ letter | animal | letter |  fruit
+--------+--------+--------+---------
+ a      | ape    | a      | apple
+ b      | bear   | b      | banana
+(2 rows)
+```
+
+## Cassandra
+
+- Add support for upper-case schema, table, and columns names.
+- Add support for `DECIMAL` type.
+
+## Amazon S3 support
+
+- Completely rewritten Hadoop FileSystem implementation for S3 using the Amazon AWS SDK,
+  with major performance and reliability improvements.
+- Add support for writing data to S3.
+
+## Miscellaneous
+
+- General improvements to the JDBC driver, specifically with respect to metadata handling.
+- Fix division by zero errors in variance aggregation functions (`VARIANCE`, `STDDEV`, etc.).
+- Fix a bug when using `DISTINCT` aggregations in the `HAVING` clause.
+- Fix an out of memory issue when writing large tables.
+- Fix a bug when using `ORDER BY rand()` in a `JOIN` query.
+- Fix handling of timestamps in maps and lists in Hive connector.
+- Add instrumentation for Hive metastore and HDFS API calls to track failures and latency. These metrics are exposed via JMX.
diff --git a/docs/src/main/sphinx/release/release-0.61.rst b/docs/src/main/sphinx/release/release-0.61.rst
deleted file mode 100644
index 820b5406debf..000000000000
--- a/docs/src/main/sphinx/release/release-0.61.rst
+++ /dev/null
@@ -1,76 +0,0 @@
-============
-Release 0.61
-============
-
-Add support for table value constructors
-----------------------------------------
-
-Presto now supports the SQL table value constructor syntax to create inline tables.
-The ``VALUES`` clause can be used anywhere a ``SELECT`` statement is allowed.
-For example, as a top-level query::
-
-   VALUES ('a', 1), ('b', 2);
-
-.. code-block:: text
-
-    _col0 | _col1
-   -------+-------
-    a     |     1
-    b     |     2
-   (2 rows)
-
-Alternatively, in the ``FROM`` clause::
-
-    SELECT *
-    FROM (
-      VALUES
-        ('a', 'ape'),
-        ('b', 'bear')
-    ) AS animal (letter, animal)
-    JOIN (
-      VALUES
-        ('a', 'apple'),
-        ('b', 'banana')
-    ) AS fruit (letter, fruit)
-    USING (letter);
-
-.. code-block:: text
-
-    letter | animal | letter |  fruit
-   --------+--------+--------+---------
-    a      | ape    | a      | apple
-    b      | bear   | b      | banana
-   (2 rows)
-
-
-Cassandra
----------
-
-* Add support for upper-case schema, table, and columns names.
-
-* Add support for ``DECIMAL`` type.
-
-Amazon S3 support
------------------
-
-* Completely rewritten Hadoop FileSystem implementation for S3 using the Amazon AWS SDK,
-  with major performance and reliability improvements.
-
-* Add support for writing data to S3.
-
-Miscellaneous
--------------
-
-* General improvements to the JDBC driver, specifically with respect to metadata handling.
-
-* Fix division by zero errors in variance aggregation functions (``VARIANCE``, ``STDDEV``, etc.).
-
-* Fix a bug when using ``DISTINCT`` aggregations in the ``HAVING`` clause.
-
-* Fix an out of memory issue when writing large tables.
-
-* Fix a bug when using ``ORDER BY rand()`` in a ``JOIN`` query.
-
-* Fix handling of timestamps in maps and lists in Hive connector.
-
-* Add instrumentation for Hive metastore and HDFS API calls to track failures and latency. These metrics are exposed via JMX.
diff --git a/docs/src/main/sphinx/release/release-0.62.md b/docs/src/main/sphinx/release/release-0.62.md
new file mode 100644
index 000000000000..1103799ff607
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.62.md
@@ -0,0 +1,7 @@
+# Release 0.62
+
+- Fix an issue with active queries JMX counter reporting incorrect numbers
+- Hive binary map keys were not being decoded correctly
+- Performance improvements for `APPROX_DISTINCT`
+- Fix performance regression when planning queries over a large number of partitions
+- Minor improvement to coordinator UI when displaying long SQL queries
diff --git a/docs/src/main/sphinx/release/release-0.62.rst b/docs/src/main/sphinx/release/release-0.62.rst
deleted file mode 100644
index 3af5eed894bb..000000000000
--- a/docs/src/main/sphinx/release/release-0.62.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-============
-Release 0.62
-============
-
-* Fix an issue with active queries JMX counter reporting incorrect numbers
-
-* Hive binary map keys were not being decoded correctly
-
-* Performance improvements for ``APPROX_DISTINCT``
-
-* Fix performance regression when planning queries over a large number of partitions
-
-* Minor improvement to coordinator UI when displaying long SQL queries
diff --git a/docs/src/main/sphinx/release/release-0.63.md b/docs/src/main/sphinx/release/release-0.63.md
new file mode 100644
index 000000000000..cb46be8addb8
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.63.md
@@ -0,0 +1,5 @@
+# Release 0.63
+
+- Minor improvements to coordinator UI
+- Minor planner optimization to avoid redundant computation in some cases
+- Error handling and classification improvements
diff --git a/docs/src/main/sphinx/release/release-0.63.rst b/docs/src/main/sphinx/release/release-0.63.rst
deleted file mode 100644
index bbb88f6a7d20..000000000000
--- a/docs/src/main/sphinx/release/release-0.63.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-============
-Release 0.63
-============
-
-* Minor improvements to coordinator UI
-
-* Minor planner optimization to avoid redundant computation in some cases
-
-* Error handling and classification improvements
diff --git a/docs/src/main/sphinx/release/release-0.64.md b/docs/src/main/sphinx/release/release-0.64.md
new file mode 100644
index 000000000000..96337578fd90
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.64.md
@@ -0,0 +1,8 @@
+# Release 0.64
+
+- Fix approximate aggregation error bound calculation
+- Error handling and classification improvements
+- Fix `GROUP BY` failure when keys are too large
+- Add thread visualization UI at `/ui/thread`
+- Fix regression in `CREATE TABLE` that can cause column data to be swapped.
+  This bug was introduced in version 0.57.
diff --git a/docs/src/main/sphinx/release/release-0.64.rst b/docs/src/main/sphinx/release/release-0.64.rst
deleted file mode 100644
index a2b5a0ef1ede..000000000000
--- a/docs/src/main/sphinx/release/release-0.64.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-============
-Release 0.64
-============
-
-* Fix approximate aggregation error bound calculation
-
-* Error handling and classification improvements
-
-* Fix ``GROUP BY`` failure when keys are too large
-
-* Add thread visualization UI at ``/ui/thread``
-
-* Fix regression in ``CREATE TABLE`` that can cause column data to be swapped.
-  This bug was introduced in version 0.57.
diff --git a/docs/src/main/sphinx/release/release-0.65.md b/docs/src/main/sphinx/release/release-0.65.md
new file mode 100644
index 000000000000..f62b791c7344
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.65.md
@@ -0,0 +1,4 @@
+# Release 0.65
+
+- Fix `NullPointerException` when tearing down queries
+- Fix exposed third-party dependencies in JDBC driver JAR
diff --git a/docs/src/main/sphinx/release/release-0.65.rst b/docs/src/main/sphinx/release/release-0.65.rst
deleted file mode 100644
index ad39eb844a1f..000000000000
--- a/docs/src/main/sphinx/release/release-0.65.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-============
-Release 0.65
-============
-
-* Fix ``NullPointerException`` when tearing down queries
-
-* Fix exposed third-party dependencies in JDBC driver JAR
diff --git a/docs/src/main/sphinx/release/release-0.66.md b/docs/src/main/sphinx/release/release-0.66.md
new file mode 100644
index 000000000000..00082447142b
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.66.md
@@ -0,0 +1,182 @@
+# Release 0.66
+
+## Type system
+
+In this release we have replaced the existing simple fixed type system
+with a fully extensible type system and have added several new types.
+We have also expanded the function system to support custom
+arithmetic, comparison and cast operators. For example, the new date/time
+types include an operator for adding an `INTERVAL` to a `TIMESTAMP`.
+
+Existing functions have been updated to operate on and return the
+newly added types.  For example, the ANSI color functions now operate
+on a `COLOR` type, and the date/time functions operate on standard
+SQL date/time types (described below).
+
+Finally, plugins can now provide custom types and operators in addition
+to connectors and functions. This feature is highly experimental, so expect
+the interfaces to change over the next few releases.  Also, since in SQL
+there is only one namespace for types, you should be careful to make names
+for custom types unique as we will add other common SQL types to Presto
+in the near future.
+
+## Date/time types
+
+Presto now supports all standard SQL date/time types:
+`DATE`, `TIME`, `TIMESTAMP` and `INTERVAL`.
+All of the date/time functions and language constructs now operate on these
+types instead of `BIGINT` and perform temporal calculations correctly.
+This was previously broken due to, for example, not being able to detect
+whether an argument was a `DATE` or a `TIMESTAMP`.
+This change comes at the cost of breaking existing queries that perform
+arithmetic operations directly on the `BIGINT` value returned from
+the date/time functions.
+
+As part of this work, we have also added the {func}`date_trunc` function
+which is convenient for grouping data by a time span. For example, you
+can perform an aggregation by hour:
+
+```
+SELECT date_trunc('hour', timestamp_column), count(*)
+FROM ...
+GROUP BY 1
+```
+
+### Time zones
+
+This release has full support for time zone rules, which are needed to
+perform date/time calculations correctly. Typically, the session time
+zone is used for temporal calculations. This is the time zone of the
+client computer that submits the query, if available. Otherwise, it is
+the time zone of the server running the Presto coordinator.
+
+Queries that operate with time zones that follow daylight saving can
+produce unexpected results. For example, if we run the following query
+to add 24 hours using in the `America/Los Angeles` time zone:
+
+```
+SELECT date_add('hour', 24, TIMESTAMP '2014-03-08 09:00:00');
+-- 2014-03-09 10:00:00.000
+```
+
+The timestamp appears to only advance 23 hours. This is because on
+March 9th clocks in `America/Los Angeles` are turned forward 1 hour,
+so March 9th only has 23 hours. To advance the day part of the timestamp,
+use the `day` unit instead:
+
+```
+SELECT date_add('day', 1, TIMESTAMP '2014-03-08 09:00:00');
+-- 2014-03-09 09:00:00.000
+```
+
+This works because the {func}`date_add` function treats the timestamp as
+list of fields, adds the value to the specified field and then rolls any
+overflow into the next higher field.
+
+Time zones are also necessary for parsing and printing timestamps.
+Queries that use this functionality can also produce unexpected results.
+For example, on the same machine:
+
+```
+SELECT TIMESTAMP '2014-03-09 02:30:00';
+```
+
+The above query causes an error because there was no 2:30 AM on March 9th
+in `America/Los_Angeles` due to a daylight saving time transition.
+
+In addition to normal `TIMESTAMP` values, Presto also supports the
+`TIMESTAMP WITH TIME ZONE` type, where every value has an explicit time zone.
+For example, the following query creates a `TIMESTAMP WITH TIME ZONE`:
+
+```
+SELECT TIMESTAMP '2014-03-14 09:30:00 Europe/Berlin';
+-- 2014-03-14 09:30:00.000 Europe/Berlin
+```
+
+You can also change the time zone of an existing timestamp using the
+`AT TIME ZONE` clause:
+
+```
+SELECT TIMESTAMP '2014-03-14 09:30:00 Europe/Berlin'
+     AT TIME ZONE 'America/Los_Angeles';
+-- 2014-03-14 01:30:00.000 America/Los_Angeles
+```
+
+Both timestamps represent the same instant in time;
+they differ only in the time zone used to print them.
+
+The time zone of the session can be set on a per-query basis using the
+`X-Presto-Time-Zone` HTTP header, or via the
+`PrestoConnection.setTimeZoneId(String)` method in the JDBC driver.
+
+### Localization
+
+In addition to time zones, the language of the user is important when
+parsing and printing date/time types. This release adds localization
+support to the Presto engine and functions that require it:
+{func}`date_format` and {func}`date_parse`.
+For example, if we set the language to Spanish:
+
+```
+SELECT date_format(TIMESTAMP '2001-01-09 09:04', '%M'); -- enero
+```
+
+If we set the language to Japanese:
+
+```
+SELECT date_format(TIMESTAMP '2001-01-09 09:04', '%M'); -- 1月
+```
+
+The language of the session can be set on a per-query basis using the
+`X-Presto-Language` HTTP header, or via the
+`PrestoConnection.setLocale(Locale)` method in the JDBC driver.
+
+## Optimizations
+
+- We have upgraded the Hive connector to Hive 0.12 which includes
+  performance improvements for RCFile.
+- `GROUP BY` and `JOIN` operators are now compiled to byte code
+  and are significantly faster.
+- Reduced memory usage of `GROUP BY` and `SELECT DISTINCT`,
+  which previously required several megabytes of memory
+  per operator, even when the number of groups was small.
+- The planner now optimizes function call arguments. This should improve
+  the performance of queries that contain complex expressions.
+- Fixed a performance regression in the HTTP client. The recent HTTP client
+  upgrade was using inadvertently GZIP compression and has a bug in the
+  buffer management resulting in high CPU usage.
+
+## SPI
+
+In this release we have made a number of backward incompatible changes to the SPI:
+
+- Added `Type` and related interfaces
+- `ConnectorType` in metadata has been replaced with `Type`
+- Renamed `TableHandle` to `ConnectorTableHandle`
+- Renamed `ColumnHandle` to `ConnectorColumnHandle`
+- Renamed `Partition` to `ConnectorPartition`
+- Renamed `PartitionResult` to `ConnectorPartitionResult`
+- Renamed `Split` to `ConnectorSplit`
+- Renamed `SplitSource` to `ConnectorSplitSource`
+- Added a `ConnectorSession` parameter to most `ConnectorMetadata` methods
+- Removed most `canHandle` methods
+
+## General bug fixes
+
+- Fixed CLI hang after using `USE CATALOG` or `USE SCHEMA`
+- Implicit coercions in aggregations now work as expected
+- Nulls in expressions work as expected
+- Fixed memory leak in compiler
+- Fixed accounting bug in task memory usage
+- Fixed resource leak caused by abandoned queries
+- Fail queries immediately on unrecoverable data transport errors
+
+## Hive bug fixes
+
+- Fixed parsing of timestamps in the Hive RCFile Text SerDe (`ColumnarSerDe`)
+  by adding configuration to set the time zone originally used when writing data
+
+## Cassandra bug fixes
+
+- Auto-reconnect if Cassandra session dies
+- Format collection types as JSON
diff --git a/docs/src/main/sphinx/release/release-0.66.rst b/docs/src/main/sphinx/release/release-0.66.rst
deleted file mode 100644
index 67b5ae7ce584..000000000000
--- a/docs/src/main/sphinx/release/release-0.66.rst
+++ /dev/null
@@ -1,181 +0,0 @@
-============
-Release 0.66
-============
-
-Type system
------------
-
-In this release we have replaced the existing simple fixed type system
-with a fully extensible type system and have added several new types.
-We have also expanded the function system to support custom
-arithmetic, comparison and cast operators. For example, the new date/time
-types include an operator for adding an ``INTERVAL`` to a ``TIMESTAMP``.
-
-Existing functions have been updated to operate on and return the
-newly added types.  For example, the ANSI color functions now operate
-on a ``COLOR`` type, and the date/time functions operate on standard
-SQL date/time types (described below).
-
-Finally, plugins can now provide custom types and operators in addition
-to connectors and functions. This feature is highly experimental, so expect
-the interfaces to change over the next few releases.  Also, since in SQL
-there is only one namespace for types, you should be careful to make names
-for custom types unique as we will add other common SQL types to Presto
-in the near future.
-
-Date/time types
----------------
-
-Presto now supports all standard SQL date/time types:
-``DATE``, ``TIME``, ``TIMESTAMP`` and ``INTERVAL``.
-All of the date/time functions and language constructs now operate on these
-types instead of ``BIGINT`` and perform temporal calculations correctly.
-This was previously broken due to, for example, not being able to detect
-whether an argument was a ``DATE`` or a ``TIMESTAMP``.
-This change comes at the cost of breaking existing queries that perform
-arithmetic operations directly on the ``BIGINT`` value returned from
-the date/time functions.
-
-As part of this work, we have also added the :func:`date_trunc` function
-which is convenient for grouping data by a time span. For example, you
-can perform an aggregation by hour::
-
-    SELECT date_trunc('hour', timestamp_column), count(*)
-    FROM ...
-    GROUP BY 1
-
-Time zones
-~~~~~~~~~~
-
-This release has full support for time zone rules, which are needed to
-perform date/time calculations correctly. Typically, the session time
-zone is used for temporal calculations. This is the time zone of the
-client computer that submits the query, if available. Otherwise, it is
-the time zone of the server running the Presto coordinator.
-
-Queries that operate with time zones that follow daylight saving can
-produce unexpected results. For example, if we run the following query
-to add 24 hours using in the ``America/Los Angeles`` time zone::
-
-    SELECT date_add('hour', 24, TIMESTAMP '2014-03-08 09:00:00');
-    -- 2014-03-09 10:00:00.000
-
-The timestamp appears to only advance 23 hours. This is because on
-March 9th clocks in ``America/Los Angeles`` are turned forward 1 hour,
-so March 9th only has 23 hours. To advance the day part of the timestamp,
-use the ``day`` unit instead::
-
-    SELECT date_add('day', 1, TIMESTAMP '2014-03-08 09:00:00');
-    -- 2014-03-09 09:00:00.000
-
-This works because the :func:`date_add` function treats the timestamp as
-list of fields, adds the value to the specified field and then rolls any
-overflow into the next higher field.
-
-Time zones are also necessary for parsing and printing timestamps.
-Queries that use this functionality can also produce unexpected results.
-For example, on the same machine::
-
-    SELECT TIMESTAMP '2014-03-09 02:30:00';
-
-The above query causes an error because there was no 2:30 AM on March 9th
-in ``America/Los_Angeles`` due to a daylight saving time transition.
-
-In addition to normal ``TIMESTAMP`` values, Presto also supports the
-``TIMESTAMP WITH TIME ZONE`` type, where every value has an explicit time zone.
-For example, the following query creates a ``TIMESTAMP WITH TIME ZONE``::
-
-    SELECT TIMESTAMP '2014-03-14 09:30:00 Europe/Berlin';
-    -- 2014-03-14 09:30:00.000 Europe/Berlin
-
-You can also change the time zone of an existing timestamp using the
-``AT TIME ZONE`` clause::
-
-   SELECT TIMESTAMP '2014-03-14 09:30:00 Europe/Berlin'
-        AT TIME ZONE 'America/Los_Angeles';
-   -- 2014-03-14 01:30:00.000 America/Los_Angeles
-
-Both timestamps represent the same instant in time;
-they differ only in the time zone used to print them.
-
-The time zone of the session can be set on a per-query basis using the
-``X-Presto-Time-Zone`` HTTP header, or via the
-``PrestoConnection.setTimeZoneId(String)`` method in the JDBC driver.
-
-Localization
-~~~~~~~~~~~~
-
-In addition to time zones, the language of the user is important when
-parsing and printing date/time types. This release adds localization
-support to the Presto engine and functions that require it:
-:func:`date_format` and :func:`date_parse`.
-For example, if we set the language to Spanish::
-
-    SELECT date_format(TIMESTAMP '2001-01-09 09:04', '%M'); -- enero
-
-If we set the language to Japanese::
-
-    SELECT date_format(TIMESTAMP '2001-01-09 09:04', '%M'); -- 1月
-
-The language of the session can be set on a per-query basis using the
-``X-Presto-Language`` HTTP header, or via the
-``PrestoConnection.setLocale(Locale)`` method in the JDBC driver.
-
-Optimizations
--------------
-
-* We have upgraded the Hive connector to Hive 0.12 which includes
-  performance improvements for RCFile.
-
-* ``GROUP BY`` and ``JOIN`` operators are now compiled to byte code
-  and are significantly faster.
-
-* Reduced memory usage of ``GROUP BY`` and ``SELECT DISTINCT``,
-  which previously required several megabytes of memory
-  per operator, even when the number of groups was small.
-
-* The planner now optimizes function call arguments. This should improve
-  the performance of queries that contain complex expressions.
-
-* Fixed a performance regression in the HTTP client. The recent HTTP client
-  upgrade was using inadvertently GZIP compression and has a bug in the
-  buffer management resulting in high CPU usage.
-
-SPI
----
-
-In this release we have made a number of backward incompatible changes to the SPI:
-
-* Added ``Type`` and related interfaces
-* ``ConnectorType`` in metadata has been replaced with ``Type``
-* Renamed ``TableHandle`` to ``ConnectorTableHandle``
-* Renamed ``ColumnHandle`` to ``ConnectorColumnHandle``
-* Renamed ``Partition`` to ``ConnectorPartition``
-* Renamed ``PartitionResult`` to ``ConnectorPartitionResult``
-* Renamed ``Split`` to ``ConnectorSplit``
-* Renamed ``SplitSource`` to ``ConnectorSplitSource``
-* Added a ``ConnectorSession`` parameter to most ``ConnectorMetadata`` methods
-* Removed most ``canHandle`` methods
-
-General bug fixes
------------------
-
-* Fixed CLI hang after using ``USE CATALOG`` or ``USE SCHEMA``
-* Implicit coercions in aggregations now work as expected
-* Nulls in expressions work as expected
-* Fixed memory leak in compiler
-* Fixed accounting bug in task memory usage
-* Fixed resource leak caused by abandoned queries
-* Fail queries immediately on unrecoverable data transport errors
-
-Hive bug fixes
---------------
-
-* Fixed parsing of timestamps in the Hive RCFile Text SerDe (``ColumnarSerDe``)
-  by adding configuration to set the time zone originally used when writing data
-
-Cassandra bug fixes
--------------------
-
-* Auto-reconnect if Cassandra session dies
-* Format collection types as JSON
diff --git a/docs/src/main/sphinx/release/release-0.67.md b/docs/src/main/sphinx/release/release-0.67.md
new file mode 100644
index 000000000000..ae92c88dbfef
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.67.md
@@ -0,0 +1,15 @@
+# Release 0.67
+
+- Fix resource leak in Hive connector
+- Improve error categorization in event logging
+- Fix planning issue with certain queries using window functions
+
+## SPI
+
+The `ConnectorSplitSource` interface now extends `Closeable`.
+
+:::{note}
+This is a backwards incompatible change to `ConnectorSplitSource` in the SPI,
+so if you have written a connector, you will need to update your code before
+deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.67.rst b/docs/src/main/sphinx/release/release-0.67.rst
deleted file mode 100644
index ae34a0758d86..000000000000
--- a/docs/src/main/sphinx/release/release-0.67.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-============
-Release 0.67
-============
-
-* Fix resource leak in Hive connector
-
-* Improve error categorization in event logging
-
-* Fix planning issue with certain queries using window functions
-
-SPI
----
-
-The ``ConnectorSplitSource`` interface now extends ``Closeable``.
-
-.. note::
-    This is a backwards incompatible change to ``ConnectorSplitSource`` in the SPI,
-    so if you have written a connector, you will need to update your code before
-    deploying this release.
diff --git a/docs/src/main/sphinx/release/release-0.68.md b/docs/src/main/sphinx/release/release-0.68.md
new file mode 100644
index 000000000000..e50004164f4e
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.68.md
@@ -0,0 +1,7 @@
+# Release 0.68
+
+- Fix a regression in the handling of Hive tables that are bucketed on a
+  string column. This caused queries that could take advantage of bucketing
+  on such tables to choose the wrong bucket and thus would not match any
+  rows for the table. This regression was introduced in 0.66.
+- Fix double counting of bytes and rows when reading records
diff --git a/docs/src/main/sphinx/release/release-0.68.rst b/docs/src/main/sphinx/release/release-0.68.rst
deleted file mode 100644
index a578aad62d77..000000000000
--- a/docs/src/main/sphinx/release/release-0.68.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-============
-Release 0.68
-============
-
-* Fix a regression in the handling of Hive tables that are bucketed on a
-  string column. This caused queries that could take advantage of bucketing
-  on such tables to choose the wrong bucket and thus would not match any
-  rows for the table. This regression was introduced in 0.66.
-
-* Fix double counting of bytes and rows when reading records
diff --git a/docs/src/main/sphinx/release/release-0.69.md b/docs/src/main/sphinx/release/release-0.69.md
new file mode 100644
index 000000000000..7aac8f7304c6
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.69.md
@@ -0,0 +1,97 @@
+# Release 0.69
+
+:::{warning}
+The following config properties must be removed from the
+`etc/config.properties` file on both the coordinator and workers:
+
+- `presto-metastore.db.type`
+- `presto-metastore.db.filename`
+
+Additionally, the `datasources` property is now deprecated and should also be
+removed (see [Datasource Configuration](rn-069-datasource-configuration)).
+:::
+
+## Prevent scheduling work on coordinator
+
+We have a new config property, `node-scheduler.include-coordinator`,
+that allows or disallows scheduling work on the coordinator.
+Previously, tasks like final aggregations could be scheduled on the
+coordinator. For larger clusters, processing work on the coordinator
+can impact query performance because the machine's resources are not
+available for the critical task of scheduling, managing and monitoring
+query execution.
+
+We recommend setting this property to `false` for the coordinator.
+See {ref}`config-properties` for an example.
+
+(rn-069-datasource-configuration)=
+## Datasource configuration
+
+The `datasources` config property has been deprecated.
+Please remove it from your `etc/config.properties` file.
+The datasources configuration is now automatically generated based
+on the `node-scheduler.include-coordinator` property
+(see [Prevent Scheduling Work on Coordinator]).
+
+## Raptor connector
+
+Presto has an extremely experimental connector that was previously called
+the `native` connector and was intertwined with the main Presto code
+(it was written before Presto had connectors). This connector is now
+named `raptor` and lives in a separate plugin.
+
+As part of this refactoring, the `presto-metastore.db.type` and
+`presto-metastore.db.filename` config properties no longer exist
+and must be removed from `etc/config.properties`.
+
+The Raptor connector stores data on the Presto machines in a
+columnar format using the same layout that Presto uses for in-memory
+data. Currently, it has major limitations: lack of replication,
+dropping a table does not reclaim the storage, etc. It is only
+suitable for experimentation, temporary tables, caching of data from
+slower connectors, etc. The metadata and data formats are subject to
+change in incompatible ways between releases.
+
+If you would like to experiment with the connector, create a catalog
+properties file such as `etc/catalog/raptor.properties` on both the
+coordinator and workers that contains the following:
+
+```text
+connector.name=raptor
+metadata.db.type=h2
+metadata.db.filename=var/data/db/MetaStore
+```
+
+## Machine learning functions
+
+Presto now has functions to train and use machine learning models
+(classifiers and regressors). This is currently only a proof of concept
+and is not ready for use in production. Example usage is as follows:
+
+```
+SELECT evaluate_classifier_predictions(label, classify(features, model))
+FROM (
+    SELECT learn_classifier(label, features) AS model
+    FROM training_data
+)
+CROSS JOIN validation_data
+```
+
+In the above example, the column `label` is a `bigint` and the column
+`features` is a map of feature identifiers to feature values. The feature
+identifiers must be integers (encoded as strings because JSON only supports
+strings for map keys) and the feature values are numbers (floating point).
+
+## Variable length binary type
+
+Presto now supports the `varbinary` type for variable length binary data.
+Currently, the only supported function is {func}`length`.
+The Hive connector now maps the Hive `BINARY` type to `varbinary`.
+
+## General
+
+- Add missing operator: `timestamp with time zone` - `interval year to month`
+- Support explaining sampled queries
+- Add JMX stats for abandoned and canceled queries
+- Add `javax.inject` to parent-first class list for plugins
+- Improve error categorization in event logging
diff --git a/docs/src/main/sphinx/release/release-0.69.rst b/docs/src/main/sphinx/release/release-0.69.rst
deleted file mode 100644
index 4db24ed8101f..000000000000
--- a/docs/src/main/sphinx/release/release-0.69.rst
+++ /dev/null
@@ -1,102 +0,0 @@
-============
-Release 0.69
-============
-
-.. warning::
-
-    The following config properties must be removed from the
-    ``etc/config.properties`` file on both the coordinator and workers:
-
-    * ``presto-metastore.db.type``
-    * ``presto-metastore.db.filename``
-
-    Additionally, the ``datasources`` property is now deprecated
-    and should also be removed (see `Datasource Configuration`_).
-
-Prevent scheduling work on coordinator
---------------------------------------
-
-We have a new config property, ``node-scheduler.include-coordinator``,
-that allows or disallows scheduling work on the coordinator.
-Previously, tasks like final aggregations could be scheduled on the
-coordinator. For larger clusters, processing work on the coordinator
-can impact query performance because the machine's resources are not
-available for the critical task of scheduling, managing and monitoring
-query execution.
-
-We recommend setting this property to ``false`` for the coordinator.
-See :ref:`config_properties` for an example.
-
-Datasource configuration
-------------------------
-
-The ``datasources`` config property has been deprecated.
-Please remove it from your ``etc/config.properties`` file.
-The datasources configuration is now automatically generated based
-on the ``node-scheduler.include-coordinator`` property
-(see `Prevent Scheduling Work on Coordinator`_).
-
-Raptor connector
-----------------
-
-Presto has an extremely experimental connector that was previously called
-the ``native`` connector and was intertwined with the main Presto code
-(it was written before Presto had connectors). This connector is now
-named ``raptor`` and lives in a separate plugin.
-
-As part of this refactoring, the ``presto-metastore.db.type`` and
-``presto-metastore.db.filename`` config properties no longer exist
-and must be removed from ``etc/config.properties``.
-
-The Raptor connector stores data on the Presto machines in a
-columnar format using the same layout that Presto uses for in-memory
-data. Currently, it has major limitations: lack of replication,
-dropping a table does not reclaim the storage, etc. It is only
-suitable for experimentation, temporary tables, caching of data from
-slower connectors, etc. The metadata and data formats are subject to
-change in incompatible ways between releases.
-
-If you would like to experiment with the connector, create a catalog
-properties file such as ``etc/catalog/raptor.properties`` on both the
-coordinator and workers that contains the following:
-
-.. code-block:: text
-
-    connector.name=raptor
-    metadata.db.type=h2
-    metadata.db.filename=var/data/db/MetaStore
-
-Machine learning functions
---------------------------
-
-Presto now has functions to train and use machine learning models
-(classifiers and regressors). This is currently only a proof of concept
-and is not ready for use in production. Example usage is as follows::
-
-    SELECT evaluate_classifier_predictions(label, classify(features, model))
-    FROM (
-        SELECT learn_classifier(label, features) AS model
-        FROM training_data
-    )
-    CROSS JOIN validation_data
-
-In the above example, the column ``label`` is a ``bigint`` and the column
-``features`` is a map of feature identifiers to feature values. The feature
-identifiers must be integers (encoded as strings because JSON only supports
-strings for map keys) and the feature values are numbers (floating point).
-
-Variable length binary type
----------------------------
-
-Presto now supports the ``varbinary`` type for variable length binary data.
-Currently, the only supported function is :func:`length`.
-The Hive connector now maps the Hive ``BINARY`` type to ``varbinary``.
-
-General
--------
-
-* Add missing operator: ``timestamp with time zone`` - ``interval year to month``
-* Support explaining sampled queries
-* Add JMX stats for abandoned and canceled queries
-* Add ``javax.inject`` to parent-first class list for plugins
-* Improve error categorization in event logging
diff --git a/docs/src/main/sphinx/release/release-0.70.md b/docs/src/main/sphinx/release/release-0.70.md
new file mode 100644
index 000000000000..922c22589df0
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.70.md
@@ -0,0 +1,81 @@
+# Release 0.70
+
+:::{warning}
+This release contained a packaging error that resulted in an
+unusable server tarball. Do not use this release.
+:::
+
+## Views
+
+We have added support for creating views within Presto.
+Views are defined using Presto syntax but are stored (as blobs)
+by connectors. Currently, views are supported by the
+Raptor and Hive connectors. For the Hive connector, views are
+stored within the Hive metastore as Hive views, but they cannot
+be queried by Hive, nor can Hive views be queried by Presto.
+
+See {doc}`/sql/create-view` and {doc}`/sql/drop-view`
+for details and examples.
+
+## DUAL table
+
+The synthetic `DUAL` table is no longer supported. As an alternative, please
+write your queries without a `FROM` clause or use the `VALUES` syntax.
+
+## Presto Verifier
+
+There is a new project, Presto Verifier, which can be used to verify a set of
+queries against two different clusters.
+
+## Connector improvements
+
+- Connectors can now add hidden columns to a table. Hidden columns are not
+  displayed in `DESCRIBE` or `information_schema`, and are not
+  considered for `SELECT *`.  As an example, we have added a hidden
+  `row_number` column to the `tpch` connector.
+- Presto contains an extensive test suite to verify the correctness.  This test
+  suite has been extracted into the `presto-test` module for use during
+  connector development. For an example, see `TestRaptorDistributedQueries`.
+
+## Machine learning functions
+
+We have added two new machine learning functions, which can be used
+by advanced users familiar with LIBSVM. The functions are
+`learn_libsvm_classifier` and `learn_libsvm_regressor`. Both take a
+parameters string which has the form `key=value,key=value`
+
+## General
+
+- New comparison functions: {func}`greatest` and {func}`least`
+- New window functions: {func}`first_value`, {func}`last_value`, and {func}`nth_value`
+- We have added a config option to disable falling back to the interpreter when
+  expressions fail to be compiled to bytecode. To set this option, add
+  `compiler.interpreter-enabled=false` to `etc/config.properties`.
+  This will force certain queries to fail rather than running slowly.
+- `DATE` values are now implicitly coerced to `TIMESTAMP` and `TIMESTAMP WITH TIME ZONE`
+  by setting the hour/minute/seconds to `0` with respect to the session timezone.
+- Minor performance optimization when planning queries over tables with tens of
+  thousands of partitions or more.
+- Fixed a bug when planning `ORDER BY ... LIMIT` queries which could result in
+  duplicate and un-ordered results under rare conditions.
+- Reduce the size of stats collected from tasks, which dramatically reduces
+  garbage generation and improves coordinator stability.
+- Fix compiler cache for expressions.
+- Fix processing of empty or commented out statements in the CLI.
+
+## Hive
+
+- There are two new configuration options for the Hive connector,
+  `hive.max-initial-split-size`, which configures the size of the
+  initial splits, and `hive.max-initial-splits`, which configures
+  the number of initial splits. This can be useful for speeding up small
+  queries, which would otherwise have low parallelism.
+- The Hive connector will now consider all tables with a non-empty value
+  for the table property `presto_offline` to be offline. The value of the
+  property will be used in the error message.
+- We have added support for `DROP TABLE` in the hive connector.
+  By default, this feature is not enabled.  To enable it, set
+  `hive.allow-drop-table=true` in your Hive catalog properties file.
+- Ignore subdirectories when generating splits
+  (this now matches the non-recursive behavior of Hive).
+- Fix handling of maps with null keys.
diff --git a/docs/src/main/sphinx/release/release-0.70.rst b/docs/src/main/sphinx/release/release-0.70.rst
deleted file mode 100644
index 57920e78ff5e..000000000000
--- a/docs/src/main/sphinx/release/release-0.70.rst
+++ /dev/null
@@ -1,103 +0,0 @@
-============
-Release 0.70
-============
-
-.. warning::
-
-    This release contained a packaging error that resulted in an
-    unusable server tarball. Do not use this release.
-
-Views
------
-
-We have added support for creating views within Presto.
-Views are defined using Presto syntax but are stored (as blobs)
-by connectors. Currently, views are supported by the
-Raptor and Hive connectors. For the Hive connector, views are
-stored within the Hive metastore as Hive views, but they cannot
-be queried by Hive, nor can Hive views be queried by Presto.
-
-See :doc:`/sql/create-view` and :doc:`/sql/drop-view`
-for details and examples.
-
-DUAL table
-----------
-
-The synthetic ``DUAL`` table is no longer supported. As an alternative, please
-write your queries without a ``FROM`` clause or use the ``VALUES`` syntax.
-
-Presto Verifier
----------------
-
-There is a new project, Presto Verifier, which can be used to verify a set of
-queries against two different clusters.
-
-Connector improvements
-----------------------
-
-* Connectors can now add hidden columns to a table. Hidden columns are not
-  displayed in ``DESCRIBE`` or ``information_schema``, and are not
-  considered for ``SELECT *``.  As an example, we have added a hidden
-  ``row_number`` column to the ``tpch`` connector.
-
-* Presto contains an extensive test suite to verify the correctness.  This test
-  suite has been extracted into the ``presto-test`` module for use during
-  connector development. For an example, see ``TestRaptorDistributedQueries``.
-
-Machine learning functions
---------------------------
-
-We have added two new machine learning functions, which can be used
-by advanced users familiar with LIBSVM. The functions are
-``learn_libsvm_classifier`` and ``learn_libsvm_regressor``. Both take a
-parameters string which has the form ``key=value,key=value``
-
-General
--------
-
-* New comparison functions: :func:`greatest` and :func:`least`
-
-* New window functions: :func:`first_value`, :func:`last_value`, and :func:`nth_value`
-
-* We have added a config option to disable falling back to the interpreter when
-  expressions fail to be compiled to bytecode. To set this option, add 
-  ``compiler.interpreter-enabled=false`` to ``etc/config.properties``.
-  This will force certain queries to fail rather than running slowly.
-
-* ``DATE`` values are now implicitly coerced to ``TIMESTAMP`` and ``TIMESTAMP WITH TIME ZONE``
-  by setting the hour/minute/seconds to ``0`` with respect to the session timezone.
-
-* Minor performance optimization when planning queries over tables with tens of
-  thousands of partitions or more.
-
-* Fixed a bug when planning ``ORDER BY ... LIMIT`` queries which could result in
-  duplicate and un-ordered results under rare conditions.
-
-* Reduce the size of stats collected from tasks, which dramatically reduces
-  garbage generation and improves coordinator stability.
-
-* Fix compiler cache for expressions.
-
-* Fix processing of empty or commented out statements in the CLI.
-
-Hive
-----
-
-* There are two new configuration options for the Hive connector,
-  ``hive.max-initial-split-size``, which configures the size of the
-  initial splits, and ``hive.max-initial-splits``, which configures
-  the number of initial splits. This can be useful for speeding up small
-  queries, which would otherwise have low parallelism.
-
-* The Hive connector will now consider all tables with a non-empty value
-  for the table property ``presto_offline`` to be offline. The value of the
-  property will be used in the error message.
-
-* We have added support for ``DROP TABLE`` in the hive connector.
-  By default, this feature is not enabled.  To enable it, set
-  ``hive.allow-drop-table=true`` in your Hive catalog properties file.
-
-* Ignore subdirectories when generating splits
-  (this now matches the non-recursive behavior of Hive).
-
-* Fix handling of maps with null keys.
diff --git a/docs/src/main/sphinx/release/release-0.71.md b/docs/src/main/sphinx/release/release-0.71.md
new file mode 100644
index 000000000000..77fa270df881
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.71.md
@@ -0,0 +1,5 @@
+# Release 0.71
+
+- Fix packaging issue that resulted in an unusable server tarball
+  for the 0.70 release
+- Fix logging in Hive connector when using Amazon S3
diff --git a/docs/src/main/sphinx/release/release-0.71.rst b/docs/src/main/sphinx/release/release-0.71.rst
deleted file mode 100644
index ed0998420910..000000000000
--- a/docs/src/main/sphinx/release/release-0.71.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-============
-Release 0.71
-============
-
-* Fix packaging issue that resulted in an unusable server tarball
-  for the 0.70 release
-
-* Fix logging in Hive connector when using Amazon S3
diff --git a/docs/src/main/sphinx/release/release-0.72.md b/docs/src/main/sphinx/release/release-0.72.md
new file mode 100644
index 000000000000..e987e7b1b1c8
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.72.md
@@ -0,0 +1,4 @@
+# Release 0.72
+
+- Fix infinite loop bug in Hive RCFile reader when decoding a Map
+  with a null key
diff --git a/docs/src/main/sphinx/release/release-0.72.rst b/docs/src/main/sphinx/release/release-0.72.rst
deleted file mode 100644
index c180ae666670..000000000000
--- a/docs/src/main/sphinx/release/release-0.72.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-============
-Release 0.72
-============
-
-* Fix infinite loop bug in Hive RCFile reader when decoding a Map
-  with a null key
diff --git a/docs/src/main/sphinx/release/release-0.73.md b/docs/src/main/sphinx/release/release-0.73.md
new file mode 100644
index 000000000000..ce17f46ad74e
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.73.md
@@ -0,0 +1,12 @@
+# Release 0.73
+
+## Cassandra plugin
+
+The Cassandra connector now supports CREATE TABLE and DROP TABLE. Additionally,
+the connector now takes into account Cassandra indexes when generating CQL.
+This release also includes several bug fixes and performance improvements.
+
+## General
+
+- New window functions: {func}`lead`, and {func}`lag`
+- New scalar function: {func}`json_size`
diff --git a/docs/src/main/sphinx/release/release-0.73.rst b/docs/src/main/sphinx/release/release-0.73.rst
deleted file mode 100644
index 5fa09acdfc22..000000000000
--- a/docs/src/main/sphinx/release/release-0.73.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-============
-Release 0.73
-============
-
-Cassandra plugin
-----------------
-
-The Cassandra connector now supports CREATE TABLE and DROP TABLE. Additionally,
-the connector now takes into account Cassandra indexes when generating CQL.
-This release also includes several bug fixes and performance improvements.
-
-General
--------
-
-* New window functions: :func:`lead`, and :func:`lag`
-
-* New scalar function: :func:`json_size`
-
diff --git a/docs/src/main/sphinx/release/release-0.74.md b/docs/src/main/sphinx/release/release-0.74.md
new file mode 100644
index 000000000000..1b8ab87add5b
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.74.md
@@ -0,0 +1,27 @@
+# Release 0.74
+
+## Bytecode compiler
+
+This version includes new infrastructure for bytecode compilation, and lays the groundwork for future improvements.
+There should be no impact in performance or correctness with the new code, but we have added a flag to revert to the
+old implementation in case of issues. To do so, add `compiler.new-bytecode-generator-enabled=false` to
+`etc/config.properties` in the coordinator and workers.
+
+## Hive storage format
+
+The storage format to use when writing data to Hive can now be configured via the `hive.storage-format` option
+in your Hive catalog properties file. Valid options are `RCBINARY`, `RCTEXT`, `SEQUENCEFILE` and `TEXTFILE`.
+The default format if the property is not set is `RCBINARY`.
+
+## General
+
+- Show column comments in `DESCRIBE`
+- Add {func}`try_cast` which works like {func}`cast` but returns `null` if the cast fails
+- `nullif` now correctly returns a value with the type of the first argument
+- Fix an issue with {func}`timezone_hour` returning results in milliseconds instead of hours
+- Show a proper error message when analyzing queries with non-equijoin clauses
+- Improve "too many failures" error message when coordinator can't talk to workers
+- Minor optimization of {func}`json_size` function
+- Improve feature normalization algorithm for machine learning functions
+- Add exponential back-off to the S3 FileSystem retry logic
+- Improve CPU efficiency of semi-joins
diff --git a/docs/src/main/sphinx/release/release-0.74.rst b/docs/src/main/sphinx/release/release-0.74.rst
deleted file mode 100644
index d7492aaef5c2..000000000000
--- a/docs/src/main/sphinx/release/release-0.74.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-============
-Release 0.74
-============
-
-Bytecode compiler
------------------
-
-This version includes new infrastructure for bytecode compilation, and lays the groundwork for future improvements.
-There should be no impact in performance or correctness with the new code, but we have added a flag to revert to the
-old implementation in case of issues. To do so, add ``compiler.new-bytecode-generator-enabled=false`` to
-``etc/config.properties`` in the coordinator and workers.
-
-Hive storage format
--------------------
-
-The storage format to use when writing data to Hive can now be configured via the ``hive.storage-format`` option
-in your Hive catalog properties file. Valid options are ``RCBINARY``, ``RCTEXT``, ``SEQUENCEFILE`` and ``TEXTFILE``.
-The default format if the property is not set is ``RCBINARY``.
-
-General
--------
-
-* Show column comments in ``DESCRIBE``
-* Add :func:`try_cast` which works like :func:`cast` but returns ``null`` if the cast fails
-* ``nullif`` now correctly returns a value with the type of the first argument
-* Fix an issue with :func:`timezone_hour` returning results in milliseconds instead of hours
-* Show a proper error message when analyzing queries with non-equijoin clauses
-* Improve "too many failures" error message when coordinator can't talk to workers
-* Minor optimization of :func:`json_size` function
-* Improve feature normalization algorithm for machine learning functions
-* Add exponential back-off to the S3 FileSystem retry logic
-* Improve CPU efficiency of semi-joins
diff --git a/docs/src/main/sphinx/release/release-0.75.md b/docs/src/main/sphinx/release/release-0.75.md
new file mode 100644
index 000000000000..afb68fd0d79b
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.75.md
@@ -0,0 +1,109 @@
+# Release 0.75
+
+## Hive
+
+- The Hive S3 file system has a new configuration option,
+  `hive.s3.max-connections`, which sets the maximum number of
+  connections to S3. The default has been increased from `50` to `500`.
+- The Hive connector now supports renaming tables. By default, this feature
+  is not enabled. To enable it, set `hive.allow-rename-table=true` in
+  your Hive catalog properties file.
+
+## General
+
+- Optimize {func}`count` with a constant to execute as the much faster `count(*)`
+- Add support for binary types to the JDBC driver
+- The legacy byte code compiler has been removed
+- New aggregation framework (~10% faster)
+- Added {func}`max_by` aggregation function
+- The `approx_avg()` function has been removed. Use {func}`avg` instead.
+- Fixed parsing of `UNION` queries that use both `DISTINCT` and `ALL`
+- Fixed cross join planning error for certain query shapes
+- Added hex and base64 conversion functions for varbinary
+- Fix the `LIKE` operator to correctly match against values that contain
+  multiple lines. Previously, it would stop matching at the first newline.
+- Add support for renaming tables using the {doc}`/sql/alter-table` statement.
+- Add basic support for inserting data using the {doc}`/sql/insert` statement.
+  This is currently only supported for the Raptor connector.
+
+## JSON function
+
+The {func}`json_extract` and {func}`json_extract_scalar` functions now support
+the square bracket syntax:
+
+```
+SELECT json_extract(json, '$.store[book]');
+SELECT json_extract(json, '$.store["book name"]');
+```
+
+As part of this change, the set of characters allowed in a non-bracketed
+path segment has been restricted to alphanumeric, underscores and colons.
+Additionally, colons cannot be used in a un-quoted bracketed path segment.
+Use the new bracket syntax with quotes to match elements that contain
+special characters.
+
+## Scheduler
+
+The scheduler now assigns splits to a node based on the current load on the node across all queries.
+Previously, the scheduler load balanced splits across nodes on a per query level. Every node can have
+`node-scheduler.max-splits-per-node` splits scheduled on it. To avoid starvation of small queries,
+when the node already has the maximum allowable splits, every task can schedule at most
+`node-scheduler.max-pending-splits-per-node-per-task` splits on the node.
+
+## Row number optimizations
+
+Queries that use the {func}`row_number` function are substantially faster
+and can run on larger result sets for two types of queries.
+
+Performing a partitioned limit that choses `N` arbitrary rows per
+partition is a streaming operation. The following query selects
+five arbitrary rows from `orders` for each `orderstatus`:
+
+```
+SELECT * FROM (
+    SELECT row_number() OVER (PARTITION BY orderstatus) AS rn,
+        custkey, orderdate, orderstatus
+    FROM orders
+) WHERE rn <= 5;
+```
+
+Performing a partitioned top-N that chooses the maximum or minimum
+`N` rows from each partition now uses significantly less memory.
+The following query selects the five oldest rows based on `orderdate`
+from `orders` for each `orderstatus`:
+
+```
+SELECT * FROM (
+    SELECT row_number() OVER (PARTITION BY orderstatus ORDER BY orderdate) AS rn,
+        custkey, orderdate, orderstatus
+    FROM orders
+) WHERE rn <= 5;
+```
+
+Use the {doc}`/sql/explain` statement to see if any of these optimizations
+have been applied to your query.
+
+## SPI
+
+The core Presto engine no longer automatically adds a column for `count(*)`
+queries. Instead, the `RecordCursorProvider` will receive an empty list of
+column handles.
+
+The `Type` and `Block` APIs have gone through a major refactoring in this
+release. The main focus of the refactoring was to consolidate all type specific
+encoding logic in the type itself, which makes types much easier to implement.
+You should consider `Type` and `Block` to be a beta API as we expect
+further changes in the near future.
+
+To simplify the API, `ConnectorOutputHandleResolver` has been merged into
+`ConnectorHandleResolver`. Additionally, `ConnectorHandleResolver`,
+`ConnectorRecordSinkProvider` and `ConnectorMetadata` were modified to
+support inserts.
+
+:::{note}
+This is a backwards incompatible change with the previous connector and
+type SPI, so if you have written a connector or type, you will need to update
+your code before deploying this release. In particular, make sure your
+connector can handle an empty column handles list (this can be verified
+by running `SELECT count(*)` on a table from your connector).
+:::
diff --git a/docs/src/main/sphinx/release/release-0.75.rst b/docs/src/main/sphinx/release/release-0.75.rst
deleted file mode 100644
index e176a0c73330..000000000000
--- a/docs/src/main/sphinx/release/release-0.75.rst
+++ /dev/null
@@ -1,111 +0,0 @@
-============
-Release 0.75
-============
-
-Hive
-----
-
-* The Hive S3 file system has a new configuration option,
-  ``hive.s3.max-connections``, which sets the maximum number of
-  connections to S3. The default has been increased from ``50`` to ``500``.
-
-* The Hive connector now supports renaming tables. By default, this feature
-  is not enabled. To enable it, set ``hive.allow-rename-table=true`` in
-  your Hive catalog properties file.
-
-General
--------
-
-* Optimize :func:`count` with a constant to execute as the much faster ``count(*)``
-* Add support for binary types to the JDBC driver
-* The legacy byte code compiler has been removed
-* New aggregation framework (~10% faster)
-* Added :func:`max_by` aggregation function
-* The ``approx_avg()`` function has been removed. Use :func:`avg` instead.
-* Fixed parsing of ``UNION`` queries that use both ``DISTINCT`` and ``ALL``
-* Fixed cross join planning error for certain query shapes
-* Added hex and base64 conversion functions for varbinary
-* Fix the ``LIKE`` operator to correctly match against values that contain
-  multiple lines. Previously, it would stop matching at the first newline.
-* Add support for renaming tables using the :doc:`/sql/alter-table` statement.
-* Add basic support for inserting data using the :doc:`/sql/insert` statement.
-  This is currently only supported for the Raptor connector.
-
-JSON function
--------------
-
-The :func:`json_extract` and :func:`json_extract_scalar` functions now support
-the square bracket syntax::
-
-    SELECT json_extract(json, '$.store[book]');
-    SELECT json_extract(json, '$.store["book name"]');
-
-As part of this change, the set of characters allowed in a non-bracketed
-path segment has been restricted to alphanumeric, underscores and colons.
-Additionally, colons cannot be used in a un-quoted bracketed path segment.
-Use the new bracket syntax with quotes to match elements that contain
-special characters.
-
-Scheduler
----------
-
-The scheduler now assigns splits to a node based on the current load on the node across all queries.
-Previously, the scheduler load balanced splits across nodes on a per query level. Every node can have
-``node-scheduler.max-splits-per-node`` splits scheduled on it. To avoid starvation of small queries,
-when the node already has the maximum allowable splits, every task can schedule at most
-``node-scheduler.max-pending-splits-per-node-per-task`` splits on the node.
-
-Row number optimizations
-------------------------
-
-Queries that use the :func:`row_number` function are substantially faster
-and can run on larger result sets for two types of queries.
-
-Performing a partitioned limit that choses ``N`` arbitrary rows per
-partition is a streaming operation. The following query selects
-five arbitrary rows from ``orders`` for each ``orderstatus``::
-
-    SELECT * FROM (
-        SELECT row_number() OVER (PARTITION BY orderstatus) AS rn,
-            custkey, orderdate, orderstatus
-        FROM orders
-    ) WHERE rn <= 5;
-
-Performing a partitioned top-N that chooses the maximum or minimum
-``N`` rows from each partition now uses significantly less memory.
-The following query selects the five oldest rows based on ``orderdate``
-from ``orders`` for each ``orderstatus``::
-
-    SELECT * FROM (
-        SELECT row_number() OVER (PARTITION BY orderstatus ORDER BY orderdate) AS rn,
-            custkey, orderdate, orderstatus
-        FROM orders
-    ) WHERE rn <= 5;
-
-Use the :doc:`/sql/explain` statement to see if any of these optimizations
-have been applied to your query.
-
-SPI
----
-
-The core Presto engine no longer automatically adds a column for ``count(*)``
-queries. Instead, the ``RecordCursorProvider`` will receive an empty list of
-column handles.
-
-The ``Type`` and ``Block`` APIs have gone through a major refactoring in this
-release. The main focus of the refactoring was to consolidate all type specific
-encoding logic in the type itself, which makes types much easier to implement.
-You should consider ``Type`` and ``Block`` to be a beta API as we expect
-further changes in the near future.
-
-To simplify the API, ``ConnectorOutputHandleResolver`` has been merged into
-``ConnectorHandleResolver``. Additionally, ``ConnectorHandleResolver``,
-``ConnectorRecordSinkProvider`` and ``ConnectorMetadata`` were modified to
-support inserts.
-
-.. note::
-    This is a backwards incompatible change with the previous connector and
-    type SPI, so if you have written a connector or type, you will need to update
-    your code before deploying this release. In particular, make sure your
-    connector can handle an empty column handles list (this can be verified
-    by running ``SELECT count(*)`` on a table from your connector).
diff --git a/docs/src/main/sphinx/release/release-0.76.md b/docs/src/main/sphinx/release/release-0.76.md
new file mode 100644
index 000000000000..5555bd415470
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.76.md
@@ -0,0 +1,67 @@
+# Release 0.76
+
+## Kafka connector
+
+This release adds a connector that allows querying of [Apache Kafka] topic data
+from Presto. Topics can be live and repeated queries will pick up new data.
+
+Apache Kafka 0.8+ is supported although Apache Kafka 0.8.1+ is recommended.
+There is extensive {doc}`documentation </connector/kafka>` about configuring
+the connector and a {doc}`tutorial </connector/kafka-tutorial>` to get started.
+
+## MySQL and PostgreSQL connectors
+
+This release adds the {doc}`/connector/mysql` and {doc}`/connector/postgresql`
+for querying and creating tables in external relational databases. These can
+be used to join or copy data between different systems like MySQL and Hive,
+or between two different MySQL or PostgreSQL instances, or any combination.
+
+## Cassandra
+
+The {doc}`/connector/cassandra` configuration properties
+`cassandra.client.read-timeout` and `cassandra.client.connect-timeout`
+are now specified using a duration rather than milliseconds (this makes
+them consistent with all other such properties in Presto). If you were
+previously specifying a value such as `25`, change it to `25ms`.
+
+The retry policy for the Cassandra client is now configurable via the
+`cassandra.retry-policy` property. In particular, the custom `BACKOFF`
+retry policy may be useful.
+
+## Hive
+
+The new {doc}`/connector/hive` configuration property `hive.s3.socket-timeout`
+allows changing the socket timeout for queries that read or write to Amazon S3.
+Additionally, the previously added `hive.s3.max-connections` property
+was not respected and always used the default of `500`.
+
+Hive allows the partitions in a table to have a different schema than the
+table. In particular, it allows changing the type of a column without
+changing the column type of existing partitions. The Hive connector does
+not support this and could previously return garbage data for partitions
+stored using the RCFile Text format if the column type was converted from
+a non-numeric type such as `STRING` to a numeric type such as `BIGINT`
+and the actual data in existing partitions was not numeric. The Hive
+connector now detects this scenario and fails the query after the
+partition metadata has been read.
+
+The property `hive.storage-format` is broken and has been disabled. It
+sets the storage format on the metadata but always writes the table using
+`RCBINARY`. This will be implemented in a future release.
+
+## General
+
+- Fix hang in verifier when an exception occurs.
+- Fix {func}`chr` function to work with Unicode code points instead of ASCII code points.
+- The JDBC driver no longer hangs the JVM on shutdown (all threads are daemon threads).
+- Fix incorrect parsing of function arguments.
+- The bytecode compiler now caches generated code for join and group byqueries,
+  which should improve performance and CPU efficiency for these types of queries.
+- Improve planning performance for certain trivial queries over tables with lots of partitions.
+- Avoid creating large output pages. This should mitigate some cases of
+  *"Remote page is too large"* errors.
+- The coordinator/worker communication layer is now fully asynchronous.
+  Specifically, long-poll requests no longer tie up a thread on the worker.
+  This makes heavily loaded clusters more efficient.
+
+[apache kafka]: https://kafka.apache.org/
diff --git a/docs/src/main/sphinx/release/release-0.76.rst b/docs/src/main/sphinx/release/release-0.76.rst
deleted file mode 100644
index 803b325b17d1..000000000000
--- a/docs/src/main/sphinx/release/release-0.76.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-============
-Release 0.76
-============
-
-Kafka connector
----------------
-
-This release adds a connector that allows querying of `Apache Kafka`_ topic data
-from Presto. Topics can be live and repeated queries will pick up new data.
-
-Apache Kafka 0.8+ is supported although Apache Kafka 0.8.1+ is recommended.
-There is extensive :doc:`documentation </connector/kafka>` about configuring
-the connector and a :doc:`tutorial </connector/kafka-tutorial>` to get started.
-
-.. _Apache Kafka: https://kafka.apache.org/
-
-MySQL and PostgreSQL connectors
--------------------------------
-
-This release adds the :doc:`/connector/mysql` and :doc:`/connector/postgresql`
-for querying and creating tables in external relational databases. These can
-be used to join or copy data between different systems like MySQL and Hive,
-or between two different MySQL or PostgreSQL instances, or any combination.
-
-Cassandra
----------
-
-The :doc:`/connector/cassandra` configuration properties
-``cassandra.client.read-timeout`` and ``cassandra.client.connect-timeout``
-are now specified using a duration rather than milliseconds (this makes
-them consistent with all other such properties in Presto). If you were
-previously specifying a value such as ``25``, change it to ``25ms``.
-
-The retry policy for the Cassandra client is now configurable via the
-``cassandra.retry-policy`` property. In particular, the custom ``BACKOFF``
-retry policy may be useful.
-
-Hive
-----
-
-The new :doc:`/connector/hive` configuration property ``hive.s3.socket-timeout``
-allows changing the socket timeout for queries that read or write to Amazon S3.
-Additionally, the previously added ``hive.s3.max-connections`` property
-was not respected and always used the default of ``500``.
-
-Hive allows the partitions in a table to have a different schema than the
-table. In particular, it allows changing the type of a column without
-changing the column type of existing partitions. The Hive connector does
-not support this and could previously return garbage data for partitions
-stored using the RCFile Text format if the column type was converted from
-a non-numeric type such as ``STRING`` to a numeric type such as ``BIGINT``
-and the actual data in existing partitions was not numeric. The Hive
-connector now detects this scenario and fails the query after the
-partition metadata has been read.
-
-The property ``hive.storage-format`` is broken and has been disabled. It
-sets the storage format on the metadata but always writes the table using
-``RCBINARY``. This will be implemented in a future release.
-
-General
--------
-
-* Fix hang in verifier when an exception occurs.
-* Fix :func:`chr` function to work with Unicode code points instead of ASCII code points.
-* The JDBC driver no longer hangs the JVM on shutdown (all threads are daemon threads).
-* Fix incorrect parsing of function arguments.
-* The bytecode compiler now caches generated code for join and group byqueries,
-  which should improve performance and CPU efficiency for these types of queries.
-* Improve planning performance for certain trivial queries over tables with lots of partitions.
-* Avoid creating large output pages. This should mitigate some cases of
-  *"Remote page is too large"* errors.
-* The coordinator/worker communication layer is now fully asynchronous.
-  Specifically, long-poll requests no longer tie up a thread on the worker.
-  This makes heavily loaded clusters more efficient.
diff --git a/docs/src/main/sphinx/release/release-0.77.md b/docs/src/main/sphinx/release/release-0.77.md
new file mode 100644
index 000000000000..ce0ac602143f
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.77.md
@@ -0,0 +1,40 @@
+# Release 0.77
+
+## Parametric types
+
+Presto now has a framework for implementing parametric types and functions.
+Support for {ref}`array-type` and {ref}`map-type` types has been added, including the element accessor
+operator `[]`, and new {doc}`/functions/array`.
+
+## Streaming index joins
+
+Index joins will now switch to use a key-by-key streaming join if index
+results fail to fit in the allocated index memory space.
+
+## Distributed joins
+
+Joins where both tables are distributed are now supported. This allows larger tables to be joined,
+and can be enabled with the `distributed-joins-enabled` flag. It may perform worse than the existing
+broadcast join implementation because it requires redistributing both tables.
+This feature is still experimental, and should be used with caution.
+
+## Hive
+
+- Handle spurious `AbortedException` when closing S3 input streams
+- Add support for ORC, DWRF and Parquet in Hive
+- Add support for `DATE` type in Hive
+- Fix performance regression in Hive when reading `VARCHAR` columns
+
+## Kafka
+
+- Fix Kafka handling of default port
+- Add support for Kafka messages with a null key
+
+## General
+
+- Fix race condition in scheduler that could cause queries to hang
+- Add ConnectorPageSource which is a more efficient interface for column-oriented sources
+- Add support for string partition keys in Cassandra
+- Add support for variable arity functions
+- Add support for {func}`count` for all types
+- Fix bug in HashAggregation that could cause the operator to go in an infinite loop
diff --git a/docs/src/main/sphinx/release/release-0.77.rst b/docs/src/main/sphinx/release/release-0.77.rst
deleted file mode 100644
index 4a7c2df3a6a8..000000000000
--- a/docs/src/main/sphinx/release/release-0.77.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-============
-Release 0.77
-============
-
-Parametric types
-----------------
-Presto now has a framework for implementing parametric types and functions.
-Support for :ref:`array_type` and :ref:`map_type` types has been added, including the element accessor
-operator ``[]``, and new :doc:`/functions/array`.
-
-Streaming index joins
----------------------
-Index joins will now switch to use a key-by-key streaming join if index
-results fail to fit in the allocated index memory space.
-
-Distributed joins
------------------
-Joins where both tables are distributed are now supported. This allows larger tables to be joined,
-and can be enabled with the ``distributed-joins-enabled`` flag. It may perform worse than the existing
-broadcast join implementation because it requires redistributing both tables.
-This feature is still experimental, and should be used with caution.
-
-Hive
-----
-* Handle spurious ``AbortedException`` when closing S3 input streams
-* Add support for ORC, DWRF and Parquet in Hive
-* Add support for ``DATE`` type in Hive
-* Fix performance regression in Hive when reading ``VARCHAR`` columns
-
-Kafka
------
-* Fix Kafka handling of default port
-* Add support for Kafka messages with a null key
-
-General
--------
-* Fix race condition in scheduler that could cause queries to hang
-* Add ConnectorPageSource which is a more efficient interface for column-oriented sources
-* Add support for string partition keys in Cassandra
-* Add support for variable arity functions
-* Add support for :func:`count` for all types
-* Fix bug in HashAggregation that could cause the operator to go in an infinite loop
diff --git a/docs/src/main/sphinx/release/release-0.78.md b/docs/src/main/sphinx/release/release-0.78.md
new file mode 100644
index 000000000000..ebdcfb068165
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.78.md
@@ -0,0 +1,54 @@
+# Release 0.78
+
+## ARRAY and MAP types in Hive connector
+
+The Hive connector now returns arrays and maps instead of json encoded strings,
+for columns whose underlying type is array or map. Please note that this is a backwards
+incompatible change, and the {doc}`/functions/json` will no longer work on these columns,
+unless you {func}`cast` them to the `json` type.
+
+## Session properties
+
+The Presto session can now contain properties, which can be used by the Presto
+engine or connectors to customize the query execution. There is a separate
+namespace for the Presto engine and each catalog. A property for a catalog is
+simplify prefixed with the catalog name followed by `.` (dot). A connector
+can retrieve the properties for the catalog using
+`ConnectorSession.getProperties()`.
+
+Session properties can be set using the `--session` command line argument to
+the Presto CLI. For example:
+
+```text
+presto-cli --session color=red --session size=large
+```
+
+For JDBC, the properties can be set by unwrapping the `Connection` as follows:
+
+```java
+connection.unwrap(PrestoConnection.class).setSessionProperty("name", "value");
+```
+
+:::{note}
+This feature is a work in progress and will change in a future release.
+Specifically, we are planning to require preregistration of properties so
+the user can list available session properties and so the engine can verify
+property values. Additionally, the Presto grammar will be extended to
+allow setting properties via a query.
+:::
+
+## Hive
+
+- Add `storage_format` session property to override format used for creating tables.
+- Add write support for `VARBINARY`, `DATE` and `TIMESTAMP`.
+- Add support for partition keys of type `TIMESTAMP`.
+- Add support for partition keys with null values (`__HIVE_DEFAULT_PARTITION__`).
+- Fix `hive.storage-format` option (see {doc}`release-0.76`).
+
+## General
+
+- Fix expression optimizer, so that it runs in linear time instead of exponential time.
+- Add {func}`cardinality` for maps.
+- Fix race condition in SqlTask creation which can cause queries to hang.
+- Fix `node-scheduler.multiple-tasks-per-node-enabled` option.
+- Fix an exception when planning a query with a UNION under a JOIN.
diff --git a/docs/src/main/sphinx/release/release-0.78.rst b/docs/src/main/sphinx/release/release-0.78.rst
deleted file mode 100644
index 87cf0e0af511..000000000000
--- a/docs/src/main/sphinx/release/release-0.78.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-============
-Release 0.78
-============
-
-ARRAY and MAP types in Hive connector
--------------------------------------
-
-The Hive connector now returns arrays and maps instead of json encoded strings,
-for columns whose underlying type is array or map. Please note that this is a backwards
-incompatible change, and the :doc:`/functions/json` will no longer work on these columns,
-unless you :func:`cast` them to the ``json`` type.
-
-Session properties
-------------------
-
-The Presto session can now contain properties, which can be used by the Presto
-engine or connectors to customize the query execution. There is a separate
-namespace for the Presto engine and each catalog. A property for a catalog is
-simplify prefixed with the catalog name followed by ``.`` (dot). A connector
-can retrieve the properties for the catalog using
-``ConnectorSession.getProperties()``.
-
-Session properties can be set using the ``--session`` command line argument to
-the Presto CLI. For example:
-
-.. code-block:: text
-
-    presto-cli --session color=red --session size=large
-
-For JDBC, the properties can be set by unwrapping the ``Connection`` as follows:
-
-.. code-block:: java
-
-    connection.unwrap(PrestoConnection.class).setSessionProperty("name", "value");
-
-.. note::
-    This feature is a work in progress and will change in a future release.
-    Specifically, we are planning to require preregistration of properties so
-    the user can list available session properties and so the engine can verify
-    property values. Additionally, the Presto grammar will be extended to
-    allow setting properties via a query.
-
-Hive
-----
-
-* Add ``storage_format`` session property to override format used for creating tables.
-* Add write support for ``VARBINARY``, ``DATE`` and ``TIMESTAMP``.
-* Add support for partition keys of type ``TIMESTAMP``.
-* Add support for partition keys with null values (``__HIVE_DEFAULT_PARTITION__``).
-* Fix ``hive.storage-format`` option (see :doc:`release-0.76`).
-
-General
--------
-
-* Fix expression optimizer, so that it runs in linear time instead of exponential time.
-* Add :func:`cardinality` for maps.
-* Fix race condition in SqlTask creation which can cause queries to hang.
-* Fix ``node-scheduler.multiple-tasks-per-node-enabled`` option.
-* Fix an exception when planning a query with a UNION under a JOIN.
diff --git a/docs/src/main/sphinx/release/release-0.79.md b/docs/src/main/sphinx/release/release-0.79.md
new file mode 100644
index 000000000000..4015d18adfe3
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.79.md
@@ -0,0 +1,16 @@
+# Release 0.79
+
+## Hive
+
+- Add configuration option `hive.force-local-scheduling` and session property
+  `force_local_scheduling` to force local scheduling of splits.
+- Add new experimental optimized RCFile reader.  The reader can be enabled by
+  setting the configuration option `hive.optimized-reader.enabled` or session
+  property `optimized_reader_enabled`.
+
+## General
+
+- Add support for {ref}`unnest`, which can be used as a replacement for the `explode()` function in Hive.
+- Fix a bug in the scan operator that can cause data to be missed. It currently only affects queries
+  over `information_schema` or `sys` tables, metadata queries such as `SHOW PARTITIONS` and connectors
+  that implement the `ConnectorPageSource` interface.
diff --git a/docs/src/main/sphinx/release/release-0.79.rst b/docs/src/main/sphinx/release/release-0.79.rst
deleted file mode 100644
index cad252bfdc42..000000000000
--- a/docs/src/main/sphinx/release/release-0.79.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-============
-Release 0.79
-============
-
-Hive
-----
-
-* Add configuration option ``hive.force-local-scheduling`` and session property
-  ``force_local_scheduling`` to force local scheduling of splits.
-* Add new experimental optimized RCFile reader.  The reader can be enabled by
-  setting the configuration option ``hive.optimized-reader.enabled`` or session
-  property ``optimized_reader_enabled``.
-
-General
--------
-
-* Add support for :ref:`unnest`, which can be used as a replacement for the ``explode()`` function in Hive.
-* Fix a bug in the scan operator that can cause data to be missed. It currently only affects queries
-  over ``information_schema`` or ``sys`` tables, metadata queries such as ``SHOW PARTITIONS`` and connectors
-  that implement the ``ConnectorPageSource`` interface.
diff --git a/docs/src/main/sphinx/release/release-0.80.md b/docs/src/main/sphinx/release/release-0.80.md
new file mode 100644
index 000000000000..17c885082215
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.80.md
@@ -0,0 +1,103 @@
+# Release 0.80
+
+## New Hive ORC reader
+
+We have added a new ORC reader implementation. The new reader supports vectorized
+reads, lazy loading, and predicate push down, all of which make the reader more
+efficient and typically reduces wall clock time for a query. Although the new
+reader has been heavily tested, it is an extensive rewrite of the Apache Hive
+ORC reader, and may have some latent issues. If you are seeing issues, you can
+disable the new reader on a per-query basis by setting the
+`<hive-catalog>.optimized_reader_enabled` session property, or you can disable
+the reader by default by setting the Hive catalog property
+`hive.optimized-reader.enabled=false`.
+
+## Hive
+
+- The maximum retry time for the Hive S3 file system can be configured
+  by setting `hive.s3.max-retry-time`.
+- Fix Hive partition pruning for null keys (i.e. `__HIVE_DEFAULT_PARTITION__`).
+
+## Cassandra
+
+- Update Cassandra driver to 2.1.0.
+- Map Cassandra `TIMESTAMP` type to Presto `TIMESTAMP` type.
+
+## "Big Query" support
+
+We've added experimental support for "big" queries. This provides a separate
+queue controlled by the following properties:
+
+- `experimental.max-concurrent-big-queries`
+- `experimental.max-queued-big-queries`
+
+There are separate configuration options for queries that are submitted with
+the `experimental_big_query` session property:
+
+- `experimental.big-query-initial-hash-partitions`
+- `experimental.big-query-max-task-memory`
+
+Queries submitted with this property will use hash distribution for all joins.
+
+## Metadata-only query optimization
+
+We now support an optimization that rewrites aggregation queries that are insensitive to the
+cardinality of the input (e.g., {func}`max`, {func}`min`, `DISTINCT` aggregates) to execute
+against table metadata.
+
+For example, if `key`, `key1` and `key2` are partition keys, the following queries
+will benefit:
+
+```
+SELECT min(key), max(key) FROM t;
+
+SELECT DISTINCT key FROM t;
+
+SELECT count(DISTINCT key) FROM t;
+
+SELECT count(DISTINCT key + 5) FROM t;
+
+SELECT count(DISTINCT key) FROM (SELECT key FROM t ORDER BY 1 LIMIT 10);
+
+SELECT key1, count(DISTINCT key2) FROM t GROUP BY 1;
+```
+
+This optimization is turned off by default. To turn it on, add `optimizer.optimize-metadata-queries=true`
+to the coordinator config properties.
+
+:::{warning}
+This optimization will cause queries to produce incorrect results if
+the connector allows partitions to contain no data. For example, the
+Hive connector will produce incorrect results if your Hive warehouse
+contains partitions without data.
+:::
+
+## General
+
+- Add support implicit joins. The following syntax is now allowed:
+
+  ```
+  SELECT * FROM a, b WHERE a.id = b.id;
+  ```
+
+- Add property `task.verbose-stats` to enable verbose statistics collection for
+  tasks. The default is `false`.
+
+- Format binary data in the CLI as a hex dump.
+
+- Add approximate numeric histogram function {func}`numeric_histogram`.
+
+- Add {func}`array_sort` function.
+
+- Add {func}`map_keys` and {func}`map_values` functions.
+
+- Make {func}`row_number` completely streaming.
+
+- Add property `task.max-partial-aggregation-memory` to configure the memory limit
+  for the partial step of aggregations.
+
+- Fix exception when processing queries with an `UNNEST` operation where the output was not used.
+
+- Only show query progress in UI after the query has been fully scheduled.
+
+- Add query execution visualization to the coordinator UI. It can be accessed via the query details page.
diff --git a/docs/src/main/sphinx/release/release-0.80.rst b/docs/src/main/sphinx/release/release-0.80.rst
deleted file mode 100644
index fa51ab6c4bbc..000000000000
--- a/docs/src/main/sphinx/release/release-0.80.rst
+++ /dev/null
@@ -1,98 +0,0 @@
-============
-Release 0.80
-============
-
-New Hive ORC reader
--------------------
-
-We have added a new ORC reader implementation. The new reader supports vectorized
-reads, lazy loading, and predicate push down, all of which make the reader more
-efficient and typically reduces wall clock time for a query. Although the new
-reader has been heavily tested, it is an extensive rewrite of the Apache Hive
-ORC reader, and may have some latent issues. If you are seeing issues, you can
-disable the new reader on a per-query basis by setting the
-``<hive-catalog>.optimized_reader_enabled`` session property, or you can disable
-the reader by default by setting the Hive catalog property
-``hive.optimized-reader.enabled=false``.
-
-Hive
-----
-
-* The maximum retry time for the Hive S3 file system can be configured
-  by setting ``hive.s3.max-retry-time``.
-* Fix Hive partition pruning for null keys (i.e. ``__HIVE_DEFAULT_PARTITION__``).
-
-Cassandra
----------
-
-* Update Cassandra driver to 2.1.0.
-* Map Cassandra ``TIMESTAMP`` type to Presto ``TIMESTAMP`` type.
-
-"Big Query" support
--------------------
-
-We've added experimental support for "big" queries. This provides a separate
-queue controlled by the following properties:
-
-* ``experimental.max-concurrent-big-queries``
-* ``experimental.max-queued-big-queries``
-
-There are separate configuration options for queries that are submitted with
-the ``experimental_big_query`` session property:
-
-* ``experimental.big-query-initial-hash-partitions``
-* ``experimental.big-query-max-task-memory``
-
-Queries submitted with this property will use hash distribution for all joins.
-
-Metadata-only query optimization
---------------------------------
-
-We now support an optimization that rewrites aggregation queries that are insensitive to the
-cardinality of the input (e.g., :func:`max`, :func:`min`, ``DISTINCT`` aggregates) to execute
-against table metadata.
-
-For example, if ``key``, ``key1`` and ``key2`` are partition keys, the following queries
-will benefit::
-
-    SELECT min(key), max(key) FROM t;
-
-    SELECT DISTINCT key FROM t;
-
-    SELECT count(DISTINCT key) FROM t;
-
-    SELECT count(DISTINCT key + 5) FROM t;
-
-    SELECT count(DISTINCT key) FROM (SELECT key FROM t ORDER BY 1 LIMIT 10);
-
-    SELECT key1, count(DISTINCT key2) FROM t GROUP BY 1;
-
-This optimization is turned off by default. To turn it on, add ``optimizer.optimize-metadata-queries=true``
-to the coordinator config properties.
-
-.. warning::
-
-      This optimization will cause queries to produce incorrect results if
-      the connector allows partitions to contain no data. For example, the
-      Hive connector will produce incorrect results if your Hive warehouse
-      contains partitions without data.
-
-General
--------
-
-* Add support implicit joins. The following syntax is now allowed::
-
-    SELECT * FROM a, b WHERE a.id = b.id;
-
-* Add property ``task.verbose-stats`` to enable verbose statistics collection for
-  tasks. The default is ``false``.
-* Format binary data in the CLI as a hex dump.
-* Add approximate numeric histogram function :func:`numeric_histogram`.
-* Add :func:`array_sort` function.
-* Add :func:`map_keys` and :func:`map_values` functions.
-* Make :func:`row_number` completely streaming.
-* Add property ``task.max-partial-aggregation-memory`` to configure the memory limit
-  for the partial step of aggregations.
-* Fix exception when processing queries with an ``UNNEST`` operation where the output was not used.
-* Only show query progress in UI after the query has been fully scheduled.
-* Add query execution visualization to the coordinator UI. It can be accessed via the query details page.
diff --git a/docs/src/main/sphinx/release/release-0.81.md b/docs/src/main/sphinx/release/release-0.81.md
new file mode 100644
index 000000000000..fd444b43574f
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.81.md
@@ -0,0 +1,11 @@
+# Release 0.81
+
+## Hive
+
+- Fix ORC predicate pushdown.
+- Fix column selection in RCFile.
+
+## General
+
+- Fix handling of null and out-of-range offsets for
+  {func}`lead`, {func}`lag` and {func}`nth_value` functions.
diff --git a/docs/src/main/sphinx/release/release-0.81.rst b/docs/src/main/sphinx/release/release-0.81.rst
deleted file mode 100644
index 94b0aa15baf6..000000000000
--- a/docs/src/main/sphinx/release/release-0.81.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-============
-Release 0.81
-============
-
-Hive
-----
-
-* Fix ORC predicate pushdown.
-* Fix column selection in RCFile.
-
-General
--------
-
-* Fix handling of null and out-of-range offsets for
-  :func:`lead`, :func:`lag` and :func:`nth_value` functions.
diff --git a/docs/src/main/sphinx/release/release-0.82.md b/docs/src/main/sphinx/release/release-0.82.md
new file mode 100644
index 000000000000..bbbd7ebf7bba
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.82.md
@@ -0,0 +1,8 @@
+# Release 0.82
+
+- Presto now supports the {ref}`row-type` type, and all Hive structs are
+  converted to ROWs, instead of JSON encoded VARCHARs.
+- Add {func}`current_timezone` function.
+- Improve planning performance for queries with thousands of columns.
+- Fix a regression that was causing excessive memory allocation and GC pressure
+  in the coordinator.
diff --git a/docs/src/main/sphinx/release/release-0.82.rst b/docs/src/main/sphinx/release/release-0.82.rst
deleted file mode 100644
index c6d9312fb4aa..000000000000
--- a/docs/src/main/sphinx/release/release-0.82.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-============
-Release 0.82
-============
-
-* Presto now supports the :ref:`row_type` type, and all Hive structs are
-  converted to ROWs, instead of JSON encoded VARCHARs.
-* Add :func:`current_timezone` function.
-* Improve planning performance for queries with thousands of columns.
-* Fix a regression that was causing excessive memory allocation and GC pressure
-  in the coordinator.
-
diff --git a/docs/src/main/sphinx/release/release-0.83.md b/docs/src/main/sphinx/release/release-0.83.md
new file mode 100644
index 000000000000..6048ecc1347a
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.83.md
@@ -0,0 +1,17 @@
+# Release 0.83
+
+## Raptor
+
+- Raptor now enables specifying the backup storage location. This feature is highly experimental.
+- Fix the handling of shards not assigned to any node.
+
+## General
+
+- Fix resource leak in query queues.
+- Fix NPE when writing null `ARRAY/MAP` to Hive.
+- Fix {func}`json_array_get` to handle nested structures.
+- Fix `UNNEST` on null collections.
+- Fix a regression where queries that fail during parsing or analysis do not expire.
+- Make `JSON` type comparable.
+- Added an optimization for hash aggregations. This optimization is turned off by default.
+  To turn it on, add `optimizer.optimize-hash-generation=true` to the coordinator config properties.
diff --git a/docs/src/main/sphinx/release/release-0.83.rst b/docs/src/main/sphinx/release/release-0.83.rst
deleted file mode 100644
index 4bcaae626c7f..000000000000
--- a/docs/src/main/sphinx/release/release-0.83.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-============
-Release 0.83
-============
-
-Raptor
-------
-* Raptor now enables specifying the backup storage location. This feature is highly experimental.
-* Fix the handling of shards not assigned to any node.
-
-General
--------
-
-* Fix resource leak in query queues.
-* Fix NPE when writing null ``ARRAY/MAP`` to Hive.
-* Fix :func:`json_array_get` to handle nested structures.
-* Fix ``UNNEST`` on null collections.
-* Fix a regression where queries that fail during parsing or analysis do not expire.
-* Make ``JSON`` type comparable.
-* Added an optimization for hash aggregations. This optimization is turned off by default.
-  To turn it on, add ``optimizer.optimize-hash-generation=true`` to the coordinator config properties.
diff --git a/docs/src/main/sphinx/release/release-0.84.md b/docs/src/main/sphinx/release/release-0.84.md
new file mode 100644
index 000000000000..4ba55cd62afc
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.84.md
@@ -0,0 +1,8 @@
+# Release 0.84
+
+- Fix handling of `NaN` and infinity in ARRAYs
+- Fix approximate queries that use `JOIN`
+- Reduce excessive memory allocation and GC pressure in the coordinator
+- Fix an issue where setting `node-scheduler.location-aware-scheduling-enabled=false`
+  would cause queries to fail for connectors whose splits were not remotely accessible
+- Fix error when running `COUNT(*)` over tables in `information_schema` and `sys`
diff --git a/docs/src/main/sphinx/release/release-0.84.rst b/docs/src/main/sphinx/release/release-0.84.rst
deleted file mode 100644
index 7a958ca4e778..000000000000
--- a/docs/src/main/sphinx/release/release-0.84.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-============
-Release 0.84
-============
-
-* Fix handling of ``NaN`` and infinity in ARRAYs
-* Fix approximate queries that use ``JOIN``
-* Reduce excessive memory allocation and GC pressure in the coordinator
-* Fix an issue where setting ``node-scheduler.location-aware-scheduling-enabled=false``
-  would cause queries to fail for connectors whose splits were not remotely accessible
-* Fix error when running ``COUNT(*)`` over tables in ``information_schema`` and ``sys``
diff --git a/docs/src/main/sphinx/release/release-0.85.md b/docs/src/main/sphinx/release/release-0.85.md
new file mode 100644
index 000000000000..c36905181229
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.85.md
@@ -0,0 +1,4 @@
+# Release 0.85
+
+- Improve query planning performance for tables with large numbers of partitions.
+- Fix issue when using `JSON` values in `GROUP BY` expressions.
diff --git a/docs/src/main/sphinx/release/release-0.85.rst b/docs/src/main/sphinx/release/release-0.85.rst
deleted file mode 100644
index 0d48c2c09b1f..000000000000
--- a/docs/src/main/sphinx/release/release-0.85.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-============
-Release 0.85
-============
-
-* Improve query planning performance for tables with large numbers of partitions.
-* Fix issue when using ``JSON`` values in ``GROUP BY`` expressions.
diff --git a/docs/src/main/sphinx/release/release-0.86.md b/docs/src/main/sphinx/release/release-0.86.md
new file mode 100644
index 000000000000..f7d2d3f80672
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.86.md
@@ -0,0 +1,24 @@
+# Release 0.86
+
+## General
+
+- Add support for inequality `INNER JOIN` when each term of the condition refers to only one side of the join.
+- Add {func}`ntile` function.
+- Add {func}`map` function to create a map from arrays of keys and values.
+- Add {func}`min_by` aggregation function.
+- Add support for concatenating arrays with the `||` operator.
+- Add support for `=` and `!=` to `JSON` type.
+- Improve error message when `DISTINCT` is applied to types that are not comparable.
+- Perform type validation for `IN` expression where the right-hand side is a subquery expression.
+- Improve error message when `ORDER BY ... LIMIT` query exceeds its maximum memory allocation.
+- Improve error message when types that are not orderable are used in an `ORDER BY` clause.
+- Improve error message when the types of the columns for subqueries of a `UNION` query don't match.
+- Fix a regression where queries could be expired too soon on a highly loaded cluster.
+- Fix scheduling issue for queries involving tables from information_schema, which could result in
+  inconsistent metadata.
+- Fix an issue with {func}`min_by` and {func}`max_by` that could result in an error when used with
+  a variable-length type (e.g., `VARCHAR`) in a `GROUP BY` query.
+- Fix rendering of array attributes in JMX connector.
+- Input rows/bytes are now tracked properly for `JOIN` queries.
+- Fix case-sensitivity issue when resolving names of constant table expressions.
+- Fix unnesting arrays and maps that contain the `ROW` type.
diff --git a/docs/src/main/sphinx/release/release-0.86.rst b/docs/src/main/sphinx/release/release-0.86.rst
deleted file mode 100644
index dcfce2db64d6..000000000000
--- a/docs/src/main/sphinx/release/release-0.86.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-============
-Release 0.86
-============
-
-General
--------
-
-* Add support for inequality ``INNER JOIN`` when each term of the condition refers to only one side of the join.
-* Add :func:`ntile` function.
-* Add :func:`map` function to create a map from arrays of keys and values.
-* Add :func:`min_by` aggregation function.
-* Add support for concatenating arrays with the ``||`` operator.
-* Add support for ``=`` and ``!=`` to ``JSON`` type.
-* Improve error message when ``DISTINCT`` is applied to types that are not comparable.
-* Perform type validation for ``IN`` expression where the right-hand side is a subquery expression.
-* Improve error message when ``ORDER BY ... LIMIT`` query exceeds its maximum memory allocation.
-* Improve error message when types that are not orderable are used in an ``ORDER BY`` clause.
-* Improve error message when the types of the columns for subqueries of a ``UNION`` query don't match.
-* Fix a regression where queries could be expired too soon on a highly loaded cluster.
-* Fix scheduling issue for queries involving tables from information_schema, which could result in
-  inconsistent metadata.
-* Fix an issue with :func:`min_by` and :func:`max_by` that could result in an error when used with
-  a variable-length type (e.g., ``VARCHAR``) in a ``GROUP BY`` query.
-* Fix rendering of array attributes in JMX connector.
-* Input rows/bytes are now tracked properly for ``JOIN`` queries.
-* Fix case-sensitivity issue when resolving names of constant table expressions.
-* Fix unnesting arrays and maps that contain the ``ROW`` type.
diff --git a/docs/src/main/sphinx/release/release-0.87.md b/docs/src/main/sphinx/release/release-0.87.md
new file mode 100644
index 000000000000..517efd3243b8
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.87.md
@@ -0,0 +1,6 @@
+# Release 0.87
+
+## General
+
+- Fixed a bug where {ref}`row-type` types could have the wrong field names.
+- Changed the minimum JDK version to 1.8.
diff --git a/docs/src/main/sphinx/release/release-0.87.rst b/docs/src/main/sphinx/release/release-0.87.rst
deleted file mode 100644
index 71e7e0977b96..000000000000
--- a/docs/src/main/sphinx/release/release-0.87.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-============
-Release 0.87
-============
-
-General
--------
-
-* Fixed a bug where :ref:`row_type` types could have the wrong field names.
-* Changed the minimum JDK version to 1.8.
diff --git a/docs/src/main/sphinx/release/release-0.88.md b/docs/src/main/sphinx/release/release-0.88.md
new file mode 100644
index 000000000000..d52890e781b6
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.88.md
@@ -0,0 +1,15 @@
+# Release 0.88
+
+## General
+
+- Added {func}`arbitrary` aggregation function.
+- Allow using all {doc}`/functions/aggregate` as {doc}`/functions/window`.
+- Support specifying window frames and correctly implement frames for all {doc}`/functions/window`.
+- Allow {func}`approx_distinct` aggregation function to accept a standard error parameter.
+- Implement {func}`least` and {func}`greatest` with variable number of arguments.
+- {ref}`array-type` is now comparable and can be used as `GROUP BY` keys or in `ORDER BY` expressions.
+- Implement `=` and `<>` operators for {ref}`row-type`.
+- Fix excessive garbage creation in the ORC reader.
+- Fix an issue that could cause queries using {func}`row_number()` and `LIMIT` to never terminate.
+- Fix an issue that could cause queries with {func}`row_number()` and specific filters to produce incorrect results.
+- Fixed an issue that caused the Cassandra plugin to fail to load with a SecurityException.
diff --git a/docs/src/main/sphinx/release/release-0.88.rst b/docs/src/main/sphinx/release/release-0.88.rst
deleted file mode 100644
index 6806bbcefc40..000000000000
--- a/docs/src/main/sphinx/release/release-0.88.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-============
-Release 0.88
-============
-
-General
--------
-
-* Added :func:`arbitrary` aggregation function.
-* Allow using all :doc:`/functions/aggregate` as :doc:`/functions/window`.
-* Support specifying window frames and correctly implement frames for all :doc:`/functions/window`.
-* Allow :func:`approx_distinct` aggregation function to accept a standard error parameter.
-* Implement :func:`least` and :func:`greatest` with variable number of arguments.
-* :ref:`array_type` is now comparable and can be used as ``GROUP BY`` keys or in ``ORDER BY`` expressions.
-* Implement ``=`` and ``<>`` operators for :ref:`row_type`.
-* Fix excessive garbage creation in the ORC reader.
-* Fix an issue that could cause queries using :func:`row_number()` and ``LIMIT`` to never terminate.
-* Fix an issue that could cause queries with :func:`row_number()` and specific filters to produce incorrect results.
-* Fixed an issue that caused the Cassandra plugin to fail to load with a SecurityException.
diff --git a/docs/src/main/sphinx/release/release-0.89.md b/docs/src/main/sphinx/release/release-0.89.md
new file mode 100644
index 000000000000..0e4b56c2998c
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.89.md
@@ -0,0 +1,19 @@
+# Release 0.89
+
+## DATE type
+
+The memory representation of dates is now the number of days since January 1, 1970
+using a 32-bit signed integer.
+
+:::{note}
+This is a backwards incompatible change with the previous date
+representation, so if you have written a connector, you will need to update
+your code before deploying this release.
+:::
+
+## General
+
+- `USE CATALOG` and `USE SCHEMA` have been replaced with {doc}`/sql/use`.
+- Fix issue where `SELECT NULL` incorrectly returns 0 rows.
+- Fix rare condition where `JOIN` queries could produce incorrect results.
+- Fix issue where `UNION` queries involving complex types would fail during planning.
diff --git a/docs/src/main/sphinx/release/release-0.89.rst b/docs/src/main/sphinx/release/release-0.89.rst
deleted file mode 100644
index bf4cbdd73376..000000000000
--- a/docs/src/main/sphinx/release/release-0.89.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-============
-Release 0.89
-============
-
-DATE type
----------
-The memory representation of dates is now the number of days since January 1, 1970
-using a 32-bit signed integer.
-
-.. note::
-    This is a backwards incompatible change with the previous date
-    representation, so if you have written a connector, you will need to update
-    your code before deploying this release.
-
-General
--------
-
-* ``USE CATALOG`` and ``USE SCHEMA`` have been replaced with :doc:`/sql/use`.
-* Fix issue where ``SELECT NULL`` incorrectly returns 0 rows.
-* Fix rare condition where ``JOIN`` queries could produce incorrect results.
-* Fix issue where ``UNION`` queries involving complex types would fail during planning.
diff --git a/docs/src/main/sphinx/release/release-0.90.md b/docs/src/main/sphinx/release/release-0.90.md
new file mode 100644
index 000000000000..0dbd23760925
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.90.md
@@ -0,0 +1,60 @@
+# Release 0.90
+
+:::{warning}
+This release has a memory leak and should not be used.
+:::
+
+## General
+
+- Initial support for partition and placement awareness in the query planner. This can
+  result in better plans for queries involving `JOIN` and `GROUP BY` over the same
+  key columns.
+- Improve planning of UNION queries.
+- Add presto version to query creation and completion events.
+- Add property `task.writer-count` to configure the number of writers per task.
+- Fix a bug when optimizing constant expressions involving binary types.
+- Fix bug where a table writer commits partial results while cleaning up a failed query.
+- Fix a bug when unnesting an array of doubles containing NaN or Infinity.
+- Fix failure when accessing elements in an empty array.
+- Fix *"Remote page is too large"* errors.
+- Improve error message when attempting to cast a value to `UNKNOWN`.
+- Update the {func}`approx_distinct` documentation with correct standard error bounds.
+- Disable falling back to the interpreter when expressions fail to be compiled
+  to bytecode. To enable this option, add `compiler.interpreter-enabled=true`
+  to the coordinator and worker config properties. Enabling this option will
+  allow certain queries to run slowly rather than failing.
+- Improve {doc}`/client/jdbc` conformance. In particular, all unimplemented
+  methods now throw `SQLException` rather than `UnsupportedOperationException`.
+
+## Functions and language features
+
+- Add {func}`bool_and` and {func}`bool_or` aggregation functions.
+- Add standard SQL function {func}`every` as an alias for {func}`bool_and`.
+- Add {func}`year_of_week` function.
+- Add {func}`regexp_extract_all` function.
+- Add {func}`map_agg` aggregation function.
+- Add support for casting `JSON` to `ARRAY` or `MAP` types.
+- Add support for unparenthesized expressions in `VALUES` clause.
+- Added {doc}`/sql/set-session`, {doc}`/sql/reset-session` and {doc}`/sql/show-session`.
+- Improve formatting of `EXPLAIN (TYPE DISTRIBUTED)` output and include additional
+  information such as output layout, task placement policy and partitioning functions.
+
+## Hive
+
+- Disable optimized metastore partition fetching for non-string partition keys.
+  This fixes an issue were Presto might silently ignore data with non-canonical
+  partition values. To enable this option, add `hive.assume-canonical-partition-keys=true`
+  to the coordinator and worker config properties.
+- Don't retry operations against S3 that fail due to lack of permissions.
+
+## SPI
+
+- Add `getColumnTypes` to `RecordSink`.
+- Use `Slice` for table writer fragments.
+- Add `ConnectorPageSink` which is a more efficient interface for column-oriented sources.
+
+:::{note}
+This is a backwards incompatible change with the previous connector SPI.
+If you have written a connector, you will need to update your code
+before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-0.90.rst b/docs/src/main/sphinx/release/release-0.90.rst
deleted file mode 100644
index 81e1d8022069..000000000000
--- a/docs/src/main/sphinx/release/release-0.90.rst
+++ /dev/null
@@ -1,61 +0,0 @@
-============
-Release 0.90
-============
-
-.. warning:: This release has a memory leak and should not be used.
-
-General
--------
-
-* Initial support for partition and placement awareness in the query planner. This can
-  result in better plans for queries involving ``JOIN`` and ``GROUP BY`` over the same
-  key columns.
-* Improve planning of UNION queries.
-* Add presto version to query creation and completion events.
-* Add property ``task.writer-count`` to configure the number of writers per task.
-* Fix a bug when optimizing constant expressions involving binary types.
-* Fix bug where a table writer commits partial results while cleaning up a failed query.
-* Fix a bug when unnesting an array of doubles containing NaN or Infinity.
-* Fix failure when accessing elements in an empty array.
-* Fix *"Remote page is too large"* errors.
-* Improve error message when attempting to cast a value to ``UNKNOWN``.
-* Update the :func:`approx_distinct` documentation with correct standard error bounds.
-* Disable falling back to the interpreter when expressions fail to be compiled
-  to bytecode. To enable this option, add ``compiler.interpreter-enabled=true``
-  to the coordinator and worker config properties. Enabling this option will
-  allow certain queries to run slowly rather than failing.
-* Improve :doc:`/client/jdbc` conformance. In particular, all unimplemented
-  methods now throw ``SQLException`` rather than ``UnsupportedOperationException``.
-
-Functions and language features
--------------------------------
-
-* Add :func:`bool_and` and :func:`bool_or` aggregation functions.
-* Add standard SQL function :func:`every` as an alias for :func:`bool_and`.
-* Add :func:`year_of_week` function.
-* Add :func:`regexp_extract_all` function.
-* Add :func:`map_agg` aggregation function.
-* Add support for casting ``JSON`` to ``ARRAY`` or ``MAP`` types.
-* Add support for unparenthesized expressions in ``VALUES`` clause.
-* Added :doc:`/sql/set-session`, :doc:`/sql/reset-session` and :doc:`/sql/show-session`.
-* Improve formatting of ``EXPLAIN (TYPE DISTRIBUTED)`` output and include additional
-  information such as output layout, task placement policy and partitioning functions.
-
-Hive
-----
-* Disable optimized metastore partition fetching for non-string partition keys.
-  This fixes an issue were Presto might silently ignore data with non-canonical
-  partition values. To enable this option, add ``hive.assume-canonical-partition-keys=true``
-  to the coordinator and worker config properties.
-* Don't retry operations against S3 that fail due to lack of permissions.
-
-SPI
----
-* Add ``getColumnTypes`` to ``RecordSink``.
-* Use ``Slice`` for table writer fragments.
-* Add ``ConnectorPageSink`` which is a more efficient interface for column-oriented sources.
-
-.. note::
-    This is a backwards incompatible change with the previous connector SPI.
-    If you have written a connector, you will need to update your code
-    before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-0.91.md b/docs/src/main/sphinx/release/release-0.91.md
new file mode 100644
index 000000000000..46e88c33d737
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.91.md
@@ -0,0 +1,9 @@
+# Release 0.91
+
+:::{warning}
+This release has a memory leak and should not be used.
+:::
+
+## General
+
+- Clear `LazyBlockLoader` reference after load to free memory earlier.
diff --git a/docs/src/main/sphinx/release/release-0.91.rst b/docs/src/main/sphinx/release/release-0.91.rst
deleted file mode 100644
index 197aa9ee1395..000000000000
--- a/docs/src/main/sphinx/release/release-0.91.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-============
-Release 0.91
-============
-
-.. warning:: This release has a memory leak and should not be used.
-
-General
--------
-
-* Clear ``LazyBlockLoader`` reference after load to free memory earlier.
diff --git a/docs/src/main/sphinx/release/release-0.92.md b/docs/src/main/sphinx/release/release-0.92.md
new file mode 100644
index 000000000000..db0baf5724cb
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.92.md
@@ -0,0 +1,5 @@
+# Release 0.92
+
+## General
+
+- Fix buffer leak when a query fails.
diff --git a/docs/src/main/sphinx/release/release-0.92.rst b/docs/src/main/sphinx/release/release-0.92.rst
deleted file mode 100644
index 154c71a7a3bb..000000000000
--- a/docs/src/main/sphinx/release/release-0.92.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-============
-Release 0.92
-============
-
-General
--------
-
-* Fix buffer leak when a query fails.
diff --git a/docs/src/main/sphinx/release/release-0.93.md b/docs/src/main/sphinx/release/release-0.93.md
new file mode 100644
index 000000000000..bdc560490508
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.93.md
@@ -0,0 +1,35 @@
+# Release 0.93
+
+## ORC memory usage
+
+This release changes the Presto ORC reader to favor small buffers when reading
+varchar and varbinary data. Some ORC files contain columns of data that are
+hundreds of megabytes when decompressed. In the previous Presto ORC reader, we
+would allocate a single large shared buffer for all values in the column. This
+would cause heap fragmentation in CMS and G1, and it would cause OOMs since
+each value of the column retains a reference to the shared buffer. In this
+release the ORC reader uses a separate buffer for each value in the column.
+This reduces heap fragmentation and excessive memory retention at the expense
+of object creation.
+
+## Verifier
+
+- Add support for setting username and password per query
+
+If you're upgrading from 0.92, you need to alter your verifier_queries table
+
+```sql
+ALTER TABLE verifier_queries add test_username VARCHAR(256) NOT NULL default 'verifier-test';
+ALTER TABLE verifier_queries add test_password VARCHAR(256);
+ALTER TABLE verifier_queries add control_username VARCHAR(256) NOT NULL default 'verifier-test';
+ALTER TABLE verifier_queries add control_password VARCHAR(256);
+```
+
+## General
+
+- Add optimizer for `LIMIT 0`
+- Fix incorrect check to disable string statistics in ORC
+- Ignore hidden columns in `INSERT` and `CREATE TABLE AS` queries
+- Add SOCKS support to CLI
+- Improve CLI output for update queries
+- Disable pushdown for non-deterministic predicates
diff --git a/docs/src/main/sphinx/release/release-0.93.rst b/docs/src/main/sphinx/release/release-0.93.rst
deleted file mode 100644
index 74f7547bf201..000000000000
--- a/docs/src/main/sphinx/release/release-0.93.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-============
-Release 0.93
-============
-
-ORC memory usage
-----------------
-
-This release changes the Presto ORC reader to favor small buffers when reading
-varchar and varbinary data. Some ORC files contain columns of data that are
-hundreds of megabytes when decompressed. In the previous Presto ORC reader, we
-would allocate a single large shared buffer for all values in the column. This
-would cause heap fragmentation in CMS and G1, and it would cause OOMs since
-each value of the column retains a reference to the shared buffer. In this
-release the ORC reader uses a separate buffer for each value in the column.
-This reduces heap fragmentation and excessive memory retention at the expense
-of object creation.
-
-Verifier
---------
-
-* Add support for setting username and password per query
-
-If you're upgrading from 0.92, you need to alter your verifier_queries table
-
-.. code-block:: sql
-
-    ALTER TABLE verifier_queries add test_username VARCHAR(256) NOT NULL default 'verifier-test';
-    ALTER TABLE verifier_queries add test_password VARCHAR(256);
-    ALTER TABLE verifier_queries add control_username VARCHAR(256) NOT NULL default 'verifier-test';
-    ALTER TABLE verifier_queries add control_password VARCHAR(256);
-
-General
--------
-
-* Add optimizer for ``LIMIT 0``
-* Fix incorrect check to disable string statistics in ORC
-* Ignore hidden columns in ``INSERT`` and ``CREATE TABLE AS`` queries
-* Add SOCKS support to CLI
-* Improve CLI output for update queries
-* Disable pushdown for non-deterministic predicates
diff --git a/docs/src/main/sphinx/release/release-0.94.md b/docs/src/main/sphinx/release/release-0.94.md
new file mode 100644
index 000000000000..18402f4a1e72
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.94.md
@@ -0,0 +1,21 @@
+# Release 0.94
+
+## ORC memory usage
+
+This release contains additional changes to the Presto ORC reader to favor
+small buffers when reading varchar and varbinary data. Some ORC files contain
+columns of data that are hundreds of megabytes compressed. When reading these
+columns, Presto would allocate a single buffer for the compressed column data,
+and this would cause heap fragmentation in CMS and G1 and eventually OOMs.
+In this release, the `hive.orc.max-buffer-size` sets the maximum size for a
+single ORC buffer, and for larger columns we instead stream the data. This
+reduces heap fragmentation and excessive buffers in ORC at the expense of
+HDFS IOPS. The default value is `8MB`.
+
+## General
+
+- Update Hive CDH 4 connector to CDH 4.7.1
+- Fix `ORDER BY` with `LIMIT 0`
+- Fix compilation of `try_cast`
+- Group threads into Java thread groups to ease debugging
+- Add `task.min-drivers` config to help limit number of concurrent readers
diff --git a/docs/src/main/sphinx/release/release-0.94.rst b/docs/src/main/sphinx/release/release-0.94.rst
deleted file mode 100644
index b220ab96d7dd..000000000000
--- a/docs/src/main/sphinx/release/release-0.94.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-============
-Release 0.94
-============
-
-ORC memory usage
-----------------
-
-This release contains additional changes to the Presto ORC reader to favor
-small buffers when reading varchar and varbinary data. Some ORC files contain
-columns of data that are hundreds of megabytes compressed. When reading these
-columns, Presto would allocate a single buffer for the compressed column data,
-and this would cause heap fragmentation in CMS and G1 and eventually OOMs.
-In this release, the ``hive.orc.max-buffer-size`` sets the maximum size for a
-single ORC buffer, and for larger columns we instead stream the data. This
-reduces heap fragmentation and excessive buffers in ORC at the expense of
-HDFS IOPS. The default value is ``8MB``.
-
-General
--------
-
-* Update Hive CDH 4 connector to CDH 4.7.1
-* Fix ``ORDER BY`` with ``LIMIT 0``
-* Fix compilation of ``try_cast``
-* Group threads into Java thread groups to ease debugging
-* Add ``task.min-drivers`` config to help limit number of concurrent readers
diff --git a/docs/src/main/sphinx/release/release-0.95.md b/docs/src/main/sphinx/release/release-0.95.md
new file mode 100644
index 000000000000..3b11e73ec09c
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.95.md
@@ -0,0 +1,5 @@
+# Release 0.95
+
+## General
+
+- Fix task and stage leak, caused when a stage finishes before its substages.
diff --git a/docs/src/main/sphinx/release/release-0.95.rst b/docs/src/main/sphinx/release/release-0.95.rst
deleted file mode 100644
index d72ccdfdf586..000000000000
--- a/docs/src/main/sphinx/release/release-0.95.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-============
-Release 0.95
-============
-
-General
--------
-
-* Fix task and stage leak, caused when a stage finishes before its substages.
diff --git a/docs/src/main/sphinx/release/release-0.96.md b/docs/src/main/sphinx/release/release-0.96.md
new file mode 100644
index 000000000000..c244837f6184
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.96.md
@@ -0,0 +1,18 @@
+# Release 0.96
+
+## General
+
+- Fix {func}`try_cast` for `TIMESTAMP` and other types that
+  need access to session information.
+- Fix planner bug that could result in incorrect results for
+  tables containing columns with the same prefix, underscores and numbers.
+- `MAP` type is now comparable.
+- Fix output buffer leak in `StatementResource.Query`.
+- Fix leak in `SqlTasks` caused by invalid heartbeats .
+- Fix double logging of queries submitted while the queue is full.
+- Fixed "running queries" JMX stat.
+- Add `distributed_join` session property to enable/disable distributed joins.
+
+## Hive
+
+- Add support for tables partitioned by `DATE`.
diff --git a/docs/src/main/sphinx/release/release-0.96.rst b/docs/src/main/sphinx/release/release-0.96.rst
deleted file mode 100644
index f73478e14472..000000000000
--- a/docs/src/main/sphinx/release/release-0.96.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-============
-Release 0.96
-============
-
-General
--------
-
-* Fix :func:`try_cast` for ``TIMESTAMP`` and other types that
-  need access to session information.
-* Fix planner bug that could result in incorrect results for
-  tables containing columns with the same prefix, underscores and numbers.
-* ``MAP`` type is now comparable.
-* Fix output buffer leak in ``StatementResource.Query``.
-* Fix leak in ``SqlTasks`` caused by invalid heartbeats .
-* Fix double logging of queries submitted while the queue is full.
-* Fixed "running queries" JMX stat.
-* Add ``distributed_join`` session property to enable/disable distributed joins.
-
-Hive
-----
-
-* Add support for tables partitioned by ``DATE``.
diff --git a/docs/src/main/sphinx/release/release-0.97.md b/docs/src/main/sphinx/release/release-0.97.md
new file mode 100644
index 000000000000..69ee5c1793b8
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.97.md
@@ -0,0 +1,16 @@
+# Release 0.97
+
+## General
+
+- The queueing policy in Presto may now be injected.
+- Speed up detection of ASCII strings in implementation of `LIKE` operator.
+- Fix NullPointerException when metadata-based query optimization is enabled.
+- Fix possible infinite loop when decompressing ORC data.
+- Fix an issue where `NOT` clause was being ignored in `NOT BETWEEN` predicates.
+- Fix a planning issue in queries that use `SELECT *`, window functions and implicit coercions.
+- Fix scheduler deadlock for queries with a `UNION` between `VALUES` and `SELECT`.
+
+## Hive
+
+- Fix decoding of `STRUCT` type from Parquet files.
+- Speed up decoding of ORC files with very small stripes.
diff --git a/docs/src/main/sphinx/release/release-0.97.rst b/docs/src/main/sphinx/release/release-0.97.rst
deleted file mode 100644
index 7f5b83563ede..000000000000
--- a/docs/src/main/sphinx/release/release-0.97.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-============
-Release 0.97
-============
-
-General
--------
-
-* The queueing policy in Presto may now be injected.
-* Speed up detection of ASCII strings in implementation of ``LIKE`` operator.
-* Fix NullPointerException when metadata-based query optimization is enabled.
-* Fix possible infinite loop when decompressing ORC data.
-* Fix an issue where ``NOT`` clause was being ignored in ``NOT BETWEEN`` predicates.
-* Fix a planning issue in queries that use ``SELECT *``, window functions and implicit coercions.
-* Fix scheduler deadlock for queries with a ``UNION`` between ``VALUES`` and ``SELECT``.
-
-Hive
-----
-
-* Fix decoding of ``STRUCT`` type from Parquet files.
-* Speed up decoding of ORC files with very small stripes.
diff --git a/docs/src/main/sphinx/release/release-0.98.md b/docs/src/main/sphinx/release/release-0.98.md
new file mode 100644
index 000000000000..cfef01f7c27b
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.98.md
@@ -0,0 +1,31 @@
+# Release 0.98
+
+## Array, map, and row types
+
+The memory representation of these types is now `VariableWidthBlockEncoding`
+instead of `JSON`.
+
+:::{note}
+This is a backwards incompatible change with the previous representation,
+so if you have written a connector or function, you will need to update
+your code before deploying this release.
+:::
+
+## Hive
+
+- Fix handling of ORC files with corrupt checkpoints.
+
+## SPI
+
+- Rename `Index` to `ConnectorIndex`.
+
+:::{note}
+This is a backwards incompatible change, so if you have written a connector
+that uses `Index`, you will need to update your code before deploying this release.
+:::
+
+## General
+
+- Fix bug in `UNNEST` when output is unreferenced or partially referenced.
+- Make {func}`max` and {func}`min` functions work on all orderable types.
+- Optimize memory allocation in {func}`max_by` and other places that `Block` is used.
diff --git a/docs/src/main/sphinx/release/release-0.98.rst b/docs/src/main/sphinx/release/release-0.98.rst
deleted file mode 100644
index 0d5e606d7b50..000000000000
--- a/docs/src/main/sphinx/release/release-0.98.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-============
-Release 0.98
-============
-
-Array, map, and row types
--------------------------
-
-The memory representation of these types is now ``VariableWidthBlockEncoding``
-instead of ``JSON``.
-
-.. note::
-    This is a backwards incompatible change with the previous representation,
-    so if you have written a connector or function, you will need to update
-    your code before deploying this release.
-
-Hive
-----
-
-* Fix handling of ORC files with corrupt checkpoints.
-
-SPI
----
-
-* Rename ``Index`` to ``ConnectorIndex``.
-
-.. note::
-    This is a backwards incompatible change, so if you have written a connector
-    that uses ``Index``, you will need to update your code before deploying this release.
-
-General
--------
-
-* Fix bug in ``UNNEST`` when output is unreferenced or partially referenced.
-* Make :func:`max` and :func:`min` functions work on all orderable types.
-* Optimize memory allocation in :func:`max_by` and other places that ``Block`` is used.
diff --git a/docs/src/main/sphinx/release/release-0.99.md b/docs/src/main/sphinx/release/release-0.99.md
new file mode 100644
index 000000000000..84cb8c63de79
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-0.99.md
@@ -0,0 +1,8 @@
+# Release 0.99
+
+## General
+
+- Reduce lock contention in `TaskExecutor`.
+- Fix reading maps with null keys from ORC.
+- Fix precomputed hash optimization for nulls values.
+- Make {func}`contains()` work for all comparable types.
diff --git a/docs/src/main/sphinx/release/release-0.99.rst b/docs/src/main/sphinx/release/release-0.99.rst
deleted file mode 100644
index f789b6ed5863..000000000000
--- a/docs/src/main/sphinx/release/release-0.99.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-============
-Release 0.99
-============
-
-General
--------
-* Reduce lock contention in ``TaskExecutor``.
-* Fix reading maps with null keys from ORC.
-* Fix precomputed hash optimization for nulls values.
-* Make :func:`contains()` work for all comparable types.
diff --git a/docs/src/main/sphinx/release/release-300.md b/docs/src/main/sphinx/release/release-300.md
new file mode 100644
index 000000000000..ecf4917cac99
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-300.md
@@ -0,0 +1,97 @@
+# Release 300 (22 Jan 2019)
+
+## General
+
+- Fix {func}`array_intersect` and {func}`array_distinct`
+  skipping zeros when input also contains nulls.
+- Fix `count(*)` aggregation returning null on empty relation
+  when `optimize_mixed_distinct_aggregation` is enabled.
+- Improve table scan performance for structured types.
+- Improve performance for {func}`array_intersect`.
+- Improve performance of window functions by filtering partitions early.
+- Add {func}`reduce_agg` aggregate function.
+- Add {func}`millisecond` function.
+- Remove `ON` keyword from {doc}`/sql/show-stats` (use `FOR` instead).
+- Restrict `WHERE` clause in {doc}`/sql/show-stats`
+  to filters that can be pushed down to connectors.
+- Return final results to clients immediately for failed queries.
+
+## JMX MBean naming
+
+- The base domain name for server MBeans is now `presto`. The old names can be
+  used by setting the configuration property `jmx.base-name` to `com.facebook.presto`.
+- The base domain name for the Hive, Raptor, and Thrift connectors is `presto.plugin`.
+  The old names can be used by setting the catalog configuration property
+  `jmx.base-name` to `com.facebook.presto.hive`, `com.facebook.presto.raptor`,
+  or `com.facebook.presto.thrift`, respectively.
+
+## Web UI
+
+- Fix rendering of live plan view for queries involving index joins.
+
+## JDBC driver
+
+- Change driver class name to `io.prestosql.jdbc.PrestoDriver`.
+
+## System connector
+
+- Remove `node_id` column from `system.runtime.queries` table.
+
+## Hive connector
+
+- Fix accounting of time spent reading Parquet data.
+- Fix corner case where the ORC writer fails with integer overflow when writing
+  highly compressible data using dictionary encoding ({issue}`x11930`).
+- Fail queries reading Parquet files if statistics in those files are corrupt
+  (e.g., min > max). To disable this behavior, set the configuration
+  property `hive.parquet.fail-on-corrupted-statistics`
+  or session property `parquet_fail_with_corrupted_statistics` to false.
+- Add support for S3 Select pushdown, which enables pushing down
+  column selection and range filters into S3 for text files.
+
+## Kudu connector
+
+- Add `number_of_replicas` table property to `SHOW CREATE TABLE` output.
+
+## Cassandra connector
+
+- Add `cassandra.splits-per-node` and `cassandra.protocol-version` configuration
+  properties to allow connecting to Cassandra servers older than 2.1.5.
+
+## MySQL connector
+
+- Add support for predicate pushdown for columns of `char(x)` type.
+
+## PostgreSQL connector
+
+- Add support for predicate pushdown for columns of `char(x)` type.
+
+## Redshift connector
+
+- Add support for predicate pushdown for columns of `char(x)` type.
+
+## SQL Server connector
+
+- Add support for predicate pushdown for columns of `char(x)` type.
+
+## Raptor Legacy connector
+
+- Change name of connector to `raptor-legacy`.
+
+## Verifier
+
+- Add `run-teardown-on-result-mismatch` configuration property to facilitate debugging.
+  When set to false, temporary tables will not be dropped after checksum failures.
+
+## SPI
+
+- Change base package to `io.prestosql.spi`.
+- Move connector related classes to package `io.prestosql.spi.connector`.
+- Make `ConnectorBucketNodeMap` a top level class.
+- Use list instead of map for bucket-to-node mapping.
+
+:::{note}
+These are backwards incompatible changes with the previous SPI.
+If you have written a plugin, you will need to update your code
+before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-300.rst b/docs/src/main/sphinx/release/release-300.rst
deleted file mode 100644
index 84eac6d89cb3..000000000000
--- a/docs/src/main/sphinx/release/release-300.rst
+++ /dev/null
@@ -1,114 +0,0 @@
-=========================
-Release 300 (22 Jan 2019)
-=========================
-
-General
--------
-
-* Fix :func:`array_intersect` and :func:`array_distinct`
-  skipping zeros when input also contains nulls.
-* Fix ``count(*)`` aggregation returning null on empty relation
-  when ``optimize_mixed_distinct_aggregation`` is enabled.
-* Improve table scan performance for structured types.
-* Improve performance for :func:`array_intersect`.
-* Improve performance of window functions by filtering partitions early.
-* Add :func:`reduce_agg` aggregate function.
-* Add :func:`millisecond` function.
-* Remove ``ON`` keyword from :doc:`/sql/show-stats` (use ``FOR`` instead).
-* Restrict ``WHERE`` clause in :doc:`/sql/show-stats`
-  to filters that can be pushed down to connectors.
-* Return final results to clients immediately for failed queries.
-
-JMX MBean naming
-----------------
-
-* The base domain name for server MBeans is now ``presto``. The old names can be
-  used by setting the configuration property ``jmx.base-name`` to ``com.facebook.presto``.
-* The base domain name for the Hive, Raptor, and Thrift connectors is ``presto.plugin``.
-  The old names can be used by setting the catalog configuration property
-  ``jmx.base-name`` to ``com.facebook.presto.hive``, ``com.facebook.presto.raptor``,
-  or ``com.facebook.presto.thrift``, respectively.
-
-Web UI
-------
-
-* Fix rendering of live plan view for queries involving index joins.
-
-JDBC driver
------------
-
-* Change driver class name to ``io.prestosql.jdbc.PrestoDriver``.
-
-System connector
-----------------
-
-* Remove ``node_id`` column from ``system.runtime.queries`` table.
-
-Hive connector
---------------
-
-* Fix accounting of time spent reading Parquet data.
-* Fix corner case where the ORC writer fails with integer overflow when writing
-  highly compressible data using dictionary encoding (:issue:`x11930`).
-* Fail queries reading Parquet files if statistics in those files are corrupt
-  (e.g., min > max). To disable this behavior, set the configuration
-  property ``hive.parquet.fail-on-corrupted-statistics``
-  or session property ``parquet_fail_with_corrupted_statistics`` to false.
-* Add support for :ref:`s3selectpushdown`, which enables pushing down
-  column selection and range filters into S3 for text files.
-
-Kudu connector
---------------
-
-* Add ``number_of_replicas`` table property to ``SHOW CREATE TABLE`` output.
-
-Cassandra connector
--------------------
-
-* Add ``cassandra.splits-per-node`` and ``cassandra.protocol-version`` configuration
-  properties to allow connecting to Cassandra servers older than 2.1.5.
-
-MySQL connector
----------------
-
-* Add support for predicate pushdown for columns of ``char(x)`` type.
-
-PostgreSQL connector
---------------------
-
-* Add support for predicate pushdown for columns of ``char(x)`` type.
-
-Redshift connector
--------------------
-
-* Add support for predicate pushdown for columns of ``char(x)`` type.
-
-SQL Server connector
---------------------
-
-* Add support for predicate pushdown for columns of ``char(x)`` type.
-
-Raptor Legacy connector
------------------------
-
-* Change name of connector to ``raptor-legacy``.
-
-Verifier
---------
-
-* Add ``run-teardown-on-result-mismatch`` configuration property to facilitate debugging.
-  When set to false, temporary tables will not be dropped after checksum failures.
-
-SPI
----
-
-* Change base package to ``io.prestosql.spi``.
-* Move connector related classes to package ``io.prestosql.spi.connector``.
-* Make ``ConnectorBucketNodeMap`` a top level class.
-* Use list instead of map for bucket-to-node mapping.
-
-.. note::
-
-    These are backwards incompatible changes with the previous SPI.
-    If you have written a plugin, you will need to update your code
-    before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-301.md b/docs/src/main/sphinx/release/release-301.md
new file mode 100644
index 000000000000..f7400d34c312
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-301.md
@@ -0,0 +1,52 @@
+# Release 301 (31 Jan 2019)
+
+## General
+
+- Fix reporting of aggregate input data size stats. ({issue}`100`)
+- Add support for role management (see {doc}`/sql/create-role`).  Note, using {doc}`/sql/set-role`
+  requires an up-to-date client library. ({issue}`90`)
+- Add `INVOKER` security mode for {doc}`/sql/create-view`. ({issue}`30`)
+- Add `ANALYZE` SQL statement for collecting table statistics. ({issue}`99`)
+- Add {func}`log` function with arbitrary base. ({issue}`36`)
+- Remove the `deprecated.legacy-log-function` configuration option. The legacy behavior
+  (reverse argument order) for the {func}`log` function is no longer available. ({issue}`36`)
+- Remove the `deprecated.legacy-array-agg` configuration option. The legacy behavior
+  (ignoring nulls) for {func}`array_agg` is no longer available. ({issue}`77`)
+- Improve performance of `COALESCE` expressions. ({issue}`35`)
+- Improve error message for unsupported {func}`reduce_agg` state type. ({issue}`55`)
+- Improve performance of queries involving `SYSTEM` table sampling and computations over the
+  columns of the sampled table. ({issue}`29`)
+
+## Server RPM
+
+- Do not allow uninstalling RPM while server is still running. ({issue}`67`)
+
+## Security
+
+- Support LDAP with anonymous bind disabled. ({issue}`97`)
+
+## Hive connector
+
+- Add procedure for dumping metastore recording to a file. ({issue}`54`)
+- Add Metastore recorder support for Glue. ({issue}`61`)
+- Add `hive.temporary-staging-directory-enabled` configuration property and
+  `temporary_staging_directory_enabled` session property to control whether a temporary staging
+  directory should be used for write operations. ({issue}`70`)
+- Add `hive.temporary-staging-directory-path` configuration property and
+  `temporary_staging_directory_path` session property to control the location of temporary
+  staging directory that is used for write operations. The `${USER}` placeholder can be used to
+  use a different location for each user (e.g., `/tmp/${USER}`). ({issue}`70`)
+
+## Kafka connector
+
+- The minimum supported Kafka broker version is now 0.10.0. ({issue}`53`)
+
+## Base-JDBC connector library
+
+- Add support for defining procedures. ({issue}`73`)
+- Add support for providing table statistics. ({issue}`72`)
+
+## SPI
+
+- Include session trace token in `QueryCreatedEvent` and `QueryCompletedEvent`. ({issue}`24`)
+- Fix regression in `NodeManager` where node list was not being refreshed on workers.  ({issue}`27`)
diff --git a/docs/src/main/sphinx/release/release-301.rst b/docs/src/main/sphinx/release/release-301.rst
deleted file mode 100644
index 42e1c1107599..000000000000
--- a/docs/src/main/sphinx/release/release-301.rst
+++ /dev/null
@@ -1,61 +0,0 @@
-=========================
-Release 301 (31 Jan 2019)
-=========================
-
-General
--------
-
-* Fix reporting of aggregate input data size stats. (:issue:`100`)
-* Add support for role management (see :doc:`/sql/create-role`).  Note, using :doc:`/sql/set-role`
-  requires an up-to-date client library. (:issue:`90`)
-* Add ``INVOKER`` security mode for :doc:`/sql/create-view`. (:issue:`30`)
-* Add ``ANALYZE`` SQL statement for collecting table statistics. (:issue:`99`)
-* Add :func:`log` function with arbitrary base. (:issue:`36`)
-* Remove the ``deprecated.legacy-log-function`` configuration option. The legacy behavior
-  (reverse argument order) for the :func:`log` function is no longer available. (:issue:`36`)
-* Remove the ``deprecated.legacy-array-agg`` configuration option. The legacy behavior
-  (ignoring nulls) for :func:`array_agg` is no longer available. (:issue:`77`)
-* Improve performance of ``COALESCE`` expressions. (:issue:`35`)
-* Improve error message for unsupported :func:`reduce_agg` state type. (:issue:`55`)
-* Improve performance of queries involving ``SYSTEM`` table sampling and computations over the
-  columns of the sampled table. (:issue:`29`)
-
-Server RPM
-----------
-
-* Do not allow uninstalling RPM while server is still running. (:issue:`67`)
-
-Security
---------
-
-* Support LDAP with anonymous bind disabled. (:issue:`97`)
-
-Hive connector
---------------
-
-* Add procedure for dumping metastore recording to a file. (:issue:`54`)
-* Add Metastore recorder support for Glue. (:issue:`61`)
-* Add ``hive.temporary-staging-directory-enabled`` configuration property and
-  ``temporary_staging_directory_enabled`` session property to control whether a temporary staging
-  directory should be used for write operations. (:issue:`70`)
-* Add ``hive.temporary-staging-directory-path`` configuration property and
-  ``temporary_staging_directory_path`` session property to control the location of temporary
-  staging directory that is used for write operations. The ``${USER}`` placeholder can be used to
-  use a different location for each user (e.g., ``/tmp/${USER}``). (:issue:`70`)
-
-Kafka connector
----------------
-
-* The minimum supported Kafka broker version is now 0.10.0. (:issue:`53`)
-
-Base-JDBC connector library
----------------------------
-
-* Add support for defining procedures. (:issue:`73`)
-* Add support for providing table statistics. (:issue:`72`)
-
-SPI
----
-
-* Include session trace token in ``QueryCreatedEvent`` and ``QueryCompletedEvent``. (:issue:`24`)
-* Fix regression in ``NodeManager`` where node list was not being refreshed on workers.  (:issue:`27`)
diff --git a/docs/src/main/sphinx/release/release-302.md b/docs/src/main/sphinx/release/release-302.md
new file mode 100644
index 000000000000..764a49faddb3
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-302.md
@@ -0,0 +1,54 @@
+# Release 302 (6 Feb 2019)
+
+## General
+
+- Fix cluster starvation when wait for minimum number of workers is enabled. ({issue}`155`)
+- Fix backup of queries blocked waiting for minimum number of workers. ({issue}`155`)
+- Fix failure when preparing statements that contain a quoted reserved word as a table name. ({issue}`80`)
+- Fix query failure when spilling is triggered during certain phases of query execution. ({issue}`164`)
+- Fix `SHOW CREATE VIEW` output to preserve table name quoting. ({issue}`80`)
+- Add {doc}`/connector/elasticsearch`. ({issue}`118`)
+- Add support for `boolean` type to {func}`approx_distinct`. ({issue}`82`)
+- Add support for boolean columns to `EXPLAIN` with type `IO`. ({issue}`157`)
+- Add `SphericalGeography` type and related {doc}`geospatial functions </functions/geospatial>`. ({issue}`166`)
+- Remove deprecated system memory pool. ({issue}`168`)
+- Improve query performance for certain queries involving `ROLLUP`. ({issue}`105`)
+
+## CLI
+
+- Add `--trace-token` option to set the trace token. ({issue}`117`)
+- Display spilled data size as part of debug information. ({issue}`161`)
+
+## Web UI
+
+- Add spilled data size to query details page. ({issue}`161`)
+
+## Security
+
+- Add `http.server.authentication.krb5.principal-hostname` configuration option to set the hostname
+  for the Kerberos service principal. ({issue}`146`, {issue}`153`)
+- Add support for client-provided extra credentials that can be utilized by connectors. ({issue}`124`)
+
+## Hive connector
+
+- Fix Parquet predicate pushdown for `smallint`, `tinyint` types. ({issue}`131`)
+- Add support for Google Cloud Storage (GCS). Credentials can be provided globally using the
+  `hive.gcs.json-key-file-path` configuration property, or as a client-provided extra credential
+  named `hive.gcs.oauth` if the `hive.gcs.use-access-token` configuration property is enabled. ({issue}`124`)
+- Allow creating tables with the `external_location` property pointing to an empty S3 directory. ({issue}`75`)
+- Reduce GC pressure from Parquet reader by constraining the maximum column read size. ({issue}`58`)
+- Reduce network utilization and latency for S3 when reading ORC or Parquet. ({issue}`142`)
+
+## Kafka connector
+
+- Fix query failure when reading `information_schema.columns` without an equality condition on `table_name`. ({issue}`120`)
+
+## Redis connector
+
+- Fix query failure when reading `information_schema.columns` without an equality condition on `table_name`. ({issue}`120`)
+
+## SPI
+
+- Include query peak task user memory in `QueryCreatedEvent` and `QueryCompletedEvent`. ({issue}`163`)
+- Include plan node cost and statistics estimates in `QueryCompletedEvent`. ({issue}`134`)
+- Include physical and internal network input data size in `QueryCompletedEvent`. ({issue}`133`)
diff --git a/docs/src/main/sphinx/release/release-302.rst b/docs/src/main/sphinx/release/release-302.rst
deleted file mode 100644
index 58b327509a8c..000000000000
--- a/docs/src/main/sphinx/release/release-302.rst
+++ /dev/null
@@ -1,64 +0,0 @@
-========================
-Release 302 (6 Feb 2019)
-========================
-
-General
--------
-
-* Fix cluster starvation when wait for minimum number of workers is enabled. (:issue:`155`)
-* Fix backup of queries blocked waiting for minimum number of workers. (:issue:`155`)
-* Fix failure when preparing statements that contain a quoted reserved word as a table name. (:issue:`80`)
-* Fix query failure when spilling is triggered during certain phases of query execution. (:issue:`164`)
-* Fix ``SHOW CREATE VIEW`` output to preserve table name quoting. (:issue:`80`)
-* Add :doc:`/connector/elasticsearch`. (:issue:`118`)
-* Add support for ``boolean`` type to :func:`approx_distinct`. (:issue:`82`)
-* Add support for boolean columns to ``EXPLAIN`` with type ``IO``. (:issue:`157`)
-* Add ``SphericalGeography`` type and related :doc:`geospatial functions </functions/geospatial>`. (:issue:`166`)
-* Remove deprecated system memory pool. (:issue:`168`)
-* Improve query performance for certain queries involving ``ROLLUP``. (:issue:`105`)
-
-CLI
----
-
-* Add ``--trace-token`` option to set the trace token. (:issue:`117`)
-* Display spilled data size as part of debug information. (:issue:`161`)
-
-Web UI
-------
-
-* Add spilled data size to query details page. (:issue:`161`)
-
-Security
---------
-
-* Add ``http.server.authentication.krb5.principal-hostname`` configuration option to set the hostname
-  for the Kerberos service principal. (:issue:`146`, :issue:`153`)
-* Add support for client-provided extra credentials that can be utilized by connectors. (:issue:`124`)
-
-Hive connector
---------------
-
-* Fix Parquet predicate pushdown for ``smallint``, ``tinyint`` types. (:issue:`131`)
-* Add support for Google Cloud Storage (GCS). Credentials can be provided globally using the
-  ``hive.gcs.json-key-file-path`` configuration property, or as a client-provided extra credential
-  named ``hive.gcs.oauth`` if the ``hive.gcs.use-access-token`` configuration property is enabled. (:issue:`124`)
-* Allow creating tables with the ``external_location`` property pointing to an empty S3 directory. (:issue:`75`)
-* Reduce GC pressure from Parquet reader by constraining the maximum column read size. (:issue:`58`)
-* Reduce network utilization and latency for S3 when reading ORC or Parquet. (:issue:`142`)
-
-Kafka connector
----------------
-
-* Fix query failure when reading ``information_schema.columns`` without an equality condition on ``table_name``. (:issue:`120`)
-
-Redis connector
----------------
-
-* Fix query failure when reading ``information_schema.columns`` without an equality condition on ``table_name``. (:issue:`120`)
-
-SPI
----
-
-* Include query peak task user memory in ``QueryCreatedEvent`` and ``QueryCompletedEvent``. (:issue:`163`)
-* Include plan node cost and statistics estimates in ``QueryCompletedEvent``. (:issue:`134`)
-* Include physical and internal network input data size in ``QueryCompletedEvent``. (:issue:`133`)
diff --git a/docs/src/main/sphinx/release/release-303.md b/docs/src/main/sphinx/release/release-303.md
new file mode 100644
index 000000000000..c2460b32ec29
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-303.md
@@ -0,0 +1,43 @@
+# Release 303 (13 Feb 2019)
+
+## General
+
+- Fix incorrect padding for `CHAR` values containing Unicode supplementary characters.
+  Previously, such values would be incorrectly padded with too few spaces. ({issue}`195`)
+- Fix an issue where a union of a table with a `VALUES` statement would execute on a
+  single node,  which could lead to out of memory errors. ({issue}`207`)
+- Fix `/v1/info` to report started status after all plugins have been registered and initialized. ({issue}`213`)
+- Improve performance of window functions by avoiding unnecessary data exchanges over the network. ({issue}`177`)
+- Choose the distribution type for semi joins based on cost when the
+  `join_distribution_type` session property is set to `AUTOMATIC`. ({issue}`160`)
+- Expand grouped execution support to window functions, making it possible
+  to execute them with less peak memory usage. ({issue}`169`)
+
+## Web UI
+
+- Add additional details to and improve rendering of live plan. ({issue}`182`)
+
+## CLI
+
+- Add `--progress` option to show query progress in batch mode. ({issue}`34`)
+
+## Hive connector
+
+- Fix query failure when reading Parquet data with no columns selected.
+  This affects queries such as `SELECT count(*)`. ({issue}`203`)
+
+## Mongo connector
+
+- Fix failure for queries involving joins or aggregations on `ObjectId` type. ({issue}`215`)
+
+## Base-JDBC connector library
+
+- Allow customizing how query predicates are pushed down to the underlying database. ({issue}`109`)
+- Allow customizing how values are written to the underlying database. ({issue}`109`)
+
+## SPI
+
+- Remove deprecated methods `getSchemaName` and `getTableName` from the `SchemaTablePrefix`
+  class. These were replaced by the `getSchema` and `getTable` methods. ({issue}`89`)
+- Remove deprecated variants of methods `listTables` and `listViews`
+  from the `ConnectorMetadata` class. ({issue}`89`)
diff --git a/docs/src/main/sphinx/release/release-303.rst b/docs/src/main/sphinx/release/release-303.rst
deleted file mode 100644
index d5b9428d3dc7..000000000000
--- a/docs/src/main/sphinx/release/release-303.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-=========================
-Release 303 (13 Feb 2019)
-=========================
-
-General
--------
-
-* Fix incorrect padding for ``CHAR`` values containing Unicode supplementary characters.
-  Previously, such values would be incorrectly padded with too few spaces. (:issue:`195`)
-* Fix an issue where a union of a table with a ``VALUES`` statement would execute on a
-  single node,  which could lead to out of memory errors. (:issue:`207`)
-* Fix ``/v1/info`` to report started status after all plugins have been registered and initialized. (:issue:`213`)
-* Improve performance of window functions by avoiding unnecessary data exchanges over the network. (:issue:`177`)
-* Choose the distribution type for semi joins based on cost when the
-  ``join_distribution_type`` session property is set to ``AUTOMATIC``. (:issue:`160`)
-* Expand grouped execution support to window functions, making it possible
-  to execute them with less peak memory usage. (:issue:`169`)
-
-Web UI
-------
-
-* Add additional details to and improve rendering of live plan. (:issue:`182`)
-
-CLI
----
-
-* Add ``--progress`` option to show query progress in batch mode. (:issue:`34`)
-
-Hive connector
---------------
-
-* Fix query failure when reading Parquet data with no columns selected.
-  This affects queries such as ``SELECT count(*)``. (:issue:`203`)
-
-Mongo connector
----------------
-
-* Fix failure for queries involving joins or aggregations on ``ObjectId`` type. (:issue:`215`)
-
-
-Base-JDBC connector library
----------------------------
-
-* Allow customizing how query predicates are pushed down to the underlying database. (:issue:`109`)
-* Allow customizing how values are written to the underlying database. (:issue:`109`)
-
-SPI
----
-
-* Remove deprecated methods ``getSchemaName`` and ``getTableName`` from the ``SchemaTablePrefix``
-  class. These were replaced by the ``getSchema`` and ``getTable`` methods. (:issue:`89`)
-* Remove deprecated variants of methods ``listTables`` and ``listViews``
-  from the ``ConnectorMetadata`` class. (:issue:`89`)
diff --git a/docs/src/main/sphinx/release/release-304.md b/docs/src/main/sphinx/release/release-304.md
new file mode 100644
index 000000000000..d0c6619807a9
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-304.md
@@ -0,0 +1,54 @@
+# Release 304 (27 Feb 2019)
+
+## General
+
+- Fix wrong results for queries involving `FULL OUTER JOIN` and `coalesce` expressions
+  over the join keys. ({issue}`288`)
+- Fix failure when a column is referenced using its fully qualified form. ({issue}`250`)
+- Correctly report physical and internal network position count for operators. ({issue}`271`)
+- Improve plan stability for repeated executions of the same query. ({issue}`226`)
+- Remove deprecated `datasources` configuration property. ({issue}`306`)
+- Improve error message when a query contains zero-length delimited identifiers. ({issue}`249`)
+- Avoid opening an unnecessary HTTP listener on an arbitrary port. ({issue}`239`)
+- Add experimental support for spilling for queries involving `ORDER BY` or window functions. ({issue}`228`)
+
+## Server RPM
+
+- Preserve modified configuration files when the RPM is uninstalled. ({issue}`267`)
+
+## Web UI
+
+- Fix broken timeline view. ({issue}`283`)
+- Show data size and position count reported by connectors and by worker-to-worker data transfers
+  in detailed query view. ({issue}`271`)
+
+## Hive connector
+
+- Fix authorization failure when using SQL Standard Based Authorization mode with user identifiers
+  that contain capital letters. ({issue}`289`)
+- Fix wrong results when filtering on the hidden `$bucket` column for tables containing
+  partitions with different bucket counts. Instead, queries will now fail in this case. ({issue}`286`)
+- Record the configured Hive time zone when writing ORC files. ({issue}`212`)
+- Use the time zone recorded in ORC files when reading timestamps.
+  The configured Hive time zone, which was previously always used, is now
+  used only as a default when the writer did not record the time zone. ({issue}`212`)
+- Support Parquet files written with Parquet 1.9+ that use `DELTA_BINARY_PACKED`
+  encoding with the Parquet `INT64` type. ({issue}`334`)
+- Allow setting the retry policy for the Thrift metastore client using the
+  `hive.metastore.thrift.client.*` configuration properties. ({issue}`240`)
+- Reduce file system read operations when reading Parquet file footers. ({issue}`296`)
+- Allow ignoring Glacier objects in S3 rather than failing the query. This is
+  disabled by default, as it may skip data that is expected to exist, but it can
+  be enabled using the `hive.s3.skip-glacier-objects` configuration property. ({issue}`305`)
+- Add procedure `system.sync_partition_metadata()` to synchronize the partitions
+  in the metastore with the partitions that are physically on the file system. ({issue}`223`)
+- Improve performance of ORC reader for columns that only contain nulls. ({issue}`229`)
+
+## PostgreSQL connector
+
+- Map PostgreSQL `json` and `jsonb` types to Presto `json` type. ({issue}`81`)
+
+## Cassandra connector
+
+- Support queries over tables containing partitioning columns of any type. ({issue}`252`)
+- Support `smallint`, `tinyint` and  `date` Cassandra types. ({issue}`141`)
diff --git a/docs/src/main/sphinx/release/release-304.rst b/docs/src/main/sphinx/release/release-304.rst
deleted file mode 100644
index 8de0c769afe4..000000000000
--- a/docs/src/main/sphinx/release/release-304.rst
+++ /dev/null
@@ -1,62 +0,0 @@
-=========================
-Release 304 (27 Feb 2019)
-=========================
-
-General
--------
-
-* Fix wrong results for queries involving ``FULL OUTER JOIN`` and ``coalesce`` expressions
-  over the join keys. (:issue:`288`)
-* Fix failure when a column is referenced using its fully qualified form. (:issue:`250`)
-* Correctly report physical and internal network position count for operators. (:issue:`271`)
-* Improve plan stability for repeated executions of the same query. (:issue:`226`)
-* Remove deprecated ``datasources`` configuration property. (:issue:`306`)
-* Improve error message when a query contains zero-length delimited identifiers. (:issue:`249`)
-* Avoid opening an unnecessary HTTP listener on an arbitrary port. (:issue:`239`)
-* Add experimental support for spilling for queries involving ``ORDER BY`` or window functions. (:issue:`228`)
-
-Server RPM
-----------
-
-* Preserve modified configuration files when the RPM is uninstalled. (:issue:`267`)
-
-Web UI
-------
-
-* Fix broken timeline view. (:issue:`283`)
-* Show data size and position count reported by connectors and by worker-to-worker data transfers
-  in detailed query view. (:issue:`271`)
-
-Hive connector
---------------
-
-* Fix authorization failure when using SQL Standard Based Authorization mode with user identifiers
-  that contain capital letters. (:issue:`289`)
-* Fix wrong results when filtering on the hidden ``$bucket`` column for tables containing
-  partitions with different bucket counts. Instead, queries will now fail in this case. (:issue:`286`)
-* Record the configured Hive time zone when writing ORC files. (:issue:`212`)
-* Use the time zone recorded in ORC files when reading timestamps.
-  The configured Hive time zone, which was previously always used, is now
-  used only as a default when the writer did not record the time zone. (:issue:`212`)
-* Support Parquet files written with Parquet 1.9+ that use ``DELTA_BINARY_PACKED``
-  encoding with the Parquet ``INT64`` type. (:issue:`334`)
-* Allow setting the retry policy for the Thrift metastore client using the
-  ``hive.metastore.thrift.client.*`` configuration properties. (:issue:`240`)
-* Reduce file system read operations when reading Parquet file footers. (:issue:`296`)
-* Allow ignoring Glacier objects in S3 rather than failing the query. This is
-  disabled by default, as it may skip data that is expected to exist, but it can
-  be enabled using the ``hive.s3.skip-glacier-objects`` configuration property. (:issue:`305`)
-* Add procedure ``system.sync_partition_metadata()`` to synchronize the partitions
-  in the metastore with the partitions that are physically on the file system. (:issue:`223`)
-* Improve performance of ORC reader for columns that only contain nulls. (:issue:`229`)
-
-PostgreSQL connector
---------------------
-
-* Map PostgreSQL ``json`` and ``jsonb`` types to Presto ``json`` type. (:issue:`81`)
-
-Cassandra connector
--------------------
-
-* Support queries over tables containing partitioning columns of any type. (:issue:`252`)
-* Support ``smallint``, ``tinyint`` and  ``date`` Cassandra types. (:issue:`141`)
diff --git a/docs/src/main/sphinx/release/release-305.md b/docs/src/main/sphinx/release/release-305.md
new file mode 100644
index 000000000000..a78e7c7b742c
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-305.md
@@ -0,0 +1,46 @@
+# Release 305 (7 Mar 2019)
+
+## General
+
+- Fix failure of {doc}`/functions/regexp` for certain patterns and inputs
+  when using the default `JONI` library. ({issue}`350`)
+- Fix a rare `ClassLoader` related problem for plugins providing an `EventListenerFactory`. ({issue}`299`)
+- Expose `join_max_broadcast_table_size` session property, which was previously hidden. ({issue}`346`)
+- Improve performance of queries when spill is enabled but not triggered. ({issue}`315`)
+- Consider estimated query peak memory when making cost based decisions. ({issue}`247`)
+- Include revocable memory in total memory stats. ({issue}`273`)
+- Add peak revocable memory to operator stats. ({issue}`273`)
+- Add {func}`ST_Points` function to access vertices of a linestring. ({issue}`316`)
+- Add a system table `system.metadata.analyze_properties`
+  to list all {doc}`/sql/analyze` properties. ({issue}`376`)
+
+## Resource groups
+
+- Fix resource group selection when selector uses regular expression variables. ({issue}`373`)
+
+## Web UI
+
+- Display peak revocable memory, current total memory,
+  and peak total memory in detailed query view. ({issue}`273`)
+
+## CLI
+
+- Add option to output CSV without quotes. ({issue}`319`)
+
+## Hive connector
+
+- Fix handling of updated credentials for Google Cloud Storage (GCS). ({issue}`398`)
+- Fix calculation of bucket number for timestamps that contain a non-zero
+  milliseconds value. Previously, data would be written into the wrong bucket,
+  or could be incorrectly skipped on read. ({issue}`366`)
+- Allow writing ORC files compatible with Hive 2.0.0 to 2.2.0 by identifying
+  the writer as an old version of Hive (rather than Presto) in the files.
+  This can be enabled using the `hive.orc.writer.use-legacy-version-number`
+  configuration property. ({issue}`353`)
+- Support dictionary filtering for Parquet v2 files using `RLE_DICTIONARY` encoding. ({issue}`251`)
+- Remove legacy writers for ORC and RCFile. ({issue}`353`)
+- Remove support for the DWRF file format. ({issue}`353`)
+
+## Base-JDBC connector library
+
+- Allow access to extra credentials when opening a JDBC connection. ({issue}`281`)
diff --git a/docs/src/main/sphinx/release/release-305.rst b/docs/src/main/sphinx/release/release-305.rst
deleted file mode 100644
index 8ad82c17051c..000000000000
--- a/docs/src/main/sphinx/release/release-305.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-========================
-Release 305 (7 Mar 2019)
-========================
-
-General
--------
-
-* Fix failure of :doc:`/functions/regexp` for certain patterns and inputs
-  when using the default ``JONI`` library. (:issue:`350`)
-* Fix a rare ``ClassLoader`` related problem for plugins providing an ``EventListenerFactory``. (:issue:`299`)
-* Expose ``join_max_broadcast_table_size`` session property, which was previously hidden. (:issue:`346`)
-* Improve performance of queries when spill is enabled but not triggered. (:issue:`315`)
-* Consider estimated query peak memory when making cost based decisions. (:issue:`247`)
-* Include revocable memory in total memory stats. (:issue:`273`)
-* Add peak revocable memory to operator stats. (:issue:`273`)
-* Add :func:`ST_Points` function to access vertices of a linestring. (:issue:`316`)
-* Add a system table ``system.metadata.analyze_properties``
-  to list all :doc:`/sql/analyze` properties. (:issue:`376`)
-
-Resource groups
----------------
-
-* Fix resource group selection when selector uses regular expression variables. (:issue:`373`)
-
-Web UI
-------
-
-* Display peak revocable memory, current total memory,
-  and peak total memory in detailed query view. (:issue:`273`)
-
-CLI
----
-
-* Add option to output CSV without quotes. (:issue:`319`)
-
-Hive connector
---------------
-
-* Fix handling of updated credentials for Google Cloud Storage (GCS). (:issue:`398`)
-* Fix calculation of bucket number for timestamps that contain a non-zero
-  milliseconds value. Previously, data would be written into the wrong bucket,
-  or could be incorrectly skipped on read. (:issue:`366`)
-* Allow writing ORC files compatible with Hive 2.0.0 to 2.2.0 by identifying
-  the writer as an old version of Hive (rather than Presto) in the files.
-  This can be enabled using the ``hive.orc.writer.use-legacy-version-number``
-  configuration property. (:issue:`353`)
-* Support dictionary filtering for Parquet v2 files using ``RLE_DICTIONARY`` encoding. (:issue:`251`)
-* Remove legacy writers for ORC and RCFile. (:issue:`353`)
-* Remove support for the DWRF file format. (:issue:`353`)
-
-Base-JDBC connector library
----------------------------
-
-* Allow access to extra credentials when opening a JDBC connection. (:issue:`281`)
diff --git a/docs/src/main/sphinx/release/release-306.md b/docs/src/main/sphinx/release/release-306.md
new file mode 100644
index 000000000000..3a3d57875433
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-306.md
@@ -0,0 +1,67 @@
+# Release 306 (16 Mar 2019)
+
+## General
+
+- Fix planning failure for queries containing a `LIMIT` after a global
+  aggregation. ({issue}`437`)
+- Fix missing column types in `EXPLAIN` output. ({issue}`328`)
+- Fix accounting of peak revocable memory reservation. ({issue}`413`)
+- Fix double memory accounting for aggregations when spilling is active. ({issue}`413`)
+- Fix excessive CPU usage that can occur when spilling for window functions. ({issue}`468`)
+- Fix incorrect view name displayed by `SHOW CREATE VIEW`. ({issue}`433`)
+- Allow specifying `NOT NULL` when creating tables or adding columns. ({issue}`418`)
+- Add a config option (`query.stage-count-warning-threshold`) to specify a
+  per-query threshold for the number of stages. When this threshold is exceeded,
+  a `TOO_MANY_STAGES` warning is raised. ({issue}`330`)
+- Support session property values with special characters (e.g., comma or equals sign). ({issue}`407`)
+- Remove the `deprecated.legacy-unnest-array-rows` configuration option.
+  The legacy behavior for `UNNEST` of arrays containing `ROW` values is no
+  longer supported. ({issue}`430`)
+- Remove the `deprecated.legacy-row-field-ordinal-access` configuration option.
+  The legacy mechanism for accessing fields of anonymous `ROW` types is no longer
+  supported. ({issue}`428`)
+- Remove the `deprecated.group-by-uses-equal` configuration option. The legacy equality
+  semantics for `GROUP BY` are not longer supported. ({issue}`432`)
+- Remove the `deprecated.legacy-map-subscript`. The legacy behavior for the map subscript
+  operator on missing keys is no longer supported. ({issue}`429`)
+- Remove the `deprecated.legacy-char-to-varchar-coercion` configuration option. The
+  legacy coercion rules between `CHAR` and `VARCHAR` types are no longer
+  supported. ({issue}`431`)
+- Remove deprecated `distributed_join` system property. Use `join_distribution_type`
+  instead. ({issue}`452`)
+
+## Hive connector
+
+- Fix calling procedures immediately after startup, before any other queries are run.
+  Previously, the procedure call would fail and also cause all subsequent Hive queries
+  to fail. ({issue}`414`)
+- Improve ORC reader performance for decoding `REAL` and `DOUBLE` types. ({issue}`465`)
+
+## MySQL connector
+
+- Allow creating or renaming tables, and adding, renaming, or dropping columns. ({issue}`418`)
+
+## PostgreSQL connector
+
+- Fix predicate pushdown for PostgreSQL `ENUM` type. ({issue}`408`)
+- Allow creating or renaming tables, and adding, renaming, or dropping columns. ({issue}`418`)
+
+## Redshift connector
+
+- Allow creating or renaming tables, and adding, renaming, or dropping columns. ({issue}`418`)
+
+## SQL Server connector
+
+- Allow creating or renaming tables, and adding, renaming, or dropping columns. ({issue}`418`)
+
+## Base-JDBC connector library
+
+- Allow mapping column type to Presto type based on `Block`. ({issue}`454`)
+
+## SPI
+
+- Deprecate Table Layout APIs. Connectors can opt out of the legacy behavior by implementing
+  `ConnectorMetadata.usesLegacyTableLayouts()`. ({issue}`420`)
+- Add support for limit pushdown into connectors via the `ConnectorMetadata.applyLimit()`
+  method. ({issue}`421`)
+- Add time spent waiting for resources to `QueryCompletedEvent`. ({issue}`461`)
diff --git a/docs/src/main/sphinx/release/release-306.rst b/docs/src/main/sphinx/release/release-306.rst
deleted file mode 100644
index f4b7cb74fc45..000000000000
--- a/docs/src/main/sphinx/release/release-306.rst
+++ /dev/null
@@ -1,77 +0,0 @@
-=========================
-Release 306 (16 Mar 2019)
-=========================
-
-General
--------
-
-* Fix planning failure for queries containing a ``LIMIT`` after a global
-  aggregation. (:issue:`437`)
-* Fix missing column types in ``EXPLAIN`` output. (:issue:`328`)
-* Fix accounting of peak revocable memory reservation. (:issue:`413`)
-* Fix double memory accounting for aggregations when spilling is active. (:issue:`413`)
-* Fix excessive CPU usage that can occur when spilling for window functions. (:issue:`468`)
-* Fix incorrect view name displayed by ``SHOW CREATE VIEW``. (:issue:`433`)
-* Allow specifying ``NOT NULL`` when creating tables or adding columns. (:issue:`418`)
-* Add a config option (``query.stage-count-warning-threshold``) to specify a
-  per-query threshold for the number of stages. When this threshold is exceeded,
-  a ``TOO_MANY_STAGES`` warning is raised. (:issue:`330`)
-* Support session property values with special characters (e.g., comma or equals sign). (:issue:`407`)
-* Remove the ``deprecated.legacy-unnest-array-rows`` configuration option.
-  The legacy behavior for ``UNNEST`` of arrays containing ``ROW`` values is no
-  longer supported. (:issue:`430`)
-* Remove the ``deprecated.legacy-row-field-ordinal-access`` configuration option.
-  The legacy mechanism for accessing fields of anonymous ``ROW`` types is no longer
-  supported. (:issue:`428`)
-* Remove the ``deprecated.group-by-uses-equal`` configuration option. The legacy equality
-  semantics for ``GROUP BY`` are not longer supported. (:issue:`432`)
-* Remove the ``deprecated.legacy-map-subscript``. The legacy behavior for the map subscript
-  operator on missing keys is no longer supported. (:issue:`429`)
-* Remove the ``deprecated.legacy-char-to-varchar-coercion`` configuration option. The
-  legacy coercion rules between ``CHAR`` and ``VARCHAR`` types are no longer
-  supported. (:issue:`431`)
-* Remove deprecated ``distributed_join`` system property. Use ``join_distribution_type``
-  instead. (:issue:`452`)
-
-Hive connector
---------------
-
-* Fix calling procedures immediately after startup, before any other queries are run.
-  Previously, the procedure call would fail and also cause all subsequent Hive queries
-  to fail. (:issue:`414`)
-* Improve ORC reader performance for decoding ``REAL`` and ``DOUBLE`` types. (:issue:`465`)
-
-MySQL connector
----------------
-
-* Allow creating or renaming tables, and adding, renaming, or dropping columns. (:issue:`418`)
-
-PostgreSQL connector
---------------------
-
-* Fix predicate pushdown for PostgreSQL ``ENUM`` type. (:issue:`408`)
-* Allow creating or renaming tables, and adding, renaming, or dropping columns. (:issue:`418`)
-
-Redshift connector
-------------------
-
-* Allow creating or renaming tables, and adding, renaming, or dropping columns. (:issue:`418`)
-
-SQL Server connector
---------------------
-
-* Allow creating or renaming tables, and adding, renaming, or dropping columns. (:issue:`418`)
-
-Base-JDBC connector library
----------------------------
-
-* Allow mapping column type to Presto type based on ``Block``. (:issue:`454`)
-
-SPI
----
-
-* Deprecate Table Layout APIs. Connectors can opt out of the legacy behavior by implementing
-  ``ConnectorMetadata.usesLegacyTableLayouts()``. (:issue:`420`)
-* Add support for limit pushdown into connectors via the ``ConnectorMetadata.applyLimit()``
-  method. (:issue:`421`)
-* Add time spent waiting for resources to ``QueryCompletedEvent``. (:issue:`461`)
diff --git a/docs/src/main/sphinx/release/release-307.md b/docs/src/main/sphinx/release/release-307.md
new file mode 100644
index 000000000000..789b688c3f05
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-307.md
@@ -0,0 +1,64 @@
+# Release 307 (3 Apr 2019)
+
+## General
+
+- Fix cleanup of spill files for queries using window functions or `ORDER BY`. ({issue}`543`)
+- Optimize queries containing `ORDER BY` together with `LIMIT` over an `OUTER JOIN`
+  by pushing `ORDER BY` and `LIMIT` to the outer side of the join. ({issue}`419`)
+- Improve performance of table scans for data sources that produce tiny pages. ({issue}`467`)
+- Improve performance of `IN` subquery expressions that contain a `DISTINCT` clause. ({issue}`551`)
+- Expand support of types handled in `EXPLAIN (TYPE IO)`. ({issue}`509`)
+- Add support for outer joins involving lateral derived tables (i.e., `LATERAL`). ({issue}`390`)
+- Add support for setting table comments via the {doc}`/sql/comment` syntax. ({issue}`200`)
+
+## Web UI
+
+- Allow UI to work when opened as `/ui` (no trailing slash). ({issue}`500`)
+
+## Security
+
+- Make query result and cancellation URIs secure. Previously, an authenticated
+  user could potentially steal the result data of any running query. ({issue}`561`)
+
+## Server RPM
+
+- Prevent JVM from allocating large amounts of native memory. The new configuration is applied
+  automatically when Presto is installed from RPM. When Presto is installed another way, or when
+  you provide your own `jvm.config`, we recommend adding `-Djdk.nio.maxCachedBufferSize=2000000`
+  to your `jvm.config`. See {doc}`/installation/deployment` for details. ({issue}`542`)
+
+## CLI
+
+- Always abort query in batch mode when CLI is killed. ({issue}`508`, {issue}`580`)
+
+## JDBC driver
+
+- Abort query synchronously when the `ResultSet` is closed or when the
+  `Statement` is cancelled. Previously, the abort was sent in the background,
+  allowing the JVM to exit before the abort was received by the server. ({issue}`580`)
+
+## Hive connector
+
+- Add safety checks for Hive bucketing version. Hive 3.0 introduced a new
+  bucketing version that uses an incompatible hash function. The Hive connector
+  will treat such tables as not bucketed when reading and disallows writing. ({issue}`512`)
+- Add support for setting table comments via the {doc}`/sql/comment` syntax. ({issue}`200`)
+
+## Other connectors
+
+These changes apply to the MySQL, PostgreSQL, Redshift, and SQL Server connectors.
+
+- Fix reading and writing of `timestamp` values. Previously, an incorrect value
+  could be read, depending on the Presto JVM time zone. ({issue}`495`)
+- Add support for using a client-provided username and password. The credential
+  names can be configured using the `user-credential-name` and `password-credential-name`
+  configuration properties. ({issue}`482`)
+
+## SPI
+
+- `LongDecimalType` and `IpAddressType` now use `Int128ArrayBlock` instead
+  of `FixedWithBlock`. Any code that creates blocks directly, rather than using
+  the `BlockBuilder` returned from the `Type`, will need to be updated. ({issue}`492`)
+- Remove `FixedWidthBlock`. Use one of the `*ArrayBlock` classes instead. ({issue}`492`)
+- Add support for simple constraint pushdown into connectors via the
+  `ConnectorMetadata.applyFilter()` method. ({issue}`541`)
diff --git a/docs/src/main/sphinx/release/release-307.rst b/docs/src/main/sphinx/release/release-307.rst
deleted file mode 100644
index 45c3a5149506..000000000000
--- a/docs/src/main/sphinx/release/release-307.rst
+++ /dev/null
@@ -1,75 +0,0 @@
-========================
-Release 307 (3 Apr 2019)
-========================
-
-General
--------
-
-* Fix cleanup of spill files for queries using window functions or ``ORDER BY``. (:issue:`543`)
-* Optimize queries containing ``ORDER BY`` together with ``LIMIT`` over an ``OUTER JOIN``
-  by pushing ``ORDER BY`` and ``LIMIT`` to the outer side of the join. (:issue:`419`)
-* Improve performance of table scans for data sources that produce tiny pages. (:issue:`467`)
-* Improve performance of ``IN`` subquery expressions that contain a ``DISTINCT`` clause. (:issue:`551`)
-* Expand support of types handled in ``EXPLAIN (TYPE IO)``. (:issue:`509`)
-* Add support for outer joins involving lateral derived tables (i.e., ``LATERAL``). (:issue:`390`)
-* Add support for setting table comments via the :doc:`/sql/comment` syntax. (:issue:`200`)
-
-Web UI
-------
-
-* Allow UI to work when opened as ``/ui`` (no trailing slash). (:issue:`500`)
-
-Security
---------
-
-* Make query result and cancellation URIs secure. Previously, an authenticated
-  user could potentially steal the result data of any running query. (:issue:`561`)
-
-Server RPM
-----------
-
-* Prevent JVM from allocating large amounts of native memory. The new configuration is applied
-  automatically when Presto is installed from RPM. When Presto is installed another way, or when
-  you provide your own ``jvm.config``, we recommend adding ``-Djdk.nio.maxCachedBufferSize=2000000``
-  to your ``jvm.config``. See :doc:`/installation/deployment` for details. (:issue:`542`)
-
-CLI
----
-
-* Always abort query in batch mode when CLI is killed. (:issue:`508`, :issue:`580`)
-
-JDBC driver
------------
-
-* Abort query synchronously when the ``ResultSet`` is closed or when the
-  ``Statement`` is cancelled. Previously, the abort was sent in the background,
-  allowing the JVM to exit before the abort was received by the server. (:issue:`580`)
-
-Hive connector
---------------
-
-* Add safety checks for Hive bucketing version. Hive 3.0 introduced a new
-  bucketing version that uses an incompatible hash function. The Hive connector
-  will treat such tables as not bucketed when reading and disallows writing. (:issue:`512`)
-* Add support for setting table comments via the :doc:`/sql/comment` syntax. (:issue:`200`)
-
-Other connectors
-----------------
-
-These changes apply to the MySQL, PostgreSQL, Redshift, and SQL Server connectors.
-
-* Fix reading and writing of ``timestamp`` values. Previously, an incorrect value
-  could be read, depending on the Presto JVM time zone. (:issue:`495`)
-* Add support for using a client-provided username and password. The credential
-  names can be configured using the ``user-credential-name`` and ``password-credential-name``
-  configuration properties. (:issue:`482`)
-
-SPI
----
-
-* ``LongDecimalType`` and ``IpAddressType`` now use ``Int128ArrayBlock`` instead
-  of ``FixedWithBlock``. Any code that creates blocks directly, rather than using
-  the ``BlockBuilder`` returned from the ``Type``, will need to be updated. (:issue:`492`)
-* Remove ``FixedWidthBlock``. Use one of the ``*ArrayBlock`` classes instead. (:issue:`492`)
-* Add support for simple constraint pushdown into connectors via the
-  ``ConnectorMetadata.applyFilter()`` method. (:issue:`541`)
diff --git a/docs/src/main/sphinx/release/release-308.md b/docs/src/main/sphinx/release/release-308.md
new file mode 100644
index 000000000000..b2e60d237311
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-308.md
@@ -0,0 +1,56 @@
+# Release 308 (11 Apr 2019)
+
+## General
+
+- Fix a regression that prevented the server from starting on Java 9+. ({issue}`610`)
+- Fix correctness issue for queries involving `FULL OUTER JOIN` and `coalesce`. ({issue}`622`)
+
+## Security
+
+- Add authorization for listing table columns. ({issue}`507`)
+
+## CLI
+
+- Add option for specifying Kerberos service principal pattern. ({issue}`597`)
+
+## JDBC driver
+
+- Correctly report precision and column display size in `ResultSetMetaData`
+  for `char` and `varchar` columns. ({issue}`615`)
+- Add option for specifying Kerberos service principal pattern. ({issue}`597`)
+
+## Hive connector
+
+- Fix regression that could cause queries to fail with `Query can potentially
+  read more than X partitions` error. ({issue}`619`)
+- Improve ORC read performance significantly. For TPC-DS, this saves about 9.5% of
+  total CPU when running over gzip-compressed data. ({issue}`555`)
+- Require access to a table (any privilege) in order to list the columns. ({issue}`507`)
+- Add directory listing cache for specific tables. The list of tables is specified
+  using the  `hive.file-status-cache-tables` configuration property. ({issue}`343`)
+
+## MySQL connector
+
+- Fix `ALTER TABLE ... RENAME TO ...` statement. ({issue}`586`)
+- Push simple `LIMIT` queries into the external database. ({issue}`589`)
+
+## PostgreSQL connector
+
+- Push simple `LIMIT` queries into the external database. ({issue}`589`)
+
+## Redshift connector
+
+- Push simple `LIMIT` queries into the external database. ({issue}`589`)
+
+## SQL Server connector
+
+- Fix writing `varchar` values with non-Latin characters in `CREATE TABLE AS`. ({issue}`573`)
+- Support writing `varchar` and `char` values with length longer than 4000
+  characters in `CREATE TABLE AS`. ({issue}`573`)
+- Support writing `boolean` values in `CREATE TABLE AS`. ({issue}`573`)
+- Push simple `LIMIT` queries into the external database. ({issue}`589`)
+
+## Elasticsearch connector
+
+- Add support for Search Guard in Elasticsearch connector. Please refer to {doc}`/connector/elasticsearch`
+  for the relevant configuration properties. ({issue}`438`)
diff --git a/docs/src/main/sphinx/release/release-308.rst b/docs/src/main/sphinx/release/release-308.rst
deleted file mode 100644
index d74ebfad2276..000000000000
--- a/docs/src/main/sphinx/release/release-308.rst
+++ /dev/null
@@ -1,68 +0,0 @@
-=========================
-Release 308 (11 Apr 2019)
-=========================
-
-General
--------
-
-* Fix a regression that prevented the server from starting on Java 9+. (:issue:`610`)
-* Fix correctness issue for queries involving ``FULL OUTER JOIN`` and ``coalesce``. (:issue:`622`)
-
-Security
---------
-
-* Add authorization for listing table columns. (:issue:`507`)
-
-CLI
----
-
-* Add option for specifying Kerberos service principal pattern. (:issue:`597`)
-
-JDBC driver
------------
-
-* Correctly report precision and column display size in ``ResultSetMetaData``
-  for ``char`` and ``varchar`` columns. (:issue:`615`)
-* Add option for specifying Kerberos service principal pattern. (:issue:`597`)
-
-Hive connector
---------------
-
-* Fix regression that could cause queries to fail with ``Query can potentially
-  read more than X partitions`` error. (:issue:`619`)
-* Improve ORC read performance significantly. For TPC-DS, this saves about 9.5% of
-  total CPU when running over gzip-compressed data. (:issue:`555`)
-* Require access to a table (any privilege) in order to list the columns. (:issue:`507`)
-* Add directory listing cache for specific tables. The list of tables is specified
-  using the  ``hive.file-status-cache-tables`` configuration property. (:issue:`343`)
-
-MySQL connector
----------------
-
-* Fix ``ALTER TABLE ... RENAME TO ...`` statement. (:issue:`586`)
-* Push simple ``LIMIT`` queries into the external database. (:issue:`589`)
-
-PostgreSQL connector
---------------------
-
-* Push simple ``LIMIT`` queries into the external database. (:issue:`589`)
-
-Redshift connector
-------------------
-
-* Push simple ``LIMIT`` queries into the external database. (:issue:`589`)
-
-SQL Server connector
---------------------
-
-* Fix writing ``varchar`` values with non-Latin characters in ``CREATE TABLE AS``. (:issue:`573`)
-* Support writing ``varchar`` and ``char`` values with length longer than 4000
-  characters in ``CREATE TABLE AS``. (:issue:`573`)
-* Support writing ``boolean`` values in ``CREATE TABLE AS``. (:issue:`573`)
-* Push simple ``LIMIT`` queries into the external database. (:issue:`589`)
-
-Elasticsearch connector
------------------------
-
-* Add support for Search Guard in Elasticsearch connector. Please refer to :doc:`/connector/elasticsearch`
-  for the relevant configuration properties. (:issue:`438`)
diff --git a/docs/src/main/sphinx/release/release-309.md b/docs/src/main/sphinx/release/release-309.md
new file mode 100644
index 000000000000..62244a0c251d
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-309.md
@@ -0,0 +1,63 @@
+# Release 309 (25 Apr 2019)
+
+## General
+
+- Fix incorrect match result for {doc}`/functions/regexp` when pattern ends
+  with a word boundary matcher. This only affects the default `JONI` library.
+  ({issue}`661`)
+- Fix failures for queries involving spatial joins. ({issue}`652`)
+- Add support for `SphericalGeography` to {func}`ST_Area()`. ({issue}`383`)
+
+## Security
+
+- Add option for specifying the Kerberos GSS name type. ({issue}`645`)
+
+## Server RPM
+
+- Update default JVM configuration to recommended settings (see {doc}`/installation/deployment`).
+  ({issue}`642`)
+
+## Hive connector
+
+- Fix rare failure when reading `DECIMAL` values from ORC files. ({issue}`664`)
+- Add a hidden `$properties` table for each table that describes its Hive table
+  properties. For example, a table named `example` will have an associated
+  properties table named `example$properties`. ({issue}`268`)
+
+## MySQL connector
+
+- Match schema and table names case insensitively. This behavior can be enabled by setting
+  the `case-insensitive-name-matching` catalog configuration option to true. ({issue}`614`)
+
+## PostgreSQL connector
+
+- Add support for `ARRAY` type. ({issue}`317`)
+- Add support writing `TINYINT` values. ({issue}`317`)
+- Match schema and table names case insensitively. This behavior can be enabled by setting
+  the `case-insensitive-name-matching` catalog configuration option to true. ({issue}`614`)
+
+## Redshift connector
+
+- Match schema and table names case insensitively. This behavior can be enabled by setting
+  the `case-insensitive-name-matching` catalog configuration option to true. ({issue}`614`)
+
+## SQL Server connector
+
+- Match schema and table names case insensitively. This behavior can be enabled by setting
+  the `case-insensitive-name-matching` catalog configuration option to true. ({issue}`614`)
+
+## Cassandra connector
+
+- Allow reading from tables which have Cassandra column types that are not supported by Presto.
+  These columns will not be visible in Presto. ({issue}`592`)
+
+## SPI
+
+- Add session parameter to the `applyFilter()` and `applyLimit()` methods in
+  `ConnectorMetadata`. ({issue}`636`)
+
+:::{note}
+This is a backwards incompatible changes with the previous SPI.
+If you have written a connector that implements these methods,
+you will need to update your code before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-309.rst b/docs/src/main/sphinx/release/release-309.rst
deleted file mode 100644
index f14e6eca7c86..000000000000
--- a/docs/src/main/sphinx/release/release-309.rst
+++ /dev/null
@@ -1,77 +0,0 @@
-=========================
-Release 309 (25 Apr 2019)
-=========================
-
-General
--------
-
-* Fix incorrect match result for :doc:`/functions/regexp` when pattern ends
-  with a word boundary matcher. This only affects the default ``JONI`` library.
-  (:issue:`661`)
-* Fix failures for queries involving spatial joins. (:issue:`652`)
-* Add support for ``SphericalGeography`` to :func:`ST_Area()`. (:issue:`383`)
-
-Security
---------
-
-* Add option for specifying the Kerberos GSS name type. (:issue:`645`)
-
-Server RPM
-----------
-
-* Update default JVM configuration to recommended settings (see :doc:`/installation/deployment`).
-  (:issue:`642`)
-
-Hive connector
---------------
-
-* Fix rare failure when reading ``DECIMAL`` values from ORC files. (:issue:`664`)
-* Add a hidden ``$properties`` table for each table that describes its Hive table
-  properties. For example, a table named ``example`` will have an associated
-  properties table named ``example$properties``. (:issue:`268`)
-
-MySQL connector
----------------
-
-* Match schema and table names case insensitively. This behavior can be enabled by setting
-  the ``case-insensitive-name-matching`` catalog configuration option to true. (:issue:`614`)
-
-PostgreSQL connector
---------------------
-
-* Add support for ``ARRAY`` type. (:issue:`317`)
-* Add support writing ``TINYINT`` values. (:issue:`317`)
-* Match schema and table names case insensitively. This behavior can be enabled by setting
-  the ``case-insensitive-name-matching`` catalog configuration option to true. (:issue:`614`)
-
-
-Redshift connector
-------------------
-
-* Match schema and table names case insensitively. This behavior can be enabled by setting
-  the ``case-insensitive-name-matching`` catalog configuration option to true. (:issue:`614`)
-
-
-SQL Server connector
---------------------
-
-* Match schema and table names case insensitively. This behavior can be enabled by setting
-  the ``case-insensitive-name-matching`` catalog configuration option to true. (:issue:`614`)
-
-Cassandra connector
--------------------
-
-* Allow reading from tables which have Cassandra column types that are not supported by Presto.
-  These columns will not be visible in Presto. (:issue:`592`)
-
-SPI
----
-
-* Add session parameter to the ``applyFilter()`` and ``applyLimit()`` methods in
-  ``ConnectorMetadata``. (:issue:`636`)
-
-.. note::
-
-    This is a backwards incompatible changes with the previous SPI.
-    If you have written a connector that implements these methods,
-    you will need to update your code before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-310.md b/docs/src/main/sphinx/release/release-310.md
new file mode 100644
index 000000000000..63ab934e9115
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-310.md
@@ -0,0 +1,37 @@
+# Release 310 (3 May 2019)
+
+## General
+
+- Reduce compilation failures for expressions over types containing an extremely
+  large number of nested types. ({issue}`537`)
+- Fix error reporting when query fails with due to running out of memory. ({issue}`696`)
+- Improve performance of `JOIN` queries involving join keys of different types.
+  ({issue}`665`)
+- Add initial and experimental support for late materialization.
+  This feature can be enabled via `experimental.work-processor-pipelines`
+  feature config or via `work_processor_pipelines` session config.
+  Simple select queries of type `SELECT ... FROM table ORDER BY cols LIMIT n` can
+  experience significant CPU and performance improvement. ({issue}`602`)
+- Add support for `FETCH FIRST` syntax. ({issue}`666`)
+
+## CLI
+
+- Make the final query time consistent with query stats. ({issue}`692`)
+
+## Hive connector
+
+- Ignore boolean column statistics when the count is `-1`. ({issue}`241`)
+- Prevent failures for `information_schema` queries when a table has an invalid
+  storage format. ({issue}`568`)
+- Add support for assuming AWS role when accessing S3 or Glue. ({issue}`698`)
+- Add support for coercions between `DECIMAL`, `DOUBLE`, and `REAL` for
+  partition and table schema mismatch. ({issue}`352`)
+- Fix typo in Metastore recorder duration property name. ({issue}`711`)
+
+## PostgreSQL connector
+
+- Support for the `ARRAY` type has been disabled by default.  ({issue}`687`)
+
+## Blackhole connector
+
+- Support having tables with same name in different Blackhole schemas. ({issue}`550`)
diff --git a/docs/src/main/sphinx/release/release-310.rst b/docs/src/main/sphinx/release/release-310.rst
deleted file mode 100644
index 5bef65257037..000000000000
--- a/docs/src/main/sphinx/release/release-310.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-========================
-Release 310 (3 May 2019)
-========================
-
-General
--------
-
-* Reduce compilation failures for expressions over types containing an extremely
-  large number of nested types. (:issue:`537`)
-* Fix error reporting when query fails with due to running out of memory. (:issue:`696`)
-* Improve performance of ``JOIN`` queries involving join keys of different types.
-  (:issue:`665`)
-* Add initial and experimental support for late materialization.
-  This feature can be enabled via ``experimental.work-processor-pipelines``
-  feature config or via ``work_processor_pipelines`` session config.
-  Simple select queries of type ``SELECT ... FROM table ORDER BY cols LIMIT n`` can
-  experience significant CPU and performance improvement. (:issue:`602`)
-* Add support for ``FETCH FIRST`` syntax. (:issue:`666`)
-
-CLI
----
-
-* Make the final query time consistent with query stats. (:issue:`692`)
-
-Hive connector
---------------
-
-* Ignore boolean column statistics when the count is ``-1``. (:issue:`241`)
-* Prevent failures for ``information_schema`` queries when a table has an invalid
-  storage format. (:issue:`568`)
-* Add support for assuming AWS role when accessing S3 or Glue. (:issue:`698`)
-* Add support for coercions between ``DECIMAL``, ``DOUBLE``, and ``REAL`` for
-  partition and table schema mismatch. (:issue:`352`)
-* Fix typo in Metastore recorder duration property name. (:issue:`711`)
-
-PostgreSQL connector
---------------------
-
-* Support for the ``ARRAY`` type has been disabled by default.  (:issue:`687`)
-
-Blackhole connector
--------------------
-
-* Support having tables with same name in different Blackhole schemas. (:issue:`550`)
diff --git a/docs/src/main/sphinx/release/release-311.md b/docs/src/main/sphinx/release/release-311.md
new file mode 100644
index 000000000000..14add699e82c
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-311.md
@@ -0,0 +1,31 @@
+# Release 311 (14 May 2019)
+
+## General
+
+- Fix incorrect results for aggregation query that contains a `HAVING` clause but no
+  `GROUP BY` clause. ({issue}`733`)
+- Fix rare error when moving already completed query to a new memory pool. ({issue}`725`)
+- Fix leak in operator peak memory computations ({issue}`764`)
+- Improve consistency of reported query statistics. ({issue}`773`)
+- Add support for `OFFSET` syntax. ({issue}`732`)
+- Print cost metrics using appropriate units in the output of `EXPLAIN`. ({issue}`68`)
+- Add {func}`combinations` function. ({issue}`714`)
+
+## Hive connector
+
+- Add support for static AWS credentials for the Glue metastore. ({issue}`748`)
+
+## Cassandra connector
+
+- Support collections nested in other collections. ({issue}`657`)
+- Automatically discover the Cassandra protocol version when the previously required
+  `cassandra.protocol-version` configuration property is not set. ({issue}`596`)
+
+## Black Hole connector
+
+- Fix rendering of tables and columns in plans. ({issue}`728`)
+- Add table and column statistics. ({issue}`728`)
+
+## System connector
+
+- Add `system.metadata.table_comments` table that contains table comments. ({issue}`531`)
diff --git a/docs/src/main/sphinx/release/release-311.rst b/docs/src/main/sphinx/release/release-311.rst
deleted file mode 100644
index 98e71110d53e..000000000000
--- a/docs/src/main/sphinx/release/release-311.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-=========================
-Release 311 (14 May 2019)
-=========================
-
-General
--------
-
-* Fix incorrect results for aggregation query that contains a ``HAVING`` clause but no
-  ``GROUP BY`` clause. (:issue:`733`)
-* Fix rare error when moving already completed query to a new memory pool. (:issue:`725`)
-* Fix leak in operator peak memory computations (:issue:`764`)
-* Improve consistency of reported query statistics. (:issue:`773`)
-* Add support for ``OFFSET`` syntax. (:issue:`732`)
-* Print cost metrics using appropriate units in the output of ``EXPLAIN``. (:issue:`68`)
-* Add :func:`combinations` function. (:issue:`714`)
-
-Hive connector
-----------------
-
-* Add support for static AWS credentials for the Glue metastore. (:issue:`748`)
-
-Cassandra connector
--------------------
-
-* Support collections nested in other collections. (:issue:`657`)
-* Automatically discover the Cassandra protocol version when the previously required
-  ``cassandra.protocol-version`` configuration property is not set. (:issue:`596`)
-
-Black Hole connector
---------------------
-
-* Fix rendering of tables and columns in plans. (:issue:`728`)
-* Add table and column statistics. (:issue:`728`)
-
-System connector
-----------------
-
-* Add ``system.metadata.table_comments`` table that contains table comments. (:issue:`531`)
diff --git a/docs/src/main/sphinx/release/release-312.md b/docs/src/main/sphinx/release/release-312.md
new file mode 100644
index 000000000000..006c0d4b8bda
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-312.md
@@ -0,0 +1,65 @@
+# Release 312 (29 May 2019)
+
+## General
+
+- Fix incorrect results for queries using `IS [NOT] DISTINCT FROM`. ({issue}`795`)
+- Fix `array_distinct`, `array_intersect` semantics with respect to indeterminate
+  values (i.e., `NULL` or structural types containing `NULL`). ({issue}`559`)
+- Fix failure when the largest negative `BIGINT` value (`-9223372036854775808`) is used
+  as a constant in a query. ({issue}`805`)
+- Improve reliability for network errors when using Kerberos with
+  {doc}`/security/internal-communication`. ({issue}`838`)
+- Improve performance of `JOIN` queries involving inline tables (`VALUES`). ({issue}`743`)
+- Improve performance of queries containing duplicate expressions. ({issue}`730`)
+- Improve performance of queries involving comparisons between values of different types. ({issue}`731`)
+- Improve performance of queries containing redundant `ORDER BY` clauses in subqueries. This may
+  affect the semantics of queries that incorrectly rely on implementation-specific behavior. The
+  old behavior can be restored via the `skip_redundant_sort` session property or the
+  `optimizer.skip-redundant-sort` configuration property. ({issue}`818`)
+- Improve performance of `IN` predicates that contain subqueries. ({issue}`767`)
+- Improve support for correlated subqueries containing redundant `LIMIT` clauses. ({issue}`441`)
+- Add a new {ref}`uuid-type` type to represent UUIDs. ({issue}`755`)
+- Add {func}`uuid` function to generate random UUIDs. ({issue}`786`)
+- Add {doc}`/connector/phoenix`. ({issue}`672`)
+- Make semantic error name available in client protocol. ({issue}`790`)
+- Report operator statistics when `experimental.work-processor-pipelines`
+  is enabled. ({issue}`788`)
+
+## Server
+
+- Raise required Java version to 8u161. This version allows unlimited strength crypto. ({issue}`779`)
+- Show JVM configuration hint when JMX agent fails to start on Java 9+. ({issue}`838`)
+- Skip starting JMX agent on Java 9+ if it is already configured via JVM properties. ({issue}`838`)
+- Support configuring TrustStore for {doc}`/security/internal-communication` using the
+  `internal-communication.https.truststore.path` and `internal-communication.https.truststore.key`
+  configuration properties. The path can point at a Java KeyStore or a PEM file. ({issue}`785`)
+- Remove deprecated check for minimum number of workers before starting a coordinator.  Use the
+  `query-manager.required-workers` and `query-manager.required-workers-max-wait` configuration
+  properties instead. ({issue}`95`)
+
+## Hive connector
+
+- Fix `SHOW GRANTS` failure when metastore contains few tables. ({issue}`791`)
+- Fix failure reading from `information_schema.table_privileges` table when metastore
+  contains few tables. ({issue}`791`)
+- Use Hive naming convention for file names when writing to bucketed tables. ({issue}`822`)
+- Support new Hive bucketing conventions by allowing any number of files per bucket.
+  This allows reading from partitions that were inserted into multiple times by Hive,
+  or were written to by Hive on Tez (which does not create files for empty buckets).
+- Allow disabling the creation of files for empty buckets when writing data.
+  This behavior is enabled by  default for compatibility with previous versions of Presto,
+  but can be disabled using the `hive.create-empty-bucket-files` configuration property
+  or the `create_empty_bucket_files` session property. ({issue}`822`)
+
+## MySQL connector
+
+- Map MySQL `json` type to Presto `json` type. ({issue}`824`)
+
+## PostgreSQL connector
+
+- Add support for PostgreSQL's `TIMESTAMP WITH TIME ZONE` data type. ({issue}`640`)
+
+## SPI
+
+- Add support for pushing `TABLESAMPLE` into connectors via the
+  `ConnectorMetadata.applySample()` method. ({issue}`753`)
diff --git a/docs/src/main/sphinx/release/release-312.rst b/docs/src/main/sphinx/release/release-312.rst
deleted file mode 100644
index f659bb44037a..000000000000
--- a/docs/src/main/sphinx/release/release-312.rst
+++ /dev/null
@@ -1,73 +0,0 @@
-=========================
-Release 312 (29 May 2019)
-=========================
-
-General
--------
-
-* Fix incorrect results for queries using ``IS [NOT] DISTINCT FROM``. (:issue:`795`)
-* Fix ``array_distinct``, ``array_intersect`` semantics with respect to indeterminate
-  values (i.e., ``NULL`` or structural types containing ``NULL``). (:issue:`559`)
-* Fix failure when the largest negative ``BIGINT`` value (``-9223372036854775808``) is used
-  as a constant in a query. (:issue:`805`)
-* Improve reliability for network errors when using Kerberos with
-  :doc:`/security/internal-communication`. (:issue:`838`)
-* Improve performance of ``JOIN`` queries involving inline tables (``VALUES``). (:issue:`743`)
-* Improve performance of queries containing duplicate expressions. (:issue:`730`)
-* Improve performance of queries involving comparisons between values of different types. (:issue:`731`)
-* Improve performance of queries containing redundant ``ORDER BY`` clauses in subqueries. This may
-  affect the semantics of queries that incorrectly rely on implementation-specific behavior. The
-  old behavior can be restored via the ``skip_redundant_sort`` session property or the
-  ``optimizer.skip-redundant-sort`` configuration property. (:issue:`818`)
-* Improve performance of ``IN`` predicates that contain subqueries. (:issue:`767`)
-* Improve support for correlated subqueries containing redundant ``LIMIT`` clauses. (:issue:`441`)
-* Add a new :ref:`uuid_type` type to represent UUIDs. (:issue:`755`)
-* Add :func:`uuid` function to generate random UUIDs. (:issue:`786`)
-* Add :doc:`/connector/phoenix`. (:issue:`672`)
-* Make semantic error name available in client protocol. (:issue:`790`)
-* Report operator statistics when ``experimental.work-processor-pipelines``
-  is enabled. (:issue:`788`)
-
-Server
-------
-
-* Raise required Java version to 8u161. This version allows unlimited strength crypto. (:issue:`779`)
-* Show JVM configuration hint when JMX agent fails to start on Java 9+. (:issue:`838`)
-* Skip starting JMX agent on Java 9+ if it is already configured via JVM properties. (:issue:`838`)
-* Support configuring TrustStore for :doc:`/security/internal-communication` using the
-  ``internal-communication.https.truststore.path`` and ``internal-communication.https.truststore.key``
-  configuration properties. The path can point at a Java KeyStore or a PEM file. (:issue:`785`)
-* Remove deprecated check for minimum number of workers before starting a coordinator.  Use the
-  ``query-manager.required-workers`` and ``query-manager.required-workers-max-wait`` configuration
-  properties instead. (:issue:`95`)
-
-Hive connector
---------------
-
-* Fix ``SHOW GRANTS`` failure when metastore contains few tables. (:issue:`791`)
-* Fix failure reading from ``information_schema.table_privileges`` table when metastore
-  contains few tables. (:issue:`791`)
-* Use Hive naming convention for file names when writing to bucketed tables. (:issue:`822`)
-* Support new Hive bucketing conventions by allowing any number of files per bucket.
-  This allows reading from partitions that were inserted into multiple times by Hive,
-  or were written to by Hive on Tez (which does not create files for empty buckets).
-* Allow disabling the creation of files for empty buckets when writing data.
-  This behavior is enabled by  default for compatibility with previous versions of Presto,
-  but can be disabled using the ``hive.create-empty-bucket-files`` configuration property
-  or the ``create_empty_bucket_files`` session property. (:issue:`822`)
-
-MySQL connector
----------------
-
-* Map MySQL ``json`` type to Presto ``json`` type. (:issue:`824`)
-
-PostgreSQL connector
---------------------
-
-* Add support for PostgreSQL's ``TIMESTAMP WITH TIME ZONE`` data type. (:issue:`640`)
-
-SPI
----
-
-* Add support for pushing ``TABLESAMPLE`` into connectors via the
-  ``ConnectorMetadata.applySample()`` method. (:issue:`753`)
diff --git a/docs/src/main/sphinx/release/release-313.md b/docs/src/main/sphinx/release/release-313.md
new file mode 100644
index 000000000000..a191d7629b57
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-313.md
@@ -0,0 +1,20 @@
+# Release 313 (31 May 2019)
+
+## General
+
+- Fix leak in operator peak memory computations. ({issue}`843`)
+- Fix incorrect results for queries involving `GROUPING SETS` and `LIMIT`. ({issue}`864`)
+- Add compression and encryption support for {doc}`/admin/spill`. ({issue}`778`)
+
+## CLI
+
+- Fix failure when selecting a value of type {ref}`uuid-type`. ({issue}`854`)
+
+## JDBC driver
+
+- Fix failure when selecting a value of type {ref}`uuid-type`. ({issue}`854`)
+
+## Phoenix connector
+
+- Allow matching schema and table names case insensitively. This can be enabled by setting
+  the `case-insensitive-name-matching` configuration property to true. ({issue}`872`)
diff --git a/docs/src/main/sphinx/release/release-313.rst b/docs/src/main/sphinx/release/release-313.rst
deleted file mode 100644
index 0d9062c17ef3..000000000000
--- a/docs/src/main/sphinx/release/release-313.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-=========================
-Release 313 (31 May 2019)
-=========================
-
-General
--------
-
-* Fix leak in operator peak memory computations. (:issue:`843`)
-* Fix incorrect results for queries involving ``GROUPING SETS`` and ``LIMIT``. (:issue:`864`)
-* Add compression and encryption support for :doc:`/admin/spill`. (:issue:`778`)
-
-CLI
----
-
-* Fix failure when selecting a value of type :ref:`uuid_type`. (:issue:`854`)
-
-JDBC driver
------------
-
-* Fix failure when selecting a value of type :ref:`uuid_type`. (:issue:`854`)
-
-Phoenix connector
--------------------
-
-* Allow matching schema and table names case insensitively. This can be enabled by setting
-  the ``case-insensitive-name-matching`` configuration property to true. (:issue:`872`)
diff --git a/docs/src/main/sphinx/release/release-314.md b/docs/src/main/sphinx/release/release-314.md
new file mode 100644
index 000000000000..1298f9b29eeb
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-314.md
@@ -0,0 +1,64 @@
+# Release 314 (7 Jun 2019)
+
+## General
+
+- Fix incorrect results for `BETWEEN` involving `NULL` values. ({issue}`877`)
+- Fix query history leak in coordinator. ({issue}`939`, {issue}`944`)
+- Fix idle client timeout handling. ({issue}`947`)
+- Improve performance of {func}`json_parse` function. ({issue}`904`)
+- Visualize plan structure in `EXPLAIN` output. ({issue}`888`)
+- Add support for positional access to `ROW` fields via the subscript
+  operator. ({issue}`860`)
+
+## CLI
+
+- Add JSON output format. ({issue}`878`)
+
+## Web UI
+
+- Fix queued queries counter in UI. ({issue}`894`)
+
+## Server RPM
+
+- Change default location of the `http-request.log` to `/var/log/presto`. Previously,
+  the log would be located in `/var/lib/presto/data/var/log` by default. ({issue}`919`)
+
+## Hive connector
+
+- Fix listing tables and views from Hive 2.3+ Metastore on certain databases,
+  including Derby and Oracle. This fixes `SHOW TABLES`, `SHOW VIEWS` and
+  reading from `information_schema.tables` table. ({issue}`833`)
+- Fix handling of Avro tables with `avro.schema.url` defined in Hive
+  `SERDEPROPERTIES`. ({issue}`898`)
+- Fix regression that caused ORC bloom filters to be ignored. ({issue}`921`)
+- Add support for reading LZ4 and ZSTD compressed Parquet data. ({issue}`910`)
+- Add support for writing ZSTD compressed ORC data. ({issue}`910`)
+- Add support for configuring ZSTD and LZ4 as default compression methods via the
+  `hive.compression-codec` configuration option. ({issue}`910`)
+- Do not allow inserting into text format tables that have a header or footer. ({issue}`891`)
+- Add `textfile_skip_header_line_count` and `textfile_skip_footer_line_count` table properties
+  for text format tables that specify the number of header and footer lines. ({issue}`845`)
+- Add `hive.max-splits-per-second` configuration property to allow throttling
+  the split discovery rate, which can reduce load on the file system. ({issue}`534`)
+- Support overwriting unpartitioned tables for insert queries. ({issue}`924`)
+
+## PostgreSQL connector
+
+- Support PostgreSQL arrays declared using internal type
+  name, for example `_int4` (rather than `int[]`). ({issue}`659`)
+
+## Elasticsearch connector
+
+- Add support for mixed-case field names. ({issue}`887`)
+
+## Base-JDBC connector library
+
+- Allow connectors to customize how they store `NULL` values. ({issue}`918`)
+
+## SPI
+
+- Expose the SQL text of the executed prepared statement to `EventListener`. ({issue}`908`)
+- Deprecate table layouts for `ConnectorMetadata.makeCompatiblePartitioning()`. ({issue}`689`)
+- Add support for delete pushdown into connectors via the `ConnectorMetadata.applyDelete()`
+  and `ConnectorMetadata.executeDelete()` methods. ({issue}`689`)
+- Allow connectors without distributed tables. ({issue}`893`)
diff --git a/docs/src/main/sphinx/release/release-314.rst b/docs/src/main/sphinx/release/release-314.rst
deleted file mode 100644
index c24b958c475b..000000000000
--- a/docs/src/main/sphinx/release/release-314.rst
+++ /dev/null
@@ -1,75 +0,0 @@
-=========================
-Release 314 (7 Jun 2019)
-=========================
-
-General
--------
-
-* Fix incorrect results for ``BETWEEN`` involving ``NULL`` values. (:issue:`877`)
-* Fix query history leak in coordinator. (:issue:`939`, :issue:`944`)
-* Fix idle client timeout handling. (:issue:`947`)
-* Improve performance of :func:`json_parse` function. (:issue:`904`)
-* Visualize plan structure in ``EXPLAIN`` output. (:issue:`888`)
-* Add support for positional access to ``ROW`` fields via the subscript
-  operator. (:issue:`860`)
-
-CLI
----
-
-* Add JSON output format. (:issue:`878`)
-
-Web UI
-------
-
-* Fix queued queries counter in UI. (:issue:`894`)
-
-Server RPM
-----------
-
-* Change default location of the ``http-request.log`` to ``/var/log/presto``. Previously,
-  the log would be located in ``/var/lib/presto/data/var/log`` by default. (:issue:`919`)
-
-Hive connector
---------------
-
-* Fix listing tables and views from Hive 2.3+ Metastore on certain databases,
-  including Derby and Oracle. This fixes ``SHOW TABLES``, ``SHOW VIEWS`` and
-  reading from ``information_schema.tables`` table. (:issue:`833`)
-* Fix handling of Avro tables with ``avro.schema.url`` defined in Hive
-  ``SERDEPROPERTIES``. (:issue:`898`)
-* Fix regression that caused ORC bloom filters to be ignored. (:issue:`921`)
-* Add support for reading LZ4 and ZSTD compressed Parquet data. (:issue:`910`)
-* Add support for writing ZSTD compressed ORC data. (:issue:`910`)
-* Add support for configuring ZSTD and LZ4 as default compression methods via the
-  ``hive.compression-codec`` configuration option. (:issue:`910`)
-* Do not allow inserting into text format tables that have a header or footer. (:issue:`891`)
-* Add ``textfile_skip_header_line_count`` and ``textfile_skip_footer_line_count`` table properties
-  for text format tables that specify the number of header and footer lines. (:issue:`845`)
-* Add ``hive.max-splits-per-second`` configuration property to allow throttling
-  the split discovery rate, which can reduce load on the file system. (:issue:`534`)
-* Support overwriting unpartitioned tables for insert queries. (:issue:`924`)
-
-PostgreSQL connector
---------------------
-
-* Support PostgreSQL arrays declared using internal type
-  name, for example ``_int4`` (rather than ``int[]``). (:issue:`659`)
-
-Elasticsearch connector
------------------------
-
-* Add support for mixed-case field names. (:issue:`887`)
-
-Base-JDBC connector library
----------------------------
-
-* Allow connectors to customize how they store ``NULL`` values. (:issue:`918`)
-
-SPI
----
-
-* Expose the SQL text of the executed prepared statement to ``EventListener``. (:issue:`908`)
-* Deprecate table layouts for ``ConnectorMetadata.makeCompatiblePartitioning()``. (:issue:`689`)
-* Add support for delete pushdown into connectors via the ``ConnectorMetadata.applyDelete()``
-  and ``ConnectorMetadata.executeDelete()`` methods. (:issue:`689`)
-* Allow connectors without distributed tables. (:issue:`893`)
diff --git a/docs/src/main/sphinx/release/release-315.md b/docs/src/main/sphinx/release/release-315.md
new file mode 100644
index 000000000000..b1a9ed1a1843
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-315.md
@@ -0,0 +1,50 @@
+# Release 315 (14 Jun 2019)
+
+## General
+
+- Fix incorrect results when dividing certain decimal numbers. ({issue}`958`)
+- Add support for `FETCH FIRST ... WITH TIES` syntax. ({issue}`832`)
+- Add locality awareness to default split scheduler. ({issue}`680`)
+- Add {func}`format` function. ({issue}`548`)
+
+## Server RPM
+
+- Require JDK version 8u161+ during installation, which is the version the server requires. ({issue}`983`)
+
+## CLI
+
+- Fix alignment of nulls for numeric columns in aligned output format. ({issue}`871`)
+
+## Hive connector
+
+- Fix regression in partition pruning for certain query shapes. ({issue}`984`)
+- Correctly identify EMRFS as S3 when deciding to use a temporary location for writes. ({issue}`935`)
+- Allow creating external tables on S3 even if the location does not exist. ({issue}`935`)
+- Add support for UTF-8 ORC bloom filters. ({issue}`914`)
+- Add support for `DATE`, `TIMESTAMP` and `REAL` in ORC bloom filters. ({issue}`967`)
+- Disable usage of old, non UTF-8, ORC bloom filters for `VARCHAR` and `CHAR`. ({issue}`914`)
+- Allow logging all calls to Hive Thrift metastore service. This can be enabled
+  by turning on `DEBUG` logging for
+  `io.prestosql.plugin.hive.metastore.thrift.ThriftHiveMetastoreClient`. ({issue}`946`)
+
+## MongoDB connector
+
+- Fix query failure when `ROW` with an `ObjectId` field is used as a join key. ({issue}`933`)
+- Add cast from `ObjectId` to `VARCHAR`. ({issue}`933`)
+
+## SPI
+
+- Allow connectors to provide view definitions. `ConnectorViewDefinition` now contains
+  the real view definition rather than an opaque blob. Connectors that support view storage
+  can use the JSON representation of that class as a stable storage format. The JSON
+  representation is the same as the previous opaque blob, thus all existing view
+  definitions will continue to work. ({issue}`976`)
+- Add `getView()` method to `ConnectorMetadata` as a replacement for `getViews()`.
+  The `getViews()` method now exists only as an optional method for connectors that
+  can efficiently support bulk retrieval of views and has a different signature. ({issue}`976`)
+
+:::{note}
+These are backwards incompatible changes with the previous SPI.
+If you have written a connector that supports views, you will
+need to update your code before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-315.rst b/docs/src/main/sphinx/release/release-315.rst
deleted file mode 100644
index 35fdc28be37b..000000000000
--- a/docs/src/main/sphinx/release/release-315.rst
+++ /dev/null
@@ -1,58 +0,0 @@
-=========================
-Release 315 (14 Jun 2019)
-=========================
-
-General
--------
-
-* Fix incorrect results when dividing certain decimal numbers. (:issue:`958`)
-* Add support for ``FETCH FIRST ... WITH TIES`` syntax. (:issue:`832`)
-* Add locality awareness to default split scheduler. (:issue:`680`)
-* Add :func:`format` function. (:issue:`548`)
-
-Server RPM
-----------
-
-* Require JDK version 8u161+ during installation, which is the version the server requires. (:issue:`983`)
-
-CLI
----
-
-* Fix alignment of nulls for numeric columns in aligned output format. (:issue:`871`)
-
-Hive connector
---------------
-
-* Fix regression in partition pruning for certain query shapes. (:issue:`984`)
-* Correctly identify EMRFS as S3 when deciding to use a temporary location for writes. (:issue:`935`)
-* Allow creating external tables on S3 even if the location does not exist. (:issue:`935`)
-* Add support for UTF-8 ORC bloom filters. (:issue:`914`)
-* Add support for ``DATE``, ``TIMESTAMP`` and ``REAL`` in ORC bloom filters. (:issue:`967`)
-* Disable usage of old, non UTF-8, ORC bloom filters for ``VARCHAR`` and ``CHAR``. (:issue:`914`)
-* Allow logging all calls to Hive Thrift metastore service. This can be enabled
-  by turning on ``DEBUG`` logging for
-  ``io.prestosql.plugin.hive.metastore.thrift.ThriftHiveMetastoreClient``. (:issue:`946`)
-
-MongoDB connector
------------------
-
-* Fix query failure when ``ROW`` with an ``ObjectId`` field is used as a join key. (:issue:`933`)
-* Add cast from ``ObjectId`` to ``VARCHAR``. (:issue:`933`)
-
-SPI
----
-
-* Allow connectors to provide view definitions. ``ConnectorViewDefinition`` now contains
-  the real view definition rather than an opaque blob. Connectors that support view storage
-  can use the JSON representation of that class as a stable storage format. The JSON
-  representation is the same as the previous opaque blob, thus all existing view
-  definitions will continue to work. (:issue:`976`)
-* Add ``getView()`` method to ``ConnectorMetadata`` as a replacement for ``getViews()``.
-  The ``getViews()`` method now exists only as an optional method for connectors that
-  can efficiently support bulk retrieval of views and has a different signature. (:issue:`976`)
-
-.. note::
-
-    These are backwards incompatible changes with the previous SPI.
-    If you have written a connector that supports views, you will
-    need to update your code before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-316.md b/docs/src/main/sphinx/release/release-316.md
new file mode 100644
index 000000000000..3d6bddbf81ac
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-316.md
@@ -0,0 +1,54 @@
+# Release 316 (8 Jul 2019)
+
+## General
+
+- Fix `date_format` function failure when format string contains non-ASCII
+  characters. ({issue}`1056`)
+- Improve performance of queries using `UNNEST`.  ({issue}`901`)
+- Improve error message when statement parsing fails. ({issue}`1042`)
+
+## CLI
+
+- Fix refresh of completion cache when catalog or schema is changed. ({issue}`1016`)
+- Allow reading password from console when stdout is a pipe. ({issue}`982`)
+
+## Hive connector
+
+- Acquire S3 credentials from the default AWS locations if not configured explicitly. ({issue}`741`)
+- Only allow using roles and grants with SQL standard based authorization. ({issue}`972`)
+- Add support for `CSV` file format. ({issue}`920`)
+- Support reading from and writing to Hadoop encryption zones (Hadoop KMS). ({issue}`997`)
+- Collect column statistics on write by default. This can be disabled using the
+  `hive.collect-column-statistics-on-write` configuration property or the
+  `collect_column_statistics_on_write` session property. ({issue}`981`)
+- Eliminate unused idle threads when using the metastore cache. ({issue}`1061`)
+
+## PostgreSQL connector
+
+- Add support for columns of type `UUID`. ({issue}`1011`)
+- Export JMX statistics for various JDBC and connector operations. ({issue}`906`).
+
+## MySQL connector
+
+- Export JMX statistics for various JDBC and connector operations. ({issue}`906`).
+
+## Redshift connector
+
+- Export JMX statistics for various JDBC and connector operations. ({issue}`906`).
+
+## SQL Server connector
+
+- Export JMX statistics for various JDBC and connector operations. ({issue}`906`).
+
+## TPC-H connector
+
+- Fix `SHOW TABLES` failure when used with a hidden schema. ({issue}`1005`)
+
+## TPC-DS connector
+
+- Fix `SHOW TABLES` failure when used with a hidden schema. ({issue}`1005`)
+
+## SPI
+
+- Add support for pushing simple column and row field reference expressions into
+  connectors via the `ConnectorMetadata.applyProjection()` method. ({issue}`676`)
diff --git a/docs/src/main/sphinx/release/release-316.rst b/docs/src/main/sphinx/release/release-316.rst
deleted file mode 100644
index 85d3b6b87928..000000000000
--- a/docs/src/main/sphinx/release/release-316.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-========================
-Release 316 (8 Jul 2019)
-========================
-
-General
--------
-
-* Fix ``date_format`` function failure when format string contains non-ASCII
-  characters. (:issue:`1056`)
-* Improve performance of queries using ``UNNEST``.  (:issue:`901`)
-* Improve error message when statement parsing fails. (:issue:`1042`)
-
-CLI
----
-
-* Fix refresh of completion cache when catalog or schema is changed. (:issue:`1016`)
-* Allow reading password from console when stdout is a pipe. (:issue:`982`)
-
-Hive connector
---------------
-
-* Acquire S3 credentials from the default AWS locations if not configured explicitly. (:issue:`741`)
-* Only allow using roles and grants with SQL standard based authorization. (:issue:`972`)
-* Add support for ``CSV`` file format. (:issue:`920`)
-* Support reading from and writing to Hadoop encryption zones (Hadoop KMS). (:issue:`997`)
-* Collect column statistics on write by default. This can be disabled using the
-  ``hive.collect-column-statistics-on-write`` configuration property or the
-  ``collect_column_statistics_on_write`` session property. (:issue:`981`)
-* Eliminate unused idle threads when using the metastore cache. (:issue:`1061`)
-
-PostgreSQL connector
---------------------
-
-* Add support for columns of type ``UUID``. (:issue:`1011`)
-* Export JMX statistics for various JDBC and connector operations. (:issue:`906`).
-
-MySQL connector
----------------
-
-* Export JMX statistics for various JDBC and connector operations. (:issue:`906`).
-
-Redshift connector
-------------------
-
-* Export JMX statistics for various JDBC and connector operations. (:issue:`906`).
-
-SQL Server connector
---------------------
-
-* Export JMX statistics for various JDBC and connector operations. (:issue:`906`).
-
-TPC-H connector
----------------
-
-* Fix ``SHOW TABLES`` failure when used with a hidden schema. (:issue:`1005`)
-
-TPC-DS connector
-----------------
-
-* Fix ``SHOW TABLES`` failure when used with a hidden schema. (:issue:`1005`)
-
-SPI
----
-
-* Add support for pushing simple column and row field reference expressions into
-  connectors via the ``ConnectorMetadata.applyProjection()`` method. (:issue:`676`)
diff --git a/docs/src/main/sphinx/release/release-317.md b/docs/src/main/sphinx/release/release-317.md
new file mode 100644
index 000000000000..03b29012d83c
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-317.md
@@ -0,0 +1,61 @@
+# Release 317 (1 Aug 2019)
+
+## General
+
+- Fix {func}`url_extract_parameter` when the query string contains an encoded `&` or `=` character.
+- Export MBeans from the `db` resource group configuration manager. ({issue}`1151`)
+- Add {func}`all_match`, {func}`any_match`, and {func}`none_match` functions. ({issue}`1045`)
+- Add support for fractional weights in {func}`approx_percentile`. ({issue}`1168`)
+- Add support for node dynamic filtering for semi-joins and filters when the experimental
+  WorkProcessor pipelines feature is enabled. ({issue}`1075`, {issue}`1155`, {issue}`1119`)
+- Allow overriding session time zone for clients via the
+  `sql.forced-session-time-zone` configuration property. ({issue}`1164`)
+
+## Web UI
+
+- Fix tooltip visibility on stage performance details page. ({issue}`1113`)
+- Add planning time to query details page. ({issue}`1115`)
+
+## Security
+
+- Allow schema owner to create, drop, and rename schema when using file-based
+  connector access control. ({issue}`1139`)
+- Allow respecting the `X-Forwarded-For` header when retrieving the IP address
+  of the client submitting the query. This information is available in the
+  `remoteClientAddress` field of the `QueryContext` class for query events.
+  The behavior can be controlled via the `dispatcher.forwarded-header`
+  configuration property, as the header should only be used when the Presto
+  coordinator is behind a proxy. ({issue}`1033`)
+
+## JDBC driver
+
+- Fix `DatabaseMetaData.getURL()` to include the `jdbc:` prefix. ({issue}`1211`)
+
+## Elasticsearch connector
+
+- Add support for nested fields. ({issue}`1001`)
+
+## Hive connector
+
+- Fix bucketing version safety check to correctly disallow writes
+  to tables that use an unsupported bucketing version. ({issue}`1199`)
+- Fix metastore error handling when metastore debug logging is enabled. ({issue}`1152`)
+- Improve performance of file listings in `system.sync_partition_metadata` procedure,
+  especially for S3. ({issue}`1093`)
+
+## Kudu connector
+
+- Update Kudu client library version to `1.10.0`. ({issue}`1086`)
+
+## MongoDB connector
+
+- Allow passwords to contain the `:` or `@` characters. ({issue}`1094`)
+
+## PostgreSQL connector
+
+- Add support for reading `hstore` data type. ({issue}`1101`)
+
+## SPI
+
+- Allow delete to be implemented for non-legacy connectors. ({issue}`1015`)
+- Remove deprecated method from `ConnectorPageSourceProvider`. ({issue}`1095`)
diff --git a/docs/src/main/sphinx/release/release-317.rst b/docs/src/main/sphinx/release/release-317.rst
deleted file mode 100644
index 7b8826cf8bbc..000000000000
--- a/docs/src/main/sphinx/release/release-317.rst
+++ /dev/null
@@ -1,73 +0,0 @@
-========================
-Release 317 (1 Aug 2019)
-========================
-
-General
--------
-
-* Fix :func:`url_extract_parameter` when the query string contains an encoded ``&`` or ``=`` character.
-* Export MBeans from the ``db`` resource group configuration manager. (:issue:`1151`)
-* Add :func:`all_match`, :func:`any_match`, and :func:`none_match` functions. (:issue:`1045`)
-* Add support for fractional weights in :func:`approx_percentile`. (:issue:`1168`)
-* Add support for node dynamic filtering for semi-joins and filters when the experimental
-  WorkProcessor pipelines feature is enabled. (:issue:`1075`, :issue:`1155`, :issue:`1119`)
-* Allow overriding session time zone for clients via the
-  ``sql.forced-session-time-zone`` configuration property. (:issue:`1164`)
-
-Web UI
-------
-
-* Fix tooltip visibility on stage performance details page. (:issue:`1113`)
-* Add planning time to query details page. (:issue:`1115`)
-
-Security
---------
-
-* Allow schema owner to create, drop, and rename schema when using file-based
-  connector access control. (:issue:`1139`)
-* Allow respecting the ``X-Forwarded-For`` header when retrieving the IP address
-  of the client submitting the query. This information is available in the
-  ``remoteClientAddress`` field of the ``QueryContext`` class for query events.
-  The behavior can be controlled via the ``dispatcher.forwarded-header``
-  configuration property, as the header should only be used when the Presto
-  coordinator is behind a proxy. (:issue:`1033`)
-
-JDBC driver
------------
-
-* Fix ``DatabaseMetaData.getURL()`` to include the ``jdbc:`` prefix. (:issue:`1211`)
-
-Elasticsearch connector
------------------------
-
-* Add support for nested fields. (:issue:`1001`)
-
-Hive connector
---------------
-
-* Fix bucketing version safety check to correctly disallow writes
-  to tables that use an unsupported bucketing version. (:issue:`1199`)
-* Fix metastore error handling when metastore debug logging is enabled. (:issue:`1152`)
-* Improve performance of file listings in ``system.sync_partition_metadata`` procedure,
-  especially for S3. (:issue:`1093`)
-
-Kudu connector
---------------
-
-* Update Kudu client library version to ``1.10.0``. (:issue:`1086`)
-
-MongoDB connector
------------------
-
-* Allow passwords to contain the ``:`` or ``@`` characters. (:issue:`1094`)
-
-PostgreSQL connector
---------------------
-
-* Add support for reading ``hstore`` data type. (:issue:`1101`)
-
-SPI
----
-
-* Allow delete to be implemented for non-legacy connectors. (:issue:`1015`)
-* Remove deprecated method from ``ConnectorPageSourceProvider``. (:issue:`1095`)
diff --git a/docs/src/main/sphinx/release/release-318.md b/docs/src/main/sphinx/release/release-318.md
new file mode 100644
index 000000000000..5c3025bbbc4d
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-318.md
@@ -0,0 +1,97 @@
+# Release 318 (26 Aug 2019)
+
+## General
+
+- Fix query failure when using `DISTINCT FROM` with the `UUID` or
+  `IPADDRESS` types. ({issue}`1180`)
+- Improve query performance when `optimize_hash_generation` is enabled. ({issue}`1071`)
+- Improve performance of information schema tables. ({issue}`999`, {issue}`1306`)
+- Rename `http.server.authentication.*` configuration options to `http-server.authentication.*`. ({issue}`1270`)
+- Change query CPU tracking for resource groups to update periodically while
+  the query is running. Previously, CPU usage would only update at query
+  completion. This improves resource management fairness when using
+  CPU-limited resource groups. ({issue}`1128`)
+- Remove `distributed_planning_time_ms` column from `system.runtime.queries`. ({issue}`1084`)
+- Add support for `Asia/Qostanay` time zone. ({issue}`1221`)
+- Add session properties that allow overriding the query per-node memory limits:
+  `query_max_memory_per_node` and `query_max_total_memory_per_node`. These properties
+  can be used to decrease limits for a query, but not to increase them. ({issue}`1212`)
+- Add {doc}`/connector/googlesheets`. ({issue}`1030`)
+- Add `planning_time_ms` column to the `system.runtime.queries` table that shows
+  the time spent on query planning. This is the same value that used to be in the
+  `analysis_time_ms` column, which was a misnomer. ({issue}`1084`)
+- Add {func}`last_day_of_month` function. ({issue}`1295`)
+- Add support for cancelling queries via the `system.runtime.kill_query` procedure when
+  they are in the queue or in the semantic analysis stage. ({issue}`1079`)
+- Add queries that are in the queue or in the semantic analysis stage to the
+  `system.runtime.queries` table. ({issue}`1079`)
+
+## Web UI
+
+- Display information about queries that are in the queue or in the semantic analysis
+  stage. ({issue}`1079`)
+- Add support for cancelling queries that are in the queue or in the semantic analysis
+  stage. ({issue}`1079`)
+
+## Hive connector
+
+- Fix query failure due to missing credentials while writing empty bucket files. ({issue}`1298`)
+- Fix bucketing of `NaN` values of `real` type. Previously `NaN` values
+  could be assigned a wrong bucket. ({issue}`1336`)
+- Fix reading `RCFile` collection delimiter set by Hive version earlier than 3.0. ({issue}`1321`)
+- Return proper error when selecting `"$bucket"` column from a table using
+  Hive bucketing v2. ({issue}`1336`)
+- Improve performance of S3 object listing. ({issue}`1232`)
+- Improve performance when reading data from GCS. ({issue}`1200`)
+- Add support for reading data from S3 Requester Pays buckets. This can be enabled
+  using the `hive.s3.requester-pays.enabled` configuration property. ({issue}`1241`)
+- Allow inserting into bucketed, unpartitioned tables. ({issue}`1127`)
+- Allow inserting into existing partitions of bucketed, partitioned tables. ({issue}`1347`)
+
+## PostgreSQL connector
+
+- Add support for providing JDBC credential in a separate file. This can be enabled by
+  setting the `credential-provider.type=FILE` and `connection-credential-file`
+  config options in the catalog properties file. ({issue}`1124`)
+- Allow logging all calls to `JdbcClient`. This can be enabled by turning
+  on `DEBUG` logging for `io.prestosql.plugin.jdbc.JdbcClient`. ({issue}`1274`)
+- Add possibility to force mapping of certain types to `varchar`. This can be enabled
+  by setting `jdbc-types-mapped-to-varchar` to comma-separated list of type names. ({issue}`186`)
+- Add support for PostgreSQL `timestamp[]` type. ({issue}`1023`, {issue}`1262`, {issue}`1328`)
+
+## MySQL connector
+
+- Add support for providing JDBC credential in a separate file. This can be enabled by
+  setting the `credential-provider.type=FILE` and `connection-credential-file`
+  config options in the catalog properties file. ({issue}`1124`)
+- Allow logging all calls to `JdbcClient`. This can be enabled by turning
+  on `DEBUG` logging for `io.prestosql.plugin.jdbc.JdbcClient`. ({issue}`1274`)
+- Add possibility to force mapping of certain types to `varchar`. This can be enabled
+  by setting `jdbc-types-mapped-to-varchar` to comma-separated list of type names. ({issue}`186`)
+
+## Redshift connector
+
+- Add support for providing JDBC credential in a separate file. This can be enabled by
+  setting the `credential-provider.type=FILE` and `connection-credential-file`
+  config options in the catalog properties file. ({issue}`1124`)
+- Allow logging all calls to `JdbcClient`. This can be enabled by turning
+  on `DEBUG` logging for `io.prestosql.plugin.jdbc.JdbcClient`. ({issue}`1274`)
+- Add possibility to force mapping of certain types to `varchar`. This can be enabled
+  by setting `jdbc-types-mapped-to-varchar` to comma-separated list of type names. ({issue}`186`)
+
+## SQL Server connector
+
+- Add support for providing JDBC credential in a separate file. This can be enabled by
+  setting the `credential-provider.type=FILE` and `connection-credential-file`
+  config options in the catalog properties file. ({issue}`1124`)
+- Allow logging all calls to `JdbcClient`. This can be enabled by turning
+  on `DEBUG` logging for `io.prestosql.plugin.jdbc.JdbcClient`. ({issue}`1274`)
+- Add possibility to force mapping of certain types to `varchar`. This can be enabled
+  by setting `jdbc-types-mapped-to-varchar` to comma-separated list of type names. ({issue}`186`)
+
+## SPI
+
+- Add `Block.isLoaded()` method. ({issue}`1216`)
+- Update security APIs to accept the new `ConnectorSecurityContext`
+  and `SystemSecurityContext` classes. ({issue}`171`)
+- Allow connectors to override minimal schedule split batch size. ({issue}`1251`)
diff --git a/docs/src/main/sphinx/release/release-318.rst b/docs/src/main/sphinx/release/release-318.rst
deleted file mode 100644
index e491e99ef4be..000000000000
--- a/docs/src/main/sphinx/release/release-318.rst
+++ /dev/null
@@ -1,107 +0,0 @@
-=========================
-Release 318 (26 Aug 2019)
-=========================
-
-General
--------
-
-* Fix query failure when using ``DISTINCT FROM`` with the ``UUID`` or
-  ``IPADDRESS`` types. (:issue:`1180`)
-* Improve query performance when ``optimize_hash_generation`` is enabled. (:issue:`1071`)
-* Improve performance of information schema tables. (:issue:`999`, :issue:`1306`)
-* Rename ``http.server.authentication.*`` configuration options to ``http-server.authentication.*``. (:issue:`1270`)
-* Change query CPU tracking for resource groups to update periodically while
-  the query is running. Previously, CPU usage would only update at query
-  completion. This improves resource management fairness when using
-  CPU-limited resource groups. (:issue:`1128`)
-* Remove ``distributed_planning_time_ms`` column from ``system.runtime.queries``. (:issue:`1084`)
-* Add support for ``Asia/Qostanay`` time zone. (:issue:`1221`)
-* Add session properties that allow overriding the query per-node memory limits:
-  ``query_max_memory_per_node`` and ``query_max_total_memory_per_node``. These properties
-  can be used to decrease limits for a query, but not to increase them. (:issue:`1212`)
-* Add :doc:`/connector/googlesheets`. (:issue:`1030`)
-* Add ``planning_time_ms`` column to the ``system.runtime.queries`` table that shows
-  the time spent on query planning. This is the same value that used to be in the
-  ``analysis_time_ms`` column, which was a misnomer. (:issue:`1084`)
-* Add :func:`last_day_of_month` function. (:issue:`1295`)
-* Add support for cancelling queries via the ``system.runtime.kill_query`` procedure when
-  they are in the queue or in the semantic analysis stage. (:issue:`1079`)
-* Add queries that are in the queue or in the semantic analysis stage to the
-  ``system.runtime.queries`` table. (:issue:`1079`)
-
-Web UI
-------
-
-* Display information about queries that are in the queue or in the semantic analysis
-  stage. (:issue:`1079`)
-* Add support for cancelling queries that are in the queue or in the semantic analysis
-  stage. (:issue:`1079`)
-
-Hive connector
---------------
-
-* Fix query failure due to missing credentials while writing empty bucket files. (:issue:`1298`)
-* Fix bucketing of ``NaN`` values of ``real`` type. Previously ``NaN`` values
-  could be assigned a wrong bucket. (:issue:`1336`)
-* Fix reading ``RCFile`` collection delimiter set by Hive version earlier than 3.0. (:issue:`1321`)
-* Return proper error when selecting ``"$bucket"`` column from a table using
-  Hive bucketing v2. (:issue:`1336`)
-* Improve performance of S3 object listing. (:issue:`1232`)
-* Improve performance when reading data from GCS. (:issue:`1200`)
-* Add support for reading data from S3 Requester Pays buckets. This can be enabled
-  using the ``hive.s3.requester-pays.enabled`` configuration property. (:issue:`1241`)
-* Allow inserting into bucketed, unpartitioned tables. (:issue:`1127`)
-* Allow inserting into existing partitions of bucketed, partitioned tables. (:issue:`1347`)
-
-PostgreSQL connector
---------------------
-
-* Add support for providing JDBC credential in a separate file. This can be enabled by
-  setting the ``credential-provider.type=FILE`` and ``connection-credential-file``
-  config options in the catalog properties file. (:issue:`1124`)
-* Allow logging all calls to ``JdbcClient``. This can be enabled by turning
-  on ``DEBUG`` logging for ``io.prestosql.plugin.jdbc.JdbcClient``. (:issue:`1274`)
-* Add possibility to force mapping of certain types to ``varchar``. This can be enabled
-  by setting ``jdbc-types-mapped-to-varchar`` to comma-separated list of type names. (:issue:`186`)
-* Add support for PostgreSQL ``timestamp[]`` type. (:issue:`1023`, :issue:`1262`, :issue:`1328`)
-
-MySQL connector
----------------
-
-* Add support for providing JDBC credential in a separate file. This can be enabled by
-  setting the ``credential-provider.type=FILE`` and ``connection-credential-file``
-  config options in the catalog properties file. (:issue:`1124`)
-* Allow logging all calls to ``JdbcClient``. This can be enabled by turning
-  on ``DEBUG`` logging for ``io.prestosql.plugin.jdbc.JdbcClient``. (:issue:`1274`)
-* Add possibility to force mapping of certain types to ``varchar``. This can be enabled
-  by setting ``jdbc-types-mapped-to-varchar`` to comma-separated list of type names. (:issue:`186`)
-
-Redshift connector
-------------------
-
-* Add support for providing JDBC credential in a separate file. This can be enabled by
-  setting the ``credential-provider.type=FILE`` and ``connection-credential-file``
-  config options in the catalog properties file. (:issue:`1124`)
-* Allow logging all calls to ``JdbcClient``. This can be enabled by turning
-  on ``DEBUG`` logging for ``io.prestosql.plugin.jdbc.JdbcClient``. (:issue:`1274`)
-* Add possibility to force mapping of certain types to ``varchar``. This can be enabled
-  by setting ``jdbc-types-mapped-to-varchar`` to comma-separated list of type names. (:issue:`186`)
-
-SQL Server connector
---------------------
-
-* Add support for providing JDBC credential in a separate file. This can be enabled by
-  setting the ``credential-provider.type=FILE`` and ``connection-credential-file``
-  config options in the catalog properties file. (:issue:`1124`)
-* Allow logging all calls to ``JdbcClient``. This can be enabled by turning
-  on ``DEBUG`` logging for ``io.prestosql.plugin.jdbc.JdbcClient``. (:issue:`1274`)
-* Add possibility to force mapping of certain types to ``varchar``. This can be enabled
-  by setting ``jdbc-types-mapped-to-varchar`` to comma-separated list of type names. (:issue:`186`)
-
-SPI
----
-
-* Add ``Block.isLoaded()`` method. (:issue:`1216`)
-* Update security APIs to accept the new ``ConnectorSecurityContext``
-  and ``SystemSecurityContext`` classes. (:issue:`171`)
-* Allow connectors to override minimal schedule split batch size. (:issue:`1251`)
diff --git a/docs/src/main/sphinx/release/release-319.md b/docs/src/main/sphinx/release/release-319.md
new file mode 100644
index 000000000000..fde505d290dd
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-319.md
@@ -0,0 +1,77 @@
+# Release 319 (22 Sep 2019)
+
+## General
+
+- Fix planning failure for queries involving `UNION` and `DISTINCT` aggregates. ({issue}`1510`)
+- Fix excessive runtime when parsing expressions involving `CASE`. ({issue}`1407`)
+- Fix fragment output size in `EXPLAIN ANALYZE` output. ({issue}`1345`)
+- Fix a rare failure when running `EXPLAIN ANALYZE` on a query containing
+  window functions. ({issue}`1401`)
+- Fix failure when querying `/v1/resourceGroupState` endpoint for non-existing resource
+  group. ({issue}`1368`)
+- Fix incorrect results when reading `information_schema.table_privileges` with
+  an equality predicate on `table_name` but without a predicate on `table_schema`.
+  ({issue}`1534`)
+- Fix planning failure due to coercion handling for correlated subqueries. ({issue}`1453`)
+- Improve performance of queries against `information_schema` tables. ({issue}`1329`)
+- Reduce metadata querying during planning. ({issue}`1308`, {issue}`1455`)
+- Improve performance of certain queries involving coercions and complex expressions in `JOIN`
+  conditions. ({issue}`1390`)
+- Include cost estimates in output of `EXPLAIN (TYPE IO)`. ({issue}`806`)
+- Improve support for correlated subqueries involving `ORDER BY` or `LIMIT`. ({issue}`1415`)
+- Improve performance of certain `JOIN` queries when automatic join ordering is enabled. ({issue}`1431`)
+- Allow setting the default session catalog and schema via the `sql.default-catalog`
+  and `sql.default-schema` configuration properties. ({issue}`1524`)
+- Add support for `IGNORE NULLS` for window functions. ({issue}`1244`)
+- Add support for `INNER` and `OUTER` joins involving `UNNEST`. ({issue}`1522`)
+- Rename `legacy` and `flat` {doc}`scheduler policies </admin/properties-node-scheduler>` to
+  `uniform` and `topology` respectively.  These can be configured via the `node-scheduler.policy`
+  configuration property. ({issue}`10491`)
+- Add `file` {doc}`network topology provider </admin/properties-node-scheduler>` which can be configured
+  via the `node-scheduler.network-topology.type` configuration property. ({issue}`1500`)
+- Add support for `SphericalGeography` to {func}`ST_Length`. ({issue}`1551`)
+
+## Security
+
+- Allow configuring read-only access in {doc}`/security/built-in-system-access-control`. ({issue}`1153`)
+- Add missing checks for schema create, rename, and drop in file-based `SystemAccessControl`. ({issue}`1153`)
+- Allow authentication over HTTP for forwarded requests containing the
+  `X-Forwarded-Proto` header. This is disabled by default, but can be enabled using the
+  `http-server.authentication.allow-forwarded-https` configuration property. ({issue}`1442`)
+
+## Web UI
+
+- Fix rendering bug in Query Timeline resulting in inconsistency of presented information after
+  query finishes. ({issue}`1371`)
+- Show total memory in Query Timeline instead of user memory. ({issue}`1371`)
+
+## CLI
+
+- Add `--insecure` option to skip validation of server certificates for debugging. ({issue}`1484`)
+
+## Hive connector
+
+- Fix reading from `information_schema`, as well as `SHOW SCHEMAS`, `SHOW TABLES`, and
+  `SHOW COLUMNS` when connecting to a Hive 3.x metastore that contains an `information_schema`
+  schema. ({issue}`1192`)
+- Improve performance when reading data from GCS. ({issue}`1443`)
+- Allow accessing tables in Glue metastore that do not have a table type. ({issue}`1343`)
+- Add support for Azure Data Lake (`adl`) file system. ({issue}`1499`)
+- Allow using custom S3 file systems by relying on the default Hadoop configuration by specifying
+  `HADOOP_DEFAULT` for the `hive.s3-file-system-type` configuration property. ({issue}`1397`)
+- Add support for instance credentials for the Glue metastore via the
+  `hive.metastore.glue.use-instance-credentials` configuration property. ({issue}`1363`)
+- Add support for custom credentials providers for the Glue metastore via the
+  `hive.metastore.glue.aws-credentials-provider` configuration property. ({issue}`1363`)
+- Do not require setting the `hive.metastore-refresh-interval` configuration property
+  when enabling metastore caching. ({issue}`1473`)
+- Add `textfile_field_separator` and `textfile_field_separator_escape` table properties
+  to support custom field separators for `TEXTFILE` format tables. ({issue}`1439`)
+- Add `$file_size` and `$file_modified_time` hidden columns. ({issue}`1428`)
+- The `hive.metastore-timeout` configuration property is now accepted only when using the
+  Thrift metastore. Previously, it was accepted for other metastore type, but was
+  ignored. ({issue}`1346`)
+- Disallow reads from transactional tables. Previously, reads would appear to work,
+  but would not return any data. ({issue}`1218`)
+- Disallow writes to transactional tables. Previously, writes would appear to work,
+  but the data would be written incorrectly. ({issue}`1218`)
diff --git a/docs/src/main/sphinx/release/release-319.rst b/docs/src/main/sphinx/release/release-319.rst
deleted file mode 100644
index bf14fb0c0cd8..000000000000
--- a/docs/src/main/sphinx/release/release-319.rst
+++ /dev/null
@@ -1,84 +0,0 @@
-=========================
-Release 319 (22 Sep 2019)
-=========================
-
-General
--------
-
-* Fix planning failure for queries involving ``UNION`` and ``DISTINCT`` aggregates. (:issue:`1510`)
-* Fix excessive runtime when parsing expressions involving ``CASE``. (:issue:`1407`)
-* Fix fragment output size in ``EXPLAIN ANALYZE`` output. (:issue:`1345`)
-* Fix a rare failure when running ``EXPLAIN ANALYZE`` on a query containing
-  window functions. (:issue:`1401`)
-* Fix failure when querying ``/v1/resourceGroupState`` endpoint for non-existing resource
-  group. (:issue:`1368`)
-* Fix incorrect results when reading ``information_schema.table_privileges`` with
-  an equality predicate on ``table_name`` but without a predicate on ``table_schema``.
-  (:issue:`1534`)
-* Fix planning failure due to coercion handling for correlated subqueries. (:issue:`1453`)
-* Improve performance of queries against ``information_schema`` tables. (:issue:`1329`)
-* Reduce metadata querying during planning. (:issue:`1308`, :issue:`1455`)
-* Improve performance of certain queries involving coercions and complex expressions in ``JOIN``
-  conditions. (:issue:`1390`)
-* Include cost estimates in output of ``EXPLAIN (TYPE IO)``. (:issue:`806`)
-* Improve support for correlated subqueries involving ``ORDER BY`` or ``LIMIT``. (:issue:`1415`)
-* Improve performance of certain ``JOIN`` queries when automatic join ordering is enabled. (:issue:`1431`)
-* Allow setting the default session catalog and schema via the ``sql.default-catalog``
-  and ``sql.default-schema`` configuration properties. (:issue:`1524`)
-* Add support for ``IGNORE NULLS`` for window functions. (:issue:`1244`)
-* Add support for ``INNER`` and ``OUTER`` joins involving ``UNNEST``. (:issue:`1522`)
-* Rename ``legacy`` and ``flat`` :doc:`scheduler policies </admin/properties-node-scheduler>` to
-  ``uniform`` and ``topology`` respectively.  These can be configured via the ``node-scheduler.policy``
-  configuration property. (:issue:`10491`)
-* Add ``file`` :doc:`network topology provider </admin/properties-node-scheduler>` which can be configured
-  via the ``node-scheduler.network-topology.type`` configuration property. (:issue:`1500`)
-* Add support for ``SphericalGeography`` to :func:`ST_Length`. (:issue:`1551`)
-
-Security
---------
-
-* Allow configuring read-only access in :doc:`/security/built-in-system-access-control`. (:issue:`1153`)
-* Add missing checks for schema create, rename, and drop in file-based ``SystemAccessControl``. (:issue:`1153`)
-* Allow authentication over HTTP for forwarded requests containing the
-  ``X-Forwarded-Proto`` header. This is disabled by default, but can be enabled using the
-  ``http-server.authentication.allow-forwarded-https`` configuration property. (:issue:`1442`)
-
-Web UI
-------
-
-* Fix rendering bug in Query Timeline resulting in inconsistency of presented information after
-  query finishes. (:issue:`1371`)
-* Show total memory in Query Timeline instead of user memory. (:issue:`1371`)
-
-CLI
----
-
-* Add ``--insecure`` option to skip validation of server certificates for debugging. (:issue:`1484`)
-
-Hive connector
---------------
-
-* Fix reading from ``information_schema``, as well as ``SHOW SCHEMAS``, ``SHOW TABLES``, and
-  ``SHOW COLUMNS`` when connecting to a Hive 3.x metastore that contains an ``information_schema``
-  schema. (:issue:`1192`)
-* Improve performance when reading data from GCS. (:issue:`1443`)
-* Allow accessing tables in Glue metastore that do not have a table type. (:issue:`1343`)
-* Add support for Azure Data Lake (``adl``) file system. (:issue:`1499`)
-* Allow using custom S3 file systems by relying on the default Hadoop configuration by specifying
-  ``HADOOP_DEFAULT`` for the ``hive.s3-file-system-type`` configuration property. (:issue:`1397`)
-* Add support for instance credentials for the Glue metastore via the
-  ``hive.metastore.glue.use-instance-credentials`` configuration property. (:issue:`1363`)
-* Add support for custom credentials providers for the Glue metastore via the
-  ``hive.metastore.glue.aws-credentials-provider`` configuration property. (:issue:`1363`)
-* Do not require setting the ``hive.metastore-refresh-interval`` configuration property
-  when enabling metastore caching. (:issue:`1473`)
-* Add ``textfile_field_separator`` and ``textfile_field_separator_escape`` table properties
-  to support custom field separators for ``TEXTFILE`` format tables. (:issue:`1439`)
-* Add ``$file_size`` and ``$file_modified_time`` hidden columns. (:issue:`1428`)
-* The ``hive.metastore-timeout`` configuration property is now accepted only when using the
-  Thrift metastore. Previously, it was accepted for other metastore type, but was
-  ignored. (:issue:`1346`)
-* Disallow reads from transactional tables. Previously, reads would appear to work,
-  but would not return any data. (:issue:`1218`)
-* Disallow writes to transactional tables. Previously, writes would appear to work,
-  but the data would be written incorrectly. (:issue:`1218`)
diff --git a/docs/src/main/sphinx/release/release-320.md b/docs/src/main/sphinx/release/release-320.md
new file mode 100644
index 000000000000..c57887a46036
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-320.md
@@ -0,0 +1,58 @@
+# Release 320 (10 Oct 2019)
+
+## General
+
+- Fix incorrect parameter binding order for prepared statement execution when
+  parameters appear inside a `WITH` clause. ({issue}`1191`)
+- Fix planning failure for certain queries involving a mix of outer and
+  cross joins. ({issue}`1589`)
+- Improve performance of queries containing complex predicates. ({issue}`1515`)
+- Avoid unnecessary evaluation of redundant filters. ({issue}`1516`)
+- Improve performance of certain window functions when using bounded window
+  frames (e.g., `ROWS BETWEEN ... PRECEDING AND ... FOLLOWING`). ({issue}`464`)
+- Add {doc}`/connector/kinesis`. ({issue}`476`)
+- Add {func}`geometry_from_hadoop_shape`. ({issue}`1593`)
+- Add {func}`at_timezone`. ({issue}`1612`)
+- Add {func}`with_timezone`. ({issue}`1612`)
+
+## JDBC driver
+
+- Only report warnings on `Statement`, not `ResultSet`, as warnings
+  are not associated with reads of the `ResultSet`. ({issue}`1640`)
+
+## CLI
+
+- Add multi-line editing and syntax highlighting. ({issue}`1380`)
+
+## Hive connector
+
+- Add impersonation support for calls to the Hive metastore. This can be enabled using the
+  `hive.metastore.thrift.impersonation.enabled` configuration property. ({issue}`43`)
+- Add caching support for Glue metastore. ({issue}`1625`)
+- Add separate configuration property `hive.hdfs.socks-proxy` for accessing HDFS via a
+  SOCKS proxy. Previously, it was controlled with the `hive.metastore.thrift.client.socks-proxy`
+  configuration property. ({issue}`1469`)
+
+## MySQL connector
+
+- Add `mysql.jdbc.use-information-schema` configuration property to control whether
+  the MySQL JDBC driver should use the MySQL `information_schema` to answer metadata
+  queries. This may be helpful when diagnosing problems. ({issue}`1598`)
+
+## PostgreSQL connector
+
+- Add support for reading PostgreSQL system tables, e.g., `pg_catalog` relations.
+  The functionality is disabled by default and can be enabled using the
+  `postgresql.include-system-tables` configuration property. ({issue}`1527`)
+
+## Elasticsearch connector
+
+- Add support for `VARBINARY`, `TIMESTAMP`, `TINYINT`, `SMALLINT`,
+  and `REAL` data types. ({issue}`1639`)
+- Discover available tables and their schema dynamically. ({issue}`1639`)
+- Add support for special `_id`, `_score` and `_source` columns. ({issue}`1639`)
+- Add support for {ref}`full text queries <elasticsearch-full-text-queries>`. ({issue}`1662`)
+
+## SPI
+
+- Introduce a builder for `Identity` and deprecate its public constructors. ({issue}`1624`)
diff --git a/docs/src/main/sphinx/release/release-320.rst b/docs/src/main/sphinx/release/release-320.rst
deleted file mode 100644
index e4cdcdba4e2e..000000000000
--- a/docs/src/main/sphinx/release/release-320.rst
+++ /dev/null
@@ -1,68 +0,0 @@
-=========================
-Release 320 (10 Oct 2019)
-=========================
-
-General
--------
-
-* Fix incorrect parameter binding order for prepared statement execution when
-  parameters appear inside a ``WITH`` clause. (:issue:`1191`)
-* Fix planning failure for certain queries involving a mix of outer and
-  cross joins. (:issue:`1589`)
-* Improve performance of queries containing complex predicates. (:issue:`1515`)
-* Avoid unnecessary evaluation of redundant filters. (:issue:`1516`)
-* Improve performance of certain window functions when using bounded window
-  frames (e.g., ``ROWS BETWEEN ... PRECEDING AND ... FOLLOWING``). (:issue:`464`)
-* Add :doc:`/connector/kinesis`. (:issue:`476`)
-* Add :func:`geometry_from_hadoop_shape`. (:issue:`1593`)
-* Add :func:`at_timezone`. (:issue:`1612`)
-* Add :func:`with_timezone`. (:issue:`1612`)
-
-JDBC driver
------------
-
-* Only report warnings on ``Statement``, not ``ResultSet``, as warnings
-  are not associated with reads of the ``ResultSet``. (:issue:`1640`)
-
-CLI
----
-
-* Add multi-line editing and syntax highlighting. (:issue:`1380`)
-
-Hive connector
---------------
-
-* Add impersonation support for calls to the Hive metastore. This can be enabled using the
-  ``hive.metastore.thrift.impersonation.enabled`` configuration property. (:issue:`43`)
-* Add caching support for Glue metastore. (:issue:`1625`)
-* Add separate configuration property ``hive.hdfs.socks-proxy`` for accessing HDFS via a
-  SOCKS proxy. Previously, it was controlled with the ``hive.metastore.thrift.client.socks-proxy``
-  configuration property. (:issue:`1469`)
-
-MySQL connector
----------------
-
-* Add ``mysql.jdbc.use-information-schema`` configuration property to control whether
-  the MySQL JDBC driver should use the MySQL ``information_schema`` to answer metadata
-  queries. This may be helpful when diagnosing problems. (:issue:`1598`)
-
-PostgreSQL connector
---------------------
-
-* Add support for reading PostgreSQL system tables, e.g., ``pg_catalog`` relations.
-  The functionality is disabled by default and can be enabled using the
-  ``postgresql.include-system-tables`` configuration property. (:issue:`1527`)
-
-Elasticsearch connector
------------------------
-
-* Add support for ``VARBINARY``, ``TIMESTAMP``, ``TINYINT``, ``SMALLINT``,
-  and ``REAL`` data types. (:issue:`1639`)
-* Discover available tables and their schema dynamically. (:issue:`1639`)
-* Add support for special ``_id``, ``_score`` and ``_source`` columns. (:issue:`1639`)
-* Add support for :ref:`full text queries <elasticsearch-full-text-queries>`. (:issue:`1662`)
-
-SPI
----
-
-* Introduce a builder for ``Identity`` and deprecate its public constructors. (:issue:`1624`)
diff --git a/docs/src/main/sphinx/release/release-321.md b/docs/src/main/sphinx/release/release-321.md
new file mode 100644
index 000000000000..6e2b5039e69d
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-321.md
@@ -0,0 +1,57 @@
+# Release 321 (15 Oct 2019)
+
+:::{warning}
+The server RPM is broken in this release.
+:::
+
+## General
+
+- Fix incorrect result of {func}`round` when applied to a `tinyint`, `smallint`,
+  `integer`, or `bigint` type with negative decimal places. ({issue}`42`)
+- Improve performance of queries with `LIMIT` over `information_schema` tables. ({issue}`1543`)
+- Improve performance for broadcast joins by using dynamic filtering. This can be enabled
+  via the `experimental.enable-dynamic-filtering` configuration option or the
+  `enable_dynamic_filtering` session property. ({issue}`1686`)
+
+## Security
+
+- Improve the security of query results with one-time tokens. ({issue}`1654`)
+
+## Hive connector
+
+- Fix reading `TEXT` file collection delimiter set by Hive versions earlier
+  than 3.0. ({issue}`1714`)
+- Fix a regression that prevented Presto from using the AWS Glue metastore. ({issue}`1698`)
+- Allow skipping header or footer lines for `CSV` format tables via the
+  `skip_header_line_count` and `skip_footer_line_count` table properties. ({issue}`1090`)
+- Rename table property `textfile_skip_header_line_count` to `skip_header_line_count`
+  and `textfile_skip_footer_line_count` to `skip_footer_line_count`. ({issue}`1090`)
+- Add support for LZOP compressed (`.lzo`) files. Previously, queries accessing LZOP compressed
+  files would fail, unless all files were small. ({issue}`1701`)
+- Add support for bucket-aware read of tables using bucketing version 2. ({issue}`538`)
+- Add support for writing to tables using bucketing version 2. ({issue}`538`)
+- Allow caching directory listings for all tables or schemas. ({issue}`1668`)
+- Add support for dynamic filtering for broadcast joins. ({issue}`1686`)
+
+## PostgreSQL connector
+
+- Support reading PostgreSQL arrays as the `JSON` data type. This can be enabled by
+  setting the `postgresql.experimental.array-mapping` configuration property or the
+  `array_mapping` catalog session property to `AS_JSON`. ({issue}`682`)
+
+## Elasticsearch connector
+
+- Add support for Amazon Elasticsearch Service. ({issue}`1693`)
+
+## Cassandra connector
+
+- Add TLS support. ({issue}`1680`)
+
+## JMX connector
+
+- Add support for wildcards in configuration of history tables. ({issue}`1572`)
+
+## SPI
+
+- Fix `QueryStatistics.getWallTime()` to report elapsed time rather than total
+  scheduled time. ({issue}`1719`)
diff --git a/docs/src/main/sphinx/release/release-321.rst b/docs/src/main/sphinx/release/release-321.rst
deleted file mode 100644
index 81d77b70dc97..000000000000
--- a/docs/src/main/sphinx/release/release-321.rst
+++ /dev/null
@@ -1,65 +0,0 @@
-=========================
-Release 321 (15 Oct 2019)
-=========================
-
-.. warning:: The server RPM is broken in this release.
-
-General
--------
-
-* Fix incorrect result of :func:`round` when applied to a ``tinyint``, ``smallint``,
-  ``integer``, or ``bigint`` type with negative decimal places. (:issue:`42`)
-* Improve performance of queries with ``LIMIT`` over ``information_schema`` tables. (:issue:`1543`)
-* Improve performance for broadcast joins by using dynamic filtering. This can be enabled
-  via the ``experimental.enable-dynamic-filtering`` configuration option or the
-  ``enable_dynamic_filtering`` session property. (:issue:`1686`)
-
-Security
---------
-
-* Improve the security of query results with one-time tokens. (:issue:`1654`)
-
-Hive connector
---------------
-
-* Fix reading ``TEXT`` file collection delimiter set by Hive versions earlier
-  than 3.0. (:issue:`1714`)
-* Fix a regression that prevented Presto from using the AWS Glue metastore. (:issue:`1698`)
-* Allow skipping header or footer lines for ``CSV`` format tables via the
-  ``skip_header_line_count`` and ``skip_footer_line_count`` table properties. (:issue:`1090`)
-* Rename table property ``textfile_skip_header_line_count`` to ``skip_header_line_count``
-  and ``textfile_skip_footer_line_count`` to ``skip_footer_line_count``. (:issue:`1090`)
-* Add support for LZOP compressed (``.lzo``) files. Previously, queries accessing LZOP compressed
-  files would fail, unless all files were small. (:issue:`1701`)
-* Add support for bucket-aware read of tables using bucketing version 2. (:issue:`538`)
-* Add support for writing to tables using bucketing version 2. (:issue:`538`)
-* Allow caching directory listings for all tables or schemas. (:issue:`1668`)
-* Add support for dynamic filtering for broadcast joins. (:issue:`1686`)
-
-PostgreSQL connector
---------------------
-
-* Support reading PostgreSQL arrays as the ``JSON`` data type. This can be enabled by
-  setting the ``postgresql.experimental.array-mapping`` configuration property or the
-  ``array_mapping`` catalog session property to ``AS_JSON``. (:issue:`682`)
-
-Elasticsearch connector
------------------------
-
-* Add support for Amazon Elasticsearch Service. (:issue:`1693`)
-
-Cassandra connector
--------------------
-
-* Add TLS support. (:issue:`1680`)
-
-JMX connector
--------------
-
-* Add support for wildcards in configuration of history tables. (:issue:`1572`)
-
-SPI
----
-
-* Fix ``QueryStatistics.getWallTime()`` to report elapsed time rather than total
-  scheduled time. (:issue:`1719`)
diff --git a/docs/src/main/sphinx/release/release-322.md b/docs/src/main/sphinx/release/release-322.md
new file mode 100644
index 000000000000..4a097a870c4c
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-322.md
@@ -0,0 +1,21 @@
+# Release 322 (16 Oct 2019)
+
+## General
+
+- Improve performance of certain join queries by reducing the amount of data
+  that needs to be scanned. ({issue}`1673`)
+
+## Server RPM
+
+- Fix a regression that caused zero-length files in the RPM. ({issue}`1767`)
+
+## Other connectors
+
+These changes apply to MySQL, PostgreSQL, Redshift, and SQL Server.
+
+- Add support for providing credentials using a keystore file. This can be enabled
+  by setting the `credential-provider.type` configuration property to `KEYSTORE`
+  and by setting the `keystore-file-path`, `keystore-type`, `keystore-password`,
+  `keystore-user-credential-password`, `keystore-password-credential-password`,
+  `keystore-user-credential-name`, and `keystore-password-credential-name`
+  configuration properties. ({issue}`1521`)
diff --git a/docs/src/main/sphinx/release/release-322.rst b/docs/src/main/sphinx/release/release-322.rst
deleted file mode 100644
index 8648793a741b..000000000000
--- a/docs/src/main/sphinx/release/release-322.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-=========================
-Release 322 (16 Oct 2019)
-=========================
-
-General
--------
-
-* Improve performance of certain join queries by reducing the amount of data
-  that needs to be scanned. (:issue:`1673`)
-
-Server RPM
-----------
-
-* Fix a regression that caused zero-length files in the RPM. (:issue:`1767`)
-
-Other connectors
-----------------
-
-These changes apply to MySQL, PostgreSQL, Redshift, and SQL Server.
-
-* Add support for providing credentials using a keystore file. This can be enabled
-  by setting the ``credential-provider.type`` configuration property to ``KEYSTORE``
-  and by setting the ``keystore-file-path``, ``keystore-type``, ``keystore-password``,
-  ``keystore-user-credential-password``, ``keystore-password-credential-password``,
-  ``keystore-user-credential-name``, and ``keystore-password-credential-name``
-  configuration properties. (:issue:`1521`)
diff --git a/docs/src/main/sphinx/release/release-323.md b/docs/src/main/sphinx/release/release-323.md
new file mode 100644
index 000000000000..640e57208180
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-323.md
@@ -0,0 +1,49 @@
+# Release 323 (23 Oct 2019)
+
+## General
+
+- Fix query failure when referencing columns from a table that contains
+  hidden columns. ({issue}`1796`)
+- Fix a rare issue in which the server produces an extra row containing
+  the boolean value `true` as the last row in the result set. For most queries,
+  this will result in a client error, since this row does not match the result
+  schema, but is a correctness issue when the result schema is a single boolean
+  column. ({issue}`1732`)
+- Allow using `.*` on expressions of type `ROW` in the `SELECT` clause to
+  convert the fields of a row into multiple columns. ({issue}`1017`)
+
+## JDBC driver
+
+- Fix a compatibility issue when connecting to pre-321 servers. ({issue}`1785`)
+- Fix reporting of views in `DatabaseMetaData.getTables()`. ({issue}`1488`)
+
+## CLI
+
+- Fix a compatibility issue when connecting to pre-321 servers. ({issue}`1785`)
+
+## Hive
+
+- Fix the ORC writer to correctly write the file footers. Previously written files were
+  sometimes unreadable in Hive 3.1 when querying the table for a second (or subsequent)
+  time. ({issue}`456`)
+- Prevent writing to materialized views. ({issue}`1725`)
+- Reduce metastore load when inserting data or analyzing tables. ({issue}`1783`, {issue}`1793`, {issue}`1794`)
+- Allow using multiple Hive catalogs that use different Kerberos or other authentication
+  configurations. ({issue}`760`, {issue}`978`, {issue}`1820`)
+
+## PostgreSQL
+
+- Support for PostgreSQL arrays is no longer considered experimental, therefore
+  the configuration property `postgresql.experimental.array-mapping` is now named
+  to `postgresql.array-mapping`. ({issue}`1740`)
+
+## SPI
+
+- Add support for unnesting dictionary blocks duration compaction. ({issue}`1761`)
+- Change `LazyBlockLoader` to directly return the loaded block. ({issue}`1744`)
+
+:::{note}
+This is a backwards incompatible changes with the previous SPI.
+If you have written a plugin that instantiates `LazyBlock`,
+you will need to update your code before deploying this release.
+:::
diff --git a/docs/src/main/sphinx/release/release-323.rst b/docs/src/main/sphinx/release/release-323.rst
deleted file mode 100644
index fcb744da1478..000000000000
--- a/docs/src/main/sphinx/release/release-323.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-=========================
-Release 323 (23 Oct 2019)
-=========================
-
-General
--------
-
-* Fix query failure when referencing columns from a table that contains
-  hidden columns. (:issue:`1796`)
-* Fix a rare issue in which the server produces an extra row containing
-  the boolean value ``true`` as the last row in the result set. For most queries,
-  this will result in a client error, since this row does not match the result
-  schema, but is a correctness issue when the result schema is a single boolean
-  column. (:issue:`1732`)
-* Allow using ``.*`` on expressions of type ``ROW`` in the ``SELECT`` clause to
-  convert the fields of a row into multiple columns. (:issue:`1017`)
-
-JDBC driver
------------
-
-* Fix a compatibility issue when connecting to pre-321 servers. (:issue:`1785`)
-* Fix reporting of views in ``DatabaseMetaData.getTables()``. (:issue:`1488`)
-
-CLI
-----
-
-* Fix a compatibility issue when connecting to pre-321 servers. (:issue:`1785`)
-
-Hive
-----
-
-* Fix the ORC writer to correctly write the file footers. Previously written files were
-  sometimes unreadable in Hive 3.1 when querying the table for a second (or subsequent)
-  time. (:issue:`456`)
-* Prevent writing to materialized views. (:issue:`1725`)
-* Reduce metastore load when inserting data or analyzing tables. (:issue:`1783`, :issue:`1793`, :issue:`1794`)
-* Allow using multiple Hive catalogs that use different Kerberos or other authentication
-  configurations. (:issue:`760`, :issue:`978`, :issue:`1820`)
-
-PostgreSQL
-----------
-
-* Support for PostgreSQL arrays is no longer considered experimental, therefore
-  the configuration property ``postgresql.experimental.array-mapping`` is now named
-  to ``postgresql.array-mapping``. (:issue:`1740`)
-
-SPI
----
-
-* Add support for unnesting dictionary blocks duration compaction. (:issue:`1761`)
-* Change ``LazyBlockLoader`` to directly return the loaded block. (:issue:`1744`)
-
-.. note::
-
-    This is a backwards incompatible changes with the previous SPI.
-    If you have written a plugin that instantiates ``LazyBlock``,
-    you will need to update your code before deploying this release.
diff --git a/docs/src/main/sphinx/release/release-324.md b/docs/src/main/sphinx/release/release-324.md
new file mode 100644
index 000000000000..778bf3e2e58c
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-324.md
@@ -0,0 +1,38 @@
+# Release 324 (1 Nov 2019)
+
+## General
+
+- Fix query failure when `CASE` operands have different types. ({issue}`1825`)
+- Add support for `ESCAPE` clause in `SHOW CATALOGS LIKE ...`. ({issue}`1691`)
+- Add {func}`line_interpolate_point` and {func}`line_interpolate_points`. ({issue}`1888`)
+- Allow references to tables in the enclosing query when using `.*`. ({issue}`1867`)
+- Configuration properties for optimizer and spill support no longer
+  have `experimental.` prefix. ({issue}`1875`)
+- Configuration property `experimental.reserved-pool-enabled` was renamed to
+  `experimental.reserved-pool-disabled` (with meaning reversed). ({issue}`1916`)
+
+## Security
+
+- Perform access control checks when displaying table or view definitions
+  with `SHOW CREATE`. ({issue}`1517`)
+
+## Hive
+
+- Allow using `SHOW GRANTS` on a Hive view when using the `sql-standard`
+  security mode. ({issue}`1842`)
+- Improve performance when filtering dictionary-encoded Parquet columns. ({issue}`1846`)
+
+## PostgreSQL
+
+- Add support for inserting `MAP(VARCHAR, VARCHAR)` values into columns of
+  `hstore` type. ({issue}`1894`)
+
+## Elasticsearch
+
+- Fix failure when reading datetime columns in Elasticsearch 5.x. ({issue}`1844`)
+- Add support for mixed-case field names. ({issue}`1914`)
+
+## SPI
+
+- Introduce a builder for `ColumnMetadata`. The various overloaded constructors
+  are now deprecated. ({issue}`1891`)
diff --git a/docs/src/main/sphinx/release/release-324.rst b/docs/src/main/sphinx/release/release-324.rst
deleted file mode 100644
index c42e52c79b00..000000000000
--- a/docs/src/main/sphinx/release/release-324.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-========================
-Release 324 (1 Nov 2019)
-========================
-
-
-General
--------
-
-* Fix query failure when ``CASE`` operands have different types. (:issue:`1825`)
-* Add support for ``ESCAPE`` clause in ``SHOW CATALOGS LIKE ...``. (:issue:`1691`)
-* Add :func:`line_interpolate_point` and :func:`line_interpolate_points`. (:issue:`1888`)
-* Allow references to tables in the enclosing query when using ``.*``. (:issue:`1867`)
-* Configuration properties for optimizer and spill support no longer
-  have ``experimental.`` prefix. (:issue:`1875`)
-* Configuration property ``experimental.reserved-pool-enabled`` was renamed to
-  ``experimental.reserved-pool-disabled`` (with meaning reversed). (:issue:`1916`)
-
-Security
---------
-
-* Perform access control checks when displaying table or view definitions
-  with ``SHOW CREATE``. (:issue:`1517`)
-
-Hive
-----
-
-* Allow using ``SHOW GRANTS`` on a Hive view when using the ``sql-standard``
-  security mode. (:issue:`1842`)
-* Improve performance when filtering dictionary-encoded Parquet columns. (:issue:`1846`)
-
-PostgreSQL
-----------
-
-* Add support for inserting ``MAP(VARCHAR, VARCHAR)`` values into columns of
-  ``hstore`` type. (:issue:`1894`)
-
-Elasticsearch
--------------
-
-* Fix failure when reading datetime columns in Elasticsearch 5.x. (:issue:`1844`)
-* Add support for mixed-case field names. (:issue:`1914`)
-
-SPI
----
-
-* Introduce a builder for ``ColumnMetadata``. The various overloaded constructors
-  are now deprecated. (:issue:`1891`)
diff --git a/docs/src/main/sphinx/release/release-325.md b/docs/src/main/sphinx/release/release-325.md
new file mode 100644
index 000000000000..68d0d8304aff
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-325.md
@@ -0,0 +1,43 @@
+# Release 325 (14 Nov 2019)
+
+:::{warning}
+There is a performance regression in this release.
+:::
+
+## General
+
+- Fix incorrect results for certain queries involving `FULL` or `RIGHT` joins and
+  `LATERAL`. ({issue}`1952`)
+- Fix incorrect results when using `IS DISTINCT FROM` on columns of `DECIMAL` type
+  with precision larger than 18. ({issue}`1985`)
+- Fix query failure when row types contain a field named after a reserved SQL keyword. ({issue}`1963`)
+- Add support for `LIKE` predicate to `SHOW SESSION` and `SHOW FUNCTIONS`. ({issue}`1688`, {issue}`1692`)
+- Add support for late materialization to join operations. ({issue}`1256`)
+- Reduce number of metadata queries during planning.
+  This change disables stats collection for non-`EXPLAIN` queries. If you
+  want to have access to such stats and cost in query completion events, you
+  need to re-enable stats collection using the `collect-plan-statistics-for-all-queries`
+  configuration property. ({issue}`1866`)
+- Add variant of {func}`strpos` that returns the Nth occurrence of a substring. ({issue}`1811`)
+- Add {func}`to_encoded_polyline` and {func}`from_encoded_polyline` geospatial functions. ({issue}`1827`)
+
+## Web UI
+
+- Show actual query for an `EXECUTE` statement. ({issue}`1980`)
+
+## Hive
+
+- Fix incorrect behavior of `CREATE TABLE` when Hive metastore is configured
+  with `metastore.create.as.acid` set to `true`. ({issue}`1958`)
+- Fix query failure when reading Parquet files that contain character data without statistics. ({issue}`1955`)
+- Allow analyzing a subset of table columns (rather than all columns). ({issue}`1907`)
+- Support overwriting unpartitioned tables for insert queries when using AWS Glue. ({issue}`1243`)
+- Add support for reading Parquet files where the declared precision of decimal columns does not match
+  the precision in the table or partition schema. ({issue}`1949`)
+- Improve performance when reading Parquet files with small row groups. ({issue}`1925`)
+
+## Other connectors
+
+These changes apply to the MySQL, PostgreSQL, Redshift, and SQL Server connectors.
+
+- Fix incorrect insertion of data when the target table has an unsupported type. ({issue}`1930`)
diff --git a/docs/src/main/sphinx/release/release-325.rst b/docs/src/main/sphinx/release/release-325.rst
deleted file mode 100644
index 1d165677a75e..000000000000
--- a/docs/src/main/sphinx/release/release-325.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-=========================
-Release 325 (14 Nov 2019)
-=========================
-
-.. warning:: There is a performance regression in this release.
-
-General
--------
-
-* Fix incorrect results for certain queries involving ``FULL`` or ``RIGHT`` joins and
-  ``LATERAL``. (:issue:`1952`)
-* Fix incorrect results when using ``IS DISTINCT FROM`` on columns of ``DECIMAL`` type
-  with precision larger than 18. (:issue:`1985`)
-* Fix query failure when row types contain a field named after a reserved SQL keyword. (:issue:`1963`)
-* Add support for ``LIKE`` predicate to ``SHOW SESSION`` and ``SHOW FUNCTIONS``. (:issue:`1688`, :issue:`1692`)
-* Add support for late materialization to join operations. (:issue:`1256`)
-* Reduce number of metadata queries during planning.
-  This change disables stats collection for non-``EXPLAIN`` queries. If you
-  want to have access to such stats and cost in query completion events, you
-  need to re-enable stats collection using the ``collect-plan-statistics-for-all-queries``
-  configuration property. (:issue:`1866`)
-* Add variant of :func:`strpos` that returns the Nth occurrence of a substring. (:issue:`1811`)
-* Add :func:`to_encoded_polyline` and :func:`from_encoded_polyline` geospatial functions. (:issue:`1827`)
-
-Web UI
-------
-
-* Show actual query for an ``EXECUTE`` statement. (:issue:`1980`)
-
-Hive
-----
-
-* Fix incorrect behavior of ``CREATE TABLE`` when Hive metastore is configured
-  with ``metastore.create.as.acid`` set to ``true``. (:issue:`1958`)
-* Fix query failure when reading Parquet files that contain character data without statistics. (:issue:`1955`)
-* Allow analyzing a subset of table columns (rather than all columns). (:issue:`1907`)
-* Support overwriting unpartitioned tables for insert queries when using AWS Glue. (:issue:`1243`)
-* Add support for reading Parquet files where the declared precision of decimal columns does not match
-  the precision in the table or partition schema. (:issue:`1949`)
-* Improve performance when reading Parquet files with small row groups. (:issue:`1925`)
-
-Other connectors
-----------------
-
-These changes apply to the MySQL, PostgreSQL, Redshift, and SQL Server connectors.
-
-* Fix incorrect insertion of data when the target table has an unsupported type. (:issue:`1930`)
diff --git a/docs/src/main/sphinx/release/release-326.md b/docs/src/main/sphinx/release/release-326.md
new file mode 100644
index 000000000000..84c84610ce1a
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-326.md
@@ -0,0 +1,39 @@
+# Release 326 (27 Nov 2019)
+
+## General
+
+- Fix incorrect query results when query contains `LEFT JOIN` over `UNNEST`. ({issue}`2097`)
+- Fix performance regression in queries involving `JOIN`. ({issue}`2047`)
+- Fix accounting of semantic analysis time when queued queries are cancelled. ({issue}`2055`)
+- Add {doc}`/connector/singlestore`. ({issue}`1906`)
+- Improve performance of `INSERT` and `CREATE TABLE ... AS` queries containing redundant
+  `ORDER BY` clauses. ({issue}`2044`)
+- Improve performance when processing columns of `map` type. ({issue}`2015`)
+
+## Server RPM
+
+- Allow running Presto with {ref}`Java 11 or above <requirements-java>`. ({issue}`2057`)
+
+## Security
+
+- Deprecate Kerberos in favor of JWT for {doc}`/security/internal-communication`. ({issue}`2032`)
+
+## Hive
+
+- Fix table creation error for tables with S3 location when using `file` metastore. ({issue}`1664`)
+- Fix a compatibility issue with the CDH 5.x metastore which results in stats
+  not being recorded for {doc}`/sql/analyze`. ({issue}`973`)
+- Improve performance for Glue metastore by fetching partitions in parallel. ({issue}`1465`)
+- Improve performance of `sql-standard` security. ({issue}`1922`, {issue}`1929`)
+
+## Phoenix connector
+
+- Collect statistics on the count and duration of each call to Phoenix. ({issue}`2024`)
+
+## Other connectors
+
+These changes apply to the MySQL, PostgreSQL, Redshift, and SQL Server connectors.
+
+- Collect statistics on the count and duration of operations to create
+  and destroy `JDBC` connections. ({issue}`2024`)
+- Add support for showing column comments. ({issue}`1840`)
diff --git a/docs/src/main/sphinx/release/release-326.rst b/docs/src/main/sphinx/release/release-326.rst
deleted file mode 100644
index 3207f2b9cac2..000000000000
--- a/docs/src/main/sphinx/release/release-326.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-=========================
-Release 326 (27 Nov 2019)
-=========================
-
-General
--------
-
-* Fix incorrect query results when query contains ``LEFT JOIN`` over ``UNNEST``. (:issue:`2097`)
-* Fix performance regression in queries involving ``JOIN``. (:issue:`2047`)
-* Fix accounting of semantic analysis time when queued queries are cancelled. (:issue:`2055`)
-* Add :doc:`/connector/memsql`. (:issue:`1906`)
-* Improve performance of ``INSERT`` and ``CREATE TABLE ... AS`` queries containing redundant
-  ``ORDER BY`` clauses. (:issue:`2044`)
-* Improve performance when processing columns of ``map`` type. (:issue:`2015`)
-
-Server RPM
-----------
-
-* Allow running Presto with :ref:`Java 11 or above <requirements-java>`. (:issue:`2057`)
-
-Security
---------
-
-* Deprecate Kerberos in favor of JWT for :doc:`/security/internal-communication`. (:issue:`2032`)
-
-Hive
-----
-
-* Fix table creation error for tables with S3 location when using ``file`` metastore. (:issue:`1664`)
-* Fix a compatibility issue with the CDH 5.x metastore which results in stats
-  not being recorded for :doc:`/sql/analyze`. (:issue:`973`)
-* Improve performance for Glue metastore by fetching partitions in parallel. (:issue:`1465`)
-* Improve performance of ``sql-standard`` security. (:issue:`1922`, :issue:`1929`)
-
-Phoenix connector
------------------
-
-* Collect statistics on the count and duration of each call to Phoenix. (:issue:`2024`)
-
-Other connectors
-----------------
-
-These changes apply to the MySQL, PostgreSQL, Redshift, and SQL Server connectors.
-
-* Collect statistics on the count and duration of operations to create
-  and destroy ``JDBC`` connections. (:issue:`2024`)
-* Add support for showing column comments. (:issue:`1840`)
diff --git a/docs/src/main/sphinx/release/release-327.md b/docs/src/main/sphinx/release/release-327.md
new file mode 100644
index 000000000000..d95744e5b600
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-327.md
@@ -0,0 +1,70 @@
+# Release 327 (20 Dec 2019)
+
+## General
+
+- Fix join query failure when late materialization is enabled. ({issue}`2144`)
+- Fix failure of {func}`word_stem` for certain inputs. ({issue}`2145`)
+- Fix query failure when using `transform_values()` inside `try()` and the transformation fails
+  for one of the rows. ({issue}`2315`)
+- Fix potential incorrect results for aggregations involving `FILTER (WHERE ...)`
+  when the condition is a reference to a table column. ({issue}`2267`)
+- Allow renaming views with {doc}`/sql/alter-view`. ({issue}`1060`)
+- Add `error_type` and `error_code` columns to `system.runtime.queries`. ({issue}`2249`)
+- Rename `experimental.work-processor-pipelines` configuration property to `experimental.late-materialization.enabled`
+  and rename `work_processor_pipelines` session property to `late_materialization`. ({issue}`2275`)
+
+## Security
+
+- Allow using multiple system access controls. ({issue}`2178`)
+- Add {doc}`/security/password-file`. ({issue}`797`)
+
+## Hive connector
+
+- Fix incorrect query results when reading `timestamp` values from ORC files written by
+  Hive 3.1 or later. ({issue}`2099`)
+- Fix a CDH 5.x metastore compatibility issue resulting in failure when analyzing or inserting
+  into a table with `date` columns. ({issue}`556`)
+- Reduce number of metastore calls when fetching partitions. ({issue}`1921`)
+- Support reading from insert-only transactional tables. ({issue}`576`)
+- Deprecate `parquet.fail-on-corrupted-statistics` (previously known as `hive.parquet.fail-on-corrupted-statistics`).
+  Setting this configuration property to `false` may hide correctness issues, leading to incorrect query results.
+  Session property `parquet_fail_with_corrupted_statistics` is deprecated as well.
+  Both configuration and session properties will be removed in a future version. ({issue}`2129`)
+- Improve concurrency when updating table or partition statistics. ({issue}`2154`)
+- Add support for renaming views. ({issue}`2189`)
+- Allow configuring the `hive.orc.use-column-names` config property on a per-session
+  basis using the `orc_use_column_names` session property. ({issue}`2248`)
+
+## Kudu connector
+
+- Support predicate pushdown for the `decimal` type. ({issue}`2131`)
+- Fix column position swap for delete operations that may result in deletion of the wrong records. ({issue}`2252`)
+- Improve predicate pushdown for queries that match a column against
+  multiple values (typically using the `IN` operator). ({issue}`2253`)
+
+## MongoDB connector
+
+- Add support for reading from views. ({issue}`2156`)
+
+## PostgreSQL connector
+
+- Allow converting unsupported types to `VARCHAR` by setting the session property
+  `unsupported_type_handling` or configuration property `unsupported-type-handling`
+  to `CONVERT_TO_VARCHAR`. ({issue}`1182`)
+
+## MySQL connector
+
+- Fix `INSERT` query failure when `GTID` mode is enabled. ({issue}`2251`)
+
+## Elasticsearch connector
+
+- Improve performance for queries involving equality and range filters
+  over table columns. ({issue}`2310`)
+
+## Google Sheets connector
+
+- Fix incorrect results when listing tables in `information_schema`. ({issue}`2118`)
+
+## SPI
+
+- Add `executionTime` to `QueryStatistics` for event listeners. ({issue}`2247`)
diff --git a/docs/src/main/sphinx/release/release-327.rst b/docs/src/main/sphinx/release/release-327.rst
deleted file mode 100644
index e1a29fa103c1..000000000000
--- a/docs/src/main/sphinx/release/release-327.rst
+++ /dev/null
@@ -1,82 +0,0 @@
-=========================
-Release 327 (20 Dec 2019)
-=========================
-
-General
--------
-
-* Fix join query failure when late materialization is enabled. (:issue:`2144`)
-* Fix failure of :func:`word_stem` for certain inputs. (:issue:`2145`)
-* Fix query failure when using ``transform_values()`` inside ``try()`` and the transformation fails
-  for one of the rows. (:issue:`2315`)
-* Fix potential incorrect results for aggregations involving ``FILTER (WHERE ...)``
-  when the condition is a reference to a table column. (:issue:`2267`)
-* Allow renaming views with :doc:`/sql/alter-view`. (:issue:`1060`)
-* Add ``error_type`` and ``error_code`` columns to ``system.runtime.queries``. (:issue:`2249`)
-* Rename ``experimental.work-processor-pipelines`` configuration property to ``experimental.late-materialization.enabled``
-  and rename ``work_processor_pipelines`` session property to ``late_materialization``. (:issue:`2275`)
-
-Security
---------
-
-* Allow using multiple system access controls. (:issue:`2178`)
-* Add :doc:`/security/password-file`. (:issue:`797`)
-
-Hive connector
---------------
-
-* Fix incorrect query results when reading ``timestamp`` values from ORC files written by
-  Hive 3.1 or later. (:issue:`2099`)
-* Fix a CDH 5.x metastore compatibility issue resulting in failure when analyzing or inserting
-  into a table with ``date`` columns. (:issue:`556`)
-* Reduce number of metastore calls when fetching partitions. (:issue:`1921`)
-* Support reading from insert-only transactional tables. (:issue:`576`)
-* Deprecate ``parquet.fail-on-corrupted-statistics`` (previously known as ``hive.parquet.fail-on-corrupted-statistics``).
-  Setting this configuration property to ``false`` may hide correctness issues, leading to incorrect query results.
-  Session property ``parquet_fail_with_corrupted_statistics`` is deprecated as well.
-  Both configuration and session properties will be removed in a future version. (:issue:`2129`)
-* Improve concurrency when updating table or partition statistics. (:issue:`2154`)
-* Add support for renaming views. (:issue:`2189`)
-* Allow configuring the ``hive.orc.use-column-names`` config property on a per-session
-  basis using the ``orc_use_column_names`` session property. (:issue:`2248`)
-
-Kudu connector
---------------
-
-* Support predicate pushdown for the ``decimal`` type. (:issue:`2131`)
-* Fix column position swap for delete operations that may result in deletion of the wrong records. (:issue:`2252`)
-* Improve predicate pushdown for queries that match a column against
-  multiple values (typically using the ``IN`` operator). (:issue:`2253`)
-
-MongoDB connector
------------------
-
-* Add support for reading from views. (:issue:`2156`)
-
-PostgreSQL connector
---------------------
-
-* Allow converting unsupported types to ``VARCHAR`` by setting the session property
-  ``unsupported_type_handling`` or configuration property ``unsupported-type-handling``
-  to ``CONVERT_TO_VARCHAR``. (:issue:`1182`)
-
-MySQL connector
----------------
-
-* Fix ``INSERT`` query failure when ``GTID`` mode is enabled. (:issue:`2251`)
-
-Elasticsearch connector
------------------------
-
-* Improve performance for queries involving equality and range filters
-  over table columns. (:issue:`2310`)
-
-Google Sheets connector
------------------------
-
-* Fix incorrect results when listing tables in ``information_schema``. (:issue:`2118`)
-
-SPI
----
-
-* Add ``executionTime`` to ``QueryStatistics`` for event listeners. (:issue:`2247`)
diff --git a/docs/src/main/sphinx/release/release-328.md b/docs/src/main/sphinx/release/release-328.md
new file mode 100644
index 000000000000..b295c9b3381d
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-328.md
@@ -0,0 +1,72 @@
+# Release 328 (10 Jan 2020)
+
+## General
+
+- Fix correctness issue for certain correlated join queries when the correlated subquery on
+  the right produces no rows. ({issue}`1969`)
+- Fix incorrect handling of multi-byte characters for {doc}`/functions/regexp` when
+  the pattern is empty. ({issue}`2313`)
+- Fix failure when join criteria contains columns of different types. ({issue}`2320`)
+- Fix failure for complex outer join queries when dynamic filtering is enabled. ({issue}`2363`)
+- Improve support for correlated queries. ({issue}`1969`)
+- Allow inserting values of a larger type into as smaller type when the values fit. For example,
+  `BIGINT` into `SMALLINT`, or `VARCHAR(10)` into `VARCHAR(3)`. Values that don't fit will
+  cause an error at runtime. ({issue}`2061`)
+- Add {func}`regexp_count` and {func}`regexp_position` functions. ({issue}`2136`)
+- Add support for interpolating {doc}`/security/secrets` in server and catalog configuration
+  files. ({issue}`2370`)
+
+## Security
+
+- Fix a security issue allowing users to gain unauthorized access to Presto cluster
+  when using password authenticator with LDAP. ({issue}`2356`)
+- Add support for LDAP referrals in LDAP password authenticator. ({issue}`2354`)
+
+## JDBC driver
+
+- Fix behavior of `java.sql.Connection#commit()` and `java.sql.Connection#rollback()`
+  methods when no statements performed in a transaction. Previously, these methods
+  would fail. ({issue}`2339`)
+- Fix failure when restoring autocommit mode with
+  `java.sql.Connection#setAutocommit()` ({issue}`2338`)
+
+## Hive connector
+
+- Reduce query latency and Hive metastore load when using the
+  `AUTOMATIC` join reordering strategy. ({issue}`2184`)
+- Allow configuring `hive.max-outstanding-splits-size` to values larger than 2GB. ({issue}`2395`)
+- Avoid redundant file system stat call when writing Parquet files. ({issue}`1746`)
+- Avoid retrying permanent errors for S3-related services such as STS. ({issue}`2331`)
+
+## Kafka connector
+
+- Remove internal columns: `_segment_start`, `_segment_end` and
+  `_segment_count`. ({issue}`2303`)
+- Add new configuration property `kafka.messages-per-split` to control how many Kafka
+  messages will be processed by a single Presto split. ({issue}`2303`)
+
+## Elasticsearch connector
+
+- Fix query failure when an object in an Elasticsearch document
+  does not have any fields. ({issue}`2217`)
+- Add support for querying index aliases. ({issue}`2324`)
+
+## Phoenix connector
+
+- Add support for mapping unsupported data types to `VARCHAR`. This can be enabled by setting
+  the `unsupported-type-handling` configuration property or the `unsupported_type_handling` session
+  property to `CONVERT_TO_VARCHAR`. ({issue}`2427`)
+
+## Other connectors
+
+These changes apply to the MySQL, PostgreSQL, Redshift and SQL Server connectors:
+
+- Add support for creating schemas. ({issue}`1874`)
+- Add support for caching metadata. The configuration property `metadata.cache-ttl`
+  controls how long to cache data (it defaults to `0ms` which disables caching),
+  and `metadata.cache-missing` controls whether or not missing tables are cached. ({issue}`2290`)
+
+This change applies to the MySQL and PostgreSQL connectors:
+
+- Add support for mapping `DECIMAL` types with precision larger than 38
+  to Presto `DECIMAL`. ({issue}`2088`)
diff --git a/docs/src/main/sphinx/release/release-328.rst b/docs/src/main/sphinx/release/release-328.rst
deleted file mode 100644
index d761af013f14..000000000000
--- a/docs/src/main/sphinx/release/release-328.rst
+++ /dev/null
@@ -1,82 +0,0 @@
-=========================
-Release 328 (10 Jan 2020)
-=========================
-
-General
--------
-
-* Fix correctness issue for certain correlated join queries when the correlated subquery on
-  the right produces no rows. (:issue:`1969`)
-* Fix incorrect handling of multi-byte characters for :doc:`/functions/regexp` when
-  the pattern is empty. (:issue:`2313`)
-* Fix failure when join criteria contains columns of different types. (:issue:`2320`)
-* Fix failure for complex outer join queries when dynamic filtering is enabled. (:issue:`2363`)
-* Improve support for correlated queries. (:issue:`1969`)
-* Allow inserting values of a larger type into as smaller type when the values fit. For example,
-  ``BIGINT`` into ``SMALLINT``, or ``VARCHAR(10)`` into ``VARCHAR(3)``. Values that don't fit will
-  cause an error at runtime. (:issue:`2061`)
-* Add :func:`regexp_count` and :func:`regexp_position` functions. (:issue:`2136`)
-* Add support for interpolating :doc:`/security/secrets` in server and catalog configuration
-  files. (:issue:`2370`)
-
-Security
---------
-
-* Fix a security issue allowing users to gain unauthorized access to Presto cluster
-  when using password authenticator with LDAP. (:issue:`2356`)
-* Add support for LDAP referrals in LDAP password authenticator. (:issue:`2354`)
-
-JDBC driver
------------
-
-* Fix behavior of ``java.sql.Connection#commit()`` and ``java.sql.Connection#rollback()``
-  methods when no statements performed in a transaction. Previously, these methods
-  would fail. (:issue:`2339`)
-* Fix failure when restoring autocommit mode with
-  ``java.sql.Connection#setAutocommit()`` (:issue:`2338`)
-
-Hive connector
---------------
-
-* Reduce query latency and Hive metastore load when using the
-  ``AUTOMATIC`` join reordering strategy. (:issue:`2184`)
-* Allow configuring ``hive.max-outstanding-splits-size`` to values larger than 2GB. (:issue:`2395`)
-* Avoid redundant file system stat call when writing Parquet files. (:issue:`1746`)
-* Avoid retrying permanent errors for S3-related services such as STS. (:issue:`2331`)
-
-Kafka connector
----------------
-
-* Remove internal columns: ``_segment_start``, ``_segment_end`` and
-  ``_segment_count``. (:issue:`2303`)
-* Add new configuration property ``kafka.messages-per-split`` to control how many Kafka
-  messages will be processed by a single Presto split. (:issue:`2303`)
-
-Elasticsearch connector
------------------------
-
-* Fix query failure when an object in an Elasticsearch document
-  does not have any fields. (:issue:`2217`)
-* Add support for querying index aliases. (:issue:`2324`)
-
-Phoenix connector
------------------
-
-* Add support for mapping unsupported data types to ``VARCHAR``. This can be enabled by setting
-  the ``unsupported-type-handling`` configuration property or the ``unsupported_type_handling`` session
-  property to ``CONVERT_TO_VARCHAR``. (:issue:`2427`)
-
-Other connectors
-----------------
-
-These changes apply to the MySQL, PostgreSQL, Redshift and SQL Server connectors:
-
-* Add support for creating schemas. (:issue:`1874`)
-* Add support for caching metadata. The configuration property ``metadata.cache-ttl``
-  controls how long to cache data (it defaults to ``0ms`` which disables caching),
-  and ``metadata.cache-missing`` controls whether or not missing tables are cached. (:issue:`2290`)
-
-This change applies to the MySQL and PostgreSQL connectors:
-
-* Add support for mapping ``DECIMAL`` types with precision larger than 38
-  to Presto ``DECIMAL``. (:issue:`2088`)
diff --git a/docs/src/main/sphinx/release/release-329.md b/docs/src/main/sphinx/release/release-329.md
new file mode 100644
index 000000000000..3adb47a1ac06
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-329.md
@@ -0,0 +1,65 @@
+# Release 329 (23 Jan 2020)
+
+## General
+
+- Fix incorrect result for {func}`last_day_of_month` function for first day of month. ({issue}`2452`)
+- Fix incorrect results when handling `DOUBLE` or `REAL` types with `NaN` values. ({issue}`2582`)
+- Fix query failure when coordinator hostname contains underscores. ({issue}`2571`)
+- Fix `SHOW CREATE TABLE` failure when row types contain a field named after a
+  reserved SQL keyword. ({issue}`2130`)
+- Handle common disk failures during spill. When one disk fails but multiple
+  spill locations are configured, the healthy disks will be used for future queries.
+  ({issue}`2444`)
+- Improve performance and reduce load on external systems when
+  querying `information_schema`. ({issue}`2488`)
+- Improve performance of queries containing redundant scalar subqueries. ({issue}`2456`)
+- Limit broadcasted table size to `100MB` by default when using the `AUTOMATIC`
+  join type selection strategy. This avoids query failures or excessive memory usage when joining two or
+  more very large tables. ({issue}`2527`)
+- Enable {doc}`cost based </optimizer/cost-based-optimizations>` join reordering and join type selection
+  optimizations by default. The previous behavior can be restored by
+  setting `optimizer.join-reordering-strategy` configuration property to `ELIMINATE_CROSS_JOINS`
+  and `join-distribution-type` to `PARTITIONED`. ({issue}`2528`)
+- Hide non-standard columns `comment` and `extra_info` in the standard
+  `information_schema.columns` table. These columns can still be selected,
+  but will no longer appear when describing the table. ({issue}`2306`)
+
+## Security
+
+- Add `ldap.bind-dn` and `ldap.bind-password` LDAP properties to allow LDAP authentication
+  access LDAP server using service account. ({issue}`1917`)
+
+## Hive connector
+
+- Fix incorrect data returned when using S3 Select on uncompressed files. In our testing, S3 Select
+  was apparently returning incorrect results when reading uncompressed files, so S3 Select is disabled
+  for uncompressed files. ({issue}`2399`)
+- Fix incorrect data returned when using S3 Select on a table with `skip.header.line.count` or
+  `skip.footer.line.count` property. S3 Select API does not support skipping footers or more than one
+  line of a header.  In our testing, S3 Select was apparently sometimes returning incorrect results when
+  reading a compressed file with header skipping, so S3 Select is disabled when any of these table
+  properties is set to non-zero value. ({issue}`2399`)
+- Fix query failure for writes when one of the inserted `REAL` or `DOUBLE` values
+  is infinite or `NaN`. ({issue}`2471`)
+- Fix performance degradation reading from S3 when the Kinesis connector is installed. ({issue}`2496`)
+- Allow reading data from Parquet files when the column type is declared as `INTEGER`
+  in the table or partition, but is a `DECIMAL` type in the file. ({issue}`2451`)
+- Validate the scale of decimal types when reading Parquet files. This prevents
+  incorrect results when the decimal scale in the file does not match the declared
+  type for the table or partition. ({issue}`2451`)
+- Delete storage location when dropping an empty schema. ({issue}`2463`)
+- Improve performance when deleting multiple partitions by executing these actions concurrently. ({issue}`1812`)
+- Improve performance for queries containing `IN` predicates over bucketing columns. ({issue}`2277`)
+- Add procedure `system.drop_stats()` to remove the column statistics
+  for a table or selected partitions. ({issue}`2538`)
+
+## Elasticsearch connector
+
+- Add support for {ref}`elasticsearch-array-types`. ({issue}`2441`)
+- Reduce load on Elasticsearch cluster and improve query performance. ({issue}`2561`)
+
+## PostgreSQL connector
+
+- Fix mapping between PostgreSQL's `TIME` and Presto's `TIME` data types.
+  Previously the mapping was incorrect, shifting it by the relative offset between the session
+  time zone and the Presto server's JVM time zone. ({issue}`2549`)
diff --git a/docs/src/main/sphinx/release/release-329.rst b/docs/src/main/sphinx/release/release-329.rst
deleted file mode 100644
index 4360469429eb..000000000000
--- a/docs/src/main/sphinx/release/release-329.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-=========================
-Release 329 (23 Jan 2020)
-=========================
-
-General
--------
-
-* Fix incorrect result for :func:`last_day_of_month` function for first day of month. (:issue:`2452`)
-* Fix incorrect results when handling ``DOUBLE`` or ``REAL`` types with ``NaN`` values. (:issue:`2582`)
-* Fix query failure when coordinator hostname contains underscores. (:issue:`2571`)
-* Fix ``SHOW CREATE TABLE`` failure when row types contain a field named after a
-  reserved SQL keyword. (:issue:`2130`)
-* Handle common disk failures during spill. When one disk fails but multiple
-  spill locations are configured, the healthy disks will be used for future queries.
-  (:issue:`2444`)
-* Improve performance and reduce load on external systems when
-  querying ``information_schema``. (:issue:`2488`)
-* Improve performance of queries containing redundant scalar subqueries. (:issue:`2456`)
-* Limit broadcasted table size to ``100MB`` by default when using the ``AUTOMATIC``
-  join type selection strategy. This avoids query failures or excessive memory usage when joining two or
-  more very large tables. (:issue:`2527`)
-* Enable :doc:`cost based </optimizer/cost-based-optimizations>` join reordering and join type selection
-  optimizations by default. The previous behavior can be restored by
-  setting ``optimizer.join-reordering-strategy`` configuration property to ``ELIMINATE_CROSS_JOINS``
-  and ``join-distribution-type`` to ``PARTITIONED``. (:issue:`2528`)
-* Hide non-standard columns ``comment`` and ``extra_info`` in the standard
-  ``information_schema.columns`` table. These columns can still be selected,
-  but will no longer appear when describing the table. (:issue:`2306`)
-
-Security
---------
-
-* Add ``ldap.bind-dn`` and ``ldap.bind-password`` LDAP properties to allow LDAP authentication
-  access LDAP server using service account. (:issue:`1917`)
-
-Hive connector
---------------
-
-* Fix incorrect data returned when using S3 Select on uncompressed files. In our testing, S3 Select
-  was apparently returning incorrect results when reading uncompressed files, so S3 Select is disabled
-  for uncompressed files. (:issue:`2399`)
-* Fix incorrect data returned when using S3 Select on a table with ``skip.header.line.count`` or
-  ``skip.footer.line.count`` property. S3 Select API does not support skipping footers or more than one
-  line of a header.  In our testing, S3 Select was apparently sometimes returning incorrect results when
-  reading a compressed file with header skipping, so S3 Select is disabled when any of these table
-  properties is set to non-zero value. (:issue:`2399`)
-* Fix query failure for writes when one of the inserted ``REAL`` or ``DOUBLE`` values
-  is infinite or ``NaN``. (:issue:`2471`)
-* Fix performance degradation reading from S3 when the Kinesis connector is installed. (:issue:`2496`)
-* Allow reading data from Parquet files when the column type is declared as ``INTEGER``
-  in the table or partition, but is a ``DECIMAL`` type in the file. (:issue:`2451`)
-* Validate the scale of decimal types when reading Parquet files. This prevents
-  incorrect results when the decimal scale in the file does not match the declared
-  type for the table or partition. (:issue:`2451`)
-* Delete storage location when dropping an empty schema. (:issue:`2463`)
-* Improve performance when deleting multiple partitions by executing these actions concurrently. (:issue:`1812`)
-* Improve performance for queries containing ``IN`` predicates over bucketing columns. (:issue:`2277`)
-* Add procedure ``system.drop_stats()`` to remove the column statistics
-  for a table or selected partitions. (:issue:`2538`)
-
-Elasticsearch connector
------------------------
-
-* Add support for :ref:`elasticsearch-array-types`. (:issue:`2441`)
-* Reduce load on Elasticsearch cluster and improve query performance. (:issue:`2561`)
-
-PostgreSQL connector
---------------------
-
-* Fix mapping between PostgreSQL's ``TIME`` and Presto's ``TIME`` data types.
-  Previously the mapping was incorrect, shifting it by the relative offset between the session
-  time zone and the Presto server's JVM time zone. (:issue:`2549`)
diff --git a/docs/src/main/sphinx/release/release-330.md b/docs/src/main/sphinx/release/release-330.md
new file mode 100644
index 000000000000..7e9486d8d1fe
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-330.md
@@ -0,0 +1,121 @@
+# Release 330 (18 Feb 2020)
+
+## General
+
+- Fix incorrect behavior of {func}`format` for `char` values. Previously, the function
+  did not preserve trailing whitespace of the value being formatted. ({issue}`2629`)
+- Fix query failure in some cases when aggregation uses inputs from both sides of a join. ({issue}`2560`)
+- Fix query failure when dynamic filtering is enabled and the query contains complex
+  multi-level joins. ({issue}`2659`)
+- Fix query failure for certain co-located joins when dynamic filtering is enabled. ({issue}`2685`)
+- Fix failure of `SHOW` statements or queries that access `information_schema` schema tables
+  with an empty value used in a predicate. ({issue}`2575`)
+- Fix query failure when {doc}`/sql/execute` is used with an expression containing a function call. ({issue}`2675`)
+- Fix failure in `SHOW CATALOGS` when the user does not have permissions to see any catalogs. ({issue}`2593`)
+- Improve query performance for some join queries when {doc}`/optimizer/cost-based-optimizations`
+  are enabled. ({issue}`2722`)
+- Prevent uneven distribution of data that can occur when writing data with redistribution or writer
+  scaling enabled. ({issue}`2788`)
+- Add support for `CREATE VIEW` with comment ({issue}`2557`)
+- Add support for all major geometry types to {func}`ST_Points`. ({issue}`2535`)
+- Add `required_workers_count` and `required_workers_max_wait_time` session properties
+  to control the number of workers that must be present in the cluster before query
+  processing starts. ({issue}`2484`)
+- Add `physical_input_bytes` column to `system.runtime.tasks` table. ({issue}`2803`)
+- Verify that the target schema exists for the {doc}`/sql/use` statement. ({issue}`2764`)
+- Verify that the session catalog exists when executing {doc}`/sql/set-role`. ({issue}`2768`)
+
+## Server
+
+- Require running on {ref}`Java 11 or above <requirements-java>`. This requirement may be temporarily relaxed by adding
+  `-Dpresto-temporarily-allow-java8=true` to the Presto {ref}`jvm-config`.
+  This fallback will be removed in future versions of Presto after March 2020. ({issue}`2751`)
+- Add experimental support for running on Linux aarch64 (ARM64). ({issue}`2809`)
+
+## Security
+
+- {ref}`system-file-auth-principal-rules` are deprecated and will be removed in a future release.
+  These rules have been replaced with {doc}`/security/user-mapping`, which
+  specifies how a complex authentication user name is mapped to a simple
+  user name for Presto, and {ref}`system-file-auth-impersonation-rules` which
+  control the ability of a user to impersonate another user. ({issue}`2215`)
+- A shared secret is now required when using {doc}`/security/internal-communication`. ({issue}`2202`)
+- Kerberos for {doc}`/security/internal-communication` has been replaced with the new shared secret mechanism.
+  The `internal-communication.kerberos.enabled` and `internal-communication.kerberos.use-canonical-hostname`
+  configuration properties must be removed. ({issue}`2202`)
+- When authentication is disabled, the Presto user may now be set using standard
+  HTTP basic authentication with an empty password. ({issue}`2653`)
+
+## Web UI
+
+- Display physical read time in detailed query view. ({issue}`2805`)
+
+## JDBC driver
+
+- Fix a performance issue on JDK 11+ when connecting using HTTP/2. ({issue}`2633`)
+- Implement `PreparedStatement.setTimestamp()` variant that takes a `Calendar`. ({issue}`2732`)
+- Add `roles` property for catalog authorization roles. ({issue}`2780`)
+- Add `sessionProperties` property for setting system and catalog session properties. ({issue}`2780`)
+- Add `clientTags` property to set client tags for selecting resource groups. ({issue}`2468`)
+- Allow using the `:` character within an extra credential value specified via the
+  `extraCredentials` property. ({issue}`2780`)
+
+## CLI
+
+- Fix a performance issue on JDK 11+ when connecting using HTTP/2. ({issue}`2633`)
+
+## Cassandra connector
+
+- Fix query failure when identifiers should be quoted. ({issue}`2455`)
+
+## Hive connector
+
+- Fix reading symlinks from HDFS when using Kerberos. ({issue}`2720`)
+- Reduce Hive metastore load when updating partition statistics. ({issue}`2734`)
+- Allow redistributing writes for un-bucketed partitioned tables on the
+  partition keys, which results in a single writer per partition. This reduces
+  memory usage, results in a single file per partition, and allows writing a
+  large number of partitions (without hitting the open writer limit). However,
+  writing large partitions with a single writer can take substantially longer, so
+  this feature should only be enabled when required. To enable this feature, set the
+  `use-preferred-write-partitioning` system configuration property or the
+  `use_preferred_write_partitioning` system session property to `true`. ({issue}`2358`)
+- Remove extra file status call after writing text-based, SequenceFile, or Avro file types. ({issue}`1748`)
+- Allow using writer scaling with all file formats. Previously, it was not supported for
+  text-based, SequenceFile, or Avro formats. ({issue}`2657`)
+- Add support for symlink-based tables with Avro files. ({issue}`2720`)
+- Add support for ignoring partitions with a non-existent data directory. This can be configured
+  using the `hive.ignore-absent-partitions=true` configuration property or the
+  `ignore_absent_partitions` session property. ({issue}`2555`)
+- Allow creation of external tables with data via `CREATE TABLE AS` when
+  both `hive.non-managed-table-creates-enabled` and `hive.non-managed-table-writes-enabled`
+  are set to `true`. Previously this required executing `CREATE TABLE` and `INSERT`
+  as separate statement ({issue}`2669`)
+- Add support for Azure WASB, ADLS Gen1 (ADL) and ADLS Gen2 (ABFS) file systems. ({issue}`2494`)
+- Add experimental support for executing basic Hive views. To enable this feature, the
+  `hive.views-execution.enabled` configuration property must be set to `true`. ({issue}`2715`)
+- Add {ref}`register_partition <register-partition>` and {ref}`unregister_partition <unregister-partition>`
+  procedures for adding partitions to and removing partitions from a partitioned table. ({issue}`2692`)
+- Allow running {doc}`/sql/analyze` collecting only basic table statistics. ({issue}`2762`)
+
+## Elasticsearch connector
+
+- Improve performance of queries containing a `LIMIT` clause. ({issue}`2781`)
+- Add support for `nested` data type. ({issue}`754`)
+
+## PostgreSQL connector
+
+- Add read support for PostgreSQL `money` data type. The type is mapped to `varchar` in Presto.
+  ({issue}`2601`)
+
+## Other connectors
+
+These changes apply to the MySQL, PostgreSQL, Redshift, Phoenix and SQL Server connectors.
+
+- Respect `DEFAULT` column clause when writing to a table. ({issue}`1185`)
+
+## SPI
+
+- Allow procedures to have optional arguments with default values. ({issue}`2706`)
+- `SystemAccessControl.checkCanSetUser()` is deprecated and has been replaced
+  with {doc}`/security/user-mapping` and `SystemAccessControl.checkCanImpersonateUser()`. ({issue}`2215`)
diff --git a/docs/src/main/sphinx/release/release-330.rst b/docs/src/main/sphinx/release/release-330.rst
deleted file mode 100644
index 15ed1fa3c2f8..000000000000
--- a/docs/src/main/sphinx/release/release-330.rst
+++ /dev/null
@@ -1,135 +0,0 @@
-=========================
-Release 330 (18 Feb 2020)
-=========================
-
-General
--------
-
-* Fix incorrect behavior of :func:`format` for ``char`` values. Previously, the function
-  did not preserve trailing whitespace of the value being formatted. (:issue:`2629`)
-* Fix query failure in some cases when aggregation uses inputs from both sides of a join. (:issue:`2560`)
-* Fix query failure when dynamic filtering is enabled and the query contains complex
-  multi-level joins. (:issue:`2659`)
-* Fix query failure for certain co-located joins when dynamic filtering is enabled. (:issue:`2685`)
-* Fix failure of ``SHOW`` statements or queries that access ``information_schema`` schema tables
-  with an empty value used in a predicate. (:issue:`2575`)
-* Fix query failure when :doc:`/sql/execute` is used with an expression containing a function call. (:issue:`2675`)
-* Fix failure in ``SHOW CATALOGS`` when the user does not have permissions to see any catalogs. (:issue:`2593`)
-* Improve query performance for some join queries when :doc:`/optimizer/cost-based-optimizations`
-  are enabled. (:issue:`2722`)
-* Prevent uneven distribution of data that can occur when writing data with redistribution or writer
-  scaling enabled. (:issue:`2788`)
-* Add support for ``CREATE VIEW`` with comment (:issue:`2557`)
-* Add support for all major geometry types to :func:`ST_Points`. (:issue:`2535`)
-* Add ``required_workers_count`` and ``required_workers_max_wait_time`` session properties
-  to control the number of workers that must be present in the cluster before query
-  processing starts. (:issue:`2484`)
-* Add ``physical_input_bytes`` column to ``system.runtime.tasks`` table. (:issue:`2803`)
-* Verify that the target schema exists for the :doc:`/sql/use` statement. (:issue:`2764`)
-* Verify that the session catalog exists when executing :doc:`/sql/set-role`. (:issue:`2768`)
-
-Server
-------
-
-* Require running on :ref:`Java 11 or above <requirements-java>`. This requirement may be temporarily relaxed by adding
-  ``-Dpresto-temporarily-allow-java8=true`` to the Presto :ref:`jvm_config`.
-  This fallback will be removed in future versions of Presto after March 2020. (:issue:`2751`)
-* Add experimental support for running on Linux aarch64 (ARM64). (:issue:`2809`)
-
-Security
---------
-
-* :ref:`system-file-auth-principal-rules` are deprecated and will be removed in a future release.
-  These rules have been replaced with :doc:`/security/user-mapping`, which
-  specifies how a complex authentication user name is mapped to a simple
-  user name for Presto, and :ref:`system-file-auth-impersonation-rules` which
-  control the ability of a user to impersonate another user. (:issue:`2215`)
-* A shared secret is now required when using :doc:`/security/internal-communication`. (:issue:`2202`)
-* Kerberos for :doc:`/security/internal-communication` has been replaced with the new shared secret mechanism.
-  The ``internal-communication.kerberos.enabled`` and ``internal-communication.kerberos.use-canonical-hostname``
-  configuration properties must be removed. (:issue:`2202`)
-* When authentication is disabled, the Presto user may now be set using standard
-  HTTP basic authentication with an empty password. (:issue:`2653`)
-
-Web UI
-------
-
-* Display physical read time in detailed query view. (:issue:`2805`)
-
-JDBC driver
------------
-
-* Fix a performance issue on JDK 11+ when connecting using HTTP/2. (:issue:`2633`)
-* Implement ``PreparedStatement.setTimestamp()`` variant that takes a ``Calendar``. (:issue:`2732`)
-* Add ``roles`` property for catalog authorization roles. (:issue:`2780`)
-* Add ``sessionProperties`` property for setting system and catalog session properties. (:issue:`2780`)
-* Add ``clientTags`` property to set client tags for selecting resource groups. (:issue:`2468`)
-* Allow using the ``:`` character within an extra credential value specified via the
-  ``extraCredentials`` property. (:issue:`2780`)
-
-CLI
----
-
-* Fix a performance issue on JDK 11+ when connecting using HTTP/2. (:issue:`2633`)
-
-Cassandra connector
--------------------
-
-* Fix query failure when identifiers should be quoted. (:issue:`2455`)
-
-Hive connector
---------------
-
-* Fix reading symlinks from HDFS when using Kerberos. (:issue:`2720`)
-* Reduce Hive metastore load when updating partition statistics. (:issue:`2734`)
-* Allow redistributing writes for un-bucketed partitioned tables on the
-  partition keys, which results in a single writer per partition. This reduces
-  memory usage, results in a single file per partition, and allows writing a
-  large number of partitions (without hitting the open writer limit). However,
-  writing large partitions with a single writer can take substantially longer, so
-  this feature should only be enabled when required. To enable this feature, set the
-  ``use-preferred-write-partitioning`` system configuration property or the
-  ``use_preferred_write_partitioning`` system session property to ``true``. (:issue:`2358`)
-* Remove extra file status call after writing text-based, SequenceFile, or Avro file types. (:issue:`1748`)
-* Allow using writer scaling with all file formats. Previously, it was not supported for
-  text-based, SequenceFile, or Avro formats. (:issue:`2657`)
-* Add support for symlink-based tables with Avro files. (:issue:`2720`)
-* Add support for ignoring partitions with a non-existent data directory. This can be configured
-  using the ``hive.ignore-absent-partitions=true`` configuration property or the
-  ``ignore_absent_partitions`` session property. (:issue:`2555`)
-* Allow creation of external tables with data via ``CREATE TABLE AS`` when
-  both ``hive.non-managed-table-creates-enabled`` and ``hive.non-managed-table-writes-enabled``
-  are set to ``true``. Previously this required executing ``CREATE TABLE`` and ``INSERT``
-  as separate statement (:issue:`2669`)
-* Add support for Azure WASB, ADLS Gen1 (ADL) and ADLS Gen2 (ABFS) file systems. (:issue:`2494`)
-* Add experimental support for executing basic Hive views. To enable this feature, the
-  ``hive.views-execution.enabled`` configuration property must be set to ``true``. (:issue:`2715`)
-* Add :ref:`register_partition <register_partition>` and :ref:`unregister_partition <unregister_partition>`
-  procedures for adding partitions to and removing partitions from a partitioned table. (:issue:`2692`)
-* Allow running :doc:`/sql/analyze` collecting only basic table statistics. (:issue:`2762`)
-
-Elasticsearch connector
------------------------
-
-* Improve performance of queries containing a ``LIMIT`` clause. (:issue:`2781`)
-* Add support for ``nested`` data type. (:issue:`754`)
-
-PostgreSQL connector
---------------------
-
-* Add read support for PostgreSQL ``money`` data type. The type is mapped to ``varchar`` in Presto.
-  (:issue:`2601`)
-
-Other connectors
-----------------
-
-These changes apply to the MySQL, PostgreSQL, Redshift, Phoenix and SQL Server connectors.
-
-* Respect ``DEFAULT`` column clause when writing to a table. (:issue:`1185`)
-
-SPI
----
-
-* Allow procedures to have optional arguments with default values. (:issue:`2706`)
-* ``SystemAccessControl.checkCanSetUser()`` is deprecated and has been replaced
-  with :doc:`/security/user-mapping` and ``SystemAccessControl.checkCanImpersonateUser()``. (:issue:`2215`)
diff --git a/docs/src/main/sphinx/release/release-331.md b/docs/src/main/sphinx/release/release-331.md
new file mode 100644
index 000000000000..5e03d925cf40
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-331.md
@@ -0,0 +1,87 @@
+# Release 331 (16 Mar 2020)
+
+## General
+
+- Prevent query failures when worker is shut down gracefully. ({issue}`2648`)
+- Fix join failures for queries involving `OR` predicate with non-comparable functions. ({issue}`2861`)
+- Ensure query completed event is fired when there is an error during analysis or planning. ({issue}`2842`)
+- Fix memory accounting for `ORDER BY` queries. ({issue}`2612`)
+- Fix {func}`last_day_of_month` for `timestamp with time zone` values. ({issue}`2851`)
+- Fix excessive runtime when parsing deeply nested expressions with unmatched parenthesis. ({issue}`2968`)
+- Correctly reject `date` literals that cannot be represented in Presto. ({issue}`2888`)
+- Improve query performance by removing redundant data reshuffling. ({issue}`2853`)
+- Improve performance of inequality joins involving `BETWEEN`. ({issue}`2859`)
+- Improve join performance for dictionary encoded data. ({issue}`2862`)
+- Enable dynamic filtering by default. ({issue}`2793`)
+- Show reorder join cost in `EXPLAIN ANALYZE VERBOSE` ({issue}`2725`)
+- Allow configuring resource groups selection based on user's groups. ({issue}`3023`)
+- Add `SET AUTHORIZATION` action to {doc}`/sql/alter-schema`. ({issue}`2673`)
+- Add {doc}`/connector/bigquery`. ({issue}`2532`)
+- Add support for large prepared statements. ({issue}`2719`)
+
+## Security
+
+- Remove unused `internal-communication.jwt.enabled` configuration property. ({issue}`2709`)
+- Rename JWT configuration properties from `http.authentication.jwt.*` to `http-server.authentication.jwt.*`. ({issue}`2712`)
+- Add access control checks for query execution, view query, and kill query. This can be
+  configured using {ref}`query-rules` in {doc}`/security/file-system-access-control`. ({issue}`2213`)
+- Hide columns of tables for which the user has no privileges in {doc}`/security/file-system-access-control`. ({issue}`2925`)
+
+## JDBC driver
+
+- Implement `PreparedStatement.getMetaData()`. ({issue}`2770`)
+
+## Web UI
+
+- Fix copying worker address to clipboard. ({issue}`2865`)
+- Fix copying query ID to clipboard. ({issue}`2872`)
+- Fix display of data size values. ({issue}`2810`)
+- Fix redirect from `/` to `/ui/` when Presto is behind a proxy. ({issue}`2908`)
+- Fix display of prepared queries. ({issue}`2784`)
+- Display physical input read rate. ({issue}`2873`)
+- Add simple form based authentication that utilizes the configured password authenticator. ({issue}`2755`)
+- Allow disabling the UI via the `web-ui.enabled` configuration property. ({issue}`2755`)
+
+## CLI
+
+- Fix formatting of `varbinary` in nested data types. ({issue}`2858`)
+- Add `--timezone` parameter. ({issue}`2961`)
+
+## Hive connector
+
+- Fix incorrect results for reads from `information_schema` tables and
+  metadata queries when using a Hive 3.x metastore. ({issue}`3008`)
+- Fix query failure when using Glue metastore and the table storage descriptor has no properties. ({issue}`2905`)
+- Fix deadlock when Hive caching is enabled and has a refresh interval configured. ({issue}`2984`)
+- Respect `bucketing_version` table property when using Glue metastore. ({issue}`2905`)
+- Improve performance of partition fetching from Glue. ({issue}`3024`)
+- Add support for bucket sort order in Glue when creating or updating a table or partition. ({issue}`1870`)
+- Add support for Hive full ACID tables. ({issue}`2068`, {issue}`1591`, {issue}`2790`)
+- Allow data conversion when reading decimal data from Parquet files and precision or scale in the file schema
+  is different from the precision or scale in partition schema. ({issue}`2823`)
+- Add option to enforce that a filter on a partition key be present in the query. This can be enabled by setting the
+  `hive.query-partition-filter-required` configuration property or the `query_partition_filter_required` session property
+  to `true`. ({issue}`2334`)
+- Allow selecting the `Intelligent-Tiering` S3 storage class when writing data to S3. This can be enabled by
+  setting the `hive.s3.storage-class` configuration property to `INTELLIGENT_TIERING`. ({issue}`3032`)
+- Hide the Hive system schema `sys` for security reasons. ({issue}`3008`)
+- Add support for changing the owner of a schema. ({issue}`2673`)
+
+## MongoDB connector
+
+- Fix incorrect results when queries contain filters on certain data types, such
+  as `real` or `decimal`. ({issue}`1781`)
+
+## Other connectors
+
+These changes apply to the MemSQL, MySQL, PostgreSQL, Redshift, Phoenix, and SQL Server connectors.
+
+- Add support for dropping schemas. ({issue}`2956`)
+
+## SPI
+
+- Remove deprecated `Identity` constructors. ({issue}`2877`)
+- Introduce a builder for `ConnectorIdentity` and deprecate its public constructors. ({issue}`2877`)
+- Add support for row filtering and column masking via the `getRowFilter()` and `getColumnMask()` APIs in
+  `SystemAccessControl` and `ConnectorAccessControl`. ({issue}`1480`)
+- Add access control check for executing procedures. ({issue}`2924`)
diff --git a/docs/src/main/sphinx/release/release-331.rst b/docs/src/main/sphinx/release/release-331.rst
deleted file mode 100644
index d93075a5fe48..000000000000
--- a/docs/src/main/sphinx/release/release-331.rst
+++ /dev/null
@@ -1,98 +0,0 @@
-=========================
-Release 331 (16 Mar 2020)
-=========================
-
-General
--------
-
-* Prevent query failures when worker is shut down gracefully. (:issue:`2648`)
-* Fix join failures for queries involving ``OR`` predicate with non-comparable functions. (:issue:`2861`)
-* Ensure query completed event is fired when there is an error during analysis or planning. (:issue:`2842`)
-* Fix memory accounting for ``ORDER BY`` queries. (:issue:`2612`)
-* Fix :func:`last_day_of_month` for ``timestamp with time zone`` values. (:issue:`2851`)
-* Fix excessive runtime when parsing deeply nested expressions with unmatched parenthesis. (:issue:`2968`)
-* Correctly reject ``date`` literals that cannot be represented in Presto. (:issue:`2888`)
-* Improve query performance by removing redundant data reshuffling. (:issue:`2853`)
-* Improve performance of inequality joins involving ``BETWEEN``. (:issue:`2859`)
-* Improve join performance for dictionary encoded data. (:issue:`2862`)
-* Enable dynamic filtering by default. (:issue:`2793`)
-* Show reorder join cost in ``EXPLAIN ANALYZE VERBOSE`` (:issue:`2725`)
-* Allow configuring resource groups selection based on user's groups. (:issue:`3023`)
-* Add ``SET AUTHORIZATION`` action to :doc:`/sql/alter-schema`. (:issue:`2673`)
-* Add :doc:`/connector/bigquery`. (:issue:`2532`)
-* Add support for large prepared statements. (:issue:`2719`)
-
-Security
---------
-
-* Remove unused ``internal-communication.jwt.enabled`` configuration property. (:issue:`2709`)
-* Rename JWT configuration properties from ``http.authentication.jwt.*`` to ``http-server.authentication.jwt.*``. (:issue:`2712`)
-* Add access control checks for query execution, view query, and kill query. This can be
-  configured using :ref:`query_rules` in :doc:`/security/file-system-access-control`. (:issue:`2213`)
-* Hide columns of tables for which the user has no privileges in :doc:`/security/file-system-access-control`. (:issue:`2925`)
-
-JDBC driver
------------
-
-* Implement ``PreparedStatement.getMetaData()``. (:issue:`2770`)
-
-Web UI
-------
-
-* Fix copying worker address to clipboard. (:issue:`2865`)
-* Fix copying query ID to clipboard. (:issue:`2872`)
-* Fix display of data size values. (:issue:`2810`)
-* Fix redirect from ``/`` to ``/ui/`` when Presto is behind a proxy. (:issue:`2908`)
-* Fix display of prepared queries. (:issue:`2784`)
-* Display physical input read rate. (:issue:`2873`)
-* Add simple form based authentication that utilizes the configured password authenticator. (:issue:`2755`)
-* Allow disabling the UI via the ``web-ui.enabled`` configuration property. (:issue:`2755`)
-
-CLI
----
-
-* Fix formatting of ``varbinary`` in nested data types. (:issue:`2858`)
-* Add ``--timezone`` parameter. (:issue:`2961`)
-
-Hive connector
---------------
-
-* Fix incorrect results for reads from ``information_schema`` tables and
-  metadata queries when using a Hive 3.x metastore. (:issue:`3008`)
-* Fix query failure when using Glue metastore and the table storage descriptor has no properties. (:issue:`2905`)
-* Fix deadlock when Hive caching is enabled and has a refresh interval configured. (:issue:`2984`)
-* Respect ``bucketing_version`` table property when using Glue metastore. (:issue:`2905`)
-* Improve performance of partition fetching from Glue. (:issue:`3024`)
-* Add support for bucket sort order in Glue when creating or updating a table or partition. (:issue:`1870`)
-* Add support for Hive full ACID tables. (:issue:`2068`, :issue:`1591`, :issue:`2790`)
-* Allow data conversion when reading decimal data from Parquet files and precision or scale in the file schema
-  is different from the precision or scale in partition schema. (:issue:`2823`)
-* Add option to enforce that a filter on a partition key be present in the query. This can be enabled by setting the
-  ``hive.query-partition-filter-required`` configuration property or the ``query_partition_filter_required`` session property
-  to ``true``. (:issue:`2334`)
-* Allow selecting the ``Intelligent-Tiering`` S3 storage class when writing data to S3. This can be enabled by
-  setting the ``hive.s3.storage-class`` configuration property to ``INTELLIGENT_TIERING``. (:issue:`3032`)
-* Hide the Hive system schema ``sys`` for security reasons. (:issue:`3008`)
-* Add support for changing the owner of a schema. (:issue:`2673`)
-
-MongoDB connector
------------------
-
-* Fix incorrect results when queries contain filters on certain data types, such
-  as ``real`` or ``decimal``. (:issue:`1781`)
-
-Other connectors
-----------------
-
-These changes apply to the MemSQL, MySQL, PostgreSQL, Redshift, Phoenix, and SQL Server connectors.
-
-* Add support for dropping schemas. (:issue:`2956`)
-
-SPI
----
-
-* Remove deprecated ``Identity`` constructors. (:issue:`2877`)
-* Introduce a builder for ``ConnectorIdentity`` and deprecate its public constructors. (:issue:`2877`)
-* Add support for row filtering and column masking via the ``getRowFilter()`` and ``getColumnMask()`` APIs in
-  ``SystemAccessControl`` and ``ConnectorAccessControl``. (:issue:`1480`)
-* Add access control check for executing procedures. (:issue:`2924`)
diff --git a/docs/src/main/sphinx/release/release-332.md b/docs/src/main/sphinx/release/release-332.md
new file mode 100644
index 000000000000..9377faa25904
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-332.md
@@ -0,0 +1,99 @@
+# Release 332 (08 Apr 2020)
+
+## General
+
+- Fix query failure during planning phase for certain queries involving multiple joins. ({issue}`3149`)
+- Fix execution failure for queries involving large `IN` predicates on decimal values with precision larger than 18. ({issue}`3191`)
+- Fix prepared statements or view creation for queries containing certain nested aliases or `TABLESAMPLE` clauses. ({issue}`3250`)
+- Fix rare query failure. ({issue}`2981`)
+- Ignore trailing whitespace when loading configuration files such as
+  `etc/event-listener.properties` or `etc/group-provider.properties`.
+  Trailing whitespace in `etc/config.properties` and catalog properties
+  files was already ignored. ({issue}`3231`)
+- Reduce overhead for internal communication requests. ({issue}`3215`)
+- Include filters over all table columns in output of `EXPLAIN (TYPE IO)`. ({issue}`2743`)
+- Support configuring multiple event listeners. The properties files for all the event listeners
+  can be specified using the `event-listener.config-files` configuration property. ({issue}`3128`)
+- Add `CREATE SCHEMA ... AUTHORIZATION` syntax to create a schema with specified owner. ({issue}`3066`).
+- Add `optimizer.push-partial-aggregation-through-join` configuration property to control
+  pushing partial aggregations through inner joins. Previously, this was only available
+  via the `push_partial_aggregation_through_join` session property. ({issue}`3205`)
+- Rename configuration property `optimizer.push-aggregation-through-join`
+  to `optimizer.push-aggregation-through-outer-join`. ({issue}`3205`)
+- Add operator statistics for the number of splits processed with a dynamic filter applied. ({issue}`3217`)
+
+## Security
+
+- Fix LDAP authentication when user belongs to multiple groups. ({issue}`3206`)
+- Verify access to table columns when running `SHOW STATS`. ({issue}`2665`)
+- Only return views accessible to the user from `information_schema.views`. ({issue}`3290`)
+
+## JDBC driver
+
+- Add `clientInfo` property to set extra information about the client. ({issue}`3188`)
+- Add `traceToken` property to set a trace token for correlating requests across systems. ({issue}`3188`)
+
+## BigQuery connector
+
+- Extract parent project ID from service account before looking at the environment. ({issue}`3131`)
+
+## Elasticsearch connector
+
+- Add support for `ip` type. ({issue}`3347`)
+- Add support for `keyword` fields with numeric values. ({issue}`3381`)
+- Remove unnecessary `elasticsearch.aws.use-instance-credentials` configuration property. ({issue}`3265`)
+
+## Hive connector
+
+- Fix failure reading certain Parquet files larger than 2GB. ({issue}`2730`)
+- Improve performance when reading gzip-compressed Parquet data. ({issue}`3175`)
+- Explicitly disallow reading from Delta Lake tables. Previously, reading
+  from partitioned tables would return zero rows, and reading from
+  unpartitioned tables would fail with a cryptic error. ({issue}`3366`)
+- Add `hive.fs.new-directory-permissions` configuration property for setting the permissions of new directories
+  created by Presto. Default value is `0777`, which corresponds to previous behavior. ({issue}`3126`)
+- Add `hive.partition-use-column-names` configuration property and matching `partition_use_column_names` catalog
+  session property that allows to match columns between table and partition schemas by names. By default they are mapped
+  by index. ({issue}`2933`)
+- Add support for `CREATE SCHEMA ... AUTHORIZATION` to create a schema with specified owner. ({issue}`3066`).
+- Allow specifying the Glue metastore endpoint URL using the
+  `hive.metastore.glue.endpoint-url` configuration property. ({issue}`3239`)
+- Add experimental file system caching. This can be enabled with the `hive.cache.enabled` configuration property. ({issue}`2679`)
+- Support reading files compressed with newer versions of LZO. ({issue}`3209`)
+- Add support for Alluxio Catalog Service. ({issue}`2116`)
+- Remove unnecessary `hive.metastore.glue.use-instance-credentials` configuration property. ({issue}`3265`)
+- Remove unnecessary `hive.s3.use-instance-credentials` configuration property. ({issue}`3265`)
+- Add flexible {ref}`hive-s3-security-mapping`, allowing for separate credentials
+  or IAM roles for specific users or buckets/paths. ({issue}`3265`)
+- Add support for specifying an External ID for an IAM role trust policy using
+  the `hive.metastore.glue.external-id` configuration property ({issue}`3144`)
+- Allow using configured S3 credentials with IAM role. Previously,
+  the configured IAM role was silently ignored. ({issue}`3351`)
+
+## Kudu connector
+
+- Fix incorrect column mapping in Kudu connector. ({issue}`3170`, {issue}`2963`)
+- Fix incorrect query result for certain queries involving `IS NULL` predicates with `OR`. ({issue}`3274`)
+
+## Memory connector
+
+- Include views in the list of tables returned to the JDBC driver. ({issue}`3208`)
+
+## MongoDB connector
+
+- Add `objectid_timestamp` for extracting the timestamp from `ObjectId`. ({issue}`3089`)
+- Delete document from `_schema` collection when `DROP TABLE`
+  is executed for a table that exists only in `_schema`. ({issue}`3234`)
+
+## SQL Server connector
+
+- Disallow renaming tables between schemas. Previously, such renames were allowed
+  but the schema name was ignored when performing the rename. ({issue}`3284`)
+
+## SPI
+
+- Expose row filters and column masks in `QueryCompletedEvent`. ({issue}`3183`)
+- Expose referenced functions and procedures in `QueryCompletedEvent`. ({issue}`3246`)
+- Allow `Connector` to provide `EventListener` instances. ({issue}`3166`)
+- Deprecate the `ConnectorPageSourceProvider.createPageSource()` variant without the
+  `dynamicFilter` parameter. The method will be removed in a future release. ({issue}`3255`)
diff --git a/docs/src/main/sphinx/release/release-332.rst b/docs/src/main/sphinx/release/release-332.rst
deleted file mode 100644
index f29b52fdfe02..000000000000
--- a/docs/src/main/sphinx/release/release-332.rst
+++ /dev/null
@@ -1,112 +0,0 @@
-=========================
-Release 332 (08 Apr 2020)
-=========================
-
-General
--------
-
-* Fix query failure during planning phase for certain queries involving multiple joins. (:issue:`3149`)
-* Fix execution failure for queries involving large ``IN`` predicates on decimal values with precision larger than 18. (:issue:`3191`)
-* Fix prepared statements or view creation for queries containing certain nested aliases or ``TABLESAMPLE`` clauses. (:issue:`3250`)
-* Fix rare query failure. (:issue:`2981`)
-* Ignore trailing whitespace when loading configuration files such as
-  ``etc/event-listener.properties`` or ``etc/group-provider.properties``.
-  Trailing whitespace in ``etc/config.properties`` and catalog properties
-  files was already ignored. (:issue:`3231`)
-* Reduce overhead for internal communication requests. (:issue:`3215`)
-* Include filters over all table columns in output of ``EXPLAIN (TYPE IO)``. (:issue:`2743`)
-* Support configuring multiple event listeners. The properties files for all the event listeners
-  can be specified using the ``event-listener.config-files`` configuration property. (:issue:`3128`)
-* Add ``CREATE SCHEMA ... AUTHORIZATION`` syntax to create a schema with specified owner. (:issue:`3066`).
-* Add ``optimizer.push-partial-aggregation-through-join`` configuration property to control
-  pushing partial aggregations through inner joins. Previously, this was only available
-  via the ``push_partial_aggregation_through_join`` session property. (:issue:`3205`)
-* Rename configuration property ``optimizer.push-aggregation-through-join``
-  to ``optimizer.push-aggregation-through-outer-join``. (:issue:`3205`)
-* Add operator statistics for the number of splits processed with a dynamic filter applied. (:issue:`3217`)
-
-Security
---------
-
-* Fix LDAP authentication when user belongs to multiple groups. (:issue:`3206`)
-* Verify access to table columns when running ``SHOW STATS``. (:issue:`2665`)
-* Only return views accessible to the user from ``information_schema.views``. (:issue:`3290`)
-
-JDBC driver
------------
-
-* Add ``clientInfo`` property to set extra information about the client. (:issue:`3188`)
-* Add ``traceToken`` property to set a trace token for correlating requests across systems. (:issue:`3188`)
-
-BigQuery connector
-------------------
-
-* Extract parent project ID from service account before looking at the environment. (:issue:`3131`)
-
-Elasticsearch connector
------------------------
-
-* Add support for ``ip`` type. (:issue:`3347`)
-* Add support for ``keyword`` fields with numeric values. (:issue:`3381`)
-* Remove unnecessary ``elasticsearch.aws.use-instance-credentials`` configuration property. (:issue:`3265`)
-
-Hive connector
---------------
-
-* Fix failure reading certain Parquet files larger than 2GB. (:issue:`2730`)
-* Improve performance when reading gzip-compressed Parquet data. (:issue:`3175`)
-* Explicitly disallow reading from Delta Lake tables. Previously, reading
-  from partitioned tables would return zero rows, and reading from
-  unpartitioned tables would fail with a cryptic error. (:issue:`3366`)
-* Add ``hive.fs.new-directory-permissions`` configuration property for setting the permissions of new directories
-  created by Presto. Default value is ``0777``, which corresponds to previous behavior. (:issue:`3126`)
-* Add ``hive.partition-use-column-names`` configuration property and matching ``partition_use_column_names`` catalog
-  session property that allows to match columns between table and partition schemas by names. By default they are mapped
-  by index. (:issue:`2933`)
-* Add support for ``CREATE SCHEMA ... AUTHORIZATION`` to create a schema with specified owner. (:issue:`3066`).
-* Allow specifying the Glue metastore endpoint URL using the
-  ``hive.metastore.glue.endpoint-url`` configuration property. (:issue:`3239`)
-* Add experimental file system caching. This can be enabled with the ``hive.cache.enabled`` configuration property. (:issue:`2679`)
-* Support reading files compressed with newer versions of LZO. (:issue:`3209`)
-* Add support for :ref:`alluxio_catalog_service`. (:issue:`2116`)
-* Remove unnecessary ``hive.metastore.glue.use-instance-credentials`` configuration property. (:issue:`3265`)
-* Remove unnecessary ``hive.s3.use-instance-credentials`` configuration property. (:issue:`3265`)
-* Add flexible :ref:`hive-s3-security-mapping`, allowing for separate credentials
-  or IAM roles for specific users or buckets/paths. (:issue:`3265`)
-* Add support for specifying an External ID for an IAM role trust policy using
-  the ``hive.metastore.glue.external-id`` configuration property (:issue:`3144`)
-* Allow using configured S3 credentials with IAM role. Previously,
-  the configured IAM role was silently ignored. (:issue:`3351`)
-
-Kudu connector
---------------
-
-* Fix incorrect column mapping in Kudu connector. (:issue:`3170`, :issue:`2963`)
-* Fix incorrect query result for certain queries involving ``IS NULL`` predicates with ``OR``. (:issue:`3274`)
-
-Memory connector
-----------------
-
-* Include views in the list of tables returned to the JDBC driver. (:issue:`3208`)
-
-MongoDB connector
------------------
-
-* Add ``objectid_timestamp`` for extracting the timestamp from ``ObjectId``. (:issue:`3089`)
-* Delete document from ``_schema`` collection when ``DROP TABLE``
-  is executed for a table that exists only in ``_schema``. (:issue:`3234`)
-
-SQL Server connector
---------------------
-
-* Disallow renaming tables between schemas. Previously, such renames were allowed
-  but the schema name was ignored when performing the rename. (:issue:`3284`)
-
-SPI
----
-
-* Expose row filters and column masks in ``QueryCompletedEvent``. (:issue:`3183`)
-* Expose referenced functions and procedures in ``QueryCompletedEvent``. (:issue:`3246`)
-* Allow ``Connector`` to provide ``EventListener`` instances. (:issue:`3166`)
-* Deprecate the ``ConnectorPageSourceProvider.createPageSource()`` variant without the
-  ``dynamicFilter`` parameter. The method will be removed in a future release. (:issue:`3255`)
diff --git a/docs/src/main/sphinx/release/release-333.md b/docs/src/main/sphinx/release/release-333.md
new file mode 100644
index 000000000000..50093534a127
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-333.md
@@ -0,0 +1,83 @@
+# Release 333 (04 May 2020)
+
+## General
+
+- Fix planning failure when lambda expressions are repeated in a query. ({issue}`3218`)
+- Fix failure when input to `TRY` is a constant `NULL`. ({issue}`3408`)
+- Fix failure for {doc}`/sql/show-create-table` for tables with
+  row types that contain special characters. ({issue}`3380`)
+- Fix failure when using {func}`max_by` or {func}`min_by`
+  where the second argument is of type `varchar`. ({issue}`3424`)
+- Fix rare failure due to an invalid size estimation for T-Digests. ({issue}`3625`)
+- Do not require coordinator to have spill paths setup when spill is enabled. ({issue}`3407`)
+- Improve performance when dynamic filtering is enabled. ({issue}`3413`)
+- Improve performance of queries involving constant scalar subqueries ({issue}`3432`)
+- Allow overriding the count of available workers used for query cost
+  estimation via the `cost_estimation_worker_count` session property. ({issue}`2705`)
+- Add data integrity verification for Presto internal communication. This can be configured
+  with the `exchange.data-integrity-verification` configuration property. ({issue}`3438`)
+- Add support for `LIKE` predicate to {doc}`/sql/show-columns`. ({issue}`2997`)
+- Add {doc}`/sql/show-create-schema`. ({issue}`3099`)
+- Add {func}`starts_with` function. ({issue}`3392`)
+
+## Server
+
+- Require running on {ref}`Java 11 or above <requirements-java>`. ({issue}`2799`)
+
+## Server RPM
+
+- Reduce size of RPM and disk usage after installation. ({issue}`3595`)
+
+## Security
+
+- Allow configuring trust certificate for LDAP password authenticator. ({issue}`3523`)
+
+## JDBC driver
+
+- Fix hangs on JDK 8u252 when using secure connections. ({issue}`3444`)
+
+## BigQuery connector
+
+- Improve performance for queries that contain filters on table columns. ({issue}`3376`)
+- Add support for partitioned tables. ({issue}`3376`)
+
+## Cassandra connector
+
+- Allow {doc}`/sql/insert` statement for table having hidden `id` column. ({issue}`3499`)
+- Add support for {doc}`/sql/create-table` statement. ({issue}`3478`)
+
+## Elasticsearch connector
+
+- Fix failure when querying Elasticsearch 7.x clusters. ({issue}`3447`)
+
+## Hive connector
+
+- Fix incorrect query results when reading Parquet data with a `varchar` column predicate
+  which is a comparison with a value containing non-ASCII characters. ({issue}`3517`)
+- Ensure cleanup of resources (file descriptors, sockets, temporary files, etc.)
+  when an error occurs while writing an ORC file. ({issue}`3390`)
+- Generate multiple splits for files in bucketed tables. ({issue}`3455`)
+- Make file system caching honor Hadoop properties from `hive.config.resources`. ({issue}`3557`)
+- Disallow enabling file system caching together with S3 security mapping or GCS access tokens. ({issue}`3571`)
+- Disable file system caching parallel warmup by default.
+  It is currently broken and should not be enabled. ({issue}`3591`)
+- Include metrics from S3 Select in the S3 JMX metrics. ({issue}`3429`)
+- Report timings for request retries in S3 JMX metrics.
+  Previously, only the first request was reported. ({issue}`3429`)
+- Add S3 JMX metric for client retry pause time (how long the thread was asleep
+  between request retries in the client itself). ({issue}`3429`)
+- Add support for {doc}`/sql/show-create-schema`. ({issue}`3099`)
+- Add `hive.projection-pushdown-enabled` configuration property and
+  `projection_pushdown_enabled` session property. ({issue}`3490`)
+- Add support for connecting to the Thrift metastore using TLS. ({issue}`3440`)
+
+## MongoDB connector
+
+- Skip unknown types in nested BSON object. ({issue}`2935`)
+- Fix query failure when the user does not have access privileges for `system.views`. ({issue}`3355`)
+
+## Other connectors
+
+These changes apply to the MemSQL, MySQL, PostgreSQL, Redshift, and SQL Server connectors.
+
+- Export JMX statistics for various connector operations. ({issue}`3479`).
diff --git a/docs/src/main/sphinx/release/release-333.rst b/docs/src/main/sphinx/release/release-333.rst
deleted file mode 100644
index f0e787ef4ec5..000000000000
--- a/docs/src/main/sphinx/release/release-333.rst
+++ /dev/null
@@ -1,96 +0,0 @@
-=========================
-Release 333 (04 May 2020)
-=========================
-
-General
--------
-
-* Fix planning failure when lambda expressions are repeated in a query. (:issue:`3218`)
-* Fix failure when input to ``TRY`` is a constant ``NULL``. (:issue:`3408`)
-* Fix failure for :doc:`/sql/show-create-table` for tables with
-  row types that contain special characters. (:issue:`3380`)
-* Fix failure when using :func:`max_by` or :func:`min_by`
-  where the second argument is of type ``varchar``. (:issue:`3424`)
-* Fix rare failure due to an invalid size estimation for T-Digests. (:issue:`3625`)
-* Do not require coordinator to have spill paths setup when spill is enabled. (:issue:`3407`)
-* Improve performance when dynamic filtering is enabled. (:issue:`3413`)
-* Improve performance of queries involving constant scalar subqueries (:issue:`3432`)
-* Allow overriding the count of available workers used for query cost
-  estimation via the ``cost_estimation_worker_count`` session property. (:issue:`2705`)
-* Add data integrity verification for Presto internal communication. This can be configured
-  with the ``exchange.data-integrity-verification`` configuration property. (:issue:`3438`)
-* Add support for ``LIKE`` predicate to :doc:`/sql/show-columns`. (:issue:`2997`)
-* Add :doc:`/sql/show-create-schema`. (:issue:`3099`)
-* Add :func:`starts_with` function. (:issue:`3392`)
-
-Server
-------
-
-* Require running on :ref:`Java 11 or above <requirements-java>`. (:issue:`2799`)
-
-Server RPM
-----------
-
-* Reduce size of RPM and disk usage after installation. (:issue:`3595`)
-
-Security
---------
-
-* Allow configuring trust certificate for LDAP password authenticator. (:issue:`3523`)
-
-JDBC driver
------------
-
-* Fix hangs on JDK 8u252 when using secure connections. (:issue:`3444`)
-
-BigQuery connector
-------------------
-
-* Improve performance for queries that contain filters on table columns. (:issue:`3376`)
-* Add support for partitioned tables. (:issue:`3376`)
-
-Cassandra connector
--------------------
-
-* Allow :doc:`/sql/insert` statement for table having hidden ``id`` column. (:issue:`3499`)
-* Add support for :doc:`/sql/create-table` statement. (:issue:`3478`)
-
-Elasticsearch connector
------------------------
-
-* Fix failure when querying Elasticsearch 7.x clusters. (:issue:`3447`)
-
-Hive connector
---------------
-
-* Fix incorrect query results when reading Parquet data with a ``varchar`` column predicate
-  which is a comparison with a value containing non-ASCII characters. (:issue:`3517`)
-* Ensure cleanup of resources (file descriptors, sockets, temporary files, etc.)
-  when an error occurs while writing an ORC file. (:issue:`3390`)
-* Generate multiple splits for files in bucketed tables. (:issue:`3455`)
-* Make file system caching honor Hadoop properties from ``hive.config.resources``. (:issue:`3557`)
-* Disallow enabling file system caching together with S3 security mapping or GCS access tokens. (:issue:`3571`)
-* Disable file system caching parallel warmup by default.
-  It is currently broken and should not be enabled. (:issue:`3591`)
-* Include metrics from S3 Select in the S3 JMX metrics. (:issue:`3429`)
-* Report timings for request retries in S3 JMX metrics.
-  Previously, only the first request was reported. (:issue:`3429`)
-* Add S3 JMX metric for client retry pause time (how long the thread was asleep
-  between request retries in the client itself). (:issue:`3429`)
-* Add support for :doc:`/sql/show-create-schema`. (:issue:`3099`)
-* Add ``hive.projection-pushdown-enabled`` configuration property and
-  ``projection_pushdown_enabled`` session property. (:issue:`3490`)
-* Add support for connecting to the Thrift metastore using TLS. (:issue:`3440`)
-
-MongoDB connector
------------------
-
-* Skip unknown types in nested BSON object. (:issue:`2935`)
-* Fix query failure when the user does not have access privileges for ``system.views``. (:issue:`3355`)
-
-Other connectors
-----------------
-
-These changes apply to the MemSQL, MySQL, PostgreSQL, Redshift, and SQL Server connectors.
-
-* Export JMX statistics for various connector operations. (:issue:`3479`).
diff --git a/docs/src/main/sphinx/release/release-334.md b/docs/src/main/sphinx/release/release-334.md
new file mode 100644
index 000000000000..bfe6e77de517
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-334.md
@@ -0,0 +1,83 @@
+# Release 334 (29 May 2020)
+
+## General
+
+- Fix incorrect query results for certain queries involving comparisons of `real` and `double` types
+  when values include negative zero. ({issue}`3745`)
+- Fix failure when querying an empty table with late materialization enabled. ({issue}`3577`)
+- Fix failure when the inputs to `UNNEST` are repeated. ({issue}`3587`)
+- Fix failure when an aggregation is used in the arguments to {func}`format`. ({issue}`3829`)
+- Fix {func}`localtime` and {func}`current_time` for session zones with DST or with historical offset changes
+  in legacy (default) timestamp semantics. ({issue}`3846`, {issue}`3850`)
+- Fix dynamic filter failures in complex spatial join queries. ({issue}`3694`)
+- Improve performance of queries involving {func}`row_number`. ({issue}`3614`)
+- Improve performance of queries containing `LIKE` predicate. ({issue}`3618`)
+- Improve query performance when dynamic filtering is enabled. ({issue}`3632`)
+- Improve performance for queries that read fields from nested structures. ({issue}`2672`)
+- Add variant of {func}`random` function that produces a number in the provided range. ({issue}`1848`)
+- Show distributed plan by default in {doc}`/sql/explain`. ({issue}`3724`)
+- Add {doc}`/connector/oracle`. ({issue}`1959`)
+- Add {doc}`/connector/pinot`. ({issue}`2028`)
+- Add {doc}`/connector/prometheus`. ({issue}`2321`)
+- Add support for standards compliant ({rfc}`7239`) HTTP forwarded headers. Processing of HTTP forwarded headers is now controlled by the
+  `http-server.process-forwarded` configuration property, and the old `http-server.authentication.allow-forwarded-https` and
+  `dispatcher.forwarded-header` configuration properties are no longer supported. ({issue}`3714`)
+- Add pluggable {doc}`/develop/certificate-authenticator`. ({issue}`3804`)
+
+## JDBC driver
+
+- Implement `toString()` for `java.sql.Array` results. ({issue}`3803`)
+
+## CLI
+
+- Improve rendering of elapsed time for short queries. ({issue}`3311`)
+
+## Web UI
+
+- Add `fixed`, `certificate`, `JWT`, and `Kerberos` to UI authentication. ({issue}`3433`)
+- Show join distribution type in Live Plan. ({issue}`1323`)
+
+## JDBC driver
+
+- Improve performance of `DatabaseMetaData.getColumns()` when the
+  parameters contain unescaped `%` or `_`. ({issue}`1620`)
+
+## Elasticsearch connector
+
+- Fix failure when executing `SHOW CREATE TABLE`. ({issue}`3718`)
+- Improve performance for `count(*)` queries. ({issue}`3512`)
+- Add support for raw Elasticsearch queries. ({issue}`3735`)
+
+## Hive connector
+
+- Fix matching bucket filenames without leading zeros. ({issue}`3702`)
+- Fix creation of external tables using `CREATE TABLE AS`. Previously, the
+  tables were created as managed and with the default location. ({issue}`3755`)
+- Fix incorrect table statistics for newly created external tables. ({issue}`3819`)
+- Prevent Presto from starting when cache fails to initialize. ({issue}`3749`)
+- Fix race condition that could cause caching to be permanently disabled. ({issue}`3729`, {issue}`3810`)
+- Fix malformed reads when asynchronous read mode for caching is enabled. ({issue}`3772`)
+- Fix eviction of cached data while still under size eviction threshold. ({issue}`3772`)
+- Improve performance when creating unpartitioned external tables over large data sets. ({issue}`3624`)
+- Leverage Parquet file statistics when reading decimal columns. ({issue}`3581`)
+- Change type of `$file_modified_time` hidden column from `bigint` to `timestamp with timezone type`. ({issue}`3611`)
+- Add caching support for HDFS and Azure file systems. ({issue}`3772`)
+- Fix S3 connection pool depletion when asynchronous read mode for caching is enabled. ({issue}`3772`)
+- Disable caching on coordinator by default. ({issue}`3820`)
+- Use asynchronous read mode for caching by default. ({issue}`3799`)
+- Cache delegation token for Hive thrift metastore. This can be configured with
+  the `hive.metastore.thrift.delegation-token.cache-ttl` and `hive.metastore.thrift.delegation-token.cache-maximum-size`
+  configuration properties. ({issue}`3771`)
+
+## MemSQL connector
+
+- Include {doc}`/connector/singlestore` in the server tarball and RPM. ({issue}`3743`)
+
+## MongoDB connector
+
+- Support case insensitive database and collection names. This can be enabled with the
+  `mongodb.case-insensitive-name-matching` configuration property. ({issue}`3453`)
+
+## SPI
+
+- Allow a `SystemAccessControl` to provide an `EventListener`. ({issue}`3629`).
diff --git a/docs/src/main/sphinx/release/release-334.rst b/docs/src/main/sphinx/release/release-334.rst
deleted file mode 100644
index 373e1dcfafff..000000000000
--- a/docs/src/main/sphinx/release/release-334.rst
+++ /dev/null
@@ -1,95 +0,0 @@
-=========================
-Release 334 (29 May 2020)
-=========================
-
-General
--------
-
-* Fix incorrect query results for certain queries involving comparisons of ``real`` and ``double`` types
-  when values include negative zero. (:issue:`3745`)
-* Fix failure when querying an empty table with late materialization enabled. (:issue:`3577`)
-* Fix failure when the inputs to ``UNNEST`` are repeated. (:issue:`3587`)
-* Fix failure when an aggregation is used in the arguments to :func:`format`. (:issue:`3829`)
-* Fix :func:`localtime` and :func:`current_time` for session zones with DST or with historical offset changes
-  in legacy (default) timestamp semantics. (:issue:`3846`, :issue:`3850`)
-* Fix dynamic filter failures in complex spatial join queries. (:issue:`3694`)
-* Improve performance of queries involving :func:`row_number`. (:issue:`3614`)
-* Improve performance of queries containing ``LIKE`` predicate. (:issue:`3618`)
-* Improve query performance when dynamic filtering is enabled. (:issue:`3632`)
-* Improve performance for queries that read fields from nested structures. (:issue:`2672`)
-* Add variant of :func:`random` function that produces a number in the provided range. (:issue:`1848`)
-* Show distributed plan by default in :doc:`/sql/explain`. (:issue:`3724`)
-* Add :doc:`/connector/oracle`. (:issue:`1959`)
-* Add :doc:`/connector/pinot`. (:issue:`2028`)
-* Add :doc:`/connector/prometheus`. (:issue:`2321`)
-* Add support for standards compliant (:rfc:`7239`) HTTP forwarded headers. Processing of HTTP forwarded headers is now controlled by the
-  ``http-server.process-forwarded`` configuration property, and the old ``http-server.authentication.allow-forwarded-https`` and
-  ``dispatcher.forwarded-header`` configuration properties are no longer supported. (:issue:`3714`)
-* Add pluggable :doc:`/develop/certificate-authenticator`. (:issue:`3804`)
-
-JDBC driver
------------
-
-* Implement ``toString()`` for ``java.sql.Array`` results. (:issue:`3803`)
-
-CLI
----
-
-* Improve rendering of elapsed time for short queries. (:issue:`3311`)
-
-Web UI
-------
-
-* Add ``fixed``, ``certificate``, ``JWT``, and ``Kerberos`` to UI authentication. (:issue:`3433`)
-* Show join distribution type in Live Plan. (:issue:`1323`)
-
-JDBC driver
------------
-
-* Improve performance of ``DatabaseMetaData.getColumns()`` when the
-  parameters contain unescaped ``%`` or ``_``. (:issue:`1620`)
-
-Elasticsearch connector
------------------------
-
-* Fix failure when executing ``SHOW CREATE TABLE``. (:issue:`3718`)
-* Improve performance for ``count(*)`` queries. (:issue:`3512`)
-* Add support for raw Elasticsearch queries. (:issue:`3735`)
-
-Hive connector
---------------
-
-* Fix matching bucket filenames without leading zeros. (:issue:`3702`)
-* Fix creation of external tables using ``CREATE TABLE AS``. Previously, the
-  tables were created as managed and with the default location. (:issue:`3755`)
-* Fix incorrect table statistics for newly created external tables. (:issue:`3819`)
-* Prevent Presto from starting when cache fails to initialize. (:issue:`3749`)
-* Fix race condition that could cause caching to be permanently disabled. (:issue:`3729`, :issue:`3810`)
-* Fix malformed reads when asynchronous read mode for caching is enabled. (:issue:`3772`)
-* Fix eviction of cached data while still under size eviction threshold. (:issue:`3772`)
-* Improve performance when creating unpartitioned external tables over large data sets. (:issue:`3624`)
-* Leverage Parquet file statistics when reading decimal columns. (:issue:`3581`)
-* Change type of ``$file_modified_time`` hidden column from ``bigint`` to ``timestamp with timezone type``. (:issue:`3611`)
-* Add caching support for HDFS and Azure file systems. (:issue:`3772`)
-* Fix S3 connection pool depletion when asynchronous read mode for caching is enabled. (:issue:`3772`)
-* Disable caching on coordinator by default. (:issue:`3820`)
-* Use asynchronous read mode for caching by default. (:issue:`3799`)
-* Cache delegation token for Hive thrift metastore. This can be configured with
-  the ``hive.metastore.thrift.delegation-token.cache-ttl`` and ``hive.metastore.thrift.delegation-token.cache-maximum-size``
-  configuration properties. (:issue:`3771`)
-
-MemSQL connector
-----------------
-
-* Include :doc:`/connector/memsql` in the server tarball and RPM. (:issue:`3743`)
-
-MongoDB connector
------------------
-
-* Support case insensitive database and collection names. This can be enabled with the
-  ``mongodb.case-insensitive-name-matching`` configuration property. (:issue:`3453`)
-
-SPI
----
-
-* Allow a ``SystemAccessControl`` to provide an ``EventListener``. (:issue:`3629`).
diff --git a/docs/src/main/sphinx/release/release-335.md b/docs/src/main/sphinx/release/release-335.md
new file mode 100644
index 000000000000..10de82323def
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-335.md
@@ -0,0 +1,55 @@
+# Release 335 (14 Jun 2020)
+
+## General
+
+- Fix failure when {func}`reduce_agg` is used as a window function. ({issue}`3883`)
+- Fix incorrect cast from `TIMESTAMP` (without time zone) to `TIME` type. ({issue}`3848`)
+- Fix incorrect query results when converting very large `TIMESTAMP` values into
+  `TIMESTAMP WITH TIME ZONE`, or when parsing very large
+  `TIMESTAMP WITH TIME ZONE` values. ({issue}`3956`)
+- Return `VARCHAR` type when {func}`substr` argument is `CHAR` type. ({issue}`3599`, {issue}`3456`)
+- Improve optimized local scheduling with regard to non-uniform data distribution. ({issue}`3922`)
+- Add support for variable-precision `TIMESTAMP` (without time zone) type. ({issue}`3783`)
+- Add a variant of {func}`substring` that takes a `CHAR` argument. ({issue}`3949`)
+- Add  `information_schema.role_authorization_descriptors` table that returns information about the roles
+  granted to principals. ({issue}`3535`)
+
+## Security
+
+- Add schema access rules to {doc}`/security/file-system-access-control`. ({issue}`3766`)
+
+## Web UI
+
+- Fix the value displayed in the worker memory pools bar. ({issue}`3920`)
+
+## Accumulo connector
+
+- The server-side iterators are now in a JAR file named `presto-accumulo-iterators`. ({issue}`3673`)
+
+## Hive connector
+
+- Collect column statistics for inserts into empty tables. ({issue}`2469`)
+- Add support for `information_schema.role_authorization_descriptors` table when using the `sql-standard`
+  security mode. ({issue}`3535`)
+- Allow non-lowercase column names in {ref}`system.sync_partition_metadata<hive-procedures>` procedure. This can be enabled
+  by passing `case_sensitive=false` when invoking the procedure. ({issue}`3431`)
+- Support caching with secured coordinator. ({issue}`3874`)
+- Prevent caching from becoming disabled due to intermittent network failures. ({issue}`3874`)
+- Ensure HDFS impersonation is not enabled when caching is enabled. ({issue}`3913`)
+- Add `hive.cache.ttl` and `hive.cache.disk-usage-percentage` cache properties. ({issue}`3840`)
+- Improve query performance when caching is enabled by scheduling work on nodes with cached data. ({issue}`3922`)
+- Add support for `UNIONTYPE`.  This is mapped to `ROW` containing a `tag` field and a field for each data type in the union. For
+  example, `UNIONTYPE<INT, DOUBLE>` is mapped to `ROW(tag INTEGER, field0 INTEGER, field1 DOUBLE)`. ({issue}`3483`)
+- Make `partition_values` argument to `drop_stats` procedure optional. ({issue}`3937`)
+- Add support for dynamic partition pruning to improve performance of complex queries
+  over partitioned data. ({issue}`1072`)
+
+## Phoenix connector
+
+- Allow configuring whether `DROP TABLE` is allowed. This is controlled by the new `allow-drop-table`
+  catalog configuration property and defaults to `true`, compatible with the previous behavior. ({issue}`3953`)
+
+## SPI
+
+- Add support for aggregation pushdown into connectors via the
+  `ConnectorMetadata.applyAggregation()` method. ({issue}`3697`)
diff --git a/docs/src/main/sphinx/release/release-335.rst b/docs/src/main/sphinx/release/release-335.rst
deleted file mode 100644
index 99f03ffab73f..000000000000
--- a/docs/src/main/sphinx/release/release-335.rst
+++ /dev/null
@@ -1,64 +0,0 @@
-=========================
-Release 335 (14 Jun 2020)
-=========================
-
-General
--------
-
-* Fix failure when :func:`reduce_agg` is used as a window function. (:issue:`3883`)
-* Fix incorrect cast from ``TIMESTAMP`` (without time zone) to ``TIME`` type. (:issue:`3848`)
-* Fix incorrect query results when converting very large ``TIMESTAMP`` values into
-  ``TIMESTAMP WITH TIME ZONE``, or when parsing very large
-  ``TIMESTAMP WITH TIME ZONE`` values. (:issue:`3956`)
-* Return ``VARCHAR`` type when :func:`substr` argument is ``CHAR`` type. (:issue:`3599`, :issue:`3456`)
-* Improve optimized local scheduling with regard to non-uniform data distribution. (:issue:`3922`)
-* Add support for variable-precision ``TIMESTAMP`` (without time zone) type. (:issue:`3783`)
-* Add a variant of :func:`substring` that takes a ``CHAR`` argument. (:issue:`3949`)
-* Add  ``information_schema.role_authorization_descriptors`` table that returns information about the roles
-  granted to principals. (:issue:`3535`)
-
-Security
---------
-
-* Add schema access rules to :doc:`/security/file-system-access-control`. (:issue:`3766`)
-
-Web UI
-------
-
-* Fix the value displayed in the worker memory pools bar. (:issue:`3920`)
-
-Accumulo connector
-------------------
-
-* The server-side iterators are now in a JAR file named ``presto-accumulo-iterators``. (:issue:`3673`)
-
-Hive connector
---------------
-
-* Collect column statistics for inserts into empty tables. (:issue:`2469`)
-* Add support for ``information_schema.role_authorization_descriptors`` table when using the ``sql-standard``
-  security mode. (:issue:`3535`)
-* Allow non-lowercase column names in :ref:`system.sync_partition_metadata<hive-procedures>` procedure. This can be enabled
-  by passing ``case_sensitive=false`` when invoking the procedure. (:issue:`3431`)
-* Support caching with secured coordinator. (:issue:`3874`)
-* Prevent caching from becoming disabled due to intermittent network failures. (:issue:`3874`)
-* Ensure HDFS impersonation is not enabled when caching is enabled. (:issue:`3913`)
-* Add ``hive.cache.ttl`` and ``hive.cache.disk-usage-percentage`` cache properties. (:issue:`3840`)
-* Improve query performance when caching is enabled by scheduling work on nodes with cached data. (:issue:`3922`)
-* Add support for ``UNIONTYPE``.  This is mapped to ``ROW`` containing a ``tag`` field and a field for each data type in the union. For
-  example, ``UNIONTYPE<INT, DOUBLE>`` is mapped to ``ROW(tag INTEGER, field0 INTEGER, field1 DOUBLE)``. (:issue:`3483`)
-* Make ``partition_values`` argument to ``drop_stats`` procedure optional. (:issue:`3937`)
-* Add support for dynamic partition pruning to improve performance of complex queries
-  over partitioned data. (:issue:`1072`)
-
-Phoenix connector
------------------
-
-* Allow configuring whether ``DROP TABLE`` is allowed. This is controlled by the new ``allow-drop-table``
-  catalog configuration property and defaults to ``true``, compatible with the previous behavior. (:issue:`3953`)
-
-SPI
----
-
-* Add support for aggregation pushdown into connectors via the
-  ``ConnectorMetadata.applyAggregation()`` method. (:issue:`3697`)
diff --git a/docs/src/main/sphinx/release/release-336.md b/docs/src/main/sphinx/release/release-336.md
new file mode 100644
index 000000000000..be9cd9805631
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-336.md
@@ -0,0 +1,17 @@
+# Release 336 (16 Jun 2020)
+
+## General
+
+- Fix failure when querying timestamp columns from older clients. ({issue}`4036`)
+- Improve reporting of configuration errors. ({issue}`4050`)
+- Fix rare failure when recording server stats in T-Digests. ({issue}`3965`)
+
+## Security
+
+- Add table access rules to {doc}`/security/file-system-access-control`. ({issue}`3951`)
+- Add new `default` system access control that allows all operations except user impersonation. ({issue}`4040`)
+
+## Hive connector
+
+- Fix incorrect query results when reading Parquet files with predicates
+  when `hive.parquet.use-column-names` is set to `false` (the default). ({issue}`3574`)
diff --git a/docs/src/main/sphinx/release/release-336.rst b/docs/src/main/sphinx/release/release-336.rst
deleted file mode 100644
index 0e9bc37be371..000000000000
--- a/docs/src/main/sphinx/release/release-336.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-=========================
-Release 336 (16 Jun 2020)
-=========================
-
-General
--------
-
-* Fix failure when querying timestamp columns from older clients. (:issue:`4036`)
-* Improve reporting of configuration errors. (:issue:`4050`)
-* Fix rare failure when recording server stats in T-Digests. (:issue:`3965`)
-
-Security
---------
-
-* Add table access rules to :doc:`/security/file-system-access-control`. (:issue:`3951`)
-* Add new ``default`` system access control that allows all operations except user impersonation. (:issue:`4040`)
-
-Hive connector
---------------
-
-* Fix incorrect query results when reading Parquet files with predicates
-  when ``hive.parquet.use-column-names`` is set to ``false`` (the default). (:issue:`3574`)
diff --git a/docs/src/main/sphinx/release/release-337.md b/docs/src/main/sphinx/release/release-337.md
new file mode 100644
index 000000000000..2257c0fbf3c3
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-337.md
@@ -0,0 +1,66 @@
+# Release 337 (25 Jun 2020)
+
+:::{Note}
+This release fixes a potential security vulnerability when secure internal communication is enabled in a cluster. A malicious
+attacker can take advantage of this vulnerability to escalate privileges to internal APIs. We encourage everyone to upgrade as soon
+as possible.
+:::
+
+## General
+
+- Fix incorrect results for inequality join involving `NaN`. ({issue}`4120`)
+- Fix peak non-revocable memory metric in event listener. ({issue}`4096`)
+- Fix queued query JMX stats. ({issue}`4129`)
+- Fix rendering of types in the output of `DESCRIBE INPUT`. ({issue}`4023`)
+- Improve performance of queries involving comparisons between `DOUBLE` or `REAL` values and integer values. ({issue}`3533`)
+- Reduce idle CPU consumption in coordinator. ({issue}`3990`)
+- Add peak non-revocable memory metric to query stats. ({issue}`4096`)
+- Add support for variable-precision `TIMESTAMP WITH TIME ZONE` type ({issue}`3947`)
+- Add support for `IN` predicate with subqueries in outer join condition. ({issue}`4151`)
+- Add support for quantified comparisons (e.g., `> ALL (...)`) in aggregation queries. ({issue}`4128`)
+- Add {doc}`/connector/druid`. ({issue}`3522`)
+- Add {func}`translate` function. ({issue}`4080`)
+- Reduce worker graceful shutdown duration. ({issue}`4192`)
+
+## Security
+
+- Disable insecure authentication over HTTP by default when HTTPS with authentication is enabled. This
+  can be overridden via the `http-server.authentication.allow-insecure-over-http` configuration property. ({issue}`4199`)
+- Add support for insecure authentication over HTTPS to the Web UI. ({issue}`4199`)
+- Add {ref}`system-file-auth-system-information` which control the ability of a
+  user to access to read and write system management information.
+  ({issue}`4199`)
+- Disable user impersonation in default system security. ({issue}`4082`)
+
+## Elasticsearch connector
+
+- Add support for password authentication. ({issue}`4165`)
+
+## Hive connector
+
+- Fix reading CSV tables with `separatorChar`, `quoteChar` or `escapeChar` table property
+  containing more than one character. For compatibility with Hive, only first character is considered
+  and remaining are ignored. ({issue}`3891`)
+- Improve performance of `INSERT` queries writing to bucketed tables when some buckets do not contain any data. ({issue}`1375`)
+- Improve performance of queries reading Parquet data with predicates on `timestamp` columns. ({issue}`4104`)
+- Improve performance for join queries over partitioned tables. ({issue}`4156`)
+- Add support for `null_format` table property for tables using TextFile storage format ({issue}`4056`)
+- Add support for `null_format` table property for tables using RCText and SequenceFile
+  storage formats ({issue}`4143`)
+- Add optimized Parquet writer. The new writer is disabled by default, and can be enabled with the
+  `parquet_optimized_writer_enabled` session property or the `hive.parquet.optimized-writer.enabled` configuration
+  property. ({issue}`3400`)
+- Add support caching data in Azure Data Lake and AliyunOSS storage. ({issue}`4213`)
+- Fix failures when caching data from Google Cloud Storage. ({issue}`4213`)
+- Support ACID data files naming used when direct inserts are enabled in Hive (HIVE-21164).
+  Direct inserts is an upcoming feature in Hive 4. ({issue}`4049`)
+
+## PostgreSQL connector
+
+- Improve performance of aggregation queries by computing aggregations within PostgreSQL database.
+  Currently, the following aggregate functions are eligible for pushdown:
+  `count`,  `min`, `max`, `sum` and `avg`. ({issue}`3881`)
+
+## Base-JDBC connector library
+
+- Implement framework for aggregation pushdown. ({issue}`3881`)
diff --git a/docs/src/main/sphinx/release/release-337.rst b/docs/src/main/sphinx/release/release-337.rst
deleted file mode 100644
index 54a761d9af0b..000000000000
--- a/docs/src/main/sphinx/release/release-337.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-=========================
-Release 337 (25 Jun 2020)
-=========================
-
-.. Note:: This release fixes a potential security vulnerability when secure internal communication is enabled in a cluster. A malicious
-   attacker can take advantage of this vulnerability to escalate privileges to internal APIs. We encourage everyone to upgrade as soon
-   as possible.
-
-General
--------
-
-* Fix incorrect results for inequality join involving ``NaN``. (:issue:`4120`)
-* Fix peak non-revocable memory metric in event listener. (:issue:`4096`)
-* Fix queued query JMX stats. (:issue:`4129`)
-* Fix rendering of types in the output of ``DESCRIBE INPUT``. (:issue:`4023`)
-* Improve performance of queries involving comparisons between ``DOUBLE`` or ``REAL`` values and integer values. (:issue:`3533`)
-* Reduce idle CPU consumption in coordinator. (:issue:`3990`)
-* Add peak non-revocable memory metric to query stats. (:issue:`4096`)
-* Add support for variable-precision ``TIMESTAMP WITH TIME ZONE`` type (:issue:`3947`)
-* Add support for ``IN`` predicate with subqueries in outer join condition. (:issue:`4151`)
-* Add support for quantified comparisons (e.g., ``> ALL (...)``) in aggregation queries. (:issue:`4128`)
-* Add :doc:`/connector/druid`. (:issue:`3522`)
-* Add :func:`translate` function. (:issue:`4080`)
-* Reduce worker graceful shutdown duration. (:issue:`4192`)
-
-Security
---------
-
-* Disable insecure authentication over HTTP by default when HTTPS with authentication is enabled. This
-  can be overridden via the ``http-server.authentication.allow-insecure-over-http`` configuration property. (:issue:`4199`)
-* Add support for insecure authentication over HTTPS to the Web UI. (:issue:`4199`)
-* Add :ref:`system-file-auth-system_information` which control the ability of a
-  user to access to read and write system management information.
-  (:issue:`4199`)
-* Disable user impersonation in default system security. (:issue:`4082`)
-
-Elasticsearch connector
------------------------
-
-* Add support for password authentication. (:issue:`4165`)
-
-Hive connector
---------------
-
-* Fix reading CSV tables with ``separatorChar``, ``quoteChar`` or ``escapeChar`` table property
-  containing more than one character. For compatibility with Hive, only first character is considered
-  and remaining are ignored. (:issue:`3891`)
-* Improve performance of ``INSERT`` queries writing to bucketed tables when some buckets do not contain any data. (:issue:`1375`)
-* Improve performance of queries reading Parquet data with predicates on ``timestamp`` columns. (:issue:`4104`)
-* Improve performance for join queries over partitioned tables. (:issue:`4156`)
-* Add support for ``null_format`` table property for tables using TextFile storage format (:issue:`4056`)
-* Add support for ``null_format`` table property for tables using RCText and SequenceFile
-  storage formats (:issue:`4143`)
-* Add optimized Parquet writer. The new writer is disabled by default, and can be enabled with the
-  ``parquet_optimized_writer_enabled`` session property or the ``hive.parquet.optimized-writer.enabled`` configuration
-  property. (:issue:`3400`)
-* Add support caching data in Azure Data Lake and AliyunOSS storage. (:issue:`4213`)
-* Fix failures when caching data from Google Cloud Storage. (:issue:`4213`)
-* Support ACID data files naming used when direct inserts are enabled in Hive (HIVE-21164).
-  Direct inserts is an upcoming feature in Hive 4. (:issue:`4049`)
-
-PostgreSQL connector
---------------------
-
-* Improve performance of aggregation queries by computing aggregations within PostgreSQL database.
-  Currently, the following aggregate functions are eligible for pushdown:
-  ``count``,  ``min``, ``max``, ``sum`` and ``avg``. (:issue:`3881`)
-
-Base-JDBC connector library
----------------------------
-
-* Implement framework for aggregation pushdown. (:issue:`3881`)
diff --git a/docs/src/main/sphinx/release/release-341.md b/docs/src/main/sphinx/release/release-341.md
index 00ed37d22bfe..456368a678a2 100644
--- a/docs/src/main/sphinx/release/release-341.md
+++ b/docs/src/main/sphinx/release/release-341.md
@@ -6,10 +6,10 @@
 * Add support for variable precision `TIME WITH TIME ZONE` type. ({issue}`4905`)
 * Add {doc}`/connector/iceberg`.
 * Add {func}`human_readable_seconds` function. ({issue}`4344`)
-* Add [`reverse()`](function_reverse_varbinary) function for `VARBINARY`. ({issue}`4741`)
+* Add [`reverse()`](function-reverse-varbinary) function for `VARBINARY`. ({issue}`4741`)
 * Add support for {func}`extract` for `timestamp(p) with time zone` with values of `p` other than 3. ({issue}`4867`)
 * Add support for correlated subqueries in recursive queries. ({issue}`4877`)
-* Add [](optimizer_rule_stats) system table. ({issue}`4659`)
+* Add [](optimizer-rule-stats) system table. ({issue}`4659`)
 * Report dynamic filters statistics. ({issue}`4440`)
 * Improve query scalability when new nodes are added to cluster. ({issue}`4294`)
 * Improve error message when JSON parsing fails. ({issue}`4616`)
@@ -68,11 +68,11 @@
 * Use a temporary staging directory for temporary files when writing to sorted bucketed tables.
   This allows using a more efficient file system for temporary files. ({issue}`3434`)
 * Fix metastore cache invalidation for `GRANT` and `REVOKE`. ({issue}`4768`)
-* Add Parquet and RCBinary [configuration properties](hive_configuration_properties) `hive.parquet.time-zone`
+* Add Parquet and RCBinary [configuration properties](hive-configuration-properties) `hive.parquet.time-zone`
   and `hive.rcfile.time-zone` to adjust binary timestamp values to a specific time zone. For Hive 3.1+, this
   should be set to UTC. The default value is the JVM default time zone, for backwards compatibility with
   earlier versions of Hive. ({issue}`4799`)
-* Add ORC [configuration property](hive_configuration_properties) `hive.orc.time-zone` to set the default
+* Add ORC [configuration property](hive-configuration-properties) `hive.orc.time-zone` to set the default
   time zone for legacy ORC files that did not declare a time zone. ({issue}`4799`)
 * Replace the `hive.time-zone` configuration property with format specific properties: `hive.orc.time-zone`,
   `hive.parquet.time-zone`, `hive.rcfile.time-zone`. ({issue}`4799`)
diff --git a/docs/src/main/sphinx/release/release-352.md b/docs/src/main/sphinx/release/release-352.md
index 26af4a4cc822..3c1f7b8a811e 100644
--- a/docs/src/main/sphinx/release/release-352.md
+++ b/docs/src/main/sphinx/release/release-352.md
@@ -2,7 +2,7 @@
 
 ## General
 
-* Add support for [`WINDOW` clause](window_clause). ({issue}`651`)
+* Add support for [`WINDOW` clause](window-clause). ({issue}`651`)
 * Add support for {doc}`/sql/update`. ({issue}`5861`)
 * Add {func}`version` function. ({issue}`4627`)
 * Allow prepared statement parameters for `SHOW STATS`. ({issue}`6582`)
diff --git a/docs/src/main/sphinx/release/release-362.md b/docs/src/main/sphinx/release/release-362.md
index 6c0167a5e56f..fe6ca261ab96 100644
--- a/docs/src/main/sphinx/release/release-362.md
+++ b/docs/src/main/sphinx/release/release-362.md
@@ -14,7 +14,7 @@
 * Fix query failure when query contains a cast from `varchar` to a shorter `char`. ({issue}`9036`)
 * Fix planning failure of `INSERT` statement when source table has hidden columns. ({issue}`9150`)
 * Fix planning of recursive queries when the recursion, the base plan, or the recursion step plan produce duplicate outputs. ({issue}`9153`)
-* Fix failure when querying the [optimizer_rule_stats](optimizer_rule_stats) system table. ({issue}`8700`)
+* Fix failure when querying the [optimizer_rule_stats](optimizer-rule-stats) system table. ({issue}`8700`)
 * Fix failure for queries that push projections into connectors. ({issue}`6200`)
 * Fix planning timeout for queries containing `IS NULL`, `AND`, and `OR` predicates in the `WHERE` clause. ({issue}`9250`)
 * Fix failure for queries containing `ORDER BY ... LIMIT` when columns in the subquery are known to be constant. ({issue}`9171`)
diff --git a/docs/src/main/sphinx/release/release-365.md b/docs/src/main/sphinx/release/release-365.md
index 615181154479..6fbb9d1905b9 100644
--- a/docs/src/main/sphinx/release/release-365.md
+++ b/docs/src/main/sphinx/release/release-365.md
@@ -6,7 +6,7 @@
 * Add support for aggregate functions in row pattern recognition context. ({issue}`8738`)
 * Add support for time travel queries. ({issue}`8773`)
 * Add support for spilling aggregations containing `ORDER BY` or `DISTINCT` clauses. ({issue}`9723`)
-* Add [`contains`](ip_address_contains) function to check whether a CIDR contains an IP address. ({issue}`9654`)
+* Add [`contains`](ip-address-contains) function to check whether a CIDR contains an IP address. ({issue}`9654`)
 * Report connector metrics in `EXPLAIN ANALYZE VERBOSE`. ({issue}`9858`)
 * Report operator input row count distribution in `EXPLAIN ANALYZE VERBOSE`. ({issue}`10133`)
 * Allow executing `INSERT` or `DELETE` statements on tables restricted with a row filter. ({issue}`8856`)
diff --git a/docs/src/main/sphinx/release/release-369.md b/docs/src/main/sphinx/release/release-369.md
index d4354bf00335..f99b8ed8dc66 100644
--- a/docs/src/main/sphinx/release/release-369.md
+++ b/docs/src/main/sphinx/release/release-369.md
@@ -73,7 +73,7 @@
 
 * Add support for writing Bloom filters in ORC files. ({issue}`3939`)
 * Allow flushing the metadata cache for specific schemas, tables, or partitions
-  with the [flush_metadata_cache](hive_flush_metadata_cache) system procedure.
+  with the [flush_metadata_cache](hive-flush-metadata-cache) system procedure.
   ({issue}`10385`)
 * Add support for long lived AWS Security Token Service (STS) credentials for
   authentication with Glue catalog. ({issue}`10735`)
diff --git a/docs/src/main/sphinx/release/release-391.md b/docs/src/main/sphinx/release/release-391.md
index ac3876a475b8..7c5fa77561ff 100644
--- a/docs/src/main/sphinx/release/release-391.md
+++ b/docs/src/main/sphinx/release/release-391.md
@@ -31,7 +31,7 @@
 
 ## Hive connector
 
-* Add support for [AWS Athena partition projection](partition_projection). ({issue}`11305`)
+* Add support for [AWS Athena partition projection](partition-projection). ({issue}`11305`)
 * Improve optimized Parquet writer performance. ({issue}`13203`, {issue}`13208`)
 * Fix potential failure when creating empty ORC bucket files while using ZSTD
   compression. ({issue}`9775`)
diff --git a/docs/src/main/sphinx/release/release-408.md b/docs/src/main/sphinx/release/release-408.md
index 1645b81199e4..bb95592733af 100644
--- a/docs/src/main/sphinx/release/release-408.md
+++ b/docs/src/main/sphinx/release/release-408.md
@@ -27,6 +27,8 @@
 
 ## Delta Lake connector
 
+* Rename the connector to `delta_lake`. The old name `delta-lake` is now
+  deprecated and will be removed in a future release. ({issue}`13931`)
 * Add support for creating tables with the Trino `change_data_feed_enabled`
   table property. ({issue}`16129`)
 * Improve query performance on tables that Trino has written to with `INSERT`. ({issue}`16026`)
@@ -71,3 +73,8 @@
 
 * Add support for pushing down `=`, `<>` and `IN` predicates over text columns
   if the column uses a case-sensitive collation within SQL Server. ({issue}`15714`)
+
+## Thrift connector
+
+* Rename the connector to `trino_thrift`. The old name `trino-thrift` is now
+  deprecated and will be removed in a future release. ({issue}`13931`)
diff --git a/docs/src/main/sphinx/release/release-411.md b/docs/src/main/sphinx/release/release-411.md
index 8af41b4a1555..44b7671d7803 100644
--- a/docs/src/main/sphinx/release/release-411.md
+++ b/docs/src/main/sphinx/release/release-411.md
@@ -122,17 +122,17 @@
 ## Oracle connector
 
 * Improve performance of queries when the network latency between Trino and
-  Oracle is high, or when selecting or when selecting a small number of rows. ({issue}`16644`)
+  Oracle is high, or when selecting a small number of columns. ({issue}`16644`)
 
 ## PostgreSQL connector
 
 * Improve performance of queries when the network latency between Trino and
-  PostgreSQL is high, or when selecting or when selecting a small number of rows. ({issue}`16644`)
+  PostgreSQL is high, or when selecting a small number of columns. ({issue}`16644`)
 
 ## Redshift connector
 
 * Improve performance of queries when the network latency between Trino and
-  Redshift is high, or when selecting or when selecting a small number of rows. ({issue}`16644`)
+  Redshift is high, or when selecting a small number of columns. ({issue}`16644`)
 
 ## SingleStore connector
 
diff --git a/docs/src/main/sphinx/release/release-412.md b/docs/src/main/sphinx/release/release-412.md
index 3cdc3738c3ae..4c9030d8c7db 100644
--- a/docs/src/main/sphinx/release/release-412.md
+++ b/docs/src/main/sphinx/release/release-412.md
@@ -3,7 +3,7 @@
 ## General
 
 * Add support for aggregate functions and parameters as arguments for the
-  [`json_object()`](json_object) and [`json_array()`](json_array)
+  [`json_object()`](json-object) and [`json_array()`](json-array)
   functions. ({issue}`16489`, {issue}`16523`, {issue}`16525`)
 * Expose optimizer rule execution statistics in query statistics. The number of
   rules for which statistics are collected can be limited with the
diff --git a/docs/src/main/sphinx/release/release-413.md b/docs/src/main/sphinx/release/release-413.md
new file mode 100644
index 000000000000..f32718276358
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-413.md
@@ -0,0 +1,55 @@
+# Release 413 (12 Apr 2023)
+
+## General
+
+* Improve performance of queries involving window operations or
+  [row pattern recognition](/sql/pattern-recognition-in-window) on small
+  partitions. ({issue}`16748`)
+* Improve performance of queries with the {func}`row_number` and {func}`rank`
+  window functions. ({issue}`16753`)
+* Fix potential failure when cancelling a query. ({issue}`16960`)
+
+## Delta Lake connector
+
+* Add support for nested `timestamp with time zone` values in
+  [structural data types](structural-data-types). ({issue}`16826`)
+* Disallow using `_change_type`, `_commit_version`, and `_commit_timestamp` as
+  column names when creating a table or adding a column with
+  [change data feed](https://docs.delta.io/2.0.0/delta-change-data-feed.html). ({issue}`16913`)
+* Disallow enabling change data feed when the table contains
+  `_change_type`, `_commit_version` and `_commit_timestamp` columns. ({issue}`16913`)
+* Fix incorrect results when reading `INT32` values without a decimal logical
+  annotation in Parquet files. ({issue}`16938`)
+
+## Hive connector
+
+* Fix incorrect results when reading `INT32` values without a decimal logical
+  annotation in Parquet files. ({issue}`16938`)
+* Fix incorrect results when the file path contains hidden characters. ({issue}`16386`)
+
+## Hudi connector
+
+* Fix incorrect results when reading `INT32` values without a decimal logical
+  annotation in Parquet files. ({issue}`16938`)
+
+## Iceberg connector
+
+* Fix incorrect results when reading `INT32` values without a decimal logical
+  annotation in Parquet files. ({issue}`16938`)
+* Fix failure when creating a schema with a username containing uppercase
+  characters in the Iceberg Glue catalog. ({issue}`16116`)
+
+## Oracle connector
+
+* Add support for [table comments](/sql/comment) and creating tables with
+  comments. ({issue}`16898`)
+
+## Phoenix connector
+
+* Add support for {doc}`/sql/merge`. ({issue}`16661`)
+
+## SPI
+
+* Deprecate the `getSchemaProperties()` and `getSchemaOwner()` methods in
+  `ConnectorMetadata` in favor of versions that accept a `String` for the schema
+  name rather than `CatalogSchemaName`. ({issue}`16862`)
diff --git a/docs/src/main/sphinx/release/release-414.md b/docs/src/main/sphinx/release/release-414.md
new file mode 100644
index 000000000000..c6bb51b85aa7
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-414.md
@@ -0,0 +1,61 @@
+# Release 414 (19 Apr 2023)
+
+## General
+
+* Add [recursive member access](json-descendant-member-accessor) to the
+  [JSON path language](json-path-language). ({issue}`16854`)
+* Add the [`sequence()`](built-in-table-functions) table function. ({issue}`16716`)
+* Add support for progress estimates when
+  [fault-tolerant execution](/admin/fault-tolerant-execution) is enabled. ({issue}`13072`)
+* Add support for `CUBE` and `ROLLUP` with composite sets. ({issue}`16981`)
+* Add experimental support for tracing using [OpenTelemetry](https://opentelemetry.io/).
+  This can be enabled by setting the `tracing.enabled` configuration property to
+  `true` and optionally configuring the
+  [OLTP/gRPC endpoint](https://opentelemetry.io/docs/reference/specification/protocol/otlp/)
+  by setting the `tracing.exporter.endpoint` configuration property. ({issue}`16950`)
+* Improve performance for certain queries that produce no values. ({issue}`15555`, {issue}`16515`)
+* Fix query failure for recursive queries involving lambda expressions. ({issue}`16989`)
+* Fix incorrect results when using the {func}`sequence` function with values
+  greater than 2<sup>31</sup> (about 2.1 billion). ({issue}`16742`)
+
+## Security
+
+* Disallow [graceful shutdown](/admin/graceful-shutdown) with the `default`
+  [system access control](/security/built-in-system-access-control). Shutdowns
+  can be re-enabled by using the `allow-all` system access control, or by
+  configuring [system information rules](system-file-auth-system-information)
+  with the `file` system access control. ({issue}`17105`)
+
+## Delta Lake connector
+
+* Add support for `INSERT`, `UPDATE`, and `DELETE` operations on
+  tables with a `name` column mapping. ({issue}`12638`)
+* Add support for [Databricks 12.2 LTS](https://docs.databricks.com/release-notes/runtime/12.2.html). ({issue}`16905`)
+* Disallow reading tables with [deletion vectors](https://github.com/delta-io/delta/blob/master/PROTOCOL.md#deletion-vectors).
+  Previously, this returned incorrect results. ({issue}`16884`)
+
+## Iceberg connector
+
+* Add support for Hive external tables in the `migrate` table procedure. ({issue}`16704`)
+
+## Kafka connector
+
+* Fix query failure when a Kafka topic contains tombstones (messages with a
+  ``NULL`` value). ({issue}`16962`)
+
+## Kudu connector
+
+* Fix query failure when merging two tables that were created by
+  `CREATE TABLE ... AS SELECT ...`. ({issue}`16848`)
+
+## Pinot connector
+
+* Fix incorrect results due to incorrect pushdown of aggregations. ({issue}`12655`)
+
+## PostgreSQL connector
+
+* Fix failure when fetching table statistics for PostgreSQL 14.0 and later. ({issue}`17061`)
+
+## Redshift connector
+
+* Add support for [fault-tolerant execution](/admin/fault-tolerant-execution). ({issue}`16860`)
diff --git a/docs/src/main/sphinx/release/release-415.md b/docs/src/main/sphinx/release/release-415.md
new file mode 100644
index 000000000000..66cfe3167c1b
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-415.md
@@ -0,0 +1,36 @@
+# Release 415 (28 Apr 2023)
+
+## General
+
+* Improve performance of aggregations with variable file sizes. ({issue}`11361`)
+* Perform missing permission checks for table arguments to table functions. ({issue}`17279`)
+
+## Web UI
+
+* Add CPU planning time to the query details page. ({issue}`15318`)
+
+## Delta Lake connector
+
+* Add support for commenting on tables and columns with an `id` and `name`
+  column mapping mode. ({issue}`17139`)
+* Add support for `BETWEEN` predicates in table check constraints. ({issue}`17120`)
+
+## Hive connector
+
+* Improve performance of queries with selective filters on primitive fields in
+  `row` columns. ({issue}`15163`)
+
+## Iceberg connector
+
+* Improve performance of queries with filters when Bloom filter indexes are
+  present in Parquet files. ({issue}`17192`)
+* Fix failure when trying to use `DROP TABLE` on a corrupted table. ({issue}`12318`)
+
+## Kafka connector
+
+* Add support for Protobuf `oneof` types when using the Confluent table
+  description provider. ({issue}`16836`)
+
+## SPI
+
+* Expose ``planningCpuTime`` in ``QueryStatistics``. ({issue}`15318`)
diff --git a/docs/src/main/sphinx/release/release-416.md b/docs/src/main/sphinx/release/release-416.md
new file mode 100644
index 000000000000..224bced24d02
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-416.md
@@ -0,0 +1,14 @@
+# Release 416 (3 May 2023)
+
+## General
+
+* Improve performance of partitioned `INSERT`, `CREATE TABLE AS .. SELECT`, and
+  `EXECUTE` statements when the source table statistics are missing or 
+  inaccurate. ({issue}`16802`)
+* Improve performance of `LIKE` expressions that contain `%`. ({issue}`16167`)
+* Remove the deprecated `preferred-write-partitioning-min-number-of-partitions`
+  configuration property. ({issue}`16802`)
+
+## Hive connector
+
+* Reduce coordinator memory usage when file metadata caching is enabled. ({issue}`17270`)
diff --git a/docs/src/main/sphinx/release/release-417.md b/docs/src/main/sphinx/release/release-417.md
new file mode 100644
index 000000000000..a8cc21344336
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-417.md
@@ -0,0 +1,33 @@
+# Release 417 (10 May 2023)
+
+## General
+
+* Improve performance of `UNION ALL` queries. ({issue}`17265`)
+
+## Delta Lake connector
+
+* Add support for [`COMMENT ON VIEW`](/sql/comment). ({issue}`17089`)
+* Improve performance when reading Parquet data written by Trino. ({issue}`17373`, {issue}`17404`)
+* Improve read performance for tables with `row` columns when only a subset of
+  fields is needed for a query. ({issue}`17085`)
+
+## Hive connector
+
+* Add support for specifying arbitrary table properties via the
+  `extra_properties` table property. ({issue}`954`)
+* Improve performance when reading Parquet data written by Trino. ({issue}`17373`, {issue}`17404`)
+* Improve performance when reading text files that contain more columns in the
+  file than are mapped in the schema. ({issue}`17364`)
+* Limit file listing cache based on in-memory size instead of number of entries.
+  This is configured via the `hive.file-status-cache.max-retained-size` and
+  `hive.per-transaction-file-status-cache.max-retained-size` configuration
+  properties. The `hive.per-transaction-file-status-cache-maximum-size` and
+  `hive.file-status-cache-size` configuration properties are deprecated. ({issue}`17285`)
+
+## Hudi connector
+
+* Improve performance when reading Parquet data written by Trino. ({issue}`17373`, {issue}`17404`)
+
+## Iceberg connector
+
+* Improve performance when reading Parquet data written by Trino. ({issue}`17373`, {issue}`17404`)
diff --git a/docs/src/main/sphinx/release/release-418.md b/docs/src/main/sphinx/release/release-418.md
new file mode 100644
index 000000000000..a41eb6237ba2
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-418.md
@@ -0,0 +1,62 @@
+# Release 418 (17 May 2023)
+
+## General
+
+* Add support for [EXECUTE IMMEDIATE](/sql/execute-immediate). ({issue}`17341`)
+* Fix failure when invoking `current_timestamp`. ({issue}`17455`)
+
+## BigQuery connector
+
+* Add support for adding labels to BigQuery jobs started by Trino as part of
+  query processing. The name and value of the label can be configured via the
+  `bigquery.job.label-name` and `bigquery.job.label-format` catalog
+  configuration properties, respectively. ({issue}`16187`)
+
+## Delta Lake connector
+
+* Add support for `INSERT`, `UPDATE`, `DELETE`, and `MERGE` statements for
+  tables with an `id` column mapping. ({issue}`16600`)
+* Add the `table_changes` table function. ({issue}`16205`)
+* Improve performance of joins on partition columns. ({issue}`14493`)
+
+## Hive connector
+
+* Improve performance of querying `information_schema.tables` when using the
+  Hive metastore. ({issue}`17127`)
+* Improve performance of joins on partition columns. ({issue}`14493`)
+* Improve performance of writing Parquet files by enabling the optimized Parquet 
+  writer by default. ({issue}`17393`)
+* Remove the `temporary_staging_directory_enabled` and
+  `temporary_staging_directory_path` session properties. ({issue}`17390`)
+* Fix failure when querying text files in S3 if the native reader is enabled. ({issue}`16546`)
+
+## Hudi connector
+
+* Improve performance of joins on partition columns. ({issue}`14493`)
+
+## Iceberg connector
+
+* Improve planning time for `SELECT` queries. ({issue}`17347`)
+* Improve performance of joins on partition columns. ({issue}`14493`)
+* Fix incorrect results when querying the `$history` table if the REST catalog
+  is used. ({issue}`17470`)
+
+## Kafka connector
+
+* Fix query failure when a Kafka key or message cannot be de-serialized, and
+  instead correctly set the `_key_corrupt` and `_message_corrupt` columns. ({issue}`17479`)
+
+## Kinesis connector
+
+* Fix query failure when a Kinesis message cannot be de-serialized, and
+  instead correctly set the `_message_valid` column. ({issue}`17479`)
+
+## Oracle connector
+
+* Add support for writes when [fault-tolerant
+  execution](/admin/fault-tolerant-execution) is enabled. ({issue}`17200`)
+
+## Redis connector
+
+* Fix query failure when a Redis key or value cannot be de-serialized, and
+  instead correctly set the `_key_corrupt` and `_value_corrupt` columns. ({issue}`17479`)
diff --git a/docs/src/main/sphinx/release/release-419.md b/docs/src/main/sphinx/release/release-419.md
new file mode 100644
index 000000000000..6235d55b0571
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-419.md
@@ -0,0 +1,64 @@
+# Release 419 (5 Jun 2023)
+
+## General
+
+* Add the {func}`array_histogram` function to find the number of occurrences of
+  the unique elements in an array. ({issue}`14725 `)
+* Improve planning performance for queries involving joins. ({issue}`17458`)
+* Fix query failure when the server JSON response exceeds the 5MB limit for
+  string values. ({issue}`17557`)
+
+## Web UI
+
+* Allow uppercase or mixed case values for the `web-ui.authentication.type`
+  configuration property. ({issue}`17334`)
+
+## BigQuery connector
+
+* Add support for proxying BigQuery APIs via an HTTP(S) proxy. ({issue}`17508`)
+* Improve performance of retrieving metadata from BigQuery. ({issue}`16064`)
+
+## Delta Lake connector
+
+* Support the `id` and `name` mapping modes when adding new columns. ({issue}`17236`)
+* Improve performance of reading Parquet files. ({issue}`17612`)
+* Improve performance when writing Parquet files with
+  [structural data types](structural-data-types). ({issue}`17665`)
+* Properly display the schema, table name, and location of tables being inserted
+  into in the output of `EXPLAIN` queries. ({issue}`17590`)
+* Fix query failure when writing to a file location with a trailing `/` in its
+  name. ({issue}`17552`)
+
+## Hive connector
+
+* Add support for reading ORC files with shorthand timezone ids in the Stripe
+  footer metadata. You can set the `hive.orc.read-legacy-short-zone-id`
+  configuration property to `true` to enable this behavior. ({issue}`12303`)
+* Improve performance of reading ORC files with Bloom filter indexes. ({issue}`17530`)
+* Improve performance of reading Parquet files. ({issue}`17612`)
+* Improve optimized Parquet writer performance for
+  [structural data types](structural-data-types). ({issue}`17665`)
+* Fix query failure for tables with file paths that contain non-alphanumeric
+  characters. ({issue}`17621`)
+
+## Hudi connector
+
+* Improve performance of reading Parquet files. ({issue}`17612`)
+* Improve performance when writing Parquet files with
+  [structural data types](structural-data-types). ({issue}`17665`)
+
+## Iceberg connector
+
+* Add support for the [Nessie catalog](iceberg-nessie-catalog). ({issue}`11701`)
+* Disallow use of the `migrate` table procedure on Hive tables with `array`,
+  `map` and `row` types. Previously, this returned incorrect results after the
+  migration. ({issue}`17587`)
+* Improve performance of reading ORC files with Bloom filter indexes. ({issue}`17530`)
+* Improve performance of reading Parquet files. ({issue}`17612`)
+* Improve performance when writing Parquet files with
+  [structural data types](structural-data-types). ({issue}`17665`)
+* Improve performance of reading table statistics. ({issue}`16745`)
+
+## SPI
+
+* Remove unused `NullAdaptationPolicy` from `ScalarFunctionAdapter`. ({issue}`17706`)
diff --git a/docs/src/main/sphinx/release/release-420.md b/docs/src/main/sphinx/release/release-420.md
new file mode 100644
index 000000000000..0abd8f51ff86
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-420.md
@@ -0,0 +1,80 @@
+# Release 420 (22 Jun 2023)
+
+## General
+
+* Add support for the {func}`any_value` aggregation function. ({issue}`17777`)
+* Add support for underscores in numeric literals. ({issue}`17776`)
+* Add support for hexadecimal, binary, and octal numeric literals. ({issue}`17776`)
+* Deprecate the `dynamic-filtering.small-broadcast.*` and
+  `dynamic-filtering.large-broadcast.*` configuration properties in favor of
+  `dynamic-filtering.small.*` and `dynamic-filtering.large.*`. ({issue}`17831`)
+
+## Security
+
+* Add support for configuring authorization rules for
+  `ALTER ... SET AUTHORIZATION...` statements in file-based access control. ({issue}`16691`)
+* Remove the deprecated `legacy.allow-set-view-authorization` configuration
+  property. ({issue}`16691`)
+
+## BigQuery connector
+
+* Fix direct download of access tokens, and correctly use the proxy when it
+  is enabled with the `bigquery.rpc-proxy.enabled` configuration property. ({issue}`17783`)
+
+## Delta Lake connector
+
+* Add support for [comments](/sql/comment) on view columns. ({issue}`17773`)
+* Add support for recalculating all statistics with an `ANALYZE` statement. ({issue}`15968`)
+* Disallow using the root directory of a bucket (`scheme://authority`) as a
+  table location without a trailing slash in the location name. ({issue}`17921`)
+* Fix Parquet writer incompatibility with Apache Spark and Databricks Runtime. ({issue}`17978`)
+
+## Druid connector
+
+* Add support for tables with uppercase characters in their names. ({issue}`7197`)
+
+## Hive connector
+
+* Add a native Avro file format reader. This can be disabled with the
+  `avro.native-reader.enabled` configuration property or the
+  `avro_native_reader_enabled` session property. ({issue}`17221`)
+* Require admin role privileges to perform `ALTER ... SET AUTHORIZATION...`
+  statements when the `hive-security` configuration property is set to
+  `sql-standard`. ({issue}`16691`)
+* Improve query performance on partitioned Hive tables when table statistics are 
+  not available. ({issue}`17677`)
+* Disallow using the root directory of a bucket (`scheme://authority`) as a
+  table location without a trailing slash in the location name. ({issue}`17921`)
+* Fix Parquet writer incompatibility with Apache Spark and Databricks Runtime. ({issue}`17978`)
+* Fix reading from a Hive table when its location is the root directory of an S3
+  bucket. ({issue}`17848`)
+
+## Hudi connector
+
+* Disallow using the root directory of a bucket (`scheme://authority`) as a
+  table location without a trailing slash in the location name. ({issue}`17921`)
+* Fix Parquet writer incompatibility with Apache Spark and Databricks Runtime. ({issue}`17978`)
+* Fix failure when fetching table metadata for views. ({issue}`17901`)
+
+## Iceberg connector
+
+* Disallow using the root directory of a bucket (`scheme://authority`) as a
+  table location without a trailing slash in the location name. ({issue}`17921`)
+* Fix Parquet writer incompatibility with Apache Spark and Databricks Runtime. ({issue}`17978`)
+* Fix scheduling failure when dynamic filtering is enabled. ({issue}`17871`)
+
+## Kafka connector
+
+* Fix server startup failure when a Kafka catalog is present. ({issue}`17299`)
+
+## MongoDB connector
+
+* Add support for `ALTER TABLE ... RENAME COLUMN`. ({issue}`17874`)
+* Fix incorrect results when the order of the
+  [dbref type](https://www.mongodb.com/docs/manual/reference/database-references/#dbrefs)
+  fields is different from `databaseName`, `collectionName`, and `id`. ({issue}`17883`)
+
+## SPI
+
+* Move table function infrastructure to the `io.trino.spi.function.table`
+  package. ({issue}`17774`)
diff --git a/docs/src/main/sphinx/release/release-421.md b/docs/src/main/sphinx/release/release-421.md
new file mode 100644
index 000000000000..ffc6aebe151d
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-421.md
@@ -0,0 +1,68 @@
+# Release 421 (6 Jul 2023)
+
+## General
+
+* Add support for check constraints in an `UPDATE` statement. ({issue}`17195`)
+* Improve performance for queries involving a `year` function within an `IN`
+  predicate. ({issue}`18092`)
+* Fix failure when cancelling a query with a window function. ({issue}`18061`)
+* Fix failure for queries involving the `concat_ws` function on arrays with more
+  than 254 values. ({issue}`17816`)
+* Fix query failure or incorrect results when coercing a
+  [structural data type](structural-data-types) that contains a timestamp. ({issue}`17900`)
+
+## JDBC driver
+
+* Add support for using an alternative hostname with the `hostnameInCertificate`
+  property when SSL verification is set to `FULL`. ({issue}`17939`)
+
+## Delta Lake connector
+
+* Add support for check constraints and column invariants in `UPDATE`
+  statements. ({issue}`17195`)
+* Add support for creating tables with the `column` mapping mode. ({issue}`12638`)
+* Add support for using the `OPTIMIZE` procedure on column mapping tables. ({issue}`17527`)
+* Add support for `DROP COLUMN`. ({issue}`15792`)
+
+## Google Sheets connector
+
+* Add support for {doc}`/sql/insert` statements. ({issue}`3866`)
+
+## Hive connector
+
+* Add Hive partition projection column properties to the output of
+  `SHOW CREATE TABLE`. ({issue}`18076`)
+* Fix incorrect query results when using S3 Select with `IS NULL` or
+  `IS NOT NULL` predicates. ({issue}`17563`)
+* Fix incorrect query results when using S3 Select and a table's `null_format`
+  field is set. ({issue}`17563`)
+
+## Iceberg connector
+
+* Add support for migrating a bucketed Hive table into a non-bucketed Iceberg
+  table. ({issue}`18103`)
+
+## Kafka connector
+
+* Add support for reading Protobuf messages containing the `Any` Protobuf type.
+  This is disabled by default and can be enabled by setting the 
+  `kafka.protobuf-any-support-enabled` configuration property to `true`. ({issue}`17394`)
+
+## MongoDB connector
+
+* Improve query performance on tables with `row` columns when only a subset of
+  fields is needed for the query. ({issue}`17710`)
+
+## Redshift connector
+
+* Add support for [table comments](/sql/comment). ({issue}`16900`)
+
+## SPI
+
+* Add the `BLOCK_AND_POSITION_NOT_NULL` argument convention. ({issue}`18035`)
+* Add the `BLOCK_BUILDER` return convention that writes function results
+  directly to a `BlockBuilder`. ({issue}`18094`)
+* Add the `READ_VALUE` operator that can read a value from any argument
+  convention to any return convention.  ({issue}`18094`)
+* Remove write methods from the BlockBuilder interface. ({issue}`17342`)
+* Change array, map, and row build to use a single `writeEntry`. ({issue}`17342`)
diff --git a/docs/src/main/sphinx/release/release-422.md b/docs/src/main/sphinx/release/release-422.md
new file mode 100644
index 000000000000..bf445660001a
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-422.md
@@ -0,0 +1,63 @@
+# Release 422 (13 Jul 2023)
+
+## General
+
+* Add support for adding nested fields with an `ADD COLUMN` statement. ({issue}`16248`)
+* Improve performance of `INSERT` and `CREATE TABLE AS ... SELECT` queries. ({issue}`18005`)
+* Prevent queries from hanging when worker nodes fail and the
+  `task.retry-policy` configuration property is set to `TASK`. ({issue}`18175 `)
+
+## Security
+
+* Add support for validating JWT types with OAuth 2.0 authentication. ({issue}`17640`)
+* Fix error when the `http-server.authentication.type` configuration property
+  is set to `oauth2` or `jwt` and the `principal-field` property's value
+  differs. ({issue}`18210`)
+
+## BigQuery connector
+
+* Add support for writing to columns with a `timestamp(p) with time zone` type. ({issue}`17793`)
+
+## Delta Lake connector
+
+* Add support for renaming columns. ({issue}`15821`)
+* Improve performance of reading from tables with a large number of
+  [checkpoints](https://docs.delta.io/latest/delta-batch.html#-data-retention). ({issue}`17405`)
+* Disallow using the `vacuum` procedure when the max
+  [writer version](https://docs.delta.io/latest/versioning.html#features-by-protocol-version)
+  is above 5. ({issue}`18095`)
+
+## Hive connector
+
+* Add support for reading the `timestamp with local time zone` Hive type. ({issue}`1240`)
+* Add a native Avro file format writer. This can be disabled with the
+  `avro.native-writer.enabled` configuration property or the
+  `avro_native_writer_enabled` session property. ({issue}`18064`)
+* Fix query failure when the `hive.recursive-directories` configuration property
+  is set to true and partition names contain non-alphanumeric characters. ({issue}`18167`)
+* Fix incorrect results when reading text and `RCTEXT` files with a value that
+  contains the character that separates fields. ({issue}`18215`)
+* Fix incorrect results when reading concatenated `GZIP` compressed text files. ({issue}`18223`)
+* Fix incorrect results when reading large text and sequence files with a single
+  header row. ({issue}`18255`)
+* Fix incorrect reporting of bytes read for compressed text files. ({issue}`1828`)
+
+## Iceberg connector
+
+* Add support for adding nested fields with an `ADD COLUMN` statement. ({issue}`16248`)
+* Add support for the `register_table` procedure to register Hadoop tables. ({issue}`16363`)
+* Change the default file format to Parquet. The `iceberg.file-format`
+  catalog configuration property can be used to specify a different default file
+  format. ({issue}`18170`)
+* Improve performance of reading `row` types from Parquet files. ({issue}`17387`)
+* Fix failure when writing to tables sorted on `UUID` or `TIME` types. ({issue}`18136`)
+
+## Kudu connector
+
+* Add support for table comments when creating tables. ({issue}`17945`)
+
+## Redshift connector
+
+* Prevent returning incorrect results by throwing an error when encountering
+  unsupported types. Previously, the query would fall back to the legacy type
+  mapping. ({issue}`18209`)
diff --git a/docs/src/main/sphinx/release/release-423.md b/docs/src/main/sphinx/release/release-423.md
new file mode 100644
index 000000000000..6930d3a7b5ca
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-423.md
@@ -0,0 +1,160 @@
+# Release 423 (10 Aug 2023)
+
+## General
+
+* Add support for renaming nested fields in a column via `RENAME COLUMN`. ({issue}`16757`)
+* Add support for setting the type of a nested field in a column via `SET DATA TYPE`. ({issue}`16959`)
+* Add support for comments on materialized view columns. ({issue}`18016`)
+* Add support for displaying all Unicode characters in string literals. ({issue}`5061`)
+* Improve performance of `INSERT` and `CREATE TABLE AS ... SELECT` queries. ({issue}`18212`)
+* Improve performance when planning queries involving multiple window functions. ({issue}`18491`)
+* Improve performance of queries involving `BETWEEN` clauses. ({issue}`18501`)
+* Improve performance of queries containing redundant `ORDER BY` clauses in
+  views or `WITH` clauses. This may affect the semantics of queries that
+  incorrectly rely on implementation-specific behavior. The old behavior can be
+  restored via the `skip_redundant_sort` session property or the
+  `optimizer.skip-redundant-sort` configuration property. ({issue}`18159`)
+* Reduce default values for the `task.partitioned-writer-count` and
+  `task.scale-writers.max-writer-count` configuration properties to reduce the
+  memory requirements of queries that write data. ({issue}`18488`)
+* Remove the deprecated `optimizer.use-mark-distinct` configuration property,
+  which has been replaced with `optimizer.mark-distinct-strategy`. ({issue}`18540`)
+* Fix query planning failure due to dynamic filters in
+  [fault tolerant execution mode](/admin/fault-tolerant-execution). ({issue}`18383`)
+* Fix `EXPLAIN` failure when a query contains `WHERE ... IN (NULL)`. ({issue}`18328`)
+
+## JDBC driver
+
+* Add support for
+  [constrained delegation](https://web.mit.edu/kerberos/krb5-latest/doc/appdev/gssapi.html#constrained-delegation-s4u)
+  with Kerberos. ({issue}`17853`)
+
+## CLI
+
+* Add support for accepting a single Trino JDBC URL with parameters as an
+  alternative to passing command line arguments. ({issue}`12587`)
+
+## ClickHouse connector
+
+* Add support for `CASCADE` option in `DROP SCHEMA` statements. ({issue}`18305`)
+
+## Blackhole connector
+
+* Add support for the `COMMENT ON VIEW` statement. ({issue}`18516`)
+
+## Delta Lake connector
+
+* Add `$properties` system table which can be queried to inspect Delta Lake
+  table properties. ({issue}`17294`)
+* Add support for reading the `timestamp_ntz` type. ({issue}`17502`)
+* Add support for writing the `timestamp with time zone` type on partitioned
+  columns. ({issue}`16822`)
+* Add option to enforce that a filter on a partition key is present for
+  query processing. This can be enabled by setting the
+  ``delta.query-partition-filter-required`` configuration property or the
+  ``query_partition_filter_required`` session property to ``true``.
+  ({issue}`18345`)
+* Improve performance of the `$history` system table. ({issue}`18427`)
+* Improve memory accounting of the Parquet writer. ({issue}`18564`)
+* Allow metadata changes on Delta Lake tables with
+  [identity columns](https://github.com/delta-io/delta/blob/master/PROTOCOL.md#identity-columns). ({issue}`18200`)
+* Fix incorrectly creating files smaller than the configured
+  `file_size_threshold` as part of `OPTIMIZE`. ({issue}`18388`)
+* Fix query failure when a table has a file with a location ending with
+  whitespace. ({issue}`18206`)
+
+## Hive connector
+
+* Add support for `varchar` to `timestamp` coercion in Hive tables. ({issue}`18014`)
+* Improve memory accounting of the Parquet writer. ({issue}`18564`)
+* Remove the legacy Parquet writer, along with the
+  `parquet.optimized-writer.enabled` configuration property and the
+  `parquet_optimized_writer_enabled ` session property. Replace the
+  `parquet.optimized-writer.validation-percentage` configuration property with
+  `parquet.writer.validation-percentage`. ({issue}`18420`)
+* Disallow coercing Hive `timestamp` types to `varchar` for dates before 1900. ({issue}`18004`)
+* Fix loss of data precision when coercing Hive `timestamp` values. ({issue}`18003`)
+* Fix incorrectly creating files smaller than the configured
+  `file_size_threshold` as part of `OPTIMIZE`. ({issue}`18388`)
+* Fix query failure when a table has a file with a location ending with
+  whitespace. ({issue}`18206`)
+* Fix incorrect results when using S3 Select and a query predicate includes a
+  quote character (`"`) or a decimal column. ({issue}`17775`)
+* Add the `hive.s3select-pushdown.experimental-textfile-pushdown-enabled`
+  configuration property to enable S3 Select pushdown for `TEXTFILE` tables. ({issue}`17775`)
+
+## Hudi connector
+
+* Fix query failure when a table has a file with a location ending with
+  whitespace. ({issue}`18206`)
+
+## Iceberg connector
+
+* Add support for renaming nested fields in a column via `RENAME COLUMN`. ({issue}`16757`)
+* Add support for setting the type of a nested field in a column via
+  `SET DATA TYPE`. ({issue}`16959`)
+* Add support for comments on materialized view columns. ({issue}`18016`)
+* Add support for `tinyint` and `smallint` types in the `migrate` procedure. ({issue}`17946`)
+* Add support for reading Parquet files with time stored in millisecond precision. ({issue}`18535`)
+* Improve performance of `information_schema.columns` queries for tables managed
+  by Trino with AWS Glue as metastore. ({issue}`18315`)
+* Improve performance of `system.metadata.table_comments` when querying Iceberg
+  tables backed by AWS Glue as metastore.  ({issue}`18517`)
+* Improve performance of `information_schema.columns` when using the Glue
+  catalog. ({issue}`18586`)
+* Improve memory accounting of the Parquet writer. ({issue}`18564`)
+* Fix incorrectly creating files smaller than the configured
+  `file_size_threshold` as part of `OPTIMIZE`. ({issue}`18388`)
+* Fix query failure when a table has a file with a location ending with
+  whitespace. ({issue}`18206`)
+* Fix failure when creating a materialized view on a table which has been
+  rolled back. ({issue}`18205`)
+* Fix query failure when reading ORC files with nullable `time` columns. ({issue}`15606`)
+* Fix failure to calculate query statistics when referring to `$path` as part of
+  a `WHERE` clause. ({issue}`18330`)
+* Fix write conflict detection for `UPDATE`, `DELETE`, and `MERGE` operations.
+  In rare situations this issue may have resulted in duplicate rows when
+  multiple operations were run at the same time, or at the same time as an
+  `optimize` procedure. ({issue}`18533`)
+
+## Kafka connector
+
+* Rename the `ADD_DUMMY` value for the `kafka.empty-field-strategy`
+  configuration property and the `empty_field_strategy` session property to
+  `MARK` ({issue}`18485`).
+
+## Kudu connector
+
+* Add support for optimized local scheduling of splits. ({issue}`18121`)
+
+## MariaDB connector
+
+* Add support for `CASCADE` option in `DROP SCHEMA` statements. ({issue}`18305`)
+
+## MongoDB connector
+
+* Add support for predicate pushdown on `char` and `decimal` type. ({issue}`18382`)
+
+## MySQL connector
+
+* Add support for predicate pushdown for `=`, `<>`, `IN`, `NOT IN`, and `LIKE`
+  operators on case-sensitive `varchar` and `nvarchar` columns. ({issue}`18140`, {issue}`18441`)
+* Add support for `CASCADE` option in `DROP SCHEMA` statements. ({issue}`18305`)
+
+## Oracle connector
+
+* Add support for Oracle `timestamp` types with non-millisecond precision. ({issue}`17934`)
+* Add support for `CASCADE` option in `DROP SCHEMA` statements. ({issue}`18305`)
+
+## SingleStore connector
+
+* Add support for `CASCADE` option in `DROP SCHEMA` statements. ({issue}`18305`)
+
+## SPI
+
+* Deprecate the `ConnectorMetadata.getTableHandle(ConnectorSession, SchemaTableName)`
+  method signature. Connectors should implement
+  `ConnectorMetadata.getTableHandle(ConnectorSession, SchemaTableName, Optional, Optional)`
+  instead. ({issue}`18596`)
+* Remove the deprecated `supportsReportingWrittenBytes` method from
+  ConnectorMetadata. ({issue}`18617`)
diff --git a/docs/src/main/sphinx/release/release-424.md b/docs/src/main/sphinx/release/release-424.md
new file mode 100644
index 000000000000..9f00c41d632e
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-424.md
@@ -0,0 +1,58 @@
+# Release 424 (17 Aug 2023)
+
+## General
+
+* Reduce coordinator overhead on large clusters. ({issue}`18542`)
+* Require the JVM default charset to be UTF-8. This can be set with the JVM
+  command line option `-Dfile.encoding=UTF-8`. ({issue}`18657`)
+
+## JDBC driver
+
+* Add the number of bytes that have been written to the query results response. ({issue}`18651`)
+
+## Delta Lake connector
+
+* Remove the legacy Parquet reader, along with the
+  `parquet.optimized-reader.enabled` and
+  `parquet.optimized-nested-reader.enabled` configuration properties. ({issue}`18639`)
+
+## Hive connector
+
+* Improve performance for line-oriented Hive formats. ({issue}`18703`)
+* Improve performance of reading JSON files. ({issue}`18709`)
+* Remove the legacy Parquet reader, along with the
+  `parquet.optimized-reader.enabled` and
+  `parquet.optimized-nested-reader.enabled` configuration properties. ({issue}`18639`)
+* Fix incorrect reporting of written bytes for uncompressed text files, which
+  prevented the `target_max_file_size` session property from working. ({issue}`18701`)
+
+## Hudi connector
+
+* Remove the legacy Parquet reader, along with the
+  `parquet.optimized-reader.enabled` and
+  `parquet.optimized-nested-reader.enabled` configuration properties. ({issue}`18639`)
+
+## Iceberg connector
+
+* Add support for `CASCADE` option in `DROP SCHEMA` statements. ({issue}`18689`)
+* Remove the legacy Parquet reader, along with the
+  `parquet.optimized-reader.enabled` and
+  `parquet.optimized-nested-reader.enabled` configuration properties. ({issue}`18639`)
+* Fix potential incorrect query results when a query involves a predicate on a
+  `timestamp with time zone` column. ({issue}`18588`)
+
+## Memory connector
+
+* Add support for `CASCADE` option in `DROP SCHEMA` statements. ({issue}`18668`)
+
+## PostgreSQL connector
+
+* Add support for `CASCADE` option in `DROP SCHEMA` statements. ({issue}`18663`)
+* Remove support for Postgres versions older than
+  [version 11](https://www.postgresql.org/support/versioning/). ({issue}`18696`)
+
+## SPI
+
+* Introduce the `getNewTableWriterScalingOptions` and
+  `getInsertWriterScalingOptions` methods to `ConnectorMetadata`, which enable
+  connectors to limit writer scaling. ({issue}`18561`)
diff --git a/docs/src/main/sphinx/release/release-425.md b/docs/src/main/sphinx/release/release-425.md
new file mode 100644
index 000000000000..8883d5a123a7
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-425.md
@@ -0,0 +1,40 @@
+# Release 425 (24 Aug 2023)
+
+## General
+
+* Improve performance of `GROUP BY`. ({issue}`18106`)
+* Fix incorrect reporting of cumulative memory usage. ({issue}`18714`)
+
+## BlackHole connector
+
+* Remove support for materialized views. ({issue}`18628`)
+
+## Delta Lake connector
+
+* Add support for check constraints in `MERGE` statements. ({issue}`15411`)
+* Improve performance when statistics are missing from the transaction log. ({issue}`16743`)
+* Improve memory usage accounting of the Parquet writer. ({issue}`18756`)
+* Improve performance of `DELETE` statements when they delete the whole table or 
+  when the filters only apply to partition columns. ({issue}`18332 `)
+
+## Hive connector
+
+* Add support for `CASCADE` option in `DROP SCHEMA` statements. ({issue}`18320`)
+* Create a new directory if the specified external location for a new table does
+  not exist. ({issue}`17920`)
+* Improve memory usage accounting of the Parquet writer. ({issue}`18756`)
+* Improve performance of writing to JSON files. ({issue}`18683`)
+
+## Iceberg connector
+
+* Improve memory usage accounting of the Parquet writer. ({issue}`18756`)
+
+## Kudu connector
+
+* Add support for `CASCADE` option in `DROP SCHEMA` statements. ({issue}`18629`)
+
+## MongoDB connector
+
+* Add support for the `Decimal128` MongoDB type. ({issue}`18722`)
+* Add support for `CASCADE` option in `DROP SCHEMA` statements. ({issue}`18629`)
+* Fix query failure when reading the value of `-0` as a `decimal` type. ({issue}`18777`)
diff --git a/docs/src/main/sphinx/release/release-426.md b/docs/src/main/sphinx/release/release-426.md
new file mode 100644
index 000000000000..e5631a6ebe14
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-426.md
@@ -0,0 +1,49 @@
+# Release 426 (5 Sep 2023)
+
+## General
+
+* Add support for `SET SESSION AUTHORIZATION` and `RESET SESSION AUTHORIZATION`. ({issue}`16067`)
+* Add support for automatic type coercion when creating tables. ({issue}`13994`)
+* Improve performance of aggregations over decimal values. ({issue}`18868`)
+* Fix event listener incorrectly reporting output columns for `UPDATE`
+  statements with subqueries. ({issue}`18815`)
+* Fix failure when performing an outer join involving geospatial functions in
+  the join clause. ({issue}`18860`)
+* Fix failure when querying partitioned tables with a `WHERE` clause that
+  contains lambda expressions. ({issue}`18865`)
+* Fix failure for `GROUP BY` queries over `map` and `array` types. ({issue}`18863`)
+
+## Security
+
+* Fix authentication failure with OAuth 2.0 when authentication tokens are
+  larger than 4 KB. ({issue}`18836`)
+
+## Delta Lake connector
+
+* Add support for the `TRUNCATE TABLE` statement. ({issue}`18786`)
+* Add support for the `CASCADE` option in `DROP SCHEMA` statements. ({issue}`18333`)
+* Add support for
+  [Databricks 13.3 LTS](https://docs.databricks.com/en/release-notes/runtime/13.3lts.html). ({issue}`18888`)
+* Fix writing an incorrect transaction log for partitioned tables with an `id`
+  or `name` column mapping mode. ({issue}`18661`)
+
+## Hive connector
+
+* Add the `hive.metastore.thrift.batch-fetch.enabled` configuration property,
+  which can be set to `false` to disable batch metadata fetching from the Hive
+  metastore. ({issue}`18111`)
+* Fix `ANALYZE` failure when row count stats are missing. ({issue}`18798`)
+* Fix the `hive.target-max-file-size` configuration property being ignored
+  when writing to sorted tables. ({issue}`18653`)
+* Fix query failure when reading large SequenceFile, RCFile, or Avro files. ({issue}`18837`)
+
+## Iceberg connector
+
+* Fix the `iceberg.target-max-file-size` configuration property being ignored
+  when writing to sorted tables. ({issue}`18653`)
+
+## SPI
+
+* Remove the deprecated
+  `ConnectorMetadata#dropSchema(ConnectorSession session, String schemaName)`
+  method. ({issue}`18839`)
diff --git a/docs/src/main/sphinx/release/release-427.md b/docs/src/main/sphinx/release/release-427.md
new file mode 100644
index 000000000000..e8d34d6d94cf
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-427.md
@@ -0,0 +1,107 @@
+# Release 427 (26 Sep 2023)
+
+## General
+
+* Add support for comparing IPv4 and IPv6 addresses and CIDRs with [contains](ip-address-contains). ({issue}`18497`)
+* Improve performance of `GROUP BY` and `DISTINCT`. ({issue}`19059`)
+* Reduce coordinator memory footprint when scannning tables. ({issue}`19009`)
+* Fix failure due to exceeding node memory limits with `INSERT` statements. ({issue}`18771`)
+* Fix query hang for certain `LIKE` patterns involving a mix of `%` and `_`. ({issue}`19146`)
+
+## Security
+
+* Ensure authorization is checked when accessing table comments with table redirections. ({issue}`18514`)
+
+## Delta Lake connector
+
+* Add support for reading tables with
+  [Deletion Vectors](https://docs.delta.io/latest/delta-deletion-vectors.html). ({issue}`16903`)
+* Add support for Delta Lake writer
+  [version 7](https://docs.delta.io/latest/versioning.html#features-by-protocol-version). ({issue}`15873`)
+* Add support for writing columns with the `timestamp(p)` type. ({issue}`16927`)
+* Reduce data read from Parquet files for queries with filters. ({issue}`19032`)
+* Improve performance of writing to Parquet files. ({issue}`19122`)
+* Fix error reading Delta Lake table history when the initial transaction logs
+  have been removed. ({issue}`18845`)
+
+## Elasticsearch connector
+
+* Fix query failure when a `LIKE` clause contains multi-byte characters. ({issue}`18966`)
+
+## Hive connector
+
+* Add support for changing column comments when using the Glue catalog. ({issue}`19076`)
+* Reduce data read from Parquet files for queries with filters. ({issue}`19032`)
+* Improve performance of reading text files. ({issue}`18959`)
+* Allow changing a column's type from `double` to `varchar` in Hive tables. ({issue}`18930`)
+* Remove legacy Hive readers and writers. The `*_native_reader_enabled` and
+  `*_native_writer_enabled` session properties and `*.native-reader.enabled` and
+  `*.native-writer.enabled` configuration properties are removed. ({issue}`18241`)
+* Remove support for S3 Select. The `s3_select_pushdown_enabled` session
+  property and the `hive.s3select*` configuration properties are removed. ({issue}`18241`)
+* Remove support for disabling optimized symlink listing. The
+  `optimize_symlink_listing` session property and
+  `hive.optimize-symlink-listing` configuration property are removed. ({issue}`18241`)
+* Fix incompatibility with Hive OpenCSV deserialization. As a result, when the
+  escape character is explicitly set to `"`, a `\` (backslash) must be used
+  instead. ({issue}`18918`)
+* Fix performance regression when reading CSV files on AWS S3. ({issue}`18976`)
+* Fix failure when creating a table with a `varchar(0)` column. ({issue}`18811`)
+
+## Hudi connector
+
+* Fix query failure when reading from Hudi tables with
+  [`instants`](https://hudi.apache.org/docs/concepts/#timeline) that have been
+  replaced. ({issue}`18213`)
+
+## Iceberg connector
+
+* Add support for usage of `date` and `timestamp` arguments in `FOR TIMESTAMP AS
+  OF` expressions. ({issue}`14214`)
+* Add support for using tags with `AS OF VERSION` queries. ({issue}`19111`)
+* Reduce data read from Parquet files for queries with filters. ({issue}`19032`)
+* Improve performance of writing to Parquet files. ({issue}`19090`)
+* Improve performance of reading tables with many equality delete files. ({issue}`17114`)
+
+## Ignite connector
+
+* Add support for `UPDATE`. ({issue}`16445`)
+
+## MariaDB connector
+
+* Add support for `UPDATE`. ({issue}`16445`)
+
+## MongoDB connector
+
+* Fix query failure when mapping MongoDB `Decimal128` values with leading zeros. ({issue}`19068`)
+
+## MySQL connector
+
+* Add support for `UPDATE`. ({issue}`16445`)
+* Change mapping for MySQL `TIMESTAMP` types from `timestamp(n)` to
+  `timestamp(n) with time zone`. ({issue}`18470`)
+
+## Oracle connector
+
+* Add support for `UPDATE`. ({issue}`16445`)
+* Fix potential query failure when joins are pushed down to Oracle. ({issue}`18924`)
+
+## PostgreSQL connector
+
+* Add support for `UPDATE`. ({issue}`16445`)
+
+## Redshift connector
+
+* Add support for `UPDATE`. ({issue}`16445`)
+
+## SingleStore connector
+
+* Add support for `UPDATE`. ({issue}`16445`)
+
+## SQL Server connector
+
+* Add support for `UPDATE`. ({issue}`16445`)
+
+## SPI
+
+* Change `BlockBuilder` to no longer extend `Block`. ({issue}`18738`)
diff --git a/docs/src/main/sphinx/release/release-428.md b/docs/src/main/sphinx/release/release-428.md
new file mode 100644
index 000000000000..7bc201687c8d
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-428.md
@@ -0,0 +1,59 @@
+# Release 428 (4 Oct 2023)
+
+## General
+
+* Reduce memory usage for queries involving `GROUP BY` clauses. ({issue}`19187`)
+* Simplify writer count configuration. Add the new `task.min-writer-count`
+  and `task.max-writer-count` configuration properties along with the
+  `task_min_writer_count` and `task_max_writer_count` session properties, which
+  control the number of writers depending on scenario. Deprecate the
+  `task.writer-count`, `task.scale-writers.max-writer-count`, and
+  `task.partitioned-writer-count` configuration properties, which will be
+  removed in the future. Remove the `task_writer_count`,
+  `task_partitioned_writer_count`, and `task_scale_writers_max_writer_count`
+  session properties. ({issue}`19135`)
+* Remove support for the `parse-decimal-literals-as-double` legacy configuration
+  property. ({issue}`19166`)
+* Fix out of memory error when running queries with `GROUP BY` clauses. ({issue}`19119`)
+
+## Delta Lake connector
+
+* Reduce the number of read requests for scanning small Parquet files. Add the
+  `parquet.small-file-threshold` configuration property and the
+  `parquet_small_file_threshold` session property to change the default size of
+  `3MB`, below which, files will be read in their entirety. Setting this
+  configuration to `0B` disables the feature. ({issue}`19127`)
+* Fix potential data duplication when running `OPTIMIZE` coincides with
+  updates to a table. ({issue}`19128`)
+* Fix error when deleting rows in tables that have partitions with certain
+  non-alphanumeric characters in their names. ({issue}`18922`)
+
+## Hive connector
+
+* Reduce the number of read requests for scanning small Parquet files. Add the
+  `parquet.small-file-threshold` configuration property and the
+  `parquet_small_file_threshold` session property to change the default size of
+  `3MB`, below which, files will be read in their entirety. Setting this
+  configuration to `0B` disables the feature. ({issue}`19127`)
+
+## Hudi connector
+
+* Reduce the number of read requests for scanning small Parquet files. Add the
+  `parquet.small-file-threshold` configuration property and the
+  `parquet_small_file_threshold` session property to change the default size of
+  `3MB`, below which, files will be read in their entirety. Setting this
+  configuration to `0B` disables the feature. ({issue}`19127`)
+
+## Iceberg connector
+
+* Reduce the number of read requests for scanning small Parquet files. Add the
+  `parquet.small-file-threshold` configuration property and the
+  `parquet_small_file_threshold` session property to change the default size of
+  `3MB`, below which, files will be read in their entirety. Setting this
+  configuration to `0B` disables the feature. ({issue}`19127`)
+* Fix incorrect column statistics for the Parquet file format in manifest files. ({issue}`19052`)
+
+## Pinot connector
+
+* Add support for [query options](https://docs.pinot.apache.org/users/user-guide-query/query-options)
+  in dynamic tables. ({issue}`19078`)
diff --git a/docs/src/main/sphinx/release/release-429.md b/docs/src/main/sphinx/release/release-429.md
new file mode 100644
index 000000000000..2671df563643
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-429.md
@@ -0,0 +1,52 @@
+# Release 429 (11 Oct 2023)
+
+## General
+
+* Allow {doc}`/sql/show-functions` for a specific schema. ({issue}`19243`)
+* Add security for function listing. ({issue}`19243`)
+
+## Security
+
+* Stop performing security checks for functions in the `system.builtin` schema. ({issue}`19160`)
+* Remove support for using function kind as a rule in file-based access control. ({issue}`19160`)
+
+## Web UI
+
+* Log out from a Trino OAuth session when logging out from the Web UI. ({issue}`13060`)
+
+## Delta Lake connector
+
+* Allow using the `#` and `?` characters in S3 location paths or URLs. ({issue}`19296`)
+
+## Hive connector
+
+* Add support for changing a column's type from `varchar` to `date`. ({issue}`19201`)
+* Add support for changing a column's type from `decimal` to `tinyint`,
+  `smallint`, `integer`, or `bigint` in partitioned Hive tables. ({issue}`19201`)
+* Improve performance of reading ORC files. ({issue}`19295`)
+* Allow using the `#` and `?` characters in S3 location paths or URLs. ({issue}`19296`)
+* Fix error reading Avro files when a schema has uppercase characters in its
+  name. ({issue}`19249`)
+
+## Hudi connector
+
+* Allow using the `#` and `?` characters in S3 location paths or URLs. ({issue}`19296`)
+
+## Iceberg connector
+
+* Add support for specifying timestamp precision as part of
+  `CREATE TABLE AS .. SELECT` statements. ({issue}`13981`)
+* Improve performance of reading ORC files. ({issue}`19295`)
+* Allow using the `#` and `?` characters in S3 location paths or URLs. ({issue}`19296`)
+
+## MongoDB connector
+
+* Fix mixed case schema names being inaccessible when using custom roles and
+  the `case-insensitive-name-matching` configuration property is enabled. ({issue}`19218`)
+
+## SPI
+
+* Change function security checks to return a boolean instead of throwing an
+  exception. ({issue}`19160`)
+* Add SQL path field to `ConnectorViewDefinition`,
+  `ConnectorMaterializedViewDefinition`, and `ViewExpression`. ({issue}`19160`)
diff --git a/docs/src/main/sphinx/release/release-430.md b/docs/src/main/sphinx/release/release-430.md
new file mode 100644
index 000000000000..50779a959706
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-430.md
@@ -0,0 +1,43 @@
+# Release 430 (20 Oct 2023)
+
+## General
+
+* Improve performance of queries with `GROUP BY`. ({issue}`19302`)
+* Fix incorrect results for queries involving `ORDER BY` and window functions
+ with ordered frames. ({issue}`19399`)
+* Fix incorrect results for query involving an aggregation in a correlated
+  subquery. ({issue}`19002`)
+
+## Security
+
+* Enforce authorization capability of client when receiving commands `RESET` and
+  `SET` for `SESSION AUTHORIZATION`. ({issue}`19217`)
+
+## JDBC driver
+
+* Add support for a `timezone` parameter to set the session timezone. ({issue}`19102`)
+
+## Iceberg connector
+
+* Add an option to require filters on partition columns. This can be enabled by
+  setting the ``iceberg.query-partition-filter-required`` configuration property
+  or the ``query_partition_filter_required`` session property. ({issue}`17263`)
+* Improve performance when reading partition columns. ({issue}`19303`)
+
+## Ignite connector
+
+* Fix failure when a query contains `LIKE` with `ESCAPE`. ({issue}`19464`)
+
+## MariaDB connector
+
+* Add support for table statistics. ({issue}`19408`)
+
+## MongoDB connector
+
+* Fix incorrect results when a query contains several `<>` or `NOT IN`
+  predicates. ({issue}`19404`)
+
+## SPI
+
+* Change the Java stack type for a `map` value to `SqlMap` and a `row` value to
+  `SqlRow`, which do not implement `Block`. ({issue}`18948`)
diff --git a/docs/src/main/sphinx/release/release-431.md b/docs/src/main/sphinx/release/release-431.md
new file mode 100644
index 000000000000..5a80e2d172fb
--- /dev/null
+++ b/docs/src/main/sphinx/release/release-431.md
@@ -0,0 +1,61 @@
+# Release 431 (27 Oct 2023)
+
+## General
+
+* Add support for [](/routines). ({issue}`19308`)
+* Add support for [](/sql/create-function) and [](/sql/drop-function) statements. ({issue}`19308`)
+* Add support for the `REPLACE` modifier to the `CREATE TABLE` statement. ({issue}`13180`)
+* Disallow a `null` offset for the {func}`lead` and {func}`lag` functions. ({issue}`19003`)
+* Improve performance of queries with short running splits. ({issue}`19487`)
+
+## Security
+
+* Support defining rules for procedures in file-based access control. ({issue}`19416`)
+* Mask additional sensitive values in log files. ({issue}`19519`)
+
+## JDBC driver
+
+* Improve latency for prepared statements for Trino versions that support
+  `EXECUTE IMMEDIATE` when the `explicitPrepare` parameter to is set to `false`.
+  ({issue}`19541`)
+
+## Delta Lake connector
+
+* Replace the `hive.metastore-timeout` Hive metastore configuration property
+  with the `hive.metastore.thrift.client.connect-timeout` and
+  `hive.metastore.thrift.client.read-timeout` properties. ({issue}`19390`)
+
+## Hive connector
+
+* Add support for [SQL routine management](sql-routine-management). ({issue}`19308`)
+* Replace the `hive.metastore-timeout` Hive metastore configuration property
+  with the `hive.metastore.thrift.client.connect-timeout` and
+  `hive.metastore.thrift.client.read-timeout` properties. ({issue}`19390`)
+* Improve support for concurrent updates of table statistics in Glue. ({issue}`19463`)
+* Fix Hive view translation failures involving comparisons between char and
+  varchar fields. ({issue}`18337`)
+
+## Hudi connector
+
+* Replace the `hive.metastore-timeout` Hive metastore configuration property
+  with the `hive.metastore.thrift.client.connect-timeout` and
+  `hive.metastore.thrift.client.read-timeout` properties. ({issue}`19390`)
+
+## Iceberg connector
+
+* Add support for the `REPLACE` modifier to the `CREATE TABLE` statement. ({issue}`13180`)
+* Replace the `hive.metastore-timeout` Hive metastore configuration property
+  with the `hive.metastore.thrift.client.connect-timeout` and
+  `hive.metastore.thrift.client.read-timeout` properties. ({issue}`19390`)
+
+## Memory connector
+
+* Add support for [SQL routine management](sql-routine-management). ({issue}`19308`)
+
+## SPI
+
+* Add `ValueBlock` abstraction along with `VALUE_BLOCK_POSITION` and
+  `VALUE_BLOCK_POSITION_NOT_NULL` calling conventions. ({issue}`19385`)
+* Require a separate block position for each argument of aggregation functions.
+  ({issue}`19385`)
+* Require implementations of `Block` to implement `ValueBlock`. ({issue}`19480`)
diff --git a/docs/src/main/sphinx/routines.md b/docs/src/main/sphinx/routines.md
new file mode 100644
index 000000000000..42e5b202a794
--- /dev/null
+++ b/docs/src/main/sphinx/routines.md
@@ -0,0 +1,23 @@
+# SQL routines
+
+A SQL routine is a custom, user-defined function authored by a user of Trino in
+a client and written in SQL. More details are available in the following sections:
+
+```{toctree}
+:maxdepth: 1
+
+Introduction <routines/introduction>
+Examples <routines/examples>
+routines/begin
+routines/case
+routines/declare
+routines/function
+routines/if
+routines/iterate
+routines/leave
+routines/loop
+routines/repeat
+routines/return
+routines/set
+routines/while
+```
diff --git a/docs/src/main/sphinx/routines/begin.md b/docs/src/main/sphinx/routines/begin.md
new file mode 100644
index 000000000000..f9dab3d72302
--- /dev/null
+++ b/docs/src/main/sphinx/routines/begin.md
@@ -0,0 +1,57 @@
+# BEGIN
+
+## Synopsis
+
+```text
+BEGIN
+  [ DECLARE ... ]
+  statements
+END
+```
+
+## Description
+
+Marks the start and end of a block in a [SQL routine](/routines/introduction).
+`BEGIN` can be used wherever a statement can be used to group multiple
+statements together and to declare variables local to the block. A typical use
+case is as first statement within a [](/routines/function). Blocks can also be
+nested.
+
+After the `BEGIN` keyword, you can add variable declarations using
+[/routines/declare] statements, followed by one or more statements that define
+the main body of the routine, separated by `;`. The following statements can be
+used:
+
+* [](/routines/case)
+* [](/routines/if)
+* [](/routines/iterate)
+* [](/routines/leave)
+* [](/routines/loop)
+* [](/routines/repeat)
+* [](/routines/return)
+* [](/routines/set)
+* [](/routines/while)
+* Nested [](/routines/begin) blocks
+
+## Examples
+
+The following example computes the value `42`:
+
+```sql
+FUNCTION meaning_of_life()
+  RETURNS tinyint
+  BEGIN
+    DECLARE a tinyint DEFAULT 6;
+    DECLARE b tinyint DEFAULT 7;
+    RETURN a * b;
+  END
+```
+
+Further examples of varying complexity that cover usage of the `BEGIN` statement
+in combination with other statements are available in the [SQL routines examples
+documentation](/routines/examples).
+
+## See also
+
+* [](/routines/introduction)
+* [](/routines/function)
diff --git a/docs/src/main/sphinx/routines/case.md b/docs/src/main/sphinx/routines/case.md
new file mode 100644
index 000000000000..36251cc9b7e5
--- /dev/null
+++ b/docs/src/main/sphinx/routines/case.md
@@ -0,0 +1,61 @@
+# CASE
+
+## Synopsis
+
+Simple case:
+
+```text
+CASE
+  WHEN condition THEN statements
+  [ ... ]
+  [ ELSE statements ]
+END CASE
+```
+
+Searched case:
+
+```text
+CASE expression
+  WHEN expression THEN statements
+  [ ... ]
+  [ ELSE statements ]
+END
+```
+
+## Description
+
+The `CASE` statement is an optional construct to allow conditional processing
+in [SQL routines](/routines/introduction).
+
+The `WHEN` clauses are evaluated sequentially, stopping after the first match,
+and therefore the order of the statements is significant. The statements of the
+`ELSE` clause are executed if none of the `WHEN` clauses match.
+
+Unlike other languages like C or Java, SQL does not support case fall through,
+so processing stops at the end of the first matched case.
+
+One or more `WHEN` clauses can be used.
+
+## Examples
+
+The following example shows a simple `CASE` statement usage:
+
+```sql
+FUNCTION simple_case(a bigint)
+  RETURNS varchar
+  BEGIN
+    CASE a
+      WHEN 0 THEN RETURN 'zero';
+      WHEN 1 THEN RETURN 'one';
+      ELSE RETURN 'more than one or negative';
+    END CASE;
+  END
+```
+
+Further examples of varying complexity that cover usage of the `CASE` statement
+in combination with other statements are available in the [SQL routines examples
+documentation](/routines/examples).
+
+## See also
+
+* [](/routines/introduction)
diff --git a/docs/src/main/sphinx/routines/declare.md b/docs/src/main/sphinx/routines/declare.md
new file mode 100644
index 000000000000..4ddcddf24e3a
--- /dev/null
+++ b/docs/src/main/sphinx/routines/declare.md
@@ -0,0 +1,52 @@
+# DECLARE
+
+## Synopsis
+
+```text
+DECLARE identifier [, ...] type [ DEFAULT expression ]
+```
+
+## Description
+
+Use the `DECLARE` statement directly after the [](/routines/begin) keyword in
+[](/routines) to define one or more variables with an `identifier` as name. Each
+statement must specify the [data type](/language/types) of the variable with
+`type`. It can optionally include a default, initial value defined by an
+`expression`. The default value is `NULL` if not specified.
+
+## Examples
+
+A simple declaration of the variable `x` with the `tinyint` data type and the
+implicit default value of `null`:
+
+```sql
+DECLARE x tinyint;
+```
+
+A declaration of multiple string variables with length restricted to 25
+characters:
+
+```sql
+DECLARE first_name, last_name, middle_name varchar(25);
+```
+
+A declaration of a fixed-precision decimal number with a default value:
+
+```sql
+DECLARE uptime_requirement decimal DEFAULT 99.999;
+```
+
+A declaration with a default value from an expression:
+
+```sql
+DECLARE start_time timestamp(3) with time zone DEFAULT now();
+```
+
+Further examples of varying complexity that cover usage of the `DECLARE`
+statement in combination with other statements are available in the [SQL
+routines examples documentation](/routines/examples).
+
+## See also
+
+* [](/routines/introduction)
+* [](/language/types)
diff --git a/docs/src/main/sphinx/routines/examples.md b/docs/src/main/sphinx/routines/examples.md
new file mode 100644
index 000000000000..0d3ed0726153
--- /dev/null
+++ b/docs/src/main/sphinx/routines/examples.md
@@ -0,0 +1,371 @@
+# Example SQL routines
+
+
+After learning about [SQL routines from the
+introduction](/routines/introduction), the following sections show numerous
+examples of valid SQL routines. The routines are suitable as [inline
+routines](routine-inline) or [catalog routines](routine-catalog), after
+adjusting the name and adjusting the example invocations.
+
+The examples combine numerous supported statements. Refer to the specific
+statement documentation for further details:
+
+* [](/routines/function) for general SQL routine declaration
+* [](/routines/begin) and [](/routines/declare) for routine blocks
+* [](/routines/set) for assigning values to variables
+* [](/routines/return) for returning routine results
+* [](/routines/case) and [](/routines/if) for conditional flows
+* [](/routines/loop), [](/routines/repeat), and [](/routines/while) for looping constructs
+* [](/routines/iterate) and [](/routines/leave) for flow control
+
+A very simple routine that returns a static value without requiring any input:
+
+```sql
+FUNCTION answer()
+RETURNS BIGINT
+RETURN 42
+```
+
+## Inline and catalog routines
+
+A full example of this routine as inline routine and usage in a string
+concatenation with a cast:
+
+```sql
+WITH
+  FUNCTION answer()
+  RETURNS BIGINT
+  RETURN 42
+SELECT 'The answer is ' || CAST(answer() as varchar);
+-- The answer is 42
+```
+
+Provided the catalog `example` supports routine storage in the `default` schema,
+you can use the following:
+
+```sql
+USE example.default;
+CREATE FUNCTION example.default.answer()
+  RETURNS BIGINT
+  RETURN 42;
+```
+
+With the routine stored in the catalog, you can run the routine multiple times
+without repeated definition:
+
+```sql
+SELECT example.default.answer() + 1; -- 43
+SELECT 'The answer is' || CAST(example.default.answer() as varchar); -- The answer is 42
+```
+
+Alternatively, you can configure the SQL environment in the
+[](config-properties) to a catalog and schema that support SQL routine storage:
+
+```properties
+sql.default-function-catalog=example
+sql.default-function-schema=default
+```
+
+Now you can manage SQL routines without the full path:
+
+```sql
+CREATE FUNCTION answer()
+  RETURNS BIGINT
+  RETURN 42;
+```
+
+SQL routine invocation works without the full path:
+
+```sql
+SELECT answer() + 5; -- 47
+```
+
+## Declaration examples
+
+The result of calling the routine `answer()` is always identical, so you can
+declare it as deterministic, and add some other information:
+
+```sql
+FUNCTION answer()
+LANGUAGE SQL
+DETERMINISTIC
+RETURNS BIGINT
+COMMENT 'Provide the answer to the question about life, the universe, and everything.'
+RETURN 42
+```
+
+The comment and other information about the routine is visible in the output of
+[](/sql/show-functions).
+
+A simple routine that returns a greeting back to the input string `fullname`
+concatenating two strings and the input value:
+
+```sql
+FUNCTION hello(fullname VARCHAR)
+RETURNS VARCHAR
+RETURN 'Hello, ' || fullname || '!'
+```
+
+Following is an example invocation:
+
+```sql
+SELECT hello('Jane Doe'); -- Hello, Jane Doe!
+```
+
+A first example routine, that uses multiple statements in a `BEGIN` block. It
+calculates the result of a multiplication of the input integer with `99`. The
+`bigint` data type is used for all variables and values. The value of integer
+`99` is cast to `bigint` in the default value assignment for the variable `x`.
+
+```sql
+FUNCTION times_ninety_nine(a bigint)
+RETURNS bigint
+BEGIN
+  DECLARE x bigint DEFAULT CAST(99 AS bigint);
+  RETURN x * a;
+END
+```
+
+Following is an example invocation:
+
+```sql
+SELECT times_ninety_nine(CAST(2 as bigint)); -- 198
+```
+
+## Conditional flows
+
+A first example of conditional flow control in a routine using the `CASE`
+statement. The simple `bigint` input value is compared to a number of values.
+
+```sql
+FUNCTION simple_case(a bigint)
+RETURNS varchar
+BEGIN
+  CASE a
+    WHEN 0 THEN RETURN 'zero';
+    WHEN 1 THEN RETURN 'one';
+    WHEN 10 THEN RETURN 'ten';
+    WHEN 20 THEN RETURN 'twenty';
+    ELSE RETURN 'other';
+  END CASE;
+  RETURN NULL;
+END
+```
+
+Following are a couple of example invocations with result and explanation:
+
+```sql
+SELECT simple_case(0); -- zero
+SELECT simple_case(1); -- one
+SELECT simple_case(-1); -- other (from else clause)
+SELECT simple_case(10); -- ten
+SELECT simple_case(11); -- other (from else clause)
+SELECT simple_case(20); -- twenty
+SELECT simple_case(100); -- other (from else clause)
+SELECT simple_case(null); -- null .. but really??
+```
+
+A second example of a routine with a `CASE` statement, this time with two
+parameters, showcasing the importance of the order of the conditions.
+
+```sql
+FUNCTION search_case(a bigint, b bigint)
+RETURNS varchar
+BEGIN
+  CASE
+    WHEN a = 0 THEN RETURN 'zero';
+    WHEN b = 1 THEN RETURN 'one';
+    WHEN a = DECIMAL '10.0' THEN RETURN 'ten';
+    WHEN b = 20.0E0 THEN RETURN 'twenty';
+    ELSE RETURN 'other';
+  END CASE;
+  RETURN NULL;
+END
+```
+
+Following are a couple of example invocations with result and explanation:
+
+```sql
+SELECT search_case(0,0); -- zero
+SELECT search_case(1,1); -- one
+SELECT search_case(0,1); -- zero (not one since the second check is never reached)
+SELECT search_case(10,1); -- one (not ten since the third check is never reached)
+SELECT search_case(10,2); -- ten
+SELECT search_case(10,20); -- ten (not twenty)
+SELECT search_case(0,20); -- zero (not twenty)
+SELECT search_case(3,20); -- twenty
+SELECT search_case(3,21); -- other
+SELECT simple_case(null,null); -- null .. but really??
+```
+
+## Fibonacci example
+
+This routine calculates the `n`-th value in the Fibonacci series, in which each
+number is the sum of the two preceding ones. The two initial values are are set
+to `1` as the defaults for `a` and `b`. The routine uses an `IF` statement
+condition to return `1` for all input values of `2` or less. The `WHILE` block
+then starts to calculate each number in the series, starting with `a=1` and
+`b=1` and iterates until it reaches the `n`-th position. In each iteration is
+sets `a` and `b` for the preceding to values, so it can calculate the sum, and
+finally return it. Note that processing the routine takes longer and longer with
+higher `n` values, and the result it deterministic.
+
+```sql
+FUNCTION fib(n bigint)
+RETURNS bigint
+BEGIN
+  DECLARE a, b bigint DEFAULT 1;
+  DECLARE c bigint;
+  IF n <= 2 THEN
+    RETURN 1;
+  END IF;
+  WHILE n > 2 DO
+    SET n = n - 1;
+    SET c = a + b;
+    SET a = b;
+    SET b = c;
+  END WHILE;
+  RETURN c;
+END
+```
+
+Following are a couple of example invocations with result and explanation:
+
+```sql
+SELECT fib(-1); -- 1
+SELECT fib(0); -- 1
+SELECT fib(1); -- 1
+SELECT fib(2); -- 1
+SELECT fib(3); -- 2
+SELECT fib(4); -- 3
+SELECT fib(5); -- 5
+SELECT fib(6); -- 8
+SELECT fib(7); -- 13
+SELECT fib(8); -- 21
+```
+
+## Labels and loops
+
+This routing uses the `top` label to name the `WHILE` block, and then controls
+the flow with conditional statements, `ITERATE`, and `LEAVE`. For the values of
+`a=1` and `a=2` in the first two iterations of the loop the `ITERATE` call moves
+the flow up to `top` before `b` is ever increased. Then `b` is increased for the
+values `a=3`, `a=4`, `a=5`, `a=6`, and `a=7`, resulting in `b=5`. The `LEAVE`
+call then causes the exit of the block before a is increased further to `10` and
+therefore the result of the routine is `5`.
+
+```sql
+FUNCTION labels()
+RETURNS bigint
+BEGIN
+  DECLARE a, b int DEFAULT 0;
+  top: WHILE a < 10 DO
+    SET a = a + 1;
+    IF a < 3 THEN
+      ITERATE top;
+    END IF;
+    SET b = b + 1;
+    IF a > 6 THEN
+      LEAVE top;
+    END IF;
+  END WHILE;
+  RETURN b;
+END
+```
+
+This routine implements calculating the `n` to the power of `p` by repeated
+multiplication and keeping track of the number of multiplications performed.
+Note that this routine does not return the correct `0` for `p=0` since the `top`
+block is merely escaped and the value of `n` is returned. The same incorrect
+behavior happens for negative values of `p`:
+
+```sql
+FUNCTION power(n int, p int)
+RETURNS int
+  BEGIN
+    DECLARE r int DEFAULT n;
+    top: LOOP
+      IF p <= 1 THEN
+        LEAVE top;
+      END IF;
+      SET r = r * n;
+      SET p = p - 1;
+    END LOOP;
+    RETURN r;
+  END
+```
+
+Following are a couple of example invocations with result and explanation:
+
+```sql
+SELECT power(2, 2); -- 4
+SELECT power(2, 8); -- 256
+SELECT power(3, 3); -- 256
+SELECT power(3, 0); -- 3, which is wrong
+SELECT power(3, -2); -- 3, which is wrong
+```
+
+This routine returns `7` as a result of the increase of `b` in the loop from
+`a=3` to `a=10`:
+
+```sql
+FUNCTION test_repeat_continue()
+RETURNS bigint
+BEGIN
+  DECLARE a int DEFAULT 0;
+  DECLARE b int DEFAULT 0;
+  top: REPEAT
+    SET a = a + 1;
+    IF a <= 3 THEN
+      ITERATE top;
+    END IF;
+    SET b = b + 1;
+  UNTIL a >= 10
+  END REPEAT;
+  RETURN b;
+END
+```
+
+This routine returns `2` and shows that labels can be repeated and label usage
+within a block refers to the label of that block:
+
+```sql
+FUNCTION test()
+RETURNS int
+BEGIN
+  DECLARE r int DEFAULT 0;
+  abc: LOOP
+    SET r = r + 1;
+    LEAVE abc;
+  END LOOP;
+  abc: LOOP
+    SET r = r + 1;
+    LEAVE abc;
+  END LOOP;
+  RETURN r;
+END
+```
+
+## Routines and built-in functions
+
+This routine show that multiple data types and built-in functions like
+`length()` and `cardinality()` can be used in a routine. The two nested `BEGIN`
+blocks also show how variable names are local within these blocks `x`, but the
+global `r` from the top-level block can be accessed in the nested blocks:
+
+```sql
+FUNCTION test()
+RETURNS bigint
+BEGIN
+  DECLARE r bigint DEFAULT 0;
+  BEGIN
+    DECLARE x varchar DEFAULT 'hello';
+    SET r = r + length(x);
+  END;
+  BEGIN
+    DECLARE x array(int) DEFAULT array[1, 2, 3];
+    SET r = r + cardinality(x);
+  END;
+  RETURN r;
+END
+```
diff --git a/docs/src/main/sphinx/routines/function.md b/docs/src/main/sphinx/routines/function.md
new file mode 100644
index 000000000000..65c4448c4eb4
--- /dev/null
+++ b/docs/src/main/sphinx/routines/function.md
@@ -0,0 +1,100 @@
+# FUNCTION
+
+## Synopsis
+
+```text
+FUNCTION name ( [ parameter_name data_type [, ...] ] )
+  RETURNS type
+  [ LANGUAGE langauge]
+  [ NOT? DETERMINISTIC ]
+  [ RETURNS NULL ON NULL INPUT ]
+  [ CALLED ON NULL INPUT ]
+  [ SECURITY { DEFINER | INVOKER } ]
+  [ COMMENT description]
+  statements
+```
+
+## Description
+
+Declare a SQL routine.
+
+The `name` of the routine. [Inline routines](routine-inline) can use a simple
+string. [Catalog routines](routine-catalog) must qualify the name of the catalog
+and schema, delimited by `.`, to store the routine or rely on the [default
+catalog and schema for routine storage](/admin/properties-sql-environment).
+
+The list of parameters is a comma-separated list of names `parameter_name` and
+data types `data_type`, see [data type](/language/types). An empty list, specified as
+`()` is also valid.
+
+The `type` value after the `RETURNS` keyword identifies the [data
+type](/language/types) of the routine output.
+
+The optional `LANGUAGE` characteristic identifies the language used for the
+routine definition with `language`. Only `SQL` is supported.
+
+The optional `DETERMINISTIC` or `NOT DETERMINISTIC` characteristic declares that
+the routine is deterministic. This means that repeated routine calls with
+identical input parameters yield the same result. For SQL language routines, a
+routine is non-deterministic if it calls any non-deterministic routines and
+[functions](/functions). By default, routines are assume to have a deterministic
+behavior.
+
+The optional `RETURNS NULL ON NULL INPUT` characteristic declares that the
+routine returns a `NULL` value when any of the input parameters are `NULL`.
+The routine is not invoked with a `NULL` input value.
+
+The `CALLED ON NULL INPUT` characteristic declares that the routine is invoked
+with `NULL` input parameter values.
+
+The `RETURNS NULL ON NULL INPUT` and `CALLED ON NULL INPUT` characteristics are
+mutually exclusive, with `CALLED ON NULL INPUT` as the default.
+
+The security declaration of `SECURITY INVOKER` or `SECURITY DEFINER` is only
+valid for catalog routines. It sets the mode for processing the routine with the
+permissions of the user who calls the routine (`INVOKER`) or the user who
+created the routine (`DEFINER`).
+
+The `COMMENT` characteristic can be used to provide information about the
+function to other users as `description`. The information is accessible with
+[](/sql/show-functions).
+
+The body of the routine can either be a simple single `RETURN` statement with an
+expression, or compound list of `statements` in a `BEGIN` block.
+
+## Examples
+
+A simple catalog function:
+
+```sql
+CREATE FUNCTION example.default.meaning_of_life()
+  RETURNS BIGINT
+  RETURN 42;
+```
+
+And used:
+
+```sql
+SELECT example.default.meaning_of_life(); -- returns 42
+```
+
+Equivalent usage with an inline function:
+
+```sql
+WITH FUNCTION meaning_of_life()
+  RETURNS BIGINT
+  RETURN 42
+SELECT meaning_of_life();
+```
+
+Further examples of varying complexity that cover usage of the `FUNCTION`
+statement in combination with other statements are available in the [SQL
+routines examples documentation](/routines/examples).
+
+## See also
+
+* [](/routines/introduction)
+* [](/routines/begin)
+* [](/routines/return)
+* [](/sql/create-function)
+
diff --git a/docs/src/main/sphinx/routines/if.md b/docs/src/main/sphinx/routines/if.md
new file mode 100644
index 000000000000..a02c9e659dc2
--- /dev/null
+++ b/docs/src/main/sphinx/routines/if.md
@@ -0,0 +1,47 @@
+# IF
+
+## Synopsis
+
+```text
+IF condition
+  THEN statements
+  [ ELSEIF condition THEN statements ]
+  [ ... ]
+  [ ELSE statements ]
+END IF
+```
+
+## Description
+
+The `IF THEN` statement is an optional construct to allow conditional processing
+in [SQL routines](/routines/introduction). Each `condition`  following an `IF`
+or `ELSEIF` must evaluate to a boolean. The result of processing the expression
+must result in a boolean `true` value to process the `statements` in the `THEN`
+block. A result of `false` results in skipping the `THEN` block and moving to
+evaluate the next `ELSEIF` and `ELSE` blocks in order.
+
+The `ELSEIF` and `ELSE` segments are optional.
+
+## Examples
+
+```sql
+FUNCTION simple_if(a bigint)
+  RETURNS varchar
+  BEGIN
+    IF a = 0 THEN
+      RETURN 'zero';
+    ELSEIF a = 1 THEN
+      RETURN 'one';
+    ELSE
+      RETURN 'more than one or negative';
+    END IF;
+  END
+```
+
+Further examples of varying complexity that cover usage of the `IF` statement in
+combination with other statements are available in the [SQL routines examples
+documentation](/routines/examples).
+
+## See also
+
+* [](/routines/introduction)
diff --git a/docs/src/main/sphinx/routines/introduction.md b/docs/src/main/sphinx/routines/introduction.md
new file mode 100644
index 000000000000..d1191ae7dab1
--- /dev/null
+++ b/docs/src/main/sphinx/routines/introduction.md
@@ -0,0 +1,177 @@
+# Introduction to SQL routines
+
+A SQL routine is a custom, user-defined function authored by a user of Trino and
+written in the SQL routine language. You can declare the routine body within a
+[](/routines/function) block as [inline routines](routine-inline) or [catalog
+routines](routine-catalog).
+
+(routine-inline)=
+## Inline routines
+
+An inline routine declares and uses the routine within a query processing
+context. The routine is declared in a `WITH` block before the query:
+
+```sql
+WITH
+  FUNCTION abc(x integer)
+    RETURNS integer
+    RETURN x * 2
+SELECT abc(21);
+```
+
+Inline routine names must follow SQL identifier naming conventions, and cannot
+contain `.` characters.
+
+The routine declaration is only valid within the context of the query. A
+separate later invocation of the routine is not possible. If this is desired,
+use a [catalog routine](routine-catalog).
+
+Multiple inline routine declarations are comma-separated, and can include
+routines calling each other, as long as a called routine is declared before
+the first invocation.
+
+```sql
+WITH
+  FUNCTION abc(x integer)
+    RETURNS integer
+    RETURN x * 2,
+  FUNCTION xyz(x integer)
+    RETURNS integer
+    RETURN abc(x) + 1
+SELECT xyz(21);
+```
+
+Note that inline routines can mask and override the meaning of a built-in function:
+
+```sql
+WITH
+  FUNCTION abs(x integer)
+    RETURNS integer
+    RETURN x * 2
+SELECT abs(-10); -- -20, not 10!
+```
+
+(routine-catalog)=
+## Catalog routines
+
+You can store a routine in the context of a catalog, if the connector used in
+the catalog supports routine storage. In this scenario, the following commands
+can be used:
+
+* [](/sql/create-function) to create and store a routine.
+* [](/sql/drop-function) to remove a routine.
+* [](/sql/show-functions) to display a list of routines in a catalog.
+
+Catalog routines must use a name that combines the catalog name and schema name
+with the routine name, such as `example.default.power` for the `power` routine
+in the `default` schema of the `example` catalog.
+
+Invocation must use the fully qualified name, such as `example.default.power`.
+
+(routine-sql-environment)=
+## SQL environment configuration
+
+Configuration of the `sql.default-function-catalog` and
+`sql.default-function-schema` [](/admin/properties-sql-environment) allows you
+to set the default storage for SQL routines. The catalog and schema must be
+added to the `sql.path` as well. This enables users to call SQL routines and
+perform all [SQL routine management](sql-routine-management) without specifying
+the full path to the routine.
+
+:::{note}
+Use the [](/connector/memory) in a catalog for simple storing and
+testing of your SQL routines.
+:::
+
+## Routine declaration
+
+Refer to the documentation for the [](/routines/function) keyword for more
+details about declaring the routine overall. The routine body is composed with
+statements from the following list:
+
+* [](/routines/begin)
+* [](/routines/case)
+* [](/routines/declare)
+* [](/routines/if)
+* [](/routines/iterate)
+* [](/routines/leave)
+* [](/routines/loop)
+* [](/routines/repeat)
+* [](/routines/return)
+* [](/routines/set)
+* [](/routines/while)
+
+Statements can also use [built-in functions and operators](/functions) as well
+as other routines, although recursion is not supported for routines.
+
+Find simple examples in each statement documentation, and refer to the [example
+documentation](/routines/examples) for more complex use cases that combine
+multiple statements.
+
+:::{note}
+User-defined functions can alternatively be written in Java and deployed as a
+plugin. Details are available in the [developer guide](/develop/functions).
+:::
+
+(routine-label)=
+## Labels
+
+Routines can contain labels as markers for a specific block in the declaration
+before the following keywords:
+
+* `CASE`
+* `IF`
+* `LOOP`
+* `REPEAT`
+* `WHILE`
+
+The label is used to name the block in order to continue processing with the
+`ITERATE` statement or exit the block with the `LEAVE` statement. This flow
+control is supported for nested blocks, allowing to continue or exit an outer
+block, not just the innermost block. For example, the following snippet uses the
+label `top` to name the complete block from `REPEAT` to `END REPEAT`:
+
+```sql
+top: REPEAT
+  SET a = a + 1;
+  IF a <= 3 THEN
+    ITERATE top;
+  END IF;
+  SET b = b + 1;
+  UNTIL a >= 10
+END REPEAT;
+```
+
+Labels can be used with the `ITERATE` and `LEAVE` statements to continue
+processing the block or leave the block. This flow control is also supported for
+nested blocks and labels.
+
+## Recommendations
+
+Processing routines can potentially be resource intensive on the cluster in
+terms of memory and processing. Take the following considerations into account
+when writing and running SQL routines:
+
+* Some checks for the runtime behavior of routines are in place. For example,
+  routines that use take longer to process than a hardcoded threshold are automatically
+  terminated.
+* Avoid creation of arrays in a looping construct. Each iteration creates a
+  separate new array with all items and copies the data for each modification,
+  leaving the prior array in memory for automated clean up later. Use a [lambda
+  expression](/functions/lambda) instead of the loop.
+* Avoid concatenating strings in a looping construct. Each iteration creates a
+  separate new string and copying the old string for each modification, leaving
+  the prior string in memory for automated clean up later. Use a [lambda
+  expression](/functions/lambda) instead of the loop.
+* Most routines should declare the `RETURNS NULL ON NULL INPUT` characteristics
+  unless the code has some special handling for null values. You must declare
+  this explicitly since `CALLED ON NULL INPUT` is the default characteristic.
+
+## Limitations
+
+The following limitations apply to SQL routines.
+
+* Routines must be declared before than can be referenced.
+* Recursion cannot be declared or processed.
+* Mutual recursion can not be declared or processed.
+* Queries cannot be processed in a routine.
diff --git a/docs/src/main/sphinx/routines/iterate.md b/docs/src/main/sphinx/routines/iterate.md
new file mode 100644
index 000000000000..7be395881459
--- /dev/null
+++ b/docs/src/main/sphinx/routines/iterate.md
@@ -0,0 +1,41 @@
+# ITERATE
+
+## Synopsis
+
+```text
+ITERATE label
+```
+
+## Description
+
+The `ITERATE` statement allows processing of blocks in [SQL
+routines](/routines/introduction) to move processing back to the start of a
+context block. Contexts are defined by a [`label`](routine-label). If no label
+is found, the functions fails with an error message.
+
+## Examples
+
+```sql
+FUNCTION count()
+RETURNS bigint
+BEGIN
+  DECLARE a int DEFAULT 0;
+  DECLARE b int DEFAULT 0;
+  top: REPEAT
+    SET a = a + 1;
+    IF a <= 3 THEN
+        ITERATE top;
+    END IF;
+    SET b = b + 1;
+  RETURN b;
+END
+```
+
+Further examples of varying complexity that cover usage of the `ITERATE`
+statement in combination with other statements are available in the [SQL
+routines examples documentation](/routines/examples).
+
+## See also
+
+* [](/routines/introduction)
+* [](/routines/leave)
diff --git a/docs/src/main/sphinx/routines/leave.md b/docs/src/main/sphinx/routines/leave.md
new file mode 100644
index 000000000000..196855509921
--- /dev/null
+++ b/docs/src/main/sphinx/routines/leave.md
@@ -0,0 +1,46 @@
+# LEAVE
+
+## Synopsis
+
+```text
+LEAVE label
+```
+
+## Description
+
+The `LEAVE` statement allows processing of blocks in [SQL
+routines](/routines/introduction) to move out of a specified context. Contexts
+are defined by a [`label`](routine-label). If no label is found, the functions
+fails with an error message.
+
+## Examples
+
+The following function includes a `LOOP` labelled `top`. The conditional `IF`
+statement inside the loop can cause the exit from processing the loop when the
+value for the parameter `p` is 1 or less. This can be the case if the value is
+passed in as 1 or less or after a number of iterations through the loop.
+
+```sql
+FUNCTION my_pow(n int, p int)
+RETURNS int
+BEGIN
+  DECLARE r int DEFAULT n;
+  top: LOOP
+    IF p <= 1 THEN
+      LEAVE top;
+    END IF;
+    SET r = r * n;
+    SET p = p - 1;
+  END LOOP;
+  RETURN r;
+END
+```
+
+Further examples of varying complexity that cover usage of the `LEAVE` statement
+in combination with other statements are available in the [SQL routines examples
+documentation](/routines/examples).
+
+## See also
+
+* [](/routines/introduction)
+* [](/routines/iterate)
diff --git a/docs/src/main/sphinx/routines/loop.md b/docs/src/main/sphinx/routines/loop.md
new file mode 100644
index 000000000000..3bb27745f0ff
--- /dev/null
+++ b/docs/src/main/sphinx/routines/loop.md
@@ -0,0 +1,63 @@
+# LOOP
+
+## Synopsis
+
+```text
+[label :] LOOP
+    statements
+END LOOP
+```
+
+## Description
+
+The `LOOP` statement is an optional construct in [SQL
+routines](/routines/introduction) to allow processing of a block of statements
+repeatedly.
+
+The block of statements is processed at least once. After the first, and every
+subsequent processing the expression `condidtion` is validated. If the result is
+`true`, processing moves to END REPEAT and continues with the next statement in
+the function. If the result is `false`, the statements are processed again
+repeatedly.
+
+The optional `label` before the `REPEAT` keyword can be used to [name the
+block](routine-label).
+
+Note that a `WHILE` statement is very similar, with the difference that for
+`REPEAT` the statements are processed at least once, and for `WHILE` blocks the
+statements might not be processed at all.
+
+
+## Examples
+
+
+The following function counts up to `100` in a loop starting from the input
+value `i` and returns the number of incremental steps in the loop to get to
+`100`.
+
+```sql
+FUNCTION to_one_hundred(i int)
+  RETURNS int
+  BEGIN
+    DECLARE count int DEFAULT 0;
+    abc: LOOP
+      IF i >= 100 THEN
+        LEAVE abc;
+      END IF
+      SET count = count + 1;
+      SET i = i + 1;
+    END LOOP;
+    RETURN;
+  END
+```
+
+Further examples of varying complexity that cover usage of the `LOOP` statement
+in combination with other statements are available in the [SQL routines examples
+documentation](/routines/examples).
+
+## See also
+
+* [](/routines/introduction)
+* [](/routines/repeat)
+* [](/routines/while)
+
diff --git a/docs/src/main/sphinx/routines/repeat.md b/docs/src/main/sphinx/routines/repeat.md
new file mode 100644
index 000000000000..5d750554c172
--- /dev/null
+++ b/docs/src/main/sphinx/routines/repeat.md
@@ -0,0 +1,70 @@
+# REPEAT
+
+## Synopsis
+
+```text
+[label :] REPEAT
+    statements
+UNTIL condition
+END REPEAT
+```
+
+## Description
+
+The `REPEAT UNTIL` statement is an optional construct in [SQL
+routines](/routines/introduction) to allow processing of a block of statements
+as long as a condition is met. The condition is validated as a last step of each
+iteration.
+
+The block of statements is processed at least once. After the first, and every
+subsequent processing the expression `condidtion` is validated. If the result is
+`true`, processing moves to `END REPEAT` and continues with the next statement in
+the function. If the result is `false`, the statements are processed again.
+
+The optional `label` before the `REPEAT` keyword can be used to [name the
+block](routine-label).
+
+Note that a `WHILE` statement is very similar, with the difference that for
+`REPEAT` the statements are processed at least once, and for `WHILE` blocks the
+statements might not be processed at all.
+
+## Examples
+
+The following routine shows a routine with a `REPEAT` statement that runs until
+the value of `a` is greater or equal to `10`.
+
+```sql
+FUNCTION test_repeat(a bigint)
+  RETURNS bigint
+  BEGIN
+    REPEAT
+      SET a = a + 1;
+    UNTIL a >= 10
+    END REPEAT;
+    RETURN a;
+  END
+```
+
+Since `a` is also the input value and it is increased before the check the
+routine always returns `10` for input values of `9` or less, and the input value
++ 1 for all higher values.
+
+Following are a couple of example invocations with result and explanation:
+
+```sql
+SELECT test_repeat(5); -- 10
+SELECT test_repeat(9); -- 10
+SELECT test_repeat(10); -- 11
+SELECT test_repeat(11); -- 12
+SELECT test_repeat(12); -- 13
+```
+
+Further examples of varying complexity that cover usage of the `REPEAT`
+statement in combination with other statements are available in the [SQL
+routines examples documentation](/routines/examples).
+
+## See also
+
+* [](/routines/introduction)
+* [](/routines/loop)
+* [](/routines/while)
diff --git a/docs/src/main/sphinx/routines/return.md b/docs/src/main/sphinx/routines/return.md
new file mode 100644
index 000000000000..18db948e112e
--- /dev/null
+++ b/docs/src/main/sphinx/routines/return.md
@@ -0,0 +1,32 @@
+# RETURN
+
+## Synopsis
+
+```text
+RETURN expression
+```
+
+## Description
+
+Provide the value from a [SQL routines](/routines/introduction) to the caller.
+The value is the result of evaluating the expression. It can be a static value,
+a declared variable or a more complex expression.
+
+## Examples
+
+The following examples return a static value, the result of an expression, and
+the value of the variable x:
+
+```sql
+RETURN 42;
+RETURN 6 * 7;
+RETURN x;
+```
+
+Further examples of varying complexity that cover usage of the `RETURN`
+statement in combination with other statements are available in the [SQL
+routines examples documentation](/routines/examples).
+
+## See also
+
+* [](/routines/introduction)
diff --git a/docs/src/main/sphinx/routines/set.md b/docs/src/main/sphinx/routines/set.md
new file mode 100644
index 000000000000..d9c24414e049
--- /dev/null
+++ b/docs/src/main/sphinx/routines/set.md
@@ -0,0 +1,43 @@
+# SET
+
+## Synopsis
+
+```text
+SET identifier = expression
+```
+
+## Description
+
+Use the `SET` statement in [SQL routines](/routines/introduction) to assign a
+value to a variable, referenced by comma-separated `identifier`s. The
+value is determined by evaluating the `expression` after the `=` sign.
+
+Before the assignment the variable must be defined with a `DECLARE` statement.
+The data type of the variable must be identical to the data type of evaluating
+the `expression`.
+
+## Examples
+
+The following functions returns the value `1` after setting the counter variable
+multiple times to different values:
+
+```sql
+FUNCTION one()
+  RETURNS bigint
+  BEGIN
+    DECLARE counter tinyint DEFAULT 1;
+    SET counter = 0;
+    SET counter = counter + 2;
+    SET counter = counter / counter;
+    RETURN counter;
+  END
+```
+
+Further examples of varying complexity that cover usage of the `SET` statement
+in combination with other statements are available in the [SQL routines examples
+documentation](/routines/examples).
+
+## See also
+
+* [](/routines/introduction)
+* [](/routines/declare)
diff --git a/docs/src/main/sphinx/routines/while.md b/docs/src/main/sphinx/routines/while.md
new file mode 100644
index 000000000000..6e252482d4b8
--- /dev/null
+++ b/docs/src/main/sphinx/routines/while.md
@@ -0,0 +1,47 @@
+# WHILE
+
+## Synopsis
+
+```text
+[label :] WHILE condition DO
+  statements
+END WHILE
+```
+
+## Description
+
+The `WHILE` statement is an optional construct in [SQL
+routines](/routines/introduction) to allow processing of a block of statements
+as long as a condition is met. The condition is validated as a first step of
+each iteration.
+
+The expression that defines the `condition` is evaluated at least once. If the
+result is `true`, processing moves to `DO`, through following `statements` and
+back to `WHILE` and the `condition`. If the result is `false`, processing moves
+to `END WHILE`  and continues with the next statement in the function.
+
+The optional `label` before the `WHILE` keyword can be used to [name the
+block](routine-label).
+
+Note that a `WHILE` statement is very similar, with the difference that for
+`REPEAT` the statements are processed at least once, and for `WHILE` blocks the
+statements might not be processed at all.
+
+## Examples
+
+```sql
+WHILE p > 1 DO
+  SET r = r * n;
+  SET p = p - 1;
+END WHILE;
+```
+
+Further examples of varying complexity that cover usage of the `WHILE` statement
+in combination with other statements are available in the [SQL routines examples
+documentation](/routines/examples).
+
+## See also
+
+* [](/routines/introduction)
+* [](/routines/loop)
+* [](/routines/repeat)
diff --git a/docs/src/main/sphinx/security.md b/docs/src/main/sphinx/security.md
new file mode 100644
index 000000000000..5b1ecf62fb23
--- /dev/null
+++ b/docs/src/main/sphinx/security.md
@@ -0,0 +1,63 @@
+# Security
+
+## Introduction
+
+```{toctree}
+:maxdepth: 1
+
+security/overview
+```
+
+## Cluster access security
+
+```{toctree}
+:maxdepth: 1
+
+security/tls
+security/inspect-pem
+security/inspect-jks
+```
+
+(security-authentication)=
+
+## Authentication
+
+```{toctree}
+:maxdepth: 1
+
+security/authentication-types
+security/password-file
+security/ldap
+security/salesforce
+security/oauth2
+security/kerberos
+security/certificate
+security/jwt
+```
+
+## User name management
+
+```{toctree}
+:maxdepth: 1
+
+security/user-mapping
+security/group-file
+```
+
+## Access control
+
+```{toctree}
+:maxdepth: 1
+
+security/built-in-system-access-control
+security/file-system-access-control
+```
+
+## Security inside the cluster
+
+```{toctree}
+:maxdepth: 1
+
+security/internal-communication
+security/secrets
+```
diff --git a/docs/src/main/sphinx/security.rst b/docs/src/main/sphinx/security.rst
deleted file mode 100644
index bbf6285e988a..000000000000
--- a/docs/src/main/sphinx/security.rst
+++ /dev/null
@@ -1,65 +0,0 @@
-********
-Security
-********
-
-Introduction
-============
-
-.. toctree::
-   :maxdepth: 1
-
-   security/overview
-
-Cluster access security
-=======================
-
-.. toctree::
-  :maxdepth: 1
-
-  security/tls
-  security/inspect-pem
-  security/inspect-jks
-
-.. _security-authentication:
-
-Authentication
-==============
-
-.. toctree::
-  :maxdepth: 1
-
-  security/authentication-types
-  security/password-file
-  security/ldap
-  security/salesforce
-  security/oauth2
-  security/kerberos
-  security/certificate
-  security/jwt
-
-User name management
-====================
-
-.. toctree::
-  :maxdepth: 1
-
-  security/user-mapping
-  security/group-file
-
-Access control
-==============
-
-.. toctree::
-  :maxdepth: 1
-
-  security/built-in-system-access-control
-  security/file-system-access-control
-
-Security inside the cluster
-===========================
-
-.. toctree::
-  :maxdepth: 1
-
-  security/internal-communication
-  security/secrets
diff --git a/docs/src/main/sphinx/security/authentication-types.md b/docs/src/main/sphinx/security/authentication-types.md
new file mode 100644
index 000000000000..2116687d5b98
--- /dev/null
+++ b/docs/src/main/sphinx/security/authentication-types.md
@@ -0,0 +1,84 @@
+# Authentication types
+
+Trino supports multiple authentication types to ensure all users of the system
+are authenticated. Different authenticators allow user management in one or more
+systems. Using {doc}`TLS <tls>` and {doc}`a configured shared secret
+</security/internal-communication>` are required for all authentications types.
+
+You can configure one or more authentication types with the
+`http-server.authentication.type` property. The following authentication types
+and authenticators are available:
+
+- `PASSWORD` for
+
+  - {doc}`password-file`
+  - {doc}`ldap`
+  - {doc}`salesforce`
+
+- `OAUTH2` for {doc}`oauth2`
+
+- `KERBEROS` for {doc}`kerberos`
+
+- `CERTIFICATE` for {doc}`certificate`
+
+- `JWT` for {doc}`jwt`
+
+- `HEADER` for {doc}`/develop/header-authenticator`
+
+Get started with a basic password authentication configuration backed by a
+{doc}`password file <password-file>`:
+
+```properties
+http-server.authentication.type=PASSWORD
+```
+
+## Multiple authentication types
+
+You can use multiple authentication types, separated with commas in the
+configuration:
+
+```properties
+http-server.authentication.type=PASSWORD,CERTIFICATE
+```
+
+Authentication is performed in order of the entries, and first successful
+authentication results in access, using the {doc}`mapped user <user-mapping>`
+from that authentication method.
+
+## Multiple password authenticators
+
+You can use multiple password authenticator types by referencing multiple
+configuration files:
+
+```properties
+http-server.authentication.type=PASSWORD
+password-authenticator.config-files=etc/ldap1.properties,etc/ldap2.properties,etc/password.properties
+```
+
+In the preceding example, the configuration files `ldap1.properties` and
+`ldap2.properties` are regular {doc}`LDAP authenticator configuration files
+<ldap>`. The `password.properties` is a {doc}`password file authenticator
+configuration file <password-file>`.
+
+Relative paths to the installation directory or absolute paths can be used.
+
+User authentication credentials are first validated against the LDAP server from
+`ldap1`, then the separate server from `ldap2`, and finally the password
+file. First successful authentication results in access, and no further
+authenticators are called.
+
+## Multiple header authenticators
+
+You can use multiple header authenticator types by referencing multiple
+configuration files:
+
+```properties
+http-server.authentication.type=HEADER
+header-authenticator.config-files=etc/xfcc.properties,etc/azureAD.properties
+```
+
+Relative paths to the installation directory or absolute paths can be used.
+
+The pre-configured headers are first validated against the `xfcc` authenticator,
+then the `azureAD` authenticator. First successful authentication results in access,
+and no further authenticators are called.
diff --git a/docs/src/main/sphinx/security/authentication-types.rst b/docs/src/main/sphinx/security/authentication-types.rst
deleted file mode 100644
index 558ba17e7716..000000000000
--- a/docs/src/main/sphinx/security/authentication-types.rst
+++ /dev/null
@@ -1,87 +0,0 @@
-====================
-Authentication types
-====================
-
-Trino supports multiple authentication types to ensure all users of the system
-are authenticated. Different authenticators allow user management in one or more
-systems. Using :doc:`TLS <tls>` and :doc:`a configured shared secret
-</security/internal-communication>` are required for all authentications types.
-
-You can configure one or more authentication types with the
-``http-server.authentication.type`` property. The following authentication types
-and authenticators are available:
-
-* ``PASSWORD`` for
-
-  *  :doc:`password-file`
-  *  :doc:`ldap`
-  *  :doc:`salesforce`
-
-* ``OAUTH2`` for :doc:`oauth2`
-* ``KERBEROS`` for :doc:`kerberos`
-* ``CERTIFICATE`` for :doc:`certificate`
-* ``JWT`` for :doc:`jwt`
-* ``HEADER`` for :doc:`/develop/header-authenticator`
-
-Get started with a basic password authentication configuration backed by a
-:doc:`password file <password-file>`:
-
-.. code-block:: properties
-
-    http-server.authentication.type=PASSWORD
-
-
-Multiple authentication types
------------------------------
-
-You can use multiple authentication types, separated with commas in the
-configuration:
-
-.. code-block:: properties
-
-    http-server.authentication.type=PASSWORD,CERTIFICATE
-
-
-Authentication is performed in order of the entries, and first successful
-authentication results in access, using the :doc:`mapped user <user-mapping>`
-from that authentication method.
-
-Multiple password authenticators
---------------------------------
-
-You can use multiple password authenticator types by referencing multiple
-configuration files:
-
-.. code-block:: properties
-
-    http-server.authentication.type=PASSWORD
-    password-authenticator.config-files=etc/ldap1.properties,etc/ldap2.properties,etc/password.properties
-
-In the preceding example, the configuration files ``ldap1.properties`` and
-``ldap2.properties`` are regular :doc:`LDAP authenticator configuration files
-<ldap>`. The ``password.properties`` is a :doc:`password file authenticator
-configuration file <password-file>`.
-
-Relative paths to the installation directory or absolute paths can be used.
-
-User authentication credentials are first validated against the LDAP server from
-``ldap1``, then the separate server from ``ldap2``, and finally the password
-file. First successful authentication results in access, and no further
-authenticators are called.
-
-Multiple header authenticators
-------------------------------------
-
-You can use multiple header authenticator types by referencing multiple
-configuration files:
-
-.. code-block:: properties
-
-    http-server.authentication.type=HEADER
-    header-authenticator.config-files=etc/xfcc.properties,etc/azureAD.properties
-
-Relative paths to the installation directory or absolute paths can be used.
-
-The pre-configured headers are first validated against the ``xfcc`` authenticator,
-then the ``azureAD`` authenticator. First successful authentication results in access,
-and no further authenticators are called.
diff --git a/docs/src/main/sphinx/security/authorization.json b/docs/src/main/sphinx/security/authorization.json
new file mode 100644
index 000000000000..07c147557de1
--- /dev/null
+++ b/docs/src/main/sphinx/security/authorization.json
@@ -0,0 +1,26 @@
+{
+  "authorization": [
+    {
+      "original_role": "admin",
+      "new_user": "bob",
+      "allow": false
+    },
+    {
+      "original_role": "admin",
+      "new_user": ".*",
+      "new_role": ".*"
+    }
+  ],
+  "schemas": [
+    {
+      "role": "admin",
+      "owner": true
+    }
+  ],
+  "tables": [
+    {
+      "role": "admin",
+      "privileges": ["OWNERSHIP"]
+    }
+  ]
+}
diff --git a/docs/src/main/sphinx/security/built-in-system-access-control.md b/docs/src/main/sphinx/security/built-in-system-access-control.md
new file mode 100644
index 000000000000..cca8b6c772a2
--- /dev/null
+++ b/docs/src/main/sphinx/security/built-in-system-access-control.md
@@ -0,0 +1,62 @@
+# System access control
+
+A system access control enforces authorization at a global level,
+before any connector level authorization. You can use one of the built-in
+implementations in Trino, or provide your own by following the guidelines in
+{doc}`/develop/system-access-control`.
+
+To use a system access control, add an `etc/access-control.properties` file
+with the following content and the desired system access control name on all
+cluster nodes:
+
+```text
+access-control.name=allow-all
+```
+
+Multiple system access control implementations may be configured at once
+using the `access-control.config-files` configuration property. It should
+contain a comma separated list of the access control property files to use
+(rather than the default `etc/access-control.properties`).
+
+Trino offers the following built-in system access control implementations:
+
+:::{list-table}
+:widths: 20, 80
+:header-rows: 1
+
+* - Name
+  - Description
+* - `default`
+  - All operations are permitted, except for user impersonation and triggering
+    [](/admin/graceful-shutdown).
+
+    This is the default access control if none are configured.
+* - `allow-all`
+  - All operations are permitted.
+* - `read-only`
+  - Operations that read data or metadata are permitted, but none of the
+    operations that write data or metadata are allowed.
+* - `file`
+  - Authorization rules are specified in a config file. See
+    [](/security/file-system-access-control).
+:::
+
+If you want to limit access on a system level in any other way than the ones
+listed above, you must implement a custom {doc}`/develop/system-access-control`.
+
+Access control must be configured on the coordinator. Authorization for
+operations on specific worker nodes, such a triggering
+{doc}`/admin/graceful-shutdown`, must also be configured on all workers.
+
+## Read only system access control
+
+This access control allows any operation that reads data or
+metadata, such as `SELECT` or `SHOW`. Setting system level or catalog level
+session properties is also permitted. However, any operation that writes data or
+metadata, such as `CREATE`, `INSERT` or `DELETE`, is prohibited.
+To use this access control, add an `etc/access-control.properties`
+file with the following contents:
+
+```text
+access-control.name=read-only
+```
diff --git a/docs/src/main/sphinx/security/built-in-system-access-control.rst b/docs/src/main/sphinx/security/built-in-system-access-control.rst
deleted file mode 100644
index 26a36daacf64..000000000000
--- a/docs/src/main/sphinx/security/built-in-system-access-control.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-=====================
-System access control
-=====================
-
-A system access control enforces authorization at a global level,
-before any connector level authorization. You can use one of the built-in
-implementations in Trino, or provide your own by following the guidelines in
-:doc:`/develop/system-access-control`.
-
-Multiple system access control implementations may be configured at once
-using the ``access-control.config-files`` configuration property. It should
-contain a comma separated list of the access control property files to use
-(rather than the default ``etc/access-control.properties``).
-
-Trino offers the following built-in implementations:
-
-================================================== =================================================================
-System access control name                         Description
-================================================== =================================================================
-``default``                                        All operations are permitted, except for user impersonation.
-                                                   This is the default access control if none are configured.
-
-``allow-all``                                      All operations are permitted.
-
-``read-only``                                      Operations that read data or metadata are permitted, but
-                                                   none of the operations that write data or metadata are allowed.
-
-``file``                                           Authorization rules are specified in a config file.
-                                                   See :doc:`file-system-access-control`.
-================================================== =================================================================
-
-If you want to limit access on a system level in any other way than the ones
-listed above, you must implement a custom :doc:`/develop/system-access-control`.
-
-Read only system access control
-===============================
-
-This access control allows any operation that reads data or
-metadata, such as ``SELECT`` or ``SHOW``. Setting system level or catalog level
-session properties is also permitted. However, any operation that writes data or
-metadata, such as ``CREATE``, ``INSERT`` or ``DELETE``, is prohibited.
-To use this access control, add an ``etc/access-control.properties``
-file with the following contents:
-
-.. code-block:: text
-
-   access-control.name=read-only
diff --git a/docs/src/main/sphinx/security/certificate.md b/docs/src/main/sphinx/security/certificate.md
new file mode 100644
index 000000000000..dfabad8d2918
--- /dev/null
+++ b/docs/src/main/sphinx/security/certificate.md
@@ -0,0 +1,106 @@
+# Certificate authentication
+
+You can configure Trino to support client-provided certificates validated by the
+Trino server on initial connection.
+
+:::{important}
+This authentication method is only provided to support sites that have an
+absolute requirement for client authentication *and already have* client
+certificates for each client. Sites in this category have an existing PKI
+infrastructure, possibly including an onsite Certificate Authority (CA).
+
+This feature is not appropriate for sites that need to generate a set of
+client certificates in order to use this authentication type. Consider
+instead using another {ref}`authentication type <cl-access-auth>`.
+:::
+
+Using {doc}`TLS <tls>` and {doc}`a configured shared secret
+</security/internal-communication>` is required for certificate authentication.
+
+## Using certificate authentication
+
+All clients connecting with TLS/HTTPS go through the following initial steps:
+
+1. The client attempts to contact the coordinator.
+2. The coordinator returns its certificate to the client.
+3. The client validates the server's certificate using the client's trust store.
+
+A cluster with certificate authentication enabled goes through the following
+additional steps:
+
+4. The coordinator asks the client for its certificate.
+5. The client responds with its certificate.
+6. The coordinator verifies the client's certificate, using the coordinator's
+   trust store.
+
+Several rules emerge from these steps:
+
+- Trust stores used by clients must include the certificate of the signer of
+  the coordinator's certificate.
+- Trust stores used by coordinators must include the certificate of the signer
+  of client certificates.
+- The trust stores used by the coordinator and clients do not need to be the
+  same.
+- The certificate that verifies the coordinator does not need to be the same as
+  the certificate verifying clients.
+
+Trino validates certificates based on the distinguished name (DN) from the
+X.509 `Subject` field. You can use {doc}`user mapping
+</security/user-mapping>` to map the subject DN to a Trino user name.
+
+There are three levels of client certificate support possible. From the point of
+view of the server:
+
+- The server does not require a certificate from clients.
+- The server asks for a certificate from clients, but allows connection without one.
+- The server must have a certificate from clients to allow connection.
+
+Trino's client certificate support is the middle type. It asks for a certificate
+but allows connection if another authentication method passes.
+
+## Certificate authentication configuration
+
+Enable certificate authentication by setting the {doc}`Certificate
+authentication type <authentication-types>` in {ref}`etc/config.properties
+<config-properties>`:
+
+```properties
+http-server.authentication.type=CERTIFICATE
+```
+
+You can specify certificate authentication along with another authenticaton
+method, such as `PASSWORD`. In this case, authentication is performed in the
+order of entries, and the first successful authentication results in access.
+For example, the following setting shows the use of two authentication types:
+
+```properties
+http-server.authentication.type=CERTIFICATE,PASSWORD
+```
+
+The following configuration properties are also available:
+
+:::{list-table} Configuration properties
+:widths: 50 50
+:header-rows: 1
+
+* - Property name
+  - Description
+* - `http-server.authentication.certificate.user-mapping.pattern`
+  -  A regular expression pattern to [map all user
+    names](/security/user-mapping) for this authentication type to the format
+    expected by Trino.
+* - `http-server.authentication.certificate.user-mapping.file`
+  - The path to a JSON file that contains a set of [user mapping
+    rules](/security/user-mapping) for this authentication type.
+:::
+
+## Use certificate authentication with clients
+
+When using the Trino {doc}`CLI </client/cli>`, specify the
+`--keystore-path` and `--keystore-password` options as described
+in {ref}`cli-certificate-auth`.
+
+When using the Trino {doc}`JDBC driver </client/jdbc>` to connect to a
+cluster with certificate authentication enabled, use the `SSLKeyStoreType` and
+`SSLKeyStorePassword` {ref}`parameters <jdbc-parameter-reference>` to specify
+the path to the client's certificate and its password, if any.
diff --git a/docs/src/main/sphinx/security/certificate.rst b/docs/src/main/sphinx/security/certificate.rst
deleted file mode 100644
index dadecfada6e0..000000000000
--- a/docs/src/main/sphinx/security/certificate.rst
+++ /dev/null
@@ -1,110 +0,0 @@
-==========================
-Certificate authentication
-==========================
-
-You can configure Trino to support client-provided certificates validated by the
-Trino server on initial connection.
-
-.. important::
-
-    This authentication method is only provided to support sites that have an
-    absolute requirement for client authentication *and already have* client
-    certificates for each client. Sites in this category have an existing PKI
-    infrastructure, possibly including an onsite Certificate Authority (CA).
-
-    This feature is not appropriate for sites that need to generate a set of
-    client certificates in order to use this authentication type. Consider
-    instead using another :ref:`authentication type <cl-access-auth>`.
-
-Using :doc:`TLS <tls>` and :doc:`a configured shared secret
-</security/internal-communication>` is required for certificate authentication.
-
-Using certificate authentication
---------------------------------
-
-All clients connecting with TLS/HTTPS go through the following initial steps:
-
-1. The client attempts to contact the coordinator.
-2. The coordinator returns its certificate to the client.
-3. The client validates the server's certificate using the client's trust store.
-
-A cluster with certificate authentication enabled goes through the following
-additional steps:
-
-4. The coordinator asks the client for its certificate.
-5. The client responds with its certificate.
-6. The coordinator verifies the client's certificate, using the coordinator's
-   trust store.
-
-Several rules emerge from these steps:
-
-* Trust stores used by clients must include the certificate of the signer of
-  the coordinator's certificate.
-* Trust stores used by coordinators must include the certificate of the signer
-  of client certificates.
-* The trust stores used by the coordinator and clients do not need to be the
-  same.
-* The certificate that verifies the coordinator does not need to be the same as
-  the certificate verifying clients.
-
-Trino validates certificates based on the distinguished name (DN) from the
-X.509 ``Subject`` field. You can use :doc:`user mapping
-</security/user-mapping>` to map the subject DN to a Trino user name.
-
-There are three levels of client certificate support possible. From the point of
-view of the server:
-
-* The server does not require a certificate from clients.
-* The server asks for a certificate from clients, but allows connection without one.
-* The server must have a certificate from clients to allow connection.
-
-Trino's client certificate support is the middle type. It asks for a certificate
-but allows connection if another authentication method passes.
-
-Certificate authentication configuration
-----------------------------------------
-
-Enable certificate authentication by setting the :doc:`Certificate
-authentication type <authentication-types>` in :ref:`etc/config.properties
-<config_properties>`:
-
-.. code-block:: properties
-
-    http-server.authentication.type=CERTIFICATE
-
-You can specify certificate authentication along with another authenticaton
-method, such as ``PASSWORD``. In this case, authentication is performed in the
-order of entries, and the first successful authentication results in access.
-For example, the following setting shows the use of two authentication types:
-
-.. code-block:: properties
-
-    http-server.authentication.type=CERTIFICATE,PASSWORD
-
-The following configuration properties are also available:
-
-.. list-table:: Configuration properties
-   :widths: 50 50
-   :header-rows: 1
-
-   * - Property name
-     - Description
-   * - ``http-server.authentication.certificate.user-mapping.pattern``
-     -  A regular expression pattern to :doc:`map all user names
-        </security/user-mapping>` for this authentication type to the format
-        expected by Trino.
-   * - ``http-server.authentication.certificate.user-mapping.file``
-     - The path to a JSON file that contains a set of :doc:`user mapping
-       rules </security/user-mapping>` for this authentication type.
-
-Use certificate authentication with clients
--------------------------------------------
-
-When using the Trino :doc:`CLI </client/cli>`, specify the
-``--keystore-path`` and ``--keystore-password`` options as described
-in :ref:`cli-certificate-auth`.
-
-When using the Trino :doc:`JDBC driver </client/jdbc>` to connect to a
-cluster with certificate authentication enabled, use the ``SSLKeyStoreType`` and
-``SSLKeyStorePassword`` :ref:`parameters <jdbc-parameter-reference>` to specify
-the path to the client's certificate and its password, if any.
diff --git a/docs/src/main/sphinx/security/file-system-access-control.md b/docs/src/main/sphinx/security/file-system-access-control.md
new file mode 100644
index 000000000000..64ef7a615471
--- /dev/null
+++ b/docs/src/main/sphinx/security/file-system-access-control.md
@@ -0,0 +1,912 @@
+# File-based access control
+
+To secure access to data in your cluster, you can implement file-based access
+control where access to data and operations is defined by rules declared in
+manually-configured JSON files.
+
+There are two types of file-based access control:
+
+- **System-level access control** uses the access control plugin with a single
+  JSON file that specifies authorization rules for the whole cluster.
+- **Catalog-level access control** uses individual JSON files for each catalog
+  for granular control over the data in that catalog, including column-level
+  authorization.
+
+(system-file-based-access-control)=
+
+## System-level access control files
+
+The access control plugin allows you to specify authorization rules for the
+cluster in a single JSON file.
+
+### Configuration
+
+To use the access control plugin, add an `etc/access-control.properties` file
+containing two required properties: `access-control.name`, which must be set
+to `file`, and `security.config-file`, which must be set to the location
+of the config file. The configuration file location can either point to the local
+disc or to a http endpoint. For example, if a config file named `rules.json` resides
+in `etc`, add an `etc/access-control.properties` with the following
+contents:
+
+```text
+access-control.name=file
+security.config-file=etc/rules.json
+```
+
+If the config should be loaded via the http endpoint `http://trino-test/config` and
+is wrapped into a JSON object and available via the `data` key `etc/access-control.properties`
+should look like this:
+
+```text
+access-control.name=file
+security.config-file=http://trino-test/config
+security.json-pointer=/data
+```
+
+The config file is specified in JSON format. It contains rules that define which
+users have access to which resources. The rules are read from top to bottom and
+the first matching rule is applied. If no rule matches, access is denied. A JSON
+pointer (RFC 6901) can be specified using the `security.json-pointer` property
+to specify a nested object inside the JSON content containing the rules. Per default,
+the file is assumed to contain a single object defining the rules rendering
+the specification of `security.json-pointer` unnecessary in that case.
+
+### Refresh
+
+By default, when a change is made to the JSON rules file, Trino must be
+restarted to load the changes. There is an optional property to refresh the
+properties without requiring a Trino restart. The refresh period is specified in
+the `etc/access-control.properties`:
+
+```text
+security.refresh-period=1s
+```
+
+### Catalog, schema, and table access
+
+Access to catalogs, schemas, tables, and views is controlled by the catalog,
+schema, and table rules. The catalog rules are coarse-grained rules used to
+restrict all access or write access to catalogs. They do not explicitly grant
+any specific schema or table permissions. The table and schema rules are used to
+specify who can create, drop, alter, select, insert, delete, etc. for schemas
+and tables.
+
+:::{note}
+These rules do not apply to system-defined tables in the
+`information_schema` schema.
+:::
+
+For each rule set, permission is based on the first matching rule read from top
+to bottom.  If no rule matches, access is denied. If no rules are provided at
+all, then access is granted.
+
+The following table summarizes the permissions required for each SQL command:
+
+| SQL command                        | Catalog   | Schema  | Table                | Note                                                              |
+| ---------------------------------- | --------- | ------- | -------------------- | ----------------------------------------------------------------- |
+| SHOW CATALOGS                      |           |         |                      | Always allowed                                                    |
+| SHOW SCHEMAS                       | read-only | any\*   | any\*                | Allowed if catalog is {ref}`visible<system-file-auth-visibility>` |
+| SHOW TABLES                        | read-only | any\*   | any\*                | Allowed if schema {ref}`visible<system-file-auth-visibility>`     |
+| CREATE SCHEMA                      | read-only | owner   |                      |                                                                   |
+| DROP SCHEMA                        | all       | owner   |                      |                                                                   |
+| SHOW CREATE SCHEMA                 | all       | owner   |                      |                                                                   |
+| ALTER SCHEMA ... RENAME TO         | all       | owner\* |                      | Ownership is required on both old and new schemas                 |
+| ALTER SCHEMA ... SET AUTHORIZATION | all       | owner   |                      |                                                                   |
+| CREATE TABLE                       | all       |         | owner                |                                                                   |
+| DROP TABLE                         | all       |         | owner                |                                                                   |
+| ALTER TABLE ... RENAME TO          | all       |         | owner\*              | Ownership is required on both old and new tables                  |
+| ALTER TABLE ... SET PROPERTIES     | all       |         | owner                |                                                                   |
+| CREATE VIEW                        | all       |         | owner                |                                                                   |
+| DROP VIEW                          | all       |         | owner                |                                                                   |
+| ALTER VIEW ... RENAME TO           | all       |         | owner\*              | Ownership is required on both old and new views                   |
+| REFRESH MATERIALIZED VIEW          | all       |         | update               |                                                                   |
+| COMMENT ON TABLE                   | all       |         | owner                |                                                                   |
+| COMMENT ON COLUMN                  | all       |         | owner                |                                                                   |
+| ALTER TABLE ... ADD COLUMN         | all       |         | owner                |                                                                   |
+| ALTER TABLE ... DROP COLUMN        | all       |         | owner                |                                                                   |
+| ALTER TABLE ... RENAME COLUMN      | all       |         | owner                |                                                                   |
+| SHOW COLUMNS                       | all       |         | any                  |                                                                   |
+| SELECT FROM table                  | read-only |         | select               |                                                                   |
+| SELECT FROM view                   | read-only |         | select, grant_select |                                                                   |
+| INSERT INTO                        | all       |         | insert               |                                                                   |
+| DELETE FROM                        | all       |         | delete               |                                                                   |
+| UPDATE                             | all       |         | update               |                                                                   |
+
+Permissions required for executing functions:
+
+:::{list-table}
+:widths: 30, 10, 20, 40
+:header-rows: 1
+
+* - SQL command
+  - Catalog
+  - Function permission
+  - Note
+* - `SELECT function()`
+  -
+  - `execute`, `grant_execute*`
+  - `grant_execute` is required when the function is used in a `SECURITY DEFINER`
+    view.
+* - `SELECT FROM TABLE(table_function())`
+  - `all`
+  - `execute`, `grant_execute*`
+  - `grant_execute` is required when the function is used in a `SECURITY DEFINER`
+    view.
+:::
+
+(system-file-auth-visibility)=
+
+#### Visibility
+
+For a catalog, schema, or table to be visible in a `SHOW` command, the user
+must have at least one permission on the item or any nested item. The nested
+items do not need to already exist as any potential permission makes the item
+visible. Specifically:
+
+- `catalog`: Visible if user is the owner of any nested schema, has
+  permissions on any nested table or function, or has permissions to
+  set session properties in the catalog.
+- `schema`: Visible if the user is the owner of the schema, or has permissions
+  on any nested table or function.
+- `table`: Visible if the user has any permissions on the table.
+
+#### Catalog rules
+
+Each catalog rule is composed of the following fields:
+
+- `user` (optional): regex to match against user name. Defaults to `.*`.
+- `role` (optional): regex to match against role names. Defaults to `.*`.
+- `group` (optional): regex to match against group names. Defaults to `.*`.
+- `catalog` (optional): regex to match against catalog name. Defaults to
+  `.*`.
+- `allow` (required): string indicating whether a user has access to the
+  catalog. This value can be `all`, `read-only` or `none`, and defaults to
+  `none`. Setting this value to `read-only` has the same behavior as the
+  `read-only` system access control plugin.
+
+In order for a rule to apply the user name must match the regular expression
+specified in `user` attribute.
+
+For role names, a rule can be applied if at least one of the currently enabled
+roles matches the `role` regular expression.
+
+For group names, a rule can be applied if at least one group name of this user
+matches the `group` regular expression.
+
+The `all` value for `allow` means these rules do not restrict access in any
+way, but the schema and table rules can restrict access.
+
+:::{note}
+By default, all users have access to the `system` catalog. You can
+override this behavior by adding a rule.
+
+Boolean `true` and `false` are also supported as legacy values for
+`allow`, to support backwards compatibility.  `true` maps to `all`,
+and `false` maps to `none`.
+:::
+
+For example, if you want to allow only the role `admin` to access the
+`mysql` and the `system` catalog, allow users from the `finance` and
+`human_resources` groups access to `postgres` catalog, allow all users to
+access the `hive` catalog, and deny all other access, you can use the
+following rules:
+
+```json
+{
+  "catalogs": [
+    {
+      "role": "admin",
+      "catalog": "(mysql|system)",
+      "allow": "all"
+    },
+    {
+      "group": "finance|human_resources",
+      "catalog": "postgres",
+      "allow": true
+    },
+    {
+      "catalog": "hive",
+      "allow": "all"
+    },
+    {
+      "user": "alice",
+      "catalog": "postgresql",
+      "allow": "read-only"
+    },
+    {
+      "catalog": "system",
+      "allow": "none"
+    }
+  ]
+}
+```
+
+For group-based rules to match, users need to be assigned to groups by a
+{doc}`/develop/group-provider`.
+
+#### Schema rules
+
+Each schema rule is composed of the following fields:
+
+- `user` (optional): regex to match against user name. Defaults to `.*`.
+- `role` (optional): regex to match against role names. Defaults to `.*`.
+- `group` (optional): regex to match against group names. Defaults to `.*`.
+- `catalog` (optional): regex to match against catalog name. Defaults to
+  `.*`.
+- `schema` (optional): regex to match against schema name. Defaults to
+  `.*`.
+- `owner` (required): boolean indicating whether the user is to be considered
+  an owner of the schema. Defaults to `false`.
+
+For example, to provide ownership of all schemas to role `admin`, treat all
+users as owners of the `default.default` schema and prevent user `guest`
+from ownership of any schema, you can use the following rules:
+
+```json
+{
+  "schemas": [
+    {
+      "role": "admin",
+      "schema": ".*",
+      "owner": true
+    },
+    {
+      "user": "guest",
+      "owner": false
+    },
+    {
+      "catalog": "default",
+      "schema": "default",
+      "owner": true
+    }
+  ]
+}
+```
+
+#### Table rules
+
+Each table rule is composed of the following fields:
+
+- `user` (optional): regex to match against user name. Defaults to `.*`.
+- `role` (optional): regex to match against role names. Defaults to `.*`.
+- `group` (optional): regex to match against group names. Defaults to `.*`.
+- `catalog` (optional): regex to match against catalog name. Defaults to
+  `.*`.
+- `schema` (optional): regex to match against schema name. Defaults to `.*`.
+- `table` (optional): regex to match against table names. Defaults to `.*`.
+- `privileges` (required): zero or more of `SELECT`, `INSERT`,
+  `DELETE`, `UPDATE`, `OWNERSHIP`, `GRANT_SELECT`
+- `columns` (optional): list of column constraints.
+- `filter` (optional): boolean filter expression for the table.
+- `filter_environment` (optional): environment use during filter evaluation.
+
+#### Column constraint
+
+These constraints can be used to restrict access to column data.
+
+- `name`: name of the column.
+- `allow` (optional): if false, column can not be accessed.
+- `mask` (optional): mask expression applied to column.
+- `mask_environment` (optional): environment use during mask evaluation.
+
+#### Filter and mask environment
+
+- `user` (optional): username for checking permission of subqueries in mask.
+
+:::{note}
+These rules do not apply to `information_schema`.
+
+`mask` can contain conditional expressions such as `IF` or `CASE`, which achieves conditional masking.
+:::
+
+The example below defines the following table access policy:
+
+- Role `admin` has all privileges across all tables and schemas
+- User `banned_user` has no privileges
+- All users have `SELECT` privileges on `default.hr.employees`, but the
+  table is filtered to only the row for the current user.
+- All users have `SELECT` privileges on all tables in the `default.default`
+  schema, except for the `address` column which is blocked, and `ssn` which
+  is masked.
+
+```json
+{
+  "tables": [
+    {
+      "role": "admin",
+      "privileges": ["SELECT", "INSERT", "DELETE", "UPDATE", "OWNERSHIP"]
+    },
+    {
+      "user": "banned_user",
+      "privileges": []
+    },
+    {
+      "catalog": "default",
+      "schema": "hr",
+      "table": "employee",
+      "privileges": ["SELECT"],
+      "filter": "user = current_user",
+      "filter_environment": {
+        "user": "system_user"
+      }
+    },
+    {
+      "catalog": "default",
+      "schema": "default",
+      "table": ".*",
+      "privileges": ["SELECT"],
+      "columns" : [
+         {
+            "name": "address",
+            "allow": false
+         },
+         {
+            "name": "SSN",
+            "mask": "'XXX-XX-' + substring(credit_card, -4)",
+            "mask_environment": {
+              "user": "system_user"
+            }
+         }
+      ]
+    }
+  ]
+}
+```
+
+(system-file-function-rules)=
+
+#### Function rules
+
+These rules control the user's ability to execute functions.
+
+:::{note}
+Users always have access to functions in the `system.builtin` schema, and
+you cannot override this behavior by adding a rule.
+:::
+
+Each function rule is composed of the following fields:
+
+- `user` (optional): regular expression to match against user name.
+  Defaults to `.*`.
+- `role` (optional): regular expression to match against role names.
+  Defaults to `.*`.
+- `group` (optional): regular expression to match against group names.
+  Defaults to `.*`.
+- `catalog` (optional): regular expression to match against catalog name.
+  Defaults to `.*`.
+- `schema` (optional): regular expression to match against schema name.
+  Defaults to `.*`.
+- `function` (optional): regular expression to match against function names.
+  Defaults to `.*`.
+- `privileges` (required): zero or more of `EXECUTE`, `GRANT_EXECUTE`.
+
+To explicitly allow the system builtin functions in queries (and SECURITY 
+DEFINER views), you can use the following rule:
+
+```json
+{
+  "functions": [
+    {
+      "catalog": "system",
+      "schema": "builtin",
+      "privileges": [
+        "EXECUTE",
+        "GRANT_EXECUTE"
+      ]
+    }
+  ]
+}
+```
+
+Care should be taken when granting permission to the `system` schema of any 
+catalog, as this is the schema Trino uses for table function such as `query`.
+These table functions can be used to access or modify the underlying data of
+the catalog.
+
+The following example allows the `admin` user to execute `query` table
+function from any catalog:
+
+```json
+{
+  "functions": [
+    {
+      "catalog": "system",
+      "schema": "builtin",
+      "privileges": [
+        "EXECUTE",
+        "GRANT_EXECUTE"
+      ]
+    },
+    {
+      "user": "admin",
+      "schema": "system",
+      "function": "query",
+      "privileges": [
+        "EXECUTE"
+      ]
+    }
+  ]
+}
+```
+
+(verify-rules)=
+
+#### Verify configuration
+
+To verify the system-access control file is configured properly, set the
+rules to completely block access to all users of the system:
+
+```json
+{
+  "catalogs": [
+    {
+      "catalog": "system",
+      "allow": "none"
+    }
+  ]
+}
+```
+
+Restart your cluster to activate the rules for your cluster. With the
+Trino {doc}`CLI </client/cli>` run a query to test authorization:
+
+```text
+trino> SELECT * FROM system.runtime.nodes;
+Query 20200824_183358_00000_c62aw failed: Access Denied: Cannot access catalog system
+```
+
+Remove these rules and restart the Trino cluster.
+
+(system-file-auth-session-property)=
+
+### Session property rules
+
+These rules control the ability of a user to set system and catalog session
+properties. The user is granted or denied access, based on the first matching
+rule, read from top to bottom. If no rules are specified, all users are allowed
+set any session property. If no rule matches, setting the session property is
+denied. System session property rules are composed of the following fields:
+
+- `user` (optional): regex to match against user name. Defaults to `.*`.
+- `role` (optional): regex to match against role names. Defaults to `.*`.
+- `group` (optional): regex to match against group names. Defaults to `.*`.
+- `property` (optional): regex to match against the property name. Defaults to
+  `.*`.
+- `allow` (required): boolean indicating if the setting the session
+  property should be allowed.
+
+The catalog session property rules have the additional field:
+
+- `catalog` (optional): regex to match against catalog name. Defaults to
+  `.*`.
+
+The example below defines the following table access policy:
+
+- Role `admin` can set all session property
+- User `banned_user` can not set any session properties
+- All users can set the `resource_overcommit` system session property, and the
+  `bucket_execution_enabled` session property in the `hive` catalog.
+
+```{literalinclude} session-property-access.json
+:language: json
+```
+
+(query-rules)=
+
+### Query rules
+
+These rules control the ability of a user to execute, view, or kill a query. The
+user is granted or denied access, based on the first matching rule read from top
+to bottom. If no rules are specified, all users are allowed to execute queries,
+and to view or kill queries owned by any user. If no rule matches, query
+management is denied. Each rule is composed of the following fields:
+
+- `user` (optional): regex to match against user name. Defaults to `.*`.
+- `role` (optional): regex to match against role names. Defaults to `.*`.
+- `group` (optional): regex to match against group names. Defaults to `.*`.
+- `queryOwner` (optional): regex to match against the query owner name.
+  Defaults to `.*`.
+- `allow` (required): set of query permissions granted to user. Values:
+  `execute`, `view`, `kill`
+
+:::{note}
+Users always have permission to view or kill their own queries.
+
+A rule that includes `queryOwner` may not include the `execute` access mode.
+Queries are only owned by a user once their execution has begun.
+:::
+
+For example, if you want to allow the role `admin` full query access, allow
+the user `alice` to execute and kill queries, allow members of the group
+`contractors` to view queries owned by users `alice` or `dave`, allow any
+user to execute queries, and deny all other access, you can use the following
+rules:
+
+```{literalinclude} query-access.json
+:language: json
+```
+
+(system-file-auth-impersonation-rules)=
+
+### Impersonation rules
+
+These rules control the ability of a user to impersonate another user. In
+some environments it is desirable for an administrator (or managed system) to
+run queries on behalf of other users. In these cases, the administrator
+authenticates using their credentials, and then submits a query as a different
+user. When the user context is changed, Trino verifies that the administrator
+is authorized to run queries as the target user.
+
+When these rules are present, the authorization is based on the first matching
+rule, processed from top to bottom. If no rules match, the authorization is
+denied. If impersonation rules are not present but the legacy principal rules
+are specified, it is assumed impersonation access control is being handled by
+the principal rules, so impersonation is allowed. If neither impersonation nor
+principal rules are defined, impersonation is not allowed.
+
+Each impersonation rule is composed of the following fields:
+
+- `original_user` (optional): regex to match against the user requesting the
+  impersonation. Defaults to `.*`.
+- `original_role` (optional): regex to match against role names of the
+  requesting impersonation. Defaults to `.*`.
+- `new_user` (required): regex to match against the user to impersonate. Can
+  contain references to subsequences captured during the match against
+  *original_user*, and each reference is replaced by the result of evaluating
+  the corresponding group respectively.
+- `allow` (optional): boolean indicating if the authentication should be
+  allowed. Defaults to `true`.
+
+The impersonation rules are a bit different than the other rules: The attribute
+`new_user` is required to not accidentally prevent more access than intended.
+Doing so it was possible to make the attribute `allow` optional.
+
+The following example allows the `admin` role, to impersonate any user, except
+for `bob`. It also allows any user to impersonate the `test` user. It also
+allows a user in the form `team_backend` to impersonate the
+`team_backend_sandbox` user, but not arbitrary users:
+
+```{literalinclude} user-impersonation.json
+:language: json
+```
+
+(system-file-auth-principal-rules)=
+
+### Principal rules
+
+:::{warning}
+Principal rules are deprecated. Instead, use {doc}`/security/user-mapping`
+which specifies how a complex authentication user name is mapped to a simple
+user name for Trino, and impersonation rules defined above.
+:::
+
+These rules serve to enforce a specific matching between a principal and a
+specified user name. The principal is granted authorization as a user, based
+on the first matching rule read from top to bottom. If no rules are specified,
+no checks are performed. If no rule matches, user authorization is denied.
+Each rule is composed of the following fields:
+
+- `principal` (required): regex to match and group against principal.
+- `user` (optional): regex to match against user name. If matched, it
+  grants or denies the authorization based on the value of `allow`.
+- `principal_to_user` (optional): replacement string to substitute against
+  principal. If the result of the substitution is same as the user name, it
+  grants or denies the authorization based on the value of `allow`.
+- `allow` (required): boolean indicating whether a principal can be authorized
+  as a user.
+
+:::{note}
+You would at least specify one criterion in a principal rule. If you specify
+both criteria in a principal rule, it returns the desired conclusion when
+either of criteria is satisfied.
+:::
+
+The following implements an exact matching of the full principal name for LDAP
+and Kerberos authentication:
+
+```json
+{
+  "principals": [
+    {
+      "principal": "(.*)",
+      "principal_to_user": "$1",
+      "allow": true
+    },
+    {
+      "principal": "([^/]+)(/.*)?@.*",
+      "principal_to_user": "$1",
+      "allow": true
+    }
+  ]
+}
+```
+
+If you want to allow users to use the exact same name as their Kerberos
+principal name, and allow `alice` and `bob` to use a group principal named
+as `group@example.net`, you can use the following rules.
+
+```json
+{
+  "principals": [
+    {
+      "principal": "([^/]+)/?.*@example.net",
+      "principal_to_user": "$1",
+      "allow": true
+    },
+    {
+      "principal": "group@example.net",
+      "user": "alice|bob",
+      "allow": true
+    }
+  ]
+}
+```
+
+(system-file-auth-system-information)=
+
+### System information rules
+
+These rules specify which users can access the system information management
+interface. System information access includes the following aspects:
+
+- Read access to details such as Trino version, uptime of the node, and others
+  from the `/v1/info` and `/v1/status` REST endpoints.
+- Read access with the {doc}`system information functions </functions/system>`.
+- Read access with the {doc}`/connector/system`.
+- Write access to trigger {doc}`/admin/graceful-shutdown`.
+
+The user is granted or denied access based on the first matching
+rule read from top to bottom. If no rules are specified, all access to system
+information is denied. If no rule matches, system access is denied. Each rule is
+composed of the following fields:
+
+- `role` (optional): regex to match against role. If matched, it
+  grants or denies the authorization based on the value of `allow`.
+- `user` (optional): regex to match against user name. If matched, it
+  grants or denies the authorization based on the value of `allow`.
+- `allow` (required): set of access permissions granted to user. Values:
+  `read`, `write`
+
+The following configuration provides and example:
+
+```{literalinclude} system-information-access.json
+:language: json
+```
+
+- All users with the `admin` role have read and write access to system
+  information. This includes the ability to trigger
+  {doc}`/admin/graceful-shutdown`.
+- The user `alice` can read system information.
+- All other users and roles are denied access to system information.
+
+A fixed user can be set for management interfaces using the `management.user`
+configuration property.  When this is configured, system information rules must
+still be set to authorize this user to read or write to management information.
+The fixed management user only applies to HTTP by default. To enable the fixed
+user over HTTPS, set the `management.user.https-enabled` configuration
+property.
+
+(system-file-auth-authorization)=
+
+### Authorization rules
+
+These rules control the ability of how owner of schema, table or view can
+be altered. These rules are applicable to commands like:
+
+> ALTER SCHEMA name SET AUTHORIZATION ( user | USER user | ROLE role )
+> ALTER TABLE name SET AUTHORIZATION ( user | USER user | ROLE role )
+> ALTER VIEW name SET AUTHORIZATION ( user | USER user | ROLE role )
+
+When these rules are present, the authorization is based on the first matching
+rule, processed from top to bottom. If no rules match, the authorization is
+denied.
+
+Notice that in order to execute `ALTER` command on schema, table or view user requires `OWNERSHIP`
+privilege.
+
+Each authorization rule is composed of the following fields:
+
+- `original_user` (optional): regex to match against the user requesting the
+  authorization. Defaults to `.*`.
+- `original_group` (optional): regex to match against group names of the
+  requesting authorization. Defaults to `.*`.
+- `original_role` (optional): regex to match against role names of the
+  requesting authorization. Defaults to `.*`.
+- `new_user` (optional): regex to match against the new owner user of the schema, table or view.
+  By default it does not match.
+- `new_role` (optional): regex to match against the new owner role of the schema, table or view.
+  By default it does not match.
+- `allow` (optional): boolean indicating if the authentication should be
+  allowed. Defaults to `true`.
+
+Notice that `new_user` and `new_role` are optional, however it is required to provide at least one of them.
+
+The following example allows the `admin` role, to change owner of any schema, table or view
+to any user, except to\`\`bob\`\`.
+
+```{literalinclude} authorization.json
+:language: json
+```
+
+(system-file-auth-system-information-1)=
+
+(catalog-file-based-access-control)=
+
+## Catalog-level access control files
+
+You can create JSON files for individual catalogs that define authorization
+rules specific to that catalog. To enable catalog-level access control files,
+add a connector-specific catalog configuration property that sets the
+authorization type to `FILE` and the `security.config-file` catalog
+configuration property that specifies the JSON rules file.
+
+For example, the following Iceberg catalog configuration properties use the
+`rules.json` file for catalog-level access control:
+
+```properties
+iceberg.security=FILE
+security.config-file=etc/catalog/rules.json
+```
+
+Catalog-level access control files are supported on a per-connector basis, refer
+to the connector documentation for more information.
+
+:::{note}
+These rules do not apply to system-defined tables in the
+`information_schema` schema.
+:::
+
+### Configure a catalog rules file
+
+The configuration file is specified in JSON format. This file is composed of
+the following sections, each of which is a list of rules that are processed in
+order from top to bottom:
+
+1. `schemas`
+2. `tables`
+3. `session_properties`
+
+The user is granted the privileges from the first matching rule. All regexes
+default to `.*` if not specified.
+
+#### Schema rules
+
+These rules govern who is considered an owner of a schema.
+
+- `user` (optional): regex to match against user name.
+- `group` (optional): regex to match against every user group the user belongs
+  to.
+- `schema` (optional): regex to match against schema name.
+- `owner` (required): boolean indicating ownership.
+
+#### Table rules
+
+These rules govern the privileges granted on specific tables.
+
+- `user` (optional): regex to match against user name.
+- `group` (optional): regex to match against every user group the user belongs
+  to.
+- `schema` (optional): regex to match against schema name.
+- `table` (optional): regex to match against table name.
+- `privileges` (required): zero or more of `SELECT`, `INSERT`,
+  `DELETE`, `UPDATE`, `OWNERSHIP`, `GRANT_SELECT`.
+- `columns` (optional): list of column constraints.
+- `filter` (optional): boolean filter expression for the table.
+- `filter_environment` (optional): environment used during filter evaluation.
+
+##### Column constraints
+
+These constraints can be used to restrict access to column data.
+
+- `name`: name of the column.
+- `allow` (optional): if false, column can not be accessed.
+- `mask` (optional): mask expression applied to column.
+- `mask_environment` (optional): environment use during mask evaluation.
+
+##### Filter environment and mask environment
+
+These rules apply to `filter_environment` and `mask_environment`.
+
+- `user` (optional): username for checking permission of subqueries in a mask.
+
+:::{note}
+`mask` can contain conditional expressions such as `IF` or `CASE`, which achieves conditional masking.
+:::
+
+#### Function rules
+
+Each function rule is composed of the following fields:
+
+- `user` (optional): regular expression to match against user name.
+  Defaults to `.*`.
+- `group` (optional): regular expression to match against group names.
+  Defaults to `.*`.
+- `schema` (optional): regular expression to match against schema name.
+  Defaults to `.*`.
+- `function` (optional): regular expression to match against function names.
+  Defaults to `.*`.
+- `privileges` (required): zero or more of `EXECUTE`, `GRANT_EXECUTE`.
+
+#### Session property rules
+
+These rules govern who may set session properties.
+
+- `user` (optional): regex to match against user name.
+- `group` (optional): regex to match against every user group the user belongs
+  to.
+- `property` (optional): regex to match against session property name.
+- `allow` (required): boolean indicating whether this session property may be
+  set.
+
+### Example
+
+```json
+{
+  "schemas": [
+    {
+      "user": "admin",
+      "schema": ".*",
+      "owner": true
+    },
+    {
+      "group": "finance|human_resources",
+      "schema": "employees",
+      "owner": true
+    },
+    {
+      "user": "guest",
+      "owner": false
+    },
+    {
+      "schema": "default",
+      "owner": true
+    }
+  ],
+  "tables": [
+    {
+      "user": "admin",
+      "privileges": ["SELECT", "INSERT", "DELETE", "UPDATE", "OWNERSHIP"]
+    },
+    {
+      "user": "banned_user",
+      "privileges": []
+    },
+    {
+      "schema": "hr",
+      "table": "employee",
+      "privileges": ["SELECT"],
+      "filter": "user = current_user"
+    },
+    {
+      "schema": "default",
+      "table": ".*",
+      "privileges": ["SELECT"],
+      "columns" : [
+         {
+            "name": "address",
+            "allow": false
+         },
+         {
+            "name": "ssn",
+            "mask": "'XXX-XX-' + substring(credit_card, -4)",
+            "mask_environment": {
+              "user": "admin"
+            }
+         }
+      ]
+    }
+  ],
+  "session_properties": [
+    {
+      "property": "force_local_scheduling",
+      "allow": true
+    },
+    {
+      "user": "admin",
+      "property": "max_split_size",
+      "allow": true
+    }
+  ]
+}
+```
diff --git a/docs/src/main/sphinx/security/file-system-access-control.rst b/docs/src/main/sphinx/security/file-system-access-control.rst
deleted file mode 100644
index dfc8f40d057e..000000000000
--- a/docs/src/main/sphinx/security/file-system-access-control.rst
+++ /dev/null
@@ -1,902 +0,0 @@
-=========================
-File-based access control
-=========================
-
-To secure access to data in your cluster, you can implement file-based access
-control where access to data and operations is defined by rules declared in
-manually-configured JSON files.
-
-There are two types of file-based access control:
-
-* **System-level access control** uses the access control plugin with a single
-  JSON file that specifies authorization rules for the whole cluster.
-* **Catalog-level access control** uses individual JSON files for each catalog
-  for granular control over the data in that catalog, including column-level
-  authorization.
-
-.. _system-file-based-access-control:
-
-System-level access control files
-=================================
-
-The access control plugin allows you to specify authorization rules for the
-cluster in a single JSON file.
-
-Configuration
--------------
-
-.. warning::
-
-    Access to all functions including :doc:`table functions </functions/table>` is allowed by default.
-    To mitigate unwanted access, you must add a ``function``
-    :ref:`rule <system-file-function-rules>` to deny the ``TABLE`` function type.
-
-To use the access control plugin, add an ``etc/access-control.properties`` file
-containing two required properties: ``access-control.name``, which must be set
-to ``file``, and ``security.config-file``, which must be set to the location
-of the config file. The configuration file location can either point to the local
-disc or to a http endpoint. For example, if a config file named ``rules.json`` resides
-in ``etc``, add an ``etc/access-control.properties`` with the following
-contents:
-
-.. code-block:: text
-
-   access-control.name=file
-   security.config-file=etc/rules.json
-
-If the config should be loaded via the http endpoint ``http://trino-test/config`` and
-is wrapped into a JSON object and available via the ``data`` key ``etc/access-control.properties``
-should look like this:
-
-.. code-block:: text
-
-   access-control.name=file
-   security.config-file=http://trino-test/config
-   security.json-pointer=/data
-
-The config file is specified in JSON format. It contains rules that define which
-users have access to which resources. The rules are read from top to bottom and
-the first matching rule is applied. If no rule matches, access is denied. A JSON
-pointer (RFC 6901) can be specified using the ``security.json-pointer`` property
-to specify a nested object inside the JSON content containing the rules. Per default,
-the file is assumed to contain a single object defining the rules rendering
-the specification of ``security.json-pointer`` unnecessary in that case.
-
-Refresh
---------
-
-By default, when a change is made to the JSON rules file, Trino must be
-restarted to load the changes. There is an optional property to refresh the
-properties without requiring a Trino restart. The refresh period is specified in
-the ``etc/access-control.properties``:
-
-.. code-block:: text
-
-   security.refresh-period=1s
-
-Catalog, schema, and table access
----------------------------------
-
-Access to catalogs, schemas, tables, and views is controlled by the catalog,
-schema, and table rules. The catalog rules are coarse-grained rules used to
-restrict all access or write access to catalogs. They do not explicitly grant
-any specific schema or table permissions. The table and schema rules are used to
-specify who can create, drop, alter, select, insert, delete, etc. for schemas
-and tables.
-
-.. note::
-
-    These rules do not apply to system-defined tables in the
-    ``information_schema`` schema.
-
-For each rule set, permission is based on the first matching rule read from top
-to bottom.  If no rule matches, access is denied. If no rules are provided at
-all, then access is granted.
-
-The following table summarizes the permissions required for each SQL command:
-
-==================================== ========== ======= ==================== ===================================================
-SQL command                          Catalog    Schema  Table                Note
-==================================== ========== ======= ==================== ===================================================
-SHOW CATALOGS                                                                Always allowed
-SHOW SCHEMAS                         read-only  any*    any*                 Allowed if catalog is :ref:`visible<system-file-auth-visibility>`
-SHOW TABLES                          read-only  any*    any*                 Allowed if schema :ref:`visible<system-file-auth-visibility>`
-CREATE SCHEMA                        read-only  owner
-DROP SCHEMA                          all        owner
-SHOW CREATE SCHEMA                   all        owner
-ALTER SCHEMA ... RENAME TO           all        owner*                       Ownership is required on both old and new schemas
-ALTER SCHEMA ... SET AUTHORIZATION   all        owner
-CREATE TABLE                         all                owner
-DROP TABLE                           all                owner
-ALTER TABLE ... RENAME TO            all                owner*               Ownership is required on both old and new tables
-ALTER TABLE ... SET PROPERTIES       all                owner
-CREATE VIEW                          all                owner
-DROP VIEW                            all                owner
-ALTER VIEW ... RENAME TO             all                owner*               Ownership is required on both old and new views
-REFRESH MATERIALIZED VIEW            all                update
-COMMENT ON TABLE                     all                owner
-COMMENT ON COLUMN                    all                owner
-ALTER TABLE ... ADD COLUMN           all                owner
-ALTER TABLE ... DROP COLUMN          all                owner
-ALTER TABLE ... RENAME COLUMN        all                owner
-SHOW COLUMNS                         all                any
-SELECT FROM table                    read-only          select
-SELECT FROM view                     read-only          select, grant_select
-INSERT INTO                          all                insert
-DELETE FROM                          all                delete
-UPDATE                               all                update
-==================================== ========== ======= ==================== ===================================================
-
-Permissions required for executing functions:
-
-.. list-table::
-   :widths: 30, 10, 15, 15, 30
-   :header-rows: 1
-
-   * - SQL command
-     - Catalog
-     - Function permission
-     - Function kind
-     - Note
-   * - ``SELECT function()``
-     -
-     - ``execute``, ``grant_execute*``
-     - ``aggregate``, ``scalar``, ``window``
-     - ``grant_execute`` is required when function is executed with view owner privileges.
-   * - ``SELECT FROM TABLE(table_function())``
-     - ``all``
-     - ``execute``, ``grant_execute*``
-     - ``table``
-     - ``grant_execute`` is required when :doc:`table function </functions/table>` is executed with view owner privileges.
-
-.. _system-file-auth-visibility:
-
-Visibility
-^^^^^^^^^^
-
-For a catalog, schema, or table to be visible in a ``SHOW`` command, the user
-must have at least one permission on the item or any nested item. The nested
-items do not need to already exist as any potential permission makes the item
-visible. Specifically:
-
-* ``catalog``: Visible if user is the owner of any nested schema, has
-  permissions on any nested table or :doc:`table function </functions/table>`, or has permissions to
-  set session properties in the catalog.
-* ``schema``: Visible if the user is the owner of the schema, or has permissions
-  on any nested table or :doc:`table function </functions/table>`.
-* ``table``: Visible if the user has any permissions on the table.
-
-Catalog rules
-^^^^^^^^^^^^^
-
-Each catalog rule is composed of the following fields:
-
-* ``user`` (optional): regex to match against user name. Defaults to ``.*``.
-* ``role`` (optional): regex to match against role names. Defaults to ``.*``.
-* ``group`` (optional): regex to match against group names. Defaults to ``.*``.
-* ``catalog`` (optional): regex to match against catalog name. Defaults to
-  ``.*``.
-* ``allow`` (required): string indicating whether a user has access to the
-  catalog. This value can be ``all``, ``read-only`` or ``none``, and defaults to
-  ``none``. Setting this value to ``read-only`` has the same behavior as the
-  ``read-only`` system access control plugin.
-
-In order for a rule to apply the user name must match the regular expression
-specified in ``user`` attribute.
-
-For role names, a rule can be applied if at least one of the currently enabled
-roles matches the ``role`` regular expression.
-
-For group names, a rule can be applied if at least one group name of this user
-matches the ``group`` regular expression.
-
-The ``all`` value for ``allow`` means these rules do not restrict access in any
-way, but the schema and table rules can restrict access.
-
-.. note::
-
-    By default, all users have access to the ``system`` catalog. You can
-    override this behavior by adding a rule.
-
-    Boolean ``true`` and ``false`` are also supported as legacy values for
-    ``allow``, to support backwards compatibility.  ``true`` maps to ``all``,
-    and ``false`` maps to ``none``.
-
-For example, if you want to allow only the role ``admin`` to access the
-``mysql`` and the ``system`` catalog, allow users from the ``finance`` and
-``human_resources`` groups access to ``postgres`` catalog, allow all users to
-access the ``hive`` catalog, and deny all other access, you can use the
-following rules:
-
-.. code-block:: json
-
-    {
-      "catalogs": [
-        {
-          "role": "admin",
-          "catalog": "(mysql|system)",
-          "allow": "all"
-        },
-        {
-          "group": "finance|human_resources",
-          "catalog": "postgres",
-          "allow": true
-        },
-        {
-          "catalog": "hive",
-          "allow": "all"
-        },
-        {
-          "user": "alice",
-          "catalog": "postgresql",
-          "allow": "read-only"
-        },
-        {
-          "catalog": "system",
-          "allow": "none"
-        }
-      ]
-    }
-
-For group-based rules to match, users need to be assigned to groups by a
-:doc:`/develop/group-provider`.
-
-Schema rules
-^^^^^^^^^^^^
-
-Each schema rule is composed of the following fields:
-
-* ``user`` (optional): regex to match against user name. Defaults to ``.*``.
-* ``role`` (optional): regex to match against role names. Defaults to ``.*``.
-* ``group`` (optional): regex to match against group names. Defaults to ``.*``.
-* ``catalog`` (optional): regex to match against catalog name. Defaults to
-  ``.*``.
-* ``schema`` (optional): regex to match against schema name. Defaults to
-  ``.*``.
-* ``owner`` (required): boolean indicating whether the user is to be considered
-  an owner of the schema. Defaults to ``false``.
-
-For example, to provide ownership of all schemas to role ``admin``, treat all
-users as owners of the ``default.default`` schema and prevent user ``guest``
-from ownership of any schema, you can use the following rules:
-
-.. code-block:: json
-
-    {
-      "schemas": [
-        {
-          "role": "admin",
-          "schema": ".*",
-          "owner": true
-        },
-        {
-          "user": "guest",
-          "owner": false
-        },
-        {
-          "catalog": "default",
-          "schema": "default",
-          "owner": true
-        }
-      ]
-    }
-
-Table rules
-^^^^^^^^^^^
-
-Each table rule is composed of the following fields:
-
-* ``user`` (optional): regex to match against user name. Defaults to ``.*``.
-* ``role`` (optional): regex to match against role names. Defaults to ``.*``.
-* ``group`` (optional): regex to match against group names. Defaults to ``.*``.
-* ``catalog`` (optional): regex to match against catalog name. Defaults to
-  ``.*``.
-* ``schema`` (optional): regex to match against schema name. Defaults to ``.*``.
-* ``table`` (optional): regex to match against table names. Defaults to ``.*``.
-* ``privileges`` (required): zero or more of ``SELECT``, ``INSERT``,
-  ``DELETE``, ``UPDATE``, ``OWNERSHIP``, ``GRANT_SELECT``
-* ``columns`` (optional): list of column constraints.
-* ``filter`` (optional): boolean filter expression for the table.
-* ``filter_environment`` (optional): environment use during filter evaluation.
-
-Column constraint
-^^^^^^^^^^^^^^^^^
-
-These constraints can be used to restrict access to column data.
-
-* ``name``: name of the column.
-* ``allow`` (optional): if false, column can not be accessed.
-* ``mask`` (optional): mask expression applied to column.
-* ``mask_environment`` (optional): environment use during mask evaluation.
-
-Filter and mask environment
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* ``user`` (optional): username for checking permission of subqueries in mask.
-
-.. note::
-
-    These rules do not apply to ``information_schema``.
-
-    ``mask`` can contain conditional expressions such as ``IF`` or ``CASE``, which achieves conditional masking.
-
-The example below defines the following table access policy:
-
-* Role ``admin`` has all privileges across all tables and schemas
-* User ``banned_user`` has no privileges
-* All users have ``SELECT`` privileges on ``default.hr.employees``, but the
-  table is filtered to only the row for the current user.
-* All users have ``SELECT`` privileges on all tables in the ``default.default``
-  schema, except for the ``address`` column which is blocked, and ``ssn`` which
-  is masked.
-
-.. code-block:: json
-
-    {
-      "tables": [
-        {
-          "role": "admin",
-          "privileges": ["SELECT", "INSERT", "DELETE", "UPDATE", "OWNERSHIP"]
-        },
-        {
-          "user": "banned_user",
-          "privileges": []
-        },
-        {
-          "catalog": "default",
-          "schema": "hr",
-          "table": "employee",
-          "privileges": ["SELECT"],
-          "filter": "user = current_user",
-          "filter_environment": {
-            "user": "system_user"
-          }
-        },
-        {
-          "catalog": "default",
-          "schema": "default",
-          "table": ".*",
-          "privileges": ["SELECT"],
-          "columns" : [
-             {
-                "name": "address",
-                "allow": false
-             },
-             {
-                "name": "SSN",
-                "mask": "'XXX-XX-' + substring(credit_card, -4)",
-                "mask_environment": {
-                  "user": "system_user"
-                }
-             }
-          ]
-        }
-      ]
-    }
-
-.. _system-file-function-rules:
-
-Function rules
-^^^^^^^^^^^^^^
-
-These rules control the user's ability to execute SQL all function kinds,
-such as :doc:`aggregate functions </functions/aggregate>`, scalar functions,
-:doc:`table functions </functions/table>` and :doc:`window functions </functions/window>`.
-
-Each function rule is composed of the following fields:
-
-* ``user`` (optional): regular expression to match against user name.
-  Defaults to ``.*``.
-* ``role`` (optional): regular expression to match against role names.
-  Defaults to ``.*``.
-* ``group`` (optional): regular expression to match against group names.
-  Defaults to ``.*``.
-* ``catalog`` (optional): regular expression to match against catalog name.
-  Defaults to ``.*``.
-* ``schema`` (optional): regular expression to match against schema name.
-  Defaults to ``.*``.
-* ``function`` (optional): regular expression to match against function names.
-  Defaults to ``.*``.
-* ``privileges`` (required): zero or more of ``EXECUTE``, ``GRANT_EXECUTE``.
-* ``function_kinds`` (required): one or more of ``AGGREGATE``, ``SCALAR``,
-  ``TABLES``, ``WINDOW``. When a user defines a rule for ``AGGREGATE``, ``SCALAR``
-  or ``WINDOW`` functions, the ``catalog`` and ``schema`` fields are disallowed
-  because those functions are available globally without any catalogs involvement.
-
-To deny all :doc:`table functions </functions/table>` from any catalog,
-use the following rules:
-
-.. code-block:: json
-
-    {
-      "functions": [
-        {
-          "privileges": [
-            "EXECUTE",
-            "GRANT_EXECUTE"
-          ],
-          "function_kinds": [
-            "SCALAR",
-            "AGGREGATE",
-            "WINDOW"
-          ]
-        },
-        {
-          "privileges": [],
-          "function_kinds": [
-            "TABLE"
-          ]
-        }
-      ]
-    }
-
-It's a good practice to limit access to ``query`` table function because this
-table function works like a query passthrough and ignores  ``tables`` rules.
-The following example allows the ``admin`` user to execute ``query`` table
-function from any catalog:
-
-.. code-block:: json
-
-    {
-      "functions": [
-        {
-          "privileges": [
-            "EXECUTE",
-            "GRANT_EXECUTE"
-          ],
-          "function_kinds": [
-            "SCALAR",
-            "AGGREGATE",
-            "WINDOW"
-          ]
-        },
-        {
-          "user": "admin",
-          "function": "query",
-          "privileges": [
-            "EXECUTE"
-          ],
-          "function_kinds": [
-            "TABLE"
-          ]
-        }
-      ]
-    }
-
-.. _verify_rules:
-
-Verify configuration
-^^^^^^^^^^^^^^^^^^^^
-
-To verify the system-access control file is configured properly, set the
-rules to completely block access to all users of the system:
-
-.. code-block:: json
-
-    {
-      "catalogs": [
-        {
-          "catalog": "system",
-          "allow": "none"
-        }
-      ]
-    }
-
-Restart your cluster to activate the rules for your cluster. With the
-Trino :doc:`CLI </client/cli>` run a query to test authorization:
-
-.. code-block:: text
-
-  trino> SELECT * FROM system.runtime.nodes;
-  Query 20200824_183358_00000_c62aw failed: Access Denied: Cannot access catalog system
-
-Remove these rules and restart the Trino cluster.
-
-.. _system-file-auth-session-property:
-
-Session property rules
-----------------------
-
-These rules control the ability of a user to set system and catalog session
-properties. The user is granted or denied access, based on the first matching
-rule, read from top to bottom. If no rules are specified, all users are allowed
-set any session property. If no rule matches, setting the session property is
-denied. System session property rules are composed of the following fields:
-
-* ``user`` (optional): regex to match against user name. Defaults to ``.*``.
-* ``role`` (optional): regex to match against role names. Defaults to ``.*``.
-* ``group`` (optional): regex to match against group names. Defaults to ``.*``.
-* ``property`` (optional): regex to match against the property name. Defaults to
-  ``.*``.
-* ``allow`` (required): boolean indicating if the setting the session
-  property should be allowed.
-
-The catalog session property rules have the additional field:
-
-* ``catalog`` (optional): regex to match against catalog name. Defaults to
-  ``.*``.
-
-The example below defines the following table access policy:
-
-* Role ``admin`` can set all session property
-* User ``banned_user`` can not set any session properties
-* All users can set the ``resource_overcommit`` system session property, and the
-  ``bucket_execution_enabled`` session property in the ``hive`` catalog.
-
-.. literalinclude:: session-property-access.json
-    :language: json
-
-.. _query_rules:
-
-Query rules
------------
-
-These rules control the ability of a user to execute, view, or kill a query. The
-user is granted or denied access, based on the first matching rule read from top
-to bottom. If no rules are specified, all users are allowed to execute queries,
-and to view or kill queries owned by any user. If no rule matches, query
-management is denied. Each rule is composed of the following fields:
-
-* ``user`` (optional): regex to match against user name. Defaults to ``.*``.
-* ``role`` (optional): regex to match against role names. Defaults to ``.*``.
-* ``group`` (optional): regex to match against group names. Defaults to ``.*``.
-* ``queryOwner`` (optional): regex to match against the query owner name.
-  Defaults to ``.*``.
-* ``allow`` (required): set of query permissions granted to user. Values:
-  ``execute``, ``view``, ``kill``
-
-.. note::
-
-    Users always have permission to view or kill their own queries.
-
-    A rule that includes ``queryOwner`` may not include the ``execute`` access mode.
-    Queries are only owned by a user once their execution has begun.
-
-For example, if you want to allow the role ``admin`` full query access, allow
-the user ``alice`` to execute and kill queries, allow members of the group
-``contractors`` to view queries owned by users ``alice`` or ``dave``, allow any
-user to execute queries, and deny all other access, you can use the following
-rules:
-
-.. literalinclude:: query-access.json
-    :language: json
-
-.. _system-file-auth-impersonation-rules:
-
-Impersonation rules
--------------------
-
-These rules control the ability of a user to impersonate another user. In
-some environments it is desirable for an administrator (or managed system) to
-run queries on behalf of other users. In these cases, the administrator
-authenticates using their credentials, and then submits a query as a different
-user. When the user context is changed, Trino verifies that the administrator
-is authorized to run queries as the target user.
-
-When these rules are present, the authorization is based on the first matching
-rule, processed from top to bottom. If no rules match, the authorization is
-denied. If impersonation rules are not present but the legacy principal rules
-are specified, it is assumed impersonation access control is being handled by
-the principal rules, so impersonation is allowed. If neither impersonation nor
-principal rules are defined, impersonation is not allowed.
-
-Each impersonation rule is composed of the following fields:
-
-* ``original_user`` (optional): regex to match against the user requesting the
-  impersonation. Defaults to ``.*``.
-* ``original_role`` (optional): regex to match against role names of the
-  requesting impersonation. Defaults to ``.*``.
-* ``new_user`` (required): regex to match against the user to impersonate. Can
-  contain references to subsequences captured during the match against
-  *original_user*, and each reference is replaced by the result of evaluating
-  the corresponding group respectively.
-* ``allow`` (optional): boolean indicating if the authentication should be
-  allowed. Defaults to ``true``.
-
-The impersonation rules are a bit different than the other rules: The attribute
-``new_user`` is required to not accidentally prevent more access than intended.
-Doing so it was possible to make the attribute ``allow`` optional.
-
-The following example allows the ``admin`` role, to impersonate any user, except
-for ``bob``. It also allows any user to impersonate the ``test`` user. It also
-allows a user in the form ``team_backend`` to impersonate the
-``team_backend_sandbox`` user, but not arbitrary users:
-
-.. literalinclude:: user-impersonation.json
-    :language: json
-
-.. _system-file-auth-principal-rules:
-
-Principal rules
----------------
-
-.. warning::
-
-    Principal rules are deprecated. Instead, use :doc:`/security/user-mapping`
-    which specifies how a complex authentication user name is mapped to a simple
-    user name for Trino, and impersonation rules defined above.
-
-These rules serve to enforce a specific matching between a principal and a
-specified user name. The principal is granted authorization as a user, based
-on the first matching rule read from top to bottom. If no rules are specified,
-no checks are performed. If no rule matches, user authorization is denied.
-Each rule is composed of the following fields:
-
-* ``principal`` (required): regex to match and group against principal.
-* ``user`` (optional): regex to match against user name. If matched, it
-  grants or denies the authorization based on the value of ``allow``.
-* ``principal_to_user`` (optional): replacement string to substitute against
-  principal. If the result of the substitution is same as the user name, it
-  grants or denies the authorization based on the value of ``allow``.
-* ``allow`` (required): boolean indicating whether a principal can be authorized
-  as a user.
-
-.. note::
-
-    You would at least specify one criterion in a principal rule. If you specify
-    both criteria in a principal rule, it returns the desired conclusion when
-    either of criteria is satisfied.
-
-The following implements an exact matching of the full principal name for LDAP
-and Kerberos authentication:
-
-.. code-block:: json
-
-    {
-      "principals": [
-        {
-          "principal": "(.*)",
-          "principal_to_user": "$1",
-          "allow": true
-        },
-        {
-          "principal": "([^/]+)(/.*)?@.*",
-          "principal_to_user": "$1",
-          "allow": true
-        }
-      ]
-    }
-
-If you want to allow users to use the exact same name as their Kerberos
-principal name, and allow ``alice`` and ``bob`` to use a group principal named
-as ``group@example.net``, you can use the following rules.
-
-.. code-block:: json
-
-    {
-      "principals": [
-        {
-          "principal": "([^/]+)/?.*@example.net",
-          "principal_to_user": "$1",
-          "allow": true
-        },
-        {
-          "principal": "group@example.net",
-          "user": "alice|bob",
-          "allow": true
-        }
-      ]
-    }
-
-.. _system-file-auth-system_information:
-
-System information rules
-------------------------
-
-These rules specify which users can access the system information management
-interface. The user is granted or denied access, based on the first matching
-rule read from top to bottom. If no rules are specified, all access to system
-information is denied. If no rule matches, system access is denied. Each rule is
-composed of the following fields:
-
-* ``user`` (optional): regex to match against user name. If matched, it
-  grants or denies the authorization based on the value of ``allow``.
-* ``allow`` (required): set of access permissions granted to user. Values:
-  ``read``, ``write``
-
-For example, if you want to allow only the role ``admin`` to read and write
-system information, allow ``alice`` to read system information, and deny all
-other access, you can use the following rules:
-
-.. literalinclude:: system-information-access.json
-    :language: json
-
-A fixed user can be set for management interfaces using the ``management.user``
-configuration property.  When this is configured, system information rules must
-still be set to authorize this user to read or write to management information.
-The fixed management user only applies to HTTP by default. To enable the fixed
-user over HTTPS, set the ``management.user.https-enabled`` configuration
-property.
-
-.. _catalog-file-based-access-control:
-
-Catalog-level access control files
-==================================
-
-You can create JSON files for individual catalogs that define authorization
-rules specific to that catalog. To enable catalog-level access control files,
-add a connector-specific catalog configuration property that sets the
-authorization type to ``FILE`` and the ``security.config-file`` catalog
-configuration property that specifies the JSON rules file.
-
-For example, the following Iceberg catalog configuration properties use the
-``rules.json`` file for catalog-level access control:
-
-.. code-block:: properties
-
-  iceberg.security=FILE
-  security.config-file=etc/catalog/rules.json
-
-
-Catalog-level access control files are supported on a per-connector basis, refer
-to the connector documentation for more information.
-
-.. note::
-
-    These rules do not apply to system-defined tables in the
-    ``information_schema`` schema.
-
-Configure a catalog rules file
-------------------------------
-
-The configuration file is specified in JSON format. This file is composed of
-the following sections, each of which is a list of rules that are processed in
-order from top to bottom:
-
-1. ``schemas``
-2. ``tables``
-3. ``session_properties``
-
-The user is granted the privileges from the first matching rule. All regexes
-default to ``.*`` if not specified.
-
-Schema rules
-^^^^^^^^^^^^
-
-These rules govern who is considered an owner of a schema.
-
-* ``user`` (optional): regex to match against user name.
-* ``group`` (optional): regex to match against every user group the user belongs
-  to.
-* ``schema`` (optional): regex to match against schema name.
-* ``owner`` (required): boolean indicating ownership.
-
-Table rules
-^^^^^^^^^^^
-
-These rules govern the privileges granted on specific tables.
-
-* ``user`` (optional): regex to match against user name.
-* ``group`` (optional): regex to match against every user group the user belongs
-  to.
-* ``schema`` (optional): regex to match against schema name.
-* ``table`` (optional): regex to match against table name.
-* ``privileges`` (required): zero or more of ``SELECT``, ``INSERT``,
-  ``DELETE``, ``UPDATE``, ``OWNERSHIP``, ``GRANT_SELECT``.
-* ``columns`` (optional): list of column constraints.
-* ``filter`` (optional): boolean filter expression for the table.
-* ``filter_environment`` (optional): environment used during filter evaluation.
-
-Column constraints
-~~~~~~~~~~~~~~~~~~
-
-These constraints can be used to restrict access to column data.
-
-* ``name``: name of the column.
-* ``allow`` (optional): if false, column can not be accessed.
-* ``mask`` (optional): mask expression applied to column.
-* ``mask_environment`` (optional): environment use during mask evaluation.
-
-Filter environment and mask environment
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-These rules apply to ``filter_environment`` and ``mask_environment``.
-
-* ``user`` (optional): username for checking permission of subqueries in a mask.
-
-.. note::
-
-    ``mask`` can contain conditional expressions such as ``IF`` or ``CASE``, which achieves conditional masking.
-
-Function rules
-^^^^^^^^^^^^^^
-
-Each function rule is composed of the following fields:
-
-* ``user`` (optional): regular expression to match against user name.
-  Defaults to ``.*``.
-* ``group`` (optional): regular expression to match against group names.
-  Defaults to ``.*``.
-* ``schema`` (optional): regular expression to match against schema name.
-  Defaults to ``.*``.
-* ``function`` (optional): regular expression to match against function names.
-  Defaults to ``.*``.
-* ``privileges`` (required): zero or more of ``EXECUTE``, ``GRANT_EXECUTE``.
-* ``function_kinds`` (required): one or more of ``AGGREGATE``, ``SCALAR``,
-  ``TABLES``, ``WINDOW``. When a user defines a rule for ``AGGREGATE``, ``SCALAR``
-  or ``WINDOW`` functions, the ``catalog`` and ``schema`` fields are disallowed.
-
-Session property rules
-^^^^^^^^^^^^^^^^^^^^^^
-
-These rules govern who may set session properties.
-
-* ``user`` (optional): regex to match against user name.
-* ``group`` (optional): regex to match against every user group the user belongs
-  to.
-* ``property`` (optional): regex to match against session property name.
-* ``allow`` (required): boolean indicating whether this session property may be
-  set.
-
-Example
--------
-
-.. code-block:: json
-
-    {
-      "schemas": [
-        {
-          "user": "admin",
-          "schema": ".*",
-          "owner": true
-        },
-        {
-          "group": "finance|human_resources",
-          "schema": "employees",
-          "owner": true
-        },
-        {
-          "user": "guest",
-          "owner": false
-        },
-        {
-          "schema": "default",
-          "owner": true
-        }
-      ],
-      "tables": [
-        {
-          "user": "admin",
-          "privileges": ["SELECT", "INSERT", "DELETE", "UPDATE", "OWNERSHIP"]
-        },
-        {
-          "user": "banned_user",
-          "privileges": []
-        },
-        {
-          "schema": "hr",
-          "table": "employee",
-          "privileges": ["SELECT"],
-          "filter": "user = current_user"
-        }
-        {
-          "schema": "default",
-          "table": ".*",
-          "privileges": ["SELECT"],
-          "columns" : [
-             {
-                "name": "address",
-                "allow": false
-             },
-             {
-                "name": "ssn",
-                "mask": "'XXX-XX-' + substring(credit_card, -4)",
-                "mask_environment": {
-                  "user": "admin"
-                }
-             }
-          ]
-        }
-      ],
-      "session_properties": [
-        {
-          "property": "force_local_scheduling",
-          "allow": true
-        },
-        {
-          "user": "admin",
-          "property": "max_split_size",
-          "allow": true
-        }
-      ]
-    }
diff --git a/docs/src/main/sphinx/security/group-file.md b/docs/src/main/sphinx/security/group-file.md
new file mode 100644
index 000000000000..17abc9a7feb9
--- /dev/null
+++ b/docs/src/main/sphinx/security/group-file.md
@@ -0,0 +1,33 @@
+# File group provider
+
+Trino can map user names onto groups for easier access control and
+resource group management. Group file resolves group membership using
+a file on the coordinator.
+
+## Group file configuration
+
+Enable group file by creating an `etc/group-provider.properties`
+file on the coordinator:
+
+```text
+group-provider.name=file
+file.group-file=/path/to/group.txt
+```
+
+The following configuration properties are available:
+
+| Property              | Description                                           |
+| --------------------- | ----------------------------------------------------- |
+| `file.group-file`     | Path of the group file.                               |
+| `file.refresh-period` | How often to reload the group file. Defaults to `5s`. |
+
+## Group files
+
+### File format
+
+The group file contains a list of groups and members, one per line,
+separated by a colon. Users are separated by a comma.
+
+```text
+group_name:user_1,user_2,user_3
+```
diff --git a/docs/src/main/sphinx/security/group-file.rst b/docs/src/main/sphinx/security/group-file.rst
deleted file mode 100644
index 1a8e51d5f1f5..000000000000
--- a/docs/src/main/sphinx/security/group-file.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-===================
-File group provider
-===================
-
-Trino can map user names onto groups for easier access control and
-resource group management. Group file resolves group membership using
-a file on the coordinator.
-
-Group file configuration
-------------------------
-
-Enable group file by creating an ``etc/group-provider.properties``
-file on the coordinator:
-
-.. code-block:: text
-
-    group-provider.name=file
-    file.group-file=/path/to/group.txt
-
-The following configuration properties are available:
-
-==================================== ==============================================
-Property                             Description
-==================================== ==============================================
-``file.group-file``                  Path of the group file.
-
-``file.refresh-period``              How often to reload the group file.
-                                     Defaults to ``5s``.
-==================================== ==============================================
-
-Group files
------------
-
-File format
-^^^^^^^^^^^
-
-The group file contains a list of groups and members, one per line,
-separated by a colon. Users are separated by a comma.
-
-.. code-block:: text
-
-    group_name:user_1,user_2,user_3
diff --git a/docs/src/main/sphinx/security/inspect-jks.md b/docs/src/main/sphinx/security/inspect-jks.md
new file mode 100644
index 000000000000..2b092f29240c
--- /dev/null
+++ b/docs/src/main/sphinx/security/inspect-jks.md
@@ -0,0 +1,129 @@
+# JKS files
+
+This topic describes how to validate a {ref}`Java keystore (JKS) <glossJKS>`
+file used to configure {doc}`/security/tls`.
+
+The Java KeyStore (JKS) system is provided as part of your Java installation.
+Private keys and certificates for your server are stored in a *keystore* file.
+The JKS system supports both PKCS #12 `.p12` files as well as legacy
+keystore `.jks` files.
+
+The keystore file itself is always password-protected. The keystore file can
+have more than one key in the the same file, each addressed by its **alias**
+name.
+
+If you receive a keystore file from your site's network admin group, verify that
+it shows the correct information for your Trino cluster, as described next.
+
+(troubleshooting-keystore)=
+
+## Inspect and validate keystore
+
+Inspect the keystore file to make sure it contains the correct information for
+your Trino server. Use the `keytool` command, which is installed as part of
+your Java installation, to retrieve information from your keystore file:
+
+```text
+keytool -list -v -keystore yourKeystore.jks
+```
+
+Keystores always require a password. If not provided on the `keytool` command
+line, `keytool` prompts for the password.
+
+Independent of the keystore's password, it is possible that an individual key
+has its own password. It is easiest to make sure these passwords are the same.
+If the JKS key inside the keystore has a different password, you are prompted
+twice.
+
+In the output of the `keytool -list` command, look for:
+
+- The keystore may contain either a private key (`Entry type:
+  PrivateKeyEntry`) or certificate (`Entry type: trustedCertEntry`) or both.
+
+- Modern browsers now enforce 398 days as the maximum validity period for a
+  certificate. Look for the `Valid from ... until` entry, and make sure the
+  time span does not exceed 398 days.
+
+- Modern browsers and clients require the **SubjectAlternativeName** (SAN)
+  field. Make sure this shows the DNS name of your server, such as
+  `DNS:cluster.example.com`. Certificates without SANs are not
+  supported.
+
+  Example:
+
+```text
+SubjectAlternativeName [
+    DNSName:  cluster.example.com
+]
+```
+
+If your keystore shows valid information for your cluster, proceed to configure
+the Trino server, as described in {ref}`cert-placement` and
+{ref}`configure-https`.
+
+The rest of this page describes additional steps that may apply in certain
+circumstances.
+
+(import-to-keystore)=
+
+## Extra: add PEM to keystore
+
+Your site may have standardized on using JKS semantics for all servers. If a
+vendor sends you a PEM-encoded certificate file for your Trino server, you can
+import it into a keystore with a command like the following. Consult `keytool`
+references for different options.
+
+```shell
+keytool -trustcacerts -import -alias cluster -file localhost.pem -keystore localkeys.jks
+```
+
+If the specified keystore file exists, `keytool` prompts for its password. If
+you are creating a new keystore, `keytool` prompts for a new password, then
+prompts you to confirm the same password. `keytool` shows you the
+contents of the key being added, similar to the `keytool -list` format, then
+prompts:
+
+```text
+Trust this certificate? [no]:
+```
+
+Type `yes` to add the PEM certificate to the keystore.
+
+The `alias` name is an arbitrary string used as a handle for the certificate
+you are adding. A keystore can contain multiple keys and certs, so `keytool`
+uses the alias to address individual entries.
+
+(cli-java-truststore)=
+
+## Extra: Java truststores
+
+:::{note}
+Remember that there may be no need to identify a local truststore when
+directly using a signed PEM-encoded certificate, independent of a keystore.
+PEM certs can contain the server's private key and the certificate chain all
+the way back to a recognzied CA.
+:::
+
+Truststore files contain a list of {ref}`Certificate Authorities <glossCA>`
+trusted by Java to validate the private keys of servers, plus a list of the
+certificates of trusted TLS servers. The standard Java-provided truststore file,
+`cacerts`, is part of your Java installation in a standard location.
+
+Keystores normally rely on the default location of the system truststore, which
+therefore does not need to be configured.
+
+However, there are cases in which you need to use an alternate truststore. For
+example, if your site relies on the JKS system, your network managers may have
+appended site-specific, local CAs to the standard list, to validate locally
+signed keys.
+
+If your server must use a custom truststore, identify its location in the
+server's config properties file. For example:
+
+```text
+http-server.https.truststore.path=/mnt/shared/certs/localcacerts
+http-server.https.truststore.key=<truststore-password>
+```
+
+If connecting clients such as browsers or the Trino CLI must be separately
+configured, contact your site's network administrators for assistance.
diff --git a/docs/src/main/sphinx/security/inspect-jks.rst b/docs/src/main/sphinx/security/inspect-jks.rst
deleted file mode 100644
index f4aac6e9a128..000000000000
--- a/docs/src/main/sphinx/security/inspect-jks.rst
+++ /dev/null
@@ -1,132 +0,0 @@
-=========
-JKS files
-=========
-
-This topic describes how to validate a :ref:`Java keystore (JKS) <glossJKS>`
-file used to configure :doc:`/security/tls`.
-
-The Java KeyStore (JKS) system is provided as part of your Java installation.
-Private keys and certificates for your server are stored in a *keystore* file.
-The JKS system supports both PKCS #12 ``.p12`` files as well as legacy
-keystore ``.jks`` files.
-
-The keystore file itself is always password-protected. The keystore file can
-have more than one key in the the same file, each addressed by its **alias**
-name.
-
-If you receive a keystore file from your site's network admin group, verify that
-it shows the correct information for your Trino cluster, as described next.
-
-.. _troubleshooting_keystore:
-
-Inspect and validate keystore
------------------------------
-
-Inspect the keystore file to make sure it contains the correct information for
-your Trino server. Use the ``keytool`` command, which is installed as part of
-your Java installation, to retrieve information from your keystore file:
-
-.. code-block:: text
-
-  keytool -list -v -keystore yourKeystore.jks
-
-Keystores always require a password. If not provided on the ``keytool`` command
-line, ``keytool`` prompts for the password.
-
-Independent of the keystore's password, it is possible that an individual key
-has its own password. It is easiest to make sure these passwords are the same.
-If the JKS key inside the keystore has a different password, you are prompted
-twice.
-
-In the output of the ``keytool -list`` command, look for:
-
-* The keystore may contain either a private key (``Entry type:
-  PrivateKeyEntry``) or certificate (``Entry type: trustedCertEntry``) or both.
-*  Modern browsers now enforce 398 days as the maximum validity period for a
-   certificate. Look for the ``Valid from ... until`` entry, and make sure the
-   time span does not exceed 398 days.
-*  Modern browsers and clients require the **SubjectAlternativeName** (SAN)
-   field. Make sure this shows the DNS name of your server, such as
-   ``DNS:cluster.example.com``. Certificates without SANs are not
-   supported.
-
-   Example:
-
-.. code-block:: text
-
-  SubjectAlternativeName [
-      DNSName:  cluster.example.com
-  ]
-
-If your keystore shows valid information for your cluster, proceed to configure
-the Trino server, as described in :ref:`cert-placement` and
-:ref:`configure-https`.
-
-The rest of this page describes additional steps that may apply in certain
-circumstances.
-
-.. _import_to_keystore:
-
-Extra: add PEM to keystore
---------------------------
-
-Your site may have standardized on using JKS semantics for all servers. If a
-vendor sends you a PEM-encoded certificate file for your Trino server, you can
-import it into a keystore with a command like the following. Consult ``keytool``
-references for different options.
-
-.. code-block:: shell
-
-  keytool -trustcacerts -import -alias cluster -file localhost.pem -keystore localkeys.jks
-
-If the specified keystore file exists, ``keytool`` prompts for its password. If
-you are creating a new keystore, ``keytool`` prompts for a new password, then
-prompts you to confirm the same password. ``keytool`` shows you the
-contents of the key being added, similar to the ``keytool -list`` format, then
-prompts:
-
-.. code-block:: text
-
-  Trust this certificate? [no]:
-
-Type ``yes`` to add the PEM certificate to the keystore.
-
-The ``alias`` name is an arbitrary string used as a handle for the certificate
-you are adding. A keystore can contain multiple keys and certs, so ``keytool``
-uses the alias to address individual entries.
-
-.. _cli_java_truststore:
-
-Extra: Java truststores
------------------------
-
-.. note::
-
-    Remember that there may be no need to identify a local truststore when
-    directly using a signed PEM-encoded certificate, independent of a keystore.
-    PEM certs can contain the server's private key and the certificate chain all
-    the way back to a recognzied CA.
-
-Truststore files contain a list of :ref:`Certificate Authorities <glossCA>`
-trusted by Java to validate the private keys of servers, plus a list of the
-certificates of trusted TLS servers. The standard Java-provided truststore file,
-``cacerts``, is part of your Java installation in a standard location.
-
-Keystores normally rely on the default location of the system truststore, which
-therefore does not need to be configured.
-
-However, there are cases in which you need to use an alternate truststore. For
-example, if your site relies on the JKS system, your network managers may have
-appended site-specific, local CAs to the standard list, to validate locally
-signed keys.
-
-If your server must use a custom truststore, identify its location in the
-server's config properties file. For example:
-
-.. code-block:: text
-
-   http-server.https.truststore.path=/mnt/shared/certs/localcacerts
-   http-server.https.truststore.key=<truststore-password>
-
-If connecting clients such as browsers or the Trino CLI must be separately
-configured, contact your site's network administrators for assistance.
diff --git a/docs/src/main/sphinx/security/inspect-pem.md b/docs/src/main/sphinx/security/inspect-pem.md
new file mode 100644
index 000000000000..a5834a82338e
--- /dev/null
+++ b/docs/src/main/sphinx/security/inspect-pem.md
@@ -0,0 +1,124 @@
+# PEM files
+
+PEM (Privacy Enhanced Mail) is a standard for public key and certificate
+information, and an encoding standard used to transmit keys and certificates.
+
+Trino supports PEM files. If you want to use other supported formats, see:
+
+- {doc}`JKS keystores </security/inspect-jks>`
+- {ref}`PKCS 12 <glossPKCS12>` stores. (Look up alternate commands for these in
+  `openssl` references.)
+
+A single PEM file can contain either certificate or key pair information, or
+both in the same file. Certified keys can contain a chain of certificates from
+successive certificate authorities.
+
+Follow the steps in this topic to inspect and validate key and certificate in
+PEM files. See {ref}`troubleshooting-keystore` to validate JKS keystores.
+
+(inspect-pems)=
+
+## Inspect PEM file
+
+The file name extensions shown on this page are examples only; there is no
+extension naming standard.
+
+You may receive a single file that includes a private key and its certificate,
+or separate files. If you received separate files, concatenate them into one,
+typically in order from key to certificate. For example:
+
+```shell
+cat clustercoord.key clustercoord.cert > clustercoord.pem
+```
+
+Next, use the `cat` command to view this plain text file. For example:
+
+```shell
+cat clustercoord.pem | less
+```
+
+Make sure the PEM file shows at least one `KEY` and one `CERTIFICATE`
+section. A key section looks something like the following:
+
+```text
+-----BEGIN PRIVATE KEY-----
+MIIEowIBAAKCAQEAwJL8CLeDFAHhZe3QOOF1vWt4Vuk9vyO38Y1y9SgBfB02b2jW
+....
+-----END PRIVATE KEY-----
+```
+
+If your key section reports `BEGIN ENCRYPTED PRIVATE KEY` instead, this means
+the key is encrypted and you must use the password to open or inspect the key.
+You may have specified the password when requesting the key, or the password
+could be assigned by your site's network managers. Note that password protected
+PEM files are not supported by Trino.
+
+If your key section reports `BEGIN EC PRIVATE KEY` or `BEGIN DSA PRIVATE
+KEY`, this designates a key using Elliptical Curve or DSA alternatives to RSA.
+
+The certificate section looks like the following example:
+
+```text
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqICAQEwDQYJKoZIhvcNAQEFBQAwgaIxCzAJBgNVBAYTAlVTMRYwFAYD
+....
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDwjCCAqoCCQCxyqwZ9GK50jANBgkqhkiG9w0BAQsFADCBojELMAkGA1UEBhMC
+....
+-----END CERTIFICATE-----
+```
+
+The file can show a single certificate section, or more than one to express a
+chain of authorities, each certifying the previous.
+
+(validate-pems)=
+
+## Validate PEM key section
+
+This page presumes your system provides the `openssl` command from OpenSSL 1.1
+or later.
+
+Test an RSA private key's validity with the following command:
+
+```text
+openssl rsa -in clustercoord.pem -check -noout
+```
+
+Look for the following confirmation message:
+
+```text
+RSA key ok
+```
+
+:::{note}
+Consult `openssl` references for the appropriate versions of the
+verification commands for EC or DSA keys.
+:::
+
+## Validate PEM certificate section
+
+Analyze the certificate section of your PEM file with the following `openssl`
+command:
+
+```text
+openssl x509 -in clustercoord.pem -text -noout
+```
+
+If your certificate was generated with a password, `openssl` prompts for it.
+Note that password protected PEM files are not supported by Trino.
+
+In the output of the `openssl` command, look for the following
+characteristics:
+
+- Modern browsers now enforce 398 days as the maximum validity period for a
+  certificate. Look for `Not Before` and `Not After` dates in the
+  `Validity` section of the output, and make sure the time span does not
+  exceed 398 days.
+- Modern browsers and clients require the **Subject Alternative Name** (SAN)
+  field. Make sure this shows the DNS name of your server, such as
+  `DNS:clustercoord.example.com`. Certificates without SANs are not
+  supported.
+
+If your PEM file shows valid information for your cluster, proceed to configure
+the server, as described in {ref}`cert-placement` and {ref}`configure-https`.
diff --git a/docs/src/main/sphinx/security/inspect-pem.rst b/docs/src/main/sphinx/security/inspect-pem.rst
deleted file mode 100644
index faa74a7ea32a..000000000000
--- a/docs/src/main/sphinx/security/inspect-pem.rst
+++ /dev/null
@@ -1,130 +0,0 @@
-=========
-PEM files
-=========
-
-PEM (Privacy Enhanced Mail) is a standard for public key and certificate
-information, and an encoding standard used to transmit keys and certificates.
-
-Trino supports PEM-encoded certificates. If you want to use other supported
-formats, see:
-
-*  :doc:`JKS keystores </security/inspect-jks>`
-*  :ref:`PKCS 12 <glossPKCS12>` stores. (Look up alternate commands for these in
-   ``openssl`` references.)
-
-A single PEM-encoded file can contain either certificate or key pair
-information, or both in the same file. Certified keys can contain a chain of
-certificates from successive certificate authorities.
-
-Follow the steps in this topic to inspect and validate PEM-encoded key and
-certificate files. See :ref:`troubleshooting_keystore` to validate JKS
-keystores.
-
-.. _inspect_pems:
-
-Inspect PEM file
-----------------
-
-The file name extensions shown on this page are examples only; there is no
-extension naming standard.
-
-You may receive a single file that includes a private key and its certificate,
-or separate files. If you received separate files, concatenate them into one,
-typically in order from key to certificate. For example:
-
-.. code-block:: shell
-
-  cat clustercoord.key clustercoord.cert > clustercoord.pem
-
-Next, use the ``cat`` command to view this plain text file. For example:
-
-.. code-block:: shell
-
-    cat clustercoord.pem | less
-
-Make sure the PEM file shows at least one ``KEY`` and one ``CERTIFICATE``
-section. A key section looks something like the following:
-
-.. code-block:: text
-
-  -----BEGIN PRIVATE KEY-----
-  MIIEowIBAAKCAQEAwJL8CLeDFAHhZe3QOOF1vWt4Vuk9vyO38Y1y9SgBfB02b2jW
-  ....
-  -----END PRIVATE KEY-----
-
-If your key section reports ``BEGIN ENCRYPTED PRIVATE KEY`` instead, this means
-the key is encrypted and you must use the password to open or inspect the key.
-You may have specified the password when requesting the key, or the password
-could be assigned by your site's network managers.
-
-If your key section reports ``BEGIN EC PRIVATE KEY`` or ``BEGIN DSA PRIVATE
-KEY``, this designates a key using Elliptical Curve or DSA alternatives to RSA.
-
-The certificate section looks like the following example:
-
-.. code-block:: text
-
-  -----BEGIN CERTIFICATE-----
-  MIIDujCCAqICAQEwDQYJKoZIhvcNAQEFBQAwgaIxCzAJBgNVBAYTAlVTMRYwFAYD
-  ....
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIDwjCCAqoCCQCxyqwZ9GK50jANBgkqhkiG9w0BAQsFADCBojELMAkGA1UEBhMC
-  ....
-  -----END CERTIFICATE-----
-
-The file can show a single certificate section, or more than one to express a
-chain of authorities, each certifying the previous.
-
-.. _validate_pems:
-
-Validate PEM key section
-------------------------
-
-This page presumes your system provides the ``openssl`` command from OpenSSL 1.1
-or later.
-
-Test an RSA private key's validity with the following command:
-
-.. code-block:: text
-
-  openssl rsa -in clustercoord.pem -check -noout
-
-Look for the following confirmation message:
-
-.. code-block:: text
-
-  RSA key ok
-
-.. note::
-
-  Consult ``openssl`` references for the appropriate versions of the
-  verification commands for EC or DSA keys.
-
-Validate PEM certificate section
---------------------------------
-
-Analyze the certificate section of your PEM file with the following ``openssl``
-command:
-
-.. code-block:: text
-
-  openssl x509 -in clustercoord.pem -text -noout
-
-If your certificate was generated with a password, ``openssl`` prompts for it.
-
-In the output of the ``openssl`` command, look for the following
-characteristics:
-
-*  Modern browsers now enforce 398 days as the maximum validity period for a
-   certificate. Look for ``Not Before`` and ``Not After`` dates in the
-   ``Validity`` section of the output, and make sure the time span does not
-   exceed 398 days.
-*  Modern browsers and clients require the **Subject Alternative Name** (SAN)
-   field. Make sure this shows the DNS name of your server, such as
-   ``DNS:clustercoord.example.com``. Certificates without SANs are not
-   supported.
-
-If your PEM certificate shows valid information for your cluster, proceed to
-configure the server, as described in :ref:`cert-placement` and
-:ref:`configure-https`.
diff --git a/docs/src/main/sphinx/security/internal-communication.md b/docs/src/main/sphinx/security/internal-communication.md
new file mode 100644
index 000000000000..ed6914306fdc
--- /dev/null
+++ b/docs/src/main/sphinx/security/internal-communication.md
@@ -0,0 +1,150 @@
+# Secure internal communication
+
+The Trino cluster can be configured to use secured communication with internal
+authentication of the nodes in the cluster, and to optionally use added security
+with {ref}`TLS <glossTLS>`.
+
+## Configure shared secret
+
+Configure a shared secret to authenticate all communication between nodes of the
+cluster. Use this configuration under the following conditions:
+
+- When opting to configure [internal TLS encryption](internal-tls)
+  between nodes of the cluster
+- When using any {doc}`external authentication <authentication-types>` method
+  between clients and the coordinator
+
+Set the shared secret to the same value in {ref}`config.properties
+<config-properties>` on all nodes of the cluster:
+
+```text
+internal-communication.shared-secret=<secret>
+```
+
+A large random key is recommended, and can be generated with the following Linux
+command:
+
+```text
+openssl rand 512 | base64
+```
+
+(verify-secrets)=
+
+### Verify configuration
+
+To verify shared secret configuration:
+
+1. Start your Trino cluster with two or more nodes configured with a shared
+   secret.
+2. Connect to the {doc}`Web UI </admin/web-interface>`.
+3. Confirm the number of `ACTIVE WORKERS` equals the number of nodes
+   configured with your shared secret.
+4. Change the value of the shared secret on one worker, and restart the worker.
+5. Log in to the Web UI and confirm the number of `ACTIVE WORKERS` is one
+   less. The worker with the invalid secret is not authenticated, and therefore
+   not registered with the coordinator.
+6. Stop your Trino cluster, revert the value change on the worker, and restart
+   your cluster.
+7. Confirm the number of `ACTIVE WORKERS` equals the number of nodes
+   configured with your shared secret.
+
+(internal-tls)=
+
+## Configure internal TLS
+
+You can optionally add an extra layer of security by configuring the cluster to
+encrypt communication between nodes with {ref}`TLS <glossTLS>`.
+
+You can configure the coordinator and all workers to encrypt all communication
+with each other using TLS. Every node in the cluster must be configured. Nodes
+that have not been configured, or are configured incorrectly, are not able to
+communicate with other nodes in the cluster.
+
+In typical deployments, you should enable {ref}`TLS directly on the coordinator
+<https-secure-directly>` for fully encrypted access to the cluster by client
+tools.
+
+Enable TLS for internal communication with the following
+configuration identical on all cluster nodes.
+
+1. Configure a shared secret for internal communication as described in
+   the preceding section.
+
+2. Enable automatic certificate creation and trust setup in
+   `etc/config.properties`:
+
+   ```properties
+   internal-communication.https.required=true
+   ```
+
+3. Change the URI for the discovery service to use HTTPS and point to the IP
+   address of the coordinator in `etc/config.properties`:
+
+   ```properties
+   discovery.uri=https://<coordinator ip address>:<https port>
+   ```
+
+   Note that using hostnames or fully qualified domain names for the URI is
+   not supported. The automatic certificate creation for internal TLS only
+   supports IP addresses.
+
+4. Enable the HTTPS endpoint on all workers.
+
+   ```properties
+   http-server.https.enabled=true
+   http-server.https.port=<https port>
+   ```
+
+5. Restart all nodes.
+
+Certificates are automatically created and used to ensure all communication
+inside the cluster is secured with TLS.
+
+:::{warning}
+Older versions of Trino required you to manually manage all the certificates
+on the nodes. If you upgrade from this setup, you must remove the following
+configuration properties:
+
+- `internal-communication.https.keystore.path`
+- `internal-communication.https.truststore.path`
+- `node.internal-address-source`
+:::
+
+### Performance with SSL/TLS enabled
+
+Enabling encryption impacts performance. The performance degradation can vary
+based on the environment, queries, and concurrency.
+
+For queries that do not require transferring too much data between the Trino
+nodes e.g. `SELECT count(*) FROM table`, the performance impact is negligible.
+
+However, for CPU intensive queries which require a considerable amount of data
+to be transferred between the nodes (for example, distributed joins, aggregations and
+window functions, which require repartitioning), the performance impact can be
+considerable. The slowdown may vary from 10% to even 100%+, depending on the network
+traffic and the CPU utilization.
+
+### Advanced performance tuning
+
+In some cases, changing the source of random numbers improves performance
+significantly.
+
+By default, TLS encryption uses the `/dev/urandom` system device as a source of entropy.
+This device has limited throughput, so on environments with high network bandwidth
+(e.g. InfiniBand), it may become a bottleneck. In such situations, it is recommended to try
+to switch the random number generator algorithm to `SHA1PRNG`, by setting it via
+`http-server.https.secure-random-algorithm` property in `config.properties` on the coordinator
+and all of the workers:
+
+```text
+http-server.https.secure-random-algorithm=SHA1PRNG
+```
+
+Be aware that this algorithm takes the initial seed from
+the blocking `/dev/random` device. For environments that do not have enough entropy to seed
+the `SHAPRNG` algorithm, the source can be changed to `/dev/urandom`
+by adding the `java.security.egd` property to `jvm.config`:
+
+```text
+-Djava.security.egd=file:/dev/urandom
+```
diff --git a/docs/src/main/sphinx/security/internal-communication.rst b/docs/src/main/sphinx/security/internal-communication.rst
deleted file mode 100644
index 1aaea9fdb1cd..000000000000
--- a/docs/src/main/sphinx/security/internal-communication.rst
+++ /dev/null
@@ -1,155 +0,0 @@
-=============================
-Secure internal communication
-=============================
-
-The Trino cluster can be configured to use secured communication with internal
-authentication of the nodes in the cluster, and to optionally use added security
-with :ref:`TLS <glossTLS>`.
-
-Configure shared secret
------------------------
-
-Configure a shared secret to authenticate all communication between nodes of the
-cluster. Use this configuration under the following conditions:
-
-* When opting to configure `internal TLS encryption <#configure-internal-tls>`_
-  between nodes of the cluster
-* When using any :doc:`external authentication <authentication-types>` method
-  between clients and the coordinator
-
-Set the shared secret to the same value in :ref:`config.properties
-<config_properties>` on all nodes of the cluster:
-
-.. code-block:: text
-
-    internal-communication.shared-secret=<secret>
-
-A large random key is recommended, and can be generated with the following Linux
-command:
-
-.. code-block:: text
-
-    openssl rand 512 | base64
-
-.. _verify_secrets:
-
-Verify configuration
-^^^^^^^^^^^^^^^^^^^^
-
-To verify shared secret configuration:
-
-1. Start your Trino cluster with two or more nodes configured with a shared
-   secret.
-2. Connect to the :doc:`Web UI </admin/web-interface>`.
-3. Confirm the number of ``ACTIVE WORKERS`` equals the number of nodes
-   configured with your shared secret.
-4. Change the value of the shared secret on one worker, and restart the worker.
-5. Log in to the Web UI and confirm the number of ``ACTIVE WORKERS`` is one
-   less. The worker with the invalid secret is not authenticated, and therefore
-   not registered with the coordinator.
-6. Stop your Trino cluster, revert the value change on the worker, and restart
-   your cluster.
-7. Confirm the number of ``ACTIVE WORKERS`` equals the number of nodes
-   configured with your shared secret.
-
-Configure internal TLS
-----------------------
-
-You can optionally add an extra layer of security by configuring the cluster to
-encrypt communication between nodes with :ref:`TLS <glossTLS>`.
-
-You can configure the coordinator and all workers to encrypt all communication
-with each other using TLS. Every node in the cluster must be configured. Nodes
-that have not been configured, or are configured incorrectly, are not able to
-communicate with other nodes in the cluster.
-
-In typical deployments, you should enable :ref:`TLS directly on the coordinator
-<https-secure-directly>` for fully encrypted access to the cluster by client
-tools.
-
-Enable TLS for internal communication with the following
-configuration identical on all cluster nodes.
-
-1. Configure a shared secret for internal communication as described in
-   the preceding section.
-
-2. Enable automatic certificate creation and trust setup in
-   ``etc/config.properties``:
-
-   .. code-block:: properties
-
-     internal-communication.https.required=true
-
-3. Change the URI for the discovery service to use HTTPS and point to the IP
-   address of the coordinator in ``etc/config.properties``:
-
-   .. code-block:: properties
-
-     discovery.uri=https://<coordinator ip address>:<https port>
-
-   Note that using hostnames or fully qualified domain names for the URI is
-   not supported. The automatic certificate creation for internal TLS only
-   supports IP addresses.
-
-4. Enable the HTTPS endpoint on all workers.
-
-   .. code-block:: properties
-
-     http-server.https.enabled=true
-     http-server.https.port=<https port>
-
-5. Restart all nodes.
-
-Certificates are automatically created and used to ensure all communication
-inside the cluster is secured with TLS.
-
-.. warning::
-
-    Older versions of Trino required you to manually manage all the certificates
-    on the nodes. If you upgrade from this setup, you must remove the following
-    configuration properties:
-
-    * ``internal-communication.https.keystore.path``
-    * ``internal-communication.https.truststore.path``
-    * ``node.internal-address-source``
-
-Performance with SSL/TLS enabled
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Enabling encryption impacts performance. The performance degradation can vary
-based on the environment, queries, and concurrency.
-
-For queries that do not require transferring too much data between the Trino
-nodes e.g. ``SELECT count(*) FROM table``, the performance impact is negligible.
-
-However, for CPU intensive queries which require a considerable amount of data
-to be transferred between the nodes (for example, distributed joins, aggregations and
-window functions, which require repartitioning), the performance impact can be
-considerable. The slowdown may vary from 10% to even 100%+, depending on the network
-traffic and the CPU utilization.
-
-Advanced performance tuning
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In some cases, changing the source of random numbers improves performance
-significantly.
-
-By default, TLS encryption uses the ``/dev/urandom`` system device as a source of entropy.
-This device has limited throughput, so on environments with high network bandwidth
-(e.g. InfiniBand), it may become a bottleneck. In such situations, it is recommended to try
-to switch the random number generator algorithm to ``SHA1PRNG``, by setting it via
-``http-server.https.secure-random-algorithm`` property in ``config.properties`` on the coordinator
-and all of the workers:
-
-.. code-block:: text
-
-    http-server.https.secure-random-algorithm=SHA1PRNG
-
-Be aware that this algorithm takes the initial seed from
-the blocking ``/dev/random`` device. For environments that do not have enough entropy to seed
-the ``SHAPRNG`` algorithm, the source can be changed to ``/dev/urandom``
-by adding the ``java.security.egd`` property to ``jvm.config``:
-
-.. code-block:: text
-
-    -Djava.security.egd=file:/dev/urandom
diff --git a/docs/src/main/sphinx/security/jwt.md b/docs/src/main/sphinx/security/jwt.md
new file mode 100644
index 000000000000..32858227f0f7
--- /dev/null
+++ b/docs/src/main/sphinx/security/jwt.md
@@ -0,0 +1,141 @@
+# JWT authentication
+
+Trino can be configured to authenticate client access using [JSON web tokens](https://wikipedia.org/wiki/JSON_Web_Token). A JWT is a small, web-safe
+JSON file that contains cryptographic information similar to a certificate,
+including:
+
+- Subject
+- Valid time period
+- Signature
+
+A JWT is designed to be passed between servers as proof of prior authentication
+in a workflow like the following:
+
+1. An end user logs into a client application and requests access to a server.
+
+2. The server sends the user's credentials to a separate authentication service
+   that:
+
+   - validates the user
+   - generates a JWT as proof of validation
+   - returns the JWT to the requesting server
+
+3. The same JWT can then be forwarded to other services to maintain the user's
+   validation without further credentials.
+
+:::{important}
+If you are trying to configure OAuth2 or OIDC, there is a dedicated system
+for that in Trino, as described in {doc}`/security/oauth2`. When using
+OAuth2 authentication, you do not need to configure JWT authentication,
+because JWTs are handled automatically by the OAuth2 code.
+
+A typical use for JWT authentication is to support administrators at large
+sites who are writing their own single sign-on or proxy system to stand
+between users and the Trino coordinator, where their new system submits
+queries on behalf of users.
+:::
+
+Using {doc}`TLS <tls>` and {doc}`a configured shared secret
+</security/internal-communication>` is required for JWT authentication.
+
+## Using JWT authentication
+
+Trino supports Base64 encoded JWTs, but not encrypted JWTs.
+
+There are two ways to get the encryption key necessary to validate the JWT
+signature:
+
+- Load the key from a JSON web key set (JWKS) endpoint service (the
+  typical case)
+- Load the key from the local file system on the Trino coordinator
+
+A JWKS endpoint is a read-only service that contains public key information in
+[JWK](https://datatracker.ietf.org/doc/html/rfc7517) format. These public
+keys are the counterpart of the private keys that sign JSON web tokens.
+
+## JWT authentication configuration
+
+Enable JWT authentication by setting the {doc}`JWT authentication type
+<authentication-types>` in {ref}`etc/config.properties <config-properties>`, and
+specifying a URL or path to a key file:
+
+```properties
+http-server.authentication.type=JWT
+http-server.authentication.jwt.key-file=https://cluster.example.net/.well-known/jwks.json
+```
+
+JWT authentication is typically used in addition to other authentication
+methods:
+
+```properties
+http-server.authentication.type=PASSWORD,JWT
+http-server.authentication.jwt.key-file=https://cluster.example.net/.well-known/jwks.json
+```
+
+The following configuration properties are available:
+
+:::{list-table} Configuration properties for JWT authentication
+:widths: 50 50
+:header-rows: 1
+
+* - Property
+  - Description
+* - `http-server.authentication.jwt.key-file`
+  - Required. Specifies either the URL to a JWKS service or the path to a PEM or
+    HMAC file, as described below this table.
+* - `http-server.authentication.jwt.required-issuer`
+  - Specifies a string that must match the value of the JWT's issuer (`iss`)
+    field in order to consider this JWT valid. The `iss` field in the JWT
+    identifies the principal that issued the JWT.
+* - `http-server.authentication.jwt.required-audience`
+  - Specifies a string that must match the value of the JWT's Audience (`aud`)
+    field in order to consider this JWT valid. The `aud` field in the JWT
+    identifies the recipients that the JWT is intended for.
+* - `http-server.authentication.jwt.principal-field`
+  - String to identify the field in the JWT that identifies the subject of the
+    JWT. The default value is `sub`. This field is used to create the Trino
+    principal.
+* - `http-server.authentication.jwt.user-mapping.pattern`
+  - A regular expression pattern to [map all user names](/security/user-mapping)
+    for this authentication system to the format expected by the Trino server.
+* - `http-server.authentication.jwt.user-mapping.file`
+  - The path to a JSON file that contains a set of [user mapping
+    rules](/security/user-mapping) for this authentication system.
+:::
+
+Use the `http-server.authentication.jwt.key-file` property to specify
+either:
+
+- The URL to a JWKS endpoint service, where the URL begins with `https://`.
+  The JWKS service must be reachable from the coordinator. If the coordinator
+  is running in a secured or firewalled network, the administrator *may* have
+  to open access to the JWKS server host.
+
+  :::{caution}
+  The Trino server also accepts JWKS URLs that begin with `http://`, but
+  using this protocol results in a severe security risk. Only use this
+  protocol for short-term testing during development of your cluster.
+  :::
+
+- The path to a local file in {doc}`PEM </security/inspect-pem>` or [HMAC](https://wikipedia.org/wiki/HMAC) format that contains a single key.
+  If the file path contains `$KEYID`, then Trino interpolates the `keyid`
+  from the JWT into the file path before loading this key. This enables support
+  for setups with multiple keys.
+
+## Using JWTs with clients
+
+When using the Trino {doc}`CLI </client/cli>`, specify a JWT as described
+in {ref}`cli-jwt-auth`.
+
+When using the Trino JDBC driver, specify a JWT with the `accessToken`
+{ref}`parameter <jdbc-parameter-reference>`.
+
+## Resources
+
+The following resources may prove useful in your work with JWTs and JWKs.
+
+- [jwt.io](https://jwt.io) helps you decode and verify a JWT.
+- [An article on using RS256](https://auth0.com/blog/navigating-rs256-and-jwks/)
+  to sign and verify your JWTs.
+- An [online JSON web key](https://mkjwk.org) generator.
+- A [command line JSON web key](https://connect2id.com/products/nimbus-jose-jwt/generator) generator.
diff --git a/docs/src/main/sphinx/security/jwt.rst b/docs/src/main/sphinx/security/jwt.rst
deleted file mode 100644
index a37b102143ae..000000000000
--- a/docs/src/main/sphinx/security/jwt.rst
+++ /dev/null
@@ -1,156 +0,0 @@
-==================
-JWT authentication
-==================
-
-Trino can be configured to authenticate client access using `JSON web tokens
-<https://wikipedia.org/wiki/JSON_Web_Token>`_. A JWT is a small, web-safe
-JSON file that contains cryptographic information similar to a certificate,
-including:
-
-*  Subject
-*  Valid time period
-*  Signature
-
-A JWT is designed to be passed between servers as proof of prior authentication
-in a workflow like the following:
-
-1. An end user logs into a client application and requests access to a server.
-2. The server sends the user's credentials to a separate authentication service
-   that:
-
-   * validates the user
-   * generates a JWT as proof of validation
-   * returns the JWT to the requesting server
-
-3. The same JWT can then be forwarded to other services to maintain the user's
-   validation without further credentials.
-
-.. important::
-
-    If you are trying to configure OAuth2 or OIDC, there is a dedicated system
-    for that in Trino, as described in :doc:`/security/oauth2`. When using
-    OAuth2 authentication, you do not need to configure JWT authentication,
-    because JWTs are handled automatically by the OAuth2 code.
-
-    A typical use for JWT authentication is to support administrators at large
-    sites who are writing their own single sign-on or proxy system to stand
-    between users and the Trino coordinator, where their new system submits
-    queries on behalf of users.
-
-Using :doc:`TLS <tls>` and :doc:`a configured shared secret
-</security/internal-communication>` is required for JWT authentication.
-
-Using JWT authentication
-------------------------
-
-Trino supports Base64 encoded JWTs, but not encrypted JWTs.
-
-There are two ways to get the encryption key necessary to validate the JWT
-signature:
-
-- Load the key from a JSON web key set (JWKS) endpoint service (the
-  typical case)
-- Load the key from the local file system on the Trino coordinator
-
-A JWKS endpoint is a read-only service that contains public key information in
-`JWK <https://datatracker.ietf.org/doc/html/rfc7517>`_ format. These public
-keys are the counterpart of the private keys that sign JSON web tokens.
-
-JWT authentication configuration
---------------------------------
-
-Enable JWT authentication by setting the :doc:`JWT authentication type
-<authentication-types>` in :ref:`etc/config.properties <config_properties>`, and
-specifying a URL or path to a key file:
-
-.. code-block:: properties
-
-    http-server.authentication.type=JWT
-    http-server.authentication.jwt.key-file=https://cluster.example.net/.well-known/jwks.json
-
-JWT authentication is typically used in addition to other authentication
-methods:
-
-.. code-block:: properties
-
-    http-server.authentication.type=PASSWORD,JWT
-    http-server.authentication.jwt.key-file=https://cluster.example.net/.well-known/jwks.json
-
-The following configuration properties are available:
-
-.. list-table:: Configuration properties for JWT authentication
-   :widths: 50 50
-   :header-rows: 1
-
-   * - Property
-     - Description
-   * - ``http-server.authentication.jwt.key-file``
-     - Required. Specifies either the URL to a JWKS service or the path to a
-       PEM or HMAC file, as described below this table.
-   * - ``http-server.authentication.jwt.required-issuer``
-     - Specifies a string that must match the value of the JWT's
-       issuer (``iss``) field in order to consider this JWT valid.
-       The ``iss`` field in the JWT identifies the principal that issued the
-       JWT.
-   * - ``http-server.authentication.jwt.required-audience``
-     - Specifies a string that must match the value of the JWT's
-       Audience (``aud``) field in order to consider this JWT valid.
-       The ``aud`` field in the JWT identifies the recipients that the
-       JWT is intended for.
-   * - ``http-server.authentication.jwt.principal-field``
-     - String to identify the field in the JWT that identifies the
-       subject of the JWT. The default value is ``sub``. This field is used to
-       create the Trino principal.
-   * - ``http-server.authentication.jwt.user-mapping.pattern``
-     - A regular expression pattern to :doc:`map all user names
-       </security/user-mapping>` for this authentication system to the format
-       expected by the Trino server.
-   * - ``http-server.authentication.jwt.user-mapping.file``
-     - The path to a JSON file that contains a set of
-       :doc:`user mapping rules </security/user-mapping>` for this
-       authentication system.
-
-Use the ``http-server.authentication.jwt.key-file`` property to specify
-either:
-
--  The URL to a JWKS endpoint service, where the URL begins with ``https://``.
-   The JWKS service must be reachable from the coordinator. If the coordinator
-   is running in a secured or firewalled network, the administrator *may* have
-   to open access to the JWKS server host.
-
-   .. caution::
-
-        The Trino server also accepts JWKS URLs that begin with ``http://``, but
-        using this protocol results in a severe security risk. Only use this
-        protocol for short-term testing during development of your cluster.
-
--  The path to a local file in :doc:`PEM </security/inspect-pem>` or `HMAC
-   <https://wikipedia.org/wiki/HMAC>`_ format that contains a single key.
-   If the file path contains ``$KEYID``, then Trino interpolates the ``keyid``
-   from the JWT into the file path before loading this key. This enables support
-   for setups with multiple keys.
-
-Using JWTs with clients
------------------------
-
-When using the Trino :doc:`CLI </client/cli>`, specify a JWT as described
-in :ref:`cli-jwt-auth`.
-
-When using the Trino JDBC driver, specify a JWT with the ``accessToken``
-:ref:`parameter <jdbc-parameter-reference>`.
-
-Resources
----------
-
-The following resources may prove useful in your work with JWTs and JWKs.
-
-* `jwt.io <https://jwt.io>`_ helps you decode and verify a JWT.
-
-* `An article on using RS256
-  <https://auth0.com/blog/navigating-rs256-and-jwks/>`_
-  to sign and verify your JWTs.
-
-* An `online JSON web key <https://mkjwk.org>`_ generator.
-
-* A `command line JSON web key
-  <https://connect2id.com/products/nimbus-jose-jwt/generator>`_ generator.
diff --git a/docs/src/main/sphinx/security/kerberos-configuration.fragment b/docs/src/main/sphinx/security/kerberos-configuration.fragment
deleted file mode 100644
index 10db4b31333f..000000000000
--- a/docs/src/main/sphinx/security/kerberos-configuration.fragment
+++ /dev/null
@@ -1,25 +0,0 @@
-MIT Kerberos configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Kerberos needs to be configured on the |subject_node|. At a minimum, there needs
-to be a ``kdc`` entry in the ``[realms]`` section of the ``/etc/krb5.conf``
-file. You may also want to include an ``admin_server`` entry and ensure that
-the |subject_node| can reach the Kerberos admin server on port 749.
-
-.. code-block:: text
-
-   [realms]
-     TRINO.EXAMPLE.COM = {
-       kdc = kdc.example.com
-       admin_server = kdc.example.com
-     }
-
-   [domain_realm]
-     .trino.example.com = TRINO.EXAMPLE.COM
-     trino.example.com = TRINO.EXAMPLE.COM
-
-The complete `documentation
-<http://web.mit.edu/kerberos/krb5-latest/doc/admin/conf_files/kdc_conf.html>`_
-for ``krb5.conf`` is hosted by the MIT Kerberos Project. If you are using a
-different implementation of the Kerberos protocol, you will need to adapt the
-configuration to your environment.
diff --git a/docs/src/main/sphinx/security/kerberos-services.fragment b/docs/src/main/sphinx/security/kerberos-services.fragment
deleted file mode 100644
index 1290b2680635..000000000000
--- a/docs/src/main/sphinx/security/kerberos-services.fragment
+++ /dev/null
@@ -1,8 +0,0 @@
-Kerberos services
-^^^^^^^^^^^^^^^^^
-
-You will need a Kerberos :abbr:`KDC (Key Distribution Center)` running on a
-node that the |subject_node| can reach over the network. The KDC is
-responsible for authenticating principals and issuing session keys that can be
-used with Kerberos-enabled services. KDCs typically run on port 88, which is
-the IANA-assigned port for Kerberos.
diff --git a/docs/src/main/sphinx/security/kerberos.md b/docs/src/main/sphinx/security/kerberos.md
new file mode 100644
index 000000000000..3d9a3c80496a
--- /dev/null
+++ b/docs/src/main/sphinx/security/kerberos.md
@@ -0,0 +1,229 @@
+# Kerberos authentication
+
+Trino can be configured to enable Kerberos authentication over HTTPS for
+clients, such as the {doc}`Trino CLI </client/cli>`, or the JDBC and ODBC
+drivers.
+
+To enable Kerberos authentication for Trino, Kerberos-related configuration
+changes are made on the Trino coordinator.
+
+Using {doc}`TLS <tls>` and {doc}`a configured shared secret
+</security/internal-communication>` is required for Kerberos authentication.
+
+## Environment configuration
+
+(server-kerberos-services)=
+
+### Kerberos services
+
+You will need a Kerberos {abbr}`KDC (Key Distribution Center)` running on a
+node that the Trino coordinator can reach over the network. The KDC is
+responsible for authenticating principals and issuing session keys that can be
+used with Kerberos-enabled services. KDCs typically run on port 88, which is
+the IANA-assigned port for Kerberos.
+
+(server-kerberos-configuration)=
+
+### MIT Kerberos configuration
+
+Kerberos needs to be configured on the Trino coordinator. At a minimum, there needs
+to be a `kdc` entry in the `[realms]` section of the `/etc/krb5.conf`
+file. You may also want to include an `admin_server` entry and ensure that
+the Trino coordinator can reach the Kerberos admin server on port 749.
+
+```text
+[realms]
+  TRINO.EXAMPLE.COM = {
+    kdc = kdc.example.com
+    admin_server = kdc.example.com
+  }
+
+[domain_realm]
+  .trino.example.com = TRINO.EXAMPLE.COM
+  trino.example.com = TRINO.EXAMPLE.COM
+```
+
+The complete [documentation](http://web.mit.edu/kerberos/krb5-latest/doc/admin/conf_files/kdc_conf.html)
+for `krb5.conf` is hosted by the MIT Kerberos Project. If you are using a
+different implementation of the Kerberos protocol, you will need to adapt the
+configuration to your environment.
+
+(server-kerberos-principals)=
+
+### Kerberos principals and keytab files
+
+The Trino coordinator needs a Kerberos principal, as do users who are going to
+connect to the Trino coordinator. You need to create these users in Kerberos
+using [kadmin](http://web.mit.edu/kerberos/krb5-latest/doc/admin/admin_commands/kadmin_local.html).
+
+In addition, the Trino coordinator needs a [keytab file](http://web.mit.edu/kerberos/krb5-devel/doc/basic/keytab_def.html). After you
+create the principal, you can create the keytab file using {command}`kadmin`
+
+```text
+kadmin
+> addprinc -randkey trino@EXAMPLE.COM
+> addprinc -randkey trino/trino-coordinator.example.com@EXAMPLE.COM
+> ktadd -k /etc/trino/trino.keytab trino@EXAMPLE.COM
+> ktadd -k /etc/trino/trino.keytab trino/trino-coordinator.example.com@EXAMPLE.COM
+```
+
+:::{note}
+Running {command}`ktadd` randomizes the principal's keys. If you have just
+created the principal, this does not matter. If the principal already exists,
+and if existing users or services rely on being able to authenticate using a
+password or a keytab, use the `-norandkey` option to {command}`ktadd`.
+:::
+
+### Configuration for TLS
+
+When using Kerberos authentication, access to the Trino coordinator must be
+through {doc}`TLS and HTTPS </security/tls>`.
+
+## System access control plugin
+
+A Trino coordinator with Kerberos enabled probably needs a
+{doc}`/develop/system-access-control` plugin to achieve the desired level of
+security.
+
+## Trino coordinator node configuration
+
+You must make the above changes to the environment prior to configuring the
+Trino coordinator to use Kerberos authentication and HTTPS. After making the
+following environment changes, you can make the changes to the Trino
+configuration files.
+
+- {doc}`/security/tls`
+- {ref}`server-kerberos-services`
+- {ref}`server-kerberos-configuration`
+- {ref}`server-kerberos-principals`
+- {doc}`System Access Control Plugin </develop/system-access-control>`
+
+### config.properties
+
+Kerberos authentication is configured in the coordinator node's
+{file}`config.properties` file. The entries that need to be added are listed
+below.
+
+```text
+http-server.authentication.type=KERBEROS
+
+http-server.authentication.krb5.service-name=trino
+http-server.authentication.krb5.principal-hostname=trino.example.com
+http-server.authentication.krb5.keytab=/etc/trino/trino.keytab
+http.authentication.krb5.config=/etc/krb5.conf
+
+http-server.https.enabled=true
+http-server.https.port=7778
+
+http-server.https.keystore.path=/etc/trino/keystore.jks
+http-server.https.keystore.key=keystore_password
+
+node.internal-address-source=FQDN
+```
+
+| Property                                               | Description                                                                                                                                                                                                                      |
+| ------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `http-server.authentication.type`                      | Authentication type for the Trino coordinator. Must be set to `KERBEROS`.                                                                                                                                                        |
+| `http-server.authentication.krb5.service-name`         | The Kerberos service name for the Trino coordinator. Must match the Kerberos principal.                                                                                                                                          |
+| `http-server.authentication.krb5.principal-hostname`   | The Kerberos hostname for the Trino coordinator. Must match the Kerberos principal. This parameter is optional. If included, Trino uses this value in the host part of the Kerberos principal instead of the machine's hostname. |
+| `http-server.authentication.krb5.keytab`               | The location of the keytab that can be used to authenticate the Kerberos principal.                                                                                                                                              |
+| `http.authentication.krb5.config`                      | The location of the Kerberos configuration file.                                                                                                                                                                                 |
+| `http-server.https.enabled`                            | Enables HTTPS access for the Trino coordinator. Should be set to `true`.                                                                                                                                                         |
+| `http-server.https.port`                               | HTTPS server port.                                                                                                                                                                                                               |
+| `http-server.https.keystore.path`                      | The location of the Java Keystore file that is used to secure TLS.                                                                                                                                                               |
+| `http-server.https.keystore.key`                       | The password for the keystore. This must match the password you specified when creating the keystore.                                                                                                                            |
+| `http-server.authentication.krb5.user-mapping.pattern` | Regex to match against user.  If matched, user will be replaced with first regex group. If not matched, authentication is denied.  Default is `(.*)`.                                                                            |
+| `http-server.authentication.krb5.user-mapping.file`    | File containing rules for mapping user.  See {doc}`/security/user-mapping` for more information.                                                                                                                                 |
+| `node.internal-address-source`                         | Kerberos is typically sensitive to DNS names. Setting this property to use `FQDN` ensures correct operation and usage of valid DNS host names.                                                                                   |
+
+See {ref}`Standards supported <tls-version-and-ciphers>` for a discussion of the
+supported TLS versions and cipher suites.
+
+### access-control.properties
+
+At a minimum, an {file}`access-control.properties` file must contain an
+`access-control.name` property.  All other configuration is specific for the
+implementation being configured. See {doc}`/develop/system-access-control` for
+details.
+
+(coordinator-troubleshooting)=
+
+## User mapping
+
+After authenticating with Kerberos, the Trino server receives the user's
+principal which is typically similar to an email address. For example, when
+`alice` logs in Trino might receive `alice@example.com`. By default, Trino
+uses the full Kerberos principal name, but this can be mapped to a shorter
+name using a user-mapping pattern. For simple mapping rules, the
+`http-server.authentication.krb5.user-mapping.pattern` configuration property
+can be set to a Java regular expression, and Trino uses the value of the
+first matcher group. If the regular expression does not match, the
+authentication is denied. For more complex user-mapping rules, see
+{doc}`/security/user-mapping`.
+
+## Troubleshooting
+
+Getting Kerberos authentication working can be challenging. You can
+independently verify some of the configuration outside of Trino to help narrow
+your focus when trying to solve a problem.
+
+### Kerberos verification
+
+Ensure that you can connect to the KDC from the Trino coordinator using
+{command}`telnet`:
+
+```text
+$ telnet kdc.example.com 88
+```
+
+Verify that the keytab file can be used to successfully obtain a ticket using
+[kinit](http://web.mit.edu/kerberos/krb5-1.12/doc/user/user_commands/kinit.html) and
+[klist](http://web.mit.edu/kerberos/krb5-1.12/doc/user/user_commands/klist.html)
+
+```text
+$ kinit -kt /etc/trino/trino.keytab trino@EXAMPLE.COM
+$ klist
+```
+
+### Java keystore file verification
+
+Verify the password for a keystore file and view its contents using
+{ref}`troubleshooting-keystore`.
+
+(kerberos-debug)=
+
+### Additional Kerberos debugging information
+
+You can enable additional Kerberos debugging information for the Trino
+coordinator process by adding the following lines to the Trino `jvm.config`
+file:
+
+```text
+-Dsun.security.krb5.debug=true
+-Dlog.enable-console=true
+```
+
+`-Dsun.security.krb5.debug=true` enables Kerberos debugging output from the
+JRE Kerberos libraries. The debugging output goes to `stdout`, which Trino
+redirects to the logging system. `-Dlog.enable-console=true` enables output
+to `stdout` to appear in the logs.
+
+The amount and usefulness of the information the Kerberos debugging output
+sends to the logs varies depending on where the authentication is failing.
+Exception messages and stack traces can provide useful clues about the
+nature of the problem.
+
+See [Troubleshooting Security](https://docs.oracle.com/en/java/javase/11/security/troubleshooting-security.html)
+in the Java documentation for more details about the `-Djava.security.debug`
+flag, and [Troubleshooting](https://docs.oracle.com/en/java/javase/11/security/troubleshooting.html) for
+more details about the Java GSS-API and Kerberos issues.
+
+(server-additional-resources)=
+
+### Additional resources
+
+[Common Kerberos Error Messages (A-M)](http://docs.oracle.com/cd/E19253-01/816-4557/trouble-6/index.html)
+
+[Common Kerberos Error Messages (N-Z)](http://docs.oracle.com/cd/E19253-01/816-4557/trouble-27/index.html)
+
+[MIT Kerberos Documentation: Troubleshooting](http://web.mit.edu/kerberos/krb5-latest/doc/admin/troubleshoot.html)
diff --git a/docs/src/main/sphinx/security/kerberos.rst b/docs/src/main/sphinx/security/kerberos.rst
deleted file mode 100644
index e08fde97e77e..000000000000
--- a/docs/src/main/sphinx/security/kerberos.rst
+++ /dev/null
@@ -1,237 +0,0 @@
-=======================
-Kerberos authentication
-=======================
-
-Trino can be configured to enable Kerberos authentication over HTTPS for
-clients, such as the :doc:`Trino CLI </client/cli>`, or the JDBC and ODBC
-drivers.
-
-To enable Kerberos authentication for Trino, Kerberos-related configuration
-changes are made on the Trino coordinator.
-
-Using :doc:`TLS <tls>` and :doc:`a configured shared secret
-</security/internal-communication>` is required for Kerberos authentication.
-
-Environment configuration
--------------------------
-
-.. |subject_node| replace:: Trino coordinator
-
-.. _server_kerberos_services:
-.. include:: kerberos-services.fragment
-
-.. _server_kerberos_configuration:
-.. include:: kerberos-configuration.fragment
-
-.. _server_kerberos_principals:
-
-Kerberos principals and keytab files
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The Trino coordinator needs a Kerberos principal, as do users who are going to
-connect to the Trino coordinator. You need to create these users in Kerberos
-using `kadmin
-<http://web.mit.edu/kerberos/krb5-latest/doc/admin/admin_commands/kadmin_local.html>`_.
-
-In addition, the Trino coordinator needs a `keytab file
-<http://web.mit.edu/kerberos/krb5-devel/doc/basic/keytab_def.html>`_. After you
-create the principal, you can create the keytab file using :command:`kadmin`
-
-.. code-block:: text
-
-    kadmin
-    > addprinc -randkey trino@EXAMPLE.COM
-    > addprinc -randkey trino/trino-coordinator.example.com@EXAMPLE.COM
-    > ktadd -k /etc/trino/trino.keytab trino@EXAMPLE.COM
-    > ktadd -k /etc/trino/trino.keytab trino/trino-coordinator.example.com@EXAMPLE.COM
-
-.. include:: ktadd-note.fragment
-
-Configuration for TLS
-^^^^^^^^^^^^^^^^^^^^^
-
-When using Kerberos authentication, access to the Trino coordinator must be
-through :doc:`TLS and HTTPS </security/tls>`.
-
-System access control plugin
-----------------------------
-
-A Trino coordinator with Kerberos enabled probably needs a
-:doc:`/develop/system-access-control` plugin to achieve the desired level of
-security.
-
-Trino coordinator node configuration
-------------------------------------
-
-You must make the above changes to the environment prior to configuring the
-Trino coordinator to use Kerberos authentication and HTTPS. After making the
-following environment changes, you can make the changes to the Trino
-configuration files.
-
-* :doc:`/security/tls`
-* :ref:`server_kerberos_services`
-* :ref:`server_kerberos_configuration`
-* :ref:`server_kerberos_principals`
-* :doc:`System Access Control Plugin </develop/system-access-control>`
-
-config.properties
-^^^^^^^^^^^^^^^^^
-
-Kerberos authentication is configured in the coordinator node's
-:file:`config.properties` file. The entries that need to be added are listed
-below.
-
-.. code-block:: text
-
-    http-server.authentication.type=KERBEROS
-
-    http-server.authentication.krb5.service-name=trino
-    http-server.authentication.krb5.principal-hostname=trino.example.com
-    http-server.authentication.krb5.keytab=/etc/trino/trino.keytab
-    http.authentication.krb5.config=/etc/krb5.conf
-
-    http-server.https.enabled=true
-    http-server.https.port=7778
-
-    http-server.https.keystore.path=/etc/trino/keystore.jks
-    http-server.https.keystore.key=keystore_password
-
-    node.internal-address-source=FQDN
-
-========================================================= ======================================================
-Property                                                  Description
-========================================================= ======================================================
-``http-server.authentication.type``                       Authentication type for the Trino
-                                                          coordinator. Must be set to ``KERBEROS``.
-``http-server.authentication.krb5.service-name``          The Kerberos service name for the Trino coordinator.
-                                                          Must match the Kerberos principal.
-``http-server.authentication.krb5.principal-hostname``    The Kerberos hostname for the Trino coordinator.
-                                                          Must match the Kerberos principal. This parameter is
-                                                          optional. If included, Trino uses this value
-                                                          in the host part of the Kerberos principal instead
-                                                          of the machine's hostname.
-``http-server.authentication.krb5.keytab``                The location of the keytab that can be used to
-                                                          authenticate the Kerberos principal.
-``http.authentication.krb5.config``                       The location of the Kerberos configuration file.
-``http-server.https.enabled``                             Enables HTTPS access for the Trino coordinator.
-                                                          Should be set to ``true``.
-``http-server.https.port``                                HTTPS server port.
-``http-server.https.keystore.path``                       The location of the Java Keystore file that is
-                                                          used to secure TLS.
-``http-server.https.keystore.key``                        The password for the keystore. This must match the
-                                                          password you specified when creating the keystore.
-``http-server.authentication.krb5.user-mapping.pattern``  Regex to match against user.  If matched, user will be
-                                                          replaced with first regex group. If not matched,
-                                                          authentication is denied.  Default is ``(.*)``.
-``http-server.authentication.krb5.user-mapping.file``     File containing rules for mapping user.  See
-                                                          :doc:`/security/user-mapping` for more information.
-``node.internal-address-source``                          Kerberos is typically sensitive to DNS names. Setting
-                                                          this property to use ``FQDN`` ensures correct
-                                                          operation and usage of valid DNS host names.
-========================================================= ======================================================
-
-See :ref:`Standards supported <tls-version-and-ciphers>` for a discussion of the
-supported TLS versions and cipher suites.
-
-access-control.properties
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-At a minimum, an :file:`access-control.properties` file must contain an
-``access-control.name`` property.  All other configuration is specific for the
-implementation being configured. See :doc:`/develop/system-access-control` for
-details.
-
-.. _coordinator-troubleshooting:
-
-User mapping
-------------
-
-After authenticating with Kerberos, the Trino server receives the user's
-principal which is typically similar to an email address. For example, when
-``alice`` logs in Trino might receive ``alice@example.com``. By default, Trino
-uses the full Kerberos principal name, but this can be mapped to a shorter
-name using a user-mapping pattern. For simple mapping rules, the
-``http-server.authentication.krb5.user-mapping.pattern`` configuration property
-can be set to a Java regular expression, and Trino uses the value of the
-first matcher group. If the regular expression does not match, the
-authentication is denied. For more complex user-mapping rules, see
-:doc:`/security/user-mapping`.
-
-Troubleshooting
----------------
-
-Getting Kerberos authentication working can be challenging. You can
-independently verify some of the configuration outside of Trino to help narrow
-your focus when trying to solve a problem.
-
-Kerberos verification
-^^^^^^^^^^^^^^^^^^^^^
-
-Ensure that you can connect to the KDC from the Trino coordinator using
-:command:`telnet`:
-
-.. code-block:: text
-
-    $ telnet kdc.example.com 88
-
-Verify that the keytab file can be used to successfully obtain a ticket using
-`kinit
-<http://web.mit.edu/kerberos/krb5-1.12/doc/user/user_commands/kinit.html>`_ and
-`klist
-<http://web.mit.edu/kerberos/krb5-1.12/doc/user/user_commands/klist.html>`_
-
-.. code-block:: text
-
-    $ kinit -kt /etc/trino/trino.keytab trino@EXAMPLE.COM
-    $ klist
-
-Java keystore file verification
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Verify the password for a keystore file and view its contents using
-:ref:`troubleshooting_keystore`.
-
-.. _kerberos-debug:
-
-Additional Kerberos debugging information
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can enable additional Kerberos debugging information for the Trino
-coordinator process by adding the following lines to the Trino ``jvm.config``
-file:
-
-.. code-block:: text
-
-    -Dsun.security.krb5.debug=true
-    -Dlog.enable-console=true
-
-``-Dsun.security.krb5.debug=true`` enables Kerberos debugging output from the
-JRE Kerberos libraries. The debugging output goes to ``stdout``, which Trino
-redirects to the logging system. ``-Dlog.enable-console=true`` enables output
-to ``stdout`` to appear in the logs.
-
-The amount and usefulness of the information the Kerberos debugging output
-sends to the logs varies depending on where the authentication is failing.
-Exception messages and stack traces can provide useful clues about the
-nature of the problem.
-
-See `Troubleshooting Security
-<https://docs.oracle.com/en/java/javase/11/security/troubleshooting-security.html>`_
-in the Java documentation for more details about the ``-Djava.security.debug``
-flag, and `Troubleshooting
-<https://docs.oracle.com/en/java/javase/11/security/troubleshooting.html>`_ for
-more details about the Java GSS-API and Kerberos issues.
-
-.. _server_additional_resources:
-
-Additional resources
-^^^^^^^^^^^^^^^^^^^^
-
-`Common Kerberos Error Messages (A-M)
-<http://docs.oracle.com/cd/E19253-01/816-4557/trouble-6/index.html>`_
-
-`Common Kerberos Error Messages (N-Z)
-<http://docs.oracle.com/cd/E19253-01/816-4557/trouble-27/index.html>`_
-
-`MIT Kerberos Documentation: Troubleshooting
-<http://web.mit.edu/kerberos/krb5-latest/doc/admin/troubleshoot.html>`_
diff --git a/docs/src/main/sphinx/security/ktadd-note.fragment b/docs/src/main/sphinx/security/ktadd-note.fragment
deleted file mode 100644
index 448279df84b7..000000000000
--- a/docs/src/main/sphinx/security/ktadd-note.fragment
+++ /dev/null
@@ -1,6 +0,0 @@
-.. note::
-
-  Running :command:`ktadd` randomizes the principal's keys. If you have just
-  created the principal, this does not matter. If the principal already exists,
-  and if existing users or services rely on being able to authenticate using a
-  password or a keytab, use the ``-norandkey`` option to :command:`ktadd`.
diff --git a/docs/src/main/sphinx/security/ldap.md b/docs/src/main/sphinx/security/ldap.md
new file mode 100644
index 000000000000..dd3cc7399d2c
--- /dev/null
+++ b/docs/src/main/sphinx/security/ldap.md
@@ -0,0 +1,274 @@
+# LDAP authentication
+
+Trino can be configured to enable frontend LDAP authentication over
+HTTPS for clients, such as the {ref}`cli-ldap`, or the JDBC and ODBC
+drivers. At present, only simple LDAP authentication mechanism involving
+username and password is supported. The Trino client sends a username
+and password to the coordinator, and the coordinator validates these
+credentials using an external LDAP service.
+
+To enable LDAP authentication for Trino, LDAP-related configuration changes are
+made on the Trino coordinator.
+
+Using {doc}`TLS <tls>` and {doc}`a configured shared secret
+</security/internal-communication>` is required for LDAP authentication.
+
+## Trino server configuration
+
+### Trino coordinator node configuration
+
+Access to the Trino coordinator should be through HTTPS, configured as described
+on {doc}`TLS and HTTPS </security/tls>`.
+
+You also need to make changes to the Trino configuration files.
+LDAP authentication is configured on the coordinator in two parts.
+The first part is to enable HTTPS support and password authentication
+in the coordinator's `config.properties` file. The second part is
+to configure LDAP as the password authenticator plugin.
+
+#### Server config properties
+
+The following is an example of the required properties that need to be added
+to the coordinator's `config.properties` file:
+
+```text
+http-server.authentication.type=PASSWORD
+
+http-server.https.enabled=true
+http-server.https.port=8443
+
+http-server.https.keystore.path=/etc/trino/keystore.jks
+http-server.https.keystore.key=keystore_password
+```
+
+| Property                                                   | Description                                                                                                                                                                  |
+| ---------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `http-server.authentication.type`                          | Enable the password {doc}`authentication type <authentication-types>` for the Trino coordinator. Must be set to `PASSWORD`.                                                  |
+| `http-server.https.enabled`                                | Enables HTTPS access for the Trino coordinator. Should be set to `true`. Default value is `false`.                                                                           |
+| `http-server.https.port`                                   | HTTPS server port.                                                                                                                                                           |
+| `http-server.https.keystore.path`                          | The location of the PEM or Java keystore file is used to enable TLS.                                                                                                         |
+| `http-server.https.keystore.key`                           | The password for the PEM or Java keystore. This must match the password you specified when creating the PEM or keystore.                                                     |
+| `http-server.process-forwarded`                            | Enable treating forwarded HTTPS requests over HTTP as secure.  Requires the `X-Forwarded-Proto` header to be set to `https` on forwarded requests. Default value is `false`. |
+| `http-server.authentication.password.user-mapping.pattern` | Regex to match against user.  If matched, user will be replaced with first regex group. If not matched, authentication is denied.  Default is `(.*)`.                        |
+| `http-server.authentication.password.user-mapping.file`    | File containing rules for mapping user.  See {doc}`/security/user-mapping` for more information.                                                                             |
+
+#### Password authenticator configuration
+
+Password authentication must be configured to use LDAP. Create an
+`etc/password-authenticator.properties` file on the coordinator. Example:
+
+```text
+password-authenticator.name=ldap
+ldap.url=ldaps://ldap-server:636
+ldap.ssl.truststore.path=/path/to/ldap_server.pem
+ldap.user-bind-pattern=<Refer below for usage>
+```
+
+| Property                       | Description                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `ldap.url`                     | The URL to the LDAP server. The URL scheme must be `ldap://` or `ldaps://`. Connecting to the LDAP server without TLS enabled requires `ldap.allow-insecure=true`.                                                                                                                                                                                                                                                                         |
+| `ldap.allow-insecure`          | Allow using an LDAP connection that is not secured with TLS.                                                                                                                                                                                                                                                                                                                                                                               |
+| `ldap.ssl.keystore.path`       | The path to the {doc}`PEM </security/inspect-pem>` or {doc}`JKS </security/inspect-jks>` keystore file.                                                                                                                                                                                                                                                                                                                                    |
+| `ldap.ssl.keystore.password`   | Password for the key store.                                                                                                                                                                                                                                                                                                                                                                                                                |
+| `ldap.ssl.truststore.path`     | The path to the {doc}`PEM </security/inspect-pem>` or {doc}`JKS </security/inspect-jks>` truststore file.                                                                                                                                                                                                                                                                                                                                  |
+| `ldap.ssl.truststore.password` | Password for the truststore.                                                                                                                                                                                                                                                                                                                                                                                                               |
+| `ldap.user-bind-pattern`       | This property can be used to specify the LDAP user bind string for password authentication. This property must contain the pattern `${USER}`, which is replaced by the actual username during the password authentication.The property can contain multiple patterns separated by a colon. Each pattern will be checked in order until a login succeeds or all logins fail. Example: `${USER}@corp.example.com:${USER}@corp.example.co.uk` |
+| `ldap.ignore-referrals`        | Ignore referrals to other LDAP servers while performing search queries. Defaults to `false`.                                                                                                                                                                                                                                                                                                                                               |
+| `ldap.cache-ttl`               | LDAP cache duration. Defaults to `1h`.                                                                                                                                                                                                                                                                                                                                                                                                     |
+| `ldap.timeout.connect`         | Timeout for establishing an LDAP connection.                                                                                                                                                                                                                                                                                                                                                                                               |
+| `ldap.timeout.read`            | Timeout for reading data from an LDAP connection.                                                                                                                                                                                                                                                                                                                                                                                          |
+
+Based on the LDAP server implementation type, the property
+`ldap.user-bind-pattern` can be used as described below.
+
+##### Active Directory
+
+```text
+ldap.user-bind-pattern=${USER}@<domain_name_of_the_server>
+```
+
+Example:
+
+```text
+ldap.user-bind-pattern=${USER}@corp.example.com
+```
+
+##### OpenLDAP
+
+```text
+ldap.user-bind-pattern=uid=${USER},<distinguished_name_of_the_user>
+```
+
+Example:
+
+```text
+ldap.user-bind-pattern=uid=${USER},OU=America,DC=corp,DC=example,DC=com
+```
+
+#### Authorization based on LDAP group membership
+
+You can further restrict the set of users allowed to connect to the Trino
+coordinator, based on their group membership, by setting the optional
+`ldap.group-auth-pattern` and `ldap.user-base-dn` properties, in addition
+to the basic LDAP authentication properties.
+
+| Property                  | Description                                                                                                                                                                                                                                                                                                                                 |
+| ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `ldap.user-base-dn`       | The base LDAP distinguished name for the user who tries to connect to the server. Example: `OU=America,DC=corp,DC=example,DC=com`                                                                                                                                                                                                           |
+| `ldap.group-auth-pattern` | This property is used to specify the LDAP query for the LDAP group membership authorization. This query is executed against the LDAP server and if successful, the user is authorized. This property must contain a pattern `${USER}`, which is replaced by the actual username in the group authorization search query. See samples below. |
+
+Based on the LDAP server implementation type, the property
+`ldap.group-auth-pattern` can be used as described below.
+
+#### Authorization using Trino LDAP service user
+
+Trino server can use dedicated LDAP service user for doing user group membership queries.
+In such case Trino will first issue a group membership query for a Trino user that needs
+to be authenticated. A user distinguished name will be extracted from a group membership
+query result. Trino will then validate user password by creating LDAP context with
+user distinguished name and user password. In order to use this mechanism `ldap.bind-dn`,
+`ldap.bind-password` and `ldap.group-auth-pattern` properties need to be defined.
+
+| Property                  | Description                                                                                                                                                                                                                                                                                                                                          |
+| ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `ldap.bind-dn`            | Bind distinguished name used by Trino when issuing group membership queries. Example: `CN=admin,OU=CITY_OU,OU=STATE_OU,DC=domain`                                                                                                                                                                                                                    |
+| `ldap.bind-password`      | Bind password used by Trino when issuing group membership queries. Example: `password1234`                                                                                                                                                                                                                                                           |
+| `ldap.group-auth-pattern` | This property is used to specify the LDAP query for the LDAP group membership authorization. This query will be executed against the LDAP server and if successful, a user distinguished name will be extracted from a query result. Trino will then validate user password by creating LDAP context with user distinguished name and user password. |
+
+##### Active Directory
+
+```text
+ldap.group-auth-pattern=(&(objectClass=<objectclass_of_user>)(sAMAccountName=${USER})(memberof=<dn_of_the_authorized_group>))
+```
+
+Example:
+
+```text
+ldap.group-auth-pattern=(&(objectClass=person)(sAMAccountName=${USER})(memberof=CN=AuthorizedGroup,OU=Asia,DC=corp,DC=example,DC=com))
+```
+
+##### OpenLDAP
+
+```text
+ldap.group-auth-pattern=(&(objectClass=<objectclass_of_user>)(uid=${USER})(memberof=<dn_of_the_authorized_group>))
+```
+
+Example:
+
+```text
+ldap.group-auth-pattern=(&(objectClass=inetOrgPerson)(uid=${USER})(memberof=CN=AuthorizedGroup,OU=Asia,DC=corp,DC=example,DC=com))
+```
+
+For OpenLDAP, for this query to work, make sure you enable the
+`memberOf` [overlay](http://www.openldap.org/doc/admin24/overlays.html).
+
+You can use this property for scenarios where you want to authorize a user
+based on complex group authorization search queries. For example, if you want to
+authorize a user belonging to any one of multiple groups (in OpenLDAP), this
+property may be set as follows:
+
+```text
+ldap.group-auth-pattern=(&(|(memberOf=CN=normal_group,DC=corp,DC=com)(memberOf=CN=another_group,DC=com))(objectClass=inetOrgPerson)(uid=${USER}))
+```
+
+(cli-ldap)=
+
+## Trino CLI
+
+### Environment configuration
+
+#### TLS configuration
+
+When using LDAP authentication, access to the Trino coordinator must be through
+{doc}`TLS/HTTPS </security/tls>`.
+
+### Trino CLI execution
+
+In addition to the options that are required when connecting to a Trino
+coordinator that does not require LDAP authentication, invoking the CLI
+with LDAP support enabled requires a number of additional command line
+options. You can either use `--keystore-*` or `--truststore-*` properties
+to secure TLS connection. The simplest way to invoke the CLI is with a
+wrapper script.
+
+```text
+#!/bin/bash
+
+./trino \
+--server https://trino-coordinator.example.com:8443 \
+--keystore-path /tmp/trino.jks \
+--keystore-password password \
+--truststore-path /tmp/trino_truststore.jks \
+--truststore-password password \
+--catalog <catalog> \
+--schema <schema> \
+--user <LDAP user> \
+--password
+```
+
+Find details on the options used in {ref}`cli-tls` and
+{ref}`cli-username-password-auth`.
+
+## Troubleshooting
+
+### Java keystore file verification
+
+Verify the password for a keystore file and view its contents using
+{ref}`troubleshooting-keystore`.
+
+### Debug Trino to LDAP server issues
+
+If you need to debug issues with Trino communicating with the LDAP server,
+you can change the {ref}`log level <log-levels>` for the LDAP authenticator:
+
+```none
+io.trino.plugin.password=DEBUG
+```
+
+### TLS debugging for Trino CLI
+
+If you encounter any TLS related errors when running the Trino CLI, you can run
+the CLI using the `-Djavax.net.debug=ssl` parameter for debugging. Use the
+Trino CLI executable JAR to enable this. For example:
+
+```text
+java -Djavax.net.debug=ssl \
+-jar \
+trino-cli-<version>-executable.jar \
+--server https://coordinator:8443 \
+<other_cli_arguments>
+```
+
+#### Common TLS/SSL errors
+
+##### java.security.cert.CertificateException: No subject alternative names present
+
+This error is seen when the Trino coordinator’s certificate is invalid, and does not have the IP you provide
+in the `--server` argument of the CLI. You have to regenerate the coordinator's TLS certificate
+with the appropriate {abbr}`SAN (Subject Alternative Name)` added.
+
+Adding a SAN to this certificate is required in cases where `https://` uses IP address in the URL, rather
+than the domain contained in the coordinator's certificate, and the certificate does not contain the
+{abbr}`SAN (Subject Alternative Name)` parameter with the matching IP address as an alternative attribute.
+
+#### Authentication or TLS errors with JDK upgrade
+
+Starting with the JDK 8u181 release, to improve the robustness of LDAPS
+(secure LDAP over TLS) connections, endpoint identification algorithms were
+enabled by default. See release notes
+[from Oracle](https://www.oracle.com/technetwork/java/javase/8u181-relnotes-4479407.html#JDK-8200666.).
+The same LDAP server certificate on the Trino coordinator, running on JDK
+version >= 8u181, that was previously able to successfully connect to an
+LDAPS server, may now fail with the following error:
+
+```text
+javax.naming.CommunicationException: simple bind failed: ldapserver:636
+[Root exception is javax.net.ssl.SSLHandshakeException: java.security.cert.CertificateException: No subject alternative DNS name matching ldapserver found.]
+```
+
+If you want to temporarily disable endpoint identification, you can add the
+property `-Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true`
+to Trino's `jvm.config` file. However, in a production environment, we
+suggest fixing the issue by regenerating the LDAP server certificate so that
+the certificate {abbr}`SAN (Subject Alternative Name)` or certificate subject
+name matches the LDAP server.
diff --git a/docs/src/main/sphinx/security/ldap.rst b/docs/src/main/sphinx/security/ldap.rst
deleted file mode 100644
index 369e9069de44..000000000000
--- a/docs/src/main/sphinx/security/ldap.rst
+++ /dev/null
@@ -1,349 +0,0 @@
-===================
-LDAP authentication
-===================
-
-Trino can be configured to enable frontend LDAP authentication over
-HTTPS for clients, such as the :ref:`cli_ldap`, or the JDBC and ODBC
-drivers. At present, only simple LDAP authentication mechanism involving
-username and password is supported. The Trino client sends a username
-and password to the coordinator, and the coordinator validates these
-credentials using an external LDAP service.
-
-To enable LDAP authentication for Trino, LDAP-related configuration changes are
-made on the Trino coordinator.
-
-Using :doc:`TLS <tls>` and :doc:`a configured shared secret
-</security/internal-communication>` is required for LDAP authentication.
-
-Trino server configuration
----------------------------
-
-Trino coordinator node configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Access to the Trino coordinator should be through HTTPS, configured as described
-on :doc:`TLS and HTTPS </security/tls>`.
-
-You also need to make changes to the Trino configuration files.
-LDAP authentication is configured on the coordinator in two parts.
-The first part is to enable HTTPS support and password authentication
-in the coordinator's ``config.properties`` file. The second part is
-to configure LDAP as the password authenticator plugin.
-
-Server config properties
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-The following is an example of the required properties that need to be added
-to the coordinator's ``config.properties`` file:
-
-.. code-block:: text
-
-    http-server.authentication.type=PASSWORD
-
-    http-server.https.enabled=true
-    http-server.https.port=8443
-
-    http-server.https.keystore.path=/etc/trino/keystore.jks
-    http-server.https.keystore.key=keystore_password
-
-============================================================= ======================================================
-Property                                                      Description
-============================================================= ======================================================
-``http-server.authentication.type``                           Enable the password :doc:`authentication type <authentication-types>`
-                                                              for the Trino coordinator. Must be set to ``PASSWORD``.
-``http-server.https.enabled``                                 Enables HTTPS access for the Trino coordinator.
-                                                              Should be set to ``true``. Default value is
-                                                              ``false``.
-``http-server.https.port``                                    HTTPS server port.
-``http-server.https.keystore.path``                           The location of the PEM or Java keystore file
-                                                              is used to enable TLS.
-``http-server.https.keystore.key``                            The password for the PEM or Java keystore. This
-                                                              must match the password you specified when creating
-                                                              the PEM or keystore.
-``http-server.process-forwarded``                             Enable treating forwarded HTTPS requests over HTTP
-                                                              as secure.  Requires the ``X-Forwarded-Proto`` header
-                                                              to be set to ``https`` on forwarded requests.
-                                                              Default value is ``false``.
-``http-server.authentication.password.user-mapping.pattern``  Regex to match against user.  If matched, user will be
-                                                              replaced with first regex group. If not matched,
-                                                              authentication is denied.  Default is ``(.*)``.
-``http-server.authentication.password.user-mapping.file``     File containing rules for mapping user.  See
-                                                              :doc:`/security/user-mapping` for more information.
-============================================================= ======================================================
-
-Password authenticator configuration
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Password authentication needs to be configured to use LDAP. Create an
-``etc/password-authenticator.properties`` file on the coordinator. Example:
-
-.. code-block:: text
-
-    password-authenticator.name=ldap
-    ldap.url=ldaps://ldap-server:636
-    ldap.ssl.truststore.path=/path/to/ldap_server.crt
-    ldap.user-bind-pattern=<Refer below for usage>
-
-================================== ======================================================
-Property                           Description
-================================== ======================================================
-``ldap.url``                       The URL to the LDAP server. The URL scheme must be
-                                   ``ldap://`` or ``ldaps://``. Connecting to the LDAP
-                                   server without TLS enabled requires
-                                   ``ldap.allow-insecure=true``.
-``ldap.allow-insecure``            Allow using an LDAP connection that is not secured with
-                                   TLS.
-``ldap.ssl.keystore.path``         Path to the PEM or JKS key store.
-``ldap.ssl.keystore.password``     Password for the key store.
-``ldap.ssl.truststore.path``       Path to the PEM or JKS trust store.
-``ldap.ssl.truststore.password``   Password for the trust store.
-``ldap.user-bind-pattern``         This property can be used to specify the LDAP user
-                                   bind string for password authentication. This property
-                                   must contain the pattern ``${USER}``, which is
-                                   replaced by the actual username during the password
-                                   authentication.
-
-                                   The property can contain multiple patterns separated
-                                   by a colon. Each pattern will be checked in order
-                                   until a login succeeds or all logins fail. Example:
-                                   ``${USER}@corp.example.com:${USER}@corp.example.co.uk``
-``ldap.ignore-referrals``          Ignore referrals to other LDAP servers while
-                                   performing search queries. Defaults to ``false``.
-``ldap.cache-ttl``                 LDAP cache duration. Defaults to ``1h``.
-``ldap.timeout.connect``           Timeout for establishing an LDAP connection.
-``ldap.timeout.read``              Timeout for reading data from an LDAP connection.
-================================== ======================================================
-
-Based on the LDAP server implementation type, the property
-``ldap.user-bind-pattern`` can be used as described below.
-
-Active Directory
-****************
-
-.. code-block:: text
-
-    ldap.user-bind-pattern=${USER}@<domain_name_of_the_server>
-
-Example:
-
-.. code-block:: text
-
-    ldap.user-bind-pattern=${USER}@corp.example.com
-
-OpenLDAP
-********
-
-.. code-block:: text
-
-    ldap.user-bind-pattern=uid=${USER},<distinguished_name_of_the_user>
-
-Example:
-
-.. code-block:: text
-
-    ldap.user-bind-pattern=uid=${USER},OU=America,DC=corp,DC=example,DC=com
-
-Authorization based on LDAP group membership
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You can further restrict the set of users allowed to connect to the Trino
-coordinator, based on their group membership, by setting the optional
-``ldap.group-auth-pattern`` and ``ldap.user-base-dn`` properties, in addition
-to the basic LDAP authentication properties.
-
-======================================================= ======================================================
-Property                                                Description
-======================================================= ======================================================
-``ldap.user-base-dn``                                   The base LDAP distinguished name for the user
-                                                        who tries to connect to the server.
-                                                        Example: ``OU=America,DC=corp,DC=example,DC=com``
-``ldap.group-auth-pattern``                             This property is used to specify the LDAP query for
-                                                        the LDAP group membership authorization. This query
-                                                        is executed against the LDAP server and if
-                                                        successful, the user is authorized.
-                                                        This property must contain a pattern ``${USER}``,
-                                                        which is replaced by the actual username in
-                                                        the group authorization search query.
-                                                        See samples below.
-======================================================= ======================================================
-
-Based on the LDAP server implementation type, the property
-``ldap.group-auth-pattern`` can be used as described below.
-
-Authorization using Trino LDAP service user
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Trino server can use dedicated LDAP service user for doing user group membership queries.
-In such case Trino will first issue a group membership query for a Trino user that needs
-to be authenticated. A user distinguished name will be extracted from a group membership
-query result. Trino will then validate user password by creating LDAP context with
-user distinguished name and user password. In order to use this mechanism ``ldap.bind-dn``,
-``ldap.bind-password`` and ``ldap.group-auth-pattern`` properties need to be defined.
-
-======================================================= ======================================================
-Property                                                Description
-======================================================= ======================================================
-``ldap.bind-dn``                                        Bind distinguished name used by Trino when issuing
-                                                        group membership queries.
-                                                        Example: ``CN=admin,OU=CITY_OU,OU=STATE_OU,DC=domain``
-``ldap.bind-password``                                  Bind password used by Trino when issuing group
-                                                        membership queries.
-                                                        Example: ``password1234``
-``ldap.group-auth-pattern``                             This property is used to specify the LDAP query for
-                                                        the LDAP group membership authorization. This query
-                                                        will be executed against the LDAP server and if
-                                                        successful, a user distinguished name will be
-                                                        extracted from a query result. Trino will then
-                                                        validate user password by creating LDAP context with
-                                                        user distinguished name and user password.
-======================================================= ======================================================
-
-Active Directory
-****************
-
-.. code-block:: text
-
-    ldap.group-auth-pattern=(&(objectClass=<objectclass_of_user>)(sAMAccountName=${USER})(memberof=<dn_of_the_authorized_group>))
-
-Example:
-
-.. code-block:: text
-
-    ldap.group-auth-pattern=(&(objectClass=person)(sAMAccountName=${USER})(memberof=CN=AuthorizedGroup,OU=Asia,DC=corp,DC=example,DC=com))
-
-OpenLDAP
-********
-
-.. code-block:: text
-
-    ldap.group-auth-pattern=(&(objectClass=<objectclass_of_user>)(uid=${USER})(memberof=<dn_of_the_authorized_group>))
-
-Example:
-
-.. code-block:: text
-
-    ldap.group-auth-pattern=(&(objectClass=inetOrgPerson)(uid=${USER})(memberof=CN=AuthorizedGroup,OU=Asia,DC=corp,DC=example,DC=com))
-
-For OpenLDAP, for this query to work, make sure you enable the
-``memberOf`` `overlay <http://www.openldap.org/doc/admin24/overlays.html>`_.
-
-You can use this property for scenarios where you want to authorize a user
-based on complex group authorization search queries. For example, if you want to
-authorize a user belonging to any one of multiple groups (in OpenLDAP), this
-property may be set as follows:
-
-.. code-block:: text
-
-    ldap.group-auth-pattern=(&(|(memberOf=CN=normal_group,DC=corp,DC=com)(memberOf=CN=another_group,DC=com))(objectClass=inetOrgPerson)(uid=${USER}))
-
-.. _cli_ldap:
-
-Trino CLI
-----------
-
-Environment configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-TLS configuration
-~~~~~~~~~~~~~~~~~
-
-When using LDAP authentication, access to the Trino coordinator must be through
-:doc:`TLS/HTTPS </security/tls>`.
-
-Trino CLI execution
-^^^^^^^^^^^^^^^^^^^^
-
-In addition to the options that are required when connecting to a Trino
-coordinator that does not require LDAP authentication, invoking the CLI
-with LDAP support enabled requires a number of additional command line
-options. You can either use ``--keystore-*`` or ``--truststore-*`` properties
-to secure TLS connection. The simplest way to invoke the CLI is with a
-wrapper script.
-
-.. code-block:: text
-
-    #!/bin/bash
-
-    ./trino \
-    --server https://trino-coordinator.example.com:8443 \
-    --keystore-path /tmp/trino.jks \
-    --keystore-password password \
-    --truststore-path /tmp/trino_truststore.jks \
-    --truststore-password password \
-    --catalog <catalog> \
-    --schema <schema> \
-    --user <LDAP user> \
-    --password
-
-Find details on the options used in :ref:`cli-tls` and
-:ref:`cli-username-password-auth`.
-
-Troubleshooting
----------------
-
-Java keystore file verification
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Verify the password for a keystore file and view its contents using
-:ref:`troubleshooting_keystore`.
-
-Debug Trino to LDAP server issues
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-If you need to debug issues with Trino communicating with the LDAP server,
-you can change the :ref:`log level <log-levels>` for the LDAP authenticator:
-
-.. code-block:: none
-
-    io.trino.plugin.password=DEBUG
-
-TLS debugging for Trino CLI
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If you encounter any TLS related errors when running the Trino CLI, you can run
-the CLI using the ``-Djavax.net.debug=ssl`` parameter for debugging. Use the
-Trino CLI executable JAR to enable this. For example:
-
-.. code-block:: text
-
-    java -Djavax.net.debug=ssl \
-    -jar \
-    trino-cli-<version>-executable.jar \
-    --server https://coordinator:8443 \
-    <other_cli_arguments>
-
-Common TLS/SSL errors
-~~~~~~~~~~~~~~~~~~~~~
-
-java.security.cert.CertificateException: No subject alternative names present
-*****************************************************************************
-
-This error is seen when the Trino coordinator’s certificate is invalid, and does not have the IP you provide
-in the ``--server`` argument of the CLI. You have to regenerate the coordinator's TLS certificate
-with the appropriate :abbr:`SAN (Subject Alternative Name)` added.
-
-Adding a SAN to this certificate is required in cases where ``https://`` uses IP address in the URL, rather
-than the domain contained in the coordinator's certificate, and the certificate does not contain the
-:abbr:`SAN (Subject Alternative Name)` parameter with the matching IP address as an alternative attribute.
-
-Authentication or TLS errors with JDK upgrade
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Starting with the JDK 8u181 release, to improve the robustness of LDAPS
-(secure LDAP over TLS) connections, endpoint identification algorithms were
-enabled by default. See release notes
-`from Oracle <https://www.oracle.com/technetwork/java/javase/8u181-relnotes-4479407.html#JDK-8200666.>`_.
-The same LDAP server certificate on the Trino coordinator, running on JDK
-version >= 8u181, that was previously able to successfully connect to an
-LDAPS server, may now fail with the following error:
-
-.. code-block:: text
-
-    javax.naming.CommunicationException: simple bind failed: ldapserver:636
-    [Root exception is javax.net.ssl.SSLHandshakeException: java.security.cert.CertificateException: No subject alternative DNS name matching ldapserver found.]
-
-If you want to temporarily disable endpoint identification, you can add the
-property ``-Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true``
-to Trino's ``jvm.config`` file. However, in a production environment, we
-suggest fixing the issue by regenerating the LDAP server certificate so that
-the certificate :abbr:`SAN (Subject Alternative Name)` or certificate subject
-name matches the LDAP server.
diff --git a/docs/src/main/sphinx/security/oauth2.md b/docs/src/main/sphinx/security/oauth2.md
new file mode 100644
index 000000000000..9143406977ba
--- /dev/null
+++ b/docs/src/main/sphinx/security/oauth2.md
@@ -0,0 +1,276 @@
+# OAuth 2.0 authentication
+
+Trino can be configured to enable OAuth 2.0 authentication over HTTPS for the
+Web UI and the JDBC driver. Trino uses the [Authorization Code](https://tools.ietf.org/html/rfc6749#section-1.3.1) flow which exchanges an
+Authorization Code for a token. At a high level, the flow includes the following
+steps:
+
+1. the Trino coordinator redirects a user's browser to the Authorization Server
+2. the user authenticates with the Authorization Server, and it approves the Trino's permissions request
+3. the user's browser is redirected back to the Trino coordinator with an authorization code
+4. the Trino coordinator exchanges the authorization code for a token
+
+To enable OAuth 2.0 authentication for Trino, configuration changes are made on
+the Trino coordinator. No changes are required to the worker configuration;
+only the communication from the clients to the coordinator is authenticated.
+
+Set the callback/redirect URL to `https://<trino-coordinator-domain-name>/oauth2/callback`,
+when configuring an OAuth 2.0 authorization server like an OpenID Connect (OIDC)
+provider.
+
+If Web UI is enabled, set the post-logout callback URL to
+`https://<trino-coordinator-domain-name>/ui/logout/logout.html` when configuring
+an OAuth 2.0 authentication server like an OpenID Connect (OIDC) provider.
+
+Using {doc}`TLS <tls>` and {doc}`a configured shared secret
+</security/internal-communication>` is required for OAuth 2.0 authentication.
+
+## OpenID Connect Discovery
+
+Trino supports reading Authorization Server configuration from [OIDC provider
+configuration metadata document](https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata).
+During startup of the coordinator Trino retrieves the document and uses provided
+values to set corresponding OAuth2 authentication configuration properties:
+
+- `authorization_endpoint` -> `http-server.authentication.oauth2.auth-url`
+- `token_endpoint` -> `http-server.authentication.oauth2.token-url`
+- `jwks_uri` -> `http-server.authentication.oauth2.jwks-url`
+- `userinfo_endpoint` ->  `http-server.authentication.oauth2.userinfo-url`
+- `access_token_issuer` -> `http-server.authentication.oauth2.access-token-issuer`
+- `end_session_endpoint` -> `http-server.authentication.oauth2.end-session-url`
+
+:::{warning}
+If the authorization server is issuing JSON Web Tokens (JWTs) and the
+metadata document contains `userinfo_endpoint`, Trino uses this endpoint to
+check the validity of OAuth2 access tokens. Since JWTs can be inspected
+locally, using them against `userinfo_endpoint` may result in authentication
+failure. In this case, set the
+`http-server.authentication.oauth2.oidc.use-userinfo-endpoint` configuration
+property to `false`
+(`http-server.authentication.oauth2.oidc.use-userinfo-endpoint=false`). This
+instructs Trino to ignore `userinfo_endpoint` and inspect tokens locally.
+:::
+
+This functionality is enabled by default but can be turned off with:
+`http-server.authentication.oauth2.oidc.discovery=false`.
+
+(trino-server-configuration-oauth2)=
+
+## Trino server configuration
+
+Using the OAuth2 authentication requires the Trino coordinator to be secured
+with TLS.
+
+The following is an example of the required properties that need to be added
+to the coordinator's `config.properties` file:
+
+```properties
+http-server.authentication.type=oauth2
+
+http-server.https.port=8443
+http-server.https.enabled=true
+
+http-server.authentication.oauth2.issuer=https://authorization-server.com
+http-server.authentication.oauth2.client-id=CLIENT_ID
+http-server.authentication.oauth2.client-secret=CLIENT_SECRET
+```
+
+To enable OAuth 2.0 authentication for the Web UI, the following
+property must be be added:
+
+```properties
+web-ui.authentication.type=oauth2
+```
+
+The following configuration properties are available:
+
+:::{list-table} OAuth2 configuration properties
+:widths: 40 60
+:header-rows: 1
+
+* - Property
+  - Description
+* - `http-server.authentication.type`
+  - The type of authentication to use. Must  be set to `oauth2` to enable OAuth2
+    authentication for the Trino coordinator.
+* - `http-server.authentication.oauth2.issuer`
+  - The issuer URL of the IdP. All issued tokens must have this in the `iss`
+    field.
+* - `http-server.authentication.oauth2.access-token-issuer`
+  - The issuer URL of the IdP for access tokens, if different. All issued access
+    tokens must have this in the `iss` field. Providing this value while OIDC
+    discovery is enabled overrides the value from the OpenID provider metadata
+    document. Defaults to the value of
+    `http-server.authentication.oauth2.issuer`.
+* - `http-server.authentication.oauth2.auth-url`
+  - The authorization URL. The URL a user's browser will be redirected to in
+    order to begin the OAuth 2.0 authorization process. Providing this value
+    while OIDC discovery is enabled overrides the value from the OpenID provider
+    metadata document.
+* - `http-server.authentication.oauth2.token-url`
+  - The URL of the endpoint on the authorization server which Trino uses to
+    obtain an access token. Providing this value while OIDC discovery is enabled
+    overrides the value from the OpenID provider metadata document.
+* - `http-server.authentication.oauth2.jwks-url`
+  - The URL of the JSON Web Key Set (JWKS) endpoint on the authorization server.
+    It provides Trino the set of keys containing the public key to verify any
+    JSON Web Token (JWT) from the authorization server. Providing this value
+    while OIDC discovery is enabled overrides the value from the OpenID provider
+    metadata document.
+* - `http-server.authentication.oauth2.userinfo-url`
+  - The URL of the IdPs `/userinfo` endpoint. If supplied then this URL is used
+    to validate the OAuth access token and retrieve any associated claims. This
+    is required if the IdP issues opaque tokens. Providing this value while OIDC
+    discovery is enabled overrides the value from the OpenID provider metadata
+    document.
+* - `http-server.authentication.oauth2.client-id`
+  - The public identifier of the Trino client.
+* - `http-server.authentication.oauth2.client-secret`
+  - The secret used to authorize Trino client with the authorization server.
+* - `http-server.authentication.oauth2.additional-audiences`
+  - Additional audiences to trust in addition to the client ID which is
+    always a trusted audience.
+* - `http-server.authentication.oauth2.scopes`
+  - Scopes requested by the server during the authorization challenge. See:
+    https://tools.ietf.org/html/rfc6749#section-3.3
+* - `http-server.authentication.oauth2.challenge-timeout`
+  - Maximum [duration](prop-type-duration) of the authorization challenge.
+    Default is `15m`.
+* - `http-server.authentication.oauth2.state-key`
+  - A secret key used by the SHA-256 [HMAC](https://tools.ietf.org/html/rfc2104)
+    algorithm to sign the state parameter in order to ensure that the
+    authorization request was not forged. Default is a random string generated
+    during the coordinator start.
+* - `http-server.authentication.oauth2.user-mapping.pattern`
+  - Regex to match against user. If matched, the user name is replaced with
+    first regex group. If not matched, authentication is denied.  Default is
+    `(.*)` which allows any user name.
+* - `http-server.authentication.oauth2.user-mapping.file`
+  - File containing rules for mapping user. See [](/security/user-mapping) for
+    more information.
+* - `http-server.authentication.oauth2.principal-field`
+  - The field of the access token used for the Trino user principal. Defaults to
+    `sub`. Other commonly used fields include `sAMAccountName`, `name`,
+    `upn`, and `email`.
+* - `http-server.authentication.oauth2.oidc.discovery`
+  - Enable reading the [OIDC provider metadata](https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata).
+    Default is `true`.
+* - `http-server.authentication.oauth2.oidc.discovery.timeout`
+  - The timeout when reading OpenID provider metadata. Default is `30s`.
+* - `http-server.authentication.oauth2.oidc.use-userinfo-endpoint`
+  - Use the value of `userinfo_endpoint` in the [provider
+    metadata](https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata).
+    When a `userinfo_endpoint` value is supplied this URL is used to validate
+    the OAuth 2.0 access token, and retrieve any associated claims. This flag
+    allows ignoring the value provided in the metadata document. Default is
+    `true`.
+* - `http-server.authentication.oauth2.end-session-url`
+  - The URL of the endpoint on the authentication server to which the user's
+    browser is redirected to so that End-User is logged out from the
+    authentication server when logging out from Trino.
+:::
+
+(trino-oauth2-refresh-tokens)=
+
+### Refresh tokens
+
+*Refresh tokens* allow you to securely control the length of user sessions
+within applications. The refresh token has a longer lifespan (TTL) and is used
+to refresh the *access token* that has a shorter lifespan. When refresh tokens
+are used in conjunction with access tokens, users can remain logged in for an
+extended duration without interruption by another login request.
+
+In a refresh token flow, there are three tokens with different expiration times:
+
+- access token
+- refresh token
+- Trino-encrypted token that is a combination of the access and refresh tokens.
+  The encrypted token manages the session lifetime with the timeout value that
+  is set with the
+  `http-server.authentication.oauth2.refresh-tokens.issued-token.timeout`
+  property.
+
+In the following scenario, the lifespan of the tokens issued by an IdP are:
+
+- access token 5m
+- refresh token 24h
+
+Because the access token lifespan is only five minutes, Trino uses the longer
+lifespan refresh token to request another access token every five minutes on
+behalf of a user. In this case, the maximum
+`http-server.authentication.oauth2.refresh-tokens.issued-token.timeout` is
+twenty-four hours.
+
+To use refresh token flows, the following property must be
+enabled in the coordinator configuration.
+
+```properties
+http-server.authentication.oauth2.refresh-tokens=true
+```
+
+Additional scopes for offline access might be required, depending on
+IdP configuration.
+
+```properties
+http-server.authentication.oauth2.scopes=openid,offline_access [or offline]
+```
+
+The following configuration properties are available:
+
+:::{list-table} OAuth2 configuration properties for refresh flow
+:widths: 40 60
+:header-rows: 1
+
+* - Property
+  - Description
+* - `http-server.authentication.oauth2.refresh-tokens.issued-token.timeout`
+  - Expiration time for an issued token, which is the Trino-encrypted token that
+    contains an access token and a refresh token. The timeout value must be less
+    than or equal to the [duration](prop-type-duration) of the refresh token
+    expiration issued by the IdP. Defaults to `1h`. The timeout value is the
+    maximum session time for an OAuth2-authenticated client with refresh tokens
+    enabled. For more details, see [](trino-oauth2-troubleshooting).
+* - `http-server.authentication.oauth2.refresh-tokens.issued-token.issuer`
+  - Issuer representing the coordinator instance, that is referenced in the
+    issued token, defaults to `Trino_coordinator`. The current Trino version is
+    appended to the value. This is mainly used for debugging purposes.
+* - `http-server.authentication.oauth2.refresh-tokens.issued-token.audience`
+  - Audience representing this coordinator instance, that is used in the
+    issued token. Defaults to `Trino_coordinator`.
+* - `http-server.authentication.oauth2.refresh-tokens.secret-key`
+  - Base64-encoded secret key used to encrypt the generated token. By default
+    it's generated during startup.
+:::
+
+(trino-oauth2-troubleshooting)=
+
+## Troubleshooting
+
+To debug issues, change the {ref}`log level <log-levels>` for the OAuth 2.0
+authenticator:
+
+```none
+io.trino.server.security.oauth2=DEBUG
+```
+
+To debug issues with OAuth 2.0 authentication use with the web UI, set the
+following configuration property:
+
+```none
+io.trino.server.ui.OAuth2WebUiAuthenticationFilter=DEBUG
+```
+
+This assumes the OAuth 2.0 authentication for the Web UI is enabled as described
+in {ref}`trino-server-configuration-oauth2`.
+
+The logged debug error for a lapsed refresh token is `Tokens refresh challenge
+has failed`.
+
+:::{warning}
+If a refresh token lapses, the user session is interrupted and the user must
+reauthenticate by logging in again. Ensure you set the
+`http-server.authentication.oauth2.refresh-tokens.issued-token.timeout`
+value to less than or equal to the duration of the refresh token expiration
+issued by your IdP. Optimally, the timeout should be slightly less than the
+refresh token lifespan of your IdP to ensure that sessions end gracefully.
+:::
diff --git a/docs/src/main/sphinx/security/oauth2.rst b/docs/src/main/sphinx/security/oauth2.rst
deleted file mode 100644
index caff7fb8c87b..000000000000
--- a/docs/src/main/sphinx/security/oauth2.rst
+++ /dev/null
@@ -1,213 +0,0 @@
-========================
-OAuth 2.0 authentication
-========================
-
-Trino can be configured to enable OAuth 2.0 authentication over HTTPS for the
-Web UI and the JDBC driver. Trino uses the `Authorization Code
-<https://tools.ietf.org/html/rfc6749#section-1.3.1>`_ flow which exchanges an
-Authorization Code for a token. At a high level, the flow includes the following
-steps:
-
-#. the Trino coordinator redirects a user's browser to the Authorization Server
-#. the user authenticates with the Authorization Server, and it approves the Trino's permissions request
-#. the user's browser is redirected back to the Trino coordinator with an authorization code
-#. the Trino coordinator exchanges the authorization code for a token
-
-To enable OAuth 2.0 authentication for Trino, configuration changes are made on
-the Trino coordinator. No changes are required to the worker configuration;
-only the communication from the clients to the coordinator is authenticated.
-
-Set the callback/redirect URL to ``https://<trino-coordinator-domain-name>/oauth2/callback``,
-when configuring an OAuth 2.0 authorization server like an OpenID Connect (OIDC)
-provider.
-
-Using :doc:`TLS <tls>` and :doc:`a configured shared secret
-</security/internal-communication>` is required for OAuth 2.0 authentication.
-
-OpenID Connect Discovery
-------------------------
-
-Trino supports reading Authorization Server configuration from `OIDC provider
-configuration metadata document
-<https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata>`_.
-During startup of the coordinator Trino retrieves the document and uses provided
-values to set corresponding OAuth2 authentication configuration properties:
-
-* ``authorization_endpoint`` -> ``http-server.authentication.oauth2.auth-url``
-* ``token_endpoint`` -> ``http-server.authentication.oauth2.token-url``
-* ``jwks_uri`` -> ``http-server.authentication.oauth2.jwks-url``
-* ``userinfo_endpoint`` ->  ``http-server.authentication.oauth2.userinfo-url``
-* ``access_token_issuer`` -> ``http-server.authentication.oauth2.access-token-issuer``
-
-.. warning::
-
-  If the authorization server is issuing JSON Web Tokens (JWTs) and the
-  metadata document contains ``userinfo_endpoint``, Trino uses this endpoint to
-  check the validity of OAuth2 access tokens. Since JWTs can be inspected
-  locally, using them against ``userinfo_endpoint`` may result in authentication
-  failure. In this case, set the
-  ``http-server.authentication.oauth2.oidc.use-userinfo-endpoint`` configuration
-  property to ``false``
-  (``http-server.authentication.oauth2.oidc.use-userinfo-endpoint=false``). This
-  instructs Trino to ignore ``userinfo_endpoint`` and inspect tokens locally.
-
-This functionality is enabled by default but can be turned off with:
-``http-server.authentication.oauth2.oidc.discovery=false``.
-
-Trino server configuration
---------------------------
-
-Using the OAuth2 authentication requires the Trino coordinator to be secured
-with TLS.
-
-The following is an example of the required properties that need to be added
-to the coordinator's ``config.properties`` file:
-
-.. code-block:: properties
-
-    http-server.authentication.type=oauth2
-
-    http-server.https.port=8443
-    http-server.https.enabled=true
-
-    http-server.authentication.oauth2.issuer=https://authorization-server.com
-    http-server.authentication.oauth2.client-id=CLIENT_ID
-    http-server.authentication.oauth2.client-secret=CLIENT_SECRET
-
-In order to enable OAuth 2.0 authentication for the Web UI, the following
-properties need to be added:
-
-.. code-block:: properties
-
-    web-ui.authentication.type=oauth2
-
-The following configuration properties are available:
-
-.. list-table:: OAuth2 configuration properties
-   :widths: 40 60
-   :header-rows: 1
-
-   * - Property
-     - Description
-   * - ``http-server.authentication.type``
-     - The type of authentication to use. Must  be set to ``oauth2`` to enable
-       OAuth2 authentication for the Trino coordinator.
-   * - ``http-server.authentication.oauth2.issuer``
-     - The issuer URL of the IdP. All issued tokens must have this in the ``iss`` field.
-   * - ``http-server.authentication.oauth2.access-token-issuer``
-     - The issuer URL of the IdP for access tokens, if different.
-       All issued access tokens must have this in the ``iss`` field.
-       Providing this value while OIDC discovery is enabled overrides the value
-       from the OpenID provider metadata document.
-       Defaults to the value of ``http-server.authentication.oauth2.issuer``.
-   * - ``http-server.authentication.oauth2.auth-url``
-     - The authorization URL. The URL a user's browser will be redirected to in
-       order to begin the OAuth 2.0 authorization process. Providing this value
-       while OIDC discovery is enabled overrides the value from the OpenID
-       provider metadata document.
-   * - ``http-server.authentication.oauth2.token-url``
-     - The URL of the endpoint on the authorization server which Trino uses to
-       obtain an access token. Providing this value while OIDC discovery is
-       enabled overrides the value from the OpenID provider metadata document.
-   * - ``http-server.authentication.oauth2.jwks-url``
-     - The URL of the JSON Web Key Set (JWKS) endpoint on the authorization
-       server. It provides Trino the set of keys containing the public key
-       to verify any JSON Web Token (JWT) from the authorization server.
-       Providing this value while OIDC discovery is enabled overrides the value
-       from the OpenID provider metadata document.
-   * - ``http-server.authentication.oauth2.userinfo-url``
-     - The URL of the IdPs ``/userinfo`` endpoint. If supplied then this URL is
-       used to validate the OAuth access token and retrieve any associated
-       claims. This is required if the IdP issues opaque tokens. Providing this
-       value while OIDC discovery is enabled overrides the value from the OpenID
-       provider metadata document.
-   * - ``http-server.authentication.oauth2.client-id``
-     - The public identifier of the Trino client.
-   * - ``http-server.authentication.oauth2.client-secret``
-     - The secret used to authorize Trino client with the authorization server.
-   * - ``http-server.authentication.oauth2.additional-audiences``
-     - Additional audiences to trust in addition to the client ID which is
-       always a trusted audience.
-   * - ``http-server.authentication.oauth2.scopes``
-     - Scopes requested by the server during the authorization challenge. See:
-       https://tools.ietf.org/html/rfc6749#section-3.3
-   * - ``http-server.authentication.oauth2.challenge-timeout``
-     - Maximum duration of the authorization challenge. Default is ``15m``.
-   * - ``http-server.authentication.oauth2.state-key``
-     - A secret key used by the SHA-256
-       `HMAC <https://tools.ietf.org/html/rfc2104>`_
-       algorithm to sign the state parameter in order to ensure that the
-       authorization request was not forged. Default is a random string
-       generated during the coordinator start.
-   * - ``http-server.authentication.oauth2.user-mapping.pattern``
-     - Regex to match against user. If matched, the user name is replaced with
-       first regex group. If not matched, authentication is denied.  Default is
-       ``(.*)`` which allows any user name.
-   * - ``http-server.authentication.oauth2.user-mapping.file``
-     - File containing rules for mapping user. See :doc:`/security/user-mapping`
-       for more information.
-   * - ``http-server.authentication.oauth2.principal-field``
-     - The field of the access token used for the Trino user principal. Defaults to ``sub``. Other commonly used fields include ``sAMAccountName``, ``name``, ``upn``, and ``email``.
-   * - ``http-server.authentication.oauth2.oidc.discovery``
-     - Enable reading the `OIDC provider metadata <https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata>`_.
-       Default is ``true``.
-   * - ``http-server.authentication.oauth2.oidc.discovery.timeout``
-     - The timeout when reading OpenID provider metadata. Default is ``30s``.
-   * - ``http-server.authentication.oauth2.oidc.use-userinfo-endpoint``
-     - Use the value of ``userinfo_endpoint`` `in the provider metadata <https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata>`_.
-       When a ``userinfo_endpoint`` value is supplied this URL is used to
-       validate the OAuth 2.0 access token, and retrieve any associated claims.
-       This flag allows ignoring the value provided in the metadata document.
-       Default is ``true``.
-
-Refresh tokens
-^^^^^^^^^^^^^^
-
-In order to start using refresh tokens flows, the following property must be
-enabled in the coordinator configuration.
-
-.. code-block:: properties
-
-    http-server.authentication.oauth2.refresh-tokens=true
-
-Additional scopes for offline access might be required, depending on
-IdP configuration.
-
-.. code-block:: properties
-
-    http-server.authentication.oauth2.scopes=openid,offline_access [or offline]
-
-The following configuration properties are available:
-
-.. list-table:: OAuth2 configuration properties for refresh flow
-   :widths: 40 60
-   :header-rows: 1
-
-   * - Property
-     - Description
-   * - ``http-server.authentication.oauth2.refresh-tokens.issued-token.timeout``
-     - Expiration time for issued token. Value must be less than or equal to
-       the duration of the refresh token expiration issued by the IdP.
-       Defaults to ``1h``.
-   * - ``http-server.authentication.oauth2.refresh-tokens.issued-token.issuer``
-     - Issuer representing the coordinator instance, that is referenced in the
-       issued token, defaults to ``Trino_coordinator``. The current
-       Trino version is appended to the value. This is mainly used for
-       debugging purposes.
-   * - ``http-server.authentication.oauth2.refresh-tokens.issued-token.audience``
-     - Audience representing this coordinator instance, that is used in the
-       issued token. Defaults to ``Trino_coordinator``.
-   * - ``http-server.authentication.oauth2.refresh-tokens.secret-key``
-     - Base64-encoded secret key used to encrypt the generated token.
-       By default it's generated during startup.
-
-
-Troubleshooting
----------------
-
-If you need to debug issues with Trino OAuth 2.0 configuration you can change
-the :ref:`log level <log-levels>` for the OAuth 2.0 authenticator:
-
-.. code-block:: none
-
-    io.trino.server.security.oauth2=DEBUG
diff --git a/docs/src/main/sphinx/security/overview.md b/docs/src/main/sphinx/security/overview.md
new file mode 100644
index 000000000000..1d82479a81bb
--- /dev/null
+++ b/docs/src/main/sphinx/security/overview.md
@@ -0,0 +1,161 @@
+# Security overview
+
+After the initial {doc}`installation </installation>` of your cluster, security
+is the next major concern for successfully operating Trino. This overview
+provides an introduction to different aspects of configuring security for your
+Trino cluster.
+
+## Aspects of configuring security
+
+The default installation of Trino has no security features enabled. Security
+can be enabled for different parts of the Trino architecture:
+
+- {ref}`security-client`
+- {ref}`security-inside-cluster`
+- {ref}`security-data-sources`
+
+## Suggested configuration workflow
+
+To configure security for a new Trino cluster, follow this best practice
+order of steps. Do not skip or combine steps.
+
+1. **Enable** {doc}`TLS/HTTPS </security/tls>`
+
+   - Work with your security team.
+   - Use a {ref}`load balancer or proxy <https-load-balancer>` to terminate
+     HTTPS, if possible.
+   - Use a globally trusted TLS certificate.
+
+   {ref}`Verify this step is working correctly.<verify-tls>`
+
+2. **Configure** a {doc}`a shared secret </security/internal-communication>`
+
+   {ref}`Verify this step is working correctly.<verify-secrets>`
+
+3. **Enable authentication**
+
+   - Start with {doc}`password file authentication <password-file>` to get up
+     and running.
+   - Then configure your preferred authentication provider, such as {doc}`LDAP
+     </security/ldap>`.
+   - Avoid the complexity of Kerberos for client authentication, if possible.
+
+   {ref}`Verify this step is working correctly.<verify-authentication>`
+
+4. **Enable authorization and access control**
+
+   - Start with {doc}`file-based rules <file-system-access-control>`.
+   - Then configure another access control method as required.
+
+   {ref}`Verify this step is working correctly. <verify-rules>`
+
+Configure one step at a time. Always restart the Trino server after each
+change, and verify the results before proceeding.
+
+(security-client)=
+
+## Securing client access to the cluster
+
+Trino {doc}`clients </client>` include the Trino {doc}`CLI </client/cli>`,
+the {doc}`Web UI </admin/web-interface>`, the {doc}`JDBC driver
+</client/jdbc>`, [Python, Go, or other clients](https://trino.io/resources.html), and any applications using these tools.
+
+All access to the Trino cluster is managed by the coordinator. Thus, securing
+access to the cluster means securing access to the coordinator.
+
+There are three aspects to consider:
+
+- {ref}`cl-access-encrypt`: protecting the integrity of client to server
+  communication in transit.
+- {ref}`cl-access-auth`: identifying users and user name management.
+- {ref}`cl-access-control`: validating each user's access rights.
+
+(cl-access-encrypt)=
+
+### Encryption
+
+The Trino server uses the standard {doc}`HTTPS protocol and TLS encryption
+<tls>`, formerly known as SSL.
+
+(cl-access-auth)=
+
+### Authentication
+
+Trino supports several authentication providers. When setting up a new cluster,
+start with simple password file authentication before configuring another
+provider.
+
+- {doc}`Password file authentication <password-file>`
+- {doc}`LDAP authentication <ldap>`
+- {doc}`Salesforce authentication <salesforce>`
+- {doc}`OAuth 2.0 authentication <oauth2>`
+- {doc}`Certificate authentication <certificate>`
+- {doc}`JSON Web Token (JWT) authentication <jwt>`
+- {doc}`Kerberos authentication <kerberos>`
+
+(user-name-management)=
+
+#### User name management
+
+Trino provides ways to map the user and group names from authentication
+providers to Trino user names.
+
+- {doc}`User mapping <user-mapping>` applies to all authentication systems,
+  and allows for regular expression rules to be specified that map complex user
+  names from other systems (`alice@example.com`) to simple user names
+  (`alice`).
+- {doc}`File group provider <group-file>` provides a way to assign a set
+  of user names to a group name to ease access control.
+
+(cl-access-control)=
+
+### Authorization and access control
+
+Trino's {doc}`default method of access control <built-in-system-access-control>`
+allows all operations for all authenticated users.
+
+To implement access control, use:
+
+- {doc}`File-based system access control <file-system-access-control>`, where
+  you configure JSON files that specify fine-grained user access restrictions at
+  the catalog, schema, or table level.
+
+In addition, Trino {doc}`provides an API </develop/system-access-control>` that
+allows you to create a custom access control method, or to extend an existing
+one.
+
+Access control can limit access to columns of a table. The default behavior
+of a query to all columns with a `SELECT *` statement is to show an error
+denying access to any inaccessible columns.
+
+You can change this behavior to silently hide inaccessible columns with the
+global property `hide-inaccessible-columns` configured in
+{ref}`config-properties`:
+
+```properties
+hide-inaccessible-columns = true
+```
+
+(security-inside-cluster)=
+
+## Securing inside the cluster
+
+You can {doc}`secure the internal communication <internal-communication>`
+between coordinator and workers inside the clusters.
+
+Secrets in properties files, such as passwords in catalog files, can be secured
+with {doc}`secrets management <secrets>`.
+
+(security-data-sources)=
+
+## Securing cluster access to data sources
+
+Communication between the Trino cluster and data sources is configured for each
+catalog. Each catalog uses a connector, which supports a variety of
+security-related configurations.
+
+More information is available with the documentation for individual
+{doc}`connectors </connector>`.
+
+{doc}`Secrets management <secrets>` can be used for the catalog properties files
+content.
diff --git a/docs/src/main/sphinx/security/overview.rst b/docs/src/main/sphinx/security/overview.rst
deleted file mode 100644
index 0c7cce75c81a..000000000000
--- a/docs/src/main/sphinx/security/overview.rst
+++ /dev/null
@@ -1,174 +0,0 @@
-=================
-Security overview
-=================
-
-After the initial :doc:`installation </installation>` of your cluster, security
-is the next major concern for successfully operating Trino. This overview
-provides an introduction to different aspects of configuring security for your
-Trino cluster.
-
-Aspects of configuring security
--------------------------------
-
-The default installation of Trino has no security features enabled. Security
-can be enabled for different parts of the Trino architecture:
-
-* :ref:`security-client`
-* :ref:`security-inside-cluster`
-* :ref:`security-data-sources`
-
-Suggested configuration workflow
---------------------------------
-
-To configure security for a new Trino cluster, follow this best practice
-order of steps. Do not skip or combine steps.
-
-#. **Enable** :doc:`TLS/HTTPS </security/tls>`
-
-   * Work with your security team.
-   * Use a :ref:`load balancer or proxy <https-load-balancer>` to terminate
-     HTTPS, if possible.
-   * Use a globally trusted TLS certificate.
-
-   :ref:`Verify this step is working correctly.<verify_tls>`
-
-#. **Configure** a :doc:`a shared secret </security/internal-communication>`
-
-   :ref:`Verify this step is working correctly.<verify_secrets>`
-
-#. **Enable authentication**
-
-   * Start with :doc:`password file authentication <password-file>` to get up
-     and running.
-   * Then configure your preferred authentication provider, such as :doc:`LDAP
-     </security/ldap>`.
-   * Avoid the complexity of Kerberos for client authentication, if possible.
-
-   :ref:`Verify this step is working correctly.<verify_authentication>`
-
-#. **Enable authorization and access control**
-
-   * Start with :doc:`file-based rules <file-system-access-control>`.
-   * Then configure another access control method as required.
-
-   :ref:`Verify this step is working correctly. <verify_rules>`
-
-Configure one step at a time. Always restart the Trino server after each
-change, and verify the results before proceeding.
-
-.. _security-client:
-
-Securing client access to the cluster
--------------------------------------
-
-Trino :doc:`clients </client>` include the Trino :doc:`CLI </client/cli>`,
-the :doc:`Web UI </admin/web-interface>`, the :doc:`JDBC driver
-</client/jdbc>`, `Python, Go, or other clients
-<https://trino.io/resources.html>`_, and any applications using these tools.
-
-All access to the Trino cluster is managed by the coordinator. Thus, securing
-access to the cluster means securing access to the coordinator.
-
-There are three aspects to consider:
-
-* :ref:`cl-access-encrypt`: protecting the integrity of client to server
-  communication in transit.
-* :ref:`cl-access-auth`: identifying users and user name management.
-* :ref:`cl-access-control`: validating each user's access rights.
-
-.. _cl-access-encrypt:
-
-Encryption
-^^^^^^^^^^
-
-The Trino server uses the standard :doc:`HTTPS protocol and TLS encryption
-<tls>`, formerly known as SSL.
-
-.. _cl-access-auth:
-
-Authentication
-^^^^^^^^^^^^^^
-
-Trino supports several authentication providers. When setting up a new cluster,
-start with simple password file authentication before configuring another
-provider.
-
-* :doc:`Password file authentication <password-file>`
-* :doc:`LDAP authentication <ldap>`
-* :doc:`Salesforce authentication <salesforce>`
-* :doc:`OAuth 2.0 authentication <oauth2>`
-* :doc:`Certificate authentication <certificate>`
-* :doc:`JSON Web Token (JWT) authentication <jwt>`
-* :doc:`Kerberos authentication <kerberos>`
-
-.. _user-name-management:
-
-User name management
-""""""""""""""""""""
-
-Trino provides ways to map the user and group names from authentication
-providers to Trino user names.
-
-* :doc:`User mapping <user-mapping>` applies to all authentication systems,
-  and allows for regular expression rules to be specified that map complex user
-  names from other systems (``alice@example.com``) to simple user names
-  (``alice``).
-* :doc:`File group provider <group-file>` provides a way to assign a set
-  of user names to a group name to ease access control.
-
-.. _cl-access-control:
-
-Authorization and access control
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Trino's :doc:`default method of access control <built-in-system-access-control>`
-allows all operations for all authenticated users.
-
-To implement access control, use:
-
-* :doc:`File-based system access control <file-system-access-control>`, where
-  you configure JSON files that specify fine-grained user access restrictions at
-  the catalog, schema, or table level.
-
-In addition, Trino :doc:`provides an API </develop/system-access-control>` that
-allows you to create a custom access control method, or to extend an existing
-one.
-
-Access control can limit access to columns of a table. The default behavior
-of a query to all columns with a ``SELECT *`` statement is to show an error
-denying access to any inaccessible columns.
-
-You can change this behavior to silently hide inaccessible columns with the
-global property ``hide-inaccessible-columns`` configured in
-:ref:`config_properties`:
-
-.. code-block:: properties
-
-    hide-inaccessible-columns = true
-
-.. _security-inside-cluster:
-
-Securing inside the cluster
----------------------------
-
-You can :doc:`secure the internal communication <internal-communication>`
-between coordinator and workers inside the clusters.
-
-Secrets in properties files, such as passwords in catalog files, can be secured
-with :doc:`secrets management <secrets>`.
-
-.. _security-data-sources:
-
-Securing cluster access to data sources
----------------------------------------
-
-Communication between the Trino cluster and data sources is configured for each
-catalog. Each catalog uses a connector, which supports a variety of
-security-related configurations.
-
-More information is available with the documentation for individual
-:doc:`connectors </connector>`.
-
-:doc:`Secrets management <secrets>` can be used for the catalog properties files
-content.
-
diff --git a/docs/src/main/sphinx/security/password-file.md b/docs/src/main/sphinx/security/password-file.md
new file mode 100644
index 000000000000..7d2d0b576b2b
--- /dev/null
+++ b/docs/src/main/sphinx/security/password-file.md
@@ -0,0 +1,120 @@
+# Password file authentication
+
+Trino can be configured to enable frontend password authentication over
+HTTPS for clients, such as the CLI, or the JDBC and ODBC drivers. The
+username and password are validated against usernames and passwords stored
+in a file.
+
+Password file authentication is very similar to {doc}`ldap`. Please see
+the LDAP documentation for generic instructions on configuring the server
+and clients to use TLS and authenticate with a username and password.
+
+Using {doc}`TLS <tls>` and {doc}`a configured shared secret
+</security/internal-communication>` is required for password file
+authentication.
+
+## Password authenticator configuration
+
+To enable password file authentication, set the {doc}`password authentication
+type <authentication-types>` in `etc/config.properties`:
+
+```properties
+http-server.authentication.type=PASSWORD
+```
+
+In addition, create a `etc/password-authenticator.properties` file on the
+coordinator with the `file` authenticator name:
+
+```text
+password-authenticator.name=file
+file.password-file=/path/to/password.db
+```
+
+The following configuration properties are available:
+
+| Property                         | Description                                                       |
+| -------------------------------- | ----------------------------------------------------------------- |
+| `file.password-file`             | Path of the password file.                                        |
+| `file.refresh-period`            | How often to reload the password file. Defaults to `5s`.          |
+| `file.auth-token-cache.max-size` | Max number of cached authenticated passwords. Defaults to `1000`. |
+
+## Password files
+
+### File format
+
+The password file contains a list of usernames and passwords, one per line,
+separated by a colon. Passwords must be securely hashed using bcrypt or PBKDF2.
+
+bcrypt passwords start with `$2y$` and must use a minimum cost of `8`:
+
+```text
+test:$2y$10$BqTb8hScP5DfcpmHo5PeyugxHz5Ky/qf3wrpD7SNm8sWuA3VlGqsa
+```
+
+PBKDF2 passwords are composed of the iteration count, followed by the
+hex encoded salt and hash:
+
+```text
+test:1000:5b4240333032306164:f38d165fce8ce42f59d366139ef5d9e1ca1247f0e06e503ee1a611dd9ec40876bb5edb8409f5abe5504aab6628e70cfb3d3a18e99d70357d295002c3d0a308a0
+```
+
+### Creating a password file
+
+Password files utilizing the bcrypt format can be created using the
+[htpasswd](https://httpd.apache.org/docs/current/programs/htpasswd.html)
+utility from the [Apache HTTP Server](https://httpd.apache.org/).
+The cost must be specified, as Trino enforces a higher minimum cost
+than the default.
+
+Create an empty password file to get started:
+
+```text
+touch password.db
+```
+
+Add or update the password for the user `test`:
+
+```text
+htpasswd -B -C 10 password.db test
+```
+
+(verify-authentication)=
+
+### Verify configuration
+
+To verify password file authentication, log in to the {doc}`Web UI
+</admin/web-interface>`, and connect with the Trino {doc}`CLI </client/cli>` to
+the cluster:
+
+- Connect to the Web UI from your browser using a URL that uses HTTPS, such as
+  `https://trino.example.com:8443`. Enter a username in the `Username` text
+  box and the corresponding password in the `Password` text box, and log in to
+  the UI. Confirm that you are not able to log in using an incorrect username
+  and password combination. A successful login displays the username in the
+  top right corner of the UI.
+- Connect with the Trino CLI using a URL that uses HTTPS, such as
+  `https://trino.example.net:8443` with the addition of the `--user` and
+  `--password` properties:
+
+```text
+./trino --server https://trino.example.com:8443 --user test --password
+```
+
+The above command quotes you for a password. Supply the password set for the
+user entered for the `--user` property to use the `trino>` prompt. Sucessful
+authentication allows you to run queries from the CLI.
+
+To test the connection, send a query:
+
+```text
+trino> SELECT 'rocks' AS trino;
+
+trino
+-------
+rocks
+(1 row)
+
+Query 20220919_113804_00017_54qfi, FINISHED, 1 node
+Splits: 1 total, 1 done (100.00%)
+0.12 [0 rows, 0B] [0 rows/s, 0B/s]
+```
diff --git a/docs/src/main/sphinx/security/password-file.rst b/docs/src/main/sphinx/security/password-file.rst
deleted file mode 100644
index 18c59aad578a..000000000000
--- a/docs/src/main/sphinx/security/password-file.rst
+++ /dev/null
@@ -1,134 +0,0 @@
-============================
-Password file authentication
-============================
-
-Trino can be configured to enable frontend password authentication over
-HTTPS for clients, such as the CLI, or the JDBC and ODBC drivers. The
-username and password are validated against usernames and passwords stored
-in a file.
-
-Password file authentication is very similar to :doc:`ldap`. Please see
-the LDAP documentation for generic instructions on configuring the server
-and clients to use TLS and authenticate with a username and password.
-
-Using :doc:`TLS <tls>` and :doc:`a configured shared secret
-</security/internal-communication>` is required for password file
-authentication.
-
-Password authenticator configuration
-------------------------------------
-
-To enable password file authentication, set the :doc:`password authentication
-type <authentication-types>` in ``etc/config.properties``:
-
-.. code-block:: properties
-
-    http-server.authentication.type=PASSWORD
-
-In addition, create a ``etc/password-authenticator.properties`` file on the
-coordinator with the ``file`` authenticator name:
-
-.. code-block:: text
-
-    password-authenticator.name=file
-    file.password-file=/path/to/password.db
-
-The following configuration properties are available:
-
-==================================== ==============================================
-Property                             Description
-==================================== ==============================================
-``file.password-file``               Path of the password file.
-
-``file.refresh-period``              How often to reload the password file.
-                                     Defaults to ``5s``.
-
-``file.auth-token-cache.max-size``   Max number of cached authenticated passwords.
-                                     Defaults to ``1000``.
-==================================== ==============================================
-
-Password files
---------------
-
-File format
-^^^^^^^^^^^
-
-The password file contains a list of usernames and passwords, one per line,
-separated by a colon. Passwords must be securely hashed using bcrypt or PBKDF2.
-
-bcrypt passwords start with ``$2y$`` and must use a minimum cost of ``8``:
-
-.. code-block:: text
-
-    test:$2y$10$BqTb8hScP5DfcpmHo5PeyugxHz5Ky/qf3wrpD7SNm8sWuA3VlGqsa
-
-PBKDF2 passwords are composed of the iteration count, followed by the
-hex encoded salt and hash:
-
-.. code-block:: text
-
-    test:1000:5b4240333032306164:f38d165fce8ce42f59d366139ef5d9e1ca1247f0e06e503ee1a611dd9ec40876bb5edb8409f5abe5504aab6628e70cfb3d3a18e99d70357d295002c3d0a308a0
-
-Creating a password file
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-Password files utilizing the bcrypt format can be created using the
-`htpasswd <https://httpd.apache.org/docs/current/programs/htpasswd.html>`_
-utility from the `Apache HTTP Server <https://httpd.apache.org/>`_.
-The cost must be specified, as Trino enforces a higher minimum cost
-than the default.
-
-Create an empty password file to get started:
-
-.. code-block:: text
-
-    touch password.db
-
-Add or update the password for the user ``test``:
-
-.. code-block:: text
-
-    htpasswd -B -C 10 password.db test
-
-.. _verify_authentication:
-
-Verify configuration
-^^^^^^^^^^^^^^^^^^^^
-
-To verify password file authentication, log in to the :doc:`Web UI
-</admin/web-interface>`, and connect with the Trino :doc:`CLI </client/cli>` to
-the cluster:
-
-* Connect to the Web UI from your browser using a URL that uses HTTPS, such as
-  ``https://trino.example.com:8443``. Enter a username in the ``Username`` text
-  box and the corresponding password in the ``Password`` text box, and log in to
-  the UI. Confirm that you are not able to log in using an incorrect username
-  and password combination. A successful login displays the username in the
-  top right corner of the UI.
-
-* Connect with the Trino CLI using a URL that uses HTTPS, such as
-  ``https://trino.example.net:8443`` with the addition of the ``--user`` and
-  ``--password`` properties:
-
-.. code-block:: text
-
-    ./trino --server https://trino.example.com:8443 --user test --password
-
-The above command quotes you for a password. Supply the password set for the
-user entered for the ``--user`` property to use the ``trino>`` prompt. Sucessful
-authentication allows you to run queries from the CLI.
-
-To test the connection, send a query:
-
-.. code-block:: text
-
-  trino> SELECT 'rocks' AS trino;
-
-  trino
-  -------
-  rocks
-  (1 row)
-
-  Query 20220919_113804_00017_54qfi, FINISHED, 1 node
-  Splits: 1 total, 1 done (100.00%)
-  0.12 [0 rows, 0B] [0 rows/s, 0B/s]
diff --git a/docs/src/main/sphinx/security/salesforce.md b/docs/src/main/sphinx/security/salesforce.md
new file mode 100644
index 000000000000..84757d2a3579
--- /dev/null
+++ b/docs/src/main/sphinx/security/salesforce.md
@@ -0,0 +1,69 @@
+# Salesforce authentication
+
+Trino can be configured to enable frontend password authentication over
+HTTPS for clients, such as the CLI, or the JDBC and ODBC drivers. The
+username and password (or password and [security token](#security-token) concatenation)
+are validated by having the Trino coordinator perform a login to Salesforce.
+
+This allows you to enable users to authenticate to Trino via their Salesforce
+basic credentials.  This can also be used to secure the {ref}`Web UI <web-ui-authentication>`.
+
+:::{note}
+This is *not* a Salesforce connector, and does not allow users to query
+Salesforce data. Salesforce authentication is simply a means by which users
+can authenticate to Trino, similar to {doc}`ldap` or {doc}`password-file`.
+:::
+
+Using {doc}`TLS <tls>` and {doc}`a configured shared secret
+</security/internal-communication>` is required for Salesforce authentication.
+
+## Salesforce authenticator configuration
+
+To enable Salesfore authentication, set the {doc}`password authentication
+type <authentication-types>` in `etc/config.properties`:
+
+```properties
+http-server.authentication.type=PASSWORD
+```
+
+In addition, create a `etc/password-authenticator.properties` file on the
+coordinator with the `salesforce` authenticator name:
+
+```properties
+password-authenticator.name=salesforce
+salesforce.allowed-organizations=<allowed-org-ids or all>
+```
+
+The following configuration properties are available:
+
+| Property                           | Description                                                                                                                                                                                                                                          |
+| ---------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `salesforce.allowed-organizations` | Comma separated list of 18 character Salesforce.com Organization IDs for a second, simple layer of security. This option can be explicitly ignored using `all`, which bypasses any check of the authenticated user's Salesforce.com Organization ID. |
+| `salesforce.cache-size`            | Maximum number of cached authenticated users. Defaults to `4096`.                                                                                                                                                                                    |
+| `salesforce.cache-expire-duration` | How long a cached authentication should be considered valid. Defaults to `2m`.                                                                                                                                                                       |
+
+## Salesforce concepts
+
+There are two Salesforce specific aspects to this authenticator.  They are the use of the
+Salesforce security token, and configuration of one or more Salesforce.com Organization IDs.
+
+(security-token)=
+### Security token
+
+Credentials are a user's Salesforce username and password if Trino is connecting from a whitelisted
+IP, or username and password/[security token](https://help.salesforce.com/articleView?id=user_security_token.htm&type=5)
+concatenation otherwise.  For example, if Trino is *not* whitelisted, and your password is `password`
+and security token is `token`, use `passwordtoken` to authenticate.
+
+You can configure a public IP for Trino as a trusted IP by [whitelisting an IP range](https://help.salesforce.com/articleView?id=security_networkaccess.htm&type=5).
+
+### Salesforce.com organization IDs
+
+You can configure one or more Salesforce Organization IDs for additional security.  When the user authenticates,
+the Salesforce API returns the *18 character* Salesforce.com Organization ID for the user.  The Trino Salesforce
+authenticator ensures that the ID matches one of the IDs configured in `salesforce.allowed-organizations`.
+
+Optionally, you can configure `all` to explicitly ignore this layer of security.
+
+Admins can find their Salesforce.com Organization ID using the [Salesforce Setup UI](https://help.salesforce.com/articleView?id=000325251&type=1&mode=1).  This will be the 15 character
+ID, which can be [converted to the 18 character ID](https://sf1518.click/).
diff --git a/docs/src/main/sphinx/security/salesforce.rst b/docs/src/main/sphinx/security/salesforce.rst
deleted file mode 100644
index 2338c8ec8071..000000000000
--- a/docs/src/main/sphinx/security/salesforce.rst
+++ /dev/null
@@ -1,88 +0,0 @@
-=========================
-Salesforce authentication
-=========================
-
-Trino can be configured to enable frontend password authentication over
-HTTPS for clients, such as the CLI, or the JDBC and ODBC drivers. The
-username and password (or password and `security token <#security-token>`__ concatenation)
-are validated by having the Trino coordinator perform a login to Salesforce.
-
-This allows you to enable users to authenticate to Trino via their Salesforce
-basic credentials.  This can also be used to secure the :ref:`Web UI <web-ui-authentication>`.
-
-.. note::
-
-    This is *not* a Salesforce connector, and does not allow users to query
-    Salesforce data. Salesforce authentication is simply a means by which users
-    can authenticate to Trino, similar to :doc:`ldap` or :doc:`password-file`.
-
-Using :doc:`TLS <tls>` and :doc:`a configured shared secret
-</security/internal-communication>` is required for Salesforce authentication.
-
-Salesforce authenticator configuration
---------------------------------------
-
-To enable Salesfore authentication, set the :doc:`password authentication
-type <authentication-types>` in ``etc/config.properties``:
-
-.. code-block:: properties
-
-    http-server.authentication.type=PASSWORD
-
-In addition, create a ``etc/password-authenticator.properties`` file on the
-coordinator with the ``salesforce`` authenticator name:
-
-.. code-block:: properties
-
-    password-authenticator.name=salesforce
-    salesforce.allowed-organizations=<allowed-org-ids or all>
-
-The following configuration properties are available:
-
-====================================   ============================================================
-Property                               Description
-====================================   ============================================================
-``salesforce.allowed-organizations``   Comma separated list of 18 character Salesforce.com
-                                       Organization IDs for a second, simple layer of security.
-                                       This option can be explicitly ignored using ``all``, which
-                                       bypasses any check of the authenticated user's
-                                       Salesforce.com Organization ID.
-
-``salesforce.cache-size``              Maximum number of cached authenticated users.
-                                       Defaults to ``4096``.
-
-``salesforce.cache-expire-duration``   How long a cached authentication should be considered valid.
-                                       Defaults to ``2m``.
-====================================   ============================================================
-
-Salesforce concepts
--------------------
-
-There are two Salesforce specific aspects to this authenticator.  They are the use of the
-Salesforce security token, and configuration of one or more Salesforce.com Organization IDs.
-
-
-Security token
-^^^^^^^^^^^^^^
-
-Credentials are a user's Salesforce username and password if Trino is connecting from a whitelisted
-IP, or username and password/`security token <https://help.salesforce.com/articleView?id=user_security_token.htm&type=5>`_
-concatenation otherwise.  For example, if Trino is *not* whitelisted, and your password is ``password``
-and security token is ``token``, use ``passwordtoken`` to authenticate.
-
-You can configure a public IP for Trino as a trusted IP by `whitelisting an IP range
-<https://help.salesforce.com/articleView?id=security_networkaccess.htm&type=5>`_.
-
-Salesforce.com organization IDs
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can configure one or more Salesforce Organization IDs for additional security.  When the user authenticates,
-the Salesforce API returns the *18 character* Salesforce.com Organization ID for the user.  The Trino Salesforce
-authenticator ensures that the ID matches one of the IDs configured in ``salesforce.allowed-organizations``.
-
-Optionally, you can configure ``all`` to explicitly ignore this layer of security.
-
-Admins can find their Salesforce.com Organization ID using the `Salesforce Setup UI
-<https://help.salesforce.com/articleView?id=000325251&type=1&mode=1>`_.  This will be the 15 character
-ID, which can be `converted to the 18 character ID <https://sf1518.click/>`_.
-
diff --git a/docs/src/main/sphinx/security/secrets.md b/docs/src/main/sphinx/security/secrets.md
new file mode 100644
index 000000000000..ed68a46b9e6c
--- /dev/null
+++ b/docs/src/main/sphinx/security/secrets.md
@@ -0,0 +1,36 @@
+# Secrets
+
+Trino manages configuration details in static properties files. This
+configuration needs to include values such as usernames, passwords and other
+strings, that are often required to be kept secret. Only a few select
+administrators or the provisioning system has access to the actual value.
+
+The secrets support in Trino allows you to use environment variables as values
+for any configuration property. All properties files used by Trino, including
+`config.properties` and catalog properties files, are supported. When loading
+the properties, Trino replaces the reference to the environment variable with
+the value of the environment variable.
+
+Environment variables are the most widely-supported means of setting and
+retrieving values. Environment variables can be set in the scope of the task
+being performed, preventing external access. Most provisioning and configuration
+management systems include support for setting environment variables. This
+includes systems such as Ansible, often used for virtual machines, and
+Kubernetes for container usage. You can also manually set an environment
+variable on the command line.
+
+```text
+export DB_PASSWORD=my-super-secret-pwd
+```
+
+To use this variable in the properties file, you reference it with the syntax
+`${ENV:VARIABLE}`. For example, if you want to use the password in a catalog
+properties file like `etc/catalog/db.properties`, add the following line:
+
+```properties
+connection-password=${ENV:DB_PASSWORD}
+```
+
+With this setup in place, the secret is managed by the provisioning system
+or by the administrators handling the machines. No secret is stored in the Trino
+configuration files on the filesystem or wherever they are managed.
diff --git a/docs/src/main/sphinx/security/secrets.rst b/docs/src/main/sphinx/security/secrets.rst
deleted file mode 100644
index 642fac909383..000000000000
--- a/docs/src/main/sphinx/security/secrets.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-=======
-Secrets
-=======
-
-Trino manages configuration details in static properties files. This
-configuration needs to include values such as usernames, passwords and other
-strings, that are often required to be kept secret. Only a few select
-administrators or the provisioning system has access to the actual value.
-
-The secrets support in Trino allows you to use environment variables as values
-for any configuration property. All properties files used by Trino, including
-``config.properties`` and catalog properties files, are supported. When loading
-the properties, Trino replaces the reference to the environment variable with
-the value of the environment variable.
-
-Environment variables are the most widely-supported means of setting and
-retrieving values. Environment variables can be set in the scope of the task
-being performed, preventing external access. Most provisioning and configuration
-management systems include support for setting environment variables. This
-includes systems such as Ansible, often used for virtual machines, and
-Kubernetes for container usage. You can also manually set an environment
-variable on the command line.
-
-.. code-block:: text
-
-    export DB_PASSWORD=my-super-secret-pwd
-
-To use this variable in the properties file, you reference it with the syntax
-``${ENV:VARIABLE}``. For example, if you want to use the password in a catalog
-properties file like ``etc/catalog/db.properties``, add the following line:
-
-.. code-block:: properties
-
-    connection-password=${ENV:DB_PASSWORD}
-
-With this setup in place, the secret is managed by the provisioning system
-or by the administrators handling the machines. No secret is stored in the Trino
-configuration files on the filesystem or wherever they are managed.
diff --git a/docs/src/main/sphinx/security/tls.md b/docs/src/main/sphinx/security/tls.md
new file mode 100644
index 000000000000..775a20f4e61b
--- /dev/null
+++ b/docs/src/main/sphinx/security/tls.md
@@ -0,0 +1,305 @@
+# TLS and HTTPS
+
+Trino runs with no security by default. This allows you to connect to the server
+using URLs that specify the HTTP protocol when using the Trino {doc}`CLI
+</client/cli>`, the {doc}`Web UI </admin/web-interface>`, or other
+clients.
+
+This topic describes how to configure your Trino server to use {ref}`TLS
+<glossTLS>` to require clients to use the HTTPS connection protocol.
+All authentication technologies supported by Trino require configuring TLS as
+the foundational layer.
+
+:::{important}
+This page discusses only how to prepare the Trino server for secure client
+connections from outside of the Trino cluster to its coordinator.
+:::
+
+See the {doc}`Glossary </glossary>` to clarify unfamiliar terms.
+
+(tls-version-and-ciphers)=
+
+## Supported standards
+
+When configured to use TLS, the Trino server responds to client connections
+using TLS 1.2 and TLS 1.3 certificates. The server rejects TLS 1.1, TLS 1.0, and
+all SSL format certificates.
+
+The Trino server does not specify a set of supported ciphers, instead deferring
+to the defaults set by the JVM version in use. The documentation for Java 17
+lists its [supported cipher suites](https://docs.oracle.com/en/java/javase/17/security/oracle-providers.html#GUID-7093246A-31A3-4304-AC5F-5FB6400405E2__SUNJSSE_CIPHER_SUITES).
+
+Run the following two-line code on the same JVM from the same vendor as
+configured on the coordinator to determine that JVM's default cipher list.
+
+```shell
+echo "java.util.Arrays.asList(((javax.net.ssl.SSLServerSocketFactory) \
+javax.net.ssl.SSLServerSocketFactory.getDefault()).getSupportedCipherSuites()).forEach(System.out::println)" | jshell -
+```
+
+The default Trino server specifies a set of regular expressions that exclude
+older cipher suites that do not support forward secrecy (FS).
+
+Use the `http-server.https.included-cipher` property to specify a
+comma-separated list of ciphers in preferred use order. If one of your preferred
+selections is a non-FS cipher, you must also set the
+`http-server.https.excluded-cipher` property to an empty list to override the
+default exclusions. For example:
+
+```text
+http-server.https.included-cipher=TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA256
+http-server.https.excluded-cipher=
+```
+
+Specifying a different cipher suite is a complex issue that should only be
+considered in conjunction with your organization's security managers. Using a
+different suite may require downloading and installing a different SunJCE
+implementation package. Some locales may have export restrictions on cipher
+suites. See the discussion in Java documentation that begins with [Customizing
+the Encryption Algorithm Providers](https://docs.oracle.com/en/java/javase/17/security/java-secure-socket-extension-jsse-reference-guide.html#GUID-316FB978-7588-442E-B829-B4973DB3B584).
+
+:::{note}
+If you manage the coordinator's direct TLS implementatation, monitor the CPU
+usage on the Trino coordinator after enabling HTTPS. Java prefers the more
+CPU-intensive cipher suites, if you allow it to choose from a big list of
+ciphers. If the CPU usage is unacceptably high after enabling HTTPS, you can
+configure Java to use specific cipher suites as described in this section.
+
+However, best practice is to instead use an external load balancer, as
+discussed next.
+:::
+
+## Approaches
+
+To configure Trino with TLS support, consider two alternative paths:
+
+- Use the {ref}`load balancer or proxy <https-load-balancer>` at your site
+  or cloud environment to terminate TLS/HTTPS. This approach is the simplest and
+  strongly preferred solution.
+- Secure the Trino {ref}`server directly <https-secure-directly>`. This
+  requires you to obtain a valid certificate, and add it to the Trino
+  coordinator's configuration.
+
+(https-load-balancer)=
+
+## Use a load balancer to terminate TLS/HTTPS
+
+Your site or cloud environment may already have a {ref}`load balancer <glossLB>`
+or proxy server configured and running with a valid, globally trusted TLS
+certificate. In this case, you can work with your network administrators to set
+up your Trino server behind the load balancer. The load balancer or proxy server
+accepts TLS connections and forwards them to the Trino coordinator, which
+typically runs with default HTTP configuration on the default port, 8080.
+
+When a load balancer accepts a TLS encrypted connection, it adds a
+[forwarded](https://developer.mozilla.org/docs/Web/HTTP/Proxy_servers_and_tunneling#forwarding_client_information_through_proxies)
+HTTP header to the request, such as `X-Forwarded-Proto: https`.
+
+This tells the Trino coordinator to process the connection as if a TLS
+connection has already been successfully negotiated for it. This is why you do
+not need to configure `http-server.https.enabled=true` for a coordinator
+behind a load balancer.
+
+However, to enable processing of such forwarded headers, the server's
+{ref}`config properties file <config-properties>` *must* include the following:
+
+```text
+http-server.process-forwarded=true
+```
+
+This completes any necessary configuration for using HTTPS with a load balancer.
+Client tools can access Trino with the URL exposed by the load balancer.
+
+(https-secure-directly)=
+
+## Secure Trino directly
+
+Instead of the preferred mechanism of using an {ref}`external load balancer
+<https-load-balancer>`, you can secure the Trino coordinator itself. This
+requires you to obtain and install a TLS {ref}`certificate <glossCert>`, and
+configure Trino to use it for client connections.
+
+### Add a TLS certificate
+
+Obtain a TLS certificate file for use with your Trino server. Consider the
+following types of certificates:
+
+- **Globally trusted certificates** — A certificate that is automatically
+  trusted by all browsers and clients. This is the easiest type to use because
+  you do not need to configure clients. Obtain a certificate of this type from:
+
+  - A commercial certificate vendor
+  - Your cloud infrastructure provider
+  - A domain name registrar, such as Verisign or GoDaddy
+  - A free certificate generator, such as
+    [letsencrypt.org](https://letsencrypt.org/) or
+    [sslforfree.com](https://www.sslforfree.com/)
+
+- **Corporate trusted certificates** — A certificate trusted by browsers and
+  clients in your organization. Typically, a site's IT department runs a local
+  {ref}`certificate authority <glossCA>` and preconfigures clients and servers
+  to trust this CA.
+
+- **Generated self-signed certificates** — A certificate generated just for
+  Trino that is not automatically trusted by any client. Before using, make sure
+  you understand the {ref}`limitations of self-signed certificates
+  <self-signed-limits>`.
+
+The most convenient option and strongly recommended option is a globally trusted
+certificate. It may require a little more work up front, but it is worth it to
+not have to configure every single client.
+
+### Keys and certificates
+
+Trino can read certificates and private keys encoded in PEM encoded PKCS #1, PEM
+encoded PKCS #8, PKCS #12, and the legacy Java KeyStore (JKS) format.
+Certificates and private keys encoded in a binary format such as DER must be
+converted.
+
+Make sure you obtain a certificate that is validated by a recognized
+{ref}`certificate authority <glossCA>`.
+
+### Inspect received certificates
+
+Before installing your certificate, inspect and validate the received key and
+certificate files to make sure they reference the correct information to access
+your Trino server. Much unnecessary debugging time is saved by taking the time
+to validate your certificates before proceeding to configure the server.
+
+Inspect PEM-encoded files as described in {doc}`Inspect PEM files
+</security/inspect-pem>`.
+
+Inspect PKCS # 12 and JKS keystores as described in {doc}`Inspect JKS files
+</security/inspect-jks>`.
+
+### Invalid certificates
+
+If your certificate does not pass validation, or does not show the expected
+information on inspection, contact the group or vendor who provided it for a
+replacement.
+
+(cert-placement)=
+
+### Place the certificate file
+
+There are no location requirements for a certificate file as long as:
+
+- The file can be read by the Trino coordinator server process.
+- The location is secure from copying or tampering by malicious actors.
+
+You can place your file in the Trino coordinator's `etc` directory, which
+allows you to use a relative path reference in configuration files. However,
+this location can require you to keep track of the certificate file, and move it
+to a new `etc` directory when you upgrade your Trino version.
+
+(configure-https)=
+
+### Configure the coordinator
+
+On the coordinator, add the following lines to the {ref}`config properties file
+<config-properties>` to enable TLS/HTTPS support for the server.
+
+:::{note}
+Legacy `keystore` and `truststore` wording is used in property names, even
+when directly using PEM-encoded certificates.
+:::
+
+```text
+http-server.https.enabled=true
+http-server.https.port=8443
+http-server.https.keystore.path=etc/clustercoord.pem
+```
+
+Possible alternatives for the third line include:
+
+```text
+http-server.https.keystore.path=etc/clustercoord.jks
+http-server.https.keystore.path=/usr/local/certs/clustercoord.p12
+```
+
+Relative paths are relative to the Trino server's root directory. In a
+`tar.gz` installation, the root directory is one level above `etc`.
+
+JKS keystores always require a password, while PEM files with passwords are not
+supported by Trino. For JKS, add the following line to the configuration:
+
+```text
+http-server.https.keystore.key=<keystore-password>
+```
+
+It is possible for a key inside a keystore to have its own password,
+independent of the keystore's password. In this case, specify the key's password
+with the following property:
+
+```text
+http-server.https.keymanager.password=<key-password>
+```
+
+When your Trino coordinator has an authenticator enabled along with HTTPS
+enabled, HTTP access is automatically disabled for all clients, including the
+{doc}`Web UI </admin/web-interface>`. Although not recommended, you can
+re-enable it by setting:
+
+```text
+http-server.authentication.allow-insecure-over-http=true
+```
+
+(verify-tls)=
+
+### Verify configuration
+
+To verify TLS/HTTPS configuration, log in to the {doc}`Web UI
+</admin/web-interface>`, and send a query with the Trino {doc}`CLI
+</client/cli>`.
+
+- Connect to the Web UI from your browser using a URL that uses HTTPS, such as
+  `https://trino.example.com:8443`. Enter any username into the `Username`
+  text box, and log in to the UI. The `Password` box is disabled while
+  {doc}`authentication <authentication-types>` is not configured.
+- Connect with the Trino CLI using a URL that uses HTTPS, such as
+  `https://trino.example.com:8443`:
+
+```text
+./trino --server https://trino.example.com:8443
+```
+
+Send a query to test the connection:
+
+```text
+trino> SELECT 'rocks' AS trino;
+
+trino
+-------
+rocks
+(1 row)
+
+Query 20220919_113804_00017_54qfi, FINISHED, 1 node
+Splits: 1 total, 1 done (100.00%)
+0.12 [0 rows, 0B] [0 rows/s, 0B/s]
+```
+
+(self-signed-limits)=
+
+## Limitations of self-signed certificates
+
+It is possible to generate a self-signed certificate with the `openssl`,
+`keytool`, or on Linux, `certtool` commands. Self-signed certificates can be
+useful during development of a cluster for internal use only. We recommend never
+using a self-signed certificate for a production Trino server.
+
+Self-signed certificates are not trusted by anyone. They are typically created
+by an administrator for expediency, because they do not require getting trust
+signoff from anyone.
+
+To use a self-signed certificate while developing your cluster requires:
+
+- distributing to every client a local truststore that validates the certificate
+- configuring every client to use this certificate
+
+However, even with this client configuration, modern browsers reject these
+certificates, which makes self-signed servers difficult to work with.
+
+There is a difference between self-signed and unsigned certificates. Both types
+are created with the same tools, but unsigned certificates are meant to be
+forwarded to a CA with a Certificate Signing Request (CSR). The CA returns the
+certificate signed by the CA and now globally trusted.
diff --git a/docs/src/main/sphinx/security/tls.rst b/docs/src/main/sphinx/security/tls.rst
deleted file mode 100644
index 141b38ee9658..000000000000
--- a/docs/src/main/sphinx/security/tls.rst
+++ /dev/null
@@ -1,323 +0,0 @@
-=============
-TLS and HTTPS
-=============
-
-Trino runs with no security by default. This allows you to connect to the server
-using URLs that specify the HTTP protocol when using the Trino :doc:`CLI
-</client/cli>`, the :doc:`Web UI </admin/web-interface>`, or other
-clients.
-
-This topic describes how to configure your Trino server to use :ref:`TLS
-<glossTLS>` to require clients to use the HTTPS connection protocol.
-All authentication technologies supported by Trino require configuring TLS as
-the foundational layer.
-
-.. important::
-
-    This page discusses only how to prepare the Trino server for secure client
-    connections from outside of the Trino cluster to its coordinator.
-
-See the :doc:`Glossary </glossary>` to clarify unfamiliar terms.
-
-.. _tls-version-and-ciphers:
-
-Supported standards
--------------------
-
-When configured to use TLS, the Trino server responds to client connections
-using TLS 1.2 and TLS 1.3 certificates. The server rejects TLS 1.1, TLS 1.0, and
-all SSL format certificates.
-
-The Trino server does not specify a set of supported ciphers, instead deferring
-to the defaults set by the JVM version in use. The documentation for Java 17
-lists its `supported cipher suites
-<https://docs.oracle.com/en/java/javase/17/security/oracle-providers.html#GUID-7093246A-31A3-4304-AC5F-5FB6400405E2__SUNJSSE_CIPHER_SUITES>`_.
-
-Run the following two-line code on the same JVM from the same vendor as
-configured on the coordinator to determine that JVM's default cipher list.
-
-.. code-block:: shell
-
-  echo "java.util.Arrays.asList(((javax.net.ssl.SSLServerSocketFactory) \
-  javax.net.ssl.SSLServerSocketFactory.getDefault()).getSupportedCipherSuites()).forEach(System.out::println)" | jshell -
-
-The default Trino server specifies a set of regular expressions that exclude
-older cipher suites that do not support forward secrecy (FS).
-
-Use the ``http-server.https.included-cipher`` property to specify a
-comma-separated list of ciphers in preferred use order. If one of your preferred
-selections is a non-FS cipher, you must also set the
-``http-server.https.excluded-cipher`` property to an empty list to override the
-default exclusions. For example:
-
-.. code-block:: text
-
-   http-server.https.included-cipher=TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA256
-   http-server.https.excluded-cipher=
-
-Specifying a different cipher suite is a complex issue that should only be
-considered in conjunction with your organization's security managers. Using a
-different suite may require downloading and installing a different SunJCE
-implementation package. Some locales may have export restrictions on cipher
-suites. See the discussion in Java documentation that begins with `Customizing
-the Encryption Algorithm Providers
-<https://docs.oracle.com/en/java/javase/17/security/java-secure-socket-extension-jsse-reference-guide.html#GUID-316FB978-7588-442E-B829-B4973DB3B584>`_.
-
-.. note::
-
-    If you manage the coordinator's direct TLS implementatation, monitor the CPU
-    usage on the Trino coordinator after enabling HTTPS. Java prefers the more
-    CPU-intensive cipher suites, if you allow it to choose from a big list of
-    ciphers. If the CPU usage is unacceptably high after enabling HTTPS, you can
-    configure Java to use specific cipher suites as described in this section.
-
-    However, best practice is to instead use an external load balancer, as
-    discussed next.
-
-Approaches
-----------
-
-To configure Trino with TLS support, consider two alternative paths:
-
-* Use the :ref:`load balancer or proxy <https-load-balancer>` at your site
-  or cloud environment to terminate TLS/HTTPS. This approach is the simplest and
-  strongly preferred solution.
-
-* Secure the Trino :ref:`server directly <https-secure-directly>`. This
-  requires you to obtain a valid certificate, and add it to the Trino
-  coordinator's configuration.
-
-.. _https-load-balancer:
-
-Use a load balancer to terminate TLS/HTTPS
-------------------------------------------
-
-Your site or cloud environment may already have a :ref:`load balancer <glossLB>`
-or proxy server configured and running with a valid, globally trusted TLS
-certificate. In this case, you can work with your network administrators to set
-up your Trino server behind the load balancer. The load balancer or proxy server
-accepts TLS connections and forwards them to the Trino coordinator, which
-typically runs with default HTTP configuration on the default port, 8080.
-
-When a load balancer accepts a TLS encrypted connection, it adds a
-`forwarded
-<https://developer.mozilla.org/docs/Web/HTTP/Proxy_servers_and_tunneling#forwarding_client_information_through_proxies>`_
-HTTP header to the request, such as ``X-Forwarded-Proto: https``.
-
-This tells the Trino coordinator to process the connection as if a TLS
-connection has already been successfully negotiated for it. This is why you do
-not need to configure ``http-server.https.enabled=true`` for a coordinator
-behind a load balancer.
-
-However, to enable processing of such forwarded headers, the server's
-:ref:`config properties file <config_properties>` *must* include the following:
-
-.. code-block:: text
-
-  http-server.process-forwarded=true
-
-This completes any necessary configuration for using HTTPS with a load balancer.
-Client tools can access Trino with the URL exposed by the load balancer.
-
-.. _https-secure-directly:
-
-Secure Trino directly
-----------------------
-
-Instead of the preferred mechanism of using an :ref:`external load balancer
-<https-load-balancer>`, you can secure the Trino coordinator itself. This
-requires you to obtain and install a TLS :ref:`certificate <glossCert>`, and
-configure Trino to use it for client connections.
-
-Add a TLS certificate
-^^^^^^^^^^^^^^^^^^^^^
-
-Obtain a TLS certificate file for use with your Trino server. Consider the
-following types of certificates:
-
-* **Globally trusted certificates** — A certificate that is automatically
-  trusted by all browsers and clients. This is the easiest type to use because
-  you do not need to configure clients. Obtain a certificate of this type from:
-
-  *  A commercial certificate vendor
-  *  Your cloud infrastructure provider
-  *  A domain name registrar, such as Verisign or GoDaddy
-  *  A free certificate generator, such as
-     `letsencrypt.org <https://letsencrypt.org/>`_ or
-     `sslforfree.com <https://www.sslforfree.com/>`_
-
-* **Corporate trusted certificates** — A certificate trusted by browsers and
-  clients in your organization. Typically, a site's IT department runs a local
-  :ref:`certificate authority <glossCA>` and preconfigures clients and servers
-  to trust this CA.
-
-* **Generated self-signed certificates** — A certificate generated just for
-  Trino that is not automatically trusted by any client. Before using, make sure
-  you understand the :ref:`limitations of self-signed certificates
-  <self_signed_limits>`.
-
-The most convenient option and strongly recommended option is a globally trusted
-certificate. It may require a little more work up front, but it is worth it to
-not have to configure every single client.
-
-Keys and certificates
-^^^^^^^^^^^^^^^^^^^^^
-
-Trino can read certificates and private keys encoded in PEM encoded PKCS #1, PEM
-encoded PKCS #8, PKCS #12, and the legacy Java KeyStore (JKS) format.
-
-Make sure you obtain a certificate that is validated by a recognized
-:ref:`certificate authority <glossCA>`.
-
-Inspect received certificates
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Before installing your certificate, inspect and validate the received key and
-certificate files to make sure they reference the correct information to access
-your Trino server. Much unnecessary debugging time is saved by taking the time
-to validate your certificates before proceeding to configure the server.
-
-Inspect PEM-encoded files as described in :doc:`Inspect PEM files
-</security/inspect-pem>`.
-
-Inspect PKCS # 12 and JKS keystores as described in :doc:`Inspect JKS files
-</security/inspect-jks>`.
-
-Invalid certificates
-^^^^^^^^^^^^^^^^^^^^^
-
-If your certificate does not pass validation, or does not show the expected
-information on inspection, contact the group or vendor who provided it for a
-replacement.
-
-.. _cert-placement:
-
-Place the certificate file
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-There are no location requirements for a certificate file as long as:
-
-* The file can be read by the Trino coordinator server process.
-* The location is secure from copying or tampering by malicious actors.
-
-You can place your file in the Trino coordinator's ``etc`` directory, which
-allows you to use a relative path reference in configuration files. However,
-this location can require you to keep track of the certificate file, and move it
-to a new ``etc`` directory when you upgrade your Trino version.
-
-.. _configure-https:
-
-Configure the coordinator
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-On the coordinator, add the following lines to the :ref:`config properties file
-<config_properties>` to enable TLS/HTTPS support for the server.
-
-.. note::
-
-  Legacy ``keystore`` and ``truststore`` wording is used in property names, even
-  when directly using PEM-encoded certificates.
-
-.. code-block:: text
-
-  http-server.https.enabled=true
-  http-server.https.port=8443
-  http-server.https.keystore.path=etc/clustercoord.pem
-
-Possible alternatives for the third line include:
-
-.. code-block:: text
-
-  http-server.https.keystore.path=etc/clustercoord.jks
-  http-server.https.keystore.path=/usr/local/certs/clustercoord.p12
-
-Relative paths are relative to the Trino server's root directory. In a
-``tar.gz`` installation, the root directory is one level above ``etc``.
-
-JKS keystores always require a password, while PEM format certificates can
-optionally require a password. For cases where you need a password, add the
-following line to the configuration.
-
-.. code-block:: text
-
-  http-server.https.keystore.key=<keystore-password>
-
-It is possible for a key inside a keystore to have its own password,
-independent of the keystore's password. In this case, specify the key's password
-with the following property:
-
-.. code-block:: text
-
-  http-server.https.keymanager.password=<key-password>
-
-When your Trino coordinator has an authenticator enabled along with HTTPS
-enabled, HTTP access is automatically disabled for all clients, including the
-:doc:`Web UI </admin/web-interface>`. Although not recommended, you can
-re-enable it by setting:
-
-.. code-block:: text
-
-  http-server.authentication.allow-insecure-over-http=true
-
-.. _verify_tls:
-
-Verify configuration
-^^^^^^^^^^^^^^^^^^^^
-
-To verify TLS/HTTPS configuration, log in to the :doc:`Web UI
-</admin/web-interface>`, and send a query with the Trino :doc:`CLI
-</client/cli>`.
-
-* Connect to the Web UI from your browser using a URL that uses HTTPS, such as
-  ``https://trino.example.com:8443``. Enter any username into the ``Username``
-  text box, and log in to the UI. The ``Password`` box is disabled while
-  :doc:`authentication <authentication-types>` is not configured.
-
-* Connect with the Trino CLI using a URL that uses HTTPS, such as
-  ``https://trino.example.com:8443``:
-
-.. code-block:: text
-
-    ./trino --server https://trino.example.com:8443
-
-Send a query to test the connection:
-
-.. code-block:: text
-
-  trino> SELECT 'rocks' AS trino;
-
-  trino
-  -------
-  rocks
-  (1 row)
-
-  Query 20220919_113804_00017_54qfi, FINISHED, 1 node
-  Splits: 1 total, 1 done (100.00%)
-  0.12 [0 rows, 0B] [0 rows/s, 0B/s]
-
-.. _self_signed_limits:
-
-Limitations of self-signed certificates
----------------------------------------
-
-It is possible to generate a self-signed certificate with the ``openssl``,
-``keytool``, or on Linux, ``certtool`` commands. Self-signed certificates can be
-useful during development of a cluster for internal use only. We recommend never
-using a self-signed certificate for a production Trino server.
-
-Self-signed certificates are not trusted by anyone. They are typically created
-by an administrator for expediency, because they do not require getting trust
-signoff from anyone.
-
-To use a self-signed certificate while developing your cluster requires:
-
-* distributing to every client a local truststore that validates the certificate
-* configuring every client to use this certificate
-
-However, even with this client configuration, modern browsers reject these
-certificates, which makes self-signed servers difficult to work with.
-
-There is a difference between self-signed and unsigned certificates. Both types
-are created with the same tools, but unsigned certificates are meant to be
-forwarded to a CA with a Certificate Signing Request (CSR). The CA returns the
-certificate signed by the CA and now globally trusted.
diff --git a/docs/src/main/sphinx/security/user-mapping.md b/docs/src/main/sphinx/security/user-mapping.md
new file mode 100644
index 000000000000..c297891f69b3
--- /dev/null
+++ b/docs/src/main/sphinx/security/user-mapping.md
@@ -0,0 +1,122 @@
+# User mapping
+
+User mapping defines rules for mapping from users in the authentication method to Trino users. This
+mapping is particularly important for {doc}`Kerberos </security/kerberos>` or
+certificate authentication where the user names
+are complex, such as `alice@example` or `CN=Alice Smith,OU=Finance,O=Acme,C=US`.
+
+There are two ways to map the username format of a given authentication
+provider into the simple username format of Trino users:
+
+- With a single regular expression (regex) {ref}`pattern mapping rule <pattern-rule>`
+- With a {ref}`file of regex mapping rules <pattern-file>` in JSON format
+
+(pattern-rule)=
+
+## Pattern mapping rule
+
+If you can map all of your authentication method’s usernames with a single
+reqular expression, consider using a **Pattern mapping rule**.
+
+For example, your authentication method uses all usernames in the form
+`alice@example.com`, with no exceptions. In this case, choose a regex that
+breaks incoming usernames into at least two regex capture groups, such that the
+first capture group includes only the name before the `@` sign. You can use
+the simple regex `(.*)(@.*)` for this case.
+
+Trino automatically uses the first capture group – the \$1 group – as the
+username to emit after the regex substitution. If the regular expression does
+not match the incoming username, authentication is denied.
+
+Specify your regex pattern in the appropriate property in your coordinator’s
+`config.properties` file, using one of the `*user-mapping.pattern`
+properties from the table below that matches the authentication type of your
+configured authentication provider. For example, for an {doc}`LDAP
+</security/ldap>` authentication provider:
+
+```text
+http-server.authentication.password.user-mapping.pattern=(.*)(@.*)
+```
+
+Remember that an {doc}`authentication type </security/authentication-types>`
+represents a category, such as `PASSWORD`, `OAUTH2`, `KERBEROS`. More than
+one authentication method can have the same authentication type. For example,
+the Password file, LDAP, and Salesforce authentication methods all share the
+`PASSWORD` authentication type.
+
+You can specify different user mapping patterns for different authentication
+types when multiple authentication methods are enabled:
+
+| Authentication type               | Property                                                      |
+| --------------------------------- | ------------------------------------------------------------- |
+| Password (file, LDAP, Salesforce) | `http-server.authentication.password.user-mapping.pattern`    |
+| OAuth2                            | `http-server.authentication.oauth2.user-mapping.pattern`      |
+| Certificate                       | `http-server.authentication.certificate.user-mapping.pattern` |
+| Header                            | `http-server.authentication.header.user-mapping.pattern`      |
+| JSON Web Token                    | `http-server.authentication.jwt.user-mapping.pattern`         |
+| Kerberos                          | `http-server.authentication.krb5.user-mapping.pattern`        |
+| Insecure                          | `http-server.authentication.insecure.user-mapping.pattern`    |
+
+(pattern-file)=
+
+## File mapping rules
+
+Use the **File mapping rules** method if your authentication provider expresses
+usernames in a way that cannot be reduced to a single rule, or if you want to
+exclude a set of users from accessing the cluster.
+
+The rules are loaded from a JSON file identified in a configuration property.
+The mapping is based on the first matching rule, processed from top to bottom.
+If no rules match, authentication is denied.  Each rule is composed of the
+following fields:
+
+- `pattern` (required): regex to match against the authentication method's
+  username.
+
+- `user` (optional): replacement string to substitute against *pattern*.
+  The default value is `$1`.
+
+- `allow` (optional): boolean indicating whether authentication is to be
+  allowed for the current match.
+
+- `case` (optional): one of:
+
+  - `keep` - keep the matched username as is (default behavior)
+  - `lower` - lowercase the matched username; thus both `Admin` and `ADMIN` become `admin`
+  - `upper` - uppercase the matched username; thus both `admin` and `Admin` become `ADMIN`
+
+The following example maps all usernames in the form `alice@example.com` to
+just `alice`, except for the `test` user, which is denied authentication. It
+also maps users in the form `bob@uk.example.com` to `bob_uk`:
+
+```{literalinclude} user-mapping.json
+:language: json
+```
+
+Set up the preceding example to use the {doc}`LDAP </security/ldap>`
+authentication method with the {doc}`PASSWORD </security/authentication-types>`
+authentication type by adding the following line to your coordinator's
+`config.properties` file:
+
+```text
+http-server.authentication.password.user-mapping.file=etc/user-mapping.json
+```
+
+You can place your user mapping JSON file in any local file system location on
+the coordinator, but placement in the `etc` directory is typical. There is no
+naming standard for the file or its extension, although using `.json` as the
+extension is traditional. Specify an absolute path or a path relative to the
+Trino installation root.
+
+You can specify different user mapping files for different authentication
+types when multiple authentication methods are enabled:
+
+| Authentication type               | Property                                                   |
+| --------------------------------- | ---------------------------------------------------------- |
+| Password (file, LDAP, Salesforce) | `http-server.authentication.password.user-mapping.file`    |
+| OAuth2                            | `http-server.authentication.oauth2.user-mapping.file`      |
+| Certificate                       | `http-server.authentication.certificate.user-mapping.file` |
+| Header                            | `http-server.authentication.header.user-mapping.pattern`   |
+| JSON Web Token                    | `http-server.authentication.jwt.user-mapping.file`         |
+| Kerberos                          | `http-server.authentication.krb5.user-mapping.file`        |
+| Insecure                          | `http-server.authentication.insecure.user-mapping.file`    |
diff --git a/docs/src/main/sphinx/security/user-mapping.rst b/docs/src/main/sphinx/security/user-mapping.rst
deleted file mode 100644
index e81bcc1b7206..000000000000
--- a/docs/src/main/sphinx/security/user-mapping.rst
+++ /dev/null
@@ -1,127 +0,0 @@
-============
-User mapping
-============
-
-User mapping defines rules for mapping from users in the authentication method to Trino users. This
-mapping is particularly important for :doc:`Kerberos </security/kerberos>` or
-certificate authentication where the user names
-are complex, such as ``alice@example`` or ``CN=Alice Smith,OU=Finance,O=Acme,C=US``.
-
-There are two ways to map the username format of a given authentication
-provider into the simple username format of Trino users:
-
-* With a single regular expression (regex) :ref:`pattern mapping rule <pattern-rule>`
-* With a :ref:`file of regex mapping rules <pattern-file>` in JSON format
-
-.. _pattern-rule:
-
-Pattern mapping rule
---------------------
-
-If you can map all of your authentication method’s usernames with a single
-reqular expression, consider using a **Pattern mapping rule**.
-
-For example, your authentication method uses all usernames in the form
-``alice@example.com``, with no exceptions. In this case, choose a regex that
-breaks incoming usernames into at least two regex capture groups, such that the
-first capture group includes only the name before the ``@`` sign. You can use
-the simple regex ``(.*)(@.*)`` for this case.
-
-Trino automatically uses the first capture group – the $1 group – as the
-username to emit after the regex substitution. If the regular expression does
-not match the incoming username, authentication is denied.
-
-Specify your regex pattern in the appropriate property in your coordinator’s
-``config.properties`` file, using one of the ``*user-mapping.pattern``
-properties from the table below that matches the authentication type of your
-configured authentication provider. For example, for an :doc:`LDAP
-</security/ldap>` authentication provider:
-
-.. code-block:: text
-
-    http-server.authentication.password.user-mapping.pattern=(.*)(@.*)
-
-Remember that an :doc:`authentication type </security/authentication-types>`
-represents a category, such as ``PASSWORD``, ``OAUTH2``, ``KERBEROS``. More than
-one authentication method can have the same authentication type. For example,
-the Password file, LDAP, and Salesforce authentication methods all share the
-``PASSWORD`` authentication type.
-
-You can specify different user mapping patterns for different authentication
-types when multiple authentication methods are enabled:
-
-===================================== ===============================================================
-Authentication type                   Property
-===================================== ===============================================================
-Password (file, LDAP, Salesforce)     ``http-server.authentication.password.user-mapping.pattern``
-OAuth2                                ``http-server.authentication.oauth2.user-mapping.pattern``
-Certificate                           ``http-server.authentication.certificate.user-mapping.pattern``
-Header                                ``http-server.authentication.header.user-mapping.pattern``
-JSON Web Token                        ``http-server.authentication.jwt.user-mapping.pattern``
-Kerberos                              ``http-server.authentication.krb5.user-mapping.pattern``
-Insecure                              ``http-server.authentication.insecure.user-mapping.pattern``
-===================================== ===============================================================
-
-.. _pattern-file:
-
-File mapping rules
-------------------
-
-Use the **File mapping rules** method if your authentication provider expresses
-usernames in a way that cannot be reduced to a single rule, or if you want to
-exclude a set of users from accessing the cluster.
-
-The rules are loaded from a JSON file identified in a configuration property.
-The mapping is based on the first matching rule, processed from top to bottom.
-If no rules match, authentication is denied.  Each rule is composed of the
-following fields:
-
-* ``pattern`` (required): regex to match against the authentication method's
-  username.
-* ``user`` (optional): replacement string to substitute against *pattern*.
-  The default value is ``$1``.
-* ``allow`` (optional): boolean indicating whether authentication is to be
-  allowed for the current match.
-* ``case`` (optional): one of:
-
-  * ``keep`` - keep the matched username as is (default behavior)
-  * ``lower`` - lowercase the matched username; thus both ``Admin`` and ``ADMIN`` become ``admin``
-  * ``upper`` - uppercase the matched username; thus both ``admin`` and ``Admin`` become ``ADMIN``
-
-The following example maps all usernames in the form ``alice@example.com`` to
-just ``alice``, except for the ``test`` user, which is denied authentication. It
-also maps users in the form ``bob@uk.example.com`` to ``bob_uk``:
-
-.. literalinclude:: user-mapping.json
-    :language: json
-
-Set up the preceding example to use the :doc:`LDAP </security/ldap>`
-authentication method with the :doc:`PASSWORD </security/authentication-types>`
-authentication type by adding the following line to your coordinator's
-``config.properties`` file:
-
-.. code-block:: text
-
-    http-server.authentication.password.user-mapping.file=etc/user-mapping.json
-
-You can place your user mapping JSON file in any local file system location on
-the coordinator, but placement in the ``etc`` directory is typical. There is no
-naming standard for the file or its extension, although using ``.json`` as the
-extension is traditional. Specify an absolute path or a path relative to the
-Trino installation root.
-
-You can specify different user mapping files for different authentication
-types when multiple authentication methods are enabled:
-
-===================================== ===============================================================
-Authentication type                   Property
-===================================== ===============================================================
-Password (file, LDAP, Salesforce)     ``http-server.authentication.password.user-mapping.file``
-OAuth2                                ``http-server.authentication.oauth2.user-mapping.file``
-Certificate                           ``http-server.authentication.certificate.user-mapping.file``
-Header                                ``http-server.authentication.header.user-mapping.pattern``
-JSON Web Token                        ``http-server.authentication.jwt.user-mapping.file``
-Kerberos                              ``http-server.authentication.krb5.user-mapping.file``
-Insecure                              ``http-server.authentication.insecure.user-mapping.file``
-===================================== ===============================================================
-
diff --git a/docs/src/main/sphinx/sql.md b/docs/src/main/sphinx/sql.md
new file mode 100644
index 000000000000..da54bc0e1bea
--- /dev/null
+++ b/docs/src/main/sphinx/sql.md
@@ -0,0 +1,88 @@
+# SQL statement syntax
+
+This section describes the syntax for SQL statements that can be executed in
+Trino.
+
+Refer to the following sections for further details:
+
+* [SQL data types and other general aspects](/language)
+* [SQL functions and operators](/functions)
+
+```{toctree}
+:maxdepth: 1
+
+sql/alter-materialized-view
+sql/alter-schema
+sql/alter-table
+sql/alter-view
+sql/analyze
+sql/call
+sql/comment
+sql/commit
+sql/create-function
+sql/create-materialized-view
+sql/create-role
+sql/create-schema
+sql/create-table
+sql/create-table-as
+sql/create-view
+sql/deallocate-prepare
+sql/delete
+sql/deny
+sql/describe
+sql/describe-input
+sql/describe-output
+sql/drop-function
+sql/drop-materialized-view
+sql/drop-role
+sql/drop-schema
+sql/drop-table
+sql/drop-view
+sql/execute
+sql/execute-immediate
+sql/explain
+sql/explain-analyze
+sql/grant
+sql/grant-roles
+sql/insert
+sql/match-recognize
+sql/merge
+sql/prepare
+sql/refresh-materialized-view
+sql/reset-session
+sql/reset-session-authorization
+sql/revoke
+sql/revoke-roles
+sql/rollback
+sql/select
+sql/set-path
+sql/set-role
+sql/set-session
+sql/set-session-authorization
+sql/set-time-zone
+sql/show-catalogs
+sql/show-columns
+sql/show-create-materialized-view
+sql/show-create-schema
+sql/show-create-table
+sql/show-create-view
+sql/show-functions
+sql/show-grants
+sql/show-role-grants
+sql/show-roles
+sql/show-schemas
+sql/show-session
+sql/show-stats
+sql/show-tables
+sql/start-transaction
+sql/truncate
+sql/update
+sql/use
+sql/values
+```
+
+```{toctree}
+:hidden:
+
+sql/pattern-recognition-in-window
+```
diff --git a/docs/src/main/sphinx/sql.rst b/docs/src/main/sphinx/sql.rst
deleted file mode 100644
index d89f1ad5014c..000000000000
--- a/docs/src/main/sphinx/sql.rst
+++ /dev/null
@@ -1,75 +0,0 @@
-********************
-SQL statement syntax
-********************
-
-This chapter describes the SQL syntax used in Trino.
-
-A :doc:`reference to the supported SQL data types</language>` is available.
-
-Trino also provides :doc:`numerous SQL functions and operators<functions>`.
-
-.. toctree::
-    :maxdepth: 1
-
-    sql/alter-materialized-view
-    sql/alter-schema
-    sql/alter-table
-    sql/alter-view
-    sql/analyze
-    sql/call
-    sql/comment
-    sql/commit
-    sql/create-materialized-view
-    sql/create-role
-    sql/create-schema
-    sql/create-table
-    sql/create-table-as
-    sql/create-view
-    sql/deallocate-prepare
-    sql/delete
-    sql/describe
-    sql/describe-input
-    sql/describe-output
-    sql/drop-materialized-view
-    sql/drop-role
-    sql/drop-schema
-    sql/drop-table
-    sql/drop-view
-    sql/execute
-    sql/explain
-    sql/explain-analyze
-    sql/grant
-    sql/grant-roles
-    sql/insert
-    sql/match-recognize
-    sql/merge
-    sql/pattern-recognition-in-window
-    sql/prepare
-    sql/refresh-materialized-view
-    sql/reset-session
-    sql/revoke
-    sql/revoke-roles
-    sql/rollback
-    sql/select
-    sql/set-role
-    sql/set-session
-    sql/set-time-zone
-    sql/show-catalogs
-    sql/show-columns
-    sql/show-create-materialized-view
-    sql/show-create-schema
-    sql/show-create-table
-    sql/show-create-view
-    sql/show-functions
-    sql/show-grants
-    sql/show-role-grants
-    sql/show-roles
-    sql/show-schemas
-    sql/show-session
-    sql/show-stats
-    sql/show-tables
-    sql/start-transaction
-    sql/truncate
-    sql/update
-    sql/use
-    sql/values
diff --git a/docs/src/main/sphinx/sql/alter-materialized-view.md b/docs/src/main/sphinx/sql/alter-materialized-view.md
new file mode 100644
index 000000000000..e6c7854b575f
--- /dev/null
+++ b/docs/src/main/sphinx/sql/alter-materialized-view.md
@@ -0,0 +1,72 @@
+# ALTER MATERIALIZED VIEW
+
+## Synopsis
+
+```text
+ALTER MATERIALIZED VIEW [ IF EXISTS ] name RENAME TO new_name
+ALTER MATERIALIZED VIEW name SET PROPERTIES property_name = expression [, ...]
+```
+
+## Description
+
+Change the name of an existing materialized view.
+
+The optional `IF EXISTS` clause causes the error to be suppressed if the
+materialized view does not exist. The error is not suppressed if the
+materialized view does not exist, but a table or view with the given name
+exists.
+
+(alter-materialized-view-set-properties)=
+
+### SET PROPERTIES
+
+The `ALTER MATERIALIZED VIEW SET PROPERTIES`  statement followed by some number
+of `property_name` and `expression` pairs applies the specified properties
+and values to a materialized view. Ommitting an already-set property from this
+statement leaves that property unchanged in the materialized view.
+
+A property in a `SET PROPERTIES` statement can be set to `DEFAULT`, which
+reverts its value back to the default in that materialized view.
+
+Support for `ALTER MATERIALIZED VIEW SET PROPERTIES` varies between
+connectors. Refer to the connector documentation for more details.
+
+## Examples
+
+Rename materialized view `people` to `users` in the current schema:
+
+```
+ALTER MATERIALIZED VIEW people RENAME TO users;
+```
+
+Rename materialized view `people` to `users`, if materialized view
+`people` exists in the current catalog and schema:
+
+```
+ALTER MATERIALIZED VIEW IF EXISTS people RENAME TO users;
+```
+
+Set view properties (`x = y`) in materialized view `people`:
+
+```
+ALTER MATERIALIZED VIEW people SET PROPERTIES x = 'y';
+```
+
+Set multiple view properties (`foo = 123` and `foo bar = 456`) in
+materialized view `people`:
+
+```
+ALTER MATERIALIZED VIEW people SET PROPERTIES foo = 123, "foo bar" = 456;
+```
+
+Set view property `x` to its default value in materialized view `people`:
+
+```
+ALTER MATERIALIZED VIEW people SET PROPERTIES x = DEFAULT;
+```
+
+## See also
+
+- {doc}`create-materialized-view`
+- {doc}`refresh-materialized-view`
+- {doc}`drop-materialized-view`
diff --git a/docs/src/main/sphinx/sql/alter-materialized-view.rst b/docs/src/main/sphinx/sql/alter-materialized-view.rst
deleted file mode 100644
index 2e66af56fb4b..000000000000
--- a/docs/src/main/sphinx/sql/alter-materialized-view.rst
+++ /dev/null
@@ -1,69 +0,0 @@
-=======================
-ALTER MATERIALIZED VIEW
-=======================
-
-Synopsis
---------
-
-.. code-block:: text
-
-    ALTER MATERIALIZED VIEW [ IF EXISTS ] name RENAME TO new_name
-    ALTER MATERIALIZED VIEW name SET PROPERTIES property_name = expression [, ...]
-
-Description
------------
-
-Change the name of an existing materialized view.
-
-The optional ``IF EXISTS`` clause causes the error to be suppressed if the
-materialized view does not exist. The error is not suppressed if the
-materialized view does not exist, but a table or view with the given name
-exists.
-
-.. _alter-materialized-view-set-properties:
-
-SET PROPERTIES
-^^^^^^^^^^^^^^
-
-The ``ALTER MATERIALIZED VIEW SET PROPERTIES``  statement followed by some number
-of ``property_name`` and ``expression`` pairs applies the specified properties
-and values to a materialized view. Ommitting an already-set property from this
-statement leaves that property unchanged in the materialized view.
-
-A property in a ``SET PROPERTIES`` statement can be set to ``DEFAULT``, which
-reverts its value back to the default in that materialized view.
-
-Support for ``ALTER MATERIALIZED VIEW SET PROPERTIES`` varies between
-connectors. Refer to the connector documentation for more details.
-
-Examples
---------
-
-Rename materialized view ``people`` to ``users`` in the current schema::
-
-    ALTER MATERIALIZED VIEW people RENAME TO users;
-
-Rename materialized view ``people`` to ``users``, if materialized view
-``people`` exists in the current catalog and schema::
-
-    ALTER MATERIALIZED VIEW IF EXISTS people RENAME TO users;
-
-Set view properties (``x = y``) in materialized view ``people``::
-
-    ALTER MATERIALIZED VIEW people SET PROPERTIES x = 'y';
-
-Set multiple view properties (``foo = 123`` and ``foo bar = 456``) in
-materialized view ``people``::
-
-    ALTER MATERIALIZED VIEW people SET PROPERTIES foo = 123, "foo bar" = 456;
-
-Set view property ``x`` to its default value in materialized view ``people``::
-
-    ALTER MATERIALIZED VIEW people SET PROPERTIES x = DEFAULT;
-
-See also
---------
-
-* :doc:`create-materialized-view`
-* :doc:`refresh-materialized-view`
-* :doc:`drop-materialized-view`
diff --git a/docs/src/main/sphinx/sql/alter-schema.md b/docs/src/main/sphinx/sql/alter-schema.md
new file mode 100644
index 000000000000..ead700bcf78d
--- /dev/null
+++ b/docs/src/main/sphinx/sql/alter-schema.md
@@ -0,0 +1,36 @@
+# ALTER SCHEMA
+
+## Synopsis
+
+```text
+ALTER SCHEMA name RENAME TO new_name
+ALTER SCHEMA name SET AUTHORIZATION ( user | USER user | ROLE role )
+```
+
+## Description
+
+Change the definition of an existing schema.
+
+## Examples
+
+Rename schema `web` to `traffic`:
+
+```
+ALTER SCHEMA web RENAME TO traffic
+```
+
+Change owner of schema `web` to user `alice`:
+
+```
+ALTER SCHEMA web SET AUTHORIZATION alice
+```
+
+Allow everyone to drop schema and create tables in schema `web`:
+
+```
+ALTER SCHEMA web SET AUTHORIZATION ROLE PUBLIC
+```
+
+## See Also
+
+{doc}`create-schema`
diff --git a/docs/src/main/sphinx/sql/alter-schema.rst b/docs/src/main/sphinx/sql/alter-schema.rst
deleted file mode 100644
index 3c6dc3a0204a..000000000000
--- a/docs/src/main/sphinx/sql/alter-schema.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-============
-ALTER SCHEMA
-============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    ALTER SCHEMA name RENAME TO new_name
-    ALTER SCHEMA name SET AUTHORIZATION ( user | USER user | ROLE role )
-
-Description
------------
-
-Change the definition of an existing schema.
-
-Examples
---------
-
-Rename schema ``web`` to ``traffic``::
-
-    ALTER SCHEMA web RENAME TO traffic
-
-Change owner of schema ``web`` to user ``alice``::
-
-    ALTER SCHEMA web SET AUTHORIZATION alice
-
-Allow everyone to drop schema and create tables in schema ``web``::
-
-    ALTER SCHEMA web SET AUTHORIZATION ROLE PUBLIC
-
-See Also
---------
-
-:doc:`create-schema`
diff --git a/docs/src/main/sphinx/sql/alter-table.md b/docs/src/main/sphinx/sql/alter-table.md
new file mode 100644
index 000000000000..08e2a43fbecc
--- /dev/null
+++ b/docs/src/main/sphinx/sql/alter-table.md
@@ -0,0 +1,156 @@
+# ALTER TABLE
+
+## Synopsis
+
+```text
+ALTER TABLE [ IF EXISTS ] name RENAME TO new_name
+ALTER TABLE [ IF EXISTS ] name ADD COLUMN [ IF NOT EXISTS ] column_name data_type
+  [ NOT NULL ] [ COMMENT comment ]
+  [ WITH ( property_name = expression [, ...] ) ]
+ALTER TABLE [ IF EXISTS ] name DROP COLUMN [ IF EXISTS ] column_name
+ALTER TABLE [ IF EXISTS ] name RENAME COLUMN [ IF EXISTS ] old_name TO new_name
+ALTER TABLE [ IF EXISTS ] name ALTER COLUMN column_name SET DATA TYPE new_type
+ALTER TABLE name SET AUTHORIZATION ( user | USER user | ROLE role )
+ALTER TABLE name SET PROPERTIES property_name = expression [, ...]
+ALTER TABLE name EXECUTE command [ ( parameter => expression [, ... ] ) ]
+    [ WHERE expression ]
+```
+
+## Description
+
+Change the definition of an existing table.
+
+The optional `IF EXISTS` (when used before the table name) clause causes the error to be suppressed if the table does not exists.
+
+The optional `IF EXISTS` (when used before the column name) clause causes the error to be suppressed if the column does not exists.
+
+The optional `IF NOT EXISTS` clause causes the error to be suppressed if the column already exists.
+
+(alter-table-set-properties)=
+
+### SET PROPERTIES
+
+The `ALTER TABLE SET PROPERTIES`  statement followed by some number
+of `property_name` and `expression` pairs applies the specified properties
+and values to a table. Ommitting an already-set property from this
+statement leaves that property unchanged in the table.
+
+A property in a `SET PROPERTIES` statement can be set to `DEFAULT`, which
+reverts its value back to the default in that table.
+
+Support for `ALTER TABLE SET PROPERTIES` varies between
+connectors, as not all connectors support modifying table properties.
+
+(alter-table-execute)=
+
+### EXECUTE
+
+The `ALTER TABLE EXECUTE` statement followed by a `command` and
+`parameters` modifies the table according to the specified command and
+parameters. `ALTER TABLE EXECUTE` supports different commands on a
+per-connector basis.
+
+You can use the `=>` operator for passing named parameter values.
+The left side is the name of the parameter, the right side is the value being passed:
+
+```
+ALTER TABLE hive.schema.test_table EXECUTE optimize(file_size_threshold => '10MB')
+```
+
+## Examples
+
+Rename table `users` to `people`:
+
+```
+ALTER TABLE users RENAME TO people;
+```
+
+Rename table `users` to `people` if table `users` exists:
+
+```
+ALTER TABLE IF EXISTS users RENAME TO people;
+```
+
+Add column `zip` to the `users` table:
+
+```
+ALTER TABLE users ADD COLUMN zip varchar;
+```
+
+Add column `zip` to the `users` table if table `users` exists and column `zip` not already exists:
+
+```
+ALTER TABLE IF EXISTS users ADD COLUMN IF NOT EXISTS zip varchar;
+```
+
+Drop column `zip` from the `users` table:
+
+```
+ALTER TABLE users DROP COLUMN zip;
+```
+
+Drop column `zip` from the `users` table if table `users` and column `zip` exists:
+
+```
+ALTER TABLE IF EXISTS users DROP COLUMN IF EXISTS zip;
+```
+
+Rename column `id` to `user_id` in the `users` table:
+
+```
+ALTER TABLE users RENAME COLUMN id TO user_id;
+```
+
+Rename column `id` to `user_id` in the `users` table if table `users` and column `id` exists:
+
+```
+ALTER TABLE IF EXISTS users RENAME column IF EXISTS id to user_id;
+```
+
+Change type of column `id` to `bigint` in the `users` table:
+
+```
+ALTER TABLE users ALTER COLUMN id SET DATA TYPE bigint;
+```
+
+Change owner of table `people` to user `alice`:
+
+```
+ALTER TABLE people SET AUTHORIZATION alice
+```
+
+Allow everyone with role public to drop and alter table `people`:
+
+```
+ALTER TABLE people SET AUTHORIZATION ROLE PUBLIC
+```
+
+Set table properties (`x = y`) in table `people`:
+
+```
+ALTER TABLE people SET PROPERTIES x = 'y';
+```
+
+Set multiple table properties (`foo = 123` and `foo bar = 456`) in
+table `people`:
+
+```
+ALTER TABLE people SET PROPERTIES foo = 123, "foo bar" = 456;
+```
+
+Set table property `x` to its default value in table\`\`people\`\`:
+
+```
+ALTER TABLE people SET PROPERTIES x = DEFAULT;
+```
+
+Collapse files in a table that are over 10 megabytes in size, as supported by
+the Hive connector:
+
+```
+ALTER TABLE hive.schema.test_table EXECUTE optimize(file_size_threshold => '10MB')
+```
+
+## See also
+
+{doc}`create-table`
diff --git a/docs/src/main/sphinx/sql/alter-table.rst b/docs/src/main/sphinx/sql/alter-table.rst
deleted file mode 100644
index cb8cd4012017..000000000000
--- a/docs/src/main/sphinx/sql/alter-table.rst
+++ /dev/null
@@ -1,133 +0,0 @@
-===========
-ALTER TABLE
-===========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    ALTER TABLE [ IF EXISTS ] name RENAME TO new_name
-    ALTER TABLE [ IF EXISTS ] name ADD COLUMN [ IF NOT EXISTS ] column_name data_type
-      [ NOT NULL ] [ COMMENT comment ]
-      [ WITH ( property_name = expression [, ...] ) ]
-    ALTER TABLE [ IF EXISTS ] name DROP COLUMN [ IF EXISTS ] column_name
-    ALTER TABLE [ IF EXISTS ] name RENAME COLUMN [ IF EXISTS ] old_name TO new_name
-    ALTER TABLE [ IF EXISTS ] name ALTER COLUMN column_name SET DATA TYPE new_type
-    ALTER TABLE name SET AUTHORIZATION ( user | USER user | ROLE role )
-    ALTER TABLE name SET PROPERTIES property_name = expression [, ...]
-    ALTER TABLE name EXECUTE command [ ( parameter => expression [, ... ] ) ]
-        [ WHERE expression ]
-
-Description
------------
-
-Change the definition of an existing table.
-
-The optional ``IF EXISTS`` (when used before the table name) clause causes the error to be suppressed if the table does not exists.
-
-The optional ``IF EXISTS`` (when used before the column name) clause causes the error to be suppressed if the column does not exists.
-
-The optional ``IF NOT EXISTS`` clause causes the error to be suppressed if the column already exists.
-
-.. _alter-table-set-properties:
-
-SET PROPERTIES
-^^^^^^^^^^^^^^
-
-The ``ALTER TABLE SET PROPERTIES``  statement followed by some number
-of ``property_name`` and ``expression`` pairs applies the specified properties
-and values to a table. Ommitting an already-set property from this
-statement leaves that property unchanged in the table.
-
-A property in a ``SET PROPERTIES`` statement can be set to ``DEFAULT``, which
-reverts its value back to the default in that table.
-
-Support for ``ALTER TABLE SET PROPERTIES`` varies between
-connectors, as not all connectors support modifying table properties.
-
-.. _alter-table-execute:
-
-EXECUTE
-^^^^^^^
-
-The ``ALTER TABLE EXECUTE`` statement followed by a ``command`` and
-``parameters`` modifies the table according to the specified command and
-parameters. ``ALTER TABLE EXECUTE`` supports different commands on a
-per-connector basis.
-
-You can use the ``=>`` operator for passing named parameter values.
-The left side is the name of the parameter, the right side is the value being passed::
-
-    ALTER TABLE hive.schema.test_table EXECUTE optimize(file_size_threshold => '10MB')
-
-Examples
---------
-
-Rename table ``users`` to ``people``::
-
-    ALTER TABLE users RENAME TO people;
-
-Rename table ``users`` to ``people`` if table ``users`` exists::
-
-    ALTER TABLE IF EXISTS users RENAME TO people;
-
-Add column ``zip`` to the ``users`` table::
-
-    ALTER TABLE users ADD COLUMN zip varchar;
-
-Add column ``zip`` to the ``users`` table if table ``users`` exists and column ``zip`` not already exists::
-
-    ALTER TABLE IF EXISTS users ADD COLUMN IF NOT EXISTS zip varchar;
-
-Drop column ``zip`` from the ``users`` table::
-
-    ALTER TABLE users DROP COLUMN zip;
-
-Drop column ``zip`` from the ``users`` table if table ``users`` and column ``zip`` exists::
-
-    ALTER TABLE IF EXISTS users DROP COLUMN IF EXISTS zip;
-
-Rename column ``id`` to ``user_id`` in the ``users`` table::
-
-    ALTER TABLE users RENAME COLUMN id TO user_id;
-
-Rename column ``id`` to ``user_id`` in the ``users`` table if table ``users`` and column ``id`` exists::
-
-    ALTER TABLE IF EXISTS users RENAME column IF EXISTS id to user_id;
-
-Change type of column ``id`` to ``bigint`` in the ``users`` table::
-
-    ALTER TABLE users ALTER COLUMN id SET DATA TYPE bigint;
-
-Change owner of table ``people`` to user ``alice``::
-
-    ALTER TABLE people SET AUTHORIZATION alice
-
-Allow everyone with role public to drop and alter table ``people``::
-
-    ALTER TABLE people SET AUTHORIZATION ROLE PUBLIC
-
-Set table properties (``x = y``) in table ``people``::
-
-    ALTER TABLE people SET PROPERTIES x = 'y';
-
-Set multiple table properties (``foo = 123`` and ``foo bar = 456``) in
-table ``people``::
-
-    ALTER TABLE people SET PROPERTIES foo = 123, "foo bar" = 456;
-
-Set table property ``x`` to its default value in table``people``::
-
-    ALTER TABLE people SET PROPERTIES x = DEFAULT;
-
-
-Collapse files in a table that are over 10 megabytes in size, as supported by
-the Hive connector::
-
-    ALTER TABLE hive.schema.test_table EXECUTE optimize(file_size_threshold => '10MB')
-
-See also
---------
-
-:doc:`create-table`
diff --git a/docs/src/main/sphinx/sql/alter-view.md b/docs/src/main/sphinx/sql/alter-view.md
new file mode 100644
index 000000000000..9c9d91aa3a65
--- /dev/null
+++ b/docs/src/main/sphinx/sql/alter-view.md
@@ -0,0 +1,30 @@
+# ALTER VIEW
+
+## Synopsis
+
+```text
+ALTER VIEW name RENAME TO new_name
+ALTER VIEW name SET AUTHORIZATION ( user | USER user | ROLE role )
+```
+
+## Description
+
+Change the definition of an existing view.
+
+## Examples
+
+Rename view `people` to `users`:
+
+```
+ALTER VIEW people RENAME TO users
+```
+
+Change owner of VIEW `people` to user `alice`:
+
+```
+ALTER VIEW people SET AUTHORIZATION alice
+```
+
+## See also
+
+{doc}`create-view`
diff --git a/docs/src/main/sphinx/sql/alter-view.rst b/docs/src/main/sphinx/sql/alter-view.rst
deleted file mode 100644
index 6c447cc396e5..000000000000
--- a/docs/src/main/sphinx/sql/alter-view.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-===========
-ALTER VIEW
-===========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    ALTER VIEW name RENAME TO new_name
-    ALTER VIEW name SET AUTHORIZATION ( user | USER user | ROLE role )
-
-Description
------------
-
-Change the definition of an existing view.
-
-Examples
---------
-
-Rename view ``people`` to ``users``::
-
-    ALTER VIEW people RENAME TO users
-
-Change owner of VIEW ``people`` to user ``alice``::
-
-    ALTER VIEW people SET AUTHORIZATION alice
-
-See also
---------
-
-:doc:`create-view`
diff --git a/docs/src/main/sphinx/sql/analyze.md b/docs/src/main/sphinx/sql/analyze.md
new file mode 100644
index 000000000000..f3e03af5ef7b
--- /dev/null
+++ b/docs/src/main/sphinx/sql/analyze.md
@@ -0,0 +1,53 @@
+# ANALYZE
+
+## Synopsis
+
+```text
+ANALYZE table_name [ WITH ( property_name = expression [, ...] ) ]
+```
+
+## Description
+
+Collects table and column statistics for a given table.
+
+The optional `WITH` clause can be used to provide connector-specific properties.
+To list all available properties, run the following query:
+
+```
+SELECT * FROM system.metadata.analyze_properties
+```
+
+## Examples
+
+Analyze table `web` to collect table and column statistics:
+
+```
+ANALYZE web;
+```
+
+Analyze table `stores` in catalog `hive` and schema `default`:
+
+```
+ANALYZE hive.default.stores;
+```
+
+Analyze partitions `'1992-01-01', '1992-01-02'` from a Hive partitioned table `sales`:
+
+```
+ANALYZE hive.default.sales WITH (partitions = ARRAY[ARRAY['1992-01-01'], ARRAY['1992-01-02']]);
+```
+
+Analyze partitions with complex partition key (`state` and `city` columns) from a Hive partitioned table `customers`:
+
+```
+ANALYZE hive.default.customers WITH (partitions = ARRAY[ARRAY['CA', 'San Francisco'], ARRAY['NY', 'NY']]);
+```
+
+Analyze only columns `department` and `product_id` for partitions `'1992-01-01', '1992-01-02'` from a Hive partitioned
+table `sales`:
+
+```
+ANALYZE hive.default.sales WITH (
+    partitions = ARRAY[ARRAY['1992-01-01'], ARRAY['1992-01-02']],
+    columns = ARRAY['department', 'product_id']);
+```
diff --git a/docs/src/main/sphinx/sql/analyze.rst b/docs/src/main/sphinx/sql/analyze.rst
deleted file mode 100644
index 47b5cd21b9e8..000000000000
--- a/docs/src/main/sphinx/sql/analyze.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-=======
-ANALYZE
-=======
-
-Synopsis
---------
-
-.. code-block:: text
-
-    ANALYZE table_name [ WITH ( property_name = expression [, ...] ) ]
-
-Description
------------
-
-Collects table and column statistics for a given table.
-
-The optional ``WITH`` clause can be used to provide connector-specific properties.
-To list all available properties, run the following query::
-
-    SELECT * FROM system.metadata.analyze_properties
-
-Examples
---------
-
-Analyze table ``web`` to collect table and column statistics::
-
-    ANALYZE web;
-
-Analyze table ``stores`` in catalog ``hive`` and schema ``default``::
-
-    ANALYZE hive.default.stores;
-
-Analyze partitions ``'1992-01-01', '1992-01-02'`` from a Hive partitioned table ``sales``::
-
-    ANALYZE hive.default.sales WITH (partitions = ARRAY[ARRAY['1992-01-01'], ARRAY['1992-01-02']]);
-
-Analyze partitions with complex partition key (``state`` and ``city`` columns) from a Hive partitioned table ``customers``::
-
-    ANALYZE hive.default.customers WITH (partitions = ARRAY[ARRAY['CA', 'San Francisco'], ARRAY['NY', 'NY']]);
-
-Analyze only columns ``department`` and ``product_id`` for partitions ``'1992-01-01', '1992-01-02'`` from a Hive partitioned
-table ``sales``::
-
-    ANALYZE hive.default.sales WITH (
-        partitions = ARRAY[ARRAY['1992-01-01'], ARRAY['1992-01-02']],
-        columns = ARRAY['department', 'product_id']);
-
diff --git a/docs/src/main/sphinx/sql/call.md b/docs/src/main/sphinx/sql/call.md
new file mode 100644
index 000000000000..c03dacda5a25
--- /dev/null
+++ b/docs/src/main/sphinx/sql/call.md
@@ -0,0 +1,42 @@
+# CALL
+
+## Synopsis
+
+```text
+CALL procedure_name ( [ name => ] expression [, ...] )
+```
+
+## Description
+
+Call a procedure.
+
+Procedures can be provided by connectors to perform data manipulation or
+administrative tasks. For example, the {doc}`/connector/system` defines a
+procedure for killing a running query.
+
+Some connectors, such as the {doc}`/connector/postgresql`, are for systems
+that have their own stored procedures. These stored procedures are separate
+from the connector-defined procedures discussed here and thus are not
+directly callable via `CALL`.
+
+See connector documentation for details on available procedures.
+
+## Examples
+
+Call a procedure using positional arguments:
+
+```
+CALL test(123, 'apple');
+```
+
+Call a procedure using named arguments:
+
+```
+CALL test(name => 'apple', id => 123);
+```
+
+Call a procedure using a fully qualified name:
+
+```
+CALL catalog.schema.test();
+```
diff --git a/docs/src/main/sphinx/sql/call.rst b/docs/src/main/sphinx/sql/call.rst
deleted file mode 100644
index a925b27c24cb..000000000000
--- a/docs/src/main/sphinx/sql/call.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-====
-CALL
-====
-
-Synopsis
---------
-
-.. code-block:: text
-
-    CALL procedure_name ( [ name => ] expression [, ...] )
-
-Description
------------
-
-Call a procedure.
-
-Procedures can be provided by connectors to perform data manipulation or
-administrative tasks. For example, the :doc:`/connector/system` defines a
-procedure for killing a running query.
-
-Some connectors, such as the :doc:`/connector/postgresql`, are for systems
-that have their own stored procedures. These stored procedures are separate
-from the connector-defined procedures discussed here and thus are not
-directly callable via ``CALL``.
-
-See connector documentation for details on available procedures.
-
-Examples
---------
-
-Call a procedure using positional arguments::
-
-    CALL test(123, 'apple');
-
-Call a procedure using named arguments::
-
-    CALL test(name => 'apple', id => 123);
-
-Call a procedure using a fully qualified name::
-
-    CALL catalog.schema.test();
diff --git a/docs/src/main/sphinx/sql/comment.md b/docs/src/main/sphinx/sql/comment.md
new file mode 100644
index 000000000000..8ed32a746ae1
--- /dev/null
+++ b/docs/src/main/sphinx/sql/comment.md
@@ -0,0 +1,35 @@
+# COMMENT
+
+## Synopsis
+
+```text
+COMMENT ON ( TABLE | VIEW | COLUMN ) name IS 'comments'
+```
+
+## Description
+
+Set the comment for a object. The comment can be removed by setting the comment to `NULL`.
+
+## Examples
+
+Change the comment for the `users` table to be `master table`:
+
+```
+COMMENT ON TABLE users IS 'master table';
+```
+
+Change the comment for the `users` view to be `master view`:
+
+```
+COMMENT ON VIEW users IS 'master view';
+```
+
+Change the comment for the `users.name` column to be `full name`:
+
+```
+COMMENT ON COLUMN users.name IS 'full name';
+```
+
+## See also
+
+[](/language/comments)
diff --git a/docs/src/main/sphinx/sql/comment.rst b/docs/src/main/sphinx/sql/comment.rst
deleted file mode 100644
index 2ec58bcc9c79..000000000000
--- a/docs/src/main/sphinx/sql/comment.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-=======
-COMMENT
-=======
-
-Synopsis
---------
-
-.. code-block:: text
-
-    COMMENT ON ( TABLE | VIEW | COLUMN ) name IS 'comments'
-
-Description
------------
-
-Set the comment for a object. The comment can be removed by setting the comment to ``NULL``.
-
-Examples
---------
-
-Change the comment for the ``users`` table to be ``master table``::
-
-    COMMENT ON TABLE users IS 'master table';
-
-Change the comment for the ``users`` view to be ``master view``::
-
-    COMMENT ON VIEW users IS 'master view';
-
-Change the comment for the ``users.name`` column to be ``full name``::
-
-    COMMENT ON COLUMN users.name IS 'full name';
diff --git a/docs/src/main/sphinx/sql/commit.md b/docs/src/main/sphinx/sql/commit.md
new file mode 100644
index 000000000000..3cd2623786e1
--- /dev/null
+++ b/docs/src/main/sphinx/sql/commit.md
@@ -0,0 +1,22 @@
+# COMMIT
+
+## Synopsis
+
+```text
+COMMIT [ WORK ]
+```
+
+## Description
+
+Commit the current transaction.
+
+## Examples
+
+```sql
+COMMIT;
+COMMIT WORK;
+```
+
+## See also
+
+{doc}`rollback`, {doc}`start-transaction`
diff --git a/docs/src/main/sphinx/sql/commit.rst b/docs/src/main/sphinx/sql/commit.rst
deleted file mode 100644
index e87ea40c8c17..000000000000
--- a/docs/src/main/sphinx/sql/commit.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-======
-COMMIT
-======
-
-Synopsis
---------
-
-.. code-block:: text
-
-    COMMIT [ WORK ]
-
-Description
------------
-
-Commit the current transaction.
-
-Examples
---------
-
-.. code-block:: sql
-
-    COMMIT;
-    COMMIT WORK;
-
-See also
---------
-
-:doc:`rollback`, :doc:`start-transaction`
diff --git a/docs/src/main/sphinx/sql/create-function.md b/docs/src/main/sphinx/sql/create-function.md
new file mode 100644
index 000000000000..403cc19f9209
--- /dev/null
+++ b/docs/src/main/sphinx/sql/create-function.md
@@ -0,0 +1,52 @@
+# CREATE FUNCTION
+
+## Synopsis
+
+```text
+CREATE [OR REPLACE] FUNCTION
+  routine_definition
+```
+
+## Description
+
+Create or replace a [](routine-catalog). The `routine_definition` is composed of
+the usage of [](/routines/function) and nested statements. The name of the
+routine must be fully qualified with catalog and schema location, unless the
+[default SQL routine storage catalog and
+schema](/admin/properties-sql-environment) are configured. The connector used in
+the catalog must support routine storage.
+
+The optional `OR REPLACE` clause causes the routine to be replaced if it already
+exists rather than raising an error.
+
+## Examples
+
+The following example creates the `meaning_of_life` routine in the `default`
+schema of the `example` catalog:
+
+```sql
+CREATE FUNCTION example.default.meaning_of_life()
+  RETURNS bigint
+  BEGIN
+    RETURN 42;
+  END;
+```
+
+If the [default catalog and schema for routine
+storage](/admin/properties-sql-environment) is configured, you can use the
+following more compact syntax:
+
+```sql
+CREATE FUNCTION meaning_of_life() RETURNS bigint RETURN 42;
+```
+
+Further examples of varying complexity that cover usage of the `FUNCTION`
+statement in combination with other statements are available in the [SQL
+routines examples documentation](/routines/examples).
+
+## See also
+
+* [](/sql/drop-function)
+* [](/sql/show-functions)
+* [](/routines/introduction)
+* [](/admin/properties-sql-environment)
diff --git a/docs/src/main/sphinx/sql/create-materialized-view.md b/docs/src/main/sphinx/sql/create-materialized-view.md
new file mode 100644
index 000000000000..3c2f1bc06f92
--- /dev/null
+++ b/docs/src/main/sphinx/sql/create-materialized-view.md
@@ -0,0 +1,120 @@
+# CREATE MATERIALIZED VIEW
+
+## Synopsis
+
+```text
+CREATE [ OR REPLACE ] MATERIALIZED VIEW
+[ IF NOT EXISTS ] view_name
+[ GRACE PERIOD interval ]
+[ COMMENT string ]
+[ WITH properties ]
+AS query
+```
+
+## Description
+
+Create and validate the definition of a new materialized view `view_name` of a
+{doc}`select` `query`. You need to run the {doc}`refresh-materialized-view`
+statement after the creation to populate the materialized view with data. This
+materialized view is a physical manifestation of the query results at time of
+refresh. The data is stored, and can be referenced by future queries.
+
+Queries accessing materialized views are typically faster than retrieving data
+from a view created with the same query. Any computation, aggregation, and other
+operation to create the data is performed once during refresh of the
+materialized views, as compared to each time of accessing the view. Multiple
+reads of view data over time, or by multiple users, all trigger repeated
+processing. This is avoided for materialized views.
+
+The optional `OR REPLACE` clause causes the materialized view to be replaced
+if it already exists rather than raising an error.
+
+The optional `IF NOT EXISTS` clause causes the materialized view only to be
+created if it does not exist yet.
+
+Note that `OR REPLACE` and `IF NOT EXISTS` are mutually exclusive clauses.
+
+The optional `GRACE PERIOD` clause specifies how long the query materialization
+is used for querying. If the time elapsed since last materialized view refresh
+is greater than the grace period, the materialized view acts as a normal view and
+the materialized data is not used. If not specified, the grace period defaults to
+infinity. See {doc}`refresh-materialized-view` for more about refreshing
+materialized views.
+
+The optional `COMMENT` clause causes a `string` comment to be stored with
+the metadata about the materialized view. The comment is displayed with the
+{doc}`show-create-materialized-view` statement and is available in the table
+`system.metadata.materialized_view_properties`.
+
+The optional `WITH` clause is used to define properties for the materialized
+view creation. Separate multiple property/value pairs by commas. The connector
+uses the properties as input parameters for the materialized view refresh
+operation. The supported properties are different for each connector and
+detailed in the SQL support section of the specific connector's documentation.
+
+After successful creation, all metadata about the materialized view is available
+in a {ref}`system table <system-metadata-materialized-views>`.
+
+## Examples
+
+Create a simple materialized view `cancelled_orders` over the `orders` table
+that only includes cancelled orders. Note that `orderstatus` is a numeric
+value that is potentially meaningless to a consumer, yet the name of the view
+clarifies the content:
+
+```
+CREATE MATERIALIZED VIEW cancelled_orders
+AS
+    SELECT orderkey, totalprice
+    FROM orders
+    WHERE orderstatus = 3;
+```
+
+Create or replace a materialized view `order_totals_by_date` that summarizes
+`orders` across all orders from all customers:
+
+```
+CREATE OR REPLACE MATERIALIZED VIEW order_totals_by_date
+AS
+    SELECT orderdate, sum(totalprice) AS price
+    FROM orders
+    GROUP BY orderdate;
+```
+
+Create a materialized view for a catalog using the Iceberg connector, with a
+comment and partitioning on two fields in the storage:
+
+```
+CREATE MATERIALIZED VIEW orders_nation_mkgsegment
+COMMENT 'Orders with nation and market segment data'
+WITH ( partitioning = ARRAY['mktsegment', 'nationkey'] )
+AS
+    SELECT o.*, c.nationkey, c.mktsegment
+    FROM orders AS o
+    JOIN customer AS c
+    ON o.custkey = c.custkey;
+```
+
+Set multiple properties:
+
+```
+WITH ( format = 'ORC', partitioning = ARRAY['_date'] )
+```
+
+Show defined materialized view properties for all catalogs:
+
+```
+SELECT * FROM system.metadata.materialized_view_properties;
+```
+
+Show metadata about the materialized views in all catalogs:
+
+```
+SELECT * FROM system.metadata.materialized_views;
+```
+
+## See also
+
+- {doc}`drop-materialized-view`
+- {doc}`show-create-materialized-view`
+- {doc}`refresh-materialized-view`
diff --git a/docs/src/main/sphinx/sql/create-materialized-view.rst b/docs/src/main/sphinx/sql/create-materialized-view.rst
deleted file mode 100644
index b2dd6526fde3..000000000000
--- a/docs/src/main/sphinx/sql/create-materialized-view.rst
+++ /dev/null
@@ -1,112 +0,0 @@
-========================
-CREATE MATERIALIZED VIEW
-========================
-
-Synopsis
---------
-
-.. code-block:: text
-
-    CREATE [ OR REPLACE ] MATERIALIZED VIEW
-    [ IF NOT EXISTS ] view_name
-    [ GRACE PERIOD interval ]
-    [ COMMENT string ]
-    [ WITH properties ]
-    AS query
-
-Description
------------
-
-Create and validate the definition of a new materialized view ``view_name`` of a
-:doc:`select` ``query``. You need to run the :doc:`refresh-materialized-view`
-statement after the creation to populate the materialized view with data. This
-materialized view is a physical manifestation of the query results at time of
-refresh. The data is stored, and can be referenced by future queries.
-
-Queries accessing materialized views are typically faster than retrieving data
-from a view created with the same query. Any computation, aggregation, and other
-operation to create the data is performed once during refresh of the
-materialized views, as compared to each time of accessing the view. Multiple
-reads of view data over time, or by multiple users, all trigger repeated
-processing. This is avoided for materialized views.
-
-The optional ``OR REPLACE`` clause causes the materialized view to be replaced
-if it already exists rather than raising an error.
-
-The optional ``IF NOT EXISTS`` clause causes the materialized view only to be
-created or replaced if it does not exist yet.
-
-The optional ``GRACE PERIOD`` clause specifies how long the query materialization
-is used for querying. If the time elapsed since last materialized view refresh
-is greater than the grace period, the materialized view acts as a normal view and
-the materialized data is not used. If not specified, the grace period defaults to
-infinity. See :doc:`refresh-materialized-view` for more about refreshing
-materialized views.
-
-The optional ``COMMENT`` clause causes a ``string`` comment to be stored with
-the metadata about the materialized view. The comment is displayed with the
-:doc:`show-create-materialized-view` statement and is available in the table
-``system.metadata.materialized_view_properties``.
-
-The optional ``WITH`` clause is used to define properties for the materialized
-view creation. Separate multiple property/value pairs by commas. The connector
-uses the properties as input parameters for the materialized view refresh
-operation. The supported properties are different for each connector and
-detailed in the SQL support section of the specific connector's documentation.
-
-After successful creation, all metadata about the materialized view is available
-in a :ref:`system table <system_metadata_materialized_views>`.
-
-Examples
---------
-
-Create a simple materialized view ``cancelled_orders`` over the ``orders`` table
-that only includes cancelled orders. Note that ``orderstatus`` is a numeric
-value that is potentially meaningless to a consumer, yet the name of the view
-clarifies the content::
-
-    CREATE MATERIALIZED VIEW cancelled_orders
-    AS
-        SELECT orderkey, totalprice
-        FROM orders
-        WHERE orderstatus = 3;
-
-Create or replace a materialized view ``order_totals_by_date`` that summarizes
-``orders`` across all orders from all customers::
-
-    CREATE OR REPLACE MATERIALIZED VIEW order_totals_by_date
-    AS
-        SELECT orderdate, sum(totalprice) AS price
-        FROM orders
-        GROUP BY orderdate;
-
-Create a materialized view for a catalog using the Iceberg connector, with a
-comment and partitioning on two fields in the storage::
-
-    CREATE MATERIALIZED VIEW orders_nation_mkgsegment
-    COMMENT 'Orders with nation and market segment data'
-    WITH ( partitioning = ARRAY['mktsegment', 'nationkey'] )
-    AS
-        SELECT o.*, c.nationkey, c.mktsegment
-        FROM orders AS o
-        JOIN customer AS c
-        ON o.custkey = c.custkey;
-
-Set multiple properties::
-
-    WITH ( format = 'ORC', partitioning = ARRAY['_date'] )
-
-Show defined materialized view properties for all catalogs::
-
-    SELECT * FROM system.metadata.materialized_view_properties;
-
-Show metadata about the materialized views in all catalogs::
-
-    SELECT * FROM system.metadata.materialized_views;
-
-See also
---------
-
-* :doc:`drop-materialized-view`
-* :doc:`show-create-materialized-view`
-* :doc:`refresh-materialized-view`
diff --git a/docs/src/main/sphinx/sql/create-role.md b/docs/src/main/sphinx/sql/create-role.md
new file mode 100644
index 000000000000..524894328a67
--- /dev/null
+++ b/docs/src/main/sphinx/sql/create-role.md
@@ -0,0 +1,44 @@
+# CREATE ROLE
+
+## Synopsis
+
+```text
+CREATE ROLE role_name
+[ WITH ADMIN ( user | USER user | ROLE role | CURRENT_USER | CURRENT_ROLE ) ]
+[ IN catalog ]
+```
+
+## Description
+
+`CREATE ROLE` creates the specified role.
+
+The optional `WITH ADMIN` clause causes the role to be created with
+the specified user as a role admin. A role admin has permission to drop
+or grant a role. If the optional `WITH ADMIN` clause is not
+specified, the role is created with current user as admin.
+
+The optional `IN catalog` clause creates the role in a catalog as opposed
+to a system role.
+
+## Examples
+
+Create role `admin`
+
+```
+CREATE ROLE admin;
+```
+
+Create role `moderator` with admin `bob`:
+
+```
+CREATE ROLE moderator WITH ADMIN USER bob;
+```
+
+## Limitations
+
+Some connectors do not support role management.
+See connector documentation for more details.
+
+## See also
+
+{doc}`drop-role`, {doc}`set-role`, {doc}`grant-roles`, {doc}`revoke-roles`
diff --git a/docs/src/main/sphinx/sql/create-role.rst b/docs/src/main/sphinx/sql/create-role.rst
deleted file mode 100644
index f43d48ae62ec..000000000000
--- a/docs/src/main/sphinx/sql/create-role.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-===========
-CREATE ROLE
-===========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    CREATE ROLE role_name
-    [ WITH ADMIN ( user | USER user | ROLE role | CURRENT_USER | CURRENT_ROLE ) ]
-    [ IN catalog ]
-
-Description
------------
-
-``CREATE ROLE`` creates the specified role.
-
-The optional ``WITH ADMIN`` clause causes the role to be created with
-the specified user as a role admin. A role admin has permission to drop
-or grant a role. If the optional ``WITH ADMIN`` clause is not
-specified, the role is created with current user as admin.
-
-The optional ``IN catalog`` clause creates the role in a catalog as opposed
-to a system role.
-
-Examples
---------
-
-Create role ``admin`` ::
-
-    CREATE ROLE admin;
-
-Create role ``moderator`` with admin ``bob``::
-
-    CREATE ROLE moderator WITH ADMIN USER bob;
-
-Limitations
------------
-
-Some connectors do not support role management.
-See connector documentation for more details.
-
-See also
---------
-
-:doc:`drop-role`, :doc:`set-role`, :doc:`grant-roles`, :doc:`revoke-roles`
diff --git a/docs/src/main/sphinx/sql/create-schema.md b/docs/src/main/sphinx/sql/create-schema.md
new file mode 100644
index 000000000000..4cf2d22a6511
--- /dev/null
+++ b/docs/src/main/sphinx/sql/create-schema.md
@@ -0,0 +1,79 @@
+# CREATE SCHEMA
+
+## Synopsis
+
+```text
+CREATE SCHEMA [ IF NOT EXISTS ] schema_name
+[ AUTHORIZATION ( user | USER user | ROLE role ) ]
+[ WITH ( property_name = expression [, ...] ) ]
+```
+
+## Description
+
+Create a new, empty schema. A schema is a container that
+holds tables, views and other database objects.
+
+The optional `IF NOT EXISTS` clause causes the error to be
+suppressed if the schema already exists.
+
+The optional `AUTHORIZATION` clause can be used to set the
+owner of the newly created schema to a user or role.
+
+The optional `WITH` clause can be used to set properties
+on the newly created schema.  To list all available schema
+properties, run the following query:
+
+```
+SELECT * FROM system.metadata.schema_properties
+```
+
+## Examples
+
+Create a new schema `web` in the current catalog:
+
+```
+CREATE SCHEMA web
+```
+
+Create a new schema `sales` in the `hive` catalog:
+
+```
+CREATE SCHEMA hive.sales
+```
+
+Create the schema `traffic` if it does not already exist:
+
+```
+CREATE SCHEMA IF NOT EXISTS traffic
+```
+
+Create a new schema `web` and set the owner to user `alice`:
+
+```
+CREATE SCHEMA web AUTHORIZATION alice
+```
+
+Create a new schema `web`, set the `LOCATION` property to `/hive/data/web`
+and set the owner to user `alice`:
+
+```
+CREATE SCHEMA web AUTHORIZATION alice WITH ( LOCATION = '/hive/data/web' )
+```
+
+Create a new schema `web` and allow everyone to drop schema and create tables
+in schema `web`:
+
+```
+CREATE SCHEMA web AUTHORIZATION ROLE PUBLIC
+```
+
+Create a new schema `web`, set the `LOCATION` property to `/hive/data/web`
+and allow everyone to drop schema and create tables in schema `web`:
+
+```
+CREATE SCHEMA web AUTHORIZATION ROLE PUBLIC WITH ( LOCATION = '/hive/data/web' )
+```
+
+## See also
+
+{doc}`alter-schema`, {doc}`drop-schema`
diff --git a/docs/src/main/sphinx/sql/create-schema.rst b/docs/src/main/sphinx/sql/create-schema.rst
deleted file mode 100644
index e6d8dd094c3e..000000000000
--- a/docs/src/main/sphinx/sql/create-schema.rst
+++ /dev/null
@@ -1,69 +0,0 @@
-=============
-CREATE SCHEMA
-=============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    CREATE SCHEMA [ IF NOT EXISTS ] schema_name
-    [ AUTHORIZATION ( user | USER user | ROLE role ) ]
-    [ WITH ( property_name = expression [, ...] ) ]
-
-Description
------------
-
-Create a new, empty schema. A schema is a container that
-holds tables, views and other database objects.
-
-The optional ``IF NOT EXISTS`` clause causes the error to be
-suppressed if the schema already exists.
-
-The optional ``AUTHORIZATION`` clause can be used to set the
-owner of the newly created schema to a user or role.
-
-The optional ``WITH`` clause can be used to set properties
-on the newly created schema.  To list all available schema
-properties, run the following query::
-
-    SELECT * FROM system.metadata.schema_properties
-
-Examples
---------
-
-Create a new schema ``web`` in the current catalog::
-
-    CREATE SCHEMA web
-
-Create a new schema ``sales`` in the ``hive`` catalog::
-
-    CREATE SCHEMA hive.sales
-
-Create the schema ``traffic`` if it does not already exist::
-
-    CREATE SCHEMA IF NOT EXISTS traffic
-
-Create a new schema ``web`` and set the owner to user ``alice``::
-
-    CREATE SCHEMA web AUTHORIZATION alice
-
-Create a new schema ``web``, set the ``LOCATION`` property to ``/hive/data/web``
-and set the owner to user ``alice``::
-
-    CREATE SCHEMA web AUTHORIZATION alice WITH ( LOCATION = '/hive/data/web' )
-
-Create a new schema ``web`` and allow everyone to drop schema and create tables
-in schema ``web``::
-
-    CREATE SCHEMA web AUTHORIZATION ROLE PUBLIC
-
-Create a new schema ``web``, set the ``LOCATION`` property to ``/hive/data/web``
-and allow everyone to drop schema and create tables in schema ``web``::
-
-    CREATE SCHEMA web AUTHORIZATION ROLE PUBLIC WITH ( LOCATION = '/hive/data/web' )
-
-See also
---------
-
-:doc:`alter-schema`, :doc:`drop-schema`
diff --git a/docs/src/main/sphinx/sql/create-table-as.md b/docs/src/main/sphinx/sql/create-table-as.md
new file mode 100644
index 000000000000..f985ce44d932
--- /dev/null
+++ b/docs/src/main/sphinx/sql/create-table-as.md
@@ -0,0 +1,79 @@
+# CREATE TABLE AS
+
+## Synopsis
+
+```text
+CREATE [ OR REPLACE ] TABLE [ IF NOT EXISTS ] table_name [ ( column_alias, ... ) ]
+[ COMMENT table_comment ]
+[ WITH ( property_name = expression [, ...] ) ]
+AS query
+[ WITH [ NO ] DATA ]
+```
+
+## Description
+
+Create a new table containing the result of a {doc}`select` query.
+Use {doc}`create-table` to create an empty table.
+
+The optional `OR REPLACE` clause causes an existing table with the
+specified name to be replaced with the new table definition. Support
+for table replacement varies across connectors. Refer to the
+connector documentation for details.
+
+The optional `IF NOT EXISTS` clause causes the error to be
+suppressed if the table already exists.
+
+`OR REPLACE` and `IF NOT EXISTS` cannot be used together.
+
+The optional `WITH` clause can be used to set properties
+on the newly created table.  To list all available table
+properties, run the following query:
+
+```
+SELECT * FROM system.metadata.table_properties
+```
+
+## Examples
+
+Create a new table `orders_column_aliased` with the results of a query and the given column names:
+
+```
+CREATE TABLE orders_column_aliased (order_date, total_price)
+AS
+SELECT orderdate, totalprice
+FROM orders
+```
+
+Create a new table `orders_by_date` that summarizes `orders`:
+
+```
+CREATE TABLE orders_by_date
+COMMENT 'Summary of orders by date'
+WITH (format = 'ORC')
+AS
+SELECT orderdate, sum(totalprice) AS price
+FROM orders
+GROUP BY orderdate
+```
+
+Create the table `orders_by_date` if it does not already exist:
+
+```
+CREATE TABLE IF NOT EXISTS orders_by_date AS
+SELECT orderdate, sum(totalprice) AS price
+FROM orders
+GROUP BY orderdate
+```
+
+Create a new `empty_nation` table with the same schema as `nation` and no data:
+
+```
+CREATE TABLE empty_nation AS
+SELECT *
+FROM nation
+WITH NO DATA
+```
+
+## See also
+
+{doc}`create-table`, {doc}`select`
diff --git a/docs/src/main/sphinx/sql/create-table-as.rst b/docs/src/main/sphinx/sql/create-table-as.rst
deleted file mode 100644
index f2efdf35ba6f..000000000000
--- a/docs/src/main/sphinx/sql/create-table-as.rst
+++ /dev/null
@@ -1,68 +0,0 @@
-===============
-CREATE TABLE AS
-===============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    CREATE TABLE [ IF NOT EXISTS ] table_name [ ( column_alias, ... ) ]
-    [ COMMENT table_comment ]
-    [ WITH ( property_name = expression [, ...] ) ]
-    AS query
-    [ WITH [ NO ] DATA ]
-
-Description
------------
-
-Create a new table containing the result of a :doc:`select` query.
-Use :doc:`create-table` to create an empty table.
-
-The optional ``IF NOT EXISTS`` clause causes the error to be
-suppressed if the table already exists.
-
-The optional ``WITH`` clause can be used to set properties
-on the newly created table.  To list all available table
-properties, run the following query::
-
-    SELECT * FROM system.metadata.table_properties
-
-Examples
---------
-
-Create a new table ``orders_column_aliased`` with the results of a query and the given column names::
-
-    CREATE TABLE orders_column_aliased (order_date, total_price)
-    AS
-    SELECT orderdate, totalprice
-    FROM orders
-
-Create a new table ``orders_by_date`` that summarizes ``orders``::
-
-    CREATE TABLE orders_by_date
-    COMMENT 'Summary of orders by date'
-    WITH (format = 'ORC')
-    AS
-    SELECT orderdate, sum(totalprice) AS price
-    FROM orders
-    GROUP BY orderdate
-
-Create the table ``orders_by_date`` if it does not already exist::
-
-    CREATE TABLE IF NOT EXISTS orders_by_date AS
-    SELECT orderdate, sum(totalprice) AS price
-    FROM orders
-    GROUP BY orderdate
-
-Create a new ``empty_nation`` table with the same schema as ``nation`` and no data::
-
-    CREATE TABLE empty_nation AS
-    SELECT *
-    FROM nation
-    WITH NO DATA
-
-See also
---------
-
-:doc:`create-table`, :doc:`select`
diff --git a/docs/src/main/sphinx/sql/create-table.md b/docs/src/main/sphinx/sql/create-table.md
new file mode 100644
index 000000000000..49af4848da04
--- /dev/null
+++ b/docs/src/main/sphinx/sql/create-table.md
@@ -0,0 +1,99 @@
+# CREATE TABLE
+
+## Synopsis
+
+```text
+CREATE [ OR REPLACE ] TABLE [ IF NOT EXISTS ]
+table_name (
+  { column_name data_type [ NOT NULL ]
+      [ COMMENT comment ]
+      [ WITH ( property_name = expression [, ...] ) ]
+  | LIKE existing_table_name
+      [ { INCLUDING | EXCLUDING } PROPERTIES ]
+  }
+  [, ...]
+)
+[ COMMENT table_comment ]
+[ WITH ( property_name = expression [, ...] ) ]
+```
+
+## Description
+
+Create a new, empty table with the specified columns.
+Use {doc}`create-table-as` to create a table with data.
+
+The optional `OR REPLACE` clause causes an existing table with the
+specified name to be replaced with the new table definition. Support
+for table replacement varies across connectors. Refer to the
+connector documentation for details.
+
+The optional `IF NOT EXISTS` clause causes the error to be
+suppressed if the table already exists.
+
+`OR REPLACE` and `IF NOT EXISTS` cannot be used together.
+
+The optional `WITH` clause can be used to set properties
+on the newly created table or on single columns.  To list all available table
+properties, run the following query:
+
+```
+SELECT * FROM system.metadata.table_properties
+```
+
+To list all available column properties, run the following query:
+
+```
+SELECT * FROM system.metadata.column_properties
+```
+
+The `LIKE` clause can be used to include all the column definitions from
+an existing table in the new table. Multiple `LIKE` clauses may be
+specified, which allows copying the columns from multiple tables.
+
+If `INCLUDING PROPERTIES` is specified, all of the table properties are
+copied to the new table. If the `WITH` clause specifies the same property
+name as one of the copied properties, the value from the `WITH` clause
+will be used. The default behavior is `EXCLUDING PROPERTIES`. The
+`INCLUDING PROPERTIES` option maybe specified for at most one table.
+
+## Examples
+
+Create a new table `orders`:
+
+```
+CREATE TABLE orders (
+  orderkey bigint,
+  orderstatus varchar,
+  totalprice double,
+  orderdate date
+)
+WITH (format = 'ORC')
+```
+
+Create the table `orders` if it does not already exist, adding a table comment
+and a column comment:
+
+```
+CREATE TABLE IF NOT EXISTS orders (
+  orderkey bigint,
+  orderstatus varchar,
+  totalprice double COMMENT 'Price in cents.',
+  orderdate date
+)
+COMMENT 'A table to keep track of orders.'
+```
+
+Create the table `bigger_orders` using the columns from `orders`
+plus additional columns at the start and end:
+
+```
+CREATE TABLE bigger_orders (
+  another_orderkey bigint,
+  LIKE orders,
+  another_orderdate date
+)
+```
+
+## See also
+
+{doc}`alter-table`, {doc}`drop-table`, {doc}`create-table-as`, {doc}`show-create-table`
diff --git a/docs/src/main/sphinx/sql/create-table.rst b/docs/src/main/sphinx/sql/create-table.rst
deleted file mode 100644
index 4484feccdbb1..000000000000
--- a/docs/src/main/sphinx/sql/create-table.rst
+++ /dev/null
@@ -1,90 +0,0 @@
-============
-CREATE TABLE
-============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    CREATE TABLE [ IF NOT EXISTS ]
-    table_name (
-      { column_name data_type [ NOT NULL ]
-          [ COMMENT comment ]
-          [ WITH ( property_name = expression [, ...] ) ]
-      | LIKE existing_table_name
-          [ { INCLUDING | EXCLUDING } PROPERTIES ]
-      }
-      [, ...]
-    )
-    [ COMMENT table_comment ]
-    [ WITH ( property_name = expression [, ...] ) ]
-
-
-Description
------------
-
-Create a new, empty table with the specified columns.
-Use :doc:`create-table-as` to create a table with data.
-
-The optional ``IF NOT EXISTS`` clause causes the error to be
-suppressed if the table already exists.
-
-The optional ``WITH`` clause can be used to set properties
-on the newly created table or on single columns.  To list all available table
-properties, run the following query::
-
-    SELECT * FROM system.metadata.table_properties
-
-To list all available column properties, run the following query::
-
-    SELECT * FROM system.metadata.column_properties
-
-The ``LIKE`` clause can be used to include all the column definitions from
-an existing table in the new table. Multiple ``LIKE`` clauses may be
-specified, which allows copying the columns from multiple tables.
-
-If ``INCLUDING PROPERTIES`` is specified, all of the table properties are
-copied to the new table. If the ``WITH`` clause specifies the same property
-name as one of the copied properties, the value from the ``WITH`` clause
-will be used. The default behavior is ``EXCLUDING PROPERTIES``. The
-``INCLUDING PROPERTIES`` option maybe specified for at most one table.
-
-
-Examples
---------
-
-Create a new table ``orders``::
-
-    CREATE TABLE orders (
-      orderkey bigint,
-      orderstatus varchar,
-      totalprice double,
-      orderdate date
-    )
-    WITH (format = 'ORC')
-
-Create the table ``orders`` if it does not already exist, adding a table comment
-and a column comment::
-
-    CREATE TABLE IF NOT EXISTS orders (
-      orderkey bigint,
-      orderstatus varchar,
-      totalprice double COMMENT 'Price in cents.',
-      orderdate date
-    )
-    COMMENT 'A table to keep track of orders.'
-
-Create the table ``bigger_orders`` using the columns from ``orders``
-plus additional columns at the start and end::
-
-    CREATE TABLE bigger_orders (
-      another_orderkey bigint,
-      LIKE orders,
-      another_orderdate date
-    )
-
-See also
---------
-
-:doc:`alter-table`, :doc:`drop-table`, :doc:`create-table-as`, :doc:`show-create-table`
diff --git a/docs/src/main/sphinx/sql/create-view.md b/docs/src/main/sphinx/sql/create-view.md
new file mode 100644
index 000000000000..ff39a3b9a0ad
--- /dev/null
+++ b/docs/src/main/sphinx/sql/create-view.md
@@ -0,0 +1,77 @@
+# CREATE VIEW
+
+## Synopsis
+
+```text
+CREATE [ OR REPLACE ] VIEW view_name
+[ COMMENT view_comment ]
+[ SECURITY { DEFINER | INVOKER } ]
+AS query
+```
+
+## Description
+
+Create a new view of a {doc}`select` query. The view is a logical table
+that can be referenced by future queries. Views do not contain any data.
+Instead, the query stored by the view is executed every time the view is
+referenced by another query.
+
+The optional `OR REPLACE` clause causes the view to be replaced if it
+already exists rather than raising an error.
+
+## Security
+
+In the default `DEFINER` security mode, tables referenced in the view
+are accessed using the permissions of the view owner (the *creator* or
+*definer* of the view) rather than the user executing the query. This
+allows providing restricted access to the underlying tables, for which
+the user may not be allowed to access directly.
+
+In the `INVOKER` security mode, tables referenced in the view are accessed
+using the permissions of the user executing the query (the *invoker* of the view).
+A view created in this mode is simply a stored query.
+
+Regardless of the security mode, the `current_user` function will
+always return the user executing the query and thus may be used
+within views to filter out rows or otherwise restrict access.
+
+## Examples
+
+Create a simple view `test` over the `orders` table:
+
+```
+CREATE VIEW test AS
+SELECT orderkey, orderstatus, totalprice / 2 AS half
+FROM orders
+```
+
+Create a view `test_with_comment` with a view comment:
+
+```
+CREATE VIEW test_with_comment
+COMMENT 'A view to keep track of orders.'
+AS
+SELECT orderkey, orderstatus, totalprice
+FROM orders
+```
+
+Create a view `orders_by_date` that summarizes `orders`:
+
+```
+CREATE VIEW orders_by_date AS
+SELECT orderdate, sum(totalprice) AS price
+FROM orders
+GROUP BY orderdate
+```
+
+Create a view that replaces an existing view:
+
+```
+CREATE OR REPLACE VIEW test AS
+SELECT orderkey, orderstatus, totalprice / 4 AS quarter
+FROM orders
+```
+
+## See also
+
+{doc}`drop-view`, {doc}`show-create-view`
diff --git a/docs/src/main/sphinx/sql/create-view.rst b/docs/src/main/sphinx/sql/create-view.rst
deleted file mode 100644
index 9d8a92f7dc85..000000000000
--- a/docs/src/main/sphinx/sql/create-view.rst
+++ /dev/null
@@ -1,76 +0,0 @@
-===========
-CREATE VIEW
-===========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    CREATE [ OR REPLACE ] VIEW view_name
-    [ COMMENT view_comment ]
-    [ SECURITY { DEFINER | INVOKER } ]
-    AS query
-
-Description
------------
-
-Create a new view of a :doc:`select` query. The view is a logical table
-that can be referenced by future queries. Views do not contain any data.
-Instead, the query stored by the view is executed every time the view is
-referenced by another query.
-
-The optional ``OR REPLACE`` clause causes the view to be replaced if it
-already exists rather than raising an error.
-
-Security
---------
-
-In the default ``DEFINER`` security mode, tables referenced in the view
-are accessed using the permissions of the view owner (the *creator* or
-*definer* of the view) rather than the user executing the query. This
-allows providing restricted access to the underlying tables, for which
-the user may not be allowed to access directly.
-
-In the ``INVOKER`` security mode, tables referenced in the view are accessed
-using the permissions of the user executing the query (the *invoker* of the view).
-A view created in this mode is simply a stored query.
-
-Regardless of the security mode, the ``current_user`` function will
-always return the user executing the query and thus may be used
-within views to filter out rows or otherwise restrict access.
-
-Examples
---------
-
-Create a simple view ``test`` over the ``orders`` table::
-
-    CREATE VIEW test AS
-    SELECT orderkey, orderstatus, totalprice / 2 AS half
-    FROM orders
-
-Create a view ``test_with_comment`` with a view comment::
-
-    CREATE VIEW test_with_comment
-    COMMENT 'A view to keep track of orders.'
-    AS
-    SELECT orderkey, orderstatus, totalprice
-    FROM orders
-
-Create a view ``orders_by_date`` that summarizes ``orders``::
-
-    CREATE VIEW orders_by_date AS
-    SELECT orderdate, sum(totalprice) AS price
-    FROM orders
-    GROUP BY orderdate
-
-Create a view that replaces an existing view::
-
-    CREATE OR REPLACE VIEW test AS
-    SELECT orderkey, orderstatus, totalprice / 4 AS quarter
-    FROM orders
-
-See also
---------
-
-:doc:`drop-view`, :doc:`show-create-view`
diff --git a/docs/src/main/sphinx/sql/deallocate-prepare.md b/docs/src/main/sphinx/sql/deallocate-prepare.md
new file mode 100644
index 000000000000..e4c1fcb5cee6
--- /dev/null
+++ b/docs/src/main/sphinx/sql/deallocate-prepare.md
@@ -0,0 +1,24 @@
+# DEALLOCATE PREPARE
+
+## Synopsis
+
+```text
+DEALLOCATE PREPARE statement_name
+```
+
+## Description
+
+Removes a statement with the name `statement_name` from the list of prepared
+statements in a session.
+
+## Examples
+
+Deallocate a statement with the name `my_query`:
+
+```
+DEALLOCATE PREPARE my_query;
+```
+
+## See also
+
+{doc}`prepare`, {doc}`execute`, {doc}`execute-immediate`
diff --git a/docs/src/main/sphinx/sql/deallocate-prepare.rst b/docs/src/main/sphinx/sql/deallocate-prepare.rst
deleted file mode 100644
index 68b9afc2d03c..000000000000
--- a/docs/src/main/sphinx/sql/deallocate-prepare.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-==================
-DEALLOCATE PREPARE
-==================
-
-Synopsis
---------
-
-.. code-block:: text
-
-    DEALLOCATE PREPARE statement_name
-
-Description
------------
-
-Removes a statement with the name ``statement_name`` from the list of prepared
-statements in a session.
-
-Examples
---------
-
-Deallocate a statement with the name ``my_query``::
-
-    DEALLOCATE PREPARE my_query;
-
-See also
---------
-:doc:`prepare`
diff --git a/docs/src/main/sphinx/sql/delete.md b/docs/src/main/sphinx/sql/delete.md
new file mode 100644
index 000000000000..622405faba92
--- /dev/null
+++ b/docs/src/main/sphinx/sql/delete.md
@@ -0,0 +1,38 @@
+# DELETE
+
+## Synopsis
+
+```text
+DELETE FROM table_name [ WHERE condition ]
+```
+
+## Description
+
+Delete rows from a table. If the `WHERE` clause is specified, only the
+matching rows are deleted. Otherwise, all rows from the table are deleted.
+
+## Examples
+
+Delete all line items shipped by air:
+
+```
+DELETE FROM lineitem WHERE shipmode = 'AIR';
+```
+
+Delete all line items for low priority orders:
+
+```
+DELETE FROM lineitem
+WHERE orderkey IN (SELECT orderkey FROM orders WHERE priority = 'LOW');
+```
+
+Delete all orders:
+
+```
+DELETE FROM orders;
+```
+
+## Limitations
+
+Some connectors have limited or no support for `DELETE`.
+See connector documentation for more details.
diff --git a/docs/src/main/sphinx/sql/delete.rst b/docs/src/main/sphinx/sql/delete.rst
deleted file mode 100644
index 52d5fd1804bb..000000000000
--- a/docs/src/main/sphinx/sql/delete.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-======
-DELETE
-======
-
-Synopsis
---------
-
-.. code-block:: text
-
-    DELETE FROM table_name [ WHERE condition ]
-
-Description
------------
-
-Delete rows from a table. If the ``WHERE`` clause is specified, only the
-matching rows are deleted. Otherwise, all rows from the table are deleted.
-
-Examples
---------
-
-Delete all line items shipped by air::
-
-    DELETE FROM lineitem WHERE shipmode = 'AIR';
-
-Delete all line items for low priority orders::
-
-    DELETE FROM lineitem
-    WHERE orderkey IN (SELECT orderkey FROM orders WHERE priority = 'LOW');
-
-Delete all orders::
-
-    DELETE FROM orders;
-
-Limitations
------------
-
-Some connectors have limited or no support for ``DELETE``.
-See connector documentation for more details.
diff --git a/docs/src/main/sphinx/sql/deny.md b/docs/src/main/sphinx/sql/deny.md
new file mode 100644
index 000000000000..d533382752db
--- /dev/null
+++ b/docs/src/main/sphinx/sql/deny.md
@@ -0,0 +1,49 @@
+# DENY
+
+## Synopsis
+
+```text
+DENY ( privilege [, ...] | ( ALL PRIVILEGES ) )
+ON ( table_name | TABLE table_name | SCHEMA schema_name)
+TO ( user | USER user | ROLE role )
+```
+
+## Description
+
+Denies the specified privileges to the specified grantee.
+
+Deny on a table rejects the specified privilege on all current and future
+columns of the table.
+
+Deny on a schema rejects the specified privilege on all current and future
+columns of all current and future tables of the schema.
+
+## Examples
+
+Deny `INSERT` and `SELECT` privileges on the table `orders`
+to user `alice`:
+
+```
+DENY INSERT, SELECT ON orders TO alice;
+```
+
+Deny `DELETE` privilege on the schema `finance` to user `bob`:
+
+```
+DENY DELETE ON SCHEMA finance TO bob;
+```
+
+Deny `SELECT` privilege on the table `orders` to everyone:
+
+```
+DENY SELECT ON orders TO ROLE PUBLIC;
+```
+
+## Limitations
+
+The system access controls as well as the connectors provided by default
+in Trino have no support for `DENY`.
+
+## See also
+
+{doc}`grant`, {doc}`revoke`, {doc}`show-grants`
diff --git a/docs/src/main/sphinx/sql/describe-input.md b/docs/src/main/sphinx/sql/describe-input.md
new file mode 100644
index 000000000000..e513323b2a7b
--- /dev/null
+++ b/docs/src/main/sphinx/sql/describe-input.md
@@ -0,0 +1,56 @@
+# DESCRIBE INPUT
+
+## Synopsis
+
+```text
+DESCRIBE INPUT statement_name
+```
+
+## Description
+
+Lists the input parameters of a prepared statement along with the
+position and type of each parameter. Parameter types that cannot be
+determined will appear as `unknown`.
+
+## Examples
+
+Prepare and describe a query with three parameters:
+
+```sql
+PREPARE my_select1 FROM
+SELECT ? FROM nation WHERE regionkey = ? AND name < ?;
+```
+
+```sql
+DESCRIBE INPUT my_select1;
+```
+
+```text
+ Position | Type
+--------------------
+        0 | unknown
+        1 | bigint
+        2 | varchar
+(3 rows)
+```
+
+Prepare and describe a query with no parameters:
+
+```sql
+PREPARE my_select2 FROM
+SELECT * FROM nation;
+```
+
+```sql
+DESCRIBE INPUT my_select2;
+```
+
+```text
+ Position | Type
+-----------------
+(0 rows)
+```
+
+## See also
+
+{doc}`prepare`
diff --git a/docs/src/main/sphinx/sql/describe-input.rst b/docs/src/main/sphinx/sql/describe-input.rst
deleted file mode 100644
index 1e4ec7a0241a..000000000000
--- a/docs/src/main/sphinx/sql/describe-input.rst
+++ /dev/null
@@ -1,62 +0,0 @@
-==============
-DESCRIBE INPUT
-==============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    DESCRIBE INPUT statement_name
-
-Description
------------
-
-Lists the input parameters of a prepared statement along with the
-position and type of each parameter. Parameter types that cannot be
-determined will appear as ``unknown``.
-
-Examples
---------
-
-Prepare and describe a query with three parameters:
-
-.. code-block:: sql
-
-    PREPARE my_select1 FROM
-    SELECT ? FROM nation WHERE regionkey = ? AND name < ?;
-
-.. code-block:: sql
-
-    DESCRIBE INPUT my_select1;
-
-.. code-block:: text
-
-     Position | Type
-    --------------------
-            0 | unknown
-            1 | bigint
-            2 | varchar
-    (3 rows)
-
-Prepare and describe a query with no parameters:
-
-.. code-block:: sql
-
-    PREPARE my_select2 FROM
-    SELECT * FROM nation;
-
-.. code-block:: sql
-
-    DESCRIBE INPUT my_select2;
-
-.. code-block:: text
-
-     Position | Type
-    -----------------
-    (0 rows)
-
-See also
---------
-
-:doc:`prepare`
diff --git a/docs/src/main/sphinx/sql/describe-output.md b/docs/src/main/sphinx/sql/describe-output.md
new file mode 100644
index 000000000000..b2636aeb6f7e
--- /dev/null
+++ b/docs/src/main/sphinx/sql/describe-output.md
@@ -0,0 +1,77 @@
+# DESCRIBE OUTPUT
+
+## Synopsis
+
+```text
+DESCRIBE OUTPUT statement_name
+```
+
+## Description
+
+List the output columns of a prepared statement, including the
+column name (or alias), catalog, schema, table, type, type size in
+bytes, and a boolean indicating if the column is aliased.
+
+## Examples
+
+Prepare and describe a query with four output columns:
+
+```
+PREPARE my_select1 FROM
+SELECT * FROM nation;
+```
+
+```sql
+DESCRIBE OUTPUT my_select1;
+```
+
+```text
+ Column Name | Catalog | Schema | Table  |  Type   | Type Size | Aliased
+-------------+---------+--------+--------+---------+-----------+---------
+ nationkey   | tpch    | sf1    | nation | bigint  |         8 | false
+ name        | tpch    | sf1    | nation | varchar |         0 | false
+ regionkey   | tpch    | sf1    | nation | bigint  |         8 | false
+ comment     | tpch    | sf1    | nation | varchar |         0 | false
+(4 rows)
+```
+
+Prepare and describe a query whose output columns are expressions:
+
+```
+PREPARE my_select2 FROM
+SELECT count(*) as my_count, 1+2 FROM nation;
+```
+
+```sql
+DESCRIBE OUTPUT my_select2;
+```
+
+```text
+ Column Name | Catalog | Schema | Table |  Type  | Type Size | Aliased
+-------------+---------+--------+-------+--------+-----------+---------
+ my_count    |         |        |       | bigint |         8 | true
+ _col1       |         |        |       | bigint |         8 | false
+(2 rows)
+```
+
+Prepare and describe a row count query:
+
+```
+PREPARE my_create FROM
+CREATE TABLE foo AS SELECT * FROM nation;
+```
+
+```sql
+DESCRIBE OUTPUT my_create;
+```
+
+```text
+ Column Name | Catalog | Schema | Table |  Type  | Type Size | Aliased
+-------------+---------+--------+-------+--------+-----------+---------
+ rows        |         |        |       | bigint |         8 | false
+(1 row)
+```
+
+## See also
+
+{doc}`prepare`
diff --git a/docs/src/main/sphinx/sql/describe-output.rst b/docs/src/main/sphinx/sql/describe-output.rst
deleted file mode 100644
index 9990883677dc..000000000000
--- a/docs/src/main/sphinx/sql/describe-output.rst
+++ /dev/null
@@ -1,77 +0,0 @@
-===============
-DESCRIBE OUTPUT
-===============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    DESCRIBE OUTPUT statement_name
-
-Description
------------
-
-List the output columns of a prepared statement, including the
-column name (or alias), catalog, schema, table, type, type size in
-bytes, and a boolean indicating if the column is aliased.
-
-Examples
---------
-
-Prepare and describe a query with four output columns::
-
-    PREPARE my_select1 FROM
-    SELECT * FROM nation;
-
-.. code-block:: sql
-
-   DESCRIBE OUTPUT my_select1;
-
-.. code-block:: text
-
-     Column Name | Catalog | Schema | Table  |  Type   | Type Size | Aliased
-    -------------+---------+--------+--------+---------+-----------+---------
-     nationkey   | tpch    | sf1    | nation | bigint  |         8 | false
-     name        | tpch    | sf1    | nation | varchar |         0 | false
-     regionkey   | tpch    | sf1    | nation | bigint  |         8 | false
-     comment     | tpch    | sf1    | nation | varchar |         0 | false
-    (4 rows)
-
-Prepare and describe a query whose output columns are expressions::
-
-   PREPARE my_select2 FROM
-   SELECT count(*) as my_count, 1+2 FROM nation;
-
-.. code-block:: sql
-
-    DESCRIBE OUTPUT my_select2;
-
-.. code-block:: text
-
-     Column Name | Catalog | Schema | Table |  Type  | Type Size | Aliased
-    -------------+---------+--------+-------+--------+-----------+---------
-     my_count    |         |        |       | bigint |         8 | true
-     _col1       |         |        |       | bigint |         8 | false
-    (2 rows)
-
-Prepare and describe a row count query::
-
-    PREPARE my_create FROM
-    CREATE TABLE foo AS SELECT * FROM nation;
-
-.. code-block:: sql
-
-    DESCRIBE OUTPUT my_create;
-
-.. code-block:: text
-
-     Column Name | Catalog | Schema | Table |  Type  | Type Size | Aliased
-    -------------+---------+--------+-------+--------+-----------+---------
-     rows        |         |        |       | bigint |         8 | false
-    (1 row)
-
-See also
---------
-
-:doc:`prepare`
diff --git a/docs/src/main/sphinx/sql/describe.md b/docs/src/main/sphinx/sql/describe.md
new file mode 100644
index 000000000000..6db8a20d0052
--- /dev/null
+++ b/docs/src/main/sphinx/sql/describe.md
@@ -0,0 +1,11 @@
+# DESCRIBE
+
+## Synopsis
+
+```text
+DESCRIBE table_name
+```
+
+## Description
+
+`DESCRIBE` is an alias for {doc}`show-columns`.
diff --git a/docs/src/main/sphinx/sql/describe.rst b/docs/src/main/sphinx/sql/describe.rst
deleted file mode 100644
index 792af3c64c8a..000000000000
--- a/docs/src/main/sphinx/sql/describe.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-========
-DESCRIBE
-========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    DESCRIBE table_name
-
-Description
------------
-
-``DESCRIBE`` is an alias for :doc:`show-columns`.
diff --git a/docs/src/main/sphinx/sql/drop-function.md b/docs/src/main/sphinx/sql/drop-function.md
new file mode 100644
index 000000000000..0e8792231e18
--- /dev/null
+++ b/docs/src/main/sphinx/sql/drop-function.md
@@ -0,0 +1,51 @@
+# DROP FUNCTION
+
+## Synopsis
+
+```text
+DROP FUNCTION [ IF EXISTS ] routine_name ( [ [ parameter_name ] data_type [, ...] ] )
+```
+
+## Description
+
+Removes a [](routine-catalog). The value of `routine_name`
+must be fully qualified with catalog and schema location of the routine, unless
+the [default SQL routine storage catalog and
+schema](/admin/properties-sql-environment) are configured.
+
+The `data_type`s must be included for routines that use parameters to ensure the
+routine with the correct name and parameter signature is removed.
+
+The optional `IF EXISTS` clause causes the error to be suppressed if
+the function does not exist.
+
+## Examples
+
+The following example removes the `meaning_of_life` routine in the `default`
+schema of the `example` catalog:
+
+```sql
+DROP FUNCTION example.default.meaning_of_life();
+```
+
+If the routine uses a input parameter, the type must be added:
+
+```sql
+DROP FUNCTION multiply_by_two(bigint);
+```
+
+If the [default catalog and schema for routine
+storage](/admin/properties-sql-environment) is configured, you can use the
+following more compact syntax:
+
+```sql
+DROP FUNCTION meaning_of_life();
+```
+
+## See also
+
+* [](/sql/create-function)
+* [](/sql/show-functions)
+* [](/routines/introduction)
+* [](/admin/properties-sql-environment)
+
diff --git a/docs/src/main/sphinx/sql/drop-materialized-view.md b/docs/src/main/sphinx/sql/drop-materialized-view.md
new file mode 100644
index 000000000000..50027fe9c787
--- /dev/null
+++ b/docs/src/main/sphinx/sql/drop-materialized-view.md
@@ -0,0 +1,34 @@
+# DROP MATERIALIZED VIEW
+
+## Synopsis
+
+```text
+DROP MATERIALIZED VIEW [ IF EXISTS ] view_name
+```
+
+## Description
+
+Drop an existing materialized view `view_name`.
+
+The optional `IF EXISTS` clause causes the error to be suppressed if
+the materialized view does not exist.
+
+## Examples
+
+Drop the materialized view `orders_by_date`:
+
+```
+DROP MATERIALIZED VIEW orders_by_date;
+```
+
+Drop the materialized view `orders_by_date` if it exists:
+
+```
+DROP MATERIALIZED VIEW IF EXISTS orders_by_date;
+```
+
+## See also
+
+- {doc}`create-materialized-view`
+- {doc}`show-create-materialized-view`
+- {doc}`refresh-materialized-view`
diff --git a/docs/src/main/sphinx/sql/drop-materialized-view.rst b/docs/src/main/sphinx/sql/drop-materialized-view.rst
deleted file mode 100644
index ebaabf4bef81..000000000000
--- a/docs/src/main/sphinx/sql/drop-materialized-view.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-======================
-DROP MATERIALIZED VIEW
-======================
-
-Synopsis
---------
-
-.. code-block:: text
-
-    DROP MATERIALIZED VIEW [ IF EXISTS ] view_name
-
-Description
------------
-
-Drop an existing materialized view ``view_name``.
-
-The optional ``IF EXISTS`` clause causes the error to be suppressed if
-the materialized view does not exist.
-
-Examples
---------
-
-Drop the materialized view ``orders_by_date``::
-
-    DROP MATERIALIZED VIEW orders_by_date;
-
-Drop the materialized view ``orders_by_date`` if it exists::
-
-    DROP MATERIALIZED VIEW IF EXISTS orders_by_date;
-
-See also
---------
-
-* :doc:`create-materialized-view`
-* :doc:`show-create-materialized-view`
-* :doc:`refresh-materialized-view`
diff --git a/docs/src/main/sphinx/sql/drop-role.md b/docs/src/main/sphinx/sql/drop-role.md
new file mode 100644
index 000000000000..9e0c848173f7
--- /dev/null
+++ b/docs/src/main/sphinx/sql/drop-role.md
@@ -0,0 +1,35 @@
+# DROP ROLE
+
+## Synopsis
+
+```text
+DROP ROLE role_name
+[ IN catalog ]
+```
+
+## Description
+
+`DROP ROLE` drops the specified role.
+
+For `DROP ROLE` statement to succeed, the user executing it should possess
+admin privileges for the given role.
+
+The optional `IN catalog` clause drops the role in a catalog as opposed
+to a system role.
+
+## Examples
+
+Drop role `admin`
+
+```
+DROP ROLE admin;
+```
+
+## Limitations
+
+Some connectors do not support role management.
+See connector documentation for more details.
+
+## See also
+
+{doc}`create-role`, {doc}`set-role`, {doc}`grant-roles`, {doc}`revoke-roles`
diff --git a/docs/src/main/sphinx/sql/drop-role.rst b/docs/src/main/sphinx/sql/drop-role.rst
deleted file mode 100644
index 87d82c835e14..000000000000
--- a/docs/src/main/sphinx/sql/drop-role.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-=========
-DROP ROLE
-=========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    DROP ROLE role_name
-    [ IN catalog ]
-
-Description
------------
-
-``DROP ROLE`` drops the specified role.
-
-For ``DROP ROLE`` statement to succeed, the user executing it should possess
-admin privileges for the given role.
-
-The optional ``IN catalog`` clause drops the role in a catalog as opposed
-to a system role.
-
-Examples
---------
-
-Drop role ``admin`` ::
-
-    DROP ROLE admin;
-
-Limitations
------------
-
-Some connectors do not support role management.
-See connector documentation for more details.
-
-See also
---------
-
-:doc:`create-role`, :doc:`set-role`, :doc:`grant-roles`, :doc:`revoke-roles`
diff --git a/docs/src/main/sphinx/sql/drop-schema.md b/docs/src/main/sphinx/sql/drop-schema.md
new file mode 100644
index 000000000000..b1345d736f39
--- /dev/null
+++ b/docs/src/main/sphinx/sql/drop-schema.md
@@ -0,0 +1,44 @@
+# DROP SCHEMA
+
+## Synopsis
+
+```text
+DROP SCHEMA [ IF EXISTS ] schema_name [ CASCADE | RESTRICT ]
+```
+
+## Description
+
+Drop an existing schema. The schema must be empty.
+
+The optional `IF EXISTS` clause causes the error to be suppressed if
+the schema does not exist.
+
+## Examples
+
+Drop the schema `web`:
+
+```
+DROP SCHEMA web
+```
+
+Drop the schema `sales` if it exists:
+
+```
+DROP SCHEMA IF EXISTS sales
+```
+
+Drop the schema `archive`, along with everything it contains:
+
+```
+DROP SCHEMA archive CASCADE
+```
+
+Drop the schema `archive`, only if there are no objects contained in the schema:
+
+```
+DROP SCHEMA archive RESTRICT
+```
+
+## See also
+
+{doc}`alter-schema`, {doc}`create-schema`
diff --git a/docs/src/main/sphinx/sql/drop-schema.rst b/docs/src/main/sphinx/sql/drop-schema.rst
deleted file mode 100644
index 090652b97834..000000000000
--- a/docs/src/main/sphinx/sql/drop-schema.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-===========
-DROP SCHEMA
-===========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    DROP SCHEMA [ IF EXISTS ] schema_name
-
-Description
------------
-
-Drop an existing schema. The schema must be empty.
-
-The optional ``IF EXISTS`` clause causes the error to be suppressed if
-the schema does not exist.
-
-Examples
---------
-
-Drop the schema ``web``::
-
-    DROP SCHEMA web
-
-Drop the schema ``sales`` if it exists::
-
-    DROP SCHEMA IF EXISTS sales
-
-See also
---------
-
-:doc:`alter-schema`, :doc:`create-schema`
diff --git a/docs/src/main/sphinx/sql/drop-table.md b/docs/src/main/sphinx/sql/drop-table.md
new file mode 100644
index 000000000000..7c8f70c6c112
--- /dev/null
+++ b/docs/src/main/sphinx/sql/drop-table.md
@@ -0,0 +1,32 @@
+# DROP TABLE
+
+## Synopsis
+
+```text
+DROP TABLE  [ IF EXISTS ] table_name
+```
+
+## Description
+
+Drops an existing table.
+
+The optional `IF EXISTS` clause causes the error to be suppressed if
+the table does not exist.
+
+## Examples
+
+Drop the table `orders_by_date`:
+
+```
+DROP TABLE orders_by_date
+```
+
+Drop the table `orders_by_date` if it exists:
+
+```
+DROP TABLE IF EXISTS orders_by_date
+```
+
+## See also
+
+{doc}`alter-table`, {doc}`create-table`
diff --git a/docs/src/main/sphinx/sql/drop-table.rst b/docs/src/main/sphinx/sql/drop-table.rst
deleted file mode 100644
index d74f4022d258..000000000000
--- a/docs/src/main/sphinx/sql/drop-table.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-==========
-DROP TABLE
-==========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    DROP TABLE  [ IF EXISTS ] table_name
-
-Description
------------
-
-Drops an existing table.
-
-The optional ``IF EXISTS`` clause causes the error to be suppressed if
-the table does not exist.
-
-Examples
---------
-
-Drop the table ``orders_by_date``::
-
-    DROP TABLE orders_by_date
-
-Drop the table ``orders_by_date`` if it exists::
-
-    DROP TABLE IF EXISTS orders_by_date
-
-See also
---------
-
-:doc:`alter-table`, :doc:`create-table`
diff --git a/docs/src/main/sphinx/sql/drop-view.md b/docs/src/main/sphinx/sql/drop-view.md
new file mode 100644
index 000000000000..62b0fd9bebd5
--- /dev/null
+++ b/docs/src/main/sphinx/sql/drop-view.md
@@ -0,0 +1,32 @@
+# DROP VIEW
+
+## Synopsis
+
+```text
+DROP VIEW [ IF EXISTS ] view_name
+```
+
+## Description
+
+Drop an existing view.
+
+The optional `IF EXISTS` clause causes the error to be suppressed if
+the view does not exist.
+
+## Examples
+
+Drop the view `orders_by_date`:
+
+```
+DROP VIEW orders_by_date
+```
+
+Drop the view `orders_by_date` if it exists:
+
+```
+DROP VIEW IF EXISTS orders_by_date
+```
+
+## See also
+
+{doc}`create-view`
diff --git a/docs/src/main/sphinx/sql/drop-view.rst b/docs/src/main/sphinx/sql/drop-view.rst
deleted file mode 100644
index 4230db6fd5e2..000000000000
--- a/docs/src/main/sphinx/sql/drop-view.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-=========
-DROP VIEW
-=========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    DROP VIEW [ IF EXISTS ] view_name
-
-Description
------------
-
-Drop an existing view.
-
-The optional ``IF EXISTS`` clause causes the error to be suppressed if
-the view does not exist.
-
-Examples
---------
-
-Drop the view ``orders_by_date``::
-
-    DROP VIEW orders_by_date
-
-Drop the view ``orders_by_date`` if it exists::
-
-    DROP VIEW IF EXISTS orders_by_date
-
-See also
---------
-
-:doc:`create-view`
diff --git a/docs/src/main/sphinx/sql/execute-immediate.md b/docs/src/main/sphinx/sql/execute-immediate.md
new file mode 100644
index 000000000000..0641d614e3d2
--- /dev/null
+++ b/docs/src/main/sphinx/sql/execute-immediate.md
@@ -0,0 +1,41 @@
+# EXECUTE IMMEDIATE
+
+## Synopsis
+
+```text
+EXECUTE IMMEDIATE `statement` [ USING parameter1 [ , parameter2, ... ] ]
+```
+
+## Description
+
+Executes a statement without the need to prepare or deallocate the statement.
+Parameter values are defined in the `USING` clause.
+
+## Examples
+
+Execute a query with no parameters:
+
+```
+EXECUTE IMMEDIATE
+'SELECT name FROM nation';
+```
+
+Execute a query with two parameters:
+
+```
+EXECUTE IMMEDIATE
+'SELECT name FROM nation WHERE regionkey = ? and nationkey < ?'
+USING 1, 3;
+```
+
+This is equivalent to:
+
+```
+PREPARE statement_name FROM SELECT name FROM nation WHERE regionkey = ? and nationkey < ?
+EXECUTE statement_name USING 1, 3
+DEALLOCATE PREPARE statement_name
+```
+
+## See also
+
+{doc}`execute`, {doc}`prepare`, {doc}`deallocate-prepare`
diff --git a/docs/src/main/sphinx/sql/execute.md b/docs/src/main/sphinx/sql/execute.md
new file mode 100644
index 000000000000..c3def55866fd
--- /dev/null
+++ b/docs/src/main/sphinx/sql/execute.md
@@ -0,0 +1,46 @@
+# EXECUTE
+
+## Synopsis
+
+```text
+EXECUTE statement_name [ USING parameter1 [ , parameter2, ... ] ]
+```
+
+## Description
+
+Executes a prepared statement with the name `statement_name`. Parameter values
+are defined in the `USING` clause.
+
+## Examples
+
+Prepare and execute a query with no parameters:
+
+```
+PREPARE my_select1 FROM
+SELECT name FROM nation;
+```
+
+```sql
+EXECUTE my_select1;
+```
+
+Prepare and execute a query with two parameters:
+
+```
+PREPARE my_select2 FROM
+SELECT name FROM nation WHERE regionkey = ? and nationkey < ?;
+```
+
+```sql
+EXECUTE my_select2 USING 1, 3;
+```
+
+This is equivalent to:
+
+```
+SELECT name FROM nation WHERE regionkey = 1 AND nationkey < 3;
+```
+
+## See also
+
+{doc}`prepare`, {doc}`deallocate-prepare`, {doc}`execute-immediate`
diff --git a/docs/src/main/sphinx/sql/execute.rst b/docs/src/main/sphinx/sql/execute.rst
deleted file mode 100644
index fe2719a86700..000000000000
--- a/docs/src/main/sphinx/sql/execute.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-=======
-EXECUTE
-=======
-
-Synopsis
---------
-
-.. code-block:: text
-
-    EXECUTE statement_name [ USING parameter1 [ , parameter2, ... ] ]
-
-Description
------------
-
-Executes a prepared statement with the name ``statement_name``. Parameter values
-are defined in the ``USING`` clause.
-
-Examples
---------
-
-Prepare and execute a query with no parameters::
-
-    PREPARE my_select1 FROM
-    SELECT name FROM nation;
-
-.. code-block:: sql
-
-    EXECUTE my_select1;
-
-Prepare and execute a query with two parameters::
-
-    PREPARE my_select2 FROM
-    SELECT name FROM nation WHERE regionkey = ? and nationkey < ?;
-
-.. code-block:: sql
-
-    EXECUTE my_select2 USING 1, 3;
-
-This is equivalent to::
-
-   SELECT name FROM nation WHERE regionkey = 1 AND nationkey < 3;
-
-See also
---------
-
-:doc:`prepare`
diff --git a/docs/src/main/sphinx/sql/explain-analyze.md b/docs/src/main/sphinx/sql/explain-analyze.md
new file mode 100644
index 000000000000..f49b777718ec
--- /dev/null
+++ b/docs/src/main/sphinx/sql/explain-analyze.md
@@ -0,0 +1,115 @@
+# EXPLAIN ANALYZE
+
+## Synopsis
+
+```text
+EXPLAIN ANALYZE [VERBOSE] statement
+```
+
+## Description
+
+Execute the statement and show the distributed execution plan of the statement
+along with the cost of each operation.
+
+The `VERBOSE` option will give more detailed information and low-level statistics;
+understanding these may require knowledge of Trino internals and implementation details.
+
+:::{note}
+The stats may not be entirely accurate, especially for queries that complete quickly.
+:::
+
+## Examples
+
+In the example below, you can see the CPU time spent in each stage, as well as the relative
+cost of each plan node in the stage. Note that the relative cost of the plan nodes is based on
+wall time, which may or may not be correlated to CPU time. For each plan node you can see
+some additional statistics (e.g: average input per node instance). Such statistics are useful
+when one wants to detect data anomalies for a query (e.g: skewness).
+
+```sql
+EXPLAIN ANALYZE SELECT count(*), clerk FROM orders
+WHERE orderdate > date '1995-01-01' GROUP BY clerk;
+```
+
+```text
+                                          Query Plan
+-----------------------------------------------------------------------------------------------
+Trino version: version
+Queued: 374.17us, Analysis: 190.96ms, Planning: 179.03ms, Execution: 3.06s
+Fragment 1 [HASH]
+    CPU: 22.58ms, Scheduled: 96.72ms, Blocked 46.21s (Input: 23.06s, Output: 0.00ns), Input: 1000 rows (37.11kB); per task: avg.: 1000.00 std.dev.: 0.00, Output: 1000 rows (28.32kB)
+    Output layout: [clerk, count]
+    Output partitioning: SINGLE []
+    Project[]
+    │   Layout: [clerk:varchar(15), count:bigint]
+    │   Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: 0B}
+    │   CPU: 8.00ms (3.51%), Scheduled: 63.00ms (15.11%), Blocked: 0.00ns (0.00%), Output: 1000 rows (28.32kB)
+    │   Input avg.: 15.63 rows, Input std.dev.: 24.36%
+    └─ Aggregate[type = FINAL, keys = [clerk], hash = [$hashvalue]]
+       │   Layout: [clerk:varchar(15), $hashvalue:bigint, count:bigint]
+       │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: 0B}
+       │   CPU: 8.00ms (3.51%), Scheduled: 22.00ms (5.28%), Blocked: 0.00ns (0.00%), Output: 1000 rows (37.11kB)
+       │   Input avg.: 15.63 rows, Input std.dev.: 24.36%
+       │   count := count("count_0")
+       └─ LocalExchange[partitioning = HASH, hashColumn = [$hashvalue], arguments = ["clerk"]]
+          │   Layout: [clerk:varchar(15), count_0:bigint, $hashvalue:bigint]
+          │   Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: 0B}
+          │   CPU: 2.00ms (0.88%), Scheduled: 4.00ms (0.96%), Blocked: 23.15s (50.10%), Output: 1000 rows (37.11kB)
+          │   Input avg.: 15.63 rows, Input std.dev.: 793.73%
+          └─ RemoteSource[sourceFragmentIds = [2]]
+                 Layout: [clerk:varchar(15), count_0:bigint, $hashvalue_1:bigint]
+                 CPU: 0.00ns (0.00%), Scheduled: 0.00ns (0.00%), Blocked: 23.06s (49.90%), Output: 1000 rows (37.11kB)
+                 Input avg.: 15.63 rows, Input std.dev.: 793.73%
+
+Fragment 2 [SOURCE]
+    CPU: 210.60ms, Scheduled: 327.92ms, Blocked 0.00ns (Input: 0.00ns, Output: 0.00ns), Input: 1500000 rows (18.17MB); per task: avg.: 1500000.00 std.dev.: 0.00, Output: 1000 rows (37.11kB)
+    Output layout: [clerk, count_0, $hashvalue_2]
+    Output partitioning: HASH [clerk][$hashvalue_2]
+    Aggregate[type = PARTIAL, keys = [clerk], hash = [$hashvalue_2]]
+    │   Layout: [clerk:varchar(15), $hashvalue_2:bigint, count_0:bigint]
+    │   CPU: 30.00ms (13.16%), Scheduled: 30.00ms (7.19%), Blocked: 0.00ns (0.00%), Output: 1000 rows (37.11kB)
+    │   Input avg.: 818058.00 rows, Input std.dev.: 0.00%
+    │   count_0 := count(*)
+    └─ ScanFilterProject[table = hive:sf1:orders, filterPredicate = ("orderdate" > DATE '1995-01-01')]
+           Layout: [clerk:varchar(15), $hashvalue_2:bigint]
+           Estimates: {rows: 1500000 (41.48MB), cpu: 35.76M, memory: 0B, network: 0B}/{rows: 816424 (22.58MB), cpu: 35.76M, memory: 0B, network: 0B}/{rows: 816424 (22.58MB), cpu: 22.58M, memory: 0B, network: 0B}
+           CPU: 180.00ms (78.95%), Scheduled: 298.00ms (71.46%), Blocked: 0.00ns (0.00%), Output: 818058 rows (12.98MB)
+           Input avg.: 1500000.00 rows, Input std.dev.: 0.00%
+           $hashvalue_2 := combine_hash(bigint '0', COALESCE("$operator$hash_code"("clerk"), 0))
+           clerk := clerk:varchar(15):REGULAR
+           orderdate := orderdate:date:REGULAR
+           Input: 1500000 rows (18.17MB), Filtered: 45.46%, Physical Input: 4.51MB
+```
+
+When the `VERBOSE` option is used, some operators may report additional information.
+For example, the window function operator will output the following:
+
+```
+EXPLAIN ANALYZE VERBOSE SELECT count(clerk) OVER() FROM orders
+WHERE orderdate > date '1995-01-01';
+```
+
+```text
+                                          Query Plan
+-----------------------------------------------------------------------------------------------
+  ...
+         ─ Window[]
+           │   Layout: [clerk:varchar(15), count:bigint]
+           │   CPU: 157.00ms (53.40%), Scheduled: 158.00ms (37.71%), Blocked: 0.00ns (0.00%), Output: 818058 rows (22.62MB)
+           │   metrics:
+           │     'CPU time distribution (s)' = {count=1.00, p01=0.16, p05=0.16, p10=0.16, p25=0.16, p50=0.16, p75=0.16, p90=0.16, p95=0.16, p99=0.16, min=0.16, max=0.16}
+           │     'Input rows distribution' = {count=1.00, p01=818058.00, p05=818058.00, p10=818058.00, p25=818058.00, p50=818058.00, p75=818058.00, p90=818058.00, p95=818058.00, p99=818058.00, min=818058.00, max=818058.00}
+           │     'Scheduled time distribution (s)' = {count=1.00, p01=0.16, p05=0.16, p10=0.16, p25=0.16, p50=0.16, p75=0.16, p90=0.16, p95=0.16, p99=0.16, min=0.16, max=0.16}
+           │   Input avg.: 818058.00 rows, Input std.dev.: 0.00%
+           │   Active Drivers: [ 1 / 1 ]
+           │   Index size: std.dev.: 0.00 bytes, 0.00 rows
+           │   Index count per driver: std.dev.: 0.00
+           │   Rows per driver: std.dev.: 0.00
+           │   Size of partition: std.dev.: 0.00
+           │   count := count("clerk") RANGE UNBOUNDED_PRECEDING CURRENT_ROW
+ ...
+```
+
+## See also
+
+{doc}`explain`
diff --git a/docs/src/main/sphinx/sql/explain-analyze.rst b/docs/src/main/sphinx/sql/explain-analyze.rst
deleted file mode 100644
index b34140d5d78e..000000000000
--- a/docs/src/main/sphinx/sql/explain-analyze.rst
+++ /dev/null
@@ -1,120 +0,0 @@
-===============
-EXPLAIN ANALYZE
-===============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    EXPLAIN ANALYZE [VERBOSE] statement
-
-Description
------------
-
-Execute the statement and show the distributed execution plan of the statement
-along with the cost of each operation.
-
-The ``VERBOSE`` option will give more detailed information and low-level statistics;
-understanding these may require knowledge of Trino internals and implementation details.
-
-.. note::
-
-    The stats may not be entirely accurate, especially for queries that complete quickly.
-
-Examples
---------
-
-In the example below, you can see the CPU time spent in each stage, as well as the relative
-cost of each plan node in the stage. Note that the relative cost of the plan nodes is based on
-wall time, which may or may not be correlated to CPU time. For each plan node you can see
-some additional statistics (e.g: average input per node instance). Such statistics are useful
-when one wants to detect data anomalies for a query (e.g: skewness).
-
-.. code-block:: sql
-
-    EXPLAIN ANALYZE SELECT count(*), clerk FROM orders
-    WHERE orderdate > date '1995-01-01' GROUP BY clerk;
-
-.. code-block:: text
-
-                                              Query Plan
-    -----------------------------------------------------------------------------------------------
-    Trino version: version
-    Queued: 374.17us, Analysis: 190.96ms, Planning: 179.03ms, Execution: 3.06s
-    Fragment 1 [HASH]
-        CPU: 22.58ms, Scheduled: 96.72ms, Blocked 46.21s (Input: 23.06s, Output: 0.00ns), Input: 1000 rows (37.11kB); per task: avg.: 1000.00 std.dev.: 0.00, Output: 1000 rows (28.32kB)
-        Output layout: [clerk, count]
-        Output partitioning: SINGLE []
-        Project[]
-        │   Layout: [clerk:varchar(15), count:bigint]
-        │   Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: 0B}
-        │   CPU: 8.00ms (3.51%), Scheduled: 63.00ms (15.11%), Blocked: 0.00ns (0.00%), Output: 1000 rows (28.32kB)
-        │   Input avg.: 15.63 rows, Input std.dev.: 24.36%
-        └─ Aggregate[type = FINAL, keys = [clerk], hash = [$hashvalue]]
-           │   Layout: [clerk:varchar(15), $hashvalue:bigint, count:bigint]
-           │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: 0B}
-           │   CPU: 8.00ms (3.51%), Scheduled: 22.00ms (5.28%), Blocked: 0.00ns (0.00%), Output: 1000 rows (37.11kB)
-           │   Input avg.: 15.63 rows, Input std.dev.: 24.36%
-           │   count := count("count_0")
-           └─ LocalExchange[partitioning = HASH, hashColumn = [$hashvalue], arguments = ["clerk"]]
-              │   Layout: [clerk:varchar(15), count_0:bigint, $hashvalue:bigint]
-              │   Estimates: {rows: ? (?), cpu: ?, memory: 0B, network: 0B}
-              │   CPU: 2.00ms (0.88%), Scheduled: 4.00ms (0.96%), Blocked: 23.15s (50.10%), Output: 1000 rows (37.11kB)
-              │   Input avg.: 15.63 rows, Input std.dev.: 793.73%
-              └─ RemoteSource[sourceFragmentIds = [2]]
-                     Layout: [clerk:varchar(15), count_0:bigint, $hashvalue_1:bigint]
-                     CPU: 0.00ns (0.00%), Scheduled: 0.00ns (0.00%), Blocked: 23.06s (49.90%), Output: 1000 rows (37.11kB)
-                     Input avg.: 15.63 rows, Input std.dev.: 793.73%
-
-    Fragment 2 [SOURCE]
-        CPU: 210.60ms, Scheduled: 327.92ms, Blocked 0.00ns (Input: 0.00ns, Output: 0.00ns), Input: 1500000 rows (18.17MB); per task: avg.: 1500000.00 std.dev.: 0.00, Output: 1000 rows (37.11kB)
-        Output layout: [clerk, count_0, $hashvalue_2]
-        Output partitioning: HASH [clerk][$hashvalue_2]
-        Aggregate[type = PARTIAL, keys = [clerk], hash = [$hashvalue_2]]
-        │   Layout: [clerk:varchar(15), $hashvalue_2:bigint, count_0:bigint]
-        │   CPU: 30.00ms (13.16%), Scheduled: 30.00ms (7.19%), Blocked: 0.00ns (0.00%), Output: 1000 rows (37.11kB)
-        │   Input avg.: 818058.00 rows, Input std.dev.: 0.00%
-        │   count_0 := count(*)
-        └─ ScanFilterProject[table = hive:sf1:orders, filterPredicate = ("orderdate" > DATE '1995-01-01')]
-               Layout: [clerk:varchar(15), $hashvalue_2:bigint]
-               Estimates: {rows: 1500000 (41.48MB), cpu: 35.76M, memory: 0B, network: 0B}/{rows: 816424 (22.58MB), cpu: 35.76M, memory: 0B, network: 0B}/{rows: 816424 (22.58MB), cpu: 22.58M, memory: 0B, network: 0B}
-               CPU: 180.00ms (78.95%), Scheduled: 298.00ms (71.46%), Blocked: 0.00ns (0.00%), Output: 818058 rows (12.98MB)
-               Input avg.: 1500000.00 rows, Input std.dev.: 0.00%
-               $hashvalue_2 := combine_hash(bigint '0', COALESCE("$operator$hash_code"("clerk"), 0))
-               clerk := clerk:varchar(15):REGULAR
-               orderdate := orderdate:date:REGULAR
-               Input: 1500000 rows (18.17MB), Filtered: 45.46%, Physical Input: 4.51MB
-
-When the ``VERBOSE`` option is used, some operators may report additional information.
-For example, the window function operator will output the following::
-
-    EXPLAIN ANALYZE VERBOSE SELECT count(clerk) OVER() FROM orders
-    WHERE orderdate > date '1995-01-01';
-
-.. code-block:: text
-
-                                              Query Plan
-    -----------------------------------------------------------------------------------------------
-      ...
-             ─ Window[]
-               │   Layout: [clerk:varchar(15), count:bigint]
-               │   CPU: 157.00ms (53.40%), Scheduled: 158.00ms (37.71%), Blocked: 0.00ns (0.00%), Output: 818058 rows (22.62MB)
-               │   metrics:
-               │     'CPU time distribution (s)' = {count=1.00, p01=0.16, p05=0.16, p10=0.16, p25=0.16, p50=0.16, p75=0.16, p90=0.16, p95=0.16, p99=0.16, min=0.16, max=0.16}
-               │     'Input rows distribution' = {count=1.00, p01=818058.00, p05=818058.00, p10=818058.00, p25=818058.00, p50=818058.00, p75=818058.00, p90=818058.00, p95=818058.00, p99=818058.00, min=818058.00, max=818058.00}
-               │     'Scheduled time distribution (s)' = {count=1.00, p01=0.16, p05=0.16, p10=0.16, p25=0.16, p50=0.16, p75=0.16, p90=0.16, p95=0.16, p99=0.16, min=0.16, max=0.16}
-               │   Input avg.: 818058.00 rows, Input std.dev.: 0.00%
-               │   Active Drivers: [ 1 / 1 ]
-               │   Index size: std.dev.: 0.00 bytes, 0.00 rows
-               │   Index count per driver: std.dev.: 0.00
-               │   Rows per driver: std.dev.: 0.00
-               │   Size of partition: std.dev.: 0.00
-               │   count := count("clerk") RANGE UNBOUNDED_PRECEDING CURRENT_ROW
-     ...
-
-
-See also
---------
-
-:doc:`explain`
diff --git a/docs/src/main/sphinx/sql/explain.md b/docs/src/main/sphinx/sql/explain.md
new file mode 100644
index 000000000000..a9b5686e7a1f
--- /dev/null
+++ b/docs/src/main/sphinx/sql/explain.md
@@ -0,0 +1,782 @@
+# EXPLAIN
+
+## Synopsis
+
+```text
+EXPLAIN [ ( option [, ...] ) ] statement
+```
+
+where `option` can be one of:
+
+```text
+FORMAT { TEXT | GRAPHVIZ | JSON }
+TYPE { LOGICAL | DISTRIBUTED | VALIDATE | IO }
+```
+
+## Description
+
+Show the logical or distributed execution plan of a statement, or validate the statement.
+The distributed plan is shown by default. Each plan fragment of the distributed plan is executed by
+a single or multiple Trino nodes. Fragments separation represent the data exchange between Trino nodes.
+Fragment type specifies how the fragment is executed by Trino nodes and how the data is
+distributed between fragments:
+
+`SINGLE`
+
+: Fragment is executed on a single node.
+
+`HASH`
+
+: Fragment is executed on a fixed number of nodes with the input data
+  distributed using a hash function.
+
+`ROUND_ROBIN`
+
+: Fragment is executed on a fixed number of nodes with the input data
+  distributed in a round-robin fashion.
+
+`BROADCAST`
+
+: Fragment is executed on a fixed number of nodes with the input data
+  broadcasted to all nodes.
+
+`SOURCE`
+
+: Fragment is executed on nodes where input splits are accessed.
+
+## Examples
+
+### EXPLAIN (TYPE LOGICAL)
+
+Process the supplied query statement and create a logical plan in text format:
+
+```
+EXPLAIN (TYPE LOGICAL) SELECT regionkey, count(*) FROM nation GROUP BY 1;
+```
+
+```text
+                                                   Query Plan
+-----------------------------------------------------------------------------------------------------------------
+ Trino version: version
+ Output[regionkey, _col1]
+ │   Layout: [regionkey:bigint, count:bigint]
+ │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+ │   _col1 := count
+ └─ RemoteExchange[GATHER]
+    │   Layout: [regionkey:bigint, count:bigint]
+    │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+    └─ Aggregate(FINAL)[regionkey]
+       │   Layout: [regionkey:bigint, count:bigint]
+       │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+       │   count := count("count_8")
+       └─ LocalExchange[HASH][$hashvalue] ("regionkey")
+          │   Layout: [regionkey:bigint, count_8:bigint, $hashvalue:bigint]
+          │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+          └─ RemoteExchange[REPARTITION][$hashvalue_9]
+             │   Layout: [regionkey:bigint, count_8:bigint, $hashvalue_9:bigint]
+             │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+             └─ Project[]
+                │   Layout: [regionkey:bigint, count_8:bigint, $hashvalue_10:bigint]
+                │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+                │   $hashvalue_10 := "combine_hash"(bigint '0', COALESCE("$operator$hash_code"("regionkey"), 0))
+                └─ Aggregate(PARTIAL)[regionkey]
+                   │   Layout: [regionkey:bigint, count_8:bigint]
+                   │   count_8 := count(*)
+                   └─ TableScan[tpch:nation:sf0.01]
+                          Layout: [regionkey:bigint]
+                          Estimates: {rows: 25 (225B), cpu: 225, memory: 0B, network: 0B}
+                          regionkey := tpch:regionkey
+```
+
+### EXPLAIN (TYPE LOGICAL, FORMAT JSON)
+
+:::{warning}
+The output format is not guaranteed to be backward compatible across Trino versions.
+:::
+
+Process the supplied query statement and create a logical plan in JSON format:
+
+```
+EXPLAIN (TYPE LOGICAL, FORMAT JSON) SELECT regionkey, count(*) FROM nation GROUP BY 1;
+```
+
+```json
+{
+   "id": "9",
+   "name": "Output",
+   "descriptor": {
+      "columnNames": "[regionkey, _col1]"
+   },
+   "outputs": [
+      {
+         "symbol": "regionkey",
+         "type": "bigint"
+      },
+      {
+         "symbol": "count",
+         "type": "bigint"
+      }
+   ],
+   "details": [
+      "_col1 := count"
+   ],
+   "estimates": [
+      {
+         "outputRowCount": "NaN",
+         "outputSizeInBytes": "NaN",
+         "cpuCost": "NaN",
+         "memoryCost": "NaN",
+         "networkCost": "NaN"
+      }
+   ],
+   "children": [
+      {
+         "id": "145",
+         "name": "RemoteExchange",
+         "descriptor": {
+            "type": "GATHER",
+            "isReplicateNullsAndAny": "",
+            "hashColumn": ""
+         },
+         "outputs": [
+            {
+               "symbol": "regionkey",
+               "type": "bigint"
+            },
+            {
+               "symbol": "count",
+               "type": "bigint"
+            }
+         ],
+         "details": [
+
+         ],
+         "estimates": [
+            {
+               "outputRowCount": "NaN",
+               "outputSizeInBytes": "NaN",
+               "cpuCost": "NaN",
+               "memoryCost": "NaN",
+               "networkCost": "NaN"
+            }
+         ],
+         "children": [
+            {
+               "id": "4",
+               "name": "Aggregate",
+               "descriptor": {
+                  "type": "FINAL",
+                  "keys": "[regionkey]",
+                  "hash": ""
+               },
+               "outputs": [
+                  {
+                     "symbol": "regionkey",
+                     "type": "bigint"
+                  },
+                  {
+                     "symbol": "count",
+                     "type": "bigint"
+                  }
+               ],
+               "details": [
+                  "count := count(\"count_0\")"
+               ],
+               "estimates": [
+                  {
+                     "outputRowCount": "NaN",
+                     "outputSizeInBytes": "NaN",
+                     "cpuCost": "NaN",
+                     "memoryCost": "NaN",
+                     "networkCost": "NaN"
+                  }
+               ],
+               "children": [
+                  {
+                     "id": "194",
+                     "name": "LocalExchange",
+                     "descriptor": {
+                        "partitioning": "HASH",
+                        "isReplicateNullsAndAny": "",
+                        "hashColumn": "[$hashvalue]",
+                        "arguments": "[\"regionkey\"]"
+                     },
+                     "outputs": [
+                        {
+                           "symbol": "regionkey",
+                           "type": "bigint"
+                        },
+                        {
+                           "symbol": "count_0",
+                           "type": "bigint"
+                        },
+                        {
+                           "symbol": "$hashvalue",
+                           "type": "bigint"
+                        }
+                     ],
+                     "details":[],
+                     "estimates": [
+                        {
+                           "outputRowCount": "NaN",
+                           "outputSizeInBytes": "NaN",
+                           "cpuCost": "NaN",
+                           "memoryCost": "NaN",
+                           "networkCost": "NaN"
+                        }
+                     ],
+                     "children": [
+                        {
+                           "id": "200",
+                           "name": "RemoteExchange",
+                           "descriptor": {
+                              "type": "REPARTITION",
+                              "isReplicateNullsAndAny": "",
+                              "hashColumn": "[$hashvalue_1]"
+                           },
+                           "outputs": [
+                              {
+                                 "symbol": "regionkey",
+                                 "type": "bigint"
+                              },
+                              {
+                                 "symbol": "count_0",
+                                 "type": "bigint"
+                              },
+                              {
+                                 "symbol": "$hashvalue_1",
+                                 "type": "bigint"
+                              }
+                           ],
+                           "details":[],
+                           "estimates": [
+                              {
+                                 "outputRowCount": "NaN",
+                                 "outputSizeInBytes": "NaN",
+                                 "cpuCost": "NaN",
+                                 "memoryCost": "NaN",
+                                 "networkCost": "NaN"
+                              }
+                           ],
+                           "children": [
+                              {
+                                 "id": "226",
+                                 "name": "Project",
+                                 "descriptor": {}
+                                 "outputs": [
+                                    {
+                                       "symbol": "regionkey",
+                                       "type": "bigint"
+                                    },
+                                    {
+                                       "symbol": "count_0",
+                                       "type": "bigint"
+                                    },
+                                    {
+                                       "symbol": "$hashvalue_2",
+                                       "type": "bigint"
+                                    }
+                                 ],
+                                 "details": [
+                                    "$hashvalue_2 := combine_hash(bigint '0', COALESCE(\"$operator$hash_code\"(\"regionkey\"), 0))"
+                                 ],
+                                 "estimates": [
+                                    {
+                                       "outputRowCount": "NaN",
+                                       "outputSizeInBytes": "NaN",
+                                       "cpuCost": "NaN",
+                                       "memoryCost": "NaN",
+                                       "networkCost": "NaN"
+                                    }
+                                 ],
+                                 "children": [
+                                    {
+                                       "id": "198",
+                                       "name": "Aggregate",
+                                       "descriptor": {
+                                          "type": "PARTIAL",
+                                          "keys": "[regionkey]",
+                                          "hash": ""
+                                       },
+                                       "outputs": [
+                                          {
+                                             "symbol": "regionkey",
+                                             "type": "bigint"
+                                          },
+                                          {
+                                             "symbol": "count_0",
+                                             "type": "bigint"
+                                          }
+                                       ],
+                                       "details": [
+                                          "count_0 := count(*)"
+                                       ],
+                                       "estimates":[],
+                                       "children": [
+                                          {
+                                             "id": "0",
+                                             "name": "TableScan",
+                                             "descriptor": {
+                                                "table": "hive:tpch_sf1_orc_part:nation"
+                                             },
+                                             "outputs": [
+                                                {
+                                                   "symbol": "regionkey",
+                                                   "type": "bigint"
+                                                }
+                                             ],
+                                             "details": [
+                                                "regionkey := regionkey:bigint:REGULAR"
+                                             ],
+                                             "estimates": [
+                                                {
+                                                   "outputRowCount": 25,
+                                                   "outputSizeInBytes": 225,
+                                                   "cpuCost": 225,
+                                                   "memoryCost": 0,
+                                                   "networkCost": 0
+                                                }
+                                             ],
+                                             "children": []
+                                          }
+                                       ]
+                                    }
+                                 ]
+                              }
+                           ]
+                        }
+                     ]
+                  }
+               ]
+            }
+         ]
+      }
+   ]
+}
+```
+
+### EXPLAIN (TYPE DISTRIBUTED)
+
+Process the supplied query statement and create a distributed plan in text
+format. The distributed plan splits the logical plan into stages, and therefore
+explicitly shows the data exchange between workers:
+
+```
+EXPLAIN (TYPE DISTRIBUTED) SELECT regionkey, count(*) FROM nation GROUP BY 1;
+```
+
+```text
+                                              Query Plan
+------------------------------------------------------------------------------------------------------
+ Trino version: version
+ Fragment 0 [SINGLE]
+     Output layout: [regionkey, count]
+     Output partitioning: SINGLE []
+     Output[regionkey, _col1]
+     │   Layout: [regionkey:bigint, count:bigint]
+     │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+     │   _col1 := count
+     └─ RemoteSource[1]
+            Layout: [regionkey:bigint, count:bigint]
+
+ Fragment 1 [HASH]
+     Output layout: [regionkey, count]
+     Output partitioning: SINGLE []
+     Aggregate(FINAL)[regionkey]
+     │   Layout: [regionkey:bigint, count:bigint]
+     │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+     │   count := count("count_8")
+     └─ LocalExchange[HASH][$hashvalue] ("regionkey")
+        │   Layout: [regionkey:bigint, count_8:bigint, $hashvalue:bigint]
+        │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+        └─ RemoteSource[2]
+               Layout: [regionkey:bigint, count_8:bigint, $hashvalue_9:bigint]
+
+ Fragment 2 [SOURCE]
+     Output layout: [regionkey, count_8, $hashvalue_10]
+     Output partitioning: HASH [regionkey][$hashvalue_10]
+     Project[]
+     │   Layout: [regionkey:bigint, count_8:bigint, $hashvalue_10:bigint]
+     │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
+     │   $hashvalue_10 := "combine_hash"(bigint '0', COALESCE("$operator$hash_code"("regionkey"), 0))
+     └─ Aggregate(PARTIAL)[regionkey]
+        │   Layout: [regionkey:bigint, count_8:bigint]
+        │   count_8 := count(*)
+        └─ TableScan[tpch:nation:sf0.01, grouped = false]
+               Layout: [regionkey:bigint]
+               Estimates: {rows: 25 (225B), cpu: 225, memory: 0B, network: 0B}
+               regionkey := tpch:regionkey
+```
+
+### EXPLAIN (TYPE DISTRIBUTED, FORMAT JSON)
+
+:::{warning}
+The output format is not guaranteed to be backward compatible across Trino versions.
+:::
+
+Process the supplied query statement and create a distributed plan in JSON
+format. The distributed plan splits the logical plan into stages, and therefore
+explicitly shows the data exchange between workers:
+
+```
+EXPLAIN (TYPE DISTRIBUTED, FORMAT JSON) SELECT regionkey, count(*) FROM nation GROUP BY 1;
+```
+
+```json
+{
+   "0" : {
+      "id" : "9",
+      "name" : "Output",
+      "descriptor" : {
+         "columnNames" : "[regionkey, _col1]"
+      },
+      "outputs" : [ {
+         "symbol" : "regionkey",
+         "type" : "bigint"
+      }, {
+         "symbol" : "count",
+         "type" : "bigint"
+      } ],
+      "details" : [ "_col1 := count" ],
+      "estimates" : [ {
+         "outputRowCount" : "NaN",
+         "outputSizeInBytes" : "NaN",
+         "cpuCost" : "NaN",
+         "memoryCost" : "NaN",
+         "networkCost" : "NaN"
+      } ],
+      "children" : [ {
+         "id" : "145",
+         "name" : "RemoteSource",
+         "descriptor" : {
+            "sourceFragmentIds" : "[1]"
+         },
+         "outputs" : [ {
+            "symbol" : "regionkey",
+            "type" : "bigint"
+         }, {
+            "symbol" : "count",
+            "type" : "bigint"
+         } ],
+         "details" : [ ],
+         "estimates" : [ ],
+         "children" : [ ]
+      } ]
+   },
+   "1" : {
+      "id" : "4",
+      "name" : "Aggregate",
+      "descriptor" : {
+         "type" : "FINAL",
+         "keys" : "[regionkey]",
+         "hash" : "[]"
+      },
+      "outputs" : [ {
+         "symbol" : "regionkey",
+         "type" : "bigint"
+      }, {
+         "symbol" : "count",
+         "type" : "bigint"
+      } ],
+      "details" : [ "count := count(\"count_0\")" ],
+      "estimates" : [ {
+         "outputRowCount" : "NaN",
+         "outputSizeInBytes" : "NaN",
+         "cpuCost" : "NaN",
+         "memoryCost" : "NaN",
+         "networkCost" : "NaN"
+      } ],
+      "children" : [ {
+         "id" : "194",
+         "name" : "LocalExchange",
+         "descriptor" : {
+            "partitioning" : "SINGLE",
+            "isReplicateNullsAndAny" : "",
+            "hashColumn" : "[]",
+            "arguments" : "[]"
+         },
+         "outputs" : [ {
+            "symbol" : "regionkey",
+            "type" : "bigint"
+         }, {
+            "symbol" : "count_0",
+            "type" : "bigint"
+         } ],
+         "details" : [ ],
+         "estimates" : [ {
+            "outputRowCount" : "NaN",
+            "outputSizeInBytes" : "NaN",
+            "cpuCost" : "NaN",
+            "memoryCost" : "NaN",
+            "networkCost" : "NaN"
+         } ],
+         "children" : [ {
+            "id" : "227",
+            "name" : "Project",
+            "descriptor" : { },
+            "outputs" : [ {
+               "symbol" : "regionkey",
+               "type" : "bigint"
+            }, {
+               "symbol" : "count_0",
+               "type" : "bigint"
+            } ],
+            "details" : [ ],
+            "estimates" : [ {
+               "outputRowCount" : "NaN",
+               "outputSizeInBytes" : "NaN",
+               "cpuCost" : "NaN",
+               "memoryCost" : "NaN",
+               "networkCost" : "NaN"
+            } ],
+            "children" : [ {
+               "id" : "200",
+               "name" : "RemoteSource",
+               "descriptor" : {
+                  "sourceFragmentIds" : "[2]"
+               },
+               "outputs" : [ {
+                  "symbol" : "regionkey",
+                  "type" : "bigint"
+               }, {
+                  "symbol" : "count_0",
+                  "type" : "bigint"
+               }, {
+                  "symbol" : "$hashvalue",
+                  "type" : "bigint"
+               } ],
+               "details" : [ ],
+               "estimates" : [ ],
+               "children" : [ ]
+            } ]
+         } ]
+      } ]
+   },
+   "2" : {
+      "id" : "226",
+      "name" : "Project",
+      "descriptor" : { },
+      "outputs" : [ {
+         "symbol" : "regionkey",
+         "type" : "bigint"
+      }, {
+         "symbol" : "count_0",
+         "type" : "bigint"
+      }, {
+         "symbol" : "$hashvalue_1",
+         "type" : "bigint"
+      } ],
+      "details" : [ "$hashvalue_1 := combine_hash(bigint '0', COALESCE(\"$operator$hash_code\"(\"regionkey\"), 0))" ],
+      "estimates" : [ {
+         "outputRowCount" : "NaN",
+         "outputSizeInBytes" : "NaN",
+         "cpuCost" : "NaN",
+         "memoryCost" : "NaN",
+         "networkCost" : "NaN"
+      } ],
+      "children" : [ {
+         "id" : "198",
+         "name" : "Aggregate",
+         "descriptor" : {
+            "type" : "PARTIAL",
+            "keys" : "[regionkey]",
+            "hash" : "[]"
+         },
+         "outputs" : [ {
+            "symbol" : "regionkey",
+            "type" : "bigint"
+         }, {
+            "symbol" : "count_0",
+            "type" : "bigint"
+         } ],
+         "details" : [ "count_0 := count(*)" ],
+         "estimates" : [ ],
+         "children" : [ {
+            "id" : "0",
+            "name" : "TableScan",
+            "descriptor" : {
+               "table" : "tpch:tiny:nation"
+            },
+            "outputs" : [ {
+               "symbol" : "regionkey",
+               "type" : "bigint"
+            } ],
+            "details" : [ "regionkey := tpch:regionkey" ],
+            "estimates" : [ {
+               "outputRowCount" : 25.0,
+               "outputSizeInBytes" : 225.0,
+               "cpuCost" : 225.0,
+               "memoryCost" : 0.0,
+               "networkCost" : 0.0
+            } ],
+            "children" : [ ]
+         } ]
+      } ]
+   }
+}
+```
+
+### EXPLAIN (TYPE VALIDATE)
+
+Validate the supplied query statement for syntactical and semantic correctness.
+Returns true if the statement is valid:
+
+```
+EXPLAIN (TYPE VALIDATE) SELECT regionkey, count(*) FROM nation GROUP BY 1;
+```
+
+```text
+ Valid
+-------
+ true
+```
+
+If the statement is not correct because a syntax error, such as an unknown
+keyword, is found the error message details the problem:
+
+```
+EXPLAIN (TYPE VALIDATE) SELET 1=0;
+```
+
+```text
+Query 20220929_234840_00001_vjwxj failed: line 1:25: mismatched input 'SELET'.
+Expecting: 'ALTER', 'ANALYZE', 'CALL', 'COMMENT', 'COMMIT', 'CREATE',
+'DEALLOCATE', 'DELETE', 'DENY', 'DESC', 'DESCRIBE', 'DROP', 'EXECUTE',
+'EXPLAIN', 'GRANT', 'INSERT', 'MERGE', 'PREPARE', 'REFRESH', 'RESET',
+'REVOKE', 'ROLLBACK', 'SET', 'SHOW', 'START', 'TRUNCATE', 'UPDATE', 'USE',
+<query>
+```
+
+Similarly if semantic issues are detected, such as an invalid object name
+`nations` instead of `nation`, the error message returns useful
+information:
+
+```
+EXPLAIN(TYPE VALIDATE) SELECT * FROM tpch.tiny.nations;
+```
+
+```text
+Query 20220929_235059_00003_vjwxj failed: line 1:15: Table 'tpch.tiny.nations' does not exist
+SELECT * FROM tpch.tiny.nations
+```
+
+### EXPLAIN (TYPE IO)
+
+Process the supplied query statement and create a plan with input and output
+details about the accessed objects in JSON format:
+
+```
+EXPLAIN (TYPE IO, FORMAT JSON) INSERT INTO test_lineitem
+SELECT * FROM lineitem WHERE shipdate = '2020-02-01' AND quantity > 10;
+```
+
+```text
+            Query Plan
+-----------------------------------
+{
+   inputTableColumnInfos: [
+      {
+         table: {
+            catalog: "hive",
+            schemaTable: {
+               schema: "tpch",
+               table: "test_orders"
+            }
+         },
+         columnConstraints: [
+            {
+               columnName: "orderkey",
+               type: "bigint",
+               domain: {
+                  nullsAllowed: false,
+                  ranges: [
+                     {
+                        low: {
+                           value: "1",
+                           bound: "EXACTLY"
+                        },
+                        high: {
+                           value: "1",
+                           bound: "EXACTLY"
+                        }
+                     },
+                     {
+                        low: {
+                           value: "2",
+                           bound: "EXACTLY"
+                        },
+                        high: {
+                           value: "2",
+                           bound: "EXACTLY"
+                        }
+                     }
+                  ]
+               }
+            },
+            {
+               columnName: "processing",
+               type: "boolean",
+               domain: {
+                  nullsAllowed: false,
+                  ranges: [
+                     {
+                        low: {
+                           value: "false",
+                           bound: "EXACTLY"
+                        },
+                        high: {
+                           value: "false",
+                           bound: "EXACTLY"
+                        }
+                     }
+                  ]
+               }
+            },
+            {
+               columnName: "custkey",
+               type: "bigint",
+               domain: {
+                  nullsAllowed: false,
+                  ranges: [
+                     {
+                        low: {
+                           bound: "ABOVE"
+                        },
+                        high: {
+                           value: "10",
+                           bound: "EXACTLY"
+                        }
+                     }
+                  ]
+               }
+            }
+         ],
+         estimate: {
+            outputRowCount: 2,
+            outputSizeInBytes: 40,
+            cpuCost: 40,
+            maxMemory: 0,
+            networkCost: 0
+         }
+      }
+   ],
+   outputTable: {
+      catalog: "hive",
+      schemaTable: {
+         schema: "tpch",
+         table: "test_orders"
+      }
+   },
+   estimate: {
+      outputRowCount: "NaN",
+      outputSizeInBytes: "NaN",
+      cpuCost: "NaN",
+      maxMemory: "NaN",
+      networkCost: "NaN"
+   }
+}
+```
+
+## See also
+
+{doc}`explain-analyze`
diff --git a/docs/src/main/sphinx/sql/explain.rst b/docs/src/main/sphinx/sql/explain.rst
deleted file mode 100644
index 29ee11eb2a10..000000000000
--- a/docs/src/main/sphinx/sql/explain.rst
+++ /dev/null
@@ -1,772 +0,0 @@
-=======
-EXPLAIN
-=======
-
-Synopsis
---------
-
-.. code-block:: text
-
-    EXPLAIN [ ( option [, ...] ) ] statement
-
-where ``option`` can be one of:
-
-.. code-block:: text
-
-    FORMAT { TEXT | GRAPHVIZ | JSON }
-    TYPE { LOGICAL | DISTRIBUTED | VALIDATE | IO }
-
-Description
------------
-
-Show the logical or distributed execution plan of a statement, or validate the statement.
-The distributed plan is shown by default. Each plan fragment of the distributed plan is executed by
-a single or multiple Trino nodes. Fragments separation represent the data exchange between Trino nodes.
-Fragment type specifies how the fragment is executed by Trino nodes and how the data is
-distributed between fragments:
-
-``SINGLE``
-    Fragment is executed on a single node.
-
-``HASH``
-    Fragment is executed on a fixed number of nodes with the input data
-    distributed using a hash function.
-
-``ROUND_ROBIN``
-    Fragment is executed on a fixed number of nodes with the input data
-    distributed in a round-robin fashion.
-
-``BROADCAST``
-    Fragment is executed on a fixed number of nodes with the input data
-    broadcasted to all nodes.
-
-``SOURCE``
-    Fragment is executed on nodes where input splits are accessed.
-
-Examples
---------
-
-EXPLAIN (TYPE LOGICAL)
-^^^^^^^^^^^^^^^^^^^^^^
-
-Process the supplied query statement and create a logical plan in text format::
-
-    EXPLAIN (TYPE LOGICAL) SELECT regionkey, count(*) FROM nation GROUP BY 1;
-
-.. code-block:: text
-
-                                                       Query Plan
-    -----------------------------------------------------------------------------------------------------------------
-     Trino version: version
-     Output[regionkey, _col1]
-     │   Layout: [regionkey:bigint, count:bigint]
-     │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-     │   _col1 := count
-     └─ RemoteExchange[GATHER]
-        │   Layout: [regionkey:bigint, count:bigint]
-        │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-        └─ Aggregate(FINAL)[regionkey]
-           │   Layout: [regionkey:bigint, count:bigint]
-           │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-           │   count := count("count_8")
-           └─ LocalExchange[HASH][$hashvalue] ("regionkey")
-              │   Layout: [regionkey:bigint, count_8:bigint, $hashvalue:bigint]
-              │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-              └─ RemoteExchange[REPARTITION][$hashvalue_9]
-                 │   Layout: [regionkey:bigint, count_8:bigint, $hashvalue_9:bigint]
-                 │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-                 └─ Project[]
-                    │   Layout: [regionkey:bigint, count_8:bigint, $hashvalue_10:bigint]
-                    │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-                    │   $hashvalue_10 := "combine_hash"(bigint '0', COALESCE("$operator$hash_code"("regionkey"), 0))
-                    └─ Aggregate(PARTIAL)[regionkey]
-                       │   Layout: [regionkey:bigint, count_8:bigint]
-                       │   count_8 := count(*)
-                       └─ TableScan[tpch:nation:sf0.01]
-                              Layout: [regionkey:bigint]
-                              Estimates: {rows: 25 (225B), cpu: 225, memory: 0B, network: 0B}
-                              regionkey := tpch:regionkey
-
-EXPLAIN (TYPE LOGICAL, FORMAT JSON)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. warning:: The output format is not guaranteed to be backward compatible across Trino versions.
-
-Process the supplied query statement and create a logical plan in JSON format::
-
-    EXPLAIN (TYPE LOGICAL, FORMAT JSON) SELECT regionkey, count(*) FROM nation GROUP BY 1;
-
-.. code-block:: json
-
-    {
-       "id": "9",
-       "name": "Output",
-       "descriptor": {
-          "columnNames": "[regionkey, _col1]"
-       },
-       "outputs": [
-          {
-             "symbol": "regionkey",
-             "type": "bigint"
-          },
-          {
-             "symbol": "count",
-             "type": "bigint"
-          }
-       ],
-       "details": [
-          "_col1 := count"
-       ],
-       "estimates": [
-          {
-             "outputRowCount": "NaN",
-             "outputSizeInBytes": "NaN",
-             "cpuCost": "NaN",
-             "memoryCost": "NaN",
-             "networkCost": "NaN"
-          }
-       ],
-       "children": [
-          {
-             "id": "145",
-             "name": "RemoteExchange",
-             "descriptor": {
-                "type": "GATHER",
-                "isReplicateNullsAndAny": "",
-                "hashColumn": ""
-             },
-             "outputs": [
-                {
-                   "symbol": "regionkey",
-                   "type": "bigint"
-                },
-                {
-                   "symbol": "count",
-                   "type": "bigint"
-                }
-             ],
-             "details": [
-
-             ],
-             "estimates": [
-                {
-                   "outputRowCount": "NaN",
-                   "outputSizeInBytes": "NaN",
-                   "cpuCost": "NaN",
-                   "memoryCost": "NaN",
-                   "networkCost": "NaN"
-                }
-             ],
-             "children": [
-                {
-                   "id": "4",
-                   "name": "Aggregate",
-                   "descriptor": {
-                      "type": "FINAL",
-                      "keys": "[regionkey]",
-                      "hash": ""
-                   },
-                   "outputs": [
-                      {
-                         "symbol": "regionkey",
-                         "type": "bigint"
-                      },
-                      {
-                         "symbol": "count",
-                         "type": "bigint"
-                      }
-                   ],
-                   "details": [
-                      "count := count(\"count_0\")"
-                   ],
-                   "estimates": [
-                      {
-                         "outputRowCount": "NaN",
-                         "outputSizeInBytes": "NaN",
-                         "cpuCost": "NaN",
-                         "memoryCost": "NaN",
-                         "networkCost": "NaN"
-                      }
-                   ],
-                   "children": [
-                      {
-                         "id": "194",
-                         "name": "LocalExchange",
-                         "descriptor": {
-                            "partitioning": "HASH",
-                            "isReplicateNullsAndAny": "",
-                            "hashColumn": "[$hashvalue]",
-                            "arguments": "[\"regionkey\"]"
-                         },
-                         "outputs": [
-                            {
-                               "symbol": "regionkey",
-                               "type": "bigint"
-                            },
-                            {
-                               "symbol": "count_0",
-                               "type": "bigint"
-                            },
-                            {
-                               "symbol": "$hashvalue",
-                               "type": "bigint"
-                            }
-                         ],
-                         "details":[],
-                         "estimates": [
-                            {
-                               "outputRowCount": "NaN",
-                               "outputSizeInBytes": "NaN",
-                               "cpuCost": "NaN",
-                               "memoryCost": "NaN",
-                               "networkCost": "NaN"
-                            }
-                         ],
-                         "children": [
-                            {
-                               "id": "200",
-                               "name": "RemoteExchange",
-                               "descriptor": {
-                                  "type": "REPARTITION",
-                                  "isReplicateNullsAndAny": "",
-                                  "hashColumn": "[$hashvalue_1]"
-                               },
-                               "outputs": [
-                                  {
-                                     "symbol": "regionkey",
-                                     "type": "bigint"
-                                  },
-                                  {
-                                     "symbol": "count_0",
-                                     "type": "bigint"
-                                  },
-                                  {
-                                     "symbol": "$hashvalue_1",
-                                     "type": "bigint"
-                                  }
-                               ],
-                               "details":[],
-                               "estimates": [
-                                  {
-                                     "outputRowCount": "NaN",
-                                     "outputSizeInBytes": "NaN",
-                                     "cpuCost": "NaN",
-                                     "memoryCost": "NaN",
-                                     "networkCost": "NaN"
-                                  }
-                               ],
-                               "children": [
-                                  {
-                                     "id": "226",
-                                     "name": "Project",
-                                     "descriptor": {}
-                                     "outputs": [
-                                        {
-                                           "symbol": "regionkey",
-                                           "type": "bigint"
-                                        },
-                                        {
-                                           "symbol": "count_0",
-                                           "type": "bigint"
-                                        },
-                                        {
-                                           "symbol": "$hashvalue_2",
-                                           "type": "bigint"
-                                        }
-                                     ],
-                                     "details": [
-                                        "$hashvalue_2 := combine_hash(bigint '0', COALESCE(\"$operator$hash_code\"(\"regionkey\"), 0))"
-                                     ],
-                                     "estimates": [
-                                        {
-                                           "outputRowCount": "NaN",
-                                           "outputSizeInBytes": "NaN",
-                                           "cpuCost": "NaN",
-                                           "memoryCost": "NaN",
-                                           "networkCost": "NaN"
-                                        }
-                                     ],
-                                     "children": [
-                                        {
-                                           "id": "198",
-                                           "name": "Aggregate",
-                                           "descriptor": {
-                                              "type": "PARTIAL",
-                                              "keys": "[regionkey]",
-                                              "hash": ""
-                                           },
-                                           "outputs": [
-                                              {
-                                                 "symbol": "regionkey",
-                                                 "type": "bigint"
-                                              },
-                                              {
-                                                 "symbol": "count_0",
-                                                 "type": "bigint"
-                                              }
-                                           ],
-                                           "details": [
-                                              "count_0 := count(*)"
-                                           ],
-                                           "estimates":[],
-                                           "children": [
-                                              {
-                                                 "id": "0",
-                                                 "name": "TableScan",
-                                                 "descriptor": {
-                                                    "table": "hive:tpch_sf1_orc_part:nation"
-                                                 },
-                                                 "outputs": [
-                                                    {
-                                                       "symbol": "regionkey",
-                                                       "type": "bigint"
-                                                    }
-                                                 ],
-                                                 "details": [
-                                                    "regionkey := regionkey:bigint:REGULAR"
-                                                 ],
-                                                 "estimates": [
-                                                    {
-                                                       "outputRowCount": 25,
-                                                       "outputSizeInBytes": 225,
-                                                       "cpuCost": 225,
-                                                       "memoryCost": 0,
-                                                       "networkCost": 0
-                                                    }
-                                                 ],
-                                                 "children": []
-                                              }
-                                           ]
-                                        }
-                                     ]
-                                  }
-                               ]
-                            }
-                         ]
-                      }
-                   ]
-                }
-             ]
-          }
-       ]
-    }
-
-EXPLAIN (TYPE DISTRIBUTED)
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Process the supplied query statement and create a distributed plan in text
-format. The distributed plan splits the logical plan into stages, and therefore
-explicitly shows the data exchange between workers::
-
-
-    EXPLAIN (TYPE DISTRIBUTED) SELECT regionkey, count(*) FROM nation GROUP BY 1;
-
-.. code-block:: text
-
-                                                  Query Plan
-    ------------------------------------------------------------------------------------------------------
-     Trino version: version
-     Fragment 0 [SINGLE]
-         Output layout: [regionkey, count]
-         Output partitioning: SINGLE []
-         Output[regionkey, _col1]
-         │   Layout: [regionkey:bigint, count:bigint]
-         │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-         │   _col1 := count
-         └─ RemoteSource[1]
-                Layout: [regionkey:bigint, count:bigint]
-
-     Fragment 1 [HASH]
-         Output layout: [regionkey, count]
-         Output partitioning: SINGLE []
-         Aggregate(FINAL)[regionkey]
-         │   Layout: [regionkey:bigint, count:bigint]
-         │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-         │   count := count("count_8")
-         └─ LocalExchange[HASH][$hashvalue] ("regionkey")
-            │   Layout: [regionkey:bigint, count_8:bigint, $hashvalue:bigint]
-            │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-            └─ RemoteSource[2]
-                   Layout: [regionkey:bigint, count_8:bigint, $hashvalue_9:bigint]
-
-     Fragment 2 [SOURCE]
-         Output layout: [regionkey, count_8, $hashvalue_10]
-         Output partitioning: HASH [regionkey][$hashvalue_10]
-         Project[]
-         │   Layout: [regionkey:bigint, count_8:bigint, $hashvalue_10:bigint]
-         │   Estimates: {rows: ? (?), cpu: ?, memory: ?, network: ?}
-         │   $hashvalue_10 := "combine_hash"(bigint '0', COALESCE("$operator$hash_code"("regionkey"), 0))
-         └─ Aggregate(PARTIAL)[regionkey]
-            │   Layout: [regionkey:bigint, count_8:bigint]
-            │   count_8 := count(*)
-            └─ TableScan[tpch:nation:sf0.01, grouped = false]
-                   Layout: [regionkey:bigint]
-                   Estimates: {rows: 25 (225B), cpu: 225, memory: 0B, network: 0B}
-                   regionkey := tpch:regionkey
-
-EXPLAIN (TYPE DISTRIBUTED, FORMAT JSON)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. warning:: The output format is not guaranteed to be backward compatible across Trino versions.
-
-Process the supplied query statement and create a distributed plan in JSON
-format. The distributed plan splits the logical plan into stages, and therefore
-explicitly shows the data exchange between workers::
-
-    EXPLAIN (TYPE DISTRIBUTED, FORMAT JSON) SELECT regionkey, count(*) FROM nation GROUP BY 1;
-
-.. code-block:: json
-
-    {
-       "0" : {
-          "id" : "9",
-          "name" : "Output",
-          "descriptor" : {
-             "columnNames" : "[regionkey, _col1]"
-          },
-          "outputs" : [ {
-             "symbol" : "regionkey",
-             "type" : "bigint"
-          }, {
-             "symbol" : "count",
-             "type" : "bigint"
-          } ],
-          "details" : [ "_col1 := count" ],
-          "estimates" : [ {
-             "outputRowCount" : "NaN",
-             "outputSizeInBytes" : "NaN",
-             "cpuCost" : "NaN",
-             "memoryCost" : "NaN",
-             "networkCost" : "NaN"
-          } ],
-          "children" : [ {
-             "id" : "145",
-             "name" : "RemoteSource",
-             "descriptor" : {
-                "sourceFragmentIds" : "[1]"
-             },
-             "outputs" : [ {
-                "symbol" : "regionkey",
-                "type" : "bigint"
-             }, {
-                "symbol" : "count",
-                "type" : "bigint"
-             } ],
-             "details" : [ ],
-             "estimates" : [ ],
-             "children" : [ ]
-          } ]
-       },
-       "1" : {
-          "id" : "4",
-          "name" : "Aggregate",
-          "descriptor" : {
-             "type" : "FINAL",
-             "keys" : "[regionkey]",
-             "hash" : "[]"
-          },
-          "outputs" : [ {
-             "symbol" : "regionkey",
-             "type" : "bigint"
-          }, {
-             "symbol" : "count",
-             "type" : "bigint"
-          } ],
-          "details" : [ "count := count(\"count_0\")" ],
-          "estimates" : [ {
-             "outputRowCount" : "NaN",
-             "outputSizeInBytes" : "NaN",
-             "cpuCost" : "NaN",
-             "memoryCost" : "NaN",
-             "networkCost" : "NaN"
-          } ],
-          "children" : [ {
-             "id" : "194",
-             "name" : "LocalExchange",
-             "descriptor" : {
-                "partitioning" : "SINGLE",
-                "isReplicateNullsAndAny" : "",
-                "hashColumn" : "[]",
-                "arguments" : "[]"
-             },
-             "outputs" : [ {
-                "symbol" : "regionkey",
-                "type" : "bigint"
-             }, {
-                "symbol" : "count_0",
-                "type" : "bigint"
-             } ],
-             "details" : [ ],
-             "estimates" : [ {
-                "outputRowCount" : "NaN",
-                "outputSizeInBytes" : "NaN",
-                "cpuCost" : "NaN",
-                "memoryCost" : "NaN",
-                "networkCost" : "NaN"
-             } ],
-             "children" : [ {
-                "id" : "227",
-                "name" : "Project",
-                "descriptor" : { },
-                "outputs" : [ {
-                   "symbol" : "regionkey",
-                   "type" : "bigint"
-                }, {
-                   "symbol" : "count_0",
-                   "type" : "bigint"
-                } ],
-                "details" : [ ],
-                "estimates" : [ {
-                   "outputRowCount" : "NaN",
-                   "outputSizeInBytes" : "NaN",
-                   "cpuCost" : "NaN",
-                   "memoryCost" : "NaN",
-                   "networkCost" : "NaN"
-                } ],
-                "children" : [ {
-                   "id" : "200",
-                   "name" : "RemoteSource",
-                   "descriptor" : {
-                      "sourceFragmentIds" : "[2]"
-                   },
-                   "outputs" : [ {
-                      "symbol" : "regionkey",
-                      "type" : "bigint"
-                   }, {
-                      "symbol" : "count_0",
-                      "type" : "bigint"
-                   }, {
-                      "symbol" : "$hashvalue",
-                      "type" : "bigint"
-                   } ],
-                   "details" : [ ],
-                   "estimates" : [ ],
-                   "children" : [ ]
-                } ]
-             } ]
-          } ]
-       },
-       "2" : {
-          "id" : "226",
-          "name" : "Project",
-          "descriptor" : { },
-          "outputs" : [ {
-             "symbol" : "regionkey",
-             "type" : "bigint"
-          }, {
-             "symbol" : "count_0",
-             "type" : "bigint"
-          }, {
-             "symbol" : "$hashvalue_1",
-             "type" : "bigint"
-          } ],
-          "details" : [ "$hashvalue_1 := combine_hash(bigint '0', COALESCE(\"$operator$hash_code\"(\"regionkey\"), 0))" ],
-          "estimates" : [ {
-             "outputRowCount" : "NaN",
-             "outputSizeInBytes" : "NaN",
-             "cpuCost" : "NaN",
-             "memoryCost" : "NaN",
-             "networkCost" : "NaN"
-          } ],
-          "children" : [ {
-             "id" : "198",
-             "name" : "Aggregate",
-             "descriptor" : {
-                "type" : "PARTIAL",
-                "keys" : "[regionkey]",
-                "hash" : "[]"
-             },
-             "outputs" : [ {
-                "symbol" : "regionkey",
-                "type" : "bigint"
-             }, {
-                "symbol" : "count_0",
-                "type" : "bigint"
-             } ],
-             "details" : [ "count_0 := count(*)" ],
-             "estimates" : [ ],
-             "children" : [ {
-                "id" : "0",
-                "name" : "TableScan",
-                "descriptor" : {
-                   "table" : "tpch:tiny:nation"
-                },
-                "outputs" : [ {
-                   "symbol" : "regionkey",
-                   "type" : "bigint"
-                } ],
-                "details" : [ "regionkey := tpch:regionkey" ],
-                "estimates" : [ {
-                   "outputRowCount" : 25.0,
-                   "outputSizeInBytes" : 225.0,
-                   "cpuCost" : 225.0,
-                   "memoryCost" : 0.0,
-                   "networkCost" : 0.0
-                } ],
-                "children" : [ ]
-             } ]
-          } ]
-       }
-    }
-
-EXPLAIN (TYPE VALIDATE)
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Validate the supplied query statement for syntactical and semantic correctness.
-Returns true if the statement is valid::
-
-    EXPLAIN (TYPE VALIDATE) SELECT regionkey, count(*) FROM nation GROUP BY 1;
-
-.. code-block:: text
-
-     Valid
-    -------
-     true
-
-If the statement is not correct because a syntax error, such as an unknown
-keyword, is found the error message details the problem::
-
-    EXPLAIN (TYPE VALIDATE) SELET 1=0;
-
-.. code-block:: text
-
-    Query 20220929_234840_00001_vjwxj failed: line 1:25: mismatched input 'SELET'.
-    Expecting: 'ALTER', 'ANALYZE', 'CALL', 'COMMENT', 'COMMIT', 'CREATE',
-    'DEALLOCATE', 'DELETE', 'DENY', 'DESC', 'DESCRIBE', 'DROP', 'EXECUTE',
-    'EXPLAIN', 'GRANT', 'INSERT', 'MERGE', 'PREPARE', 'REFRESH', 'RESET',
-    'REVOKE', 'ROLLBACK', 'SET', 'SHOW', 'START', 'TRUNCATE', 'UPDATE', 'USE',
-    <query>
-
-Similarly if semantic issues are detected, such as an invalid object name
-``nations`` instead of ``nation``, the error message returns useful
-information::
-
-    EXPLAIN(TYPE VALIDATE) SELECT * FROM tpch.tiny.nations;
-
-.. code-block:: text
-
-    Query 20220929_235059_00003_vjwxj failed: line 1:15: Table 'tpch.tiny.nations' does not exist
-    SELECT * FROM tpch.tiny.nations
-
-
-EXPLAIN (TYPE IO)
-^^^^^^^^^^^^^^^^^
-
-Process the supplied query statement and create a plan with input and output
-details about the accessed objects in JSON format::
-
-    EXPLAIN (TYPE IO, FORMAT JSON) INSERT INTO test_lineitem
-    SELECT * FROM lineitem WHERE shipdate = '2020-02-01' AND quantity > 10;
-
-.. code-block:: text
-
-                Query Plan
-    -----------------------------------
-    {
-       inputTableColumnInfos: [
-          {
-             table: {
-                catalog: "hive",
-                schemaTable: {
-                   schema: "tpch",
-                   table: "test_orders"
-                }
-             },
-             columnConstraints: [
-                {
-                   columnName: "orderkey",
-                   type: "bigint",
-                   domain: {
-                      nullsAllowed: false,
-                      ranges: [
-                         {
-                            low: {
-                               value: "1",
-                               bound: "EXACTLY"
-                            },
-                            high: {
-                               value: "1",
-                               bound: "EXACTLY"
-                            }
-                         },
-                         {
-                            low: {
-                               value: "2",
-                               bound: "EXACTLY"
-                            },
-                            high: {
-                               value: "2",
-                               bound: "EXACTLY"
-                            }
-                         }
-                      ]
-                   }
-                },
-                {
-                   columnName: "processing",
-                   type: "boolean",
-                   domain: {
-                      nullsAllowed: false,
-                      ranges: [
-                         {
-                            low: {
-                               value: "false",
-                               bound: "EXACTLY"
-                            },
-                            high: {
-                               value: "false",
-                               bound: "EXACTLY"
-                            }
-                         }
-                      ]
-                   }
-                },
-                {
-                   columnName: "custkey",
-                   type: "bigint",
-                   domain: {
-                      nullsAllowed: false,
-                      ranges: [
-                         {
-                            low: {
-                               bound: "ABOVE"
-                            },
-                            high: {
-                               value: "10",
-                               bound: "EXACTLY"
-                            }
-                         }
-                      ]
-                   }
-                }
-             ],
-             estimate: {
-                outputRowCount: 2,
-                outputSizeInBytes: 40,
-                cpuCost: 40,
-                maxMemory: 0,
-                networkCost: 0
-             }
-          }
-       ],
-       outputTable: {
-          catalog: "hive",
-          schemaTable: {
-             schema: "tpch",
-             table: "test_orders"
-          }
-       },
-       estimate: {
-          outputRowCount: "NaN",
-          outputSizeInBytes: "NaN",
-          cpuCost: "NaN",
-          maxMemory: "NaN",
-          networkCost: "NaN"
-       }
-    }
-
-
-See also
---------
-
-:doc:`explain-analyze`
diff --git a/docs/src/main/sphinx/sql/grant-roles.md b/docs/src/main/sphinx/sql/grant-roles.md
new file mode 100644
index 000000000000..02dc29b7ca00
--- /dev/null
+++ b/docs/src/main/sphinx/sql/grant-roles.md
@@ -0,0 +1,51 @@
+# GRANT role
+
+## Synopsis
+
+```text
+GRANT role_name [, ...]
+TO ( user | USER user_mame | ROLE role_name) [, ...]
+[ GRANTED BY ( user | USER user | ROLE role | CURRENT_USER | CURRENT_ROLE ) ]
+[ WITH ADMIN OPTION ]
+[ IN catalog ]
+```
+
+## Description
+
+Grants the specified role(s) to the specified principal(s).
+
+If the `WITH ADMIN OPTION` clause is specified, the role(s) are granted
+to the users with `GRANT` option.
+
+For the `GRANT` statement for roles to succeed, the user executing it either should
+be the role admin or should possess the `GRANT` option for the given role.
+
+The optional `GRANTED BY` clause causes the role(s) to be granted with
+the specified principal as a grantor. If the `GRANTED BY` clause is not
+specified, the roles are granted with the current user as a grantor.
+
+The optional `IN catalog` clause grants the roles in a catalog as opposed
+to a system roles.
+
+## Examples
+
+Grant role `bar` to user `foo`
+
+```
+GRANT bar TO USER foo;
+```
+
+Grant roles `bar` and `foo` to user `baz` and role `qux` with admin option
+
+```
+GRANT bar, foo TO USER baz, ROLE qux WITH ADMIN OPTION;
+```
+
+## Limitations
+
+Some connectors do not support role management.
+See connector documentation for more details.
+
+## See also
+
+{doc}`create-role`, {doc}`drop-role`, {doc}`set-role`, {doc}`revoke-roles`
diff --git a/docs/src/main/sphinx/sql/grant-roles.rst b/docs/src/main/sphinx/sql/grant-roles.rst
deleted file mode 100644
index 7610c2aa3d0e..000000000000
--- a/docs/src/main/sphinx/sql/grant-roles.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-===========
-GRANT ROLES
-===========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    GRANT role [, ...]
-    TO ( user | USER user | ROLE role) [, ...]
-    [ GRANTED BY ( user | USER user | ROLE role | CURRENT_USER | CURRENT_ROLE ) ]
-    [ WITH ADMIN OPTION ]
-    [ IN catalog ]
-
-Description
------------
-
-Grants the specified role(s) to the specified principal(s).
-
-If the ``WITH ADMIN OPTION`` clause is specified, the role(s) are granted
-to the users with ``GRANT`` option.
-
-For the ``GRANT`` statement for roles to succeed, the user executing it either should
-be the role admin or should possess the ``GRANT`` option for the given role.
-
-The optional ``GRANTED BY`` clause causes the role(s) to be granted with
-the specified principal as a grantor. If the ``GRANTED BY`` clause is not
-specified, the roles are granted with the current user as a grantor.
-
-The optional ``IN catalog`` clause grants the roles in a catalog as opposed
-to a system roles.
-
-Examples
---------
-
-Grant role ``bar`` to user ``foo`` ::
-
-    GRANT bar TO USER foo;
-
-Grant roles ``bar`` and ``foo`` to user ``baz`` and role ``qux`` with admin option ::
-
-    GRANT bar, foo TO USER baz, ROLE qux WITH ADMIN OPTION;
-
-Limitations
------------
-
-Some connectors do not support role management.
-See connector documentation for more details.
-
-See also
---------
-
-:doc:`create-role`, :doc:`drop-role`, :doc:`set-role`, :doc:`revoke-roles`
diff --git a/docs/src/main/sphinx/sql/grant.md b/docs/src/main/sphinx/sql/grant.md
new file mode 100644
index 000000000000..269e0fd9dda0
--- /dev/null
+++ b/docs/src/main/sphinx/sql/grant.md
@@ -0,0 +1,61 @@
+# GRANT privilege
+
+## Synopsis
+
+```text
+GRANT ( privilege [, ...] | ( ALL PRIVILEGES ) )
+ON ( table_name | TABLE table_name | SCHEMA schema_name)
+TO ( user | USER user | ROLE role )
+[ WITH GRANT OPTION ]
+```
+
+## Description
+
+Grants the specified privileges to the specified grantee.
+
+Specifying `ALL PRIVILEGES` grants {doc}`delete`, {doc}`insert`, {doc}`update` and {doc}`select` privileges.
+
+Specifying `ROLE PUBLIC` grants privileges to the `PUBLIC` role and hence to all users.
+
+The optional `WITH GRANT OPTION` clause allows the grantee to grant these same privileges to others.
+
+For `GRANT` statement to succeed, the user executing it should possess the specified privileges as well as the `GRANT OPTION` for those privileges.
+
+Grant on a table grants the specified privilege on all current and future columns of the table.
+
+Grant on a schema grants the specified privilege on all current and future columns of all current and future tables of the schema.
+
+## Examples
+
+Grant `INSERT` and `SELECT` privileges on the table `orders` to user `alice`:
+
+```
+GRANT INSERT, SELECT ON orders TO alice;
+```
+
+Grant `DELETE` privilege on the schema `finance` to user `bob`:
+
+```
+GRANT DELETE ON SCHEMA finance TO bob;
+```
+
+Grant `SELECT` privilege on the table `nation` to user `alice`, additionally allowing `alice` to grant `SELECT` privilege to others:
+
+```
+GRANT SELECT ON nation TO alice WITH GRANT OPTION;
+```
+
+Grant `SELECT` privilege on the table `orders` to everyone:
+
+```
+GRANT SELECT ON orders TO ROLE PUBLIC;
+```
+
+## Limitations
+
+Some connectors have no support for `GRANT`.
+See connector documentation for more details.
+
+## See also
+
+{doc}`deny`, {doc}`revoke`, {doc}`show-grants`
diff --git a/docs/src/main/sphinx/sql/grant.rst b/docs/src/main/sphinx/sql/grant.rst
deleted file mode 100644
index 4f3f2d63e6c6..000000000000
--- a/docs/src/main/sphinx/sql/grant.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-=====
-GRANT
-=====
-
-Synopsis
---------
-
-.. code-block:: text
-
-    GRANT ( privilege [, ...] | ( ALL PRIVILEGES ) )
-    ON ( table_name | TABLE table_name | SCHEMA schema_name)
-    TO ( user | USER user | ROLE role )
-    [ WITH GRANT OPTION ]
-
-Description
------------
-
-Grants the specified privileges to the specified grantee.
-
-Specifying ``ALL PRIVILEGES`` grants :doc:`delete`, :doc:`insert`, :doc:`update` and :doc:`select` privileges.
-
-Specifying ``ROLE PUBLIC`` grants privileges to the ``PUBLIC`` role and hence to all users.
-
-The optional ``WITH GRANT OPTION`` clause allows the grantee to grant these same privileges to others.
-
-For ``GRANT`` statement to succeed, the user executing it should possess the specified privileges as well as the ``GRANT OPTION`` for those privileges.
-
-Grant on a table grants the specified privilege on all current and future columns of the table.
-
-Grant on a schema grants the specified privilege on all current and future columns of all current and future tables of the schema.
-
-Examples
---------
-
-Grant ``INSERT`` and ``SELECT`` privileges on the table ``orders`` to user ``alice``::
-
-    GRANT INSERT, SELECT ON orders TO alice;
-
-Grant ``DELETE`` privilege on the schema ``finance`` to user ``bob``::
-
-    GRANT DELETE ON SCHEMA finance TO bob;
-
-Grant ``SELECT`` privilege on the table ``nation`` to user ``alice``, additionally allowing ``alice`` to grant ``SELECT`` privilege to others::
-
-    GRANT SELECT ON nation TO alice WITH GRANT OPTION;
-
-Grant ``SELECT`` privilege on the table ``orders`` to everyone::
-
-    GRANT SELECT ON orders TO ROLE PUBLIC;
-
-Limitations
------------
-
-Some connectors have no support for ``GRANT``.
-See connector documentation for more details.
-
-See also
---------
-
-:doc:`revoke`, :doc:`show-grants`
diff --git a/docs/src/main/sphinx/sql/insert.md b/docs/src/main/sphinx/sql/insert.md
new file mode 100644
index 000000000000..677fc9a936fc
--- /dev/null
+++ b/docs/src/main/sphinx/sql/insert.md
@@ -0,0 +1,57 @@
+# INSERT
+
+## Synopsis
+
+```text
+INSERT INTO table_name [ ( column [, ... ] ) ] query
+```
+
+## Description
+
+Insert new rows into a table.
+
+If the list of column names is specified, they must exactly match the list
+of columns produced by the query. Each column in the table not present in the
+column list will be filled with a `null` value. Otherwise, if the list of
+columns is not specified, the columns produced by the query must exactly match
+the columns in the table being inserted into.
+
+## Examples
+
+Load additional rows into the `orders` table from the `new_orders` table:
+
+```
+INSERT INTO orders
+SELECT * FROM new_orders;
+```
+
+Insert a single row into the `cities` table:
+
+```
+INSERT INTO cities VALUES (1, 'San Francisco');
+```
+
+Insert multiple rows into the `cities` table:
+
+```
+INSERT INTO cities VALUES (2, 'San Jose'), (3, 'Oakland');
+```
+
+Insert a single row into the `nation` table with the specified column list:
+
+```
+INSERT INTO nation (nationkey, name, regionkey, comment)
+VALUES (26, 'POLAND', 3, 'no comment');
+```
+
+Insert a row without specifying the `comment` column.
+That column will be `null`:
+
+```
+INSERT INTO nation (nationkey, name, regionkey)
+VALUES (26, 'POLAND', 3);
+```
+
+## See also
+
+{doc}`values`
diff --git a/docs/src/main/sphinx/sql/insert.rst b/docs/src/main/sphinx/sql/insert.rst
deleted file mode 100644
index a5455f86392e..000000000000
--- a/docs/src/main/sphinx/sql/insert.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-======
-INSERT
-======
-
-Synopsis
---------
-
-.. code-block:: text
-
-    INSERT INTO table_name [ ( column [, ... ] ) ] query
-
-Description
------------
-
-Insert new rows into a table.
-
-If the list of column names is specified, they must exactly match the list
-of columns produced by the query. Each column in the table not present in the
-column list will be filled with a ``null`` value. Otherwise, if the list of
-columns is not specified, the columns produced by the query must exactly match
-the columns in the table being inserted into.
-
-
-Examples
---------
-
-Load additional rows into the ``orders`` table from the ``new_orders`` table::
-
-    INSERT INTO orders
-    SELECT * FROM new_orders;
-
-Insert a single row into the ``cities`` table::
-
-    INSERT INTO cities VALUES (1, 'San Francisco');
-
-Insert multiple rows into the ``cities`` table::
-
-    INSERT INTO cities VALUES (2, 'San Jose'), (3, 'Oakland');
-
-Insert a single row into the ``nation`` table with the specified column list::
-
-    INSERT INTO nation (nationkey, name, regionkey, comment)
-    VALUES (26, 'POLAND', 3, 'no comment');
-
-Insert a row without specifying the ``comment`` column.
-That column will be ``null``::
-
-    INSERT INTO nation (nationkey, name, regionkey)
-    VALUES (26, 'POLAND', 3);
-
-See also
---------
-
-:doc:`values`
diff --git a/docs/src/main/sphinx/sql/match-recognize.md b/docs/src/main/sphinx/sql/match-recognize.md
new file mode 100644
index 000000000000..cffddbccd747
--- /dev/null
+++ b/docs/src/main/sphinx/sql/match-recognize.md
@@ -0,0 +1,809 @@
+# MATCH_RECOGNIZE
+
+## Synopsis
+
+```text
+MATCH_RECOGNIZE (
+  [ PARTITION BY column [, ...] ]
+  [ ORDER BY column [, ...] ]
+  [ MEASURES measure_definition [, ...] ]
+  [ rows_per_match ]
+  [ AFTER MATCH skip_to ]
+  PATTERN ( row_pattern )
+  [ SUBSET subset_definition [, ...] ]
+  DEFINE variable_definition [, ...]
+  )
+```
+
+## Description
+
+The `MATCH_RECOGNIZE` clause is an optional subclause of the `FROM` clause.
+It is used to detect patterns in a set of rows. Patterns of interest are
+specified using row pattern syntax based on regular expressions. The input to
+pattern matching is a table, a view or a subquery. For each detected match, one
+or more rows are returned. They contain requested information about the match.
+
+Row pattern matching is a powerful tool when analyzing complex sequences of
+events. The following examples show some of the typical use cases:
+
+- in trade applications, tracking trends or identifying customers with specific
+  behavioral patterns
+- in shipping applications, tracking packages through all possible valid paths,
+- in financial applications, detecting unusual incidents, which might signal
+  fraud
+
+## Example
+
+In the following example, the pattern describes a V-shape over the
+`totalprice` column. A match is found whenever orders made by a customer
+first decrease in price, and then increase past the starting point:
+
+```
+SELECT * FROM orders MATCH_RECOGNIZE(
+     PARTITION BY custkey
+     ORDER BY orderdate
+     MEASURES
+              A.totalprice AS starting_price,
+              LAST(B.totalprice) AS bottom_price,
+              LAST(U.totalprice) AS top_price
+     ONE ROW PER MATCH
+     AFTER MATCH SKIP PAST LAST ROW
+     PATTERN (A B+ C+ D+)
+     SUBSET U = (C, D)
+     DEFINE
+              B AS totalprice < PREV(totalprice),
+              C AS totalprice > PREV(totalprice) AND totalprice <= A.totalprice,
+              D AS totalprice > PREV(totalprice)
+     )
+```
+
+In the following sections, all subclauses of the `MATCH_RECOGNIZE` clause are
+explained with this example query.
+
+## Partitioning and ordering
+
+```sql
+PARTITION BY custkey
+```
+
+The `PARTITION BY` clause allows you to break up the input table into
+separate sections, that are independently processed for pattern matching.
+Without a partition declaration, the whole input table is used. This behavior
+is analogous to the semantics of `PARTITION BY` clause in {ref}`window
+specification<window-clause>`. In the example, the `orders` table is
+partitioned by the `custkey` value, so that pattern matching is performed for
+all orders of a specific customer independently from orders of other
+customers.
+
+```sql
+ORDER BY orderdate
+```
+
+The optional `ORDER BY` clause is generally useful to allow matching on an
+ordered data set. For example, sorting the input by `orderdate` allows for
+matching on a trend of changes over time.
+
+(row-pattern-measures)=
+
+## Row pattern measures
+
+The `MEASURES` clause allows to specify what information is retrieved from a
+matched sequence of rows.
+
+```text
+MEASURES measure_expression AS measure_name [, ...]
+```
+
+A measure expression is a scalar expression whose value is computed based on a
+match. In the example, three row pattern measures are specified:
+
+`A.totalprice AS starting_price` returns the price in the first row of the
+match, which is the only row associated with `A` according to the pattern.
+
+`LAST(B.totalprice) AS bottom_price` returns the lowest price (corresponding
+to the bottom of the "V" in the pattern). It is the price in the last row
+associated with `B`, which is the last row of the descending section.
+
+`LAST(U.totalprice) AS top_price` returns the highest price in the match. It
+is the price in the last row associated with `C` or `D`, which is also the
+final row of the match.
+
+Measure expressions can refer to the columns of the input table. They also
+allow special syntax to combine the input information with the details of the
+match (see {ref}`pattern-recognition-expressions`).
+
+Each measure defines an output column of the pattern recognition. The column
+can be referenced with the `measure_name`.
+
+The `MEASURES` clause is optional. When no measures are specified, certain
+input columns (depending on {ref}`ROWS PER MATCH<rows-per-match>` clause) are
+the output of the pattern recognition.
+
+(rows-per-match)=
+
+## Rows per match
+
+This clause can be used to specify the quantity of output rows. There are two
+main options:
+
+```
+ONE ROW PER MATCH
+```
+
+and
+
+```sql
+ALL ROWS PER MATCH
+```
+
+`ONE ROW PER MATCH` is the default option. For every match, a single row of
+output is produced. Output consists of `PARTITION BY` columns and measures.
+The output is also produced for empty matches, based on their starting rows.
+Rows that are unmatched (that is, neither included in some non-empty match, nor
+being the starting row of an empty match), are not included in the output.
+
+For `ALL ROWS PER MATCH`, every row of a match produces an output row, unless
+it is excluded from the output by the {ref}`exclusion-syntax`. Output consists
+of `PARTITION BY` columns, `ORDER BY` columns, measures and remaining
+columns from the input table. By default, empty matches are shown and unmatched
+rows are skipped, similarly as with the `ONE ROW PER MATCH` option. However,
+this behavior can be changed by modifiers:
+
+```
+ALL ROWS PER MATCH SHOW EMPTY MATCHES
+```
+
+shows empty matches and skips unmatched rows, like the default.
+
+```sql
+ALL ROWS PER MATCH OMIT EMPTY MATCHES
+```
+
+excludes empty matches from the output.
+
+```sql
+ALL ROWS PER MATCH WITH UNMATCHED ROWS
+```
+
+shows empty matches and produces additional output row for each unmatched row.
+
+There are special rules for computing row pattern measures for empty matches
+and unmatched rows. They are explained in
+{ref}`empty-matches-and-unmatched-rows`.
+
+Unmatched rows can only occur when the pattern does not allow an empty match.
+Otherwise, they are considered as starting rows of empty matches. The option
+`ALL ROWS PER MATCH WITH UNMATCHED ROWS` is recommended when pattern
+recognition is expected to pass all input rows, and it is not certain whether
+the pattern allows an empty match.
+
+(after-match-skip)=
+
+## After match skip
+
+The `AFTER MATCH SKIP` clause specifies where pattern matching resumes after
+a non-empty match is found.
+
+The default option is:
+
+```
+AFTER MATCH SKIP PAST LAST ROW
+```
+
+With this option, pattern matching starts from the row after the last row of
+the match. Overlapping matches are not detected.
+
+With the following option, pattern matching starts from the second row of the
+match:
+
+```
+AFTER MATCH SKIP TO NEXT ROW
+```
+
+In the example, if a V-shape is detected, further overlapping matches are
+found, starting from consecutive rows on the descending slope of the "V".
+Skipping to the next row is the default behavior after detecting an empty match
+or unmatched row.
+
+The following `AFTER MATCH SKIP` options allow to resume pattern matching
+based on the components of the pattern. Pattern matching starts from the last
+(default) or first row matched to a certain row pattern variable. It can be
+either a primary pattern variable (they are explained in
+{ref}`row-pattern-syntax`) or a
+{ref}`union variable<row-pattern-union-variables>`:
+
+```
+AFTER MATCH SKIP TO [ FIRST | LAST ] pattern_variable
+```
+
+It is forbidden to skip to the first row of the current match, because it
+results in an infinite loop. For example specifying `AFTER MATCH SKIP TO A`
+fails, because `A` is the first element of the pattern, and jumping back to
+it creates an infinite loop. Similarly, skipping to a pattern variable which is
+not present in the match causes failure.
+
+All other options than the default `AFTER MATCH SKIP PAST LAST ROW` allow
+detection of overlapping matches. The combination of `ALL ROWS PER MATCH WITH
+UNMATCHED ROWS` with `AFTER MATCH SKIP PAST LAST ROW` is the only
+configuration that guarantees exactly one output row for each input row.
+
+(row-pattern-syntax)=
+
+## Row pattern syntax
+
+Row pattern is a form of a regular expression with some syntactical extensions
+specific to row pattern recognition. It is specified in the `PATTERN`
+clause:
+
+```
+PATTERN ( row_pattern )
+```
+
+The basic element of row pattern is a primary pattern variable. Like pattern
+matching in character strings searches for characters, pattern matching in row
+sequences searches for rows which can be "labeled" with certain primary pattern
+variables. A primary pattern variable has a form of an identifier and is
+{ref}`defined<row-pattern-variable-definitions>` by a boolean condition. This
+condition determines whether a particular input row can be mapped to this
+variable and take part in the match.
+
+In the example `PATTERN (A B+ C+ D+)`, there are four primary pattern
+variables: `A`, `B`, `C`, and `D`.
+
+Row pattern syntax includes the following usage:
+
+### concatenation
+
+```text
+A B+ C+ D+
+```
+
+It is a sequence of components without operators between them. All components
+are matched in the same order as they are specified.
+
+### alternation
+
+```text
+A | B | C
+```
+
+It is a sequence of components separated by `|`. Exactly one of the
+components is matched. In case when multiple components can be matched, the
+leftmost matching component is chosen.
+
+(permute-function)=
+
+### permutation
+
+```text
+PERMUTE(A, B, C)
+```
+
+It is equivalent to alternation of all permutations of its components. All
+components are matched in some order. If multiple matches are possible for
+different orderings of the components, the match is chosen based on the
+lexicographical order established by the order of components in the `PERMUTE`
+list. In the above example, the most preferred option is `A B C`, and the
+least preferred option is `C B A`.
+
+### grouping
+
+```text
+(A B C)
+```
+
+### partition start anchor
+
+```text
+^
+```
+
+### partition end anchor
+
+```text
+$
+```
+
+### empty pattern
+
+```text
+()
+```
+
+(exclusion-syntax)=
+
+### exclusion syntax
+
+```text
+{- row_pattern -}
+```
+
+Exclusion syntax is used to specify portions of the match to exclude from the
+output. It is useful in combination with the `ALL ROWS PER MATCH` option,
+when only certain sections of the match are interesting.
+
+If you change the example to use `ALL ROWS PER MATCH`, and the pattern is
+modified to `PATTERN (A {- B+ C+ -} D+)`, the result consists of the initial
+matched row and the trailing section of rows.
+
+Specifying pattern exclusions does not affect the computation of expressions in
+`MEASURES` and `DEFINE` clauses. Exclusions also do not affect pattern
+matching. They have the same semantics as regular grouping with parentheses.
+
+It is forbidden to specify pattern exclusions with the option `ALL ROWS PER
+MATCH WITH UNMATCHED ROWS`.
+
+### quantifiers
+
+Pattern quantifiers allow to specify the desired number of repetitions of a
+sub-pattern in a match. They are appended after the relevant pattern
+component:
+
+```
+(A | B)*
+```
+
+There are following row pattern quantifiers:
+
+- zero or more repetitions:
+
+```text
+*
+```
+
+- one or more repetitions:
+
+```text
++
+```
+
+- zero or one repetition:
+
+```text
+?
+```
+
+- exact number of repetitions, specified by a non-negative integer number:
+
+```text
+{n}
+```
+
+- number of repetitions ranging between bounds, specified by non-negative
+  integer numbers:
+
+```text
+{m, n}
+```
+
+Specifying bounds is optional. If the left bound is omitted, it defaults to
+`0`. So, `{, 5}` can be described as "between zero and five repetitions".
+If the right bound is omitted, the number of accepted repetitions is unbounded.
+So, `{5, }` can be described as "at least five repetitions". Also, `{,}` is
+equivalent to `*`.
+
+Quantifiers are greedy by default. It means that higher number of repetitions
+is preferred over lower number. This behavior can be changed to reluctant by
+appending `?` immediately after the quantifier. With `{3, 5}`, 3
+repetitions is the least desired option and 5 repetitions -- the most desired.
+With `{3, 5}?`, 3 repetitions are most desired. Similarly, `?` prefers 1
+repetition, while `??` prefers 0 repetitions.
+
+(row-pattern-union-variables)=
+
+## Row pattern union variables
+
+As explained in {ref}`row-pattern-syntax`, primary pattern variables are the
+basic elements of row pattern. In addition to primary pattern variables, you
+can define union variables. They are introduced in the `SUBSET` clause:
+
+```
+SUBSET U = (C, D), ...
+```
+
+In the preceding example, union variable `U` is defined as union of primary
+variables `C` and `D`. Union variables are useful in `MEASURES`,
+`DEFINE` and `AFTER MATCH SKIP` clauses. They allow you to refer to set of
+rows matched to either primary variable from a subset.
+
+With the pattern: `PATTERN((A | B){5} C+)` it cannot be determined upfront if
+the match contains any `A` or any `B`. A union variable can be used to
+access the last row matched to either `A` or `B`. Define `SUBSET U =
+(A, B)`, and the expression `LAST(U.totalprice)` returns the value of the
+`totalprice` column from the last row mapped to either `A` or `B`. Also,
+`AFTER MATCH SKIP TO LAST A` or `AFTER MATCH SKIP TO LAST B` can result in
+failure if `A` or `B` is not present in the match. `AFTER MATCH SKIP TO
+LAST U` does not fail.
+
+(row-pattern-variable-definitions)=
+
+## Row pattern variable definitions
+
+The `DEFINE` clause is where row pattern primary variables are defined. Each
+variable is associated with a boolean condition:
+
+```
+DEFINE B AS totalprice < PREV(totalprice), ...
+```
+
+During pattern matching, when a certain variable is considered for the next
+step of the match, the boolean condition is evaluated in context of the current
+match. If the result is `true`, then the current row, "labeled" with the
+variable, becomes part of the match.
+
+In the preceding example, assume that the pattern allows to match `B` at some
+point. There are some rows already matched to some pattern variables. Now,
+variable `B` is being considered for the current row. Before the match is
+made, the defining condition for `B` is evaluated. In this example, it is
+only true if the value of the `totalprice` column in the current row is lower
+than `totalprice` in the preceding row.
+
+The mechanism of matching variables to rows shows the difference between
+pattern matching in row sequences and regular expression matching in text. In
+text, characters remain constantly in their positions. In row pattern matching,
+a row can be mapped to different variables in different matches, depending on
+the preceding part of the match, and even on the match number.
+
+It is not required that every primary variable has a definition in the
+`DEFINE` clause. Variables not mentioned in the `DEFINE` clause are
+implicitly associated with `true` condition, which means that they can be
+matched to every row.
+
+Boolean expressions in the `DEFINE` clause allow the same special syntax as
+expressions in the `MEASURES` clause. Details are explained in
+{ref}`pattern-recognition-expressions`.
+
+(pattern-recognition-expressions)=
+
+## Row pattern recognition expressions
+
+Expressions in {ref}`MEASURES<row-pattern-measures>` and
+{ref}`DEFINE<row-pattern-variable-definitions>` clauses are scalar expressions
+evaluated over rows of the input table. They support special syntax, specific
+to pattern recognition context. They can combine input information with the
+information about the current match. Special syntax allows to access pattern
+variables assigned to rows, browse rows based on how they are matched, and
+refer to the sequential number of the match.
+
+### pattern variable references
+
+```sql
+A.totalprice
+
+U.orderdate
+
+orderstatus
+```
+
+A column name prefixed with a pattern variable refers to values of this column
+in all rows matched to this variable, or to any variable from the subset in
+case of union variable. If a column name is not prefixed, it is considered as
+prefixed with the `universal pattern variable`, defined as union of all
+primary pattern variables. In other words, a non-prefixed column name refers to
+all rows of the current match.
+
+It is forbidden to prefix a column name with a table name in the pattern
+recognition context.
+
+(classifier-function)=
+
+### classifier function
+
+```sql
+CLASSIFIER()
+
+CLASSIFIER(A)
+
+CLASSIFIER(U)
+```
+
+The `classifier` function returns the primary pattern variable associated
+with the row. The return type is `varchar`. The optional argument is a
+pattern variable. It limits the rows of interest, the same way as with prefixed
+column references. The `classifier` function is particularly useful with a
+union variable as the argument. It allows you to determine which variable from
+the subset actually matched.
+
+(match-number-function)=
+
+### match_number function
+
+```sql
+MATCH_NUMBER()
+```
+
+The `match_number` function returns the sequential number of the match within
+partition, starting from `1`. Empty matches are assigned sequential numbers
+as well as non-empty matches. The return type is `bigint`.
+
+(logical-navigation-functions)=
+
+### logical navigation functions
+
+```sql
+FIRST(A.totalprice, 2)
+```
+
+In the above example, the `first` function navigates to the first row matched
+to pattern variable `A`, and then searches forward until it finds two more
+occurrences of variable `A` within the match. The result is the value of the
+`totalprice` column in that row.
+
+```sql
+LAST(A.totalprice, 2)
+```
+
+In the above example, the `last` function navigates to the last row matched
+to pattern variable `A`, and then searches backwards until it finds two more
+occurrences of variable `A` within the match. The result is the value of the
+`totalprice` column in that row.
+
+With the `first` and `last` functions the result is `null`, if the
+searched row is not found in the mach.
+
+The second argument is optional. The default value is `0`, which means that
+by default these functions navigate to the first or last row of interest. If
+specified, the second argument must be a non-negative integer number.
+
+(physical-navigation-functions)=
+
+### physical navigation functions
+
+```sql
+PREV(A.totalprice, 2)
+```
+
+In the above example, the `prev` function navigates to the last row matched
+to pattern variable `A`, and then searches two rows backward. The result is
+the value of the `totalprice` column in that row.
+
+```sql
+NEXT(A.totalprice, 2)
+```
+
+In the above example, the `next` function navigates to the last row matched
+to pattern variable `A`, and then searches two rows forward. The result is
+the value of the `totalprice` column in that row.
+
+With the `prev` and `next` functions, it is possible to navigate and
+retrieve values outside the match. If the navigation goes beyond partition
+bounds, the result is `null`.
+
+The second argument is optional. The default value is `1`, which means that
+by default these functions navigate to previous or next row. If specified, the
+second argument must be a non-negative integer number.
+
+### nesting of navigation functions
+
+It is possible to nest logical navigation functions within physical navigation
+functions:
+
+```sql
+PREV(FIRST(A.totalprice, 3), 2)
+```
+
+In case of nesting, first the logical navigation is performed. It establishes
+the starting row for the physical navigation. When both navigation operations
+succeed, the value is retrieved from the designated row.
+
+Pattern navigation functions require at least one column reference or
+`classifier` function inside of their first argument. The following examples
+are correct:
+
+```
+LAST("pattern_variable_" || CLASSIFIER())
+
+NEXT(U.totalprice + 10)
+```
+
+This is incorrect:
+
+```
+LAST(1)
+```
+
+It is also required that all column references and all `classifier` calls
+inside a pattern navigation function are consistent in referred pattern
+variables. They must all refer either to the same primary variable, the same
+union variable, or to the implicit universal pattern variable. The following
+examples are correct:
+
+```
+LAST(CLASSIFIER() = 'A' OR totalprice > 10) /* universal pattern variable */
+
+LAST(CLASSIFIER(U) = 'A' OR U.totalprice > 10) /* pattern variable U */
+```
+
+This is incorrect:
+
+```
+LAST(A.totalprice + B.totalprice)
+```
+
+### Aggregate functions
+
+It is allowed to use aggregate functions in a row pattern recognition context.
+Aggregate functions are evaluated over all rows of the current match or over a
+subset of rows based on the matched pattern variables. The
+{ref}`running and final semantics<running-and-final>` are supported, with
+`running` as the default.
+
+The following expression returns the average value of the `totalprice` column
+for all rows matched to pattern variable `A`:
+
+```
+avg(A.totalprice)
+```
+
+The following expression returns the average value of the `totalprice` column
+for all rows matched to pattern variables from subset `U`:
+
+```
+avg(U.totalprice)
+```
+
+The following expression returns the average value of the `totalprice` column
+for all rows of the match:
+
+```
+avg(totalprice)
+```
+
+#### Aggregation arguments
+
+In case when the aggregate function has multiple arguments, it is required that
+all arguments refer consistently to the same set of rows:
+
+```
+max_by(totalprice, tax) /* aggregate over all rows of the match */
+
+max_by(CLASSIFIER(A), A.tax) /* aggregate over all rows matched to A */
+```
+
+This is incorrect:
+
+```
+max_by(A.totalprice, tax)
+
+max_by(A.totalprice, A.tax + B.tax)
+```
+
+If an aggregate argument does not contain any column reference or
+`classifier` function, it does not refer to any pattern variable. In such a
+case other aggregate arguments determine the set of rows to aggregate over. If
+none of the arguments contains a pattern variable reference, the universal row
+pattern variable is implicit. This means that the aggregate function applies to
+all rows of the match:
+
+```
+count(1) /* aggregate over all rows of the match */
+
+min_by(1, 2) /* aggregate over all rows of the match */
+
+min_by(1, totalprice) /* aggregate over all rows of the match */
+
+min_by(totalprice, 1) /* aggregate over all rows of the match */
+
+min_by(A.totalprice, 1) /* aggregate over all rows matched to A */
+
+max_by(1, A.totalprice) /* aggregate over all rows matched to A */
+```
+
+#### Nesting of aggregate functions
+
+Aggregate function arguments must not contain pattern navigation functions.
+Similarly, aggregate functions cannot be nested in pattern navigation
+functions.
+
+#### Usage of the `classifier` and `match_number` functions
+
+It is allowed to use the `classifier` and `match_number` functions in
+aggregate function arguments. The following expression returns an array
+containing all matched pattern variables:
+
+```
+array_agg(CLASSIFIER())
+```
+
+This is particularly useful in combination with the option
+`ONE ROW PER MATCH`. It allows to get all the components of the match while
+keeping the output size reduced.
+
+#### Row pattern count aggregation
+
+Like other aggregate functions in a row pattern recognition context, the
+`count` function can be applied to all rows of the match, or to rows
+associated with certain row pattern variables:
+
+```
+count(*), count() /* count all rows of the match */
+
+count(totalprice) /* count non-null values of the totalprice column
+                     in all rows of the match */
+
+count(A.totalprice) /* count non-null values of the totalprice column
+                       in all rows matched to A */
+```
+
+The `count` function in a row pattern recognition context allows special syntax
+to support the `count(*)` behavior over a limited set of rows:
+
+```
+count(A.*) /* count rows matched to A */
+
+count(U.*) /* count rows matched to pattern variables from subset U */
+```
+
+(running-and-final)=
+
+### `RUNNING` and `FINAL` semantics
+
+During pattern matching in a sequence of rows, one row after another is
+examined to determine if it fits the pattern. At any step, a partial match is
+known, but it is not yet known what rows will be added in the future or what
+pattern variables they will be mapped to. So, when evaluating a boolean
+condition in the `DEFINE` clause for the current row, only the preceding part
+of the match (plus the current row) is "visible". This is the `running`
+semantics.
+
+When evaluating expressions in the `MEASURES` clause, the match is complete.
+It is then possible to apply the `final` semantics. In the `final`
+semantics, the whole match is "visible" as from the position of the final row.
+
+In the `MEASURES` clause, the `running` semantics can also be applied. When
+outputting information row by row (as in `ALL ROWS PER MATCH`), the
+`running` semantics evaluate expressions from the positions of consecutive
+rows.
+
+The `running` and `final` semantics are denoted by the keywords:
+`RUNNING` and `FINAL`, preceding a logical navigation function `first` or
+`last`, or an aggregate function:
+
+```
+RUNNING LAST(A.totalprice)
+
+FINAL LAST(A.totalprice)
+
+RUNNING avg(A.totalprice)
+
+FINAL count(A.*)
+```
+
+The `running` semantics is default in `MEASURES` and `DEFINE` clauses.
+`FINAL` can only be specified in the `MEASURES` clause.
+
+With the option `ONE ROW PER MATCH`, row pattern measures are evaluated from
+the position of the final row in the match. Therefore, `running` and
+`final` semantics are the same.
+
+(empty-matches-and-unmatched-rows)=
+
+## Evaluating expressions in empty matches and unmatched rows
+
+An empty match occurs when the row pattern is successfully matched, but no
+pattern variables are assigned. The following pattern produces an empty match
+for every row:
+
+```
+PATTERN(())
+```
+
+When evaluating row pattern measures for an empty match:
+
+- all column references return `null`
+- all navigation operations return `null`
+- `classifier` function returns `null`
+- `match_number` function returns the sequential number of the match
+- all aggregate functions are evaluated over an empty set of rows
+
+Like every match, an empty match has its starting row. All input values which
+are to be output along with the measures (as explained in
+{ref}`rows-per-match`), are the values from the starting row.
+
+An unmatched row is a row that is neither part of any non-empty match nor the
+starting row of an empty match. With the option `ALL ROWS PER MATCH WITH
+UNMATCHED ROWS`, a single output row is produced. In that row, all row pattern
+measures are `null`. All input values which are to be output along with the
+measures (as explained in {ref}`rows-per-match`), are the values from the
+unmatched row. Using the `match_number` function as a measure can help
+differentiate between an empty match and unmatched row.
diff --git a/docs/src/main/sphinx/sql/match-recognize.rst b/docs/src/main/sphinx/sql/match-recognize.rst
deleted file mode 100644
index 284a00739609..000000000000
--- a/docs/src/main/sphinx/sql/match-recognize.rst
+++ /dev/null
@@ -1,791 +0,0 @@
-===============
-MATCH_RECOGNIZE
-===============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    MATCH_RECOGNIZE (
-      [ PARTITION BY column [, ...] ]
-      [ ORDER BY column [, ...] ]
-      [ MEASURES measure_definition [, ...] ]
-      [ rows_per_match ]
-      [ AFTER MATCH skip_to ]
-      PATTERN ( row_pattern )
-      [ SUBSET subset_definition [, ...] ]
-      DEFINE variable_definition [, ...]
-      )
-
-Description
------------
-
-The ``MATCH_RECOGNIZE`` clause is an optional subclause of the ``FROM`` clause.
-It is used to detect patterns in a set of rows. Patterns of interest are
-specified using row pattern syntax based on regular expressions. The input to
-pattern matching is a table, a view or a subquery. For each detected match, one
-or more rows are returned. They contain requested information about the match.
-
-Row pattern matching is a powerful tool when analyzing complex sequences of
-events. The following examples show some of the typical use cases:
-
-- in trade applications, tracking trends or identifying customers with specific
-  behavioral patterns
-
-- in shipping applications, tracking packages through all possible valid paths,
-
-- in financial applications, detecting unusual incidents, which might signal
-  fraud
-
-Example
--------
-
-In the following example, the pattern describes a V-shape over the
-``totalprice`` column. A match is found whenever orders made by a customer
-first decrease in price, and then increase past the starting point::
-
-    SELECT * FROM orders MATCH_RECOGNIZE(
-         PARTITION BY custkey
-         ORDER BY orderdate
-         MEASURES
-                  A.totalprice AS starting_price,
-                  LAST(B.totalprice) AS bottom_price,
-                  LAST(U.totalprice) AS top_price
-         ONE ROW PER MATCH
-         AFTER MATCH SKIP PAST LAST ROW
-         PATTERN (A B+ C+ D+)
-         SUBSET U = (C, D)
-         DEFINE
-                  B AS totalprice < PREV(totalprice),
-                  C AS totalprice > PREV(totalprice) AND totalprice <= A.totalprice,
-                  D AS totalprice > PREV(totalprice)
-         )
-
-In the following sections, all subclauses of the ``MATCH_RECOGNIZE`` clause are
-explained with this example query.
-
-Partitioning and ordering
--------------------------
-
-.. code-block:: sql
-
-    PARTITION BY custkey
-
-The ``PARTITION BY`` clause allows you to break up the input table into
-separate sections, that are independently processed for pattern matching.
-Without a partition declaration, the whole input table is used. This behavior
-is analogous to the semantics of ``PARTITION BY`` clause in :ref:`window
-specification<window_clause>`. In the example, the ``orders`` table is
-partitioned by the ``custkey`` value, so that pattern matching is performed for
-all orders of a specific customer independently from orders of other
-customers.
-
-.. code-block:: sql
-
-    ORDER BY orderdate
-
-The optional ``ORDER BY`` clause is generally useful to allow matching on an
-ordered data set. For example, sorting the input by ``orderdate`` allows for
-matching on a trend of changes over time.
-
-.. _row_pattern_measures:
-
-Row pattern measures
---------------------
-
-The ``MEASURES`` clause allows to specify what information is retrieved from a
-matched sequence of rows.
-
-.. code-block:: text
-
-    MEASURES measure_expression AS measure_name [, ...]
-
-A measure expression is a scalar expression whose value is computed based on a
-match. In the example, three row pattern measures are specified:
-
-``A.totalprice AS starting_price`` returns the price in the first row of the
-match, which is the only row associated with ``A`` according to the pattern.
-
-``LAST(B.totalprice) AS bottom_price`` returns the lowest price (corresponding
-to the bottom of the "V" in the pattern). It is the price in the last row
-associated with ``B``, which is the last row of the descending section.
-
-``LAST(U.totalprice) AS top_price`` returns the highest price in the match. It
-is the price in the last row associated with ``C`` or ``D``, which is also the
-final row of the match.
-
-Measure expressions can refer to the columns of the input table. They also
-allow special syntax to combine the input information with the details of the
-match (see :ref:`pattern_recognition_expressions`).
-
-Each measure defines an output column of the pattern recognition. The column
-can be referenced with the ``measure_name``.
-
-The ``MEASURES`` clause is optional. When no measures are specified, certain
-input columns (depending on :ref:`ROWS PER MATCH<rows_per_match>` clause) are
-the output of the pattern recognition.
-
-.. _rows_per_match:
-
-Rows per match
---------------
-
-This clause can be used to specify the quantity of output rows. There are two
-main options::
-
-    ONE ROW PER MATCH
-
-and
-
-.. code-block:: sql
-
-    ALL ROWS PER MATCH
-
-``ONE ROW PER MATCH`` is the default option. For every match, a single row of
-output is produced. Output consists of ``PARTITION BY`` columns and measures.
-The output is also produced for empty matches, based on their starting rows.
-Rows that are unmatched (that is, neither included in some non-empty match, nor
-being the starting row of an empty match), are not included in the output.
-
-For ``ALL ROWS PER MATCH``, every row of a match produces an output row, unless
-it is excluded from the output by the :ref:`exclusion_syntax`. Output consists
-of ``PARTITION BY`` columns, ``ORDER BY`` columns, measures and remaining
-columns from the input table. By default, empty matches are shown and unmatched
-rows are skipped, similarly as with the ``ONE ROW PER MATCH`` option. However,
-this behavior can be changed by modifiers::
-
-    ALL ROWS PER MATCH SHOW EMPTY MATCHES
-
-shows empty matches and skips unmatched rows, like the default.
-
-.. code-block:: sql
-
-    ALL ROWS PER MATCH OMIT EMPTY MATCHES
-
-excludes empty matches from the output.
-
-.. code-block:: sql
-
-    ALL ROWS PER MATCH WITH UNMATCHED ROWS
-
-shows empty matches and produces additional output row for each unmatched row.
-
-There are special rules for computing row pattern measures for empty matches
-and unmatched rows. They are explained in
-:ref:`empty_matches_and_unmatched_rows`.
-
-Unmatched rows can only occur when the pattern does not allow an empty match.
-Otherwise, they are considered as starting rows of empty matches. The option
-``ALL ROWS PER MATCH WITH UNMATCHED ROWS`` is recommended when pattern
-recognition is expected to pass all input rows, and it is not certain whether
-the pattern allows an empty match.
-
-.. _after_match_skip:
-
-After match skip
-----------------
-
-The ``AFTER MATCH SKIP`` clause specifies where pattern matching resumes after
-a non-empty match is found.
-
-The default option is::
-
-    AFTER MATCH SKIP PAST LAST ROW
-
-With this option, pattern matching starts from the row after the last row of
-the match. Overlapping matches are not detected.
-
-With the following option, pattern matching starts from the second row of the
-match::
-
-    AFTER MATCH SKIP TO NEXT ROW
-
-In the example, if a V-shape is detected, further overlapping matches are
-found, starting from consecutive rows on the descending slope of the "V".
-Skipping to the next row is the default behavior after detecting an empty match
-or unmatched row.
-
-The following ``AFTER MATCH SKIP`` options allow to resume pattern matching
-based on the components of the pattern. Pattern matching starts from the last
-(default) or first row matched to a certain row pattern variable. It can be
-either a primary pattern variable (they are explained in
-:ref:`row_pattern_syntax`) or a
-:ref:`union variable<row_pattern_union_variables>`::
-
-    AFTER MATCH SKIP TO [ FIRST | LAST ] pattern_variable
-
-It is forbidden to skip to the first row of the current match, because it
-results in an infinite loop. For example specifying ``AFTER MATCH SKIP TO A``
-fails, because ``A`` is the first element of the pattern, and jumping back to
-it creates an infinite loop. Similarly, skipping to a pattern variable which is
-not present in the match causes failure.
-
-All other options than the default ``AFTER MATCH SKIP PAST LAST ROW`` allow
-detection of overlapping matches. The combination of ``ALL ROWS PER MATCH WITH
-UNMATCHED ROWS`` with ``AFTER MATCH SKIP PAST LAST ROW`` is the only
-configuration that guarantees exactly one output row for each input row.
-
-.. _row_pattern_syntax:
-
-Row pattern syntax
-------------------
-
-Row pattern is a form of a regular expression with some syntactical extensions
-specific to row pattern recognition. It is specified in the ``PATTERN``
-clause::
-
-    PATTERN ( row_pattern )
-
-The basic element of row pattern is a primary pattern variable. Like pattern
-matching in character strings searches for characters, pattern matching in row
-sequences searches for rows which can be "labeled" with certain primary pattern
-variables. A primary pattern variable has a form of an identifier and is
-:ref:`defined<row_pattern_variable_definitions>` by a boolean condition. This
-condition determines whether a particular input row can be mapped to this
-variable and take part in the match.
-
-In the example ``PATTERN (A B+ C+ D+)``, there are four primary pattern
-variables: ``A``, ``B``, ``C``, and ``D``.
-
-Row pattern syntax includes the following usage:
-
-concatenation
-^^^^^^^^^^^^^
-
-.. code-block:: text
-
-    A B+ C+ D+
-
-It is a sequence of components without operators between them. All components
-are matched in the same order as they are specified.
-
-alternation
-^^^^^^^^^^^
-
-.. code-block:: text
-
-    A | B | C
-
-It is a sequence of components separated by ``|``. Exactly one of the
-components is matched. In case when multiple components can be matched, the
-leftmost matching component is chosen.
-
-permutation
-^^^^^^^^^^^
-
-.. code-block:: text
-
-    PERMUTE(A, B, C)
-
-It is equivalent to alternation of all permutations of its components. All
-components are matched in some order. If multiple matches are possible for
-different orderings of the components, the match is chosen based on the
-lexicographical order established by the order of components in the ``PERMUTE``
-list. In the above example, the most preferred option is ``A B C``, and the
-least preferred option is ``C B A``.
-
-grouping
-^^^^^^^^
-
-.. code-block:: text
-
-    (A B C)
-
-partition start anchor
-^^^^^^^^^^^^^^^^^^^^^^
-
-.. code-block:: text
-
-    ^
-
-partition end anchor
-^^^^^^^^^^^^^^^^^^^^
-
-.. code-block:: text
-
-    $
-
-empty pattern
-^^^^^^^^^^^^^
-
-.. code-block:: text
-
-    ()
-
-.. _exclusion_syntax:
-
-exclusion syntax
-^^^^^^^^^^^^^^^^
-
-.. code-block:: text
-
-    {- row_pattern -}
-
-Exclusion syntax is used to specify portions of the match to exclude from the
-output. It is useful in combination with the ``ALL ROWS PER MATCH`` option,
-when only certain sections of the match are interesting.
-
-If you change the example to use ``ALL ROWS PER MATCH``, and the pattern is
-modified to ``PATTERN (A {- B+ C+ -} D+)``, the result consists of the initial
-matched row and the trailing section of rows.
-
-Specifying pattern exclusions does not affect the computation of expressions in
-``MEASURES`` and ``DEFINE`` clauses. Exclusions also do not affect pattern
-matching. They have the same semantics as regular grouping with parentheses.
-
-It is forbidden to specify pattern exclusions with the option ``ALL ROWS PER
-MATCH WITH UNMATCHED ROWS``.
-
-quantifiers
-^^^^^^^^^^^
-
-Pattern quantifiers allow to specify the desired number of repetitions of a
-sub-pattern in a match. They are appended after the relevant pattern
-component::
-
-    (A | B)*
-
-There are following row pattern quantifiers:
-
-- zero or more repetitions:
-
-.. code-block:: text
-
-    *
-
-- one or more repetitions:
-
-.. code-block:: text
-
-    +
-
-- zero or one repetition:
-
-.. code-block:: text
-
-    ?
-
-- exact number of repetitions, specified by a non-negative integer number:
-
-.. code-block:: text
-
-    {n}
-
-- number of repetitions ranging between bounds, specified by non-negative
-  integer numbers:
-
-.. code-block:: text
-
-    {m, n}
-
-Specifying bounds is optional. If the left bound is omitted, it defaults to
-``0``. So, ``{, 5}`` can be described as "between zero and five repetitions".
-If the right bound is omitted, the number of accepted repetitions is unbounded.
-So, ``{5, }`` can be described as "at least five repetitions". Also, ``{,}`` is
-equivalent to ``*``.
-
-Quantifiers are greedy by default. It means that higher number of repetitions
-is preferred over lower number. This behavior can be changed to reluctant by
-appending ``?`` immediately after the quantifier. With ``{3, 5}``, 3
-repetitions is the least desired option and 5 repetitions -- the most desired.
-With ``{3, 5}?``, 3 repetitions are most desired. Similarly, ``?`` prefers 1
-repetition, while ``??`` prefers 0 repetitions.
-
-.. _row_pattern_union_variables:
-
-Row pattern union variables
----------------------------
-
-As explained in :ref:`row_pattern_syntax`, primary pattern variables are the
-basic elements of row pattern. In addition to primary pattern variables, you
-can define union variables. They are introduced in the ``SUBSET`` clause::
-
-    SUBSET U = (C, D), ...
-
-In the preceding example, union variable ``U`` is defined as union of primary
-variables ``C`` and ``D``. Union variables are useful in ``MEASURES``,
-``DEFINE`` and ``AFTER MATCH SKIP`` clauses. They allow you to refer to set of
-rows matched to either primary variable from a subset.
-
-With the pattern: ``PATTERN((A | B){5} C+)`` it cannot be determined upfront if
-the match contains any ``A`` or any ``B``. A union variable can be used to
-access the last row matched to either ``A`` or ``B``. Define ``SUBSET U =
-(A, B)``, and the expression ``LAST(U.totalprice)`` returns the value of the
-``totalprice`` column from the last row mapped to either ``A`` or ``B``. Also,
-``AFTER MATCH SKIP TO LAST A`` or ``AFTER MATCH SKIP TO LAST B`` can result in
-failure if ``A`` or ``B`` is not present in the match. ``AFTER MATCH SKIP TO
-LAST U`` does not fail.
-
-.. _row_pattern_variable_definitions:
-
-Row pattern variable definitions
---------------------------------
-
-The ``DEFINE`` clause is where row pattern primary variables are defined. Each
-variable is associated with a boolean condition::
-
-    DEFINE B AS totalprice < PREV(totalprice), ...
-
-During pattern matching, when a certain variable is considered for the next
-step of the match, the boolean condition is evaluated in context of the current
-match. If the result is ``true``, then the current row, "labeled" with the
-variable, becomes part of the match.
-
-In the preceding example, assume that the pattern allows to match ``B`` at some
-point. There are some rows already matched to some pattern variables. Now,
-variable ``B`` is being considered for the current row. Before the match is
-made, the defining condition for ``B`` is evaluated. In this example, it is
-only true if the value of the ``totalprice`` column in the current row is lower
-than ``totalprice`` in the preceding row.
-
-The mechanism of matching variables to rows shows the difference between
-pattern matching in row sequences and regular expression matching in text. In
-text, characters remain constantly in their positions. In row pattern matching,
-a row can be mapped to different variables in different matches, depending on
-the preceding part of the match, and even on the match number.
-
-It is not required that every primary variable has a definition in the
-``DEFINE`` clause. Variables not mentioned in the ``DEFINE`` clause are
-implicitly associated with ``true`` condition, which means that they can be
-matched to every row.
-
-Boolean expressions in the ``DEFINE`` clause allow the same special syntax as
-expressions in the ``MEASURES`` clause. Details are explained in
-:ref:`pattern_recognition_expressions`.
-
-.. _pattern_recognition_expressions:
-
-Row pattern recognition expressions
------------------------------------
-
-Expressions in :ref:`MEASURES<row_pattern_measures>` and
-:ref:`DEFINE<row_pattern_variable_definitions>` clauses are scalar expressions
-evaluated over rows of the input table. They support special syntax, specific
-to pattern recognition context. They can combine input information with the
-information about the current match. Special syntax allows to access pattern
-variables assigned to rows, browse rows based on how they are matched, and
-refer to the sequential number of the match.
-
-pattern variable references
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. code-block:: sql
-
-    A.totalprice
-
-    U.orderdate
-
-    orderstatus
-
-A column name prefixed with a pattern variable refers to values of this column
-in all rows matched to this variable, or to any variable from the subset in
-case of union variable. If a column name is not prefixed, it is considered as
-prefixed with the ``universal pattern variable``, defined as union of all
-primary pattern variables. In other words, a non-prefixed column name refers to
-all rows of the current match.
-
-It is forbidden to prefix a column name with a table name in the pattern
-recognition context.
-
-classifier function
-^^^^^^^^^^^^^^^^^^^
-
-.. code-block:: sql
-
-    CLASSIFIER()
-
-    CLASSIFIER(A)
-
-    CLASSIFIER(U)
-
-The ``classifier`` function returns the primary pattern variable associated
-with the row. The return type is ``varchar``. The optional argument is a
-pattern variable. It limits the rows of interest, the same way as with prefixed
-column references. The ``classifier`` function is particularly useful with a
-union variable as the argument. It allows you to determine which variable from
-the subset actually matched.
-
-match_number function
-^^^^^^^^^^^^^^^^^^^^^
-
-.. code-block:: sql
-
-    MATCH_NUMBER()
-
-The ``match_number`` function returns the sequential number of the match within
-partition, starting from ``1``. Empty matches are assigned sequential numbers
-as well as non-empty matches. The return type is ``bigint``.
-
-logical navigation functions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. code-block:: sql
-
-    FIRST(A.totalprice, 2)
-
-In the above example, the ``first`` function navigates to the first row matched
-to pattern variable ``A``, and then searches forward until it finds two more
-occurrences of variable ``A`` within the match. The result is the value of the
-``totalprice`` column in that row.
-
-.. code-block:: sql
-
-    LAST(A.totalprice, 2)
-
-In the above example, the ``last`` function navigates to the last row matched
-to pattern variable ``A``, and then searches backwards until it finds two more
-occurrences of variable ``A`` within the match. The result is the value of the
-``totalprice`` column in that row.
-
-With the ``first`` and ``last`` functions the result is ``null``, if the
-searched row is not found in the mach.
-
-The second argument is optional. The default value is ``0``, which means that
-by default these functions navigate to the first or last row of interest. If
-specified, the second argument must be a non-negative integer number.
-
-physical navigation functions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. code-block:: sql
-
-    PREV(A.totalprice, 2)
-
-In the above example, the ``prev`` function navigates to the last row matched
-to pattern variable ``A``, and then searches two rows backward. The result is
-the value of the ``totalprice`` column in that row.
-
-.. code-block:: sql
-
-    NEXT(A.totalprice, 2)
-
-In the above example, the ``next`` function navigates to the last row matched
-to pattern variable ``A``, and then searches two rows forward. The result is
-the value of the ``totalprice`` column in that row.
-
-With the ``prev`` and ``next`` functions, it is possible to navigate and
-retrieve values outside the match. If the navigation goes beyond partition
-bounds, the result is ``null``.
-
-The second argument is optional. The default value is ``1``, which means that
-by default these functions navigate to previous or next row. If specified, the
-second argument must be a non-negative integer number.
-
-nesting of navigation functions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-It is possible to nest logical navigation functions within physical navigation
-functions:
-
-.. code-block:: sql
-
-    PREV(FIRST(A.totalprice, 3), 2)
-
-In case of nesting, first the logical navigation is performed. It establishes
-the starting row for the physical navigation. When both navigation operations
-succeed, the value is retrieved from the designated row.
-
-Pattern navigation functions require at least one column reference or
-``classifier`` function inside of their first argument. The following examples
-are correct::
-
-    LAST("pattern_variable_" || CLASSIFIER())
-
-    NEXT(U.totalprice + 10)
-
-This is incorrect::
-
-    LAST(1)
-
-It is also required that all column references and all ``classifier`` calls
-inside a pattern navigation function are consistent in referred pattern
-variables. They must all refer either to the same primary variable, the same
-union variable, or to the implicit universal pattern variable. The following
-examples are correct::
-
-    LAST(CLASSIFIER() = 'A' OR totalprice > 10) /* universal pattern variable */
-
-    LAST(CLASSIFIER(U) = 'A' OR U.totalprice > 10) /* pattern variable U */
-
-This is incorrect::
-
-    LAST(A.totalprice + B.totalprice)
-
-Aggregate functions
-^^^^^^^^^^^^^^^^^^^
-
-It is allowed to use aggregate functions in a row pattern recognition context.
-Aggregate functions are evaluated over all rows of the current match or over a
-subset of rows based on the matched pattern variables. The
-:ref:`running and final semantics<running_and_final>` are supported, with
-``running`` as the default.
-
-The following expression returns the average value of the ``totalprice`` column
-for all rows matched to pattern variable ``A``::
-
-    avg(A.totalprice)
-
-The following expression returns the average value of the ``totalprice`` column
-for all rows matched to pattern variables from subset ``U``::
-
-    avg(U.totalprice)
-
-The following expression returns the average value of the ``totalprice`` column
-for all rows of the match::
-
-    avg(totalprice)
-
-Aggregation arguments
-"""""""""""""""""""""
-
-In case when the aggregate function has multiple arguments, it is required that
-all arguments refer consistently to the same set of rows::
-
-    max_by(totalprice, tax) /* aggregate over all rows of the match */
-
-    max_by(CLASSIFIER(A), A.tax) /* aggregate over all rows matched to A */
-
-This is incorrect::
-
-    max_by(A.totalprice, tax)
-
-    max_by(A.totalprice, A.tax + B.tax)
-
-If an aggregate argument does not contain any column reference or
-``classifier`` function, it does not refer to any pattern variable. In such a
-case other aggregate arguments determine the set of rows to aggregate over. If
-none of the arguments contains a pattern variable reference, the universal row
-pattern variable is implicit. This means that the aggregate function applies to
-all rows of the match::
-
-    count(1) /* aggregate over all rows of the match */
-
-    min_by(1, 2) /* aggregate over all rows of the match */
-
-    min_by(1, totalprice) /* aggregate over all rows of the match */
-
-    min_by(totalprice, 1) /* aggregate over all rows of the match */
-
-    min_by(A.totalprice, 1) /* aggregate over all rows matched to A */
-
-    max_by(1, A.totalprice) /* aggregate over all rows matched to A */
-
-Nesting of aggregate functions
-""""""""""""""""""""""""""""""
-
-Aggregate function arguments must not contain pattern navigation functions.
-Similarly, aggregate functions cannot be nested in pattern navigation
-functions.
-
-Usage of the ``classifier`` and ``match_number`` functions
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-It is allowed to use the ``classifier`` and ``match_number`` functions in
-aggregate function arguments. The following expression returns an array
-containing all matched pattern variables::
-
-    array_agg(CLASSIFIER())
-
-This is particularly useful in combination with the option
-``ONE ROW PER MATCH``. It allows to get all the components of the match while
-keeping the output size reduced.
-
-Row pattern count aggregation
-"""""""""""""""""""""""""""""
-
-Like other aggregate functions in a row pattern recognition context, the
-``count`` function can be applied to all rows of the match, or to rows
-associated with certain row pattern variables::
-
-    count(*), count() /* count all rows of the match */
-
-    count(totalprice) /* count non-null values of the totalprice column
-                         in all rows of the match */
-
-    count(A.totalprice) /* count non-null values of the totalprice column
-                           in all rows matched to A */
-
-The ``count`` function in a row pattern recognition context allows special syntax
-to support the ``count(*)`` behavior over a limited set of rows::
-
-    count(A.*) /* count rows matched to A */
-
-    count(U.*) /* count rows matched to pattern variables from subset U */
-
-.. _running_and_final:
-
-``RUNNING`` and ``FINAL`` semantics
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-During pattern matching in a sequence of rows, one row after another is
-examined to determine if it fits the pattern. At any step, a partial match is
-known, but it is not yet known what rows will be added in the future or what
-pattern variables they will be mapped to. So, when evaluating a boolean
-condition in the ``DEFINE`` clause for the current row, only the preceding part
-of the match (plus the current row) is "visible". This is the ``running``
-semantics.
-
-When evaluating expressions in the ``MEASURES`` clause, the match is complete.
-It is then possible to apply the ``final`` semantics. In the ``final``
-semantics, the whole match is "visible" as from the position of the final row.
-
-In the ``MEASURES`` clause, the ``running`` semantics can also be applied. When
-outputting information row by row (as in ``ALL ROWS PER MATCH``), the
-``running`` semantics evaluate expressions from the positions of consecutive
-rows.
-
-The ``running`` and ``final`` semantics are denoted by the keywords:
-``RUNNING`` and ``FINAL``, preceding a logical navigation function ``first`` or
-``last``, or an aggregate function::
-
-    RUNNING LAST(A.totalprice)
-
-    FINAL LAST(A.totalprice)
-
-    RUNNING avg(A.totalprice)
-
-    FINAL count(A.*)
-
-The ``running`` semantics is default in ``MEASURES`` and ``DEFINE`` clauses.
-``FINAL`` can only be specified in the ``MEASURES`` clause.
-
-With the option ``ONE ROW PER MATCH``, row pattern measures are evaluated from
-the position of the final row in the match. Therefore, ``running`` and
-``final`` semantics are the same.
-
-.. _empty_matches_and_unmatched_rows:
-
-Evaluating expressions in empty matches and unmatched rows
-----------------------------------------------------------
-
-An empty match occurs when the row pattern is successfully matched, but no
-pattern variables are assigned. The following pattern produces an empty match
-for every row::
-
-    PATTERN(())
-
-When evaluating row pattern measures for an empty match:
-
-- all column references return ``null``
-
-- all navigation operations return ``null``
-
-- ``classifier`` function returns ``null``
-
-- ``match_number`` function returns the sequential number of the match
-
-- all aggregate functions are evaluated over an empty set of rows
-
-Like every match, an empty match has its starting row. All input values which
-are to be output along with the measures (as explained in
-:ref:`rows_per_match`), are the values from the starting row.
-
-An unmatched row is a row that is neither part of any non-empty match nor the
-starting row of an empty match. With the option ``ALL ROWS PER MATCH WITH
-UNMATCHED ROWS``, a single output row is produced. In that row, all row pattern
-measures are ``null``. All input values which are to be output along with the
-measures (as explained in :ref:`rows_per_match`), are the values from the
-unmatched row. Using the ``match_number`` function as a measure can help
-differentiate between an empty match and unmatched row.
-
diff --git a/docs/src/main/sphinx/sql/merge.md b/docs/src/main/sphinx/sql/merge.md
new file mode 100644
index 000000000000..e7b65257763f
--- /dev/null
+++ b/docs/src/main/sphinx/sql/merge.md
@@ -0,0 +1,99 @@
+# MERGE
+
+## Synopsis
+
+```text
+MERGE INTO target_table [ [ AS ]  target_alias ]
+USING { source_table | query } [ [ AS ] source_alias ]
+ON search_condition
+when_clause [...]
+```
+
+where `when_clause` is one of
+
+```text
+WHEN MATCHED [ AND condition ]
+    THEN DELETE
+```
+
+```text
+WHEN MATCHED [ AND condition ]
+    THEN UPDATE SET ( column = expression [, ...] )
+```
+
+```text
+WHEN NOT MATCHED [ AND condition ]
+    THEN INSERT [ column_list ] VALUES (expression, ...)
+```
+
+## Description
+
+Conditionally update and/or delete rows of a table and/or insert new
+rows into a table.
+
+`MERGE` supports an arbitrary number of `WHEN` clauses with different
+`MATCHED` conditions, executing the `DELETE`, `UPDATE` or `INSERT`
+operation in the first `WHEN` clause selected by the `MATCHED`
+state and the match condition.
+
+For each source row, the `WHEN` clauses are processed in order.  Only
+the first first matching `WHEN` clause is executed and subsequent clauses
+are ignored.  A `MERGE_TARGET_ROW_MULTIPLE_MATCHES` exception is
+raised when a single target table row matches more than one source row.
+
+If a source row is not matched by any `WHEN` clause and there is no
+`WHEN NOT MATCHED` clause, the source row is ignored.
+
+In `WHEN` clauses with `UPDATE` operations, the column value expressions
+can depend on any field of the target or the source.  In the `NOT MATCHED`
+case, the `INSERT` expressions can depend on any field of the source.
+
+## Examples
+
+Delete all customers mentioned in the source table:
+
+```
+MERGE INTO accounts t USING monthly_accounts_update s
+    ON t.customer = s.customer
+    WHEN MATCHED
+        THEN DELETE
+```
+
+For matching customer rows, increment the purchases, and if there is no
+match, insert the row from the source table:
+
+```
+MERGE INTO accounts t USING monthly_accounts_update s
+    ON (t.customer = s.customer)
+    WHEN MATCHED
+        THEN UPDATE SET purchases = s.purchases + t.purchases
+    WHEN NOT MATCHED
+        THEN INSERT (customer, purchases, address)
+              VALUES(s.customer, s.purchases, s.address)
+```
+
+`MERGE` into the target table from the source table, deleting any matching
+target row for which the source address is Centreville.  For all other
+matching rows, add the source purchases and set the address to the source
+address, if there is no match in the target table, insert the source
+table row:
+
+```
+MERGE INTO accounts t USING monthly_accounts_update s
+    ON (t.customer = s.customer)
+    WHEN MATCHED AND s.address = 'Centreville'
+        THEN DELETE
+    WHEN MATCHED
+        THEN UPDATE
+            SET purchases = s.purchases + t.purchases, address = s.address
+    WHEN NOT MATCHED
+        THEN INSERT (customer, purchases, address)
+              VALUES(s.customer, s.purchases, s.address)
+```
+
+## Limitations
+
+Any connector can be used as a source table for a `MERGE` statement.
+Only connectors which support the `MERGE` statement can be the target of a
+merge operation. See the {doc}`connector documentation </connector>` for more
+information.
diff --git a/docs/src/main/sphinx/sql/merge.rst b/docs/src/main/sphinx/sql/merge.rst
deleted file mode 100644
index ea3597048c78..000000000000
--- a/docs/src/main/sphinx/sql/merge.rst
+++ /dev/null
@@ -1,99 +0,0 @@
-=====
-MERGE
-=====
-
-Synopsis
---------
-
-.. code-block:: text
-
-    MERGE INTO target_table [ [ AS ]  target_alias ]
-    USING { source_table | query } [ [ AS ] source_alias ]
-    ON search_condition
-    when_clause [...]
-
-where ``when_clause`` is one of
-
-.. code-block:: text
-
-    WHEN MATCHED [ AND condition ]
-        THEN DELETE
-
-.. code-block:: text
-
-    WHEN MATCHED [ AND condition ]
-        THEN UPDATE SET ( column = expression [, ...] )
-
-.. code-block:: text
-
-    WHEN NOT MATCHED [ AND condition ]
-        THEN INSERT [ column_list ] VALUES (expression, ...)
-
-Description
------------
-
-Conditionally update and/or delete rows of a table and/or insert new
-rows into a table.
-
-``MERGE`` supports an arbitrary number of ``WHEN`` clauses with different
-``MATCHED`` conditions, executing the ``DELETE``, ``UPDATE`` or ``INSERT``
-operation in the first ``WHEN`` clause selected by the ``MATCHED``
-state and the match condition.
-
-For each source row, the ``WHEN`` clauses are processed in order.  Only
-the first first matching ``WHEN`` clause is executed and subsequent clauses
-are ignored.  A ``MERGE_TARGET_ROW_MULTIPLE_MATCHES`` exception is
-raised when a single target table row matches more than one source row.
-
-If a source row is not matched by any ``WHEN`` clause and there is no
-``WHEN NOT MATCHED`` clause, the source row is ignored.
-
-In ``WHEN`` clauses with ``UPDATE`` operations, the column value expressions
-can depend on any field of the target or the source.  In the ``NOT MATCHED``
-case, the ``INSERT`` expressions can depend on any field of the source.
-
-Examples
---------
-
-Delete all customers mentioned in the source table::
-
-    MERGE INTO accounts t USING monthly_accounts_update s
-        ON t.customer = s.customer
-        WHEN MATCHED
-            THEN DELETE
-
-For matching customer rows, increment the purchases, and if there is no
-match, insert the row from the source table::
-
-    MERGE INTO accounts t USING monthly_accounts_update s
-        ON (t.customer = s.customer)
-        WHEN MATCHED
-            THEN UPDATE SET purchases = s.purchases + t.purchases
-        WHEN NOT MATCHED
-            THEN INSERT (customer, purchases, address)
-                  VALUES(s.customer, s.purchases, s.address)
-
-``MERGE`` into the target table from the source table, deleting any matching
-target row for which the source address is Centreville.  For all other
-matching rows, add the source purchases and set the address to the source
-address, if there is no match in the target table, insert the source
-table row::
-
-    MERGE INTO accounts t USING monthly_accounts_update s
-        ON (t.customer = s.customer)
-        WHEN MATCHED AND s.address = 'Centreville'
-            THEN DELETE
-        WHEN MATCHED
-            THEN UPDATE
-                SET purchases = s.purchases + t.purchases, address = s.address
-        WHEN NOT MATCHED
-            THEN INSERT (customer, purchases, address)
-                  VALUES(s.customer, s.purchases, s.address)
-
-Limitations
------------
-
-Any connector can be used as a source table for a ``MERGE`` statement.
-Only connectors which support the ``MERGE`` statement can be the target of a
-merge operation. See the :doc:`connector documentation </connector>` for more
-information.
diff --git a/docs/src/main/sphinx/sql/pattern-recognition-in-window.md b/docs/src/main/sphinx/sql/pattern-recognition-in-window.md
new file mode 100644
index 000000000000..d1e533ab71af
--- /dev/null
+++ b/docs/src/main/sphinx/sql/pattern-recognition-in-window.md
@@ -0,0 +1,259 @@
+# Row pattern recognition in window structures
+
+A window structure can be defined in the `WINDOW` clause or in the `OVER`
+clause of a window operation. In both cases, the window specification can
+include row pattern recognition clauses. They are part of the window frame. The
+syntax and semantics of row pattern recognition in window are similar to those
+of the {doc}`MATCH_RECOGNIZE</sql/match-recognize>` clause.
+
+This section explains the details of row pattern recognition in window
+structures, and highlights the similarities and the differences between both
+pattern recognition mechanisms.
+
+## Window with row pattern recognition
+
+**Window specification:**
+
+```text
+(
+[ existing_window_name ]
+[ PARTITION BY column [, ...] ]
+[ ORDER BY column [, ...] ]
+[ window_frame ]
+)
+```
+
+**Window frame:**
+
+```text
+[ MEASURES measure_definition [, ...] ]
+frame_extent
+[ AFTER MATCH skip_to ]
+[ INITIAL | SEEK ]
+[ PATTERN ( row_pattern ) ]
+[ SUBSET subset_definition [, ...] ]
+[ DEFINE variable_definition [, ...] ]
+```
+
+Generally, a window frame specifies the `frame_extent`, which defines the
+"sliding window" of rows to be processed by a window function. It can be
+defined in terms of `ROWS`, `RANGE` or `GROUPS`.
+
+A window frame with row pattern recognition involves many other syntactical
+components, mandatory or optional, and enforces certain limitations on the
+`frame_extent`.
+
+**Window frame with row pattern recognition:**
+
+```text
+[ MEASURES measure_definition [, ...] ]
+ROWS BETWEEN CURRENT ROW AND frame_end
+[ AFTER MATCH skip_to ]
+[ INITIAL | SEEK ]
+PATTERN ( row_pattern )
+[ SUBSET subset_definition [, ...] ]
+DEFINE variable_definition [, ...]
+```
+
+## Description of the pattern recognition clauses
+
+The `frame_extent` with row pattern recognition must be defined in terms of
+`ROWS`. The frame start must be at the `CURRENT ROW`, which limits the
+allowed frame extent values to the following:
+
+```
+ROWS BETWEEN CURRENT ROW AND CURRENT ROW
+
+ROWS BETWEEN CURRENT ROW AND <expression> FOLLOWING
+
+ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING
+```
+
+For every input row processed by the window, the portion of rows enclosed by
+the `frame_extent` limits the search area for row pattern recognition. Unlike
+in `MATCH_RECOGNIZE`, where the pattern search can explore all rows until the
+partition end, and all rows of the partition are available for computations, in
+window structures the pattern matching can neither match rows nor retrieve
+input values outside the frame.
+
+Besides the `frame_extent`, pattern matching requires the `PATTERN` and
+`DEFINE` clauses.
+
+The `PATTERN` clause specifies a row pattern, which is a form of a regular
+expression with some syntactical extensions. The row pattern syntax is similar
+to the {ref}`row pattern syntax in MATCH_RECOGNIZE<row-pattern-syntax>`.
+However, the anchor patterns `^` and `$` are not allowed in a window
+specification.
+
+The `DEFINE` clause defines the row pattern primary variables in terms of
+boolean conditions that must be satisfied. It is similar to the
+{ref}`DEFINE clause of MATCH_RECOGNIZE<row-pattern-variable-definitions>`.
+The only difference is that the window syntax does not support the
+`MATCH_NUMBER` function.
+
+The `MEASURES` clause is syntactically similar to the
+{ref}`MEASURES clause of MATCH_RECOGNIZE<row-pattern-measures>`. The only
+limitation is that the `MATCH_NUMBER` function is not allowed. However, the
+semantics of this clause differs between `MATCH_RECOGNIZE` and window.
+While in `MATCH_RECOGNIZE` every measure produces an output column, the
+measures in window should be considered as **definitions** associated with the
+window structure. They can be called over the window, in the same manner as
+regular window functions:
+
+```
+SELECT cust_key, value OVER w, label OVER w
+    FROM orders
+    WINDOW w AS (
+                 PARTITION BY cust_key
+                 ORDER BY order_date
+                 MEASURES
+                        RUNNING LAST(total_price) AS value,
+                        CLASSIFIER() AS label
+                 ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING
+                 PATTERN (A B+ C+)
+                 DEFINE
+                        B AS B.value < PREV (B.value),
+                        C AS C.value > PREV (C.value)
+                )
+```
+
+Measures defined in a window can be referenced in the `SELECT` clause and in
+the `ORDER BY` clause of the enclosing query.
+
+The `RUNNING` and `FINAL` keywords are allowed in the `MEASURES` clause.
+They can precede a logical navigation function `FIRST` or `LAST`, or an
+aggregate function. However, they have no effect. Every computation is
+performed from the position of the final row of the match, so the semantics is
+effectively `FINAL`.
+
+The `AFTER MATCH SKIP` clause has the same syntax as the
+{ref}`AFTER MATCH SKIP clause of MATCH_RECOGNIZE<after-match-skip>`.
+
+The `INITIAL` or `SEEK` modifier is specific to row pattern recognition in
+window. With `INITIAL`, which is the default, the pattern match for an input
+row can only be found starting from that row. With `SEEK`, if there is no
+match starting from the current row, the engine tries to find a match starting
+from subsequent rows within the frame. As a result, it is possible to associate
+an input row with a match which is detached from that row.
+
+The `SUBSET` clause is used to define {ref}`union variables
+<row-pattern-union-variables>` as sets of primary pattern variables. You can
+use union variables to refer to a set of rows matched to any primary pattern
+variable from the subset:
+
+```
+SUBSET U = (A, B)
+```
+
+The following expression returns the `total_price` value from the last row
+matched to either `A` or `B`:
+
+```
+LAST(U.total_price)
+```
+
+If you want to refer to all rows of the match, there is no need to define a
+`SUBSET` containing all pattern variables. There is an implicit *universal
+pattern variable* applied to any non prefixed column name and any
+`CLASSIFIER` call without an argument. The following expression returns the
+`total_price` value from the last matched row:
+
+```
+LAST(total_price)
+```
+
+The following call returns the primary pattern variable of the first matched
+row:
+
+```
+FIRST(CLASSIFIER())
+```
+
+In window, unlike in `MATCH_RECOGNIZE`, you cannot specify `ONE ROW PER
+MATCH` or `ALL ROWS PER MATCH`. This is because all calls over window,
+whether they are regular window functions or measures, must comply with the
+window semantics. A call over window is supposed to produce exactly one output
+row for every input row. And so, the output mode of pattern recognition in
+window is a combination of `ONE ROW PER MATCH` and `WITH UNMATCHED ROWS`.
+
+## Processing input with row pattern recognition
+
+Pattern recognition in window processes input rows in two different cases:
+
+- upon a row pattern measure call over the window:
+
+  ```
+  some_measure OVER w
+  ```
+
+- upon a window function call over the window:
+
+  ```
+  sum(total_price) OVER w
+  ```
+
+The output row produced for each input row, consists of:
+
+- all values from the input row
+- the value of the called measure or window function, computed with respect to
+  the pattern match associated with the row
+
+Processing the input can be described as the following sequence of steps:
+
+- Partition the input data accordingly to `PARTITION BY`
+- Order each partition by the `ORDER BY` expressions
+- For every row of the ordered partition:
+  : If the row is 'skipped' by a match of some previous row:
+    : - For a measure, produce a one-row output as for an unmatched row
+      - For a window function, evaluate the function over an empty frame
+        and produce a one-row output
+
+    Otherwise:
+    : - Determine the frame extent
+      - Try match the row pattern starting from the current row within
+        the frame extent
+      - If no match is found, and `SEEK` is specified, try to find a match
+        starting from subsequent rows within the frame extent
+
+      If no match is found:
+      : - For a measure, produce a one-row output for an unmatched row
+        - For a window function, evaluate the function over an empty
+          frame and produce a one-row output
+
+      Otherwise:
+      : - For a measure, produce a one-row output for the match
+        - For a window function, evaluate the function over a frame
+          limited to the matched rows sequence and produce a one-row
+          output
+        - Evaluate the `AFTER MATCH SKIP` clause, and mark the 'skipped'
+          rows
+
+## Empty matches and unmatched rows
+
+If no match can be associated with a particular input row, the row is
+*unmatched*. This happens when no match can be found for the row. This also
+happens when no match is attempted for the row, because it is skipped by the
+`AFTER MATCH SKIP` clause of some preceding row. For an unmatched row,
+every row pattern measure is `null`. Every window function is evaluated over
+an empty frame.
+
+An *empty match* is a successful match which does not involve any pattern
+variables. In other words, an empty match does not contain any rows. If an
+empty match is associated with an input row, every row pattern measure for that
+row is evaluated over an empty sequence of rows. All navigation operations and
+the `CLASSIFIER` function return `null`. Every window function is evaluated
+over an empty frame.
+
+In most cases, the results for empty matches and unmatched rows are the same.
+A constant measure can be helpful to distinguish between them:
+
+The following call returns `'matched'` for every matched row, including empty
+matches, and `null` for every unmatched row:
+
+```
+matched OVER (
+              ...
+              MEASURES 'matched' AS matched
+              ...
+             )
+```
diff --git a/docs/src/main/sphinx/sql/pattern-recognition-in-window.rst b/docs/src/main/sphinx/sql/pattern-recognition-in-window.rst
deleted file mode 100644
index a7e6684f9b5e..000000000000
--- a/docs/src/main/sphinx/sql/pattern-recognition-in-window.rst
+++ /dev/null
@@ -1,246 +0,0 @@
-============================================
-Row pattern recognition in window structures
-============================================
-
-A window structure can be defined in the ``WINDOW`` clause or in the ``OVER``
-clause of a window operation. In both cases, the window specification can
-include row pattern recognition clauses. They are part of the window frame. The
-syntax and semantics of row pattern recognition in window are similar to those
-of the :doc:`MATCH_RECOGNIZE</sql/match-recognize>` clause.
-
-This section explains the details of row pattern recognition in window
-structures, and highlights the similarities and the differences between both
-pattern recognition mechanisms.
-
-Window with row pattern recognition
------------------------------------
-
-**Window specification:**
-
-.. code-block:: text
-
-        (
-        [ existing_window_name ]
-        [ PARTITION BY column [, ...] ]
-        [ ORDER BY column [, ...] ]
-        [ window_frame ]
-        )
-
-**Window frame:**
-
-.. code-block:: text
-
-        [ MEASURES measure_definition [, ...] ]
-        frame_extent
-        [ AFTER MATCH skip_to ]
-        [ INITIAL | SEEK ]
-        [ PATTERN ( row_pattern ) ]
-        [ SUBSET subset_definition [, ...] ]
-        [ DEFINE variable_definition [, ...] ]
-
-Generally, a window frame specifies the ``frame_extent``, which defines the
-"sliding window" of rows to be processed by a window function. It can be
-defined in terms of ``ROWS``, ``RANGE`` or ``GROUPS``.
-
-A window frame with row pattern recognition involves many other syntactical
-components, mandatory or optional, and enforces certain limitations on the
-``frame_extent``.
-
-**Window frame with row pattern recognition:**
-
-.. code-block:: text
-
-        [ MEASURES measure_definition [, ...] ]
-        ROWS BETWEEN CURRENT ROW AND frame_end
-        [ AFTER MATCH skip_to ]
-        [ INITIAL | SEEK ]
-        PATTERN ( row_pattern )
-        [ SUBSET subset_definition [, ...] ]
-        DEFINE variable_definition [, ...]
-
-Description of the pattern recognition clauses
-----------------------------------------------
-
-The ``frame_extent`` with row pattern recognition must be defined in terms of
-``ROWS``. The frame start must be at the ``CURRENT ROW``, which limits the
-allowed frame extent values to the following::
-
-    ROWS BETWEEN CURRENT ROW AND CURRENT ROW
-
-    ROWS BETWEEN CURRENT ROW AND <expression> FOLLOWING
-
-    ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING
-
-For every input row processed by the window, the portion of rows enclosed by
-the ``frame_extent`` limits the search area for row pattern recognition. Unlike
-in ``MATCH_RECOGNIZE``, where the pattern search can explore all rows until the
-partition end, and all rows of the partition are available for computations, in
-window structures the pattern matching can neither match rows nor retrieve
-input values outside the frame.
-
-Besides the ``frame_extent``, pattern matching requires the ``PATTERN`` and
-``DEFINE`` clauses.
-
-The ``PATTERN`` clause specifies a row pattern, which is a form of a regular
-expression with some syntactical extensions. The row pattern syntax is similar
-to the :ref:`row pattern syntax in MATCH_RECOGNIZE<row_pattern_syntax>`.
-However, the anchor patterns ``^`` and ``$`` are not allowed in a window
-specification.
-
-The ``DEFINE`` clause defines the row pattern primary variables in terms of
-boolean conditions that must be satisfied. It is similar to the
-:ref:`DEFINE clause of MATCH_RECOGNIZE<row_pattern_variable_definitions>`.
-The only difference is that the window syntax does not support the
-``MATCH_NUMBER`` function.
-
-The ``MEASURES`` clause is syntactically similar to the
-:ref:`MEASURES clause of MATCH_RECOGNIZE<row_pattern_measures>`. The only
-limitation is that the ``MATCH_NUMBER`` function is not allowed. However, the
-semantics of this clause differs between ``MATCH_RECOGNIZE`` and window.
-While in ``MATCH_RECOGNIZE`` every measure produces an output column, the
-measures in window should be considered as **definitions** associated with the
-window structure. They can be called over the window, in the same manner as
-regular window functions::
-
-    SELECT cust_key, value OVER w, label OVER w
-        FROM orders
-        WINDOW w AS (
-                     PARTITION BY cust_key
-                     ORDER BY order_date
-                     MEASURES
-                            RUNNING LAST(total_price) AS value,
-                            CLASSIFIER() AS label
-                     ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING
-                     PATTERN (A B+ C+)
-                     DEFINE
-                            B AS B.value < PREV (B.value),
-                            C AS C.value > PREV (C.value)
-                    )
-
-Measures defined in a window can be referenced in the ``SELECT`` clause and in
-the ``ORDER BY`` clause of the enclosing query.
-
-The ``RUNNING`` and ``FINAL`` keywords are allowed in the ``MEASURES`` clause.
-They can precede a logical navigation function ``FIRST`` or ``LAST``, or an
-aggregate function. However, they have no effect. Every computation is
-performed from the position of the final row of the match, so the semantics is
-effectively ``FINAL``.
-
-The ``AFTER MATCH SKIP`` clause has the same syntax as the
-:ref:`AFTER MATCH SKIP clause of MATCH_RECOGNIZE<after_match_skip>`.
-
-The ``INITIAL`` or ``SEEK`` modifier is specific to row pattern recognition in
-window. With ``INITIAL``, which is the default, the pattern match for an input
-row can only be found starting from that row. With ``SEEK``, if there is no
-match starting from the current row, the engine tries to find a match starting
-from subsequent rows within the frame. As a result, it is possible to associate
-an input row with a match which is detached from that row.
-
-The ``SUBSET`` clause is used to define :ref:`union variables
-<row_pattern_union_variables>` as sets of primary pattern variables. You can
-use union variables to refer to a set of rows matched to any primary pattern
-variable from the subset::
-
-    SUBSET U = (A, B)
-
-The following expression returns the ``total_price`` value from the last row
-matched to either ``A`` or ``B``::
-
-    LAST(U.total_price)
-
-If you want to refer to all rows of the match, there is no need to define a
-``SUBSET`` containing all pattern variables. There is an implicit *universal
-pattern variable* applied to any non prefixed column name and any
-``CLASSIFIER`` call without an argument. The following expression returns the
-``total_price`` value from the last matched row::
-
-    LAST(total_price)
-
-The following call returns the primary pattern variable of the first matched
-row::
-
-    FIRST(CLASSIFIER())
-
-In window, unlike in ``MATCH_RECOGNIZE``, you cannot specify ``ONE ROW PER
-MATCH`` or ``ALL ROWS PER MATCH``. This is because all calls over window,
-whether they are regular window functions or measures, must comply with the
-window semantics. A call over window is supposed to produce exactly one output
-row for every input row. And so, the output mode of pattern recognition in
-window is a combination of ``ONE ROW PER MATCH`` and ``WITH UNMATCHED ROWS``.
-
-Processing input with row pattern recognition
----------------------------------------------
-
-Pattern recognition in window processes input rows in two different cases:
-
-* upon a row pattern measure call over the window::
-
-    some_measure OVER w
-
-* upon a window function call over the window::
-
-    sum(total_price) OVER w
-
-The output row produced for each input row, consists of:
-
-* all values from the input row
-* the value of the called measure or window function, computed with respect to
-  the pattern match associated with the row
-
-Processing the input can be described as the following sequence of steps:
-
-* Partition the input data accordingly to ``PARTITION BY``
-* Order each partition by the ``ORDER BY`` expressions
-* For every row of the ordered partition:
-    If the row is 'skipped' by a match of some previous row:
-        * For a measure, produce a one-row output as for an unmatched row
-        * For a window function, evaluate the function over an empty frame
-          and produce a one-row output
-    Otherwise:
-        * Determine the frame extent
-        * Try match the row pattern starting from the current row within
-          the frame extent
-        * If no match is found, and ``SEEK`` is specified, try to find a match
-          starting from subsequent rows within the frame extent
-
-        If no match is found:
-            * For a measure, produce a one-row output for an unmatched row
-            * For a window function, evaluate the function over an empty
-              frame and produce a one-row output
-        Otherwise:
-            * For a measure, produce a one-row output for the match
-            * For a window function, evaluate the function over a frame
-              limited to the matched rows sequence and produce a one-row
-              output
-            * Evaluate the ``AFTER MATCH SKIP`` clause, and mark the 'skipped'
-              rows
-
-Empty matches and unmatched rows
---------------------------------
-
-If no match can be associated with a particular input row, the row is
-*unmatched*. This happens when no match can be found for the row. This also
-happens when no match is attempted for the row, because it is skipped by the
-``AFTER MATCH SKIP`` clause of some preceding row. For an unmatched row,
-every row pattern measure is ``null``. Every window function is evaluated over
-an empty frame.
-
-An *empty match* is a successful match which does not involve any pattern
-variables. In other words, an empty match does not contain any rows. If an
-empty match is associated with an input row, every row pattern measure for that
-row is evaluated over an empty sequence of rows. All navigation operations and
-the ``CLASSIFIER`` function return ``null``. Every window function is evaluated
-over an empty frame.
-
-In most cases, the results for empty matches and unmatched rows are the same.
-A constant measure can be helpful to distinguish between them:
-
-The following call returns ``'matched'`` for every matched row, including empty
-matches, and ``null`` for every unmatched row::
-
-    matched OVER (
-                  ...
-                  MEASURES 'matched' AS matched
-                  ...
-                 )
-
diff --git a/docs/src/main/sphinx/sql/prepare.md b/docs/src/main/sphinx/sql/prepare.md
new file mode 100644
index 000000000000..d6bb0aef2a83
--- /dev/null
+++ b/docs/src/main/sphinx/sql/prepare.md
@@ -0,0 +1,42 @@
+# PREPARE
+
+## Synopsis
+
+```text
+PREPARE statement_name FROM statement
+```
+
+## Description
+
+Prepares a statement for execution at a later time. Prepared statements are
+queries that are saved in a session with a given name. The statement can
+include parameters in place of literals to be replaced at execution time.
+Parameters are represented by question marks.
+
+## Examples
+
+Prepare a select query:
+
+```
+PREPARE my_select1 FROM
+SELECT * FROM nation;
+```
+
+Prepare a select query that includes parameters. The values to compare with
+`regionkey` and `nationkey` will be filled in with the {doc}`execute` statement:
+
+```
+PREPARE my_select2 FROM
+SELECT name FROM nation WHERE regionkey = ? AND nationkey < ?;
+```
+
+Prepare an insert query:
+
+```
+PREPARE my_insert FROM
+INSERT INTO cities VALUES (1, 'San Francisco');
+```
+
+## See also
+
+{doc}`execute`, {doc}`deallocate-prepare`, {doc}`execute-immediate`, {doc}`describe-input`, {doc}`describe-output`
diff --git a/docs/src/main/sphinx/sql/prepare.rst b/docs/src/main/sphinx/sql/prepare.rst
deleted file mode 100644
index a65ea0ccdc6d..000000000000
--- a/docs/src/main/sphinx/sql/prepare.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-=======
-PREPARE
-=======
-
-Synopsis
---------
-
-.. code-block:: text
-
-    PREPARE statement_name FROM statement
-
-Description
------------
-
-Prepares a statement for execution at a later time. Prepared statements are
-queries that are saved in a session with a given name. The statement can
-include parameters in place of literals to be replaced at execution time.
-Parameters are represented by question marks.
-
-Examples
---------
-
-Prepare a select query::
-
-    PREPARE my_select1 FROM
-    SELECT * FROM nation;
-
-Prepare a select query that includes parameters. The values to compare with
-``regionkey`` and ``nationkey`` will be filled in with the :doc:`execute` statement::
-
-    PREPARE my_select2 FROM
-    SELECT name FROM nation WHERE regionkey = ? AND nationkey < ?;
-
-Prepare an insert query::
-
-    PREPARE my_insert FROM
-    INSERT INTO cities VALUES (1, 'San Francisco');
-
-See also
---------
-
-:doc:`execute`, :doc:`deallocate-prepare`, :doc:`describe-input`, :doc:`describe-output`
diff --git a/docs/src/main/sphinx/sql/refresh-materialized-view.md b/docs/src/main/sphinx/sql/refresh-materialized-view.md
new file mode 100644
index 000000000000..61a4d74cf469
--- /dev/null
+++ b/docs/src/main/sphinx/sql/refresh-materialized-view.md
@@ -0,0 +1,29 @@
+# REFRESH MATERIALIZED VIEW
+
+## Synopsis
+
+```text
+REFRESH MATERIALIZED VIEW view_name
+```
+
+## Description
+
+Initially populate or refresh the data stored in the materialized view
+`view_name`. The materialized view must be defined with
+{doc}`create-materialized-view`. Data is retrieved from the underlying tables
+accessed by the defined query.
+
+The initial population of the materialized view is typically processing
+intensive since it reads the data from the source tables and performs physical
+write operations.
+
+The refresh operation can be less intensive, if the underlying data has not
+changed and the connector has implemented a mechanism to be aware of that. The
+specific implementation and performance varies by connector used to create the
+materialized view.
+
+## See also
+
+- {doc}`create-materialized-view`
+- {doc}`drop-materialized-view`
+- {doc}`show-create-materialized-view`
diff --git a/docs/src/main/sphinx/sql/refresh-materialized-view.rst b/docs/src/main/sphinx/sql/refresh-materialized-view.rst
deleted file mode 100644
index 1b2fea248229..000000000000
--- a/docs/src/main/sphinx/sql/refresh-materialized-view.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-=========================
-REFRESH MATERIALIZED VIEW
-=========================
-
-Synopsis
---------
-
-.. code-block:: text
-
-    REFRESH MATERIALIZED VIEW view_name
-
-Description
------------
-
-Initially populate or refresh the data stored in the materialized view
-``view_name``. The materialized view must be defined with
-:doc:`create-materialized-view`. Data is retrieved from the underlying tables
-accessed by the defined query.
-
-The initial population of the materialized view is typically processing
-intensive since it reads the data from the source tables and performs physical
-write operations.
-
-The refresh operation can be less intensive, if the underlying data has not
-changed and the connector has implemented a mechanism to be aware of that. The
-specific implementation and performance varies by connector used to create the
-materialized view.
-
-See also
---------
-
-* :doc:`create-materialized-view`
-* :doc:`drop-materialized-view`
-* :doc:`show-create-materialized-view`
diff --git a/docs/src/main/sphinx/sql/reset-session-authorization.rst b/docs/src/main/sphinx/sql/reset-session-authorization.rst
new file mode 100644
index 000000000000..b1b163a5c90a
--- /dev/null
+++ b/docs/src/main/sphinx/sql/reset-session-authorization.rst
@@ -0,0 +1,22 @@
+===========================
+RESET SESSION AUTHORIZATION
+===========================
+
+Synopsis
+--------
+
+.. code-block:: none
+
+    RESET SESSION AUTHORIZATION
+
+Description
+-----------
+
+Resets the current authorization user back to the original user.
+The original user is usually the authenticated user (principal),
+or it can be the session user when the session user is provided by the client.
+
+See Also
+--------
+
+:doc:`set-session-authorization`
diff --git a/docs/src/main/sphinx/sql/reset-session.md b/docs/src/main/sphinx/sql/reset-session.md
new file mode 100644
index 000000000000..431b78ddabb7
--- /dev/null
+++ b/docs/src/main/sphinx/sql/reset-session.md
@@ -0,0 +1,24 @@
+# RESET SESSION
+
+## Synopsis
+
+```text
+RESET SESSION name
+RESET SESSION catalog.name
+```
+
+## Description
+
+Reset a {ref}`session property <session-properties-definition>` value to the
+default value.
+
+## Examples
+
+```sql
+RESET SESSION optimize_hash_generation;
+RESET SESSION hive.optimized_reader_enabled;
+```
+
+## See also
+
+{doc}`set-session`, {doc}`show-session`
diff --git a/docs/src/main/sphinx/sql/reset-session.rst b/docs/src/main/sphinx/sql/reset-session.rst
deleted file mode 100644
index 2a7484f38ccf..000000000000
--- a/docs/src/main/sphinx/sql/reset-session.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-=============
-RESET SESSION
-=============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    RESET SESSION name
-    RESET SESSION catalog.name
-
-Description
------------
-
-Reset a :ref:`session property <session-properties-definition>` value to the
-default value.
-
-Examples
---------
-
-.. code-block:: sql
-
-    RESET SESSION optimize_hash_generation;
-    RESET SESSION hive.optimized_reader_enabled;
-
-See also
---------
-
-:doc:`set-session`, :doc:`show-session`
diff --git a/docs/src/main/sphinx/sql/revoke-roles.md b/docs/src/main/sphinx/sql/revoke-roles.md
new file mode 100644
index 000000000000..ad215281e106
--- /dev/null
+++ b/docs/src/main/sphinx/sql/revoke-roles.md
@@ -0,0 +1,52 @@
+# REVOKE role
+
+## Synopsis
+
+```text
+REVOKE
+[ ADMIN OPTION FOR ]
+role_name [, ...]
+FROM ( user | USER user | ROLE role) [, ...]
+[ GRANTED BY ( user | USER user | ROLE role | CURRENT_USER | CURRENT_ROLE ) ]
+[ IN catalog ]
+```
+
+## Description
+
+Revokes the specified role(s) from the specified principal(s).
+
+If the `ADMIN OPTION FOR` clause is specified, the `GRANT` permission is
+revoked instead of the role.
+
+For the `REVOKE` statement for roles to succeed, the user executing it either should
+be the role admin or should possess the `GRANT` option for the given role.
+
+The optional `GRANTED BY` clause causes the role(s) to be revoked with
+the specified principal as a revoker. If the `GRANTED BY` clause is not
+specified, the roles are revoked by the current user as a revoker.
+
+The optional `IN catalog` clause revokes the roles in a catalog as opposed
+to a system roles.
+
+## Examples
+
+Revoke role `bar` from user `foo`
+
+```
+REVOKE bar FROM USER foo;
+```
+
+Revoke admin option for roles `bar` and `foo` from user `baz` and role `qux`
+
+```
+REVOKE ADMIN OPTION FOR bar, foo FROM USER baz, ROLE qux;
+```
+
+## Limitations
+
+Some connectors do not support role management.
+See connector documentation for more details.
+
+## See also
+
+{doc}`create-role`, {doc}`drop-role`, {doc}`set-role`, {doc}`grant-roles`
diff --git a/docs/src/main/sphinx/sql/revoke-roles.rst b/docs/src/main/sphinx/sql/revoke-roles.rst
deleted file mode 100644
index 719ae9072f4e..000000000000
--- a/docs/src/main/sphinx/sql/revoke-roles.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-============
-REVOKE ROLES
-============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    REVOKE
-    [ ADMIN OPTION FOR ]
-    role [, ...]
-    FROM ( user | USER user | ROLE role) [, ...]
-    [ GRANTED BY ( user | USER user | ROLE role | CURRENT_USER | CURRENT_ROLE ) ]
-    [ IN catalog ]
-
-Description
------------
-
-Revokes the specified role(s) from the specified principal(s).
-
-If the ``ADMIN OPTION FOR`` clause is specified, the ``GRANT`` permission is
-revoked instead of the role.
-
-For the ``REVOKE`` statement for roles to succeed, the user executing it either should
-be the role admin or should possess the ``GRANT`` option for the given role.
-
-The optional ``GRANTED BY`` clause causes the role(s) to be revoked with
-the specified principal as a revoker. If the ``GRANTED BY`` clause is not
-specified, the roles are revoked by the current user as a revoker.
-
-The optional ``IN catalog`` clause revokes the roles in a catalog as opposed
-to a system roles.
-
-Examples
---------
-
-Revoke role ``bar`` from user ``foo`` ::
-
-    REVOKE bar FROM USER foo;
-
-Revoke admin option for roles ``bar`` and ``foo`` from user ``baz`` and role ``qux`` ::
-
-    REVOKE ADMIN OPTION FOR bar, foo FROM USER baz, ROLE qux;
-
-Limitations
------------
-
-Some connectors do not support role management.
-See connector documentation for more details.
-
-See also
---------
-
-:doc:`create-role`, :doc:`drop-role`, :doc:`set-role`, :doc:`grant-roles`
diff --git a/docs/src/main/sphinx/sql/revoke.md b/docs/src/main/sphinx/sql/revoke.md
new file mode 100644
index 000000000000..57fad9c7c59b
--- /dev/null
+++ b/docs/src/main/sphinx/sql/revoke.md
@@ -0,0 +1,62 @@
+# REVOKE privilege
+
+## Synopsis
+
+```text
+REVOKE [ GRANT OPTION FOR ]
+( privilege [, ...] | ALL PRIVILEGES )
+ON ( table_name | TABLE table_name | SCHEMA schema_name )
+FROM ( user | USER user | ROLE role )
+```
+
+## Description
+
+Revokes the specified privileges from the specified grantee.
+
+Specifying `ALL PRIVILEGES` revokes {doc}`delete`, {doc}`insert` and {doc}`select` privileges.
+
+Specifying `ROLE PUBLIC` revokes privileges from the `PUBLIC` role. Users will retain privileges assigned to them directly or via other roles.
+
+If the optional `GRANT OPTION FOR` clause is specified, only the `GRANT OPTION`
+is removed. Otherwise, both the `GRANT` and `GRANT OPTION` are revoked.
+
+For `REVOKE` statement to succeed, the user executing it should possess the specified privileges as well as the `GRANT OPTION` for those privileges.
+
+Revoke on a table revokes the specified privilege on all columns of the table.
+
+Revoke on a schema revokes the specified privilege on all columns of all tables of the schema.
+
+## Examples
+
+Revoke `INSERT` and `SELECT` privileges on the table `orders` from user `alice`:
+
+```
+REVOKE INSERT, SELECT ON orders FROM alice;
+```
+
+Revoke `DELETE` privilege on the schema `finance` from user `bob`:
+
+```
+REVOKE DELETE ON SCHEMA finance FROM bob;
+```
+
+Revoke `SELECT` privilege on the table `nation` from everyone, additionally revoking the privilege to grant `SELECT` privilege:
+
+```
+REVOKE GRANT OPTION FOR SELECT ON nation FROM ROLE PUBLIC;
+```
+
+Revoke all privileges on the table `test` from user `alice`:
+
+```
+REVOKE ALL PRIVILEGES ON test FROM alice;
+```
+
+## Limitations
+
+Some connectors have no support for `REVOKE`.
+See connector documentation for more details.
+
+## See also
+
+{doc}`deny`, {doc}`grant`, {doc}`show-grants`
diff --git a/docs/src/main/sphinx/sql/revoke.rst b/docs/src/main/sphinx/sql/revoke.rst
deleted file mode 100644
index 68d0ddb17c41..000000000000
--- a/docs/src/main/sphinx/sql/revoke.rst
+++ /dev/null
@@ -1,61 +0,0 @@
-======
-REVOKE
-======
-
-Synopsis
---------
-
-.. code-block:: text
-
-    REVOKE [ GRANT OPTION FOR ]
-    ( privilege [, ...] | ALL PRIVILEGES )
-    ON ( table_name | TABLE table_name | SCHEMA schema_name )
-    FROM ( user | USER user | ROLE role )
-
-Description
------------
-
-Revokes the specified privileges from the specified grantee.
-
-Specifying ``ALL PRIVILEGES`` revokes :doc:`delete`, :doc:`insert` and :doc:`select` privileges.
-
-Specifying ``ROLE PUBLIC`` revokes privileges from the ``PUBLIC`` role. Users will retain privileges assigned to them directly or via other roles.
-
-If the optional ``GRANT OPTION FOR`` clause is specified, only the ``GRANT OPTION``
-is removed. Otherwise, both the ``GRANT`` and ``GRANT OPTION`` are revoked.
-
-For ``REVOKE`` statement to succeed, the user executing it should possess the specified privileges as well as the ``GRANT OPTION`` for those privileges.
-
-Revoke on a table revokes the specified privilege on all columns of the table.
-
-Revoke on a schema revokes the specified privilege on all columns of all tables of the schema.
-
-Examples
---------
-
-Revoke ``INSERT`` and ``SELECT`` privileges on the table ``orders`` from user ``alice``::
-
-    REVOKE INSERT, SELECT ON orders FROM alice;
-
-Revoke ``DELETE`` privilege on the schema ``finance`` from user ``bob``::
-
-    REVOKE DELETE ON SCHEMA finance FROM bob;
-
-Revoke ``SELECT`` privilege on the table ``nation`` from everyone, additionally revoking the privilege to grant ``SELECT`` privilege::
-
-    REVOKE GRANT OPTION FOR SELECT ON nation FROM ROLE PUBLIC;
-
-Revoke all privileges on the table ``test`` from user ``alice``::
-
-    REVOKE ALL PRIVILEGES ON test FROM alice;
-
-Limitations
------------
-
-Some connectors have no support for ``REVOKE``.
-See connector documentation for more details.
-
-See also
---------
-
-:doc:`grant`, :doc:`show-grants`
diff --git a/docs/src/main/sphinx/sql/rollback.md b/docs/src/main/sphinx/sql/rollback.md
new file mode 100644
index 000000000000..abd53cae3fb4
--- /dev/null
+++ b/docs/src/main/sphinx/sql/rollback.md
@@ -0,0 +1,22 @@
+# ROLLBACK
+
+## Synopsis
+
+```text
+ROLLBACK [ WORK ]
+```
+
+## Description
+
+Rollback the current transaction.
+
+## Examples
+
+```sql
+ROLLBACK;
+ROLLBACK WORK;
+```
+
+## See also
+
+{doc}`commit`, {doc}`start-transaction`
diff --git a/docs/src/main/sphinx/sql/rollback.rst b/docs/src/main/sphinx/sql/rollback.rst
deleted file mode 100644
index 61fa40dc8fe9..000000000000
--- a/docs/src/main/sphinx/sql/rollback.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-========
-ROLLBACK
-========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    ROLLBACK [ WORK ]
-
-Description
------------
-
-Rollback the current transaction.
-
-Examples
---------
-
-.. code-block:: sql
-
-    ROLLBACK;
-    ROLLBACK WORK;
-
-See also
---------
-
-:doc:`commit`, :doc:`start-transaction`
diff --git a/docs/src/main/sphinx/sql/select.md b/docs/src/main/sphinx/sql/select.md
new file mode 100644
index 000000000000..c552dee7ea1a
--- /dev/null
+++ b/docs/src/main/sphinx/sql/select.md
@@ -0,0 +1,1441 @@
+# SELECT
+
+## Synopsis
+
+```text
+[ WITH FUNCTION sql_routines ]
+[ WITH [ RECURSIVE ] with_query [, ...] ]
+SELECT [ ALL | DISTINCT ] select_expression [, ...]
+[ FROM from_item [, ...] ]
+[ WHERE condition ]
+[ GROUP BY [ ALL | DISTINCT ] grouping_element [, ...] ]
+[ HAVING condition]
+[ WINDOW window_definition_list]
+[ { UNION | INTERSECT | EXCEPT } [ ALL | DISTINCT ] select ]
+[ ORDER BY expression [ ASC | DESC ] [, ...] ]
+[ OFFSET count [ ROW | ROWS ] ]
+[ LIMIT { count | ALL } ]
+[ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } { ONLY | WITH TIES } ]
+```
+
+where `from_item` is one of
+
+```text
+table_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
+```
+
+```text
+from_item join_type from_item
+  [ ON join_condition | USING ( join_column [, ...] ) ]
+```
+
+```text
+table_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
+  MATCH_RECOGNIZE pattern_recognition_specification
+    [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
+```
+
+For detailed description of `MATCH_RECOGNIZE` clause, see {doc}`pattern
+recognition in FROM clause</sql/match-recognize>`.
+
+```text
+TABLE (table_function_invocation) [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
+```
+
+For description of table functions usage, see {doc}`table functions</functions/table>`.
+
+and `join_type` is one of
+
+```text
+[ INNER ] JOIN
+LEFT [ OUTER ] JOIN
+RIGHT [ OUTER ] JOIN
+FULL [ OUTER ] JOIN
+CROSS JOIN
+```
+
+and `grouping_element` is one of
+
+```text
+()
+expression
+GROUPING SETS ( ( column [, ...] ) [, ...] )
+CUBE ( column [, ...] )
+ROLLUP ( column [, ...] )
+```
+
+## Description
+
+Retrieve rows from zero or more tables.
+
+## WITH FUNCTION clause
+
+The `WITH FUNCTION` clause allows you to define a list of inline SQL routines
+that are available for use in the rest of the query.
+
+The following example declares and uses two inline routines:
+
+```sql
+WITH 
+  FUNCTION hello(name varchar)
+    RETURNS varchar
+    RETURN format('Hello %s!', 'name'),
+  FUNCTION bye(name varchar)
+    RETURNS varchar
+    RETURN format('Bye %s!', 'name')
+SELECT hello('Finn') || ' and ' || bye('Joe');
+-- Hello Finn! and Bye Joe!
+```
+
+Find further information about routines in general, inline routines, all
+supported statements, and examples in [](/routines).
+
+## WITH clause
+
+The `WITH` clause defines named relations for use within a query.
+It allows flattening nested queries or simplifying subqueries.
+For example, the following queries are equivalent:
+
+```
+SELECT a, b
+FROM (
+  SELECT a, MAX(b) AS b FROM t GROUP BY a
+) AS x;
+
+WITH x AS (SELECT a, MAX(b) AS b FROM t GROUP BY a)
+SELECT a, b FROM x;
+```
+
+This also works with multiple subqueries:
+
+```
+WITH
+  t1 AS (SELECT a, MAX(b) AS b FROM x GROUP BY a),
+  t2 AS (SELECT a, AVG(d) AS d FROM y GROUP BY a)
+SELECT t1.*, t2.*
+FROM t1
+JOIN t2 ON t1.a = t2.a;
+```
+
+Additionally, the relations within a `WITH` clause can chain:
+
+```
+WITH
+  x AS (SELECT a FROM t),
+  y AS (SELECT a AS b FROM x),
+  z AS (SELECT b AS c FROM y)
+SELECT c FROM z;
+```
+
+:::{warning}
+Currently, the SQL for the `WITH` clause will be inlined anywhere the named
+relation is used. This means that if the relation is used more than once and the query
+is non-deterministic, the results may be different each time.
+:::
+
+## WITH RECURSIVE clause
+
+The `WITH RECURSIVE` clause is a variant of the `WITH` clause. It defines
+a list of queries to process, including recursive processing of suitable
+queries.
+
+:::{warning}
+This feature is experimental only. Proceed to use it only if you understand
+potential query failures and the impact of the recursion processing on your
+workload.
+:::
+
+A recursive `WITH`-query must be shaped as a `UNION` of two relations. The
+first relation is called the *recursion base*, and the second relation is called
+the *recursion step*. Trino supports recursive `WITH`-queries with a single
+recursive reference to a `WITH`-query from within the query. The name `T` of
+the query `T` can be mentioned once in the `FROM` clause of the recursion
+step relation.
+
+The following listing shows a simple example, that displays a commonly used
+form of a single query in the list:
+
+```text
+WITH RECURSIVE t(n) AS (
+    VALUES (1)
+    UNION ALL
+    SELECT n + 1 FROM t WHERE n < 4
+)
+SELECT sum(n) FROM t;
+```
+
+In the preceding query the simple assignment `VALUES (1)` defines the
+recursion base relation. `SELECT n + 1 FROM t WHERE n < 4` defines the
+recursion step relation. The recursion processing performs these steps:
+
+- recursive base yields `1`
+- first recursion yields `1 + 1 = 2`
+- second recursion uses the result from the first and adds one: `2 + 1 = 3`
+- third recursion uses the result from the second and adds one again:
+  `3 + 1 = 4`
+- fourth recursion aborts since `n = 4`
+- this results in `t` having values `1`, `2`, `3` and `4`
+- the final statement performs the sum operation of these elements with the
+  final result value `10`
+
+The types of the returned columns are those of the base relation. Therefore it
+is required that types in the step relation can be coerced to base relation
+types.
+
+The `RECURSIVE` clause applies to all queries in the `WITH` list, but not
+all of them must be recursive. If a `WITH`-query is not shaped according to
+the rules mentioned above or it does not contain a recursive reference, it is
+processed like a regular `WITH`-query. Column aliases are mandatory for all
+the queries in the recursive `WITH` list.
+
+The following limitations apply as a result of following the SQL standard and
+due to implementation choices, in addition to `WITH` clause limitations:
+
+- only single-element recursive cycles are supported. Like in regular
+  `WITH`-queries, references to previous queries in the `WITH` list are
+  allowed. References to following queries are forbidden.
+- usage of outer joins, set operations, limit clause, and others is not always
+  allowed in the step relation
+- recursion depth is fixed, defaults to `10`, and doesn't depend on the actual
+  query results
+
+You can adjust the recursion depth with the {doc}`session property
+</sql/set-session>` `max_recursion_depth`. When changing the value consider
+that the size of the query plan growth is quadratic with the recursion depth.
+
+## SELECT clause
+
+The `SELECT` clause specifies the output of the query. Each `select_expression`
+defines a column or columns to be included in the result.
+
+```text
+SELECT [ ALL | DISTINCT ] select_expression [, ...]
+```
+
+The `ALL` and `DISTINCT` quantifiers determine whether duplicate rows
+are included in the result set. If the argument `ALL` is specified,
+all rows are included. If the argument `DISTINCT` is specified, only unique
+rows are included in the result set. In this case, each output column must
+be of a type that allows comparison. If neither argument is specified,
+the behavior defaults to `ALL`.
+
+### Select expressions
+
+Each `select_expression` must be in one of the following forms:
+
+```text
+expression [ [ AS ] column_alias ]
+```
+
+```text
+row_expression.* [ AS ( column_alias [, ...] ) ]
+```
+
+```text
+relation.*
+```
+
+```text
+*
+```
+
+In the case of `expression [ [ AS ] column_alias ]`, a single output column
+is defined.
+
+In the case of `row_expression.* [ AS ( column_alias [, ...] ) ]`,
+the `row_expression` is an arbitrary expression of type `ROW`.
+All fields of the row define output columns to be included in the result set.
+
+In the case of `relation.*`, all columns of `relation` are included
+in the result set. In this case column aliases are not allowed.
+
+In the case of `*`, all columns of the relation defined by the query
+are included in the result set.
+
+In the result set, the order of columns is the same as the order of their
+specification by the select expressions. If a select expression returns multiple
+columns, they are ordered the same way they were ordered in the source
+relation or row type expression.
+
+If column aliases are specified, they override any preexisting column
+or row field names:
+
+```
+SELECT (CAST(ROW(1, true) AS ROW(field1 bigint, field2 boolean))).* AS (alias1, alias2);
+```
+
+```text
+ alias1 | alias2
+--------+--------
+      1 | true
+(1 row)
+```
+
+Otherwise, the existing names are used:
+
+```
+SELECT (CAST(ROW(1, true) AS ROW(field1 bigint, field2 boolean))).*;
+```
+
+```text
+ field1 | field2
+--------+--------
+      1 | true
+(1 row)
+```
+
+and in their absence, anonymous columns are produced:
+
+```
+SELECT (ROW(1, true)).*;
+```
+
+```text
+ _col0 | _col1
+-------+-------
+     1 | true
+(1 row)
+```
+
+## GROUP BY clause
+
+The `GROUP BY` clause divides the output of a `SELECT` statement into
+groups of rows containing matching values. A simple `GROUP BY` clause may
+contain any expression composed of input columns or it may be an ordinal
+number selecting an output column by position (starting at one).
+
+The following queries are equivalent. They both group the output by
+the `nationkey` input column with the first query using the ordinal
+position of the output column and the second query using the input
+column name:
+
+```
+SELECT count(*), nationkey FROM customer GROUP BY 2;
+
+SELECT count(*), nationkey FROM customer GROUP BY nationkey;
+```
+
+`GROUP BY` clauses can group output by input column names not appearing in
+the output of a select statement. For example, the following query generates
+row counts for the `customer` table using the input column `mktsegment`:
+
+```
+SELECT count(*) FROM customer GROUP BY mktsegment;
+```
+
+```text
+ _col0
+-------
+ 29968
+ 30142
+ 30189
+ 29949
+ 29752
+(5 rows)
+```
+
+When a `GROUP BY` clause is used in a `SELECT` statement all output
+expressions must be either aggregate functions or columns present in
+the `GROUP BY` clause.
+
+(complex-grouping-operations)=
+
+### Complex grouping operations
+
+Trino also supports complex aggregations using the `GROUPING SETS`, `CUBE`
+and `ROLLUP` syntax. This syntax allows users to perform analysis that requires
+aggregation on multiple sets of columns in a single query. Complex grouping
+operations do not support grouping on expressions composed of input columns.
+Only column names are allowed.
+
+Complex grouping operations are often equivalent to a `UNION ALL` of simple
+`GROUP BY` expressions, as shown in the following examples. This equivalence
+does not apply, however, when the source of data for the aggregation
+is non-deterministic.
+
+### GROUPING SETS
+
+Grouping sets allow users to specify multiple lists of columns to group on.
+The columns not part of a given sublist of grouping columns are set to `NULL`.
+
+```
+SELECT * FROM shipping;
+```
+
+```text
+ origin_state | origin_zip | destination_state | destination_zip | package_weight
+--------------+------------+-------------------+-----------------+----------------
+ California   |      94131 | New Jersey        |            8648 |             13
+ California   |      94131 | New Jersey        |            8540 |             42
+ New Jersey   |       7081 | Connecticut       |            6708 |            225
+ California   |      90210 | Connecticut       |            6927 |           1337
+ California   |      94131 | Colorado          |           80302 |              5
+ New York     |      10002 | New Jersey        |            8540 |              3
+(6 rows)
+```
+
+`GROUPING SETS` semantics are demonstrated by this example query:
+
+```
+SELECT origin_state, origin_zip, destination_state, sum(package_weight)
+FROM shipping
+GROUP BY GROUPING SETS (
+    (origin_state),
+    (origin_state, origin_zip),
+    (destination_state));
+```
+
+```text
+ origin_state | origin_zip | destination_state | _col0
+--------------+------------+-------------------+-------
+ New Jersey   | NULL       | NULL              |   225
+ California   | NULL       | NULL              |  1397
+ New York     | NULL       | NULL              |     3
+ California   |      90210 | NULL              |  1337
+ California   |      94131 | NULL              |    60
+ New Jersey   |       7081 | NULL              |   225
+ New York     |      10002 | NULL              |     3
+ NULL         | NULL       | Colorado          |     5
+ NULL         | NULL       | New Jersey        |    58
+ NULL         | NULL       | Connecticut       |  1562
+(10 rows)
+```
+
+The preceding query may be considered logically equivalent to a `UNION ALL` of
+multiple `GROUP BY` queries:
+
+```
+SELECT origin_state, NULL, NULL, sum(package_weight)
+FROM shipping GROUP BY origin_state
+
+UNION ALL
+
+SELECT origin_state, origin_zip, NULL, sum(package_weight)
+FROM shipping GROUP BY origin_state, origin_zip
+
+UNION ALL
+
+SELECT NULL, NULL, destination_state, sum(package_weight)
+FROM shipping GROUP BY destination_state;
+```
+
+However, the query with the complex grouping syntax (`GROUPING SETS`, `CUBE`
+or `ROLLUP`) will only read from the underlying data source once, while the
+query with the `UNION ALL` reads the underlying data three times. This is why
+queries with a `UNION ALL` may produce inconsistent results when the data
+source is not deterministic.
+
+### CUBE
+
+The `CUBE` operator generates all possible grouping sets (i.e. a power set)
+for a given set of columns. For example, the query:
+
+```
+SELECT origin_state, destination_state, sum(package_weight)
+FROM shipping
+GROUP BY CUBE (origin_state, destination_state);
+```
+
+is equivalent to:
+
+```
+SELECT origin_state, destination_state, sum(package_weight)
+FROM shipping
+GROUP BY GROUPING SETS (
+    (origin_state, destination_state),
+    (origin_state),
+    (destination_state),
+    ()
+);
+```
+
+```text
+ origin_state | destination_state | _col0
+--------------+-------------------+-------
+ California   | New Jersey        |    55
+ California   | Colorado          |     5
+ New York     | New Jersey        |     3
+ New Jersey   | Connecticut       |   225
+ California   | Connecticut       |  1337
+ California   | NULL              |  1397
+ New York     | NULL              |     3
+ New Jersey   | NULL              |   225
+ NULL         | New Jersey        |    58
+ NULL         | Connecticut       |  1562
+ NULL         | Colorado          |     5
+ NULL         | NULL              |  1625
+(12 rows)
+```
+
+### ROLLUP
+
+The `ROLLUP` operator generates all possible subtotals for a given set of
+columns. For example, the query:
+
+```
+SELECT origin_state, origin_zip, sum(package_weight)
+FROM shipping
+GROUP BY ROLLUP (origin_state, origin_zip);
+```
+
+```text
+ origin_state | origin_zip | _col2
+--------------+------------+-------
+ California   |      94131 |    60
+ California   |      90210 |  1337
+ New Jersey   |       7081 |   225
+ New York     |      10002 |     3
+ California   | NULL       |  1397
+ New York     | NULL       |     3
+ New Jersey   | NULL       |   225
+ NULL         | NULL       |  1625
+(8 rows)
+```
+
+is equivalent to:
+
+```
+SELECT origin_state, origin_zip, sum(package_weight)
+FROM shipping
+GROUP BY GROUPING SETS ((origin_state, origin_zip), (origin_state), ());
+```
+
+### Combining multiple grouping expressions
+
+Multiple grouping expressions in the same query are interpreted as having
+cross-product semantics. For example, the following query:
+
+```
+SELECT origin_state, destination_state, origin_zip, sum(package_weight)
+FROM shipping
+GROUP BY
+    GROUPING SETS ((origin_state, destination_state)),
+    ROLLUP (origin_zip);
+```
+
+which can be rewritten as:
+
+```
+SELECT origin_state, destination_state, origin_zip, sum(package_weight)
+FROM shipping
+GROUP BY
+    GROUPING SETS ((origin_state, destination_state)),
+    GROUPING SETS ((origin_zip), ());
+```
+
+is logically equivalent to:
+
+```
+SELECT origin_state, destination_state, origin_zip, sum(package_weight)
+FROM shipping
+GROUP BY GROUPING SETS (
+    (origin_state, destination_state, origin_zip),
+    (origin_state, destination_state)
+);
+```
+
+```text
+ origin_state | destination_state | origin_zip | _col3
+--------------+-------------------+------------+-------
+ New York     | New Jersey        |      10002 |     3
+ California   | New Jersey        |      94131 |    55
+ New Jersey   | Connecticut       |       7081 |   225
+ California   | Connecticut       |      90210 |  1337
+ California   | Colorado          |      94131 |     5
+ New York     | New Jersey        | NULL       |     3
+ New Jersey   | Connecticut       | NULL       |   225
+ California   | Colorado          | NULL       |     5
+ California   | Connecticut       | NULL       |  1337
+ California   | New Jersey        | NULL       |    55
+(10 rows)
+```
+
+The `ALL` and `DISTINCT` quantifiers determine whether duplicate grouping
+sets each produce distinct output rows. This is particularly useful when
+multiple complex grouping sets are combined in the same query. For example, the
+following query:
+
+```
+SELECT origin_state, destination_state, origin_zip, sum(package_weight)
+FROM shipping
+GROUP BY ALL
+    CUBE (origin_state, destination_state),
+    ROLLUP (origin_state, origin_zip);
+```
+
+is equivalent to:
+
+```
+SELECT origin_state, destination_state, origin_zip, sum(package_weight)
+FROM shipping
+GROUP BY GROUPING SETS (
+    (origin_state, destination_state, origin_zip),
+    (origin_state, origin_zip),
+    (origin_state, destination_state, origin_zip),
+    (origin_state, origin_zip),
+    (origin_state, destination_state),
+    (origin_state),
+    (origin_state, destination_state),
+    (origin_state),
+    (origin_state, destination_state),
+    (origin_state),
+    (destination_state),
+    ()
+);
+```
+
+However, if the query uses the `DISTINCT` quantifier for the `GROUP BY`:
+
+```
+SELECT origin_state, destination_state, origin_zip, sum(package_weight)
+FROM shipping
+GROUP BY DISTINCT
+    CUBE (origin_state, destination_state),
+    ROLLUP (origin_state, origin_zip);
+```
+
+only unique grouping sets are generated:
+
+```
+SELECT origin_state, destination_state, origin_zip, sum(package_weight)
+FROM shipping
+GROUP BY GROUPING SETS (
+    (origin_state, destination_state, origin_zip),
+    (origin_state, origin_zip),
+    (origin_state, destination_state),
+    (origin_state),
+    (destination_state),
+    ()
+);
+```
+
+The default set quantifier is `ALL`.
+
+### GROUPING operation
+
+`grouping(col1, ..., colN) -> bigint`
+
+The grouping operation returns a bit set converted to decimal, indicating which columns are present in a
+grouping. It must be used in conjunction with `GROUPING SETS`, `ROLLUP`, `CUBE`  or `GROUP BY`
+and its arguments must match exactly the columns referenced in the corresponding `GROUPING SETS`,
+`ROLLUP`, `CUBE` or `GROUP BY` clause.
+
+To compute the resulting bit set for a particular row, bits are assigned to the argument columns with
+the rightmost column being the least significant bit. For a given grouping, a bit is set to 0 if the
+corresponding column is included in the grouping and to 1 otherwise. For example, consider the query
+below:
+
+```
+SELECT origin_state, origin_zip, destination_state, sum(package_weight),
+       grouping(origin_state, origin_zip, destination_state)
+FROM shipping
+GROUP BY GROUPING SETS (
+    (origin_state),
+    (origin_state, origin_zip),
+    (destination_state)
+);
+```
+
+```text
+origin_state | origin_zip | destination_state | _col3 | _col4
+--------------+------------+-------------------+-------+-------
+California   | NULL       | NULL              |  1397 |     3
+New Jersey   | NULL       | NULL              |   225 |     3
+New York     | NULL       | NULL              |     3 |     3
+California   |      94131 | NULL              |    60 |     1
+New Jersey   |       7081 | NULL              |   225 |     1
+California   |      90210 | NULL              |  1337 |     1
+New York     |      10002 | NULL              |     3 |     1
+NULL         | NULL       | New Jersey        |    58 |     6
+NULL         | NULL       | Connecticut       |  1562 |     6
+NULL         | NULL       | Colorado          |     5 |     6
+(10 rows)
+```
+
+The first grouping in the above result only includes the `origin_state` column and excludes
+the `origin_zip` and `destination_state` columns. The bit set constructed for that grouping
+is `011` where the most significant bit represents `origin_state`.
+
+## HAVING clause
+
+The `HAVING` clause is used in conjunction with aggregate functions and
+the `GROUP BY` clause to control which groups are selected. A `HAVING`
+clause eliminates groups that do not satisfy the given conditions.
+`HAVING` filters groups after groups and aggregates are computed.
+
+The following example queries the `customer` table and selects groups
+with an account balance greater than the specified value:
+
+```
+SELECT count(*), mktsegment, nationkey,
+       CAST(sum(acctbal) AS bigint) AS totalbal
+FROM customer
+GROUP BY mktsegment, nationkey
+HAVING sum(acctbal) > 5700000
+ORDER BY totalbal DESC;
+```
+
+```text
+ _col0 | mktsegment | nationkey | totalbal
+-------+------------+-----------+----------
+  1272 | AUTOMOBILE |        19 |  5856939
+  1253 | FURNITURE  |        14 |  5794887
+  1248 | FURNITURE  |         9 |  5784628
+  1243 | FURNITURE  |        12 |  5757371
+  1231 | HOUSEHOLD  |         3 |  5753216
+  1251 | MACHINERY  |         2 |  5719140
+  1247 | FURNITURE  |         8 |  5701952
+(7 rows)
+```
+
+(window-clause)=
+
+## WINDOW clause
+
+The `WINDOW` clause is used to define named window specifications. The defined named
+window specifications can be referred to in the `SELECT` and `ORDER BY` clauses
+of the enclosing query:
+
+```
+SELECT orderkey, clerk, totalprice,
+      rank() OVER w AS rnk
+FROM orders
+WINDOW w AS (PARTITION BY clerk ORDER BY totalprice DESC)
+ORDER BY count() OVER w, clerk, rnk
+```
+
+The window definition list of `WINDOW` clause can contain one or multiple named window
+specifications of the form
+
+```none
+window_name AS (window_specification)
+```
+
+A window specification has the following components:
+
+- The existing window name, which refers to a named window specification in the
+  `WINDOW` clause. The window specification associated with the referenced name
+  is the basis of the current specification.
+- The partition specification, which separates the input rows into different
+  partitions. This is analogous to how the `GROUP BY` clause separates rows
+  into different groups for aggregate functions.
+- The ordering specification, which determines the order in which input rows
+  will be processed by the window function.
+- The window frame, which specifies a sliding window of rows to be processed
+  by the function for a given row. If the frame is not specified, it defaults
+  to `RANGE UNBOUNDED PRECEDING`, which is the same as
+  `RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW`. This frame contains all
+  rows from the start of the partition up to the last peer of the current row.
+  In the absence of `ORDER BY`, all rows are considered peers, so `RANGE
+  BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW` is equivalent to `BETWEEN
+  UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING`. The window frame syntax
+  supports additional clauses for row pattern recognition. If the row pattern
+  recognition clauses are specified, the window frame for a particular row
+  consists of the rows matched by a pattern starting from that row.
+  Additionally, if the frame specifies row pattern measures, they can be
+  called over the window, similarly to window functions. For more details, see
+  [Row pattern recognition in window structures](/sql/pattern-recognition-in-window) .
+
+Each window component is optional. If a window specification does not specify
+window partitioning, ordering or frame, those components are obtained from
+the window specification referenced by the `existing window name`, or from
+another window specification in the reference chain. In case when there is no
+`existing window name` specified, or none of the referenced window
+specifications contains the component, the default value is used.
+
+## Set operations
+
+`UNION`  `INTERSECT` and `EXCEPT` are all set operations.  These clauses are used
+to combine the results of more than one select statement into a single result set:
+
+```text
+query UNION [ALL | DISTINCT] query
+```
+
+```text
+query INTERSECT [ALL | DISTINCT] query
+```
+
+```text
+query EXCEPT [ALL | DISTINCT] query
+```
+
+The argument `ALL` or `DISTINCT` controls which rows are included in
+the final result set. If the argument `ALL` is specified all rows are
+included even if the rows are identical.  If the argument `DISTINCT`
+is specified only unique rows are included in the combined result set.
+If neither is specified, the behavior defaults to `DISTINCT`.
+
+Multiple set operations are processed left to right, unless the order is explicitly
+specified via parentheses. Additionally, `INTERSECT` binds more tightly
+than `EXCEPT` and `UNION`. That means `A UNION B INTERSECT C EXCEPT D`
+is the same as `A UNION (B INTERSECT C) EXCEPT D`.
+
+### UNION clause
+
+`UNION` combines all the rows that are in the result set from the
+first query with those that are in the result set for the second query.
+The following is an example of one of the simplest possible `UNION` clauses.
+It selects the value `13` and combines this result set with a second query
+that selects the value `42`:
+
+```
+SELECT 13
+UNION
+SELECT 42;
+```
+
+```text
+ _col0
+-------
+    13
+    42
+(2 rows)
+```
+
+The following query demonstrates the difference between `UNION` and `UNION ALL`.
+It selects the value `13` and combines this result set with a second query that
+selects the values `42` and `13`:
+
+```
+SELECT 13
+UNION
+SELECT * FROM (VALUES 42, 13);
+```
+
+```text
+ _col0
+-------
+    13
+    42
+(2 rows)
+```
+
+```
+SELECT 13
+UNION ALL
+SELECT * FROM (VALUES 42, 13);
+```
+
+```text
+ _col0
+-------
+    13
+    42
+    13
+(2 rows)
+```
+
+### INTERSECT clause
+
+`INTERSECT` returns only the rows that are in the result sets of both the first and
+the second queries. The following is an example of one of the simplest
+possible `INTERSECT` clauses. It selects the values `13` and `42` and combines
+this result set with a second query that selects the value `13`.  Since `42`
+is only in the result set of the first query, it is not included in the final results.:
+
+```
+SELECT * FROM (VALUES 13, 42)
+INTERSECT
+SELECT 13;
+```
+
+```text
+ _col0
+-------
+    13
+(2 rows)
+```
+
+### EXCEPT clause
+
+`EXCEPT` returns the rows that are in the result set of the first query,
+but not the second. The following is an example of one of the simplest
+possible `EXCEPT` clauses. It selects the values `13` and `42` and combines
+this result set with a second query that selects the value `13`.  Since `13`
+is also in the result set of the second query, it is not included in the final result.:
+
+```
+SELECT * FROM (VALUES 13, 42)
+EXCEPT
+SELECT 13;
+```
+
+```text
+ _col0
+-------
+   42
+(2 rows)
+```
+
+(order-by-clause)=
+
+## ORDER BY clause
+
+The `ORDER BY` clause is used to sort a result set by one or more
+output expressions:
+
+```text
+ORDER BY expression [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [, ...]
+```
+
+Each expression may be composed of output columns, or it may be an ordinal
+number selecting an output column by position, starting at one. The
+`ORDER BY` clause is evaluated after any `GROUP BY` or `HAVING` clause,
+and before any `OFFSET`, `LIMIT` or `FETCH FIRST` clause.
+The default null ordering is `NULLS LAST`, regardless of the ordering direction.
+
+Note that, following the SQL specification, an `ORDER BY` clause only
+affects the order of rows for queries that immediately contain the clause.
+Trino follows that specification, and drops redundant usage of the clause to
+avoid negative performance impacts.
+
+In the following example, the clause only applies to the select statement.
+
+```SQL
+INSERT INTO some_table
+SELECT * FROM another_table
+ORDER BY field;
+```
+
+Since tables in SQL are inherently unordered, and the `ORDER BY` clause in
+this case does not result in any difference, but negatively impacts performance
+of running the overall insert statement, Trino skips the sort operation.
+
+Another example where the `ORDER BY` clause is redundant, and does not affect
+the outcome of the overall statement, is a nested query:
+
+```SQL
+SELECT *
+FROM some_table
+    JOIN (SELECT * FROM another_table ORDER BY field) u
+    ON some_table.key = u.key;
+```
+
+More background information and details can be found in
+[a blog post about this optimization](https://trino.io/blog/2019/06/03/redundant-order-by.html).
+
+(offset-clause)=
+
+## OFFSET clause
+
+The `OFFSET` clause is used to discard a number of leading rows
+from the result set:
+
+```text
+OFFSET count [ ROW | ROWS ]
+```
+
+If the `ORDER BY` clause is present, the `OFFSET` clause is evaluated
+over a sorted result set, and the set remains sorted after the
+leading rows are discarded:
+
+```
+SELECT name FROM nation ORDER BY name OFFSET 22;
+```
+
+```text
+      name
+----------------
+ UNITED KINGDOM
+ UNITED STATES
+ VIETNAM
+(3 rows)
+```
+
+Otherwise, it is arbitrary which rows are discarded.
+If the count specified in the `OFFSET` clause equals or exceeds the size
+of the result set, the final result is empty.
+
+(limit-clause)=
+
+## LIMIT or FETCH FIRST clause
+
+The `LIMIT` or `FETCH FIRST` clause restricts the number of rows
+in the result set.
+
+```text
+LIMIT { count | ALL }
+```
+
+```text
+FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } { ONLY | WITH TIES }
+```
+
+The following example queries a large table, but the `LIMIT` clause
+restricts the output to only have five rows (because the query lacks an `ORDER BY`,
+exactly which rows are returned is arbitrary):
+
+```
+SELECT orderdate FROM orders LIMIT 5;
+```
+
+```text
+ orderdate
+------------
+ 1994-07-25
+ 1993-11-12
+ 1992-10-06
+ 1994-01-04
+ 1997-12-28
+(5 rows)
+```
+
+`LIMIT ALL` is the same as omitting the `LIMIT` clause.
+
+The `FETCH FIRST` clause supports either the `FIRST` or `NEXT` keywords
+and the `ROW` or `ROWS` keywords. These keywords are equivalent and
+the choice of keyword has no effect on query execution.
+
+If the count is not specified in the `FETCH FIRST` clause, it defaults to `1`:
+
+```
+SELECT orderdate FROM orders FETCH FIRST ROW ONLY;
+```
+
+```text
+ orderdate
+------------
+ 1994-02-12
+(1 row)
+```
+
+If the `OFFSET` clause is present, the `LIMIT` or `FETCH FIRST` clause
+is evaluated after the `OFFSET` clause:
+
+```
+SELECT * FROM (VALUES 5, 2, 4, 1, 3) t(x) ORDER BY x OFFSET 2 LIMIT 2;
+```
+
+```text
+ x
+---
+ 3
+ 4
+(2 rows)
+```
+
+For the `FETCH FIRST` clause, the argument `ONLY` or `WITH TIES`
+controls which rows are included in the result set.
+
+If the argument `ONLY` is specified, the result set is limited to the exact
+number of leading rows determined by the count.
+
+If the argument `WITH TIES` is specified, it is required that the `ORDER BY`
+clause be present. The result set consists of the same set of leading rows
+and all of the rows in the same peer group as the last of them ('ties')
+as established by the ordering in the `ORDER BY` clause. The result set is sorted:
+
+```
+SELECT name, regionkey
+FROM nation
+ORDER BY regionkey FETCH FIRST ROW WITH TIES;
+```
+
+```text
+    name    | regionkey
+------------+-----------
+ ETHIOPIA   |         0
+ MOROCCO    |         0
+ KENYA      |         0
+ ALGERIA    |         0
+ MOZAMBIQUE |         0
+(5 rows)
+```
+
+## TABLESAMPLE
+
+There are multiple sample methods:
+
+`BERNOULLI`
+
+: Each row is selected to be in the table sample with a probability of
+  the sample percentage. When a table is sampled using the Bernoulli
+  method, all physical blocks of the table are scanned and certain
+  rows are skipped (based on a comparison between the sample percentage
+  and a random value calculated at runtime).
+
+  The probability of a row being included in the result is independent
+  from any other row. This does not reduce the time required to read
+  the sampled table from disk. It may have an impact on the total
+  query time if the sampled output is processed further.
+
+`SYSTEM`
+
+: This sampling method divides the table into logical segments of data
+  and samples the table at this granularity. This sampling method either
+  selects all the rows from a particular segment of data or skips it
+  (based on a comparison between the sample percentage and a random
+  value calculated at runtime).
+
+  The rows selected in a system sampling will be dependent on which
+  connector is used. For example, when used with Hive, it is dependent
+  on how the data is laid out on HDFS. This method does not guarantee
+  independent sampling probabilities.
+
+:::{note}
+Neither of the two methods allow deterministic bounds on the number of rows returned.
+:::
+
+Examples:
+
+```
+SELECT *
+FROM users TABLESAMPLE BERNOULLI (50);
+
+SELECT *
+FROM users TABLESAMPLE SYSTEM (75);
+```
+
+Using sampling with joins:
+
+```
+SELECT o.*, i.*
+FROM orders o TABLESAMPLE SYSTEM (10)
+JOIN lineitem i TABLESAMPLE BERNOULLI (40)
+  ON o.orderkey = i.orderkey;
+```
+
+(unnest)=
+
+## UNNEST
+
+`UNNEST` can be used to expand an {ref}`array-type` or {ref}`map-type` into a relation.
+Arrays are expanded into a single column:
+
+```
+SELECT * FROM UNNEST(ARRAY[1,2]) AS t(number);
+```
+
+```text
+ number
+--------
+      1
+      2
+(2 rows)
+```
+
+Maps are expanded into two columns (key, value):
+
+```
+SELECT * FROM UNNEST(
+        map_from_entries(
+            ARRAY[
+                ('SQL',1974),
+                ('Java', 1995)
+            ]
+        )
+) AS t(language, first_appeared_year);
+```
+
+```text
+ language | first_appeared_year
+----------+---------------------
+ SQL      |                1974
+ Java     |                1995
+(2 rows)
+```
+
+`UNNEST` can be used in combination with an `ARRAY` of {ref}`row-type` structures for expanding each
+field of the `ROW` into a corresponding column:
+
+```
+SELECT *
+FROM UNNEST(
+        ARRAY[
+            ROW('Java',  1995),
+            ROW('SQL' , 1974)],
+        ARRAY[
+            ROW(false),
+            ROW(true)]
+) as t(language,first_appeared_year,declarative);
+```
+
+```text
+ language | first_appeared_year | declarative
+----------+---------------------+-------------
+ Java     |                1995 | false
+ SQL      |                1974 | true
+(2 rows)
+```
+
+`UNNEST` can optionally have a `WITH ORDINALITY` clause, in which case an additional ordinality column
+is added to the end:
+
+```
+SELECT a, b, rownumber
+FROM UNNEST (
+    ARRAY[2, 5],
+    ARRAY[7, 8, 9]
+     ) WITH ORDINALITY AS t(a, b, rownumber);
+```
+
+```text
+  a   | b | rownumber
+------+---+-----------
+    2 | 7 |         1
+    5 | 8 |         2
+ NULL | 9 |         3
+(3 rows)
+```
+
+`UNNEST` returns zero entries when the array/map is empty:
+
+```
+SELECT * FROM UNNEST (ARRAY[]) AS t(value);
+```
+
+```text
+ value
+-------
+(0 rows)
+```
+
+`UNNEST` returns zero entries when the array/map is null:
+
+```
+SELECT * FROM UNNEST (CAST(null AS ARRAY(integer))) AS t(number);
+```
+
+```text
+ number
+--------
+(0 rows)
+```
+
+`UNNEST` is normally used with a `JOIN`, and can reference columns
+from relations on the left side of the join:
+
+```
+SELECT student, score
+FROM (
+   VALUES
+      ('John', ARRAY[7, 10, 9]),
+      ('Mary', ARRAY[4, 8, 9])
+) AS tests (student, scores)
+CROSS JOIN UNNEST(scores) AS t(score);
+```
+
+```text
+ student | score
+---------+-------
+ John    |     7
+ John    |    10
+ John    |     9
+ Mary    |     4
+ Mary    |     8
+ Mary    |     9
+(6 rows)
+```
+
+`UNNEST` can also be used with multiple arguments, in which case they are expanded into multiple columns,
+with as many rows as the highest cardinality argument (the other columns are padded with nulls):
+
+```
+SELECT numbers, animals, n, a
+FROM (
+  VALUES
+    (ARRAY[2, 5], ARRAY['dog', 'cat', 'bird']),
+    (ARRAY[7, 8, 9], ARRAY['cow', 'pig'])
+) AS x (numbers, animals)
+CROSS JOIN UNNEST(numbers, animals) AS t (n, a);
+```
+
+```text
+  numbers  |     animals      |  n   |  a
+-----------+------------------+------+------
+ [2, 5]    | [dog, cat, bird] |    2 | dog
+ [2, 5]    | [dog, cat, bird] |    5 | cat
+ [2, 5]    | [dog, cat, bird] | NULL | bird
+ [7, 8, 9] | [cow, pig]       |    7 | cow
+ [7, 8, 9] | [cow, pig]       |    8 | pig
+ [7, 8, 9] | [cow, pig]       |    9 | NULL
+(6 rows)
+```
+
+`LEFT JOIN` is preferable in order to avoid losing the the row containing the array/map field in question
+when referenced columns from relations on the left side of the join can be empty or have `NULL` values:
+
+```
+SELECT runner, checkpoint
+FROM (
+   VALUES
+      ('Joe', ARRAY[10, 20, 30, 42]),
+      ('Roger', ARRAY[10]),
+      ('Dave', ARRAY[]),
+      ('Levi', NULL)
+) AS marathon (runner, checkpoints)
+LEFT JOIN UNNEST(checkpoints) AS t(checkpoint) ON TRUE;
+```
+
+```text
+ runner | checkpoint
+--------+------------
+ Joe    |         10
+ Joe    |         20
+ Joe    |         30
+ Joe    |         42
+ Roger  |         10
+ Dave   |       NULL
+ Levi   |       NULL
+(7 rows)
+```
+
+Note that in case of using `LEFT JOIN` the only condition supported by the current implementation is `ON TRUE`.
+
+## Joins
+
+Joins allow you to combine data from multiple relations.
+
+### CROSS JOIN
+
+A cross join returns the Cartesian product (all combinations) of two
+relations. Cross joins can either be specified using the explit
+`CROSS JOIN` syntax or by specifying multiple relations in the
+`FROM` clause.
+
+Both of the following queries are equivalent:
+
+```
+SELECT *
+FROM nation
+CROSS JOIN region;
+
+SELECT *
+FROM nation, region;
+```
+
+The `nation` table contains 25 rows and the `region` table contains 5 rows,
+so a cross join between the two tables produces 125 rows:
+
+```
+SELECT n.name AS nation, r.name AS region
+FROM nation AS n
+CROSS JOIN region AS r
+ORDER BY 1, 2;
+```
+
+```text
+     nation     |   region
+----------------+-------------
+ ALGERIA        | AFRICA
+ ALGERIA        | AMERICA
+ ALGERIA        | ASIA
+ ALGERIA        | EUROPE
+ ALGERIA        | MIDDLE EAST
+ ARGENTINA      | AFRICA
+ ARGENTINA      | AMERICA
+...
+(125 rows)
+```
+
+### LATERAL
+
+Subqueries appearing in the `FROM` clause can be preceded by the keyword `LATERAL`.
+This allows them to reference columns provided by preceding `FROM` items.
+
+A `LATERAL` join can appear at the top level in the `FROM` list, or anywhere
+within a parenthesized join tree. In the latter case, it can also refer to any items
+that are on the left-hand side of a `JOIN` for which it is on the right-hand side.
+
+When a `FROM` item contains `LATERAL` cross-references, evaluation proceeds as follows:
+for each row of the `FROM` item providing the cross-referenced columns,
+the `LATERAL` item is evaluated using that row set's values of the columns.
+The resulting rows are joined as usual with the rows they were computed from.
+This is repeated for set of rows from the column source tables.
+
+`LATERAL` is primarily useful when the cross-referenced column is necessary for
+computing the rows to be joined:
+
+```
+SELECT name, x, y
+FROM nation
+CROSS JOIN LATERAL (SELECT name || ' :-' AS x)
+CROSS JOIN LATERAL (SELECT x || ')' AS y);
+```
+
+### Qualifying column names
+
+When two relations in a join have columns with the same name, the column
+references must be qualified using the relation alias (if the relation
+has an alias), or with the relation name:
+
+```
+SELECT nation.name, region.name
+FROM nation
+CROSS JOIN region;
+
+SELECT n.name, r.name
+FROM nation AS n
+CROSS JOIN region AS r;
+
+SELECT n.name, r.name
+FROM nation n
+CROSS JOIN region r;
+```
+
+The following query will fail with the error `Column 'name' is ambiguous`:
+
+```
+SELECT name
+FROM nation
+CROSS JOIN region;
+```
+
+## Subqueries
+
+A subquery is an expression which is composed of a query. The subquery
+is correlated when it refers to columns outside of the subquery.
+Logically, the subquery will be evaluated for each row in the surrounding
+query. The referenced columns will thus be constant during any single
+evaluation of the subquery.
+
+:::{note}
+Support for correlated subqueries is limited. Not every standard form is supported.
+:::
+
+### EXISTS
+
+The `EXISTS` predicate determines if a subquery returns any rows:
+
+```
+SELECT name
+FROM nation
+WHERE EXISTS (
+     SELECT *
+     FROM region
+     WHERE region.regionkey = nation.regionkey
+);
+```
+
+### IN
+
+The `IN` predicate determines if any values produced by the subquery
+are equal to the provided expression. The result of `IN` follows the
+standard rules for nulls. The subquery must produce exactly one column:
+
+```
+SELECT name
+FROM nation
+WHERE regionkey IN (
+     SELECT regionkey
+     FROM region
+     WHERE name = 'AMERICA' OR name = 'AFRICA'
+);
+```
+
+### Scalar subquery
+
+A scalar subquery is a non-correlated subquery that returns zero or
+one row. It is an error for the subquery to produce more than one
+row. The returned value is `NULL` if the subquery produces no rows:
+
+```
+SELECT name
+FROM nation
+WHERE regionkey = (SELECT max(regionkey) FROM region);
+```
+
+:::{note}
+Currently only single column can be returned from the scalar subquery.
+:::
diff --git a/docs/src/main/sphinx/sql/select.rst b/docs/src/main/sphinx/sql/select.rst
deleted file mode 100644
index ad41bfcf71ad..000000000000
--- a/docs/src/main/sphinx/sql/select.rst
+++ /dev/null
@@ -1,1344 +0,0 @@
-======
-SELECT
-======
-
-Synopsis
---------
-
-.. code-block:: text
-
-    [ WITH [ RECURSIVE ] with_query [, ...] ]
-    SELECT [ ALL | DISTINCT ] select_expression [, ...]
-    [ FROM from_item [, ...] ]
-    [ WHERE condition ]
-    [ GROUP BY [ ALL | DISTINCT ] grouping_element [, ...] ]
-    [ HAVING condition]
-    [ WINDOW window_definition_list]
-    [ { UNION | INTERSECT | EXCEPT } [ ALL | DISTINCT ] select ]
-    [ ORDER BY expression [ ASC | DESC ] [, ...] ]
-    [ OFFSET count [ ROW | ROWS ] ]
-    [ LIMIT { count | ALL } ]
-    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } { ONLY | WITH TIES } ]
-
-where ``from_item`` is one of
-
-.. code-block:: text
-
-    table_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
-
-.. code-block:: text
-
-    from_item join_type from_item
-      [ ON join_condition | USING ( join_column [, ...] ) ]
-
-.. code-block:: text
-
-    table_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
-      MATCH_RECOGNIZE pattern_recognition_specification
-        [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
-
-For detailed description of ``MATCH_RECOGNIZE`` clause, see :doc:`pattern
-recognition in FROM clause</sql/match-recognize>`.
-
-.. code-block:: text
-
-    TABLE (table_function_invocation) [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
-
-For description of table functions usage, see :doc:`table functions</functions/table>`.
-
-and ``join_type`` is one of
-
-.. code-block:: text
-
-    [ INNER ] JOIN
-    LEFT [ OUTER ] JOIN
-    RIGHT [ OUTER ] JOIN
-    FULL [ OUTER ] JOIN
-    CROSS JOIN
-
-and ``grouping_element`` is one of
-
-.. code-block:: text
-
-    ()
-    expression
-    GROUPING SETS ( ( column [, ...] ) [, ...] )
-    CUBE ( column [, ...] )
-    ROLLUP ( column [, ...] )
-
-Description
------------
-
-Retrieve rows from zero or more tables.
-
-WITH clause
------------
-
-The ``WITH`` clause defines named relations for use within a query.
-It allows flattening nested queries or simplifying subqueries.
-For example, the following queries are equivalent::
-
-    SELECT a, b
-    FROM (
-      SELECT a, MAX(b) AS b FROM t GROUP BY a
-    ) AS x;
-
-    WITH x AS (SELECT a, MAX(b) AS b FROM t GROUP BY a)
-    SELECT a, b FROM x;
-
-This also works with multiple subqueries::
-
-    WITH
-      t1 AS (SELECT a, MAX(b) AS b FROM x GROUP BY a),
-      t2 AS (SELECT a, AVG(d) AS d FROM y GROUP BY a)
-    SELECT t1.*, t2.*
-    FROM t1
-    JOIN t2 ON t1.a = t2.a;
-
-Additionally, the relations within a ``WITH`` clause can chain::
-
-    WITH
-      x AS (SELECT a FROM t),
-      y AS (SELECT a AS b FROM x),
-      z AS (SELECT b AS c FROM y)
-    SELECT c FROM z;
-
-.. warning::
-    Currently, the SQL for the ``WITH`` clause will be inlined anywhere the named
-    relation is used. This means that if the relation is used more than once and the query
-    is non-deterministic, the results may be different each time.
-
-WITH RECURSIVE clause
----------------------
-
-The ``WITH RECURSIVE`` clause is a variant of the ``WITH`` clause. It defines
-a list of queries to process, including recursive processing of suitable
-queries.
-
-.. warning::
-
-    This feature is experimental only. Proceed to use it only if you understand
-    potential query failures and the impact of the recursion processing on your
-    workload.
-
-A recursive ``WITH``-query must be shaped as a ``UNION`` of two relations. The
-first relation is called the *recursion base*, and the second relation is called
-the *recursion step*. Trino supports recursive ``WITH``-queries with a single
-recursive reference to a ``WITH``-query from within the query. The name ``T`` of
-the query ``T`` can be mentioned once in the ``FROM`` clause of the recursion
-step relation.
-
-The following listing shows a simple example, that displays a commonly used
-form of a single query in the list:
-
-.. code-block:: text
-
-    WITH RECURSIVE t(n) AS (
-        VALUES (1)
-        UNION ALL
-        SELECT n + 1 FROM t WHERE n < 4
-    )
-    SELECT sum(n) FROM t;
-
-In the preceding query the simple assignment ``VALUES (1)`` defines the
-recursion base relation. ``SELECT n + 1 FROM t WHERE n < 4`` defines the
-recursion step relation. The recursion processing performs these steps:
-
-- recursive base yields ``1``
-- first recursion yields ``1 + 1 = 2``
-- second recursion uses the result from the first and adds one: ``2 + 1 = 3``
-- third recursion uses the result from the second and adds one again:
-  ``3 + 1 = 4``
-- fourth recursion aborts since ``n = 4``
-- this results in ``t`` having values ``1``, ``2``, ``3`` and ``4``
-- the final statement performs the sum operation of these elements with the
-  final result value ``10``
-
-The types of the returned columns are those of the base relation. Therefore it
-is required that types in the step relation can be coerced to base relation
-types.
-
-The ``RECURSIVE`` clause applies to all queries in the ``WITH`` list, but not
-all of them must be recursive. If a ``WITH``-query is not shaped according to
-the rules mentioned above or it does not contain a recursive reference, it is
-processed like a regular ``WITH``-query. Column aliases are mandatory for all
-the queries in the recursive ``WITH`` list.
-
-The following limitations apply as a result of following the SQL standard and
-due to implementation choices, in addition to ``WITH`` clause limitations:
-
-- only single-element recursive cycles are supported. Like in regular
-  ``WITH``-queries, references to previous queries in the ``WITH`` list are
-  allowed. References to following queries are forbidden.
-- usage of outer joins, set operations, limit clause, and others is not always
-  allowed in the step relation
-- recursion depth is fixed, defaults to ``10``, and doesn't depend on the actual
-  query results
-
-You can adjust the recursion depth with the :doc:`session property
-</sql/set-session>` ``max_recursion_depth``. When changing the value consider
-that the size of the query plan growth is quadratic with the recursion depth.
-
-SELECT clause
--------------
-
-The ``SELECT`` clause specifies the output of the query. Each ``select_expression``
-defines a column or columns to be included in the result.
-
-.. code-block:: text
-
-    SELECT [ ALL | DISTINCT ] select_expression [, ...]
-
-The ``ALL`` and ``DISTINCT`` quantifiers determine whether duplicate rows
-are included in the result set. If the argument ``ALL`` is specified,
-all rows are included. If the argument ``DISTINCT`` is specified, only unique
-rows are included in the result set. In this case, each output column must
-be of a type that allows comparison. If neither argument is specified,
-the behavior defaults to ``ALL``.
-
-Select expressions
-^^^^^^^^^^^^^^^^^^
-
-Each ``select_expression`` must be in one of the following forms:
-
-.. code-block:: text
-
-    expression [ [ AS ] column_alias ]
-
-.. code-block:: text
-
-    row_expression.* [ AS ( column_alias [, ...] ) ]
-
-.. code-block:: text
-
-    relation.*
-
-.. code-block:: text
-
-    *
-
-In the case of ``expression [ [ AS ] column_alias ]``, a single output column
-is defined.
-
-In the case of ``row_expression.* [ AS ( column_alias [, ...] ) ]``,
-the ``row_expression`` is an arbitrary expression of type ``ROW``.
-All fields of the row define output columns to be included in the result set.
-
-In the case of ``relation.*``, all columns of ``relation`` are included
-in the result set. In this case column aliases are not allowed.
-
-In the case of ``*``, all columns of the relation defined by the query
-are included in the result set.
-
-In the result set, the order of columns is the same as the order of their
-specification by the select expressions. If a select expression returns multiple
-columns, they are ordered the same way they were ordered in the source
-relation or row type expression.
-
-If column aliases are specified, they override any preexisting column
-or row field names::
-
-    SELECT (CAST(ROW(1, true) AS ROW(field1 bigint, field2 boolean))).* AS (alias1, alias2);
-
-.. code-block:: text
-
-     alias1 | alias2
-    --------+--------
-          1 | true
-    (1 row)
-
-Otherwise, the existing names are used::
-
-    SELECT (CAST(ROW(1, true) AS ROW(field1 bigint, field2 boolean))).*;
-
-.. code-block:: text
-
-     field1 | field2
-    --------+--------
-          1 | true
-    (1 row)
-
-and in their absence, anonymous columns are produced::
-
-    SELECT (ROW(1, true)).*;
-
-.. code-block:: text
-
-     _col0 | _col1
-    -------+-------
-         1 | true
-    (1 row)
-
-
-GROUP BY clause
----------------
-
-The ``GROUP BY`` clause divides the output of a ``SELECT`` statement into
-groups of rows containing matching values. A simple ``GROUP BY`` clause may
-contain any expression composed of input columns or it may be an ordinal
-number selecting an output column by position (starting at one).
-
-The following queries are equivalent. They both group the output by
-the ``nationkey`` input column with the first query using the ordinal
-position of the output column and the second query using the input
-column name::
-
-    SELECT count(*), nationkey FROM customer GROUP BY 2;
-
-    SELECT count(*), nationkey FROM customer GROUP BY nationkey;
-
-``GROUP BY`` clauses can group output by input column names not appearing in
-the output of a select statement. For example, the following query generates
-row counts for the ``customer`` table using the input column ``mktsegment``::
-
-    SELECT count(*) FROM customer GROUP BY mktsegment;
-
-.. code-block:: text
-
-     _col0
-    -------
-     29968
-     30142
-     30189
-     29949
-     29752
-    (5 rows)
-
-When a ``GROUP BY`` clause is used in a ``SELECT`` statement all output
-expressions must be either aggregate functions or columns present in
-the ``GROUP BY`` clause.
-
-.. _complex_grouping_operations:
-
-Complex grouping operations
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Trino also supports complex aggregations using the ``GROUPING SETS``, ``CUBE``
-and ``ROLLUP`` syntax. This syntax allows users to perform analysis that requires
-aggregation on multiple sets of columns in a single query. Complex grouping
-operations do not support grouping on expressions composed of input columns.
-Only column names are allowed.
-
-Complex grouping operations are often equivalent to a ``UNION ALL`` of simple
-``GROUP BY`` expressions, as shown in the following examples. This equivalence
-does not apply, however, when the source of data for the aggregation
-is non-deterministic.
-
-GROUPING SETS
-^^^^^^^^^^^^^
-
-Grouping sets allow users to specify multiple lists of columns to group on.
-The columns not part of a given sublist of grouping columns are set to ``NULL``.
-::
-
-    SELECT * FROM shipping;
-
-.. code-block:: text
-
-     origin_state | origin_zip | destination_state | destination_zip | package_weight
-    --------------+------------+-------------------+-----------------+----------------
-     California   |      94131 | New Jersey        |            8648 |             13
-     California   |      94131 | New Jersey        |            8540 |             42
-     New Jersey   |       7081 | Connecticut       |            6708 |            225
-     California   |      90210 | Connecticut       |            6927 |           1337
-     California   |      94131 | Colorado          |           80302 |              5
-     New York     |      10002 | New Jersey        |            8540 |              3
-    (6 rows)
-
-``GROUPING SETS`` semantics are demonstrated by this example query::
-
-    SELECT origin_state, origin_zip, destination_state, sum(package_weight)
-    FROM shipping
-    GROUP BY GROUPING SETS (
-        (origin_state),
-        (origin_state, origin_zip),
-        (destination_state));
-
-.. code-block:: text
-
-     origin_state | origin_zip | destination_state | _col0
-    --------------+------------+-------------------+-------
-     New Jersey   | NULL       | NULL              |   225
-     California   | NULL       | NULL              |  1397
-     New York     | NULL       | NULL              |     3
-     California   |      90210 | NULL              |  1337
-     California   |      94131 | NULL              |    60
-     New Jersey   |       7081 | NULL              |   225
-     New York     |      10002 | NULL              |     3
-     NULL         | NULL       | Colorado          |     5
-     NULL         | NULL       | New Jersey        |    58
-     NULL         | NULL       | Connecticut       |  1562
-    (10 rows)
-
-The preceding query may be considered logically equivalent to a ``UNION ALL`` of
-multiple ``GROUP BY`` queries::
-
-    SELECT origin_state, NULL, NULL, sum(package_weight)
-    FROM shipping GROUP BY origin_state
-
-    UNION ALL
-
-    SELECT origin_state, origin_zip, NULL, sum(package_weight)
-    FROM shipping GROUP BY origin_state, origin_zip
-
-    UNION ALL
-
-    SELECT NULL, NULL, destination_state, sum(package_weight)
-    FROM shipping GROUP BY destination_state;
-
-However, the query with the complex grouping syntax (``GROUPING SETS``, ``CUBE``
-or ``ROLLUP``) will only read from the underlying data source once, while the
-query with the ``UNION ALL`` reads the underlying data three times. This is why
-queries with a ``UNION ALL`` may produce inconsistent results when the data
-source is not deterministic.
-
-CUBE
-^^^^
-
-The ``CUBE`` operator generates all possible grouping sets (i.e. a power set)
-for a given set of columns. For example, the query::
-
-    SELECT origin_state, destination_state, sum(package_weight)
-    FROM shipping
-    GROUP BY CUBE (origin_state, destination_state);
-
-is equivalent to::
-
-    SELECT origin_state, destination_state, sum(package_weight)
-    FROM shipping
-    GROUP BY GROUPING SETS (
-        (origin_state, destination_state),
-        (origin_state),
-        (destination_state),
-        ()
-    );
-
-.. code-block:: text
-
-     origin_state | destination_state | _col0
-    --------------+-------------------+-------
-     California   | New Jersey        |    55
-     California   | Colorado          |     5
-     New York     | New Jersey        |     3
-     New Jersey   | Connecticut       |   225
-     California   | Connecticut       |  1337
-     California   | NULL              |  1397
-     New York     | NULL              |     3
-     New Jersey   | NULL              |   225
-     NULL         | New Jersey        |    58
-     NULL         | Connecticut       |  1562
-     NULL         | Colorado          |     5
-     NULL         | NULL              |  1625
-    (12 rows)
-
-ROLLUP
-^^^^^^
-
-The ``ROLLUP`` operator generates all possible subtotals for a given set of
-columns. For example, the query::
-
-    SELECT origin_state, origin_zip, sum(package_weight)
-    FROM shipping
-    GROUP BY ROLLUP (origin_state, origin_zip);
-
-.. code-block:: text
-
-     origin_state | origin_zip | _col2
-    --------------+------------+-------
-     California   |      94131 |    60
-     California   |      90210 |  1337
-     New Jersey   |       7081 |   225
-     New York     |      10002 |     3
-     California   | NULL       |  1397
-     New York     | NULL       |     3
-     New Jersey   | NULL       |   225
-     NULL         | NULL       |  1625
-    (8 rows)
-
-is equivalent to::
-
-    SELECT origin_state, origin_zip, sum(package_weight)
-    FROM shipping
-    GROUP BY GROUPING SETS ((origin_state, origin_zip), (origin_state), ());
-
-Combining multiple grouping expressions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Multiple grouping expressions in the same query are interpreted as having
-cross-product semantics. For example, the following query::
-
-    SELECT origin_state, destination_state, origin_zip, sum(package_weight)
-    FROM shipping
-    GROUP BY
-        GROUPING SETS ((origin_state, destination_state)),
-        ROLLUP (origin_zip);
-
-which can be rewritten as::
-
-    SELECT origin_state, destination_state, origin_zip, sum(package_weight)
-    FROM shipping
-    GROUP BY
-        GROUPING SETS ((origin_state, destination_state)),
-        GROUPING SETS ((origin_zip), ());
-
-is logically equivalent to::
-
-    SELECT origin_state, destination_state, origin_zip, sum(package_weight)
-    FROM shipping
-    GROUP BY GROUPING SETS (
-        (origin_state, destination_state, origin_zip),
-        (origin_state, destination_state)
-    );
-
-.. code-block:: text
-
-     origin_state | destination_state | origin_zip | _col3
-    --------------+-------------------+------------+-------
-     New York     | New Jersey        |      10002 |     3
-     California   | New Jersey        |      94131 |    55
-     New Jersey   | Connecticut       |       7081 |   225
-     California   | Connecticut       |      90210 |  1337
-     California   | Colorado          |      94131 |     5
-     New York     | New Jersey        | NULL       |     3
-     New Jersey   | Connecticut       | NULL       |   225
-     California   | Colorado          | NULL       |     5
-     California   | Connecticut       | NULL       |  1337
-     California   | New Jersey        | NULL       |    55
-    (10 rows)
-
-The ``ALL`` and ``DISTINCT`` quantifiers determine whether duplicate grouping
-sets each produce distinct output rows. This is particularly useful when
-multiple complex grouping sets are combined in the same query. For example, the
-following query::
-
-    SELECT origin_state, destination_state, origin_zip, sum(package_weight)
-    FROM shipping
-    GROUP BY ALL
-        CUBE (origin_state, destination_state),
-        ROLLUP (origin_state, origin_zip);
-
-is equivalent to::
-
-    SELECT origin_state, destination_state, origin_zip, sum(package_weight)
-    FROM shipping
-    GROUP BY GROUPING SETS (
-        (origin_state, destination_state, origin_zip),
-        (origin_state, origin_zip),
-        (origin_state, destination_state, origin_zip),
-        (origin_state, origin_zip),
-        (origin_state, destination_state),
-        (origin_state),
-        (origin_state, destination_state),
-        (origin_state),
-        (origin_state, destination_state),
-        (origin_state),
-        (destination_state),
-        ()
-    );
-
-However, if the query uses the ``DISTINCT`` quantifier for the ``GROUP BY``::
-
-    SELECT origin_state, destination_state, origin_zip, sum(package_weight)
-    FROM shipping
-    GROUP BY DISTINCT
-        CUBE (origin_state, destination_state),
-        ROLLUP (origin_state, origin_zip);
-
-only unique grouping sets are generated::
-
-    SELECT origin_state, destination_state, origin_zip, sum(package_weight)
-    FROM shipping
-    GROUP BY GROUPING SETS (
-        (origin_state, destination_state, origin_zip),
-        (origin_state, origin_zip),
-        (origin_state, destination_state),
-        (origin_state),
-        (destination_state),
-        ()
-    );
-
-The default set quantifier is ``ALL``.
-
-GROUPING operation
-^^^^^^^^^^^^^^^^^^
-
-``grouping(col1, ..., colN) -> bigint``
-
-The grouping operation returns a bit set converted to decimal, indicating which columns are present in a
-grouping. It must be used in conjunction with ``GROUPING SETS``, ``ROLLUP``, ``CUBE``  or ``GROUP BY``
-and its arguments must match exactly the columns referenced in the corresponding ``GROUPING SETS``,
-``ROLLUP``, ``CUBE`` or ``GROUP BY`` clause.
-
-To compute the resulting bit set for a particular row, bits are assigned to the argument columns with
-the rightmost column being the least significant bit. For a given grouping, a bit is set to 0 if the
-corresponding column is included in the grouping and to 1 otherwise. For example, consider the query
-below::
-
-    SELECT origin_state, origin_zip, destination_state, sum(package_weight),
-           grouping(origin_state, origin_zip, destination_state)
-    FROM shipping
-    GROUP BY GROUPING SETS (
-        (origin_state),
-        (origin_state, origin_zip),
-        (destination_state)
-    );
-
-.. code-block:: text
-
-    origin_state | origin_zip | destination_state | _col3 | _col4
-    --------------+------------+-------------------+-------+-------
-    California   | NULL       | NULL              |  1397 |     3
-    New Jersey   | NULL       | NULL              |   225 |     3
-    New York     | NULL       | NULL              |     3 |     3
-    California   |      94131 | NULL              |    60 |     1
-    New Jersey   |       7081 | NULL              |   225 |     1
-    California   |      90210 | NULL              |  1337 |     1
-    New York     |      10002 | NULL              |     3 |     1
-    NULL         | NULL       | New Jersey        |    58 |     6
-    NULL         | NULL       | Connecticut       |  1562 |     6
-    NULL         | NULL       | Colorado          |     5 |     6
-    (10 rows)
-
-The first grouping in the above result only includes the ``origin_state`` column and excludes
-the ``origin_zip`` and ``destination_state`` columns. The bit set constructed for that grouping
-is ``011`` where the most significant bit represents ``origin_state``.
-
-HAVING clause
--------------
-
-The ``HAVING`` clause is used in conjunction with aggregate functions and
-the ``GROUP BY`` clause to control which groups are selected. A ``HAVING``
-clause eliminates groups that do not satisfy the given conditions.
-``HAVING`` filters groups after groups and aggregates are computed.
-
-The following example queries the ``customer`` table and selects groups
-with an account balance greater than the specified value::
-
-
-    SELECT count(*), mktsegment, nationkey,
-           CAST(sum(acctbal) AS bigint) AS totalbal
-    FROM customer
-    GROUP BY mktsegment, nationkey
-    HAVING sum(acctbal) > 5700000
-    ORDER BY totalbal DESC;
-
-.. code-block:: text
-
-     _col0 | mktsegment | nationkey | totalbal
-    -------+------------+-----------+----------
-      1272 | AUTOMOBILE |        19 |  5856939
-      1253 | FURNITURE  |        14 |  5794887
-      1248 | FURNITURE  |         9 |  5784628
-      1243 | FURNITURE  |        12 |  5757371
-      1231 | HOUSEHOLD  |         3 |  5753216
-      1251 | MACHINERY  |         2 |  5719140
-      1247 | FURNITURE  |         8 |  5701952
-    (7 rows)
-
-.. _window_clause:
-
-WINDOW clause
--------------
-
-The ``WINDOW`` clause is used to define named window specifications. The defined named
-window specifications can be referred to in the ``SELECT`` and ``ORDER BY`` clauses
-of the enclosing query::
-
-     SELECT orderkey, clerk, totalprice,
-           rank() OVER w AS rnk
-     FROM orders
-     WINDOW w AS (PARTITION BY clerk ORDER BY totalprice DESC)
-     ORDER BY count() OVER w, clerk, rnk
-
-The window definition list of ``WINDOW`` clause can contain one or multiple named window
-specifications of the form
-
-.. code-block:: none
-
-    window_name AS (window_specification)
-
-A window specification has the following components:
-
-* The existing window name, which refers to a named window specification in the
-  ``WINDOW`` clause. The window specification associated with the referenced name
-  is the basis of the current specification.
-* The partition specification, which separates the input rows into different
-  partitions. This is analogous to how the ``GROUP BY`` clause separates rows
-  into different groups for aggregate functions.
-* The ordering specification, which determines the order in which input rows
-  will be processed by the window function.
-* The window frame, which specifies a sliding window of rows to be processed
-  by the function for a given row. If the frame is not specified, it defaults
-  to ``RANGE UNBOUNDED PRECEDING``, which is the same as
-  ``RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW``. This frame contains all
-  rows from the start of the partition up to the last peer of the current row.
-  In the absence of ``ORDER BY``, all rows are considered peers, so ``RANGE
-  BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW`` is equivalent to ``BETWEEN
-  UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING``. The window frame syntax
-  supports additional clauses for row pattern recognition. If the row pattern
-  recognition clauses are specified, the window frame for a particular row
-  consists of the rows matched by a pattern starting from that row.
-  Additionally, if the frame specifies row pattern measures, they can be
-  called over the window, similarly to window functions. For more details, see
-  :doc:`Row pattern recognition in window structures
-  </sql/pattern-recognition-in-window>`.
-
-Each window component is optional. If a window specification does not specify
-window partitioning, ordering or frame, those components are obtained from
-the window specification referenced by the ``existing window name``, or from
-another window specification in the reference chain. In case when there is no
-``existing window name`` specified, or none of the referenced window
-specifications contains the component, the default value is used.
-
-Set operations
---------------
-
-``UNION``  ``INTERSECT`` and ``EXCEPT`` are all set operations.  These clauses are used
-to combine the results of more than one select statement into a single result set:
-
-.. code-block:: text
-
-    query UNION [ALL | DISTINCT] query
-
-.. code-block:: text
-
-    query INTERSECT [ALL | DISTINCT] query
-
-.. code-block:: text
-
-    query EXCEPT [ALL | DISTINCT] query
-
-The argument ``ALL`` or ``DISTINCT`` controls which rows are included in
-the final result set. If the argument ``ALL`` is specified all rows are
-included even if the rows are identical.  If the argument ``DISTINCT``
-is specified only unique rows are included in the combined result set.
-If neither is specified, the behavior defaults to ``DISTINCT``.
-
-
-Multiple set operations are processed left to right, unless the order is explicitly
-specified via parentheses. Additionally, ``INTERSECT`` binds more tightly
-than ``EXCEPT`` and ``UNION``. That means ``A UNION B INTERSECT C EXCEPT D``
-is the same as ``A UNION (B INTERSECT C) EXCEPT D``.
-
-UNION clause
-^^^^^^^^^^^^
-
-``UNION`` combines all the rows that are in the result set from the
-first query with those that are in the result set for the second query.
-The following is an example of one of the simplest possible ``UNION`` clauses.
-It selects the value ``13`` and combines this result set with a second query
-that selects the value ``42``::
-
-    SELECT 13
-    UNION
-    SELECT 42;
-
-.. code-block:: text
-
-     _col0
-    -------
-        13
-        42
-    (2 rows)
-
-The following query demonstrates the difference between ``UNION`` and ``UNION ALL``.
-It selects the value ``13`` and combines this result set with a second query that
-selects the values ``42`` and ``13``::
-
-    SELECT 13
-    UNION
-    SELECT * FROM (VALUES 42, 13);
-
-.. code-block:: text
-
-     _col0
-    -------
-        13
-        42
-    (2 rows)
-
-::
-
-    SELECT 13
-    UNION ALL
-    SELECT * FROM (VALUES 42, 13);
-
-.. code-block:: text
-
-     _col0
-    -------
-        13
-        42
-        13
-    (2 rows)
-
-INTERSECT clause
-^^^^^^^^^^^^^^^^
-
-``INTERSECT`` returns only the rows that are in the result sets of both the first and
-the second queries. The following is an example of one of the simplest
-possible ``INTERSECT`` clauses. It selects the values ``13`` and ``42`` and combines
-this result set with a second query that selects the value ``13``.  Since ``42``
-is only in the result set of the first query, it is not included in the final results.::
-
-    SELECT * FROM (VALUES 13, 42)
-    INTERSECT
-    SELECT 13;
-
-.. code-block:: text
-
-     _col0
-    -------
-        13
-    (2 rows)
-
-EXCEPT clause
-^^^^^^^^^^^^^
-
-``EXCEPT`` returns the rows that are in the result set of the first query,
-but not the second. The following is an example of one of the simplest
-possible ``EXCEPT`` clauses. It selects the values ``13`` and ``42`` and combines
-this result set with a second query that selects the value ``13``.  Since ``13``
-is also in the result set of the second query, it is not included in the final result.::
-
-    SELECT * FROM (VALUES 13, 42)
-    EXCEPT
-    SELECT 13;
-
-.. code-block:: text
-
-     _col0
-    -------
-       42
-    (2 rows)
-
-.. _order-by-clause:
-
-ORDER BY clause
----------------
-
-The ``ORDER BY`` clause is used to sort a result set by one or more
-output expressions:
-
-.. code-block:: text
-
-    ORDER BY expression [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [, ...]
-
-Each expression may be composed of output columns, or it may be an ordinal
-number selecting an output column by position, starting at one. The
-``ORDER BY`` clause is evaluated after any ``GROUP BY`` or ``HAVING`` clause,
-and before any ``OFFSET``, ``LIMIT`` or ``FETCH FIRST`` clause.
-The default null ordering is ``NULLS LAST``, regardless of the ordering direction.
-
-Note that, following the SQL specification, an ``ORDER BY`` clause only
-affects the order of rows for queries that immediately contain the clause.
-Trino follows that specification, and drops redundant usage of the clause to
-avoid negative performance impacts.
-
-In the following example, the clause only applies to the select statement.
-
-.. code-block:: SQL
-
-    INSERT INTO some_table
-    SELECT * FROM another_table
-    ORDER BY field;
-
-Since tables in SQL are inherently unordered, and the ``ORDER BY`` clause in
-this case does not result in any difference, but negatively impacts performance
-of running the overall insert statement, Trino skips the sort operation.
-
-Another example where the ``ORDER BY`` clause is redundant, and does not affect
-the outcome of the overall statement, is a nested query:
-
-.. code-block:: SQL
-
-    SELECT *
-    FROM some_table
-        JOIN (SELECT * FROM another_table ORDER BY field) u
-        ON some_table.key = u.key;
-
-More background information and details can be found in
-`a blog post about this optimization <https://trino.io/blog/2019/06/03/redundant-order-by.html>`_.
-
-.. _offset-clause:
-
-OFFSET clause
--------------
-
-The ``OFFSET`` clause is used to discard a number of leading rows
-from the result set:
-
-.. code-block:: text
-
-    OFFSET count [ ROW | ROWS ]
-
-If the ``ORDER BY`` clause is present, the ``OFFSET`` clause is evaluated
-over a sorted result set, and the set remains sorted after the
-leading rows are discarded::
-
-    SELECT name FROM nation ORDER BY name OFFSET 22;
-
-.. code-block:: text
-
-          name
-    ----------------
-     UNITED KINGDOM
-     UNITED STATES
-     VIETNAM
-    (3 rows)
-
-Otherwise, it is arbitrary which rows are discarded.
-If the count specified in the ``OFFSET`` clause equals or exceeds the size
-of the result set, the final result is empty.
-
-.. _limit-clause:
-
-LIMIT or FETCH FIRST clause
----------------------------
-
-The ``LIMIT`` or ``FETCH FIRST`` clause restricts the number of rows
-in the result set.
-
-.. code-block:: text
-
-    LIMIT { count | ALL }
-
-.. code-block:: text
-
-    FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } { ONLY | WITH TIES }
-
-The following example queries a large table, but the ``LIMIT`` clause
-restricts the output to only have five rows (because the query lacks an ``ORDER BY``,
-exactly which rows are returned is arbitrary)::
-
-    SELECT orderdate FROM orders LIMIT 5;
-
-.. code-block:: text
-
-     orderdate
-    ------------
-     1994-07-25
-     1993-11-12
-     1992-10-06
-     1994-01-04
-     1997-12-28
-    (5 rows)
-
-``LIMIT ALL`` is the same as omitting the ``LIMIT`` clause.
-
-The ``FETCH FIRST`` clause supports either the ``FIRST`` or ``NEXT`` keywords
-and the ``ROW`` or ``ROWS`` keywords. These keywords are equivalent and
-the choice of keyword has no effect on query execution.
-
-If the count is not specified in the ``FETCH FIRST`` clause, it defaults to ``1``::
-
-    SELECT orderdate FROM orders FETCH FIRST ROW ONLY;
-
-.. code-block:: text
-
-     orderdate
-    ------------
-     1994-02-12
-    (1 row)
-
-If the ``OFFSET`` clause is present, the ``LIMIT`` or ``FETCH FIRST`` clause
-is evaluated after the ``OFFSET`` clause::
-
-    SELECT * FROM (VALUES 5, 2, 4, 1, 3) t(x) ORDER BY x OFFSET 2 LIMIT 2;
-
-.. code-block:: text
-
-     x
-    ---
-     3
-     4
-    (2 rows)
-
-For the ``FETCH FIRST`` clause, the argument ``ONLY`` or ``WITH TIES``
-controls which rows are included in the result set.
-
-If the argument ``ONLY`` is specified, the result set is limited to the exact
-number of leading rows determined by the count.
-
-If the argument ``WITH TIES`` is specified, it is required that the ``ORDER BY``
-clause be present. The result set consists of the same set of leading rows
-and all of the rows in the same peer group as the last of them ('ties')
-as established by the ordering in the ``ORDER BY`` clause. The result set is sorted::
-
-    SELECT name, regionkey
-    FROM nation
-    ORDER BY regionkey FETCH FIRST ROW WITH TIES;
-
-.. code-block:: text
-
-        name    | regionkey
-    ------------+-----------
-     ETHIOPIA   |         0
-     MOROCCO    |         0
-     KENYA      |         0
-     ALGERIA    |         0
-     MOZAMBIQUE |         0
-    (5 rows)
-
-TABLESAMPLE
------------
-
-There are multiple sample methods:
-
-``BERNOULLI``
-    Each row is selected to be in the table sample with a probability of
-    the sample percentage. When a table is sampled using the Bernoulli
-    method, all physical blocks of the table are scanned and certain
-    rows are skipped (based on a comparison between the sample percentage
-    and a random value calculated at runtime).
-
-    The probability of a row being included in the result is independent
-    from any other row. This does not reduce the time required to read
-    the sampled table from disk. It may have an impact on the total
-    query time if the sampled output is processed further.
-
-``SYSTEM``
-    This sampling method divides the table into logical segments of data
-    and samples the table at this granularity. This sampling method either
-    selects all the rows from a particular segment of data or skips it
-    (based on a comparison between the sample percentage and a random
-    value calculated at runtime).
-
-    The rows selected in a system sampling will be dependent on which
-    connector is used. For example, when used with Hive, it is dependent
-    on how the data is laid out on HDFS. This method does not guarantee
-    independent sampling probabilities.
-
-.. note:: Neither of the two methods allow deterministic bounds on the number of rows returned.
-
-Examples::
-
-    SELECT *
-    FROM users TABLESAMPLE BERNOULLI (50);
-
-    SELECT *
-    FROM users TABLESAMPLE SYSTEM (75);
-
-Using sampling with joins::
-
-    SELECT o.*, i.*
-    FROM orders o TABLESAMPLE SYSTEM (10)
-    JOIN lineitem i TABLESAMPLE BERNOULLI (40)
-      ON o.orderkey = i.orderkey;
-
-.. _unnest:
-
-UNNEST
-------
-
-``UNNEST`` can be used to expand an :ref:`array_type` or :ref:`map_type` into a relation.
-Arrays are expanded into a single column::
-
-    SELECT * FROM UNNEST(ARRAY[1,2]) AS t(number);
-
-.. code-block:: text
-
-     number
-    --------
-          1
-          2
-    (2 rows)
-
-
-Maps are expanded into two columns (key, value)::
-
-    SELECT * FROM UNNEST(
-            map_from_entries(
-                ARRAY[
-                    ('SQL',1974),
-                    ('Java', 1995)
-                ]
-            )
-    ) AS t(language, first_appeared_year);
-
-
-.. code-block:: text
-
-     language | first_appeared_year
-    ----------+---------------------
-     SQL      |                1974
-     Java     |                1995
-    (2 rows)
-
-``UNNEST`` can be used in combination with an ``ARRAY`` of :ref:`row_type` structures for expanding each
-field of the ``ROW`` into a corresponding column::
-
-    SELECT *
-    FROM UNNEST(
-            ARRAY[
-                ROW('Java',  1995),
-                ROW('SQL' , 1974)],
-            ARRAY[
-                ROW(false),
-                ROW(true)]
-    ) as t(language,first_appeared_year,declarative);
-
-.. code-block:: text
-
-     language | first_appeared_year | declarative
-    ----------+---------------------+-------------
-     Java     |                1995 | false
-     SQL      |                1974 | true
-    (2 rows)
-
-``UNNEST`` can optionally have a ``WITH ORDINALITY`` clause, in which case an additional ordinality column
-is added to the end::
-
-    SELECT a, b, rownumber
-    FROM UNNEST (
-        ARRAY[2, 5],
-        ARRAY[7, 8, 9]
-         ) WITH ORDINALITY AS t(a, b, rownumber);
-
-.. code-block:: text
-
-      a   | b | rownumber
-    ------+---+-----------
-        2 | 7 |         1
-        5 | 8 |         2
-     NULL | 9 |         3
-    (3 rows)
-
-``UNNEST`` returns zero entries when the array/map is empty::
-
-    SELECT * FROM UNNEST (ARRAY[]) AS t(value);
-
-.. code-block:: text
-
-     value
-    -------
-    (0 rows)
-
-``UNNEST`` returns zero entries when the array/map is null::
-
-    SELECT * FROM UNNEST (CAST(null AS ARRAY(integer))) AS t(number);
-
-.. code-block:: text
-
-     number
-    --------
-    (0 rows)
-
-``UNNEST`` is normally used with a ``JOIN``, and can reference columns
-from relations on the left side of the join::
-
-    SELECT student, score
-    FROM (
-       VALUES
-          ('John', ARRAY[7, 10, 9]),
-          ('Mary', ARRAY[4, 8, 9])
-    ) AS tests (student, scores)
-    CROSS JOIN UNNEST(scores) AS t(score);
-
-.. code-block:: text
-
-     student | score
-    ---------+-------
-     John    |     7
-     John    |    10
-     John    |     9
-     Mary    |     4
-     Mary    |     8
-     Mary    |     9
-    (6 rows)
-
-``UNNEST`` can also be used with multiple arguments, in which case they are expanded into multiple columns,
-with as many rows as the highest cardinality argument (the other columns are padded with nulls)::
-
-    SELECT numbers, animals, n, a
-    FROM (
-      VALUES
-        (ARRAY[2, 5], ARRAY['dog', 'cat', 'bird']),
-        (ARRAY[7, 8, 9], ARRAY['cow', 'pig'])
-    ) AS x (numbers, animals)
-    CROSS JOIN UNNEST(numbers, animals) AS t (n, a);
-
-.. code-block:: text
-
-      numbers  |     animals      |  n   |  a
-    -----------+------------------+------+------
-     [2, 5]    | [dog, cat, bird] |    2 | dog
-     [2, 5]    | [dog, cat, bird] |    5 | cat
-     [2, 5]    | [dog, cat, bird] | NULL | bird
-     [7, 8, 9] | [cow, pig]       |    7 | cow
-     [7, 8, 9] | [cow, pig]       |    8 | pig
-     [7, 8, 9] | [cow, pig]       |    9 | NULL
-    (6 rows)
-
-``LEFT JOIN`` is preferable in order to avoid losing the the row containing the array/map field in question
-when referenced columns from relations on the left side of the join can be empty or have ``NULL`` values::
-
-    SELECT runner, checkpoint
-    FROM (
-       VALUES
-          ('Joe', ARRAY[10, 20, 30, 42]),
-          ('Roger', ARRAY[10]),
-          ('Dave', ARRAY[]),
-          ('Levi', NULL)
-    ) AS marathon (runner, checkpoints)
-    LEFT JOIN UNNEST(checkpoints) AS t(checkpoint) ON TRUE;
-
-.. code-block:: text
-
-     runner | checkpoint
-    --------+------------
-     Joe    |         10
-     Joe    |         20
-     Joe    |         30
-     Joe    |         42
-     Roger  |         10
-     Dave   |       NULL
-     Levi   |       NULL
-    (7 rows)
-
-Note that in case of using ``LEFT JOIN`` the only condition supported by the current implementation is ``ON TRUE``.
-
-Joins
------
-
-Joins allow you to combine data from multiple relations.
-
-CROSS JOIN
-^^^^^^^^^^
-
-A cross join returns the Cartesian product (all combinations) of two
-relations. Cross joins can either be specified using the explit
-``CROSS JOIN`` syntax or by specifying multiple relations in the
-``FROM`` clause.
-
-Both of the following queries are equivalent::
-
-    SELECT *
-    FROM nation
-    CROSS JOIN region;
-
-    SELECT *
-    FROM nation, region;
-
-The ``nation`` table contains 25 rows and the ``region`` table contains 5 rows,
-so a cross join between the two tables produces 125 rows::
-
-    SELECT n.name AS nation, r.name AS region
-    FROM nation AS n
-    CROSS JOIN region AS r
-    ORDER BY 1, 2;
-
-.. code-block:: text
-
-         nation     |   region
-    ----------------+-------------
-     ALGERIA        | AFRICA
-     ALGERIA        | AMERICA
-     ALGERIA        | ASIA
-     ALGERIA        | EUROPE
-     ALGERIA        | MIDDLE EAST
-     ARGENTINA      | AFRICA
-     ARGENTINA      | AMERICA
-    ...
-    (125 rows)
-
-LATERAL
-^^^^^^^
-
-Subqueries appearing in the ``FROM`` clause can be preceded by the keyword ``LATERAL``.
-This allows them to reference columns provided by preceding ``FROM`` items.
-
-A ``LATERAL`` join can appear at the top level in the ``FROM`` list, or anywhere
-within a parenthesized join tree. In the latter case, it can also refer to any items
-that are on the left-hand side of a ``JOIN`` for which it is on the right-hand side.
-
-When a ``FROM`` item contains ``LATERAL`` cross-references, evaluation proceeds as follows:
-for each row of the ``FROM`` item providing the cross-referenced columns,
-the ``LATERAL`` item is evaluated using that row set's values of the columns.
-The resulting rows are joined as usual with the rows they were computed from.
-This is repeated for set of rows from the column source tables.
-
-``LATERAL`` is primarily useful when the cross-referenced column is necessary for
-computing the rows to be joined::
-
-    SELECT name, x, y
-    FROM nation
-    CROSS JOIN LATERAL (SELECT name || ' :-' AS x)
-    CROSS JOIN LATERAL (SELECT x || ')' AS y);
-
-Qualifying column names
-^^^^^^^^^^^^^^^^^^^^^^^
-
-When two relations in a join have columns with the same name, the column
-references must be qualified using the relation alias (if the relation
-has an alias), or with the relation name::
-
-    SELECT nation.name, region.name
-    FROM nation
-    CROSS JOIN region;
-
-    SELECT n.name, r.name
-    FROM nation AS n
-    CROSS JOIN region AS r;
-
-    SELECT n.name, r.name
-    FROM nation n
-    CROSS JOIN region r;
-
-The following query will fail with the error ``Column 'name' is ambiguous``::
-
-    SELECT name
-    FROM nation
-    CROSS JOIN region;
-
-Subqueries
-----------
-
-A subquery is an expression which is composed of a query. The subquery
-is correlated when it refers to columns outside of the subquery.
-Logically, the subquery will be evaluated for each row in the surrounding
-query. The referenced columns will thus be constant during any single
-evaluation of the subquery.
-
-.. note:: Support for correlated subqueries is limited. Not every standard form is supported.
-
-EXISTS
-^^^^^^
-
-The ``EXISTS`` predicate determines if a subquery returns any rows::
-
-    SELECT name
-    FROM nation
-    WHERE EXISTS (
-         SELECT *
-         FROM region
-         WHERE region.regionkey = nation.regionkey
-    );
-
-IN
-^^
-
-The ``IN`` predicate determines if any values produced by the subquery
-are equal to the provided expression. The result of ``IN`` follows the
-standard rules for nulls. The subquery must produce exactly one column::
-
-    SELECT name
-    FROM nation
-    WHERE regionkey IN (
-         SELECT regionkey
-         FROM region
-         WHERE name = 'AMERICA' OR name = 'AFRICA'
-    );
-
-Scalar subquery
-^^^^^^^^^^^^^^^
-
-A scalar subquery is a non-correlated subquery that returns zero or
-one row. It is an error for the subquery to produce more than one
-row. The returned value is ``NULL`` if the subquery produces no rows::
-
-    SELECT name
-    FROM nation
-    WHERE regionkey = (SELECT max(regionkey) FROM region);
-
-.. note:: Currently only single column can be returned from the scalar subquery.
diff --git a/docs/src/main/sphinx/sql/set-path.md b/docs/src/main/sphinx/sql/set-path.md
new file mode 100644
index 000000000000..5735e5bb9375
--- /dev/null
+++ b/docs/src/main/sphinx/sql/set-path.md
@@ -0,0 +1,51 @@
+# SET PATH
+
+## Synopsis
+
+```text
+SET PATH path-element[, ...]
+```
+
+## Description
+
+Define a collection of paths to functions or table functions in specific
+catalogs and schemas for the current session.
+
+Each path-element uses a period-separated syntax to specify the catalog name and
+schema location `<catalog>.<schema>` of the function, or only the schema
+location `<schema>` in the current catalog. The current catalog is set with
+{doc}`use`, or as part of a client tool connection. Catalog and schema must
+exist.
+
+## Examples
+
+The following example sets a path to access functions in the `system` schema
+of the `example` catalog:
+
+```
+SET PATH example.system;
+```
+
+The catalog uses the PostgreSQL connector, and you can therefore use the
+{ref}`query table function <postgresql-query-function>` directly, without the
+full catalog and schema qualifiers:
+
+```
+SELECT
+  *
+FROM
+  TABLE(
+    query(
+      query => 'SELECT
+        *
+      FROM
+        tpch.nation'
+    )
+  );
+```
+
+## See also
+
+* [](/sql/use)
+* [](/admin/properties-sql-environment)
+
diff --git a/docs/src/main/sphinx/sql/set-role.md b/docs/src/main/sphinx/sql/set-role.md
new file mode 100644
index 000000000000..338d7507155f
--- /dev/null
+++ b/docs/src/main/sphinx/sql/set-role.md
@@ -0,0 +1,34 @@
+# SET ROLE
+
+## Synopsis
+
+```text
+SET ROLE ( role | ALL | NONE )
+[ IN catalog ]
+```
+
+## Description
+
+`SET ROLE` sets the enabled role for the current session.
+
+`SET ROLE role` enables a single specified role for the current session.
+For the `SET ROLE role` statement to succeed, the user executing it should
+have a grant for the given role.
+
+`SET ROLE ALL` enables all roles that the current user has been granted for the
+current session.
+
+`SET ROLE NONE` disables all the roles granted to the current user for the
+current session.
+
+The optional `IN catalog` clause sets the role in a catalog as opposed
+to a system role.
+
+## Limitations
+
+Some connectors do not support role management.
+See connector documentation for more details.
+
+## See also
+
+{doc}`create-role`, {doc}`drop-role`, {doc}`grant-roles`, {doc}`revoke-roles`
diff --git a/docs/src/main/sphinx/sql/set-role.rst b/docs/src/main/sphinx/sql/set-role.rst
deleted file mode 100644
index a933c946619d..000000000000
--- a/docs/src/main/sphinx/sql/set-role.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-========
-SET ROLE
-========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SET ROLE ( role | ALL | NONE )
-    [ IN catalog ]
-
-Description
------------
-
-``SET ROLE`` sets the enabled role for the current session.
-
-``SET ROLE role`` enables a single specified role for the current session.
-For the ``SET ROLE role`` statement to succeed, the user executing it should
-have a grant for the given role.
-
-``SET ROLE ALL`` enables all roles that the current user has been granted for the
-current session.
-
-``SET ROLE NONE`` disables all the roles granted to the current user for the
-current session.
-
-The optional ``IN catalog`` clause sets the role in a catalog as opposed
-to a system role.
-
-Limitations
------------
-
-Some connectors do not support role management.
-See connector documentation for more details.
-
-See also
---------
-
-:doc:`create-role`, :doc:`drop-role`, :doc:`grant-roles`, :doc:`revoke-roles`
diff --git a/docs/src/main/sphinx/sql/set-session-authorization.rst b/docs/src/main/sphinx/sql/set-session-authorization.rst
new file mode 100644
index 000000000000..98634dd11235
--- /dev/null
+++ b/docs/src/main/sphinx/sql/set-session-authorization.rst
@@ -0,0 +1,47 @@
+=========================
+SET SESSION AUTHORIZATION
+=========================
+
+Synopsis
+--------
+
+.. code-block:: none
+
+    SET SESSION AUTHORIZATION username
+
+Description
+-----------
+
+Changes the current user of the session.
+For the ``SET SESSION AUTHORIZATION username`` statement to succeed,
+the the original user (that the client connected with) must be able to impersonate the specified user.
+User impersonation can be enabled in the system access control.
+
+Examples
+--------
+
+In the following example, the original user when the connection to Trino is made is Kevin.
+The following sets the session authorization user to John::
+
+    SET SESSION AUTHORIZATION 'John';
+
+Queries will now execute as John instead of Kevin.
+
+All supported syntax to change the session authorization users are shown below.
+
+Changing the session authorization with single quotes::
+
+    SET SESSION AUTHORIZATION 'John';
+
+Changing the session authorization with double quotes::
+
+    SET SESSION AUTHORIZATION "John";
+
+Changing the session authorization without quotes::
+
+    SET SESSION AUTHORIZATION John;
+
+See Also
+--------
+
+:doc:`reset-session-authorization`
diff --git a/docs/src/main/sphinx/sql/set-session.md b/docs/src/main/sphinx/sql/set-session.md
new file mode 100644
index 000000000000..396f6d0688e7
--- /dev/null
+++ b/docs/src/main/sphinx/sql/set-session.md
@@ -0,0 +1,61 @@
+# SET SESSION
+
+## Synopsis
+
+```text
+SET SESSION name = expression
+SET SESSION catalog.name = expression
+```
+
+## Description
+
+Set a session property value or a catalog session property.
+
+(session-properties-definition)=
+
+## Session properties
+
+A session property is a {doc}`configuration property </admin/properties>` that
+can be temporarily modified by a user for the duration of the current
+connection session to the Trino cluster. Many configuration properties have a
+corresponding session property that accepts the same values as the config
+property.
+
+There are two types of session properties:
+
+- **System session properties** apply to the whole cluster. Most session
+  properties are system session properties unless specified otherwise.
+- **Catalog session properties** are connector-defined session properties that
+  can be set on a per-catalog basis. These properties must be set separately for
+  each catalog by including the catalog name as a prefix, such as
+  `catalogname.property_name`.
+
+Session properties are tied to the current session, so a user can have multiple
+connections to a cluster that each have different values for the same session
+properties. Once a session ends, either by disconnecting or creating a new
+session, any changes made to session properties during the previous session are
+lost.
+
+## Examples
+
+The following example sets a system session property to enable optimized hash
+generation:
+
+```
+SET SESSION optimize_hash_generation = true;
+```
+
+The following example sets the `optimize_locality_enabled` catalog session
+property for an {doc}`Accumulo catalog </connector/accumulo>` named `acc01`:
+
+```
+SET SESSION acc01.optimize_locality_enabled = false;
+```
+
+The example `acc01.optimize_locality_enabled` catalog session property
+does not apply to any other catalog, even if another catalog also uses the
+Accumulo connector.
+
+## See also
+
+{doc}`reset-session`, {doc}`show-session`
diff --git a/docs/src/main/sphinx/sql/set-session.rst b/docs/src/main/sphinx/sql/set-session.rst
deleted file mode 100644
index 371a4ee211f0..000000000000
--- a/docs/src/main/sphinx/sql/set-session.rst
+++ /dev/null
@@ -1,64 +0,0 @@
-===========
-SET SESSION
-===========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SET SESSION name = expression
-    SET SESSION catalog.name = expression
-
-Description
------------
-
-Set a session property value or a catalog session property.
-
-.. _session-properties-definition:
-
-Session properties
-------------------
-
-A session property is a :doc:`configuration property </admin/properties>` that
-can be temporarily modified by a user for the duration of the current
-connection session to the Trino cluster. Many configuration properties have a
-corresponding session property that accepts the same values as the config
-property.
-
-There are two types of session properties:
-
-* **System session properties** apply to the whole cluster. Most session
-  properties are system session properties unless specified otherwise.
-* **Catalog session properties** are connector-defined session properties that
-  can be set on a per-catalog basis. These properties must be set separately for
-  each catalog by including the catalog name as a prefix, such as
-  ``catalogname.property_name``.
-
-Session properties are tied to the current session, so a user can have multiple
-connections to a cluster that each have different values for the same session
-properties. Once a session ends, either by disconnecting or creating a new
-session, any changes made to session properties during the previous session are
-lost.
-
-Examples
---------
-
-The following example sets a system session property to enable optimized hash
-generation::
-
-    SET SESSION optimize_hash_generation = true;
-
-The following example sets the ``optimize_locality_enabled`` catalog session
-property for an :doc:`Accumulo catalog </connector/accumulo>` named ``acc01``::
-
-    SET SESSION acc01.optimize_locality_enabled = false;
-
-The example ``acc01.optimize_locality_enabled`` catalog session property
-does not apply to any other catalog, even if another catalog also uses the
-Accumulo connector.
-
-See also
---------
-
-:doc:`reset-session`, :doc:`show-session`
diff --git a/docs/src/main/sphinx/sql/set-time-zone.md b/docs/src/main/sphinx/sql/set-time-zone.md
new file mode 100644
index 000000000000..9921f9bb61a6
--- /dev/null
+++ b/docs/src/main/sphinx/sql/set-time-zone.md
@@ -0,0 +1,67 @@
+# SET TIME ZONE
+
+## Synopsis
+
+```text
+SET TIME ZONE LOCAL
+SET TIME ZONE expression
+```
+
+## Description
+
+Sets the default time zone for the current session.
+
+If the `LOCAL` option is specified, the time zone for the current session
+is set to the initial time zone of the session.
+
+If the `expression` option is specified:
+
+- if the type of the `expression` is a string, the time zone for the current
+  session is set to the corresponding region-based time zone ID or the
+  corresponding zone offset.
+- if the type of the `expression` is an interval, the time zone for the
+  current session is set to the corresponding zone offset relative to UTC.
+  It must be in the range of \[-14,14\] hours.
+
+## Examples
+
+Use the default time zone for the current session:
+
+```
+SET TIME ZONE LOCAL;
+```
+
+Use a zone offset for specifying the time zone:
+
+```
+SET TIME ZONE '-08:00';
+```
+
+Use an interval literal for specifying the time zone:
+
+```
+SET TIME ZONE INTERVAL '10' HOUR;
+SET TIME ZONE INTERVAL -'08:00' HOUR TO MINUTE;
+```
+
+Use a region-based time zone identifier for specifying the time zone:
+
+```
+SET TIME ZONE 'America/Los_Angeles';
+```
+
+The time zone identifier to be used can be passed as the output of a
+function call:
+
+```
+SET TIME ZONE concat_ws('/', 'America', 'Los_Angeles');
+```
+
+## Limitations
+
+Setting the default time zone for the session has no effect if
+the `sql.forced-session-time-zone` configuration property is already set.
+
+## See also
+
+- {func}`current_timezone`
diff --git a/docs/src/main/sphinx/sql/set-time-zone.rst b/docs/src/main/sphinx/sql/set-time-zone.rst
deleted file mode 100644
index 5614ed46adb0..000000000000
--- a/docs/src/main/sphinx/sql/set-time-zone.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-=============
-SET TIME ZONE
-=============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SET TIME ZONE LOCAL
-    SET TIME ZONE expression
-
-Description
------------
-
-Sets the default time zone for the current session.
-
-If the ``LOCAL`` option is specified, the time zone for the current session
-is set to the initial time zone of the session.
-
-If the ``expression`` option is specified:
-
-* if the type of the ``expression`` is a string, the time zone for the current
-  session is set to the corresponding region-based time zone ID or the
-  corresponding zone offset.
-
-* if the type of the ``expression`` is an interval, the time zone for the
-  current session is set to the corresponding zone offset relative to UTC.
-  It must be in the range of [-14,14] hours.
-
-
-Examples
---------
-
-Use the default time zone for the current session::
-
-    SET TIME ZONE LOCAL;
-
-Use a zone offset for specifying the time zone::
-
-    SET TIME ZONE '-08:00';
-
-Use an interval literal for specifying the time zone::
-
-    SET TIME ZONE INTERVAL '10' HOUR;
-    SET TIME ZONE INTERVAL -'08:00' HOUR TO MINUTE;
-
-Use a region-based time zone identifier for specifying the time zone::
-
-    SET TIME ZONE 'America/Los_Angeles';
-
-The time zone identifier to be used can be passed as the output of a
-function call::
-
-    SET TIME ZONE concat_ws('/', 'America', 'Los_Angeles');
-
-Limitations
------------
-
-Setting the default time zone for the session has no effect if
-the ``sql.forced-session-time-zone`` configuration property is already set.
-
-See also
---------
-
-- :func:`current_timezone`
diff --git a/docs/src/main/sphinx/sql/show-catalogs.md b/docs/src/main/sphinx/sql/show-catalogs.md
new file mode 100644
index 000000000000..1f253d794018
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-catalogs.md
@@ -0,0 +1,19 @@
+# SHOW CATALOGS
+
+## Synopsis
+
+```text
+SHOW CATALOGS [ LIKE pattern ]
+```
+
+## Description
+
+List the available catalogs.
+
+{ref}`Specify a pattern <like-operator>` in the optional `LIKE` clause to
+filter the results to the desired subset. For example, the following query
+allows you to find catalogs that begin with `t`:
+
+```
+SHOW CATALOGS LIKE 't%'
+```
diff --git a/docs/src/main/sphinx/sql/show-catalogs.rst b/docs/src/main/sphinx/sql/show-catalogs.rst
deleted file mode 100644
index 75fe7118ce0c..000000000000
--- a/docs/src/main/sphinx/sql/show-catalogs.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-=============
-SHOW CATALOGS
-=============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW CATALOGS [ LIKE pattern ]
-
-Description
------------
-
-List the available catalogs.
-
-:ref:`Specify a pattern <like_operator>` in the optional ``LIKE`` clause to
-filter the results to the desired subset. For example, the following query
-allows you to find catalogs that begin with ``t``::
-
-    SHOW CATALOGS LIKE 't%'
diff --git a/docs/src/main/sphinx/sql/show-columns.md b/docs/src/main/sphinx/sql/show-columns.md
new file mode 100644
index 000000000000..3a399296a08f
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-columns.md
@@ -0,0 +1,39 @@
+# SHOW COLUMNS
+
+## Synopsis
+
+```text
+SHOW COLUMNS FROM table [ LIKE pattern ]
+```
+
+## Description
+
+List the columns in a `table` along with their data type and other attributes:
+
+```
+SHOW COLUMNS FROM nation;
+```
+
+```text
+  Column   |     Type     | Extra | Comment
+-----------+--------------+-------+---------
+ nationkey | bigint       |       |
+ name      | varchar(25)  |       |
+ regionkey | bigint       |       |
+ comment   | varchar(152) |       |
+```
+
+{ref}`Specify a pattern <like-operator>` in the optional `LIKE` clause to
+filter the results to the desired subset. For example, the following query
+allows you to find columns ending in `key`:
+
+```
+SHOW COLUMNS FROM nation LIKE '%key';
+```
+
+```text
+  Column   |     Type     | Extra | Comment
+-----------+--------------+-------+---------
+ nationkey | bigint       |       |
+ regionkey | bigint       |       |
+```
diff --git a/docs/src/main/sphinx/sql/show-columns.rst b/docs/src/main/sphinx/sql/show-columns.rst
deleted file mode 100644
index 771157be604c..000000000000
--- a/docs/src/main/sphinx/sql/show-columns.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-============
-SHOW COLUMNS
-============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW COLUMNS FROM table [ LIKE pattern ]
-
-Description
------------
-
-List the columns in a ``table`` along with their data type and other attributes.
-
-:ref:`Specify a pattern <like_operator>` in the optional ``LIKE`` clause to
-filter the results to the desired subset. For example, the following query
-allows you to find columns ending in ``key``::
-
-    SHOW COLUMNS FROM nation LIKE '%key'
diff --git a/docs/src/main/sphinx/sql/show-create-materialized-view.md b/docs/src/main/sphinx/sql/show-create-materialized-view.md
new file mode 100644
index 000000000000..915a49c838e9
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-create-materialized-view.md
@@ -0,0 +1,18 @@
+# SHOW CREATE MATERIALIZED VIEW
+
+## Synopsis
+
+```text
+SHOW CREATE MATERIALIZED VIEW view_name
+```
+
+## Description
+
+Show the SQL statement that creates the specified materialized view
+`view_name`.
+
+## See also
+
+- {doc}`create-materialized-view`
+- {doc}`drop-materialized-view`
+- {doc}`refresh-materialized-view`
diff --git a/docs/src/main/sphinx/sql/show-create-materialized-view.rst b/docs/src/main/sphinx/sql/show-create-materialized-view.rst
deleted file mode 100644
index fa4c7375b789..000000000000
--- a/docs/src/main/sphinx/sql/show-create-materialized-view.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-=============================
-SHOW CREATE MATERIALIZED VIEW
-=============================
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW CREATE MATERIALIZED VIEW view_name
-
-Description
------------
-
-Show the SQL statement that creates the specified materialized view
-``view_name``.
-
-See also
---------
-
-* :doc:`create-materialized-view`
-* :doc:`drop-materialized-view`
-* :doc:`refresh-materialized-view`
diff --git a/docs/src/main/sphinx/sql/show-create-schema.md b/docs/src/main/sphinx/sql/show-create-schema.md
new file mode 100644
index 000000000000..fdf9b01c67a5
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-create-schema.md
@@ -0,0 +1,15 @@
+# SHOW CREATE SCHEMA
+
+## Synopsis
+
+```text
+SHOW CREATE SCHEMA schema_name
+```
+
+## Description
+
+Show the SQL statement that creates the specified schema.
+
+## See also
+
+{doc}`create-schema`
diff --git a/docs/src/main/sphinx/sql/show-create-schema.rst b/docs/src/main/sphinx/sql/show-create-schema.rst
deleted file mode 100644
index a226a72846e6..000000000000
--- a/docs/src/main/sphinx/sql/show-create-schema.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-==================
-SHOW CREATE SCHEMA
-==================
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW CREATE SCHEMA schema_name
-
-Description
------------
-
-Show the SQL statement that creates the specified schema.
-
-See also
---------
-
-:doc:`create-schema`
diff --git a/docs/src/main/sphinx/sql/show-create-table.md b/docs/src/main/sphinx/sql/show-create-table.md
new file mode 100644
index 000000000000..41d428aecafa
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-create-table.md
@@ -0,0 +1,39 @@
+# SHOW CREATE TABLE
+
+## Synopsis
+
+```text
+SHOW CREATE TABLE table_name
+```
+
+## Description
+
+Show the SQL statement that creates the specified table.
+
+## Examples
+
+Show the SQL that can be run to create the `orders` table:
+
+```
+SHOW CREATE TABLE sf1.orders;
+```
+
+```text
+              Create Table
+-----------------------------------------
+ CREATE TABLE tpch.sf1.orders (
+    orderkey bigint,
+    orderstatus varchar,
+    totalprice double,
+    orderdate varchar
+ )
+ WITH (
+    format = 'ORC',
+    partitioned_by = ARRAY['orderdate']
+ )
+(1 row)
+```
+
+## See also
+
+{doc}`create-table`
diff --git a/docs/src/main/sphinx/sql/show-create-table.rst b/docs/src/main/sphinx/sql/show-create-table.rst
deleted file mode 100644
index 00823d60c212..000000000000
--- a/docs/src/main/sphinx/sql/show-create-table.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-=================
-SHOW CREATE TABLE
-=================
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW CREATE TABLE table_name
-
-Description
------------
-
-Show the SQL statement that creates the specified table.
-
-Examples
---------
-
-Show the SQL that can be run to create the ``orders`` table::
-
-    SHOW CREATE TABLE sf1.orders;
-
-.. code-block:: text
-
-                  Create Table
-    -----------------------------------------
-     CREATE TABLE tpch.sf1.orders (
-        orderkey bigint,
-        orderstatus varchar,
-        totalprice double,
-        orderdate varchar
-     )
-     WITH (
-        format = 'ORC',
-        partitioned_by = ARRAY['orderdate']
-     )
-    (1 row)
-
-See also
---------
-
-:doc:`create-table`
diff --git a/docs/src/main/sphinx/sql/show-create-view.md b/docs/src/main/sphinx/sql/show-create-view.md
new file mode 100644
index 000000000000..dd1377d12fee
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-create-view.md
@@ -0,0 +1,15 @@
+# SHOW CREATE VIEW
+
+## Synopsis
+
+```text
+SHOW CREATE VIEW view_name
+```
+
+## Description
+
+Show the SQL statement that creates the specified view.
+
+## See also
+
+{doc}`create-view`
diff --git a/docs/src/main/sphinx/sql/show-create-view.rst b/docs/src/main/sphinx/sql/show-create-view.rst
deleted file mode 100644
index 25cf2ac85a18..000000000000
--- a/docs/src/main/sphinx/sql/show-create-view.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-================
-SHOW CREATE VIEW
-================
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW CREATE VIEW view_name
-
-Description
------------
-
-Show the SQL statement that creates the specified view.
-
-See also
---------
-
-:doc:`create-view`
diff --git a/docs/src/main/sphinx/sql/show-functions.md b/docs/src/main/sphinx/sql/show-functions.md
new file mode 100644
index 000000000000..013dfd0d98a3
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-functions.md
@@ -0,0 +1,68 @@
+# SHOW FUNCTIONS
+
+## Synopsis
+
+```text
+SHOW FUNCTIONS [ FROM schema ] [ LIKE pattern ]
+```
+
+## Description
+
+List functions in `schema` or all functions in the current session path. This
+can include built-in functions, [functions from a custom
+plugin](/develop/functions), and [SQL routines](/routines).
+
+For each function returned, the following information is displayed:
+
+- Function name
+- Return type
+- Argument types
+- Function type
+- Deterministic
+- Description
+
+Use the optional `FROM` keyword to only list functions in a specific catalog and
+schema. The location in `schema` must be specified as
+`cataglog_name.schema_name`.
+
+{ref}`Specify a pattern <like-operator>` in the optional `LIKE` clause to
+filter the results to the desired subset.
+
+## Examples
+
+List all SQL routines and plugin functions in the `default` schema of the
+`example` catalog:
+
+```sql
+SHOW FUNCTIONS FROM example.default;
+```
+
+List all functions with a name beginning with `array`:
+
+```sql
+SHOW FUNCTIONS LIKE 'array%';
+```
+
+List all functions with a name beginning with `cf`:
+
+```sql
+SHOW FUNCTIONS LIKE 'cf%';
+```
+
+Example output:
+
+```text
+     Function      | Return Type | Argument Types | Function Type | Deterministic |               Description
+ ------------------+-------------+----------------+---------------+---------------+-----------------------------------------
+ cf_getgroups      | varchar     |                | scalar        | true          | Returns the current session's groups
+ cf_getprincipal   | varchar     |                | scalar        | true          | Returns the current session's principal
+ cf_getuser        | varchar     |                | scalar        | true          | Returns the current session's user
+```
+
+## See also
+
+* [](/functions)
+* [](/routines)
+* [](/develop/functions)
+* [](/sql/create-function)
+* [](/sql/drop-function)
diff --git a/docs/src/main/sphinx/sql/show-functions.rst b/docs/src/main/sphinx/sql/show-functions.rst
deleted file mode 100644
index 62525eee4320..000000000000
--- a/docs/src/main/sphinx/sql/show-functions.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-==============
-SHOW FUNCTIONS
-==============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW FUNCTIONS [ LIKE pattern ]
-
-Description
------------
-
-List all the functions available for use in queries. For each function returned,
-the following information is displayed:
-
-* Function name
-* Return type
-* Argument types
-* Function type
-* Deterministic
-* Description
-
-:ref:`Specify a pattern <like_operator>` in the optional ``LIKE`` clause to
-filter the results to the desired subset. For example, the following query
-allows you to find functions beginning with ``array``::
-
-    SHOW FUNCTIONS LIKE 'array%';
-
-``SHOW FUNCTIONS`` works with built-in functions as well as with :doc:`custom
-functions </develop/functions>`. In the following example, three custom
-functions beginning with ``cf`` are available:
-
-.. code-block:: text
-
-   SHOW FUNCTIONS LIKE 'cf%';
-
-        Function      | Return Type | Argument Types | Function Type | Deterministic |               Description
-    ------------------+-------------+----------------+---------------+---------------+-----------------------------------------
-    cf_getgroups      | varchar     |                | scalar        | true          | Returns the current session's groups
-    cf_getprincipal   | varchar     |                | scalar        | true          | Returns the current session's principal
-    cf_getuser        | varchar     |                | scalar        | true          | Returns the current session's user
diff --git a/docs/src/main/sphinx/sql/show-grants.md b/docs/src/main/sphinx/sql/show-grants.md
new file mode 100644
index 000000000000..2ff6f5bf383b
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-grants.md
@@ -0,0 +1,42 @@
+# SHOW GRANTS
+
+## Synopsis
+
+```text
+SHOW GRANTS [ ON [ TABLE ] table_name ]
+```
+
+## Description
+
+List the grants for the current user on the specified table in the current catalog.
+
+If no table name is specified, the command lists the grants for the current user on all the tables in all schemas of the current catalog.
+
+The command requires the current catalog to be set.
+
+:::{note}
+Ensure that authentication has been enabled before running any of the authorization commands.
+:::
+
+## Examples
+
+List the grants for the current user on table `orders`:
+
+```
+SHOW GRANTS ON TABLE orders;
+```
+
+List the grants for the current user on all the tables in all schemas of the current catalog:
+
+```
+SHOW GRANTS;
+```
+
+## Limitations
+
+Some connectors have no support for `SHOW GRANTS`.
+See connector documentation for more details.
+
+## See also
+
+{doc}`grant`, {doc}`revoke`
diff --git a/docs/src/main/sphinx/sql/show-grants.rst b/docs/src/main/sphinx/sql/show-grants.rst
deleted file mode 100644
index 6546afcc35ec..000000000000
--- a/docs/src/main/sphinx/sql/show-grants.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-===========
-SHOW GRANTS
-===========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW GRANTS [ ON [ TABLE ] table_name ]
-
-Description
------------
-
-List the grants for the current user on the specified table in the current catalog.
-
-If no table name is specified, the command lists the grants for the current user on all the tables in all schemas of the current catalog.
-
-The command requires the current catalog to be set.
-
-.. note::
-
-    Ensure that authentication has been enabled before running any of the authorization commands.
-
-Examples
---------
-
-List the grants for the current user on table ``orders``::
-
-    SHOW GRANTS ON TABLE orders;
-
-List the grants for the current user on all the tables in all schemas of the current catalog::
-
-    SHOW GRANTS;
-
-Limitations
------------
-
-Some connectors have no support for ``SHOW GRANTS``.
-See connector documentation for more details.
-
-See also
---------
-
-:doc:`grant`, :doc:`revoke`
diff --git a/docs/src/main/sphinx/sql/show-role-grants.md b/docs/src/main/sphinx/sql/show-role-grants.md
new file mode 100644
index 000000000000..1170ae13b0ea
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-role-grants.md
@@ -0,0 +1,11 @@
+# SHOW ROLE GRANTS
+
+## Synopsis
+
+```text
+SHOW ROLE GRANTS [ FROM catalog ]
+```
+
+## Description
+
+List non-recursively the system roles or roles in `catalog` that have been granted to the session user.
diff --git a/docs/src/main/sphinx/sql/show-role-grants.rst b/docs/src/main/sphinx/sql/show-role-grants.rst
deleted file mode 100644
index f0f32a3b5c52..000000000000
--- a/docs/src/main/sphinx/sql/show-role-grants.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-================
-SHOW ROLE GRANTS
-================
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW ROLE GRANTS [ FROM catalog ]
-
-Description
------------
-
-List non-recursively the system roles or roles in ``catalog`` that have been granted to the session user.
diff --git a/docs/src/main/sphinx/sql/show-roles.md b/docs/src/main/sphinx/sql/show-roles.md
new file mode 100644
index 000000000000..4476048c4a06
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-roles.md
@@ -0,0 +1,13 @@
+# SHOW ROLES
+
+## Synopsis
+
+```text
+SHOW [CURRENT] ROLES [ FROM catalog ]
+```
+
+## Description
+
+`SHOW ROLES` lists all the system roles or all the roles in `catalog`.
+
+`SHOW CURRENT ROLES` lists the enabled system roles or roles in `catalog`.
diff --git a/docs/src/main/sphinx/sql/show-roles.rst b/docs/src/main/sphinx/sql/show-roles.rst
deleted file mode 100644
index b6bca436c817..000000000000
--- a/docs/src/main/sphinx/sql/show-roles.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-==========
-SHOW ROLES
-==========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW [CURRENT] ROLES [ FROM catalog ]
-
-Description
------------
-
-``SHOW ROLES`` lists all the system roles or all the roles in ``catalog``.
-
-``SHOW CURRENT ROLES`` lists the enabled system roles or roles in ``catalog``.
diff --git a/docs/src/main/sphinx/sql/show-schemas.md b/docs/src/main/sphinx/sql/show-schemas.md
new file mode 100644
index 000000000000..0c5160457061
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-schemas.md
@@ -0,0 +1,19 @@
+# SHOW SCHEMAS
+
+## Synopsis
+
+```text
+SHOW SCHEMAS [ FROM catalog ] [ LIKE pattern ]
+```
+
+## Description
+
+List the schemas in `catalog` or in the current catalog.
+
+{ref}`Specify a pattern <like-operator>` in the optional `LIKE` clause to
+filter the results to the desired subset. For example, the following query
+allows you to find schemas that have `3` as the third character:
+
+```
+SHOW SCHEMAS FROM tpch LIKE '__3%'
+```
diff --git a/docs/src/main/sphinx/sql/show-schemas.rst b/docs/src/main/sphinx/sql/show-schemas.rst
deleted file mode 100644
index 06c66b0feda7..000000000000
--- a/docs/src/main/sphinx/sql/show-schemas.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-============
-SHOW SCHEMAS
-============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW SCHEMAS [ FROM catalog ] [ LIKE pattern ]
-
-Description
------------
-
-List the schemas in ``catalog`` or in the current catalog.
-
-:ref:`Specify a pattern <like_operator>` in the optional ``LIKE`` clause to
-filter the results to the desired subset. For example, the following query
-allows you to find schemas that have ``3`` as the third character::
-
-    SHOW SCHEMAS FROM tpch LIKE '__3%'
diff --git a/docs/src/main/sphinx/sql/show-session.md b/docs/src/main/sphinx/sql/show-session.md
new file mode 100644
index 000000000000..e19846475103
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-session.md
@@ -0,0 +1,23 @@
+# SHOW SESSION
+
+## Synopsis
+
+```text
+SHOW SESSION [ LIKE pattern ]
+```
+
+## Description
+
+List the current {ref}`session properties <session-properties-definition>`.
+
+{ref}`Specify a pattern <like-operator>` in the optional `LIKE` clause to
+filter the results to the desired subset. For example, the following query
+allows you to find session properties that begin with `query`:
+
+```
+SHOW SESSION LIKE 'query%'
+```
+
+## See also
+
+{doc}`reset-session`, {doc}`set-session`
diff --git a/docs/src/main/sphinx/sql/show-session.rst b/docs/src/main/sphinx/sql/show-session.rst
deleted file mode 100644
index 211a0136613d..000000000000
--- a/docs/src/main/sphinx/sql/show-session.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-============
-SHOW SESSION
-============
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW SESSION [ LIKE pattern ]
-
-Description
------------
-
-List the current :ref:`session properties <session-properties-definition>`.
-
-:ref:`Specify a pattern <like_operator>` in the optional ``LIKE`` clause to
-filter the results to the desired subset. For example, the following query
-allows you to find session properties that begin with ``query``::
-
-    SHOW SESSION LIKE 'query%'
-
-See also
---------
-
-:doc:`reset-session`, :doc:`set-session`
diff --git a/docs/src/main/sphinx/sql/show-stats.md b/docs/src/main/sphinx/sql/show-stats.md
new file mode 100644
index 000000000000..2c5f27af0123
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-stats.md
@@ -0,0 +1,57 @@
+# SHOW STATS
+
+## Synopsis
+
+```text
+SHOW STATS FOR table
+SHOW STATS FOR ( query )
+```
+
+## Description
+
+Returns approximated statistics for the named table or for the results of a
+query. Returns `NULL` for any statistics that are not populated or
+unavailable on the data source.
+
+Statistics are returned as a row for each column, plus a summary row for
+the table (identifiable by a `NULL` value for `column_name`). The following
+table lists the returned columns and what statistics they represent. Any
+additional statistics collected on the data source, other than those listed
+here, are not included.
+
+:::{list-table} Statistics
+:widths: 20, 40, 40
+:header-rows: 1
+
+* - Column
+  - Description
+  - Notes
+* - `column_name`
+  - The name of the column
+  - `NULL` in the table summary row
+* - `data_size`
+  - The total size in bytes of all of the values in the column
+  - `NULL` in the table summary row. Available for columns of
+    [string](string-data-types) data types with variable widths.
+* - `distinct_values_count`
+  - The estimated number of distinct values in the column
+  - `NULL` in the table summary row
+* - `nulls_fractions`
+  - The portion of the values in the column that are `NULL`
+  - `NULL` in the table summary row.
+* - `row_count`
+  - The estimated number of rows in the table
+  - `NULL` in column statistic rows
+* - `low_value`
+  - The lowest value found in this column
+  - `NULL` in the table summary row. Available for columns of
+    [DATE](date-data-type), [integer](integer-data-types),
+    [floating-point](floating-point-data-types), and
+    [fixed-precision](fixed-precision-data-types) data types.
+* - `high_value`
+  - The highest value found in this column
+  - `NULL` in the table summary row. Available for columns of
+    [DATE](date-data-type), [integer](integer-data-types),
+    [floating-point](floating-point-data-types), and
+    [fixed-precision](fixed-precision-data-types) data types.
+ :::
diff --git a/docs/src/main/sphinx/sql/show-stats.rst b/docs/src/main/sphinx/sql/show-stats.rst
deleted file mode 100644
index 26f0eb86afed..000000000000
--- a/docs/src/main/sphinx/sql/show-stats.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-==========
-SHOW STATS
-==========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW STATS FOR table
-    SHOW STATS FOR ( query )
-
-Description
------------
-
-Returns approximated statistics for the named table or for the results of a
-query. Returns ``NULL`` for any statistics that are not populated or
-unavailable on the data source.
-
-Statistics are returned as a row for each column, plus a summary row for
-the table (identifiable by a ``NULL`` value for ``column_name``). The following
-table lists the returned columns and what statistics they represent. Any
-additional statistics collected on the data source, other than those listed
-here, are not included.
-
-==========================  ============================================================= =================================
-Column                      Description                                                   Notes
-==========================  ============================================================= =================================
-``column_name``             The name of the column                                        ``NULL`` in the table summary row
-``data_size``               The total size in bytes of all of the values in the column    ``NULL`` in the table summary row. Available for columns of textual types (``CHAR``, ``VARCHAR``, etc)
-``distinct_values_count``   The estimated number of distinct values in the column m       ``NULL`` in the table summary row
-``nulls_fractions``         The portion of the values in the column that are ``NULL``     ``NULL`` in the table summary row.
-``row_count``               The estimated number of rows in the table                     ``NULL`` in column statistic rows
-``low_value``               The lowest value found in this column                         ``NULL`` in the table summary row. Available for columns of numeric types (``BIGINT``, ``DECIMAL``, etc)
-``high_value``              The highest value found in this column                        ``NULL`` in the table summary row. Available for columns of numeric types (``BIGINT``, ``DECIMAL``, etc)
-==========================  ============================================================= =================================
diff --git a/docs/src/main/sphinx/sql/show-tables.md b/docs/src/main/sphinx/sql/show-tables.md
new file mode 100644
index 000000000000..17dce4ad8f48
--- /dev/null
+++ b/docs/src/main/sphinx/sql/show-tables.md
@@ -0,0 +1,19 @@
+# SHOW TABLES
+
+## Synopsis
+
+```text
+SHOW TABLES [ FROM schema ] [ LIKE pattern ]
+```
+
+## Description
+
+List the tables in `schema` or in the current schema.
+
+{ref}`Specify a pattern <like-operator>` in the optional `LIKE` clause to
+filter the results to the desired subset.. For example, the following query
+allows you to find tables that begin with `p`:
+
+```
+SHOW TABLES FROM tpch.tiny LIKE 'p%';
+```
diff --git a/docs/src/main/sphinx/sql/show-tables.rst b/docs/src/main/sphinx/sql/show-tables.rst
deleted file mode 100644
index d0f1365be675..000000000000
--- a/docs/src/main/sphinx/sql/show-tables.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-===========
-SHOW TABLES
-===========
-
-Synopsis
---------
-
-.. code-block:: text
-
-    SHOW TABLES [ FROM schema ] [ LIKE pattern ]
-
-Description
------------
-
-List the tables in ``schema`` or in the current schema.
-
-:ref:`Specify a pattern <like_operator>` in the optional ``LIKE`` clause to
-filter the results to the desired subset.. For example, the following query
-allows you to find tables that begin with ``p``::
-
-    SHOW TABLES FROM tpch.tiny LIKE 'p%';
diff --git a/docs/src/main/sphinx/sql/start-transaction.md b/docs/src/main/sphinx/sql/start-transaction.md
new file mode 100644
index 000000000000..e293dc5c083c
--- /dev/null
+++ b/docs/src/main/sphinx/sql/start-transaction.md
@@ -0,0 +1,32 @@
+# START TRANSACTION
+
+## Synopsis
+
+```text
+START TRANSACTION [ mode [, ...] ]
+```
+
+where `mode` is one of
+
+```text
+ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
+READ { ONLY | WRITE }
+```
+
+## Description
+
+Start a new transaction for the current session.
+
+## Examples
+
+```sql
+START TRANSACTION;
+START TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+START TRANSACTION READ WRITE;
+START TRANSACTION ISOLATION LEVEL READ COMMITTED, READ ONLY;
+START TRANSACTION READ WRITE, ISOLATION LEVEL SERIALIZABLE;
+```
+
+## See also
+
+{doc}`commit`, {doc}`rollback`
diff --git a/docs/src/main/sphinx/sql/start-transaction.rst b/docs/src/main/sphinx/sql/start-transaction.rst
deleted file mode 100644
index 28ee3421b3d1..000000000000
--- a/docs/src/main/sphinx/sql/start-transaction.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-=================
-START TRANSACTION
-=================
-
-Synopsis
---------
-
-.. code-block:: text
-
-    START TRANSACTION [ mode [, ...] ]
-
-where ``mode`` is one of
-
-.. code-block:: text
-
-    ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
-    READ { ONLY | WRITE }
-
-Description
------------
-
-Start a new transaction for the current session.
-
-Examples
---------
-
-.. code-block:: sql
-
-    START TRANSACTION;
-    START TRANSACTION ISOLATION LEVEL REPEATABLE READ;
-    START TRANSACTION READ WRITE;
-    START TRANSACTION ISOLATION LEVEL READ COMMITTED, READ ONLY;
-    START TRANSACTION READ WRITE, ISOLATION LEVEL SERIALIZABLE;
-
-See also
---------
-
-:doc:`commit`, :doc:`rollback`
diff --git a/docs/src/main/sphinx/sql/truncate.md b/docs/src/main/sphinx/sql/truncate.md
new file mode 100644
index 000000000000..e1f634b5c258
--- /dev/null
+++ b/docs/src/main/sphinx/sql/truncate.md
@@ -0,0 +1,19 @@
+# TRUNCATE
+
+## Synopsis
+
+```none
+TRUNCATE TABLE table_name
+```
+
+## Description
+
+Delete all rows from a table.
+
+## Examples
+
+Truncate the table `orders`:
+
+```
+TRUNCATE TABLE orders;
+```
diff --git a/docs/src/main/sphinx/sql/truncate.rst b/docs/src/main/sphinx/sql/truncate.rst
deleted file mode 100644
index 711a71216e3d..000000000000
--- a/docs/src/main/sphinx/sql/truncate.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-========
-TRUNCATE
-========
-
-Synopsis
---------
-
-.. code-block:: none
-
-    TRUNCATE TABLE table_name
-
-Description
------------
-
-Delete all rows from a table.
-
-Examples
---------
-
-Truncate the table ``orders``::
-
-    TRUNCATE TABLE orders;
-
diff --git a/docs/src/main/sphinx/sql/update.md b/docs/src/main/sphinx/sql/update.md
new file mode 100644
index 000000000000..0f6a698f13ba
--- /dev/null
+++ b/docs/src/main/sphinx/sql/update.md
@@ -0,0 +1,61 @@
+# UPDATE
+
+## Synopsis
+
+```text
+UPDATE table_name SET [ ( column = expression [, ... ] ) ] [ WHERE condition ]
+```
+
+## Description
+
+Update selected columns values in existing rows in a table.
+
+The columns named in the `column = expression` assignments will be updated
+for all rows that match the `WHERE` condition.  The values of all column update
+expressions for a matching row are evaluated before any column value is changed.
+When the type of the expression and the type of the column differ, the usual implicit
+CASTs, such as widening numeric fields, are applied to the `UPDATE` expression values.
+
+## Examples
+
+Update the status of all purchases that haven't been assigned a ship date:
+
+```
+UPDATE
+  purchases
+SET
+  status = 'OVERDUE'
+WHERE
+  ship_date IS NULL;
+```
+
+Update the account manager and account assign date for all customers:
+
+```
+UPDATE
+  customers
+SET
+  account_manager = 'John Henry',
+  assign_date = now();
+```
+
+Update the manager to be the name of the employee who matches the manager ID:
+
+```
+UPDATE
+  new_hires
+SET
+  manager = (
+    SELECT
+      e.name
+    FROM
+      employees e
+    WHERE
+      e.employee_id = new_hires.manager_id
+  );
+```
+
+## Limitations
+
+Some connectors have limited or no support for `UPDATE`.
+See connector documentation for more details.
diff --git a/docs/src/main/sphinx/sql/update.rst b/docs/src/main/sphinx/sql/update.rst
deleted file mode 100644
index c80d8be75912..000000000000
--- a/docs/src/main/sphinx/sql/update.rst
+++ /dev/null
@@ -1,62 +0,0 @@
-======
-UPDATE
-======
-
-Synopsis
---------
-
-.. code-block:: text
-
-    UPDATE table_name SET [ ( column = expression [, ... ] ) ] [ WHERE condition ]
-
-Description
------------
-
-Update selected columns values in existing rows in a table.
-
-The columns named in the ``column = expression`` assignments will be updated
-for all rows that match the ``WHERE`` condition.  The values of all column update
-expressions for a matching row are evaluated before any column value is changed.
-When the type of the expression and the type of the column differ, the usual implicit
-CASTs, such as widening numeric fields, are applied to the ``UPDATE`` expression values.
-
-
-Examples
---------
-
-Update the status of all purchases that haven't been assigned a ship date::
-
-    UPDATE
-      purchases
-    SET
-      status = 'OVERDUE'
-    WHERE
-      ship_date IS NULL;
-
-Update the account manager and account assign date for all customers::
-
-    UPDATE
-      customers
-    SET
-      account_manager = 'John Henry',
-      assign_date = now();
-
-Update the manager to be the name of the employee who matches the manager ID::
-
-    UPDATE
-      new_hires
-    SET
-      manager = (
-        SELECT
-          e.name
-        FROM
-          employees e
-        WHERE
-          e.employee_id = new_hires.manager_id
-      );
-
-Limitations
------------
-
-Some connectors have limited or no support for ``UPDATE``.
-See connector documentation for more details.
diff --git a/docs/src/main/sphinx/sql/use.md b/docs/src/main/sphinx/sql/use.md
new file mode 100644
index 000000000000..ae693eeedc60
--- /dev/null
+++ b/docs/src/main/sphinx/sql/use.md
@@ -0,0 +1,21 @@
+# USE
+
+## Synopsis
+
+```text
+USE catalog.schema
+USE schema
+```
+
+## Description
+
+Update the session to use the specified catalog and schema. If a
+catalog is not specified, the schema is resolved relative to the
+current catalog.
+
+## Examples
+
+```sql
+USE hive.finance;
+USE information_schema;
+```
diff --git a/docs/src/main/sphinx/sql/use.rst b/docs/src/main/sphinx/sql/use.rst
deleted file mode 100644
index b7a13d892e07..000000000000
--- a/docs/src/main/sphinx/sql/use.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-===
-USE
-===
-
-Synopsis
---------
-
-.. code-block:: text
-
-    USE catalog.schema
-    USE schema
-
-Description
------------
-
-Update the session to use the specified catalog and schema. If a
-catalog is not specified, the schema is resolved relative to the
-current catalog.
-
-
-Examples
---------
-
-.. code-block:: sql
-
-    USE hive.finance;
-    USE information_schema;
diff --git a/docs/src/main/sphinx/sql/values.md b/docs/src/main/sphinx/sql/values.md
new file mode 100644
index 000000000000..3b478c0735a5
--- /dev/null
+++ b/docs/src/main/sphinx/sql/values.md
@@ -0,0 +1,66 @@
+# VALUES
+
+## Synopsis
+
+```text
+VALUES row [, ...]
+```
+
+where `row` is a single expression or
+
+```text
+( column_expression [, ...] )
+```
+
+## Description
+
+Defines a literal inline table.
+
+`VALUES` can be used anywhere a query can be used (e.g., the `FROM` clause
+of a {doc}`select`, an {doc}`insert`, or even at the top level). `VALUES` creates
+an anonymous table without column names, but the table and columns can be named
+using an `AS` clause with column aliases.
+
+## Examples
+
+Return a table with one column and three rows:
+
+```
+VALUES 1, 2, 3
+```
+
+Return a table with two columns and three rows:
+
+```
+VALUES
+    (1, 'a'),
+    (2, 'b'),
+    (3, 'c')
+```
+
+Return table with column `id` and `name`:
+
+```
+SELECT * FROM (
+    VALUES
+        (1, 'a'),
+        (2, 'b'),
+        (3, 'c')
+) AS t (id, name)
+```
+
+Create a new table with column `id` and `name`:
+
+```
+CREATE TABLE example AS
+SELECT * FROM (
+    VALUES
+        (1, 'a'),
+        (2, 'b'),
+        (3, 'c')
+) AS t (id, name)
+```
+
+## See also
+
+{doc}`insert`, {doc}`select`
diff --git a/docs/src/main/sphinx/sql/values.rst b/docs/src/main/sphinx/sql/values.rst
deleted file mode 100644
index fa8615591459..000000000000
--- a/docs/src/main/sphinx/sql/values.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-======
-VALUES
-======
-
-Synopsis
---------
-
-.. code-block:: text
-
-    VALUES row [, ...]
-
-
-where ``row`` is a single expression or
-
-.. code-block:: text
-
-    ( column_expression [, ...] )
-
-
-Description
------------
-
-Defines a literal inline table.
-
-``VALUES`` can be used anywhere a query can be used (e.g., the ``FROM`` clause
-of a :doc:`select`, an :doc:`insert`, or even at the top level). ``VALUES`` creates
-an anonymous table without column names, but the table and columns can be named
-using an ``AS`` clause with column aliases.
-
-Examples
---------
-
-Return a table with one column and three rows::
-
-    VALUES 1, 2, 3
-
-Return a table with two columns and three rows::
-
-    VALUES
-        (1, 'a'),
-        (2, 'b'),
-        (3, 'c')
-
-Return table with column ``id`` and ``name``::
-
-    SELECT * FROM (
-        VALUES
-            (1, 'a'),
-            (2, 'b'),
-            (3, 'c')
-    ) AS t (id, name)
-
-Create a new table with column ``id`` and ``name``::
-
-    CREATE TABLE example AS
-    SELECT * FROM (
-        VALUES
-            (1, 'a'),
-            (2, 'b'),
-            (3, 'c')
-    ) AS t (id, name)
-
-See also
---------
-
-:doc:`insert`, :doc:`select`
diff --git a/docs/src/main/sphinx/static/img/kinesis.png b/docs/src/main/sphinx/static/img/kinesis.png
index 10e811531831..7f5619032211 100644
Binary files a/docs/src/main/sphinx/static/img/kinesis.png and b/docs/src/main/sphinx/static/img/kinesis.png differ
diff --git a/docs/src/main/sphinx/static/img/redshift.png b/docs/src/main/sphinx/static/img/redshift.png
index 5760a3a05573..de9ccabfb747 100644
Binary files a/docs/src/main/sphinx/static/img/redshift.png and b/docs/src/main/sphinx/static/img/redshift.png differ
diff --git a/docs/src/main/sphinx/static/img/snowflake.png b/docs/src/main/sphinx/static/img/snowflake.png
new file mode 100644
index 000000000000..b337bc4d5a77
Binary files /dev/null and b/docs/src/main/sphinx/static/img/snowflake.png differ
diff --git a/lib/trino-array/pom.xml b/lib/trino-array/pom.xml
index d0c70b74e77a..124707cef584 100644
--- a/lib/trino-array/pom.xml
+++ b/lib/trino-array/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-array</artifactId>
-    <name>trino-array</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,8 +17,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
@@ -27,12 +26,22 @@
             <artifactId>slice</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>it.unimi.dsi</groupId>
             <artifactId>fastutil</artifactId>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing-services</artifactId>
@@ -40,20 +49,32 @@
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
+            <artifactId>jmh-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/lib/trino-array/src/main/java/io/trino/array/ShortBigArray.java b/lib/trino-array/src/main/java/io/trino/array/ShortBigArray.java
index 8c80ac1f5a43..ab6019debd9a 100644
--- a/lib/trino-array/src/main/java/io/trino/array/ShortBigArray.java
+++ b/lib/trino-array/src/main/java/io/trino/array/ShortBigArray.java
@@ -13,6 +13,7 @@
  */
 package io.trino.array;
 
+import com.google.common.primitives.Shorts;
 import io.airlift.slice.SizeOf;
 
 import java.util.Arrays;
@@ -102,7 +103,7 @@ public void increment(long index)
      */
     public void add(long index, long value)
     {
-        array[segment(index)][offset(index)] += value;
+        array[segment(index)][offset(index)] += Shorts.checkedCast(value);
     }
 
     /**
diff --git a/lib/trino-array/src/main/java/io/trino/array/SliceBigArray.java b/lib/trino-array/src/main/java/io/trino/array/SliceBigArray.java
index 0e4af70d4f52..96bbd74368b8 100644
--- a/lib/trino-array/src/main/java/io/trino/array/SliceBigArray.java
+++ b/lib/trino-array/src/main/java/io/trino/array/SliceBigArray.java
@@ -78,7 +78,7 @@ private void updateRetainedSize(long index, Slice value)
     {
         Slice currentValue = array.get(index);
         if (currentValue != null) {
-            int baseReferenceCount = trackedSlices.decrementAndGet(currentValue.getBase());
+            int baseReferenceCount = trackedSlices.decrementAndGet(currentValue.byteArray());
             int sliceReferenceCount = trackedSlices.decrementAndGet(currentValue);
             if (baseReferenceCount == 0) {
                 // it is the last referenced base
@@ -90,7 +90,7 @@ else if (sliceReferenceCount == 0) {
             }
         }
         if (value != null) {
-            int baseReferenceCount = trackedSlices.incrementAndGet(value.getBase());
+            int baseReferenceCount = trackedSlices.incrementAndGet(value.byteArray());
             int sliceReferenceCount = trackedSlices.incrementAndGet(value);
             if (baseReferenceCount == 1) {
                 // it is the first referenced base
diff --git a/lib/trino-array/src/main/java/io/trino/array/SqlMapBigArray.java b/lib/trino-array/src/main/java/io/trino/array/SqlMapBigArray.java
new file mode 100644
index 000000000000..a20f07a38f4a
--- /dev/null
+++ b/lib/trino-array/src/main/java/io/trino/array/SqlMapBigArray.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed 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 io.trino.array;
+
+import io.trino.spi.block.SqlMap;
+
+import static io.airlift.slice.SizeOf.instanceSize;
+
+public final class SqlMapBigArray
+{
+    private static final int INSTANCE_SIZE = instanceSize(SqlMapBigArray.class);
+    private final ObjectBigArray<SqlMap> array;
+    private final ReferenceCountMap trackedObjects = new ReferenceCountMap();
+    private long sizeOfBlocks;
+
+    public SqlMapBigArray()
+    {
+        array = new ObjectBigArray<>();
+    }
+
+    public SqlMapBigArray(SqlMap sqlMap)
+    {
+        array = new ObjectBigArray<>(sqlMap);
+    }
+
+    /**
+     * Returns the size of this big array in bytes.
+     */
+    public long sizeOf()
+    {
+        return INSTANCE_SIZE + array.sizeOf() + sizeOfBlocks + trackedObjects.sizeOf();
+    }
+
+    /**
+     * Returns the element of this big array at specified index.
+     *
+     * @param index a position in this big array.
+     * @return the element of this big array at the specified position.
+     */
+    public SqlMap get(long index)
+    {
+        return array.get(index);
+    }
+
+    /**
+     * Sets the element of this big array at specified index.
+     *
+     * @param index a position in this big array.
+     */
+    public void set(long index, SqlMap value)
+    {
+        SqlMap currentValue = array.get(index);
+        if (currentValue != null) {
+            currentValue.retainedBytesForEachPart((object, size) -> {
+                if (currentValue == object) {
+                    // track instance size separately as the reference count for an instance is always 1
+                    sizeOfBlocks -= size;
+                    return;
+                }
+                if (trackedObjects.decrementAndGet(object) == 0) {
+                    // decrement the size only when it is the last reference
+                    sizeOfBlocks -= size;
+                }
+            });
+        }
+        if (value != null) {
+            value.retainedBytesForEachPart((object, size) -> {
+                if (value == object) {
+                    // track instance size separately as the reference count for an instance is always 1
+                    sizeOfBlocks += size;
+                    return;
+                }
+                if (trackedObjects.incrementAndGet(object) == 1) {
+                    // increment the size only when it is the first reference
+                    sizeOfBlocks += size;
+                }
+            });
+        }
+        array.set(index, value);
+    }
+
+    /**
+     * Ensures this big array is at least the specified length.  If the array is smaller, segments
+     * are added until the array is larger then the specified length.
+     */
+    public void ensureCapacity(long length)
+    {
+        array.ensureCapacity(length);
+    }
+}
diff --git a/lib/trino-array/src/main/java/io/trino/array/SqlRowBigArray.java b/lib/trino-array/src/main/java/io/trino/array/SqlRowBigArray.java
new file mode 100644
index 000000000000..47160c3da1b4
--- /dev/null
+++ b/lib/trino-array/src/main/java/io/trino/array/SqlRowBigArray.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed 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 io.trino.array;
+
+import io.trino.spi.block.SqlRow;
+
+import static io.airlift.slice.SizeOf.instanceSize;
+
+public final class SqlRowBigArray
+{
+    private static final int INSTANCE_SIZE = instanceSize(SqlRowBigArray.class);
+    private final ObjectBigArray<SqlRow> array;
+    private final ReferenceCountMap trackedObjects = new ReferenceCountMap();
+    private long sizeOfBlocks;
+
+    public SqlRowBigArray()
+    {
+        array = new ObjectBigArray<>();
+    }
+
+    public SqlRowBigArray(SqlRow sqlRow)
+    {
+        array = new ObjectBigArray<>(sqlRow);
+    }
+
+    /**
+     * Returns the size of this big array in bytes.
+     */
+    public long sizeOf()
+    {
+        return INSTANCE_SIZE + array.sizeOf() + sizeOfBlocks + trackedObjects.sizeOf();
+    }
+
+    /**
+     * Returns the element of this big array at specified index.
+     *
+     * @param index a position in this big array.
+     * @return the element of this big array at the specified position.
+     */
+    public SqlRow get(long index)
+    {
+        return array.get(index);
+    }
+
+    /**
+     * Sets the element of this big array at specified index.
+     *
+     * @param index a position in this big array.
+     */
+    public void set(long index, SqlRow value)
+    {
+        SqlRow currentValue = array.get(index);
+        if (currentValue != null) {
+            currentValue.retainedBytesForEachPart((object, size) -> {
+                if (currentValue == object) {
+                    // track instance size separately as the reference count for an instance is always 1
+                    sizeOfBlocks -= size;
+                    return;
+                }
+                if (trackedObjects.decrementAndGet(object) == 0) {
+                    // decrement the size only when it is the last reference
+                    sizeOfBlocks -= size;
+                }
+            });
+        }
+        if (value != null) {
+            value.retainedBytesForEachPart((object, size) -> {
+                if (value == object) {
+                    // track instance size separately as the reference count for an instance is always 1
+                    sizeOfBlocks += size;
+                    return;
+                }
+                if (trackedObjects.incrementAndGet(object) == 1) {
+                    // increment the size only when it is the first reference
+                    sizeOfBlocks += size;
+                }
+            });
+        }
+        array.set(index, value);
+    }
+
+    /**
+     * Ensures this big array is at least the specified length.  If the array is smaller, segments
+     * are added until the array is larger then the specified length.
+     */
+    public void ensureCapacity(long length)
+    {
+        array.ensureCapacity(length);
+    }
+}
diff --git a/lib/trino-array/src/test/java/io/trino/array/BenchmarkReferenceCountMap.java b/lib/trino-array/src/test/java/io/trino/array/BenchmarkReferenceCountMap.java
index bdf56d64c214..bf2f27e0641d 100644
--- a/lib/trino-array/src/test/java/io/trino/array/BenchmarkReferenceCountMap.java
+++ b/lib/trino-array/src/test/java/io/trino/array/BenchmarkReferenceCountMap.java
@@ -32,9 +32,6 @@
 import java.util.concurrent.TimeUnit;
 
 import static io.airlift.slice.Slices.wrappedBuffer;
-import static io.airlift.slice.Slices.wrappedDoubleArray;
-import static io.airlift.slice.Slices.wrappedIntArray;
-import static io.airlift.slice.Slices.wrappedLongArray;
 import static io.trino.jmh.Benchmarks.benchmark;
 
 @OutputTimeUnit(TimeUnit.SECONDS)
@@ -49,8 +46,8 @@ public class BenchmarkReferenceCountMap
     @State(Scope.Thread)
     public static class Data
     {
-        @Param({"int", "double", "long", "byte"})
-        private String arrayType = "int";
+        @Param("byte")
+        private String arrayType = "byte";
         private Object[] bases = new Object[NUMBER_OF_BASES];
         private Slice[] slices = new Slice[NUMBER_OF_ENTRIES];
 
@@ -59,15 +56,6 @@ public void setup()
         {
             for (int i = 0; i < NUMBER_OF_BASES; i++) {
                 switch (arrayType) {
-                    case "int":
-                        bases[i] = new int[ThreadLocalRandom.current().nextInt(NUMBER_OF_BASES)];
-                        break;
-                    case "double":
-                        bases[i] = new double[ThreadLocalRandom.current().nextInt(NUMBER_OF_BASES)];
-                        break;
-                    case "long":
-                        bases[i] = new long[ThreadLocalRandom.current().nextInt(NUMBER_OF_BASES)];
-                        break;
                     case "byte":
                         bases[i] = new byte[ThreadLocalRandom.current().nextInt(NUMBER_OF_BASES)];
                         break;
@@ -79,18 +67,6 @@ public void setup()
             for (int i = 0; i < NUMBER_OF_ENTRIES; i++) {
                 Object base = bases[ThreadLocalRandom.current().nextInt(NUMBER_OF_BASES)];
                 switch (arrayType) {
-                    case "int":
-                        int[] intBase = (int[]) base;
-                        slices[i] = wrappedIntArray(intBase, 0, intBase.length);
-                        break;
-                    case "double":
-                        double[] doubleBase = (double[]) base;
-                        slices[i] = wrappedDoubleArray(doubleBase, 0, doubleBase.length);
-                        break;
-                    case "long":
-                        long[] longBase = (long[]) base;
-                        slices[i] = wrappedLongArray(longBase, 0, longBase.length);
-                        break;
                     case "byte":
                         byte[] byteBase = (byte[]) base;
                         slices[i] = wrappedBuffer(byteBase, 0, byteBase.length);
@@ -109,7 +85,7 @@ public ReferenceCountMap benchmarkInserts(Data data)
         ReferenceCountMap map = new ReferenceCountMap();
         for (int i = 0; i < NUMBER_OF_ENTRIES; i++) {
             map.incrementAndGet(data.slices[i]);
-            map.incrementAndGet(data.slices[i].getBase());
+            map.incrementAndGet(data.slices[i].byteArray());
         }
         return map;
     }
diff --git a/lib/trino-array/src/test/java/io/trino/array/TestBlockBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestBlockBigArray.java
index c52bf3fd9063..37b769ef7928 100644
--- a/lib/trino-array/src/test/java/io/trino/array/TestBlockBigArray.java
+++ b/lib/trino-array/src/test/java/io/trino/array/TestBlockBigArray.java
@@ -14,12 +14,11 @@
 package io.trino.array;
 
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.IntArrayBlockBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.slice.SizeOf.instanceSize;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBlockBigArray
 {
@@ -27,7 +26,7 @@ public class TestBlockBigArray
     public void testRetainedSizeWithOverlappingBlocks()
     {
         int entries = 123;
-        BlockBuilder blockBuilder = new IntArrayBlockBuilder(null, entries);
+        IntArrayBlockBuilder blockBuilder = new IntArrayBlockBuilder(null, entries);
         for (int i = 0; i < entries; i++) {
             blockBuilder.writeInt(i);
         }
@@ -47,7 +46,7 @@ public void testRetainedSizeWithOverlappingBlocks()
         long expectedSize = instanceSize(BlockBigArray.class)
                 + referenceCountMap.sizeOf()
                 + (new ObjectBigArray<>()).sizeOf()
-                + block.getRetainedSizeInBytes() + (arraySize - 1) * instanceSize(block.getClass());
-        assertEquals(blockBigArray.sizeOf(), expectedSize);
+                + block.getRetainedSizeInBytes() + (arraySize - 1L) * instanceSize(block.getClass());
+        assertThat(blockBigArray.sizeOf()).isEqualTo(expectedSize);
     }
 }
diff --git a/lib/trino-array/src/test/java/io/trino/array/TestBooleanBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestBooleanBigArray.java
index a9a53063de5e..b2d1930fb1e8 100644
--- a/lib/trino-array/src/test/java/io/trino/array/TestBooleanBigArray.java
+++ b/lib/trino-array/src/test/java/io/trino/array/TestBooleanBigArray.java
@@ -13,11 +13,11 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBooleanBigArray
 {
@@ -38,7 +38,7 @@ private static void assertFillCapacity(BooleanBigArray array, long capacity, boo
         array.fill(value);
 
         for (int i = 0; i < capacity; i++) {
-            assertEquals(array.get(i), value);
+            assertThat(array.get(i)).isEqualTo(value);
         }
     }
 
@@ -74,13 +74,13 @@ private static void assertCopyTo(BooleanBigArray source, long sourceIndex, Boole
         source.copyTo(sourceIndex, destination, destinationIndex, length);
 
         for (long i = 0; i < destinationIndex; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
         for (long i = 0; i < length; i++) {
-            assertEquals(source.get(sourceIndex + i), destination.get(destinationIndex + i));
+            assertThat(source.get(sourceIndex + i)).isEqualTo(destination.get(destinationIndex + i));
         }
         for (long i = destinationIndex + length; i < destinationCapacity; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
     }
 }
diff --git a/lib/trino-array/src/test/java/io/trino/array/TestByteBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestByteBigArray.java
index 1bc07302f5fe..73a2354a2e96 100644
--- a/lib/trino-array/src/test/java/io/trino/array/TestByteBigArray.java
+++ b/lib/trino-array/src/test/java/io/trino/array/TestByteBigArray.java
@@ -13,11 +13,11 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestByteBigArray
 {
@@ -38,7 +38,7 @@ private static void assertFillCapacity(ByteBigArray array, long capacity, byte v
         array.fill(value);
 
         for (int i = 0; i < capacity; i++) {
-            assertEquals(array.get(i), value);
+            assertThat(array.get(i)).isEqualTo(value);
         }
     }
 
@@ -75,13 +75,13 @@ private static void assertCopyTo(ByteBigArray source, long sourceIndex, ByteBigA
         source.copyTo(sourceIndex, destination, destinationIndex, length);
 
         for (long i = 0; i < destinationIndex; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
         for (long i = 0; i < length; i++) {
-            assertEquals(source.get(sourceIndex + i), destination.get(destinationIndex + i));
+            assertThat(source.get(sourceIndex + i)).isEqualTo(destination.get(destinationIndex + i));
         }
         for (long i = destinationIndex + length; i < destinationCapacity; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
     }
 }
diff --git a/lib/trino-array/src/test/java/io/trino/array/TestDoubleBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestDoubleBigArray.java
index 733aad3cad89..a003f1ea4a63 100644
--- a/lib/trino-array/src/test/java/io/trino/array/TestDoubleBigArray.java
+++ b/lib/trino-array/src/test/java/io/trino/array/TestDoubleBigArray.java
@@ -13,11 +13,11 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDoubleBigArray
 {
@@ -38,7 +38,7 @@ private static void assertFillCapacity(DoubleBigArray array, long capacity, doub
         array.fill(value);
 
         for (int i = 0; i < capacity; i++) {
-            assertEquals(array.get(i), value);
+            assertThat(array.get(i)).isEqualTo(value);
         }
     }
 
@@ -75,13 +75,13 @@ private static void assertCopyTo(DoubleBigArray source, long sourceIndex, Double
         source.copyTo(sourceIndex, destination, destinationIndex, length);
 
         for (long i = 0; i < destinationIndex; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
         for (long i = 0; i < length; i++) {
-            assertEquals(source.get(sourceIndex + i), destination.get(destinationIndex + i));
+            assertThat(source.get(sourceIndex + i)).isEqualTo(destination.get(destinationIndex + i));
         }
         for (long i = destinationIndex + length; i < destinationCapacity; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
     }
 }
diff --git a/lib/trino-array/src/test/java/io/trino/array/TestIntBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestIntBigArray.java
index 96ae28e0e4d5..099f359b5213 100644
--- a/lib/trino-array/src/test/java/io/trino/array/TestIntBigArray.java
+++ b/lib/trino-array/src/test/java/io/trino/array/TestIntBigArray.java
@@ -13,11 +13,11 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIntBigArray
 {
@@ -38,7 +38,7 @@ private static void assertFillCapacity(IntBigArray array, long capacity, int val
         array.fill(value);
 
         for (int i = 0; i < capacity; i++) {
-            assertEquals(array.get(i), value);
+            assertThat(array.get(i)).isEqualTo(value);
         }
     }
 
@@ -75,13 +75,13 @@ private static void assertCopyTo(IntBigArray source, long sourceIndex, IntBigArr
         source.copyTo(sourceIndex, destination, destinationIndex, length);
 
         for (long i = 0; i < destinationIndex; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
         for (long i = 0; i < length; i++) {
-            assertEquals(source.get(sourceIndex + i), destination.get(destinationIndex + i));
+            assertThat(source.get(sourceIndex + i)).isEqualTo(destination.get(destinationIndex + i));
         }
         for (long i = destinationIndex + length; i < destinationCapacity; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
     }
 }
diff --git a/lib/trino-array/src/test/java/io/trino/array/TestLongBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestLongBigArray.java
index 2404416907e0..14c8547a688f 100644
--- a/lib/trino-array/src/test/java/io/trino/array/TestLongBigArray.java
+++ b/lib/trino-array/src/test/java/io/trino/array/TestLongBigArray.java
@@ -13,11 +13,11 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestLongBigArray
 {
@@ -38,7 +38,7 @@ private static void assertFillCapacity(LongBigArray array, long capacity, long v
         array.fill(value);
 
         for (int i = 0; i < capacity; i++) {
-            assertEquals(array.get(i), value);
+            assertThat(array.get(i)).isEqualTo(value);
         }
     }
 
@@ -75,13 +75,13 @@ private static void assertCopyTo(LongBigArray source, long sourceIndex, LongBigA
         source.copyTo(sourceIndex, destination, destinationIndex, length);
 
         for (long i = 0; i < destinationIndex; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
         for (long i = 0; i < length; i++) {
-            assertEquals(source.get(sourceIndex + i), destination.get(destinationIndex + i));
+            assertThat(source.get(sourceIndex + i)).isEqualTo(destination.get(destinationIndex + i));
         }
         for (long i = destinationIndex + length; i < destinationCapacity; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
     }
 }
diff --git a/lib/trino-array/src/test/java/io/trino/array/TestObjectBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestObjectBigArray.java
index 8f5bf4bad7dc..0f0550056b5c 100644
--- a/lib/trino-array/src/test/java/io/trino/array/TestObjectBigArray.java
+++ b/lib/trino-array/src/test/java/io/trino/array/TestObjectBigArray.java
@@ -13,11 +13,11 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestObjectBigArray
 {
@@ -38,7 +38,7 @@ private static <T> void assertFillCapacity(ObjectBigArray<T> array, long capacit
         array.fill(value);
 
         for (int i = 0; i < capacity; i++) {
-            assertEquals(array.get(i), value);
+            assertThat(array.get(i)).isEqualTo(value);
         }
     }
 
@@ -75,13 +75,13 @@ private static void assertCopyTo(ObjectBigArray<String> source, long sourceIndex
         source.copyTo(sourceIndex, destination, destinationIndex, length);
 
         for (long i = 0; i < destinationIndex; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
         for (long i = 0; i < length; i++) {
-            assertEquals(source.get(sourceIndex + i), destination.get(destinationIndex + i));
+            assertThat(source.get(sourceIndex + i)).isEqualTo(destination.get(destinationIndex + i));
         }
         for (long i = destinationIndex + length; i < destinationCapacity; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
     }
 }
diff --git a/lib/trino-array/src/test/java/io/trino/array/TestShortBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestShortBigArray.java
index 3d39c9b0328f..d1c378df023c 100644
--- a/lib/trino-array/src/test/java/io/trino/array/TestShortBigArray.java
+++ b/lib/trino-array/src/test/java/io/trino/array/TestShortBigArray.java
@@ -13,11 +13,11 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestShortBigArray
 {
@@ -38,7 +38,7 @@ private static void assertFillCapacity(ShortBigArray array, long capacity, short
         array.fill(value);
 
         for (int i = 0; i < capacity; i++) {
-            assertEquals(array.get(i), value);
+            assertThat(array.get(i)).isEqualTo(value);
         }
     }
 
@@ -75,13 +75,13 @@ private static void assertCopyTo(ShortBigArray source, long sourceIndex, ShortBi
         source.copyTo(sourceIndex, destination, destinationIndex, length);
 
         for (long i = 0; i < destinationIndex; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
         for (long i = 0; i < length; i++) {
-            assertEquals(source.get(sourceIndex + i), destination.get(destinationIndex + i));
+            assertThat(source.get(sourceIndex + i)).isEqualTo(destination.get(destinationIndex + i));
         }
         for (long i = destinationIndex + length; i < destinationCapacity; i++) {
-            assertEquals(destination.get(i), destinationFillValue);
+            assertThat(destination.get(i)).isEqualTo(destinationFillValue);
         }
     }
 }
diff --git a/lib/trino-array/src/test/java/io/trino/array/TestSliceBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestSliceBigArray.java
index 0a5a96f85408..c310a902ed4f 100644
--- a/lib/trino-array/src/test/java/io/trino/array/TestSliceBigArray.java
+++ b/lib/trino-array/src/test/java/io/trino/array/TestSliceBigArray.java
@@ -14,15 +14,13 @@
 package io.trino.array;
 
 import io.airlift.slice.Slice;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.airlift.slice.Slices.wrappedBuffer;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class TestSliceBigArray
 {
     private static final long BIG_ARRAY_INSTANCE_SIZE = instanceSize(SliceBigArray.class) + new ReferenceCountMap().sizeOf() + new ObjectBigArray<Slice>().sizeOf();
@@ -30,72 +28,73 @@ public class TestSliceBigArray
     private static final int CAPACITY = 32;
     private final byte[] firstBytes = new byte[1234];
     private final byte[] secondBytes = new byte[4567];
-    private SliceBigArray sliceBigArray;
-
-    @BeforeMethod
-    public void setup()
-    {
-        sliceBigArray = new SliceBigArray();
-        sliceBigArray.ensureCapacity(CAPACITY);
-    }
 
     @Test
     public void testSameSliceRetainedSize()
     {
+        SliceBigArray sliceBigArray = new SliceBigArray();
+        sliceBigArray.ensureCapacity(CAPACITY);
+
         // same slice should be counted only once
         Slice slice = wrappedBuffer(secondBytes, 201, 1501);
         for (int i = 0; i < CAPACITY; i++) {
             sliceBigArray.set(i, slice);
-            assertEquals(sliceBigArray.sizeOf(), BIG_ARRAY_INSTANCE_SIZE + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE);
+            assertThat(sliceBigArray.sizeOf()).isEqualTo(BIG_ARRAY_INSTANCE_SIZE + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE);
         }
 
         // adding a new slice will increase the size
         slice = wrappedBuffer(secondBytes, 201, 1501);
         sliceBigArray.set(3, slice);
-        assertEquals(sliceBigArray.sizeOf(), BIG_ARRAY_INSTANCE_SIZE + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE * 2);
+        assertThat(sliceBigArray.sizeOf()).isEqualTo(BIG_ARRAY_INSTANCE_SIZE + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE * 2);
     }
 
     @Test
     public void testNullSlicesRetainedSize()
     {
+        SliceBigArray sliceBigArray = new SliceBigArray();
+        sliceBigArray.ensureCapacity(CAPACITY);
+
         // add null values
         sliceBigArray.set(0, null);
-        assertEquals(sliceBigArray.sizeOf(), BIG_ARRAY_INSTANCE_SIZE);
+        assertThat(sliceBigArray.sizeOf()).isEqualTo(BIG_ARRAY_INSTANCE_SIZE);
 
         // replace null with a slice
         sliceBigArray.set(0, wrappedBuffer(secondBytes, 201, 1501));
-        assertEquals(sliceBigArray.sizeOf(), BIG_ARRAY_INSTANCE_SIZE + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE);
+        assertThat(sliceBigArray.sizeOf()).isEqualTo(BIG_ARRAY_INSTANCE_SIZE + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE);
 
         // add another slice
         sliceBigArray.set(1, wrappedBuffer(secondBytes, 201, 1501));
-        assertEquals(sliceBigArray.sizeOf(), BIG_ARRAY_INSTANCE_SIZE + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE * 2);
+        assertThat(sliceBigArray.sizeOf()).isEqualTo(BIG_ARRAY_INSTANCE_SIZE + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE * 2);
 
         // replace slice with null
         sliceBigArray.set(1, null);
-        assertEquals(sliceBigArray.sizeOf(), BIG_ARRAY_INSTANCE_SIZE + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE);
+        assertThat(sliceBigArray.sizeOf()).isEqualTo(BIG_ARRAY_INSTANCE_SIZE + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE);
     }
 
     @Test
     public void testRetainedSize()
     {
+        SliceBigArray sliceBigArray = new SliceBigArray();
+        sliceBigArray.ensureCapacity(CAPACITY);
+
         // add two elements
         sliceBigArray.set(0, wrappedBuffer(firstBytes, 0, 100));
         sliceBigArray.set(1, wrappedBuffer(secondBytes, 0, 100));
-        assertEquals(sliceBigArray.sizeOf(), BIG_ARRAY_INSTANCE_SIZE + sizeOf(firstBytes) + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE * 2);
+        assertThat(sliceBigArray.sizeOf()).isEqualTo(BIG_ARRAY_INSTANCE_SIZE + sizeOf(firstBytes) + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE * 2);
 
         // add two more
         sliceBigArray.set(2, wrappedBuffer(firstBytes, 100, 200));
         sliceBigArray.set(3, wrappedBuffer(secondBytes, 20, 150));
-        assertEquals(sliceBigArray.sizeOf(), BIG_ARRAY_INSTANCE_SIZE + sizeOf(firstBytes) + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE * 4);
+        assertThat(sliceBigArray.sizeOf()).isEqualTo(BIG_ARRAY_INSTANCE_SIZE + sizeOf(firstBytes) + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE * 4);
 
         // replace with different slices but the same base
         sliceBigArray.set(2, wrappedBuffer(firstBytes, 11, 1200));
         sliceBigArray.set(3, wrappedBuffer(secondBytes, 201, 1501));
-        assertEquals(sliceBigArray.sizeOf(), BIG_ARRAY_INSTANCE_SIZE + sizeOf(firstBytes) + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE * 4);
+        assertThat(sliceBigArray.sizeOf()).isEqualTo(BIG_ARRAY_INSTANCE_SIZE + sizeOf(firstBytes) + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE * 4);
 
         // replace with a different slice with a different base
         sliceBigArray.set(0, wrappedBuffer(secondBytes, 11, 1200));
         sliceBigArray.set(2, wrappedBuffer(secondBytes, 201, 1501));
-        assertEquals(sliceBigArray.sizeOf(), BIG_ARRAY_INSTANCE_SIZE + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE * 4);
+        assertThat(sliceBigArray.sizeOf()).isEqualTo(BIG_ARRAY_INSTANCE_SIZE + sizeOf(secondBytes) + SLICE_INSTANCE_SIZE * 4);
     }
 }
diff --git a/lib/trino-cache/pom.xml b/lib/trino-cache/pom.xml
new file mode 100644
index 000000000000..85136f65fca5
--- /dev/null
+++ b/lib/trino-cache/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>io.trino</groupId>
+        <artifactId>trino-root</artifactId>
+        <version>432-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>trino-cache</artifactId>
+
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <air.compiler.fail-warnings>true</air.compiler.fail-warnings>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/lib/trino-cache/src/main/java/io/trino/cache/CacheUtils.java b/lib/trino-cache/src/main/java/io/trino/cache/CacheUtils.java
new file mode 100644
index 000000000000..614ebaa210f2
--- /dev/null
+++ b/lib/trino-cache/src/main/java/io/trino/cache/CacheUtils.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed 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 io.trino.cache;
+
+import com.google.common.cache.Cache;
+
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+
+public final class CacheUtils
+{
+    private CacheUtils() {}
+
+    public static <K, V> V uncheckedCacheGet(Cache<K, V> cache, K key, Supplier<V> loader)
+    {
+        try {
+            return cache.get(key, loader::get);
+        }
+        catch (ExecutionException e) {
+            // this can not happen because a supplier can not throw a checked exception
+            throw new RuntimeException("Unexpected checked exception from cache load", e);
+        }
+    }
+
+    public static <K> void invalidateAllIf(Cache<K, ?> cache, Predicate<? super K> filterFunction)
+    {
+        List<K> cacheKeys = cache.asMap().keySet().stream()
+                .filter(filterFunction)
+                .collect(toImmutableList());
+        cache.invalidateAll(cacheKeys);
+    }
+}
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/ElementTypesAreNonnullByDefault.java b/lib/trino-cache/src/main/java/io/trino/cache/ElementTypesAreNonnullByDefault.java
similarity index 75%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/ElementTypesAreNonnullByDefault.java
rename to lib/trino-cache/src/main/java/io/trino/cache/ElementTypesAreNonnullByDefault.java
index 38d821a4bc98..f1900465c540 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/ElementTypesAreNonnullByDefault.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/ElementTypesAreNonnullByDefault.java
@@ -11,17 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
-import javax.annotation.Nonnull;
-import javax.annotation.meta.TypeQualifierDefault;
+import jakarta.annotation.Nonnull;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
@@ -31,6 +27,5 @@
  */
 @Retention(SOURCE)
 @Target(TYPE)
-@TypeQualifierDefault({FIELD, METHOD, PARAMETER})
 @Nonnull
 @interface ElementTypesAreNonnullByDefault {}
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/EmptyCache.java b/lib/trino-cache/src/main/java/io/trino/cache/EmptyCache.java
similarity index 98%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/EmptyCache.java
rename to lib/trino-cache/src/main/java/io/trino/cache/EmptyCache.java
index 7ad5646fb24d..73e587c5fe0d 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/EmptyCache.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/EmptyCache.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.cache.AbstractLoadingCache;
 import com.google.common.cache.CacheLoader;
@@ -20,9 +20,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.UncheckedExecutionException;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Collection;
 import java.util.Map;
@@ -46,7 +44,6 @@ class EmptyCache<K, V>
         this.statsCounter = recordStats ? new SimpleStatsCounter() : new NoopStatsCounter();
     }
 
-    @CheckForNull
     @Override
     public V getIfPresent(Object key)
     {
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/EvictableCache.java b/lib/trino-cache/src/main/java/io/trino/cache/EvictableCache.java
similarity index 99%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/EvictableCache.java
rename to lib/trino-cache/src/main/java/io/trino/cache/EvictableCache.java
index 3c6043ad4776..c8bdb0784069 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/EvictableCache.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/EvictableCache.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.cache.AbstractLoadingCache;
@@ -24,11 +24,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.ListenableFuture;
+import jakarta.annotation.Nullable;
 import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -92,7 +90,6 @@ private static <K, V> LoadingCache<K, V> buildUnsafeCache(CacheBuilder<? super K
         return cacheBuilder.build(cacheLoader);
     }
 
-    @CheckForNull
     @Override
     public V getIfPresent(Object key)
     {
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/EvictableCacheBuilder.java b/lib/trino-cache/src/main/java/io/trino/cache/EvictableCacheBuilder.java
similarity index 85%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/EvictableCacheBuilder.java
rename to lib/trino-cache/src/main/java/io/trino/cache/EvictableCacheBuilder.java
index 14234ab8f6d0..b270264a953a 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/EvictableCacheBuilder.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/EvictableCacheBuilder.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Ticker;
@@ -22,7 +22,7 @@
 import com.google.common.cache.Weigher;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.CheckReturnValue;
-import io.trino.collect.cache.EvictableCache.Token;
+import io.trino.cache.EvictableCache.Token;
 import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 
 import java.time.Duration;
@@ -53,6 +53,7 @@ public static EvictableCacheBuilder<Object, Object> newBuilder()
     private Optional<Duration> refreshAfterWrite = Optional.empty();
     private Optional<Long> maximumSize = Optional.empty();
     private Optional<Long> maximumWeight = Optional.empty();
+    private Optional<Integer> concurrencyLevel = Optional.empty();
     private Optional<Weigher<? super Token<K>, ? super V>> weigher = Optional.empty();
     private boolean recordStats;
     private Optional<DisabledCacheImplementation> disabledCacheImplementation = Optional.empty();
@@ -78,7 +79,7 @@ public EvictableCacheBuilder<K, V> expireAfterWrite(long duration, TimeUnit unit
     @CanIgnoreReturnValue
     public EvictableCacheBuilder<K, V> expireAfterWrite(Duration duration)
     {
-        checkState(!this.expireAfterWrite.isPresent(), "expireAfterWrite already set");
+        checkState(this.expireAfterWrite.isEmpty(), "expireAfterWrite already set");
         this.expireAfterWrite = Optional.of(duration);
         return this;
     }
@@ -92,7 +93,7 @@ public EvictableCacheBuilder<K, V> refreshAfterWrite(long duration, TimeUnit uni
     @CanIgnoreReturnValue
     public EvictableCacheBuilder<K, V> refreshAfterWrite(Duration duration)
     {
-        checkState(!this.refreshAfterWrite.isPresent(), "refreshAfterWrite already set");
+        checkState(this.refreshAfterWrite.isEmpty(), "refreshAfterWrite already set");
         this.refreshAfterWrite = Optional.of(duration);
         return this;
     }
@@ -100,8 +101,8 @@ public EvictableCacheBuilder<K, V> refreshAfterWrite(Duration duration)
     @CanIgnoreReturnValue
     public EvictableCacheBuilder<K, V> maximumSize(long maximumSize)
     {
-        checkState(!this.maximumSize.isPresent(), "maximumSize already set");
-        checkState(!this.maximumWeight.isPresent(), "maximumWeight already set");
+        checkState(this.maximumSize.isEmpty(), "maximumSize already set");
+        checkState(this.maximumWeight.isEmpty(), "maximumWeight already set");
         this.maximumSize = Optional.of(maximumSize);
         return this;
     }
@@ -109,15 +110,23 @@ public EvictableCacheBuilder<K, V> maximumSize(long maximumSize)
     @CanIgnoreReturnValue
     public EvictableCacheBuilder<K, V> maximumWeight(long maximumWeight)
     {
-        checkState(!this.maximumWeight.isPresent(), "maximumWeight already set");
-        checkState(!this.maximumSize.isPresent(), "maximumSize already set");
+        checkState(this.maximumWeight.isEmpty(), "maximumWeight already set");
+        checkState(this.maximumSize.isEmpty(), "maximumSize already set");
         this.maximumWeight = Optional.of(maximumWeight);
         return this;
     }
 
+    @CanIgnoreReturnValue
+    public EvictableCacheBuilder<K, V> concurrencyLevel(int concurrencyLevel)
+    {
+        checkState(this.concurrencyLevel.isEmpty(), "concurrencyLevel already set");
+        this.concurrencyLevel = Optional.of(concurrencyLevel);
+        return this;
+    }
+
     public <K1 extends K, V1 extends V> EvictableCacheBuilder<K1, V1> weigher(Weigher<? super K1, ? super V1> weigher)
     {
-        checkState(!this.weigher.isPresent(), "weigher already set");
+        checkState(this.weigher.isEmpty(), "weigher already set");
         @SuppressWarnings("unchecked") // see com.google.common.cache.CacheBuilder.weigher
         EvictableCacheBuilder<K1, V1> cast = (EvictableCacheBuilder<K1, V1>) this;
         cast.weigher = Optional.of(new TokenWeigher<>(weigher));
@@ -153,7 +162,7 @@ public EvictableCacheBuilder<K, V> shareNothingWhenDisabled()
     @VisibleForTesting
     EvictableCacheBuilder<K, V> disabledCacheImplementation(DisabledCacheImplementation cacheImplementation)
     {
-        checkState(!disabledCacheImplementation.isPresent(), "disabledCacheImplementation already set");
+        checkState(disabledCacheImplementation.isEmpty(), "disabledCacheImplementation already set");
         disabledCacheImplementation = Optional.of(cacheImplementation);
         return this;
     }
@@ -173,10 +182,9 @@ public <K1 extends K, V1 extends V> LoadingCache<K1, V1> build(CacheLoader<? sup
                     "Even when cache is disabled, the loads are synchronized and both load results and failures are shared between threads. " +
                             "This is rarely desired, thus builder caller is expected to either opt-in into this behavior with shareResultsAndFailuresEvenIfDisabled(), " +
                             "or choose not to share results (and failures) between concurrent invocations with shareNothingWhenDisabled()."));
-            switch (disabledCacheImplementation) {
-                case NOOP:
-                    return new EmptyCache<>(loader, recordStats);
-                case GUAVA:
+            return switch (disabledCacheImplementation) {
+                case NOOP -> new EmptyCache<>(loader, recordStats);
+                case GUAVA -> {
                     // Disabled cache is always empty, so doesn't exhibit invalidation problems.
                     // Avoid overhead of EvictableCache wrapper.
                     CacheBuilder<Object, Object> cacheBuilder = CacheBuilder.newBuilder()
@@ -185,9 +193,9 @@ public <K1 extends K, V1 extends V> LoadingCache<K1, V1> build(CacheLoader<? sup
                     if (recordStats) {
                         cacheBuilder.recordStats();
                     }
-                    return buildUnsafeCache(cacheBuilder, loader);
-            }
-            throw new UnsupportedOperationException("Unsupported option: " + disabledCacheImplementation);
+                    yield buildUnsafeCache(cacheBuilder, loader);
+                }
+            };
         }
 
         if (!(maximumSize.isPresent() || maximumWeight.isPresent() || expireAfterWrite.isPresent())) {
@@ -205,6 +213,7 @@ public <K1 extends K, V1 extends V> LoadingCache<K1, V1> build(CacheLoader<? sup
         maximumSize.ifPresent(cacheBuilder::maximumSize);
         maximumWeight.ifPresent(cacheBuilder::maximumWeight);
         weigher.ifPresent(cacheBuilder::weigher);
+        concurrencyLevel.ifPresent(cacheBuilder::concurrencyLevel);
         if (recordStats) {
             cacheBuilder.recordStats();
         }
@@ -231,14 +240,12 @@ private static <K, V> CacheLoader<K, V> unimplementedCacheLoader()
     }
 
     @ElementTypesAreNonnullByDefault
-    private static final class TokenWeigher<K, V>
+    private record TokenWeigher<K, V>(Weigher<? super K, ? super V> delegate)
             implements Weigher<Token<K>, V>
     {
-        private final Weigher<? super K, ? super V> delegate;
-
-        public TokenWeigher(Weigher<? super K, ? super V> delegate)
+        private TokenWeigher
         {
-            this.delegate = requireNonNull(delegate, "delegate is null");
+            requireNonNull(delegate, "delegate is null");
         }
 
         @Override
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonEvictableCache.java b/lib/trino-cache/src/main/java/io/trino/cache/NonEvictableCache.java
similarity index 97%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/NonEvictableCache.java
rename to lib/trino-cache/src/main/java/io/trino/cache/NonEvictableCache.java
index b1751c444faa..356828bc2210 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonEvictableCache.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/NonEvictableCache.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.cache.Cache;
 
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonEvictableCacheImpl.java b/lib/trino-cache/src/main/java/io/trino/cache/NonEvictableCacheImpl.java
similarity index 96%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/NonEvictableCacheImpl.java
rename to lib/trino-cache/src/main/java/io/trino/cache/NonEvictableCacheImpl.java
index 9a0103f87d20..e61f22e375ee 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonEvictableCacheImpl.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/NonEvictableCacheImpl.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.cache.Cache;
 import com.google.common.collect.ForwardingConcurrentMap;
@@ -40,7 +40,7 @@ public void invalidateAll()
     public ConcurrentMap<K, V> asMap()
     {
         ConcurrentMap<K, V> map = super.asMap();
-        return new ForwardingConcurrentMap<K, V>()
+        return new ForwardingConcurrentMap<>()
         {
             @Override
             protected ConcurrentMap<K, V> delegate()
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonEvictableLoadingCache.java b/lib/trino-cache/src/main/java/io/trino/cache/NonEvictableLoadingCache.java
similarity index 96%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/NonEvictableLoadingCache.java
rename to lib/trino-cache/src/main/java/io/trino/cache/NonEvictableLoadingCache.java
index 35ae03620a50..e32266d43410 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonEvictableLoadingCache.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/NonEvictableLoadingCache.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 /**
  * A {@link com.google.common.cache.LoadingCache} that does not support eviction.
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonEvictableLoadingCacheImpl.java b/lib/trino-cache/src/main/java/io/trino/cache/NonEvictableLoadingCacheImpl.java
similarity index 96%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/NonEvictableLoadingCacheImpl.java
rename to lib/trino-cache/src/main/java/io/trino/cache/NonEvictableLoadingCacheImpl.java
index 2b093a688fe8..1f75441cde19 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonEvictableLoadingCacheImpl.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/NonEvictableLoadingCacheImpl.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ForwardingConcurrentMap;
@@ -40,7 +40,7 @@ public void invalidateAll()
     public ConcurrentMap<K, V> asMap()
     {
         ConcurrentMap<K, V> map = super.asMap();
-        return new ForwardingConcurrentMap<K, V>()
+        return new ForwardingConcurrentMap<>()
         {
             @Override
             protected ConcurrentMap<K, V> delegate()
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonKeyEvictableCache.java b/lib/trino-cache/src/main/java/io/trino/cache/NonKeyEvictableCache.java
similarity index 97%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/NonKeyEvictableCache.java
rename to lib/trino-cache/src/main/java/io/trino/cache/NonKeyEvictableCache.java
index 8cafab98e0a2..e143070c07b6 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonKeyEvictableCache.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/NonKeyEvictableCache.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.cache.Cache;
 
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonKeyEvictableCacheImpl.java b/lib/trino-cache/src/main/java/io/trino/cache/NonKeyEvictableCacheImpl.java
similarity index 97%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/NonKeyEvictableCacheImpl.java
rename to lib/trino-cache/src/main/java/io/trino/cache/NonKeyEvictableCacheImpl.java
index b7f5d05871dd..64e66006f17e 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonKeyEvictableCacheImpl.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/NonKeyEvictableCacheImpl.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.ForwardingCache;
@@ -58,7 +58,7 @@ public void invalidateAll(Iterable<?> keys)
     public ConcurrentMap<K, V> asMap()
     {
         ConcurrentMap<K, V> map = delegate.asMap();
-        return new ForwardingConcurrentMap<K, V>()
+        return new ForwardingConcurrentMap<>()
         {
             @Override
             protected ConcurrentMap<K, V> delegate()
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonKeyEvictableLoadingCache.java b/lib/trino-cache/src/main/java/io/trino/cache/NonKeyEvictableLoadingCache.java
similarity index 98%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/NonKeyEvictableLoadingCache.java
rename to lib/trino-cache/src/main/java/io/trino/cache/NonKeyEvictableLoadingCache.java
index 803ec5cd98c9..4e8d7fb27c26 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonKeyEvictableLoadingCache.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/NonKeyEvictableLoadingCache.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.cache.LoadingCache;
 
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonKeyEvictableLoadingCacheImpl.java b/lib/trino-cache/src/main/java/io/trino/cache/NonKeyEvictableLoadingCacheImpl.java
similarity index 96%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/NonKeyEvictableLoadingCacheImpl.java
rename to lib/trino-cache/src/main/java/io/trino/cache/NonKeyEvictableLoadingCacheImpl.java
index 69a1f235c903..d938f6d2217f 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/NonKeyEvictableLoadingCacheImpl.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/NonKeyEvictableLoadingCacheImpl.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.cache.ForwardingLoadingCache;
 import com.google.common.cache.LoadingCache;
@@ -48,6 +48,7 @@ public void invalidate(Object key)
     }
 
     @Override
+    @SuppressWarnings("deprecation") // we're implementing a deprecated API method
     public void unsafeInvalidate(Object key)
     {
         super.invalidate(key);
@@ -64,7 +65,7 @@ public void invalidateAll(Iterable<?> keys)
     public ConcurrentMap<K, V> asMap()
     {
         ConcurrentMap<K, V> map = delegate.asMap();
-        return new ForwardingConcurrentMap<K, V>()
+        return new ForwardingConcurrentMap<>()
         {
             @Override
             protected ConcurrentMap<K, V> delegate()
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/SafeCaches.java b/lib/trino-cache/src/main/java/io/trino/cache/SafeCaches.java
similarity index 98%
rename from lib/trino-collect/src/main/java/io/trino/collect/cache/SafeCaches.java
rename to lib/trino-cache/src/main/java/io/trino/cache/SafeCaches.java
index c991787c1de6..a5902fe4d2c2 100644
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/SafeCaches.java
+++ b/lib/trino-cache/src/main/java/io/trino/cache/SafeCaches.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
diff --git a/lib/trino-collect/src/test/java/io/trino/collect/cache/CacheStatsAssertions.java b/lib/trino-cache/src/test/java/io/trino/cache/CacheStatsAssertions.java
similarity index 98%
rename from lib/trino-collect/src/test/java/io/trino/collect/cache/CacheStatsAssertions.java
rename to lib/trino-cache/src/test/java/io/trino/cache/CacheStatsAssertions.java
index 51202e86d908..50c24e887e69 100644
--- a/lib/trino-collect/src/test/java/io/trino/collect/cache/CacheStatsAssertions.java
+++ b/lib/trino-cache/src/test/java/io/trino/cache/CacheStatsAssertions.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheStats;
diff --git a/lib/trino-cache/src/test/java/io/trino/cache/Invalidation.java b/lib/trino-cache/src/test/java/io/trino/cache/Invalidation.java
new file mode 100644
index 000000000000..23f1d33109e1
--- /dev/null
+++ b/lib/trino-cache/src/test/java/io/trino/cache/Invalidation.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed 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 io.trino.cache;
+
+enum Invalidation
+{
+    INVALIDATE_KEY,
+    INVALIDATE_PREDEFINED_KEYS,
+    INVALIDATE_SELECTED_KEYS,
+    INVALIDATE_ALL,
+    /**/;
+}
diff --git a/lib/trino-collect/src/test/java/io/trino/collect/cache/MoreFutures.java b/lib/trino-cache/src/test/java/io/trino/cache/MoreFutures.java
similarity index 98%
rename from lib/trino-collect/src/test/java/io/trino/collect/cache/MoreFutures.java
rename to lib/trino-cache/src/test/java/io/trino/cache/MoreFutures.java
index 1afb81fde291..e50a01ee7b33 100644
--- a/lib/trino-collect/src/test/java/io/trino/collect/cache/MoreFutures.java
+++ b/lib/trino-cache/src/test/java/io/trino/cache/MoreFutures.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
diff --git a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEmptyCache.java b/lib/trino-cache/src/test/java/io/trino/cache/TestEmptyCache.java
similarity index 94%
rename from lib/trino-collect/src/test/java/io/trino/collect/cache/TestEmptyCache.java
rename to lib/trino-cache/src/test/java/io/trino/cache/TestEmptyCache.java
index 22d273769b7c..b0706b8e7db0 100644
--- a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEmptyCache.java
+++ b/lib/trino-cache/src/test/java/io/trino/cache/TestEmptyCache.java
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheLoader;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +33,7 @@ public class TestEmptyCache
 {
     private static final int TEST_TIMEOUT_MILLIS = 10_000;
 
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
+    @Test
     public void testLoadFailure()
             throws Exception
     {
@@ -80,7 +80,7 @@ public void testLoadFailure()
         }
         finally {
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertThat(executor.awaitTermination(10, SECONDS)).isTrue();
         }
     }
 }
diff --git a/lib/trino-cache/src/test/java/io/trino/cache/TestEvictableCache.java b/lib/trino-cache/src/test/java/io/trino/cache/TestEvictableCache.java
new file mode 100644
index 000000000000..19329732b07b
--- /dev/null
+++ b/lib/trino-cache/src/test/java/io/trino/cache/TestEvictableCache.java
@@ -0,0 +1,586 @@
+/*
+ * Licensed 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 io.trino.cache;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheStats;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import io.airlift.testing.TestingTicker;
+import io.trino.cache.EvictableCacheBuilder.DisabledCacheImplementation;
+import org.gaul.modernizer_maven_annotations.SuppressModernizer;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.IntStream;
+
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.cache.CacheStatsAssertions.assertCacheStats;
+import static java.lang.Math.toIntExact;
+import static java.lang.String.format;
+import static java.util.concurrent.Executors.newFixedThreadPool;
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestEvictableCache
+{
+    private static final int TEST_TIMEOUT_SECONDS = 10;
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testLoad()
+            throws Exception
+    {
+        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10_000)
+                .build();
+        assertThat(cache.get(42, () -> "abc")).isEqualTo("abc");
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testEvictBySize()
+            throws Exception
+    {
+        int maximumSize = 10;
+        Cache<Integer, Integer> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(maximumSize)
+                .build();
+
+        for (int i = 0; i < 10_000; i++) {
+            int value = i * 10;
+            assertThat((Object) cache.get(i, () -> value)).isEqualTo(value);
+        }
+        cache.cleanUp();
+        assertThat(cache.size()).isEqualTo(maximumSize);
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).isEqualTo(maximumSize);
+
+        // Ensure cache is effective, i.e. some entries preserved
+        int lastKey = 10_000 - 1;
+        assertThat((Object) cache.get(lastKey, () -> {
+            throw new UnsupportedOperationException();
+        })).isEqualTo(lastKey * 10);
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testEvictByWeight()
+            throws Exception
+    {
+        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                .maximumWeight(20)
+                .weigher((Integer key, String value) -> value.length())
+                .build();
+
+        for (int i = 0; i < 10; i++) {
+            String value = "a".repeat(i);
+            assertThat((Object) cache.get(i, () -> value)).isEqualTo(value);
+        }
+        cache.cleanUp();
+        // It's not deterministic which entries get evicted
+        int cacheSize = toIntExact(cache.size());
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(cacheSize);
+        assertThat(cache.asMap().keySet()).as("keySet").hasSize(cacheSize);
+        assertThat(cache.asMap().keySet().stream().mapToInt(i -> i).sum()).as("key sum").isLessThanOrEqualTo(20);
+        assertThat(cache.asMap().values()).as("values").hasSize(cacheSize);
+        assertThat(cache.asMap().values().stream().mapToInt(String::length).sum()).as("values length sum").isLessThanOrEqualTo(20);
+
+        // Ensure cache is effective, i.e. some entries preserved
+        int lastKey = 10 - 1;
+        assertThat(cache.get(lastKey, () -> {
+            throw new UnsupportedOperationException();
+        })).isEqualTo("a".repeat(lastKey));
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testEvictByTime()
+            throws Exception
+    {
+        TestingTicker ticker = new TestingTicker();
+        int ttl = 100;
+        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                .ticker(ticker)
+                .expireAfterWrite(ttl, TimeUnit.MILLISECONDS)
+                .build();
+
+        assertThat(cache.get(1, () -> "1 ala ma kota")).isEqualTo("1 ala ma kota");
+        ticker.increment(ttl, MILLISECONDS);
+        assertThat(cache.get(2, () -> "2 ala ma kota")).isEqualTo("2 ala ma kota");
+        cache.cleanUp();
+
+        // First entry should be expired and its token removed
+        int cacheSize = toIntExact(cache.size());
+        assertThat(cacheSize).as("cacheSize").isEqualTo(1);
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(cacheSize);
+        assertThat(cache.asMap().keySet()).as("keySet").hasSize(cacheSize);
+        assertThat(cache.asMap().values()).as("values").hasSize(cacheSize);
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testPreserveValueLoadedAfterTimeExpiration()
+            throws Exception
+    {
+        TestingTicker ticker = new TestingTicker();
+        int ttl = 100;
+        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                .ticker(ticker)
+                .expireAfterWrite(ttl, TimeUnit.MILLISECONDS)
+                .build();
+        int key = 11;
+
+        assertThat(cache.get(key, () -> "11 ala ma kota")).isEqualTo("11 ala ma kota");
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
+
+        // Should be served from the cache
+        assertThat(cache.get(key, () -> "something else")).isEqualTo("11 ala ma kota");
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
+
+        ticker.increment(ttl, MILLISECONDS);
+        // Should be reloaded
+        assertThat(cache.get(key, () -> "new value")).isEqualTo("new value");
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
+
+        // Should be served from the cache
+        assertThat(cache.get(key, () -> "something yet different")).isEqualTo("new value");
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
+
+        assertThat(cache.size()).as("cacheSize").isEqualTo(1);
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
+        assertThat(cache.asMap().keySet()).as("keySet").hasSize(1);
+        assertThat(cache.asMap().values()).as("values").hasSize(1);
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testReplace()
+            throws Exception
+    {
+        Cache<Integer, Integer> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10)
+                .build();
+
+        int key = 10;
+        int initialValue = 20;
+        int replacedValue = 21;
+        cache.get(key, () -> initialValue);
+        assertThat(cache.asMap().replace(key, initialValue, replacedValue)).isTrue();
+        assertThat((Object) cache.getIfPresent(key)).isEqualTo(replacedValue);
+
+        // already replaced, current value is different
+        assertThat(cache.asMap().replace(key, initialValue, replacedValue)).isFalse();
+        assertThat((Object) cache.getIfPresent(key)).isEqualTo(replacedValue);
+
+        // non-existent key
+        assertThat(cache.asMap().replace(100000, replacedValue, 22)).isFalse();
+        assertThat(cache.asMap().keySet()).isEqualTo(ImmutableSet.of(key));
+        assertThat((Object) cache.getIfPresent(key)).isEqualTo(replacedValue);
+
+        int anotherKey = 13;
+        int anotherInitialValue = 14;
+        cache.get(anotherKey, () -> anotherInitialValue);
+        cache.invalidate(anotherKey);
+        // after eviction
+        assertThat(cache.asMap().replace(anotherKey, anotherInitialValue, 15)).isFalse();
+        assertThat(cache.asMap().keySet()).isEqualTo(ImmutableSet.of(key));
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testDisabledCache()
+            throws Exception
+    {
+        assertThatThrownBy(() -> EvictableCacheBuilder.newBuilder()
+                .maximumSize(0)
+                .build())
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Even when cache is disabled, the loads are synchronized and both load results and failures are shared between threads. " +
+                        "This is rarely desired, thus builder caller is expected to either opt-in into this behavior with shareResultsAndFailuresEvenIfDisabled(), " +
+                        "or choose not to share results (and failures) between concurrent invocations with shareNothingWhenDisabled().");
+
+        testDisabledCache(
+                EvictableCacheBuilder.newBuilder()
+                        .maximumSize(0)
+                        .shareNothingWhenDisabled()
+                        .build());
+
+        testDisabledCache(
+                EvictableCacheBuilder.newBuilder()
+                        .maximumSize(0)
+                        .shareResultsAndFailuresEvenIfDisabled()
+                        .build());
+    }
+
+    private void testDisabledCache(Cache<Integer, Integer> cache)
+            throws Exception
+    {
+        for (int i = 0; i < 10; i++) {
+            int value = i * 10;
+            assertThat((Object) cache.get(i, () -> value)).isEqualTo(value);
+        }
+        cache.cleanUp();
+        assertThat(cache.size()).isEqualTo(0);
+        assertThat(cache.asMap().keySet()).as("keySet").isEmpty();
+        assertThat(cache.asMap().values()).as("values").isEmpty();
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testLoadStats()
+            throws Exception
+    {
+        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10_000)
+                .recordStats()
+                .build();
+
+        assertThat(cache.stats()).isEqualTo(new CacheStats(0, 0, 0, 0, 0, 0));
+
+        String value = assertCacheStats(cache)
+                .misses(1)
+                .loads(1)
+                .calling(() -> cache.get(42, () -> "abc"));
+        assertThat(value).isEqualTo("abc");
+
+        value = assertCacheStats(cache)
+                .hits(1)
+                .calling(() -> cache.get(42, () -> "xyz"));
+        assertThat(value).isEqualTo("abc");
+
+        // with equal, but not the same key
+        value = assertCacheStats(cache)
+                .hits(1)
+                .calling(() -> cache.get(newInteger(42), () -> "xyz"));
+        assertThat(value).isEqualTo("abc");
+    }
+
+    @RepeatedTest(value = 10, failureThreshold = 5)
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testLoadFailure()
+            throws Exception
+    {
+        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(0)
+                .expireAfterWrite(0, DAYS)
+                .shareResultsAndFailuresEvenIfDisabled()
+                .build();
+        int key = 10;
+
+        ExecutorService executor = newFixedThreadPool(2);
+        try {
+            AtomicBoolean first = new AtomicBoolean(true);
+            CyclicBarrier barrier = new CyclicBarrier(2);
+
+            List<Future<String>> futures = new ArrayList<>();
+            for (int i = 0; i < 2; i++) {
+                futures.add(executor.submit(() -> {
+                    barrier.await(10, SECONDS);
+                    return cache.get(key, () -> {
+                        if (first.compareAndSet(true, false)) {
+                            // first
+                            Thread.sleep(1); // increase chances that second thread calls cache.get before we return
+                            throw new RuntimeException("first attempt is poised to fail");
+                        }
+                        return "success";
+                    });
+                }));
+            }
+
+            List<String> results = new ArrayList<>();
+            for (Future<String> future : futures) {
+                try {
+                    results.add(future.get());
+                }
+                catch (ExecutionException e) {
+                    results.add(e.getCause().toString());
+                }
+            }
+
+            // Note: if this starts to fail, that suggests that Guava implementation changed and NoopCache may be redundant now.
+            assertThat(results).containsExactly(
+                    "com.google.common.util.concurrent.UncheckedExecutionException: java.lang.RuntimeException: first attempt is poised to fail",
+                    "com.google.common.util.concurrent.UncheckedExecutionException: java.lang.RuntimeException: first attempt is poised to fail");
+        }
+        finally {
+            executor.shutdownNow();
+            assertThat(executor.awaitTermination(10, SECONDS)).isTrue();
+        }
+    }
+
+    @SuppressModernizer
+    private static Integer newInteger(int value)
+    {
+        Integer integer = value;
+        @SuppressWarnings({"UnnecessaryBoxing", "BoxedPrimitiveConstructor", "CachedNumberConstructorCall", "removal"})
+        Integer newInteger = new Integer(value);
+        assertThat(integer).isNotSameAs(newInteger);
+        return newInteger;
+    }
+
+    /**
+     * Test that the loader is invoked only once for concurrent invocations of {{@link LoadingCache#get(Object, Callable)} with equal keys.
+     * This is a behavior of Guava Cache as well. While this is necessarily desirable behavior (see
+     * <a href="https://github.com/trinodb/trino/issues/11067">https://github.com/trinodb/trino/issues/11067</a>),
+     * the test exists primarily to document current state and support discussion, should the current state change.
+     */
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testConcurrentGetWithCallableShareLoad()
+            throws Exception
+    {
+        AtomicInteger loads = new AtomicInteger();
+        AtomicInteger concurrentInvocations = new AtomicInteger();
+
+        Cache<Integer, Integer> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10_000)
+                .build();
+
+        int threads = 2;
+        int invocationsPerThread = 100;
+        ExecutorService executor = newFixedThreadPool(threads);
+        try {
+            CyclicBarrier barrier = new CyclicBarrier(threads);
+            List<Future<?>> futures = new ArrayList<>();
+            for (int i = 0; i < threads; i++) {
+                futures.add(executor.submit(() -> {
+                    for (int invocation = 0; invocation < invocationsPerThread; invocation++) {
+                        int key = invocation;
+                        barrier.await(10, SECONDS);
+                        int value = cache.get(key, () -> {
+                            loads.incrementAndGet();
+                            int invocations = concurrentInvocations.incrementAndGet();
+                            checkState(invocations == 1, "There should be no concurrent invocations, cache should do load sharing when get() invoked for same key");
+                            Thread.sleep(1);
+                            concurrentInvocations.decrementAndGet();
+                            return -key;
+                        });
+                        assertThat(value).isEqualTo(-invocation);
+                    }
+                    return null;
+                }));
+            }
+
+            for (Future<?> future : futures) {
+                future.get(10, SECONDS);
+            }
+            assertThat(loads).as("loads")
+                    .hasValueBetween(invocationsPerThread, threads * invocationsPerThread - 1 /* inclusive */);
+        }
+        finally {
+            executor.shutdownNow();
+            assertThat(executor.awaitTermination(10, SECONDS)).isTrue();
+        }
+    }
+
+    /**
+     * Covers https://github.com/google/guava/issues/1881
+     */
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testInvalidateOngoingLoad()
+            throws Exception
+    {
+        for (Invalidation invalidation : Invalidation.values()) {
+            Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                    .maximumSize(10_000)
+                    .build();
+            Integer key = 42;
+
+            CountDownLatch loadOngoing = new CountDownLatch(1);
+            CountDownLatch invalidated = new CountDownLatch(1);
+            CountDownLatch getReturned = new CountDownLatch(1);
+            ExecutorService executor = newFixedThreadPool(2);
+            try {
+                // thread A
+                Future<String> threadA = executor.submit(() -> {
+                    String value = cache.get(key, () -> {
+                        loadOngoing.countDown(); // 1
+                        assertThat(invalidated.await(10, SECONDS)).isTrue(); // 2
+                        return "stale value";
+                    });
+                    getReturned.countDown(); // 3
+                    return value;
+                });
+
+                // thread B
+                Future<String> threadB = executor.submit(() -> {
+                    assertThat(loadOngoing.await(10, SECONDS)).isTrue(); // 1
+
+                    switch (invalidation) {
+                        case INVALIDATE_KEY:
+                            cache.invalidate(key);
+                            break;
+                        case INVALIDATE_PREDEFINED_KEYS:
+                            cache.invalidateAll(ImmutableList.of(key));
+                            break;
+                        case INVALIDATE_SELECTED_KEYS:
+                            Set<Integer> keys = cache.asMap().keySet().stream()
+                                    .filter(foundKey -> (int) foundKey == key)
+                                    .collect(toImmutableSet());
+                            cache.invalidateAll(keys);
+                            break;
+                        case INVALIDATE_ALL:
+                            cache.invalidateAll();
+                            break;
+                    }
+
+                    invalidated.countDown(); // 2
+                    // Cache may persist value after loader returned, but before `cache.get(...)` returned. Ensure the latter completed.
+                    assertThat(getReturned.await(10, SECONDS)).isTrue(); // 3
+
+                    return cache.get(key, () -> "fresh value");
+                });
+
+                assertThat(threadA.get()).isEqualTo("stale value");
+                assertThat(threadB.get()).isEqualTo("fresh value");
+            }
+            finally {
+                executor.shutdownNow();
+                assertThat(executor.awaitTermination(10, SECONDS)).isTrue();
+            }
+        }
+    }
+
+    /**
+     * Covers https://github.com/google/guava/issues/1881
+     */
+    @RepeatedTest(10)
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testInvalidateAndLoadConcurrently()
+            throws Exception
+    {
+        for (Invalidation invalidation : Invalidation.values()) {
+            int[] primes = {2, 3, 5, 7};
+            AtomicLong remoteState = new AtomicLong(1);
+
+            Cache<Integer, Long> cache = EvictableCacheBuilder.newBuilder()
+                    .maximumSize(10_000)
+                    .build();
+            Integer key = 42;
+            int threads = 4;
+
+            CyclicBarrier barrier = new CyclicBarrier(threads);
+            ExecutorService executor = newFixedThreadPool(threads);
+            try {
+                List<Future<Void>> futures = IntStream.range(0, threads)
+                        .mapToObj(threadNumber -> executor.submit(() -> {
+                            // prime the cache
+                            assertThat((long) cache.get(key, remoteState::get)).isEqualTo(1L);
+                            int prime = primes[threadNumber];
+
+                            barrier.await(10, SECONDS);
+
+                            // modify underlying state
+                            remoteState.updateAndGet(current -> current * prime);
+
+                            // invalidate
+                            switch (invalidation) {
+                                case INVALIDATE_KEY:
+                                    cache.invalidate(key);
+                                    break;
+                                case INVALIDATE_PREDEFINED_KEYS:
+                                    cache.invalidateAll(ImmutableList.of(key));
+                                    break;
+                                case INVALIDATE_SELECTED_KEYS:
+                                    Set<Integer> keys = cache.asMap().keySet().stream()
+                                            .filter(foundKey -> (int) foundKey == key)
+                                            .collect(toImmutableSet());
+                                    cache.invalidateAll(keys);
+                                    break;
+                                case INVALIDATE_ALL:
+                                    cache.invalidateAll();
+                                    break;
+                            }
+
+                            // read through cache
+                            long current = cache.get(key, remoteState::get);
+                            if (current % prime != 0) {
+                                throw new AssertionError(format("The value read through cache (%s) in thread (%s) is not divisible by (%s)", current, threadNumber, prime));
+                            }
+
+                            return (Void) null;
+                        }))
+                        .collect(toImmutableList());
+
+                futures.forEach(MoreFutures::getFutureValue);
+
+                assertThat(remoteState.get()).isEqualTo(2 * 3 * 5 * 7);
+                assertThat((long) cache.get(key, remoteState::get)).isEqualTo(remoteState.get());
+            }
+            finally {
+                executor.shutdownNow();
+                assertThat(executor.awaitTermination(10, SECONDS)).isTrue();
+            }
+        }
+    }
+
+    @Test
+    public void testPutOnEmptyCacheImplementation()
+    {
+        for (DisabledCacheImplementation disabledCacheImplementation : DisabledCacheImplementation.values()) {
+            Cache<Object, Object> cache = EvictableCacheBuilder.newBuilder()
+                    .maximumSize(0)
+                    .disabledCacheImplementation(disabledCacheImplementation)
+                    .build();
+            Map<Object, Object> cacheMap = cache.asMap();
+
+            int key = 0;
+            int value = 1;
+            assertThat(cacheMap.put(key, value)).isNull();
+            assertThat(cacheMap.put(key, value)).isNull();
+            assertThat(cacheMap.putIfAbsent(key, value)).isNull();
+            assertThat(cacheMap.putIfAbsent(key, value)).isNull();
+        }
+    }
+
+    @Test
+    public void testPutOnNonEmptyCacheImplementation()
+    {
+        Cache<Object, Object> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10)
+                .build();
+        Map<Object, Object> cacheMap = cache.asMap();
+
+        int key = 0;
+        int value = 1;
+        assertThatThrownBy(() -> cacheMap.put(key, value))
+                .isInstanceOf(UnsupportedOperationException.class)
+                .hasMessage("The operation is not supported, as in inherently races with cache invalidation. Use get(key, callable) instead.");
+        assertThatThrownBy(() -> cacheMap.putIfAbsent(key, value))
+                .isInstanceOf(UnsupportedOperationException.class)
+                .hasMessage("The operation is not supported, as in inherently races with cache invalidation");
+    }
+}
diff --git a/lib/trino-cache/src/test/java/io/trino/cache/TestEvictableLoadingCache.java b/lib/trino-cache/src/test/java/io/trino/cache/TestEvictableLoadingCache.java
new file mode 100644
index 000000000000..fea26d863d68
--- /dev/null
+++ b/lib/trino-cache/src/test/java/io/trino/cache/TestEvictableLoadingCache.java
@@ -0,0 +1,758 @@
+/*
+ * Licensed 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 io.trino.cache;
+
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.CacheStats;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import io.airlift.testing.TestingTicker;
+import org.gaul.modernizer_maven_annotations.SuppressModernizer;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.IntStream;
+
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.cache.CacheStatsAssertions.assertCacheStats;
+import static java.lang.Math.toIntExact;
+import static java.lang.String.format;
+import static java.util.concurrent.Executors.newFixedThreadPool;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestEvictableLoadingCache
+{
+    private static final int TEST_TIMEOUT_SECONDS = 10;
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testLoad()
+            throws Exception
+    {
+        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10_000)
+                .recordStats()
+                .build(CacheLoader.from((Integer ignored) -> "abc"));
+
+        assertThat(cache.get(42)).isEqualTo("abc");
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testEvictBySize()
+            throws Exception
+    {
+        int maximumSize = 10;
+        AtomicInteger loads = new AtomicInteger();
+        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(maximumSize)
+                .build(CacheLoader.from(key -> {
+                    loads.incrementAndGet();
+                    return "abc" + key;
+                }));
+
+        for (int i = 0; i < 10_000; i++) {
+            assertThat((Object) cache.get(i)).isEqualTo("abc" + i);
+        }
+        cache.cleanUp();
+        assertThat(cache.size()).isEqualTo(maximumSize);
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).isEqualTo(maximumSize);
+        assertThat(loads.get()).isEqualTo(10_000);
+
+        // Ensure cache is effective, i.e. no new load
+        int lastKey = 10_000 - 1;
+        assertThat((Object) cache.get(lastKey)).isEqualTo("abc" + lastKey);
+        assertThat(loads.get()).isEqualTo(10_000);
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testEvictByWeight()
+            throws Exception
+    {
+        AtomicInteger loads = new AtomicInteger();
+        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                .maximumWeight(20)
+                .weigher((Integer key, String value) -> value.length())
+                .build(CacheLoader.from(key -> {
+                    loads.incrementAndGet();
+                    return "a".repeat(key);
+                }));
+
+        for (int i = 0; i < 10; i++) {
+            assertThat((Object) cache.get(i)).isEqualTo("a".repeat(i));
+        }
+        cache.cleanUp();
+        // It's not deterministic which entries get evicted
+        int cacheSize = toIntExact(cache.size());
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(cacheSize);
+        assertThat(cache.asMap().keySet()).as("keySet").hasSize(cacheSize);
+        assertThat(cache.asMap().keySet().stream().mapToInt(i -> i).sum()).as("key sum").isLessThanOrEqualTo(20);
+        assertThat(cache.asMap().values()).as("values").hasSize(cacheSize);
+        assertThat(cache.asMap().values().stream().mapToInt(String::length).sum()).as("values length sum").isLessThanOrEqualTo(20);
+        assertThat(loads.get()).isEqualTo(10);
+
+        // Ensure cache is effective, i.e. no new load
+        int lastKey = 10 - 1;
+        assertThat((Object) cache.get(lastKey)).isEqualTo("a".repeat(lastKey));
+        assertThat(loads.get()).isEqualTo(10);
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testEvictByTime()
+    {
+        TestingTicker ticker = new TestingTicker();
+        int ttl = 100;
+        AtomicInteger loads = new AtomicInteger();
+        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                .ticker(ticker)
+                .expireAfterWrite(ttl, TimeUnit.MILLISECONDS)
+                .build(CacheLoader.from(k -> {
+                    loads.incrementAndGet();
+                    return k + " ala ma kota";
+                }));
+
+        assertThat(cache.getUnchecked(1)).isEqualTo("1 ala ma kota");
+        ticker.increment(ttl, MILLISECONDS);
+        assertThat(cache.getUnchecked(2)).isEqualTo("2 ala ma kota");
+        cache.cleanUp();
+
+        // First entry should be expired and its token removed
+        int cacheSize = toIntExact(cache.size());
+        assertThat(cacheSize).as("cacheSize").isEqualTo(1);
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(cacheSize);
+        assertThat(cache.asMap().keySet()).as("keySet").hasSize(cacheSize);
+        assertThat(cache.asMap().values()).as("values").hasSize(cacheSize);
+        assertThat(loads.get()).isEqualTo(2);
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testPreserveValueLoadedAfterTimeExpiration()
+    {
+        TestingTicker ticker = new TestingTicker();
+        int ttl = 100;
+        AtomicInteger loads = new AtomicInteger();
+        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                .ticker(ticker)
+                .expireAfterWrite(ttl, TimeUnit.MILLISECONDS)
+                .build(CacheLoader.from(k -> {
+                    loads.incrementAndGet();
+                    return k + " ala ma kota";
+                }));
+        int key = 11;
+
+        assertThat(cache.getUnchecked(key)).isEqualTo("11 ala ma kota");
+        assertThat(loads.get()).as("initial load count").isEqualTo(1);
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
+
+        // Should be served from the cache
+        assertThat(cache.getUnchecked(key)).isEqualTo("11 ala ma kota");
+        assertThat(loads.get()).as("loads count should not change before value expires").isEqualTo(1);
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
+
+        ticker.increment(ttl, MILLISECONDS);
+        // Should be reloaded
+        assertThat(cache.getUnchecked(key)).isEqualTo("11 ala ma kota");
+        assertThat(loads.get()).as("loads count should reflect reloading of value after expiration").isEqualTo(2);
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
+
+        // Should be served from the cache
+        assertThat(cache.getUnchecked(key)).isEqualTo("11 ala ma kota");
+        assertThat(loads.get()).as("loads count should not change before value expires again").isEqualTo(2);
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
+
+        assertThat(cache.size()).as("cacheSize").isEqualTo(1);
+        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
+        assertThat(cache.asMap().keySet()).as("keySet").hasSize(1);
+        assertThat(cache.asMap().values()).as("values").hasSize(1);
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testDisabledCache()
+            throws ExecutionException
+    {
+        assertThatThrownBy(() -> EvictableCacheBuilder.newBuilder()
+                .maximumSize(0)
+                .build(CacheLoader.<Integer, Integer>from(key -> key * 10)))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Even when cache is disabled, the loads are synchronized and both load results and failures are shared between threads. " +
+                        "This is rarely desired, thus builder caller is expected to either opt-in into this behavior with shareResultsAndFailuresEvenIfDisabled(), " +
+                        "or choose not to share results (and failures) between concurrent invocations with shareNothingWhenDisabled().");
+
+        testDisabledCache(
+                EvictableCacheBuilder.newBuilder()
+                        .maximumSize(0)
+                        .shareNothingWhenDisabled()
+                        .build(CacheLoader.from(key -> key * 10)));
+
+        testDisabledCache(
+                EvictableCacheBuilder.newBuilder()
+                        .maximumSize(0)
+                        .shareResultsAndFailuresEvenIfDisabled()
+                        .build(CacheLoader.from(key -> key * 10)));
+    }
+
+    private void testDisabledCache(LoadingCache<Integer, Integer> cache)
+            throws ExecutionException
+    {
+        for (int i = 0; i < 10; i++) {
+            assertThat((Object) cache.get(i)).isEqualTo(i * 10);
+        }
+        cache.cleanUp();
+        assertThat(cache.size()).isEqualTo(0);
+        assertThat(cache.asMap().keySet()).as("keySet").isEmpty();
+        assertThat(cache.asMap().values()).as("values").isEmpty();
+    }
+
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testLoadStats()
+            throws Exception
+    {
+        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10_000)
+                .recordStats()
+                .build(CacheLoader.from((Integer ignored) -> "abc"));
+
+        assertThat(cache.stats()).isEqualTo(new CacheStats(0, 0, 0, 0, 0, 0));
+
+        String value = assertCacheStats(cache)
+                .misses(1)
+                .loads(1)
+                .calling(() -> cache.get(42));
+        assertThat(value).isEqualTo("abc");
+
+        value = assertCacheStats(cache)
+                .hits(1)
+                .calling(() -> cache.get(42));
+        assertThat(value).isEqualTo("abc");
+
+        // with equal, but not the same key
+        value = assertCacheStats(cache)
+                .hits(1)
+                .calling(() -> cache.get(newInteger(42)));
+        assertThat(value).isEqualTo("abc");
+    }
+
+    @SuppressModernizer
+    private static Integer newInteger(int value)
+    {
+        Integer integer = value;
+        @SuppressWarnings({"UnnecessaryBoxing", "BoxedPrimitiveConstructor", "CachedNumberConstructorCall", "removal"})
+        Integer newInteger = new Integer(value);
+        assertThat(integer).isNotSameAs(newInteger);
+        return newInteger;
+    }
+
+    /**
+     * Verity that implementation of {@link LoadingCache#getAll(Iterable)} returns same keys as provided, not equal ones.
+     * This is necessary for the case where the cache key can be equal but still distinguishable.
+     */
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testGetAllMaintainsKeyIdentity()
+            throws Exception
+    {
+        LoadingCache<String, Integer> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10_000)
+                .recordStats()
+                .build(CacheLoader.from(String::length));
+
+        String first = "abc";
+        String second = new String(first);
+        assertThat(first).isNotSameAs(second);
+
+        // prime the cache
+        assertThat((int) cache.get(first)).isEqualTo(3);
+
+        Map<String, Integer> values = cache.getAll(ImmutableList.of(second));
+        assertThat(values).hasSize(1);
+        Entry<String, Integer> entry = getOnlyElement(values.entrySet());
+        assertThat((int) entry.getValue()).isEqualTo(3);
+        assertThat(entry.getKey()).isEqualTo(first);
+        assertThat(entry.getKey()).isEqualTo(second);
+        assertThat(entry.getKey()).isNotSameAs(first);
+        assertThat(entry.getKey()).isSameAs(second);
+    }
+
+    /**
+     * Test that they keys provided to {@link LoadingCache#get(Object)} are not necessarily the ones provided to
+     * {@link CacheLoader#load(Object)}. While guarantying this would be obviously desirable (as in
+     * {@link #testGetAllMaintainsKeyIdentityForBulkLoader}), it seems not feasible to do this while
+     * also maintain load sharing (see {@link #testConcurrentGetShareLoad()}).
+     */
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testGetDoesNotMaintainKeyIdentityForLoader()
+            throws Exception
+    {
+        AtomicInteger loadCounter = new AtomicInteger();
+        int firstAdditionalField = 1;
+        int secondAdditionalField = 123456789;
+
+        LoadingCache<ClassWithPartialEquals, Integer> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10_000)
+                .build(CacheLoader.from((ClassWithPartialEquals key) -> {
+                    loadCounter.incrementAndGet();
+                    assertThat(key.getAdditionalField()).isEqualTo(firstAdditionalField); // not secondAdditionalField because get() reuses existing token
+                    return key.getValue();
+                }));
+
+        ClassWithPartialEquals keyA = new ClassWithPartialEquals(42, firstAdditionalField);
+        ClassWithPartialEquals keyB = new ClassWithPartialEquals(42, secondAdditionalField);
+        // sanity check: objects are equal despite having different observed state
+        assertThat(keyA).isEqualTo(keyB);
+        assertThat(keyA.getAdditionalField()).isNotEqualTo(keyB.getAdditionalField());
+
+        // Populate the cache
+        assertThat((int) cache.get(keyA, () -> 317)).isEqualTo(317);
+        assertThat(loadCounter.get()).isEqualTo(0);
+
+        // invalidate dataCache but keep tokens -- simulate concurrent implicit or explicit eviction
+        ((EvictableCache<?, ?>) cache).clearDataCacheOnly();
+        assertThat((int) cache.get(keyB)).isEqualTo(42);
+        assertThat(loadCounter.get()).isEqualTo(1);
+    }
+
+    /**
+     * Test that they keys provided to {@link LoadingCache#getAll(Iterable)} are the ones provided to {@link CacheLoader#loadAll(Iterable)}.
+     * It is possible that {@link CacheLoader#loadAll(Iterable)} requires keys to have some special characteristics and some
+     * other, equal keys, derived from {@code EvictableCache.tokens}, may not have that characteristics.
+     * This can happen only when cache keys are not fully value-based. While discouraged, this situation is possible.
+     * Guava Cache also exhibits the behavior tested here.
+     */
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testGetAllMaintainsKeyIdentityForBulkLoader()
+            throws Exception
+    {
+        AtomicInteger loadAllCounter = new AtomicInteger();
+        int expectedAdditionalField = 123456789;
+
+        LoadingCache<ClassWithPartialEquals, Integer> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10_000)
+                .build(new CacheLoader<ClassWithPartialEquals, Integer>()
+                {
+                    @Override
+                    public Integer load(ClassWithPartialEquals key)
+                    {
+                        throw new UnsupportedOperationException();
+                    }
+
+                    @Override
+                    public Map<ClassWithPartialEquals, Integer> loadAll(Iterable<? extends ClassWithPartialEquals> keys)
+                    {
+                        loadAllCounter.incrementAndGet();
+                        // For the sake of simplicity, the test currently leverages that getAll() with singleton list will
+                        // end up calling loadAll() even though load() could be used.
+                        ClassWithPartialEquals key = getOnlyElement(keys);
+                        assertThat(key.getAdditionalField()).isEqualTo(expectedAdditionalField);
+                        return ImmutableMap.of(key, key.getValue());
+                    }
+                });
+
+        ClassWithPartialEquals keyA = new ClassWithPartialEquals(42, 1);
+        ClassWithPartialEquals keyB = new ClassWithPartialEquals(42, expectedAdditionalField);
+        // sanity check: objects are equal despite having different observed state
+        assertThat(keyA).isEqualTo(keyB);
+        assertThat(keyA.getAdditionalField()).isNotEqualTo(keyB.getAdditionalField());
+
+        // Populate the cache
+        assertThat((int) cache.get(keyA, () -> 317)).isEqualTo(317);
+        assertThat(loadAllCounter.get()).isEqualTo(0);
+
+        // invalidate dataCache but keep tokens -- simulate concurrent implicit or explicit eviction
+        ((EvictableCache<?, ?>) cache).clearDataCacheOnly();
+        Map<ClassWithPartialEquals, Integer> map = cache.getAll(ImmutableList.of(keyB));
+        assertThat(map).hasSize(1);
+        assertThat(getOnlyElement(map.keySet())).isSameAs(keyB);
+        assertThat((int) getOnlyElement(map.values())).isEqualTo(42);
+        assertThat(loadAllCounter.get()).isEqualTo(1);
+    }
+
+    /**
+     * Test that the loader is invoked only once for concurrent invocations of {{@link LoadingCache#get(Object, Callable)} with equal keys.
+     * This is a behavior of Guava Cache as well. While this is necessarily desirable behavior (see
+     * <a href="https://github.com/trinodb/trino/issues/11067">https://github.com/trinodb/trino/issues/11067</a>),
+     * the test exists primarily to document current state and support discussion, should the current state change.
+     */
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testConcurrentGetWithCallableShareLoad()
+            throws Exception
+    {
+        AtomicInteger loads = new AtomicInteger();
+        AtomicInteger concurrentInvocations = new AtomicInteger();
+
+        LoadingCache<Integer, Integer> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10_000)
+                .build(CacheLoader.from(() -> {
+                    throw new UnsupportedOperationException();
+                }));
+
+        int threads = 2;
+        int invocationsPerThread = 100;
+        ExecutorService executor = newFixedThreadPool(threads);
+        try {
+            CyclicBarrier barrier = new CyclicBarrier(threads);
+            List<Future<?>> futures = new ArrayList<>();
+            for (int i = 0; i < threads; i++) {
+                futures.add(executor.submit(() -> {
+                    for (int invocation = 0; invocation < invocationsPerThread; invocation++) {
+                        int key = invocation;
+                        barrier.await(10, SECONDS);
+                        int value = cache.get(key, () -> {
+                            loads.incrementAndGet();
+                            int invocations = concurrentInvocations.incrementAndGet();
+                            checkState(invocations == 1, "There should be no concurrent invocations, cache should do load sharing when get() invoked for same key");
+                            Thread.sleep(1);
+                            concurrentInvocations.decrementAndGet();
+                            return -key;
+                        });
+                        assertThat(value).isEqualTo(-invocation);
+                    }
+                    return null;
+                }));
+            }
+
+            for (Future<?> future : futures) {
+                future.get(10, SECONDS);
+            }
+            assertThat(loads).as("loads")
+                    .hasValueBetween(invocationsPerThread, threads * invocationsPerThread - 1 /* inclusive */);
+        }
+        finally {
+            executor.shutdownNow();
+            assertThat(executor.awaitTermination(10, SECONDS)).isTrue();
+        }
+    }
+
+    /**
+     * Test that the loader is invoked only once for concurrent invocations of {{@link LoadingCache#get(Object)} with equal keys.
+     */
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testConcurrentGetShareLoad()
+            throws Exception
+    {
+        AtomicInteger loads = new AtomicInteger();
+        AtomicInteger concurrentInvocations = new AtomicInteger();
+
+        LoadingCache<Integer, Integer> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10_000)
+                .build(new CacheLoader<Integer, Integer>()
+                {
+                    @Override
+                    public Integer load(Integer key)
+                            throws Exception
+                    {
+                        loads.incrementAndGet();
+                        int invocations = concurrentInvocations.incrementAndGet();
+                        checkState(invocations == 1, "There should be no concurrent invocations, cache should do load sharing when get() invoked for same key");
+                        Thread.sleep(1);
+                        concurrentInvocations.decrementAndGet();
+                        return -key;
+                    }
+                });
+
+        int threads = 2;
+        int invocationsPerThread = 100;
+        ExecutorService executor = newFixedThreadPool(threads);
+        try {
+            CyclicBarrier barrier = new CyclicBarrier(threads);
+            List<Future<?>> futures = new ArrayList<>();
+            for (int i = 0; i < threads; i++) {
+                futures.add(executor.submit(() -> {
+                    for (int invocation = 0; invocation < invocationsPerThread; invocation++) {
+                        barrier.await(10, SECONDS);
+                        assertThat((int) cache.get(invocation)).isEqualTo(-invocation);
+                    }
+                    return null;
+                }));
+            }
+
+            for (Future<?> future : futures) {
+                future.get(10, SECONDS);
+            }
+            assertThat(loads).as("loads")
+                    .hasValueBetween(invocationsPerThread, threads * invocationsPerThread - 1 /* inclusive */);
+        }
+        finally {
+            executor.shutdownNow();
+            assertThat(executor.awaitTermination(10, SECONDS)).isTrue();
+        }
+    }
+
+    /**
+     * Covers https://github.com/google/guava/issues/1881
+     */
+    @Test
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testInvalidateOngoingLoad()
+            throws Exception
+    {
+        for (Invalidation invalidation : Invalidation.values()) {
+            ConcurrentMap<Integer, String> remoteState = new ConcurrentHashMap<>();
+            Integer key = 42;
+            remoteState.put(key, "stale value");
+
+            CountDownLatch loadOngoing = new CountDownLatch(1);
+            CountDownLatch invalidated = new CountDownLatch(1);
+            CountDownLatch getReturned = new CountDownLatch(1);
+
+            LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
+                    .maximumSize(10_000)
+                    .build(new CacheLoader<Integer, String>()
+                    {
+                        @Override
+                        public String load(Integer key)
+                                throws Exception
+                        {
+                            String value = remoteState.get(key);
+                            loadOngoing.countDown(); // 1
+                            assertThat(invalidated.await(10, SECONDS)).isTrue(); // 2
+                            return value;
+                        }
+                    });
+
+            ExecutorService executor = newFixedThreadPool(2);
+            try {
+                // thread A
+                Future<String> threadA = executor.submit(() -> {
+                    String value = cache.get(key);
+                    getReturned.countDown(); // 3
+                    return value;
+                });
+
+                // thread B
+                Future<String> threadB = executor.submit(() -> {
+                    assertThat(loadOngoing.await(10, SECONDS)).isTrue(); // 1
+
+                    switch (invalidation) {
+                        case INVALIDATE_KEY:
+                            cache.invalidate(key);
+                            break;
+                        case INVALIDATE_PREDEFINED_KEYS:
+                            cache.invalidateAll(ImmutableList.of(key));
+                            break;
+                        case INVALIDATE_SELECTED_KEYS:
+                            Set<Integer> keys = cache.asMap().keySet().stream()
+                                    .filter(foundKey -> (int) foundKey == key)
+                                    .collect(toImmutableSet());
+                            cache.invalidateAll(keys);
+                            break;
+                        case INVALIDATE_ALL:
+                            cache.invalidateAll();
+                            break;
+                    }
+
+                    remoteState.put(key, "fresh value");
+                    invalidated.countDown(); // 2
+                    // Cache may persist value after loader returned, but before `cache.get(...)` returned. Ensure the latter completed.
+                    assertThat(getReturned.await(10, SECONDS)).isTrue(); // 3
+
+                    return cache.get(key);
+                });
+
+                assertThat(threadA.get()).isEqualTo("stale value");
+                assertThat(threadB.get()).isEqualTo("fresh value");
+            }
+            finally {
+                executor.shutdownNow();
+                assertThat(executor.awaitTermination(10, SECONDS)).isTrue();
+            }
+        }
+    }
+
+    /**
+     * Covers https://github.com/google/guava/issues/1881
+     */
+    @RepeatedTest(10)
+    @Timeout(TEST_TIMEOUT_SECONDS)
+    public void testInvalidateAndLoadConcurrently()
+            throws Exception
+    {
+        for (Invalidation invalidation : Invalidation.values()) {
+            int[] primes = {2, 3, 5, 7};
+
+            Integer key = 42;
+            Map<Integer, AtomicLong> remoteState = new ConcurrentHashMap<>();
+            remoteState.put(key, new AtomicLong(1));
+
+            LoadingCache<Integer, Long> cache = EvictableCacheBuilder.newBuilder()
+                    .maximumSize(10_000)
+                    .build(CacheLoader.from(i -> remoteState.get(i).get()));
+
+            int threads = 4;
+            CyclicBarrier barrier = new CyclicBarrier(threads);
+            ExecutorService executor = newFixedThreadPool(threads);
+            try {
+                List<Future<Void>> futures = IntStream.range(0, threads)
+                        .mapToObj(threadNumber -> executor.submit(() -> {
+                            // prime the cache
+                            assertThat((long) cache.get(key)).isEqualTo(1L);
+                            int prime = primes[threadNumber];
+
+                            barrier.await(10, SECONDS);
+
+                            // modify underlying state
+                            remoteState.get(key).updateAndGet(current -> current * prime);
+
+                            // invalidate
+                            switch (invalidation) {
+                                case INVALIDATE_KEY:
+                                    cache.invalidate(key);
+                                    break;
+                                case INVALIDATE_PREDEFINED_KEYS:
+                                    cache.invalidateAll(ImmutableList.of(key));
+                                    break;
+                                case INVALIDATE_SELECTED_KEYS:
+                                    Set<Integer> keys = cache.asMap().keySet().stream()
+                                            .filter(foundKey -> (int) foundKey == key)
+                                            .collect(toImmutableSet());
+                                    cache.invalidateAll(keys);
+                                    break;
+                                case INVALIDATE_ALL:
+                                    cache.invalidateAll();
+                                    break;
+                            }
+
+                            // read through cache
+                            long current = cache.get(key);
+                            if (current % prime != 0) {
+                                throw new AssertionError(format("The value read through cache (%s) in thread (%s) is not divisible by (%s)", current, threadNumber, prime));
+                            }
+
+                            return (Void) null;
+                        }))
+                        .collect(toImmutableList());
+
+                futures.forEach(MoreFutures::getFutureValue);
+
+                assertThat(remoteState.keySet()).isEqualTo(ImmutableSet.of(key));
+                assertThat(remoteState.get(key).get()).isEqualTo(2 * 3 * 5 * 7);
+                assertThat((long) cache.get(key)).isEqualTo(2 * 3 * 5 * 7);
+            }
+            finally {
+                executor.shutdownNow();
+                assertThat(executor.awaitTermination(10, SECONDS)).isTrue();
+            }
+        }
+    }
+
+    @Test
+    public void testPutOnEmptyCacheImplementation()
+    {
+        for (EvictableCacheBuilder.DisabledCacheImplementation disabledCacheImplementation : EvictableCacheBuilder.DisabledCacheImplementation.values()) {
+            LoadingCache<Object, Object> cache = EvictableCacheBuilder.newBuilder()
+                    .maximumSize(0)
+                    .disabledCacheImplementation(disabledCacheImplementation)
+                    .build(CacheLoader.from(key -> key));
+            Map<Object, Object> cacheMap = cache.asMap();
+
+            int key = 0;
+            int value = 1;
+            assertThat(cacheMap.put(key, value)).isNull();
+            assertThat(cacheMap.put(key, value)).isNull();
+            assertThat(cacheMap.putIfAbsent(key, value)).isNull();
+            assertThat(cacheMap.putIfAbsent(key, value)).isNull();
+        }
+    }
+
+    @Test
+    public void testPutOnNonEmptyCacheImplementation()
+    {
+        LoadingCache<Object, Object> cache = EvictableCacheBuilder.newBuilder()
+                .maximumSize(10)
+                .build(CacheLoader.from(key -> key));
+        Map<Object, Object> cacheMap = cache.asMap();
+
+        int key = 0;
+        int value = 1;
+        assertThatThrownBy(() -> cacheMap.put(key, value))
+                .isInstanceOf(UnsupportedOperationException.class)
+                .hasMessage("The operation is not supported, as in inherently races with cache invalidation. Use get(key, callable) instead.");
+        assertThatThrownBy(() -> cacheMap.putIfAbsent(key, value))
+                .isInstanceOf(UnsupportedOperationException.class)
+                .hasMessage("The operation is not supported, as in inherently races with cache invalidation");
+    }
+
+    /**
+     * A class implementing value-based equality taking into account some fields, but not all.
+     * This is definitely discouraged, but still may happen in practice.
+     */
+    private static class ClassWithPartialEquals
+    {
+        private final int value;
+        private final int additionalField; // not part of equals
+
+        public ClassWithPartialEquals(int value, int additionalField)
+        {
+            this.value = value;
+            this.additionalField = additionalField;
+        }
+
+        public int getValue()
+        {
+            return value;
+        }
+
+        public int getAdditionalField()
+        {
+            return additionalField;
+        }
+
+        @Override
+        public boolean equals(Object other)
+        {
+            return other != null &&
+                    this.getClass() == other.getClass() &&
+                    this.value == ((ClassWithPartialEquals) other).value;
+        }
+
+        @Override
+        public int hashCode()
+        {
+            return value;
+        }
+    }
+}
diff --git a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestSafeCaches.java b/lib/trino-cache/src/test/java/io/trino/cache/TestSafeCaches.java
similarity index 93%
rename from lib/trino-collect/src/test/java/io/trino/collect/cache/TestSafeCaches.java
rename to lib/trino-cache/src/test/java/io/trino/cache/TestSafeCaches.java
index 041acc734129..c9af12e47d64 100644
--- a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestSafeCaches.java
+++ b/lib/trino-cache/src/test/java/io/trino/cache/TestSafeCaches.java
@@ -11,21 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.collect.cache;
+package io.trino.cache;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.collect.ImmutableList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertSame;
 
 public class TestSafeCaches
 {
@@ -75,7 +74,7 @@ private static void verifyLoadingIsPossible(Cache<Object, Object> cache)
         Object key = new Object();
         Object value = new Object();
         // Verify the previous load was inserted into the cache
-        assertSame(cache.get(key, () -> value), value);
+        assertThat(cache.get(key, () -> value)).isSameAs(value);
     }
 
     private static void verifyKeyInvalidationIsImpossible(Cache<Object, Object> cache)
@@ -118,14 +117,14 @@ private static void verifyClearIsPossible(Cache<Object, Object> cache)
         Object key = new Object();
         Object firstValue = new Object();
         cache.get(key, () -> firstValue);
-        assertSame(cache.getIfPresent(key), firstValue);
+        assertThat(cache.getIfPresent(key)).isSameAs(firstValue);
 
         cache.invalidateAll();
         assertThat(cache.getIfPresent(key)).isNull();
 
         Object secondValue = new Object();
         cache.get(key, () -> secondValue);
-        assertSame(cache.getIfPresent(key), secondValue);
+        assertThat(cache.getIfPresent(key)).isSameAs(secondValue);
         cache.asMap().clear();
         assertThat(cache.getIfPresent(key)).isNull();
     }
diff --git a/lib/trino-collect/pom.xml b/lib/trino-collect/pom.xml
deleted file mode 100644
index be672b065161..000000000000
--- a/lib/trino-collect/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>io.trino</groupId>
-        <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>trino-collect</artifactId>
-    <name>trino-collect</name>
-
-    <properties>
-        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <project.build.targetJdk>8</project.build.targetJdk>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.gaul</groupId>
-            <artifactId>modernizer-maven-annotations</artifactId>
-        </dependency>
-
-        <!-- for testing -->
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/lib/trino-collect/src/main/java/io/trino/collect/cache/CacheUtils.java b/lib/trino-collect/src/main/java/io/trino/collect/cache/CacheUtils.java
deleted file mode 100644
index 601164fe795a..000000000000
--- a/lib/trino-collect/src/main/java/io/trino/collect/cache/CacheUtils.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed 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 io.trino.collect.cache;
-
-import com.google.common.cache.Cache;
-
-import java.util.concurrent.ExecutionException;
-import java.util.function.Supplier;
-
-public final class CacheUtils
-{
-    private CacheUtils() {}
-
-    public static <K, V> V uncheckedCacheGet(Cache<K, V> cache, K key, Supplier<V> loader)
-    {
-        try {
-            return cache.get(key, loader::get);
-        }
-        catch (ExecutionException e) {
-            // this can not happen because a supplier can not throw a checked exception
-            throw new RuntimeException("Unexpected checked exception from cache load", e);
-        }
-    }
-}
diff --git a/lib/trino-collect/src/test/java/io/trino/collect/cache/Invalidation.java b/lib/trino-collect/src/test/java/io/trino/collect/cache/Invalidation.java
deleted file mode 100644
index 6b6213bc1127..000000000000
--- a/lib/trino-collect/src/test/java/io/trino/collect/cache/Invalidation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed 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 io.trino.collect.cache;
-
-import org.testng.annotations.DataProvider;
-
-import java.util.stream.Stream;
-
-enum Invalidation
-{
-    INVALIDATE_KEY,
-    INVALIDATE_PREDEFINED_KEYS,
-    INVALIDATE_SELECTED_KEYS,
-    INVALIDATE_ALL,
-    /**/;
-
-    @DataProvider
-    public static Object[][] invalidations()
-    {
-        return Stream.of(values())
-                .map(invalidation -> new Object[] {invalidation})
-                .toArray(Object[][]::new);
-    }
-}
diff --git a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java b/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
deleted file mode 100644
index 4274eb453966..000000000000
--- a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
+++ /dev/null
@@ -1,591 +0,0 @@
-/*
- * Licensed 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 io.trino.collect.cache;
-
-import com.google.common.base.Strings;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheStats;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import io.airlift.testing.TestingTicker;
-import io.trino.collect.cache.EvictableCacheBuilder.DisabledCacheImplementation;
-import org.gaul.modernizer_maven_annotations.SuppressModernizer;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static io.trino.collect.cache.CacheStatsAssertions.assertCacheStats;
-import static io.trino.testing.DataProviders.toDataProvider;
-import static java.lang.Math.toIntExact;
-import static java.lang.String.format;
-import static java.util.concurrent.Executors.newFixedThreadPool;
-import static java.util.concurrent.TimeUnit.DAYS;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotSame;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-public class TestEvictableCache
-{
-    private static final int TEST_TIMEOUT_MILLIS = 10_000;
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testLoad()
-            throws Exception
-    {
-        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .build();
-        assertEquals(cache.get(42, () -> "abc"), "abc");
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testEvictBySize()
-            throws Exception
-    {
-        int maximumSize = 10;
-        Cache<Integer, Integer> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(maximumSize)
-                .build();
-
-        for (int i = 0; i < 10_000; i++) {
-            int value = i * 10;
-            assertEquals((Object) cache.get(i, () -> value), value);
-        }
-        cache.cleanUp();
-        assertEquals(cache.size(), maximumSize);
-        assertEquals(((EvictableCache<?, ?>) cache).tokensCount(), maximumSize);
-
-        // Ensure cache is effective, i.e. some entries preserved
-        int lastKey = 10_000 - 1;
-        assertEquals((Object) cache.get(lastKey, () -> {
-            throw new UnsupportedOperationException();
-        }), lastKey * 10);
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testEvictByWeight()
-            throws Exception
-    {
-        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .maximumWeight(20)
-                .weigher((Integer key, String value) -> value.length())
-                .build();
-
-        for (int i = 0; i < 10; i++) {
-            String value = Strings.repeat("a", i);
-            assertEquals((Object) cache.get(i, () -> value), value);
-        }
-        cache.cleanUp();
-        // It's not deterministic which entries get evicted
-        int cacheSize = toIntExact(cache.size());
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(cacheSize);
-        assertThat(cache.asMap().keySet()).as("keySet").hasSize(cacheSize);
-        assertThat(cache.asMap().keySet().stream().mapToInt(i -> i).sum()).as("key sum").isLessThanOrEqualTo(20);
-        assertThat(cache.asMap().values()).as("values").hasSize(cacheSize);
-        assertThat(cache.asMap().values().stream().mapToInt(String::length).sum()).as("values length sum").isLessThanOrEqualTo(20);
-
-        // Ensure cache is effective, i.e. some entries preserved
-        int lastKey = 10 - 1;
-        assertEquals(cache.get(lastKey, () -> {
-            throw new UnsupportedOperationException();
-        }), Strings.repeat("a", lastKey));
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testEvictByTime()
-            throws Exception
-    {
-        TestingTicker ticker = new TestingTicker();
-        int ttl = 100;
-        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .ticker(ticker)
-                .expireAfterWrite(ttl, TimeUnit.MILLISECONDS)
-                .build();
-
-        assertEquals(cache.get(1, () -> "1 ala ma kota"), "1 ala ma kota");
-        ticker.increment(ttl, MILLISECONDS);
-        assertEquals(cache.get(2, () -> "2 ala ma kota"), "2 ala ma kota");
-        cache.cleanUp();
-
-        // First entry should be expired and its token removed
-        int cacheSize = toIntExact(cache.size());
-        assertThat(cacheSize).as("cacheSize").isEqualTo(1);
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(cacheSize);
-        assertThat(cache.asMap().keySet()).as("keySet").hasSize(cacheSize);
-        assertThat(cache.asMap().values()).as("values").hasSize(cacheSize);
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testPreserveValueLoadedAfterTimeExpiration()
-            throws Exception
-    {
-        TestingTicker ticker = new TestingTicker();
-        int ttl = 100;
-        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .ticker(ticker)
-                .expireAfterWrite(ttl, TimeUnit.MILLISECONDS)
-                .build();
-        int key = 11;
-
-        assertEquals(cache.get(key, () -> "11 ala ma kota"), "11 ala ma kota");
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
-
-        // Should be served from the cache
-        assertEquals(cache.get(key, () -> "something else"), "11 ala ma kota");
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
-
-        ticker.increment(ttl, MILLISECONDS);
-        // Should be reloaded
-        assertEquals(cache.get(key, () -> "new value"), "new value");
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
-
-        // Should be served from the cache
-        assertEquals(cache.get(key, () -> "something yet different"), "new value");
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
-
-        assertThat(cache.size()).as("cacheSize").isEqualTo(1);
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
-        assertThat(cache.asMap().keySet()).as("keySet").hasSize(1);
-        assertThat(cache.asMap().values()).as("values").hasSize(1);
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testReplace()
-            throws Exception
-    {
-        Cache<Integer, Integer> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10)
-                .build();
-
-        int key = 10;
-        int initialValue = 20;
-        int replacedValue = 21;
-        cache.get(key, () -> initialValue);
-        assertTrue(cache.asMap().replace(key, initialValue, replacedValue));
-        assertEquals((Object) cache.getIfPresent(key), replacedValue);
-
-        // already replaced, current value is different
-        assertFalse(cache.asMap().replace(key, initialValue, replacedValue));
-        assertEquals((Object) cache.getIfPresent(key), replacedValue);
-
-        // non-existent key
-        assertFalse(cache.asMap().replace(100000, replacedValue, 22));
-        assertEquals(cache.asMap().keySet(), ImmutableSet.of(key));
-        assertEquals((Object) cache.getIfPresent(key), replacedValue);
-
-        int anotherKey = 13;
-        int anotherInitialValue = 14;
-        cache.get(anotherKey, () -> anotherInitialValue);
-        cache.invalidate(anotherKey);
-        // after eviction
-        assertFalse(cache.asMap().replace(anotherKey, anotherInitialValue, 15));
-        assertEquals(cache.asMap().keySet(), ImmutableSet.of(key));
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS, dataProvider = "testDisabledCacheDataProvider")
-    public void testDisabledCache(String behavior)
-            throws Exception
-    {
-        EvictableCacheBuilder<Object, Object> builder = EvictableCacheBuilder.newBuilder()
-                .maximumSize(0);
-
-        switch (behavior) {
-            case "share-nothing":
-                builder.shareNothingWhenDisabled();
-                break;
-            case "guava":
-                builder.shareResultsAndFailuresEvenIfDisabled();
-                break;
-            case "none":
-                assertThatThrownBy(builder::build)
-                        .isInstanceOf(IllegalStateException.class)
-                        .hasMessage("Even when cache is disabled, the loads are synchronized and both load results and failures are shared between threads. " +
-                                "This is rarely desired, thus builder caller is expected to either opt-in into this behavior with shareResultsAndFailuresEvenIfDisabled(), " +
-                                "or choose not to share results (and failures) between concurrent invocations with shareNothingWhenDisabled().");
-                return;
-            default:
-                throw new UnsupportedOperationException("Unsupported: " + behavior);
-        }
-
-        Cache<Integer, Integer> cache = builder.build();
-
-        for (int i = 0; i < 10; i++) {
-            int value = i * 10;
-            assertEquals((Object) cache.get(i, () -> value), value);
-        }
-        cache.cleanUp();
-        assertEquals(cache.size(), 0);
-        assertThat(cache.asMap().keySet()).as("keySet").isEmpty();
-        assertThat(cache.asMap().values()).as("values").isEmpty();
-    }
-
-    @DataProvider
-    public static Object[][] testDisabledCacheDataProvider()
-    {
-        return new Object[][] {
-                {"share-nothing"},
-                {"guava"},
-                {"none"},
-        };
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testLoadStats()
-            throws Exception
-    {
-        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .recordStats()
-                .build();
-
-        assertEquals(cache.stats(), new CacheStats(0, 0, 0, 0, 0, 0));
-
-        String value = assertCacheStats(cache)
-                .misses(1)
-                .loads(1)
-                .calling(() -> cache.get(42, () -> "abc"));
-        assertEquals(value, "abc");
-
-        value = assertCacheStats(cache)
-                .hits(1)
-                .calling(() -> cache.get(42, () -> "xyz"));
-        assertEquals(value, "abc");
-
-        // with equal, but not the same key
-        value = assertCacheStats(cache)
-                .hits(1)
-                .calling(() -> cache.get(newInteger(42), () -> "xyz"));
-        assertEquals(value, "abc");
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS, invocationCount = 10, successPercentage = 50)
-    public void testLoadFailure()
-            throws Exception
-    {
-        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(0)
-                .expireAfterWrite(0, DAYS)
-                .shareResultsAndFailuresEvenIfDisabled()
-                .build();
-        int key = 10;
-
-        ExecutorService executor = newFixedThreadPool(2);
-        try {
-            AtomicBoolean first = new AtomicBoolean(true);
-            CyclicBarrier barrier = new CyclicBarrier(2);
-
-            List<Future<String>> futures = new ArrayList<>();
-            for (int i = 0; i < 2; i++) {
-                futures.add(executor.submit(() -> {
-                    barrier.await(10, SECONDS);
-                    return cache.get(key, () -> {
-                        if (first.compareAndSet(true, false)) {
-                            // first
-                            Thread.sleep(1); // increase chances that second thread calls cache.get before we return
-                            throw new RuntimeException("first attempt is poised to fail");
-                        }
-                        return "success";
-                    });
-                }));
-            }
-
-            List<String> results = new ArrayList<>();
-            for (Future<String> future : futures) {
-                try {
-                    results.add(future.get());
-                }
-                catch (ExecutionException e) {
-                    results.add(e.getCause().toString());
-                }
-            }
-
-            // Note: if this starts to fail, that suggests that Guava implementation changed and NoopCache may be redundant now.
-            assertThat(results).containsExactly(
-                    "com.google.common.util.concurrent.UncheckedExecutionException: java.lang.RuntimeException: first attempt is poised to fail",
-                    "com.google.common.util.concurrent.UncheckedExecutionException: java.lang.RuntimeException: first attempt is poised to fail");
-        }
-        finally {
-            executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
-        }
-    }
-
-    @SuppressModernizer
-    private static Integer newInteger(int value)
-    {
-        Integer integer = value;
-        @SuppressWarnings({"UnnecessaryBoxing", "deprecation", "BoxedPrimitiveConstructor"})
-        Integer newInteger = new Integer(value);
-        assertNotSame(integer, newInteger);
-        return newInteger;
-    }
-
-    /**
-     * Test that the loader is invoked only once for concurrent invocations of {{@link LoadingCache#get(Object, Callable)} with equal keys.
-     * This is a behavior of Guava Cache as well. While this is necessarily desirable behavior (see
-     * <a href="https://github.com/trinodb/trino/issues/11067">https://github.com/trinodb/trino/issues/11067</a>),
-     * the test exists primarily to document current state and support discussion, should the current state change.
-     */
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testConcurrentGetWithCallableShareLoad()
-            throws Exception
-    {
-        AtomicInteger loads = new AtomicInteger();
-        AtomicInteger concurrentInvocations = new AtomicInteger();
-
-        Cache<Integer, Integer> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .build();
-
-        int threads = 2;
-        int invocationsPerThread = 100;
-        ExecutorService executor = newFixedThreadPool(threads);
-        try {
-            CyclicBarrier barrier = new CyclicBarrier(threads);
-            List<Future<?>> futures = new ArrayList<>();
-            for (int i = 0; i < threads; i++) {
-                futures.add(executor.submit(() -> {
-                    for (int invocation = 0; invocation < invocationsPerThread; invocation++) {
-                        int key = invocation;
-                        barrier.await(10, SECONDS);
-                        int value = cache.get(key, () -> {
-                            loads.incrementAndGet();
-                            int invocations = concurrentInvocations.incrementAndGet();
-                            checkState(invocations == 1, "There should be no concurrent invocations, cache should do load sharing when get() invoked for same key");
-                            Thread.sleep(1);
-                            concurrentInvocations.decrementAndGet();
-                            return -key;
-                        });
-                        assertEquals(value, -invocation);
-                    }
-                    return null;
-                }));
-            }
-
-            for (Future<?> future : futures) {
-                future.get(10, SECONDS);
-            }
-            assertThat(loads).as("loads")
-                    .hasValueBetween(invocationsPerThread, threads * invocationsPerThread - 1 /* inclusive */);
-        }
-        finally {
-            executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
-        }
-    }
-
-    /**
-     * Covers https://github.com/google/guava/issues/1881
-     */
-    @Test(timeOut = TEST_TIMEOUT_MILLIS, dataProviderClass = Invalidation.class, dataProvider = "invalidations")
-    public void testInvalidateOngoingLoad(Invalidation invalidation)
-            throws Exception
-    {
-        Cache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .build();
-        Integer key = 42;
-
-        CountDownLatch loadOngoing = new CountDownLatch(1);
-        CountDownLatch invalidated = new CountDownLatch(1);
-        CountDownLatch getReturned = new CountDownLatch(1);
-        ExecutorService executor = newFixedThreadPool(2);
-        try {
-            // thread A
-            Future<String> threadA = executor.submit(() -> {
-                String value = cache.get(key, () -> {
-                    loadOngoing.countDown(); // 1
-                    assertTrue(invalidated.await(10, SECONDS)); // 2
-                    return "stale value";
-                });
-                getReturned.countDown(); // 3
-                return value;
-            });
-
-            // thread B
-            Future<String> threadB = executor.submit(() -> {
-                assertTrue(loadOngoing.await(10, SECONDS)); // 1
-
-                switch (invalidation) {
-                    case INVALIDATE_KEY:
-                        cache.invalidate(key);
-                        break;
-                    case INVALIDATE_PREDEFINED_KEYS:
-                        cache.invalidateAll(ImmutableList.of(key));
-                        break;
-                    case INVALIDATE_SELECTED_KEYS:
-                        Set<Integer> keys = cache.asMap().keySet().stream()
-                                .filter(foundKey -> (int) foundKey == key)
-                                .collect(toImmutableSet());
-                        cache.invalidateAll(keys);
-                        break;
-                    case INVALIDATE_ALL:
-                        cache.invalidateAll();
-                        break;
-                }
-
-                invalidated.countDown(); // 2
-                // Cache may persist value after loader returned, but before `cache.get(...)` returned. Ensure the latter completed.
-                assertTrue(getReturned.await(10, SECONDS)); // 3
-
-                return cache.get(key, () -> "fresh value");
-            });
-
-            assertEquals(threadA.get(), "stale value");
-            assertEquals(threadB.get(), "fresh value");
-        }
-        finally {
-            executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
-        }
-    }
-
-    /**
-     * Covers https://github.com/google/guava/issues/1881
-     */
-    @Test(invocationCount = 10, timeOut = TEST_TIMEOUT_MILLIS, dataProviderClass = Invalidation.class, dataProvider = "invalidations")
-    public void testInvalidateAndLoadConcurrently(Invalidation invalidation)
-            throws Exception
-    {
-        int[] primes = {2, 3, 5, 7};
-        AtomicLong remoteState = new AtomicLong(1);
-
-        Cache<Integer, Long> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .build();
-        Integer key = 42;
-        int threads = 4;
-
-        CyclicBarrier barrier = new CyclicBarrier(threads);
-        ExecutorService executor = newFixedThreadPool(threads);
-        try {
-            List<Future<Void>> futures = IntStream.range(0, threads)
-                    .mapToObj(threadNumber -> executor.submit(() -> {
-                        // prime the cache
-                        assertEquals((long) cache.get(key, remoteState::get), 1L);
-                        int prime = primes[threadNumber];
-
-                        barrier.await(10, SECONDS);
-
-                        // modify underlying state
-                        remoteState.updateAndGet(current -> current * prime);
-
-                        // invalidate
-                        switch (invalidation) {
-                            case INVALIDATE_KEY:
-                                cache.invalidate(key);
-                                break;
-                            case INVALIDATE_PREDEFINED_KEYS:
-                                cache.invalidateAll(ImmutableList.of(key));
-                                break;
-                            case INVALIDATE_SELECTED_KEYS:
-                                Set<Integer> keys = cache.asMap().keySet().stream()
-                                        .filter(foundKey -> (int) foundKey == key)
-                                        .collect(toImmutableSet());
-                                cache.invalidateAll(keys);
-                                break;
-                            case INVALIDATE_ALL:
-                                cache.invalidateAll();
-                                break;
-                        }
-
-                        // read through cache
-                        long current = cache.get(key, remoteState::get);
-                        if (current % prime != 0) {
-                            fail(format("The value read through cache (%s) in thread (%s) is not divisible by (%s)", current, threadNumber, prime));
-                        }
-
-                        return (Void) null;
-                    }))
-                    .collect(toImmutableList());
-
-            futures.forEach(MoreFutures::getFutureValue);
-
-            assertEquals(remoteState.get(), 2 * 3 * 5 * 7);
-            assertEquals((long) cache.get(key, remoteState::get), remoteState.get());
-        }
-        finally {
-            executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
-        }
-    }
-
-    @Test(dataProvider = "disabledCacheImplementations")
-    public void testPutOnEmptyCacheImplementation(DisabledCacheImplementation disabledCacheImplementation)
-    {
-        Cache<Object, Object> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(0)
-                .disabledCacheImplementation(disabledCacheImplementation)
-                .build();
-        Map<Object, Object> cacheMap = cache.asMap();
-
-        int key = 0;
-        int value = 1;
-        assertThat(cacheMap.put(key, value)).isNull();
-        assertThat(cacheMap.put(key, value)).isNull();
-        assertThat(cacheMap.putIfAbsent(key, value)).isNull();
-        assertThat(cacheMap.putIfAbsent(key, value)).isNull();
-    }
-
-    @Test
-    public void testPutOnNonEmptyCacheImplementation()
-    {
-        Cache<Object, Object> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10)
-                .build();
-        Map<Object, Object> cacheMap = cache.asMap();
-
-        int key = 0;
-        int value = 1;
-        assertThatThrownBy(() -> cacheMap.put(key, value))
-                .isInstanceOf(UnsupportedOperationException.class)
-                .hasMessage("The operation is not supported, as in inherently races with cache invalidation. Use get(key, callable) instead.");
-        assertThatThrownBy(() -> cacheMap.putIfAbsent(key, value))
-                .isInstanceOf(UnsupportedOperationException.class)
-                .hasMessage("The operation is not supported, as in inherently races with cache invalidation");
-    }
-
-    @DataProvider
-    public static Object[][] disabledCacheImplementations()
-    {
-        return Stream.of(DisabledCacheImplementation.values())
-                .collect(toDataProvider());
-    }
-}
diff --git a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableLoadingCache.java b/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableLoadingCache.java
deleted file mode 100644
index 0259538a100b..000000000000
--- a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableLoadingCache.java
+++ /dev/null
@@ -1,753 +0,0 @@
-/*
- * Licensed 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 io.trino.collect.cache;
-
-import com.google.common.base.Strings;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.CacheStats;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import io.airlift.testing.TestingTicker;
-import org.gaul.modernizer_maven_annotations.SuppressModernizer;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.IntStream;
-
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.collect.cache.CacheStatsAssertions.assertCacheStats;
-import static java.lang.Math.toIntExact;
-import static java.lang.String.format;
-import static java.util.concurrent.Executors.newFixedThreadPool;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotSame;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-public class TestEvictableLoadingCache
-{
-    private static final int TEST_TIMEOUT_MILLIS = 10_000;
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testLoad()
-            throws Exception
-    {
-        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .recordStats()
-                .build(CacheLoader.from((Integer ignored) -> "abc"));
-
-        assertEquals(cache.get(42), "abc");
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testEvictBySize()
-            throws Exception
-    {
-        int maximumSize = 10;
-        AtomicInteger loads = new AtomicInteger();
-        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(maximumSize)
-                .build(CacheLoader.from(key -> {
-                    loads.incrementAndGet();
-                    return "abc" + key;
-                }));
-
-        for (int i = 0; i < 10_000; i++) {
-            assertEquals((Object) cache.get(i), "abc" + i);
-        }
-        cache.cleanUp();
-        assertEquals(cache.size(), maximumSize);
-        assertEquals(((EvictableCache<?, ?>) cache).tokensCount(), maximumSize);
-        assertEquals(loads.get(), 10_000);
-
-        // Ensure cache is effective, i.e. no new load
-        int lastKey = 10_000 - 1;
-        assertEquals((Object) cache.get(lastKey), "abc" + lastKey);
-        assertEquals(loads.get(), 10_000);
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testEvictByWeight()
-            throws Exception
-    {
-        AtomicInteger loads = new AtomicInteger();
-        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .maximumWeight(20)
-                .weigher((Integer key, String value) -> value.length())
-                .build(CacheLoader.from(key -> {
-                    loads.incrementAndGet();
-                    return Strings.repeat("a", key);
-                }));
-
-        for (int i = 0; i < 10; i++) {
-            assertEquals((Object) cache.get(i), Strings.repeat("a", i));
-        }
-        cache.cleanUp();
-        // It's not deterministic which entries get evicted
-        int cacheSize = toIntExact(cache.size());
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(cacheSize);
-        assertThat(cache.asMap().keySet()).as("keySet").hasSize(cacheSize);
-        assertThat(cache.asMap().keySet().stream().mapToInt(i -> i).sum()).as("key sum").isLessThanOrEqualTo(20);
-        assertThat(cache.asMap().values()).as("values").hasSize(cacheSize);
-        assertThat(cache.asMap().values().stream().mapToInt(String::length).sum()).as("values length sum").isLessThanOrEqualTo(20);
-        assertEquals(loads.get(), 10);
-
-        // Ensure cache is effective, i.e. no new load
-        int lastKey = 10 - 1;
-        assertEquals((Object) cache.get(lastKey), Strings.repeat("a", lastKey));
-        assertEquals(loads.get(), 10);
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testEvictByTime()
-    {
-        TestingTicker ticker = new TestingTicker();
-        int ttl = 100;
-        AtomicInteger loads = new AtomicInteger();
-        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .ticker(ticker)
-                .expireAfterWrite(ttl, TimeUnit.MILLISECONDS)
-                .build(CacheLoader.from(k -> {
-                    loads.incrementAndGet();
-                    return k + " ala ma kota";
-                }));
-
-        assertEquals(cache.getUnchecked(1), "1 ala ma kota");
-        ticker.increment(ttl, MILLISECONDS);
-        assertEquals(cache.getUnchecked(2), "2 ala ma kota");
-        cache.cleanUp();
-
-        // First entry should be expired and its token removed
-        int cacheSize = toIntExact(cache.size());
-        assertThat(cacheSize).as("cacheSize").isEqualTo(1);
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(cacheSize);
-        assertThat(cache.asMap().keySet()).as("keySet").hasSize(cacheSize);
-        assertThat(cache.asMap().values()).as("values").hasSize(cacheSize);
-        assertEquals(loads.get(), 2);
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testPreserveValueLoadedAfterTimeExpiration()
-    {
-        TestingTicker ticker = new TestingTicker();
-        int ttl = 100;
-        AtomicInteger loads = new AtomicInteger();
-        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .ticker(ticker)
-                .expireAfterWrite(ttl, TimeUnit.MILLISECONDS)
-                .build(CacheLoader.from(k -> {
-                    loads.incrementAndGet();
-                    return k + " ala ma kota";
-                }));
-        int key = 11;
-
-        assertEquals(cache.getUnchecked(key), "11 ala ma kota");
-        assertThat(loads.get()).as("initial load count").isEqualTo(1);
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
-
-        // Should be served from the cache
-        assertEquals(cache.getUnchecked(key), "11 ala ma kota");
-        assertThat(loads.get()).as("loads count should not change before value expires").isEqualTo(1);
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
-
-        ticker.increment(ttl, MILLISECONDS);
-        // Should be reloaded
-        assertEquals(cache.getUnchecked(key), "11 ala ma kota");
-        assertThat(loads.get()).as("loads count should reflect reloading of value after expiration").isEqualTo(2);
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
-
-        // Should be served from the cache
-        assertEquals(cache.getUnchecked(key), "11 ala ma kota");
-        assertThat(loads.get()).as("loads count should not change before value expires again").isEqualTo(2);
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
-
-        assertThat(cache.size()).as("cacheSize").isEqualTo(1);
-        assertThat(((EvictableCache<?, ?>) cache).tokensCount()).as("tokensCount").isEqualTo(1);
-        assertThat(cache.asMap().keySet()).as("keySet").hasSize(1);
-        assertThat(cache.asMap().values()).as("values").hasSize(1);
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS, dataProvider = "testDisabledCacheDataProvider")
-    public void testDisabledCache(String behavior)
-            throws Exception
-    {
-        CacheLoader<Integer, Integer> loader = CacheLoader.from(key -> key * 10);
-        EvictableCacheBuilder<Object, Object> builder = EvictableCacheBuilder.newBuilder()
-                .maximumSize(0);
-
-        switch (behavior) {
-            case "share-nothing":
-                builder.shareNothingWhenDisabled();
-                break;
-            case "guava":
-                builder.shareResultsAndFailuresEvenIfDisabled();
-                break;
-            case "none":
-                assertThatThrownBy(() -> builder.build(loader))
-                        .isInstanceOf(IllegalStateException.class)
-                        .hasMessage("Even when cache is disabled, the loads are synchronized and both load results and failures are shared between threads. " +
-                                "This is rarely desired, thus builder caller is expected to either opt-in into this behavior with shareResultsAndFailuresEvenIfDisabled(), " +
-                                "or choose not to share results (and failures) between concurrent invocations with shareNothingWhenDisabled().");
-                return;
-            default:
-                throw new UnsupportedOperationException("Unsupported: " + behavior);
-        }
-
-        LoadingCache<Integer, Integer> cache = builder.build(loader);
-
-        for (int i = 0; i < 10; i++) {
-            assertEquals((Object) cache.get(i), i * 10);
-        }
-        cache.cleanUp();
-        assertEquals(cache.size(), 0);
-        assertThat(cache.asMap().keySet()).as("keySet").isEmpty();
-        assertThat(cache.asMap().values()).as("values").isEmpty();
-    }
-
-    @DataProvider
-    public static Object[][] testDisabledCacheDataProvider()
-    {
-        return new Object[][] {
-                {"share-nothing"},
-                {"guava"},
-                {"none"},
-        };
-    }
-
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testLoadStats()
-            throws Exception
-    {
-        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .recordStats()
-                .build(CacheLoader.from((Integer ignored) -> "abc"));
-
-        assertEquals(cache.stats(), new CacheStats(0, 0, 0, 0, 0, 0));
-
-        String value = assertCacheStats(cache)
-                .misses(1)
-                .loads(1)
-                .calling(() -> cache.get(42));
-        assertEquals(value, "abc");
-
-        value = assertCacheStats(cache)
-                .hits(1)
-                .calling(() -> cache.get(42));
-        assertEquals(value, "abc");
-
-        // with equal, but not the same key
-        value = assertCacheStats(cache)
-                .hits(1)
-                .calling(() -> cache.get(newInteger(42)));
-        assertEquals(value, "abc");
-    }
-
-    @SuppressModernizer
-    private static Integer newInteger(int value)
-    {
-        Integer integer = value;
-        @SuppressWarnings({"UnnecessaryBoxing", "deprecation", "BoxedPrimitiveConstructor"})
-        Integer newInteger = new Integer(value);
-        assertNotSame(integer, newInteger);
-        return newInteger;
-    }
-
-    /**
-     * Verity that implementation of {@link LoadingCache#getAll(Iterable)} returns same keys as provided, not equal ones.
-     * This is necessary for the case where the cache key can be equal but still distinguishable.
-     */
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testGetAllMaintainsKeyIdentity()
-            throws Exception
-    {
-        LoadingCache<String, Integer> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .recordStats()
-                .build(CacheLoader.from(String::length));
-
-        String first = "abc";
-        String second = new String(first);
-        assertNotSame(first, second);
-
-        // prime the cache
-        assertEquals((int) cache.get(first), 3);
-
-        Map<String, Integer> values = cache.getAll(ImmutableList.of(second));
-        assertThat(values).hasSize(1);
-        Entry<String, Integer> entry = getOnlyElement(values.entrySet());
-        assertEquals((int) entry.getValue(), 3);
-        assertEquals(entry.getKey(), first);
-        assertEquals(entry.getKey(), second);
-        assertNotSame(entry.getKey(), first);
-        assertSame(entry.getKey(), second);
-    }
-
-    /**
-     * Test that they keys provided to {@link LoadingCache#get(Object)} are not necessarily the ones provided to
-     * {@link CacheLoader#load(Object)}. While guarantying this would be obviously desirable (as in
-     * {@link #testGetAllMaintainsKeyIdentityForBulkLoader}), it seems not feasible to do this while
-     * also maintain load sharing (see {@link #testConcurrentGetShareLoad()}).
-     */
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testGetDoesNotMaintainKeyIdentityForLoader()
-            throws Exception
-    {
-        AtomicInteger loadCounter = new AtomicInteger();
-        int firstAdditionalField = 1;
-        int secondAdditionalField = 123456789;
-
-        LoadingCache<ClassWithPartialEquals, Integer> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .build(CacheLoader.from((ClassWithPartialEquals key) -> {
-                    loadCounter.incrementAndGet();
-                    assertEquals(key.getAdditionalField(), firstAdditionalField); // not secondAdditionalField because get() reuses existing token
-                    return key.getValue();
-                }));
-
-        ClassWithPartialEquals keyA = new ClassWithPartialEquals(42, firstAdditionalField);
-        ClassWithPartialEquals keyB = new ClassWithPartialEquals(42, secondAdditionalField);
-        // sanity check: objects are equal despite having different observed state
-        assertEquals(keyA, keyB);
-        assertNotEquals(keyA.getAdditionalField(), keyB.getAdditionalField());
-
-        // Populate the cache
-        assertEquals((int) cache.get(keyA, () -> 317), 317);
-        assertEquals(loadCounter.get(), 0);
-
-        // invalidate dataCache but keep tokens -- simulate concurrent implicit or explicit eviction
-        ((EvictableCache<?, ?>) cache).clearDataCacheOnly();
-        assertEquals((int) cache.get(keyB), 42);
-        assertEquals(loadCounter.get(), 1);
-    }
-
-    /**
-     * Test that they keys provided to {@link LoadingCache#getAll(Iterable)} are the ones provided to {@link CacheLoader#loadAll(Iterable)}.
-     * It is possible that {@link CacheLoader#loadAll(Iterable)} requires keys to have some special characteristics and some
-     * other, equal keys, derived from {@code EvictableCache.tokens}, may not have that characteristics.
-     * This can happen only when cache keys are not fully value-based. While discouraged, this situation is possible.
-     * Guava Cache also exhibits the behavior tested here.
-     */
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testGetAllMaintainsKeyIdentityForBulkLoader()
-            throws Exception
-    {
-        AtomicInteger loadAllCounter = new AtomicInteger();
-        int expectedAdditionalField = 123456789;
-
-        LoadingCache<ClassWithPartialEquals, Integer> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .build(new CacheLoader<ClassWithPartialEquals, Integer>()
-                {
-                    @Override
-                    public Integer load(ClassWithPartialEquals key)
-                    {
-                        throw new UnsupportedOperationException();
-                    }
-
-                    @Override
-                    public Map<ClassWithPartialEquals, Integer> loadAll(Iterable<? extends ClassWithPartialEquals> keys)
-                    {
-                        loadAllCounter.incrementAndGet();
-                        // For the sake of simplicity, the test currently leverages that getAll() with singleton list will
-                        // end up calling loadAll() even though load() could be used.
-                        ClassWithPartialEquals key = getOnlyElement(keys);
-                        assertEquals(key.getAdditionalField(), expectedAdditionalField);
-                        return ImmutableMap.of(key, key.getValue());
-                    }
-                });
-
-        ClassWithPartialEquals keyA = new ClassWithPartialEquals(42, 1);
-        ClassWithPartialEquals keyB = new ClassWithPartialEquals(42, expectedAdditionalField);
-        // sanity check: objects are equal despite having different observed state
-        assertEquals(keyA, keyB);
-        assertNotEquals(keyA.getAdditionalField(), keyB.getAdditionalField());
-
-        // Populate the cache
-        assertEquals((int) cache.get(keyA, () -> 317), 317);
-        assertEquals(loadAllCounter.get(), 0);
-
-        // invalidate dataCache but keep tokens -- simulate concurrent implicit or explicit eviction
-        ((EvictableCache<?, ?>) cache).clearDataCacheOnly();
-        Map<ClassWithPartialEquals, Integer> map = cache.getAll(ImmutableList.of(keyB));
-        assertThat(map).hasSize(1);
-        assertSame(getOnlyElement(map.keySet()), keyB);
-        assertEquals((int) getOnlyElement(map.values()), 42);
-        assertEquals(loadAllCounter.get(), 1);
-    }
-
-    /**
-     * Test that the loader is invoked only once for concurrent invocations of {{@link LoadingCache#get(Object, Callable)} with equal keys.
-     * This is a behavior of Guava Cache as well. While this is necessarily desirable behavior (see
-     * <a href="https://github.com/trinodb/trino/issues/11067">https://github.com/trinodb/trino/issues/11067</a>),
-     * the test exists primarily to document current state and support discussion, should the current state change.
-     */
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testConcurrentGetWithCallableShareLoad()
-            throws Exception
-    {
-        AtomicInteger loads = new AtomicInteger();
-        AtomicInteger concurrentInvocations = new AtomicInteger();
-
-        LoadingCache<Integer, Integer> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .build(CacheLoader.from(() -> {
-                    throw new UnsupportedOperationException();
-                }));
-
-        int threads = 2;
-        int invocationsPerThread = 100;
-        ExecutorService executor = newFixedThreadPool(threads);
-        try {
-            CyclicBarrier barrier = new CyclicBarrier(threads);
-            List<Future<?>> futures = new ArrayList<>();
-            for (int i = 0; i < threads; i++) {
-                futures.add(executor.submit(() -> {
-                    for (int invocation = 0; invocation < invocationsPerThread; invocation++) {
-                        int key = invocation;
-                        barrier.await(10, SECONDS);
-                        int value = cache.get(key, () -> {
-                            loads.incrementAndGet();
-                            int invocations = concurrentInvocations.incrementAndGet();
-                            checkState(invocations == 1, "There should be no concurrent invocations, cache should do load sharing when get() invoked for same key");
-                            Thread.sleep(1);
-                            concurrentInvocations.decrementAndGet();
-                            return -key;
-                        });
-                        assertEquals(value, -invocation);
-                    }
-                    return null;
-                }));
-            }
-
-            for (Future<?> future : futures) {
-                future.get(10, SECONDS);
-            }
-            assertThat(loads).as("loads")
-                    .hasValueBetween(invocationsPerThread, threads * invocationsPerThread - 1 /* inclusive */);
-        }
-        finally {
-            executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
-        }
-    }
-
-    /**
-     * Test that the loader is invoked only once for concurrent invocations of {{@link LoadingCache#get(Object)} with equal keys.
-     */
-    @Test(timeOut = TEST_TIMEOUT_MILLIS)
-    public void testConcurrentGetShareLoad()
-            throws Exception
-    {
-        AtomicInteger loads = new AtomicInteger();
-        AtomicInteger concurrentInvocations = new AtomicInteger();
-
-        LoadingCache<Integer, Integer> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .build(new CacheLoader<Integer, Integer>()
-                {
-                    @Override
-                    public Integer load(Integer key)
-                            throws Exception
-                    {
-                        loads.incrementAndGet();
-                        int invocations = concurrentInvocations.incrementAndGet();
-                        checkState(invocations == 1, "There should be no concurrent invocations, cache should do load sharing when get() invoked for same key");
-                        Thread.sleep(1);
-                        concurrentInvocations.decrementAndGet();
-                        return -key;
-                    }
-                });
-
-        int threads = 2;
-        int invocationsPerThread = 100;
-        ExecutorService executor = newFixedThreadPool(threads);
-        try {
-            CyclicBarrier barrier = new CyclicBarrier(threads);
-            List<Future<?>> futures = new ArrayList<>();
-            for (int i = 0; i < threads; i++) {
-                futures.add(executor.submit(() -> {
-                    for (int invocation = 0; invocation < invocationsPerThread; invocation++) {
-                        barrier.await(10, SECONDS);
-                        assertEquals((int) cache.get(invocation), -invocation);
-                    }
-                    return null;
-                }));
-            }
-
-            for (Future<?> future : futures) {
-                future.get(10, SECONDS);
-            }
-            assertThat(loads).as("loads")
-                    .hasValueBetween(invocationsPerThread, threads * invocationsPerThread - 1 /* inclusive */);
-        }
-        finally {
-            executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
-        }
-    }
-
-    /**
-     * Covers https://github.com/google/guava/issues/1881
-     */
-    @Test(timeOut = TEST_TIMEOUT_MILLIS, dataProviderClass = Invalidation.class, dataProvider = "invalidations")
-    public void testInvalidateOngoingLoad(Invalidation invalidation)
-            throws Exception
-    {
-        ConcurrentMap<Integer, String> remoteState = new ConcurrentHashMap<>();
-        Integer key = 42;
-        remoteState.put(key, "stale value");
-
-        CountDownLatch loadOngoing = new CountDownLatch(1);
-        CountDownLatch invalidated = new CountDownLatch(1);
-        CountDownLatch getReturned = new CountDownLatch(1);
-
-        LoadingCache<Integer, String> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .build(new CacheLoader<Integer, String>()
-                {
-                    @Override
-                    public String load(Integer key)
-                            throws Exception
-                    {
-                        String value = remoteState.get(key);
-                        loadOngoing.countDown(); // 1
-                        assertTrue(invalidated.await(10, SECONDS)); // 2
-                        return value;
-                    }
-                });
-
-        ExecutorService executor = newFixedThreadPool(2);
-        try {
-            // thread A
-            Future<String> threadA = executor.submit(() -> {
-                String value = cache.get(key);
-                getReturned.countDown(); // 3
-                return value;
-            });
-
-            // thread B
-            Future<String> threadB = executor.submit(() -> {
-                assertTrue(loadOngoing.await(10, SECONDS)); // 1
-
-                switch (invalidation) {
-                    case INVALIDATE_KEY:
-                        cache.invalidate(key);
-                        break;
-                    case INVALIDATE_PREDEFINED_KEYS:
-                        cache.invalidateAll(ImmutableList.of(key));
-                        break;
-                    case INVALIDATE_SELECTED_KEYS:
-                        Set<Integer> keys = cache.asMap().keySet().stream()
-                                .filter(foundKey -> (int) foundKey == key)
-                                .collect(toImmutableSet());
-                        cache.invalidateAll(keys);
-                        break;
-                    case INVALIDATE_ALL:
-                        cache.invalidateAll();
-                        break;
-                }
-
-                remoteState.put(key, "fresh value");
-                invalidated.countDown(); // 2
-                // Cache may persist value after loader returned, but before `cache.get(...)` returned. Ensure the latter completed.
-                assertTrue(getReturned.await(10, SECONDS)); // 3
-
-                return cache.get(key);
-            });
-
-            assertEquals(threadA.get(), "stale value");
-            assertEquals(threadB.get(), "fresh value");
-        }
-        finally {
-            executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
-        }
-    }
-
-    /**
-     * Covers https://github.com/google/guava/issues/1881
-     */
-    @Test(invocationCount = 10, timeOut = TEST_TIMEOUT_MILLIS, dataProviderClass = Invalidation.class, dataProvider = "invalidations")
-    public void testInvalidateAndLoadConcurrently(Invalidation invalidation)
-            throws Exception
-    {
-        int[] primes = {2, 3, 5, 7};
-
-        Integer key = 42;
-        Map<Integer, AtomicLong> remoteState = new ConcurrentHashMap<>();
-        remoteState.put(key, new AtomicLong(1));
-
-        LoadingCache<Integer, Long> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10_000)
-                .build(CacheLoader.from(i -> remoteState.get(i).get()));
-
-        int threads = 4;
-        CyclicBarrier barrier = new CyclicBarrier(threads);
-        ExecutorService executor = newFixedThreadPool(threads);
-        try {
-            List<Future<Void>> futures = IntStream.range(0, threads)
-                    .mapToObj(threadNumber -> executor.submit(() -> {
-                        // prime the cache
-                        assertEquals((long) cache.get(key), 1L);
-                        int prime = primes[threadNumber];
-
-                        barrier.await(10, SECONDS);
-
-                        // modify underlying state
-                        remoteState.get(key).updateAndGet(current -> current * prime);
-
-                        // invalidate
-                        switch (invalidation) {
-                            case INVALIDATE_KEY:
-                                cache.invalidate(key);
-                                break;
-                            case INVALIDATE_PREDEFINED_KEYS:
-                                cache.invalidateAll(ImmutableList.of(key));
-                                break;
-                            case INVALIDATE_SELECTED_KEYS:
-                                Set<Integer> keys = cache.asMap().keySet().stream()
-                                        .filter(foundKey -> (int) foundKey == key)
-                                        .collect(toImmutableSet());
-                                cache.invalidateAll(keys);
-                                break;
-                            case INVALIDATE_ALL:
-                                cache.invalidateAll();
-                                break;
-                        }
-
-                        // read through cache
-                        long current = cache.get(key);
-                        if (current % prime != 0) {
-                            fail(format("The value read through cache (%s) in thread (%s) is not divisible by (%s)", current, threadNumber, prime));
-                        }
-
-                        return (Void) null;
-                    }))
-                    .collect(toImmutableList());
-
-            futures.forEach(MoreFutures::getFutureValue);
-
-            assertEquals(remoteState.keySet(), ImmutableSet.of(key));
-            assertEquals(remoteState.get(key).get(), 2 * 3 * 5 * 7);
-            assertEquals((long) cache.get(key), 2 * 3 * 5 * 7);
-        }
-        finally {
-            executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
-        }
-    }
-
-    @Test(dataProvider = "disabledCacheImplementations", dataProviderClass = TestEvictableCache.class)
-    public void testPutOnEmptyCacheImplementation(EvictableCacheBuilder.DisabledCacheImplementation disabledCacheImplementation)
-    {
-        LoadingCache<Object, Object> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(0)
-                .disabledCacheImplementation(disabledCacheImplementation)
-                .build(CacheLoader.from(key -> key));
-        Map<Object, Object> cacheMap = cache.asMap();
-
-        int key = 0;
-        int value = 1;
-        assertThat(cacheMap.put(key, value)).isNull();
-        assertThat(cacheMap.put(key, value)).isNull();
-        assertThat(cacheMap.putIfAbsent(key, value)).isNull();
-        assertThat(cacheMap.putIfAbsent(key, value)).isNull();
-    }
-
-    @Test
-    public void testPutOnNonEmptyCacheImplementation()
-    {
-        LoadingCache<Object, Object> cache = EvictableCacheBuilder.newBuilder()
-                .maximumSize(10)
-                .build(CacheLoader.from(key -> key));
-        Map<Object, Object> cacheMap = cache.asMap();
-
-        int key = 0;
-        int value = 1;
-        assertThatThrownBy(() -> cacheMap.put(key, value))
-                .isInstanceOf(UnsupportedOperationException.class)
-                .hasMessage("The operation is not supported, as in inherently races with cache invalidation. Use get(key, callable) instead.");
-        assertThatThrownBy(() -> cacheMap.putIfAbsent(key, value))
-                .isInstanceOf(UnsupportedOperationException.class)
-                .hasMessage("The operation is not supported, as in inherently races with cache invalidation");
-    }
-
-    /**
-     * A class implementing value-based equality taking into account some fields, but not all.
-     * This is definitely discouraged, but still may happen in practice.
-     */
-    private static class ClassWithPartialEquals
-    {
-        private final int value;
-        private final int additionalField; // not part of equals
-
-        public ClassWithPartialEquals(int value, int additionalField)
-        {
-            this.value = value;
-            this.additionalField = additionalField;
-        }
-
-        public int getValue()
-        {
-            return value;
-        }
-
-        public int getAdditionalField()
-        {
-            return additionalField;
-        }
-
-        @Override
-        public boolean equals(Object other)
-        {
-            return other != null &&
-                    this.getClass() == other.getClass() &&
-                    this.value == ((ClassWithPartialEquals) other).value;
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return value;
-        }
-    }
-}
diff --git a/lib/trino-filesystem-azure/pom.xml b/lib/trino-filesystem-azure/pom.xml
new file mode 100644
index 000000000000..a62d788616f4
--- /dev/null
+++ b/lib/trino-filesystem-azure/pom.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>io.trino</groupId>
+        <artifactId>trino-root</artifactId>
+        <version>432-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>trino-filesystem-azure</artifactId>
+    <description>Trino Filesystem - Azure</description>
+
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <air.compiler.fail-warnings>true</air.compiler.fail-warnings>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+                    <artifactId>jackson-dataformat-xml</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-core-http-okhttp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-identity</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.azure</groupId>
+                    <artifactId>azure-core-http-netty</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.nimbusds</groupId>
+                    <artifactId>oauth2-oidc-sdk</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.java.dev.jna</groupId>
+                    <artifactId>jna-platform</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-storage-blob</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.azure</groupId>
+                    <artifactId>azure-core-http-netty</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+                    <artifactId>jackson-dataformat-xml</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-storage-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.azure</groupId>
+                    <artifactId>azure-core-http-netty</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-storage-file-datalake</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.azure</groupId>
+                    <artifactId>azure-core-http-netty</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-memory-context</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino.hive</groupId>
+            <artifactId>hive-apache</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>it.unimi.dsi</groupId>
+            <artifactId>fastutil</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/TestAzureFileSystemBlob.java</exclude>
+                                <exclude>**/TestAzureFileSystemGen2Flat.java</exclude>
+                                <exclude>**/TestAzureFileSystemGen2Hierarchical.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>cloud-tests</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <includes>
+                                <include>**/TestAzureFileSystemBlob.java</include>
+                                <include>**/TestAzureFileSystemGen2Flat.java</include>
+                                <include>**/TestAzureFileSystemGen2Hierarchical.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuth.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuth.java
new file mode 100644
index 000000000000..96140b67e07d
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuth.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.storage.blob.BlobContainerClientBuilder;
+import com.azure.storage.file.datalake.DataLakeServiceClientBuilder;
+
+public interface AzureAuth
+{
+    void setAuth(String storageAccount, BlobContainerClientBuilder builder);
+
+    void setAuth(String storageAccount, DataLakeServiceClientBuilder builder);
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthAccessKey.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthAccessKey.java
new file mode 100644
index 000000000000..a76257eefa39
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthAccessKey.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.storage.blob.BlobContainerClientBuilder;
+import com.azure.storage.common.StorageSharedKeyCredential;
+import com.azure.storage.file.datalake.DataLakeServiceClientBuilder;
+import com.google.inject.Inject;
+
+import static java.util.Objects.requireNonNull;
+
+public class AzureAuthAccessKey
+        implements AzureAuth
+{
+    private final String accessKey;
+
+    @Inject
+    public AzureAuthAccessKey(AzureAuthAccessKeyConfig config)
+    {
+        this(config.getAccessKey());
+    }
+
+    public AzureAuthAccessKey(String accessKey)
+    {
+        this.accessKey = requireNonNull(accessKey, "accessKey is null");
+    }
+
+    @Override
+    public void setAuth(String storageAccount, BlobContainerClientBuilder builder)
+    {
+        builder.credential(new StorageSharedKeyCredential(storageAccount, accessKey));
+    }
+
+    @Override
+    public void setAuth(String storageAccount, DataLakeServiceClientBuilder builder)
+    {
+        builder.credential(new StorageSharedKeyCredential(storageAccount, accessKey));
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthAccessKeyConfig.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthAccessKeyConfig.java
new file mode 100644
index 000000000000..e848f4ff1164
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthAccessKeyConfig.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import io.airlift.configuration.Config;
+import io.airlift.configuration.ConfigSecuritySensitive;
+import jakarta.validation.constraints.NotEmpty;
+
+public class AzureAuthAccessKeyConfig
+{
+    private String accessKey;
+
+    @NotEmpty
+    public String getAccessKey()
+    {
+        return accessKey;
+    }
+
+    @ConfigSecuritySensitive
+    @Config("azure.access-key")
+    public AzureAuthAccessKeyConfig setAccessKey(String accessKey)
+    {
+        this.accessKey = accessKey;
+        return this;
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthAccessKeyModule.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthAccessKeyModule.java
new file mode 100644
index 000000000000..7e59b4672635
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthAccessKeyModule.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import com.google.inject.Scopes;
+
+import static io.airlift.configuration.ConfigBinder.configBinder;
+
+public class AzureAuthAccessKeyModule
+        implements Module
+{
+    @Override
+    public void configure(Binder binder)
+    {
+        configBinder(binder).bindConfig(AzureAuthAccessKeyConfig.class);
+        binder.bind(AzureAuth.class).to(AzureAuthAccessKey.class).in(Scopes.SINGLETON);
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthOAuthConfig.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthOAuthConfig.java
new file mode 100644
index 000000000000..31187efe1836
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthOAuthConfig.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import io.airlift.configuration.Config;
+import io.airlift.configuration.ConfigSecuritySensitive;
+import jakarta.validation.constraints.NotEmpty;
+
+public class AzureAuthOAuthConfig
+{
+    private String clientEndpoint;
+    private String clientId;
+    private String clientSecret;
+
+    @NotEmpty
+    public String getClientEndpoint()
+    {
+        return clientEndpoint;
+    }
+
+    @ConfigSecuritySensitive
+    @Config("azure.oauth.endpoint")
+    public AzureAuthOAuthConfig setClientEndpoint(String clientEndpoint)
+    {
+        this.clientEndpoint = clientEndpoint;
+        return this;
+    }
+
+    @NotEmpty
+    public String getClientId()
+    {
+        return clientId;
+    }
+
+    @ConfigSecuritySensitive
+    @Config("azure.oauth.client-id")
+    public AzureAuthOAuthConfig setClientId(String clientId)
+    {
+        this.clientId = clientId;
+        return this;
+    }
+
+    @NotEmpty
+    public String getClientSecret()
+    {
+        return clientSecret;
+    }
+
+    @ConfigSecuritySensitive
+    @Config("azure.oauth.secret")
+    public AzureAuthOAuthConfig setClientSecret(String clientSecret)
+    {
+        this.clientSecret = clientSecret;
+        return this;
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthOAuthModule.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthOAuthModule.java
new file mode 100644
index 000000000000..bb0bb48d8601
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthOAuthModule.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import com.google.inject.Scopes;
+
+import static io.airlift.configuration.ConfigBinder.configBinder;
+
+public class AzureAuthOAuthModule
+        implements Module
+{
+    @Override
+    public void configure(Binder binder)
+    {
+        configBinder(binder).bindConfig(AzureAuthOAuthConfig.class);
+        binder.bind(AzureAuth.class).to(AzureAuthOauth.class).in(Scopes.SINGLETON);
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthOauth.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthOauth.java
new file mode 100644
index 000000000000..c18d44995381
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureAuthOauth.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.identity.ClientSecretCredential;
+import com.azure.identity.ClientSecretCredentialBuilder;
+import com.azure.storage.blob.BlobContainerClientBuilder;
+import com.azure.storage.file.datalake.DataLakeServiceClientBuilder;
+import com.google.inject.Inject;
+
+public class AzureAuthOauth
+        implements AzureAuth
+{
+    private final ClientSecretCredential credential;
+
+    @Inject
+    public AzureAuthOauth(AzureAuthOAuthConfig config)
+    {
+        this(config.getClientEndpoint(), config.getClientId(), config.getClientSecret());
+    }
+
+    public AzureAuthOauth(String clientEndpoint, String clientId, String clientSecret)
+    {
+        credential = new ClientSecretCredentialBuilder()
+                .authorityHost(clientEndpoint)
+                .clientId(clientId)
+                .clientSecret(clientSecret)
+                .build();
+    }
+
+    @Override
+    public void setAuth(String storageAccount, BlobContainerClientBuilder builder)
+    {
+        builder.credential(credential);
+    }
+
+    @Override
+    public void setAuth(String storageAccount, DataLakeServiceClientBuilder builder)
+    {
+        builder.credential(credential);
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureBlobFileIterator.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureBlobFileIterator.java
new file mode 100644
index 000000000000..47b79a49dae9
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureBlobFileIterator.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.storage.blob.models.BlobItem;
+import io.trino.filesystem.FileEntry;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Optional;
+
+import static io.trino.filesystem.azure.AzureUtils.handleAzureException;
+import static java.util.Objects.requireNonNull;
+
+final class AzureBlobFileIterator
+        implements FileIterator
+{
+    private final AzureLocation location;
+    private final Iterator<BlobItem> iterator;
+    private final Location baseLocation;
+
+    AzureBlobFileIterator(AzureLocation location, Iterator<BlobItem> iterator)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.iterator = requireNonNull(iterator, "iterator is null");
+        this.baseLocation = location.baseLocation();
+    }
+
+    @Override
+    public boolean hasNext()
+            throws IOException
+    {
+        try {
+            return iterator.hasNext();
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "listing files", location);
+        }
+    }
+
+    @Override
+    public FileEntry next()
+            throws IOException
+    {
+        try {
+            BlobItem blobItem = iterator.next();
+            return new FileEntry(
+                    baseLocation.appendPath(blobItem.getName()),
+                    blobItem.getProperties().getContentLength(),
+                    blobItem.getProperties().getLastModified().toInstant(),
+                    Optional.empty());
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "listing files", location);
+        }
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureDataLakeFileIterator.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureDataLakeFileIterator.java
new file mode 100644
index 000000000000..50dc7a38c5a1
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureDataLakeFileIterator.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.storage.file.datalake.models.PathItem;
+import io.trino.filesystem.FileEntry;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Optional;
+
+import static io.trino.filesystem.azure.AzureUtils.handleAzureException;
+import static java.util.Objects.requireNonNull;
+
+final class AzureDataLakeFileIterator
+        implements FileIterator
+{
+    private final AzureLocation location;
+    private final Iterator<PathItem> iterator;
+    private final Location baseLocation;
+
+    AzureDataLakeFileIterator(AzureLocation location, Iterator<PathItem> iterator)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.iterator = requireNonNull(iterator, "iterator is null");
+        this.baseLocation = location.baseLocation();
+    }
+
+    @Override
+    public boolean hasNext()
+            throws IOException
+    {
+        try {
+            return iterator.hasNext();
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "listing files", location);
+        }
+    }
+
+    @Override
+    public FileEntry next()
+            throws IOException
+    {
+        try {
+            PathItem pathItem = iterator.next();
+            return new FileEntry(
+                    baseLocation.appendPath(pathItem.getName()),
+                    pathItem.getContentLength(),
+                    pathItem.getLastModified().toInstant(),
+                    Optional.empty());
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "listing files", location);
+        }
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystem.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystem.java
new file mode 100644
index 000000000000..45925f474b98
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystem.java
@@ -0,0 +1,461 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.storage.blob.BlobClient;
+import com.azure.storage.blob.BlobContainerClient;
+import com.azure.storage.blob.BlobContainerClientBuilder;
+import com.azure.storage.blob.models.AccountKind;
+import com.azure.storage.blob.models.BlobItem;
+import com.azure.storage.blob.models.ListBlobsOptions;
+import com.azure.storage.blob.models.StorageAccountInfo;
+import com.azure.storage.common.Utility;
+import com.azure.storage.file.datalake.DataLakeDirectoryClient;
+import com.azure.storage.file.datalake.DataLakeFileClient;
+import com.azure.storage.file.datalake.DataLakeFileSystemClient;
+import com.azure.storage.file.datalake.DataLakeServiceClient;
+import com.azure.storage.file.datalake.DataLakeServiceClientBuilder;
+import com.azure.storage.file.datalake.models.DataLakeRequestConditions;
+import com.azure.storage.file.datalake.models.DataLakeStorageException;
+import com.azure.storage.file.datalake.models.ListPathsOptions;
+import com.azure.storage.file.datalake.models.PathItem;
+import com.azure.storage.file.datalake.options.DataLakePathDeleteOptions;
+import com.google.common.collect.ImmutableSet;
+import io.airlift.units.DataSize;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoOutputFile;
+
+import java.io.IOException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.Set;
+
+import static com.azure.storage.common.implementation.Constants.HeaderConstants.ETAG_WILDCARD;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.filesystem.azure.AzureUtils.handleAzureException;
+import static java.lang.Math.toIntExact;
+import static java.util.Objects.requireNonNull;
+import static java.util.function.Predicate.not;
+
+public class AzureFileSystem
+        implements TrinoFileSystem
+{
+    private final HttpClient httpClient;
+    private final AzureAuth azureAuth;
+    private final int readBlockSizeBytes;
+    private final long writeBlockSizeBytes;
+    private final int maxWriteConcurrency;
+    private final long maxSingleUploadSizeBytes;
+
+    public AzureFileSystem(HttpClient httpClient, AzureAuth azureAuth, DataSize readBlockSize, DataSize writeBlockSize, int maxWriteConcurrency, DataSize maxSingleUploadSize)
+    {
+        this.httpClient = requireNonNull(httpClient, "httpClient is null");
+        this.azureAuth = requireNonNull(azureAuth, "azureAuth is null");
+        this.readBlockSizeBytes = toIntExact(readBlockSize.toBytes());
+        this.writeBlockSizeBytes = writeBlockSize.toBytes();
+        checkArgument(maxWriteConcurrency >= 0, "maxWriteConcurrency is negative");
+        this.maxWriteConcurrency = maxWriteConcurrency;
+        this.maxSingleUploadSizeBytes = maxSingleUploadSize.toBytes();
+    }
+
+    @Override
+    public TrinoInputFile newInputFile(Location location)
+    {
+        AzureLocation azureLocation = new AzureLocation(location);
+        BlobClient client = createBlobClient(azureLocation);
+        return new AzureInputFile(azureLocation, OptionalLong.empty(), client, readBlockSizeBytes);
+    }
+
+    @Override
+    public TrinoInputFile newInputFile(Location location, long length)
+    {
+        AzureLocation azureLocation = new AzureLocation(location);
+        BlobClient client = createBlobClient(azureLocation);
+        return new AzureInputFile(azureLocation, OptionalLong.of(length), client, readBlockSizeBytes);
+    }
+
+    @Override
+    public TrinoOutputFile newOutputFile(Location location)
+    {
+        AzureLocation azureLocation = new AzureLocation(location);
+        BlobClient client = createBlobClient(azureLocation);
+        return new AzureOutputFile(azureLocation, client, writeBlockSizeBytes, maxWriteConcurrency, maxSingleUploadSizeBytes);
+    }
+
+    @Override
+    public void deleteFile(Location location)
+            throws IOException
+    {
+        location.verifyValidFileLocation();
+        AzureLocation azureLocation = new AzureLocation(location);
+        BlobClient client = createBlobClient(azureLocation);
+        try {
+            client.delete();
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "deleting file", azureLocation);
+        }
+    }
+
+    @Override
+    public void deleteDirectory(Location location)
+            throws IOException
+    {
+        AzureLocation azureLocation = new AzureLocation(location);
+        try {
+            if (isHierarchicalNamespaceEnabled(azureLocation)) {
+                deleteGen2Directory(azureLocation);
+            }
+            else {
+                deleteBlobDirectory(azureLocation);
+            }
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "deleting directory", azureLocation);
+        }
+    }
+
+    private void deleteGen2Directory(AzureLocation location)
+            throws IOException
+    {
+        DataLakeFileSystemClient fileSystemClient = createFileSystemClient(location);
+        DataLakePathDeleteOptions deleteRecursiveOptions = new DataLakePathDeleteOptions().setIsRecursive(true);
+        if (location.path().isEmpty()) {
+            for (PathItem pathItem : fileSystemClient.listPaths()) {
+                if (pathItem.isDirectory()) {
+                    fileSystemClient.deleteDirectoryIfExistsWithResponse(pathItem.getName(), deleteRecursiveOptions, null, null);
+                }
+                else {
+                    fileSystemClient.deleteFileIfExists(pathItem.getName());
+                }
+            }
+        }
+        else {
+            DataLakeDirectoryClient directoryClient = fileSystemClient.getDirectoryClient(location.path());
+            if (directoryClient.exists()) {
+                if (!directoryClient.getProperties().isDirectory()) {
+                    throw new IOException("Location is not a directory: " + location);
+                }
+                directoryClient.deleteIfExistsWithResponse(deleteRecursiveOptions, null, null);
+            }
+        }
+    }
+
+    private void deleteBlobDirectory(AzureLocation location)
+    {
+        String path = location.path();
+        if (!path.isEmpty() && !path.endsWith("/")) {
+            path += "/";
+        }
+        BlobContainerClient blobContainerClient = createBlobContainerClient(location);
+        PagedIterable<BlobItem> blobItems = blobContainerClient.listBlobs(new ListBlobsOptions().setPrefix(path), null);
+        for (BlobItem item : blobItems) {
+            String blobUrl = Utility.urlEncode(item.getName());
+            blobContainerClient.getBlobClient(blobUrl).deleteIfExists();
+        }
+    }
+
+    @Override
+    public void renameFile(Location source, Location target)
+            throws IOException
+    {
+        source.verifyValidFileLocation();
+        target.verifyValidFileLocation();
+
+        AzureLocation sourceLocation = new AzureLocation(source);
+        AzureLocation targetLocation = new AzureLocation(target);
+        if (!sourceLocation.account().equals(targetLocation.account())) {
+            throw new IOException("Cannot rename across storage accounts");
+        }
+        if (!Objects.equals(sourceLocation.container(), targetLocation.container())) {
+            throw new IOException("Cannot rename across storage account containers");
+        }
+
+        // DFS rename file works with all storage types
+        renameGen2File(sourceLocation, targetLocation);
+    }
+
+    private void renameGen2File(AzureLocation source, AzureLocation target)
+            throws IOException
+    {
+        try {
+            DataLakeFileSystemClient fileSystemClient = createFileSystemClient(source);
+            DataLakeFileClient dataLakeFileClient = fileSystemClient.getFileClient(source.path());
+            if (dataLakeFileClient.getProperties().isDirectory()) {
+                throw new IOException("Rename file from %s to %s, source is a directory".formatted(source, target));
+            }
+
+            fileSystemClient.createDirectoryIfNotExists(target.location().parentDirectory().path());
+            dataLakeFileClient.renameWithResponse(
+                    null,
+                    target.path(),
+                    null,
+                    new DataLakeRequestConditions().setIfNoneMatch(ETAG_WILDCARD),
+                    null,
+                    null);
+        }
+        catch (RuntimeException e) {
+            throw new IOException("Rename file from %s to %s failed".formatted(source, target), e);
+        }
+    }
+
+    @Override
+    public FileIterator listFiles(Location location)
+            throws IOException
+    {
+        AzureLocation azureLocation = new AzureLocation(location);
+        try {
+            // blob API returns directories as blobs, so it cannot be used when Gen2 is enabled
+            return (isHierarchicalNamespaceEnabled(azureLocation))
+                    ? listGen2Files(azureLocation)
+                    : listBlobFiles(azureLocation);
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "listing files", azureLocation);
+        }
+    }
+
+    private FileIterator listGen2Files(AzureLocation location)
+            throws IOException
+    {
+        DataLakeFileSystemClient fileSystemClient = createFileSystemClient(location);
+        PagedIterable<PathItem> pathItems;
+        if (location.path().isEmpty()) {
+            pathItems = fileSystemClient.listPaths(new ListPathsOptions().setRecursive(true), null);
+        }
+        else {
+            DataLakeDirectoryClient directoryClient = fileSystemClient.getDirectoryClient(location.path());
+            if (!directoryClient.exists()) {
+                return FileIterator.empty();
+            }
+            if (!directoryClient.getProperties().isDirectory()) {
+                throw new IOException("Location is not a directory: " + location);
+            }
+            pathItems = directoryClient.listPaths(true, false, null, null);
+        }
+        return new AzureDataLakeFileIterator(
+                location,
+                pathItems.stream()
+                        .filter(not(PathItem::isDirectory))
+                        .iterator());
+    }
+
+    private FileIterator listBlobFiles(AzureLocation location)
+    {
+        String path = location.path();
+        if (!path.isEmpty() && !path.endsWith("/")) {
+            path += "/";
+        }
+        PagedIterable<BlobItem> blobItems = createBlobContainerClient(location).listBlobs(new ListBlobsOptions().setPrefix(path), null);
+        return new AzureBlobFileIterator(location, blobItems.iterator());
+    }
+
+    @Override
+    public Optional<Boolean> directoryExists(Location location)
+            throws IOException
+    {
+        AzureLocation azureLocation = new AzureLocation(location);
+        if (location.path().isEmpty()) {
+            return Optional.of(true);
+        }
+        if (!isHierarchicalNamespaceEnabled(azureLocation)) {
+            if (listFiles(location).hasNext()) {
+                return Optional.of(true);
+            }
+            return Optional.empty();
+        }
+
+        try {
+            DataLakeFileSystemClient fileSystemClient = createFileSystemClient(azureLocation);
+            DataLakeFileClient fileClient = fileSystemClient.getFileClient(azureLocation.path());
+            return Optional.of(fileClient.getProperties().isDirectory());
+        }
+        catch (DataLakeStorageException e) {
+            if (e.getStatusCode() == 404) {
+                return Optional.of(false);
+            }
+            throw handleAzureException(e, "checking directory existence", azureLocation);
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "checking directory existence", azureLocation);
+        }
+    }
+
+    @Override
+    public void createDirectory(Location location)
+            throws IOException
+    {
+        AzureLocation azureLocation = new AzureLocation(location);
+        if (!isHierarchicalNamespaceEnabled(azureLocation)) {
+            return;
+        }
+        try {
+            DataLakeFileSystemClient fileSystemClient = createFileSystemClient(azureLocation);
+            DataLakeDirectoryClient directoryClient = fileSystemClient.createDirectoryIfNotExists(azureLocation.path());
+            if (!directoryClient.getProperties().isDirectory()) {
+                throw new IOException("Location is not a directory: " + azureLocation);
+            }
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "creating directory", azureLocation);
+        }
+    }
+
+    @Override
+    public void renameDirectory(Location source, Location target)
+            throws IOException
+    {
+        AzureLocation sourceLocation = new AzureLocation(source);
+        AzureLocation targetLocation = new AzureLocation(target);
+        if (!sourceLocation.account().equals(targetLocation.account())) {
+            throw new IOException("Cannot rename across storage accounts");
+        }
+        if (!Objects.equals(sourceLocation.container(), targetLocation.container())) {
+            throw new IOException("Cannot rename across storage account containers");
+        }
+        if (!isHierarchicalNamespaceEnabled(sourceLocation)) {
+            throw new IOException("Azure non-hierarchical does not support directory renames");
+        }
+        if (sourceLocation.path().isEmpty() || targetLocation.path().isEmpty()) {
+            throw new IOException("Cannot rename %s to %s".formatted(source, target));
+        }
+
+        try {
+            DataLakeFileSystemClient fileSystemClient = createFileSystemClient(sourceLocation);
+            DataLakeDirectoryClient directoryClient = fileSystemClient.getDirectoryClient(sourceLocation.path());
+            if (!directoryClient.exists()) {
+                throw new IOException("Source directory does not exist: " + source);
+            }
+            if (!directoryClient.getProperties().isDirectory()) {
+                throw new IOException("Source is not a directory: " + source);
+            }
+            directoryClient.rename(null, targetLocation.path());
+        }
+        catch (RuntimeException e) {
+            throw new IOException("Rename directory from %s to %s failed".formatted(source, target), e);
+        }
+    }
+
+    @Override
+    public Set<Location> listDirectories(Location location)
+            throws IOException
+    {
+        AzureLocation azureLocation = new AzureLocation(location);
+        try {
+            // blob API returns directories as blobs, so it cannot be used when Gen2 is enabled
+            return (isHierarchicalNamespaceEnabled(azureLocation))
+                    ? listGen2Directories(azureLocation)
+                    : listBlobDirectories(azureLocation);
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "listing files", azureLocation);
+        }
+    }
+
+    private Set<Location> listGen2Directories(AzureLocation location)
+            throws IOException
+    {
+        DataLakeFileSystemClient fileSystemClient = createFileSystemClient(location);
+        PagedIterable<PathItem> pathItems;
+        if (location.path().isEmpty()) {
+            pathItems = fileSystemClient.listPaths();
+        }
+        else {
+            DataLakeDirectoryClient directoryClient = fileSystemClient.getDirectoryClient(location.path());
+            if (!directoryClient.exists()) {
+                return ImmutableSet.of();
+            }
+            if (!directoryClient.getProperties().isDirectory()) {
+                throw new IOException("Location is not a directory: " + location);
+            }
+            pathItems = directoryClient.listPaths(false, false, null, null);
+        }
+        Location baseLocation = location.baseLocation();
+        return pathItems.stream()
+                .filter(PathItem::isDirectory)
+                .map(item -> baseLocation.appendPath(item.getName() + "/"))
+                .collect(toImmutableSet());
+    }
+
+    private Set<Location> listBlobDirectories(AzureLocation location)
+    {
+        String path = location.path();
+        if (!path.isEmpty() && !path.endsWith("/")) {
+            path += "/";
+        }
+        Location baseLocation = location.baseLocation();
+        return createBlobContainerClient(location)
+                .listBlobsByHierarchy(path).stream()
+                .filter(BlobItem::isPrefix)
+                .map(item -> baseLocation.appendPath(item.getName()))
+                .collect(toImmutableSet());
+    }
+
+    private boolean isHierarchicalNamespaceEnabled(AzureLocation location)
+            throws IOException
+    {
+        StorageAccountInfo accountInfo = createBlobContainerClient(location).getServiceClient().getAccountInfo();
+
+        AccountKind accountKind = accountInfo.getAccountKind();
+        if (accountKind == AccountKind.BLOB_STORAGE) {
+            return false;
+        }
+        if (accountKind != AccountKind.STORAGE_V2) {
+            throw new IOException("Unsupported account kind '%s': %s".formatted(accountKind, location));
+        }
+        return accountInfo.isHierarchicalNamespaceEnabled();
+    }
+
+    private BlobClient createBlobClient(AzureLocation location)
+    {
+        // encode the path using the Azure url encoder utility
+        String path = Utility.urlEncode(location.path());
+        return createBlobContainerClient(location).getBlobClient(path);
+    }
+
+    private BlobContainerClient createBlobContainerClient(AzureLocation location)
+    {
+        requireNonNull(location, "location is null");
+
+        BlobContainerClientBuilder builder = new BlobContainerClientBuilder()
+                .httpClient(httpClient)
+                .endpoint(String.format("https://%s.blob.core.windows.net", location.account()));
+        azureAuth.setAuth(location.account(), builder);
+        location.container().ifPresent(builder::containerName);
+        return builder.buildClient();
+    }
+
+    private DataLakeFileSystemClient createFileSystemClient(AzureLocation location)
+    {
+        requireNonNull(location, "location is null");
+
+        DataLakeServiceClientBuilder builder = new DataLakeServiceClientBuilder()
+                .httpClient(httpClient)
+                .endpoint(String.format("https://%s.dfs.core.windows.net", location.account()));
+        azureAuth.setAuth(location.account(), builder);
+        DataLakeServiceClient client = builder.buildClient();
+        DataLakeFileSystemClient fileSystemClient = client.getFileSystemClient(location.container().orElseThrow());
+        if (!fileSystemClient.exists()) {
+            throw new IllegalArgumentException();
+        }
+        return fileSystemClient;
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemConfig.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemConfig.java
new file mode 100644
index 000000000000..a753f52bba33
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemConfig.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import io.airlift.configuration.Config;
+import io.airlift.units.DataSize;
+import io.airlift.units.DataSize.Unit;
+import jakarta.validation.constraints.NotNull;
+
+public class AzureFileSystemConfig
+{
+    public enum AuthType
+    {
+        ACCESS_KEY,
+        OAUTH,
+        NONE
+    }
+
+    private AuthType authType = AuthType.NONE;
+
+    private DataSize readBlockSize = DataSize.of(4, Unit.MEGABYTE);
+    private DataSize writeBlockSize = DataSize.of(4, Unit.MEGABYTE);
+    private int maxWriteConcurrency = 8;
+    private DataSize maxSingleUploadSize = DataSize.of(4, Unit.MEGABYTE);
+
+    @NotNull
+    public AuthType getAuthType()
+    {
+        return authType;
+    }
+
+    @Config("azure.auth-type")
+    public AzureFileSystemConfig setAuthType(AuthType authType)
+    {
+        this.authType = authType;
+        return this;
+    }
+
+    @NotNull
+    public DataSize getReadBlockSize()
+    {
+        return readBlockSize;
+    }
+
+    @Config("azure.read-block-size")
+    public AzureFileSystemConfig setReadBlockSize(DataSize readBlockSize)
+    {
+        this.readBlockSize = readBlockSize;
+        return this;
+    }
+
+    @NotNull
+    public DataSize getWriteBlockSize()
+    {
+        return writeBlockSize;
+    }
+
+    @Config("azure.write-block-size")
+    public AzureFileSystemConfig setWriteBlockSize(DataSize writeBlockSize)
+    {
+        this.writeBlockSize = writeBlockSize;
+        return this;
+    }
+
+    @NotNull
+    public int getMaxWriteConcurrency()
+    {
+        return maxWriteConcurrency;
+    }
+
+    @Config("azure.max-write-concurrency")
+    public AzureFileSystemConfig setMaxWriteConcurrency(int maxWriteConcurrency)
+    {
+        this.maxWriteConcurrency = maxWriteConcurrency;
+        return this;
+    }
+
+    @NotNull
+    public DataSize getMaxSingleUploadSize()
+    {
+        return maxSingleUploadSize;
+    }
+
+    @Config("azure.max-single-upload-size")
+    public AzureFileSystemConfig setMaxSingleUploadSize(DataSize maxSingleUploadSize)
+    {
+        this.maxSingleUploadSize = maxSingleUploadSize;
+        return this;
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemFactory.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemFactory.java
new file mode 100644
index 000000000000..ea6345760993
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemFactory.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.okhttp.OkHttpAsyncClientProvider;
+import com.azure.core.util.HttpClientOptions;
+import com.google.inject.Inject;
+import io.airlift.units.DataSize;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.spi.security.ConnectorIdentity;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+public class AzureFileSystemFactory
+        implements TrinoFileSystemFactory
+{
+    private final AzureAuth auth;
+    private final DataSize readBlockSize;
+    private final DataSize writeBlockSize;
+    private final int maxWriteConcurrency;
+    private final DataSize maxSingleUploadSize;
+    private final HttpClient httpClient;
+
+    @Inject
+    public AzureFileSystemFactory(AzureAuth azureAuth, AzureFileSystemConfig config)
+    {
+        this(
+                azureAuth,
+                config.getReadBlockSize(),
+                config.getWriteBlockSize(),
+                config.getMaxWriteConcurrency(),
+                config.getMaxSingleUploadSize());
+    }
+
+    public AzureFileSystemFactory(AzureAuth azureAuth, DataSize readBlockSize, DataSize writeBlockSize, int maxWriteConcurrency, DataSize maxSingleUploadSize)
+    {
+        this.auth = requireNonNull(azureAuth, "azureAuth is null");
+        this.readBlockSize = requireNonNull(readBlockSize, "readBlockSize is null");
+        this.writeBlockSize = requireNonNull(writeBlockSize, "writeBlockSize is null");
+        checkArgument(maxWriteConcurrency >= 0, "maxWriteConcurrency is negative");
+        this.maxWriteConcurrency = maxWriteConcurrency;
+        this.maxSingleUploadSize = requireNonNull(maxSingleUploadSize, "maxSingleUploadSize is null");
+        this.httpClient = HttpClient.createDefault(new HttpClientOptions().setHttpClientProvider(OkHttpAsyncClientProvider.class));
+    }
+
+    @Override
+    public TrinoFileSystem create(ConnectorIdentity identity)
+    {
+        return new AzureFileSystem(httpClient, auth, readBlockSize, writeBlockSize, maxWriteConcurrency, maxSingleUploadSize);
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemModule.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemModule.java
new file mode 100644
index 000000000000..339ac9bd1c0b
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemModule.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import io.airlift.configuration.AbstractConfigurationAwareModule;
+
+import static com.google.inject.util.Modules.EMPTY_MODULE;
+
+public class AzureFileSystemModule
+        extends AbstractConfigurationAwareModule
+{
+    @Override
+    protected void setup(Binder binder)
+    {
+        Module module = switch (buildConfigObject(AzureFileSystemConfig.class).getAuthType()) {
+            case ACCESS_KEY -> new AzureAuthAccessKeyModule();
+            case OAUTH -> new AzureAuthOAuthModule();
+            case NONE -> EMPTY_MODULE;
+        };
+        install(module);
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureInput.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureInput.java
new file mode 100644
index 000000000000..6c927e50668f
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureInput.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.storage.blob.BlobClient;
+import com.azure.storage.blob.models.BlobRange;
+import com.azure.storage.blob.options.BlobInputStreamOptions;
+import com.azure.storage.blob.specialized.BlobInputStream;
+import io.trino.filesystem.TrinoInput;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.OptionalLong;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.filesystem.azure.AzureUtils.handleAzureException;
+import static java.util.Objects.checkFromIndexSize;
+import static java.util.Objects.requireNonNull;
+
+class AzureInput
+        implements TrinoInput
+{
+    private final AzureLocation location;
+    private final BlobClient blobClient;
+    private final int readBlockSize;
+    private OptionalLong length;
+    private boolean closed;
+
+    public AzureInput(AzureLocation location, BlobClient blobClient, int readBlockSize, OptionalLong length)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.blobClient = requireNonNull(blobClient, "blobClient is null");
+        checkArgument(readBlockSize >= 0, "readBlockSize is negative");
+        this.readBlockSize = readBlockSize;
+        this.length = requireNonNull(length, "length is null");
+    }
+
+    @Override
+    public void readFully(long position, byte[] buffer, int bufferOffset, int bufferLength)
+            throws IOException
+    {
+        ensureOpen();
+        if (position < 0) {
+            throw new IOException("Negative seek offset");
+        }
+        checkFromIndexSize(bufferOffset, bufferLength, buffer.length);
+        if (bufferLength == 0) {
+            return;
+        }
+
+        BlobInputStreamOptions options = new BlobInputStreamOptions()
+                .setRange(new BlobRange(position, (long) bufferLength))
+                .setBlockSize(readBlockSize);
+        try (BlobInputStream blobInputStream = blobClient.openInputStream(options)) {
+            long fileSize = blobInputStream.getProperties().getBlobSize();
+            if (position >= fileSize) {
+                throw new IOException("Cannot read at %s. File size is %s: %s".formatted(position, fileSize, location));
+            }
+
+            int readSize = blobInputStream.readNBytes(buffer, bufferOffset, bufferLength);
+            if (readSize != bufferLength) {
+                throw new EOFException("End of file reached before reading fully: " + location);
+            }
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "reading file", location);
+        }
+    }
+
+    @Override
+    public int readTail(byte[] buffer, int bufferOffset, int bufferLength)
+            throws IOException
+    {
+        ensureOpen();
+        checkFromIndexSize(bufferOffset, bufferLength, buffer.length);
+
+        try {
+            if (length.isEmpty()) {
+                length = OptionalLong.of(blobClient.getProperties().getBlobSize());
+            }
+            BlobInputStreamOptions options = new BlobInputStreamOptions()
+                    .setRange(new BlobRange(length.orElseThrow() - bufferLength))
+                    .setBlockSize(readBlockSize);
+            try (BlobInputStream blobInputStream = blobClient.openInputStream(options)) {
+                return blobInputStream.readNBytes(buffer, bufferOffset, bufferLength);
+            }
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "reading file", location);
+        }
+    }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Output stream closed: " + location);
+        }
+    }
+
+    @Override
+    public void close()
+    {
+        closed = true;
+    }
+
+    @Override
+    public String toString()
+    {
+        return location.toString();
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureInputFile.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureInputFile.java
new file mode 100644
index 000000000000..e2f093d433a8
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureInputFile.java
@@ -0,0 +1,120 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.storage.blob.BlobClient;
+import com.azure.storage.blob.models.BlobProperties;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInput;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoInputStream;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.util.Optional;
+import java.util.OptionalLong;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.filesystem.azure.AzureUtils.handleAzureException;
+import static java.util.Objects.requireNonNull;
+
+class AzureInputFile
+        implements TrinoInputFile
+{
+    private final AzureLocation location;
+    private final BlobClient blobClient;
+    private final int readBlockSizeBytes;
+
+    private OptionalLong length;
+    private Optional<Instant> lastModified = Optional.empty();
+
+    public AzureInputFile(AzureLocation location, OptionalLong length, BlobClient blobClient, int readBlockSizeBytes)
+    {
+        this.location = requireNonNull(location, "location is null");
+        location.location().verifyValidFileLocation();
+        this.length = requireNonNull(length, "length is null");
+        this.blobClient = requireNonNull(blobClient, "blobClient is null");
+        checkArgument(readBlockSizeBytes >= 0, "readBlockSizeBytes is negative");
+        this.readBlockSizeBytes = readBlockSizeBytes;
+    }
+
+    @Override
+    public Location location()
+    {
+        return location.location();
+    }
+
+    @Override
+    public boolean exists()
+    {
+        return blobClient.exists();
+    }
+
+    @Override
+    public TrinoInputStream newStream()
+            throws IOException
+    {
+        return new AzureInputStream(location, blobClient, readBlockSizeBytes);
+    }
+
+    @Override
+    public TrinoInput newInput()
+            throws IOException
+    {
+        try {
+            return new AzureInput(location, blobClient, readBlockSizeBytes, length);
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "opening file", location);
+        }
+    }
+
+    @Override
+    public Instant lastModified()
+            throws IOException
+    {
+        if (lastModified.isEmpty()) {
+            loadProperties();
+        }
+        return lastModified.orElseThrow();
+    }
+
+    @Override
+    public long length()
+            throws IOException
+    {
+        if (length.isEmpty()) {
+            loadProperties();
+        }
+        return length.orElseThrow();
+    }
+
+    private void loadProperties()
+            throws IOException
+    {
+        BlobProperties properties;
+        try {
+            properties = blobClient.getProperties();
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "fetching properties for file", location);
+        }
+        if (length.isEmpty()) {
+            length = OptionalLong.of(properties.getBlobSize());
+        }
+        if (lastModified.isEmpty()) {
+            lastModified = Optional.of(properties.getLastModified().toInstant());
+        }
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureInputStream.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureInputStream.java
new file mode 100644
index 000000000000..9de687b3155a
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureInputStream.java
@@ -0,0 +1,211 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.storage.blob.BlobClient;
+import com.azure.storage.blob.models.BlobRange;
+import com.azure.storage.blob.options.BlobInputStreamOptions;
+import com.azure.storage.blob.specialized.BlobInputStream;
+import io.trino.filesystem.TrinoInputStream;
+
+import java.io.EOFException;
+import java.io.IOException;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.primitives.Longs.constrainToRange;
+import static io.trino.filesystem.azure.AzureUtils.handleAzureException;
+import static java.util.Objects.checkFromIndexSize;
+import static java.util.Objects.requireNonNull;
+
+class AzureInputStream
+        extends TrinoInputStream
+{
+    private final AzureLocation location;
+    private final BlobClient blobClient;
+    private final int readBlockSizeBytes;
+    private final long fileSize;
+
+    private BlobInputStream stream;
+    private long currentPosition;
+    private long nextPosition;
+    private boolean closed;
+
+    public AzureInputStream(AzureLocation location, BlobClient blobClient, int readBlockSizeBytes)
+            throws IOException
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.blobClient = requireNonNull(blobClient, "blobClient is null");
+        checkArgument(readBlockSizeBytes >= 0, "readBlockSizeBytes is negative");
+        this.readBlockSizeBytes = readBlockSizeBytes;
+        openStream(0);
+        fileSize = stream.getProperties().getBlobSize();
+    }
+
+    @Override
+    public int available()
+            throws IOException
+    {
+        ensureOpen();
+        repositionStream();
+        return stream.available();
+    }
+
+    @Override
+    public long getPosition()
+    {
+        return nextPosition;
+    }
+
+    @Override
+    public void seek(long newPosition)
+            throws IOException
+    {
+        ensureOpen();
+        if (newPosition < 0) {
+            throw new IOException("Negative seek offset");
+        }
+        if (newPosition > fileSize) {
+            throw new IOException("Cannot seek to %s. File size is %s: %s".formatted(newPosition, fileSize, location));
+        }
+        nextPosition = newPosition;
+    }
+
+    @Override
+    public int read()
+            throws IOException
+    {
+        ensureOpen();
+        repositionStream();
+
+        try {
+            int value = stream.read();
+            if (value >= 0) {
+                currentPosition++;
+                nextPosition++;
+            }
+            return value;
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "reading file", location);
+        }
+    }
+
+    @Override
+    public int read(byte[] buffer, int offset, int length)
+            throws IOException
+    {
+        checkFromIndexSize(offset, length, buffer.length);
+
+        ensureOpen();
+        repositionStream();
+
+        try {
+            int readSize = stream.read(buffer, offset, length);
+            if (readSize > 0) {
+                currentPosition += readSize;
+                nextPosition += readSize;
+            }
+            return readSize;
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "reading file", location);
+        }
+    }
+
+    @Override
+    public long skip(long n)
+            throws IOException
+    {
+        ensureOpen();
+
+        long skipSize = constrainToRange(n, 0, fileSize - nextPosition);
+        nextPosition += skipSize;
+        return skipSize;
+    }
+
+    @Override
+    public void skipNBytes(long n)
+            throws IOException
+    {
+        ensureOpen();
+        if (n <= 0) {
+            return;
+        }
+
+        long position = nextPosition + n;
+        if ((position < 0) || (position > fileSize)) {
+            throw new EOFException("Unable to skip %s bytes (position=%s, fileSize=%s): %s".formatted(n, nextPosition, fileSize, location));
+        }
+        nextPosition = position;
+    }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Output stream closed: " + location);
+        }
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        if (!closed) {
+            closed = true;
+            try {
+                stream.close();
+            }
+            catch (RuntimeException e) {
+                throw handleAzureException(e, "closing file", location);
+            }
+        }
+    }
+
+    private void openStream(long offset)
+            throws IOException
+    {
+        try {
+            BlobInputStreamOptions options = new BlobInputStreamOptions()
+                    .setRange(new BlobRange(offset))
+                    .setBlockSize(readBlockSizeBytes);
+            stream = blobClient.openInputStream(options);
+            currentPosition = offset;
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "reading file", location);
+        }
+    }
+
+    private void repositionStream()
+            throws IOException
+    {
+        if (nextPosition == currentPosition) {
+            return;
+        }
+
+        if (nextPosition > currentPosition) {
+            long bytesToSkip = nextPosition - currentPosition;
+            // this always works because the client simply moves a counter forward and
+            // preforms the reposition on the next actual read
+            stream.skipNBytes(bytesToSkip);
+        }
+        else {
+            stream.close();
+            openStream(nextPosition);
+        }
+
+        currentPosition = nextPosition;
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureLocation.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureLocation.java
new file mode 100644
index 000000000000..c2fc47b5cfc8
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureLocation.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.google.common.base.CharMatcher;
+import io.trino.filesystem.Location;
+
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+class AzureLocation
+{
+    private static final String INVALID_LOCATION_MESSAGE = "Invalid Azure location. Expected form is 'abfs://[<containerName>@]<accountName>.dfs.core.windows.net/<filePath>': %s";
+
+    // https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/resource-name-rules
+    private static final CharMatcher CONTAINER_VALID_CHARACTERS = CharMatcher.inRange('a', 'z').or(CharMatcher.inRange('0', '9')).or(CharMatcher.is('-'));
+    private static final CharMatcher STORAGE_ACCOUNT_VALID_CHARACTERS = CharMatcher.inRange('a', 'z').or(CharMatcher.inRange('0', '9'));
+
+    private final Location location;
+    private final String account;
+
+    public AzureLocation(Location location)
+    {
+        this.location = requireNonNull(location, "location is null");
+        // abfss is also supported but not documented
+        String scheme = location.scheme().orElseThrow(() -> new IllegalArgumentException(String.format(INVALID_LOCATION_MESSAGE, location)));
+        checkArgument("abfs".equals(scheme) || "abfss".equals(scheme), INVALID_LOCATION_MESSAGE, location);
+
+        // container is interpolated into the URL path, so perform extra checks
+        location.userInfo().ifPresent(container -> {
+            checkArgument(!container.isEmpty(), INVALID_LOCATION_MESSAGE, location);
+            checkArgument(
+                    CONTAINER_VALID_CHARACTERS.matchesAllOf(container),
+                    "Invalid Azure storage container name. Valid characters are 'a-z', '0-9', and '-': %s",
+                    location);
+            checkArgument(
+                    !container.startsWith("-") && !container.endsWith("-"),
+                    "Invalid Azure storage container name. Cannot start or end with a hyphen: %s",
+                    location);
+            checkArgument(
+                    !container.contains("--"),
+                    "Invalid Azure storage container name. Cannot contain consecutive hyphens: %s",
+                    location);
+        });
+
+        // storage account is the first label of the host
+        checkArgument(location.host().isPresent(), INVALID_LOCATION_MESSAGE, location);
+        String host = location.host().get();
+        int accountSplit = host.indexOf('.');
+        checkArgument(
+                accountSplit > 0,
+                INVALID_LOCATION_MESSAGE,
+                this.location);
+        this.account = host.substring(0, accountSplit);
+
+        // host must end with ".dfs.core.windows.net"
+        checkArgument(host.substring(accountSplit).equals(".dfs.core.windows.net"), INVALID_LOCATION_MESSAGE, location);
+
+        // storage account is interpolated into URL host name, so perform extra checks
+        checkArgument(STORAGE_ACCOUNT_VALID_CHARACTERS.matchesAllOf(account),
+                "Invalid Azure storage account name. Valid characters are 'a-z' and '0-9': %s",
+                location);
+    }
+
+    /**
+     * Creates a new {@link AzureLocation} based on the storage account, container and blob path parsed from the location.
+     * <p>
+     * Locations follow the conventions used by
+     * <a href="https://docs.microsoft.com/en-us/azure/storage/blobs/data-lake-storage-introduction-abfs-uri">ABFS URI</a>
+     * that follows the following convention
+     * <pre>{@code abfs://<container-name>@<storage-account-name>.dfs.core.windows.net/<blob_path>}</pre>
+     */
+    public static AzureLocation from(String location)
+    {
+        return new AzureLocation(Location.of(location));
+    }
+
+    public Location location()
+    {
+        return location;
+    }
+
+    public Optional<String> container()
+    {
+        return location.userInfo();
+    }
+
+    public String account()
+    {
+        return account;
+    }
+
+    public String path()
+    {
+        return location.path();
+    }
+
+    @Override
+    public String toString()
+    {
+        return location.toString();
+    }
+
+    public Location baseLocation()
+    {
+        return Location.of("abfs://%s%s.dfs.core.windows.net/".formatted(
+                container().map(container -> container + "@").orElse(""),
+                account()));
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureOutputFile.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureOutputFile.java
new file mode 100644
index 000000000000..17840e85388a
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureOutputFile.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.storage.blob.BlobClient;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoOutputFile;
+import io.trino.memory.context.AggregatedMemoryContext;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.FileAlreadyExistsException;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+class AzureOutputFile
+        implements TrinoOutputFile
+{
+    private final AzureLocation location;
+    private final BlobClient blobClient;
+    private final long writeBlockSizeBytes;
+    private final int maxWriteConcurrency;
+    private final long maxSingleUploadSizeBytes;
+
+    public AzureOutputFile(AzureLocation location, BlobClient blobClient, long writeBlockSizeBytes, int maxWriteConcurrency, long maxSingleUploadSizeBytes)
+    {
+        this.location = requireNonNull(location, "location is null");
+        location.location().verifyValidFileLocation();
+        this.blobClient = requireNonNull(blobClient, "blobClient is null");
+        checkArgument(writeBlockSizeBytes >= 0, "writeBlockSizeBytes is negative");
+        this.writeBlockSizeBytes = writeBlockSizeBytes;
+        checkArgument(maxWriteConcurrency >= 0, "maxWriteConcurrency is negative");
+        this.maxWriteConcurrency = maxWriteConcurrency;
+        checkArgument(maxSingleUploadSizeBytes >= 0, "maxSingleUploadSizeBytes is negative");
+        this.maxSingleUploadSizeBytes = maxSingleUploadSizeBytes;
+    }
+
+    public boolean exists()
+    {
+        return blobClient.exists();
+    }
+
+    @Override
+    public OutputStream create(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        // Azure can enforce that the file is not overwritten, but it only enforces this during data upload.
+        // Check here and then set the stream to check again when data is uploaded just to be sure.
+        if (exists()) {
+            throw new FileAlreadyExistsException(location.toString());
+        }
+        return createOutputStream(memoryContext, false);
+    }
+
+    @Override
+    public OutputStream createOrOverwrite(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        return createOutputStream(memoryContext, true);
+    }
+
+    @Override
+    public OutputStream createExclusive(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        return create(memoryContext);
+    }
+
+    private AzureOutputStream createOutputStream(AggregatedMemoryContext memoryContext, boolean overwrite)
+            throws IOException
+    {
+        return new AzureOutputStream(location, blobClient, overwrite, memoryContext, writeBlockSizeBytes, maxWriteConcurrency, maxSingleUploadSizeBytes);
+    }
+
+    @Override
+    public Location location()
+    {
+        return location.location();
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureOutputStream.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureOutputStream.java
new file mode 100644
index 000000000000..62dd9c8bb82a
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureOutputStream.java
@@ -0,0 +1,166 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.storage.blob.BlobClient;
+import com.azure.storage.blob.models.BlobRequestConditions;
+import com.azure.storage.blob.models.ParallelTransferOptions;
+import com.azure.storage.blob.options.BlockBlobOutputStreamOptions;
+import com.azure.storage.common.implementation.Constants.HeaderConstants;
+import io.trino.memory.context.AggregatedMemoryContext;
+import io.trino.memory.context.LocalMemoryContext;
+
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.filesystem.azure.AzureUtils.handleAzureException;
+import static java.lang.Math.min;
+import static java.util.Objects.checkFromIndexSize;
+import static java.util.Objects.requireNonNull;
+
+class AzureOutputStream
+        extends OutputStream
+{
+    private static final int BUFFER_SIZE = 8192;
+
+    private final AzureLocation location;
+    private final long writeBlockSizeBytes;
+    private final OutputStream stream;
+    private final LocalMemoryContext memoryContext;
+    private long writtenBytes;
+    private boolean closed;
+
+    public AzureOutputStream(
+            AzureLocation location,
+            BlobClient blobClient,
+            boolean overwrite,
+            AggregatedMemoryContext memoryContext,
+            long writeBlockSizeBytes,
+            int maxWriteConcurrency,
+            long maxSingleUploadSizeBytes)
+            throws IOException
+    {
+        requireNonNull(location, "location is null");
+        requireNonNull(blobClient, "blobClient is null");
+        checkArgument(writeBlockSizeBytes >= 0, "writeBlockSizeBytes is negative");
+        checkArgument(maxWriteConcurrency >= 0, "maxWriteConcurrency is negative");
+        checkArgument(maxSingleUploadSizeBytes >= 0, "maxSingleUploadSizeBytes is negative");
+
+        this.location = location;
+        this.writeBlockSizeBytes = writeBlockSizeBytes;
+        BlockBlobOutputStreamOptions streamOptions = new BlockBlobOutputStreamOptions();
+        streamOptions.setParallelTransferOptions(new ParallelTransferOptions()
+                .setBlockSizeLong(writeBlockSizeBytes)
+                .setMaxConcurrency(maxWriteConcurrency)
+                .setMaxSingleUploadSizeLong(maxSingleUploadSizeBytes));
+        if (!overwrite) {
+            // This is not enforced until data is written
+            streamOptions.setRequestConditions(new BlobRequestConditions().setIfNoneMatch(HeaderConstants.ETAG_WILDCARD));
+        }
+
+        try {
+            // TODO It is not clear if the buffered stream helps or hurts... the underlying implementation seems to copy every write to a byte buffer so small writes will suffer
+            stream = new BufferedOutputStream(blobClient.getBlockBlobClient().getBlobOutputStream(streamOptions), BUFFER_SIZE);
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "creating file", location);
+        }
+
+        // TODO to track memory we will need to fork com.azure.storage.blob.specialized.BlobOutputStream.BlockBlobOutputStream
+        this.memoryContext = memoryContext.newLocalMemoryContext(AzureOutputStream.class.getSimpleName());
+        this.memoryContext.setBytes(BUFFER_SIZE);
+    }
+
+    @Override
+    public void write(int b)
+            throws IOException
+    {
+        ensureOpen();
+        try {
+            stream.write(b);
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "writing file", location);
+        }
+        recordBytesWritten(1);
+    }
+
+    @Override
+    public void write(byte[] buffer, int offset, int length)
+            throws IOException
+    {
+        checkFromIndexSize(offset, length, buffer.length);
+
+        ensureOpen();
+        try {
+            stream.write(buffer, offset, length);
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "writing file", location);
+        }
+        recordBytesWritten(length);
+    }
+
+    @Override
+    public void flush()
+            throws IOException
+    {
+        ensureOpen();
+        try {
+            stream.flush();
+        }
+        catch (RuntimeException e) {
+            throw handleAzureException(e, "writing file", location);
+        }
+    }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Output stream closed: " + location);
+        }
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        if (!closed) {
+            closed = true;
+            try {
+                stream.close();
+            }
+            catch (IOException e) {
+                // Azure close sometimes rethrows IOExceptions from worker threads, so the
+                // stack traces are disconnected from this call. Wrapping here solves that problem.
+                throw new IOException("Error closing file: " + location, e);
+            }
+            finally {
+                memoryContext.close();
+            }
+        }
+    }
+
+    private void recordBytesWritten(int size)
+    {
+        if (writtenBytes < writeBlockSizeBytes) {
+            // assume that there is only one pending block buffer, and that it grows as written bytes grow
+            memoryContext.setBytes(BUFFER_SIZE + min(writtenBytes + size, writeBlockSizeBytes));
+        }
+        writtenBytes += size;
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureUtils.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureUtils.java
new file mode 100644
index 000000000000..ef0c01c299f5
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureUtils.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.core.exception.AzureException;
+import com.azure.storage.blob.models.BlobErrorCode;
+import com.azure.storage.blob.models.BlobStorageException;
+import com.azure.storage.file.datalake.models.DataLakeStorageException;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+final class AzureUtils
+{
+    private AzureUtils() {}
+
+    public static IOException handleAzureException(RuntimeException exception, String action, AzureLocation location)
+            throws IOException
+    {
+        if (exception instanceof BlobStorageException blobStorageException) {
+            if (BlobErrorCode.BLOB_NOT_FOUND.equals(blobStorageException.getErrorCode())) {
+                throw withCause(new FileNotFoundException(location.toString()), exception);
+            }
+        }
+        if (exception instanceof DataLakeStorageException dataLakeStorageException) {
+            if ("PathNotFound".equals(dataLakeStorageException.getErrorCode())) {
+                throw withCause(new FileNotFoundException(location.toString()), exception);
+            }
+        }
+        if (exception instanceof AzureException) {
+            throw new IOException("Azure service error %s file: %s".formatted(action, location), exception);
+        }
+        throw new IOException("Error %s file: %s".formatted(action, location), exception);
+    }
+
+    private static <T extends Throwable> T withCause(T throwable, Throwable cause)
+    {
+        throwable.initCause(cause);
+        return throwable;
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/AbstractTestAzureFileSystem.java b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/AbstractTestAzureFileSystem.java
new file mode 100644
index 000000000000..d7dd40ef416f
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/AbstractTestAzureFileSystem.java
@@ -0,0 +1,181 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.azure.storage.blob.BlobContainerClient;
+import com.azure.storage.blob.BlobServiceClient;
+import com.azure.storage.blob.BlobServiceClientBuilder;
+import com.azure.storage.blob.models.StorageAccountInfo;
+import com.azure.storage.common.StorageSharedKeyCredential;
+import com.azure.storage.file.datalake.DataLakeFileSystemClient;
+import com.azure.storage.file.datalake.DataLakeFileSystemClientBuilder;
+import com.azure.storage.file.datalake.models.PathItem;
+import com.azure.storage.file.datalake.options.DataLakePathDeleteOptions;
+import io.trino.filesystem.AbstractTestTrinoFileSystem;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.spi.security.ConnectorIdentity;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+import java.io.IOException;
+
+import static com.azure.storage.common.Utility.urlEncode;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Locale.ROOT;
+import static java.util.Objects.requireNonNull;
+import static java.util.UUID.randomUUID;
+import static org.assertj.core.api.Assertions.assertThat;
+
+@TestInstance(Lifecycle.PER_CLASS)
+public abstract class AbstractTestAzureFileSystem
+        extends AbstractTestTrinoFileSystem
+{
+    protected static String getRequiredEnvironmentVariable(String name)
+    {
+        return requireNonNull(System.getenv(name), "Environment variable not set: " + name);
+    }
+
+    enum AccountKind
+    {
+        HIERARCHICAL, FLAT, BLOB
+    }
+
+    private String account;
+    private StorageSharedKeyCredential credential;
+    private AccountKind accountKind;
+    private String containerName;
+    private Location rootLocation;
+    private BlobContainerClient blobContainerClient;
+    private TrinoFileSystem fileSystem;
+
+    protected void initialize(String account, String accountKey, AccountKind expectedAccountKind)
+            throws IOException
+    {
+        this.account = account;
+        credential = new StorageSharedKeyCredential(account, accountKey);
+
+        String blobEndpoint = "https://%s.blob.core.windows.net".formatted(account);
+        BlobServiceClient blobServiceClient = new BlobServiceClientBuilder()
+                .endpoint(blobEndpoint)
+                .credential(credential)
+                .buildClient();
+        accountKind = getAccountKind(blobServiceClient);
+        checkState(accountKind == expectedAccountKind, "Expected %s account, but found %s".formatted(expectedAccountKind, accountKind));
+
+        containerName = "test-%s-%s".formatted(accountKind.name().toLowerCase(ROOT), randomUUID());
+        rootLocation = Location.of("abfs://%s@%s.dfs.core.windows.net/".formatted(containerName, account));
+
+        blobContainerClient = blobServiceClient.getBlobContainerClient(containerName);
+        // this will fail if the container already exists, which is what we want
+        blobContainerClient.create();
+
+        fileSystem = new AzureFileSystemFactory(new AzureAuthAccessKey(accountKey), new AzureFileSystemConfig()).create(ConnectorIdentity.ofUser("test"));
+
+        cleanupFiles();
+    }
+
+    private static AccountKind getAccountKind(BlobServiceClient blobServiceClient)
+            throws IOException
+    {
+        StorageAccountInfo accountInfo = blobServiceClient.getAccountInfo();
+        if (accountInfo.getAccountKind() == com.azure.storage.blob.models.AccountKind.STORAGE_V2) {
+            if (accountInfo.isHierarchicalNamespaceEnabled()) {
+                return AccountKind.HIERARCHICAL;
+            }
+            return AccountKind.FLAT;
+        }
+        if (accountInfo.getAccountKind() == com.azure.storage.blob.models.AccountKind.BLOB_STORAGE) {
+            return AccountKind.BLOB;
+        }
+        throw new IOException("Unsupported account kind '%s'".formatted(accountInfo.getAccountKind()));
+    }
+
+    @AfterAll
+    void tearDown()
+    {
+        credential = null;
+        fileSystem = null;
+        if (blobContainerClient != null) {
+            blobContainerClient.deleteIfExists();
+            blobContainerClient = null;
+        }
+    }
+
+    @AfterEach
+    void afterEach()
+    {
+        cleanupFiles();
+    }
+
+    private void cleanupFiles()
+    {
+        if (accountKind == AccountKind.HIERARCHICAL) {
+            DataLakeFileSystemClient fileSystemClient = new DataLakeFileSystemClientBuilder()
+                    .endpoint("https://%s.dfs.core.windows.net".formatted(account))
+                    .fileSystemName(containerName)
+                    .credential(credential)
+                    .buildClient();
+
+            DataLakePathDeleteOptions deleteRecursiveOptions = new DataLakePathDeleteOptions().setIsRecursive(true);
+            for (PathItem pathItem : fileSystemClient.listPaths()) {
+                if (pathItem.isDirectory()) {
+                    fileSystemClient.deleteDirectoryIfExistsWithResponse(pathItem.getName(), deleteRecursiveOptions, null, null);
+                }
+                else {
+                    fileSystemClient.deleteFileIfExists(pathItem.getName());
+                }
+            }
+        }
+        else {
+            blobContainerClient.listBlobs().forEach(item -> blobContainerClient.getBlobClient(urlEncode(item.getName())).deleteIfExists());
+        }
+    }
+
+    @Override
+    protected final boolean isHierarchical()
+    {
+        return accountKind == AccountKind.HIERARCHICAL;
+    }
+
+    @Override
+    protected final TrinoFileSystem getFileSystem()
+    {
+        return fileSystem;
+    }
+
+    @Override
+    protected final Location getRootLocation()
+    {
+        return rootLocation;
+    }
+
+    @Override
+    protected final void verifyFileSystemIsEmpty()
+    {
+        assertThat(blobContainerClient.listBlobs()).isEmpty();
+    }
+
+    @Test
+    @Override
+    public void testPaths()
+            throws IOException
+    {
+        // Azure file paths are always hierarchical
+        testPathHierarchical();
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureAuthAccessKeyConfig.java b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureAuthAccessKeyConfig.java
new file mode 100644
index 000000000000..07a766fa3346
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureAuthAccessKeyConfig.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+
+class TestAzureAuthAccessKeyConfig
+{
+    @Test
+    void testDefaults()
+    {
+        assertRecordedDefaults(recordDefaults(AzureAuthAccessKeyConfig.class)
+                .setAccessKey(null));
+    }
+
+    @Test
+    public void testExplicitPropertyMappings()
+    {
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("azure.access-key", "secret")
+                .buildOrThrow();
+
+        AzureAuthAccessKeyConfig expected = new AzureAuthAccessKeyConfig()
+                .setAccessKey("secret");
+
+        assertFullMapping(properties, expected);
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureAuthOAuthConfig.java b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureAuthOAuthConfig.java
new file mode 100644
index 000000000000..6ebff1ede185
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureAuthOAuthConfig.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+
+class TestAzureAuthOAuthConfig
+{
+    @Test
+    void testDefaults()
+    {
+        assertRecordedDefaults(recordDefaults(AzureAuthOAuthConfig.class)
+                .setClientEndpoint(null)
+                .setClientId(null)
+                .setClientSecret(null));
+    }
+
+    @Test
+    public void testExplicitPropertyMappings()
+    {
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("azure.oauth.endpoint", "endpoint")
+                .put("azure.oauth.client-id", "clientId")
+                .put("azure.oauth.secret", "secret")
+                .buildOrThrow();
+
+        AzureAuthOAuthConfig expected = new AzureAuthOAuthConfig()
+                .setClientEndpoint("endpoint")
+                .setClientId("clientId")
+                .setClientSecret("secret");
+
+        assertFullMapping(properties, expected);
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureFileSystemBlob.java b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureFileSystemBlob.java
new file mode 100644
index 000000000000..09a67cf82a76
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureFileSystemBlob.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+import java.io.IOException;
+
+import static io.trino.filesystem.azure.AbstractTestAzureFileSystem.AccountKind.BLOB;
+
+@TestInstance(Lifecycle.PER_CLASS)
+class TestAzureFileSystemBlob
+        extends AbstractTestAzureFileSystem
+{
+    @BeforeAll
+    void setup()
+            throws IOException
+    {
+        initialize(getRequiredEnvironmentVariable("ABFS_BLOB_ACCOUNT"), getRequiredEnvironmentVariable("ABFS_BLOB_ACCESS_KEY"), BLOB);
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureFileSystemConfig.java b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureFileSystemConfig.java
new file mode 100644
index 000000000000..80c360240795
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureFileSystemConfig.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import com.google.common.collect.ImmutableMap;
+import io.airlift.units.DataSize;
+import io.airlift.units.DataSize.Unit;
+import io.trino.filesystem.azure.AzureFileSystemConfig.AuthType;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+
+class TestAzureFileSystemConfig
+{
+    @Test
+    void testDefaults()
+    {
+        assertRecordedDefaults(recordDefaults(AzureFileSystemConfig.class)
+                .setAuthType(AuthType.NONE)
+                .setReadBlockSize(DataSize.of(4, Unit.MEGABYTE))
+                .setWriteBlockSize(DataSize.of(4, Unit.MEGABYTE))
+                .setMaxWriteConcurrency(8)
+                .setMaxSingleUploadSize(DataSize.of(4, Unit.MEGABYTE)));
+    }
+
+    @Test
+    public void testExplicitPropertyMappings()
+    {
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("azure.auth-type", "oauth")
+                .put("azure.read-block-size", "3MB")
+                .put("azure.write-block-size", "5MB")
+                .put("azure.max-write-concurrency", "7")
+                .put("azure.max-single-upload-size", "7MB")
+                .buildOrThrow();
+
+        AzureFileSystemConfig expected = new AzureFileSystemConfig()
+                .setAuthType(AuthType.OAUTH)
+                .setReadBlockSize(DataSize.of(3, Unit.MEGABYTE))
+                .setWriteBlockSize(DataSize.of(5, Unit.MEGABYTE))
+                .setMaxWriteConcurrency(7)
+                .setMaxSingleUploadSize(DataSize.of(7, Unit.MEGABYTE));
+
+        assertFullMapping(properties, expected);
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureFileSystemGen2Flat.java b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureFileSystemGen2Flat.java
new file mode 100644
index 000000000000..78069cc742b4
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureFileSystemGen2Flat.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+import java.io.IOException;
+
+import static io.trino.filesystem.azure.AbstractTestAzureFileSystem.AccountKind.FLAT;
+
+@TestInstance(Lifecycle.PER_CLASS)
+class TestAzureFileSystemGen2Flat
+        extends AbstractTestAzureFileSystem
+{
+    @BeforeAll
+    void setup()
+            throws IOException
+    {
+        initialize(getRequiredEnvironmentVariable("ABFS_FLAT_ACCOUNT"), getRequiredEnvironmentVariable("ABFS_FLAT_ACCESS_KEY"), FLAT);
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureFileSystemGen2Hierarchical.java b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureFileSystemGen2Hierarchical.java
new file mode 100644
index 000000000000..eaf5abb778b3
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureFileSystemGen2Hierarchical.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+import java.io.IOException;
+
+import static io.trino.filesystem.azure.AbstractTestAzureFileSystem.AccountKind.HIERARCHICAL;
+
+@TestInstance(Lifecycle.PER_CLASS)
+class TestAzureFileSystemGen2Hierarchical
+        extends AbstractTestAzureFileSystem
+{
+    @BeforeAll
+    void setup()
+            throws IOException
+    {
+        initialize(getRequiredEnvironmentVariable("ABFS_ACCOUNT"), getRequiredEnvironmentVariable("ABFS_ACCESS_KEY"), HIERARCHICAL);
+    }
+}
diff --git a/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureLocation.java b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureLocation.java
new file mode 100644
index 000000000000..bbf38b2e457e
--- /dev/null
+++ b/lib/trino-filesystem-azure/src/test/java/io/trino/filesystem/azure/TestAzureLocation.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed 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 io.trino.filesystem.azure;
+
+import io.trino.filesystem.Location;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class TestAzureLocation
+{
+    @Test
+    void test()
+    {
+        assertValid("abfs://container@account.dfs.core.windows.net/some/path/file", "account", "container", "some/path/file");
+        assertValid("abfss://container@account.dfs.core.windows.net/some/path/file", "account", "container", "some/path/file");
+
+        assertValid("abfs://container-stuff@account.dfs.core.windows.net/some/path/file", "account", "container-stuff", "some/path/file");
+        assertValid("abfs://container2@account.dfs.core.windows.net/some/path/file", "account", "container2", "some/path/file");
+        assertValid("abfs://account.dfs.core.windows.net/some/path/file", "account", null, "some/path/file");
+
+        assertValid("abfs://container@account.dfs.core.windows.net/file", "account", "container", "file");
+        assertValid("abfs://container@account0.dfs.core.windows.net///f///i///l///e///", "account0", "container", "//f///i///l///e///");
+
+        // only abfs and abfss schemes allowed
+        assertInvalid("https://container@account.dfs.core.windows.net/some/path/file");
+        // host must have at least to labels
+        assertInvalid("abfs://container@account/some/path/file");
+        assertInvalid("abfs://container@/some/path/file");
+
+        // schema and authority are required
+        assertInvalid("abfs:///some/path/file");
+        assertInvalid("/some/path/file");
+
+        // container is only a-z, 0-9, and dash, and cannot start or end with dash or contain consecutive dashes
+        assertInvalid("abfs://ConTainer@account.dfs.core.windows.net/some/path/file");
+        assertInvalid("abfs://con_tainer@account.dfs.core.windows.net/some/path/file");
+        assertInvalid("abfs://con$tainer@account.dfs.core.windows.net/some/path/file");
+        assertInvalid("abfs://-container@account.dfs.core.windows.net/some/path/file");
+        assertInvalid("abfs://container-@account.dfs.core.windows.net/some/path/file");
+        assertInvalid("abfs://con---tainer@account.dfs.core.windows.net/some/path/file");
+        assertInvalid("abfs://con--tainer@account.dfs.core.windows.net/some/path/file");
+        // account is only a-z and 0-9
+        assertInvalid("abfs://container@ac-count.dfs.core.windows.net/some/path/file");
+        assertInvalid("abfs://container@ac_count.dfs.core.windows.net/some/path/file");
+        assertInvalid("abfs://container@ac$count.dfs.core.windows.net/some/path/file");
+        // host must end with .dfs.core.windows.net
+        assertInvalid("abfs://container@account.example.com/some/path/file");
+        // host must be just account.dfs.core.windows.net
+        assertInvalid("abfs://container@account.fake.dfs.core.windows.net/some/path/file");
+    }
+
+    private static void assertValid(String uri, String expectedAccount, String expectedContainer, String expectedPath)
+    {
+        Location location = Location.of(uri);
+        AzureLocation azureLocation = new AzureLocation(location);
+        assertThat(azureLocation.location()).isEqualTo(location);
+        assertThat(azureLocation.account()).isEqualTo(expectedAccount);
+        assertThat(azureLocation.container()).isEqualTo(Optional.ofNullable(expectedContainer));
+        assertThat(azureLocation.path()).contains(expectedPath);
+    }
+
+    private static void assertInvalid(String uri)
+    {
+        Location location = Location.of(uri);
+        assertThatThrownBy(() -> new AzureLocation(location))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(uri);
+    }
+}
diff --git a/lib/trino-filesystem-manager/pom.xml b/lib/trino-filesystem-manager/pom.xml
new file mode 100644
index 000000000000..7fea178e1cce
--- /dev/null
+++ b/lib/trino-filesystem-manager/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>io.trino</groupId>
+        <artifactId>trino-root</artifactId>
+        <version>432-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>trino-filesystem-manager</artifactId>
+
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <air.compiler.fail-warnings>true</air.compiler.fail-warnings>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem-azure</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem-s3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hdfs</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemConfig.java b/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemConfig.java
new file mode 100644
index 000000000000..72e5bdfcee0f
--- /dev/null
+++ b/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemConfig.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed 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 io.trino.filesystem.manager;
+
+import io.airlift.configuration.Config;
+
+public class FileSystemConfig
+{
+    private boolean hadoopEnabled = true;
+    private boolean nativeAzureEnabled;
+    private boolean nativeS3Enabled;
+
+    public boolean isHadoopEnabled()
+    {
+        return hadoopEnabled;
+    }
+
+    @Config("fs.hadoop.enabled")
+    public FileSystemConfig setHadoopEnabled(boolean hadoopEnabled)
+    {
+        this.hadoopEnabled = hadoopEnabled;
+        return this;
+    }
+
+    public boolean isNativeAzureEnabled()
+    {
+        return nativeAzureEnabled;
+    }
+
+    @Config("fs.native-azure.enabled")
+    public FileSystemConfig setNativeAzureEnabled(boolean nativeAzureEnabled)
+    {
+        this.nativeAzureEnabled = nativeAzureEnabled;
+        return this;
+    }
+
+    public boolean isNativeS3Enabled()
+    {
+        return nativeS3Enabled;
+    }
+
+    @Config("fs.native-s3.enabled")
+    public FileSystemConfig setNativeS3Enabled(boolean nativeS3Enabled)
+    {
+        this.nativeS3Enabled = nativeS3Enabled;
+        return this;
+    }
+}
diff --git a/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemModule.java b/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemModule.java
new file mode 100644
index 000000000000..362f98f796b6
--- /dev/null
+++ b/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemModule.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed 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 io.trino.filesystem.manager;
+
+import com.google.inject.Binder;
+import com.google.inject.Inject;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.azure.AzureFileSystemFactory;
+import io.trino.filesystem.azure.AzureFileSystemModule;
+import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.filesystem.hdfs.HdfsFileSystemModule;
+import io.trino.filesystem.s3.S3FileSystemFactory;
+import io.trino.filesystem.s3.S3FileSystemModule;
+import io.trino.filesystem.tracing.TracingFileSystemFactory;
+import io.trino.hdfs.azure.HiveAzureModule;
+import io.trino.hdfs.s3.HiveS3Module;
+
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.inject.Scopes.SINGLETON;
+import static com.google.inject.multibindings.MapBinder.newMapBinder;
+
+public class FileSystemModule
+        extends AbstractConfigurationAwareModule
+{
+    @Override
+    protected void setup(Binder binder)
+    {
+        FileSystemConfig config = buildConfigObject(FileSystemConfig.class);
+
+        binder.bind(HdfsFileSystemFactoryHolder.class).in(SINGLETON);
+
+        if (config.isHadoopEnabled()) {
+            install(new HdfsFileSystemModule());
+        }
+
+        var factories = newMapBinder(binder, String.class, TrinoFileSystemFactory.class);
+
+        if (config.isNativeAzureEnabled()) {
+            install(new AzureFileSystemModule());
+            factories.addBinding("abfs").to(AzureFileSystemFactory.class);
+            factories.addBinding("abfss").to(AzureFileSystemFactory.class);
+        }
+        else {
+            install(new HiveAzureModule());
+        }
+
+        if (config.isNativeS3Enabled()) {
+            install(new S3FileSystemModule());
+            factories.addBinding("s3").to(S3FileSystemFactory.class);
+            factories.addBinding("s3a").to(S3FileSystemFactory.class);
+            factories.addBinding("s3n").to(S3FileSystemFactory.class);
+        }
+        else {
+            install(new HiveS3Module());
+        }
+    }
+
+    @Provides
+    @Singleton
+    public TrinoFileSystemFactory createFileSystemFactory(
+            HdfsFileSystemFactoryHolder hdfsFileSystemFactory,
+            Map<String, TrinoFileSystemFactory> factories,
+            Tracer tracer)
+    {
+        TrinoFileSystemFactory delegate = new SwitchingFileSystemFactory(hdfsFileSystemFactory.value(), factories);
+        return new TracingFileSystemFactory(tracer, delegate);
+    }
+
+    public static class HdfsFileSystemFactoryHolder
+    {
+        @Inject(optional = true)
+        private HdfsFileSystemFactory hdfsFileSystemFactory;
+
+        public Optional<TrinoFileSystemFactory> value()
+        {
+            return Optional.ofNullable(hdfsFileSystemFactory);
+        }
+    }
+}
diff --git a/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/SwitchingFileSystem.java b/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/SwitchingFileSystem.java
new file mode 100644
index 000000000000..041a89a720c6
--- /dev/null
+++ b/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/SwitchingFileSystem.java
@@ -0,0 +1,159 @@
+/*
+ * Licensed 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 io.trino.filesystem.manager;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoOutputFile;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.security.ConnectorIdentity;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.groupingBy;
+
+final class SwitchingFileSystem
+        implements TrinoFileSystem
+{
+    private final Optional<ConnectorSession> session;
+    private final Optional<ConnectorIdentity> identity;
+    private final Optional<TrinoFileSystemFactory> hdfsFactory;
+    private final Map<String, TrinoFileSystemFactory> factories;
+
+    public SwitchingFileSystem(
+            Optional<ConnectorSession> session,
+            Optional<ConnectorIdentity> identity,
+            Optional<TrinoFileSystemFactory> hdfsFactory,
+            Map<String, TrinoFileSystemFactory> factories)
+    {
+        checkArgument(session.isPresent() != identity.isPresent(), "exactly one of session and identity must be present");
+        this.session = session;
+        this.identity = identity;
+        this.hdfsFactory = requireNonNull(hdfsFactory, "hdfsFactory is null");
+        this.factories = ImmutableMap.copyOf(requireNonNull(factories, "factories is null"));
+    }
+
+    @Override
+    public TrinoInputFile newInputFile(Location location)
+    {
+        return fileSystem(location).newInputFile(location);
+    }
+
+    @Override
+    public TrinoInputFile newInputFile(Location location, long length)
+    {
+        return fileSystem(location).newInputFile(location, length);
+    }
+
+    @Override
+    public TrinoOutputFile newOutputFile(Location location)
+    {
+        return fileSystem(location).newOutputFile(location);
+    }
+
+    @Override
+    public void deleteFile(Location location)
+            throws IOException
+    {
+        fileSystem(location).deleteFile(location);
+    }
+
+    @Override
+    public void deleteFiles(Collection<Location> locations)
+            throws IOException
+    {
+        var groups = locations.stream().collect(groupingBy(this::determineFactory));
+        for (var entry : groups.entrySet()) {
+            createFileSystem(entry.getKey()).deleteFiles(entry.getValue());
+        }
+    }
+
+    @Override
+    public void deleteDirectory(Location location)
+            throws IOException
+    {
+        fileSystem(location).deleteDirectory(location);
+    }
+
+    @Override
+    public void renameFile(Location source, Location target)
+            throws IOException
+    {
+        fileSystem(source).renameFile(source, target);
+    }
+
+    @Override
+    public FileIterator listFiles(Location location)
+            throws IOException
+    {
+        return fileSystem(location).listFiles(location);
+    }
+
+    @Override
+    public Optional<Boolean> directoryExists(Location location)
+            throws IOException
+    {
+        return fileSystem(location).directoryExists(location);
+    }
+
+    @Override
+    public void createDirectory(Location location)
+            throws IOException
+    {
+        fileSystem(location).createDirectory(location);
+    }
+
+    @Override
+    public void renameDirectory(Location source, Location target)
+            throws IOException
+    {
+        fileSystem(source).renameDirectory(source, target);
+    }
+
+    @Override
+    public Set<Location> listDirectories(Location location)
+            throws IOException
+    {
+        return fileSystem(location).listDirectories(location);
+    }
+
+    private TrinoFileSystem fileSystem(Location location)
+    {
+        return createFileSystem(determineFactory(location));
+    }
+
+    private TrinoFileSystemFactory determineFactory(Location location)
+    {
+        return location.scheme()
+                .map(factories::get)
+                .or(() -> hdfsFactory)
+                .orElseThrow(() -> new IllegalArgumentException("No factory for location: " + location));
+    }
+
+    private TrinoFileSystem createFileSystem(TrinoFileSystemFactory factory)
+    {
+        return session.map(factory::create).orElseGet(() ->
+                factory.create(identity.orElseThrow()));
+    }
+}
diff --git a/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/SwitchingFileSystemFactory.java b/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/SwitchingFileSystemFactory.java
new file mode 100644
index 000000000000..973c0a5baf35
--- /dev/null
+++ b/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/SwitchingFileSystemFactory.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed 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 io.trino.filesystem.manager;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.security.ConnectorIdentity;
+
+import java.util.Map;
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public class SwitchingFileSystemFactory
+        implements TrinoFileSystemFactory
+{
+    private final Optional<TrinoFileSystemFactory> hdfsFactory;
+    private final Map<String, TrinoFileSystemFactory> factories;
+
+    public SwitchingFileSystemFactory(Optional<TrinoFileSystemFactory> hdfsFactory, Map<String, TrinoFileSystemFactory> factories)
+    {
+        this.hdfsFactory = requireNonNull(hdfsFactory, "hdfsFactory is null");
+        this.factories = ImmutableMap.copyOf(requireNonNull(factories, "factories is null"));
+    }
+
+    @Override
+    public TrinoFileSystem create(ConnectorSession session)
+    {
+        return new SwitchingFileSystem(Optional.of(session), Optional.empty(), hdfsFactory, factories);
+    }
+
+    @Override
+    public TrinoFileSystem create(ConnectorIdentity identity)
+    {
+        return new SwitchingFileSystem(Optional.empty(), Optional.of(identity), hdfsFactory, factories);
+    }
+}
diff --git a/lib/trino-filesystem-manager/src/test/java/io/trino/filesystem/manager/TestFileSystemConfig.java b/lib/trino-filesystem-manager/src/test/java/io/trino/filesystem/manager/TestFileSystemConfig.java
new file mode 100644
index 000000000000..a9b9bad5dad0
--- /dev/null
+++ b/lib/trino-filesystem-manager/src/test/java/io/trino/filesystem/manager/TestFileSystemConfig.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed 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 io.trino.filesystem.manager;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+
+public class TestFileSystemConfig
+{
+    @Test
+    public void testDefaults()
+    {
+        assertRecordedDefaults(recordDefaults(FileSystemConfig.class)
+                .setHadoopEnabled(true)
+                .setNativeAzureEnabled(false)
+                .setNativeS3Enabled(false));
+    }
+
+    @Test
+    public void testExplicitPropertyMappings()
+    {
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("fs.hadoop.enabled", "false")
+                .put("fs.native-azure.enabled", "true")
+                .put("fs.native-s3.enabled", "true")
+                .buildOrThrow();
+
+        FileSystemConfig expected = new FileSystemConfig()
+                .setHadoopEnabled(false)
+                .setNativeAzureEnabled(true)
+                .setNativeS3Enabled(true);
+
+        assertFullMapping(properties, expected);
+    }
+}
diff --git a/lib/trino-filesystem-s3/pom.xml b/lib/trino-filesystem-s3/pom.xml
new file mode 100644
index 000000000000..3f131e3bba69
--- /dev/null
+++ b/lib/trino-filesystem-s3/pom.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>io.trino</groupId>
+        <artifactId>trino-root</artifactId>
+        <version>432-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>trino-filesystem-s3</artifactId>
+
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <air.compiler.fail-warnings>true</air.compiler.fail-warnings>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-memory-context</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>auth</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>http-client-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>regions</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>sdk-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>sts</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>utils</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.adobe.testing</groupId>
+            <artifactId>s3mock-testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-containers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>localstack</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/TestS3FileSystemAwsS3.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>cloud-tests</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <includes>
+                                <include>**/TestS3FileSystemAwsS3.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3Context.java b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3Context.java
new file mode 100644
index 000000000000..026acde55240
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3Context.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import io.trino.filesystem.s3.S3FileSystemConfig.S3SseType;
+import software.amazon.awssdk.services.s3.model.RequestPayer;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+record S3Context(int partSize, boolean requesterPays, S3SseType sseType, String sseKmsKeyId)
+{
+    private static final int MIN_PART_SIZE = 5 * 1024 * 1024; // S3 requirement
+
+    public S3Context
+    {
+        checkArgument(partSize >= MIN_PART_SIZE, "partSize must be at least %s bytes", MIN_PART_SIZE);
+        requireNonNull(sseType, "sseType is null");
+        checkArgument((sseType != S3SseType.KMS) || (sseKmsKeyId != null), "sseKmsKeyId is null for SSE-KMS");
+    }
+
+    public RequestPayer requestPayer()
+    {
+        return requesterPays ? RequestPayer.REQUESTER : null;
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileIterator.java b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileIterator.java
new file mode 100644
index 000000000000..e37ca49d6a7a
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileIterator.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import io.trino.filesystem.FileEntry;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.services.s3.model.S3Object;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Optional;
+
+import static com.google.common.base.Verify.verify;
+import static java.util.Objects.requireNonNull;
+
+final class S3FileIterator
+        implements FileIterator
+{
+    private final S3Location location;
+    private final Iterator<S3Object> iterator;
+    private final Location baseLocation;
+
+    public S3FileIterator(S3Location location, Iterator<S3Object> iterator)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.iterator = requireNonNull(iterator, "iterator is null");
+        this.baseLocation = location.baseLocation();
+    }
+
+    @Override
+    public boolean hasNext()
+            throws IOException
+    {
+        try {
+            return iterator.hasNext();
+        }
+        catch (SdkException e) {
+            throw new IOException("Failed to list location: " + location, e);
+        }
+    }
+
+    @Override
+    public FileEntry next()
+            throws IOException
+    {
+        try {
+            S3Object object = iterator.next();
+
+            verify(object.key().startsWith(location.key()), "S3 listed key [%s] does not start with prefix [%s]", object.key(), location.key());
+
+            return new FileEntry(
+                    baseLocation.appendPath(object.key()),
+                    object.size(),
+                    object.lastModified(),
+                    Optional.empty());
+        }
+        catch (SdkException e) {
+            throw new IOException("Failed to list location: " + location, e);
+        }
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileSystem.java b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileSystem.java
new file mode 100644
index 000000000000..30d3b4f3e133
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileSystem.java
@@ -0,0 +1,252 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.SetMultimap;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoOutputFile;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.CommonPrefix;
+import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
+import software.amazon.awssdk.services.s3.model.DeleteObjectsRequest;
+import software.amazon.awssdk.services.s3.model.DeleteObjectsResponse;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
+import software.amazon.awssdk.services.s3.model.ObjectIdentifier;
+import software.amazon.awssdk.services.s3.model.RequestPayer;
+import software.amazon.awssdk.services.s3.model.S3Error;
+import software.amazon.awssdk.services.s3.paginators.ListObjectsV2Iterable;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.collect.Iterables.partition;
+import static com.google.common.collect.Multimaps.toMultimap;
+import static java.util.Objects.requireNonNull;
+
+final class S3FileSystem
+        implements TrinoFileSystem
+{
+    private final S3Client client;
+    private final S3Context context;
+    private final RequestPayer requestPayer;
+
+    public S3FileSystem(S3Client client, S3Context context)
+    {
+        this.client = requireNonNull(client, "client is null");
+        this.context = requireNonNull(context, "context is null");
+        this.requestPayer = context.requestPayer();
+    }
+
+    @Override
+    public TrinoInputFile newInputFile(Location location)
+    {
+        return new S3InputFile(client, context, new S3Location(location), null);
+    }
+
+    @Override
+    public TrinoInputFile newInputFile(Location location, long length)
+    {
+        return new S3InputFile(client, context, new S3Location(location), length);
+    }
+
+    @Override
+    public TrinoOutputFile newOutputFile(Location location)
+    {
+        return new S3OutputFile(client, context, new S3Location(location));
+    }
+
+    @Override
+    public void deleteFile(Location location)
+            throws IOException
+    {
+        location.verifyValidFileLocation();
+        S3Location s3Location = new S3Location(location);
+        DeleteObjectRequest request = DeleteObjectRequest.builder()
+                .requestPayer(requestPayer)
+                .key(s3Location.key())
+                .bucket(s3Location.bucket())
+                .build();
+
+        try {
+            client.deleteObject(request);
+        }
+        catch (SdkException e) {
+            throw new IOException("Failed to delete file: " + location, e);
+        }
+    }
+
+    @Override
+    public void deleteDirectory(Location location)
+            throws IOException
+    {
+        FileIterator iterator = listFiles(location);
+        while (iterator.hasNext()) {
+            List<Location> files = new ArrayList<>();
+            while ((files.size() < 1000) && iterator.hasNext()) {
+                files.add(iterator.next().location());
+            }
+            deleteFiles(files);
+        }
+    }
+
+    @Override
+    public void deleteFiles(Collection<Location> locations)
+            throws IOException
+    {
+        locations.forEach(Location::verifyValidFileLocation);
+
+        SetMultimap<String, String> bucketToKeys = locations.stream()
+                .map(S3Location::new)
+                .collect(toMultimap(S3Location::bucket, S3Location::key, HashMultimap::create));
+
+        Map<String, String> failures = new HashMap<>();
+
+        for (Entry<String, Collection<String>> entry : bucketToKeys.asMap().entrySet()) {
+            String bucket = entry.getKey();
+            Collection<String> allKeys = entry.getValue();
+
+            for (List<String> keys : partition(allKeys, 250)) {
+                List<ObjectIdentifier> objects = keys.stream()
+                        .map(key -> ObjectIdentifier.builder().key(key).build())
+                        .toList();
+
+                DeleteObjectsRequest request = DeleteObjectsRequest.builder()
+                        .requestPayer(requestPayer)
+                        .bucket(bucket)
+                        .delete(builder -> builder.objects(objects).quiet(true))
+                        .build();
+
+                try {
+                    DeleteObjectsResponse response = client.deleteObjects(request);
+                    for (S3Error error : response.errors()) {
+                        failures.put("s3://%s/%s".formatted(bucket, error.key()), error.code());
+                    }
+                }
+                catch (SdkException e) {
+                    throw new IOException("Error while batch deleting files", e);
+                }
+            }
+        }
+
+        if (!failures.isEmpty()) {
+            throw new IOException("Failed to delete one or more files: " + failures);
+        }
+    }
+
+    @Override
+    public void renameFile(Location source, Location target)
+            throws IOException
+    {
+        throw new IOException("S3 does not support renames");
+    }
+
+    @Override
+    public FileIterator listFiles(Location location)
+            throws IOException
+    {
+        S3Location s3Location = new S3Location(location);
+
+        String key = s3Location.key();
+        if (!key.isEmpty() && !key.endsWith("/")) {
+            key += "/";
+        }
+
+        ListObjectsV2Request request = ListObjectsV2Request.builder()
+                .bucket(s3Location.bucket())
+                .prefix(key)
+                .build();
+
+        try {
+            ListObjectsV2Iterable iterable = client.listObjectsV2Paginator(request);
+            return new S3FileIterator(s3Location, iterable.contents().iterator());
+        }
+        catch (SdkException e) {
+            throw new IOException("Failed to list location: " + location, e);
+        }
+    }
+
+    @Override
+    public Optional<Boolean> directoryExists(Location location)
+            throws IOException
+    {
+        validateS3Location(location);
+        if (location.path().isEmpty() || listFiles(location).hasNext()) {
+            return Optional.of(true);
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    public void createDirectory(Location location)
+    {
+        validateS3Location(location);
+        // S3 does not have directories
+    }
+
+    @Override
+    public void renameDirectory(Location source, Location target)
+            throws IOException
+    {
+        throw new IOException("S3 does not support directory renames");
+    }
+
+    @Override
+    public Set<Location> listDirectories(Location location)
+            throws IOException
+    {
+        S3Location s3Location = new S3Location(location);
+        Location baseLocation = s3Location.baseLocation();
+
+        String key = s3Location.key();
+        if (!key.isEmpty() && !key.endsWith("/")) {
+            key += "/";
+        }
+
+        ListObjectsV2Request request = ListObjectsV2Request.builder()
+                .bucket(s3Location.bucket())
+                .prefix(key)
+                .delimiter("/")
+                .build();
+
+        try {
+            return client.listObjectsV2Paginator(request)
+                    .commonPrefixes().stream()
+                    .map(CommonPrefix::prefix)
+                    .map(baseLocation::appendPath)
+                    .collect(toImmutableSet());
+        }
+        catch (SdkException e) {
+            throw new IOException("Failed to list location: " + location, e);
+        }
+    }
+
+    @SuppressWarnings("ResultOfObjectAllocationIgnored")
+    private static void validateS3Location(Location location)
+    {
+        new S3Location(location);
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileSystemConfig.java b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileSystemConfig.java
new file mode 100644
index 000000000000..616e79e7c54b
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileSystemConfig.java
@@ -0,0 +1,269 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import com.google.common.net.HostAndPort;
+import io.airlift.configuration.Config;
+import io.airlift.configuration.ConfigDescription;
+import io.airlift.configuration.ConfigSecuritySensitive;
+import io.airlift.units.DataSize;
+import io.airlift.units.MaxDataSize;
+import io.airlift.units.MinDataSize;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+
+import static io.airlift.units.DataSize.Unit.MEGABYTE;
+
+public class S3FileSystemConfig
+{
+    public enum S3SseType
+    {
+        NONE, S3, KMS
+    }
+
+    private String awsAccessKey;
+    private String awsSecretKey;
+    private String endpoint;
+    private String region;
+    private boolean pathStyleAccess;
+    private String iamRole;
+    private String roleSessionName = "trino-filesystem";
+    private String externalId;
+    private String stsEndpoint;
+    private String stsRegion;
+    private S3SseType sseType = S3SseType.NONE;
+    private String sseKmsKeyId;
+    private DataSize streamingPartSize = DataSize.of(16, MEGABYTE);
+    private boolean requesterPays;
+    private Integer maxConnections;
+    private HostAndPort httpProxy;
+    private boolean httpProxySecure;
+
+    public String getAwsAccessKey()
+    {
+        return awsAccessKey;
+    }
+
+    @Config("s3.aws-access-key")
+    public S3FileSystemConfig setAwsAccessKey(String awsAccessKey)
+    {
+        this.awsAccessKey = awsAccessKey;
+        return this;
+    }
+
+    public String getAwsSecretKey()
+    {
+        return awsSecretKey;
+    }
+
+    @Config("s3.aws-secret-key")
+    @ConfigSecuritySensitive
+    public S3FileSystemConfig setAwsSecretKey(String awsSecretKey)
+    {
+        this.awsSecretKey = awsSecretKey;
+        return this;
+    }
+
+    public String getEndpoint()
+    {
+        return endpoint;
+    }
+
+    @Config("s3.endpoint")
+    public S3FileSystemConfig setEndpoint(String endpoint)
+    {
+        this.endpoint = endpoint;
+        return this;
+    }
+
+    public String getRegion()
+    {
+        return region;
+    }
+
+    @Config("s3.region")
+    public S3FileSystemConfig setRegion(String region)
+    {
+        this.region = region;
+        return this;
+    }
+
+    public boolean isPathStyleAccess()
+    {
+        return pathStyleAccess;
+    }
+
+    @Config("s3.path-style-access")
+    @ConfigDescription("Use path-style access for all requests to S3")
+    public S3FileSystemConfig setPathStyleAccess(boolean pathStyleAccess)
+    {
+        this.pathStyleAccess = pathStyleAccess;
+        return this;
+    }
+
+    public String getIamRole()
+    {
+        return iamRole;
+    }
+
+    @Config("s3.iam-role")
+    @ConfigDescription("ARN of an IAM role to assume when connecting to S3")
+    public S3FileSystemConfig setIamRole(String iamRole)
+    {
+        this.iamRole = iamRole;
+        return this;
+    }
+
+    @NotNull
+    public String getRoleSessionName()
+    {
+        return roleSessionName;
+    }
+
+    @Config("s3.role-session-name")
+    @ConfigDescription("Role session name to use when connecting to S3")
+    public S3FileSystemConfig setRoleSessionName(String roleSessionName)
+    {
+        this.roleSessionName = roleSessionName;
+        return this;
+    }
+
+    public String getExternalId()
+    {
+        return externalId;
+    }
+
+    @Config("s3.external-id")
+    @ConfigDescription("External ID for the IAM role trust policy when connecting to S3")
+    public S3FileSystemConfig setExternalId(String externalId)
+    {
+        this.externalId = externalId;
+        return this;
+    }
+
+    public String getStsEndpoint()
+    {
+        return stsEndpoint;
+    }
+
+    @Config("s3.sts.endpoint")
+    public S3FileSystemConfig setStsEndpoint(String stsEndpoint)
+    {
+        this.stsEndpoint = stsEndpoint;
+        return this;
+    }
+
+    public String getStsRegion()
+    {
+        return stsRegion;
+    }
+
+    @Config("s3.sts.region")
+    public S3FileSystemConfig setStsRegion(String stsRegion)
+    {
+        this.stsRegion = stsRegion;
+        return this;
+    }
+
+    @NotNull
+    public S3SseType getSseType()
+    {
+        return sseType;
+    }
+
+    @Config("s3.sse.type")
+    public S3FileSystemConfig setSseType(S3SseType sseType)
+    {
+        this.sseType = sseType;
+        return this;
+    }
+
+    public String getSseKmsKeyId()
+    {
+        return sseKmsKeyId;
+    }
+
+    @Config("s3.sse.kms-key-id")
+    @ConfigDescription("KMS Key ID to use for S3 server-side encryption with KMS-managed key")
+    public S3FileSystemConfig setSseKmsKeyId(String sseKmsKeyId)
+    {
+        this.sseKmsKeyId = sseKmsKeyId;
+        return this;
+    }
+
+    @NotNull
+    @MinDataSize("5MB")
+    @MaxDataSize("256MB")
+    public DataSize getStreamingPartSize()
+    {
+        return streamingPartSize;
+    }
+
+    @Config("s3.streaming.part-size")
+    @ConfigDescription("Part size for S3 streaming upload")
+    public S3FileSystemConfig setStreamingPartSize(DataSize streamingPartSize)
+    {
+        this.streamingPartSize = streamingPartSize;
+        return this;
+    }
+
+    public boolean isRequesterPays()
+    {
+        return requesterPays;
+    }
+
+    @Config("s3.requester-pays")
+    public S3FileSystemConfig setRequesterPays(boolean requesterPays)
+    {
+        this.requesterPays = requesterPays;
+        return this;
+    }
+
+    @Min(1)
+    public Integer getMaxConnections()
+    {
+        return maxConnections;
+    }
+
+    @Config("s3.max-connections")
+    public S3FileSystemConfig setMaxConnections(Integer maxConnections)
+    {
+        this.maxConnections = maxConnections;
+        return this;
+    }
+
+    public HostAndPort getHttpProxy()
+    {
+        return httpProxy;
+    }
+
+    @Config("s3.http-proxy")
+    public S3FileSystemConfig setHttpProxy(HostAndPort httpProxy)
+    {
+        this.httpProxy = httpProxy;
+        return this;
+    }
+
+    public boolean isHttpProxySecure()
+    {
+        return httpProxySecure;
+    }
+
+    @Config("s3.http-proxy.secure")
+    public S3FileSystemConfig setHttpProxySecure(boolean httpProxySecure)
+    {
+        this.httpProxySecure = httpProxySecure;
+        return this;
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileSystemFactory.java b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileSystemFactory.java
new file mode 100644
index 000000000000..065ede41c99f
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileSystemFactory.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import com.google.inject.Inject;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.spi.security.ConnectorIdentity;
+import jakarta.annotation.PreDestroy;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.http.apache.ProxyConfiguration;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3ClientBuilder;
+import software.amazon.awssdk.services.sts.StsClient;
+import software.amazon.awssdk.services.sts.StsClientBuilder;
+import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider;
+
+import java.net.URI;
+import java.util.Optional;
+
+import static java.lang.Math.toIntExact;
+
+public final class S3FileSystemFactory
+        implements TrinoFileSystemFactory
+{
+    private final S3Client client;
+    private final S3Context context;
+
+    @Inject
+    public S3FileSystemFactory(S3FileSystemConfig config)
+    {
+        S3ClientBuilder s3 = S3Client.builder();
+
+        if ((config.getAwsAccessKey() != null) && (config.getAwsSecretKey() != null)) {
+            s3.credentialsProvider(StaticCredentialsProvider.create(
+                    AwsBasicCredentials.create(config.getAwsAccessKey(), config.getAwsSecretKey())));
+        }
+
+        Optional.ofNullable(config.getRegion()).map(Region::of).ifPresent(s3::region);
+        Optional.ofNullable(config.getEndpoint()).map(URI::create).ifPresent(s3::endpointOverride);
+        s3.forcePathStyle(config.isPathStyleAccess());
+
+        if (config.getIamRole() != null) {
+            StsClientBuilder sts = StsClient.builder();
+            Optional.ofNullable(config.getStsEndpoint()).map(URI::create).ifPresent(sts::endpointOverride);
+            Optional.ofNullable(config.getStsRegion())
+                    .or(() -> Optional.ofNullable(config.getRegion()))
+                    .map(Region::of).ifPresent(sts::region);
+
+            s3.credentialsProvider(StsAssumeRoleCredentialsProvider.builder()
+                    .refreshRequest(request -> request
+                            .roleArn(config.getIamRole())
+                            .roleSessionName(config.getRoleSessionName())
+                            .externalId(config.getExternalId()))
+                    .stsClient(sts.build())
+                    .asyncCredentialUpdateEnabled(true)
+                    .build());
+        }
+
+        ApacheHttpClient.Builder httpClient = ApacheHttpClient.builder()
+                .maxConnections(config.getMaxConnections());
+
+        if (config.getHttpProxy() != null) {
+            URI endpoint = URI.create("%s://%s".formatted(
+                    config.isHttpProxySecure() ? "https" : "http",
+                    config.getHttpProxy()));
+            httpClient.proxyConfiguration(ProxyConfiguration.builder()
+                    .endpoint(endpoint)
+                    .build());
+        }
+
+        s3.httpClientBuilder(httpClient);
+
+        this.client = s3.build();
+
+        context = new S3Context(
+                toIntExact(config.getStreamingPartSize().toBytes()),
+                config.isRequesterPays(),
+                config.getSseType(),
+                config.getSseKmsKeyId());
+    }
+
+    @PreDestroy
+    public void destroy()
+    {
+        client.close();
+    }
+
+    @Override
+    public TrinoFileSystem create(ConnectorIdentity identity)
+    {
+        return new S3FileSystem(client, context);
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileSystemModule.java b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileSystemModule.java
new file mode 100644
index 000000000000..ac96377cfffb
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3FileSystemModule.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import com.google.inject.Binder;
+import com.google.inject.Module;
+
+import static com.google.inject.Scopes.SINGLETON;
+import static io.airlift.configuration.ConfigBinder.configBinder;
+
+public class S3FileSystemModule
+        implements Module
+{
+    @Override
+    public void configure(Binder binder)
+    {
+        configBinder(binder).bindConfig(S3FileSystemConfig.class);
+        binder.bind(S3FileSystemFactory.class).in(SINGLETON);
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3Input.java b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3Input.java
new file mode 100644
index 000000000000..526e522a296b
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3Input.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInput;
+import software.amazon.awssdk.core.exception.AbortedException;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
+
+import java.io.EOFException;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+
+import static java.util.Objects.checkFromIndexSize;
+import static java.util.Objects.requireNonNull;
+
+final class S3Input
+        implements TrinoInput
+{
+    private final Location location;
+    private final S3Client client;
+    private final GetObjectRequest request;
+    private boolean closed;
+
+    public S3Input(Location location, S3Client client, GetObjectRequest request)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.client = requireNonNull(client, "client is null");
+        this.request = requireNonNull(request, "request is null");
+    }
+
+    @Override
+    public void readFully(long position, byte[] buffer, int offset, int length)
+            throws IOException
+    {
+        ensureOpen();
+        if (position < 0) {
+            throw new IOException("Negative seek offset");
+        }
+        checkFromIndexSize(offset, length, buffer.length);
+        if (length == 0) {
+            return;
+        }
+
+        String range = "bytes=%s-%s".formatted(position, (position + length) - 1);
+        GetObjectRequest rangeRequest = request.toBuilder().range(range).build();
+
+        try (InputStream in = getObject(rangeRequest)) {
+            int n = readNBytes(in, buffer, offset, length);
+            if (n < length) {
+                throw new EOFException("Read %s of %s requested bytes: %s".formatted(n, length, location));
+            }
+        }
+    }
+
+    @Override
+    public int readTail(byte[] buffer, int offset, int length)
+            throws IOException
+    {
+        ensureOpen();
+        checkFromIndexSize(offset, length, buffer.length);
+        if (length == 0) {
+            return 0;
+        }
+
+        String range = "bytes=-%s".formatted(length);
+        GetObjectRequest rangeRequest = request.toBuilder().range(range).build();
+
+        try (InputStream in = getObject(rangeRequest)) {
+            return readNBytes(in, buffer, offset, length);
+        }
+    }
+
+    @Override
+    public void close()
+    {
+        closed = true;
+    }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Input closed: " + location);
+        }
+    }
+
+    private InputStream getObject(GetObjectRequest request)
+            throws IOException
+    {
+        try {
+            return client.getObject(request);
+        }
+        catch (NoSuchKeyException e) {
+            throw new FileNotFoundException(location.toString());
+        }
+        catch (SdkException e) {
+            throw new IOException("Failed to open S3 file: " + location, e);
+        }
+    }
+
+    private static int readNBytes(InputStream in, byte[] buffer, int offset, int length)
+            throws IOException
+    {
+        try {
+            return in.readNBytes(buffer, offset, length);
+        }
+        catch (AbortedException e) {
+            throw new InterruptedIOException();
+        }
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3InputFile.java b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3InputFile.java
new file mode 100644
index 000000000000..9df5d5169854
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3InputFile.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInput;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoInputStream;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.HeadObjectRequest;
+import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
+import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
+import software.amazon.awssdk.services.s3.model.RequestPayer;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.time.Instant;
+
+import static java.util.Objects.requireNonNull;
+
+final class S3InputFile
+        implements TrinoInputFile
+{
+    private final S3Client client;
+    private final S3Location location;
+    private final RequestPayer requestPayer;
+    private Long length;
+    private Instant lastModified;
+
+    public S3InputFile(S3Client client, S3Context context, S3Location location, Long length)
+    {
+        this.client = requireNonNull(client, "client is null");
+        this.location = requireNonNull(location, "location is null");
+        this.requestPayer = context.requestPayer();
+        this.length = length;
+        location.location().verifyValidFileLocation();
+    }
+
+    @Override
+    public TrinoInput newInput()
+    {
+        return new S3Input(location(), client, newGetObjectRequest());
+    }
+
+    @Override
+    public TrinoInputStream newStream()
+    {
+        return new S3InputStream(location(), client, newGetObjectRequest(), length);
+    }
+
+    @Override
+    public long length()
+            throws IOException
+    {
+        if ((length == null) && !headObject()) {
+            throw new FileNotFoundException(location.toString());
+        }
+        return length;
+    }
+
+    @Override
+    public Instant lastModified()
+            throws IOException
+    {
+        if ((lastModified == null) && !headObject()) {
+            throw new FileNotFoundException(location.toString());
+        }
+        return lastModified;
+    }
+
+    @Override
+    public boolean exists()
+            throws IOException
+    {
+        return headObject();
+    }
+
+    @Override
+    public Location location()
+    {
+        return location.location();
+    }
+
+    private GetObjectRequest newGetObjectRequest()
+    {
+        return GetObjectRequest.builder()
+                .requestPayer(requestPayer)
+                .bucket(location.bucket())
+                .key(location.key())
+                .build();
+    }
+
+    private boolean headObject()
+            throws IOException
+    {
+        HeadObjectRequest request = HeadObjectRequest.builder()
+                .requestPayer(requestPayer)
+                .bucket(location.bucket())
+                .key(location.key())
+                .build();
+
+        try {
+            HeadObjectResponse response = client.headObject(request);
+            if (length == null) {
+                length = response.contentLength();
+            }
+            if (lastModified == null) {
+                lastModified = response.lastModified();
+            }
+            return true;
+        }
+        catch (NoSuchKeyException e) {
+            return false;
+        }
+        catch (SdkException e) {
+            throw new IOException("S3 HEAD request failed for file: " + location, e);
+        }
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3InputStream.java b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3InputStream.java
new file mode 100644
index 000000000000..e79432e6e9c6
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3InputStream.java
@@ -0,0 +1,267 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInputStream;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.core.exception.AbortedException;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
+
+import java.io.EOFException;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+
+import static java.lang.Math.max;
+import static java.util.Objects.requireNonNull;
+
+final class S3InputStream
+        extends TrinoInputStream
+{
+    private static final int MAX_SKIP_BYTES = 1024 * 1024;
+
+    private final Location location;
+    private final S3Client client;
+    private final GetObjectRequest request;
+    private final Long length;
+
+    private boolean closed;
+    private ResponseInputStream<GetObjectResponse> in;
+    private long streamPosition;
+    private long nextReadPosition;
+
+    public S3InputStream(Location location, S3Client client, GetObjectRequest request, Long length)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.client = requireNonNull(client, "client is null");
+        this.request = requireNonNull(request, "request is null");
+        this.length = length;
+    }
+
+    @Override
+    public int available()
+            throws IOException
+    {
+        ensureOpen();
+        if ((in != null) && (nextReadPosition == streamPosition)) {
+            return getAvailable();
+        }
+        return 0;
+    }
+
+    @Override
+    public long getPosition()
+    {
+        return nextReadPosition;
+    }
+
+    @Override
+    public void seek(long position)
+            throws IOException
+    {
+        ensureOpen();
+        if (position < 0) {
+            throw new IOException("Negative seek offset");
+        }
+        if ((length != null) && (position > length)) {
+            throw new IOException("Cannot seek to %s. File size is %s: %s".formatted(position, length, location));
+        }
+
+        nextReadPosition = position;
+    }
+
+    @Override
+    public int read()
+            throws IOException
+    {
+        ensureOpen();
+        seekStream();
+
+        int value = doRead();
+        if (value >= 0) {
+            streamPosition++;
+            nextReadPosition++;
+        }
+        return value;
+    }
+
+    @Override
+    public int read(byte[] bytes, int offset, int length)
+            throws IOException
+    {
+        ensureOpen();
+        seekStream();
+
+        int n = doRead(bytes, offset, length);
+        if (n > 0) {
+            streamPosition += n;
+            nextReadPosition += n;
+        }
+        return n;
+    }
+
+    @Override
+    public long skip(long n)
+            throws IOException
+    {
+        ensureOpen();
+        seekStream();
+
+        long skip = doSkip(n);
+        streamPosition += skip;
+        nextReadPosition += skip;
+        return skip;
+    }
+
+    @Override
+    public void skipNBytes(long n)
+            throws IOException
+    {
+        ensureOpen();
+
+        if (n <= 0) {
+            return;
+        }
+
+        long position = nextReadPosition + n;
+        if ((position < 0) || (length != null && position > length)) {
+            throw new EOFException("Unable to skip %s bytes (position=%s, fileSize=%s): %s".formatted(n, nextReadPosition, length, location));
+        }
+        nextReadPosition = position;
+    }
+
+    @Override
+    public void close()
+    {
+        if (closed) {
+            return;
+        }
+        closed = true;
+
+        closeStream();
+    }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Input stream closed: " + location);
+        }
+    }
+
+    private void seekStream()
+            throws IOException
+    {
+        if ((in != null) && (nextReadPosition == streamPosition)) {
+            // already at specified position
+            return;
+        }
+
+        if ((in != null) && (nextReadPosition > streamPosition)) {
+            // seeking forwards
+            long skip = nextReadPosition - streamPosition;
+            if (skip <= max(getAvailable(), MAX_SKIP_BYTES)) {
+                // already buffered or seek is small enough
+                if (doSkip(skip) == skip) {
+                    streamPosition = nextReadPosition;
+                    return;
+                }
+            }
+        }
+
+        // close the stream and open at desired position
+        streamPosition = nextReadPosition;
+        closeStream();
+
+        try {
+            String range = "bytes=%s-".formatted(nextReadPosition);
+            GetObjectRequest rangeRequest = request.toBuilder().range(range).build();
+            in = client.getObject(rangeRequest);
+            streamPosition = nextReadPosition;
+        }
+        catch (NoSuchKeyException e) {
+            var ex = new FileNotFoundException(location.toString());
+            ex.initCause(e);
+            throw ex;
+        }
+        catch (SdkException e) {
+            throw new IOException("Failed to open S3 file: " + location, e);
+        }
+    }
+
+    private void closeStream()
+    {
+        if (in == null) {
+            return;
+        }
+
+        try (var ignored = in) {
+            in.abort();
+        }
+        catch (AbortedException | IOException ignored) {
+        }
+        finally {
+            in = null;
+        }
+    }
+
+    private int getAvailable()
+            throws IOException
+    {
+        try {
+            return in.available();
+        }
+        catch (AbortedException e) {
+            throw new InterruptedIOException();
+        }
+    }
+
+    private long doSkip(long n)
+            throws IOException
+    {
+        try {
+            return in.skip(n);
+        }
+        catch (AbortedException e) {
+            throw new InterruptedIOException();
+        }
+    }
+
+    private int doRead()
+            throws IOException
+    {
+        try {
+            return in.read();
+        }
+        catch (AbortedException e) {
+            throw new InterruptedIOException();
+        }
+    }
+
+    private int doRead(byte[] bytes, int offset, int length)
+            throws IOException
+    {
+        try {
+            return in.read(bytes, offset, length);
+        }
+        catch (AbortedException e) {
+            throw new InterruptedIOException();
+        }
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3Location.java b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3Location.java
new file mode 100644
index 000000000000..d4e2932c731a
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3Location.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import io.trino.filesystem.Location;
+
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+record S3Location(Location location)
+{
+    S3Location
+    {
+        requireNonNull(location, "location is null");
+        checkArgument(location.scheme().isPresent(), "No scheme for S3 location: %s", location);
+        checkArgument(Set.of("s3", "s3a", "s3n").contains(location.scheme().get()), "Wrong scheme for S3 location: %s", location);
+        checkArgument(location.host().isPresent(), "No bucket for S3 location: %s", location);
+        checkArgument(location.userInfo().isEmpty(), "S3 location contains user info: %s", location);
+        checkArgument(location.port().isEmpty(), "S3 location contains port: %s", location);
+    }
+
+    public String scheme()
+    {
+        return location.scheme().orElseThrow();
+    }
+
+    public String bucket()
+    {
+        return location.host().orElseThrow();
+    }
+
+    public String key()
+    {
+        return location.path();
+    }
+
+    @Override
+    public String toString()
+    {
+        return location.toString();
+    }
+
+    public Location baseLocation()
+    {
+        return Location.of("%s://%s/".formatted(scheme(), bucket()));
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3OutputFile.java b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3OutputFile.java
new file mode 100644
index 000000000000..a388bcb6d287
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3OutputFile.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoOutputFile;
+import io.trino.memory.context.AggregatedMemoryContext;
+import software.amazon.awssdk.services.s3.S3Client;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import static java.util.Objects.requireNonNull;
+
+final class S3OutputFile
+        implements TrinoOutputFile
+{
+    private final S3Client client;
+    private final S3Context context;
+    private final S3Location location;
+
+    public S3OutputFile(S3Client client, S3Context context, S3Location location)
+    {
+        this.client = requireNonNull(client, "client is null");
+        this.context = requireNonNull(context, "context is null");
+        this.location = requireNonNull(location, "location is null");
+        location.location().verifyValidFileLocation();
+    }
+
+    @Override
+    public OutputStream create(AggregatedMemoryContext memoryContext)
+    {
+        // always overwrite since Trino usually creates unique file names
+        return createOrOverwrite(memoryContext);
+    }
+
+    @Override
+    public OutputStream createOrOverwrite(AggregatedMemoryContext memoryContext)
+    {
+        return new S3OutputStream(memoryContext, client, context, location);
+    }
+
+    @Override
+    public OutputStream createExclusive(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        throw new IOException("S3 does not support exclusive create");
+    }
+
+    @Override
+    public Location location()
+    {
+        return location.location();
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3OutputStream.java b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3OutputStream.java
new file mode 100644
index 000000000000..8259e2928900
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3OutputStream.java
@@ -0,0 +1,345 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import io.trino.filesystem.s3.S3FileSystemConfig.S3SseType;
+import io.trino.memory.context.AggregatedMemoryContext;
+import io.trino.memory.context.LocalMemoryContext;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CompletedPart;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.RequestPayer;
+import software.amazon.awssdk.services.s3.model.UploadPartRequest;
+import software.amazon.awssdk.services.s3.model.UploadPartResponse;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import static com.google.common.primitives.Ints.constrainToRange;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+import static java.lang.System.arraycopy;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.CompletableFuture.supplyAsync;
+import static software.amazon.awssdk.services.s3.model.ServerSideEncryption.AES256;
+import static software.amazon.awssdk.services.s3.model.ServerSideEncryption.AWS_KMS;
+
+final class S3OutputStream
+        extends OutputStream
+{
+    private final List<CompletedPart> parts = new ArrayList<>();
+    private final LocalMemoryContext memoryContext;
+    private final S3Client client;
+    private final S3Location location;
+    private final int partSize;
+    private final RequestPayer requestPayer;
+    private final S3SseType sseType;
+    private final String sseKmsKeyId;
+
+    private int currentPartNumber;
+    private byte[] buffer = new byte[0];
+    private int bufferSize;
+    private int initialBufferSize = 64;
+
+    private boolean closed;
+    private boolean failed;
+    private boolean multipartUploadStarted;
+    private Future<CompletedPart> inProgressUploadFuture;
+
+    // Mutated by background thread which does the multipart upload.
+    // Read by both main thread and background thread.
+    // Visibility is ensured by calling get() on inProgressUploadFuture.
+    private Optional<String> uploadId = Optional.empty();
+
+    public S3OutputStream(AggregatedMemoryContext memoryContext, S3Client client, S3Context context, S3Location location)
+    {
+        this.memoryContext = memoryContext.newLocalMemoryContext(S3OutputStream.class.getSimpleName());
+        this.client = requireNonNull(client, "client is null");
+        this.location = requireNonNull(location, "location is null");
+        this.partSize = context.partSize();
+        this.requestPayer = context.requestPayer();
+        this.sseType = context.sseType();
+        this.sseKmsKeyId = context.sseKmsKeyId();
+    }
+
+    @SuppressWarnings("NumericCastThatLosesPrecision")
+    @Override
+    public void write(int b)
+            throws IOException
+    {
+        ensureOpen();
+        ensureCapacity(1);
+        buffer[bufferSize] = (byte) b;
+        bufferSize++;
+        flushBuffer(false);
+    }
+
+    @Override
+    public void write(byte[] bytes, int offset, int length)
+            throws IOException
+    {
+        ensureOpen();
+
+        while (length > 0) {
+            ensureCapacity(length);
+
+            int copied = min(buffer.length - bufferSize, length);
+            arraycopy(bytes, offset, buffer, bufferSize, copied);
+            bufferSize += copied;
+
+            flushBuffer(false);
+
+            offset += copied;
+            length -= copied;
+        }
+    }
+
+    @Override
+    public void flush()
+            throws IOException
+    {
+        ensureOpen();
+        flushBuffer(false);
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        if (closed) {
+            return;
+        }
+        closed = true;
+
+        if (failed) {
+            try {
+                abortUpload();
+                return;
+            }
+            catch (SdkException e) {
+                throw new IOException(e);
+            }
+        }
+
+        try {
+            flushBuffer(true);
+            memoryContext.close();
+            waitForPreviousUploadFinish();
+        }
+        catch (IOException | RuntimeException e) {
+            abortUploadSuppressed(e);
+            throw e;
+        }
+
+        try {
+            uploadId.ifPresent(this::finishUpload);
+        }
+        catch (SdkException e) {
+            abortUploadSuppressed(e);
+            throw new IOException(e);
+        }
+    }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Output stream closed: " + location);
+        }
+    }
+
+    private void ensureCapacity(int extra)
+    {
+        int capacity = min(partSize, bufferSize + extra);
+        if (buffer.length < capacity) {
+            int target = max(buffer.length, initialBufferSize);
+            if (target < capacity) {
+                target += target / 2; // increase 50%
+                target = constrainToRange(target, capacity, partSize);
+            }
+            buffer = Arrays.copyOf(buffer, target);
+            memoryContext.setBytes(buffer.length);
+        }
+    }
+
+    private void flushBuffer(boolean finished)
+            throws IOException
+    {
+        // skip multipart upload if there would only be one part
+        if (finished && !multipartUploadStarted) {
+            PutObjectRequest request = PutObjectRequest.builder()
+                    .requestPayer(requestPayer)
+                    .bucket(location.bucket())
+                    .key(location.key())
+                    .contentLength((long) bufferSize)
+                    .applyMutation(builder -> {
+                        switch (sseType) {
+                            case NONE -> { /* ignored */ }
+                            case S3 -> builder.serverSideEncryption(AES256);
+                            case KMS -> builder.serverSideEncryption(AWS_KMS).ssekmsKeyId(sseKmsKeyId);
+                        }
+                    })
+                    .build();
+
+            ByteBuffer bytes = ByteBuffer.wrap(buffer, 0, bufferSize);
+
+            try {
+                client.putObject(request, RequestBody.fromByteBuffer(bytes));
+                return;
+            }
+            catch (SdkException e) {
+                failed = true;
+                throw new IOException(e);
+            }
+        }
+
+        // the multipart upload API only allows the last part to be smaller than 5MB
+        if ((bufferSize == partSize) || (finished && (bufferSize > 0))) {
+            byte[] data = buffer;
+            int length = bufferSize;
+
+            if (finished) {
+                this.buffer = null;
+            }
+            else {
+                this.buffer = new byte[0];
+                this.initialBufferSize = partSize;
+                bufferSize = 0;
+            }
+            memoryContext.setBytes(0);
+
+            try {
+                waitForPreviousUploadFinish();
+            }
+            catch (IOException e) {
+                failed = true;
+                abortUploadSuppressed(e);
+                throw e;
+            }
+            multipartUploadStarted = true;
+            inProgressUploadFuture = supplyAsync(() -> uploadPage(data, length));
+        }
+    }
+
+    private void waitForPreviousUploadFinish()
+            throws IOException
+    {
+        if (inProgressUploadFuture == null) {
+            return;
+        }
+
+        try {
+            inProgressUploadFuture.get();
+        }
+        catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new InterruptedIOException();
+        }
+        catch (ExecutionException e) {
+            throw new IOException("Streaming upload failed", e);
+        }
+    }
+
+    private CompletedPart uploadPage(byte[] data, int length)
+    {
+        if (uploadId.isEmpty()) {
+            CreateMultipartUploadRequest request = CreateMultipartUploadRequest.builder()
+                    .requestPayer(requestPayer)
+                    .bucket(location.bucket())
+                    .key(location.key())
+                    .applyMutation(builder -> {
+                        switch (sseType) {
+                            case NONE -> { /* ignored */ }
+                            case S3 -> builder.serverSideEncryption(AES256);
+                            case KMS -> builder.serverSideEncryption(AWS_KMS).ssekmsKeyId(sseKmsKeyId);
+                        }
+                    })
+                    .build();
+
+            uploadId = Optional.of(client.createMultipartUpload(request).uploadId());
+        }
+
+        currentPartNumber++;
+        UploadPartRequest request = UploadPartRequest.builder()
+                .requestPayer(requestPayer)
+                .bucket(location.bucket())
+                .key(location.key())
+                .contentLength((long) length)
+                .uploadId(uploadId.get())
+                .partNumber(currentPartNumber)
+                .build();
+
+        ByteBuffer bytes = ByteBuffer.wrap(data, 0, length);
+
+        UploadPartResponse response = client.uploadPart(request, RequestBody.fromByteBuffer(bytes));
+
+        CompletedPart part = CompletedPart.builder()
+                .partNumber(currentPartNumber)
+                .eTag(response.eTag())
+                .build();
+
+        parts.add(part);
+        return part;
+    }
+
+    private void finishUpload(String uploadId)
+    {
+        CompleteMultipartUploadRequest request = CompleteMultipartUploadRequest.builder()
+                .requestPayer(requestPayer)
+                .bucket(location.bucket())
+                .key(location.key())
+                .uploadId(uploadId)
+                .multipartUpload(x -> x.parts(parts))
+                .build();
+
+        client.completeMultipartUpload(request);
+    }
+
+    private void abortUpload()
+    {
+        uploadId.map(id -> AbortMultipartUploadRequest.builder()
+                        .requestPayer(requestPayer)
+                        .bucket(location.bucket())
+                        .key(location.key())
+                        .uploadId(id)
+                        .build())
+                .ifPresent(client::abortMultipartUpload);
+    }
+
+    @SuppressWarnings("ObjectEquality")
+    private void abortUploadSuppressed(Throwable throwable)
+    {
+        try {
+            abortUpload();
+        }
+        catch (Throwable t) {
+            if (throwable != t) {
+                throwable.addSuppressed(t);
+            }
+        }
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/AbstractTestS3FileSystem.java b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/AbstractTestS3FileSystem.java
new file mode 100644
index 000000000000..46881729b898
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/AbstractTestS3FileSystem.java
@@ -0,0 +1,177 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.io.ByteStreams;
+import io.airlift.log.Logging;
+import io.trino.filesystem.AbstractTestTrinoFileSystem;
+import io.trino.filesystem.FileEntry;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoInputStream;
+import io.trino.spi.security.ConnectorIdentity;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.List;
+
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public abstract class AbstractTestS3FileSystem
+        extends AbstractTestTrinoFileSystem
+{
+    private S3FileSystemFactory fileSystemFactory;
+    private TrinoFileSystem fileSystem;
+
+    @BeforeAll
+    final void init()
+    {
+        Logging.initialize();
+
+        initEnvironment();
+        fileSystemFactory = createS3FileSystemFactory();
+        fileSystem = fileSystemFactory.create(ConnectorIdentity.ofUser("test"));
+    }
+
+    @AfterAll
+    final void cleanup()
+    {
+        fileSystem = null;
+        fileSystemFactory.destroy();
+        fileSystemFactory = null;
+    }
+
+    /**
+     * Tests same things as {@link #testFileWithTrailingWhitespace()} but with setup and assertions using {@link S3Client}.
+     */
+    @Test
+    public void testFileWithTrailingWhitespaceAgainstNativeClient()
+            throws IOException
+    {
+        try (S3Client s3Client = createS3Client()) {
+            String key = "foo/bar with whitespace ";
+            byte[] contents = "abc foo bar".getBytes(UTF_8);
+            s3Client.putObject(
+                    request -> request.bucket(bucket()).key(key),
+                    RequestBody.fromBytes(contents.clone()));
+            try {
+                // Verify listing
+                List<FileEntry> listing = toList(fileSystem.listFiles(getRootLocation().appendPath("foo")));
+                assertThat(listing).hasSize(1);
+                FileEntry fileEntry = getOnlyElement(listing);
+                assertThat(fileEntry.location()).isEqualTo(getRootLocation().appendPath(key));
+                assertThat(fileEntry.length()).isEqualTo(contents.length);
+
+                // Verify reading
+                TrinoInputFile inputFile = fileSystem.newInputFile(fileEntry.location());
+                assertThat(inputFile.exists()).as("exists").isTrue();
+                try (TrinoInputStream inputStream = inputFile.newStream()) {
+                    byte[] bytes = ByteStreams.toByteArray(inputStream);
+                    assertThat(bytes).isEqualTo(contents);
+                }
+
+                // Verify writing
+                byte[] newContents = "bar bar baz new content".getBytes(UTF_8);
+                try (OutputStream outputStream = fileSystem.newOutputFile(fileEntry.location()).createOrOverwrite()) {
+                    outputStream.write(newContents.clone());
+                }
+                assertThat(s3Client.getObjectAsBytes(request -> request.bucket(bucket()).key(key)).asByteArray())
+                        .isEqualTo(newContents);
+
+                // Verify deleting
+                fileSystem.deleteFile(fileEntry.location());
+                assertThat(inputFile.exists()).as("exists after delete").isFalse();
+            }
+            finally {
+                s3Client.deleteObject(delete -> delete.bucket(bucket()).key(key));
+            }
+        }
+    }
+
+    @Override
+    protected final boolean isHierarchical()
+    {
+        return false;
+    }
+
+    @Override
+    protected final TrinoFileSystem getFileSystem()
+    {
+        return fileSystem;
+    }
+
+    @Override
+    protected final Location getRootLocation()
+    {
+        return Location.of("s3://%s/".formatted(bucket()));
+    }
+
+    @Override
+    protected final boolean supportsCreateExclusive()
+    {
+        return false;
+    }
+
+    @Override
+    protected final boolean supportsRenameFile()
+    {
+        return false;
+    }
+
+    @Override
+    protected final boolean deleteFileFailsIfNotExists()
+    {
+        return false;
+    }
+
+    @Override
+    protected final void verifyFileSystemIsEmpty()
+    {
+        try (S3Client client = createS3Client()) {
+            ListObjectsV2Request request = ListObjectsV2Request.builder()
+                    .bucket(bucket())
+                    .build();
+            assertThat(client.listObjectsV2(request).contents()).isEmpty();
+        }
+    }
+
+    protected void initEnvironment() {}
+
+    protected abstract String bucket();
+
+    protected abstract S3FileSystemFactory createS3FileSystemFactory();
+
+    protected abstract S3Client createS3Client();
+
+    protected List<FileEntry> toList(FileIterator fileIterator)
+            throws IOException
+    {
+        ImmutableList.Builder<FileEntry> list = ImmutableList.builder();
+        while (fileIterator.hasNext()) {
+            list.add(fileIterator.next());
+        }
+        return list.build();
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemAwsS3.java b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemAwsS3.java
new file mode 100644
index 000000000000..1e5543146dfa
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemAwsS3.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import io.airlift.units.DataSize;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
+import static java.util.Objects.requireNonNull;
+
+public class TestS3FileSystemAwsS3
+        extends AbstractTestS3FileSystem
+{
+    private String accessKey;
+    private String secretKey;
+    private String region;
+    private String bucket;
+
+    @Override
+    protected void initEnvironment()
+    {
+        accessKey = environmentVariable("AWS_ACCESS_KEY_ID");
+        secretKey = environmentVariable("AWS_SECRET_ACCESS_KEY");
+        region = environmentVariable("AWS_REGION");
+        bucket = environmentVariable("EMPTY_S3_BUCKET");
+    }
+
+    @Override
+    protected String bucket()
+    {
+        return bucket;
+    }
+
+    @Override
+    protected S3Client createS3Client()
+    {
+        return S3Client.builder()
+                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey)))
+                .region(Region.of(region))
+                .build();
+    }
+
+    @Override
+    protected S3FileSystemFactory createS3FileSystemFactory()
+    {
+        return new S3FileSystemFactory(new S3FileSystemConfig()
+                .setAwsAccessKey(accessKey)
+                .setAwsSecretKey(secretKey)
+                .setRegion(region)
+                .setStreamingPartSize(DataSize.valueOf("5.5MB")));
+    }
+
+    private static String environmentVariable(String name)
+    {
+        return requireNonNull(System.getenv(name), "Environment variable not set: " + name);
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemConfig.java b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemConfig.java
new file mode 100644
index 000000000000..dd07e1f6edf5
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemConfig.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.net.HostAndPort;
+import io.airlift.units.DataSize;
+import io.trino.filesystem.s3.S3FileSystemConfig.S3SseType;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+import static io.airlift.units.DataSize.Unit.MEGABYTE;
+
+public class TestS3FileSystemConfig
+{
+    @Test
+    public void testDefaults()
+    {
+        assertRecordedDefaults(recordDefaults(S3FileSystemConfig.class)
+                .setAwsAccessKey(null)
+                .setAwsSecretKey(null)
+                .setEndpoint(null)
+                .setRegion(null)
+                .setPathStyleAccess(false)
+                .setIamRole(null)
+                .setRoleSessionName("trino-filesystem")
+                .setExternalId(null)
+                .setStsEndpoint(null)
+                .setStsRegion(null)
+                .setSseType(S3SseType.NONE)
+                .setSseKmsKeyId(null)
+                .setStreamingPartSize(DataSize.of(16, MEGABYTE))
+                .setRequesterPays(false)
+                .setMaxConnections(null)
+                .setHttpProxy(null)
+                .setHttpProxySecure(false));
+    }
+
+    @Test
+    public void testExplicitPropertyMappings()
+    {
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("s3.aws-access-key", "abc123")
+                .put("s3.aws-secret-key", "secret")
+                .put("s3.endpoint", "endpoint.example.com")
+                .put("s3.region", "eu-central-1")
+                .put("s3.path-style-access", "true")
+                .put("s3.iam-role", "myrole")
+                .put("s3.role-session-name", "mysession")
+                .put("s3.external-id", "myid")
+                .put("s3.sts.endpoint", "sts.example.com")
+                .put("s3.sts.region", "us-west-2")
+                .put("s3.sse.type", "KMS")
+                .put("s3.sse.kms-key-id", "mykey")
+                .put("s3.streaming.part-size", "42MB")
+                .put("s3.requester-pays", "true")
+                .put("s3.max-connections", "42")
+                .put("s3.http-proxy", "localhost:8888")
+                .put("s3.http-proxy.secure", "true")
+                .buildOrThrow();
+
+        S3FileSystemConfig expected = new S3FileSystemConfig()
+                .setAwsAccessKey("abc123")
+                .setAwsSecretKey("secret")
+                .setEndpoint("endpoint.example.com")
+                .setRegion("eu-central-1")
+                .setPathStyleAccess(true)
+                .setIamRole("myrole")
+                .setRoleSessionName("mysession")
+                .setExternalId("myid")
+                .setStsEndpoint("sts.example.com")
+                .setStsRegion("us-west-2")
+                .setStreamingPartSize(DataSize.of(42, MEGABYTE))
+                .setSseType(S3SseType.KMS)
+                .setSseKmsKeyId("mykey")
+                .setRequesterPays(true)
+                .setMaxConnections(42)
+                .setHttpProxy(HostAndPort.fromParts("localhost", 8888))
+                .setHttpProxySecure(true);
+
+        assertFullMapping(properties, expected);
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemLocalStack.java b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemLocalStack.java
new file mode 100644
index 000000000000..213a16f991e8
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemLocalStack.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import io.airlift.units.DataSize;
+import org.testcontainers.containers.localstack.LocalStackContainer;
+import org.testcontainers.containers.localstack.LocalStackContainer.Service;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
+@Testcontainers
+public class TestS3FileSystemLocalStack
+        extends AbstractTestS3FileSystem
+{
+    private static final String BUCKET = "test-bucket";
+
+    @Container
+    private static final LocalStackContainer LOCALSTACK = new LocalStackContainer(DockerImageName.parse("localstack/localstack:2.0.2"))
+            .withServices(Service.S3);
+
+    @Override
+    protected void initEnvironment()
+    {
+        try (S3Client s3Client = createS3Client()) {
+            s3Client.createBucket(builder -> builder.bucket(BUCKET).build());
+        }
+    }
+
+    @Override
+    protected String bucket()
+    {
+        return BUCKET;
+    }
+
+    @Override
+    protected S3Client createS3Client()
+    {
+        return S3Client.builder()
+                .endpointOverride(LOCALSTACK.getEndpointOverride(Service.S3))
+                .region(Region.of(LOCALSTACK.getRegion()))
+                .credentialsProvider(StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(LOCALSTACK.getAccessKey(), LOCALSTACK.getSecretKey())))
+                .build();
+    }
+
+    @Override
+    protected S3FileSystemFactory createS3FileSystemFactory()
+    {
+        return new S3FileSystemFactory(new S3FileSystemConfig()
+                .setAwsAccessKey(LOCALSTACK.getAccessKey())
+                .setAwsSecretKey(LOCALSTACK.getSecretKey())
+                .setEndpoint(LOCALSTACK.getEndpointOverride(Service.S3).toString())
+                .setRegion(LOCALSTACK.getRegion())
+                .setStreamingPartSize(DataSize.valueOf("5.5MB")));
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemMinIo.java b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemMinIo.java
new file mode 100644
index 000000000000..f60672a4d92b
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemMinIo.java
@@ -0,0 +1,120 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import io.airlift.units.DataSize;
+import io.trino.testing.containers.Minio;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
+import java.io.IOException;
+import java.net.URI;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestS3FileSystemMinIo
+        extends AbstractTestS3FileSystem
+{
+    private final String bucket = "test-bucket-test-s3-file-system-minio";
+
+    private Minio minio;
+
+    @Override
+    protected void initEnvironment()
+    {
+        minio = Minio.builder().build();
+        minio.start();
+        minio.createBucket(bucket);
+    }
+
+    @AfterAll
+    void tearDown()
+    {
+        if (minio != null) {
+            minio.close();
+            minio = null;
+        }
+    }
+
+    @Override
+    protected String bucket()
+    {
+        return bucket;
+    }
+
+    @Override
+    protected S3Client createS3Client()
+    {
+        return S3Client.builder()
+                .endpointOverride(URI.create(minio.getMinioAddress()))
+                .region(Region.of(Minio.MINIO_REGION))
+                .forcePathStyle(true)
+                .credentialsProvider(StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(Minio.MINIO_ACCESS_KEY, Minio.MINIO_SECRET_KEY)))
+                .build();
+    }
+
+    @Override
+    protected S3FileSystemFactory createS3FileSystemFactory()
+    {
+        return new S3FileSystemFactory(new S3FileSystemConfig()
+                .setEndpoint(minio.getMinioAddress())
+                .setRegion(Minio.MINIO_REGION)
+                .setPathStyleAccess(true)
+                .setAwsAccessKey(Minio.MINIO_ACCESS_KEY)
+                .setAwsSecretKey(Minio.MINIO_SECRET_KEY)
+                .setStreamingPartSize(DataSize.valueOf("5.5MB")));
+    }
+
+    @Test
+    @Override
+    public void testPaths()
+    {
+        assertThatThrownBy(super::testPaths)
+                .isInstanceOf(IOException.class)
+                // MinIO does not support object keys with directory navigation ("/./" or "/../") or with double slashes ("//")
+                .hasMessage("S3 HEAD request failed for file: s3://" + bucket + "/test/.././/file");
+    }
+
+    @Test
+    @Override
+    public void testListFiles()
+            throws IOException
+    {
+        // MinIO is not hierarchical but has hierarchical naming constraints. For example it's not possible to have two blobs "level0" and "level0/level1".
+        testListFiles(true);
+    }
+
+    @Test
+    @Override
+    public void testDeleteDirectory()
+            throws IOException
+    {
+        // MinIO is not hierarchical but has hierarchical naming constraints. For example it's not possible to have two blobs "level0" and "level0/level1".
+        testDeleteDirectory(true);
+    }
+
+    @Test
+    @Override
+    public void testListDirectories()
+            throws IOException
+    {
+        // MinIO is not hierarchical but has hierarchical naming constraints. For example it's not possible to have two blobs "level0" and "level0/level1".
+        testListDirectories(true);
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemS3Mock.java b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemS3Mock.java
new file mode 100644
index 000000000000..785a68dea1e8
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemS3Mock.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import com.adobe.testing.s3mock.testcontainers.S3MockContainer;
+import io.airlift.units.DataSize;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
+import java.net.URI;
+
+@Testcontainers
+public class TestS3FileSystemS3Mock
+        extends AbstractTestS3FileSystem
+{
+    private static final String BUCKET = "test-bucket";
+
+    @Container
+    private static final S3MockContainer S3_MOCK = new S3MockContainer("3.0.1")
+            .withInitialBuckets(BUCKET);
+
+    @Override
+    protected String bucket()
+    {
+        return BUCKET;
+    }
+
+    @Override
+    protected S3Client createS3Client()
+    {
+        return S3Client.builder()
+                .credentialsProvider(StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create("accesskey", "secretkey")))
+                .endpointOverride(URI.create(S3_MOCK.getHttpEndpoint()))
+                .region(Region.US_EAST_1)
+                .forcePathStyle(true)
+                .build();
+    }
+
+    @Override
+    protected S3FileSystemFactory createS3FileSystemFactory()
+    {
+        return new S3FileSystemFactory(new S3FileSystemConfig()
+                .setAwsAccessKey("accesskey")
+                .setAwsSecretKey("secretkey")
+                .setEndpoint(S3_MOCK.getHttpEndpoint())
+                .setRegion(Region.US_EAST_1.id())
+                .setPathStyleAccess(true)
+                .setStreamingPartSize(DataSize.valueOf("5.5MB")));
+    }
+}
diff --git a/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3Location.java b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3Location.java
new file mode 100644
index 000000000000..97a18f1d9995
--- /dev/null
+++ b/lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3Location.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed 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 io.trino.filesystem.s3;
+
+import io.trino.filesystem.Location;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestS3Location
+{
+    @Test
+    public void testValidUri()
+    {
+        assertS3Uri("s3://abc/", "abc", "");
+        assertS3Uri("s3://abc/x", "abc", "x");
+        assertS3Uri("s3://abc/xyz/fooBAR", "abc", "xyz/fooBAR");
+        assertS3Uri("s3://abc/xyz/../foo", "abc", "xyz/../foo");
+        assertS3Uri("s3://abc/..", "abc", "..");
+        assertS3Uri("s3://abc/xyz/%41%xx", "abc", "xyz/%41%xx");
+        assertS3Uri("s3://abc///what", "abc", "//what");
+        assertS3Uri("s3://abc///what//", "abc", "//what//");
+        assertS3Uri("s3a://hello/what/xxx", "hello", "what/xxx");
+    }
+
+    @Test
+    public void testInvalidUri()
+    {
+        assertThatThrownBy(() -> new S3Location(Location.of("/abc/xyz")))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("No scheme for S3 location: /abc/xyz");
+
+        assertThatThrownBy(() -> new S3Location(Location.of("s3://")))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("No bucket for S3 location: s3://");
+
+        assertThatThrownBy(() -> new S3Location(Location.of("s3://abc")))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Path missing in file system location: s3://abc");
+
+        assertThatThrownBy(() -> new S3Location(Location.of("s3:///abc")))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("No bucket for S3 location: s3:///abc");
+
+        assertThatThrownBy(() -> new S3Location(Location.of("s3://user:pass@abc/xyz")))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("S3 location contains user info: s3://user:pass@abc/xyz");
+
+        assertThatThrownBy(() -> new S3Location(Location.of("blah://abc/xyz")))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Wrong scheme for S3 location: blah://abc/xyz");
+    }
+
+    private static void assertS3Uri(String uri, String bucket, String key)
+    {
+        var location = Location.of(uri);
+        var s3Location = new S3Location(location);
+        assertThat(s3Location.location()).as("location").isEqualTo(location);
+        assertThat(s3Location.bucket()).as("bucket").isEqualTo(bucket);
+        assertThat(s3Location.key()).as("key").isEqualTo(key);
+    }
+}
diff --git a/lib/trino-filesystem/pom.xml b/lib/trino-filesystem/pom.xml
index 4c1f4a46307f..f05229d86dab 100644
--- a/lib/trino-filesystem/pom.xml
+++ b/lib/trino-filesystem/pom.xml
@@ -5,18 +5,43 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-filesystem</artifactId>
-    <name>trino-filesystem</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <air.compiler.fail-warnings>true</air.compiler.fail-warnings>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry.semconv</groupId>
+            <artifactId>opentelemetry-semconv</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-memory-context</artifactId>
@@ -28,23 +53,30 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -56,5 +88,11 @@
             <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/FileEntry.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/FileEntry.java
index 397ea27d1bc1..bfbae5ecb6e6 100644
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/FileEntry.java
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/FileEntry.java
@@ -26,7 +26,7 @@
 import static java.util.Comparator.comparing;
 import static java.util.Objects.requireNonNull;
 
-public record FileEntry(String location, long length, Instant lastModified, Optional<List<Block>> blocks)
+public record FileEntry(Location location, long length, Instant lastModified, Optional<List<Block>> blocks)
 {
     public FileEntry
     {
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/Location.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/Location.java
new file mode 100644
index 000000000000..a30f57cc9f5e
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/Location.java
@@ -0,0 +1,312 @@
+/*
+ * Licensed 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 io.trino.filesystem;
+
+import com.google.common.base.Splitter;
+
+import java.io.File;
+import java.util.List;
+import java.util.Optional;
+import java.util.OptionalInt;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.Iterables.getLast;
+import static java.lang.Integer.parseInt;
+import static java.util.Objects.requireNonNull;
+import static java.util.function.Predicate.not;
+
+/**
+ * Location of a file or directory in a blob or hierarchical file system.
+ * The location uses the URI like format {@code scheme://[userInfo@]host[:port][/path]}, but does not
+ * follow the format rules of a URI or URL which support escapes and other special characters.
+ * <p>
+ * Alternatively, a location can be specified as {@code /path} for usage with legacy HDFS installations,
+ * or as {@code file:/path} for local file systems as returned by {@link File#toURI()}.
+ * <p>
+ * The API of this class is very limited, so blob storage locations can be used as well. Specifically,
+ * methods are provided to get the name of a file location, get the parent of a location, append a path
+ * to a location, and parse a location. This allows for the operations needed for analysing data in an
+ * object store where you need to create subdirectories, and get peers of a file. Specifically, walking
+ * up a path is discouraged as some blob locations have invalid inner path parts.
+ */
+public final class Location
+{
+    private static final Splitter SCHEME_SPLITTER = Splitter.on(":").limit(2);
+    private static final Splitter USER_INFO_SPLITTER = Splitter.on('@').limit(2);
+    private static final Splitter AUTHORITY_SPLITTER = Splitter.on('/').limit(2);
+    private static final Splitter HOST_AND_PORT_SPLITTER = Splitter.on(':').limit(2);
+
+    private final String location;
+    private final Optional<String> scheme;
+    private final Optional<String> userInfo;
+    private final Optional<String> host;
+    private final OptionalInt port;
+    private final String path;
+
+    public static Location of(String location)
+    {
+        requireNonNull(location, "location is null");
+        checkArgument(!location.isEmpty(), "location is empty");
+        checkArgument(!location.isBlank(), "location is blank");
+
+        // legacy HDFS location that is just a path
+        if (location.startsWith("/")) {
+            return new Location(location, Optional.empty(), Optional.empty(), Optional.empty(), OptionalInt.empty(), location.substring(1));
+        }
+
+        List<String> schemeSplit = SCHEME_SPLITTER.splitToList(location);
+        checkArgument(schemeSplit.size() == 2, "No scheme for file system location: %s", location);
+        String scheme = schemeSplit.get(0);
+
+        String afterScheme = schemeSplit.get(1);
+        if (afterScheme.startsWith("//")) {
+            // Locations with an authority must begin with a double slash
+            afterScheme = afterScheme.substring(2);
+
+            List<String> authoritySplit = AUTHORITY_SPLITTER.splitToList(afterScheme);
+            List<String> userInfoSplit = USER_INFO_SPLITTER.splitToList(authoritySplit.get(0));
+            Optional<String> userInfo = userInfoSplit.size() == 2 ? Optional.of(userInfoSplit.get(0)) : Optional.empty();
+            List<String> hostAndPortSplit = HOST_AND_PORT_SPLITTER.splitToList(getLast(userInfoSplit));
+
+            Optional<String> host = Optional.of(hostAndPortSplit.get(0)).filter(not(String::isEmpty));
+
+            OptionalInt port = OptionalInt.empty();
+            if (hostAndPortSplit.size() == 2) {
+                try {
+                    port = OptionalInt.of(parseInt(hostAndPortSplit.get(1)));
+                }
+                catch (NumberFormatException e) {
+                    throw new IllegalArgumentException("Invalid port in file system location: " + location, e);
+                }
+            }
+
+            checkArgument((userInfo.isEmpty() && host.isEmpty() && port.isEmpty()) || authoritySplit.size() == 2, "Path missing in file system location: %s", location);
+            String path = (authoritySplit.size() == 2) ? authoritySplit.get(1) : "";
+
+            return new Location(location, Optional.of(scheme), userInfo, host, port, path);
+        }
+
+        checkArgument(afterScheme.startsWith("/"), "Path must begin with a '/' when no authority is present");
+        return new Location(location, Optional.of(scheme), Optional.empty(), Optional.empty(), OptionalInt.empty(), afterScheme.substring(1));
+    }
+
+    private Location(String location, Optional<String> scheme, Optional<String> userInfo, Optional<String> host, OptionalInt port, String path)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.scheme = requireNonNull(scheme, "scheme is null");
+        this.userInfo = requireNonNull(userInfo, "userInfo is null");
+        this.host = requireNonNull(host, "host is null");
+        this.port = requireNonNull(port, "port is null");
+        this.path = requireNonNull(path, "path is null");
+        checkArgument(scheme.isEmpty() || !scheme.get().isEmpty(), "scheme value is empty");
+        checkArgument(host.isEmpty() || !host.get().isEmpty(), "host value is empty");
+    }
+
+    private Location withPath(String location, String path)
+    {
+        return new Location(location, scheme, userInfo, host, port, path);
+    }
+
+    /**
+     * Returns the scheme of the location, if present.
+     * If the scheme is present, the value will not be an empty string.
+     * Legacy HDFS paths do not have a scheme.
+     */
+    public Optional<String> scheme()
+    {
+        return scheme;
+    }
+
+    /**
+     * Returns the user info of the location, if present.
+     * The user info will be present if the location authority contains an at sign,
+     * but the value may be an empty string.
+     */
+    public Optional<String> userInfo()
+    {
+        return userInfo;
+    }
+
+    /**
+     * Returns the host of the location, if present.
+     * If the host is present, the value will not be an empty string.
+     */
+    public Optional<String> host()
+    {
+        return host;
+    }
+
+    public OptionalInt port()
+    {
+        return port;
+    }
+
+    /**
+     * Returns the path of the location. The path will not start with a slash, and might be empty.
+     */
+    public String path()
+    {
+        return path;
+    }
+
+    /**
+     * Returns the file name of the location.
+     * The location must be a valid file location.
+     * The file name is all characters after the last slash in the path.
+     *
+     * @throws IllegalStateException if the location is not a valid file location
+     */
+    public String fileName()
+    {
+        verifyValidFileLocation();
+        return path.substring(path.lastIndexOf('/') + 1);
+    }
+
+    /**
+     * Returns a new location with the same parent directory as the current location,
+     * but with the filename corresponding to the specified name.
+     * The location must be a valid file location.
+     */
+    public Location sibling(String name)
+    {
+        requireNonNull(name, "name is null");
+        checkArgument(!name.isEmpty(), "name is empty");
+        verifyValidFileLocation();
+
+        return this.withPath(location.substring(0, location.lastIndexOf('/') + 1) + name, path.substring(0, path.lastIndexOf('/') + 1) + name);
+    }
+
+    /**
+     * Creates a new location with all characters removed after the last slash in the path.
+     * This should only be used once, as recursive calls for blob paths may lead to incorrect results.
+     *
+     * @throws IllegalStateException if the location is not a valid file location
+     */
+    public Location parentDirectory()
+    {
+        // todo should this only be allowed for file locations?
+        verifyValidFileLocation();
+        checkState(!path.isEmpty() && !path.equals("/"), "root location does not have parent: %s", location);
+
+        int lastIndexOfSlash = path.lastIndexOf('/');
+        if (lastIndexOfSlash < 0) {
+            String newLocation = location.substring(0, location.length() - path.length() - 1);
+            newLocation += "/";
+            return withPath(newLocation, "");
+        }
+
+        String newPath = path.substring(0, lastIndexOfSlash);
+        String newLocation = location.substring(0, location.length() - (path.length() - newPath.length()));
+        return withPath(newLocation, newPath);
+    }
+
+    /**
+     * Creates a new location by appending the given path element to the current path.
+     * A slash will be added between the current path and the new path element if needed.
+     *
+     * @throws IllegalArgumentException if the new path element is empty or starts with a slash
+     */
+    public Location appendPath(String newPathElement)
+    {
+        checkArgument(!newPathElement.isEmpty(), "newPathElement is empty");
+        checkArgument(!newPathElement.startsWith("/"), "newPathElement starts with a slash: %s", newPathElement);
+
+        if (path.isEmpty()) {
+            return appendToEmptyPath(newPathElement);
+        }
+
+        if (!path.endsWith("/")) {
+            newPathElement = "/" + newPathElement;
+        }
+        return withPath(location + newPathElement, path + newPathElement);
+    }
+
+    Location removeOneTrailingSlash()
+    {
+        if (path.endsWith("/")) {
+            return withPath(location.substring(0, location.length() - 1), path.substring(0, path.length() - 1));
+        }
+        if (path.equals("") && location.endsWith("/")) {
+            return withPath(location.substring(0, location.length() - 1), "");
+        }
+        return this;
+    }
+
+    /**
+     * Creates a new location by appending the given suffix to the current path.
+     * Typical usage for this method is to append a file extension to a file name,
+     * but it may be used to append anything, including a slash.
+     * <p>
+     * Use {@link #appendPath(String)} instead of this method to append a path element.
+     */
+    public Location appendSuffix(String suffix)
+    {
+        if (path.isEmpty()) {
+            return appendToEmptyPath(suffix);
+        }
+
+        return withPath(location + suffix, path + suffix);
+    }
+
+    private Location appendToEmptyPath(String value)
+    {
+        checkState(path.isEmpty());
+
+        // empty path may or may not have a location that ends with a slash
+        boolean needSlash = !location.endsWith("/");
+
+        // slash is needed for locations with no host or user info that did not have a path
+        if (scheme.isPresent() && host.isEmpty() && userInfo.isEmpty() && !location.endsWith(":///")) {
+            needSlash = true;
+        }
+
+        return withPath(location + (needSlash ? "/" : "") + value, value);
+    }
+
+    /**
+     * Verifies the location is valid for a file reference.  Specifically, the path must not be empty and must not end with a slash.
+     *
+     * @throws IllegalStateException if the location is not a valid file location
+     */
+    public void verifyValidFileLocation()
+    {
+        // TODO: should this be IOException?
+        // file path must not be empty
+        checkState(!path.isEmpty() && !path.equals("/"), "File location must contain a path: %s", location);
+        // file path cannot end with a slash
+        checkState(!path.endsWith("/"), "File location cannot end with '/': %s", location);
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        return (o instanceof Location that) && location.equals(that.location);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return location.hashCode();
+    }
+
+    /**
+     * Return the original location string.
+     */
+    @Override
+    public String toString()
+    {
+        return location;
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/Locations.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/Locations.java
index 10048e544395..0e948aa54674 100644
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/Locations.java
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/Locations.java
@@ -13,19 +13,28 @@
  */
 package io.trino.filesystem;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 public final class Locations
 {
     private Locations() {}
 
+    /**
+     * @deprecated use {@link Location#appendPath(String)} instead
+     */
+    @Deprecated
     public static String appendPath(String location, String path)
     {
-        checkArgument(location.indexOf('?') < 0, "location contains a query string: %s", location);
-        checkArgument(location.indexOf('#') < 0, "location contains a fragment: %s", location);
         if (!location.endsWith("/")) {
             location += "/";
         }
         return location + path;
     }
+
+    /**
+     * Verifies whether the two provided directory location parameters point to the same actual location.
+     */
+    public static boolean areDirectoryLocationsEquivalent(Location leftLocation, Location rightLocation)
+    {
+        return leftLocation.equals(rightLocation) ||
+                leftLocation.removeOneTrailingSlash().equals(rightLocation.removeOneTrailingSlash());
+    }
 }
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoFileSystem.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoFileSystem.java
index 3da75b379ce3..bc4d79ddb40a 100644
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoFileSystem.java
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoFileSystem.java
@@ -15,31 +15,196 @@
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Optional;
+import java.util.Set;
 
+/**
+ * TrinoFileSystem is the main abstraction for Trino to interact with data in cloud-like storage
+ * systems. This replaces uses HDFS APIs in Trino.  This is not a full replacement of the HDFS, and
+ * the APIs present are limited to only what Trino needs. This API supports both hierarchical and
+ * blob storage systems, but they have slightly different behavior due to path resolution in
+ * hierarchical storage systems.
+ * <p>
+ * Hierarchical file systems have directories containing files and directories. HDFS and the OS local
+ * file system are examples of hierarchical file systems. The file path in a hierarchical file system
+ * contains an optional list of directory names separated by '/' followed by a file name. Hierarchical
+ * paths can contain relative directory references such as '.' or '..'. This means it is possible
+ * for the same file to be referenced by multiple paths.  Additionally, the path of a hierarchical
+ * file system can have restrictions on what elements are allowed.  For example, most hierarchical file
+ * systems do not allow empty directory names, so '//' would not be legal in a path.
+ * <p>
+ * Blob file systems use a simple key to reference data (blobs). The file system typically applies
+ * very few restrictions to the key, and generally allows keys that are illegal in hierarchical file
+ * systems. This flexibility can be a problem when accessing a blob file system through a hierarchical
+ * file system API, such as HDFS, as there can be blobs that cannot be referenced. To reduce these
+ * issues, it is recommended that the keys do not contain '/../', '/./', or '//'.
+ * <p>
+ * When performing file operations, the location path cannot be empty, and must not end with a slash
+ * or whitespace.
+ * <p>
+ * For directory operations, the location path can be empty, and can end with slash.  An empty path
+ * is a reference to the root of the file system.  For blob file systems, if the location does not
+ * end with a slash, one is appended, and this prefix is checked against all file locations.
+ */
+// NOTE: take care when adding to these APIs.  The intention is to have the minimal API surface area,
+// so it is easier to maintain existing implementations and add new file system implementations.
 public interface TrinoFileSystem
 {
-    TrinoInputFile newInputFile(String location);
+    /**
+     * Creates a TrinoInputFile which can be used to read the file data. The file location path
+     * cannot be empty, and must not end with a slash or whitespace.
+     *
+     * @throws IllegalArgumentException if location is not valid for this file system
+     */
+    TrinoInputFile newInputFile(Location location);
+
+    /**
+     * Creates a TrinoInputFile with a predeclared length which can be used to read the file data.
+     * The length will be returned from {@link TrinoInputFile#length()} and the actual file length
+     * will never be checked. The file location path cannot be empty, and must not end with a slash
+     * or whitespace.
+     *
+     * @throws IllegalArgumentException if location is not valid for this file system
+     */
+    TrinoInputFile newInputFile(Location location, long length);
+
+    /**
+     * Creates a TrinoOutputFile which can be used to create or overwrite the file. The file
+     * location path cannot be empty, and must not end with a slash or whitespace.
+     *
+     * @throws IllegalArgumentException if location is not valid for this file system
+     */
+    TrinoOutputFile newOutputFile(Location location);
+
+    /**
+     * Deletes the specified file. The file location path cannot be empty, and must not end with
+     * a slash or whitespace. If the file is a director, an exception is raised.
+     *
+     * @throws IllegalArgumentException if location is not valid for this file system
+     * @throws IOException if the file does not exist (optional) or was not deleted
+     */
+    void deleteFile(Location location)
+            throws IOException;
+
+    /**
+     * Delete specified files. This operation is <b>not</b> required to be atomic, so if an error
+     * occurs, all, some, or, none of the files may be deleted. This operation may be faster than simply
+     * looping over the locations as some file systems support batch delete operations natively.
+     *
+     * @throws IllegalArgumentException if location is not valid for this file system
+     * @throws IOException if a file does not exist (optional) or was not deleted
+     */
+    default void deleteFiles(Collection<Location> locations)
+            throws IOException
+    {
+        for (var location : locations) {
+            deleteFile(location);
+        }
+    }
 
-    TrinoInputFile newInputFile(String location, long length);
+    /**
+     * Deletes all files and directories within the specified directory recursively, and deletes
+     * the directory itself. If the location does not exist, this method is a noop. If the location
+     * does not have a path, all files and directories in the file system are deleted.
+     * <p>
+     * For hierarchical file systems (e.g. HDFS), if the path is not a directory, an exception is
+     * raised.
+     * <p>
+     * For blob file systems (e.g., S3), if the location does not end with a slash, one is appended,
+     * and all blobs that start with that prefix are deleted.
+     * <p>
+     * If this operation fails, some, none, or all of the directory contents may
+     * have been deleted.
+     *
+     * @param location the directory to delete
+     * @throws IllegalArgumentException if location is not valid for this file system
+     */
+    void deleteDirectory(Location location)
+            throws IOException;
 
-    TrinoOutputFile newOutputFile(String location);
+    /**
+     * Rename source to target without overwriting target.  This method is not required
+     * to be atomic, but it is required that if an error occurs, the source, target, or both
+     * must exist with the data from the source.  This operation may or may not preserve the
+     * last modified time.
+     *
+     * @throws IllegalArgumentException if either location is not valid for this file system
+     */
+    void renameFile(Location source, Location target)
+            throws IOException;
 
-    void deleteFile(String location)
+    /**
+     * Lists all files within the specified directory recursively. The location can be empty,
+     * listing all files in the file system, otherwise the location must end with a slash. If the
+     * location does not exist, an empty iterator is returned.
+     * <p>
+     * For hierarchical file systems, if the path is not a directory, an exception is
+     * raised.
+     * For hierarchical file systems, if the path does not reference an existing
+     * directory, an empty iterator is returned. For blob file systems, all blobs
+     * that start with the location are listed. In the rare case that a blob exists with the
+     * exact name of the prefix, it is not included in the results.
+     * <p>
+     * The returned FileEntry locations will start with the specified location exactly.
+     *
+     * @param location the directory to list
+     * @throws IllegalArgumentException if location is not valid for this file system
+     */
+    FileIterator listFiles(Location location)
             throws IOException;
 
     /**
-     * Delete files in batches, possibly non-atomically.
-     * If an error occurs, some files may have been deleted.
+     * Checks if a directory exists at the specified location. For all file system types,
+     * this returns <tt>true</tt> if the location is empty (the root of the file system)
+     * or if any files exist within the directory, as determined by {@link #listFiles(Location)}.
+     * Otherwise:
+     * <ul>
+     * <li>For hierarchical file systems, this returns <tt>true</tt> if the
+     *     location is an empty directory, else it returns <tt>false</tt>.
+     * <li>For non-hierarchical file systems, an <tt>Optional.empty()</tt> is returned,
+     *     indicating that the file system has no concept of an empty directory.
+     * </ul>
+     *
+     * @param location the location to check for a directory
+     * @throws IllegalArgumentException if the location is not valid for this file system
      */
-    void deleteFiles(Collection<String> locations)
+    Optional<Boolean> directoryExists(Location location)
             throws IOException;
 
-    void deleteDirectory(String location)
+    /**
+     * Creates the specified directory and any parent directories that do not exist.
+     * For hierarchical file systems, if the location already exists but is not a
+     * directory, or if the directory cannot be created, an exception is raised.
+     * This method does nothing for non-hierarchical file systems or if the directory
+     * already exists.
+     *
+     * @throws IllegalArgumentException if location is not valid for this file system
+     */
+    void createDirectory(Location location)
             throws IOException;
 
-    void renameFile(String source, String target)
+    /**
+     * Renames source to target. An exception is raised if the target already exists,
+     * or on non-hierarchical file systems.
+     *
+     * @throws IllegalArgumentException if location is not valid for this file system
+     */
+    void renameDirectory(Location source, Location target)
             throws IOException;
 
-    FileIterator listFiles(String location)
+    /**
+     * Lists all directories that are direct descendants of the specified directory.
+     * The location can be empty, which lists all directories at the root of the file system,
+     * otherwise the location otherwise the location must end with a slash.
+     * If the location does not exist, an empty set is returned.
+     * <p>
+     * For hierarchical file systems, if the path is not a directory, an exception is raised.
+     * For hierarchical file systems, if the path does not reference an existing directory,
+     * an empty iterator is returned. For blob file systems, all directories containing
+     * blobs that start with the location are listed.
+     *
+     * @throws IllegalArgumentException if location is not valid for this file system
+     */
+    Set<Location> listDirectories(Location location)
             throws IOException;
 }
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoInputFile.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoInputFile.java
index eaefaaccd664..2ec77045a9f8 100644
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoInputFile.java
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoInputFile.java
@@ -33,5 +33,5 @@ Instant lastModified()
     boolean exists()
             throws IOException;
 
-    String location();
+    Location location();
 }
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoInputStream.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoInputStream.java
index 7a9e6c462b3a..b47f4fb3f2ff 100644
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoInputStream.java
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoInputStream.java
@@ -27,6 +27,8 @@ public abstract long getPosition()
 
     /**
      * @param position the new position from the start of the file
+     * @throws IOException if the new position is negative, or an error occurs while seeking
+     * @throws java.io.EOFException if the new position is larger than the file size
      */
     public abstract void seek(long position)
             throws IOException;
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoOutputFile.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoOutputFile.java
index e14dd9244dc9..eea75c0291fb 100644
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoOutputFile.java
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/TrinoOutputFile.java
@@ -35,11 +35,20 @@ default OutputStream createOrOverwrite()
         return createOrOverwrite(newSimpleAggregatedMemoryContext());
     }
 
+    default OutputStream createExclusive()
+            throws IOException
+    {
+        return createExclusive(newSimpleAggregatedMemoryContext());
+    }
+
     OutputStream create(AggregatedMemoryContext memoryContext)
             throws IOException;
 
     OutputStream createOrOverwrite(AggregatedMemoryContext memoryContext)
             throws IOException;
 
-    String location();
+    OutputStream createExclusive(AggregatedMemoryContext memoryContext)
+            throws IOException;
+
+    Location location();
 }
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/FileTrinoInputStream.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/FileTrinoInputStream.java
deleted file mode 100644
index 9bb31e69a966..000000000000
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/FileTrinoInputStream.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed 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 io.trino.filesystem.local;
-
-import com.google.common.primitives.Ints;
-import io.trino.filesystem.TrinoInputStream;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
-class FileTrinoInputStream
-        extends TrinoInputStream
-{
-    private final RandomAccessFile input;
-
-    public FileTrinoInputStream(File file)
-            throws FileNotFoundException
-    {
-        this.input = new RandomAccessFile(file, "r");
-    }
-
-    @Override
-    public long getPosition()
-            throws IOException
-    {
-        return input.getFilePointer();
-    }
-
-    @Override
-    public void seek(long position)
-            throws IOException
-    {
-        input.seek(position);
-    }
-
-    @Override
-    public int read()
-            throws IOException
-    {
-        return input.read();
-    }
-
-    @Override
-    public int read(byte[] b)
-            throws IOException
-    {
-        return input.read(b);
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len)
-            throws IOException
-    {
-        return input.read(b, off, len);
-    }
-
-    @Override
-    public long skip(long n)
-            throws IOException
-    {
-        return input.skipBytes(Ints.saturatedCast(n));
-    }
-
-    @Override
-    public void close()
-            throws IOException
-    {
-        input.close();
-    }
-}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalFileIterator.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalFileIterator.java
new file mode 100644
index 000000000000..31de369d43ac
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalFileIterator.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed 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 io.trino.filesystem.local;
+
+import io.trino.filesystem.FileEntry;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Iterator;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.filesystem.local.LocalUtils.handleException;
+import static java.util.Collections.emptyIterator;
+import static java.util.Objects.requireNonNull;
+
+class LocalFileIterator
+        implements FileIterator
+{
+    private final Path rootPath;
+    private final Iterator<Path> iterator;
+
+    public LocalFileIterator(Location location, Path rootPath, Path path)
+            throws IOException
+    {
+        this.rootPath = requireNonNull(rootPath, "rootPath is null");
+        if (Files.isRegularFile(path)) {
+            throw new IOException("Location is a file: " + location);
+        }
+        if (!Files.isDirectory(path)) {
+            this.iterator = emptyIterator();
+        }
+        else {
+            try (Stream<Path> stream = Files.walk(path)) {
+                this.iterator = stream
+                        .filter(Files::isRegularFile)
+                        // materialize full list so stream can be closed
+                        .collect(toImmutableList())
+                        .iterator();
+            }
+            catch (IOException e) {
+                throw handleException(location, e);
+            }
+        }
+    }
+
+    @Override
+    public boolean hasNext()
+            throws IOException
+    {
+        return iterator.hasNext();
+    }
+
+    @Override
+    public FileEntry next()
+            throws IOException
+    {
+        Path path = iterator.next();
+        if (!path.startsWith(rootPath)) {
+            throw new IOException("entry is not inside of filesystem root");
+        }
+
+        return new FileEntry(
+                Location.of("local:///" + rootPath.relativize(path)),
+                Files.size(path),
+                Files.getLastModifiedTime(path).toInstant(),
+                Optional.empty());
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalFileSystem.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalFileSystem.java
new file mode 100644
index 000000000000..f96315bf86a8
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalFileSystem.java
@@ -0,0 +1,254 @@
+/*
+ * Licensed 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 io.trino.filesystem.local;
+
+import com.google.common.collect.ImmutableSet;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoOutputFile;
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.filesystem.local.LocalUtils.handleException;
+import static java.nio.file.LinkOption.NOFOLLOW_LINKS;
+
+/**
+ * A hierarchical file system for testing.
+ */
+public class LocalFileSystem
+        implements TrinoFileSystem
+{
+    private final Path rootPath;
+
+    public LocalFileSystem(Path rootPath)
+    {
+        this.rootPath = rootPath;
+        checkArgument(Files.isDirectory(rootPath), "root is not a directory");
+    }
+
+    @Override
+    public TrinoInputFile newInputFile(Location location)
+    {
+        return new LocalInputFile(location, toFilePath(location));
+    }
+
+    @Override
+    public TrinoInputFile newInputFile(Location location, long length)
+    {
+        return new LocalInputFile(location, toFilePath(location), length);
+    }
+
+    @Override
+    public TrinoOutputFile newOutputFile(Location location)
+    {
+        return new LocalOutputFile(location, toFilePath(location));
+    }
+
+    @Override
+    public void deleteFile(Location location)
+            throws IOException
+    {
+        Path filePath = toFilePath(location);
+        try {
+            Files.delete(filePath);
+        }
+        catch (IOException e) {
+            throw handleException(location, e);
+        }
+    }
+
+    @Override
+    public void deleteDirectory(Location location)
+            throws IOException
+    {
+        Path directoryPath = toDirectoryPath(location);
+        if (!Files.exists(directoryPath)) {
+            return;
+        }
+        if (!Files.isDirectory(directoryPath)) {
+            throw new IOException("Location is not a directory: " + location);
+        }
+
+        try {
+            Files.walkFileTree(
+                    directoryPath,
+                    new SimpleFileVisitor<>()
+                    {
+                        @Override
+                        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+                                throws IOException
+                        {
+                            Files.delete(file);
+                            return FileVisitResult.CONTINUE;
+                        }
+
+                        @Override
+                        public FileVisitResult postVisitDirectory(Path directory, IOException exception)
+                                throws IOException
+                        {
+                            if (exception != null) {
+                                throw exception;
+                            }
+                            // do not delete the root of this file system
+                            if (!directory.equals(rootPath)) {
+                                Files.delete(directory);
+                            }
+                            return FileVisitResult.CONTINUE;
+                        }
+                    });
+        }
+        catch (IOException e) {
+            throw handleException(location, e);
+        }
+    }
+
+    @Override
+    public void renameFile(Location source, Location target)
+            throws IOException
+    {
+        Path sourcePath = toFilePath(source);
+        Path targetPath = toFilePath(target);
+        try {
+            if (!Files.exists(sourcePath)) {
+                throw new IOException("Source does not exist: " + source);
+            }
+            if (!Files.isRegularFile(sourcePath)) {
+                throw new IOException("Source is not a file: " + source);
+            }
+
+            Files.createDirectories(targetPath.getParent());
+
+            // Do not specify atomic move, as unix overwrites when atomic is enabled
+            Files.move(sourcePath, targetPath);
+        }
+        catch (IOException e) {
+            throw new IOException("File rename from %s to %s failed: %s".formatted(source, target, e.getMessage()), e);
+        }
+    }
+
+    @Override
+    public FileIterator listFiles(Location location)
+            throws IOException
+    {
+        return new LocalFileIterator(location, rootPath, toDirectoryPath(location));
+    }
+
+    @Override
+    public Optional<Boolean> directoryExists(Location location)
+    {
+        return Optional.of(Files.isDirectory(toDirectoryPath(location)));
+    }
+
+    @Override
+    public void createDirectory(Location location)
+            throws IOException
+    {
+        validateLocalLocation(location);
+        try {
+            Files.createDirectories(toDirectoryPath(location));
+        }
+        catch (IOException e) {
+            throw new IOException("Failed to create directory: " + location, e);
+        }
+    }
+
+    @Override
+    public void renameDirectory(Location source, Location target)
+            throws IOException
+    {
+        Path sourcePath = toDirectoryPath(source);
+        Path targetPath = toDirectoryPath(target);
+        try {
+            if (!Files.exists(sourcePath)) {
+                throw new IOException("Source does not exist: " + source);
+            }
+            if (!Files.isDirectory(sourcePath)) {
+                throw new IOException("Source is not a directory: " + source);
+            }
+
+            Files.createDirectories(targetPath.getParent());
+
+            // Do not specify atomic move, as unix overwrites when atomic is enabled
+            Files.move(sourcePath, targetPath);
+        }
+        catch (IOException e) {
+            throw new IOException("Directory rename from %s to %s failed: %s".formatted(source, target, e.getMessage()), e);
+        }
+    }
+
+    @Override
+    public Set<Location> listDirectories(Location location)
+            throws IOException
+    {
+        Path path = toDirectoryPath(location);
+        if (Files.isRegularFile(path)) {
+            throw new IOException("Location is a file: " + location);
+        }
+        if (!Files.isDirectory(path)) {
+            return ImmutableSet.of();
+        }
+        try (Stream<Path> stream = Files.list(path)) {
+            return stream
+                    .filter(file -> Files.isDirectory(file, NOFOLLOW_LINKS))
+                    .map(file -> file.getFileName() + "/")
+                    .map(location::appendPath)
+                    .collect(toImmutableSet());
+        }
+    }
+
+    private Path toFilePath(Location location)
+    {
+        validateLocalLocation(location);
+        location.verifyValidFileLocation();
+
+        Path localPath = toPath(location);
+
+        // local file path can not be empty as this would create a file for the root entry
+        checkArgument(!localPath.equals(rootPath), "Local file location must contain a path: %s", localPath);
+        return localPath;
+    }
+
+    private Path toDirectoryPath(Location location)
+    {
+        validateLocalLocation(location);
+        return toPath(location);
+    }
+
+    private static void validateLocalLocation(Location location)
+    {
+        checkArgument(location.scheme().equals(Optional.of("local")), "Only 'local' scheme is supported: %s", location);
+        checkArgument(location.userInfo().isEmpty(), "Local location cannot contain user info: %s", location);
+        checkArgument(location.host().isEmpty(), "Local location cannot contain a host: %s", location);
+    }
+
+    private Path toPath(Location location)
+    {
+        // ensure path isn't something like '../../data'
+        Path localPath = rootPath.resolve(location.path()).normalize();
+        checkArgument(localPath.startsWith(rootPath), "Location references data outside of the root: %s", location);
+        return localPath;
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalFileSystemFactory.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalFileSystemFactory.java
new file mode 100644
index 000000000000..799ef7f332b7
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalFileSystemFactory.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed 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 io.trino.filesystem.local;
+
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.spi.security.ConnectorIdentity;
+
+import java.nio.file.Path;
+
+/**
+ * A hierarchical file system for testing.
+ */
+public class LocalFileSystemFactory
+        implements TrinoFileSystemFactory
+{
+    private final LocalFileSystem fileSystem;
+
+    public LocalFileSystemFactory(Path rootPath)
+    {
+        fileSystem = new LocalFileSystem(rootPath);
+    }
+
+    @Override
+    public TrinoFileSystem create(ConnectorIdentity identity)
+    {
+        return fileSystem;
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalInput.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalInput.java
index 6409681eb0b0..7d9d3a2a258e 100644
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalInput.java
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalInput.java
@@ -13,24 +13,31 @@
  */
 package io.trino.filesystem.local;
 
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoInput;
 
+import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+import static io.trino.filesystem.local.LocalUtils.handleException;
 import static java.lang.Math.min;
+import static java.util.Objects.checkFromIndexSize;
 import static java.util.Objects.requireNonNull;
 
 class LocalInput
         implements TrinoInput
 {
+    private final Location location;
     private final File file;
     private final RandomAccessFile input;
+    private boolean closed;
 
-    public LocalInput(File file)
+    public LocalInput(Location location, File file)
             throws IOException
     {
+        this.location = requireNonNull(location, "location is null");
         this.file = requireNonNull(file, "file is null");
         this.input = new RandomAccessFile(file, "r");
     }
@@ -39,23 +46,49 @@ public LocalInput(File file)
     public void readFully(long position, byte[] buffer, int bufferOffset, int bufferLength)
             throws IOException
     {
-        input.seek(position);
-        input.readFully(buffer, bufferOffset, bufferLength);
+        ensureOpen();
+        checkFromIndexSize(bufferOffset, bufferLength, buffer.length);
+        if (position < 0) {
+            throw new IOException("Negative seek offset");
+        }
+        if (position >= file.length()) {
+            throw new EOFException("Cannot read at %s. File size is %s: %s".formatted(position, file.length(), location));
+        }
+
+        try {
+            input.seek(position);
+            input.readFully(buffer, bufferOffset, bufferLength);
+        }
+        catch (IOException e) {
+            throw handleException(location, e);
+        }
     }
 
     @Override
     public int readTail(byte[] buffer, int bufferOffset, int bufferLength)
             throws IOException
     {
+        ensureOpen();
+        checkFromIndexSize(bufferOffset, bufferLength, buffer.length);
+
         int readSize = (int) min(file.length(), bufferLength);
         readFully(file.length() - readSize, buffer, bufferOffset, readSize);
         return readSize;
     }
 
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Output stream closed: " + location);
+        }
+    }
+
     @Override
     public void close()
             throws IOException
     {
+        closed = true;
         input.close();
     }
 
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalInputFile.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalInputFile.java
index 1deb68863941..29550549ea84 100644
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalInputFile.java
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalInputFile.java
@@ -13,70 +13,120 @@
  */
 package io.trino.filesystem.local;
 
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoInput;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.filesystem.TrinoInputStream;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.time.Instant;
+import java.util.Optional;
+import java.util.OptionalLong;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.filesystem.local.LocalUtils.handleException;
 import static java.util.Objects.requireNonNull;
 
 public class LocalInputFile
         implements TrinoInputFile
 {
-    private final File file;
+    private final Location location;
+    private final Path path;
+    private OptionalLong length = OptionalLong.empty();
+    private Optional<Instant> lastModified = Optional.empty();
+
+    public LocalInputFile(Location location, Path path)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.path = requireNonNull(path, "path is null");
+    }
+
+    public LocalInputFile(Location location, Path path, long length)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.path = requireNonNull(path, "path is null");
+        checkArgument(length >= 0, "length is negative");
+        this.length = OptionalLong.of(length);
+    }
 
     public LocalInputFile(File file)
     {
-        this.file = requireNonNull(file, "file is null");
+        this(Location.of(file.toURI().toString()), file.toPath());
     }
 
     @Override
     public TrinoInput newInput()
             throws IOException
     {
-        return new LocalInput(file);
+        try {
+            return new LocalInput(location, path.toFile());
+        }
+        catch (IOException e) {
+            throw handleException(location, e);
+        }
     }
 
     @Override
     public TrinoInputStream newStream()
             throws IOException
     {
-        return new FileTrinoInputStream(file);
+        try {
+            return new LocalInputStream(location, path.toFile());
+        }
+        catch (IOException e) {
+            throw handleException(location, e);
+        }
     }
 
     @Override
     public long length()
             throws IOException
     {
-        return file.length();
+        if (length.isEmpty()) {
+            try {
+                length = OptionalLong.of(Files.size(path));
+            }
+            catch (IOException e) {
+                throw handleException(location, e);
+            }
+        }
+        return length.getAsLong();
     }
 
     @Override
     public Instant lastModified()
             throws IOException
     {
-        return Instant.ofEpochMilli(file.lastModified());
+        if (lastModified.isEmpty()) {
+            try {
+                lastModified = Optional.of(Files.getLastModifiedTime(path).toInstant());
+            }
+            catch (IOException e) {
+                throw handleException(location, e);
+            }
+        }
+        return lastModified.get();
     }
 
     @Override
     public boolean exists()
             throws IOException
     {
-        return file.exists();
+        return Files.exists(path);
     }
 
     @Override
-    public String location()
+    public Location location()
     {
-        return file.getPath();
+        return location;
     }
 
     @Override
     public String toString()
     {
-        return location();
+        return location.toString();
     }
 }
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalInputStream.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalInputStream.java
new file mode 100644
index 000000000000..0107daaae5b0
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalInputStream.java
@@ -0,0 +1,160 @@
+/*
+ * Licensed 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 io.trino.filesystem.local;
+
+import com.google.common.primitives.Ints;
+import com.google.common.primitives.Longs;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInputStream;
+
+import java.io.BufferedInputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
+import static java.util.Objects.requireNonNull;
+
+class LocalInputStream
+        extends TrinoInputStream
+{
+    private final Location location;
+    private final File file;
+    private final long fileLength;
+
+    private InputStream input;
+    private long position;
+    private boolean closed;
+
+    public LocalInputStream(Location location, File file)
+            throws FileNotFoundException
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.file = requireNonNull(file, "file is null");
+        this.fileLength = file.length();
+        this.input = new BufferedInputStream(new FileInputStream(file), 4 * 1024);
+    }
+
+    @Override
+    public int available()
+            throws IOException
+    {
+        ensureOpen();
+        return Ints.saturatedCast(fileLength - position);
+    }
+
+    @Override
+    public long getPosition()
+    {
+        return position;
+    }
+
+    @Override
+    public void seek(long position)
+            throws IOException
+    {
+        ensureOpen();
+        if (position < 0) {
+            throw new IOException("Negative seek offset");
+        }
+        if (position > fileLength) {
+            throw new IOException("Cannot seek to %s. File size is %s: %s".formatted(position, fileLength, location));
+        }
+
+        // for negative seek, reopen the file
+        if (position < this.position) {
+            input.close();
+            // it is possible to seek backwards using the original file input stream, but this seems simpler
+            input = new BufferedInputStream(new FileInputStream(file), 4 * 1024);
+            this.position = 0;
+        }
+
+        while (position > this.position) {
+            long skip = input.skip(position - this.position);
+            if (skip < 0) {
+                throw new IOException("Skip returned a negative size");
+            }
+
+            if (skip > 0) {
+                this.position += skip;
+            }
+            else {
+                if (input.read() == -1) {
+                    // This should not happen unless the file size changed
+                    throw new EOFException();
+                }
+                this.position++;
+            }
+        }
+
+        if (this.position != position) {
+            throw new IOException("Seek to %s failed. Current position is %s: %s".formatted(position, this.position, location));
+        }
+    }
+
+    @Override
+    public int read()
+            throws IOException
+    {
+        ensureOpen();
+        int read = input.read();
+        if (read != -1) {
+            position++;
+        }
+        return read;
+    }
+
+    @Override
+    public int read(byte[] destination, int destinationIndex, int length)
+            throws IOException
+    {
+        ensureOpen();
+        int read = input.read(destination, destinationIndex, length);
+        if (read > 0) {
+            position += read;
+        }
+        return read;
+    }
+
+    @Override
+    public long skip(long length)
+            throws IOException
+    {
+        ensureOpen();
+
+        length = Longs.constrainToRange(length, 0, fileLength - position);
+        seek(position + length);
+        return length;
+    }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Output stream closed: " + location);
+        }
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        if (!closed) {
+            closed = true;
+            input.close();
+        }
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalOutputFile.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalOutputFile.java
new file mode 100644
index 000000000000..2af7daf0602d
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalOutputFile.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed 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 io.trino.filesystem.local;
+
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoOutputFile;
+import io.trino.memory.context.AggregatedMemoryContext;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+
+import static io.trino.filesystem.local.LocalUtils.handleException;
+import static java.util.Objects.requireNonNull;
+
+public class LocalOutputFile
+        implements TrinoOutputFile
+{
+    private final Location location;
+    private final Path path;
+
+    public LocalOutputFile(Location location, Path path)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.path = requireNonNull(path, "path is null");
+    }
+
+    public LocalOutputFile(File file)
+    {
+        this(Location.of(file.toURI().toString()), file.toPath());
+    }
+
+    @Override
+    public OutputStream create(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        try {
+            Files.createDirectories(path.getParent());
+            OutputStream stream = Files.newOutputStream(path, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE);
+            return new LocalOutputStream(location, stream);
+        }
+        catch (IOException e) {
+            throw handleException(location, e);
+        }
+    }
+
+    @Override
+    public OutputStream createOrOverwrite(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        try {
+            Files.createDirectories(path.getParent());
+            OutputStream stream = Files.newOutputStream(path);
+            return new LocalOutputStream(location, stream);
+        }
+        catch (IOException e) {
+            throw handleException(location, e);
+        }
+    }
+
+    @Override
+    public OutputStream createExclusive(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        return create(memoryContext);
+    }
+
+    @Override
+    public Location location()
+    {
+        return location;
+    }
+
+    @Override
+    public String toString()
+    {
+        return location.toString();
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalOutputStream.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalOutputStream.java
new file mode 100644
index 000000000000..11ba499c0f05
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalOutputStream.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed 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 io.trino.filesystem.local;
+
+import io.trino.filesystem.Location;
+
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import static io.trino.filesystem.local.LocalUtils.handleException;
+import static java.util.Objects.checkFromIndexSize;
+import static java.util.Objects.requireNonNull;
+
+class LocalOutputStream
+        extends OutputStream
+{
+    private final Location location;
+    private final OutputStream stream;
+    private boolean closed;
+
+    public LocalOutputStream(Location location, OutputStream stream)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.stream = new BufferedOutputStream(requireNonNull(stream, "stream is null"), 4 * 1024);
+    }
+
+    @Override
+    public void write(int b)
+            throws IOException
+    {
+        ensureOpen();
+        try {
+            stream.write(b);
+        }
+        catch (IOException e) {
+            throw handleException(location, e);
+        }
+    }
+
+    @Override
+    public void write(byte[] buffer, int offset, int length)
+            throws IOException
+    {
+        checkFromIndexSize(offset, length, buffer.length);
+
+        ensureOpen();
+        try {
+            stream.write(buffer, offset, length);
+        }
+        catch (IOException e) {
+            throw handleException(location, e);
+        }
+    }
+
+    @Override
+    public void flush()
+            throws IOException
+    {
+        ensureOpen();
+        try {
+            stream.flush();
+        }
+        catch (IOException e) {
+            throw handleException(location, e);
+        }
+    }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Output stream closed: " + location);
+        }
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        if (!closed) {
+            closed = true;
+            try {
+                stream.close();
+            }
+            catch (IOException e) {
+                throw handleException(location, e);
+            }
+        }
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalUtils.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalUtils.java
new file mode 100644
index 000000000000..3bf5edb140fb
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/local/LocalUtils.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed 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 io.trino.filesystem.local;
+
+import io.trino.filesystem.Location;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.NoSuchFileException;
+
+final class LocalUtils
+{
+    private LocalUtils() {}
+
+    static IOException handleException(Location location, IOException exception)
+            throws IOException
+    {
+        if (exception instanceof FileNotFoundException || exception instanceof NoSuchFileException) {
+            throw withCause(new FileNotFoundException(location.toString()), exception);
+        }
+        if (exception instanceof FileAlreadyExistsException) {
+            throw withCause(new FileAlreadyExistsException(location.toString()), exception);
+        }
+        throw new IOException(exception.getMessage() + ": " + location, exception);
+    }
+
+    private static <T extends Throwable> T withCause(T throwable, Throwable cause)
+    {
+        throwable.initCause(cause);
+        return throwable;
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryBlob.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryBlob.java
new file mode 100644
index 000000000000..9d90c5342eef
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryBlob.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed 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 io.trino.filesystem.memory;
+
+import io.airlift.slice.Slice;
+
+import java.time.Instant;
+
+import static java.util.Objects.requireNonNull;
+
+public record MemoryBlob(Slice data, Instant lastModified)
+{
+    public MemoryBlob(Slice data)
+    {
+        this(data, Instant.now());
+    }
+
+    public MemoryBlob
+    {
+        requireNonNull(data, "data is null");
+        requireNonNull(lastModified, "lastModified is null");
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryFileSystem.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryFileSystem.java
new file mode 100644
index 000000000000..303f93b79fc3
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryFileSystem.java
@@ -0,0 +1,225 @@
+/*
+ * Licensed 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 io.trino.filesystem.memory;
+
+import com.google.common.collect.ImmutableSet;
+import io.airlift.slice.Slice;
+import io.trino.filesystem.FileEntry;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoOutputFile;
+import io.trino.filesystem.memory.MemoryOutputFile.OutputBlob;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.FileAlreadyExistsException;
+import java.util.Iterator;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+/**
+ * A blob file system for testing.
+ */
+public class MemoryFileSystem
+        implements TrinoFileSystem
+{
+    private final ConcurrentMap<String, MemoryBlob> blobs = new ConcurrentHashMap<>();
+
+    boolean isEmpty()
+    {
+        return blobs.isEmpty();
+    }
+
+    @Override
+    public TrinoInputFile newInputFile(Location location)
+    {
+        String key = toBlobKey(location);
+        return new MemoryInputFile(location, () -> blobs.get(key), OptionalLong.empty());
+    }
+
+    @Override
+    public TrinoInputFile newInputFile(Location location, long length)
+    {
+        String key = toBlobKey(location);
+        return new MemoryInputFile(location, () -> blobs.get(key), OptionalLong.of(length));
+    }
+
+    @Override
+    public TrinoOutputFile newOutputFile(Location location)
+    {
+        String key = toBlobKey(location);
+        OutputBlob outputBlob = new OutputBlob()
+        {
+            @Override
+            public boolean exists()
+            {
+                return blobs.containsKey(key);
+            }
+
+            @Override
+            public void createBlob(Slice data)
+                    throws FileAlreadyExistsException
+            {
+                if (blobs.putIfAbsent(key, new MemoryBlob(data)) != null) {
+                    throw new FileAlreadyExistsException(location.toString());
+                }
+            }
+
+            @Override
+            public void overwriteBlob(Slice data)
+            {
+                blobs.put(key, new MemoryBlob(data));
+            }
+        };
+        return new MemoryOutputFile(location, outputBlob);
+    }
+
+    @Override
+    public void deleteFile(Location location)
+            throws IOException
+    {
+        if (blobs.remove(toBlobKey(location)) == null) {
+            throw new FileNotFoundException(location.toString());
+        }
+    }
+
+    @Override
+    public void deleteDirectory(Location location)
+            throws IOException
+    {
+        String prefix = toBlobPrefix(location);
+        blobs.keySet().removeIf(path -> path.startsWith(prefix));
+    }
+
+    @Override
+    public void renameFile(Location source, Location target)
+            throws IOException
+    {
+        String sourceKey = toBlobKey(source);
+        String targetKey = toBlobKey(target);
+
+        // File rename is not atomic and that is ok
+        MemoryBlob sourceData = blobs.get(sourceKey);
+        if (sourceData == null) {
+            throw new IOException("File rename from %s to %s failed: Source does not exist".formatted(source, target));
+        }
+        if (blobs.putIfAbsent(targetKey, sourceData) != null) {
+            throw new IOException("File rename from %s to %s failed: Target already exists".formatted(source, target));
+        }
+        blobs.remove(sourceKey, sourceData);
+    }
+
+    @Override
+    public FileIterator listFiles(Location location)
+            throws IOException
+    {
+        String prefix = toBlobPrefix(location);
+        Iterator<FileEntry> iterator = blobs.entrySet().stream()
+                .filter(entry -> entry.getKey().startsWith(prefix))
+                .map(entry -> new FileEntry(
+                        Location.of("memory:///" + entry.getKey()),
+                        entry.getValue().data().length(),
+                        entry.getValue().lastModified(),
+                        Optional.empty()))
+                .iterator();
+        return new FileIterator()
+        {
+            @Override
+            public boolean hasNext()
+            {
+                return iterator.hasNext();
+            }
+
+            @Override
+            public FileEntry next()
+            {
+                return iterator.next();
+            }
+        };
+    }
+
+    @Override
+    public Optional<Boolean> directoryExists(Location location)
+            throws IOException
+    {
+        validateMemoryLocation(location);
+        if (location.path().isEmpty() || listFiles(location).hasNext()) {
+            return Optional.of(true);
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    public void createDirectory(Location location)
+            throws IOException
+    {
+        validateMemoryLocation(location);
+        // memory file system does not have directories
+    }
+
+    @Override
+    public void renameDirectory(Location source, Location target)
+            throws IOException
+    {
+        throw new IOException("Memory file system does not support directory renames");
+    }
+
+    @Override
+    public Set<Location> listDirectories(Location location)
+            throws IOException
+    {
+        String prefix = toBlobPrefix(location);
+        ImmutableSet.Builder<Location> directories = ImmutableSet.builder();
+        for (String key : blobs.keySet()) {
+            if (key.startsWith(prefix)) {
+                int index = key.indexOf('/', prefix.length() + 1);
+                if (index >= 0) {
+                    directories.add(Location.of("memory:///" + key.substring(0, index + 1)));
+                }
+            }
+        }
+        return directories.build();
+    }
+
+    private static String toBlobKey(Location location)
+    {
+        validateMemoryLocation(location);
+        location.verifyValidFileLocation();
+        return location.path();
+    }
+
+    private static String toBlobPrefix(Location location)
+    {
+        validateMemoryLocation(location);
+        String directoryPath = location.path();
+        if (!directoryPath.isEmpty() && !directoryPath.endsWith("/")) {
+            directoryPath += "/";
+        }
+        return directoryPath;
+    }
+
+    private static void validateMemoryLocation(Location location)
+    {
+        checkArgument(location.scheme().equals(Optional.of("memory")), "Only 'memory' scheme is supported: %s", location);
+        checkArgument(location.userInfo().isEmpty(), "Memory location cannot contain user info: %s", location);
+        checkArgument(location.host().isEmpty(), "Memory location cannot contain a host: %s", location);
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryFileSystemFactory.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryFileSystemFactory.java
new file mode 100644
index 000000000000..3521be7f6b77
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryFileSystemFactory.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.filesystem.memory;
+
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.spi.security.ConnectorIdentity;
+
+/**
+ * A blob file system for testing.
+ */
+public class MemoryFileSystemFactory
+        implements TrinoFileSystemFactory
+{
+    @Override
+    public TrinoFileSystem create(ConnectorIdentity identity)
+    {
+        return new MemoryFileSystem();
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryInput.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryInput.java
index d16fadac9c1c..029a85b9beab 100644
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryInput.java
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryInput.java
@@ -14,19 +14,25 @@
 package io.trino.filesystem.memory;
 
 import io.airlift.slice.Slice;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoInput;
 
+import java.io.EOFException;
+import java.io.IOException;
+
 import static java.lang.Math.min;
 import static java.lang.Math.toIntExact;
+import static java.util.Objects.checkFromIndexSize;
 import static java.util.Objects.requireNonNull;
 
 class MemoryInput
         implements TrinoInput
 {
-    private final String location;
+    private final Location location;
     private final Slice data;
+    private boolean closed;
 
-    public MemoryInput(String location, Slice data)
+    public MemoryInput(Location location, Slice data)
     {
         this.location = requireNonNull(location, "location is null");
         this.data = requireNonNull(data, "data is null");
@@ -34,24 +40,49 @@ public MemoryInput(String location, Slice data)
 
     @Override
     public void readFully(long position, byte[] buffer, int bufferOffset, int bufferLength)
+            throws IOException
     {
+        ensureOpen();
+        checkFromIndexSize(bufferOffset, bufferLength, buffer.length);
+        if (position < 0) {
+            throw new IOException("Negative seek offset");
+        }
+        if (position + bufferLength > data.length()) {
+            throw new EOFException("Cannot read %s bytes at %s. File size is %s: %s".formatted(position, bufferLength, data.length(), location));
+        }
+
         data.getBytes(toIntExact(position), buffer, bufferOffset, bufferLength);
     }
 
     @Override
     public int readTail(byte[] buffer, int bufferOffset, int bufferLength)
+            throws IOException
     {
+        ensureOpen();
+        checkFromIndexSize(bufferOffset, bufferLength, buffer.length);
+
         int readSize = min(data.length(), bufferLength);
         readFully(data.length() - readSize, buffer, bufferOffset, readSize);
         return readSize;
     }
 
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Output stream closed: " + location);
+        }
+    }
+
     @Override
-    public void close() {}
+    public void close()
+    {
+        closed = true;
+    }
 
     @Override
     public String toString()
     {
-        return location;
+        return location.toString();
     }
 }
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryInputFile.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryInputFile.java
index 7285451741a4..5cf15a28bb0e 100644
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryInputFile.java
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryInputFile.java
@@ -14,64 +14,83 @@
 package io.trino.filesystem.memory;
 
 import io.airlift.slice.Slice;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoInput;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.filesystem.TrinoInputStream;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.time.Instant;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.function.Supplier;
 
 import static java.util.Objects.requireNonNull;
 
 public class MemoryInputFile
         implements TrinoInputFile
 {
-    private final String location;
-    private final Slice data;
+    private final Location location;
+    private final Supplier<MemoryBlob> dataSupplier;
+    private OptionalLong length;
+    private Optional<Instant> lastModified = Optional.empty();
 
-    public MemoryInputFile(String location, Slice data)
+    public MemoryInputFile(Location location, Slice data)
+    {
+        this(location, () -> new MemoryBlob(data), OptionalLong.of(data.length()));
+    }
+
+    public MemoryInputFile(Location location, Supplier<MemoryBlob> dataSupplier, OptionalLong length)
     {
         this.location = requireNonNull(location, "location is null");
-        this.data = requireNonNull(data, "data is null");
+        this.dataSupplier = requireNonNull(dataSupplier, "dataSupplier is null");
+        this.length = requireNonNull(length, "length is null");
     }
 
     @Override
     public TrinoInput newInput()
             throws IOException
     {
-        return new MemoryInput(location, data);
+        return new MemoryInput(location, getBlobRequired().data());
     }
 
     @Override
     public TrinoInputStream newStream()
             throws IOException
     {
-        return new MemoryTrinoInputStream(data);
+        return new MemoryInputStream(location, getBlobRequired().data());
     }
 
     @Override
     public long length()
             throws IOException
     {
-        return data.length();
+        if (length.isEmpty()) {
+            length = OptionalLong.of(getBlobRequired().data().length());
+        }
+        return length.getAsLong();
     }
 
     @Override
     public Instant lastModified()
             throws IOException
     {
-        return Instant.EPOCH;
+        if (lastModified.isEmpty()) {
+            lastModified = Optional.of(getBlobRequired().lastModified());
+        }
+        return lastModified.get();
     }
 
     @Override
     public boolean exists()
             throws IOException
     {
-        return true;
+        return dataSupplier.get() != null;
     }
 
     @Override
-    public String location()
+    public Location location()
     {
         return location;
     }
@@ -79,6 +98,16 @@ public String location()
     @Override
     public String toString()
     {
-        return location();
+        return location.toString();
+    }
+
+    private MemoryBlob getBlobRequired()
+            throws FileNotFoundException
+    {
+        MemoryBlob data = dataSupplier.get();
+        if (data == null) {
+            throw new FileNotFoundException(toString());
+        }
+        return data;
     }
 }
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryInputStream.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryInputStream.java
new file mode 100644
index 000000000000..573093a9a14a
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryInputStream.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed 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 io.trino.filesystem.memory;
+
+import io.airlift.slice.Slice;
+import io.airlift.slice.SliceInput;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInputStream;
+
+import java.io.IOException;
+
+import static java.util.Objects.requireNonNull;
+
+class MemoryInputStream
+        extends TrinoInputStream
+{
+    private final Location location;
+    private final SliceInput input;
+    private final int length;
+    private boolean closed;
+
+    public MemoryInputStream(Location location, Slice data)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.input = requireNonNull(data, "data is null").getInput();
+        this.length = data.length();
+    }
+
+    @Override
+    public int available()
+            throws IOException
+    {
+        ensureOpen();
+        return input.available();
+    }
+
+    @Override
+    public long getPosition()
+    {
+        return input.position();
+    }
+
+    @Override
+    public void seek(long position)
+            throws IOException
+    {
+        ensureOpen();
+        if (position < 0) {
+            throw new IOException("Negative seek offset");
+        }
+        if (position > length) {
+            throw new IOException("Cannot seek to %s. File size is %s: %s".formatted(position, length, location));
+        }
+        input.setPosition(position);
+    }
+
+    @Override
+    public int read()
+            throws IOException
+    {
+        ensureOpen();
+        return input.read();
+    }
+
+    @Override
+    public int read(byte[] destination, int destinationIndex, int length)
+            throws IOException
+    {
+        ensureOpen();
+        return input.read(destination, destinationIndex, length);
+    }
+
+    @Override
+    public long skip(long length)
+            throws IOException
+    {
+        ensureOpen();
+        return input.skip(length);
+    }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Output stream closed: " + location);
+        }
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        if (!closed) {
+            closed = true;
+            input.close();
+        }
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryOutputFile.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryOutputFile.java
new file mode 100644
index 000000000000..b937377f3ca4
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryOutputFile.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed 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 io.trino.filesystem.memory;
+
+import io.airlift.slice.Slice;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoOutputFile;
+import io.trino.memory.context.AggregatedMemoryContext;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.FileAlreadyExistsException;
+
+import static java.util.Objects.requireNonNull;
+
+class MemoryOutputFile
+        implements TrinoOutputFile
+{
+    public interface OutputBlob
+    {
+        boolean exists();
+
+        void createBlob(Slice data)
+                throws FileAlreadyExistsException;
+
+        void overwriteBlob(Slice data);
+    }
+
+    private final Location location;
+    private final OutputBlob outputBlob;
+
+    public MemoryOutputFile(Location location, OutputBlob outputBlob)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.outputBlob = requireNonNull(outputBlob, "outputBlob is null");
+    }
+
+    @Override
+    public OutputStream create(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        if (outputBlob.exists()) {
+            throw new FileAlreadyExistsException(toString());
+        }
+        return new MemoryOutputStream(location, outputBlob::createBlob);
+    }
+
+    @Override
+    public OutputStream createOrOverwrite(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        return new MemoryOutputStream(location, outputBlob::overwriteBlob);
+    }
+
+    @Override
+    public OutputStream createExclusive(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        return create(memoryContext);
+    }
+
+    @Override
+    public Location location()
+    {
+        return location;
+    }
+
+    @Override
+    public String toString()
+    {
+        return location.toString();
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryOutputStream.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryOutputStream.java
new file mode 100644
index 000000000000..1c6b13653fe5
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryOutputStream.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed 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 io.trino.filesystem.memory;
+
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
+import io.trino.filesystem.Location;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import static java.util.Objects.checkFromIndexSize;
+import static java.util.Objects.requireNonNull;
+
+public class MemoryOutputStream
+        extends OutputStream
+{
+    public interface OnStreamClose
+    {
+        void onClose(Slice data)
+                throws IOException;
+    }
+
+    private final Location location;
+    private final OnStreamClose onStreamClose;
+    private ByteArrayOutputStream stream = new ByteArrayOutputStream();
+
+    public MemoryOutputStream(Location location, OnStreamClose onStreamClose)
+    {
+        this.location = requireNonNull(location, "location is null");
+        this.onStreamClose = requireNonNull(onStreamClose, "onStreamClose is null");
+    }
+
+    @Override
+    public void write(int b)
+            throws IOException
+    {
+        ensureOpen();
+        stream.write(b);
+    }
+
+    @Override
+    public void write(byte[] buffer, int offset, int length)
+            throws IOException
+    {
+        checkFromIndexSize(offset, length, buffer.length);
+
+        ensureOpen();
+        stream.write(buffer, offset, length);
+    }
+
+    @Override
+    public void flush()
+            throws IOException
+    {
+        ensureOpen();
+    }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (stream == null) {
+            throw new IOException("Output stream closed: " + location);
+        }
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        if (stream != null) {
+            byte[] data = stream.toByteArray();
+            stream = null;
+            onStreamClose.onClose(Slices.wrappedBuffer(data));
+        }
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryTrinoInputStream.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryTrinoInputStream.java
deleted file mode 100644
index 56ade34e1685..000000000000
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/memory/MemoryTrinoInputStream.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed 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 io.trino.filesystem.memory;
-
-import io.airlift.slice.Slice;
-import io.airlift.slice.SliceInput;
-import io.trino.filesystem.TrinoInputStream;
-
-import java.io.IOException;
-
-public class MemoryTrinoInputStream
-        extends TrinoInputStream
-{
-    private final SliceInput input;
-
-    public MemoryTrinoInputStream(Slice data)
-    {
-        input = data.getInput();
-    }
-
-    @Override
-    public long getPosition()
-    {
-        return input.position();
-    }
-
-    @Override
-    public void seek(long position)
-    {
-        input.setPosition(position);
-    }
-
-    @Override
-    public int read()
-            throws IOException
-    {
-        return input.read();
-    }
-
-    @Override
-    public int read(byte[] destination, int destinationIndex, int length)
-    {
-        return input.read(destination, destinationIndex, length);
-    }
-
-    @Override
-    public long skip(long length)
-    {
-        return input.skip(length);
-    }
-}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/FileSystemAttributes.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/FileSystemAttributes.java
new file mode 100644
index 000000000000..bb8fddf09ccb
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/FileSystemAttributes.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed 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 io.trino.filesystem.tracing;
+
+import io.opentelemetry.api.common.AttributeKey;
+
+import static io.opentelemetry.api.common.AttributeKey.longKey;
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
+
+public final class FileSystemAttributes
+{
+    private FileSystemAttributes() {}
+
+    public static final AttributeKey<String> FILE_LOCATION = stringKey("trino.file.location");
+    public static final AttributeKey<Long> FILE_SIZE = longKey("trino.file.size");
+    public static final AttributeKey<Long> FILE_LOCATION_COUNT = longKey("trino.file.location_count");
+    public static final AttributeKey<Long> FILE_READ_SIZE = longKey("trino.file.read_size");
+    public static final AttributeKey<Long> FILE_READ_POSITION = longKey("trino.file.read_position");
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/Tracing.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/Tracing.java
new file mode 100644
index 000000000000..3c9237206a20
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/Tracing.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed 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 io.trino.filesystem.tracing;
+
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.semconv.SemanticAttributes;
+
+import java.util.Optional;
+
+final class Tracing
+{
+    private Tracing() {}
+
+    public static <T> Attributes attribute(AttributeKey<T> key, Optional<T> optionalValue)
+    {
+        return optionalValue.map(value -> Attributes.of(key, value))
+                .orElseGet(Attributes::empty);
+    }
+
+    public static <E extends Exception> void withTracing(Span span, CheckedRunnable<E> runnable)
+            throws E
+    {
+        withTracing(span, () -> {
+            runnable.run();
+            return null;
+        });
+    }
+
+    public static <T, E extends Exception> T withTracing(Span span, CheckedSupplier<T, E> supplier)
+            throws E
+    {
+        try (var ignored = span.makeCurrent()) {
+            return supplier.get();
+        }
+        catch (Throwable t) {
+            span.setStatus(StatusCode.ERROR, t.getMessage());
+            span.recordException(t, Attributes.of(SemanticAttributes.EXCEPTION_ESCAPED, true));
+            throw t;
+        }
+        finally {
+            span.end();
+        }
+    }
+
+    public interface CheckedRunnable<E extends Exception>
+    {
+        void run()
+                throws E;
+    }
+
+    public interface CheckedSupplier<T, E extends Exception>
+    {
+        T get()
+                throws E;
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingFileSystem.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingFileSystem.java
new file mode 100644
index 000000000000..2e0c694d0552
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingFileSystem.java
@@ -0,0 +1,151 @@
+/*
+ * Licensed 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 io.trino.filesystem.tracing;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoOutputFile;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Set;
+
+import static io.trino.filesystem.tracing.Tracing.withTracing;
+import static java.util.Objects.requireNonNull;
+
+final class TracingFileSystem
+        implements TrinoFileSystem
+{
+    private final Tracer tracer;
+    private final TrinoFileSystem delegate;
+
+    public TracingFileSystem(Tracer tracer, TrinoFileSystem delegate)
+    {
+        this.tracer = requireNonNull(tracer, "tracer is null");
+        this.delegate = requireNonNull(delegate, "delegate is null");
+    }
+
+    @Override
+    public TrinoInputFile newInputFile(Location location)
+    {
+        return new TracingInputFile(tracer, delegate.newInputFile(location), Optional.empty());
+    }
+
+    @Override
+    public TrinoInputFile newInputFile(Location location, long length)
+    {
+        return new TracingInputFile(tracer, delegate.newInputFile(location, length), Optional.of(length));
+    }
+
+    @Override
+    public TrinoOutputFile newOutputFile(Location location)
+    {
+        return new TracingOutputFile(tracer, delegate.newOutputFile(location));
+    }
+
+    @Override
+    public void deleteFile(Location location)
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("FileSystem.deleteFile")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, location.toString())
+                .startSpan();
+        withTracing(span, () -> delegate.deleteFile(location));
+    }
+
+    @Override
+    public void deleteFiles(Collection<Location> locations)
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("FileSystem.deleteFiles")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION_COUNT, (long) locations.size())
+                .startSpan();
+        withTracing(span, () -> delegate.deleteFiles(locations));
+    }
+
+    @Override
+    public void deleteDirectory(Location location)
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("FileSystem.deleteDirectory")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, location.toString())
+                .startSpan();
+        withTracing(span, () -> delegate.deleteDirectory(location));
+    }
+
+    @Override
+    public void renameFile(Location source, Location target)
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("FileSystem.renameFile")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, source.toString())
+                .startSpan();
+        withTracing(span, () -> delegate.renameFile(source, target));
+    }
+
+    @Override
+    public FileIterator listFiles(Location location)
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("FileSystem.listFiles")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, location.toString())
+                .startSpan();
+        return withTracing(span, () -> delegate.listFiles(location));
+    }
+
+    @Override
+    public Optional<Boolean> directoryExists(Location location)
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("FileSystem.directoryExists")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, location.toString())
+                .startSpan();
+        return withTracing(span, () -> delegate.directoryExists(location));
+    }
+
+    @Override
+    public void createDirectory(Location location)
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("FileSystem.createDirectory")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, location.toString())
+                .startSpan();
+        withTracing(span, () -> delegate.createDirectory(location));
+    }
+
+    @Override
+    public void renameDirectory(Location source, Location target)
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("FileSystem.renameDirectory")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, source.toString())
+                .startSpan();
+        withTracing(span, () -> delegate.renameDirectory(source, target));
+    }
+
+    @Override
+    public Set<Location> listDirectories(Location location)
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("FileSystem.listDirectories")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, location.toString())
+                .startSpan();
+        return withTracing(span, () -> delegate.listDirectories(location));
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingFileSystemFactory.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingFileSystemFactory.java
new file mode 100644
index 000000000000..a7fe3b3a001f
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingFileSystemFactory.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed 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 io.trino.filesystem.tracing;
+
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.security.ConnectorIdentity;
+
+import static java.util.Objects.requireNonNull;
+
+public final class TracingFileSystemFactory
+        implements TrinoFileSystemFactory
+{
+    private final Tracer tracer;
+    private final TrinoFileSystemFactory delegate;
+
+    public TracingFileSystemFactory(Tracer tracer, TrinoFileSystemFactory delegate)
+    {
+        this.tracer = requireNonNull(tracer, "tracer is null");
+        this.delegate = requireNonNull(delegate, "delegate is null");
+    }
+
+    @Override
+    public TrinoFileSystem create(ConnectorIdentity identity)
+    {
+        return new TracingFileSystem(tracer, delegate.create(identity));
+    }
+
+    @Override
+    public TrinoFileSystem create(ConnectorSession session)
+    {
+        return new TracingFileSystem(tracer, delegate.create(session));
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingInput.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingInput.java
new file mode 100644
index 000000000000..dac17b1ac126
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingInput.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed 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 io.trino.filesystem.tracing;
+
+import io.airlift.slice.Slice;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInput;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import static io.trino.filesystem.tracing.Tracing.attribute;
+import static io.trino.filesystem.tracing.Tracing.withTracing;
+import static java.util.Objects.requireNonNull;
+
+final class TracingInput
+        implements TrinoInput
+{
+    private final Tracer tracer;
+    private final TrinoInput delegate;
+    private final Location location;
+    private final Optional<Long> fileLength;
+
+    public TracingInput(Tracer tracer, TrinoInput delegate, Location location, Optional<Long> fileLength)
+    {
+        this.tracer = requireNonNull(tracer, "tracer is null");
+        this.delegate = requireNonNull(delegate, "delegate is null");
+        this.location = requireNonNull(location, "location is null");
+        this.fileLength = requireNonNull(fileLength, "fileLength is null");
+    }
+
+    @Override
+    public void readFully(long position, byte[] buffer, int bufferOffset, int bufferLength)
+            throws IOException
+    {
+        Span span = spanBuilder("Input.readFully", bufferLength)
+                .setAttribute(FileSystemAttributes.FILE_READ_POSITION, position)
+                .startSpan();
+        withTracing(span, () -> delegate.readFully(position, buffer, bufferOffset, bufferLength));
+    }
+
+    @Override
+    public int readTail(byte[] buffer, int bufferOffset, int bufferLength)
+            throws IOException
+    {
+        Span span = spanBuilder("Input.readTail", bufferLength)
+                .startSpan();
+        return withTracing(span, () -> delegate.readTail(buffer, bufferOffset, bufferLength));
+    }
+
+    @Override
+    public Slice readFully(long position, int length)
+            throws IOException
+    {
+        Span span = spanBuilder("Input.readFully", length)
+                .setAttribute(FileSystemAttributes.FILE_READ_POSITION, position)
+                .startSpan();
+        return withTracing(span, () -> delegate.readFully(position, length));
+    }
+
+    @Override
+    public Slice readTail(int length)
+            throws IOException
+    {
+        Span span = spanBuilder("Input.readTail", length)
+                .startSpan();
+        return withTracing(span, () -> delegate.readTail(length));
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        delegate.close();
+    }
+
+    @Override
+    public String toString()
+    {
+        return location.toString();
+    }
+
+    private SpanBuilder spanBuilder(String name, long readLength)
+    {
+        return tracer.spanBuilder(name)
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, toString())
+                .setAllAttributes(attribute(FileSystemAttributes.FILE_SIZE, fileLength))
+                .setAttribute(FileSystemAttributes.FILE_READ_SIZE, readLength);
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingInputFile.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingInputFile.java
new file mode 100644
index 000000000000..9e9581082903
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingInputFile.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed 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 io.trino.filesystem.tracing;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInput;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoInputStream;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.util.Optional;
+
+import static io.trino.filesystem.tracing.Tracing.attribute;
+import static io.trino.filesystem.tracing.Tracing.withTracing;
+import static java.util.Objects.requireNonNull;
+
+final class TracingInputFile
+        implements TrinoInputFile
+{
+    private final Tracer tracer;
+    private final TrinoInputFile delegate;
+    private final Optional<Long> length;
+
+    public TracingInputFile(Tracer tracer, TrinoInputFile delegate, Optional<Long> length)
+    {
+        this.tracer = requireNonNull(tracer, "tracer is null");
+        this.delegate = requireNonNull(delegate, "delegate is null");
+        this.length = requireNonNull(length, "length is null");
+    }
+
+    @Override
+    public TrinoInput newInput()
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("InputFile.newInput")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, toString())
+                .setAllAttributes(attribute(FileSystemAttributes.FILE_SIZE, length))
+                .startSpan();
+        return withTracing(span, () -> new TracingInput(tracer, delegate.newInput(), location(), length));
+    }
+
+    @Override
+    public TrinoInputStream newStream()
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("InputFile.newStream")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, toString())
+                .setAllAttributes(attribute(FileSystemAttributes.FILE_SIZE, length))
+                .startSpan();
+        return withTracing(span, delegate::newStream);
+    }
+
+    @Override
+    public long length()
+            throws IOException
+    {
+        // skip tracing if length is cached, but delegate anyway
+        if (length.isPresent()) {
+            return delegate.length();
+        }
+
+        Span span = tracer.spanBuilder("InputFile.length")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, toString())
+                .startSpan();
+        return withTracing(span, delegate::length);
+    }
+
+    @Override
+    public Instant lastModified()
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("InputFile.lastModified")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, toString())
+                .startSpan();
+        return withTracing(span, delegate::lastModified);
+    }
+
+    @Override
+    public boolean exists()
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("InputFile.exists")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, toString())
+                .startSpan();
+        return withTracing(span, delegate::exists);
+    }
+
+    @Override
+    public Location location()
+    {
+        return delegate.location();
+    }
+
+    @Override
+    public String toString()
+    {
+        return location().toString();
+    }
+}
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingOutputFile.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingOutputFile.java
new file mode 100644
index 000000000000..de0123b21b2a
--- /dev/null
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/TracingOutputFile.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed 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 io.trino.filesystem.tracing;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoOutputFile;
+import io.trino.memory.context.AggregatedMemoryContext;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import static io.trino.filesystem.tracing.Tracing.withTracing;
+import static java.util.Objects.requireNonNull;
+
+final class TracingOutputFile
+        implements TrinoOutputFile
+{
+    private final Tracer tracer;
+    private final TrinoOutputFile delegate;
+
+    public TracingOutputFile(Tracer tracer, TrinoOutputFile delegate)
+    {
+        this.tracer = requireNonNull(tracer, "tracer is null");
+        this.delegate = requireNonNull(delegate, "delete is null");
+    }
+
+    @Override
+    public OutputStream create()
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("OutputFile.create")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, toString())
+                .startSpan();
+        return withTracing(span, () -> delegate.create());
+    }
+
+    @Override
+    public OutputStream createOrOverwrite()
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("OutputFile.createOrOverwrite")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, toString())
+                .startSpan();
+        return withTracing(span, () -> delegate.createOrOverwrite());
+    }
+
+    @Override
+    public OutputStream createExclusive()
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("OutputFile.createExclusive")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, toString())
+                .startSpan();
+        return withTracing(span, () -> delegate.createExclusive());
+    }
+
+    @Override
+    public OutputStream create(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("OutputFile.create")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, toString())
+                .startSpan();
+        return withTracing(span, () -> delegate.create(memoryContext));
+    }
+
+    @Override
+    public OutputStream createOrOverwrite(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("OutputFile.createOrOverwrite")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, toString())
+                .startSpan();
+        return withTracing(span, () -> delegate.createOrOverwrite(memoryContext));
+    }
+
+    @Override
+    public OutputStream createExclusive(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        Span span = tracer.spanBuilder("OutputFile.createExclusive")
+                .setAttribute(FileSystemAttributes.FILE_LOCATION, toString())
+                .startSpan();
+        return withTracing(span, () -> delegate.createExclusive(memoryContext));
+    }
+
+    @Override
+    public Location location()
+    {
+        return delegate.location();
+    }
+
+    @Override
+    public String toString()
+    {
+        return location().toString();
+    }
+}
diff --git a/lib/trino-filesystem/src/test/java/io/trino/filesystem/AbstractTestTrinoFileSystem.java b/lib/trino-filesystem/src/test/java/io/trino/filesystem/AbstractTestTrinoFileSystem.java
new file mode 100644
index 000000000000..3fd8d6b3911d
--- /dev/null
+++ b/lib/trino-filesystem/src/test/java/io/trino/filesystem/AbstractTestTrinoFileSystem.java
@@ -0,0 +1,1224 @@
+/*
+ * Licensed 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 io.trino.filesystem;
+
+import com.google.common.collect.Ordering;
+import com.google.common.io.ByteStreams;
+import com.google.common.io.Closer;
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+import java.io.Closeable;
+import java.io.EOFException;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+import java.nio.file.FileAlreadyExistsException;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+
+import static java.lang.Math.min;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+@TestInstance(Lifecycle.PER_CLASS)
+public abstract class AbstractTestTrinoFileSystem
+{
+    protected static final String TEST_BLOB_CONTENT_PREFIX = "test blob content for ";
+    private static final int MEGABYTE = 1024 * 1024;
+
+    protected abstract boolean isHierarchical();
+
+    protected abstract TrinoFileSystem getFileSystem();
+
+    protected abstract Location getRootLocation();
+
+    protected abstract void verifyFileSystemIsEmpty();
+
+    protected boolean supportsCreateExclusive()
+    {
+        return true;
+    }
+
+    protected boolean supportsRenameFile()
+    {
+        return true;
+    }
+
+    protected boolean deleteFileFailsIfNotExists()
+    {
+        return true;
+    }
+
+    protected boolean normalizesListFilesResult()
+    {
+        return false;
+    }
+
+    protected boolean seekPastEndOfFileFails()
+    {
+        return true;
+    }
+
+    protected Location createLocation(String path)
+    {
+        if (path.isEmpty()) {
+            return getRootLocation();
+        }
+        return getRootLocation().appendPath(path);
+    }
+
+    @BeforeEach
+    void beforeEach()
+    {
+        verifyFileSystemIsEmpty();
+    }
+
+    @Test
+    void testInputFileMetadata()
+            throws IOException
+    {
+        // an input file cannot be created at the root of the file system
+        assertThatThrownBy(() -> getFileSystem().newInputFile(getRootLocation()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(getRootLocation().toString());
+        assertThatThrownBy(() -> getFileSystem().newInputFile(Location.of(getRootLocation() + "/")))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(getRootLocation().toString() + "/");
+        // an input file location cannot end with a slash
+        assertThatThrownBy(() -> getFileSystem().newInputFile(createLocation("foo/")))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(createLocation("foo/").toString());
+
+        try (TempBlob tempBlob = randomBlobLocation("inputFileMetadata")) {
+            TrinoInputFile inputFile = getFileSystem().newInputFile(tempBlob.location());
+            assertThat(inputFile.location()).isEqualTo(tempBlob.location());
+            assertThat(inputFile.exists()).isFalse();
+
+            // getting length or modified time of non-existent file is an error
+            assertThatThrownBy(inputFile::length)
+                    .isInstanceOf(FileNotFoundException.class)
+                    .hasMessageContaining(tempBlob.location().toString());
+            assertThatThrownBy(inputFile::lastModified)
+                    .isInstanceOf(FileNotFoundException.class)
+                    .hasMessageContaining(tempBlob.location().toString());
+
+            tempBlob.createOrOverwrite("123456");
+
+            assertThat(inputFile.length()).isEqualTo(6);
+            Instant lastModified = inputFile.lastModified();
+            assertThat(lastModified).isEqualTo(tempBlob.inputFile().lastModified());
+
+            // delete file and verify that exists check is not cached
+            tempBlob.close();
+            assertThat(inputFile.exists()).isFalse();
+            // input file caches metadata, so results will be unchanged after delete
+            assertThat(inputFile.length()).isEqualTo(6);
+            assertThat(inputFile.lastModified()).isEqualTo(lastModified);
+        }
+    }
+
+    @Test
+    void testInputFileWithLengthMetadata()
+            throws IOException
+    {
+        // an input file cannot be created at the root of the file system
+        assertThatThrownBy(() -> getFileSystem().newInputFile(getRootLocation(), 22))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(getRootLocation().toString());
+        assertThatThrownBy(() -> getFileSystem().newInputFile(Location.of(getRootLocation() + "/"), 22))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(getRootLocation() + "/");
+        // an input file location cannot end with a slash
+        assertThatThrownBy(() -> getFileSystem().newInputFile(createLocation("foo/"), 22))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(createLocation("foo/").toString());
+
+        try (TempBlob tempBlob = randomBlobLocation("inputFileWithLengthMetadata")) {
+            TrinoInputFile inputFile = getFileSystem().newInputFile(tempBlob.location(), 22);
+            assertThat(inputFile.exists()).isFalse();
+
+            // getting length for non-existent file returns pre-declared length
+            assertThat(inputFile.length()).isEqualTo(22);
+            // modified time of non-existent file is an error
+            assertThatThrownBy(inputFile::lastModified)
+                    .isInstanceOf(FileNotFoundException.class)
+                    .hasMessageContaining(tempBlob.location().toString());
+            // double-check the length did not change in call above
+            assertThat(inputFile.length()).isEqualTo(22);
+
+            tempBlob.createOrOverwrite("123456");
+
+            // length always returns the pre-declared length
+            assertThat(inputFile.length()).isEqualTo(22);
+            // modified time works
+            Instant lastModified = inputFile.lastModified();
+            assertThat(lastModified).isEqualTo(tempBlob.inputFile().lastModified());
+            // double-check the length did not change when metadata was loaded
+            assertThat(inputFile.length()).isEqualTo(22);
+
+            // delete file and verify that exists check is not cached
+            tempBlob.close();
+            assertThat(inputFile.exists()).isFalse();
+            // input file caches metadata, so results will be unchanged after delete
+            assertThat(inputFile.length()).isEqualTo(22);
+            assertThat(inputFile.lastModified()).isEqualTo(lastModified);
+        }
+    }
+
+    @Test
+    public void testInputFile()
+            throws IOException
+    {
+        try (TempBlob tempBlob = randomBlobLocation("inputStream")) {
+            // creating an input file for a non-existent file succeeds
+            TrinoInputFile inputFile = getFileSystem().newInputFile(tempBlob.location());
+
+            // reading a non-existent file is an error
+            assertThatThrownBy(
+                    () -> {
+                        try (TrinoInputStream inputStream = inputFile.newStream()) {
+                            inputStream.readAllBytes();
+                        }
+                    })
+                    .isInstanceOf(FileNotFoundException.class)
+                    .hasMessageContaining(tempBlob.location().toString());
+            assertThatThrownBy(
+                    () -> {
+                        try (TrinoInput input = inputFile.newInput()) {
+                            input.readFully(0, 10);
+                        }
+                    })
+                    .isInstanceOf(FileNotFoundException.class)
+                    .hasMessageContaining(tempBlob.location().toString());
+            assertThatThrownBy(
+                    () -> {
+                        try (TrinoInput input = inputFile.newInput()) {
+                            input.readTail(10);
+                        }
+                    })
+                    .isInstanceOf(FileNotFoundException.class)
+                    .hasMessageContaining(tempBlob.location().toString());
+
+            // write a 16 MB file
+            try (OutputStream outputStream = tempBlob.outputFile().create()) {
+                byte[] bytes = new byte[4];
+                Slice slice = Slices.wrappedBuffer(bytes);
+                for (int i = 0; i < 4 * MEGABYTE; i++) {
+                    slice.setInt(0, i);
+                    outputStream.write(bytes);
+                }
+            }
+
+            int fileSize = 16 * MEGABYTE;
+            assertThat(inputFile.exists()).isTrue();
+            assertThat(inputFile.length()).isEqualTo(fileSize);
+
+            try (TrinoInputStream inputStream = inputFile.newStream()) {
+                byte[] bytes = new byte[4];
+                Slice slice = Slices.wrappedBuffer(bytes);
+
+                // read int at a time
+                for (int intPosition = 0; intPosition < 4 * MEGABYTE; intPosition++) {
+                    assertThat(inputStream.getPosition()).isEqualTo(intPosition * 4L);
+
+                    int size = inputStream.readNBytes(bytes, 0, bytes.length);
+                    assertThat(size).isEqualTo(4);
+                    assertThat(slice.getInt(0)).isEqualTo(intPosition);
+                    assertThat(inputStream.getPosition()).isEqualTo((intPosition * 4) + size);
+                }
+                assertThat(inputStream.getPosition()).isEqualTo(fileSize);
+                assertThat(inputStream.read()).isLessThan(0);
+                assertThat(inputStream.read(bytes)).isLessThan(0);
+                if (seekPastEndOfFileFails()) {
+                    assertThat(inputStream.skip(10)).isEqualTo(0);
+                }
+                else {
+                    assertThat(inputStream.skip(10)).isEqualTo(10L);
+                }
+
+                // seek 4 MB in and read byte at a time
+                inputStream.seek(4 * MEGABYTE);
+                for (int intPosition = MEGABYTE; intPosition < 4 * MEGABYTE; intPosition++) {
+                    // write i into bytes, for validation below
+                    slice.setInt(0, intPosition);
+                    for (byte b : bytes) {
+                        int value = inputStream.read();
+                        assertThat(value).isGreaterThanOrEqualTo(0);
+                        assertThat((byte) value).isEqualTo(b);
+                    }
+                }
+                assertThat(inputStream.getPosition()).isEqualTo(fileSize);
+                assertThat(inputStream.read()).isLessThan(0);
+                assertThat(inputStream.read(bytes)).isLessThan(0);
+                if (seekPastEndOfFileFails()) {
+                    assertThat(inputStream.skip(10)).isEqualTo(0);
+                }
+                else {
+                    assertThat(inputStream.skip(10)).isEqualTo(10L);
+                }
+
+                // seek 1MB at a time
+                for (int i = 0; i < 16; i++) {
+                    int expectedPosition = i * MEGABYTE;
+                    inputStream.seek(expectedPosition);
+                    assertThat(inputStream.getPosition()).isEqualTo(expectedPosition);
+
+                    int size = inputStream.readNBytes(bytes, 0, bytes.length);
+                    assertThat(size).isEqualTo(4);
+                    assertThat(slice.getInt(0)).isEqualTo(expectedPosition / 4);
+                }
+
+                // skip 1MB at a time
+                inputStream.seek(0);
+                long expectedPosition = 0;
+                for (int i = 0; i < 15; i++) {
+                    long skipSize = inputStream.skip(MEGABYTE);
+                    assertThat(skipSize).isEqualTo(MEGABYTE);
+                    expectedPosition += skipSize;
+                    assertThat(inputStream.getPosition()).isEqualTo(expectedPosition);
+
+                    int size = inputStream.readNBytes(bytes, 0, bytes.length);
+                    assertThat(size).isEqualTo(4);
+                    assertThat(slice.getInt(0)).isEqualTo(expectedPosition / 4);
+                    expectedPosition += size;
+                }
+                if (seekPastEndOfFileFails()) {
+                    long skipSize = inputStream.skip(MEGABYTE);
+                    assertThat(skipSize).isEqualTo(fileSize - expectedPosition);
+                    assertThat(inputStream.getPosition()).isEqualTo(fileSize);
+                }
+
+                // skip N bytes
+                inputStream.seek(0);
+                expectedPosition = 0;
+                for (int i = 1; i <= 11; i++) {
+                    int size = min((MEGABYTE / 4) * i, MEGABYTE * 2);
+                    inputStream.skipNBytes(size);
+                    expectedPosition += size;
+                    assertThat(inputStream.getPosition()).isEqualTo(expectedPosition);
+
+                    size = inputStream.readNBytes(bytes, 0, bytes.length);
+                    assertThat(size).isEqualTo(4);
+                    assertThat(slice.getInt(0)).isEqualTo(expectedPosition / 4);
+                    expectedPosition += size;
+                }
+                inputStream.skipNBytes(fileSize - expectedPosition);
+                assertThat(inputStream.getPosition()).isEqualTo(fileSize);
+
+                if (seekPastEndOfFileFails()) {
+                    // skip beyond the end of the file is not allowed
+                    inputStream.seek(expectedPosition);
+                    assertThat(expectedPosition + MEGABYTE).isGreaterThan(fileSize);
+                    assertThatThrownBy(() -> inputStream.skipNBytes(MEGABYTE))
+                            .isInstanceOf(EOFException.class);
+                }
+
+                inputStream.seek(fileSize);
+                if (seekPastEndOfFileFails()) {
+                    assertThatThrownBy(() -> inputStream.skipNBytes(1))
+                            .isInstanceOf(EOFException.class);
+                }
+
+                inputStream.seek(fileSize);
+                if (seekPastEndOfFileFails()) {
+                    assertThat(inputStream.skip(1)).isEqualTo(0);
+                }
+                else {
+                    assertThat(inputStream.skip(1)).isEqualTo(1L);
+                }
+
+                // seek beyond the end of the file, is not allowed
+                long currentPosition = fileSize - 500;
+                inputStream.seek(currentPosition);
+                assertThat(inputStream.read()).isGreaterThanOrEqualTo(0);
+                currentPosition++;
+                if (seekPastEndOfFileFails()) {
+                    assertThatThrownBy(() -> inputStream.seek(fileSize + 100))
+                            .isInstanceOf(IOException.class)
+                            .hasMessageContaining(tempBlob.location().toString());
+                    assertThat(inputStream.getPosition()).isEqualTo(currentPosition);
+                    assertThat(inputStream.read()).isGreaterThanOrEqualTo(0);
+                    assertThat(inputStream.getPosition()).isEqualTo(currentPosition + 1);
+                }
+                else {
+                    inputStream.seek(fileSize + 100);
+                    assertThat(inputStream.getPosition()).isEqualTo(fileSize + 100);
+                    assertThat(inputStream.read()).isEqualTo(-1);
+                    assertThat(inputStream.readNBytes(50)).isEmpty();
+                    assertThat(inputStream.getPosition()).isEqualTo(fileSize + 100);
+                }
+
+                // verify all the methods throw after close
+                inputStream.close();
+                assertThatThrownBy(inputStream::available)
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+                assertThatThrownBy(() -> inputStream.seek(0))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+                assertThatThrownBy(inputStream::read)
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+                assertThatThrownBy(() -> inputStream.read(new byte[10]))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+                assertThatThrownBy(() -> inputStream.read(new byte[10], 2, 3))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+            }
+
+            try (TrinoInput trinoInput = inputFile.newInput()) {
+                byte[] bytes = new byte[4 * 10];
+                Slice slice = Slices.wrappedBuffer(bytes);
+
+                // positioned read
+                trinoInput.readFully(0, bytes, 0, bytes.length);
+                for (int i = 0; i < 10; i++) {
+                    assertThat(slice.getInt(i * 4)).isEqualTo(i);
+                }
+                assertThat(trinoInput.readFully(0, bytes.length)).isEqualTo(Slices.wrappedBuffer(bytes));
+
+                trinoInput.readFully(0, bytes, 2, bytes.length - 2);
+                for (int i = 0; i < 9; i++) {
+                    assertThat(slice.getInt(2 + i * 4)).isEqualTo(i);
+                }
+
+                trinoInput.readFully(MEGABYTE, bytes, 0, bytes.length);
+                for (int i = 0; i < 10; i++) {
+                    assertThat(slice.getInt(i * 4)).isEqualTo(i + MEGABYTE / 4);
+                }
+                assertThat(trinoInput.readFully(MEGABYTE, bytes.length)).isEqualTo(Slices.wrappedBuffer(bytes));
+                assertThatThrownBy(() -> trinoInput.readFully(fileSize - bytes.length + 1, bytes, 0, bytes.length))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+
+                // tail read
+                trinoInput.readTail(bytes, 0, bytes.length);
+                int totalPositions = 16 * MEGABYTE / 4;
+                for (int i = 0; i < 10; i++) {
+                    assertThat(slice.getInt(i * 4)).isEqualTo(totalPositions - 10 + i);
+                }
+
+                assertThat(trinoInput.readTail(bytes.length)).isEqualTo(Slices.wrappedBuffer(bytes));
+
+                trinoInput.readTail(bytes, 2, bytes.length - 2);
+                for (int i = 0; i < 9; i++) {
+                    assertThat(slice.getInt(4 + i * 4)).isEqualTo(totalPositions - 9 + i);
+                }
+
+                // verify all the methods throw after close
+                trinoInput.close();
+                assertThatThrownBy(() -> trinoInput.readFully(0, 10))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+                assertThatThrownBy(() -> trinoInput.readFully(0, bytes, 0, 10))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+                assertThatThrownBy(() -> trinoInput.readTail(10))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+                assertThatThrownBy(() -> trinoInput.readTail(bytes, 0, 10))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+            }
+        }
+    }
+
+    @Test
+    void testOutputFile()
+            throws IOException
+    {
+        // an output file cannot be created at the root of the file system
+        assertThatThrownBy(() -> getFileSystem().newOutputFile(getRootLocation()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(getRootLocation().toString());
+        assertThatThrownBy(() -> getFileSystem().newOutputFile(Location.of(getRootLocation() + "/")))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(getRootLocation() + "/");
+        // an output file location cannot end with a slash
+        assertThatThrownBy(() -> getFileSystem().newOutputFile(createLocation("foo/")))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(createLocation("foo/").toString());
+
+        try (TempBlob tempBlob = randomBlobLocation("outputFile")) {
+            TrinoOutputFile outputFile = getFileSystem().newOutputFile(tempBlob.location());
+            assertThat(outputFile.location()).isEqualTo(tempBlob.location());
+            assertThat(tempBlob.exists()).isFalse();
+
+            // create file and write data
+            try (OutputStream outputStream = outputFile.create()) {
+                outputStream.write("initial".getBytes(UTF_8));
+            }
+
+            if (supportsCreateExclusive()) {
+                // re-create without overwrite is an error
+                assertThatThrownBy(outputFile::create)
+                        .isInstanceOf(FileAlreadyExistsException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+
+                // verify nothing changed
+                assertThat(tempBlob.read()).isEqualTo("initial");
+
+                // re-create exclusive is an error
+                assertThatThrownBy(outputFile::createExclusive)
+                        .isInstanceOf(FileAlreadyExistsException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+
+                // verify nothing changed
+                assertThat(tempBlob.read()).isEqualTo("initial");
+            }
+            else {
+                // re-create without overwrite succeeds
+                try (OutputStream outputStream = outputFile.create()) {
+                    outputStream.write("replaced".getBytes(UTF_8));
+                }
+
+                // verify contents changed
+                assertThat(tempBlob.read()).isEqualTo("replaced");
+
+                // create exclusive is an error
+                assertThatThrownBy(outputFile::createExclusive)
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining("does not support exclusive create");
+            }
+
+            // overwrite file
+            try (OutputStream outputStream = outputFile.createOrOverwrite()) {
+                outputStream.write("overwrite".getBytes(UTF_8));
+            }
+
+            // verify file is different
+            assertThat(tempBlob.read()).isEqualTo("overwrite");
+        }
+    }
+
+    @Test
+    void testOutputStreamByteAtATime()
+            throws IOException
+    {
+        try (TempBlob tempBlob = randomBlobLocation("inputStream")) {
+            try (OutputStream outputStream = tempBlob.outputFile().create()) {
+                for (int i = 0; i < MEGABYTE; i++) {
+                    outputStream.write(i);
+                    if (i % 1024 == 0) {
+                        outputStream.flush();
+                    }
+                }
+                outputStream.close();
+
+                // verify all the methods throw after close
+                assertThatThrownBy(() -> outputStream.write(42))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+                assertThatThrownBy(() -> outputStream.write(new byte[10]))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+                assertThatThrownBy(() -> outputStream.write(new byte[10], 1, 3))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+                assertThatThrownBy(outputStream::flush)
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+            }
+
+            try (TrinoInputStream inputStream = tempBlob.inputFile().newStream()) {
+                for (int i = 0; i < MEGABYTE; i++) {
+                    int value = inputStream.read();
+                    assertThat(value).isGreaterThanOrEqualTo(0);
+                    assertThat((byte) value).isEqualTo((byte) i);
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testPaths()
+            throws IOException
+    {
+        if (isHierarchical()) {
+            testPathHierarchical();
+        }
+        else {
+            testPathBlob();
+        }
+    }
+
+    protected void testPathHierarchical()
+            throws IOException
+    {
+        // file outside of root is not allowed
+        // the check is over the entire statement, because some file system delay path checks until the data is uploaded
+        assertThatThrownBy(() -> getFileSystem().newOutputFile(createLocation("../file")).createOrOverwrite().close())
+                .isInstanceOfAny(IOException.class, IllegalArgumentException.class)
+                .hasMessageContaining(createLocation("../file").toString());
+
+        try (TempBlob absolute = new TempBlob(createLocation("b"))) {
+            try (TempBlob alias = new TempBlob(createLocation("a/../b"))) {
+                absolute.createOrOverwrite(TEST_BLOB_CONTENT_PREFIX + absolute.location().toString());
+                assertThat(alias.exists()).isTrue();
+                assertThat(absolute.exists()).isTrue();
+
+                assertThat(alias.read()).isEqualTo(TEST_BLOB_CONTENT_PREFIX + absolute.location().toString());
+
+                assertThat(listPath("")).containsExactly(absolute.location());
+
+                getFileSystem().deleteFile(alias.location());
+                assertThat(alias.exists()).isFalse();
+                assertThat(absolute.exists()).isFalse();
+            }
+        }
+    }
+
+    protected void testPathBlob()
+            throws IOException
+    {
+        try (TempBlob tempBlob = new TempBlob(createLocation("test/.././/file"))) {
+            TrinoInputFile inputFile = getFileSystem().newInputFile(tempBlob.location());
+            assertThat(inputFile.location()).isEqualTo(tempBlob.location());
+            assertThat(inputFile.exists()).isFalse();
+
+            tempBlob.createOrOverwrite(TEST_BLOB_CONTENT_PREFIX + tempBlob.location().toString());
+            assertThat(inputFile.length()).isEqualTo(TEST_BLOB_CONTENT_PREFIX.length() + tempBlob.location().toString().length());
+            assertThat(tempBlob.read()).isEqualTo(TEST_BLOB_CONTENT_PREFIX + tempBlob.location().toString());
+
+            if (!normalizesListFilesResult()) {
+                assertThat(listPath("test/..")).containsExactly(tempBlob.location());
+            }
+
+            if (supportsRenameFile()) {
+                getFileSystem().renameFile(tempBlob.location(), createLocation("file"));
+                assertThat(inputFile.exists()).isFalse();
+                assertThat(readLocation(createLocation("file"))).isEqualTo(TEST_BLOB_CONTENT_PREFIX + tempBlob.location().toString());
+
+                getFileSystem().renameFile(createLocation("file"), tempBlob.location());
+                assertThat(inputFile.exists()).isTrue();
+                assertThat(tempBlob.read()).isEqualTo(TEST_BLOB_CONTENT_PREFIX + tempBlob.location().toString());
+            }
+
+            getFileSystem().deleteFile(tempBlob.location());
+            assertThat(inputFile.exists()).isFalse();
+        }
+    }
+
+    @Test
+    void testDeleteFile()
+            throws IOException
+    {
+        // delete file location cannot be the root of the file system
+        assertThatThrownBy(() -> getFileSystem().deleteFile(getRootLocation()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(getRootLocation().toString());
+        assertThatThrownBy(() -> getFileSystem().deleteFile(Location.of(getRootLocation() + "/")))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(getRootLocation() + "/");
+        // delete file location cannot end with a slash
+        assertThatThrownBy(() -> getFileSystem().deleteFile(createLocation("foo/")))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(createLocation("foo/").toString());
+
+        try (TempBlob tempBlob = randomBlobLocation("delete")) {
+            if (deleteFileFailsIfNotExists()) {
+                // deleting a non-existent file is an error
+                assertThatThrownBy(() -> getFileSystem().deleteFile(tempBlob.location()))
+                        .isInstanceOf(FileNotFoundException.class)
+                        .hasMessageContaining(tempBlob.location().toString());
+            }
+            else {
+                // deleting a non-existent file is a no-op
+                getFileSystem().deleteFile(tempBlob.location());
+            }
+
+            tempBlob.createOrOverwrite("delete me");
+
+            getFileSystem().deleteFile(tempBlob.location());
+            assertThat(tempBlob.exists()).isFalse();
+        }
+    }
+
+    @Test
+    void testDeleteFiles()
+            throws IOException
+    {
+        try (Closer closer = Closer.create()) {
+            Set<Location> locations = createTestDirectoryStructure(closer, isHierarchical());
+
+            getFileSystem().deleteFiles(locations);
+            for (Location location : locations) {
+                assertThat(getFileSystem().newInputFile(location).exists()).isFalse();
+            }
+        }
+    }
+
+    @Test
+    public void testDeleteDirectory()
+            throws IOException
+    {
+        testDeleteDirectory(isHierarchical());
+    }
+
+    protected void testDeleteDirectory(boolean hierarchicalNamingConstraints)
+            throws IOException
+    {
+        // for safety make sure the file system is empty before deleting directories
+        verifyFileSystemIsEmpty();
+
+        try (Closer closer = Closer.create()) {
+            Set<Location> locations = createTestDirectoryStructure(closer, hierarchicalNamingConstraints);
+
+            // for safety make sure the verification code is functioning
+            assertThatThrownBy(this::verifyFileSystemIsEmpty)
+                    .isInstanceOf(Throwable.class);
+
+            // delete directory on a file is a noop
+            getFileSystem().deleteDirectory(createLocation("unknown"));
+            for (Location location : locations) {
+                assertThat(getFileSystem().newInputFile(location).exists()).isTrue();
+            }
+
+            if (isHierarchical()) {
+                // delete directory cannot be called on a file
+                assertThatThrownBy(() -> getFileSystem().deleteDirectory(createLocation("level0-file0")))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(createLocation("level0-file0").toString());
+            }
+
+            getFileSystem().deleteDirectory(createLocation("level0"));
+            Location deletedLocationPrefix = createLocation("level0/");
+            for (Location location : Ordering.usingToString().sortedCopy(locations)) {
+                assertThat(getFileSystem().newInputFile(location).exists()).as("%s exists", location)
+                        .isEqualTo(!location.toString().startsWith(deletedLocationPrefix.toString()));
+            }
+
+            getFileSystem().deleteDirectory(getRootLocation());
+            for (Location location : locations) {
+                assertThat(getFileSystem().newInputFile(location).exists()).isFalse();
+            }
+        }
+    }
+
+    @Test
+    void testRenameFile()
+            throws IOException
+    {
+        if (!supportsRenameFile()) {
+            try (TempBlob sourceBlob = randomBlobLocation("renameSource");
+                    TempBlob targetBlob = randomBlobLocation("renameTarget")) {
+                sourceBlob.createOrOverwrite("data");
+                assertThatThrownBy(() -> getFileSystem().renameFile(sourceBlob.location(), targetBlob.location()))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining("does not support renames");
+            }
+            return;
+        }
+
+        // rename file locations cannot be the root of the file system
+        assertThatThrownBy(() -> getFileSystem().renameFile(getRootLocation(), createLocation("file")))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(getRootLocation().toString());
+        assertThatThrownBy(() -> getFileSystem().renameFile(createLocation("file"), getRootLocation()))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(getRootLocation().toString());
+        assertThatThrownBy(() -> getFileSystem().renameFile(Location.of(getRootLocation() + "/"), createLocation("file")))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(getRootLocation() + "/");
+        assertThatThrownBy(() -> getFileSystem().renameFile(createLocation("file"), Location.of(getRootLocation() + "/")))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(getRootLocation() + "/");
+        // rename file locations cannot end with a slash
+        assertThatThrownBy(() -> getFileSystem().renameFile(createLocation("foo/"), createLocation("file")))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(createLocation("foo/").toString());
+        assertThatThrownBy(() -> getFileSystem().renameFile(createLocation("file"), createLocation("foo/")))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(createLocation("foo/").toString());
+
+        // todo rename to existing file name
+        try (TempBlob sourceBlob = randomBlobLocation("renameSource");
+                TempBlob targetBlob = randomBlobLocation("renameTarget")) {
+            // renaming a non-existent file is an error
+            assertThatThrownBy(() -> getFileSystem().renameFile(sourceBlob.location(), targetBlob.location()))
+                    .isInstanceOf(IOException.class)
+                    .hasMessageContaining(sourceBlob.location().toString())
+                    .hasMessageContaining(targetBlob.location().toString());
+
+            // create target directory first
+            getFileSystem().createDirectory(targetBlob.location().parentDirectory());
+
+            // rename
+            sourceBlob.createOrOverwrite("data");
+            getFileSystem().renameFile(sourceBlob.location(), targetBlob.location());
+            assertThat(sourceBlob.exists()).isFalse();
+            assertThat(targetBlob.exists()).isTrue();
+            assertThat(targetBlob.read()).isEqualTo("data");
+
+            // rename over existing should fail
+            sourceBlob.createOrOverwrite("new data");
+            assertThatThrownBy(() -> getFileSystem().renameFile(sourceBlob.location(), targetBlob.location()))
+                    .isInstanceOf(IOException.class)
+                    .hasMessageContaining(sourceBlob.location().toString())
+                    .hasMessageContaining(targetBlob.location().toString());
+            assertThat(sourceBlob.exists()).isTrue();
+            assertThat(targetBlob.exists()).isTrue();
+            assertThat(sourceBlob.read()).isEqualTo("new data");
+            assertThat(targetBlob.read()).isEqualTo("data");
+
+            if (isHierarchical()) {
+                // todo rename to existing directory name should fail
+                // todo rename to existing alias
+                try (Closer closer = Closer.create()) {
+                    // rename of directory is not allowed
+                    createBlob(closer, "a/b");
+                    assertThatThrownBy(() -> getFileSystem().renameFile(createLocation("a"), createLocation("b")))
+                            .isInstanceOf(IOException.class);
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testListFiles()
+            throws IOException
+    {
+        testListFiles(isHierarchical());
+    }
+
+    protected void testListFiles(boolean hierarchicalNamingConstraints)
+            throws IOException
+    {
+        try (Closer closer = Closer.create()) {
+            Set<Location> locations = createTestDirectoryStructure(closer, hierarchicalNamingConstraints);
+
+            assertThat(listPath("")).containsExactlyInAnyOrderElementsOf(locations);
+
+            assertThat(listPath("level0")).containsExactlyInAnyOrderElementsOf(locations.stream()
+                    .filter(location -> location.toString().startsWith(createLocation("level0/").toString()))
+                    .toList());
+            assertThat(listPath("level0/")).containsExactlyInAnyOrderElementsOf(locations.stream()
+                    .filter(location -> location.toString().startsWith(createLocation("level0/").toString()))
+                    .toList());
+
+            assertThat(listPath("level0/level1/")).containsExactlyInAnyOrderElementsOf(locations.stream()
+                    .filter(location -> location.toString().startsWith(createLocation("level0/level1/").toString()))
+                    .toList());
+            assertThat(listPath("level0/level1")).containsExactlyInAnyOrderElementsOf(locations.stream()
+                    .filter(location -> location.toString().startsWith(createLocation("level0/level1/").toString()))
+                    .toList());
+
+            assertThat(listPath("level0/level1/level2/")).containsExactlyInAnyOrderElementsOf(locations.stream()
+                    .filter(location -> location.toString().startsWith(createLocation("level0/level1/level2/").toString()))
+                    .toList());
+            assertThat(listPath("level0/level1/level2")).containsExactlyInAnyOrderElementsOf(locations.stream()
+                    .filter(location -> location.toString().startsWith(createLocation("level0/level1/level2/").toString()))
+                    .toList());
+
+            assertThat(listPath("level0/level1/level2/level3")).isEmpty();
+            assertThat(listPath("level0/level1/level2/level3/")).isEmpty();
+
+            assertThat(listPath("unknown/")).isEmpty();
+
+            if (isHierarchical()) {
+                assertThatThrownBy(() -> listPath("level0-file0"))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(createLocation("level0-file0").toString());
+            }
+            else {
+                assertThat(listPath("level0-file0")).isEmpty();
+            }
+
+            if (!hierarchicalNamingConstraints && !normalizesListFilesResult()) {
+                // this lists a path in a directory with an empty name
+                assertThat(listPath("/")).isEmpty();
+            }
+        }
+    }
+
+    @Test
+    public void testDirectoryExists()
+            throws IOException
+    {
+        try (Closer closer = Closer.create()) {
+            String directoryName = "testDirectoryExistsDir";
+            String fileName = "file.csv";
+
+            assertThat(listPath("")).isEmpty();
+            assertThat(getFileSystem().directoryExists(getRootLocation())).contains(true);
+
+            if (isHierarchical()) {
+                assertThat(getFileSystem().directoryExists(createLocation(directoryName))).contains(false);
+                createBlob(closer, createLocation(directoryName).appendPath(fileName).path());
+                assertThat(getFileSystem().directoryExists(createLocation(directoryName))).contains(true);
+                assertThat(getFileSystem().directoryExists(createLocation(UUID.randomUUID().toString()))).contains(false);
+                assertThat(getFileSystem().directoryExists(createLocation(directoryName).appendPath(fileName))).contains(false);
+            }
+            else {
+                assertThat(getFileSystem().directoryExists(createLocation(directoryName))).isEmpty();
+                createBlob(closer, createLocation(directoryName).appendPath(fileName).path());
+                assertThat(getFileSystem().directoryExists(createLocation(directoryName))).contains(true);
+                assertThat(getFileSystem().directoryExists(createLocation(UUID.randomUUID().toString()))).isEmpty();
+                assertThat(getFileSystem().directoryExists(createLocation(directoryName).appendPath(fileName))).isEmpty();
+            }
+        }
+    }
+
+    @Test
+    public void testFileWithTrailingWhitespace()
+            throws IOException
+    {
+        try (Closer closer = Closer.create()) {
+            Location location = createBlob(closer, "dir/whitespace ");
+
+            // Verify listing
+            assertThat(listPath("dir")).isEqualTo(List.of(location));
+
+            // Verify reading
+            TrinoInputFile inputFile = getFileSystem().newInputFile(location);
+            assertThat(inputFile.exists()).as("exists").isTrue();
+            try (TrinoInputStream inputStream = inputFile.newStream()) {
+                byte[] bytes = ByteStreams.toByteArray(inputStream);
+                assertThat(bytes).isEqualTo(("test blob content for " + location).getBytes(UTF_8));
+            }
+
+            // Verify writing
+            byte[] newContents = "bar bar baz new content".getBytes(UTF_8);
+            try (OutputStream outputStream = getFileSystem().newOutputFile(location).createOrOverwrite()) {
+                outputStream.write(newContents.clone());
+            }
+            try (TrinoInputStream inputStream = inputFile.newStream()) {
+                byte[] bytes = ByteStreams.toByteArray(inputStream);
+                assertThat(bytes).isEqualTo(newContents);
+            }
+
+            // Verify deleting
+            getFileSystem().deleteFile(location);
+            assertThat(inputFile.exists()).as("exists after delete").isFalse();
+
+            // Verify renames
+            if (supportsRenameFile()) {
+                Location source = createBlob(closer, "dir/another trailing whitespace ");
+                Location target = getRootLocation().appendPath("dir/after rename still whitespace ");
+                getFileSystem().renameFile(source, target);
+                assertThat(getFileSystem().newInputFile(source).exists()).as("source exists after rename").isFalse();
+                assertThat(getFileSystem().newInputFile(target).exists()).as("target exists after rename").isTrue();
+
+                try (TrinoInputStream inputStream = getFileSystem().newInputFile(target).newStream()) {
+                    byte[] bytes = ByteStreams.toByteArray(inputStream);
+                    assertThat(bytes).isEqualTo(("test blob content for " + source).getBytes(UTF_8));
+                }
+
+                getFileSystem().deleteFile(target);
+                assertThat(getFileSystem().newInputFile(target).exists()).as("target exists after delete").isFalse();
+            }
+        }
+    }
+
+    @Test
+    public void testCreateDirectory()
+            throws IOException
+    {
+        try (Closer closer = Closer.create()) {
+            getFileSystem().createDirectory(createLocation("level0/level1/level2"));
+
+            Optional<Boolean> expectedExists = isHierarchical() ? Optional.of(true) : Optional.empty();
+
+            assertThat(getFileSystem().directoryExists(createLocation("level0/level1/level2"))).isEqualTo(expectedExists);
+            assertThat(getFileSystem().directoryExists(createLocation("level0/level1"))).isEqualTo(expectedExists);
+            assertThat(getFileSystem().directoryExists(createLocation("level0"))).isEqualTo(expectedExists);
+
+            Location blob = createBlob(closer, "level0/level1/level2-file");
+
+            if (isHierarchical()) {
+                // creating a directory for an existing file location is an error
+                assertThatThrownBy(() -> getFileSystem().createDirectory(blob))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(blob.toString());
+            }
+            else {
+                getFileSystem().createDirectory(blob);
+            }
+            assertThat(readLocation(blob)).isEqualTo(TEST_BLOB_CONTENT_PREFIX + blob);
+
+            // create for existing directory does nothing
+            getFileSystem().createDirectory(createLocation("level0"));
+            getFileSystem().createDirectory(createLocation("level0/level1"));
+            getFileSystem().createDirectory(createLocation("level0/level1/level2"));
+        }
+    }
+
+    @Test
+    public void testRenameDirectory()
+            throws IOException
+    {
+        if (!isHierarchical()) {
+            getFileSystem().createDirectory(createLocation("abc"));
+            assertThatThrownBy(() -> getFileSystem().renameDirectory(createLocation("source"), createLocation("target")))
+                    .isInstanceOf(IOException.class)
+                    .hasMessageContaining("does not support directory renames");
+            return;
+        }
+
+        // rename directory locations cannot be the root of the file system
+        assertThatThrownBy(() -> getFileSystem().renameDirectory(getRootLocation(), createLocation("dir")))
+                .isInstanceOf(IOException.class)
+                .hasMessageContaining(getRootLocation().toString());
+        assertThatThrownBy(() -> getFileSystem().renameDirectory(createLocation("dir"), getRootLocation()))
+                .isInstanceOf(IOException.class)
+                .hasMessageContaining(getRootLocation().toString());
+
+        try (Closer closer = Closer.create()) {
+            getFileSystem().createDirectory(createLocation("level0/level1/level2"));
+
+            Location blob = createBlob(closer, "level0/level1/level2-file");
+
+            assertThat(getFileSystem().directoryExists(createLocation("level0/level1/level2"))).contains(true);
+            assertThat(getFileSystem().directoryExists(createLocation("level0/level1"))).contains(true);
+            assertThat(getFileSystem().directoryExists(createLocation("level0"))).contains(true);
+
+            // rename interior directory
+            getFileSystem().renameDirectory(createLocation("level0/level1"), createLocation("level0/renamed"));
+
+            assertThat(getFileSystem().directoryExists(createLocation("level0/level1"))).contains(false);
+            assertThat(getFileSystem().directoryExists(createLocation("level0/level1/level2"))).contains(false);
+            assertThat(getFileSystem().directoryExists(createLocation("level0/renamed"))).contains(true);
+            assertThat(getFileSystem().directoryExists(createLocation("level0/renamed/level2"))).contains(true);
+
+            assertThat(getFileSystem().newInputFile(blob).exists()).isFalse();
+
+            Location renamedBlob = createLocation("level0/renamed/level2-file");
+            assertThat(readLocation(renamedBlob))
+                    .isEqualTo(TEST_BLOB_CONTENT_PREFIX + blob);
+
+            // rename to existing directory is an error
+            Location blob2 = createBlob(closer, "abc/xyz-file");
+
+            assertThat(getFileSystem().directoryExists(createLocation("abc"))).contains(true);
+
+            assertThatThrownBy(() -> getFileSystem().renameDirectory(createLocation("abc"), createLocation("level0")))
+                    .isInstanceOf(IOException.class)
+                    .hasMessageContaining(createLocation("abc").toString())
+                    .hasMessageContaining(createLocation("level0").toString());
+
+            assertThat(getFileSystem().newInputFile(blob2).exists()).isTrue();
+            assertThat(getFileSystem().newInputFile(renamedBlob).exists()).isTrue();
+        }
+    }
+
+    @Test
+    public void testListDirectories()
+            throws IOException
+    {
+        testListDirectories(isHierarchical());
+    }
+
+    protected void testListDirectories(boolean hierarchicalNamingConstraints)
+            throws IOException
+    {
+        try (Closer closer = Closer.create()) {
+            createTestDirectoryStructure(closer, hierarchicalNamingConstraints);
+            createBlob(closer, "level0/level1/level2/level3-file0");
+            createBlob(closer, "level0/level1x/level2x-file0");
+            createBlob(closer, "other/file");
+
+            assertThat(listDirectories("")).containsOnly(
+                    createLocation("level0/"),
+                    createLocation("other/"));
+
+            assertThat(listDirectories("level0")).containsOnly(
+                    createLocation("level0/level1/"),
+                    createLocation("level0/level1x/"));
+            assertThat(listDirectories("level0/")).containsOnly(
+                    createLocation("level0/level1/"),
+                    createLocation("level0/level1x/"));
+
+            assertThat(listDirectories("level0/level1")).containsOnly(
+                    createLocation("level0/level1/level2/"));
+            assertThat(listDirectories("level0/level1/")).containsOnly(
+                    createLocation("level0/level1/level2/"));
+
+            assertThat(listDirectories("level0/level1/level2/level3")).isEmpty();
+            assertThat(listDirectories("level0/level1/level2/level3/")).isEmpty();
+
+            assertThat(listDirectories("unknown")).isEmpty();
+            assertThat(listDirectories("unknown/")).isEmpty();
+
+            if (isHierarchical()) {
+                assertThatThrownBy(() -> listDirectories("level0-file0"))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining(createLocation("level0-file0").toString());
+            }
+            else {
+                assertThat(listDirectories("level0-file0")).isEmpty();
+            }
+
+            if (!hierarchicalNamingConstraints && !normalizesListFilesResult()) {
+                // this lists a path in a directory with an empty name
+                assertThat(listDirectories("/")).isEmpty();
+            }
+        }
+    }
+
+    private Set<Location> listDirectories(String path)
+            throws IOException
+    {
+        return getFileSystem().listDirectories(createListingLocation(path));
+    }
+
+    private List<Location> listPath(String path)
+            throws IOException
+    {
+        List<Location> locations = new ArrayList<>();
+        FileIterator fileIterator = getFileSystem().listFiles(createListingLocation(path));
+        while (fileIterator.hasNext()) {
+            FileEntry fileEntry = fileIterator.next();
+            Location location = fileEntry.location();
+            assertThat(fileEntry.length()).isEqualTo(TEST_BLOB_CONTENT_PREFIX.length() + location.toString().length());
+            locations.add(location);
+        }
+        return locations;
+    }
+
+    private Location createListingLocation(String path)
+    {
+        // allow listing a directory with a trailing slash
+        if (path.equals("/")) {
+            return createLocation("").appendSuffix("/");
+        }
+        return createLocation(path);
+    }
+
+    private String readLocation(Location path)
+    {
+        try (InputStream inputStream = getFileSystem().newInputFile(path).newStream()) {
+            return new String(inputStream.readAllBytes(), UTF_8);
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    private Location createBlob(Closer closer, String path)
+    {
+        Location location = createLocation(path);
+        closer.register(new TempBlob(location)).createOrOverwrite(TEST_BLOB_CONTENT_PREFIX + location.toString());
+        return location;
+    }
+
+    protected TempBlob randomBlobLocation(String nameHint)
+    {
+        TempBlob tempBlob = new TempBlob(createLocation("%s/%s".formatted(nameHint, UUID.randomUUID())));
+        assertThat(tempBlob.exists()).isFalse();
+        return tempBlob;
+    }
+
+    private Set<Location> createTestDirectoryStructure(Closer closer, boolean hierarchicalNamingConstraints)
+    {
+        Set<Location> locations = new HashSet<>();
+        if (!hierarchicalNamingConstraints) {
+            locations.add(createBlob(closer, "level0"));
+        }
+        locations.add(createBlob(closer, "level0-file0"));
+        locations.add(createBlob(closer, "level0-file1"));
+        locations.add(createBlob(closer, "level0-file2"));
+        if (!hierarchicalNamingConstraints) {
+            locations.add(createBlob(closer, "level0/level1"));
+        }
+        locations.add(createBlob(closer, "level0/level1-file0"));
+        locations.add(createBlob(closer, "level0/level1-file1"));
+        locations.add(createBlob(closer, "level0/level1-file2"));
+        if (!hierarchicalNamingConstraints) {
+            locations.add(createBlob(closer, "level0/level1/level2"));
+        }
+        locations.add(createBlob(closer, "level0/level1/level2-file0"));
+        locations.add(createBlob(closer, "level0/level1/level2-file1"));
+        locations.add(createBlob(closer, "level0/level1/level2-file2"));
+        return locations;
+    }
+
+    protected class TempBlob
+            implements Closeable
+    {
+        private final Location location;
+        private final TrinoFileSystem fileSystem;
+
+        public TempBlob(Location location)
+        {
+            this.location = requireNonNull(location, "location is null");
+            fileSystem = getFileSystem();
+        }
+
+        public Location location()
+        {
+            return location;
+        }
+
+        public boolean exists()
+        {
+            try {
+                return inputFile().exists();
+            }
+            catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+
+        public TrinoInputFile inputFile()
+        {
+            return fileSystem.newInputFile(location);
+        }
+
+        public TrinoOutputFile outputFile()
+        {
+            return fileSystem.newOutputFile(location);
+        }
+
+        public void createOrOverwrite(String data)
+        {
+            try (OutputStream outputStream = outputFile().createOrOverwrite()) {
+                outputStream.write(data.getBytes(UTF_8));
+            }
+            catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+            assertThat(exists()).isTrue();
+        }
+
+        public String read()
+        {
+            return readLocation(location);
+        }
+
+        @Override
+        public void close()
+        {
+            try {
+                fileSystem.deleteFile(location);
+            }
+            catch (IOException ignored) {
+            }
+        }
+    }
+}
diff --git a/lib/trino-filesystem/src/test/java/io/trino/filesystem/TestFileEntry.java b/lib/trino-filesystem/src/test/java/io/trino/filesystem/TestFileEntry.java
index 24ab1852e228..d095a80d3db9 100644
--- a/lib/trino-filesystem/src/test/java/io/trino/filesystem/TestFileEntry.java
+++ b/lib/trino-filesystem/src/test/java/io/trino/filesystem/TestFileEntry.java
@@ -25,14 +25,15 @@
 
 public class TestFileEntry
 {
+    private static final Location LOCATION = Location.of("/test");
     private static final Instant MODIFIED = Instant.ofEpochSecond(1234567890);
 
     @Test
     public void testEmptyBlocks()
     {
-        assertThat(new FileEntry("/test", 123, MODIFIED, Optional.empty()))
+        assertThat(new FileEntry(LOCATION, 123, MODIFIED, Optional.empty()))
                 .satisfies(entry -> {
-                    assertThat(entry.location()).isEqualTo("/test");
+                    assertThat(entry.location()).isEqualTo(LOCATION);
                     assertThat(entry.length()).isEqualTo(123);
                     assertThat(entry.lastModified()).isEqualTo(MODIFIED);
                     assertThat(entry.blocks()).isEmpty();
@@ -46,14 +47,14 @@ public void testPresentBlocks()
                 new Block(List.of(), 0, 50),
                 new Block(List.of(), 50, 70),
                 new Block(List.of(), 100, 150));
-        assertThat(new FileEntry("/test", 200, MODIFIED, Optional.of(locations)))
+        assertThat(new FileEntry(LOCATION, 200, MODIFIED, Optional.of(locations)))
                 .satisfies(entry -> assertThat(entry.blocks()).contains(locations));
     }
 
     @Test
     public void testMissingBlocks()
     {
-        assertThatThrownBy(() -> new FileEntry("/test", 0, MODIFIED, Optional.of(List.of())))
+        assertThatThrownBy(() -> new FileEntry(LOCATION, 0, MODIFIED, Optional.of(List.of())))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("blocks is empty");
     }
@@ -62,7 +63,7 @@ public void testMissingBlocks()
     public void testBlocksEmptyFile()
     {
         List<Block> locations = List.of(new Block(List.of(), 0, 0));
-        assertThat(new FileEntry("/test", 0, MODIFIED, Optional.of(locations)))
+        assertThat(new FileEntry(LOCATION, 0, MODIFIED, Optional.of(locations)))
                 .satisfies(entry -> assertThat(entry.blocks()).contains(locations));
     }
 
@@ -70,7 +71,7 @@ public void testBlocksEmptyFile()
     public void testBlocksGapAtStart()
     {
         List<Block> locations = List.of(new Block(List.of(), 50, 50));
-        assertThatThrownBy(() -> new FileEntry("/test", 100, MODIFIED, Optional.of(locations)))
+        assertThatThrownBy(() -> new FileEntry(LOCATION, 100, MODIFIED, Optional.of(locations)))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("blocks have a gap");
     }
@@ -81,7 +82,7 @@ public void testBlocksGapInMiddle()
         List<Block> locations = List.of(
                 new Block(List.of(), 0, 50),
                 new Block(List.of(), 100, 100));
-        assertThatThrownBy(() -> new FileEntry("/test", 200, MODIFIED, Optional.of(locations)))
+        assertThatThrownBy(() -> new FileEntry(LOCATION, 200, MODIFIED, Optional.of(locations)))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("blocks have a gap");
     }
@@ -92,7 +93,7 @@ public void testBlocksGapAtEnd()
         List<Block> locations = List.of(
                 new Block(List.of(), 0, 50),
                 new Block(List.of(), 50, 49));
-        assertThatThrownBy(() -> new FileEntry("/test", 100, MODIFIED, Optional.of(locations)))
+        assertThatThrownBy(() -> new FileEntry(LOCATION, 100, MODIFIED, Optional.of(locations)))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("blocks do not cover file");
     }
diff --git a/lib/trino-filesystem/src/test/java/io/trino/filesystem/TestLocation.java b/lib/trino-filesystem/src/test/java/io/trino/filesystem/TestLocation.java
new file mode 100644
index 000000000000..6d540b195126
--- /dev/null
+++ b/lib/trino-filesystem/src/test/java/io/trino/filesystem/TestLocation.java
@@ -0,0 +1,512 @@
+/*
+ * Licensed 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 io.trino.filesystem;
+
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class TestLocation
+{
+    @Test
+    void testParse()
+    {
+        assertLocation("scheme://userInfo@host/some/path", "scheme", Optional.of("userInfo"), "host", "some/path");
+        // case is preserved
+        assertLocation("SCHEME://USER_INFO@HOST/SOME/PATH", "SCHEME", Optional.of("USER_INFO"), "HOST", "SOME/PATH");
+        // whitespace is allowed
+        assertLocation("sc heme://user info@ho st/so me/pa th", Optional.of("sc heme"), Optional.of("user info"), Optional.of("ho st"), OptionalInt.empty(), "so me/pa th", Set.of("Illegal character in scheme name at index 2: sc heme://user info@ho st/so me/pa th"));
+
+        // userInfo is optional
+        assertLocation("scheme://host/some/path", "scheme", Optional.empty(), "host", "some/path");
+        // userInfo can be empty string
+        assertLocation("scheme://@host/some/path", "scheme", Optional.of(""), "host", "some/path");
+
+        // host can be empty string
+        assertLocation("scheme:///some/path", "scheme", Optional.empty(), "", "some/path");
+        // host can be empty string when userInfo is present
+        assertLocation("scheme://user@/some/path", Optional.of("scheme"), Optional.of("user"), Optional.empty(), OptionalInt.empty(), "some/path", Set.of("userInfo compared with URI: expected [Optional.empty], was [Optional[user]]"));
+        // userInfo cannot contain slashes
+        assertLocation("scheme://host:1234/some/path//@here:444/there", Optional.of("scheme"), Optional.empty(), Optional.of("host"), OptionalInt.of(1234), "some/path//@here:444/there");
+        // host and userInfo can both be empty
+        assertLocation("scheme://@/some/path", Optional.of("scheme"), Optional.of(""), Optional.empty(), OptionalInt.empty(), "some/path", Set.of("userInfo compared with URI: expected [Optional.empty], was [Optional[]]"));
+        // port or userInfo can be given even if host is not (note: this documents current state, but does not imply the intent to support such locations)
+        assertLocation("scheme://:1/some/path", Optional.of("scheme"), Optional.empty(), Optional.empty(), OptionalInt.of(1), "some/path", Set.of("port compared with URI: expected [OptionalInt.empty], was [OptionalInt[1]]"));
+        assertLocation("scheme://@:1/some/path", Optional.of("scheme"), Optional.of(""), Optional.empty(), OptionalInt.of(1), "some/path", Set.of(
+                "userInfo compared with URI: expected [Optional.empty], was [Optional[]]",
+                "port compared with URI: expected [OptionalInt.empty], was [OptionalInt[1]]"));
+        assertLocation("scheme://@/", Optional.of("scheme"), Optional.of(""), Optional.empty(), OptionalInt.empty(), "", Set.of("userInfo compared with URI: expected [Optional.empty], was [Optional[]]"));
+        assertLocation("scheme://@:1/", Optional.of("scheme"), Optional.of(""), Optional.empty(), OptionalInt.of(1), "", Set.of(
+                "userInfo compared with URI: expected [Optional.empty], was [Optional[]]",
+                "port compared with URI: expected [OptionalInt.empty], was [OptionalInt[1]]"));
+        assertLocation("scheme://:1/", Optional.of("scheme"), Optional.empty(), Optional.empty(), OptionalInt.of(1), "", Set.of("port compared with URI: expected [OptionalInt.empty], was [OptionalInt[1]]"));
+        assertLocation("scheme://@//", Optional.of("scheme"), Optional.of(""), Optional.empty(), OptionalInt.empty(), "/", Set.of("userInfo compared with URI: expected [Optional.empty], was [Optional[]]"));
+        assertLocation("scheme://@:1//", Optional.of("scheme"), Optional.of(""), Optional.empty(), OptionalInt.of(1), "/", Set.of(
+                "userInfo compared with URI: expected [Optional.empty], was [Optional[]]",
+                "port compared with URI: expected [OptionalInt.empty], was [OptionalInt[1]]"));
+        assertLocation("scheme://:1//", Optional.of("scheme"), Optional.empty(), Optional.empty(), OptionalInt.of(1), "/", Set.of("port compared with URI: expected [OptionalInt.empty], was [OptionalInt[1]]"));
+
+        // port is allowed
+        assertLocation("hdfs://hadoop:9000/some/path", "hdfs", "hadoop", 9000, "some/path");
+
+        // path can contain anything
+        assertLocation("scheme://host/..", "scheme", Optional.empty(), "host", "..");
+
+        assertLocation("scheme://host/path/../../other", "scheme", Optional.empty(), "host", "path/../../other");
+
+        assertLocation("scheme://host/path/%41%illegal", Optional.of("scheme"), Optional.empty(), Optional.of("host"), OptionalInt.empty(), "path/%41%illegal", Set.of("Malformed escape pair at index 22: scheme://host/path/%41%illegal"));
+
+        assertLocation("scheme://host///path", "scheme", Optional.empty(), "host", "//path");
+
+        assertLocation("scheme://host///path//", "scheme", Optional.empty(), "host", "//path//");
+
+        assertLocationWithoutUriTesting("scheme://userInfo@host/some/path#fragment", "scheme", Optional.of("userInfo"), "host", "some/path#fragment");
+        assertLocationWithoutUriTesting("scheme://userInfo@ho#st/some/path", "scheme", Optional.of("userInfo"), "ho#st", "some/path");
+        assertLocationWithoutUriTesting("scheme://user#Info@host/some/path", "scheme", Optional.of("user#Info"), "host", "some/path");
+        assertLocationWithoutUriTesting("sc#heme://userInfo@host/some/path", "sc#heme", Optional.of("userInfo"), "host", "some/path");
+        assertLocationWithoutUriTesting("scheme://userInfo@host/some/path?fragment", "scheme", Optional.of("userInfo"), "host", "some/path?fragment");
+        assertLocationWithoutUriTesting("scheme://userInfo@ho?st/some/path", "scheme", Optional.of("userInfo"), "ho?st", "some/path");
+        assertLocationWithoutUriTesting("scheme://user?Info@host/some/path", "scheme", Optional.of("user?Info"), "host", "some/path");
+        assertLocationWithoutUriTesting("sc?heme://userInfo@host/some/path", "sc?heme", Optional.of("userInfo"), "host", "some/path");
+
+        // the path can be empty
+        assertLocation("scheme://", Optional.of("scheme"), Optional.empty(), Optional.empty(), OptionalInt.empty(), "", Set.of("Expected authority at index 9: scheme://"));
+        assertLocation("scheme://host/", "scheme", Optional.empty(), "host", "");
+        assertLocation("scheme:///", "scheme", Optional.empty(), "", "");
+
+        // the path can be just a slash (if you really want)
+        assertLocation("scheme://host//", "scheme", Optional.empty(), "host", "/");
+        assertLocation("scheme:////", "scheme", Optional.empty(), "", "/");
+
+        // the location can be just a path
+        assertLocation("/", "");
+        assertLocation("//", "/", Set.of("Expected authority at index 2: //"));
+        assertLocation("///", "//", Set.of("'/path' compared with URI: expected [/], was [///]"));
+        assertLocation("/abc", "abc");
+        assertLocation("//abc", "/abc", Set.of("host compared with URI: expected [Optional[abc]], was [Optional.empty]", "'/path' compared with URI: expected [], was [//abc]"));
+        assertLocation("///abc", "//abc", Set.of("'/path' compared with URI: expected [/abc], was [///abc]"));
+        assertLocation("/abc/xyz", "abc/xyz");
+        assertLocation("/foo://host:port/path", "foo://host:port/path");
+
+        // special handling for Locations without hostnames
+        assertLocation("file:/", "file", "");
+        assertLocation("file://", Optional.of("file"), Optional.empty(), Optional.empty(), OptionalInt.empty(), "", Set.of("Expected authority at index 7: file://"));
+        assertLocation("file:///", "file", "");
+        assertLocation("file:////", "file", "/");
+        assertLocation("file://///", "file", "//");
+        assertLocation("file:/hello.txt", "file", "hello.txt");
+        assertLocation("file:/some/path", "file", "some/path");
+        assertLocation("file:/some@what/path", "file", "some@what/path");
+        assertLocation("hdfs:/a/hadoop/path.csv", "hdfs", "a/hadoop/path.csv");
+        assertLocation("file:///tmp/staging/dir/some-user@example.com", "file", "tmp/staging/dir/some-user@example.com");
+
+        // invalid locations
+        assertThatThrownBy(() -> Location.of(null))
+                .isInstanceOf(NullPointerException.class);
+
+        assertThatThrownBy(() -> Location.of(""))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("location is empty");
+        assertThatThrownBy(() -> Location.of("  "))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("location is blank");
+        assertThatThrownBy(() -> Location.of("x"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("No scheme for file system location: x");
+        assertThatThrownBy(() -> Location.of("dev/null"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("No scheme for file system location: dev/null");
+        assertThatThrownBy(() -> Location.of("scheme://host:invalid/path"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Invalid port in file system location: scheme://host:invalid/path");
+        assertThatThrownBy(() -> Location.of("scheme://:"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Invalid port in file system location: scheme://:");
+        assertThatThrownBy(() -> Location.of("scheme://:/"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Invalid port in file system location: scheme://:/");
+        assertThatThrownBy(() -> Location.of("scheme://@:/"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Invalid port in file system location: scheme://@:/");
+
+        // no path
+        assertThatThrownBy(() -> Location.of("scheme://host"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Path missing in file system location: scheme://host");
+
+        assertThatThrownBy(() -> Location.of("scheme://userInfo@host"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Path missing in file system location: scheme://userInfo@host");
+
+        assertThatThrownBy(() -> Location.of("scheme://userInfo@host:1234"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Path missing in file system location: scheme://userInfo@host:1234");
+
+        // no path and empty host name
+        assertThatThrownBy(() -> Location.of("scheme://@"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Path missing in file system location: scheme://@");
+
+        assertThatThrownBy(() -> Location.of("scheme://@:1"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Path missing in file system location: scheme://@:1");
+
+        assertThatThrownBy(() -> Location.of("scheme://:1"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Path missing in file system location: scheme://:1");
+
+        assertThatThrownBy(() -> Location.of("scheme://:"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Invalid port in file system location: scheme://:");
+    }
+
+    private static void assertLocationWithoutUriTesting(String locationString, String scheme, Optional<String> userInfo, String host, String path)
+    {
+        Optional<String> expectedHost = host.isEmpty() ? Optional.empty() : Optional.of(host);
+        assertLocation(Location.of(locationString), locationString, Optional.of(scheme), userInfo, expectedHost, OptionalInt.empty(), path, true, Set.of("skipped"));
+    }
+
+    private static void assertLocation(String locationString, String scheme, Optional<String> userInfo, String host, String path)
+    {
+        Optional<String> expectedHost = host.isEmpty() ? Optional.empty() : Optional.of(host);
+        assertLocation(locationString, Optional.of(scheme), userInfo, expectedHost, OptionalInt.empty(), path, Set.of());
+    }
+
+    private static void assertLocation(String locationString, String scheme, String path)
+    {
+        assertLocation(locationString, Optional.of(scheme), Optional.empty(), Optional.empty(), OptionalInt.empty(), path, Set.of());
+    }
+
+    private static void assertLocation(String locationString, String scheme, String host, int port, String path)
+    {
+        assertLocation(locationString, Optional.of(scheme), Optional.empty(), Optional.of(host), OptionalInt.of(port), path, Set.of());
+    }
+
+    private static void assertLocation(String locationString, String path)
+    {
+        assertLocation(locationString, path, Set.of());
+    }
+
+    private static void assertLocation(String locationString, String path, Set<String> uriIncompatibilities)
+    {
+        assertLocation(locationString, Optional.empty(), Optional.empty(), Optional.empty(), OptionalInt.empty(), path, uriIncompatibilities);
+    }
+
+    private static void assertLocation(Location actual, Location expected)
+    {
+        assertLocation(actual, expected.toString(), expected.scheme(), expected.userInfo(), expected.host(), expected.port(), expected.path(), true, Set.of("skipped"));
+    }
+
+    private static void assertLocation(String locationString, Optional<String> scheme, Optional<String> userInfo, Optional<String> host, OptionalInt port, String path)
+    {
+        assertLocation(locationString, scheme, userInfo, host, port, path, Set.of());
+    }
+
+    private static void assertLocation(
+            String locationString,
+            Optional<String> scheme,
+            Optional<String> userInfo,
+            Optional<String> host,
+            OptionalInt port,
+            String path,
+            Set<String> uriIncompatibilities)
+    {
+        Location location = Location.of(locationString);
+        assertLocation(location, locationString, scheme, userInfo, host, port, path, false, uriIncompatibilities);
+    }
+
+    private static void assertLocation(
+            Location location,
+            String locationString,
+            Optional<String> scheme,
+            Optional<String> userInfo,
+            Optional<String> host,
+            OptionalInt port,
+            String path,
+            boolean skipUriTesting,
+            Set<String> uriIncompatibilities)
+    {
+        assertThat(location.toString()).isEqualTo(locationString);
+        assertThat(location.scheme()).isEqualTo(scheme);
+        assertThat(location.userInfo()).isEqualTo(userInfo);
+        assertThat(location.host()).isEqualTo(host);
+        assertThat(location.port()).isEqualTo(port);
+        assertThat(location.path()).isEqualTo(path);
+
+        if (!skipUriTesting) {
+            int observedIncompatibilities = 0;
+            URI uri = null;
+            try {
+                uri = new URI(locationString);
+            }
+            catch (URISyntaxException e) {
+                assertThat(uriIncompatibilities).contains(e.getMessage());
+                observedIncompatibilities++;
+            }
+            // Locations are not URIs but they follow URI structure
+            if (uri != null) {
+                observedIncompatibilities += assertEqualsOrVerifyDeviation(Optional.ofNullable(uri.getScheme()), location.scheme(), "scheme compared with URI", uriIncompatibilities);
+                observedIncompatibilities += assertEqualsOrVerifyDeviation(Optional.ofNullable(uri.getUserInfo()), location.userInfo(), "userInfo compared with URI", uriIncompatibilities);
+                observedIncompatibilities += assertEqualsOrVerifyDeviation(Optional.ofNullable(uri.getHost()), location.host(), "host compared with URI", uriIncompatibilities);
+                observedIncompatibilities += assertEqualsOrVerifyDeviation(uri.getPort() == -1 ? OptionalInt.empty() : OptionalInt.of(uri.getPort()), location.port(), "port compared with URI", uriIncompatibilities);
+                // For some reason, URI.getPath returns paths starting with "/", while Location does not.
+                observedIncompatibilities += assertEqualsOrVerifyDeviation(uri.getPath(), "/" + location.path(), "'/path' compared with URI", uriIncompatibilities);
+            }
+            assertThat(uriIncompatibilities).hasSize(observedIncompatibilities);
+        }
+        else {
+            assertThat(uriIncompatibilities).isEqualTo(Set.of("skipped"));
+        }
+
+        assertThat(location).isEqualTo(location);
+        assertThat(location).isEqualTo(Location.of(locationString));
+        assertThat(location.hashCode()).isEqualTo(location.hashCode());
+        assertThat(location.hashCode()).isEqualTo(Location.of(locationString).hashCode());
+
+        assertThat(location.toString()).isEqualTo(locationString);
+    }
+
+    private static <T> int assertEqualsOrVerifyDeviation(T expected, T actual, String message, Set<String> expectedDifferences)
+    {
+        if (Objects.equals(expected, actual)) {
+            return 0;
+        }
+        String key = "%s: expected [%s], was [%s]".formatted(message, expected, actual);
+        assertThat(expectedDifferences).contains(key);
+        return 1;
+    }
+
+    @Test
+    void testVerifyFileLocation()
+    {
+        Location.of("scheme://userInfo@host/name").verifyValidFileLocation();
+        Location.of("scheme://userInfo@host/path/name").verifyValidFileLocation();
+        Location.of("scheme://userInfo@host/name ").verifyValidFileLocation();
+
+        Location.of("/name").verifyValidFileLocation();
+        Location.of("/path/name").verifyValidFileLocation();
+        Location.of("/path/name ").verifyValidFileLocation();
+        Location.of("/name ").verifyValidFileLocation();
+
+        assertInvalidFileLocation("scheme://userInfo@host/", "File location must contain a path: scheme://userInfo@host/");
+        assertInvalidFileLocation("scheme://userInfo@host/name/", "File location cannot end with '/': scheme://userInfo@host/name/");
+
+        assertInvalidFileLocation("/", "File location must contain a path: /");
+        assertInvalidFileLocation("/name/", "File location cannot end with '/': /name/");
+    }
+
+    private static void assertInvalidFileLocation(String locationString, String expectedErrorMessage)
+    {
+        Location location = Location.of(locationString);
+        assertThatThrownBy(location::verifyValidFileLocation)
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(locationString)
+                .hasMessage(expectedErrorMessage);
+        assertThatThrownBy(location::fileName)
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(locationString)
+                .hasMessage(expectedErrorMessage);
+        assertThatThrownBy(location::parentDirectory)
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining(locationString)
+                .hasMessage(expectedErrorMessage);
+    }
+
+    @Test
+    void testFileName()
+    {
+        assertFileName("scheme://userInfo@host/path/name", "name");
+        assertFileName("scheme://userInfo@host/name", "name");
+
+        assertFileName("/path/name", "name");
+        assertFileName("/name", "name");
+
+        // all valid file locations must have a path
+        // invalid file locations are tested in testVerifyFileLocation
+    }
+
+    private static void assertFileName(String locationString, String fileName)
+    {
+        // fileName method only works with valid file locations
+        Location location = Location.of(locationString);
+        location.verifyValidFileLocation();
+        assertThat(location.fileName()).isEqualTo(fileName);
+    }
+
+    @Test
+    void testSibling()
+    {
+        assertSiblingFailure("/", "sibling", IllegalStateException.class, "File location must contain a path: /");
+        assertSiblingFailure("//", "sibling", IllegalStateException.class, "File location must contain a path: /");
+        assertSiblingFailure("file:/", "sibling", IllegalStateException.class, "File location must contain a path: file:/");
+        assertSiblingFailure("file://", "sibling", IllegalStateException.class, "File location must contain a path: file://");
+        assertSiblingFailure("file:///", "sibling", IllegalStateException.class, "File location must contain a path: file:///");
+        assertSiblingFailure("s3://bucket/", "sibling", IllegalStateException.class, "File location must contain a path: s3://bucket/");
+        assertSiblingFailure("scheme://userInfo@host/path/", "sibling", IllegalStateException.class, "File location cannot end with '/'");
+
+        assertSiblingFailure("scheme://userInfo@host/path/filename", null, NullPointerException.class, "name is null");
+        assertSiblingFailure("scheme://userInfo@host/path/filename", "", IllegalArgumentException.class, "name is empty");
+
+        assertSibling("scheme://userInfo@host/path/name", "sibling", "scheme://userInfo@host/path/sibling");
+        assertSibling("scheme://userInfo@host/path//name", "sibling", "scheme://userInfo@host/path//sibling");
+        assertSibling("scheme://userInfo@host/path///name", "sibling", "scheme://userInfo@host/path///sibling");
+        assertSibling("scheme://userInfo@host/level1/level2/name", "sibling", "scheme://userInfo@host/level1/level2/sibling");
+        assertSibling("scheme://userInfo@host/level1//level2/name", "sibling", "scheme://userInfo@host/level1//level2/sibling");
+
+        assertSibling("file:/path/name", "sibling", "file:/path/sibling");
+        assertSibling("s3://bucket/directory/filename with spaces", "sibling", "s3://bucket/directory/sibling");
+        assertSibling("/path/name", "sibling", "/path/sibling");
+        assertSibling("/name", "sibling", "/sibling");
+    }
+
+    private static void assertSiblingFailure(String locationString, String siblingName, Class<?> exceptionClass, String exceptionMessage)
+    {
+        assertThatThrownBy(() -> Location.of(locationString).sibling(siblingName))
+                .isInstanceOf(exceptionClass)
+                .hasMessageContaining(exceptionMessage);
+    }
+
+    private static void assertSibling(String locationString, String siblingName, String expectedLocationString)
+    {
+        // fileName method only works with valid file locations
+        Location location = Location.of(locationString);
+        location.verifyValidFileLocation();
+        Location siblingLocation = location.sibling(siblingName);
+
+        assertLocation(siblingLocation, Location.of(expectedLocationString));
+    }
+
+    @Test
+    void testParentDirectory()
+    {
+        assertParentDirectoryFailure("scheme:/", "File location must contain a path: scheme:/");
+        assertParentDirectoryFailure("scheme://", "File location must contain a path: scheme://");
+        assertParentDirectoryFailure("scheme:///", "File location must contain a path: scheme:///");
+
+        assertParentDirectoryFailure("scheme://host/", "File location must contain a path: scheme://host/");
+        assertParentDirectoryFailure("scheme://userInfo@host/", "File location must contain a path: scheme://userInfo@host/");
+        assertParentDirectoryFailure("scheme://userInfo@host:1234/", "File location must contain a path: scheme://userInfo@host:1234/");
+
+        assertParentDirectoryFailure("scheme://host//", "File location must contain a path: scheme://host//");
+        assertParentDirectoryFailure("scheme://userInfo@host//", "File location must contain a path: scheme://userInfo@host//");
+        assertParentDirectoryFailure("scheme://userInfo@host:1234//", "File location must contain a path: scheme://userInfo@host:1234//");
+
+        assertParentDirectory("scheme://userInfo@host/path/name", Location.of("scheme://userInfo@host/path"));
+        assertParentDirectory("scheme://userInfo@host:1234/name", Location.of("scheme://userInfo@host:1234/"));
+
+        assertParentDirectory("scheme://userInfo@host/path//name", Location.of("scheme://userInfo@host/path/"));
+        assertParentDirectory("scheme://userInfo@host/path///name", Location.of("scheme://userInfo@host/path//"));
+        assertParentDirectory("scheme://userInfo@host/path:/name", Location.of("scheme://userInfo@host/path:"));
+
+        assertParentDirectoryFailure("/", "File location must contain a path: /");
+        assertParentDirectoryFailure("//", "File location must contain a path: //");
+        assertParentDirectory("/path/name", Location.of("/path"));
+        assertParentDirectory("/name", Location.of("/"));
+
+        assertParentDirectoryFailure("/path/name/", "File location cannot end with '/': /path/name/");
+        assertParentDirectoryFailure("/name/", "File location cannot end with '/': /name/");
+
+        assertParentDirectory("/path//name", Location.of("/path/"));
+        assertParentDirectory("/path///name", Location.of("/path//"));
+        assertParentDirectory("/path:/name", Location.of("/path:"));
+
+        // all valid file locations must have a parent directory
+        // invalid file locations are tested in testVerifyFileLocation
+    }
+
+    private static void assertParentDirectory(String locationString, Location parentLocation)
+    {
+        // fileName method only works with valid file locations
+        Location location = Location.of(locationString);
+        location.verifyValidFileLocation();
+        Location parentDirectory = location.parentDirectory();
+
+        assertLocation(parentDirectory, parentLocation);
+    }
+
+    private static void assertParentDirectoryFailure(String locationString, @Language("RegExp") String expectedMessagePattern)
+    {
+        assertThatThrownBy(Location.of(locationString)::parentDirectory)
+                .hasMessageMatching(expectedMessagePattern);
+    }
+
+    @Test
+    void testAppendPath()
+    {
+        assertAppendPath("scheme://userInfo@host/", "name", Location.of("scheme://userInfo@host/name"));
+
+        assertAppendPath("scheme://userInfo@host:1234/path", "name", Location.of("scheme://userInfo@host:1234/path/name"));
+        assertAppendPath("scheme://userInfo@host/path/", "name", Location.of("scheme://userInfo@host/path/name"));
+
+        assertAppendPath("scheme://userInfo@host/path//", "name", Location.of("scheme://userInfo@host/path//name"));
+        assertAppendPath("scheme://userInfo@host/path:", "name", Location.of("scheme://userInfo@host/path:/name"));
+
+        assertAppendPath("scheme://", "name", Location.of("scheme:///name"));
+        assertAppendPath("scheme:///", "name", Location.of("scheme:///name"));
+
+        assertAppendPath("scheme:///path", "name", Location.of("scheme:///path/name"));
+        assertAppendPath("scheme:///path/", "name", Location.of("scheme:///path/name"));
+
+        assertAppendPath("/", "name", Location.of("/name"));
+        assertAppendPath("/path", "name", Location.of("/path/name"));
+
+        assertAppendPath("/tmp", "username@example.com", Location.of("/tmp/username@example.com"));
+        assertAppendPath("file:///tmp", "username@example.com", Location.of("file:///tmp/username@example.com"));
+    }
+
+    private static void assertAppendPath(String locationString, String newPathElement, Location expected)
+    {
+        Location location = Location.of(locationString).appendPath(newPathElement);
+        assertLocation(location, expected);
+    }
+
+    @Test
+    void testAppendSuffix()
+    {
+        assertAppendSuffix("scheme://userInfo@host/", ".ext", Location.of("scheme://userInfo@host/.ext"));
+
+        assertAppendSuffix("scheme://userInfo@host:1234/path", ".ext", Location.of("scheme://userInfo@host:1234/path.ext"));
+        assertAppendSuffix("scheme://userInfo@host/path/", ".ext", Location.of("scheme://userInfo@host/path/.ext"));
+
+        assertAppendSuffix("scheme://userInfo@host/path//", ".ext", Location.of("scheme://userInfo@host/path//.ext"));
+        assertAppendSuffix("scheme://userInfo@host/path:", ".ext", Location.of("scheme://userInfo@host/path:.ext"));
+
+        assertAppendSuffix("scheme://", ".ext", Location.of("scheme:///.ext"));
+        assertAppendSuffix("scheme:///", ".ext", Location.of("scheme:///.ext"));
+
+        assertAppendSuffix("scheme:///path", ".ext", Location.of("scheme:///path.ext"));
+        assertAppendSuffix("scheme:///path/", ".ext", Location.of("scheme:///path/.ext"));
+
+        assertAppendSuffix("scheme:///path", "/foo", Location.of("scheme:///path/foo"));
+        assertAppendSuffix("scheme:///path/", "/foo", Location.of("scheme:///path//foo"));
+
+        assertAppendSuffix("/", ".ext", Location.of("/.ext"));
+        assertAppendSuffix("/path", ".ext", Location.of("/path.ext"));
+    }
+
+    private static void assertAppendSuffix(String locationString, String suffix, Location expected)
+    {
+        Location location = Location.of(locationString).appendSuffix(suffix);
+        assertLocation(location, expected);
+    }
+}
diff --git a/lib/trino-filesystem/src/test/java/io/trino/filesystem/TestLocations.java b/lib/trino-filesystem/src/test/java/io/trino/filesystem/TestLocations.java
new file mode 100644
index 000000000000..6d5183836749
--- /dev/null
+++ b/lib/trino-filesystem/src/test/java/io/trino/filesystem/TestLocations.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed 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 io.trino.filesystem;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static io.trino.filesystem.Locations.appendPath;
+import static io.trino.filesystem.Locations.areDirectoryLocationsEquivalent;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestLocations
+{
+    private static Stream<Arguments> locations()
+    {
+        return Stream.of(
+                Arguments.of("test_dir", "", "test_dir/"),
+                Arguments.of("", "test_file.txt", "/test_file.txt"),
+                Arguments.of("test_dir", "test_file.txt", "test_dir/test_file.txt"),
+                Arguments.of("/test_dir", "test_file.txt", "/test_dir/test_file.txt"),
+                Arguments.of("test_dir/", "test_file.txt", "test_dir/test_file.txt"),
+                Arguments.of("/test_dir/", "test_file.txt", "/test_dir/test_file.txt"),
+                Arguments.of("test_dir", "test_dir2/", "test_dir/test_dir2/"),
+                Arguments.of("test_dir/", "test_dir2/", "test_dir/test_dir2/"),
+                Arguments.of("s3:/test_dir", "test_file.txt", "s3:/test_dir/test_file.txt"),
+                Arguments.of("s3://test_dir", "test_file.txt", "s3://test_dir/test_file.txt"),
+                Arguments.of("s3://test_dir/", "test_file.txt", "s3://test_dir/test_file.txt"),
+                Arguments.of("s3://dir_with_space ", "test_file.txt", "s3://dir_with_space /test_file.txt"),
+                Arguments.of("s3://dir_with_double_space  ", "test_file.txt", "s3://dir_with_double_space  /test_file.txt"));
+    }
+
+    @ParameterizedTest
+    @MethodSource("locations")
+    @SuppressWarnings("deprecation") // we're testing a deprecated method
+    public void testAppendPath(String location, String path, String expected)
+    {
+        assertThat(appendPath(location, path)).isEqualTo(expected);
+    }
+
+    @Test
+    public void testDirectoryLocationEquivalence()
+    {
+        assertDirectoryLocationEquivalence("scheme://authority/", "scheme://authority/", true);
+        assertDirectoryLocationEquivalence("scheme://authority/", "scheme://authority//", false);
+        assertDirectoryLocationEquivalence("scheme://authority/", "scheme://authority///", false);
+        assertDirectoryLocationEquivalence("scheme://userInfo@host:1234/dir", "scheme://userInfo@host:1234/dir/", true);
+        assertDirectoryLocationEquivalence("scheme://authority/some/path", "scheme://authority/some/path", true);
+        assertDirectoryLocationEquivalence("scheme://authority/some/path", "scheme://authority/some/path/", true);
+        assertDirectoryLocationEquivalence("scheme://authority/some/path", "scheme://authority/some/path//", false);
+
+        assertDirectoryLocationEquivalence("scheme://authority/some/path//", "scheme://authority/some/path//", true);
+        assertDirectoryLocationEquivalence("scheme://authority/some/path/", "scheme://authority/some/path//", false);
+        assertDirectoryLocationEquivalence("scheme://authority/some/path//", "scheme://authority/some/path///", false);
+
+        assertDirectoryLocationEquivalence("scheme://authority/some//path", "scheme://authority/some//path/", true);
+    }
+
+    private static void assertDirectoryLocationEquivalence(String leftLocation, String rightLocation, boolean equivalent)
+    {
+        assertThat(areDirectoryLocationsEquivalent(Location.of(leftLocation), Location.of(rightLocation))).as("equivalence of '%s' in relation to '%s'", leftLocation, rightLocation)
+                .isEqualTo(equivalent);
+        assertThat(areDirectoryLocationsEquivalent(Location.of(rightLocation), Location.of(leftLocation))).as("equivalence of '%s' in relation to '%s'", rightLocation, leftLocation)
+                .isEqualTo(equivalent);
+    }
+}
diff --git a/lib/trino-filesystem/src/test/java/io/trino/filesystem/TrackingFileSystemFactory.java b/lib/trino-filesystem/src/test/java/io/trino/filesystem/TrackingFileSystemFactory.java
index b9f8916b78d7..9bbb650414f6 100644
--- a/lib/trino-filesystem/src/test/java/io/trino/filesystem/TrackingFileSystemFactory.java
+++ b/lib/trino-filesystem/src/test/java/io/trino/filesystem/TrackingFileSystemFactory.java
@@ -17,25 +17,26 @@
 import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.spi.security.ConnectorIdentity;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.Map;
-import java.util.Objects;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Verify.verify;
 import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_EXISTS;
 import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_GET_LENGTH;
+import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_LAST_MODIFIED;
 import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_NEW_STREAM;
 import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.OUTPUT_FILE_CREATE;
+import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.OUTPUT_FILE_CREATE_EXCLUSIVE;
 import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.OUTPUT_FILE_CREATE_OR_OVERWRITE;
-import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.OUTPUT_FILE_LOCATION;
 import static java.util.Objects.requireNonNull;
 
 public class TrackingFileSystemFactory
@@ -48,8 +49,9 @@ public enum OperationType
         INPUT_FILE_EXISTS,
         OUTPUT_FILE_CREATE,
         OUTPUT_FILE_CREATE_OR_OVERWRITE,
-        OUTPUT_FILE_LOCATION,
+        OUTPUT_FILE_CREATE_EXCLUSIVE,
         OUTPUT_FILE_TO_INPUT_FILE,
+        INPUT_FILE_LAST_MODIFIED,
     }
 
     private final AtomicInteger fileId = new AtomicInteger();
@@ -72,7 +74,7 @@ public void reset()
         operationCounts.clear();
     }
 
-    private void increment(String path, int fileId, OperationType operationType)
+    private void increment(Location path, int fileId, OperationType operationType)
     {
         OperationContext context = new OperationContext(path, fileId, operationType);
         operationCounts.merge(context, 1, Math::addExact);    // merge is atomic for ConcurrentHashMap
@@ -86,7 +88,7 @@ public TrinoFileSystem create(ConnectorIdentity identity)
 
     private interface Tracker
     {
-        void track(String path, int fileId, OperationType operationType);
+        void track(Location path, int fileId, OperationType operationType);
     }
 
     private class TrackingFileSystem
@@ -102,25 +104,27 @@ private TrackingFileSystem(TrinoFileSystem delegate, Tracker tracker)
         }
 
         @Override
-        public TrinoInputFile newInputFile(String location)
+        public TrinoInputFile newInputFile(Location location)
         {
             int nextId = fileId.incrementAndGet();
             return new TrackingInputFile(
                     delegate.newInputFile(location),
+                    OptionalLong.empty(),
                     operation -> tracker.track(location, nextId, operation));
         }
 
         @Override
-        public TrinoInputFile newInputFile(String location, long length)
+        public TrinoInputFile newInputFile(Location location, long length)
         {
             int nextId = fileId.incrementAndGet();
             return new TrackingInputFile(
                     delegate.newInputFile(location, length),
+                    OptionalLong.of(length),
                     operation -> tracker.track(location, nextId, operation));
         }
 
         @Override
-        public TrinoOutputFile newOutputFile(String location)
+        public TrinoOutputFile newOutputFile(Location location)
         {
             int nextId = fileId.incrementAndGet();
             return new TrackingOutputFile(
@@ -129,50 +133,80 @@ public TrinoOutputFile newOutputFile(String location)
         }
 
         @Override
-        public void deleteFile(String location)
+        public void deleteFile(Location location)
                 throws IOException
         {
             delegate.deleteFile(location);
         }
 
         @Override
-        public void deleteFiles(Collection<String> locations)
+        public void deleteFiles(Collection<Location> locations)
                 throws IOException
         {
             delegate.deleteFiles(locations);
         }
 
         @Override
-        public void deleteDirectory(String location)
+        public void deleteDirectory(Location location)
                 throws IOException
         {
             delegate.deleteDirectory(location);
         }
 
         @Override
-        public void renameFile(String source, String target)
+        public void renameFile(Location source, Location target)
                 throws IOException
         {
             delegate.renameFile(source, target);
         }
 
         @Override
-        public FileIterator listFiles(String location)
+        public FileIterator listFiles(Location location)
                 throws IOException
         {
             return delegate.listFiles(location);
         }
+
+        @Override
+        public Optional<Boolean> directoryExists(Location location)
+                throws IOException
+        {
+            return delegate.directoryExists(location);
+        }
+
+        @Override
+        public void createDirectory(Location location)
+                throws IOException
+        {
+            delegate.createDirectory(location);
+        }
+
+        @Override
+        public void renameDirectory(Location source, Location target)
+                throws IOException
+        {
+            delegate.renameDirectory(source, target);
+        }
+
+        @Override
+        public Set<Location> listDirectories(Location location)
+                throws IOException
+        {
+            return delegate.listDirectories(location);
+        }
     }
 
     private static class TrackingInputFile
             implements TrinoInputFile
     {
         private final TrinoInputFile delegate;
+        private final OptionalLong length;
         private final Consumer<OperationType> tracker;
 
-        public TrackingInputFile(TrinoInputFile delegate, Consumer<OperationType> tracker)
+        public TrackingInputFile(TrinoInputFile delegate, OptionalLong length, Consumer<OperationType> tracker)
         {
             this.delegate = requireNonNull(delegate, "delegate is null");
+            this.length = requireNonNull(length, "length is null");
             this.tracker = requireNonNull(tracker, "tracker is null");
         }
 
@@ -180,6 +214,13 @@ public TrackingInputFile(TrinoInputFile delegate, Consumer<OperationType> tracke
         public long length()
                 throws IOException
         {
+            if (length.isPresent()) {
+                // Without TrinoInputFile, known length would be returned. This is additional verification
+                long actualLength = delegate.length();
+                verify(length.getAsLong() == actualLength, "Provided length does not match actual: %s != %s", length.getAsLong(), actualLength);
+                // No call tracking -- the filesystem call is for verification only. Normally it wouldn't take place.
+                return length.getAsLong();
+            }
             tracker.accept(INPUT_FILE_GET_LENGTH);
             return delegate.length();
         }
@@ -212,14 +253,21 @@ public boolean exists()
         public Instant lastModified()
                 throws IOException
         {
+            tracker.accept(INPUT_FILE_LAST_MODIFIED);
             return delegate.lastModified();
         }
 
         @Override
-        public String location()
+        public Location location()
         {
             return delegate.location();
         }
+
+        @Override
+        public String toString()
+        {
+            return delegate.toString();
+        }
     }
 
     private static class TrackingOutputFile
@@ -251,71 +299,33 @@ public OutputStream createOrOverwrite(AggregatedMemoryContext memoryContext)
         }
 
         @Override
-        public String location()
-        {
-            tracker.accept(OUTPUT_FILE_LOCATION);
-            return delegate.location();
-        }
-    }
-
-    @Immutable
-    public static class OperationContext
-    {
-        private final String filePath;
-        private final int fileId;
-        private final OperationType operationType;
-
-        public OperationContext(String filePath, int fileId, OperationType operationType)
-        {
-            this.filePath = requireNonNull(filePath, "filePath is null");
-            this.fileId = fileId;
-            this.operationType = requireNonNull(operationType, "operationType is null");
-        }
-
-        public String getFilePath()
-        {
-            return filePath;
-        }
-
-        public int getFileId()
-        {
-            return fileId;
-        }
-
-        public OperationType getOperationType()
+        public OutputStream createExclusive(AggregatedMemoryContext memoryContext)
+                throws IOException
         {
-            return operationType;
+            tracker.accept(OUTPUT_FILE_CREATE_EXCLUSIVE);
+            return delegate.createExclusive(memoryContext);
         }
 
         @Override
-        public boolean equals(Object o)
+        public Location location()
         {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            OperationContext that = (OperationContext) o;
-            return Objects.equals(filePath, that.filePath)
-                    && fileId == that.fileId
-                    && operationType == that.operationType;
+            // Not tracked because it's a cheap local operation
+            return delegate.location();
         }
 
         @Override
-        public int hashCode()
+        public String toString()
         {
-            return Objects.hash(filePath, fileId, operationType);
+            return delegate.toString();
         }
+    }
 
-        @Override
-        public String toString()
+    public record OperationContext(Location location, int fileId, OperationType operationType)
+    {
+        public OperationContext
         {
-            return toStringHelper(this)
-                    .add("path", filePath)
-                    .add("fileId", fileId)
-                    .add("operation", operationType)
-                    .toString();
+            requireNonNull(location, "location is null");
+            requireNonNull(operationType, "operationType is null");
         }
     }
 }
diff --git a/lib/trino-filesystem/src/test/java/io/trino/filesystem/local/TestLocalFileSystem.java b/lib/trino-filesystem/src/test/java/io/trino/filesystem/local/TestLocalFileSystem.java
new file mode 100644
index 000000000000..b9f4208e6054
--- /dev/null
+++ b/lib/trino-filesystem/src/test/java/io/trino/filesystem/local/TestLocalFileSystem.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed 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 io.trino.filesystem.local;
+
+import io.trino.filesystem.AbstractTestTrinoFileSystem;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.stream.Stream;
+
+import static java.util.function.Predicate.not;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestLocalFileSystem
+        extends AbstractTestTrinoFileSystem
+{
+    private LocalFileSystem fileSystem;
+    private Path tempDirectory;
+
+    @BeforeAll
+    void beforeAll()
+            throws IOException
+    {
+        tempDirectory = Files.createTempDirectory("test");
+        fileSystem = new LocalFileSystem(tempDirectory);
+    }
+
+    @AfterEach
+    void afterEach()
+            throws IOException
+    {
+        cleanupFiles();
+    }
+
+    @AfterAll
+    void afterAll()
+            throws IOException
+    {
+        Files.delete(tempDirectory);
+    }
+
+    private void cleanupFiles()
+            throws IOException
+    {
+        // tests will leave directories
+        try (Stream<Path> walk = Files.walk(tempDirectory)) {
+            Iterator<Path> iterator = walk.sorted(Comparator.reverseOrder()).iterator();
+            while (iterator.hasNext()) {
+                Path path = iterator.next();
+                if (!path.equals(tempDirectory)) {
+                    Files.delete(path);
+                }
+            }
+        }
+    }
+
+    @Override
+    protected boolean isHierarchical()
+    {
+        return true;
+    }
+
+    @Override
+    protected TrinoFileSystem getFileSystem()
+    {
+        return fileSystem;
+    }
+
+    @Override
+    protected Location getRootLocation()
+    {
+        return Location.of("local://");
+    }
+
+    @Override
+    protected void verifyFileSystemIsEmpty()
+    {
+        try {
+            try (Stream<Path> entries = Files.list(tempDirectory)) {
+                assertThat(entries.filter(not(tempDirectory::equals)).findFirst()).isEmpty();
+            }
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @Test
+    void testPathsOutOfBounds()
+    {
+        assertThatThrownBy(() -> getFileSystem().newInputFile(createLocation("../file")))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(createLocation("../file").toString());
+        assertThatThrownBy(() -> getFileSystem().newInputFile(createLocation("../file"), 22))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(createLocation("../file").toString());
+        assertThatThrownBy(() -> getFileSystem().newOutputFile(createLocation("../file")))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(createLocation("../file").toString());
+        assertThatThrownBy(() -> getFileSystem().deleteFile(createLocation("../file")))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(createLocation("../file").toString());
+        assertThatThrownBy(() -> getFileSystem().listFiles(createLocation("../file")))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(createLocation("../file").toString());
+        assertThatThrownBy(() -> getFileSystem().renameFile(createLocation("../file"), createLocation("target")))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(createLocation("../file").toString());
+        assertThatThrownBy(() -> getFileSystem().renameFile(createLocation("source"), createLocation("../file")))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(createLocation("../file").toString());
+    }
+}
diff --git a/lib/trino-filesystem/src/test/java/io/trino/filesystem/memory/TestMemoryFileSystem.java b/lib/trino-filesystem/src/test/java/io/trino/filesystem/memory/TestMemoryFileSystem.java
new file mode 100644
index 000000000000..a1014dc89809
--- /dev/null
+++ b/lib/trino-filesystem/src/test/java/io/trino/filesystem/memory/TestMemoryFileSystem.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed 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 io.trino.filesystem.memory;
+
+import io.trino.filesystem.AbstractTestTrinoFileSystem;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestMemoryFileSystem
+        extends AbstractTestTrinoFileSystem
+{
+    private MemoryFileSystem fileSystem;
+
+    @BeforeAll
+    void setUp()
+    {
+        fileSystem = new MemoryFileSystem();
+    }
+
+    @AfterAll
+    void tearDown()
+    {
+        fileSystem = null;
+    }
+
+    @Override
+    protected boolean isHierarchical()
+    {
+        return false;
+    }
+
+    @Override
+    protected TrinoFileSystem getFileSystem()
+    {
+        return fileSystem;
+    }
+
+    @Override
+    protected Location getRootLocation()
+    {
+        return Location.of("memory://");
+    }
+
+    @Override
+    protected void verifyFileSystemIsEmpty()
+    {
+        assertThat(fileSystem.isEmpty()).isTrue();
+    }
+}
diff --git a/lib/trino-filesystem/src/test/java/io/trino/filesystem/tracing/TestTracing.java b/lib/trino-filesystem/src/test/java/io/trino/filesystem/tracing/TestTracing.java
new file mode 100644
index 000000000000..aa49de4e2e10
--- /dev/null
+++ b/lib/trino-filesystem/src/test/java/io/trino/filesystem/tracing/TestTracing.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed 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 io.trino.filesystem.tracing;
+
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.TrinoInput;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoOutputFile;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
+
+public class TestTracing
+{
+    @Test
+    public void testEverythingImplemented()
+    {
+        assertAllMethodsOverridden(TrinoFileSystemFactory.class, TracingFileSystemFactory.class);
+        assertAllMethodsOverridden(TrinoFileSystem.class, TracingFileSystem.class);
+        assertAllMethodsOverridden(TrinoInputFile.class, TracingInputFile.class);
+        assertAllMethodsOverridden(TrinoInput.class, TracingInput.class);
+        assertAllMethodsOverridden(TrinoOutputFile.class, TracingOutputFile.class);
+    }
+}
diff --git a/lib/trino-geospatial-toolkit/pom.xml b/lib/trino-geospatial-toolkit/pom.xml
index 0d6051a6bcd6..8f8dd952df8e 100644
--- a/lib/trino-geospatial-toolkit/pom.xml
+++ b/lib/trino-geospatial-toolkit/pom.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -16,21 +16,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.esri.geometry</groupId>
             <artifactId>esri-geometry-api</artifactId>
@@ -42,24 +27,29 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -72,6 +62,12 @@
             <artifactId>jts-io-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing-services</artifactId>
@@ -79,22 +75,27 @@
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/lib/trino-geospatial-toolkit/src/main/java/io/trino/geospatial/GeometryUtils.java b/lib/trino-geospatial-toolkit/src/main/java/io/trino/geospatial/GeometryUtils.java
index 351309b17fa0..ee75c2aa10e2 100644
--- a/lib/trino-geospatial-toolkit/src/main/java/io/trino/geospatial/GeometryUtils.java
+++ b/lib/trino-geospatial-toolkit/src/main/java/io/trino/geospatial/GeometryUtils.java
@@ -23,35 +23,18 @@
 import com.esri.core.geometry.ogc.OGCGeometry;
 import com.esri.core.geometry.ogc.OGCPoint;
 import com.esri.core.geometry.ogc.OGCPolygon;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableMap;
 import io.trino.spi.TrinoException;
-import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.io.ParseException;
 import org.locationtech.jts.io.geojson.GeoJsonReader;
 import org.locationtech.jts.io.geojson.GeoJsonWriter;
 
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 
 public final class GeometryUtils
 {
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-    private static final GeometryFactory GEOMETRY_FACTORY = new GeometryFactory();
-    private static final String TYPE_ATTRIBUTE = "type";
-    private static final String COORDINATES_ATTRIBUTE = "coordinates";
-    private static final Map<String, String> EMPTY_ATOMIC_GEOMETRY_JSON_OVERRIDE = ImmutableMap.of(
-            "LineString", "{\"type\":\"LineString\",\"coordinates\":[]}",
-            "Point", "{\"type\":\"Point\",\"coordinates\":[]}");
-    private static final Map<String, org.locationtech.jts.geom.Geometry> EMPTY_ATOMIC_GEOMETRY_OVERRIDE = ImmutableMap.of(
-            "Polygon", GEOMETRY_FACTORY.createPolygon(),
-            "Point", GEOMETRY_FACTORY.createPoint());
-
     private GeometryUtils() {}
 
     /**
@@ -187,10 +170,6 @@ public static boolean isPointOrRectangle(OGCGeometry ogcGeometry, Envelope envel
     public static org.locationtech.jts.geom.Geometry jtsGeometryFromJson(String json)
     {
         try {
-            org.locationtech.jts.geom.Geometry emptyGeoJsonOverride = getEmptyGeometryOverride(json);
-            if (emptyGeoJsonOverride != null) {
-                return emptyGeoJsonOverride;
-            }
             return new GeoJsonReader().read(json);
         }
         catch (ParseException | IllegalArgumentException e) {
@@ -198,60 +177,8 @@ public static org.locationtech.jts.geom.Geometry jtsGeometryFromJson(String json
         }
     }
 
-    /**
-     * Return an empty geometry in the cases in which the locationtech library
-     * doesn't when the coordinates attribute is an empty array. In particular,
-     * these two cases are handled by the underlying library as follows:
-     * {type:Point, coordinates:[]} -> POINT (0 0)
-     * {type:Polygon, coordinates[]} -> Exception during parsing
-     * To circumvent these inconsistencies, we catch this upfront and return
-     * the correct empty geometry.
-     * TODO: Remove if/when https://github.com/locationtech/jts/issues/684 is fixed.
-     */
-    private static org.locationtech.jts.geom.Geometry getEmptyGeometryOverride(String json)
-    {
-        try {
-            JsonNode jsonNode = OBJECT_MAPPER.readTree(json);
-            JsonNode typeNode = jsonNode.get(TYPE_ATTRIBUTE);
-            if (typeNode != null) {
-                org.locationtech.jts.geom.Geometry emptyGeometry = EMPTY_ATOMIC_GEOMETRY_OVERRIDE.get(typeNode.textValue());
-                if (emptyGeometry != null) {
-                    JsonNode coordinatesNode = jsonNode.get(COORDINATES_ATTRIBUTE);
-                    if (coordinatesNode != null && coordinatesNode.isArray() && coordinatesNode.isEmpty()) {
-                        return emptyGeometry;
-                    }
-                }
-            }
-        }
-        catch (JsonProcessingException e) {
-            // Ignore and have subsequent GeoJsonReader throw
-        }
-        return null;
-    }
-
     public static String jsonFromJtsGeometry(org.locationtech.jts.geom.Geometry geometry)
     {
-        String geoJsonOverride = getEmptyGeoJsonOverride(geometry);
-        if (geoJsonOverride != null) {
-            return geoJsonOverride;
-        }
-
         return new GeoJsonWriter().write(geometry);
     }
-
-    /**
-     * Return GeoJSON with an empty coordinate array when the geometry is empty. This
-     * overrides the behavior of the locationtech library which returns invalid
-     * GeoJSON in these cases. For example, in the case of an empty point,
-     * locationtech would return:
-     * {type:Point, coordinates:, ...}
-     * TODO: Remove if/when https://github.com/locationtech/jts/issues/411 is fixed
-     */
-    private static String getEmptyGeoJsonOverride(org.locationtech.jts.geom.Geometry geometry)
-    {
-        if (geometry.isEmpty()) {
-            return EMPTY_ATOMIC_GEOMETRY_JSON_OVERRIDE.get(geometry.getGeometryType());
-        }
-        return null;
-    }
 }
diff --git a/lib/trino-geospatial-toolkit/src/main/java/io/trino/geospatial/KdbTreeUtils.java b/lib/trino-geospatial-toolkit/src/main/java/io/trino/geospatial/KdbTreeUtils.java
index 96a09dc1cf23..e4efa05c612c 100644
--- a/lib/trino-geospatial-toolkit/src/main/java/io/trino/geospatial/KdbTreeUtils.java
+++ b/lib/trino-geospatial-toolkit/src/main/java/io/trino/geospatial/KdbTreeUtils.java
@@ -35,4 +35,10 @@ public static String toJson(KdbTree kdbTree)
         requireNonNull(kdbTree, "kdbTree is null");
         return KDB_TREE_CODEC.toJson(kdbTree);
     }
+
+    public static byte[] toJsonBytes(KdbTree kdbTree)
+    {
+        requireNonNull(kdbTree, "kdbTree is null");
+        return KDB_TREE_CODEC.toJsonBytes(kdbTree);
+    }
 }
diff --git a/lib/trino-geospatial-toolkit/src/main/java/io/trino/geospatial/serde/GeometrySerde.java b/lib/trino-geospatial-toolkit/src/main/java/io/trino/geospatial/serde/GeometrySerde.java
index 329344c301d8..2b3dba0a911b 100644
--- a/lib/trino-geospatial-toolkit/src/main/java/io/trino/geospatial/serde/GeometrySerde.java
+++ b/lib/trino-geospatial-toolkit/src/main/java/io/trino/geospatial/serde/GeometrySerde.java
@@ -35,8 +35,7 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceInput;
 import io.trino.geospatial.GeometryType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/lib/trino-geospatial-toolkit/src/test/java/io/trino/geospatial/TestKdbTree.java b/lib/trino-geospatial-toolkit/src/test/java/io/trino/geospatial/TestKdbTree.java
index 2c582c63aeeb..9a4d7ef18b30 100644
--- a/lib/trino-geospatial-toolkit/src/test/java/io/trino/geospatial/TestKdbTree.java
+++ b/lib/trino-geospatial-toolkit/src/test/java/io/trino/geospatial/TestKdbTree.java
@@ -16,13 +16,13 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Set;
 
 import static io.trino.geospatial.KdbTree.buildKdbTree;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestKdbTree
 {
@@ -45,7 +45,7 @@ public void testSerde()
     private void testSerializationRoundtrip(KdbTree tree)
     {
         KdbTree treeCopy = KdbTreeUtils.fromJson(KdbTreeUtils.toJson(tree));
-        assertEquals(treeCopy, tree);
+        assertThat(treeCopy).isEqualTo(tree);
     }
 
     @Test
@@ -67,11 +67,11 @@ private void testSinglePartition(double width, double height)
 
         KdbTree tree = buildKdbTree(100, extent, rectangles.build());
 
-        assertEquals(tree.getLeaves().size(), 1);
+        assertThat(tree.getLeaves().size()).isEqualTo(1);
 
         Map.Entry<Integer, Rectangle> entry = Iterables.getOnlyElement(tree.getLeaves().entrySet());
-        assertEquals(entry.getKey().intValue(), 0);
-        assertEquals(entry.getValue(), extent);
+        assertThat(entry.getKey().intValue()).isEqualTo(0);
+        assertThat(entry.getValue()).isEqualTo(extent);
     }
 
     @Test
@@ -94,10 +94,10 @@ private void testSplitVertically(double width, double height)
         KdbTree treeCopy = buildKdbTree(25, extent, rectangles.build());
 
         Map<Integer, Rectangle> leafNodes = treeCopy.getLeaves();
-        assertEquals(leafNodes.size(), 2);
-        assertEquals(leafNodes.keySet(), ImmutableSet.of(0, 1));
-        assertEquals(leafNodes.get(0), new Rectangle(0, 0, 4.5, 4));
-        assertEquals(leafNodes.get(1), new Rectangle(4.5, 0, 9, 4));
+        assertThat(leafNodes.size()).isEqualTo(2);
+        assertThat(leafNodes.keySet()).isEqualTo(ImmutableSet.of(0, 1));
+        assertThat(leafNodes.get(0)).isEqualTo(new Rectangle(0, 0, 4.5, 4));
+        assertThat(leafNodes.get(1)).isEqualTo(new Rectangle(4.5, 0, 9, 4));
 
         assertPartitions(treeCopy, new Rectangle(1, 1, 2, 2), ImmutableSet.of(0));
         assertPartitions(treeCopy, new Rectangle(1, 1, 5, 2), ImmutableSet.of(0, 1));
@@ -123,10 +123,10 @@ private void testSplitHorizontally(double width, double height)
         KdbTree tree = buildKdbTree(25, extent, rectangles.build());
 
         Map<Integer, Rectangle> leafNodes = tree.getLeaves();
-        assertEquals(leafNodes.size(), 2);
-        assertEquals(leafNodes.keySet(), ImmutableSet.of(0, 1));
-        assertEquals(leafNodes.get(0), new Rectangle(0, 0, 4, 4.5));
-        assertEquals(leafNodes.get(1), new Rectangle(0, 4.5, 4, 9));
+        assertThat(leafNodes.size()).isEqualTo(2);
+        assertThat(leafNodes.keySet()).isEqualTo(ImmutableSet.of(0, 1));
+        assertThat(leafNodes.get(0)).isEqualTo(new Rectangle(0, 0, 4, 4.5));
+        assertThat(leafNodes.get(1)).isEqualTo(new Rectangle(0, 4.5, 4, 9));
 
         // points inside and outside partitions
         assertPartitions(tree, new Rectangle(1, 1, 1, 1), ImmutableSet.of(0));
@@ -146,8 +146,8 @@ private void testSplitHorizontally(double width, double height)
     private void assertPartitions(KdbTree kdbTree, Rectangle envelope, Set<Integer> partitions)
     {
         Map<Integer, Rectangle> matchingNodes = kdbTree.findIntersectingLeaves(envelope);
-        assertEquals(matchingNodes.size(), partitions.size());
-        assertEquals(matchingNodes.keySet(), partitions);
+        assertThat(matchingNodes.size()).isEqualTo(partitions.size());
+        assertThat(matchingNodes.keySet()).isEqualTo(partitions);
     }
 
     @Test
@@ -170,14 +170,14 @@ private void testEvenDistribution(double width, double height)
         KdbTree tree = buildKdbTree(10, extent, rectangles.build());
 
         Map<Integer, Rectangle> leafNodes = tree.getLeaves();
-        assertEquals(leafNodes.size(), 6);
-        assertEquals(leafNodes.keySet(), ImmutableSet.of(0, 1, 2, 3, 4, 5));
-        assertEquals(leafNodes.get(0), new Rectangle(0, 0, 2.5, 2.5));
-        assertEquals(leafNodes.get(1), new Rectangle(0, 2.5, 2.5, 4));
-        assertEquals(leafNodes.get(2), new Rectangle(2.5, 0, 4.5, 4));
-        assertEquals(leafNodes.get(3), new Rectangle(4.5, 0, 7.5, 2.5));
-        assertEquals(leafNodes.get(4), new Rectangle(4.5, 2.5, 7.5, 4));
-        assertEquals(leafNodes.get(5), new Rectangle(7.5, 0, 9, 4));
+        assertThat(leafNodes.size()).isEqualTo(6);
+        assertThat(leafNodes.keySet()).isEqualTo(ImmutableSet.of(0, 1, 2, 3, 4, 5));
+        assertThat(leafNodes.get(0)).isEqualTo(new Rectangle(0, 0, 2.5, 2.5));
+        assertThat(leafNodes.get(1)).isEqualTo(new Rectangle(0, 2.5, 2.5, 4));
+        assertThat(leafNodes.get(2)).isEqualTo(new Rectangle(2.5, 0, 4.5, 4));
+        assertThat(leafNodes.get(3)).isEqualTo(new Rectangle(4.5, 0, 7.5, 2.5));
+        assertThat(leafNodes.get(4)).isEqualTo(new Rectangle(4.5, 2.5, 7.5, 4));
+        assertThat(leafNodes.get(5)).isEqualTo(new Rectangle(7.5, 0, 9, 4));
     }
 
     @Test
@@ -206,17 +206,17 @@ private void testSkewedDistribution(double width, double height)
         KdbTree tree = buildKdbTree(10, extent, rectangles.build());
 
         Map<Integer, Rectangle> leafNodes = tree.getLeaves();
-        assertEquals(leafNodes.size(), 9);
-        assertEquals(leafNodes.keySet(), ImmutableSet.of(0, 1, 2, 3, 4, 5, 6, 7, 8));
-        assertEquals(leafNodes.get(0), new Rectangle(0, 0, 1.5, 2.5));
-        assertEquals(leafNodes.get(1), new Rectangle(1.5, 0, 3.5, 2.5));
-        assertEquals(leafNodes.get(2), new Rectangle(0, 2.5, 3.5, 4));
-        assertEquals(leafNodes.get(3), new Rectangle(3.5, 0, 5.1, 1.75));
-        assertEquals(leafNodes.get(4), new Rectangle(3.5, 1.75, 5.1, 4));
-        assertEquals(leafNodes.get(5), new Rectangle(5.1, 0, 5.9, 1.75));
-        assertEquals(leafNodes.get(6), new Rectangle(5.9, 0, 9, 1.75));
-        assertEquals(leafNodes.get(7), new Rectangle(5.1, 1.75, 7.5, 4));
-        assertEquals(leafNodes.get(8), new Rectangle(7.5, 1.75, 9, 4));
+        assertThat(leafNodes.size()).isEqualTo(9);
+        assertThat(leafNodes.keySet()).isEqualTo(ImmutableSet.of(0, 1, 2, 3, 4, 5, 6, 7, 8));
+        assertThat(leafNodes.get(0)).isEqualTo(new Rectangle(0, 0, 1.5, 2.5));
+        assertThat(leafNodes.get(1)).isEqualTo(new Rectangle(1.5, 0, 3.5, 2.5));
+        assertThat(leafNodes.get(2)).isEqualTo(new Rectangle(0, 2.5, 3.5, 4));
+        assertThat(leafNodes.get(3)).isEqualTo(new Rectangle(3.5, 0, 5.1, 1.75));
+        assertThat(leafNodes.get(4)).isEqualTo(new Rectangle(3.5, 1.75, 5.1, 4));
+        assertThat(leafNodes.get(5)).isEqualTo(new Rectangle(5.1, 0, 5.9, 1.75));
+        assertThat(leafNodes.get(6)).isEqualTo(new Rectangle(5.9, 0, 9, 1.75));
+        assertThat(leafNodes.get(7)).isEqualTo(new Rectangle(5.1, 1.75, 7.5, 4));
+        assertThat(leafNodes.get(8)).isEqualTo(new Rectangle(7.5, 1.75, 9, 4));
     }
 
     @Test
@@ -240,18 +240,18 @@ private void testCantSplitVertically(double width, double height)
         KdbTree tree = buildKdbTree(10, extent, rectangles.build());
 
         Map<Integer, Rectangle> leafNodes = tree.getLeaves();
-        assertEquals(leafNodes.size(), 10);
-        assertEquals(leafNodes.keySet(), ImmutableSet.of(0, 1, 2, 3, 4, 5, 6, 7, 8, 9));
-        assertEquals(leafNodes.get(0), new Rectangle(0, 0, 4.5, 0.5));
-        assertEquals(leafNodes.get(1), new Rectangle(0, 0.5, 4.5, 1.5));
-        assertEquals(leafNodes.get(2), new Rectangle(0, 1.5, 4.5, 2.5));
-        assertEquals(leafNodes.get(3), new Rectangle(0, 2.5, 4.5, 3.5));
-        assertEquals(leafNodes.get(4), new Rectangle(0, 3.5, 4.5, 4 + height));
-        assertEquals(leafNodes.get(5), new Rectangle(4.5, 0, 9 + width, 0.5));
-        assertEquals(leafNodes.get(6), new Rectangle(4.5, 0.5, 9 + width, 1.5));
-        assertEquals(leafNodes.get(7), new Rectangle(4.5, 1.5, 9 + width, 2.5));
-        assertEquals(leafNodes.get(8), new Rectangle(4.5, 2.5, 9 + width, 3.5));
-        assertEquals(leafNodes.get(9), new Rectangle(4.5, 3.5, 9 + width, 4 + height));
+        assertThat(leafNodes.size()).isEqualTo(10);
+        assertThat(leafNodes.keySet()).isEqualTo(ImmutableSet.of(0, 1, 2, 3, 4, 5, 6, 7, 8, 9));
+        assertThat(leafNodes.get(0)).isEqualTo(new Rectangle(0, 0, 4.5, 0.5));
+        assertThat(leafNodes.get(1)).isEqualTo(new Rectangle(0, 0.5, 4.5, 1.5));
+        assertThat(leafNodes.get(2)).isEqualTo(new Rectangle(0, 1.5, 4.5, 2.5));
+        assertThat(leafNodes.get(3)).isEqualTo(new Rectangle(0, 2.5, 4.5, 3.5));
+        assertThat(leafNodes.get(4)).isEqualTo(new Rectangle(0, 3.5, 4.5, 4 + height));
+        assertThat(leafNodes.get(5)).isEqualTo(new Rectangle(4.5, 0, 9 + width, 0.5));
+        assertThat(leafNodes.get(6)).isEqualTo(new Rectangle(4.5, 0.5, 9 + width, 1.5));
+        assertThat(leafNodes.get(7)).isEqualTo(new Rectangle(4.5, 1.5, 9 + width, 2.5));
+        assertThat(leafNodes.get(8)).isEqualTo(new Rectangle(4.5, 2.5, 9 + width, 3.5));
+        assertThat(leafNodes.get(9)).isEqualTo(new Rectangle(4.5, 3.5, 9 + width, 4 + height));
     }
 
     @Test
@@ -275,9 +275,9 @@ private void testCantSplit(double width, double height)
         KdbTree tree = buildKdbTree(10, extent, rectangles.build());
 
         Map<Integer, Rectangle> leafNodes = tree.getLeaves();
-        assertEquals(leafNodes.size(), 2);
-        assertEquals(leafNodes.keySet(), ImmutableSet.of(0, 1));
-        assertEquals(leafNodes.get(0), new Rectangle(0, 0, 4.5, 4 + height));
-        assertEquals(leafNodes.get(1), new Rectangle(4.5, 0, 9 + width, 4 + height));
+        assertThat(leafNodes.size()).isEqualTo(2);
+        assertThat(leafNodes.keySet()).isEqualTo(ImmutableSet.of(0, 1));
+        assertThat(leafNodes.get(0)).isEqualTo(new Rectangle(0, 0, 4.5, 4 + height));
+        assertThat(leafNodes.get(1)).isEqualTo(new Rectangle(4.5, 0, 9 + width, 4 + height));
     }
 }
diff --git a/lib/trino-geospatial-toolkit/src/test/java/io/trino/geospatial/serde/TestGeometrySerialization.java b/lib/trino-geospatial-toolkit/src/test/java/io/trino/geospatial/serde/TestGeometrySerialization.java
index 14bca80a0394..6041919f7f3b 100644
--- a/lib/trino-geospatial-toolkit/src/test/java/io/trino/geospatial/serde/TestGeometrySerialization.java
+++ b/lib/trino-geospatial-toolkit/src/test/java/io/trino/geospatial/serde/TestGeometrySerialization.java
@@ -16,10 +16,10 @@
 import com.esri.core.geometry.Envelope;
 import com.esri.core.geometry.ogc.OGCGeometry;
 import io.airlift.slice.Slice;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.io.ParseException;
 import org.locationtech.jts.io.WKTReader;
-import org.testng.annotations.Test;
 
 import static com.esri.core.geometry.ogc.OGCGeometry.createFromEsriGeometry;
 import static io.trino.geospatial.serde.GeometrySerde.deserialize;
@@ -34,7 +34,7 @@
 import static io.trino.geospatial.serde.GeometrySerializationType.MULTI_POLYGON;
 import static io.trino.geospatial.serde.GeometrySerializationType.POINT;
 import static io.trino.geospatial.serde.GeometrySerializationType.POLYGON;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestGeometrySerialization
 {
@@ -141,9 +141,9 @@ public void testEnvelope()
 
     private void testEnvelopeSerialization(Envelope envelope)
     {
-        assertEquals(deserialize(serialize(envelope)), createFromEsriGeometry(envelope, null));
-        assertEquals(deserializeEnvelope(serialize(envelope)), envelope);
-        assertEquals(JtsGeometrySerde.serialize(JtsGeometrySerde.deserialize(serialize(envelope))), serialize(createFromEsriGeometry(envelope, null)));
+        assertThat(deserialize(serialize(envelope))).isEqualTo(createFromEsriGeometry(envelope, null));
+        assertThat(deserializeEnvelope(serialize(envelope))).isEqualTo(envelope);
+        assertThat(JtsGeometrySerde.serialize(JtsGeometrySerde.deserialize(serialize(envelope)))).isEqualTo(serialize(createFromEsriGeometry(envelope, null)));
     }
 
     @Test
@@ -178,7 +178,7 @@ public void testDeserializeType()
         assertDeserializeType("GEOMETRYCOLLECTION (POINT (3 7), LINESTRING (4 6, 7 10))", GEOMETRY_COLLECTION);
         assertDeserializeType("GEOMETRYCOLLECTION EMPTY", GEOMETRY_COLLECTION);
 
-        assertEquals(deserializeType(serialize(new Envelope(1, 2, 3, 4))), ENVELOPE);
+        assertThat(deserializeType(serialize(new Envelope(1, 2, 3, 4)))).isEqualTo(ENVELOPE);
     }
 
     private static void testSerialization(String wkt)
@@ -201,7 +201,7 @@ private static void testJtsSerialization(String wkt)
 
         Slice jtsSerialized = JtsGeometrySerde.serialize(jtsGeometry);
         Slice esriSerialized = GeometrySerde.serialize(esriGeometry);
-        assertEquals(jtsSerialized, esriSerialized);
+        assertThat(jtsSerialized).isEqualTo(esriSerialized);
 
         Geometry jtsDeserialized = JtsGeometrySerde.deserialize(jtsSerialized);
         assertGeometryEquals(jtsDeserialized, jtsGeometry);
@@ -227,17 +227,17 @@ private static Geometry createJtsGeometry(String wkt)
 
     private static void assertGeometryEquals(Geometry actual, Geometry expected)
     {
-        assertEquals(actual.norm(), expected.norm());
+        assertThat(actual.norm()).isEqualTo(expected.norm());
     }
 
     private static void assertDeserializeEnvelope(String geometry, Envelope expectedEnvelope)
     {
-        assertEquals(deserializeEnvelope(geometryFromText(geometry)), expectedEnvelope);
+        assertThat(deserializeEnvelope(geometryFromText(geometry))).isEqualTo(expectedEnvelope);
     }
 
     private static void assertDeserializeType(String wkt, GeometrySerializationType expectedType)
     {
-        assertEquals(deserializeType(geometryFromText(wkt)), expectedType);
+        assertThat(deserializeType(geometryFromText(wkt))).isEqualTo(expectedType);
     }
 
     private static void assertGeometryEquals(OGCGeometry actual, OGCGeometry expected)
@@ -246,7 +246,7 @@ private static void assertGeometryEquals(OGCGeometry actual, OGCGeometry expecte
         expected.setSpatialReference(null);
         ensureEnvelopeLoaded(actual);
         ensureEnvelopeLoaded(expected);
-        assertEquals(actual, expected);
+        assertThat(actual).isEqualTo(expected);
     }
 
     /**
diff --git a/lib/trino-hadoop-toolkit/pom.xml b/lib/trino-hadoop-toolkit/pom.xml
index 1f2183ec1c94..abb93c98d8d9 100644
--- a/lib/trino-hadoop-toolkit/pom.xml
+++ b/lib/trino-hadoop-toolkit/pom.xml
@@ -5,19 +5,18 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-hadoop-toolkit</artifactId>
-    <name>trino-hadoop-toolkit</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <air.compiler.fail-warnings>true</air.compiler.fail-warnings>
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-spi</artifactId>
@@ -34,8 +33,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/lib/trino-hadoop-toolkit/src/test/java/io/trino/hadoop/TestDummy.java b/lib/trino-hadoop-toolkit/src/test/java/io/trino/hadoop/TestDummy.java
index 05fd986b32a9..ad45437142b3 100644
--- a/lib/trino-hadoop-toolkit/src/test/java/io/trino/hadoop/TestDummy.java
+++ b/lib/trino-hadoop-toolkit/src/test/java/io/trino/hadoop/TestDummy.java
@@ -13,7 +13,7 @@
  */
 package io.trino.hadoop;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestDummy
 {
diff --git a/lib/trino-hdfs/pom.xml b/lib/trino-hdfs/pom.xml
index c4f9be5812be..de0536a49c0f 100644
--- a/lib/trino-hdfs/pom.xml
+++ b/lib/trino-hdfs/pom.xml
@@ -5,46 +5,80 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-hdfs</artifactId>
-    <name>trino-hdfs</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <!-- Move TestFileSystemCache to separate profile to isolate it from interactions coming
+             from other threads against the global file system cache, resulting in flaky CI -->
+        <isolatedJvmTests>**/TestFileSystemCache.java</isolatedJvmTests>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-filesystem</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hadoop-toolkit</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-s3</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-memory-context</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-sts</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hadoop</groupId>
-            <artifactId>hadoop-apache</artifactId>
+            <groupId>com.google.cloud.bigdataoss</groupId>
+            <artifactId>gcs-connector</artifactId>
+            <classifier>shaded</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.qubole.rubix</groupId>
+            <artifactId>rubix-presto-shaded</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>concurrent</artifactId>
         </dependency>
 
         <dependency>
@@ -52,6 +86,11 @@
             <artifactId>configuration</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>http-client</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>log</artifactId>
@@ -73,29 +112,53 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-aws-sdk-1.11</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hadoop-toolkit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-memory-context</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino.hadoop</groupId>
+            <artifactId>hadoop-apache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -108,17 +171,15 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.adobe.testing</groupId>
+            <artifactId>s3mock-testcontainers</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -128,12 +189,55 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-client</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-containers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
@@ -146,10 +250,84 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>${isolatedJvmTests}</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>test-isolated-jvm-suites</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <includes>
+                                <include>${isolatedJvmTests}</include>
+                            </includes>
+                            <reuseForks>false</reuseForks>
+                            <forkCount>1</forkCount>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/plugin/trino-delta-lake/src/main/java/com/google/cloud/hadoop/fs/gcs/TrinoGoogleHadoopFileSystemConfiguration.java b/lib/trino-hdfs/src/main/java/com/google/cloud/hadoop/fs/gcs/TrinoGoogleHadoopFileSystemConfiguration.java
similarity index 95%
rename from plugin/trino-delta-lake/src/main/java/com/google/cloud/hadoop/fs/gcs/TrinoGoogleHadoopFileSystemConfiguration.java
rename to lib/trino-hdfs/src/main/java/com/google/cloud/hadoop/fs/gcs/TrinoGoogleHadoopFileSystemConfiguration.java
index 68543fba4a25..b3026fa04488 100644
--- a/plugin/trino-delta-lake/src/main/java/com/google/cloud/hadoop/fs/gcs/TrinoGoogleHadoopFileSystemConfiguration.java
+++ b/lib/trino-hdfs/src/main/java/com/google/cloud/hadoop/fs/gcs/TrinoGoogleHadoopFileSystemConfiguration.java
@@ -21,7 +21,7 @@
  * convert {@link Configuration} to gcs hadoop-connectors specific
  * configuration instances.
  */
-public class TrinoGoogleHadoopFileSystemConfiguration
+public final class TrinoGoogleHadoopFileSystemConfiguration
 {
     private TrinoGoogleHadoopFileSystemConfiguration() {}
 
diff --git a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HadoopPaths.java b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HadoopPaths.java
index 46a5bddb7eb4..0e42a5fe4faf 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HadoopPaths.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HadoopPaths.java
@@ -13,28 +13,39 @@
  */
 package io.trino.filesystem.hdfs;
 
+import com.google.common.base.VerifyException;
+import io.trino.filesystem.Location;
 import org.apache.hadoop.fs.Path;
 
 import java.net.URI;
-import java.net.URLEncoder;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
+import java.net.URISyntaxException;
 
 public final class HadoopPaths
 {
     private HadoopPaths() {}
 
-    public static Path hadoopPath(String path)
+    public static Path hadoopPath(Location location)
     {
         // hack to preserve the original path for S3 if necessary
+        String path = location.toString();
         Path hadoopPath = new Path(path);
         if ("s3".equals(hadoopPath.toUri().getScheme()) && !path.equals(hadoopPath.toString())) {
-            if (hadoopPath.toUri().getFragment() != null) {
-                throw new IllegalArgumentException("Unexpected URI fragment in path: " + path);
-            }
-            URI uri = URI.create(path);
-            return new Path(uri + "#" + URLEncoder.encode(uri.getPath(), UTF_8));
+            return new Path(toPathEncodedUri(location));
         }
         return hadoopPath;
     }
+
+    private static URI toPathEncodedUri(Location location)
+    {
+        try {
+            return new URI(
+                    location.scheme().orElse(null),
+                    location.host().orElse(null),
+                    "/" + location.path(),
+                    location.path());
+        }
+        catch (URISyntaxException e) {
+            throw new VerifyException("Failed to convert location to URI: " + location, e);
+        }
+    }
 }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileIterator.java b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileIterator.java
index 422d285199fb..78fc58fbe7b3 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileIterator.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileIterator.java
@@ -17,20 +17,21 @@
 import io.trino.filesystem.FileEntry;
 import io.trino.filesystem.FileEntry.Block;
 import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import org.apache.hadoop.fs.BlockLocation;
-import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.LocatedFileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.RemoteIterator;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.net.URI;
 import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import static com.google.common.base.Strings.nullToEmpty;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static java.util.Objects.requireNonNull;
@@ -38,14 +39,14 @@
 class HdfsFileIterator
         implements FileIterator
 {
-    private final String listingPath;
-    private final URI listingUri;
+    private final Location listingLocation;
+    private final Path listingPath;
     private final RemoteIterator<LocatedFileStatus> iterator;
 
-    public HdfsFileIterator(String listingPath, FileSystem fs, RemoteIterator<LocatedFileStatus> iterator)
+    public HdfsFileIterator(Location listingLocation, Path listingPath, RemoteIterator<LocatedFileStatus> iterator)
     {
+        this.listingLocation = requireNonNull(listingLocation, "listingPath is null");
         this.listingPath = requireNonNull(listingPath, "listingPath is null");
-        this.listingUri = new Path(listingPath).makeQualified(fs.getUri(), fs.getWorkingDirectory()).toUri();
         this.iterator = requireNonNull(iterator, "iterator is null");
     }
 
@@ -53,7 +54,22 @@ public HdfsFileIterator(String listingPath, FileSystem fs, RemoteIterator<Locate
     public boolean hasNext()
             throws IOException
     {
-        return iterator.hasNext();
+        // TODO: remove this workaround for https://issues.apache.org/jira/browse/HADOOP-18662
+        int attempts = 0;
+        while (true) {
+            try {
+                return iterator.hasNext();
+            }
+            catch (FileNotFoundException | RuntimeException e) {
+                if ((e instanceof RuntimeException) && !nullToEmpty(e.getMessage()).contains(": No such file or directory\n")) {
+                    throw new IOException(e);
+                }
+                attempts++;
+                if (attempts > 1000) {
+                    throw e;
+                }
+            }
+        }
     }
 
     @Override
@@ -64,16 +80,8 @@ public FileEntry next()
 
         verify(status.isFile(), "iterator returned a non-file: %s", status);
 
-        URI pathUri = status.getPath().toUri();
-        URI relativeUri = listingUri.relativize(pathUri);
-        verify(!relativeUri.equals(pathUri), "cannot relativize [%s] against [%s]", pathUri, listingUri);
-
-        String path = listingPath;
-        if (!relativeUri.getPath().isEmpty()) {
-            if (!path.endsWith("/")) {
-                path += "/";
-            }
-            path += relativeUri.getPath();
+        if (status.getPath().equals(listingPath)) {
+            throw new IOException("Listing location is a file, not a directory: " + listingLocation);
         }
 
         List<Block> blocks = Stream.of(status.getBlockLocations())
@@ -81,12 +89,23 @@ public FileEntry next()
                 .collect(toImmutableList());
 
         return new FileEntry(
-                path,
+                listedLocation(listingLocation, listingPath, status.getPath()),
                 status.getLen(),
                 Instant.ofEpochMilli(status.getModificationTime()),
                 blocks.isEmpty() ? Optional.empty() : Optional.of(blocks));
     }
 
+    static Location listedLocation(Location listingLocation, Path listingPath, Path listedPath)
+    {
+        String root = listingPath.toUri().getPath();
+        String path = listedPath.toUri().getPath();
+
+        verify(path.startsWith(root), "iterator path [%s] not a child of listing path [%s] for location [%s]", path, root, listingLocation);
+
+        int index = root.endsWith("/") ? root.length() : root.length() + 1;
+        return listingLocation.appendPath(path.substring(index));
+    }
+
     private static Block toTrinoBlock(BlockLocation location)
     {
         try {
diff --git a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystem.java b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystem.java
index 7ef300a9383a..aa1337607e8a 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystem.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystem.java
@@ -13,26 +13,39 @@
  */
 package io.trino.filesystem.hdfs;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import io.airlift.stats.TimeStat;
 import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.filesystem.TrinoOutputFile;
 import io.trino.hdfs.FileSystemWithBatchDelete;
 import io.trino.hdfs.HdfsContext;
 import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
+import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.permission.FsPermission;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Stream;
 
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.filesystem.hdfs.HadoopPaths.hadoopPath;
+import static io.trino.filesystem.hdfs.HdfsFileIterator.listedLocation;
 import static io.trino.hdfs.FileSystemUtils.getRawFileSystem;
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.mapping;
@@ -41,54 +54,80 @@
 class HdfsFileSystem
         implements TrinoFileSystem
 {
+    private static final Map<String, Boolean> KNOWN_HIERARCHICAL_FILESYSTEMS = ImmutableMap.<String, Boolean>builder()
+            .put("s3", false)
+            .put("s3a", false)
+            .put("s3n", false)
+            .put("hdfs", true)
+            .buildOrThrow();
+
     private final HdfsEnvironment environment;
     private final HdfsContext context;
+    private final TrinoHdfsFileSystemStats stats;
+
+    private final Map<FileSystem, Boolean> hierarchicalFileSystemCache = new IdentityHashMap<>();
 
-    public HdfsFileSystem(HdfsEnvironment environment, HdfsContext context)
+    public HdfsFileSystem(HdfsEnvironment environment, HdfsContext context, TrinoHdfsFileSystemStats stats)
     {
         this.environment = requireNonNull(environment, "environment is null");
         this.context = requireNonNull(context, "context is null");
+        this.stats = requireNonNull(stats, "stats is null");
     }
 
     @Override
-    public TrinoInputFile newInputFile(String location)
+    public TrinoInputFile newInputFile(Location location)
     {
-        return new HdfsInputFile(location, null, environment, context);
+        return new HdfsInputFile(location, null, environment, context, stats.getOpenFileCalls());
     }
 
     @Override
-    public TrinoInputFile newInputFile(String location, long length)
+    public TrinoInputFile newInputFile(Location location, long length)
     {
-        return new HdfsInputFile(location, length, environment, context);
+        return new HdfsInputFile(location, length, environment, context, stats.getOpenFileCalls());
     }
 
     @Override
-    public TrinoOutputFile newOutputFile(String location)
+    public TrinoOutputFile newOutputFile(Location location)
     {
-        return new HdfsOutputFile(location, environment, context);
+        return new HdfsOutputFile(location, environment, context, stats.getCreateFileCalls());
     }
 
     @Override
-    public void deleteFile(String location)
+    public void deleteFile(Location location)
             throws IOException
     {
+        location.verifyValidFileLocation();
+        stats.getDeleteFileCalls().newCall();
         Path file = hadoopPath(location);
         FileSystem fileSystem = environment.getFileSystem(context, file);
         environment.doAs(context.getIdentity(), () -> {
-            if (!fileSystem.delete(file, false)) {
-                throw new IOException("Failed to delete file: " + file);
+            try (TimeStat.BlockTimer ignored = stats.getDeleteFileCalls().time()) {
+                if (hierarchical(fileSystem, location) && !fileSystem.getFileStatus(file).isFile()) {
+                    throw new IOException("Location is not a file");
+                }
+                if (!fileSystem.delete(file, false)) {
+                    throw new IOException("delete failed");
+                }
+                return null;
+            }
+            catch (FileNotFoundException e) {
+                stats.getDeleteFileCalls().recordException(e);
+                throw new FileNotFoundException(location.toString());
+            }
+            catch (IOException e) {
+                stats.getDeleteFileCalls().recordException(e);
+                throw new IOException("Delete file %s failed: %s".formatted(location, e.getMessage()), e);
             }
-            return null;
         });
     }
 
     @Override
-    public void deleteFiles(Collection<String> locations)
+    public void deleteFiles(Collection<Location> locations)
             throws IOException
     {
         Map<Path, List<Path>> pathsGroupedByDirectory = locations.stream().collect(
                 groupingBy(
-                        path -> hadoopPath(path.replaceFirst("/[^/]*$", "")),
+                        location -> hadoopPath(location.parentDirectory()),
                         mapping(HadoopPaths::hadoopPath, toList())));
         for (Entry<Path, List<Path>> directoryWithPaths : pathsGroupedByDirectory.entrySet()) {
             FileSystem rawFileSystem = getRawFileSystem(environment.getFileSystem(context, directoryWithPaths.getKey()));
@@ -98,7 +137,14 @@ public void deleteFiles(Collection<String> locations)
                 }
                 else {
                     for (Path path : directoryWithPaths.getValue()) {
-                        rawFileSystem.delete(path, false);
+                        stats.getDeleteFileCalls().newCall();
+                        try (TimeStat.BlockTimer ignored = stats.getDeleteFileCalls().time()) {
+                            rawFileSystem.delete(path, false);
+                        }
+                        catch (IOException e) {
+                            stats.getDeleteFileCalls().recordException(e);
+                            throw e;
+                        }
                     }
                 }
                 return null;
@@ -107,47 +153,259 @@ public void deleteFiles(Collection<String> locations)
     }
 
     @Override
-    public void deleteDirectory(String location)
+    public void deleteDirectory(Location location)
             throws IOException
     {
+        stats.getDeleteDirectoryCalls().newCall();
         Path directory = hadoopPath(location);
         FileSystem fileSystem = environment.getFileSystem(context, directory);
         environment.doAs(context.getIdentity(), () -> {
-            if (!fileSystem.delete(directory, true) && fileSystem.exists(directory)) {
-                throw new IOException("Failed to delete directory: " + directory);
+            try (TimeStat.BlockTimer ignored = stats.getDeleteDirectoryCalls().time()) {
+                // recursive delete on the root directory must be handled manually
+                if (location.path().isEmpty()) {
+                    for (FileStatus status : fileSystem.listStatus(directory)) {
+                        if (!fileSystem.delete(status.getPath(), true) && fileSystem.exists(status.getPath())) {
+                            throw new IOException("delete failed");
+                        }
+                    }
+                    return null;
+                }
+                if (hierarchical(fileSystem, location) && !fileSystem.getFileStatus(directory).isDirectory()) {
+                    throw new IOException("Location is not a directory");
+                }
+                if (!fileSystem.delete(directory, true) && fileSystem.exists(directory)) {
+                    throw new IOException("delete failed");
+                }
+                return null;
+            }
+            catch (FileNotFoundException e) {
+                return null;
+            }
+            catch (IOException e) {
+                stats.getDeleteDirectoryCalls().recordException(e);
+                throw new IOException("Delete directory %s failed %s".formatted(location, e.getMessage()), e);
             }
-            return null;
         });
     }
 
     @Override
-    public void renameFile(String source, String target)
+    public void renameFile(Location source, Location target)
             throws IOException
     {
+        source.verifyValidFileLocation();
+        target.verifyValidFileLocation();
+
+        stats.getRenameFileCalls().newCall();
         Path sourcePath = hadoopPath(source);
         Path targetPath = hadoopPath(target);
         FileSystem fileSystem = environment.getFileSystem(context, sourcePath);
+
         environment.doAs(context.getIdentity(), () -> {
-            if (!fileSystem.rename(sourcePath, targetPath)) {
-                throw new IOException(format("Failed to rename [%s] to [%s]", source, target));
+            try (TimeStat.BlockTimer ignored = stats.getRenameFileCalls().time()) {
+                if (!fileSystem.getFileStatus(sourcePath).isFile()) {
+                    throw new IOException("Source location is not a file");
+                }
+                // local file system allows renaming onto an existing file
+                if (fileSystem.exists(targetPath)) {
+                    throw new IOException("Target location already exists");
+                }
+                if (!fileSystem.rename(sourcePath, targetPath)) {
+                    throw new IOException("rename failed");
+                }
+                return null;
+            }
+            catch (IOException e) {
+                stats.getRenameFileCalls().recordException(e);
+                throw new IOException("File rename from %s to %s failed: %s".formatted(source, target, e.getMessage()), e);
             }
-            return null;
         });
     }
 
     @Override
-    public FileIterator listFiles(String location)
+    public FileIterator listFiles(Location location)
             throws IOException
     {
+        stats.getListFilesCalls().newCall();
         Path directory = hadoopPath(location);
         FileSystem fileSystem = environment.getFileSystem(context, directory);
         return environment.doAs(context.getIdentity(), () -> {
-            try {
-                return new HdfsFileIterator(location, fileSystem, fileSystem.listFiles(directory, true));
+            try (TimeStat.BlockTimer ignored = stats.getListFilesCalls().time()) {
+                return new HdfsFileIterator(location, directory, fileSystem.listFiles(directory, true));
             }
             catch (FileNotFoundException e) {
                 return FileIterator.empty();
             }
+            catch (IOException e) {
+                stats.getListFilesCalls().recordException(e);
+                throw new IOException("List files for %s failed: %s".formatted(location, e.getMessage()), e);
+            }
+        });
+    }
+
+    @Override
+    public Optional<Boolean> directoryExists(Location location)
+            throws IOException
+    {
+        stats.getDirectoryExistsCalls().newCall();
+        Path directory = hadoopPath(location);
+        FileSystem fileSystem = environment.getFileSystem(context, directory);
+
+        if (location.path().isEmpty()) {
+            return Optional.of(true);
+        }
+
+        return environment.doAs(context.getIdentity(), () -> {
+            try (TimeStat.BlockTimer ignored = stats.getDirectoryExistsCalls().time()) {
+                if (!hierarchical(fileSystem, location)) {
+                    try {
+                        if (fileSystem.listStatusIterator(directory).hasNext()) {
+                            return Optional.of(true);
+                        }
+                        return Optional.empty();
+                    }
+                    catch (FileNotFoundException e) {
+                        return Optional.empty();
+                    }
+                }
+
+                FileStatus fileStatus = fileSystem.getFileStatus(directory);
+                return Optional.of(fileStatus.isDirectory());
+            }
+            catch (FileNotFoundException e) {
+                return Optional.of(false);
+            }
+            catch (IOException e) {
+                stats.getListFilesCalls().recordException(e);
+                throw new IOException("Directory exists check for %s failed: %s".formatted(location, e.getMessage()), e);
+            }
+        });
+    }
+
+    @Override
+    public void createDirectory(Location location)
+            throws IOException
+    {
+        stats.getCreateDirectoryCalls().newCall();
+        Path directory = hadoopPath(location);
+        FileSystem fileSystem = environment.getFileSystem(context, directory);
+
+        environment.doAs(context.getIdentity(), () -> {
+            if (!hierarchical(fileSystem, location)) {
+                return null;
+            }
+            Optional<FsPermission> permission = environment.getNewDirectoryPermissions();
+            try (TimeStat.BlockTimer ignored = stats.getCreateDirectoryCalls().time()) {
+                if (!fileSystem.mkdirs(directory, permission.orElse(null))) {
+                    throw new IOException("mkdirs failed");
+                }
+                // explicitly set permission since the default umask overrides it on creation
+                if (permission.isPresent()) {
+                    fileSystem.setPermission(directory, permission.get());
+                }
+            }
+            catch (IOException e) {
+                stats.getCreateDirectoryCalls().recordException(e);
+                throw new IOException("Create directory %s failed: %s".formatted(location, e.getMessage()), e);
+            }
+            return null;
+        });
+    }
+
+    @Override
+    public void renameDirectory(Location source, Location target)
+            throws IOException
+    {
+        stats.getRenameDirectoryCalls().newCall();
+        Path sourcePath = hadoopPath(source);
+        Path targetPath = hadoopPath(target);
+        FileSystem fileSystem = environment.getFileSystem(context, sourcePath);
+
+        environment.doAs(context.getIdentity(), () -> {
+            try (TimeStat.BlockTimer ignored = stats.getRenameDirectoryCalls().time()) {
+                if (!hierarchical(fileSystem, source)) {
+                    throw new IOException("Non-hierarchical file system '%s' does not support directory renames".formatted(fileSystem.getScheme()));
+                }
+                if (!fileSystem.getFileStatus(sourcePath).isDirectory()) {
+                    throw new IOException("Source location is not a directory");
+                }
+                if (fileSystem.exists(targetPath)) {
+                    throw new IOException("Target location already exists");
+                }
+                if (!fileSystem.rename(sourcePath, targetPath)) {
+                    throw new IOException("rename failed");
+                }
+                return null;
+            }
+            catch (IOException e) {
+                stats.getRenameDirectoryCalls().recordException(e);
+                throw new IOException("Directory rename from %s to %s failed: %s".formatted(source, target, e.getMessage()), e);
+            }
         });
     }
+
+    @Override
+    public Set<Location> listDirectories(Location location)
+            throws IOException
+    {
+        stats.getListDirectoriesCalls().newCall();
+        Path directory = hadoopPath(location);
+        FileSystem fileSystem = environment.getFileSystem(context, directory);
+        return environment.doAs(context.getIdentity(), () -> {
+            try (TimeStat.BlockTimer ignored = stats.getListDirectoriesCalls().time()) {
+                FileStatus[] files = fileSystem.listStatus(directory);
+                if (files.length == 0) {
+                    return ImmutableSet.of();
+                }
+                if (files[0].getPath().equals(directory)) {
+                    throw new IOException("Location is a file, not a directory: " + location);
+                }
+                return Stream.of(files)
+                        .filter(FileStatus::isDirectory)
+                        .map(file -> listedLocation(location, directory, file.getPath()))
+                        .map(file -> file.appendSuffix("/"))
+                        .collect(toImmutableSet());
+            }
+            catch (FileNotFoundException e) {
+                return ImmutableSet.of();
+            }
+            catch (IOException e) {
+                stats.getListDirectoriesCalls().recordException(e);
+                throw new IOException("List directories for %s failed: %s".formatted(location, e.getMessage()), e);
+            }
+        });
+    }
+
+    private boolean hierarchical(FileSystem fileSystem, Location rootLocation)
+    {
+        Boolean knownResult = KNOWN_HIERARCHICAL_FILESYSTEMS.get(fileSystem.getScheme());
+        if (knownResult != null) {
+            return knownResult;
+        }
+
+        Boolean cachedResult = hierarchicalFileSystemCache.get(fileSystem);
+        if (cachedResult != null) {
+            return cachedResult;
+        }
+
+        // Hierarchical file systems will fail to list directories which do not exist.
+        // Object store file systems like S3 will allow these kinds of operations.
+        // Attempt to list a path which does not exist to know which one we have.
+        try {
+            fileSystem.listStatus(hadoopPath(rootLocation.appendPath(UUID.randomUUID().toString())));
+            hierarchicalFileSystemCache.putIfAbsent(fileSystem, false);
+            return false;
+        }
+        catch (IOException e) {
+            // Being overly broad to avoid throwing an exception with the random UUID path in it.
+            // Instead, defer to later calls to fail with a more appropriate message.
+            hierarchicalFileSystemCache.putIfAbsent(fileSystem, true);
+            return true;
+        }
+    }
+
+    static <T extends Throwable> T withCause(T throwable, Throwable cause)
+    {
+        throwable.initCause(cause);
+        return throwable;
+    }
 }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystemFactory.java b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystemFactory.java
index ab29a43d8618..a1948e1fac7f 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystemFactory.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystemFactory.java
@@ -13,30 +13,32 @@
  */
 package io.trino.filesystem.hdfs;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hdfs.HdfsContext;
 import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
 import io.trino.spi.security.ConnectorIdentity;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 public class HdfsFileSystemFactory
         implements TrinoFileSystemFactory
 {
     private final HdfsEnvironment environment;
+    private final TrinoHdfsFileSystemStats fileSystemStats;
 
     @Inject
-    public HdfsFileSystemFactory(HdfsEnvironment environment)
+    public HdfsFileSystemFactory(HdfsEnvironment environment, TrinoHdfsFileSystemStats fileSystemStats)
     {
         this.environment = requireNonNull(environment, "environment is null");
+        this.fileSystemStats = requireNonNull(fileSystemStats, "fileSystemStats is null");
     }
 
     @Override
     public TrinoFileSystem create(ConnectorIdentity identity)
     {
-        return new HdfsFileSystem(environment, new HdfsContext(identity));
+        return new HdfsFileSystem(environment, new HdfsContext(identity), fileSystemStats);
     }
 }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystemModule.java b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystemModule.java
index 541944202fdd..a938c22833e7 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystemModule.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystemModule.java
@@ -15,9 +15,10 @@
 
 import com.google.inject.Binder;
 import com.google.inject.Module;
-import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
 
 import static com.google.inject.Scopes.SINGLETON;
+import static org.weakref.jmx.guice.ExportBinder.newExporter;
 
 public class HdfsFileSystemModule
         implements Module
@@ -25,6 +26,8 @@ public class HdfsFileSystemModule
     @Override
     public void configure(Binder binder)
     {
-        binder.bind(TrinoFileSystemFactory.class).to(HdfsFileSystemFactory.class).in(SINGLETON);
+        binder.bind(HdfsFileSystemFactory.class).in(SINGLETON);
+        binder.bind(TrinoHdfsFileSystemStats.class).in(SINGLETON);
+        newExporter(binder).export(TrinoHdfsFileSystemStats.class).withGeneratedName();
     }
 }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsInput.java b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsInput.java
index 4e78476451bb..873474ef27bf 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsInput.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsInput.java
@@ -19,8 +19,10 @@
 import io.trino.hdfs.FSDataInputStreamTail;
 import org.apache.hadoop.fs.FSDataInputStream;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 
+import static io.trino.filesystem.hdfs.HdfsFileSystem.withCause;
 import static java.util.Objects.requireNonNull;
 
 class HdfsInput
@@ -28,6 +30,7 @@ class HdfsInput
 {
     private final FSDataInputStream stream;
     private final TrinoInputFile inputFile;
+    private boolean closed;
 
     public HdfsInput(FSDataInputStream stream, TrinoInputFile inputFile)
     {
@@ -39,22 +42,41 @@ public HdfsInput(FSDataInputStream stream, TrinoInputFile inputFile)
     public void readFully(long position, byte[] buffer, int bufferOffset, int bufferLength)
             throws IOException
     {
-        stream.readFully(position, buffer, bufferOffset, bufferLength);
+        ensureOpen();
+        try {
+            stream.readFully(position, buffer, bufferOffset, bufferLength);
+        }
+        catch (FileNotFoundException e) {
+            throw withCause(new FileNotFoundException("File %s not found: %s".formatted(toString(), e.getMessage())), e);
+        }
+        catch (IOException e) {
+            throw new IOException("Read exactly %s bytes at position %s of file %s failed: %s".formatted(bufferLength, position, toString(), e.getMessage()), e);
+        }
     }
 
     @Override
     public int readTail(byte[] buffer, int bufferOffset, int bufferLength)
             throws IOException
     {
-        Slice tail = FSDataInputStreamTail.readTail(inputFile.location(), inputFile.length(), stream, bufferLength).getTailSlice();
-        tail.getBytes(0, buffer, bufferOffset, tail.length());
-        return tail.length();
+        ensureOpen();
+        try {
+            Slice tail = FSDataInputStreamTail.readTail(toString(), inputFile.length(), stream, bufferLength).getTailSlice();
+            tail.getBytes(0, buffer, bufferOffset, tail.length());
+            return tail.length();
+        }
+        catch (FileNotFoundException e) {
+            throw withCause(new FileNotFoundException("File %s not found: %s".formatted(toString(), e.getMessage())), e);
+        }
+        catch (IOException e) {
+            throw new IOException("Read %s tail bytes of file %s failed: %s".formatted(bufferLength, toString(), e.getMessage()), e);
+        }
     }
 
     @Override
     public void close()
             throws IOException
     {
+        closed = true;
         stream.close();
     }
 
@@ -63,4 +85,12 @@ public String toString()
     {
         return inputFile.toString();
     }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Output stream closed: " + this);
+        }
+    }
 }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsInputFile.java b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsInputFile.java
index a38876e0ec63..d374a6090279 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsInputFile.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsInputFile.java
@@ -13,9 +13,12 @@
  */
 package io.trino.filesystem.hdfs;
 
+import io.airlift.stats.TimeStat;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoInput;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.filesystem.TrinoInputStream;
+import io.trino.hdfs.CallStats;
 import io.trino.hdfs.HdfsContext;
 import io.trino.hdfs.HdfsEnvironment;
 import org.apache.hadoop.fs.FSDataInputStream;
@@ -23,31 +26,36 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.time.Instant;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.filesystem.hdfs.HadoopPaths.hadoopPath;
+import static io.trino.filesystem.hdfs.HdfsFileSystem.withCause;
 import static java.util.Objects.requireNonNull;
 
 class HdfsInputFile
         implements TrinoInputFile
 {
-    private final String path;
+    private final Location location;
     private final HdfsEnvironment environment;
     private final HdfsContext context;
     private final Path file;
+    private final CallStats openFileCallStat;
     private Long length;
     private FileStatus status;
 
-    public HdfsInputFile(String path, Long length, HdfsEnvironment environment, HdfsContext context)
+    public HdfsInputFile(Location location, Long length, HdfsEnvironment environment, HdfsContext context, CallStats openFileCallStat)
     {
-        this.path = requireNonNull(path, "path is null");
+        this.location = requireNonNull(location, "location is null");
         this.environment = requireNonNull(environment, "environment is null");
         this.context = requireNonNull(context, "context is null");
-        this.file = hadoopPath(path);
+        this.openFileCallStat = requireNonNull(openFileCallStat, "openFileCallStat is null");
+        this.file = hadoopPath(location);
         this.length = length;
         checkArgument(length == null || length >= 0, "length is negative");
+        location.verifyValidFileLocation();
     }
 
     @Override
@@ -61,7 +69,7 @@ public TrinoInput newInput()
     public TrinoInputStream newStream()
             throws IOException
     {
-        return new HdfsTrinoInputStream(openFile());
+        return new HdfsTrinoInputStream(location, openFile());
     }
 
     @Override
@@ -90,22 +98,34 @@ public boolean exists()
     }
 
     @Override
-    public String location()
+    public Location location()
     {
-        return path;
+        return location;
     }
 
     @Override
     public String toString()
     {
-        return location();
+        return location().toString();
     }
 
     private FSDataInputStream openFile()
             throws IOException
     {
+        openFileCallStat.newCall();
         FileSystem fileSystem = environment.getFileSystem(context, file);
-        return environment.doAs(context.getIdentity(), () -> fileSystem.open(file));
+        return environment.doAs(context.getIdentity(), () -> {
+            try (TimeStat.BlockTimer ignored = openFileCallStat.time()) {
+                return fileSystem.open(file);
+            }
+            catch (IOException e) {
+                openFileCallStat.recordException(e);
+                if (e instanceof FileNotFoundException) {
+                    throw withCause(new FileNotFoundException(toString()), e);
+                }
+                throw new IOException("Open file %s failed: %s".formatted(location, e.getMessage()), e);
+            }
+        });
     }
 
     private FileStatus lazyStatus()
@@ -113,7 +133,15 @@ private FileStatus lazyStatus()
     {
         if (status == null) {
             FileSystem fileSystem = environment.getFileSystem(context, file);
-            status = environment.doAs(context.getIdentity(), () -> fileSystem.getFileStatus(file));
+            try {
+                status = environment.doAs(context.getIdentity(), () -> fileSystem.getFileStatus(file));
+            }
+            catch (FileNotFoundException e) {
+                throw withCause(new FileNotFoundException(toString()), e);
+            }
+            catch (IOException e) {
+                throw new IOException("Get status for file %s failed: %s".formatted(location, e.getMessage()), e);
+            }
         }
         return status;
     }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsOutputFile.java b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsOutputFile.java
index 644063fd37d7..d09b28baeb56 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsOutputFile.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsOutputFile.java
@@ -13,33 +13,46 @@
  */
 package io.trino.filesystem.hdfs;
 
+import com.google.cloud.hadoop.fs.gcs.GoogleHadoopFileSystem;
+import io.airlift.stats.TimeStat;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoOutputFile;
+import io.trino.hdfs.CallStats;
 import io.trino.hdfs.HdfsContext;
 import io.trino.hdfs.HdfsEnvironment;
 import io.trino.hdfs.MemoryAwareFileSystem;
+import io.trino.hdfs.authentication.GenericExceptionAction;
+import io.trino.hdfs.gcs.GcsExclusiveOutputStream;
+import io.trino.hdfs.s3.TrinoS3FileSystem;
 import io.trino.memory.context.AggregatedMemoryContext;
+import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.FileAlreadyExistsException;
 
 import static io.trino.filesystem.hdfs.HadoopPaths.hadoopPath;
+import static io.trino.filesystem.hdfs.HdfsFileSystem.withCause;
 import static io.trino.hdfs.FileSystemUtils.getRawFileSystem;
 import static java.util.Objects.requireNonNull;
 
 class HdfsOutputFile
         implements TrinoOutputFile
 {
-    private final String path;
+    private final Location location;
     private final HdfsEnvironment environment;
     private final HdfsContext context;
+    private final CallStats createFileCallStat;
 
-    public HdfsOutputFile(String path, HdfsEnvironment environment, HdfsContext context)
+    public HdfsOutputFile(Location location, HdfsEnvironment environment, HdfsContext context, CallStats createFileCallStat)
     {
-        this.path = requireNonNull(path, "path is null");
+        this.location = requireNonNull(location, "location is null");
         this.environment = requireNonNull(environment, "environment is null");
         this.context = requireNonNull(context, "context is null");
+        this.createFileCallStat = requireNonNull(createFileCallStat, "createFileCallStat is null");
+        location.verifyValidFileLocation();
     }
 
     @Override
@@ -56,27 +69,60 @@ public OutputStream createOrOverwrite(AggregatedMemoryContext memoryContext)
         return create(true, memoryContext);
     }
 
+    @Override
+    public OutputStream createExclusive(AggregatedMemoryContext memoryContext)
+            throws IOException
+    {
+        Path file = hadoopPath(location);
+        FileSystem fileSystem = getRawFileSystem(environment.getFileSystem(context, file));
+        if (fileSystem instanceof TrinoS3FileSystem) {
+            throw new IOException("S3 does not support exclusive create");
+        }
+        if (fileSystem instanceof GoogleHadoopFileSystem) {
+            return new GcsExclusiveOutputStream(environment, context, file);
+        }
+        return create(memoryContext);
+    }
+
     private OutputStream create(boolean overwrite, AggregatedMemoryContext memoryContext)
             throws IOException
     {
-        Path file = hadoopPath(path);
+        createFileCallStat.newCall();
+        Path file = hadoopPath(location);
         FileSystem fileSystem = environment.getFileSystem(context, file);
         FileSystem rawFileSystem = getRawFileSystem(fileSystem);
-        if (rawFileSystem instanceof MemoryAwareFileSystem memoryAwareFileSystem) {
-            return environment.doAs(context.getIdentity(), () -> memoryAwareFileSystem.create(file, memoryContext));
+        try (TimeStat.BlockTimer ignored = createFileCallStat.time()) {
+            if (rawFileSystem instanceof MemoryAwareFileSystem memoryAwareFileSystem) {
+                return create(() -> memoryAwareFileSystem.create(file, memoryContext));
+            }
+            return create(() -> fileSystem.create(file, overwrite));
         }
-        return environment.doAs(context.getIdentity(), () -> fileSystem.create(file, overwrite));
+        catch (org.apache.hadoop.fs.FileAlreadyExistsException e) {
+            createFileCallStat.recordException(e);
+            throw withCause(new FileAlreadyExistsException(toString()), e);
+        }
+        catch (IOException e) {
+            createFileCallStat.recordException(e);
+            throw new IOException("Creation of file %s failed: %s".formatted(file, e.getMessage()), e);
+        }
+    }
+
+    private OutputStream create(GenericExceptionAction<FSDataOutputStream, IOException> action)
+            throws IOException
+    {
+        FSDataOutputStream out = environment.doAs(context.getIdentity(), action);
+        return new HdfsOutputStream(location, out, environment, context);
     }
 
     @Override
-    public String location()
+    public Location location()
     {
-        return path;
+        return location;
     }
 
     @Override
     public String toString()
     {
-        return location();
+        return location().toString();
     }
 }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsOutputStream.java b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsOutputStream.java
new file mode 100644
index 000000000000..376168e6be36
--- /dev/null
+++ b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsOutputStream.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed 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 io.trino.filesystem.hdfs;
+
+import io.trino.filesystem.Location;
+import io.trino.hdfs.HdfsContext;
+import io.trino.hdfs.HdfsEnvironment;
+import io.trino.spi.security.ConnectorIdentity;
+import org.apache.hadoop.fs.FSDataOutputStream;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import static java.util.Objects.requireNonNull;
+
+class HdfsOutputStream
+        extends FSDataOutputStream
+{
+    private final Location location;
+    private final HdfsEnvironment environment;
+    private final ConnectorIdentity identity;
+    private boolean closed;
+
+    public HdfsOutputStream(Location location, FSDataOutputStream out, HdfsEnvironment environment, HdfsContext context)
+    {
+        super(out, null, out.getPos());
+        this.location = requireNonNull(location, "location is null");
+        this.environment = environment;
+        this.identity = context.getIdentity();
+    }
+
+    @Override
+    public OutputStream getWrappedStream()
+    {
+        // return the originally wrapped stream, not the delegate
+        return ((FSDataOutputStream) super.getWrappedStream()).getWrappedStream();
+    }
+
+    @Override
+    public void write(int b)
+            throws IOException
+    {
+        ensureOpen();
+        // handle Kerberos ticket refresh during long write operations
+        environment.doAs(identity, () -> {
+            super.write(b);
+            return null;
+        });
+    }
+
+    @Override
+    public void write(byte[] b, int off, int len)
+            throws IOException
+    {
+        ensureOpen();
+        // handle Kerberos ticket refresh during long write operations
+        environment.doAs(identity, () -> {
+            super.write(b, off, len);
+            return null;
+        });
+    }
+
+    @Override
+    public void flush()
+            throws IOException
+    {
+        ensureOpen();
+        super.flush();
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        closed = true;
+        super.close();
+    }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Output stream closed: " + location);
+        }
+    }
+}
diff --git a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsTrinoInputStream.java b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsTrinoInputStream.java
index bc606d209c4e..8e1fa57b06e4 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsTrinoInputStream.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsTrinoInputStream.java
@@ -13,62 +13,126 @@
  */
 package io.trino.filesystem.hdfs;
 
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoInputStream;
 import org.apache.hadoop.fs.FSDataInputStream;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 
+import static io.trino.filesystem.hdfs.HdfsFileSystem.withCause;
 import static java.util.Objects.requireNonNull;
 
 class HdfsTrinoInputStream
         extends TrinoInputStream
 {
+    private final Location location;
     private final FSDataInputStream stream;
+    private boolean closed;
 
-    HdfsTrinoInputStream(FSDataInputStream stream)
+    HdfsTrinoInputStream(Location location, FSDataInputStream stream)
     {
+        this.location = requireNonNull(location, "location is null");
         this.stream = requireNonNull(stream, "stream is null");
     }
 
+    @Override
+    public int available()
+            throws IOException
+    {
+        ensureOpen();
+        try {
+            return stream.available();
+        }
+        catch (IOException e) {
+            throw new IOException("Get available for file %s failed: %s".formatted(location, e.getMessage()), e);
+        }
+    }
+
     @Override
     public long getPosition()
             throws IOException
     {
-        return stream.getPos();
+        ensureOpen();
+        try {
+            return stream.getPos();
+        }
+        catch (IOException e) {
+            throw new IOException("Get position for file %s failed: %s".formatted(location, e.getMessage()), e);
+        }
     }
 
     @Override
     public void seek(long position)
             throws IOException
     {
-        stream.seek(position);
+        ensureOpen();
+        try {
+            stream.seek(position);
+        }
+        catch (IOException e) {
+            throw new IOException("Seek to position %s for file %s failed: %s".formatted(position, location, e.getMessage()), e);
+        }
     }
 
     @Override
     public int read()
             throws IOException
     {
-        return stream.read();
+        ensureOpen();
+        try {
+            return stream.read();
+        }
+        catch (FileNotFoundException e) {
+            throw withCause(new FileNotFoundException("File %s not found: %s".formatted(location, e.getMessage())), e);
+        }
+        catch (IOException e) {
+            throw new IOException("Read of file %s failed: %s".formatted(location, e.getMessage()), e);
+        }
     }
 
     @Override
-    public int read(byte[] b)
+    public int read(byte[] b, int off, int len)
             throws IOException
     {
-        return stream.read(b);
+        ensureOpen();
+        try {
+            return stream.read(b, off, len);
+        }
+        catch (FileNotFoundException e) {
+            throw withCause(new FileNotFoundException("File %s not found: %s".formatted(location, e.getMessage())), e);
+        }
+        catch (IOException e) {
+            throw new IOException("Read of file %s failed: %s".formatted(location, e.getMessage()), e);
+        }
     }
 
     @Override
-    public int read(byte[] b, int off, int len)
+    public long skip(long n)
             throws IOException
     {
-        return stream.read(b, off, len);
+        ensureOpen();
+        try {
+            return stream.skip(n);
+        }
+        catch (IOException e) {
+            throw new IOException("Skipping %s bytes of file %s failed: %s".formatted(n, location, e.getMessage()), e);
+        }
     }
 
     @Override
     public void close()
             throws IOException
     {
+        closed = true;
         stream.close();
     }
+
+    private void ensureOpen()
+            throws IOException
+    {
+        if (closed) {
+            throw new IOException("Output stream closed: " + location);
+        }
+    }
 }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/CallStats.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/CallStats.java
new file mode 100644
index 000000000000..a3787887dc5a
--- /dev/null
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/CallStats.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed 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 io.trino.hdfs;
+
+import io.airlift.stats.CounterStat;
+import io.airlift.stats.TimeStat;
+import org.weakref.jmx.Managed;
+import org.weakref.jmx.Nested;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+public final class CallStats
+{
+    private final TimeStat time = new TimeStat(TimeUnit.MILLISECONDS);
+    private final CounterStat totalCalls = new CounterStat();
+    private final CounterStat totalFailures = new CounterStat();
+    private final CounterStat ioExceptions = new CounterStat();
+    private final CounterStat fileNotFoundExceptions = new CounterStat();
+
+    public TimeStat.BlockTimer time()
+    {
+        return time.time();
+    }
+
+    public void recordException(Exception exception)
+    {
+        if (exception instanceof FileNotFoundException) {
+            fileNotFoundExceptions.update(1);
+        }
+        else if (exception instanceof IOException) {
+            ioExceptions.update(1);
+        }
+        totalFailures.update(1);
+    }
+
+    @Managed
+    @Nested
+    public CounterStat getTotalCalls()
+    {
+        return totalCalls;
+    }
+
+    @Managed
+    @Nested
+    public CounterStat getTotalFailures()
+    {
+        return totalFailures;
+    }
+
+    @Managed
+    @Nested
+    public CounterStat getIoExceptions()
+    {
+        return ioExceptions;
+    }
+
+    @Managed
+    @Nested
+    public CounterStat getFileNotFoundExceptions()
+    {
+        return fileNotFoundExceptions;
+    }
+
+    @Managed
+    @Nested
+    public TimeStat getTime()
+    {
+        return time;
+    }
+
+    public void newCall()
+    {
+        totalCalls.update(1);
+    }
+}
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/ConfigurationUtils.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/ConfigurationUtils.java
index 6e28ad11053b..9181537b4e93 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/ConfigurationUtils.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/ConfigurationUtils.java
@@ -15,7 +15,6 @@
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobConf;
 
 import java.io.File;
 import java.util.List;
@@ -61,14 +60,6 @@ public static void copy(Configuration from, Configuration to)
         }
     }
 
-    public static JobConf toJobConf(Configuration conf)
-    {
-        if (conf instanceof JobConf) {
-            return (JobConf) conf;
-        }
-        return new JobConf(conf);
-    }
-
     public static Configuration readConfiguration(List<File> resourcePaths)
     {
         Configuration result = newEmptyConfiguration();
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/DynamicHdfsConfiguration.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/DynamicHdfsConfiguration.java
index b4b31d39cc0c..173b2d1162ff 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/DynamicHdfsConfiguration.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/DynamicHdfsConfiguration.java
@@ -14,10 +14,9 @@
 package io.trino.hdfs;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import org.apache.hadoop.conf.Configuration;
 
-import javax.inject.Inject;
-
 import java.net.URI;
 import java.util.Set;
 
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/FileSystemFinalizerService.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/FileSystemFinalizerService.java
index 0cca43bca722..fc61a414a1fd 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/FileSystemFinalizerService.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/FileSystemFinalizerService.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static com.google.common.base.Preconditions.checkState;
 import static java.util.Collections.newSetFromMap;
 import static java.util.Objects.requireNonNull;
 
@@ -34,6 +35,7 @@ public class FileSystemFinalizerService
     private final Set<FinalizerReference> finalizers = newSetFromMap(new ConcurrentHashMap<>());
     private final ReferenceQueue<Object> finalizerQueue = new ReferenceQueue<>();
     private Thread finalizerThread;
+    private volatile boolean shutdown;
 
     private FileSystemFinalizerService() {}
 
@@ -47,6 +49,17 @@ public static synchronized FileSystemFinalizerService getInstance()
         return instance.get();
     }
 
+    public static synchronized void shutdown()
+    {
+        instance.ifPresent(FileSystemFinalizerService::doShutdown);
+    }
+
+    public synchronized void doShutdown()
+    {
+        shutdown = true;
+        finalizerThread.interrupt();
+    }
+
     private void start()
     {
         if (finalizerThread != null) {
@@ -64,16 +77,17 @@ private void start()
      * <p>
      * Note: cleanup must not contain a reference to the referent object.
      */
-    public void addFinalizer(Object referent, Runnable cleanup)
+    public synchronized void addFinalizer(Object referent, Runnable cleanup)
     {
         requireNonNull(referent, "referent is null");
         requireNonNull(cleanup, "cleanup is null");
+        checkState(!shutdown, "FileSystemFinalizerService is shutdown");
         finalizers.add(new FinalizerReference(referent, finalizerQueue, cleanup));
     }
 
     private void processFinalizerQueue()
     {
-        while (!Thread.interrupted()) {
+        while (!Thread.interrupted() && !shutdown) {
             try {
                 FinalizerReference finalizer = (FinalizerReference) finalizerQueue.remove();
                 finalizers.remove(finalizer);
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsConfig.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsConfig.java
index a7582bb4f104..801f19ead198 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsConfig.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsConfig.java
@@ -22,12 +22,11 @@
 import io.airlift.configuration.validation.FileExists;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import org.apache.hadoop.fs.permission.FsPermission;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-
 import java.io.File;
 import java.util.List;
 import java.util.Optional;
@@ -231,6 +230,7 @@ public HdfsConfig setWireEncryptionEnabled(boolean wireEncryptionEnabled)
         return this;
     }
 
+    @Min(1)
     public int getFileSystemMaxCacheSize()
     {
         return fileSystemMaxCacheSize;
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsConfigurationInitializer.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsConfigurationInitializer.java
index 32612aa4fd39..17687189f1b0 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsConfigurationInitializer.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsConfigurationInitializer.java
@@ -17,13 +17,13 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.HostAndPort;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
 import io.trino.hadoop.SocksSocketFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
 import org.apache.hadoop.net.DNSToSwitchMapping;
 
-import javax.inject.Inject;
 import javax.net.SocketFactory;
 
 import java.util.List;
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsEnvironment.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsEnvironment.java
index a75cdc5d0a24..7608e1f73e3f 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsEnvironment.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsEnvironment.java
@@ -13,21 +13,29 @@
  */
 package io.trino.hdfs;
 
+import com.google.cloud.hadoop.repackaged.gcs.com.google.api.services.storage.Storage;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.inject.Inject;
+import io.airlift.log.Logger;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.hadoop.HadoopNative;
 import io.trino.hdfs.authentication.GenericExceptionAction;
 import io.trino.hdfs.authentication.HdfsAuthentication;
+import io.trino.hdfs.gcs.GcsStorageFactory;
+import io.trino.spi.Plugin;
 import io.trino.spi.security.ConnectorIdentity;
+import jakarta.annotation.PreDestroy;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileSystemManager;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.util.Optional;
 
+import static io.trino.hdfs.FileSystemUtils.getRawFileSystem;
 import static java.util.Objects.requireNonNull;
 
 public class HdfsEnvironment
@@ -37,23 +45,49 @@ public class HdfsEnvironment
         FileSystemManager.registerCache(TrinoFileSystemCache.INSTANCE);
     }
 
+    private static final Logger log = Logger.get(HdfsEnvironment.class);
+
+    private final OpenTelemetry openTelemetry;
     private final HdfsConfiguration hdfsConfiguration;
     private final HdfsAuthentication hdfsAuthentication;
     private final Optional<FsPermission> newDirectoryPermissions;
     private final boolean newFileInheritOwnership;
     private final boolean verifyChecksum;
+    private final Optional<GcsStorageFactory> gcsStorageFactory;
+
+    @VisibleForTesting
+    public HdfsEnvironment(HdfsConfiguration hdfsConfiguration, HdfsConfig config, HdfsAuthentication hdfsAuthentication)
+    {
+        this(OpenTelemetry.noop(), hdfsConfiguration, config, hdfsAuthentication, Optional.empty());
+    }
 
     @Inject
     public HdfsEnvironment(
+            OpenTelemetry openTelemetry,
             HdfsConfiguration hdfsConfiguration,
             HdfsConfig config,
-            HdfsAuthentication hdfsAuthentication)
+            HdfsAuthentication hdfsAuthentication,
+            Optional<GcsStorageFactory> gcsStorageFactory)
     {
+        this.openTelemetry = requireNonNull(openTelemetry, "openTelemetry is null");
         this.hdfsConfiguration = requireNonNull(hdfsConfiguration, "hdfsConfiguration is null");
         this.newFileInheritOwnership = config.isNewFileInheritOwnership();
         this.verifyChecksum = config.isVerifyChecksum();
         this.hdfsAuthentication = requireNonNull(hdfsAuthentication, "hdfsAuthentication is null");
         this.newDirectoryPermissions = config.getNewDirectoryFsPermissions();
+        this.gcsStorageFactory = requireNonNull(gcsStorageFactory, "gcsStorageFactory is null");
+    }
+
+    @PreDestroy
+    public void shutdown()
+            throws IOException
+    {
+        // shut down if running in a plugin classloader
+        if (!getClass().getClassLoader().equals(Plugin.class.getClassLoader())) {
+            FileSystemFinalizerService.shutdown();
+            stopFileSystemStatsThread();
+            TrinoFileSystemCache.INSTANCE.closeAll();
+        }
     }
 
     public Configuration getConfiguration(HdfsContext context, Path path)
@@ -73,6 +107,9 @@ public FileSystem getFileSystem(ConnectorIdentity identity, Path path, Configura
         return hdfsAuthentication.doAs(identity, () -> {
             FileSystem fileSystem = path.getFileSystem(configuration);
             fileSystem.setVerifyChecksum(verifyChecksum);
+            if (getRawFileSystem(fileSystem) instanceof OpenTelemetryAwareFileSystem fs) {
+                fs.setOpenTelemetry(openTelemetry);
+            }
             return fileSystem;
         });
     }
@@ -93,8 +130,22 @@ public <R, E extends Exception> R doAs(ConnectorIdentity identity, GenericExcept
         return hdfsAuthentication.doAs(identity, action);
     }
 
-    public void doAs(ConnectorIdentity identity, Runnable action)
+    public Storage createGcsStorage(HdfsContext context, Path path)
+    {
+        return gcsStorageFactory
+                .orElseThrow(() -> new IllegalStateException("GcsStorageFactory not set"))
+                .create(this, context, path);
+    }
+
+    private static void stopFileSystemStatsThread()
     {
-        hdfsAuthentication.doAs(identity, action);
+        try {
+            Field field = FileSystem.Statistics.class.getDeclaredField("STATS_DATA_CLEANER");
+            field.setAccessible(true);
+            ((Thread) field.get(null)).interrupt();
+        }
+        catch (ReflectiveOperationException | RuntimeException e) {
+            log.error(e, "Error stopping file system stats thread");
+        }
     }
 }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsModule.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsModule.java
index a8c036295b22..d358e72d7569 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsModule.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsModule.java
@@ -16,8 +16,10 @@
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Scopes;
+import io.trino.hdfs.gcs.GcsStorageFactory;
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
+import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
 import static io.airlift.configuration.ConfigBinder.configBinder;
 
 public class HdfsModule
@@ -34,5 +36,7 @@ public void configure(Binder binder)
         binder.bind(HdfsConfigurationInitializer.class).in(Scopes.SINGLETON);
         newSetBinder(binder, ConfigurationInitializer.class);
         newSetBinder(binder, DynamicConfigurationProvider.class);
+
+        newOptionalBinder(binder, GcsStorageFactory.class);
     }
 }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsNamenodeStats.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsNamenodeStats.java
new file mode 100644
index 000000000000..1f8638da1f50
--- /dev/null
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/HdfsNamenodeStats.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.hdfs;
+
+import org.weakref.jmx.Managed;
+import org.weakref.jmx.Nested;
+
+public final class HdfsNamenodeStats
+{
+    private final CallStats listLocatedStatus = new CallStats();
+    private final CallStats remoteIteratorNext = new CallStats();
+
+    @Managed
+    @Nested
+    public CallStats getListLocatedStatus()
+    {
+        return listLocatedStatus;
+    }
+
+    @Managed
+    @Nested
+    public CallStats getRemoteIteratorNext()
+    {
+        return remoteIteratorNext;
+    }
+}
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/MemoryAwareFileSystem.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/MemoryAwareFileSystem.java
index d4ee3bf00b1e..c16830d058e6 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/MemoryAwareFileSystem.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/MemoryAwareFileSystem.java
@@ -14,13 +14,13 @@
 package io.trino.hdfs;
 
 import io.trino.memory.context.AggregatedMemoryContext;
+import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.Path;
 
 import java.io.IOException;
-import java.io.OutputStream;
 
 public interface MemoryAwareFileSystem
 {
-    OutputStream create(Path f, AggregatedMemoryContext memoryContext)
+    FSDataOutputStream create(Path f, AggregatedMemoryContext memoryContext)
             throws IOException;
 }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/OpenTelemetryAwareFileSystem.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/OpenTelemetryAwareFileSystem.java
new file mode 100644
index 000000000000..479b631d0bf5
--- /dev/null
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/OpenTelemetryAwareFileSystem.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed 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 io.trino.hdfs;
+
+import io.opentelemetry.api.OpenTelemetry;
+
+public interface OpenTelemetryAwareFileSystem
+{
+    void setOpenTelemetry(OpenTelemetry openTelemetry);
+}
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/TrinoFileSystemCache.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/TrinoFileSystemCache.java
index 246364a91880..c3661475db87 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/TrinoFileSystemCache.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/TrinoFileSystemCache.java
@@ -41,7 +41,6 @@
 import java.net.URI;
 import java.util.EnumSet;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
@@ -118,21 +117,18 @@ private FileSystem getInternal(URI uri, Configuration conf, long unique)
         try {
             fileSystemHolder = cache.compute(key, (k, currentFileSystemHolder) -> {
                 if (currentFileSystemHolder == null) {
+                    // ConcurrentHashMap.compute guarantees that remapping function is invoked at most once, so cacheSize remains eventually consistent with cache.size()
                     if (cacheSize.getAndUpdate(currentSize -> Math.min(currentSize + 1, maxSize)) >= maxSize) {
                         throw new RuntimeException(
                                 new IOException(format("FileSystem max cache size has been reached: %s", maxSize)));
                     }
                     return new FileSystemHolder(conf, privateCredentials);
                 }
-                else {
-                    // Update file system instance when credentials change.
-                    if (currentFileSystemHolder.credentialsChanged(uri, conf, privateCredentials)) {
-                        return new FileSystemHolder(conf, privateCredentials);
-                    }
-                    else {
-                        return currentFileSystemHolder;
-                    }
+                // Update file system instance when credentials change.
+                if (currentFileSystemHolder.credentialsChanged(uri, conf, privateCredentials)) {
+                    return new FileSystemHolder(conf, privateCredentials);
                 }
+                return currentFileSystemHolder;
             });
 
             // Now create the filesystem object outside of cache's lock
@@ -235,17 +231,15 @@ private static FileSystemKey createFileSystemKey(URI uri, UserGroupInformation u
         String proxyUser;
         AuthenticationMethod authenticationMethod = userGroupInformation.getAuthenticationMethod();
         switch (authenticationMethod) {
-            case SIMPLE:
-            case KERBEROS:
+            case SIMPLE, KERBEROS -> {
                 realUser = userGroupInformation.getUserName();
                 proxyUser = null;
-                break;
-            case PROXY:
+            }
+            case PROXY -> {
                 realUser = userGroupInformation.getRealUser().getUserName();
                 proxyUser = userGroupInformation.getUserName();
-                break;
-            default:
-                throw new IllegalArgumentException("Unsupported authentication method: " + authenticationMethod);
+            }
+            default -> throw new IllegalArgumentException("Unsupported authentication method: " + authenticationMethod);
         }
         return new FileSystemKey(scheme, authority, unique, realUser, proxyUser);
     }
@@ -253,16 +247,12 @@ private static FileSystemKey createFileSystemKey(URI uri, UserGroupInformation u
     private static Set<?> getPrivateCredentials(UserGroupInformation userGroupInformation)
     {
         AuthenticationMethod authenticationMethod = userGroupInformation.getAuthenticationMethod();
-        switch (authenticationMethod) {
-            case SIMPLE:
-                return ImmutableSet.of();
-            case KERBEROS:
-                return ImmutableSet.copyOf(getSubject(userGroupInformation).getPrivateCredentials());
-            case PROXY:
-                return getPrivateCredentials(userGroupInformation.getRealUser());
-            default:
-                throw new IllegalArgumentException("Unsupported authentication method: " + authenticationMethod);
-        }
+        return switch (authenticationMethod) {
+            case SIMPLE -> ImmutableSet.of();
+            case KERBEROS -> ImmutableSet.copyOf(getSubject(userGroupInformation).getPrivateCredentials());
+            case PROXY -> getPrivateCredentials(userGroupInformation.getRealUser());
+            default -> throw new IllegalArgumentException("Unsupported authentication method: " + authenticationMethod);
+        };
     }
 
     private static boolean isHdfs(URI uri)
@@ -271,56 +261,14 @@ private static boolean isHdfs(URI uri)
         return "hdfs".equals(scheme) || "viewfs".equals(scheme);
     }
 
-    private static class FileSystemKey
+    @SuppressWarnings("unused")
+    private record FileSystemKey(String scheme, String authority, long unique, String realUser, String proxyUser)
     {
-        private final String scheme;
-        private final String authority;
-        private final long unique;
-        private final String realUser;
-        private final String proxyUser;
-
-        public FileSystemKey(String scheme, String authority, long unique, String realUser, String proxyUser)
-        {
-            this.scheme = requireNonNull(scheme, "scheme is null");
-            this.authority = requireNonNull(authority, "authority is null");
-            this.unique = unique;
-            this.realUser = requireNonNull(realUser, "realUser");
-            this.proxyUser = proxyUser;
-        }
-
-        @Override
-        public boolean equals(Object o)
-        {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            FileSystemKey that = (FileSystemKey) o;
-            return Objects.equals(scheme, that.scheme) &&
-                    Objects.equals(authority, that.authority) &&
-                    Objects.equals(unique, that.unique) &&
-                    Objects.equals(realUser, that.realUser) &&
-                    Objects.equals(proxyUser, that.proxyUser);
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hash(scheme, authority, unique, realUser, proxyUser);
-        }
-
-        @Override
-        public String toString()
+        private FileSystemKey
         {
-            return toStringHelper(this)
-                    .add("scheme", scheme)
-                    .add("authority", authority)
-                    .add("unique", unique)
-                    .add("realUser", realUser)
-                    .add("proxyUser", proxyUser)
-                    .toString();
+            requireNonNull(scheme, "scheme is null");
+            requireNonNull(authority, "authority is null");
+            requireNonNull(realUser, "realUser");
         }
     }
 
@@ -342,7 +290,7 @@ public void createFileSystemOnce(URI uri, Configuration conf)
             if (fileSystem == null) {
                 synchronized (this) {
                     if (fileSystem == null) {
-                        fileSystem = TrinoFileSystemCache.createFileSystem(uri, conf);
+                        fileSystem = createFileSystem(uri, conf);
                     }
                 }
             }
@@ -358,8 +306,8 @@ public boolean credentialsChanged(URI newUri, Configuration newConf, Set<?> newP
             // Kerberos re-login occurs, re-create the file system and cache it using
             // the same key.
             // - Extra credentials are used to authenticate with certain file systems.
-            return (isHdfs(newUri) && !this.privateCredentials.equals(newPrivateCredentials))
-                    || !this.cacheCredentials.equals(newConf.get(CACHE_KEY, ""));
+            return (isHdfs(newUri) && !privateCredentials.equals(newPrivateCredentials))
+                    || !cacheCredentials.equals(newConf.get(CACHE_KEY, ""));
         }
 
         public FileSystem getFileSystem()
@@ -440,7 +388,7 @@ public BlockLocation[] getFileBlockLocations(Path p, long start, long len)
         public RemoteIterator<LocatedFileStatus> listFiles(Path path, boolean recursive)
                 throws IOException
         {
-            return fs.listFiles(path, recursive);
+            return new RemoteIteratorWrapper(fs.listFiles(path, recursive), this);
         }
     }
 
@@ -448,12 +396,15 @@ private static class OutputStreamWrapper
             extends FSDataOutputStream
     {
         @SuppressWarnings({"FieldCanBeLocal", "unused"})
-        private final FileSystem fileSystem;
+        // Keep reference to FileSystemWrapper which owns the FSDataOutputStream.
+        // Otherwise, GC on FileSystemWrapper could trigger finalizer that closes wrapped FileSystem object and that would break
+        // FSDataOutputStream delegate.
+        private final FileSystemWrapper owningFileSystemWrapper;
 
-        public OutputStreamWrapper(FSDataOutputStream delegate, FileSystem fileSystem)
+        public OutputStreamWrapper(FSDataOutputStream delegate, FileSystemWrapper owningFileSystemWrapper)
         {
             super(delegate, null, delegate.getPos());
-            this.fileSystem = fileSystem;
+            this.owningFileSystemWrapper = requireNonNull(owningFileSystemWrapper, "owningFileSystemWrapper is null");
         }
 
         @Override
@@ -467,12 +418,15 @@ private static class InputStreamWrapper
             extends FSDataInputStream
     {
         @SuppressWarnings({"FieldCanBeLocal", "unused"})
-        private final FileSystem fileSystem;
+        // Keep reference to FileSystemWrapper which owns the FSDataInputStream.
+        // Otherwise, GC on FileSystemWrapper could trigger finalizer that closes wrapped FileSystem object and that would break
+        // FSDataInputStream delegate.
+        private final FileSystemWrapper owningFileSystemWrapper;
 
-        public InputStreamWrapper(FSDataInputStream inputStream, FileSystem fileSystem)
+        public InputStreamWrapper(FSDataInputStream inputStream, FileSystemWrapper owningFileSystemWrapper)
         {
             super(inputStream);
-            this.fileSystem = fileSystem;
+            this.owningFileSystemWrapper = requireNonNull(owningFileSystemWrapper, "owningFileSystemWrapper is null");
         }
 
         @Override
@@ -482,6 +436,37 @@ public InputStream getWrappedStream()
         }
     }
 
+    private static class RemoteIteratorWrapper
+            implements RemoteIterator<LocatedFileStatus>
+    {
+        private final RemoteIterator<LocatedFileStatus> delegate;
+        @SuppressWarnings({"FieldCanBeLocal", "unused"})
+        // Keep reference to FileSystemWrapper which owns the RemoteIterator.
+        // Otherwise, GC on FileSystemWrapper could trigger finalizer that closes wrapped FileSystem object and that would break
+        // RemoteIterator delegate.
+        private final FileSystemWrapper owningFileSystemWrapper;
+
+        public RemoteIteratorWrapper(RemoteIterator<LocatedFileStatus> delegate, FileSystemWrapper owningFileSystemWrapper)
+        {
+            this.delegate = delegate;
+            this.owningFileSystemWrapper = requireNonNull(owningFileSystemWrapper, "owningFileSystemWrapper is null");
+        }
+
+        @Override
+        public boolean hasNext()
+                throws IOException
+        {
+            return delegate.hasNext();
+        }
+
+        @Override
+        public LocatedFileStatus next()
+                throws IOException
+        {
+            return delegate.next();
+        }
+    }
+
     public TrinoFileSystemCacheStats getFileSystemCacheStats()
     {
         return stats;
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/TrinoHdfsFileSystemStats.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/TrinoHdfsFileSystemStats.java
new file mode 100644
index 000000000000..5b942370a137
--- /dev/null
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/TrinoHdfsFileSystemStats.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed 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 io.trino.hdfs;
+
+import org.weakref.jmx.Managed;
+import org.weakref.jmx.Nested;
+
+public final class TrinoHdfsFileSystemStats
+{
+    private final CallStats openFileCalls = new CallStats();
+    private final CallStats createFileCalls = new CallStats();
+    private final CallStats listFilesCalls = new CallStats();
+    private final CallStats renameFileCalls = new CallStats();
+    private final CallStats deleteFileCalls = new CallStats();
+    private final CallStats deleteDirectoryCalls = new CallStats();
+    private final CallStats directoryExistsCalls = new CallStats();
+    private final CallStats createDirectoryCalls = new CallStats();
+    private final CallStats renameDirectoryCalls = new CallStats();
+    private final CallStats listDirectoriesCalls = new CallStats();
+
+    @Managed
+    @Nested
+    public CallStats getOpenFileCalls()
+    {
+        return openFileCalls;
+    }
+
+    @Managed
+    @Nested
+    public CallStats getCreateFileCalls()
+    {
+        return createFileCalls;
+    }
+
+    @Managed
+    @Nested
+    public CallStats getListFilesCalls()
+    {
+        return listFilesCalls;
+    }
+
+    @Managed
+    @Nested
+    public CallStats getRenameFileCalls()
+    {
+        return renameFileCalls;
+    }
+
+    @Managed
+    @Nested
+    public CallStats getDeleteFileCalls()
+    {
+        return deleteFileCalls;
+    }
+
+    @Managed
+    @Nested
+    public CallStats getDeleteDirectoryCalls()
+    {
+        return deleteDirectoryCalls;
+    }
+
+    @Managed
+    @Nested
+    public CallStats getDirectoryExistsCalls()
+    {
+        return directoryExistsCalls;
+    }
+
+    @Managed
+    @Nested
+    public CallStats getCreateDirectoryCalls()
+    {
+        return createDirectoryCalls;
+    }
+
+    @Managed
+    @Nested
+    public CallStats getRenameDirectoryCalls()
+    {
+        return renameDirectoryCalls;
+    }
+
+    @Managed
+    @Nested
+    public CallStats getListDirectoriesCalls()
+    {
+        return listDirectoriesCalls;
+    }
+}
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/AuthenticationModules.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/AuthenticationModules.java
index 9c1024b8722d..18cde7f03c94 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/AuthenticationModules.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/AuthenticationModules.java
@@ -14,6 +14,7 @@
 package io.trino.hdfs.authentication;
 
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.Provides;
@@ -23,8 +24,6 @@
 import io.trino.plugin.base.authentication.KerberosConfiguration;
 import io.trino.plugin.base.security.UserNameProvider;
 
-import javax.inject.Inject;
-
 import static com.google.inject.Scopes.SINGLETON;
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
 import static io.airlift.configuration.ConfigBinder.configBinder;
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/CachingKerberosHadoopAuthentication.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/CachingKerberosHadoopAuthentication.java
index 64697cc29482..f2731dccde6f 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/CachingKerberosHadoopAuthentication.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/CachingKerberosHadoopAuthentication.java
@@ -13,9 +13,9 @@
  */
 package io.trino.hdfs.authentication;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import org.apache.hadoop.security.UserGroupInformation;
 
-import javax.annotation.concurrent.GuardedBy;
 import javax.security.auth.Subject;
 import javax.security.auth.kerberos.KerberosTicket;
 
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/DirectHdfsAuthentication.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/DirectHdfsAuthentication.java
index 70bc26fd5578..dcabadb22eea 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/DirectHdfsAuthentication.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/DirectHdfsAuthentication.java
@@ -13,10 +13,9 @@
  */
 package io.trino.hdfs.authentication;
 
+import com.google.inject.Inject;
 import io.trino.spi.security.ConnectorIdentity;
 
-import javax.inject.Inject;
-
 import static io.trino.hdfs.authentication.UserGroupInformationUtils.executeActionInDoAs;
 import static java.util.Objects.requireNonNull;
 
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/ForHdfs.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/ForHdfs.java
index 3395f8bd36dd..99a657b8dd54 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/ForHdfs.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/ForHdfs.java
@@ -13,7 +13,7 @@
  */
 package io.trino.hdfs.authentication;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForHdfs
 {
 }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/HdfsAuthentication.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/HdfsAuthentication.java
index ee98bda27d83..1d0da9a7fb15 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/HdfsAuthentication.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/HdfsAuthentication.java
@@ -19,12 +19,4 @@ public interface HdfsAuthentication
 {
     <R, E extends Exception> R doAs(ConnectorIdentity identity, GenericExceptionAction<R, E> action)
             throws E;
-
-    default void doAs(ConnectorIdentity identity, Runnable action)
-    {
-        doAs(identity, () -> {
-            action.run();
-            return null;
-        });
-    }
 }
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/HdfsAuthenticationConfig.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/HdfsAuthenticationConfig.java
index 1955c29927d5..1f0762584952 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/HdfsAuthenticationConfig.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/HdfsAuthenticationConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class HdfsAuthenticationConfig
 {
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/HdfsKerberosConfig.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/HdfsKerberosConfig.java
index a068f6e73fda..3d6df90030ad 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/HdfsKerberosConfig.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/HdfsKerberosConfig.java
@@ -17,9 +17,8 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/ImpersonatingHdfsAuthentication.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/ImpersonatingHdfsAuthentication.java
index d7b4c5cc55e3..6f6293428d47 100644
--- a/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/ImpersonatingHdfsAuthentication.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/authentication/ImpersonatingHdfsAuthentication.java
@@ -13,12 +13,11 @@
  */
 package io.trino.hdfs.authentication;
 
+import com.google.inject.Inject;
 import io.trino.plugin.base.security.UserNameProvider;
 import io.trino.spi.security.ConnectorIdentity;
 import org.apache.hadoop.security.UserGroupInformation;
 
-import javax.inject.Inject;
-
 import static io.trino.hdfs.authentication.UserGroupInformationUtils.executeActionInDoAs;
 import static java.util.Objects.requireNonNull;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/azure/HiveAzureConfig.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/azure/HiveAzureConfig.java
similarity index 99%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/azure/HiveAzureConfig.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/azure/HiveAzureConfig.java
index ad811dbd17b9..8b523711d3c6 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/azure/HiveAzureConfig.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/azure/HiveAzureConfig.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.azure;
+package io.trino.hdfs.azure;
 
 import com.google.common.net.HostAndPort;
 import io.airlift.configuration.Config;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/azure/HiveAzureModule.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/azure/HiveAzureModule.java
similarity index 97%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/azure/HiveAzureModule.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/azure/HiveAzureModule.java
index ff3e7540dd8b..c5f9ec7776d8 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/azure/HiveAzureModule.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/azure/HiveAzureModule.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.azure;
+package io.trino.hdfs.azure;
 
 import com.google.inject.Binder;
 import com.google.inject.Scopes;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/azure/TrinoAzureConfigurationInitializer.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/azure/TrinoAzureConfigurationInitializer.java
similarity index 94%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/azure/TrinoAzureConfigurationInitializer.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/azure/TrinoAzureConfigurationInitializer.java
index db21eaee41a7..80e505278eb0 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/azure/TrinoAzureConfigurationInitializer.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/azure/TrinoAzureConfigurationInitializer.java
@@ -11,16 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.azure;
+package io.trino.hdfs.azure;
 
 import com.google.common.net.HostAndPort;
+import com.google.inject.Inject;
 import io.trino.hdfs.ConfigurationInitializer;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.adl.AdlFileSystem;
 import org.apache.hadoop.fs.azurebfs.AzureBlobFileSystem;
 
-import javax.inject.Inject;
-
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.Proxy.Type;
@@ -28,6 +27,8 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.lang.String.format;
+import static org.apache.hadoop.fs.azurebfs.constants.ConfigurationKeys.DATA_BLOCKS_BUFFER;
+import static org.apache.hadoop.fs.store.DataBlocks.DATA_BLOCKS_BUFFER_ARRAY;
 
 public class TrinoAzureConfigurationInitializer
         implements ConfigurationInitializer
@@ -118,6 +119,9 @@ public void initializeConfiguration(Configuration config)
 
         // do not rely on information returned from local system about users and groups
         config.set("fs.azure.skipUserGroupMetadataDuringInitialization", "true");
+
+        // disable buffering Azure output streams to disk(default is DATA_BLOCKS_BUFFER_DISK)
+        config.set(DATA_BLOCKS_BUFFER, DATA_BLOCKS_BUFFER_ARRAY);
     }
 
     private static Optional<String> dropEmpty(Optional<String> optional)
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/CosConfigurationInitializer.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/CosConfigurationInitializer.java
similarity index 96%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/CosConfigurationInitializer.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/CosConfigurationInitializer.java
index bb72a5e4b4b0..c3a3d352413c 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/CosConfigurationInitializer.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/CosConfigurationInitializer.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.cos;
+package io.trino.hdfs.cos;
 
 import io.trino.hdfs.ConfigurationInitializer;
 import org.apache.hadoop.conf.Configuration;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/CosServiceConfigurationProvider.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/CosServiceConfigurationProvider.java
similarity index 87%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/CosServiceConfigurationProvider.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/CosServiceConfigurationProvider.java
index b56ea5c0e2b4..5c6483afb4ce 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/CosServiceConfigurationProvider.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/CosServiceConfigurationProvider.java
@@ -11,23 +11,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.cos;
+package io.trino.hdfs.cos;
 
 import com.google.common.base.Splitter;
+import com.google.inject.Inject;
 import io.trino.hdfs.DynamicConfigurationProvider;
 import io.trino.hdfs.HdfsContext;
 import org.apache.hadoop.conf.Configuration;
 
-import javax.inject.Inject;
-
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
 
 import static io.trino.hdfs.DynamicConfigurationProvider.setCacheKey;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ACCESS_KEY;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ENDPOINT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SECRET_KEY;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ACCESS_KEY;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ENDPOINT;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SECRET_KEY;
 
 public class CosServiceConfigurationProvider
         implements DynamicConfigurationProvider
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/HiveCosModule.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/HiveCosModule.java
similarity index 97%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/HiveCosModule.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/HiveCosModule.java
index c45a8cd3d9de..22a930258893 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/HiveCosModule.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/HiveCosModule.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.cos;
+package io.trino.hdfs.cos;
 
 import com.google.inject.Binder;
 import com.google.inject.Scopes;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/HiveCosServiceConfig.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/HiveCosServiceConfig.java
similarity index 96%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/HiveCosServiceConfig.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/HiveCosServiceConfig.java
index 6719e5eb6c29..8e5c106daff8 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/HiveCosServiceConfig.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/HiveCosServiceConfig.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.cos;
+package io.trino.hdfs.cos;
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.validation.FileExists;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/ServiceConfig.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/ServiceConfig.java
similarity index 99%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/ServiceConfig.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/ServiceConfig.java
index 80eb21eb6e34..d721ed49268c 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/ServiceConfig.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/ServiceConfig.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.cos;
+package io.trino.hdfs.cos;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/TrinoCosFileSystem.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/TrinoCosFileSystem.java
similarity index 91%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/TrinoCosFileSystem.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/TrinoCosFileSystem.java
index 0553bc42281d..da09e0134450 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/cos/TrinoCosFileSystem.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/cos/TrinoCosFileSystem.java
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.cos;
+package io.trino.hdfs.cos;
 
 import com.google.common.base.Splitter;
-import io.trino.plugin.hive.s3.TrinoS3FileSystem;
+import io.trino.hdfs.s3.TrinoS3FileSystem;
 
 import java.net.URI;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/GcsAccessTokenProvider.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GcsAccessTokenProvider.java
similarity index 97%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/GcsAccessTokenProvider.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GcsAccessTokenProvider.java
index c9e98d2f291e..215e6c0d4b28 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/GcsAccessTokenProvider.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GcsAccessTokenProvider.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.gcs;
+package io.trino.hdfs.gcs;
 
 import com.google.cloud.hadoop.util.AccessTokenProvider;
 import org.apache.hadoop.conf.Configuration;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/GcsConfigurationProvider.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GcsConfigurationProvider.java
similarity index 92%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/GcsConfigurationProvider.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GcsConfigurationProvider.java
index 7a381c67198f..202d148ada20 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/GcsConfigurationProvider.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GcsConfigurationProvider.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.gcs;
+package io.trino.hdfs.gcs;
 
 import io.trino.hdfs.DynamicConfigurationProvider;
 import io.trino.hdfs.HdfsContext;
@@ -21,7 +21,7 @@
 
 import static com.google.cloud.hadoop.fs.gcs.GoogleHadoopFileSystem.SCHEME;
 import static io.trino.hdfs.DynamicConfigurationProvider.setCacheKey;
-import static io.trino.plugin.hive.gcs.GcsAccessTokenProvider.GCS_ACCESS_TOKEN_CONF;
+import static io.trino.hdfs.gcs.GcsAccessTokenProvider.GCS_ACCESS_TOKEN_CONF;
 
 public class GcsConfigurationProvider
         implements DynamicConfigurationProvider
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GcsExclusiveOutputStream.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GcsExclusiveOutputStream.java
new file mode 100644
index 000000000000..b53e0b4e082d
--- /dev/null
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GcsExclusiveOutputStream.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed 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 io.trino.hdfs.gcs;
+
+import com.google.cloud.hadoop.repackaged.gcs.com.google.api.client.http.ByteArrayContent;
+import com.google.cloud.hadoop.repackaged.gcs.com.google.api.services.storage.Storage;
+import com.google.cloud.hadoop.repackaged.gcs.com.google.api.services.storage.model.StorageObject;
+import com.google.cloud.hadoop.repackaged.gcs.com.google.cloud.hadoop.gcsio.StorageResourceId;
+import io.trino.hdfs.HdfsContext;
+import io.trino.hdfs.HdfsEnvironment;
+import org.apache.hadoop.fs.Path;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class GcsExclusiveOutputStream
+        extends ByteArrayOutputStream
+{
+    private final Storage storage;
+    private final Path path;
+    private boolean closed;
+
+    public GcsExclusiveOutputStream(HdfsEnvironment environment, HdfsContext context, Path path)
+    {
+        this.storage = environment.createGcsStorage(context, path);
+        this.path = path;
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        if (closed) {
+            return;
+        }
+        closed = true;
+
+        StorageResourceId storageResourceId = StorageResourceId.fromStringPath(path.toString());
+        Storage.Objects.Insert insert = storage.objects().insert(
+                storageResourceId.getBucketName(),
+                new StorageObject().setName(storageResourceId.getObjectName()),
+                new ByteArrayContent("application/octet-stream", buf, 0, count));
+        insert.setIfGenerationMatch(0L); // fail if object already exists
+        insert.getMediaHttpUploader().setDirectUploadEnabled(true);
+        insert.execute();
+    }
+}
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GcsStorageFactory.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GcsStorageFactory.java
new file mode 100644
index 000000000000..2579685950fc
--- /dev/null
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GcsStorageFactory.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed 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 io.trino.hdfs.gcs;
+
+import com.google.cloud.hadoop.repackaged.gcs.com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
+import com.google.cloud.hadoop.repackaged.gcs.com.google.api.client.http.HttpTransport;
+import com.google.cloud.hadoop.repackaged.gcs.com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.cloud.hadoop.repackaged.gcs.com.google.api.services.storage.Storage;
+import com.google.cloud.hadoop.repackaged.gcs.com.google.cloud.hadoop.gcsio.GoogleCloudStorageOptions;
+import com.google.cloud.hadoop.repackaged.gcs.com.google.cloud.hadoop.util.CredentialFactory;
+import com.google.cloud.hadoop.repackaged.gcs.com.google.cloud.hadoop.util.HttpTransportFactory;
+import com.google.cloud.hadoop.repackaged.gcs.com.google.cloud.hadoop.util.RetryHttpInitializer;
+import com.google.inject.Inject;
+import io.trino.hdfs.HdfsContext;
+import io.trino.hdfs.HdfsEnvironment;
+import io.trino.spi.TrinoException;
+import org.apache.hadoop.fs.Path;
+
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.time.Duration;
+import java.util.Optional;
+
+import static com.google.cloud.hadoop.fs.gcs.TrinoGoogleHadoopFileSystemConfiguration.getGcsOptionsBuilder;
+import static com.google.common.base.Strings.nullToEmpty;
+import static io.trino.hdfs.gcs.GcsConfigurationProvider.GCS_OAUTH_KEY;
+import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+@SuppressWarnings("deprecation")
+public class GcsStorageFactory
+{
+    private static final String APPLICATION_NAME = "Trino";
+
+    private final boolean useGcsAccessToken;
+    private final Optional<GoogleCredential> jsonGoogleCredential;
+
+    @Inject
+    public GcsStorageFactory(HiveGcsConfig hiveGcsConfig)
+            throws IOException
+    {
+        hiveGcsConfig.validate();
+        this.useGcsAccessToken = hiveGcsConfig.isUseGcsAccessToken();
+        String jsonKey = hiveGcsConfig.getJsonKey();
+        String jsonKeyFilePath = hiveGcsConfig.getJsonKeyFilePath();
+        if (jsonKey != null) {
+            try (InputStream inputStream = new ByteArrayInputStream(jsonKey.getBytes(UTF_8))) {
+                jsonGoogleCredential = Optional.of(GoogleCredential.fromStream(inputStream).createScoped(CredentialFactory.DEFAULT_SCOPES));
+            }
+        }
+        else if (jsonKeyFilePath != null) {
+            try (FileInputStream inputStream = new FileInputStream(jsonKeyFilePath)) {
+                jsonGoogleCredential = Optional.of(GoogleCredential.fromStream(inputStream).createScoped(CredentialFactory.DEFAULT_SCOPES));
+            }
+        }
+        else {
+            jsonGoogleCredential = Optional.empty();
+        }
+    }
+
+    public Storage create(HdfsEnvironment environment, HdfsContext context, Path path)
+    {
+        try {
+            GoogleCloudStorageOptions gcsOptions = getGcsOptionsBuilder(environment.getConfiguration(context, path)).build();
+            HttpTransport httpTransport = HttpTransportFactory.createHttpTransport(
+                    gcsOptions.getTransportType(),
+                    gcsOptions.getProxyAddress(),
+                    gcsOptions.getProxyUsername(),
+                    gcsOptions.getProxyPassword(),
+                    Duration.ofMillis(gcsOptions.getHttpRequestReadTimeout()));
+            GoogleCredential credential;
+            if (useGcsAccessToken) {
+                String accessToken = nullToEmpty(context.getIdentity().getExtraCredentials().get(GCS_OAUTH_KEY));
+                try (ByteArrayInputStream inputStream = new ByteArrayInputStream(accessToken.getBytes(UTF_8))) {
+                    credential = GoogleCredential.fromStream(inputStream).createScoped(CredentialFactory.DEFAULT_SCOPES);
+                }
+            }
+            else {
+                credential = jsonGoogleCredential.orElseThrow(() -> new IllegalStateException("GCS credentials not configured"));
+            }
+            return new Storage.Builder(httpTransport, JacksonFactory.getDefaultInstance(), new RetryHttpInitializer(credential, APPLICATION_NAME))
+                    .setApplicationName(APPLICATION_NAME)
+                    .build();
+        }
+        catch (Exception e) {
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, e);
+        }
+    }
+}
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GoogleGcsConfigurationInitializer.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GoogleGcsConfigurationInitializer.java
new file mode 100644
index 000000000000..2cb3ba0eb57e
--- /dev/null
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/GoogleGcsConfigurationInitializer.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed 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 io.trino.hdfs.gcs;
+
+import com.google.cloud.hadoop.fs.gcs.GoogleHadoopFileSystem;
+import com.google.cloud.hadoop.util.AccessTokenProvider;
+import com.google.inject.Inject;
+import io.trino.hdfs.ConfigurationInitializer;
+import org.apache.hadoop.conf.Configuration;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.EnumSet;
+import java.util.Optional;
+
+import static com.google.cloud.hadoop.fs.gcs.GoogleHadoopFileSystemConfiguration.GCS_CONFIG_PREFIX;
+import static com.google.cloud.hadoop.fs.gcs.HadoopCredentialConfiguration.ACCESS_TOKEN_PROVIDER_IMPL_SUFFIX;
+import static com.google.cloud.hadoop.fs.gcs.HadoopCredentialConfiguration.ENABLE_SERVICE_ACCOUNTS_SUFFIX;
+import static com.google.cloud.hadoop.fs.gcs.HadoopCredentialConfiguration.SERVICE_ACCOUNT_JSON_KEYFILE_SUFFIX;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
+
+public class GoogleGcsConfigurationInitializer
+        implements ConfigurationInitializer
+{
+    private final boolean useGcsAccessToken;
+    private final String jsonKeyFilePath;
+
+    @Inject
+    public GoogleGcsConfigurationInitializer(HiveGcsConfig config)
+    {
+        config.validate();
+        this.useGcsAccessToken = config.isUseGcsAccessToken();
+        this.jsonKeyFilePath = Optional.ofNullable(config.getJsonKey())
+                .map(GoogleGcsConfigurationInitializer::getJsonKeyFilePath)
+                .orElse(config.getJsonKeyFilePath());
+    }
+
+    private static String getJsonKeyFilePath(String jsonKey)
+    {
+        try {
+            // Just create a temporary json key file.
+            Path tempFile = Files.createTempFile("gcs-key-", ".json", PosixFilePermissions.asFileAttribute(EnumSet.of(OWNER_READ, OWNER_WRITE)));
+            tempFile.toFile().deleteOnExit();
+            Files.writeString(tempFile, jsonKey, StandardCharsets.UTF_8);
+            return tempFile.toString();
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException("Failed to create a temp file for the GCS JSON key", e);
+        }
+    }
+
+    @Override
+    public void initializeConfiguration(Configuration config)
+    {
+        config.set("fs.gs.impl", GoogleHadoopFileSystem.class.getName());
+
+        if (useGcsAccessToken) {
+            // use oauth token to authenticate with Google Cloud Storage
+            config.setBoolean(GCS_CONFIG_PREFIX + ENABLE_SERVICE_ACCOUNTS_SUFFIX.getKey(), false);
+            config.setClass(GCS_CONFIG_PREFIX + ACCESS_TOKEN_PROVIDER_IMPL_SUFFIX.getKey(), GcsAccessTokenProvider.class, AccessTokenProvider.class);
+        }
+        else if (jsonKeyFilePath != null) {
+            // use service account key file
+            config.setBoolean(GCS_CONFIG_PREFIX + ENABLE_SERVICE_ACCOUNTS_SUFFIX.getKey(), true);
+            config.set(GCS_CONFIG_PREFIX + SERVICE_ACCOUNT_JSON_KEYFILE_SUFFIX.getKey(), jsonKeyFilePath);
+        }
+    }
+}
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/HiveGcsConfig.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/HiveGcsConfig.java
new file mode 100644
index 000000000000..cda101a55f1c
--- /dev/null
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/HiveGcsConfig.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed 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 io.trino.hdfs.gcs;
+
+import io.airlift.configuration.Config;
+import io.airlift.configuration.ConfigDescription;
+import io.airlift.configuration.ConfigSecuritySensitive;
+import io.airlift.configuration.validation.FileExists;
+import jakarta.annotation.Nullable;
+
+import static com.google.common.base.Preconditions.checkState;
+
+public class HiveGcsConfig
+{
+    private boolean useGcsAccessToken;
+    private String jsonKey;
+    private String jsonKeyFilePath;
+
+    public boolean isUseGcsAccessToken()
+    {
+        return useGcsAccessToken;
+    }
+
+    @Config("hive.gcs.use-access-token")
+    @ConfigDescription("Use client-provided OAuth token to access Google Cloud Storage")
+    public HiveGcsConfig setUseGcsAccessToken(boolean useGcsAccessToken)
+    {
+        this.useGcsAccessToken = useGcsAccessToken;
+        return this;
+    }
+
+    @Nullable
+    public String getJsonKey()
+    {
+        return jsonKey;
+    }
+
+    @Config("hive.gcs.json-key")
+    @ConfigSecuritySensitive
+    public HiveGcsConfig setJsonKey(String jsonKey)
+    {
+        this.jsonKey = jsonKey;
+        return this;
+    }
+
+    @Nullable
+    @FileExists
+    public String getJsonKeyFilePath()
+    {
+        return jsonKeyFilePath;
+    }
+
+    @Config("hive.gcs.json-key-file-path")
+    @ConfigDescription("JSON key file used to access Google Cloud Storage")
+    public HiveGcsConfig setJsonKeyFilePath(String jsonKeyFilePath)
+    {
+        this.jsonKeyFilePath = jsonKeyFilePath;
+        return this;
+    }
+
+    public void validate()
+    {
+        // This cannot be normal validation, as it would make it impossible to write TestHiveGcsConfig.testExplicitPropertyMappings
+
+        if (useGcsAccessToken) {
+            checkState(jsonKey == null, "Cannot specify 'hive.gcs.json-key' when 'hive.gcs.use-access-token' is set");
+            checkState(jsonKeyFilePath == null, "Cannot specify 'hive.gcs.json-key-file-path' when 'hive.gcs.use-access-token' is set");
+        }
+        checkState(jsonKey == null || jsonKeyFilePath == null, "'hive.gcs.json-key' and 'hive.gcs.json-key-file-path' cannot be both set");
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/HiveGcsModule.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/HiveGcsModule.java
similarity index 92%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/HiveGcsModule.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/HiveGcsModule.java
index 2bcada7ba1ce..8b7c27e2e17f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/HiveGcsModule.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/gcs/HiveGcsModule.java
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.gcs;
+package io.trino.hdfs.gcs;
 
 import com.google.inject.Binder;
 import com.google.inject.Scopes;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.hdfs.ConfigurationInitializer;
 import io.trino.hdfs.DynamicConfigurationProvider;
-import io.trino.plugin.hive.rubix.RubixEnabledConfig;
+import io.trino.hdfs.rubix.RubixEnabledConfig;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
@@ -38,5 +38,7 @@ protected void setup(Binder binder)
             checkArgument(!buildConfigObject(RubixEnabledConfig.class).isCacheEnabled(), "Use of GCS access token is not compatible with Hive caching");
             newSetBinder(binder, DynamicConfigurationProvider.class).addBinding().to(GcsConfigurationProvider.class).in(Scopes.SINGLETON);
         }
+
+        binder.bind(GcsStorageFactory.class).in(Scopes.SINGLETON);
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/CachingTrinoS3FileSystem.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/CachingTrinoS3FileSystem.java
similarity index 91%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/CachingTrinoS3FileSystem.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/CachingTrinoS3FileSystem.java
index c6dd1b6e48cf..e82cba5c990b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/CachingTrinoS3FileSystem.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/CachingTrinoS3FileSystem.java
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
 import com.qubole.rubix.core.CachingFileSystem;
 import com.qubole.rubix.spi.ClusterType;
-import io.trino.plugin.hive.s3.TrinoS3FileSystem;
+import io.trino.hdfs.s3.TrinoS3FileSystem;
 
 public class CachingTrinoS3FileSystem
         extends CachingFileSystem<TrinoS3FileSystem>
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/DummyBookKeeper.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/DummyBookKeeper.java
similarity index 98%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/DummyBookKeeper.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/DummyBookKeeper.java
index b6f4b9f14ea4..f9c9b3d68b3b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/DummyBookKeeper.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/DummyBookKeeper.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
 import com.qubole.rubix.spi.thrift.BookKeeperService;
 import com.qubole.rubix.spi.thrift.CacheStatusRequest;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixConfig.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixConfig.java
similarity index 96%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixConfig.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixConfig.java
index 10f240ffcaac..9973f8a4efcd 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixConfig.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixConfig.java
@@ -11,17 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
 import com.qubole.rubix.spi.CacheConfig;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixConfigurationInitializer.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixConfigurationInitializer.java
similarity index 95%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixConfigurationInitializer.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixConfigurationInitializer.java
index 85ad19737ab9..bfc49b29acc5 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixConfigurationInitializer.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixConfigurationInitializer.java
@@ -11,14 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
+import com.google.inject.Inject;
 import io.trino.hdfs.DynamicConfigurationProvider;
 import io.trino.hdfs.HdfsContext;
 import org.apache.hadoop.conf.Configuration;
 
-import javax.inject.Inject;
-
 import java.net.URI;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixEnabledConfig.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixEnabledConfig.java
similarity index 96%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixEnabledConfig.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixEnabledConfig.java
index f83b4a042cf9..ac091c99511f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixEnabledConfig.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixEnabledConfig.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixHdfsInitializer.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixHdfsInitializer.java
similarity index 95%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixHdfsInitializer.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixHdfsInitializer.java
index 39b09a67d053..1c0aaa243ef2 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixHdfsInitializer.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixHdfsInitializer.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
 import io.trino.hdfs.ConfigurationInitializer;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixInitializer.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixInitializer.java
similarity index 85%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixInitializer.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixInitializer.java
index f18e2bd15c4f..59e2c5001954 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixInitializer.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixInitializer.java
@@ -11,11 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.Closer;
+import com.google.inject.Inject;
 import com.qubole.rubix.bookkeeper.BookKeeper;
 import com.qubole.rubix.bookkeeper.BookKeeperServer;
 import com.qubole.rubix.bookkeeper.LocalDataTransferServer;
@@ -27,26 +28,25 @@
 import com.qubole.rubix.prestosql.CachingPrestoNativeAzureFileSystem;
 import com.qubole.rubix.prestosql.CachingPrestoSecureAzureBlobFileSystem;
 import com.qubole.rubix.prestosql.CachingPrestoSecureNativeAzureFileSystem;
+import dev.failsafe.Failsafe;
+import dev.failsafe.FailsafeExecutor;
+import dev.failsafe.RetryPolicy;
 import io.airlift.log.Logger;
-import io.airlift.units.Duration;
 import io.trino.hdfs.HdfsConfigurationInitializer;
 import io.trino.plugin.base.CatalogName;
-import io.trino.plugin.hive.util.RetryDriver;
 import io.trino.spi.HostAddress;
 import io.trino.spi.Node;
 import io.trino.spi.NodeManager;
 import io.trino.spi.TrinoException;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PreDestroy;
 import org.apache.hadoop.conf.Configuration;
 
-import javax.annotation.Nullable;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.io.IOException;
+import java.time.Duration;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Throwables.propagateIfPossible;
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.qubole.rubix.spi.CacheConfig.enableHeartbeat;
 import static com.qubole.rubix.spi.CacheConfig.setBookKeeperServerPort;
@@ -65,14 +65,9 @@
 import static com.qubole.rubix.spi.CacheConfig.setPrestoClusterManager;
 import static io.trino.hdfs.ConfigurationUtils.getInitialConfiguration;
 import static io.trino.hdfs.DynamicConfigurationProvider.setCacheKey;
-import static io.trino.plugin.hive.rubix.RubixInitializer.Owner.PRESTO;
-import static io.trino.plugin.hive.rubix.RubixInitializer.Owner.RUBIX;
-import static io.trino.plugin.hive.util.RetryDriver.DEFAULT_SCALE_FACTOR;
-import static io.trino.plugin.hive.util.RetryDriver.retry;
+import static io.trino.hdfs.rubix.RubixInitializer.Owner.PRESTO;
+import static io.trino.hdfs.rubix.RubixInitializer.Owner.RUBIX;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
-import static java.lang.Integer.MAX_VALUE;
-import static java.util.concurrent.TimeUnit.MINUTES;
-import static java.util.concurrent.TimeUnit.SECONDS;
 
 /*
  * Responsibilities of this initializer:
@@ -94,19 +89,16 @@ public class RubixInitializer
     private static final String RUBIX_GS_FS_CLASS_NAME = CachingPrestoGoogleHadoopFileSystem.class.getName();
     private static final String FILESYSTEM_OWNED_BY_RUBIX_CONFIG_PROPETY = "presto.fs.owned.by.rubix";
 
-    private static final RetryDriver DEFAULT_COORDINATOR_RETRY_DRIVER = retry()
-            // unlimited attempts
-            .maxAttempts(MAX_VALUE)
-            .exponentialBackoff(
-                    new Duration(1, SECONDS),
-                    new Duration(1, SECONDS),
-                    // wait for 10 minutes
-                    new Duration(10, MINUTES),
-                    DEFAULT_SCALE_FACTOR);
+    private static final FailsafeExecutor<?> DEFAULT_COORDINATOR_FAILSAFE_EXECUTOR = Failsafe.with(RetryPolicy.builder()
+            .handle(TrinoException.class)
+            .withMaxAttempts(-1)
+            .withMaxDuration(Duration.ofMinutes(10))
+            .withDelay(Duration.ofSeconds(1))
+            .build());
 
     private static final Logger log = Logger.get(RubixInitializer.class);
 
-    private final RetryDriver coordinatorRetryDriver;
+    private final FailsafeExecutor<?> coordinatorFailsafeExecutor;
     private final boolean startServerOnCoordinator;
     private final boolean parallelWarmupEnabled;
     private final Optional<String> cacheLocation;
@@ -133,19 +125,19 @@ public RubixInitializer(
             HdfsConfigurationInitializer hdfsConfigurationInitializer,
             RubixHdfsInitializer rubixHdfsInitializer)
     {
-        this(DEFAULT_COORDINATOR_RETRY_DRIVER, rubixConfig, nodeManager, catalogName, hdfsConfigurationInitializer, rubixHdfsInitializer);
+        this(DEFAULT_COORDINATOR_FAILSAFE_EXECUTOR, rubixConfig, nodeManager, catalogName, hdfsConfigurationInitializer, rubixHdfsInitializer);
     }
 
     @VisibleForTesting
     RubixInitializer(
-            RetryDriver coordinatorRetryDriver,
+            FailsafeExecutor<?> coordinatorFailsafeExecutor,
             RubixConfig rubixConfig,
             NodeManager nodeManager,
             CatalogName catalogName,
             HdfsConfigurationInitializer hdfsConfigurationInitializer,
             RubixHdfsInitializer rubixHdfsInitializer)
     {
-        this.coordinatorRetryDriver = coordinatorRetryDriver;
+        this.coordinatorFailsafeExecutor = coordinatorFailsafeExecutor;
         this.startServerOnCoordinator = rubixConfig.isStartServerOnCoordinator();
         this.parallelWarmupEnabled = rubixConfig.getReadMode().isParallelWarmupEnabled();
         this.cacheLocation = rubixConfig.getCacheLocation();
@@ -236,21 +228,12 @@ boolean isServerUp()
 
     private void waitForCoordinator()
     {
-        try {
-            coordinatorRetryDriver.run(
-                    "waitForCoordinator",
-                    () -> {
-                        if (nodeManager.getAllNodes().stream().noneMatch(Node::isCoordinator)) {
-                            // This exception will only be propagated when timeout is reached.
-                            throw new TrinoException(GENERIC_INTERNAL_ERROR, "No coordinator node available");
-                        }
-                        return null;
-                    });
-        }
-        catch (Exception exception) {
-            propagateIfPossible(exception, TrinoException.class);
-            throw new RuntimeException(exception);
-        }
+        coordinatorFailsafeExecutor.run(() -> {
+            if (nodeManager.getAllNodes().stream().noneMatch(Node::isCoordinator)) {
+                // This exception will only be propagated when timeout is reached.
+                throw new TrinoException(GENERIC_INTERNAL_ERROR, "No coordinator node available");
+            }
+        });
     }
 
     private void startRubix()
@@ -315,7 +298,7 @@ private void updateRubixConfiguration(Configuration config, Owner owner)
             setCacheDataOnMasterEnabled(config, false);
         }
         else {
-            setCacheDataDirPrefix(config, cacheLocation.get());
+            setCacheDataDirPrefix(config, cacheLocation.orElseThrow());
         }
 
         config.set("fs.s3.impl", RUBIX_S3_FS_CLASS_NAME);
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixModule.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixModule.java
similarity index 99%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixModule.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixModule.java
index 5ccf42a34244..89040f629965 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/RubixModule.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/RubixModule.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Binder;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/TrinoClusterManager.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/TrinoClusterManager.java
similarity index 98%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/TrinoClusterManager.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/TrinoClusterManager.java
index ab19f16fd85d..ec5ace8e1090 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rubix/TrinoClusterManager.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/rubix/TrinoClusterManager.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
 import com.qubole.rubix.spi.ClusterManager;
 import com.qubole.rubix.spi.ClusterType;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/AwsCurrentRegionHolder.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/AwsCurrentRegionHolder.java
similarity index 98%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/AwsCurrentRegionHolder.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/AwsCurrentRegionHolder.java
index f0a4682fa516..4026970ed341 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/AwsCurrentRegionHolder.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/AwsCurrentRegionHolder.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.aws;
+package io.trino.hdfs.s3;
 
 import com.amazonaws.regions.Region;
 import com.amazonaws.regions.Regions;
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/AwsSdkClientCoreStats.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/AwsSdkClientCoreStats.java
new file mode 100644
index 000000000000..88c27e50ca34
--- /dev/null
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/AwsSdkClientCoreStats.java
@@ -0,0 +1,183 @@
+/*
+ * Licensed 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 io.trino.hdfs.s3;
+
+import com.amazonaws.Request;
+import com.amazonaws.Response;
+import com.amazonaws.metrics.RequestMetricCollector;
+import com.amazonaws.util.AWSRequestMetrics;
+import com.amazonaws.util.TimingInfo;
+import com.google.errorprone.annotations.ThreadSafe;
+import io.airlift.stats.CounterStat;
+import io.airlift.stats.TimeStat;
+import org.weakref.jmx.Managed;
+import org.weakref.jmx.Nested;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static com.amazonaws.util.AWSRequestMetrics.Field.ClientExecuteTime;
+import static com.amazonaws.util.AWSRequestMetrics.Field.HttpClientPoolAvailableCount;
+import static com.amazonaws.util.AWSRequestMetrics.Field.HttpClientPoolLeasedCount;
+import static com.amazonaws.util.AWSRequestMetrics.Field.HttpClientPoolPendingCount;
+import static com.amazonaws.util.AWSRequestMetrics.Field.HttpClientRetryCount;
+import static com.amazonaws.util.AWSRequestMetrics.Field.HttpRequestTime;
+import static com.amazonaws.util.AWSRequestMetrics.Field.RequestCount;
+import static com.amazonaws.util.AWSRequestMetrics.Field.RetryPauseTime;
+import static com.amazonaws.util.AWSRequestMetrics.Field.ThrottleException;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+@ThreadSafe
+public final class AwsSdkClientCoreStats
+{
+    private final CounterStat awsRequestCount = new CounterStat();
+    private final CounterStat awsRetryCount = new CounterStat();
+    private final CounterStat awsThrottleExceptions = new CounterStat();
+    private final TimeStat awsRequestTime = new TimeStat(MILLISECONDS);
+    private final TimeStat awsClientExecuteTime = new TimeStat(MILLISECONDS);
+    private final TimeStat awsClientRetryPauseTime = new TimeStat(MILLISECONDS);
+    private final AtomicLong awsHttpClientPoolAvailableCount = new AtomicLong();
+    private final AtomicLong awsHttpClientPoolLeasedCount = new AtomicLong();
+    private final AtomicLong awsHttpClientPoolPendingCount = new AtomicLong();
+
+    @Managed
+    @Nested
+    public CounterStat getAwsRequestCount()
+    {
+        return awsRequestCount;
+    }
+
+    @Managed
+    @Nested
+    public CounterStat getAwsRetryCount()
+    {
+        return awsRetryCount;
+    }
+
+    @Managed
+    @Nested
+    public CounterStat getAwsThrottleExceptions()
+    {
+        return awsThrottleExceptions;
+    }
+
+    @Managed
+    @Nested
+    public TimeStat getAwsRequestTime()
+    {
+        return awsRequestTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeStat getAwsClientExecuteTime()
+    {
+        return awsClientExecuteTime;
+    }
+
+    @Managed
+    @Nested
+    public TimeStat getAwsClientRetryPauseTime()
+    {
+        return awsClientRetryPauseTime;
+    }
+
+    @Managed
+    public long getAwsHttpClientPoolAvailableCount()
+    {
+        return awsHttpClientPoolAvailableCount.get();
+    }
+
+    @Managed
+    public long getAwsHttpClientPoolLeasedCount()
+    {
+        return awsHttpClientPoolLeasedCount.get();
+    }
+
+    @Managed
+    public long getAwsHttpClientPoolPendingCount()
+    {
+        return awsHttpClientPoolPendingCount.get();
+    }
+
+    public AwsSdkClientCoreRequestMetricCollector newRequestMetricCollector()
+    {
+        return new AwsSdkClientCoreRequestMetricCollector(this);
+    }
+
+    public static class AwsSdkClientCoreRequestMetricCollector
+            extends RequestMetricCollector
+    {
+        private final AwsSdkClientCoreStats stats;
+
+        protected AwsSdkClientCoreRequestMetricCollector(AwsSdkClientCoreStats stats)
+        {
+            this.stats = requireNonNull(stats, "stats is null");
+        }
+
+        @Override
+        public void collectMetrics(Request<?> request, Response<?> response)
+        {
+            TimingInfo timingInfo = request.getAWSRequestMetrics().getTimingInfo();
+
+            Number requestCounts = timingInfo.getCounter(RequestCount.name());
+            if (requestCounts != null) {
+                stats.awsRequestCount.update(requestCounts.longValue());
+            }
+
+            Number retryCounts = timingInfo.getCounter(HttpClientRetryCount.name());
+            if (retryCounts != null) {
+                stats.awsRetryCount.update(retryCounts.longValue());
+            }
+
+            Number throttleExceptions = timingInfo.getCounter(ThrottleException.name());
+            if (throttleExceptions != null) {
+                stats.awsThrottleExceptions.update(throttleExceptions.longValue());
+            }
+
+            Number httpClientPoolAvailableCount = timingInfo.getCounter(HttpClientPoolAvailableCount.name());
+            if (httpClientPoolAvailableCount != null) {
+                stats.awsHttpClientPoolAvailableCount.set(httpClientPoolAvailableCount.longValue());
+            }
+
+            Number httpClientPoolLeasedCount = timingInfo.getCounter(HttpClientPoolLeasedCount.name());
+            if (httpClientPoolLeasedCount != null) {
+                stats.awsHttpClientPoolLeasedCount.set(httpClientPoolLeasedCount.longValue());
+            }
+
+            Number httpClientPoolPendingCount = timingInfo.getCounter(HttpClientPoolPendingCount.name());
+            if (httpClientPoolPendingCount != null) {
+                stats.awsHttpClientPoolPendingCount.set(httpClientPoolPendingCount.longValue());
+            }
+
+            recordSubTimingDurations(timingInfo, HttpRequestTime, stats.awsRequestTime);
+            recordSubTimingDurations(timingInfo, ClientExecuteTime, stats.awsClientExecuteTime);
+            recordSubTimingDurations(timingInfo, RetryPauseTime, stats.awsClientRetryPauseTime);
+        }
+
+        private static void recordSubTimingDurations(TimingInfo timingInfo, AWSRequestMetrics.Field field, TimeStat timeStat)
+        {
+            List<TimingInfo> subTimings = timingInfo.getAllSubMeasurements(field.name());
+            if (subTimings != null) {
+                for (TimingInfo subTiming : subTimings) {
+                    Long endTimeNanos = subTiming.getEndTimeNanoIfKnown();
+                    if (endTimeNanos != null) {
+                        timeStat.addNanos(endTimeNanos - subTiming.getStartTimeNano());
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/FileBasedS3SecurityMappingsProvider.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/FileBasedS3SecurityMappingsProvider.java
similarity index 98%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/FileBasedS3SecurityMappingsProvider.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/FileBasedS3SecurityMappingsProvider.java
index f84cfc190cf9..2074a65dc405 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/FileBasedS3SecurityMappingsProvider.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/FileBasedS3SecurityMappingsProvider.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.google.inject.Inject;
 import io.airlift.log.Logger;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/ForS3SecurityMapping.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/ForS3SecurityMapping.java
similarity index 96%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/ForS3SecurityMapping.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/ForS3SecurityMapping.java
index 41088150b3a8..9168e632bc16 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/ForS3SecurityMapping.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/ForS3SecurityMapping.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.google.inject.BindingAnnotation;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/HiveS3Config.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/HiveS3Config.java
similarity index 99%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/HiveS3Config.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/HiveS3Config.java
index 316897509d42..70d00c56030f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/HiveS3Config.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/HiveS3Config.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.google.common.base.StandardSystemProperty;
 import com.google.common.collect.ImmutableList;
@@ -25,9 +25,8 @@
 import io.airlift.units.MaxDataSize;
 import io.airlift.units.MinDataSize;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.List;
@@ -601,6 +600,7 @@ public String getS3ProxyPassword()
     }
 
     @Config("hive.s3.proxy.password")
+    @ConfigSecuritySensitive
     public HiveS3Config setS3ProxyPassword(String s3proxyPassword)
     {
         this.s3proxyPassword = s3proxyPassword;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/HiveS3Module.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/HiveS3Module.java
similarity index 94%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/HiveS3Module.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/HiveS3Module.java
index 4f6cff14de18..501bfcb973f7 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/HiveS3Module.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/HiveS3Module.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.google.inject.Binder;
 import com.google.inject.Scopes;
@@ -19,8 +19,7 @@
 import io.airlift.units.Duration;
 import io.trino.hdfs.ConfigurationInitializer;
 import io.trino.hdfs.DynamicConfigurationProvider;
-import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.rubix.RubixEnabledConfig;
+import io.trino.hdfs.rubix.RubixEnabledConfig;
 import org.apache.hadoop.conf.Configuration;
 
 import java.util.concurrent.TimeUnit;
@@ -84,7 +83,6 @@ private void bindSecurityMapping(Binder binder)
         newSetBinder(binder, DynamicConfigurationProvider.class).addBinding()
                 .to(S3SecurityMappingConfigurationProvider.class).in(Scopes.SINGLETON);
 
-        checkArgument(!buildConfigObject(HiveConfig.class).isS3SelectPushdownEnabled(), "S3 security mapping is not compatible with S3 Select pushdown");
         checkArgument(!buildConfigObject(RubixEnabledConfig.class).isCacheEnabled(), "S3 security mapping is not compatible with Hive caching");
     }
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/HiveS3TypeConfig.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/HiveS3TypeConfig.java
similarity index 92%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/HiveS3TypeConfig.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/HiveS3TypeConfig.java
index feab04a8fc66..db43dde957d8 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/HiveS3TypeConfig.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/HiveS3TypeConfig.java
@@ -11,11 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class HiveS3TypeConfig
 {
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/RetryDriver.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/RetryDriver.java
new file mode 100644
index 000000000000..ec378c20a516
--- /dev/null
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/RetryDriver.java
@@ -0,0 +1,170 @@
+/*
+ * Licensed 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 io.trino.hdfs.s3;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.log.Logger;
+import io.airlift.units.Duration;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public class RetryDriver
+{
+    private static final Logger log = Logger.get(RetryDriver.class);
+    public static final int DEFAULT_MAX_ATTEMPTS = 10;
+    public static final Duration DEFAULT_SLEEP_TIME = new Duration(1, SECONDS);
+    public static final Duration DEFAULT_MAX_RETRY_TIME = new Duration(30, SECONDS);
+    public static final double DEFAULT_SCALE_FACTOR = 2.0;
+
+    private final int maxAttempts;
+    private final Duration minSleepTime;
+    private final Duration maxSleepTime;
+    private final double scaleFactor;
+    private final Duration maxRetryTime;
+    private final List<Class<? extends Exception>> stopOnExceptions;
+    private final Optional<Runnable> retryRunnable;
+
+    private RetryDriver(
+            int maxAttempts,
+            Duration minSleepTime,
+            Duration maxSleepTime,
+            double scaleFactor,
+            Duration maxRetryTime,
+            List<Class<? extends Exception>> stopOnExceptions,
+            Optional<Runnable> retryRunnable)
+    {
+        this.maxAttempts = maxAttempts;
+        this.minSleepTime = minSleepTime;
+        this.maxSleepTime = maxSleepTime;
+        this.scaleFactor = scaleFactor;
+        this.maxRetryTime = maxRetryTime;
+        this.stopOnExceptions = stopOnExceptions;
+        this.retryRunnable = retryRunnable;
+    }
+
+    private RetryDriver()
+    {
+        this(DEFAULT_MAX_ATTEMPTS,
+                DEFAULT_SLEEP_TIME,
+                DEFAULT_SLEEP_TIME,
+                DEFAULT_SCALE_FACTOR,
+                DEFAULT_MAX_RETRY_TIME,
+                ImmutableList.of(),
+                Optional.empty());
+    }
+
+    public static RetryDriver retry()
+    {
+        return new RetryDriver();
+    }
+
+    public final RetryDriver maxAttempts(int maxAttempts)
+    {
+        return new RetryDriver(maxAttempts, minSleepTime, maxSleepTime, scaleFactor, maxRetryTime, stopOnExceptions, retryRunnable);
+    }
+
+    public final RetryDriver exponentialBackoff(Duration minSleepTime, Duration maxSleepTime, Duration maxRetryTime, double scaleFactor)
+    {
+        return new RetryDriver(maxAttempts, minSleepTime, maxSleepTime, scaleFactor, maxRetryTime, stopOnExceptions, retryRunnable);
+    }
+
+    public final RetryDriver onRetry(Runnable retryRunnable)
+    {
+        return new RetryDriver(maxAttempts, minSleepTime, maxSleepTime, scaleFactor, maxRetryTime, stopOnExceptions, Optional.ofNullable(retryRunnable));
+    }
+
+    @SafeVarargs
+    public final RetryDriver stopOn(Class<? extends Exception>... classes)
+    {
+        requireNonNull(classes, "classes is null");
+        List<Class<? extends Exception>> exceptions = ImmutableList.<Class<? extends Exception>>builder()
+                .addAll(stopOnExceptions)
+                .addAll(Arrays.asList(classes))
+                .build();
+
+        return new RetryDriver(maxAttempts, minSleepTime, maxSleepTime, scaleFactor, maxRetryTime, exceptions, retryRunnable);
+    }
+
+    public <V> V run(String callableName, Callable<V> callable)
+            throws Exception
+    {
+        requireNonNull(callableName, "callableName is null");
+        requireNonNull(callable, "callable is null");
+
+        List<Throwable> suppressedExceptions = new ArrayList<>();
+        long startTime = System.nanoTime();
+        int attempt = 0;
+        while (true) {
+            attempt++;
+
+            if (attempt > 1) {
+                retryRunnable.ifPresent(Runnable::run);
+            }
+
+            try {
+                return callable.call();
+            }
+            catch (Exception e) {
+                // Immediately stop retry attempts once an interrupt has been received
+                if (e instanceof InterruptedException || Thread.currentThread().isInterrupted()) {
+                    addSuppressed(e, suppressedExceptions);
+                    throw e;
+                }
+                for (Class<? extends Exception> clazz : stopOnExceptions) {
+                    if (clazz.isInstance(e)) {
+                        addSuppressed(e, suppressedExceptions);
+                        throw e;
+                    }
+                }
+                if (attempt >= maxAttempts || Duration.nanosSince(startTime).compareTo(maxRetryTime) >= 0) {
+                    addSuppressed(e, suppressedExceptions);
+                    throw e;
+                }
+                log.debug("Failed on executing %s with attempt %d, will retry. Exception: %s", callableName, attempt, e.getMessage());
+
+                suppressedExceptions.add(e);
+
+                int delayInMs = (int) Math.min(minSleepTime.toMillis() * Math.pow(scaleFactor, attempt - 1), maxSleepTime.toMillis());
+                int jitter = ThreadLocalRandom.current().nextInt(Math.max(1, (int) (delayInMs * 0.1)));
+                try {
+                    TimeUnit.MILLISECONDS.sleep(delayInMs + jitter);
+                }
+                catch (InterruptedException ie) {
+                    Thread.currentThread().interrupt();
+                    Exception exception = new RuntimeException(ie);
+                    addSuppressed(exception, suppressedExceptions);
+                    throw exception;
+                }
+            }
+        }
+    }
+
+    private static void addSuppressed(Exception exception, List<Throwable> suppressedExceptions)
+    {
+        for (Throwable suppressedException : suppressedExceptions) {
+            if (exception != suppressedException) {
+                exception.addSuppressed(suppressedException);
+            }
+        }
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3FileSystemType.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3FileSystemType.java
similarity index 96%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3FileSystemType.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3FileSystemType.java
index e109bc128e01..87868ce69017 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3FileSystemType.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3FileSystemType.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 public enum S3FileSystemType
 {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMapping.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMapping.java
similarity index 98%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMapping.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMapping.java
index 02d010a00e6f..c6a17f1b7bc5 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMapping.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMapping.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -30,7 +30,7 @@
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.extractBucketName;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.extractBucketName;
 import static java.util.Objects.requireNonNull;
 
 public class S3SecurityMapping
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappingConfig.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappingConfig.java
similarity index 97%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappingConfig.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappingConfig.java
index d4e877cc7897..6ec715ff5140 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappingConfig.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappingConfig.java
@@ -11,13 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappingConfigurationProvider.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappingConfigurationProvider.java
similarity index 93%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappingConfigurationProvider.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappingConfigurationProvider.java
index f7f63b80ed88..fde8e541eb49 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappingConfigurationProvider.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappingConfigurationProvider.java
@@ -11,20 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.hash.Hasher;
 import com.google.common.hash.Hashing;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.hdfs.DynamicConfigurationProvider;
 import io.trino.hdfs.HdfsContext;
 import io.trino.spi.security.AccessDeniedException;
 import org.apache.hadoop.conf.Configuration;
 
-import javax.inject.Inject;
-
 import java.net.URI;
 import java.util.Optional;
 import java.util.Set;
@@ -32,12 +31,12 @@
 
 import static com.google.common.base.Verify.verify;
 import static io.trino.hdfs.DynamicConfigurationProvider.setCacheKey;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ACCESS_KEY;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ENDPOINT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_IAM_ROLE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_KMS_KEY_ID;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ROLE_SESSION_NAME;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SECRET_KEY;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ACCESS_KEY;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ENDPOINT;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_IAM_ROLE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_KMS_KEY_ID;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ROLE_SESSION_NAME;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SECRET_KEY;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappings.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappings.java
similarity index 97%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappings.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappings.java
index 30301a8124b7..8ca368962d3e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappings.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappings.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappingsParser.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappingsParser.java
similarity index 97%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappingsParser.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappingsParser.java
index 6677c1f5792e..5f9550fb5118 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappingsParser.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappingsParser.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappingsProvider.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappingsProvider.java
similarity index 95%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappingsProvider.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappingsProvider.java
index 935c55c00d03..faee73f4ed08 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/S3SecurityMappingsProvider.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/S3SecurityMappingsProvider.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import java.util.function.Supplier;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3AclType.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3AclType.java
similarity index 97%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3AclType.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3AclType.java
index 7ee560800193..03199c556bde 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3AclType.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3AclType.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.amazonaws.services.s3.model.CannedAccessControlList;
 
diff --git a/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3ConfigurationInitializer.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3ConfigurationInitializer.java
new file mode 100644
index 000000000000..94334708c6cb
--- /dev/null
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3ConfigurationInitializer.java
@@ -0,0 +1,256 @@
+/*
+ * Licensed 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 io.trino.hdfs.s3;
+
+import com.google.inject.Inject;
+import io.airlift.units.DataSize;
+import io.airlift.units.Duration;
+import io.trino.hdfs.ConfigurationInitializer;
+import org.apache.hadoop.conf.Configuration;
+
+import java.io.File;
+import java.util.List;
+import java.util.Optional;
+
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ACCESS_KEY;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ACL_TYPE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_CONNECT_TIMEOUT;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_CONNECT_TTL;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ENCRYPTION_MATERIALS_PROVIDER;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ENDPOINT;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_EXTERNAL_ID;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_IAM_ROLE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_KMS_KEY_ID;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_MAX_BACKOFF_TIME;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_MAX_CLIENT_RETRIES;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_MAX_CONNECTIONS;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_MAX_ERROR_RETRIES;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_MAX_RETRY_TIME;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_MULTIPART_MIN_FILE_SIZE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_MULTIPART_MIN_PART_SIZE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_NON_PROXY_HOSTS;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_PATH_STYLE_ACCESS;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_PIN_CLIENT_TO_CURRENT_REGION;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_PREEMPTIVE_BASIC_PROXY_AUTH;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_PROXY_HOST;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_PROXY_PASSWORD;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_PROXY_PORT;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_PROXY_PROTOCOL;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_PROXY_USERNAME;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_REGION;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_REQUESTER_PAYS_ENABLED;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SECRET_KEY;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SIGNER_CLASS;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SIGNER_TYPE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SKIP_GLACIER_OBJECTS;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SOCKET_TIMEOUT;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SSE_ENABLED;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SSE_KMS_KEY_ID;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SSE_TYPE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SSL_ENABLED;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_STAGING_DIRECTORY;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_STORAGE_CLASS;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_STREAMING_UPLOAD_ENABLED;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_STREAMING_UPLOAD_PART_SIZE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_STS_ENDPOINT;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_STS_REGION;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_USER_AGENT_PREFIX;
+import static java.util.stream.Collectors.joining;
+
+public class TrinoS3ConfigurationInitializer
+        implements ConfigurationInitializer
+{
+    private final String awsAccessKey;
+    private final String awsSecretKey;
+    private final String endpoint;
+    private final String region;
+    private final TrinoS3StorageClass s3StorageClass;
+    private final TrinoS3SignerType signerType;
+    private final boolean pathStyleAccess;
+    private final String iamRole;
+    private final String externalId;
+    private final boolean sslEnabled;
+    private final boolean sseEnabled;
+    private final TrinoS3SseType sseType;
+    private final String encryptionMaterialsProvider;
+    private final String kmsKeyId;
+    private final String sseKmsKeyId;
+    private final int maxClientRetries;
+    private final int maxErrorRetries;
+    private final Duration maxBackoffTime;
+    private final Duration maxRetryTime;
+    private final Duration connectTimeout;
+    private final Optional<Duration> connectTtl;
+    private final Duration socketTimeout;
+    private final int maxConnections;
+    private final DataSize multipartMinFileSize;
+    private final DataSize multipartMinPartSize;
+    private final File stagingDirectory;
+    private final boolean pinClientToCurrentRegion;
+    private final String userAgentPrefix;
+    private final TrinoS3AclType aclType;
+    private final String signerClass;
+    private final boolean requesterPaysEnabled;
+    private final boolean skipGlacierObjects;
+    private final boolean s3StreamingUploadEnabled;
+    private final DataSize streamingPartSize;
+    private final String s3proxyHost;
+    private final int s3proxyPort;
+    private final TrinoS3Protocol s3ProxyProtocol;
+    private final List<String> s3nonProxyHosts;
+    private final String s3proxyUsername;
+    private final String s3proxyPassword;
+    private final boolean s3preemptiveBasicProxyAuth;
+    private final String s3StsEndpoint;
+    private final String s3StsRegion;
+
+    @Inject
+    public TrinoS3ConfigurationInitializer(HiveS3Config config)
+    {
+        this.awsAccessKey = config.getS3AwsAccessKey();
+        this.awsSecretKey = config.getS3AwsSecretKey();
+        this.endpoint = config.getS3Endpoint();
+        this.region = config.getS3Region();
+        this.s3StorageClass = config.getS3StorageClass();
+        this.signerType = config.getS3SignerType();
+        this.signerClass = config.getS3SignerClass();
+        this.pathStyleAccess = config.isS3PathStyleAccess();
+        this.iamRole = config.getS3IamRole();
+        this.externalId = config.getS3ExternalId();
+        this.sslEnabled = config.isS3SslEnabled();
+        this.sseEnabled = config.isS3SseEnabled();
+        this.sseType = config.getS3SseType();
+        this.encryptionMaterialsProvider = config.getS3EncryptionMaterialsProvider();
+        this.kmsKeyId = config.getS3KmsKeyId();
+        this.sseKmsKeyId = config.getS3SseKmsKeyId();
+        this.maxClientRetries = config.getS3MaxClientRetries();
+        this.maxErrorRetries = config.getS3MaxErrorRetries();
+        this.maxBackoffTime = config.getS3MaxBackoffTime();
+        this.maxRetryTime = config.getS3MaxRetryTime();
+        this.connectTimeout = config.getS3ConnectTimeout();
+        this.connectTtl = config.getS3ConnectTtl();
+        this.socketTimeout = config.getS3SocketTimeout();
+        this.maxConnections = config.getS3MaxConnections();
+        this.multipartMinFileSize = config.getS3MultipartMinFileSize();
+        this.multipartMinPartSize = config.getS3MultipartMinPartSize();
+        this.stagingDirectory = config.getS3StagingDirectory();
+        this.pinClientToCurrentRegion = config.isPinS3ClientToCurrentRegion();
+        this.userAgentPrefix = config.getS3UserAgentPrefix();
+        this.aclType = config.getS3AclType();
+        this.skipGlacierObjects = config.isSkipGlacierObjects();
+        this.requesterPaysEnabled = config.isRequesterPaysEnabled();
+        this.s3StreamingUploadEnabled = config.isS3StreamingUploadEnabled();
+        this.streamingPartSize = config.getS3StreamingPartSize();
+        this.s3proxyHost = config.getS3ProxyHost();
+        this.s3proxyPort = config.getS3ProxyPort();
+        this.s3ProxyProtocol = config.getS3ProxyProtocol();
+        this.s3nonProxyHosts = config.getS3NonProxyHosts();
+        this.s3proxyUsername = config.getS3ProxyUsername();
+        this.s3proxyPassword = config.getS3ProxyPassword();
+        this.s3preemptiveBasicProxyAuth = config.getS3PreemptiveBasicProxyAuth();
+        this.s3StsEndpoint = config.getS3StsEndpoint();
+        this.s3StsRegion = config.getS3StsRegion();
+    }
+
+    @Override
+    public void initializeConfiguration(Configuration config)
+    {
+        // re-map filesystem schemes to match Amazon Elastic MapReduce
+        config.set("fs.s3.impl", TrinoS3FileSystem.class.getName());
+        config.set("fs.s3a.impl", TrinoS3FileSystem.class.getName());
+        config.set("fs.s3n.impl", TrinoS3FileSystem.class.getName());
+
+        if (awsAccessKey != null) {
+            config.set(S3_ACCESS_KEY, awsAccessKey);
+        }
+        if (awsSecretKey != null) {
+            config.set(S3_SECRET_KEY, awsSecretKey);
+        }
+        if (endpoint != null) {
+            config.set(S3_ENDPOINT, endpoint);
+        }
+        if (region != null) {
+            config.set(S3_REGION, region);
+        }
+        config.set(S3_STORAGE_CLASS, s3StorageClass.name());
+        if (signerType != null) {
+            config.set(S3_SIGNER_TYPE, signerType.name());
+        }
+        if (signerClass != null) {
+            config.set(S3_SIGNER_CLASS, signerClass);
+        }
+        config.setBoolean(S3_PATH_STYLE_ACCESS, pathStyleAccess);
+        if (iamRole != null) {
+            config.set(S3_IAM_ROLE, iamRole);
+        }
+        if (externalId != null) {
+            config.set(S3_EXTERNAL_ID, externalId);
+        }
+        config.setBoolean(S3_SSL_ENABLED, sslEnabled);
+        config.setBoolean(S3_SSE_ENABLED, sseEnabled);
+        config.set(S3_SSE_TYPE, sseType.name());
+        if (encryptionMaterialsProvider != null) {
+            config.set(S3_ENCRYPTION_MATERIALS_PROVIDER, encryptionMaterialsProvider);
+        }
+        if (kmsKeyId != null) {
+            config.set(S3_KMS_KEY_ID, kmsKeyId);
+        }
+        if (sseKmsKeyId != null) {
+            config.set(S3_SSE_KMS_KEY_ID, sseKmsKeyId);
+        }
+        config.setInt(S3_MAX_CLIENT_RETRIES, maxClientRetries);
+        config.setInt(S3_MAX_ERROR_RETRIES, maxErrorRetries);
+        config.set(S3_MAX_BACKOFF_TIME, maxBackoffTime.toString());
+        config.set(S3_MAX_RETRY_TIME, maxRetryTime.toString());
+        config.set(S3_CONNECT_TIMEOUT, connectTimeout.toString());
+        connectTtl.ifPresent(duration -> config.set(S3_CONNECT_TTL, duration.toString()));
+        config.set(S3_SOCKET_TIMEOUT, socketTimeout.toString());
+        config.set(S3_STAGING_DIRECTORY, stagingDirectory.getPath());
+        config.setInt(S3_MAX_CONNECTIONS, maxConnections);
+        config.setLong(S3_MULTIPART_MIN_FILE_SIZE, multipartMinFileSize.toBytes());
+        config.setLong(S3_MULTIPART_MIN_PART_SIZE, multipartMinPartSize.toBytes());
+        config.setBoolean(S3_PIN_CLIENT_TO_CURRENT_REGION, pinClientToCurrentRegion);
+        config.set(S3_USER_AGENT_PREFIX, userAgentPrefix);
+        config.set(S3_ACL_TYPE, aclType.name());
+        config.setBoolean(S3_SKIP_GLACIER_OBJECTS, skipGlacierObjects);
+        config.setBoolean(S3_REQUESTER_PAYS_ENABLED, requesterPaysEnabled);
+        config.setBoolean(S3_STREAMING_UPLOAD_ENABLED, s3StreamingUploadEnabled);
+        config.setLong(S3_STREAMING_UPLOAD_PART_SIZE, streamingPartSize.toBytes());
+        if (s3proxyHost != null) {
+            config.set(S3_PROXY_HOST, s3proxyHost);
+        }
+        if (s3proxyPort > -1) {
+            config.setInt(S3_PROXY_PORT, s3proxyPort);
+        }
+        if (s3ProxyProtocol != null) {
+            config.set(S3_PROXY_PROTOCOL, s3ProxyProtocol.name());
+        }
+        if (s3nonProxyHosts != null) {
+            config.set(S3_NON_PROXY_HOSTS, s3nonProxyHosts.stream().collect(joining("|")));
+        }
+        if (s3proxyUsername != null) {
+            config.set(S3_PROXY_USERNAME, s3proxyUsername);
+        }
+        if (s3proxyPassword != null) {
+            config.set(S3_PROXY_PASSWORD, s3proxyPassword);
+        }
+        config.setBoolean(S3_PREEMPTIVE_BASIC_PROXY_AUTH, s3preemptiveBasicProxyAuth);
+        if (s3StsEndpoint != null) {
+            config.set(S3_STS_ENDPOINT, s3StsEndpoint);
+        }
+        if (s3StsRegion != null) {
+            config.set(S3_STS_REGION, s3StsRegion);
+        }
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3FileSystem.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3FileSystem.java
similarity index 95%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3FileSystem.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3FileSystem.java
index f145aabb2926..87deecddb1e9 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3FileSystem.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3FileSystem.java
@@ -11,13 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.amazonaws.AbortedException;
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.ClientConfiguration;
 import com.amazonaws.Protocol;
+import com.amazonaws.Request;
+import com.amazonaws.Response;
 import com.amazonaws.SdkClientException;
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSCredentialsProvider;
@@ -32,6 +34,7 @@
 import com.amazonaws.event.ProgressEvent;
 import com.amazonaws.event.ProgressEventType;
 import com.amazonaws.event.ProgressListener;
+import com.amazonaws.handlers.RequestHandler2;
 import com.amazonaws.metrics.RequestMetricCollector;
 import com.amazonaws.regions.DefaultAwsRegionProviderChain;
 import com.amazonaws.regions.Region;
@@ -83,9 +86,12 @@
 import io.airlift.log.Logger;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.awssdk.v1_11.AwsSdkTelemetry;
 import io.trino.hdfs.FSDataInputStreamTail;
 import io.trino.hdfs.FileSystemWithBatchDelete;
 import io.trino.hdfs.MemoryAwareFileSystem;
+import io.trino.hdfs.OpenTelemetryAwareFileSystem;
 import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.memory.context.LocalMemoryContext;
 import org.apache.hadoop.conf.Configurable;
@@ -144,6 +150,7 @@
 import static com.amazonaws.services.s3.Headers.UNENCRYPTED_CONTENT_LENGTH;
 import static com.amazonaws.services.s3.model.StorageClass.DeepArchive;
 import static com.amazonaws.services.s3.model.StorageClass.Glacier;
+import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkPositionIndexes;
 import static com.google.common.base.Preconditions.checkState;
@@ -157,9 +164,9 @@
 import static com.google.common.hash.Hashing.md5;
 import static io.airlift.concurrent.Threads.threadsNamed;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
+import static io.trino.hdfs.s3.AwsCurrentRegionHolder.getCurrentRegionFromEC2Metadata;
+import static io.trino.hdfs.s3.RetryDriver.retry;
 import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
-import static io.trino.plugin.hive.aws.AwsCurrentRegionHolder.getCurrentRegionFromEC2Metadata;
-import static io.trino.plugin.hive.util.RetryDriver.retry;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static java.lang.Math.toIntExact;
@@ -181,7 +188,7 @@
 
 public class TrinoS3FileSystem
         extends FileSystem
-        implements FileSystemWithBatchDelete, MemoryAwareFileSystem
+        implements FileSystemWithBatchDelete, MemoryAwareFileSystem, OpenTelemetryAwareFileSystem
 {
     public static final String S3_USER_AGENT_PREFIX = "trino.s3.user-agent-prefix";
     public static final String S3_CREDENTIALS_PROVIDER = "trino.s3.credentials-provider";
@@ -275,6 +282,7 @@ public class TrinoS3FileSystem
     private String s3RoleSessionName;
 
     private final ExecutorService uploadExecutor = newCachedThreadPool(threadsNamed("s3-upload-%s"));
+    private final ForwardingRequestHandler forwardingRequestHandler = new ForwardingRequestHandler();
 
     @Override
     public void initialize(URI uri, Configuration conf)
@@ -375,7 +383,9 @@ public void close()
                 closer.register(closeable);
             }
             closer.register(uploadExecutor::shutdown);
-            closer.register(s3::shutdown);
+            if (s3 != null) {
+                closer.register(s3::shutdown);
+            }
         }
     }
 
@@ -386,6 +396,17 @@ private void closeSuper()
         super.close();
     }
 
+    @Override
+    public void setOpenTelemetry(OpenTelemetry openTelemetry)
+    {
+        requireNonNull(openTelemetry, "openTelemetry is null");
+        forwardingRequestHandler.setDelegateIfAbsent(() ->
+                AwsSdkTelemetry.builder(openTelemetry)
+                        .setCaptureExperimentalSpanAttributes(true)
+                        .build()
+                        .newRequestHandler());
+    }
+
     @Override
     public String getScheme()
     {
@@ -499,13 +520,24 @@ public FileStatus getFileStatus(Path path)
         return new FileStatus(
                 getObjectSize(path, metadata),
                 // Some directories (e.g. uploaded through S3 GUI) return a charset in the Content-Type header
-                MediaType.parse(metadata.getContentType()).is(DIRECTORY_MEDIA_TYPE),
+                isDirectoryMediaType(nullToEmpty(metadata.getContentType())),
                 1,
                 BLOCK_SIZE.toBytes(),
                 lastModifiedTime(metadata),
                 qualifiedPath(path));
     }
 
+    private static boolean isDirectoryMediaType(String contentType)
+    {
+        try {
+            return MediaType.parse(contentType).is(DIRECTORY_MEDIA_TYPE);
+        }
+        catch (IllegalArgumentException e) {
+            log.debug(e, "isDirectoryMediaType: failed to inspect contentType [%s], assuming not a directory", contentType);
+            return false;
+        }
+    }
+
     private long getObjectSize(Path path, ObjectMetadata metadata)
             throws IOException
     {
@@ -548,7 +580,7 @@ public FSDataOutputStream create(Path path, FsPermission permission, boolean ove
     }
 
     @Override
-    public OutputStream create(Path path, AggregatedMemoryContext aggregatedMemoryContext)
+    public FSDataOutputStream create(Path path, AggregatedMemoryContext aggregatedMemoryContext)
             throws IOException
     {
         return new FSDataOutputStream(createOutputStream(path, aggregatedMemoryContext), statistics);
@@ -621,6 +653,7 @@ public boolean rename(Path src, Path dst)
             delete(src, true);
         }
 
+        // TODO should we return true also when deleteObject() returned false?
         return true;
     }
 
@@ -664,6 +697,7 @@ else if (deletePrefixResult == DeletePrefixResult.DELETE_KEYS_FAILURE) {
             }
             deleteObject(key + DIRECTORY_SUFFIX);
         }
+        // TODO should we return true also when deleteObject() returned false? (currently deleteObject's return value is never used)
         return true;
     }
 
@@ -713,8 +747,9 @@ private boolean directory(Path path)
 
     private boolean deleteObject(String key)
     {
+        String bucketName = getBucketName(uri);
         try {
-            DeleteObjectRequest deleteObjectRequest = new DeleteObjectRequest(getBucketName(uri), key);
+            DeleteObjectRequest deleteObjectRequest = new DeleteObjectRequest(bucketName, key);
             if (requesterPaysEnabled) {
                 // TODO use deleteObjectRequest.setRequesterPays() when https://github.com/aws/aws-sdk-java/issues/1219 is fixed
                 // currently the method exists, but is ineffective (doesn't set the required HTTP header)
@@ -725,6 +760,8 @@ private boolean deleteObject(String key)
             return true;
         }
         catch (AmazonClientException e) {
+            // TODO should we propagate this?
+            log.debug(e, "Failed to delete object from the bucket %s: %s", bucketName, key);
             return false;
         }
     }
@@ -894,12 +931,6 @@ private static boolean isHadoopFolderMarker(S3ObjectSummary object)
     public static class UnrecoverableS3OperationException
             extends IOException
     {
-        public UnrecoverableS3OperationException(Path path, Throwable cause)
-        {
-            // append the path info to the message
-            super(format("%s (Path: %s)", cause, path), cause);
-        }
-
         public UnrecoverableS3OperationException(String bucket, String key, Throwable cause)
         {
             // append bucket and key to the message
@@ -913,14 +944,14 @@ ObjectMetadata getS3ObjectMetadata(Path path)
     {
         String bucketName = getBucketName(uri);
         String key = keyFromPath(path);
-        ObjectMetadata s3ObjectMetadata = getS3ObjectMetadata(path, bucketName, key);
+        ObjectMetadata s3ObjectMetadata = getS3ObjectMetadata(bucketName, key);
         if (s3ObjectMetadata == null && !key.isEmpty()) {
-            return getS3ObjectMetadata(path, bucketName, key + PATH_SEPARATOR);
+            return getS3ObjectMetadata(bucketName, key + PATH_SEPARATOR);
         }
         return s3ObjectMetadata;
     }
 
-    private ObjectMetadata getS3ObjectMetadata(Path path, String bucketName, String key)
+    private ObjectMetadata getS3ObjectMetadata(String bucketName, String key)
             throws IOException
     {
         try {
@@ -941,7 +972,7 @@ private ObjectMetadata getS3ObjectMetadata(Path path, String bucketName, String
                                 switch (awsException.getStatusCode()) {
                                     case HTTP_FORBIDDEN:
                                     case HTTP_BAD_REQUEST:
-                                        throw new UnrecoverableS3OperationException(path, e);
+                                        throw new UnrecoverableS3OperationException(bucketName, key, e);
                                 }
                             }
                             if (e instanceof AmazonS3Exception s3Exception &&
@@ -1077,6 +1108,8 @@ else if (region != null) {
             clientBuilder.setForceGlobalBucketAccessEnabled(true);
         }
 
+        clientBuilder.setRequestHandlers(forwardingRequestHandler);
+
         return clientBuilder.build();
     }
 
@@ -1264,7 +1297,7 @@ private InitiateMultipartUploadResult initMultipartUpload(String bucket, String
                                 switch (s3Exception.getStatusCode()) {
                                     case HTTP_FORBIDDEN, HTTP_BAD_REQUEST -> throw new UnrecoverableS3OperationException(bucket, key, e);
                                     case HTTP_NOT_FOUND -> {
-                                        throwIfFileNotFound(s3Exception);
+                                        throwIfFileNotFound(bucket, key, s3Exception);
                                         throw new UnrecoverableS3OperationException(bucket, key, e);
                                     }
                                 }
@@ -1346,8 +1379,9 @@ public int read(long position, byte[] buffer, int offset, int length)
                         .onRetry(STATS::newGetObjectRetry)
                         .run("getS3Object", () -> {
                             InputStream stream;
+                            String key = keyFromPath(path);
                             try {
-                                GetObjectRequest request = new GetObjectRequest(bucket, keyFromPath(path))
+                                GetObjectRequest request = new GetObjectRequest(bucket, key)
                                         .withRange(position, (position + length) - 1)
                                         .withRequesterPays(requesterPaysEnabled);
                                 stream = s3.getObject(request).getObjectContent();
@@ -1358,7 +1392,7 @@ public int read(long position, byte[] buffer, int offset, int length)
                                     switch (s3Exception.getStatusCode()) {
                                         case HTTP_FORBIDDEN:
                                         case HTTP_BAD_REQUEST:
-                                            throw new UnrecoverableS3OperationException(path, e);
+                                            throw new UnrecoverableS3OperationException(bucket, key, e);
                                     }
                                 }
                                 if (e instanceof AmazonS3Exception s3Exception) {
@@ -1366,8 +1400,8 @@ public int read(long position, byte[] buffer, int offset, int length)
                                         case HTTP_RANGE_NOT_SATISFIABLE:
                                             throw new EOFException(CANNOT_SEEK_PAST_EOF);
                                         case HTTP_NOT_FOUND:
-                                            throwIfFileNotFound(s3Exception);
-                                            throw new UnrecoverableS3OperationException(path, e);
+                                            throwIfFileNotFound(bucket, key, s3Exception);
+                                            throw new UnrecoverableS3OperationException(bucket, key, e);
                                     }
                                 }
                                 throw e;
@@ -1521,8 +1555,9 @@ private InputStream openStream(Path path, long start)
                         .stopOn(InterruptedException.class, UnrecoverableS3OperationException.class, AbortedException.class, FileNotFoundException.class)
                         .onRetry(STATS::newGetObjectRetry)
                         .run("getS3Object", () -> {
+                            String key = keyFromPath(path);
                             try {
-                                GetObjectRequest request = new GetObjectRequest(bucket, keyFromPath(path))
+                                GetObjectRequest request = new GetObjectRequest(bucket, key)
                                         .withRange(start)
                                         .withRequesterPays(requesterPaysEnabled);
                                 return s3.getObject(request).getObjectContent();
@@ -1533,7 +1568,7 @@ private InputStream openStream(Path path, long start)
                                     switch (awsException.getStatusCode()) {
                                         case HTTP_FORBIDDEN:
                                         case HTTP_BAD_REQUEST:
-                                            throw new UnrecoverableS3OperationException(path, e);
+                                            throw new UnrecoverableS3OperationException(bucket, key, e);
                                     }
                                 }
                                 if (e instanceof AmazonS3Exception s3Exception) {
@@ -1542,8 +1577,8 @@ private InputStream openStream(Path path, long start)
                                             // ignore request for start past end of object
                                             return new ByteArrayInputStream(new byte[0]);
                                         case HTTP_NOT_FOUND:
-                                            throwIfFileNotFound(s3Exception);
-                                            throw new UnrecoverableS3OperationException(path, e);
+                                            throwIfFileNotFound(bucket, key, s3Exception);
+                                            throw new UnrecoverableS3OperationException(bucket, key, e);
                                     }
                                 }
                                 throw e;
@@ -1980,7 +2015,7 @@ private void abortUploadSuppressed(Throwable throwable)
     }
 
     @VisibleForTesting
-    AmazonS3 getS3Client()
+    public AmazonS3 getS3Client()
     {
         return s3;
     }
@@ -2031,12 +2066,12 @@ private static String getMd5AsBase64(byte[] data, int offset, int length)
         return Base64.getEncoder().encodeToString(md5);
     }
 
-    private static void throwIfFileNotFound(AmazonS3Exception s3Exception)
+    private static void throwIfFileNotFound(String bucket, String key, AmazonS3Exception s3Exception)
             throws FileNotFoundException
     {
         String errorCode = s3Exception.getErrorCode();
         if (NO_SUCH_KEY_ERROR_CODE.equals(errorCode) || NO_SUCH_BUCKET_ERROR_CODE.equals(errorCode)) {
-            FileNotFoundException fileNotFoundException = new FileNotFoundException(s3Exception.getMessage());
+            FileNotFoundException fileNotFoundException = new FileNotFoundException(format("%s (Bucket: %s, Key: %s)", firstNonNull(s3Exception.getMessage(), s3Exception), bucket, key));
             fileNotFoundException.initCause(s3Exception);
             throw fileNotFoundException;
         }
@@ -2048,4 +2083,41 @@ private enum DeletePrefixResult
         ALL_KEYS_DELETED,
         DELETE_KEYS_FAILURE
     }
+
+    private static class ForwardingRequestHandler
+            extends RequestHandler2
+    {
+        private volatile RequestHandler2 delegate;
+
+        public synchronized void setDelegateIfAbsent(Supplier<RequestHandler2> supplier)
+        {
+            if (delegate == null) {
+                delegate = supplier.get();
+            }
+        }
+
+        @Override
+        public void beforeRequest(Request<?> request)
+        {
+            if (delegate != null) {
+                delegate.beforeRequest(request);
+            }
+        }
+
+        @Override
+        public void afterResponse(Request<?> request, Response<?> response)
+        {
+            if (delegate != null) {
+                delegate.afterResponse(request, response);
+            }
+        }
+
+        @Override
+        public void afterError(Request<?> request, Response<?> response, Exception e)
+        {
+            if (delegate != null) {
+                delegate.afterError(request, response, e);
+            }
+        }
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3FileSystemStats.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3FileSystemStats.java
similarity index 98%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3FileSystemStats.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3FileSystemStats.java
index dadee5338097..8957cb379486 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3FileSystemStats.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3FileSystemStats.java
@@ -11,12 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.amazonaws.AbortedException;
 import com.amazonaws.metrics.RequestMetricCollector;
 import io.airlift.stats.CounterStat;
-import io.trino.plugin.hive.aws.AwsSdkClientCoreStats;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3Protocol.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3Protocol.java
similarity index 96%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3Protocol.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3Protocol.java
index 581e7cd480e5..c88adf27fb45 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3Protocol.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3Protocol.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.amazonaws.Protocol;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3SignerType.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3SignerType.java
similarity index 96%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3SignerType.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3SignerType.java
index 62e34cde00ea..9e60c415b1d8 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3SignerType.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3SignerType.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 // These are the exact names used by SignerFactory in the AWS library
 // and thus cannot be renamed or use the normal naming convention.
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3SseType.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3SseType.java
similarity index 94%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3SseType.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3SseType.java
index 9de1a7e1438e..34c9b395490b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3SseType.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3SseType.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 public enum TrinoS3SseType
 {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3StorageClass.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3StorageClass.java
similarity index 97%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3StorageClass.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3StorageClass.java
index 217bc2aa0757..d0ce79bd8ded 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3StorageClass.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/TrinoS3StorageClass.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.amazonaws.services.s3.model.StorageClass;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/UriBasedS3SecurityMappingsProvider.java b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/UriBasedS3SecurityMappingsProvider.java
similarity index 98%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/UriBasedS3SecurityMappingsProvider.java
rename to lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/UriBasedS3SecurityMappingsProvider.java
index 2183a9b75a89..6540a086eaac 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/UriBasedS3SecurityMappingsProvider.java
+++ b/lib/trino-hdfs/src/main/java/io/trino/hdfs/s3/UriBasedS3SecurityMappingsProvider.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.google.inject.Inject;
 import io.airlift.http.client.HttpClient;
diff --git a/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/Hadoop.java b/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/Hadoop.java
new file mode 100644
index 000000000000..8b7b3ec66d0c
--- /dev/null
+++ b/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/Hadoop.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed 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 io.trino.filesystem.hdfs;
+
+import io.airlift.log.Logger;
+import io.trino.testing.containers.BaseTestContainer;
+import io.trino.testing.containers.PrintingLogConsumer;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.google.common.base.StandardSystemProperty.USER_NAME;
+import static io.trino.testing.TestingProperties.getDockerImagesVersion;
+import static java.util.Collections.emptyMap;
+import static java.util.Objects.requireNonNull;
+
+public class Hadoop
+        extends BaseTestContainer
+{
+    private static final Logger log = Logger.get(Hadoop.class);
+
+    private static final String IMAGE = "ghcr.io/trinodb/testing/hdp3.1-hive:" + getDockerImagesVersion();
+
+    private static final int HDFS_PORT = 9000;
+
+    public Hadoop()
+    {
+        super(
+                IMAGE,
+                "hadoop-master",
+                Set.of(HDFS_PORT),
+                emptyMap(),
+                Map.of("HADOOP_USER_NAME", requireNonNull(USER_NAME.value())),
+                Optional.empty(),
+                1);
+    }
+
+    @Override
+    protected void setupContainer()
+    {
+        super.setupContainer();
+        withLogConsumer(new PrintingLogConsumer("hadoop | "));
+        withRunCommand(List.of("bash", "-e", "-c", """
+                rm /etc/supervisord.d/{hive*,mysql*,socks*,sshd*,yarn*}.conf
+                supervisord -c /etc/supervisord.conf
+                """));
+    }
+
+    @Override
+    public void start()
+    {
+        super.start();
+        executeInContainerFailOnError("hadoop", "fs", "-rm", "-r", "/*");
+        log.info("Hadoop container started with HDFS endpoint: %s", getHdfsUri());
+    }
+
+    public String getHdfsUri()
+    {
+        return "hdfs://%s/".formatted(getMappedHostAndPortForExposedPort(HDFS_PORT));
+    }
+}
diff --git a/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystem.java b/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystem.java
deleted file mode 100644
index f154b93ffb79..000000000000
--- a/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystem.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed 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 io.trino.filesystem.hdfs;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import io.trino.filesystem.FileIterator;
-import io.trino.filesystem.TrinoFileSystem;
-import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.hdfs.DynamicHdfsConfiguration;
-import io.trino.hdfs.HdfsConfig;
-import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.hdfs.HdfsEnvironment;
-import io.trino.hdfs.authentication.NoHdfsAuthentication;
-import io.trino.spi.security.ConnectorIdentity;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-
-import static com.google.common.io.MoreFiles.deleteRecursively;
-import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static java.nio.file.Files.createDirectory;
-import static java.nio.file.Files.createFile;
-import static java.nio.file.Files.createTempDirectory;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TestHdfsFileSystem
-{
-    @Test
-    public void testListing()
-            throws IOException
-    {
-        HdfsConfig hdfsConfig = new HdfsConfig();
-        DynamicHdfsConfiguration hdfsConfiguration = new DynamicHdfsConfiguration(new HdfsConfigurationInitializer(hdfsConfig), ImmutableSet.of());
-        HdfsEnvironment hdfsEnvironment = new HdfsEnvironment(hdfsConfiguration, hdfsConfig, new NoHdfsAuthentication());
-
-        TrinoFileSystemFactory factory = new HdfsFileSystemFactory(hdfsEnvironment);
-        TrinoFileSystem fileSystem = factory.create(ConnectorIdentity.ofUser("test"));
-
-        Path tempDir = createTempDirectory("testListing");
-        String root = tempDir.toString();
-
-        assertThat(listFiles(fileSystem, root)).isEmpty();
-
-        createFile(tempDir.resolve("abc"));
-        createFile(tempDir.resolve("xyz"));
-        createFile(tempDir.resolve("e f"));
-        createDirectory(tempDir.resolve("mydir"));
-
-        assertThat(listFiles(fileSystem, root)).containsExactlyInAnyOrder(
-                root + "/abc",
-                root + "/e f",
-                root + "/xyz");
-
-        assertThat(listFiles(fileSystem, root + "/abc")).containsExactly(root + "/abc");
-        assertThat(listFiles(fileSystem, root + "/abc/")).containsExactly(root + "/abc/");
-        assertThat(listFiles(fileSystem, root + "/abc//")).containsExactly(root + "/abc//");
-        assertThat(listFiles(fileSystem, root + "///abc")).containsExactly(root + "///abc");
-
-        createFile(tempDir.resolve("mydir").resolve("qqq"));
-
-        assertThat(listFiles(fileSystem, root)).containsExactlyInAnyOrder(
-                root + "/abc",
-                root + "/e f",
-                root + "/xyz",
-                root + "/mydir/qqq");
-
-        assertThat(listFiles(fileSystem, root + "/mydir")).containsExactly(root + "/mydir/qqq");
-        assertThat(listFiles(fileSystem, root + "/mydir/")).containsExactly(root + "/mydir/qqq");
-        assertThat(listFiles(fileSystem, root + "/mydir//")).containsExactly(root + "/mydir//qqq");
-        assertThat(listFiles(fileSystem, root + "///mydir")).containsExactly(root + "///mydir/qqq");
-
-        deleteRecursively(tempDir, ALLOW_INSECURE);
-    }
-
-    private static List<String> listFiles(TrinoFileSystem fileSystem, String path)
-            throws IOException
-    {
-        FileIterator iterator = fileSystem.listFiles(path);
-        ImmutableList.Builder<String> files = ImmutableList.builder();
-        while (iterator.hasNext()) {
-            files.add(iterator.next().location());
-        }
-        return files.build();
-    }
-}
diff --git a/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemHdfs.java b/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemHdfs.java
new file mode 100644
index 000000000000..8a98509c611d
--- /dev/null
+++ b/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemHdfs.java
@@ -0,0 +1,141 @@
+/*
+ * Licensed 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 io.trino.filesystem.hdfs;
+
+import io.trino.filesystem.AbstractTestTrinoFileSystem;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.hdfs.DynamicHdfsConfiguration;
+import io.trino.hdfs.HdfsConfig;
+import io.trino.hdfs.HdfsConfiguration;
+import io.trino.hdfs.HdfsConfigurationInitializer;
+import io.trino.hdfs.HdfsContext;
+import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
+import io.trino.hdfs.authentication.NoHdfsAuthentication;
+import io.trino.spi.security.ConnectorIdentity;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+
+import static java.util.Collections.emptySet;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestHdfsFileSystemHdfs
+        extends AbstractTestTrinoFileSystem
+{
+    private Hadoop hadoop;
+    private HdfsConfiguration hdfsConfiguration;
+    private HdfsEnvironment hdfsEnvironment;
+    private HdfsContext hdfsContext;
+    private TrinoFileSystem fileSystem;
+
+    @BeforeAll
+    void beforeAll()
+    {
+        hadoop = new Hadoop();
+        hadoop.start();
+
+        HdfsConfig hdfsConfig = new HdfsConfig();
+        hdfsConfiguration = new DynamicHdfsConfiguration(new HdfsConfigurationInitializer(hdfsConfig), emptySet());
+        hdfsEnvironment = new HdfsEnvironment(hdfsConfiguration, hdfsConfig, new NoHdfsAuthentication());
+        hdfsContext = new HdfsContext(ConnectorIdentity.ofUser("test"));
+
+        fileSystem = new HdfsFileSystem(hdfsEnvironment, hdfsContext, new TrinoHdfsFileSystemStats());
+    }
+
+    @AfterEach
+    void afterEach()
+            throws IOException
+    {
+        Path root = new Path(getRootLocation().toString());
+        FileSystem fs = hdfsEnvironment.getFileSystem(hdfsContext, root);
+        for (FileStatus status : fs.listStatus(root)) {
+            fs.delete(status.getPath(), true);
+        }
+    }
+
+    @AfterAll
+    void afterAll()
+    {
+        hadoop.stop();
+    }
+
+    @Override
+    protected boolean isHierarchical()
+    {
+        return true;
+    }
+
+    @Override
+    protected TrinoFileSystem getFileSystem()
+    {
+        return fileSystem;
+    }
+
+    @Override
+    protected Location getRootLocation()
+    {
+        return Location.of(hadoop.getHdfsUri());
+    }
+
+    @Override
+    protected void verifyFileSystemIsEmpty()
+    {
+        try {
+            Path root = new Path(getRootLocation().toString());
+            FileSystem fs = hdfsEnvironment.getFileSystem(hdfsContext, root);
+            assertThat(fs.listStatus(root)).isEmpty();
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @Test
+    void testCreateDirectoryPermission()
+            throws IOException
+    {
+        assertCreateDirectoryPermission(fileSystem, hdfsEnvironment, (short) 777);
+    }
+
+    @Test
+    void testCreateDirectoryPermissionWithSkip()
+            throws IOException
+    {
+        HdfsConfig configWithSkip = new HdfsConfig()
+                .setNewDirectoryPermissions(HdfsConfig.SKIP_DIR_PERMISSIONS);
+        HdfsEnvironment hdfsEnvironment = new HdfsEnvironment(hdfsConfiguration, configWithSkip, new NoHdfsAuthentication());
+        TrinoFileSystem fileSystem = new HdfsFileSystem(hdfsEnvironment, hdfsContext, new TrinoHdfsFileSystemStats());
+
+        assertCreateDirectoryPermission(fileSystem, hdfsEnvironment, (short) 755);
+    }
+
+    private void assertCreateDirectoryPermission(TrinoFileSystem fileSystem, HdfsEnvironment hdfsEnvironment, short permission)
+            throws IOException
+    {
+        Location location = getRootLocation().appendPath("test");
+        fileSystem.createDirectory(location);
+        Path path = new Path(location.toString());
+        FileStatus status = hdfsEnvironment.getFileSystem(hdfsContext, path).getFileStatus(path);
+        assertThat(status.getPermission().toOctal()).isEqualTo(permission);
+    }
+}
diff --git a/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemListing.java b/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemListing.java
new file mode 100644
index 000000000000..95b197a38ca2
--- /dev/null
+++ b/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemListing.java
@@ -0,0 +1,114 @@
+/*
+ * Licensed 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 io.trino.filesystem.hdfs;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.hdfs.DynamicHdfsConfiguration;
+import io.trino.hdfs.HdfsConfig;
+import io.trino.hdfs.HdfsConfigurationInitializer;
+import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
+import io.trino.hdfs.authentication.NoHdfsAuthentication;
+import io.trino.spi.security.ConnectorIdentity;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+import static com.google.common.io.MoreFiles.deleteRecursively;
+import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
+import static java.nio.file.Files.createDirectory;
+import static java.nio.file.Files.createFile;
+import static java.nio.file.Files.createTempDirectory;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestHdfsFileSystemListing
+{
+    @Test
+    public void testListing()
+            throws IOException
+    {
+        HdfsConfig hdfsConfig = new HdfsConfig();
+        DynamicHdfsConfiguration hdfsConfiguration = new DynamicHdfsConfiguration(new HdfsConfigurationInitializer(hdfsConfig), ImmutableSet.of());
+        HdfsEnvironment hdfsEnvironment = new HdfsEnvironment(hdfsConfiguration, hdfsConfig, new NoHdfsAuthentication());
+        TrinoHdfsFileSystemStats fileSystemStats = new TrinoHdfsFileSystemStats();
+
+        TrinoFileSystemFactory factory = new HdfsFileSystemFactory(hdfsEnvironment, fileSystemStats);
+        TrinoFileSystem fileSystem = factory.create(ConnectorIdentity.ofUser("test"));
+
+        Path tempDir = createTempDirectory("testListing");
+
+        String root = tempDir.toUri().toString();
+        assertThat(root).endsWith("/");
+        root = root.substring(0, root.length() - 1);
+
+        assertThat(listFiles(fileSystem, root)).isEmpty();
+
+        createFile(tempDir.resolve("abc"));
+        createFile(tempDir.resolve("xyz"));
+        createFile(tempDir.resolve("e f"));
+        createDirectory(tempDir.resolve("mydir"));
+
+        assertThat(listFiles(fileSystem, root)).containsExactlyInAnyOrder(
+                root + "/abc",
+                root + "/e f",
+                root + "/xyz");
+
+        for (String path : List.of("/abc", "/abc/", "/abc//", "///abc")) {
+            String directory = root + path;
+            assertThatThrownBy(() -> listFiles(fileSystem, directory))
+                    .isInstanceOf(IOException.class)
+                    .hasMessage("Listing location is a file, not a directory: %s", directory);
+        }
+
+        String rootPath = tempDir.toAbsolutePath().toString();
+        assertThat(listFiles(fileSystem, rootPath)).containsExactlyInAnyOrder(
+                rootPath + "/abc",
+                rootPath + "/e f",
+                rootPath + "/xyz");
+
+        createFile(tempDir.resolve("mydir").resolve("qqq"));
+
+        assertThat(listFiles(fileSystem, root)).containsExactlyInAnyOrder(
+                root + "/abc",
+                root + "/e f",
+                root + "/xyz",
+                root + "/mydir/qqq");
+
+        assertThat(listFiles(fileSystem, root + "/mydir")).containsExactly(root + "/mydir/qqq");
+        assertThat(listFiles(fileSystem, root + "/mydir/")).containsExactly(root + "/mydir/qqq");
+        assertThat(listFiles(fileSystem, root + "/mydir//")).containsExactly(root + "/mydir//qqq");
+        assertThat(listFiles(fileSystem, root + "///mydir")).containsExactly(root + "///mydir/qqq");
+
+        deleteRecursively(tempDir, ALLOW_INSECURE);
+    }
+
+    private static List<String> listFiles(TrinoFileSystem fileSystem, String path)
+            throws IOException
+    {
+        FileIterator iterator = fileSystem.listFiles(Location.of(path));
+        ImmutableList.Builder<String> files = ImmutableList.builder();
+        while (iterator.hasNext()) {
+            files.add(iterator.next().location().toString());
+        }
+        return files.build();
+    }
+}
diff --git a/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemLocal.java b/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemLocal.java
new file mode 100644
index 000000000000..2b156375f319
--- /dev/null
+++ b/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemLocal.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed 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 io.trino.filesystem.hdfs;
+
+import io.trino.filesystem.AbstractTestTrinoFileSystem;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.hdfs.DynamicConfigurationProvider;
+import io.trino.hdfs.DynamicHdfsConfiguration;
+import io.trino.hdfs.HdfsConfig;
+import io.trino.hdfs.HdfsConfiguration;
+import io.trino.hdfs.HdfsConfigurationInitializer;
+import io.trino.hdfs.HdfsContext;
+import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
+import io.trino.hdfs.authentication.NoHdfsAuthentication;
+import io.trino.spi.security.ConnectorIdentity;
+import org.apache.hadoop.fs.RawLocalFileSystem;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import static java.util.Comparator.reverseOrder;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestHdfsFileSystemLocal
+        extends AbstractTestTrinoFileSystem
+{
+    private TrinoFileSystem fileSystem;
+    private Path tempDirectory;
+
+    @BeforeAll
+    void beforeAll()
+            throws IOException
+    {
+        RawLocalFileSystem.useStatIfAvailable();
+        DynamicConfigurationProvider viewFs = (config, context, uri) ->
+                config.set("fs.viewfs.mounttable.abc.linkFallback", tempDirectory.toAbsolutePath().toUri().toString());
+
+        HdfsConfig hdfsConfig = new HdfsConfig();
+        HdfsConfiguration hdfsConfiguration = new DynamicHdfsConfiguration(new HdfsConfigurationInitializer(hdfsConfig), Set.of(viewFs));
+        HdfsEnvironment hdfsEnvironment = new HdfsEnvironment(hdfsConfiguration, hdfsConfig, new NoHdfsAuthentication());
+        HdfsContext hdfsContext = new HdfsContext(ConnectorIdentity.ofUser("test"));
+        TrinoHdfsFileSystemStats stats = new TrinoHdfsFileSystemStats();
+
+        tempDirectory = Files.createTempDirectory("test");
+        fileSystem = new HdfsFileSystem(hdfsEnvironment, hdfsContext, stats);
+    }
+
+    @AfterEach
+    void afterEach()
+            throws IOException
+    {
+        cleanupFiles();
+    }
+
+    @AfterAll
+    void afterAll()
+            throws IOException
+    {
+        Files.delete(tempDirectory);
+    }
+
+    private void cleanupFiles()
+            throws IOException
+    {
+        // tests will leave directories
+        try (Stream<Path> walk = Files.walk(tempDirectory)) {
+            Iterator<Path> iterator = walk.sorted(reverseOrder()).iterator();
+            while (iterator.hasNext()) {
+                Path path = iterator.next();
+                if (!path.equals(tempDirectory)) {
+                    Files.delete(path);
+                }
+            }
+        }
+    }
+
+    @Override
+    protected boolean isHierarchical()
+    {
+        return true;
+    }
+
+    @Override
+    protected TrinoFileSystem getFileSystem()
+    {
+        return fileSystem;
+    }
+
+    @Override
+    protected Location getRootLocation()
+    {
+        return Location.of("viewfs://abc/");
+    }
+
+    @Override
+    protected void verifyFileSystemIsEmpty()
+    {
+        try (Stream<Path> entries = Files.list(tempDirectory)) {
+            assertThat(entries.toList()).isEmpty();
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @Disabled("ViewFs allows traversal outside root")
+    @Test
+    @Override
+    public void testPaths() {}
+}
diff --git a/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemS3Mock.java b/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemS3Mock.java
new file mode 100644
index 000000000000..45f3d49f372e
--- /dev/null
+++ b/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemS3Mock.java
@@ -0,0 +1,147 @@
+/*
+ * Licensed 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 io.trino.filesystem.hdfs;
+
+import com.adobe.testing.s3mock.testcontainers.S3MockContainer;
+import io.airlift.units.DataSize;
+import io.trino.filesystem.AbstractTestTrinoFileSystem;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.hdfs.ConfigurationInitializer;
+import io.trino.hdfs.DynamicHdfsConfiguration;
+import io.trino.hdfs.HdfsConfig;
+import io.trino.hdfs.HdfsConfiguration;
+import io.trino.hdfs.HdfsConfigurationInitializer;
+import io.trino.hdfs.HdfsContext;
+import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
+import io.trino.hdfs.authentication.NoHdfsAuthentication;
+import io.trino.hdfs.s3.HiveS3Config;
+import io.trino.hdfs.s3.TrinoS3ConfigurationInitializer;
+import io.trino.spi.security.ConnectorIdentity;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.Set;
+
+import static java.util.Collections.emptySet;
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Testcontainers
+public class TestHdfsFileSystemS3Mock
+        extends AbstractTestTrinoFileSystem
+{
+    private static final String BUCKET = "test-bucket";
+
+    @Container
+    private static final S3MockContainer S3_MOCK = new S3MockContainer("3.0.1")
+            .withInitialBuckets(BUCKET);
+
+    private HdfsEnvironment hdfsEnvironment;
+    private HdfsContext hdfsContext;
+    private TrinoFileSystem fileSystem;
+
+    @BeforeAll
+    void beforeAll()
+    {
+        HiveS3Config s3Config = new HiveS3Config()
+                .setS3AwsAccessKey("accesskey")
+                .setS3AwsSecretKey("secretkey")
+                .setS3Endpoint(S3_MOCK.getHttpEndpoint())
+                .setS3PathStyleAccess(true)
+                .setS3StreamingPartSize(DataSize.valueOf("5.5MB"));
+
+        HdfsConfig hdfsConfig = new HdfsConfig();
+        ConfigurationInitializer s3Initializer = new TrinoS3ConfigurationInitializer(s3Config);
+        HdfsConfigurationInitializer initializer = new HdfsConfigurationInitializer(hdfsConfig, Set.of(s3Initializer));
+        HdfsConfiguration hdfsConfiguration = new DynamicHdfsConfiguration(initializer, emptySet());
+        hdfsEnvironment = new HdfsEnvironment(hdfsConfiguration, hdfsConfig, new NoHdfsAuthentication());
+        hdfsContext = new HdfsContext(ConnectorIdentity.ofUser("test"));
+
+        fileSystem = new HdfsFileSystem(hdfsEnvironment, hdfsContext, new TrinoHdfsFileSystemStats());
+    }
+
+    @AfterEach
+    void afterEach()
+            throws IOException
+    {
+        Path root = new Path(getRootLocation().toString());
+        FileSystem fs = hdfsEnvironment.getFileSystem(hdfsContext, root);
+        for (FileStatus status : fs.listStatus(root)) {
+            fs.delete(status.getPath(), true);
+        }
+    }
+
+    @Override
+    protected final boolean isHierarchical()
+    {
+        return false;
+    }
+
+    @Override
+    protected TrinoFileSystem getFileSystem()
+    {
+        return fileSystem;
+    }
+
+    @Override
+    protected Location getRootLocation()
+    {
+        return Location.of("s3://%s/".formatted(BUCKET));
+    }
+
+    @Override
+    protected final boolean supportsCreateExclusive()
+    {
+        return false;
+    }
+
+    @Override
+    protected final boolean deleteFileFailsIfNotExists()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean normalizesListFilesResult()
+    {
+        return true;
+    }
+
+    @Override
+    protected boolean seekPastEndOfFileFails()
+    {
+        return false;
+    }
+
+    @Override
+    protected void verifyFileSystemIsEmpty()
+    {
+        try {
+            Path root = new Path(getRootLocation().toString());
+            FileSystem fs = hdfsEnvironment.getFileSystem(hdfsContext, root);
+            assertThat(fs.listStatus(root)).isEmpty();
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+}
diff --git a/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestFSDataInputStreamTail.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestFSDataInputStreamTail.java
index fa1fbd14b596..02077cea6be5 100644
--- a/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestFSDataInputStreamTail.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestFSDataInputStreamTail.java
@@ -33,10 +33,10 @@
 
 import static io.airlift.testing.Closeables.closeAll;
 import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
 
 @Test(singleThreaded = true) // e.g. test methods operate on shared, mutated tempFile
 public class TestFSDataInputStreamTail
@@ -148,7 +148,7 @@ public void testReadTailPartial()
         }
     }
 
-    @Test(expectedExceptions = IOException.class, expectedExceptionsMessageRegExp = "Incorrect file size \\(.*\\) for file \\(end of stream not reached\\): file:.*")
+    @Test
     public void testReadTailNoEndOfFileFound()
             throws Exception
     {
@@ -160,12 +160,13 @@ public void testReadTailNoEndOfFileFound()
         assertEquals(fs.getFileLinkStatus(tempFile).getLen(), contents.length);
 
         try (FSDataInputStream is = fs.open(tempFile)) {
-            FSDataInputStreamTail.readTail(tempFile.toString(), 128, is, 16);
-            fail("Expected failure to find end of stream");
+            assertThatThrownBy(() -> FSDataInputStreamTail.readTail(tempFile.toString(), 128, is, 16))
+                    .isInstanceOf(IOException.class)
+                    .hasMessage("Incorrect file size (128) for file (end of stream not reached): " + tempFile);
         }
     }
 
-    @Test(expectedExceptions = IOException.class, expectedExceptionsMessageRegExp = "Incorrect file size \\(.*\\) for file \\(end of stream not reached\\): file:.*")
+    @Test
     public void testReadTailForFileSizeNoEndOfFileFound()
             throws Exception
     {
@@ -177,8 +178,9 @@ public void testReadTailForFileSizeNoEndOfFileFound()
         assertEquals(fs.getFileLinkStatus(tempFile).getLen(), contents.length);
 
         try (FSDataInputStream is = fs.open(tempFile)) {
-            FSDataInputStreamTail.readTailForFileSize(tempFile.toString(), 128, is);
-            fail("Expected failure to find end of stream");
+            assertThatThrownBy(() -> FSDataInputStreamTail.readTailForFileSize(tempFile.toString(), 128, is))
+                    .isInstanceOf(IOException.class)
+                    .hasMessage("Incorrect file size (128) for file (end of stream not reached): " + tempFile);
         }
     }
 
diff --git a/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestFileSystemCache.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestFileSystemCache.java
index d86612a948bc..3e7c34a90e70 100644
--- a/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestFileSystemCache.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestFileSystemCache.java
@@ -80,7 +80,8 @@ public void testFileSystemCache()
     }
 
     @Test
-    public void testFileSystemCacheException() throws IOException
+    public void testFileSystemCacheException()
+            throws IOException
     {
         HdfsEnvironment environment = new HdfsEnvironment(
                 new DynamicHdfsConfiguration(new HdfsConfigurationInitializer(new HdfsConfig()), ImmutableSet.of()),
@@ -99,7 +100,8 @@ public void testFileSystemCacheException() throws IOException
     }
 
     @Test
-    public void testFileSystemCacheConcurrency() throws InterruptedException, ExecutionException, IOException
+    public void testFileSystemCacheConcurrency()
+            throws InterruptedException, ExecutionException, IOException
     {
         int numThreads = 20;
         List<Callable<Void>> callableTasks = new ArrayList<>();
@@ -128,7 +130,8 @@ private static FileSystem getFileSystem(HdfsEnvironment environment, ConnectorId
     @FunctionalInterface
     public interface FileSystemConsumer
     {
-        void consume(FileSystem fileSystem) throws IOException;
+        void consume(FileSystem fileSystem)
+                throws IOException;
     }
 
     private static class FileSystemCloser
@@ -136,7 +139,8 @@ private static class FileSystemCloser
     {
         @Override
         @SuppressModernizer
-        public void consume(FileSystem fileSystem) throws IOException
+        public void consume(FileSystem fileSystem)
+                throws IOException
         {
             fileSystem.close();  /* triggers fscache.remove() */
         }
@@ -164,7 +168,8 @@ public static class CreateFileSystemsAndConsume
         }
 
         @Override
-        public Void call() throws IOException
+        public Void call()
+                throws IOException
         {
             for (int i = 0; i < getCallsPerInvocation; i++) {
                 FileSystem fs = getFileSystem(environment, ConnectorIdentity.ofUser("user" + random.nextInt(userCount)));
diff --git a/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestHdfsConfig.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestHdfsConfig.java
index 1c599bcbb6b3..b341c7a503c9 100644
--- a/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestHdfsConfig.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestHdfsConfig.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.HostAndPort;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestTrinoFileSystemCacheStats.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestTrinoFileSystemCacheStats.java
index cc9adbc7d80a..58efe717aa8c 100644
--- a/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestTrinoFileSystemCacheStats.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/TestTrinoFileSystemCacheStats.java
@@ -15,7 +15,7 @@
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 
diff --git a/lib/trino-hdfs/src/test/java/io/trino/hdfs/authentication/TestHdfsAuthenticationConfig.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/authentication/TestHdfsAuthenticationConfig.java
index 1a4589727af1..e4af8ebf5585 100644
--- a/lib/trino-hdfs/src/test/java/io/trino/hdfs/authentication/TestHdfsAuthenticationConfig.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/authentication/TestHdfsAuthenticationConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.hdfs.authentication.HdfsAuthenticationConfig.HdfsAuthenticationType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/lib/trino-hdfs/src/test/java/io/trino/hdfs/authentication/TestHdfsKerberosConfig.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/authentication/TestHdfsKerberosConfig.java
index 18648d8939e6..6e5167719481 100644
--- a/lib/trino-hdfs/src/test/java/io/trino/hdfs/authentication/TestHdfsKerberosConfig.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/authentication/TestHdfsKerberosConfig.java
@@ -15,9 +15,8 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.configuration.ConfigurationFactory;
-import org.testng.annotations.Test;
-
-import javax.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.AssertTrue;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/azure/TestHiveAzureConfig.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/azure/TestHiveAzureConfig.java
similarity index 97%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/azure/TestHiveAzureConfig.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/azure/TestHiveAzureConfig.java
index 6c0d9b9ea7bb..1af1c01c0759 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/azure/TestHiveAzureConfig.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/azure/TestHiveAzureConfig.java
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.azure;
+package io.trino.hdfs.azure;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.HostAndPort;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/azure/TestTrinoAzureConfigurationInitializer.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/azure/TestTrinoAzureConfigurationInitializer.java
similarity index 98%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/azure/TestTrinoAzureConfigurationInitializer.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/azure/TestTrinoAzureConfigurationInitializer.java
index 164c497f77e1..b6a249bef765 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/azure/TestTrinoAzureConfigurationInitializer.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/azure/TestTrinoAzureConfigurationInitializer.java
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.azure;
+package io.trino.hdfs.azure;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Set;
 import java.util.function.BiConsumer;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/cos/TestHiveCosServiceConfig.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/cos/TestHiveCosServiceConfig.java
similarity index 95%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/cos/TestHiveCosServiceConfig.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/cos/TestHiveCosServiceConfig.java
index baff9d1198d0..697dedafd054 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/cos/TestHiveCosServiceConfig.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/cos/TestHiveCosServiceConfig.java
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.cos;
+package io.trino.hdfs.cos;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Path;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/cos/TestHiveCosServiceConfigurationProvider.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/cos/TestHiveCosServiceConfigurationProvider.java
similarity index 94%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/cos/TestHiveCosServiceConfigurationProvider.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/cos/TestHiveCosServiceConfigurationProvider.java
index 0a444791510d..357c646f055a 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/cos/TestHiveCosServiceConfigurationProvider.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/cos/TestHiveCosServiceConfigurationProvider.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.cos;
+package io.trino.hdfs.cos;
 
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
@@ -23,11 +23,11 @@
 import io.trino.hdfs.HdfsConfiguration;
 import io.trino.hdfs.HdfsConfigurationInitializer;
 import io.trino.hdfs.HdfsContext;
-import io.trino.plugin.hive.s3.HiveS3Config;
-import io.trino.plugin.hive.s3.TrinoS3ConfigurationInitializer;
+import io.trino.hdfs.s3.HiveS3Config;
+import io.trino.hdfs.s3.TrinoS3ConfigurationInitializer;
 import io.trino.spi.security.ConnectorIdentity;
 import org.apache.hadoop.conf.Configuration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -35,7 +35,7 @@
 import java.util.Properties;
 
 import static io.airlift.testing.Assertions.assertInstanceOf;
-import static io.trino.plugin.hive.s3.TestTrinoS3FileSystem.getAwsCredentialsProvider;
+import static io.trino.hdfs.s3.TestTrinoS3FileSystem.getAwsCredentialsProvider;
 import static org.testng.Assert.assertEquals;
 
 public class TestHiveCosServiceConfigurationProvider
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/cos/TestServiceConfig.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/cos/TestServiceConfig.java
similarity index 98%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/cos/TestServiceConfig.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/cos/TestServiceConfig.java
index bcd9f4751951..babccca8dd66 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/cos/TestServiceConfig.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/cos/TestServiceConfig.java
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.cos;
+package io.trino.hdfs.cos;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.testing.TempFile;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/lib/trino-hdfs/src/test/java/io/trino/hdfs/gcs/TestHiveGcsConfig.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/gcs/TestHiveGcsConfig.java
new file mode 100644
index 000000000000..305e529189b3
--- /dev/null
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/gcs/TestHiveGcsConfig.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed 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 io.trino.hdfs.gcs;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestHiveGcsConfig
+{
+    @Test
+    public void testDefaults()
+    {
+        assertRecordedDefaults(recordDefaults(HiveGcsConfig.class)
+                .setUseGcsAccessToken(false)
+                .setJsonKey(null)
+                .setJsonKeyFilePath(null));
+    }
+
+    @Test
+    public void testExplicitPropertyMappings()
+            throws IOException
+    {
+        Path jsonKeyFile = Files.createTempFile(null, null);
+
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("hive.gcs.use-access-token", "true")
+                .put("hive.gcs.json-key", "{}")
+                .put("hive.gcs.json-key-file-path", jsonKeyFile.toString())
+                .buildOrThrow();
+
+        HiveGcsConfig expected = new HiveGcsConfig()
+                .setUseGcsAccessToken(true)
+                .setJsonKey("{}")
+                .setJsonKeyFilePath(jsonKeyFile.toString());
+
+        assertFullMapping(properties, expected);
+    }
+
+    @Test
+    public void testValidation()
+    {
+        assertThatThrownBy(
+                new HiveGcsConfig()
+                        .setUseGcsAccessToken(true)
+                        .setJsonKey("{}}")::validate)
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Cannot specify 'hive.gcs.json-key' when 'hive.gcs.use-access-token' is set");
+
+        assertThatThrownBy(
+                new HiveGcsConfig()
+                        .setUseGcsAccessToken(true)
+                        .setJsonKeyFilePath("/dev/null")::validate)
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Cannot specify 'hive.gcs.json-key-file-path' when 'hive.gcs.use-access-token' is set");
+
+        assertThatThrownBy(
+                new HiveGcsConfig()
+                        .setJsonKey("{}")
+                        .setJsonKeyFilePath("/dev/null")::validate)
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("'hive.gcs.json-key' and 'hive.gcs.json-key-file-path' cannot be both set");
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/rubix/CachingLocalFileSystem.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/rubix/CachingLocalFileSystem.java
similarity index 96%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/rubix/CachingLocalFileSystem.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/rubix/CachingLocalFileSystem.java
index 5fd18fea2846..9f0e34f25fe8 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/rubix/CachingLocalFileSystem.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/rubix/CachingLocalFileSystem.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
 import com.qubole.rubix.core.CachingFileSystem;
 import com.qubole.rubix.spi.ClusterType;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/rubix/TestRubixCaching.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/rubix/TestRubixCaching.java
similarity index 87%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/rubix/TestRubixCaching.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/rubix/TestRubixCaching.java
index d7fedd63d953..b6aff0df6f9a 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/rubix/TestRubixCaching.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/rubix/TestRubixCaching.java
@@ -11,11 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.io.ByteProcessor;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Closer;
 import com.qubole.rubix.core.CachingFileSystem;
@@ -24,6 +25,7 @@
 import com.qubole.rubix.prestosql.CachingPrestoDistributedFileSystem;
 import com.qubole.rubix.prestosql.CachingPrestoGoogleHadoopFileSystem;
 import com.qubole.rubix.prestosql.CachingPrestoSecureAzureBlobFileSystem;
+import dev.failsafe.Failsafe;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.hdfs.DynamicHdfsConfiguration;
@@ -33,15 +35,11 @@
 import io.trino.hdfs.HdfsEnvironment;
 import io.trino.hdfs.authentication.HdfsAuthenticationConfig;
 import io.trino.hdfs.authentication.NoHdfsAuthentication;
+import io.trino.hdfs.rubix.RubixConfig.ReadMode;
+import io.trino.hdfs.rubix.RubixModule.DefaultRubixHdfsInitializer;
 import io.trino.metadata.InternalNode;
 import io.trino.plugin.base.CatalogName;
-import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.orc.OrcReaderConfig;
-import io.trino.plugin.hive.rubix.RubixConfig.ReadMode;
-import io.trino.plugin.hive.rubix.RubixModule.DefaultRubixHdfsInitializer;
 import io.trino.spi.Node;
-import io.trino.spi.session.PropertyMetadata;
-import io.trino.testing.TestingConnectorSession;
 import io.trino.testing.TestingNodeManager;
 import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.FSDataInputStream;
@@ -76,14 +74,14 @@
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static com.qubole.rubix.spi.CacheConfig.setRemoteFetchProcessInterval;
 import static io.airlift.testing.Assertions.assertGreaterThan;
-import static io.airlift.testing.Assertions.assertInstanceOf;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.client.NodeVersion.UNKNOWN;
-import static io.trino.plugin.hive.HiveTestUtils.getHiveSessionProperties;
-import static io.trino.plugin.hive.rubix.RubixConfig.ReadMode.ASYNC;
-import static io.trino.plugin.hive.rubix.RubixConfig.ReadMode.READ_THROUGH;
-import static io.trino.plugin.hive.util.RetryDriver.retry;
+import static io.trino.hdfs.rubix.RubixConfig.ReadMode.ASYNC;
+import static io.trino.hdfs.rubix.RubixConfig.ReadMode.READ_THROUGH;
+import static io.trino.hdfs.s3.RetryDriver.retry;
+import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.assertions.Assert.assertEventually;
+import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.net.InetAddress.getLocalHost;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -92,9 +90,9 @@
 import static java.util.Collections.nCopies;
 import static java.util.concurrent.Executors.newFixedThreadPool;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
 
 @Test(singleThreaded = true)
 public class TestRubixCaching
@@ -120,14 +118,7 @@ public void setup()
 
         cacheStoragePath = getStoragePath("/");
         config = new HdfsConfig();
-        List<PropertyMetadata<?>> hiveSessionProperties = getHiveSessionProperties(
-                new HiveConfig(),
-                new OrcReaderConfig()).getSessionProperties();
-        context = new HdfsContext(
-                TestingConnectorSession.builder()
-                        .setPropertyMetadata(hiveSessionProperties)
-                        .build());
-
+        context = new HdfsContext(SESSION);
         nonCachingFileSystem = getNonCachingFileSystem();
     }
 
@@ -158,7 +149,7 @@ private void initializeCachingFileSystem(RubixConfig rubixConfig)
     private void initializeRubix(RubixConfig rubixConfig)
             throws Exception
     {
-        InternalNode coordinatorNode = new InternalNode(
+        Node coordinatorNode = new InternalNode(
                 "master",
                 URI.create("http://" + getLocalHost().getHostAddress() + ":8080"),
                 UNKNOWN,
@@ -297,13 +288,13 @@ public void testCoordinatorNotJoining()
         RubixConfig rubixConfig = new RubixConfig()
                 .setCacheLocation("/tmp/not/existing/dir");
         HdfsConfigurationInitializer configurationInitializer = new HdfsConfigurationInitializer(config, ImmutableSet.of());
-        InternalNode workerNode = new InternalNode(
+        Node workerNode = new InternalNode(
                 "worker",
                 URI.create("http://127.0.0.2:8080"),
                 UNKNOWN,
                 false);
         RubixInitializer rubixInitializer = new RubixInitializer(
-                retry().maxAttempts(1),
+                Failsafe.none(),
                 rubixConfig.setStartServerOnCoordinator(true),
                 new TestingNodeManager(ImmutableList.of(workerNode)),
                 new CatalogName("catalog"),
@@ -318,17 +309,17 @@ public void testGetBlockLocations()
             throws Exception
     {
         RubixConfig rubixConfig = new RubixConfig();
-        InternalNode coordinatorNode = new InternalNode(
+        Node coordinatorNode = new InternalNode(
                 "master",
                 URI.create("http://" + getLocalHost().getHostAddress() + ":8080"),
                 UNKNOWN,
                 true);
-        InternalNode workerNode1 = new InternalNode(
+        Node workerNode1 = new InternalNode(
                 "worker1",
                 URI.create("http://127.0.0.2:8080"),
                 UNKNOWN,
                 false);
-        InternalNode workerNode2 = new InternalNode(
+        Node workerNode2 = new InternalNode(
                 "worker2",
                 URI.create("http://127.0.0.3:8080"),
                 UNKNOWN,
@@ -355,7 +346,7 @@ public void testCacheRead(ReadMode readMode)
     {
         RubixConfig rubixConfig = new RubixConfig().setReadMode(readMode);
         initializeCachingFileSystem(rubixConfig);
-        byte[] randomData = new byte[(int) SMALL_FILE_SIZE.toBytes()];
+        byte[] randomData = new byte[toIntExact(SMALL_FILE_SIZE.toBytes())];
         new Random().nextBytes(randomData);
 
         Path file = getStoragePath("some_file");
@@ -365,13 +356,13 @@ public void testCacheRead(ReadMode readMode)
         long beforeCachedReadsCount = getCachedReadsCount();
         long beforeAsyncDownloadedMb = getAsyncDownloadedMb(readMode);
 
-        assertEquals(readFile(cachingFileSystem, file), randomData);
+        assertFileContents(cachingFileSystem, file, randomData);
 
         if (readMode == ASYNC) {
             // wait for async Rubix requests to complete
             assertEventually(
                     new Duration(10, SECONDS),
-                    () -> assertEquals(getAsyncDownloadedMb(readMode), beforeAsyncDownloadedMb + 1));
+                    () -> assertEquals(getAsyncDownloadedMb(ASYNC), beforeAsyncDownloadedMb + 1));
         }
 
         // stats are propagated asynchronously
@@ -388,7 +379,7 @@ public void testCacheRead(ReadMode readMode)
                 new Duration(10, SECONDS),
                 () -> {
                     long remoteReadsCount = getRemoteReadsCount();
-                    assertEquals(readFile(cachingFileSystem, file), randomData);
+                    assertFileContents(cachingFileSystem, file, randomData);
                     assertGreaterThan(getCachedReadsCount(), beforeCachedReadsCount);
                     assertEquals(getRemoteReadsCount(), remoteReadsCount);
                 });
@@ -403,7 +394,7 @@ public void testCacheWrite(ReadMode readMode)
 
         byte[] data = "Hello world".getBytes(UTF_8);
         writeFile(cachingFileSystem.create(file), data);
-        assertEquals(readFile(nonCachingFileSystem, file), data);
+        assertFileContents(cachingFileSystem, file, data);
     }
 
     @Test(dataProvider = "readMode")
@@ -411,7 +402,7 @@ public void testLargeFile(ReadMode readMode)
             throws Exception
     {
         initializeCachingFileSystem(new RubixConfig().setReadMode(readMode));
-        byte[] randomData = new byte[(int) LARGE_FILE_SIZE.toBytes()];
+        byte[] randomData = new byte[toIntExact(LARGE_FILE_SIZE.toBytes())];
         new Random().nextBytes(randomData);
 
         Path file = getStoragePath("large_file");
@@ -421,13 +412,13 @@ public void testLargeFile(ReadMode readMode)
         long beforeCachedReadsCount = getCachedReadsCount();
         long beforeAsyncDownloadedMb = getAsyncDownloadedMb(readMode);
 
-        assertTrue(Arrays.equals(randomData, readFile(cachingFileSystem, file)));
+        assertFileContents(cachingFileSystem, file, randomData);
 
         if (readMode == ASYNC) {
             // wait for async Rubix requests to complete
             assertEventually(
                     new Duration(10, SECONDS),
-                    () -> assertEquals(getAsyncDownloadedMb(readMode), beforeAsyncDownloadedMb + 100));
+                    () -> assertEquals(getAsyncDownloadedMb(ASYNC), beforeAsyncDownloadedMb + 100));
         }
 
         // stats are propagated asynchronously
@@ -443,7 +434,7 @@ public void testLargeFile(ReadMode readMode)
                 new Duration(10, SECONDS),
                 () -> {
                     long remoteReadsCount = getRemoteReadsCount();
-                    assertTrue(Arrays.equals(randomData, readFile(cachingFileSystem, file)));
+                    assertFileContents(cachingFileSystem, file, randomData);
                     assertGreaterThan(getCachedReadsCount(), beforeCachedReadsCount);
                     assertEquals(getRemoteReadsCount(), remoteReadsCount);
                 });
@@ -456,7 +447,7 @@ public void testLargeFile(ReadMode readMode)
             List<Callable<?>> reads = nCopies(
                     3,
                     () -> {
-                        assertTrue(Arrays.equals(randomData, readFile(cachingFileSystem, file)));
+                        assertFileContents(cachingFileSystem, file, randomData);
                         return null;
                     });
             List<Future<?>> futures = reads.stream()
@@ -524,32 +515,51 @@ public void testFileSystemBindings()
         }
     }
 
-    private void assertRawFileSystemInstanceOf(FileSystem actual, Class<? extends FileSystem> expectedType)
+    private static void assertRawFileSystemInstanceOf(FileSystem actual, Class<? extends FileSystem> expectedType)
     {
-        assertInstanceOf(actual, FilterFileSystem.class);
-        FileSystem rawFileSystem = ((FilterFileSystem) actual).getRawFileSystem();
-        assertInstanceOf(rawFileSystem, expectedType);
+        assertThat(actual).isInstanceOfSatisfying(FilterFileSystem.class, filterFileSystem ->
+                assertThat(filterFileSystem.getRawFileSystem()).isInstanceOf(expectedType));
     }
 
-    private byte[] readFile(FileSystem fileSystem, Path path)
+    private static void assertFileContents(FileSystem fileSystem, Path path, byte[] expected)
     {
         try (FSDataInputStream inputStream = fileSystem.open(path)) {
-            return ByteStreams.toByteArray(inputStream);
+            ByteStreams.readBytes(inputStream, new ByteProcessor<>()
+            {
+                int readOffset;
+
+                @Override
+                public boolean processBytes(byte[] buf, int off, int len)
+                {
+                    if (readOffset + len > expected.length) {
+                        throw new AssertionError("read too much");
+                    }
+                    if (!Arrays.equals(buf, off, off + len, expected, readOffset, readOffset + len)) {
+                        throw new AssertionError("read different than expected");
+                    }
+                    readOffset += len;
+                    return true; // continue
+                }
+
+                @Override
+                public Void getResult()
+                {
+                    assertEquals(readOffset, expected.length, "Read different amount of data");
+                    return null;
+                }
+            });
         }
         catch (IOException exception) {
             throw new RuntimeException(exception);
         }
     }
 
-    private void writeFile(FSDataOutputStream outputStream, byte[] content)
+    private static void writeFile(FSDataOutputStream outputStream, byte[] content)
             throws IOException
     {
-        try {
+        try (outputStream) {
             outputStream.write(content);
         }
-        finally {
-            outputStream.close();
-        }
     }
 
     private Path getStoragePath(String path)
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/rubix/TestRubixConfig.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/rubix/TestRubixConfig.java
similarity index 94%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/rubix/TestRubixConfig.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/rubix/TestRubixConfig.java
index 7e2be5bcf773..36282d60e11d 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/rubix/TestRubixConfig.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/rubix/TestRubixConfig.java
@@ -11,16 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
 import com.google.common.collect.ImmutableMap;
 import com.qubole.rubix.spi.CacheConfig;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -100,7 +99,7 @@ public void testValidation()
                 new RubixConfig()
                         .setCacheTtl(null),
                 "cacheTtl",
-                "may not be null",
+                "must not be null",
                 NotNull.class);
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/rubix/TestRubixEnabledConfig.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/rubix/TestRubixEnabledConfig.java
similarity index 95%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/rubix/TestRubixEnabledConfig.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/rubix/TestRubixEnabledConfig.java
index 1ceae56f73fb..2d4bf4d95d7f 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/rubix/TestRubixEnabledConfig.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/rubix/TestRubixEnabledConfig.java
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.rubix;
+package io.trino.hdfs.rubix;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/MockAmazonS3.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/MockAmazonS3.java
similarity index 99%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/MockAmazonS3.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/MockAmazonS3.java
index b5390854ade0..0f68f3ba9659 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/MockAmazonS3.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/MockAmazonS3.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.amazonaws.SdkClientException;
 import com.amazonaws.services.s3.AbstractAmazonS3;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestHiveS3Config.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestHiveS3Config.java
similarity index 99%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestHiveS3Config.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestHiveS3Config.java
index c3d727241918..d1515c510a98 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestHiveS3Config.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestHiveS3Config.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.google.common.base.StandardSystemProperty;
 import com.google.common.collect.ImmutableList;
@@ -19,7 +19,7 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.DataSize.Unit;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestHiveS3TypeConfig.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestHiveS3TypeConfig.java
similarity index 95%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestHiveS3TypeConfig.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestHiveS3TypeConfig.java
index 1c322e5fb3c0..9084b6562473 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestHiveS3TypeConfig.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestHiveS3TypeConfig.java
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3HadoopPaths.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3HadoopPaths.java
new file mode 100644
index 000000000000..7e0435cab4a9
--- /dev/null
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3HadoopPaths.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed 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 io.trino.hdfs.s3;
+
+import io.trino.filesystem.Location;
+import org.apache.hadoop.fs.Path;
+import org.junit.jupiter.api.Test;
+
+import java.net.URI;
+
+import static io.trino.filesystem.hdfs.HadoopPaths.hadoopPath;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestS3HadoopPaths
+{
+    @Test
+    public void testNonS3Path()
+    {
+        assertThat(hadoopPath(Location.of("gcs://test/abc//xyz")))
+                .isEqualTo(new Path("gcs://test/abc/xyz"));
+    }
+
+    @Test
+    public void testS3NormalPath()
+    {
+        assertThat(hadoopPath(Location.of("s3://test/abc/xyz.csv")))
+                .isEqualTo(new Path("s3://test/abc/xyz.csv"))
+                .extracting(TrinoS3FileSystem::keyFromPath)
+                .isEqualTo("abc/xyz.csv");
+    }
+
+    @Test
+    public void testS3NormalPathWithInvalidUriEscape()
+    {
+        assertThat(hadoopPath(Location.of("s3://test/abc%xyz")))
+                .isEqualTo(new Path("s3://test/abc%xyz"))
+                .extracting(TrinoS3FileSystem::keyFromPath)
+                .isEqualTo("abc%xyz");
+    }
+
+    @Test
+    public void testS3NonCanonicalPath()
+    {
+        assertThat(hadoopPath(Location.of("s3://test/abc//xyz.csv")))
+                .isEqualTo(new Path(URI.create("s3://test/abc/xyz.csv#abc//xyz.csv")))
+                .hasToString("s3://test/abc/xyz.csv#abc//xyz.csv")
+                .extracting(TrinoS3FileSystem::keyFromPath)
+                .isEqualTo("abc//xyz.csv");
+    }
+
+    @Test
+    public void testS3NonCanonicalPathWithInvalidUriEscape()
+    {
+        assertThat(hadoopPath(Location.of("s3://test/abc%xyz//test")))
+                .isEqualTo(new Path(URI.create("s3://test/abc%25xyz/test#abc%25xyz//test")))
+                .hasToString("s3://test/abc%xyz/test#abc%xyz//test")
+                .extracting(TrinoS3FileSystem::keyFromPath)
+                .isEqualTo("abc%xyz//test");
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestS3SecurityMapping.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3SecurityMapping.java
similarity index 94%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestS3SecurityMapping.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3SecurityMapping.java
index 41b70ecd97cb..bbcbb15c0fb6 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestS3SecurityMapping.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3SecurityMapping.java
@@ -11,39 +11,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.trino.hdfs.DynamicConfigurationProvider;
 import io.trino.hdfs.HdfsContext;
-import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.HiveSessionProperties;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.testing.TestingConnectorSession;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.Set;
 
 import static com.google.common.io.Resources.getResource;
 import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
-import static io.trino.plugin.hive.HiveTestUtils.getHiveSessionProperties;
-import static io.trino.plugin.hive.s3.TestS3SecurityMapping.MappingResult.clusterDefaultRole;
-import static io.trino.plugin.hive.s3.TestS3SecurityMapping.MappingResult.credentials;
-import static io.trino.plugin.hive.s3.TestS3SecurityMapping.MappingResult.role;
-import static io.trino.plugin.hive.s3.TestS3SecurityMapping.MappingSelector.empty;
-import static io.trino.plugin.hive.s3.TestS3SecurityMapping.MappingSelector.path;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ACCESS_KEY;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ENDPOINT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_IAM_ROLE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_KMS_KEY_ID;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ROLE_SESSION_NAME;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SECRET_KEY;
+import static io.trino.hdfs.s3.TestS3SecurityMapping.MappingResult.clusterDefaultRole;
+import static io.trino.hdfs.s3.TestS3SecurityMapping.MappingResult.credentials;
+import static io.trino.hdfs.s3.TestS3SecurityMapping.MappingResult.role;
+import static io.trino.hdfs.s3.TestS3SecurityMapping.MappingSelector.empty;
+import static io.trino.hdfs.s3.TestS3SecurityMapping.MappingSelector.path;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ACCESS_KEY;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ENDPOINT;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_IAM_ROLE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_KMS_KEY_ID;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ROLE_SESSION_NAME;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SECRET_KEY;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -52,8 +49,6 @@
 
 public class TestS3SecurityMapping
 {
-    private static final HiveSessionProperties HIVE_SESSION_PROPERTIES = getHiveSessionProperties(new HiveConfig());
-
     private static final String IAM_ROLE_CREDENTIAL_NAME = "IAM_ROLE_CREDENTIAL_NAME";
     private static final String KMS_KEY_ID_CREDENTIAL_NAME = "KMS_KEY_ID_CREDENTIAL_NAME";
     private static final String DEFAULT_PATH = "s3://default";
@@ -434,7 +429,6 @@ public HdfsContext getHdfsContext()
                             .withGroups(groups)
                             .withExtraCredentials(extraCredentials.buildOrThrow())
                             .build())
-                    .setPropertyMetadata(HIVE_SESSION_PROPERTIES.getSessionProperties())
                     .build();
             return new HdfsContext(connectorSession);
         }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestS3SecurityMappingConfig.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3SecurityMappingConfig.java
similarity index 98%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestS3SecurityMappingConfig.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3SecurityMappingConfig.java
index 26efd2bd556e..1634c8eb2a5e 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestS3SecurityMappingConfig.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3SecurityMappingConfig.java
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestS3SecurityMappingsParser.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3SecurityMappingsParser.java
similarity index 96%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestS3SecurityMappingsParser.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3SecurityMappingsParser.java
index 58da511eaddd..92b24b72cfe4 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestS3SecurityMappingsParser.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestS3SecurityMappingsParser.java
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import io.trino.spi.security.ConnectorIdentity;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.util.Optional;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestTrinoS3FileSystem.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestTrinoS3FileSystem.java
similarity index 93%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestTrinoS3FileSystem.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestTrinoS3FileSystem.java
index 93cc3594696f..dcba948b242f 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestTrinoS3FileSystem.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestTrinoS3FileSystem.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import com.amazonaws.AmazonWebServiceClient;
 import com.amazonaws.ClientConfiguration;
@@ -41,9 +41,9 @@
 import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
+import io.trino.hdfs.s3.TrinoS3FileSystem.UnrecoverableS3OperationException;
 import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.memory.context.MemoryReservationHandler;
-import io.trino.plugin.hive.s3.TrinoS3FileSystem.UnrecoverableS3OperationException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FSDataOutputStream;
@@ -51,8 +51,7 @@
 import org.apache.hadoop.fs.LocatedFileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.RemoteIterator;
-import org.testng.SkipException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import javax.crypto.spec.SecretKeySpec;
 
@@ -79,30 +78,30 @@
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.airlift.testing.Assertions.assertInstanceOf;
 import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.NO_SUCH_BUCKET_ERROR_CODE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.NO_SUCH_KEY_ERROR_CODE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ACCESS_KEY;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ACL_TYPE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_CREDENTIALS_PROVIDER;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ENCRYPTION_MATERIALS_PROVIDER;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_ENDPOINT;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_EXTERNAL_ID;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_IAM_ROLE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_KMS_KEY_ID;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_MAX_BACKOFF_TIME;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_MAX_CLIENT_RETRIES;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_MAX_RETRY_TIME;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_PATH_STYLE_ACCESS;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_PIN_CLIENT_TO_CURRENT_REGION;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_REGION;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SECRET_KEY;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SESSION_TOKEN;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_SKIP_GLACIER_OBJECTS;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_STAGING_DIRECTORY;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_STREAMING_UPLOAD_ENABLED;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_STREAMING_UPLOAD_PART_SIZE;
+import static io.trino.hdfs.s3.TrinoS3FileSystem.S3_USER_AGENT_PREFIX;
 import static io.trino.memory.context.AggregatedMemoryContext.newRootAggregatedMemoryContext;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.NO_SUCH_BUCKET_ERROR_CODE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.NO_SUCH_KEY_ERROR_CODE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ACCESS_KEY;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ACL_TYPE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_CREDENTIALS_PROVIDER;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ENCRYPTION_MATERIALS_PROVIDER;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ENDPOINT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_EXTERNAL_ID;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_IAM_ROLE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_KMS_KEY_ID;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MAX_BACKOFF_TIME;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MAX_CLIENT_RETRIES;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MAX_RETRY_TIME;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_PATH_STYLE_ACCESS;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_PIN_CLIENT_TO_CURRENT_REGION;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_REGION;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SECRET_KEY;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SESSION_TOKEN;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SKIP_GLACIER_OBJECTS;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_STAGING_DIRECTORY;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_STREAMING_UPLOAD_ENABLED;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_STREAMING_UPLOAD_PART_SIZE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_USER_AGENT_PREFIX;
 import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
 import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
@@ -111,6 +110,7 @@
 import static java.nio.file.Files.createTempFile;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.abort;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
@@ -168,7 +168,7 @@ private static AWSCredentials getStaticCredentials(Configuration config, TrinoS3
         return awsCredentialsProvider.getCredentials();
     }
 
-    @Test(expectedExceptions = VerifyException.class, expectedExceptionsMessageRegExp = "Invalid configuration: either endpoint can be set or S3 client can be pinned to the current region")
+    @Test
     public void testEndpointWithPinToCurrentRegionConfiguration()
             throws Exception
     {
@@ -176,7 +176,9 @@ public void testEndpointWithPinToCurrentRegionConfiguration()
         config.set(S3_ENDPOINT, "test.example.endpoint.com");
         config.set(S3_PIN_CLIENT_TO_CURRENT_REGION, "true");
         try (TrinoS3FileSystem fs = new TrinoS3FileSystem()) {
-            fs.initialize(new URI("s3a://test-bucket/"), config);
+            assertThatThrownBy(() -> fs.initialize(new URI("s3a://test-bucket/"), config))
+                    .isInstanceOf(VerifyException.class)
+                    .hasMessage("Invalid configuration: either endpoint can be set or S3 client can be pinned to the current region");
         }
     }
 
@@ -475,7 +477,7 @@ public void testCreateWithStagingDirectorySymlink()
                 Files.createSymbolicLink(link, staging);
             }
             catch (UnsupportedOperationException e) {
-                throw new SkipException("Filesystem does not support symlinks", e);
+                abort("Filesystem does not support symlinks");
             }
 
             try (TrinoS3FileSystem fs = new TrinoS3FileSystem()) {
@@ -564,11 +566,11 @@ public void testKMSEncryptionMaterialsProvider()
         }
     }
 
-    @Test(expectedExceptions = UnrecoverableS3OperationException.class, expectedExceptionsMessageRegExp = ".*\\Q (Path: /tmp/test/path)\\E")
+    @Test
     public void testUnrecoverableS3ExceptionMessage()
-            throws Exception
     {
-        throw new UnrecoverableS3OperationException(new Path("/tmp/test/path"), new IOException("test io exception"));
+        assertThat(new UnrecoverableS3OperationException("my-bucket", "tmp/test/path", new IOException("test io exception")))
+                .hasMessage("java.io.IOException: test io exception (Bucket: my-bucket, Key: tmp/test/path)");
     }
 
     @Test
@@ -583,14 +585,19 @@ public void testCustomCredentialsProvider()
         }
     }
 
-    @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Error creating an instance of .*")
+    @Test
     public void testCustomCredentialsClassCannotBeFound()
             throws Exception
     {
         Configuration config = newEmptyConfiguration();
         config.set(S3_CREDENTIALS_PROVIDER, "com.example.DoesNotExist");
         try (TrinoS3FileSystem fs = new TrinoS3FileSystem()) {
-            fs.initialize(new URI("s3n://test-bucket/"), config);
+            assertThatThrownBy(() -> fs.initialize(new URI("s3n://test-bucket/"), config))
+                    .isInstanceOf(RuntimeException.class)
+                    .hasMessage("Error creating an instance of com.example.DoesNotExist for URI s3n://test-bucket/")
+                    .cause()
+                    .isInstanceOf(ClassNotFoundException.class)
+                    .hasMessage("Class com.example.DoesNotExist not found");
         }
     }
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestUriBasedS3SecurityMappingsProvider.java b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestUriBasedS3SecurityMappingsProvider.java
similarity index 95%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestUriBasedS3SecurityMappingsProvider.java
rename to lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestUriBasedS3SecurityMappingsProvider.java
index 86253c28af03..935054b2af12 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestUriBasedS3SecurityMappingsProvider.java
+++ b/lib/trino-hdfs/src/test/java/io/trino/hdfs/s3/TestUriBasedS3SecurityMappingsProvider.java
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.s3;
+package io.trino.hdfs.s3;
 
 import io.airlift.http.client.HttpStatus;
 import io.airlift.http.client.Response;
 import io.airlift.http.client.testing.TestingHttpClient;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.net.MediaType.JSON_UTF_8;
 import static io.airlift.http.client.testing.TestingResponse.mockResponse;
diff --git a/plugin/trino-hive/src/test/resources/io/trino/plugin/hive/s3/security-mapping-with-fallback-to-cluster-default.json b/lib/trino-hdfs/src/test/resources/io/trino/hdfs/s3/security-mapping-with-fallback-to-cluster-default.json
similarity index 100%
rename from plugin/trino-hive/src/test/resources/io/trino/plugin/hive/s3/security-mapping-with-fallback-to-cluster-default.json
rename to lib/trino-hdfs/src/test/resources/io/trino/hdfs/s3/security-mapping-with-fallback-to-cluster-default.json
diff --git a/plugin/trino-hive/src/test/resources/io/trino/plugin/hive/s3/security-mapping-without-fallback.json b/lib/trino-hdfs/src/test/resources/io/trino/hdfs/s3/security-mapping-without-fallback.json
similarity index 100%
rename from plugin/trino-hive/src/test/resources/io/trino/plugin/hive/s3/security-mapping-without-fallback.json
rename to lib/trino-hdfs/src/test/resources/io/trino/hdfs/s3/security-mapping-without-fallback.json
diff --git a/plugin/trino-hive/src/test/resources/io/trino/plugin/hive/s3/security-mapping.json b/lib/trino-hdfs/src/test/resources/io/trino/hdfs/s3/security-mapping.json
similarity index 100%
rename from plugin/trino-hive/src/test/resources/io/trino/plugin/hive/s3/security-mapping.json
rename to lib/trino-hdfs/src/test/resources/io/trino/hdfs/s3/security-mapping.json
diff --git a/lib/trino-hive-formats/pom.xml b/lib/trino-hive-formats/pom.xml
index 2042b4d63ed8..44045573ba48 100644
--- a/lib/trino-hive-formats/pom.xml
+++ b/lib/trino-hive-formats/pom.xml
@@ -5,32 +5,43 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-hive-formats</artifactId>
-    <name>trino-hive-formats</name>
     <description>Trino - Hive Formats</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <air.compiler.fail-warnings>true</air.compiler.fail-warnings>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-filesystem</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
         </dependency>
 
         <dependency>
@@ -41,40 +52,38 @@
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <artifactId>log</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
+            <artifactId>slice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
         </dependency>
 
         <dependency>
-             <groupId>commons-codec</groupId>
-             <artifactId>commons-codec</artifactId>
-         </dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>joda-time</groupId>
@@ -82,15 +91,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gaul</groupId>
-            <artifactId>modernizer-maven-annotations</artifactId>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hadoop-toolkit</artifactId>
-            <scope>runtime</scope>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
         </dependency>
 
         <!-- for hadoop compression -->
@@ -106,16 +113,29 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <!-- TODO: remove after making Avro use Aircompressor -->
+        <dependency>
+            <groupId>com.github.luben</groupId>
+            <artifactId>zstd-jni</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
-            <scope>test</scope>
+            <artifactId>trino-hadoop-toolkit</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
+        <!-- TODO: remove after making Avro use Aircompressor -->
         <dependency>
-            <groupId>io.trino.hive</groupId>
-            <artifactId>hive-apache</artifactId>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -128,61 +148,74 @@
         <dependency>
             <groupId>io.starburst.openjson</groupId>
             <artifactId>openjson</artifactId>
-            <version>1.8-e.10</version>
+            <version>1.8-e.11</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.starburst.openx.data</groupId>
             <artifactId>json-serde</artifactId>
-            <version>1.3.9-e.10</version>
+            <version>1.3.9-e.11</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.hive</groupId>
-                    <artifactId>hive-serde</artifactId>
+                    <artifactId>hive-exec</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.hive</groupId>
-                    <artifactId>hive-exec</artifactId>
+                    <artifactId>hive-serde</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>it.unimi.dsi</groupId>
-            <artifactId>fastutil</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
+            <groupId>io.trino.hive</groupId>
+            <artifactId>hive-apache</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
+            <groupId>it.unimi.dsi</groupId>
+            <artifactId>fastutil</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/DistinctMapKeys.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/DistinctMapKeys.java
index 69446a00d4e6..10b6d8ceb3d3 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/DistinctMapKeys.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/DistinctMapKeys.java
@@ -51,16 +51,17 @@ public boolean[] selectDistinctKeys(Block keyBlock)
         int hashTableSize = keyCount * HASH_MULTIPLIER;
 
         if (distinctBuffer.length < keyCount) {
-            int bufferSize = calculateBufferSize(keyCount);
-            distinctBuffer = new boolean[bufferSize];
-            hashTableBuffer = new int[bufferSize];
+            distinctBuffer = new boolean[calculateBufferSize(keyCount)];
+        }
+
+        if (hashTableBuffer.length < hashTableSize) {
+            hashTableBuffer = new int[calculateBufferSize(hashTableSize)];
         }
         boolean[] distinct = distinctBuffer;
         Arrays.fill(distinct, false);
         int[] hashTable = hashTableBuffer;
         Arrays.fill(hashTable, -1);
 
-        int hashTableOffset = 0;
         for (int i = 0; i < keyCount; i++) {
             // Nulls are not marked as distinct and thus are ignored
             if (keyBlock.isNull(i)) {
@@ -68,8 +69,8 @@ public boolean[] selectDistinctKeys(Block keyBlock)
             }
             int hash = getHashPosition(keyBlock, i, hashTableSize);
             while (true) {
-                if (hashTable[hashTableOffset + hash] == -1) {
-                    hashTable[hashTableOffset + hash] = i;
+                if (hashTable[hash] == -1) {
+                    hashTable[hash] = i;
                     distinct[i] = true;
                     break;
                 }
@@ -77,7 +78,7 @@ public boolean[] selectDistinctKeys(Block keyBlock)
                 Boolean isDuplicateKey;
                 try {
                     // assuming maps with indeterminate keys are not supported
-                    isDuplicateKey = (Boolean) mapType.getKeyBlockEqual().invokeExact(keyBlock, i, keyBlock, hashTable[hashTableOffset + hash]);
+                    isDuplicateKey = (Boolean) mapType.getKeyBlockEqual().invokeExact(keyBlock, i, keyBlock, hashTable[hash]);
                 }
                 catch (RuntimeException e) {
                     throw e;
@@ -94,10 +95,10 @@ public boolean[] selectDistinctKeys(Block keyBlock)
                 // duplicate keys are ignored
                 if (isDuplicateKey) {
                     if (userLastEntry) {
-                        int duplicateIndex = hashTable[hashTableOffset + hash];
+                        int duplicateIndex = hashTable[hash];
                         distinct[duplicateIndex] = false;
 
-                        hashTable[hashTableOffset + hash] = i;
+                        hashTable[hash] = i;
                         distinct[i] = true;
                     }
                     break;
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/HiveFormatUtils.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/HiveFormatUtils.java
index 395ecb19b76a..9d38794c8eb8 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/HiveFormatUtils.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/HiveFormatUtils.java
@@ -301,13 +301,13 @@ else if (c == TIMESTAMP_FORMATS_SEPARATOR) {
 
     public static String formatHiveDate(Block block, int position)
     {
-        LocalDate localDate = LocalDate.ofEpochDay(DATE.getLong(block, position));
+        LocalDate localDate = LocalDate.ofEpochDay(DATE.getInt(block, position));
         return localDate.format(DATE_FORMATTER);
     }
 
     public static void formatHiveDate(Block block, int position, StringBuilder builder)
     {
-        LocalDate localDate = LocalDate.ofEpochDay(DATE.getLong(block, position));
+        LocalDate localDate = LocalDate.ofEpochDay(DATE.getInt(block, position));
         DATE_FORMATTER.formatTo(localDate, builder);
     }
 
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/TrinoDataInputStream.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/TrinoDataInputStream.java
index 8cfcb3e6ebc8..5d1996634246 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/TrinoDataInputStream.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/TrinoDataInputStream.java
@@ -31,6 +31,8 @@
 import static io.airlift.slice.SizeOf.SIZE_OF_SHORT;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
+import static java.lang.Math.addExact;
+import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
 public final class TrinoDataInputStream
@@ -86,7 +88,7 @@ public long getReadBytes()
     public long getPos()
             throws IOException
     {
-        return checkedCast(bufferOffset + bufferPosition);
+        return addExact(bufferOffset, bufferPosition);
     }
 
     public void seek(long newPos)
@@ -230,10 +232,14 @@ public int read()
     public long skip(long length)
             throws IOException
     {
+        if (length <= 0) {
+            return 0;
+        }
+
         int availableBytes = availableBytes();
         // is skip within the current buffer?
         if (availableBytes >= length) {
-            bufferPosition += length;
+            bufferPosition = addExact(bufferPosition, toIntExact(length));
             return length;
         }
 
@@ -398,13 +404,6 @@ private int fillBuffer()
         return bufferFill;
     }
 
-    private static int checkedCast(long value)
-    {
-        int result = (int) value;
-        checkArgument(result == value, "Size is greater than maximum int value");
-        return result;
-    }
-
     //
     // Unsupported operations
     //
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/UnionToRowCoercionUtils.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/UnionToRowCoercionUtils.java
new file mode 100644
index 000000000000..69ef8cc4edd0
--- /dev/null
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/UnionToRowCoercionUtils.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed 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 io.trino.hive.formats;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeSignature;
+import io.trino.spi.type.TypeSignatureParameter;
+
+import java.util.List;
+
+import static io.trino.spi.type.TinyintType.TINYINT;
+import static io.trino.spi.type.TypeSignatureParameter.namedField;
+
+public final class UnionToRowCoercionUtils
+{
+    public static final String UNION_FIELD_TAG_NAME = "tag";
+    public static final String UNION_FIELD_FIELD_PREFIX = "field";
+    public static final Type UNION_FIELD_TAG_TYPE = TINYINT;
+
+    private UnionToRowCoercionUtils() {}
+
+    public static RowType rowTypeForUnionOfTypes(List<Type> types)
+    {
+        ImmutableList.Builder<RowType.Field> fields = ImmutableList.<RowType.Field>builder()
+                .add(RowType.field(UNION_FIELD_TAG_NAME, UNION_FIELD_TAG_TYPE));
+        for (int i = 0; i < types.size(); i++) {
+            fields.add(RowType.field(UNION_FIELD_FIELD_PREFIX + i, types.get(i)));
+        }
+        return RowType.from(fields.build());
+    }
+
+    public static TypeSignature rowTypeSignatureForUnionOfTypes(List<TypeSignature> typeSignatures)
+    {
+        ImmutableList.Builder<TypeSignatureParameter> fields = ImmutableList.builder();
+        fields.add(namedField(UNION_FIELD_TAG_NAME, UNION_FIELD_TAG_TYPE.getTypeSignature()));
+        for (int i = 0; i < typeSignatures.size(); i++) {
+            fields.add(namedField(UNION_FIELD_FIELD_PREFIX + i, typeSignatures.get(i)));
+        }
+        return TypeSignature.rowType(fields.build());
+    }
+}
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroCompressionKind.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroCompressionKind.java
new file mode 100644
index 000000000000..7985df34fd51
--- /dev/null
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroCompressionKind.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import org.apache.avro.file.CodecFactory;
+import org.apache.avro.file.DataFileConstants;
+
+import static org.apache.avro.file.CodecFactory.DEFAULT_DEFLATE_LEVEL;
+import static org.apache.avro.file.CodecFactory.DEFAULT_ZSTANDARD_BUFFERPOOL;
+import static org.apache.avro.file.CodecFactory.DEFAULT_ZSTANDARD_LEVEL;
+import static org.apache.avro.file.CodecFactory.deflateCodec;
+import static org.apache.avro.file.CodecFactory.nullCodec;
+import static org.apache.avro.file.CodecFactory.snappyCodec;
+import static org.apache.avro.file.CodecFactory.zstandardCodec;
+
+/**
+ * Inner join between Trino plugin supported codec types and Avro spec supported codec types
+ * Spec list: <a href="https://avro.apache.org/docs/1.11.1/specification/#required-codecs">required</a> and
+ * <a href="https://avro.apache.org/docs/1.11.1/specification/#optional-codecs">optionals</a>
+ */
+public enum AvroCompressionKind
+{
+    // Avro nulls out codec's if it can't find the proper library locally
+    NULL(DataFileConstants.NULL_CODEC, nullCodec() != null),
+    DEFLATE(DataFileConstants.DEFLATE_CODEC, deflateCodec(DEFAULT_DEFLATE_LEVEL) != null),
+    SNAPPY(DataFileConstants.SNAPPY_CODEC, snappyCodec() != null),
+    ZSTANDARD(DataFileConstants.ZSTANDARD_CODEC, zstandardCodec(DEFAULT_ZSTANDARD_LEVEL, DEFAULT_ZSTANDARD_BUFFERPOOL) != null);
+
+    private final String codecString;
+    private final boolean supportedLocally;
+
+    AvroCompressionKind(String codecString, boolean supportedLocally)
+    {
+        this.codecString = codecString;
+        this.supportedLocally = supportedLocally;
+    }
+
+    @Override
+    public String toString()
+    {
+        return codecString;
+    }
+
+    public CodecFactory getCodecFactory()
+    {
+        return CodecFactory.fromString(codecString);
+    }
+
+    public boolean isSupportedLocally()
+    {
+        return supportedLocally;
+    }
+}
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroFileReader.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroFileReader.java
new file mode 100644
index 000000000000..480caf476258
--- /dev/null
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroFileReader.java
@@ -0,0 +1,179 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import com.google.common.annotations.VisibleForTesting;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.hive.formats.TrinoDataInputStream;
+import io.trino.spi.Page;
+import org.apache.avro.AvroRuntimeException;
+import org.apache.avro.Schema;
+import org.apache.avro.file.DataFileReader;
+import org.apache.avro.file.SeekableInput;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.function.Function;
+
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static java.util.Objects.requireNonNull;
+
+public class AvroFileReader
+        implements Closeable
+{
+    private final TrinoDataInputStream input;
+    private final AvroPageDataReader dataReader;
+    private final DataFileReader<Optional<Page>> fileReader;
+    private Page nextPage;
+    private final OptionalLong end;
+
+    public AvroFileReader(
+            TrinoInputFile inputFile,
+            Schema schema,
+            AvroTypeManager avroTypeManager)
+            throws IOException, AvroTypeException
+    {
+        this(inputFile, schema, avroTypeManager, 0, OptionalLong.empty());
+    }
+
+    public AvroFileReader(
+            TrinoInputFile inputFile,
+            Schema schema,
+            AvroTypeManager avroTypeManager,
+            long offset,
+            OptionalLong length)
+            throws IOException, AvroTypeException
+    {
+        requireNonNull(inputFile, "inputFile is null");
+        requireNonNull(schema, "schema is null");
+        requireNonNull(avroTypeManager, "avroTypeManager is null");
+        long fileSize = inputFile.length();
+
+        verify(offset >= 0, "offset is negative");
+        verify(offset < inputFile.length(), "offset is greater than data size");
+        length.ifPresent(lengthLong -> verify(lengthLong >= 1, "length must be at least 1"));
+        end = length.stream().map(l -> l + offset).findFirst();
+        end.ifPresent(endLong -> verify(endLong <= fileSize, "offset plus length is greater than data size"));
+        input = new TrinoDataInputStream(inputFile.newStream());
+        dataReader = new AvroPageDataReader(schema, avroTypeManager);
+        try {
+            fileReader = new DataFileReader<>(new TrinoDataInputStreamAsAvroSeekableInput(input, fileSize), dataReader);
+            fileReader.sync(offset);
+        }
+        catch (AvroPageDataReader.UncheckedAvroTypeException runtimeWrapper) {
+            // Avro Datum Reader interface can't throw checked exceptions when initialized by the file reader,
+            // so the exception is wrapped in a runtime exception that must be unwrapped
+            throw runtimeWrapper.getAvroTypeException();
+        }
+        avroTypeManager.configure(fileReader.getMetaKeys().stream().collect(toImmutableMap(Function.identity(), fileReader::getMeta)));
+    }
+
+    public long getCompletedBytes()
+    {
+        return input.getReadBytes();
+    }
+
+    public long getReadTimeNanos()
+    {
+        return input.getReadTimeNanos();
+    }
+
+    public boolean hasNext()
+            throws IOException
+    {
+        loadNextPageIfNecessary();
+        return nextPage != null;
+    }
+
+    public Page next()
+            throws IOException
+    {
+        if (!hasNext()) {
+            throw new IOException("No more pages available from Avro file");
+        }
+        Page result = nextPage;
+        nextPage = null;
+        return result;
+    }
+
+    private void loadNextPageIfNecessary()
+            throws IOException
+    {
+        while (nextPage == null && (end.isEmpty() || !fileReader.pastSync(end.getAsLong())) && fileReader.hasNext()) {
+            try {
+                nextPage = fileReader.next().orElse(null);
+            }
+            catch (AvroRuntimeException e) {
+                throw new IOException(e);
+            }
+        }
+        if (nextPage == null) {
+            nextPage = dataReader.flush().orElse(null);
+        }
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        fileReader.close();
+    }
+
+    @VisibleForTesting
+    record TrinoDataInputStreamAsAvroSeekableInput(TrinoDataInputStream inputStream, long fileSize)
+            implements SeekableInput
+    {
+        TrinoDataInputStreamAsAvroSeekableInput
+        {
+            requireNonNull(inputStream, "inputStream is null");
+        }
+
+        @Override
+        public void seek(long p)
+                throws IOException
+        {
+            inputStream.seek(p);
+        }
+
+        @Override
+        public long tell()
+                throws IOException
+        {
+            return inputStream.getPos();
+        }
+
+        @Override
+        public long length()
+        {
+            return fileSize;
+        }
+
+        @Override
+        public int read(byte[] b, int off, int len)
+                throws IOException
+        {
+            return inputStream.read(b, off, len);
+        }
+
+        @Override
+        public void close()
+                throws IOException
+        {
+            inputStream.close();
+        }
+    }
+}
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroFileWriter.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroFileWriter.java
new file mode 100644
index 000000000000..9e158ed1fc8f
--- /dev/null
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroFileWriter.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import io.trino.spi.Page;
+import io.trino.spi.type.Type;
+import org.apache.avro.Schema;
+import org.apache.avro.file.DataFileWriter;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.base.Verify.verify;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.trino.hive.formats.avro.AvroTypeUtils.lowerCaseAllFieldsForWriter;
+
+public class AvroFileWriter
+        implements Closeable
+{
+    private static final int INSTANCE_SIZE = instanceSize(AvroFileWriter.class);
+
+    private final AvroPagePositionDataWriter pagePositionDataWriter;
+    private final DataFileWriter<Integer> pagePositionFileWriter;
+
+    public AvroFileWriter(
+            OutputStream rawOutput,
+            Schema schema,
+            AvroTypeManager avroTypeManager,
+            AvroCompressionKind compressionKind,
+            Map<String, String> fileMetadata,
+            List<String> names,
+            List<Type> types,
+            boolean resolveUsingLowerCaseFieldsInSchema)
+            throws IOException, AvroTypeException
+    {
+        verify(compressionKind.isSupportedLocally(), "compression kind must be supported locally: %s", compressionKind);
+        if (resolveUsingLowerCaseFieldsInSchema) {
+            pagePositionDataWriter = new AvroPagePositionDataWriter(lowerCaseAllFieldsForWriter(schema), avroTypeManager, names, types);
+        }
+        else {
+            pagePositionDataWriter = new AvroPagePositionDataWriter(schema, avroTypeManager, names, types);
+        }
+        try {
+            DataFileWriter<Integer> fileWriter = new DataFileWriter<>(pagePositionDataWriter)
+                    .setCodec(compressionKind.getCodecFactory());
+            fileMetadata.forEach(fileWriter::setMeta);
+            pagePositionFileWriter = fileWriter.create(schema, rawOutput);
+        }
+        catch (org.apache.avro.AvroTypeException e) {
+            throw new AvroTypeException(e);
+        }
+        catch (org.apache.avro.AvroRuntimeException e) {
+            throw new IOException(e);
+        }
+    }
+
+    public void write(Page page)
+            throws IOException
+    {
+        pagePositionDataWriter.setPage(page);
+        for (int pos = 0; pos < page.getPositionCount(); pos++) {
+            try {
+                pagePositionFileWriter.append(pos);
+            }
+            catch (RuntimeException e) {
+                throw new IOException("Error writing to avro file", e);
+            }
+        }
+    }
+
+    public long getRetainedSize()
+    {
+        // Avro library delegates to java.io.BufferedOutputStream.BufferedOutputStream(java.io.OutputStream)
+        // which has a default buffer size of 8192
+        return INSTANCE_SIZE + 8192;
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        pagePositionFileWriter.close();
+    }
+}
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroPageDataReader.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroPageDataReader.java
new file mode 100644
index 000000000000..f21299ef643b
--- /dev/null
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroPageDataReader.java
@@ -0,0 +1,1052 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
+import io.trino.spi.Page;
+import io.trino.spi.PageBuilder;
+import io.trino.spi.block.ArrayBlockBuilder;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.Type;
+import org.apache.avro.Resolver;
+import org.apache.avro.Schema;
+import org.apache.avro.generic.GenericData;
+import org.apache.avro.io.BinaryDecoder;
+import org.apache.avro.io.DatumReader;
+import org.apache.avro.io.Decoder;
+import org.apache.avro.io.DecoderFactory;
+import org.apache.avro.io.Encoder;
+import org.apache.avro.io.EncoderFactory;
+import org.apache.avro.io.FastReaderBuilder;
+import org.apache.avro.io.parsing.ResolvingGrammarGenerator;
+import org.apache.avro.util.internal.Accessor;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.IntFunction;
+import java.util.stream.IntStream;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verify;
+import static io.trino.hive.formats.UnionToRowCoercionUtils.UNION_FIELD_TAG_TYPE;
+import static io.trino.hive.formats.avro.AvroTypeUtils.isSimpleNullableUnion;
+import static io.trino.hive.formats.avro.AvroTypeUtils.typeFromAvro;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.VarbinaryType.VARBINARY;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.lang.Float.floatToRawIntBits;
+import static java.util.Objects.requireNonNull;
+
+public class AvroPageDataReader
+        implements DatumReader<Optional<Page>>
+{
+    // same limit as org.apache.avro.io.BinaryDecoder
+    private static final long MAX_ARRAY_SIZE = (long) Integer.MAX_VALUE - 8L;
+
+    private final Schema readerSchema;
+    private Schema writerSchema;
+    private final PageBuilder pageBuilder;
+    private RowBlockBuildingDecoder rowBlockBuildingDecoder;
+    private final AvroTypeManager typeManager;
+
+    public AvroPageDataReader(Schema readerSchema, AvroTypeManager typeManager)
+            throws AvroTypeException
+    {
+        this.readerSchema = requireNonNull(readerSchema, "readerSchema is null");
+        writerSchema = this.readerSchema;
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        try {
+            Type readerSchemaType = typeFromAvro(this.readerSchema, typeManager);
+            verify(readerSchemaType instanceof RowType, "Root Avro type must be a row");
+            pageBuilder = new PageBuilder(readerSchemaType.getTypeParameters());
+            initialize();
+        }
+        catch (org.apache.avro.AvroTypeException e) {
+            throw new AvroTypeException(e);
+        }
+    }
+
+    private void initialize()
+            throws AvroTypeException
+    {
+        verify(readerSchema.getType() == Schema.Type.RECORD, "Avro schema for page reader must be record");
+        verify(writerSchema.getType() == Schema.Type.RECORD, "File Avro schema for page reader must be record");
+        rowBlockBuildingDecoder = new RowBlockBuildingDecoder(writerSchema, readerSchema, typeManager);
+    }
+
+    @Override
+    public void setSchema(Schema schema)
+    {
+        requireNonNull(schema, "schema is null");
+        if (schema != writerSchema) {
+            writerSchema = schema;
+            try {
+                initialize();
+            }
+            catch (org.apache.avro.AvroTypeException e) {
+                throw new UncheckedAvroTypeException(new AvroTypeException(e));
+            }
+            catch (AvroTypeException e) {
+                throw new UncheckedAvroTypeException(e);
+            }
+        }
+    }
+
+    @Override
+    public Optional<Page> read(Optional<Page> ignoredReuse, Decoder decoder)
+            throws IOException
+    {
+        Optional<Page> page = Optional.empty();
+        rowBlockBuildingDecoder.decodeIntoPageBuilder(decoder, pageBuilder);
+        if (pageBuilder.isFull()) {
+            page = Optional.of(pageBuilder.build());
+            pageBuilder.reset();
+        }
+        return page;
+    }
+
+    public Optional<Page> flush()
+    {
+        if (!pageBuilder.isEmpty()) {
+            Optional<Page> lastPage = Optional.of(pageBuilder.build());
+            pageBuilder.reset();
+            return lastPage;
+        }
+        return Optional.empty();
+    }
+
+    private abstract static class BlockBuildingDecoder
+    {
+        protected abstract void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException;
+    }
+
+    private static BlockBuildingDecoder createBlockBuildingDecoderForAction(Resolver.Action action, AvroTypeManager typeManager)
+            throws AvroTypeException
+    {
+        Optional<BiConsumer<BlockBuilder, Object>> consumer = typeManager.overrideBuildingFunctionForSchema(action.reader);
+        if (consumer.isPresent()) {
+            return new UserDefinedBlockBuildingDecoder(action.reader, action.writer, consumer.get());
+        }
+        return switch (action.type) {
+            case DO_NOTHING -> switch (action.reader.getType()) {
+                case NULL -> NullBlockBuildingDecoder.INSTANCE;
+                case BOOLEAN -> BooleanBlockBuildingDecoder.INSTANCE;
+                case INT -> IntBlockBuildingDecoder.INSTANCE;
+                case LONG -> new LongBlockBuildingDecoder();
+                case FLOAT -> new FloatBlockBuildingDecoder();
+                case DOUBLE -> new DoubleBlockBuildingDecoder();
+                case STRING -> StringBlockBuildingDecoder.INSTANCE;
+                case BYTES -> BytesBlockBuildingDecoder.INSTANCE;
+                case FIXED -> new FixedBlockBuildingDecoder(action.reader.getFixedSize());
+                // these reader types covered by special action types
+                case ENUM, ARRAY, MAP, RECORD, UNION -> throw new IllegalStateException("Do Nothing action type not compatible with reader schema type " + action.reader.getType());
+            };
+            case PROMOTE -> switch (action.reader.getType()) {
+                // only certain types valid to promote into as determined by org.apache.avro.Resolver.Promote.isValid
+                case LONG -> new LongBlockBuildingDecoder(getLongPromotionFunction(action.writer));
+                case FLOAT -> new FloatBlockBuildingDecoder(getFloatPromotionFunction(action.writer));
+                case DOUBLE -> new DoubleBlockBuildingDecoder(getDoublePromotionFunction(action.writer));
+                case STRING -> {
+                    if (action.writer.getType() == Schema.Type.BYTES) {
+                        yield StringBlockBuildingDecoder.INSTANCE;
+                    }
+                    throw new AvroTypeException("Unable to promote to String from type " + action.writer.getType());
+                }
+                case BYTES -> {
+                    if (action.writer.getType() == Schema.Type.STRING) {
+                        yield BytesBlockBuildingDecoder.INSTANCE;
+                    }
+                    throw new AvroTypeException("Unable to promote to Bytes from type " + action.writer.getType());
+                }
+                case NULL, BOOLEAN, INT, FIXED, ENUM, ARRAY, MAP, RECORD, UNION ->
+                        throw new AvroTypeException("Promotion action not allowed for reader schema type " + action.reader.getType());
+            };
+            case CONTAINER -> switch (action.reader.getType()) {
+                case ARRAY -> new ArrayBlockBuildingDecoder((Resolver.Container) action, typeManager);
+                case MAP -> new MapBlockBuildingDecoder((Resolver.Container) action, typeManager);
+                default -> throw new AvroTypeException("Not possible to have container action type with non container reader schema " + action.reader.getType());
+            };
+            case RECORD -> new RowBlockBuildingDecoder(action, typeManager);
+            case ENUM -> new EnumBlockBuildingDecoder((Resolver.EnumAdjust) action);
+            case WRITER_UNION -> {
+                if (isSimpleNullableUnion(action.reader)) {
+                    yield new WriterUnionBlockBuildingDecoder((Resolver.WriterUnion) action, typeManager);
+                }
+                else {
+                    yield new WriterUnionCoercedIntoRowBlockBuildingDecoder((Resolver.WriterUnion) action, typeManager);
+                }
+            }
+            case READER_UNION -> {
+                if (isSimpleNullableUnion(action.reader)) {
+                    yield createBlockBuildingDecoderForAction(((Resolver.ReaderUnion) action).actualAction, typeManager);
+                }
+                else {
+                    yield new ReaderUnionCoercedIntoRowBlockBuildingDecoder((Resolver.ReaderUnion) action, typeManager);
+                }
+            }
+            case ERROR -> throw new AvroTypeException("Resolution action returned with error " + action);
+            case SKIP -> throw new IllegalStateException("Skips filtered by row step");
+        };
+    }
+
+    // Different plugins may have different Avro Schema to Type mappings
+    // that are currently transforming GenericDatumReader returned objects into their target type during the record reading process
+    // This block building decoder allows plugin writers to port that code directly and use within this reader
+    // This mechanism is used to enhance Avro longs into timestamp types according to schema metadata
+    private static class UserDefinedBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private final BiConsumer<BlockBuilder, Object> userBuilderFunction;
+        private final DatumReader<Object> datumReader;
+
+        public UserDefinedBlockBuildingDecoder(Schema readerSchema, Schema writerSchema, BiConsumer<BlockBuilder, Object> userBuilderFunction)
+                throws AvroTypeException
+        {
+            requireNonNull(readerSchema, "readerSchema is null");
+            requireNonNull(writerSchema, "writerSchema is null");
+            try {
+                FastReaderBuilder fastReaderBuilder = new FastReaderBuilder(new GenericData());
+                datumReader = fastReaderBuilder.createDatumReader(writerSchema, readerSchema);
+            }
+            catch (IOException ioException) {
+                // IOException only thrown when default encoded in schema is unable to be re-serialized into bytes with proper typing
+                // translate into type exception
+                throw new AvroTypeException("Unable to decode default value in schema " + readerSchema, ioException);
+            }
+            this.userBuilderFunction = requireNonNull(userBuilderFunction, "userBuilderFunction is null");
+        }
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            userBuilderFunction.accept(builder, datumReader.read(null, decoder));
+        }
+    }
+
+    private static class NullBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private static final NullBlockBuildingDecoder INSTANCE = new NullBlockBuildingDecoder();
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            decoder.readNull();
+            builder.appendNull();
+        }
+    }
+
+    private static class BooleanBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private static final BooleanBlockBuildingDecoder INSTANCE = new BooleanBlockBuildingDecoder();
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            BOOLEAN.writeBoolean(builder, decoder.readBoolean());
+        }
+    }
+
+    private static class IntBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private static final IntBlockBuildingDecoder INSTANCE = new IntBlockBuildingDecoder();
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            INTEGER.writeLong(builder, decoder.readInt());
+        }
+    }
+
+    private static class LongBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private static final LongIoFunction<Decoder> DEFAULT_EXTRACT_LONG = Decoder::readLong;
+        private final LongIoFunction<Decoder> extractLong;
+
+        public LongBlockBuildingDecoder()
+        {
+            this(DEFAULT_EXTRACT_LONG);
+        }
+
+        public LongBlockBuildingDecoder(LongIoFunction<Decoder> extractLong)
+        {
+            this.extractLong = requireNonNull(extractLong, "extractLong is null");
+        }
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            BIGINT.writeLong(builder, extractLong.apply(decoder));
+        }
+    }
+
+    private static class FloatBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private static final FloatIoFunction<Decoder> DEFAULT_EXTRACT_FLOAT = Decoder::readFloat;
+        private final FloatIoFunction<Decoder> extractFloat;
+
+        public FloatBlockBuildingDecoder()
+        {
+            this(DEFAULT_EXTRACT_FLOAT);
+        }
+
+        public FloatBlockBuildingDecoder(FloatIoFunction<Decoder> extractFloat)
+        {
+            this.extractFloat = requireNonNull(extractFloat, "extractFloat is null");
+        }
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            REAL.writeLong(builder, floatToRawIntBits(extractFloat.apply(decoder)));
+        }
+    }
+
+    private static class DoubleBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private static final DoubleIoFunction<Decoder> DEFAULT_EXTRACT_DOUBLE = Decoder::readDouble;
+        private final DoubleIoFunction<Decoder> extractDouble;
+
+        public DoubleBlockBuildingDecoder()
+        {
+            this(DEFAULT_EXTRACT_DOUBLE);
+        }
+
+        public DoubleBlockBuildingDecoder(DoubleIoFunction<Decoder> extractDouble)
+        {
+            this.extractDouble = requireNonNull(extractDouble, "extractDouble is null");
+        }
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            DOUBLE.writeDouble(builder, extractDouble.apply(decoder));
+        }
+    }
+
+    private static class StringBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private static final StringBlockBuildingDecoder INSTANCE = new StringBlockBuildingDecoder();
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            // it is only possible to read String type when underlying write type is String or Bytes
+            // both have the same encoding, so coercion is a no-op
+            long size = decoder.readLong();
+            if (size > MAX_ARRAY_SIZE) {
+                throw new IOException("Unable to read avro String with size greater than %s. Found String size: %s".formatted(MAX_ARRAY_SIZE, size));
+            }
+            byte[] bytes = new byte[(int) size];
+            decoder.readFixed(bytes);
+            VARCHAR.writeSlice(builder, Slices.wrappedBuffer(bytes));
+        }
+    }
+
+    private static class BytesBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private static final BytesBlockBuildingDecoder INSTANCE = new BytesBlockBuildingDecoder();
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            // it is only possible to read Bytes type when underlying write type is String or Bytes
+            // both have the same encoding, so coercion is a no-op
+            long size = decoder.readLong();
+            if (size > MAX_ARRAY_SIZE) {
+                throw new IOException("Unable to read avro Bytes with size greater than %s. Found Bytes size: %s".formatted(MAX_ARRAY_SIZE, size));
+            }
+            byte[] bytes = new byte[(int) size];
+            decoder.readFixed(bytes);
+            VARBINARY.writeSlice(builder, Slices.wrappedBuffer(bytes));
+        }
+    }
+
+    private static class FixedBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private final int expectedSize;
+
+        public FixedBlockBuildingDecoder(int expectedSize)
+        {
+            verify(expectedSize >= 0, "expected size must be greater than or equal to 0");
+            this.expectedSize = expectedSize;
+        }
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            byte[] slice = new byte[expectedSize];
+            decoder.readFixed(slice);
+            VARBINARY.writeSlice(builder, Slices.wrappedBuffer(slice));
+        }
+    }
+
+    private static class EnumBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private Slice[] symbols;
+
+        public EnumBlockBuildingDecoder(Resolver.EnumAdjust action)
+                throws AvroTypeException
+        {
+            List<String> symbolsList = requireNonNull(action, "action is null").reader.getEnumSymbols();
+            symbols = symbolsList.stream().map(Slices::utf8Slice).toArray(Slice[]::new);
+            if (!action.noAdjustmentsNeeded) {
+                Slice[] adjustedSymbols = new Slice[(action.writer.getEnumSymbols().size())];
+                for (int i = 0; i < action.adjustments.length; i++) {
+                    if (action.adjustments[i] < 0) {
+                        throw new AvroTypeException("No reader Enum value for writer Enum value " + action.writer.getEnumSymbols().get(i));
+                    }
+                    adjustedSymbols[i] = symbols[action.adjustments[i]];
+                }
+                symbols = adjustedSymbols;
+            }
+        }
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            VARCHAR.writeSlice(builder, symbols[decoder.readEnum()]);
+        }
+    }
+
+    private static class ArrayBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private final BlockBuildingDecoder elementBlockBuildingDecoder;
+
+        public ArrayBlockBuildingDecoder(Resolver.Container containerAction, AvroTypeManager typeManager)
+                throws AvroTypeException
+        {
+            requireNonNull(containerAction, "containerAction is null");
+            verify(containerAction.reader.getType() == Schema.Type.ARRAY, "Reader schema must be a array");
+            elementBlockBuildingDecoder = createBlockBuildingDecoderForAction(containerAction.elementAction, typeManager);
+        }
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            ((ArrayBlockBuilder) builder).buildEntry(elementBuilder -> {
+                long elementsInBlock = decoder.readArrayStart();
+                if (elementsInBlock > 0) {
+                    do {
+                        for (int i = 0; i < elementsInBlock; i++) {
+                            elementBlockBuildingDecoder.decodeIntoBlock(decoder, elementBuilder);
+                        }
+                    }
+                    while ((elementsInBlock = decoder.arrayNext()) > 0);
+                }
+            });
+        }
+    }
+
+    private static class MapBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private final BlockBuildingDecoder keyBlockBuildingDecoder = new StringBlockBuildingDecoder();
+        private final BlockBuildingDecoder valueBlockBuildingDecoder;
+
+        public MapBlockBuildingDecoder(Resolver.Container containerAction, AvroTypeManager typeManager)
+                throws AvroTypeException
+        {
+            requireNonNull(containerAction, "containerAction is null");
+            verify(containerAction.reader.getType() == Schema.Type.MAP, "Reader schema must be a map");
+            valueBlockBuildingDecoder = createBlockBuildingDecoderForAction(containerAction.elementAction, typeManager);
+        }
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            ((MapBlockBuilder) builder).buildEntry((keyBuilder, valueBuilder) -> {
+                long entriesInBlock = decoder.readMapStart();
+                // TODO need to filter out all but last value for key?
+                if (entriesInBlock > 0) {
+                    do {
+                        for (int i = 0; i < entriesInBlock; i++) {
+                            keyBlockBuildingDecoder.decodeIntoBlock(decoder, keyBuilder);
+                            valueBlockBuildingDecoder.decodeIntoBlock(decoder, valueBuilder);
+                        }
+                    }
+                    while ((entriesInBlock = decoder.mapNext()) > 0);
+                }
+            });
+        }
+    }
+
+    private static class RowBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        private final RowBuildingAction[] buildSteps;
+
+        private RowBlockBuildingDecoder(Schema writeSchema, Schema readSchema, AvroTypeManager typeManager)
+                throws AvroTypeException
+        {
+            this(Resolver.resolve(writeSchema, readSchema, new GenericData()), typeManager);
+        }
+
+        private RowBlockBuildingDecoder(Resolver.Action action, AvroTypeManager typeManager)
+                throws AvroTypeException
+
+        {
+            if (action instanceof Resolver.ErrorAction errorAction) {
+                throw new AvroTypeException("Error in resolution of types for row building: " + errorAction.error);
+            }
+            if (!(action instanceof Resolver.RecordAdjust recordAdjust)) {
+                throw new AvroTypeException("Write and Read Schemas must be records when building a row block building decoder. Illegal action: " + action);
+            }
+            buildSteps = new RowBuildingAction[recordAdjust.fieldActions.length + recordAdjust.readerOrder.length
+                    - recordAdjust.firstDefault];
+            int i = 0;
+            int readerFieldCount = 0;
+            for (; i < recordAdjust.fieldActions.length; i++) {
+                Resolver.Action fieldAction = recordAdjust.fieldActions[i];
+                if (fieldAction instanceof Resolver.Skip skip) {
+                    buildSteps[i] = new SkipSchemaBuildingAction(skip.writer);
+                }
+                else {
+                    Schema.Field readField = recordAdjust.readerOrder[readerFieldCount++];
+                    buildSteps[i] = new BuildIntoBlockAction(createBlockBuildingDecoderForAction(fieldAction, typeManager), readField.pos());
+                }
+            }
+
+            // add defaulting if required
+            for (; i < buildSteps.length; i++) {
+                // create constant block
+                Schema.Field readField = recordAdjust.readerOrder[readerFieldCount++];
+                // TODO see if it can be done with RLE block
+                buildSteps[i] = new ConstantBlockAction(getDefaultBlockBuilder(readField, typeManager), readField.pos());
+            }
+
+            verify(Arrays.stream(buildSteps)
+                            .mapToInt(RowBuildingAction::getOutputChannel)
+                            .filter(a -> a >= 0)
+                            .distinct()
+                            .sum() == (recordAdjust.reader.getFields().size() * (recordAdjust.reader.getFields().size() - 1) / 2),
+                    "Every channel in output block builder must be accounted for");
+            verify(Arrays.stream(buildSteps)
+                    .mapToInt(RowBuildingAction::getOutputChannel)
+                    .filter(a -> a >= 0)
+                    .distinct().count() == (long) recordAdjust.reader.getFields().size(), "Every channel in output block builder must be accounted for");
+        }
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            ((RowBlockBuilder) builder).buildEntry(fieldBuilders -> decodeIntoBlockProvided(decoder, fieldBuilders::get));
+        }
+
+        protected void decodeIntoPageBuilder(Decoder decoder, PageBuilder builder)
+                throws IOException
+        {
+            builder.declarePosition();
+            decodeIntoBlockProvided(decoder, builder::getBlockBuilder);
+        }
+
+        protected void decodeIntoBlockProvided(Decoder decoder, IntFunction<BlockBuilder> fieldBlockBuilder)
+                throws IOException
+        {
+            for (RowBuildingAction buildStep : buildSteps) {
+                // TODO replace with switch sealed class syntax when stable
+                if (buildStep instanceof SkipSchemaBuildingAction skipSchemaBuildingAction) {
+                    skipSchemaBuildingAction.skip(decoder);
+                }
+                else if (buildStep instanceof BuildIntoBlockAction buildIntoBlockAction) {
+                    buildIntoBlockAction.decode(decoder, fieldBlockBuilder);
+                }
+                else if (buildStep instanceof ConstantBlockAction constantBlockAction) {
+                    constantBlockAction.addConstant(fieldBlockBuilder);
+                }
+                else {
+                    throw new IllegalStateException("Unhandled buildingAction");
+                }
+            }
+        }
+
+        sealed interface RowBuildingAction
+                permits BuildIntoBlockAction, ConstantBlockAction, SkipSchemaBuildingAction
+        {
+            int getOutputChannel();
+        }
+
+        private static final class BuildIntoBlockAction
+                implements RowBuildingAction
+        {
+            private final BlockBuildingDecoder delegate;
+            private final int outputChannel;
+
+            public BuildIntoBlockAction(BlockBuildingDecoder delegate, int outputChannel)
+            {
+                this.delegate = requireNonNull(delegate, "delegate is null");
+                checkArgument(outputChannel >= 0, "outputChannel must be positive");
+                this.outputChannel = outputChannel;
+            }
+
+            public void decode(Decoder decoder, IntFunction<BlockBuilder> channelSelector)
+                    throws IOException
+            {
+                delegate.decodeIntoBlock(decoder, channelSelector.apply(outputChannel));
+            }
+
+            @Override
+            public int getOutputChannel()
+            {
+                return outputChannel;
+            }
+        }
+
+        protected static final class ConstantBlockAction
+                implements RowBuildingAction
+        {
+            private final IoConsumer<BlockBuilder> addConstantFunction;
+            private final int outputChannel;
+
+            public ConstantBlockAction(IoConsumer<BlockBuilder> addConstantFunction, int outputChannel)
+            {
+                this.addConstantFunction = requireNonNull(addConstantFunction, "addConstantFunction is null");
+                checkArgument(outputChannel >= 0, "outputChannel must be positive");
+                this.outputChannel = outputChannel;
+            }
+
+            public void addConstant(IntFunction<BlockBuilder> channelSelector)
+                    throws IOException
+            {
+                addConstantFunction.accept(channelSelector.apply(outputChannel));
+            }
+
+            @Override
+            public int getOutputChannel()
+            {
+                return outputChannel;
+            }
+        }
+
+        private static final class SkipSchemaBuildingAction
+                implements RowBuildingAction
+        {
+            private final SkipAction skipAction;
+
+            SkipSchemaBuildingAction(Schema schema)
+            {
+                skipAction = createSkipActionForSchema(requireNonNull(schema, "schema is null"));
+            }
+
+            public void skip(Decoder decoder)
+                    throws IOException
+            {
+                skipAction.skip(decoder);
+            }
+
+            @Override
+            public int getOutputChannel()
+            {
+                return -1;
+            }
+
+            @FunctionalInterface
+            private interface SkipAction
+            {
+                void skip(Decoder decoder)
+                        throws IOException;
+            }
+
+            private static SkipAction createSkipActionForSchema(Schema schema)
+            {
+                return switch (schema.getType()) {
+                    case NULL -> Decoder::readNull;
+                    case BOOLEAN -> Decoder::readBoolean;
+                    case INT -> Decoder::readInt;
+                    case LONG -> Decoder::readLong;
+                    case FLOAT -> Decoder::readFloat;
+                    case DOUBLE -> Decoder::readDouble;
+                    case STRING -> Decoder::skipString;
+                    case BYTES -> Decoder::skipBytes;
+                    case ENUM -> Decoder::readEnum;
+                    case FIXED -> {
+                        int size = schema.getFixedSize();
+                        yield decoder -> decoder.skipFixed(size);
+                    }
+                    case ARRAY -> new ArraySkipAction(schema.getElementType());
+                    case MAP -> new MapSkipAction(schema.getValueType());
+                    case RECORD -> new RecordSkipAction(schema.getFields());
+                    case UNION -> new UnionSkipAction(schema.getTypes());
+                };
+            }
+
+            private static class ArraySkipAction
+                    implements SkipAction
+            {
+                private final SkipAction elementSkipAction;
+
+                public ArraySkipAction(Schema elementSchema)
+                {
+                    elementSkipAction = createSkipActionForSchema(requireNonNull(elementSchema, "elementSchema is null"));
+                }
+
+                @Override
+                public void skip(Decoder decoder)
+                        throws IOException
+                {
+                    for (long i = decoder.skipArray(); i != 0; i = decoder.skipArray()) {
+                        for (long j = 0; j < i; j++) {
+                            elementSkipAction.skip(decoder);
+                        }
+                    }
+                }
+            }
+
+            private static class MapSkipAction
+                    implements SkipAction
+            {
+                private final SkipAction valueSkipAction;
+
+                public MapSkipAction(Schema valueSchema)
+                {
+                    valueSkipAction = createSkipActionForSchema(requireNonNull(valueSchema, "valueSchema is null"));
+                }
+
+                @Override
+                public void skip(Decoder decoder)
+                        throws IOException
+                {
+                    for (long i = decoder.skipMap(); i != 0; i = decoder.skipMap()) {
+                        for (long j = 0; j < i; j++) {
+                            decoder.skipString(); // key
+                            valueSkipAction.skip(decoder); // value
+                        }
+                    }
+                }
+            }
+
+            private static class RecordSkipAction
+                    implements SkipAction
+            {
+                private final SkipAction[] fieldSkips;
+
+                public RecordSkipAction(List<Schema.Field> fields)
+                {
+                    fieldSkips = new SkipAction[requireNonNull(fields, "fields is null").size()];
+                    for (int i = 0; i < fields.size(); i++) {
+                        fieldSkips[i] = createSkipActionForSchema(fields.get(i).schema());
+                    }
+                }
+
+                @Override
+                public void skip(Decoder decoder)
+                        throws IOException
+                {
+                    for (SkipAction fieldSkipAction : fieldSkips) {
+                        fieldSkipAction.skip(decoder);
+                    }
+                }
+            }
+
+            private static class UnionSkipAction
+                    implements SkipAction
+            {
+                private final SkipAction[] skipActions;
+
+                private UnionSkipAction(List<Schema> types)
+                {
+                    skipActions = new SkipAction[requireNonNull(types, "types is null").size()];
+                    for (int i = 0; i < types.size(); i++) {
+                        skipActions[i] = createSkipActionForSchema(types.get(i));
+                    }
+                }
+
+                @Override
+                public void skip(Decoder decoder)
+                        throws IOException
+                {
+                    skipActions[decoder.readIndex()].skip(decoder);
+                }
+            }
+        }
+    }
+
+    private static class WriterUnionBlockBuildingDecoder
+            extends BlockBuildingDecoder
+    {
+        protected final BlockBuildingDecoder[] blockBuildingDecoders;
+
+        public WriterUnionBlockBuildingDecoder(Resolver.WriterUnion writerUnion, AvroTypeManager typeManager)
+                throws AvroTypeException
+        {
+            requireNonNull(writerUnion, "writerUnion is null");
+            blockBuildingDecoders = new BlockBuildingDecoder[writerUnion.actions.length];
+            for (int i = 0; i < writerUnion.actions.length; i++) {
+                blockBuildingDecoders[i] = createBlockBuildingDecoderForAction(writerUnion.actions[i], typeManager);
+            }
+        }
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            decodeIntoBlock(decoder.readIndex(), decoder, builder);
+        }
+
+        protected void decodeIntoBlock(int blockBuilderIndex, Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            blockBuildingDecoders[blockBuilderIndex].decodeIntoBlock(decoder, builder);
+        }
+    }
+
+    private static class WriterUnionCoercedIntoRowBlockBuildingDecoder
+            extends WriterUnionBlockBuildingDecoder
+    {
+        private final boolean readUnionEquiv;
+        private final int[] indexToChannel;
+        private final int totalChannels;
+
+        public WriterUnionCoercedIntoRowBlockBuildingDecoder(Resolver.WriterUnion writerUnion, AvroTypeManager avroTypeManager)
+                throws AvroTypeException
+        {
+            super(writerUnion, avroTypeManager);
+            readUnionEquiv = writerUnion.unionEquiv;
+            List<Schema> readSchemas = writerUnion.reader.getTypes();
+            checkArgument(readSchemas.size() == writerUnion.actions.length, "each read schema must have resolvedAction For it");
+            indexToChannel = getIndexToChannel(readSchemas);
+            totalChannels = (int) IntStream.of(indexToChannel).filter(i -> i >= 0).count();
+        }
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            int index = decoder.readIndex();
+            if (readUnionEquiv) {
+                // if no output channel then the schema is null and the whole record can be null;
+                if (indexToChannel[index] < 0) {
+                    NullBlockBuildingDecoder.INSTANCE.decodeIntoBlock(decoder, builder);
+                }
+                else {
+                    // the index for the reader and writer are the same, so the channel for the index is used to select the field to populate
+                    makeSingleRowWithTagAndAllFieldsNullButOne(indexToChannel[index], totalChannels, blockBuildingDecoders[index], decoder, builder);
+                }
+            }
+            else {
+                // delegate to ReaderUnionCoercedIntoRowBlockBuildingDecoder to get the output channel from the resolved action
+                decodeIntoBlock(index, decoder, builder);
+            }
+        }
+
+        protected static void makeSingleRowWithTagAndAllFieldsNullButOne(int outputChannel, int totalChannels, BlockBuildingDecoder blockBuildingDecoder, Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            ((RowBlockBuilder) builder).buildEntry(fieldBuilders -> {
+                //add tag with channel
+                UNION_FIELD_TAG_TYPE.writeLong(fieldBuilders.get(0), outputChannel);
+                //add in null fields except one
+                for (int channel = 1; channel <= totalChannels; channel++) {
+                    if (channel == outputChannel + 1) {
+                        blockBuildingDecoder.decodeIntoBlock(decoder, fieldBuilders.get(channel));
+                    }
+                    else {
+                        fieldBuilders.get(channel).appendNull();
+                    }
+                }
+            });
+        }
+
+        protected static int[] getIndexToChannel(List<Schema> schemas)
+        {
+            int[] indexToChannel = new int[schemas.size()];
+            int outputChannel = 0;
+            for (int i = 0; i < indexToChannel.length; i++) {
+                if (schemas.get(i).getType() == Schema.Type.NULL) {
+                    indexToChannel[i] = -1;
+                }
+                else {
+                    indexToChannel[i] = outputChannel++;
+                }
+            }
+            return indexToChannel;
+        }
+    }
+
+    private static class ReaderUnionCoercedIntoRowBlockBuildingDecoder
+            extends
+            BlockBuildingDecoder
+    {
+        private final BlockBuildingDecoder delegateBuilder;
+        private final int outputChannel;
+        private final int totalChannels;
+
+        public ReaderUnionCoercedIntoRowBlockBuildingDecoder(Resolver.ReaderUnion readerUnion, AvroTypeManager avroTypeManager)
+                throws AvroTypeException
+        {
+            requireNonNull(readerUnion, "readerUnion is null");
+            requireNonNull(avroTypeManager, "avroTypeManger is null");
+            int[] indexToChannel = WriterUnionCoercedIntoRowBlockBuildingDecoder.getIndexToChannel(readerUnion.reader.getTypes());
+            outputChannel = indexToChannel[readerUnion.firstMatch];
+            delegateBuilder = createBlockBuildingDecoderForAction(readerUnion.actualAction, avroTypeManager);
+            totalChannels = (int) IntStream.of(indexToChannel).filter(i -> i >= 0).count();
+        }
+
+        @Override
+        protected void decodeIntoBlock(Decoder decoder, BlockBuilder builder)
+                throws IOException
+        {
+            if (outputChannel < 0) {
+                // No outputChannel for Null schema in union, null out coerces struct
+                NullBlockBuildingDecoder.INSTANCE.decodeIntoBlock(decoder, builder);
+            }
+            else {
+                WriterUnionCoercedIntoRowBlockBuildingDecoder
+                        .makeSingleRowWithTagAndAllFieldsNullButOne(outputChannel, totalChannels, delegateBuilder, decoder, builder);
+            }
+        }
+    }
+
+    private static LongIoFunction<Decoder> getLongPromotionFunction(Schema writerSchema)
+            throws AvroTypeException
+    {
+        if (writerSchema.getType() == Schema.Type.INT) {
+            return Decoder::readInt;
+        }
+        throw new AvroTypeException("Cannot promote type %s to long".formatted(writerSchema.getType()));
+    }
+
+    private static FloatIoFunction<Decoder> getFloatPromotionFunction(Schema writerSchema)
+            throws AvroTypeException
+    {
+        return switch (writerSchema.getType()) {
+            case INT -> Decoder::readInt;
+            case LONG -> Decoder::readLong;
+            default -> throw new AvroTypeException("Cannot promote type %s to float".formatted(writerSchema.getType()));
+        };
+    }
+
+    private static DoubleIoFunction<Decoder> getDoublePromotionFunction(Schema writerSchema)
+            throws AvroTypeException
+    {
+        return switch (writerSchema.getType()) {
+            case INT -> Decoder::readInt;
+            case LONG -> Decoder::readLong;
+            case FLOAT -> Decoder::readFloat;
+            default -> throw new AvroTypeException("Cannot promote type %s to double".formatted(writerSchema.getType()));
+        };
+    }
+
+    @FunctionalInterface
+    private interface LongIoFunction<A>
+    {
+        long apply(A a)
+                throws IOException;
+    }
+
+    @FunctionalInterface
+    private interface FloatIoFunction<A>
+    {
+        float apply(A a)
+                throws IOException;
+    }
+
+    @FunctionalInterface
+    private interface DoubleIoFunction<A>
+    {
+        double apply(A a)
+                throws IOException;
+    }
+
+    @FunctionalInterface
+    private interface IoConsumer<A>
+    {
+        void accept(A a)
+                throws IOException;
+    }
+
+    // Avro supports default values for reader record fields that are missing in the writer schema
+    // the bytes representing the default field value are passed to a block building decoder
+    // so that it can pack the block appropriately for the default type.
+    private static IoConsumer<BlockBuilder> getDefaultBlockBuilder(Schema.Field field, AvroTypeManager typeManager)
+            throws AvroTypeException
+    {
+        BlockBuildingDecoder buildingDecoder = createBlockBuildingDecoderForAction(Resolver.resolve(field.schema(), field.schema()), typeManager);
+        byte[] defaultBytes = getDefaultByes(field);
+        BinaryDecoder reuse = DecoderFactory.get().binaryDecoder(defaultBytes, null);
+        return blockBuilder -> buildingDecoder.decodeIntoBlock(DecoderFactory.get().binaryDecoder(defaultBytes, reuse), blockBuilder);
+    }
+
+    private static byte[] getDefaultByes(Schema.Field field)
+            throws AvroTypeException
+    {
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            Encoder e = EncoderFactory.get().binaryEncoder(out, null);
+            ResolvingGrammarGenerator.encode(e, field.schema(), Accessor.defaultValue(field));
+            e.flush();
+            return out.toByteArray();
+        }
+        catch (IOException exception) {
+            throw new AvroTypeException("Unable to encode to bytes for default value in field " + field, exception);
+        }
+    }
+
+    /**
+     * Used for throwing {@link AvroTypeException} through interfaces that can not throw checked exceptions like DatumReader
+     */
+    protected static class UncheckedAvroTypeException
+            extends RuntimeException
+    {
+        private final AvroTypeException avroTypeException;
+
+        public UncheckedAvroTypeException(AvroTypeException cause)
+        {
+            super(requireNonNull(cause, "cause is null"));
+            avroTypeException = cause;
+        }
+
+        public AvroTypeException getAvroTypeException()
+        {
+            return avroTypeException;
+        }
+    }
+}
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroPagePositionDataWriter.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroPagePositionDataWriter.java
new file mode 100644
index 000000000000..07f10a691907
--- /dev/null
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroPagePositionDataWriter.java
@@ -0,0 +1,588 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import com.google.common.collect.ImmutableMap;
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.VarbinaryType;
+import org.apache.avro.Schema;
+import org.apache.avro.generic.GenericDatumWriter;
+import org.apache.avro.io.DatumWriter;
+import org.apache.avro.io.Encoder;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.IntFunction;
+import java.util.function.ToIntBiFunction;
+import java.util.function.ToLongBiFunction;
+import java.util.stream.IntStream;
+
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.hive.formats.avro.AvroTypeUtils.SimpleUnionNullIndex;
+import static io.trino.hive.formats.avro.AvroTypeUtils.getSimpleNullableUnionNullIndex;
+import static io.trino.hive.formats.avro.AvroTypeUtils.isSimpleNullableUnion;
+import static io.trino.hive.formats.avro.AvroTypeUtils.lowerCaseAllFieldsForWriter;
+import static io.trino.hive.formats.avro.AvroTypeUtils.unwrapNullableUnion;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TinyintType.TINYINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.util.Objects.requireNonNull;
+
+public class AvroPagePositionDataWriter
+        implements DatumWriter<Integer>
+{
+    private Page page;
+    private final Schema schema;
+    private final RecordBlockPositionEncoder pageBlockPositionEncoder;
+
+    public AvroPagePositionDataWriter(Schema schema, AvroTypeManager avroTypeManager, List<String> channelNames, List<Type> channelTypes)
+            throws AvroTypeException
+    {
+        this.schema = requireNonNull(schema, "schema is null");
+        pageBlockPositionEncoder = new RecordBlockPositionEncoder(schema, avroTypeManager, channelNames, channelTypes);
+        checkInvariants();
+    }
+
+    @Override
+    public void setSchema(Schema schema)
+    {
+        requireNonNull(schema, "schema is null");
+        if (this.schema != schema) {
+            verify(this.schema.equals(lowerCaseAllFieldsForWriter(schema)), "Unable to change schema for this data writer");
+        }
+    }
+
+    public void setPage(Page page)
+    {
+        this.page = requireNonNull(page, "page is null");
+        checkInvariants();
+        pageBlockPositionEncoder.setChannelBlocksFromPage(page);
+    }
+
+    private void checkInvariants()
+    {
+        verify(schema.getType() == Schema.Type.RECORD, "Can only write pages to record schema");
+        verify(page == null || page.getChannelCount() == schema.getFields().size(), "Page channel count must equal schema field count");
+    }
+
+    @Override
+    public void write(Integer position, Encoder encoder)
+            throws IOException
+    {
+        checkWritable();
+        if (position >= page.getPositionCount()) {
+            throw new IndexOutOfBoundsException("Position %s not within page with position count %s".formatted(position, page.getPositionCount()));
+        }
+        pageBlockPositionEncoder.encodePositionInEachChannel(position, encoder);
+    }
+
+    private void checkWritable()
+    {
+        checkState(page != null, "page must be set before beginning to write positions");
+    }
+
+    private abstract static class BlockPositionEncoder
+    {
+        protected Block block;
+        private final Optional<SimpleUnionNullIndex> nullIndex;
+
+        public BlockPositionEncoder(Optional<SimpleUnionNullIndex> nullIndex)
+        {
+            this.nullIndex = requireNonNull(nullIndex, "nullIdx is null");
+        }
+
+        abstract void encodeFromBlock(int position, Encoder encoder)
+                throws IOException;
+
+        void encode(int position, Encoder encoder)
+                throws IOException
+        {
+            checkState(block != null, "block must be set before calling encode");
+            boolean isNull = block.isNull(position);
+            if (isNull && nullIndex.isEmpty()) {
+                throw new IOException("Can not write null value for non-nullable schema");
+            }
+            if (nullIndex.isPresent()) {
+                encoder.writeIndex(isNull ? nullIndex.get().getIndex() : 1 ^ nullIndex.get().getIndex());
+            }
+            if (isNull) {
+                encoder.writeNull();
+            }
+            else {
+                encodeFromBlock(position, encoder);
+            }
+        }
+
+        void setBlock(Block block)
+        {
+            this.block = block;
+        }
+    }
+
+    private static BlockPositionEncoder createBlockPositionEncoder(Schema schema, AvroTypeManager avroTypeManager, Type type)
+            throws AvroTypeException
+    {
+        return createBlockPositionEncoder(schema, avroTypeManager, type, Optional.empty());
+    }
+
+    private static BlockPositionEncoder createBlockPositionEncoder(Schema schema, AvroTypeManager avroTypeManager, Type type, Optional<SimpleUnionNullIndex> nullIdx)
+            throws AvroTypeException
+    {
+        Optional<BiFunction<Block, Integer, Object>> overrideToAvroGenericObject = avroTypeManager.overrideBlockToAvroObject(schema, type);
+        if (overrideToAvroGenericObject.isPresent()) {
+            return new UserDefinedBlockPositionEncoder(nullIdx, schema, overrideToAvroGenericObject.get());
+        }
+        switch (schema.getType()) {
+            case NULL -> throw new AvroTypeException("No null support outside of union");
+            case BOOLEAN -> {
+                if (BOOLEAN.equals(type)) {
+                    return new BooleanBlockPositionEncoder(nullIdx);
+                }
+            }
+            case INT -> {
+                if (TINYINT.equals(type)) {
+                    return new IntBlockPositionEncoder(nullIdx, TINYINT::getByte);
+                }
+                if (SMALLINT.equals(type)) {
+                    return new IntBlockPositionEncoder(nullIdx, SMALLINT::getShort);
+                }
+                if (INTEGER.equals(type)) {
+                    return new IntBlockPositionEncoder(nullIdx, INTEGER::getInt);
+                }
+            }
+            case LONG -> {
+                if (TINYINT.equals(type)) {
+                    return new LongBlockPositionEncoder(nullIdx, TINYINT::getByte);
+                }
+                if (SMALLINT.equals(type)) {
+                    return new LongBlockPositionEncoder(nullIdx, SMALLINT::getShort);
+                }
+                if (INTEGER.equals(type)) {
+                    return new LongBlockPositionEncoder(nullIdx, INTEGER::getInt);
+                }
+                if (BIGINT.equals(type)) {
+                    return new LongBlockPositionEncoder(nullIdx, BIGINT::getLong);
+                }
+            }
+            case FLOAT -> {
+                if (REAL.equals(type)) {
+                    return new FloatBlockPositionEncoder(nullIdx);
+                }
+            }
+            case DOUBLE -> {
+                if (DOUBLE.equals(type)) {
+                    return new DoubleBlockPositionEncoder(nullIdx);
+                }
+            }
+            case STRING -> {
+                if (VARCHAR.equals(type)) {
+                    return new StringOrBytesPositionEncoder(nullIdx);
+                }
+            }
+            case BYTES -> {
+                if (VarbinaryType.VARBINARY.equals(type)) {
+                    return new StringOrBytesPositionEncoder(nullIdx);
+                }
+            }
+            case FIXED -> {
+                if (VarbinaryType.VARBINARY.equals(type)) {
+                    return new FixedBlockPositionEncoder(nullIdx, schema.getFixedSize());
+                }
+            }
+            case ENUM -> {
+                if (VARCHAR.equals(type)) {
+                    return new EnumBlockPositionEncoder(nullIdx, schema.getEnumSymbols());
+                }
+            }
+            case ARRAY -> {
+                if (type instanceof ArrayType arrayType) {
+                    return new ArrayBlockPositionEncoder(nullIdx, schema, avroTypeManager, arrayType);
+                }
+            }
+            case MAP -> {
+                if (type instanceof MapType mapType) {
+                    return new MapBlockPositionEncoder(nullIdx, schema, avroTypeManager, mapType);
+                }
+            }
+            case RECORD -> {
+                if (type instanceof RowType rowType) {
+                    return new RecordBlockPositionEncoder(nullIdx, schema, avroTypeManager, rowType);
+                }
+            }
+            case UNION -> {
+                if (isSimpleNullableUnion(schema)) {
+                    return createBlockPositionEncoder(unwrapNullableUnion(schema), avroTypeManager, type, Optional.of(getSimpleNullableUnionNullIndex(schema)));
+                }
+                else {
+                    throw new AvroTypeException("Unable to make writer for schema with non simple nullable union %s".formatted(schema));
+                }
+            }
+        }
+        throw new AvroTypeException("Schema and Trino Type mismatch between %s and %s".formatted(schema, type));
+    }
+
+    private static class BooleanBlockPositionEncoder
+            extends BlockPositionEncoder
+    {
+        public BooleanBlockPositionEncoder(Optional<SimpleUnionNullIndex> isNullWithIndex)
+        {
+            super(isNullWithIndex);
+        }
+
+        @Override
+        void encodeFromBlock(int position, Encoder encoder)
+                throws IOException
+        {
+            encoder.writeBoolean(BOOLEAN.getBoolean(block, position));
+        }
+    }
+
+    private static class IntBlockPositionEncoder
+            extends BlockPositionEncoder
+    {
+        private final ToIntBiFunction<Block, Integer> getInt;
+
+        public IntBlockPositionEncoder(Optional<SimpleUnionNullIndex> isNullWithIndex, ToIntBiFunction<Block, Integer> getInt)
+        {
+            super(isNullWithIndex);
+            this.getInt = requireNonNull(getInt, "getInt is null");
+        }
+
+        @Override
+        void encodeFromBlock(int position, Encoder encoder)
+                throws IOException
+        {
+            encoder.writeInt(getInt.applyAsInt(block, position));
+        }
+    }
+
+    private static class LongBlockPositionEncoder
+            extends BlockPositionEncoder
+    {
+        private final ToLongBiFunction<Block, Integer> getLong;
+
+        public LongBlockPositionEncoder(Optional<SimpleUnionNullIndex> isNullWithIndex, ToLongBiFunction<Block, Integer> getLong)
+        {
+            super(isNullWithIndex);
+            this.getLong = requireNonNull(getLong, "getLong is null");
+        }
+
+        @Override
+        void encodeFromBlock(int position, Encoder encoder)
+                throws IOException
+        {
+            encoder.writeLong(getLong.applyAsLong(block, position));
+        }
+    }
+
+    private static class FloatBlockPositionEncoder
+            extends BlockPositionEncoder
+    {
+        public FloatBlockPositionEncoder(Optional<SimpleUnionNullIndex> isNullWithIndex)
+        {
+            super(isNullWithIndex);
+        }
+
+        @Override
+        void encodeFromBlock(int position, Encoder encoder)
+                throws IOException
+        {
+            encoder.writeFloat(REAL.getFloat(block, position));
+        }
+    }
+
+    private static class DoubleBlockPositionEncoder
+            extends BlockPositionEncoder
+    {
+        public DoubleBlockPositionEncoder(Optional<SimpleUnionNullIndex> isNullWithIndex)
+        {
+            super(isNullWithIndex);
+        }
+
+        @Override
+        void encodeFromBlock(int position, Encoder encoder)
+                throws IOException
+        {
+            encoder.writeDouble(DOUBLE.getDouble(block, position));
+        }
+    }
+
+    private static class StringOrBytesPositionEncoder
+            extends BlockPositionEncoder
+    {
+        public StringOrBytesPositionEncoder(Optional<SimpleUnionNullIndex> isNullWithIndex)
+        {
+            super(isNullWithIndex);
+        }
+
+        @Override
+        void encodeFromBlock(int position, Encoder encoder)
+                throws IOException
+        {
+            int length = block.getSliceLength(position);
+            encoder.writeLong(length);
+            encoder.writeFixed(block.getSlice(position, 0, length).getBytes());
+        }
+    }
+
+    private static class FixedBlockPositionEncoder
+            extends BlockPositionEncoder
+    {
+        private final int fixedSize;
+
+        public FixedBlockPositionEncoder(Optional<SimpleUnionNullIndex> nullIdx, int fixedSize)
+        {
+            super(nullIdx);
+            this.fixedSize = fixedSize;
+        }
+
+        @Override
+        void encodeFromBlock(int position, Encoder encoder)
+                throws IOException
+        {
+            int length = block.getSliceLength(position);
+            if (length != fixedSize) {
+                throw new IOException("Unable to write Avro fixed with size %s from slice of length %s".formatted(fixedSize, length));
+            }
+            encoder.writeFixed(block.getSlice(position, 0, length).getBytes());
+        }
+    }
+
+    private static class EnumBlockPositionEncoder
+            extends BlockPositionEncoder
+    {
+        private final Map<Slice, Integer> symbolToIndex;
+
+        public EnumBlockPositionEncoder(Optional<SimpleUnionNullIndex> nullIdx, List<String> symbols)
+        {
+            super(nullIdx);
+            ImmutableMap.Builder<Slice, Integer> symbolToIndex = ImmutableMap.builder();
+            for (int i = 0; i < symbols.size(); i++) {
+                symbolToIndex.put(Slices.utf8Slice(symbols.get(i)), i);
+            }
+            this.symbolToIndex = symbolToIndex.buildOrThrow();
+        }
+
+        @Override
+        void encodeFromBlock(int position, Encoder encoder)
+                throws IOException
+        {
+            int length = block.getSliceLength(position);
+            Integer symbolIndex = symbolToIndex.get(block.getSlice(position, 0, length));
+            if (symbolIndex == null) {
+                throw new IOException("Unable to write Avro Enum symbol %s. Not found in set %s".formatted(
+                        block.getSlice(position, 0, length).toStringUtf8(),
+                        symbolToIndex.keySet().stream().map(Slice::toStringUtf8).toList()));
+            }
+            encoder.writeEnum(symbolIndex);
+        }
+    }
+
+    private static class ArrayBlockPositionEncoder
+            extends BlockPositionEncoder
+    {
+        private final BlockPositionEncoder elementBlockPositionEncoder;
+        private final ArrayType type;
+
+        public ArrayBlockPositionEncoder(Optional<SimpleUnionNullIndex> nullIdx, Schema schema, AvroTypeManager avroTypeManager, ArrayType type)
+                throws AvroTypeException
+        {
+            super(nullIdx);
+            verify(requireNonNull(schema, "schema is null").getType() == Schema.Type.ARRAY);
+            this.type = requireNonNull(type, "type is null");
+            elementBlockPositionEncoder = createBlockPositionEncoder(schema.getElementType(), avroTypeManager, type.getElementType());
+        }
+
+        @Override
+        void encodeFromBlock(int position, Encoder encoder)
+                throws IOException
+        {
+            Block elementBlock = type.getObject(block, position);
+            elementBlockPositionEncoder.setBlock(elementBlock);
+            int size = elementBlock.getPositionCount();
+            encoder.writeArrayStart();
+            encoder.setItemCount(size);
+            for (int itemPos = 0; itemPos < size; itemPos++) {
+                encoder.startItem();
+                elementBlockPositionEncoder.encode(itemPos, encoder);
+            }
+            encoder.writeArrayEnd();
+        }
+    }
+
+    private static class MapBlockPositionEncoder
+            extends BlockPositionEncoder
+    {
+        private final BlockPositionEncoder keyBlockPositionEncoder = new StringOrBytesPositionEncoder(Optional.empty());
+        private final BlockPositionEncoder valueBlockPositionEncoder;
+        private final MapType type;
+
+        public MapBlockPositionEncoder(Optional<SimpleUnionNullIndex> nullIdx, Schema schema, AvroTypeManager avroTypeManager, MapType type)
+                throws AvroTypeException
+        {
+            super(nullIdx);
+            verify(requireNonNull(schema, "schema is null").getType() == Schema.Type.MAP);
+            this.type = requireNonNull(type, "type is null");
+            if (!VARCHAR.equals(this.type.getKeyType())) {
+                throw new AvroTypeException("Avro Maps must have String keys, invalid type: %s".formatted(this.type.getKeyType()));
+            }
+            valueBlockPositionEncoder = createBlockPositionEncoder(schema.getValueType(), avroTypeManager, type.getValueType());
+        }
+
+        @Override
+        void encodeFromBlock(int position, Encoder encoder)
+                throws IOException
+        {
+            SqlMap sqlMap = type.getObject(block, position);
+            keyBlockPositionEncoder.setBlock(sqlMap.getRawKeyBlock());
+            valueBlockPositionEncoder.setBlock(sqlMap.getRawValueBlock());
+            encoder.writeMapStart();
+            encoder.setItemCount(sqlMap.getSize());
+
+            int rawOffset = sqlMap.getRawOffset();
+            for (int i = 0; i < sqlMap.getSize(); i++) {
+                encoder.startItem();
+                keyBlockPositionEncoder.encode(rawOffset + i, encoder);
+                valueBlockPositionEncoder.encode(rawOffset + i, encoder);
+            }
+            encoder.writeMapEnd();
+        }
+    }
+
+    private static class RecordBlockPositionEncoder
+            extends BlockPositionEncoder
+    {
+        private final RowType type;
+        private final BlockPositionEncoder[] channelEncoders;
+        private final int[] fieldToChannel;
+
+        // used only for nested row building
+        public RecordBlockPositionEncoder(Optional<SimpleUnionNullIndex> nullIdx, Schema schema, AvroTypeManager avroTypeManager, RowType rowType)
+                throws AvroTypeException
+        {
+            this(nullIdx,
+                    schema,
+                    avroTypeManager,
+                    rowType.getFields().stream()
+                            .map(RowType.Field::getName)
+                            .map(optName -> optName.orElseThrow(() -> new IllegalArgumentException("Unable to use nested anonymous row type for avro writing")))
+                            .collect(toImmutableList()),
+                    rowType.getFields().stream()
+                            .map(RowType.Field::getType)
+                            .collect(toImmutableList()));
+        }
+
+        // used only for top level page building
+        public RecordBlockPositionEncoder(Schema schema, AvroTypeManager avroTypeManager, List<String> channelNames, List<Type> channelTypes)
+                throws AvroTypeException
+        {
+            this(Optional.empty(), schema, avroTypeManager, channelNames, channelTypes);
+        }
+
+        private RecordBlockPositionEncoder(Optional<SimpleUnionNullIndex> nullIdx, Schema schema, AvroTypeManager avroTypeManager, List<String> channelNames, List<Type> channelTypes)
+                throws AvroTypeException
+        {
+            super(nullIdx);
+            type = RowType.anonymous(requireNonNull(channelTypes, "channelTypes is null"));
+            verify(requireNonNull(schema, "schema is null").getType() == Schema.Type.RECORD);
+            verify(schema.getFields().size() == channelTypes.size(), "Must have channel for each record field");
+            verify(requireNonNull(channelNames, "channelNames is null").size() == channelTypes.size(), "Must provide names for all channels");
+            fieldToChannel = new int[schema.getFields().size()];
+            channelEncoders = new BlockPositionEncoder[schema.getFields().size()];
+            for (int i = 0; i < channelNames.size(); i++) {
+                String fieldName = channelNames.get(i);
+                Schema.Field avroField = requireNonNull(schema.getField(fieldName), "no field with name %s in schema %s".formatted(fieldName, schema));
+                fieldToChannel[avroField.pos()] = i;
+                channelEncoders[i] = createBlockPositionEncoder(avroField.schema(), avroTypeManager, channelTypes.get(i));
+            }
+            verify(IntStream.of(fieldToChannel).sum() == (schema.getFields().size() * (schema.getFields().size() - 1) / 2), "all channels must be accounted for");
+        }
+
+        // Used only for nested rows
+        @Override
+        void encodeFromBlock(int position, Encoder encoder)
+                throws IOException
+        {
+            SqlRow sqlRow = type.getObject(block, position);
+            for (int i = 0; i < channelEncoders.length; i++) {
+                channelEncoders[i].setBlock(sqlRow.getRawFieldBlock(i));
+            }
+            int rawIndex = sqlRow.getRawIndex();
+            encodeInternal(i -> rawIndex, encoder);
+        }
+
+        public void setChannelBlocksFromPage(Page page)
+        {
+            verify(page.getChannelCount() == channelEncoders.length, "Page must have channels equal to provided type list");
+            for (int channel = 0; channel < page.getChannelCount(); channel++) {
+                channelEncoders[channel].setBlock(page.getBlock(channel));
+            }
+        }
+
+        public void encodePositionInEachChannel(int position, Encoder encoder)
+                throws IOException
+        {
+            encodeInternal(ignore -> position, encoder);
+        }
+
+        private void encodeInternal(IntFunction<Integer> channelToPosition, Encoder encoder)
+                throws IOException
+        {
+            for (int channel : fieldToChannel) {
+                BlockPositionEncoder channelEncoder = channelEncoders[channel];
+                channelEncoder.encode(channelToPosition.apply(channel), encoder);
+            }
+        }
+    }
+
+    private static class UserDefinedBlockPositionEncoder
+            extends BlockPositionEncoder
+    {
+        private final GenericDatumWriter<Object> datumWriter;
+        private final BiFunction<Block, Integer, Object> toAvroGeneric;
+
+        public UserDefinedBlockPositionEncoder(Optional<SimpleUnionNullIndex> nullIdx, Schema schema, BiFunction<Block, Integer, Object> toAvroGeneric)
+        {
+            super(nullIdx);
+            datumWriter = new GenericDatumWriter<>(requireNonNull(schema, "schema is null"));
+            this.toAvroGeneric = requireNonNull(toAvroGeneric, "toAvroGeneric is null");
+        }
+
+        @Override
+        void encodeFromBlock(int position, Encoder encoder)
+                throws IOException
+        {
+            datumWriter.write(toAvroGeneric.apply(block, position), encoder);
+        }
+    }
+}
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroTypeException.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroTypeException.java
new file mode 100644
index 000000000000..e2c1ca12866c
--- /dev/null
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroTypeException.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+public class AvroTypeException
+        extends Exception
+{
+    public AvroTypeException(org.apache.avro.AvroTypeException runtimeAvroTypeException)
+    {
+        super(runtimeAvroTypeException);
+    }
+
+    public AvroTypeException(String message)
+    {
+        super(message);
+    }
+
+    public AvroTypeException(String message, Throwable cause)
+    {
+        super(message, cause);
+    }
+}
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroTypeManager.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroTypeManager.java
new file mode 100644
index 000000000000..0bf5d8f90b76
--- /dev/null
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroTypeManager.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.Type;
+import org.apache.avro.Schema;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+
+public interface AvroTypeManager
+{
+    /**
+     * Called when the type manager is reading out data from a data file such as in {@link AvroFileReader}
+     *
+     * @param fileMetadata metadata from the file header
+     */
+    void configure(Map<String, byte[]> fileMetadata);
+
+    Optional<Type> overrideTypeForSchema(Schema schema)
+            throws AvroTypeException;
+
+    /**
+     * Object provided by FasterReader's deserialization with no conversions.
+     * Object class determined by Avro's standard generic data process
+     * BlockBuilder provided by Type returned above for the schema
+     * Possible to override for each primitive type as well.
+     */
+    Optional<BiConsumer<BlockBuilder, Object>> overrideBuildingFunctionForSchema(Schema schema)
+            throws AvroTypeException;
+
+    /**
+     * Extract and convert the object from the given block at the given position and return the Avro Generic Data forum.
+     * Type is either provided explicitly to the writer or derived from the schema using this interface.
+     */
+    Optional<BiFunction<Block, Integer, Object>> overrideBlockToAvroObject(Schema schema, Type type)
+            throws AvroTypeException;
+}
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroTypeUtils.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroTypeUtils.java
new file mode 100644
index 000000000000..659a16a508a7
--- /dev/null
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/AvroTypeUtils.java
@@ -0,0 +1,163 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.BigintType;
+import io.trino.spi.type.BooleanType;
+import io.trino.spi.type.DoubleType;
+import io.trino.spi.type.IntegerType;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RealType;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
+import io.trino.spi.type.VarbinaryType;
+import io.trino.spi.type.VarcharType;
+import org.apache.avro.Schema;
+
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.MoreCollectors.onlyElement;
+import static io.trino.hive.formats.UnionToRowCoercionUtils.rowTypeForUnionOfTypes;
+import static java.util.function.Predicate.not;
+
+public final class AvroTypeUtils
+{
+    private AvroTypeUtils() {}
+
+    public static Type typeFromAvro(Schema schema, AvroTypeManager avroTypeManager)
+            throws AvroTypeException
+    {
+        return typeFromAvro(schema, avroTypeManager, new HashSet<>());
+    }
+
+    private static Type typeFromAvro(final Schema schema, AvroTypeManager avroTypeManager, Set<Schema> enclosingRecords)
+            throws AvroTypeException
+    {
+        Optional<Type> customType = avroTypeManager.overrideTypeForSchema(schema);
+        if (customType.isPresent()) {
+            return customType.get();
+        }
+        return switch (schema.getType()) {
+            case NULL -> throw new UnsupportedOperationException("No null column type support");
+            case BOOLEAN -> BooleanType.BOOLEAN;
+            case INT -> IntegerType.INTEGER;
+            case LONG -> BigintType.BIGINT;
+            case FLOAT -> RealType.REAL;
+            case DOUBLE -> DoubleType.DOUBLE;
+            case ENUM, STRING -> VarcharType.VARCHAR;
+            case FIXED, BYTES -> VarbinaryType.VARBINARY;
+            case ARRAY -> new ArrayType(typeFromAvro(schema.getElementType(), avroTypeManager, enclosingRecords));
+            case MAP -> new MapType(VarcharType.VARCHAR, typeFromAvro(schema.getValueType(), avroTypeManager, enclosingRecords), new TypeOperators());
+            case RECORD -> {
+                if (!enclosingRecords.add(schema)) {
+                    throw new UnsupportedOperationException("Unable to represent recursive avro schemas in Trino Type form");
+                }
+                ImmutableList.Builder<RowType.Field> rowFieldTypes = ImmutableList.builder();
+                for (Schema.Field field : schema.getFields()) {
+                    rowFieldTypes.add(new RowType.Field(Optional.of(field.name()), typeFromAvro(field.schema(), avroTypeManager, new HashSet<>(enclosingRecords))));
+                }
+                yield RowType.from(rowFieldTypes.build());
+            }
+            case UNION -> {
+                if (isSimpleNullableUnion(schema)) {
+                    yield typeFromAvro(unwrapNullableUnion(schema), avroTypeManager, enclosingRecords);
+                }
+                else {
+                    yield rowTypeForUnion(schema, avroTypeManager, enclosingRecords);
+                }
+            }
+        };
+    }
+
+    static boolean isSimpleNullableUnion(Schema schema)
+    {
+        verify(schema.isUnion(), "Schema must be union");
+        return schema.getTypes().stream().filter(not(Schema::isNullable)).count() == 1L;
+    }
+
+    static Schema unwrapNullableUnion(Schema schema)
+    {
+        verify(schema.isUnion(), "Schema must be union");
+        verify(schema.isNullable() && schema.getTypes().size() == 2);
+        return schema.getTypes().stream().filter(not(Schema::isNullable)).collect(onlyElement());
+    }
+
+    private static RowType rowTypeForUnion(Schema schema, AvroTypeManager avroTypeManager, Set<Schema> enclosingRecords)
+            throws AvroTypeException
+    {
+        verify(schema.isUnion());
+        ImmutableList.Builder<Type> unionTypes = ImmutableList.builder();
+        for (Schema variant : schema.getTypes()) {
+            if (!variant.isNullable()) {
+                unionTypes.add(typeFromAvro(variant, avroTypeManager, enclosingRecords));
+            }
+        }
+        return rowTypeForUnionOfTypes(unionTypes.build());
+    }
+
+    public static SimpleUnionNullIndex getSimpleNullableUnionNullIndex(Schema schema)
+    {
+        verify(schema.isUnion(), "Schema must be union");
+        verify(schema.isNullable() && schema.getTypes().size() == 2, "Invalid null union: %s", schema);
+        return schema.getTypes().get(0).getType() == Schema.Type.NULL ? SimpleUnionNullIndex.ZERO : SimpleUnionNullIndex.ONE;
+    }
+
+    enum SimpleUnionNullIndex
+    {
+        ZERO(0),
+        ONE(1);
+        private final int index;
+
+        SimpleUnionNullIndex(int index)
+        {
+            this.index = index;
+        }
+
+        public int getIndex()
+        {
+            return index;
+        }
+    }
+
+    static Schema lowerCaseAllFieldsForWriter(Schema schema)
+    {
+        return switch (schema.getType()) {
+            case RECORD ->
+                Schema.createRecord(
+                        schema.getName(),
+                        schema.getDoc(),
+                        schema.getNamespace(),
+                        schema.isError(),
+                        schema.getFields().stream()
+                                .map(field -> new Schema.Field(
+                                        field.name().toLowerCase(Locale.ENGLISH),
+                                        lowerCaseAllFieldsForWriter(field.schema()),
+                                        field.doc()))// Can ignore field default because only used on read path and opens the opportunity for invalid default errors
+                                .collect(toImmutableList()));
+
+            case ARRAY -> Schema.createArray(lowerCaseAllFieldsForWriter(schema.getElementType()));
+            case MAP -> Schema.createMap(lowerCaseAllFieldsForWriter(schema.getValueType()));
+            case UNION -> Schema.createUnion(schema.getTypes().stream().map(AvroTypeUtils::lowerCaseAllFieldsForWriter).collect(toImmutableList()));
+            case NULL, BOOLEAN, INT, LONG, FLOAT, DOUBLE, STRING, BYTES, FIXED, ENUM -> schema;
+        };
+    }
+}
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/NativeLogicalTypesAvroTypeManager.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/NativeLogicalTypesAvroTypeManager.java
new file mode 100644
index 000000000000..8c61632a4e77
--- /dev/null
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/avro/NativeLogicalTypesAvroTypeManager.java
@@ -0,0 +1,550 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import com.google.common.base.VerifyException;
+import com.google.common.primitives.Longs;
+import io.airlift.log.Logger;
+import io.airlift.slice.Slice;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.DateType;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.Int128;
+import io.trino.spi.type.SqlTimestamp;
+import io.trino.spi.type.TimeType;
+import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.Timestamps;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.UuidType;
+import org.apache.avro.LogicalType;
+import org.apache.avro.LogicalTypes;
+import org.apache.avro.Schema;
+import org.apache.avro.SchemaBuilder;
+import org.apache.avro.generic.GenericData;
+import org.apache.avro.generic.GenericFixed;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+import static com.google.common.base.Verify.verify;
+import static io.trino.spi.type.Timestamps.roundDiv;
+import static io.trino.spi.type.UuidType.javaUuidToTrinoUuid;
+import static io.trino.spi.type.UuidType.trinoUuidToJavaUuid;
+import static java.util.Objects.requireNonNull;
+import static org.apache.avro.LogicalTypes.fromSchemaIgnoreInvalid;
+
+/**
+ * An implementation that translates Avro Standard Logical types into Trino SPI types
+ */
+public class NativeLogicalTypesAvroTypeManager
+        implements AvroTypeManager
+{
+    private static final Logger log = Logger.get(NativeLogicalTypesAvroTypeManager.class);
+
+    public static final Schema TIMESTAMP_MILLIS_SCHEMA;
+    public static final Schema TIMESTAMP_MICROS_SCHEMA;
+    public static final Schema DATE_SCHEMA;
+    public static final Schema TIME_MILLIS_SCHEMA;
+    public static final Schema TIME_MICROS_SCHEMA;
+    public static final Schema UUID_SCHEMA;
+
+    // Copied from org.apache.avro.LogicalTypes
+    protected static final String DECIMAL = "decimal";
+    protected static final String UUID = "uuid";
+    protected static final String DATE = "date";
+    protected static final String TIME_MILLIS = "time-millis";
+    protected static final String TIME_MICROS = "time-micros";
+    protected static final String TIMESTAMP_MILLIS = "timestamp-millis";
+    protected static final String TIMESTAMP_MICROS = "timestamp-micros";
+    protected static final String LOCAL_TIMESTAMP_MILLIS = "local-timestamp-millis";
+    protected static final String LOCAL_TIMESTAMP_MICROS = "local-timestamp-micros";
+
+    static {
+        TIMESTAMP_MILLIS_SCHEMA = SchemaBuilder.builder().longType();
+        LogicalTypes.timestampMillis().addToSchema(TIMESTAMP_MILLIS_SCHEMA);
+        TIMESTAMP_MICROS_SCHEMA = SchemaBuilder.builder().longType();
+        LogicalTypes.timestampMicros().addToSchema(TIMESTAMP_MICROS_SCHEMA);
+        DATE_SCHEMA = Schema.create(Schema.Type.INT);
+        LogicalTypes.date().addToSchema(DATE_SCHEMA);
+        TIME_MILLIS_SCHEMA = Schema.create(Schema.Type.INT);
+        LogicalTypes.timeMillis().addToSchema(TIME_MILLIS_SCHEMA);
+        TIME_MICROS_SCHEMA = Schema.create(Schema.Type.LONG);
+        LogicalTypes.timeMicros().addToSchema(TIME_MICROS_SCHEMA);
+        UUID_SCHEMA = Schema.create(Schema.Type.STRING);
+        LogicalTypes.uuid().addToSchema(UUID_SCHEMA);
+    }
+
+    @Override
+    public void configure(Map<String, byte[]> fileMetadata) {}
+
+    @Override
+    public Optional<Type> overrideTypeForSchema(Schema schema)
+            throws AvroTypeException
+    {
+        return validateAndLogIssues(schema).map(NativeLogicalTypesAvroTypeManager::getAvroLogicalTypeSpiType);
+    }
+
+    @Override
+    public Optional<BiConsumer<BlockBuilder, Object>> overrideBuildingFunctionForSchema(Schema schema)
+            throws AvroTypeException
+    {
+        return validateAndLogIssues(schema).map(logicalType -> getLogicalTypeBuildingFunction(logicalType, schema));
+    }
+
+    @Override
+    public Optional<BiFunction<Block, Integer, Object>> overrideBlockToAvroObject(Schema schema, Type type)
+            throws AvroTypeException
+    {
+        Optional<LogicalType> logicalType = validateAndLogIssues(schema);
+        if (logicalType.isEmpty()) {
+            return Optional.empty();
+        }
+        return Optional.of(getAvroFunction(logicalType.get(), schema, type));
+    }
+
+    private static Type getAvroLogicalTypeSpiType(LogicalType logicalType)
+    {
+        return switch (logicalType.getName()) {
+            case TIMESTAMP_MILLIS -> TimestampType.TIMESTAMP_MILLIS;
+            case TIMESTAMP_MICROS -> TimestampType.TIMESTAMP_MICROS;
+            case DECIMAL -> {
+                LogicalTypes.Decimal decimal = (LogicalTypes.Decimal) logicalType;
+                yield DecimalType.createDecimalType(decimal.getPrecision(), decimal.getScale());
+            }
+            case DATE -> DateType.DATE;
+            case TIME_MILLIS -> TimeType.TIME_MILLIS;
+            case TIME_MICROS -> TimeType.TIME_MICROS;
+            case UUID -> UuidType.UUID;
+            default -> throw new IllegalStateException("Unreachable unfiltered logical type");
+        };
+    }
+
+    private static BiConsumer<BlockBuilder, Object> getLogicalTypeBuildingFunction(LogicalType logicalType, Schema schema)
+    {
+        return switch (logicalType.getName()) {
+            case TIMESTAMP_MILLIS -> {
+                if (schema.getType() == Schema.Type.LONG) {
+                    yield (builder, obj) -> {
+                        Long l = (Long) obj;
+                        TimestampType.TIMESTAMP_MILLIS.writeLong(builder, l * Timestamps.MICROSECONDS_PER_MILLISECOND);
+                    };
+                }
+                throw new IllegalStateException("Unreachable unfiltered logical type");
+            }
+            case TIMESTAMP_MICROS -> {
+                if (schema.getType() == Schema.Type.LONG) {
+                    yield (builder, obj) -> {
+                        Long l = (Long) obj;
+                        TimestampType.TIMESTAMP_MICROS.writeLong(builder, l);
+                    };
+                }
+                throw new IllegalStateException("Unreachable unfiltered logical type");
+            }
+            case DECIMAL -> {
+                LogicalTypes.Decimal decimal = (LogicalTypes.Decimal) logicalType;
+                DecimalType decimalType = DecimalType.createDecimalType(decimal.getPrecision(), decimal.getScale());
+                Function<Object, byte[]> byteExtract = switch (schema.getType()) {
+                    case BYTES -> // This is only safe because we don't reuse byte buffer objects which means each gets sized exactly for the bytes contained
+                            (obj) -> ((ByteBuffer) obj).array();
+                    case FIXED -> (obj) -> ((GenericFixed) obj).bytes();
+                    default -> throw new IllegalStateException("Unreachable unfiltered logical type");
+                };
+                if (decimalType.isShort()) {
+                    yield (builder, obj) -> decimalType.writeLong(builder, fromBigEndian(byteExtract.apply(obj)));
+                }
+                else {
+                    yield (builder, obj) -> decimalType.writeObject(builder, Int128.fromBigEndian(byteExtract.apply(obj)));
+                }
+            }
+            case DATE -> {
+                if (schema.getType() == Schema.Type.INT) {
+                    yield (builder, obj) -> {
+                        Integer i = (Integer) obj;
+                        DateType.DATE.writeLong(builder, i.longValue());
+                    };
+                }
+                throw new IllegalStateException("Unreachable unfiltered logical type");
+            }
+            case TIME_MILLIS -> {
+                if (schema.getType() == Schema.Type.INT) {
+                    yield (builder, obj) -> {
+                        Integer i = (Integer) obj;
+                        TimeType.TIME_MILLIS.writeLong(builder, i.longValue() * Timestamps.PICOSECONDS_PER_MILLISECOND);
+                    };
+                }
+                throw new IllegalStateException("Unreachable unfiltered logical type");
+            }
+            case TIME_MICROS -> {
+                if (schema.getType() == Schema.Type.LONG) {
+                    yield (builder, obj) -> {
+                        Long i = (Long) obj;
+                        TimeType.TIME_MICROS.writeLong(builder, i * Timestamps.PICOSECONDS_PER_MICROSECOND);
+                    };
+                }
+                throw new IllegalStateException("Unreachable unfiltered logical type");
+            }
+            case UUID -> {
+                if (schema.getType() == Schema.Type.STRING) {
+                    yield (builder, obj) -> UuidType.UUID.writeSlice(builder, javaUuidToTrinoUuid(java.util.UUID.fromString(obj.toString())));
+                }
+                throw new IllegalStateException("Unreachable unfiltered logical type");
+            }
+            default -> throw new IllegalStateException("Unreachable unfiltered logical type");
+        };
+    }
+
+    private static BiFunction<Block, Integer, Object> getAvroFunction(LogicalType logicalType, Schema schema, Type type)
+            throws AvroTypeException
+    {
+        return switch (logicalType.getName()) {
+            case TIMESTAMP_MILLIS -> {
+                if (!(type instanceof TimestampType timestampType)) {
+                    throw new AvroTypeException("Can't represent Avro logical type %s with Trino Type %s".formatted(logicalType.getName(), type));
+                }
+                if (timestampType.isShort()) {
+                    yield (block, integer) -> timestampType.getLong(block, integer) / Timestamps.MICROSECONDS_PER_MILLISECOND;
+                }
+                else {
+                    yield ((block, integer) ->
+                    {
+                        SqlTimestamp timestamp = (SqlTimestamp) timestampType.getObject(block, integer);
+                        return timestamp.roundTo(3).getMillis();
+                    });
+                }
+            }
+            case TIMESTAMP_MICROS -> {
+                if (!(type instanceof TimestampType timestampType)) {
+                    throw new AvroTypeException("Can't represent Avro logical type %s with Trino Type %s".formatted(logicalType.getName(), type));
+                }
+                if (timestampType.isShort()) {
+                    // Don't use method reference because it causes an NPE in errorprone
+                    yield (block, position) -> timestampType.getLong(block, position);
+                }
+                else {
+                    yield ((block, position) ->
+                    {
+                        SqlTimestamp timestamp = (SqlTimestamp) timestampType.getObject(block, position);
+                        return timestamp.roundTo(6).getEpochMicros();
+                    });
+                }
+            }
+            case DECIMAL -> {
+                DecimalType decimalType = (DecimalType) getAvroLogicalTypeSpiType(logicalType);
+                Function<byte[], Object> wrapBytes = switch (schema.getType()) {
+                    case BYTES -> ByteBuffer::wrap;
+                    case FIXED -> bytes -> new GenericData.Fixed(schema, fitBigEndianValueToByteArraySize(bytes, schema.getFixedSize()));
+                    default -> throw new VerifyException("Unreachable unfiltered logical type");
+                };
+                if (decimalType.isShort()) {
+                    yield (block, pos) -> wrapBytes.apply(Longs.toByteArray(decimalType.getLong(block, pos)));
+                }
+                else {
+                    yield (block, pos) -> wrapBytes.apply(((Int128) decimalType.getObject(block, pos)).toBigEndianBytes());
+                }
+            }
+            case DATE -> {
+                if (type != DateType.DATE) {
+                    throw new AvroTypeException("Can't represent Avro logical type %s with Trino Type %s".formatted(logicalType.getName(), type));
+                }
+                yield DateType.DATE::getLong;
+            }
+            case TIME_MILLIS -> {
+                if (!(type instanceof TimeType timeType)) {
+                    throw new AvroTypeException("Can't represent Avro logical type %s with Trino Type %s".formatted(logicalType.getName(), type));
+                }
+                if (timeType.getPrecision() > 3) {
+                    throw new AvroTypeException("Can't write out Avro logical time-millis from Trino Time Type with precision %s".formatted(timeType.getPrecision()));
+                }
+                yield (block, pos) -> roundDiv(timeType.getLong(block, pos), Timestamps.PICOSECONDS_PER_MILLISECOND);
+            }
+            case TIME_MICROS -> {
+                if (!(type instanceof TimeType timeType)) {
+                    throw new AvroTypeException("Can't represent Avro logical type %s with Trino Type %s".formatted(logicalType.getName(), type));
+                }
+                if (timeType.getPrecision() > 6) {
+                    throw new AvroTypeException("Can't write out Avro logical time-millis from Trino Time Type with precision %s".formatted(timeType.getPrecision()));
+                }
+                yield (block, pos) -> roundDiv(timeType.getLong(block, pos), Timestamps.PICOSECONDS_PER_MICROSECOND);
+            }
+            case UUID -> {
+                if (!(type instanceof UuidType uuidType)) {
+                    throw new AvroTypeException("Can't represent Avro logical type %s with Trino Type %s".formatted(logicalType.getName(), type));
+                }
+                yield (block, pos) -> trinoUuidToJavaUuid((Slice) uuidType.getObject(block, pos)).toString();
+            }
+            default -> throw new VerifyException("Unreachable unfiltered logical type");
+        };
+    }
+
+    private Optional<LogicalType> validateAndLogIssues(Schema schema)
+    {
+        // TODO replace with switch sealed class syntax when stable
+        ValidateLogicalTypeResult logicalTypeResult = validateLogicalType(schema);
+        if (logicalTypeResult instanceof NoLogicalType ignored) {
+            return Optional.empty();
+        }
+        if (logicalTypeResult instanceof NonNativeAvroLogicalType ignored) {
+            log.debug("Unrecognized logical type " + schema);
+            return Optional.empty();
+        }
+        if (logicalTypeResult instanceof InvalidNativeAvroLogicalType invalidNativeAvroLogicalType) {
+            log.debug(invalidNativeAvroLogicalType.getCause(), "Invalidly configured native Avro logical type");
+            return Optional.empty();
+        }
+        if (logicalTypeResult instanceof ValidNativeAvroLogicalType validNativeAvroLogicalType) {
+            return Optional.of(validNativeAvroLogicalType.getLogicalType());
+        }
+        throw new IllegalStateException("Unhandled validate logical type result");
+    }
+
+    protected static ValidateLogicalTypeResult validateLogicalType(Schema schema)
+    {
+        final String typeName = schema.getProp(LogicalType.LOGICAL_TYPE_PROP);
+        if (typeName == null) {
+            return new NoLogicalType();
+        }
+        LogicalType logicalType;
+        switch (typeName) {
+            case TIMESTAMP_MILLIS, TIMESTAMP_MICROS, DECIMAL, DATE, TIME_MILLIS, TIME_MICROS, UUID:
+                logicalType = fromSchemaIgnoreInvalid(schema);
+                break;
+            case LOCAL_TIMESTAMP_MICROS + LOCAL_TIMESTAMP_MILLIS:
+                log.debug("Logical type " + typeName + " not currently supported by by Trino");
+                // fall through
+            default:
+                return new NonNativeAvroLogicalType(typeName);
+        }
+        // make sure the type is valid before returning it
+        if (logicalType != null) {
+            try {
+                logicalType.validate(schema);
+            }
+            catch (RuntimeException e) {
+                return new InvalidNativeAvroLogicalType(typeName, e);
+            }
+            return new ValidNativeAvroLogicalType(logicalType);
+        }
+        else {
+            return new NonNativeAvroLogicalType(typeName);
+        }
+    }
+
+    protected abstract static sealed class ValidateLogicalTypeResult
+            permits NoLogicalType, NonNativeAvroLogicalType, InvalidNativeAvroLogicalType, ValidNativeAvroLogicalType {}
+
+    protected static final class NoLogicalType
+            extends ValidateLogicalTypeResult {}
+
+    protected static final class NonNativeAvroLogicalType
+            extends ValidateLogicalTypeResult
+    {
+        private final String logicalTypeName;
+
+        public NonNativeAvroLogicalType(String logicalTypeName)
+        {
+            this.logicalTypeName = requireNonNull(logicalTypeName, "logicalTypeName is null");
+        }
+
+        public String getLogicalTypeName()
+        {
+            return logicalTypeName;
+        }
+    }
+
+    protected static final class InvalidNativeAvroLogicalType
+            extends ValidateLogicalTypeResult
+    {
+        private final String logicalTypeName;
+        private final RuntimeException cause;
+
+        public InvalidNativeAvroLogicalType(String logicalTypeName, RuntimeException cause)
+        {
+            this.logicalTypeName = requireNonNull(logicalTypeName, "logicalTypeName");
+            this.cause = requireNonNull(cause, "cause is null");
+        }
+
+        public String getLogicalTypeName()
+        {
+            return logicalTypeName;
+        }
+
+        public RuntimeException getCause()
+        {
+            return cause;
+        }
+    }
+
+    protected static final class ValidNativeAvroLogicalType
+            extends ValidateLogicalTypeResult
+    {
+        private final LogicalType logicalType;
+
+        public ValidNativeAvroLogicalType(LogicalType logicalType)
+        {
+            this.logicalType = requireNonNull(logicalType, "logicalType is null");
+        }
+
+        public LogicalType getLogicalType()
+        {
+            return logicalType;
+        }
+    }
+
+    private static final VarHandle BIG_ENDIAN_LONG_VIEW = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.BIG_ENDIAN);
+
+    /**
+     * Decode a long from the two's complement big-endian representation.
+     *
+     * @param bytes the two's complement big-endian encoding of the number. It must contain at least 1 byte.
+     * It may contain more than 8 bytes if the leading bytes are not significant (either zeros or -1)
+     * @throws ArithmeticException if the bytes represent a number outside the range [-2^63, 2^63 - 1]
+     */
+    // Styled from io.trino.spi.type.Int128.fromBigEndian
+    public static long fromBigEndian(byte[] bytes)
+    {
+        if (bytes.length > 8) {
+            int offset = bytes.length - Long.BYTES;
+            long res = (long) BIG_ENDIAN_LONG_VIEW.get(bytes, offset);
+            // verify that the significant bits above 64 bits are proper sign extension
+            int expectedSignExtensionByte = (int) (res >> 63);
+            for (int i = 0; i < offset; i++) {
+                if (bytes[i] != expectedSignExtensionByte) {
+                    throw new ArithmeticException("Overflow");
+                }
+            }
+            return res;
+        }
+        if (bytes.length == 8) {
+            return (long) BIG_ENDIAN_LONG_VIEW.get(bytes, 0);
+        }
+        long res = (bytes[0] >> 7);
+        for (byte b : bytes) {
+            res = (res << 8) | (b & 0xFF);
+        }
+        return res;
+    }
+
+    public static byte[] fitBigEndianValueToByteArraySize(long value, int byteSize)
+    {
+        return fitBigEndianValueToByteArraySize(Longs.toByteArray(value), byteSize);
+    }
+
+    public static byte[] fitBigEndianValueToByteArraySize(Int128 value, int byteSize)
+    {
+        return fitBigEndianValueToByteArraySize(value.toBigEndianBytes(), byteSize);
+    }
+
+    /**
+     * Will resize big endian bytes to a desired array length while preserving the represented value.
+     *
+     * @throws ArithmeticException if conversion is not possible
+     */
+    public static byte[] fitBigEndianValueToByteArraySize(byte[] value, int byteSize)
+    {
+        if (value.length == byteSize) {
+            return value;
+        }
+        if (value.length < byteSize) {
+            return padBigEndianToSize(value, byteSize);
+        }
+        if (canBigEndianValueBeRepresentedBySmallerByteSize(value, byteSize)) {
+            byte[] dest = new byte[byteSize];
+            System.arraycopy(value, value.length - byteSize, dest, 0, byteSize);
+            return dest;
+        }
+        throw new ArithmeticException("Can't resize big endian bytes %s to size %s".formatted(Arrays.toString(value), byteSize));
+    }
+
+    private static boolean canBigEndianValueBeRepresentedBySmallerByteSize(byte[] bigEndianValue, int byteSize)
+    {
+        verify(byteSize < bigEndianValue.length);
+        // pre-req 1
+        // can't represent number with 0 bytes
+        if (byteSize <= 0) {
+            return false;
+        }
+        // pre-req 2
+        // these are the only padding bytes, if they aren't in the most sig bits place, then all bytes matter
+        // and a down-size isn't possible
+        if (bigEndianValue[0] != 0 && bigEndianValue[0] != -1) {
+            return false;
+        }
+        // the first significant byte is either the first byte that is consistent with the sign of the padding
+        // or the last padding byte when the next byte is inconsistent with the sign
+        int firstSigByte = 0;
+        byte padding = bigEndianValue[0];
+        for (int i = 1; i < bigEndianValue.length; i++) {
+            if (bigEndianValue[i] == padding) {
+                firstSigByte = i;
+            }
+            // case 1
+            else if (padding == 0 && bigEndianValue[i] < 0) {
+                break;
+            }
+            // case 2
+            else if (padding == 0 && bigEndianValue[i] > 0) {
+                firstSigByte = i;
+                break;
+            }
+            // case 3
+            else if (padding == -1 && bigEndianValue[i] >= 0) {
+                break;
+            }
+            // case 4
+            else if (padding == -1 && bigEndianValue[i] < 0) {
+                firstSigByte = i;
+                break;
+            }
+        }
+        return (bigEndianValue.length - firstSigByte) <= byteSize;
+    }
+
+    public static byte[] padBigEndianToSize(Int128 toPad, int byteSize)
+    {
+        return padBigEndianToSize(toPad.toBigEndianBytes(), byteSize);
+    }
+
+    public static byte[] padBigEndianToSize(long toPad, int byteSize)
+    {
+        return padBigEndianToSize(Longs.toByteArray(toPad), byteSize);
+    }
+
+    public static byte[] padBigEndianToSize(byte[] toPad, int byteSize)
+    {
+        int endianSize = toPad.length;
+        if (byteSize < endianSize) {
+            throw new ArithmeticException("Big endian bytes size must be less than or equal to the total padded size");
+        }
+        if (endianSize < 1) {
+            throw new ArithmeticException("Cannot pad empty array");
+        }
+        byte[] padded = new byte[byteSize];
+        System.arraycopy(toPad, 0, padded, byteSize - endianSize, endianSize);
+        if (toPad[0] < 0) {
+            for (int i = 0; i < byteSize - endianSize; i++) {
+                padded[i] = -1;
+            }
+        }
+        return padded;
+    }
+}
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/compression/BufferedOutputStreamSliceOutput.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/compression/BufferedOutputStreamSliceOutput.java
index 518701cee34f..3bc486c8ca41 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/compression/BufferedOutputStreamSliceOutput.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/compression/BufferedOutputStreamSliceOutput.java
@@ -237,6 +237,66 @@ public void writeBytes(byte[] source, int sourceIndex, int length)
         }
     }
 
+    @Override
+    public void writeShorts(short[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = ensureBatchSize(length * Short.BYTES) / Short.BYTES;
+            slice.setShorts(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Short.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeInts(int[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = ensureBatchSize(length * Integer.BYTES) / Integer.BYTES;
+            slice.setInts(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Integer.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeLongs(long[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = ensureBatchSize(length * Long.BYTES) / Long.BYTES;
+            slice.setLongs(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Long.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeFloats(float[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = ensureBatchSize(length * Float.BYTES) / Float.BYTES;
+            slice.setFloats(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Float.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeDoubles(double[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = ensureBatchSize(length * Double.BYTES) / Double.BYTES;
+            slice.setDoubles(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Double.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
     @Override
     public void writeBytes(InputStream in, int length)
             throws IOException
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/compression/ChunkedSliceOutput.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/compression/ChunkedSliceOutput.java
deleted file mode 100644
index 9d2af03586b5..000000000000
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/compression/ChunkedSliceOutput.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * Licensed 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 io.trino.hive.formats.compression;
-
-import com.google.common.collect.ImmutableList;
-import io.airlift.slice.Slice;
-import io.airlift.slice.SliceOutput;
-import io.airlift.slice.Slices;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.airlift.slice.SizeOf.SIZE_OF_BYTE;
-import static io.airlift.slice.SizeOf.SIZE_OF_INT;
-import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
-import static io.airlift.slice.SizeOf.SIZE_OF_SHORT;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static java.lang.Math.min;
-import static java.lang.Math.multiplyExact;
-import static java.lang.Math.toIntExact;
-
-public final class ChunkedSliceOutput
-        extends SliceOutput
-{
-    private static final int INSTANCE_SIZE = instanceSize(ChunkedSliceOutput.class);
-    private static final int MINIMUM_CHUNK_SIZE = 4096;
-    private static final int MAXIMUM_CHUNK_SIZE = 16 * 1024 * 1024;
-    // This must not be larger than MINIMUM_CHUNK_SIZE/2
-    private static final int MAX_UNUSED_BUFFER_SIZE = 128;
-
-    private final ChunkSupplier chunkSupplier;
-
-    private Slice slice;
-    private byte[] buffer;
-
-    private final List<Slice> closedSlices = new ArrayList<>();
-    private long closedSlicesRetainedSize;
-
-    /**
-     * Offset of buffer within stream.
-     */
-    private long streamOffset;
-
-    /**
-     * Current position for writing in buffer.
-     */
-    private int bufferPosition;
-
-    public ChunkedSliceOutput(int minChunkSize, int maxChunkSize)
-    {
-        this.chunkSupplier = new ChunkSupplier(minChunkSize, maxChunkSize);
-
-        this.buffer = chunkSupplier.get();
-        this.slice = Slices.wrappedBuffer(buffer);
-    }
-
-    public List<Slice> getSlices()
-    {
-        return ImmutableList.<Slice>builder()
-                .addAll(closedSlices)
-                .add(Slices.copyOf(slice, 0, bufferPosition))
-                .build();
-    }
-
-    @Override
-    public void reset()
-    {
-        chunkSupplier.reset();
-        closedSlices.clear();
-
-        buffer = chunkSupplier.get();
-        slice = Slices.wrappedBuffer(buffer);
-
-        closedSlicesRetainedSize = 0;
-        streamOffset = 0;
-        bufferPosition = 0;
-    }
-
-    @Override
-    public void reset(int position)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int size()
-    {
-        return toIntExact(streamOffset + bufferPosition);
-    }
-
-    @Override
-    public long getRetainedSize()
-    {
-        return slice.getRetainedSize() + closedSlicesRetainedSize + INSTANCE_SIZE;
-    }
-
-    @Override
-    public int writableBytes()
-    {
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    public boolean isWritable()
-    {
-        return true;
-    }
-
-    @Override
-    public void writeByte(int value)
-    {
-        ensureWritableBytes(SIZE_OF_BYTE);
-        slice.setByte(bufferPosition, value);
-        bufferPosition += SIZE_OF_BYTE;
-    }
-
-    @Override
-    public void writeShort(int value)
-    {
-        ensureWritableBytes(SIZE_OF_SHORT);
-        slice.setShort(bufferPosition, value);
-        bufferPosition += SIZE_OF_SHORT;
-    }
-
-    @Override
-    public void writeInt(int value)
-    {
-        ensureWritableBytes(SIZE_OF_INT);
-        slice.setInt(bufferPosition, value);
-        bufferPosition += SIZE_OF_INT;
-    }
-
-    @Override
-    public void writeLong(long value)
-    {
-        ensureWritableBytes(SIZE_OF_LONG);
-        slice.setLong(bufferPosition, value);
-        bufferPosition += SIZE_OF_LONG;
-    }
-
-    @Override
-    public void writeFloat(float value)
-    {
-        writeInt(Float.floatToIntBits(value));
-    }
-
-    @Override
-    public void writeDouble(double value)
-    {
-        writeLong(Double.doubleToLongBits(value));
-    }
-
-    @Override
-    public void writeBytes(Slice source)
-    {
-        writeBytes(source, 0, source.length());
-    }
-
-    @Override
-    public void writeBytes(Slice source, int sourceIndex, int length)
-    {
-        while (length > 0) {
-            int batch = tryEnsureBatchSize(length);
-            slice.setBytes(bufferPosition, source, sourceIndex, batch);
-            bufferPosition += batch;
-            sourceIndex += batch;
-            length -= batch;
-        }
-    }
-
-    @Override
-    public void writeBytes(byte[] source)
-    {
-        writeBytes(source, 0, source.length);
-    }
-
-    @Override
-    public void writeBytes(byte[] source, int sourceIndex, int length)
-    {
-        while (length > 0) {
-            int batch = tryEnsureBatchSize(length);
-            slice.setBytes(bufferPosition, source, sourceIndex, batch);
-            bufferPosition += batch;
-            sourceIndex += batch;
-            length -= batch;
-        }
-    }
-
-    @Override
-    public void writeBytes(InputStream in, int length)
-            throws IOException
-    {
-        while (length > 0) {
-            int batch = tryEnsureBatchSize(length);
-            slice.setBytes(bufferPosition, in, batch);
-            bufferPosition += batch;
-            length -= batch;
-        }
-    }
-
-    @Override
-    public void writeZero(int length)
-    {
-        checkArgument(length >= 0, "length must be greater than or equal to 0");
-
-        while (length > 0) {
-            int batch = tryEnsureBatchSize(length);
-            Arrays.fill(buffer, bufferPosition, bufferPosition + batch, (byte) 0);
-            bufferPosition += batch;
-            length -= batch;
-        }
-    }
-
-    @Override
-    public SliceOutput appendLong(long value)
-    {
-        writeLong(value);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendDouble(double value)
-    {
-        writeDouble(value);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendInt(int value)
-    {
-        writeInt(value);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendShort(int value)
-    {
-        writeShort(value);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendByte(int value)
-    {
-        writeByte(value);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendBytes(byte[] source, int sourceIndex, int length)
-    {
-        writeBytes(source, sourceIndex, length);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendBytes(byte[] source)
-    {
-        writeBytes(source);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendBytes(Slice slice)
-    {
-        writeBytes(slice);
-        return this;
-    }
-
-    @Override
-    public Slice slice()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Slice getUnderlyingSlice()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String toString(Charset charset)
-    {
-        return toString();
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder("OutputStreamSliceOutputAdapter{");
-        builder.append("position=").append(size());
-        builder.append("bufferSize=").append(slice.length());
-        builder.append('}');
-        return builder.toString();
-    }
-
-    private int tryEnsureBatchSize(int length)
-    {
-        ensureWritableBytes(min(MAX_UNUSED_BUFFER_SIZE, length));
-        return min(length, slice.length() - bufferPosition);
-    }
-
-    private void ensureWritableBytes(int minWritableBytes)
-    {
-        checkArgument(minWritableBytes <= MAX_UNUSED_BUFFER_SIZE);
-        if (bufferPosition + minWritableBytes > slice.length()) {
-            closeChunk();
-        }
-    }
-
-    private void closeChunk()
-    {
-        // add trimmed view of slice to closed slices
-        closedSlices.add(slice.slice(0, bufferPosition));
-
-        // create a new buffer
-        // double size until we hit the max chunk size
-        buffer = chunkSupplier.get();
-        slice = Slices.wrappedBuffer(buffer);
-
-        streamOffset += bufferPosition;
-        bufferPosition = 0;
-    }
-
-    // Chunk supplier creates buffers by doubling the size from min to max chunk size.
-    // The supplier also tracks all created buffers and can be reset to the beginning,
-    // reusing the buffers.
-    private static class ChunkSupplier
-    {
-        private final int maxChunkSize;
-
-        private final List<byte[]> bufferPool = new ArrayList<>();
-        private final List<byte[]> usedBuffers = new ArrayList<>();
-
-        private int currentSize;
-
-        public ChunkSupplier(int minChunkSize, int maxChunkSize)
-        {
-            checkArgument(minChunkSize >= MINIMUM_CHUNK_SIZE, "minimum chunk size of " + MINIMUM_CHUNK_SIZE + " required");
-            checkArgument(maxChunkSize <= MAXIMUM_CHUNK_SIZE, "maximum chunk size of " + MAXIMUM_CHUNK_SIZE + " required");
-            checkArgument(minChunkSize <= maxChunkSize, "minimum chunk size must be less than maximum chunk size");
-
-            this.currentSize = minChunkSize;
-            this.maxChunkSize = maxChunkSize;
-        }
-
-        public void reset()
-        {
-            bufferPool.addAll(0, usedBuffers);
-            usedBuffers.clear();
-        }
-
-        public byte[] get()
-        {
-            byte[] buffer;
-            if (bufferPool.isEmpty()) {
-                currentSize = min(multiplyExact(currentSize, 2), maxChunkSize);
-                buffer = new byte[currentSize];
-            }
-            else {
-                buffer = bufferPool.remove(0);
-                currentSize = buffer.length;
-            }
-            usedBuffers.add(buffer);
-            return buffer;
-        }
-    }
-}
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/compression/MemoryCompressedSliceOutput.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/compression/MemoryCompressedSliceOutput.java
index 088489daddd7..acea99c8fb8c 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/compression/MemoryCompressedSliceOutput.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/compression/MemoryCompressedSliceOutput.java
@@ -15,6 +15,7 @@
 
 import io.airlift.compress.hadoop.HadoopStreams;
 import io.airlift.slice.Slice;
+import io.trino.plugin.base.io.ChunkedSliceOutput;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/BinaryColumnEncodingFactory.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/BinaryColumnEncodingFactory.java
index 02e40bf6c8a2..d05069d1ce90 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/BinaryColumnEncodingFactory.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/BinaryColumnEncodingFactory.java
@@ -85,19 +85,19 @@ public BinaryColumnEncoding getEncoding(Type type)
         if (type instanceof TimestampType) {
             return new TimestampEncoding((TimestampType) type, timeZone);
         }
-        if (type instanceof ArrayType) {
-            return new ListEncoding(type, getEncoding(type.getTypeParameters().get(0)));
+        if (type instanceof ArrayType arrayType) {
+            return new ListEncoding(arrayType, getEncoding(arrayType.getElementType()));
         }
-        if (type instanceof MapType) {
+        if (type instanceof MapType mapType) {
             return new MapEncoding(
-                    type,
-                    getEncoding(type.getTypeParameters().get(0)),
-                    getEncoding(type.getTypeParameters().get(1)));
+                    mapType,
+                    getEncoding(mapType.getKeyType()),
+                    getEncoding(mapType.getValueType()));
         }
-        if (type instanceof RowType) {
+        if (type instanceof RowType rowType) {
             return new StructEncoding(
-                    type,
-                    type.getTypeParameters().stream()
+                    rowType,
+                    rowType.getTypeParameters().stream()
                             .map(this::getEncoding)
                             .collect(Collectors.toList()));
         }
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/ListEncoding.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/ListEncoding.java
index d6db5e0fab55..5843b3ad853d 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/ListEncoding.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/ListEncoding.java
@@ -16,27 +16,30 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
 import io.trino.hive.formats.ReadWriteUtils;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
+import io.trino.spi.type.ArrayType;
 
 import static java.lang.Math.toIntExact;
 
 public class ListEncoding
         extends BlockEncoding
 {
+    private final ArrayType arrayType;
     private final BinaryColumnEncoding elementEncoding;
 
-    public ListEncoding(Type type, BinaryColumnEncoding elementEncoding)
+    public ListEncoding(ArrayType arrayType, BinaryColumnEncoding elementEncoding)
     {
-        super(type);
+        super(arrayType);
+        this.arrayType = arrayType;
         this.elementEncoding = elementEncoding;
     }
 
     @Override
     public void encodeValue(Block block, int position, SliceOutput output)
     {
-        Block list = block.getObject(position, Block.class);
+        Block list = arrayType.getObject(block, position);
         ReadWriteUtils.writeVInt(output, list.getPositionCount());
 
         // write null bits
@@ -63,7 +66,11 @@ public void encodeValue(Block block, int position, SliceOutput output)
     @Override
     public void decodeValueInto(BlockBuilder builder, Slice slice, int offset, int length)
     {
-        // entries in list
+        ((ArrayBlockBuilder) builder).buildEntry(elementBuilder -> decodeArrayInto(elementBuilder, slice, offset));
+    }
+
+    private void decodeArrayInto(BlockBuilder elementBuilder, Slice slice, int offset)
+    {
         int entries = toIntExact(ReadWriteUtils.readVInt(slice, offset));
         offset += ReadWriteUtils.decodeVIntSize(slice.getByte(offset));
 
@@ -73,24 +80,22 @@ public void decodeValueInto(BlockBuilder builder, Slice slice, int offset, int l
 
         // read elements starting after null bytes
         int elementOffset = nullByteEnd;
-        BlockBuilder arrayBuilder = builder.beginBlockEntry();
         for (int i = 0; i < entries; i++) {
             if ((slice.getByte(nullByteCur) & (1 << (i % 8))) != 0) {
                 int valueOffset = elementEncoding.getValueOffset(slice, elementOffset);
                 int valueLength = elementEncoding.getValueLength(slice, elementOffset);
 
-                elementEncoding.decodeValueInto(arrayBuilder, slice, elementOffset + valueOffset, valueLength);
+                elementEncoding.decodeValueInto(elementBuilder, slice, elementOffset + valueOffset, valueLength);
 
                 elementOffset = elementOffset + valueOffset + valueLength;
             }
             else {
-                arrayBuilder.appendNull();
+                elementBuilder.appendNull();
             }
             // move onto the next null byte
             if (7 == (i % 8)) {
                 nullByteCur++;
             }
         }
-        builder.closeEntry();
     }
 }
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/MapEncoding.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/MapEncoding.java
index 77558d475f0d..ace73d1f942e 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/MapEncoding.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/MapEncoding.java
@@ -20,19 +20,23 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.type.MapType;
 
 import static java.lang.Math.toIntExact;
 
 public class MapEncoding
         extends BlockEncoding
 {
+    private final MapType mapType;
     private final BinaryColumnEncoding keyReader;
     private final BinaryColumnEncoding valueReader;
 
-    public MapEncoding(Type type, BinaryColumnEncoding keyReader, BinaryColumnEncoding valueReader)
+    public MapEncoding(MapType mapType, BinaryColumnEncoding keyReader, BinaryColumnEncoding valueReader)
     {
-        super(type);
+        super(mapType);
+        this.mapType = mapType;
         this.keyReader = keyReader;
         this.valueReader = valueReader;
     }
@@ -40,16 +44,19 @@ public MapEncoding(Type type, BinaryColumnEncoding keyReader, BinaryColumnEncodi
     @Override
     public void encodeValue(Block block, int position, SliceOutput output)
     {
-        Block map = block.getObject(position, Block.class);
+        SqlMap sqlMap = mapType.getObject(block, position);
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
 
         // write entry count
-        ReadWriteUtils.writeVInt(output, map.getPositionCount() / 2);
+        ReadWriteUtils.writeVInt(output, sqlMap.getSize());
 
         // write null bits
         int nullByte = 0b0101_0101;
         int bits = 0;
-        for (int elementIndex = 0; elementIndex < map.getPositionCount(); elementIndex += 2) {
-            if (map.isNull(elementIndex)) {
+        for (int elementIndex = 0; elementIndex < sqlMap.getSize(); elementIndex++) {
+            if (rawKeyBlock.isNull(rawOffset + elementIndex)) {
                 throw new TrinoException(StandardErrorCode.GENERIC_INTERNAL_ERROR, "Map must never contain null keys");
             }
 
@@ -59,7 +66,7 @@ public void encodeValue(Block block, int position, SliceOutput output)
                 bits = 0;
             }
 
-            if (!map.isNull(elementIndex + 1)) {
+            if (!rawValueBlock.isNull(rawOffset + elementIndex)) {
                 nullByte |= (1 << bits + 1);
             }
             bits += 2;
@@ -67,21 +74,26 @@ public void encodeValue(Block block, int position, SliceOutput output)
         output.writeByte(nullByte);
 
         // write values
-        for (int elementIndex = 0; elementIndex < map.getPositionCount(); elementIndex += 2) {
-            if (map.isNull(elementIndex)) {
+        for (int elementIndex = 0; elementIndex < sqlMap.getSize(); elementIndex++) {
+            if (rawKeyBlock.isNull(rawOffset + elementIndex)) {
                 // skip null keys
                 continue;
             }
 
-            keyReader.encodeValueInto(map, elementIndex, output);
-            if (!map.isNull(elementIndex + 1)) {
-                valueReader.encodeValueInto(map, elementIndex + 1, output);
+            keyReader.encodeValueInto(rawKeyBlock, rawOffset + elementIndex, output);
+            if (!rawValueBlock.isNull(rawOffset + elementIndex)) {
+                valueReader.encodeValueInto(rawValueBlock, rawOffset + elementIndex, output);
             }
         }
     }
 
     @Override
     public void decodeValueInto(BlockBuilder builder, Slice slice, int offset, int length)
+    {
+        ((MapBlockBuilder) builder).buildEntry((keyBuilder, valueBuilder) -> decodeValueInto(keyBuilder, valueBuilder, slice, offset));
+    }
+
+    private void decodeValueInto(BlockBuilder keyBuilder, BlockBuilder valueBuilder, Slice slice, int offset)
     {
         // entries in list
         int entries = toIntExact(ReadWriteUtils.readVInt(slice, offset));
@@ -93,7 +105,6 @@ public void decodeValueInto(BlockBuilder builder, Slice slice, int offset, int l
 
         // read elements starting after null bytes
         int elementOffset = nullByteEnd;
-        BlockBuilder mapBuilder = builder.beginBlockEntry();
         for (int i = 0; i < entries; i++) {
             // read key
             boolean nullKey;
@@ -101,7 +112,7 @@ public void decodeValueInto(BlockBuilder builder, Slice slice, int offset, int l
                 int keyOffset = keyReader.getValueOffset(slice, elementOffset);
                 int keyLength = keyReader.getValueLength(slice, elementOffset);
 
-                keyReader.decodeValueInto(mapBuilder, slice, elementOffset + keyOffset, keyLength);
+                keyReader.decodeValueInto(keyBuilder, slice, elementOffset + keyOffset, keyLength);
                 nullKey = false;
 
                 elementOffset = elementOffset + keyOffset + keyLength;
@@ -119,7 +130,7 @@ public void decodeValueInto(BlockBuilder builder, Slice slice, int offset, int l
 
                 // ignore entries with a null key
                 if (!nullKey) {
-                    valueReader.decodeValueInto(mapBuilder, slice, elementOffset + valueOffset, valueLength);
+                    valueReader.decodeValueInto(valueBuilder, slice, elementOffset + valueOffset, valueLength);
                 }
 
                 elementOffset = elementOffset + valueOffset + valueLength;
@@ -127,7 +138,7 @@ public void decodeValueInto(BlockBuilder builder, Slice slice, int offset, int l
             else {
                 // ignore entries with a null key
                 if (!nullKey) {
-                    mapBuilder.appendNull();
+                    valueBuilder.appendNull();
                 }
             }
 
@@ -136,6 +147,5 @@ public void decodeValueInto(BlockBuilder builder, Slice slice, int offset, int l
                 nullByteCur++;
             }
         }
-        builder.closeEntry();
     }
 }
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/StructEncoding.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/StructEncoding.java
index 3c79434ea594..038deae7b97a 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/StructEncoding.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/StructEncoding.java
@@ -18,7 +18,9 @@
 import io.airlift.slice.SliceOutput;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlRow;
+import io.trino.spi.type.RowType;
 
 import java.util.List;
 
@@ -26,33 +28,37 @@ public class StructEncoding
         extends BlockEncoding
 {
     private final List<BinaryColumnEncoding> structFields;
+    private final RowType rowType;
 
-    public StructEncoding(Type type, List<BinaryColumnEncoding> structFields)
+    public StructEncoding(RowType rowType, List<BinaryColumnEncoding> structFields)
     {
-        super(type);
+        super(rowType);
+        this.rowType = rowType;
         this.structFields = ImmutableList.copyOf(structFields);
     }
 
     @Override
     public void encodeValue(Block block, int position, SliceOutput output)
     {
-        Block row = block.getObject(position, Block.class);
+        SqlRow row = rowType.getObject(block, position);
+        int rawIndex = row.getRawIndex();
 
         // write values
-        for (int batchStart = 0; batchStart < row.getPositionCount(); batchStart += 8) {
+        for (int batchStart = 0; batchStart < row.getFieldCount(); batchStart += 8) {
             int batchEnd = Math.min(batchStart + 8, structFields.size());
 
             int nullByte = 0;
             for (int fieldId = batchStart; fieldId < batchEnd; fieldId++) {
-                if (!row.isNull(fieldId)) {
+                if (!row.getRawFieldBlock(fieldId).isNull(rawIndex)) {
                     nullByte |= (1 << (fieldId % 8));
                 }
             }
             output.writeByte(nullByte);
             for (int fieldId = batchStart; fieldId < batchEnd; fieldId++) {
-                if (!row.isNull(fieldId)) {
+                Block fieldBlock = row.getRawFieldBlock(fieldId);
+                if (!fieldBlock.isNull(rawIndex)) {
                     BinaryColumnEncoding field = structFields.get(fieldId);
-                    field.encodeValueInto(row, fieldId, output);
+                    field.encodeValueInto(fieldBlock, rawIndex, output);
                 }
             }
         }
@@ -61,40 +67,38 @@ public void encodeValue(Block block, int position, SliceOutput output)
     @Override
     public void decodeValueInto(BlockBuilder builder, Slice slice, int offset, int length)
     {
-        int fieldId = 0;
-        int nullByte = 0;
-        int elementOffset = offset;
-        BlockBuilder rowBuilder = builder.beginBlockEntry();
-        while (fieldId < structFields.size() && elementOffset < offset + length) {
-            BinaryColumnEncoding field = structFields.get(fieldId);
+        ((RowBlockBuilder) builder).buildEntry(fieldBuilders -> {
+            int fieldId = 0;
+            int nullByte = 0;
+            int elementOffset = offset;
+            while (fieldId < structFields.size() && elementOffset < offset + length) {
+                BinaryColumnEncoding field = structFields.get(fieldId);
 
-            // null byte prefixes every 8 fields
-            if ((fieldId % 8) == 0) {
-                nullByte = slice.getByte(elementOffset);
-                elementOffset++;
-            }
+                // null byte prefixes every 8 fields
+                if ((fieldId % 8) == 0) {
+                    nullByte = slice.getByte(elementOffset);
+                    elementOffset++;
+                }
 
-            // read field
-            if ((nullByte & (1 << (fieldId % 8))) != 0) {
-                int valueOffset = field.getValueOffset(slice, elementOffset);
-                int valueLength = field.getValueLength(slice, elementOffset);
+                // read field
+                if ((nullByte & (1 << (fieldId % 8))) != 0) {
+                    int valueOffset = field.getValueOffset(slice, elementOffset);
+                    int valueLength = field.getValueLength(slice, elementOffset);
 
-                field.decodeValueInto(rowBuilder, slice, elementOffset + valueOffset, valueLength);
+                    field.decodeValueInto(fieldBuilders.get(fieldId), slice, elementOffset + valueOffset, valueLength);
 
-                elementOffset = elementOffset + valueOffset + valueLength;
+                    elementOffset = elementOffset + valueOffset + valueLength;
+                }
+                else {
+                    fieldBuilders.get(fieldId).appendNull();
+                }
+                fieldId++;
             }
-            else {
-                rowBuilder.appendNull();
+            // Sometimes a struct does not have all fields written, so we fill with nulls
+            while (fieldId < structFields.size()) {
+                fieldBuilders.get(fieldId).appendNull();
+                fieldId++;
             }
-            fieldId++;
-        }
-
-        // Sometimes a struct does not have all fields written, so we fill with nulls
-        while (fieldId < structFields.size()) {
-            rowBuilder.appendNull();
-            fieldId++;
-        }
-
-        builder.closeEntry();
+        });
     }
 }
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/TimestampEncoding.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/TimestampEncoding.java
index 1ee34b041a1d..02ab50396682 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/TimestampEncoding.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/binary/TimestampEncoding.java
@@ -13,6 +13,7 @@
  */
 package io.trino.hive.formats.encodings.binary;
 
+import com.google.common.math.IntMath;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
 import io.trino.hive.formats.ReadWriteUtils;
@@ -168,7 +169,7 @@ private static int decodeNanos(int nanos)
         nanos = temp;
 
         if (nanosDigits < 9) {
-            nanos *= Math.pow(10, 9 - nanosDigits);
+            nanos *= IntMath.pow(10, 9 - nanosDigits);
         }
         return nanos;
     }
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/ListEncoding.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/ListEncoding.java
index 0541474082a3..a50d7ae5e078 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/ListEncoding.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/ListEncoding.java
@@ -16,19 +16,22 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
 import io.trino.hive.formats.FileCorruptionException;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
+import io.trino.spi.type.ArrayType;
 
 public class ListEncoding
         extends BlockEncoding
 {
+    private final ArrayType arrayType;
     private final byte separator;
     private final TextColumnEncoding elementEncoding;
 
-    public ListEncoding(Type type, Slice nullSequence, byte separator, Byte escapeByte, TextColumnEncoding elementEncoding)
+    public ListEncoding(ArrayType arrayType, Slice nullSequence, byte separator, Byte escapeByte, TextColumnEncoding elementEncoding)
     {
-        super(type, nullSequence, escapeByte);
+        super(arrayType, nullSequence, escapeByte);
+        this.arrayType = arrayType;
         this.separator = separator;
         this.elementEncoding = elementEncoding;
     }
@@ -37,7 +40,7 @@ public ListEncoding(Type type, Slice nullSequence, byte separator, Byte escapeBy
     public void encodeValueInto(Block block, int position, SliceOutput output)
             throws FileCorruptionException
     {
-        Block list = block.getObject(position, Block.class);
+        Block list = arrayType.getObject(block, position);
         for (int elementIndex = 0; elementIndex < list.getPositionCount(); elementIndex++) {
             if (elementIndex > 0) {
                 output.writeByte(separator);
@@ -55,26 +58,31 @@ public void encodeValueInto(Block block, int position, SliceOutput output)
     public void decodeValueInto(BlockBuilder builder, Slice slice, int offset, int length)
             throws FileCorruptionException
     {
-        int end = offset + length;
+        ((ArrayBlockBuilder) builder).buildEntry(elementBuilder -> decodeArrayInto(elementBuilder, slice, offset, length));
+    }
+
+    private void decodeArrayInto(BlockBuilder elementBuilder, Slice slice, int offset, int length)
+            throws FileCorruptionException
+    {
+        if (length <= 0) {
+            return;
+        }
 
-        BlockBuilder arrayBlockBuilder = builder.beginBlockEntry();
-        if (length > 0) {
-            int elementOffset = offset;
-            while (offset < end) {
-                byte currentByte = slice.getByte(offset);
-                if (currentByte == separator) {
-                    decodeElementValueInto(arrayBlockBuilder, slice, elementOffset, offset - elementOffset);
-                    elementOffset = offset + 1;
-                }
-                else if (isEscapeByte(currentByte) && offset + 1 < length) {
-                    // ignore the char after escape_char
-                    offset++;
-                }
+        int end = offset + length;
+        int elementOffset = offset;
+        while (offset < end) {
+            byte currentByte = slice.getByte(offset);
+            if (currentByte == separator) {
+                decodeElementValueInto(elementBuilder, slice, elementOffset, offset - elementOffset);
+                elementOffset = offset + 1;
+            }
+            else if (isEscapeByte(currentByte) && offset + 1 < length) {
+                // ignore the char after escape_char
                 offset++;
             }
-            decodeElementValueInto(arrayBlockBuilder, slice, elementOffset, offset - elementOffset);
+            offset++;
         }
-        builder.closeEntry();
+        decodeElementValueInto(elementBuilder, slice, elementOffset, offset - elementOffset);
     }
 
     private void decodeElementValueInto(BlockBuilder blockBuilder, Slice slice, int offset, int length)
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/MapEncoding.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/MapEncoding.java
index e45025916b09..9006bd3325ce 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/MapEncoding.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/MapEncoding.java
@@ -21,8 +21,9 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.type.MapType;
-import io.trino.spi.type.Type;
 
 public class MapEncoding
         extends BlockEncoding
@@ -37,7 +38,7 @@ public class MapEncoding
     private BlockBuilder keyBlockBuilder;
 
     public MapEncoding(
-            Type type,
+            MapType mapType,
             Slice nullSequence,
             byte elementSeparator,
             byte keyValueSeparator,
@@ -45,8 +46,8 @@ public MapEncoding(
             TextColumnEncoding keyEncoding,
             TextColumnEncoding valueEncoding)
     {
-        super(type, nullSequence, escapeByte);
-        this.mapType = (MapType) type;
+        super(mapType, nullSequence, escapeByte);
+        this.mapType = mapType;
         this.elementSeparator = elementSeparator;
         this.keyValueSeparator = keyValueSeparator;
         this.keyEncoding = keyEncoding;
@@ -59,10 +60,14 @@ public MapEncoding(
     public void encodeValueInto(Block block, int position, SliceOutput output)
             throws FileCorruptionException
     {
-        Block map = block.getObject(position, Block.class);
+        SqlMap sqlMap = mapType.getObject(block, position);
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
         boolean first = true;
-        for (int elementIndex = 0; elementIndex < map.getPositionCount(); elementIndex += 2) {
-            if (map.isNull(elementIndex)) {
+        for (int elementIndex = 0; elementIndex < sqlMap.getSize(); elementIndex++) {
+            if (rawKeyBlock.isNull(rawOffset + elementIndex)) {
                 throw new TrinoException(StandardErrorCode.GENERIC_INTERNAL_ERROR, "Map must never contain null keys");
             }
 
@@ -70,13 +75,13 @@ public void encodeValueInto(Block block, int position, SliceOutput output)
                 output.writeByte(elementSeparator);
             }
             first = false;
-            keyEncoding.encodeValueInto(map, elementIndex, output);
+            keyEncoding.encodeValueInto(rawKeyBlock, rawOffset + elementIndex, output);
             output.writeByte(keyValueSeparator);
-            if (map.isNull(elementIndex + 1)) {
+            if (rawValueBlock.isNull(rawOffset + elementIndex)) {
                 output.writeBytes(nullSequence);
             }
             else {
-                valueEncoding.encodeValueInto(map, elementIndex + 1, output);
+                valueEncoding.encodeValueInto(rawValueBlock, rawOffset + elementIndex, output);
             }
         }
     }
@@ -94,9 +99,10 @@ public void decodeValueInto(BlockBuilder builder, Slice slice, int offset, int l
         boolean[] distinctKeys = distinctMapKeys.selectDistinctKeys(keyBlock);
 
         // add the distinct entries to the map
-        BlockBuilder mapBuilder = builder.beginBlockEntry();
-        processEntries(slice, offset, length, new DistinctEntryDecoder(distinctKeys, keyBlock, mapBuilder));
-        builder.closeEntry();
+        ((MapBlockBuilder) builder).buildEntry((keyBuilder, valueBuilder) -> {
+            DistinctEntryDecoder entryDecoder = new DistinctEntryDecoder(distinctKeys, keyBlock, keyBuilder, valueBuilder);
+            processEntries(slice, offset, length, entryDecoder);
+        });
     }
 
     private void processEntries(Slice slice, int offset, int length, EntryDecoder entryDecoder)
@@ -182,14 +188,16 @@ private class DistinctEntryDecoder
     {
         private final boolean[] distinctKeys;
         private final Block keyBlock;
-        private final BlockBuilder mapBuilder;
+        private final BlockBuilder keyBuilder;
+        private final BlockBuilder valueBuilder;
         private int entryPosition;
 
-        public DistinctEntryDecoder(boolean[] distinctKeys, Block keyBlock, BlockBuilder mapBuilder)
+        public DistinctEntryDecoder(boolean[] distinctKeys, Block keyBlock, BlockBuilder keyBuilder, BlockBuilder valueBuilder)
         {
             this.distinctKeys = distinctKeys;
             this.keyBlock = keyBlock;
-            this.mapBuilder = mapBuilder;
+            this.keyBuilder = keyBuilder;
+            this.valueBuilder = valueBuilder;
         }
 
         @Override
@@ -197,13 +205,13 @@ public void decodeKeyValue(int depth, Slice slice, int keyOffset, int keyLength,
                 throws FileCorruptionException
         {
             if (distinctKeys[entryPosition]) {
-                mapType.getKeyType().appendTo(keyBlock, entryPosition, mapBuilder);
+                mapType.getKeyType().appendTo(keyBlock, entryPosition, keyBuilder);
 
                 if (hasValue && !isNullSequence(slice, valueOffset, valueLength)) {
-                    valueEncoding.decodeValueInto(mapBuilder, slice, valueOffset, valueLength);
+                    valueEncoding.decodeValueInto(valueBuilder, slice, valueOffset, valueLength);
                 }
                 else {
-                    mapBuilder.appendNull();
+                    valueBuilder.appendNull();
                 }
             }
             entryPosition++;
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/StringEncoding.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/StringEncoding.java
index b54560d6219d..a5d3ad6705dd 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/StringEncoding.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/StringEncoding.java
@@ -162,13 +162,18 @@ private static ColumnData unescape(ColumnData columnData, byte escapeByte)
 
     private static void unescape(byte escapeByte, SliceOutput output, Slice slice, int offset, int length)
     {
-        for (int i = 0; i < length; i++) {
+        int i = 0;
+        while (i < length) {
             byte value = slice.getByte(offset + i);
             if (value == escapeByte && i + 1 < length) {
-                // skip the escape byte
+                // write the next byte immediately to handle cases of multiple escape characters in a row
+                output.write(slice.getByte(offset + i + 1));
+                // skip the escape and the next byte
+                i += 2;
                 continue;
             }
             output.write(value);
+            i++;
         }
     }
 }
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/StructEncoding.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/StructEncoding.java
index 245585df89fe..fb78ce553b7a 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/StructEncoding.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/StructEncoding.java
@@ -18,26 +18,30 @@
 import io.trino.hive.formats.FileCorruptionException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlRow;
+import io.trino.spi.type.RowType;
 
 import java.util.List;
 
 public class StructEncoding
         extends BlockEncoding
 {
+    private final RowType rowType;
     private final byte separator;
     private final boolean lastColumnTakesRest;
     private final List<TextColumnEncoding> structFields;
 
     public StructEncoding(
-            Type type,
+            RowType rowType,
             Slice nullSequence,
             byte separator,
             Byte escapeByte,
             boolean lastColumnTakesRest,
             List<TextColumnEncoding> structFields)
     {
-        super(type, nullSequence, escapeByte);
+        super(rowType, nullSequence, escapeByte);
+        this.rowType = rowType;
         this.separator = separator;
         this.lastColumnTakesRest = lastColumnTakesRest;
         this.structFields = structFields;
@@ -47,17 +51,19 @@ public StructEncoding(
     public void encodeValueInto(Block block, int position, SliceOutput output)
             throws FileCorruptionException
     {
-        Block row = block.getObject(position, Block.class);
+        SqlRow row = rowType.getObject(block, position);
+        int rawIndex = row.getRawIndex();
         for (int fieldIndex = 0; fieldIndex < structFields.size(); fieldIndex++) {
             if (fieldIndex > 0) {
                 output.writeByte(separator);
             }
 
-            if (row.isNull(fieldIndex)) {
+            Block fieldBlock = row.getRawFieldBlock(fieldIndex);
+            if (fieldBlock.isNull(rawIndex)) {
                 output.writeBytes(nullSequence);
             }
             else {
-                structFields.get(fieldIndex).encodeValueInto(row, fieldIndex, output);
+                structFields.get(fieldIndex).encodeValueInto(fieldBlock, rawIndex, output);
             }
         }
     }
@@ -67,37 +73,40 @@ public void decodeValueInto(BlockBuilder builder, Slice slice, int offset, int l
             throws FileCorruptionException
     {
         int end = offset + length;
-
-        BlockBuilder structBuilder = builder.beginBlockEntry();
-        int elementOffset = offset;
-        int fieldIndex = 0;
-        while (offset < end) {
-            byte currentByte = slice.getByte(offset);
-            if (currentByte == separator) {
-                decodeElementValueInto(fieldIndex, structBuilder, slice, elementOffset, offset - elementOffset);
-                elementOffset = offset + 1;
-                fieldIndex++;
-                if (lastColumnTakesRest && fieldIndex == structFields.size() - 1) {
-                    // no need to process the remaining bytes as they are all assigned to the last column
-                    break;
+        ((RowBlockBuilder) builder).buildEntry(fieldBuilders -> {
+            int currentOffset = offset;
+            int elementOffset = currentOffset;
+            int fieldIndex = 0;
+            while (currentOffset < end) {
+                byte currentByte = slice.getByte(currentOffset);
+                if (currentByte == separator) {
+                    decodeElementValueInto(fieldIndex, fieldBuilders.get(fieldIndex), slice, elementOffset, currentOffset - elementOffset);
+                    elementOffset = currentOffset + 1;
+                    fieldIndex++;
+                    if (lastColumnTakesRest && fieldIndex == structFields.size() - 1) {
+                        // no need to process the remaining bytes as they are all assigned to the last column
+                        break;
+                    }
+                    if (fieldIndex == structFields.size()) {
+                        // this was the last field, so there is no more data to process
+                        return;
+                    }
                 }
+                else if (isEscapeByte(currentByte)) {
+                    // ignore the char after escape_char
+                    currentOffset++;
+                }
+                currentOffset++;
             }
-            else if (isEscapeByte(currentByte)) {
-                // ignore the char after escape_char
-                offset++;
-            }
-            offset++;
-        }
-        decodeElementValueInto(fieldIndex, structBuilder, slice, elementOffset, end - elementOffset);
-        fieldIndex++;
-
-        // missing fields are null
-        while (fieldIndex < structFields.size()) {
-            structBuilder.appendNull();
+            decodeElementValueInto(fieldIndex, fieldBuilders.get(fieldIndex), slice, elementOffset, end - elementOffset);
             fieldIndex++;
-        }
 
-        builder.closeEntry();
+            // missing fields are null
+            while (fieldIndex < structFields.size()) {
+                fieldBuilders.get(fieldIndex).appendNull();
+                fieldIndex++;
+            }
+        });
     }
 
     private void decodeElementValueInto(int fieldIndex, BlockBuilder builder, Slice slice, int offset, int length)
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/TextColumnEncodingFactory.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/TextColumnEncodingFactory.java
index 60f46091f4c7..24dbb1e33f4f 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/TextColumnEncodingFactory.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/encodings/text/TextColumnEncodingFactory.java
@@ -115,20 +115,20 @@ private TextColumnEncoding getEncoding(Type type, int depth)
         if (type instanceof TimestampType) {
             return new TimestampEncoding((TimestampType) type, textEncodingOptions.getNullSequence(), textEncodingOptions.getTimestampFormats());
         }
-        if (type instanceof ArrayType) {
-            TextColumnEncoding elementEncoding = getEncoding(type.getTypeParameters().get(0), depth + 1);
+        if (type instanceof ArrayType arrayType) {
+            TextColumnEncoding elementEncoding = getEncoding(arrayType.getElementType(), depth + 1);
             return new ListEncoding(
-                    type,
+                    arrayType,
                     textEncodingOptions.getNullSequence(),
                     getSeparator(depth + 1),
                     textEncodingOptions.getEscapeByte(),
                     elementEncoding);
         }
-        if (type instanceof MapType) {
-            TextColumnEncoding keyEncoding = getEncoding(type.getTypeParameters().get(0), depth + 2);
-            TextColumnEncoding valueEncoding = getEncoding(type.getTypeParameters().get(1), depth + 2);
+        if (type instanceof MapType mapType) {
+            TextColumnEncoding keyEncoding = getEncoding(mapType.getKeyType(), depth + 2);
+            TextColumnEncoding valueEncoding = getEncoding(mapType.getValueType(), depth + 2);
             return new MapEncoding(
-                    type,
+                    mapType,
                     textEncodingOptions.getNullSequence(),
                     getSeparator(depth + 1),
                     getSeparator(depth + 2),
@@ -136,12 +136,12 @@ private TextColumnEncoding getEncoding(Type type, int depth)
                     keyEncoding,
                     valueEncoding);
         }
-        if (type instanceof RowType) {
-            List<TextColumnEncoding> fieldEncodings = type.getTypeParameters().stream()
+        if (type instanceof RowType rowType) {
+            List<TextColumnEncoding> fieldEncodings = rowType.getTypeParameters().stream()
                     .map(fieldType -> getEncoding(fieldType, depth + 1))
                     .collect(toImmutableList());
             return new StructEncoding(
-                    type,
+                    rowType,
                     textEncodingOptions.getNullSequence(),
                     getSeparator(depth + 1),
                     textEncodingOptions.getEscapeByte(),
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/LineReader.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/LineReader.java
index 6a4ee08e46ba..5c7c035d1030 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/LineReader.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/LineReader.java
@@ -28,7 +28,7 @@ public interface LineReader
     long getReadTimeNanos();
 
     /**
-     * Read a line into the buffer. If there are no more lines in the steam, this reader is closed.
+     * Read a line into the buffer. If there are no more lines in the stream, this reader is closed.
      *
      * @return true if a line was read; otherwise, there no more lines and false is returned
      */
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/csv/CsvDeserializerFactory.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/csv/CsvDeserializerFactory.java
index ff6ad3cea0b2..e1e21b02021d 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/csv/CsvDeserializerFactory.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/csv/CsvDeserializerFactory.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.hive.formats.line.csv.CsvConstants.DEFAULT_QUOTE;
 import static io.trino.hive.formats.line.csv.CsvConstants.DEFAULT_SEPARATOR;
 import static io.trino.hive.formats.line.csv.CsvConstants.DESERIALIZER_DEFAULT_ESCAPE;
@@ -27,6 +28,7 @@
 import static io.trino.hive.formats.line.csv.CsvConstants.HIVE_SERDE_CLASS_NAMES;
 import static io.trino.hive.formats.line.csv.CsvConstants.QUOTE_KEY;
 import static io.trino.hive.formats.line.csv.CsvConstants.SEPARATOR_KEY;
+import static io.trino.hive.formats.line.csv.CsvConstants.SERIALIZER_DEFAULT_ESCAPE;
 import static io.trino.hive.formats.line.csv.CsvConstants.getCharProperty;
 
 public class CsvDeserializerFactory
@@ -44,6 +46,15 @@ public LineDeserializer create(List<Column> columns, Map<String, String> serdePr
         char separatorChar = getCharProperty(serdeProperties, SEPARATOR_KEY, DEFAULT_SEPARATOR);
         char quoteChar = getCharProperty(serdeProperties, QUOTE_KEY, DEFAULT_QUOTE);
         char escapeChar = getCharProperty(serdeProperties, ESCAPE_KEY, DESERIALIZER_DEFAULT_ESCAPE);
+        // Hive has a bug where when the escape character is explicitly set to double quote (char 34),
+        // it changes the escape character to backslash (char 92) when deserializing.
+        if (escapeChar == SERIALIZER_DEFAULT_ESCAPE) {
+            // Add an explicit checks for separator or quote being backslash, so a more helpful error message can be provided
+            // as this Hive behavior is not obvious
+            checkArgument(separatorChar != DESERIALIZER_DEFAULT_ESCAPE, "Separator character cannot be '\\' when escape character is '\"'");
+            checkArgument(quoteChar != DESERIALIZER_DEFAULT_ESCAPE, "Quote character cannot be '\\' when escape character is '\"'");
+            escapeChar = DESERIALIZER_DEFAULT_ESCAPE;
+        }
         return new CsvDeserializer(columns, separatorChar, quoteChar, escapeChar);
     }
 }
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/json/JsonDeserializer.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/json/JsonDeserializer.java
index 17f4f21a2ea1..f46dbd17244e 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/json/JsonDeserializer.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/json/JsonDeserializer.java
@@ -14,7 +14,6 @@
 package io.trino.hive.formats.line.json;
 
 import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonLocation;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
@@ -28,9 +27,11 @@
 import io.trino.hive.formats.line.LineDeserializer;
 import io.trino.plugin.base.type.DecodedTimestamp;
 import io.trino.spi.PageBuilder;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.SingleRowBlockWriter;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
@@ -68,6 +69,7 @@
 import static io.trino.hive.formats.HiveFormatUtils.parseHiveDate;
 import static io.trino.hive.formats.HiveFormatUtils.writeDecimal;
 import static io.trino.plugin.base.type.TrinoTimestampEncoderFactory.createTimestampEncoder;
+import static io.trino.plugin.base.util.JsonUtils.jsonFactoryBuilder;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.Chars.truncateToLengthAndTrimSpaces;
@@ -107,7 +109,7 @@
 public class JsonDeserializer
         implements LineDeserializer
 {
-    private static final JsonFactory JSON_FACTORY = new JsonFactoryBuilder()
+    private static final JsonFactory JSON_FACTORY = jsonFactoryBuilder()
             .disable(INTERN_FIELD_NAMES)
             .build();
 
@@ -528,15 +530,14 @@ public ArrayDecoder(ArrayType arrayType, Decoder elementDecoder)
         void decodeValue(LineBuffer lineBuffer, JsonParser parser, BlockBuilder builder)
                 throws IOException
         {
-            BlockBuilder elementBuilder = builder.beginBlockEntry();
-
-            if (parser.currentToken() != START_ARRAY) {
-                throw invalidJson("start of array expected");
-            }
-            while (nextTokenRequired(parser) != JsonToken.END_ARRAY) {
-                elementDecoder.decode(lineBuffer, parser, elementBuilder);
-            }
-            builder.closeEntry();
+            ((ArrayBlockBuilder) builder).buildEntry(elementBuilder -> {
+                if (parser.currentToken() != START_ARRAY) {
+                    throw invalidJson("start of array expected");
+                }
+                while (nextTokenRequired(parser) != JsonToken.END_ARRAY) {
+                    elementDecoder.decode(lineBuffer, parser, elementBuilder);
+                }
+            });
         }
     }
 
@@ -570,23 +571,23 @@ void decodeValue(LineBuffer lineBuffer, JsonParser parser, BlockBuilder builder)
             Block keyBlock = readKeys(createParserAt(parser.currentTokenLocation(), lineBuffer));
             boolean[] distinctKeys = distinctMapKeys.selectDistinctKeys(keyBlock);
 
-            BlockBuilder entryBuilder = builder.beginBlockEntry();
-            if (parser.currentToken() != START_OBJECT) {
-                throw invalidJson("start of object expected");
-            }
-            int keyIndex = 0;
-            while (nextObjectField(parser)) {
-                if (distinctKeys[keyIndex]) {
-                    keyType.appendTo(keyBlock, keyIndex, entryBuilder);
-                    parser.nextToken();
-                    valueDecoder.decode(lineBuffer, parser, entryBuilder);
+            ((MapBlockBuilder) builder).buildEntry((keyBuilder, valueBuilder) -> {
+                if (parser.currentToken() != START_OBJECT) {
+                    throw invalidJson("start of object expected");
                 }
-                else {
-                    skipNextValue(parser);
+                int keyIndex = 0;
+                while (nextObjectField(parser)) {
+                    if (distinctKeys[keyIndex]) {
+                        keyType.appendTo(keyBlock, keyIndex, keyBuilder);
+                        parser.nextToken();
+                        valueDecoder.decode(lineBuffer, parser, valueBuilder);
+                    }
+                    else {
+                        skipNextValue(parser);
+                    }
+                    keyIndex++;
                 }
-                keyIndex++;
-            }
-            builder.closeEntry();
+            });
         }
 
         private Block readKeys(JsonParser fieldNameParser)
@@ -661,17 +662,21 @@ private static class RowDecoder
     {
         private static final Pattern INTERNAL_PATTERN = Pattern.compile("_col([0-9]+)");
 
-        private final List<String> fieldNames;
+        private final Map<String, Integer> fieldPositions;
         private final List<Decoder> fieldDecoders;
         private final IntUnaryOperator ordinalToFieldPosition;
 
         public RowDecoder(RowType rowType, List<Decoder> fieldDecoders, IntUnaryOperator ordinalToFieldPosition)
         {
             super(rowType);
-            this.fieldNames = rowType.getFields().stream()
-                    .map(field -> field.getName().orElseThrow())
-                    .map(fieldName -> fieldName.toLowerCase(Locale.ROOT))
-                    .collect(toImmutableList());
+
+            ImmutableMap.Builder<String, Integer> fieldPositions = ImmutableMap.builder();
+            List<Field> fields = rowType.getFields();
+            for (int i = 0; i < fields.size(); i++) {
+                Field field = fields.get(i);
+                fieldPositions.put(field.getName().orElseThrow().toLowerCase(Locale.ROOT), i);
+            }
+            this.fieldPositions = fieldPositions.buildOrThrow();
             this.fieldDecoders = fieldDecoders;
             this.ordinalToFieldPosition = ordinalToFieldPosition;
         }
@@ -687,9 +692,7 @@ public void decode(LineBuffer lineBuffer, JsonParser parser, PageBuilder builder
         void decodeValue(LineBuffer lineBuffer, JsonParser parser, BlockBuilder builder)
                 throws IOException
         {
-            SingleRowBlockWriter currentBuilder = (SingleRowBlockWriter) builder.beginBlockEntry();
-            decodeValue(lineBuffer, parser, currentBuilder::getFieldBlockBuilder);
-            builder.closeEntry();
+            ((RowBlockBuilder) builder).buildEntry(fieldBuilders -> decodeValue(lineBuffer, parser, fieldBuilders::get));
         }
 
         private void decodeValue(LineBuffer lineBuffer, JsonParser parser, IntFunction<BlockBuilder> fieldBuilders)
@@ -700,7 +703,7 @@ private void decodeValue(LineBuffer lineBuffer, JsonParser parser, IntFunction<B
             }
 
             int[] jsonToRowIndex = getJsonToRowIndex(lineBuffer, parser);
-            boolean[] fieldWritten = new boolean[fieldNames.size()];
+            boolean[] fieldWritten = new boolean[fieldDecoders.size()];
 
             int jsonFieldIndex = 0;
             while (nextObjectField(parser)) {
@@ -734,7 +737,7 @@ private int[] getJsonToRowIndex(LineBuffer lineBuffer, JsonParser parser)
             }
 
             // build a mapping from field in the row to the field in the json object
-            int[] rowToJson = new int[fieldNames.size()];
+            int[] rowToJson = new int[fieldDecoders.size()];
             Arrays.fill(rowToJson, -1);
 
             int jsonFieldIndex = 0;
@@ -763,8 +766,8 @@ private int[] getJsonToRowIndex(LineBuffer lineBuffer, JsonParser parser)
 
         private int getFieldPosition(String fieldName)
         {
-            int fieldPosition = fieldNames.indexOf(fieldName.toLowerCase(Locale.ROOT));
-            if (fieldPosition >= 0) {
+            Integer fieldPosition = fieldPositions.get(fieldName.toLowerCase(Locale.ROOT));
+            if (fieldPosition != null) {
                 return fieldPosition;
             }
 
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/json/JsonSerializer.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/json/JsonSerializer.java
index 68b040a8a5ff..40debc88f4d0 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/json/JsonSerializer.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/json/JsonSerializer.java
@@ -15,12 +15,15 @@
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.io.SerializedString;
 import io.airlift.slice.SliceOutput;
 import io.trino.hive.formats.HiveFormatUtils;
 import io.trino.hive.formats.line.Column;
 import io.trino.hive.formats.line.LineSerializer;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.Chars;
@@ -37,10 +40,10 @@
 import java.io.OutputStream;
 import java.util.List;
 import java.util.Locale;
-import java.util.function.IntFunction;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.plugin.base.util.JsonUtils.jsonFactory;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DateType.DATE;
@@ -51,7 +54,7 @@
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
-import static java.lang.Float.intBitsToFloat;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Deserializer that is bug for bug compatible with Hive JsonSerDe.
@@ -61,6 +64,7 @@ public class JsonSerializer
 {
     private final RowType type;
     private final JsonFactory jsonFactory;
+    private final FieldWriter[] fieldWriters;
 
     public JsonSerializer(List<Column> columns)
     {
@@ -68,7 +72,9 @@ public JsonSerializer(List<Column> columns)
                 .map(column -> field(column.name().toLowerCase(Locale.ROOT), column.type()))
                 .collect(toImmutableList()));
 
-        jsonFactory = new JsonFactory();
+        fieldWriters = createRowTypeFieldWriters(this.type);
+
+        jsonFactory = jsonFactory();
     }
 
     @Override
@@ -82,157 +88,226 @@ public void write(Page page, int position, SliceOutput sliceOutput)
             throws IOException
     {
         try (JsonGenerator generator = jsonFactory.createGenerator((OutputStream) sliceOutput)) {
-            writeStruct(generator, type, page::getBlock, position);
-        }
-    }
-
-    private static void writeStruct(JsonGenerator generator, RowType rowType, IntFunction<Block> blocks, int position)
-            throws IOException
-    {
-        generator.writeStartObject();
-        List<Field> fields = rowType.getFields();
-        for (int fieldIndex = 0; fieldIndex < fields.size(); fieldIndex++) {
-            Field field = fields.get(fieldIndex);
-            generator.writeFieldName(field.getName().orElseThrow());
-            Block block = blocks.apply(fieldIndex);
-            writeValue(generator, field.getType(), block, position);
+            generator.writeStartObject();
+            for (int field = 0; field < fieldWriters.length; field++) {
+                fieldWriters[field].writeField(generator, page.getBlock(field), position);
+            }
+            generator.writeEndObject();
         }
-        generator.writeEndObject();
     }
 
-    private static void writeValue(JsonGenerator generator, Type type, Block block, int position)
-            throws IOException
+    private static ValueWriter createValueWriter(Type type)
     {
-        if (block.isNull(position)) {
-            generator.writeNull();
-            return;
-        }
-
         if (BOOLEAN.equals(type)) {
-            generator.writeBoolean(BOOLEAN.getBoolean(block, position));
+            return (generator, block, position) -> generator.writeBoolean(BOOLEAN.getBoolean(block, position));
         }
         else if (BIGINT.equals(type)) {
-            generator.writeNumber(BIGINT.getLong(block, position));
+            return (generator, block, position) -> generator.writeNumber(BIGINT.getLong(block, position));
         }
         else if (INTEGER.equals(type)) {
-            generator.writeNumber(INTEGER.getLong(block, position));
+            return (generator, block, position) -> generator.writeNumber(INTEGER.getInt(block, position));
         }
         else if (SMALLINT.equals(type)) {
-            generator.writeNumber(SMALLINT.getLong(block, position));
+            return (generator, block, position) -> generator.writeNumber(SMALLINT.getShort(block, position));
         }
         else if (TINYINT.equals(type)) {
-            generator.writeNumber(TINYINT.getLong(block, position));
+            return (generator, block, position) -> generator.writeNumber(TINYINT.getByte(block, position));
         }
-        else if (type instanceof DecimalType) {
-            SqlDecimal value = (SqlDecimal) type.getObjectValue(null, block, position);
-            generator.writeNumber(value.toBigDecimal().toString());
+        else if (type instanceof DecimalType decimalType) {
+            return (generator, block, position) -> {
+                SqlDecimal value = (SqlDecimal) decimalType.getObjectValue(null, block, position);
+                generator.writeNumber(value.toBigDecimal().toString());
+            };
         }
         else if (REAL.equals(type)) {
-            generator.writeNumber(intBitsToFloat((int) REAL.getLong(block, position)));
+            return (generator, block, position) -> generator.writeNumber(REAL.getFloat(block, position));
         }
         else if (DOUBLE.equals(type)) {
-            generator.writeNumber(DOUBLE.getDouble(block, position));
+            return (generator, block, position) -> generator.writeNumber(DOUBLE.getDouble(block, position));
         }
         else if (DATE.equals(type)) {
-            generator.writeString(HiveFormatUtils.formatHiveDate(block, position));
+            return (generator, block, position) -> generator.writeString(HiveFormatUtils.formatHiveDate(block, position));
         }
-        else if (type instanceof TimestampType) {
-            generator.writeString(HiveFormatUtils.formatHiveTimestamp(type, block, position));
+        else if (type instanceof TimestampType timestampType) {
+            return (generator, block, position) -> generator.writeString(HiveFormatUtils.formatHiveTimestamp(timestampType, block, position));
         }
         else if (VARBINARY.equals(type)) {
-            // This corrupts the data, but this is exactly what Hive does, so we get the same result as Hive
-            String value = type.getSlice(block, position).toStringUtf8();
-            generator.writeString(value);
+            return (generator, block, position) -> {
+                // This corrupts the data, but this is exactly what Hive does, so we get the same result as Hive
+                String value = VARBINARY.getSlice(block, position).toStringUtf8();
+                generator.writeString(value);
+            };
         }
-        else if (type instanceof VarcharType) {
-            generator.writeString(type.getSlice(block, position).toStringUtf8());
+        else if (type instanceof VarcharType varcharType) {
+            return (generator, block, position) -> generator.writeString(varcharType.getSlice(block, position).toStringUtf8());
         }
         else if (type instanceof CharType charType) {
-            generator.writeString(Chars.padSpaces(charType.getSlice(block, position), charType).toStringUtf8());
+            return (generator, block, position) -> generator.writeString(Chars.padSpaces(charType.getSlice(block, position), charType).toStringUtf8());
         }
         else if (type instanceof ArrayType arrayType) {
-            Type elementType = arrayType.getElementType();
-            Block arrayBlock = arrayType.getObject(block, position);
-
-            generator.writeStartArray();
-            for (int arrayIndex = 0; arrayIndex < arrayBlock.getPositionCount(); arrayIndex++) {
-                writeValue(generator, elementType, arrayBlock, arrayIndex);
-            }
-            generator.writeEndArray();
+            return new ArrayValueWriter(arrayType, createValueWriter(arrayType.getElementType()));
         }
         else if (type instanceof MapType mapType) {
-            Type keyType = mapType.getKeyType();
-            Type valueType = mapType.getValueType();
-            Block mapBlock = mapType.getObject(block, position);
-
-            generator.writeStartObject();
-            for (int mapIndex = 0; mapIndex < mapBlock.getPositionCount(); mapIndex += 2) {
-                generator.writeFieldName(toMapKey(keyType, mapBlock, mapIndex));
-                writeValue(generator, valueType, mapBlock, mapIndex + 1);
-            }
-            generator.writeEndObject();
+            return new MapValueWriter(mapType, createMapKeyFunction(mapType.getKeyType()), createValueWriter(mapType.getValueType()));
         }
         else if (type instanceof RowType rowType) {
-            List<Field> fields = rowType.getFields();
-            Block rowBlock = rowType.getObject(block, position);
-
-            generator.writeStartObject();
-            for (int fieldIndex = 0; fieldIndex < fields.size(); fieldIndex++) {
-                Field field = fields.get(fieldIndex);
-                generator.writeFieldName(field.getName().orElseThrow());
-                writeValue(generator, field.getType(), rowBlock, fieldIndex);
-            }
-            generator.writeEndObject();
+            return new RowValueWriter(rowType, createRowTypeFieldWriters(rowType));
         }
         else {
             throw new UnsupportedOperationException("Unsupported column type: " + type);
         }
     }
 
-    private static String toMapKey(Type type, Block block, int position)
+    private static FieldWriter[] createRowTypeFieldWriters(RowType rowType)
     {
-        checkArgument(!block.isNull(position), "map key is null");
+        List<Field> fields = rowType.getFields();
+        FieldWriter[] writers = new FieldWriter[fields.size()];
+        int index = 0;
+        for (Field field : fields) {
+            writers[index++] = new FieldWriter(new SerializedString(field.getName().orElseThrow()), createValueWriter(field.getType()));
+        }
+        return writers;
+    }
 
+    private static ToMapKeyFunction createMapKeyFunction(Type type)
+    {
         if (BOOLEAN.equals(type)) {
-            return String.valueOf(BOOLEAN.getBoolean(block, position));
+            return (block, position) -> String.valueOf(BOOLEAN.getBoolean(block, position));
         }
         else if (BIGINT.equals(type)) {
-            return String.valueOf(BIGINT.getLong(block, position));
+            return (block, position) -> String.valueOf(BIGINT.getLong(block, position));
         }
         else if (INTEGER.equals(type)) {
-            return String.valueOf(INTEGER.getLong(block, position));
+            return (block, position) -> String.valueOf(INTEGER.getInt(block, position));
         }
         else if (SMALLINT.equals(type)) {
-            return String.valueOf(SMALLINT.getLong(block, position));
+            return (block, position) -> String.valueOf(SMALLINT.getShort(block, position));
         }
         else if (TINYINT.equals(type)) {
-            return String.valueOf(TINYINT.getLong(block, position));
+            return (block, position) -> String.valueOf(TINYINT.getByte(block, position));
         }
-        else if (type instanceof DecimalType) {
-            return type.getObjectValue(null, block, position).toString();
+        else if (type instanceof DecimalType decimalType) {
+            return (block, position) -> decimalType.getObjectValue(null, block, position).toString();
         }
         else if (REAL.equals(type)) {
-            return String.valueOf(intBitsToFloat((int) REAL.getLong(block, position)));
+            return (block, position) -> String.valueOf(REAL.getFloat(block, position));
         }
         else if (DOUBLE.equals(type)) {
-            return String.valueOf(DOUBLE.getDouble(block, position));
+            return (block, position) -> String.valueOf(DOUBLE.getDouble(block, position));
         }
         else if (DATE.equals(type)) {
-            return HiveFormatUtils.formatHiveDate(block, position);
+            return HiveFormatUtils::formatHiveDate;
         }
-        else if (type instanceof TimestampType) {
-            return HiveFormatUtils.formatHiveTimestamp(type, block, position);
+        else if (type instanceof TimestampType timestampType) {
+            return (block, position) -> HiveFormatUtils.formatHiveTimestamp(timestampType, block, position);
         }
         else if (VARBINARY.equals(type)) {
             // This corrupts the data, but this is exactly what Hive does, so we get the same result as Hive
-            return type.getSlice(block, position).toStringUtf8();
+            return (block, position) -> VARBINARY.getSlice(block, position).toStringUtf8();
         }
-        else if (type instanceof VarcharType) {
-            return type.getSlice(block, position).toStringUtf8();
+        else if (type instanceof VarcharType varcharType) {
+            return (block, position) -> varcharType.getSlice(block, position).toStringUtf8();
         }
         else if (type instanceof CharType charType) {
-            return Chars.padSpaces(charType.getSlice(block, position), charType).toStringUtf8();
+            return (block, position) -> Chars.padSpaces(charType.getSlice(block, position), charType).toStringUtf8();
         }
         throw new UnsupportedOperationException("Unsupported map key type: " + type);
     }
+
+    private record FieldWriter(SerializedString fieldName, ValueWriter valueWriter)
+    {
+        /**
+         * Writes the combined field name and value for the given position into the JSON output
+         */
+        public void writeField(JsonGenerator generator, Block block, int position)
+                throws IOException
+        {
+            generator.writeFieldName(fieldName);
+            valueWriter.writeValue(generator, block, position);
+        }
+    }
+
+    private interface ValueWriter
+    {
+        default void writeValue(JsonGenerator generator, Block block, int position)
+                throws IOException
+        {
+            if (block.isNull(position)) {
+                generator.writeNull();
+            }
+            else {
+                writeNonNull(generator, block, position);
+            }
+        }
+
+        /**
+         * Writes only a single position value as JSON without any field name. This caller <strong>must</strong> ensure
+         * that the block position is non-null before invoking this method.
+         */
+        void writeNonNull(JsonGenerator generator, Block block, int position)
+                throws IOException;
+    }
+
+    private record ArrayValueWriter(ArrayType arrayType, ValueWriter elementWriter)
+            implements ValueWriter
+    {
+        @Override
+        public void writeNonNull(JsonGenerator generator, Block block, int position)
+                throws IOException
+        {
+            Block arrayBlock = requireNonNull(arrayType.getObject(block, position));
+            generator.writeStartArray();
+            for (int arrayIndex = 0; arrayIndex < arrayBlock.getPositionCount(); arrayIndex++) {
+                elementWriter.writeValue(generator, arrayBlock, arrayIndex);
+            }
+            generator.writeEndArray();
+        }
+    }
+
+    private interface ToMapKeyFunction
+    {
+        String apply(Block mapBlock, int mapIndex);
+    }
+
+    private record MapValueWriter(MapType mapType, ToMapKeyFunction toMapKey, ValueWriter valueWriter)
+            implements ValueWriter
+    {
+        @Override
+        public void writeNonNull(JsonGenerator generator, Block block, int position)
+                throws IOException
+        {
+            SqlMap sqlMap = requireNonNull(mapType.getObject(block, position));
+            int rawOffset = sqlMap.getRawOffset();
+            Block rawKeyBlock = sqlMap.getRawKeyBlock();
+            Block rawValueBlock = sqlMap.getRawValueBlock();
+
+            generator.writeStartObject();
+            for (int i = 0; i < sqlMap.getSize(); i++) {
+                checkArgument(!rawKeyBlock.isNull(rawOffset + i), "map key is null");
+                generator.writeFieldName(toMapKey.apply(rawKeyBlock, rawOffset + i));
+                valueWriter.writeValue(generator, rawValueBlock, rawOffset + i);
+            }
+            generator.writeEndObject();
+        }
+    }
+
+    private record RowValueWriter(RowType rowType, FieldWriter[] fieldWriters)
+            implements ValueWriter
+    {
+        @Override
+        public void writeNonNull(JsonGenerator generator, Block block, int position)
+                throws IOException
+        {
+            SqlRow sqlRow = rowType.getObject(block, position);
+            int rawIndex = sqlRow.getRawIndex();
+
+            generator.writeStartObject();
+            for (int field = 0; field < fieldWriters.length; field++) {
+                FieldWriter writer = fieldWriters[field];
+                Block fieldBlock = sqlRow.getRawFieldBlock(field);
+                writer.writeField(generator, fieldBlock, rawIndex);
+            }
+            generator.writeEndObject();
+        }
+    }
 }
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/openxjson/OpenXJsonDeserializer.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/openxjson/OpenXJsonDeserializer.java
index 80711b97955a..74698cb1956c 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/openxjson/OpenXJsonDeserializer.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/openxjson/OpenXJsonDeserializer.java
@@ -24,9 +24,11 @@
 import io.trino.plugin.base.type.DecodedTimestamp;
 import io.trino.plugin.base.type.TrinoTimestampEncoder;
 import io.trino.spi.PageBuilder;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.SingleRowBlockWriter;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
@@ -658,18 +660,17 @@ void decodeValue(Object jsonValue, BlockBuilder builder)
                 return;
             }
 
-            BlockBuilder elementBuilder = builder.beginBlockEntry();
-
-            if (jsonValue instanceof List<?> jsonArray) {
-                for (Object element : jsonArray) {
-                    elementDecoder.decode(element, elementBuilder);
+            ((ArrayBlockBuilder) builder).buildEntry(elementBuilder -> {
+                if (jsonValue instanceof List<?> jsonArray) {
+                    for (Object element : jsonArray) {
+                        elementDecoder.decode(element, elementBuilder);
+                    }
                 }
-            }
-            else {
-                // all other values are coerced to a single element array
-                elementDecoder.decode(jsonValue, elementBuilder);
-            }
-            builder.closeEntry();
+                else {
+                    // all other values are coerced to a single element array
+                    elementDecoder.decode(jsonValue, elementBuilder);
+                }
+            });
         }
     }
 
@@ -681,7 +682,7 @@ private static class MapDecoder
         private final Type keyType;
 
         private final DistinctMapKeys distinctMapKeys;
-        private BlockBuilder keyBlockBuilder;
+        private BlockBuilder tempKeyBlockBuilder;
 
         public MapDecoder(MapType mapType, Decoder keyDecoder, Decoder valueDecoder)
         {
@@ -690,7 +691,7 @@ public MapDecoder(MapType mapType, Decoder keyDecoder, Decoder valueDecoder)
             this.valueDecoder = valueDecoder;
 
             this.distinctMapKeys = new DistinctMapKeys(mapType, true);
-            this.keyBlockBuilder = mapType.getKeyType().createBlockBuilder(null, 128);
+            this.tempKeyBlockBuilder = mapType.getKeyType().createBlockBuilder(null, 128);
         }
 
         @Override
@@ -713,16 +714,16 @@ void decodeValue(Object jsonValue, BlockBuilder builder)
             Block keyBlock = readKeys(fieldNames);
             boolean[] distinctKeys = distinctMapKeys.selectDistinctKeys(keyBlock);
 
-            BlockBuilder entryBuilder = builder.beginBlockEntry();
-            int keyIndex = 0;
-            for (Object fieldName : fieldNames) {
-                if (distinctKeys[keyIndex]) {
-                    keyType.appendTo(keyBlock, keyIndex, entryBuilder);
-                    valueDecoder.decode(jsonObject.get(fieldName), entryBuilder);
+            ((MapBlockBuilder) builder).buildEntry((keyBuilder, valueBuilder) -> {
+                int keyIndex = 0;
+                for (Object fieldName : fieldNames) {
+                    if (distinctKeys[keyIndex]) {
+                        keyType.appendTo(keyBlock, keyIndex, keyBuilder);
+                        valueDecoder.decode(jsonObject.get(fieldName), valueBuilder);
+                    }
+                    keyIndex++;
                 }
-                keyIndex++;
-            }
-            builder.closeEntry();
+            });
         }
 
         private Block readKeys(Collection<?> fieldNames)
@@ -731,11 +732,11 @@ private Block readKeys(Collection<?> fieldNames)
                 // field names are always processed as a quoted JSON string even though they may
                 // have not been quoted in the original JSON text
                 JsonString jsonValue = new JsonString(fieldName.toString(), true);
-                keyDecoder.decode(jsonValue, keyBlockBuilder);
+                keyDecoder.decode(jsonValue, tempKeyBlockBuilder);
             }
 
-            Block keyBlock = keyBlockBuilder.build();
-            keyBlockBuilder = keyType.createBlockBuilder(null, keyBlock.getPositionCount());
+            Block keyBlock = tempKeyBlockBuilder.build();
+            tempKeyBlockBuilder = keyType.createBlockBuilder(null, keyBlock.getPositionCount());
             return keyBlock;
         }
     }
@@ -759,7 +760,6 @@ public RowDecoder(RowType rowType, OpenXJsonOptions options, List<Decoder> field
         }
 
         public void decode(Object jsonValue, PageBuilder builder)
-                throws IOException
         {
             builder.declarePosition();
             decodeValue(jsonValue, builder::getBlockBuilder);
@@ -768,9 +768,7 @@ public void decode(Object jsonValue, PageBuilder builder)
         @Override
         void decodeValue(Object jsonValue, BlockBuilder builder)
         {
-            SingleRowBlockWriter currentBuilder = (SingleRowBlockWriter) builder.beginBlockEntry();
-            decodeValue(jsonValue, currentBuilder::getFieldBlockBuilder);
-            builder.closeEntry();
+            ((RowBlockBuilder) builder).buildEntry(fieldBuilders -> decodeValue(jsonValue, fieldBuilders::get));
         }
 
         private void decodeValue(Object jsonValue, IntFunction<BlockBuilder> fieldBuilders)
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/openxjson/OpenXJsonSerializer.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/openxjson/OpenXJsonSerializer.java
index b48a8d84ea2d..63f8600765d9 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/openxjson/OpenXJsonSerializer.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/openxjson/OpenXJsonSerializer.java
@@ -20,6 +20,8 @@
 import io.trino.hive.formats.line.LineSerializer;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.Chars;
@@ -57,7 +59,6 @@
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
-import static java.lang.Float.intBitsToFloat;
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.HOUR_OF_DAY;
 import static java.time.temporal.ChronoField.MINUTE_OF_HOUR;
@@ -141,13 +142,13 @@ else if (BIGINT.equals(type)) {
             return BIGINT.getLong(block, position);
         }
         else if (INTEGER.equals(type)) {
-            return INTEGER.getLong(block, position);
+            return INTEGER.getInt(block, position);
         }
         else if (SMALLINT.equals(type)) {
-            return SMALLINT.getLong(block, position);
+            return SMALLINT.getShort(block, position);
         }
         else if (TINYINT.equals(type)) {
-            return TINYINT.getLong(block, position);
+            return TINYINT.getByte(block, position);
         }
         else if (type instanceof DecimalType) {
             // decimal type is read-only in Hive, but we support it
@@ -155,7 +156,7 @@ else if (type instanceof DecimalType) {
             return value.toBigDecimal().toString();
         }
         else if (REAL.equals(type)) {
-            return intBitsToFloat((int) REAL.getLong(block, position));
+            return REAL.getFloat(block, position);
         }
         else if (DOUBLE.equals(type)) {
             return DOUBLE.getDouble(block, position);
@@ -197,12 +198,16 @@ else if (type instanceof MapType mapType) {
                 throw new RuntimeException("Unsupported map key type: " + keyType);
             }
             Type valueType = mapType.getValueType();
-            Block mapBlock = mapType.getObject(block, position);
+            SqlMap sqlMap = mapType.getObject(block, position);
+
+            int rawOffset = sqlMap.getRawOffset();
+            Block rawKeyBlock = sqlMap.getRawKeyBlock();
+            Block rawValueBlock = sqlMap.getRawValueBlock();
 
             Map<String, Object> jsonMap = new LinkedHashMap<>();
-            for (int mapIndex = 0; mapIndex < mapBlock.getPositionCount(); mapIndex += 2) {
+            for (int mapIndex = 0; mapIndex < sqlMap.getSize(); mapIndex++) {
                 try {
-                    Object key = writeValue(keyType, mapBlock, mapIndex);
+                    Object key = writeValue(keyType, rawKeyBlock, rawOffset + mapIndex);
                     if (key == null) {
                         throw new RuntimeException("OpenX JsonSerDe can not write a null map key");
                     }
@@ -217,7 +222,7 @@ else if (key instanceof List<?> list) {
                         fieldName = key.toString();
                     }
 
-                    Object value = writeValue(valueType, mapBlock, mapIndex + 1);
+                    Object value = writeValue(valueType, rawValueBlock, rawOffset + mapIndex);
                     jsonMap.put(fieldName, value);
                 }
                 catch (InvalidJsonException ignored) {
@@ -227,13 +232,15 @@ else if (key instanceof List<?> list) {
         }
         else if (type instanceof RowType rowType) {
             List<Field> fields = rowType.getFields();
-            Block rowBlock = rowType.getObject(block, position);
+            SqlRow sqlRow = rowType.getObject(block, position);
+            int rawIndex = sqlRow.getRawIndex();
 
             Map<String, Object> jsonObject = new LinkedHashMap<>();
             for (int fieldIndex = 0; fieldIndex < fields.size(); fieldIndex++) {
                 Field field = fields.get(fieldIndex);
+                Block fieldBlock = sqlRow.getRawFieldBlock(fieldIndex);
                 String fieldName = field.getName().orElseThrow();
-                Object fieldValue = writeValue(field.getType(), rowBlock, fieldIndex);
+                Object fieldValue = writeValue(field.getType(), fieldBlock, rawIndex);
                 if (options.isExplicitNull() || fieldValue != null) {
                     jsonObject.put(fieldName, fieldValue);
                 }
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/sequence/SequenceFileReader.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/sequence/SequenceFileReader.java
index f779b417c648..1634e7c4308e 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/sequence/SequenceFileReader.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/sequence/SequenceFileReader.java
@@ -20,6 +20,7 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.Slices;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.hive.formats.FileCorruptionException;
 import io.trino.hive.formats.TrinoDataInputStream;
@@ -60,7 +61,7 @@ public final class SequenceFileReader
     private static final int MAX_METADATA_ENTRIES = 500_000;
     private static final int MAX_METADATA_STRING_LENGTH = 1024 * 1024;
 
-    private final String location;
+    private final Location location;
     private final TrinoDataInputStream input;
 
     private final String keyClassName;
@@ -170,7 +171,7 @@ public SequenceFileReader(TrinoInputFile inputFile, long offset, long length)
         }
     }
 
-    public String getFileLocation()
+    public Location getFileLocation()
     {
         return location;
     }
@@ -280,7 +281,7 @@ private static class SingleValueReader
     {
         private static final int INSTANCE_SIZE = instanceSize(SingleValueReader.class);
 
-        private final String location;
+        private final Location location;
         private final long fileSize;
         private final TrinoDataInputStream input;
         private final ValueDecompressor decompressor;
@@ -293,7 +294,7 @@ private static class SingleValueReader
         private final DynamicSliceOutput uncompressedBuffer = new DynamicSliceOutput(0);
 
         public SingleValueReader(
-                String location,
+                Location location,
                 long fileSize,
                 TrinoDataInputStream input,
                 ValueDecompressor decompressor,
@@ -393,7 +394,7 @@ private static class BlockCompressedValueReader
     {
         private static final int INSTANCE_SIZE = instanceSize(BlockCompressedValueReader.class);
 
-        private final String location;
+        private final Location location;
         private final long fileSize;
         private final TrinoDataInputStream input;
         private final long end;
@@ -407,7 +408,7 @@ private static class BlockCompressedValueReader
         private ValuesBlock valuesBlock = ValuesBlock.EMPTY_VALUES_BLOCK;
 
         public BlockCompressedValueReader(
-                String location,
+                Location location,
                 long fileSize,
                 TrinoDataInputStream input,
                 ValueDecompressor decompressor,
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/sequence/SequenceFileReaderFactory.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/sequence/SequenceFileReaderFactory.java
index 95b942adf41c..782ae5435fbe 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/sequence/SequenceFileReaderFactory.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/sequence/SequenceFileReaderFactory.java
@@ -21,6 +21,8 @@
 
 import java.io.IOException;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 public class SequenceFileReaderFactory
         implements LineReaderFactory
 {
@@ -56,12 +58,16 @@ public LineReader createLineReader(
     {
         LineReader lineReader = new SequenceFileReader(inputFile, start, length);
 
-        //  Only skip header rows when the split is at the beginning of the file
         if (headerCount > 0) {
-            skipHeader(lineReader, headerCount);
+            checkArgument(start == 0 || headerCount == 1, "file cannot be split when there is more than one header row");
+            // header is only skipped at the beginning of the file
+            if (start == 0) {
+                skipHeader(lineReader, headerCount);
+            }
         }
 
         if (footerCount > 0) {
+            checkArgument(start == 0, "file cannot be split when there are footer rows");
             lineReader = new FooterAwareLineReader(lineReader, footerCount, this::createLineBuffer);
         }
         return lineReader;
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/text/TextLineReader.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/text/TextLineReader.java
index b306c82ddaa6..acb7087d6caa 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/text/TextLineReader.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/text/TextLineReader.java
@@ -13,12 +13,16 @@
  */
 package io.trino.hive.formats.line.text;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.CountingInputStream;
+import io.trino.hive.formats.compression.Codec;
 import io.trino.hive.formats.line.LineBuffer;
 import io.trino.hive.formats.line.LineReader;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.OptionalLong;
+import java.util.function.LongSupplier;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
@@ -32,9 +36,11 @@ public final class TextLineReader
 {
     private static final int INSTANCE_SIZE = instanceSize(TextLineReader.class);
 
-    private final CountingInputStream in;
+    private final InputStream in;
     private final byte[] buffer;
-    private final long inputEnd;
+    private final OptionalLong inputEnd;
+    private final LongSupplier rawInputPositionSupplier;
+    private final long initialRawInputPosition;
 
     private boolean firstRecord = true;
     private int bufferStart;
@@ -43,27 +49,48 @@ public final class TextLineReader
     private boolean closed;
     private long readTimeNanos;
 
-    public TextLineReader(InputStream in, int bufferSize)
+    public static TextLineReader createCompressedReader(InputStream in, int bufferSize, Codec codec)
             throws IOException
     {
-        this(in, bufferSize, 0, Long.MAX_VALUE);
+        CountingInputStream countingInputStream = new CountingInputStream(in);
+        LongSupplier rawInputPositionSupplier = countingInputStream::getCount;
+        in = codec.createStreamDecompressor(countingInputStream);
+        return new TextLineReader(in, bufferSize, 0, OptionalLong.empty(), rawInputPositionSupplier);
     }
 
-    public TextLineReader(InputStream in, int bufferSize, long start, long length)
+    public static TextLineReader createUncompressedReader(InputStream in, int bufferSize)
+            throws IOException
+    {
+        return createUncompressedReader(in, bufferSize, 0, Long.MAX_VALUE);
+    }
+
+    public static TextLineReader createUncompressedReader(InputStream in, int bufferSize, long splitStart, long splitLength)
+            throws IOException
+    {
+        CountingInputStream countingInputStream = new CountingInputStream(in);
+        LongSupplier rawInputPositionSupplier = countingInputStream::getCount;
+        return new TextLineReader(countingInputStream, bufferSize, splitStart, OptionalLong.of(splitLength), rawInputPositionSupplier);
+    }
+
+    private TextLineReader(InputStream in, int bufferSize, long splitStart, OptionalLong splitLength, LongSupplier rawInputPositionSupplier)
             throws IOException
     {
         requireNonNull(in, "in is null");
         checkArgument(bufferSize >= 16, "bufferSize must be at least 16 bytes");
         checkArgument(bufferSize <= 1024 * 1024 * 1024, "bufferSize is greater than 1GB");
-        checkArgument(start >= 0, "start is negative");
-        checkArgument(length > 0, "length must be at least one byte");
+        checkArgument(splitStart >= 0, "splitStart is negative");
+        checkArgument(splitLength.orElse(1) > 0, "splitLength must be at least one byte");
+        requireNonNull(rawInputPositionSupplier, "rawInputPositionSupplier is null");
 
-        this.in = new CountingInputStream(in);
+        this.in = in;
         this.buffer = new byte[bufferSize];
-        this.inputEnd = addExact(start, length);
+        this.inputEnd = splitLength.stream().map(length -> addExact(splitStart, length)).findAny();
+        this.rawInputPositionSupplier = rawInputPositionSupplier;
+        // the initial skip is not included in the physical read size
+        this.initialRawInputPosition = splitStart;
 
-        // If reading start of file, skipping UTF-8 BOM, otherwise seek to start position, and skip the remaining line
-        if (start == 0) {
+        // If reading splitStart of file, skipping UTF-8 BOM, otherwise seek to splitStart position, and skip the remaining line
+        if (splitStart == 0) {
             fillBuffer();
             if (bufferEnd >= 3 && buffer[0] == (byte) 0xEF && (buffer[1] == (byte) 0xBB) && (buffer[2] == (byte) 0xBF)) {
                 bufferStart = 3;
@@ -71,7 +98,7 @@ public TextLineReader(InputStream in, int bufferSize, long start, long length)
             }
         }
         else {
-            this.in.skipNBytes(start);
+            this.in.skipNBytes(splitStart);
             if (closed) {
                 return;
             }
@@ -100,16 +127,20 @@ public long getRetainedSize()
         return INSTANCE_SIZE + sizeOf(buffer);
     }
 
+    @VisibleForTesting
     public long getCurrentPosition()
     {
+        if (!(in instanceof CountingInputStream countingInputStream)) {
+            throw new IllegalStateException("Current position only supported for uncompressed files");
+        }
         int currentBufferSize = bufferEnd - bufferPosition;
-        return in.getCount() - currentBufferSize;
+        return countingInputStream.getCount() - currentBufferSize;
     }
 
     @Override
     public long getBytesRead()
     {
-        return in.getCount();
+        return rawInputPositionSupplier.getAsLong() - initialRawInputPosition;
     }
 
     @Override
@@ -124,7 +155,7 @@ public boolean readLine(LineBuffer lineBuffer)
     {
         lineBuffer.reset();
 
-        if (getCurrentPosition() > inputEnd) {
+        if (isAfterEnd()) {
             close();
             return false;
         }
@@ -157,7 +188,7 @@ public boolean readLine(LineBuffer lineBuffer)
             lineBuffer.write(buffer, bufferStart, bufferPosition - bufferStart);
             fillBuffer();
         }
-        // if file does not end in a line terminator, the last line is still valid
+        // if the file does not end in a line terminator, the last line is still valid
         firstRecord = false;
         return !lineBuffer.isEmpty();
     }
@@ -167,7 +198,7 @@ public void skipLines(int lineCount)
     {
         checkArgument(lineCount >= 0, "lineCount is negative");
         while (!closed && lineCount > 0) {
-            if (getCurrentPosition() > inputEnd) {
+            if (isAfterEnd()) {
                 close();
                 return;
             }
@@ -189,6 +220,15 @@ public void skipLines(int lineCount)
         }
     }
 
+    private boolean isAfterEnd()
+    {
+        if (inputEnd.isPresent()) {
+            long currentPosition = getCurrentPosition();
+            return currentPosition > inputEnd.getAsLong();
+        }
+        return false;
+    }
+
     private boolean seekToStartOfLineTerminator()
     {
         while (bufferPosition < bufferEnd) {
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/text/TextLineReaderFactory.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/text/TextLineReaderFactory.java
index 593fa6b23f2b..28752042f738 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/text/TextLineReaderFactory.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/text/TextLineReaderFactory.java
@@ -65,23 +65,27 @@ public LineReader createLineReader(
     {
         InputStream inputStream = inputFile.newStream();
         try {
-            Optional<Codec> codec = CompressionKind.forFile(inputFile.location())
+            Optional<Codec> codec = CompressionKind.forFile(inputFile.location().fileName())
                     .map(CompressionKind::createCodec);
+            LineReader lineReader;
             if (codec.isPresent()) {
                 checkArgument(start == 0, "Compressed files are not splittable");
-                // for compressed input, we do not know the length of the uncompressed text
-                length = Long.MAX_VALUE;
-                inputStream = codec.get().createStreamDecompressor(inputStream);
+                lineReader = TextLineReader.createCompressedReader(inputStream, fileBufferSize, codec.get());
+            }
+            else {
+                lineReader = TextLineReader.createUncompressedReader(inputStream, fileBufferSize, start, length);
             }
 
-            LineReader lineReader = new TextLineReader(inputStream, fileBufferSize, start, length);
-
-            //  Only skip header rows when the split is at the beginning of the file
             if (headerCount > 0) {
-                skipHeader(lineReader, headerCount);
+                checkArgument(start == 0 || headerCount == 1, "file cannot be split when there is more than one header row");
+                // header is only skipped at the beginning of the file
+                if (start == 0) {
+                    skipHeader(lineReader, headerCount);
+                }
             }
 
             if (footerCount > 0) {
+                checkArgument(start == 0, "file cannot be split when there are footer rows");
                 lineReader = new FooterAwareLineReader(lineReader, footerCount, this::createLineBuffer);
             }
             return lineReader;
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/text/TextLineWriter.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/text/TextLineWriter.java
index 8ab37a546b94..b90913cf7ada 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/text/TextLineWriter.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/text/TextLineWriter.java
@@ -41,7 +41,7 @@ public TextLineWriter(OutputStream outputStream, Optional<CompressionKind> compr
             this.outputStream = compressionKind.get().createCodec().createStreamCompressor(countingOutputStream);
         }
         else {
-            this.outputStream = outputStream;
+            this.outputStream = countingOutputStream;
         }
     }
 
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/rcfile/RcFileReader.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/rcfile/RcFileReader.java
index cab6337cd1fd..0195905dd50b 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/rcfile/RcFileReader.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/rcfile/RcFileReader.java
@@ -17,6 +17,7 @@
 import io.airlift.slice.BasicSliceInput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.hive.formats.FileCorruptionException;
 import io.trino.hive.formats.ReadWriteUtils;
@@ -73,7 +74,7 @@ public class RcFileReader
 
     private static final String COLUMN_COUNT_METADATA_KEY = "hive.io.rcfile.column.number";
 
-    private final String location;
+    private final Location location;
     private final long fileSize;
     private final Map<Integer, Type> readColumns;
     private final TrinoDataInputStream input;
@@ -131,7 +132,6 @@ private RcFileReader(
         this.location = inputFile.location();
         this.fileSize = inputFile.length();
         this.readColumns = ImmutableMap.copyOf(requireNonNull(readColumns, "readColumns is null"));
-        this.input = new TrinoDataInputStream(inputFile.newStream());
 
         this.writeValidation = requireNonNull(writeValidation, "writeValidation is null");
         this.writeChecksumBuilder = writeValidation.map(validation -> WriteChecksumBuilder.createWriteChecksumBuilder(readColumns));
@@ -143,100 +143,108 @@ private RcFileReader(
         this.end = offset + length;
         verify(end <= fileSize, "offset plus length is greater than data size");
 
-        // read header
-        Slice magic = input.readSlice(RCFILE_MAGIC.length());
-        boolean compressed;
-        if (RCFILE_MAGIC.equals(magic)) {
-            version = input.readByte();
-            verify(version <= CURRENT_VERSION, "RCFile version %s not supported: %s", version, inputFile.location());
-            validateWrite(validation -> validation.getVersion() == version, "Unexpected file version");
-            compressed = input.readBoolean();
-        }
-        else if (SEQUENCE_FILE_MAGIC.equals(magic)) {
-            validateWrite(validation -> false, "Expected file to start with RCFile magic");
+        this.input = new TrinoDataInputStream(inputFile.newStream());
+        try {
+            // read header
+            Slice magic = input.readSlice(RCFILE_MAGIC.length());
+            boolean compressed;
+            if (RCFILE_MAGIC.equals(magic)) {
+                version = input.readByte();
+                verify(version <= CURRENT_VERSION, "RCFile version %s not supported: %s", version, inputFile.location());
+                validateWrite(validation -> validation.getVersion() == version, "Unexpected file version");
+                compressed = input.readBoolean();
+            }
+            else if (SEQUENCE_FILE_MAGIC.equals(magic)) {
+                validateWrite(validation -> false, "Expected file to start with RCFile magic");
 
-            // first version of RCFile used magic SEQ with version 6
-            byte sequenceFileVersion = input.readByte();
-            verify(sequenceFileVersion == SEQUENCE_FILE_VERSION, "File %s is a SequenceFile not an RCFile", inputFile.location());
+                // first version of RCFile used magic SEQ with version 6
+                byte sequenceFileVersion = input.readByte();
+                verify(sequenceFileVersion == SEQUENCE_FILE_VERSION, "File %s is a SequenceFile not an RCFile", inputFile.location());
 
-            // this is the first version of RCFile
-            this.version = FIRST_VERSION;
+                // this is the first version of RCFile
+                this.version = FIRST_VERSION;
 
-            Slice keyClassName = readLengthPrefixedString(input);
-            Slice valueClassName = readLengthPrefixedString(input);
-            verify(RCFILE_KEY_BUFFER_NAME.equals(keyClassName) && RCFILE_VALUE_BUFFER_NAME.equals(valueClassName), "File %s is a SequenceFile not an RCFile", inputFile);
-            compressed = input.readBoolean();
+                Slice keyClassName = readLengthPrefixedString(input);
+                Slice valueClassName = readLengthPrefixedString(input);
+                verify(RCFILE_KEY_BUFFER_NAME.equals(keyClassName) && RCFILE_VALUE_BUFFER_NAME.equals(valueClassName), "File %s is a SequenceFile not an RCFile", inputFile);
+                compressed = input.readBoolean();
 
-            // RC file is never block compressed
-            if (input.readBoolean()) {
-                throw corrupt("File %s is a SequenceFile not an RCFile", inputFile.location());
+                // RC file is never block compressed
+                if (input.readBoolean()) {
+                    throw corrupt("File %s is a SequenceFile not an RCFile", inputFile.location());
+                }
+            }
+            else {
+                throw corrupt("File %s is not an RCFile", inputFile.location());
             }
-        }
-        else {
-            throw corrupt("File %s is not an RCFile", inputFile.location());
-        }
 
-        // setup the compression codec
-        if (compressed) {
-            String codecClassName = readLengthPrefixedString(input).toStringUtf8();
-            CompressionKind compressionKind = CompressionKind.fromHadoopClassName(codecClassName);
-            checkArgument(compressionKind != LZOP, "LZOP cannot be use with RCFile.  LZO compression can be used, but LZ4 is preferred.");
-            Codec codecFromHadoopClassName = compressionKind.createCodec();
-            validateWrite(validation -> validation.getCodecClassName().equals(Optional.of(codecClassName)), "Unexpected compression codec");
-            this.decompressor = codecFromHadoopClassName.createValueDecompressor();
-        }
-        else {
-            validateWrite(validation -> validation.getCodecClassName().equals(Optional.empty()), "Expected file to be compressed");
-            this.decompressor = null;
-        }
+            // setup the compression codec
+            if (compressed) {
+                String codecClassName = readLengthPrefixedString(input).toStringUtf8();
+                CompressionKind compressionKind = CompressionKind.fromHadoopClassName(codecClassName);
+                checkArgument(compressionKind != LZOP, "LZOP cannot be use with RCFile.  LZO compression can be used, but LZ4 is preferred.");
+                Codec codecFromHadoopClassName = compressionKind.createCodec();
+                validateWrite(validation -> validation.getCodecClassName().equals(Optional.of(codecClassName)), "Unexpected compression codec");
+                this.decompressor = codecFromHadoopClassName.createValueDecompressor();
+            }
+            else {
+                validateWrite(validation -> validation.getCodecClassName().equals(Optional.empty()), "Expected file to be compressed");
+                this.decompressor = null;
+            }
 
-        // read metadata
-        int metadataEntries = Integer.reverseBytes(input.readInt());
-        verify(metadataEntries >= 0, "Invalid metadata entry count %s in RCFile %s", metadataEntries, inputFile.location());
-        verify(metadataEntries <= MAX_METADATA_ENTRIES, "Too many metadata entries (%s) in RCFile %s", metadataEntries, inputFile.location());
-        ImmutableMap.Builder<String, String> metadataBuilder = ImmutableMap.builder();
-        for (int i = 0; i < metadataEntries; i++) {
-            metadataBuilder.put(readLengthPrefixedString(input).toStringUtf8(), readLengthPrefixedString(input).toStringUtf8());
-        }
-        metadata = metadataBuilder.buildOrThrow();
-        validateWrite(validation -> validation.getMetadata().equals(metadata), "Unexpected metadata");
+            // read metadata
+            int metadataEntries = Integer.reverseBytes(input.readInt());
+            verify(metadataEntries >= 0, "Invalid metadata entry count %s in RCFile %s", metadataEntries, inputFile.location());
+            verify(metadataEntries <= MAX_METADATA_ENTRIES, "Too many metadata entries (%s) in RCFile %s", metadataEntries, inputFile.location());
+            ImmutableMap.Builder<String, String> metadataBuilder = ImmutableMap.builder();
+            for (int i = 0; i < metadataEntries; i++) {
+                metadataBuilder.put(readLengthPrefixedString(input).toStringUtf8(), readLengthPrefixedString(input).toStringUtf8());
+            }
+            metadata = metadataBuilder.buildOrThrow();
+            validateWrite(validation -> validation.getMetadata().equals(metadata), "Unexpected metadata");
+
+            // get column count from metadata
+            String columnCountString = metadata.get(COLUMN_COUNT_METADATA_KEY);
+            verify(columnCountString != null, "Column count not specified in metadata RCFile %s", inputFile.location());
+            try {
+                columnCount = Integer.parseInt(columnCountString);
+            }
+            catch (NumberFormatException e) {
+                throw corrupt("Invalid column count %s in RCFile %s", columnCountString, inputFile.location());
+            }
 
-        // get column count from metadata
-        String columnCountString = metadata.get(COLUMN_COUNT_METADATA_KEY);
-        verify(columnCountString != null, "Column count not specified in metadata RCFile %s", inputFile.location());
-        try {
-            columnCount = Integer.parseInt(columnCountString);
-        }
-        catch (NumberFormatException e) {
-            throw corrupt("Invalid column count %s in RCFile %s", columnCountString, inputFile.location());
-        }
+            // initialize columns
+            verify(columnCount <= MAX_COLUMN_COUNT, "Too many columns (%s) in RCFile %s", columnCountString, inputFile.location());
+            columns = new Column[columnCount];
+            for (Entry<Integer, Type> entry : readColumns.entrySet()) {
+                if (entry.getKey() < columnCount) {
+                    ColumnEncoding columnEncoding = encoding.getEncoding(entry.getValue());
+                    columns[entry.getKey()] = new Column(columnEncoding, decompressor);
+                }
+            }
 
-        // initialize columns
-        verify(columnCount <= MAX_COLUMN_COUNT, "Too many columns (%s) in RCFile %s", columnCountString, inputFile.location());
-        columns = new Column[columnCount];
-        for (Entry<Integer, Type> entry : readColumns.entrySet()) {
-            if (entry.getKey() < columnCount) {
-                ColumnEncoding columnEncoding = encoding.getEncoding(entry.getValue());
-                columns[entry.getKey()] = new Column(columnEncoding, decompressor);
+            // read sync bytes
+            syncFirst = input.readLong();
+            validateWrite(validation -> validation.getSyncFirst() == syncFirst, "Unexpected sync sequence");
+            syncSecond = input.readLong();
+            validateWrite(validation -> validation.getSyncSecond() == syncSecond, "Unexpected sync sequence");
+
+            // seek to first sync point within the specified region, unless the region starts at the beginning
+            // of the file.  In that case, the reader owns all row groups up to the first sync point.
+            if (offset != 0) {
+                // if the specified file region does not contain the start of a sync sequence, this call will close the reader
+                long startOfSyncSequence = ReadWriteUtils.findFirstSyncPosition(inputFile, offset, length, syncFirst, syncSecond);
+                if (startOfSyncSequence < 0) {
+                    closeQuietly();
+                    return;
+                }
+                input.seek(startOfSyncSequence);
             }
         }
-
-        // read sync bytes
-        syncFirst = input.readLong();
-        validateWrite(validation -> validation.getSyncFirst() == syncFirst, "Unexpected sync sequence");
-        syncSecond = input.readLong();
-        validateWrite(validation -> validation.getSyncSecond() == syncSecond, "Unexpected sync sequence");
-
-        // seek to first sync point within the specified region, unless the region starts at the beginning
-        // of the file.  In that case, the reader owns all row groups up to the first sync point.
-        if (offset != 0) {
-            // if the specified file region does not contain the start of a sync sequence, this call will close the reader
-            long startOfSyncSequence = ReadWriteUtils.findFirstSyncPosition(inputFile, offset, length, syncFirst, syncSecond);
-            if (startOfSyncSequence < 0) {
-                closeQuietly();
-                return;
+        catch (Throwable throwable) {
+            try (input) {
+                throw throwable;
             }
-            input.seek(startOfSyncSequence);
         }
     }
 
@@ -438,7 +446,7 @@ public Block readBlock(int columnIndex)
         return columns[columnIndex].readBlock(rowGroupPosition, currentChunkRowCount);
     }
 
-    public String getFileLocation()
+    public Location getFileLocation()
     {
         return location;
     }
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/rcfile/RcFileWriter.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/rcfile/RcFileWriter.java
index 3546b831838a..b6ad13a25710 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/rcfile/RcFileWriter.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/rcfile/RcFileWriter.java
@@ -31,8 +31,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/rcfile/ValidationHash.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/rcfile/ValidationHash.java
index dd1f992b0fc5..aa1e7c20161a 100644
--- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/rcfile/ValidationHash.java
+++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/rcfile/ValidationHash.java
@@ -14,7 +14,12 @@
 package io.trino.hive.formats.rcfile;
 
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.InvocationConvention;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 
@@ -22,11 +27,8 @@
 import java.lang.invoke.MethodType;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.type.StandardTypes.ARRAY;
-import static io.trino.spi.type.StandardTypes.MAP;
-import static io.trino.spi.type.StandardTypes.ROW;
 import static java.lang.invoke.MethodHandles.lookup;
 import static java.util.Objects.requireNonNull;
 
@@ -44,15 +46,15 @@ class ValidationHash
             MAP_HASH = lookup().findStatic(
                     ValidationHash.class,
                     "mapSkipNullKeysHash",
-                    MethodType.methodType(long.class, Type.class, ValidationHash.class, ValidationHash.class, Block.class, int.class));
+                    MethodType.methodType(long.class, MapType.class, ValidationHash.class, ValidationHash.class, Block.class, int.class));
             ARRAY_HASH = lookup().findStatic(
                     ValidationHash.class,
                     "arrayHash",
-                    MethodType.methodType(long.class, Type.class, ValidationHash.class, Block.class, int.class));
+                    MethodType.methodType(long.class, ArrayType.class, ValidationHash.class, Block.class, int.class));
             ROW_HASH = lookup().findStatic(
                     ValidationHash.class,
                     "rowHash",
-                    MethodType.methodType(long.class, Type.class, ValidationHash[].class, Block.class, int.class));
+                    MethodType.methodType(long.class, RowType.class, ValidationHash[].class, Block.class, int.class));
         }
         catch (Exception e) {
             throw new RuntimeException(e);
@@ -65,25 +67,25 @@ class ValidationHash
     public static ValidationHash createValidationHash(Type type)
     {
         requireNonNull(type, "type is null");
-        if (type.getTypeSignature().getBase().equals(MAP)) {
-            ValidationHash keyHash = createValidationHash(type.getTypeParameters().get(0));
-            ValidationHash valueHash = createValidationHash(type.getTypeParameters().get(1));
-            return new ValidationHash(MAP_HASH.bindTo(type).bindTo(keyHash).bindTo(valueHash));
+        if (type instanceof MapType mapType) {
+            ValidationHash keyHash = createValidationHash(mapType.getKeyType());
+            ValidationHash valueHash = createValidationHash(mapType.getValueType());
+            return new ValidationHash(MAP_HASH.bindTo(mapType).bindTo(keyHash).bindTo(valueHash));
         }
 
-        if (type.getTypeSignature().getBase().equals(ARRAY)) {
-            ValidationHash elementHash = createValidationHash(type.getTypeParameters().get(0));
-            return new ValidationHash(ARRAY_HASH.bindTo(type).bindTo(elementHash));
+        if (type instanceof ArrayType arrayType) {
+            ValidationHash elementHash = createValidationHash(arrayType.getElementType());
+            return new ValidationHash(ARRAY_HASH.bindTo(arrayType).bindTo(elementHash));
         }
 
-        if (type.getTypeSignature().getBase().equals(ROW)) {
-            ValidationHash[] fieldHashes = type.getTypeParameters().stream()
+        if (type instanceof RowType rowType) {
+            ValidationHash[] fieldHashes = rowType.getTypeParameters().stream()
                     .map(ValidationHash::createValidationHash)
                     .toArray(ValidationHash[]::new);
-            return new ValidationHash(ROW_HASH.bindTo(type).bindTo(fieldHashes));
+            return new ValidationHash(ROW_HASH.bindTo(rowType).bindTo(fieldHashes));
         }
 
-        return new ValidationHash(VALIDATION_TYPE_OPERATORS_CACHE.getHashCodeOperator(type, InvocationConvention.simpleConvention(FAIL_ON_NULL, BLOCK_POSITION)));
+        return new ValidationHash(VALIDATION_TYPE_OPERATORS_CACHE.getHashCodeOperator(type, InvocationConvention.simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)));
     }
 
     private final MethodHandle hashCodeOperator;
@@ -107,22 +109,27 @@ public long hash(Block block, int position)
         }
     }
 
-    private static long mapSkipNullKeysHash(Type type, ValidationHash keyHash, ValidationHash valueHash, Block block, int position)
+    private static long mapSkipNullKeysHash(MapType type, ValidationHash keyHash, ValidationHash valueHash, Block block, int position)
     {
-        Block mapBlock = (Block) type.getObject(block, position);
+        SqlMap sqlMap = type.getObject(block, position);
+
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
         long hash = 0;
-        for (int i = 0; i < mapBlock.getPositionCount(); i += 2) {
-            if (!mapBlock.isNull(i)) {
-                hash += keyHash.hash(mapBlock, i);
-                hash += valueHash.hash(mapBlock, i + 1);
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            if (!rawKeyBlock.isNull(i)) {
+                hash += keyHash.hash(rawKeyBlock, rawOffset + i);
+                hash += valueHash.hash(rawValueBlock, rawOffset + i);
             }
         }
         return hash;
     }
 
-    private static long arrayHash(Type type, ValidationHash elementHash, Block block, int position)
+    private static long arrayHash(ArrayType type, ValidationHash elementHash, Block block, int position)
     {
-        Block array = (Block) type.getObject(block, position);
+        Block array = type.getObject(block, position);
         long hash = 0;
         for (int i = 0; i < array.getPositionCount(); i++) {
             hash = 31 * hash + elementHash.hash(array, i);
@@ -130,12 +137,13 @@ private static long arrayHash(Type type, ValidationHash elementHash, Block block
         return hash;
     }
 
-    private static long rowHash(Type type, ValidationHash[] fieldHashes, Block block, int position)
+    private static long rowHash(RowType type, ValidationHash[] fieldHashes, Block block, int position)
     {
-        Block row = (Block) type.getObject(block, position);
+        SqlRow row = type.getObject(block, position);
+        int rawIndex = row.getRawIndex();
         long hash = 0;
-        for (int i = 0; i < row.getPositionCount(); i++) {
-            hash = 31 * hash + fieldHashes[i].hash(row, i);
+        for (int i = 0; i < row.getFieldCount(); i++) {
+            hash = 31 * hash + fieldHashes[i].hash(row.getRawFieldBlock(i), rawIndex);
         }
         return hash;
     }
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/FormatTestUtils.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/FormatTestUtils.java
index 4d7063b1a023..3a1572050761 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/FormatTestUtils.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/FormatTestUtils.java
@@ -22,7 +22,10 @@
 import io.trino.plugin.base.type.DecodedTimestamp;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
@@ -120,7 +123,7 @@
 import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaStringObjectInspector;
 import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaTimestampObjectInspector;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.data.Offset.offset;
 
 public final class FormatTestUtils
 {
@@ -395,13 +398,13 @@ public static void assertColumnValuesEquals(List<Column> columns, List<Object> a
     public static void assertColumnValueEquals(Type type, Object actual, Object expected)
     {
         if (actual == null || expected == null) {
-            assertEquals(actual, expected);
+            assertThat(actual).isEqualTo(expected);
             return;
         }
         if (type instanceof ArrayType) {
             List<?> actualArray = (List<?>) actual;
             List<?> expectedArray = (List<?>) expected;
-            assertEquals(actualArray.size(), expectedArray.size());
+            assertThat(actualArray.size()).isEqualTo(expectedArray.size());
 
             Type elementType = type.getTypeParameters().get(0);
             for (int i = 0; i < actualArray.size(); i++) {
@@ -413,7 +416,7 @@ public static void assertColumnValueEquals(Type type, Object actual, Object expe
         else if (type instanceof MapType) {
             Map<?, ?> actualMap = (Map<?, ?>) actual;
             Map<?, ?> expectedMap = (Map<?, ?>) expected;
-            assertEquals(actualMap.size(), expectedMap.size());
+            assertThat(actualMap.size()).isEqualTo(expectedMap.size());
 
             Type keyType = type.getTypeParameters().get(0);
             Type valueType = type.getTypeParameters().get(1);
@@ -439,8 +442,8 @@ else if (type instanceof RowType) {
 
             List<?> actualRow = (List<?>) actual;
             List<?> expectedRow = (List<?>) expected;
-            assertEquals(actualRow.size(), fieldTypes.size());
-            assertEquals(actualRow.size(), expectedRow.size());
+            assertThat(actualRow.size()).isEqualTo(fieldTypes.size());
+            assertThat(actualRow.size()).isEqualTo(expectedRow.size());
 
             for (int fieldId = 0; fieldId < actualRow.size(); fieldId++) {
                 Type fieldType = fieldTypes.get(fieldId);
@@ -452,10 +455,11 @@ else if (type instanceof RowType) {
         else if (type.equals(DOUBLE)) {
             Double actualDouble = (Double) actual;
             Double expectedDouble = (Double) expected;
-            assertEquals(actualDouble, expectedDouble, 0.001);
+            assertThat(actualDouble)
+                    .isCloseTo(expectedDouble, offset(0.001));
         }
         else if (!Objects.equals(actual, expected)) {
-            assertEquals(actual, expected);
+            assertThat(actual).isEqualTo(expected);
         }
     }
 
@@ -538,32 +542,30 @@ else if (type instanceof TimestampType timestampType) {
         else if (type instanceof ArrayType) {
             List<?> array = (List<?>) value;
             Type elementType = type.getTypeParameters().get(0);
-            BlockBuilder arrayBlockBuilder = blockBuilder.beginBlockEntry();
-            for (Object elementValue : array) {
-                writeTrinoValue(elementType, arrayBlockBuilder, elementValue);
-            }
-            blockBuilder.closeEntry();
+            ((ArrayBlockBuilder) blockBuilder).buildEntry(elementBuilder -> {
+                for (Object elementValue : array) {
+                    writeTrinoValue(elementType, elementBuilder, elementValue);
+                }
+            });
         }
         else if (type instanceof MapType) {
             Map<?, ?> map = (Map<?, ?>) value;
             Type keyType = type.getTypeParameters().get(0);
             Type valueType = type.getTypeParameters().get(1);
-            BlockBuilder mapBlockBuilder = blockBuilder.beginBlockEntry();
-            map.forEach((entryKey, entryValue) -> {
-                writeTrinoValue(keyType, mapBlockBuilder, entryKey);
-                writeTrinoValue(valueType, mapBlockBuilder, entryValue);
-            });
-            blockBuilder.closeEntry();
+            ((MapBlockBuilder) blockBuilder).buildEntry((keyBuilder, valueBuilder) -> map.forEach((entryKey, entryValue) -> {
+                writeTrinoValue(keyType, keyBuilder, entryKey);
+                writeTrinoValue(valueType, valueBuilder, entryValue);
+            }));
         }
         else if (type instanceof RowType) {
             List<?> array = (List<?>) value;
             List<Type> fieldTypes = type.getTypeParameters();
-            BlockBuilder rowBlockBuilder = blockBuilder.beginBlockEntry();
-            for (int fieldId = 0; fieldId < fieldTypes.size(); fieldId++) {
-                Type fieldType = fieldTypes.get(fieldId);
-                writeTrinoValue(fieldType, rowBlockBuilder, array.get(fieldId));
-            }
-            blockBuilder.closeEntry();
+            ((RowBlockBuilder) blockBuilder).buildEntry(fieldBuilders -> {
+                for (int fieldId = 0; fieldId < fieldTypes.size(); fieldId++) {
+                    Type fieldType = fieldTypes.get(fieldId);
+                    writeTrinoValue(fieldType, fieldBuilders.get(fieldId), array.get(fieldId));
+                }
+            });
         }
         else {
             throw new IllegalArgumentException("Unsupported type: " + type);
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestDataOutputStream.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestDataOutputStream.java
index 9a56cfb9078a..beb78a9c6739 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestDataOutputStream.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestDataOutputStream.java
@@ -15,15 +15,14 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.concurrent.ThreadLocalRandom;
 
 import static io.airlift.slice.SizeOf.instanceSize;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDataOutputStream
 {
@@ -120,8 +119,7 @@ public void testEncodingFloat()
     public void testEncodingBytes()
             throws Exception
     {
-        byte[] data = new byte[18000];
-        ThreadLocalRandom.current().nextBytes(data);
+        byte[] data = Slices.random(18000).byteArray();
 
         assertEncoding(sliceOutput -> sliceOutput.write(data), data);
         assertEncoding(sliceOutput -> sliceOutput.write(data, 0, 0), Arrays.copyOfRange(data, 0, 0));
@@ -138,9 +136,8 @@ public void testEncodingBytes()
     public void testEncodingSlice()
             throws Exception
     {
-        byte[] data = new byte[18000];
-        ThreadLocalRandom.current().nextBytes(data);
-        Slice slice = Slices.wrappedBuffer(data);
+        Slice slice = Slices.random(18000);
+        byte[] data = slice.byteArray();
 
         assertEncoding(sliceOutput -> sliceOutput.write(slice), data);
         assertEncoding(sliceOutput -> sliceOutput.write(slice, 0, 0), Arrays.copyOfRange(data, 0, 0));
@@ -181,10 +178,10 @@ public void testRetainedSize()
         DataOutputStream output = new DataOutputStream(new ByteArrayOutputStream(0), bufferSize);
 
         long originalRetainedSize = output.getRetainedSize();
-        assertEquals(originalRetainedSize, instanceSize(DataOutputStream.class) + Slices.allocate(bufferSize).getRetainedSize());
+        assertThat(originalRetainedSize).isEqualTo(instanceSize(DataOutputStream.class) + Slices.allocate(bufferSize).getRetainedSize());
         output.writeLong(0);
         output.writeShort(0);
-        assertEquals(output.getRetainedSize(), originalRetainedSize);
+        assertThat(output.getRetainedSize()).isEqualTo(originalRetainedSize);
     }
 
     /**
@@ -218,12 +215,12 @@ private static void assertEncoding(DataOutputTester operations, int offset, byte
         try (DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream, 16384)) {
             dataOutputStream.writeZero(offset);
             operations.test(dataOutputStream);
-            assertEquals(dataOutputStream.longSize(), offset + output.length);
+            assertThat(dataOutputStream.longSize()).isEqualTo(offset + output.length);
         }
 
         byte[] expected = new byte[offset + output.length];
         System.arraycopy(output, 0, expected, offset, output.length);
-        assertEquals(byteArrayOutputStream.toByteArray(), expected);
+        assertThat(byteArrayOutputStream.toByteArray()).isEqualTo(expected);
     }
 
     private interface DataOutputTester
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestHiveFormatUtils.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestHiveFormatUtils.java
index 81dc7f1e4e64..dc74158c1cfa 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestHiveFormatUtils.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestHiveFormatUtils.java
@@ -13,12 +13,12 @@
  */
 package io.trino.hive.formats;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 
 import static io.trino.hive.formats.HiveFormatUtils.parseHiveDate;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveFormatUtils
 {
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestReadWriteUtils.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestReadWriteUtils.java
index 07222943d4d9..b6be7b26d177 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestReadWriteUtils.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestReadWriteUtils.java
@@ -17,12 +17,12 @@
 import io.airlift.slice.SliceOutput;
 import io.airlift.slice.Slices;
 import org.apache.hadoop.io.WritableUtils;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
 import static io.trino.hive.formats.ReadWriteUtils.computeVIntLength;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestReadWriteUtils
 {
@@ -31,33 +31,33 @@ public void testVIntLength()
     {
         SliceOutput output = Slices.allocate(100).getOutput();
 
-        assertEquals(calculateVintLength(output, Integer.MAX_VALUE), 5);
+        assertThat(calculateVintLength(output, Integer.MAX_VALUE)).isEqualTo(5);
 
-        assertEquals(calculateVintLength(output, 16777216), 5);
-        assertEquals(calculateVintLength(output, 16777215), 4);
+        assertThat(calculateVintLength(output, 16777216)).isEqualTo(5);
+        assertThat(calculateVintLength(output, 16777215)).isEqualTo(4);
 
-        assertEquals(calculateVintLength(output, 65536), 4);
-        assertEquals(calculateVintLength(output, 65535), 3);
+        assertThat(calculateVintLength(output, 65536)).isEqualTo(4);
+        assertThat(calculateVintLength(output, 65535)).isEqualTo(3);
 
-        assertEquals(calculateVintLength(output, 256), 3);
-        assertEquals(calculateVintLength(output, 255), 2);
+        assertThat(calculateVintLength(output, 256)).isEqualTo(3);
+        assertThat(calculateVintLength(output, 255)).isEqualTo(2);
 
-        assertEquals(calculateVintLength(output, 128), 2);
-        assertEquals(calculateVintLength(output, 127), 1);
+        assertThat(calculateVintLength(output, 128)).isEqualTo(2);
+        assertThat(calculateVintLength(output, 127)).isEqualTo(1);
 
-        assertEquals(calculateVintLength(output, -112), 1);
-        assertEquals(calculateVintLength(output, -113), 2);
+        assertThat(calculateVintLength(output, -112)).isEqualTo(1);
+        assertThat(calculateVintLength(output, -113)).isEqualTo(2);
 
-        assertEquals(calculateVintLength(output, -256), 2);
-        assertEquals(calculateVintLength(output, -257), 3);
+        assertThat(calculateVintLength(output, -256)).isEqualTo(2);
+        assertThat(calculateVintLength(output, -257)).isEqualTo(3);
 
-        assertEquals(calculateVintLength(output, -65536), 3);
-        assertEquals(calculateVintLength(output, -65537), 4);
+        assertThat(calculateVintLength(output, -65536)).isEqualTo(3);
+        assertThat(calculateVintLength(output, -65537)).isEqualTo(4);
 
-        assertEquals(calculateVintLength(output, -16777216), 4);
-        assertEquals(calculateVintLength(output, -16777217), 5);
+        assertThat(calculateVintLength(output, -16777216)).isEqualTo(4);
+        assertThat(calculateVintLength(output, -16777217)).isEqualTo(5);
 
-        assertEquals(calculateVintLength(output, Integer.MIN_VALUE), 5);
+        assertThat(calculateVintLength(output, Integer.MIN_VALUE)).isEqualTo(5);
     }
 
     private static int calculateVintLength(SliceOutput output, int value)
@@ -67,7 +67,7 @@ private static int calculateVintLength(SliceOutput output, int value)
         ReadWriteUtils.writeVLong(output, value);
         int expectedSize = output.size();
 
-        assertEquals(computeVIntLength(value), expectedSize);
+        assertThat(computeVIntLength(value)).isEqualTo(expectedSize);
         return expectedSize;
     }
 
@@ -102,13 +102,13 @@ private static void assertVIntRoundTrip(SliceOutput output, long value)
         Slice oldBytes = writeVint(output, value);
 
         long readValueOld = WritableUtils.readVLong(oldBytes.getInput());
-        assertEquals(readValueOld, value);
+        assertThat(readValueOld).isEqualTo(value);
 
         long readValueNew = ReadWriteUtils.readVInt(oldBytes, 0);
-        assertEquals(readValueNew, value);
+        assertThat(readValueNew).isEqualTo(value);
 
         long readValueNewStream = ReadWriteUtils.readVInt(oldBytes.getInput());
-        assertEquals(readValueNewStream, value);
+        assertThat(readValueNewStream).isEqualTo(value);
     }
 
     private static Slice writeVint(SliceOutput output, long value)
@@ -116,25 +116,25 @@ private static Slice writeVint(SliceOutput output, long value)
     {
         output.reset();
         WritableUtils.writeVLong(output, value);
-        Slice vLongOld = Slices.copyOf(output.slice());
+        Slice vLongOld = output.slice().copy();
 
         output.reset();
         ReadWriteUtils.writeVLong(output, value);
-        Slice vLongNew = Slices.copyOf(output.slice());
-        assertEquals(vLongNew, vLongOld);
+        Slice vLongNew = output.slice().copy();
+        assertThat(vLongNew).isEqualTo(vLongOld);
 
         if (value == (int) value) {
             output.reset();
             WritableUtils.writeVInt(output, (int) value);
-            Slice vIntOld = Slices.copyOf(output.slice());
-            assertEquals(vIntOld, vLongOld);
+            Slice vIntOld = output.slice().copy();
+            assertThat(vIntOld).isEqualTo(vLongOld);
 
             output.reset();
             ReadWriteUtils.writeVInt(output, (int) value);
-            Slice vIntNew = Slices.copyOf(output.slice());
-            assertEquals(vIntNew, vLongOld);
+            Slice vIntNew = output.slice().copy();
+            assertThat(vIntNew).isEqualTo(vLongOld);
 
-            assertEquals(computeVIntLength((int) value), vIntNew.length());
+            assertThat(computeVIntLength((int) value)).isEqualTo(vIntNew.length());
         }
         return vLongOld;
     }
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestTrinoDataInputStream.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestTrinoDataInputStream.java
index 1807e75ac27f..d99a82a8f2f0 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestTrinoDataInputStream.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/TestTrinoDataInputStream.java
@@ -18,9 +18,11 @@
 import com.google.common.io.ByteStreams;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInputFile;
 import io.trino.filesystem.TrinoInputStream;
-import io.trino.filesystem.memory.MemoryTrinoInputStream;
-import org.testng.annotations.Test;
+import io.trino.filesystem.memory.MemoryInputFile;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.EOFException;
@@ -37,10 +39,8 @@
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOfByteArray;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @SuppressWarnings("resource")
 public class TestTrinoDataInputStream
@@ -73,7 +73,7 @@ public void loadValue(DataOutputStream output, int valueIndex)
             public void verifyValue(TrinoDataInputStream input, int valueIndex)
                     throws IOException
             {
-                assertEquals(input.readBoolean(), valueIndex % 2 == 0);
+                assertThat(input.readBoolean()).isEqualTo(valueIndex % 2 == 0);
             }
         });
     }
@@ -95,7 +95,7 @@ public void loadValue(DataOutputStream output, int valueIndex)
             public void verifyValue(TrinoDataInputStream input, int valueIndex)
                     throws IOException
             {
-                assertEquals(input.readByte(), (byte) valueIndex);
+                assertThat(input.readByte()).isEqualTo((byte) valueIndex);
             }
         });
     }
@@ -117,14 +117,14 @@ public void loadValue(DataOutputStream output, int valueIndex)
             public void verifyValue(TrinoDataInputStream input, int valueIndex)
                     throws IOException
             {
-                assertEquals(input.read(), valueIndex & 0xFF);
+                assertThat(input.read()).isEqualTo(valueIndex & 0xFF);
             }
 
             @Override
             public void verifyReadOffEnd(TrinoDataInputStream input)
                     throws IOException
             {
-                assertEquals(input.read(), -1);
+                assertThat(input.read()).isEqualTo(-1);
             }
         });
     }
@@ -146,7 +146,7 @@ public void loadValue(DataOutputStream output, int valueIndex)
             public void verifyValue(TrinoDataInputStream input, int valueIndex)
                     throws IOException
             {
-                assertEquals(input.readShort(), (short) valueIndex);
+                assertThat(input.readShort()).isEqualTo((short) valueIndex);
             }
         });
     }
@@ -168,7 +168,7 @@ public void loadValue(DataOutputStream output, int valueIndex)
             public void verifyValue(TrinoDataInputStream input, int valueIndex)
                     throws IOException
             {
-                assertEquals(input.readUnsignedShort(), valueIndex & 0xFFF);
+                assertThat(input.readUnsignedShort()).isEqualTo(valueIndex & 0xFFF);
             }
         });
     }
@@ -190,7 +190,7 @@ public void loadValue(DataOutputStream output, int valueIndex)
             public void verifyValue(TrinoDataInputStream input, int valueIndex)
                     throws IOException
             {
-                assertEquals(input.readInt(), valueIndex);
+                assertThat(input.readInt()).isEqualTo(valueIndex);
             }
         });
     }
@@ -212,7 +212,7 @@ public void loadValue(DataOutputStream output, int valueIndex)
             public void verifyValue(TrinoDataInputStream input, int valueIndex)
                     throws IOException
             {
-                assertEquals(input.readUnsignedInt(), valueIndex);
+                assertThat(input.readUnsignedInt()).isEqualTo(valueIndex);
             }
         });
     }
@@ -234,7 +234,7 @@ public void loadValue(DataOutputStream output, int valueIndex)
             public void verifyValue(TrinoDataInputStream input, int valueIndex)
                     throws IOException
             {
-                assertEquals(input.readLong(), valueIndex);
+                assertThat(input.readLong()).isEqualTo(valueIndex);
             }
         });
     }
@@ -256,7 +256,7 @@ public void loadValue(DataOutputStream output, int valueIndex)
             public void verifyValue(TrinoDataInputStream input, int valueIndex)
                     throws IOException
             {
-                assertEquals(input.readFloat(), valueIndex + 0.12f);
+                assertThat(input.readFloat()).isEqualTo(valueIndex + 0.12f);
             }
         });
     }
@@ -278,7 +278,7 @@ public void loadValue(DataOutputStream output, int valueIndex)
             public void verifyValue(TrinoDataInputStream input, int valueIndex)
                     throws IOException
             {
-                assertEquals(input.readDouble(), valueIndex + 0.12);
+                assertThat(input.readDouble()).isEqualTo(valueIndex + 0.12);
             }
         });
     }
@@ -302,7 +302,7 @@ public void verifyValue(TrinoDataInputStream input, int valueIndex)
                 public void verifyReadOffEnd(TrinoDataInputStream input)
                         throws IOException
                 {
-                    assertEquals(input.skip(valueSize()), valueSize() - 1);
+                    assertThat(input.skip(valueSize())).isEqualTo(valueSize() - 1);
                 }
             });
             testDataInput(new SkipDataInputTester(readSize)
@@ -318,7 +318,7 @@ public void verifyValue(TrinoDataInputStream input, int valueIndex)
                 public void verifyReadOffEnd(TrinoDataInputStream input)
                         throws IOException
                 {
-                    assertEquals(input.skip(valueSize()), valueSize() - 1);
+                    assertThat(input.skip(valueSize())).isEqualTo(valueSize() - 1);
                 }
             });
 
@@ -338,7 +338,7 @@ public void verifyValue(TrinoDataInputStream input, int valueIndex)
                         int skipSize = input.skipBytes(length);
                         length -= skipSize;
                     }
-                    assertEquals(input.skip(0), 0);
+                    assertThat(input.skip(0)).isEqualTo(0);
                 }
             });
             testDataInput(new SkipDataInputTester(readSize)
@@ -356,7 +356,7 @@ public void verifyValue(TrinoDataInputStream input, int valueIndex)
                         long skipSize = input.skip(length);
                         length -= skipSize;
                     }
-                    assertEquals(input.skip(0), 0);
+                    assertThat(input.skip(0)).isEqualTo(0);
                 }
             });
         }
@@ -439,7 +439,9 @@ public String readActual(TrinoDataInputStream input)
                     if (bytesRead == -1) {
                         throw new EOFException();
                     }
-                    assertTrue(bytesRead > 0, "Expected to read at least one byte");
+                    assertThat(bytesRead)
+                            .describedAs("Expected to read at least one byte")
+                            .isGreaterThan(0);
                     input.readFully(bytes, bytesRead, bytes.length - bytesRead);
                     return new String(bytes, 0, valueSize(), UTF_8);
                 }
@@ -474,7 +476,7 @@ public void testEmptyInput()
             throws Exception
     {
         TrinoDataInputStream input = createTrinoDataInputStream(new byte[0]);
-        assertEquals(input.getPos(), 0);
+        assertThat(input.getPos()).isEqualTo(0);
     }
 
     @Test
@@ -482,117 +484,126 @@ public void testEmptyRead()
             throws Exception
     {
         TrinoDataInputStream input = createTrinoDataInputStream(new byte[0]);
-        assertEquals(input.read(), -1);
+        assertThat(input.read()).isEqualTo(-1);
     }
 
-    @Test(expectedExceptions = EOFException.class)
+    @Test
     public void testReadByteBeyondEnd()
-            throws Exception
     {
-        TrinoDataInputStream input = createTrinoDataInputStream(new byte[0]);
-        input.readByte();
+        assertThatThrownBy(() -> {
+            TrinoDataInputStream input = createTrinoDataInputStream(new byte[0]);
+            input.readByte();
+        })
+                .isInstanceOf(EOFException.class);
     }
 
-    @Test(expectedExceptions = EOFException.class)
+    @Test
     public void testReadShortBeyondEnd()
-            throws Exception
     {
-        TrinoDataInputStream input = createTrinoDataInputStream(new byte[1]);
-        input.readShort();
+        assertThatThrownBy(() -> {
+            TrinoDataInputStream input = createTrinoDataInputStream(new byte[1]);
+            input.readShort();
+        })
+                .isInstanceOf(EOFException.class);
     }
 
-    @Test(expectedExceptions = EOFException.class)
+    @Test
     public void testReadIntBeyondEnd()
-            throws Exception
     {
-        TrinoDataInputStream input = createTrinoDataInputStream(new byte[3]);
-        input.readInt();
+        assertThatThrownBy(() -> {
+            TrinoDataInputStream input = createTrinoDataInputStream(new byte[3]);
+            input.readInt();
+        })
+                .isInstanceOf(EOFException.class);
     }
 
-    @Test(expectedExceptions = EOFException.class)
+    @Test
     public void testReadLongBeyondEnd()
-            throws Exception
     {
-        TrinoDataInputStream input = createTrinoDataInputStream(new byte[7]);
-        input.readLong();
+        assertThatThrownBy(() -> {
+            TrinoDataInputStream input = createTrinoDataInputStream(new byte[7]);
+            input.readLong();
+        })
+                .isInstanceOf(EOFException.class);
     }
 
     @Test
     public void testEncodingBoolean()
             throws Exception
     {
-        assertTrue(createTrinoDataInputStream(new byte[] {1}).readBoolean());
-        assertFalse(createTrinoDataInputStream(new byte[] {0}).readBoolean());
+        assertThat(createTrinoDataInputStream(new byte[] {1}).readBoolean()).isTrue();
+        assertThat(createTrinoDataInputStream(new byte[] {0}).readBoolean()).isFalse();
     }
 
     @Test
     public void testEncodingByte()
             throws Exception
     {
-        assertEquals(createTrinoDataInputStream(new byte[] {92}).readByte(), 92);
-        assertEquals(createTrinoDataInputStream(new byte[] {-100}).readByte(), -100);
-        assertEquals(createTrinoDataInputStream(new byte[] {-17}).readByte(), -17);
+        assertThat(createTrinoDataInputStream(new byte[] {92}).readByte()).isEqualTo((byte) 92);
+        assertThat(createTrinoDataInputStream(new byte[] {-100}).readByte()).isEqualTo((byte) -100);
+        assertThat(createTrinoDataInputStream(new byte[] {-17}).readByte()).isEqualTo((byte) -17);
 
-        assertEquals(createTrinoDataInputStream(new byte[] {92}).readUnsignedByte(), 92);
-        assertEquals(createTrinoDataInputStream(new byte[] {-100}).readUnsignedByte(), 156);
-        assertEquals(createTrinoDataInputStream(new byte[] {-17}).readUnsignedByte(), 239);
+        assertThat(createTrinoDataInputStream(new byte[] {92}).readUnsignedByte()).isEqualTo(92);
+        assertThat(createTrinoDataInputStream(new byte[] {-100}).readUnsignedByte()).isEqualTo(156);
+        assertThat(createTrinoDataInputStream(new byte[] {-17}).readUnsignedByte()).isEqualTo(239);
     }
 
     @Test
     public void testEncodingShort()
             throws Exception
     {
-        assertEquals(createTrinoDataInputStream(new byte[] {109, 92}).readShort(), 23661);
-        assertEquals(createTrinoDataInputStream(new byte[] {109, -100}).readShort(), -25491);
-        assertEquals(createTrinoDataInputStream(new byte[] {-52, -107}).readShort(), -27188);
+        assertThat(createTrinoDataInputStream(new byte[] {109, 92}).readShort()).isEqualTo((short) 23661);
+        assertThat(createTrinoDataInputStream(new byte[] {109, -100}).readShort()).isEqualTo((short) -25491);
+        assertThat(createTrinoDataInputStream(new byte[] {-52, -107}).readShort()).isEqualTo((short) -27188);
 
-        assertEquals(createTrinoDataInputStream(new byte[] {109, -100}).readUnsignedShort(), 40045);
-        assertEquals(createTrinoDataInputStream(new byte[] {-52, -107}).readUnsignedShort(), 38348);
+        assertThat(createTrinoDataInputStream(new byte[] {109, -100}).readUnsignedShort()).isEqualTo(40045);
+        assertThat(createTrinoDataInputStream(new byte[] {-52, -107}).readUnsignedShort()).isEqualTo(38348);
     }
 
     @Test
     public void testEncodingInteger()
             throws Exception
     {
-        assertEquals(createTrinoDataInputStream(new byte[] {109, 92, 75, 58}).readInt(), 978017389);
-        assertEquals(createTrinoDataInputStream(new byte[] {-16, -60, -120, -1}).readInt(), -7813904);
+        assertThat(createTrinoDataInputStream(new byte[] {109, 92, 75, 58}).readInt()).isEqualTo(978017389);
+        assertThat(createTrinoDataInputStream(new byte[] {-16, -60, -120, -1}).readInt()).isEqualTo(-7813904);
     }
 
     @Test
     public void testEncodingLong()
             throws Exception
     {
-        assertEquals(createTrinoDataInputStream(new byte[] {49, -114, -96, -23, -32, -96, -32, 127}).readLong(), 9214541725452766769L);
-        assertEquals(createTrinoDataInputStream(new byte[] {109, 92, 75, 58, 18, 120, -112, -17}).readLong(), -1184314682315678611L);
+        assertThat(createTrinoDataInputStream(new byte[] {49, -114, -96, -23, -32, -96, -32, 127}).readLong()).isEqualTo(9214541725452766769L);
+        assertThat(createTrinoDataInputStream(new byte[] {109, 92, 75, 58, 18, 120, -112, -17}).readLong()).isEqualTo(-1184314682315678611L);
     }
 
     @Test
     public void testEncodingDouble()
             throws Exception
     {
-        assertEquals(createTrinoDataInputStream(new byte[] {31, -123, -21, 81, -72, 30, 9, 64}).readDouble(), 3.14);
-        assertEquals(createTrinoDataInputStream(new byte[] {0, 0, 0, 0, 0, 0, -8, 127}).readDouble(), Double.NaN);
-        assertEquals(createTrinoDataInputStream(new byte[] {0, 0, 0, 0, 0, 0, -16, -1}).readDouble(), Double.NEGATIVE_INFINITY);
-        assertEquals(createTrinoDataInputStream(new byte[] {0, 0, 0, 0, 0, 0, -16, 127}).readDouble(), Double.POSITIVE_INFINITY);
+        assertThat(createTrinoDataInputStream(new byte[] {31, -123, -21, 81, -72, 30, 9, 64}).readDouble()).isEqualTo(3.14);
+        assertThat(createTrinoDataInputStream(new byte[] {0, 0, 0, 0, 0, 0, -8, 127}).readDouble()).isNaN();
+        assertThat(createTrinoDataInputStream(new byte[] {0, 0, 0, 0, 0, 0, -16, -1}).readDouble()).isEqualTo(Double.NEGATIVE_INFINITY);
+        assertThat(createTrinoDataInputStream(new byte[] {0, 0, 0, 0, 0, 0, -16, 127}).readDouble()).isEqualTo(Double.POSITIVE_INFINITY);
     }
 
     @Test
     public void testEncodingFloat()
             throws Exception
     {
-        assertEquals(createTrinoDataInputStream(new byte[] {-61, -11, 72, 64}).readFloat(), 3.14f);
-        assertEquals(createTrinoDataInputStream(new byte[] {0, 0, -64, 127}).readFloat(), Float.NaN);
-        assertEquals(createTrinoDataInputStream(new byte[] {0, 0, -128, -1}).readFloat(), Float.NEGATIVE_INFINITY);
-        assertEquals(createTrinoDataInputStream(new byte[] {0, 0, -128, 127}).readFloat(), Float.POSITIVE_INFINITY);
+        assertThat(createTrinoDataInputStream(new byte[] {-61, -11, 72, 64}).readFloat()).isEqualTo(3.14f);
+        assertThat(createTrinoDataInputStream(new byte[] {0, 0, -64, 127}).readFloat()).isNaN();
+        assertThat(createTrinoDataInputStream(new byte[] {0, 0, -128, -1}).readFloat()).isEqualTo(Float.NEGATIVE_INFINITY);
+        assertThat(createTrinoDataInputStream(new byte[] {0, 0, -128, 127}).readFloat()).isEqualTo(Float.POSITIVE_INFINITY);
     }
 
     @Test
     public void testRetainedSize()
+            throws IOException
     {
         int bufferSize = 1024;
-        TrinoInputStream inputStream = new MemoryTrinoInputStream(Slices.wrappedBuffer(new byte[] {0, 1}));
+        TrinoInputStream inputStream = getMemoryInputFile(new byte[] {0, 1}).newStream();
         TrinoDataInputStream input = new TrinoDataInputStream(inputStream, bufferSize);
-        assertEquals(input.getRetainedSize(), instanceSize(TrinoDataInputStream.class) + sizeOfByteArray(bufferSize));
+        assertThat(input.getRetainedSize()).isEqualTo(instanceSize(TrinoDataInputStream.class) + sizeOfByteArray(bufferSize));
     }
 
     private static void testDataInput(DataInputTester tester)
@@ -618,7 +629,7 @@ private static void testReadForward(DataInputTester tester, byte[] bytes)
         TrinoDataInputStream input = createTrinoDataInputStream(bytes);
         for (int i = 0; i < bytes.length / tester.valueSize(); i++) {
             int position = i * tester.valueSize();
-            assertEquals(input.getPos(), position);
+            assertThat(input.getPos()).isEqualTo(position);
             tester.verifyValue(input, i);
         }
     }
@@ -630,7 +641,7 @@ private static void testReadReverse(DataInputTester tester, byte[] bytes)
         for (int i = bytes.length / tester.valueSize() - 1; i >= 0; i--) {
             int position = i * tester.valueSize();
             input.seek(position);
-            assertEquals(input.getPos(), position);
+            assertThat(input.getPos()).isEqualTo(position);
             tester.verifyValue(input, i);
         }
     }
@@ -674,7 +685,7 @@ public void verifyReadOffEnd(TrinoDataInputStream input)
         {
             try {
                 verifyValue(input, 1);
-                fail("expected EOFException");
+                throw new AssertionError("expected EOFException");
             }
             catch (EOFException expected) {
             }
@@ -718,7 +729,7 @@ public final void verifyValue(TrinoDataInputStream input, int valueIndex)
         {
             String actual = readActual(input);
             String expected = getExpectedStringValue(valueIndex, valueSize());
-            assertEquals(actual, expected);
+            assertThat(actual).isEqualTo(expected);
         }
 
         protected abstract String readActual(TrinoDataInputStream input)
@@ -726,8 +737,14 @@ protected abstract String readActual(TrinoDataInputStream input)
     }
 
     private static TrinoDataInputStream createTrinoDataInputStream(byte[] bytes)
+            throws IOException
     {
-        TrinoInputStream inputStream = new MemoryTrinoInputStream(Slices.wrappedBuffer(bytes));
+        TrinoInputStream inputStream = getMemoryInputFile(bytes).newStream();
         return new TrinoDataInputStream(inputStream, 16 * 1024);
     }
+
+    private static TrinoInputFile getMemoryInputFile(byte[] bytes)
+    {
+        return new MemoryInputFile(Location.of("memory:///test"), Slices.wrappedBuffer(bytes));
+    }
 }
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/NoOpAvroTypeManager.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/NoOpAvroTypeManager.java
new file mode 100644
index 000000000000..cd7ccc22082e
--- /dev/null
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/NoOpAvroTypeManager.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.Type;
+import org.apache.avro.Schema;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+
+public class NoOpAvroTypeManager
+        implements AvroTypeManager
+{
+    public static final NoOpAvroTypeManager INSTANCE = new NoOpAvroTypeManager();
+
+    private NoOpAvroTypeManager() {}
+
+    @Override
+    public void configure(Map<String, byte[]> fileMetadata) {}
+
+    @Override
+    public Optional<Type> overrideTypeForSchema(Schema schema)
+            throws AvroTypeException
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<BiConsumer<BlockBuilder, Object>> overrideBuildingFunctionForSchema(Schema schema)
+            throws AvroTypeException
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<BiFunction<Block, Integer, Object>> overrideBlockToAvroObject(Schema schema, Type type)
+            throws AvroTypeException
+    {
+        return Optional.empty();
+    }
+}
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroBase.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroBase.java
new file mode 100644
index 000000000000..623761e79d76
--- /dev/null
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroBase.java
@@ -0,0 +1,468 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.common.primitives.Bytes;
+import com.google.common.primitives.Longs;
+import io.airlift.slice.Slices;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.local.LocalFileSystem;
+import io.trino.hive.formats.TrinoDataInputStream;
+import io.trino.spi.Page;
+import io.trino.spi.block.ArrayBlock;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.ByteArrayBlock;
+import io.trino.spi.block.IntArrayBlock;
+import io.trino.spi.block.LongArrayBlock;
+import io.trino.spi.block.MapBlock;
+import io.trino.spi.block.RowBlock;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.BigintType;
+import io.trino.spi.type.BooleanType;
+import io.trino.spi.type.DoubleType;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RealType;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.TypeOperators;
+import io.trino.spi.type.VarbinaryType;
+import org.apache.avro.Schema;
+import org.apache.avro.SchemaBuilder;
+import org.apache.avro.file.DataFileReader;
+import org.apache.avro.file.DataFileWriter;
+import org.apache.avro.generic.GenericData;
+import org.apache.avro.generic.GenericDatumReader;
+import org.apache.avro.generic.GenericDatumWriter;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.generic.GenericRecordBuilder;
+import org.apache.avro.util.RandomData;
+import org.apache.avro.util.Utf8;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
+
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.block.BlockAssertions.assertBlockEquals;
+import static io.trino.block.BlockAssertions.createIntsBlock;
+import static io.trino.block.BlockAssertions.createRowBlock;
+import static io.trino.block.BlockAssertions.createStringsBlock;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.lang.Double.doubleToLongBits;
+import static java.lang.Float.floatToIntBits;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.within;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public abstract class TestAvroBase
+{
+    protected static final TypeOperators TYPE_OPERATORS = new TypeOperators();
+    protected static final ArrayType ARRAY_INTEGER = new ArrayType(INTEGER);
+    protected static final MapType MAP_VARCHAR_VARCHAR = new MapType(VARCHAR, VARCHAR, TYPE_OPERATORS);
+    protected static final MapType MAP_VARCHAR_INTEGER = new MapType(VARCHAR, INTEGER, TYPE_OPERATORS);
+    protected TrinoFileSystem trinoLocalFilesystem;
+    protected Path tempDirectory;
+
+    protected static final Schema SIMPLE_RECORD_SCHEMA = SchemaBuilder.record("simpleRecord")
+            .fields()
+            .name("a")
+            .type().intType().noDefault()
+            .name("b")
+            .type().doubleType().noDefault()
+            .name("c")
+            .type().stringType().noDefault()
+            .endRecord();
+
+    protected static final Schema SIMPLE_ENUM_SCHEMA = SchemaBuilder.enumeration("myEnumType").symbols("A", "B", "C");
+
+    protected static final Schema ALL_TYPES_RECORD_SCHEMA = SchemaBuilder.builder()
+            .record("all")
+            .fields()
+            .name("aBoolean")
+            .type().booleanType().noDefault()
+            .name("aInt")
+            .type().intType().noDefault()
+            .name("aLong")
+            .type().longType().noDefault()
+            .name("aFloat")
+            .type().floatType().noDefault()
+            .name("aDouble")
+            .type().doubleType().noDefault()
+            .name("aString")
+            .type().stringType().noDefault()
+            .name("aBytes")
+            .type().bytesType().noDefault()
+            .name("aFixed")
+            .type().fixed("myFixedType").size(16).noDefault()
+            .name("anArray")
+            .type().array().items().intType().noDefault()
+            .name("aMap")
+            .type().map().values().intType().noDefault()
+            .name("anEnum")
+            .type(SIMPLE_ENUM_SCHEMA).noDefault()
+            .name("aRecord")
+            .type(SIMPLE_RECORD_SCHEMA).noDefault()
+            .name("aUnion")
+            .type().optional().stringType()
+            .endRecord();
+    protected static final GenericRecord ALL_TYPES_GENERIC_RECORD;
+    protected static final Page ALL_TYPES_PAGE;
+    protected static final GenericRecord SIMPLE_GENERIC_RECORD;
+    protected static final String A_STRING_VALUE = "a test string";
+    protected static final ByteBuffer A_BYTES_VALUE = ByteBuffer.wrap("a test byte array".getBytes(StandardCharsets.UTF_8));
+    protected static final GenericData.Fixed A_FIXED_VALUE;
+
+    static {
+        ImmutableList.Builder<Block> allTypeBlocks = ImmutableList.builder();
+        SIMPLE_GENERIC_RECORD = new GenericData.Record(SIMPLE_RECORD_SCHEMA);
+        SIMPLE_GENERIC_RECORD.put("a", 5);
+        SIMPLE_GENERIC_RECORD.put("b", 3.14159265358979);
+        SIMPLE_GENERIC_RECORD.put("c", "Simple Record String Field");
+
+        UUID fixed = UUID.nameUUIDFromBytes("a test fixed".getBytes(StandardCharsets.UTF_8));
+        A_FIXED_VALUE = new GenericData.Fixed(SchemaBuilder.builder().fixed("myFixedType").size(16), Bytes.concat(Longs.toByteArray(fixed.getMostSignificantBits()), Longs.toByteArray(fixed.getLeastSignificantBits())));
+
+        ALL_TYPES_GENERIC_RECORD = new GenericData.Record(ALL_TYPES_RECORD_SCHEMA);
+        ALL_TYPES_GENERIC_RECORD.put("aBoolean", true);
+        allTypeBlocks.add(new ByteArrayBlock(1, Optional.empty(), new byte[]{1}));
+        ALL_TYPES_GENERIC_RECORD.put("aInt", 42);
+        allTypeBlocks.add(new IntArrayBlock(1, Optional.empty(), new int[]{42}));
+        ALL_TYPES_GENERIC_RECORD.put("aLong", 3400L);
+        allTypeBlocks.add(new LongArrayBlock(1, Optional.empty(), new long[]{3400L}));
+        ALL_TYPES_GENERIC_RECORD.put("aFloat", 3.14f);
+        allTypeBlocks.add(new IntArrayBlock(1, Optional.empty(), new int[]{floatToIntBits(3.14f)}));
+        ALL_TYPES_GENERIC_RECORD.put("aDouble", 9.81);
+        allTypeBlocks.add(new LongArrayBlock(1, Optional.empty(), new long[]{doubleToLongBits(9.81)}));
+        ALL_TYPES_GENERIC_RECORD.put("aString", A_STRING_VALUE);
+        allTypeBlocks.add(new VariableWidthBlock(1, Slices.utf8Slice(A_STRING_VALUE), new int[] {0, Slices.utf8Slice(A_STRING_VALUE).length()}, Optional.empty()));
+        ALL_TYPES_GENERIC_RECORD.put("aBytes", A_BYTES_VALUE);
+        allTypeBlocks.add(new VariableWidthBlock(1, Slices.wrappedHeapBuffer(A_BYTES_VALUE), new int[] {0, A_BYTES_VALUE.limit()}, Optional.empty()));
+        ALL_TYPES_GENERIC_RECORD.put("aFixed", A_FIXED_VALUE);
+        allTypeBlocks.add(new VariableWidthBlock(1, Slices.wrappedBuffer(A_FIXED_VALUE.bytes()), new int[] {0, A_FIXED_VALUE.bytes().length}, Optional.empty()));
+        ALL_TYPES_GENERIC_RECORD.put("anArray", ImmutableList.of(1, 2, 3, 4));
+        allTypeBlocks.add(ArrayBlock.fromElementBlock(1, Optional.empty(), new int[] {0, 4}, createIntsBlock(1, 2, 3, 4)));
+        ALL_TYPES_GENERIC_RECORD.put("aMap", ImmutableMap.of(new Utf8("key1"), 1, new Utf8("key2"), 2));
+        allTypeBlocks.add(MAP_VARCHAR_INTEGER.createBlockFromKeyValue(Optional.empty(),
+                new int[] {0, 2},
+                createStringsBlock("key1", "key2"),
+                createIntsBlock(1, 2)));
+        ALL_TYPES_GENERIC_RECORD.put("anEnum", new GenericData.EnumSymbol(SIMPLE_ENUM_SCHEMA, "A"));
+        allTypeBlocks.add(new VariableWidthBlock(1, Slices.utf8Slice("A"), new int[] {0, 1}, Optional.empty()));
+        ALL_TYPES_GENERIC_RECORD.put("aRecord", SIMPLE_GENERIC_RECORD);
+        allTypeBlocks.add(createRowBlock(ImmutableList.of(INTEGER, DoubleType.DOUBLE, VARCHAR), new Object[] {5, 3.14159265358979, "Simple Record String Field"}));
+        ALL_TYPES_GENERIC_RECORD.put("aUnion", null);
+        allTypeBlocks.add(new VariableWidthBlock(1, Slices.wrappedBuffer(), new int[] {0, 0}, Optional.of(new boolean[] {true})));
+        ALL_TYPES_PAGE = new Page(allTypeBlocks.build().toArray(Block[]::new));
+    }
+
+    @BeforeAll
+    public void setup()
+    {
+        try {
+            tempDirectory = Files.createTempDirectory("testingAvro");
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        trinoLocalFilesystem = new LocalFileSystem(tempDirectory.toAbsolutePath());
+        // test identity
+        assertIsAllTypesPage(ALL_TYPES_PAGE);
+    }
+
+    @Test
+    public void testSerdeCycles()
+            throws IOException, AvroTypeException
+    {
+        for (AvroCompressionKind compressionKind : AvroCompressionKind.values()) {
+            if (compressionKind.isSupportedLocally()) {
+                testSerdeCycles(SIMPLE_RECORD_SCHEMA, compressionKind);
+
+                testSerdeCycles(
+                        new Schema.Parser().parse(
+                                """
+                                {
+                                   "type":"record",
+                                   "name":"test",
+                                   "fields":[
+                                       {
+                                           "name":"a",
+                                           "type":"int"
+                                       },
+                                       {
+                                           "name":"b",
+                                           "type":["null", {
+                                               "type":"array",
+                                               "items":[%s, "null"]
+                                           }]
+                                       },
+                                       {
+                                           "name":"c",
+                                           "type":
+                                           {
+                                               "type":"map",
+                                               "values":{
+                                                   "type":"enum",
+                                                   "name":"testingEnum",
+                                                   "symbols":["Apples","Bananas","Kiwi"]
+                                               }
+                                           }
+                                       }
+                                   ]
+                                }
+                                """.formatted(SIMPLE_RECORD_SCHEMA)),
+                        compressionKind);
+
+                testSerdeCycles(
+                        SchemaBuilder.builder().record("level1")
+                                .fields()
+                                .name("level1Field1")
+                                .type(SchemaBuilder.record("level2")
+                                        .fields()
+                                        .name("level2Field1")
+                                        .type(SchemaBuilder.record("level3")
+                                                .fields()
+                                                .name("level3Field1")
+                                                .type(ALL_TYPES_RECORD_SCHEMA)
+                                                .noDefault()
+                                                .endRecord())
+                                        .noDefault()
+                                        .name("level2Field2")
+                                        .type().optional().type(ALL_TYPES_RECORD_SCHEMA)
+                                        .endRecord())
+                                .noDefault()
+                                .name("level1Field2")
+                                .type(ALL_TYPES_RECORD_SCHEMA)
+                                .noDefault()
+                                .endRecord(),
+                        compressionKind);
+            }
+        }
+    }
+
+    @AfterAll
+    public void cleanup()
+    {
+        try {
+            trinoLocalFilesystem.deleteDirectory((Location.of("local:///")));
+            Files.deleteIfExists(tempDirectory.toAbsolutePath());
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    private void testSerdeCycles(Schema schema, AvroCompressionKind compressionKind)
+            throws IOException, AvroTypeException
+    {
+        assertThat(schema.getType()).isEqualTo(Schema.Type.RECORD);
+        Location temp1 = createLocalTempLocation();
+        Location temp2 = createLocalTempLocation();
+
+        int count = ThreadLocalRandom.current().nextInt(1000, 10000);
+        ImmutableList.Builder<GenericRecord> testRecordsExpected = ImmutableList.builder();
+        for (Object o : new RandomData(schema, count, true)) {
+            testRecordsExpected.add((GenericRecord) o);
+        }
+
+        ImmutableList.Builder<Page> pages = ImmutableList.builder();
+        try (AvroFileReader fileReader = new AvroFileReader(
+                createWrittenFileWithData(schema, testRecordsExpected.build(), temp1),
+                schema,
+                NoOpAvroTypeManager.INSTANCE)) {
+            while (fileReader.hasNext()) {
+                pages.add(fileReader.next());
+            }
+        }
+
+        try (AvroFileWriter fileWriter = new AvroFileWriter(
+                trinoLocalFilesystem.newOutputFile(temp2).create(),
+                schema,
+                NoOpAvroTypeManager.INSTANCE,
+                compressionKind,
+                ImmutableMap.of(),
+                schema.getFields().stream().map(Schema.Field::name).collect(toImmutableList()),
+                AvroTypeUtils.typeFromAvro(schema, NoOpAvroTypeManager.INSTANCE).getTypeParameters(), false)) {
+            for (Page p : pages.build()) {
+                fileWriter.write(p);
+            }
+        }
+
+        ImmutableList.Builder<GenericRecord> testRecordsActual = ImmutableList.builder();
+        try (DataFileReader<GenericRecord> genericRecordDataFileReader = new DataFileReader<>(
+                new AvroFileReader.TrinoDataInputStreamAsAvroSeekableInput(new TrinoDataInputStream(trinoLocalFilesystem.newInputFile(temp2).newStream()), trinoLocalFilesystem.newInputFile(temp2).length()),
+                new GenericDatumReader<>())) {
+            while (genericRecordDataFileReader.hasNext()) {
+                testRecordsActual.add(genericRecordDataFileReader.next());
+            }
+        }
+        assertThat(testRecordsExpected.build().size()).isEqualTo(testRecordsActual.build().size());
+        List<GenericRecord> expected = testRecordsExpected.build();
+        List<GenericRecord> actual = testRecordsActual.build();
+        for (int i = 0; i < expected.size(); i++) {
+            assertThat(expected.get(i)).isEqualTo(actual.get(i));
+        }
+    }
+
+    protected Location createLocalTempLocation()
+    {
+        return Location.of("local:///" + UUID.randomUUID());
+    }
+
+    protected static void assertIsAllTypesPage(Page p)
+    {
+        // test boolean
+        assertThat(p.getBlock(0)).isInstanceOf(ByteArrayBlock.class);
+        assertThat(BooleanType.BOOLEAN.getBoolean(p.getBlock(0), 0)).isTrue();
+        // test int
+        assertThat(p.getBlock(1)).isInstanceOf(IntArrayBlock.class);
+        assertThat(INTEGER.getInt(p.getBlock(1), 0)).isEqualTo(42);
+        // test long
+        assertThat(p.getBlock(2)).isInstanceOf(LongArrayBlock.class);
+        assertThat(BigintType.BIGINT.getLong(p.getBlock(2), 0)).isEqualTo(3400L);
+        // test float
+        assertThat(p.getBlock(3)).isInstanceOf(IntArrayBlock.class);
+        assertThat(RealType.REAL.getFloat(p.getBlock(3), 0)).isCloseTo(3.14f, within(0.001f));
+        // test double
+        assertThat(p.getBlock(4)).isInstanceOf(LongArrayBlock.class);
+        assertThat(DoubleType.DOUBLE.getDouble(p.getBlock(4), 0)).isCloseTo(9.81, within(0.001));
+        // test string
+        assertThat(p.getBlock(5)).isInstanceOf(VariableWidthBlock.class);
+        assertThat(VARCHAR.getObject(p.getBlock(5), 0)).isEqualTo(Slices.utf8Slice(A_STRING_VALUE));
+        // test bytes
+        assertThat(p.getBlock(6)).isInstanceOf(VariableWidthBlock.class);
+        assertThat(VarbinaryType.VARBINARY.getObject(p.getBlock(6), 0)).isEqualTo(Slices.wrappedHeapBuffer(A_BYTES_VALUE));
+        // test fixed
+        assertThat(p.getBlock(7)).isInstanceOf(VariableWidthBlock.class);
+        assertThat(VarbinaryType.VARBINARY.getObject(p.getBlock(7), 0)).isEqualTo(Slices.wrappedBuffer(A_FIXED_VALUE.bytes()));
+        //test array
+        assertThat(p.getBlock(8)).isInstanceOf(ArrayBlock.class);
+        assertThat(ARRAY_INTEGER.getObject(p.getBlock(8), 0)).isInstanceOf(IntArrayBlock.class);
+        assertBlockEquals(INTEGER, ARRAY_INTEGER.getObject(p.getBlock(8), 0), createIntsBlock(1, 2, 3, 4));
+        // test map
+        assertThat(p.getBlock(9)).isInstanceOf(MapBlock.class);
+        assertThat(MAP_VARCHAR_INTEGER.getObjectValue(null, p.getBlock(9), 0)).isEqualTo(ImmutableMap.of("key1", 1, "key2", 2));
+        // test enum
+        assertThat(p.getBlock(10)).isInstanceOf(VariableWidthBlock.class);
+        assertThat(VARCHAR.getObject(p.getBlock(10), 0)).isEqualTo(Slices.utf8Slice("A"));
+        // test record
+        assertThat(p.getBlock(11)).isInstanceOf(RowBlock.class);
+        Block expected = createRowBlock(ImmutableList.of(INTEGER, DoubleType.DOUBLE, VARCHAR), new Object[] {5, 3.14159265358979, "Simple Record String Field"});
+        assertBlockEquals(RowType.anonymousRow(INTEGER, DoubleType.DOUBLE, VARCHAR), p.getBlock(11), expected);
+        // test nullable union
+        assertThat(p.getBlock(12)).isInstanceOf(VariableWidthBlock.class);
+        assertThat(p.getBlock(12).isNull(0)).isTrue();
+    }
+
+    protected TrinoInputFile createWrittenFileWithData(Schema schema, List<GenericRecord> records)
+            throws IOException
+    {
+        return createWrittenFileWithData(schema, records, createLocalTempLocation());
+    }
+
+    protected TrinoInputFile createWrittenFileWithData(Schema schema, List<GenericRecord> records, Location location)
+            throws IOException
+    {
+        try (DataFileWriter<GenericRecord> fileWriter = new DataFileWriter<>(new GenericDatumWriter<>())) {
+            fileWriter.create(schema, trinoLocalFilesystem.newOutputFile(location).createOrOverwrite());
+            for (GenericRecord genericRecord : records) {
+                fileWriter.append(genericRecord);
+            }
+        }
+        return trinoLocalFilesystem.newInputFile(location);
+    }
+
+    protected TrinoInputFile createWrittenFileWithSchema(int count, Schema schema)
+            throws IOException
+    {
+        Iterator<Object> randomData = new RandomData(schema, count).iterator();
+        Location tempFile = createLocalTempLocation();
+        try (DataFileWriter<GenericRecord> fileWriter = new DataFileWriter<>(new GenericDatumWriter<>())) {
+            fileWriter.create(schema, trinoLocalFilesystem.newOutputFile(tempFile).createOrOverwrite());
+            while (randomData.hasNext()) {
+                fileWriter.append((GenericRecord) randomData.next());
+            }
+        }
+        return trinoLocalFilesystem.newInputFile(tempFile);
+    }
+
+    static GenericRecord reorderGenericRecord(Schema reorderTo, GenericRecord record)
+    {
+        GenericRecordBuilder recordBuilder = new GenericRecordBuilder(reorderTo);
+        for (Schema.Field field : reorderTo.getFields()) {
+            if (field.schema().getType() == Schema.Type.RECORD) {
+                recordBuilder.set(field, reorderGenericRecord(field.schema(), (GenericRecord) record.get(field.name())));
+            }
+            else {
+                recordBuilder.set(field, record.get(field.name()));
+            }
+        }
+        return recordBuilder.build();
+    }
+
+    static <T> List<T> reorder(List<T> list)
+    {
+        List<T> l = new ArrayList<>(list);
+        Collections.shuffle(l);
+        return ImmutableList.copyOf(l);
+    }
+
+    static Schema reorderSchema(Schema schema)
+    {
+        verify(schema.getType() == Schema.Type.RECORD);
+        SchemaBuilder.FieldAssembler<Schema> fieldAssembler = SchemaBuilder.builder().record(schema.getName()).fields();
+        for (Schema.Field field : reorder(schema.getFields())) {
+            if (field.schema().getType() == Schema.Type.ENUM) {
+                fieldAssembler = fieldAssembler.name(field.name())
+                        .type(Schema.createEnum(field.schema().getName(), field.schema().getDoc(), field.schema().getNamespace(), Lists.reverse(field.schema().getEnumSymbols())))
+                        .noDefault();
+            }
+            else if (field.schema().getType() == Schema.Type.UNION) {
+                fieldAssembler = fieldAssembler.name(field.name())
+                        .type(Schema.createUnion(reorder(field.schema().getTypes())))
+                        .noDefault();
+            }
+            else if (field.schema().getType() == Schema.Type.RECORD) {
+                fieldAssembler = fieldAssembler.name(field.name())
+                        .type(reorderSchema(field.schema()))
+                        .noDefault();
+            }
+            else {
+                fieldAssembler = fieldAssembler.name(field.name()).type(field.schema()).noDefault();
+            }
+        }
+        return fieldAssembler.endRecord();
+    }
+}
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroPageDataReaderWithAvroNativeTypeManagement.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroPageDataReaderWithAvroNativeTypeManagement.java
new file mode 100644
index 000000000000..b3131a2cd4d1
--- /dev/null
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroPageDataReaderWithAvroNativeTypeManagement.java
@@ -0,0 +1,301 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.primitives.Longs;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.DateType;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.Int128;
+import io.trino.spi.type.SqlDate;
+import io.trino.spi.type.SqlDecimal;
+import io.trino.spi.type.SqlTime;
+import io.trino.spi.type.SqlTimestamp;
+import io.trino.spi.type.TimeType;
+import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.Timestamps;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.UuidType;
+import org.apache.avro.LogicalTypes;
+import org.apache.avro.Schema;
+import org.apache.avro.SchemaBuilder;
+import org.apache.avro.generic.GenericData;
+import org.apache.avro.generic.GenericRecord;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.Date;
+import java.util.UUID;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.DATE_SCHEMA;
+import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.TIMESTAMP_MICROS_SCHEMA;
+import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.TIMESTAMP_MILLIS_SCHEMA;
+import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.TIME_MICROS_SCHEMA;
+import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.TIME_MILLIS_SCHEMA;
+import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.UUID_SCHEMA;
+import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.padBigEndianToSize;
+import static io.trino.spi.type.Decimals.MAX_SHORT_PRECISION;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestAvroPageDataReaderWithAvroNativeTypeManagement
+        extends TestAvroBase
+{
+    private static final Schema DECIMAL_SMALL_BYTES_SCHEMA;
+    private static final int SMALL_FIXED_SIZE = 8;
+    private static final int LARGE_FIXED_SIZE = 9;
+    private static final Schema DECIMAL_SMALL_FIXED_SCHEMA;
+    private static final Schema DECIMAL_LARGE_BYTES_SCHEMA;
+    private static final Schema DECIMAL_LARGE_FIXED_SCHEMA;
+    private static final Date testTime = new Date(780681600000L);
+    private static final Type SMALL_DECIMAL_TYPE = DecimalType.createDecimalType(MAX_SHORT_PRECISION - 1, 2);
+    private static final Type LARGE_DECIMAL_TYPE = DecimalType.createDecimalType(MAX_SHORT_PRECISION + 1, 2);
+    private static final Schema ALL_SUPPORTED_TYPES_SCHEMA;
+    private static final GenericRecord ALL_SUPPORTED_TYPES_GENERIC_RECORD;
+    private static final Page ALL_SUPPORTED_PAGE;
+    public static final GenericData.Fixed GENERIC_SMALL_FIXED_DECIMAL;
+    public static final GenericData.Fixed GENERIC_LARGE_FIXED_DECIMAL;
+    public static final UUID RANDOM_UUID = UUID.randomUUID();
+
+    static {
+        LogicalTypes.Decimal small = LogicalTypes.decimal(MAX_SHORT_PRECISION - 1, 2);
+        LogicalTypes.Decimal large = LogicalTypes.decimal(MAX_SHORT_PRECISION + 1, 2);
+        DECIMAL_SMALL_BYTES_SCHEMA = Schema.create(Schema.Type.BYTES);
+        small.addToSchema(DECIMAL_SMALL_BYTES_SCHEMA);
+        DECIMAL_SMALL_FIXED_SCHEMA = Schema.createFixed("smallDecimal", "myFixed", "namespace", SMALL_FIXED_SIZE);
+        small.addToSchema(DECIMAL_SMALL_FIXED_SCHEMA);
+        DECIMAL_LARGE_BYTES_SCHEMA = Schema.create(Schema.Type.BYTES);
+        large.addToSchema(DECIMAL_LARGE_BYTES_SCHEMA);
+        DECIMAL_LARGE_FIXED_SCHEMA = Schema.createFixed("largeDecimal", "myFixed", "namespace", (int) ((MAX_SHORT_PRECISION + 2) * Math.log(10) / Math.log(2) / 8) + 1);
+        large.addToSchema(DECIMAL_LARGE_FIXED_SCHEMA);
+        GENERIC_SMALL_FIXED_DECIMAL = new GenericData.Fixed(DECIMAL_SMALL_FIXED_SCHEMA, padBigEndianToSize(78068160000000L, SMALL_FIXED_SIZE));
+        GENERIC_LARGE_FIXED_DECIMAL = new GenericData.Fixed(DECIMAL_LARGE_FIXED_SCHEMA, padBigEndianToSize(78068160000000L, LARGE_FIXED_SIZE));
+
+        ALL_SUPPORTED_TYPES_SCHEMA = SchemaBuilder.builder()
+                .record("allSupported")
+                .fields()
+                .name("timestampMillis")
+                .type(TIMESTAMP_MILLIS_SCHEMA).noDefault()
+                .name("timestampMicros")
+                .type(TIMESTAMP_MICROS_SCHEMA).noDefault()
+                .name("smallBytesDecimal")
+                .type(DECIMAL_SMALL_BYTES_SCHEMA).noDefault()
+                .name("smallFixedDecimal")
+                .type(DECIMAL_SMALL_FIXED_SCHEMA).noDefault()
+                .name("largeBytesDecimal")
+                .type(DECIMAL_LARGE_BYTES_SCHEMA).noDefault()
+                .name("largeFixedDecimal")
+                .type(DECIMAL_LARGE_FIXED_SCHEMA).noDefault()
+                .name("date")
+                .type(DATE_SCHEMA).noDefault()
+                .name("timeMillis")
+                .type(TIME_MILLIS_SCHEMA).noDefault()
+                .name("timeMicros")
+                .type(TIME_MICROS_SCHEMA).noDefault()
+                .name("id")
+                .type(UUID_SCHEMA).noDefault()
+                .endRecord();
+
+        ImmutableList.Builder<Block> blocks = ImmutableList.builder();
+        ALL_SUPPORTED_TYPES_GENERIC_RECORD = new GenericData.Record(ALL_SUPPORTED_TYPES_SCHEMA);
+
+        ALL_SUPPORTED_TYPES_GENERIC_RECORD.put("timestampMillis", testTime.getTime());
+        BlockBuilder timestampMilliBlock = TimestampType.TIMESTAMP_MILLIS.createBlockBuilder(null, 1);
+        TimestampType.TIMESTAMP_MILLIS.writeLong(timestampMilliBlock, testTime.getTime() * Timestamps.MICROSECONDS_PER_MILLISECOND);
+        blocks.add(timestampMilliBlock.build());
+
+        ALL_SUPPORTED_TYPES_GENERIC_RECORD.put("timestampMicros", testTime.getTime() * 1000);
+        BlockBuilder timestampMicroBlock = TimestampType.TIMESTAMP_MICROS.createBlockBuilder(null, 1);
+        TimestampType.TIMESTAMP_MICROS.writeLong(timestampMicroBlock, testTime.getTime() * Timestamps.MICROSECONDS_PER_MILLISECOND);
+        blocks.add(timestampMicroBlock.build());
+
+        ALL_SUPPORTED_TYPES_GENERIC_RECORD.put("smallBytesDecimal", ByteBuffer.wrap(Longs.toByteArray(78068160000000L)));
+        ALL_SUPPORTED_TYPES_GENERIC_RECORD.put("smallFixedDecimal", GENERIC_SMALL_FIXED_DECIMAL);
+        BlockBuilder smallDecimalBlock = SMALL_DECIMAL_TYPE.createBlockBuilder(null, 1);
+        SMALL_DECIMAL_TYPE.writeLong(smallDecimalBlock, 78068160000000L);
+        blocks.add(smallDecimalBlock.build());
+        blocks.add(smallDecimalBlock.build());
+
+        ALL_SUPPORTED_TYPES_GENERIC_RECORD.put("largeBytesDecimal", ByteBuffer.wrap(Int128.valueOf(78068160000000L).toBigEndianBytes()));
+        ALL_SUPPORTED_TYPES_GENERIC_RECORD.put("largeFixedDecimal", GENERIC_LARGE_FIXED_DECIMAL);
+        BlockBuilder largeDecimalBlock = LARGE_DECIMAL_TYPE.createBlockBuilder(null, 1);
+        LARGE_DECIMAL_TYPE.writeObject(largeDecimalBlock, Int128.valueOf(78068160000000L));
+        blocks.add(largeDecimalBlock.build());
+        blocks.add(largeDecimalBlock.build());
+
+        ALL_SUPPORTED_TYPES_GENERIC_RECORD.put("date", 9035);
+        BlockBuilder dateBlockBuilder = DateType.DATE.createBlockBuilder(null, 1);
+        DateType.DATE.writeInt(dateBlockBuilder, 9035);
+        blocks.add(dateBlockBuilder.build());
+
+        ALL_SUPPORTED_TYPES_GENERIC_RECORD.put("timeMillis", 39_600_000);
+        BlockBuilder timeMillisBlock = TimeType.TIME_MILLIS.createBlockBuilder(null, 1);
+        TimeType.TIME_MILLIS.writeLong(timeMillisBlock, 39_600_000L * Timestamps.PICOSECONDS_PER_MILLISECOND);
+        blocks.add(timeMillisBlock.build());
+
+        ALL_SUPPORTED_TYPES_GENERIC_RECORD.put("timeMicros", 39_600_000_000L);
+        BlockBuilder timeMicrosBlock = TimeType.TIME_MICROS.createBlockBuilder(null, 1);
+        TimeType.TIME_MICROS.writeLong(timeMicrosBlock, 39_600_000_000L * Timestamps.PICOSECONDS_PER_MICROSECOND);
+        blocks.add(timeMicrosBlock.build());
+
+        ALL_SUPPORTED_TYPES_GENERIC_RECORD.put("id", RANDOM_UUID.toString());
+        BlockBuilder uuidBlock = UuidType.UUID.createBlockBuilder(null, 1);
+        UuidType.UUID.writeSlice(uuidBlock, UuidType.javaUuidToTrinoUuid(RANDOM_UUID));
+        blocks.add(uuidBlock.build());
+
+        ALL_SUPPORTED_PAGE = new Page(blocks.build().toArray(Block[]::new));
+    }
+
+    @BeforeAll
+    public void testStatics()
+    {
+        // Identity
+        assertIsAllSupportedTypePage(ALL_SUPPORTED_PAGE);
+    }
+
+    @Test
+    public void testTypesSimple()
+            throws IOException, AvroTypeException
+    {
+        TrinoInputFile input = createWrittenFileWithData(ALL_SUPPORTED_TYPES_SCHEMA, ImmutableList.of(ALL_SUPPORTED_TYPES_GENERIC_RECORD));
+        try (AvroFileReader pageIterator = new AvroFileReader(input, ALL_SUPPORTED_TYPES_SCHEMA, new NativeLogicalTypesAvroTypeManager())) {
+            while (pageIterator.hasNext()) {
+                Page p = pageIterator.next();
+                assertIsAllSupportedTypePage(p);
+            }
+        }
+    }
+
+    @Test
+    public void testWithDefaults()
+            throws IOException, AvroTypeException
+    {
+        String id = UUID.randomUUID().toString();
+        Schema schema = SchemaBuilder.builder()
+                .record("testDefaults")
+                .fields()
+                .name("timestampMillis")
+                .type(TIMESTAMP_MILLIS_SCHEMA).withDefault(testTime.getTime())
+                .name("smallBytesDecimal")
+                .type(DECIMAL_SMALL_BYTES_SCHEMA).withDefault(ByteBuffer.wrap(Longs.toByteArray(testTime.getTime())))
+                .name("timeMicros")
+                .type(TIME_MICROS_SCHEMA).withDefault(39_600_000_000L)
+                .name("id")
+                .type(UUID_SCHEMA).withDefault(id)
+                .endRecord();
+        Schema writeSchema = SchemaBuilder.builder()
+                .record("testDefaults")
+                .fields()
+                .name("notRead").type().optional().booleanType()
+                .endRecord();
+
+        TrinoInputFile input = createWrittenFileWithSchema(10, writeSchema);
+        try (AvroFileReader avroFileReader = new AvroFileReader(input, schema, new NativeLogicalTypesAvroTypeManager())) {
+            int totalRecords = 0;
+            while (avroFileReader.hasNext()) {
+                Page p = avroFileReader.next();
+                for (int i = 0; i < p.getPositionCount(); i++) {
+                    // millis timestamp const
+                    SqlTimestamp milliTimestamp = (SqlTimestamp) TimestampType.TIMESTAMP_MILLIS.getObjectValue(null, p.getBlock(0), i);
+                    assertThat(milliTimestamp.getEpochMicros()).isEqualTo(testTime.getTime() * 1000);
+
+                    // decimal bytes const
+                    SqlDecimal smallBytesDecimal = (SqlDecimal) SMALL_DECIMAL_TYPE.getObjectValue(null, p.getBlock(1), i);
+                    assertThat(smallBytesDecimal.getUnscaledValue()).isEqualTo(new BigInteger(Longs.toByteArray(testTime.getTime())));
+
+                    // time micros const
+                    SqlTime timeMicros = (SqlTime) TimeType.TIME_MICROS.getObjectValue(null, p.getBlock(2), i);
+                    assertThat(timeMicros.getPicos()).isEqualTo(39_600_000_000L * 1_000_000L);
+
+                    //UUID const assert
+                    assertThat(id).isEqualTo(UuidType.UUID.getObjectValue(null, p.getBlock(3), i));
+                }
+                totalRecords += p.getPositionCount();
+            }
+            assertThat(totalRecords).isEqualTo(10);
+        }
+    }
+
+    @Test
+    public void testWriting()
+            throws IOException, AvroTypeException
+    {
+        Location testLocation = createLocalTempLocation();
+        try (AvroFileWriter fileWriter = new AvroFileWriter(
+                trinoLocalFilesystem.newOutputFile(testLocation).create(),
+                ALL_SUPPORTED_TYPES_SCHEMA,
+                new NativeLogicalTypesAvroTypeManager(),
+                AvroCompressionKind.NULL,
+                ImmutableMap.of(),
+                ALL_SUPPORTED_TYPES_SCHEMA.getFields().stream().map(Schema.Field::name).collect(toImmutableList()),
+                AvroTypeUtils.typeFromAvro(ALL_SUPPORTED_TYPES_SCHEMA, new NativeLogicalTypesAvroTypeManager()).getTypeParameters(), false)) {
+            fileWriter.write(ALL_SUPPORTED_PAGE);
+        }
+
+        try (AvroFileReader fileReader = new AvroFileReader(
+                trinoLocalFilesystem.newInputFile(testLocation),
+                ALL_SUPPORTED_TYPES_SCHEMA,
+                new NativeLogicalTypesAvroTypeManager())) {
+            assertThat(fileReader.hasNext()).isTrue();
+            assertIsAllSupportedTypePage(fileReader.next());
+            assertThat(fileReader.hasNext()).isFalse();
+        }
+    }
+
+    private static void assertIsAllSupportedTypePage(Page p)
+    {
+        assertThat(p.getPositionCount()).isEqualTo(1);
+        // Timestamps equal
+        SqlTimestamp milliTimestamp = (SqlTimestamp) TimestampType.TIMESTAMP_MILLIS.getObjectValue(null, p.getBlock(0), 0);
+        SqlTimestamp microTimestamp = (SqlTimestamp) TimestampType.TIMESTAMP_MICROS.getObjectValue(null, p.getBlock(1), 0);
+        assertThat(milliTimestamp).isEqualTo(microTimestamp.roundTo(3));
+        assertThat(microTimestamp.getEpochMicros()).isEqualTo(testTime.getTime() * 1000);
+
+        // Decimals Equal
+        SqlDecimal smallBytesDecimal = (SqlDecimal) SMALL_DECIMAL_TYPE.getObjectValue(null, p.getBlock(2), 0);
+        SqlDecimal smallFixedDecimal = (SqlDecimal) SMALL_DECIMAL_TYPE.getObjectValue(null, p.getBlock(3), 0);
+        SqlDecimal largeBytesDecimal = (SqlDecimal) LARGE_DECIMAL_TYPE.getObjectValue(null, p.getBlock(4), 0);
+        SqlDecimal largeFixedDecimal = (SqlDecimal) LARGE_DECIMAL_TYPE.getObjectValue(null, p.getBlock(5), 0);
+
+        assertThat(smallBytesDecimal).isEqualTo(smallFixedDecimal);
+        assertThat(largeBytesDecimal).isEqualTo(largeFixedDecimal);
+        assertThat(smallBytesDecimal.toBigDecimal()).isEqualTo(largeBytesDecimal.toBigDecimal());
+        assertThat(smallBytesDecimal.getUnscaledValue()).isEqualTo(new BigInteger(Longs.toByteArray(78068160000000L)));
+
+        // Get date
+        SqlDate date = (SqlDate) DateType.DATE.getObjectValue(null, p.getBlock(6), 0);
+        assertThat(date.getDays()).isEqualTo(9035);
+
+        // Time equals
+        SqlTime timeMillis = (SqlTime) TimeType.TIME_MILLIS.getObjectValue(null, p.getBlock(7), 0);
+        SqlTime timeMicros = (SqlTime) TimeType.TIME_MICROS.getObjectValue(null, p.getBlock(8), 0);
+        assertThat(timeMillis).isEqualTo(timeMicros.roundTo(3));
+        assertThat(timeMillis.getPicos()).isEqualTo(timeMicros.getPicos()).isEqualTo(39_600_000_000L * 1_000_000L);
+
+        //UUID
+        assertThat(RANDOM_UUID.toString()).isEqualTo(UuidType.UUID.getObjectValue(null, p.getBlock(9), 0));
+    }
+}
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroPageDataReaderWithoutTypeManager.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroPageDataReaderWithoutTypeManager.java
new file mode 100644
index 000000000000..bcc88c9068b9
--- /dev/null
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroPageDataReaderWithoutTypeManager.java
@@ -0,0 +1,338 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.airlift.slice.Slice;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.ByteArrayBlock;
+import io.trino.spi.block.IntArrayBlock;
+import io.trino.spi.block.LongArrayBlock;
+import io.trino.spi.block.MapBlock;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.type.VarcharType;
+import org.apache.avro.Schema;
+import org.apache.avro.SchemaBuilder;
+import org.apache.avro.generic.GenericData;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.util.RandomData;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static io.trino.block.BlockAssertions.assertBlockEquals;
+import static io.trino.block.BlockAssertions.createStringsBlock;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestAvroPageDataReaderWithoutTypeManager
+        extends TestAvroBase
+{
+    private static final Schema SIMPLE_ENUM_SCHEMA = SchemaBuilder.enumeration("myEnumType").symbols("A", "B", "C");
+    private static final Schema SIMPLE_ENUM_SUPER_SCHEMA = SchemaBuilder.enumeration("myEnumType").symbols("A", "B", "C", "D");
+    private static final Schema SIMPLE_ENUM_REORDERED = SchemaBuilder.enumeration("myEnumType").symbols("C", "D", "B", "A");
+
+    @Test
+    public void testAllTypesSimple()
+            throws IOException, AvroTypeException
+    {
+        TrinoInputFile input = createWrittenFileWithData(ALL_TYPES_RECORD_SCHEMA, ImmutableList.of(ALL_TYPES_GENERIC_RECORD));
+        try (AvroFileReader avroFileReader = new AvroFileReader(input, ALL_TYPES_RECORD_SCHEMA, NoOpAvroTypeManager.INSTANCE)) {
+            int totalRecords = 0;
+            while (avroFileReader.hasNext()) {
+                Page p = avroFileReader.next();
+                assertIsAllTypesPage(p);
+                totalRecords += p.getPositionCount();
+            }
+            assertThat(totalRecords).isEqualTo(1);
+        }
+    }
+
+    @Test
+    public void testSchemaWithSkips()
+            throws IOException, AvroTypeException
+    {
+        SchemaBuilder.FieldAssembler<Schema> fieldAssembler = SchemaBuilder.builder().record("simpleRecord").fields();
+        fieldAssembler.name("notInAllTypeRecordSchema").type().optional().array().items().intType();
+        Schema readSchema = fieldAssembler.endRecord();
+
+        int count = ThreadLocalRandom.current().nextInt(10000, 100000);
+        TrinoInputFile input = createWrittenFileWithSchema(count, ALL_TYPES_RECORD_SCHEMA);
+        try (AvroFileReader avroFileReader = new AvroFileReader(input, readSchema, NoOpAvroTypeManager.INSTANCE)) {
+            int totalRecords = 0;
+            while (avroFileReader.hasNext()) {
+                Page p = avroFileReader.next();
+                for (int pos = 0; pos < p.getPositionCount(); pos++) {
+                    assertThat(p.getBlock(0).isNull(pos)).isTrue();
+                }
+                totalRecords += p.getPositionCount();
+            }
+            assertThat(totalRecords).isEqualTo(count);
+        }
+    }
+
+    @Test
+    public void testSchemaWithDefaults()
+            throws IOException, AvroTypeException
+    {
+        SchemaBuilder.FieldAssembler<Schema> fieldAssembler = SchemaBuilder.builder().record("simpleRecord").fields();
+        fieldAssembler.name("defaultedField1").type().map().values().stringType().mapDefault(ImmutableMap.of("key1", "value1"));
+        for (Schema.Field field : SIMPLE_RECORD_SCHEMA.getFields()) {
+            fieldAssembler = fieldAssembler.name(field.name()).type(field.schema()).noDefault();
+        }
+        fieldAssembler.name("defaultedField2").type().booleanType().booleanDefault(true);
+        Schema readerSchema = fieldAssembler.endRecord();
+
+        int count = ThreadLocalRandom.current().nextInt(10000, 100000);
+        TrinoInputFile input = createWrittenFileWithSchema(count, SIMPLE_RECORD_SCHEMA);
+        try (AvroFileReader avroFileReader = new AvroFileReader(input, readerSchema, NoOpAvroTypeManager.INSTANCE)) {
+            int totalRecords = 0;
+            while (avroFileReader.hasNext()) {
+                Page p = avroFileReader.next();
+                MapBlock mb = (MapBlock) p.getBlock(0);
+                MapBlock expected = (MapBlock) MAP_VARCHAR_VARCHAR.createBlockFromKeyValue(Optional.empty(),
+                        new int[] {0, 1},
+                        createStringsBlock("key1"),
+                        createStringsBlock("value1"));
+                mb = (MapBlock) mb.getRegion(0, 1);
+                assertBlockEquals(MAP_VARCHAR_VARCHAR, mb, expected);
+
+                ByteArrayBlock block = (ByteArrayBlock) p.getBlock(readerSchema.getFields().size() - 1);
+                assertThat(block.getByte(0, 0)).isGreaterThan((byte) 0);
+                totalRecords += p.getPositionCount();
+            }
+            assertThat(totalRecords).isEqualTo(count);
+        }
+    }
+
+    @Test
+    public void testSchemaWithReorders()
+            throws IOException, AvroTypeException
+    {
+        Schema writerSchema = reorderSchema(ALL_TYPES_RECORD_SCHEMA);
+        TrinoInputFile input = createWrittenFileWithData(writerSchema, ImmutableList.of(reorderGenericRecord(writerSchema, ALL_TYPES_GENERIC_RECORD)));
+        try (AvroFileReader avroFileReader = new AvroFileReader(input, ALL_TYPES_RECORD_SCHEMA, NoOpAvroTypeManager.INSTANCE)) {
+            int totalRecords = 0;
+            while (avroFileReader.hasNext()) {
+                Page p = avroFileReader.next();
+                assertIsAllTypesPage(p);
+                totalRecords += p.getPositionCount();
+            }
+            assertThat(totalRecords).isEqualTo(1);
+        }
+    }
+
+    @Test
+    public void testPromotions()
+            throws IOException, AvroTypeException
+    {
+        SchemaBuilder.FieldAssembler<Schema> writeSchemaBuilder = SchemaBuilder.builder().record("writeRecord").fields();
+        SchemaBuilder.FieldAssembler<Schema> readSchemaBuilder = SchemaBuilder.builder().record("readRecord").fields();
+
+        AtomicInteger fieldNum = new AtomicInteger(0);
+        Map<Integer, Class<?>> expectedBlockPerChannel = new HashMap<>();
+        for (Schema.Type readType : Schema.Type.values()) {
+            List<Schema.Type> promotesFrom = switch (readType) {
+                case STRING -> ImmutableList.of(Schema.Type.BYTES);
+                case BYTES -> ImmutableList.of(Schema.Type.STRING);
+                case LONG -> ImmutableList.of(Schema.Type.INT);
+                case FLOAT -> ImmutableList.of(Schema.Type.INT, Schema.Type.LONG);
+                case DOUBLE -> ImmutableList.of(Schema.Type.INT, Schema.Type.LONG, Schema.Type.FLOAT);
+                case RECORD, ENUM, ARRAY, MAP, UNION, FIXED, INT, BOOLEAN, NULL -> ImmutableList.of();
+            };
+            for (Schema.Type writeType : promotesFrom) {
+                expectedBlockPerChannel.put(fieldNum.get(), switch (readType) {
+                    case STRING, BYTES -> VariableWidthBlock.class;
+                    case LONG, DOUBLE -> LongArrayBlock.class;
+                    case FLOAT -> IntArrayBlock.class;
+                    case RECORD, ENUM, ARRAY, MAP, UNION, FIXED, INT, BOOLEAN, NULL -> throw new IllegalStateException();
+                });
+                String fieldName = "field" + fieldNum.getAndIncrement();
+                writeSchemaBuilder = writeSchemaBuilder.name(fieldName).type(Schema.create(writeType)).noDefault();
+                readSchemaBuilder = readSchemaBuilder.name(fieldName).type(Schema.create(readType)).noDefault();
+            }
+        }
+
+        int count = ThreadLocalRandom.current().nextInt(10000, 100000);
+        TrinoInputFile input = createWrittenFileWithSchema(count, writeSchemaBuilder.endRecord());
+        try (AvroFileReader avroFileReader = new AvroFileReader(input, readSchemaBuilder.endRecord(), NoOpAvroTypeManager.INSTANCE)) {
+            int totalRecords = 0;
+            while (avroFileReader.hasNext()) {
+                Page p = avroFileReader.next();
+                for (Map.Entry<Integer, Class<?>> channelClass : expectedBlockPerChannel.entrySet()) {
+                    assertThat(p.getBlock(channelClass.getKey())).isInstanceOf(channelClass.getValue());
+                }
+                totalRecords += p.getPositionCount();
+            }
+            assertThat(totalRecords).isEqualTo(count);
+        }
+    }
+
+    @Test
+    public void testEnum()
+            throws IOException, AvroTypeException
+    {
+        Schema base = SchemaBuilder.record("test").fields()
+                .name("myEnum")
+                .type(SIMPLE_ENUM_SCHEMA).noDefault()
+                .endRecord();
+        Schema superSchema = SchemaBuilder.record("test").fields()
+                .name("myEnum")
+                .type(SIMPLE_ENUM_SUPER_SCHEMA).noDefault()
+                .endRecord();
+        Schema reorderdSchema = SchemaBuilder.record("test").fields()
+                .name("myEnum")
+                .type(SIMPLE_ENUM_REORDERED).noDefault()
+                .endRecord();
+
+        GenericRecord expected = (GenericRecord) new RandomData(base, 1).iterator().next();
+
+        //test superset
+        TrinoInputFile input = createWrittenFileWithData(base, ImmutableList.of(expected));
+        try (AvroFileReader avroFileReader = new AvroFileReader(input, superSchema, NoOpAvroTypeManager.INSTANCE)) {
+            int totalRecords = 0;
+            while (avroFileReader.hasNext()) {
+                Page p = avroFileReader.next();
+                String actualSymbol = new String(((Slice) VARCHAR.getObject(p.getBlock(0), 0)).getBytes(), StandardCharsets.UTF_8);
+                assertThat(actualSymbol).isEqualTo(expected.get("myEnum").toString());
+                totalRecords += p.getPositionCount();
+            }
+            assertThat(totalRecords).isEqualTo(1);
+        }
+
+        //test reordered
+        input = createWrittenFileWithData(base, ImmutableList.of(expected));
+        try (AvroFileReader avroFileReader = new AvroFileReader(input, reorderdSchema, NoOpAvroTypeManager.INSTANCE)) {
+            int totalRecords = 0;
+            while (avroFileReader.hasNext()) {
+                Page p = avroFileReader.next();
+                String actualSymbol = new String(((Slice) VarcharType.VARCHAR.getObject(p.getBlock(0), 0)).getBytes(), StandardCharsets.UTF_8);
+                assertThat(actualSymbol).isEqualTo(expected.get("myEnum").toString());
+                totalRecords += p.getPositionCount();
+            }
+            assertThat(totalRecords).isEqualTo(1);
+        }
+    }
+
+    @Test
+    public void testCoercionOfUnionToStruct()
+            throws IOException, AvroTypeException
+    {
+        Schema complexUnion = Schema.createUnion(Schema.create(Schema.Type.INT), Schema.create(Schema.Type.STRING), Schema.create(Schema.Type.NULL));
+
+        Schema readSchema = SchemaBuilder.builder()
+                .record("testComplexUnions")
+                .fields()
+                .name("readStraightUp")
+                .type(complexUnion)
+                .noDefault()
+                .name("readFromReverse")
+                .type(complexUnion)
+                .noDefault()
+                .name("readFromDefault")
+                .type(complexUnion)
+                .withDefault(42)
+                .endRecord();
+
+        Schema writeSchema = SchemaBuilder.builder()
+                .record("testComplexUnions")
+                .fields()
+                .name("readStraightUp")
+                .type(complexUnion)
+                .noDefault()
+                .name("readFromReverse")
+                .type(Schema.createUnion(Schema.create(Schema.Type.STRING), Schema.create(Schema.Type.NULL), Schema.create(Schema.Type.INT)))
+                .noDefault()
+                .endRecord();
+
+        GenericRecord stringsOnly = new GenericData.Record(writeSchema);
+        stringsOnly.put("readStraightUp", "I am in column 0 field 1");
+        stringsOnly.put("readFromReverse", "I am in column 1 field 1");
+
+        GenericRecord ints = new GenericData.Record(writeSchema);
+        ints.put("readStraightUp", 5);
+        ints.put("readFromReverse", 21);
+
+        GenericRecord nulls = new GenericData.Record(writeSchema);
+        nulls.put("readStraightUp", null);
+        nulls.put("readFromReverse", null);
+
+        TrinoInputFile input = createWrittenFileWithData(writeSchema, ImmutableList.of(stringsOnly, ints, nulls));
+        try (AvroFileReader avroFileReader = new AvroFileReader(input, readSchema, NoOpAvroTypeManager.INSTANCE)) {
+            int totalRecords = 0;
+            while (avroFileReader.hasNext()) {
+                Page p = avroFileReader.next();
+                assertThat(p.getPositionCount()).withFailMessage("Page Batch should be at least 3").isEqualTo(3);
+                //check first column
+                //check first column first row coerced struct
+                Block readStraightUpStringsOnly = p.getBlock(0).getSingleValueBlock(0);
+                assertThat(readStraightUpStringsOnly.getChildren().size()).isEqualTo(3); // tag, int and string block fields
+                assertThat(readStraightUpStringsOnly.getChildren().get(1).isNull(0)).isTrue(); // int field null
+                assertThat(VARCHAR.getObjectValue(null, readStraightUpStringsOnly.getChildren().get(2), 0)).isEqualTo("I am in column 0 field 1"); //string field expected value
+                // check first column second row coerced struct
+                Block readStraightUpInts = p.getBlock(0).getSingleValueBlock(1);
+                assertThat(readStraightUpInts.getChildren().size()).isEqualTo(3); // tag, int and string block fields
+                assertThat(readStraightUpInts.getChildren().get(2).isNull(0)).isTrue(); // string field null
+                assertThat(INTEGER.getObjectValue(null, readStraightUpInts.getChildren().get(1), 0)).isEqualTo(5);
+
+                //check first column third row is null
+                assertThat(p.getBlock(0).isNull(2)).isTrue();
+                //check second column
+                //check second column first row coerced struct
+                Block readFromReverseStringsOnly = p.getBlock(1).getSingleValueBlock(0);
+                assertThat(readFromReverseStringsOnly.getChildren().size()).isEqualTo(3); // tag, int and string block fields
+                assertThat(readFromReverseStringsOnly.getChildren().get(1).isNull(0)).isTrue(); // int field null
+                assertThat(VARCHAR.getObjectValue(null, readFromReverseStringsOnly.getChildren().get(2), 0)).isEqualTo("I am in column 1 field 1");
+                //check second column second row coerced struct
+                Block readFromReverseUpInts = p.getBlock(1).getSingleValueBlock(1);
+                assertThat(readFromReverseUpInts.getChildren().size()).isEqualTo(3); // tag, int and string block fields
+                assertThat(readFromReverseUpInts.getChildren().get(2).isNull(0)).isTrue(); // string field null
+                assertThat(INTEGER.getObjectValue(null, readFromReverseUpInts.getChildren().get(1), 0)).isEqualTo(21);
+                //check second column third row is null
+                assertThat(p.getBlock(1).isNull(2)).isTrue();
+
+                //check third column (default of 42 always)
+                //check third column first row coerced struct
+                Block readFromDefaultStringsOnly = p.getBlock(2).getSingleValueBlock(0);
+                assertThat(readFromDefaultStringsOnly.getChildren().size()).isEqualTo(3); // tag, int and string block fields
+                assertThat(readFromDefaultStringsOnly.getChildren().get(2).isNull(0)).isTrue(); // string field null
+                assertThat(INTEGER.getObjectValue(null, readFromDefaultStringsOnly.getChildren().get(1), 0)).isEqualTo(42);
+                //check third column second row coerced struct
+                Block readFromDefaultInts = p.getBlock(2).getSingleValueBlock(1);
+                assertThat(readFromDefaultInts.getChildren().size()).isEqualTo(3); // tag, int and string block fields
+                assertThat(readFromDefaultInts.getChildren().get(2).isNull(0)).isTrue(); // string field null
+                assertThat(INTEGER.getObjectValue(null, readFromDefaultInts.getChildren().get(1), 0)).isEqualTo(42);
+                //check third column third row coerced struct
+                Block readFromDefaultNulls = p.getBlock(2).getSingleValueBlock(2);
+                assertThat(readFromDefaultNulls.getChildren().size()).isEqualTo(3); // int and string block fields
+                assertThat(readFromDefaultNulls.getChildren().get(2).isNull(0)).isTrue(); // string field null
+                assertThat(INTEGER.getObjectValue(null, readFromDefaultNulls.getChildren().get(1), 0)).isEqualTo(42);
+
+                totalRecords += p.getPositionCount();
+            }
+            assertThat(totalRecords).isEqualTo(3);
+        }
+    }
+}
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroPageDataWriterWithoutTypeManager.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroPageDataWriterWithoutTypeManager.java
new file mode 100644
index 000000000000..f8c098dd6361
--- /dev/null
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestAvroPageDataWriterWithoutTypeManager.java
@@ -0,0 +1,225 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.airlift.slice.Slices;
+import io.trino.filesystem.Location;
+import io.trino.hive.formats.TrinoDataInputStream;
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.DictionaryBlock;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.type.DoubleType;
+import io.trino.spi.type.IntegerType;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.VarcharType;
+import org.apache.avro.Schema;
+import org.apache.avro.SchemaBuilder;
+import org.apache.avro.file.DataFileReader;
+import org.apache.avro.generic.GenericDatumReader;
+import org.apache.avro.generic.GenericRecord;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.block.BlockAssertions.assertBlockEquals;
+import static io.trino.block.BlockAssertions.createRowBlock;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TinyintType.TINYINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestAvroPageDataWriterWithoutTypeManager
+        extends TestAvroBase
+{
+    @Test
+    public void testAllTypesSimple()
+            throws IOException, AvroTypeException
+    {
+        testAllTypesWriting(ALL_TYPES_RECORD_SCHEMA);
+    }
+
+    @Test
+    public void testAllTypesReordered()
+            throws IOException, AvroTypeException
+    {
+        testAllTypesWriting(reorderSchema(ALL_TYPES_RECORD_SCHEMA));
+    }
+
+    private void testAllTypesWriting(Schema writeSchema)
+            throws AvroTypeException, IOException
+    {
+        Location tempTestLocation = createLocalTempLocation();
+        try (AvroFileWriter fileWriter = new AvroFileWriter(
+                trinoLocalFilesystem.newOutputFile(tempTestLocation).create(),
+                writeSchema,
+                NoOpAvroTypeManager.INSTANCE,
+                AvroCompressionKind.NULL,
+                ImmutableMap.of(),
+                ALL_TYPES_RECORD_SCHEMA.getFields().stream().map(Schema.Field::name).collect(toImmutableList()),
+                AvroTypeUtils.typeFromAvro(ALL_TYPES_RECORD_SCHEMA, NoOpAvroTypeManager.INSTANCE).getTypeParameters(), false)) {
+            fileWriter.write(ALL_TYPES_PAGE);
+        }
+
+        try (AvroFileReader fileReader = new AvroFileReader(trinoLocalFilesystem.newInputFile(tempTestLocation), ALL_TYPES_RECORD_SCHEMA, NoOpAvroTypeManager.INSTANCE)) {
+            assertThat(fileReader.hasNext()).isTrue();
+            assertIsAllTypesPage(fileReader.next());
+            assertThat(fileReader.hasNext()).isFalse();
+        }
+
+        try (DataFileReader<GenericRecord> genericRecordDataFileReader = new DataFileReader<>(
+                new AvroFileReader.TrinoDataInputStreamAsAvroSeekableInput(new TrinoDataInputStream(trinoLocalFilesystem.newInputFile(tempTestLocation).newStream()), trinoLocalFilesystem.newInputFile(tempTestLocation).length()),
+                new GenericDatumReader<>(ALL_TYPES_RECORD_SCHEMA))) {
+            assertThat(genericRecordDataFileReader.hasNext()).isTrue();
+            assertThat(genericRecordDataFileReader.next()).isEqualTo(ALL_TYPES_GENERIC_RECORD);
+            assertThat(genericRecordDataFileReader.hasNext()).isFalse();
+        }
+    }
+
+    @Test
+    public void testRLEAndDictionaryBlocks()
+            throws IOException, AvroTypeException
+    {
+        Type simepleRecordType = RowType.anonymousRow(INTEGER, DoubleType.DOUBLE, VARCHAR);
+        Schema testBlocksSchema = SchemaBuilder.builder()
+                .record("testRLEAndDictionary")
+                .fields()
+                .name("rleInt")
+                .type().intType().noDefault()
+                .name("rleString")
+                .type().stringType().noDefault()
+                .name("dictString")
+                .type().stringType().noDefault()
+                .name("rleRow")
+                .type(SIMPLE_RECORD_SCHEMA).noDefault()
+                .name("dictRow")
+                .type(SIMPLE_RECORD_SCHEMA).noDefault()
+                .endRecord();
+
+        Block expectedRLERow = createRowBlock(ImmutableList.of(INTEGER, DoubleType.DOUBLE, VARCHAR), new Object[] {5, 3.14159265358979, "Simple Record String Field"});
+        Block expectedDictionaryRow = createRowBlock(ImmutableList.of(INTEGER, DoubleType.DOUBLE, VARCHAR), new Object[] {2, 27.9, "Sting1"});
+        Page toWrite = new Page(
+                RunLengthEncodedBlock.create(IntegerType.INTEGER, 2L, 2),
+                RunLengthEncodedBlock.create(VarcharType.VARCHAR, Slices.utf8Slice("rleString"), 2),
+                DictionaryBlock.create(2,
+                        VarcharType.VARCHAR.createBlockBuilder(null, 3, 1)
+                                .writeEntry(Slices.utf8Slice("A"))
+                                .writeEntry(Slices.utf8Slice("B"))
+                                .writeEntry(Slices.utf8Slice("C"))
+                                .build(),
+                        new int[] {1, 2}),
+                RunLengthEncodedBlock.create(
+                        expectedRLERow, 2),
+                DictionaryBlock.create(2,
+                        expectedDictionaryRow,
+                        new int[] {0, 0}));
+
+        Location testLocation = createLocalTempLocation();
+        try (AvroFileWriter avroFileWriter = new AvroFileWriter(
+                trinoLocalFilesystem.newOutputFile(testLocation).create(),
+                testBlocksSchema,
+                NoOpAvroTypeManager.INSTANCE,
+                AvroCompressionKind.NULL,
+                ImmutableMap.of(),
+                testBlocksSchema.getFields().stream().map(Schema.Field::name).collect(toImmutableList()),
+                AvroTypeUtils.typeFromAvro(testBlocksSchema, NoOpAvroTypeManager.INSTANCE).getTypeParameters(), false)) {
+            avroFileWriter.write(toWrite);
+        }
+
+        try (AvroFileReader avroFileReader = new AvroFileReader(
+                trinoLocalFilesystem.newInputFile(testLocation),
+                testBlocksSchema,
+                NoOpAvroTypeManager.INSTANCE)) {
+            assertThat(avroFileReader.hasNext()).isTrue();
+            Page readPage = avroFileReader.next();
+            assertThat(INTEGER.getInt(readPage.getBlock(0), 0)).isEqualTo(2);
+            assertThat(INTEGER.getInt(readPage.getBlock(0), 1)).isEqualTo(2);
+            assertThat(VarcharType.VARCHAR.getSlice(readPage.getBlock(1), 0)).isEqualTo(Slices.utf8Slice("rleString"));
+            assertThat(VarcharType.VARCHAR.getSlice(readPage.getBlock(1), 1)).isEqualTo(Slices.utf8Slice("rleString"));
+            assertThat(VarcharType.VARCHAR.getSlice(readPage.getBlock(2), 0)).isEqualTo(Slices.utf8Slice("B"));
+            assertThat(VarcharType.VARCHAR.getSlice(readPage.getBlock(2), 1)).isEqualTo(Slices.utf8Slice("C"));
+            assertBlockEquals(simepleRecordType, readPage.getBlock(3).getSingleValueBlock(0), expectedRLERow);
+            assertBlockEquals(simepleRecordType, readPage.getBlock(3).getSingleValueBlock(1), expectedRLERow);
+            assertBlockEquals(simepleRecordType, readPage.getBlock(4).getSingleValueBlock(0), expectedDictionaryRow);
+            assertBlockEquals(simepleRecordType, readPage.getBlock(4).getSingleValueBlock(1), expectedDictionaryRow);
+            assertThat(avroFileReader.hasNext()).isFalse();
+        }
+    }
+
+    @Test
+    public void testBlockUpcasting()
+            throws IOException, AvroTypeException
+    {
+        Schema testCastingSchema = SchemaBuilder.builder()
+                .record("testUpCasting")
+                .fields()
+                .name("byteToInt")
+                .type().intType().noDefault()
+                .name("shortToInt")
+                .type().intType().noDefault()
+                .name("byteToLong")
+                .type().longType().noDefault()
+                .name("shortToLong")
+                .type().longType().noDefault()
+                .name("intToLong")
+                .type().longType().noDefault()
+                .endRecord();
+
+        BlockBuilder byteBlockBuilder = TINYINT.createBlockBuilder(null, 1);
+        TINYINT.writeByte(byteBlockBuilder, (byte) 1);
+        Block byteBlock = byteBlockBuilder.build();
+
+        BlockBuilder shortBlockBuilder = SMALLINT.createBlockBuilder(null, 1);
+        SMALLINT.writeShort(shortBlockBuilder, (short) 2);
+        Block shortBlock = shortBlockBuilder.build();
+
+        BlockBuilder integerBlockBuilder = INTEGER.createBlockBuilder(null, 1);
+        INTEGER.writeInt(integerBlockBuilder, 4);
+        Block integerBlock = integerBlockBuilder.build();
+
+        Page toWrite = new Page(byteBlock, shortBlock, byteBlock, shortBlock, integerBlock);
+        Location testLocation = createLocalTempLocation();
+        try (AvroFileWriter avroFileWriter = new AvroFileWriter(
+                trinoLocalFilesystem.newOutputFile(testLocation).create(),
+                testCastingSchema,
+                NoOpAvroTypeManager.INSTANCE,
+                AvroCompressionKind.NULL,
+                ImmutableMap.of(),
+                ImmutableList.of("byteToInt", "shortToInt", "byteToLong", "shortToLong", "intToLong"),
+                ImmutableList.of(TINYINT, SMALLINT, TINYINT, SMALLINT, INTEGER), false)) {
+            avroFileWriter.write(toWrite);
+        }
+
+        try (AvroFileReader avroFileReader = new AvroFileReader(
+                trinoLocalFilesystem.newInputFile(testLocation),
+                testCastingSchema,
+                NoOpAvroTypeManager.INSTANCE)) {
+            assertThat(avroFileReader.hasNext()).isTrue();
+            Page readPage = avroFileReader.next();
+            assertThat(INTEGER.getInt(readPage.getBlock(0), 0)).isEqualTo(1);
+            assertThat(INTEGER.getInt(readPage.getBlock(1), 0)).isEqualTo(2);
+            assertThat(BIGINT.getLong(readPage.getBlock(2), 0)).isEqualTo(1);
+            assertThat(BIGINT.getLong(readPage.getBlock(3), 0)).isEqualTo(2);
+            assertThat(BIGINT.getLong(readPage.getBlock(4), 0)).isEqualTo(4);
+            assertThat(avroFileReader.hasNext()).isFalse();
+        }
+    }
+}
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestLongFromBigEndian.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestLongFromBigEndian.java
new file mode 100644
index 000000000000..542d61b11d98
--- /dev/null
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/avro/TestLongFromBigEndian.java
@@ -0,0 +1,191 @@
+/*
+ * Licensed 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 io.trino.hive.formats.avro;
+
+import com.google.common.primitives.Longs;
+import io.trino.spi.type.Int128;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.concurrent.ThreadLocalRandom;
+
+import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.fitBigEndianValueToByteArraySize;
+import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.fromBigEndian;
+import static io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager.padBigEndianToSize;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestLongFromBigEndian
+{
+    @Test
+    public void testArrays()
+    {
+        assertThat(fromBigEndian(new byte[] {(byte) 0xFF, (byte) 0xFF})).isEqualTo(-1);
+        assertThat(fromBigEndian(new byte[] {0, 0, 0, 0, 0, 0, (byte) 0xFF, (byte) 0xFF})).isEqualTo(65535);
+        assertThat(fromBigEndian(new byte[] {(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0x80, 0, 0, 0, 0, 0, 0, 0})).isEqualTo(Long.MIN_VALUE);
+    }
+
+    @Test
+    public void testIdentity()
+    {
+        long a = 780681600000L;
+        long b = Long.MIN_VALUE;
+        long c = Long.MAX_VALUE;
+        long d = 0L;
+        long e = -1L;
+
+        assertThat(fromBigEndian(Longs.toByteArray(a))).isEqualTo(a);
+        assertThat(fromBigEndian(Longs.toByteArray(b))).isEqualTo(b);
+        assertThat(fromBigEndian(Longs.toByteArray(c))).isEqualTo(c);
+        assertThat(fromBigEndian(Longs.toByteArray(d))).isEqualTo(d);
+        assertThat(fromBigEndian(Longs.toByteArray(e))).isEqualTo(e);
+    }
+
+    @Test
+    public void testLessThan8Bytes()
+    {
+        long a = 24L;
+        long b = -24L;
+        long c = 0L;
+        long d = 1L;
+        long e = -1L;
+        long f = 64L;
+        long g = -64L;
+
+        for (int i = 0; i < 8; i++) {
+            assertThat(fromBigEndian(Arrays.copyOfRange(Longs.toByteArray(a), i, 8))).isEqualTo(a);
+            assertThat(fromBigEndian(Arrays.copyOfRange(Longs.toByteArray(b), i, 8))).isEqualTo(b);
+            assertThat(fromBigEndian(Arrays.copyOfRange(Longs.toByteArray(c), i, 8))).isEqualTo(c);
+            assertThat(fromBigEndian(Arrays.copyOfRange(Longs.toByteArray(d), i, 8))).isEqualTo(d);
+            assertThat(fromBigEndian(Arrays.copyOfRange(Longs.toByteArray(e), i, 8))).isEqualTo(e);
+            assertThat(fromBigEndian(Arrays.copyOfRange(Longs.toByteArray(f), i, 8))).isEqualTo(f);
+            assertThat(fromBigEndian(Arrays.copyOfRange(Longs.toByteArray(g), i, 8))).isEqualTo(g);
+        }
+    }
+
+    @Test
+    public void testWithPadding()
+    {
+        long a = 780681600000L;
+        long b = Long.MIN_VALUE;
+        long c = Long.MAX_VALUE;
+        long d = 0L;
+        long e = -1L;
+
+        for (int i = 9; i < 24; i++) {
+            assertThat(fromBigEndian(padBigEndianToSize(a, i))).isEqualTo(a);
+            assertThat(fromBigEndian(padBigEndianToSize(b, i))).isEqualTo(b);
+            assertThat(fromBigEndian(padBigEndianToSize(c, i))).isEqualTo(c);
+            assertThat(fromBigEndian(padBigEndianToSize(d, i))).isEqualTo(d);
+            assertThat(fromBigEndian(padBigEndianToSize(e, i))).isEqualTo(e);
+        }
+    }
+
+    private static byte[] padPoorly(long toPad)
+    {
+        int totalSize = 32;
+        byte[] longBytes = Longs.toByteArray(toPad);
+
+        byte[] padded = new byte[totalSize];
+
+        System.arraycopy(longBytes, 0, padded, totalSize - 8, 8);
+
+        for (int i = 0; i < totalSize - 8; i++) {
+            padded[i] = ThreadLocalRandom.current().nextBoolean() ? (byte) ThreadLocalRandom.current().nextInt(1, Byte.MAX_VALUE) : (byte) ThreadLocalRandom.current().nextInt(Byte.MIN_VALUE, -1);
+        }
+
+        return padded;
+    }
+
+    @Test
+    public void testWithBadPadding()
+    {
+        long a = 780681600000L;
+        long b = Long.MIN_VALUE;
+        long c = Long.MAX_VALUE;
+        long d = 0L;
+        long e = -1L;
+
+        assertThatThrownBy(() -> fromBigEndian(padPoorly(a))).isInstanceOf(ArithmeticException.class);
+        assertThatThrownBy(() -> fromBigEndian(padPoorly(b))).isInstanceOf(ArithmeticException.class);
+        assertThatThrownBy(() -> fromBigEndian(padPoorly(c))).isInstanceOf(ArithmeticException.class);
+        assertThatThrownBy(() -> fromBigEndian(padPoorly(d))).isInstanceOf(ArithmeticException.class);
+        assertThatThrownBy(() -> fromBigEndian(padPoorly(e))).isInstanceOf(ArithmeticException.class);
+    }
+
+    @Test
+    public void testPad()
+    {
+        assertThat(padBigEndianToSize(new byte[] {0}, 10)).isEqualTo(new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0});
+        assertThat(padBigEndianToSize(new byte[] {-1}, 10)).isEqualTo(new byte[] {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1});
+        assertThat(padBigEndianToSize(new byte[] {(byte) 0x80, 0x00}, 10)).isEqualTo(new byte[] {-1, -1, -1, -1, -1, -1, -1, -1, (byte) 0x80, 0});
+
+        assertThat(padBigEndianToSize(2, 10)).isEqualTo(new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 2});
+        assertThat(padBigEndianToSize(0xFF, 10)).isEqualTo(new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, -1});
+        assertThat(padBigEndianToSize(Long.MIN_VALUE, 10)).isEqualTo(new byte[] {-1, -1, (byte) 0x80, 0, 0, 0, 0, 0, 0, 0});
+        assertThat(padBigEndianToSize(Long.MAX_VALUE, 10)).isEqualTo(new byte[] {0, 0, (byte) 0x7F, -1, -1, -1, -1, -1, -1, -1});
+
+        assertThat(padBigEndianToSize(Int128.valueOf(2), 18)).isEqualTo(new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2});
+        assertThat(padBigEndianToSize(Int128.valueOf(-1), 18)).isEqualTo(new byte[] {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1});
+        assertThat(padBigEndianToSize(Int128.MIN_VALUE, 18)).isEqualTo(new byte[] {-1, -1, (byte) 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0});
+        assertThat(padBigEndianToSize(Int128.MAX_VALUE, 18)).isEqualTo(new byte[] {0, 0, 0x7F, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1});
+    }
+
+    @Test
+    public void testBigEndianResize()
+    {
+        //test identity
+        assertThat(fitBigEndianValueToByteArraySize(2, 8)).isEqualTo(Longs.toByteArray(2));
+        assertThat(fitBigEndianValueToByteArraySize(Int128.valueOf(Long.MAX_VALUE), 16)).isEqualTo(Int128.valueOf(Long.MAX_VALUE).toBigEndianBytes());
+
+        // test scale up
+        assertThat(fitBigEndianValueToByteArraySize(42, 16)).isEqualTo(Int128.valueOf(42).toBigEndianBytes());
+        assertThat(fitBigEndianValueToByteArraySize(-2000, 16)).isEqualTo(Int128.valueOf(-2000).toBigEndianBytes());
+
+        // test scale down
+        assertThat(fitBigEndianValueToByteArraySize(Int128.valueOf(32), 8)).isEqualTo(Longs.toByteArray(32));
+        assertThat(fitBigEndianValueToByteArraySize(Int128.valueOf(-1), 8)).isEqualTo(Longs.toByteArray(-1));
+
+        assertThat(fitBigEndianValueToByteArraySize(1, 3)).isEqualTo(new byte[] {0, 0, 1});
+        assertThat(fitBigEndianValueToByteArraySize(Int128.valueOf(-7), 4)).isEqualTo(new byte[] {-1, -1, -1, -7});
+        assertThat(fitBigEndianValueToByteArraySize(new byte[] {2, 4, 5}, 5)).isEqualTo(new byte[] {0, 0, 2, 4, 5});
+        assertThat(fitBigEndianValueToByteArraySize(new byte[] {-7, 4, 5}, 6)).isEqualTo(new byte[] {-1, -1, -1, -7, 4, 5});
+
+        //fails size down prereq 1
+        assertThatThrownBy(() -> fitBigEndianValueToByteArraySize(new byte[] {0x7F}, 0)).isInstanceOf(ArithmeticException.class);
+        assertThatThrownBy(() -> fitBigEndianValueToByteArraySize(new byte[] {0x00, 0x02, (byte) 200, -34}, -3)).isInstanceOf(ArithmeticException.class);
+
+        //fails size down prereq 2
+        assertThatThrownBy(() -> fitBigEndianValueToByteArraySize(new byte[] {0x01, 0x02, 0x03}, 2)).isInstanceOf(ArithmeticException.class);
+        assertThatThrownBy(() -> fitBigEndianValueToByteArraySize(new byte[] {-2, 0x02, 0x03}, 2)).isInstanceOf(ArithmeticException.class);
+
+        // case 1 resize down assert proper significant bit
+        assertThatThrownBy(() -> fitBigEndianValueToByteArraySize(new byte[] {0, 0, -1}, 1)).isInstanceOf(ArithmeticException.class);
+        assertThat(fitBigEndianValueToByteArraySize(new byte[] {0, 0, -1}, 2)).isEqualTo(new byte[] {0, -1});
+
+        // case 2 resize down assert proper significant bit
+        assertThatThrownBy(() -> fitBigEndianValueToByteArraySize(new byte[] {0, 0, 1}, 0)).isInstanceOf(ArithmeticException.class);
+        assertThat(fitBigEndianValueToByteArraySize(new byte[] {0, 0, 1}, 1)).isEqualTo(new byte[] {1});
+        assertThat(fitBigEndianValueToByteArraySize(new byte[] {0, 0, 1}, 2)).isEqualTo(new byte[] {0, 1});
+
+        // case 3 resize down assert proper significant bit
+        assertThatThrownBy(() -> fitBigEndianValueToByteArraySize(new byte[] {-1, -1, 2}, 1)).isInstanceOf(ArithmeticException.class);
+        assertThat(fitBigEndianValueToByteArraySize(new byte[] {-1, -1, 0}, 2)).isEqualTo(new byte[] {-1, 0});
+
+        // case 4 resize down assert proper significant bit
+        assertThatThrownBy(() -> fitBigEndianValueToByteArraySize(new byte[] {-1, -1, -34}, 0)).isInstanceOf(ArithmeticException.class);
+        assertThat(fitBigEndianValueToByteArraySize(new byte[] {-1, -1, -34}, 1)).isEqualTo(new byte[] {-34});
+        assertThat(fitBigEndianValueToByteArraySize(new byte[] {-1, -1, -1}, 2)).isEqualTo(new byte[] {-1, -1});
+    }
+}
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/compression/TestBufferedOutputStreamSliceOutput.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/compression/TestBufferedOutputStreamSliceOutput.java
index f8b20a6f76c0..da47ea0b1292 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/compression/TestBufferedOutputStreamSliceOutput.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/compression/TestBufferedOutputStreamSliceOutput.java
@@ -15,12 +15,12 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 
 import static io.airlift.testing.Assertions.assertLessThanOrEqual;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBufferedOutputStreamSliceOutput
 {
@@ -46,7 +46,7 @@ public void testWriteBytes()
         }
         // ignore the last flush size check
         output.flush();
-        assertEquals(byteOutputStream.toByteArray(), inputArray);
+        assertThat(byteOutputStream.toByteArray()).isEqualTo(inputArray);
         byteOutputStream.close();
 
         // check slice version
@@ -58,7 +58,7 @@ public void testWriteBytes()
         }
         // ignore the last flush size check
         output.flush();
-        assertEquals(byteOutputStream.toByteArray(), inputArray);
+        assertThat(byteOutputStream.toByteArray()).isEqualTo(inputArray);
         byteOutputStream.close();
     }
 
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/AbstractTestLineReaderWriter.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/AbstractTestLineReaderWriter.java
index f1e7b5de39da..c1fbd158bd7c 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/AbstractTestLineReaderWriter.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/AbstractTestLineReaderWriter.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.DiscreteDomain;
 import com.google.common.collect.Range;
 import io.trino.hadoop.HadoopNative;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Set;
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/TestFooterAwareLineReader.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/TestFooterAwareLineReader.java
index d6f6c917a005..0137f6b0f357 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/TestFooterAwareLineReader.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/TestFooterAwareLineReader.java
@@ -14,7 +14,7 @@
 package io.trino.hive.formats.line;
 
 import com.google.common.collect.ImmutableList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/TestLineBuffer.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/TestLineBuffer.java
index 9d2f1dd904e6..bab89518eeee 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/TestLineBuffer.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/TestLineBuffer.java
@@ -14,7 +14,7 @@
 package io.trino.hive.formats.line;
 
 import com.google.common.primitives.Bytes;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -24,8 +24,8 @@
 import static io.airlift.slice.SizeOf.sizeOf;
 import static java.lang.Math.min;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestLineBuffer
 {
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/csv/TestCsvFormat.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/csv/TestCsvFormat.java
index 36a1bc2d20c6..d0c469daef14 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/csv/TestCsvFormat.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/csv/TestCsvFormat.java
@@ -30,7 +30,7 @@
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.JobConf;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -57,6 +57,7 @@
 import static org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_COLUMN_TYPES;
 import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_LIB;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestCsvFormat
 {
@@ -129,13 +130,24 @@ public void testCsv()
         // For serialization the pipe character is escaped with a quote char, but for deserialization escape character is the backslash character
         assertTrinoHiveByteForByte(false, Arrays.asList("|", "a", "b"), Optional.empty(), Optional.of('|'), Optional.empty());
         assertTrinoHiveByteForByte(false, Arrays.asList("|", "a", "|"), Optional.empty(), Optional.of('|'), Optional.empty());
+
+        // Hive has strange special handling of the escape character. If the escape character is double quote (char 34)
+        // Hive will change the escape character to backslash (char 92).
+        assertLine("*a*|*b\\|b*|*c*", Arrays.asList("a", "b|b", "c"), Optional.of('|'), Optional.of('*'), Optional.of('"'));
+
+        // Hive does not allow the separator, quote, or escape characters to be the same, but this is checked after the escape character is changed
+        assertInvalidConfig(Optional.of('\\'), Optional.of('*'), Optional.of('"'));
+        assertInvalidConfig(Optional.of('*'), Optional.of('\\'), Optional.of('"'));
+
+        // Since the escape character is swapped, the quote or separator character can be the same as the original escape character
+        assertLine("\"a\"|\"b\\\"b\"|\"c\"", Arrays.asList("a", "b\"b", "c"), Optional.of('|'), Optional.of('"'), Optional.of('"'));
+        assertLine("*a*\"*b\\\"b*\"*c*", Arrays.asList("a", "b\"b", "c"), Optional.of('"'), Optional.of('*'), Optional.of('"'));
     }
 
     private static void assertLine(boolean shouldRoundTrip, String csvLine, List<String> expectedValues)
             throws Exception
     {
-        assertHiveLine(csvLine, expectedValues, Optional.empty(), Optional.empty(), Optional.empty());
-        assertTrinoLine(csvLine, expectedValues, Optional.empty(), Optional.empty(), Optional.empty());
+        assertLine(csvLine, expectedValues, Optional.empty(), Optional.empty(), Optional.empty());
         assertTrinoHiveByteForByte(shouldRoundTrip, expectedValues, Optional.empty(), Optional.empty(), Optional.empty());
 
         csvLine = rewriteSpecialChars(csvLine, '_', '|', '~');
@@ -143,8 +155,7 @@ private static void assertLine(boolean shouldRoundTrip, String csvLine, List<Str
                 .map(value -> value == null ? null : rewriteSpecialChars(value, '_', '|', '~'))
                 .collect(Collectors.toList());
 
-        assertHiveLine(csvLine, expectedValues, Optional.of('_'), Optional.of('|'), Optional.of('~'));
-        assertTrinoLine(csvLine, expectedValues, Optional.of('_'), Optional.of('|'), Optional.of('~'));
+        assertLine(csvLine, expectedValues, Optional.of('_'), Optional.of('|'), Optional.of('~'));
         // after switching the special characters the values will round trip
         assertTrinoHiveByteForByte(true, expectedValues, Optional.of('_'), Optional.of('|'), Optional.of('~'));
     }
@@ -222,6 +233,13 @@ private static List<Column> createReadColumns(int columnCount)
                 .toList();
     }
 
+    private static void assertLine(String csvLine, List<String> expectedValues, Optional<Character> separatorChar, Optional<Character> quoteChar, Optional<Character> escapeChar)
+            throws SerDeException, IOException
+    {
+        assertHiveLine(csvLine, expectedValues, separatorChar, quoteChar, escapeChar);
+        assertTrinoLine(csvLine, expectedValues, separatorChar, quoteChar, escapeChar);
+    }
+
     private static void assertHiveLine(String csvLine, List<String> expectedValues, Optional<Character> separatorChar, Optional<Character> quoteChar, Optional<Character> escapeChar)
             throws SerDeException
     {
@@ -246,6 +264,16 @@ private static String writeHiveLine(List<String> expectedValues, Optional<Charac
         return serializer.serialize(expectedValues, javaObjectInspector).toString();
     }
 
+    private static void assertInvalidConfig(Optional<Character> separatorChar, Optional<Character> quoteChar, Optional<Character> escapeChar)
+    {
+        assertThatThrownBy(() -> createHiveSerDe(3, separatorChar, quoteChar, escapeChar).deserialize(new Text("")))
+                .isInstanceOf(SerDeException.class)
+                .hasMessage("java.lang.UnsupportedOperationException: The separator, quote, and escape characters must be different!");
+        assertThatThrownBy(() -> new CsvDeserializerFactory().create(createReadColumns(3), createCsvProperties(separatorChar, quoteChar, escapeChar)))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageMatching("(Quote|Separator) character cannot be '\\\\' when escape character is '\"'");
+    }
+
     private static OpenCSVSerde createHiveSerDe(int columnCount, Optional<Character> separatorChar, Optional<Character> quoteChar, Optional<Character> escapeChar)
             throws SerDeException
     {
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/json/TestJsonFormat.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/json/TestJsonFormat.java
index de1bc923259f..947350f97b31 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/json/TestJsonFormat.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/json/TestJsonFormat.java
@@ -45,7 +45,7 @@
 import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.JobConf;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -96,8 +96,8 @@
 import static org.apache.hadoop.hive.serde.serdeConstants.LIST_COLUMN_TYPES;
 import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_LIB;
 import static org.apache.hadoop.hive.serde2.SerDeUtils.escapeString;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertTrue;
 
 public class TestJsonFormat
 {
@@ -1101,7 +1101,7 @@ private static void internalAssertValueFailsHive(Type type, String jsonValue, bo
 
     private static MapType toMapKeyType(Type type)
     {
-        assertTrue(isScalarType(type));
+        assertThat(isScalarType(type)).isTrue();
         return new MapType(type, BIGINT, TYPE_OPERATORS);
     }
 
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/openxjson/JsonReaderTest.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/openxjson/JsonReaderTest.java
deleted file mode 100644
index 548994e1695c..000000000000
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/openxjson/JsonReaderTest.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Licensed 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 io.trino.hive.formats.line.openxjson;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import io.starburst.openjson.JSONArray;
-import io.starburst.openjson.JSONException;
-import io.starburst.openjson.JSONObject;
-import io.starburst.openjson.JSONTokener;
-import org.testng.annotations.Test;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-public class JsonReaderTest
-{
-    @Test
-    public void testJsonNull()
-            throws InvalidJsonException
-    {
-        assertJsonValue("null", null);
-    }
-
-    @Test
-    public void testJsonPrimitive()
-            throws InvalidJsonException
-    {
-        // unquoted values
-        assertJsonValue("true", new JsonString("true", false));
-        assertJsonValue("false", new JsonString("false", false));
-        assertJsonValue("TRUE", new JsonString("TRUE", false));
-        assertJsonValue("FALSE", new JsonString("FALSE", false));
-        assertJsonValue("42", new JsonString("42", false));
-        assertJsonValue("1.23", new JsonString("1.23", false));
-        assertJsonValue("1.23e10", new JsonString("1.23e10", false));
-        assertJsonValue("1.23E10", new JsonString("1.23E10", false));
-        assertJsonValue("Infinity", new JsonString("Infinity", false));
-        assertJsonValue("NaN", new JsonString("NaN", false));
-        assertJsonValue("abc", new JsonString("abc", false));
-
-        // anything is allowed after the value ends, which requires a separator
-        assertJsonValue("true;anything", new JsonString("true", false));
-        assertJsonValue("false anything", new JsonString("false", false));
-
-        // Quoted string values
-        assertJsonValue("\"\"", new JsonString("", true));
-        assertJsonValue("\"abc\"", new JsonString("abc", true));
-
-        // escapes
-        assertJsonValue("\" \\\\ \\t \\b \\n \\r \\f \\a \\v \\u1234 \\uFFFD \\ufffd \"",
-                new JsonString(" \\ \t \b \n \r \f \007 \011 \u1234 \uFFFD \ufffd ", true));
-
-        // any other character is just passed through
-        assertJsonValue("\"\\X\"", new JsonString("X", true));
-        assertJsonValue("\"\\\"\"", new JsonString("\"", true));
-        assertJsonValue("\"\\'\"", new JsonString("'", true));
-
-        // unterminated escapes are an error
-        assertJsonFails("\"\\\"");
-        assertJsonFails("\"\\u1\"");
-        assertJsonFails("\"\\u12\"");
-        assertJsonFails("\"\\u123\"");
-
-        // unicode escape requires hex
-        assertJsonFails("\"\\u123X\"");
-
-        // unterminated string is an error
-        assertJsonFails("\"abc");
-        assertJsonFails("\"a\\tc");
-
-        // anything is allowed after the value
-        assertJsonValue("\"abc\"anything", new JsonString("abc", true));
-    }
-
-    @Test
-    public void testJsonObject()
-            throws InvalidJsonException
-    {
-        assertJsonValue("{}", ImmutableMap.of());
-        assertJsonValue("{ }", ImmutableMap.of());
-        assertJsonFails("{");
-        assertJsonFails("{{");
-
-        // anything is allowed after the object
-        assertJsonValue("{}anything allowed", ImmutableMap.of());
-
-        assertJsonValue("{ \"a\" : 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
-        assertJsonValue("{ \"a\" = 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
-        assertJsonValue("{ \"a\" => 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
-        assertJsonValue("{ a : 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
-        assertJsonValue("{ a = 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
-        assertJsonValue("{ a => 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
-        assertJsonFails("{ \"a\"");
-        assertJsonFails("{ a");
-        assertJsonFails("{ \"a\",");
-        assertJsonFails("{ \"a\";");
-        assertJsonFails("{ \"a\",2.34");
-        assertJsonFails("{ \"a\";2.34");
-        assertJsonFails("{ a x 2.34 }");
-        assertJsonFails("{ a ~ 2.34 }");
-        assertJsonFails("{ a -> 2.34 }");
-        // starburst allows for :> due to a bug, but the original code did not support this
-        assertJsonTrinoFails("{ a :> 2.34 }");
-        assertJsonHive("{ a :> 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
-
-        assertJsonValue("{ a : 2.34 , b : false}", ImmutableMap.of("a", new JsonString("2.34", false), "b", new JsonString("false", false)));
-        assertJsonValue("{ a : 2.34 ; b : false}", ImmutableMap.of("a", new JsonString("2.34", false), "b", new JsonString("false", false)));
-        assertJsonFails("{ a : 2.34 x b : false}");
-        assertJsonFails("{ a : 2.34 ^ b : false}");
-        assertJsonFails("{ a : 2.34 : b : false}");
-
-        assertJsonValue("{ a : NaN }", ImmutableMap.of("a", new JsonString("NaN", false)));
-        assertJsonValue("{ a : \"NaN\" }", ImmutableMap.of("a", new JsonString("NaN", true)));
-
-        // Starburst hive does not allow unquoted field names, but Trino and the original code does
-        assertJsonTrinoOnly("{ true : NaN }", ImmutableMap.of("true", new JsonString("NaN", false)));
-        assertJsonTrinoOnly("{ 123 : NaN }", ImmutableMap.of("123", new JsonString("NaN", false)));
-
-        // field name can not be null
-        assertJsonFails("{ null : \"NaN\" }");
-        // field name can not be structural
-        assertJsonFails("{ [] : \"NaN\" }");
-        assertJsonFails("{ {} : \"NaN\" }");
-
-        // map can contain c-style comments
-        assertJsonValue("/*foo*/{/*foo*/\"a\"/*foo*/:/*foo*/2.34/*foo*/}/*foo*/", ImmutableMap.of("a", new JsonString("2.34", false)));
-        // unterminated comment is an error
-        assertJsonFails("/*foo*/{/*foo*/\"a\"/*foo*/:/*foo");
-        // end of line comments are always an error since the value is unterminated
-        assertJsonFails("/*foo*/{/*foo*/\"a\"/*foo*/:#end-of-line");
-        assertJsonFails("/*foo*/{/*foo*/\"a\"/*foo*/://end-of-line");
-    }
-
-    @Test
-    public void testJsonArray()
-            throws InvalidJsonException
-    {
-        assertJsonValue("[]", ImmutableList.of());
-        assertJsonValue("[,]", Arrays.asList(null, null));
-        assertJsonFails("[");
-        assertJsonFails("[42");
-        assertJsonFails("[42,");
-
-        // anything is allowed after the array
-        assertJsonValue("[]anything allowed", ImmutableList.of());
-
-        assertJsonValue("[ 2.34 ]", singletonList(new JsonString("2.34", false)));
-        assertJsonValue("[ NaN ]", singletonList(new JsonString("NaN", false)));
-        assertJsonValue("[ \"NaN\" ]", singletonList(new JsonString("NaN", true)));
-
-        assertJsonValue("[ 2.34 , ]", Arrays.asList(new JsonString("2.34", false), null));
-        assertJsonValue("[ NaN , ]", Arrays.asList(new JsonString("NaN", false), null));
-        assertJsonValue("[ \"NaN\" , ]", Arrays.asList(new JsonString("NaN", true), null));
-
-        // map can contain c-style comments
-        assertJsonValue("/*foo*/[/*foo*/\"a\"/*foo*/,/*foo*/2.34/*foo*/]/*foo*/", ImmutableList.of(new JsonString("a", true), new JsonString("2.34", false)));
-        // unterminated comment is an error
-        assertJsonFails("/*foo*/[/*foo*/\"a\"/*foo*/,/*foo");
-        // end of line comments are always an error since the value is unterminated
-        assertJsonFails("/*foo*/[/*foo*/\"a\"/*foo*/,#end-of-line");
-        assertJsonFails("/*foo*/[/*foo*/\"a\"/*foo*/,//end-of-line");
-    }
-
-    private static void assertJsonValue(String json, Object expectedTrinoValue)
-            throws InvalidJsonException
-    {
-        assertJsonTrino(json, expectedTrinoValue);
-        assertJsonHive(json, expectedTrinoValue);
-    }
-
-    private static void assertJsonTrinoOnly(String json, Object expected)
-            throws InvalidJsonException
-    {
-        assertJsonTrino(json, expected);
-        assertJsonHiveFails(json);
-    }
-
-    private static void assertJsonTrino(String json, Object expected)
-            throws InvalidJsonException
-    {
-        assertThat(JsonReader.readJson(json, Function.identity()))
-                .isEqualTo(expected);
-    }
-
-    private static void assertJsonHive(String json, Object expectedTrinoValue)
-    {
-        Object actualHiveValue = unwrapHiveValue(new JSONTokener(false, json).nextValue());
-        Object expectedHiveValue = toHiveEquivalent(expectedTrinoValue);
-        assertThat(actualHiveValue).isEqualTo(expectedHiveValue);
-    }
-
-    private static void assertJsonFails(String json)
-    {
-        assertJsonTrinoFails(json);
-        assertJsonHiveFails(json);
-    }
-
-    private static void assertJsonTrinoFails(String json)
-    {
-        assertThatThrownBy(() -> JsonReader.readJson(json, Function.identity()))
-                .isInstanceOf(InvalidJsonException.class);
-    }
-
-    private static void assertJsonHiveFails(String json)
-    {
-        assertThatThrownBy(() -> new JSONTokener(false, json).nextValue())
-                .isInstanceOf(JSONException.class);
-    }
-
-    private static Object unwrapHiveValue(Object value)
-    {
-        if (value instanceof JSONObject jsonObject) {
-            LinkedHashMap<String, Object> unwrapped = new LinkedHashMap<>();
-            for (String key : jsonObject.keySet()) {
-                unwrapped.put(key, jsonObject.opt(key));
-            }
-            return unwrapped;
-        }
-        if (value instanceof JSONArray jsonArray) {
-            List<Object> unwrapped = new ArrayList<>();
-            for (int i = 0; i < jsonArray.length(); i++) {
-                unwrapped.add(jsonArray.opt(i));
-            }
-            return unwrapped;
-        }
-        if (value == JSONObject.NULL) {
-            return null;
-        }
-        return value;
-    }
-
-    private static Object toHiveEquivalent(Object value)
-    {
-        if (value == null) {
-            return null;
-        }
-        if (value instanceof Map<?, ?> map) {
-            return map.entrySet().stream()
-                    .collect(Collectors.toUnmodifiableMap(Entry::getKey, entry -> toHiveEquivalent(entry.getValue())));
-        }
-        if (value instanceof List<?> list) {
-            return list.stream()
-                    .map(JsonReaderTest::toHiveEquivalent)
-                    .collect(Collectors.toCollection(ArrayList::new));
-        }
-        if (value instanceof JsonString jsonString) {
-            if (jsonString.quoted()) {
-                return jsonString.value();
-            }
-
-            String string = jsonString.value();
-
-            if (string.equalsIgnoreCase("true")) {
-                return true;
-            }
-            if (string.equalsIgnoreCase("false")) {
-                return false;
-            }
-
-            try {
-                long longValue = Long.parseLong(string);
-                if (longValue <= Integer.MAX_VALUE && longValue >= Integer.MIN_VALUE) {
-                    return (int) longValue;
-                }
-                else {
-                    return longValue;
-                }
-            }
-            catch (NumberFormatException ignored) {
-            }
-
-            try {
-                BigDecimal asDecimal = new BigDecimal(string);
-                double asDouble = Double.parseDouble(string);
-                return asDecimal.compareTo(BigDecimal.valueOf(asDouble)) == 0 ? asDouble : asDecimal;
-            }
-            catch (NumberFormatException ignored) {
-            }
-
-            return string;
-        }
-        throw new IllegalArgumentException("Unsupported type: " + value.getClass().getSimpleName());
-    }
-}
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/openxjson/TestJsonReader.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/openxjson/TestJsonReader.java
new file mode 100644
index 000000000000..676f709b5a1d
--- /dev/null
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/openxjson/TestJsonReader.java
@@ -0,0 +1,307 @@
+/*
+ * Licensed 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 io.trino.hive.formats.line.openxjson;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.starburst.openjson.JSONArray;
+import io.starburst.openjson.JSONException;
+import io.starburst.openjson.JSONObject;
+import io.starburst.openjson.JSONTokener;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestJsonReader
+{
+    @Test
+    public void testJsonNull()
+            throws InvalidJsonException
+    {
+        assertJsonValue("null", null);
+    }
+
+    @Test
+    public void testJsonPrimitive()
+            throws InvalidJsonException
+    {
+        // unquoted values
+        assertJsonValue("true", new JsonString("true", false));
+        assertJsonValue("false", new JsonString("false", false));
+        assertJsonValue("TRUE", new JsonString("TRUE", false));
+        assertJsonValue("FALSE", new JsonString("FALSE", false));
+        assertJsonValue("42", new JsonString("42", false));
+        assertJsonValue("1.23", new JsonString("1.23", false));
+        assertJsonValue("1.23e10", new JsonString("1.23e10", false));
+        assertJsonValue("1.23E10", new JsonString("1.23E10", false));
+        assertJsonValue("Infinity", new JsonString("Infinity", false));
+        assertJsonValue("NaN", new JsonString("NaN", false));
+        assertJsonValue("abc", new JsonString("abc", false));
+
+        // anything is allowed after the value ends, which requires a separator
+        assertJsonValue("true;anything", new JsonString("true", false));
+        assertJsonValue("false anything", new JsonString("false", false));
+
+        // Quoted string values
+        assertJsonValue("\"\"", new JsonString("", true));
+        assertJsonValue("\"abc\"", new JsonString("abc", true));
+
+        // escapes
+        assertJsonValue("\" \\\\ \\t \\b \\n \\r \\f \\a \\v \\u1234 \\uFFFD \\ufffd \"",
+                new JsonString(" \\ \t \b \n \r \f \007 \011 \u1234 \uFFFD \ufffd ", true));
+
+        // any other character is just passed through
+        assertJsonValue("\"\\X\"", new JsonString("X", true));
+        assertJsonValue("\"\\\"\"", new JsonString("\"", true));
+        assertJsonValue("\"\\'\"", new JsonString("'", true));
+
+        // unterminated escapes are an error
+        assertJsonFails("\"\\\"");
+        assertJsonFails("\"\\u1\"");
+        assertJsonFails("\"\\u12\"");
+        assertJsonFails("\"\\u123\"");
+
+        // unicode escape requires hex
+        assertJsonFails("\"\\u123X\"");
+
+        // unterminated string is an error
+        assertJsonFails("\"abc");
+        assertJsonFails("\"a\\tc");
+
+        // anything is allowed after the value
+        assertJsonValue("\"abc\"anything", new JsonString("abc", true));
+    }
+
+    @Test
+    public void testJsonObject()
+            throws InvalidJsonException
+    {
+        assertJsonValue("{}", ImmutableMap.of());
+        assertJsonValue("{ }", ImmutableMap.of());
+        assertJsonFails("{");
+        assertJsonFails("{{");
+
+        // anything is allowed after the object
+        assertJsonValue("{}anything allowed", ImmutableMap.of());
+
+        assertJsonValue("{ \"a\" : 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
+        assertJsonValue("{ \"a\" = 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
+        assertJsonValue("{ \"a\" => 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
+        assertJsonValue("{ a : 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
+        assertJsonValue("{ a = 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
+        assertJsonValue("{ a => 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
+        assertJsonFails("{ \"a\"");
+        assertJsonFails("{ a");
+        assertJsonFails("{ \"a\",");
+        assertJsonFails("{ \"a\";");
+        assertJsonFails("{ \"a\",2.34");
+        assertJsonFails("{ \"a\";2.34");
+        assertJsonFails("{ a x 2.34 }");
+        assertJsonFails("{ a ~ 2.34 }");
+        assertJsonFails("{ a -> 2.34 }");
+        // starburst allows for :> due to a bug, but the original code did not support this
+        assertJsonTrinoFails("{ a :> 2.34 }");
+        assertJsonHive("{ a :> 2.34 }", ImmutableMap.of("a", new JsonString("2.34", false)));
+
+        assertJsonValue("{ a : 2.34 , b : false}", ImmutableMap.of("a", new JsonString("2.34", false), "b", new JsonString("false", false)));
+        assertJsonValue("{ a : 2.34 ; b : false}", ImmutableMap.of("a", new JsonString("2.34", false), "b", new JsonString("false", false)));
+        assertJsonFails("{ a : 2.34 x b : false}");
+        assertJsonFails("{ a : 2.34 ^ b : false}");
+        assertJsonFails("{ a : 2.34 : b : false}");
+
+        assertJsonValue("{ a : NaN }", ImmutableMap.of("a", new JsonString("NaN", false)));
+        assertJsonValue("{ a : \"NaN\" }", ImmutableMap.of("a", new JsonString("NaN", true)));
+
+        // Starburst hive does not allow unquoted field names, but Trino and the original code does
+        assertJsonTrinoOnly("{ true : NaN }", ImmutableMap.of("true", new JsonString("NaN", false)));
+        assertJsonTrinoOnly("{ 123 : NaN }", ImmutableMap.of("123", new JsonString("NaN", false)));
+
+        // field name can not be null
+        assertJsonFails("{ null : \"NaN\" }");
+        // field name can not be structural
+        assertJsonFails("{ [] : \"NaN\" }");
+        assertJsonFails("{ {} : \"NaN\" }");
+
+        // map can contain c-style comments
+        assertJsonValue("/*foo*/{/*foo*/\"a\"/*foo*/:/*foo*/2.34/*foo*/}/*foo*/", ImmutableMap.of("a", new JsonString("2.34", false)));
+        // unterminated comment is an error
+        assertJsonFails("/*foo*/{/*foo*/\"a\"/*foo*/:/*foo");
+        // end of line comments are always an error since the value is unterminated
+        assertJsonFails("/*foo*/{/*foo*/\"a\"/*foo*/:#end-of-line");
+        assertJsonFails("/*foo*/{/*foo*/\"a\"/*foo*/://end-of-line");
+    }
+
+    @Test
+    public void testJsonArray()
+            throws InvalidJsonException
+    {
+        assertJsonValue("[]", ImmutableList.of());
+        assertJsonValue("[,]", Arrays.asList(null, null));
+        assertJsonFails("[");
+        assertJsonFails("[42");
+        assertJsonFails("[42,");
+
+        // anything is allowed after the array
+        assertJsonValue("[]anything allowed", ImmutableList.of());
+
+        assertJsonValue("[ 2.34 ]", singletonList(new JsonString("2.34", false)));
+        assertJsonValue("[ NaN ]", singletonList(new JsonString("NaN", false)));
+        assertJsonValue("[ \"NaN\" ]", singletonList(new JsonString("NaN", true)));
+
+        assertJsonValue("[ 2.34 , ]", Arrays.asList(new JsonString("2.34", false), null));
+        assertJsonValue("[ NaN , ]", Arrays.asList(new JsonString("NaN", false), null));
+        assertJsonValue("[ \"NaN\" , ]", Arrays.asList(new JsonString("NaN", true), null));
+
+        // map can contain c-style comments
+        assertJsonValue("/*foo*/[/*foo*/\"a\"/*foo*/,/*foo*/2.34/*foo*/]/*foo*/", ImmutableList.of(new JsonString("a", true), new JsonString("2.34", false)));
+        // unterminated comment is an error
+        assertJsonFails("/*foo*/[/*foo*/\"a\"/*foo*/,/*foo");
+        // end of line comments are always an error since the value is unterminated
+        assertJsonFails("/*foo*/[/*foo*/\"a\"/*foo*/,#end-of-line");
+        assertJsonFails("/*foo*/[/*foo*/\"a\"/*foo*/,//end-of-line");
+    }
+
+    private static void assertJsonValue(String json, Object expectedTrinoValue)
+            throws InvalidJsonException
+    {
+        assertJsonTrino(json, expectedTrinoValue);
+        assertJsonHive(json, expectedTrinoValue);
+    }
+
+    private static void assertJsonTrinoOnly(String json, Object expected)
+            throws InvalidJsonException
+    {
+        assertJsonTrino(json, expected);
+        assertJsonHiveFails(json);
+    }
+
+    private static void assertJsonTrino(String json, Object expected)
+            throws InvalidJsonException
+    {
+        assertThat(JsonReader.readJson(json, Function.identity()))
+                .isEqualTo(expected);
+    }
+
+    private static void assertJsonHive(String json, Object expectedTrinoValue)
+    {
+        Object actualHiveValue = unwrapHiveValue(new JSONTokener(false, json).nextValue());
+        Object expectedHiveValue = toHiveEquivalent(expectedTrinoValue);
+        assertThat(actualHiveValue).isEqualTo(expectedHiveValue);
+    }
+
+    private static void assertJsonFails(String json)
+    {
+        assertJsonTrinoFails(json);
+        assertJsonHiveFails(json);
+    }
+
+    private static void assertJsonTrinoFails(String json)
+    {
+        assertThatThrownBy(() -> JsonReader.readJson(json, Function.identity()))
+                .isInstanceOf(InvalidJsonException.class);
+    }
+
+    private static void assertJsonHiveFails(String json)
+    {
+        assertThatThrownBy(() -> new JSONTokener(false, json).nextValue())
+                .isInstanceOf(JSONException.class);
+    }
+
+    private static Object unwrapHiveValue(Object value)
+    {
+        if (value instanceof JSONObject jsonObject) {
+            LinkedHashMap<String, Object> unwrapped = new LinkedHashMap<>();
+            for (String key : jsonObject.keySet()) {
+                unwrapped.put(key, jsonObject.opt(key));
+            }
+            return unwrapped;
+        }
+        if (value instanceof JSONArray jsonArray) {
+            List<Object> unwrapped = new ArrayList<>();
+            for (int i = 0; i < jsonArray.length(); i++) {
+                unwrapped.add(jsonArray.opt(i));
+            }
+            return unwrapped;
+        }
+        if (value == JSONObject.NULL) {
+            return null;
+        }
+        return value;
+    }
+
+    private static Object toHiveEquivalent(Object value)
+    {
+        if (value == null) {
+            return null;
+        }
+        if (value instanceof Map<?, ?> map) {
+            return map.entrySet().stream()
+                    .collect(Collectors.toUnmodifiableMap(Entry::getKey, entry -> toHiveEquivalent(entry.getValue())));
+        }
+        if (value instanceof List<?> list) {
+            return list.stream()
+                    .map(TestJsonReader::toHiveEquivalent)
+                    .collect(Collectors.toCollection(ArrayList::new));
+        }
+        if (value instanceof JsonString jsonString) {
+            if (jsonString.quoted()) {
+                return jsonString.value();
+            }
+
+            String string = jsonString.value();
+
+            if (string.equalsIgnoreCase("true")) {
+                return true;
+            }
+            if (string.equalsIgnoreCase("false")) {
+                return false;
+            }
+
+            try {
+                long longValue = Long.parseLong(string);
+                if (longValue <= Integer.MAX_VALUE && longValue >= Integer.MIN_VALUE) {
+                    return (int) longValue;
+                }
+                else {
+                    return longValue;
+                }
+            }
+            catch (NumberFormatException ignored) {
+            }
+
+            try {
+                BigDecimal asDecimal = new BigDecimal(string);
+                double asDouble = Double.parseDouble(string);
+                return asDecimal.compareTo(BigDecimal.valueOf(asDouble)) == 0 ? asDouble : asDecimal;
+            }
+            catch (NumberFormatException ignored) {
+            }
+
+            return string;
+        }
+        throw new IllegalArgumentException("Unsupported type: " + value.getClass().getSimpleName());
+    }
+}
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/openxjson/TestOpenxJsonFormat.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/openxjson/TestOpenxJsonFormat.java
index 200a67883f99..f7109e13de0a 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/openxjson/TestOpenxJsonFormat.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/openxjson/TestOpenxJsonFormat.java
@@ -52,8 +52,8 @@
 import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.JobConf;
+import org.junit.jupiter.api.Test;
 import org.openx.data.jsonserde.JsonSerDe;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -122,7 +122,6 @@
 import static org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.getStandardStructObjectInspector;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertTrue;
 
 public class TestOpenxJsonFormat
 {
@@ -498,7 +497,7 @@ private static void assertVarcharCanonicalization(Type type, String jsonValue, S
             hiveCanonicalValue = padSpaces(hiveCanonicalValue, charType);
         }
 
-        assertTrue(CharMatcher.whitespace().matchesNoneOf(jsonValue));
+        assertThat(CharMatcher.whitespace().matchesNoneOf(jsonValue)).isTrue();
 
         // quoted values are not canonicalized
         assertValue(type, "\"" + jsonValue + "\"", nonCanonicalValue);
@@ -1576,7 +1575,7 @@ private static void assertLineFailsHive(List<Column> columns, String jsonLine, O
 
     private static MapType toMapKeyType(Type type)
     {
-        assertTrue(isScalarType(type));
+        assertThat(isScalarType(type)).isTrue();
         return new MapType(type, BIGINT, TYPE_OPERATORS);
     }
 
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/regex/TestRegexFormat.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/regex/TestRegexFormat.java
index 2d64ada9f13e..f6006d0282f8 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/regex/TestRegexFormat.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/regex/TestRegexFormat.java
@@ -36,7 +36,7 @@
 import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.JobConf;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/sequence/TestSequenceFileReaderWriter.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/sequence/TestSequenceFileReaderWriter.java
index 852cc3b9e0e1..d4bf748d52db 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/sequence/TestSequenceFileReaderWriter.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/sequence/TestSequenceFileReaderWriter.java
@@ -31,7 +31,7 @@
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.JobConf;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -60,10 +60,7 @@
 import static org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.COMPRESS_CODEC;
 import static org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.COMPRESS_TYPE;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestSequenceFileReaderWriter
         extends AbstractTestLineReaderWriter
@@ -132,23 +129,23 @@ private static void assertNew(File inputFile, List<String> values, Map<String, S
     {
         LineBuffer lineBuffer = createLineBuffer(values);
         try (SequenceFileReader reader = createSequenceFileReader(inputFile)) {
-            assertEquals(reader.getFileLocation(), inputFile.getAbsolutePath());
+            assertThat(reader.getFileLocation().toString()).isEqualTo(inputFile.toURI().toString());
 
             assertSyncPoint(reader, inputFile);
-            assertEquals(reader.getKeyClassName(), BytesWritable.class.getName());
-            assertEquals(reader.getValueClassName(), Text.class.getName());
-            assertEquals(reader.getMetadata(), metadata);
+            assertThat(reader.getKeyClassName()).isEqualTo(BytesWritable.class.getName());
+            assertThat(reader.getValueClassName()).isEqualTo(Text.class.getName());
+            assertThat(reader.getMetadata()).isEqualTo(metadata);
 
             for (String expected : values) {
-                assertTrue(reader.readLine(lineBuffer));
+                assertThat(reader.readLine(lineBuffer)).isTrue();
                 String actual = new String(lineBuffer.getBuffer(), 0, lineBuffer.getLength(), UTF_8);
-                assertEquals(actual, expected);
+                assertThat(actual).isEqualTo(expected);
             }
-            assertFalse(reader.readLine(lineBuffer));
-            assertEquals(reader.getRowsRead(), values.size());
+            assertThat(reader.readLine(lineBuffer)).isFalse();
+            assertThat(reader.getRowsRead()).isEqualTo(values.size());
 
             assertThat(reader.getReadTimeNanos()).isGreaterThan(0);
-            assertEquals(inputFile.length(), reader.getBytesRead());
+            assertThat(inputFile.length()).isEqualTo(reader.getBytesRead());
         }
     }
 
@@ -158,7 +155,7 @@ private static void assertSyncPoint(SequenceFileReader reader, File file)
         List<Long> syncPositionsBruteForce = getSyncPositionsBruteForce(reader, file);
         List<Long> syncPositionsSimple = getSyncPositionsSimple(reader, file);
 
-        assertEquals(syncPositionsBruteForce, syncPositionsSimple);
+        assertThat(syncPositionsBruteForce).isEqualTo(syncPositionsSimple);
     }
 
     private static List<Long> getSyncPositionsBruteForce(SequenceFileReader reader, File file)
@@ -199,13 +196,13 @@ private static List<Long> getSyncPositionsSimple(SequenceFileReader recordReader
         while (syncPosition >= 0) {
             syncPosition = findFirstSyncPosition(inputFile, syncPosition, file.length() - syncPosition, syncFirst, syncSecond);
             if (syncPosition > 0) {
-                assertEquals(findFirstSyncPosition(inputFile, syncPosition, 1, syncFirst, syncSecond), syncPosition);
-                assertEquals(findFirstSyncPosition(inputFile, syncPosition, 2, syncFirst, syncSecond), syncPosition);
-                assertEquals(findFirstSyncPosition(inputFile, syncPosition, 10, syncFirst, syncSecond), syncPosition);
+                assertThat(findFirstSyncPosition(inputFile, syncPosition, 1, syncFirst, syncSecond)).isEqualTo(syncPosition);
+                assertThat(findFirstSyncPosition(inputFile, syncPosition, 2, syncFirst, syncSecond)).isEqualTo(syncPosition);
+                assertThat(findFirstSyncPosition(inputFile, syncPosition, 10, syncFirst, syncSecond)).isEqualTo(syncPosition);
 
-                assertEquals(findFirstSyncPosition(inputFile, syncPosition - 1, 1, syncFirst, syncSecond), -1);
-                assertEquals(findFirstSyncPosition(inputFile, syncPosition - 2, 2, syncFirst, syncSecond), -1);
-                assertEquals(findFirstSyncPosition(inputFile, syncPosition + 1, 1, syncFirst, syncSecond), -1);
+                assertThat(findFirstSyncPosition(inputFile, syncPosition - 1, 1, syncFirst, syncSecond)).isEqualTo(-1);
+                assertThat(findFirstSyncPosition(inputFile, syncPosition - 2, 2, syncFirst, syncSecond)).isEqualTo(-1);
+                assertThat(findFirstSyncPosition(inputFile, syncPosition + 1, 1, syncFirst, syncSecond)).isEqualTo(-1);
 
                 syncPositions.add(syncPosition);
                 syncPosition++;
@@ -244,35 +241,34 @@ private static void assertOld(File inputFile, List<String> values, Map<String, S
         JobConf jobConf = new JobConf(false);
         configureCompressionCodecs(jobConf);
         Path path = new Path(inputFile.toURI());
-        //noinspection deprecation
-        try (SequenceFile.Reader reader = new SequenceFile.Reader(path.getFileSystem(jobConf), path, jobConf)) {
-            assertEquals(reader.getKeyClassName(), BytesWritable.class.getName());
-            assertEquals(reader.getValueClassName(), Text.class.getName());
+        try (SequenceFile.Reader reader = new SequenceFile.Reader(jobConf, SequenceFile.Reader.file(path))) {
+            assertThat(reader.getKeyClassName()).isEqualTo(BytesWritable.class.getName());
+            assertThat(reader.getValueClassName()).isEqualTo(Text.class.getName());
 
             Map<String, String> actualMetadata = reader.getMetadata().getMetadata().entrySet().stream()
                     .collect(toImmutableMap(entry -> entry.getKey().toString(), entry -> entry.getValue().toString()));
-            assertEquals(actualMetadata, metadata);
+            assertThat(actualMetadata).isEqualTo(metadata);
 
             switch (reader.getCompressionType()) {
                 case NONE -> assertThat(compressionKind).isEmpty();
                 case RECORD -> {
                     assertThat(compressionKind).isPresent();
-                    assertFalse(blockCompressed);
+                    assertThat(blockCompressed).isFalse();
                 }
                 case BLOCK -> {
                     assertThat(compressionKind).isPresent();
-                    assertTrue(blockCompressed);
+                    assertThat(blockCompressed).isTrue();
                 }
             }
 
             BytesWritable key = new BytesWritable();
             Text text = new Text();
             for (String expected : values) {
-                assertTrue(reader.next(key, text));
-                assertEquals(text.toString(), expected);
+                assertThat(reader.next(key, text)).isTrue();
+                assertThat(text.toString()).isEqualTo(expected);
             }
 
-            assertFalse(reader.next(key, text));
+            assertThat(reader.next(key, text)).isFalse();
         }
     }
 
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/sequence/TestSequenceFileWriterFactory.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/sequence/TestSequenceFileWriterFactory.java
new file mode 100644
index 000000000000..ebde79117974
--- /dev/null
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/sequence/TestSequenceFileWriterFactory.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed 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 io.trino.hive.formats.line.sequence;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.memory.MemoryInputFile;
+import io.trino.hive.formats.line.LineBuffer;
+import io.trino.hive.formats.line.LineReader;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Optional;
+
+import static io.airlift.slice.Slices.utf8Slice;
+import static io.airlift.slice.Slices.wrappedBuffer;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestSequenceFileWriterFactory
+{
+    @Test
+    public void testHeaderFooterConstraints()
+            throws Exception
+    {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (SequenceFileWriter writer = new SequenceFileWriter(
+                out,
+                Optional.empty(),
+                false,
+                ImmutableMap.of())) {
+            writer.write(utf8Slice("header"));
+            for (int i = 0; i < 1000; i++) {
+                writer.write(utf8Slice("data " + i));
+            }
+        }
+        TrinoInputFile file = new MemoryInputFile(Location.of("memory:///test"), wrappedBuffer(out.toByteArray()));
+
+        SequenceFileReaderFactory readerFactory = new SequenceFileReaderFactory(1024, 8096);
+        assertThatThrownBy(() -> readerFactory.createLineReader(file, 1, 7, 2, 0))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageMatching("file cannot be split.* header.*");
+
+        assertThatThrownBy(() -> readerFactory.createLineReader(file, 1, 7, 0, 1))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageMatching("file cannot be split.* footer.*");
+
+        // single header allowed in split file
+        LineBuffer lineBuffer = new LineBuffer(1, 20);
+        LineReader lineReader = readerFactory.createLineReader(file, 0, 2, 1, 0);
+        int count = 0;
+        while (lineReader.readLine(lineBuffer)) {
+            assertThat(new String(lineBuffer.getBuffer(), 0, lineBuffer.getLength(), StandardCharsets.UTF_8)).isEqualTo("data " + count);
+            count++;
+        }
+        // The value here was obtained experimentally, but should be stable because the sequence file code is deterministic.
+        // The exact number of lines is not important, but it should be more than 1.
+        assertThat(count).isEqualTo(487);
+
+        lineReader = readerFactory.createLineReader(file, 2, file.length() - 2, 1, 0);
+        while (lineReader.readLine(lineBuffer)) {
+            assertThat(new String(lineBuffer.getBuffer(), 0, lineBuffer.getLength(), StandardCharsets.UTF_8)).isEqualTo("data " + count);
+            count++;
+        }
+        assertThat(count).isEqualTo(1000);
+    }
+}
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/simple/TestSimpleFormat.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/simple/TestSimpleFormat.java
index 40c9077e4245..df8f30eec918 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/simple/TestSimpleFormat.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/simple/TestSimpleFormat.java
@@ -48,7 +48,7 @@
 import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.JobConf;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -444,6 +444,9 @@ private static void testStringEscaping(Type type, char escape)
         assertString(type, "tab " + escape + "\t tab", "tab \t tab", options);
         assertString(type, "new " + escape + "\n line", "new \n line", options);
         assertString(type, "carriage " + escape + "\r return", "carriage \r return", options);
+        assertString(type, "escape " + escape + escape + " char", "escape " + escape + " char", options);
+        assertString(type, "double " + escape + escape + escape + escape + " escape", "double " + escape + escape + " escape", options);
+        assertString(type, "simple " + escape + "X char", "simple X char", options);
 
         String allControlCharacters = IntStream.range(0, 32)
                 .mapToObj(i -> i + " " + ((char) i))
@@ -1347,7 +1350,7 @@ private static Slice writeTrinoLine(List<Column> columns, List<Object> expectedV
         LineSerializer serializer = new SimpleSerializerFactory().create(columns, options.toSchema());
         SliceOutput sliceOutput = new DynamicSliceOutput(1024);
         serializer.write(page, 0, sliceOutput);
-        return Slices.copyOf(sliceOutput.slice());
+        return sliceOutput.slice().copy();
     }
 
     private static void assertValueHive(Type type, String value, Object expectedValue, TextEncodingOptions textEncodingOptions)
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/text/TestLineReader.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/text/TestLineReader.java
index 957e96596b8b..a1f37449b643 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/text/TestLineReader.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/text/TestLineReader.java
@@ -15,14 +15,18 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import io.trino.hive.formats.compression.CompressionKind;
 import io.trino.hive.formats.line.LineBuffer;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.zip.GZIPOutputStream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getLast;
@@ -103,7 +107,8 @@ private static void assertLines(List<String> lines)
                         TestData testData = createInputData(lines, delimiter, delimiterAtEndOfFile, bom);
                         LineBuffer lineBuffer = createLineBuffer(lines);
 
-                        assertLines(testData, lineBuffer, bufferSize);
+                        assertLines(testData, lineBuffer, bufferSize, false);
+                        assertLines(testData, lineBuffer, bufferSize, true);
                         assertSplitRead(testData, lineBuffer, bufferSize, bom);
                         assertSkipLines(testData, lineBuffer, bufferSize);
                     }
@@ -112,15 +117,31 @@ private static void assertLines(List<String> lines)
         }
     }
 
-    private static void assertLines(TestData testData, LineBuffer lineBuffer, int bufferSize)
+    private static void assertLines(TestData testData, LineBuffer lineBuffer, int bufferSize, boolean compressed)
             throws IOException
     {
-        TextLineReader lineReader = new TextLineReader(new ByteArrayInputStream(testData.inputData()), bufferSize);
+        byte[] inputData = testData.inputData();
+
+        TextLineReader lineReader;
+        if (compressed) {
+            ByteArrayOutputStream out = new ByteArrayOutputStream(inputData.length);
+            try (OutputStream compress = new GZIPOutputStream(out)) {
+                compress.write(inputData);
+            }
+            inputData = out.toByteArray();
+            lineReader = TextLineReader.createCompressedReader(new ByteArrayInputStream(inputData), bufferSize, CompressionKind.GZIP.createCodec());
+        }
+        else {
+            lineReader = TextLineReader.createUncompressedReader(new ByteArrayInputStream(inputData), bufferSize);
+        }
+
         assertThat(lineReader.getRetainedSize()).isEqualTo(LINE_READER_INSTANCE_SIZE + sizeOfByteArray(bufferSize));
         for (ExpectedLine expectedLine : testData.expectedLines()) {
             assertThat(lineReader.readLine(lineBuffer)).isTrue();
             assertThat(new String(lineBuffer.getBuffer(), 0, lineBuffer.getLength(), UTF_8)).isEqualTo(expectedLine.line());
-            assertThat(lineReader.getCurrentPosition()).isEqualTo(expectedLine.endExclusive());
+            if (!compressed) {
+                assertThat(lineReader.getCurrentPosition()).isEqualTo(expectedLine.endExclusive());
+            }
             assertThat(lineReader.getRetainedSize()).isEqualTo(LINE_READER_INSTANCE_SIZE + sizeOfByteArray(bufferSize));
         }
 
@@ -128,6 +149,7 @@ private static void assertLines(TestData testData, LineBuffer lineBuffer, int bu
         assertThat(lineBuffer.isEmpty()).isTrue();
         assertThat(lineReader.isClosed()).isTrue();
         assertThat(lineReader.getRetainedSize()).isEqualTo(LINE_READER_INSTANCE_SIZE + sizeOfByteArray(bufferSize));
+        assertThat(lineReader.getBytesRead()).isEqualTo(inputData.length);
     }
 
     private static void assertSplitRead(TestData testData, LineBuffer lineBuffer, int bufferSize, boolean bom)
@@ -161,7 +183,7 @@ private static void assertSplitRead(TestData testData, LineBuffer lineBuffer, in
         int lineIndex = 0;
 
         // read up to the first split
-        TextLineReader lineReader = new TextLineReader(new ByteArrayInputStream(testData.inputData()), bufferSize, 0, splitPosition);
+        TextLineReader lineReader = TextLineReader.createUncompressedReader(new ByteArrayInputStream(testData.inputData()), bufferSize, 0, splitPosition);
         assertThat(lineReader.getCurrentPosition()).isEqualTo(bom ? 3 : 0);
         while (lineReader.readLine(lineBuffer)) {
             ExpectedLine expectedLine = testData.expectedLines().get(lineIndex++);
@@ -172,7 +194,7 @@ private static void assertSplitRead(TestData testData, LineBuffer lineBuffer, in
         assertThat(lineBuffer.isEmpty()).isTrue();
         assertThat(lineReader.isClosed()).isTrue();
 
-        lineReader = new TextLineReader(new ByteArrayInputStream(testData.inputData()), bufferSize, splitPosition, testData.inputData().length - splitPosition);
+        lineReader = TextLineReader.createUncompressedReader(new ByteArrayInputStream(testData.inputData()), bufferSize, splitPosition, testData.inputData().length - splitPosition);
         assertThat(lineReader.getCurrentPosition()).isEqualTo(testData.expectedLines().get(lineIndex - 1).endExclusive());
         while (lineReader.readLine(lineBuffer)) {
             ExpectedLine expectedLine = testData.expectedLines().get(lineIndex++);
@@ -192,7 +214,7 @@ private static void assertSkipLines(TestData testData, LineBuffer lineBuffer, in
         for (int skipLines : SKIP_SIZES) {
             skipLines = min(skipLines, lines.size());
 
-            TextLineReader lineReader = new TextLineReader(new ByteArrayInputStream(testData.inputData()), bufferSize);
+            TextLineReader lineReader = TextLineReader.createUncompressedReader(new ByteArrayInputStream(testData.inputData()), bufferSize);
             assertThat(lineReader.getRetainedSize()).isEqualTo(LINE_READER_INSTANCE_SIZE + sizeOfByteArray(bufferSize));
             lineReader.skipLines(skipLines);
             for (String line : lines.subList(skipLines, lines.size())) {
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/text/TestTextLineReaderFactory.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/text/TestTextLineReaderFactory.java
new file mode 100644
index 000000000000..00fb27ffab1f
--- /dev/null
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/text/TestTextLineReaderFactory.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed 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 io.trino.hive.formats.line.text;
+
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.memory.MemoryInputFile;
+import io.trino.hive.formats.line.LineBuffer;
+import io.trino.hive.formats.line.LineReader;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+
+import static io.airlift.slice.Slices.utf8Slice;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestTextLineReaderFactory
+{
+    @Test
+    public void testHeaderFooterConstraints()
+            throws Exception
+    {
+        TextLineReaderFactory readerFactory = new TextLineReaderFactory(1024, 1024, 8096);
+        TrinoInputFile file = new MemoryInputFile(Location.of("memory:///test"), utf8Slice("header\ndata"));
+
+        assertThatThrownBy(() -> readerFactory.createLineReader(file, 1, 7, 2, 0))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageMatching("file cannot be split.* header.*");
+
+        assertThatThrownBy(() -> readerFactory.createLineReader(file, 1, 7, 0, 1))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageMatching("file cannot be split.* footer.*");
+
+        // single header allowed in split file
+        LineBuffer lineBuffer = new LineBuffer(1, 20);
+        LineReader lineReader = readerFactory.createLineReader(file, 0, 2, 1, 0);
+        assertThat(lineReader.readLine(lineBuffer)).isFalse();
+
+        lineReader = readerFactory.createLineReader(file, 2, file.length() - 2, 1, 0);
+        assertThat(lineReader.readLine(lineBuffer)).isTrue();
+        assertThat(new String(lineBuffer.getBuffer(), 0, lineBuffer.getLength(), StandardCharsets.UTF_8)).isEqualTo("data");
+    }
+}
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/text/TestTextLineReaderWriter.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/text/TestTextLineReaderWriter.java
index 8dcd22ba5fbc..78425713fbd2 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/text/TestTextLineReaderWriter.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/line/text/TestTextLineReaderWriter.java
@@ -48,9 +48,6 @@
 import static java.nio.file.Files.createTempDirectory;
 import static org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.COMPRESS_CODEC;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
 public class TestTextLineReaderWriter
         extends AbstractTestLineReaderWriter
@@ -83,13 +80,13 @@ private static void assertNew(TempFileWithExtension tempFile, List<String> value
         try (TextLineReader reader = createTextLineReader(tempFile, compressionKind)) {
             int linesRead = 0;
             for (String expected : values) {
-                assertTrue(reader.readLine(lineBuffer));
+                assertThat(reader.readLine(lineBuffer)).isTrue();
                 String actual = new String(lineBuffer.getBuffer(), 0, lineBuffer.getLength(), UTF_8);
-                assertEquals(actual, expected);
+                assertThat(actual).isEqualTo(expected);
                 linesRead++;
             }
-            assertFalse(reader.readLine(lineBuffer));
-            assertEquals(linesRead, values.size());
+            assertThat(reader.readLine(lineBuffer)).isFalse();
+            assertThat(linesRead).isEqualTo(values.size());
 
             assertThat(reader.getReadTimeNanos()).isGreaterThan(0);
             assertThat(reader.getBytesRead()).isGreaterThan(0);
@@ -103,7 +100,7 @@ private static TextLineReader createTextLineReader(TempFileWithExtension tempFil
         if (compressionKind.isPresent()) {
             inputStream = compressionKind.get().createCodec().createStreamDecompressor(inputStream);
         }
-        return new TextLineReader(inputStream, 1024);
+        return TextLineReader.createUncompressedReader(inputStream, 1024);
     }
 
     private static void writeNew(File outputFile, List<String> values, Optional<CompressionKind> compressionKind)
@@ -114,7 +111,7 @@ private static void writeNew(File outputFile, List<String> values, Optional<Comp
             for (String value : values) {
                 writer.write(Slices.utf8Slice(value));
             }
-            assertTrue(writer.getRetainedSizeInBytes() > 0);
+            assertThat(writer.getRetainedSizeInBytes() > 0).isTrue();
         }
     }
 
@@ -130,11 +127,11 @@ private static void assertOld(File inputFile, List<String> values)
             LongWritable key = new LongWritable();
             Text text = new Text();
             for (String expected : values) {
-                assertTrue(reader.next(key, text));
-                assertEquals(text.toString(), expected);
+                assertThat(reader.next(key, text)).isTrue();
+                assertThat(text.toString()).isEqualTo(expected);
             }
 
-            assertFalse(reader.next(key, text));
+            assertThat(reader.next(key, text)).isFalse();
         }
     }
 
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/AbstractTestRcFileReader.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/AbstractTestRcFileReader.java
index ff83c1792952..41476ba1a3ac 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/AbstractTestRcFileReader.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/AbstractTestRcFileReader.java
@@ -22,8 +22,9 @@
 import io.trino.spi.type.SqlDecimal;
 import io.trino.spi.type.SqlVarbinary;
 import org.joda.time.DateTimeZone;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -48,8 +49,10 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.nCopies;
 import static java.util.stream.Collectors.toList;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public abstract class AbstractTestRcFileReader
 {
     private static final DecimalType DECIMAL_TYPE_PRECISION_2 = DecimalType.createDecimalType(2, 1);
@@ -66,10 +69,10 @@ public AbstractTestRcFileReader(RcFileTester tester)
         this.tester = tester;
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
-        assertEquals(DateTimeZone.getDefault(), RcFileTester.HIVE_STORAGE_TIME_ZONE);
+        assertThat(DateTimeZone.getDefault()).isEqualTo(RcFileTester.HIVE_STORAGE_TIME_ZONE);
     }
 
     @Test
@@ -173,7 +176,7 @@ public void testTimestampSequence()
                 TIMESTAMP_MILLIS,
                 intsBetween(123_406_789, 123_456_789).stream()
                         .filter(i -> i % 19 == 0)
-                        .map(timestamp -> sqlTimestampOf(timestamp))
+                        .map(timestamp -> sqlTimestampOf(3, timestamp))
                         .collect(toList()));
     }
 
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/RcFileTester.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/RcFileTester.java
index 77c344397923..bc245d8e9572 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/RcFileTester.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/RcFileTester.java
@@ -110,10 +110,8 @@
 import static org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.getStandardStructObjectInspector;
 import static org.apache.hadoop.mapred.Reporter.NULL;
 import static org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.COMPRESS_CODEC;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @SuppressWarnings("StaticPseudoFunctionalStyleMethod")
 public class RcFileTester
@@ -367,7 +365,7 @@ private static void assertFileContentsNew(
     {
         try (RcFileReader recordReader = createRcFileReader(tempFile, type, format.getVectorEncoding())) {
             assertIndexOf(recordReader, tempFile.file());
-            assertEquals(recordReader.getMetadata(), ImmutableMap.builder()
+            assertThat(recordReader.getMetadata()).isEqualTo(ImmutableMap.builder()
                     .putAll(metadata)
                     .put("hive.io.rcfile.column.number", "1")
                     .buildOrThrow());
@@ -377,7 +375,7 @@ private static void assertFileContentsNew(
             for (int batchSize = recordReader.advance(); batchSize >= 0; batchSize = recordReader.advance()) {
                 totalCount += batchSize;
                 if (readLastBatchOnly && totalCount == expectedValues.size()) {
-                    assertEquals(advance(iterator, batchSize), batchSize);
+                    assertThat(advance(iterator, batchSize)).isEqualTo(batchSize);
                 }
                 else {
                     Block block = recordReader.readBlock(0);
@@ -388,7 +386,7 @@ private static void assertFileContentsNew(
                     }
 
                     for (int i = 0; i < batchSize; i++) {
-                        assertTrue(iterator.hasNext());
+                        assertThat(iterator.hasNext()).isTrue();
                         Object expected = iterator.next();
 
                         Object actual = data.get(i);
@@ -396,8 +394,8 @@ private static void assertFileContentsNew(
                     }
                 }
             }
-            assertFalse(iterator.hasNext());
-            assertEquals(recordReader.getRowsRead(), totalCount);
+            assertThat(iterator.hasNext()).isFalse();
+            assertThat(recordReader.getRowsRead()).isEqualTo(totalCount);
         }
     }
 
@@ -407,7 +405,7 @@ private static void assertIndexOf(RcFileReader recordReader, File file)
         List<Long> syncPositionsBruteForce = getSyncPositionsBruteForce(recordReader, file);
         List<Long> syncPositionsSimple = getSyncPositionsSimple(recordReader, file);
 
-        assertEquals(syncPositionsBruteForce, syncPositionsSimple);
+        assertThat(syncPositionsBruteForce).isEqualTo(syncPositionsSimple);
     }
 
     private static List<Long> getSyncPositionsBruteForce(RcFileReader recordReader, File file)
@@ -448,13 +446,13 @@ private static List<Long> getSyncPositionsSimple(RcFileReader recordReader, File
         while (syncPosition >= 0) {
             syncPosition = findFirstSyncPosition(inputFile, syncPosition, file.length() - syncPosition, syncFirst, syncSecond);
             if (syncPosition > 0) {
-                assertEquals(findFirstSyncPosition(inputFile, syncPosition, 1, syncFirst, syncSecond), syncPosition);
-                assertEquals(findFirstSyncPosition(inputFile, syncPosition, 2, syncFirst, syncSecond), syncPosition);
-                assertEquals(findFirstSyncPosition(inputFile, syncPosition, 10, syncFirst, syncSecond), syncPosition);
+                assertThat(findFirstSyncPosition(inputFile, syncPosition, 1, syncFirst, syncSecond)).isEqualTo(syncPosition);
+                assertThat(findFirstSyncPosition(inputFile, syncPosition, 2, syncFirst, syncSecond)).isEqualTo(syncPosition);
+                assertThat(findFirstSyncPosition(inputFile, syncPosition, 10, syncFirst, syncSecond)).isEqualTo(syncPosition);
 
-                assertEquals(findFirstSyncPosition(inputFile, syncPosition - 1, 1, syncFirst, syncSecond), -1);
-                assertEquals(findFirstSyncPosition(inputFile, syncPosition - 2, 2, syncFirst, syncSecond), -1);
-                assertEquals(findFirstSyncPosition(inputFile, syncPosition + 1, 1, syncFirst, syncSecond), -1);
+                assertThat(findFirstSyncPosition(inputFile, syncPosition - 1, 1, syncFirst, syncSecond)).isEqualTo(-1);
+                assertThat(findFirstSyncPosition(inputFile, syncPosition - 2, 2, syncFirst, syncSecond)).isEqualTo(-1);
+                assertThat(findFirstSyncPosition(inputFile, syncPosition + 1, 1, syncFirst, syncSecond)).isEqualTo(-1);
 
                 syncPositions.add(syncPosition);
                 syncPosition++;
@@ -474,7 +472,7 @@ private static RcFileReader createRcFileReader(TempFile tempFile, Type type, Col
                 0,
                 tempFile.file().length());
 
-        assertEquals(rcFileReader.getColumnCount(), 1);
+        assertThat(rcFileReader.getColumnCount()).isEqualTo(1);
 
         return rcFileReader;
     }
@@ -549,7 +547,7 @@ private static <K extends LongWritable, V extends BytesRefArrayWritable> void as
             actualValue = decodeRecordReaderValue(type, actualValue, format == Format.BINARY ? Optional.of(HIVE_STORAGE_TIME_ZONE) : Optional.empty());
             assertColumnValueEquals(type, actualValue, expectedValue);
         }
-        assertFalse(iterator.hasNext());
+        assertThat(iterator.hasNext()).isFalse();
     }
 
     private static void writeRcFileColumnOld(File outputFile, Format format, Optional<CompressionKind> compression, Type type, Iterator<?> values)
diff --git a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/TestRcFileReaderManual.java b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/TestRcFileReaderManual.java
index e363d81944d0..27b8ad29a6f6 100644
--- a/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/TestRcFileReaderManual.java
+++ b/lib/trino-hive-formats/src/test/java/io/trino/hive/formats/rcfile/TestRcFileReaderManual.java
@@ -18,11 +18,12 @@
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.memory.MemoryInputFile;
 import io.trino.hive.formats.encodings.binary.BinaryColumnEncodingFactory;
 import io.trino.spi.block.Block;
 import org.joda.time.DateTimeZone;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.List;
@@ -31,7 +32,7 @@
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static java.util.stream.Collectors.toList;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestRcFileReaderManual
 {
@@ -78,29 +79,29 @@ private static void assertFileSegments(Slice file, List<Segment> segments)
                 .map(Segment::getValues)
                 .flatMap(List::stream)
                 .collect(toList());
-        assertEquals(allValues, readValues(file, 0, file.length()));
+        assertThat(allValues).isEqualTo(readValues(file, 0, file.length()));
 
         for (Segment segment : segments) {
             // whole segment
-            assertEquals(segment.getValues(), readValues(file, segment.getOffset(), segment.getLength()));
+            assertThat(segment.getValues()).isEqualTo(readValues(file, segment.getOffset(), segment.getLength()));
             // first byte of segment
-            assertEquals(segment.getValues(), readValues(file, segment.getOffset(), 1));
+            assertThat(segment.getValues()).isEqualTo(readValues(file, segment.getOffset(), 1));
             // straddle segment start
-            assertEquals(segment.getValues(), readValues(file, segment.getOffset() - 1, 2));
+            assertThat(segment.getValues()).isEqualTo(readValues(file, segment.getOffset() - 1, 2));
 
             // regions entirely within the segment
-            assertEquals(ImmutableList.of(), readValues(file, segment.getOffset() + 1, 1));
-            assertEquals(ImmutableList.of(), readValues(file, segment.getOffset() + 1, segment.getLength() - 1));
+            assertThat(ImmutableList.of()).isEqualTo(readValues(file, segment.getOffset() + 1, 1));
+            assertThat(ImmutableList.of()).isEqualTo(readValues(file, segment.getOffset() + 1, segment.getLength() - 1));
 
             for (int rowGroupOffset : segment.getRowGroupSegmentOffsets()) {
                 // segment header to row group start
-                assertEquals(segment.getValues(), readValues(file, segment.getOffset(), rowGroupOffset));
-                assertEquals(segment.getValues(), readValues(file, segment.getOffset(), rowGroupOffset - 1));
-                assertEquals(segment.getValues(), readValues(file, segment.getOffset(), rowGroupOffset + 1));
+                assertThat(segment.getValues()).isEqualTo(readValues(file, segment.getOffset(), rowGroupOffset));
+                assertThat(segment.getValues()).isEqualTo(readValues(file, segment.getOffset(), rowGroupOffset - 1));
+                assertThat(segment.getValues()).isEqualTo(readValues(file, segment.getOffset(), rowGroupOffset + 1));
 
                 // region from grow group start until end of file (row group offset is always inside of the segment since a
                 // segment starts with a file header or sync sequence)
-                assertEquals(ImmutableList.of(), readValues(file, segment.getOffset() + rowGroupOffset, segment.getLength() - rowGroupOffset));
+                assertThat(ImmutableList.of()).isEqualTo(readValues(file, segment.getOffset() + rowGroupOffset, segment.getLength() - rowGroupOffset));
             }
         }
 
@@ -115,10 +116,10 @@ private static void assertFileSegments(Slice file, List<Segment> segments)
                         .flatMap(List::stream)
                         .collect(toList());
 
-                assertEquals(segmentsValues, readValues(file, startSegment.getOffset(), endSegment.getOffset() + endSegment.getLength() - startSegment.getOffset()));
-                assertEquals(segmentsValues, readValues(file, startSegment.getOffset(), endSegment.getOffset() + 1 - startSegment.getOffset()));
-                assertEquals(segmentsValues, readValues(file, startSegment.getOffset() - 1, endSegment.getOffset() + 1 + endSegment.getLength() - startSegment.getOffset()));
-                assertEquals(segmentsValues, readValues(file, startSegment.getOffset() - 1, endSegment.getOffset() + 1 + 1 - startSegment.getOffset()));
+                assertThat(segmentsValues).isEqualTo(readValues(file, startSegment.getOffset(), endSegment.getOffset() + endSegment.getLength() - startSegment.getOffset()));
+                assertThat(segmentsValues).isEqualTo(readValues(file, startSegment.getOffset(), endSegment.getOffset() + 1 - startSegment.getOffset()));
+                assertThat(segmentsValues).isEqualTo(readValues(file, startSegment.getOffset() - 1, endSegment.getOffset() + 1 + endSegment.getLength() - startSegment.getOffset()));
+                assertThat(segmentsValues).isEqualTo(readValues(file, startSegment.getOffset() - 1, endSegment.getOffset() + 1 + 1 - startSegment.getOffset()));
             }
         }
     }
@@ -235,7 +236,7 @@ private static List<Integer> readValues(Slice data, int offset, int length)
         }
 
         RcFileReader reader = new RcFileReader(
-                new MemoryInputFile("test", data),
+                new MemoryInputFile(Location.of("memory:///test"), data),
                 new BinaryColumnEncodingFactory(DateTimeZone.UTC),
                 ImmutableMap.of(0, SMALLINT),
                 offset,
@@ -245,7 +246,7 @@ private static List<Integer> readValues(Slice data, int offset, int length)
         while (reader.advance() >= 0) {
             Block block = reader.readBlock(0);
             for (int position = 0; position < block.getPositionCount(); position++) {
-                values.add((int) SMALLINT.getLong(block, position));
+                values.add((int) SMALLINT.getShort(block, position));
             }
         }
 
diff --git a/lib/trino-ignite-patched/pom.xml b/lib/trino-ignite-patched/pom.xml
new file mode 100644
index 000000000000..499c9615acd1
--- /dev/null
+++ b/lib/trino-ignite-patched/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- TODO Remove whole module when Ignite is released -->
+<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>io.trino</groupId>
+        <artifactId>trino-root</artifactId>
+        <version>432-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>trino-ignite-patched</artifactId>
+    <description>Trino - patched Ignite client to work with JDK21</description>
+
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>2.15.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <createSourcesJar>false</createSourcesJar>
+                            <shadeSourcesContent>false</shadeSourcesContent>
+                            <promoteTransitiveDependencies>false</promoteTransitiveDependencies>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.apache.ignite.shaded</pattern>
+                                    <shadedPattern>org.apache.ignite</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <filters>
+                                <filter>
+                                    <artifact>org.apache.ignite:ignite-core</artifact>
+                                    <excludes>
+                                        <exclude>org/apache/ignite/internal/util/GridUnsafe.class</exclude>
+                                        <exclude>org/apache/ignite/internal/util/GridUnsafe$*.class</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.basepom.maven</groupId>
+                <artifactId>duplicate-finder-maven-plugin</artifactId>
+                <configuration>
+                    <ignoredDependencies>
+                        <dependency>
+                            <groupId>org.apache.ignite</groupId>
+                            <artifactId>ignite-core</artifactId>
+                        </dependency>
+                    </ignoredDependencies>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <configuration>
+                    <rules>
+                        <RestrictImports>
+                            <skip>true</skip>
+                        </RestrictImports>
+                    </rules>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/lib/trino-ignite-patched/src/main/java/org/apache/ignite/shaded/internal/util/GridUnsafe.java b/lib/trino-ignite-patched/src/main/java/org/apache/ignite/shaded/internal/util/GridUnsafe.java
new file mode 100644
index 000000000000..e50109eefb01
--- /dev/null
+++ b/lib/trino-ignite-patched/src/main/java/org/apache/ignite/shaded/internal/util/GridUnsafe.java
@@ -0,0 +1,2284 @@
+/*
+ * Licensed 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.ignite.shaded.internal.util;
+
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.util.DirectBufferCleaner;
+import org.apache.ignite.internal.util.FeatureChecker;
+import org.apache.ignite.internal.util.ReflectiveDirectBufferCleaner;
+import org.apache.ignite.internal.util.UnsafeDirectBufferCleaner;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import sun.misc.Unsafe;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+import static com.google.common.base.Preconditions.checkState;
+import static org.apache.ignite.internal.util.IgniteUtils.jdkVersion;
+import static org.apache.ignite.internal.util.IgniteUtils.majorJavaVersion;
+
+/**
+ * <p>Wrapper for {@link sun.misc.Unsafe} class.</p>
+ *
+ * <p>
+ * The following statements for memory access operations  are true:
+ * <ul>
+ * <li>All {@code putXxx(long addr, xxx val)}, {@code getXxx(long addr)}, {@code putXxx(byte[] arr, long off, xxx val)},
+ * {@code getXxx(byte[] arr, long off)} and corresponding methods with {@code LE} suffix are alignment aware
+ * and can be safely used with unaligned pointers.</li>
+ * <li>All {@code putXxxField(Object obj, long fieldOff, xxx val)} and {@code getXxxField(Object obj, long fieldOff)}
+ * methods are not alignment aware and can't be safely used with unaligned pointers. This methods can be safely used
+ * for object field values access because all object fields addresses are aligned.</li>
+ * <li>All {@code putXxxLE(...)} and {@code getXxxLE(...)} methods assumes that byte order is fixed as little-endian
+ * while native byte order is big-endian. So it is client code responsibility to check native byte order before
+ * invoking of this methods.</li>
+ * </ul>
+ * </p>
+ *
+ * TODO Remove after new version of Ignite is released. Copied from https://github.com/apache/ignite/commit/d837b749962583d30db8ad1ecc512d98887f3895 and formatted.
+ * Applied https://github.com/apache/ignite/commit/fc51f0e43275953ab6a77c7f4d10ba32d1a640b6 from https://github.com/apache/ignite/pull/10764
+ */
+public abstract class GridUnsafe
+{
+    /**
+     *
+     */
+    public static final ByteOrder NATIVE_BYTE_ORDER = ByteOrder.nativeOrder();
+
+    /**
+     * Unsafe.
+     */
+    private static final Unsafe UNSAFE = unsafe();
+
+    /**
+     * Page size.
+     */
+    private static final int PAGE_SIZE = UNSAFE.pageSize();
+
+    /**
+     * Empty page.
+     */
+    private static final byte[] EMPTY_PAGE = new byte[PAGE_SIZE];
+
+    /**
+     * Unaligned flag.
+     */
+    private static final boolean UNALIGNED = unaligned();
+
+    /**
+     * @see IgniteSystemProperties#IGNITE_MEMORY_PER_BYTE_COPY_THRESHOLD
+     */
+    public static final long DFLT_MEMORY_PER_BYTE_COPY_THRESHOLD = 0L;
+
+    /**
+     * Per-byte copy threshold.
+     */
+    private static final long PER_BYTE_THRESHOLD = IgniteSystemProperties.getLong(
+            IgniteSystemProperties.IGNITE_MEMORY_PER_BYTE_COPY_THRESHOLD, DFLT_MEMORY_PER_BYTE_COPY_THRESHOLD);
+
+    /**
+     * Big endian.
+     */
+    public static final boolean BIG_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
+
+    /**
+     * Address size.
+     */
+    public static final int ADDR_SIZE = UNSAFE.addressSize();
+
+    /**
+     *
+     */
+    public static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
+
+    /**
+     *
+     */
+    public static final int BYTE_ARR_INT_OFF = UNSAFE.arrayBaseOffset(byte[].class);
+
+    /**
+     *
+     */
+    public static final long SHORT_ARR_OFF = UNSAFE.arrayBaseOffset(short[].class);
+
+    /**
+     *
+     */
+    public static final long INT_ARR_OFF = UNSAFE.arrayBaseOffset(int[].class);
+
+    /**
+     *
+     */
+    public static final long LONG_ARR_OFF = UNSAFE.arrayBaseOffset(long[].class);
+
+    /**
+     *
+     */
+    public static final long FLOAT_ARR_OFF = UNSAFE.arrayBaseOffset(float[].class);
+
+    /**
+     *
+     */
+    public static final long DOUBLE_ARR_OFF = UNSAFE.arrayBaseOffset(double[].class);
+
+    /**
+     *
+     */
+    public static final long CHAR_ARR_OFF = UNSAFE.arrayBaseOffset(char[].class);
+
+    /**
+     *
+     */
+    public static final long BOOLEAN_ARR_OFF = UNSAFE.arrayBaseOffset(boolean[].class);
+
+    /**
+     * {@link java.nio.Buffer#address} field offset.
+     */
+    private static final long DIRECT_BUF_ADDR_OFF = bufferAddressOffset();
+
+    /**
+     * Whether to use newDirectByteBuffer(long, long) constructor
+     */
+    private static final boolean IS_DIRECT_BUF_LONG_CAP = majorJavaVersion(jdkVersion()) >= 21;
+
+    /**
+     * Cleaner code for direct {@code java.nio.ByteBuffer}.
+     */
+    private static final DirectBufferCleaner DIRECT_BUF_CLEANER =
+            majorJavaVersion(jdkVersion()) < 9
+                    ? new ReflectiveDirectBufferCleaner()
+                    : new UnsafeDirectBufferCleaner();
+
+    /**
+     * JavaNioAccess object. If {@code null} then {@link #NEW_DIRECT_BUF_CONSTRUCTOR} should be available.
+     */
+    @Nullable private static final Object JAVA_NIO_ACCESS_OBJ;
+
+    /**
+     * JavaNioAccess#newDirectByteBuffer method. Ususally {@code null} if {@link #JAVA_NIO_ACCESS_OBJ} is {@code null}.
+     * If {@code null} then {@link #NEW_DIRECT_BUF_CONSTRUCTOR} should be available.
+     */
+    @Nullable private static final Method NEW_DIRECT_BUF_MTD;
+
+    /**
+     * New direct buffer class constructor obtained and tested using reflection. If {@code null} then both {@link
+     * #JAVA_NIO_ACCESS_OBJ} and {@link #NEW_DIRECT_BUF_MTD} should be not {@code null}.
+     */
+    @Nullable private static final Constructor<?> NEW_DIRECT_BUF_CONSTRUCTOR;
+
+    static {
+        Object nioAccessObj = null;
+        Method directBufMtd = null;
+
+        Constructor<?> directBufCtor = null;
+
+        if (majorJavaVersion(jdkVersion()) < 12) {
+            // for old java prefer Java NIO & Shared Secrets obect init way
+            try {
+                nioAccessObj = javaNioAccessObject();
+                directBufMtd = newDirectBufferMethod(nioAccessObj);
+            }
+            catch (Exception e) {
+                nioAccessObj = null;
+                directBufMtd = null;
+
+                try {
+                    directBufCtor = createAndTestNewDirectBufferCtor();
+                }
+                catch (Exception eFallback) {
+                    eFallback.printStackTrace();
+
+                    e.addSuppressed(eFallback);
+
+                    throw e; // fallback was not suceefull
+                }
+
+                if (directBufCtor == null) {
+                    throw e;
+                }
+            }
+        }
+        else {
+            try {
+                directBufCtor = createAndTestNewDirectBufferCtor();
+            }
+            catch (Exception e) {
+                try {
+                    nioAccessObj = javaNioAccessObject();
+                    directBufMtd = newDirectBufferMethod(nioAccessObj);
+                }
+                catch (Exception eFallback) {
+                    eFallback.printStackTrace();
+
+                    e.addSuppressed(eFallback);
+
+                    throw e; //fallback to shared secrets failed.
+                }
+
+                if (nioAccessObj == null || directBufMtd == null) {
+                    throw e;
+                }
+            }
+        }
+
+        JAVA_NIO_ACCESS_OBJ = nioAccessObj;
+        NEW_DIRECT_BUF_MTD = directBufMtd;
+
+        NEW_DIRECT_BUF_CONSTRUCTOR = directBufCtor;
+    }
+
+    /**
+     * Ensure singleton.
+     */
+    private GridUnsafe()
+    {
+        // No-op.
+    }
+
+    /**
+     * Wraps pointer to unmanaged memory into direct byte buffer.
+     *
+     * @param ptr Pointer to wrap.
+     * @param len Memory location length.
+     * @return Byte buffer wrapping the given memory.
+     */
+    public static ByteBuffer wrapPointer(long ptr, int len)
+    {
+        if (NEW_DIRECT_BUF_MTD != null && JAVA_NIO_ACCESS_OBJ != null) {
+            return wrapPointerJavaNio(ptr, len, NEW_DIRECT_BUF_MTD, JAVA_NIO_ACCESS_OBJ);
+        }
+        else if (NEW_DIRECT_BUF_CONSTRUCTOR != null) {
+            return wrapPointerDirectBufCtor(ptr, len, NEW_DIRECT_BUF_CONSTRUCTOR);
+        }
+        else {
+            throw new RuntimeException(
+                    "All alternative for a new DirectByteBuffer() creation failed: " + FeatureChecker.JAVA_VER_SPECIFIC_WARN);
+        }
+    }
+
+    /**
+     * Wraps pointer to unmanaged memory into direct byte buffer. Uses constructor of a direct byte buffer.
+     *
+     * @param ptr Pointer to wrap.
+     * @param len Memory location length.
+     * @param constructor Constructor to use. Should create an instance of a direct ByteBuffer.
+     * @return Byte buffer wrapping the given memory.
+     */
+    @NotNull
+    private static ByteBuffer wrapPointerDirectBufCtor(long ptr, int len, Constructor<?> constructor)
+    {
+        try {
+            Object newDirectBuf = constructor.newInstance(ptr, len);
+
+            return ((ByteBuffer) newDirectBuf).order(NATIVE_BYTE_ORDER);
+        }
+        catch (ReflectiveOperationException e) {
+            throw new RuntimeException("DirectByteBuffer#constructor is unavailable."
+                    + FeatureChecker.JAVA_VER_SPECIFIC_WARN, e);
+        }
+    }
+
+    /**
+     * Wraps pointer to unmanaged memory into direct byte buffer. Uses JavaNioAccess object.
+     *
+     * @param ptr Pointer to wrap.
+     * @param len Memory location length.
+     * @param newDirectBufMtd Method which should return an instance of a direct byte buffer.
+     * @param javaNioAccessObj Object to invoke method.
+     * @return Byte buffer wrapping the given memory.
+     */
+    @NotNull
+    private static ByteBuffer wrapPointerJavaNio(long ptr,
+            int len,
+            @NotNull Method newDirectBufMtd,
+            @NotNull Object javaNioAccessObj)
+    {
+        try {
+            ByteBuffer buf = (ByteBuffer) newDirectBufMtd.invoke(javaNioAccessObj, ptr, len, null);
+
+            checkState(buf.isDirect(), "buf.isDirect() is false");
+
+            buf.order(NATIVE_BYTE_ORDER);
+
+            return buf;
+        }
+        catch (ReflectiveOperationException e) {
+            throw new RuntimeException("JavaNioAccess#newDirectByteBuffer() method is unavailable."
+                    + FeatureChecker.JAVA_VER_SPECIFIC_WARN, e);
+        }
+    }
+
+    /**
+     * @param len Length.
+     * @return Allocated direct buffer.
+     */
+    public static ByteBuffer allocateBuffer(int len)
+    {
+        long ptr = allocateMemory(len);
+
+        return wrapPointer(ptr, len);
+    }
+
+    /**
+     * @param buf Direct buffer allocated by {@link #allocateBuffer(int)}.
+     */
+    public static void freeBuffer(ByteBuffer buf)
+    {
+        long ptr = bufferAddress(buf);
+
+        freeMemory(ptr);
+    }
+
+    /**
+     * @param buf Buffer.
+     * @param len New length.
+     * @return Reallocated direct buffer.
+     */
+    public static ByteBuffer reallocateBuffer(ByteBuffer buf, int len)
+    {
+        long ptr = bufferAddress(buf);
+
+        long newPtr = reallocateMemory(ptr, len);
+
+        return wrapPointer(newPtr, len);
+    }
+
+    /**
+     * Gets boolean value from object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @return Boolean value from object field.
+     */
+    public static boolean getBooleanField(Object obj, long fieldOff)
+    {
+        return UNSAFE.getBoolean(obj, fieldOff);
+    }
+
+    /**
+     * Stores boolean value into object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @param val Value.
+     */
+    public static void putBooleanField(Object obj, long fieldOff, boolean val)
+    {
+        UNSAFE.putBoolean(obj, fieldOff, val);
+    }
+
+    /**
+     * Gets byte value from object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @return Byte value from object field.
+     */
+    public static byte getByteField(Object obj, long fieldOff)
+    {
+        return UNSAFE.getByte(obj, fieldOff);
+    }
+
+    /**
+     * Stores byte value into object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @param val Value.
+     */
+    public static void putByteField(Object obj, long fieldOff, byte val)
+    {
+        UNSAFE.putByte(obj, fieldOff, val);
+    }
+
+    /**
+     * Gets short value from object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @return Short value from object field.
+     */
+    public static short getShortField(Object obj, long fieldOff)
+    {
+        return UNSAFE.getShort(obj, fieldOff);
+    }
+
+    /**
+     * Stores short value into object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @param val Value.
+     */
+    public static void putShortField(Object obj, long fieldOff, short val)
+    {
+        UNSAFE.putShort(obj, fieldOff, val);
+    }
+
+    /**
+     * Gets char value from object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @return Char value from object field.
+     */
+    public static char getCharField(Object obj, long fieldOff)
+    {
+        return UNSAFE.getChar(obj, fieldOff);
+    }
+
+    /**
+     * Stores char value into object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @param val Value.
+     */
+    public static void putCharField(Object obj, long fieldOff, char val)
+    {
+        UNSAFE.putChar(obj, fieldOff, val);
+    }
+
+    /**
+     * Gets integer value from object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @return Integer value from object field.
+     */
+    public static int getIntField(Object obj, long fieldOff)
+    {
+        return UNSAFE.getInt(obj, fieldOff);
+    }
+
+    /**
+     * Stores integer value into object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @param val Value.
+     */
+    public static void putIntField(Object obj, long fieldOff, int val)
+    {
+        UNSAFE.putInt(obj, fieldOff, val);
+    }
+
+    /**
+     * Gets long value from object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @return Long value from object field.
+     */
+    public static long getLongField(Object obj, long fieldOff)
+    {
+        return UNSAFE.getLong(obj, fieldOff);
+    }
+
+    /**
+     * Stores long value into object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @param val Value.
+     */
+    public static void putLongField(Object obj, long fieldOff, long val)
+    {
+        UNSAFE.putLong(obj, fieldOff, val);
+    }
+
+    /**
+     * Gets float value from object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @return Float value from object field.
+     */
+    public static float getFloatField(Object obj, long fieldOff)
+    {
+        return UNSAFE.getFloat(obj, fieldOff);
+    }
+
+    /**
+     * Stores float value into object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @param val Value.
+     */
+    public static void putFloatField(Object obj, long fieldOff, float val)
+    {
+        UNSAFE.putFloat(obj, fieldOff, val);
+    }
+
+    /**
+     * Gets double value from object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @return Double value from object field.
+     */
+    public static double getDoubleField(Object obj, long fieldOff)
+    {
+        return UNSAFE.getDouble(obj, fieldOff);
+    }
+
+    /**
+     * Stores double value into object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @param val Value.
+     */
+    public static void putDoubleField(Object obj, long fieldOff, double val)
+    {
+        UNSAFE.putDouble(obj, fieldOff, val);
+    }
+
+    /**
+     * Gets reference from object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @return Reference from object field.
+     */
+    public static Object getObjectField(Object obj, long fieldOff)
+    {
+        return UNSAFE.getObject(obj, fieldOff);
+    }
+
+    /**
+     * Stores reference value into object field.
+     *
+     * @param obj Object.
+     * @param fieldOff Field offset.
+     * @param val Value.
+     */
+    public static void putObjectField(Object obj, long fieldOff, Object val)
+    {
+        UNSAFE.putObject(obj, fieldOff, val);
+    }
+
+    /**
+     * Gets boolean value from byte array.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @return Boolean value from byte array.
+     */
+    public static boolean getBoolean(byte[] arr, long off)
+    {
+        return UNSAFE.getBoolean(arr, off);
+    }
+
+    /**
+     * Stores boolean value into byte array.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putBoolean(byte[] arr, long off, boolean val)
+    {
+        UNSAFE.putBoolean(arr, off, val);
+    }
+
+    /**
+     * Gets byte value from byte array.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @return Byte value from byte array.
+     */
+    public static byte getByte(byte[] arr, long off)
+    {
+        return UNSAFE.getByte(arr, off);
+    }
+
+    /**
+     * Stores byte value into byte array.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putByte(byte[] arr, long off, byte val)
+    {
+        UNSAFE.putByte(arr, off, val);
+    }
+
+    /**
+     * Gets short value from byte array. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @return Short value from byte array.
+     */
+    public static short getShort(byte[] arr, long off)
+    {
+        return UNALIGNED ? UNSAFE.getShort(arr, off) : getShortByByte(arr, off, BIG_ENDIAN);
+    }
+
+    /**
+     * Stores short value into byte array. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putShort(byte[] arr, long off, short val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putShort(arr, off, val);
+        }
+        else {
+            putShortByByte(arr, off, val, BIG_ENDIAN);
+        }
+    }
+
+    /**
+     * Gets char value from byte array. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @return Char value from byte array.
+     */
+    public static char getChar(byte[] arr, long off)
+    {
+        return UNALIGNED ? UNSAFE.getChar(arr, off) : getCharByByte(arr, off, BIG_ENDIAN);
+    }
+
+    /**
+     * Stores char value into byte array. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putChar(byte[] arr, long off, char val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putChar(arr, off, val);
+        }
+        else {
+            putCharByByte(arr, off, val, BIG_ENDIAN);
+        }
+    }
+
+    /**
+     * Gets integer value from byte array. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @return Integer value from byte array.
+     */
+    public static int getInt(byte[] arr, long off)
+    {
+        return UNALIGNED ? UNSAFE.getInt(arr, off) : getIntByByte(arr, off, BIG_ENDIAN);
+    }
+
+    /**
+     * Stores integer value into byte array. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putInt(byte[] arr, long off, int val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putInt(arr, off, val);
+        }
+        else {
+            putIntByByte(arr, off, val, BIG_ENDIAN);
+        }
+    }
+
+    /**
+     * Gets long value from byte array. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @return Long value from byte array.
+     */
+    public static long getLong(byte[] arr, long off)
+    {
+        return UNALIGNED ? UNSAFE.getLong(arr, off) : getLongByByte(arr, off, BIG_ENDIAN);
+    }
+
+    /**
+     * Stores long value into byte array. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putLong(byte[] arr, long off, long val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putLong(arr, off, val);
+        }
+        else {
+            putLongByByte(arr, off, val, BIG_ENDIAN);
+        }
+    }
+
+    /**
+     * Gets float value from byte array. Alignment aware.
+     *
+     * @param arr Object.
+     * @param off Offset.
+     * @return Float value from byte array.
+     */
+    public static float getFloat(byte[] arr, long off)
+    {
+        return UNALIGNED ? UNSAFE.getFloat(arr, off) : Float.intBitsToFloat(getIntByByte(arr, off, BIG_ENDIAN));
+    }
+
+    /**
+     * Stores float value into byte array. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putFloat(byte[] arr, long off, float val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putFloat(arr, off, val);
+        }
+        else {
+            putIntByByte(arr, off, Float.floatToIntBits(val), BIG_ENDIAN);
+        }
+    }
+
+    /**
+     * Gets double value from byte array. Alignment aware.
+     *
+     * @param arr byte array.
+     * @param off Offset.
+     * @return Double value from byte array. Alignment aware.
+     */
+    public static double getDouble(byte[] arr, long off)
+    {
+        return UNALIGNED ? UNSAFE.getDouble(arr, off) : Double.longBitsToDouble(getLongByByte(arr, off, BIG_ENDIAN));
+    }
+
+    /**
+     * Stores double value into byte array. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putDouble(byte[] arr, long off, double val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putDouble(arr, off, val);
+        }
+        else {
+            putLongByByte(arr, off, Double.doubleToLongBits(val), BIG_ENDIAN);
+        }
+    }
+
+    /**
+     * Gets short value from byte array assuming that value stored in little-endian byte order and native byte order
+     * is big-endian. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @return Short value from byte array.
+     */
+    public static short getShortLE(byte[] arr, long off)
+    {
+        return UNALIGNED ? Short.reverseBytes(UNSAFE.getShort(arr, off)) : getShortByByte(arr, off, false);
+    }
+
+    /**
+     * Stores short value into byte array assuming that value should be stored in little-endian byte order and native
+     * byte order is big-endian. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putShortLE(byte[] arr, long off, short val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putShort(arr, off, Short.reverseBytes(val));
+        }
+        else {
+            putShortByByte(arr, off, val, false);
+        }
+    }
+
+    /**
+     * Gets char value from byte array assuming that value stored in little-endian byte order and native byte order
+     * is big-endian. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @return Char value from byte array.
+     */
+    public static char getCharLE(byte[] arr, long off)
+    {
+        return UNALIGNED ? Character.reverseBytes(UNSAFE.getChar(arr, off)) : getCharByByte(arr, off, false);
+    }
+
+    /**
+     * Stores char value into byte array assuming that value should be stored in little-endian byte order and native
+     * byte order is big-endian. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putCharLE(byte[] arr, long off, char val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putChar(arr, off, Character.reverseBytes(val));
+        }
+        else {
+            putCharByByte(arr, off, val, false);
+        }
+    }
+
+    /**
+     * Gets integer value from byte array assuming that value stored in little-endian byte order and native byte order
+     * is big-endian. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @return Integer value from byte array.
+     */
+    public static int getIntLE(byte[] arr, long off)
+    {
+        return UNALIGNED ? Integer.reverseBytes(UNSAFE.getInt(arr, off)) : getIntByByte(arr, off, false);
+    }
+
+    /**
+     * Stores integer value into byte array assuming that value should be stored in little-endian byte order and
+     * native byte order is big-endian. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putIntLE(byte[] arr, long off, int val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putInt(arr, off, Integer.reverseBytes(val));
+        }
+        else {
+            putIntByByte(arr, off, val, false);
+        }
+    }
+
+    /**
+     * Gets long value from byte array assuming that value stored in little-endian byte order and native byte order
+     * is big-endian. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @return Long value from byte array.
+     */
+    public static long getLongLE(byte[] arr, long off)
+    {
+        return UNALIGNED ? Long.reverseBytes(UNSAFE.getLong(arr, off)) : getLongByByte(arr, off, false);
+    }
+
+    /**
+     * Stores long value into byte array assuming that value should be stored in little-endian byte order and native
+     * byte order is big-endian. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putLongLE(byte[] arr, long off, long val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putLong(arr, off, Long.reverseBytes(val));
+        }
+        else {
+            putLongByByte(arr, off, val, false);
+        }
+    }
+
+    /**
+     * Gets float value from byte array assuming that value stored in little-endian byte order and native byte order
+     * is big-endian. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @return Float value from byte array.
+     */
+    public static float getFloatLE(byte[] arr, long off)
+    {
+        return Float.intBitsToFloat(
+                UNALIGNED ? Integer.reverseBytes(UNSAFE.getInt(arr, off)) : getIntByByte(arr, off, false));
+    }
+
+    /**
+     * Stores float value into byte array assuming that value should be stored in little-endian byte order and native
+     * byte order is big-endian. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putFloatLE(byte[] arr, long off, float val)
+    {
+        int intVal = Float.floatToIntBits(val);
+
+        if (UNALIGNED) {
+            UNSAFE.putInt(arr, off, Integer.reverseBytes(intVal));
+        }
+        else {
+            putIntByByte(arr, off, intVal, false);
+        }
+    }
+
+    /**
+     * Gets double value from byte array assuming that value stored in little-endian byte order and native byte order
+     * is big-endian. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @return Double value from byte array.
+     */
+    public static double getDoubleLE(byte[] arr, long off)
+    {
+        return Double.longBitsToDouble(
+                UNALIGNED ? Long.reverseBytes(UNSAFE.getLong(arr, off)) : getLongByByte(arr, off, false));
+    }
+
+    /**
+     * Stores double value into byte array assuming that value should be stored in little-endian byte order and
+     * native byte order is big-endian. Alignment aware.
+     *
+     * @param arr Byte array.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putDoubleLE(byte[] arr, long off, double val)
+    {
+        long longVal = Double.doubleToLongBits(val);
+
+        if (UNALIGNED) {
+            UNSAFE.putLong(arr, off, Long.reverseBytes(longVal));
+        }
+        else {
+            putLongByByte(arr, off, longVal, false);
+        }
+    }
+
+    /**
+     * Gets byte value from given address.
+     *
+     * @param addr Address.
+     * @return Byte value from given address.
+     */
+    public static byte getByte(long addr)
+    {
+        return UNSAFE.getByte(addr);
+    }
+
+    /**
+     * Stores given byte value.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putByte(long addr, byte val)
+    {
+        UNSAFE.putByte(addr, val);
+    }
+
+    /**
+     * Gets short value from given address. Alignment aware.
+     *
+     * @param addr Address.
+     * @return Short value from given address.
+     */
+    public static short getShort(long addr)
+    {
+        return UNALIGNED ? UNSAFE.getShort(addr) : getShortByByte(addr, BIG_ENDIAN);
+    }
+
+    /**
+     * Stores given short value. Alignment aware.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putShort(long addr, short val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putShort(addr, val);
+        }
+        else {
+            putShortByByte(addr, val, BIG_ENDIAN);
+        }
+    }
+
+    /**
+     * Gets char value from given address. Alignment aware.
+     *
+     * @param addr Address.
+     * @return Char value from given address.
+     */
+    public static char getChar(long addr)
+    {
+        return UNALIGNED ? UNSAFE.getChar(addr) : getCharByByte(addr, BIG_ENDIAN);
+    }
+
+    /**
+     * Stores given char value. Alignment aware.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putChar(long addr, char val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putChar(addr, val);
+        }
+        else {
+            putCharByByte(addr, val, BIG_ENDIAN);
+        }
+    }
+
+    /**
+     * Gets integer value from given address. Alignment aware.
+     *
+     * @param addr Address.
+     * @return Integer value from given address.
+     */
+    public static int getInt(long addr)
+    {
+        return UNALIGNED ? UNSAFE.getInt(addr) : getIntByByte(addr, BIG_ENDIAN);
+    }
+
+    /**
+     * Stores given integer value. Alignment aware.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putInt(long addr, int val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putInt(addr, val);
+        }
+        else {
+            putIntByByte(addr, val, BIG_ENDIAN);
+        }
+    }
+
+    /**
+     * Gets long value from given address. Alignment aware.
+     *
+     * @param addr Address.
+     * @return Long value from given address.
+     */
+    public static long getLong(long addr)
+    {
+        return UNALIGNED ? UNSAFE.getLong(addr) : getLongByByte(addr, BIG_ENDIAN);
+    }
+
+    /**
+     * Stores given integer value. Alignment aware.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putLong(long addr, long val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putLong(addr, val);
+        }
+        else {
+            putLongByByte(addr, val, BIG_ENDIAN);
+        }
+    }
+
+    /**
+     * Gets float value from given address. Alignment aware.
+     *
+     * @param addr Address.
+     * @return Float value from given address.
+     */
+    public static float getFloat(long addr)
+    {
+        return UNALIGNED ? UNSAFE.getFloat(addr) : Float.intBitsToFloat(getIntByByte(addr, BIG_ENDIAN));
+    }
+
+    /**
+     * Stores given float value. Alignment aware.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putFloat(long addr, float val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putFloat(addr, val);
+        }
+        else {
+            putIntByByte(addr, Float.floatToIntBits(val), BIG_ENDIAN);
+        }
+    }
+
+    /**
+     * Gets double value from given address. Alignment aware.
+     *
+     * @param addr Address.
+     * @return Double value from given address.
+     */
+    public static double getDouble(long addr)
+    {
+        return UNALIGNED ? UNSAFE.getDouble(addr) : Double.longBitsToDouble(getLongByByte(addr, BIG_ENDIAN));
+    }
+
+    /**
+     * Stores given double value. Alignment aware.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putDouble(long addr, double val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putDouble(addr, val);
+        }
+        else {
+            putLongByByte(addr, Double.doubleToLongBits(val), BIG_ENDIAN);
+        }
+    }
+
+    /**
+     * Gets short value from given address assuming that value stored in little-endian byte order and native byte order
+     * is big-endian. Alignment aware.
+     *
+     * @param addr Address.
+     * @return Short value from given address.
+     */
+    public static short getShortLE(long addr)
+    {
+        return UNALIGNED ? Short.reverseBytes(UNSAFE.getShort(addr)) : getShortByByte(addr, false);
+    }
+
+    /**
+     * Stores given short value assuming that value should be stored in little-endian byte order and native byte
+     * order is big-endian. Alignment aware.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putShortLE(long addr, short val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putShort(addr, Short.reverseBytes(val));
+        }
+        else {
+            putShortByByte(addr, val, false);
+        }
+    }
+
+    /**
+     * Gets char value from given address assuming that value stored in little-endian byte order and native byte order
+     * is big-endian. Alignment aware.
+     *
+     * @param addr Address.
+     * @return Char value from given address.
+     */
+    public static char getCharLE(long addr)
+    {
+        return UNALIGNED ? Character.reverseBytes(UNSAFE.getChar(addr)) : getCharByByte(addr, false);
+    }
+
+    /**
+     * Stores given char value assuming that value should be stored in little-endian byte order and native byte order
+     * is big-endian. Alignment aware.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putCharLE(long addr, char val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putChar(addr, Character.reverseBytes(val));
+        }
+        else {
+            putCharByByte(addr, val, false);
+        }
+    }
+
+    /**
+     * Gets integer value from given address assuming that value stored in little-endian byte order
+     * and native byte order is big-endian. Alignment aware.
+     *
+     * @param addr Address.
+     * @return Integer value from given address.
+     */
+    public static int getIntLE(long addr)
+    {
+        return UNALIGNED ? Integer.reverseBytes(UNSAFE.getInt(addr)) : getIntByByte(addr, false);
+    }
+
+    /**
+     * Stores given integer value assuming that value should be stored in little-endian byte order
+     * and native byte order is big-endian. Alignment aware.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putIntLE(long addr, int val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putInt(addr, Integer.reverseBytes(val));
+        }
+        else {
+            putIntByByte(addr, val, false);
+        }
+    }
+
+    /**
+     * Gets long value from given address assuming that value stored in little-endian byte order
+     * and native byte order is big-endian. Alignment aware.
+     *
+     * @param addr Address.
+     * @return Long value from given address.
+     */
+    public static long getLongLE(long addr)
+    {
+        return UNALIGNED ? Long.reverseBytes(UNSAFE.getLong(addr)) : getLongByByte(addr, false);
+    }
+
+    /**
+     * Stores given integer value assuming that value should be stored in little-endian byte order
+     * and native byte order is big-endian. Alignment aware.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putLongLE(long addr, long val)
+    {
+        if (UNALIGNED) {
+            UNSAFE.putLong(addr, Long.reverseBytes(val));
+        }
+        else {
+            putLongByByte(addr, val, false);
+        }
+    }
+
+    /**
+     * Gets float value from given address assuming that value stored in little-endian byte order
+     * and native byte order is big-endian. Alignment aware.
+     *
+     * @param addr Address.
+     * @return Float value from given address.
+     */
+    public static float getFloatLE(long addr)
+    {
+        return Float.intBitsToFloat(UNALIGNED ? Integer.reverseBytes(UNSAFE.getInt(addr)) : getIntByByte(addr, false));
+    }
+
+    /**
+     * Stores given float value assuming that value should be stored in little-endian byte order
+     * and native byte order is big-endian. Alignment aware.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putFloatLE(long addr, float val)
+    {
+        int intVal = Float.floatToIntBits(val);
+
+        if (UNALIGNED) {
+            UNSAFE.putInt(addr, Integer.reverseBytes(intVal));
+        }
+        else {
+            putIntByByte(addr, intVal, false);
+        }
+    }
+
+    /**
+     * Gets double value from given address assuming that value stored in little-endian byte order
+     * and native byte order is big-endian. Alignment aware.
+     *
+     * @param addr Address.
+     * @return Double value from given address.
+     */
+    public static double getDoubleLE(long addr)
+    {
+        return Double.longBitsToDouble(
+                UNALIGNED ? Long.reverseBytes(UNSAFE.getLong(addr)) : getLongByByte(addr, false));
+    }
+
+    /**
+     * Stores given double value assuming that value should be stored in little-endian byte order
+     * and native byte order is big-endian. Alignment aware.
+     *
+     * @param addr Address.
+     * @param val Value.
+     */
+    public static void putDoubleLE(long addr, double val)
+    {
+        long longVal = Double.doubleToLongBits(val);
+
+        if (UNALIGNED) {
+            UNSAFE.putLong(addr, Long.reverseBytes(longVal));
+        }
+        else {
+            putLongByByte(addr, longVal, false);
+        }
+    }
+
+    /**
+     * Returns static field offset.
+     *
+     * @param field Field.
+     * @return Static field offset.
+     */
+    public static long staticFieldOffset(Field field)
+    {
+        return UNSAFE.staticFieldOffset(field);
+    }
+
+    /**
+     * Returns object field offset.
+     *
+     * @param field Field.
+     * @return Object field offset.
+     */
+    public static long objectFieldOffset(Field field)
+    {
+        return UNSAFE.objectFieldOffset(field);
+    }
+
+    /**
+     * Returns static field base.
+     *
+     * @param field Field.
+     * @return Static field base.
+     */
+    public static Object staticFieldBase(Field field)
+    {
+        return UNSAFE.staticFieldBase(field);
+    }
+
+    /**
+     * Allocates memory.
+     *
+     * @param size Size.
+     * @return address.
+     */
+    public static long allocateMemory(long size)
+    {
+        return UNSAFE.allocateMemory(size);
+    }
+
+    /**
+     * Reallocates memory.
+     *
+     * @param addr Address.
+     * @param len Length.
+     * @return address.
+     */
+    public static long reallocateMemory(long addr, long len)
+    {
+        return UNSAFE.reallocateMemory(addr, len);
+    }
+
+    /**
+     * Fills memory with given value.
+     *
+     * @param addr Address.
+     * @param len Length.
+     * @param val Value.
+     */
+    public static void setMemory(long addr, long len, byte val)
+    {
+        UNSAFE.setMemory(addr, len, val);
+    }
+
+    /**
+     * Fills memory with zeroes.
+     *
+     * @param addr Address.
+     * @param len Length.
+     */
+    public static void zeroMemory(long addr, long len)
+    {
+        long off = 0;
+
+        for (; off + PAGE_SIZE <= len; off += PAGE_SIZE) {
+            UNSAFE.copyMemory(EMPTY_PAGE, BYTE_ARR_OFF, null, addr + off, PAGE_SIZE);
+        }
+
+        if (len != off) {
+            UNSAFE.copyMemory(EMPTY_PAGE, BYTE_ARR_OFF, null, addr + off, len - off);
+        }
+    }
+
+    /**
+     * Copy memory between offheap locations.
+     *
+     * @param srcAddr Source address.
+     * @param dstAddr Destination address.
+     * @param len Length.
+     */
+    public static void copyOffheapOffheap(long srcAddr, long dstAddr, long len)
+    {
+        if (len <= PER_BYTE_THRESHOLD) {
+            for (int i = 0; i < len; i++) {
+                UNSAFE.putByte(dstAddr + i, UNSAFE.getByte(srcAddr + i));
+            }
+        }
+        else {
+            UNSAFE.copyMemory(srcAddr, dstAddr, len);
+        }
+    }
+
+    /**
+     * Copy memory from offheap to heap.
+     *
+     * @param srcAddr Source address.
+     * @param dstBase Destination base.
+     * @param dstOff Destination offset.
+     * @param len Length.
+     */
+    public static void copyOffheapHeap(long srcAddr, Object dstBase, long dstOff, long len)
+    {
+        if (len <= PER_BYTE_THRESHOLD) {
+            for (int i = 0; i < len; i++) {
+                UNSAFE.putByte(dstBase, dstOff + i, UNSAFE.getByte(srcAddr + i));
+            }
+        }
+        else {
+            UNSAFE.copyMemory(null, srcAddr, dstBase, dstOff, len);
+        }
+    }
+
+    /**
+     * Copy memory from heap to offheap.
+     *
+     * @param srcBase Source base.
+     * @param srcOff Source offset.
+     * @param dstAddr Destination address.
+     * @param len Length.
+     */
+    public static void copyHeapOffheap(Object srcBase, long srcOff, long dstAddr, long len)
+    {
+        if (len <= PER_BYTE_THRESHOLD) {
+            for (int i = 0; i < len; i++) {
+                UNSAFE.putByte(dstAddr + i, UNSAFE.getByte(srcBase, srcOff + i));
+            }
+        }
+        else {
+            UNSAFE.copyMemory(srcBase, srcOff, null, dstAddr, len);
+        }
+    }
+
+    /**
+     * Copies memory.
+     *
+     * @param src Source.
+     * @param dst Dst.
+     * @param len Length.
+     */
+    public static void copyMemory(long src, long dst, long len)
+    {
+        UNSAFE.copyMemory(src, dst, len);
+    }
+
+    /**
+     * Sets all bytes in a given block of memory to a copy of another block.
+     *
+     * @param srcBase Source base.
+     * @param srcOff Source offset.
+     * @param dstBase Dst base.
+     * @param dstOff Dst offset.
+     * @param len Length.
+     */
+    public static void copyMemory(Object srcBase, long srcOff, Object dstBase, long dstOff, long len)
+    {
+        if (len <= PER_BYTE_THRESHOLD && srcBase != null && dstBase != null) {
+            for (int i = 0; i < len; i++) {
+                UNSAFE.putByte(dstBase, dstOff + i, UNSAFE.getByte(srcBase, srcOff + i));
+            }
+        }
+        else {
+            UNSAFE.copyMemory(srcBase, srcOff, dstBase, dstOff, len);
+        }
+    }
+
+    /**
+     * Frees memory.
+     *
+     * @param addr Address.
+     */
+    public static void freeMemory(long addr)
+    {
+        UNSAFE.freeMemory(addr);
+    }
+
+    /**
+     * Returns the offset of the first element in the storage allocation of a given array class.
+     *
+     * @param cls Class.
+     * @return the offset of the first element in the storage allocation of a given array class.
+     */
+    public static int arrayBaseOffset(Class cls)
+    {
+        return UNSAFE.arrayBaseOffset(cls);
+    }
+
+    /**
+     * Returns the scale factor for addressing elements in the storage allocation of a given array class.
+     *
+     * @param cls Class.
+     * @return the scale factor for addressing elements in the storage allocation of a given array class.
+     */
+    public static int arrayIndexScale(Class<?> cls)
+    {
+        return UNSAFE.arrayIndexScale(cls);
+    }
+
+    /**
+     * Allocates instance of given class.
+     *
+     * @param cls Class.
+     * @return Allocated instance.
+     */
+    public static Object allocateInstance(Class cls)
+            throws InstantiationException
+    {
+        return UNSAFE.allocateInstance(cls);
+    }
+
+    /**
+     * Integer CAS.
+     *
+     * @param obj Object.
+     * @param off Offset.
+     * @param exp Expected.
+     * @param upd Upd.
+     * @return {@code True} if operation completed successfully, {@code false} - otherwise.
+     */
+    public static boolean compareAndSwapInt(Object obj, long off, int exp, int upd)
+    {
+        return UNSAFE.compareAndSwapInt(obj, off, exp, upd);
+    }
+
+    /**
+     * Long CAS.
+     *
+     * @param obj Object.
+     * @param off Offset.
+     * @param exp Expected.
+     * @param upd Upd.
+     * @return {@code True} if operation completed successfully, {@code false} - otherwise.
+     */
+    public static boolean compareAndSwapLong(Object obj, long off, long exp, long upd)
+    {
+        return UNSAFE.compareAndSwapLong(obj, off, exp, upd);
+    }
+
+    /**
+     * Atomically increments value stored in an integer pointed by {@code ptr}.
+     *
+     * @param ptr Pointer to an integer.
+     * @return Updated value.
+     */
+    public static int incrementAndGetInt(long ptr)
+    {
+        return UNSAFE.getAndAddInt(null, ptr, 1) + 1;
+    }
+
+    /**
+     * Atomically increments value stored in an integer pointed by {@code ptr}.
+     *
+     * @param ptr Pointer to an integer.
+     * @return Updated value.
+     */
+    public static int decrementAndGetInt(long ptr)
+    {
+        return UNSAFE.getAndAddInt(null, ptr, -1) - 1;
+    }
+
+    /**
+     * Gets byte value with volatile semantic.
+     *
+     * @param obj Object.
+     * @param off Offset.
+     * @return Byte value.
+     */
+    public static byte getByteVolatile(Object obj, long off)
+    {
+        return UNSAFE.getByteVolatile(obj, off);
+    }
+
+    /**
+     * Stores byte value with volatile semantic.
+     *
+     * @param obj Object.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putByteVolatile(Object obj, long off, byte val)
+    {
+        UNSAFE.putByteVolatile(obj, off, val);
+    }
+
+    /**
+     * Gets integer value with volatile semantic.
+     *
+     * @param obj Object.
+     * @param off Offset.
+     * @return Integer value.
+     */
+    public static int getIntVolatile(Object obj, long off)
+    {
+        return UNSAFE.getIntVolatile(obj, off);
+    }
+
+    /**
+     * Stores integer value with volatile semantic.
+     *
+     * @param obj Object.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putIntVolatile(Object obj, long off, int val)
+    {
+        UNSAFE.putIntVolatile(obj, off, val);
+    }
+
+    /**
+     * Gets long value with volatile semantic.
+     *
+     * @param obj Object.
+     * @param off Offset.
+     * @return Long value.
+     */
+    public static long getLongVolatile(Object obj, long off)
+    {
+        return UNSAFE.getLongVolatile(obj, off);
+    }
+
+    /**
+     * Stores long value with volatile semantic.
+     *
+     * @param obj Object.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putLongVolatile(Object obj, long off, long val)
+    {
+        UNSAFE.putLongVolatile(obj, off, val);
+    }
+
+    /**
+     * Stores reference value with volatile semantic.
+     *
+     * @param obj Object.
+     * @param off Offset.
+     * @param val Value.
+     */
+    public static void putObjectVolatile(Object obj, long off, Object val)
+    {
+        UNSAFE.putObjectVolatile(obj, off, val);
+    }
+
+    /**
+     * Returns page size.
+     *
+     * @return Page size.
+     */
+    public static int pageSize()
+    {
+        return UNSAFE.pageSize();
+    }
+
+    /**
+     * Returns address of {@link Buffer} instance.
+     *
+     * @param buf Buffer.
+     * @return Buffer memory address.
+     */
+    public static long bufferAddress(ByteBuffer buf)
+    {
+        checkState(buf.isDirect(), "buf.isDirect() is false");
+
+        return UNSAFE.getLong(buf, DIRECT_BUF_ADDR_OFF);
+    }
+
+    /**
+     * Invokes some method on {@code sun.misc.Unsafe} instance.
+     *
+     * @param mtd Method.
+     * @param args Arguments.
+     */
+    public static Object invoke(Method mtd, Object... args)
+    {
+        try {
+            return mtd.invoke(UNSAFE, args);
+        }
+        catch (IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException("Unsafe invocation failed [cls=" + UNSAFE.getClass() + ", mtd=" + mtd + ']', e);
+        }
+    }
+
+    /**
+     * Cleans direct {@code java.nio.ByteBuffer}
+     *
+     * @param buf Direct buffer.
+     */
+    public static void cleanDirectBuffer(ByteBuffer buf)
+    {
+        checkState(buf.isDirect(), "buf.isDirect() is false");
+
+        DIRECT_BUF_CLEANER.clean(buf);
+    }
+
+    /**
+     * Returns unaligned flag.
+     */
+    private static boolean unaligned()
+    {
+        String arch = System.getProperty("os.arch");
+
+        boolean res = arch.equals("i386") || arch.equals("x86") || arch.equals("amd64") || arch.equals("x86_64");
+
+        if (!res) {
+            res = IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_MEMORY_UNALIGNED_ACCESS, false);
+        }
+
+        return res;
+    }
+
+    /**
+     * @return Instance of Unsafe class.
+     */
+    private static Unsafe unsafe()
+    {
+        try {
+            return Unsafe.getUnsafe();
+        }
+        catch (SecurityException ignored) {
+            try {
+                return AccessController.doPrivileged(
+                        new PrivilegedExceptionAction<Unsafe>()
+                        {
+                            @Override
+                            public Unsafe run()
+                                    throws Exception
+                            {
+                                Field f = Unsafe.class.getDeclaredField("theUnsafe");
+
+                                f.setAccessible(true);
+
+                                return (Unsafe) f.get(null);
+                            }
+                        });
+            }
+            catch (PrivilegedActionException e) {
+                throw new RuntimeException("Could not initialize intrinsics.", e.getCause());
+            }
+        }
+    }
+
+    /**
+     *
+     */
+    private static long bufferAddressOffset()
+    {
+        final ByteBuffer maybeDirectBuf = ByteBuffer.allocateDirect(1);
+
+        Field addrField = AccessController.doPrivileged(new PrivilegedAction<Field>()
+        {
+            @Override
+            public Field run()
+            {
+                try {
+                    Field addrFld = Buffer.class.getDeclaredField("address");
+
+                    addrFld.setAccessible(true);
+
+                    if (addrFld.getLong(maybeDirectBuf) == 0) {
+                        throw new RuntimeException("java.nio.DirectByteBuffer.address field is unavailable.");
+                    }
+
+                    return addrFld;
+                }
+                catch (Exception e) {
+                    throw new RuntimeException("java.nio.DirectByteBuffer.address field is unavailable.", e);
+                }
+            }
+        });
+
+        return UNSAFE.objectFieldOffset(addrField);
+    }
+
+    /**
+     * Returns {@code JavaNioAccess} instance from private API for corresponding Java version.
+     *
+     * @return {@code JavaNioAccess} instance for corresponding Java version.
+     * @throws RuntimeException If getting access to the private API is failed.
+     */
+    private static Object javaNioAccessObject()
+    {
+        String pkgName = miscPackage();
+
+        try {
+            Class<?> cls = Class.forName(pkgName + ".misc.SharedSecrets");
+
+            Method mth = cls.getMethod("getJavaNioAccess");
+
+            return mth.invoke(null);
+        }
+        catch (ReflectiveOperationException e) {
+            throw new RuntimeException(pkgName + ".misc.JavaNioAccess class is unavailable."
+                    + FeatureChecker.JAVA_VER_SPECIFIC_WARN, e);
+        }
+    }
+
+    /**
+     * Returns reference to {@code JavaNioAccess.newDirectByteBuffer} method
+     * from private API for corresponding Java version.
+     *
+     * @param nioAccessObj Java NIO access object.
+     * @return Reference to {@code JavaNioAccess.newDirectByteBuffer} method
+     * @throws RuntimeException If getting access to the private API is failed.
+     */
+    private static Method newDirectBufferMethod(Object nioAccessObj)
+    {
+        try {
+            Class<?> cls = nioAccessObj.getClass();
+
+            Method mtd = IS_DIRECT_BUF_LONG_CAP ? cls.getMethod("newDirectByteBuffer", long.class, long.class, Object.class) :
+                    cls.getMethod("newDirectByteBuffer", long.class, int.class, Object.class);
+
+            mtd.setAccessible(true);
+
+            return mtd;
+        }
+        catch (ReflectiveOperationException e) {
+            throw new RuntimeException(miscPackage() + ".JavaNioAccess#newDirectByteBuffer() method is unavailable."
+                    + FeatureChecker.JAVA_VER_SPECIFIC_WARN, e);
+        }
+    }
+
+    /**
+     *
+     */
+    @NotNull
+    private static String miscPackage()
+    {
+        int javaVer = majorJavaVersion(jdkVersion());
+
+        return javaVer < 9 ? "sun" : "jdk.internal";
+    }
+
+    /**
+     * Creates and tests contructor for Direct ByteBuffer. Test is wrapping one-byte unsafe memory into a buffer.
+     *
+     * @return constructor for creating direct ByteBuffers.
+     */
+    @NotNull
+    private static Constructor<?> createAndTestNewDirectBufferCtor()
+    {
+        Constructor<?> ctorCandidate = createNewDirectBufferCtor();
+
+        int l = 1;
+        long ptr = UNSAFE.allocateMemory(l);
+
+        try {
+            ByteBuffer buf = wrapPointerDirectBufCtor(ptr, l, ctorCandidate);
+
+            A.ensure(buf.isDirect(), "Buffer expected to be direct, internal error during #wrapPointerDirectBufCtor()");
+        }
+        finally {
+            UNSAFE.freeMemory(ptr);
+        }
+
+        return ctorCandidate;
+    }
+
+    /**
+     * Simply create some instance of direct Byte Buffer and try to get it's class declared constructor.
+     *
+     * @return constructor for creating direct ByteBuffers.
+     */
+    @NotNull
+    private static Constructor<?> createNewDirectBufferCtor()
+    {
+        try {
+            ByteBuffer buf = ByteBuffer.allocateDirect(1).order(NATIVE_BYTE_ORDER);
+
+            Constructor<?> ctor = IS_DIRECT_BUF_LONG_CAP ? buf.getClass().getDeclaredConstructor(long.class, long.class) :
+                    buf.getClass().getDeclaredConstructor(long.class, int.class);
+
+            ctor.setAccessible(true);
+
+            return ctor;
+        }
+        catch (NoSuchMethodException | SecurityException e) {
+            throw new RuntimeException("Unable to set up byte buffer creation using reflections :" + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * @param obj Object.
+     * @param off Offset.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static short getShortByByte(Object obj, long off, boolean bigEndian)
+    {
+        if (bigEndian) {
+            return (short) (UNSAFE.getByte(obj, off) << 8 | (UNSAFE.getByte(obj, off + 1) & 0xff));
+        }
+        else {
+            return (short) (UNSAFE.getByte(obj, off + 1) << 8 | (UNSAFE.getByte(obj, off) & 0xff));
+        }
+    }
+
+    /**
+     * @param obj Object.
+     * @param off Offset.
+     * @param val Value.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static void putShortByByte(Object obj, long off, short val, boolean bigEndian)
+    {
+        if (bigEndian) {
+            UNSAFE.putByte(obj, off, (byte) (val >> 8));
+            UNSAFE.putByte(obj, off + 1, (byte) val);
+        }
+        else {
+            UNSAFE.putByte(obj, off + 1, (byte) (val >> 8));
+            UNSAFE.putByte(obj, off, (byte) val);
+        }
+    }
+
+    /**
+     * @param obj Object.
+     * @param off Offset.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static char getCharByByte(Object obj, long off, boolean bigEndian)
+    {
+        if (bigEndian) {
+            return (char) (UNSAFE.getByte(obj, off) << 8 | (UNSAFE.getByte(obj, off + 1) & 0xff));
+        }
+        else {
+            return (char) (UNSAFE.getByte(obj, off + 1) << 8 | (UNSAFE.getByte(obj, off) & 0xff));
+        }
+    }
+
+    /**
+     * @param obj Object.
+     * @param addr Address.
+     * @param val Value.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static void putCharByByte(Object obj, long addr, char val, boolean bigEndian)
+    {
+        if (bigEndian) {
+            UNSAFE.putByte(obj, addr, (byte) (val >> 8));
+            UNSAFE.putByte(obj, addr + 1, (byte) val);
+        }
+        else {
+            UNSAFE.putByte(obj, addr + 1, (byte) (val >> 8));
+            UNSAFE.putByte(obj, addr, (byte) val);
+        }
+    }
+
+    /**
+     * @param obj Object.
+     * @param addr Address.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static int getIntByByte(Object obj, long addr, boolean bigEndian)
+    {
+        if (bigEndian) {
+            return (((int) UNSAFE.getByte(obj, addr)) << 24) |
+                    (((int) UNSAFE.getByte(obj, addr + 1) & 0xff) << 16) |
+                    (((int) UNSAFE.getByte(obj, addr + 2) & 0xff) << 8) |
+                    (((int) UNSAFE.getByte(obj, addr + 3) & 0xff));
+        }
+        else {
+            return (((int) UNSAFE.getByte(obj, addr + 3)) << 24) |
+                    (((int) UNSAFE.getByte(obj, addr + 2) & 0xff) << 16) |
+                    (((int) UNSAFE.getByte(obj, addr + 1) & 0xff) << 8) |
+                    (((int) UNSAFE.getByte(obj, addr) & 0xff));
+        }
+    }
+
+    /**
+     * @param obj Object.
+     * @param addr Address.
+     * @param val Value.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static void putIntByByte(Object obj, long addr, int val, boolean bigEndian)
+    {
+        if (bigEndian) {
+            UNSAFE.putByte(obj, addr, (byte) (val >> 24));
+            UNSAFE.putByte(obj, addr + 1, (byte) (val >> 16));
+            UNSAFE.putByte(obj, addr + 2, (byte) (val >> 8));
+            UNSAFE.putByte(obj, addr + 3, (byte) (val));
+        }
+        else {
+            UNSAFE.putByte(obj, addr + 3, (byte) (val >> 24));
+            UNSAFE.putByte(obj, addr + 2, (byte) (val >> 16));
+            UNSAFE.putByte(obj, addr + 1, (byte) (val >> 8));
+            UNSAFE.putByte(obj, addr, (byte) (val));
+        }
+    }
+
+    /**
+     * @param obj Object.
+     * @param addr Address.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static long getLongByByte(Object obj, long addr, boolean bigEndian)
+    {
+        if (bigEndian) {
+            return (((long) UNSAFE.getByte(obj, addr)) << 56) |
+                    (((long) UNSAFE.getByte(obj, addr + 1) & 0xff) << 48) |
+                    (((long) UNSAFE.getByte(obj, addr + 2) & 0xff) << 40) |
+                    (((long) UNSAFE.getByte(obj, addr + 3) & 0xff) << 32) |
+                    (((long) UNSAFE.getByte(obj, addr + 4) & 0xff) << 24) |
+                    (((long) UNSAFE.getByte(obj, addr + 5) & 0xff) << 16) |
+                    (((long) UNSAFE.getByte(obj, addr + 6) & 0xff) << 8) |
+                    (((long) UNSAFE.getByte(obj, addr + 7) & 0xff));
+        }
+        else {
+            return (((long) UNSAFE.getByte(obj, addr + 7)) << 56) |
+                    (((long) UNSAFE.getByte(obj, addr + 6) & 0xff) << 48) |
+                    (((long) UNSAFE.getByte(obj, addr + 5) & 0xff) << 40) |
+                    (((long) UNSAFE.getByte(obj, addr + 4) & 0xff) << 32) |
+                    (((long) UNSAFE.getByte(obj, addr + 3) & 0xff) << 24) |
+                    (((long) UNSAFE.getByte(obj, addr + 2) & 0xff) << 16) |
+                    (((long) UNSAFE.getByte(obj, addr + 1) & 0xff) << 8) |
+                    (((long) UNSAFE.getByte(obj, addr) & 0xff));
+        }
+    }
+
+    /**
+     * @param obj Object.
+     * @param addr Address.
+     * @param val Value.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static void putLongByByte(Object obj, long addr, long val, boolean bigEndian)
+    {
+        if (bigEndian) {
+            UNSAFE.putByte(obj, addr, (byte) (val >> 56));
+            UNSAFE.putByte(obj, addr + 1, (byte) (val >> 48));
+            UNSAFE.putByte(obj, addr + 2, (byte) (val >> 40));
+            UNSAFE.putByte(obj, addr + 3, (byte) (val >> 32));
+            UNSAFE.putByte(obj, addr + 4, (byte) (val >> 24));
+            UNSAFE.putByte(obj, addr + 5, (byte) (val >> 16));
+            UNSAFE.putByte(obj, addr + 6, (byte) (val >> 8));
+            UNSAFE.putByte(obj, addr + 7, (byte) (val));
+        }
+        else {
+            UNSAFE.putByte(obj, addr + 7, (byte) (val >> 56));
+            UNSAFE.putByte(obj, addr + 6, (byte) (val >> 48));
+            UNSAFE.putByte(obj, addr + 5, (byte) (val >> 40));
+            UNSAFE.putByte(obj, addr + 4, (byte) (val >> 32));
+            UNSAFE.putByte(obj, addr + 3, (byte) (val >> 24));
+            UNSAFE.putByte(obj, addr + 2, (byte) (val >> 16));
+            UNSAFE.putByte(obj, addr + 1, (byte) (val >> 8));
+            UNSAFE.putByte(obj, addr, (byte) (val));
+        }
+    }
+
+    /**
+     * @param addr Address.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static short getShortByByte(long addr, boolean bigEndian)
+    {
+        if (bigEndian) {
+            return (short) (UNSAFE.getByte(addr) << 8 | (UNSAFE.getByte(addr + 1) & 0xff));
+        }
+        else {
+            return (short) (UNSAFE.getByte(addr + 1) << 8 | (UNSAFE.getByte(addr) & 0xff));
+        }
+    }
+
+    /**
+     * @param addr Address.
+     * @param val Value.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static void putShortByByte(long addr, short val, boolean bigEndian)
+    {
+        if (bigEndian) {
+            UNSAFE.putByte(addr, (byte) (val >> 8));
+            UNSAFE.putByte(addr + 1, (byte) val);
+        }
+        else {
+            UNSAFE.putByte(addr + 1, (byte) (val >> 8));
+            UNSAFE.putByte(addr, (byte) val);
+        }
+    }
+
+    /**
+     * @param addr Address.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static char getCharByByte(long addr, boolean bigEndian)
+    {
+        if (bigEndian) {
+            return (char) (UNSAFE.getByte(addr) << 8 | (UNSAFE.getByte(addr + 1) & 0xff));
+        }
+        else {
+            return (char) (UNSAFE.getByte(addr + 1) << 8 | (UNSAFE.getByte(addr) & 0xff));
+        }
+    }
+
+    /**
+     * @param addr Address.
+     * @param val Value.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static void putCharByByte(long addr, char val, boolean bigEndian)
+    {
+        if (bigEndian) {
+            UNSAFE.putByte(addr, (byte) (val >> 8));
+            UNSAFE.putByte(addr + 1, (byte) val);
+        }
+        else {
+            UNSAFE.putByte(addr + 1, (byte) (val >> 8));
+            UNSAFE.putByte(addr, (byte) val);
+        }
+    }
+
+    /**
+     * @param addr Address.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static int getIntByByte(long addr, boolean bigEndian)
+    {
+        if (bigEndian) {
+            return (((int) UNSAFE.getByte(addr)) << 24) |
+                    (((int) UNSAFE.getByte(addr + 1) & 0xff) << 16) |
+                    (((int) UNSAFE.getByte(addr + 2) & 0xff) << 8) |
+                    (((int) UNSAFE.getByte(addr + 3) & 0xff));
+        }
+        else {
+            return (((int) UNSAFE.getByte(addr + 3)) << 24) |
+                    (((int) UNSAFE.getByte(addr + 2) & 0xff) << 16) |
+                    (((int) UNSAFE.getByte(addr + 1) & 0xff) << 8) |
+                    (((int) UNSAFE.getByte(addr) & 0xff));
+        }
+    }
+
+    /**
+     * @param addr Address.
+     * @param val Value.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static void putIntByByte(long addr, int val, boolean bigEndian)
+    {
+        if (bigEndian) {
+            UNSAFE.putByte(addr, (byte) (val >> 24));
+            UNSAFE.putByte(addr + 1, (byte) (val >> 16));
+            UNSAFE.putByte(addr + 2, (byte) (val >> 8));
+            UNSAFE.putByte(addr + 3, (byte) (val));
+        }
+        else {
+            UNSAFE.putByte(addr + 3, (byte) (val >> 24));
+            UNSAFE.putByte(addr + 2, (byte) (val >> 16));
+            UNSAFE.putByte(addr + 1, (byte) (val >> 8));
+            UNSAFE.putByte(addr, (byte) (val));
+        }
+    }
+
+    /**
+     * @param addr Address.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static long getLongByByte(long addr, boolean bigEndian)
+    {
+        if (bigEndian) {
+            return (((long) UNSAFE.getByte(addr)) << 56) |
+                    (((long) UNSAFE.getByte(addr + 1) & 0xff) << 48) |
+                    (((long) UNSAFE.getByte(addr + 2) & 0xff) << 40) |
+                    (((long) UNSAFE.getByte(addr + 3) & 0xff) << 32) |
+                    (((long) UNSAFE.getByte(addr + 4) & 0xff) << 24) |
+                    (((long) UNSAFE.getByte(addr + 5) & 0xff) << 16) |
+                    (((long) UNSAFE.getByte(addr + 6) & 0xff) << 8) |
+                    (((long) UNSAFE.getByte(addr + 7) & 0xff));
+        }
+        else {
+            return (((long) UNSAFE.getByte(addr + 7)) << 56) |
+                    (((long) UNSAFE.getByte(addr + 6) & 0xff) << 48) |
+                    (((long) UNSAFE.getByte(addr + 5) & 0xff) << 40) |
+                    (((long) UNSAFE.getByte(addr + 4) & 0xff) << 32) |
+                    (((long) UNSAFE.getByte(addr + 3) & 0xff) << 24) |
+                    (((long) UNSAFE.getByte(addr + 2) & 0xff) << 16) |
+                    (((long) UNSAFE.getByte(addr + 1) & 0xff) << 8) |
+                    (((long) UNSAFE.getByte(addr) & 0xff));
+        }
+    }
+
+    /**
+     * @param addr Address.
+     * @param val Value.
+     * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+     */
+    private static void putLongByByte(long addr, long val, boolean bigEndian)
+    {
+        if (bigEndian) {
+            UNSAFE.putByte(addr, (byte) (val >> 56));
+            UNSAFE.putByte(addr + 1, (byte) (val >> 48));
+            UNSAFE.putByte(addr + 2, (byte) (val >> 40));
+            UNSAFE.putByte(addr + 3, (byte) (val >> 32));
+            UNSAFE.putByte(addr + 4, (byte) (val >> 24));
+            UNSAFE.putByte(addr + 5, (byte) (val >> 16));
+            UNSAFE.putByte(addr + 6, (byte) (val >> 8));
+            UNSAFE.putByte(addr + 7, (byte) (val));
+        }
+        else {
+            UNSAFE.putByte(addr + 7, (byte) (val >> 56));
+            UNSAFE.putByte(addr + 6, (byte) (val >> 48));
+            UNSAFE.putByte(addr + 5, (byte) (val >> 40));
+            UNSAFE.putByte(addr + 4, (byte) (val >> 32));
+            UNSAFE.putByte(addr + 3, (byte) (val >> 24));
+            UNSAFE.putByte(addr + 2, (byte) (val >> 16));
+            UNSAFE.putByte(addr + 1, (byte) (val >> 8));
+            UNSAFE.putByte(addr, (byte) (val));
+        }
+    }
+}
diff --git a/lib/trino-ignite-patched/src/test/java/org/apache/ignite/TestDummy.java b/lib/trino-ignite-patched/src/test/java/org/apache/ignite/TestDummy.java
new file mode 100644
index 000000000000..eabaf8f7d7a4
--- /dev/null
+++ b/lib/trino-ignite-patched/src/test/java/org/apache/ignite/TestDummy.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed 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.ignite;
+
+import org.testng.annotations.Test;
+
+public class TestDummy
+{
+    @Test
+    public void buildRequiresTestToExist() {}
+}
diff --git a/lib/trino-matching/pom.xml b/lib/trino-matching/pom.xml
index 737db355540f..c56c1717acd8 100644
--- a/lib/trino-matching/pom.xml
+++ b/lib/trino-matching/pom.xml
@@ -5,15 +5,15 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-matching</artifactId>
-    <name>trino-matching</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <air.compiler.fail-warnings>true</air.compiler.fail-warnings>
     </properties>
 
     <dependencies>
@@ -22,7 +22,6 @@
             <artifactId>guava</artifactId>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
diff --git a/lib/trino-matching/src/main/java/io/trino/matching/Captures.java b/lib/trino-matching/src/main/java/io/trino/matching/Captures.java
index e587a8a3ba2d..7880218ee042 100644
--- a/lib/trino-matching/src/main/java/io/trino/matching/Captures.java
+++ b/lib/trino-matching/src/main/java/io/trino/matching/Captures.java
@@ -14,6 +14,7 @@
 package io.trino.matching;
 
 import java.util.NoSuchElementException;
+import java.util.Objects;
 
 public class Captures
 {
@@ -71,14 +72,9 @@ public boolean equals(Object o)
         }
 
         Captures captures = (Captures) o;
-
-        if (capture != null ? !capture.equals(captures.capture) : captures.capture != null) {
-            return false;
-        }
-        if (value != null ? !value.equals(captures.value) : captures.value != null) {
-            return false;
-        }
-        return tail != null ? tail.equals(captures.tail) : captures.tail == null;
+        return Objects.equals(capture, captures.capture)
+                && Objects.equals(value, captures.value)
+                && Objects.equals(tail, captures.tail);
     }
 
     @Override
diff --git a/lib/trino-memory-context/pom.xml b/lib/trino-memory-context/pom.xml
index 605021808c7b..430b3a38a2e4 100644
--- a/lib/trino-memory-context/pom.xml
+++ b/lib/trino-memory-context/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-memory-context</artifactId>
-    <name>trino-memory-context</name>
     <description>Trino - Memory Tracking Framework</description>
 
     <properties>
@@ -19,8 +18,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -29,7 +28,6 @@
             <artifactId>guava</artifactId>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>testing</artifactId>
diff --git a/lib/trino-memory-context/src/main/java/io/trino/memory/context/AbstractAggregatedMemoryContext.java b/lib/trino-memory-context/src/main/java/io/trino/memory/context/AbstractAggregatedMemoryContext.java
index cdfbafe3bafe..a9c6df073ac2 100644
--- a/lib/trino-memory-context/src/main/java/io/trino/memory/context/AbstractAggregatedMemoryContext.java
+++ b/lib/trino-memory-context/src/main/java/io/trino/memory/context/AbstractAggregatedMemoryContext.java
@@ -14,9 +14,8 @@
 package io.trino.memory.context;
 
 import com.google.common.util.concurrent.ListenableFuture;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
diff --git a/lib/trino-memory-context/src/main/java/io/trino/memory/context/MemoryTrackingContext.java b/lib/trino-memory-context/src/main/java/io/trino/memory/context/MemoryTrackingContext.java
index fe43d98099de..ac9a19c656cd 100644
--- a/lib/trino-memory-context/src/main/java/io/trino/memory/context/MemoryTrackingContext.java
+++ b/lib/trino-memory-context/src/main/java/io/trino/memory/context/MemoryTrackingContext.java
@@ -14,8 +14,7 @@
 package io.trino.memory.context;
 
 import com.google.common.io.Closer;
-
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
 
 import java.io.IOException;
 
diff --git a/lib/trino-memory-context/src/main/java/io/trino/memory/context/SimpleLocalMemoryContext.java b/lib/trino-memory-context/src/main/java/io/trino/memory/context/SimpleLocalMemoryContext.java
index fd3438a6fd12..be5b20688727 100644
--- a/lib/trino-memory-context/src/main/java/io/trino/memory/context/SimpleLocalMemoryContext.java
+++ b/lib/trino-memory-context/src/main/java/io/trino/memory/context/SimpleLocalMemoryContext.java
@@ -14,9 +14,8 @@
 package io.trino.memory.context;
 
 import com.google.common.util.concurrent.ListenableFuture;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/lib/trino-orc/pom.xml b/lib/trino-orc/pom.xml
index abfb03f1d666..6666bb334ab0 100644
--- a/lib/trino-orc/pom.xml
+++ b/lib/trino-orc/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-orc</artifactId>
-    <name>trino-orc</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,58 +17,63 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-array</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-filesystem</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>aircompressor</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-memory-context</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.orc</groupId>
-            <artifactId>orc-protobuf</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>stats</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>aircompressor</artifactId>
+            <artifactId>units</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-array</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>stats</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-memory-context</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino.orc</groupId>
+            <artifactId>orc-protobuf</artifactId>
         </dependency>
 
         <dependency>
@@ -77,6 +81,11 @@
             <artifactId>fastutil</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
@@ -87,6 +96,18 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-hadoop-toolkit</artifactId>
@@ -100,19 +121,11 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -137,18 +150,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -167,18 +168,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/AbstractOrcDataSource.java b/lib/trino-orc/src/main/java/io/trino/orc/AbstractOrcDataSource.java
index 4fdd1a1e7f1a..e7e14c81297b 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/AbstractOrcDataSource.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/AbstractOrcDataSource.java
@@ -31,6 +31,7 @@
 import static com.google.common.base.Verify.verify;
 import static io.trino.orc.OrcDataSourceUtils.getDiskRangeSlice;
 import static io.trino.orc.OrcDataSourceUtils.mergeAdjacentDiskRanges;
+import static java.lang.Math.min;
 import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
@@ -54,7 +55,8 @@ public AbstractOrcDataSource(OrcDataSourceId id, long estimatedSize, OrcReaderOp
     protected Slice readTailInternal(int length)
             throws IOException
     {
-        return readFully(estimatedSize - length, length);
+        int readSize = toIntExact(min(estimatedSize, length));
+        return readFully(estimatedSize - readSize, readSize);
     }
 
     protected abstract void readInternal(long position, byte[] buffer, int bufferOffset, int bufferLength)
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/ChunkedSliceOutput.java b/lib/trino-orc/src/main/java/io/trino/orc/ChunkedSliceOutput.java
deleted file mode 100644
index a07f46c571af..000000000000
--- a/lib/trino-orc/src/main/java/io/trino/orc/ChunkedSliceOutput.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Licensed 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 io.trino.orc;
-
-import com.google.common.collect.ImmutableList;
-import io.airlift.slice.Slice;
-import io.airlift.slice.SliceOutput;
-import io.airlift.slice.Slices;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.airlift.slice.SizeOf.SIZE_OF_BYTE;
-import static io.airlift.slice.SizeOf.SIZE_OF_INT;
-import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
-import static io.airlift.slice.SizeOf.SIZE_OF_SHORT;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static java.lang.Math.min;
-import static java.lang.Math.multiplyExact;
-import static java.lang.Math.toIntExact;
-
-public final class ChunkedSliceOutput
-        extends SliceOutput
-{
-    private static final int INSTANCE_SIZE = instanceSize(ChunkedSliceOutput.class);
-    private static final int MINIMUM_CHUNK_SIZE = 4096;
-    private static final int MAXIMUM_CHUNK_SIZE = 16 * 1024 * 1024;
-    // This must not be larger than MINIMUM_CHUNK_SIZE/2
-    private static final int MAX_UNUSED_BUFFER_SIZE = 128;
-
-    private final ChunkSupplier chunkSupplier;
-
-    private Slice slice;
-    private byte[] buffer;
-
-    private final List<Slice> closedSlices = new ArrayList<>();
-    private long closedSlicesRetainedSize;
-
-    /**
-     * Offset of buffer within stream.
-     */
-    private long streamOffset;
-
-    /**
-     * Current position for writing in buffer.
-     */
-    private int bufferPosition;
-
-    public ChunkedSliceOutput(int minChunkSize, int maxChunkSize)
-    {
-        this.chunkSupplier = new ChunkSupplier(minChunkSize, maxChunkSize);
-
-        this.buffer = chunkSupplier.get();
-        this.slice = Slices.wrappedBuffer(buffer);
-    }
-
-    public List<Slice> getSlices()
-    {
-        return ImmutableList.<Slice>builder()
-                .addAll(closedSlices)
-                .add(Slices.copyOf(slice, 0, bufferPosition))
-                .build();
-    }
-
-    @Override
-    public void reset()
-    {
-        chunkSupplier.reset();
-        closedSlices.clear();
-
-        buffer = chunkSupplier.get();
-        slice = Slices.wrappedBuffer(buffer);
-
-        closedSlicesRetainedSize = 0;
-        streamOffset = 0;
-        bufferPosition = 0;
-    }
-
-    @Override
-    public void reset(int position)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int size()
-    {
-        return toIntExact(streamOffset + bufferPosition);
-    }
-
-    @Override
-    public long getRetainedSize()
-    {
-        return slice.getRetainedSize() + closedSlicesRetainedSize + INSTANCE_SIZE;
-    }
-
-    @Override
-    public int writableBytes()
-    {
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    public boolean isWritable()
-    {
-        return true;
-    }
-
-    @Override
-    public void writeByte(int value)
-    {
-        ensureWritableBytes(SIZE_OF_BYTE);
-        slice.setByte(bufferPosition, value);
-        bufferPosition += SIZE_OF_BYTE;
-    }
-
-    @Override
-    public void writeShort(int value)
-    {
-        ensureWritableBytes(SIZE_OF_SHORT);
-        slice.setShort(bufferPosition, value);
-        bufferPosition += SIZE_OF_SHORT;
-    }
-
-    @Override
-    public void writeInt(int value)
-    {
-        ensureWritableBytes(SIZE_OF_INT);
-        slice.setInt(bufferPosition, value);
-        bufferPosition += SIZE_OF_INT;
-    }
-
-    @Override
-    public void writeLong(long value)
-    {
-        ensureWritableBytes(SIZE_OF_LONG);
-        slice.setLong(bufferPosition, value);
-        bufferPosition += SIZE_OF_LONG;
-    }
-
-    @Override
-    public void writeFloat(float value)
-    {
-        writeInt(Float.floatToIntBits(value));
-    }
-
-    @Override
-    public void writeDouble(double value)
-    {
-        writeLong(Double.doubleToLongBits(value));
-    }
-
-    @Override
-    public void writeBytes(Slice source)
-    {
-        writeBytes(source, 0, source.length());
-    }
-
-    @Override
-    public void writeBytes(Slice source, int sourceIndex, int length)
-    {
-        while (length > 0) {
-            int batch = tryEnsureBatchSize(length);
-            slice.setBytes(bufferPosition, source, sourceIndex, batch);
-            bufferPosition += batch;
-            sourceIndex += batch;
-            length -= batch;
-        }
-    }
-
-    @Override
-    public void writeBytes(byte[] source)
-    {
-        writeBytes(source, 0, source.length);
-    }
-
-    @Override
-    public void writeBytes(byte[] source, int sourceIndex, int length)
-    {
-        while (length > 0) {
-            int batch = tryEnsureBatchSize(length);
-            slice.setBytes(bufferPosition, source, sourceIndex, batch);
-            bufferPosition += batch;
-            sourceIndex += batch;
-            length -= batch;
-        }
-    }
-
-    @Override
-    public void writeBytes(InputStream in, int length)
-            throws IOException
-    {
-        while (length > 0) {
-            int batch = tryEnsureBatchSize(length);
-            slice.setBytes(bufferPosition, in, batch);
-            bufferPosition += batch;
-            length -= batch;
-        }
-    }
-
-    @Override
-    public void writeZero(int length)
-    {
-        checkArgument(length >= 0, "length must be greater than or equal to 0");
-
-        while (length > 0) {
-            int batch = tryEnsureBatchSize(length);
-            Arrays.fill(buffer, bufferPosition, bufferPosition + batch, (byte) 0);
-            bufferPosition += batch;
-            length -= batch;
-        }
-    }
-
-    @Override
-    public SliceOutput appendLong(long value)
-    {
-        writeLong(value);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendDouble(double value)
-    {
-        writeDouble(value);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendInt(int value)
-    {
-        writeInt(value);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendShort(int value)
-    {
-        writeShort(value);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendByte(int value)
-    {
-        writeByte(value);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendBytes(byte[] source, int sourceIndex, int length)
-    {
-        writeBytes(source, sourceIndex, length);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendBytes(byte[] source)
-    {
-        writeBytes(source);
-        return this;
-    }
-
-    @Override
-    public SliceOutput appendBytes(Slice slice)
-    {
-        writeBytes(slice);
-        return this;
-    }
-
-    @Override
-    public Slice slice()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Slice getUnderlyingSlice()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String toString(Charset charset)
-    {
-        return toString();
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder("OutputStreamSliceOutputAdapter{");
-        builder.append("position=").append(size());
-        builder.append("bufferSize=").append(slice.length());
-        builder.append('}');
-        return builder.toString();
-    }
-
-    private int tryEnsureBatchSize(int length)
-    {
-        ensureWritableBytes(min(MAX_UNUSED_BUFFER_SIZE, length));
-        return min(length, slice.length() - bufferPosition);
-    }
-
-    private void ensureWritableBytes(int minWritableBytes)
-    {
-        checkArgument(minWritableBytes <= MAX_UNUSED_BUFFER_SIZE);
-        if (bufferPosition + minWritableBytes > slice.length()) {
-            closeChunk();
-        }
-    }
-
-    private void closeChunk()
-    {
-        // add trimmed view of slice to closed slices
-        closedSlices.add(slice.slice(0, bufferPosition));
-        closedSlicesRetainedSize += slice.getRetainedSize();
-
-        // create a new buffer
-        // double size until we hit the max chunk size
-        buffer = chunkSupplier.get();
-        slice = Slices.wrappedBuffer(buffer);
-
-        streamOffset += bufferPosition;
-        bufferPosition = 0;
-    }
-
-    // Chunk supplier creates buffers by doubling the size from min to max chunk size.
-    // The supplier also tracks all created buffers and can be reset to the beginning,
-    // reusing the buffers.
-    private static class ChunkSupplier
-    {
-        private final int maxChunkSize;
-
-        private final List<byte[]> bufferPool = new ArrayList<>();
-        private final List<byte[]> usedBuffers = new ArrayList<>();
-
-        private int currentSize;
-
-        public ChunkSupplier(int minChunkSize, int maxChunkSize)
-        {
-            checkArgument(minChunkSize >= MINIMUM_CHUNK_SIZE, "minimum chunk size of " + MINIMUM_CHUNK_SIZE + " required");
-            checkArgument(maxChunkSize <= MAXIMUM_CHUNK_SIZE, "maximum chunk size of " + MAXIMUM_CHUNK_SIZE + " required");
-            checkArgument(minChunkSize <= maxChunkSize, "minimum chunk size must be less than maximum chunk size");
-
-            this.currentSize = minChunkSize;
-            this.maxChunkSize = maxChunkSize;
-        }
-
-        public void reset()
-        {
-            bufferPool.addAll(0, usedBuffers);
-            usedBuffers.clear();
-        }
-
-        public byte[] get()
-        {
-            byte[] buffer;
-            if (bufferPool.isEmpty()) {
-                currentSize = min(multiplyExact(currentSize, 2), maxChunkSize);
-                buffer = new byte[currentSize];
-            }
-            else {
-                buffer = bufferPool.remove(0);
-                currentSize = buffer.length;
-            }
-            usedBuffers.add(buffer);
-            return buffer;
-        }
-    }
-}
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/DictionaryCompressionOptimizer.java b/lib/trino-orc/src/main/java/io/trino/orc/DictionaryCompressionOptimizer.java
index ad89067fc503..94ee46a95768 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/DictionaryCompressionOptimizer.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/DictionaryCompressionOptimizer.java
@@ -25,7 +25,9 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.math.DoubleMath.roundToLong;
 import static java.lang.Math.toIntExact;
+import static java.math.RoundingMode.HALF_UP;
 import static java.util.Objects.requireNonNull;
 
 public class DictionaryCompressionOptimizer
@@ -106,7 +108,7 @@ public void finalOptimize(int bufferedBytes)
         convertLowCompressionStreams(bufferedBytes);
     }
 
-    public void optimize(int bufferedBytes, int stripeRowCount)
+    public void optimize(long bufferedBytes, int stripeRowCount)
     {
         // recompute the dictionary memory usage
         dictionaryMemoryBytes = allWriters.stream()
@@ -131,7 +133,7 @@ public void optimize(int bufferedBytes, int stripeRowCount)
         }
 
         // calculate size of non-dictionary columns by removing the buffered size of dictionary columns
-        int nonDictionaryBufferedBytes = bufferedBytes;
+        long nonDictionaryBufferedBytes = bufferedBytes;
         for (DictionaryColumnManager dictionaryWriter : allWriters) {
             if (!dictionaryWriter.isDirectEncoded()) {
                 nonDictionaryBufferedBytes -= dictionaryWriter.getBufferedBytes();
@@ -176,7 +178,7 @@ public void optimize(int bufferedBytes, int stripeRowCount)
         }
     }
 
-    private int convertLowCompressionStreams(int bufferedBytes)
+    private long convertLowCompressionStreams(long bufferedBytes)
     {
         // convert all low compression column to direct
         for (DictionaryColumnManager dictionaryWriter : ImmutableList.copyOf(directConversionCandidates)) {
@@ -205,7 +207,7 @@ private OptionalInt tryConvertToDirect(DictionaryColumnManager dictionaryWriter,
         return directBytes;
     }
 
-    private double currentCompressionRatio(int totalNonDictionaryBytes)
+    private double currentCompressionRatio(long totalNonDictionaryBytes)
     {
         long uncompressedBytes = totalNonDictionaryBytes;
         long compressedBytes = totalNonDictionaryBytes;
@@ -229,11 +231,11 @@ private double currentCompressionRatio(int totalNonDictionaryBytes)
      * @param stripeRowCount current number of rows in the stripe
      * @return the column that would produce the best stripe compression ration if converted to direct
      */
-    private DictionaryCompressionProjection selectDictionaryColumnToConvert(int totalNonDictionaryBytes, int stripeRowCount)
+    private DictionaryCompressionProjection selectDictionaryColumnToConvert(long totalNonDictionaryBytes, int stripeRowCount)
     {
         checkState(!directConversionCandidates.isEmpty());
 
-        int totalNonDictionaryBytesPerRow = totalNonDictionaryBytes / stripeRowCount;
+        long totalNonDictionaryBytesPerRow = totalNonDictionaryBytes / stripeRowCount;
 
         // rawBytes = sum of the length of every row value (without dictionary encoding)
         // dictionaryBytes = sum of the length of every entry in the dictionary
@@ -243,9 +245,9 @@ private DictionaryCompressionProjection selectDictionaryColumnToConvert(int tota
         long totalDictionaryBytes = 0;
         long totalDictionaryIndexBytes = 0;
 
-        long totalDictionaryRawBytesPerRow = 0;
-        long totalDictionaryBytesPerNewRow = 0;
-        long totalDictionaryIndexBytesPerRow = 0;
+        double totalDictionaryRawBytesPerRow = 0;
+        double totalDictionaryBytesPerNewRow = 0;
+        double totalDictionaryIndexBytesPerRow = 0;
 
         for (DictionaryColumnManager column : allWriters) {
             if (!column.isDirectEncoded()) {
@@ -259,7 +261,7 @@ private DictionaryCompressionProjection selectDictionaryColumnToConvert(int tota
             }
         }
 
-        long totalUncompressedBytesPerRow = totalNonDictionaryBytesPerRow + totalDictionaryRawBytesPerRow;
+        long totalUncompressedBytesPerRow = totalNonDictionaryBytesPerRow + roundToLong(totalDictionaryRawBytesPerRow, HALF_UP);
 
         DictionaryCompressionProjection maxProjectedCompression = null;
         for (DictionaryColumnManager column : directConversionCandidates) {
@@ -294,7 +296,7 @@ private DictionaryCompressionProjection selectDictionaryColumnToConvert(int tota
         return maxProjectedCompression;
     }
 
-    private int getMaxDirectBytes(int bufferedBytes)
+    private int getMaxDirectBytes(long bufferedBytes)
     {
         return toIntExact(Math.min(stripeMaxBytes, stripeMaxBytes - bufferedBytes + DIRECT_COLUMN_SIZE_RANGE.toBytes()));
     }
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/LazySliceInput.java b/lib/trino-orc/src/main/java/io/trino/orc/LazySliceInput.java
index d5996462f69f..2ad74d015e43 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/LazySliceInput.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/LazySliceInput.java
@@ -180,6 +180,36 @@ public void readBytes(byte[] destination, int destinationIndex, int length)
         getDelegate().readBytes(destination, destinationIndex, length);
     }
 
+    @Override
+    public void readShorts(short[] destination, int destinationIndex, int length)
+    {
+        getDelegate().readShorts(destination, destinationIndex, length);
+    }
+
+    @Override
+    public void readInts(int[] destination, int destinationIndex, int length)
+    {
+        getDelegate().readInts(destination, destinationIndex, length);
+    }
+
+    @Override
+    public void readLongs(long[] destination, int destinationIndex, int length)
+    {
+        getDelegate().readLongs(destination, destinationIndex, length);
+    }
+
+    @Override
+    public void readFloats(float[] destination, int destinationIndex, int length)
+    {
+        getDelegate().readFloats(destination, destinationIndex, length);
+    }
+
+    @Override
+    public void readDoubles(double[] destination, int destinationIndex, int length)
+    {
+        getDelegate().readDoubles(destination, destinationIndex, length);
+    }
+
     @Override
     public void readBytes(Slice destination, int destinationIndex, int length)
     {
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/MemoryOrcDataSource.java b/lib/trino-orc/src/main/java/io/trino/orc/MemoryOrcDataSource.java
index a7128eea0c83..56cfe22e5cda 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/MemoryOrcDataSource.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/MemoryOrcDataSource.java
@@ -21,6 +21,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import static java.lang.Math.min;
 import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
@@ -70,7 +71,8 @@ public long getRetainedSize()
     @Override
     public Slice readTail(int length)
     {
-        return readFully(data.length() - length, length);
+        int readSize = min(data.length(), length);
+        return readFully(data.length() - readSize, readSize);
     }
 
     @Override
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/OrcBlockFactory.java b/lib/trino-orc/src/main/java/io/trino/orc/OrcBlockFactory.java
index 0fc875d5b34a..a3f2779f3266 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/OrcBlockFactory.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/OrcBlockFactory.java
@@ -40,9 +40,14 @@ public void nextPage()
         currentPageId++;
     }
 
-    public Block createBlock(int positionCount, OrcBlockReader reader, boolean nested)
+    public LazyBlock createBlock(int positionCount, OrcBlockReader reader, boolean nested)
     {
-        return new LazyBlock(positionCount, new OrcBlockLoader(reader, nested && !nestedLazy));
+        return new LazyBlock(positionCount, createLazyBlockLoader(reader, nested));
+    }
+
+    public LazyBlockLoader createLazyBlockLoader(OrcBlockReader reader, boolean nested)
+    {
+        return new OrcBlockLoader(reader, nested && !nestedLazy);
     }
 
     public interface OrcBlockReader
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/OrcOutputBuffer.java b/lib/trino-orc/src/main/java/io/trino/orc/OrcOutputBuffer.java
index 49177f895928..9e895cf1e2f3 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/OrcOutputBuffer.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/OrcOutputBuffer.java
@@ -23,8 +23,8 @@
 import io.airlift.slice.SliceOutput;
 import io.trino.orc.checkpoint.InputStreamCheckpoint;
 import io.trino.orc.metadata.CompressionKind;
-
-import javax.annotation.Nullable;
+import io.trino.plugin.base.io.ChunkedSliceOutput;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -274,6 +274,66 @@ public void writeBytes(byte[] source, int sourceIndex, int length)
         }
     }
 
+    @Override
+    public void writeShorts(short[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = ensureBatchSize(length * Short.BYTES) / Short.BYTES;
+            slice.setShorts(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Short.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeInts(int[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = ensureBatchSize(length * Integer.BYTES) / Integer.BYTES;
+            slice.setInts(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Integer.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeLongs(long[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = ensureBatchSize(length * Long.BYTES) / Long.BYTES;
+            slice.setLongs(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Long.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeFloats(float[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = ensureBatchSize(length * Float.BYTES) / Float.BYTES;
+            slice.setFloats(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Float.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeDoubles(double[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = ensureBatchSize(length * Double.BYTES) / Double.BYTES;
+            slice.setDoubles(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Double.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
     @Override
     public void writeBytes(InputStream in, int length)
             throws IOException
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/OrcReader.java b/lib/trino-orc/src/main/java/io/trino/orc/OrcReader.java
index bc427024d835..54b0e0ade5f0 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/OrcReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/OrcReader.java
@@ -126,7 +126,7 @@ private OrcReader(
     {
         this.options = requireNonNull(options, "options is null");
         this.orcDataSource = orcDataSource;
-        this.metadataReader = new ExceptionWrappingMetadataReader(orcDataSource.getId(), new OrcMetadataReader());
+        this.metadataReader = new ExceptionWrappingMetadataReader(orcDataSource.getId(), new OrcMetadataReader(options));
 
         this.writeValidation = requireNonNull(writeValidation, "writeValidation is null");
 
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/OrcReaderOptions.java b/lib/trino-orc/src/main/java/io/trino/orc/OrcReaderOptions.java
index e0d5eb7c6326..8d491c025685 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/OrcReaderOptions.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/OrcReaderOptions.java
@@ -28,6 +28,7 @@ public class OrcReaderOptions
     private static final DataSize DEFAULT_MAX_BLOCK_SIZE = DataSize.of(16, MEGABYTE);
     private static final boolean DEFAULT_LAZY_READ_SMALL_RANGES = true;
     private static final boolean DEFAULT_NESTED_LAZY = true;
+    private static final boolean DEFAULT_READ_LEGACY_SHORT_ZONE_ID = false;
 
     private final boolean bloomFiltersEnabled;
 
@@ -38,17 +39,20 @@ public class OrcReaderOptions
     private final DataSize maxBlockSize;
     private final boolean lazyReadSmallRanges;
     private final boolean nestedLazy;
+    private final boolean readLegacyShortZoneId;
 
     public OrcReaderOptions()
     {
-        bloomFiltersEnabled = DEFAULT_BLOOM_FILTERS_ENABLED;
-        maxMergeDistance = DEFAULT_MAX_MERGE_DISTANCE;
-        maxBufferSize = DEFAULT_MAX_BUFFER_SIZE;
-        tinyStripeThreshold = DEFAULT_TINY_STRIPE_THRESHOLD;
-        streamBufferSize = DEFAULT_STREAM_BUFFER_SIZE;
-        maxBlockSize = DEFAULT_MAX_BLOCK_SIZE;
-        lazyReadSmallRanges = DEFAULT_LAZY_READ_SMALL_RANGES;
-        nestedLazy = DEFAULT_NESTED_LAZY;
+        this(
+                DEFAULT_BLOOM_FILTERS_ENABLED,
+                DEFAULT_MAX_MERGE_DISTANCE,
+                DEFAULT_MAX_BUFFER_SIZE,
+                DEFAULT_TINY_STRIPE_THRESHOLD,
+                DEFAULT_STREAM_BUFFER_SIZE,
+                DEFAULT_MAX_BLOCK_SIZE,
+                DEFAULT_LAZY_READ_SMALL_RANGES,
+                DEFAULT_NESTED_LAZY,
+                DEFAULT_READ_LEGACY_SHORT_ZONE_ID);
     }
 
     private OrcReaderOptions(
@@ -59,7 +63,8 @@ private OrcReaderOptions(
             DataSize streamBufferSize,
             DataSize maxBlockSize,
             boolean lazyReadSmallRanges,
-            boolean nestedLazy)
+            boolean nestedLazy,
+            boolean readLegacyShortZoneId)
     {
         this.maxMergeDistance = requireNonNull(maxMergeDistance, "maxMergeDistance is null");
         this.maxBufferSize = requireNonNull(maxBufferSize, "maxBufferSize is null");
@@ -69,6 +74,7 @@ private OrcReaderOptions(
         this.lazyReadSmallRanges = lazyReadSmallRanges;
         this.bloomFiltersEnabled = bloomFiltersEnabled;
         this.nestedLazy = nestedLazy;
+        this.readLegacyShortZoneId = readLegacyShortZoneId;
     }
 
     public boolean isBloomFiltersEnabled()
@@ -111,111 +117,171 @@ public boolean isNestedLazy()
         return nestedLazy;
     }
 
+    public boolean isReadLegacyShortZoneId()
+    {
+        return readLegacyShortZoneId;
+    }
+
     public OrcReaderOptions withBloomFiltersEnabled(boolean bloomFiltersEnabled)
     {
-        return new OrcReaderOptions(
-                bloomFiltersEnabled,
-                maxMergeDistance,
-                maxBufferSize,
-                tinyStripeThreshold,
-                streamBufferSize,
-                maxBlockSize,
-                lazyReadSmallRanges,
-                nestedLazy);
+        return new Builder(this)
+                .withBloomFiltersEnabled(bloomFiltersEnabled)
+                .build();
     }
 
     public OrcReaderOptions withMaxMergeDistance(DataSize maxMergeDistance)
     {
-        return new OrcReaderOptions(
-                bloomFiltersEnabled,
-                maxMergeDistance,
-                maxBufferSize,
-                tinyStripeThreshold,
-                streamBufferSize,
-                maxBlockSize,
-                lazyReadSmallRanges,
-                nestedLazy);
+        return new Builder(this)
+                .withMaxMergeDistance(maxMergeDistance)
+                .build();
     }
 
     public OrcReaderOptions withMaxBufferSize(DataSize maxBufferSize)
     {
-        return new OrcReaderOptions(
-                bloomFiltersEnabled,
-                maxMergeDistance,
-                maxBufferSize,
-                tinyStripeThreshold,
-                streamBufferSize,
-                maxBlockSize,
-                lazyReadSmallRanges,
-                nestedLazy);
+        return new Builder(this)
+                .withMaxBufferSize(maxBufferSize)
+                .build();
     }
 
     public OrcReaderOptions withTinyStripeThreshold(DataSize tinyStripeThreshold)
     {
-        return new OrcReaderOptions(
-                bloomFiltersEnabled,
-                maxMergeDistance,
-                maxBufferSize,
-                tinyStripeThreshold,
-                streamBufferSize,
-                maxBlockSize,
-                lazyReadSmallRanges,
-                nestedLazy);
+        return new Builder(this)
+                .withTinyStripeThreshold(tinyStripeThreshold)
+                .build();
     }
 
     public OrcReaderOptions withStreamBufferSize(DataSize streamBufferSize)
     {
-        return new OrcReaderOptions(
-                bloomFiltersEnabled,
-                maxMergeDistance,
-                maxBufferSize,
-                tinyStripeThreshold,
-                streamBufferSize,
-                maxBlockSize,
-                lazyReadSmallRanges,
-                nestedLazy);
+        return new Builder(this)
+                .withStreamBufferSize(streamBufferSize)
+                .build();
     }
 
     public OrcReaderOptions withMaxReadBlockSize(DataSize maxBlockSize)
     {
-        return new OrcReaderOptions(
-                bloomFiltersEnabled,
-                maxMergeDistance,
-                maxBufferSize,
-                tinyStripeThreshold,
-                streamBufferSize,
-                maxBlockSize,
-                lazyReadSmallRanges,
-                nestedLazy);
+        return new Builder(this)
+                .withMaxBlockSize(maxBlockSize)
+                .build();
     }
 
     // TODO remove config option once efficacy is proven
     @Deprecated
     public OrcReaderOptions withLazyReadSmallRanges(boolean lazyReadSmallRanges)
     {
-        return new OrcReaderOptions(
-                bloomFiltersEnabled,
-                maxMergeDistance,
-                maxBufferSize,
-                tinyStripeThreshold,
-                streamBufferSize,
-                maxBlockSize,
-                lazyReadSmallRanges,
-                nestedLazy);
+        return new Builder(this)
+                .withLazyReadSmallRanges(lazyReadSmallRanges)
+                .build();
     }
 
     // TODO remove config option once efficacy is proven
     @Deprecated
     public OrcReaderOptions withNestedLazy(boolean nestedLazy)
     {
-        return new OrcReaderOptions(
-                bloomFiltersEnabled,
-                maxMergeDistance,
-                maxBufferSize,
-                tinyStripeThreshold,
-                streamBufferSize,
-                maxBlockSize,
-                lazyReadSmallRanges,
-                nestedLazy);
+        return new Builder(this)
+                .withNestedLazy(nestedLazy)
+                .build();
+    }
+
+    @Deprecated
+    public OrcReaderOptions withReadLegacyShortZoneId(boolean readLegacyShortZoneId)
+    {
+        return new Builder(this)
+                .withReadLegacyShortZoneId(readLegacyShortZoneId)
+                .build();
+    }
+
+    private static class Builder
+    {
+        private boolean bloomFiltersEnabled;
+        private DataSize maxMergeDistance;
+        private DataSize maxBufferSize;
+        private DataSize tinyStripeThreshold;
+        private DataSize streamBufferSize;
+        private DataSize maxBlockSize;
+        private boolean lazyReadSmallRanges;
+        private boolean nestedLazy;
+        private boolean readLegacyShortZoneId;
+
+        private Builder(OrcReaderOptions orcReaderOptions)
+        {
+            requireNonNull(orcReaderOptions, "orcReaderOptions is null");
+            this.bloomFiltersEnabled = orcReaderOptions.bloomFiltersEnabled;
+            this.maxMergeDistance = orcReaderOptions.maxMergeDistance;
+            this.maxBufferSize = orcReaderOptions.maxBufferSize;
+            this.tinyStripeThreshold = orcReaderOptions.tinyStripeThreshold;
+            this.streamBufferSize = orcReaderOptions.streamBufferSize;
+            this.maxBlockSize = orcReaderOptions.maxBlockSize;
+            this.lazyReadSmallRanges = orcReaderOptions.lazyReadSmallRanges;
+            this.nestedLazy = orcReaderOptions.nestedLazy;
+            this.readLegacyShortZoneId = orcReaderOptions.readLegacyShortZoneId;
+        }
+
+        public Builder withBloomFiltersEnabled(boolean bloomFiltersEnabled)
+        {
+            this.bloomFiltersEnabled = bloomFiltersEnabled;
+            return this;
+        }
+
+        public Builder withMaxMergeDistance(DataSize maxMergeDistance)
+        {
+            this.maxMergeDistance = requireNonNull(maxMergeDistance, "maxMergeDistance is null");
+            return this;
+        }
+
+        public Builder withMaxBufferSize(DataSize maxBufferSize)
+        {
+            this.maxBufferSize = requireNonNull(maxBufferSize, "maxBufferSize is null");
+            return this;
+        }
+
+        public Builder withTinyStripeThreshold(DataSize tinyStripeThreshold)
+        {
+            this.tinyStripeThreshold = requireNonNull(tinyStripeThreshold, "tinyStripeThreshold is null");
+            return this;
+        }
+
+        public Builder withStreamBufferSize(DataSize streamBufferSize)
+        {
+            this.streamBufferSize = requireNonNull(streamBufferSize, "streamBufferSize is null");
+            return this;
+        }
+
+        public Builder withMaxBlockSize(DataSize maxBlockSize)
+        {
+            this.maxBlockSize = requireNonNull(maxBlockSize, "maxBlockSize is null");
+            return this;
+        }
+
+        public Builder withLazyReadSmallRanges(boolean lazyReadSmallRanges)
+        {
+            this.lazyReadSmallRanges = lazyReadSmallRanges;
+            return this;
+        }
+
+        public Builder withNestedLazy(boolean nestedLazy)
+        {
+            this.nestedLazy = nestedLazy;
+            return this;
+        }
+
+        public Builder withReadLegacyShortZoneId(boolean shortZoneIdEnabled)
+        {
+            this.readLegacyShortZoneId = shortZoneIdEnabled;
+            return this;
+        }
+
+        private OrcReaderOptions build()
+        {
+            return new OrcReaderOptions(
+                    bloomFiltersEnabled,
+                    maxMergeDistance,
+                    maxBufferSize,
+                    tinyStripeThreshold,
+                    streamBufferSize,
+                    maxBlockSize,
+                    lazyReadSmallRanges,
+                    nestedLazy,
+                    readLegacyShortZoneId);
+        }
     }
 }
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/OrcRecordReader.java b/lib/trino-orc/src/main/java/io/trino/orc/OrcRecordReader.java
index 2482667dbd4c..04c7f5737ae7 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/OrcRecordReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/OrcRecordReader.java
@@ -20,7 +20,6 @@
 import com.google.common.collect.Maps;
 import com.google.common.io.Closer;
 import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
 import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.memory.context.LocalMemoryContext;
@@ -237,7 +236,7 @@ public OrcRecordReader(
                 .mapToLong(StripeInformation::getNumberOfRows)
                 .sum();
 
-        this.userMetadata = ImmutableMap.copyOf(Maps.transformValues(userMetadata, Slices::copyOf));
+        this.userMetadata = ImmutableMap.copyOf(Maps.transformValues(userMetadata, Slice::copy));
 
         this.currentStripeMemoryContext = this.memoryUsage.newAggregatedMemoryContext();
         // The streamReadersMemoryContext covers the StreamReader local buffer sizes, plus leaf node StreamReaders'
@@ -479,7 +478,7 @@ private void blockLoaded(int columnIndex, Block block)
 
     public Map<String, Slice> getUserMetadata()
     {
-        return ImmutableMap.copyOf(Maps.transformValues(userMetadata, Slices::copyOf));
+        return ImmutableMap.copyOf(Maps.transformValues(userMetadata, Slice::copy));
     }
 
     private boolean advanceToNextRowGroup()
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/OrcWriteValidation.java b/lib/trino-orc/src/main/java/io/trino/orc/OrcWriteValidation.java
index 2a721fdef7e0..a86292c4d579 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/OrcWriteValidation.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/OrcWriteValidation.java
@@ -41,12 +41,13 @@
 import io.trino.orc.metadata.statistics.StringStatistics;
 import io.trino.orc.metadata.statistics.StringStatisticsBuilder;
 import io.trino.orc.metadata.statistics.StripeStatistics;
+import io.trino.orc.metadata.statistics.TimeMicrosStatisticsBuilder;
 import io.trino.orc.metadata.statistics.TimestampStatisticsBuilder;
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.ColumnarMap;
-import io.trino.spi.block.ColumnarRow;
+import io.trino.spi.block.RowBlock;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
@@ -93,6 +94,7 @@
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TimeType.TIME_MICROS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
@@ -628,6 +630,11 @@ else if (VARBINARY.equals(type) || UUID.equals(type)) {
                 fieldExtractor = ignored -> ImmutableList.of();
                 fieldBuilders = ImmutableList.of();
             }
+            else if (TIME_MICROS.equals(type)) {
+                statisticsBuilder = new TimeMicrosStatisticsBuilder(new NoOpBloomFilterBuilder());
+                fieldExtractor = ignored -> ImmutableList.of();
+                fieldBuilders = ImmutableList.of();
+            }
             else if (DATE.equals(type)) {
                 statisticsBuilder = new DateStatisticsBuilder(new NoOpBloomFilterBuilder());
                 fieldExtractor = ignored -> ImmutableList.of();
@@ -680,14 +687,7 @@ else if (type instanceof MapType) {
             }
             else if (type instanceof RowType) {
                 statisticsBuilder = new CountStatisticsBuilder();
-                fieldExtractor = block -> {
-                    ColumnarRow columnarRow = ColumnarRow.toColumnarRow(block);
-                    ImmutableList.Builder<Block> fields = ImmutableList.builder();
-                    for (int index = 0; index < columnarRow.getFieldCount(); index++) {
-                        fields.add(columnarRow.getField(index));
-                    }
-                    return fields.build();
-                };
+                fieldExtractor = block -> RowBlock.getRowFieldsFromBlock(block.getLoadedBlock());
                 fieldBuilders = type.getTypeParameters().stream()
                         .map(ColumnStatisticsValidation::new)
                         .collect(toImmutableList());
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/OrcWriter.java b/lib/trino-orc/src/main/java/io/trino/orc/OrcWriter.java
index f77c15d6a822..f7fd479a3929 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/OrcWriter.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/OrcWriter.java
@@ -44,8 +44,7 @@
 import io.trino.orc.writer.SliceDictionaryColumnWriter;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -115,7 +114,7 @@ public final class OrcWriter
     private final DictionaryCompressionOptimizer dictionaryCompressionOptimizer;
     private int stripeRowCount;
     private int rowGroupRowCount;
-    private int bufferedBytes;
+    private long bufferedBytes;
     private long columnWritersRetainedBytes;
     private long closedStripesRetainedBytes;
     private long previouslyRecordedSizeInBytes;
@@ -225,7 +224,7 @@ public long getWrittenBytes()
     /**
      * Number of pending bytes not yet flushed.
      */
-    public int getBufferedBytes()
+    public long getBufferedBytes()
     {
         return bufferedBytes;
     }
@@ -259,26 +258,19 @@ public void write(Page page)
             validationBuilder.addPage(page);
         }
 
-        while (page != null) {
+        int writeOffset = 0;
+        while (writeOffset < page.getPositionCount()) {
             // align page to row group boundaries
-            int chunkRows = min(page.getPositionCount(), min(rowGroupMaxRowCount - rowGroupRowCount, stripeMaxRowCount - stripeRowCount));
-            Page chunk = page.getRegion(0, chunkRows);
+            Page chunk = page.getRegion(writeOffset, min(page.getPositionCount() - writeOffset, min(rowGroupMaxRowCount - rowGroupRowCount, stripeMaxRowCount - stripeRowCount)));
 
             // avoid chunk with huge logical size
-            while (chunkRows > 1 && chunk.getLogicalSizeInBytes() > chunkMaxLogicalBytes) {
-                chunkRows /= 2;
-                chunk = chunk.getRegion(0, chunkRows);
-            }
-
-            if (chunkRows < page.getPositionCount()) {
-                page = page.getRegion(chunkRows, page.getPositionCount() - chunkRows);
-            }
-            else {
-                page = null;
+            while (chunk.getPositionCount() > 1 && chunk.getLogicalSizeInBytes() > chunkMaxLogicalBytes) {
+                chunk = chunk.getRegion(writeOffset, chunk.getPositionCount() / 2);
             }
 
+            writeOffset += chunk.getPositionCount();
             writeChunk(chunk);
-            fileRowCount += chunkRows;
+            fileRowCount += chunk.getPositionCount();
         }
 
         long recordedSizeInBytes = getRetainedBytes();
@@ -384,7 +376,7 @@ private List<OrcDataOutput> bufferStripeData(long stripeStartOffset, FlushReason
         }
 
         // convert any dictionary encoded column with a low compression ratio to direct
-        dictionaryCompressionOptimizer.finalOptimize(bufferedBytes);
+        dictionaryCompressionOptimizer.finalOptimize(toIntExact(bufferedBytes));
 
         columnWriters.forEach(ColumnWriter::close);
 
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/StripeReader.java b/lib/trino-orc/src/main/java/io/trino/orc/StripeReader.java
index 068d554eaf5c..fca542ed9336 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/StripeReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/StripeReader.java
@@ -407,18 +407,11 @@ private Map<OrcColumnId, List<BloomFilter>> readBloomFilterIndexes(Map<StreamId,
         HashMap<OrcColumnId, List<BloomFilter>> bloomFilters = new HashMap<>();
         for (Entry<StreamId, Stream> entry : streams.entrySet()) {
             Stream stream = entry.getValue();
-            if (stream.getStreamKind() == BLOOM_FILTER_UTF8) {
+            if (stream.getStreamKind() == BLOOM_FILTER_UTF8 || stream.getStreamKind() == BLOOM_FILTER && !bloomFilters.containsKey(stream.getColumnId())) {
                 OrcInputStream inputStream = new OrcInputStream(streamsData.get(entry.getKey()));
                 bloomFilters.put(stream.getColumnId(), metadataReader.readBloomFilterIndexes(inputStream));
             }
         }
-        for (Entry<StreamId, Stream> entry : streams.entrySet()) {
-            Stream stream = entry.getValue();
-            if (stream.getStreamKind() == BLOOM_FILTER && !bloomFilters.containsKey(stream.getColumnId())) {
-                OrcInputStream inputStream = new OrcInputStream(streamsData.get(entry.getKey()));
-                bloomFilters.put(entry.getKey().getColumnId(), metadataReader.readBloomFilterIndexes(inputStream));
-            }
-        }
         return ImmutableMap.copyOf(bloomFilters);
     }
 
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/TupleDomainOrcPredicate.java b/lib/trino-orc/src/main/java/io/trino/orc/TupleDomainOrcPredicate.java
index af359088658a..7f8e1465178b 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/TupleDomainOrcPredicate.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/TupleDomainOrcPredicate.java
@@ -298,7 +298,7 @@ else if (REAL.equals(type) && columnStatistics.getDoubleStatistics() != null) {
 
     private static <T extends Comparable<T>> Domain createDomain(Type type, boolean hasNullValue, RangeStatistics<T> rangeStatistics)
     {
-        return createDomain(type, hasNullValue, rangeStatistics, value -> value);
+        return createDomain(type, hasNullValue, rangeStatistics, Function.identity());
     }
 
     private static <F, T extends Comparable<T>> Domain createDomain(Type type, boolean hasNullValue, RangeStatistics<F> rangeStatistics, Function<F, T> function)
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/ValidationHash.java b/lib/trino-orc/src/main/java/io/trino/orc/ValidationHash.java
index 6af3bdcd984b..7b30700b5c37 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/ValidationHash.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/ValidationHash.java
@@ -14,9 +14,14 @@
 package io.trino.orc;
 
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.InvocationConvention;
 import io.trino.spi.type.AbstractLongType;
-import io.trino.spi.type.StandardTypes;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 
@@ -24,11 +29,8 @@
 import java.lang.invoke.MethodType;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.type.StandardTypes.ARRAY;
-import static io.trino.spi.type.StandardTypes.MAP;
-import static io.trino.spi.type.StandardTypes.ROW;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
 import static java.lang.invoke.MethodHandles.lookup;
 import static java.util.Objects.requireNonNull;
@@ -48,15 +50,15 @@ class ValidationHash
             MAP_HASH = lookup().findStatic(
                     ValidationHash.class,
                     "mapSkipNullKeysHash",
-                    MethodType.methodType(long.class, Type.class, ValidationHash.class, ValidationHash.class, Block.class, int.class));
+                    MethodType.methodType(long.class, MapType.class, ValidationHash.class, ValidationHash.class, Block.class, int.class));
             ARRAY_HASH = lookup().findStatic(
                     ValidationHash.class,
                     "arrayHash",
-                    MethodType.methodType(long.class, Type.class, ValidationHash.class, Block.class, int.class));
+                    MethodType.methodType(long.class, ArrayType.class, ValidationHash.class, Block.class, int.class));
             ROW_HASH = lookup().findStatic(
                     ValidationHash.class,
                     "rowHash",
-                    MethodType.methodType(long.class, Type.class, ValidationHash[].class, Block.class, int.class));
+                    MethodType.methodType(long.class, RowType.class, ValidationHash[].class, Block.class, int.class));
             TIMESTAMP_HASH = lookup().findStatic(
                     ValidationHash.class,
                     "timestampHash",
@@ -67,35 +69,35 @@ class ValidationHash
         }
     }
 
-    // This should really come from the environment, but there is not good way to get a value here
+    // This should really come from the environment, but there is no good way to get a value here
     private static final TypeOperators VALIDATION_TYPE_OPERATORS_CACHE = new TypeOperators();
 
     public static ValidationHash createValidationHash(Type type)
     {
         requireNonNull(type, "type is null");
-        if (type.getTypeSignature().getBase().equals(MAP)) {
-            ValidationHash keyHash = createValidationHash(type.getTypeParameters().get(0));
-            ValidationHash valueHash = createValidationHash(type.getTypeParameters().get(1));
-            return new ValidationHash(MAP_HASH.bindTo(type).bindTo(keyHash).bindTo(valueHash));
+        if (type instanceof MapType mapType) {
+            ValidationHash keyHash = createValidationHash(mapType.getKeyType());
+            ValidationHash valueHash = createValidationHash(mapType.getValueType());
+            return new ValidationHash(MAP_HASH.bindTo(mapType).bindTo(keyHash).bindTo(valueHash));
         }
 
-        if (type.getTypeSignature().getBase().equals(ARRAY)) {
-            ValidationHash elementHash = createValidationHash(type.getTypeParameters().get(0));
-            return new ValidationHash(ARRAY_HASH.bindTo(type).bindTo(elementHash));
+        if (type instanceof ArrayType arrayType) {
+            ValidationHash elementHash = createValidationHash(arrayType.getElementType());
+            return new ValidationHash(ARRAY_HASH.bindTo(arrayType).bindTo(elementHash));
         }
 
-        if (type.getTypeSignature().getBase().equals(ROW)) {
+        if (type instanceof RowType rowType) {
             ValidationHash[] fieldHashes = type.getTypeParameters().stream()
                     .map(ValidationHash::createValidationHash)
                     .toArray(ValidationHash[]::new);
-            return new ValidationHash(ROW_HASH.bindTo(type).bindTo(fieldHashes));
+            return new ValidationHash(ROW_HASH.bindTo(rowType).bindTo(fieldHashes));
         }
 
-        if (type.getTypeSignature().getBase().equals(StandardTypes.TIMESTAMP)) {
+        if (type instanceof TimestampType timestampType && timestampType.isShort()) {
             return new ValidationHash(TIMESTAMP_HASH);
         }
 
-        return new ValidationHash(VALIDATION_TYPE_OPERATORS_CACHE.getHashCodeOperator(type, InvocationConvention.simpleConvention(FAIL_ON_NULL, BLOCK_POSITION)));
+        return new ValidationHash(VALIDATION_TYPE_OPERATORS_CACHE.getHashCodeOperator(type, InvocationConvention.simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)));
     }
 
     private final MethodHandle hashCodeOperator;
@@ -119,21 +121,25 @@ public long hash(Block block, int position)
         }
     }
 
-    private static long mapSkipNullKeysHash(Type type, ValidationHash keyHash, ValidationHash valueHash, Block block, int position)
+    private static long mapSkipNullKeysHash(MapType type, ValidationHash keyHash, ValidationHash valueHash, Block block, int position)
     {
-        Block mapBlock = (Block) type.getObject(block, position);
+        SqlMap sqlMap = type.getObject(block, position);
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
         long hash = 0;
-        for (int i = 0; i < mapBlock.getPositionCount(); i += 2) {
-            if (!mapBlock.isNull(i)) {
-                hash += keyHash.hash(mapBlock, i) ^ valueHash.hash(mapBlock, i + 1);
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            if (!rawKeyBlock.isNull(rawOffset + i)) {
+                hash += keyHash.hash(rawKeyBlock, rawOffset + i) ^ valueHash.hash(rawValueBlock, rawOffset + i);
             }
         }
         return hash;
     }
 
-    private static long arrayHash(Type type, ValidationHash elementHash, Block block, int position)
+    private static long arrayHash(ArrayType type, ValidationHash elementHash, Block block, int position)
     {
-        Block array = (Block) type.getObject(block, position);
+        Block array = type.getObject(block, position);
         long hash = 0;
         for (int i = 0; i < array.getPositionCount(); i++) {
             hash = 31 * hash + elementHash.hash(array, i);
@@ -141,12 +147,13 @@ private static long arrayHash(Type type, ValidationHash elementHash, Block block
         return hash;
     }
 
-    private static long rowHash(Type type, ValidationHash[] fieldHashes, Block block, int position)
+    private static long rowHash(RowType type, ValidationHash[] fieldHashes, Block block, int position)
     {
-        Block row = (Block) type.getObject(block, position);
+        SqlRow row = type.getObject(block, position);
+        int rawIndex = row.getRawIndex();
         long hash = 0;
-        for (int i = 0; i < row.getPositionCount(); i++) {
-            hash = 31 * hash + fieldHashes[i].hash(row, i);
+        for (int i = 0; i < row.getFieldCount(); i++) {
+            hash = 31 * hash + fieldHashes[i].hash(row.getRawFieldBlock(i), rawIndex);
         }
         return hash;
     }
@@ -155,7 +162,7 @@ private static long timestampHash(Block block, int position)
     {
         // A flaw in ORC encoding makes it impossible to represent timestamp
         // between 1969-12-31 23:59:59.000, exclusive, and 1970-01-01 00:00:00.000, exclusive.
-        // Therefore, such data won't round trip. The data read back is expected to be 1 second later than the original value.
+        // Therefore, such data won't roundtrip. The data read back is expected to be 1 second later than the original value.
         long millis = TIMESTAMP_MILLIS.getLong(block, position);
         if (millis > -1000 && millis < 0) {
             millis += 1000;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/metadata/Footer.java b/lib/trino-orc/src/main/java/io/trino/orc/metadata/Footer.java
index 7d8453f0b6a3..b1d2daf22ee3 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/metadata/Footer.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/metadata/Footer.java
@@ -16,7 +16,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
 import io.trino.orc.metadata.statistics.ColumnStatistics;
 
 import java.util.List;
@@ -55,7 +54,7 @@ public Footer(
         this.types = requireNonNull(types, "types is null");
         this.fileStats = requireNonNull(fileStats, "fileStats is null");
         requireNonNull(userMetadata, "userMetadata is null");
-        this.userMetadata = ImmutableMap.copyOf(transformValues(userMetadata, Slices::copyOf));
+        this.userMetadata = ImmutableMap.copyOf(transformValues(userMetadata, Slice::copy));
         this.writerId = requireNonNull(writerId, "writerId is null");
     }
 
@@ -86,7 +85,7 @@ public Optional<ColumnMetadata<ColumnStatistics>> getFileStats()
 
     public Map<String, Slice> getUserMetadata()
     {
-        return ImmutableMap.copyOf(transformValues(userMetadata, Slices::copyOf));
+        return ImmutableMap.copyOf(transformValues(userMetadata, Slice::copy));
     }
 
     public Optional<Integer> getWriterId()
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcMetadataReader.java b/lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcMetadataReader.java
index e5d99c35e2eb..f4cee1cf0be0 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcMetadataReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcMetadataReader.java
@@ -16,10 +16,10 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.primitives.Longs;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
+import io.trino.orc.OrcReaderOptions;
 import io.trino.orc.metadata.ColumnEncoding.ColumnEncodingKind;
 import io.trino.orc.metadata.OrcType.OrcTypeKind;
 import io.trino.orc.metadata.PostScript.HiveWriterVersion;
@@ -74,6 +74,7 @@
 import static io.trino.orc.metadata.statistics.TimestampStatistics.TIMESTAMP_VALUE_BYTES;
 import static java.lang.Character.MIN_SUPPLEMENTARY_CODE_POINT;
 import static java.lang.Math.toIntExact;
+import static java.util.Objects.requireNonNull;
 
 public class OrcMetadataReader
         implements MetadataReader
@@ -81,6 +82,13 @@ public class OrcMetadataReader
     private static final int REPLACEMENT_CHARACTER_CODE_POINT = 0xFFFD;
     private static final int PROTOBUF_MESSAGE_MAX_LIMIT = toIntExact(DataSize.of(1, GIGABYTE).toBytes());
 
+    private final OrcReaderOptions orcReaderOptions;
+
+    public OrcMetadataReader(OrcReaderOptions orcReaderOptions)
+    {
+        this.orcReaderOptions = requireNonNull(orcReaderOptions, "orcReaderOptions is null");
+    }
+
     @Override
     public PostScript readPostScript(InputStream inputStream)
             throws IOException
@@ -172,7 +180,10 @@ public StripeFooter readStripeFooter(ColumnMetadata<OrcType> types, InputStream
                 toStream(stripeFooter.getStreamsList()),
                 toColumnEncoding(stripeFooter.getColumnsList()),
                 Optional.ofNullable(emptyToNull(stripeFooter.getWriterTimezone()))
-                        .map(ZoneId::of)
+                        .map(zoneId ->
+                                orcReaderOptions.isReadLegacyShortZoneId()
+                                        ? ZoneId.of(zoneId, ZoneId.SHORT_IDS)
+                                        : ZoneId.of(zoneId))
                         .orElse(legacyFileTimeZone));
     }
 
@@ -227,7 +238,12 @@ public List<BloomFilter> readBloomFilterIndexes(InputStream inputStream)
                 builder.add(new BloomFilter(bits, orcBloomFilter.getNumHashFunctions()));
             }
             else {
-                builder.add(new BloomFilter(Longs.toArray(orcBloomFilter.getBitsetList()), orcBloomFilter.getNumHashFunctions()));
+                int length = orcBloomFilter.getBitsetCount();
+                long[] bits = new long[length];
+                for (int i = 0; i < length; i++) {
+                    bits[i] = orcBloomFilter.getBitset(i);
+                }
+                builder.add(new BloomFilter(bits, orcBloomFilter.getNumHashFunctions()));
             }
         }
         return builder.build();
@@ -414,7 +430,7 @@ public static Slice maxStringTruncateToValidRange(Slice value, HiveWriterVersion
             return value;
         }
         // Append 0xFF so that it is larger than value
-        Slice newValue = Slices.copyOf(value, 0, index + 1);
+        Slice newValue = value.copy(0, index + 1);
         newValue.setByte(index, 0xFF);
         return newValue;
     }
@@ -434,7 +450,7 @@ public static Slice minStringTruncateToValidRange(Slice value, HiveWriterVersion
         if (index == value.length()) {
             return value;
         }
-        return Slices.copyOf(value, 0, index);
+        return value.copy(0, index);
     }
 
     @VisibleForTesting
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcType.java b/lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcType.java
index af6f96ca65cc..281ae81abc39 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcType.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcType.java
@@ -13,7 +13,6 @@
  */
 package io.trino.orc.metadata;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.trino.spi.TrinoException;
@@ -291,7 +290,6 @@ public static ColumnMetadata<OrcType> createRootOrcType(List<String> fieldNames,
         return createRootOrcType(fieldNames, fieldTypes, Optional.empty());
     }
 
-    @VisibleForTesting
     public static ColumnMetadata<OrcType> createRootOrcType(List<String> fieldNames, List<Type> fieldTypes, Optional<Function<Type, Optional<OrcType>>> additionalTypeMapping)
     {
         return new ColumnMetadata<>(createOrcRowType(0, fieldNames, fieldTypes, additionalTypeMapping));
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/BloomFilter.java b/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/BloomFilter.java
index e2521a8985df..480d09aa1d8e 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/BloomFilter.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/BloomFilter.java
@@ -14,9 +14,9 @@
 package io.trino.orc.metadata.statistics;
 
 import com.google.common.annotations.VisibleForTesting;
-import io.airlift.slice.ByteArrays;
 import io.airlift.slice.Slice;
-import io.airlift.slice.UnsafeSlice;
+
+import java.lang.invoke.VarHandle;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
@@ -24,6 +24,8 @@
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static java.lang.Double.doubleToLongBits;
+import static java.lang.invoke.MethodHandles.byteArrayViewVarHandle;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
 
 /**
  * BloomFilter is a probabilistic data structure for set membership check. BloomFilters are
@@ -50,6 +52,8 @@ public class BloomFilter
 {
     private static final int INSTANCE_SIZE = instanceSize(BloomFilter.class) + instanceSize(BitSet.class);
 
+    private static final VarHandle LONG_ARRAY_HANDLE = byteArrayViewVarHandle(long[].class, LITTLE_ENDIAN);
+
     // from 64-bit linear congruential generator
     private static final long NULL_HASHCODE = 2862933555777941757L;
 
@@ -344,7 +348,7 @@ public static long hash64(byte[] data)
             // body
             int current = 0;
             while (current < fastLimit) {
-                long k = ByteArrays.getLong(data, current);
+                long k = (long) LONG_ARRAY_HANDLE.get(data, current);
                 current += SIZE_OF_LONG;
 
                 // mix functions
@@ -394,7 +398,7 @@ public static long hash64(Slice data)
             // body
             int current = 0;
             while (current < fastLimit) {
-                long k = UnsafeSlice.getLongUnchecked(data, current);
+                long k = data.getLongUnchecked(current);
                 current += SIZE_OF_LONG;
 
                 // mix functions
@@ -409,19 +413,19 @@ public static long hash64(Slice data)
             long k = 0;
             switch (data.length() - current) {
                 case 7:
-                    k ^= ((long) UnsafeSlice.getByteUnchecked(data, current + 6) & 0xff) << 48;
+                    k ^= ((long) data.getByteUnchecked(current + 6) & 0xff) << 48;
                 case 6:
-                    k ^= ((long) UnsafeSlice.getByteUnchecked(data, current + 5) & 0xff) << 40;
+                    k ^= ((long) data.getByteUnchecked(current + 5) & 0xff) << 40;
                 case 5:
-                    k ^= ((long) UnsafeSlice.getByteUnchecked(data, current + 4) & 0xff) << 32;
+                    k ^= ((long) data.getByteUnchecked(current + 4) & 0xff) << 32;
                 case 4:
-                    k ^= ((long) UnsafeSlice.getByteUnchecked(data, current + 3) & 0xff) << 24;
+                    k ^= ((long) data.getByteUnchecked(current + 3) & 0xff) << 24;
                 case 3:
-                    k ^= ((long) UnsafeSlice.getByteUnchecked(data, current + 2) & 0xff) << 16;
+                    k ^= ((long) data.getByteUnchecked(current + 2) & 0xff) << 16;
                 case 2:
-                    k ^= ((long) UnsafeSlice.getByteUnchecked(data, current + 1) & 0xff) << 8;
+                    k ^= ((long) data.getByteUnchecked(current + 1) & 0xff) << 8;
                 case 1:
-                    k ^= ((long) UnsafeSlice.getByteUnchecked(data, current) & 0xff);
+                    k ^= ((long) data.getByteUnchecked(current) & 0xff);
                     k *= C1;
                     k = Long.rotateLeft(k, R1);
                     k *= C2;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/StringStatistics.java b/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/StringStatistics.java
index 7f9e067aff43..ae87182858bf 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/StringStatistics.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/StringStatistics.java
@@ -15,8 +15,7 @@
 
 import io.airlift.slice.Slice;
 import io.trino.orc.metadata.statistics.StatisticsHasher.Hashable;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/StringStatisticsBuilder.java b/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/StringStatisticsBuilder.java
index 320eab940e9e..3be027ad1a32 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/StringStatisticsBuilder.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/StringStatisticsBuilder.java
@@ -194,7 +194,7 @@ private Slice computeStringMinMax(Slice minOrMax, boolean isMin)
         if (minOrMax.isCompact()) {
             return minOrMax;
         }
-        return Slices.copyOf(minOrMax);
+        return minOrMax.copy();
     }
 
     static final class StringCompactor
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/TimeMicrosStatisticsBuilder.java b/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/TimeMicrosStatisticsBuilder.java
new file mode 100644
index 000000000000..5f2fb15325c4
--- /dev/null
+++ b/lib/trino-orc/src/main/java/io/trino/orc/metadata/statistics/TimeMicrosStatisticsBuilder.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed 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 io.trino.orc.metadata.statistics;
+
+import io.trino.spi.block.Block;
+import io.trino.spi.type.Type;
+
+import java.util.Optional;
+
+import static io.trino.orc.metadata.statistics.IntegerStatistics.INTEGER_VALUE_BYTES;
+import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MICROSECOND;
+import static java.lang.Math.addExact;
+import static java.util.Objects.requireNonNull;
+
+public class TimeMicrosStatisticsBuilder
+        implements LongValueStatisticsBuilder
+{
+    private long nonNullValueCount;
+    private long minimum = Long.MAX_VALUE;
+    private long maximum = Long.MIN_VALUE;
+    private long sum;
+    private boolean overflow;
+
+    private final BloomFilterBuilder bloomFilterBuilder;
+
+    public TimeMicrosStatisticsBuilder(BloomFilterBuilder bloomFilterBuilder)
+    {
+        this.bloomFilterBuilder = requireNonNull(bloomFilterBuilder, "bloomFilterBuilder is null");
+    }
+
+    @Override
+    public long getValueFromBlock(Type type, Block block, int position)
+    {
+        return type.getLong(block, position) / PICOSECONDS_PER_MICROSECOND;
+    }
+
+    @Override
+    public void addValue(long value)
+    {
+        nonNullValueCount++;
+
+        minimum = Math.min(value, minimum);
+        maximum = Math.max(value, maximum);
+
+        if (!overflow) {
+            try {
+                sum = addExact(sum, value);
+            }
+            catch (ArithmeticException e) {
+                overflow = true;
+            }
+        }
+        bloomFilterBuilder.addLong(value);
+    }
+
+    private Optional<IntegerStatistics> buildIntegerStatistics()
+    {
+        if (nonNullValueCount == 0) {
+            return Optional.empty();
+        }
+        return Optional.of(new IntegerStatistics(minimum, maximum, overflow ? null : sum));
+    }
+
+    @Override
+    public ColumnStatistics buildColumnStatistics()
+    {
+        Optional<IntegerStatistics> integerStatistics = buildIntegerStatistics();
+        return new ColumnStatistics(
+                nonNullValueCount,
+                integerStatistics.map(s -> INTEGER_VALUE_BYTES).orElse(0L),
+                null,
+                integerStatistics.orElse(null),
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                bloomFilterBuilder.buildBloomFilter());
+    }
+}
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/BooleanColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/BooleanColumnReader.java
index 14ba6cc6abb3..af396c2838f4 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/BooleanColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/BooleanColumnReader.java
@@ -26,8 +26,7 @@
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.BooleanType;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.time.ZoneId;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/ByteColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/ByteColumnReader.java
index ae2160d36c5b..052b8ecf440c 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/ByteColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/ByteColumnReader.java
@@ -27,8 +27,7 @@
 import io.trino.spi.block.IntArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.time.ZoneId;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/ColumnReaders.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/ColumnReaders.java
index 63b9205a3b70..27550fe1ce6c 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/ColumnReaders.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/ColumnReaders.java
@@ -33,6 +33,7 @@
 public final class ColumnReaders
 {
     public static final String ICEBERG_BINARY_TYPE = "iceberg.binary-type";
+    public static final String ICEBERG_LONG_TYPE = "iceberg.long-type";
 
     private ColumnReaders() {}
 
@@ -47,7 +48,7 @@ public static ColumnReader createColumnReader(
     {
         if (type instanceof TimeType) {
             if (!type.equals(TIME_MICROS) || column.getColumnType() != LONG ||
-                    !"TIME".equals(column.getAttributes().get("iceberg.long-type"))) {
+                    !"TIME".equals(column.getAttributes().get(ICEBERG_LONG_TYPE))) {
                 throw invalidStreamType(column, type);
             }
             return new TimeColumnReader(type, column, memoryContext.newLocalMemoryContext(ColumnReaders.class.getSimpleName()));
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/DecimalColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/DecimalColumnReader.java
index 82a0630d1fea..4f3d8cde5403 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/DecimalColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/DecimalColumnReader.java
@@ -31,8 +31,7 @@
 import io.trino.spi.type.Decimals;
 import io.trino.spi.type.Int128Math;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.time.ZoneId;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/DoubleColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/DoubleColumnReader.java
index e03f09ce7a1c..cdae9c2bb4eb 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/DoubleColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/DoubleColumnReader.java
@@ -27,8 +27,7 @@
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.DoubleType;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.time.ZoneId;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/FloatColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/FloatColumnReader.java
index 5e3de784dc11..2371a5cd6d49 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/FloatColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/FloatColumnReader.java
@@ -27,8 +27,7 @@
 import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.time.ZoneId;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/ListColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/ListColumnReader.java
index c190e3fbcbe4..0448bdb72eb2 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/ListColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/ListColumnReader.java
@@ -29,8 +29,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/LongColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/LongColumnReader.java
index 3564af17ab96..0d59a7e1b5f9 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/LongColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/LongColumnReader.java
@@ -33,8 +33,7 @@
 import io.trino.spi.type.SmallintType;
 import io.trino.spi.type.TimeType;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.time.ZoneId;
@@ -189,6 +188,9 @@ private Block readNullBlock(boolean[] isNull, int nonNullCount)
         if (type instanceof BigintType) {
             return longReadNullBlock(isNull, nonNullCount);
         }
+        if (type instanceof TimeType) {
+            return longReadNullBlock(isNull, nonNullCount);
+        }
         if (type instanceof IntegerType || type instanceof DateType) {
             return intReadNullBlock(isNull, nonNullCount);
         }
@@ -210,6 +212,7 @@ private Block longReadNullBlock(boolean[] isNull, int nonNullCount)
 
         dataStream.next(longNonNullValueTemp, nonNullCount);
 
+        maybeTransformValues(longNonNullValueTemp, nonNullCount);
         long[] result = unpackLongNulls(longNonNullValueTemp, isNull);
 
         return new LongArrayBlock(nextBatchSize, Optional.of(isNull), result);
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/MapColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/MapColumnReader.java
index 2cdc1348d3b1..e9663a3bd8dd 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/MapColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/MapColumnReader.java
@@ -29,9 +29,8 @@
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.Type;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/ReaderUtils.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/ReaderUtils.java
index 31c4800cdf69..7f71af8385ab 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/ReaderUtils.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/ReaderUtils.java
@@ -15,11 +15,14 @@
 
 import io.trino.orc.OrcColumn;
 import io.trino.orc.OrcCorruptionException;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.DictionaryBlock;
 import io.trino.spi.type.Type;
 
 import java.util.function.Predicate;
 
 import static java.lang.Math.max;
+import static java.util.Objects.requireNonNull;
 
 final class ReaderUtils
 {
@@ -147,4 +150,41 @@ public static void convertLengthVectorToOffsetVector(int[] vector)
             currentLength = nextLength;
         }
     }
+
+    static Block toNotNullSupressedBlock(int positionCount, boolean[] rowIsNull, Block fieldBlock)
+    {
+        requireNonNull(rowIsNull, "rowIsNull is null");
+        requireNonNull(fieldBlock, "fieldBlock is null");
+
+        // find an existing position in the block that is null
+        int nullIndex = -1;
+        if (fieldBlock.mayHaveNull()) {
+            for (int position = 0; position < fieldBlock.getPositionCount(); position++) {
+                if (fieldBlock.isNull(position)) {
+                    nullIndex = position;
+                    break;
+                }
+            }
+        }
+        // if there are no null positions, append a null to the end of the block
+        if (nullIndex == -1) {
+            fieldBlock = fieldBlock.getLoadedBlock();
+            nullIndex = fieldBlock.getPositionCount();
+            fieldBlock = fieldBlock.copyWithAppendedNull();
+        }
+
+        // create a dictionary that maps null positions to the null index
+        int[] dictionaryIds = new int[positionCount];
+        int nullSuppressedPosition = 0;
+        for (int position = 0; position < positionCount; position++) {
+            if (rowIsNull[position]) {
+                dictionaryIds[position] = nullIndex;
+            }
+            else {
+                dictionaryIds[position] = nullSuppressedPosition;
+                nullSuppressedPosition++;
+            }
+        }
+        return DictionaryBlock.create(positionCount, fieldBlock, dictionaryIds);
+    }
 }
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/SliceDictionaryColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/SliceDictionaryColumnReader.java
index 88ef25c53142..b9859eb79336 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/SliceDictionaryColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/SliceDictionaryColumnReader.java
@@ -28,8 +28,7 @@
 import io.trino.spi.block.DictionaryBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.block.VariableWidthBlock;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.time.ZoneId;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/SliceDirectColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/SliceDirectColumnReader.java
index 6974cadbda07..cda63c3a9b3a 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/SliceDirectColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/SliceDirectColumnReader.java
@@ -29,8 +29,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.block.VariableWidthBlock;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.time.ZoneId;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/StructColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/StructColumnReader.java
index dadd0d39a650..06ae21600145 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/StructColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/StructColumnReader.java
@@ -29,13 +29,14 @@
 import io.trino.orc.stream.InputStreamSource;
 import io.trino.orc.stream.InputStreamSources;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.LazyBlock;
+import io.trino.spi.block.LazyBlockLoader;
 import io.trino.spi.block.RowBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.RowType.Field;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -50,6 +51,7 @@
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.orc.metadata.Stream.StreamKind.PRESENT;
 import static io.trino.orc.reader.ColumnReaders.createColumnReader;
+import static io.trino.orc.reader.ReaderUtils.toNotNullSupressedBlock;
 import static io.trino.orc.reader.ReaderUtils.verifyStreamType;
 import static io.trino.orc.stream.MissingInputStreamSource.missingStreamSource;
 import static java.util.Locale.ENGLISH;
@@ -152,19 +154,19 @@ public Block readBlock()
         Block[] blocks;
 
         if (presentStream == null) {
-            blocks = getBlocksForType(nextBatchSize);
+            blocks = getBlocks(nextBatchSize, nextBatchSize, null);
         }
         else {
             nullVector = new boolean[nextBatchSize];
             int nullValues = presentStream.getUnsetBits(nextBatchSize, nullVector);
             if (nullValues != nextBatchSize) {
-                blocks = getBlocksForType(nextBatchSize - nullValues);
+                blocks = getBlocks(nextBatchSize, nextBatchSize - nullValues, nullVector);
             }
             else {
                 List<Type> typeParameters = type.getTypeParameters();
                 blocks = new Block[typeParameters.size()];
                 for (int i = 0; i < typeParameters.size(); i++) {
-                    blocks[i] = typeParameters.get(i).createBlockBuilder(null, 0).build();
+                    blocks[i] = RunLengthEncodedBlock.create(typeParameters.get(i).createBlockBuilder(null, 0).appendNull().build(), nextBatchSize);
                 }
             }
         }
@@ -175,7 +177,7 @@ public Block readBlock()
                 .count() == 1);
 
         // Struct is represented as a row block
-        Block rowBlock = RowBlock.fromFieldBlocks(nextBatchSize, Optional.ofNullable(nullVector), blocks);
+        Block rowBlock = RowBlock.fromNotNullSuppressedFieldBlocks(nextBatchSize, Optional.ofNullable(nullVector), blocks);
 
         readOffset = 0;
         nextBatchSize = 0;
@@ -235,7 +237,7 @@ public String toString()
                 .toString();
     }
 
-    private Block[] getBlocksForType(int positionCount)
+    private Block[] getBlocks(int positionCount, int nonNullCount, boolean[] nullVector)
     {
         Block[] blocks = new Block[fieldNames.size()];
 
@@ -244,8 +246,15 @@ private Block[] getBlocksForType(int positionCount)
 
             ColumnReader columnReader = structFields.get(fieldName);
             if (columnReader != null) {
-                columnReader.prepareNextRead(positionCount);
-                blocks[i] = blockFactory.createBlock(positionCount, columnReader::readBlock, true);
+                columnReader.prepareNextRead(nonNullCount);
+
+                LazyBlockLoader lazyBlockLoader = blockFactory.createLazyBlockLoader(columnReader::readBlock, true);
+                if (nullVector == null) {
+                    blocks[i] = new LazyBlock(positionCount, lazyBlockLoader);
+                }
+                else {
+                    blocks[i] = new LazyBlock(positionCount, () -> toNotNullSupressedBlock(positionCount, nullVector, lazyBlockLoader.load()));
+                }
             }
             else {
                 blocks[i] = RunLengthEncodedBlock.create(type.getFields().get(i).getType(), null, positionCount);
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/TimestampColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/TimestampColumnReader.java
index e1605b8b28e6..0a30c3695973 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/TimestampColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/TimestampColumnReader.java
@@ -25,15 +25,14 @@
 import io.trino.orc.stream.InputStreamSources;
 import io.trino.orc.stream.LongInputStream;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.Int96ArrayBlock;
+import io.trino.spi.block.Fixed12Block;
 import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.TimeZoneKey;
 import io.trino.spi.type.Type;
+import jakarta.annotation.Nullable;
 import org.joda.time.DateTimeZone;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -48,6 +47,7 @@
 import static io.trino.orc.metadata.Stream.StreamKind.SECONDARY;
 import static io.trino.orc.reader.ReaderUtils.invalidStreamType;
 import static io.trino.orc.stream.MissingInputStreamSource.missingStreamSource;
+import static io.trino.spi.block.Fixed12Block.encodeFixed12;
 import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
@@ -469,28 +469,26 @@ private long readTimestampMicros()
     private Block readNonNullTimestampNanos()
             throws IOException
     {
-        long[] microsValues = new long[nextBatchSize];
-        int[] picosFractionValues = new int[nextBatchSize];
+        int[] values = new int[nextBatchSize * 3];
         for (int i = 0; i < nextBatchSize; i++) {
-            readTimestampNanos(i, microsValues, picosFractionValues);
+            readTimestampNanos(i, values);
         }
-        return new Int96ArrayBlock(nextBatchSize, Optional.empty(), microsValues, picosFractionValues);
+        return new Fixed12Block(nextBatchSize, Optional.empty(), values);
     }
 
     private Block readNullTimestampNanos(boolean[] isNull)
             throws IOException
     {
-        long[] microsValues = new long[nextBatchSize];
-        int[] picosFractionValues = new int[nextBatchSize];
+        int[] values = new int[nextBatchSize * 3];
         for (int i = 0; i < nextBatchSize; i++) {
             if (!isNull[i]) {
-                readTimestampNanos(i, microsValues, picosFractionValues);
+                readTimestampNanos(i, values);
             }
         }
-        return new Int96ArrayBlock(nextBatchSize, Optional.of(isNull), microsValues, picosFractionValues);
+        return new Fixed12Block(nextBatchSize, Optional.of(isNull), values);
     }
 
-    private void readTimestampNanos(int i, long[] microsValues, int[] picosFractionValues)
+    private void readTimestampNanos(int i, int[] values)
             throws IOException
     {
         long seconds = secondsStream.next();
@@ -520,8 +518,7 @@ private void readTimestampNanos(int i, long[] microsValues, int[] picosFractionV
             micros = (millis * MICROSECONDS_PER_MILLISECOND) + microsFraction;
         }
 
-        microsValues[i] = micros;
-        picosFractionValues[i] = picosFraction;
+        encodeFixed12(micros, picosFraction, values, i);
     }
 
     // INSTANT MILLIS
@@ -574,28 +571,26 @@ private long readInstantMillis()
     private Block readNonNullInstantMicros()
             throws IOException
     {
-        long[] millisValues = new long[nextBatchSize];
-        int[] picosFractionValues = new int[nextBatchSize];
+        int[] values = new int[nextBatchSize * 3];
         for (int i = 0; i < nextBatchSize; i++) {
-            readInstantMicros(i, millisValues, picosFractionValues);
+            readInstantMicros(i, values);
         }
-        return new Int96ArrayBlock(nextBatchSize, Optional.empty(), millisValues, picosFractionValues);
+        return new Fixed12Block(nextBatchSize, Optional.empty(), values);
     }
 
     private Block readNullInstantMicros(boolean[] isNull)
             throws IOException
     {
-        long[] millisValues = new long[nextBatchSize];
-        int[] picosFractionValues = new int[nextBatchSize];
+        int[] values = new int[nextBatchSize * 3];
         for (int i = 0; i < nextBatchSize; i++) {
             if (!isNull[i]) {
-                readInstantMicros(i, millisValues, picosFractionValues);
+                readInstantMicros(i, values);
             }
         }
-        return new Int96ArrayBlock(nextBatchSize, Optional.of(isNull), millisValues, picosFractionValues);
+        return new Fixed12Block(nextBatchSize, Optional.of(isNull), values);
     }
 
-    private void readInstantMicros(int i, long[] millisValues, int[] picosFractionValues)
+    private void readInstantMicros(int i, int[] values)
             throws IOException
     {
         long seconds = secondsStream.next();
@@ -624,8 +619,7 @@ private void readInstantMicros(int i, long[] millisValues, int[] picosFractionVa
             }
         }
 
-        millisValues[i] = packDateTimeWithZone(millis, TimeZoneKey.UTC_KEY);
-        picosFractionValues[i] = picosFraction;
+        encodeFixed12(packDateTimeWithZone(millis, TimeZoneKey.UTC_KEY), picosFraction, values, i);
     }
 
     // INSTANT NANOS
@@ -633,28 +627,26 @@ private void readInstantMicros(int i, long[] millisValues, int[] picosFractionVa
     private Block readNonNullInstantNanos()
             throws IOException
     {
-        long[] millisValues = new long[nextBatchSize];
-        int[] picosFractionValues = new int[nextBatchSize];
+        int[] values = new int[nextBatchSize * 3];
         for (int i = 0; i < nextBatchSize; i++) {
-            readInstantNanos(i, millisValues, picosFractionValues);
+            readInstantNanos(i, values);
         }
-        return new Int96ArrayBlock(nextBatchSize, Optional.empty(), millisValues, picosFractionValues);
+        return new Fixed12Block(nextBatchSize, Optional.empty(), values);
     }
 
     private Block readNullInstantNanos(boolean[] isNull)
             throws IOException
     {
-        long[] millisValues = new long[nextBatchSize];
-        int[] picosFractionValues = new int[nextBatchSize];
+        int[] values = new int[nextBatchSize * 3];
         for (int i = 0; i < nextBatchSize; i++) {
             if (!isNull[i]) {
-                readInstantNanos(i, millisValues, picosFractionValues);
+                readInstantNanos(i, values);
             }
         }
-        return new Int96ArrayBlock(nextBatchSize, Optional.of(isNull), millisValues, picosFractionValues);
+        return new Fixed12Block(nextBatchSize, Optional.of(isNull), values);
     }
 
-    private void readInstantNanos(int i, long[] millisValues, int[] picosFractionValues)
+    private void readInstantNanos(int i, int[] values)
             throws IOException
     {
         long seconds = secondsStream.next();
@@ -677,7 +669,6 @@ private void readInstantNanos(int i, long[] millisValues, int[] picosFractionVal
             picosFraction = toIntExact(nanos * PICOSECONDS_PER_NANOSECOND);
         }
 
-        millisValues[i] = packDateTimeWithZone(millis, TimeZoneKey.UTC_KEY);
-        picosFractionValues[i] = picosFraction;
+        encodeFixed12(packDateTimeWithZone(millis, TimeZoneKey.UTC_KEY), picosFraction, values, i);
     }
 }
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/UnionColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/UnionColumnReader.java
index 6d6d35031675..3dffa5366a20 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/UnionColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/UnionColumnReader.java
@@ -27,7 +27,6 @@
 import io.trino.orc.stream.InputStreamSource;
 import io.trino.orc.stream.InputStreamSources;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.ByteArrayBlock;
 import io.trino.spi.block.LazyBlock;
 import io.trino.spi.block.LazyBlockLoader;
@@ -35,8 +34,7 @@
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -46,13 +44,13 @@
 import java.util.Optional;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.orc.OrcReader.fullyProjectedLayout;
 import static io.trino.orc.metadata.Stream.StreamKind.DATA;
 import static io.trino.orc.metadata.Stream.StreamKind.PRESENT;
 import static io.trino.orc.reader.ColumnReaders.createColumnReader;
+import static io.trino.orc.reader.ReaderUtils.toNotNullSupressedBlock;
 import static io.trino.orc.reader.ReaderUtils.verifyStreamType;
 import static io.trino.orc.stream.MissingInputStreamSource.missingStreamSource;
 import static io.trino.spi.type.TinyintType.TINYINT;
@@ -143,13 +141,13 @@ public Block readBlock()
         Block[] blocks;
 
         if (presentStream == null) {
-            blocks = getBlocks(nextBatchSize);
+            blocks = getBlocks(nextBatchSize, nextBatchSize, null);
         }
         else {
             nullVector = new boolean[nextBatchSize];
             int nullValues = presentStream.getUnsetBits(nextBatchSize, nullVector);
             if (nullValues != nextBatchSize) {
-                blocks = getBlocks(nextBatchSize - nullValues);
+                blocks = getBlocks(nextBatchSize, nextBatchSize - nullValues, nullVector);
             }
             else {
                 List<Type> typeParameters = type.getTypeParameters();
@@ -166,7 +164,7 @@ public Block readBlock()
                 .distinct()
                 .count() == 1);
 
-        Block rowBlock = RowBlock.fromFieldBlocks(nextBatchSize, Optional.ofNullable(nullVector), blocks);
+        Block rowBlock = RowBlock.fromNotNullSuppressedFieldBlocks(nextBatchSize, Optional.ofNullable(nullVector), blocks);
 
         readOffset = 0;
         nextBatchSize = 0;
@@ -231,7 +229,7 @@ public String toString()
                 .toString();
     }
 
-    private Block[] getBlocks(int positionCount)
+    private Block[] getBlocks(int positionCount, int nonNullCount, boolean[] rowIsNull)
             throws IOException
     {
         if (dataStream == null) {
@@ -240,14 +238,27 @@ private Block[] getBlocks(int positionCount)
 
         Block[] blocks = new Block[fieldReaders.size() + 1];
 
-        byte[] tags = dataStream.next(positionCount);
-        blocks[0] = new ByteArrayBlock(positionCount, Optional.empty(), tags);
+        // read null suppressed tag column, and then remove the suppression
+        byte[] tags = dataStream.next(nonNullCount);
+        if (rowIsNull == null) {
+            blocks[0] = new ByteArrayBlock(positionCount, Optional.empty(), tags);
+        }
+        else {
+            blocks[0] = toNotNullSupressedBlock(positionCount, rowIsNull, new ByteArrayBlock(nonNullCount, Optional.empty(), tags));
+        }
 
-        boolean[][] valueIsNonNull = new boolean[fieldReaders.size()][positionCount];
+        // build a null vector for each field
+        boolean[][] valueIsNull = new boolean[fieldReaders.size()][positionCount];
+        for (boolean[] fieldIsNull : valueIsNull) {
+            Arrays.fill(fieldIsNull, true);
+        }
         int[] nonNullValueCount = new int[fieldReaders.size()];
-        for (int i = 0; i < positionCount; i++) {
-            valueIsNonNull[tags[i]][i] = true;
-            nonNullValueCount[tags[i]]++;
+        for (int position = 0; position < positionCount; position++) {
+            if (rowIsNull != null && rowIsNull[position]) {
+                byte tag = tags[position];
+                valueIsNull[tag][position] = false;
+                nonNullValueCount[tag]++;
+            }
         }
 
         for (int i = 0; i < fieldReaders.size(); i++) {
@@ -255,8 +266,9 @@ private Block[] getBlocks(int positionCount)
             if (nonNullValueCount[i] > 0) {
                 ColumnReader reader = fieldReaders.get(i);
                 reader.prepareNextRead(nonNullValueCount[i]);
-                Block rawBlock = blockFactory.createBlock(nonNullValueCount[i], reader::readBlock, true);
-                blocks[i + 1] = new LazyBlock(positionCount, new UnpackLazyBlockLoader(rawBlock, fieldType, valueIsNonNull[i]));
+                LazyBlockLoader lazyBlockLoader = blockFactory.createLazyBlockLoader(reader::readBlock, true);
+                boolean[] fieldIsNull = valueIsNull[i];
+                blocks[i] = new LazyBlock(positionCount, () -> toNotNullSupressedBlock(positionCount, fieldIsNull, lazyBlockLoader.load()));
             }
             else {
                 blocks[i + 1] = RunLengthEncodedBlock.create(
@@ -289,38 +301,4 @@ public long getRetainedSizeInBytes()
         }
         return retainedSizeInBytes;
     }
-
-    private static final class UnpackLazyBlockLoader
-            implements LazyBlockLoader
-    {
-        private final Block denseBlock;
-        private final Type type;
-        private final boolean[] valueIsNonNull;
-
-        public UnpackLazyBlockLoader(Block denseBlock, Type type, boolean[] valueIsNonNull)
-        {
-            this.denseBlock = requireNonNull(denseBlock, "denseBlock is null");
-            this.type = requireNonNull(type, "type is null");
-            this.valueIsNonNull = requireNonNull(valueIsNonNull, "valueIsNonNull");
-        }
-
-        @Override
-        public Block load()
-        {
-            Block loadedDenseBlock = denseBlock.getLoadedBlock();
-            BlockBuilder unpackedBlock = type.createBlockBuilder(null, valueIsNonNull.length);
-
-            int denseBlockPosition = 0;
-            for (boolean isNonNull : valueIsNonNull) {
-                if (isNonNull) {
-                    type.appendTo(loadedDenseBlock, denseBlockPosition++, unpackedBlock);
-                }
-                else {
-                    unpackedBlock.appendNull();
-                }
-            }
-            checkState(denseBlockPosition == loadedDenseBlock.getPositionCount(), "inconsistency between denseBlock and valueIsNonNull");
-            return unpackedBlock.build();
-        }
-    }
 }
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/UuidColumnReader.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/UuidColumnReader.java
index 9119be6a3561..ce46c7ae87d7 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/reader/UuidColumnReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/reader/UuidColumnReader.java
@@ -26,8 +26,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.Int128ArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/AbstractDiskOrcDataReader.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/AbstractDiskOrcDataReader.java
index c9a86b440bef..af20fe49af1f 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/AbstractDiskOrcDataReader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/AbstractDiskOrcDataReader.java
@@ -17,8 +17,7 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.trino.orc.OrcDataSourceId;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/ByteInputStream.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/ByteInputStream.java
index 3cfc71296d18..5c06f8fddc5a 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/ByteInputStream.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/ByteInputStream.java
@@ -20,6 +20,7 @@
 import java.util.Arrays;
 
 import static java.lang.Math.min;
+import static java.lang.Math.toIntExact;
 
 public class ByteInputStream
         implements ValueInputStream<ByteStreamCheckpoint>
@@ -98,7 +99,7 @@ public void skip(long items)
             if (offset == length) {
                 readNextBlock();
             }
-            long consume = min(items, length - offset);
+            int consume = toIntExact(min(items, length - offset));
             offset += consume;
             items -= consume;
         }
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/CheckpointInputStreamSource.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/CheckpointInputStreamSource.java
index 18fa8cef40ac..57fdf8c0b8b9 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/CheckpointInputStreamSource.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/CheckpointInputStreamSource.java
@@ -14,8 +14,7 @@
 package io.trino.orc.stream;
 
 import io.trino.orc.checkpoint.StreamCheckpoint;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/CompressedOrcChunkLoader.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/CompressedOrcChunkLoader.java
index d8efb33c5e2b..18c041524728 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/CompressedOrcChunkLoader.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/CompressedOrcChunkLoader.java
@@ -153,7 +153,7 @@ private void ensureCompressedBytesAvailable(int size)
 
         // is this a read larger than the buffer
         if (size > dataReader.getMaxBufferSize()) {
-            throw new OrcCorruptionException(dataReader.getOrcDataSourceId(), "Requested read size (%s bytes) is greater than max buffer size (%s bytes", size, dataReader.getMaxBufferSize());
+            throw new OrcCorruptionException(dataReader.getOrcDataSourceId(), "Requested read size (%s bytes) is greater than max buffer size (%s bytes)", size, dataReader.getMaxBufferSize());
         }
 
         // is this a read past the end of the stream
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/DecimalInputStream.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/DecimalInputStream.java
index 81880e175d11..85a837b9509f 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/DecimalInputStream.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/DecimalInputStream.java
@@ -184,7 +184,7 @@ else if (offset < 16) {
                 middle |= (value & 0x7F) << ((offset - 8) * 7);
             }
             else if (offset < 19) {
-                high |= (value & 0x7F) << ((offset - 16) * 7);
+                high = (int) (high | (value & 0x7F) << ((offset - 16) * 7));
             }
             else {
                 throw new OrcCorruptionException(chunkLoader.getOrcDataSourceId(), "Decimal exceeds 128 bits");
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/DoubleInputStream.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/DoubleInputStream.java
index 6b4f4082996e..11eb03aaba18 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/DoubleInputStream.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/DoubleInputStream.java
@@ -59,6 +59,6 @@ public double next()
     public void next(long[] values, int items)
             throws IOException
     {
-        input.readFully(Slices.wrappedLongArray(values), 0, items * SIZE_OF_DOUBLE);
+        input.readFully(values, 0, items);
     }
 }
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/FloatInputStream.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/FloatInputStream.java
index 7f354cf93cc9..e0a3969c65de 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/FloatInputStream.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/FloatInputStream.java
@@ -59,6 +59,6 @@ public float next()
     public void next(int[] values, int items)
             throws IOException
     {
-        input.readFully(Slices.wrappedIntArray(values), 0, items * SIZE_OF_FLOAT);
+        input.readFully(values, 0, items);
     }
 }
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/InputStreamSource.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/InputStreamSource.java
index 0ce6918242b5..544043bc6d34 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/InputStreamSource.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/InputStreamSource.java
@@ -13,7 +13,7 @@
  */
 package io.trino.orc.stream;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/LongBitPacker.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/LongBitPacker.java
index 2709538b1360..8ee0e69d8a92 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/LongBitPacker.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/LongBitPacker.java
@@ -21,9 +21,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
-import static io.airlift.slice.UnsafeSlice.getIntUnchecked;
-import static io.airlift.slice.UnsafeSlice.getLongUnchecked;
-import static io.airlift.slice.UnsafeSlice.getShortUnchecked;
 
 public final class LongBitPacker
 {
@@ -265,7 +262,7 @@ private void unpack16(long[] buffer, int offset, int len, InputStream input)
             i += input.read(tmp, i, blockReadableBytes - i);
         }
         for (int i = 0; i < len; i++) {
-            buffer[offset + i] = 0xFFFFL & Short.reverseBytes(getShortUnchecked(slice, 2 * i));
+            buffer[offset + i] = 0xFFFFL & Short.reverseBytes(slice.getShortUnchecked(2 * i));
         }
     }
 
@@ -279,7 +276,7 @@ private void unpack24(long[] buffer, int offset, int len, InputStream input)
         for (int i = 0; i < len; i++) {
             // It's safe to read 4-bytes at a time and shift, because slice is a view over tmp,
             // which has 8 bytes of buffer space for every position
-            buffer[offset + i] = 0xFF_FFFFL & (Integer.reverseBytes(getIntUnchecked(slice, 3 * i)) >>> 8);
+            buffer[offset + i] = 0xFF_FFFFL & (Integer.reverseBytes(slice.getIntUnchecked(3 * i)) >>> 8);
         }
     }
 
@@ -291,7 +288,7 @@ private void unpack32(long[] buffer, int offset, int len, InputStream input)
             i += input.read(tmp, i, blockReadableBytes - i);
         }
         for (int i = 0; i < len; i++) {
-            buffer[offset + i] = 0xFFFF_FFFFL & Integer.reverseBytes(getIntUnchecked(slice, 4 * i));
+            buffer[offset + i] = 0xFFFF_FFFFL & Integer.reverseBytes(slice.getIntUnchecked(4 * i));
         }
     }
 
@@ -305,7 +302,7 @@ private void unpack40(long[] buffer, int offset, int len, InputStream input)
         for (int i = 0; i < len; i++) {
             // It's safe to read 8-bytes at a time and shift, because slice is a view over tmp,
             // which has 8 bytes of buffer space for every position
-            buffer[offset + i] = Long.reverseBytes(getLongUnchecked(slice, 5 * i)) >>> 24;
+            buffer[offset + i] = Long.reverseBytes(slice.getLongUnchecked(5 * i)) >>> 24;
         }
     }
 
@@ -319,7 +316,7 @@ private void unpack48(long[] buffer, int offset, int len, InputStream input)
         for (int i = 0; i < len; i++) {
             // It's safe to read 8-bytes at a time and shift, because slice is a view over tmp,
             // which has 8 bytes of buffer space for every position
-            buffer[offset + i] = Long.reverseBytes(getLongUnchecked(slice, 6 * i)) >>> 16;
+            buffer[offset + i] = Long.reverseBytes(slice.getLongUnchecked(6 * i)) >>> 16;
         }
     }
 
@@ -333,7 +330,7 @@ private void unpack56(long[] buffer, int offset, int len, InputStream input)
         for (int i = 0; i < len; i++) {
             // It's safe to read 8-bytes at a time and shift, because slice is a view over tmp,
             // which has 8 bytes of buffer space for every position
-            buffer[offset + i] = Long.reverseBytes(getLongUnchecked(slice, 7 * i)) >>> 8;
+            buffer[offset + i] = Long.reverseBytes(slice.getLongUnchecked(7 * i)) >>> 8;
         }
     }
 
@@ -345,7 +342,7 @@ private void unpack64(long[] buffer, int offset, int len, InputStream input)
             i += input.read(tmp, i, blockReadableBytes - i);
         }
         for (int i = 0; i < len; i++) {
-            buffer[offset + i] = Long.reverseBytes(getLongUnchecked(slice, 8 * i));
+            buffer[offset + i] = Long.reverseBytes(slice.getLongUnchecked(8 * i));
         }
     }
 }
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/LongInputStreamV1.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/LongInputStreamV1.java
index ebaba90f5c8c..8beaf52fcec5 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/LongInputStreamV1.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/LongInputStreamV1.java
@@ -20,6 +20,7 @@
 import java.io.IOException;
 
 import static java.lang.Math.min;
+import static java.lang.Math.toIntExact;
 
 public class LongInputStreamV1
         implements LongInputStream
@@ -87,7 +88,7 @@ public long next()
             readValues();
         }
         if (repeat) {
-            result = literals[0] + (used++) * delta;
+            result = literals[0] + (used++) * (long) delta;
         }
         else {
             result = literals[used++];
@@ -110,7 +111,7 @@ public void next(long[] values, int items)
             int chunkSize = min(numLiterals - used, items);
             if (repeat) {
                 for (int i = 0; i < chunkSize; i++) {
-                    values[offset + i] = literals[0] + ((used + i) * delta);
+                    values[offset + i] = literals[0] + ((used + i) * (long) delta);
                 }
             }
             else {
@@ -137,7 +138,7 @@ public void next(int[] values, int items)
             int chunkSize = min(numLiterals - used, items);
             if (repeat) {
                 for (int i = 0; i < chunkSize; i++) {
-                    long literal = literals[0] + ((used + i) * delta);
+                    long literal = literals[0] + ((used + i) * (long) delta);
                     int value = (int) literal;
                     if (literal != value) {
                         throw new OrcCorruptionException(input.getOrcDataSourceId(), "Decoded value out of range for a 32bit number");
@@ -176,7 +177,7 @@ public void next(short[] values, int items)
             int chunkSize = min(numLiterals - used, items);
             if (repeat) {
                 for (int i = 0; i < chunkSize; i++) {
-                    long literal = literals[0] + ((used + i) * delta);
+                    long literal = literals[0] + ((used + i) * (long) delta);
                     short value = (short) literal;
                     if (literal != value) {
                         throw new OrcCorruptionException(input.getOrcDataSourceId(), "Decoded value out of range for a 16bit number");
@@ -227,7 +228,7 @@ public void skip(long items)
             if (used == numLiterals) {
                 readValues();
             }
-            long consume = min(items, numLiterals - used);
+            int consume = toIntExact(min(items, numLiterals - used));
             used += consume;
             items -= consume;
         }
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/LongInputStreamV2.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/LongInputStreamV2.java
index 91b12cfebd4d..4c47ad695037 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/LongInputStreamV2.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/LongInputStreamV2.java
@@ -21,6 +21,7 @@
 import java.io.InputStream;
 
 import static java.lang.Math.min;
+import static java.lang.Math.toIntExact;
 
 /**
  * See {@link org.apache.orc.impl.RunLengthIntegerWriterV2} for description of various lightweight compression techniques.
@@ -437,7 +438,7 @@ public void skip(long items)
                 used = 0;
                 readValues();
             }
-            long consume = min(items, numLiterals - used);
+            int consume = toIntExact(min(items, numLiterals - used));
             used += consume;
             items -= consume;
         }
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/LongOutputStreamV1.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/LongOutputStreamV1.java
index d0f78e3ec43d..ab6680557fdd 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/LongOutputStreamV1.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/LongOutputStreamV1.java
@@ -197,7 +197,7 @@ public StreamDataOutput getStreamDataOutput(OrcColumnId columnId)
     @Override
     public long getBufferedBytes()
     {
-        return buffer.estimateOutputDataSize() + (Long.BYTES * size);
+        return buffer.estimateOutputDataSize() + (Long.BYTES * (long) size);
     }
 
     @Override
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/LongOutputStreamV2.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/LongOutputStreamV2.java
index 8d81d4c14f83..5e4bbe95c7d0 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/LongOutputStreamV2.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/LongOutputStreamV2.java
@@ -756,7 +756,7 @@ public StreamDataOutput getStreamDataOutput(OrcColumnId columnId)
     @Override
     public long getBufferedBytes()
     {
-        return buffer.estimateOutputDataSize() + (Long.BYTES * numLiterals);
+        return buffer.estimateOutputDataSize() + (Long.BYTES * (long) numLiterals);
     }
 
     @Override
@@ -1057,7 +1057,7 @@ void writeInts(long[] input, int offset, int length, int bitSize, SliceOutput ou
                 int bitsToWrite = bitSize;
                 while (bitsToWrite > bitsLeft) {
                     // add the bits to the bottom of the current word
-                    current |= value >>> (bitsToWrite - bitsLeft);
+                    current = (byte) (current | value >>> (bitsToWrite - bitsLeft));
                     // subtract out the bits we just added
                     bitsToWrite -= bitsLeft;
                     // zero out the bits above bitsToWrite
@@ -1067,7 +1067,7 @@ void writeInts(long[] input, int offset, int length, int bitSize, SliceOutput ou
                     bitsLeft = 8;
                 }
                 bitsLeft -= bitsToWrite;
-                current |= value << bitsLeft;
+                current = (byte) (current | value << bitsLeft);
                 if (bitsLeft == 0) {
                     output.write(current);
                     current = 0;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/MissingInputStreamSource.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/MissingInputStreamSource.java
index 6f4360aedc78..4a9c2a2d589b 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/MissingInputStreamSource.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/MissingInputStreamSource.java
@@ -13,7 +13,7 @@
  */
 package io.trino.orc.stream;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 public class MissingInputStreamSource<S extends ValueInputStream<?>>
         implements InputStreamSource<S>
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/OrcInputStream.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/OrcInputStream.java
index dfb5a76a1951..3f37981fc5e4 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/OrcInputStream.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/OrcInputStream.java
@@ -13,12 +13,13 @@
  */
 package io.trino.orc.stream;
 
+import com.google.common.primitives.Ints;
 import io.airlift.slice.FixedLengthSliceInput;
 import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
 import io.trino.orc.OrcCorruptionException;
 import io.trino.orc.OrcDataSourceId;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,6 +38,9 @@ public final class OrcInputStream
 {
     private final OrcChunkLoader chunkLoader;
 
+    // 8 byte temp buffer for reading multibyte values that straddle a buffer boundary
+    private final Slice tempBuffer8 = Slices.allocate(8);
+
     @Nullable
     private FixedLengthSliceInput current = EMPTY_SLICE.getInput();
     private long lastCheckpoint;
@@ -126,19 +130,77 @@ public void readFully(byte[] buffer, int offset, int length)
         }
     }
 
-    public void readFully(Slice buffer, int offset, int length)
+    public void readFully(int[] values, int offset, int length)
             throws IOException
     {
+        if (current == null) {
+            throw new OrcCorruptionException(chunkLoader.getOrcDataSourceId(), "Unexpected end of stream");
+        }
+
         while (length > 0) {
-            if (current != null && current.remaining() == 0) {
+            int remaining = Ints.saturatedCast(current.remaining());
+            if (remaining < Integer.BYTES) {
+                // there might be a value split across the buffers
+                Slice slice = null;
+                if (remaining != 0) {
+                    slice = tempBuffer8;
+                    current.readBytes(slice, 0, remaining);
+                }
+
                 advance();
+                if (current == null) {
+                    throw new OrcCorruptionException(chunkLoader.getOrcDataSourceId(), "Unexpected end of stream");
+                }
+
+                if (remaining != 0) {
+                    current.readBytes(slice, remaining, Integer.BYTES - remaining);
+                    values[offset] = slice.getInt(0);
+                    length--;
+                    offset++;
+                }
+                remaining = Ints.saturatedCast(current.remaining());
             }
-            if (current == null) {
-                throw new OrcCorruptionException(chunkLoader.getOrcDataSourceId(), "Unexpected end of stream");
+
+            int chunkSize = min(length, remaining / Integer.BYTES);
+            current.readInts(values, offset, chunkSize);
+            length -= chunkSize;
+            offset += chunkSize;
+        }
+    }
+
+    public void readFully(long[] values, int offset, int length)
+            throws IOException
+    {
+        if (current == null) {
+            throw new OrcCorruptionException(chunkLoader.getOrcDataSourceId(), "Unexpected end of stream");
+        }
+
+        while (length > 0) {
+            int remaining = Ints.saturatedCast(current.remaining());
+            if (remaining < Long.BYTES) {
+                // there might be a value split across the buffers
+                Slice slice = null;
+                if (remaining != 0) {
+                    slice = tempBuffer8;
+                    current.readBytes(slice, 0, remaining);
+                }
+
+                advance();
+                if (current == null) {
+                    throw new OrcCorruptionException(chunkLoader.getOrcDataSourceId(), "Unexpected end of stream");
+                }
+
+                if (remaining != 0) {
+                    current.readBytes(slice, remaining, Long.BYTES - remaining);
+                    values[offset] = slice.getLong(0);
+                    length--;
+                    offset++;
+                }
+                remaining = Ints.saturatedCast(current.remaining());
             }
 
-            int chunkSize = min(length, (int) current.remaining());
-            current.readBytes(buffer, offset, chunkSize);
+            int chunkSize = min(length, remaining / Long.BYTES);
+            current.readLongs(values, offset, chunkSize);
             length -= chunkSize;
             offset += chunkSize;
         }
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/PresentOutputStream.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/PresentOutputStream.java
index a2ca97569168..18dee5087f83 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/PresentOutputStream.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/PresentOutputStream.java
@@ -18,8 +18,7 @@
 import io.trino.orc.metadata.CompressionKind;
 import io.trino.orc.metadata.OrcColumnId;
 import io.trino.orc.metadata.Stream;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/stream/ValueInputStreamSource.java b/lib/trino-orc/src/main/java/io/trino/orc/stream/ValueInputStreamSource.java
index 3c902d4f8581..b89de8c32985 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/stream/ValueInputStreamSource.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/stream/ValueInputStreamSource.java
@@ -13,7 +13,7 @@
  */
 package io.trino.orc.stream;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static java.util.Objects.requireNonNull;
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/writer/ColumnWriters.java b/lib/trino-orc/src/main/java/io/trino/orc/writer/ColumnWriters.java
index 8bb50095c292..09d067cdf0d8 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/writer/ColumnWriters.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/writer/ColumnWriters.java
@@ -25,6 +25,7 @@
 import io.trino.orc.metadata.statistics.DoubleStatisticsBuilder;
 import io.trino.orc.metadata.statistics.IntegerStatisticsBuilder;
 import io.trino.orc.metadata.statistics.StringStatisticsBuilder;
+import io.trino.orc.metadata.statistics.TimeMicrosStatisticsBuilder;
 import io.trino.orc.metadata.statistics.TimestampStatisticsBuilder;
 import io.trino.spi.type.TimeType;
 import io.trino.spi.type.Type;
@@ -33,6 +34,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.orc.metadata.OrcType.OrcTypeKind.LONG;
+import static io.trino.orc.reader.ColumnReaders.ICEBERG_LONG_TYPE;
 import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
@@ -55,8 +57,8 @@ public static ColumnWriter createColumnWriter(
         if (type instanceof TimeType timeType) {
             checkArgument(timeType.getPrecision() == 6, "%s not supported for ORC writer", type);
             checkArgument(orcType.getOrcTypeKind() == LONG, "wrong ORC type %s for type %s", orcType, type);
-            checkArgument("TIME".equals(orcType.getAttributes().get("iceberg.long-type")), "wrong attributes %s for type %s", orcType.getAttributes(), type);
-            return new TimeColumnWriter(columnId, type, compression, bufferSize, () -> new IntegerStatisticsBuilder(bloomFilterBuilder.get()));
+            checkArgument("TIME".equals(orcType.getAttributes().get(ICEBERG_LONG_TYPE)), "wrong attributes %s for type %s", orcType.getAttributes(), type);
+            return new TimeColumnWriter(columnId, type, compression, bufferSize, () -> new TimeMicrosStatisticsBuilder(bloomFilterBuilder.get()));
         }
         switch (orcType.getOrcTypeKind()) {
             case BOOLEAN:
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/writer/DictionaryBuilder.java b/lib/trino-orc/src/main/java/io/trino/orc/writer/DictionaryBuilder.java
index 1a2b6e1780b4..51a921ad5829 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/writer/DictionaryBuilder.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/writer/DictionaryBuilder.java
@@ -13,39 +13,46 @@
  */
 package io.trino.orc.writer;
 
+import io.airlift.slice.DynamicSliceOutput;
+import io.airlift.slice.Slice;
+import io.airlift.slice.SliceOutput;
+import io.airlift.slice.XxHash64;
 import io.trino.array.IntBigArray;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.VariableWidthBlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+
+import java.util.Arrays;
+import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
 import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
 import static io.trino.spi.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
 import static it.unimi.dsi.fastutil.HashCommon.arraySize;
 import static java.lang.Math.min;
 import static java.util.Objects.requireNonNull;
 
-// TODO this class is not memory efficient.  We can bypass all of the Trino type and block code
-// since we are only interested in a hash of byte arrays.  The only place an actual block is needed
-// is during conversion to direct, and in that case we can use a slice array block.  This code
-// can use store the data in multiple Slices to avoid a large contiguous allocation.
 public class DictionaryBuilder
 {
     private static final int INSTANCE_SIZE = instanceSize(DictionaryBuilder.class);
+
+    // See jdk.internal.util.ArraysSupport.SOFT_MAX_ARRAY_LENGTH for an explanation
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
     private static final float FILL_RATIO = 0.75f;
     private static final int EMPTY_SLOT = -1;
     private static final int NULL_POSITION = 0;
     private static final int EXPECTED_BYTES_PER_ENTRY = 32;
 
     private final IntBigArray blockPositionByHash = new IntBigArray();
-    private BlockBuilder elementBlock;
+
+    private int entryCount = 1;
+    private SliceOutput sliceOutput;
+    private int[] offsets;
 
     private int maxFill;
     private int hashMask;
 
-    private boolean containsNullElement;
-
     public DictionaryBuilder(int expectedSize)
     {
         checkArgument(expectedSize >= 0, "expectedSize must not be negative");
@@ -53,65 +60,54 @@ public DictionaryBuilder(int expectedSize)
         // todo we can do better
         int expectedEntries = min(expectedSize, DEFAULT_MAX_PAGE_SIZE_IN_BYTES / EXPECTED_BYTES_PER_ENTRY);
         // it is guaranteed expectedEntries * EXPECTED_BYTES_PER_ENTRY will not overflow
-        this.elementBlock = new VariableWidthBlockBuilder(
-                null,
-                expectedEntries,
-                expectedEntries * EXPECTED_BYTES_PER_ENTRY);
-
-        // first position is always null
-        this.elementBlock.appendNull();
+        int expectedBytes = expectedEntries * EXPECTED_BYTES_PER_ENTRY;
+        sliceOutput = new DynamicSliceOutput(min(expectedBytes, MAX_ARRAY_SIZE));
 
         int hashSize = arraySize(expectedSize, FILL_RATIO);
         this.maxFill = calculateMaxFill(hashSize);
         this.hashMask = hashSize - 1;
 
+        this.offsets = new int[maxFill + 1];
+
         blockPositionByHash.ensureCapacity(hashSize);
         blockPositionByHash.fill(EMPTY_SLOT);
-
-        this.containsNullElement = false;
     }
 
     public long getSizeInBytes()
     {
-        return elementBlock.getSizeInBytes();
+        return sliceOutput.size() + sizeOf(offsets);
     }
 
     public long getRetainedSizeInBytes()
     {
-        return INSTANCE_SIZE + elementBlock.getRetainedSizeInBytes() + blockPositionByHash.sizeOf();
+        return INSTANCE_SIZE +
+                sliceOutput.getRetainedSize() +
+                sizeOf(offsets) +
+                blockPositionByHash.sizeOf();
     }
 
-    public Block getElementBlock()
+    public VariableWidthBlock getElementBlock()
     {
-        return elementBlock;
+        boolean[] isNull = new boolean[entryCount];
+        isNull[NULL_POSITION] = true;
+        return new VariableWidthBlock(entryCount, sliceOutput.slice(), offsets, Optional.of(isNull));
     }
 
     public void clear()
     {
-        containsNullElement = false;
         blockPositionByHash.fill(EMPTY_SLOT);
-        elementBlock = elementBlock.newBlockBuilderLike(null);
-        // first position is always null
-        elementBlock.appendNull();
-    }
-
-    public boolean contains(Block block, int position)
-    {
-        requireNonNull(block, "block must not be null");
-        checkArgument(position >= 0, "position must be >= 0");
 
-        if (block.isNull(position)) {
-            return containsNullElement;
-        }
-        return blockPositionByHash.get(getHashPositionOfElement(block, position)) != EMPTY_SLOT;
+        int initialSize = min((int) (sliceOutput.size() * 1.25), MAX_ARRAY_SIZE);
+        sliceOutput = new DynamicSliceOutput(initialSize);
+        entryCount = 1;
+        Arrays.fill(offsets, 0);
     }
 
-    public int putIfAbsent(Block block, int position)
+    public int putIfAbsent(VariableWidthBlock block, int position)
     {
         requireNonNull(block, "block must not be null");
 
         if (block.isNull(position)) {
-            containsNullElement = true;
             return NULL_POSITION;
         }
 
@@ -129,24 +125,29 @@ public int putIfAbsent(Block block, int position)
 
     public int getEntryCount()
     {
-        return elementBlock.getPositionCount();
+        return entryCount;
     }
 
     /**
-     * Get slot position of element at {@code position} of {@code block}
+     * Get slot position of the element at {@code position} of {@code block}
      */
-    private long getHashPositionOfElement(Block block, int position)
+    private long getHashPositionOfElement(VariableWidthBlock block, int position)
     {
         checkArgument(!block.isNull(position), "position is null");
+        Slice rawSlice = block.getRawSlice();
+        int rawSliceOffset = block.getRawSliceOffset(position);
         int length = block.getSliceLength(position);
-        long hashPosition = getMaskedHash(block.hash(position, 0, length));
+
+        long hashPosition = getMaskedHash(XxHash64.hash(rawSlice, rawSliceOffset, length));
         while (true) {
-            int blockPosition = blockPositionByHash.get(hashPosition);
-            if (blockPosition == EMPTY_SLOT) {
+            int entryPosition = blockPositionByHash.get(hashPosition);
+            if (entryPosition == EMPTY_SLOT) {
                 // Doesn't have this element
                 return hashPosition;
             }
-            if (elementBlock.getSliceLength(blockPosition) == length && block.equals(position, 0, elementBlock, blockPosition, 0, length)) {
+            int entryOffset = offsets[entryPosition];
+            int entryLength = offsets[entryPosition + 1] - entryOffset;
+            if (rawSlice.equals(rawSliceOffset, length, sliceOutput.getUnderlyingSlice(), entryOffset, entryLength)) {
                 // Already has this element
                 return hashPosition;
             }
@@ -155,17 +156,20 @@ private long getHashPositionOfElement(Block block, int position)
         }
     }
 
-    private int addNewElement(long hashPosition, Block block, int position)
+    private int addNewElement(long hashPosition, VariableWidthBlock block, int position)
     {
         checkArgument(!block.isNull(position), "position is null");
-        block.writeBytesTo(position, 0, block.getSliceLength(position), elementBlock);
-        elementBlock.closeEntry();
 
-        int newElementPositionInBlock = elementBlock.getPositionCount() - 1;
+        int newElementPositionInBlock = entryCount;
+
+        sliceOutput.writeBytes(block.getRawSlice(), block.getRawSliceOffset(position), block.getSliceLength(position));
+        entryCount++;
+        offsets[entryCount] = sliceOutput.size();
+
         blockPositionByHash.set(hashPosition, newElementPositionInBlock);
 
         // increase capacity, if necessary
-        if (elementBlock.getPositionCount() >= maxFill) {
+        if (entryCount >= maxFill) {
             rehash(maxFill * 2);
         }
 
@@ -177,12 +181,30 @@ private void rehash(int size)
         int newHashSize = arraySize(size + 1, FILL_RATIO);
         hashMask = newHashSize - 1;
         maxFill = calculateMaxFill(newHashSize);
+
+        // offsets are not changed during rehashing, but we grow them hold the maxFill
+        offsets = Arrays.copyOf(offsets, maxFill + 1);
+
         blockPositionByHash.ensureCapacity(newHashSize);
         blockPositionByHash.fill(EMPTY_SLOT);
 
         // the first element of elementBlock is always null
-        for (int blockPosition = 1; blockPosition < elementBlock.getPositionCount(); blockPosition++) {
-            blockPositionByHash.set(getHashPositionOfElement(elementBlock, blockPosition), blockPosition);
+        for (int entryPosition = 1; entryPosition < entryCount; entryPosition++) {
+            int entryOffset = offsets[entryPosition];
+            int entryLength = offsets[entryPosition + 1] - entryOffset;
+            long entryHashCode = XxHash64.hash(sliceOutput.getUnderlyingSlice(), entryOffset, entryLength);
+
+            // values are already distinct, so just find the first empty slot
+            long hashPosition = getMaskedHash(entryHashCode);
+            while (true) {
+                int hashEntryIndex = blockPositionByHash.get(hashPosition);
+                if (hashEntryIndex == EMPTY_SLOT) {
+                    blockPositionByHash.set(hashPosition, entryPosition);
+                    break;
+                }
+
+                hashPosition = getMaskedHash(hashPosition + 1);
+            }
         }
     }
 
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/writer/SliceDictionaryColumnWriter.java b/lib/trino-orc/src/main/java/io/trino/orc/writer/SliceDictionaryColumnWriter.java
index 045d2fee05fb..1766a2a45d1a 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/writer/SliceDictionaryColumnWriter.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/writer/SliceDictionaryColumnWriter.java
@@ -38,6 +38,7 @@
 import io.trino.orc.stream.StreamDataOutput;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.DictionaryBlock;
+import io.trino.spi.block.VariableWidthBlock;
 import io.trino.spi.type.Type;
 import it.unimi.dsi.fastutil.ints.IntArrays;
 
@@ -282,17 +283,19 @@ public void writeBlock(Block block)
 
         // record values
         values.ensureCapacity(rowGroupValueCount + block.getPositionCount());
-        for (int position = 0; position < block.getPositionCount(); position++) {
-            int index = dictionary.putIfAbsent(block, position);
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        for (int i = 0; i < block.getPositionCount(); i++) {
+            int position = block.getUnderlyingValuePosition(i);
+            int index = dictionary.putIfAbsent(valueBlock, position);
             values.set(rowGroupValueCount, index);
             rowGroupValueCount++;
             totalValueCount++;
 
-            if (!block.isNull(position)) {
+            if (!valueBlock.isNull(position)) {
                 // todo min/max statistics only need to be updated if value was not already in the dictionary, but non-null count does
-                statisticsBuilder.addValue(type.getSlice(block, position));
+                statisticsBuilder.addValue(type.getSlice(valueBlock, position));
 
-                rawBytes += block.getSliceLength(position);
+                rawBytes += valueBlock.getSliceLength(position);
                 totalNonNullValueCount++;
             }
         }
@@ -349,7 +352,7 @@ private void bufferOutputData()
         checkState(closed);
         checkState(!directEncoded);
 
-        Block dictionaryElements = dictionary.getElementBlock();
+        VariableWidthBlock dictionaryElements = dictionary.getElementBlock();
 
         // write dictionary in sorted order
         int[] sortedDictionaryIndexes = getSortedDictionaryNullsLast(dictionaryElements);
@@ -404,13 +407,14 @@ private void bufferOutputData()
         presentStream.close();
     }
 
-    private static int[] getSortedDictionaryNullsLast(Block elementBlock)
+    private static int[] getSortedDictionaryNullsLast(VariableWidthBlock elementBlock)
     {
         int[] sortedPositions = new int[elementBlock.getPositionCount()];
         for (int i = 0; i < sortedPositions.length; i++) {
             sortedPositions[i] = i;
         }
 
+        Slice rawSlice = elementBlock.getRawSlice();
         IntArrays.quickSort(sortedPositions, 0, sortedPositions.length, (int left, int right) -> {
             boolean nullLeft = elementBlock.isNull(left);
             boolean nullRight = elementBlock.isNull(right);
@@ -423,13 +427,11 @@ private static int[] getSortedDictionaryNullsLast(Block elementBlock)
             if (nullRight) {
                 return -1;
             }
-            return elementBlock.compareTo(
-                    left,
-                    0,
+            return rawSlice.compareTo(
+                    elementBlock.getRawSliceOffset(left),
                     elementBlock.getSliceLength(left),
-                    elementBlock,
-                    right,
-                    0,
+                    rawSlice,
+                    elementBlock.getRawSliceOffset(right),
                     elementBlock.getSliceLength(right));
         });
 
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/writer/StructColumnWriter.java b/lib/trino-orc/src/main/java/io/trino/orc/writer/StructColumnWriter.java
index 57940e39083b..fc9a17948eee 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/writer/StructColumnWriter.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/writer/StructColumnWriter.java
@@ -28,7 +28,6 @@
 import io.trino.orc.stream.PresentOutputStream;
 import io.trino.orc.stream.StreamDataOutput;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.ColumnarRow;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -41,7 +40,7 @@
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT;
 import static io.trino.orc.metadata.CompressionKind.NONE;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
+import static io.trino.spi.block.RowBlock.getNullSuppressedRowFieldsFromBlock;
 import static java.util.Objects.requireNonNull;
 
 public class StructColumnWriter
@@ -106,27 +105,20 @@ public void writeBlock(Block block)
         checkState(!closed);
         checkArgument(block.getPositionCount() > 0, "Block is empty");
 
-        ColumnarRow columnarRow = toColumnarRow(block);
-        writeColumnarRow(columnarRow);
-    }
-
-    private void writeColumnarRow(ColumnarRow columnarRow)
-    {
         // record nulls
-        for (int position = 0; position < columnarRow.getPositionCount(); position++) {
-            boolean present = !columnarRow.isNull(position);
+        for (int position = 0; position < block.getPositionCount(); position++) {
+            boolean present = !block.isNull(position);
             presentStream.writeBoolean(present);
             if (present) {
                 nonNullValueCount++;
             }
         }
 
-        // write field values
-        for (int i = 0; i < structFields.size(); i++) {
-            ColumnWriter columnWriter = structFields.get(i);
-            Block fieldBlock = columnarRow.getField(i);
-            if (fieldBlock.getPositionCount() > 0) {
-                columnWriter.writeBlock(fieldBlock);
+        // write null-suppressed field values
+        List<Block> fields = getNullSuppressedRowFieldsFromBlock(block);
+        if (fields.get(0).getPositionCount() > 0) {
+            for (int i = 0; i < structFields.size(); i++) {
+                structFields.get(i).writeBlock(fields.get(i));
             }
         }
     }
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/AbstractTestOrcReader.java b/lib/trino-orc/src/test/java/io/trino/orc/AbstractTestOrcReader.java
index 517f64094376..1019fdabff3e 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/AbstractTestOrcReader.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/AbstractTestOrcReader.java
@@ -23,6 +23,7 @@
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.SqlDate;
 import io.trino.spi.type.SqlDecimal;
+import io.trino.spi.type.SqlTime;
 import io.trino.spi.type.SqlTimestamp;
 import io.trino.spi.type.SqlTimestampWithTimeZone;
 import io.trino.spi.type.SqlVarbinary;
@@ -53,6 +54,7 @@
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TimeType.TIME_MICROS;
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
@@ -316,6 +318,25 @@ public void testTimestampMillis()
         tester.testRoundTrip(TIMESTAMP_MILLIS, newArrayList(limit(cycle(map.values()), 30_000)));
     }
 
+    @Test
+    public void testTimeMicros()
+            throws Exception
+    {
+        Map<String, SqlTime> map = ImmutableMap.<String, SqlTime>builder()
+                .put("00:00:00.000000", SqlTime.newInstance(6, 0L))
+                .put("12:05:19.257000", SqlTime.newInstance(6, 43519257000000000L))
+                .put("17:37:07.638000", SqlTime.newInstance(6, 63427638000000000L))
+                .put("05:17:37.346000", SqlTime.newInstance(6, 19057346000000000L))
+                .put("06:09:00.988000", SqlTime.newInstance(6, 22140988000000000L))
+                .put("13:31:34.185000", SqlTime.newInstance(6, 48694185000000000L))
+                .put("01:09:07.185000", SqlTime.newInstance(6, 4147185000000000L))
+                .put("20:43:39.822000", SqlTime.newInstance(6, 74619822000000000L))
+                .put("23:59:59.999000", SqlTime.newInstance(6, 86399999000000000L))
+                .buildOrThrow();
+        map.forEach((expected, value) -> assertEquals(value.toString(), expected));
+        tester.testRoundTrip(TIME_MICROS, newArrayList(limit(cycle(map.values()), 30_000)));
+    }
+
     @Test
     public void testTimestampMicros()
             throws Exception
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/OrcTester.java b/lib/trino-orc/src/test/java/io/trino/orc/OrcTester.java
index 408411ad4077..93d6442a3d31 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/OrcTester.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/OrcTester.java
@@ -22,15 +22,17 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
-import io.trino.filesystem.TrinoOutputFile;
+import io.trino.filesystem.local.LocalOutputFile;
 import io.trino.hive.orc.OrcConf;
-import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.orc.metadata.ColumnMetadata;
 import io.trino.orc.metadata.CompressionKind;
 import io.trino.orc.metadata.OrcType;
 import io.trino.spi.Page;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
@@ -43,6 +45,7 @@
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.SqlDate;
 import io.trino.spi.type.SqlDecimal;
+import io.trino.spi.type.SqlTime;
 import io.trino.spi.type.SqlTimestamp;
 import io.trino.spi.type.SqlTimestampWithTimeZone;
 import io.trino.spi.type.SqlVarbinary;
@@ -95,9 +98,7 @@
 import org.joda.time.DateTimeZone;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.time.LocalDateTime;
@@ -139,7 +140,9 @@
 import static io.trino.orc.metadata.CompressionKind.ZLIB;
 import static io.trino.orc.metadata.CompressionKind.ZSTD;
 import static io.trino.orc.metadata.OrcType.OrcTypeKind.BINARY;
+import static io.trino.orc.metadata.OrcType.OrcTypeKind.LONG;
 import static io.trino.orc.reader.ColumnReaders.ICEBERG_BINARY_TYPE;
+import static io.trino.orc.reader.ColumnReaders.ICEBERG_LONG_TYPE;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.Chars.truncateToLengthAndTrimSpaces;
@@ -150,6 +153,7 @@
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TimeType.TIME_MICROS;
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
@@ -443,7 +447,10 @@ private void assertRoundTrip(Type writeType, Type readType, List<?> writeValues,
     {
         OrcWriterStats stats = new OrcWriterStats();
         for (CompressionKind compression : compressions) {
-            boolean hiveSupported = (compression != LZ4) && (compression != ZSTD) && !isTimestampTz(writeType) && !isTimestampTz(readType) && !isUuid(writeType) && !isUuid(readType);
+            boolean hiveSupported = (compression != LZ4) && (compression != ZSTD)
+                    && !containsTimeMicros(writeType) && !containsTimeMicros(readType)
+                    && !isTimestampTz(writeType) && !isTimestampTz(readType)
+                    && !isUuid(writeType) && !isUuid(readType);
 
             for (Format format : formats) {
                 // write Hive, read Trino
@@ -633,7 +640,7 @@ public static void writeOrcPages(File outputFile, CompressionKind compression, L
                 .collect(toImmutableList());
 
         OrcWriter writer = new OrcWriter(
-                OutputStreamOrcDataSink.create(new LocalTrinoOutputFile(outputFile)),
+                OutputStreamOrcDataSink.create(new LocalOutputFile(outputFile)),
                 columnNames,
                 types,
                 OrcType.createRootOrcType(columnNames, types),
@@ -669,11 +676,21 @@ public static void writeOrcColumnTrino(File outputFile, CompressionKind compress
                         Optional.empty(),
                         ImmutableMap.of(ICEBERG_BINARY_TYPE, "UUID")));
             }
+            if (TIME_MICROS.equals(mappedType)) {
+                return Optional.of(new OrcType(
+                    LONG,
+                    ImmutableList.of(),
+                    ImmutableList.of(),
+                    Optional.empty(),
+                    Optional.empty(),
+                    Optional.empty(),
+                    ImmutableMap.of(ICEBERG_LONG_TYPE, "TIME")));
+            }
             return Optional.empty();
         }));
 
         OrcWriter writer = new OrcWriter(
-                OutputStreamOrcDataSink.create(new LocalTrinoOutputFile(outputFile)),
+                OutputStreamOrcDataSink.create(new LocalOutputFile(outputFile)),
                 ImmutableList.of("test"),
                 types,
                 orcType,
@@ -740,6 +757,9 @@ else if (DATE.equals(type)) {
                 long days = ((SqlDate) value).getDays();
                 type.writeLong(blockBuilder, days);
             }
+            else if (TIME_MICROS.equals(type)) {
+                type.writeLong(blockBuilder, ((SqlTime) value).getPicos());
+            }
             else if (TIMESTAMP_MILLIS.equals(type)) {
                 type.writeLong(blockBuilder, ((SqlTimestamp) value).getEpochMicros());
             }
@@ -763,32 +783,32 @@ else if (TIMESTAMP_TZ_MICROS.equals(type) || TIMESTAMP_TZ_NANOS.equals(type)) {
                 if (type instanceof ArrayType) {
                     List<?> array = (List<?>) value;
                     Type elementType = type.getTypeParameters().get(0);
-                    BlockBuilder arrayBlockBuilder = blockBuilder.beginBlockEntry();
-                    for (Object elementValue : array) {
-                        writeValue(elementType, arrayBlockBuilder, elementValue);
-                    }
-                    blockBuilder.closeEntry();
+                    ((ArrayBlockBuilder) blockBuilder).buildEntry(elementBuilder -> {
+                        for (Object elementValue : array) {
+                            writeValue(elementType, elementBuilder, elementValue);
+                        }
+                    });
                 }
-                else if (type instanceof MapType) {
+                else if (type instanceof MapType mapType) {
                     Map<?, ?> map = (Map<?, ?>) value;
-                    Type keyType = type.getTypeParameters().get(0);
-                    Type valueType = type.getTypeParameters().get(1);
-                    BlockBuilder mapBlockBuilder = blockBuilder.beginBlockEntry();
-                    for (Entry<?, ?> entry : map.entrySet()) {
-                        writeValue(keyType, mapBlockBuilder, entry.getKey());
-                        writeValue(valueType, mapBlockBuilder, entry.getValue());
-                    }
-                    blockBuilder.closeEntry();
+                    Type keyType = mapType.getKeyType();
+                    Type valueType = mapType.getValueType();
+                    ((MapBlockBuilder) blockBuilder).buildEntry((keyBuilder, valueBuilder) -> {
+                        map.forEach((key, value1) -> {
+                            writeValue(keyType, keyBuilder, key);
+                            writeValue(valueType, valueBuilder, value1);
+                        });
+                    });
                 }
                 else if (type instanceof RowType) {
                     List<?> array = (List<?>) value;
                     List<Type> fieldTypes = type.getTypeParameters();
-                    BlockBuilder rowBlockBuilder = blockBuilder.beginBlockEntry();
-                    for (int fieldId = 0; fieldId < fieldTypes.size(); fieldId++) {
-                        Type fieldType = fieldTypes.get(fieldId);
-                        writeValue(fieldType, rowBlockBuilder, array.get(fieldId));
-                    }
-                    blockBuilder.closeEntry();
+                    ((RowBlockBuilder) blockBuilder).buildEntry(fieldBuilders -> {
+                        for (int fieldId = 0; fieldId < fieldTypes.size(); fieldId++) {
+                            Type fieldType = fieldTypes.get(fieldId);
+                            writeValue(fieldType, fieldBuilders.get(fieldId), array.get(fieldId));
+                        }
+                    });
                 }
                 else {
                     throw new IllegalArgumentException("Unsupported type " + type);
@@ -1077,6 +1097,9 @@ private static ObjectInspector getJavaObjectInspector(Type type)
         if (type.equals(DATE)) {
             return javaDateObjectInspector;
         }
+        if (type.equals(TIME_MICROS)) {
+            return javaLongObjectInspector;
+        }
         if (type.equals(TIMESTAMP_MILLIS) || type.equals(TIMESTAMP_MICROS) || type.equals(TIMESTAMP_NANOS)) {
             return javaTimestampObjectInspector;
         }
@@ -1148,6 +1171,9 @@ private static Object preprocessWriteValueHive(Type type, Object value)
         if (type.equals(DATE)) {
             return Date.ofEpochDay(((SqlDate) value).getDays());
         }
+        if (type.equals(TIME_MICROS)) {
+            return ((SqlTime) value).getPicos() / PICOSECONDS_PER_MICROSECOND;
+        }
         if (type.equals(TIMESTAMP_MILLIS) || type.equals(TIMESTAMP_MICROS) || type.equals(TIMESTAMP_NANOS)) {
             LocalDateTime dateTime = ((SqlTimestamp) value).toLocalDateTime();
             return Timestamp.ofEpochSecond(dateTime.toEpochSecond(ZoneOffset.UTC), dateTime.getNano());
@@ -1351,6 +1377,25 @@ private static Type rowType(Type... fieldTypes)
         return TESTING_TYPE_MANAGER.getParameterizedType(StandardTypes.ROW, typeSignatureParameters.build());
     }
 
+    private static boolean containsTimeMicros(Type type)
+    {
+        if (type.equals(TIME_MICROS)) {
+            return true;
+        }
+        if (type instanceof ArrayType arrayType) {
+            return containsTimeMicros(arrayType.getElementType());
+        }
+        if (type instanceof MapType mapType) {
+            return containsTimeMicros(mapType.getKeyType()) || containsTimeMicros(mapType.getValueType());
+        }
+        if (type instanceof RowType rowType) {
+            return rowType.getFields().stream()
+                    .map(RowType.Field::getType)
+                    .anyMatch(OrcTester::containsTimeMicros);
+        }
+        return false;
+    }
+
     private static boolean isTimestampTz(Type type)
     {
         if (type instanceof TimestampWithTimeZoneType) {
@@ -1388,41 +1433,4 @@ private static boolean isUuid(Type type)
         }
         return false;
     }
-
-    public static class LocalTrinoOutputFile
-            implements TrinoOutputFile
-    {
-        private final File file;
-
-        public LocalTrinoOutputFile(File file)
-        {
-            this.file = file;
-        }
-
-        @Override
-        public OutputStream create(AggregatedMemoryContext memoryContext)
-                throws IOException
-        {
-            return new FileOutputStream(file);
-        }
-
-        @Override
-        public OutputStream createOrOverwrite(AggregatedMemoryContext memoryContext)
-                throws IOException
-        {
-            return new FileOutputStream(file);
-        }
-
-        @Override
-        public String location()
-        {
-            return file.getAbsolutePath();
-        }
-
-        @Override
-        public String toString()
-        {
-            return location();
-        }
-    }
 }
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/TestDictionaryBuilder.java b/lib/trino-orc/src/test/java/io/trino/orc/TestDictionaryBuilder.java
index e486503fe60f..3a56af57f175 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/TestDictionaryBuilder.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/TestDictionaryBuilder.java
@@ -14,7 +14,6 @@
 package io.trino.orc;
 
 import com.google.common.collect.ImmutableSet;
-import io.airlift.slice.Slice;
 import io.trino.orc.writer.DictionaryBuilder;
 import io.trino.spi.block.VariableWidthBlock;
 import org.testng.annotations.Test;
@@ -34,25 +33,9 @@ public void testSkipReservedSlots()
         Set<Integer> positions = new HashSet<>();
         DictionaryBuilder dictionaryBuilder = new DictionaryBuilder(64);
         for (int i = 0; i < 64; i++) {
-            positions.add(dictionaryBuilder.putIfAbsent(new TestHashCollisionBlock(1, wrappedBuffer(new byte[] {1}), new int[] {0, 1}, new boolean[] {false}), 0));
-            positions.add(dictionaryBuilder.putIfAbsent(new TestHashCollisionBlock(1, wrappedBuffer(new byte[] {2}), new int[] {0, 1}, new boolean[] {false}), 0));
+            positions.add(dictionaryBuilder.putIfAbsent(new VariableWidthBlock(1, wrappedBuffer(new byte[] {1}), new int[] {0, 1}, Optional.of(new boolean[] {false})), 0));
+            positions.add(dictionaryBuilder.putIfAbsent(new VariableWidthBlock(1, wrappedBuffer(new byte[] {2}), new int[] {0, 1}, Optional.of(new boolean[] {false})), 0));
         }
         assertEquals(positions, ImmutableSet.of(1, 2));
     }
-
-    private static class TestHashCollisionBlock
-            extends VariableWidthBlock
-    {
-        public TestHashCollisionBlock(int positionCount, Slice slice, int[] offsets, boolean[] valueIsNull)
-        {
-            super(positionCount, slice, offsets, Optional.of(valueIsNull));
-        }
-
-        @Override
-        public long hash(int position, int offset, int length)
-        {
-            // return 0 to hash to the reserved null position which is zero
-            return 0;
-        }
-    }
 }
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/TestDictionaryCompressionOptimizer.java b/lib/trino-orc/src/test/java/io/trino/orc/TestDictionaryCompressionOptimizer.java
index ed82fa0f3253..60d9f6a92686 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/TestDictionaryCompressionOptimizer.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/TestDictionaryCompressionOptimizer.java
@@ -153,7 +153,7 @@ public void testSingleDictionaryColumnMemoryLimit()
         // construct a simulator that will hit the dictionary (low) memory limit by estimating the number of rows at the memory limit, and then setting large limits around this value
         int stripeMaxBytes = megabytes(100);
         int dictionaryMaxMemoryBytesLow = dictionaryMaxMemoryBytes - (int) DICTIONARY_MEMORY_MAX_RANGE.toBytes();
-        int expectedMaxRowCount = (int) (dictionaryMaxMemoryBytesLow / bytesPerEntry / uniquePercentage);
+        int expectedMaxRowCount = (int) (1.0 * dictionaryMaxMemoryBytesLow / bytesPerEntry / uniquePercentage);
         DataSimulator simulator = new DataSimulator(0, stripeMaxBytes, expectedMaxRowCount * 2, dictionaryMaxMemoryBytes, 0, column);
 
         for (int loop = 0; loop < 3; loop++) {
@@ -191,7 +191,7 @@ public void testDirectConversionOnDictionaryFull()
 
         // construct a simulator that will flip the column to direct and then hit the bytes limit
         int stripeMaxBytes = megabytes(100);
-        int expectedRowCountAtFlip = (int) (dictionaryMaxMemoryBytes / bytesPerEntry / uniquePercentage);
+        int expectedRowCountAtFlip = (int) (1.0 * dictionaryMaxMemoryBytes / bytesPerEntry / uniquePercentage);
         int expectedMaxRowCountAtFull = stripeMaxBytes / bytesPerEntry;
         DataSimulator simulator = new DataSimulator(stripeMaxBytes / 2, stripeMaxBytes, expectedMaxRowCountAtFull * 2, dictionaryMaxMemoryBytes, 0, column);
 
@@ -239,7 +239,7 @@ public void testNotDirectConversionOnDictionaryFull()
         // construct a simulator that will be full because of dictionary memory limit;
         // the column cannot not be converted to direct encoding because of stripe size limit
         int stripeMaxBytes = megabytes(100);
-        int expectedMaxRowCount = (int) (dictionaryMaxMemoryBytes / bytesPerEntry / uniquePercentage);
+        int expectedMaxRowCount = (int) (1.0 * dictionaryMaxMemoryBytes / bytesPerEntry / uniquePercentage);
         DataSimulator simulator = new DataSimulator(stripeMaxBytes / 2, stripeMaxBytes, expectedMaxRowCount * 2, dictionaryMaxMemoryBytes, 0, column);
 
         for (int loop = 0; loop < 3; loop++) {
@@ -573,7 +573,7 @@ public long getBufferedBytes()
             }
             int dictionaryEntries = getDictionaryEntries();
             int bytesPerValue = estimateIndexBytesPerValue(dictionaryEntries);
-            return (dictionaryEntries * bytesPerEntry) + (getNonNullValueCount() * bytesPerValue);
+            return ((long) dictionaryEntries * bytesPerEntry) + (getNonNullValueCount() * bytesPerValue);
         }
 
         @Override
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/TestFullOrcReader.java b/lib/trino-orc/src/test/java/io/trino/orc/TestFullOrcReader.java
index e34f27b937c5..ca19adab15e2 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/TestFullOrcReader.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/TestFullOrcReader.java
@@ -13,9 +13,6 @@
  */
 package io.trino.orc;
 
-import org.testng.annotations.Test;
-
-@Test(groups = "ci")
 public class TestFullOrcReader
         extends AbstractTestOrcReader
 {
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/TestOrcBloomFilters.java b/lib/trino-orc/src/test/java/io/trino/orc/TestOrcBloomFilters.java
index fcd220808c65..457501bbd43e 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/TestOrcBloomFilters.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/TestOrcBloomFilters.java
@@ -131,7 +131,7 @@ public void testOrcHiveBloomFilterSerde()
 
         // Read through method
         InputStream inputStream = bloomFilterBytes.getInput();
-        OrcMetadataReader metadataReader = new OrcMetadataReader();
+        OrcMetadataReader metadataReader = new OrcMetadataReader(new OrcReaderOptions());
         List<BloomFilter> bloomFilters = metadataReader.readBloomFilterIndexes(inputStream);
 
         assertEquals(bloomFilters.size(), 1);
@@ -168,7 +168,7 @@ public void testOrcHiveBloomFilterSerde()
     @Test
     public void testBloomFilterPredicateValuesExisting()
     {
-        BloomFilter bloomFilter = new BloomFilter(TEST_VALUES.size() * 10, 0.01);
+        BloomFilter bloomFilter = new BloomFilter(TEST_VALUES.size() * 10L, 0.01);
 
         for (Map.Entry<Object, Type> testValue : TEST_VALUES.entrySet()) {
             Object o = testValue.getKey();
@@ -212,7 +212,7 @@ else if (o instanceof Double) {
     @Test
     public void testBloomFilterPredicateValuesNonExisting()
     {
-        BloomFilter bloomFilter = new BloomFilter(TEST_VALUES.size() * 10, 0.01);
+        BloomFilter bloomFilter = new BloomFilter(TEST_VALUES.size() * 10L, 0.01);
 
         for (Map.Entry<Object, Type> testValue : TEST_VALUES.entrySet()) {
             boolean matched = checkInBloomFilter(bloomFilter, testValue.getKey(), testValue.getValue());
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/TestOrcLz4.java b/lib/trino-orc/src/test/java/io/trino/orc/TestOrcLz4.java
index beeef57b67b9..59b40f444c63 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/TestOrcLz4.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/TestOrcLz4.java
@@ -74,7 +74,7 @@ public void testReadLz4(byte[] data)
 
                 for (int position = 0; position < page.getPositionCount(); position++) {
                     BIGINT.getLong(xBlock, position);
-                    INTEGER.getLong(yBlock, position);
+                    INTEGER.getInt(yBlock, position);
                     BIGINT.getLong(zBlock, position);
                 }
             }
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/TestOrcReaderPositions.java b/lib/trino-orc/src/test/java/io/trino/orc/TestOrcReaderPositions.java
index ced10471396a..3e680de6c30c 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/TestOrcReaderPositions.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/TestOrcReaderPositions.java
@@ -224,7 +224,7 @@ public void testBatchSizesForVariableWidth()
                     rowCountsInCurrentRowGroup += page.getPositionCount();
 
                     Block block = page.getBlock(0);
-                    if (MAX_BATCH_SIZE * currentStringBytes <= READER_OPTIONS.getMaxBlockSize().toBytes()) {
+                    if (MAX_BATCH_SIZE * (long) currentStringBytes <= READER_OPTIONS.getMaxBlockSize().toBytes()) {
                         // Either we are bounded by 1024 rows per batch, or it is the last batch in the row group
                         // For the first 3 row groups, the strings are of length 300, 600, and 900 respectively
                         // So the loaded data is bounded by MAX_BATCH_SIZE
@@ -374,7 +374,7 @@ private static void assertCurrentBatch(Page page, int rowIndex, int batchSize)
     {
         Block block = page.getBlock(0);
         for (int i = 0; i < batchSize; i++) {
-            assertEquals(BIGINT.getLong(block, i), (rowIndex + i) * 3);
+            assertEquals(BIGINT.getLong(block, i), (rowIndex + i) * 3L);
         }
     }
 
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/TestOrcWithoutRowGroupInfo.java b/lib/trino-orc/src/test/java/io/trino/orc/TestOrcWithoutRowGroupInfo.java
index 62ab61939139..bc6a53643f25 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/TestOrcWithoutRowGroupInfo.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/TestOrcWithoutRowGroupInfo.java
@@ -17,6 +17,7 @@
 import io.trino.orc.metadata.OrcColumnId;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.type.RowType;
 import org.joda.time.DateTimeZone;
@@ -84,9 +85,8 @@ private void testAndVerifyResults(OrcPredicate orcPredicate)
             Block rowBlock = page.getBlock(5);
 
             for (int position = 0; position < page.getPositionCount(); position++) {
-                BIGINT.getLong(
-                        rowType.getObject(rowBlock, 0),
-                        0);
+                SqlRow sqlRow = rowType.getObject(rowBlock, 0);
+                BIGINT.getLong(sqlRow.getRawFieldBlock(0), sqlRow.getRawIndex());
             }
         }
 
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/TestOrcWriter.java b/lib/trino-orc/src/test/java/io/trino/orc/TestOrcWriter.java
index be63c869ffcd..19097430462f 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/TestOrcWriter.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/TestOrcWriter.java
@@ -19,7 +19,7 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
-import io.trino.orc.OrcTester.LocalTrinoOutputFile;
+import io.trino.filesystem.local.LocalOutputFile;
 import io.trino.orc.OrcWriteValidation.OrcWriteValidationMode;
 import io.trino.orc.metadata.Footer;
 import io.trino.orc.metadata.OrcMetadataReader;
@@ -31,7 +31,7 @@
 import io.trino.orc.stream.OrcInputStream;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.type.Type;
 import org.testng.annotations.Test;
 
@@ -67,7 +67,7 @@ public void testWriteOutputStreamsInOrder()
             List<Type> types = ImmutableList.of(VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR);
 
             OrcWriter writer = new OrcWriter(
-                    OutputStreamOrcDataSink.create(new LocalTrinoOutputFile(tempFile.getFile())),
+                    OutputStreamOrcDataSink.create(new LocalOutputFile(tempFile.getFile())),
                     ImmutableList.of("test1", "test2", "test3", "test4", "test5"),
                     types,
                     OrcType.createRootOrcType(columnNames, types),
@@ -88,17 +88,16 @@ public void testWriteOutputStreamsInOrder()
             String[] data = new String[] {"a", "bbbbb", "ccc", "dd", "eeee"};
             Block[] blocks = new Block[data.length];
             int entries = 65536;
-            BlockBuilder blockBuilder = VARCHAR.createBlockBuilder(null, entries);
+            VariableWidthBlockBuilder blockBuilder = VARCHAR.createBlockBuilder(null, entries);
             for (int i = 0; i < data.length; i++) {
                 byte[] bytes = data[i].getBytes(UTF_8);
                 for (int j = 0; j < entries; j++) {
                     // force to write different data
                     bytes[0] = (byte) ((bytes[0] + 1) % 128);
-                    blockBuilder.writeBytes(Slices.wrappedBuffer(bytes, 0, bytes.length), 0, bytes.length);
-                    blockBuilder.closeEntry();
+                    blockBuilder.writeEntry(Slices.wrappedBuffer(bytes, 0, bytes.length));
                 }
                 blocks[i] = blockBuilder.build();
-                blockBuilder = blockBuilder.newBlockBuilderLike(null);
+                blockBuilder = (VariableWidthBlockBuilder) blockBuilder.newBlockBuilderLike(null);
             }
 
             writer.write(new Page(blocks));
@@ -117,7 +116,7 @@ public void testWriteOutputStreamsInOrder()
                 // read the footer
                 Slice tailBuffer = orcDataSource.readFully(stripe.getOffset() + stripe.getIndexLength() + stripe.getDataLength(), toIntExact(stripe.getFooterLength()));
                 try (InputStream inputStream = new OrcInputStream(OrcChunkLoader.create(orcDataSource.getId(), tailBuffer, Optional.empty(), newSimpleAggregatedMemoryContext()))) {
-                    StripeFooter stripeFooter = new OrcMetadataReader().readStripeFooter(footer.getTypes(), inputStream, ZoneId.of("UTC"));
+                    StripeFooter stripeFooter = new OrcMetadataReader(new OrcReaderOptions()).readStripeFooter(footer.getTypes(), inputStream, ZoneId.of("UTC"));
 
                     int size = 0;
                     boolean dataStreamStarted = false;
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/TestSliceDictionaryColumnReader.java b/lib/trino-orc/src/test/java/io/trino/orc/TestSliceDictionaryColumnReader.java
index 678830fd83eb..3bdc5cde691b 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/TestSliceDictionaryColumnReader.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/TestSliceDictionaryColumnReader.java
@@ -72,7 +72,7 @@ public void testDictionaryReaderUpdatesRetainedSize()
                 footer.getRowsInRowGroup(),
                 OrcPredicate.TRUE,
                 ORIGINAL,
-                new OrcMetadataReader(),
+                new OrcMetadataReader(new OrcReaderOptions()),
                 Optional.empty());
         AggregatedMemoryContext memoryContext = newSimpleAggregatedMemoryContext();
         SliceDictionaryColumnReader columnReader = new SliceDictionaryColumnReader(columns.get(0), memoryContext.newLocalMemoryContext(TestSliceDictionaryColumnReader.class.getSimpleName()), -1, false);
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/TestSliceDictionaryColumnWriter.java b/lib/trino-orc/src/test/java/io/trino/orc/TestSliceDictionaryColumnWriter.java
index 14b902e4ed1b..d483409e2a54 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/TestSliceDictionaryColumnWriter.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/TestSliceDictionaryColumnWriter.java
@@ -102,8 +102,7 @@ public void testBloomFiltersAfterConvertToDirect()
             testValues.add(value);
             base = (byte) (base + i);
             if (i % 9 == 0) {
-                blockBuilder.writeBytes(value, 0, value.length());
-                blockBuilder.closeEntry();
+                blockBuilder.writeEntry(value);
             }
         }
 
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/TestStructColumnReader.java b/lib/trino-orc/src/test/java/io/trino/orc/TestStructColumnReader.java
index 3aedfb333dbd..f5926371236e 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/TestStructColumnReader.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/TestStructColumnReader.java
@@ -16,14 +16,15 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
-import io.trino.orc.OrcTester.LocalTrinoOutputFile;
+import io.trino.filesystem.local.LocalOutputFile;
 import io.trino.orc.metadata.OrcType;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.RowBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.type.NamedTypeSignature;
 import io.trino.spi.type.RowFieldName;
 import io.trino.spi.type.StandardTypes;
@@ -49,7 +50,6 @@
 import static io.trino.orc.metadata.CompressionKind.NONE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.joda.time.DateTimeZone.UTC;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
@@ -57,8 +57,6 @@
 @Test(singleThreaded = true)
 public class TestStructColumnReader
 {
-    private static final Type TEST_DATA_TYPE = VARCHAR;
-
     private static final String STRUCT_COL_NAME = "struct_col";
 
     private TempFile tempFile;
@@ -216,7 +214,7 @@ private void write(TempFile tempFile, Type writerType, List<String> data)
         List<String> columnNames = ImmutableList.of(STRUCT_COL_NAME);
         List<Type> types = ImmutableList.of(writerType);
         OrcWriter writer = new OrcWriter(
-                OutputStreamOrcDataSink.create(new LocalTrinoOutputFile(tempFile.getFile())),
+                OutputStreamOrcDataSink.create(new LocalOutputFile(tempFile.getFile())),
                 columnNames,
                 types,
                 OrcType.createRootOrcType(columnNames, types),
@@ -236,20 +234,17 @@ private void write(TempFile tempFile, Type writerType, List<String> data)
         Block[] fieldBlocks = new Block[data.size()];
 
         int entries = 10;
-        boolean[] rowIsNull = new boolean[entries];
-        Arrays.fill(rowIsNull, false);
-
-        BlockBuilder blockBuilder = TEST_DATA_TYPE.createBlockBuilder(null, entries);
-        for (int i = 0; i < data.size(); i++) {
-            byte[] bytes = data.get(i).getBytes(UTF_8);
-            for (int j = 0; j < entries; j++) {
-                blockBuilder.writeBytes(Slices.wrappedBuffer(bytes), 0, bytes.length);
-                blockBuilder.closeEntry();
+
+        VariableWidthBlockBuilder fieldBlockBuilder = VARCHAR.createBlockBuilder(null, entries);
+        for (int fieldId = 0; fieldId < data.size(); fieldId++) {
+            Slice fieldValue = Slices.utf8Slice(data.get(fieldId));
+            for (int rowId = 0; rowId < entries; rowId++) {
+                fieldBlockBuilder.writeEntry(fieldValue);
             }
-            fieldBlocks[i] = blockBuilder.build();
-            blockBuilder = blockBuilder.newBlockBuilderLike(null);
+            fieldBlocks[fieldId] = fieldBlockBuilder.build();
+            fieldBlockBuilder = (VariableWidthBlockBuilder) fieldBlockBuilder.newBlockBuilderLike(null);
         }
-        Block rowBlock = RowBlock.fromFieldBlocks(rowIsNull.length, Optional.of(rowIsNull), fieldBlocks);
+        Block rowBlock = RowBlock.fromFieldBlocks(entries, fieldBlocks);
         writer.write(new Page(rowBlock));
         writer.close();
     }
@@ -279,7 +274,7 @@ private Type getType(List<String> fieldNames)
     {
         ImmutableList.Builder<TypeSignatureParameter> typeSignatureParameters = ImmutableList.builder();
         for (String fieldName : fieldNames) {
-            typeSignatureParameters.add(TypeSignatureParameter.namedTypeParameter(new NamedTypeSignature(Optional.of(new RowFieldName(fieldName)), TEST_DATA_TYPE.getTypeSignature())));
+            typeSignatureParameters.add(TypeSignatureParameter.namedTypeParameter(new NamedTypeSignature(Optional.of(new RowFieldName(fieldName)), VARCHAR.getTypeSignature())));
         }
         return TESTING_TYPE_MANAGER.getParameterizedType(StandardTypes.ROW, typeSignatureParameters.build());
     }
@@ -289,7 +284,7 @@ private Type getTypeNullName(int numFields)
         ImmutableList.Builder<TypeSignatureParameter> typeSignatureParameters = ImmutableList.builder();
 
         for (int i = 0; i < numFields; i++) {
-            typeSignatureParameters.add(TypeSignatureParameter.namedTypeParameter(new NamedTypeSignature(Optional.empty(), TEST_DATA_TYPE.getTypeSignature())));
+            typeSignatureParameters.add(TypeSignatureParameter.namedTypeParameter(new NamedTypeSignature(Optional.empty(), VARCHAR.getTypeSignature())));
         }
         return TESTING_TYPE_MANAGER.getParameterizedType(StandardTypes.ROW, typeSignatureParameters.build());
     }
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/TestingOrcPredicate.java b/lib/trino-orc/src/test/java/io/trino/orc/TestingOrcPredicate.java
index 7e1dc5f18353..05777fa6b9be 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/TestingOrcPredicate.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/TestingOrcPredicate.java
@@ -29,6 +29,7 @@
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.SqlDate;
 import io.trino.spi.type.SqlDecimal;
+import io.trino.spi.type.SqlTime;
 import io.trino.spi.type.SqlTimestamp;
 import io.trino.spi.type.SqlTimestampWithTimeZone;
 import io.trino.spi.type.Type;
@@ -51,6 +52,7 @@
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TimeType.TIME_MICROS;
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
@@ -58,6 +60,7 @@
 import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MICROS;
 import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
 import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_NANOS;
+import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MICROSECOND;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.UuidType.UUID;
 import static java.util.stream.Collectors.toList;
@@ -103,6 +106,9 @@ public static OrcPredicate createOrcPredicate(Type type, Iterable<?> values)
             return new DecimalOrcPredicate(expectedValues);
         }
 
+        if (TIME_MICROS.equals(type)) {
+            return new LongOrcPredicate(false, transform(expectedValues, value -> ((SqlTime) value).getPicos() / PICOSECONDS_PER_MICROSECOND));
+        }
         if (TIMESTAMP_MILLIS.equals(type)) {
             return new LongOrcPredicate(false, transform(expectedValues, value -> ((SqlTimestamp) value).getMillis()));
         }
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/metadata/statistics/AbstractStatisticsBuilderTest.java b/lib/trino-orc/src/test/java/io/trino/orc/metadata/statistics/AbstractStatisticsBuilderTest.java
index c577d14356b5..cd3b016eb19e 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/metadata/statistics/AbstractStatisticsBuilderTest.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/metadata/statistics/AbstractStatisticsBuilderTest.java
@@ -130,7 +130,7 @@ private void assertValuesInternal(T expectedMin, T expectedMax, List<T> values)
         }
     }
 
-    protected static void assertNoColumnStatistics(ColumnStatistics columnStatistics, int expectedNumberOfValues)
+    protected static void assertNoColumnStatistics(ColumnStatistics columnStatistics, long expectedNumberOfValues)
     {
         assertEquals(columnStatistics.getNumberOfValues(), expectedNumberOfValues);
         assertNull(columnStatistics.getBooleanStatistics());
@@ -158,7 +158,7 @@ private void assertColumnStatistics(
         assertColumnStatistics(columnStatistics, expectedNumberOfValues, expectedMin, expectedMax);
 
         // merge in forward order
-        int totalCount = aggregateColumnStatistics.getTotalCount();
+        long totalCount = aggregateColumnStatistics.getTotalCount();
         assertColumnStatistics(aggregateColumnStatistics.getMergedColumnStatistics(Optional.empty()), totalCount, expectedMin, expectedMax);
         assertColumnStatistics(aggregateColumnStatistics.getMergedColumnStatisticsPairwise(Optional.empty()), totalCount, expectedMin, expectedMax);
 
@@ -181,7 +181,7 @@ static List<ColumnStatistics> insertEmptyColumnStatisticsAt(List<ColumnStatistic
         return newStatisticsList;
     }
 
-    protected void assertColumnStatistics(ColumnStatistics columnStatistics, int expectedNumberOfValues, T expectedMin, T expectedMax)
+    protected void assertColumnStatistics(ColumnStatistics columnStatistics, long expectedNumberOfValues, T expectedMin, T expectedMax)
     {
         assertEquals(columnStatistics.getNumberOfValues(), expectedNumberOfValues);
 
@@ -239,7 +239,7 @@ void assertRangeStatistics(RangeStatistics<?> rangeStatistics, T expectedMin, T
 
     public static class AggregateColumnStatistics
     {
-        private int totalCount;
+        private long totalCount;
         private final ImmutableList.Builder<ColumnStatistics> statisticsList = ImmutableList.builder();
 
         public void add(ColumnStatistics columnStatistics)
@@ -248,7 +248,7 @@ public void add(ColumnStatistics columnStatistics)
             statisticsList.add(columnStatistics);
         }
 
-        public int getTotalCount()
+        public long getTotalCount()
         {
             return totalCount;
         }
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/stream/BenchmarkLongBitPacker.java b/lib/trino-orc/src/test/java/io/trino/orc/stream/BenchmarkLongBitPacker.java
index fb4c7ef9e691..eaf7d3cc29c4 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/stream/BenchmarkLongBitPacker.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/stream/BenchmarkLongBitPacker.java
@@ -28,7 +28,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 
 import static io.trino.jmh.Benchmarks.benchmark;
@@ -216,9 +215,7 @@ public static class BenchmarkData
         @Setup
         public void setup()
         {
-            byte[] bytes = new byte[256 * 64];
-            ThreadLocalRandom.current().nextBytes(bytes);
-            input = Slices.wrappedBuffer(bytes).getInput();
+            input = Slices.random(256 * 64).getInput();
         }
     }
 
diff --git a/lib/trino-orc/src/test/java/io/trino/orc/stream/TestLongDecode.java b/lib/trino-orc/src/test/java/io/trino/orc/stream/TestLongDecode.java
index 1852bc12add9..361c006f71f1 100644
--- a/lib/trino-orc/src/test/java/io/trino/orc/stream/TestLongDecode.java
+++ b/lib/trino-orc/src/test/java/io/trino/orc/stream/TestLongDecode.java
@@ -75,12 +75,12 @@ private static void assertVIntRoundTrip(SliceOutput output, long value, boolean
         else {
             writeVulong(output, value);
         }
-        Slice hiveBytes = Slices.copyOf(output.slice());
+        Slice hiveBytes = output.slice().copy();
 
         // write using Trino's code, and verify they are the same
         output.reset();
         writeVLong(output, value, signed);
-        Slice trinoBytes = Slices.copyOf(output.slice());
+        Slice trinoBytes = output.slice().copy();
         if (!trinoBytes.equals(hiveBytes)) {
             assertEquals(trinoBytes, hiveBytes);
         }
diff --git a/lib/trino-parquet/pom.xml b/lib/trino-parquet/pom.xml
index 1283f6d3e5fa..b8e98caa64eb 100644
--- a/lib/trino-parquet/pom.xml
+++ b/lib/trino-parquet/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-parquet</artifactId>
-    <name>trino-parquet</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,18 +17,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-memory-context</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino.hive</groupId>
-            <artifactId>hive-apache</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
@@ -53,14 +42,13 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-memory-context</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
@@ -68,25 +56,41 @@
             <artifactId>fastutil</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-column</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.xerial.snappy</groupId>
-            <artifactId>snappy-java</artifactId>
-            <scope>runtime</scope>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-encoding</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-format-structures</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-hadoop</artifactId>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-spi</artifactId>
@@ -105,14 +109,36 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for benchmark -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-benchmark</artifactId>
             <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -138,14 +164,14 @@
         </dependency>
 
         <dependency>
-            <groupId>io.trino.tpch</groupId>
-            <artifactId>tpch</artifactId>
+            <groupId>io.trino.hive</groupId>
+            <artifactId>hive-apache</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>io.trino.tpch</groupId>
+            <artifactId>tpch</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -173,4 +199,37 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <!--Disabled to reduce logging in CI https://github.com/trinodb/trino/issues/17452 -->
+                        <ProgressLoggingListener.enabled>false</ProgressLoggingListener.enabled>
+                    </systemPropertyVariables>
+                </configuration>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/AbstractParquetDataSource.java b/lib/trino-parquet/src/main/java/io/trino/parquet/AbstractParquetDataSource.java
index 7bf97d49a891..459b6eea7be3 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/AbstractParquetDataSource.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/AbstractParquetDataSource.java
@@ -36,6 +36,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static java.lang.Math.min;
 import static java.lang.Math.toIntExact;
 import static java.util.Comparator.comparingLong;
 import static java.util.Objects.requireNonNull;
@@ -59,7 +60,8 @@ protected AbstractParquetDataSource(ParquetDataSourceId id, long estimatedSize,
     protected Slice readTailInternal(int length)
             throws IOException
     {
-        return readFully(estimatedSize - length, length);
+        int readSize = toIntExact(min(estimatedSize, length));
+        return readFully(estimatedSize - readSize, readSize);
     }
 
     protected abstract void readInternal(long position, byte[] buffer, int bufferOffset, int bufferLength)
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/BloomFilterStore.java b/lib/trino-parquet/src/main/java/io/trino/parquet/BloomFilterStore.java
index 534e8eae417b..85c3dc616eb4 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/BloomFilterStore.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/BloomFilterStore.java
@@ -16,6 +16,9 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.slice.BasicSliceInput;
 import io.airlift.slice.Slice;
+import io.trino.spi.predicate.Domain;
+import io.trino.spi.predicate.TupleDomain;
+import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.column.values.bloomfilter.BlockSplitBloomFilter;
 import org.apache.parquet.column.values.bloomfilter.BloomFilter;
 import org.apache.parquet.format.BloomFilterHeader;
@@ -32,6 +35,7 @@
 import java.util.Set;
 
 import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static org.apache.parquet.column.values.bloomfilter.BlockSplitBloomFilter.UPPER_BOUND_BYTES;
@@ -92,6 +96,30 @@ public Optional<BloomFilter> getBloomFilter(ColumnPath columnPath)
         }
     }
 
+    public static Optional<BloomFilterStore> getBloomFilterStore(
+            ParquetDataSource dataSource,
+            BlockMetaData blockMetadata,
+            TupleDomain<ColumnDescriptor> parquetTupleDomain,
+            ParquetReaderOptions options)
+    {
+        if (!options.useBloomFilter() || parquetTupleDomain.isAll() || parquetTupleDomain.isNone()) {
+            return Optional.empty();
+        }
+
+        boolean hasBloomFilter = blockMetadata.getColumns().stream().anyMatch(BloomFilterStore::hasBloomFilter);
+        if (!hasBloomFilter) {
+            return Optional.empty();
+        }
+
+        Map<ColumnDescriptor, Domain> parquetDomains = parquetTupleDomain.getDomains()
+                .orElseThrow(() -> new IllegalStateException("Predicate other than none should have domains"));
+        Set<ColumnPath> columnsFilteredPaths = parquetDomains.keySet().stream()
+                .map(column -> ColumnPath.get(column.getPath()))
+                .collect(toImmutableSet());
+
+        return Optional.of(new BloomFilterStore(dataSource, blockMetadata, columnsFilteredPaths));
+    }
+
     public static boolean hasBloomFilter(ColumnChunkMetaData columnMetaData)
     {
         return columnMetaData.getBloomFilterOffset() > 0;
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/ColumnStatisticsValidation.java b/lib/trino-parquet/src/main/java/io/trino/parquet/ColumnStatisticsValidation.java
index 71e29b6c1134..ef28f2469286 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/ColumnStatisticsValidation.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/ColumnStatisticsValidation.java
@@ -18,7 +18,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.ColumnarArray;
 import io.trino.spi.block.ColumnarMap;
-import io.trino.spi.block.ColumnarRow;
+import io.trino.spi.block.RowBlock;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
@@ -86,13 +86,9 @@ else if (type instanceof MapType) {
             mergedColumnStatistics = columnStatistics.merge(addMapBlock(columnarMap));
         }
         else if (type instanceof RowType) {
-            ColumnarRow columnarRow = ColumnarRow.toColumnarRow(block);
-            ImmutableList.Builder<Block> fieldsBuilder = ImmutableList.builder();
-            for (int index = 0; index < columnarRow.getFieldCount(); index++) {
-                fieldsBuilder.add(columnarRow.getField(index));
-            }
-            fields = fieldsBuilder.build();
-            mergedColumnStatistics = columnStatistics.merge(addRowBlock(columnarRow));
+            // the validation code is designed to work with null-suppressed blocks
+            fields = RowBlock.getNullSuppressedRowFieldsFromBlock(block);
+            mergedColumnStatistics = columnStatistics.merge(addRowBlock(block));
         }
         else {
             throw new TrinoException(NOT_SUPPORTED, format("Unsupported type: %s", type));
@@ -148,7 +144,7 @@ private static ColumnStatistics addArrayBlock(ColumnarArray block)
         return new ColumnStatistics(nonLeafValuesCount, nonLeafValuesCount);
     }
 
-    private static ColumnStatistics addRowBlock(ColumnarRow block)
+    private static ColumnStatistics addRowBlock(Block block)
     {
         if (!block.mayHaveNull()) {
             return new ColumnStatistics(0, 0);
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetCompressionUtils.java b/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetCompressionUtils.java
index 5d3db9d318a1..d482f627caac 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetCompressionUtils.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetCompressionUtils.java
@@ -72,9 +72,14 @@ public static Slice decompress(CompressionCodec codec, Slice input, int uncompre
 
     private static Slice decompressSnappy(Slice input, int uncompressedSize)
     {
-        byte[] buffer = new byte[uncompressedSize];
-        decompress(new SnappyDecompressor(), input, 0, input.length(), buffer, 0);
-        return wrappedBuffer(buffer);
+        // Snappy decompressor is more efficient if there's at least a long's worth of extra space
+        // in the output buffer
+        byte[] buffer = new byte[uncompressedSize + SIZE_OF_LONG];
+        int actualUncompressedSize = decompress(new SnappyDecompressor(), input, 0, input.length(), buffer, 0);
+        if (actualUncompressedSize != uncompressedSize) {
+            throw new IllegalArgumentException(format("Invalid uncompressedSize for SNAPPY input. Expected %s, actual: %s", uncompressedSize, actualUncompressedSize));
+        }
+        return wrappedBuffer(buffer, 0, uncompressedSize);
     }
 
     private static Slice decompressZstd(Slice input, int uncompressedSize)
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetEncoding.java b/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetEncoding.java
index f73524f7c09f..b547628e41e0 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetEncoding.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetEncoding.java
@@ -15,7 +15,6 @@
 
 import io.trino.parquet.dictionary.BinaryDictionary;
 import io.trino.parquet.dictionary.Dictionary;
-import io.trino.parquet.dictionary.DictionaryReader;
 import io.trino.parquet.dictionary.DoubleDictionary;
 import io.trino.parquet.dictionary.FloatDictionary;
 import io.trino.parquet.dictionary.IntegerDictionary;
@@ -106,24 +105,12 @@ public ValuesReader getValuesReader(ColumnDescriptor descriptor, ValuesType valu
     },
 
     PLAIN_DICTIONARY {
-        @Override
-        public ValuesReader getDictionaryBasedValuesReader(ColumnDescriptor descriptor, ValuesType valuesType, Dictionary dictionary)
-        {
-            return RLE_DICTIONARY.getDictionaryBasedValuesReader(descriptor, valuesType, dictionary);
-        }
-
         @Override
         public Dictionary initDictionary(ColumnDescriptor descriptor, DictionaryPage dictionaryPage)
                 throws IOException
         {
             return PLAIN.initDictionary(descriptor, dictionaryPage);
         }
-
-        @Override
-        public boolean usesDictionary()
-        {
-            return true;
-        }
     },
 
     DELTA_BINARY_PACKED {
@@ -156,24 +143,12 @@ public ValuesReader getValuesReader(ColumnDescriptor descriptor, ValuesType valu
     },
 
     RLE_DICTIONARY {
-        @Override
-        public ValuesReader getDictionaryBasedValuesReader(ColumnDescriptor descriptor, ValuesType valuesType, Dictionary dictionary)
-        {
-            return new DictionaryReader(dictionary);
-        }
-
         @Override
         public Dictionary initDictionary(ColumnDescriptor descriptor, DictionaryPage dictionaryPage)
                 throws IOException
         {
             return PLAIN.initDictionary(descriptor, dictionaryPage);
         }
-
-        @Override
-        public boolean usesDictionary()
-        {
-            return true;
-        }
     };
 
     static final int INT96_TYPE_LENGTH = 12;
@@ -192,11 +167,6 @@ static int getMaxLevel(ColumnDescriptor descriptor, ValuesType valuesType)
         };
     }
 
-    public boolean usesDictionary()
-    {
-        return false;
-    }
-
     public Dictionary initDictionary(ColumnDescriptor descriptor, DictionaryPage dictionaryPage)
             throws IOException
     {
@@ -207,9 +177,4 @@ public ValuesReader getValuesReader(ColumnDescriptor descriptor, ValuesType valu
     {
         throw new UnsupportedOperationException("Error decoding  values in encoding: " + this.name());
     }
-
-    public ValuesReader getDictionaryBasedValuesReader(ColumnDescriptor descriptor, ValuesType valuesType, Dictionary dictionary)
-    {
-        throw new UnsupportedOperationException(" Dictionary encoding is not supported for: " + name());
-    }
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetReaderOptions.java b/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetReaderOptions.java
index 56896a6f35f9..e0e7d4418fbb 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetReaderOptions.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetReaderOptions.java
@@ -25,6 +25,7 @@ public class ParquetReaderOptions
     private static final int DEFAULT_MAX_READ_BLOCK_ROW_COUNT = 8 * 1024;
     private static final DataSize DEFAULT_MAX_MERGE_DISTANCE = DataSize.of(1, MEGABYTE);
     private static final DataSize DEFAULT_MAX_BUFFER_SIZE = DataSize.of(8, MEGABYTE);
+    private static final DataSize DEFAULT_SMALL_FILE_THRESHOLD = DataSize.of(3, MEGABYTE);
 
     private final boolean ignoreStatistics;
     private final DataSize maxReadBlockSize;
@@ -32,9 +33,8 @@ public class ParquetReaderOptions
     private final DataSize maxMergeDistance;
     private final DataSize maxBufferSize;
     private final boolean useColumnIndex;
-    private final boolean useBatchColumnReaders;
-    private final boolean useBatchNestedColumnReaders;
     private final boolean useBloomFilter;
+    private final DataSize smallFileThreshold;
 
     public ParquetReaderOptions()
     {
@@ -44,9 +44,8 @@ public ParquetReaderOptions()
         maxMergeDistance = DEFAULT_MAX_MERGE_DISTANCE;
         maxBufferSize = DEFAULT_MAX_BUFFER_SIZE;
         useColumnIndex = true;
-        useBatchColumnReaders = true;
-        useBatchNestedColumnReaders = true;
         useBloomFilter = true;
+        smallFileThreshold = DEFAULT_SMALL_FILE_THRESHOLD;
     }
 
     private ParquetReaderOptions(
@@ -56,9 +55,8 @@ private ParquetReaderOptions(
             DataSize maxMergeDistance,
             DataSize maxBufferSize,
             boolean useColumnIndex,
-            boolean useBatchColumnReaders,
-            boolean useBatchNestedColumnReaders,
-            boolean useBloomFilter)
+            boolean useBloomFilter,
+            DataSize smallFileThreshold)
     {
         this.ignoreStatistics = ignoreStatistics;
         this.maxReadBlockSize = requireNonNull(maxReadBlockSize, "maxReadBlockSize is null");
@@ -67,9 +65,8 @@ private ParquetReaderOptions(
         this.maxMergeDistance = requireNonNull(maxMergeDistance, "maxMergeDistance is null");
         this.maxBufferSize = requireNonNull(maxBufferSize, "maxBufferSize is null");
         this.useColumnIndex = useColumnIndex;
-        this.useBatchColumnReaders = useBatchColumnReaders;
-        this.useBatchNestedColumnReaders = useBatchNestedColumnReaders;
         this.useBloomFilter = useBloomFilter;
+        this.smallFileThreshold = requireNonNull(smallFileThreshold, "smallFileThreshold is null");
     }
 
     public boolean isIgnoreStatistics()
@@ -92,16 +89,6 @@ public boolean isUseColumnIndex()
         return useColumnIndex;
     }
 
-    public boolean useBatchColumnReaders()
-    {
-        return useBatchColumnReaders;
-    }
-
-    public boolean useBatchNestedColumnReaders()
-    {
-        return useBatchNestedColumnReaders;
-    }
-
     public boolean useBloomFilter()
     {
         return useBloomFilter;
@@ -117,6 +104,11 @@ public int getMaxReadBlockRowCount()
         return maxReadBlockRowCount;
     }
 
+    public DataSize getSmallFileThreshold()
+    {
+        return smallFileThreshold;
+    }
+
     public ParquetReaderOptions withIgnoreStatistics(boolean ignoreStatistics)
     {
         return new ParquetReaderOptions(
@@ -126,9 +118,8 @@ public ParquetReaderOptions withIgnoreStatistics(boolean ignoreStatistics)
                 maxMergeDistance,
                 maxBufferSize,
                 useColumnIndex,
-                useBatchColumnReaders,
-                useBatchNestedColumnReaders,
-                useBloomFilter);
+                useBloomFilter,
+                smallFileThreshold);
     }
 
     public ParquetReaderOptions withMaxReadBlockSize(DataSize maxReadBlockSize)
@@ -140,9 +131,8 @@ public ParquetReaderOptions withMaxReadBlockSize(DataSize maxReadBlockSize)
                 maxMergeDistance,
                 maxBufferSize,
                 useColumnIndex,
-                useBatchColumnReaders,
-                useBatchNestedColumnReaders,
-                useBloomFilter);
+                useBloomFilter,
+                smallFileThreshold);
     }
 
     public ParquetReaderOptions withMaxReadBlockRowCount(int maxReadBlockRowCount)
@@ -154,9 +144,8 @@ public ParquetReaderOptions withMaxReadBlockRowCount(int maxReadBlockRowCount)
                 maxMergeDistance,
                 maxBufferSize,
                 useColumnIndex,
-                useBatchColumnReaders,
-                useBatchNestedColumnReaders,
-                useBloomFilter);
+                useBloomFilter,
+                smallFileThreshold);
     }
 
     public ParquetReaderOptions withMaxMergeDistance(DataSize maxMergeDistance)
@@ -168,9 +157,8 @@ public ParquetReaderOptions withMaxMergeDistance(DataSize maxMergeDistance)
                 maxMergeDistance,
                 maxBufferSize,
                 useColumnIndex,
-                useBatchColumnReaders,
-                useBatchNestedColumnReaders,
-                useBloomFilter);
+                useBloomFilter,
+                smallFileThreshold);
     }
 
     public ParquetReaderOptions withMaxBufferSize(DataSize maxBufferSize)
@@ -182,9 +170,8 @@ public ParquetReaderOptions withMaxBufferSize(DataSize maxBufferSize)
                 maxMergeDistance,
                 maxBufferSize,
                 useColumnIndex,
-                useBatchColumnReaders,
-                useBatchNestedColumnReaders,
-                useBloomFilter);
+                useBloomFilter,
+                smallFileThreshold);
     }
 
     public ParquetReaderOptions withUseColumnIndex(boolean useColumnIndex)
@@ -196,26 +183,11 @@ public ParquetReaderOptions withUseColumnIndex(boolean useColumnIndex)
                 maxMergeDistance,
                 maxBufferSize,
                 useColumnIndex,
-                useBatchColumnReaders,
-                useBatchNestedColumnReaders,
-                useBloomFilter);
+                useBloomFilter,
+                smallFileThreshold);
     }
 
-    public ParquetReaderOptions withBatchColumnReaders(boolean useBatchColumnReaders)
-    {
-        return new ParquetReaderOptions(
-                ignoreStatistics,
-                maxReadBlockSize,
-                maxReadBlockRowCount,
-                maxMergeDistance,
-                maxBufferSize,
-                useColumnIndex,
-                useBatchColumnReaders,
-                useBatchNestedColumnReaders,
-                useBloomFilter);
-    }
-
-    public ParquetReaderOptions withBatchNestedColumnReaders(boolean useBatchNestedColumnReaders)
+    public ParquetReaderOptions withBloomFilter(boolean useBloomFilter)
     {
         return new ParquetReaderOptions(
                 ignoreStatistics,
@@ -224,12 +196,11 @@ public ParquetReaderOptions withBatchNestedColumnReaders(boolean useBatchNestedC
                 maxMergeDistance,
                 maxBufferSize,
                 useColumnIndex,
-                useBatchColumnReaders,
-                useBatchNestedColumnReaders,
-                useBloomFilter);
+                useBloomFilter,
+                smallFileThreshold);
     }
 
-    public ParquetReaderOptions withBloomFilter(boolean useBloomFilter)
+    public ParquetReaderOptions withSmallFileThreshold(DataSize smallFileThreshold)
     {
         return new ParquetReaderOptions(
                 ignoreStatistics,
@@ -238,8 +209,7 @@ public ParquetReaderOptions withBloomFilter(boolean useBloomFilter)
                 maxMergeDistance,
                 maxBufferSize,
                 useColumnIndex,
-                useBatchColumnReaders,
-                useBatchNestedColumnReaders,
-                useBloomFilter);
+                useBloomFilter,
+                smallFileThreshold);
     }
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetTypeUtils.java b/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetTypeUtils.java
index 71234980612f..4797f6526a92 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetTypeUtils.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetTypeUtils.java
@@ -20,6 +20,7 @@
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.column.Encoding;
 import org.apache.parquet.io.ColumnIO;
@@ -32,8 +33,6 @@
 import org.apache.parquet.schema.LogicalTypeAnnotation.DecimalLogicalTypeAnnotation;
 import org.apache.parquet.schema.MessageType;
 
-import javax.annotation.Nullable;
-
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -45,8 +44,6 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static java.lang.String.format;
-import static org.apache.parquet.io.ColumnIOUtil.columnDefinitionLevel;
-import static org.apache.parquet.io.ColumnIOUtil.columnRepetitionLevel;
 import static org.apache.parquet.schema.Type.Repetition.OPTIONAL;
 import static org.apache.parquet.schema.Type.Repetition.REPEATED;
 
@@ -251,6 +248,11 @@ public static boolean isValueNull(boolean required, int definitionLevel, int max
         return !required && (definitionLevel == maxDefinitionLevel - 1);
     }
 
+    public static boolean isOptionalFieldValueNull(int definitionLevel, int maxDefinitionLevel)
+    {
+        return definitionLevel == maxDefinitionLevel - 1;
+    }
+
     public static long getShortDecimalValue(byte[] bytes)
     {
         return getShortDecimalValue(bytes, 0, bytes.length);
@@ -323,8 +325,8 @@ public static Optional<Field> constructField(Type type, ColumnIO columnIO)
             return Optional.empty();
         }
         boolean required = columnIO.getType().getRepetition() != OPTIONAL;
-        int repetitionLevel = columnRepetitionLevel(columnIO);
-        int definitionLevel = columnDefinitionLevel(columnIO);
+        int repetitionLevel = columnIO.getRepetitionLevel();
+        int definitionLevel = columnIO.getDefinitionLevel();
         if (type instanceof RowType rowType) {
             GroupColumnIO groupColumnIO = (GroupColumnIO) columnIO;
             ImmutableList.Builder<Optional<Field>> fieldsBuilder = ImmutableList.builder();
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetWriteValidation.java b/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetWriteValidation.java
index 5b4669966457..83a712efb19f 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetWriteValidation.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/ParquetWriteValidation.java
@@ -595,7 +595,7 @@ private static boolean areEncodingsSame(Set<org.apache.parquet.column.Encoding>
         return actual.equals(expected.stream().map(METADATA_CONVERTER::getEncoding).collect(toImmutableSet()));
     }
 
-    private static boolean areStatisticsSame(org.apache.parquet.column.statistics.Statistics actual, org.apache.parquet.format.Statistics expected)
+    private static boolean areStatisticsSame(org.apache.parquet.column.statistics.Statistics<?> actual, org.apache.parquet.format.Statistics expected)
     {
         Statistics.Builder expectedStatsBuilder = Statistics.getBuilderForReading(actual.type());
         if (expected.isSetNull_count()) {
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/ValidationHash.java b/lib/trino-parquet/src/main/java/io/trino/parquet/ValidationHash.java
index 86cb0ceceafa..82106cb1885e 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/ValidationHash.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/ValidationHash.java
@@ -14,7 +14,12 @@
 package io.trino.parquet;
 
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.InvocationConvention;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 
@@ -22,11 +27,8 @@
 import java.lang.invoke.MethodType;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.type.StandardTypes.ARRAY;
-import static io.trino.spi.type.StandardTypes.MAP;
-import static io.trino.spi.type.StandardTypes.ROW;
 import static java.lang.invoke.MethodHandles.lookup;
 import static java.util.Objects.requireNonNull;
 
@@ -48,46 +50,46 @@ class ValidationHash
             MAP_HASH = lookup().findStatic(
                     ValidationHash.class,
                     "mapHash",
-                    MethodType.methodType(long.class, Type.class, ValidationHash.class, ValidationHash.class, Block.class, int.class));
+                    MethodType.methodType(long.class, MapType.class, ValidationHash.class, ValidationHash.class, Block.class, int.class));
             ARRAY_HASH = lookup().findStatic(
                     ValidationHash.class,
                     "arrayHash",
-                    MethodType.methodType(long.class, Type.class, ValidationHash.class, Block.class, int.class));
+                    MethodType.methodType(long.class, ArrayType.class, ValidationHash.class, Block.class, int.class));
             ROW_HASH = lookup().findStatic(
                     ValidationHash.class,
                     "rowHash",
-                    MethodType.methodType(long.class, Type.class, ValidationHash[].class, Block.class, int.class));
+                    MethodType.methodType(long.class, RowType.class, ValidationHash[].class, Block.class, int.class));
         }
         catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
-    // This should really come from the environment, but there is not good way to get a value here
+    // This should really come from the environment, but there is no good way to get a value here
     private static final TypeOperators VALIDATION_TYPE_OPERATORS_CACHE = new TypeOperators();
 
     public static ValidationHash createValidationHash(Type type)
     {
         requireNonNull(type, "type is null");
-        if (type.getTypeSignature().getBase().equals(MAP)) {
-            ValidationHash keyHash = createValidationHash(type.getTypeParameters().get(0));
-            ValidationHash valueHash = createValidationHash(type.getTypeParameters().get(1));
-            return new ValidationHash(MAP_HASH.bindTo(type).bindTo(keyHash).bindTo(valueHash));
+        if (type instanceof MapType mapType) {
+            ValidationHash keyHash = createValidationHash(mapType.getKeyType());
+            ValidationHash valueHash = createValidationHash(mapType.getValueType());
+            return new ValidationHash(MAP_HASH.bindTo(mapType).bindTo(keyHash).bindTo(valueHash));
         }
 
-        if (type.getTypeSignature().getBase().equals(ARRAY)) {
-            ValidationHash elementHash = createValidationHash(type.getTypeParameters().get(0));
-            return new ValidationHash(ARRAY_HASH.bindTo(type).bindTo(elementHash));
+        if (type instanceof ArrayType arrayType) {
+            ValidationHash elementHash = createValidationHash(arrayType.getElementType());
+            return new ValidationHash(ARRAY_HASH.bindTo(arrayType).bindTo(elementHash));
         }
 
-        if (type.getTypeSignature().getBase().equals(ROW)) {
-            ValidationHash[] fieldHashes = type.getTypeParameters().stream()
+        if (type instanceof RowType rowType) {
+            ValidationHash[] fieldHashes = rowType.getTypeParameters().stream()
                     .map(ValidationHash::createValidationHash)
                     .toArray(ValidationHash[]::new);
-            return new ValidationHash(ROW_HASH.bindTo(type).bindTo(fieldHashes));
+            return new ValidationHash(ROW_HASH.bindTo(rowType).bindTo(fieldHashes));
         }
 
-        return new ValidationHash(VALIDATION_TYPE_OPERATORS_CACHE.getHashCodeOperator(type, InvocationConvention.simpleConvention(FAIL_ON_NULL, BLOCK_POSITION)));
+        return new ValidationHash(VALIDATION_TYPE_OPERATORS_CACHE.getHashCodeOperator(type, InvocationConvention.simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)));
     }
 
     private final MethodHandle hashCodeOperator;
@@ -111,20 +113,24 @@ public long hash(Block block, int position)
         }
     }
 
-    private static long mapHash(Type type, ValidationHash keyHash, ValidationHash valueHash, Block block, int position)
+    private static long mapHash(MapType type, ValidationHash keyHash, ValidationHash valueHash, Block block, int position)
     {
-        Block mapBlock = (Block) type.getObject(block, position);
+        SqlMap sqlMap = type.getObject(block, position);
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
         long hash = 0;
-        for (int i = 0; i < mapBlock.getPositionCount(); i += 2) {
-            hash = 31 * hash + keyHash.hash(mapBlock, i);
-            hash = 31 * hash + valueHash.hash(mapBlock, i + 1);
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            hash = 31 * hash + keyHash.hash(rawKeyBlock, rawOffset + i);
+            hash = 31 * hash + valueHash.hash(rawValueBlock, rawOffset + i);
         }
         return hash;
     }
 
-    private static long arrayHash(Type type, ValidationHash elementHash, Block block, int position)
+    private static long arrayHash(ArrayType type, ValidationHash elementHash, Block block, int position)
     {
-        Block array = (Block) type.getObject(block, position);
+        Block array = type.getObject(block, position);
         long hash = 0;
         for (int i = 0; i < array.getPositionCount(); i++) {
             hash = 31 * hash + elementHash.hash(array, i);
@@ -132,12 +138,13 @@ private static long arrayHash(Type type, ValidationHash elementHash, Block block
         return hash;
     }
 
-    private static long rowHash(Type type, ValidationHash[] fieldHashes, Block block, int position)
+    private static long rowHash(RowType type, ValidationHash[] fieldHashes, Block block, int position)
     {
-        Block row = (Block) type.getObject(block, position);
+        SqlRow row = type.getObject(block, position);
+        int rawIndex = row.getRawIndex();
         long hash = 0;
-        for (int i = 0; i < row.getPositionCount(); i++) {
-            hash = 31 * hash + fieldHashes[i].hash(row, i);
+        for (int i = 0; i < row.getFieldCount(); i++) {
+            hash = 31 * hash + fieldHashes[i].hash(row.getRawFieldBlock(i), rawIndex);
         }
         return hash;
     }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/dictionary/BinaryDictionary.java b/lib/trino-parquet/src/main/java/io/trino/parquet/dictionary/BinaryDictionary.java
index 534bc01318e6..4a0f20257b1c 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/dictionary/BinaryDictionary.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/dictionary/BinaryDictionary.java
@@ -15,61 +15,46 @@
 
 import io.airlift.slice.Slice;
 import io.trino.parquet.DictionaryPage;
-import org.apache.parquet.io.api.Binary;
-
-import java.io.IOException;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
-import static org.apache.parquet.bytes.BytesUtils.readIntLittleEndian;
 
 public class BinaryDictionary
         implements Dictionary
 {
-    private final Binary[] content;
+    private final Slice[] content;
 
     public BinaryDictionary(DictionaryPage dictionaryPage)
-            throws IOException
     {
         this(dictionaryPage, null);
     }
 
     public BinaryDictionary(DictionaryPage dictionaryPage, Integer length)
-            throws IOException
     {
-        content = new Binary[dictionaryPage.getDictionarySize()];
+        content = new Slice[dictionaryPage.getDictionarySize()];
 
-        byte[] dictionaryBytes;
-        int offset;
         Slice dictionarySlice = dictionaryPage.getSlice();
-        if (dictionarySlice.hasByteArray()) {
-            dictionaryBytes = dictionarySlice.byteArray();
-            offset = dictionarySlice.byteArrayOffset();
-        }
-        else {
-            dictionaryBytes = dictionarySlice.getBytes();
-            offset = 0;
-        }
 
+        int currentInputOffset = 0;
         if (length == null) {
             for (int i = 0; i < content.length; i++) {
-                int len = readIntLittleEndian(dictionaryBytes, offset);
-                offset += 4;
-                content[i] = Binary.fromReusedByteArray(dictionaryBytes, offset, len);
-                offset += len;
+                int positionLength = dictionarySlice.getInt(currentInputOffset);
+                currentInputOffset += Integer.BYTES;
+                content[i] = dictionarySlice.slice(currentInputOffset, positionLength);
+                currentInputOffset += positionLength;
             }
         }
         else {
             checkArgument(length > 0, "Invalid byte array length: %s", length);
             for (int i = 0; i < content.length; i++) {
-                content[i] = Binary.fromReusedByteArray(dictionaryBytes, offset, length);
-                offset += length;
+                content[i] = dictionarySlice.slice(currentInputOffset, length);
+                currentInputOffset += length;
             }
         }
     }
 
     @Override
-    public Binary decodeToBinary(int id)
+    public Slice decodeToSlice(int id)
     {
         return content[id];
     }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/dictionary/Dictionary.java b/lib/trino-parquet/src/main/java/io/trino/parquet/dictionary/Dictionary.java
index 63d6dcb68ca3..29720538e62e 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/dictionary/Dictionary.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/dictionary/Dictionary.java
@@ -13,11 +13,11 @@
  */
 package io.trino.parquet.dictionary;
 
-import org.apache.parquet.io.api.Binary;
+import io.airlift.slice.Slice;
 
 public interface Dictionary
 {
-    default Binary decodeToBinary(int id)
+    default Slice decodeToSlice(int id)
     {
         throw new UnsupportedOperationException();
     }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/predicate/TupleDomainParquetPredicate.java b/lib/trino-parquet/src/main/java/io/trino/parquet/predicate/TupleDomainParquetPredicate.java
index 49b8e3ca7346..c69d0506a02c 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/predicate/TupleDomainParquetPredicate.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/predicate/TupleDomainParquetPredicate.java
@@ -307,11 +307,13 @@ public static Domain getDomain(
         }
 
         try {
+            Object min = statistics.genericGetMin();
+            Object max = statistics.genericGetMax();
             return getDomain(
                     column,
                     type,
-                    ImmutableList.of(statistics.genericGetMin()),
-                    ImmutableList.of(statistics.genericGetMax()),
+                    ImmutableList.of(min instanceof Binary ? Slices.wrappedBuffer(((Binary) min).getBytes()) : min),
+                    ImmutableList.of(max instanceof Binary ? Slices.wrappedBuffer(((Binary) max).getBytes()) : max),
                     hasNullValue,
                     timeZone);
         }
@@ -372,8 +374,8 @@ private static Domain getDomain(
                     Object min = minimums.get(i);
                     Object max = maximums.get(i);
 
-                    long minValue = min instanceof Binary ? getShortDecimalValue(((Binary) min).getBytes()) : asLong(min);
-                    long maxValue = max instanceof Binary ? getShortDecimalValue(((Binary) max).getBytes()) : asLong(max);
+                    long minValue = min instanceof Slice ? getShortDecimalValue(((Slice) min).getBytes()) : asLong(min);
+                    long maxValue = max instanceof Slice ? getShortDecimalValue(((Slice) max).getBytes()) : asLong(max);
 
                     if (isStatisticsOverflow(type, minValue, maxValue)) {
                         return Domain.create(ValueSet.all(type), hasNullValue);
@@ -384,8 +386,8 @@ private static Domain getDomain(
             }
             else {
                 for (int i = 0; i < minimums.size(); i++) {
-                    Int128 min = Int128.fromBigEndian(((Binary) minimums.get(i)).getBytes());
-                    Int128 max = Int128.fromBigEndian(((Binary) maximums.get(i)).getBytes());
+                    Int128 min = Int128.fromBigEndian(((Slice) minimums.get(i)).getBytes());
+                    Int128 max = Int128.fromBigEndian(((Slice) maximums.get(i)).getBytes());
 
                     rangesBuilder.addRangeInclusive(min, max);
                 }
@@ -427,8 +429,8 @@ private static Domain getDomain(
         if (type instanceof VarcharType) {
             SortedRangeSet.Builder rangesBuilder = SortedRangeSet.builder(type, minimums.size());
             for (int i = 0; i < minimums.size(); i++) {
-                Slice min = Slices.wrappedBuffer(((Binary) minimums.get(i)).toByteBuffer());
-                Slice max = Slices.wrappedBuffer(((Binary) maximums.get(i)).toByteBuffer());
+                Slice min = (Slice) minimums.get(i);
+                Slice max = (Slice) maximums.get(i);
                 rangesBuilder.addRangeInclusive(min, max);
             }
             return Domain.create(rangesBuilder.build(), hasNullValue);
@@ -446,11 +448,11 @@ private static Domain getDomain(
                     // PARQUET-1065 deprecated them. The result is that any writer that produced stats was producing unusable incorrect values, except
                     // the special case where min == max and an incorrect ordering would not be material to the result. PARQUET-1026 made binary stats
                     // available and valid in that special case
-                    if (!(min instanceof Binary) || !(max instanceof Binary) || !min.equals(max)) {
+                    if (!(min instanceof Slice) || !(max instanceof Slice) || !min.equals(max)) {
                         return Domain.create(ValueSet.all(type), hasNullValue);
                     }
 
-                    rangesBuilder.addValue(timestampEncoder.getTimestamp(decodeInt96Timestamp((Binary) min)));
+                    rangesBuilder.addValue(timestampEncoder.getTimestamp(decodeInt96Timestamp(Binary.fromConstantByteArray(((Slice) min).getBytes()))));
                 }
                 return Domain.create(rangesBuilder.build(), hasNullValue);
             }
@@ -732,11 +734,13 @@ public boolean canDrop(org.apache.parquet.filter2.predicate.Statistics<T> statis
                 return false;
             }
 
+            T min = statistic.getMin();
+            T max = statistic.getMax();
             Domain domain = getDomain(
                     columnDescriptor,
                     columnDomain.getType(),
-                    ImmutableList.of(statistic.getMin()),
-                    ImmutableList.of(statistic.getMax()),
+                    ImmutableList.of(min instanceof Binary ? Slices.wrappedBuffer(((Binary) min).getBytes()) : min),
+                    ImmutableList.of(max instanceof Binary ? Slices.wrappedBuffer(((Binary) max).getBytes()) : max),
                     true,
                     timeZone);
             return !columnDomain.overlaps(domain);
@@ -759,23 +763,14 @@ private ColumnIndexValueConverter()
 
         private Function<ByteBuffer, Object> getConverter(PrimitiveType primitiveType)
         {
-            switch (primitiveType.getPrimitiveTypeName()) {
-                case BOOLEAN:
-                    return buffer -> buffer.get(0) != 0;
-                case INT32:
-                    return buffer -> buffer.order(LITTLE_ENDIAN).getInt(0);
-                case INT64:
-                    return buffer -> buffer.order(LITTLE_ENDIAN).getLong(0);
-                case FLOAT:
-                    return buffer -> buffer.order(LITTLE_ENDIAN).getFloat(0);
-                case DOUBLE:
-                    return buffer -> buffer.order(LITTLE_ENDIAN).getDouble(0);
-                case FIXED_LEN_BYTE_ARRAY:
-                case BINARY:
-                case INT96:
-                default:
-                    return buffer -> Binary.fromReusedByteBuffer(buffer);
-            }
+            return switch (primitiveType.getPrimitiveTypeName()) {
+                case BOOLEAN -> buffer -> buffer.get(0) != 0;
+                case INT32 -> buffer -> buffer.order(LITTLE_ENDIAN).getInt(0);
+                case INT64 -> buffer -> buffer.order(LITTLE_ENDIAN).getLong(0);
+                case FLOAT -> buffer -> buffer.order(LITTLE_ENDIAN).getFloat(0);
+                case DOUBLE -> buffer -> buffer.order(LITTLE_ENDIAN).getDouble(0);
+                case FIXED_LEN_BYTE_ARRAY, BINARY, INT96 -> Slices::wrappedHeapBuffer;
+            };
         }
     }
 
@@ -796,7 +791,7 @@ private Function<Integer, Object> getConverter(PrimitiveType primitiveType)
                 case INT64 -> (i) -> dictionary.decodeToLong(i);
                 case FLOAT -> (i) -> dictionary.decodeToFloat(i);
                 case DOUBLE -> (i) -> dictionary.decodeToDouble(i);
-                case FIXED_LEN_BYTE_ARRAY, BINARY, INT96 -> (i) -> dictionary.decodeToBinary(i);
+                case FIXED_LEN_BYTE_ARRAY, BINARY, INT96 -> (i) -> dictionary.decodeToSlice(i);
             };
         }
     }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/AbstractColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/AbstractColumnReader.java
index 0fdd76cc7567..42e3ecac432e 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/AbstractColumnReader.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/AbstractColumnReader.java
@@ -25,18 +25,18 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.DictionaryBlock;
 import io.trino.spi.type.AbstractVariableWidthType;
+import io.trino.spi.type.DateType;
+import io.trino.spi.type.Type;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.io.ParquetDecodingException;
 
-import javax.annotation.Nullable;
-
 import java.util.Optional;
 import java.util.OptionalLong;
 
-import static io.trino.parquet.ParquetEncoding.PLAIN;
 import static io.trino.parquet.ParquetEncoding.PLAIN_DICTIONARY;
 import static io.trino.parquet.ParquetEncoding.RLE_DICTIONARY;
 import static io.trino.parquet.reader.decoders.ValueDecoder.ValueDecodersProvider;
-import static io.trino.parquet.reader.decoders.ValueDecoders.getDictionaryDecoder;
+import static io.trino.parquet.reader.flat.DictionaryDecoder.DictionaryDecoderProvider;
 import static io.trino.parquet.reader.flat.RowRangesIterator.createRowRangesIterator;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
@@ -49,6 +49,7 @@ public abstract class AbstractColumnReader<BufferType>
     protected final PrimitiveField field;
     protected final ValueDecodersProvider<BufferType> decodersProvider;
     protected final ColumnAdapter<BufferType> columnAdapter;
+    private final DictionaryDecoderProvider<BufferType> dictionaryDecoderProvider;
 
     protected PageReader pageReader;
     protected RowRangesIterator rowRanges;
@@ -59,10 +60,12 @@ public abstract class AbstractColumnReader<BufferType>
     public AbstractColumnReader(
             PrimitiveField field,
             ValueDecodersProvider<BufferType> decodersProvider,
+            DictionaryDecoderProvider<BufferType> dictionaryDecoderProvider,
             ColumnAdapter<BufferType> columnAdapter)
     {
         this.field = requireNonNull(field, "field is null");
         this.decodersProvider = requireNonNull(decodersProvider, "decoders is null");
+        this.dictionaryDecoderProvider = requireNonNull(dictionaryDecoderProvider, "dictionaryDecoderProvider is null");
         this.columnAdapter = requireNonNull(columnAdapter, "columnAdapter is null");
     }
 
@@ -78,11 +81,7 @@ public void setPageReader(PageReader pageReader, Optional<FilteredRowRanges> row
         // For dictionary based encodings - https://github.com/apache/parquet-format/blob/master/Encodings.md
         if (dictionaryPage != null) {
             log.debug("field %s, readDictionaryPage %s", field, dictionaryPage);
-            dictionaryDecoder = getDictionaryDecoder(
-                    dictionaryPage,
-                    columnAdapter,
-                    decodersProvider.create(PLAIN, field),
-                    isNonNull());
+            dictionaryDecoder = dictionaryDecoderProvider.create(dictionaryPage, isNonNull());
             produceDictionaryBlock = shouldProduceDictionaryBlock(rowRanges);
         }
         this.rowRanges = createRowRangesIterator(rowRanges);
@@ -105,7 +104,7 @@ protected ValueDecoder<BufferType> createValueDecoder(ValueDecodersProvider<Buff
             valueDecoder = dictionaryDecoder;
         }
         else {
-            valueDecoder = decodersProvider.create(encoding, field);
+            valueDecoder = decodersProvider.create(encoding);
         }
         valueDecoder.init(new SimpleSliceInputStream(data));
         return valueDecoder;
@@ -152,9 +151,7 @@ private boolean shouldProduceDictionaryBlock(Optional<FilteredRowRanges> filtere
         //   2. Number of dictionary entries exceeds a threshold (Integer.MAX_VALUE for parquet-mr by default).
         // Trino dictionary blocks are produced only when the entire column chunk is dictionary encoded
         if (pageReader.hasOnlyDictionaryEncodedPages()) {
-            // TODO: DictionaryBlocks are currently restricted to variable width types where dictionary processing is most beneficial.
-            //   Dictionary processing for other data types can be enabled after validating improvements on benchmarks.
-            if (!(field.getType() instanceof AbstractVariableWidthType)) {
+            if (!shouldProduceDictionaryForType(field.getType())) {
                 return false;
             }
             requireNonNull(dictionaryDecoder, "dictionaryDecoder is null");
@@ -166,6 +163,13 @@ private boolean shouldProduceDictionaryBlock(Optional<FilteredRowRanges> filtere
         return false;
     }
 
+    static boolean shouldProduceDictionaryForType(Type type)
+    {
+        // TODO: DictionaryBlocks are currently restricted to variable width and date types where dictionary processing is most beneficial.
+        //   Dictionary processing for other data types can be enabled after validating improvements on benchmarks.
+        return type instanceof AbstractVariableWidthType || type instanceof DateType;
+    }
+
     private static long getMaxDictionaryBlockSize(Block dictionary, long batchSize)
     {
         // An approximate upper bound on size of DictionaryBlock is derived here instead of using
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/BinaryColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/BinaryColumnReader.java
deleted file mode 100644
index 89f7ce729dec..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/BinaryColumnReader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.airlift.slice.Slice;
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.CharType;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.VarcharType;
-import org.apache.parquet.io.api.Binary;
-
-import static io.airlift.slice.Slices.EMPTY_SLICE;
-import static io.airlift.slice.Slices.wrappedBuffer;
-import static io.trino.spi.type.Chars.truncateToLengthAndTrimSpaces;
-import static io.trino.spi.type.Varchars.truncateToLength;
-
-public class BinaryColumnReader
-        extends PrimitiveColumnReader
-{
-    public BinaryColumnReader(PrimitiveField field)
-    {
-        super(field);
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type type)
-    {
-        Binary binary = valuesReader.readBytes();
-        Slice value;
-        if (binary.length() == 0) {
-            value = EMPTY_SLICE;
-        }
-        else {
-            value = wrappedBuffer(binary.getBytes());
-        }
-        if (type instanceof VarcharType) {
-            value = truncateToLength(value, type);
-        }
-        if (type instanceof CharType) {
-            value = truncateToLengthAndTrimSpaces(value, type);
-        }
-        type.writeSlice(blockBuilder, value);
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/BooleanColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/BooleanColumnReader.java
deleted file mode 100644
index bf215cfc4715..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/BooleanColumnReader.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-
-public class BooleanColumnReader
-        extends PrimitiveColumnReader
-{
-    public BooleanColumnReader(PrimitiveField primitiveField)
-    {
-        super(primitiveField);
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type type)
-    {
-        type.writeBoolean(blockBuilder, valuesReader.readBoolean());
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java
index 3c58f36a1593..7997149bc0e0 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java
@@ -15,12 +15,12 @@
 
 import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.memory.context.LocalMemoryContext;
-import io.trino.parquet.ParquetReaderOptions;
 import io.trino.parquet.PrimitiveField;
-import io.trino.parquet.reader.decoders.TransformingValueDecoders;
+import io.trino.parquet.reader.decoders.ValueDecoder;
 import io.trino.parquet.reader.decoders.ValueDecoders;
 import io.trino.parquet.reader.flat.ColumnAdapter;
 import io.trino.parquet.reader.flat.FlatColumnReader;
+import io.trino.parquet.reader.flat.FlatDefinitionLevelDecoder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.AbstractIntType;
 import io.trino.spi.type.AbstractLongType;
@@ -46,14 +46,14 @@
 
 import java.util.Optional;
 
-import static io.trino.parquet.ParquetTypeUtils.createDecimalType;
-import static io.trino.parquet.reader.decoders.TransformingValueDecoders.getInt96ToLongTimestampDecoder;
-import static io.trino.parquet.reader.decoders.TransformingValueDecoders.getInt96ToShortTimestampDecoder;
+import static io.trino.parquet.ParquetEncoding.PLAIN;
 import static io.trino.parquet.reader.decoders.ValueDecoder.ValueDecodersProvider;
 import static io.trino.parquet.reader.flat.BinaryColumnAdapter.BINARY_ADAPTER;
 import static io.trino.parquet.reader.flat.ByteColumnAdapter.BYTE_ADAPTER;
+import static io.trino.parquet.reader.flat.DictionaryDecoder.DictionaryDecoderProvider;
+import static io.trino.parquet.reader.flat.DictionaryDecoder.getDictionaryDecoder;
+import static io.trino.parquet.reader.flat.Fixed12ColumnAdapter.FIXED12_ADAPTER;
 import static io.trino.parquet.reader.flat.Int128ColumnAdapter.INT128_ADAPTER;
-import static io.trino.parquet.reader.flat.Int96ColumnAdapter.INT96_ADAPTER;
 import static io.trino.parquet.reader.flat.IntColumnAdapter.INT_ADAPTER;
 import static io.trino.parquet.reader.flat.LongColumnAdapter.LONG_ADAPTER;
 import static io.trino.parquet.reader.flat.ShortColumnAdapter.SHORT_ADAPTER;
@@ -71,9 +71,9 @@
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
 import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.MICROS;
 import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.MILLIS;
-import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.NANOS;
 import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.BINARY;
 import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY;
 import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.FLOAT;
@@ -83,241 +83,193 @@
 
 public final class ColumnReaderFactory
 {
-    private static final int MAX_INT_DIGITS = 10;
+    private final DateTimeZone timeZone;
 
-    private ColumnReaderFactory() {}
+    public ColumnReaderFactory(DateTimeZone timeZone)
+    {
+        this.timeZone = requireNonNull(timeZone, "dateTimeZone is null");
+    }
 
-    public static ColumnReader create(PrimitiveField field, DateTimeZone timeZone, AggregatedMemoryContext aggregatedMemoryContext, ParquetReaderOptions options)
+    public ColumnReader create(PrimitiveField field, AggregatedMemoryContext aggregatedMemoryContext)
     {
         Type type = field.getType();
         PrimitiveTypeName primitiveType = field.getDescriptor().getPrimitiveType().getPrimitiveTypeName();
         LogicalTypeAnnotation annotation = field.getDescriptor().getPrimitiveType().getLogicalTypeAnnotation();
         LocalMemoryContext memoryContext = aggregatedMemoryContext.newLocalMemoryContext(ColumnReader.class.getSimpleName());
-        if (useBatchedColumnReaders(options, field)) {
-            if (BOOLEAN.equals(type) && primitiveType == PrimitiveTypeName.BOOLEAN) {
-                return createColumnReader(field, ValueDecoders::getBooleanDecoder, BYTE_ADAPTER, memoryContext);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
+        if (BOOLEAN.equals(type) && primitiveType == PrimitiveTypeName.BOOLEAN) {
+            return createColumnReader(field, valueDecoders::getBooleanDecoder, BYTE_ADAPTER, memoryContext);
+        }
+        if (TINYINT.equals(type) && isIntegerOrDecimalPrimitive(primitiveType)) {
+            if (isZeroScaleShortDecimalAnnotation(annotation)) {
+                return createColumnReader(field, valueDecoders::getShortDecimalToByteDecoder, BYTE_ADAPTER, memoryContext);
+            }
+            if (!isIntegerAnnotationAndPrimitive(annotation, primitiveType)) {
+                throw unsupportedException(type, field);
+            }
+            return createColumnReader(field, valueDecoders::getByteDecoder, BYTE_ADAPTER, memoryContext);
+        }
+        if (SMALLINT.equals(type) && isIntegerOrDecimalPrimitive(primitiveType)) {
+            if (isZeroScaleShortDecimalAnnotation(annotation)) {
+                return createColumnReader(field, valueDecoders::getShortDecimalToShortDecoder, SHORT_ADAPTER, memoryContext);
             }
-            if (TINYINT.equals(type) && isIntegerOrDecimalPrimitive(primitiveType)) {
-                if (isZeroScaleShortDecimalAnnotation(annotation)) {
-                    return createColumnReader(field, TransformingValueDecoders::getShortDecimalToByteDecoder, BYTE_ADAPTER, memoryContext);
-                }
-                if (!isIntegerAnnotationAndPrimitive(annotation, primitiveType)) {
-                    throw unsupportedException(type, field);
-                }
-                return createColumnReader(field, ValueDecoders::getByteDecoder, BYTE_ADAPTER, memoryContext);
+            if (!isIntegerAnnotationAndPrimitive(annotation, primitiveType)) {
+                throw unsupportedException(type, field);
+            }
+            return createColumnReader(field, valueDecoders::getShortDecoder, SHORT_ADAPTER, memoryContext);
+        }
+        if (DATE.equals(type) && primitiveType == INT32) {
+            if (annotation == null || annotation instanceof DateLogicalTypeAnnotation) {
+                return createColumnReader(field, valueDecoders::getIntDecoder, INT_ADAPTER, memoryContext);
             }
-            if (SMALLINT.equals(type) && isIntegerOrDecimalPrimitive(primitiveType)) {
-                if (isZeroScaleShortDecimalAnnotation(annotation)) {
-                    return createColumnReader(field, TransformingValueDecoders::getShortDecimalToShortDecoder, SHORT_ADAPTER, memoryContext);
-                }
-                if (!isIntegerAnnotationAndPrimitive(annotation, primitiveType)) {
-                    throw unsupportedException(type, field);
-                }
-                return createColumnReader(field, ValueDecoders::getShortDecoder, SHORT_ADAPTER, memoryContext);
+            throw unsupportedException(type, field);
+        }
+        if (type instanceof AbstractIntType && isIntegerOrDecimalPrimitive(primitiveType)) {
+            if (isZeroScaleShortDecimalAnnotation(annotation)) {
+                return createColumnReader(field, valueDecoders::getShortDecimalToIntDecoder, INT_ADAPTER, memoryContext);
             }
-            if (DATE.equals(type) && primitiveType == INT32) {
-                if (annotation == null || annotation instanceof DateLogicalTypeAnnotation) {
-                    return createColumnReader(field, ValueDecoders::getIntDecoder, INT_ADAPTER, memoryContext);
-                }
+            if (!isIntegerAnnotationAndPrimitive(annotation, primitiveType)) {
+                throw unsupportedException(type, field);
+            }
+            return createColumnReader(field, valueDecoders::getIntDecoder, INT_ADAPTER, memoryContext);
+        }
+        if (type instanceof TimeType) {
+            if (!(annotation instanceof TimeLogicalTypeAnnotation timeAnnotation)) {
                 throw unsupportedException(type, field);
             }
-            if (type instanceof AbstractIntType && isIntegerOrDecimalPrimitive(primitiveType)) {
-                if (isZeroScaleShortDecimalAnnotation(annotation)) {
-                    return createColumnReader(field, TransformingValueDecoders::getShortDecimalToIntDecoder, INT_ADAPTER, memoryContext);
-                }
-                if (!isIntegerAnnotationAndPrimitive(annotation, primitiveType)) {
-                    throw unsupportedException(type, field);
-                }
-                return createColumnReader(field, ValueDecoders::getIntDecoder, INT_ADAPTER, memoryContext);
+            if (primitiveType == INT64 && timeAnnotation.getUnit() == MICROS) {
+                return createColumnReader(field, valueDecoders::getTimeMicrosDecoder, LONG_ADAPTER, memoryContext);
             }
-            if (type instanceof TimeType && primitiveType == INT64) {
-                if (annotation instanceof TimeLogicalTypeAnnotation timeAnnotation && timeAnnotation.getUnit() == MICROS) {
-                    return createColumnReader(field, TransformingValueDecoders::getTimeMicrosDecoder, LONG_ADAPTER, memoryContext);
-                }
+            if (primitiveType == INT32 && timeAnnotation.getUnit() == MILLIS) {
+                return createColumnReader(field, valueDecoders::getTimeMillisDecoder, LONG_ADAPTER, memoryContext);
+            }
+            throw unsupportedException(type, field);
+        }
+        if (BIGINT.equals(type) && primitiveType == INT64
+                && (annotation instanceof TimestampLogicalTypeAnnotation || annotation instanceof TimeLogicalTypeAnnotation)) {
+            return createColumnReader(field, valueDecoders::getLongDecoder, LONG_ADAPTER, memoryContext);
+        }
+        if (type instanceof AbstractLongType && isIntegerOrDecimalPrimitive(primitiveType)) {
+            if (isZeroScaleShortDecimalAnnotation(annotation)) {
+                return createColumnReader(field, valueDecoders::getShortDecimalDecoder, LONG_ADAPTER, memoryContext);
+            }
+            if (!isIntegerAnnotationAndPrimitive(annotation, primitiveType)) {
                 throw unsupportedException(type, field);
             }
-            if (BIGINT.equals(type) && primitiveType == INT64
-                    && (annotation instanceof TimestampLogicalTypeAnnotation || annotation instanceof TimeLogicalTypeAnnotation)) {
-                return createColumnReader(field, ValueDecoders::getLongDecoder, LONG_ADAPTER, memoryContext);
+            if (primitiveType == INT32) {
+                return createColumnReader(field, valueDecoders::getInt32ToLongDecoder, LONG_ADAPTER, memoryContext);
             }
-            if (type instanceof AbstractLongType && isIntegerOrDecimalPrimitive(primitiveType)) {
-                if (isZeroScaleShortDecimalAnnotation(annotation)) {
-                    return createColumnReader(field, ValueDecoders::getShortDecimalDecoder, LONG_ADAPTER, memoryContext);
-                }
-                if (!isIntegerAnnotationAndPrimitive(annotation, primitiveType)) {
-                    throw unsupportedException(type, field);
-                }
-                if (primitiveType == INT32) {
-                    return createColumnReader(field, TransformingValueDecoders::getInt32ToLongDecoder, LONG_ADAPTER, memoryContext);
-                }
-                if (primitiveType == INT64) {
-                    return createColumnReader(field, ValueDecoders::getLongDecoder, LONG_ADAPTER, memoryContext);
-                }
+            if (primitiveType == INT64) {
+                return createColumnReader(field, valueDecoders::getLongDecoder, LONG_ADAPTER, memoryContext);
             }
-            if (REAL.equals(type) && primitiveType == FLOAT) {
-                return createColumnReader(field, ValueDecoders::getRealDecoder, INT_ADAPTER, memoryContext);
+        }
+        if (REAL.equals(type) && primitiveType == FLOAT) {
+            return createColumnReader(field, valueDecoders::getRealDecoder, INT_ADAPTER, memoryContext);
+        }
+        if (DOUBLE.equals(type)) {
+            if (primitiveType == PrimitiveTypeName.DOUBLE) {
+                return createColumnReader(field, valueDecoders::getDoubleDecoder, LONG_ADAPTER, memoryContext);
             }
-            if (DOUBLE.equals(type)) {
-                if (primitiveType == PrimitiveTypeName.DOUBLE) {
-                    return createColumnReader(field, ValueDecoders::getDoubleDecoder, LONG_ADAPTER, memoryContext);
-                }
-                if (primitiveType == FLOAT) {
-                    return createColumnReader(field, TransformingValueDecoders::getFloatToDoubleDecoder, LONG_ADAPTER, memoryContext);
-                }
+            if (primitiveType == FLOAT) {
+                return createColumnReader(field, valueDecoders::getFloatToDoubleDecoder, LONG_ADAPTER, memoryContext);
             }
-            if (type instanceof TimestampType timestampType && primitiveType == INT96) {
-                if (timestampType.isShort()) {
-                    return createColumnReader(
-                            field,
-                            (encoding, primitiveField) -> getInt96ToShortTimestampDecoder(encoding, primitiveField, timeZone),
-                            LONG_ADAPTER,
-                            memoryContext);
-                }
+        }
+        if (type instanceof TimestampType timestampType && primitiveType == INT96) {
+            if (timestampType.isShort()) {
                 return createColumnReader(
                         field,
-                        (encoding, primitiveField) -> getInt96ToLongTimestampDecoder(encoding, primitiveField, timeZone),
-                        INT96_ADAPTER,
+                        (encoding) -> valueDecoders.getInt96ToShortTimestampDecoder(encoding, timeZone),
+                        LONG_ADAPTER,
                         memoryContext);
             }
-            if (type instanceof TimestampWithTimeZoneType timestampWithTimeZoneType && primitiveType == INT96) {
-                if (timestampWithTimeZoneType.isShort()) {
-                    return createColumnReader(field, TransformingValueDecoders::getInt96ToShortTimestampWithTimeZoneDecoder, LONG_ADAPTER, memoryContext);
-                }
+            return createColumnReader(
+                    field,
+                    (encoding) -> valueDecoders.getInt96ToLongTimestampDecoder(encoding, timeZone),
+                    FIXED12_ADAPTER,
+                    memoryContext);
+        }
+        if (type instanceof TimestampWithTimeZoneType timestampWithTimeZoneType && primitiveType == INT96) {
+            if (timestampWithTimeZoneType.isShort()) {
+                return createColumnReader(field, valueDecoders::getInt96ToShortTimestampWithTimeZoneDecoder, LONG_ADAPTER, memoryContext);
+            }
+            throw unsupportedException(type, field);
+        }
+        if (type instanceof TimestampType timestampType && primitiveType == INT64) {
+            if (!(annotation instanceof TimestampLogicalTypeAnnotation timestampAnnotation)) {
                 throw unsupportedException(type, field);
             }
-            if (type instanceof TimestampType timestampType && primitiveType == INT64) {
-                if (!(annotation instanceof TimestampLogicalTypeAnnotation timestampAnnotation)) {
-                    throw unsupportedException(type, field);
-                }
-                if (timestampType.isShort()) {
-                    return switch (timestampAnnotation.getUnit()) {
-                        case MILLIS -> createColumnReader(field, TransformingValueDecoders::getInt64TimestampMillsToShortTimestampDecoder, LONG_ADAPTER, memoryContext);
-                        case MICROS -> createColumnReader(field, TransformingValueDecoders::getInt64TimestampMicrosToShortTimestampDecoder, LONG_ADAPTER, memoryContext);
-                        case NANOS -> createColumnReader(field, TransformingValueDecoders::getInt64TimestampNanosToShortTimestampDecoder, LONG_ADAPTER, memoryContext);
-                    };
-                }
+            if (timestampType.isShort()) {
                 return switch (timestampAnnotation.getUnit()) {
-                    case MILLIS -> createColumnReader(field, TransformingValueDecoders::getInt64TimestampMillisToLongTimestampDecoder, INT96_ADAPTER, memoryContext);
-                    case MICROS -> createColumnReader(field, TransformingValueDecoders::getInt64TimestampMicrosToLongTimestampDecoder, INT96_ADAPTER, memoryContext);
-                    case NANOS -> createColumnReader(field, TransformingValueDecoders::getInt64TimestampNanosToLongTimestampDecoder, INT96_ADAPTER, memoryContext);
+                    case MILLIS -> createColumnReader(field, valueDecoders::getInt64TimestampMillsToShortTimestampDecoder, LONG_ADAPTER, memoryContext);
+                    case MICROS -> createColumnReader(field, valueDecoders::getInt64TimestampMicrosToShortTimestampDecoder, LONG_ADAPTER, memoryContext);
+                    case NANOS -> createColumnReader(field, valueDecoders::getInt64TimestampNanosToShortTimestampDecoder, LONG_ADAPTER, memoryContext);
                 };
             }
-            if (type instanceof TimestampWithTimeZoneType timestampWithTimeZoneType && primitiveType == INT64) {
-                if (!(annotation instanceof TimestampLogicalTypeAnnotation timestampAnnotation)) {
-                    throw unsupportedException(type, field);
-                }
-                if (timestampWithTimeZoneType.isShort()) {
-                    return switch (timestampAnnotation.getUnit()) {
-                        case MILLIS -> createColumnReader(field, TransformingValueDecoders::getInt64TimestampMillsToShortTimestampWithTimeZoneDecoder, LONG_ADAPTER, memoryContext);
-                        case MICROS -> createColumnReader(field, TransformingValueDecoders::getInt64TimestampMicrosToShortTimestampWithTimeZoneDecoder, LONG_ADAPTER, memoryContext);
-                        case NANOS -> throw unsupportedException(type, field);
-                    };
-                }
+            return switch (timestampAnnotation.getUnit()) {
+                case MILLIS -> createColumnReader(field, valueDecoders::getInt64TimestampMillisToLongTimestampDecoder, FIXED12_ADAPTER, memoryContext);
+                case MICROS -> createColumnReader(field, valueDecoders::getInt64TimestampMicrosToLongTimestampDecoder, FIXED12_ADAPTER, memoryContext);
+                case NANOS -> createColumnReader(field, valueDecoders::getInt64TimestampNanosToLongTimestampDecoder, FIXED12_ADAPTER, memoryContext);
+            };
+        }
+        if (type instanceof TimestampWithTimeZoneType timestampWithTimeZoneType && primitiveType == INT64) {
+            if (!(annotation instanceof TimestampLogicalTypeAnnotation timestampAnnotation)) {
+                throw unsupportedException(type, field);
+            }
+            if (timestampWithTimeZoneType.isShort()) {
                 return switch (timestampAnnotation.getUnit()) {
-                    case MILLIS, NANOS -> throw unsupportedException(type, field);
-                    case MICROS -> createColumnReader(field, TransformingValueDecoders::getInt64TimestampMicrosToLongTimestampWithTimeZoneDecoder, INT96_ADAPTER, memoryContext);
+                    case MILLIS -> createColumnReader(field, valueDecoders::getInt64TimestampMillsToShortTimestampWithTimeZoneDecoder, LONG_ADAPTER, memoryContext);
+                    case MICROS -> createColumnReader(field, valueDecoders::getInt64TimestampMicrosToShortTimestampWithTimeZoneDecoder, LONG_ADAPTER, memoryContext);
+                    case NANOS -> throw unsupportedException(type, field);
                 };
             }
-            if (type instanceof DecimalType decimalType && decimalType.isShort()
-                    && isIntegerOrDecimalPrimitive(primitiveType)) {
-                if (decimalType.getScale() == 0 && decimalType.getPrecision() >= MAX_INT_DIGITS
-                        && primitiveType == INT32
-                        && isIntegerAnnotation(annotation)) {
-                    return createColumnReader(field, TransformingValueDecoders::getInt32ToLongDecoder, LONG_ADAPTER, memoryContext);
-                }
-                if (!(annotation instanceof DecimalLogicalTypeAnnotation decimalAnnotation)) {
-                    throw unsupportedException(type, field);
-                }
-                if (isDecimalRescaled(decimalAnnotation, decimalType)) {
-                    return createColumnReader(field, TransformingValueDecoders::getRescaledShortDecimalDecoder, LONG_ADAPTER, memoryContext);
-                }
-                return createColumnReader(field, ValueDecoders::getShortDecimalDecoder, LONG_ADAPTER, memoryContext);
-            }
-            if (type instanceof DecimalType decimalType && !decimalType.isShort()
-                    && isIntegerOrDecimalPrimitive(primitiveType)) {
-                if (!(annotation instanceof DecimalLogicalTypeAnnotation decimalAnnotation)) {
-                    throw unsupportedException(type, field);
-                }
-                if (isDecimalRescaled(decimalAnnotation, decimalType)) {
-                    return createColumnReader(field, TransformingValueDecoders::getRescaledLongDecimalDecoder, INT128_ADAPTER, memoryContext);
-                }
-                return createColumnReader(field, ValueDecoders::getLongDecimalDecoder, INT128_ADAPTER, memoryContext);
-            }
-            if (type instanceof VarcharType varcharType && !varcharType.isUnbounded() && primitiveType == BINARY) {
-                return createColumnReader(field, ValueDecoders::getBoundedVarcharBinaryDecoder, BINARY_ADAPTER, memoryContext);
-            }
-            if (type instanceof CharType && primitiveType == BINARY) {
-                return createColumnReader(field, ValueDecoders::getCharBinaryDecoder, BINARY_ADAPTER, memoryContext);
+            return switch (timestampAnnotation.getUnit()) {
+                case MILLIS, NANOS -> throw unsupportedException(type, field);
+                case MICROS -> createColumnReader(field, valueDecoders::getInt64TimestampMicrosToLongTimestampWithTimeZoneDecoder, FIXED12_ADAPTER, memoryContext);
+            };
+        }
+        if (type instanceof DecimalType decimalType && decimalType.isShort()
+                && isIntegerOrDecimalPrimitive(primitiveType)) {
+            if (primitiveType == INT32 && isIntegerAnnotation(annotation)) {
+                return createColumnReader(field, valueDecoders::getInt32ToShortDecimalDecoder, LONG_ADAPTER, memoryContext);
             }
-            if (type instanceof AbstractVariableWidthType && primitiveType == BINARY) {
-                return createColumnReader(field, ValueDecoders::getBinaryDecoder, BINARY_ADAPTER, memoryContext);
+            if (!(annotation instanceof DecimalLogicalTypeAnnotation decimalAnnotation)) {
+                throw unsupportedException(type, field);
             }
-            if ((VARBINARY.equals(type) || VARCHAR.equals(type)) && primitiveType == FIXED_LEN_BYTE_ARRAY) {
-                return createColumnReader(field, ValueDecoders::getFixedWidthBinaryDecoder, BINARY_ADAPTER, memoryContext);
+            if (isDecimalRescaled(decimalAnnotation, decimalType)) {
+                return createColumnReader(field, valueDecoders::getRescaledShortDecimalDecoder, LONG_ADAPTER, memoryContext);
             }
-            if (UUID.equals(type) && primitiveType == FIXED_LEN_BYTE_ARRAY) {
-                // Iceberg 0.11.1 writes UUID as FIXED_LEN_BYTE_ARRAY without logical type annotation (see https://github.com/apache/iceberg/pull/2913)
-                // To support such files, we bet on the logical type to be UUID based on the Trino UUID type check.
-                if (annotation == null || isLogicalUuid(annotation)) {
-                    return createColumnReader(field, ValueDecoders::getUuidDecoder, INT128_ADAPTER, memoryContext);
-                }
+            return createColumnReader(field, valueDecoders::getShortDecimalDecoder, LONG_ADAPTER, memoryContext);
+        }
+        if (type instanceof DecimalType decimalType && !decimalType.isShort()
+                && isIntegerOrDecimalPrimitive(primitiveType)) {
+            if (!(annotation instanceof DecimalLogicalTypeAnnotation decimalAnnotation)) {
                 throw unsupportedException(type, field);
             }
-            throw new TrinoException(
-                    NOT_SUPPORTED,
-                    format("Reading Trino column (%s) from Parquet column (%s) is not supported by optimized parquet reader", type, field.getDescriptor()));
-        }
-
-        return switch (primitiveType) {
-            case BOOLEAN -> new BooleanColumnReader(field);
-            case INT32 -> createDecimalColumnReader(field).orElse(new IntColumnReader(field));
-            case INT64 -> {
-                if (annotation instanceof TimeLogicalTypeAnnotation timeAnnotation) {
-                    if (field.getType() instanceof TimeType && timeAnnotation.getUnit() == MICROS) {
-                        yield new TimeMicrosColumnReader(field);
-                    }
-                    else if (BIGINT.equals(field.getType())) {
-                        yield new LongColumnReader(field);
-                    }
-                    throw unsupportedException(type, field);
-                }
-                if (annotation instanceof TimestampLogicalTypeAnnotation timestampAnnotation) {
-                    if (timestampAnnotation.getUnit() == MILLIS) {
-                        yield new Int64TimestampMillisColumnReader(field);
-                    }
-                    if (timestampAnnotation.getUnit() == MICROS) {
-                        yield new TimestampMicrosColumnReader(field);
-                    }
-                    if (timestampAnnotation.getUnit() == NANOS) {
-                        yield new Int64TimestampNanosColumnReader(field);
-                    }
-                    throw unsupportedException(type, field);
-                }
-                yield createDecimalColumnReader(field).orElse(new LongColumnReader(field));
+            if (isDecimalRescaled(decimalAnnotation, decimalType)) {
+                return createColumnReader(field, valueDecoders::getRescaledLongDecimalDecoder, INT128_ADAPTER, memoryContext);
             }
-            case INT96 -> new TimestampColumnReader(field, timeZone);
-            case FLOAT -> new FloatColumnReader(field);
-            case DOUBLE -> new DoubleColumnReader(field);
-            case BINARY -> createDecimalColumnReader(field).orElse(new BinaryColumnReader(field));
-            case FIXED_LEN_BYTE_ARRAY -> {
-                Optional<PrimitiveColumnReader> decimalColumnReader = createDecimalColumnReader(field);
-                if (decimalColumnReader.isPresent()) {
-                    yield decimalColumnReader.get();
-                }
-                if (isLogicalUuid(annotation)) {
-                    yield new UuidColumnReader(field);
-                }
-                if (VARBINARY.equals(type) || VARCHAR.equals(type)) {
-                    yield new BinaryColumnReader(field);
-                }
-                if (annotation == null) {
-                    // Iceberg 0.11.1 writes UUID as FIXED_LEN_BYTE_ARRAY without logical type annotation (see https://github.com/apache/iceberg/pull/2913)
-                    // To support such files, we bet on the type to be UUID, which gets verified later, when reading the column data.
-                    yield new UuidColumnReader(field);
-                }
-                throw unsupportedException(type, field);
+            return createColumnReader(field, valueDecoders::getLongDecimalDecoder, INT128_ADAPTER, memoryContext);
+        }
+        if (type instanceof VarcharType varcharType && !varcharType.isUnbounded() && primitiveType == BINARY) {
+            return createColumnReader(field, valueDecoders::getBoundedVarcharBinaryDecoder, BINARY_ADAPTER, memoryContext);
+        }
+        if (type instanceof CharType && primitiveType == BINARY) {
+            return createColumnReader(field, valueDecoders::getCharBinaryDecoder, BINARY_ADAPTER, memoryContext);
+        }
+        if (type instanceof AbstractVariableWidthType && primitiveType == BINARY) {
+            return createColumnReader(field, valueDecoders::getBinaryDecoder, BINARY_ADAPTER, memoryContext);
+        }
+        if ((VARBINARY.equals(type) || VARCHAR.equals(type)) && primitiveType == FIXED_LEN_BYTE_ARRAY) {
+            return createColumnReader(field, valueDecoders::getFixedWidthBinaryDecoder, BINARY_ADAPTER, memoryContext);
+        }
+        if (UUID.equals(type) && primitiveType == FIXED_LEN_BYTE_ARRAY) {
+            // Iceberg 0.11.1 writes UUID as FIXED_LEN_BYTE_ARRAY without logical type annotation (see https://github.com/apache/iceberg/pull/2913)
+            // To support such files, we bet on the logical type to be UUID based on the Trino UUID type check.
+            if (annotation == null || isLogicalUuid(annotation)) {
+                return createColumnReader(field, valueDecoders::getUuidDecoder, INT128_ADAPTER, memoryContext);
             }
-        };
+        }
+        throw unsupportedException(type, field);
     }
 
     private static <T> ColumnReader createColumnReader(
@@ -326,18 +278,27 @@ private static <T> ColumnReader createColumnReader(
             ColumnAdapter<T> columnAdapter,
             LocalMemoryContext memoryContext)
     {
+        DictionaryDecoderProvider<T> dictionaryDecoderProvider = (dictionaryPage, isNonNull) -> getDictionaryDecoder(
+                dictionaryPage,
+                columnAdapter,
+                decodersProvider.create(PLAIN),
+                isNonNull);
         if (isFlatColumn(field)) {
-            return new FlatColumnReader<>(field, decodersProvider, columnAdapter, memoryContext);
+            return new FlatColumnReader<>(
+                    field,
+                    decodersProvider,
+                    FlatDefinitionLevelDecoder::getFlatDefinitionLevelDecoder,
+                    dictionaryDecoderProvider,
+                    columnAdapter,
+                    memoryContext);
         }
-        return new NestedColumnReader<>(field, decodersProvider, columnAdapter, memoryContext);
-    }
-
-    private static boolean useBatchedColumnReaders(ParquetReaderOptions options, PrimitiveField field)
-    {
-        if (isFlatColumn(field)) {
-            return options.useBatchColumnReaders();
-        }
-        return options.useBatchColumnReaders() && options.useBatchNestedColumnReaders();
+        return new NestedColumnReader<>(
+                field,
+                decodersProvider,
+                ValueDecoder::createLevelsDecoder,
+                dictionaryDecoderProvider,
+                columnAdapter,
+                memoryContext);
     }
 
     private static boolean isFlatColumn(PrimitiveField field)
@@ -359,12 +320,6 @@ public Optional<Boolean> visit(UUIDLogicalTypeAnnotation uuidLogicalType)
                 .orElse(FALSE);
     }
 
-    private static Optional<PrimitiveColumnReader> createDecimalColumnReader(PrimitiveField field)
-    {
-        return createDecimalType(field)
-                .map(decimalType -> DecimalColumnReaderFactory.createReader(field, decimalType));
-    }
-
     private static boolean isDecimalRescaled(DecimalLogicalTypeAnnotation decimalAnnotation, DecimalType trinoType)
     {
         return decimalAnnotation.getPrecision() != trinoType.getPrecision()
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/DecimalColumnReaderFactory.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/DecimalColumnReaderFactory.java
deleted file mode 100644
index d16c896f7517..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/DecimalColumnReaderFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.type.DecimalType;
-
-public final class DecimalColumnReaderFactory
-{
-    private DecimalColumnReaderFactory() {}
-
-    public static PrimitiveColumnReader createReader(PrimitiveField field, DecimalType parquetDecimalType)
-    {
-        if (parquetDecimalType.isShort()) {
-            return new ShortDecimalColumnReader(field, parquetDecimalType);
-        }
-        return new LongDecimalColumnReader(field, parquetDecimalType);
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/DoubleColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/DoubleColumnReader.java
deleted file mode 100644
index d807ad90e000..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/DoubleColumnReader.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-
-public class DoubleColumnReader
-        extends PrimitiveColumnReader
-{
-    public DoubleColumnReader(PrimitiveField field)
-    {
-        super(field);
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type type)
-    {
-        type.writeDouble(blockBuilder, valuesReader.readDouble());
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/FloatColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/FloatColumnReader.java
deleted file mode 100644
index e493087da027..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/FloatColumnReader.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-
-import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.RealType.REAL;
-import static java.lang.Float.floatToRawIntBits;
-
-public class FloatColumnReader
-        extends PrimitiveColumnReader
-{
-    public FloatColumnReader(PrimitiveField field)
-    {
-        super(field);
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type type)
-    {
-        if (type == REAL) {
-            type.writeLong(blockBuilder, floatToRawIntBits(valuesReader.readFloat()));
-        }
-        else if (type == DOUBLE) {
-            type.writeDouble(blockBuilder, valuesReader.readFloat());
-        }
-        else {
-            throw new VerifyError("Unsupported type " + type);
-        }
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/Int64TimestampMillisColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/Int64TimestampMillisColumnReader.java
deleted file mode 100644
index 421702c8dce8..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/Int64TimestampMillisColumnReader.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.LongTimestamp;
-import io.trino.spi.type.TimestampType;
-import io.trino.spi.type.TimestampWithTimeZoneType;
-import io.trino.spi.type.Type;
-
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
-import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
-import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
-import static java.lang.String.format;
-
-public class Int64TimestampMillisColumnReader
-        extends PrimitiveColumnReader
-{
-    public Int64TimestampMillisColumnReader(PrimitiveField field)
-    {
-        super(field);
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type type)
-    {
-        long epochMillis = valuesReader.readLong();
-        if (type instanceof TimestampWithTimeZoneType) {
-            type.writeLong(blockBuilder, packDateTimeWithZone(epochMillis, UTC_KEY));
-        }
-        else if (type instanceof TimestampType) {
-            long epochMicros = epochMillis * MICROSECONDS_PER_MILLISECOND;
-            if (((TimestampType) type).isShort()) {
-                type.writeLong(blockBuilder, epochMicros);
-            }
-            else {
-                type.writeObject(blockBuilder, new LongTimestamp(epochMicros, 0));
-            }
-        }
-        else if (type == BIGINT) {
-            type.writeLong(blockBuilder, epochMillis);
-        }
-        else {
-            throw new TrinoException(NOT_SUPPORTED, format("Unsupported Trino column type (%s) for Parquet column (%s)", type, field.getDescriptor()));
-        }
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/Int64TimestampNanosColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/Int64TimestampNanosColumnReader.java
deleted file mode 100644
index b5a64fec78d3..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/Int64TimestampNanosColumnReader.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.LongTimestamp;
-import io.trino.spi.type.Timestamps;
-import io.trino.spi.type.Type;
-
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
-import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
-import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
-import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MICROSECOND;
-import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_NANOSECOND;
-import static java.lang.Math.floorDiv;
-import static java.lang.Math.floorMod;
-import static java.lang.String.format;
-
-public class Int64TimestampNanosColumnReader
-        extends PrimitiveColumnReader
-{
-    public Int64TimestampNanosColumnReader(PrimitiveField field)
-    {
-        super(field);
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type type)
-    {
-        long epochNanos = valuesReader.readLong();
-        // TODO: specialize the class at creation time
-        if (type == TIMESTAMP_MILLIS) {
-            type.writeLong(blockBuilder, Timestamps.round(epochNanos, 6) / NANOSECONDS_PER_MICROSECOND);
-        }
-        else if (type == TIMESTAMP_MICROS) {
-            type.writeLong(blockBuilder, Timestamps.round(epochNanos, 3) / NANOSECONDS_PER_MICROSECOND);
-        }
-        else if (type == TIMESTAMP_NANOS) {
-            type.writeObject(blockBuilder, new LongTimestamp(
-                    floorDiv(epochNanos, NANOSECONDS_PER_MICROSECOND),
-                    floorMod(epochNanos, NANOSECONDS_PER_MICROSECOND) * PICOSECONDS_PER_NANOSECOND));
-        }
-        else if (type == BIGINT) {
-            type.writeLong(blockBuilder, epochNanos);
-        }
-        else {
-            throw new TrinoException(NOT_SUPPORTED, format("Unsupported Trino column type (%s) for Parquet column (%s)", type, field.getDescriptor()));
-        }
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/IntColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/IntColumnReader.java
deleted file mode 100644
index f130fa2f0654..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/IntColumnReader.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-
-public class IntColumnReader
-        extends PrimitiveColumnReader
-{
-    public IntColumnReader(PrimitiveField field)
-    {
-        super(field);
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type type)
-    {
-        type.writeLong(blockBuilder, valuesReader.readInteger());
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LevelNullReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LevelNullReader.java
deleted file mode 100644
index 06b66d7a997a..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LevelNullReader.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-public class LevelNullReader
-        implements LevelReader
-{
-    @Override
-    public int readLevel()
-    {
-        return 0;
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LevelRLEReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LevelRLEReader.java
deleted file mode 100644
index 05fe478dcf61..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LevelRLEReader.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import org.apache.parquet.column.values.rle.RunLengthBitPackingHybridDecoder;
-import org.apache.parquet.io.ParquetDecodingException;
-
-import java.io.IOException;
-
-public class LevelRLEReader
-        implements LevelReader
-{
-    private final RunLengthBitPackingHybridDecoder delegate;
-
-    public LevelRLEReader(RunLengthBitPackingHybridDecoder delegate)
-    {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public int readLevel()
-    {
-        try {
-            return delegate.readInt();
-        }
-        catch (IOException e) {
-            throw new ParquetDecodingException(e);
-        }
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LevelReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LevelReader.java
deleted file mode 100644
index ef9c019c45b4..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LevelReader.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-public interface LevelReader
-{
-    int readLevel();
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LevelValuesReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LevelValuesReader.java
deleted file mode 100644
index 86edfb925f87..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LevelValuesReader.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import org.apache.parquet.column.values.ValuesReader;
-
-public class LevelValuesReader
-        implements LevelReader
-{
-    private final ValuesReader delegate;
-
-    public LevelValuesReader(ValuesReader delegate)
-    {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public int readLevel()
-    {
-        return delegate.readInteger();
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ListColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ListColumnReader.java
index 592bf304bfc8..b6a68e55bcbb 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ListColumnReader.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ListColumnReader.java
@@ -14,9 +14,12 @@
 package io.trino.parquet.reader;
 
 import io.trino.parquet.Field;
-import io.trino.parquet.ParquetTypeUtils;
-import it.unimi.dsi.fastutil.booleans.BooleanList;
-import it.unimi.dsi.fastutil.ints.IntList;
+import it.unimi.dsi.fastutil.booleans.BooleanArrayList;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+
+import java.util.Optional;
+
+import static io.trino.parquet.ParquetTypeUtils.isOptionalFieldValueNull;
 
 public final class ListColumnReader
 {
@@ -29,33 +32,53 @@ private ListColumnReader() {}
      * 3) Collection is defined but empty
      * 4) Collection is defined and not empty. In this case offset value is increased by the number of elements in that collection
      */
-    public static void calculateCollectionOffsets(Field field, IntList offsets, BooleanList collectionIsNull, int[] definitionLevels, int[] repetitionLevels)
+    public static BlockPositions calculateCollectionOffsets(Field field, int[] definitionLevels, int[] repetitionLevels)
     {
         int maxDefinitionLevel = field.getDefinitionLevel();
         int maxElementRepetitionLevel = field.getRepetitionLevel() + 1;
         boolean required = field.isRequired();
         int offset = 0;
+        IntArrayList offsets = new IntArrayList();
         offsets.add(offset);
-        for (int i = 0; i < definitionLevels.length; i = getNextCollectionStartIndex(repetitionLevels, maxElementRepetitionLevel, i)) {
-            if (ParquetTypeUtils.isValueNull(required, definitionLevels[i], maxDefinitionLevel)) {
-                // Collection is null
-                collectionIsNull.add(true);
-                offsets.add(offset);
-            }
-            else if (definitionLevels[i] == maxDefinitionLevel) {
-                // Collection is defined but empty
-                collectionIsNull.add(false);
-                offsets.add(offset);
+        if (required) {
+            for (int i = 0; i < definitionLevels.length; i = getNextCollectionStartIndex(repetitionLevels, maxElementRepetitionLevel, i)) {
+                if (definitionLevels[i] == maxDefinitionLevel) {
+                    // Collection is defined but empty
+                    offsets.add(offset);
+                }
+                else if (definitionLevels[i] > maxDefinitionLevel) {
+                    // Collection is defined and not empty
+                    offset += getCollectionSize(repetitionLevels, maxElementRepetitionLevel, i + 1);
+                    offsets.add(offset);
+                }
             }
-            else if (definitionLevels[i] > maxDefinitionLevel) {
-                // Collection is defined and not empty
-                collectionIsNull.add(false);
-                offset += getCollectionSize(repetitionLevels, maxElementRepetitionLevel, i + 1);
+            return new BlockPositions(Optional.empty(), offsets.toIntArray());
+        }
+
+        BooleanArrayList collectionIsNull = new BooleanArrayList();
+        int nullValuesCount = 0;
+        for (int i = 0; i < definitionLevels.length; i = getNextCollectionStartIndex(repetitionLevels, maxElementRepetitionLevel, i)) {
+            if (definitionLevels[i] >= maxDefinitionLevel - 1) {
+                boolean isNull = isOptionalFieldValueNull(definitionLevels[i], maxDefinitionLevel);
+                collectionIsNull.add(isNull);
+                nullValuesCount += isNull ? 1 : 0;
+                // definitionLevels[i] == maxDefinitionLevel - 1 => Collection is null
+                // definitionLevels[i] == maxDefinitionLevel     => Collection is defined but empty
+                if (definitionLevels[i] > maxDefinitionLevel) {
+                    // Collection is defined and not empty
+                    offset += getCollectionSize(repetitionLevels, maxElementRepetitionLevel, i + 1);
+                }
                 offsets.add(offset);
             }
         }
+        if (nullValuesCount == 0) {
+            return new BlockPositions(Optional.empty(), offsets.toIntArray());
+        }
+        return new BlockPositions(Optional.of(collectionIsNull.elements()), offsets.toIntArray());
     }
 
+    public record BlockPositions(Optional<boolean[]> isNull, int[] offsets) {}
+
     private static int getNextCollectionStartIndex(int[] repetitionLevels, int maxRepetitionLevel, int elementIndex)
     {
         do {
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LongColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LongColumnReader.java
deleted file mode 100644
index 027814c7162d..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LongColumnReader.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-
-public class LongColumnReader
-        extends PrimitiveColumnReader
-{
-    public LongColumnReader(PrimitiveField field)
-    {
-        super(field);
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type type)
-    {
-        type.writeLong(blockBuilder, valuesReader.readLong());
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LongDecimalColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LongDecimalColumnReader.java
deleted file mode 100644
index d11fd057d01a..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/LongDecimalColumnReader.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.Int128;
-import io.trino.spi.type.Type;
-import org.apache.parquet.io.ParquetDecodingException;
-import org.apache.parquet.io.api.Binary;
-
-import static io.trino.spi.type.DecimalConversions.longToLongCast;
-import static io.trino.spi.type.DecimalConversions.longToShortCast;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-
-public class LongDecimalColumnReader
-        extends PrimitiveColumnReader
-{
-    private final DecimalType parquetDecimalType;
-
-    LongDecimalColumnReader(PrimitiveField field, DecimalType parquetDecimalType)
-    {
-        super(field);
-        this.parquetDecimalType = requireNonNull(parquetDecimalType, "parquetDecimalType is null");
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type trinoType)
-    {
-        if (!(trinoType instanceof DecimalType trinoDecimalType)) {
-            throw new ParquetDecodingException(format("Unsupported Trino column type (%s) for Parquet column (%s)", trinoType, field.getDescriptor()));
-        }
-
-        Binary binary = valuesReader.readBytes();
-        Int128 value = Int128.fromBigEndian(binary.getBytes());
-
-        if (trinoDecimalType.isShort()) {
-            trinoType.writeLong(blockBuilder, longToShortCast(
-                    value,
-                    parquetDecimalType.getPrecision(),
-                    parquetDecimalType.getScale(),
-                    trinoDecimalType.getPrecision(),
-                    trinoDecimalType.getScale()));
-        }
-        else {
-            trinoType.writeObject(blockBuilder, longToLongCast(
-                    value,
-                    parquetDecimalType.getPrecision(),
-                    parquetDecimalType.getScale(),
-                    trinoDecimalType.getPrecision(),
-                    trinoDecimalType.getScale()));
-        }
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/MetadataReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/MetadataReader.java
index f3126368ebe1..9dd28b8614a5 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/MetadataReader.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/MetadataReader.java
@@ -64,7 +64,6 @@
 import static java.lang.Boolean.TRUE;
 import static java.lang.Math.min;
 import static java.lang.Math.toIntExact;
-import static org.apache.hadoop.hive.ql.io.parquet.write.DataWritableWriteSupport.WRITER_TIMEZONE;
 import static org.apache.parquet.format.Util.readFileMetaData;
 import static org.apache.parquet.format.converter.ParquetMetadataConverterUtil.getLogicalTypeAnnotation;
 
@@ -117,8 +116,16 @@ public static ParquetMetadata readFooter(ParquetDataSource dataSource, Optional<
         InputStream metadataStream = buffer.slice(buffer.length() - completeFooterSize, metadataLength).getInput();
 
         FileMetaData fileMetaData = readFileMetaData(metadataStream);
+        ParquetMetadata parquetMetadata = createParquetMetadata(fileMetaData, dataSource.getId().toString());
+        validateFileMetadata(dataSource.getId(), parquetMetadata.getFileMetaData(), parquetWriteValidation);
+        return parquetMetadata;
+    }
+
+    public static ParquetMetadata createParquetMetadata(FileMetaData fileMetaData, String filename)
+            throws ParquetCorruptionException
+    {
         List<SchemaElement> schema = fileMetaData.getSchema();
-        validateParquet(!schema.isEmpty(), "Empty Parquet schema in file: %s", dataSource.getId());
+        validateParquet(!schema.isEmpty(), "Empty Parquet schema in file: %s", filename);
 
         MessageType messageType = readParquetSchema(schema);
         List<BlockMetaData> blocks = new ArrayList<>();
@@ -175,7 +182,6 @@ public static ParquetMetadata readFooter(ParquetDataSource dataSource, Optional<
                 messageType,
                 keyValueMetaData,
                 fileMetaData.getCreated_by());
-        validateFileMetadata(dataSource.getId(), parquetFileMetadata, parquetWriteValidation);
         return new ParquetMetadata(parquetFileMetadata, blocks);
     }
 
@@ -401,7 +407,7 @@ private static void validateFileMetadata(ParquetDataSourceId dataSourceId, org.a
         ParquetWriteValidation writeValidation = parquetWriteValidation.get();
         writeValidation.validateTimeZone(
                 dataSourceId,
-                Optional.ofNullable(fileMetaData.getKeyValueMetaData().get(WRITER_TIMEZONE)));
+                Optional.ofNullable(fileMetaData.getKeyValueMetaData().get("writer.time.zone")));
         writeValidation.validateColumns(dataSourceId, fileMetaData.getSchema());
     }
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/NestedColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/NestedColumnReader.java
index ccf6b690e730..6870ce3122a9 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/NestedColumnReader.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/NestedColumnReader.java
@@ -23,9 +23,7 @@
 import io.trino.parquet.DataPageV2;
 import io.trino.parquet.ParquetEncoding;
 import io.trino.parquet.PrimitiveField;
-import io.trino.parquet.reader.decoders.RleBitPackingHybridDecoder;
 import io.trino.parquet.reader.decoders.ValueDecoder;
-import io.trino.parquet.reader.decoders.ValueDecoder.EmptyValueDecoder;
 import io.trino.parquet.reader.flat.ColumnAdapter;
 import io.trino.parquet.reader.flat.DictionaryDecoder;
 import io.trino.spi.block.RunLengthEncodedBlock;
@@ -39,10 +37,11 @@
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.trino.parquet.ParquetEncoding.RLE;
 import static io.trino.parquet.ParquetReaderUtils.castToByte;
+import static io.trino.parquet.reader.decoders.ValueDecoder.LevelsDecoderProvider;
 import static io.trino.parquet.reader.decoders.ValueDecoder.ValueDecodersProvider;
+import static io.trino.parquet.reader.flat.DictionaryDecoder.DictionaryDecoderProvider;
 import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
-import static org.apache.parquet.bytes.BytesUtils.getWidthFromMaxInt;
 
 /**
  * This class works similarly to FlatColumnReader. The difference is that the resulting number
@@ -90,6 +89,7 @@ public class NestedColumnReader<BufferType>
 {
     private static final Logger log = Logger.get(NestedColumnReader.class);
 
+    private final LevelsDecoderProvider levelsDecoderProvider;
     private final LocalMemoryContext memoryContext;
 
     private ValueDecoder<int[]> definitionLevelDecoder;
@@ -110,10 +110,13 @@ public class NestedColumnReader<BufferType>
     public NestedColumnReader(
             PrimitiveField field,
             ValueDecodersProvider<BufferType> decodersProvider,
+            LevelsDecoderProvider levelsDecoderProvider,
+            DictionaryDecoderProvider<BufferType> dictionaryDecoderProvider,
             ColumnAdapter<BufferType> columnAdapter,
             LocalMemoryContext memoryContext)
     {
-        super(field, decodersProvider, columnAdapter);
+        super(field, decodersProvider, dictionaryDecoderProvider, columnAdapter);
+        this.levelsDecoderProvider = requireNonNull(levelsDecoderProvider, "levelsDecoderProvider is null");
         this.memoryContext = requireNonNull(memoryContext, "memoryContext is null");
     }
 
@@ -507,24 +510,19 @@ private void readFlatPageV1(DataPageV1 page)
         checkArgument(maxDefinitionLevel == 0 || definitionEncoding == RLE, "Invalid definition level encoding: " + definitionEncoding);
         checkArgument(maxRepetitionLevel == 0 || repetitionEncoding == RLE, "Invalid repetition level encoding: " + definitionEncoding);
 
+        repetitionLevelDecoder = levelsDecoderProvider.create(maxRepetitionLevel);
         if (maxRepetitionLevel > 0) {
             int bufferSize = buffer.getInt(0); //  We need to read the size even if there is no repetition data
-            repetitionLevelDecoder = new RleBitPackingHybridDecoder(getWidthFromMaxInt(maxRepetitionLevel));
             repetitionLevelDecoder.init(new SimpleSliceInputStream(buffer.slice(Integer.BYTES, bufferSize)));
             buffer = buffer.slice(bufferSize + Integer.BYTES, buffer.length() - bufferSize - Integer.BYTES);
         }
-        else {
-            repetitionLevelDecoder = new EmptyValueDecoder<>();
-        }
+
+        definitionLevelDecoder = levelsDecoderProvider.create(maxDefinitionLevel);
         if (maxDefinitionLevel > 0) {
             int bufferSize = buffer.getInt(0); // We need to read the size even if there is no definition
-            definitionLevelDecoder = new RleBitPackingHybridDecoder(getWidthFromMaxInt(field.getDefinitionLevel()));
             definitionLevelDecoder.init(new SimpleSliceInputStream(buffer.slice(Integer.BYTES, bufferSize)));
             buffer = buffer.slice(bufferSize + Integer.BYTES, buffer.length() - bufferSize - Integer.BYTES);
         }
-        else {
-            definitionLevelDecoder = new EmptyValueDecoder<>();
-        }
 
         valueDecoder = createValueDecoder(decodersProvider, page.getValueEncoding(), buffer);
     }
@@ -534,20 +532,11 @@ private void readFlatPageV2(DataPageV2 page)
         int maxDefinitionLevel = field.getDefinitionLevel();
         int maxRepetitionLevel = field.getRepetitionLevel();
 
-        if (maxDefinitionLevel == 0) {
-            definitionLevelDecoder = new EmptyValueDecoder<>();
-        }
-        else {
-            definitionLevelDecoder = new RleBitPackingHybridDecoder(getWidthFromMaxInt(maxDefinitionLevel));
-            definitionLevelDecoder.init(new SimpleSliceInputStream(page.getDefinitionLevels()));
-        }
-        if (maxRepetitionLevel == 0) {
-            repetitionLevelDecoder = new EmptyValueDecoder<>();
-        }
-        else {
-            repetitionLevelDecoder = new RleBitPackingHybridDecoder(getWidthFromMaxInt(maxRepetitionLevel));
-            repetitionLevelDecoder.init(new SimpleSliceInputStream(page.getRepetitionLevels()));
-        }
+        definitionLevelDecoder = levelsDecoderProvider.create(maxDefinitionLevel);
+        definitionLevelDecoder.init(new SimpleSliceInputStream(page.getDefinitionLevels()));
+
+        repetitionLevelDecoder = levelsDecoderProvider.create(maxRepetitionLevel);
+        repetitionLevelDecoder.init(new SimpleSliceInputStream(page.getRepetitionLevels()));
 
         valueDecoder = createValueDecoder(decodersProvider, page.getDataEncoding(), page.getSlice());
     }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/PageReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/PageReader.java
index a5e08b085efb..1c19115cffdd 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/PageReader.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/PageReader.java
@@ -21,14 +21,13 @@
 import io.trino.parquet.DataPageV2;
 import io.trino.parquet.DictionaryPage;
 import io.trino.parquet.Page;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.column.statistics.Statistics;
 import org.apache.parquet.format.CompressionCodec;
 import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData;
 import org.apache.parquet.internal.column.columnindex.OffsetIndex;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Optional;
@@ -103,6 +102,9 @@ public DataPage readPage()
         dataPageReadCount++;
         try {
             if (compressedPage instanceof DataPageV1 dataPageV1) {
+                if (!arePagesCompressed()) {
+                    return dataPageV1;
+                }
                 return new DataPageV1(
                         decompress(codec, dataPageV1.getSlice(), dataPageV1.getUncompressedSize()),
                         dataPageV1.getValueCount(),
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ParquetColumnChunkIterator.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ParquetColumnChunkIterator.java
index e7a9d3bc1f71..1a14d579bc59 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ParquetColumnChunkIterator.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ParquetColumnChunkIterator.java
@@ -18,6 +18,7 @@
 import io.trino.parquet.DictionaryPage;
 import io.trino.parquet.Page;
 import io.trino.parquet.ParquetCorruptionException;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.column.Encoding;
 import org.apache.parquet.format.DataPageHeader;
@@ -28,8 +29,6 @@
 import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData;
 import org.apache.parquet.internal.column.columnindex.OffsetIndex;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Optional;
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ParquetReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ParquetReader.java
index 75ec9f571bb6..9c214df7d128 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ParquetReader.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ParquetReader.java
@@ -34,6 +34,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.block.ArrayBlock;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.DictionaryBlock;
 import io.trino.spi.block.RowBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.metrics.Metric;
@@ -42,11 +43,7 @@
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeSignatureParameter;
-import it.unimi.dsi.fastutil.booleans.BooleanArrayList;
-import it.unimi.dsi.fastutil.booleans.BooleanList;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.filter2.compat.FilterCompat;
 import org.apache.parquet.filter2.predicate.FilterPredicate;
@@ -58,8 +55,6 @@
 import org.apache.parquet.internal.filter2.columnindex.ColumnIndexStore;
 import org.joda.time.DateTimeZone;
 
-import javax.annotation.Nullable;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.HashMap;
@@ -101,7 +96,7 @@ public class ParquetReader
     private final List<Field> columnFields;
     private final List<PrimitiveField> primitiveFields;
     private final ParquetDataSource dataSource;
-    private final DateTimeZone timeZone;
+    private final ColumnReaderFactory columnReaderFactory;
     private final AggregatedMemoryContext memoryContext;
 
     private int currentRowGroup = -1;
@@ -172,7 +167,7 @@ public ParquetReader(
         this.blocks = requireNonNull(blocks, "blocks is null");
         this.firstRowsOfBlocks = requireNonNull(firstRowsOfBlocks, "firstRowsOfBlocks is null");
         this.dataSource = requireNonNull(dataSource, "dataSource is null");
-        this.timeZone = requireNonNull(timeZone, "timeZone is null");
+        this.columnReaderFactory = new ColumnReaderFactory(timeZone);
         this.memoryContext = requireNonNull(memoryContext, "memoryContext is null");
         this.currentRowGroupMemoryContext = memoryContext.newAggregatedMemoryContext();
         this.options = requireNonNull(options, "options is null");
@@ -361,11 +356,10 @@ private ColumnChunk readArray(GroupField field)
         checkArgument(parameters.size() == 1, "Arrays must have a single type parameter, found %s", parameters.size());
         Field elementField = field.getChildren().get(0).get();
         ColumnChunk columnChunk = readColumnChunk(elementField);
-        IntList offsets = new IntArrayList();
-        BooleanList valueIsNull = new BooleanArrayList();
 
-        calculateCollectionOffsets(field, offsets, valueIsNull, columnChunk.getDefinitionLevels(), columnChunk.getRepetitionLevels());
-        Block arrayBlock = ArrayBlock.fromElementBlock(valueIsNull.size(), Optional.of(valueIsNull.toBooleanArray()), offsets.toIntArray(), columnChunk.getBlock());
+        ListColumnReader.BlockPositions collectionPositions = calculateCollectionOffsets(field, columnChunk.getDefinitionLevels(), columnChunk.getRepetitionLevels());
+        int positionsCount = collectionPositions.offsets().length - 1;
+        Block arrayBlock = ArrayBlock.fromElementBlock(positionsCount, collectionPositions.isNull(), collectionPositions.offsets(), columnChunk.getBlock());
         return new ColumnChunk(arrayBlock, columnChunk.getDefinitionLevels(), columnChunk.getRepetitionLevels());
     }
 
@@ -379,38 +373,77 @@ private ColumnChunk readMap(GroupField field)
         ColumnChunk columnChunk = readColumnChunk(field.getChildren().get(0).get());
         blocks[0] = columnChunk.getBlock();
         blocks[1] = readColumnChunk(field.getChildren().get(1).get()).getBlock();
-        IntList offsets = new IntArrayList();
-        BooleanList valueIsNull = new BooleanArrayList();
-        calculateCollectionOffsets(field, offsets, valueIsNull, columnChunk.getDefinitionLevels(), columnChunk.getRepetitionLevels());
-        Block mapBlock = ((MapType) field.getType()).createBlockFromKeyValue(Optional.of(valueIsNull.toBooleanArray()), offsets.toIntArray(), blocks[0], blocks[1]);
+        ListColumnReader.BlockPositions collectionPositions = calculateCollectionOffsets(field, columnChunk.getDefinitionLevels(), columnChunk.getRepetitionLevels());
+        Block mapBlock = ((MapType) field.getType()).createBlockFromKeyValue(collectionPositions.isNull(), collectionPositions.offsets(), blocks[0], blocks[1]);
         return new ColumnChunk(mapBlock, columnChunk.getDefinitionLevels(), columnChunk.getRepetitionLevels());
     }
 
     private ColumnChunk readStruct(GroupField field)
             throws IOException
     {
-        List<TypeSignatureParameter> fields = field.getType().getTypeSignature().getParameters();
-        Block[] blocks = new Block[fields.size()];
+        Block[] blocks = new Block[field.getType().getTypeParameters().size()];
         ColumnChunk columnChunk = null;
         List<Optional<Field>> parameters = field.getChildren();
-        for (int i = 0; i < fields.size(); i++) {
+        for (int i = 0; i < blocks.length; i++) {
             Optional<Field> parameter = parameters.get(i);
             if (parameter.isPresent()) {
                 columnChunk = readColumnChunk(parameter.get());
                 blocks[i] = columnChunk.getBlock();
             }
         }
-        for (int i = 0; i < fields.size(); i++) {
+
+        if (columnChunk == null) {
+            throw new ParquetCorruptionException("Struct field does not have any children: " + field);
+        }
+
+        StructColumnReader.RowBlockPositions structIsNull = StructColumnReader.calculateStructOffsets(field, columnChunk.getDefinitionLevels(), columnChunk.getRepetitionLevels());
+        Optional<boolean[]> isNull = structIsNull.isNull();
+        for (int i = 0; i < blocks.length; i++) {
             if (blocks[i] == null) {
-                blocks[i] = RunLengthEncodedBlock.create(field.getType().getTypeParameters().get(i), null, columnChunk.getBlock().getPositionCount());
+                blocks[i] = RunLengthEncodedBlock.create(field.getType().getTypeParameters().get(i), null, structIsNull.positionsCount());
+            }
+            else if (isNull.isPresent()) {
+                blocks[i] = toNotNullSupressedBlock(structIsNull.positionsCount(), isNull.get(), blocks[i]);
             }
         }
-        BooleanList structIsNull = StructColumnReader.calculateStructOffsets(field, columnChunk.getDefinitionLevels(), columnChunk.getRepetitionLevels());
-        boolean[] structIsNullVector = structIsNull.toBooleanArray();
-        Block rowBlock = RowBlock.fromFieldBlocks(structIsNullVector.length, Optional.of(structIsNullVector), blocks);
+        Block rowBlock = RowBlock.fromNotNullSuppressedFieldBlocks(structIsNull.positionsCount(), structIsNull.isNull(), blocks);
         return new ColumnChunk(rowBlock, columnChunk.getDefinitionLevels(), columnChunk.getRepetitionLevels());
     }
 
+    private static Block toNotNullSupressedBlock(int positionCount, boolean[] rowIsNull, Block fieldBlock)
+    {
+        // find a existing position in the block that is null
+        int nullIndex = -1;
+        if (fieldBlock.mayHaveNull()) {
+            for (int position = 0; position < fieldBlock.getPositionCount(); position++) {
+                if (fieldBlock.isNull(position)) {
+                    nullIndex = position;
+                    break;
+                }
+            }
+        }
+        // if there are no null positions, append a null to the end of the block
+        if (nullIndex == -1) {
+            fieldBlock = fieldBlock.getLoadedBlock();
+            nullIndex = fieldBlock.getPositionCount();
+            fieldBlock = fieldBlock.copyWithAppendedNull();
+        }
+
+        // create a dictionary that maps null positions to the null index
+        int[] dictionaryIds = new int[positionCount];
+        int nullSuppressedPosition = 0;
+        for (int position = 0; position < positionCount; position++) {
+            if (rowIsNull[position]) {
+                dictionaryIds[position] = nullIndex;
+            }
+            else {
+                dictionaryIds[position] = nullSuppressedPosition;
+                nullSuppressedPosition++;
+            }
+        }
+        return DictionaryBlock.create(positionCount, fieldBlock, dictionaryIds);
+    }
+
     @Nullable
     private FilteredOffsetIndex getFilteredOffsetIndex(FilteredRowRanges rowRanges, int rowGroup, long rowGroupRowCount, ColumnPath columnPath)
     {
@@ -486,7 +519,7 @@ private void initializeColumnReaders()
         for (PrimitiveField field : primitiveFields) {
             columnReaders.put(
                     field.getId(),
-                    ColumnReaderFactory.create(field, timeZone, currentRowGroupMemoryContext, options));
+                    columnReaderFactory.create(field, currentRowGroupMemoryContext));
         }
     }
 
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/PrimitiveColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/PrimitiveColumnReader.java
deleted file mode 100644
index 1dc845b9116b..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/PrimitiveColumnReader.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.airlift.slice.Slice;
-import io.trino.parquet.DataPage;
-import io.trino.parquet.DataPageV1;
-import io.trino.parquet.DataPageV2;
-import io.trino.parquet.DictionaryPage;
-import io.trino.parquet.ParquetEncoding;
-import io.trino.parquet.ParquetTypeUtils;
-import io.trino.parquet.PrimitiveField;
-import io.trino.parquet.dictionary.Dictionary;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
-import org.apache.parquet.bytes.ByteBufferInputStream;
-import org.apache.parquet.bytes.BytesUtils;
-import org.apache.parquet.column.values.ValuesReader;
-import org.apache.parquet.column.values.rle.RunLengthBitPackingHybridDecoder;
-import org.apache.parquet.io.ParquetDecodingException;
-
-import javax.annotation.Nullable;
-
-import java.io.IOException;
-import java.util.Optional;
-import java.util.OptionalLong;
-import java.util.PrimitiveIterator;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Verify.verify;
-import static io.trino.parquet.ParquetReaderUtils.toInputStream;
-import static io.trino.parquet.ValuesType.DEFINITION_LEVEL;
-import static io.trino.parquet.ValuesType.REPETITION_LEVEL;
-import static io.trino.parquet.ValuesType.VALUES;
-import static java.util.Objects.requireNonNull;
-
-public abstract class PrimitiveColumnReader
-        implements ColumnReader
-{
-    private static final int EMPTY_LEVEL_VALUE = -1;
-    protected final PrimitiveField field;
-
-    protected int definitionLevel = EMPTY_LEVEL_VALUE;
-    protected int repetitionLevel = EMPTY_LEVEL_VALUE;
-    protected ValuesReader valuesReader;
-
-    private int nextBatchSize;
-    private LevelReader repetitionReader;
-    private LevelReader definitionReader;
-    private PageReader pageReader;
-    private Dictionary dictionary;
-    private DataPage page;
-    private int remainingValueCountInPage;
-    private int readOffset;
-    @Nullable
-    private PrimitiveIterator.OfLong indexIterator;
-    private long currentRow;
-    private long targetRow;
-
-    protected abstract void readValue(BlockBuilder blockBuilder, Type type);
-
-    private void skipSingleValue()
-    {
-        if (definitionLevel == field.getDescriptor().getMaxDefinitionLevel()) {
-            valuesReader.skip();
-        }
-    }
-
-    protected boolean isValueNull()
-    {
-        return ParquetTypeUtils.isValueNull(field.isRequired(), definitionLevel, field.getDefinitionLevel());
-    }
-
-    public PrimitiveColumnReader(PrimitiveField field)
-    {
-        this.field = requireNonNull(field, "columnDescriptor");
-        pageReader = null;
-        this.targetRow = 0;
-        this.indexIterator = null;
-    }
-
-    @Override
-    public boolean hasPageReader()
-    {
-        return pageReader != null;
-    }
-
-    @Override
-    public void setPageReader(PageReader pageReader, Optional<FilteredRowRanges> rowRanges)
-    {
-        this.pageReader = requireNonNull(pageReader, "pageReader");
-        DictionaryPage dictionaryPage = pageReader.readDictionaryPage();
-
-        if (dictionaryPage != null) {
-            try {
-                dictionary = dictionaryPage.getEncoding().initDictionary(field.getDescriptor(), dictionaryPage);
-            }
-            catch (IOException e) {
-                throw new ParquetDecodingException("could not decode the dictionary for " + field.getDescriptor(), e);
-            }
-        }
-        else {
-            dictionary = null;
-        }
-        if (rowRanges.isPresent()) {
-            indexIterator = rowRanges.get().getParquetRowRanges().iterator();
-            // If rowRanges is empty for a row-group, then no page needs to be read, and we should not reach here
-            checkArgument(indexIterator.hasNext(), "rowRanges is empty");
-            targetRow = indexIterator.next();
-        }
-    }
-
-    @Override
-    public void prepareNextRead(int batchSize)
-    {
-        readOffset = readOffset + nextBatchSize;
-        nextBatchSize = batchSize;
-    }
-
-    @Override
-    public ColumnChunk readPrimitive()
-    {
-        // Pre-allocate these arrays to the necessary size. This saves a substantial amount of
-        // CPU time by avoiding container resizing.
-        IntList definitionLevels = new IntArrayList(nextBatchSize);
-        IntList repetitionLevels = new IntArrayList(nextBatchSize);
-        seek();
-        BlockBuilder blockBuilder = field.getType().createBlockBuilder(null, nextBatchSize);
-        int valueCount = 0;
-        while (valueCount < nextBatchSize) {
-            if (page == null) {
-                readNextPage();
-            }
-            int valuesToRead = Math.min(remainingValueCountInPage, nextBatchSize - valueCount);
-            if (valuesToRead == 0) {
-                // When we break here, we could end up with valueCount < nextBatchSize, but that is OK.
-                break;
-            }
-            readValues(blockBuilder, valuesToRead, field.getType(), definitionLevels, repetitionLevels);
-            valueCount += valuesToRead;
-        }
-
-        readOffset = 0;
-        nextBatchSize = 0;
-        return new ColumnChunk(blockBuilder.build(), definitionLevels.toIntArray(), repetitionLevels.toIntArray());
-    }
-
-    private void readValues(BlockBuilder blockBuilder, int valuesToRead, Type type, IntList definitionLevels, IntList repetitionLevels)
-    {
-        processValues(valuesToRead, () -> {
-            if (definitionLevel == field.getDefinitionLevel()) {
-                readValue(blockBuilder, type);
-            }
-            else if (isValueNull()) {
-                blockBuilder.appendNull();
-            }
-            definitionLevels.add(definitionLevel);
-            repetitionLevels.add(repetitionLevel);
-        });
-    }
-
-    private void skipValues(long valuesToRead)
-    {
-        processValues(valuesToRead, this::skipSingleValue);
-    }
-
-    /**
-     * When filtering using column indexes we might skip reading some pages for different columns. Because the rows are
-     * not aligned between the pages of the different columns it might be required to skip some values. The values (and the
-     * related rl and dl) are skipped based on the iterator of the required row indexes and the first row index of each
-     * page.
-     * For example:
-     *
-     * <pre>
-     * rows   col1   col2   col3
-     *      ┌──────┬──────┬──────┐
-     *   0  │  p0  │      │      │
-     *      ╞══════╡  p0  │  p0  │
-     *  20  │ p1(X)│------│------│
-     *      ╞══════╪══════╡      │
-     *  40  │ p2(X)│      │------│
-     *      ╞══════╡ p1(X)╞══════╡
-     *  60  │ p3(X)│      │------│
-     *      ╞══════╪══════╡      │
-     *  80  │  p4  │      │  p1  │
-     *      ╞══════╡  p2  │      │
-     * 100  │  p5  │      │      │
-     *      └──────┴──────┴──────┘
-     * </pre>
-     * <p>
-     * The pages 1, 2, 3 in col1 are skipped so we have to skip the rows [20, 79]. Because page 1 in col2 contains values
-     * only for the rows [40, 79] we skip this entire page as well. To synchronize the row reading we have to skip the
-     * values (and the related rl and dl) for the rows [20, 39] in the end of the page 0 for col2. Similarly, we have to
-     * skip values while reading page0 and page1 for col3.
-     */
-    private void processValues(long valuesToRead, Runnable valueReader)
-    {
-        if (definitionLevel == EMPTY_LEVEL_VALUE && repetitionLevel == EMPTY_LEVEL_VALUE) {
-            definitionLevel = definitionReader.readLevel();
-            repetitionLevel = repetitionReader.readLevel();
-        }
-        int valueCount = 0;
-        int skipCount = 0;
-        for (int i = 0; i < valuesToRead; ) {
-            boolean consumed;
-            do {
-                if (incrementRowAndTestIfTargetReached(repetitionLevel)) {
-                    valueReader.run();
-                    valueCount++;
-                    consumed = true;
-                }
-                else {
-                    skipSingleValue();
-                    skipCount++;
-                    consumed = false;
-                }
-
-                if (valueCount + skipCount == remainingValueCountInPage) {
-                    updateValueCounts(valueCount, skipCount);
-                    if (!readNextPage()) {
-                        return;
-                    }
-                    valueCount = 0;
-                    skipCount = 0;
-                }
-
-                repetitionLevel = repetitionReader.readLevel();
-                definitionLevel = definitionReader.readLevel();
-            }
-            while (repetitionLevel != 0);
-
-            if (consumed) {
-                i++;
-            }
-        }
-        updateValueCounts(valueCount, skipCount);
-    }
-
-    private void seek()
-    {
-        if (readOffset == 0) {
-            return;
-        }
-        int readOffset = this.readOffset;
-        int valuePosition = 0;
-        while (valuePosition < readOffset) {
-            if (page == null) {
-                if (!readNextPage()) {
-                    break;
-                }
-            }
-            int offset = Math.min(remainingValueCountInPage, readOffset - valuePosition);
-            skipValues(offset);
-            valuePosition = valuePosition + offset;
-        }
-        checkArgument(valuePosition == readOffset, "valuePosition %s must be equal to readOffset %s", valuePosition, readOffset);
-    }
-
-    private boolean readNextPage()
-    {
-        verify(page == null, "readNextPage has to be called when page is null");
-        page = pageReader.readPage();
-        if (page == null) {
-            // we have read all pages
-            return false;
-        }
-        remainingValueCountInPage = page.getValueCount();
-        if (page instanceof DataPageV1) {
-            valuesReader = readPageV1((DataPageV1) page);
-        }
-        else {
-            valuesReader = readPageV2((DataPageV2) page);
-        }
-        return true;
-    }
-
-    private void updateValueCounts(int valuesRead, int skipCount)
-    {
-        int totalCount = valuesRead + skipCount;
-        if (totalCount == remainingValueCountInPage) {
-            page = null;
-            valuesReader = null;
-        }
-        remainingValueCountInPage -= totalCount;
-    }
-
-    private ValuesReader readPageV1(DataPageV1 page)
-    {
-        ValuesReader rlReader = page.getRepetitionLevelEncoding().getValuesReader(field.getDescriptor(), REPETITION_LEVEL);
-        ValuesReader dlReader = page.getDefinitionLevelEncoding().getValuesReader(field.getDescriptor(), DEFINITION_LEVEL);
-        repetitionReader = new LevelValuesReader(rlReader);
-        definitionReader = new LevelValuesReader(dlReader);
-        try {
-            ByteBufferInputStream in = toInputStream(page.getSlice());
-            rlReader.initFromPage(page.getValueCount(), in);
-            dlReader.initFromPage(page.getValueCount(), in);
-            return initDataReader(page.getValueEncoding(), page.getValueCount(), in, page.getFirstRowIndex());
-        }
-        catch (IOException e) {
-            throw new ParquetDecodingException("Error reading parquet page " + page + " in column " + field.getDescriptor(), e);
-        }
-    }
-
-    private ValuesReader readPageV2(DataPageV2 page)
-    {
-        repetitionReader = buildLevelRLEReader(field.getDescriptor().getMaxRepetitionLevel(), page.getRepetitionLevels());
-        definitionReader = buildLevelRLEReader(field.getDescriptor().getMaxDefinitionLevel(), page.getDefinitionLevels());
-        return initDataReader(page.getDataEncoding(), page.getValueCount(), toInputStream(page.getSlice()), page.getFirstRowIndex());
-    }
-
-    private LevelReader buildLevelRLEReader(int maxLevel, Slice slice)
-    {
-        if (maxLevel == 0) {
-            return new LevelNullReader();
-        }
-        return new LevelRLEReader(new RunLengthBitPackingHybridDecoder(BytesUtils.getWidthFromMaxInt(maxLevel), slice.getInput()));
-    }
-
-    private ValuesReader initDataReader(ParquetEncoding dataEncoding, int valueCount, ByteBufferInputStream in, OptionalLong firstRowIndex)
-    {
-        ValuesReader valuesReader;
-        if (dataEncoding.usesDictionary()) {
-            if (dictionary == null) {
-                throw new ParquetDecodingException("Dictionary is missing for Page");
-            }
-            valuesReader = dataEncoding.getDictionaryBasedValuesReader(field.getDescriptor(), VALUES, dictionary);
-        }
-        else {
-            valuesReader = dataEncoding.getValuesReader(field.getDescriptor(), VALUES);
-        }
-
-        try {
-            valuesReader.initFromPage(valueCount, in);
-            if (firstRowIndex.isPresent()) {
-                currentRow = firstRowIndex.getAsLong();
-            }
-            return valuesReader;
-        }
-        catch (IOException e) {
-            throw new ParquetDecodingException("Error reading parquet page in column " + field.getDescriptor(), e);
-        }
-    }
-
-    // Increment currentRow and return true if at or after targetRow
-    private boolean incrementRowAndTestIfTargetReached(int repetitionLevel)
-    {
-        if (indexIterator == null) {
-            return true;
-        }
-
-        if (repetitionLevel == 0) {
-            if (currentRow > targetRow) {
-                targetRow = indexIterator.hasNext() ? indexIterator.next() : Long.MAX_VALUE;
-            }
-            boolean isAtTargetRow = currentRow == targetRow;
-            currentRow++;
-            return isAtTargetRow;
-        }
-
-        // currentRow was incremented at repetitionLevel 0
-        return currentRow - 1 == targetRow;
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ShortDecimalColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ShortDecimalColumnReader.java
deleted file mode 100644
index 7950ca65016d..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ShortDecimalColumnReader.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.Type;
-import org.apache.parquet.io.ParquetDecodingException;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.parquet.ParquetTypeUtils.checkBytesFitInShortDecimal;
-import static io.trino.parquet.ParquetTypeUtils.getShortDecimalValue;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.DecimalConversions.shortToLongCast;
-import static io.trino.spi.type.DecimalConversions.shortToShortCast;
-import static io.trino.spi.type.Decimals.longTenToNth;
-import static io.trino.spi.type.IntegerType.INTEGER;
-import static io.trino.spi.type.SmallintType.SMALLINT;
-import static io.trino.spi.type.TinyintType.TINYINT;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.INT32;
-import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.INT64;
-
-public class ShortDecimalColumnReader
-        extends PrimitiveColumnReader
-{
-    private final DecimalType parquetDecimalType;
-
-    ShortDecimalColumnReader(PrimitiveField field, DecimalType parquetDecimalType)
-    {
-        super(field);
-        this.parquetDecimalType = requireNonNull(parquetDecimalType, "parquetDecimalType is null");
-        int typeLength = field.getDescriptor().getPrimitiveType().getTypeLength();
-        checkArgument(typeLength <= 16, "Type length %s should be <= 16 for short decimal column %s", typeLength, field.getDescriptor());
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type trinoType)
-    {
-        if (!((trinoType instanceof DecimalType) || isIntegerType(trinoType))) {
-            throw new ParquetDecodingException(format("Unsupported Trino column type (%s) for Parquet column (%s)", trinoType, field.getDescriptor()));
-        }
-
-        long value;
-
-        // When decimals are encoded with primitive types Parquet stores unscaled values
-        if (field.getDescriptor().getPrimitiveType().getPrimitiveTypeName() == INT32) {
-            value = valuesReader.readInteger();
-        }
-        else if (field.getDescriptor().getPrimitiveType().getPrimitiveTypeName() == INT64) {
-            value = valuesReader.readLong();
-        }
-        else {
-            byte[] bytes = valuesReader.readBytes().getBytes();
-            if (bytes.length <= Long.BYTES) {
-                value = getShortDecimalValue(bytes);
-            }
-            else {
-                int startOffset = bytes.length - Long.BYTES;
-                checkBytesFitInShortDecimal(bytes, 0, startOffset, field.getDescriptor());
-                value = getShortDecimalValue(bytes, startOffset, Long.BYTES);
-            }
-        }
-
-        if (trinoType instanceof DecimalType trinoDecimalType) {
-            if (trinoDecimalType.isShort()) {
-                long rescale = longTenToNth(Math.abs(trinoDecimalType.getScale() - parquetDecimalType.getScale()));
-                long convertedValue = shortToShortCast(
-                        value,
-                        parquetDecimalType.getPrecision(),
-                        parquetDecimalType.getScale(),
-                        trinoDecimalType.getPrecision(),
-                        trinoDecimalType.getScale(),
-                        rescale,
-                        rescale / 2);
-
-                trinoType.writeLong(blockBuilder, convertedValue);
-            }
-            else {
-                trinoType.writeObject(blockBuilder, shortToLongCast(
-                        value,
-                        parquetDecimalType.getPrecision(),
-                        parquetDecimalType.getScale(),
-                        trinoDecimalType.getPrecision(),
-                        trinoDecimalType.getScale()));
-            }
-        }
-        else {
-            if (parquetDecimalType.getScale() != 0) {
-                throw new TrinoException(NOT_SUPPORTED, format("Unsupported Trino column type (%s) for Parquet column (%s)", trinoType, field.getDescriptor()));
-            }
-
-            if (!isInValidNumberRange(trinoType, value)) {
-                throw new TrinoException(NOT_SUPPORTED, format("Could not coerce from %s to %s: %s", parquetDecimalType, trinoType, value));
-            }
-            trinoType.writeLong(blockBuilder, value);
-        }
-    }
-
-    protected boolean isIntegerType(Type type)
-    {
-        return type.equals(TINYINT) || type.equals(SMALLINT) || type.equals(INTEGER) || type.equals(BIGINT);
-    }
-
-    protected boolean isInValidNumberRange(Type type, long value)
-    {
-        if (type.equals(TINYINT)) {
-            return Byte.MIN_VALUE <= value && value <= Byte.MAX_VALUE;
-        }
-        if (type.equals(SMALLINT)) {
-            return Short.MIN_VALUE <= value && value <= Short.MAX_VALUE;
-        }
-        if (type.equals(INTEGER)) {
-            return Integer.MIN_VALUE <= value && value <= Integer.MAX_VALUE;
-        }
-        if (type.equals(BIGINT)) {
-            return true;
-        }
-
-        throw new IllegalArgumentException("Unsupported type: " + type);
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/SimpleSliceInputStream.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/SimpleSliceInputStream.java
index 5491d947d866..87f5954a50b1 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/SimpleSliceInputStream.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/SimpleSliceInputStream.java
@@ -13,10 +13,9 @@
  */
 package io.trino.parquet.reader;
 
+import com.google.common.primitives.Shorts;
 import io.airlift.slice.Slice;
-import io.airlift.slice.UnsafeSlice;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkPositionIndexes;
 import static java.util.Objects.requireNonNull;
 
@@ -40,7 +39,6 @@ public SimpleSliceInputStream(Slice slice)
     public SimpleSliceInputStream(Slice slice, int offset)
     {
         this.slice = requireNonNull(slice, "slice is null");
-        checkArgument(slice.length() == 0 || slice.hasByteArray(), "SimpleSliceInputStream supports only slices backed by byte array");
         this.offset = offset;
     }
 
@@ -83,6 +81,24 @@ public void readBytes(byte[] output, int outputOffset, int length)
         offset += length;
     }
 
+    public void readShorts(short[] output, int outputOffset, int length)
+    {
+        slice.getShorts(offset, output, outputOffset, length);
+        offset += length * Shorts.BYTES;
+    }
+
+    public void readInts(int[] output, int outputOffset, int length)
+    {
+        slice.getInts(offset, output, outputOffset, length);
+        offset += length * Integer.BYTES;
+    }
+
+    public void readLongs(long[] output, int outputOffset, int length)
+    {
+        slice.getLongs(offset, output, outputOffset, length);
+        offset += length * Long.BYTES;
+    }
+
     public void readBytes(Slice destination, int destinationIndex, int length)
     {
         slice.getBytes(offset, destination, destinationIndex, length);
@@ -135,7 +151,7 @@ public void ensureBytesAvailable(int bytes)
      */
     public int readIntUnsafe()
     {
-        int value = UnsafeSlice.getIntUnchecked(slice, offset);
+        int value = slice.getIntUnchecked(offset);
         offset += Integer.BYTES;
         return value;
     }
@@ -146,7 +162,7 @@ public int readIntUnsafe()
      */
     public long readLongUnsafe()
     {
-        long value = UnsafeSlice.getLongUnchecked(slice, offset);
+        long value = slice.getLongUnchecked(offset);
         offset += Long.BYTES;
         return value;
     }
@@ -157,7 +173,7 @@ public long readLongUnsafe()
      */
     public byte getByteUnsafe(int index)
     {
-        return UnsafeSlice.getByteUnchecked(slice, offset + index);
+        return slice.getByteUnchecked(offset + index);
     }
 
     /**
@@ -166,7 +182,7 @@ public byte getByteUnsafe(int index)
      */
     public int getIntUnsafe(int index)
     {
-        return UnsafeSlice.getIntUnchecked(slice, offset + index);
+        return slice.getIntUnchecked(offset + index);
     }
 
     /**
@@ -175,6 +191,6 @@ public int getIntUnsafe(int index)
      */
     public long getLongUnsafe(int index)
     {
-        return UnsafeSlice.getLongUnchecked(slice, offset + index);
+        return slice.getLongUnchecked(offset + index);
     }
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/StructColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/StructColumnReader.java
index 77d1e82d4b8d..8a5c6cf3ac19 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/StructColumnReader.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/StructColumnReader.java
@@ -15,9 +15,10 @@
 
 import io.trino.parquet.Field;
 import it.unimi.dsi.fastutil.booleans.BooleanArrayList;
-import it.unimi.dsi.fastutil.booleans.BooleanList;
 
-import static io.trino.parquet.ParquetTypeUtils.isValueNull;
+import java.util.Optional;
+
+import static io.trino.parquet.ParquetTypeUtils.isOptionalFieldValueNull;
 
 public final class StructColumnReader
 {
@@ -29,23 +30,35 @@ private StructColumnReader() {}
      * 2) Struct is null
      * 3) Struct is defined and not empty.
      */
-    public static BooleanList calculateStructOffsets(
+    public static RowBlockPositions calculateStructOffsets(
             Field field,
             int[] fieldDefinitionLevels,
             int[] fieldRepetitionLevels)
     {
         int maxDefinitionLevel = field.getDefinitionLevel();
         int maxRepetitionLevel = field.getRepetitionLevel();
-        BooleanList structIsNull = new BooleanArrayList();
         boolean required = field.isRequired();
-        if (fieldDefinitionLevels == null) {
-            return structIsNull;
+        if (required) {
+            int definedValuesCount = 0;
+            for (int i = 0; i < fieldDefinitionLevels.length; i++) {
+                if (fieldRepetitionLevels[i] <= maxRepetitionLevel) {
+                    if (fieldDefinitionLevels[i] >= maxDefinitionLevel) {
+                        // Struct is defined and not empty
+                        definedValuesCount++;
+                    }
+                }
+            }
+            return new RowBlockPositions(Optional.empty(), definedValuesCount);
         }
+
+        int nullValuesCount = 0;
+        BooleanArrayList structIsNull = new BooleanArrayList();
         for (int i = 0; i < fieldDefinitionLevels.length; i++) {
             if (fieldRepetitionLevels[i] <= maxRepetitionLevel) {
-                if (isValueNull(required, fieldDefinitionLevels[i], maxDefinitionLevel)) {
+                if (isOptionalFieldValueNull(fieldDefinitionLevels[i], maxDefinitionLevel)) {
                     // Struct is null
                     structIsNull.add(true);
+                    nullValuesCount++;
                 }
                 else if (fieldDefinitionLevels[i] >= maxDefinitionLevel) {
                     // Struct is defined and not empty
@@ -53,6 +66,11 @@ else if (fieldDefinitionLevels[i] >= maxDefinitionLevel) {
                 }
             }
         }
-        return structIsNull;
+        if (nullValuesCount == 0) {
+            return new RowBlockPositions(Optional.empty(), structIsNull.size());
+        }
+        return new RowBlockPositions(Optional.of(structIsNull.elements()), structIsNull.size());
     }
+
+    public record RowBlockPositions(Optional<boolean[]> isNull, int positionsCount) {}
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TimeMicrosColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TimeMicrosColumnReader.java
deleted file mode 100644
index ba1e7138856d..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TimeMicrosColumnReader.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.TimeType;
-import io.trino.spi.type.Timestamps;
-import io.trino.spi.type.Type;
-
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static java.lang.String.format;
-
-public class TimeMicrosColumnReader
-        extends PrimitiveColumnReader
-{
-    public TimeMicrosColumnReader(PrimitiveField field)
-    {
-        super(field);
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type type)
-    {
-        long picos = valuesReader.readLong() * Timestamps.PICOSECONDS_PER_MICROSECOND;
-        if (type instanceof TimeType) {
-            type.writeLong(blockBuilder, picos);
-        }
-        else {
-            throw new TrinoException(NOT_SUPPORTED, format("Unsupported Trino column type (%s) for Parquet column (%s)", type, field.getDescriptor()));
-        }
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java
deleted file mode 100644
index cf236d294396..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.plugin.base.type.DecodedTimestamp;
-import io.trino.plugin.base.type.TrinoTimestampEncoder;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.TimestampType;
-import io.trino.spi.type.TimestampWithTimeZoneType;
-import io.trino.spi.type.Type;
-import org.joda.time.DateTimeZone;
-
-import static io.trino.parquet.ParquetTimestampUtils.decodeInt96Timestamp;
-import static io.trino.plugin.base.type.TrinoTimestampEncoderFactory.createTimestampEncoder;
-import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
-import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
-import static io.trino.spi.type.Timestamps.MILLISECONDS_PER_SECOND;
-import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MILLISECOND;
-import static java.util.Objects.requireNonNull;
-
-public class TimestampColumnReader
-        extends PrimitiveColumnReader
-{
-    private final DateTimeZone timeZone;
-
-    public TimestampColumnReader(PrimitiveField field, DateTimeZone timeZone)
-    {
-        super(field);
-        this.timeZone = requireNonNull(timeZone, "timeZone is null");
-    }
-
-    // TODO: refactor to provide type at construction time (https://github.com/trinodb/trino/issues/5198)
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type type)
-    {
-        if (type instanceof TimestampWithTimeZoneType) {
-            DecodedTimestamp decodedTimestamp = decodeInt96Timestamp(valuesReader.readBytes());
-            long utcMillis = decodedTimestamp.epochSeconds() * MILLISECONDS_PER_SECOND + decodedTimestamp.nanosOfSecond() / NANOSECONDS_PER_MILLISECOND;
-            type.writeLong(blockBuilder, packDateTimeWithZone(utcMillis, UTC_KEY));
-        }
-        else {
-            TrinoTimestampEncoder<?> trinoTimestampEncoder = createTimestampEncoder((TimestampType) type, timeZone);
-            trinoTimestampEncoder.write(decodeInt96Timestamp(valuesReader.readBytes()), blockBuilder);
-        }
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TimestampMicrosColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TimestampMicrosColumnReader.java
deleted file mode 100644
index 6aafffc18397..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TimestampMicrosColumnReader.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.LongTimestamp;
-import io.trino.spi.type.LongTimestampWithTimeZone;
-import io.trino.spi.type.Timestamps;
-import io.trino.spi.type.Type;
-
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
-import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
-import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
-import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
-import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
-import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MICROS;
-import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
-import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_NANOS;
-import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
-import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MICROSECOND;
-import static java.lang.Math.floorDiv;
-import static java.lang.Math.floorMod;
-import static java.lang.Math.toIntExact;
-import static java.lang.String.format;
-
-public class TimestampMicrosColumnReader
-        extends PrimitiveColumnReader
-{
-    public TimestampMicrosColumnReader(PrimitiveField field)
-    {
-        super(field);
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type type)
-    {
-        long epochMicros = valuesReader.readLong();
-        // TODO: specialize the class at creation time
-        if (type == TIMESTAMP_MILLIS) {
-            type.writeLong(blockBuilder, Timestamps.round(epochMicros, 3));
-        }
-        else if (type == TIMESTAMP_MICROS) {
-            type.writeLong(blockBuilder, epochMicros);
-        }
-        else if (type == TIMESTAMP_NANOS) {
-            type.writeObject(blockBuilder, new LongTimestamp(epochMicros, 0));
-        }
-        else if (type == TIMESTAMP_TZ_MILLIS) {
-            long epochMillis = Timestamps.round(epochMicros, 3) / MICROSECONDS_PER_MILLISECOND;
-            type.writeLong(blockBuilder, packDateTimeWithZone(epochMillis, UTC_KEY));
-        }
-        else if (type == TIMESTAMP_TZ_MICROS || type == TIMESTAMP_TZ_NANOS) {
-            long epochMillis = floorDiv(epochMicros, MICROSECONDS_PER_MILLISECOND);
-            int picosOfMillis = toIntExact(floorMod(epochMicros, MICROSECONDS_PER_MILLISECOND)) * PICOSECONDS_PER_MICROSECOND;
-            type.writeObject(blockBuilder, LongTimestampWithTimeZone.fromEpochMillisAndFraction(epochMillis, picosOfMillis, UTC_KEY));
-        }
-        else if (type == BIGINT) {
-            type.writeLong(blockBuilder, epochMicros);
-        }
-        else {
-            throw new TrinoException(NOT_SUPPORTED, format("Unsupported Trino column type (%s) for Parquet column (%s)", type, field.getDescriptor()));
-        }
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TrinoColumnIndexStore.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TrinoColumnIndexStore.java
index 413f65646007..041c4e1250ae 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TrinoColumnIndexStore.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/TrinoColumnIndexStore.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ListMultimap;
 import io.trino.parquet.DiskRange;
 import io.trino.parquet.ParquetDataSource;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.format.Util;
 import org.apache.parquet.format.converter.ParquetMetadataConverter;
 import org.apache.parquet.hadoop.metadata.BlockMetaData;
@@ -29,8 +30,6 @@
 import org.apache.parquet.internal.hadoop.metadata.IndexReference;
 import org.apache.parquet.schema.PrimitiveType;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/UuidColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/UuidColumnReader.java
deleted file mode 100644
index c3f77249d927..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/UuidColumnReader.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.airlift.slice.Slice;
-import io.trino.parquet.PrimitiveField;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.Type;
-import org.apache.parquet.io.api.Binary;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.airlift.slice.Slices.wrappedBuffer;
-import static io.trino.spi.type.UuidType.UUID;
-
-public class UuidColumnReader
-        extends PrimitiveColumnReader
-{
-    public UuidColumnReader(PrimitiveField field)
-    {
-        super(field);
-    }
-
-    @Override
-    protected void readValue(BlockBuilder blockBuilder, Type trinoType)
-    {
-        checkArgument(trinoType == UUID, "Unsupported type: %s", trinoType);
-
-        Binary binary = valuesReader.readBytes();
-        Slice slice = wrappedBuffer(binary.getBytes());
-        trinoType.writeSlice(blockBuilder, slice);
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/DeltaPackingUtils.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/DeltaPackingUtils.java
index 39f6f10ae7cf..90579737ed41 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/DeltaPackingUtils.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/DeltaPackingUtils.java
@@ -13,13 +13,11 @@
  */
 package io.trino.parquet.reader.decoders;
 
-import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 
 import java.util.Arrays;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.parquet.ParquetReaderUtils.toByteExact;
 import static io.trino.parquet.ParquetReaderUtils.toShortExact;
 import static io.trino.parquet.reader.decoders.ByteBitUnpackers.getByteBitUnpacker;
@@ -29,8 +27,6 @@
 
 public final class DeltaPackingUtils
 {
-    private static final int SHORTS_IN_LONG = Long.BYTES / Short.BYTES;
-
     private DeltaPackingUtils() {}
 
     public static void unpackDelta(byte[] output, int outputOffset, int length, SimpleSliceInputStream input, long minDelta, byte bitWidth)
@@ -128,10 +124,10 @@ private static void unpackEmpty(byte[] output, int outputOffset, int length, byt
     private static void unpackEmpty(short[] output, int outputOffset, int length, short delta)
     {
         if (delta == 0) { // Common case
-            fillArray4(output, outputOffset, length / 4, output[outputOffset - 1]);
+            Arrays.fill(output, outputOffset, outputOffset + length, output[outputOffset - 1]);
         }
         else {
-            fillArray4(output, outputOffset, length / 4, delta);
+            Arrays.fill(output, outputOffset, outputOffset + length, delta);
             for (int i = outputOffset; i < outputOffset + length; i += 32) {
                 output[i] += output[i - 1];
                 output[i + 1] += output[i];
@@ -301,104 +297,79 @@ private static void fillArray8(byte[] output, int outputOffset, int length, byte
                 .fill(baseValue);
     }
 
-    /**
-     * Fill short array with a value. Fills 4 values at a time
-     *
-     * @param length Number of LONG values to write i.e. number of shorts / 4
-     */
-    private static void fillArray4(short[] output, int outputOffset, int length, short baseValue)
-    {
-        Slice buffer = Slices.wrappedShortArray(output, outputOffset, length * SHORTS_IN_LONG);
-        checkArgument(output.length - outputOffset >= length * SHORTS_IN_LONG, "Trying to write values out of array bounds");
-        long value = fillLong(baseValue);
-        for (int i = 0; i < length * Long.BYTES; i += Long.BYTES) {
-            buffer.setLong(i, value);
-        }
-    }
-
-    /**
-     * @return long value made out of the argument concatenated 4 times
-     */
-    private static long fillLong(short baseValue)
-    {
-        long value = ((long) (baseValue & 0xFFFF) << 16) | (baseValue & 0xFFFF);
-        value = (value << 32) | value;
-        return value;
-    }
-
     private static void inPlacePrefixSum(byte[] output, int outputOffset, int length, short minDelta)
     {
         for (int i = outputOffset; i < outputOffset + length; i += 32) {
-            output[i] += output[i - 1] + minDelta;
-            output[i + 1] += output[i] + minDelta;
-            output[i + 2] += output[i + 1] + minDelta;
-            output[i + 3] += output[i + 2] + minDelta;
-            output[i + 4] += output[i + 3] + minDelta;
-            output[i + 5] += output[i + 4] + minDelta;
-            output[i + 6] += output[i + 5] + minDelta;
-            output[i + 7] += output[i + 6] + minDelta;
-            output[i + 8] += output[i + 7] + minDelta;
-            output[i + 9] += output[i + 8] + minDelta;
-            output[i + 10] += output[i + 9] + minDelta;
-            output[i + 11] += output[i + 10] + minDelta;
-            output[i + 12] += output[i + 11] + minDelta;
-            output[i + 13] += output[i + 12] + minDelta;
-            output[i + 14] += output[i + 13] + minDelta;
-            output[i + 15] += output[i + 14] + minDelta;
-            output[i + 16] += output[i + 15] + minDelta;
-            output[i + 17] += output[i + 16] + minDelta;
-            output[i + 18] += output[i + 17] + minDelta;
-            output[i + 19] += output[i + 18] + minDelta;
-            output[i + 20] += output[i + 19] + minDelta;
-            output[i + 21] += output[i + 20] + minDelta;
-            output[i + 22] += output[i + 21] + minDelta;
-            output[i + 23] += output[i + 22] + minDelta;
-            output[i + 24] += output[i + 23] + minDelta;
-            output[i + 25] += output[i + 24] + minDelta;
-            output[i + 26] += output[i + 25] + minDelta;
-            output[i + 27] += output[i + 26] + minDelta;
-            output[i + 28] += output[i + 27] + minDelta;
-            output[i + 29] += output[i + 28] + minDelta;
-            output[i + 30] += output[i + 29] + minDelta;
-            output[i + 31] += output[i + 30] + minDelta;
+            output[i] = (byte) (output[i] + (output[i - 1] + minDelta));
+            output[i + 1] = (byte) (output[i + 1] + (output[i] + minDelta));
+            output[i + 2] = (byte) (output[i + 2] + (output[i + 1] + minDelta));
+            output[i + 3] = (byte) (output[i + 3] + (output[i + 2] + minDelta));
+            output[i + 4] = (byte) (output[i + 4] + (output[i + 3] + minDelta));
+            output[i + 5] = (byte) (output[i + 5] + (output[i + 4] + minDelta));
+            output[i + 6] = (byte) (output[i + 6] + (output[i + 5] + minDelta));
+            output[i + 7] = (byte) (output[i + 7] + (output[i + 6] + minDelta));
+            output[i + 8] = (byte) (output[i + 8] + (output[i + 7] + minDelta));
+            output[i + 9] = (byte) (output[i + 9] + (output[i + 8] + minDelta));
+            output[i + 10] = (byte) (output[i + 10] + (output[i + 9] + minDelta));
+            output[i + 11] = (byte) (output[i + 11] + (output[i + 10] + minDelta));
+            output[i + 12] = (byte) (output[i + 12] + (output[i + 11] + minDelta));
+            output[i + 13] = (byte) (output[i + 13] + (output[i + 12] + minDelta));
+            output[i + 14] = (byte) (output[i + 14] + (output[i + 13] + minDelta));
+            output[i + 15] = (byte) (output[i + 15] + (output[i + 14] + minDelta));
+            output[i + 16] = (byte) (output[i + 16] + (output[i + 15] + minDelta));
+            output[i + 17] = (byte) (output[i + 17] + (output[i + 16] + minDelta));
+            output[i + 18] = (byte) (output[i + 18] + (output[i + 17] + minDelta));
+            output[i + 19] = (byte) (output[i + 19] + (output[i + 18] + minDelta));
+            output[i + 20] = (byte) (output[i + 20] + (output[i + 19] + minDelta));
+            output[i + 21] = (byte) (output[i + 21] + (output[i + 20] + minDelta));
+            output[i + 22] = (byte) (output[i + 22] + (output[i + 21] + minDelta));
+            output[i + 23] = (byte) (output[i + 23] + (output[i + 22] + minDelta));
+            output[i + 24] = (byte) (output[i + 24] + (output[i + 23] + minDelta));
+            output[i + 25] = (byte) (output[i + 25] + (output[i + 24] + minDelta));
+            output[i + 26] = (byte) (output[i + 26] + (output[i + 25] + minDelta));
+            output[i + 27] = (byte) (output[i + 27] + (output[i + 26] + minDelta));
+            output[i + 28] = (byte) (output[i + 28] + (output[i + 27] + minDelta));
+            output[i + 29] = (byte) (output[i + 29] + (output[i + 28] + minDelta));
+            output[i + 30] = (byte) (output[i + 30] + (output[i + 29] + minDelta));
+            output[i + 31] = (byte) (output[i + 31] + (output[i + 30] + minDelta));
         }
     }
 
     private static void inPlacePrefixSum(short[] output, int outputOffset, int length, int minDelta)
     {
         for (int i = outputOffset; i < outputOffset + length; i += 32) {
-            output[i] += output[i - 1] + minDelta;
-            output[i + 1] += output[i] + minDelta;
-            output[i + 2] += output[i + 1] + minDelta;
-            output[i + 3] += output[i + 2] + minDelta;
-            output[i + 4] += output[i + 3] + minDelta;
-            output[i + 5] += output[i + 4] + minDelta;
-            output[i + 6] += output[i + 5] + minDelta;
-            output[i + 7] += output[i + 6] + minDelta;
-            output[i + 8] += output[i + 7] + minDelta;
-            output[i + 9] += output[i + 8] + minDelta;
-            output[i + 10] += output[i + 9] + minDelta;
-            output[i + 11] += output[i + 10] + minDelta;
-            output[i + 12] += output[i + 11] + minDelta;
-            output[i + 13] += output[i + 12] + minDelta;
-            output[i + 14] += output[i + 13] + minDelta;
-            output[i + 15] += output[i + 14] + minDelta;
-            output[i + 16] += output[i + 15] + minDelta;
-            output[i + 17] += output[i + 16] + minDelta;
-            output[i + 18] += output[i + 17] + minDelta;
-            output[i + 19] += output[i + 18] + minDelta;
-            output[i + 20] += output[i + 19] + minDelta;
-            output[i + 21] += output[i + 20] + minDelta;
-            output[i + 22] += output[i + 21] + minDelta;
-            output[i + 23] += output[i + 22] + minDelta;
-            output[i + 24] += output[i + 23] + minDelta;
-            output[i + 25] += output[i + 24] + minDelta;
-            output[i + 26] += output[i + 25] + minDelta;
-            output[i + 27] += output[i + 26] + minDelta;
-            output[i + 28] += output[i + 27] + minDelta;
-            output[i + 29] += output[i + 28] + minDelta;
-            output[i + 30] += output[i + 29] + minDelta;
-            output[i + 31] += output[i + 30] + minDelta;
+            output[i] = (short) (output[i] + output[i - 1] + minDelta);
+            output[i + 1] = (short) (output[i + 1] + output[i] + minDelta);
+            output[i + 2] = (short) (output[i + 2] + output[i + 1] + minDelta);
+            output[i + 3] = (short) (output[i + 3] + output[i + 2] + minDelta);
+            output[i + 4] = (short) (output[i + 4] + output[i + 3] + minDelta);
+            output[i + 5] = (short) (output[i + 5] + output[i + 4] + minDelta);
+            output[i + 6] = (short) (output[i + 6] + output[i + 5] + minDelta);
+            output[i + 7] = (short) (output[i + 7] + output[i + 6] + minDelta);
+            output[i + 8] = (short) (output[i + 8] + output[i + 7] + minDelta);
+            output[i + 9] = (short) (output[i + 9] + output[i + 8] + minDelta);
+            output[i + 10] = (short) (output[i + 10] + output[i + 9] + minDelta);
+            output[i + 11] = (short) (output[i + 11] + output[i + 10] + minDelta);
+            output[i + 12] = (short) (output[i + 12] + output[i + 11] + minDelta);
+            output[i + 13] = (short) (output[i + 13] + output[i + 12] + minDelta);
+            output[i + 14] = (short) (output[i + 14] + output[i + 13] + minDelta);
+            output[i + 15] = (short) (output[i + 15] + output[i + 14] + minDelta);
+            output[i + 16] = (short) (output[i + 16] + output[i + 15] + minDelta);
+            output[i + 17] = (short) (output[i + 17] + output[i + 16] + minDelta);
+            output[i + 18] = (short) (output[i + 18] + output[i + 17] + minDelta);
+            output[i + 19] = (short) (output[i + 19] + output[i + 18] + minDelta);
+            output[i + 20] = (short) (output[i + 20] + output[i + 19] + minDelta);
+            output[i + 21] = (short) (output[i + 21] + output[i + 20] + minDelta);
+            output[i + 22] = (short) (output[i + 22] + output[i + 21] + minDelta);
+            output[i + 23] = (short) (output[i + 23] + output[i + 22] + minDelta);
+            output[i + 24] = (short) (output[i + 24] + output[i + 23] + minDelta);
+            output[i + 25] = (short) (output[i + 25] + output[i + 24] + minDelta);
+            output[i + 26] = (short) (output[i + 26] + output[i + 25] + minDelta);
+            output[i + 27] = (short) (output[i + 27] + output[i + 26] + minDelta);
+            output[i + 28] = (short) (output[i + 28] + output[i + 27] + minDelta);
+            output[i + 29] = (short) (output[i + 29] + output[i + 28] + minDelta);
+            output[i + 30] = (short) (output[i + 30] + output[i + 29] + minDelta);
+            output[i + 31] = (short) (output[i + 31] + output[i + 30] + minDelta);
         }
     }
 
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/IntBitUnpackers.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/IntBitUnpackers.java
index a32919460706..e65418bd2190 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/IntBitUnpackers.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/IntBitUnpackers.java
@@ -13,7 +13,6 @@
  */
 package io.trino.parquet.reader.decoders;
 
-import io.airlift.slice.Slices;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 
 public final class IntBitUnpackers
@@ -76,200 +75,67 @@ public void unpack(int[] output, int outputOffset, SimpleSliceInputStream input,
     private static final class Unpacker1
             implements IntBitUnpacker
     {
-        private static void unpack64(int[] output, int outputOffset, SimpleSliceInputStream input)
-        {
-            long v0 = input.readLong();
-            output[outputOffset] = (int) (v0 & 0b1L);
-            output[outputOffset + 1] = (int) ((v0 >>> 1) & 0b1L);
-            output[outputOffset + 2] = (int) ((v0 >>> 2) & 0b1L);
-            output[outputOffset + 3] = (int) ((v0 >>> 3) & 0b1L);
-            output[outputOffset + 4] = (int) ((v0 >>> 4) & 0b1L);
-            output[outputOffset + 5] = (int) ((v0 >>> 5) & 0b1L);
-            output[outputOffset + 6] = (int) ((v0 >>> 6) & 0b1L);
-            output[outputOffset + 7] = (int) ((v0 >>> 7) & 0b1L);
-            output[outputOffset + 8] = (int) ((v0 >>> 8) & 0b1L);
-            output[outputOffset + 9] = (int) ((v0 >>> 9) & 0b1L);
-            output[outputOffset + 10] = (int) ((v0 >>> 10) & 0b1L);
-            output[outputOffset + 11] = (int) ((v0 >>> 11) & 0b1L);
-            output[outputOffset + 12] = (int) ((v0 >>> 12) & 0b1L);
-            output[outputOffset + 13] = (int) ((v0 >>> 13) & 0b1L);
-            output[outputOffset + 14] = (int) ((v0 >>> 14) & 0b1L);
-            output[outputOffset + 15] = (int) ((v0 >>> 15) & 0b1L);
-            output[outputOffset + 16] = (int) ((v0 >>> 16) & 0b1L);
-            output[outputOffset + 17] = (int) ((v0 >>> 17) & 0b1L);
-            output[outputOffset + 18] = (int) ((v0 >>> 18) & 0b1L);
-            output[outputOffset + 19] = (int) ((v0 >>> 19) & 0b1L);
-            output[outputOffset + 20] = (int) ((v0 >>> 20) & 0b1L);
-            output[outputOffset + 21] = (int) ((v0 >>> 21) & 0b1L);
-            output[outputOffset + 22] = (int) ((v0 >>> 22) & 0b1L);
-            output[outputOffset + 23] = (int) ((v0 >>> 23) & 0b1L);
-            output[outputOffset + 24] = (int) ((v0 >>> 24) & 0b1L);
-            output[outputOffset + 25] = (int) ((v0 >>> 25) & 0b1L);
-            output[outputOffset + 26] = (int) ((v0 >>> 26) & 0b1L);
-            output[outputOffset + 27] = (int) ((v0 >>> 27) & 0b1L);
-            output[outputOffset + 28] = (int) ((v0 >>> 28) & 0b1L);
-            output[outputOffset + 29] = (int) ((v0 >>> 29) & 0b1L);
-            output[outputOffset + 30] = (int) ((v0 >>> 30) & 0b1L);
-            output[outputOffset + 31] = (int) ((v0 >>> 31) & 0b1L);
-            output[outputOffset + 32] = (int) ((v0 >>> 32) & 0b1L);
-            output[outputOffset + 33] = (int) ((v0 >>> 33) & 0b1L);
-            output[outputOffset + 34] = (int) ((v0 >>> 34) & 0b1L);
-            output[outputOffset + 35] = (int) ((v0 >>> 35) & 0b1L);
-            output[outputOffset + 36] = (int) ((v0 >>> 36) & 0b1L);
-            output[outputOffset + 37] = (int) ((v0 >>> 37) & 0b1L);
-            output[outputOffset + 38] = (int) ((v0 >>> 38) & 0b1L);
-            output[outputOffset + 39] = (int) ((v0 >>> 39) & 0b1L);
-            output[outputOffset + 40] = (int) ((v0 >>> 40) & 0b1L);
-            output[outputOffset + 41] = (int) ((v0 >>> 41) & 0b1L);
-            output[outputOffset + 42] = (int) ((v0 >>> 42) & 0b1L);
-            output[outputOffset + 43] = (int) ((v0 >>> 43) & 0b1L);
-            output[outputOffset + 44] = (int) ((v0 >>> 44) & 0b1L);
-            output[outputOffset + 45] = (int) ((v0 >>> 45) & 0b1L);
-            output[outputOffset + 46] = (int) ((v0 >>> 46) & 0b1L);
-            output[outputOffset + 47] = (int) ((v0 >>> 47) & 0b1L);
-            output[outputOffset + 48] = (int) ((v0 >>> 48) & 0b1L);
-            output[outputOffset + 49] = (int) ((v0 >>> 49) & 0b1L);
-            output[outputOffset + 50] = (int) ((v0 >>> 50) & 0b1L);
-            output[outputOffset + 51] = (int) ((v0 >>> 51) & 0b1L);
-            output[outputOffset + 52] = (int) ((v0 >>> 52) & 0b1L);
-            output[outputOffset + 53] = (int) ((v0 >>> 53) & 0b1L);
-            output[outputOffset + 54] = (int) ((v0 >>> 54) & 0b1L);
-            output[outputOffset + 55] = (int) ((v0 >>> 55) & 0b1L);
-            output[outputOffset + 56] = (int) ((v0 >>> 56) & 0b1L);
-            output[outputOffset + 57] = (int) ((v0 >>> 57) & 0b1L);
-            output[outputOffset + 58] = (int) ((v0 >>> 58) & 0b1L);
-            output[outputOffset + 59] = (int) ((v0 >>> 59) & 0b1L);
-            output[outputOffset + 60] = (int) ((v0 >>> 60) & 0b1L);
-            output[outputOffset + 61] = (int) ((v0 >>> 61) & 0b1L);
-            output[outputOffset + 62] = (int) ((v0 >>> 62) & 0b1L);
-            output[outputOffset + 63] = (int) ((v0 >>> 63) & 0b1L);
-        }
-
-        private static void unpack8(int[] output, int outputOffset, SimpleSliceInputStream input)
+        private static void unpack8(int[] output, int outputOffset, byte[] input, int inputOffset)
         {
-            byte v0 = input.readByte();
-            output[outputOffset] = (int) (v0 & 0b1L);
-            output[outputOffset + 1] = (int) ((v0 >>> 1) & 0b1L);
-            output[outputOffset + 2] = (int) ((v0 >>> 2) & 0b1L);
-            output[outputOffset + 3] = (int) ((v0 >>> 3) & 0b1L);
-            output[outputOffset + 4] = (int) ((v0 >>> 4) & 0b1L);
-            output[outputOffset + 5] = (int) ((v0 >>> 5) & 0b1L);
-            output[outputOffset + 6] = (int) ((v0 >>> 6) & 0b1L);
-            output[outputOffset + 7] = (int) ((v0 >>> 7) & 0b1L);
+            byte v0 = input[inputOffset];
+            output[outputOffset] = v0 & 1;
+            output[outputOffset + 1] = (v0 >>> 1) & 1;
+            output[outputOffset + 2] = (v0 >>> 2) & 1;
+            output[outputOffset + 3] = (v0 >>> 3) & 1;
+            output[outputOffset + 4] = (v0 >>> 4) & 1;
+            output[outputOffset + 5] = (v0 >>> 5) & 1;
+            output[outputOffset + 6] = (v0 >>> 6) & 1;
+            output[outputOffset + 7] = (v0 >>> 7) & 1;
         }
 
         @Override
         public void unpack(int[] output, int outputOffset, SimpleSliceInputStream input, int length)
         {
-            while (length >= 64) {
-                unpack64(output, outputOffset, input);
-                outputOffset += 64;
-                length -= 64;
-            }
-            switch (length) {
-                case 56:
-                    unpack8(output, outputOffset, input);
-                    outputOffset += 8;
-                    // fall through
-                case 48:
-                    unpack8(output, outputOffset, input);
-                    outputOffset += 8;
-                    // fall through
-                case 40:
-                    unpack8(output, outputOffset, input);
-                    outputOffset += 8;
-                    // fall through
-                case 32:
-                    unpack8(output, outputOffset, input);
-                    outputOffset += 8;
-                    // fall through
-                case 24:
-                    unpack8(output, outputOffset, input);
-                    outputOffset += 8;
-                    // fall through
-                case 16:
-                    unpack8(output, outputOffset, input);
-                    outputOffset += 8;
-                    // fall through
-                case 8:
-                    unpack8(output, outputOffset, input);
+            byte[] inputArr = input.getByteArray();
+            int inputOffset = input.getByteArrayOffset();
+            int inputBytesRead = 0;
+            while (length >= 8) {
+                unpack8(output, outputOffset, inputArr, inputOffset + inputBytesRead);
+                outputOffset += 8;
+                length -= 8;
+                inputBytesRead++;
             }
+            input.skip(inputBytesRead);
         }
     }
 
     private static final class Unpacker2
             implements IntBitUnpacker
     {
-        private static void unpack32(int[] output, int outputOffset, SimpleSliceInputStream input)
+        private static void unpack8(int[] output, int outputOffset, byte[] input, int inputOffset)
         {
-            long v0 = input.readLong();
-            output[outputOffset] = (int) (v0 & 0b11L);
-            output[outputOffset + 1] = (int) ((v0 >>> 2) & 0b11L);
-            output[outputOffset + 2] = (int) ((v0 >>> 4) & 0b11L);
-            output[outputOffset + 3] = (int) ((v0 >>> 6) & 0b11L);
-            output[outputOffset + 4] = (int) ((v0 >>> 8) & 0b11L);
-            output[outputOffset + 5] = (int) ((v0 >>> 10) & 0b11L);
-            output[outputOffset + 6] = (int) ((v0 >>> 12) & 0b11L);
-            output[outputOffset + 7] = (int) ((v0 >>> 14) & 0b11L);
-            output[outputOffset + 8] = (int) ((v0 >>> 16) & 0b11L);
-            output[outputOffset + 9] = (int) ((v0 >>> 18) & 0b11L);
-            output[outputOffset + 10] = (int) ((v0 >>> 20) & 0b11L);
-            output[outputOffset + 11] = (int) ((v0 >>> 22) & 0b11L);
-            output[outputOffset + 12] = (int) ((v0 >>> 24) & 0b11L);
-            output[outputOffset + 13] = (int) ((v0 >>> 26) & 0b11L);
-            output[outputOffset + 14] = (int) ((v0 >>> 28) & 0b11L);
-            output[outputOffset + 15] = (int) ((v0 >>> 30) & 0b11L);
-            output[outputOffset + 16] = (int) ((v0 >>> 32) & 0b11L);
-            output[outputOffset + 17] = (int) ((v0 >>> 34) & 0b11L);
-            output[outputOffset + 18] = (int) ((v0 >>> 36) & 0b11L);
-            output[outputOffset + 19] = (int) ((v0 >>> 38) & 0b11L);
-            output[outputOffset + 20] = (int) ((v0 >>> 40) & 0b11L);
-            output[outputOffset + 21] = (int) ((v0 >>> 42) & 0b11L);
-            output[outputOffset + 22] = (int) ((v0 >>> 44) & 0b11L);
-            output[outputOffset + 23] = (int) ((v0 >>> 46) & 0b11L);
-            output[outputOffset + 24] = (int) ((v0 >>> 48) & 0b11L);
-            output[outputOffset + 25] = (int) ((v0 >>> 50) & 0b11L);
-            output[outputOffset + 26] = (int) ((v0 >>> 52) & 0b11L);
-            output[outputOffset + 27] = (int) ((v0 >>> 54) & 0b11L);
-            output[outputOffset + 28] = (int) ((v0 >>> 56) & 0b11L);
-            output[outputOffset + 29] = (int) ((v0 >>> 58) & 0b11L);
-            output[outputOffset + 30] = (int) ((v0 >>> 60) & 0b11L);
-            output[outputOffset + 31] = (int) ((v0 >>> 62) & 0b11L);
-        }
+            byte v0 = input[inputOffset];
+            byte v1 = input[inputOffset + 1];
 
-        private static void unpack8(int[] output, int outputOffset, SimpleSliceInputStream input)
-        {
-            short v0 = input.readShort();
-            output[outputOffset] = (int) (v0 & 0b11L);
-            output[outputOffset + 1] = (int) ((v0 >>> 2) & 0b11L);
-            output[outputOffset + 2] = (int) ((v0 >>> 4) & 0b11L);
-            output[outputOffset + 3] = (int) ((v0 >>> 6) & 0b11L);
-            output[outputOffset + 4] = (int) ((v0 >>> 8) & 0b11L);
-            output[outputOffset + 5] = (int) ((v0 >>> 10) & 0b11L);
-            output[outputOffset + 6] = (int) ((v0 >>> 12) & 0b11L);
-            output[outputOffset + 7] = (int) ((v0 >>> 14) & 0b11L);
+            output[outputOffset] = v0 & 0b11;
+            output[outputOffset + 1] = (v0 >>> 2) & 0b11;
+            output[outputOffset + 2] = (v0 >>> 4) & 0b11;
+            output[outputOffset + 3] = (v0 >>> 6) & 0b11;
+
+            output[outputOffset + 4] = v1 & 0b11;
+            output[outputOffset + 5] = (v1 >>> 2) & 0b11;
+            output[outputOffset + 6] = (v1 >>> 4) & 0b11;
+            output[outputOffset + 7] = (v1 >>> 6) & 0b11;
         }
 
         @Override
         public void unpack(int[] output, int outputOffset, SimpleSliceInputStream input, int length)
         {
-            while (length >= 32) {
-                unpack32(output, outputOffset, input);
-                outputOffset += 32;
-                length -= 32;
-            }
-            switch (length) {
-                case 24:
-                    unpack8(output, outputOffset, input);
-                    outputOffset += 8;
-                    // fall through
-                case 16:
-                    unpack8(output, outputOffset, input);
-                    outputOffset += 8;
-                    // fall through
-                case 8:
-                    unpack8(output, outputOffset, input);
+            byte[] inputArr = input.getByteArray();
+            int inputOffset = input.getByteArrayOffset();
+            int inputBytesRead = 0;
+            while (length >= 8) {
+                unpack8(output, outputOffset, inputArr, inputOffset + inputBytesRead);
+                outputOffset += 8;
+                length -= 8;
+                inputBytesRead += 2;
             }
+            input.skip(inputBytesRead);
         }
     }
 
@@ -403,51 +269,36 @@ public void unpack(int[] output, int outputOffset, SimpleSliceInputStream input,
     private static final class Unpacker4
             implements IntBitUnpacker
     {
-        private static void unpack16(int[] output, int outputOffset, SimpleSliceInputStream input)
+        private static void unpack8(int[] output, int outputOffset, byte[] input, int inputOffset)
         {
-            long v0 = input.readLong();
-            output[outputOffset] = (int) (v0 & 0b1111L);
-            output[outputOffset + 1] = (int) ((v0 >>> 4) & 0b1111L);
-            output[outputOffset + 2] = (int) ((v0 >>> 8) & 0b1111L);
-            output[outputOffset + 3] = (int) ((v0 >>> 12) & 0b1111L);
-            output[outputOffset + 4] = (int) ((v0 >>> 16) & 0b1111L);
-            output[outputOffset + 5] = (int) ((v0 >>> 20) & 0b1111L);
-            output[outputOffset + 6] = (int) ((v0 >>> 24) & 0b1111L);
-            output[outputOffset + 7] = (int) ((v0 >>> 28) & 0b1111L);
-            output[outputOffset + 8] = (int) ((v0 >>> 32) & 0b1111L);
-            output[outputOffset + 9] = (int) ((v0 >>> 36) & 0b1111L);
-            output[outputOffset + 10] = (int) ((v0 >>> 40) & 0b1111L);
-            output[outputOffset + 11] = (int) ((v0 >>> 44) & 0b1111L);
-            output[outputOffset + 12] = (int) ((v0 >>> 48) & 0b1111L);
-            output[outputOffset + 13] = (int) ((v0 >>> 52) & 0b1111L);
-            output[outputOffset + 14] = (int) ((v0 >>> 56) & 0b1111L);
-            output[outputOffset + 15] = (int) ((v0 >>> 60) & 0b1111L);
-        }
+            byte v0 = input[inputOffset];
+            byte v1 = input[inputOffset + 1];
+            byte v2 = input[inputOffset + 2];
+            byte v3 = input[inputOffset + 3];
 
-        private static void unpack8(int[] output, int outputOffset, SimpleSliceInputStream input)
-        {
-            int v0 = input.readInt();
-            output[outputOffset] = (int) (v0 & 0b1111L);
-            output[outputOffset + 1] = (int) ((v0 >>> 4) & 0b1111L);
-            output[outputOffset + 2] = (int) ((v0 >>> 8) & 0b1111L);
-            output[outputOffset + 3] = (int) ((v0 >>> 12) & 0b1111L);
-            output[outputOffset + 4] = (int) ((v0 >>> 16) & 0b1111L);
-            output[outputOffset + 5] = (int) ((v0 >>> 20) & 0b1111L);
-            output[outputOffset + 6] = (int) ((v0 >>> 24) & 0b1111L);
-            output[outputOffset + 7] = (int) ((v0 >>> 28) & 0b1111L);
+            output[outputOffset] = v0 & 0b1111;
+            output[outputOffset + 1] = (v0 >>> 4) & 0b1111;
+            output[outputOffset + 2] = v1 & 0b1111;
+            output[outputOffset + 3] = (v1 >>> 4) & 0b1111;
+            output[outputOffset + 4] = v2 & 0b1111;
+            output[outputOffset + 5] = (v2 >>> 4) & 0b1111;
+            output[outputOffset + 6] = v3 & 0b1111;
+            output[outputOffset + 7] = (v3 >>> 4) & 0b1111;
         }
 
         @Override
         public void unpack(int[] output, int outputOffset, SimpleSliceInputStream input, int length)
         {
-            while (length >= 16) {
-                unpack16(output, outputOffset, input);
-                outputOffset += 16;
-                length -= 16;
-            }
-            if (length >= 8) {
-                unpack8(output, outputOffset, input);
+            byte[] inputArr = input.getByteArray();
+            int inputOffset = input.getByteArrayOffset();
+            int inputBytesRead = 0;
+            while (length >= 8) {
+                unpack8(output, outputOffset, inputArr, inputOffset + inputBytesRead);
+                outputOffset += 8;
+                length -= 8;
+                inputBytesRead += 4;
             }
+            input.skip(inputBytesRead);
         }
     }
 
@@ -795,27 +646,31 @@ public void unpack(int[] output, int outputOffset, SimpleSliceInputStream input,
     private static final class Unpacker8
             implements IntBitUnpacker
     {
-        private static void unpack8(int[] output, int outputOffset, SimpleSliceInputStream input)
+        private static void unpack8(int[] output, int outputOffset, byte[] input, int inputOffset)
         {
-            long v0 = input.readLong();
-            output[outputOffset] = (int) (v0 & 0b11111111L);
-            output[outputOffset + 1] = (int) ((v0 >>> 8) & 0b11111111L);
-            output[outputOffset + 2] = (int) ((v0 >>> 16) & 0b11111111L);
-            output[outputOffset + 3] = (int) ((v0 >>> 24) & 0b11111111L);
-            output[outputOffset + 4] = (int) ((v0 >>> 32) & 0b11111111L);
-            output[outputOffset + 5] = (int) ((v0 >>> 40) & 0b11111111L);
-            output[outputOffset + 6] = (int) ((v0 >>> 48) & 0b11111111L);
-            output[outputOffset + 7] = (int) ((v0 >>> 56) & 0b11111111L);
+            output[outputOffset] = input[inputOffset] & 0b11111111;
+            output[outputOffset + 1] = input[inputOffset + 1] & 0b11111111;
+            output[outputOffset + 2] = input[inputOffset + 2] & 0b11111111;
+            output[outputOffset + 3] = input[inputOffset + 3] & 0b11111111;
+            output[outputOffset + 4] = input[inputOffset + 4] & 0b11111111;
+            output[outputOffset + 5] = input[inputOffset + 5] & 0b11111111;
+            output[outputOffset + 6] = input[inputOffset + 6] & 0b11111111;
+            output[outputOffset + 7] = input[inputOffset + 7] & 0b11111111;
         }
 
         @Override
         public void unpack(int[] output, int outputOffset, SimpleSliceInputStream input, int length)
         {
+            byte[] inputArray = input.getByteArray();
+            int inputOffset = input.getByteArrayOffset();
+            int inputBytesRead = 0;
             while (length >= 8) {
-                unpack8(output, outputOffset, input);
+                unpack8(output, outputOffset, inputArray, inputOffset + inputBytesRead);
                 outputOffset += 8;
                 length -= 8;
+                inputBytesRead += 8;
             }
+            input.skip(inputBytesRead);
         }
     }
 
@@ -1508,7 +1363,7 @@ private static final class Unpacker32
         @Override
         public void unpack(int[] output, int outputOffset, SimpleSliceInputStream input, int length)
         {
-            input.readBytes(Slices.wrappedIntArray(output, outputOffset, length), 0, length * Integer.BYTES);
+            input.readInts(output, outputOffset, length);
         }
     }
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/LongBitUnpackers.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/LongBitUnpackers.java
index ab8c58a4297d..2a9da799ebdf 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/LongBitUnpackers.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/LongBitUnpackers.java
@@ -13,7 +13,6 @@
  */
 package io.trino.parquet.reader.decoders;
 
-import io.airlift.slice.Slices;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -4276,7 +4275,7 @@ private static class Unpacker64
         @Override
         public void unpack(long[] output, int outputOffset, SimpleSliceInputStream input, int length)
         {
-            input.readBytes(Slices.wrappedLongArray(output, outputOffset, length), 0, length * Long.BYTES);
+            input.readLongs(output, outputOffset, length);
         }
     }
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/PlainValueDecoders.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/PlainValueDecoders.java
index 51a5881a7ae2..482b0d403289 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/PlainValueDecoders.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/PlainValueDecoders.java
@@ -31,7 +31,7 @@
 import static io.trino.parquet.ParquetTypeUtils.checkBytesFitInShortDecimal;
 import static io.trino.parquet.ParquetTypeUtils.getShortDecimalValue;
 import static io.trino.parquet.reader.flat.BitPackingUtils.unpack;
-import static io.trino.parquet.reader.flat.Int96ColumnAdapter.Int96Buffer;
+import static io.trino.spi.block.Fixed12Block.encodeFixed12;
 import static java.lang.Math.min;
 import static java.util.Objects.requireNonNull;
 import static org.apache.parquet.schema.LogicalTypeAnnotation.DecimalLogicalTypeAnnotation;
@@ -54,7 +54,7 @@ public void init(SimpleSliceInputStream input)
         @Override
         public void read(long[] values, int offset, int length)
         {
-            input.readBytes(Slices.wrappedLongArray(values), offset * Long.BYTES, length * Long.BYTES);
+            input.readLongs(values, offset, length);
         }
 
         @Override
@@ -78,7 +78,7 @@ public void init(SimpleSliceInputStream input)
         @Override
         public void read(int[] values, int offset, int length)
         {
-            input.readBytes(Slices.wrappedIntArray(values), offset * Integer.BYTES, length * Integer.BYTES);
+            input.readInts(values, offset, length);
         }
 
         @Override
@@ -341,8 +341,8 @@ public void skip(int n)
         }
     }
 
-    public static final class Int96PlainValueDecoder
-            implements ValueDecoder<Int96Buffer>
+    public static final class Int96TimestampPlainValueDecoder
+            implements ValueDecoder<int[]>
     {
         private static final int LENGTH = SIZE_OF_LONG + SIZE_OF_INT;
 
@@ -355,14 +355,12 @@ public void init(SimpleSliceInputStream input)
         }
 
         @Override
-        public void read(Int96Buffer values, int offset, int length)
+        public void read(int[] values, int offset, int length)
         {
             input.ensureBytesAvailable(length * LENGTH);
             for (int i = offset; i < offset + length; i++) {
                 DecodedTimestamp timestamp = decodeInt96Timestamp(input.readLongUnsafe(), input.readIntUnsafe());
-
-                values.longs[i] = timestamp.epochSeconds();
-                values.ints[i] = timestamp.nanosOfSecond();
+                encodeFixed12(timestamp.epochSeconds(), timestamp.nanosOfSecond(), values, i);
             }
         }
 
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/RleBitPackingHybridBooleanDecoder.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/RleBitPackingHybridBooleanDecoder.java
index d75638b96b9b..ca19ece2faa0 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/RleBitPackingHybridBooleanDecoder.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/RleBitPackingHybridBooleanDecoder.java
@@ -25,14 +25,14 @@
 public final class RleBitPackingHybridBooleanDecoder
         implements ValueDecoder<byte[]>
 {
-    private NullsDecoder decoder;
+    private final NullsDecoder decoder = new NullsDecoder();
 
     @Override
     public void init(SimpleSliceInputStream input)
     {
         // First int is size in bytes which is not needed here
         input.skip(Integer.BYTES);
-        this.decoder = new NullsDecoder(input.asSlice());
+        this.decoder.init(input.asSlice());
     }
 
     @Override
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ShortBitUnpackers.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ShortBitUnpackers.java
index ac910acf4a84..e2542267c055 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ShortBitUnpackers.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ShortBitUnpackers.java
@@ -13,7 +13,6 @@
  */
 package io.trino.parquet.reader.decoders;
 
-import io.airlift.slice.Slices;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -871,7 +870,7 @@ private static final class Unpacker16
         @Override
         public void unpack(short[] output, int outputOffset, SimpleSliceInputStream input, int length)
         {
-            input.readBytes(Slices.wrappedShortArray(output, outputOffset, length), 0, length * Short.BYTES);
+            input.readShorts(output, outputOffset, length);
         }
     }
 
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ShortDecimalFixedWidthByteArrayBatchDecoder.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ShortDecimalFixedWidthByteArrayBatchDecoder.java
index 32a3535344ba..5ba66a888197 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ShortDecimalFixedWidthByteArrayBatchDecoder.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ShortDecimalFixedWidthByteArrayBatchDecoder.java
@@ -246,29 +246,17 @@ private static final class BigEndianReader1
         @Override
         public void decode(SimpleSliceInputStream input, long[] values, int offset, int length)
         {
-            while (length > 7) {
-                long value = input.readLongUnsafe();
-
-                // We first shift the byte as left as possible. Then, when shifting back right,
-                // the sign bit will get propagated
-                values[offset] = value << 56 >> 56;
-                values[offset + 1] = value << 48 >> 56;
-                values[offset + 2] = value << 40 >> 56;
-                values[offset + 3] = value << 32 >> 56;
-                values[offset + 4] = value << 24 >> 56;
-                values[offset + 5] = value << 16 >> 56;
-                values[offset + 6] = value << 8 >> 56;
-                values[offset + 7] = value >> 56;
-
-                offset += 8;
-                length -= 8;
-            }
-
+            byte[] inputArr = input.getByteArray();
+            int inputOffset = input.getByteArrayOffset();
+            int inputBytesRead = 0;
+            int outputOffset = offset;
             while (length > 0) {
                 // Implicit cast will propagate the sign bit correctly
-                values[offset++] = input.readByte();
+                values[outputOffset++] = inputArr[inputOffset + inputBytesRead];
+                inputBytesRead++;
                 length--;
             }
+            input.skip(inputBytesRead);
         }
     }
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/TransformingValueDecoders.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/TransformingValueDecoders.java
deleted file mode 100644
index 018911c4e4e2..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/TransformingValueDecoders.java
+++ /dev/null
@@ -1,934 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader.decoders;
-
-import io.airlift.slice.Slice;
-import io.trino.parquet.ParquetEncoding;
-import io.trino.parquet.PrimitiveField;
-import io.trino.parquet.reader.SimpleSliceInputStream;
-import io.trino.parquet.reader.flat.BinaryBuffer;
-import io.trino.spi.type.DecimalConversions;
-import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.Decimals;
-import io.trino.spi.type.Int128;
-import io.trino.spi.type.TimestampType;
-import io.trino.spi.type.TimestampWithTimeZoneType;
-import org.apache.parquet.column.ColumnDescriptor;
-import org.apache.parquet.io.ParquetDecodingException;
-import org.apache.parquet.schema.LogicalTypeAnnotation;
-import org.joda.time.DateTimeZone;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.parquet.ParquetEncoding.DELTA_BYTE_ARRAY;
-import static io.trino.parquet.ParquetReaderUtils.toByteExact;
-import static io.trino.parquet.ParquetReaderUtils.toShortExact;
-import static io.trino.parquet.ParquetTypeUtils.checkBytesFitInShortDecimal;
-import static io.trino.parquet.ParquetTypeUtils.getShortDecimalValue;
-import static io.trino.parquet.reader.decoders.DeltaByteArrayDecoders.BinaryDeltaByteArrayDecoder;
-import static io.trino.parquet.reader.decoders.ValueDecoders.getBinaryDecoder;
-import static io.trino.parquet.reader.decoders.ValueDecoders.getInt32Decoder;
-import static io.trino.parquet.reader.decoders.ValueDecoders.getInt96Decoder;
-import static io.trino.parquet.reader.decoders.ValueDecoders.getLongDecimalDecoder;
-import static io.trino.parquet.reader.decoders.ValueDecoders.getLongDecoder;
-import static io.trino.parquet.reader.decoders.ValueDecoders.getRealDecoder;
-import static io.trino.parquet.reader.decoders.ValueDecoders.getShortDecimalDecoder;
-import static io.trino.parquet.reader.flat.Int96ColumnAdapter.Int96Buffer;
-import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
-import static io.trino.spi.type.Decimals.longTenToNth;
-import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
-import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
-import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_SECOND;
-import static io.trino.spi.type.Timestamps.MILLISECONDS_PER_SECOND;
-import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MICROSECOND;
-import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MILLISECOND;
-import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MICROSECOND;
-import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_NANOSECOND;
-import static io.trino.spi.type.Timestamps.round;
-import static java.lang.Math.floorDiv;
-import static java.lang.Math.floorMod;
-import static java.lang.Math.toIntExact;
-import static java.util.Objects.requireNonNull;
-import static org.apache.parquet.schema.LogicalTypeAnnotation.DecimalLogicalTypeAnnotation;
-
-/**
- * {@link io.trino.parquet.reader.decoders.ValueDecoder} implementations which build on top of implementations from {@link io.trino.parquet.reader.decoders.ValueDecoders}.
- * These decoders apply transformations to the output of an underlying primitive parquet type decoder to convert it into values
- * which can be used by {@link io.trino.parquet.reader.flat.ColumnAdapter} to create Trino blocks.
- */
-public class TransformingValueDecoders
-{
-    private TransformingValueDecoders() {}
-
-    public static ValueDecoder<long[]> getTimeMicrosDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        return new InlineTransformDecoder<>(
-                getLongDecoder(encoding, field),
-                (values, offset, length) -> {
-                    for (int i = offset; i < offset + length; i++) {
-                        values[i] = values[i] * PICOSECONDS_PER_MICROSECOND;
-                    }
-                });
-    }
-
-    public static ValueDecoder<long[]> getInt96ToShortTimestampDecoder(ParquetEncoding encoding, PrimitiveField field, DateTimeZone timeZone)
-    {
-        checkArgument(
-                field.getType() instanceof TimestampType timestampType && timestampType.isShort(),
-                "Trino type %s is not a short timestamp",
-                field.getType());
-        int precision = ((TimestampType) field.getType()).getPrecision();
-        ValueDecoder<Int96Buffer> delegate = getInt96Decoder(encoding, field);
-        return new ValueDecoder<>()
-        {
-            @Override
-            public void init(SimpleSliceInputStream input)
-            {
-                delegate.init(input);
-            }
-
-            @Override
-            public void read(long[] values, int offset, int length)
-            {
-                Int96Buffer int96Buffer = new Int96Buffer(length);
-                delegate.read(int96Buffer, 0, length);
-                for (int i = 0; i < length; i++) {
-                    long epochSeconds = int96Buffer.longs[i];
-                    long epochMicros;
-                    if (timeZone == DateTimeZone.UTC) {
-                        epochMicros = epochSeconds * MICROSECONDS_PER_SECOND;
-                    }
-                    else {
-                        epochMicros = timeZone.convertUTCToLocal(epochSeconds * MILLISECONDS_PER_SECOND) * MICROSECONDS_PER_MILLISECOND;
-                    }
-                    int nanosOfSecond = (int) round(int96Buffer.ints[i], 9 - precision);
-                    values[offset + i] = epochMicros + nanosOfSecond / NANOSECONDS_PER_MICROSECOND;
-                }
-            }
-
-            @Override
-            public void skip(int n)
-            {
-                delegate.skip(n);
-            }
-        };
-    }
-
-    public static ValueDecoder<Int96Buffer> getInt96ToLongTimestampDecoder(ParquetEncoding encoding, PrimitiveField field, DateTimeZone timeZone)
-    {
-        checkArgument(
-                field.getType() instanceof TimestampType timestampType && !timestampType.isShort(),
-                "Trino type %s is not a long timestamp",
-                field.getType());
-        int precision = ((TimestampType) field.getType()).getPrecision();
-        return new InlineTransformDecoder<>(
-                getInt96Decoder(encoding, field),
-                (values, offset, length) -> {
-                    for (int i = offset; i < offset + length; i++) {
-                        long epochSeconds = values.longs[i];
-                        long nanosOfSecond = values.ints[i];
-                        if (timeZone != DateTimeZone.UTC) {
-                            epochSeconds = timeZone.convertUTCToLocal(epochSeconds * MILLISECONDS_PER_SECOND) / MILLISECONDS_PER_SECOND;
-                        }
-                        if (precision < 9) {
-                            nanosOfSecond = (int) round(nanosOfSecond, 9 - precision);
-                        }
-                        // epochMicros
-                        values.longs[i] = epochSeconds * MICROSECONDS_PER_SECOND + (nanosOfSecond / NANOSECONDS_PER_MICROSECOND);
-                        // picosOfMicro
-                        values.ints[i] = (int) ((nanosOfSecond * PICOSECONDS_PER_NANOSECOND) % PICOSECONDS_PER_MICROSECOND);
-                    }
-                });
-    }
-
-    public static ValueDecoder<long[]> getInt96ToShortTimestampWithTimeZoneDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        checkArgument(
-                field.getType() instanceof TimestampWithTimeZoneType timestampWithTimeZoneType && timestampWithTimeZoneType.isShort(),
-                "Trino type %s is not a short timestamp with timezone",
-                field.getType());
-        ValueDecoder<Int96Buffer> delegate = getInt96Decoder(encoding, field);
-        return new ValueDecoder<>() {
-            @Override
-            public void init(SimpleSliceInputStream input)
-            {
-                delegate.init(input);
-            }
-
-            @Override
-            public void read(long[] values, int offset, int length)
-            {
-                Int96Buffer int96Buffer = new Int96Buffer(length);
-                delegate.read(int96Buffer, 0, length);
-                for (int i = 0; i < length; i++) {
-                    long epochSeconds = int96Buffer.longs[i];
-                    int nanosOfSecond = int96Buffer.ints[i];
-                    long utcMillis = epochSeconds * MILLISECONDS_PER_SECOND + (nanosOfSecond / NANOSECONDS_PER_MILLISECOND);
-                    values[offset + i] = packDateTimeWithZone(utcMillis, UTC_KEY);
-                }
-            }
-
-            @Override
-            public void skip(int n)
-            {
-                delegate.skip(n);
-            }
-        };
-    }
-
-    public static ValueDecoder<long[]> getInt64TimestampMillsToShortTimestampDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        checkArgument(
-                field.getType() instanceof TimestampType timestampType && timestampType.isShort(),
-                "Trino type %s is not a short timestamp",
-                field.getType());
-        int precision = ((TimestampType) field.getType()).getPrecision();
-        ValueDecoder<long[]> valueDecoder = getLongDecoder(encoding, field);
-        if (precision < 3) {
-            return new InlineTransformDecoder<>(
-                    valueDecoder,
-                    (values, offset, length) -> {
-                        // decoded values are epochMillis, round to lower precision and convert to epochMicros
-                        for (int i = offset; i < offset + length; i++) {
-                            values[i] = round(values[i], 3 - precision) * MICROSECONDS_PER_MILLISECOND;
-                        }
-                    });
-        }
-        return new InlineTransformDecoder<>(
-                valueDecoder,
-                (values, offset, length) -> {
-                    // decoded values are epochMillis, convert to epochMicros
-                    for (int i = offset; i < offset + length; i++) {
-                        values[i] = values[i] * MICROSECONDS_PER_MILLISECOND;
-                    }
-                });
-    }
-
-    public static ValueDecoder<long[]> getInt64TimestampMillsToShortTimestampWithTimeZoneDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        checkArgument(
-                field.getType() instanceof TimestampWithTimeZoneType timestampWithTimeZoneType && timestampWithTimeZoneType.isShort(),
-                "Trino type %s is not a short timestamp",
-                field.getType());
-        int precision = ((TimestampWithTimeZoneType) field.getType()).getPrecision();
-        ValueDecoder<long[]> valueDecoder = getLongDecoder(encoding, field);
-        if (precision < 3) {
-            return new InlineTransformDecoder<>(
-                    valueDecoder,
-                    (values, offset, length) -> {
-                        // decoded values are epochMillis, round to lower precision and convert to packed millis utc value
-                        for (int i = offset; i < offset + length; i++) {
-                            values[i] = packDateTimeWithZone(round(values[i], 3 - precision), UTC_KEY);
-                        }
-                    });
-        }
-        return new InlineTransformDecoder<>(
-                valueDecoder,
-                (values, offset, length) -> {
-                    // decoded values are epochMillis, convert to packed millis utc value
-                    for (int i = offset; i < offset + length; i++) {
-                        values[i] = packDateTimeWithZone(values[i], UTC_KEY);
-                    }
-                });
-    }
-
-    public static ValueDecoder<long[]> getInt64TimestampMicrosToShortTimestampDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        checkArgument(
-                field.getType() instanceof TimestampType timestampType && timestampType.isShort(),
-                "Trino type %s is not a short timestamp",
-                field.getType());
-        int precision = ((TimestampType) field.getType()).getPrecision();
-        ValueDecoder<long[]> valueDecoder = getLongDecoder(encoding, field);
-        if (precision == 6) {
-            return valueDecoder;
-        }
-        return new InlineTransformDecoder<>(
-                valueDecoder,
-                (values, offset, length) -> {
-                    // decoded values are epochMicros, round to lower precision
-                    for (int i = offset; i < offset + length; i++) {
-                        values[i] = round(values[i], 6 - precision);
-                    }
-                });
-    }
-
-    public static ValueDecoder<long[]> getInt64TimestampMicrosToShortTimestampWithTimeZoneDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        checkArgument(
-                field.getType() instanceof TimestampWithTimeZoneType timestampWithTimeZoneType && timestampWithTimeZoneType.isShort(),
-                "Trino type %s is not a short timestamp",
-                field.getType());
-        int precision = ((TimestampWithTimeZoneType) field.getType()).getPrecision();
-        return new InlineTransformDecoder<>(
-                getLongDecoder(encoding, field),
-                (values, offset, length) -> {
-                    // decoded values are epochMicros, round to lower precision and convert to packed millis utc value
-                    for (int i = offset; i < offset + length; i++) {
-                        values[i] = packDateTimeWithZone(round(values[i], 6 - precision) / MICROSECONDS_PER_MILLISECOND, UTC_KEY);
-                    }
-                });
-    }
-
-    public static ValueDecoder<long[]> getInt64TimestampNanosToShortTimestampDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        checkArgument(
-                field.getType() instanceof TimestampType timestampType && timestampType.isShort(),
-                "Trino type %s is not a short timestamp",
-                field.getType());
-        int precision = ((TimestampType) field.getType()).getPrecision();
-        return new InlineTransformDecoder<>(
-                getLongDecoder(encoding, field),
-                (values, offset, length) -> {
-                    // decoded values are epochNanos, round to lower precision and convert to epochMicros
-                    for (int i = offset; i < offset + length; i++) {
-                        values[i] = round(values[i], 9 - precision) / NANOSECONDS_PER_MICROSECOND;
-                    }
-                });
-    }
-
-    public static ValueDecoder<Int96Buffer> getInt64TimestampMillisToLongTimestampDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        ValueDecoder<long[]> delegate = getLongDecoder(encoding, field);
-        return new ValueDecoder<>()
-        {
-            @Override
-            public void init(SimpleSliceInputStream input)
-            {
-                delegate.init(input);
-            }
-
-            @Override
-            public void read(Int96Buffer values, int offset, int length)
-            {
-                delegate.read(values.longs, offset, length);
-                // decoded values are epochMillis, convert to epochMicros
-                for (int i = offset; i < offset + length; i++) {
-                    values.longs[i] = values.longs[i] * MICROSECONDS_PER_MILLISECOND;
-                }
-            }
-
-            @Override
-            public void skip(int n)
-            {
-                delegate.skip(n);
-            }
-        };
-    }
-
-    public static ValueDecoder<Int96Buffer> getInt64TimestampMicrosToLongTimestampDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        ValueDecoder<long[]> delegate = getLongDecoder(encoding, field);
-        return new ValueDecoder<>()
-        {
-            @Override
-            public void init(SimpleSliceInputStream input)
-            {
-                delegate.init(input);
-            }
-
-            @Override
-            public void read(Int96Buffer values, int offset, int length)
-            {
-                // decoded values are epochMicros
-                delegate.read(values.longs, offset, length);
-            }
-
-            @Override
-            public void skip(int n)
-            {
-                delegate.skip(n);
-            }
-        };
-    }
-
-    public static ValueDecoder<Int96Buffer> getInt64TimestampMicrosToLongTimestampWithTimeZoneDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        ValueDecoder<long[]> delegate = getLongDecoder(encoding, field);
-        return new ValueDecoder<>()
-        {
-            @Override
-            public void init(SimpleSliceInputStream input)
-            {
-                delegate.init(input);
-            }
-
-            @Override
-            public void read(Int96Buffer values, int offset, int length)
-            {
-                delegate.read(values.longs, offset, length);
-                // decoded values are epochMicros, convert to (packed epochMillisUtc, picosOfMilli)
-                for (int i = offset; i < offset + length; i++) {
-                    long epochMicros = values.longs[i];
-                    values.longs[i] = packDateTimeWithZone(floorDiv(epochMicros, MICROSECONDS_PER_MILLISECOND), UTC_KEY);
-                    values.ints[i] = floorMod(epochMicros, MICROSECONDS_PER_MILLISECOND) * PICOSECONDS_PER_MICROSECOND;
-                }
-            }
-
-            @Override
-            public void skip(int n)
-            {
-                delegate.skip(n);
-            }
-        };
-    }
-
-    public static ValueDecoder<Int96Buffer> getInt64TimestampNanosToLongTimestampDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        ValueDecoder<long[]> delegate = getLongDecoder(encoding, field);
-        return new ValueDecoder<>()
-        {
-            @Override
-            public void init(SimpleSliceInputStream input)
-            {
-                delegate.init(input);
-            }
-
-            @Override
-            public void read(Int96Buffer values, int offset, int length)
-            {
-                delegate.read(values.longs, offset, length);
-                // decoded values are epochNanos, convert to (epochMicros, picosOfMicro)
-                for (int i = offset; i < offset + length; i++) {
-                    long epochNanos = values.longs[i];
-                    values.longs[i] = floorDiv(epochNanos, NANOSECONDS_PER_MICROSECOND);
-                    values.ints[i] = floorMod(epochNanos, NANOSECONDS_PER_MICROSECOND) * PICOSECONDS_PER_NANOSECOND;
-                }
-            }
-
-            @Override
-            public void skip(int n)
-            {
-                delegate.skip(n);
-            }
-        };
-    }
-
-    public static ValueDecoder<long[]> getFloatToDoubleDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        ValueDecoder<int[]> delegate = getRealDecoder(encoding, field);
-        return new ValueDecoder<>()
-        {
-            @Override
-            public void init(SimpleSliceInputStream input)
-            {
-                delegate.init(input);
-            }
-
-            @Override
-            public void read(long[] values, int offset, int length)
-            {
-                int[] buffer = new int[length];
-                delegate.read(buffer, 0, length);
-                for (int i = 0; i < length; i++) {
-                    values[offset + i] = Double.doubleToLongBits(Float.intBitsToFloat(buffer[i]));
-                }
-            }
-
-            @Override
-            public void skip(int n)
-            {
-                delegate.skip(n);
-            }
-        };
-    }
-
-    public static ValueDecoder<long[]> getBinaryLongDecimalDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        return new BinaryToLongDecimalTransformDecoder(getBinaryDecoder(encoding, field));
-    }
-
-    public static ValueDecoder<long[]> getDeltaFixedWidthLongDecimalDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        checkArgument(encoding.equals(DELTA_BYTE_ARRAY), "encoding %s is not DELTA_BYTE_ARRAY", encoding);
-        ColumnDescriptor descriptor = field.getDescriptor();
-        LogicalTypeAnnotation logicalTypeAnnotation = descriptor.getPrimitiveType().getLogicalTypeAnnotation();
-        checkArgument(
-                logicalTypeAnnotation instanceof DecimalLogicalTypeAnnotation decimalAnnotation
-                        && decimalAnnotation.getPrecision() > Decimals.MAX_SHORT_PRECISION,
-                "Column %s is not a long decimal",
-                descriptor);
-        return new BinaryToLongDecimalTransformDecoder(new BinaryDeltaByteArrayDecoder());
-    }
-
-    public static ValueDecoder<long[]> getBinaryShortDecimalDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        ValueDecoder<BinaryBuffer> delegate = getBinaryDecoder(encoding, field);
-        return new ValueDecoder<>()
-        {
-            @Override
-            public void init(SimpleSliceInputStream input)
-            {
-                delegate.init(input);
-            }
-
-            @Override
-            public void read(long[] values, int offset, int length)
-            {
-                BinaryBuffer buffer = new BinaryBuffer(length);
-                delegate.read(buffer, 0, length);
-                int[] offsets = buffer.getOffsets();
-                byte[] inputBytes = buffer.asSlice().byteArray();
-
-                for (int i = 0; i < length; i++) {
-                    int positionOffset = offsets[i];
-                    int positionLength = offsets[i + 1] - positionOffset;
-                    if (positionLength > 8) {
-                        throw new ParquetDecodingException("Unable to read BINARY type decimal of size " + positionLength + " as a short decimal");
-                    }
-                    // No need for checkBytesFitInShortDecimal as the standard requires variable binary decimals
-                    // to be stored in minimum possible number of bytes
-                    values[offset + i] = getShortDecimalValue(inputBytes, positionOffset, positionLength);
-                }
-            }
-
-            @Override
-            public void skip(int n)
-            {
-                delegate.skip(n);
-            }
-        };
-    }
-
-    public static ValueDecoder<long[]> getDeltaFixedWidthShortDecimalDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        checkArgument(encoding.equals(DELTA_BYTE_ARRAY), "encoding %s is not DELTA_BYTE_ARRAY", encoding);
-        ColumnDescriptor descriptor = field.getDescriptor();
-        LogicalTypeAnnotation logicalTypeAnnotation = descriptor.getPrimitiveType().getLogicalTypeAnnotation();
-        checkArgument(
-                logicalTypeAnnotation instanceof DecimalLogicalTypeAnnotation decimalAnnotation
-                        && decimalAnnotation.getPrecision() <= Decimals.MAX_SHORT_PRECISION,
-                "Column %s is not a short decimal",
-                descriptor);
-        int typeLength = descriptor.getPrimitiveType().getTypeLength();
-        checkArgument(typeLength > 0 && typeLength <= 16, "Expected column %s to have type length in range (1-16)", descriptor);
-        return new ValueDecoder<>()
-        {
-            private final ValueDecoder<BinaryBuffer> delegate = new BinaryDeltaByteArrayDecoder();
-
-            @Override
-            public void init(SimpleSliceInputStream input)
-            {
-                delegate.init(input);
-            }
-
-            @Override
-            public void read(long[] values, int offset, int length)
-            {
-                BinaryBuffer buffer = new BinaryBuffer(length);
-                delegate.read(buffer, 0, length);
-
-                // Each position in FIXED_LEN_BYTE_ARRAY has fixed length
-                int bytesOffset = 0;
-                int bytesLength = typeLength;
-                if (typeLength > Long.BYTES) {
-                    bytesOffset = typeLength - Long.BYTES;
-                    bytesLength = Long.BYTES;
-                }
-
-                byte[] inputBytes = buffer.asSlice().byteArray();
-                int[] offsets = buffer.getOffsets();
-                for (int i = 0; i < length; i++) {
-                    int inputOffset = offsets[i];
-                    checkBytesFitInShortDecimal(inputBytes, inputOffset, bytesOffset, descriptor);
-                    values[offset + i] = getShortDecimalValue(inputBytes, inputOffset + bytesOffset, bytesLength);
-                }
-            }
-
-            @Override
-            public void skip(int n)
-            {
-                delegate.skip(n);
-            }
-        };
-    }
-
-    public static ValueDecoder<long[]> getRescaledLongDecimalDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        DecimalType decimalType = (DecimalType) field.getType();
-        DecimalLogicalTypeAnnotation decimalAnnotation = (DecimalLogicalTypeAnnotation) field.getDescriptor().getPrimitiveType().getLogicalTypeAnnotation();
-        if (decimalAnnotation.getPrecision() <= Decimals.MAX_SHORT_PRECISION) {
-            ValueDecoder<long[]> delegate = getShortDecimalDecoder(encoding, field);
-            return new ValueDecoder<>()
-            {
-                @Override
-                public void init(SimpleSliceInputStream input)
-                {
-                    delegate.init(input);
-                }
-
-                @Override
-                public void read(long[] values, int offset, int length)
-                {
-                    long[] buffer = new long[length];
-                    delegate.read(buffer, 0, length);
-                    for (int i = 0; i < length; i++) {
-                        Int128 rescaled = DecimalConversions.shortToLongCast(
-                                buffer[i],
-                                decimalAnnotation.getPrecision(),
-                                decimalAnnotation.getScale(),
-                                decimalType.getPrecision(),
-                                decimalType.getScale());
-
-                        values[2 * (offset + i)] = rescaled.getHigh();
-                        values[2 * (offset + i) + 1] = rescaled.getLow();
-                    }
-                }
-
-                @Override
-                public void skip(int n)
-                {
-                    delegate.skip(n);
-                }
-            };
-        }
-        return new InlineTransformDecoder<>(
-                getLongDecimalDecoder(encoding, field),
-                (values, offset, length) -> {
-                    int endOffset = (offset + length) * 2;
-                    for (int currentOffset = offset * 2; currentOffset < endOffset; currentOffset += 2) {
-                        Int128 rescaled = DecimalConversions.longToLongCast(
-                                Int128.valueOf(values[currentOffset], values[currentOffset + 1]),
-                                decimalAnnotation.getPrecision(),
-                                decimalAnnotation.getScale(),
-                                decimalType.getPrecision(),
-                                decimalType.getScale());
-
-                        values[currentOffset] = rescaled.getHigh();
-                        values[currentOffset + 1] = rescaled.getLow();
-                    }
-                });
-    }
-
-    public static ValueDecoder<long[]> getRescaledShortDecimalDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        DecimalType decimalType = (DecimalType) field.getType();
-        DecimalLogicalTypeAnnotation decimalAnnotation = (DecimalLogicalTypeAnnotation) field.getDescriptor().getPrimitiveType().getLogicalTypeAnnotation();
-        if (decimalAnnotation.getPrecision() <= Decimals.MAX_SHORT_PRECISION) {
-            long rescale = longTenToNth(Math.abs(decimalType.getScale() - decimalAnnotation.getScale()));
-            return new InlineTransformDecoder<>(
-                    getShortDecimalDecoder(encoding, field),
-                    (values, offset, length) -> {
-                        for (int i = offset; i < offset + length; i++) {
-                            values[i] = DecimalConversions.shortToShortCast(
-                                    values[i],
-                                    decimalAnnotation.getPrecision(),
-                                    decimalAnnotation.getScale(),
-                                    decimalType.getPrecision(),
-                                    decimalType.getScale(),
-                                    rescale,
-                                    rescale / 2);
-                        }
-                    });
-        }
-        ValueDecoder<long[]> delegate = getLongDecimalDecoder(encoding, field);
-        return new ValueDecoder<>()
-        {
-            @Override
-            public void init(SimpleSliceInputStream input)
-            {
-                delegate.init(input);
-            }
-
-            @Override
-            public void read(long[] values, int offset, int length)
-            {
-                long[] buffer = new long[2 * length];
-                delegate.read(buffer, 0, length);
-                for (int i = 0; i < length; i++) {
-                    values[offset + i] = DecimalConversions.longToShortCast(
-                            Int128.valueOf(buffer[2 * i], buffer[2 * i + 1]),
-                            decimalAnnotation.getPrecision(),
-                            decimalAnnotation.getScale(),
-                            decimalType.getPrecision(),
-                            decimalType.getScale());
-                }
-            }
-
-            @Override
-            public void skip(int n)
-            {
-                delegate.skip(n);
-            }
-        };
-    }
-
-    public static ValueDecoder<long[]> getInt32ToLongDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        ValueDecoder<int[]> delegate = getInt32Decoder(encoding, field);
-        return new ValueDecoder<>()
-        {
-            @Override
-            public void init(SimpleSliceInputStream input)
-            {
-                delegate.init(input);
-            }
-
-            @Override
-            public void read(long[] values, int offset, int length)
-            {
-                int[] buffer = new int[length];
-                delegate.read(buffer, 0, length);
-                for (int i = 0; i < length; i++) {
-                    values[i + offset] = buffer[i];
-                }
-            }
-
-            @Override
-            public void skip(int n)
-            {
-                delegate.skip(n);
-            }
-        };
-    }
-
-    public static ValueDecoder<int[]> getInt64ToIntDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        return new LongToIntTransformDecoder(getLongDecoder(encoding, field));
-    }
-
-    public static ValueDecoder<int[]> getShortDecimalToIntDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        return new LongToIntTransformDecoder(getShortDecimalDecoder(encoding, field));
-    }
-
-    public static ValueDecoder<short[]> getInt64ToShortDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        return new LongToShortTransformDecoder(getLongDecoder(encoding, field));
-    }
-
-    public static ValueDecoder<short[]> getShortDecimalToShortDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        return new LongToShortTransformDecoder(getShortDecimalDecoder(encoding, field));
-    }
-
-    public static ValueDecoder<byte[]> getInt64ToByteDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        return new LongToByteTransformDecoder(getLongDecoder(encoding, field));
-    }
-
-    public static ValueDecoder<byte[]> getShortDecimalToByteDecoder(ParquetEncoding encoding, PrimitiveField field)
-    {
-        return new LongToByteTransformDecoder(getShortDecimalDecoder(encoding, field));
-    }
-
-    public static ValueDecoder<long[]> getDeltaUuidDecoder(ParquetEncoding encoding)
-    {
-        checkArgument(encoding.equals(DELTA_BYTE_ARRAY), "encoding %s is not DELTA_BYTE_ARRAY", encoding);
-        ValueDecoder<BinaryBuffer> delegate = new BinaryDeltaByteArrayDecoder();
-        return new ValueDecoder<>()
-        {
-            @Override
-            public void init(SimpleSliceInputStream input)
-            {
-                delegate.init(input);
-            }
-
-            @Override
-            public void read(long[] values, int offset, int length)
-            {
-                BinaryBuffer buffer = new BinaryBuffer(length);
-                delegate.read(buffer, 0, length);
-                SimpleSliceInputStream binaryInput = new SimpleSliceInputStream(buffer.asSlice());
-
-                int endOffset = (offset + length) * 2;
-                for (int outputOffset = offset * 2; outputOffset < endOffset; outputOffset += 2) {
-                    values[outputOffset] = binaryInput.readLong();
-                    values[outputOffset + 1] = binaryInput.readLong();
-                }
-            }
-
-            @Override
-            public void skip(int n)
-            {
-                delegate.skip(n);
-            }
-        };
-    }
-
-    private static class LongToIntTransformDecoder
-            implements ValueDecoder<int[]>
-    {
-        private final ValueDecoder<long[]> delegate;
-
-        private LongToIntTransformDecoder(ValueDecoder<long[]> delegate)
-        {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void init(SimpleSliceInputStream input)
-        {
-            delegate.init(input);
-        }
-
-        @Override
-        public void read(int[] values, int offset, int length)
-        {
-            long[] buffer = new long[length];
-            delegate.read(buffer, 0, length);
-            for (int i = 0; i < length; i++) {
-                values[offset + i] = toIntExact(buffer[i]);
-            }
-        }
-
-        @Override
-        public void skip(int n)
-        {
-            delegate.skip(n);
-        }
-    }
-
-    private static class LongToShortTransformDecoder
-            implements ValueDecoder<short[]>
-    {
-        private final ValueDecoder<long[]> delegate;
-
-        private LongToShortTransformDecoder(ValueDecoder<long[]> delegate)
-        {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void init(SimpleSliceInputStream input)
-        {
-            delegate.init(input);
-        }
-
-        @Override
-        public void read(short[] values, int offset, int length)
-        {
-            long[] buffer = new long[length];
-            delegate.read(buffer, 0, length);
-            for (int i = 0; i < length; i++) {
-                values[offset + i] = toShortExact(buffer[i]);
-            }
-        }
-
-        @Override
-        public void skip(int n)
-        {
-            delegate.skip(n);
-        }
-    }
-
-    private static class LongToByteTransformDecoder
-            implements ValueDecoder<byte[]>
-    {
-        private final ValueDecoder<long[]> delegate;
-
-        private LongToByteTransformDecoder(ValueDecoder<long[]> delegate)
-        {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void init(SimpleSliceInputStream input)
-        {
-            delegate.init(input);
-        }
-
-        @Override
-        public void read(byte[] values, int offset, int length)
-        {
-            long[] buffer = new long[length];
-            delegate.read(buffer, 0, length);
-            for (int i = 0; i < length; i++) {
-                values[offset + i] = toByteExact(buffer[i]);
-            }
-        }
-
-        @Override
-        public void skip(int n)
-        {
-            delegate.skip(n);
-        }
-    }
-
-    private static class BinaryToLongDecimalTransformDecoder
-            implements ValueDecoder<long[]>
-    {
-        private final ValueDecoder<BinaryBuffer> delegate;
-
-        private BinaryToLongDecimalTransformDecoder(ValueDecoder<BinaryBuffer> delegate)
-        {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void init(SimpleSliceInputStream input)
-        {
-            delegate.init(input);
-        }
-
-        @Override
-        public void read(long[] values, int offset, int length)
-        {
-            BinaryBuffer buffer = new BinaryBuffer(length);
-            delegate.read(buffer, 0, length);
-            int[] offsets = buffer.getOffsets();
-            Slice binaryInput = buffer.asSlice();
-
-            for (int i = 0; i < length; i++) {
-                int positionOffset = offsets[i];
-                int positionLength = offsets[i + 1] - positionOffset;
-                Int128 value = Int128.fromBigEndian(binaryInput.getBytes(positionOffset, positionLength));
-                values[2 * (offset + i)] = value.getHigh();
-                values[2 * (offset + i) + 1] = value.getLow();
-            }
-        }
-
-        @Override
-        public void skip(int n)
-        {
-            delegate.skip(n);
-        }
-    }
-
-    private static class InlineTransformDecoder<T>
-            implements ValueDecoder<T>
-    {
-        private final ValueDecoder<T> valueDecoder;
-        private final TypeTransform<T> typeTransform;
-
-        private InlineTransformDecoder(ValueDecoder<T> valueDecoder, TypeTransform<T> typeTransform)
-        {
-            this.valueDecoder = requireNonNull(valueDecoder, "valueDecoder is null");
-            this.typeTransform = requireNonNull(typeTransform, "typeTransform is null");
-        }
-
-        @Override
-        public void init(SimpleSliceInputStream input)
-        {
-            valueDecoder.init(input);
-        }
-
-        @Override
-        public void read(T values, int offset, int length)
-        {
-            valueDecoder.read(values, offset, length);
-            typeTransform.process(values, offset, length);
-        }
-
-        @Override
-        public void skip(int n)
-        {
-            valueDecoder.skip(n);
-        }
-    }
-
-    private interface TypeTransform<T>
-    {
-        void process(T values, int offset, int length);
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ValueDecoder.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ValueDecoder.java
index a562c5e601de..daded56c89ed 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ValueDecoder.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ValueDecoder.java
@@ -14,9 +14,10 @@
 package io.trino.parquet.reader.decoders;
 
 import io.trino.parquet.ParquetEncoding;
-import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 
+import static org.apache.parquet.bytes.BytesUtils.getWidthFromMaxInt;
+
 public interface ValueDecoder<T>
 {
     void init(SimpleSliceInputStream input);
@@ -40,6 +41,19 @@ public void skip(int n) {}
 
     interface ValueDecodersProvider<T>
     {
-        ValueDecoder<T> create(ParquetEncoding encoding, PrimitiveField field);
+        ValueDecoder<T> create(ParquetEncoding encoding);
+    }
+
+    interface LevelsDecoderProvider
+    {
+        ValueDecoder<int[]> create(int maxLevel);
+    }
+
+    static ValueDecoder<int[]> createLevelsDecoder(int maxLevel)
+    {
+        if (maxLevel == 0) {
+            return new ValueDecoder.EmptyValueDecoder<>();
+        }
+        return new RleBitPackingHybridDecoder(getWidthFromMaxInt(maxLevel));
     }
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ValueDecoders.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ValueDecoders.java
index e65876090faa..73d8b3c14502 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ValueDecoders.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/decoders/ValueDecoders.java
@@ -13,21 +13,36 @@
  */
 package io.trino.parquet.reader.decoders;
 
-import io.trino.parquet.DictionaryPage;
+import io.airlift.slice.Slice;
 import io.trino.parquet.ParquetEncoding;
 import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 import io.trino.parquet.reader.flat.BinaryBuffer;
-import io.trino.parquet.reader.flat.ColumnAdapter;
-import io.trino.parquet.reader.flat.DictionaryDecoder;
+import io.trino.spi.TrinoException;
 import io.trino.spi.type.CharType;
+import io.trino.spi.type.DecimalConversions;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.Decimals;
+import io.trino.spi.type.Int128;
+import io.trino.spi.type.TimeType;
+import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.TimestampWithTimeZoneType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
+import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.column.values.ValuesReader;
+import org.apache.parquet.io.ParquetDecodingException;
+import org.apache.parquet.schema.LogicalTypeAnnotation;
 import org.apache.parquet.schema.PrimitiveType;
+import org.joda.time.DateTimeZone;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.parquet.ParquetEncoding.DELTA_BYTE_ARRAY;
 import static io.trino.parquet.ParquetEncoding.PLAIN;
+import static io.trino.parquet.ParquetReaderUtils.toByteExact;
+import static io.trino.parquet.ParquetReaderUtils.toShortExact;
+import static io.trino.parquet.ParquetTypeUtils.checkBytesFitInShortDecimal;
+import static io.trino.parquet.ParquetTypeUtils.getShortDecimalValue;
 import static io.trino.parquet.ValuesType.VALUES;
 import static io.trino.parquet.reader.decoders.ApacheParquetValueDecoders.BooleanApacheParquetValueDecoder;
 import static io.trino.parquet.reader.decoders.DeltaBinaryPackedDecoders.DeltaBinaryPackedByteDecoder;
@@ -45,7 +60,7 @@
 import static io.trino.parquet.reader.decoders.PlainByteArrayDecoders.CharPlainValueDecoder;
 import static io.trino.parquet.reader.decoders.PlainValueDecoders.BooleanPlainValueDecoder;
 import static io.trino.parquet.reader.decoders.PlainValueDecoders.FixedLengthPlainValueDecoder;
-import static io.trino.parquet.reader.decoders.PlainValueDecoders.Int96PlainValueDecoder;
+import static io.trino.parquet.reader.decoders.PlainValueDecoders.Int96TimestampPlainValueDecoder;
 import static io.trino.parquet.reader.decoders.PlainValueDecoders.IntPlainValueDecoder;
 import static io.trino.parquet.reader.decoders.PlainValueDecoders.IntToBytePlainValueDecoder;
 import static io.trino.parquet.reader.decoders.PlainValueDecoders.IntToShortPlainValueDecoder;
@@ -53,46 +68,62 @@
 import static io.trino.parquet.reader.decoders.PlainValueDecoders.LongPlainValueDecoder;
 import static io.trino.parquet.reader.decoders.PlainValueDecoders.ShortDecimalFixedLengthByteArrayDecoder;
 import static io.trino.parquet.reader.decoders.PlainValueDecoders.UuidPlainValueDecoder;
-import static io.trino.parquet.reader.decoders.TransformingValueDecoders.getBinaryLongDecimalDecoder;
-import static io.trino.parquet.reader.decoders.TransformingValueDecoders.getBinaryShortDecimalDecoder;
-import static io.trino.parquet.reader.decoders.TransformingValueDecoders.getDeltaFixedWidthLongDecimalDecoder;
-import static io.trino.parquet.reader.decoders.TransformingValueDecoders.getDeltaFixedWidthShortDecimalDecoder;
-import static io.trino.parquet.reader.decoders.TransformingValueDecoders.getDeltaUuidDecoder;
-import static io.trino.parquet.reader.decoders.TransformingValueDecoders.getInt32ToLongDecoder;
-import static io.trino.parquet.reader.decoders.TransformingValueDecoders.getInt64ToByteDecoder;
-import static io.trino.parquet.reader.decoders.TransformingValueDecoders.getInt64ToIntDecoder;
-import static io.trino.parquet.reader.decoders.TransformingValueDecoders.getInt64ToShortDecoder;
-import static io.trino.parquet.reader.flat.Int96ColumnAdapter.Int96Buffer;
+import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
+import static io.trino.spi.block.Fixed12Block.decodeFixed12First;
+import static io.trino.spi.block.Fixed12Block.decodeFixed12Second;
+import static io.trino.spi.block.Fixed12Block.encodeFixed12;
+import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
+import static io.trino.spi.type.Decimals.longTenToNth;
+import static io.trino.spi.type.Decimals.overflows;
+import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
+import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
+import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_SECOND;
+import static io.trino.spi.type.Timestamps.MILLISECONDS_PER_SECOND;
+import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MICROSECOND;
+import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MILLISECOND;
+import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_DAY;
+import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MICROSECOND;
+import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MILLISECOND;
+import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_NANOSECOND;
+import static io.trino.spi.type.Timestamps.round;
+import static java.lang.Math.floorDiv;
+import static java.lang.Math.floorMod;
+import static java.lang.Math.toIntExact;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
 import static org.apache.parquet.schema.LogicalTypeAnnotation.DecimalLogicalTypeAnnotation;
 
 /**
- * This class provides static API for creating value decoders for given fields and encodings.
- * If no suitable decoder is found the Apache Parquet fallback is used.
- * Not all types are supported since this class is at this point used only by flat readers
+ * This class provides API for creating value decoders for given fields and encodings.
  * <p>
  * This class is to replace most of the logic contained in ParquetEncoding enum
  */
 public final class ValueDecoders
 {
-    private ValueDecoders() {}
+    private final PrimitiveField field;
 
-    public static ValueDecoder<long[]> getDoubleDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoders(PrimitiveField field)
+    {
+        this.field = requireNonNull(field, "field is null");
+    }
+
+    public ValueDecoder<long[]> getDoubleDecoder(ParquetEncoding encoding)
     {
         if (PLAIN.equals(encoding)) {
             return new LongPlainValueDecoder();
         }
-        throw wrongEncoding(encoding, field);
+        throw wrongEncoding(encoding);
     }
 
-    public static ValueDecoder<int[]> getRealDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<int[]> getRealDecoder(ParquetEncoding encoding)
     {
         if (PLAIN.equals(encoding)) {
             return new IntPlainValueDecoder();
         }
-        throw wrongEncoding(encoding, field);
+        throw wrongEncoding(encoding);
     }
 
-    public static ValueDecoder<long[]> getShortDecimalDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<long[]> getShortDecimalDecoder(ParquetEncoding encoding)
     {
         PrimitiveType primitiveType = field.getDescriptor().getPrimitiveType();
         checkArgument(
@@ -100,69 +131,69 @@ public static ValueDecoder<long[]> getShortDecimalDecoder(ParquetEncoding encodi
                 "Column %s is not annotated as a decimal",
                 field);
         return switch (primitiveType.getPrimitiveTypeName()) {
-            case INT64 -> getLongDecoder(encoding, field);
-            case INT32 -> getInt32ToLongDecoder(encoding, field);
-            case FIXED_LEN_BYTE_ARRAY -> getFixedWidthShortDecimalDecoder(encoding, field);
-            case BINARY -> getBinaryShortDecimalDecoder(encoding, field);
-            default -> throw wrongEncoding(encoding, field);
+            case INT64 -> getLongDecoder(encoding);
+            case INT32 -> getInt32ToLongDecoder(encoding);
+            case FIXED_LEN_BYTE_ARRAY -> getFixedWidthShortDecimalDecoder(encoding);
+            case BINARY -> getBinaryShortDecimalDecoder(encoding);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<long[]> getLongDecimalDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<long[]> getLongDecimalDecoder(ParquetEncoding encoding)
     {
         return switch (field.getDescriptor().getPrimitiveType().getPrimitiveTypeName()) {
-            case FIXED_LEN_BYTE_ARRAY -> getFixedWidthLongDecimalDecoder(encoding, field);
-            case BINARY -> getBinaryLongDecimalDecoder(encoding, field);
-            default -> throw wrongEncoding(encoding, field);
+            case FIXED_LEN_BYTE_ARRAY -> getFixedWidthLongDecimalDecoder(encoding);
+            case BINARY -> getBinaryLongDecimalDecoder(encoding);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<long[]> getUuidDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<long[]> getUuidDecoder(ParquetEncoding encoding)
     {
         return switch (encoding) {
             case PLAIN -> new UuidPlainValueDecoder();
             case DELTA_BYTE_ARRAY -> getDeltaUuidDecoder(encoding);
-            default -> throw wrongEncoding(encoding, field);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<long[]> getLongDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<long[]> getLongDecoder(ParquetEncoding encoding)
     {
         return switch (encoding) {
             case PLAIN -> new LongPlainValueDecoder();
             case DELTA_BINARY_PACKED -> new DeltaBinaryPackedLongDecoder();
-            default -> throw wrongEncoding(encoding, field);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<int[]> getIntDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<int[]> getIntDecoder(ParquetEncoding encoding)
     {
         return switch (field.getDescriptor().getPrimitiveType().getPrimitiveTypeName()) {
-            case INT64 -> getInt64ToIntDecoder(encoding, field);
-            case INT32 -> getInt32Decoder(encoding, field);
-            default -> throw wrongEncoding(encoding, field);
+            case INT64 -> getInt64ToIntDecoder(encoding);
+            case INT32 -> getInt32Decoder(encoding);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<short[]> getShortDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<short[]> getShortDecoder(ParquetEncoding encoding)
     {
         return switch (field.getDescriptor().getPrimitiveType().getPrimitiveTypeName()) {
-            case INT64 -> getInt64ToShortDecoder(encoding, field);
-            case INT32 -> getInt32ToShortDecoder(encoding, field);
-            default -> throw wrongEncoding(encoding, field);
+            case INT64 -> getInt64ToShortDecoder(encoding);
+            case INT32 -> getInt32ToShortDecoder(encoding);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<byte[]> getByteDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<byte[]> getByteDecoder(ParquetEncoding encoding)
     {
         return switch (field.getDescriptor().getPrimitiveType().getPrimitiveTypeName()) {
-            case INT64 -> getInt64ToByteDecoder(encoding, field);
-            case INT32 -> getInt32ToByteDecoder(encoding, field);
-            default -> throw wrongEncoding(encoding, field);
+            case INT64 -> getInt64ToByteDecoder(encoding);
+            case INT32 -> getInt32ToByteDecoder(encoding);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<byte[]> getBooleanDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<byte[]> getBooleanDecoder(ParquetEncoding encoding)
     {
         return switch (encoding) {
             case PLAIN -> new BooleanPlainValueDecoder();
@@ -170,49 +201,49 @@ public static ValueDecoder<byte[]> getBooleanDecoder(ParquetEncoding encoding, P
             // BIT_PACKED is a deprecated encoding which should not be used anymore as per
             // https://github.com/apache/parquet-format/blob/master/Encodings.md#bit-packed-deprecated-bit_packed--4
             // An unoptimized decoder for this encoding is provided here for compatibility with old files or non-compliant writers
-            case BIT_PACKED -> new BooleanApacheParquetValueDecoder(getApacheParquetReader(encoding, field));
-            default -> throw wrongEncoding(encoding, field);
+            case BIT_PACKED -> new BooleanApacheParquetValueDecoder(getApacheParquetReader(encoding));
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<Int96Buffer> getInt96Decoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<int[]> getInt96TimestampDecoder(ParquetEncoding encoding)
     {
         if (PLAIN.equals(encoding)) {
             // INT96 type has been deprecated as per https://github.com/apache/parquet-format/blob/master/Encodings.md#plain-plain--0
             // However, this encoding is still commonly encountered in parquet files.
-            return new Int96PlainValueDecoder();
+            return new Int96TimestampPlainValueDecoder();
         }
-        throw wrongEncoding(encoding, field);
+        throw wrongEncoding(encoding);
     }
 
-    public static ValueDecoder<long[]> getFixedWidthShortDecimalDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<long[]> getFixedWidthShortDecimalDecoder(ParquetEncoding encoding)
     {
         return switch (encoding) {
             case PLAIN -> new ShortDecimalFixedLengthByteArrayDecoder(field.getDescriptor());
-            case DELTA_BYTE_ARRAY -> getDeltaFixedWidthShortDecimalDecoder(encoding, field);
-            default -> throw wrongEncoding(encoding, field);
+            case DELTA_BYTE_ARRAY -> getDeltaFixedWidthShortDecimalDecoder(encoding);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<long[]> getFixedWidthLongDecimalDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<long[]> getFixedWidthLongDecimalDecoder(ParquetEncoding encoding)
     {
         return switch (encoding) {
             case PLAIN -> new LongDecimalPlainValueDecoder(field.getDescriptor().getPrimitiveType().getTypeLength());
-            case DELTA_BYTE_ARRAY -> getDeltaFixedWidthLongDecimalDecoder(encoding, field);
-            default -> throw wrongEncoding(encoding, field);
+            case DELTA_BYTE_ARRAY -> getDeltaFixedWidthLongDecimalDecoder(encoding);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<BinaryBuffer> getFixedWidthBinaryDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<BinaryBuffer> getFixedWidthBinaryDecoder(ParquetEncoding encoding)
     {
         return switch (encoding) {
             case PLAIN -> new FixedLengthPlainValueDecoder(field.getDescriptor().getPrimitiveType().getTypeLength());
             case DELTA_BYTE_ARRAY -> new BinaryDeltaByteArrayDecoder();
-            default -> throw wrongEncoding(encoding, field);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<BinaryBuffer> getBoundedVarcharBinaryDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<BinaryBuffer> getBoundedVarcharBinaryDecoder(ParquetEncoding encoding)
     {
         Type trinoType = field.getType();
         checkArgument(
@@ -223,11 +254,11 @@ public static ValueDecoder<BinaryBuffer> getBoundedVarcharBinaryDecoder(ParquetE
             case PLAIN -> new BoundedVarcharPlainValueDecoder((VarcharType) trinoType);
             case DELTA_LENGTH_BYTE_ARRAY -> new BoundedVarcharDeltaLengthDecoder((VarcharType) trinoType);
             case DELTA_BYTE_ARRAY -> new BoundedVarcharDeltaByteArrayDecoder((VarcharType) trinoType);
-            default -> throw wrongEncoding(encoding, field);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<BinaryBuffer> getCharBinaryDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<BinaryBuffer> getCharBinaryDecoder(ParquetEncoding encoding)
     {
         Type trinoType = field.getType();
         checkArgument(
@@ -238,68 +269,989 @@ public static ValueDecoder<BinaryBuffer> getCharBinaryDecoder(ParquetEncoding en
             case PLAIN -> new CharPlainValueDecoder((CharType) trinoType);
             case DELTA_LENGTH_BYTE_ARRAY -> new CharDeltaLengthDecoder((CharType) trinoType);
             case DELTA_BYTE_ARRAY -> new CharDeltaByteArrayDecoder((CharType) trinoType);
-            default -> throw wrongEncoding(encoding, field);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static ValueDecoder<BinaryBuffer> getBinaryDecoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<BinaryBuffer> getBinaryDecoder(ParquetEncoding encoding)
     {
         return switch (encoding) {
             case PLAIN -> new BinaryPlainValueDecoder();
             case DELTA_LENGTH_BYTE_ARRAY -> new BinaryDeltaLengthDecoder();
             case DELTA_BYTE_ARRAY -> new BinaryDeltaByteArrayDecoder();
-            default -> throw wrongEncoding(encoding, field);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    public static <T> DictionaryDecoder<T> getDictionaryDecoder(
-            DictionaryPage dictionaryPage,
-            ColumnAdapter<T> columnAdapter,
-            ValueDecoder<T> plainValuesDecoder,
-            boolean isNonNull)
-    {
-        int size = dictionaryPage.getDictionarySize();
-        // Extra value is added to the end of the dictionary for nullable columns because
-        // parquet dictionary page does not include null but Trino DictionaryBlock's dictionary does
-        T dictionary = columnAdapter.createBuffer(size + (isNonNull ? 0 : 1));
-        plainValuesDecoder.init(new SimpleSliceInputStream(dictionaryPage.getSlice()));
-        plainValuesDecoder.read(dictionary, 0, size);
-        return new DictionaryDecoder<>(dictionary, columnAdapter, size, isNonNull);
-    }
-
-    public static ValueDecoder<int[]> getInt32Decoder(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<int[]> getInt32Decoder(ParquetEncoding encoding)
     {
         return switch (encoding) {
             case PLAIN -> new IntPlainValueDecoder();
             case DELTA_BINARY_PACKED -> new DeltaBinaryPackedIntDecoder();
-            default -> throw wrongEncoding(encoding, field);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    private static ValueDecoder<short[]> getInt32ToShortDecoder(ParquetEncoding encoding, PrimitiveField field)
+    private ValueDecoder<short[]> getInt32ToShortDecoder(ParquetEncoding encoding)
     {
         return switch (encoding) {
             case PLAIN -> new IntToShortPlainValueDecoder();
             case DELTA_BINARY_PACKED -> new DeltaBinaryPackedShortDecoder();
-            default -> throw wrongEncoding(encoding, field);
+            default -> throw wrongEncoding(encoding);
         };
     }
 
-    private static ValueDecoder<byte[]> getInt32ToByteDecoder(ParquetEncoding encoding, PrimitiveField field)
+    private ValueDecoder<byte[]> getInt32ToByteDecoder(ParquetEncoding encoding)
     {
         return switch (encoding) {
             case PLAIN -> new IntToBytePlainValueDecoder();
             case DELTA_BINARY_PACKED -> new DeltaBinaryPackedByteDecoder();
-            default -> throw wrongEncoding(encoding, field);
+            default -> throw wrongEncoding(encoding);
+        };
+    }
+
+    public ValueDecoder<long[]> getTimeMicrosDecoder(ParquetEncoding encoding)
+    {
+        return new InlineTransformDecoder<>(
+                getLongDecoder(encoding),
+                (values, offset, length) -> {
+                    for (int i = offset; i < offset + length; i++) {
+                        values[i] = values[i] * PICOSECONDS_PER_MICROSECOND;
+                    }
+                });
+    }
+
+    public ValueDecoder<long[]> getTimeMillisDecoder(ParquetEncoding encoding)
+    {
+        int precision = ((TimeType) field.getType()).getPrecision();
+        if (precision < 3) {
+            return new InlineTransformDecoder<>(
+                    getInt32ToLongDecoder(encoding),
+                    (values, offset, length) -> {
+                        // decoded values are millis, round to lower precision and convert to picos
+                        // modulo PICOSECONDS_PER_DAY is applied for the case when a value is rounded up to PICOSECONDS_PER_DAY
+                        for (int i = offset; i < offset + length; i++) {
+                            values[i] = (round(values[i], 3 - precision) * PICOSECONDS_PER_MILLISECOND) % PICOSECONDS_PER_DAY;
+                        }
+                    });
+        }
+        return new InlineTransformDecoder<>(
+                getInt32ToLongDecoder(encoding),
+                (values, offset, length) -> {
+                    for (int i = offset; i < offset + length; i++) {
+                        values[i] = values[i] * PICOSECONDS_PER_MILLISECOND;
+                    }
+                });
+    }
+
+    public ValueDecoder<long[]> getInt96ToShortTimestampDecoder(ParquetEncoding encoding, DateTimeZone timeZone)
+    {
+        checkArgument(
+                field.getType() instanceof TimestampType timestampType && timestampType.isShort(),
+                "Trino type %s is not a short timestamp",
+                field.getType());
+        int precision = ((TimestampType) field.getType()).getPrecision();
+        ValueDecoder<int[]> delegate = getInt96TimestampDecoder(encoding);
+        return new ValueDecoder<>()
+        {
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(long[] values, int offset, int length)
+            {
+                int[] int96Buffer = new int[length * 3];
+                delegate.read(int96Buffer, 0, length);
+                for (int i = 0; i < length; i++) {
+                    long epochSeconds = decodeFixed12First(int96Buffer, i);
+                    long epochMicros;
+                    if (timeZone == DateTimeZone.UTC) {
+                        epochMicros = epochSeconds * MICROSECONDS_PER_SECOND;
+                    }
+                    else {
+                        epochMicros = timeZone.convertUTCToLocal(epochSeconds * MILLISECONDS_PER_SECOND) * MICROSECONDS_PER_MILLISECOND;
+                    }
+                    int nanosOfSecond = (int) round(decodeFixed12Second(int96Buffer, i), 9 - precision);
+                    values[offset + i] = epochMicros + nanosOfSecond / NANOSECONDS_PER_MICROSECOND;
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
+        };
+    }
+
+    public ValueDecoder<int[]> getInt96ToLongTimestampDecoder(ParquetEncoding encoding, DateTimeZone timeZone)
+    {
+        checkArgument(
+                field.getType() instanceof TimestampType timestampType && !timestampType.isShort(),
+                "Trino type %s is not a long timestamp",
+                field.getType());
+        int precision = ((TimestampType) field.getType()).getPrecision();
+        return new InlineTransformDecoder<>(
+                getInt96TimestampDecoder(encoding),
+                (values, offset, length) -> {
+                    for (int i = offset; i < offset + length; i++) {
+                        long epochSeconds = decodeFixed12First(values, i);
+                        long nanosOfSecond = decodeFixed12Second(values, i);
+                        if (timeZone != DateTimeZone.UTC) {
+                            epochSeconds = timeZone.convertUTCToLocal(epochSeconds * MILLISECONDS_PER_SECOND) / MILLISECONDS_PER_SECOND;
+                        }
+                        if (precision < 9) {
+                            nanosOfSecond = (int) round(nanosOfSecond, 9 - precision);
+                        }
+                        // epochMicros
+                        encodeFixed12(
+                                epochSeconds * MICROSECONDS_PER_SECOND + (nanosOfSecond / NANOSECONDS_PER_MICROSECOND),
+                                (int) ((nanosOfSecond * PICOSECONDS_PER_NANOSECOND) % PICOSECONDS_PER_MICROSECOND),
+                                values,
+                                i);
+                    }
+                });
+    }
+
+    public ValueDecoder<long[]> getInt96ToShortTimestampWithTimeZoneDecoder(ParquetEncoding encoding)
+    {
+        checkArgument(
+                field.getType() instanceof TimestampWithTimeZoneType timestampWithTimeZoneType && timestampWithTimeZoneType.isShort(),
+                "Trino type %s is not a short timestamp with timezone",
+                field.getType());
+        ValueDecoder<int[]> delegate = getInt96TimestampDecoder(encoding);
+        return new ValueDecoder<>()
+        {
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(long[] values, int offset, int length)
+            {
+                int[] int96Buffer = new int[length * 3];
+                delegate.read(int96Buffer, 0, length);
+                for (int i = 0; i < length; i++) {
+                    long epochSeconds = decodeFixed12First(int96Buffer, i);
+                    int nanosOfSecond = decodeFixed12Second(int96Buffer, i);
+                    long utcMillis = epochSeconds * MILLISECONDS_PER_SECOND + (nanosOfSecond / NANOSECONDS_PER_MILLISECOND);
+                    values[offset + i] = packDateTimeWithZone(utcMillis, UTC_KEY);
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
+        };
+    }
+
+    public ValueDecoder<long[]> getInt64TimestampMillsToShortTimestampDecoder(ParquetEncoding encoding)
+    {
+        checkArgument(
+                field.getType() instanceof TimestampType timestampType && timestampType.isShort(),
+                "Trino type %s is not a short timestamp",
+                field.getType());
+        int precision = ((TimestampType) field.getType()).getPrecision();
+        ValueDecoder<long[]> valueDecoder = getLongDecoder(encoding);
+        if (precision < 3) {
+            return new InlineTransformDecoder<>(
+                    valueDecoder,
+                    (values, offset, length) -> {
+                        // decoded values are epochMillis, round to lower precision and convert to epochMicros
+                        for (int i = offset; i < offset + length; i++) {
+                            values[i] = round(values[i], 3 - precision) * MICROSECONDS_PER_MILLISECOND;
+                        }
+                    });
+        }
+        return new InlineTransformDecoder<>(
+                valueDecoder,
+                (values, offset, length) -> {
+                    // decoded values are epochMillis, convert to epochMicros
+                    for (int i = offset; i < offset + length; i++) {
+                        values[i] = values[i] * MICROSECONDS_PER_MILLISECOND;
+                    }
+                });
+    }
+
+    public ValueDecoder<long[]> getInt64TimestampMillsToShortTimestampWithTimeZoneDecoder(ParquetEncoding encoding)
+    {
+        checkArgument(
+                field.getType() instanceof TimestampWithTimeZoneType timestampWithTimeZoneType && timestampWithTimeZoneType.isShort(),
+                "Trino type %s is not a short timestamp",
+                field.getType());
+        int precision = ((TimestampWithTimeZoneType) field.getType()).getPrecision();
+        ValueDecoder<long[]> valueDecoder = getLongDecoder(encoding);
+        if (precision < 3) {
+            return new InlineTransformDecoder<>(
+                    valueDecoder,
+                    (values, offset, length) -> {
+                        // decoded values are epochMillis, round to lower precision and convert to packed millis utc value
+                        for (int i = offset; i < offset + length; i++) {
+                            values[i] = packDateTimeWithZone(round(values[i], 3 - precision), UTC_KEY);
+                        }
+                    });
+        }
+        return new InlineTransformDecoder<>(
+                valueDecoder,
+                (values, offset, length) -> {
+                    // decoded values are epochMillis, convert to packed millis utc value
+                    for (int i = offset; i < offset + length; i++) {
+                        values[i] = packDateTimeWithZone(values[i], UTC_KEY);
+                    }
+                });
+    }
+
+    public ValueDecoder<long[]> getInt64TimestampMicrosToShortTimestampDecoder(ParquetEncoding encoding)
+    {
+        checkArgument(
+                field.getType() instanceof TimestampType timestampType && timestampType.isShort(),
+                "Trino type %s is not a short timestamp",
+                field.getType());
+        int precision = ((TimestampType) field.getType()).getPrecision();
+        ValueDecoder<long[]> valueDecoder = getLongDecoder(encoding);
+        if (precision == 6) {
+            return valueDecoder;
+        }
+        return new InlineTransformDecoder<>(
+                valueDecoder,
+                (values, offset, length) -> {
+                    // decoded values are epochMicros, round to lower precision
+                    for (int i = offset; i < offset + length; i++) {
+                        values[i] = round(values[i], 6 - precision);
+                    }
+                });
+    }
+
+    public ValueDecoder<long[]> getInt64TimestampMicrosToShortTimestampWithTimeZoneDecoder(ParquetEncoding encoding)
+    {
+        checkArgument(
+                field.getType() instanceof TimestampWithTimeZoneType timestampWithTimeZoneType && timestampWithTimeZoneType.isShort(),
+                "Trino type %s is not a short timestamp",
+                field.getType());
+        int precision = ((TimestampWithTimeZoneType) field.getType()).getPrecision();
+        return new InlineTransformDecoder<>(
+                getLongDecoder(encoding),
+                (values, offset, length) -> {
+                    // decoded values are epochMicros, round to lower precision and convert to packed millis utc value
+                    for (int i = offset; i < offset + length; i++) {
+                        values[i] = packDateTimeWithZone(round(values[i], 6 - precision) / MICROSECONDS_PER_MILLISECOND, UTC_KEY);
+                    }
+                });
+    }
+
+    public ValueDecoder<long[]> getInt64TimestampNanosToShortTimestampDecoder(ParquetEncoding encoding)
+    {
+        checkArgument(
+                field.getType() instanceof TimestampType timestampType && timestampType.isShort(),
+                "Trino type %s is not a short timestamp",
+                field.getType());
+        int precision = ((TimestampType) field.getType()).getPrecision();
+        return new InlineTransformDecoder<>(
+                getLongDecoder(encoding),
+                (values, offset, length) -> {
+                    // decoded values are epochNanos, round to lower precision and convert to epochMicros
+                    for (int i = offset; i < offset + length; i++) {
+                        values[i] = round(values[i], 9 - precision) / NANOSECONDS_PER_MICROSECOND;
+                    }
+                });
+    }
+
+    public ValueDecoder<int[]> getInt64TimestampMillisToLongTimestampDecoder(ParquetEncoding encoding)
+    {
+        ValueDecoder<long[]> delegate = getLongDecoder(encoding);
+        return new ValueDecoder<>()
+        {
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(int[] values, int offset, int length)
+            {
+                long[] buffer = new long[length];
+                delegate.read(buffer, 0, length);
+                // decoded values are epochMillis, convert to epochMicros
+                for (int i = 0; i < length; i++) {
+                    encodeFixed12(buffer[i] * MICROSECONDS_PER_MILLISECOND, 0, values, i + offset);
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
+        };
+    }
+
+    public ValueDecoder<int[]> getInt64TimestampMicrosToLongTimestampDecoder(ParquetEncoding encoding)
+    {
+        ValueDecoder<long[]> delegate = getLongDecoder(encoding);
+        return new ValueDecoder<>()
+        {
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(int[] values, int offset, int length)
+            {
+                long[] buffer = new long[length];
+                delegate.read(buffer, 0, length);
+                // decoded values are epochMicros
+                for (int i = 0; i < length; i++) {
+                    encodeFixed12(buffer[i], 0, values, i + offset);
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
+        };
+    }
+
+    public ValueDecoder<int[]> getInt64TimestampMicrosToLongTimestampWithTimeZoneDecoder(ParquetEncoding encoding)
+    {
+        ValueDecoder<long[]> delegate = getLongDecoder(encoding);
+        return new ValueDecoder<>()
+        {
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(int[] values, int offset, int length)
+            {
+                long[] buffer = new long[length];
+                delegate.read(buffer, 0, length);
+                // decoded values are epochMicros, convert to (packed epochMillisUtc, picosOfMilli)
+                for (int i = 0; i < length; i++) {
+                    long epochMicros = buffer[i];
+                    encodeFixed12(
+                            packDateTimeWithZone(floorDiv(epochMicros, MICROSECONDS_PER_MILLISECOND), UTC_KEY),
+                            floorMod(epochMicros, MICROSECONDS_PER_MILLISECOND) * PICOSECONDS_PER_MICROSECOND,
+                            values,
+                            i + offset);
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
+        };
+    }
+
+    public ValueDecoder<int[]> getInt64TimestampNanosToLongTimestampDecoder(ParquetEncoding encoding)
+    {
+        ValueDecoder<long[]> delegate = getLongDecoder(encoding);
+        return new ValueDecoder<>()
+        {
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(int[] values, int offset, int length)
+            {
+                long[] buffer = new long[length];
+                delegate.read(buffer, 0, length);
+                // decoded values are epochNanos, convert to (epochMicros, picosOfMicro)
+                for (int i = 0; i < length; i++) {
+                    long epochNanos = buffer[i];
+                    encodeFixed12(
+                            floorDiv(epochNanos, NANOSECONDS_PER_MICROSECOND),
+                            floorMod(epochNanos, NANOSECONDS_PER_MICROSECOND) * PICOSECONDS_PER_NANOSECOND,
+                            values,
+                            i + offset);
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
         };
     }
 
-    private static ValuesReader getApacheParquetReader(ParquetEncoding encoding, PrimitiveField field)
+    public ValueDecoder<long[]> getFloatToDoubleDecoder(ParquetEncoding encoding)
+    {
+        ValueDecoder<int[]> delegate = getRealDecoder(encoding);
+        return new ValueDecoder<>()
+        {
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(long[] values, int offset, int length)
+            {
+                int[] buffer = new int[length];
+                delegate.read(buffer, 0, length);
+                for (int i = 0; i < length; i++) {
+                    values[offset + i] = Double.doubleToLongBits(Float.intBitsToFloat(buffer[i]));
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
+        };
+    }
+
+    public ValueDecoder<long[]> getBinaryLongDecimalDecoder(ParquetEncoding encoding)
+    {
+        return new BinaryToLongDecimalTransformDecoder(getBinaryDecoder(encoding));
+    }
+
+    public ValueDecoder<long[]> getDeltaFixedWidthLongDecimalDecoder(ParquetEncoding encoding)
+    {
+        checkArgument(encoding.equals(DELTA_BYTE_ARRAY), "encoding %s is not DELTA_BYTE_ARRAY", encoding);
+        ColumnDescriptor descriptor = field.getDescriptor();
+        LogicalTypeAnnotation logicalTypeAnnotation = descriptor.getPrimitiveType().getLogicalTypeAnnotation();
+        checkArgument(
+                logicalTypeAnnotation instanceof DecimalLogicalTypeAnnotation decimalAnnotation
+                        && decimalAnnotation.getPrecision() > Decimals.MAX_SHORT_PRECISION,
+                "Column %s is not a long decimal",
+                descriptor);
+        return new BinaryToLongDecimalTransformDecoder(new BinaryDeltaByteArrayDecoder());
+    }
+
+    public ValueDecoder<long[]> getBinaryShortDecimalDecoder(ParquetEncoding encoding)
+    {
+        ValueDecoder<BinaryBuffer> delegate = getBinaryDecoder(encoding);
+        return new ValueDecoder<>()
+        {
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(long[] values, int offset, int length)
+            {
+                BinaryBuffer buffer = new BinaryBuffer(length);
+                delegate.read(buffer, 0, length);
+                int[] offsets = buffer.getOffsets();
+                byte[] inputBytes = buffer.asSlice().byteArray();
+
+                for (int i = 0; i < length; i++) {
+                    int positionOffset = offsets[i];
+                    int positionLength = offsets[i + 1] - positionOffset;
+                    if (positionLength > 8) {
+                        throw new ParquetDecodingException("Unable to read BINARY type decimal of size " + positionLength + " as a short decimal");
+                    }
+                    // No need for checkBytesFitInShortDecimal as the standard requires variable binary decimals
+                    // to be stored in minimum possible number of bytes
+                    values[offset + i] = getShortDecimalValue(inputBytes, positionOffset, positionLength);
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
+        };
+    }
+
+    public ValueDecoder<long[]> getDeltaFixedWidthShortDecimalDecoder(ParquetEncoding encoding)
+    {
+        checkArgument(encoding.equals(DELTA_BYTE_ARRAY), "encoding %s is not DELTA_BYTE_ARRAY", encoding);
+        ColumnDescriptor descriptor = field.getDescriptor();
+        LogicalTypeAnnotation logicalTypeAnnotation = descriptor.getPrimitiveType().getLogicalTypeAnnotation();
+        checkArgument(
+                logicalTypeAnnotation instanceof DecimalLogicalTypeAnnotation decimalAnnotation
+                        && decimalAnnotation.getPrecision() <= Decimals.MAX_SHORT_PRECISION,
+                "Column %s is not a short decimal",
+                descriptor);
+        int typeLength = descriptor.getPrimitiveType().getTypeLength();
+        checkArgument(typeLength > 0 && typeLength <= 16, "Expected column %s to have type length in range (1-16)", descriptor);
+        return new ValueDecoder<>()
+        {
+            private final ValueDecoder<BinaryBuffer> delegate = new BinaryDeltaByteArrayDecoder();
+
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(long[] values, int offset, int length)
+            {
+                BinaryBuffer buffer = new BinaryBuffer(length);
+                delegate.read(buffer, 0, length);
+
+                // Each position in FIXED_LEN_BYTE_ARRAY has fixed length
+                int bytesOffset = 0;
+                int bytesLength = typeLength;
+                if (typeLength > Long.BYTES) {
+                    bytesOffset = typeLength - Long.BYTES;
+                    bytesLength = Long.BYTES;
+                }
+
+                byte[] inputBytes = buffer.asSlice().byteArray();
+                int[] offsets = buffer.getOffsets();
+                for (int i = 0; i < length; i++) {
+                    int inputOffset = offsets[i];
+                    checkBytesFitInShortDecimal(inputBytes, inputOffset, bytesOffset, descriptor);
+                    values[offset + i] = getShortDecimalValue(inputBytes, inputOffset + bytesOffset, bytesLength);
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
+        };
+    }
+
+    public ValueDecoder<long[]> getRescaledLongDecimalDecoder(ParquetEncoding encoding)
+    {
+        DecimalType decimalType = (DecimalType) field.getType();
+        DecimalLogicalTypeAnnotation decimalAnnotation = (DecimalLogicalTypeAnnotation) field.getDescriptor().getPrimitiveType().getLogicalTypeAnnotation();
+        if (decimalAnnotation.getPrecision() <= Decimals.MAX_SHORT_PRECISION) {
+            ValueDecoder<long[]> delegate = getShortDecimalDecoder(encoding);
+            return new ValueDecoder<>()
+            {
+                @Override
+                public void init(SimpleSliceInputStream input)
+                {
+                    delegate.init(input);
+                }
+
+                @Override
+                public void read(long[] values, int offset, int length)
+                {
+                    long[] buffer = new long[length];
+                    delegate.read(buffer, 0, length);
+                    for (int i = 0; i < length; i++) {
+                        Int128 rescaled = DecimalConversions.shortToLongCast(
+                                buffer[i],
+                                decimalAnnotation.getPrecision(),
+                                decimalAnnotation.getScale(),
+                                decimalType.getPrecision(),
+                                decimalType.getScale());
+
+                        values[2 * (offset + i)] = rescaled.getHigh();
+                        values[2 * (offset + i) + 1] = rescaled.getLow();
+                    }
+                }
+
+                @Override
+                public void skip(int n)
+                {
+                    delegate.skip(n);
+                }
+            };
+        }
+        return new InlineTransformDecoder<>(
+                getLongDecimalDecoder(encoding),
+                (values, offset, length) -> {
+                    int endOffset = (offset + length) * 2;
+                    for (int currentOffset = offset * 2; currentOffset < endOffset; currentOffset += 2) {
+                        Int128 rescaled = DecimalConversions.longToLongCast(
+                                Int128.valueOf(values[currentOffset], values[currentOffset + 1]),
+                                decimalAnnotation.getPrecision(),
+                                decimalAnnotation.getScale(),
+                                decimalType.getPrecision(),
+                                decimalType.getScale());
+
+                        values[currentOffset] = rescaled.getHigh();
+                        values[currentOffset + 1] = rescaled.getLow();
+                    }
+                });
+    }
+
+    public ValueDecoder<long[]> getRescaledShortDecimalDecoder(ParquetEncoding encoding)
+    {
+        DecimalType decimalType = (DecimalType) field.getType();
+        DecimalLogicalTypeAnnotation decimalAnnotation = (DecimalLogicalTypeAnnotation) field.getDescriptor().getPrimitiveType().getLogicalTypeAnnotation();
+        if (decimalAnnotation.getPrecision() <= Decimals.MAX_SHORT_PRECISION) {
+            long rescale = longTenToNth(Math.abs(decimalType.getScale() - decimalAnnotation.getScale()));
+            return new InlineTransformDecoder<>(
+                    getShortDecimalDecoder(encoding),
+                    (values, offset, length) -> {
+                        for (int i = offset; i < offset + length; i++) {
+                            values[i] = DecimalConversions.shortToShortCast(
+                                    values[i],
+                                    decimalAnnotation.getPrecision(),
+                                    decimalAnnotation.getScale(),
+                                    decimalType.getPrecision(),
+                                    decimalType.getScale(),
+                                    rescale,
+                                    rescale / 2);
+                        }
+                    });
+        }
+        ValueDecoder<long[]> delegate = getLongDecimalDecoder(encoding);
+        return new ValueDecoder<>()
+        {
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(long[] values, int offset, int length)
+            {
+                long[] buffer = new long[2 * length];
+                delegate.read(buffer, 0, length);
+                for (int i = 0; i < length; i++) {
+                    values[offset + i] = DecimalConversions.longToShortCast(
+                            Int128.valueOf(buffer[2 * i], buffer[2 * i + 1]),
+                            decimalAnnotation.getPrecision(),
+                            decimalAnnotation.getScale(),
+                            decimalType.getPrecision(),
+                            decimalType.getScale());
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
+        };
+    }
+
+    public ValueDecoder<long[]> getInt32ToShortDecimalDecoder(ParquetEncoding encoding)
+    {
+        DecimalType decimalType = (DecimalType) field.getType();
+        ValueDecoder<int[]> delegate = getInt32Decoder(encoding);
+        return new ValueDecoder<>()
+        {
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(long[] values, int offset, int length)
+            {
+                int[] buffer = new int[length];
+                delegate.read(buffer, 0, length);
+                for (int i = 0; i < length; i++) {
+                    if (overflows(buffer[i], decimalType.getPrecision())) {
+                        throw new TrinoException(
+                                INVALID_CAST_ARGUMENT,
+                                format("Cannot read parquet INT32 value '%s' as DECIMAL(%s, %s)", buffer[i], decimalType.getPrecision(), decimalType.getScale()));
+                    }
+                    values[i + offset] = buffer[i];
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
+        };
+    }
+
+    public ValueDecoder<long[]> getInt32ToLongDecoder(ParquetEncoding encoding)
+    {
+        ValueDecoder<int[]> delegate = getInt32Decoder(encoding);
+        return new ValueDecoder<>()
+        {
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(long[] values, int offset, int length)
+            {
+                int[] buffer = new int[length];
+                delegate.read(buffer, 0, length);
+                for (int i = 0; i < length; i++) {
+                    values[i + offset] = buffer[i];
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
+        };
+    }
+
+    public ValueDecoder<int[]> getInt64ToIntDecoder(ParquetEncoding encoding)
+    {
+        return new LongToIntTransformDecoder(getLongDecoder(encoding));
+    }
+
+    public ValueDecoder<int[]> getShortDecimalToIntDecoder(ParquetEncoding encoding)
+    {
+        return new LongToIntTransformDecoder(getShortDecimalDecoder(encoding));
+    }
+
+    public ValueDecoder<short[]> getInt64ToShortDecoder(ParquetEncoding encoding)
+    {
+        return new LongToShortTransformDecoder(getLongDecoder(encoding));
+    }
+
+    public ValueDecoder<short[]> getShortDecimalToShortDecoder(ParquetEncoding encoding)
+    {
+        return new LongToShortTransformDecoder(getShortDecimalDecoder(encoding));
+    }
+
+    public ValueDecoder<byte[]> getInt64ToByteDecoder(ParquetEncoding encoding)
+    {
+        return new LongToByteTransformDecoder(getLongDecoder(encoding));
+    }
+
+    public ValueDecoder<byte[]> getShortDecimalToByteDecoder(ParquetEncoding encoding)
+    {
+        return new LongToByteTransformDecoder(getShortDecimalDecoder(encoding));
+    }
+
+    public ValueDecoder<long[]> getDeltaUuidDecoder(ParquetEncoding encoding)
+    {
+        checkArgument(encoding.equals(DELTA_BYTE_ARRAY), "encoding %s is not DELTA_BYTE_ARRAY", encoding);
+        ValueDecoder<BinaryBuffer> delegate = new BinaryDeltaByteArrayDecoder();
+        return new ValueDecoder<>()
+        {
+            @Override
+            public void init(SimpleSliceInputStream input)
+            {
+                delegate.init(input);
+            }
+
+            @Override
+            public void read(long[] values, int offset, int length)
+            {
+                BinaryBuffer buffer = new BinaryBuffer(length);
+                delegate.read(buffer, 0, length);
+                SimpleSliceInputStream binaryInput = new SimpleSliceInputStream(buffer.asSlice());
+
+                int endOffset = (offset + length) * 2;
+                for (int outputOffset = offset * 2; outputOffset < endOffset; outputOffset += 2) {
+                    values[outputOffset] = binaryInput.readLong();
+                    values[outputOffset + 1] = binaryInput.readLong();
+                }
+            }
+
+            @Override
+            public void skip(int n)
+            {
+                delegate.skip(n);
+            }
+        };
+    }
+
+    private static class LongToIntTransformDecoder
+            implements ValueDecoder<int[]>
+    {
+        private final ValueDecoder<long[]> delegate;
+
+        private LongToIntTransformDecoder(ValueDecoder<long[]> delegate)
+        {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void init(SimpleSliceInputStream input)
+        {
+            delegate.init(input);
+        }
+
+        @Override
+        public void read(int[] values, int offset, int length)
+        {
+            long[] buffer = new long[length];
+            delegate.read(buffer, 0, length);
+            for (int i = 0; i < length; i++) {
+                values[offset + i] = toIntExact(buffer[i]);
+            }
+        }
+
+        @Override
+        public void skip(int n)
+        {
+            delegate.skip(n);
+        }
+    }
+
+    private static class LongToShortTransformDecoder
+            implements ValueDecoder<short[]>
+    {
+        private final ValueDecoder<long[]> delegate;
+
+        private LongToShortTransformDecoder(ValueDecoder<long[]> delegate)
+        {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void init(SimpleSliceInputStream input)
+        {
+            delegate.init(input);
+        }
+
+        @Override
+        public void read(short[] values, int offset, int length)
+        {
+            long[] buffer = new long[length];
+            delegate.read(buffer, 0, length);
+            for (int i = 0; i < length; i++) {
+                values[offset + i] = toShortExact(buffer[i]);
+            }
+        }
+
+        @Override
+        public void skip(int n)
+        {
+            delegate.skip(n);
+        }
+    }
+
+    private static class LongToByteTransformDecoder
+            implements ValueDecoder<byte[]>
+    {
+        private final ValueDecoder<long[]> delegate;
+
+        private LongToByteTransformDecoder(ValueDecoder<long[]> delegate)
+        {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void init(SimpleSliceInputStream input)
+        {
+            delegate.init(input);
+        }
+
+        @Override
+        public void read(byte[] values, int offset, int length)
+        {
+            long[] buffer = new long[length];
+            delegate.read(buffer, 0, length);
+            for (int i = 0; i < length; i++) {
+                values[offset + i] = toByteExact(buffer[i]);
+            }
+        }
+
+        @Override
+        public void skip(int n)
+        {
+            delegate.skip(n);
+        }
+    }
+
+    private static class BinaryToLongDecimalTransformDecoder
+            implements ValueDecoder<long[]>
+    {
+        private final ValueDecoder<BinaryBuffer> delegate;
+
+        private BinaryToLongDecimalTransformDecoder(ValueDecoder<BinaryBuffer> delegate)
+        {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void init(SimpleSliceInputStream input)
+        {
+            delegate.init(input);
+        }
+
+        @Override
+        public void read(long[] values, int offset, int length)
+        {
+            BinaryBuffer buffer = new BinaryBuffer(length);
+            delegate.read(buffer, 0, length);
+            int[] offsets = buffer.getOffsets();
+            Slice binaryInput = buffer.asSlice();
+
+            for (int i = 0; i < length; i++) {
+                int positionOffset = offsets[i];
+                int positionLength = offsets[i + 1] - positionOffset;
+                Int128 value = Int128.fromBigEndian(binaryInput.getBytes(positionOffset, positionLength));
+                values[2 * (offset + i)] = value.getHigh();
+                values[2 * (offset + i) + 1] = value.getLow();
+            }
+        }
+
+        @Override
+        public void skip(int n)
+        {
+            delegate.skip(n);
+        }
+    }
+
+    private static class InlineTransformDecoder<T>
+            implements ValueDecoder<T>
+    {
+        private final ValueDecoder<T> valueDecoder;
+        private final TypeTransform<T> typeTransform;
+
+        private InlineTransformDecoder(ValueDecoder<T> valueDecoder, TypeTransform<T> typeTransform)
+        {
+            this.valueDecoder = requireNonNull(valueDecoder, "valueDecoder is null");
+            this.typeTransform = requireNonNull(typeTransform, "typeTransform is null");
+        }
+
+        @Override
+        public void init(SimpleSliceInputStream input)
+        {
+            valueDecoder.init(input);
+        }
+
+        @Override
+        public void read(T values, int offset, int length)
+        {
+            valueDecoder.read(values, offset, length);
+            typeTransform.process(values, offset, length);
+        }
+
+        @Override
+        public void skip(int n)
+        {
+            valueDecoder.skip(n);
+        }
+    }
+
+    private interface TypeTransform<T>
+    {
+        void process(T values, int offset, int length);
+    }
+
+    private ValuesReader getApacheParquetReader(ParquetEncoding encoding)
     {
         return encoding.getValuesReader(field.getDescriptor(), VALUES);
     }
 
-    private static IllegalArgumentException wrongEncoding(ParquetEncoding encoding, PrimitiveField field)
+    private IllegalArgumentException wrongEncoding(ParquetEncoding encoding)
     {
         return new IllegalArgumentException("Wrong encoding " + encoding + " for column " + field.getDescriptor());
     }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/DictionaryDecoder.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/DictionaryDecoder.java
index c90a3565596e..53f7e251b8d0 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/DictionaryDecoder.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/DictionaryDecoder.java
@@ -13,12 +13,12 @@
  */
 package io.trino.parquet.reader.flat;
 
+import io.trino.parquet.DictionaryPage;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 import io.trino.parquet.reader.decoders.RleBitPackingHybridDecoder;
 import io.trino.parquet.reader.decoders.ValueDecoder;
 import io.trino.spi.block.Block;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -95,4 +95,24 @@ public int getDictionarySize()
     {
         return dictionarySize;
     }
+
+    public interface DictionaryDecoderProvider<T>
+    {
+        DictionaryDecoder<T> create(DictionaryPage dictionaryPage, boolean isNonNull);
+    }
+
+    public static <BufferType> DictionaryDecoder<BufferType> getDictionaryDecoder(
+            DictionaryPage dictionaryPage,
+            ColumnAdapter<BufferType> columnAdapter,
+            ValueDecoder<BufferType> plainValuesDecoder,
+            boolean isNonNull)
+    {
+        int size = dictionaryPage.getDictionarySize();
+        // Extra value is added to the end of the dictionary for nullable columns because
+        // parquet dictionary page does not include null but Trino DictionaryBlock's dictionary does
+        BufferType dictionary = columnAdapter.createBuffer(size + (isNonNull ? 0 : 1));
+        plainValuesDecoder.init(new SimpleSliceInputStream(dictionaryPage.getSlice()));
+        plainValuesDecoder.read(dictionary, 0, size);
+        return new DictionaryDecoder<>(dictionary, columnAdapter, size, isNonNull);
+    }
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/FilteredRowRangesIterator.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/FilteredRowRangesIterator.java
index 15716684c874..1051f13c8ba5 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/FilteredRowRangesIterator.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/FilteredRowRangesIterator.java
@@ -172,7 +172,7 @@ public long skipToRangeStart()
         if (rangeStart <= currentIndex) {
             return 0;
         }
-        long skipCount = rangeStart - currentIndex;
+        int skipCount = toIntExact(rangeStart - currentIndex);
         pageValuesConsumed += skipCount;
         return skipCount;
     }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/Fixed12ColumnAdapter.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/Fixed12ColumnAdapter.java
new file mode 100644
index 000000000000..55fb4080c2b7
--- /dev/null
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/Fixed12ColumnAdapter.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed 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 io.trino.parquet.reader.flat;
+
+import com.google.common.primitives.Ints;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.Fixed12Block;
+
+import java.util.List;
+import java.util.Optional;
+
+import static io.airlift.slice.SizeOf.sizeOf;
+
+public class Fixed12ColumnAdapter
+        implements ColumnAdapter<int[]>
+{
+    public static final Fixed12ColumnAdapter FIXED12_ADAPTER = new Fixed12ColumnAdapter();
+
+    @Override
+    public int[] createBuffer(int size)
+    {
+        return new int[size * 3];
+    }
+
+    @Override
+    public Block createNonNullBlock(int[] values)
+    {
+        return new Fixed12Block(values.length / 3, Optional.empty(), values);
+    }
+
+    @Override
+    public Block createNullableBlock(boolean[] nulls, int[] values)
+    {
+        return new Fixed12Block(values.length / 3, Optional.of(nulls), values);
+    }
+
+    @Override
+    public void copyValue(int[] source, int sourceIndex, int[] destination, int destinationIndex)
+    {
+        destination[destinationIndex * 3] = source[sourceIndex * 3];
+        destination[(destinationIndex * 3) + 1] = source[(sourceIndex * 3) + 1];
+        destination[(destinationIndex * 3) + 2] = source[(sourceIndex * 3) + 2];
+    }
+
+    @Override
+    public void decodeDictionaryIds(int[] values, int offset, int length, int[] ids, int[] dictionary)
+    {
+        for (int i = 0; i < length; i++) {
+            int id = 3 * ids[i];
+            int destinationIndex = 3 * (offset + i);
+            values[destinationIndex] = dictionary[id];
+            values[destinationIndex + 1] = dictionary[id + 1];
+            values[destinationIndex + 2] = dictionary[id + 2];
+        }
+    }
+
+    @Override
+    public long getSizeInBytes(int[] values)
+    {
+        return sizeOf(values);
+    }
+
+    @Override
+    public int[] merge(List<int[]> buffers)
+    {
+        return Ints.concat(buffers.toArray(int[][]::new));
+    }
+}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/FlatColumnReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/FlatColumnReader.java
index f94e8c5bea4b..45347567ead2 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/FlatColumnReader.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/FlatColumnReader.java
@@ -34,6 +34,8 @@
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.parquet.ParquetEncoding.RLE;
 import static io.trino.parquet.reader.decoders.ValueDecoder.ValueDecodersProvider;
+import static io.trino.parquet.reader.flat.DictionaryDecoder.DictionaryDecoderProvider;
+import static io.trino.parquet.reader.flat.FlatDefinitionLevelDecoder.DefinitionLevelDecoderProvider;
 import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
@@ -45,6 +47,7 @@ public class FlatColumnReader<BufferType>
     private static final int[] EMPTY_DEFINITION_LEVELS = new int[0];
     private static final int[] EMPTY_REPETITION_LEVELS = new int[0];
 
+    private final DefinitionLevelDecoderProvider definitionLevelDecoderProvider;
     private final LocalMemoryContext memoryContext;
 
     private int remainingPageValueCount;
@@ -56,10 +59,13 @@ public class FlatColumnReader<BufferType>
     public FlatColumnReader(
             PrimitiveField field,
             ValueDecodersProvider<BufferType> decodersProvider,
+            DefinitionLevelDecoderProvider definitionLevelDecoderProvider,
+            DictionaryDecoderProvider<BufferType> dictionaryDecoderProvider,
             ColumnAdapter<BufferType> columnAdapter,
             LocalMemoryContext memoryContext)
     {
-        super(field, decodersProvider, columnAdapter);
+        super(field, decodersProvider, dictionaryDecoderProvider, columnAdapter);
+        this.definitionLevelDecoderProvider = requireNonNull(definitionLevelDecoderProvider, "definitionLevelDecoderProvider is null");
         this.memoryContext = requireNonNull(memoryContext, "memoryContext is null");
     }
 
@@ -280,12 +286,11 @@ private void readFlatPageV1(DataPageV1 page)
             // Definition levels are skipped from file when the max definition level is 0 as the bit-width required to store them is 0.
             // This can happen for non-null (required) fields or nullable fields where all values are null.
             // See org.apache.parquet.column.Encoding.RLE.getValuesReader for reference.
-            if (field.getDescriptor().getMaxDefinitionLevel() == 0) {
-                definitionLevelDecoder = new ZeroDefinitionLevelDecoder();
-            }
-            else {
+            int maxDefinitionLevel = field.getDescriptor().getMaxDefinitionLevel();
+            definitionLevelDecoder = definitionLevelDecoderProvider.create(maxDefinitionLevel);
+            if (maxDefinitionLevel > 0) {
                 int bufferSize = buffer.getInt(0); //  We need to read the size even if nulls are absent
-                definitionLevelDecoder = new NullsDecoder(buffer.slice(Integer.BYTES, bufferSize));
+                definitionLevelDecoder.init(buffer.slice(Integer.BYTES, bufferSize));
                 alreadyRead = bufferSize + Integer.BYTES;
             }
         }
@@ -295,11 +300,8 @@ private void readFlatPageV1(DataPageV1 page)
 
     private void readFlatPageV2(DataPageV2 page)
     {
-        int maxDefinitionLevel = field.getDescriptor().getMaxDefinitionLevel();
-        checkArgument(maxDefinitionLevel >= 0 && maxDefinitionLevel <= 1, "Invalid max definition level: " + maxDefinitionLevel);
-
-        definitionLevelDecoder = new NullsDecoder(page.getDefinitionLevels());
-
+        definitionLevelDecoder = definitionLevelDecoderProvider.create(field.getDescriptor().getMaxDefinitionLevel());
+        definitionLevelDecoder.init(page.getDefinitionLevels());
         valueDecoder = createValueDecoder(decodersProvider, page.getDataEncoding(), page.getSlice());
     }
 
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/FlatDefinitionLevelDecoder.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/FlatDefinitionLevelDecoder.java
index 3e7942476a25..de629401fb4a 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/FlatDefinitionLevelDecoder.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/FlatDefinitionLevelDecoder.java
@@ -13,8 +13,14 @@
  */
 package io.trino.parquet.reader.flat;
 
+import io.airlift.slice.Slice;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
 public interface FlatDefinitionLevelDecoder
 {
+    void init(Slice input);
+
     /**
      * Populate 'values' with true for nulls and return the number of non-nulls encountered.
      * 'values' array is assumed to be empty at the start of reading a batch, i.e. contain only false values.
@@ -25,4 +31,18 @@ public interface FlatDefinitionLevelDecoder
      * Skip 'length' values and return the number of non-nulls encountered
      */
     int skip(int length);
+
+    interface DefinitionLevelDecoderProvider
+    {
+        FlatDefinitionLevelDecoder create(int maxDefinitionLevel);
+    }
+
+    static FlatDefinitionLevelDecoder getFlatDefinitionLevelDecoder(int maxDefinitionLevel)
+    {
+        checkArgument(maxDefinitionLevel >= 0 && maxDefinitionLevel <= 1, "Invalid max definition level: " + maxDefinitionLevel);
+        if (maxDefinitionLevel == 0) {
+            return new ZeroDefinitionLevelDecoder();
+        }
+        return new NullsDecoder();
+    }
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/Int96ColumnAdapter.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/Int96ColumnAdapter.java
deleted file mode 100644
index 1cbea6dacefa..000000000000
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/Int96ColumnAdapter.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader.flat;
-
-import com.google.common.primitives.Ints;
-import com.google.common.primitives.Longs;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.Int96ArrayBlock;
-
-import java.util.List;
-import java.util.Optional;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.airlift.slice.SizeOf.sizeOf;
-
-public class Int96ColumnAdapter
-        implements ColumnAdapter<Int96ColumnAdapter.Int96Buffer>
-{
-    public static final Int96ColumnAdapter INT96_ADAPTER = new Int96ColumnAdapter();
-
-    @Override
-    public Int96Buffer createBuffer(int size)
-    {
-        return new Int96Buffer(size);
-    }
-
-    @Override
-    public void copyValue(Int96Buffer source, int sourceIndex, Int96Buffer destination, int destinationIndex)
-    {
-        destination.longs[destinationIndex] = source.longs[sourceIndex];
-        destination.ints[destinationIndex] = source.ints[sourceIndex];
-    }
-
-    @Override
-    public Block createNullableBlock(boolean[] nulls, Int96Buffer values)
-    {
-        return new Int96ArrayBlock(values.size(), Optional.of(nulls), values.longs, values.ints);
-    }
-
-    @Override
-    public Block createNonNullBlock(Int96Buffer values)
-    {
-        return new Int96ArrayBlock(values.size(), Optional.empty(), values.longs, values.ints);
-    }
-
-    @Override
-    public void decodeDictionaryIds(Int96Buffer values, int offset, int length, int[] ids, Int96Buffer dictionary)
-    {
-        for (int i = 0; i < length; i++) {
-            values.longs[offset + i] = dictionary.longs[ids[i]];
-            values.ints[offset + i] = dictionary.ints[ids[i]];
-        }
-    }
-
-    @Override
-    public long getSizeInBytes(Int96Buffer values)
-    {
-        return sizeOf(values.longs) + sizeOf(values.ints);
-    }
-
-    @Override
-    public Int96Buffer merge(List<Int96Buffer> buffers)
-    {
-        return new Int96Buffer(
-                Longs.concat(buffers.stream()
-                        .map(buffer -> buffer.longs)
-                        .toArray(long[][]::new)),
-                Ints.concat(buffers.stream()
-                        .map(buffer -> buffer.ints)
-                        .toArray(int[][]::new)));
-    }
-
-    public static class Int96Buffer
-    {
-        public final long[] longs;
-        public final int[] ints;
-
-        public Int96Buffer(int size)
-        {
-            this(new long[size], new int[size]);
-        }
-
-        private Int96Buffer(long[] longs, int[] ints)
-        {
-            checkArgument(
-                    longs.length == ints.length,
-                    "Length of longs %s does not match length of ints %s",
-                    longs.length,
-                    ints.length);
-            this.longs = longs;
-            this.ints = ints;
-        }
-
-        public int size()
-        {
-            return longs.length;
-        }
-    }
-}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/NullsDecoder.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/NullsDecoder.java
index 8a679483a9eb..9468afc2785e 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/NullsDecoder.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/NullsDecoder.java
@@ -36,8 +36,7 @@
 public class NullsDecoder
         implements FlatDefinitionLevelDecoder
 {
-    private final SimpleSliceInputStream input;
-
+    private SimpleSliceInputStream input;
     // Encoding type if decoding stopped in the middle of the group
     private boolean isRle;
     // Values left to decode in the current group
@@ -49,7 +48,8 @@ public class NullsDecoder
     // Number of bits already read in the current byte while reading bit-packed values
     private int bitPackedValueOffset;
 
-    public NullsDecoder(Slice input)
+    @Override
+    public void init(Slice input)
     {
         this.input = new SimpleSliceInputStream(requireNonNull(input, "input is null"));
     }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/ZeroDefinitionLevelDecoder.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/ZeroDefinitionLevelDecoder.java
index e7d26460979d..79634780a4f5 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/ZeroDefinitionLevelDecoder.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/flat/ZeroDefinitionLevelDecoder.java
@@ -13,9 +13,14 @@
  */
 package io.trino.parquet.reader.flat;
 
+import io.airlift.slice.Slice;
+
 public class ZeroDefinitionLevelDecoder
         implements FlatDefinitionLevelDecoder
 {
+    @Override
+    public void init(Slice input) {}
+
     @Override
     public int readNext(boolean[] values, int offset, int length)
     {
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ArrayColumnWriter.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ArrayColumnWriter.java
index d2a84b4519e0..4cc187bf8298 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ArrayColumnWriter.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ArrayColumnWriter.java
@@ -16,8 +16,8 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.parquet.writer.repdef.DefLevelWriterProvider;
 import io.trino.parquet.writer.repdef.DefLevelWriterProviders;
-import io.trino.parquet.writer.repdef.RepLevelIterable;
-import io.trino.parquet.writer.repdef.RepLevelIterables;
+import io.trino.parquet.writer.repdef.RepLevelWriterProvider;
+import io.trino.parquet.writer.repdef.RepLevelWriterProviders;
 import io.trino.spi.block.ColumnarArray;
 
 import java.io.IOException;
@@ -53,9 +53,9 @@ public void writeBlock(ColumnChunk columnChunk)
                                 .addAll(columnChunk.getDefLevelWriterProviders())
                                 .add(DefLevelWriterProviders.of(columnarArray, maxDefinitionLevel))
                                 .build(),
-                        ImmutableList.<RepLevelIterable>builder()
-                                .addAll(columnChunk.getRepLevelIterables())
-                                .add(RepLevelIterables.of(columnarArray, maxRepetitionLevel))
+                        ImmutableList.<RepLevelWriterProvider>builder()
+                                .addAll(columnChunk.getRepLevelWriterProviders())
+                                .add(RepLevelWriterProviders.of(columnarArray, maxRepetitionLevel))
                                 .build()));
     }
 
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ColumnChunk.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ColumnChunk.java
index 186e5e77cba7..32912ebabb52 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ColumnChunk.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ColumnChunk.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.parquet.writer.repdef.DefLevelWriterProvider;
-import io.trino.parquet.writer.repdef.RepLevelIterable;
+import io.trino.parquet.writer.repdef.RepLevelWriterProvider;
 import io.trino.spi.block.Block;
 
 import java.util.List;
@@ -26,18 +26,18 @@ public class ColumnChunk
 {
     private final Block block;
     private final List<DefLevelWriterProvider> defLevelWriterProviders;
-    private final List<RepLevelIterable> repLevelIterables;
+    private final List<RepLevelWriterProvider> repLevelWriterProviders;
 
     ColumnChunk(Block block)
     {
         this(block, ImmutableList.of(), ImmutableList.of());
     }
 
-    ColumnChunk(Block block, List<DefLevelWriterProvider> defLevelWriterProviders, List<RepLevelIterable> repLevelIterables)
+    ColumnChunk(Block block, List<DefLevelWriterProvider> defLevelWriterProviders, List<RepLevelWriterProvider> repLevelWriterProviders)
     {
         this.block = requireNonNull(block, "block is null");
         this.defLevelWriterProviders = ImmutableList.copyOf(defLevelWriterProviders);
-        this.repLevelIterables = ImmutableList.copyOf(repLevelIterables);
+        this.repLevelWriterProviders = ImmutableList.copyOf(repLevelWriterProviders);
     }
 
     List<DefLevelWriterProvider> getDefLevelWriterProviders()
@@ -45,9 +45,9 @@ List<DefLevelWriterProvider> getDefLevelWriterProviders()
         return defLevelWriterProviders;
     }
 
-    List<RepLevelIterable> getRepLevelIterables()
+    public List<RepLevelWriterProvider> getRepLevelWriterProviders()
     {
-        return repLevelIterables;
+        return repLevelWriterProviders;
     }
 
     public Block getBlock()
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ColumnWriter.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ColumnWriter.java
index b82d4a4942a1..f81d4978ff83 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ColumnWriter.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ColumnWriter.java
@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.OptionalInt;
 
 import static java.util.Objects.requireNonNull;
 
@@ -38,10 +39,12 @@ class BufferData
     {
         private final ColumnMetaData metaData;
         private final List<ParquetDataOutput> data;
+        private final OptionalInt dictionaryPageSize;
 
-        public BufferData(List<ParquetDataOutput> data, ColumnMetaData metaData)
+        public BufferData(List<ParquetDataOutput> data, OptionalInt dictionaryPageSize, ColumnMetaData metaData)
         {
             this.data = requireNonNull(data, "data is null");
+            this.dictionaryPageSize = requireNonNull(dictionaryPageSize, "dictionaryPageSize is null");
             this.metaData = requireNonNull(metaData, "metaData is null");
         }
 
@@ -54,5 +57,10 @@ public List<ParquetDataOutput> getData()
         {
             return data;
         }
+
+        public OptionalInt getDictionaryPageSize()
+        {
+            return dictionaryPageSize;
+        }
     }
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/MapColumnWriter.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/MapColumnWriter.java
index 7a91cf1b13ed..8977a44a27a2 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/MapColumnWriter.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/MapColumnWriter.java
@@ -16,8 +16,8 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.parquet.writer.repdef.DefLevelWriterProvider;
 import io.trino.parquet.writer.repdef.DefLevelWriterProviders;
-import io.trino.parquet.writer.repdef.RepLevelIterable;
-import io.trino.parquet.writer.repdef.RepLevelIterables;
+import io.trino.parquet.writer.repdef.RepLevelWriterProvider;
+import io.trino.parquet.writer.repdef.RepLevelWriterProviders;
 import io.trino.spi.block.ColumnarMap;
 
 import java.io.IOException;
@@ -54,9 +54,9 @@ public void writeBlock(ColumnChunk columnChunk)
                 .addAll(columnChunk.getDefLevelWriterProviders())
                 .add(DefLevelWriterProviders.of(columnarMap, maxDefinitionLevel)).build();
 
-        ImmutableList<RepLevelIterable> repLevelIterables = ImmutableList.<RepLevelIterable>builder()
-                .addAll(columnChunk.getRepLevelIterables())
-                .add(RepLevelIterables.of(columnarMap, maxRepetitionLevel)).build();
+        ImmutableList<RepLevelWriterProvider> repLevelIterables = ImmutableList.<RepLevelWriterProvider>builder()
+                .addAll(columnChunk.getRepLevelWriterProviders())
+                .add(RepLevelWriterProviders.of(columnarMap, maxRepetitionLevel)).build();
 
         keyWriter.writeBlock(new ColumnChunk(columnarMap.getKeysBlock(), defLevelWriterProviders, repLevelIterables));
         valueWriter.writeBlock(new ColumnChunk(columnarMap.getValuesBlock(), defLevelWriterProviders, repLevelIterables));
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetCompressor.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetCompressor.java
index 924825e01462..e42179e0bde1 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetCompressor.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetCompressor.java
@@ -17,7 +17,6 @@
 import io.airlift.compress.snappy.SnappyCompressor;
 import io.airlift.compress.zstd.ZstdCompressor;
 import io.airlift.slice.Slices;
-import org.apache.parquet.bytes.BytesInput;
 import org.apache.parquet.format.CompressionCodec;
 
 import java.io.ByteArrayOutputStream;
@@ -68,7 +67,7 @@ public ParquetDataOutput compress(byte[] input)
             try (GZIPOutputStream outputStream = new GZIPOutputStream(byteArrayOutputStream)) {
                 outputStream.write(input, 0, input.length);
             }
-            return createDataOutput(BytesInput.from(byteArrayOutputStream));
+            return createDataOutput(byteArrayOutputStream);
         }
     }
 
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetDataOutput.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetDataOutput.java
index 8987e25384f6..24be9c5dbc17 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetDataOutput.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetDataOutput.java
@@ -15,8 +15,9 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
-import org.apache.parquet.bytes.BytesInput;
+import io.trino.plugin.base.io.ChunkedSliceOutput;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import static java.util.Objects.requireNonNull;
@@ -29,7 +30,7 @@ static ParquetDataOutput createDataOutput(Slice slice)
         return new ParquetDataOutput()
         {
             @Override
-            public long size()
+            public int size()
             {
                 return slice.length();
             }
@@ -42,22 +43,41 @@ public void writeData(SliceOutput sliceOutput)
         };
     }
 
-    static ParquetDataOutput createDataOutput(BytesInput bytesInput)
+    static ParquetDataOutput createDataOutput(ChunkedSliceOutput chunkedSliceOutput)
     {
-        requireNonNull(bytesInput, "bytesInput is null");
+        requireNonNull(chunkedSliceOutput, "chunkedSliceOutput is null");
         return new ParquetDataOutput()
         {
             @Override
-            public long size()
+            public int size()
             {
-                return bytesInput.size();
+                return chunkedSliceOutput.size();
+            }
+
+            @Override
+            public void writeData(SliceOutput sliceOutput)
+            {
+                chunkedSliceOutput.getSlices().forEach(sliceOutput::writeBytes);
+            }
+        };
+    }
+
+    static ParquetDataOutput createDataOutput(ByteArrayOutputStream byteArrayOutputStream)
+    {
+        requireNonNull(byteArrayOutputStream, "byteArrayOutputStream is null");
+        return new ParquetDataOutput()
+        {
+            @Override
+            public int size()
+            {
+                return byteArrayOutputStream.size();
             }
 
             @Override
             public void writeData(SliceOutput sliceOutput)
             {
                 try {
-                    bytesInput.writeAllTo(sliceOutput);
+                    byteArrayOutputStream.writeTo(sliceOutput);
                 }
                 catch (IOException e) {
                     throw new RuntimeException(e);
@@ -69,7 +89,7 @@ public void writeData(SliceOutput sliceOutput)
     /**
      * Number of bytes that will be written.
      */
-    long size();
+    int size();
 
     /**
      * Writes data to the output. The output must be exactly
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetMetadataUtils.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetMetadataUtils.java
new file mode 100644
index 000000000000..422688a80cde
--- /dev/null
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetMetadataUtils.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed 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 io.trino.parquet.writer;
+
+import org.apache.parquet.column.statistics.BinaryStatistics;
+import org.apache.parquet.format.Statistics;
+import org.apache.parquet.format.converter.ParquetMetadataConverter;
+import org.apache.parquet.io.api.Binary;
+
+import static com.google.common.base.Verify.verify;
+import static org.apache.parquet.format.converter.ParquetMetadataConverter.MAX_STATS_SIZE;
+import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
+import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.BINARY;
+import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY;
+
+public final class ParquetMetadataUtils
+{
+    private ParquetMetadataUtils() {}
+
+    public static <T extends Comparable<T>> Statistics toParquetStatistics(org.apache.parquet.column.statistics.Statistics<T> stats, int truncateLength)
+    {
+        // TODO Utilize https://github.com/apache/parquet-format/pull/216 when available to populate is_max_value_exact/is_min_value_exact
+        if (isTruncationPossible(stats, truncateLength)) {
+            // parquet-mr drops statistics larger than MAX_STATS_SIZE rather than truncating them.
+            // In order to ensure truncation rather than no stats, we need to use a truncateLength which would never exceed ParquetMetadataConverter.MAX_STATS_SIZE
+            verify(
+                    2L * truncateLength < MAX_STATS_SIZE,
+                    "Twice of truncateLength %s must be less than MAX_STATS_SIZE %s",
+                    truncateLength,
+                    MAX_STATS_SIZE);
+            // We need to take a lock here because CharsetValidator inside BinaryTruncator modifies a reusable dummyBuffer in-place
+            // and DEFAULT_UTF8_TRUNCATOR is a static instance, which makes this method thread unsafe.
+            // isTruncationPossible should ensure that locking is used only when we expect truncation, which is an uncommon scenario.
+            // TODO remove synchronization when we use a release with the fix https://github.com/apache/parquet-mr/pull/1154
+            synchronized (ParquetMetadataUtils.class) {
+                return ParquetMetadataConverter.toParquetStatistics(stats, truncateLength);
+            }
+        }
+        return ParquetMetadataConverter.toParquetStatistics(stats);
+    }
+
+    private static <T extends Comparable<T>> boolean isTruncationPossible(org.apache.parquet.column.statistics.Statistics<T> stats, int truncateLength)
+    {
+        PrimitiveTypeName primitiveType = stats.type().getPrimitiveTypeName();
+        if (!primitiveType.equals(BINARY) && !primitiveType.equals(FIXED_LEN_BYTE_ARRAY)) {
+            return false;
+        }
+        if (stats.isEmpty() || !stats.hasNonNullValue() || !(stats instanceof BinaryStatistics binaryStatistics)) {
+            return false;
+        }
+        // non-null value exists, so min and max can't be null
+        Binary min = binaryStatistics.genericGetMin();
+        Binary max = binaryStatistics.genericGetMax();
+        return min.length() > truncateLength || max.length() > truncateLength;
+    }
+}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetSchemaConverter.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetSchemaConverter.java
index 7100e28ef97d..d4944def35ec 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetSchemaConverter.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetSchemaConverter.java
@@ -53,6 +53,7 @@
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static org.apache.parquet.schema.LogicalTypeAnnotation.decimalType;
+import static org.apache.parquet.schema.LogicalTypeAnnotation.intType;
 import static org.apache.parquet.schema.Type.Repetition.OPTIONAL;
 import static org.apache.parquet.schema.Type.Repetition.REQUIRED;
 
@@ -144,8 +145,23 @@ private static org.apache.parquet.schema.Type getPrimitiveType(
         if (BOOLEAN.equals(type)) {
             return Types.primitive(PrimitiveType.PrimitiveTypeName.BOOLEAN, repetition).named(name);
         }
-        if (INTEGER.equals(type) || SMALLINT.equals(type) || TINYINT.equals(type)) {
-            return Types.primitive(PrimitiveType.PrimitiveTypeName.INT32, repetition).named(name);
+        // https://github.com/apache/parquet-format/blob/master/LogicalTypes.md#signed-integers
+        // INT(32, true) and INT(64, true) are implied by the int32 and int64 primitive types if no other annotation is present.
+        // Implementations may use these annotations to produce smaller in-memory representations when reading data.
+        if (TINYINT.equals(type)) {
+            return Types.primitive(PrimitiveType.PrimitiveTypeName.INT32, repetition)
+                    .as(intType(8, true))
+                    .named(name);
+        }
+        if (SMALLINT.equals(type)) {
+            return Types.primitive(PrimitiveType.PrimitiveTypeName.INT32, repetition)
+                    .as(intType(16, true))
+                    .named(name);
+        }
+        if (INTEGER.equals(type)) {
+            return Types.primitive(PrimitiveType.PrimitiveTypeName.INT32, repetition)
+                    .as(intType(32, true))
+                    .named(name);
         }
         if (type instanceof DecimalType decimalType) {
             // Apache Hive version 3 or lower does not support reading decimals encoded as INT32/INT64
@@ -170,7 +186,9 @@ private static org.apache.parquet.schema.Type getPrimitiveType(
             return Types.primitive(PrimitiveType.PrimitiveTypeName.INT32, repetition).as(LogicalTypeAnnotation.dateType()).named(name);
         }
         if (BIGINT.equals(type)) {
-            return Types.primitive(PrimitiveType.PrimitiveTypeName.INT64, repetition).named(name);
+            return Types.primitive(PrimitiveType.PrimitiveTypeName.INT64, repetition)
+                    .as(intType(64, true))
+                    .named(name);
         }
 
         if (type instanceof TimestampType timestampType) {
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetWriter.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetWriter.java
index 0c1d320eb890..1f7acbac194d 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetWriter.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetWriter.java
@@ -19,7 +19,6 @@
 import io.airlift.slice.OutputStreamSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import io.airlift.units.DataSize;
 import io.trino.parquet.Field;
 import io.trino.parquet.ParquetCorruptionException;
 import io.trino.parquet.ParquetDataSource;
@@ -30,6 +29,7 @@
 import io.trino.parquet.writer.ColumnWriter.BufferData;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.column.ParquetProperties;
 import org.apache.parquet.format.ColumnMetaData;
 import org.apache.parquet.format.CompressionCodec;
@@ -49,6 +49,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.function.Consumer;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -59,7 +60,6 @@
 import static io.airlift.slice.SizeOf.SIZE_OF_INT;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.Slices.wrappedBuffer;
-import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
 import static io.trino.parquet.ParquetTypeUtils.constructField;
 import static io.trino.parquet.ParquetTypeUtils.getColumnIO;
@@ -68,11 +68,9 @@
 import static io.trino.parquet.writer.ParquetDataOutput.createDataOutput;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
-import static java.lang.Math.toIntExact;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static java.util.Collections.nCopies;
 import static java.util.Objects.requireNonNull;
-import static org.apache.hadoop.hive.ql.io.parquet.write.DataWritableWriteSupport.WRITER_TIMEZONE;
 import static org.apache.parquet.column.ParquetProperties.WriterVersion.PARQUET_1_0;
 
 public class ParquetWriter
@@ -80,19 +78,14 @@ public class ParquetWriter
 {
     private static final int INSTANCE_SIZE = instanceSize(ParquetWriter.class);
 
-    private static final int CHUNK_MAX_BYTES = toIntExact(DataSize.of(128, MEGABYTE).toBytes());
-
     private final OutputStreamSliceOutput outputStream;
     private final ParquetWriterOptions writerOption;
     private final MessageType messageType;
-    private final String createdBy;
     private final int chunkMaxLogicalBytes;
     private final Map<List<String>, Type> primitiveTypes;
     private final CompressionCodec compressionCodec;
-    private final boolean useBatchColumnReadersForVerification;
     private final Optional<DateTimeZone> parquetTimeZone;
-
-    private final ImmutableList.Builder<RowGroup> rowGroupBuilder = ImmutableList.builder();
+    private final FileFooter fileFooter;
     private final Optional<ParquetWriteValidationBuilder> validationBuilder;
 
     private List<ColumnWriter> columnWriters;
@@ -100,6 +93,8 @@ public class ParquetWriter
     private long bufferedBytes;
     private boolean closed;
     private boolean writeHeader;
+    @Nullable
+    private FileMetaData fileMetaData;
 
     public static final Slice MAGIC = wrappedBuffer("PAR1".getBytes(US_ASCII));
 
@@ -110,7 +105,6 @@ public ParquetWriter(
             ParquetWriterOptions writerOption,
             CompressionCodec compressionCodec,
             String trinoVersion,
-            boolean useBatchColumnReadersForVerification,
             Optional<DateTimeZone> parquetTimeZone,
             Optional<ParquetWriteValidationBuilder> validationBuilder)
     {
@@ -120,15 +114,15 @@ public ParquetWriter(
         this.primitiveTypes = requireNonNull(primitiveTypes, "primitiveTypes is null");
         this.writerOption = requireNonNull(writerOption, "writerOption is null");
         this.compressionCodec = requireNonNull(compressionCodec, "compressionCodec is null");
-        this.useBatchColumnReadersForVerification = useBatchColumnReadersForVerification;
         this.parquetTimeZone = requireNonNull(parquetTimeZone, "parquetTimeZone is null");
-        this.createdBy = formatCreatedBy(requireNonNull(trinoVersion, "trinoVersion is null"));
+        String createdBy = formatCreatedBy(requireNonNull(trinoVersion, "trinoVersion is null"));
+        this.fileFooter = new FileFooter(messageType, createdBy, parquetTimeZone);
 
         recordValidation(validation -> validation.setTimeZone(parquetTimeZone.map(DateTimeZone::getID)));
         recordValidation(validation -> validation.setColumns(messageType.getColumns()));
         recordValidation(validation -> validation.setCreatedBy(createdBy));
         initColumnWriters();
-        this.chunkMaxLogicalBytes = max(1, CHUNK_MAX_BYTES / 2);
+        this.chunkMaxLogicalBytes = max(1, writerOption.getMaxRowGroupSize() / 2);
     }
 
     public long getWrittenBytes()
@@ -163,24 +157,16 @@ public void write(Page page)
         Page validationPage = page;
         recordValidation(validation -> validation.addPage(validationPage));
 
-        while (page != null) {
-            int chunkRows = min(page.getPositionCount(), writerOption.getBatchSize());
-            Page chunk = page.getRegion(0, chunkRows);
+        int writeOffset = 0;
+        while (writeOffset < page.getPositionCount()) {
+            Page chunk = page.getRegion(writeOffset, min(page.getPositionCount() - writeOffset, writerOption.getBatchSize()));
 
             // avoid chunk with huge logical size
-            while (chunkRows > 1 && chunk.getLogicalSizeInBytes() > chunkMaxLogicalBytes) {
-                chunkRows /= 2;
-                chunk = chunk.getRegion(0, chunkRows);
-            }
-
-            // Remove chunk from current page
-            if (chunkRows < page.getPositionCount()) {
-                page = page.getRegion(chunkRows, page.getPositionCount() - chunkRows);
-            }
-            else {
-                page = null;
+            while (chunk.getPositionCount() > 1 && chunk.getLogicalSizeInBytes() > chunkMaxLogicalBytes) {
+                chunk = page.getRegion(writeOffset, chunk.getPositionCount() / 2);
             }
 
+            writeOffset += chunk.getPositionCount();
             writeChunk(chunk);
         }
     }
@@ -217,6 +203,7 @@ public void close()
         try (outputStream) {
             columnWriters.forEach(ColumnWriter::close);
             flush();
+            columnWriters = ImmutableList.of();
             writeFooter();
         }
         bufferedBytes = 0;
@@ -244,6 +231,12 @@ public void validate(ParquetDataSource input)
         }
     }
 
+    public FileMetaData getFileMetaData()
+    {
+        checkState(closed, "fileMetaData is available only after writer is closed");
+        return requireNonNull(fileMetaData, "fileMetaData is null");
+    }
+
     private ParquetReader createParquetReader(ParquetDataSource input, ParquetMetadata parquetMetadata, ParquetWriteValidation writeValidation)
             throws IOException
     {
@@ -271,7 +264,7 @@ private ParquetReader createParquetReader(ParquetDataSource input, ParquetMetada
                 input,
                 parquetTimeZone.orElseThrow(),
                 newSimpleAggregatedMemoryContext(),
-                new ParquetReaderOptions().withBatchColumnReaders(useBatchColumnReadersForVerification),
+                new ParquetReaderOptions(),
                 exception -> {
                     throwIfUnchecked(exception);
                     return new RuntimeException(exception);
@@ -312,32 +305,42 @@ private void flush()
         if (rows == 0) {
             // Avoid writing empty row groups as these are ignored by the reader
             verify(
-                    bufferDataList.stream().allMatch(buffer -> buffer.getData().size() == 0),
+                    bufferDataList.stream()
+                            .flatMap(bufferData -> bufferData.getData().stream())
+                            .allMatch(dataOutput -> dataOutput.size() == 0),
                     "Buffer should be empty when there are no rows");
             return;
         }
 
         // update stats
-        long stripeStartOffset = outputStream.longSize();
-        List<ColumnMetaData> metadatas = bufferDataList.stream()
-                .map(BufferData::getMetaData)
-                .collect(toImmutableList());
-        updateRowGroups(updateColumnMetadataOffset(metadatas, stripeStartOffset));
+        long currentOffset = outputStream.longSize();
+        ImmutableList.Builder<ColumnMetaData> columnMetaDataBuilder = ImmutableList.builder();
+        for (BufferData bufferData : bufferDataList) {
+            ColumnMetaData columnMetaData = bufferData.getMetaData();
+            OptionalInt dictionaryPageSize = bufferData.getDictionaryPageSize();
+            if (dictionaryPageSize.isPresent()) {
+                columnMetaData.setDictionary_page_offset(currentOffset);
+            }
+            columnMetaData.setData_page_offset(currentOffset + dictionaryPageSize.orElse(0));
+            columnMetaDataBuilder.add(columnMetaData);
+            currentOffset += columnMetaData.getTotal_compressed_size();
+        }
+        updateRowGroups(columnMetaDataBuilder.build());
 
         // flush pages
-        bufferDataList.stream()
-                .map(BufferData::getData)
-                .flatMap(List::stream)
-                .forEach(data -> data.writeData(outputStream));
+        for (BufferData bufferData : bufferDataList) {
+            bufferData.getData()
+                    .forEach(data -> data.writeData(outputStream));
+        }
     }
 
     private void writeFooter()
             throws IOException
     {
         checkState(closed);
-        List<RowGroup> rowGroups = rowGroupBuilder.build();
-        Slice footer = getFooter(rowGroups, messageType);
-        recordValidation(validation -> validation.setRowGroups(rowGroups));
+        fileMetaData = fileFooter.createFileMetadata();
+        Slice footer = serializeFooter(fileMetaData);
+        recordValidation(validation -> validation.setRowGroups(fileMetaData.getRow_groups()));
         createDataOutput(footer).writeData(outputStream);
 
         Slice footerSize = Slices.allocate(SIZE_OF_INT);
@@ -347,32 +350,22 @@ private void writeFooter()
         createDataOutput(MAGIC).writeData(outputStream);
     }
 
-    Slice getFooter(List<RowGroup> rowGroups, MessageType messageType)
-            throws IOException
+    private void updateRowGroups(List<ColumnMetaData> columnMetaData)
     {
-        FileMetaData fileMetaData = new FileMetaData();
-        fileMetaData.setVersion(1);
-        fileMetaData.setCreated_by(createdBy);
-        fileMetaData.setSchema(MessageTypeConverter.toParquetSchema(messageType));
-        // Added based on org.apache.hadoop.hive.ql.io.parquet.write.DataWritableWriteSupport
-        parquetTimeZone.ifPresent(dateTimeZone -> fileMetaData.setKey_value_metadata(
-                ImmutableList.of(new KeyValue(WRITER_TIMEZONE).setValue(dateTimeZone.getID()))));
-        long totalRows = rowGroups.stream().mapToLong(RowGroup::getNum_rows).sum();
-        fileMetaData.setNum_rows(totalRows);
-        fileMetaData.setRow_groups(ImmutableList.copyOf(rowGroups));
+        long totalCompressedBytes = columnMetaData.stream().mapToLong(ColumnMetaData::getTotal_compressed_size).sum();
+        long totalBytes = columnMetaData.stream().mapToLong(ColumnMetaData::getTotal_uncompressed_size).sum();
+        ImmutableList<org.apache.parquet.format.ColumnChunk> columnChunks = columnMetaData.stream().map(ParquetWriter::toColumnChunk).collect(toImmutableList());
+        fileFooter.addRowGroup(new RowGroup(columnChunks, totalBytes, rows).setTotal_compressed_size(totalCompressedBytes));
+    }
 
+    private static Slice serializeFooter(FileMetaData fileMetaData)
+            throws IOException
+    {
         DynamicSliceOutput dynamicSliceOutput = new DynamicSliceOutput(40);
         Util.writeFileMetaData(fileMetaData, dynamicSliceOutput);
         return dynamicSliceOutput.slice();
     }
 
-    private void updateRowGroups(List<ColumnMetaData> columnMetaData)
-    {
-        long totalBytes = columnMetaData.stream().mapToLong(ColumnMetaData::getTotal_compressed_size).sum();
-        ImmutableList<org.apache.parquet.format.ColumnChunk> columnChunks = columnMetaData.stream().map(ParquetWriter::toColumnChunk).collect(toImmutableList());
-        rowGroupBuilder.add(new RowGroup(columnChunks, totalBytes, rows));
-    }
-
     private static org.apache.parquet.format.ColumnChunk toColumnChunk(ColumnMetaData metaData)
     {
         // TODO Not sure whether file_offset is used
@@ -381,20 +374,6 @@ private static org.apache.parquet.format.ColumnChunk toColumnChunk(ColumnMetaDat
         return columnChunk;
     }
 
-    private List<ColumnMetaData> updateColumnMetadataOffset(List<ColumnMetaData> columns, long offset)
-    {
-        ImmutableList.Builder<ColumnMetaData> builder = ImmutableList.builder();
-        long currentOffset = offset;
-        for (ColumnMetaData column : columns) {
-            ColumnMetaData columnMetaData = new ColumnMetaData(column.type, column.encodings, column.path_in_schema, column.codec, column.num_values, column.total_uncompressed_size, column.total_compressed_size, currentOffset);
-            columnMetaData.setStatistics(column.getStatistics());
-            columnMetaData.setEncoding_stats(column.getEncoding_stats());
-            builder.add(columnMetaData);
-            currentOffset += column.getTotal_compressed_size();
-        }
-        return builder.build();
-    }
-
     @VisibleForTesting
     static String formatCreatedBy(String trinoVersion)
     {
@@ -413,4 +392,45 @@ private void initColumnWriters()
 
         this.columnWriters = ParquetWriters.getColumnWriters(messageType, primitiveTypes, parquetProperties, compressionCodec, parquetTimeZone);
     }
+
+    private static class FileFooter
+    {
+        private final MessageType messageType;
+        private final String createdBy;
+        private final Optional<DateTimeZone> parquetTimeZone;
+
+        @Nullable
+        private ImmutableList.Builder<RowGroup> rowGroupBuilder = ImmutableList.builder();
+
+        private FileFooter(MessageType messageType, String createdBy, Optional<DateTimeZone> parquetTimeZone)
+        {
+            this.messageType = messageType;
+            this.createdBy = createdBy;
+            this.parquetTimeZone = parquetTimeZone;
+        }
+
+        public void addRowGroup(RowGroup rowGroup)
+        {
+            checkState(rowGroupBuilder != null, "rowGroupBuilder is null");
+            rowGroupBuilder.add(rowGroup);
+        }
+
+        public FileMetaData createFileMetadata()
+        {
+            checkState(rowGroupBuilder != null, "rowGroupBuilder is null");
+            List<RowGroup> rowGroups = rowGroupBuilder.build();
+            rowGroupBuilder = null;
+            long totalRows = rowGroups.stream().mapToLong(RowGroup::getNum_rows).sum();
+            FileMetaData fileMetaData = new FileMetaData(
+                    1,
+                    MessageTypeConverter.toParquetSchema(messageType),
+                    totalRows,
+                    ImmutableList.copyOf(rowGroups));
+            fileMetaData.setCreated_by(createdBy);
+            // Added based on org.apache.hadoop.hive.ql.io.parquet.write.DataWritableWriteSupport
+            parquetTimeZone.ifPresent(dateTimeZone -> fileMetaData.setKey_value_metadata(
+                    ImmutableList.of(new KeyValue("writer.time.zone").setValue(dateTimeZone.getID()))));
+            return fileMetaData;
+        }
+    }
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetWriterOptions.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetWriterOptions.java
index aab98abf20ff..7b7af7591ac3 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetWriterOptions.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetWriterOptions.java
@@ -13,11 +13,10 @@
  */
 package io.trino.parquet.writer;
 
+import com.google.common.primitives.Ints;
 import io.airlift.units.DataSize;
 import org.apache.parquet.hadoop.ParquetWriter;
 
-import static java.lang.Math.toIntExact;
-
 public class ParquetWriterOptions
 {
     private static final DataSize DEFAULT_MAX_ROW_GROUP_SIZE = DataSize.ofBytes(ParquetWriter.DEFAULT_BLOCK_SIZE);
@@ -35,12 +34,12 @@ public static ParquetWriterOptions.Builder builder()
 
     private ParquetWriterOptions(DataSize maxBlockSize, DataSize maxPageSize, int batchSize)
     {
-        this.maxRowGroupSize = toIntExact(maxBlockSize.toBytes());
-        this.maxPageSize = toIntExact(maxPageSize.toBytes());
+        this.maxRowGroupSize = Ints.saturatedCast(maxBlockSize.toBytes());
+        this.maxPageSize = Ints.saturatedCast(maxPageSize.toBytes());
         this.batchSize = batchSize;
     }
 
-    public long getMaxRowGroupSize()
+    public int getMaxRowGroupSize()
     {
         return maxRowGroupSize;
     }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetWriters.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetWriters.java
index 0697feec1ee3..5327c3f2706e 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetWriters.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/ParquetWriters.java
@@ -32,6 +32,7 @@
 import io.trino.parquet.writer.valuewriter.TimestampNanosValueWriter;
 import io.trino.parquet.writer.valuewriter.TimestampTzMicrosValueWriter;
 import io.trino.parquet.writer.valuewriter.TimestampTzMillisValueWriter;
+import io.trino.parquet.writer.valuewriter.TrinoValuesWriterFactory;
 import io.trino.parquet.writer.valuewriter.UuidValueWriter;
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.CharType;
@@ -91,7 +92,8 @@ static List<ColumnWriter> getColumnWriters(
             CompressionCodec compressionCodec,
             Optional<DateTimeZone> parquetTimeZone)
     {
-        WriteBuilder writeBuilder = new WriteBuilder(messageType, trinoTypes, parquetProperties, compressionCodec, parquetTimeZone);
+        TrinoValuesWriterFactory valuesWriterFactory = new TrinoValuesWriterFactory(parquetProperties);
+        WriteBuilder writeBuilder = new WriteBuilder(messageType, trinoTypes, parquetProperties, valuesWriterFactory, compressionCodec, parquetTimeZone);
         ParquetTypeVisitor.visit(messageType, writeBuilder);
         return writeBuilder.build();
     }
@@ -102,6 +104,7 @@ private static class WriteBuilder
         private final MessageType type;
         private final Map<List<String>, Type> trinoTypes;
         private final ParquetProperties parquetProperties;
+        private final TrinoValuesWriterFactory valuesWriterFactory;
         private final CompressionCodec compressionCodec;
         private final Optional<DateTimeZone> parquetTimeZone;
         private final ImmutableList.Builder<ColumnWriter> builder = ImmutableList.builder();
@@ -110,12 +113,14 @@ private static class WriteBuilder
                 MessageType messageType,
                 Map<List<String>, Type> trinoTypes,
                 ParquetProperties parquetProperties,
+                TrinoValuesWriterFactory valuesWriterFactory,
                 CompressionCodec compressionCodec,
                 Optional<DateTimeZone> parquetTimeZone)
         {
             this.type = requireNonNull(messageType, "messageType is null");
             this.trinoTypes = requireNonNull(trinoTypes, "trinoTypes is null");
             this.parquetProperties = requireNonNull(parquetProperties, "parquetProperties is null");
+            this.valuesWriterFactory = requireNonNull(valuesWriterFactory, "valuesWriterFactory is null");
             this.compressionCodec = requireNonNull(compressionCodec, "compressionCodec is null");
             this.parquetTimeZone = requireNonNull(parquetTimeZone, "parquetTimeZone is null");
         }
@@ -168,7 +173,7 @@ public ColumnWriter primitive(PrimitiveType primitive)
             Type trinoType = requireNonNull(trinoTypes.get(ImmutableList.copyOf(path)), "Trino type is null");
             return new PrimitiveColumnWriter(
                     columnDescriptor,
-                    getValueWriter(parquetProperties.newValuesWriter(columnDescriptor), trinoType, columnDescriptor.getPrimitiveType(), parquetTimeZone),
+                    getValueWriter(valuesWriterFactory.newValuesWriter(columnDescriptor), trinoType, columnDescriptor.getPrimitiveType(), parquetTimeZone),
                     parquetProperties.newDefinitionLevelWriter(columnDescriptor),
                     parquetProperties.newRepetitionLevelWriter(columnDescriptor),
                     compressionCodec,
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/PrimitiveColumnWriter.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/PrimitiveColumnWriter.java
index 444344bae4eb..d925d690288c 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/PrimitiveColumnWriter.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/PrimitiveColumnWriter.java
@@ -17,9 +17,11 @@
 import io.airlift.slice.Slices;
 import io.trino.parquet.writer.repdef.DefLevelWriterProvider;
 import io.trino.parquet.writer.repdef.DefLevelWriterProviders;
-import io.trino.parquet.writer.repdef.RepLevelIterable;
-import io.trino.parquet.writer.repdef.RepLevelIterables;
+import io.trino.parquet.writer.repdef.RepLevelWriterProvider;
+import io.trino.parquet.writer.repdef.RepLevelWriterProviders;
 import io.trino.parquet.writer.valuewriter.PrimitiveValueWriter;
+import io.trino.plugin.base.io.ChunkedSliceOutput;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.bytes.BytesInput;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.column.Encoding;
@@ -32,16 +34,13 @@
 import org.apache.parquet.format.PageType;
 import org.apache.parquet.format.converter.ParquetMetadataConverter;
 
-import javax.annotation.Nullable;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.OptionalInt;
 import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkState;
@@ -51,13 +50,19 @@
 import static io.trino.parquet.writer.ParquetDataOutput.createDataOutput;
 import static io.trino.parquet.writer.repdef.DefLevelWriterProvider.DefinitionLevelWriter;
 import static io.trino.parquet.writer.repdef.DefLevelWriterProvider.getRootDefinitionLevelWriter;
-import static java.lang.Math.toIntExact;
+import static io.trino.parquet.writer.repdef.RepLevelWriterProvider.RepetitionLevelWriter;
+import static io.trino.parquet.writer.repdef.RepLevelWriterProvider.getRootRepetitionLevelWriter;
 import static java.util.Objects.requireNonNull;
 
 public class PrimitiveColumnWriter
         implements ColumnWriter
 {
     private static final int INSTANCE_SIZE = instanceSize(PrimitiveColumnWriter.class);
+    private static final int MINIMUM_OUTPUT_BUFFER_CHUNK_SIZE = 8 * 1024;
+    private static final int MAXIMUM_OUTPUT_BUFFER_CHUNK_SIZE = 2 * 1024 * 1024;
+    // ParquetMetadataConverter.MAX_STATS_SIZE is 4096, we need a value which would guarantee that min and max
+    // don't add up to 4096 (so less than 2048). Using 1K as that is big enough for most use cases.
+    private static final int MAX_STATISTICS_LENGTH_IN_BYTES = 1024;
 
     private final ColumnDescriptor columnDescriptor;
     private final CompressionCodec compressionCodec;
@@ -86,13 +91,15 @@ public class PrimitiveColumnWriter
 
     private final int maxDefinitionLevel;
 
-    private final List<ParquetDataOutput> pageBuffer = new ArrayList<>();
+    private final ChunkedSliceOutput compressedOutputStream;
 
     @Nullable
     private final ParquetCompressor compressor;
 
     private final int pageSizeThreshold;
 
+    // Total size of compressed parquet pages and the current uncompressed page buffered in memory
+    // Used by ParquetWriter to decide when a row group is big enough to flush
     private long bufferedBytes;
     private long pageBufferedBytes;
 
@@ -107,6 +114,7 @@ public PrimitiveColumnWriter(ColumnDescriptor columnDescriptor, PrimitiveValueWr
         this.compressor = getCompressor(compressionCodec);
         this.pageSizeThreshold = pageSizeThreshold;
         this.columnStatistics = Statistics.createStats(columnDescriptor.getPrimitiveType());
+        this.compressedOutputStream = new ChunkedSliceOutput(MINIMUM_OUTPUT_BUFFER_CHUNK_SIZE, MAXIMUM_OUTPUT_BUFFER_CHUNK_SIZE);
     }
 
     @Override
@@ -129,20 +137,21 @@ public void writeBlock(ColumnChunk columnChunk)
 
         if (columnDescriptor.getMaxRepetitionLevel() > 0) {
             // write repetition levels for nested types
-            Iterator<Integer> repIterator = RepLevelIterables.getIterator(ImmutableList.<RepLevelIterable>builder()
-                    .addAll(columnChunk.getRepLevelIterables())
-                    .add(RepLevelIterables.of(columnChunk.getBlock()))
-                    .build());
-            while (repIterator.hasNext()) {
-                int next = repIterator.next();
-                repetitionLevelWriter.writeInteger(next);
-            }
+            List<RepLevelWriterProvider> repLevelWriterProviders = ImmutableList.<RepLevelWriterProvider>builder()
+                    .addAll(columnChunk.getRepLevelWriterProviders())
+                    .add(RepLevelWriterProviders.of(columnChunk.getBlock()))
+                    .build();
+            RepetitionLevelWriter rootRepetitionLevelWriter = getRootRepetitionLevelWriter(repLevelWriterProviders, repetitionLevelWriter);
+            rootRepetitionLevelWriter.writeRepetitionLevels(0);
         }
 
-        updateBufferedBytes();
-        if (bufferedBytes >= pageSizeThreshold) {
+        long currentPageBufferedBytes = getCurrentPageBufferedBytes();
+        if (currentPageBufferedBytes >= pageSizeThreshold) {
             flushCurrentPageToBuffer();
         }
+        else {
+            updateBufferedBytes(currentPageBufferedBytes);
+        }
     }
 
     @Override
@@ -156,7 +165,8 @@ public List<BufferData> getBuffer()
             throws IOException
     {
         checkState(closed);
-        return ImmutableList.of(new BufferData(getDataStreams(), getColumnMetaData()));
+        DataStreams dataStreams = getDataStreams();
+        return ImmutableList.of(new BufferData(dataStreams.data(), dataStreams.dictionaryPageSize(), getColumnMetaData()));
     }
 
     // Returns ColumnMetaData that offset is invalid
@@ -173,7 +183,7 @@ private ColumnMetaData getColumnMetaData()
                 totalUnCompressedSize,
                 totalCompressedSize,
                 -1);
-        columnMetaData.setStatistics(ParquetMetadataConverter.toParquetStatistics(columnStatistics));
+        columnMetaData.setStatistics(ParquetMetadataUtils.toParquetStatistics(columnStatistics, MAX_STATISTICS_LENGTH_IN_BYTES));
         ImmutableList.Builder<PageEncodingStats> pageEncodingStats = ImmutableList.builder();
         dataPagesWithEncoding.entrySet().stream()
                 .map(encodingAndCount -> new PageEncodingStats(PageType.DATA_PAGE, encodingAndCount.getKey(), encodingAndCount.getValue()))
@@ -197,36 +207,35 @@ private void flushCurrentPageToBuffer()
                 definitionLevelWriter.getBytes(),
                 primitiveValueWriter.getBytes())
                 .toByteArray();
-        long uncompressedSize = pageDataBytes.length;
+        int uncompressedSize = pageDataBytes.length;
         ParquetDataOutput pageData = (compressor != null)
                 ? compressor.compress(pageDataBytes)
                 : createDataOutput(Slices.wrappedBuffer(pageDataBytes));
-        long compressedSize = pageData.size();
+        int compressedSize = pageData.size();
 
         Statistics<?> statistics = primitiveValueWriter.getStatistics();
         statistics.incrementNumNulls(currentPageNullCounts);
         columnStatistics.mergeStatistics(statistics);
 
-        ByteArrayOutputStream pageHeaderOutputStream = new ByteArrayOutputStream();
-        parquetMetadataConverter.writeDataPageV1Header(toIntExact(uncompressedSize),
-                toIntExact(compressedSize),
+        int writtenBytesSoFar = compressedOutputStream.size();
+        parquetMetadataConverter.writeDataPageV1Header(uncompressedSize,
+                compressedSize,
                 valueCount,
                 repetitionLevelWriter.getEncoding(),
                 definitionLevelWriter.getEncoding(),
                 primitiveValueWriter.getEncoding(),
-                pageHeaderOutputStream);
-        ParquetDataOutput pageHeader = createDataOutput(BytesInput.from(pageHeaderOutputStream));
+                compressedOutputStream);
+        int pageHeaderSize = compressedOutputStream.size() - writtenBytesSoFar;
 
         dataPagesWithEncoding.merge(parquetMetadataConverter.getEncoding(primitiveValueWriter.getEncoding()), 1, Integer::sum);
 
         // update total stats
-        totalUnCompressedSize += pageHeader.size() + uncompressedSize;
-        long pageCompressedSize = pageHeader.size() + compressedSize;
+        totalUnCompressedSize += pageHeaderSize + uncompressedSize;
+        int pageCompressedSize = pageHeaderSize + compressedSize;
         totalCompressedSize += pageCompressedSize;
         totalValues += valueCount;
 
-        pageBuffer.add(pageHeader);
-        pageBuffer.add(pageData);
+        pageData.writeData(compressedOutputStream);
         pageBufferedBytes += pageCompressedSize;
 
         // Add encoding should be called after ValuesWriter#getBytes() and before ValuesWriter#reset()
@@ -241,49 +250,48 @@ private void flushCurrentPageToBuffer()
         repetitionLevelWriter.reset();
         definitionLevelWriter.reset();
         primitiveValueWriter.reset();
-        updateBufferedBytes();
+        updateBufferedBytes(getCurrentPageBufferedBytes());
     }
 
-    private List<ParquetDataOutput> getDataStreams()
+    private DataStreams getDataStreams()
             throws IOException
     {
-        List<ParquetDataOutput> dictPage = new ArrayList<>();
+        ImmutableList.Builder<ParquetDataOutput> outputs = ImmutableList.builder();
         if (valueCount > 0) {
             flushCurrentPageToBuffer();
         }
         // write dict page if possible
         DictionaryPage dictionaryPage = primitiveValueWriter.toDictPageAndClose();
+        OptionalInt dictionaryPageSize = OptionalInt.empty();
         if (dictionaryPage != null) {
-            long uncompressedSize = dictionaryPage.getUncompressedSize();
+            int uncompressedSize = dictionaryPage.getUncompressedSize();
             byte[] pageBytes = dictionaryPage.getBytes().toByteArray();
             ParquetDataOutput pageData = compressor != null
                     ? compressor.compress(pageBytes)
                     : createDataOutput(Slices.wrappedBuffer(pageBytes));
-            long compressedSize = pageData.size();
+            int compressedSize = pageData.size();
 
             ByteArrayOutputStream dictStream = new ByteArrayOutputStream();
             parquetMetadataConverter.writeDictionaryPageHeader(
-                    toIntExact(uncompressedSize),
-                    toIntExact(compressedSize),
+                    uncompressedSize,
+                    compressedSize,
                     dictionaryPage.getDictionarySize(),
                     dictionaryPage.getEncoding(),
                     dictStream);
-            ParquetDataOutput pageHeader = createDataOutput(BytesInput.from(dictStream));
-            dictPage.add(pageHeader);
-            dictPage.add(pageData);
+            ParquetDataOutput pageHeader = createDataOutput(dictStream);
+            outputs.add(pageHeader);
+            outputs.add(pageData);
             totalCompressedSize += pageHeader.size() + compressedSize;
             totalUnCompressedSize += pageHeader.size() + uncompressedSize;
             dictionaryPagesWithEncoding.merge(new ParquetMetadataConverter().getEncoding(dictionaryPage.getEncoding()), 1, Integer::sum);
+            dictionaryPageSize = OptionalInt.of(pageHeader.size() + compressedSize);
 
             primitiveValueWriter.resetDictionary();
-            updateBufferedBytes();
         }
         getDataStreamsCalled = true;
 
-        return ImmutableList.<ParquetDataOutput>builder()
-                .addAll(dictPage)
-                .addAll(pageBuffer)
-                .build();
+        outputs.add(createDataOutput(compressedOutputStream));
+        return new DataStreams(outputs.build(), dictionaryPageSize);
     }
 
     @Override
@@ -296,16 +304,23 @@ public long getBufferedBytes()
     public long getRetainedBytes()
     {
         return INSTANCE_SIZE +
+                compressedOutputStream.getRetainedSize() +
                 primitiveValueWriter.getAllocatedSize() +
                 definitionLevelWriter.getAllocatedSize() +
                 repetitionLevelWriter.getAllocatedSize();
     }
 
-    private void updateBufferedBytes()
+    private void updateBufferedBytes(long currentPageBufferedBytes)
     {
-        bufferedBytes = pageBufferedBytes +
-                definitionLevelWriter.getBufferedSize() +
+        bufferedBytes = pageBufferedBytes + currentPageBufferedBytes;
+    }
+
+    private long getCurrentPageBufferedBytes()
+    {
+        return definitionLevelWriter.getBufferedSize() +
                 repetitionLevelWriter.getBufferedSize() +
                 primitiveValueWriter.getBufferedSize();
     }
+
+    private record DataStreams(List<ParquetDataOutput> data, OptionalInt dictionaryPageSize) {}
 }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/StructColumnWriter.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/StructColumnWriter.java
index accf2ca78060..181c1942ea35 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/StructColumnWriter.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/StructColumnWriter.java
@@ -16,16 +16,15 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.parquet.writer.repdef.DefLevelWriterProvider;
 import io.trino.parquet.writer.repdef.DefLevelWriterProviders;
-import io.trino.parquet.writer.repdef.RepLevelIterable;
-import io.trino.parquet.writer.repdef.RepLevelIterables;
+import io.trino.parquet.writer.repdef.RepLevelWriterProvider;
+import io.trino.parquet.writer.repdef.RepLevelWriterProviders;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.ColumnarRow;
+import io.trino.spi.block.RowBlock;
 
 import java.io.IOException;
 import java.util.List;
 
 import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
 import static java.util.Objects.requireNonNull;
 import static org.apache.parquet.Preconditions.checkArgument;
 
@@ -47,22 +46,23 @@ public StructColumnWriter(List<ColumnWriter> columnWriters, int maxDefinitionLev
     public void writeBlock(ColumnChunk columnChunk)
             throws IOException
     {
-        ColumnarRow columnarRow = toColumnarRow(columnChunk.getBlock());
-        checkArgument(columnarRow.getFieldCount() == columnWriters.size(), "ColumnarRow field size %s is not equal to columnWriters size %s", columnarRow.getFieldCount(), columnWriters.size());
+        Block block = columnChunk.getBlock();
+        List<Block> fields = RowBlock.getNullSuppressedRowFieldsFromBlock(block);
+        checkArgument(fields.size() == columnWriters.size(), "Row field size %s is not equal to columnWriters size %s", fields.size(), columnWriters.size());
 
         List<DefLevelWriterProvider> defLevelWriterProviders = ImmutableList.<DefLevelWriterProvider>builder()
                 .addAll(columnChunk.getDefLevelWriterProviders())
-                .add(DefLevelWriterProviders.of(columnarRow, maxDefinitionLevel))
+                .add(DefLevelWriterProviders.of(block, maxDefinitionLevel))
                 .build();
-        List<RepLevelIterable> repLevelIterables = ImmutableList.<RepLevelIterable>builder()
-                .addAll(columnChunk.getRepLevelIterables())
-                .add(RepLevelIterables.of(columnChunk.getBlock()))
+        List<RepLevelWriterProvider> repLevelWriterProviders = ImmutableList.<RepLevelWriterProvider>builder()
+                .addAll(columnChunk.getRepLevelWriterProviders())
+                .add(RepLevelWriterProviders.of(block))
                 .build();
 
         for (int i = 0; i < columnWriters.size(); ++i) {
             ColumnWriter columnWriter = columnWriters.get(i);
-            Block block = columnarRow.getField(i);
-            columnWriter.writeBlock(new ColumnChunk(block, defLevelWriterProviders, repLevelIterables));
+            Block field = fields.get(i);
+            columnWriter.writeBlock(new ColumnChunk(field, defLevelWriterProviders, repLevelWriterProviders));
         }
     }
 
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/DefLevelWriterProviders.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/DefLevelWriterProviders.java
index 7de391070c78..5bed0cb34ab2 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/DefLevelWriterProviders.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/DefLevelWriterProviders.java
@@ -13,10 +13,12 @@
  */
 package io.trino.parquet.writer.repdef;
 
+import io.trino.spi.block.ArrayBlock;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.ColumnarArray;
 import io.trino.spi.block.ColumnarMap;
-import io.trino.spi.block.ColumnarRow;
+import io.trino.spi.block.MapBlock;
+import io.trino.spi.block.RowBlock;
 import org.apache.parquet.column.values.ValuesWriter;
 
 import java.util.Optional;
@@ -31,14 +33,12 @@ private DefLevelWriterProviders() {}
 
     public static DefLevelWriterProvider of(Block block, int maxDefinitionLevel)
     {
+        if (block.getUnderlyingValueBlock() instanceof RowBlock) {
+            return new RowDefLevelWriterProvider(block, maxDefinitionLevel);
+        }
         return new PrimitiveDefLevelWriterProvider(block, maxDefinitionLevel);
     }
 
-    public static DefLevelWriterProvider of(ColumnarRow columnarRow, int maxDefinitionLevel)
-    {
-        return new ColumnRowDefLevelWriterProvider(columnarRow, maxDefinitionLevel);
-    }
-
     public static DefLevelWriterProvider of(ColumnarArray columnarArray, int maxDefinitionLevel)
     {
         return new ColumnArrayDefLevelWriterProvider(columnarArray, maxDefinitionLevel);
@@ -59,6 +59,9 @@ static class PrimitiveDefLevelWriterProvider
         {
             this.block = requireNonNull(block, "block is null");
             this.maxDefinitionLevel = maxDefinitionLevel;
+            checkArgument(!(block.getUnderlyingValueBlock() instanceof RowBlock), "block is a row block");
+            checkArgument(!(block.getUnderlyingValueBlock() instanceof ArrayBlock), "block is an array block");
+            checkArgument(!(block.getUnderlyingValueBlock() instanceof MapBlock), "block is a map block");
         }
 
         @Override
@@ -100,16 +103,17 @@ public ValuesCount writeDefinitionLevels(int positionsCount)
         }
     }
 
-    static class ColumnRowDefLevelWriterProvider
+    static class RowDefLevelWriterProvider
             implements DefLevelWriterProvider
     {
-        private final ColumnarRow columnarRow;
+        private final Block block;
         private final int maxDefinitionLevel;
 
-        ColumnRowDefLevelWriterProvider(ColumnarRow columnarRow, int maxDefinitionLevel)
+        RowDefLevelWriterProvider(Block block, int maxDefinitionLevel)
         {
-            this.columnarRow = requireNonNull(columnarRow, "columnarRow is null");
+            this.block = requireNonNull(block, "block is null");
             this.maxDefinitionLevel = maxDefinitionLevel;
+            checkArgument(block.getUnderlyingValueBlock() instanceof RowBlock, "block is not a row block");
         }
 
         @Override
@@ -125,21 +129,21 @@ public DefinitionLevelWriter getDefinitionLevelWriter(Optional<DefinitionLevelWr
                 @Override
                 public ValuesCount writeDefinitionLevels()
                 {
-                    return writeDefinitionLevels(columnarRow.getPositionCount());
+                    return writeDefinitionLevels(block.getPositionCount());
                 }
 
                 @Override
                 public ValuesCount writeDefinitionLevels(int positionsCount)
                 {
-                    checkValidPosition(offset, positionsCount, columnarRow.getPositionCount());
-                    if (!columnarRow.mayHaveNull()) {
+                    checkValidPosition(offset, positionsCount, block.getPositionCount());
+                    if (!block.mayHaveNull()) {
                         offset += positionsCount;
                         return nestedWriter.writeDefinitionLevels(positionsCount);
                     }
                     int maxDefinitionValuesCount = 0;
                     int totalValuesCount = 0;
                     for (int position = offset; position < offset + positionsCount; ) {
-                        if (columnarRow.isNull(position)) {
+                        if (block.isNull(position)) {
                             encoder.writeInteger(maxDefinitionLevel - 1);
                             totalValuesCount++;
                             position++;
@@ -147,7 +151,7 @@ public ValuesCount writeDefinitionLevels(int positionsCount)
                         else {
                             int consecutiveNonNullsCount = 1;
                             position++;
-                            while (position < offset + positionsCount && !columnarRow.isNull(position)) {
+                            while (position < offset + positionsCount && !block.isNull(position)) {
                                 position++;
                                 consecutiveNonNullsCount++;
                             }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/RepLevelWriterProvider.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/RepLevelWriterProvider.java
new file mode 100644
index 000000000000..c835c9060c54
--- /dev/null
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/RepLevelWriterProvider.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed 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 io.trino.parquet.writer.repdef;
+
+import com.google.common.collect.Iterables;
+import org.apache.parquet.column.values.ValuesWriter;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface RepLevelWriterProvider
+{
+    RepetitionLevelWriter getRepetitionLevelWriter(Optional<RepetitionLevelWriter> nestedWriter, ValuesWriter encoder);
+
+    /**
+     * Parent repetition level marks at which level either:
+     * 1. A new collection starts
+     * 2. A collection is null or empty
+     * 3. A primitive column stays
+     */
+    interface RepetitionLevelWriter
+    {
+        void writeRepetitionLevels(int parentLevel, int positionsCount);
+
+        void writeRepetitionLevels(int parentLevel);
+    }
+
+    static RepetitionLevelWriter getRootRepetitionLevelWriter(List<RepLevelWriterProvider> repLevelWriterProviders, ValuesWriter encoder)
+    {
+        // Constructs hierarchy of RepetitionLevelWriter from leaf to root
+        RepetitionLevelWriter rootRepetitionLevelWriter = Iterables.getLast(repLevelWriterProviders)
+                .getRepetitionLevelWriter(Optional.empty(), encoder);
+        for (int nestedLevel = repLevelWriterProviders.size() - 2; nestedLevel >= 0; nestedLevel--) {
+            RepetitionLevelWriter nestedWriter = rootRepetitionLevelWriter;
+            rootRepetitionLevelWriter = repLevelWriterProviders.get(nestedLevel)
+                    .getRepetitionLevelWriter(Optional.of(nestedWriter), encoder);
+        }
+        return rootRepetitionLevelWriter;
+    }
+}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/RepLevelWriterProviders.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/RepLevelWriterProviders.java
new file mode 100644
index 000000000000..a8ab99dc3366
--- /dev/null
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/RepLevelWriterProviders.java
@@ -0,0 +1,284 @@
+/*
+ * Licensed 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 io.trino.parquet.writer.repdef;
+
+import io.trino.spi.block.ArrayBlock;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.ColumnarArray;
+import io.trino.spi.block.ColumnarMap;
+import io.trino.spi.block.MapBlock;
+import io.trino.spi.block.RowBlock;
+import org.apache.parquet.column.values.ValuesWriter;
+
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+public class RepLevelWriterProviders
+{
+    private RepLevelWriterProviders() {}
+
+    public static RepLevelWriterProvider of(Block block)
+    {
+        if (block.getUnderlyingValueBlock() instanceof RowBlock) {
+            return new RowRepLevelWriterProvider(block);
+        }
+        return new PrimitiveRepLevelWriterProvider(block);
+    }
+
+    public static RepLevelWriterProvider of(ColumnarArray columnarArray, int maxRepetitionLevel)
+    {
+        return new ColumnArrayRepLevelWriterProvider(columnarArray, maxRepetitionLevel);
+    }
+
+    public static RepLevelWriterProvider of(ColumnarMap columnarMap, int maxRepetitionLevel)
+    {
+        return new ColumnMapRepLevelWriterProvider(columnarMap, maxRepetitionLevel);
+    }
+
+    static class PrimitiveRepLevelWriterProvider
+            implements RepLevelWriterProvider
+    {
+        private final Block block;
+
+        PrimitiveRepLevelWriterProvider(Block block)
+        {
+            this.block = requireNonNull(block, "block is null");
+            checkArgument(!(block.getUnderlyingValueBlock() instanceof RowBlock), "block is a row block");
+            checkArgument(!(block.getUnderlyingValueBlock() instanceof ArrayBlock), "block is an array block");
+            checkArgument(!(block.getUnderlyingValueBlock() instanceof MapBlock), "block is a map block");
+        }
+
+        @Override
+        public RepetitionLevelWriter getRepetitionLevelWriter(Optional<RepetitionLevelWriter> nestedWriter, ValuesWriter encoder)
+        {
+            checkArgument(nestedWriter.isEmpty(), "nestedWriter should be empty for primitive repetition level writer");
+            return new RepetitionLevelWriter()
+            {
+                private int offset;
+
+                @Override
+                public void writeRepetitionLevels(int parentLevel)
+                {
+                    writeRepetitionLevels(parentLevel, block.getPositionCount());
+                }
+
+                @Override
+                public void writeRepetitionLevels(int parentLevel, int positionsCount)
+                {
+                    checkValidPosition(offset, positionsCount, block.getPositionCount());
+                    for (int i = 0; i < positionsCount; i++) {
+                        encoder.writeInteger(parentLevel);
+                    }
+                    offset += positionsCount;
+                }
+            };
+        }
+    }
+
+    static class RowRepLevelWriterProvider
+            implements RepLevelWriterProvider
+    {
+        private final Block block;
+
+        RowRepLevelWriterProvider(Block block)
+        {
+            this.block = requireNonNull(block, "block is null");
+            checkArgument(block.getUnderlyingValueBlock() instanceof RowBlock, "block is not a row block");
+        }
+
+        @Override
+        public RepetitionLevelWriter getRepetitionLevelWriter(Optional<RepetitionLevelWriter> nestedWriterOptional, ValuesWriter encoder)
+        {
+            checkArgument(nestedWriterOptional.isPresent(), "nestedWriter should be present for column row repetition level writer");
+            return new RepetitionLevelWriter()
+            {
+                private final RepetitionLevelWriter nestedWriter = nestedWriterOptional.orElseThrow();
+
+                private int offset;
+
+                @Override
+                public void writeRepetitionLevels(int parentLevel)
+                {
+                    writeRepetitionLevels(parentLevel, block.getPositionCount());
+                }
+
+                @Override
+                public void writeRepetitionLevels(int parentLevel, int positionsCount)
+                {
+                    checkValidPosition(offset, positionsCount, block.getPositionCount());
+                    if (!block.mayHaveNull()) {
+                        nestedWriter.writeRepetitionLevels(parentLevel, positionsCount);
+                        offset += positionsCount;
+                        return;
+                    }
+
+                    for (int position = offset; position < offset + positionsCount; ) {
+                        if (block.isNull(position)) {
+                            encoder.writeInteger(parentLevel);
+                            position++;
+                        }
+                        else {
+                            int consecutiveNonNullsCount = 1;
+                            position++;
+                            while (position < offset + positionsCount && !block.isNull(position)) {
+                                position++;
+                                consecutiveNonNullsCount++;
+                            }
+                            nestedWriter.writeRepetitionLevels(parentLevel, consecutiveNonNullsCount);
+                        }
+                    }
+                    offset += positionsCount;
+                }
+            };
+        }
+    }
+
+    static class ColumnMapRepLevelWriterProvider
+            implements RepLevelWriterProvider
+    {
+        private final ColumnarMap columnarMap;
+        private final int maxRepetitionLevel;
+
+        ColumnMapRepLevelWriterProvider(ColumnarMap columnarMap, int maxRepetitionLevel)
+        {
+            this.columnarMap = requireNonNull(columnarMap, "columnarMap is null");
+            this.maxRepetitionLevel = maxRepetitionLevel;
+        }
+
+        @Override
+        public RepetitionLevelWriter getRepetitionLevelWriter(Optional<RepetitionLevelWriter> nestedWriterOptional, ValuesWriter encoder)
+        {
+            checkArgument(nestedWriterOptional.isPresent(), "nestedWriter should be present for column map repetition level writer");
+            return new RepetitionLevelWriter()
+            {
+                private final RepetitionLevelWriter nestedWriter = nestedWriterOptional.orElseThrow();
+
+                private int offset;
+
+                @Override
+                public void writeRepetitionLevels(int parentLevel)
+                {
+                    writeRepetitionLevels(parentLevel, columnarMap.getPositionCount());
+                }
+
+                @Override
+                public void writeRepetitionLevels(int parentLevel, int positionsCount)
+                {
+                    checkValidPosition(offset, positionsCount, columnarMap.getPositionCount());
+                    if (!columnarMap.mayHaveNull()) {
+                        for (int position = offset; position < offset + positionsCount; position++) {
+                            writeNonNullableLevels(parentLevel, position);
+                        }
+                    }
+                    else {
+                        for (int position = offset; position < offset + positionsCount; position++) {
+                            if (columnarMap.isNull(position)) {
+                                encoder.writeInteger(parentLevel);
+                                continue;
+                            }
+                            writeNonNullableLevels(parentLevel, position);
+                        }
+                    }
+                    offset += positionsCount;
+                }
+
+                private void writeNonNullableLevels(int parentLevel, int position)
+                {
+                    int entryLength = columnarMap.getEntryCount(position);
+                    if (entryLength == 0) {
+                        encoder.writeInteger(parentLevel);
+                    }
+                    else {
+                        nestedWriter.writeRepetitionLevels(parentLevel, 1);
+                        nestedWriter.writeRepetitionLevels(maxRepetitionLevel, entryLength - 1);
+                    }
+                }
+            };
+        }
+    }
+
+    static class ColumnArrayRepLevelWriterProvider
+            implements RepLevelWriterProvider
+    {
+        private final ColumnarArray columnarArray;
+        private final int maxRepetitionLevel;
+
+        ColumnArrayRepLevelWriterProvider(ColumnarArray columnarArray, int maxRepetitionLevel)
+        {
+            this.columnarArray = requireNonNull(columnarArray, "columnarArray is null");
+            this.maxRepetitionLevel = maxRepetitionLevel;
+        }
+
+        @Override
+        public RepetitionLevelWriter getRepetitionLevelWriter(Optional<RepetitionLevelWriter> nestedWriterOptional, ValuesWriter encoder)
+        {
+            checkArgument(nestedWriterOptional.isPresent(), "nestedWriter should be present for column map repetition level writer");
+            return new RepetitionLevelWriter()
+            {
+                private final RepetitionLevelWriter nestedWriter = nestedWriterOptional.orElseThrow();
+
+                private int offset;
+
+                @Override
+                public void writeRepetitionLevels(int parentLevel)
+                {
+                    writeRepetitionLevels(parentLevel, columnarArray.getPositionCount());
+                }
+
+                @Override
+                public void writeRepetitionLevels(int parentLevel, int positionsCount)
+                {
+                    checkValidPosition(offset, positionsCount, columnarArray.getPositionCount());
+                    if (!columnarArray.mayHaveNull()) {
+                        for (int position = offset; position < offset + positionsCount; position++) {
+                            writeNonNullableLevels(parentLevel, position);
+                        }
+                    }
+                    else {
+                        for (int position = offset; position < offset + positionsCount; position++) {
+                            if (columnarArray.isNull(position)) {
+                                encoder.writeInteger(parentLevel);
+                                continue;
+                            }
+                            writeNonNullableLevels(parentLevel, position);
+                        }
+                    }
+                    offset += positionsCount;
+                }
+
+                private void writeNonNullableLevels(int parentLevel, int position)
+                {
+                    int arrayLength = columnarArray.getLength(position);
+                    if (arrayLength == 0) {
+                        encoder.writeInteger(parentLevel);
+                    }
+                    else {
+                        nestedWriter.writeRepetitionLevels(parentLevel, 1);
+                        nestedWriter.writeRepetitionLevels(maxRepetitionLevel, arrayLength - 1);
+                    }
+                }
+            };
+        }
+    }
+
+    private static void checkValidPosition(int offset, int positionsCount, int totalPositionsCount)
+    {
+        if (offset < 0 || positionsCount < 0 || offset + positionsCount > totalPositionsCount) {
+            throw new IndexOutOfBoundsException(format("Invalid offset %s and positionsCount %s in block with %s positions", offset, positionsCount, totalPositionsCount));
+        }
+    }
+}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/DateValueWriter.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/DateValueWriter.java
index 02ff365024ea..974950b1b67f 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/DateValueWriter.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/DateValueWriter.java
@@ -36,7 +36,7 @@ public void write(Block block)
     {
         for (int position = 0; position < block.getPositionCount(); position++) {
             if (!block.isNull(position)) {
-                int value = (int) DATE.getLong(block, position);
+                int value = DATE.getInt(block, position);
                 valuesWriter.writeInteger(value);
                 getStatistics().updateStats(value);
             }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/DictionaryFallbackValuesWriter.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/DictionaryFallbackValuesWriter.java
new file mode 100644
index 000000000000..305a591f4fea
--- /dev/null
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/DictionaryFallbackValuesWriter.java
@@ -0,0 +1,234 @@
+/*
+ * Licensed 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 io.trino.parquet.writer.valuewriter;
+
+import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nullable;
+import org.apache.parquet.bytes.BytesInput;
+import org.apache.parquet.column.Encoding;
+import org.apache.parquet.column.page.DictionaryPage;
+import org.apache.parquet.column.values.ValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter;
+import org.apache.parquet.io.api.Binary;
+
+import static com.google.common.base.Verify.verify;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Based on org.apache.parquet.column.values.fallback.FallbackValuesWriter
+ */
+public class DictionaryFallbackValuesWriter
+        extends ValuesWriter
+{
+    private final ValuesWriter fallBackWriter;
+
+    private boolean fellBackAlready;
+    private ValuesWriter currentWriter;
+    @Nullable
+    private DictionaryValuesWriter initialWriter;
+    private boolean initialUsedAndHadDictionary;
+    /* size of raw data, even if dictionary is used, it will not have effect on raw data size, it is used to decide
+     * if fall back to plain encoding is better by comparing rawDataByteSize with Encoded data size
+     * It's also used in getBufferedSize, so the page will be written based on raw data size
+     */
+    private long rawDataByteSize;
+    // indicates if this is the first page being processed
+    private boolean firstPage = true;
+
+    public DictionaryFallbackValuesWriter(DictionaryValuesWriter initialWriter, ValuesWriter fallBackWriter)
+    {
+        super();
+        this.initialWriter = initialWriter;
+        this.fallBackWriter = fallBackWriter;
+        this.currentWriter = initialWriter;
+    }
+
+    @Override
+    public long getBufferedSize()
+    {
+        // use raw data size to decide if we want to flush the page
+        // so the actual size of the page written could be much more smaller
+        // due to dictionary encoding. This prevents page being too big when fallback happens.
+        return rawDataByteSize;
+    }
+
+    @Override
+    public BytesInput getBytes()
+    {
+        if (!fellBackAlready && firstPage) {
+            // we use the first page to decide if we're going to use this encoding
+            BytesInput bytes = initialWriter.getBytes();
+            if (!initialWriter.isCompressionSatisfying(rawDataByteSize, bytes.size())) {
+                fallBack();
+                // Since fallback happened on first page itself, we can drop the contents of initialWriter
+                initialWriter.close();
+                initialWriter = null;
+                verify(!initialUsedAndHadDictionary, "initialUsedAndHadDictionary should be false when falling back to PLAIN in first page");
+            }
+            else {
+                return bytes;
+            }
+        }
+        return currentWriter.getBytes();
+    }
+
+    @Override
+    public Encoding getEncoding()
+    {
+        Encoding encoding = currentWriter.getEncoding();
+        if (!fellBackAlready && !initialUsedAndHadDictionary) {
+            initialUsedAndHadDictionary = encoding.usesDictionary();
+        }
+        return encoding;
+    }
+
+    @Override
+    public void reset()
+    {
+        rawDataByteSize = 0;
+        firstPage = false;
+        currentWriter.reset();
+    }
+
+    @Override
+    public void close()
+    {
+        if (initialWriter != null) {
+            initialWriter.close();
+        }
+        fallBackWriter.close();
+    }
+
+    @Override
+    public DictionaryPage toDictPageAndClose()
+    {
+        if (initialUsedAndHadDictionary) {
+            return initialWriter.toDictPageAndClose();
+        }
+        else {
+            return currentWriter.toDictPageAndClose();
+        }
+    }
+
+    @Override
+    public void resetDictionary()
+    {
+        if (initialUsedAndHadDictionary) {
+            initialWriter.resetDictionary();
+        }
+        else {
+            currentWriter.resetDictionary();
+        }
+        currentWriter = initialWriter;
+        fellBackAlready = false;
+        initialUsedAndHadDictionary = false;
+        firstPage = true;
+    }
+
+    @Override
+    public long getAllocatedSize()
+    {
+        return fallBackWriter.getAllocatedSize() + (initialWriter != null ? initialWriter.getAllocatedSize() : 0);
+    }
+
+    @Override
+    public String memUsageString(String prefix)
+    {
+        return String.format(
+                "%s FallbackValuesWriter{\n"
+                        + "%s\n"
+                        + "%s\n"
+                        + "%s}\n",
+                prefix,
+                initialWriter != null ? initialWriter.memUsageString(prefix + " initial:") : "",
+                fallBackWriter.memUsageString(prefix + " fallback:"),
+                prefix);
+    }
+
+    // passthrough writing the value
+    @Override
+    public void writeByte(int value)
+    {
+        rawDataByteSize += Byte.BYTES;
+        currentWriter.writeByte(value);
+        checkFallback();
+    }
+
+    @Override
+    public void writeBytes(Binary value)
+    {
+        // For raw data, length(4 bytes int) is stored, followed by the binary content itself
+        rawDataByteSize += value.length() + Integer.BYTES;
+        currentWriter.writeBytes(value);
+        checkFallback();
+    }
+
+    @Override
+    public void writeInteger(int value)
+    {
+        rawDataByteSize += Integer.BYTES;
+        currentWriter.writeInteger(value);
+        checkFallback();
+    }
+
+    @Override
+    public void writeLong(long value)
+    {
+        rawDataByteSize += Long.BYTES;
+        currentWriter.writeLong(value);
+        checkFallback();
+    }
+
+    @Override
+    public void writeFloat(float value)
+    {
+        rawDataByteSize += Float.BYTES;
+        currentWriter.writeFloat(value);
+        checkFallback();
+    }
+
+    @Override
+    public void writeDouble(double value)
+    {
+        rawDataByteSize += Double.BYTES;
+        currentWriter.writeDouble(value);
+        checkFallback();
+    }
+
+    @VisibleForTesting
+    public DictionaryValuesWriter getInitialWriter()
+    {
+        return requireNonNull(initialWriter, "initialWriter is null");
+    }
+
+    @VisibleForTesting
+    public ValuesWriter getFallBackWriter()
+    {
+        return fallBackWriter;
+    }
+
+    private void checkFallback()
+    {
+        if (!fellBackAlready && initialWriter.shouldFallBack()) {
+            fallBack();
+        }
+    }
+
+    private void fallBack()
+    {
+        fellBackAlready = true;
+        initialWriter.fallBackAllValuesTo(fallBackWriter);
+        currentWriter = fallBackWriter;
+    }
+}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/RealValueWriter.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/RealValueWriter.java
index fe3850a2ddf4..45dc82e49471 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/RealValueWriter.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/RealValueWriter.java
@@ -18,8 +18,6 @@
 import org.apache.parquet.schema.PrimitiveType;
 
 import static io.trino.spi.type.RealType.REAL;
-import static java.lang.Float.intBitsToFloat;
-import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
 public class RealValueWriter
@@ -38,7 +36,7 @@ public void write(Block block)
     {
         for (int i = 0; i < block.getPositionCount(); i++) {
             if (!block.isNull(i)) {
-                float value = intBitsToFloat(toIntExact(REAL.getLong(block, i)));
+                float value = REAL.getFloat(block, i);
                 valuesWriter.writeFloat(value);
                 getStatistics().updateStats(value);
             }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/TrinoValuesWriterFactory.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/TrinoValuesWriterFactory.java
new file mode 100644
index 000000000000..362ee18c3a8f
--- /dev/null
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/TrinoValuesWriterFactory.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed 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 io.trino.parquet.writer.valuewriter;
+
+import org.apache.parquet.column.ColumnDescriptor;
+import org.apache.parquet.column.Encoding;
+import org.apache.parquet.column.ParquetProperties;
+import org.apache.parquet.column.values.ValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter;
+import org.apache.parquet.column.values.plain.BooleanPlainValuesWriter;
+import org.apache.parquet.column.values.plain.FixedLenByteArrayPlainValuesWriter;
+import org.apache.parquet.column.values.plain.PlainValuesWriter;
+
+import static org.apache.parquet.column.Encoding.PLAIN_DICTIONARY;
+
+/**
+ * Based on org.apache.parquet.column.values.factory.DefaultV1ValuesWriterFactory
+ */
+public class TrinoValuesWriterFactory
+{
+    private final ParquetProperties parquetProperties;
+
+    public TrinoValuesWriterFactory(ParquetProperties properties)
+    {
+        this.parquetProperties = properties;
+    }
+
+    public ValuesWriter newValuesWriter(ColumnDescriptor descriptor)
+    {
+        return switch (descriptor.getPrimitiveType().getPrimitiveTypeName()) {
+            case BOOLEAN -> new BooleanPlainValuesWriter(); // no dictionary encoding for boolean
+            case FIXED_LEN_BYTE_ARRAY -> getFixedLenByteArrayValuesWriter(descriptor);
+            case BINARY -> getBinaryValuesWriter(descriptor);
+            case INT32 -> getInt32ValuesWriter(descriptor);
+            case INT64 -> getInt64ValuesWriter(descriptor);
+            case INT96 -> getInt96ValuesWriter(descriptor);
+            case DOUBLE -> getDoubleValuesWriter(descriptor);
+            case FLOAT -> getFloatValuesWriter(descriptor);
+        };
+    }
+
+    private ValuesWriter getFixedLenByteArrayValuesWriter(ColumnDescriptor path)
+    {
+        // dictionary encoding was not enabled in PARQUET 1.0
+        return new FixedLenByteArrayPlainValuesWriter(path.getTypeLength(), parquetProperties.getInitialSlabSize(), parquetProperties.getPageSizeThreshold(), parquetProperties.getAllocator());
+    }
+
+    private ValuesWriter getBinaryValuesWriter(ColumnDescriptor path)
+    {
+        ValuesWriter fallbackWriter = new PlainValuesWriter(parquetProperties.getInitialSlabSize(), parquetProperties.getPageSizeThreshold(), parquetProperties.getAllocator());
+        return dictWriterWithFallBack(path, parquetProperties, getEncodingForDictionaryPage(), getEncodingForDataPage(), fallbackWriter);
+    }
+
+    private ValuesWriter getInt32ValuesWriter(ColumnDescriptor path)
+    {
+        ValuesWriter fallbackWriter = new PlainValuesWriter(parquetProperties.getInitialSlabSize(), parquetProperties.getPageSizeThreshold(), parquetProperties.getAllocator());
+        return dictWriterWithFallBack(path, parquetProperties, getEncodingForDictionaryPage(), getEncodingForDataPage(), fallbackWriter);
+    }
+
+    private ValuesWriter getInt64ValuesWriter(ColumnDescriptor path)
+    {
+        ValuesWriter fallbackWriter = new PlainValuesWriter(parquetProperties.getInitialSlabSize(), parquetProperties.getPageSizeThreshold(), parquetProperties.getAllocator());
+        return dictWriterWithFallBack(path, parquetProperties, getEncodingForDictionaryPage(), getEncodingForDataPage(), fallbackWriter);
+    }
+
+    private ValuesWriter getInt96ValuesWriter(ColumnDescriptor path)
+    {
+        ValuesWriter fallbackWriter = new FixedLenByteArrayPlainValuesWriter(12, parquetProperties.getInitialSlabSize(), parquetProperties.getPageSizeThreshold(), parquetProperties.getAllocator());
+        return dictWriterWithFallBack(path, parquetProperties, getEncodingForDictionaryPage(), getEncodingForDataPage(), fallbackWriter);
+    }
+
+    private ValuesWriter getDoubleValuesWriter(ColumnDescriptor path)
+    {
+        ValuesWriter fallbackWriter = new PlainValuesWriter(parquetProperties.getInitialSlabSize(), parquetProperties.getPageSizeThreshold(), parquetProperties.getAllocator());
+        return dictWriterWithFallBack(path, parquetProperties, getEncodingForDictionaryPage(), getEncodingForDataPage(), fallbackWriter);
+    }
+
+    private ValuesWriter getFloatValuesWriter(ColumnDescriptor path)
+    {
+        ValuesWriter fallbackWriter = new PlainValuesWriter(parquetProperties.getInitialSlabSize(), parquetProperties.getPageSizeThreshold(), parquetProperties.getAllocator());
+        return dictWriterWithFallBack(path, parquetProperties, getEncodingForDictionaryPage(), getEncodingForDataPage(), fallbackWriter);
+    }
+
+    @SuppressWarnings("deprecation")
+    private static Encoding getEncodingForDataPage()
+    {
+        return PLAIN_DICTIONARY;
+    }
+
+    @SuppressWarnings("deprecation")
+    private static Encoding getEncodingForDictionaryPage()
+    {
+        return PLAIN_DICTIONARY;
+    }
+
+    private static DictionaryValuesWriter dictionaryWriter(ColumnDescriptor path, ParquetProperties properties, Encoding dictPageEncoding, Encoding dataPageEncoding)
+    {
+        return switch (path.getPrimitiveType().getPrimitiveTypeName()) {
+            case BOOLEAN -> throw new IllegalArgumentException("no dictionary encoding for BOOLEAN");
+            case BINARY ->
+                    new DictionaryValuesWriter.PlainBinaryDictionaryValuesWriter(properties.getDictionaryPageSizeThreshold(), dataPageEncoding, dictPageEncoding, properties.getAllocator());
+            case INT32 ->
+                    new DictionaryValuesWriter.PlainIntegerDictionaryValuesWriter(properties.getDictionaryPageSizeThreshold(), dataPageEncoding, dictPageEncoding, properties.getAllocator());
+            case INT64 ->
+                    new DictionaryValuesWriter.PlainLongDictionaryValuesWriter(properties.getDictionaryPageSizeThreshold(), dataPageEncoding, dictPageEncoding, properties.getAllocator());
+            case INT96 ->
+                    new DictionaryValuesWriter.PlainFixedLenArrayDictionaryValuesWriter(properties.getDictionaryPageSizeThreshold(), 12, dataPageEncoding, dictPageEncoding, properties.getAllocator());
+            case DOUBLE ->
+                    new DictionaryValuesWriter.PlainDoubleDictionaryValuesWriter(properties.getDictionaryPageSizeThreshold(), dataPageEncoding, dictPageEncoding, properties.getAllocator());
+            case FLOAT ->
+                    new DictionaryValuesWriter.PlainFloatDictionaryValuesWriter(properties.getDictionaryPageSizeThreshold(), dataPageEncoding, dictPageEncoding, properties.getAllocator());
+            case FIXED_LEN_BYTE_ARRAY ->
+                    new DictionaryValuesWriter.PlainFixedLenArrayDictionaryValuesWriter(properties.getDictionaryPageSizeThreshold(), path.getTypeLength(), dataPageEncoding, dictPageEncoding, properties.getAllocator());
+        };
+    }
+
+    private static ValuesWriter dictWriterWithFallBack(ColumnDescriptor path, ParquetProperties parquetProperties, Encoding dictPageEncoding, Encoding dataPageEncoding, ValuesWriter writerToFallBackTo)
+    {
+        return new DictionaryFallbackValuesWriter(dictionaryWriter(path, parquetProperties, dictPageEncoding, dataPageEncoding), writerToFallBackTo);
+    }
+}
diff --git a/lib/trino-parquet/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java b/lib/trino-parquet/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java
new file mode 100644
index 000000000000..1c2b14b51485
--- /dev/null
+++ b/lib/trino-parquet/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed 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.parquet.format.converter;
+
+import org.apache.parquet.format.ConvertedType;
+import org.apache.parquet.format.LogicalType;
+import org.apache.parquet.format.SchemaElement;
+import org.apache.parquet.schema.LogicalTypeAnnotation;
+
+public final class ParquetMetadataConverterUtil
+{
+    private ParquetMetadataConverterUtil() {}
+
+    public static LogicalTypeAnnotation getLogicalTypeAnnotation(ParquetMetadataConverter converter, ConvertedType type, SchemaElement element)
+    {
+        return converter.getLogicalTypeAnnotation(type, element);
+    }
+
+    public static LogicalTypeAnnotation getLogicalTypeAnnotation(ParquetMetadataConverter converter, LogicalType type)
+    {
+        return converter.getLogicalTypeAnnotation(type);
+    }
+
+    public static LogicalType convertToLogicalType(ParquetMetadataConverter converter, LogicalTypeAnnotation annotation)
+    {
+        return converter.convertToLogicalType(annotation);
+    }
+}
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/ParquetTestUtils.java b/lib/trino-parquet/src/test/java/io/trino/parquet/ParquetTestUtils.java
new file mode 100644
index 000000000000..6f6b5e70b8ca
--- /dev/null
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/ParquetTestUtils.java
@@ -0,0 +1,247 @@
+/*
+ * Licensed 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 io.trino.parquet;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
+import io.trino.memory.context.AggregatedMemoryContext;
+import io.trino.parquet.reader.ParquetReader;
+import io.trino.parquet.writer.ParquetSchemaConverter;
+import io.trino.parquet.writer.ParquetWriter;
+import io.trino.parquet.writer.ParquetWriterOptions;
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.LongArrayBlock;
+import io.trino.spi.block.RowBlock;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeOperators;
+import org.apache.parquet.format.CompressionCodec;
+import org.apache.parquet.hadoop.metadata.BlockMetaData;
+import org.apache.parquet.hadoop.metadata.ParquetMetadata;
+import org.apache.parquet.io.MessageColumnIO;
+import org.joda.time.DateTimeZone;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Random;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Throwables.throwIfUnchecked;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.parquet.ParquetTypeUtils.constructField;
+import static io.trino.parquet.ParquetTypeUtils.getColumnIO;
+import static io.trino.parquet.ParquetTypeUtils.getParquetEncoding;
+import static io.trino.parquet.ParquetTypeUtils.lookupColumnByName;
+import static io.trino.spi.block.ArrayBlock.fromElementBlock;
+import static io.trino.spi.block.MapBlock.fromKeyValueBlock;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.TypeUtils.writeNativeValue;
+import static java.util.Collections.nCopies;
+import static org.joda.time.DateTimeZone.UTC;
+
+public class ParquetTestUtils
+{
+    private static final Random RANDOM = new Random(42);
+    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
+
+    private ParquetTestUtils() {}
+
+    public static Slice writeParquetFile(ParquetWriterOptions writerOptions, List<Type> types, List<String> columnNames, List<io.trino.spi.Page> inputPages)
+            throws IOException
+    {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ParquetWriter writer = createParquetWriter(outputStream, writerOptions, types, columnNames);
+
+        for (io.trino.spi.Page inputPage : inputPages) {
+            checkArgument(types.size() == inputPage.getChannelCount());
+            writer.write(inputPage);
+        }
+        writer.close();
+        return Slices.wrappedBuffer(outputStream.toByteArray());
+    }
+
+    public static ParquetWriter createParquetWriter(OutputStream outputStream, ParquetWriterOptions writerOptions, List<Type> types, List<String> columnNames)
+    {
+        checkArgument(types.size() == columnNames.size());
+        ParquetSchemaConverter schemaConverter = new ParquetSchemaConverter(types, columnNames, false, false);
+        return new ParquetWriter(
+                outputStream,
+                schemaConverter.getMessageType(),
+                schemaConverter.getPrimitiveTypes(),
+                writerOptions,
+                CompressionCodec.SNAPPY,
+                "test-version",
+                Optional.of(DateTimeZone.getDefault()),
+                Optional.empty());
+    }
+
+    public static ParquetReader createParquetReader(
+            ParquetDataSource input,
+            ParquetMetadata parquetMetadata,
+            AggregatedMemoryContext memoryContext,
+            List<Type> types,
+            List<String> columnNames)
+            throws IOException
+    {
+        org.apache.parquet.hadoop.metadata.FileMetaData fileMetaData = parquetMetadata.getFileMetaData();
+        MessageColumnIO messageColumnIO = getColumnIO(fileMetaData.getSchema(), fileMetaData.getSchema());
+        ImmutableList.Builder<Field> columnFields = ImmutableList.builder();
+        for (int i = 0; i < types.size(); i++) {
+            columnFields.add(constructField(
+                    types.get(i),
+                    lookupColumnByName(messageColumnIO, columnNames.get(i)))
+                    .orElseThrow());
+        }
+        long nextStart = 0;
+        ImmutableList.Builder<Long> blockStartsBuilder = ImmutableList.builder();
+        for (BlockMetaData block : parquetMetadata.getBlocks()) {
+            blockStartsBuilder.add(nextStart);
+            nextStart += block.getRowCount();
+        }
+        List<Long> blockStarts = blockStartsBuilder.build();
+        return new ParquetReader(
+                Optional.ofNullable(fileMetaData.getCreatedBy()),
+                columnFields.build(),
+                parquetMetadata.getBlocks(),
+                blockStarts,
+                input,
+                UTC,
+                memoryContext,
+                new ParquetReaderOptions(),
+                exception -> {
+                    throwIfUnchecked(exception);
+                    return new RuntimeException(exception);
+                },
+                Optional.empty(),
+                nCopies(blockStarts.size(), Optional.empty()),
+                Optional.empty());
+    }
+
+    public static List<io.trino.spi.Page> generateInputPages(List<Type> types, int positionsPerPage, int pageCount)
+    {
+        ImmutableList.Builder<io.trino.spi.Page> pagesBuilder = ImmutableList.builder();
+        for (int i = 0; i < pageCount; i++) {
+            List<Block> blocks = types.stream()
+                    .map(type -> generateBlock(type, positionsPerPage))
+                    .collect(toImmutableList());
+            pagesBuilder.add(new Page(blocks.toArray(Block[]::new)));
+        }
+        return pagesBuilder.build();
+    }
+
+    public static List<Integer> generateGroupSizes(int positionsCount)
+    {
+        int maxGroupSize = 17;
+        int offset = 0;
+        ImmutableList.Builder<Integer> groupsBuilder = ImmutableList.builder();
+        while (offset < positionsCount) {
+            int remaining = positionsCount - offset;
+            int groupSize = Math.min(RANDOM.nextInt(maxGroupSize) + 1, remaining);
+            groupsBuilder.add(groupSize);
+            offset += groupSize;
+        }
+        return groupsBuilder.build();
+    }
+
+    public static RowBlock createRowBlock(Optional<boolean[]> rowIsNull, int positionCount)
+    {
+        // TODO test with nested null fields and without nulls
+        Block[] fieldBlocks = new Block[4];
+        // no nulls block
+        fieldBlocks[0] = new LongArrayBlock(positionCount, rowIsNull, new long[positionCount]);
+        // no nulls with mayHaveNull block
+        fieldBlocks[1] = new LongArrayBlock(positionCount, rowIsNull.or(() -> Optional.of(new boolean[positionCount])), new long[positionCount]);
+        // all nulls block
+        boolean[] allNulls = new boolean[positionCount];
+        Arrays.fill(allNulls, true);
+        fieldBlocks[2] = new LongArrayBlock(positionCount, Optional.of(allNulls), new long[positionCount]);
+        // random nulls block
+        boolean[] valueIsNull = rowIsNull.map(boolean[]::clone).orElseGet(() -> new boolean[positionCount]);
+        for (int i = 0; i < positionCount; i++) {
+            valueIsNull[i] |= RANDOM.nextBoolean();
+        }
+        fieldBlocks[3] = new LongArrayBlock(positionCount, Optional.of(valueIsNull), new long[positionCount]);
+
+        return RowBlock.fromNotNullSuppressedFieldBlocks(positionCount, rowIsNull, fieldBlocks);
+    }
+
+    public static Block createArrayBlock(Optional<boolean[]> valueIsNull, int positionCount)
+    {
+        int[] arrayOffset = generateOffsets(valueIsNull, positionCount);
+        return fromElementBlock(positionCount, valueIsNull, arrayOffset, createLongsBlockWithRandomNulls(arrayOffset[positionCount]));
+    }
+
+    public static Block createMapBlock(Optional<boolean[]> mapIsNull, int positionCount)
+    {
+        int[] offsets = generateOffsets(mapIsNull, positionCount);
+        int entriesCount = offsets[positionCount];
+        Block keyBlock = new LongArrayBlock(entriesCount, Optional.empty(), new long[entriesCount]);
+        Block valueBlock = createLongsBlockWithRandomNulls(entriesCount);
+        return fromKeyValueBlock(mapIsNull, offsets, keyBlock, valueBlock, new MapType(BIGINT, BIGINT, TYPE_OPERATORS));
+    }
+
+    public static int[] generateOffsets(Optional<boolean[]> valueIsNull, int positionCount)
+    {
+        int maxCardinality = 7; // array length or map size at the current position
+        int[] offsets = new int[positionCount + 1];
+        for (int position = 0; position < positionCount; position++) {
+            if (valueIsNull.isPresent() && valueIsNull.get()[position]) {
+                offsets[position + 1] = offsets[position];
+            }
+            else {
+                offsets[position + 1] = offsets[position] + RANDOM.nextInt(maxCardinality);
+            }
+        }
+        return offsets;
+    }
+
+    private static Block createLongsBlockWithRandomNulls(int positionCount)
+    {
+        boolean[] valueIsNull = new boolean[positionCount];
+        for (int i = 0; i < positionCount; i++) {
+            valueIsNull[i] = RANDOM.nextBoolean();
+        }
+        return new LongArrayBlock(positionCount, Optional.of(valueIsNull), new long[positionCount]);
+    }
+
+    private static Block generateBlock(Type type, int positions)
+    {
+        BlockBuilder blockBuilder = type.createBlockBuilder(null, positions);
+        for (int i = 0; i < positions; i++) {
+            writeNativeValue(type, blockBuilder, (long) i);
+        }
+        return blockBuilder.build();
+    }
+
+    public static DictionaryPage toTrinoDictionaryPage(org.apache.parquet.column.page.DictionaryPage dictionary)
+    {
+        try {
+            return new DictionaryPage(
+                    Slices.wrappedBuffer(dictionary.getBytes().toByteArray()),
+                    dictionary.getDictionarySize(),
+                    getParquetEncoding(dictionary.getEncoding()));
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+}
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/TestTupleDomainParquetPredicate.java b/lib/trino-parquet/src/test/java/io/trino/parquet/TestTupleDomainParquetPredicate.java
index aa9b12d5218b..bbb409273a64 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/TestTupleDomainParquetPredicate.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/TestTupleDomainParquetPredicate.java
@@ -847,7 +847,7 @@ private static LongTimestamp longTimestamp(long precision, LocalDateTime start)
         checkArgument(precision > MAX_SHORT_PRECISION && precision <= TimestampType.MAX_PRECISION, "Precision is out of range");
         return new LongTimestamp(
                 start.atZone(ZoneOffset.UTC).toInstant().getEpochSecond() * MICROSECONDS_PER_SECOND + start.getLong(MICRO_OF_SECOND),
-                toIntExact(round((start.getNano() % PICOSECONDS_PER_NANOSECOND) * PICOSECONDS_PER_NANOSECOND, toIntExact(TimestampType.MAX_PRECISION - precision))));
+                toIntExact(round((start.getNano() % PICOSECONDS_PER_NANOSECOND) * (long) PICOSECONDS_PER_NANOSECOND, toIntExact(TimestampType.MAX_PRECISION - precision))));
     }
 
     private static List<ByteBuffer> toByteBufferList(Long... values)
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/AbstractColumnReaderBenchmark.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/AbstractColumnReaderBenchmark.java
index 98d074a14c16..3fbfa3f18161 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/AbstractColumnReaderBenchmark.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/AbstractColumnReaderBenchmark.java
@@ -17,7 +17,6 @@
 import io.airlift.slice.Slices;
 import io.trino.parquet.DataPage;
 import io.trino.parquet.DataPageV1;
-import io.trino.parquet.ParquetReaderOptions;
 import io.trino.parquet.PrimitiveField;
 import org.apache.parquet.column.values.ValuesWriter;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -61,6 +60,7 @@ public abstract class AbstractColumnReaderBenchmark<VALUES>
     private static final int DATA_GENERATION_BATCH_SIZE = 16384;
     private static final int READ_BATCH_SIZE = 4096;
 
+    private final ColumnReaderFactory columnReaderFactory = new ColumnReaderFactory(UTC);
     private final List<DataPage> dataPages = new ArrayList<>();
     private int dataPositions;
 
@@ -102,11 +102,7 @@ public void setup()
     public int read()
             throws IOException
     {
-        ColumnReader columnReader = ColumnReaderFactory.create(
-                field,
-                UTC,
-                newSimpleAggregatedMemoryContext(),
-                new ParquetReaderOptions().withBatchColumnReaders(true));
+        ColumnReader columnReader = columnReaderFactory.create(field, newSimpleAggregatedMemoryContext());
         columnReader.setPageReader(new PageReader(UNCOMPRESSED, dataPages.iterator(), false, false), Optional.empty());
         int rowsRead = 0;
         while (rowsRead < dataPositions) {
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/AbstractColumnReaderRowRangesTest.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/AbstractColumnReaderRowRangesTest.java
index b0bef6951956..36f502a9f1b4 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/AbstractColumnReaderRowRangesTest.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/AbstractColumnReaderRowRangesTest.java
@@ -19,6 +19,8 @@
 import io.trino.parquet.DataPageV2;
 import io.trino.parquet.Page;
 import io.trino.parquet.PrimitiveField;
+import io.trino.parquet.reader.decoders.ValueDecoder;
+import io.trino.parquet.reader.decoders.ValueDecoders;
 import io.trino.spi.block.Block;
 import it.unimi.dsi.fastutil.booleans.BooleanArrayList;
 import it.unimi.dsi.fastutil.booleans.BooleanList;
@@ -56,9 +58,11 @@
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.parquet.ParquetTestUtils.toTrinoDictionaryPage;
 import static io.trino.parquet.ParquetTypeUtils.getParquetEncoding;
 import static io.trino.parquet.reader.FilteredRowRanges.RowRange;
-import static io.trino.parquet.reader.TestingColumnReader.toTrinoDictionaryPage;
+import static io.trino.parquet.reader.TestingRowRanges.toRowRange;
+import static io.trino.parquet.reader.TestingRowRanges.toRowRanges;
 import static io.trino.testing.DataProviders.cartesianProduct;
 import static io.trino.testing.DataProviders.concat;
 import static io.trino.testing.DataProviders.toDataProvider;
@@ -66,8 +70,6 @@
 import static org.apache.parquet.bytes.BytesUtils.getWidthFromMaxInt;
 import static org.apache.parquet.column.Encoding.RLE_DICTIONARY;
 import static org.apache.parquet.format.CompressionCodec.UNCOMPRESSED;
-import static org.apache.parquet.internal.filter2.columnindex.TestingRowRanges.toRowRange;
-import static org.apache.parquet.internal.filter2.columnindex.TestingRowRanges.toRowRanges;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class AbstractColumnReaderRowRangesTest
@@ -152,6 +154,12 @@ protected interface ColumnReaderProvider
         PrimitiveField getField();
     }
 
+    protected static ValueDecoder.ValueDecodersProvider<int[]> getIntDecodersProvider(PrimitiveField field)
+    {
+        ValueDecoders valueDecoders = new ValueDecoders(field);
+        return valueDecoders::getIntDecoder;
+    }
+
     @DataProvider
     public Object[][] testRowRangesProvider()
     {
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/AbstractColumnReaderTest.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/AbstractColumnReaderTest.java
index ded0609aa960..0359a113640e 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/AbstractColumnReaderTest.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/AbstractColumnReaderTest.java
@@ -24,14 +24,13 @@
 import io.trino.parquet.DictionaryPage;
 import io.trino.parquet.Page;
 import io.trino.parquet.ParquetEncoding;
-import io.trino.parquet.ParquetReaderOptions;
 import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.TestingColumnReader.ColumnReaderFormat;
 import io.trino.parquet.reader.TestingColumnReader.DataPageVersion;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.DictionaryBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
-import io.trino.spi.type.AbstractVariableWidthType;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.bytes.HeapByteBufferAllocator;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.column.values.ValuesWriter;
@@ -43,8 +42,6 @@
 import org.apache.parquet.schema.Types.PrimitiveBuilder;
 import org.testng.annotations.Test;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
@@ -58,11 +55,12 @@
 import static io.trino.parquet.ParquetEncoding.RLE;
 import static io.trino.parquet.ParquetEncoding.RLE_DICTIONARY;
 import static io.trino.parquet.ParquetTypeUtils.getParquetEncoding;
+import static io.trino.parquet.reader.AbstractColumnReader.shouldProduceDictionaryForType;
 import static io.trino.parquet.reader.TestingColumnReader.DataPageVersion.V1;
 import static io.trino.parquet.reader.TestingColumnReader.getDictionaryPage;
+import static io.trino.parquet.reader.TestingRowRanges.toRowRange;
 import static org.apache.parquet.bytes.BytesUtils.getWidthFromMaxInt;
 import static org.apache.parquet.format.CompressionCodec.UNCOMPRESSED;
-import static org.apache.parquet.internal.filter2.columnindex.TestingRowRanges.toRowRange;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.joda.time.DateTimeZone.UTC;
 
@@ -87,7 +85,7 @@ public <T> void testSingleValueDictionary(DataPageVersion version, ColumnReaderF
         reader.prepareNextRead(2);
         Block actual = reader.readPrimitive().getBlock();
         assertThat(actual.mayHaveNull()).isFalse();
-        if (field.getType() instanceof AbstractVariableWidthType) {
+        if (shouldProduceDictionaryForType(field.getType())) {
             assertThat(actual).isInstanceOf(DictionaryBlock.class);
         }
         format.assertBlock(values, actual);
@@ -110,7 +108,7 @@ public <T> void testSingleValueDictionaryNullable(DataPageVersion version, Colum
         reader.prepareNextRead(2);
         Block actual = reader.readPrimitive().getBlock();
         assertThat(actual.mayHaveNull()).isTrue();
-        if (field.getType() instanceof AbstractVariableWidthType) {
+        if (shouldProduceDictionaryForType(field.getType())) {
             assertThat(actual).isInstanceOf(DictionaryBlock.class);
         }
         format.assertBlock(values, actual);
@@ -132,7 +130,7 @@ public <T> void testSingleValueDictionaryNullableWithNoNulls(DataPageVersion ver
         reader.setPageReader(getPageReaderMock(List.of(page), dictionaryPage), Optional.empty());
         reader.prepareNextRead(2);
         Block actual = reader.readPrimitive().getBlock();
-        if (field.getType() instanceof AbstractVariableWidthType) {
+        if (shouldProduceDictionaryForType(field.getType())) {
             assertThat(actual).isInstanceOf(DictionaryBlock.class);
             assertThat(actual.mayHaveNull()).isTrue();
         }
@@ -155,7 +153,7 @@ public <T> void testSingleValueDictionaryNullableWithNoNullsUsingColumnStats(Dat
         reader.setPageReader(getPageReaderMock(List.of(page), dictionaryPage, true), Optional.empty());
         reader.prepareNextRead(2);
         Block actual = reader.readPrimitive().getBlock();
-        if (field.getType() instanceof AbstractVariableWidthType) {
+        if (shouldProduceDictionaryForType(field.getType())) {
             assertThat(actual).isInstanceOf(DictionaryBlock.class);
             assertThat(actual.mayHaveNull()).isFalse();
         }
@@ -205,7 +203,7 @@ public <T> void testDictionariesSharedBetweenPages(DataPageVersion version, Colu
         reader.prepareNextRead(2);
         Block block2 = reader.readPrimitive().getBlock();
 
-        if (field.getType() instanceof AbstractVariableWidthType) {
+        if (shouldProduceDictionaryForType(field.getType())) {
             assertThat(block1).isInstanceOf(DictionaryBlock.class);
             assertThat(block2).isInstanceOf(DictionaryBlock.class);
 
@@ -216,6 +214,13 @@ public <T> void testDictionariesSharedBetweenPages(DataPageVersion version, Colu
         format.assertBlock(values2, block2);
     }
 
+//    @Test
+//    public <T> void testReadNoNullX()
+//            throws IOException
+//    {
+//        testReadNoNull(DataPageVersion.V2,
+//                new ColumnReaderFormat<>(INT64, timestampType(false, NANOS), TIMESTAMP_NANOS, PLAIN_WRITER, DICTIONARY_LONG_WRITER, WRITE_LONG_TIMESTAMP, assertLongTimestamp(3)));
+//    }
     @Test(dataProvider = "readersWithPageVersions", dataProviderClass = TestingColumnReader.class)
     public <T> void testReadNoNull(DataPageVersion version, ColumnReaderFormat<T> format)
             throws IOException
@@ -353,7 +358,7 @@ public <T> void testReadNullableDictionary(DataPageVersion version, ColumnReader
         Block actual2 = readBlock(reader, 3);
         Block actual3 = readBlock(reader, 4);
 
-        if (field.getType() instanceof AbstractVariableWidthType) {
+        if (shouldProduceDictionaryForType(field.getType())) {
             assertThat(actual1).isInstanceOf(DictionaryBlock.class);
             assertThat(actual2).isInstanceOf(DictionaryBlock.class);
             assertThat(actual3).isInstanceOf(DictionaryBlock.class);
@@ -532,7 +537,8 @@ public <T> void testMemoryUsage(DataPageVersion version, ColumnReaderFormat<T> f
         // Create reader
         PrimitiveField field = createField(format, true);
         AggregatedMemoryContext memoryContext = newSimpleAggregatedMemoryContext();
-        ColumnReader reader = ColumnReaderFactory.create(field, UTC, memoryContext, new ParquetReaderOptions().withBatchColumnReaders(true));
+        ColumnReaderFactory columnReaderFactory = new ColumnReaderFactory(UTC);
+        ColumnReader reader = columnReaderFactory.create(field, memoryContext);
         // Write data
         DictionaryValuesWriter dictionaryWriter = format.getDictionaryWriter();
         format.write(dictionaryWriter, new Integer[] {1, 2, 3});
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkFixed12ColumnReader.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkFixed12ColumnReader.java
new file mode 100644
index 000000000000..b2ea4be9927c
--- /dev/null
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkFixed12ColumnReader.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed 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 io.trino.parquet.reader;
+
+import io.trino.parquet.PrimitiveField;
+import org.apache.parquet.bytes.HeapByteBufferAllocator;
+import org.apache.parquet.column.ColumnDescriptor;
+import org.apache.parquet.column.values.ValuesWriter;
+import org.apache.parquet.column.values.plain.FixedLenByteArrayPlainValuesWriter;
+import org.apache.parquet.schema.PrimitiveType;
+import org.apache.parquet.schema.Types;
+
+import java.time.LocalDateTime;
+import java.time.Year;
+import java.util.Random;
+
+import static io.airlift.slice.SizeOf.SIZE_OF_INT;
+import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
+import static io.trino.parquet.reader.TestingColumnReader.encodeInt96Timestamp;
+import static io.trino.spi.block.Fixed12Block.decodeFixed12First;
+import static io.trino.spi.block.Fixed12Block.decodeFixed12Second;
+import static io.trino.spi.block.Fixed12Block.encodeFixed12;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
+import static java.time.ZoneOffset.UTC;
+import static java.time.temporal.ChronoField.NANO_OF_SECOND;
+import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.INT96;
+
+public class BenchmarkFixed12ColumnReader
+        extends AbstractColumnReaderBenchmark<int[]>
+{
+    private static final int LENGTH = SIZE_OF_LONG + SIZE_OF_INT;
+
+    private final Random random = new Random(56246);
+
+    @Override
+    protected PrimitiveField createPrimitiveField()
+    {
+        PrimitiveType parquetType = Types.optional(INT96).named("name");
+        return new PrimitiveField(
+                TIMESTAMP_NANOS,
+                true,
+                new ColumnDescriptor(new String[] {"test"}, parquetType, 0, 0),
+                0);
+    }
+
+    @Override
+    protected ValuesWriter createValuesWriter(int bufferSize)
+    {
+        return new FixedLenByteArrayPlainValuesWriter(LENGTH, bufferSize, bufferSize, HeapByteBufferAllocator.getInstance());
+    }
+
+    @Override
+    protected void writeValue(ValuesWriter writer, int[] batch, int index)
+    {
+        writer.writeBytes(encodeInt96Timestamp(decodeFixed12First(batch, index), decodeFixed12Second(batch, index)));
+    }
+
+    @Override
+    protected int[] generateDataBatch(int size)
+    {
+        int[] batch = new int[size * 3];
+        for (int i = 0; i < size; i++) {
+            LocalDateTime timestamp = LocalDateTime.of(
+                    random.nextInt(Year.MIN_VALUE, Year.MAX_VALUE + 1),
+                    random.nextInt(1, 13),
+                    random.nextInt(1, 29),
+                    random.nextInt(24),
+                    random.nextInt(60),
+                    random.nextInt(60));
+            encodeFixed12(timestamp.toEpochSecond(UTC), timestamp.get(NANO_OF_SECOND), batch, i);
+        }
+        return batch;
+    }
+
+    public static void main(String[] args)
+            throws Exception
+    {
+        run(BenchmarkFixed12ColumnReader.class);
+    }
+}
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkInt96ColumnReader.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkInt96ColumnReader.java
deleted file mode 100644
index 33cf0def2798..000000000000
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkInt96ColumnReader.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.PrimitiveField;
-import org.apache.parquet.bytes.HeapByteBufferAllocator;
-import org.apache.parquet.column.ColumnDescriptor;
-import org.apache.parquet.column.values.ValuesWriter;
-import org.apache.parquet.column.values.plain.FixedLenByteArrayPlainValuesWriter;
-import org.apache.parquet.schema.PrimitiveType;
-import org.apache.parquet.schema.Types;
-
-import java.time.LocalDateTime;
-import java.time.Year;
-import java.util.Random;
-
-import static io.airlift.slice.SizeOf.SIZE_OF_INT;
-import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
-import static io.trino.parquet.reader.TestingColumnReader.encodeInt96Timestamp;
-import static io.trino.parquet.reader.flat.Int96ColumnAdapter.Int96Buffer;
-import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
-import static java.time.ZoneOffset.UTC;
-import static java.time.temporal.ChronoField.NANO_OF_SECOND;
-import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.INT96;
-
-public class BenchmarkInt96ColumnReader
-        extends AbstractColumnReaderBenchmark<Int96Buffer>
-{
-    private static final int LENGTH = SIZE_OF_LONG + SIZE_OF_INT;
-
-    private final Random random = new Random(56246);
-
-    @Override
-    protected PrimitiveField createPrimitiveField()
-    {
-        PrimitiveType parquetType = Types.optional(INT96).named("name");
-        return new PrimitiveField(
-                TIMESTAMP_NANOS,
-                true,
-                new ColumnDescriptor(new String[] {"test"}, parquetType, 0, 0),
-                0);
-    }
-
-    @Override
-    protected ValuesWriter createValuesWriter(int bufferSize)
-    {
-        return new FixedLenByteArrayPlainValuesWriter(LENGTH, bufferSize, bufferSize, HeapByteBufferAllocator.getInstance());
-    }
-
-    @Override
-    protected void writeValue(ValuesWriter writer, Int96Buffer batch, int index)
-    {
-        writer.writeBytes(encodeInt96Timestamp(batch.longs[index], batch.ints[index]));
-    }
-
-    @Override
-    protected Int96Buffer generateDataBatch(int size)
-    {
-        Int96Buffer batch = new Int96Buffer(size);
-        for (int i = 0; i < size; i++) {
-            LocalDateTime timestamp = LocalDateTime.of(
-                    random.nextInt(Year.MIN_VALUE, Year.MAX_VALUE + 1),
-                    random.nextInt(1, 13),
-                    random.nextInt(1, 29),
-                    random.nextInt(24),
-                    random.nextInt(60),
-                    random.nextInt(60));
-            batch.longs[i] = timestamp.toEpochSecond(UTC);
-            batch.ints[i] = timestamp.get(NANO_OF_SECOND);
-        }
-        return batch;
-    }
-
-    public static void main(String[] args)
-            throws Exception
-    {
-        run(BenchmarkInt96ColumnReader.class);
-    }
-}
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkLongDecimalColumnReader.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkLongDecimalColumnReader.java
index f4d2c35e07af..771299e7bfce 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkLongDecimalColumnReader.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkLongDecimalColumnReader.java
@@ -80,7 +80,9 @@ else if (encoding.equals(DELTA_BYTE_ARRAY)) {
     @Override
     protected void writeValue(ValuesWriter writer, long[] batch, int index)
     {
-        Slice slice = Slices.wrappedLongArray(batch, index * 2, 2);
+        Slice slice = Slices.allocate(Long.BYTES * 2);
+        slice.setLong(0, batch[index * 2]);
+        slice.setLong(SIZE_OF_LONG, batch[(index * 2) + 1]);
         writer.writeBytes(Binary.fromConstantByteArray(slice.getBytes()));
     }
 
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkUuidColumnReader.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkUuidColumnReader.java
index 46671c1076fb..c0965b283632 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkUuidColumnReader.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/BenchmarkUuidColumnReader.java
@@ -77,7 +77,9 @@ else if (encoding.equals(DELTA_BYTE_ARRAY)) {
     @Override
     protected void writeValue(ValuesWriter writer, long[] batch, int index)
     {
-        Slice slice = Slices.wrappedLongArray(batch, index * 2, 2);
+        Slice slice = Slices.allocate(Long.BYTES * 2);
+        slice.setLong(0, batch[index * 2]);
+        slice.setLong(SIZE_OF_LONG, batch[(index * 2) + 1]);
         writer.writeBytes(Binary.fromConstantByteArray(slice.getBytes()));
     }
 
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/FileParquetDataSource.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/FileParquetDataSource.java
new file mode 100644
index 000000000000..250933ce6bfc
--- /dev/null
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/FileParquetDataSource.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed 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 io.trino.parquet.reader;
+
+import io.trino.parquet.AbstractParquetDataSource;
+import io.trino.parquet.ParquetDataSourceId;
+import io.trino.parquet.ParquetReaderOptions;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+public class FileParquetDataSource
+        extends AbstractParquetDataSource
+{
+    private final RandomAccessFile input;
+
+    public FileParquetDataSource(File path, ParquetReaderOptions options)
+            throws FileNotFoundException
+    {
+        super(new ParquetDataSourceId(path.getPath()), path.length(), options);
+        this.input = new RandomAccessFile(path, "r");
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        super.close();
+        input.close();
+    }
+
+    @Override
+    protected void readInternal(long position, byte[] buffer, int bufferOffset, int bufferLength)
+            throws IOException
+    {
+        input.seek(position);
+        input.readFully(buffer, bufferOffset, bufferLength);
+    }
+}
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestColumnReaderBenchmark.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestColumnReaderBenchmark.java
index 5b7220e21b6a..9bad2f5a4e09 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestColumnReaderBenchmark.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestColumnReaderBenchmark.java
@@ -138,7 +138,7 @@ public void testUuidColumnReaderBenchmark()
     public void testInt96ColumnReaderBenchmark()
             throws IOException
     {
-        BenchmarkInt96ColumnReader benchmark = new BenchmarkInt96ColumnReader();
+        BenchmarkFixed12ColumnReader benchmark = new BenchmarkFixed12ColumnReader();
         benchmark.setup();
         benchmark.read();
     }
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestColumnReaderFactory.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestColumnReaderFactory.java
deleted file mode 100644
index d7c92e38c5f9..000000000000
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestColumnReaderFactory.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed 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 io.trino.parquet.reader;
-
-import io.trino.parquet.ParquetReaderOptions;
-import io.trino.parquet.PrimitiveField;
-import io.trino.parquet.reader.flat.FlatColumnReader;
-import org.apache.parquet.column.ColumnDescriptor;
-import org.apache.parquet.schema.PrimitiveType;
-import org.testng.annotations.Test;
-
-import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
-import static io.trino.spi.type.IntegerType.INTEGER;
-import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.INT32;
-import static org.apache.parquet.schema.Type.Repetition.OPTIONAL;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.joda.time.DateTimeZone.UTC;
-
-public class TestColumnReaderFactory
-{
-    @Test
-    public void testUseBatchedColumnReaders()
-    {
-        PrimitiveField field = new PrimitiveField(
-                INTEGER,
-                false,
-                new ColumnDescriptor(new String[] {"test"}, new PrimitiveType(OPTIONAL, INT32, "test"), 0, 1),
-                0);
-        assertThat(ColumnReaderFactory.create(field, UTC, newSimpleAggregatedMemoryContext(), new ParquetReaderOptions().withBatchColumnReaders(false)))
-                .isNotInstanceOf(AbstractColumnReader.class);
-        assertThat(ColumnReaderFactory.create(field, UTC, newSimpleAggregatedMemoryContext(), new ParquetReaderOptions().withBatchColumnReaders(true)))
-                .isInstanceOf(FlatColumnReader.class);
-    }
-
-    @Test
-    public void testNestedColumnReaders()
-    {
-        PrimitiveField field = new PrimitiveField(
-                INTEGER,
-                false,
-                new ColumnDescriptor(new String[] {"level1", "level2"}, new PrimitiveType(OPTIONAL, INT32, "test"), 1, 2),
-                0);
-        assertThat(ColumnReaderFactory.create(field, UTC, newSimpleAggregatedMemoryContext(), new ParquetReaderOptions().withBatchColumnReaders(false)))
-                .isNotInstanceOf(AbstractColumnReader.class);
-        assertThat(ColumnReaderFactory.create(
-                field,
-                UTC,
-                newSimpleAggregatedMemoryContext(),
-                new ParquetReaderOptions().withBatchColumnReaders(false).withBatchNestedColumnReaders(true)))
-                .isNotInstanceOf(AbstractColumnReader.class);
-
-        assertThat(ColumnReaderFactory.create(field, UTC, newSimpleAggregatedMemoryContext(), new ParquetReaderOptions().withBatchColumnReaders(true)))
-                .isInstanceOf(NestedColumnReader.class);
-        assertThat(ColumnReaderFactory.create(
-                field,
-                UTC,
-                newSimpleAggregatedMemoryContext(),
-                new ParquetReaderOptions().withBatchColumnReaders(true).withBatchNestedColumnReaders(true)))
-                .isInstanceOf(NestedColumnReader.class);
-    }
-}
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestFlatColumnReaderRowRanges.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestFlatColumnReaderRowRanges.java
index aaf155bb6e4b..582558e617bb 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestFlatColumnReaderRowRanges.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestFlatColumnReaderRowRanges.java
@@ -15,14 +15,17 @@
 
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.parquet.PrimitiveField;
-import io.trino.parquet.reader.decoders.ValueDecoders;
 import io.trino.parquet.reader.flat.FlatColumnReader;
+import io.trino.parquet.reader.flat.FlatDefinitionLevelDecoder;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.schema.PrimitiveType;
 
 import java.util.function.Supplier;
 
 import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
+import static io.trino.parquet.ParquetEncoding.PLAIN;
+import static io.trino.parquet.reader.decoders.ValueDecoder.ValueDecodersProvider;
+import static io.trino.parquet.reader.flat.DictionaryDecoder.getDictionaryDecoder;
 import static io.trino.parquet.reader.flat.IntColumnAdapter.INT_ADAPTER;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static java.util.Objects.requireNonNull;
@@ -59,10 +62,8 @@ protected ColumnReaderProvider[] getColumnReaderProviders()
     private enum FlatColumnReaderProvider
             implements ColumnReaderProvider
     {
-        INT_PRIMITIVE_NO_NULLS(() -> new IntColumnReader(FIELD), FIELD),
-        INT_PRIMITIVE_NULLABLE(() -> new IntColumnReader(NULLABLE_FIELD), NULLABLE_FIELD),
-        INT_FLAT_NO_NULLS(() -> new FlatColumnReader<>(FIELD, ValueDecoders::getIntDecoder, INT_ADAPTER, MEMORY_CONTEXT), FIELD),
-        INT_FLAT_NULLABLE(() -> new FlatColumnReader<>(NULLABLE_FIELD, ValueDecoders::getIntDecoder, INT_ADAPTER, MEMORY_CONTEXT), NULLABLE_FIELD),
+        INT_FLAT_NO_NULLS(() -> createFlatColumnReader(FIELD), FIELD),
+        INT_FLAT_NULLABLE(() -> createFlatColumnReader(NULLABLE_FIELD), NULLABLE_FIELD),
         /**/;
 
         private final Supplier<ColumnReader> columnReader;
@@ -86,4 +87,20 @@ public PrimitiveField getField()
             return field;
         }
     }
+
+    private static FlatColumnReader<int[]> createFlatColumnReader(PrimitiveField field)
+    {
+        ValueDecodersProvider<int[]> valueDecodersProvider = getIntDecodersProvider(field);
+        return new FlatColumnReader<>(
+                field,
+                valueDecodersProvider,
+                FlatDefinitionLevelDecoder::getFlatDefinitionLevelDecoder,
+                (dictionaryPage, isNonNull) -> getDictionaryDecoder(
+                        dictionaryPage,
+                        INT_ADAPTER,
+                        valueDecodersProvider.create(PLAIN),
+                        isNonNull),
+                INT_ADAPTER,
+                MEMORY_CONTEXT);
+    }
 }
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestInt96Timestamp.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestInt96Timestamp.java
index ff7e1c23272f..5939dd0253d1 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestInt96Timestamp.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestInt96Timestamp.java
@@ -17,7 +17,6 @@
 import io.airlift.slice.Slices;
 import io.trino.parquet.DataPage;
 import io.trino.parquet.DataPageV2;
-import io.trino.parquet.ParquetReaderOptions;
 import io.trino.parquet.PrimitiveField;
 import io.trino.plugin.base.type.DecodedTimestamp;
 import io.trino.spi.block.Block;
@@ -107,7 +106,8 @@ public void testVariousTimestamps(TimestampType type, BiFunction<Block, Integer,
                 null,
                 false);
         // Read and assert
-        ColumnReader reader = ColumnReaderFactory.create(field, DateTimeZone.UTC, newSimpleAggregatedMemoryContext(), new ParquetReaderOptions().withBatchColumnReaders(true));
+        ColumnReaderFactory columnReaderFactory = new ColumnReaderFactory(DateTimeZone.UTC);
+        ColumnReader reader = columnReaderFactory.create(field, newSimpleAggregatedMemoryContext());
         reader.setPageReader(
                 new PageReader(UNCOMPRESSED, List.of(dataPage).iterator(), false, false),
                 Optional.empty());
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestNestedColumnReader.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestNestedColumnReader.java
index 1fdf0498da09..77f821ca21c2 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestNestedColumnReader.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestNestedColumnReader.java
@@ -16,7 +16,6 @@
 import io.trino.parquet.DataPage;
 import io.trino.parquet.DictionaryPage;
 import io.trino.parquet.ParquetEncoding;
-import io.trino.parquet.ParquetReaderOptions;
 import io.trino.parquet.PrimitiveField;
 import io.trino.spi.block.Block;
 import org.apache.parquet.column.ColumnDescriptor;
@@ -54,11 +53,8 @@ protected ColumnReader createColumnReader(PrimitiveField field)
                         descriptor.getMaxRepetitionLevel(),
                         descriptor.getMaxDefinitionLevel()),
                 field.getId());
-        ColumnReader columnReader = ColumnReaderFactory.create(
-                tesingField,
-                UTC,
-                newSimpleAggregatedMemoryContext(),
-                new ParquetReaderOptions().withBatchColumnReaders(true).withBatchNestedColumnReaders(true));
+        ColumnReaderFactory columnReaderFactory = new ColumnReaderFactory(UTC);
+        ColumnReader columnReader = columnReaderFactory.create(tesingField, newSimpleAggregatedMemoryContext());
         assertThat(columnReader).isInstanceOf(NestedColumnReader.class);
         return columnReader;
     }
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestNestedColumnReaderRowRanges.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestNestedColumnReaderRowRanges.java
index 7bed50487bd7..f9c7eacb5633 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestNestedColumnReaderRowRanges.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestNestedColumnReaderRowRanges.java
@@ -15,13 +15,16 @@
 
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.parquet.PrimitiveField;
-import io.trino.parquet.reader.decoders.ValueDecoders;
+import io.trino.parquet.reader.decoders.ValueDecoder;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.schema.PrimitiveType;
 
 import java.util.function.Supplier;
 
 import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
+import static io.trino.parquet.ParquetEncoding.PLAIN;
+import static io.trino.parquet.reader.decoders.ValueDecoder.ValueDecodersProvider;
+import static io.trino.parquet.reader.flat.DictionaryDecoder.getDictionaryDecoder;
 import static io.trino.parquet.reader.flat.IntColumnAdapter.INT_ADAPTER;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static java.util.Objects.requireNonNull;
@@ -66,15 +69,14 @@ protected ColumnReaderProvider[] getColumnReaderProviders()
     private enum NestedColumnReaderProvider
             implements ColumnReaderProvider
     {
-        NESTED_READER_NO_NULLS(() -> new NestedColumnReader<>(FLAT_FIELD, ValueDecoders::getIntDecoder, INT_ADAPTER, MEMORY_CONTEXT), FLAT_FIELD),
-        NESTED_READER_NULLABLE(() -> new NestedColumnReader<>(NULLABLE_FLAT_FIELD, ValueDecoders::getIntDecoder, INT_ADAPTER, MEMORY_CONTEXT), NULLABLE_FLAT_FIELD),
-        NESTED_READER_NESTED_NO_NULLS(() -> new NestedColumnReader<>(NESTED_FIELD, ValueDecoders::getIntDecoder, INT_ADAPTER, MEMORY_CONTEXT), NESTED_FIELD),
-        NESTED_READER_NESTED_NULLABLE(() -> new NestedColumnReader<>(NULLABLE_NESTED_FIELD, ValueDecoders::getIntDecoder, INT_ADAPTER, MEMORY_CONTEXT), NULLABLE_NESTED_FIELD),
-        NESTED_READER_REPEATABLE_NO_NULLS(() -> new NestedColumnReader<>(REPEATED_FLAT_FIELD, ValueDecoders::getIntDecoder, INT_ADAPTER, MEMORY_CONTEXT), REPEATED_FLAT_FIELD),
-        NESTED_READER_REPEATABLE_NULLABLE(() -> new NestedColumnReader<>(REPEATED_NULLABLE_FIELD, ValueDecoders::getIntDecoder, INT_ADAPTER, MEMORY_CONTEXT), REPEATED_NULLABLE_FIELD),
-        NESTED_READER_REPEATABLE_NESTED_NO_NULLS(() -> new NestedColumnReader<>(REPEATED_NESTED_FIELD, ValueDecoders::getIntDecoder, INT_ADAPTER, MEMORY_CONTEXT), REPEATED_NESTED_FIELD),
-        NESTED_READER_REPEATABLE_NESTED_NULLABLE(() -> new NestedColumnReader<>(REPEATED_NULLABLE_NESTED_FIELD, ValueDecoders::getIntDecoder, INT_ADAPTER, MEMORY_CONTEXT), REPEATED_NULLABLE_NESTED_FIELD),
-        REPEATABLE_NESTED_NULLABLE(() -> new IntColumnReader(REPEATED_NULLABLE_NESTED_FIELD), REPEATED_NULLABLE_NESTED_FIELD),
+        NESTED_READER_NO_NULLS(() -> createNestedColumnReader(FLAT_FIELD), FLAT_FIELD),
+        NESTED_READER_NULLABLE(() -> createNestedColumnReader(NULLABLE_FLAT_FIELD), NULLABLE_FLAT_FIELD),
+        NESTED_READER_NESTED_NO_NULLS(() -> createNestedColumnReader(NESTED_FIELD), NESTED_FIELD),
+        NESTED_READER_NESTED_NULLABLE(() -> createNestedColumnReader(NULLABLE_NESTED_FIELD), NULLABLE_NESTED_FIELD),
+        NESTED_READER_REPEATABLE_NO_NULLS(() -> createNestedColumnReader(REPEATED_FLAT_FIELD), REPEATED_FLAT_FIELD),
+        NESTED_READER_REPEATABLE_NULLABLE(() -> createNestedColumnReader(REPEATED_NULLABLE_FIELD), REPEATED_NULLABLE_FIELD),
+        NESTED_READER_REPEATABLE_NESTED_NO_NULLS(() -> createNestedColumnReader(REPEATED_NESTED_FIELD), REPEATED_NESTED_FIELD),
+        NESTED_READER_REPEATABLE_NESTED_NULLABLE(() -> createNestedColumnReader(REPEATED_NULLABLE_NESTED_FIELD), REPEATED_NULLABLE_NESTED_FIELD),
         /**/;
 
         private final Supplier<ColumnReader> columnReader;
@@ -98,4 +100,20 @@ public PrimitiveField getField()
             return field;
         }
     }
+
+    private static NestedColumnReader<int[]> createNestedColumnReader(PrimitiveField field)
+    {
+        ValueDecodersProvider<int[]> valueDecodersProvider = getIntDecodersProvider(field);
+        return new NestedColumnReader<>(
+                field,
+                valueDecodersProvider,
+                ValueDecoder::createLevelsDecoder,
+                (dictionaryPage, isNonNull) -> getDictionaryDecoder(
+                        dictionaryPage,
+                        INT_ADAPTER,
+                        valueDecodersProvider.create(PLAIN),
+                        isNonNull),
+                INT_ADAPTER,
+                MEMORY_CONTEXT);
+    }
 }
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestParquetDataSource.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestParquetDataSource.java
index ac7a1ac1a3d9..ff80346453f8 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestParquetDataSource.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestParquetDataSource.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.ListMultimap;
 import io.airlift.slice.Slice;
+import io.airlift.slice.SliceOutput;
 import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
 import io.trino.memory.context.AggregatedMemoryContext;
@@ -41,7 +42,7 @@ public class TestParquetDataSource
     public void testPlanReadOrdering(DataSize maxBufferSize)
             throws IOException
     {
-        Slice testingInput = Slices.wrappedIntArray(IntStream.range(0, 1000).toArray());
+        Slice testingInput = createTestingInput();
         TestingParquetDataSource dataSource = new TestingParquetDataSource(
                 testingInput,
                 new ParquetReaderOptions().withMaxBufferSize(maxBufferSize));
@@ -72,7 +73,7 @@ public Object[][] testPlanReadOrderingProvider()
     public void testMemoryAccounting()
             throws IOException
     {
-        Slice testingInput = Slices.wrappedIntArray(IntStream.range(0, 1000).toArray());
+        Slice testingInput = createTestingInput();
         TestingParquetDataSource dataSource = new TestingParquetDataSource(
                 testingInput,
                 new ParquetReaderOptions().withMaxBufferSize(DataSize.ofBytes(500)));
@@ -112,7 +113,7 @@ public void testMemoryAccounting()
     public void testChunkedInputStreamLazyLoading()
             throws IOException
     {
-        Slice testingInput = Slices.wrappedIntArray(IntStream.range(0, 1000).toArray());
+        Slice testingInput = createTestingInput();
         TestingParquetDataSource dataSource = new TestingParquetDataSource(
                 testingInput,
                 new ParquetReaderOptions()
@@ -138,4 +139,52 @@ public void testChunkedInputStreamLazyLoading()
         inputStreams.get("1").close();
         assertThat(memoryContext.getBytes()).isEqualTo(100);
     }
+
+    @Test
+    public void testMergeSmallReads()
+            throws IOException
+    {
+        Slice testingInput = createTestingInput();
+        TestingParquetDataSource dataSource = new TestingParquetDataSource(
+                testingInput,
+                new ParquetReaderOptions()
+                        .withMaxBufferSize(DataSize.ofBytes(500))
+                        .withMaxMergeDistance(DataSize.ofBytes(300)));
+        AggregatedMemoryContext memoryContext = newSimpleAggregatedMemoryContext();
+        Map<String, ChunkedInputStream> inputStreams = dataSource.planRead(
+                ImmutableListMultimap.<String, DiskRange>builder()
+                        .put("1", new DiskRange(0, 200))
+                        .put("1", new DiskRange(250, 50))
+                        .put("2", new DiskRange(400, 100))
+                        .put("2", new DiskRange(600, 200))
+                        .put("3", new DiskRange(1100, 50))
+                        .put("3", new DiskRange(1500, 50))
+                        .build(),
+                memoryContext);
+        assertThat(memoryContext.getBytes()).isEqualTo(0);
+
+        inputStreams.get("1").getSlice(200);
+        // Reads are merged only upto 500 bytes due to max-buffer-size
+        assertThat(memoryContext.getBytes()).isEqualTo(500);
+
+        inputStreams.get("2").getSlice(100);
+        // no extra read needed
+        assertThat(memoryContext.getBytes()).isEqualTo(500);
+
+        inputStreams.get("1").close();
+        inputStreams.get("2").close();
+        assertThat(memoryContext.getBytes()).isEqualTo(0);
+
+        inputStreams.get("3").getSlice(50);
+        // no merged read due to max-merge-distance
+        assertThat(memoryContext.getBytes()).isEqualTo(50);
+    }
+
+    private static Slice createTestingInput()
+    {
+        Slice testingInput = Slices.allocate(4000);
+        SliceOutput out = testingInput.getOutput();
+        IntStream.range(0, 1000).forEach(out::appendInt);
+        return testingInput;
+    }
 }
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestParquetReaderMemoryUsage.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestParquetReaderMemoryUsage.java
index 3c87e65b0e94..8ade0d3cbfbe 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestParquetReaderMemoryUsage.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestParquetReaderMemoryUsage.java
@@ -14,46 +14,28 @@
 package io.trino.parquet.reader;
 
 import com.google.common.collect.ImmutableList;
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
 import io.trino.memory.context.AggregatedMemoryContext;
-import io.trino.parquet.Field;
 import io.trino.parquet.ParquetDataSource;
 import io.trino.parquet.ParquetReaderOptions;
-import io.trino.parquet.writer.ParquetSchemaConverter;
-import io.trino.parquet.writer.ParquetWriter;
 import io.trino.parquet.writer.ParquetWriterOptions;
 import io.trino.spi.Page;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.LazyBlock;
 import io.trino.spi.type.Type;
-import org.apache.parquet.format.CompressionCodec;
-import org.apache.parquet.hadoop.metadata.BlockMetaData;
 import org.apache.parquet.hadoop.metadata.ParquetMetadata;
-import org.apache.parquet.io.MessageColumnIO;
-import org.joda.time.DateTimeZone;
 import org.testng.annotations.Test;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Throwables.throwIfUnchecked;
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
-import static io.trino.parquet.ParquetTypeUtils.constructField;
-import static io.trino.parquet.ParquetTypeUtils.getColumnIO;
-import static io.trino.parquet.ParquetTypeUtils.lookupColumnByName;
+import static io.trino.parquet.ParquetTestUtils.createParquetReader;
+import static io.trino.parquet.ParquetTestUtils.generateInputPages;
+import static io.trino.parquet.ParquetTestUtils.writeParquetFile;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
-import static io.trino.spi.type.TypeUtils.writeNativeValue;
-import static java.util.Collections.nCopies;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.joda.time.DateTimeZone.UTC;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestParquetReaderMemoryUsage
 {
@@ -65,7 +47,15 @@ public void testColumnReaderMemoryUsage()
         List<String> columnNames = ImmutableList.of("columnA", "columnB");
         List<Type> types = ImmutableList.of(INTEGER, BIGINT);
 
-        ParquetDataSource dataSource = new TestingParquetDataSource(writeParquetFile(types, columnNames), new ParquetReaderOptions());
+        ParquetDataSource dataSource = new TestingParquetDataSource(
+                writeParquetFile(
+                        ParquetWriterOptions.builder()
+                                .setMaxBlockSize(DataSize.ofBytes(1000))
+                                .build(),
+                        types,
+                        columnNames,
+                        generateInputPages(types, 100, 5)),
+                new ParquetReaderOptions());
         ParquetMetadata parquetMetadata = MetadataReader.readFooter(dataSource, Optional.empty());
         assertThat(parquetMetadata.getBlocks().size()).isGreaterThan(1);
         // Verify file has only non-dictionary encodings as dictionary memory usage is already tested in TestFlatColumnReader#testMemoryUsage
@@ -108,95 +98,4 @@ public void testColumnReaderMemoryUsage()
         reader.close();
         assertThat(memoryContext.getBytes()).isEqualTo(0);
     }
-
-    private static Slice writeParquetFile(List<Type> types, List<String> columnNames)
-            throws IOException
-    {
-        checkArgument(types.size() == columnNames.size());
-        ParquetSchemaConverter schemaConverter = new ParquetSchemaConverter(types, columnNames, false, false);
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        ParquetWriter writer = new ParquetWriter(
-                outputStream,
-                schemaConverter.getMessageType(),
-                schemaConverter.getPrimitiveTypes(),
-                ParquetWriterOptions.builder()
-                        .setMaxPageSize(DataSize.ofBytes(100))
-                        .setMaxBlockSize(DataSize.ofBytes(1))
-                        .build(),
-                CompressionCodec.SNAPPY,
-                "test-version",
-                false,
-                Optional.of(DateTimeZone.getDefault()),
-                Optional.empty());
-
-        for (io.trino.spi.Page inputPage : generateInputPages(types, 100, 5)) {
-            checkArgument(types.size() == inputPage.getChannelCount());
-            writer.write(inputPage);
-        }
-        writer.close();
-        return Slices.wrappedBuffer(outputStream.toByteArray());
-    }
-
-    private static List<io.trino.spi.Page> generateInputPages(List<Type> types, int positionsPerPage, int pageCount)
-    {
-        ImmutableList.Builder<io.trino.spi.Page> pagesBuilder = ImmutableList.builder();
-        for (int i = 0; i < pageCount; i++) {
-            List<Block> blocks = types.stream()
-                    .map(type -> generateBlock(type, positionsPerPage))
-                    .collect(toImmutableList());
-            pagesBuilder.add(new Page(blocks.toArray(Block[]::new)));
-        }
-        return pagesBuilder.build();
-    }
-
-    private static Block generateBlock(Type type, int positions)
-    {
-        BlockBuilder blockBuilder = type.createBlockBuilder(null, positions);
-        for (int i = 0; i < positions; i++) {
-            writeNativeValue(type, blockBuilder, (long) i);
-        }
-        return blockBuilder.build();
-    }
-
-    private static ParquetReader createParquetReader(
-            ParquetDataSource input,
-            ParquetMetadata parquetMetadata,
-            AggregatedMemoryContext memoryContext,
-            List<Type> types,
-            List<String> columnNames)
-            throws IOException
-    {
-        org.apache.parquet.hadoop.metadata.FileMetaData fileMetaData = parquetMetadata.getFileMetaData();
-        MessageColumnIO messageColumnIO = getColumnIO(fileMetaData.getSchema(), fileMetaData.getSchema());
-        ImmutableList.Builder<Field> columnFields = ImmutableList.builder();
-        for (int i = 0; i < types.size(); i++) {
-            columnFields.add(constructField(
-                    types.get(i),
-                    lookupColumnByName(messageColumnIO, columnNames.get(i)))
-                    .orElseThrow());
-        }
-        long nextStart = 0;
-        ImmutableList.Builder<Long> blockStartsBuilder = ImmutableList.builder();
-        for (BlockMetaData block : parquetMetadata.getBlocks()) {
-            blockStartsBuilder.add(nextStart);
-            nextStart += block.getRowCount();
-        }
-        List<Long> blockStarts = blockStartsBuilder.build();
-        return new ParquetReader(
-                Optional.ofNullable(fileMetaData.getCreatedBy()),
-                columnFields.build(),
-                parquetMetadata.getBlocks(),
-                blockStarts,
-                input,
-                UTC,
-                memoryContext,
-                new ParquetReaderOptions(),
-                exception -> {
-                    throwIfUnchecked(exception);
-                    return new RuntimeException(exception);
-                },
-                Optional.empty(),
-                nCopies(blockStarts.size(), Optional.empty()),
-                Optional.empty());
-    }
 }
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestTimeMillis.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestTimeMillis.java
new file mode 100644
index 000000000000..cd781878c1db
--- /dev/null
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestTimeMillis.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed 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 io.trino.parquet.reader;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.io.Resources;
+import io.trino.parquet.ParquetDataSource;
+import io.trino.parquet.ParquetReaderOptions;
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.type.SqlTime;
+import io.trino.spi.type.TimeType;
+import io.trino.spi.type.Type;
+import org.apache.parquet.hadoop.metadata.ParquetMetadata;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
+import static io.trino.parquet.ParquetTestUtils.createParquetReader;
+import static io.trino.spi.type.TimeType.TIME_MICROS;
+import static io.trino.spi.type.TimeType.TIME_MILLIS;
+import static io.trino.spi.type.TimeType.TIME_NANOS;
+import static io.trino.spi.type.TimeType.TIME_SECONDS;
+import static io.trino.testing.DataProviders.toDataProvider;
+import static io.trino.testing.TestingConnectorSession.SESSION;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestTimeMillis
+{
+    @Test(dataProvider = "timeTypeProvider")
+    public void testTimeMillsInt32(TimeType timeType)
+            throws Exception
+    {
+        List<String> columnNames = ImmutableList.of("COLUMN1", "COLUMN2");
+        List<Type> types = ImmutableList.of(timeType, timeType);
+        int precision = timeType.getPrecision();
+
+        ParquetDataSource dataSource = new FileParquetDataSource(
+                new File(Resources.getResource("time_millis_int32.snappy.parquet").toURI()),
+                new ParquetReaderOptions());
+        ParquetMetadata parquetMetadata = MetadataReader.readFooter(dataSource, Optional.empty());
+        ParquetReader reader = createParquetReader(dataSource, parquetMetadata, newSimpleAggregatedMemoryContext(), types, columnNames);
+
+        Page page = reader.nextPage();
+        Block block = page.getBlock(0).getLoadedBlock();
+        assertThat(block.getPositionCount()).isEqualTo(1);
+        // TIME '15:03:00'
+        assertThat(timeType.getObjectValue(SESSION, block, 0))
+                .isEqualTo(SqlTime.newInstance(precision, 54180000000000000L));
+
+        // TIME '23:59:59.999'
+        block = page.getBlock(1).getLoadedBlock();
+        assertThat(block.getPositionCount()).isEqualTo(1);
+        // Rounded up to 0 if precision < 3
+        assertThat(timeType.getObjectValue(SESSION, block, 0))
+                .isEqualTo(SqlTime.newInstance(precision, timeType == TIME_SECONDS ? 0L : 86399999000000000L));
+    }
+
+    @DataProvider
+    public static Object[][] timeTypeProvider()
+    {
+        return Stream.of(TIME_SECONDS, TIME_MILLIS, TIME_MICROS, TIME_NANOS)
+                .collect(toDataProvider());
+    }
+}
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestingChunkReader.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestingChunkReader.java
index 464860716f79..b9fc499b8b9b 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestingChunkReader.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestingChunkReader.java
@@ -15,8 +15,7 @@
 
 import io.airlift.slice.Slice;
 import io.trino.parquet.ChunkReader;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestingColumnReader.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestingColumnReader.java
index 65f3d0c07202..1f564a66f68c 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestingColumnReader.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestingColumnReader.java
@@ -24,8 +24,8 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.ByteArrayBlock;
 import io.trino.spi.block.DictionaryBlock;
+import io.trino.spi.block.Fixed12Block;
 import io.trino.spi.block.Int128ArrayBlock;
-import io.trino.spi.block.Int96ArrayBlock;
 import io.trino.spi.block.IntArrayBlock;
 import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
@@ -41,6 +41,7 @@
 import io.trino.spi.type.TimeZoneKey;
 import io.trino.spi.type.Timestamps;
 import io.trino.spi.type.Type;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.bytes.HeapByteBufferAllocator;
 import org.apache.parquet.column.Encoding;
 import org.apache.parquet.column.values.ValuesWriter;
@@ -59,10 +60,6 @@
 import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
 import org.testng.annotations.DataProvider;
 
-import javax.annotation.Nullable;
-
-import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.util.Arrays;
@@ -72,7 +69,7 @@
 import java.util.stream.Stream;
 
 import static com.google.common.collect.MoreCollectors.onlyElement;
-import static io.trino.parquet.ParquetTypeUtils.getParquetEncoding;
+import static io.trino.parquet.ParquetTestUtils.toTrinoDictionaryPage;
 import static io.trino.parquet.ParquetTypeUtils.paddingBigInteger;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
@@ -135,14 +132,14 @@ public class TestingColumnReader
             .put(TIME_MILLIS, LongArrayBlock.class)
             .put(TIMESTAMP_MILLIS, LongArrayBlock.class)
             .put(TIMESTAMP_TZ_MILLIS, LongArrayBlock.class)
-            .put(TIMESTAMP_TZ_NANOS, Int96ArrayBlock.class)
-            .put(TIMESTAMP_PICOS, Int96ArrayBlock.class)
+            .put(TIMESTAMP_TZ_NANOS, Fixed12Block.class)
+            .put(TIMESTAMP_PICOS, Fixed12Block.class)
             .put(UUID, Int128ArrayBlock.class)
             .buildOrThrow();
 
     private static final IntFunction<DictionaryValuesWriter> DICTIONARY_INT_WRITER =
             length -> new PlainIntegerDictionaryValuesWriter(Integer.MAX_VALUE, Encoding.RLE, Encoding.PLAIN, HeapByteBufferAllocator.getInstance());
-    private static final IntFunction<DictionaryValuesWriter> DICTIONARY_LONG_WRITER =
+    public static final IntFunction<DictionaryValuesWriter> DICTIONARY_LONG_WRITER =
             length -> new PlainLongDictionaryValuesWriter(Integer.MAX_VALUE, Encoding.RLE, Encoding.PLAIN, HeapByteBufferAllocator.getInstance());
     private static final IntFunction<DictionaryValuesWriter> DICTIONARY_FIXED_LENGTH_WRITER =
             length -> new PlainFixedLenArrayDictionaryValuesWriter(Integer.MAX_VALUE, length, Encoding.RLE, Encoding.PLAIN, HeapByteBufferAllocator.getInstance());
@@ -211,7 +208,7 @@ public class TestingColumnReader
         }
         return result;
     };
-    private static final Writer<Number> WRITE_LONG_TIMESTAMP = (writer, values) -> {
+    public static final Writer<Number> WRITE_LONG_TIMESTAMP = (writer, values) -> {
         Number[] result = new Number[values.length];
         for (int i = 0; i < values.length; i++) {
             if (values[i] != null) {
@@ -535,7 +532,7 @@ private static Assertion<DecodedTimestamp> assertInt96ShortWithTimezone()
         };
     }
 
-    private static Assertion<Number> assertLongTimestamp(int precision)
+    public static Assertion<Number> assertLongTimestamp(int precision)
     {
         int multiplier = IntMath.pow(10, precision);
         return (values, block, offset, blockOffset) ->
@@ -596,19 +593,6 @@ public static DictionaryPage getDictionaryPage(DictionaryValuesWriter dictionary
         return toTrinoDictionaryPage(apacheDictionaryPage);
     }
 
-    public static DictionaryPage toTrinoDictionaryPage(org.apache.parquet.column.page.DictionaryPage dictionary)
-    {
-        try {
-            return new DictionaryPage(
-                    Slices.wrappedBuffer(dictionary.getBytes().toByteArray()),
-                    dictionary.getDictionarySize(),
-                    getParquetEncoding(dictionary.getEncoding()));
-        }
-        catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
     @DataProvider(name = "readersWithPageVersions")
     public static Object[][] readersWithPageVersions()
     {
@@ -651,6 +635,8 @@ private static ColumnReaderFormat<?>[] columnReaders()
                 new ColumnReaderFormat<>(FLOAT, DoubleType.DOUBLE, PLAIN_WRITER, DICTIONARY_FLOAT_WRITER, WRITE_FLOAT, ASSERT_DOUBLE_STORED_AS_FLOAT),
                 new ColumnReaderFormat<>(DOUBLE, DoubleType.DOUBLE, PLAIN_WRITER, DICTIONARY_DOUBLE_WRITER, WRITE_DOUBLE, ASSERT_DOUBLE),
                 new ColumnReaderFormat<>(INT32, decimalType(0, 8), createDecimalType(8), PLAIN_WRITER, DICTIONARY_INT_WRITER, WRITE_INT, ASSERT_INT),
+                // INT32 can be read as a ShortDecimalType in Trino without decimal logical type annotation as well
+                new ColumnReaderFormat<>(INT32, createDecimalType(8, 0), PLAIN_WRITER, DICTIONARY_INT_WRITER, WRITE_INT, ASSERT_INT),
                 new ColumnReaderFormat<>(INT32, BIGINT, PLAIN_WRITER, DICTIONARY_INT_WRITER, WRITE_INT, ASSERT_LONG),
                 new ColumnReaderFormat<>(INT32, INTEGER, PLAIN_WRITER, DICTIONARY_INT_WRITER, WRITE_INT, ASSERT_INT),
                 new ColumnReaderFormat<>(INT32, SMALLINT, PLAIN_WRITER, DICTIONARY_INT_WRITER, WRITE_SHORT, ASSERT_SHORT),
@@ -667,6 +653,7 @@ private static ColumnReaderFormat<?>[] columnReaders()
                 new ColumnReaderFormat<>(FIXED_LEN_BYTE_ARRAY, 16, uuidType(), UUID, FIXED_LENGTH_WRITER, DICTIONARY_FIXED_LENGTH_WRITER, WRITE_UUID, ASSERT_INT_128),
                 new ColumnReaderFormat<>(FIXED_LEN_BYTE_ARRAY, 16, null, UUID, FIXED_LENGTH_WRITER, DICTIONARY_FIXED_LENGTH_WRITER, WRITE_UUID, ASSERT_INT_128),
                 // Trino type precision is irrelevant since the data is always stored as picoseconds
+                new ColumnReaderFormat<>(INT32, timeType(false, MILLIS), TimeType.TIME_MILLIS, PLAIN_WRITER, DICTIONARY_INT_WRITER, WRITE_INT, assertTime(9)),
                 new ColumnReaderFormat<>(INT64, timeType(false, MICROS), TimeType.TIME_MICROS, PLAIN_WRITER, DICTIONARY_LONG_WRITER, WRITE_LONG, assertTime(6)),
                 // Reading a column TimeLogicalTypeAnnotation as a BIGINT
                 new ColumnReaderFormat<>(INT64, timeType(false, MICROS), BIGINT, PLAIN_WRITER, DICTIONARY_LONG_WRITER, WRITE_LONG, ASSERT_LONG),
diff --git a/lib/trino-parquet/src/test/java/org/apache/parquet/internal/filter2/columnindex/TestingRowRanges.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestingRowRanges.java
similarity index 95%
rename from lib/trino-parquet/src/test/java/org/apache/parquet/internal/filter2/columnindex/TestingRowRanges.java
rename to lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestingRowRanges.java
index 856962a9a205..68d0d20bf55b 100644
--- a/lib/trino-parquet/src/test/java/org/apache/parquet/internal/filter2/columnindex/TestingRowRanges.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestingRowRanges.java
@@ -11,9 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.parquet.internal.filter2.columnindex;
+package io.trino.parquet.reader;
 
 import org.apache.parquet.internal.column.columnindex.OffsetIndex;
+import org.apache.parquet.internal.filter2.columnindex.RowRanges;
 
 import java.util.stream.IntStream;
 
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/AbstractValueDecodersTest.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/AbstractValueDecodersTest.java
index 81f9d19ccf98..0581a5273bfe 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/AbstractValueDecodersTest.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/AbstractValueDecodersTest.java
@@ -17,13 +17,15 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.trino.parquet.ParquetEncoding;
+import io.trino.parquet.ParquetTestUtils;
 import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.dictionary.Dictionary;
 import io.trino.parquet.reader.SimpleSliceInputStream;
-import io.trino.parquet.reader.TestingColumnReader;
 import io.trino.parquet.reader.flat.ColumnAdapter;
+import io.trino.parquet.reader.flat.DictionaryDecoder;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Type;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.bytes.ByteBufferInputStream;
 import org.apache.parquet.bytes.HeapByteBufferAllocator;
 import org.apache.parquet.column.ColumnDescriptor;
@@ -45,8 +47,6 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.ByteBuffer;
@@ -71,7 +71,6 @@
 import static io.trino.parquet.ParquetEncoding.RLE_DICTIONARY;
 import static io.trino.parquet.ValuesType.VALUES;
 import static io.trino.parquet.reader.decoders.ValueDecoder.ValueDecodersProvider;
-import static io.trino.parquet.reader.decoders.ValueDecoders.getDictionaryDecoder;
 import static io.trino.testing.DataProviders.cartesianProduct;
 import static io.trino.testing.DataProviders.concat;
 import static io.trino.testing.DataProviders.toDataProvider;
@@ -135,7 +134,7 @@ public <T> void testDecoder(
         DataBuffer dataBuffer = inputDataProvider.write(valuesWriter, dataSize);
 
         Optional<io.trino.parquet.DictionaryPage> dictionaryPage = Optional.ofNullable(dataBuffer.dictionaryPage())
-                .map(TestingColumnReader::toTrinoDictionaryPage);
+                .map(ParquetTestUtils::toTrinoDictionaryPage);
         Optional<Dictionary> dictionary = dictionaryPage.map(page -> {
             try {
                 return encoding.initDictionary(field.getDescriptor(), page);
@@ -147,12 +146,12 @@ public <T> void testDecoder(
         ValuesReader valuesReader = getApacheParquetReader(encoding, field, dictionary);
         ValueDecoder<T> apacheValuesDecoder = testType.apacheValuesDecoderProvider().apply(valuesReader);
 
-        Optional<ValueDecoder<T>> dictionaryDecoder = dictionaryPage.map(page -> getDictionaryDecoder(
+        Optional<ValueDecoder<T>> dictionaryDecoder = dictionaryPage.map(page -> DictionaryDecoder.getDictionaryDecoder(
                 page,
                 testType.columnAdapter(),
-                testType.optimizedValuesDecoderProvider().create(PLAIN, field),
+                testType.optimizedValuesDecoderProvider().create(PLAIN),
                 field.isRequired()));
-        ValueDecoder<T> optimizedValuesDecoder = dictionaryDecoder.orElseGet(() -> testType.optimizedValuesDecoderProvider().create(encoding, field));
+        ValueDecoder<T> optimizedValuesDecoder = dictionaryDecoder.orElseGet(() -> testType.optimizedValuesDecoderProvider().create(encoding));
 
         apacheValuesDecoder.init(new SimpleSliceInputStream(dataBuffer.dataPage()));
         optimizedValuesDecoder.init(new SimpleSliceInputStream(dataBuffer.dataPage()));
@@ -242,7 +241,7 @@ static <T> Object[][] testArgs(
     static ValuesReader getApacheParquetReader(ParquetEncoding encoding, PrimitiveField field, Optional<Dictionary> dictionary)
     {
         if (encoding == RLE_DICTIONARY || encoding == PLAIN_DICTIONARY) {
-            return encoding.getDictionaryBasedValuesReader(field.getDescriptor(), VALUES, dictionary.orElseThrow());
+            return new DictionaryReader(dictionary.orElseThrow());
         }
         checkArgument(dictionary.isEmpty(), "dictionary should be empty");
         return encoding.getValuesReader(field.getDescriptor(), VALUES);
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/ApacheParquetByteUnpacker.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/ApacheParquetByteUnpacker.java
index 467311aff8e8..56d6b17aff25 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/ApacheParquetByteUnpacker.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/ApacheParquetByteUnpacker.java
@@ -40,7 +40,7 @@ public void unpackDelta(byte[] output, int outputOffset, SimpleSliceInputStream
             input.readBytes(buffer, 0, byteWidth);
             delegate.unpack32Values(buffer, 0, outputBuffer, 0);
             for (int j = 0; j < 32; j++) {
-                output[i + j] += output[i + j - 1] + (byte) outputBuffer[j];
+                output[i + j] += (byte) (output[i + j - 1] + (byte) outputBuffer[j]);
             }
         }
     }
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/ApacheParquetShortUnpacker.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/ApacheParquetShortUnpacker.java
index fcca943995d6..d1d8c8a4e498 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/ApacheParquetShortUnpacker.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/ApacheParquetShortUnpacker.java
@@ -40,7 +40,7 @@ public void unpackDelta(short[] output, int outputOffset, SimpleSliceInputStream
             input.readBytes(buffer, 0, byteWidth);
             delegate.unpack32Values(buffer, 0, outputBuffer, 0);
             for (int j = 0; j < 32; j++) {
-                output[i + j] += output[i + j - 1] + (short) outputBuffer[j];
+                output[i + j] += (short) (output[i + j - 1] + (short) outputBuffer[j]);
             }
         }
     }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/dictionary/DictionaryReader.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/DictionaryReader.java
similarity index 92%
rename from lib/trino-parquet/src/main/java/io/trino/parquet/dictionary/DictionaryReader.java
rename to lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/DictionaryReader.java
index dd727bd604d1..e78176c62749 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/dictionary/DictionaryReader.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/DictionaryReader.java
@@ -11,8 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.parquet.dictionary;
+package io.trino.parquet.reader.decoders;
 
+import io.trino.parquet.dictionary.Dictionary;
 import org.apache.parquet.bytes.ByteBufferInputStream;
 import org.apache.parquet.bytes.BytesUtils;
 import org.apache.parquet.column.values.ValuesReader;
@@ -50,7 +51,7 @@ public int readValueDictionaryId()
     @Override
     public Binary readBytes()
     {
-        return dictionary.decodeToBinary(readInt());
+        return Binary.fromConstantByteArray(dictionary.decodeToSlice(readInt()).getBytes());
     }
 
     @Override
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestBooleanValueDecoders.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestBooleanValueDecoders.java
index 2137e70faf0e..702f522c22f0 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestBooleanValueDecoders.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestBooleanValueDecoders.java
@@ -14,6 +14,7 @@
 package io.trino.parquet.reader.decoders;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.parquet.PrimitiveField;
 import io.trino.spi.type.BooleanType;
 import org.apache.parquet.column.values.ValuesWriter;
 
@@ -35,10 +36,12 @@ public final class TestBooleanValueDecoders
     @Override
     protected Object[][] tests()
     {
+        PrimitiveField field = createField(BOOLEAN, OptionalInt.empty(), BooleanType.BOOLEAN);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return testArgs(
                 new TestType<>(
-                        createField(BOOLEAN, OptionalInt.empty(), BooleanType.BOOLEAN),
-                        ValueDecoders::getBooleanDecoder,
+                        field,
+                        valueDecoders::getBooleanDecoder,
                         BooleanApacheParquetValueDecoder::new,
                         BYTE_ADAPTER,
                         (actual, expected) -> assertThat(actual).isEqualTo(expected)),
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestByteArrayValueDecoders.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestByteArrayValueDecoders.java
index 980416afc23d..3e7f3ba69694 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestByteArrayValueDecoders.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestByteArrayValueDecoders.java
@@ -17,6 +17,7 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.trino.parquet.ParquetEncoding;
+import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 import io.trino.parquet.reader.flat.BinaryBuffer;
 import io.trino.spi.type.CharType;
@@ -69,33 +70,49 @@ protected Object[][] tests()
     {
         return DataProviders.concat(
                 testArgs(
-                        new TestType<>(
-                                createField(BINARY, OptionalInt.empty(), VARBINARY),
-                                ValueDecoders::getBinaryDecoder,
-                                BinaryApacheParquetValueDecoder::new,
-                                BINARY_ADAPTER,
-                                BINARY_ASSERT),
+                        createVarbinaryTestType(),
                         ENCODINGS,
                         generateUnboundedBinaryInputs()),
                 testArgs(
-                        new TestType<>(
-                                createField(BINARY, OptionalInt.empty(), createUnboundedVarcharType()),
-                                ValueDecoders::getBinaryDecoder,
-                                BinaryApacheParquetValueDecoder::new,
-                                BINARY_ADAPTER,
-                                BINARY_ASSERT),
+                        createUnboundedVarcharTestType(),
                         ENCODINGS,
                         generateUnboundedBinaryInputs()),
                 testArgs(createBoundedVarcharTestType(), ENCODINGS, generateBoundedVarcharInputs()),
                 testArgs(createCharTestType(), ENCODINGS, generateCharInputs()));
     }
 
+    private static TestType<BinaryBuffer> createVarbinaryTestType()
+    {
+        PrimitiveField field = createField(BINARY, OptionalInt.empty(), VARBINARY);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
+        return new TestType<>(
+                createField(BINARY, OptionalInt.empty(), VARBINARY),
+                valueDecoders::getBinaryDecoder,
+                BinaryApacheParquetValueDecoder::new,
+                BINARY_ADAPTER,
+                BINARY_ASSERT);
+    }
+
+    private static TestType<BinaryBuffer> createUnboundedVarcharTestType()
+    {
+        PrimitiveField field = createField(BINARY, OptionalInt.empty(), createUnboundedVarcharType());
+        ValueDecoders valueDecoders = new ValueDecoders(field);
+        return new TestType<>(
+                createField(BINARY, OptionalInt.empty(), createUnboundedVarcharType()),
+                valueDecoders::getBinaryDecoder,
+                BinaryApacheParquetValueDecoder::new,
+                BINARY_ADAPTER,
+                BINARY_ASSERT);
+    }
+
     private static TestType<BinaryBuffer> createBoundedVarcharTestType()
     {
         VarcharType varcharType = createVarcharType(5);
+        PrimitiveField field = createField(BINARY, OptionalInt.empty(), varcharType);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return new TestType<>(
-                createField(BINARY, OptionalInt.empty(), varcharType),
-                ValueDecoders::getBoundedVarcharBinaryDecoder,
+                field,
+                valueDecoders::getBoundedVarcharBinaryDecoder,
                 valuesReader -> new BoundedVarcharApacheParquetValueDecoder(valuesReader, varcharType),
                 BINARY_ADAPTER,
                 BINARY_ASSERT);
@@ -104,9 +121,11 @@ private static TestType<BinaryBuffer> createBoundedVarcharTestType()
     private static TestType<BinaryBuffer> createCharTestType()
     {
         CharType charType = createCharType(5);
+        PrimitiveField field = createField(BINARY, OptionalInt.empty(), charType);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return new TestType<>(
-                createField(BINARY, OptionalInt.empty(), charType),
-                ValueDecoders::getCharBinaryDecoder,
+                field,
+                valueDecoders::getCharBinaryDecoder,
                 valuesReader -> new CharApacheParquetValueDecoder(valuesReader, charType),
                 BINARY_ADAPTER,
                 BINARY_ASSERT);
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestByteValueDecoders.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestByteValueDecoders.java
index be8216710d92..e4e2ad582d72 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestByteValueDecoders.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestByteValueDecoders.java
@@ -14,6 +14,7 @@
 package io.trino.parquet.reader.decoders;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 import org.apache.parquet.column.values.ValuesReader;
 import org.apache.parquet.column.values.ValuesWriter;
@@ -41,10 +42,12 @@ public final class TestByteValueDecoders
     @Override
     protected Object[][] tests()
     {
+        PrimitiveField field = createField(INT32, OptionalInt.empty(), TINYINT);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return testArgs(
                 new TestType<>(
-                        createField(INT32, OptionalInt.empty(), TINYINT),
-                        ValueDecoders::getByteDecoder,
+                        field,
+                        valueDecoders::getByteDecoder,
                         ByteApacheParquetValueDecoder::new,
                         BYTE_ADAPTER,
                         (actual, expected) -> assertThat(actual).isEqualTo(expected)),
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestDoubleValueDecoders.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestDoubleValueDecoders.java
index acaf4bb0a01a..bd709e790738 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestDoubleValueDecoders.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestDoubleValueDecoders.java
@@ -14,6 +14,7 @@
 package io.trino.parquet.reader.decoders;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 import io.trino.spi.type.DoubleType;
 import org.apache.parquet.column.values.ValuesReader;
@@ -35,10 +36,12 @@ public final class TestDoubleValueDecoders
     @Override
     protected Object[][] tests()
     {
+        PrimitiveField field = createField(DOUBLE, OptionalInt.empty(), DoubleType.DOUBLE);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return testArgs(
                 new TestType<>(
-                        createField(DOUBLE, OptionalInt.empty(), DoubleType.DOUBLE),
-                        ValueDecoders::getDoubleDecoder,
+                        field,
+                        valueDecoders::getDoubleDecoder,
                         DoubleApacheParquetValueDecoder::new,
                         LONG_ADAPTER,
                         (actual, expected) -> assertThat(actual).isEqualTo(expected)),
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestFixedWidthByteArrayValueDecoders.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestFixedWidthByteArrayValueDecoders.java
index c71fcef3e0b6..72041f288a86 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestFixedWidthByteArrayValueDecoders.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestFixedWidthByteArrayValueDecoders.java
@@ -14,7 +14,6 @@
 package io.trino.parquet.reader.decoders;
 
 import com.google.common.collect.ImmutableList;
-import io.airlift.slice.Slices;
 import io.trino.parquet.ParquetEncoding;
 import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.SimpleSliceInputStream;
@@ -36,7 +35,7 @@
 import java.util.List;
 import java.util.OptionalInt;
 import java.util.Random;
-import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.BiConsumer;
 import java.util.stream.IntStream;
 
@@ -148,9 +147,10 @@ private static TestType<long[]> createShortDecimalTestType(int typeLength, int p
     {
         DecimalType decimalType = DecimalType.createDecimalType(precision, 2);
         PrimitiveField primitiveField = createField(FIXED_LEN_BYTE_ARRAY, OptionalInt.of(typeLength), decimalType);
+        ValueDecoders valueDecoders = new ValueDecoders(primitiveField);
         return new TestType<>(
                 primitiveField,
-                ValueDecoders::getFixedWidthShortDecimalDecoder,
+                valueDecoders::getFixedWidthShortDecimalDecoder,
                 valuesReader -> new ShortDecimalApacheParquetValueDecoder(valuesReader, primitiveField.getDescriptor()),
                 LONG_ADAPTER,
                 (actual, expected) -> assertThat(actual).isEqualTo(expected));
@@ -160,9 +160,11 @@ private static TestType<long[]> createLongDecimalTestType(int typeLength)
     {
         int precision = maxPrecision(typeLength);
         DecimalType decimalType = DecimalType.createDecimalType(precision, 2);
+        PrimitiveField field = createField(FIXED_LEN_BYTE_ARRAY, OptionalInt.of(typeLength), decimalType);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return new TestType<>(
-                createField(FIXED_LEN_BYTE_ARRAY, OptionalInt.of(typeLength), decimalType),
-                ValueDecoders::getFixedWidthLongDecimalDecoder,
+                field,
+                valueDecoders::getFixedWidthLongDecimalDecoder,
                 LongDecimalApacheParquetValueDecoder::new,
                 INT128_ADAPTER,
                 (actual, expected) -> assertThat(actual).isEqualTo(expected));
@@ -170,9 +172,11 @@ private static TestType<long[]> createLongDecimalTestType(int typeLength)
 
     private static TestType<long[]> createUuidTestType()
     {
+        PrimitiveField field = createField(FIXED_LEN_BYTE_ARRAY, OptionalInt.of(16), UuidType.UUID);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return new TestType<>(
-                createField(FIXED_LEN_BYTE_ARRAY, OptionalInt.of(16), UuidType.UUID),
-                ValueDecoders::getUuidDecoder,
+                field,
+                valueDecoders::getUuidDecoder,
                 UuidApacheParquetValueDecoder::new,
                 INT128_ADAPTER,
                 (actual, expected) -> assertThat(actual).isEqualTo(expected));
@@ -180,9 +184,11 @@ private static TestType<long[]> createUuidTestType()
 
     private static TestType<BinaryBuffer> createVarbinaryTestType(int typeLength)
     {
+        PrimitiveField field = createField(FIXED_LEN_BYTE_ARRAY, OptionalInt.of(typeLength), VARBINARY);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return new TestType<>(
-                createField(FIXED_LEN_BYTE_ARRAY, OptionalInt.of(typeLength), VARBINARY),
-                ValueDecoders::getFixedWidthBinaryDecoder,
+                field,
+                valueDecoders::getFixedWidthBinaryDecoder,
                 BinaryApacheParquetValueDecoder::new,
                 BINARY_ADAPTER,
                 BINARY_ASSERT);
@@ -190,9 +196,11 @@ private static TestType<BinaryBuffer> createVarbinaryTestType(int typeLength)
 
     private static TestType<BinaryBuffer> createVarcharTestType(int typeLength)
     {
+        PrimitiveField field = createField(FIXED_LEN_BYTE_ARRAY, OptionalInt.of(typeLength), VARCHAR);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return new TestType<>(
-                createField(FIXED_LEN_BYTE_ARRAY, OptionalInt.of(typeLength), VARCHAR),
-                ValueDecoders::getFixedWidthBinaryDecoder,
+                field,
+                valueDecoders::getFixedWidthBinaryDecoder,
                 BinaryApacheParquetValueDecoder::new,
                 BINARY_ADAPTER,
                 BINARY_ASSERT);
@@ -250,13 +258,9 @@ private static class UuidInputProvider
         @Override
         public DataBuffer write(ValuesWriter valuesWriter, int dataSize)
         {
-            byte[][] bytes = new byte[dataSize][];
+            byte[][] bytes = new byte[dataSize][16];
             for (int i = 0; i < dataSize; i++) {
-                UUID uuid = UUID.randomUUID();
-                bytes[i] = Slices.wrappedLongArray(
-                                uuid.getMostSignificantBits(),
-                                uuid.getLeastSignificantBits())
-                        .getBytes();
+                ThreadLocalRandom.current().nextBytes(bytes[i]);
             }
             return writeBytes(valuesWriter, bytes);
         }
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestFloatValueDecoders.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestFloatValueDecoders.java
index f7c97f8fa32a..40b08d55cb3c 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestFloatValueDecoders.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestFloatValueDecoders.java
@@ -14,6 +14,7 @@
 package io.trino.parquet.reader.decoders;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 import org.apache.parquet.column.values.ValuesReader;
 import org.apache.parquet.column.values.ValuesWriter;
@@ -35,10 +36,12 @@ public final class TestFloatValueDecoders
     @Override
     protected Object[][] tests()
     {
+        PrimitiveField field = createField(FLOAT, OptionalInt.empty(), REAL);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return testArgs(
                 new TestType<>(
-                        createField(FLOAT, OptionalInt.empty(), REAL),
-                        ValueDecoders::getRealDecoder,
+                        field,
+                        valueDecoders::getRealDecoder,
                         FloatApacheParquetValueDecoder::new,
                         INT_ADAPTER,
                         (actual, expected) -> assertThat(actual).isEqualTo(expected)),
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestInt96ValueDecoder.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestInt96ValueDecoder.java
index 010ecfbb7990..53bc25b90203 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestInt96ValueDecoder.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestInt96ValueDecoder.java
@@ -14,8 +14,10 @@
 package io.trino.parquet.reader.decoders;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 import io.trino.plugin.base.type.DecodedTimestamp;
+import io.trino.spi.block.Fixed12Block;
 import org.apache.parquet.column.values.ValuesReader;
 import org.apache.parquet.column.values.ValuesWriter;
 
@@ -28,8 +30,7 @@
 import static io.trino.parquet.ParquetEncoding.RLE_DICTIONARY;
 import static io.trino.parquet.ParquetTimestampUtils.decodeInt96Timestamp;
 import static io.trino.parquet.reader.TestingColumnReader.encodeInt96Timestamp;
-import static io.trino.parquet.reader.flat.Int96ColumnAdapter.INT96_ADAPTER;
-import static io.trino.parquet.reader.flat.Int96ColumnAdapter.Int96Buffer;
+import static io.trino.parquet.reader.flat.Fixed12ColumnAdapter.FIXED12_ADAPTER;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
 import static java.time.ZoneOffset.UTC;
 import static java.time.temporal.ChronoField.NANO_OF_SECOND;
@@ -43,16 +44,15 @@ public final class TestInt96ValueDecoder
     @Override
     protected Object[][] tests()
     {
+        PrimitiveField field = createField(INT96, OptionalInt.empty(), TIMESTAMP_NANOS);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return testArgs(
                 new TestType<>(
-                        createField(INT96, OptionalInt.empty(), TIMESTAMP_NANOS),
-                        ValueDecoders::getInt96Decoder,
+                        field,
+                        valueDecoders::getInt96TimestampDecoder,
                         Int96ApacheParquetValueDecoder::new,
-                        INT96_ADAPTER,
-                        (actual, expected) -> {
-                            assertThat(actual.longs).isEqualTo(expected.longs);
-                            assertThat(actual.ints).isEqualTo(expected.ints);
-                        }),
+                        FIXED12_ADAPTER,
+                        (actual, expected) -> assertThat(actual).isEqualTo(expected)),
                 ImmutableList.of(PLAIN, RLE_DICTIONARY),
                 TimestampInputProvider.values());
     }
@@ -125,7 +125,7 @@ private static DataBuffer writeValues(ValuesWriter valuesWriter, long[] epochSec
     }
 
     public static final class Int96ApacheParquetValueDecoder
-            implements ValueDecoder<Int96Buffer>
+            implements ValueDecoder<int[]>
     {
         private final ValuesReader delegate;
 
@@ -141,13 +141,16 @@ public void init(SimpleSliceInputStream input)
         }
 
         @Override
-        public void read(Int96Buffer values, int offset, int length)
+        public void read(int[] values, int offset, int length)
         {
             int endOffset = offset + length;
             for (int i = offset; i < endOffset; i++) {
                 DecodedTimestamp decodedTimestamp = decodeInt96Timestamp(delegate.readBytes());
-                values.longs[i] = decodedTimestamp.epochSeconds();
-                values.ints[i] = decodedTimestamp.nanosOfSecond();
+                Fixed12Block.encodeFixed12(
+                        decodedTimestamp.epochSeconds(),
+                        decodedTimestamp.nanosOfSecond(),
+                        values,
+                        i);
             }
         }
 
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestIntValueDecoders.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestIntValueDecoders.java
index c151a67325c6..c074bd843eb0 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestIntValueDecoders.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestIntValueDecoders.java
@@ -14,11 +14,14 @@
 package io.trino.parquet.reader.decoders;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.parquet.ParquetEncoding;
+import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 import org.apache.parquet.column.values.ValuesReader;
 import org.apache.parquet.column.values.ValuesWriter;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.OptionalInt;
 import java.util.Random;
 import java.util.stream.IntStream;
@@ -40,30 +43,46 @@
 public final class TestIntValueDecoders
         extends AbstractValueDecodersTest
 {
+    private static final List<ParquetEncoding> ENCODINGS = ImmutableList.of(PLAIN, RLE_DICTIONARY, DELTA_BINARY_PACKED);
+
     @Override
     protected Object[][] tests()
     {
         return concat(
                 testArgs(
-                        new TestType<>(
-                                createField(INT32, OptionalInt.empty(), INTEGER),
-                                ValueDecoders::getIntDecoder,
-                                IntApacheParquetValueDecoder::new,
-                                INT_ADAPTER,
-                                (actual, expected) -> assertThat(actual).isEqualTo(expected)),
-                        ImmutableList.of(PLAIN, RLE_DICTIONARY, DELTA_BINARY_PACKED),
+                        createIntegerTestType(),
+                        ENCODINGS,
                         generateInputDataProviders()),
                 testArgs(
-                        new TestType<>(
-                                createField(INT32, OptionalInt.empty(), BIGINT),
-                                TransformingValueDecoders::getInt32ToLongDecoder,
-                                IntToLongApacheParquetValueDecoder::new,
-                                LONG_ADAPTER,
-                                (actual, expected) -> assertThat(actual).isEqualTo(expected)),
-                        ImmutableList.of(PLAIN, RLE_DICTIONARY, DELTA_BINARY_PACKED),
+                        createBigIntegerTestType(),
+                        ENCODINGS,
                         generateInputDataProviders()));
     }
 
+    private static TestType<int[]> createIntegerTestType()
+    {
+        PrimitiveField field = createField(INT32, OptionalInt.empty(), INTEGER);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
+        return new TestType<>(
+                field,
+                valueDecoders::getIntDecoder,
+                IntApacheParquetValueDecoder::new,
+                INT_ADAPTER,
+                (actual, expected) -> assertThat(actual).isEqualTo(expected));
+    }
+
+    private TestType<long[]> createBigIntegerTestType()
+    {
+        PrimitiveField field = createField(INT32, OptionalInt.empty(), BIGINT);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
+        return new TestType<>(
+                field,
+                valueDecoders::getInt32ToLongDecoder,
+                IntToLongApacheParquetValueDecoder::new,
+                LONG_ADAPTER,
+                (actual, expected) -> assertThat(actual).isEqualTo(expected));
+    }
+
     private static InputDataProvider[] generateInputDataProviders()
     {
         return Stream.concat(
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestLongValueDecoders.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestLongValueDecoders.java
index c7fa43496c71..ee22f30d4891 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestLongValueDecoders.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestLongValueDecoders.java
@@ -14,6 +14,7 @@
 package io.trino.parquet.reader.decoders;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 import org.apache.parquet.column.values.ValuesReader;
 import org.apache.parquet.column.values.ValuesWriter;
@@ -40,10 +41,12 @@ public final class TestLongValueDecoders
     @Override
     protected Object[][] tests()
     {
+        PrimitiveField field = createField(INT64, OptionalInt.empty(), BIGINT);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return testArgs(
                 new TestType<>(
-                        createField(INT64, OptionalInt.empty(), BIGINT),
-                        ValueDecoders::getLongDecoder,
+                        field,
+                        valueDecoders::getLongDecoder,
                         LongApacheParquetValueDecoder::new,
                         LONG_ADAPTER,
                         (actual, expected) -> assertThat(actual).isEqualTo(expected)),
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestShortValueDecoders.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestShortValueDecoders.java
index 228acadfebbc..d25f61b6b590 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestShortValueDecoders.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/decoders/TestShortValueDecoders.java
@@ -14,6 +14,7 @@
 package io.trino.parquet.reader.decoders;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.SimpleSliceInputStream;
 import org.apache.parquet.column.values.ValuesReader;
 import org.apache.parquet.column.values.ValuesWriter;
@@ -41,10 +42,12 @@ public final class TestShortValueDecoders
     @Override
     protected Object[][] tests()
     {
+        PrimitiveField field = createField(INT32, OptionalInt.empty(), SMALLINT);
+        ValueDecoders valueDecoders = new ValueDecoders(field);
         return testArgs(
                 new TestType<>(
-                        createField(INT32, OptionalInt.empty(), SMALLINT),
-                        ValueDecoders::getShortDecoder,
+                        field,
+                        valueDecoders::getShortDecoder,
                         ShortApacheParquetValueDecoder::new,
                         SHORT_ADAPTER,
                         (actual, expected) -> assertThat(actual).isEqualTo(expected)),
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/BenchmarkFlatDefinitionLevelDecoder.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/BenchmarkFlatDefinitionLevelDecoder.java
index 3f94b32f055b..ce2b29429e56 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/BenchmarkFlatDefinitionLevelDecoder.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/BenchmarkFlatDefinitionLevelDecoder.java
@@ -84,7 +84,8 @@ public void setup()
     public int read()
             throws IOException
     {
-        NullsDecoder decoder = new NullsDecoder(Slices.wrappedBuffer(data));
+        NullsDecoder decoder = new NullsDecoder();
+        decoder.init(Slices.wrappedBuffer(data));
         int nonNullCount = 0;
         for (int i = 0; i < size; i += BATCH_SIZE) {
             nonNullCount += decoder.readNext(output, i, Math.min(BATCH_SIZE, size - i));
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/TestFlatColumnReader.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/TestFlatColumnReader.java
index 27eec90cb743..1ef5d574c688 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/TestFlatColumnReader.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/TestFlatColumnReader.java
@@ -18,7 +18,6 @@
 import io.trino.parquet.DataPage;
 import io.trino.parquet.DataPageV1;
 import io.trino.parquet.ParquetEncoding;
-import io.trino.parquet.ParquetReaderOptions;
 import io.trino.parquet.PrimitiveField;
 import io.trino.parquet.reader.AbstractColumnReaderTest;
 import io.trino.parquet.reader.ColumnReader;
@@ -63,11 +62,8 @@ public class TestFlatColumnReader
     @Override
     protected ColumnReader createColumnReader(PrimitiveField field)
     {
-        ColumnReader columnReader = ColumnReaderFactory.create(
-                field,
-                UTC,
-                newSimpleAggregatedMemoryContext(),
-                new ParquetReaderOptions().withBatchColumnReaders(true));
+        ColumnReaderFactory columnReaderFactory = new ColumnReaderFactory(UTC);
+        ColumnReader columnReader = columnReaderFactory.create(field, newSimpleAggregatedMemoryContext());
         assertThat(columnReader).isInstanceOf(FlatColumnReader.class);
         return columnReader;
     }
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/TestNullsDecoder.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/TestNullsDecoder.java
index 01002bfcac40..8003acbe7bda 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/TestNullsDecoder.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/TestNullsDecoder.java
@@ -54,7 +54,8 @@ public void testDecoding(NullValuesProvider nullValuesProvider, int batchSize)
     {
         boolean[] values = nullValuesProvider.getPositions();
         byte[] encoded = encode(values);
-        NullsDecoder decoder = new NullsDecoder(Slices.wrappedBuffer(encoded));
+        NullsDecoder decoder = new NullsDecoder();
+        decoder.init(Slices.wrappedBuffer(encoded));
         boolean[] result = new boolean[N];
         int nonNullCount = 0;
         for (int i = 0; i < N; i += batchSize) {
@@ -74,7 +75,8 @@ public void testSkippedDecoding(NullValuesProvider nullValuesProvider, int batch
     {
         boolean[] values = nullValuesProvider.getPositions();
         byte[] encoded = encode(values);
-        NullsDecoder decoder = new NullsDecoder(Slices.wrappedBuffer(encoded));
+        NullsDecoder decoder = new NullsDecoder();
+        decoder.init(Slices.wrappedBuffer(encoded));
         int nonNullCount = 0;
         int numberOfBatches = (N + batchSize - 1) / batchSize;
         Random random = new Random(batchSize * 0xFFFFFFFFL * N);
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/TestRowRangesIterator.java b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/TestRowRangesIterator.java
index 8861e0d75748..e5f933b9edee 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/TestRowRangesIterator.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/reader/flat/TestRowRangesIterator.java
@@ -21,8 +21,8 @@
 import java.util.OptionalLong;
 
 import static io.trino.parquet.reader.FilteredRowRanges.RowRange;
-import static org.apache.parquet.internal.filter2.columnindex.TestingRowRanges.toRowRange;
-import static org.apache.parquet.internal.filter2.columnindex.TestingRowRanges.toRowRanges;
+import static io.trino.parquet.reader.TestingRowRanges.toRowRange;
+import static io.trino.parquet.reader.TestingRowRanges.toRowRanges;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/writer/NullsProvider.java b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/NullsProvider.java
new file mode 100644
index 000000000000..f0b383626468
--- /dev/null
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/NullsProvider.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed 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 io.trino.parquet.writer;
+
+import org.testng.annotations.DataProvider;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.Random;
+import java.util.stream.Stream;
+
+import static io.trino.testing.DataProviders.toDataProvider;
+
+enum NullsProvider
+{
+    NO_NULLS {
+        @Override
+        Optional<boolean[]> getNulls(int positionCount)
+        {
+            return Optional.empty();
+        }
+    },
+    NO_NULLS_WITH_MAY_HAVE_NULL {
+        @Override
+        Optional<boolean[]> getNulls(int positionCount)
+        {
+            return Optional.of(new boolean[positionCount]);
+        }
+    },
+    ALL_NULLS {
+        @Override
+        Optional<boolean[]> getNulls(int positionCount)
+        {
+            boolean[] nulls = new boolean[positionCount];
+            Arrays.fill(nulls, true);
+            return Optional.of(nulls);
+        }
+    },
+    RANDOM_NULLS {
+        @Override
+        Optional<boolean[]> getNulls(int positionCount)
+        {
+            boolean[] nulls = new boolean[positionCount];
+            for (int i = 0; i < positionCount; i++) {
+                nulls[i] = RANDOM.nextBoolean();
+            }
+            return Optional.of(nulls);
+        }
+    },
+    GROUPED_NULLS {
+        @Override
+        Optional<boolean[]> getNulls(int positionCount)
+        {
+            boolean[] nulls = new boolean[positionCount];
+            int maxGroupSize = 23;
+            int position = 0;
+            while (position < positionCount) {
+                int remaining = positionCount - position;
+                int groupSize = Math.min(RANDOM.nextInt(maxGroupSize) + 1, remaining);
+                Arrays.fill(nulls, position, position + groupSize, RANDOM.nextBoolean());
+                position += groupSize;
+            }
+            return Optional.of(nulls);
+        }
+    };
+
+    private static final Random RANDOM = new Random(42);
+
+    abstract Optional<boolean[]> getNulls(int positionCount);
+
+    Optional<boolean[]> getNulls(int positionCount, Optional<boolean[]> forcedNulls)
+    {
+        Optional<boolean[]> nulls = getNulls(positionCount);
+        if (forcedNulls.isEmpty()) {
+            return nulls;
+        }
+        if (nulls.isEmpty()) {
+            return forcedNulls;
+        }
+
+        boolean[] nullPositions = nulls.get();
+        boolean[] forcedNullPositions = forcedNulls.get();
+        for (int i = 0; i < positionCount; i++) {
+            if (forcedNullPositions[i]) {
+                nullPositions[i] = true;
+            }
+        }
+        return Optional.of(nullPositions);
+    }
+
+    @DataProvider
+    public static Object[][] nullsProviders()
+    {
+        return Stream.of(NullsProvider.values())
+                .collect(toDataProvider());
+    }
+}
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/RepLevelIterable.java b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/RepLevelIterable.java
similarity index 96%
rename from lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/RepLevelIterable.java
rename to lib/trino-parquet/src/test/java/io/trino/parquet/writer/RepLevelIterable.java
index 02dff21502ed..ead832090e77 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/RepLevelIterable.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/RepLevelIterable.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.parquet.writer.repdef;
+package io.trino.parquet.writer;
 
 import com.google.common.collect.AbstractIterator;
 
@@ -59,7 +59,7 @@ boolean isNull()
             return isNull;
         }
 
-        int value()
+        public int value()
         {
             return this.value;
         }
diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/RepLevelIterables.java b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/RepLevelIterables.java
similarity index 97%
rename from lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/RepLevelIterables.java
rename to lib/trino-parquet/src/test/java/io/trino/parquet/writer/RepLevelIterables.java
index 921628922adc..9bd19becc5c5 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/repdef/RepLevelIterables.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/RepLevelIterables.java
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.parquet.writer.repdef;
+package io.trino.parquet.writer;
 
 import com.google.common.collect.AbstractIterator;
-import io.trino.parquet.writer.repdef.RepLevelIterable.RepValueIterator;
-import io.trino.parquet.writer.repdef.RepLevelIterable.RepetitionLevel;
+import io.trino.parquet.writer.RepLevelIterable.RepValueIterator;
+import io.trino.parquet.writer.RepLevelIterable.RepetitionLevel;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.ColumnarArray;
 import io.trino.spi.block.ColumnarMap;
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestDefinitionLevelWriter.java b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestDefinitionLevelWriter.java
index 8391a5ed6d99..3cab34ede5f5 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestDefinitionLevelWriter.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestDefinitionLevelWriter.java
@@ -18,69 +18,34 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.ColumnarArray;
 import io.trino.spi.block.ColumnarMap;
-import io.trino.spi.block.ColumnarRow;
 import io.trino.spi.block.LongArrayBlock;
-import io.trino.spi.type.MapType;
-import io.trino.spi.type.TypeOperators;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
-import org.apache.parquet.bytes.BytesInput;
-import org.apache.parquet.column.Encoding;
-import org.apache.parquet.column.values.ValuesWriter;
-import org.testng.annotations.DataProvider;
+import io.trino.spi.block.RowBlock;
 import org.testng.annotations.Test;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.Random;
-import java.util.stream.Stream;
 
+import static io.trino.parquet.ParquetTestUtils.createArrayBlock;
+import static io.trino.parquet.ParquetTestUtils.createMapBlock;
+import static io.trino.parquet.ParquetTestUtils.createRowBlock;
+import static io.trino.parquet.ParquetTestUtils.generateGroupSizes;
 import static io.trino.parquet.writer.repdef.DefLevelWriterProvider.DefinitionLevelWriter;
 import static io.trino.parquet.writer.repdef.DefLevelWriterProvider.ValuesCount;
 import static io.trino.parquet.writer.repdef.DefLevelWriterProvider.getRootDefinitionLevelWriter;
-import static io.trino.spi.block.ArrayBlock.fromElementBlock;
 import static io.trino.spi.block.ColumnarArray.toColumnarArray;
 import static io.trino.spi.block.ColumnarMap.toColumnarMap;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
-import static io.trino.spi.block.MapBlock.fromKeyValueBlock;
-import static io.trino.spi.block.RowBlock.fromFieldBlocks;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.testing.DataProviders.toDataProvider;
-import static java.lang.Math.toIntExact;
+import static io.trino.spi.block.RowBlock.getNullSuppressedRowFieldsFromBlock;
 import static java.util.Collections.nCopies;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDefinitionLevelWriter
 {
     private static final int POSITIONS = 8096;
-    private static final Random RANDOM = new Random(42);
-    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
 
-    private static final boolean[] ALL_NULLS_ARRAY = new boolean[POSITIONS];
-    private static final boolean[] RANDOM_NULLS_ARRAY = new boolean[POSITIONS];
-    private static final boolean[] GROUPED_NULLS_ARRAY = new boolean[POSITIONS];
-
-    static {
-        Arrays.fill(ALL_NULLS_ARRAY, true);
-        for (int i = 0; i < POSITIONS; i++) {
-            RANDOM_NULLS_ARRAY[i] = RANDOM.nextBoolean();
-        }
-
-        int maxGroupSize = 23;
-        int position = 0;
-        while (position < POSITIONS) {
-            int remaining = POSITIONS - position;
-            int groupSize = Math.min(RANDOM.nextInt(maxGroupSize) + 1, remaining);
-            Arrays.fill(GROUPED_NULLS_ARRAY, position, position + groupSize, RANDOM.nextBoolean());
-            position += groupSize;
-        }
-    }
-
-    @Test(dataProvider = "primitiveBlockProvider")
-    public void testWritePrimitiveDefinitionLevels(PrimitiveBlockProvider blockProvider)
+    @Test(dataProviderClass = NullsProvider.class, dataProvider = "nullsProviders")
+    public void testWritePrimitiveDefinitionLevels(NullsProvider nullsProvider)
     {
-        Block block = blockProvider.getInputBlock();
+        Block block = new LongArrayBlock(POSITIONS, nullsProvider.getNulls(POSITIONS), new long[POSITIONS]);
         int maxDefinitionLevel = 3;
         // Write definition levels for all positions
         assertDefinitionLevels(block, ImmutableList.of(), maxDefinitionLevel);
@@ -92,154 +57,43 @@ public void testWritePrimitiveDefinitionLevels(PrimitiveBlockProvider blockProvi
         assertDefinitionLevels(block, generateGroupSizes(block.getPositionCount()), maxDefinitionLevel);
     }
 
-    @DataProvider
-    public static Object[][] primitiveBlockProvider()
+    @Test(dataProviderClass = NullsProvider.class, dataProvider = "nullsProviders")
+    public void testWriteRowDefinitionLevels(NullsProvider nullsProvider)
     {
-        return Stream.of(PrimitiveBlockProvider.values())
-                .collect(toDataProvider());
-    }
-
-    private enum PrimitiveBlockProvider
-    {
-        NO_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return new LongArrayBlock(POSITIONS, Optional.empty(), new long[POSITIONS]);
-            }
-        },
-        NO_NULLS_WITH_MAY_HAVE_NULL {
-            @Override
-            Block getInputBlock()
-            {
-                return new LongArrayBlock(POSITIONS, Optional.of(new boolean[POSITIONS]), new long[POSITIONS]);
-            }
-        },
-        ALL_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return new LongArrayBlock(POSITIONS, Optional.of(ALL_NULLS_ARRAY), new long[POSITIONS]);
-            }
-        },
-        RANDOM_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return new LongArrayBlock(POSITIONS, Optional.of(RANDOM_NULLS_ARRAY), new long[POSITIONS]);
-            }
-        },
-        GROUPED_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return new LongArrayBlock(POSITIONS, Optional.of(GROUPED_NULLS_ARRAY), new long[POSITIONS]);
-            }
-        };
-
-        abstract Block getInputBlock();
-    }
-
-    @Test(dataProvider = "rowBlockProvider")
-    public void testWriteRowDefinitionLevels(RowBlockProvider blockProvider)
-    {
-        ColumnarRow columnarRow = toColumnarRow(blockProvider.getInputBlock());
+        RowBlock rowBlock = createRowBlock(nullsProvider.getNulls(POSITIONS), POSITIONS);
+        List<Block> fields = getNullSuppressedRowFieldsFromBlock(rowBlock);
         int fieldMaxDefinitionLevel = 2;
         // Write definition levels for all positions
-        for (int field = 0; field < columnarRow.getFieldCount(); field++) {
-            assertDefinitionLevels(columnarRow, ImmutableList.of(), field, fieldMaxDefinitionLevel);
+        for (int field = 0; field < fields.size(); field++) {
+            assertDefinitionLevels(rowBlock, fields, ImmutableList.of(), field, fieldMaxDefinitionLevel);
         }
 
         // Write definition levels for all positions one-at-a-time
-        for (int field = 0; field < columnarRow.getFieldCount(); field++) {
+        for (int field = 0; field < fields.size(); field++) {
             assertDefinitionLevels(
-                    columnarRow,
-                    nCopies(columnarRow.getPositionCount(), 1),
+                    rowBlock,
+                    fields,
+                    nCopies(rowBlock.getPositionCount(), 1),
                     field,
                     fieldMaxDefinitionLevel);
         }
 
         // Write definition levels for all positions with different group sizes
-        for (int field = 0; field < columnarRow.getFieldCount(); field++) {
+        for (int field = 0; field < fields.size(); field++) {
             assertDefinitionLevels(
-                    columnarRow,
-                    generateGroupSizes(columnarRow.getPositionCount()),
+                    rowBlock,
+                    fields,
+                    generateGroupSizes(rowBlock.getPositionCount()),
                     field,
                     fieldMaxDefinitionLevel);
         }
     }
 
-    @DataProvider
-    public static Object[][] rowBlockProvider()
-    {
-        return Stream.of(RowBlockProvider.values())
-                .collect(toDataProvider());
-    }
-
-    private enum RowBlockProvider
+    @Test(dataProviderClass = NullsProvider.class, dataProvider = "nullsProviders")
+    public void testWriteArrayDefinitionLevels(NullsProvider nullsProvider)
     {
-        NO_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return createRowBlock(Optional.empty());
-            }
-        },
-        NO_NULLS_WITH_MAY_HAVE_NULL {
-            @Override
-            Block getInputBlock()
-            {
-                return createRowBlock(Optional.of(new boolean[POSITIONS]));
-            }
-        },
-        ALL_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return createRowBlock(Optional.of(ALL_NULLS_ARRAY));
-            }
-        },
-        RANDOM_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return createRowBlock(Optional.of(RANDOM_NULLS_ARRAY));
-            }
-        },
-        GROUPED_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return createRowBlock(Optional.of(GROUPED_NULLS_ARRAY));
-            }
-        };
-
-        abstract Block getInputBlock();
-
-        private static Block createRowBlock(Optional<boolean[]> rowIsNull)
-        {
-            int positionCount = rowIsNull.map(isNull -> isNull.length).orElse(0) - toIntExact(rowIsNull.stream().count());
-            int fieldCount = 4;
-            Block[] fieldBlocks = new Block[fieldCount];
-            // no nulls block
-            fieldBlocks[0] = new LongArrayBlock(positionCount, Optional.empty(), new long[positionCount]);
-            // no nulls with mayHaveNull block
-            fieldBlocks[1] = new LongArrayBlock(positionCount, Optional.of(new boolean[positionCount]), new long[positionCount]);
-            // all nulls block
-            boolean[] allNulls = new boolean[positionCount];
-            Arrays.fill(allNulls, false);
-            fieldBlocks[2] = new LongArrayBlock(positionCount, Optional.of(allNulls), new long[positionCount]);
-            // random nulls block
-            fieldBlocks[3] = createLongsBlockWithRandomNulls(positionCount);
-
-            return fromFieldBlocks(positionCount, rowIsNull, fieldBlocks);
-        }
-    }
-
-    @Test(dataProvider = "arrayBlockProvider")
-    public void testWriteArrayDefinitionLevels(ArrayBlockProvider blockProvider)
-    {
-        ColumnarArray columnarArray = toColumnarArray(blockProvider.getInputBlock());
+        Block arrayBlock = createArrayBlock(nullsProvider.getNulls(POSITIONS), POSITIONS);
+        ColumnarArray columnarArray = toColumnarArray(arrayBlock);
         int maxDefinitionLevel = 3;
         // Write definition levels for all positions
         assertDefinitionLevels(
@@ -260,64 +114,11 @@ public void testWriteArrayDefinitionLevels(ArrayBlockProvider blockProvider)
                 maxDefinitionLevel);
     }
 
-    @DataProvider
-    public static Object[][] arrayBlockProvider()
-    {
-        return Stream.of(ArrayBlockProvider.values())
-                .collect(toDataProvider());
-    }
-
-    private enum ArrayBlockProvider
-    {
-        NO_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return createArrayBlock(Optional.empty());
-            }
-        },
-        NO_NULLS_WITH_MAY_HAVE_NULL {
-            @Override
-            Block getInputBlock()
-            {
-                return createArrayBlock(Optional.of(new boolean[POSITIONS]));
-            }
-        },
-        ALL_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return createArrayBlock(Optional.of(ALL_NULLS_ARRAY));
-            }
-        },
-        RANDOM_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return createArrayBlock(Optional.of(RANDOM_NULLS_ARRAY));
-            }
-        },
-        GROUPED_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return createArrayBlock(Optional.of(GROUPED_NULLS_ARRAY));
-            }
-        };
-
-        abstract Block getInputBlock();
-
-        private static Block createArrayBlock(Optional<boolean[]> valueIsNull)
-        {
-            int[] arrayOffset = generateOffsets(valueIsNull);
-            return fromElementBlock(POSITIONS, valueIsNull, arrayOffset, createLongsBlockWithRandomNulls(arrayOffset[POSITIONS]));
-        }
-    }
-
-    @Test(dataProvider = "mapBlockProvider")
-    public void testWriteMapDefinitionLevels(MapBlockProvider blockProvider)
+    @Test(dataProviderClass = NullsProvider.class, dataProvider = "nullsProviders")
+    public void testWriteMapDefinitionLevels(NullsProvider nullsProvider)
     {
-        ColumnarMap columnarMap = toColumnarMap(blockProvider.getInputBlock());
+        Block mapBlock = createMapBlock(nullsProvider.getNulls(POSITIONS), POSITIONS);
+        ColumnarMap columnarMap = toColumnarMap(mapBlock);
         int keysMaxDefinitionLevel = 2;
         int valuesMaxDefinitionLevel = 3;
         // Write definition levels for all positions
@@ -342,116 +143,6 @@ public void testWriteMapDefinitionLevels(MapBlockProvider blockProvider)
                 valuesMaxDefinitionLevel);
     }
 
-    @DataProvider
-    public static Object[][] mapBlockProvider()
-    {
-        return Stream.of(MapBlockProvider.values())
-                .collect(toDataProvider());
-    }
-
-    private enum MapBlockProvider
-    {
-        NO_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return createMapBlock(Optional.empty());
-            }
-        },
-        NO_NULLS_WITH_MAY_HAVE_NULL {
-            @Override
-            Block getInputBlock()
-            {
-                return createMapBlock(Optional.of(new boolean[POSITIONS]));
-            }
-        },
-        ALL_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return createMapBlock(Optional.of(ALL_NULLS_ARRAY));
-            }
-        },
-        RANDOM_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return createMapBlock(Optional.of(RANDOM_NULLS_ARRAY));
-            }
-        },
-        GROUPED_NULLS {
-            @Override
-            Block getInputBlock()
-            {
-                return createMapBlock(Optional.of(GROUPED_NULLS_ARRAY));
-            }
-        };
-
-        abstract Block getInputBlock();
-
-        private static Block createMapBlock(Optional<boolean[]> mapIsNull)
-        {
-            int[] offsets = generateOffsets(mapIsNull);
-            int positionCount = offsets[POSITIONS];
-            Block keyBlock = new LongArrayBlock(positionCount, Optional.empty(), new long[positionCount]);
-            Block valueBlock = createLongsBlockWithRandomNulls(positionCount);
-            return fromKeyValueBlock(mapIsNull, offsets, keyBlock, valueBlock, new MapType(BIGINT, BIGINT, TYPE_OPERATORS));
-        }
-    }
-
-    private static class TestingValuesWriter
-            extends ValuesWriter
-    {
-        private final IntList values = new IntArrayList();
-
-        @Override
-        public long getBufferedSize()
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public BytesInput getBytes()
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public Encoding getEncoding()
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void reset()
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public long getAllocatedSize()
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public String memUsageString(String prefix)
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void writeInteger(int v)
-        {
-            values.add(v);
-        }
-
-        List<Integer> getWrittenValues()
-        {
-            return values;
-        }
-    }
-
     private static void assertDefinitionLevels(Block block, List<Integer> writePositionCounts, int maxDefinitionLevel)
     {
         TestingValuesWriter valuesWriter = new TestingValuesWriter();
@@ -489,7 +180,8 @@ private static void assertDefinitionLevels(Block block, List<Integer> writePosit
     }
 
     private static void assertDefinitionLevels(
-            ColumnarRow columnarRow,
+            RowBlock block,
+            List<Block> nullSuppressedFields,
             List<Integer> writePositionCounts,
             int field,
             int maxDefinitionLevel)
@@ -498,8 +190,8 @@ private static void assertDefinitionLevels(
         TestingValuesWriter valuesWriter = new TestingValuesWriter();
         DefinitionLevelWriter fieldRootDefLevelWriter = getRootDefinitionLevelWriter(
                 ImmutableList.of(
-                        DefLevelWriterProviders.of(columnarRow, maxDefinitionLevel - 1),
-                        DefLevelWriterProviders.of(columnarRow.getField(field), maxDefinitionLevel)),
+                        DefLevelWriterProviders.of(block, maxDefinitionLevel - 1),
+                        DefLevelWriterProviders.of(nullSuppressedFields.get(field), maxDefinitionLevel)),
                 valuesWriter);
         ValuesCount fieldValuesCount;
         if (writePositionCounts.isEmpty()) {
@@ -520,12 +212,12 @@ private static void assertDefinitionLevels(
         int maxDefinitionValuesCount = 0;
         ImmutableList.Builder<Integer> expectedDefLevelsBuilder = ImmutableList.builder();
         int fieldOffset = 0;
-        for (int position = 0; position < columnarRow.getPositionCount(); position++) {
-            if (columnarRow.isNull(position)) {
+        for (int position = 0; position < block.getPositionCount(); position++) {
+            if (block.isNull(position)) {
                 expectedDefLevelsBuilder.add(maxDefinitionLevel - 2);
                 continue;
             }
-            Block fieldBlock = columnarRow.getField(field);
+            Block fieldBlock = nullSuppressedFields.get(field);
             if (fieldBlock.isNull(fieldOffset)) {
                 expectedDefLevelsBuilder.add(maxDefinitionLevel - 1);
             }
@@ -535,7 +227,7 @@ private static void assertDefinitionLevels(
             }
             fieldOffset++;
         }
-        assertThat(fieldValuesCount.totalValuesCount()).isEqualTo(columnarRow.getPositionCount());
+        assertThat(fieldValuesCount.totalValuesCount()).isEqualTo(block.getPositionCount());
         assertThat(fieldValuesCount.maxDefinitionLevelValuesCount()).isEqualTo(maxDefinitionValuesCount);
         assertThat(valuesWriter.getWrittenValues()).isEqualTo(expectedDefLevelsBuilder.build());
     }
@@ -697,42 +389,4 @@ private static void assertDefinitionLevels(
         assertThat(valuesValueCount.maxDefinitionLevelValuesCount()).isEqualTo(maxDefinitionValuesCount);
         assertThat(valuesWriter.getWrittenValues()).isEqualTo(valuesExpectedDefLevelsBuilder.build());
     }
-
-    private static List<Integer> generateGroupSizes(int positionsCount)
-    {
-        int maxGroupSize = 17;
-        int offset = 0;
-        ImmutableList.Builder<Integer> groupsBuilder = ImmutableList.builder();
-        while (offset < positionsCount) {
-            int remaining = positionsCount - offset;
-            int groupSize = Math.min(RANDOM.nextInt(maxGroupSize) + 1, remaining);
-            groupsBuilder.add(groupSize);
-            offset += groupSize;
-        }
-        return groupsBuilder.build();
-    }
-
-    private static int[] generateOffsets(Optional<boolean[]> valueIsNull)
-    {
-        int maxCardinality = 7; // array length or map size at the current position
-        int[] offsets = new int[POSITIONS + 1];
-        for (int position = 0; position < POSITIONS; position++) {
-            if (valueIsNull.isPresent() && valueIsNull.get()[position]) {
-                offsets[position + 1] = offsets[position];
-            }
-            else {
-                offsets[position + 1] = offsets[position] + RANDOM.nextInt(maxCardinality);
-            }
-        }
-        return offsets;
-    }
-
-    private static Block createLongsBlockWithRandomNulls(int positionCount)
-    {
-        boolean[] valueIsNull = new boolean[positionCount];
-        for (int i = 0; i < positionCount; i++) {
-            valueIsNull[i] = RANDOM.nextBoolean();
-        }
-        return new LongArrayBlock(positionCount, Optional.of(valueIsNull), new long[positionCount]);
-    }
 }
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestParquetWriter.java b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestParquetWriter.java
index fb194910436d..42fee9542a81 100644
--- a/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestParquetWriter.java
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestParquetWriter.java
@@ -13,11 +13,57 @@
  */
 package io.trino.parquet.writer;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
+import io.airlift.slice.Slice;
+import io.airlift.slice.SliceInput;
+import io.airlift.slice.Slices;
+import io.airlift.units.DataSize;
+import io.trino.parquet.DataPage;
+import io.trino.parquet.DiskRange;
+import io.trino.parquet.ParquetDataSource;
+import io.trino.parquet.ParquetReaderOptions;
+import io.trino.parquet.reader.ChunkedInputStream;
+import io.trino.parquet.reader.MetadataReader;
+import io.trino.parquet.reader.PageReader;
+import io.trino.parquet.reader.TestingParquetDataSource;
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.Type;
 import org.apache.parquet.VersionParser;
+import org.apache.parquet.column.ColumnDescriptor;
+import org.apache.parquet.format.PageHeader;
+import org.apache.parquet.format.PageType;
+import org.apache.parquet.format.Util;
+import org.apache.parquet.hadoop.metadata.BlockMetaData;
+import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData;
+import org.apache.parquet.hadoop.metadata.ParquetMetadata;
+import org.apache.parquet.schema.PrimitiveType;
 import org.testng.annotations.Test;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
+import static io.trino.operator.scalar.CharacterStringCasts.varcharToVarcharSaturatedFloorCast;
+import static io.trino.parquet.ParquetCompressionUtils.decompress;
+import static io.trino.parquet.ParquetTestUtils.createParquetWriter;
+import static io.trino.parquet.ParquetTestUtils.generateInputPages;
+import static io.trino.parquet.ParquetTestUtils.writeParquetFile;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.TinyintType.TINYINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.lang.Math.toIntExact;
+import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.INT32;
+import static org.apache.parquet.schema.Type.Repetition.REQUIRED;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestParquetWriter
@@ -37,4 +83,194 @@ public void testCreatedByIsParsable()
         assertThat(version.version).isEqualTo("test-version");
         assertThat(version.appBuildHash).isEqualTo("n/a");
     }
+
+    @Test
+    public void testWrittenPageSize()
+            throws IOException
+    {
+        List<String> columnNames = ImmutableList.of("columnA", "columnB");
+        List<Type> types = ImmutableList.of(INTEGER, BIGINT);
+
+        // Write a file with many small input pages and parquet max page size of 20Kb
+        ParquetDataSource dataSource = new TestingParquetDataSource(
+                writeParquetFile(
+                        ParquetWriterOptions.builder()
+                                .setMaxPageSize(DataSize.ofBytes(20 * 1024))
+                                .build(),
+                        types,
+                        columnNames,
+                        generateInputPages(types, 100, 1000)),
+                new ParquetReaderOptions());
+        ParquetMetadata parquetMetadata = MetadataReader.readFooter(dataSource, Optional.empty());
+        assertThat(parquetMetadata.getBlocks().size()).isEqualTo(1);
+        assertThat(parquetMetadata.getBlocks().get(0).getRowCount()).isEqualTo(100 * 1000);
+
+        ColumnChunkMetaData chunkMetaData = parquetMetadata.getBlocks().get(0).getColumns().get(0);
+        DiskRange range = new DiskRange(chunkMetaData.getStartingPos(), chunkMetaData.getTotalSize());
+        Map<Integer, ChunkedInputStream> chunkReader = dataSource.planRead(ImmutableListMultimap.of(0, range), newSimpleAggregatedMemoryContext());
+
+        PageReader pageReader = PageReader.createPageReader(
+                chunkReader.get(0),
+                chunkMetaData,
+                new ColumnDescriptor(new String[] {"columna"}, new PrimitiveType(REQUIRED, INT32, "columna"), 0, 0),
+                null,
+                Optional.empty());
+
+        pageReader.readDictionaryPage();
+        assertThat(pageReader.hasNext()).isTrue();
+        int pagesRead = 0;
+        DataPage dataPage;
+        while (pageReader.hasNext()) {
+            dataPage = pageReader.readPage();
+            pagesRead++;
+            if (!pageReader.hasNext()) {
+                break; // skip last page size validation
+            }
+            assertThat(dataPage.getValueCount()).isBetween(4500, 5500);
+        }
+        assertThat(pagesRead).isGreaterThan(10);
+    }
+
+    @Test
+    public void testLargeStringTruncation()
+            throws IOException
+    {
+        List<String> columnNames = ImmutableList.of("columnA", "columnB");
+        List<Type> types = ImmutableList.of(VARCHAR, VARCHAR);
+
+        Slice minA = Slices.utf8Slice("abc".repeat(300)); // within truncation threshold
+        Block blockA = VARCHAR.createBlockBuilder(null, 2)
+                .writeEntry(minA)
+                .writeEntry(Slices.utf8Slice("y".repeat(3200))) // bigger than truncation threshold
+                .build();
+
+        String threeByteCodePoint = new String(Character.toChars(0x20AC));
+        String maxCodePoint = new String(Character.toChars(Character.MAX_CODE_POINT));
+        Slice minB = Slices.utf8Slice(threeByteCodePoint.repeat(300)); // truncation in middle of unicode bytes
+        Block blockB = VARCHAR.createBlockBuilder(null, 2)
+                .writeEntry(minB)
+                // start with maxCodePoint to make it max value in stats
+                // last character for truncation is maxCodePoint
+                .writeEntry(Slices.utf8Slice(maxCodePoint + "d".repeat(1017) + maxCodePoint))
+                .build();
+
+        ParquetDataSource dataSource = new TestingParquetDataSource(
+                writeParquetFile(
+                        ParquetWriterOptions.builder().build(),
+                        types,
+                        columnNames,
+                        ImmutableList.of(new Page(2, blockA, blockB))),
+                new ParquetReaderOptions());
+
+        ParquetMetadata parquetMetadata = MetadataReader.readFooter(dataSource, Optional.empty());
+        BlockMetaData blockMetaData = getOnlyElement(parquetMetadata.getBlocks());
+
+        ColumnChunkMetaData chunkMetaData = blockMetaData.getColumns().get(0);
+        assertThat(chunkMetaData.getStatistics().getMinBytes()).isEqualTo(minA.getBytes());
+        Slice truncatedMax = Slices.utf8Slice("y".repeat(1023) + "z");
+        assertThat(chunkMetaData.getStatistics().getMaxBytes()).isEqualTo(truncatedMax.getBytes());
+
+        chunkMetaData = blockMetaData.getColumns().get(1);
+        Slice truncatedMin = varcharToVarcharSaturatedFloorCast(1024, minB);
+        assertThat(chunkMetaData.getStatistics().getMinBytes()).isEqualTo(truncatedMin.getBytes());
+        truncatedMax = Slices.utf8Slice(maxCodePoint + "d".repeat(1016) + "e");
+        assertThat(chunkMetaData.getStatistics().getMaxBytes()).isEqualTo(truncatedMax.getBytes());
+    }
+
+    @Test
+    public void testColumnReordering()
+            throws IOException
+    {
+        List<String> columnNames = ImmutableList.of("columnA", "columnB", "columnC", "columnD");
+        List<Type> types = ImmutableList.of(BIGINT, TINYINT, INTEGER, DecimalType.createDecimalType(12));
+
+        // Write a file with many row groups
+        ParquetDataSource dataSource = new TestingParquetDataSource(
+                writeParquetFile(
+                        ParquetWriterOptions.builder()
+                                .setMaxBlockSize(DataSize.ofBytes(20 * 1024))
+                                .build(),
+                        types,
+                        columnNames,
+                        generateInputPages(types, 100, 100)),
+                new ParquetReaderOptions());
+
+        ParquetMetadata parquetMetadata = MetadataReader.readFooter(dataSource, Optional.empty());
+        assertThat(parquetMetadata.getBlocks().size()).isGreaterThanOrEqualTo(10);
+        for (BlockMetaData blockMetaData : parquetMetadata.getBlocks()) {
+            // Verify that the columns are stored in the same order as the metadata
+            List<Long> offsets = blockMetaData.getColumns().stream()
+                    .map(ColumnChunkMetaData::getFirstDataPageOffset)
+                    .collect(toImmutableList());
+            assertThat(offsets).isSorted();
+        }
+    }
+
+    @Test
+    public void testWriterMemoryAccounting()
+            throws IOException
+    {
+        List<String> columnNames = ImmutableList.of("columnA", "columnB");
+        List<Type> types = ImmutableList.of(INTEGER, INTEGER);
+
+        ParquetWriter writer = createParquetWriter(
+                new ByteArrayOutputStream(),
+                ParquetWriterOptions.builder()
+                        .setMaxPageSize(DataSize.ofBytes(1024))
+                        .build(),
+                types,
+                columnNames);
+        List<io.trino.spi.Page> inputPages = generateInputPages(types, 1000, 100);
+
+        long previousRetainedBytes = 0;
+        for (io.trino.spi.Page inputPage : inputPages) {
+            checkArgument(types.size() == inputPage.getChannelCount());
+            writer.write(inputPage);
+            long currentRetainedBytes = writer.getRetainedBytes();
+            assertThat(currentRetainedBytes).isGreaterThanOrEqualTo(previousRetainedBytes);
+            previousRetainedBytes = currentRetainedBytes;
+        }
+        assertThat(previousRetainedBytes).isGreaterThanOrEqualTo(2 * Integer.BYTES * 1000 * 100);
+        writer.close();
+        assertThat(previousRetainedBytes - writer.getRetainedBytes()).isGreaterThanOrEqualTo(2 * Integer.BYTES * 1000 * 100);
+    }
+
+    @Test
+    public void testDictionaryPageOffset()
+            throws IOException
+    {
+        List<String> columnNames = ImmutableList.of("column");
+        List<Type> types = ImmutableList.of(INTEGER);
+
+        // Write a file with dictionary encoded data
+        ParquetDataSource dataSource = new TestingParquetDataSource(
+                writeParquetFile(
+                        ParquetWriterOptions.builder().build(),
+                        types,
+                        columnNames,
+                        generateInputPages(types, 100, 100)),
+                new ParquetReaderOptions());
+
+        ParquetMetadata parquetMetadata = MetadataReader.readFooter(dataSource, Optional.empty());
+        assertThat(parquetMetadata.getBlocks().size()).isGreaterThanOrEqualTo(1);
+        for (BlockMetaData blockMetaData : parquetMetadata.getBlocks()) {
+            ColumnChunkMetaData chunkMetaData = getOnlyElement(blockMetaData.getColumns());
+            assertThat(chunkMetaData.getDictionaryPageOffset()).isGreaterThan(0);
+            int dictionaryPageSize = toIntExact(chunkMetaData.getFirstDataPageOffset() - chunkMetaData.getDictionaryPageOffset());
+            assertThat(dictionaryPageSize).isGreaterThan(0);
+
+            // verify reading dictionary page
+            SliceInput inputStream = dataSource.readFully(chunkMetaData.getStartingPos(), dictionaryPageSize).getInput();
+            PageHeader pageHeader = Util.readPageHeader(inputStream);
+            assertThat(pageHeader.getType()).isEqualTo(PageType.DICTIONARY_PAGE);
+            assertThat(pageHeader.getDictionary_page_header().getNum_values()).isEqualTo(100);
+            Slice compressedData = inputStream.readSlice(pageHeader.getCompressed_page_size());
+            Slice uncompressedData = decompress(chunkMetaData.getCodec().getParquetCompressionCodec(), compressedData, pageHeader.getUncompressed_page_size());
+            int[] ids = new int[100];
+            uncompressedData.getInts(0, ids, 0, 100);
+            for (int i = 0; i < 100; i++) {
+                assertThat(ids[i]).isEqualTo(i);
+            }
+        }
+    }
 }
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestRepetitionLevelWriter.java b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestRepetitionLevelWriter.java
new file mode 100644
index 000000000000..4f38866c003a
--- /dev/null
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestRepetitionLevelWriter.java
@@ -0,0 +1,326 @@
+/*
+ * Licensed 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 io.trino.parquet.writer;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.parquet.writer.repdef.RepLevelWriterProviders;
+import io.trino.spi.block.ArrayBlock;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.ColumnarArray;
+import io.trino.spi.block.ColumnarMap;
+import io.trino.spi.block.RowBlock;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.TypeOperators;
+import org.testng.annotations.Test;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+
+import static io.trino.parquet.ParquetTestUtils.createArrayBlock;
+import static io.trino.parquet.ParquetTestUtils.createMapBlock;
+import static io.trino.parquet.ParquetTestUtils.createRowBlock;
+import static io.trino.parquet.ParquetTestUtils.generateGroupSizes;
+import static io.trino.parquet.ParquetTestUtils.generateOffsets;
+import static io.trino.parquet.writer.NullsProvider.RANDOM_NULLS;
+import static io.trino.parquet.writer.repdef.RepLevelWriterProvider.RepetitionLevelWriter;
+import static io.trino.parquet.writer.repdef.RepLevelWriterProvider.getRootRepetitionLevelWriter;
+import static io.trino.spi.block.ArrayBlock.fromElementBlock;
+import static io.trino.spi.block.ColumnarArray.toColumnarArray;
+import static io.trino.spi.block.ColumnarMap.toColumnarMap;
+import static io.trino.spi.block.MapBlock.fromKeyValueBlock;
+import static io.trino.spi.block.RowBlock.getNullSuppressedRowFieldsFromBlock;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static java.util.Collections.nCopies;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestRepetitionLevelWriter
+{
+    private static final int POSITIONS = 1024;
+
+    @Test(dataProviderClass = NullsProvider.class, dataProvider = "nullsProviders")
+    public void testWriteRowRepetitionLevels(NullsProvider nullsProvider)
+    {
+        // Using an array of row blocks for testing as Structs don't have a repetition level by themselves
+        Optional<boolean[]> valueIsNull = RANDOM_NULLS.getNulls(POSITIONS);
+        int[] arrayOffsets = generateOffsets(valueIsNull, POSITIONS);
+        int rowBlockPositions = arrayOffsets[POSITIONS];
+        RowBlock rowBlock = createRowBlock(nullsProvider.getNulls(rowBlockPositions), rowBlockPositions);
+        ArrayBlock arrayBlock = fromElementBlock(POSITIONS, valueIsNull, arrayOffsets, rowBlock);
+
+        ColumnarArray columnarArray = toColumnarArray(arrayBlock);
+        Block row = columnarArray.getElementsBlock();
+        List<Block> nullSuppressedFields = getNullSuppressedRowFieldsFromBlock(row);
+        // Write Repetition levels for all positions
+        for (int fieldIndex = 0; fieldIndex < nullSuppressedFields.size(); fieldIndex++) {
+            Block field = nullSuppressedFields.get(fieldIndex);
+            assertRepetitionLevels(columnarArray, row, field, ImmutableList.of());
+            assertRepetitionLevels(columnarArray, row, field, ImmutableList.of());
+
+            // Write Repetition levels for all positions one-at-a-time
+            assertRepetitionLevels(
+                    columnarArray,
+                    row,
+                    field,
+                    nCopies(columnarArray.getPositionCount(), 1));
+
+            // Write Repetition levels for all positions with different group sizes
+            assertRepetitionLevels(
+                    columnarArray,
+                    row,
+                    field,
+                    generateGroupSizes(columnarArray.getPositionCount()));
+        }
+    }
+
+    @Test(dataProviderClass = NullsProvider.class, dataProvider = "nullsProviders")
+    public void testWriteArrayRepetitionLevels(NullsProvider nullsProvider)
+    {
+        Block arrayBlock = createArrayBlock(nullsProvider.getNulls(POSITIONS), POSITIONS);
+        ColumnarArray columnarArray = toColumnarArray(arrayBlock);
+        // Write Repetition levels for all positions
+        assertRepetitionLevels(columnarArray, ImmutableList.of());
+
+        // Write Repetition levels for all positions one-at-a-time
+        assertRepetitionLevels(columnarArray, nCopies(columnarArray.getPositionCount(), 1));
+
+        // Write Repetition levels for all positions with different group sizes
+        assertRepetitionLevels(columnarArray, generateGroupSizes(columnarArray.getPositionCount()));
+    }
+
+    @Test(dataProviderClass = NullsProvider.class, dataProvider = "nullsProviders")
+    public void testWriteMapRepetitionLevels(NullsProvider nullsProvider)
+    {
+        Block mapBlock = createMapBlock(nullsProvider.getNulls(POSITIONS), POSITIONS);
+        ColumnarMap columnarMap = toColumnarMap(mapBlock);
+        // Write Repetition levels for all positions
+        assertRepetitionLevels(columnarMap, ImmutableList.of());
+
+        // Write Repetition levels for all positions one-at-a-time
+        assertRepetitionLevels(columnarMap, nCopies(columnarMap.getPositionCount(), 1));
+
+        // Write Repetition levels for all positions with different group sizes
+        assertRepetitionLevels(columnarMap, generateGroupSizes(columnarMap.getPositionCount()));
+    }
+
+    @Test(dataProviderClass = NullsProvider.class, dataProvider = "nullsProviders")
+    public void testNestedStructRepetitionLevels(NullsProvider nullsProvider)
+    {
+        RowBlock rowBlock = createNestedRowBlock(nullsProvider.getNulls(POSITIONS), POSITIONS);
+        List<Block> fieldBlocks = getNullSuppressedRowFieldsFromBlock(rowBlock);
+
+        for (int field = 0; field < fieldBlocks.size(); field++) {
+            Block fieldBlock = fieldBlocks.get(field);
+            ColumnarMap columnarMap = toColumnarMap(fieldBlock);
+            for (Block mapElements : ImmutableList.of(columnarMap.getKeysBlock(), columnarMap.getValuesBlock())) {
+                ColumnarArray columnarArray = toColumnarArray(mapElements);
+
+                // Write Repetition levels for all positions
+                assertRepetitionLevels(rowBlock, columnarMap, columnarArray, ImmutableList.of());
+
+                // Write Repetition levels for all positions one-at-a-time
+                assertRepetitionLevels(rowBlock, columnarMap, columnarArray, nCopies(rowBlock.getPositionCount(), 1));
+
+                // Write Repetition levels for all positions with different group sizes
+                assertRepetitionLevels(rowBlock, columnarMap, columnarArray, generateGroupSizes(rowBlock.getPositionCount()));
+            }
+        }
+    }
+
+    private static RowBlock createNestedRowBlock(Optional<boolean[]> rowIsNull, int positionCount)
+    {
+        Block[] fieldBlocks = new Block[2];
+        // no nulls map block
+        fieldBlocks[0] = createMapOfArraysBlock(rowIsNull, positionCount);
+        // random nulls map block
+        fieldBlocks[1] = createMapOfArraysBlock(RANDOM_NULLS.getNulls(positionCount, rowIsNull), positionCount);
+
+        return RowBlock.fromNotNullSuppressedFieldBlocks(positionCount, rowIsNull, fieldBlocks);
+    }
+
+    private static Block createMapOfArraysBlock(Optional<boolean[]> mapIsNull, int positionCount)
+    {
+        int[] offsets = generateOffsets(mapIsNull, positionCount);
+        int entriesCount = offsets[positionCount];
+        Block keyBlock = createArrayBlock(Optional.empty(), entriesCount);
+        Block valueBlock = createArrayBlock(RANDOM_NULLS.getNulls(entriesCount), entriesCount);
+        return fromKeyValueBlock(mapIsNull, offsets, keyBlock, valueBlock, new MapType(BIGINT, BIGINT, new TypeOperators()));
+    }
+
+    private static void assertRepetitionLevels(
+            ColumnarArray columnarArray,
+            Block row,
+            Block field,
+            List<Integer> writePositionCounts)
+    {
+        int maxRepetitionLevel = 1;
+        // Write Repetition levels
+        TestingValuesWriter valuesWriter = new TestingValuesWriter();
+        RepetitionLevelWriter fieldRootRepLevelWriter = getRootRepetitionLevelWriter(
+                ImmutableList.of(
+                        RepLevelWriterProviders.of(columnarArray, maxRepetitionLevel),
+                        RepLevelWriterProviders.of(row),
+                        RepLevelWriterProviders.of(field)),
+                valuesWriter);
+        if (writePositionCounts.isEmpty()) {
+            fieldRootRepLevelWriter.writeRepetitionLevels(0);
+        }
+        else {
+            for (int positionsCount : writePositionCounts) {
+                fieldRootRepLevelWriter.writeRepetitionLevels(0, positionsCount);
+            }
+        }
+
+        // Verify written Repetition levels
+        Iterator<Integer> expectedRepetitionLevelsIter = RepLevelIterables.getIterator(ImmutableList.<RepLevelIterable>builder()
+                .add(RepLevelIterables.of(columnarArray, maxRepetitionLevel))
+                .add(RepLevelIterables.of(columnarArray.getElementsBlock()))
+                .add(RepLevelIterables.of(field))
+                .build());
+        assertThat(valuesWriter.getWrittenValues()).isEqualTo(ImmutableList.copyOf(expectedRepetitionLevelsIter));
+    }
+
+    private static void assertRepetitionLevels(
+            ColumnarArray columnarArray,
+            List<Integer> writePositionCounts)
+    {
+        int maxRepetitionLevel = 1;
+        // Write Repetition levels
+        TestingValuesWriter valuesWriter = new TestingValuesWriter();
+        RepetitionLevelWriter elementsRootRepLevelWriter = getRootRepetitionLevelWriter(
+                ImmutableList.of(
+                        RepLevelWriterProviders.of(columnarArray, maxRepetitionLevel),
+                        RepLevelWriterProviders.of(columnarArray.getElementsBlock())),
+                valuesWriter);
+        if (writePositionCounts.isEmpty()) {
+            elementsRootRepLevelWriter.writeRepetitionLevels(0);
+        }
+        else {
+            for (int positionsCount : writePositionCounts) {
+                elementsRootRepLevelWriter.writeRepetitionLevels(0, positionsCount);
+            }
+        }
+
+        // Verify written Repetition levels
+        ImmutableList.Builder<Integer> expectedRepLevelsBuilder = ImmutableList.builder();
+        int elementsOffset = 0;
+        for (int position = 0; position < columnarArray.getPositionCount(); position++) {
+            if (columnarArray.isNull(position)) {
+                expectedRepLevelsBuilder.add(maxRepetitionLevel - 1);
+                continue;
+            }
+            int arrayLength = columnarArray.getLength(position);
+            if (arrayLength == 0) {
+                expectedRepLevelsBuilder.add(maxRepetitionLevel - 1);
+                continue;
+            }
+            expectedRepLevelsBuilder.add(maxRepetitionLevel - 1);
+            for (int i = elementsOffset + 1; i < elementsOffset + arrayLength; i++) {
+                expectedRepLevelsBuilder.add(maxRepetitionLevel);
+            }
+            elementsOffset += arrayLength;
+        }
+        assertThat(valuesWriter.getWrittenValues()).isEqualTo(expectedRepLevelsBuilder.build());
+    }
+
+    private static void assertRepetitionLevels(
+            ColumnarMap columnarMap,
+            List<Integer> writePositionCounts)
+    {
+        int maxRepetitionLevel = 1;
+        // Write Repetition levels for map keys
+        TestingValuesWriter keysWriter = new TestingValuesWriter();
+        RepetitionLevelWriter keysRootRepLevelWriter = getRootRepetitionLevelWriter(
+                ImmutableList.of(
+                        RepLevelWriterProviders.of(columnarMap, maxRepetitionLevel),
+                        RepLevelWriterProviders.of(columnarMap.getKeysBlock())),
+                keysWriter);
+        if (writePositionCounts.isEmpty()) {
+            keysRootRepLevelWriter.writeRepetitionLevels(0);
+        }
+        else {
+            for (int positionsCount : writePositionCounts) {
+                keysRootRepLevelWriter.writeRepetitionLevels(0, positionsCount);
+            }
+        }
+
+        // Write Repetition levels for map values
+        TestingValuesWriter valuesWriter = new TestingValuesWriter();
+        RepetitionLevelWriter valuesRootRepLevelWriter = getRootRepetitionLevelWriter(
+                ImmutableList.of(
+                        RepLevelWriterProviders.of(columnarMap, maxRepetitionLevel),
+                        RepLevelWriterProviders.of(columnarMap.getValuesBlock())),
+                valuesWriter);
+        if (writePositionCounts.isEmpty()) {
+            valuesRootRepLevelWriter.writeRepetitionLevels(0);
+        }
+        else {
+            for (int positionsCount : writePositionCounts) {
+                valuesRootRepLevelWriter.writeRepetitionLevels(0, positionsCount);
+            }
+        }
+
+        // Verify written Repetition levels
+        ImmutableList.Builder<Integer> expectedRepLevelsBuilder = ImmutableList.builder();
+        for (int position = 0; position < columnarMap.getPositionCount(); position++) {
+            if (columnarMap.isNull(position)) {
+                expectedRepLevelsBuilder.add(maxRepetitionLevel - 1);
+                continue;
+            }
+            int mapLength = columnarMap.getEntryCount(position);
+            if (mapLength == 0) {
+                expectedRepLevelsBuilder.add(maxRepetitionLevel - 1);
+                continue;
+            }
+            expectedRepLevelsBuilder.add(maxRepetitionLevel - 1);
+            expectedRepLevelsBuilder.addAll(nCopies(mapLength - 1, maxRepetitionLevel));
+        }
+        assertThat(keysWriter.getWrittenValues()).isEqualTo(expectedRepLevelsBuilder.build());
+        assertThat(valuesWriter.getWrittenValues()).isEqualTo(expectedRepLevelsBuilder.build());
+    }
+
+    private static void assertRepetitionLevels(
+            RowBlock rowBlock,
+            ColumnarMap columnarMap,
+            ColumnarArray columnarArray,
+            List<Integer> writePositionCounts)
+    {
+        // Write Repetition levels
+        TestingValuesWriter valuesWriter = new TestingValuesWriter();
+        RepetitionLevelWriter fieldRootRepLevelWriter = getRootRepetitionLevelWriter(
+                ImmutableList.of(
+                        RepLevelWriterProviders.of(rowBlock),
+                        RepLevelWriterProviders.of(columnarMap, 1),
+                        RepLevelWriterProviders.of(columnarArray, 2),
+                        RepLevelWriterProviders.of(columnarArray.getElementsBlock())),
+                valuesWriter);
+        if (writePositionCounts.isEmpty()) {
+            fieldRootRepLevelWriter.writeRepetitionLevels(0);
+        }
+        else {
+            for (int positionsCount : writePositionCounts) {
+                fieldRootRepLevelWriter.writeRepetitionLevels(0, positionsCount);
+            }
+        }
+
+        // Verify written Repetition levels
+        Iterator<Integer> expectedRepetitionLevelsIter = RepLevelIterables.getIterator(ImmutableList.<RepLevelIterable>builder()
+                .add(RepLevelIterables.of(rowBlock))
+                .add(RepLevelIterables.of(columnarMap, 1))
+                .add(RepLevelIterables.of(columnarArray, 2))
+                .add(RepLevelIterables.of(columnarArray.getElementsBlock()))
+                .build());
+        assertThat(valuesWriter.getWrittenValues()).isEqualTo(ImmutableList.copyOf(expectedRepetitionLevelsIter));
+    }
+}
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestTrinoValuesWriterFactory.java b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestTrinoValuesWriterFactory.java
new file mode 100644
index 000000000000..3abec18fe784
--- /dev/null
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestTrinoValuesWriterFactory.java
@@ -0,0 +1,151 @@
+/*
+ * Licensed 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 io.trino.parquet.writer;
+
+import io.trino.parquet.writer.valuewriter.DictionaryFallbackValuesWriter;
+import io.trino.parquet.writer.valuewriter.TrinoValuesWriterFactory;
+import org.apache.parquet.column.ColumnDescriptor;
+import org.apache.parquet.column.ParquetProperties;
+import org.apache.parquet.column.values.ValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter.PlainBinaryDictionaryValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter.PlainDoubleDictionaryValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter.PlainFixedLenArrayDictionaryValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter.PlainFloatDictionaryValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter.PlainIntegerDictionaryValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter.PlainLongDictionaryValuesWriter;
+import org.apache.parquet.column.values.plain.BooleanPlainValuesWriter;
+import org.apache.parquet.column.values.plain.FixedLenByteArrayPlainValuesWriter;
+import org.apache.parquet.column.values.plain.PlainValuesWriter;
+import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
+import org.testng.annotations.Test;
+
+import static java.util.Locale.ENGLISH;
+import static org.apache.parquet.column.ParquetProperties.WriterVersion.PARQUET_1_0;
+import static org.apache.parquet.schema.Types.required;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestTrinoValuesWriterFactory
+{
+    @Test
+    public void testBoolean()
+    {
+        testValueWriter(PrimitiveTypeName.BOOLEAN, BooleanPlainValuesWriter.class);
+    }
+
+    @Test
+    public void testFixedLenByteArray()
+    {
+        testValueWriter(PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY, FixedLenByteArrayPlainValuesWriter.class);
+    }
+
+    @Test
+    public void testBinary()
+    {
+        testValueWriter(
+                PrimitiveTypeName.BINARY,
+                PlainBinaryDictionaryValuesWriter.class,
+                PlainValuesWriter.class);
+    }
+
+    @Test
+    public void testInt32()
+    {
+        testValueWriter(
+                PrimitiveTypeName.INT32,
+                PlainIntegerDictionaryValuesWriter.class,
+                PlainValuesWriter.class);
+    }
+
+    @Test
+    public void testInt64()
+    {
+        testValueWriter(
+                PrimitiveTypeName.INT64,
+                PlainLongDictionaryValuesWriter.class,
+                PlainValuesWriter.class);
+    }
+
+    @Test
+    public void testInt96()
+    {
+        testValueWriter(
+                PrimitiveTypeName.INT96,
+                PlainFixedLenArrayDictionaryValuesWriter.class,
+                FixedLenByteArrayPlainValuesWriter.class);
+    }
+
+    @Test
+    public void testDouble()
+    {
+        testValueWriter(
+                PrimitiveTypeName.DOUBLE,
+                PlainDoubleDictionaryValuesWriter.class,
+                PlainValuesWriter.class);
+    }
+
+    @Test
+    public void testFloat()
+    {
+        testValueWriter(
+                PrimitiveTypeName.FLOAT,
+                PlainFloatDictionaryValuesWriter.class,
+                PlainValuesWriter.class);
+    }
+
+    private void testValueWriter(PrimitiveTypeName typeName, Class<? extends ValuesWriter> expectedValueWriterClass)
+    {
+        ColumnDescriptor mockPath = createColumnDescriptor(typeName);
+        TrinoValuesWriterFactory factory = new TrinoValuesWriterFactory(ParquetProperties.builder()
+                .withWriterVersion(PARQUET_1_0)
+                .build());
+        ValuesWriter writer = factory.newValuesWriter(mockPath);
+
+        validateWriterType(writer, expectedValueWriterClass);
+    }
+
+    private void testValueWriter(PrimitiveTypeName typeName, Class<? extends ValuesWriter> initialValueWriterClass, Class<? extends ValuesWriter> fallbackValueWriterClass)
+    {
+        ColumnDescriptor mockPath = createColumnDescriptor(typeName);
+        TrinoValuesWriterFactory factory = new TrinoValuesWriterFactory(ParquetProperties.builder()
+                .withWriterVersion(PARQUET_1_0)
+                .build());
+        ValuesWriter writer = factory.newValuesWriter(mockPath);
+
+        validateFallbackWriter(writer, initialValueWriterClass, fallbackValueWriterClass);
+    }
+
+    private ColumnDescriptor createColumnDescriptor(PrimitiveTypeName typeName)
+    {
+        return createColumnDescriptor(typeName, "fake_" + typeName.name().toLowerCase(ENGLISH) + "_col");
+    }
+
+    private ColumnDescriptor createColumnDescriptor(PrimitiveTypeName typeName, String name)
+    {
+        return new ColumnDescriptor(new String[] {name}, required(typeName).length(1).named(name), 0, 0);
+    }
+
+    private void validateWriterType(ValuesWriter writer, Class<? extends ValuesWriter> valuesWriterClass)
+    {
+        assertThat(writer).isInstanceOf(valuesWriterClass);
+    }
+
+    private void validateFallbackWriter(ValuesWriter writer, Class<? extends ValuesWriter> initialWriterClass, Class<? extends ValuesWriter> fallbackWriterClass)
+    {
+        validateWriterType(writer, DictionaryFallbackValuesWriter.class);
+
+        DictionaryFallbackValuesWriter fallbackValuesWriter = (DictionaryFallbackValuesWriter) writer;
+        validateWriterType(fallbackValuesWriter.getInitialWriter(), initialWriterClass);
+        validateWriterType(fallbackValuesWriter.getFallBackWriter(), fallbackWriterClass);
+    }
+}
diff --git a/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestingValuesWriter.java b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestingValuesWriter.java
new file mode 100644
index 000000000000..53d6dd89b681
--- /dev/null
+++ b/lib/trino-parquet/src/test/java/io/trino/parquet/writer/TestingValuesWriter.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed 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 io.trino.parquet.writer;
+
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import org.apache.parquet.bytes.BytesInput;
+import org.apache.parquet.column.Encoding;
+import org.apache.parquet.column.values.ValuesWriter;
+
+import java.util.List;
+
+class TestingValuesWriter
+        extends ValuesWriter
+{
+    private final IntList values = new IntArrayList();
+
+    @Override
+    public long getBufferedSize()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public BytesInput getBytes()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Encoding getEncoding()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void reset()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long getAllocatedSize()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public String memUsageString(String prefix)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void writeInteger(int v)
+    {
+        values.add(v);
+    }
+
+    List<Integer> getWrittenValues()
+    {
+        return values;
+    }
+}
diff --git a/lib/trino-parquet/src/test/java/org/apache/parquet/column/values/dictionary/TestDictionaryWriter.java b/lib/trino-parquet/src/test/java/org/apache/parquet/column/values/dictionary/TestDictionaryWriter.java
new file mode 100644
index 000000000000..06afb635a310
--- /dev/null
+++ b/lib/trino-parquet/src/test/java/org/apache/parquet/column/values/dictionary/TestDictionaryWriter.java
@@ -0,0 +1,705 @@
+/*
+ * Licensed 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.parquet.column.values.dictionary;
+
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
+import io.trino.parquet.DictionaryPage;
+import io.trino.parquet.reader.SimpleSliceInputStream;
+import io.trino.parquet.reader.decoders.PlainByteArrayDecoders;
+import io.trino.parquet.reader.decoders.PlainValueDecoders;
+import io.trino.parquet.reader.decoders.ValueDecoder;
+import io.trino.parquet.reader.flat.BinaryBuffer;
+import io.trino.parquet.reader.flat.ColumnAdapter;
+import io.trino.parquet.reader.flat.DictionaryDecoder;
+import io.trino.parquet.writer.valuewriter.DictionaryFallbackValuesWriter;
+import org.apache.parquet.bytes.BytesInput;
+import org.apache.parquet.bytes.DirectByteBufferAllocator;
+import org.apache.parquet.column.Encoding;
+import org.apache.parquet.column.values.ValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter.PlainBinaryDictionaryValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter.PlainDoubleDictionaryValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter.PlainFloatDictionaryValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter.PlainIntegerDictionaryValuesWriter;
+import org.apache.parquet.column.values.dictionary.DictionaryValuesWriter.PlainLongDictionaryValuesWriter;
+import org.apache.parquet.column.values.plain.PlainValuesWriter;
+import org.apache.parquet.io.api.Binary;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import static io.trino.parquet.ParquetTestUtils.toTrinoDictionaryPage;
+import static io.trino.parquet.reader.flat.BinaryColumnAdapter.BINARY_ADAPTER;
+import static io.trino.parquet.reader.flat.IntColumnAdapter.INT_ADAPTER;
+import static io.trino.parquet.reader.flat.LongColumnAdapter.LONG_ADAPTER;
+import static org.apache.parquet.column.Encoding.PLAIN;
+import static org.apache.parquet.column.Encoding.PLAIN_DICTIONARY;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDictionaryWriter
+{
+    @Test
+    public void testBinaryDictionary()
+            throws IOException
+    {
+        int count = 100;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainBinaryDictionaryValuesWriter(200, 10000);
+        writeRepeated(count, fallbackValuesWriter, "a");
+        BytesInput bytes1 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        writeRepeated(count, fallbackValuesWriter, "b");
+        BytesInput bytes2 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        // now we will fall back
+        writeDistinct(count, fallbackValuesWriter, "c");
+        BytesInput bytes3 = getBytesAndCheckEncoding(fallbackValuesWriter, PLAIN);
+
+        ValueDecoder<BinaryBuffer> decoder = getDictionaryDecoder(fallbackValuesWriter, BINARY_ADAPTER, new PlainByteArrayDecoders.BinaryPlainValueDecoder());
+        checkRepeated(count, bytes1, decoder, "a");
+        checkRepeated(count, bytes2, decoder, "b");
+        decoder = new PlainByteArrayDecoders.BinaryPlainValueDecoder();
+        checkDistinct(count, bytes3, decoder, "c");
+    }
+
+    @Test
+    public void testSkipInBinaryDictionary()
+            throws Exception
+    {
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainBinaryDictionaryValuesWriter(1000, 10000);
+        writeRepeated(100, fallbackValuesWriter, "a");
+        writeDistinct(100, fallbackValuesWriter, "b");
+        assertThat(fallbackValuesWriter.getEncoding()).isEqualTo(getDictionaryEncoding());
+
+        // Test skip and skip-n with dictionary encoding
+        Slice writtenValues = Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray());
+        ValueDecoder<BinaryBuffer> decoder = getDictionaryDecoder(fallbackValuesWriter, BINARY_ADAPTER, new PlainByteArrayDecoders.BinaryPlainValueDecoder());
+        decoder.init(new SimpleSliceInputStream(writtenValues));
+        for (int i = 0; i < 100; i += 2) {
+            BinaryBuffer buffer = new BinaryBuffer(1);
+            decoder.read(buffer, 0, 1);
+            assertThat(buffer.asSlice().toStringUtf8()).isEqualTo("a" + i % 10);
+            decoder.skip(1);
+        }
+        int skipcount;
+        for (int i = 0; i < 100; i += skipcount + 1) {
+            BinaryBuffer buffer = new BinaryBuffer(1);
+            decoder.read(buffer, 0, 1);
+            assertThat(buffer.asSlice().toStringUtf8()).isEqualTo("b" + i);
+            skipcount = (100 - i) / 2;
+            decoder.skip(skipcount);
+        }
+
+        // Ensure fallback
+        writeDistinct(1000, fallbackValuesWriter, "c");
+        assertThat(fallbackValuesWriter.getEncoding()).isEqualTo(PLAIN);
+
+        // Test skip and skip-n with plain encoding (after fallback)
+        decoder = new PlainByteArrayDecoders.BinaryPlainValueDecoder();
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        decoder.skip(200);
+        for (int i = 0; i < 100; i += 2) {
+            BinaryBuffer buffer = new BinaryBuffer(1);
+            decoder.read(buffer, 0, 1);
+            assertThat(buffer.asSlice().toStringUtf8()).isEqualTo("c" + i);
+            decoder.skip(1);
+        }
+        for (int i = 100; i < 1000; i += skipcount + 1) {
+            BinaryBuffer buffer = new BinaryBuffer(1);
+            decoder.read(buffer, 0, 1);
+            assertThat(buffer.asSlice().toStringUtf8()).isEqualTo("c" + i);
+            skipcount = (1000 - i) / 2;
+            decoder.skip(skipcount);
+        }
+    }
+
+    @Test
+    public void testBinaryDictionaryFallBack()
+            throws IOException
+    {
+        int slabSize = 100;
+        int maxDictionaryByteSize = 50;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainBinaryDictionaryValuesWriter(maxDictionaryByteSize, slabSize);
+        int dataSize = 0;
+        for (long i = 0; i < 100; i++) {
+            Binary binary = Binary.fromString("str" + i);
+            fallbackValuesWriter.writeBytes(binary);
+            dataSize += (binary.length() + 4);
+            assertThat(fallbackValuesWriter.getEncoding()).isEqualTo(dataSize < maxDictionaryByteSize ? getDictionaryEncoding() : PLAIN);
+        }
+
+        // Fallback to Plain encoding, therefore use BinaryPlainValueDecoder to read it back
+        ValueDecoder<BinaryBuffer> decoder = new PlainByteArrayDecoders.BinaryPlainValueDecoder();
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        BinaryBuffer buffer = new BinaryBuffer(100);
+        decoder.read(buffer, 0, 100);
+        Slice values = buffer.asSlice();
+        int[] offsets = buffer.getOffsets();
+        int currentOffset = 0;
+        for (int i = 0; i < 100; i++) {
+            int length = offsets[i + 1] - offsets[i];
+            assertThat(values.slice(currentOffset, length).toStringUtf8()).isEqualTo("str" + i);
+            currentOffset += length;
+        }
+
+        // simulate cutting the page
+        fallbackValuesWriter.reset();
+        assertThat(fallbackValuesWriter.getBufferedSize()).isEqualTo(0);
+    }
+
+    @Test
+    public void testBinaryDictionaryChangedValues()
+            throws IOException
+    {
+        int count = 100;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainBinaryDictionaryValuesWriter(200, 10000);
+        writeRepeatedWithReuse(count, fallbackValuesWriter, "a");
+        BytesInput bytes1 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        writeRepeatedWithReuse(count, fallbackValuesWriter, "b");
+        BytesInput bytes2 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        // now we will fall back
+        writeDistinct(count, fallbackValuesWriter, "c");
+        BytesInput bytes3 = getBytesAndCheckEncoding(fallbackValuesWriter, PLAIN);
+
+        ValueDecoder<BinaryBuffer> decoder = getDictionaryDecoder(fallbackValuesWriter, BINARY_ADAPTER, new PlainByteArrayDecoders.BinaryPlainValueDecoder());
+        checkRepeated(count, bytes1, decoder, "a");
+        checkRepeated(count, bytes2, decoder, "b");
+        decoder = new PlainByteArrayDecoders.BinaryPlainValueDecoder();
+        checkDistinct(count, bytes3, decoder, "c");
+    }
+
+    @Test
+    public void testFirstPageFallBack()
+            throws IOException
+    {
+        int count = 1000;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainBinaryDictionaryValuesWriter(10000, 10000);
+        writeDistinct(count, fallbackValuesWriter, "a");
+        long dictionaryAllocatedSize = fallbackValuesWriter.getInitialWriter().getAllocatedSize();
+        assertThat(fallbackValuesWriter.getAllocatedSize()).isEqualTo(dictionaryAllocatedSize);
+        // not efficient so falls back
+        BytesInput bytes1 = getBytesAndCheckEncoding(fallbackValuesWriter, PLAIN);
+        writeRepeated(count, fallbackValuesWriter, "b");
+        assertThat(fallbackValuesWriter.getAllocatedSize()).isEqualTo(fallbackValuesWriter.getFallBackWriter().getAllocatedSize());
+        // still plain because we fell back on first page
+        BytesInput bytes2 = getBytesAndCheckEncoding(fallbackValuesWriter, PLAIN);
+
+        ValueDecoder<BinaryBuffer> decoder = new PlainByteArrayDecoders.BinaryPlainValueDecoder();
+        checkDistinct(count, bytes1, decoder, "a");
+        checkRepeated(count, bytes2, decoder, "b");
+    }
+
+    @Test
+    public void testSecondPageFallBack()
+            throws IOException
+    {
+        int count = 1000;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainBinaryDictionaryValuesWriter(1000, 10000);
+        writeRepeated(count, fallbackValuesWriter, "a");
+        BytesInput bytes1 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        writeDistinct(count, fallbackValuesWriter, "b");
+        // not efficient so falls back
+        BytesInput bytes2 = getBytesAndCheckEncoding(fallbackValuesWriter, PLAIN);
+        writeRepeated(count, fallbackValuesWriter, "a");
+        // still plain because we fell back on previous page
+        BytesInput bytes3 = getBytesAndCheckEncoding(fallbackValuesWriter, PLAIN);
+
+        ValueDecoder<BinaryBuffer> decoder = getDictionaryDecoder(fallbackValuesWriter, BINARY_ADAPTER, new PlainByteArrayDecoders.BinaryPlainValueDecoder());
+        checkRepeated(count, bytes1, decoder, "a");
+        decoder = new PlainByteArrayDecoders.BinaryPlainValueDecoder();
+        checkDistinct(count, bytes2, decoder, "b");
+        checkRepeated(count, bytes3, decoder, "a");
+    }
+
+    @Test
+    public void testLongDictionary()
+            throws IOException
+    {
+        int count = 1000;
+        int count2 = 2000;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainLongDictionaryValuesWriter(10000, 10000);
+        for (long i = 0; i < count; i++) {
+            fallbackValuesWriter.writeLong(i % 50);
+        }
+        BytesInput bytes1 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        assertThat(fallbackValuesWriter.getInitialWriter().getDictionarySize()).isEqualTo(50);
+
+        for (long i = count2; i > 0; i--) {
+            fallbackValuesWriter.writeLong(i % 50);
+        }
+        BytesInput bytes2 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        assertThat(fallbackValuesWriter.getInitialWriter().getDictionarySize()).isEqualTo(50);
+
+        DictionaryDecoder<long[]> dictionaryDecoder = getDictionaryDecoder(fallbackValuesWriter, LONG_ADAPTER, new PlainValueDecoders.LongPlainValueDecoder());
+
+        dictionaryDecoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(bytes1.toByteArray())));
+        long[] values = new long[count];
+        dictionaryDecoder.read(values, 0, count);
+        for (int i = 0; i < count; i++) {
+            assertThat(values[i]).isEqualTo(i % 50);
+        }
+
+        dictionaryDecoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(bytes2.toByteArray())));
+        values = new long[count2];
+        dictionaryDecoder.read(values, 0, count2);
+        for (int i = count2; i > 0; i--) {
+            assertThat(values[count2 - i]).isEqualTo(i % 50);
+        }
+    }
+
+    @Test
+    public void testLongDictionaryFallBack()
+            throws IOException
+    {
+        int slabSize = 100;
+        int maxDictionaryByteSize = 50;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainLongDictionaryValuesWriter(maxDictionaryByteSize, slabSize);
+        // Fallback to Plain encoding, therefore use LongPlainValueDecoder to read it back
+        ValueDecoder<long[]> decoder = new PlainValueDecoders.LongPlainValueDecoder();
+
+        roundTripLong(fallbackValuesWriter, decoder, maxDictionaryByteSize);
+        // simulate cutting the page
+        fallbackValuesWriter.reset();
+        assertThat(fallbackValuesWriter.getBufferedSize()).isEqualTo(0);
+        fallbackValuesWriter.resetDictionary();
+
+        roundTripLong(fallbackValuesWriter, decoder, maxDictionaryByteSize);
+    }
+
+    @Test
+    public void testDoubleDictionary()
+            throws IOException
+    {
+        int count = 1000;
+        int count2 = 2000;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainDoubleDictionaryValuesWriter(10000, 10000);
+
+        for (double i = 0; i < count; i++) {
+            fallbackValuesWriter.writeDouble(i % 50);
+        }
+
+        BytesInput bytes1 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        assertThat(fallbackValuesWriter.getInitialWriter().getDictionarySize()).isEqualTo(50);
+
+        for (double i = count2; i > 0; i--) {
+            fallbackValuesWriter.writeDouble(i % 50);
+        }
+        BytesInput bytes2 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        assertThat(fallbackValuesWriter.getInitialWriter().getDictionarySize()).isEqualTo(50);
+
+        DictionaryDecoder<long[]> dictionaryDecoder = getDictionaryDecoder(fallbackValuesWriter, LONG_ADAPTER, new PlainValueDecoders.LongPlainValueDecoder());
+
+        dictionaryDecoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(bytes1.toByteArray())));
+        long[] values = new long[count];
+        dictionaryDecoder.read(values, 0, count);
+        for (int i = 0; i < count; i++) {
+            double back = Double.longBitsToDouble(values[i]);
+            assertThat(back).isEqualTo(i % 50);
+        }
+
+        dictionaryDecoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(bytes2.toByteArray())));
+        values = new long[count2];
+        dictionaryDecoder.read(values, 0, count2);
+        for (int i = count2; i > 0; i--) {
+            double back = Double.longBitsToDouble(values[count2 - i]);
+            assertThat(back).isEqualTo(i % 50);
+        }
+    }
+
+    @Test
+    public void testDoubleDictionaryFallBack()
+            throws IOException
+    {
+        int slabSize = 100;
+        int maxDictionaryByteSize = 50;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainDoubleDictionaryValuesWriter(maxDictionaryByteSize, slabSize);
+
+        // Fallback to Plain encoding, therefore use LongPlainValueDecoder to read it back
+        ValueDecoder<long[]> decoder = new PlainValueDecoders.LongPlainValueDecoder();
+
+        roundTripDouble(fallbackValuesWriter, decoder, maxDictionaryByteSize);
+        // simulate cutting the page
+        fallbackValuesWriter.reset();
+        assertThat(fallbackValuesWriter.getBufferedSize()).isEqualTo(0);
+        fallbackValuesWriter.resetDictionary();
+
+        roundTripDouble(fallbackValuesWriter, decoder, maxDictionaryByteSize);
+    }
+
+    @Test
+    public void testIntDictionary()
+            throws IOException
+    {
+        int count = 2000;
+        int count2 = 4000;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainIntegerDictionaryValuesWriter(10000, 10000);
+
+        for (int i = 0; i < count; i++) {
+            fallbackValuesWriter.writeInteger(i % 50);
+        }
+        BytesInput bytes1 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        assertThat(fallbackValuesWriter.getInitialWriter().getDictionarySize()).isEqualTo(50);
+
+        for (int i = count2; i > 0; i--) {
+            fallbackValuesWriter.writeInteger(i % 50);
+        }
+        BytesInput bytes2 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        assertThat(fallbackValuesWriter.getInitialWriter().getDictionarySize()).isEqualTo(50);
+
+        DictionaryDecoder<int[]> dictionaryDecoder = getDictionaryDecoder(fallbackValuesWriter, INT_ADAPTER, new PlainValueDecoders.IntPlainValueDecoder());
+
+        dictionaryDecoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(bytes1.toByteArray())));
+        int[] values = new int[count];
+        dictionaryDecoder.read(values, 0, count);
+        for (int i = 0; i < count; i++) {
+            assertThat(values[i]).isEqualTo(i % 50);
+        }
+
+        dictionaryDecoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(bytes2.toByteArray())));
+        values = new int[count2];
+        dictionaryDecoder.read(values, 0, count2);
+        for (int i = count2; i > 0; i--) {
+            assertThat(values[count2 - i]).isEqualTo(i % 50);
+        }
+    }
+
+    @Test
+    public void testIntDictionaryFallBack()
+            throws IOException
+    {
+        int slabSize = 100;
+        int maxDictionaryByteSize = 50;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainIntegerDictionaryValuesWriter(maxDictionaryByteSize, slabSize);
+
+        // Fallback to Plain encoding, therefore use IntPlainValueDecoder to read it back
+        ValueDecoder<int[]> decoder = new PlainValueDecoders.IntPlainValueDecoder();
+
+        roundTripInt(fallbackValuesWriter, decoder, maxDictionaryByteSize);
+        // simulate cutting the page
+        fallbackValuesWriter.reset();
+        assertThat(fallbackValuesWriter.getBufferedSize()).isEqualTo(0);
+        fallbackValuesWriter.resetDictionary();
+
+        roundTripInt(fallbackValuesWriter, decoder, maxDictionaryByteSize);
+    }
+
+    @Test
+    public void testFloatDictionary()
+            throws IOException
+    {
+        int count = 2000;
+        int count2 = 4000;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainFloatDictionaryValuesWriter(10000, 10000);
+
+        for (float i = 0; i < count; i++) {
+            fallbackValuesWriter.writeFloat(i % 50);
+        }
+        BytesInput bytes1 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        assertThat(fallbackValuesWriter.getInitialWriter().getDictionarySize()).isEqualTo(50);
+
+        for (float i = count2; i > 0; i--) {
+            fallbackValuesWriter.writeFloat(i % 50);
+        }
+        BytesInput bytes2 = getBytesAndCheckEncoding(fallbackValuesWriter, getDictionaryEncoding());
+        assertThat(fallbackValuesWriter.getInitialWriter().getDictionarySize()).isEqualTo(50);
+
+        DictionaryDecoder<int[]> dictionaryDecoder = getDictionaryDecoder(fallbackValuesWriter, INT_ADAPTER, new PlainValueDecoders.IntPlainValueDecoder());
+
+        dictionaryDecoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(bytes1.toByteArray())));
+        int[] values = new int[count];
+        dictionaryDecoder.read(values, 0, count);
+        for (int i = 0; i < count; i++) {
+            float back = Float.intBitsToFloat(values[i]);
+            assertThat(back).isEqualTo(i % 50);
+        }
+
+        dictionaryDecoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(bytes2.toByteArray())));
+        values = new int[count2];
+        dictionaryDecoder.read(values, 0, count2);
+        for (int i = count2; i > 0; i--) {
+            float back = Float.intBitsToFloat(values[count2 - i]);
+            assertThat(back).isEqualTo(i % 50);
+        }
+    }
+
+    @Test
+    public void testFloatDictionaryFallBack()
+            throws IOException
+    {
+        int slabSize = 100;
+        int maxDictionaryByteSize = 50;
+        DictionaryFallbackValuesWriter fallbackValuesWriter = newPlainFloatDictionaryValuesWriter(maxDictionaryByteSize, slabSize);
+
+        // Fallback to Plain encoding, therefore use IntPlainValueDecoder to read it back
+        ValueDecoder<int[]> decoder = new PlainValueDecoders.IntPlainValueDecoder();
+
+        roundTripFloat(fallbackValuesWriter, decoder, maxDictionaryByteSize);
+        // simulate cutting the page
+        fallbackValuesWriter.reset();
+        assertThat(fallbackValuesWriter.getBufferedSize()).isEqualTo(0);
+        fallbackValuesWriter.resetDictionary();
+
+        roundTripFloat(fallbackValuesWriter, decoder, maxDictionaryByteSize);
+    }
+
+    private void roundTripLong(DictionaryFallbackValuesWriter fallbackValuesWriter, ValueDecoder<long[]> decoder, int maxDictionaryByteSize)
+            throws IOException
+    {
+        int fallBackThreshold = maxDictionaryByteSize / 8;
+        for (long i = 0; i < 100; i++) {
+            fallbackValuesWriter.writeLong(i);
+            assertThat(fallbackValuesWriter.getEncoding()).isEqualTo(i < fallBackThreshold ? getDictionaryEncoding() : PLAIN);
+        }
+
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        long[] values = new long[100];
+        decoder.read(values, 0, 100);
+        for (int i = 0; i < 100; i++) {
+            assertThat(values[i]).isEqualTo(i);
+        }
+
+        // Test skip with plain encoding
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        values = new long[1];
+        for (int i = 0; i < 100; i += 2) {
+            decoder.read(values, 0, 1);
+            assertThat(values[0]).isEqualTo(i);
+            decoder.skip(1);
+        }
+
+        // Test skip-n with plain encoding
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        int skipcount;
+        for (int i = 0; i < 100; i += skipcount + 1) {
+            decoder.read(values, 0, 1);
+            assertThat(values[0]).isEqualTo(i);
+            skipcount = (100 - i) / 2;
+            decoder.skip(skipcount);
+        }
+    }
+
+    private static void roundTripDouble(DictionaryFallbackValuesWriter fallbackValuesWriter, ValueDecoder<long[]> decoder, int maxDictionaryByteSize)
+            throws IOException
+    {
+        int fallBackThreshold = maxDictionaryByteSize / 8;
+        for (double i = 0; i < 100; i++) {
+            fallbackValuesWriter.writeDouble(i);
+            assertThat(fallbackValuesWriter.getEncoding()).isEqualTo(i < fallBackThreshold ? getDictionaryEncoding() : PLAIN);
+        }
+
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        long[] values = new long[100];
+        decoder.read(values, 0, 100);
+        for (int i = 0; i < 100; i++) {
+            assertThat(Double.longBitsToDouble(values[i])).isEqualTo(i);
+        }
+
+        // Test skip with plain encoding
+        values = new long[1];
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        for (int i = 0; i < 100; i += 2) {
+            decoder.read(values, 0, 1);
+            assertThat(Double.longBitsToDouble(values[0])).isEqualTo(i);
+            decoder.skip(1);
+        }
+
+        // Test skip-n with plain encoding
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        int skipcount;
+        for (int i = 0; i < 100; i += skipcount + 1) {
+            decoder.read(values, 0, 1);
+            assertThat(Double.longBitsToDouble(values[0])).isEqualTo(i);
+            skipcount = (100 - i) / 2;
+            decoder.skip(skipcount);
+        }
+    }
+
+    private static void roundTripInt(DictionaryFallbackValuesWriter fallbackValuesWriter, ValueDecoder<int[]> decoder, int maxDictionaryByteSize)
+            throws IOException
+    {
+        int fallBackThreshold = maxDictionaryByteSize / 4;
+        for (int i = 0; i < 100; i++) {
+            fallbackValuesWriter.writeInteger(i);
+            assertThat(fallbackValuesWriter.getEncoding()).isEqualTo(i < fallBackThreshold ? getDictionaryEncoding() : PLAIN);
+        }
+
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        int[] values = new int[100];
+        decoder.read(values, 0, 100);
+        for (int i = 0; i < 100; i++) {
+            assertThat(values[i]).isEqualTo(i);
+        }
+
+        // Test skip with plain encoding
+        values = new int[1];
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        for (int i = 0; i < 100; i += 2) {
+            decoder.read(values, 0, 1);
+            assertThat(values[0]).isEqualTo(i);
+            decoder.skip(1);
+        }
+
+        // Test skip-n with plain encoding
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        int skipcount;
+        for (int i = 0; i < 100; i += skipcount + 1) {
+            decoder.read(values, 0, 1);
+            assertThat(values[0]).isEqualTo(i);
+            skipcount = (100 - i) / 2;
+            decoder.skip(skipcount);
+        }
+    }
+
+    private static void roundTripFloat(DictionaryFallbackValuesWriter fallbackValuesWriter, ValueDecoder<int[]> decoder, int maxDictionaryByteSize)
+            throws IOException
+    {
+        int fallBackThreshold = maxDictionaryByteSize / 4;
+        for (float i = 0; i < 100; i++) {
+            fallbackValuesWriter.writeFloat(i);
+            assertThat(fallbackValuesWriter.getEncoding()).isEqualTo(i < fallBackThreshold ? getDictionaryEncoding() : PLAIN);
+        }
+
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        int[] values = new int[100];
+        decoder.read(values, 0, 100);
+        for (int i = 0; i < 100; i++) {
+            assertThat(Float.intBitsToFloat(values[i])).isEqualTo(i);
+        }
+
+        // Test skip with plain encoding
+        values = new int[1];
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        for (int i = 0; i < 100; i += 2) {
+            decoder.read(values, 0, 1);
+            assertThat(Float.intBitsToFloat(values[0])).isEqualTo(i);
+            decoder.skip(1);
+        }
+
+        // Test skip-n with plain encoding
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(fallbackValuesWriter.getBytes().toByteArray())));
+        int skipcount;
+        for (int i = 0; i < 100; i += skipcount + 1) {
+            decoder.read(values, 0, 1);
+            assertThat(Float.intBitsToFloat(values[0])).isEqualTo(i);
+            skipcount = (100 - i) / 2;
+            decoder.skip(skipcount);
+        }
+    }
+
+    private static <T> DictionaryDecoder<T> getDictionaryDecoder(ValuesWriter valuesWriter, ColumnAdapter<T> columnAdapter, ValueDecoder<T> plainValuesDecoder)
+            throws IOException
+    {
+        DictionaryPage dictionaryPage = toTrinoDictionaryPage(valuesWriter.toDictPageAndClose().copy());
+        return DictionaryDecoder.getDictionaryDecoder(dictionaryPage, columnAdapter, plainValuesDecoder, true);
+    }
+
+    private static void checkDistinct(int count, BytesInput bytes, ValueDecoder<BinaryBuffer> decoder, String prefix)
+            throws IOException
+    {
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(bytes.toByteArray())));
+        BinaryBuffer buffer = new BinaryBuffer(count);
+        decoder.read(buffer, 0, count);
+        Slice values = buffer.asSlice();
+        int[] offsets = buffer.getOffsets();
+        int currentOffset = 0;
+        for (int i = 0; i < count; i++) {
+            int length = offsets[i + 1] - offsets[i];
+            assertThat(values.slice(currentOffset, length).toStringUtf8()).isEqualTo(prefix + i);
+            currentOffset += length;
+        }
+    }
+
+    private static void checkRepeated(int count, BytesInput bytes, ValueDecoder<BinaryBuffer> decoder, String prefix)
+            throws IOException
+    {
+        decoder.init(new SimpleSliceInputStream(Slices.wrappedBuffer(bytes.toByteArray())));
+        BinaryBuffer buffer = new BinaryBuffer(count);
+        decoder.read(buffer, 0, count);
+        Slice values = buffer.asSlice();
+        int[] offsets = buffer.getOffsets();
+        int currentOffset = 0;
+        for (int i = 0; i < count; i++) {
+            int length = offsets[i + 1] - offsets[i];
+            assertThat(values.slice(currentOffset, length).toStringUtf8()).isEqualTo(prefix + i % 10);
+            currentOffset += length;
+        }
+    }
+
+    private static void writeDistinct(int count, ValuesWriter valuesWriter, String prefix)
+    {
+        for (int i = 0; i < count; i++) {
+            valuesWriter.writeBytes(Binary.fromString(prefix + i));
+        }
+    }
+
+    private static void writeRepeated(int count, ValuesWriter valuesWriter, String prefix)
+    {
+        for (int i = 0; i < count; i++) {
+            valuesWriter.writeBytes(Binary.fromString(prefix + i % 10));
+        }
+    }
+
+    private static void writeRepeatedWithReuse(int count, ValuesWriter valuesWriter, String prefix)
+    {
+        Binary reused = Binary.fromReusedByteArray((prefix + "0").getBytes(StandardCharsets.UTF_8));
+        for (int i = 0; i < count; i++) {
+            Binary content = Binary.fromString(prefix + i % 10);
+            System.arraycopy(content.getBytesUnsafe(), 0, reused.getBytesUnsafe(), 0, reused.length());
+            valuesWriter.writeBytes(reused);
+        }
+    }
+
+    private static BytesInput getBytesAndCheckEncoding(ValuesWriter valuesWriter, Encoding encoding)
+            throws IOException
+    {
+        BytesInput bytes = BytesInput.copy(valuesWriter.getBytes());
+        assertThat(valuesWriter.getEncoding()).isEqualTo(encoding);
+        valuesWriter.reset();
+        return bytes;
+    }
+
+    private static DictionaryFallbackValuesWriter plainFallBack(DictionaryValuesWriter dictionaryValuesWriter, int initialSize)
+    {
+        return new DictionaryFallbackValuesWriter(dictionaryValuesWriter, new PlainValuesWriter(initialSize, initialSize * 5, new DirectByteBufferAllocator()));
+    }
+
+    private static DictionaryFallbackValuesWriter newPlainBinaryDictionaryValuesWriter(int maxDictionaryByteSize, int initialSize)
+    {
+        return plainFallBack(new PlainBinaryDictionaryValuesWriter(maxDictionaryByteSize, getDictionaryEncoding(), getDictionaryEncoding(), new DirectByteBufferAllocator()), initialSize);
+    }
+
+    private static DictionaryFallbackValuesWriter newPlainLongDictionaryValuesWriter(int maxDictionaryByteSize, int initialSize)
+    {
+        return plainFallBack(new PlainLongDictionaryValuesWriter(maxDictionaryByteSize, getDictionaryEncoding(), getDictionaryEncoding(), new DirectByteBufferAllocator()), initialSize);
+    }
+
+    private static DictionaryFallbackValuesWriter newPlainIntegerDictionaryValuesWriter(int maxDictionaryByteSize, int initialSize)
+    {
+        return plainFallBack(new PlainIntegerDictionaryValuesWriter(maxDictionaryByteSize, getDictionaryEncoding(), getDictionaryEncoding(), new DirectByteBufferAllocator()), initialSize);
+    }
+
+    private static DictionaryFallbackValuesWriter newPlainDoubleDictionaryValuesWriter(int maxDictionaryByteSize, int initialSize)
+    {
+        return plainFallBack(new PlainDoubleDictionaryValuesWriter(maxDictionaryByteSize, getDictionaryEncoding(), getDictionaryEncoding(), new DirectByteBufferAllocator()), initialSize);
+    }
+
+    private static DictionaryFallbackValuesWriter newPlainFloatDictionaryValuesWriter(int maxDictionaryByteSize, int initialSize)
+    {
+        return plainFallBack(new PlainFloatDictionaryValuesWriter(maxDictionaryByteSize, getDictionaryEncoding(), getDictionaryEncoding(), new DirectByteBufferAllocator()), initialSize);
+    }
+
+    @SuppressWarnings("deprecation")
+    private static Encoding getDictionaryEncoding()
+    {
+        return PLAIN_DICTIONARY;
+    }
+}
diff --git a/lib/trino-parquet/src/test/resources/time_millis_int32.snappy.parquet b/lib/trino-parquet/src/test/resources/time_millis_int32.snappy.parquet
new file mode 100644
index 000000000000..0475588b7b2b
Binary files /dev/null and b/lib/trino-parquet/src/test/resources/time_millis_int32.snappy.parquet differ
diff --git a/lib/trino-phoenix5-patched/pom.xml b/lib/trino-phoenix5-patched/pom.xml
index da804f22da29..5652d0ad421d 100644
--- a/lib/trino-phoenix5-patched/pom.xml
+++ b/lib/trino-phoenix5-patched/pom.xml
@@ -6,12 +6,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-phoenix5-patched</artifactId>
-    <name>trino-phoenix5-patched</name>
     <description>Trino - patched Phoenix5 client to work with JDK17</description>
 
     <properties>
@@ -22,7 +21,7 @@
         <dependency>
             <groupId>org.apache.phoenix</groupId>
             <artifactId>phoenix-client-embedded-hbase-2.2</artifactId>
-            <version>5.1.2</version>
+            <version>5.1.3</version>
         </dependency>
 
         <dependency>
@@ -37,18 +36,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <phase>package</phase>
                         <configuration>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
                             <createSourcesJar>false</createSourcesJar>
                             <shadeSourcesContent>false</shadeSourcesContent>
-                            <dependencyReducedPomLocation>${project.build.directory}/pom.xml</dependencyReducedPomLocation>
                             <promoteTransitiveDependencies>false</promoteTransitiveDependencies>
                             <relocations>
                                 <relocation>
diff --git a/lib/trino-phoenix5-patched/src/main/java/org/apache/phoenix/shaded/org/apache/zookeeper/client/StaticHostProvider.java b/lib/trino-phoenix5-patched/src/main/java/org/apache/phoenix/shaded/org/apache/zookeeper/client/StaticHostProvider.java
index 4fdc665965bc..2c3abeb71da1 100644
--- a/lib/trino-phoenix5-patched/src/main/java/org/apache/phoenix/shaded/org/apache/zookeeper/client/StaticHostProvider.java
+++ b/lib/trino-phoenix5-patched/src/main/java/org/apache/phoenix/shaded/org/apache/zookeeper/client/StaticHostProvider.java
@@ -28,7 +28,8 @@ public final class StaticHostProvider
 {
     public interface Resolver
     {
-        InetAddress[] getAllByName(String name) throws UnknownHostException;
+        InetAddress[] getAllByName(String name)
+                throws UnknownHostException;
     }
 
     private final List<InetSocketAddress> serverAddresses = new ArrayList<InetSocketAddress>(5);
diff --git a/lib/trino-plugin-toolkit/pom.xml b/lib/trino-plugin-toolkit/pom.xml
index 09919db70c9e..dadb793e0cc3 100644
--- a/lib/trino-plugin-toolkit/pom.xml
+++ b/lib/trino-plugin-toolkit/pom.xml
@@ -1,16 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-plugin-toolkit</artifactId>
-    <name>trino-plugin-toolkit</name>
     <description>Trino - Plugin Toolkit</description>
 
     <properties>
@@ -19,99 +18,98 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-matching</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>http-client</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>security</artifactId>
+            <artifactId>bootstrap</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <artifactId>configuration</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>stats</artifactId>
+            <artifactId>http-client</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
+            <artifactId>json</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>security</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.airlift</groupId>
+            <artifactId>stats</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-matching</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -129,26 +127,16 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- It was introduced by http-client as compile. Used by tests but also needed transitively -->
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>node</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>node</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -163,6 +151,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -171,7 +166,7 @@
 
         <dependency>
             <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-servlet-api</artifactId>
+            <artifactId>jetty-jakarta-servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -185,15 +180,15 @@
     <build>
         <resources>
             <resource>
-                <directory>src/main/resources</directory>
                 <filtering>true</filtering>
+                <directory>src/main/resources</directory>
                 <includes>
                     <include>io/trino/plugin/base/trino-spi-compile-time-version.txt</include>
                 </includes>
             </resource>
             <resource>
-                <directory>src/main/resources</directory>
                 <filtering>false</filtering>
+                <directory>src/main/resources</directory>
                 <excludes>
                     <exclude>io/trino/plugin/base/trino-spi-compile-time-version.txt</exclude>
                 </excludes>
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/annotation/NotThreadSafe.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/annotation/NotThreadSafe.java
new file mode 100644
index 000000000000..cb9f0a5f4369
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/annotation/NotThreadSafe.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
+/**
+ * The class to which this annotation is applied is not considered thread-safe.
+ */
+@Documented
+@Target(value = TYPE)
+@Retention(value = CLASS)
+public @interface NotThreadSafe
+{
+}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/TypeDeserializer.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/TypeDeserializer.java
index 27977711e605..f3ad055772c5 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/TypeDeserializer.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/TypeDeserializer.java
@@ -15,12 +15,11 @@
 
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.FromStringDeserializer;
+import com.google.inject.Inject;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeId;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/Versions.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/Versions.java
index d30cca3c8cb3..eb5171ede53a 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/Versions.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/Versions.java
@@ -28,8 +28,10 @@ private Versions() {}
      * Using plugins built for a different version of Trino may fail at runtime, especially if plugin author
      * chooses not to maintain compatibility with older SPI versions, as happens for plugins maintained together with
      * the Trino project.
+     *
+     * @implNote This method is designed only for plugins distributed with Trino
      */
-    public static void checkSpiVersion(ConnectorContext context, ConnectorFactory connectorFactory)
+    public static void checkStrictSpiVersionMatch(ConnectorContext context, ConnectorFactory connectorFactory)
     {
         String spiVersion = context.getSpiVersion();
         String compileTimeSpiVersion = SpiVersionHolder.SPI_COMPILE_TIME_VERSION;
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/authentication/CachingKerberosAuthentication.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/authentication/CachingKerberosAuthentication.java
index c448a566d4ca..d1b524903871 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/authentication/CachingKerberosAuthentication.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/authentication/CachingKerberosAuthentication.java
@@ -13,7 +13,8 @@
  */
 package io.trino.plugin.base.authentication;
 
-import javax.annotation.concurrent.GuardedBy;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+
 import javax.security.auth.Subject;
 import javax.security.auth.kerberos.KerberosTicket;
 
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorAccessControl.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorAccessControl.java
index 1cde37af1469..159f9bd5105e 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorAccessControl.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorAccessControl.java
@@ -13,19 +13,18 @@
  */
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.SchemaRoutineName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.security.ViewExpression;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -198,6 +197,14 @@ public Set<String> filterColumns(ConnectorSecurityContext context, SchemaTableNa
         }
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(ConnectorSecurityContext context, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.filterColumns(context, tableColumns);
+        }
+    }
+
     @Override
     public void checkCanAddColumn(ConnectorSecurityContext context, SchemaTableName tableName)
     {
@@ -350,14 +357,6 @@ public void checkCanRenameMaterializedView(ConnectorSecurityContext context, Sch
         }
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            delegate.checkCanGrantExecuteFunctionPrivilege(context, functionKind, functionName, grantee, grantOption);
-        }
-    }
-
     @Override
     public void checkCanSetMaterializedViewProperties(ConnectorSecurityContext context, SchemaTableName materializedViewName, Map<String, Optional<Object>> properties)
     {
@@ -470,14 +469,6 @@ public void checkCanSetRole(ConnectorSecurityContext context, String role)
         }
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(ConnectorSecurityContext context)
-    {
-        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            delegate.checkCanShowRoleAuthorizationDescriptors(context);
-        }
-    }
-
     @Override
     public void checkCanShowRoles(ConnectorSecurityContext context)
     {
@@ -519,34 +510,66 @@ public void checkCanExecuteTableProcedure(ConnectorSecurityContext context, Sche
     }
 
     @Override
-    public void checkCanExecuteFunction(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName function)
+    public boolean canExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            delegate.checkCanExecuteFunction(context, functionKind, function);
+            return delegate.canExecuteFunction(context, function);
         }
     }
 
     @Override
-    public List<ViewExpression> getRowFilters(ConnectorSecurityContext context, SchemaTableName tableName)
+    public boolean canCreateViewWithExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.getRowFilters(context, tableName);
+            return delegate.canCreateViewWithExecuteFunction(context, function);
         }
     }
 
     @Override
-    public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    public void checkCanShowFunctions(ConnectorSecurityContext context, String schemaName)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.getColumnMask(context, tableName, columnName, type);
+            delegate.checkCanShowFunctions(context, schemaName);
         }
     }
 
     @Override
-    public List<ViewExpression> getColumnMasks(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    public Set<SchemaFunctionName> filterFunctions(ConnectorSecurityContext context, Set<SchemaFunctionName> functionNames)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.getColumnMasks(context, tableName, columnName, type);
+            return delegate.filterFunctions(context, functionNames);
+        }
+    }
+
+    @Override
+    public void checkCanCreateFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            delegate.checkCanCreateFunction(context, function);
+        }
+    }
+
+    @Override
+    public void checkCanDropFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            delegate.checkCanDropFunction(context, function);
+        }
+    }
+
+    @Override
+    public List<ViewExpression> getRowFilters(ConnectorSecurityContext context, SchemaTableName tableName)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.getRowFilters(context, tableName);
+        }
+    }
+
+    @Override
+    public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.getColumnMask(context, tableName, columnName, type);
         }
     }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMergeSink.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMergeSink.java
index b0713e31bae8..1b626219f464 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMergeSink.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMergeSink.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.spi.Page;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorMergeSink;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMetadata.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMetadata.java
index 812e9f9027ae..adc7a7be7b7e 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMetadata.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMetadata.java
@@ -13,12 +13,12 @@
  */
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.AggregationApplicationResult;
 import io.trino.spi.connector.BeginTableExecuteResult;
-import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
@@ -49,10 +49,13 @@
 import io.trino.spi.connector.LimitApplicationResult;
 import io.trino.spi.connector.MaterializedViewFreshness;
 import io.trino.spi.connector.ProjectionApplicationResult;
+import io.trino.spi.connector.RelationColumnsMetadata;
+import io.trino.spi.connector.RelationCommentMetadata;
 import io.trino.spi.connector.RetryMode;
 import io.trino.spi.connector.RowChangeParadigm;
 import io.trino.spi.connector.SampleApplicationResult;
 import io.trino.spi.connector.SampleType;
+import io.trino.spi.connector.SaveMode;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.connector.SortItem;
@@ -61,15 +64,18 @@
 import io.trino.spi.connector.TableFunctionApplicationResult;
 import io.trino.spi.connector.TableScanRedirectApplicationResult;
 import io.trino.spi.connector.TopNApplicationResult;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Constant;
 import io.trino.spi.function.AggregationFunctionMetadata;
 import io.trino.spi.function.BoundSignature;
 import io.trino.spi.function.FunctionDependencyDeclaration;
 import io.trino.spi.function.FunctionId;
 import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.function.SchemaFunctionName;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
 import io.trino.spi.security.GrantInfo;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.RoleGrant;
@@ -79,8 +85,6 @@
 import io.trino.spi.statistics.TableStatisticsMetadata;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -89,6 +93,7 @@
 import java.util.OptionalLong;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.UnaryOperator;
 
 import static java.util.Objects.requireNonNull;
 
@@ -129,6 +134,14 @@ public Optional<ConnectorTableLayout> getNewTableLayout(ConnectorSession session
         }
     }
 
+    @Override
+    public Optional<Type> getSupportedType(ConnectorSession session, Map<String, Object> tableProperties, Type type)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.getSupportedType(session, tableProperties, type);
+        }
+    }
+
     @Override
     public Optional<ConnectorTableLayout> getInsertLayout(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
@@ -242,18 +255,18 @@ public Optional<SystemTable> getSystemTable(ConnectorSession session, SchemaTabl
     }
 
     @Override
-    public ConnectorTableSchema getTableSchema(ConnectorSession session, ConnectorTableHandle table)
+    public SchemaTableName getTableName(ConnectorSession session, ConnectorTableHandle table)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.getTableSchema(session, table);
+            return delegate.getTableName(session, table);
         }
     }
 
     @Override
-    public SchemaTableName getSchemaTableName(ConnectorSession session, ConnectorTableHandle table)
+    public ConnectorTableSchema getTableSchema(ConnectorSession session, ConnectorTableHandle table)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.getSchemaTableName(session, table);
+            return delegate.getTableSchema(session, table);
         }
     }
 
@@ -313,6 +326,25 @@ public ClassLoaderSafeIterator<TableColumnsMetadata> streamTableColumns(Connecto
         }
     }
 
+    @Override
+    public ClassLoaderSafeIterator<RelationColumnsMetadata> streamRelationColumns(
+            ConnectorSession session,
+            Optional<String> schemaName,
+            UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return new ClassLoaderSafeIterator<>(delegate.streamRelationColumns(session, schemaName, relationFilter), classLoader);
+        }
+    }
+
+    @Override
+    public ClassLoaderSafeIterator<RelationCommentMetadata> streamRelationComments(ConnectorSession session, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return new ClassLoaderSafeIterator<>(delegate.streamRelationComments(session, schemaName, relationFilter), classLoader);
+        }
+    }
+
     @Override
     public TableStatistics getTableStatistics(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
@@ -329,6 +361,14 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
         }
     }
 
+    @Override
+    public void addField(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> parentPath, String fieldName, Type type, boolean ignoreExisting)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            delegate.addField(session, tableHandle, parentPath, fieldName, type, ignoreExisting);
+        }
+    }
+
     @Override
     public void setColumnType(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column, Type type)
     {
@@ -337,6 +377,14 @@ public void setColumnType(ConnectorSession session, ConnectorTableHandle tableHa
         }
     }
 
+    @Override
+    public void setFieldType(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> fieldPath, Type type)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            delegate.setFieldType(session, tableHandle, fieldPath, type);
+        }
+    }
+
     @Override
     public void setTableAuthorization(ConnectorSession session, SchemaTableName table, TrinoPrincipal principal)
     {
@@ -354,10 +402,10 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            delegate.dropSchema(session, schemaName);
+            delegate.dropSchema(session, schemaName, cascade);
         }
     }
 
@@ -385,6 +433,14 @@ public void createTable(ConnectorSession session, ConnectorTableMetadata tableMe
         }
     }
 
+    @Override
+    public void createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, SaveMode saveMode)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            delegate.createTable(session, tableMetadata, saveMode);
+        }
+    }
+
     @Override
     public void dropTable(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
@@ -409,6 +465,14 @@ public void renameColumn(ConnectorSession session, ConnectorTableHandle tableHan
         }
     }
 
+    @Override
+    public void renameField(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> fieldPath, String target)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            delegate.renameField(session, tableHandle, fieldPath, target);
+        }
+    }
+
     @Override
     public void dropColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column)
     {
@@ -465,6 +529,14 @@ public void setViewColumnComment(ConnectorSession session, SchemaTableName viewN
         }
     }
 
+    @Override
+    public void setMaterializedViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            delegate.setMaterializedViewColumnComment(session, viewName, columnName, comment);
+        }
+    }
+
     @Override
     public void setColumnComment(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column, Optional<String> comment)
     {
@@ -481,6 +553,14 @@ public ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, Con
         }
     }
 
+    @Override
+    public ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, Optional<ConnectorTableLayout> layout, RetryMode retryMode, boolean replace)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.beginCreateTable(session, tableMetadata, layout, retryMode, replace);
+        }
+    }
+
     @Override
     public Optional<ConnectorOutputMetadata> finishCreateTable(ConnectorSession session, ConnectorOutputTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
     {
@@ -624,18 +704,30 @@ public Optional<ConnectorViewDefinition> getView(ConnectorSession session, Schem
     }
 
     @Override
-    public Map<String, Object> getSchemaProperties(ConnectorSession session, CatalogSchemaName schemaName)
+    public Map<String, Object> getSchemaProperties(ConnectorSession session, String schemaName)
+    {
+        return delegate.getSchemaProperties(session, schemaName);
+    }
+
+    @Override
+    public Optional<TrinoPrincipal> getSchemaOwner(ConnectorSession session, String schemaName)
+    {
+        return delegate.getSchemaOwner(session, schemaName);
+    }
+
+    @Override
+    public Optional<ConnectorTableHandle> applyUpdate(ConnectorSession session, ConnectorTableHandle handle, Map<ColumnHandle, Constant> assignments)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.getSchemaProperties(session, schemaName);
+            return delegate.applyUpdate(session, handle, assignments);
         }
     }
 
     @Override
-    public Optional<TrinoPrincipal> getSchemaOwner(ConnectorSession session, CatalogSchemaName schemaName)
+    public OptionalLong executeUpdate(ConnectorSession session, ConnectorTableHandle handle)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.getSchemaOwner(session, schemaName);
+            return delegate.executeUpdate(session, handle);
         }
     }
 
@@ -705,6 +797,46 @@ public FunctionDependencyDeclaration getFunctionDependencies(ConnectorSession se
         }
     }
 
+    @Override
+    public Collection<LanguageFunction> listLanguageFunctions(ConnectorSession session, String schemaName)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.listLanguageFunctions(session, schemaName);
+        }
+    }
+
+    @Override
+    public Collection<LanguageFunction> getLanguageFunctions(ConnectorSession session, SchemaFunctionName name)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.getLanguageFunctions(session, name);
+        }
+    }
+
+    @Override
+    public boolean languageFunctionExists(ConnectorSession session, SchemaFunctionName name, String signatureToken)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.languageFunctionExists(session, name, signatureToken);
+        }
+    }
+
+    @Override
+    public void createLanguageFunction(ConnectorSession session, SchemaFunctionName name, LanguageFunction function, boolean replace)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            delegate.createLanguageFunction(session, name, function, replace);
+        }
+    }
+
+    @Override
+    public void dropLanguageFunction(ConnectorSession session, SchemaFunctionName name, String signatureToken)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            delegate.dropLanguageFunction(session, name, signatureToken);
+        }
+    }
+
     @Override
     public boolean roleExists(ConnectorSession session, String role)
     {
@@ -1042,10 +1174,10 @@ public ConnectorMergeTableHandle beginMerge(ConnectorSession session, ConnectorT
     }
 
     @Override
-    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle mergeTableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            delegate.finishMerge(session, tableHandle, fragments, computedStatistics);
+            delegate.finishMerge(session, mergeTableHandle, fragments, computedStatistics);
         }
     }
 
@@ -1074,33 +1206,26 @@ public RowChangeParadigm getRowChangeParadigm(ConnectorSession session, Connecto
     }
 
     @Override
-    public boolean supportsReportingWrittenBytes(ConnectorSession session, SchemaTableName schemaTableName, Map<String, Object> tableProperties)
+    public OptionalInt getMaxWriterTasks(ConnectorSession session)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.supportsReportingWrittenBytes(session, schemaTableName, tableProperties);
+            return delegate.getMaxWriterTasks(session);
         }
     }
 
     @Override
-    public boolean supportsReportingWrittenBytes(ConnectorSession session, ConnectorTableHandle connectorTableHandle)
+    public WriterScalingOptions getNewTableWriterScalingOptions(ConnectorSession session, SchemaTableName tableName, Map<String, Object> tableProperties)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.supportsReportingWrittenBytes(session, connectorTableHandle);
+            return delegate.getNewTableWriterScalingOptions(session, tableName, tableProperties);
         }
     }
 
     @Override
-    public OptionalInt getMaxWriterTasks(ConnectorSession session)
+    public WriterScalingOptions getInsertWriterScalingOptions(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.getMaxWriterTasks(session);
+            return delegate.getInsertWriterScalingOptions(session, tableHandle);
         }
     }
-
-    @Override
-    protected Object clone()
-            throws CloneNotSupportedException
-    {
-        return super.clone();
-    }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSink.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSink.java
index 0c0331e0b01b..6b399d2d40de 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSink.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSink.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.spi.Page;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorPageSink;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSinkProvider.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSinkProvider.java
index bb9395d18b9e..9df776207999 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSinkProvider.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSinkProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorMergeSink;
@@ -25,8 +26,6 @@
 import io.trino.spi.connector.ConnectorTableExecuteHandle;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 public final class ClassLoaderSafeConnectorPageSinkProvider
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSourceProvider.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSourceProvider.java
index cde34bc58d97..ee8ed1d078b7 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSourceProvider.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSourceProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorPageSource;
@@ -23,8 +24,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.DynamicFilter;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorRecordSetProvider.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorRecordSetProvider.java
index c182273a28d0..cced3a1c96e8 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorRecordSetProvider.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorRecordSetProvider.java
@@ -14,6 +14,7 @@
 
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
@@ -23,8 +24,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.RecordSet;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitManager.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitManager.java
index 716687081720..5ff299b72dbe 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitManager.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
@@ -21,10 +22,7 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.DynamicFilter;
-import io.trino.spi.function.SchemaFunctionName;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-
-import javax.inject.Inject;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 
 import static java.util.Objects.requireNonNull;
 
@@ -58,11 +56,10 @@ public ConnectorSplitSource getSplits(
     public ConnectorSplitSource getSplits(
             ConnectorTransactionHandle transaction,
             ConnectorSession session,
-            SchemaFunctionName name,
             ConnectorTableFunctionHandle function)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.getSplits(transaction, session, name, function);
+            return delegate.getSplits(transaction, session, function);
         }
     }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitSource.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitSource.java
index 8729b73ec862..6ec167bfac70 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitSource.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitSource.java
@@ -13,11 +13,10 @@
  */
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorSplitSource;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorTableFunction.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorTableFunction.java
index 83945b1b2504..47f75333f28a 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorTableFunction.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorTableFunction.java
@@ -14,13 +14,14 @@
 package io.trino.plugin.base.classloader;
 
 import io.trino.spi.classloader.ThreadContextClassLoader;
+import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.ArgumentSpecification;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.ReturnTypeSpecification;
-import io.trino.spi.ptf.TableFunctionAnalysis;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ArgumentSpecification;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ReturnTypeSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
 
 import java.util.List;
 import java.util.Map;
@@ -72,10 +73,13 @@ public ReturnTypeSpecification getReturnTypeSpecification()
     }
 
     @Override
-    public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+    public TableFunctionAnalysis analyze(ConnectorSession session,
+            ConnectorTransactionHandle transaction,
+            Map<String, Argument> arguments,
+            ConnectorAccessControl accessControl)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.analyze(session, transaction, arguments);
+            return delegate.analyze(session, transaction, arguments, accessControl);
         }
     }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeEventListener.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeEventListener.java
index dc6f8d7436e6..b507dc40be11 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeEventListener.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeEventListener.java
@@ -13,14 +13,13 @@
  */
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.eventlistener.EventListener;
 import io.trino.spi.eventlistener.QueryCompletedEvent;
 import io.trino.spi.eventlistener.QueryCreatedEvent;
 import io.trino.spi.eventlistener.SplitCompletedEvent;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 public class ClassLoaderSafeEventListener
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeNodePartitioningProvider.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeNodePartitioningProvider.java
index 98bbcc7f459a..dcf272d1733f 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeNodePartitioningProvider.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeNodePartitioningProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.BucketFunction;
 import io.trino.spi.connector.ConnectorBucketNodeMap;
@@ -23,8 +24,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.function.ToIntFunction;
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeRecordSet.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeRecordSet.java
index d6c024920189..dda3bf4bc9fd 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeRecordSet.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeRecordSet.java
@@ -14,13 +14,12 @@
 
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeSystemTable.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeSystemTable.java
index e6205ab8d356..a2bffa436b28 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeSystemTable.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeSystemTable.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.base.classloader;
 
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorSession;
@@ -22,7 +23,7 @@
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
+import java.util.Set;
 
 import static java.util.Objects.requireNonNull;
 
@@ -63,6 +64,14 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
         }
     }
 
+    @Override
+    public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, ConnectorSession session, TupleDomain<Integer> constraint, Set<Integer> requiredColumns)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.cursor(transactionHandle, session, constraint, requiredColumns);
+        }
+    }
+
     @Override
     public ConnectorPageSource pageSource(ConnectorTransactionHandle transactionHandle, ConnectorSession session, TupleDomain<Integer> constraint)
     {
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ForClassLoaderSafe.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ForClassLoaderSafe.java
index 321d8f524d0b..c165ee275bec 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ForClassLoaderSafe.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ForClassLoaderSafe.java
@@ -14,7 +14,7 @@
 
 package io.trino.plugin.base.classloader;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -26,7 +26,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForClassLoaderSafe
 {
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/io/ChunkedSliceOutput.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/io/ChunkedSliceOutput.java
new file mode 100644
index 000000000000..8e59bb252cbb
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/io/ChunkedSliceOutput.java
@@ -0,0 +1,445 @@
+/*
+ * Licensed 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 io.trino.plugin.base.io;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.slice.Slice;
+import io.airlift.slice.SliceOutput;
+import io.airlift.slice.Slices;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.airlift.slice.SizeOf.SIZE_OF_BYTE;
+import static io.airlift.slice.SizeOf.SIZE_OF_INT;
+import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
+import static io.airlift.slice.SizeOf.SIZE_OF_SHORT;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static java.lang.Math.min;
+import static java.lang.Math.multiplyExact;
+import static java.lang.Math.toIntExact;
+
+public final class ChunkedSliceOutput
+        extends SliceOutput
+{
+    private static final int INSTANCE_SIZE = instanceSize(ChunkedSliceOutput.class);
+    private static final int MINIMUM_CHUNK_SIZE = 4096;
+    private static final int MAXIMUM_CHUNK_SIZE = 16 * 1024 * 1024;
+    // This must not be larger than MINIMUM_CHUNK_SIZE/2
+    private static final int MAX_UNUSED_BUFFER_SIZE = 128;
+
+    private final ChunkSupplier chunkSupplier;
+
+    private Slice slice;
+    private byte[] buffer;
+
+    private final List<Slice> closedSlices = new ArrayList<>();
+    private long closedSlicesRetainedSize;
+
+    /**
+     * Offset of buffer within stream.
+     */
+    private long streamOffset;
+
+    /**
+     * Current position for writing in buffer.
+     */
+    private int bufferPosition;
+
+    public ChunkedSliceOutput(int minChunkSize, int maxChunkSize)
+    {
+        this.chunkSupplier = new ChunkSupplier(minChunkSize, maxChunkSize);
+
+        this.buffer = chunkSupplier.get();
+        this.slice = Slices.wrappedBuffer(buffer);
+    }
+
+    public List<Slice> getSlices()
+    {
+        return ImmutableList.<Slice>builder()
+                .addAll(closedSlices)
+                .add(slice.copy(0, bufferPosition))
+                .build();
+    }
+
+    @Override
+    public void reset()
+    {
+        chunkSupplier.reset();
+        closedSlices.clear();
+
+        buffer = chunkSupplier.get();
+        slice = Slices.wrappedBuffer(buffer);
+
+        closedSlicesRetainedSize = 0;
+        streamOffset = 0;
+        bufferPosition = 0;
+    }
+
+    @Override
+    public void reset(int position)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int size()
+    {
+        return toIntExact(streamOffset + bufferPosition);
+    }
+
+    @Override
+    public long getRetainedSize()
+    {
+        return slice.getRetainedSize() + closedSlicesRetainedSize + INSTANCE_SIZE;
+    }
+
+    @Override
+    public int writableBytes()
+    {
+        return Integer.MAX_VALUE;
+    }
+
+    @Override
+    public boolean isWritable()
+    {
+        return true;
+    }
+
+    @Override
+    public void writeByte(int value)
+    {
+        ensureWritableBytes(SIZE_OF_BYTE);
+        slice.setByte(bufferPosition, value);
+        bufferPosition += SIZE_OF_BYTE;
+    }
+
+    @Override
+    public void writeShort(int value)
+    {
+        ensureWritableBytes(SIZE_OF_SHORT);
+        slice.setShort(bufferPosition, value);
+        bufferPosition += SIZE_OF_SHORT;
+    }
+
+    @Override
+    public void writeInt(int value)
+    {
+        ensureWritableBytes(SIZE_OF_INT);
+        slice.setInt(bufferPosition, value);
+        bufferPosition += SIZE_OF_INT;
+    }
+
+    @Override
+    public void writeLong(long value)
+    {
+        ensureWritableBytes(SIZE_OF_LONG);
+        slice.setLong(bufferPosition, value);
+        bufferPosition += SIZE_OF_LONG;
+    }
+
+    @Override
+    public void writeFloat(float value)
+    {
+        writeInt(Float.floatToIntBits(value));
+    }
+
+    @Override
+    public void writeDouble(double value)
+    {
+        writeLong(Double.doubleToLongBits(value));
+    }
+
+    @Override
+    public void writeBytes(Slice source)
+    {
+        writeBytes(source, 0, source.length());
+    }
+
+    @Override
+    public void writeBytes(Slice source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int batch = tryEnsureBatchSize(length);
+            slice.setBytes(bufferPosition, source, sourceIndex, batch);
+            bufferPosition += batch;
+            sourceIndex += batch;
+            length -= batch;
+        }
+    }
+
+    @Override
+    public void writeBytes(byte[] source)
+    {
+        writeBytes(source, 0, source.length);
+    }
+
+    @Override
+    public void writeBytes(byte[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int batch = tryEnsureBatchSize(length);
+            slice.setBytes(bufferPosition, source, sourceIndex, batch);
+            bufferPosition += batch;
+            sourceIndex += batch;
+            length -= batch;
+        }
+    }
+
+    @Override
+    public void writeShorts(short[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = tryEnsureBatchSize(length * Short.BYTES) / Short.BYTES;
+            slice.setShorts(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Short.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeInts(int[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = tryEnsureBatchSize(length * Integer.BYTES) / Integer.BYTES;
+            slice.setInts(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Integer.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeLongs(long[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = tryEnsureBatchSize(length * Long.BYTES) / Long.BYTES;
+            slice.setLongs(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Long.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeFloats(float[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = tryEnsureBatchSize(length * Float.BYTES) / Float.BYTES;
+            slice.setFloats(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Float.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeDoubles(double[] source, int sourceIndex, int length)
+    {
+        while (length > 0) {
+            int flushLength = tryEnsureBatchSize(length * Double.BYTES) / Double.BYTES;
+            slice.setDoubles(bufferPosition, source, sourceIndex, flushLength);
+            bufferPosition += flushLength * Double.BYTES;
+            sourceIndex += flushLength;
+            length -= flushLength;
+        }
+    }
+
+    @Override
+    public void writeBytes(InputStream in, int length)
+            throws IOException
+    {
+        while (length > 0) {
+            int batch = tryEnsureBatchSize(length);
+            slice.setBytes(bufferPosition, in, batch);
+            bufferPosition += batch;
+            length -= batch;
+        }
+    }
+
+    @Override
+    public void writeZero(int length)
+    {
+        checkArgument(length >= 0, "length must be greater than or equal to 0");
+
+        while (length > 0) {
+            int batch = tryEnsureBatchSize(length);
+            Arrays.fill(buffer, bufferPosition, bufferPosition + batch, (byte) 0);
+            bufferPosition += batch;
+            length -= batch;
+        }
+    }
+
+    @Override
+    public SliceOutput appendLong(long value)
+    {
+        writeLong(value);
+        return this;
+    }
+
+    @Override
+    public SliceOutput appendDouble(double value)
+    {
+        writeDouble(value);
+        return this;
+    }
+
+    @Override
+    public SliceOutput appendInt(int value)
+    {
+        writeInt(value);
+        return this;
+    }
+
+    @Override
+    public SliceOutput appendShort(int value)
+    {
+        writeShort(value);
+        return this;
+    }
+
+    @Override
+    public SliceOutput appendByte(int value)
+    {
+        writeByte(value);
+        return this;
+    }
+
+    @Override
+    public SliceOutput appendBytes(byte[] source, int sourceIndex, int length)
+    {
+        writeBytes(source, sourceIndex, length);
+        return this;
+    }
+
+    @Override
+    public SliceOutput appendBytes(byte[] source)
+    {
+        writeBytes(source);
+        return this;
+    }
+
+    @Override
+    public SliceOutput appendBytes(Slice slice)
+    {
+        writeBytes(slice);
+        return this;
+    }
+
+    @Override
+    public Slice slice()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Slice getUnderlyingSlice()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public String toString(Charset charset)
+    {
+        return toString();
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder("OutputStreamSliceOutputAdapter{");
+        builder.append("position=").append(size());
+        builder.append("bufferSize=").append(slice.length());
+        builder.append('}');
+        return builder.toString();
+    }
+
+    private int tryEnsureBatchSize(int length)
+    {
+        ensureWritableBytes(min(MAX_UNUSED_BUFFER_SIZE, length));
+        return min(length, slice.length() - bufferPosition);
+    }
+
+    private void ensureWritableBytes(int minWritableBytes)
+    {
+        checkArgument(minWritableBytes <= MAX_UNUSED_BUFFER_SIZE);
+        if (bufferPosition + minWritableBytes > slice.length()) {
+            closeChunk();
+        }
+    }
+
+    private void closeChunk()
+    {
+        // add trimmed view of slice to closed slices
+        closedSlices.add(slice.slice(0, bufferPosition));
+        closedSlicesRetainedSize += slice.getRetainedSize();
+
+        // create a new buffer
+        // double size until we hit the max chunk size
+        buffer = chunkSupplier.get();
+        slice = Slices.wrappedBuffer(buffer);
+
+        streamOffset += bufferPosition;
+        bufferPosition = 0;
+    }
+
+    // Chunk supplier creates buffers by doubling the size from min to max chunk size.
+    // The supplier also tracks all created buffers and can be reset to the beginning,
+    // reusing the buffers.
+    private static class ChunkSupplier
+    {
+        private final int maxChunkSize;
+
+        private final List<byte[]> bufferPool = new ArrayList<>();
+        private int usedBuffers;
+        private int currentSize;
+
+        public ChunkSupplier(int minChunkSize, int maxChunkSize)
+        {
+            checkArgument(minChunkSize >= MINIMUM_CHUNK_SIZE, "minimum chunk size of " + MINIMUM_CHUNK_SIZE + " required");
+            checkArgument(maxChunkSize <= MAXIMUM_CHUNK_SIZE, "maximum chunk size of " + MAXIMUM_CHUNK_SIZE + " required");
+            checkArgument(minChunkSize <= maxChunkSize, "minimum chunk size must be less than maximum chunk size");
+
+            this.currentSize = minChunkSize;
+            this.maxChunkSize = maxChunkSize;
+        }
+
+        public void reset()
+        {
+            usedBuffers = 0;
+        }
+
+        public byte[] get()
+        {
+            byte[] buffer;
+            if (usedBuffers == bufferPool.size()) {
+                int newSize = min(multiplyExact(currentSize, 2), maxChunkSize);
+                buffer = new byte[newSize];
+                bufferPool.add(buffer);
+            }
+            else {
+                buffer = bufferPool.get(usedBuffers);
+            }
+            usedBuffers++;
+            currentSize = buffer.length;
+            return buffer;
+        }
+    }
+}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/jmx/RebindSafeMBeanServer.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/jmx/RebindSafeMBeanServer.java
index a3f095a74a1e..85e6f1f73a24 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/jmx/RebindSafeMBeanServer.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/jmx/RebindSafeMBeanServer.java
@@ -13,9 +13,9 @@
  */
 package io.trino.plugin.base.jmx;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.log.Logger;
 
-import javax.annotation.concurrent.ThreadSafe;
 import javax.management.Attribute;
 import javax.management.AttributeList;
 import javax.management.AttributeNotFoundException;
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ldap/JdkLdapClient.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ldap/JdkLdapClient.java
index ec10304a90c0..0431c6df8188 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ldap/JdkLdapClient.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ldap/JdkLdapClient.java
@@ -14,12 +14,12 @@
 package io.trino.plugin.base.ldap;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.plugin.base.ssl.SslUtils;
 import io.trino.spi.security.AccessDeniedException;
 
-import javax.inject.Inject;
 import javax.naming.AuthenticationException;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ldap/LdapClientConfig.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ldap/LdapClientConfig.java
index 9d1b51823b61..4f9c1e0d6324 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ldap/LdapClientConfig.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ldap/LdapClientConfig.java
@@ -19,10 +19,9 @@
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.configuration.validation.FileExists;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 import java.io.File;
 import java.util.Optional;
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/logging/FormatInterpolator.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/logging/FormatInterpolator.java
new file mode 100644
index 000000000000..71508b5c670c
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/logging/FormatInterpolator.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed 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 io.trino.plugin.base.logging;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.MatchResult;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.joining;
+
+public class FormatInterpolator<Context>
+{
+    private final String format;
+    private final List<InterpolatedValue<Context>> values;
+
+    public FormatInterpolator(String format, List<InterpolatedValue<Context>> values)
+    {
+        this.format = firstNonNull(format, "");
+        this.values = ImmutableList.copyOf(requireNonNull(values, "values is null"));
+    }
+
+    @SafeVarargs
+    public FormatInterpolator(String format, InterpolatedValue<Context>... values)
+    {
+        this(format, Arrays.stream(values).toList());
+    }
+
+    public String interpolate(Context context)
+    {
+        String result = format;
+        for (InterpolatedValue<Context> value : values) {
+            if (result.contains(value.getCode())) {
+                result = result.replaceAll(value.getMatchCase(), value.value(context));
+            }
+        }
+        return result;
+    }
+
+    public static boolean hasValidPlaceholders(String format, InterpolatedValue<?>... values)
+    {
+        return hasValidPlaceholders(format, Arrays.stream(values).toList());
+    }
+
+    public static boolean hasValidPlaceholders(String format, List<InterpolatedValue<?>> values)
+    {
+        List<String> matches = values.stream().map(InterpolatedValue::getMatchCase).toList();
+        Pattern pattern = Pattern.compile("[\\w ,_\\-=]|" + String.join("|", matches));
+
+        Matcher matcher = pattern.matcher(format);
+        return matcher.results()
+                .map(MatchResult::group)
+                .collect(joining())
+                .equals(format);
+    }
+
+    interface InterpolatedValue<Context>
+    {
+        String name();
+
+        default String getCode()
+        {
+            return "$" + this.name();
+        }
+
+        default String getMatchCase()
+        {
+            return "\\$" + this.name();
+        }
+
+        String value(Context context);
+    }
+}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/logging/SessionInterpolatedValues.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/logging/SessionInterpolatedValues.java
new file mode 100644
index 000000000000..5ac804179577
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/logging/SessionInterpolatedValues.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed 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 io.trino.plugin.base.logging;
+
+import io.trino.plugin.base.logging.FormatInterpolator.InterpolatedValue;
+import io.trino.spi.connector.ConnectorSession;
+
+import java.util.function.Function;
+
+public enum SessionInterpolatedValues
+        implements InterpolatedValue<ConnectorSession>
+{
+    QUERY_ID(ConnectorSession::getQueryId),
+    SOURCE(session -> session.getSource().orElse("")),
+    USER(ConnectorSession::getUser),
+    TRACE_TOKEN(session -> session.getTraceToken().orElse(""));
+
+    private final Function<ConnectorSession, String> valueProvider;
+
+    SessionInterpolatedValues(Function<ConnectorSession, String> valueProvider)
+    {
+        this.valueProvider = valueProvider;
+    }
+
+    @Override
+    public String value(ConnectorSession session)
+    {
+        return valueProvider.apply(session);
+    }
+}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/CachingIdentifierMapping.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/CachingIdentifierMapping.java
new file mode 100644
index 000000000000..a25fcf83784d
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/CachingIdentifierMapping.java
@@ -0,0 +1,202 @@
+/*
+ * Licensed 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 io.trino.plugin.base.mapping;
+
+import com.google.common.base.CharMatcher;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import io.trino.cache.NonKeyEvictableCache;
+import io.trino.plugin.base.mapping.IdentifierMappingModule.ForCachingIdentifierMapping;
+import io.trino.spi.TrinoException;
+import io.trino.spi.security.ConnectorIdentity;
+import jakarta.annotation.Nullable;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verify;
+import static io.trino.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
+import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+public final class CachingIdentifierMapping
+        implements IdentifierMapping
+{
+    private final NonKeyEvictableCache<ConnectorIdentity, Mapping> remoteSchemaNames;
+    private final NonKeyEvictableCache<RemoteTableNameCacheKey, Mapping> remoteTableNames;
+    private final IdentifierMapping identifierMapping;
+
+    @Inject
+    public CachingIdentifierMapping(
+            MappingConfig mappingConfig,
+            @ForCachingIdentifierMapping IdentifierMapping identifierMapping)
+    {
+        CacheBuilder<Object, Object> remoteNamesCacheBuilder = CacheBuilder.newBuilder()
+                .expireAfterWrite(mappingConfig.getCaseInsensitiveNameMatchingCacheTtl().toMillis(), MILLISECONDS);
+        this.remoteSchemaNames = buildNonEvictableCacheWithWeakInvalidateAll(remoteNamesCacheBuilder);
+        this.remoteTableNames = buildNonEvictableCacheWithWeakInvalidateAll(remoteNamesCacheBuilder);
+
+        this.identifierMapping = requireNonNull(identifierMapping, "identifierMapping is null");
+    }
+
+    public void flushCache()
+    {
+        // Note: this may not invalidate ongoing loads (https://github.com/trinodb/trino/issues/10512, https://github.com/google/guava/issues/1881)
+        // This is acceptable, since this operation is invoked manually, and not relied upon for correctness.
+        remoteSchemaNames.invalidateAll();
+        remoteTableNames.invalidateAll();
+    }
+
+    @Override
+    public String fromRemoteSchemaName(String remoteSchemaName)
+    {
+        return identifierMapping.fromRemoteSchemaName(remoteSchemaName);
+    }
+
+    @Override
+    public String fromRemoteTableName(String remoteSchemaName, String remoteTableName)
+    {
+        return identifierMapping.fromRemoteTableName(remoteSchemaName, remoteTableName);
+    }
+
+    @Override
+    public String fromRemoteColumnName(String remoteColumnName)
+    {
+        return identifierMapping.fromRemoteColumnName(remoteColumnName);
+    }
+
+    @Override
+    public String toRemoteSchemaName(RemoteIdentifiers remoteIdentifiers, ConnectorIdentity identity, String schemaName)
+    {
+        requireNonNull(schemaName, "schemaName is null");
+        verify(CharMatcher.forPredicate(Character::isUpperCase).matchesNoneOf(schemaName), "Expected schema name from internal metadata to be lowercase: %s", schemaName);
+        try {
+            Mapping mapping = remoteSchemaNames.getIfPresent(identity);
+            if (mapping != null && !mapping.hasRemoteObject(schemaName)) {
+                // This might be a schema that has just been created. Force reload.
+                mapping = null;
+            }
+            if (mapping == null) {
+                mapping = createSchemaMapping(remoteIdentifiers.getRemoteSchemas());
+                remoteSchemaNames.put(identity, mapping);
+            }
+            String remoteSchema = mapping.get(schemaName);
+            if (remoteSchema != null) {
+                return remoteSchema;
+            }
+        }
+        catch (RuntimeException e) {
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Failed to find remote schema name: " + firstNonNull(e.getMessage(), e), e);
+        }
+
+        return identifierMapping.toRemoteSchemaName(remoteIdentifiers, identity, schemaName);
+    }
+
+    @Override
+    public String toRemoteTableName(RemoteIdentifiers remoteIdentifiers, ConnectorIdentity identity, String remoteSchema, String tableName)
+    {
+        requireNonNull(remoteSchema, "remoteSchema is null");
+        requireNonNull(tableName, "tableName is null");
+        verify(CharMatcher.forPredicate(Character::isUpperCase).matchesNoneOf(tableName), "Expected table name from internal metadata to be lowercase: %s", tableName);
+        try {
+            RemoteTableNameCacheKey cacheKey = new RemoteTableNameCacheKey(identity, remoteSchema);
+            Mapping mapping = remoteTableNames.getIfPresent(cacheKey);
+            if (mapping != null && !mapping.hasRemoteObject(tableName)) {
+                // This might be a table that has just been created. Force reload.
+                mapping = null;
+            }
+            if (mapping == null) {
+                mapping = createTableMapping(remoteSchema, remoteIdentifiers.getRemoteTables(remoteSchema));
+                remoteTableNames.put(cacheKey, mapping);
+            }
+            String remoteTable = mapping.get(tableName);
+            if (remoteTable != null) {
+                return remoteTable;
+            }
+        }
+        catch (RuntimeException e) {
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Failed to find remote table name: " + firstNonNull(e.getMessage(), e), e);
+        }
+
+        return identifierMapping.toRemoteTableName(remoteIdentifiers, identity, remoteSchema, tableName);
+    }
+
+    @Override
+    public String toRemoteColumnName(RemoteIdentifiers remoteIdentifiers, String columnName)
+    {
+        return identifierMapping.toRemoteColumnName(remoteIdentifiers, columnName);
+    }
+
+    private Mapping createSchemaMapping(Collection<String> remoteSchemas)
+    {
+        return createMapping(remoteSchemas, identifierMapping::fromRemoteSchemaName);
+    }
+
+    private Mapping createTableMapping(String remoteSchema, Set<String> remoteTables)
+    {
+        return createMapping(
+                remoteTables,
+                remoteTableName -> identifierMapping.fromRemoteTableName(remoteSchema, remoteTableName));
+    }
+
+    private static Mapping createMapping(Collection<String> remoteNames, Function<String, String> mapping)
+    {
+        Map<String, String> map = new HashMap<>();
+        Set<String> duplicates = new HashSet<>();
+        for (String remoteName : remoteNames) {
+            String name = mapping.apply(remoteName);
+            if (duplicates.contains(name)) {
+                continue;
+            }
+            if (map.put(name, remoteName) != null) {
+                duplicates.add(name);
+                map.remove(name);
+            }
+        }
+        return new Mapping(map, duplicates);
+    }
+
+    private static final class Mapping
+    {
+        private final Map<String, String> mapping;
+        private final Set<String> duplicates;
+
+        public Mapping(Map<String, String> mapping, Set<String> duplicates)
+        {
+            this.mapping = ImmutableMap.copyOf(requireNonNull(mapping, "mapping is null"));
+            this.duplicates = ImmutableSet.copyOf(requireNonNull(duplicates, "duplicates is null"));
+        }
+
+        public boolean hasRemoteObject(String remoteName)
+        {
+            return mapping.containsKey(remoteName) || duplicates.contains(remoteName);
+        }
+
+        @Nullable
+        public String get(String remoteName)
+        {
+            checkArgument(!duplicates.contains(remoteName), "Ambiguous name: %s", remoteName);
+            return mapping.get(remoteName);
+        }
+    }
+}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/DefaultIdentifierMapping.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/DefaultIdentifierMapping.java
new file mode 100644
index 000000000000..57d6345d8959
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/DefaultIdentifierMapping.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed 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 io.trino.plugin.base.mapping;
+
+import io.trino.spi.security.ConnectorIdentity;
+
+import static java.util.Locale.ENGLISH;
+
+public class DefaultIdentifierMapping
+        implements IdentifierMapping
+{
+    @Override
+    public String fromRemoteSchemaName(String remoteSchemaName)
+    {
+        return remoteSchemaName.toLowerCase(ENGLISH);
+    }
+
+    @Override
+    public String fromRemoteTableName(String remoteSchemaName, String remoteTableName)
+    {
+        return remoteTableName.toLowerCase(ENGLISH);
+    }
+
+    @Override
+    public String fromRemoteColumnName(String remoteColumnName)
+    {
+        return remoteColumnName.toLowerCase(ENGLISH);
+    }
+
+    @Override
+    public String toRemoteSchemaName(RemoteIdentifiers remoteIdentifiers, ConnectorIdentity identity, String schemaName)
+    {
+        return toRemoteIdentifier(schemaName, remoteIdentifiers);
+    }
+
+    @Override
+    public String toRemoteTableName(RemoteIdentifiers remoteIdentifiers, ConnectorIdentity identity, String remoteSchema, String tableName)
+    {
+        return toRemoteIdentifier(tableName, remoteIdentifiers);
+    }
+
+    @Override
+    public String toRemoteColumnName(RemoteIdentifiers remoteIdentifiers, String columnName)
+    {
+        return toRemoteIdentifier(columnName, remoteIdentifiers);
+    }
+
+    private String toRemoteIdentifier(String identifier, RemoteIdentifiers remoteIdentifiers)
+    {
+        if (remoteIdentifiers.storesUpperCaseIdentifiers()) {
+            return identifier.toUpperCase(ENGLISH);
+        }
+        return identifier;
+    }
+}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/ForwardingIdentifierMapping.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/ForwardingIdentifierMapping.java
new file mode 100644
index 000000000000..a32c69dc1f7a
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/ForwardingIdentifierMapping.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed 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 io.trino.plugin.base.mapping;
+
+import io.trino.spi.security.ConnectorIdentity;
+
+import java.util.function.Supplier;
+
+import static java.util.Objects.requireNonNull;
+
+public abstract class ForwardingIdentifierMapping
+        implements IdentifierMapping
+{
+    public static IdentifierMapping of(Supplier<IdentifierMapping> delegateSupplier)
+    {
+        requireNonNull(delegateSupplier, "delegateSupplier is null");
+        return new ForwardingIdentifierMapping()
+        {
+            @Override
+            protected IdentifierMapping delegate()
+            {
+                return delegateSupplier.get();
+            }
+        };
+    }
+
+    protected abstract IdentifierMapping delegate();
+
+    @Override
+    public String fromRemoteSchemaName(String remoteSchemaName)
+    {
+        return delegate().fromRemoteSchemaName(remoteSchemaName);
+    }
+
+    @Override
+    public String fromRemoteTableName(String remoteSchemaName, String remoteTableName)
+    {
+        return delegate().fromRemoteTableName(remoteSchemaName, remoteTableName);
+    }
+
+    @Override
+    public String fromRemoteColumnName(String remoteColumnName)
+    {
+        return delegate().fromRemoteColumnName(remoteColumnName);
+    }
+
+    @Override
+    public String toRemoteSchemaName(RemoteIdentifiers remoteIdentifiers, ConnectorIdentity identity, String schemaName)
+    {
+        return delegate().toRemoteSchemaName(remoteIdentifiers, identity, schemaName);
+    }
+
+    @Override
+    public String toRemoteTableName(RemoteIdentifiers remoteIdentifiers, ConnectorIdentity identity, String remoteSchema, String tableName)
+    {
+        return delegate().toRemoteTableName(remoteIdentifiers, identity, remoteSchema, tableName);
+    }
+
+    @Override
+    public String toRemoteColumnName(RemoteIdentifiers remoteIdentifiers, String columnName)
+    {
+        return delegate().toRemoteColumnName(remoteIdentifiers, columnName);
+    }
+}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/IdentifierMapping.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/IdentifierMapping.java
new file mode 100644
index 000000000000..7a16b7d11f1b
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/IdentifierMapping.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.plugin.base.mapping;
+
+import io.trino.spi.security.ConnectorIdentity;
+
+public interface IdentifierMapping
+{
+    String fromRemoteSchemaName(String remoteSchemaName);
+
+    String fromRemoteTableName(String remoteSchemaName, String remoteTableName);
+
+    String fromRemoteColumnName(String remoteColumnName);
+
+    String toRemoteSchemaName(RemoteIdentifiers remoteIdentifiers, ConnectorIdentity identity, String schemaName);
+
+    String toRemoteTableName(RemoteIdentifiers remoteIdentifiers, ConnectorIdentity identity, String remoteSchema, String tableName);
+
+    String toRemoteColumnName(RemoteIdentifiers remoteIdentifiers, String columnName);
+}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/IdentifierMappingModule.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/IdentifierMappingModule.java
similarity index 91%
rename from plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/IdentifierMappingModule.java
rename to lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/IdentifierMappingModule.java
index 682c668a3565..0d0f34a57b44 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/IdentifierMappingModule.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/IdentifierMappingModule.java
@@ -11,22 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.jdbc.mapping;
+package io.trino.plugin.base.mapping;
 
 import com.google.inject.Binder;
+import com.google.inject.BindingAnnotation;
 import com.google.inject.Key;
-import com.google.inject.Provider;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.plugin.base.CatalogName;
-import io.trino.plugin.jdbc.BaseJdbcClient;
-import io.trino.plugin.jdbc.ForBaseJdbc;
-import io.trino.plugin.jdbc.JdbcClient;
-
-import javax.inject.Qualifier;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -62,8 +57,6 @@ protected void setup(Binder binder)
         // As it's required for cache flush procedure we provide Optional binding by default.
         newOptionalBinder(binder, CachingIdentifierMapping.class);
         if (config.isCaseInsensitiveNameMatching()) {
-            Provider<JdbcClient> baseJdbcClientProvider = binder.getProvider(Key.get(JdbcClient.class, ForBaseJdbc.class));
-            binder.bind(BaseJdbcClient.class).toProvider(() -> (BaseJdbcClient) baseJdbcClientProvider.get());
             binder.bind(IdentifierMapping.class)
                     .annotatedWith(ForCachingIdentifierMapping.class)
                     .to(DefaultIdentifierMapping.class)
@@ -127,11 +120,11 @@ private static IdentifierMappingRules createRules(String configFile)
 
     @Retention(RUNTIME)
     @Target({FIELD, PARAMETER, METHOD})
-    @Qualifier
+    @BindingAnnotation
     public @interface ForCachingIdentifierMapping {}
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD})
-    @Qualifier
+    @BindingAnnotation
     public @interface ForRuleBasedIdentifierMapping {}
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/IdentifierMappingRules.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/IdentifierMappingRules.java
similarity index 98%
rename from plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/IdentifierMappingRules.java
rename to lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/IdentifierMappingRules.java
index 1b8500b1c702..3348dc8fcfd5 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/IdentifierMappingRules.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/IdentifierMappingRules.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.jdbc.mapping;
+package io.trino.plugin.base.mapping;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/MappingConfig.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/MappingConfig.java
similarity index 97%
rename from plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/MappingConfig.java
rename to lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/MappingConfig.java
index 4264b564c755..b5fcd825d3eb 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/MappingConfig.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/MappingConfig.java
@@ -11,14 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.jdbc.mapping;
+package io.trino.plugin.base.mapping;
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.validation.FileExists;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/RemoteIdentifiers.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/RemoteIdentifiers.java
new file mode 100644
index 000000000000..9e76a47e53d3
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/RemoteIdentifiers.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.base.mapping;
+
+import java.util.Set;
+
+public interface RemoteIdentifiers
+{
+    Set<String> getRemoteSchemas();
+
+    Set<String> getRemoteTables(String remoteSchema);
+
+    boolean storesUpperCaseIdentifiers();
+}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/RemoteTableNameCacheKey.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/RemoteTableNameCacheKey.java
similarity index 98%
rename from plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/RemoteTableNameCacheKey.java
rename to lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/RemoteTableNameCacheKey.java
index e281b9de024a..6e4589d867e3 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/RemoteTableNameCacheKey.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/RemoteTableNameCacheKey.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.jdbc.mapping;
+package io.trino.plugin.base.mapping;
 
 import io.trino.spi.security.ConnectorIdentity;
 
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/RuleBasedIdentifierMapping.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/RuleBasedIdentifierMapping.java
similarity index 84%
rename from plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/RuleBasedIdentifierMapping.java
rename to lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/RuleBasedIdentifierMapping.java
index 3cc8133bab9b..1167527d3136 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/RuleBasedIdentifierMapping.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/RuleBasedIdentifierMapping.java
@@ -11,12 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.jdbc.mapping;
+package io.trino.plugin.base.mapping;
 
 import com.google.common.collect.Table;
 import io.trino.spi.security.ConnectorIdentity;
 
-import java.sql.Connection;
 import java.util.Map;
 
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
@@ -83,28 +82,28 @@ public String fromRemoteColumnName(String remoteColumnName)
     }
 
     @Override
-    public String toRemoteSchemaName(ConnectorIdentity identity, Connection connection, String schemaName)
+    public String toRemoteSchemaName(RemoteIdentifiers remoteIdentifiers, ConnectorIdentity identity, String schemaName)
     {
         String remoteSchemaName = toRemoteSchema.get(schemaName);
         if (remoteSchemaName == null) {
-            remoteSchemaName = delegate.toRemoteSchemaName(identity, connection, schemaName);
+            remoteSchemaName = delegate.toRemoteSchemaName(remoteIdentifiers, identity, schemaName);
         }
         return remoteSchemaName;
     }
 
     @Override
-    public String toRemoteTableName(ConnectorIdentity identity, Connection connection, String remoteSchema, String tableName)
+    public String toRemoteTableName(RemoteIdentifiers remoteIdentifiers, ConnectorIdentity identity, String remoteSchema, String tableName)
     {
         String remoteTableName = toRemoteTable.get(remoteSchema, tableName);
         if (remoteTableName == null) {
-            remoteTableName = delegate.toRemoteTableName(identity, connection, remoteSchema, tableName);
+            remoteTableName = delegate.toRemoteTableName(remoteIdentifiers, identity, remoteSchema, tableName);
         }
         return remoteTableName;
     }
 
     @Override
-    public String toRemoteColumnName(Connection connection, String columnName)
+    public String toRemoteColumnName(RemoteIdentifiers remoteIdentifiers, String columnName)
     {
-        return delegate.toRemoteColumnName(connection, columnName);
+        return delegate.toRemoteColumnName(remoteIdentifiers, columnName);
     }
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/SchemaMappingRule.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/SchemaMappingRule.java
similarity index 98%
rename from plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/SchemaMappingRule.java
rename to lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/SchemaMappingRule.java
index df7158bb7f6f..289bd9ae20d9 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/SchemaMappingRule.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/SchemaMappingRule.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.jdbc.mapping;
+package io.trino.plugin.base.mapping;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/TableMappingRule.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/TableMappingRule.java
similarity index 98%
rename from plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/TableMappingRule.java
rename to lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/TableMappingRule.java
index ad4290819ce5..f48ee4a74ec5 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/TableMappingRule.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/mapping/TableMappingRule.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.jdbc.mapping;
+package io.trino.plugin.base.mapping;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/metrics/TDigestHistogram.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/metrics/TDigestHistogram.java
index f4130cae61a7..a7b2be702930 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/metrics/TDigestHistogram.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/metrics/TDigestHistogram.java
@@ -26,6 +26,7 @@
 import java.util.Base64;
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
 
 import static com.google.common.base.MoreObjects.ToStringHelper;
 import static com.google.common.base.MoreObjects.toStringHelper;
@@ -175,7 +176,7 @@ public synchronized double getPercentile(double percentile)
     public String toString()
     {
         ToStringHelper helper = toStringHelper("")
-                .add("count", formatDouble(digest.getCount()))
+                .add("count", getTotal())
                 .add("p01", formatDouble(getP01()))
                 .add("p05", formatDouble(getP05()))
                 .add("p10", formatDouble(getP10()))
@@ -190,6 +191,15 @@ public String toString()
         return helper.toString();
     }
 
+    public static Optional<TDigestHistogram> merge(List<TDigestHistogram> histograms)
+    {
+        if (histograms.isEmpty()) {
+            return Optional.empty();
+        }
+
+        return Optional.of(histograms.get(0).mergeWith(histograms.subList(1, histograms.size())));
+    }
+
     private static String formatDouble(double value)
     {
         return format(Locale.US, "%.2f", value);
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/projection/ApplyProjectionUtil.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/projection/ApplyProjectionUtil.java
new file mode 100644
index 000000000000..e44281e7320e
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/projection/ApplyProjectionUtil.java
@@ -0,0 +1,172 @@
+/*
+ * Licensed 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 io.trino.plugin.base.projection;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
+import io.trino.spi.expression.Call;
+import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Constant;
+import io.trino.spi.expression.FieldDereference;
+import io.trino.spi.expression.Variable;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Predicate;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static java.util.Objects.requireNonNull;
+
+public final class ApplyProjectionUtil
+{
+    private ApplyProjectionUtil() {}
+
+    public static List<ConnectorExpression> extractSupportedProjectedColumns(ConnectorExpression expression)
+    {
+        return extractSupportedProjectedColumns(expression, connectorExpression -> true);
+    }
+
+    public static List<ConnectorExpression> extractSupportedProjectedColumns(ConnectorExpression expression, Predicate<ConnectorExpression> expressionPredicate)
+    {
+        requireNonNull(expression, "expression is null");
+        ImmutableList.Builder<ConnectorExpression> supportedSubExpressions = ImmutableList.builder();
+        fillSupportedProjectedColumns(expression, supportedSubExpressions, expressionPredicate);
+        return supportedSubExpressions.build();
+    }
+
+    private static void fillSupportedProjectedColumns(ConnectorExpression expression, ImmutableList.Builder<ConnectorExpression> supportedSubExpressions, Predicate<ConnectorExpression> expressionPredicate)
+    {
+        if (isPushdownSupported(expression, expressionPredicate)) {
+            supportedSubExpressions.add(expression);
+            return;
+        }
+
+        // If the whole expression is not supported, look for a partially supported projection
+        for (ConnectorExpression child : expression.getChildren()) {
+            fillSupportedProjectedColumns(child, supportedSubExpressions, expressionPredicate);
+        }
+    }
+
+    @VisibleForTesting
+    static boolean isPushdownSupported(ConnectorExpression expression, Predicate<ConnectorExpression> expressionPredicate)
+    {
+        return expressionPredicate.test(expression)
+                && (expression instanceof Variable ||
+                    (expression instanceof FieldDereference fieldDereference
+                            && isPushdownSupported(fieldDereference.getTarget(), expressionPredicate)));
+    }
+
+    public static ProjectedColumnRepresentation createProjectedColumnRepresentation(ConnectorExpression expression)
+    {
+        ImmutableList.Builder<Integer> ordinals = ImmutableList.builder();
+
+        Variable target;
+        while (true) {
+            if (expression instanceof Variable variable) {
+                target = variable;
+                break;
+            }
+            if (expression instanceof FieldDereference dereference) {
+                ordinals.add(dereference.getField());
+                expression = dereference.getTarget();
+            }
+            else {
+                throw new IllegalArgumentException("expression is not a valid dereference chain");
+            }
+        }
+
+        return new ProjectedColumnRepresentation(target, ordinals.build().reverse());
+    }
+
+    /**
+     * Replace all connector expressions with variables as given by {@param expressionToVariableMappings} in a top down manner.
+     * i.e. if the replacement occurs for the parent, the children will not be visited.
+     */
+    public static ConnectorExpression replaceWithNewVariables(ConnectorExpression expression, Map<ConnectorExpression, Variable> expressionToVariableMappings)
+    {
+        if (expressionToVariableMappings.containsKey(expression)) {
+            return expressionToVariableMappings.get(expression);
+        }
+
+        if (expression instanceof Constant || expression instanceof Variable) {
+            return expression;
+        }
+
+        if (expression instanceof FieldDereference fieldDereference) {
+            ConnectorExpression newTarget = replaceWithNewVariables(fieldDereference.getTarget(), expressionToVariableMappings);
+            return new FieldDereference(expression.getType(), newTarget, fieldDereference.getField());
+        }
+
+        if (expression instanceof Call call) {
+            return new Call(
+                    call.getType(),
+                    call.getFunctionName(),
+                    call.getArguments().stream()
+                            .map(argument -> replaceWithNewVariables(argument, expressionToVariableMappings))
+                            .collect(toImmutableList()));
+        }
+
+        // We cannot skip processing for unsupported expression shapes. This may lead to variables being left in ProjectionApplicationResult
+        // which are no longer bound.
+        throw new UnsupportedOperationException("Unsupported expression: " + expression);
+    }
+
+    public static class ProjectedColumnRepresentation
+    {
+        private final Variable variable;
+        private final List<Integer> dereferenceIndices;
+
+        public ProjectedColumnRepresentation(Variable variable, List<Integer> dereferenceIndices)
+        {
+            this.variable = requireNonNull(variable, "variable is null");
+            this.dereferenceIndices = ImmutableList.copyOf(requireNonNull(dereferenceIndices, "dereferenceIndices is null"));
+        }
+
+        public Variable getVariable()
+        {
+            return variable;
+        }
+
+        public List<Integer> getDereferenceIndices()
+        {
+            return dereferenceIndices;
+        }
+
+        public boolean isVariable()
+        {
+            return dereferenceIndices.isEmpty();
+        }
+
+        @Override
+        public boolean equals(Object obj)
+        {
+            if (this == obj) {
+                return true;
+            }
+            if ((obj == null) || (getClass() != obj.getClass())) {
+                return false;
+            }
+            ProjectedColumnRepresentation that = (ProjectedColumnRepresentation) obj;
+            return Objects.equals(variable, that.variable) &&
+                    Objects.equals(dereferenceIndices, that.dereferenceIndices);
+        }
+
+        @Override
+        public int hashCode()
+        {
+            return Objects.hash(variable, dereferenceIndices);
+        }
+    }
+}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AccessControlRules.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AccessControlRules.java
index 3a5962872660..5661976085f3 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AccessControlRules.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AccessControlRules.java
@@ -27,18 +27,26 @@ public class AccessControlRules
     private final List<TableAccessControlRule> tableRules;
     private final List<SessionPropertyAccessControlRule> sessionPropertyRules;
     private final List<FunctionAccessControlRule> functionRules;
+    private final List<ProcedureAccessControlRule> procedureRules;
+    private final List<AuthorizationRule> authorizationRules;
 
     @JsonCreator
     public AccessControlRules(
             @JsonProperty("schemas") Optional<List<SchemaAccessControlRule>> schemaRules,
             @JsonProperty("tables") Optional<List<TableAccessControlRule>> tableRules,
             @JsonProperty("session_properties") @JsonAlias("sessionProperties") Optional<List<SessionPropertyAccessControlRule>> sessionPropertyRules,
-            @JsonProperty("functions") Optional<List<FunctionAccessControlRule>> functionRules)
+            @JsonProperty("functions") Optional<List<FunctionAccessControlRule>> functionRules,
+            @JsonProperty("procedures") Optional<List<ProcedureAccessControlRule>> procedureRules,
+            @JsonProperty("authorization") Optional<List<AuthorizationRule>> authorizationRules)
     {
         this.schemaRules = schemaRules.orElse(ImmutableList.of(SchemaAccessControlRule.ALLOW_ALL));
         this.tableRules = tableRules.orElse(ImmutableList.of(TableAccessControlRule.ALLOW_ALL));
         this.sessionPropertyRules = sessionPropertyRules.orElse(ImmutableList.of(SessionPropertyAccessControlRule.ALLOW_ALL));
-        this.functionRules = functionRules.orElse(ImmutableList.of(FunctionAccessControlRule.ALLOW_ALL));
+        // functions are not allowed by default
+        this.functionRules = functionRules.orElse(ImmutableList.of());
+        // procedures are not allowed by default
+        this.procedureRules = procedureRules.orElse(ImmutableList.of());
+        this.authorizationRules = authorizationRules.orElse(ImmutableList.of());
     }
 
     public List<SchemaAccessControlRule> getSchemaRules()
@@ -61,11 +69,24 @@ public List<FunctionAccessControlRule> getFunctionRules()
         return functionRules;
     }
 
+    public List<ProcedureAccessControlRule> getProcedureRules()
+    {
+        return procedureRules;
+    }
+
+    public List<AuthorizationRule> getAuthorizationRules()
+    {
+        return authorizationRules;
+    }
+
     public boolean hasRoleRules()
     {
         return schemaRules.stream().anyMatch(rule -> rule.getRoleRegex().isPresent()) ||
                 tableRules.stream().anyMatch(rule -> rule.getRoleRegex().isPresent()) ||
                 sessionPropertyRules.stream().anyMatch(rule -> rule.getRoleRegex().isPresent()) ||
-                functionRules.stream().anyMatch(rule -> rule.getRoleRegex().isPresent());
+                functionRules.stream().anyMatch(rule -> rule.getRoleRegex().isPresent()) ||
+                procedureRules.stream().anyMatch(rule -> rule.getRoleRegex().isPresent()) ||
+                authorizationRules.stream().anyMatch(rule -> rule.getOriginalRolePattern().isPresent()) ||
+                authorizationRules.stream().anyMatch(rule -> rule.getNewRolePattern().isPresent());
     }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AllowAllAccessControl.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AllowAllAccessControl.java
index 00b8d4ed792e..2da20cc186e1 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AllowAllAccessControl.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AllowAllAccessControl.java
@@ -18,7 +18,7 @@
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.SchemaRoutineName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.security.ViewExpression;
@@ -130,6 +130,12 @@ public Set<String> filterColumns(ConnectorSecurityContext context, SchemaTableNa
         return columns;
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(ConnectorSecurityContext context, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        return tableColumns;
+    }
+
     @Override
     public void checkCanAddColumn(ConnectorSecurityContext context, SchemaTableName tableName)
     {
@@ -225,11 +231,6 @@ public void checkCanRenameMaterializedView(ConnectorSecurityContext context, Sch
     {
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-    }
-
     @Override
     public void checkCanSetMaterializedViewProperties(ConnectorSecurityContext context, SchemaTableName materializedViewName, Map<String, Optional<Object>> properties)
     {
@@ -303,11 +304,6 @@ public void checkCanSetRole(ConnectorSecurityContext context, String role)
     {
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(ConnectorSecurityContext context)
-    {
-    }
-
     @Override
     public void checkCanShowRoles(ConnectorSecurityContext context)
     {
@@ -334,25 +330,47 @@ public void checkCanExecuteTableProcedure(ConnectorSecurityContext context, Sche
     }
 
     @Override
-    public void checkCanExecuteFunction(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName function)
+    public boolean canExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
     {
+        return true;
     }
 
     @Override
-    public List<ViewExpression> getRowFilters(ConnectorSecurityContext context, SchemaTableName tableName)
+    public boolean canCreateViewWithExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
     {
-        return ImmutableList.of();
+        return true;
     }
 
     @Override
-    public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    public void checkCanShowFunctions(ConnectorSecurityContext context, String schemaName)
     {
-        return Optional.empty();
     }
 
     @Override
-    public List<ViewExpression> getColumnMasks(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    public Set<SchemaFunctionName> filterFunctions(ConnectorSecurityContext context, Set<SchemaFunctionName> functionNames)
+    {
+        return functionNames;
+    }
+
+    @Override
+    public void checkCanCreateFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+    }
+
+    @Override
+    public void checkCanDropFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+    }
+
+    @Override
+    public List<ViewExpression> getRowFilters(ConnectorSecurityContext context, SchemaTableName tableName)
     {
         return ImmutableList.of();
     }
+
+    @Override
+    public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    {
+        return Optional.empty();
+    }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AllowAllSystemAccessControl.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AllowAllSystemAccessControl.java
index 8f2bf40dd799..451d6b6dd1ea 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AllowAllSystemAccessControl.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AllowAllSystemAccessControl.java
@@ -19,7 +19,7 @@
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.eventlistener.EventListener;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.SystemAccessControl;
@@ -64,7 +64,7 @@ public SystemAccessControl create(Map<String, String> config)
     }
 
     @Override
-    public void checkCanImpersonateUser(SystemSecurityContext context, String userName)
+    public void checkCanImpersonateUser(Identity identity, String userName)
     {
     }
 
@@ -74,60 +74,45 @@ public void checkCanSetUser(Optional<Principal> principal, String userName)
     }
 
     @Override
-    public void checkCanReadSystemInformation(SystemSecurityContext context)
+    public void checkCanReadSystemInformation(Identity identity)
     {
     }
 
     @Override
-    public void checkCanWriteSystemInformation(SystemSecurityContext context)
+    public void checkCanWriteSystemInformation(Identity identity)
     {
     }
 
     @Override
-    public void checkCanExecuteQuery(SystemSecurityContext context)
+    public void checkCanExecuteQuery(Identity identity)
     {
     }
 
     @Override
-    public void checkCanViewQueryOwnedBy(SystemSecurityContext context, Identity queryOwner)
+    public void checkCanViewQueryOwnedBy(Identity identity, Identity queryOwner)
     {
     }
 
     @Override
-    public void checkCanViewQueryOwnedBy(SystemSecurityContext context, String queryOwner)
+    public void checkCanKillQueryOwnedBy(Identity identity, Identity queryOwner)
     {
     }
 
     @Override
-    public void checkCanKillQueryOwnedBy(SystemSecurityContext context, Identity queryOwner)
-    {
-    }
-
-    @Override
-    public void checkCanKillQueryOwnedBy(SystemSecurityContext context, String queryOwner)
-    {
-    }
-
-    @Override
-    public Collection<Identity> filterViewQueryOwnedBy(SystemSecurityContext context, Collection<Identity> queryOwners)
-    {
-        return queryOwners;
-    }
-
-    @Override
-    public Set<String> filterViewQueryOwnedBy(SystemSecurityContext context, Set<String> queryOwners)
+    public Collection<Identity> filterViewQueryOwnedBy(Identity identity, Collection<Identity> queryOwners)
     {
         return queryOwners;
     }
 
     @Override
-    public void checkCanSetSystemSessionProperty(SystemSecurityContext context, String propertyName)
+    public void checkCanSetSystemSessionProperty(Identity identity, String propertyName)
     {
     }
 
     @Override
-    public void checkCanAccessCatalog(SystemSecurityContext context, String catalogName)
+    public boolean canAccessCatalog(SystemSecurityContext context, String catalogName)
     {
+        return true;
     }
 
     @Override
@@ -244,6 +229,12 @@ public Set<String> filterColumns(SystemSecurityContext context, CatalogSchemaTab
         return columns;
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(SystemSecurityContext context, String catalogName, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        return tableColumns;
+    }
+
     @Override
     public void checkCanAddColumn(SystemSecurityContext context, CatalogSchemaTableName table)
     {
@@ -344,16 +335,6 @@ public void checkCanSetMaterializedViewProperties(SystemSecurityContext context,
     {
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SystemSecurityContext context, String functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-    }
-
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SystemSecurityContext context, FunctionKind functionKind, CatalogSchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-    }
-
     @Override
     public void checkCanSetCatalogSessionProperty(SystemSecurityContext context, String catalogName, String propertyName)
     {
@@ -424,11 +405,6 @@ public void checkCanRevokeRoles(
     {
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(SystemSecurityContext context)
-    {
-    }
-
     @Override
     public void checkCanShowCurrentRoles(SystemSecurityContext context)
     {
@@ -445,13 +421,15 @@ public void checkCanExecuteProcedure(SystemSecurityContext systemSecurityContext
     }
 
     @Override
-    public void checkCanExecuteFunction(SystemSecurityContext systemSecurityContext, String functionName)
+    public boolean canExecuteFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
     {
+        return true;
     }
 
     @Override
-    public void checkCanExecuteFunction(SystemSecurityContext systemSecurityContext, FunctionKind functionKind, CatalogSchemaRoutineName functionName)
+    public boolean canCreateViewWithExecuteFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
     {
+        return true;
     }
 
     @Override
@@ -459,6 +437,27 @@ public void checkCanExecuteTableProcedure(SystemSecurityContext systemSecurityCo
     {
     }
 
+    @Override
+    public void checkCanShowFunctions(SystemSecurityContext context, CatalogSchemaName schema)
+    {
+    }
+
+    @Override
+    public Set<SchemaFunctionName> filterFunctions(SystemSecurityContext context, String catalogName, Set<SchemaFunctionName> functionNames)
+    {
+        return functionNames;
+    }
+
+    @Override
+    public void checkCanCreateFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
+    {
+    }
+
+    @Override
+    public void checkCanDropFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
+    {
+    }
+
     @Override
     public Iterable<EventListener> getEventListeners()
     {
@@ -476,10 +475,4 @@ public Optional<ViewExpression> getColumnMask(SystemSecurityContext context, Cat
     {
         return Optional.empty();
     }
-
-    @Override
-    public List<ViewExpression> getColumnMasks(SystemSecurityContext context, CatalogSchemaTableName tableName, String columnName, Type type)
-    {
-        return emptyList();
-    }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AuthorizationRule.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AuthorizationRule.java
new file mode 100644
index 000000000000..d716649260a4
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AuthorizationRule.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed 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 io.trino.plugin.base.security;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.trino.spi.security.TrinoPrincipal;
+
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.lang.Boolean.TRUE;
+import static java.util.Objects.requireNonNull;
+
+public class AuthorizationRule
+{
+    private final Optional<Pattern> originalUserPattern;
+    private final Optional<Pattern> originalGroupPattern;
+    private final Optional<Pattern> originalRolePattern;
+    private final Optional<Pattern> newUserPattern;
+    private final Optional<Pattern> newRolePattern;
+    private final boolean allow;
+
+    @JsonCreator
+    public AuthorizationRule(
+            @JsonProperty("original_user") @JsonAlias("originalUser") Optional<Pattern> originalUserPattern,
+            @JsonProperty("original_group") @JsonAlias("originalGroup") Optional<Pattern> originalGroupPattern,
+            @JsonProperty("original_role") @JsonAlias("originalRole") Optional<Pattern> originalRolePattern,
+            @JsonProperty("new_user") @JsonAlias("newUser") Optional<Pattern> newUserPattern,
+            @JsonProperty("new_role") @JsonAlias("newRole") Optional<Pattern> newRolePattern,
+            @JsonProperty("allow") Boolean allow)
+    {
+        checkArgument(newUserPattern.isPresent() || newRolePattern.isPresent(), "At least one of new_use or new_role is required, none were provided");
+        this.originalUserPattern = requireNonNull(originalUserPattern, "originalUserPattern is null");
+        this.originalGroupPattern = requireNonNull(originalGroupPattern, "originalGroupPattern is null");
+        this.originalRolePattern = requireNonNull(originalRolePattern, "originalRolePattern is null");
+        this.newUserPattern = requireNonNull(newUserPattern, "newUserPattern is null");
+        this.newRolePattern = requireNonNull(newRolePattern, "newRolePattern is null");
+        this.allow = firstNonNull(allow, TRUE);
+    }
+
+    public Optional<Boolean> match(String user, Set<String> groups, Set<String> roles, TrinoPrincipal newPrincipal)
+    {
+        if (originalUserPattern.map(regex -> regex.matcher(user).matches()).orElse(true) &&
+                (originalGroupPattern.isEmpty() || groups.stream().anyMatch(group -> originalGroupPattern.get().matcher(group).matches())) &&
+                (originalRolePattern.isEmpty() || roles.stream().anyMatch(role -> originalRolePattern.get().matcher(role).matches())) &&
+                matches(newPrincipal)) {
+            return Optional.of(allow);
+        }
+        return Optional.empty();
+    }
+
+    private boolean matches(TrinoPrincipal newPrincipal)
+    {
+        return switch (newPrincipal.getType()) {
+            case USER -> newUserPattern.map(regex -> regex.matcher(newPrincipal.getName()).matches()).orElse(false);
+            case ROLE -> newRolePattern.map(regex -> regex.matcher(newPrincipal.getName()).matches()).orElse(false);
+        };
+    }
+
+    public Optional<Pattern> getOriginalRolePattern()
+    {
+        return originalRolePattern;
+    }
+
+    public Optional<Pattern> getNewRolePattern()
+    {
+        return newRolePattern;
+    }
+}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/CatalogFunctionAccessControlRule.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/CatalogFunctionAccessControlRule.java
index dfd250b88e51..380331b93ebb 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/CatalogFunctionAccessControlRule.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/CatalogFunctionAccessControlRule.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableSet;
 import io.trino.plugin.base.security.FunctionAccessControlRule.FunctionPrivilege;
 import io.trino.spi.connector.CatalogSchemaRoutineName;
 import io.trino.spi.function.FunctionKind;
@@ -24,15 +25,21 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import static com.google.common.base.Preconditions.checkState;
-import static io.trino.spi.function.FunctionKind.TABLE;
+import static io.trino.plugin.base.security.FunctionAccessControlRule.FunctionPrivilege.EXECUTE;
+import static io.trino.plugin.base.security.FunctionAccessControlRule.FunctionPrivilege.GRANT_EXECUTE;
 import static java.util.Objects.requireNonNull;
 
 public class CatalogFunctionAccessControlRule
 {
-    public static final CatalogFunctionAccessControlRule ALLOW_ALL = new CatalogFunctionAccessControlRule(
+    public static final CatalogFunctionAccessControlRule ALLOW_BUILTIN = new CatalogFunctionAccessControlRule(
+            ImmutableSet.of(EXECUTE, GRANT_EXECUTE),
             Optional.empty(),
-            FunctionAccessControlRule.ALLOW_ALL);
+            Optional.empty(),
+            Optional.empty(),
+            Optional.of(Pattern.compile("system")),
+            Optional.of(Pattern.compile("builtin")),
+            Optional.empty(),
+            ImmutableSet.of());
 
     private final Optional<Pattern> catalogRegex;
     private final FunctionAccessControlRule functionAccessControlRule;
@@ -55,28 +62,19 @@ private CatalogFunctionAccessControlRule(Optional<Pattern> catalogRegex, Functio
     {
         this.catalogRegex = requireNonNull(catalogRegex, "catalogRegex is null");
         this.functionAccessControlRule = requireNonNull(functionAccessControlRule, "functionAccessControlRule is null");
-        // TODO when every function is tied to connectors then remove this check
-        checkState(functionAccessControlRule.getFunctionKinds().equals(Set.of(TABLE)) || catalogRegex.isEmpty(), "Cannot define catalog for others function kinds than TABLE");
     }
 
-    public boolean matches(String user, Set<String> roles, Set<String> groups, String functionName)
-    {
-        return functionAccessControlRule.matches(user, roles, groups, functionName);
-    }
-
-    public boolean matches(String user, Set<String> roles, Set<String> groups, FunctionKind functionKind, CatalogSchemaRoutineName functionName)
+    public boolean matches(String user, Set<String> roles, Set<String> groups, CatalogSchemaRoutineName functionName)
     {
         if (!catalogRegex.map(regex -> regex.matcher(functionName.getCatalogName()).matches()).orElse(true)) {
             return false;
         }
-        return functionAccessControlRule.matches(user, roles, groups, functionKind, functionName.getSchemaRoutineName());
+        return functionAccessControlRule.matches(user, roles, groups, functionName.getSchemaRoutineName());
     }
 
     Optional<AnyCatalogPermissionsRule> toAnyCatalogPermissionsRule()
     {
-        if (functionAccessControlRule.getPrivileges().isEmpty() ||
-                // TODO when every function is tied to connectors then remove this check
-                !functionAccessControlRule.getFunctionKinds().contains(TABLE)) {
+        if (functionAccessControlRule.getPrivileges().isEmpty()) {
             return Optional.empty();
         }
         return Optional.of(new AnyCatalogPermissionsRule(
@@ -88,9 +86,7 @@ Optional<AnyCatalogPermissionsRule> toAnyCatalogPermissionsRule()
 
     Optional<AnyCatalogSchemaPermissionsRule> toAnyCatalogSchemaPermissionsRule()
     {
-        if (functionAccessControlRule.getPrivileges().isEmpty() ||
-                // TODO when every function is tied to connectors then remove this check
-                !functionAccessControlRule.getFunctionKinds().contains(TABLE)) {
+        if (functionAccessControlRule.getPrivileges().isEmpty()) {
             return Optional.empty();
         }
         return Optional.of(new AnyCatalogSchemaPermissionsRule(
@@ -110,4 +106,9 @@ public boolean canGrantExecuteFunction()
     {
         return functionAccessControlRule.canGrantExecuteFunction();
     }
+
+    public boolean hasOwnership()
+    {
+        return functionAccessControlRule.hasOwnership();
+    }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/CatalogProcedureAccessControlRule.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/CatalogProcedureAccessControlRule.java
new file mode 100644
index 000000000000..dad9c9d38a89
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/CatalogProcedureAccessControlRule.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed 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 io.trino.plugin.base.security;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableSet;
+import io.trino.plugin.base.security.ProcedureAccessControlRule.ProcedurePrivilege;
+import io.trino.spi.connector.CatalogSchemaRoutineName;
+
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import static io.trino.plugin.base.security.ProcedureAccessControlRule.ProcedurePrivilege.EXECUTE;
+import static io.trino.plugin.base.security.ProcedureAccessControlRule.ProcedurePrivilege.GRANT_EXECUTE;
+import static java.util.Objects.requireNonNull;
+
+public class CatalogProcedureAccessControlRule
+{
+    public static final CatalogProcedureAccessControlRule ALLOW_BUILTIN = new CatalogProcedureAccessControlRule(
+            ImmutableSet.of(EXECUTE, GRANT_EXECUTE),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.empty(),
+            Optional.of(Pattern.compile("system")),
+            Optional.of(Pattern.compile("builtin")),
+            Optional.empty());
+
+    private final Optional<Pattern> catalogRegex;
+    private final ProcedureAccessControlRule procedureAccessControlRule;
+
+    @JsonCreator
+    public CatalogProcedureAccessControlRule(
+            @JsonProperty("privileges") Set<ProcedurePrivilege> privileges,
+            @JsonProperty("user") Optional<Pattern> userRegex,
+            @JsonProperty("role") Optional<Pattern> roleRegex,
+            @JsonProperty("group") Optional<Pattern> groupRegex,
+            @JsonProperty("catalog") Optional<Pattern> catalogRegex,
+            @JsonProperty("schema") Optional<Pattern> schemaRegex,
+            @JsonProperty("procedure") Optional<Pattern> procedureRegex)
+    {
+        this(catalogRegex, new ProcedureAccessControlRule(privileges, userRegex, roleRegex, groupRegex, schemaRegex, procedureRegex));
+    }
+
+    private CatalogProcedureAccessControlRule(Optional<Pattern> catalogRegex, ProcedureAccessControlRule procedureAccessControlRule)
+    {
+        this.catalogRegex = requireNonNull(catalogRegex, "catalogRegex is null");
+        this.procedureAccessControlRule = requireNonNull(procedureAccessControlRule, "procedureAccessControlRule is null");
+    }
+
+    public boolean matches(String user, Set<String> roles, Set<String> groups, CatalogSchemaRoutineName procedureName)
+    {
+        if (!catalogRegex.map(regex -> regex.matcher(procedureName.getCatalogName()).matches()).orElse(true)) {
+            return false;
+        }
+        return procedureAccessControlRule.matches(user, roles, groups, procedureName.getSchemaRoutineName());
+    }
+
+    Optional<AnyCatalogPermissionsRule> toAnyCatalogPermissionsRule()
+    {
+        if (procedureAccessControlRule.getPrivileges().isEmpty()) {
+            return Optional.empty();
+        }
+        return Optional.of(new AnyCatalogPermissionsRule(
+                procedureAccessControlRule.getUserRegex(),
+                procedureAccessControlRule.getRoleRegex(),
+                procedureAccessControlRule.getGroupRegex(),
+                catalogRegex));
+    }
+
+    Optional<AnyCatalogSchemaPermissionsRule> toAnyCatalogSchemaPermissionsRule()
+    {
+        if (procedureAccessControlRule.getPrivileges().isEmpty()) {
+            return Optional.empty();
+        }
+        return Optional.of(new AnyCatalogSchemaPermissionsRule(
+                procedureAccessControlRule.getUserRegex(),
+                procedureAccessControlRule.getRoleRegex(),
+                procedureAccessControlRule.getGroupRegex(),
+                catalogRegex,
+                procedureAccessControlRule.getSchemaRegex()));
+    }
+
+    public boolean canExecuteProcedure()
+    {
+        return procedureAccessControlRule.canExecuteProcedure();
+    }
+
+    public boolean canGrantExecuteProcedure()
+    {
+        return procedureAccessControlRule.canGrantExecuteProcedure();
+    }
+}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/DefaultSystemAccessControl.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/DefaultSystemAccessControl.java
index 791e4363a614..9c74d7c4707f 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/DefaultSystemAccessControl.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/DefaultSystemAccessControl.java
@@ -13,14 +13,15 @@
  */
 package io.trino.plugin.base.security;
 
+import io.trino.spi.security.Identity;
 import io.trino.spi.security.SystemAccessControl;
 import io.trino.spi.security.SystemAccessControlFactory;
-import io.trino.spi.security.SystemSecurityContext;
 
 import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.spi.security.AccessDeniedException.denyImpersonateUser;
+import static io.trino.spi.security.AccessDeniedException.denyWriteSystemInformationAccess;
 
 /**
  * Default system access control rules.
@@ -51,8 +52,14 @@ public SystemAccessControl create(Map<String, String> config)
     }
 
     @Override
-    public void checkCanImpersonateUser(SystemSecurityContext context, String userName)
+    public void checkCanImpersonateUser(Identity identity, String userName)
     {
-        denyImpersonateUser(context.getIdentity().getUser(), userName);
+        denyImpersonateUser(identity.getUser(), userName);
+    }
+
+    @Override
+    public void checkCanWriteSystemInformation(Identity identity)
+    {
+        denyWriteSystemInformationAccess();
     }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedAccessControl.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedAccessControl.java
index 590744dd89cc..15fb53c8ee4c 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedAccessControl.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedAccessControl.java
@@ -22,9 +22,8 @@
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.SchemaRoutineName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.ConnectorIdentity;
-import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.security.ViewExpression;
@@ -51,6 +50,7 @@
 import static io.trino.spi.security.AccessDeniedException.denyCommentColumn;
 import static io.trino.spi.security.AccessDeniedException.denyCommentTable;
 import static io.trino.spi.security.AccessDeniedException.denyCommentView;
+import static io.trino.spi.security.AccessDeniedException.denyCreateFunction;
 import static io.trino.spi.security.AccessDeniedException.denyCreateMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyCreateRole;
 import static io.trino.spi.security.AccessDeniedException.denyCreateSchema;
@@ -61,13 +61,13 @@
 import static io.trino.spi.security.AccessDeniedException.denyDenySchemaPrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyDenyTablePrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyDropColumn;
+import static io.trino.spi.security.AccessDeniedException.denyDropFunction;
 import static io.trino.spi.security.AccessDeniedException.denyDropMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyDropRole;
 import static io.trino.spi.security.AccessDeniedException.denyDropSchema;
 import static io.trino.spi.security.AccessDeniedException.denyDropTable;
 import static io.trino.spi.security.AccessDeniedException.denyDropView;
-import static io.trino.spi.security.AccessDeniedException.denyExecuteFunction;
-import static io.trino.spi.security.AccessDeniedException.denyGrantExecuteFunctionPrivilege;
+import static io.trino.spi.security.AccessDeniedException.denyExecuteProcedure;
 import static io.trino.spi.security.AccessDeniedException.denyGrantRoles;
 import static io.trino.spi.security.AccessDeniedException.denyGrantSchemaPrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyGrantTablePrivilege;
@@ -92,11 +92,11 @@
 import static io.trino.spi.security.AccessDeniedException.denyShowColumns;
 import static io.trino.spi.security.AccessDeniedException.denyShowCreateSchema;
 import static io.trino.spi.security.AccessDeniedException.denyShowCreateTable;
+import static io.trino.spi.security.AccessDeniedException.denyShowFunctions;
 import static io.trino.spi.security.AccessDeniedException.denyShowTables;
 import static io.trino.spi.security.AccessDeniedException.denyTruncateTable;
 import static io.trino.spi.security.AccessDeniedException.denyUpdateTableColumns;
 import static java.lang.String.format;
-import static java.util.Locale.ENGLISH;
 
 public class FileBasedAccessControl
         implements ConnectorAccessControl
@@ -108,6 +108,8 @@ public class FileBasedAccessControl
     private final List<TableAccessControlRule> tableRules;
     private final List<SessionPropertyAccessControlRule> sessionPropertyRules;
     private final List<FunctionAccessControlRule> functionRules;
+    private final List<ProcedureAccessControlRule> procedureRules;
+    private final List<AuthorizationRule> authorizationRules;
     private final Set<AnySchemaPermissionsRule> anySchemaPermissionsRules;
 
     public FileBasedAccessControl(CatalogName catalogName, AccessControlRules rules)
@@ -120,6 +122,8 @@ public FileBasedAccessControl(CatalogName catalogName, AccessControlRules rules)
         this.tableRules = rules.getTableRules();
         this.sessionPropertyRules = rules.getSessionPropertyRules();
         this.functionRules = rules.getFunctionRules();
+        this.procedureRules = rules.getProcedureRules();
+        this.authorizationRules = rules.getAuthorizationRules();
         ImmutableSet.Builder<AnySchemaPermissionsRule> anySchemaPermissionsRules = ImmutableSet.builder();
         schemaRules.stream()
                 .map(SchemaAccessControlRule::toAnySchemaPermissionsRule)
@@ -136,6 +140,11 @@ public FileBasedAccessControl(CatalogName catalogName, AccessControlRules rules)
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .forEach(anySchemaPermissionsRules::add);
+        procedureRules.stream()
+                .map(ProcedureAccessControlRule::toAnySchemaPermissionsRule)
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .forEach(anySchemaPermissionsRules::add);
         this.anySchemaPermissionsRules = anySchemaPermissionsRules.build();
     }
 
@@ -169,6 +178,9 @@ public void checkCanSetSchemaAuthorization(ConnectorSecurityContext context, Str
         if (!isSchemaOwner(context, schemaName)) {
             denySetSchemaAuthorization(schemaName, principal);
         }
+        if (!checkCanSetAuthorization(context, principal)) {
+            denySetSchemaAuthorization(schemaName, principal);
+        }
     }
 
     @Override
@@ -268,6 +280,13 @@ public Set<String> filterColumns(ConnectorSecurityContext context, SchemaTableNa
                 .collect(toImmutableSet());
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(ConnectorSecurityContext context, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        // Default implementation is good enough. Explicit implementation is expected by the test though.
+        return ConnectorAccessControl.super.filterColumns(context, tableColumns);
+    }
+
     @Override
     public void checkCanRenameTable(ConnectorSecurityContext context, SchemaTableName tableName, SchemaTableName newTableName)
     {
@@ -347,6 +366,9 @@ public void checkCanSetTableAuthorization(ConnectorSecurityContext context, Sche
         if (!checkTablePermission(context, tableName, OWNERSHIP)) {
             denySetTableAuthorization(tableName.toString(), principal);
         }
+        if (!checkCanSetAuthorization(context, principal)) {
+            denySetTableAuthorization(tableName.toString(), principal);
+        }
     }
 
     @Override
@@ -423,6 +445,9 @@ public void checkCanSetViewAuthorization(ConnectorSecurityContext context, Schem
         if (!checkTablePermission(context, viewName, OWNERSHIP)) {
             denySetViewAuthorization(viewName.toString(), principal);
         }
+        if (!checkCanSetAuthorization(context, principal)) {
+            denySetViewAuthorization(viewName.toString(), principal);
+        }
     }
 
     @Override
@@ -487,15 +512,6 @@ public void checkCanRenameMaterializedView(ConnectorSecurityContext context, Sch
         }
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-        if (!checkFunctionPermission(context, functionKind, functionName, FunctionAccessControlRule::canGrantExecuteFunction)) {
-            String granteeAsString = format("%s '%s'", grantee.getType().name().toLowerCase(ENGLISH), grantee.getName());
-            denyGrantExecuteFunctionPrivilege(functionName.toString(), Identity.ofUser(context.getIdentity().getUser()), granteeAsString);
-        }
-    }
-
     @Override
     public void checkCanSetMaterializedViewProperties(ConnectorSecurityContext context, SchemaTableName materializedViewName, Map<String, Optional<Object>> properties)
     {
@@ -595,12 +611,6 @@ public void checkCanSetRole(ConnectorSecurityContext context, String role)
         denySetRole(role);
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(ConnectorSecurityContext context)
-    {
-        // allow, no roles are supported so show will always be empty
-    }
-
     @Override
     public void checkCanShowRoles(ConnectorSecurityContext context)
     {
@@ -622,6 +632,15 @@ public void checkCanShowRoleGrants(ConnectorSecurityContext context)
     @Override
     public void checkCanExecuteProcedure(ConnectorSecurityContext context, SchemaRoutineName procedure)
     {
+        ConnectorIdentity identity = context.getIdentity();
+        boolean allowed = procedureRules.stream()
+                .filter(rule -> rule.matches(identity.getUser(), identity.getEnabledSystemRoles(), identity.getGroups(), procedure))
+                .findFirst()
+                .filter(ProcedureAccessControlRule::canExecuteProcedure)
+                .isPresent();
+        if (!allowed) {
+            denyExecuteProcedure(procedure.toString());
+        }
     }
 
     @Override
@@ -630,10 +649,47 @@ public void checkCanExecuteTableProcedure(ConnectorSecurityContext context, Sche
     }
 
     @Override
-    public void checkCanExecuteFunction(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName function)
+    public boolean canExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        return checkFunctionPermission(context, function, FunctionAccessControlRule::canExecuteFunction);
+    }
+
+    @Override
+    public boolean canCreateViewWithExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        return checkFunctionPermission(context, function, FunctionAccessControlRule::canGrantExecuteFunction);
+    }
+
+    @Override
+    public void checkCanShowFunctions(ConnectorSecurityContext context, String schemaName)
     {
-        if (!checkFunctionPermission(context, functionKind, function, FunctionAccessControlRule::canExecuteFunction)) {
-            denyExecuteFunction(function.toString());
+        if (!checkAnySchemaAccess(context, schemaName)) {
+            denyShowFunctions(schemaName);
+        }
+    }
+
+    @Override
+    public Set<SchemaFunctionName> filterFunctions(ConnectorSecurityContext context, Set<SchemaFunctionName> functionNames)
+    {
+        return functionNames.stream()
+                .filter(name -> isSchemaOwner(context, name.getSchemaName()) ||
+                        checkAnyFunctionPermission(context, new SchemaRoutineName(name.getSchemaName(), name.getFunctionName()), FunctionAccessControlRule::canExecuteFunction))
+                .collect(toImmutableSet());
+    }
+
+    @Override
+    public void checkCanCreateFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        if (!checkFunctionPermission(context, function, FunctionAccessControlRule::hasOwnership)) {
+            denyCreateFunction(function.toString());
+        }
+    }
+
+    @Override
+    public void checkCanDropFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        if (!checkFunctionPermission(context, function, FunctionAccessControlRule::hasOwnership)) {
+            denyDropFunction(function.toString());
         }
     }
 
@@ -679,12 +735,6 @@ public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context,
         return masks.stream().findFirst();
     }
 
-    @Override
-    public List<ViewExpression> getColumnMasks(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
-    {
-        throw new UnsupportedOperationException();
-    }
-
     private boolean canSetSessionProperty(ConnectorSecurityContext context, String property)
     {
         ConnectorIdentity identity = context.getIdentity();
@@ -740,13 +790,35 @@ private boolean isSchemaOwner(ConnectorSecurityContext context, String schemaNam
         return false;
     }
 
-    private boolean checkFunctionPermission(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName functionName, Predicate<FunctionAccessControlRule> executePredicate)
+    private boolean checkFunctionPermission(ConnectorSecurityContext context, SchemaRoutineName functionName, Predicate<FunctionAccessControlRule> executePredicate)
     {
         ConnectorIdentity identity = context.getIdentity();
         return functionRules.stream()
-                .filter(rule -> rule.matches(identity.getUser(), identity.getEnabledSystemRoles(), identity.getGroups(), functionKind, functionName))
+                .filter(rule -> rule.matches(identity.getUser(), identity.getEnabledSystemRoles(), identity.getGroups(), functionName))
                 .findFirst()
                 .filter(executePredicate)
                 .isPresent();
     }
+
+    private boolean checkAnyFunctionPermission(ConnectorSecurityContext context, SchemaRoutineName functionName, Predicate<FunctionAccessControlRule> executePredicate)
+    {
+        ConnectorIdentity identity = context.getIdentity();
+        return functionRules.stream()
+                .filter(rule -> rule.matches(identity.getUser(), identity.getEnabledSystemRoles(), identity.getGroups(), functionName))
+                .findFirst()
+                .filter(executePredicate)
+                .isPresent();
+    }
+
+    private boolean checkCanSetAuthorization(ConnectorSecurityContext context, TrinoPrincipal principal)
+    {
+        ConnectorIdentity identity = context.getIdentity();
+        Set<String> roles = identity.getConnectorRole().stream()
+                .flatMap(role -> role.getRole().stream())
+                .collect(toImmutableSet());
+        return authorizationRules.stream()
+                .flatMap(rule -> rule.match(identity.getUser(), identity.getGroups(), roles, principal).stream())
+                .findFirst()
+                .orElse(false);
+    }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedAccessControlConfig.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedAccessControlConfig.java
index e608b90e9544..b6498db87831 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedAccessControlConfig.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedAccessControlConfig.java
@@ -17,9 +17,8 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControl.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControl.java
index 20c5d5d4a9bf..cecb304b1252 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControl.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControl.java
@@ -25,7 +25,7 @@
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.eventlistener.EventListener;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.SystemAccessControl;
@@ -36,6 +36,7 @@
 import io.trino.spi.type.Type;
 
 import java.security.Principal;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -57,11 +58,11 @@
 import static io.trino.spi.StandardErrorCode.INVALID_COLUMN_MASK;
 import static io.trino.spi.security.AccessDeniedException.denyAddColumn;
 import static io.trino.spi.security.AccessDeniedException.denyAlterColumn;
-import static io.trino.spi.security.AccessDeniedException.denyCatalogAccess;
 import static io.trino.spi.security.AccessDeniedException.denyCommentColumn;
 import static io.trino.spi.security.AccessDeniedException.denyCommentTable;
 import static io.trino.spi.security.AccessDeniedException.denyCommentView;
 import static io.trino.spi.security.AccessDeniedException.denyCreateCatalog;
+import static io.trino.spi.security.AccessDeniedException.denyCreateFunction;
 import static io.trino.spi.security.AccessDeniedException.denyCreateMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyCreateRole;
 import static io.trino.spi.security.AccessDeniedException.denyCreateSchema;
@@ -73,13 +74,13 @@
 import static io.trino.spi.security.AccessDeniedException.denyDenyTablePrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyDropCatalog;
 import static io.trino.spi.security.AccessDeniedException.denyDropColumn;
+import static io.trino.spi.security.AccessDeniedException.denyDropFunction;
 import static io.trino.spi.security.AccessDeniedException.denyDropMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyDropRole;
 import static io.trino.spi.security.AccessDeniedException.denyDropSchema;
 import static io.trino.spi.security.AccessDeniedException.denyDropTable;
 import static io.trino.spi.security.AccessDeniedException.denyDropView;
-import static io.trino.spi.security.AccessDeniedException.denyExecuteFunction;
-import static io.trino.spi.security.AccessDeniedException.denyGrantExecuteFunctionPrivilege;
+import static io.trino.spi.security.AccessDeniedException.denyExecuteProcedure;
 import static io.trino.spi.security.AccessDeniedException.denyGrantRoles;
 import static io.trino.spi.security.AccessDeniedException.denyGrantSchemaPrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyGrantTablePrivilege;
@@ -107,7 +108,7 @@
 import static io.trino.spi.security.AccessDeniedException.denyShowColumns;
 import static io.trino.spi.security.AccessDeniedException.denyShowCreateSchema;
 import static io.trino.spi.security.AccessDeniedException.denyShowCreateTable;
-import static io.trino.spi.security.AccessDeniedException.denyShowRoleAuthorizationDescriptors;
+import static io.trino.spi.security.AccessDeniedException.denyShowFunctions;
 import static io.trino.spi.security.AccessDeniedException.denyShowSchemas;
 import static io.trino.spi.security.AccessDeniedException.denyShowTables;
 import static io.trino.spi.security.AccessDeniedException.denyTruncateTable;
@@ -115,7 +116,6 @@
 import static io.trino.spi.security.AccessDeniedException.denyViewQuery;
 import static io.trino.spi.security.AccessDeniedException.denyWriteSystemInformationAccess;
 import static java.lang.String.format;
-import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 
 public class FileBasedSystemAccessControl
@@ -129,11 +129,13 @@ public class FileBasedSystemAccessControl
     private final Optional<List<ImpersonationRule>> impersonationRules;
     private final Optional<List<PrincipalUserMatchRule>> principalUserMatchRules;
     private final Optional<List<SystemInformationRule>> systemInformationRules;
+    private final List<AuthorizationRule> authorizationRules;
     private final List<CatalogSchemaAccessControlRule> schemaRules;
     private final List<CatalogTableAccessControlRule> tableRules;
     private final List<SessionPropertyAccessControlRule> sessionPropertyRules;
     private final List<CatalogSessionPropertyAccessControlRule> catalogSessionPropertyRules;
     private final List<CatalogFunctionAccessControlRule> functionRules;
+    private final List<CatalogProcedureAccessControlRule> procedureRules;
     private final Set<AnyCatalogPermissionsRule> anyCatalogPermissionsRules;
     private final Set<AnyCatalogSchemaPermissionsRule> anyCatalogSchemaPermissionsRules;
 
@@ -143,22 +145,26 @@ private FileBasedSystemAccessControl(
             Optional<List<ImpersonationRule>> impersonationRules,
             Optional<List<PrincipalUserMatchRule>> principalUserMatchRules,
             Optional<List<SystemInformationRule>> systemInformationRules,
+            List<AuthorizationRule> authorizationRules,
             List<CatalogSchemaAccessControlRule> schemaRules,
             List<CatalogTableAccessControlRule> tableRules,
             List<SessionPropertyAccessControlRule> sessionPropertyRules,
             List<CatalogSessionPropertyAccessControlRule> catalogSessionPropertyRules,
-            List<CatalogFunctionAccessControlRule> functionRules)
+            List<CatalogFunctionAccessControlRule> functionRules,
+            List<CatalogProcedureAccessControlRule> procedureRules)
     {
         this.catalogRules = catalogRules;
         this.queryAccessRules = queryAccessRules;
         this.impersonationRules = impersonationRules;
         this.principalUserMatchRules = principalUserMatchRules;
         this.systemInformationRules = systemInformationRules;
+        this.authorizationRules = authorizationRules;
         this.schemaRules = schemaRules;
         this.tableRules = tableRules;
         this.sessionPropertyRules = sessionPropertyRules;
         this.catalogSessionPropertyRules = catalogSessionPropertyRules;
         this.functionRules = functionRules;
+        this.procedureRules = procedureRules;
 
         ImmutableSet.Builder<AnyCatalogPermissionsRule> anyCatalogPermissionsRules = ImmutableSet.builder();
         schemaRules.stream()
@@ -177,6 +183,10 @@ private FileBasedSystemAccessControl(
                 .map(CatalogFunctionAccessControlRule::toAnyCatalogPermissionsRule)
                 .flatMap(Optional::stream)
                 .forEach(anyCatalogPermissionsRules::add);
+        procedureRules.stream()
+                .map(CatalogProcedureAccessControlRule::toAnyCatalogPermissionsRule)
+                .flatMap(Optional::stream)
+                .forEach(anyCatalogPermissionsRules::add);
         this.anyCatalogPermissionsRules = anyCatalogPermissionsRules.build();
 
         ImmutableSet.Builder<AnyCatalogSchemaPermissionsRule> anyCatalogSchemaPermissionsRules = ImmutableSet.builder();
@@ -192,6 +202,10 @@ private FileBasedSystemAccessControl(
                 .map(CatalogFunctionAccessControlRule::toAnyCatalogSchemaPermissionsRule)
                 .flatMap(Optional::stream)
                 .forEach(anyCatalogSchemaPermissionsRules::add);
+        procedureRules.stream()
+                .map(CatalogProcedureAccessControlRule::toAnyCatalogSchemaPermissionsRule)
+                .flatMap(Optional::stream)
+                .forEach(anyCatalogSchemaPermissionsRules::add);
         this.anyCatalogSchemaPermissionsRules = anyCatalogSchemaPermissionsRules.build();
     }
 
@@ -223,9 +237,8 @@ public SystemAccessControl create(Map<String, String> config)
     }
 
     @Override
-    public void checkCanImpersonateUser(SystemSecurityContext context, String userName)
+    public void checkCanImpersonateUser(Identity identity, String userName)
     {
-        Identity identity = context.getIdentity();
         if (impersonationRules.isEmpty()) {
             // if there are principal user match rules, we assume that impersonation checks are
             // handled there; otherwise, impersonation must be manually configured
@@ -278,37 +291,36 @@ public void checkCanSetUser(Optional<Principal> principal, String userName)
     }
 
     @Override
-    public void checkCanExecuteQuery(SystemSecurityContext context)
+    public void checkCanExecuteQuery(Identity identity)
     {
-        if (!canAccessQuery(context.getIdentity(), Optional.empty(), QueryAccessRule.AccessMode.EXECUTE)) {
+        if (!canAccessQuery(identity, Optional.empty(), QueryAccessRule.AccessMode.EXECUTE)) {
             denyViewQuery();
         }
     }
 
     @Override
-    public void checkCanViewQueryOwnedBy(SystemSecurityContext context, String queryOwner)
+    public void checkCanViewQueryOwnedBy(Identity identity, Identity queryOwner)
     {
-        if (!canAccessQuery(context.getIdentity(), Optional.of(queryOwner), QueryAccessRule.AccessMode.VIEW)) {
+        if (!canAccessQuery(identity, Optional.of(queryOwner.getUser()), QueryAccessRule.AccessMode.VIEW)) {
             denyViewQuery();
         }
     }
 
     @Override
-    public Set<String> filterViewQueryOwnedBy(SystemSecurityContext context, Set<String> queryOwners)
+    public Collection<Identity> filterViewQueryOwnedBy(Identity identity, Collection<Identity> queryOwners)
     {
         if (queryAccessRules.isEmpty()) {
             return queryOwners;
         }
-        Identity identity = context.getIdentity();
         return queryOwners.stream()
-                .filter(owner -> canAccessQuery(identity, Optional.of(owner), QueryAccessRule.AccessMode.VIEW))
+                .filter(owner -> canAccessQuery(identity, Optional.of(owner.getUser()), QueryAccessRule.AccessMode.VIEW))
                 .collect(toImmutableSet());
     }
 
     @Override
-    public void checkCanKillQueryOwnedBy(SystemSecurityContext context, String queryOwner)
+    public void checkCanKillQueryOwnedBy(Identity identity, Identity queryOwner)
     {
-        if (!canAccessQuery(context.getIdentity(), Optional.of(queryOwner), QueryAccessRule.AccessMode.KILL)) {
+        if (!canAccessQuery(identity, Optional.of(queryOwner.getUser()), QueryAccessRule.AccessMode.KILL)) {
             denyViewQuery();
         }
     }
@@ -328,17 +340,17 @@ private boolean canAccessQuery(Identity identity, Optional<String> queryOwner, Q
     }
 
     @Override
-    public void checkCanReadSystemInformation(SystemSecurityContext context)
+    public void checkCanReadSystemInformation(Identity identity)
     {
-        if (!checkCanSystemInformation(context.getIdentity(), SystemInformationRule.AccessMode.READ)) {
+        if (!checkCanSystemInformation(identity, SystemInformationRule.AccessMode.READ)) {
             denyReadSystemInformationAccess();
         }
     }
 
     @Override
-    public void checkCanWriteSystemInformation(SystemSecurityContext context)
+    public void checkCanWriteSystemInformation(Identity identity)
     {
-        if (!checkCanSystemInformation(context.getIdentity(), SystemInformationRule.AccessMode.WRITE)) {
+        if (!checkCanSystemInformation(identity, SystemInformationRule.AccessMode.WRITE)) {
             denyWriteSystemInformationAccess();
         }
     }
@@ -355,9 +367,8 @@ private boolean checkCanSystemInformation(Identity identity, SystemInformationRu
     }
 
     @Override
-    public void checkCanSetSystemSessionProperty(SystemSecurityContext context, String propertyName)
+    public void checkCanSetSystemSessionProperty(Identity identity, String propertyName)
     {
-        Identity identity = context.getIdentity();
         boolean allowed = sessionPropertyRules.stream()
                 .map(rule -> rule.match(identity.getUser(), identity.getEnabledRoles(), identity.getGroups(), propertyName))
                 .flatMap(Optional::stream)
@@ -369,11 +380,9 @@ public void checkCanSetSystemSessionProperty(SystemSecurityContext context, Stri
     }
 
     @Override
-    public void checkCanAccessCatalog(SystemSecurityContext context, String catalogName)
+    public boolean canAccessCatalog(SystemSecurityContext context, String catalogName)
     {
-        if (!canAccessCatalog(context, catalogName, READ_ONLY)) {
-            denyCatalogAccess(catalogName);
-        }
+        return canAccessCatalog(context, catalogName, READ_ONLY);
     }
 
     @Override
@@ -434,6 +443,9 @@ public void checkCanSetSchemaAuthorization(SystemSecurityContext context, Catalo
         if (!isSchemaOwner(context, schema)) {
             denySetSchemaAuthorization(schema.toString(), principal);
         }
+        if (!checkCanSetAuthorization(context, principal)) {
+            denySetSchemaAuthorization(schema.toString(), principal);
+        }
     }
 
     @Override
@@ -590,6 +602,13 @@ public Set<String> filterColumns(SystemSecurityContext context, CatalogSchemaTab
                 .collect(toImmutableSet());
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(SystemSecurityContext context, String catalogName, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        // Default implementation is good enough. Explicit implementation is expected by the test though.
+        return SystemAccessControl.super.filterColumns(context, catalogName, tableColumns);
+    }
+
     @Override
     public void checkCanAddColumn(SystemSecurityContext context, CatalogSchemaTableName table)
     {
@@ -628,6 +647,9 @@ public void checkCanSetTableAuthorization(SystemSecurityContext context, Catalog
         if (!checkTablePermission(context, table, OWNERSHIP)) {
             denySetTableAuthorization(table.toString(), principal);
         }
+        if (!checkCanSetAuthorization(context, principal)) {
+            denySetTableAuthorization(table.toString(), principal);
+        }
     }
 
     @Override
@@ -700,6 +722,9 @@ public void checkCanSetViewAuthorization(SystemSecurityContext context, CatalogS
         if (!checkTablePermission(context, view, OWNERSHIP)) {
             denySetViewAuthorization(view.toString(), principal);
         }
+        if (!checkCanSetAuthorization(context, principal)) {
+            denySetViewAuthorization(view.toString(), principal);
+        }
     }
 
     @Override
@@ -776,24 +801,6 @@ public void checkCanSetMaterializedViewProperties(SystemSecurityContext context,
         }
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SystemSecurityContext context, String functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-        if (!checkFunctionPermission(context, functionName, CatalogFunctionAccessControlRule::canGrantExecuteFunction)) {
-            String granteeAsString = format("%s '%s'", grantee.getType().name().toLowerCase(ENGLISH), grantee.getName());
-            denyGrantExecuteFunctionPrivilege(functionName, context.getIdentity(), granteeAsString);
-        }
-    }
-
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SystemSecurityContext context, FunctionKind functionKind, CatalogSchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-        if (!checkFunctionPermission(context, functionKind, functionName, CatalogFunctionAccessControlRule::canGrantExecuteFunction)) {
-            String granteeAsString = format("%s '%s'", grantee.getType().name().toLowerCase(ENGLISH), grantee.getName());
-            denyGrantExecuteFunctionPrivilege(functionName.toString(), context.getIdentity(), granteeAsString);
-        }
-    }
-
     @Override
     public void checkCanSetCatalogSessionProperty(SystemSecurityContext context, String catalogName, String propertyName)
     {
@@ -898,12 +905,6 @@ public void checkCanRevokeRoles(SystemSecurityContext context,
         denyRevokeRoles(roles, grantees);
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(SystemSecurityContext context)
-    {
-        denyShowRoleAuthorizationDescriptors();
-    }
-
     @Override
     public void checkCanShowCurrentRoles(SystemSecurityContext context)
     {
@@ -925,27 +926,69 @@ public void checkCanShowRoles(SystemSecurityContext context)
     @Override
     public void checkCanExecuteProcedure(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName procedure)
     {
+        Identity identity = systemSecurityContext.getIdentity();
+        boolean allowed = canAccessCatalog(systemSecurityContext, procedure.getCatalogName(), READ_ONLY) &&
+                procedureRules.stream()
+                        .filter(rule -> rule.matches(identity.getUser(), identity.getEnabledRoles(), identity.getGroups(), procedure))
+                        .findFirst()
+                        .filter(CatalogProcedureAccessControlRule::canExecuteProcedure)
+                        .isPresent();
+        if (!allowed) {
+            denyExecuteProcedure(procedure.toString());
+        }
+    }
+
+    @Override
+    public boolean canExecuteFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
+    {
+        return checkFunctionPermission(systemSecurityContext, functionName, CatalogFunctionAccessControlRule::canExecuteFunction);
     }
 
     @Override
-    public void checkCanExecuteFunction(SystemSecurityContext systemSecurityContext, String functionName)
+    public boolean canCreateViewWithExecuteFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
     {
-        if (!checkFunctionPermission(systemSecurityContext, functionName, CatalogFunctionAccessControlRule::canExecuteFunction)) {
-            denyExecuteFunction(functionName);
+        return checkFunctionPermission(systemSecurityContext, functionName, CatalogFunctionAccessControlRule::canGrantExecuteFunction);
+    }
+
+    @Override
+    public void checkCanExecuteTableProcedure(SystemSecurityContext systemSecurityContext, CatalogSchemaTableName table, String procedure)
+    {
+    }
+
+    @Override
+    public void checkCanShowFunctions(SystemSecurityContext context, CatalogSchemaName schema)
+    {
+        if (!checkAnySchemaAccess(context, schema.getCatalogName(), schema.getSchemaName())) {
+            denyShowFunctions(schema.toString());
         }
     }
 
     @Override
-    public void checkCanExecuteFunction(SystemSecurityContext systemSecurityContext, FunctionKind functionKind, CatalogSchemaRoutineName functionName)
+    public Set<SchemaFunctionName> filterFunctions(SystemSecurityContext context, String catalogName, Set<SchemaFunctionName> functionNames)
     {
-        if (!checkFunctionPermission(systemSecurityContext, functionKind, functionName, CatalogFunctionAccessControlRule::canExecuteFunction)) {
-            denyExecuteFunction(functionName.toString());
+        return functionNames.stream()
+                .filter(functionName -> {
+                    CatalogSchemaRoutineName routineName = new CatalogSchemaRoutineName(catalogName, functionName.getSchemaName(), functionName.getFunctionName());
+                    return isSchemaOwner(context, new CatalogSchemaName(catalogName, functionName.getSchemaName())) ||
+                            checkAnyFunctionPermission(context, routineName, CatalogFunctionAccessControlRule::canExecuteFunction);
+                })
+                .collect(toImmutableSet());
+    }
+
+    @Override
+    public void checkCanCreateFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
+    {
+        if (!checkFunctionPermission(systemSecurityContext, functionName, CatalogFunctionAccessControlRule::hasOwnership)) {
+            denyCreateFunction(functionName.toString());
         }
     }
 
     @Override
-    public void checkCanExecuteTableProcedure(SystemSecurityContext systemSecurityContext, CatalogSchemaTableName table, String procedure)
+    public void checkCanDropFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
     {
+        if (!checkFunctionPermission(systemSecurityContext, functionName, CatalogFunctionAccessControlRule::hasOwnership)) {
+            denyDropFunction(functionName.toString());
+        }
     }
 
     @Override
@@ -998,12 +1041,6 @@ public Optional<ViewExpression> getColumnMask(SystemSecurityContext context, Cat
         return masks.stream().findFirst();
     }
 
-    @Override
-    public List<ViewExpression> getColumnMasks(SystemSecurityContext context, CatalogSchemaTableName table, String columnName, Type type)
-    {
-        throw new UnsupportedOperationException();
-    }
-
     private boolean checkAnyCatalogAccess(SystemSecurityContext context, String catalogName)
     {
         if (canAccessCatalog(context, catalogName, OWNER)) {
@@ -1084,31 +1121,37 @@ private boolean checkTablePermission(
         return false;
     }
 
-    private boolean checkFunctionPermission(SystemSecurityContext context, String functionName, Predicate<CatalogFunctionAccessControlRule> executePredicate)
+    private boolean checkFunctionPermission(SystemSecurityContext context, CatalogSchemaRoutineName functionName, Predicate<CatalogFunctionAccessControlRule> executePredicate)
     {
         Identity identity = context.getIdentity();
-        return functionRules.stream()
-                .filter(rule -> rule.matches(identity.getUser(), identity.getEnabledRoles(), identity.getGroups(), functionName))
-                .findFirst()
-                .filter(executePredicate)
-                .isPresent();
+        return canAccessCatalog(context, functionName.getCatalogName(), READ_ONLY) &&
+                functionRules.stream()
+                        .filter(rule -> rule.matches(identity.getUser(), identity.getEnabledRoles(), identity.getGroups(), functionName))
+                        .findFirst()
+                        .filter(executePredicate)
+                        .isPresent();
     }
 
-    private boolean checkFunctionPermission(SystemSecurityContext context, FunctionKind functionKind, CatalogSchemaRoutineName functionName, Predicate<CatalogFunctionAccessControlRule> executePredicate)
+    private boolean checkAnyFunctionPermission(SystemSecurityContext context, CatalogSchemaRoutineName functionName, Predicate<CatalogFunctionAccessControlRule> executePredicate)
     {
-        AccessMode requiredCatalogAccess = switch (functionKind) {
-            case SCALAR, AGGREGATE, WINDOW -> READ_ONLY;
-            case TABLE -> ALL;
-        };
         Identity identity = context.getIdentity();
-        return canAccessCatalog(context, functionName.getCatalogName(), requiredCatalogAccess) &&
+        return canAccessCatalog(context, functionName.getCatalogName(), READ_ONLY) &&
                 functionRules.stream()
-                        .filter(rule -> rule.matches(identity.getUser(), identity.getEnabledRoles(), identity.getGroups(), functionKind, functionName))
+                        .filter(rule -> rule.matches(identity.getUser(), identity.getEnabledRoles(), identity.getGroups(), functionName))
                         .findFirst()
                         .filter(executePredicate)
                         .isPresent();
     }
 
+    private boolean checkCanSetAuthorization(SystemSecurityContext context, TrinoPrincipal principal)
+    {
+        Identity identity = context.getIdentity();
+        return authorizationRules.stream()
+                .flatMap(rule -> rule.match(identity.getUser(), identity.getGroups(), identity.getEnabledRoles(), principal).stream())
+                .findFirst()
+                .orElse(false);
+    }
+
     public static Builder builder()
     {
         return new Builder();
@@ -1121,11 +1164,13 @@ public static final class Builder
         private Optional<List<ImpersonationRule>> impersonationRules = Optional.empty();
         private Optional<List<PrincipalUserMatchRule>> principalUserMatchRules = Optional.empty();
         private Optional<List<SystemInformationRule>> systemInformationRules = Optional.empty();
+        private List<AuthorizationRule> authorizationRules = ImmutableList.of();
         private List<CatalogSchemaAccessControlRule> schemaRules = ImmutableList.of(CatalogSchemaAccessControlRule.ALLOW_ALL);
         private List<CatalogTableAccessControlRule> tableRules = ImmutableList.of(CatalogTableAccessControlRule.ALLOW_ALL);
         private List<SessionPropertyAccessControlRule> sessionPropertyRules = ImmutableList.of(SessionPropertyAccessControlRule.ALLOW_ALL);
         private List<CatalogSessionPropertyAccessControlRule> catalogSessionPropertyRules = ImmutableList.of(CatalogSessionPropertyAccessControlRule.ALLOW_ALL);
-        private List<CatalogFunctionAccessControlRule> functionRules = ImmutableList.of(CatalogFunctionAccessControlRule.ALLOW_ALL);
+        private List<CatalogFunctionAccessControlRule> functionRules = ImmutableList.of(CatalogFunctionAccessControlRule.ALLOW_BUILTIN);
+        private List<CatalogProcedureAccessControlRule> procedureRules = ImmutableList.of(CatalogProcedureAccessControlRule.ALLOW_BUILTIN);
 
         @SuppressWarnings("unused")
         public Builder denyAllAccess()
@@ -1135,11 +1180,13 @@ public Builder denyAllAccess()
             impersonationRules = Optional.of(ImmutableList.of());
             principalUserMatchRules = Optional.of(ImmutableList.of());
             systemInformationRules = Optional.of(ImmutableList.of());
+            authorizationRules = ImmutableList.of();
             schemaRules = ImmutableList.of();
             tableRules = ImmutableList.of();
             sessionPropertyRules = ImmutableList.of();
             catalogSessionPropertyRules = ImmutableList.of();
             functionRules = ImmutableList.of();
+            procedureRules = ImmutableList.of();
             return this;
         }
 
@@ -1173,6 +1220,12 @@ public Builder setSystemInformationRules(Optional<List<SystemInformationRule>> s
             return this;
         }
 
+        public Builder setAuthorizationRules(List<AuthorizationRule> authorizationRules)
+        {
+            this.authorizationRules = authorizationRules;
+            return this;
+        }
+
         public Builder setSchemaRules(List<CatalogSchemaAccessControlRule> schemaRules)
         {
             this.schemaRules = schemaRules;
@@ -1203,6 +1256,12 @@ public Builder setFunctionRules(List<CatalogFunctionAccessControlRule> functionR
             return this;
         }
 
+        public Builder setProcedureRules(List<CatalogProcedureAccessControlRule> procedureRules)
+        {
+            this.procedureRules = procedureRules;
+            return this;
+        }
+
         public FileBasedSystemAccessControl build()
         {
             return new FileBasedSystemAccessControl(
@@ -1211,11 +1270,13 @@ public FileBasedSystemAccessControl build()
                     impersonationRules,
                     principalUserMatchRules,
                     systemInformationRules,
+                    authorizationRules,
                     schemaRules,
                     tableRules,
                     sessionPropertyRules,
                     catalogSessionPropertyRules,
-                    functionRules);
+                    functionRules,
+                    procedureRules);
         }
     }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControlModule.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControlModule.java
index 891d5ca2dff2..732b2c5a2ec1 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControlModule.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControlModule.java
@@ -103,11 +103,13 @@ private SystemAccessControl create(FileBasedSystemAccessControlRules rules)
                 .setImpersonationRules(rules.getImpersonationRules())
                 .setPrincipalUserMatchRules(rules.getPrincipalUserMatchRules())
                 .setSystemInformationRules(rules.getSystemInformationRules())
+                .setAuthorizationRules(rules.getAuthorizationRules())
                 .setSchemaRules(rules.getSchemaRules().orElse(ImmutableList.of(CatalogSchemaAccessControlRule.ALLOW_ALL)))
                 .setTableRules(rules.getTableRules().orElse(ImmutableList.of(CatalogTableAccessControlRule.ALLOW_ALL)))
                 .setSessionPropertyRules(rules.getSessionPropertyRules().orElse(ImmutableList.of(SessionPropertyAccessControlRule.ALLOW_ALL)))
                 .setCatalogSessionPropertyRules(rules.getCatalogSessionPropertyRules().orElse(ImmutableList.of(CatalogSessionPropertyAccessControlRule.ALLOW_ALL)))
-                .setFunctionRules(rules.getFunctionRules().orElse(ImmutableList.of(CatalogFunctionAccessControlRule.ALLOW_ALL)))
+                .setFunctionRules(rules.getFunctionRules().orElse(ImmutableList.of(CatalogFunctionAccessControlRule.ALLOW_BUILTIN)))
+                .setProcedureRules(rules.getProcedureRules().orElse(ImmutableList.of(CatalogProcedureAccessControlRule.ALLOW_BUILTIN)))
                 .build();
     }
 
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControlRules.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControlRules.java
index 8665b91fdcd5..f10dab871a31 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControlRules.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControlRules.java
@@ -27,11 +27,13 @@ public class FileBasedSystemAccessControlRules
     private final Optional<List<ImpersonationRule>> impersonationRules;
     private final Optional<List<PrincipalUserMatchRule>> principalUserMatchRules;
     private final Optional<List<SystemInformationRule>> systemInformationRules;
+    private final Optional<List<AuthorizationRule>> authorizationRules;
     private final Optional<List<CatalogSchemaAccessControlRule>> schemaRules;
     private final Optional<List<CatalogTableAccessControlRule>> tableRules;
     private final Optional<List<SessionPropertyAccessControlRule>> sessionPropertyRules;
     private final Optional<List<CatalogSessionPropertyAccessControlRule>> catalogSessionPropertyRules;
     private final Optional<List<CatalogFunctionAccessControlRule>> functionRules;
+    private final Optional<List<CatalogProcedureAccessControlRule>> procedureRules;
 
     @JsonCreator
     public FileBasedSystemAccessControlRules(
@@ -40,22 +42,26 @@ public FileBasedSystemAccessControlRules(
             @JsonProperty("impersonation") Optional<List<ImpersonationRule>> impersonationRules,
             @JsonProperty("principals") Optional<List<PrincipalUserMatchRule>> principalUserMatchRules,
             @JsonProperty("system_information") Optional<List<SystemInformationRule>> systemInformationRules,
+            @JsonProperty("authorization") Optional<List<AuthorizationRule>> authorizationRules,
             @JsonProperty("schemas") Optional<List<CatalogSchemaAccessControlRule>> schemaAccessControlRules,
             @JsonProperty("tables") Optional<List<CatalogTableAccessControlRule>> tableAccessControlRules,
             @JsonProperty("system_session_properties") Optional<List<SessionPropertyAccessControlRule>> sessionPropertyRules,
             @JsonProperty("catalog_session_properties") Optional<List<CatalogSessionPropertyAccessControlRule>> catalogSessionPropertyRules,
-            @JsonProperty("functions") Optional<List<CatalogFunctionAccessControlRule>> functionRules)
+            @JsonProperty("functions") Optional<List<CatalogFunctionAccessControlRule>> functionRules,
+            @JsonProperty("procedures") Optional<List<CatalogProcedureAccessControlRule>> procedureRules)
     {
         this.catalogRules = catalogRules.map(ImmutableList::copyOf);
         this.queryAccessRules = queryAccessRules.map(ImmutableList::copyOf);
         this.principalUserMatchRules = principalUserMatchRules.map(ImmutableList::copyOf);
         this.impersonationRules = impersonationRules.map(ImmutableList::copyOf);
         this.systemInformationRules = systemInformationRules.map(ImmutableList::copyOf);
+        this.authorizationRules = authorizationRules.map(ImmutableList::copyOf);
         this.schemaRules = schemaAccessControlRules.map(ImmutableList::copyOf);
         this.tableRules = tableAccessControlRules.map(ImmutableList::copyOf);
         this.sessionPropertyRules = sessionPropertyRules.map(ImmutableList::copyOf);
         this.catalogSessionPropertyRules = catalogSessionPropertyRules.map(ImmutableList::copyOf);
         this.functionRules = functionRules.map(ImmutableList::copyOf);
+        this.procedureRules = procedureRules.map(ImmutableList::copyOf);
     }
 
     public Optional<List<CatalogAccessControlRule>> getCatalogRules()
@@ -83,6 +89,11 @@ public Optional<List<SystemInformationRule>> getSystemInformationRules()
         return systemInformationRules;
     }
 
+    public List<AuthorizationRule> getAuthorizationRules()
+    {
+        return authorizationRules.orElseGet(ImmutableList::of);
+    }
+
     public Optional<List<CatalogSchemaAccessControlRule>> getSchemaRules()
     {
         return schemaRules;
@@ -107,4 +118,9 @@ public Optional<List<CatalogFunctionAccessControlRule>> getFunctionRules()
     {
         return functionRules;
     }
+
+    public Optional<List<CatalogProcedureAccessControlRule>> getProcedureRules()
+    {
+        return procedureRules;
+    }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ForwardingConnectorAccessControl.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ForwardingConnectorAccessControl.java
index eca7a3514867..bb4643aedd9d 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ForwardingConnectorAccessControl.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ForwardingConnectorAccessControl.java
@@ -17,7 +17,7 @@
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.SchemaRoutineName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.security.ViewExpression;
@@ -163,6 +163,12 @@ public Set<String> filterColumns(ConnectorSecurityContext context, SchemaTableNa
         return delegate().filterColumns(context, tableName, columns);
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(ConnectorSecurityContext context, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        return delegate().filterColumns(context, tableColumns);
+    }
+
     @Override
     public void checkCanAddColumn(ConnectorSecurityContext context, SchemaTableName tableName)
     {
@@ -277,12 +283,6 @@ public void checkCanRenameMaterializedView(ConnectorSecurityContext context, Sch
         delegate().checkCanRenameMaterializedView(context, viewName, newViewName);
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-        delegate().checkCanGrantExecuteFunctionPrivilege(context, functionKind, functionName, grantee, grantOption);
-    }
-
     @Override
     public void checkCanSetMaterializedViewProperties(ConnectorSecurityContext context, SchemaTableName materializedViewName, Map<String, Optional<Object>> properties)
     {
@@ -369,12 +369,6 @@ public void checkCanSetRole(ConnectorSecurityContext context, String role)
         delegate().checkCanSetRole(context, role);
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(ConnectorSecurityContext context)
-    {
-        delegate().checkCanShowRoleAuthorizationDescriptors(context);
-    }
-
     @Override
     public void checkCanShowRoles(ConnectorSecurityContext context)
     {
@@ -406,26 +400,50 @@ public void checkCanExecuteTableProcedure(ConnectorSecurityContext context, Sche
     }
 
     @Override
-    public void checkCanExecuteFunction(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName function)
+    public boolean canExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
     {
-        delegate().checkCanExecuteFunction(context, functionKind, function);
+        return delegate().canExecuteFunction(context, function);
     }
 
     @Override
-    public List<ViewExpression> getRowFilters(ConnectorSecurityContext context, SchemaTableName tableName)
+    public boolean canCreateViewWithExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
     {
-        return delegate().getRowFilters(context, tableName);
+        return delegate().canCreateViewWithExecuteFunction(context, function);
     }
 
     @Override
-    public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    public void checkCanShowFunctions(ConnectorSecurityContext context, String schemaName)
     {
-        return delegate().getColumnMask(context, tableName, columnName, type);
+        delegate().checkCanShowFunctions(context, schemaName);
+    }
+
+    @Override
+    public Set<SchemaFunctionName> filterFunctions(ConnectorSecurityContext context, Set<SchemaFunctionName> functionNames)
+    {
+        return delegate().filterFunctions(context, functionNames);
+    }
+
+    @Override
+    public void checkCanCreateFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        delegate().checkCanCreateFunction(context, function);
+    }
+
+    @Override
+    public void checkCanDropFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        delegate().checkCanDropFunction(context, function);
     }
 
     @Override
-    public List<ViewExpression> getColumnMasks(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    public List<ViewExpression> getRowFilters(ConnectorSecurityContext context, SchemaTableName tableName)
     {
-        return delegate().getColumnMasks(context, tableName, columnName, type);
+        return delegate().getRowFilters(context, tableName);
+    }
+
+    @Override
+    public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    {
+        return delegate().getColumnMask(context, tableName, columnName, type);
     }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ForwardingSystemAccessControl.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ForwardingSystemAccessControl.java
index d38129848666..ff281745ae23 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ForwardingSystemAccessControl.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ForwardingSystemAccessControl.java
@@ -18,7 +18,7 @@
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.eventlistener.EventListener;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.SystemAccessControl;
@@ -56,9 +56,9 @@ protected SystemAccessControl delegate()
     protected abstract SystemAccessControl delegate();
 
     @Override
-    public void checkCanImpersonateUser(SystemSecurityContext context, String userName)
+    public void checkCanImpersonateUser(Identity identity, String userName)
     {
-        delegate().checkCanImpersonateUser(context, userName);
+        delegate().checkCanImpersonateUser(identity, userName);
     }
 
     @Override
@@ -68,69 +68,51 @@ public void checkCanSetUser(Optional<Principal> principal, String userName)
     }
 
     @Override
-    public void checkCanReadSystemInformation(SystemSecurityContext context)
+    public void checkCanReadSystemInformation(Identity identity)
     {
-        delegate().checkCanReadSystemInformation(context);
+        delegate().checkCanReadSystemInformation(identity);
     }
 
     @Override
-    public void checkCanWriteSystemInformation(SystemSecurityContext context)
+    public void checkCanWriteSystemInformation(Identity identity)
     {
-        delegate().checkCanWriteSystemInformation(context);
+        delegate().checkCanWriteSystemInformation(identity);
     }
 
     @Override
-    public void checkCanExecuteQuery(SystemSecurityContext context)
+    public void checkCanExecuteQuery(Identity identity)
     {
-        delegate().checkCanExecuteQuery(context);
+        delegate().checkCanExecuteQuery(identity);
     }
 
     @Override
-    public void checkCanViewQueryOwnedBy(SystemSecurityContext context, Identity queryOwner)
+    public void checkCanViewQueryOwnedBy(Identity identity, Identity queryOwner)
     {
-        delegate().checkCanViewQueryOwnedBy(context, queryOwner);
+        delegate().checkCanViewQueryOwnedBy(identity, queryOwner);
     }
 
     @Override
-    public void checkCanViewQueryOwnedBy(SystemSecurityContext context, String queryOwner)
+    public Collection<Identity> filterViewQueryOwnedBy(Identity identity, Collection<Identity> queryOwners)
     {
-        delegate().checkCanViewQueryOwnedBy(context, queryOwner);
+        return delegate().filterViewQueryOwnedBy(identity, queryOwners);
     }
 
     @Override
-    public Collection<Identity> filterViewQueryOwnedBy(SystemSecurityContext context, Collection<Identity> queryOwners)
+    public void checkCanKillQueryOwnedBy(Identity identity, Identity queryOwner)
     {
-        return delegate().filterViewQueryOwnedBy(context, queryOwners);
+        delegate().checkCanKillQueryOwnedBy(identity, queryOwner);
     }
 
     @Override
-    public Set<String> filterViewQueryOwnedBy(SystemSecurityContext context, Set<String> queryOwners)
+    public void checkCanSetSystemSessionProperty(Identity identity, String propertyName)
     {
-        return delegate().filterViewQueryOwnedBy(context, queryOwners);
+        delegate().checkCanSetSystemSessionProperty(identity, propertyName);
     }
 
     @Override
-    public void checkCanKillQueryOwnedBy(SystemSecurityContext context, Identity queryOwner)
+    public boolean canAccessCatalog(SystemSecurityContext context, String catalogName)
     {
-        delegate().checkCanKillQueryOwnedBy(context, queryOwner);
-    }
-
-    @Override
-    public void checkCanKillQueryOwnedBy(SystemSecurityContext context, String queryOwner)
-    {
-        delegate().checkCanKillQueryOwnedBy(context, queryOwner);
-    }
-
-    @Override
-    public void checkCanSetSystemSessionProperty(SystemSecurityContext context, String propertyName)
-    {
-        delegate().checkCanSetSystemSessionProperty(context, propertyName);
-    }
-
-    @Override
-    public void checkCanAccessCatalog(SystemSecurityContext context, String catalogName)
-    {
-        delegate().checkCanAccessCatalog(context, catalogName);
+        return delegate().canAccessCatalog(context, catalogName);
     }
 
     @Override
@@ -265,6 +247,12 @@ public Set<String> filterColumns(SystemSecurityContext context, CatalogSchemaTab
         return delegate().filterColumns(context, tableName, columns);
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(SystemSecurityContext context, String catalogName, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        return delegate().filterColumns(context, catalogName, tableColumns);
+    }
+
     @Override
     public void checkCanAddColumn(SystemSecurityContext context, CatalogSchemaTableName table)
     {
@@ -386,15 +374,15 @@ public void checkCanSetMaterializedViewProperties(SystemSecurityContext context,
     }
 
     @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SystemSecurityContext context, String functionName, TrinoPrincipal grantee, boolean grantOption)
+    public boolean canExecuteFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
     {
-        delegate().checkCanGrantExecuteFunctionPrivilege(context, functionName, grantee, grantOption);
+        return delegate().canExecuteFunction(systemSecurityContext, functionName);
     }
 
     @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SystemSecurityContext context, FunctionKind functionKind, CatalogSchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
+    public boolean canCreateViewWithExecuteFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
     {
-        delegate().checkCanGrantExecuteFunctionPrivilege(context, functionKind, functionName, grantee, grantOption);
+        return delegate().canCreateViewWithExecuteFunction(systemSecurityContext, functionName);
     }
 
     @Override
@@ -469,12 +457,6 @@ public void checkCanRevokeRoles(SystemSecurityContext context, Set<String> roles
         delegate().checkCanRevokeRoles(context, roles, grantees, adminOption, grantor);
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(SystemSecurityContext context)
-    {
-        delegate().checkCanShowRoleAuthorizationDescriptors(context);
-    }
-
     @Override
     public void checkCanShowCurrentRoles(SystemSecurityContext context)
     {
@@ -494,21 +476,33 @@ public void checkCanExecuteProcedure(SystemSecurityContext systemSecurityContext
     }
 
     @Override
-    public void checkCanExecuteFunction(SystemSecurityContext systemSecurityContext, String functionName)
+    public void checkCanExecuteTableProcedure(SystemSecurityContext systemSecurityContext, CatalogSchemaTableName table, String procedure)
     {
-        delegate().checkCanExecuteFunction(systemSecurityContext, functionName);
+        delegate().checkCanExecuteTableProcedure(systemSecurityContext, table, procedure);
     }
 
     @Override
-    public void checkCanExecuteFunction(SystemSecurityContext systemSecurityContext, FunctionKind functionKind, CatalogSchemaRoutineName functionName)
+    public void checkCanShowFunctions(SystemSecurityContext context, CatalogSchemaName schema)
     {
-        delegate().checkCanExecuteFunction(systemSecurityContext, functionKind, functionName);
+        delegate().checkCanShowFunctions(context, schema);
     }
 
     @Override
-    public void checkCanExecuteTableProcedure(SystemSecurityContext systemSecurityContext, CatalogSchemaTableName table, String procedure)
+    public Set<SchemaFunctionName> filterFunctions(SystemSecurityContext context, String catalogName, Set<SchemaFunctionName> functionNames)
     {
-        delegate().checkCanExecuteTableProcedure(systemSecurityContext, table, procedure);
+        return delegate().filterFunctions(context, catalogName, functionNames);
+    }
+
+    @Override
+    public void checkCanCreateFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
+    {
+        delegate().checkCanCreateFunction(systemSecurityContext, functionName);
+    }
+
+    @Override
+    public void checkCanDropFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
+    {
+        delegate().checkCanDropFunction(systemSecurityContext, functionName);
     }
 
     @Override
@@ -528,10 +522,4 @@ public Optional<ViewExpression> getColumnMask(SystemSecurityContext context, Cat
     {
         return delegate().getColumnMask(context, tableName, columnName, type);
     }
-
-    @Override
-    public List<ViewExpression> getColumnMasks(SystemSecurityContext context, CatalogSchemaTableName tableName, String columnName, Type type)
-    {
-        return delegate().getColumnMasks(context, tableName, columnName, type);
-    }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FunctionAccessControlRule.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FunctionAccessControlRule.java
index 1c8933e053e5..0fba97303544 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FunctionAccessControlRule.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FunctionAccessControlRule.java
@@ -20,39 +20,23 @@
 import io.trino.spi.connector.SchemaRoutineName;
 import io.trino.spi.function.FunctionKind;
 
-import java.util.Arrays;
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import static com.google.common.base.Preconditions.checkState;
 import static io.trino.plugin.base.security.FunctionAccessControlRule.FunctionPrivilege.EXECUTE;
 import static io.trino.plugin.base.security.FunctionAccessControlRule.FunctionPrivilege.GRANT_EXECUTE;
-import static io.trino.spi.function.FunctionKind.AGGREGATE;
-import static io.trino.spi.function.FunctionKind.SCALAR;
-import static io.trino.spi.function.FunctionKind.TABLE;
-import static io.trino.spi.function.FunctionKind.WINDOW;
+import static io.trino.plugin.base.security.FunctionAccessControlRule.FunctionPrivilege.OWNERSHIP;
 import static java.util.Objects.requireNonNull;
 
 public class FunctionAccessControlRule
 {
-    public static final FunctionAccessControlRule ALLOW_ALL = new FunctionAccessControlRule(
-            ImmutableSet.copyOf(FunctionPrivilege.values()),
-            Optional.empty(),
-            Optional.empty(),
-            Optional.empty(),
-            Optional.empty(),
-            Optional.empty(),
-            ImmutableSet.copyOf(FunctionKind.values()));
-
     private final Set<FunctionPrivilege> privileges;
     private final Optional<Pattern> userRegex;
     private final Optional<Pattern> roleRegex;
     private final Optional<Pattern> groupRegex;
     private final Optional<Pattern> schemaRegex;
     private final Optional<Pattern> functionRegex;
-    private final Set<FunctionKind> functionKinds;
-    private final boolean globalScopeFunctionKind;
 
     @JsonCreator
     public FunctionAccessControlRule(
@@ -70,26 +54,14 @@ public FunctionAccessControlRule(
         this.groupRegex = requireNonNull(groupRegex, "groupRegex is null");
         this.schemaRegex = requireNonNull(schemaRegex, "schemaRegex is null");
         this.functionRegex = requireNonNull(functionRegex, "functionRegex is null");
-        this.functionKinds = requireNonNull(functionKinds, "functionKinds is null");
-        checkState(!functionKinds.isEmpty(), "functionKinds cannot be empty, provide at least one function kind " + Arrays.toString(FunctionKind.values()));
-        globalScopeFunctionKind = functionKinds.contains(SCALAR) || functionKinds.contains(AGGREGATE) || functionKinds.contains(WINDOW);
-        // TODO when every function is tied to connectors then remove this check
-        checkState(functionKinds.equals(Set.of(TABLE)) || schemaRegex.isEmpty(), "Cannot define schema for others function kinds than TABLE");
-    }
-
-    public boolean matches(String user, Set<String> roles, Set<String> groups, String functionName)
-    {
-        return globalScopeFunctionKind &&
-                userRegex.map(regex -> regex.matcher(user).matches()).orElse(true) &&
-                roleRegex.map(regex -> roles.stream().anyMatch(role -> regex.matcher(role).matches())).orElse(true) &&
-                groupRegex.map(regex -> groups.stream().anyMatch(group -> regex.matcher(group).matches())).orElse(true) &&
-                functionRegex.map(regex -> regex.matcher(functionName).matches()).orElse(true);
+        if (functionKinds != null && !functionKinds.isEmpty()) {
+            throw new IllegalArgumentException("function_kind is no longer supported in security rules");
+        }
     }
 
-    public boolean matches(String user, Set<String> roles, Set<String> groups, FunctionKind functionKind, SchemaRoutineName functionName)
+    public boolean matches(String user, Set<String> roles, Set<String> groups, SchemaRoutineName functionName)
     {
-        return this.functionKinds.contains(functionKind) &&
-                userRegex.map(regex -> regex.matcher(user).matches()).orElse(true) &&
+        return userRegex.map(regex -> regex.matcher(user).matches()).orElse(true) &&
                 roleRegex.map(regex -> roles.stream().anyMatch(role -> regex.matcher(role).matches())).orElse(true) &&
                 groupRegex.map(regex -> groups.stream().anyMatch(group -> regex.matcher(group).matches())).orElse(true) &&
                 schemaRegex.map(regex -> regex.matcher(functionName.getSchemaName()).matches()).orElse(true) &&
@@ -106,11 +78,14 @@ public boolean canGrantExecuteFunction()
         return privileges.contains(GRANT_EXECUTE);
     }
 
+    public boolean hasOwnership()
+    {
+        return privileges.contains(OWNERSHIP);
+    }
+
     Optional<AnySchemaPermissionsRule> toAnySchemaPermissionsRule()
     {
-        if (privileges.isEmpty() ||
-                // TODO when every function is tied to connectors then remove this check
-                !functionKinds.contains(TABLE)) {
+        if (privileges.isEmpty()) {
             return Optional.empty();
         }
         return Optional.of(new AnySchemaPermissionsRule(userRegex, roleRegex, groupRegex, schemaRegex));
@@ -141,13 +116,8 @@ Optional<Pattern> getSchemaRegex()
         return schemaRegex;
     }
 
-    Set<FunctionKind> getFunctionKinds()
-    {
-        return functionKinds;
-    }
-
     public enum FunctionPrivilege
     {
-        EXECUTE, GRANT_EXECUTE
+        EXECUTE, GRANT_EXECUTE, OWNERSHIP
     }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ProcedureAccessControlRule.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ProcedureAccessControlRule.java
new file mode 100644
index 000000000000..95ca28fa93d5
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ProcedureAccessControlRule.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed 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 io.trino.plugin.base.security;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableSet;
+import io.trino.spi.connector.SchemaRoutineName;
+
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import static io.trino.plugin.base.security.ProcedureAccessControlRule.ProcedurePrivilege.EXECUTE;
+import static io.trino.plugin.base.security.ProcedureAccessControlRule.ProcedurePrivilege.GRANT_EXECUTE;
+import static java.util.Objects.requireNonNull;
+
+public class ProcedureAccessControlRule
+{
+    private final Set<ProcedurePrivilege> privileges;
+    private final Optional<Pattern> userRegex;
+    private final Optional<Pattern> roleRegex;
+    private final Optional<Pattern> groupRegex;
+    private final Optional<Pattern> schemaRegex;
+    private final Optional<Pattern> procedureRegex;
+
+    @JsonCreator
+    public ProcedureAccessControlRule(
+            @JsonProperty("privileges") Set<ProcedurePrivilege> privileges,
+            @JsonProperty("user") Optional<Pattern> userRegex,
+            @JsonProperty("role") Optional<Pattern> roleRegex,
+            @JsonProperty("group") Optional<Pattern> groupRegex,
+            @JsonProperty("schema") Optional<Pattern> schemaRegex,
+            @JsonProperty("procedure") Optional<Pattern> procedureRegex)
+    {
+        this.privileges = ImmutableSet.copyOf(requireNonNull(privileges, "privileges is null"));
+        this.userRegex = requireNonNull(userRegex, "userRegex is null");
+        this.roleRegex = requireNonNull(roleRegex, "roleRegex is null");
+        this.groupRegex = requireNonNull(groupRegex, "groupRegex is null");
+        this.schemaRegex = requireNonNull(schemaRegex, "schemaRegex is null");
+        this.procedureRegex = requireNonNull(procedureRegex, "procedureRegex is null");
+    }
+
+    public boolean matches(String user, Set<String> roles, Set<String> groups, SchemaRoutineName procedureName)
+    {
+        return userRegex.map(regex -> regex.matcher(user).matches()).orElse(true) &&
+                roleRegex.map(regex -> roles.stream().anyMatch(role -> regex.matcher(role).matches())).orElse(true) &&
+                groupRegex.map(regex -> groups.stream().anyMatch(group -> regex.matcher(group).matches())).orElse(true) &&
+                schemaRegex.map(regex -> regex.matcher(procedureName.getSchemaName()).matches()).orElse(true) &&
+                procedureRegex.map(regex -> regex.matcher(procedureName.getRoutineName()).matches()).orElse(true);
+    }
+
+    public boolean canExecuteProcedure()
+    {
+        return privileges.contains(EXECUTE) || canGrantExecuteProcedure();
+    }
+
+    public boolean canGrantExecuteProcedure()
+    {
+        return privileges.contains(GRANT_EXECUTE);
+    }
+
+    Optional<AnySchemaPermissionsRule> toAnySchemaPermissionsRule()
+    {
+        if (privileges.isEmpty()) {
+            return Optional.empty();
+        }
+        return Optional.of(new AnySchemaPermissionsRule(userRegex, roleRegex, groupRegex, schemaRegex));
+    }
+
+    Set<ProcedurePrivilege> getPrivileges()
+    {
+        return privileges;
+    }
+
+    Optional<Pattern> getUserRegex()
+    {
+        return userRegex;
+    }
+
+    Optional<Pattern> getRoleRegex()
+    {
+        return roleRegex;
+    }
+
+    Optional<Pattern> getGroupRegex()
+    {
+        return groupRegex;
+    }
+
+    Optional<Pattern> getSchemaRegex()
+    {
+        return schemaRegex;
+    }
+
+    public enum ProcedurePrivilege
+    {
+        EXECUTE, GRANT_EXECUTE
+    }
+}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ReadOnlyAccessControl.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ReadOnlyAccessControl.java
index 60a1de000a65..0d506c962678 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ReadOnlyAccessControl.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ReadOnlyAccessControl.java
@@ -16,6 +16,7 @@
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.TrinoPrincipal;
 
@@ -148,6 +149,12 @@ public Set<String> filterColumns(ConnectorSecurityContext context, SchemaTableNa
         return columns;
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(ConnectorSecurityContext context, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        return tableColumns;
+    }
+
     @Override
     public void checkCanRenameColumn(ConnectorSecurityContext context, SchemaTableName tableName)
     {
@@ -251,26 +258,32 @@ public void checkCanRevokeTablePrivilege(ConnectorSecurityContext context, Privi
     }
 
     @Override
-    public void checkCanShowRoleAuthorizationDescriptors(ConnectorSecurityContext context)
+    public void checkCanShowRoles(ConnectorSecurityContext context)
     {
         // allow
     }
 
     @Override
-    public void checkCanShowRoles(ConnectorSecurityContext context)
+    public void checkCanShowCurrentRoles(ConnectorSecurityContext context)
     {
         // allow
     }
 
     @Override
-    public void checkCanShowCurrentRoles(ConnectorSecurityContext context)
+    public void checkCanShowRoleGrants(ConnectorSecurityContext context)
     {
         // allow
     }
 
     @Override
-    public void checkCanShowRoleGrants(ConnectorSecurityContext context)
+    public void checkCanShowFunctions(ConnectorSecurityContext context, String schemaName)
     {
         // allow
     }
+
+    @Override
+    public Set<SchemaFunctionName> filterFunctions(ConnectorSecurityContext context, Set<SchemaFunctionName> functionNames)
+    {
+        return functionNames;
+    }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ReadOnlySystemAccessControl.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ReadOnlySystemAccessControl.java
index a15d1737300a..3fac67bfc1e9 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ReadOnlySystemAccessControl.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/ReadOnlySystemAccessControl.java
@@ -17,21 +17,19 @@
 import io.trino.spi.connector.CatalogSchemaRoutineName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
+import io.trino.spi.security.Identity;
 import io.trino.spi.security.SystemAccessControl;
 import io.trino.spi.security.SystemAccessControlFactory;
 import io.trino.spi.security.SystemSecurityContext;
-import io.trino.spi.security.TrinoPrincipal;
 
 import java.security.Principal;
+import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.spi.security.AccessDeniedException.denyGrantExecuteFunctionPrivilege;
-import static java.lang.String.format;
-import static java.util.Locale.ENGLISH;
 
 public class ReadOnlySystemAccessControl
         implements SystemAccessControl
@@ -63,34 +61,35 @@ public void checkCanSetUser(Optional<Principal> principal, String userName)
     }
 
     @Override
-    public void checkCanExecuteQuery(SystemSecurityContext context)
+    public void checkCanExecuteQuery(Identity identity)
     {
     }
 
     @Override
-    public void checkCanViewQueryOwnedBy(SystemSecurityContext context, String queryOwner)
+    public void checkCanViewQueryOwnedBy(Identity identity, Identity queryOwner)
     {
     }
 
     @Override
-    public Set<String> filterViewQueryOwnedBy(SystemSecurityContext context, Set<String> queryOwners)
+    public Collection<Identity> filterViewQueryOwnedBy(Identity identity, Collection<Identity> queryOwners)
     {
         return queryOwners;
     }
 
     @Override
-    public void checkCanSetSystemSessionProperty(SystemSecurityContext context, String propertyName)
+    public void checkCanSetSystemSessionProperty(Identity identity, String propertyName)
     {
     }
 
     @Override
-    public void checkCanAccessCatalog(SystemSecurityContext context, String catalogName)
+    public void checkCanSelectFromColumns(SystemSecurityContext context, CatalogSchemaTableName table, Set<String> columns)
     {
     }
 
     @Override
-    public void checkCanSelectFromColumns(SystemSecurityContext context, CatalogSchemaTableName table, Set<String> columns)
+    public boolean canAccessCatalog(SystemSecurityContext context, String catalogName)
     {
+        return true;
     }
 
     @Override
@@ -103,25 +102,6 @@ public void checkCanCreateViewWithSelectFromColumns(SystemSecurityContext contex
     {
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SystemSecurityContext context, String functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-    }
-
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(SystemSecurityContext context, FunctionKind functionKind, CatalogSchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-        switch (functionKind) {
-            case SCALAR, AGGREGATE, WINDOW:
-                return;
-            case TABLE:
-                // May not be read-only, so deny
-                String granteeAsString = format("%s '%s'", grantee.getType().name().toLowerCase(ENGLISH), grantee.getName());
-                denyGrantExecuteFunctionPrivilege(functionName.toString(), context.getIdentity(), granteeAsString);
-        }
-        throw new UnsupportedOperationException("Unsupported function kind: " + functionKind);
-    }
-
     @Override
     public Set<String> filterCatalogs(SystemSecurityContext context, Set<String> catalogs)
     {
@@ -151,6 +131,12 @@ public Set<String> filterColumns(SystemSecurityContext context, CatalogSchemaTab
         return columns;
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(SystemSecurityContext context, String catalogName, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        return tableColumns;
+    }
+
     @Override
     public void checkCanShowSchemas(SystemSecurityContext context, String catalogName)
     {
@@ -167,17 +153,35 @@ public void checkCanShowRoles(SystemSecurityContext context)
     }
 
     @Override
-    public void checkCanShowRoleAuthorizationDescriptors(SystemSecurityContext context)
+    public void checkCanShowCurrentRoles(SystemSecurityContext context)
     {
     }
 
     @Override
-    public void checkCanShowCurrentRoles(SystemSecurityContext context)
+    public boolean canExecuteFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
+    {
+        return isSystemBuiltinSchema(functionName);
+    }
+
+    @Override
+    public boolean canCreateViewWithExecuteFunction(SystemSecurityContext systemSecurityContext, CatalogSchemaRoutineName functionName)
+    {
+        return isSystemBuiltinSchema(functionName);
+    }
+
+    private static boolean isSystemBuiltinSchema(CatalogSchemaRoutineName functionName)
+    {
+        return functionName.getCatalogName().equals("system") && functionName.getSchemaName().equals("builtin");
+    }
+
+    @Override
+    public void checkCanShowFunctions(SystemSecurityContext context, CatalogSchemaName schema)
     {
     }
 
     @Override
-    public void checkCanExecuteFunction(SystemSecurityContext systemSecurityContext, String functionName)
+    public Set<SchemaFunctionName> filterFunctions(SystemSecurityContext context, String catalogName, Set<SchemaFunctionName> functionNames)
     {
+        return functionNames;
     }
 }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/TableAccessControlRule.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/TableAccessControlRule.java
index 13e6b5536e58..b94ba4c572f6 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/TableAccessControlRule.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/TableAccessControlRule.java
@@ -105,20 +105,21 @@ public boolean canSelectColumns(Set<String> columnNames)
     public Optional<ViewExpression> getColumnMask(String catalog, String schema, String column)
     {
         return Optional.ofNullable(columnConstraints.get(column)).flatMap(constraint ->
-                constraint.getMask().map(mask -> new ViewExpression(
-                        constraint.getMaskEnvironment().flatMap(ExpressionEnvironment::getUser),
-                        Optional.of(catalog),
-                        Optional.of(schema),
-                        mask)));
+                constraint.getMask().map(mask -> ViewExpression.builder()
+                        .identity(constraint.getMaskEnvironment().flatMap(ExpressionEnvironment::getUser).orElse(null))
+                        .catalog(catalog)
+                        .schema(schema)
+                        .expression(mask).build()));
     }
 
     public Optional<ViewExpression> getFilter(String catalog, String schema)
     {
-        return filter.map(filter -> new ViewExpression(
-                filterEnvironment.flatMap(ExpressionEnvironment::getUser),
-                Optional.of(catalog),
-                Optional.of(schema),
-                filter));
+        return filter.map(filter -> ViewExpression.builder()
+                .identity(filterEnvironment.flatMap(ExpressionEnvironment::getUser).orElse(null))
+                .catalog(catalog)
+                .schema(schema)
+                .expression(filter)
+                .build());
     }
 
     Optional<AnySchemaPermissionsRule> toAnySchemaPermissionsRule()
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/session/PropertyMetadataUtil.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/session/PropertyMetadataUtil.java
index 2f139416421e..412e3020b823 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/session/PropertyMetadataUtil.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/session/PropertyMetadataUtil.java
@@ -15,10 +15,12 @@
 
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.trino.spi.TrinoException;
 import io.trino.spi.session.PropertyMetadata;
 
 import java.util.function.Consumer;
 
+import static io.trino.spi.StandardErrorCode.INVALID_SESSION_PROPERTY;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public final class PropertyMetadataUtil
@@ -47,6 +49,20 @@ public static PropertyMetadata<DataSize> dataSizeProperty(String name, String de
                 DataSize::toString);
     }
 
+    public static void validateMinDataSize(String name, DataSize value, DataSize min)
+    {
+        if (value.compareTo(min) < 0) {
+            throw new TrinoException(INVALID_SESSION_PROPERTY, "%s must be at least %s: %s".formatted(name, min, value));
+        }
+    }
+
+    public static void validateMaxDataSize(String name, DataSize value, DataSize max)
+    {
+        if (value.compareTo(max) > 0) {
+            throw new TrinoException(INVALID_SESSION_PROPERTY, "%s must be at most %s: %s".formatted(name, max, value));
+        }
+    }
+
     public static PropertyMetadata<Duration> durationProperty(String name, String description, Duration defaultValue, boolean hidden)
     {
         return durationProperty(name, description, defaultValue, value -> {}, hidden);
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/Functions.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/Functions.java
new file mode 100644
index 000000000000..c0c44cb65e85
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/Functions.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.plugin.base.util;
+
+import com.google.errorprone.annotations.FormatMethod;
+import io.trino.spi.TrinoException;
+
+import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
+import static java.lang.String.format;
+
+public final class Functions
+{
+    private Functions() {}
+
+    @FormatMethod
+    public static void checkFunctionArgument(boolean condition, String message, Object... args)
+    {
+        if (!condition) {
+            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format(message, args));
+        }
+    }
+}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/JsonTypeUtil.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/JsonTypeUtil.java
index 92286a81b098..46150e5975df 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/JsonTypeUtil.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/JsonTypeUtil.java
@@ -14,7 +14,6 @@
 package io.trino.plugin.base.util;
 
 import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.airlift.json.ObjectMapperProvider;
@@ -31,13 +30,14 @@
 import static com.fasterxml.jackson.core.JsonFactory.Feature.CANONICALIZE_FIELD_NAMES;
 import static com.fasterxml.jackson.databind.SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS;
 import static com.google.common.base.Preconditions.checkState;
+import static io.trino.plugin.base.util.JsonUtils.jsonFactoryBuilder;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 public final class JsonTypeUtil
 {
-    private static final JsonFactory JSON_FACTORY = new JsonFactoryBuilder().disable(CANONICALIZE_FIELD_NAMES).build();
+    private static final JsonFactory JSON_FACTORY = jsonFactoryBuilder().disable(CANONICALIZE_FIELD_NAMES).build();
     private static final ObjectMapper SORTED_MAPPER = new ObjectMapperProvider().get().configure(ORDER_MAP_ENTRIES_BY_KEYS, true);
 
     private JsonTypeUtil() {}
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/JsonUtils.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/JsonUtils.java
index 41696f5f6b83..e5e2fb40a36d 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/JsonUtils.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/JsonUtils.java
@@ -13,13 +13,17 @@
  */
 package io.trino.plugin.base.util;
 
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.airlift.json.ObjectMapperProvider;
+import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -144,6 +148,24 @@ private static <T> T parseJson(JsonNode node, String jsonPointer, Class<T> javaT
         return jsonTreeToValue(mappingsNode, javaType);
     }
 
+    public static JsonFactory jsonFactory()
+    {
+        return jsonFactoryBuilder().build();
+    }
+
+    @SuppressModernizer
+    // JsonFactoryBuilder usage is intentional as we need to disable read constraints
+    // due to the limits introduced by Jackson 2.15
+    public static JsonFactoryBuilder jsonFactoryBuilder()
+    {
+        return new JsonFactoryBuilder()
+                .streamReadConstraints(StreamReadConstraints.builder()
+                        .maxStringLength(Integer.MAX_VALUE)
+                        .maxNestingDepth(Integer.MAX_VALUE)
+                        .maxNumberLength(Integer.MAX_VALUE)
+                        .build());
+    }
+
     private interface ParserConstructor<I>
     {
         JsonParser createParser(ObjectMapper mapper, I input)
diff --git a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/classloader/TestClassLoaderSafeWrappers.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/classloader/TestClassLoaderSafeWrappers.java
index b559881f4ec1..55646e93a8b1 100644
--- a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/classloader/TestClassLoaderSafeWrappers.java
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/classloader/TestClassLoaderSafeWrappers.java
@@ -26,7 +26,7 @@
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.eventlistener.EventListener;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import org.testng.annotations.Test;
 
 import java.lang.reflect.Method;
diff --git a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/ldap/TestLdapConfig.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/ldap/TestLdapConfig.java
index eb799d29d155..89874bae7b1c 100644
--- a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/ldap/TestLdapConfig.java
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/ldap/TestLdapConfig.java
@@ -16,12 +16,11 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import org.testng.annotations.Test;
 
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -105,6 +104,6 @@ public void testValidation()
         assertFailsValidation(new LdapClientConfig().setLdapUrl("localhost"), "ldapUrl", "Invalid LDAP server URL. Expected ldap:// or ldaps://", Pattern.class);
         assertFailsValidation(new LdapClientConfig().setLdapUrl("ldaps:/localhost"), "ldapUrl", "Invalid LDAP server URL. Expected ldap:// or ldaps://", Pattern.class);
 
-        assertFailsValidation(new LdapClientConfig(), "ldapUrl", "may not be null", NotNull.class);
+        assertFailsValidation(new LdapClientConfig(), "ldapUrl", "must not be null", NotNull.class);
     }
 }
diff --git a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/logging/TestFormatInterpolator.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/logging/TestFormatInterpolator.java
new file mode 100644
index 000000000000..561777bbbde4
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/logging/TestFormatInterpolator.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed 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 io.trino.plugin.base.logging;
+
+import org.testng.annotations.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+public class TestFormatInterpolator
+{
+    @Test
+    public void testNullInterpolation()
+    {
+        FormatInterpolator<String> interpolator = new FormatInterpolator<>(null, SingleTestValue.values());
+        assertThat(interpolator.interpolate("!")).isEqualTo("");
+    }
+
+    @Test
+    public void testSingleValueInterpolation()
+    {
+        FormatInterpolator<String> interpolator = new FormatInterpolator<>("TEST_VALUE is $TEST_VALUE", SingleTestValue.values());
+        assertThat(interpolator.interpolate("!")).isEqualTo("TEST_VALUE is singleValue!");
+    }
+
+    @Test
+    public void testMultipleValueInterpolation()
+    {
+        FormatInterpolator<String> interpolator = new FormatInterpolator<>("TEST_VALUE is $TEST_VALUE and ANOTHER_VALUE is $ANOTHER_VALUE", MultipleTestValues.values());
+        assertThat(interpolator.interpolate("!")).isEqualTo("TEST_VALUE is first! and ANOTHER_VALUE is second!");
+    }
+
+    @Test
+    public void testUnknownValueInterpolation()
+    {
+        FormatInterpolator<String> interpolator = new FormatInterpolator<>("UNKNOWN_VALUE is $UNKNOWN_VALUE", MultipleTestValues.values());
+        assertThat(interpolator.interpolate("!")).isEqualTo("UNKNOWN_VALUE is $UNKNOWN_VALUE");
+    }
+
+    @Test
+    public void testValidation()
+    {
+        assertFalse(FormatInterpolator.hasValidPlaceholders("$UNKNOWN_VALUE", MultipleTestValues.values()));
+        assertTrue(FormatInterpolator.hasValidPlaceholders("$TEST_VALUE", MultipleTestValues.values()));
+        assertFalse(FormatInterpolator.hasValidPlaceholders("$TEST_VALUE and $UNKNOWN_VALUE", MultipleTestValues.values()));
+        assertTrue(FormatInterpolator.hasValidPlaceholders("$TEST_VALUE and $ANOTHER_VALUE", MultipleTestValues.values()));
+        assertTrue(FormatInterpolator.hasValidPlaceholders("$TEST_VALUE and $TEST_VALUE", MultipleTestValues.values()));
+    }
+
+    public enum SingleTestValue
+            implements FormatInterpolator.InterpolatedValue<String>
+    {
+        TEST_VALUE;
+
+        @Override
+        public String value(String value)
+        {
+            return "singleValue" + value;
+        }
+    }
+
+    public enum MultipleTestValues
+            implements FormatInterpolator.InterpolatedValue<String>
+    {
+        TEST_VALUE("first"),
+        ANOTHER_VALUE("second");
+
+        private final String value;
+
+        MultipleTestValues(String value)
+        {
+            this.value = value;
+        }
+
+        @Override
+        public String value(String value)
+        {
+            return this.value + value;
+        }
+    }
+}
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/mapping/RuleBasedIdentifierMappingUtils.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/mapping/RuleBasedIdentifierMappingUtils.java
similarity index 98%
rename from plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/mapping/RuleBasedIdentifierMappingUtils.java
rename to lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/mapping/RuleBasedIdentifierMappingUtils.java
index 71394e74efaa..4a1c63af75ff 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/mapping/RuleBasedIdentifierMappingUtils.java
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/mapping/RuleBasedIdentifierMappingUtils.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.jdbc.mapping;
+package io.trino.plugin.base.mapping;
 
 import com.google.common.collect.ImmutableList;
 import io.airlift.units.Duration;
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/mapping/TestForwardingIdentifierMapping.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/mapping/TestForwardingIdentifierMapping.java
similarity index 96%
rename from plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/mapping/TestForwardingIdentifierMapping.java
rename to lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/mapping/TestForwardingIdentifierMapping.java
index 4dcc347afa13..cd264d7ee1d5 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/mapping/TestForwardingIdentifierMapping.java
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/mapping/TestForwardingIdentifierMapping.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.jdbc.mapping;
+package io.trino.plugin.base.mapping;
 
 import org.testng.annotations.Test;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/mapping/TestIdentifierMappingRules.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/mapping/TestIdentifierMappingRules.java
similarity index 98%
rename from plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/mapping/TestIdentifierMappingRules.java
rename to lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/mapping/TestIdentifierMappingRules.java
index b616ad6a3073..56b4ea1fec08 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/mapping/TestIdentifierMappingRules.java
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/mapping/TestIdentifierMappingRules.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.jdbc.mapping;
+package io.trino.plugin.base.mapping;
 
 import com.google.common.collect.ImmutableList;
 import io.airlift.json.JsonCodec;
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/mapping/TestMappingConfig.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/mapping/TestMappingConfig.java
similarity index 96%
rename from plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/mapping/TestMappingConfig.java
rename to lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/mapping/TestMappingConfig.java
index b2917520fb7e..d737012a5490 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/mapping/TestMappingConfig.java
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/mapping/TestMappingConfig.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.jdbc.mapping;
+package io.trino.plugin.base.mapping;
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
@@ -22,7 +22,7 @@
 import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
 import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
 import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
diff --git a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/metrics/TestMetrics.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/metrics/TestMetrics.java
index 0f771e84fc33..9237577d6e8f 100644
--- a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/metrics/TestMetrics.java
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/metrics/TestMetrics.java
@@ -59,7 +59,7 @@ public void testMergeHistogram()
         assertThat(merged.getPercentile(0)).isEqualTo(5.0);
         assertThat(merged.getPercentile(100)).isEqualTo(10.0);
         assertThat(merged.toString())
-                .matches("\\{count=3\\.00, p01=5\\.00, p05=5\\.00, p10=5\\.00, p25=5\\.00, p50=7\\.50, p75=10\\.00, p90=10\\.00, p95=10\\.00, p99=10\\.00, min=5\\.00, max=10\\.00\\}");
+                .matches("\\{count=3, p01=5\\.00, p05=5\\.00, p10=5\\.00, p25=5\\.00, p50=7\\.50, p75=10\\.00, p90=10\\.00, p95=10\\.00, p99=10\\.00, min=5\\.00, max=10\\.00\\}");
     }
 
     @Test
diff --git a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/projection/TestApplyProjectionUtil.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/projection/TestApplyProjectionUtil.java
new file mode 100644
index 000000000000..a5a924355210
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/projection/TestApplyProjectionUtil.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed 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 io.trino.plugin.base.projection;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Constant;
+import io.trino.spi.expression.FieldDereference;
+import io.trino.spi.expression.Variable;
+import io.trino.spi.type.RowType;
+import org.testng.annotations.Test;
+
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.extractSupportedProjectedColumns;
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.isPushdownSupported;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RowType.field;
+import static io.trino.spi.type.RowType.rowType;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+public class TestApplyProjectionUtil
+{
+    private static final ConnectorExpression ROW_OF_ROW_VARIABLE = new Variable("a", rowType(field("b", rowType(field("c", INTEGER)))));
+    private static final ConnectorExpression LEAF_DOTTED_ROW_OF_ROW_VARIABLE = new Variable("a", rowType(field("b", rowType(field("c.x", INTEGER)))));
+    private static final ConnectorExpression MID_DOTTED_ROW_OF_ROW_VARIABLE = new Variable("a", rowType(field("b.x", rowType(field("c", INTEGER)))));
+
+    private static final ConnectorExpression ONE_LEVEL_DEREFERENCE = new FieldDereference(
+            rowType(field("c", INTEGER)),
+            ROW_OF_ROW_VARIABLE,
+            0);
+
+    private static final ConnectorExpression TWO_LEVEL_DEREFERENCE = new FieldDereference(
+            INTEGER,
+            ONE_LEVEL_DEREFERENCE,
+            0);
+
+    private static final ConnectorExpression LEAF_DOTTED_ONE_LEVEL_DEREFERENCE = new FieldDereference(
+            rowType(field("c.x", INTEGER)),
+            LEAF_DOTTED_ROW_OF_ROW_VARIABLE,
+            0);
+
+    private static final ConnectorExpression LEAF_DOTTED_TWO_LEVEL_DEREFERENCE = new FieldDereference(
+            INTEGER,
+            LEAF_DOTTED_ONE_LEVEL_DEREFERENCE,
+            0);
+
+    private static final ConnectorExpression MID_DOTTED_ONE_LEVEL_DEREFERENCE = new FieldDereference(
+            rowType(field("c.x", INTEGER)),
+            MID_DOTTED_ROW_OF_ROW_VARIABLE,
+            0);
+
+    private static final ConnectorExpression MID_DOTTED_TWO_LEVEL_DEREFERENCE = new FieldDereference(
+            INTEGER,
+            MID_DOTTED_ONE_LEVEL_DEREFERENCE,
+            0);
+
+    private static final ConnectorExpression INT_VARIABLE = new Variable("a", INTEGER);
+    private static final ConnectorExpression CONSTANT = new Constant(5, INTEGER);
+
+    @Test
+    public void testIsProjectionSupported()
+    {
+        assertTrue(isPushdownSupported(ONE_LEVEL_DEREFERENCE, connectorExpression -> true));
+        assertTrue(isPushdownSupported(TWO_LEVEL_DEREFERENCE, connectorExpression -> true));
+        assertTrue(isPushdownSupported(INT_VARIABLE, connectorExpression -> true));
+        assertFalse(isPushdownSupported(CONSTANT, connectorExpression -> true));
+
+        assertFalse(isPushdownSupported(ONE_LEVEL_DEREFERENCE, connectorExpression -> false));
+        assertFalse(isPushdownSupported(TWO_LEVEL_DEREFERENCE, connectorExpression -> false));
+        assertFalse(isPushdownSupported(INT_VARIABLE, connectorExpression -> false));
+        assertFalse(isPushdownSupported(CONSTANT, connectorExpression -> false));
+
+        assertTrue(isPushdownSupported(LEAF_DOTTED_ONE_LEVEL_DEREFERENCE, this::isSupportedForPushDown));
+        assertFalse(isPushdownSupported(LEAF_DOTTED_TWO_LEVEL_DEREFERENCE, this::isSupportedForPushDown));
+        assertFalse(isPushdownSupported(MID_DOTTED_ONE_LEVEL_DEREFERENCE, this::isSupportedForPushDown));
+        assertFalse(isPushdownSupported(MID_DOTTED_TWO_LEVEL_DEREFERENCE, this::isSupportedForPushDown));
+    }
+
+    @Test
+    public void testExtractSupportedProjectionColumns()
+    {
+        assertEquals(extractSupportedProjectedColumns(ONE_LEVEL_DEREFERENCE), ImmutableList.of(ONE_LEVEL_DEREFERENCE));
+        assertEquals(extractSupportedProjectedColumns(TWO_LEVEL_DEREFERENCE), ImmutableList.of(TWO_LEVEL_DEREFERENCE));
+        assertEquals(extractSupportedProjectedColumns(INT_VARIABLE), ImmutableList.of(INT_VARIABLE));
+        assertEquals(extractSupportedProjectedColumns(CONSTANT), ImmutableList.of());
+
+        assertEquals(extractSupportedProjectedColumns(ONE_LEVEL_DEREFERENCE, connectorExpression -> false), ImmutableList.of());
+        assertEquals(extractSupportedProjectedColumns(TWO_LEVEL_DEREFERENCE, connectorExpression -> false), ImmutableList.of());
+        assertEquals(extractSupportedProjectedColumns(INT_VARIABLE, connectorExpression -> false), ImmutableList.of());
+        assertEquals(extractSupportedProjectedColumns(CONSTANT, connectorExpression -> false), ImmutableList.of());
+
+        // Partial supported projection
+        assertEquals(extractSupportedProjectedColumns(LEAF_DOTTED_ONE_LEVEL_DEREFERENCE, this::isSupportedForPushDown), ImmutableList.of(LEAF_DOTTED_ONE_LEVEL_DEREFERENCE));
+        assertEquals(extractSupportedProjectedColumns(LEAF_DOTTED_TWO_LEVEL_DEREFERENCE, this::isSupportedForPushDown), ImmutableList.of(LEAF_DOTTED_ONE_LEVEL_DEREFERENCE));
+        assertEquals(extractSupportedProjectedColumns(MID_DOTTED_ONE_LEVEL_DEREFERENCE, this::isSupportedForPushDown), ImmutableList.of(MID_DOTTED_ROW_OF_ROW_VARIABLE));
+        assertEquals(extractSupportedProjectedColumns(MID_DOTTED_TWO_LEVEL_DEREFERENCE, this::isSupportedForPushDown), ImmutableList.of(MID_DOTTED_ROW_OF_ROW_VARIABLE));
+    }
+
+    /**
+     * This method is used to simulate the behavior when the field passed in the connectorExpression might not supported for pushdown.
+     */
+    private boolean isSupportedForPushDown(ConnectorExpression connectorExpression)
+    {
+        if (connectorExpression instanceof FieldDereference fieldDereference) {
+            RowType rowType = (RowType) fieldDereference.getTarget().getType();
+            RowType.Field field = rowType.getFields().get(fieldDereference.getField());
+            String fieldName = field.getName().get();
+            if (fieldName.contains(".") || fieldName.contains("$")) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/BaseFileBasedConnectorAccessControlTest.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/BaseFileBasedConnectorAccessControlTest.java
index 9b5a568beb5b..abf4b0b8fa42 100644
--- a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/BaseFileBasedConnectorAccessControlTest.java
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/BaseFileBasedConnectorAccessControlTest.java
@@ -25,9 +25,9 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.SchemaRoutineName;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.ConnectorIdentity;
-import io.trino.spi.security.PrincipalType;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.security.ViewExpression;
@@ -44,15 +44,14 @@
 import java.util.stream.Stream;
 
 import static com.google.common.io.Files.copy;
-import static io.trino.spi.function.FunctionKind.AGGREGATE;
-import static io.trino.spi.function.FunctionKind.SCALAR;
-import static io.trino.spi.function.FunctionKind.TABLE;
-import static io.trino.spi.function.FunctionKind.WINDOW;
+import static io.trino.spi.security.PrincipalType.ROLE;
+import static io.trino.spi.security.PrincipalType.USER;
 import static io.trino.spi.security.Privilege.UPDATE;
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.Thread.sleep;
 import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.util.Files.newTemporaryFile;
 import static org.testng.Assert.assertEquals;
@@ -76,7 +75,7 @@ public void testEmptyFile()
         accessControl.checkCanCreateSchema(UNKNOWN, "unknown", ImmutableMap.of());
         accessControl.checkCanDropSchema(UNKNOWN, "unknown");
         accessControl.checkCanRenameSchema(UNKNOWN, "unknown", "new_unknown");
-        accessControl.checkCanSetSchemaAuthorization(UNKNOWN, "unknown", new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(UNKNOWN, "unknown", new TrinoPrincipal(ROLE, "some_role")));
         accessControl.checkCanShowCreateSchema(UNKNOWN, "unknown");
 
         accessControl.checkCanSelectFromColumns(UNKNOWN, new SchemaTableName("unknown", "unknown"), ImmutableSet.of());
@@ -101,7 +100,7 @@ public void testEmptyFile()
         assertEquals(accessControl.filterTables(UNKNOWN, tables), tables);
 
         // permissions management APIs are hard coded to deny
-        TrinoPrincipal someUser = new TrinoPrincipal(PrincipalType.USER, "some_user");
+        TrinoPrincipal someUser = new TrinoPrincipal(USER, "some_user");
         assertDenied(() -> accessControl.checkCanGrantTablePrivilege(ADMIN, Privilege.SELECT, new SchemaTableName("any", "any"), someUser, false));
         assertDenied(() -> accessControl.checkCanDenyTablePrivilege(ADMIN, Privilege.SELECT, new SchemaTableName("any", "any"), someUser));
         assertDenied(() -> accessControl.checkCanRevokeTablePrivilege(ADMIN, Privilege.SELECT, new SchemaTableName("any", "any"), someUser, false));
@@ -122,31 +121,11 @@ public void testEmptyFile()
         assertDenied(() -> accessControl.checkCanSetRole(ADMIN, "role"));
 
         // showing roles and permissions is hard coded to allow
-        accessControl.checkCanShowRoleAuthorizationDescriptors(UNKNOWN);
         accessControl.checkCanShowRoles(UNKNOWN);
         accessControl.checkCanShowCurrentRoles(UNKNOWN);
         accessControl.checkCanShowRoleGrants(UNKNOWN);
     }
 
-    @Test
-    public void testEmptyFunctionKind()
-    {
-        assertThatThrownBy(() -> createAccessControl("empty-functions-kind.json"))
-                .hasRootCauseInstanceOf(IllegalStateException.class)
-                .hasRootCauseMessage("functionKinds cannot be empty, provide at least one function kind [SCALAR, AGGREGATE, WINDOW, TABLE]");
-    }
-
-    @Test
-    public void testDisallowFunctionKindRuleCombination()
-    {
-        assertThatThrownBy(() -> createAccessControl("disallow-function-rule-combination.json"))
-                .hasRootCauseInstanceOf(IllegalStateException.class)
-                .hasRootCauseMessage("Cannot define schema for others function kinds than TABLE");
-        assertThatThrownBy(() -> createAccessControl("disallow-function-rule-combination-without-table.json"))
-                .hasRootCauseInstanceOf(IllegalStateException.class)
-                .hasRootCauseMessage("Cannot define schema for others function kinds than TABLE");
-    }
-
     @Test
     public void testSchemaRules()
     {
@@ -199,12 +178,12 @@ public void testSchemaRules()
         accessControl.checkCanRenameSchema(CHARLIE, "authenticated", "authenticated");
         assertDenied(() -> accessControl.checkCanRenameSchema(CHARLIE, "test", "new_schema"));
 
-        accessControl.checkCanSetSchemaAuthorization(ADMIN, "test", new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
-        accessControl.checkCanSetSchemaAuthorization(ADMIN, "test", new TrinoPrincipal(PrincipalType.USER, "some_user"));
-        accessControl.checkCanSetSchemaAuthorization(BOB, "bob", new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
-        accessControl.checkCanSetSchemaAuthorization(BOB, "bob", new TrinoPrincipal(PrincipalType.USER, "some_user"));
-        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(BOB, "test", new TrinoPrincipal(PrincipalType.ROLE, "some_role")));
-        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(BOB, "test", new TrinoPrincipal(PrincipalType.USER, "some_user")));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(ADMIN, "test", new TrinoPrincipal(ROLE, "some_role")));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(ADMIN, "test", new TrinoPrincipal(USER, "some_user")));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(BOB, "bob", new TrinoPrincipal(ROLE, "some_role")));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(BOB, "bob", new TrinoPrincipal(USER, "some_user")));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(BOB, "test", new TrinoPrincipal(ROLE, "some_role")));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(BOB, "test", new TrinoPrincipal(USER, "some_user")));
 
         accessControl.checkCanShowCreateSchema(ADMIN, "bob");
         accessControl.checkCanShowCreateSchema(ADMIN, "staff");
@@ -226,7 +205,7 @@ public void testSchemaRules()
     public void testGrantSchemaPrivilege(Privilege privilege, boolean grantOption)
     {
         ConnectorAccessControl accessControl = createAccessControl("schema.json");
-        TrinoPrincipal grantee = new TrinoPrincipal(PrincipalType.USER, "alice");
+        TrinoPrincipal grantee = new TrinoPrincipal(USER, "alice");
 
         accessControl.checkCanGrantSchemaPrivilege(ADMIN, privilege, "bob", grantee, grantOption);
         accessControl.checkCanGrantSchemaPrivilege(ADMIN, privilege, "staff", grantee, grantOption);
@@ -248,7 +227,7 @@ public void testGrantSchemaPrivilege(Privilege privilege, boolean grantOption)
     public void testDenySchemaPrivilege()
     {
         ConnectorAccessControl accessControl = createAccessControl("schema.json");
-        TrinoPrincipal grantee = new TrinoPrincipal(PrincipalType.USER, "alice");
+        TrinoPrincipal grantee = new TrinoPrincipal(USER, "alice");
 
         accessControl.checkCanDenySchemaPrivilege(ADMIN, UPDATE, "bob", grantee);
         accessControl.checkCanDenySchemaPrivilege(ADMIN, UPDATE, "staff", grantee);
@@ -270,7 +249,7 @@ public void testDenySchemaPrivilege()
     public void testRevokeSchemaPrivilege(Privilege privilege, boolean grantOption)
     {
         ConnectorAccessControl accessControl = createAccessControl("schema.json");
-        TrinoPrincipal grantee = new TrinoPrincipal(PrincipalType.USER, "alice");
+        TrinoPrincipal grantee = new TrinoPrincipal(USER, "alice");
 
         accessControl.checkCanRevokeSchemaPrivilege(ADMIN, privilege, "bob", grantee, grantOption);
         accessControl.checkCanRevokeSchemaPrivilege(ADMIN, privilege, "staff", grantee, grantOption);
@@ -375,19 +354,19 @@ public void testTableRules()
         assertDenied(() -> accessControl.checkCanSetMaterializedViewProperties(ALICE, new SchemaTableName("bobschema", "bobmaterializedview"), ImmutableMap.of()));
         assertDenied(() -> accessControl.checkCanSetMaterializedViewProperties(BOB, new SchemaTableName("bobschema", "bobmaterializedview"), ImmutableMap.of()));
 
-        accessControl.checkCanSetTableAuthorization(ADMIN, testTable, new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
-        accessControl.checkCanSetTableAuthorization(ADMIN, testTable, new TrinoPrincipal(PrincipalType.USER, "some_user"));
-        accessControl.checkCanSetTableAuthorization(ALICE, aliceTable, new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
-        accessControl.checkCanSetTableAuthorization(ALICE, aliceTable, new TrinoPrincipal(PrincipalType.USER, "some_user"));
-        assertDenied(() -> accessControl.checkCanSetTableAuthorization(ALICE, bobTable, new TrinoPrincipal(PrincipalType.ROLE, "some_role")));
-        assertDenied(() -> accessControl.checkCanSetTableAuthorization(ALICE, bobTable, new TrinoPrincipal(PrincipalType.USER, "some_user")));
-
-        accessControl.checkCanSetViewAuthorization(ADMIN, testTable, new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
-        accessControl.checkCanSetViewAuthorization(ADMIN, testTable, new TrinoPrincipal(PrincipalType.USER, "some_user"));
-        accessControl.checkCanSetViewAuthorization(ALICE, aliceTable, new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
-        accessControl.checkCanSetViewAuthorization(ALICE, aliceTable, new TrinoPrincipal(PrincipalType.USER, "some_user"));
-        assertDenied(() -> accessControl.checkCanSetViewAuthorization(ALICE, bobTable, new TrinoPrincipal(PrincipalType.ROLE, "some_role")));
-        assertDenied(() -> accessControl.checkCanSetViewAuthorization(ALICE, bobTable, new TrinoPrincipal(PrincipalType.USER, "some_user")));
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(ADMIN, testTable, new TrinoPrincipal(ROLE, "some_role")));
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(ADMIN, testTable, new TrinoPrincipal(USER, "some_user")));
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(ALICE, aliceTable, new TrinoPrincipal(ROLE, "some_role")));
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(ALICE, aliceTable, new TrinoPrincipal(USER, "some_user")));
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(ALICE, bobTable, new TrinoPrincipal(ROLE, "some_role")));
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(ALICE, bobTable, new TrinoPrincipal(USER, "some_user")));
+
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(ADMIN, testTable, new TrinoPrincipal(ROLE, "some_role")));
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(ADMIN, testTable, new TrinoPrincipal(USER, "some_user")));
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(ALICE, aliceTable, new TrinoPrincipal(ROLE, "some_role")));
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(ALICE, aliceTable, new TrinoPrincipal(USER, "some_user")));
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(ALICE, bobTable, new TrinoPrincipal(ROLE, "some_role")));
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(ALICE, bobTable, new TrinoPrincipal(USER, "some_user")));
     }
 
     @Test
@@ -419,7 +398,11 @@ public void testTableRulesForMixedGroupUsers()
         accessControl.checkCanSelectFromColumns(userGroup2, myTable, ImmutableSet.of());
         assertViewExpressionEquals(
                 accessControl.getColumnMask(userGroup2, myTable, "col_a", VARCHAR).orElseThrow(),
-                new ViewExpression(Optional.empty(), Optional.of("test_catalog"), Optional.of("my_schema"), "'mask_a'"));
+                ViewExpression.builder()
+                        .catalog("test_catalog")
+                        .schema("my_schema")
+                        .expression("'mask_a'")
+                        .build());
         assertEquals(
                 accessControl.getRowFilters(userGroup2, myTable),
                 ImmutableList.of());
@@ -443,13 +426,21 @@ public void testTableRulesForMixedGroupUsers()
         accessControl.checkCanSelectFromColumns(userGroup3, myTable, ImmutableSet.of());
         assertViewExpressionEquals(
                 accessControl.getColumnMask(userGroup3, myTable, "col_a", VARCHAR).orElseThrow(),
-                new ViewExpression(Optional.empty(), Optional.of("test_catalog"), Optional.of("my_schema"), "'mask_a'"));
+                ViewExpression.builder()
+                        .catalog("test_catalog")
+                        .schema("my_schema")
+                        .expression("'mask_a'")
+                        .build());
 
         List<ViewExpression> rowFilters = accessControl.getRowFilters(userGroup3, myTable);
         assertEquals(rowFilters.size(), 1);
         assertViewExpressionEquals(
                 rowFilters.get(0),
-                new ViewExpression(Optional.empty(), Optional.of("test_catalog"), Optional.of("my_schema"), "country='US'"));
+                ViewExpression.builder()
+                        .catalog("test_catalog")
+                        .schema("my_schema")
+                        .expression("country='US'")
+                        .build());
     }
 
     private static void assertViewExpressionEquals(ViewExpression actual, ViewExpression expected)
@@ -458,6 +449,7 @@ private static void assertViewExpressionEquals(ViewExpression actual, ViewExpres
         assertEquals(actual.getCatalog(), expected.getCatalog(), "Catalog");
         assertEquals(actual.getSchema(), expected.getSchema(), "Schema");
         assertEquals(actual.getExpression(), expected.getExpression(), "Expression");
+        assertEquals(actual.getPath(), expected.getPath(), "Path");
     }
 
     @Test
@@ -515,14 +507,22 @@ public void testNoFunctionRules()
     {
         ConnectorAccessControl accessControl = createAccessControl("no-access.json");
 
-        assertDenied(() -> accessControl.checkCanExecuteFunction(ALICE, AGGREGATE, new SchemaRoutineName("schema", "some_function")));
-        assertDenied(() -> accessControl.checkCanExecuteFunction(ALICE, SCALAR, new SchemaRoutineName("schema", "some_function")));
-        assertDenied(() -> accessControl.checkCanExecuteFunction(ALICE, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function")));
-        assertDenied(() -> accessControl.checkCanExecuteFunction(ALICE, WINDOW, new SchemaRoutineName("schema", "some_function")));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, AGGREGATE, new SchemaRoutineName("schema", "some_function"), new TrinoPrincipal(PrincipalType.USER, "some_user"), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, SCALAR, new SchemaRoutineName("schema", "some_function"), new TrinoPrincipal(PrincipalType.USER, "some_user"), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function"), new TrinoPrincipal(PrincipalType.USER, "some_user"), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, WINDOW, new SchemaRoutineName("schema", "some_function"), new TrinoPrincipal(PrincipalType.USER, "some_user"), true));
+        assertThat(accessControl.canExecuteFunction(ALICE, new SchemaRoutineName("schema", "some_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(ALICE, new SchemaRoutineName("schema", "some_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(ALICE, new SchemaRoutineName("ptf_schema", "some_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(ALICE, new SchemaRoutineName("schema", "some_function"))).isFalse();
+        assertThat(accessControl.canCreateViewWithExecuteFunction(ALICE, new SchemaRoutineName("schema", "some_function"))).isFalse();
+        assertThat(accessControl.canCreateViewWithExecuteFunction(ALICE, new SchemaRoutineName("schema", "some_function"))).isFalse();
+        assertThat(accessControl.canCreateViewWithExecuteFunction(ALICE, new SchemaRoutineName("ptf_schema", "some_function"))).isFalse();
+        assertThat(accessControl.canCreateViewWithExecuteFunction(ALICE, new SchemaRoutineName("schema", "some_function"))).isFalse();
+
+        Set<SchemaFunctionName> functions = ImmutableSet.<SchemaFunctionName>builder()
+                .add(new SchemaFunctionName("restricted", "any"))
+                .add(new SchemaFunctionName("secret", "any"))
+                .add(new SchemaFunctionName("any", "any"))
+                .build();
+        assertEquals(accessControl.filterFunctions(ALICE, functions), ImmutableSet.of());
+        assertEquals(accessControl.filterFunctions(BOB, functions), ImmutableSet.of());
     }
 
     @Test
@@ -551,10 +551,10 @@ public void testFilterSchemas()
 
     private static void assertFilterSchemas(ConnectorAccessControl accessControl)
     {
-        ImmutableSet<String> allSchemas = ImmutableSet.of("specific-schema", "alice-schema", "bob-schema", "unknown", "ptf_schema");
+        ImmutableSet<String> allSchemas = ImmutableSet.of("specific-schema", "alice-schema", "bob-schema", "unknown", "ptf_schema", "procedure-schema");
         assertEquals(accessControl.filterSchemas(ADMIN, allSchemas), allSchemas);
         assertEquals(accessControl.filterSchemas(ALICE, allSchemas), ImmutableSet.of("specific-schema", "alice-schema", "ptf_schema"));
-        assertEquals(accessControl.filterSchemas(BOB, allSchemas), ImmutableSet.of("specific-schema", "bob-schema"));
+        assertEquals(accessControl.filterSchemas(BOB, allSchemas), ImmutableSet.of("specific-schema", "bob-schema", "procedure-schema"));
         assertEquals(accessControl.filterSchemas(CHARLIE, allSchemas), ImmutableSet.of("specific-schema"));
     }
 
@@ -576,7 +576,7 @@ public void testSchemaRulesForCheckCanShowTables()
         accessControl.checkCanShowTables(BOB, "bob-schema");
         assertDenied(() -> accessControl.checkCanShowTables(BOB, "alice-schema"));
         assertDenied(() -> accessControl.checkCanShowTables(BOB, "secret"));
-        assertDenied(() -> accessControl.checkCanShowTables(BOB, "any"));
+        accessControl.checkCanShowTables(BOB, "any");
         accessControl.checkCanShowTables(CHARLIE, "specific-schema");
         assertDenied(() -> accessControl.checkCanShowTables(CHARLIE, "bob-schema"));
         assertDenied(() -> accessControl.checkCanShowTables(CHARLIE, "alice-schema"));
@@ -584,59 +584,69 @@ public void testSchemaRulesForCheckCanShowTables()
         assertDenied(() -> accessControl.checkCanShowTables(CHARLIE, "any"));
     }
 
+    @Test
+    public void testSchemaRulesForCheckCanShowFunctions()
+    {
+        ConnectorAccessControl accessControl = createAccessControl("visibility.json");
+        accessControl.checkCanShowFunctions(ADMIN, "specific-schema");
+        accessControl.checkCanShowFunctions(ADMIN, "bob-schema");
+        accessControl.checkCanShowFunctions(ADMIN, "alice-schema");
+        accessControl.checkCanShowFunctions(ADMIN, "secret");
+        accessControl.checkCanShowFunctions(ADMIN, "any");
+        accessControl.checkCanShowFunctions(ALICE, "specific-schema");
+        accessControl.checkCanShowFunctions(ALICE, "alice-schema");
+        assertDenied(() -> accessControl.checkCanShowFunctions(ALICE, "bob-schema"));
+        assertDenied(() -> accessControl.checkCanShowFunctions(ALICE, "secret"));
+        assertDenied(() -> accessControl.checkCanShowFunctions(ALICE, "any"));
+        accessControl.checkCanShowFunctions(BOB, "specific-schema");
+        accessControl.checkCanShowFunctions(BOB, "bob-schema");
+        assertDenied(() -> accessControl.checkCanShowFunctions(BOB, "alice-schema"));
+        assertDenied(() -> accessControl.checkCanShowFunctions(BOB, "secret"));
+        accessControl.checkCanShowFunctions(BOB, "any");
+        accessControl.checkCanShowFunctions(CHARLIE, "specific-schema");
+        assertDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, "bob-schema"));
+        assertDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, "alice-schema"));
+        assertDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, "secret"));
+        assertDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, "any"));
+    }
+
     @Test
     public void testFunctionRulesForCheckCanExecute()
     {
         ConnectorAccessControl accessControl = createAccessControl("visibility.json");
-        assertDenied(() -> accessControl.checkCanExecuteFunction(ADMIN, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function")));
-        accessControl.checkCanExecuteFunction(ALICE, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function"));
-        assertDenied(() -> accessControl.checkCanExecuteFunction(BOB, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function")));
-        assertDenied(() -> accessControl.checkCanExecuteFunction(CHARLIE, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function")));
-        assertDenied(() -> accessControl.checkCanExecuteFunction(ADMIN, TABLE, new SchemaRoutineName("ptf_schema", "some_function")));
-        assertDenied(() -> accessControl.checkCanExecuteFunction(ALICE, AGGREGATE, new SchemaRoutineName("any", "some_function")));
-        assertDenied(() -> accessControl.checkCanExecuteFunction(ALICE, SCALAR, new SchemaRoutineName("any", "some_function")));
-        assertDenied(() -> accessControl.checkCanExecuteFunction(ALICE, WINDOW, new SchemaRoutineName("any", "some_function")));
-        accessControl.checkCanExecuteFunction(BOB, AGGREGATE, new SchemaRoutineName("any", "some_function"));
-        accessControl.checkCanExecuteFunction(BOB, SCALAR, new SchemaRoutineName("any", "some_function"));
-        accessControl.checkCanExecuteFunction(BOB, WINDOW, new SchemaRoutineName("any", "some_function"));
-        assertDenied(() -> accessControl.checkCanExecuteFunction(CHARLIE, AGGREGATE, new SchemaRoutineName("any", "some_function")));
-        assertDenied(() -> accessControl.checkCanExecuteFunction(CHARLIE, SCALAR, new SchemaRoutineName("any", "some_function")));
-        assertDenied(() -> accessControl.checkCanExecuteFunction(CHARLIE, WINDOW, new SchemaRoutineName("any", "some_function")));
+        assertThat(accessControl.canExecuteFunction(ADMIN, new SchemaRoutineName("ptf_schema", "some_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(ADMIN, new SchemaRoutineName("any", "some_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(ADMIN, new SchemaRoutineName("any", "some_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(ADMIN, new SchemaRoutineName("any", "some_function"))).isFalse();
+
+        assertThat(accessControl.canExecuteFunction(ALICE, new SchemaRoutineName("ptf_schema", "some_function"))).isTrue();
+        assertThat(accessControl.canExecuteFunction(ALICE, new SchemaRoutineName("any", "some_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(ALICE, new SchemaRoutineName("any", "some_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(ALICE, new SchemaRoutineName("any", "some_function"))).isFalse();
+
+        assertThat(accessControl.canExecuteFunction(BOB, new SchemaRoutineName("ptf_schema", "some_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(BOB, new SchemaRoutineName("any", "some_function"))).isTrue();
+        assertThat(accessControl.canExecuteFunction(BOB, new SchemaRoutineName("any", "some_function"))).isTrue();
+        assertThat(accessControl.canExecuteFunction(BOB, new SchemaRoutineName("any", "some_function"))).isTrue();
+
+        assertThat(accessControl.canExecuteFunction(CHARLIE, new SchemaRoutineName("ptf_schema", "some_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(CHARLIE, new SchemaRoutineName("any", "some_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(CHARLIE, new SchemaRoutineName("any", "some_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(CHARLIE, new SchemaRoutineName("any", "some_function"))).isFalse();
     }
 
     @Test
-    public void testFunctionRulesForCheckCanGrantExecute()
+    public void testProcedureRulesForCheckCanExecute()
     {
         ConnectorAccessControl accessControl = createAccessControl("visibility.json");
-        accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function"), new TrinoPrincipal(PrincipalType.USER, ADMIN.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function"), new TrinoPrincipal(PrincipalType.USER, ALICE.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function"), new TrinoPrincipal(PrincipalType.USER, BOB.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function"), new TrinoPrincipal(PrincipalType.USER, CHARLIE.getIdentity().getUser()), true);
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, TABLE, new SchemaRoutineName("ptf_schema", "some_function"), new TrinoPrincipal(PrincipalType.USER, ADMIN.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, AGGREGATE, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, ALICE.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, SCALAR, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, ALICE.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, WINDOW, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, ALICE.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, AGGREGATE, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, BOB.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, SCALAR, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, BOB.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, WINDOW, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, BOB.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, AGGREGATE, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, CHARLIE.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, SCALAR, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, CHARLIE.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, WINDOW, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, CHARLIE.getIdentity().getUser()), true));
-
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function"), new TrinoPrincipal(PrincipalType.USER, ADMIN.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function"), new TrinoPrincipal(PrincipalType.USER, ALICE.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function"), new TrinoPrincipal(PrincipalType.USER, BOB.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, TABLE, new SchemaRoutineName("ptf_schema", "some_table_function"), new TrinoPrincipal(PrincipalType.USER, CHARLIE.getIdentity().getUser()), true));
-        assertDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, TABLE, new SchemaRoutineName("ptf_schema", "some_function"), new TrinoPrincipal(PrincipalType.USER, ADMIN.getIdentity().getUser()), true));
-        accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, AGGREGATE, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, ALICE.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, SCALAR, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, ALICE.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, WINDOW, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, ALICE.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, AGGREGATE, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, BOB.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, SCALAR, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, BOB.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, WINDOW, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, BOB.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, AGGREGATE, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, CHARLIE.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, SCALAR, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, CHARLIE.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, WINDOW, new SchemaRoutineName("any", "some_function"), new TrinoPrincipal(PrincipalType.USER, CHARLIE.getIdentity().getUser()), true);
+
+        accessControl.checkCanExecuteProcedure(BOB, new SchemaRoutineName("procedure-schema", "some_procedure"));
+        assertDenied(() -> accessControl.checkCanExecuteProcedure(BOB, new SchemaRoutineName("some-schema", "some_procedure")));
+        assertDenied(() -> accessControl.checkCanExecuteProcedure(BOB, new SchemaRoutineName("procedure-schema", "another_procedure")));
+
+        assertDenied(() -> accessControl.checkCanExecuteProcedure(CHARLIE, new SchemaRoutineName("procedure-schema", "some_procedure")));
+
+        assertDenied(() -> accessControl.checkCanExecuteProcedure(ALICE, new SchemaRoutineName("procedure-schema", "some_procedure")));
     }
 
     @Test
@@ -655,6 +665,109 @@ public void testFilterSchemasWithJsonPointer()
         assertFilterSchemas(accessControl);
     }
 
+    @Test
+    public void testSchemaAuthorization()
+    {
+        ConnectorAccessControl accessControl = createAccessControl("authorization-no-roles.json");
+
+        String schema = "test";
+        String ownedByUser = "owned_by_user";
+        String ownedByGroup = "owned_by_group";
+
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(user("user", "group"), schema, new TrinoPrincipal(ROLE, "new_role")));
+
+        // access to schema granted to user
+        accessControl.checkCanSetSchemaAuthorization(user("owner_authorized", "group"), ownedByUser, new TrinoPrincipal(USER, "new_user"));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(user("owner_DENY_authorized", "group"), ownedByUser, new TrinoPrincipal(USER, "new_user")));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(user("owner", "group"), ownedByUser, new TrinoPrincipal(USER, "new_user")));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(user("owner_authorized", "group"), ownedByUser, new TrinoPrincipal(ROLE, "new_role")));
+
+        // access to schema granted to group
+        accessControl.checkCanSetSchemaAuthorization(user("authorized", "owner"), ownedByGroup, new TrinoPrincipal(USER, "new_user"));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(user("DENY_authorized", "owner"), ownedByGroup, new TrinoPrincipal(USER, "new_user")));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(user("user", "owner"), ownedByGroup, new TrinoPrincipal(USER, "new_user")));
+        assertDenied(() -> accessControl.checkCanSetSchemaAuthorization(user("authorized", "owner"), ownedByGroup, new TrinoPrincipal(ROLE, "new_role")));
+    }
+
+    @Test
+    public void testTableAuthorization()
+    {
+        ConnectorAccessControl accessControl = createAccessControl("authorization-no-roles.json");
+
+        SchemaTableName table = new SchemaTableName("test", "table");
+        SchemaTableName ownedByUser = new SchemaTableName("test", "owned_by_user");
+        SchemaTableName ownedByGroup = new SchemaTableName("test", "owned_by_group");
+
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(user("user", "group"), table, new TrinoPrincipal(ROLE, "new_role")));
+
+        // access to table granted to user
+        accessControl.checkCanSetTableAuthorization(user("owner_authorized", "group"), ownedByUser, new TrinoPrincipal(USER, "new_user"));
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(user("owner", "group"), ownedByUser, new TrinoPrincipal(ROLE, "new_role")));
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(user("owner_authorized", "group"), ownedByUser, new TrinoPrincipal(ROLE, "new_role")));
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(user("owner_DENY_authorized", "group"), ownedByUser, new TrinoPrincipal(USER, "new_user")));
+
+        // access to table granted to group
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(user("user", "owner"), ownedByGroup, new TrinoPrincipal(USER, "new_user")));
+        accessControl.checkCanSetTableAuthorization(user("authorized", "owner"), ownedByGroup, new TrinoPrincipal(USER, "new_user"));
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(user("authorized", "owner"), ownedByGroup, new TrinoPrincipal(ROLE, "new_role")));
+        assertDenied(() -> accessControl.checkCanSetTableAuthorization(user("DENY_authorized", "owner"), ownedByGroup, new TrinoPrincipal(USER, "new_user")));
+    }
+
+    @Test
+    public void testViewAuthorization()
+    {
+        ConnectorAccessControl accessControl = createAccessControl("authorization-no-roles.json");
+
+        SchemaTableName table = new SchemaTableName("test", "table");
+        SchemaTableName ownedByUser = new SchemaTableName("test", "owned_by_user");
+        SchemaTableName ownedByGroup = new SchemaTableName("test", "owned_by_group");
+
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(user("user", "group"), table, new TrinoPrincipal(ROLE, "new_role")));
+
+        // access to schema granted to user
+        accessControl.checkCanSetViewAuthorization(user("owner_authorized", "group"), ownedByUser, new TrinoPrincipal(USER, "new_user"));
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(user("owner_DENY_authorized", "group"), ownedByUser, new TrinoPrincipal(USER, "new_user")));
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(user("owner", "group"), ownedByUser, new TrinoPrincipal(USER, "new_user")));
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(user("owner_authorized", "group"), ownedByUser, new TrinoPrincipal(ROLE, "new_role")));
+
+        // access to schema granted to group
+        accessControl.checkCanSetViewAuthorization(user("authorized", "owner"), ownedByGroup, new TrinoPrincipal(USER, "new_user"));
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(user("DENY_authorized", "owner"), ownedByGroup, new TrinoPrincipal(USER, "new_user")));
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(user("user", "owner"), ownedByGroup, new TrinoPrincipal(USER, "new_user")));
+        assertDenied(() -> accessControl.checkCanSetViewAuthorization(user("authorized", "owner"), ownedByGroup, new TrinoPrincipal(ROLE, "new_role")));
+    }
+
+    @Test
+    public void testFunctionFilter()
+    {
+        ConnectorAccessControl accessControl = createAccessControl("function-filter.json");
+        Set<SchemaFunctionName> functions = ImmutableSet.<SchemaFunctionName>builder()
+                .add(new SchemaFunctionName("restricted", "any"))
+                .add(new SchemaFunctionName("secret", "any"))
+                .add(new SchemaFunctionName("aliceschema", "any"))
+                .add(new SchemaFunctionName("aliceschema", "bobfunction"))
+                .add(new SchemaFunctionName("bobschema", "bob_any"))
+                .add(new SchemaFunctionName("bobschema", "any"))
+                .add(new SchemaFunctionName("any", "any"))
+                .build();
+        assertEquals(accessControl.filterFunctions(ALICE, functions), ImmutableSet.<SchemaFunctionName>builder()
+                .add(new SchemaFunctionName("aliceschema", "any"))
+                .add(new SchemaFunctionName("aliceschema", "bobfunction"))
+                .build());
+        assertEquals(accessControl.filterFunctions(BOB, functions), ImmutableSet.<SchemaFunctionName>builder()
+                .add(new SchemaFunctionName("aliceschema", "bobfunction"))
+                .add(new SchemaFunctionName("bobschema", "bob_any"))
+                .build());
+        assertEquals(accessControl.filterFunctions(ADMIN, functions), ImmutableSet.<SchemaFunctionName>builder()
+                .add(new SchemaFunctionName("secret", "any"))
+                .add(new SchemaFunctionName("aliceschema", "any"))
+                .add(new SchemaFunctionName("aliceschema", "bobfunction"))
+                .add(new SchemaFunctionName("bobschema", "bob_any"))
+                .add(new SchemaFunctionName("bobschema", "any"))
+                .add(new SchemaFunctionName("any", "any"))
+                .build());
+    }
+
     @Test
     public void testEverythingImplemented()
             throws NoSuchMethodException
@@ -711,6 +824,11 @@ private String getResourcePath(String resourceName)
         return requireNonNull(this.getClass().getClassLoader().getResource(resourceName), "Resource does not exist: " + resourceName).getPath();
     }
 
+    private static ConnectorSecurityContext user(String user, String group)
+    {
+        return user(user, ImmutableSet.of(group));
+    }
+
     private static ConnectorSecurityContext user(String name, Set<String> groups)
     {
         return new ConnectorSecurityContext(
diff --git a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/BaseFileBasedSystemAccessControlTest.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/BaseFileBasedSystemAccessControlTest.java
index 532e10ad4339..c996a01dc780 100644
--- a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/BaseFileBasedSystemAccessControlTest.java
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/BaseFileBasedSystemAccessControlTest.java
@@ -21,10 +21,11 @@
 import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaRoutineName;
 import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.connector.SchemaRoutineName;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.Identity;
-import io.trino.spi.security.PrincipalType;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.SystemAccessControl;
 import io.trino.spi.security.SystemSecurityContext;
@@ -37,7 +38,7 @@
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import java.io.File;
-import java.util.Collection;
+import java.time.Instant;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
@@ -46,10 +47,7 @@
 import java.util.stream.Stream;
 
 import static com.google.common.io.Files.copy;
-import static io.trino.spi.function.FunctionKind.AGGREGATE;
-import static io.trino.spi.function.FunctionKind.SCALAR;
-import static io.trino.spi.function.FunctionKind.TABLE;
-import static io.trino.spi.function.FunctionKind.WINDOW;
+import static io.trino.spi.security.PrincipalType.ROLE;
 import static io.trino.spi.security.PrincipalType.USER;
 import static io.trino.spi.security.Privilege.UPDATE;
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
@@ -57,13 +55,14 @@
 import static java.lang.String.format;
 import static java.lang.Thread.sleep;
 import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.util.Files.newTemporaryFile;
 import static org.testng.Assert.assertEquals;
 
 public abstract class BaseFileBasedSystemAccessControlTest
 {
-    protected static final Identity alice = Identity.forUser("alice").withGroups(ImmutableSet.of("staff")).build();
+    private static final Identity alice = Identity.forUser("alice").withGroups(ImmutableSet.of("staff")).build();
     private static final Identity kerberosValidAlice = Identity.forUser("alice").withPrincipal(new KerberosPrincipal("alice/example.com@EXAMPLE.COM")).build();
     private static final Identity kerberosValidNonAsciiUser = Identity.forUser("\u0194\u0194\u0194").withPrincipal(new KerberosPrincipal("\u0194\u0194\u0194/example.com@EXAMPLE.COM")).build();
     private static final Identity kerberosInvalidAlice = Identity.forUser("alice").withPrincipal(new KerberosPrincipal("mallory/example.com@EXAMPLE.COM")).build();
@@ -76,70 +75,67 @@ public abstract class BaseFileBasedSystemAccessControlTest
     private static final Identity admin = Identity.forUser("alberto").withEnabledRoles(ImmutableSet.of("admin")).withGroups(ImmutableSet.of("staff")).build();
     private static final Identity nonAsciiUser = Identity.ofUser("\u0194\u0194\u0194");
     private static final CatalogSchemaTableName aliceView = new CatalogSchemaTableName("alice-catalog", "schema", "view");
-    private static final Optional<QueryId> queryId = Optional.empty();
+    private static final QueryId queryId = new QueryId("test_query");
+    private static final Instant queryStart = Instant.now();
 
     private static final Identity charlie = Identity.forUser("charlie").withGroups(ImmutableSet.of("guests")).build();
     private static final Identity dave = Identity.forUser("dave").withGroups(ImmutableSet.of("contractors")).build();
     private static final Identity joe = Identity.ofUser("joe");
     private static final Identity any = Identity.ofUser("any");
     private static final Identity anyone = Identity.ofUser("anyone");
-    private static final SystemSecurityContext ADMIN = new SystemSecurityContext(admin, queryId);
-    private static final SystemSecurityContext BOB = new SystemSecurityContext(bob, queryId);
-    private static final SystemSecurityContext CHARLIE = new SystemSecurityContext(charlie, queryId);
-    private static final SystemSecurityContext ALICE = new SystemSecurityContext(alice, queryId);
-    private static final SystemSecurityContext JOE = new SystemSecurityContext(joe, queryId);
-    private static final SystemSecurityContext UNKNOWN = new SystemSecurityContext(Identity.ofUser("some-unknown-user-id"), queryId);
-
-    private static final String SHOWN_SCHEMAS_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot show schemas";
-    private static final String CREATE_SCHEMA_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot create schema .*";
-    private static final String DROP_SCHEMA_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot drop schema .*";
-    private static final String RENAME_SCHEMA_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot rename schema from .* to .*";
-    private static final String AUTH_SCHEMA_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot set authorization for schema .* to .*";
-    private static final String SHOW_CREATE_SCHEMA_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot show create schema for .*";
-    private static final String GRANT_SCHEMA_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot grant privilege %s on schema %s%s";
-    private static final String DENY_SCHEMA_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot deny privilege %s on schema %s%s";
-    private static final String REVOKE_SCHEMA_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot revoke privilege %s on schema %s%s";
-
-    private static final String SHOWN_TABLES_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot show tables of .*";
-    private static final String SELECT_TABLE_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot select from table .*";
-    private static final String SHOW_COLUMNS_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot show columns of table .*";
-    private static final String ADD_COLUMNS_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot add a column to table .*";
-    private static final String DROP_COLUMNS_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot drop a column from table .*";
-    private static final String RENAME_COLUMNS_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot rename a column in table .*";
-    private static final String AUTH_TABLE_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot set authorization for table .* to .*";
-    private static final String AUTH_VIEW_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot set authorization for view .* to .*";
-    private static final String TABLE_COMMENT_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot comment table to .*";
-    private static final String INSERT_TABLE_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot insert into table .*";
-    private static final String DELETE_TABLE_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot delete from table .*";
-    private static final String TRUNCATE_TABLE_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot truncate table .*";
-    private static final String DROP_TABLE_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot drop table .*";
-    private static final String CREATE_TABLE_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot show create table for .*";
-    private static final String RENAME_TABLE_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot rename table .*";
-    private static final String SET_TABLE_PROPERTIES_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot set table properties to .*";
-    private static final String CREATE_VIEW_ACCESS_DENIED_MESSAGE = "Access Denied: View owner '.*' cannot create view that selects from .*";
-    private static final String CREATE_MATERIALIZED_VIEW_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot create materialized view .*";
-    private static final String DROP_MATERIALIZED_VIEW_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot drop materialized view .*";
-    private static final String REFRESH_MATERIALIZED_VIEW_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot refresh materialized view .*";
-    private static final String SET_MATERIALIZED_VIEW_PROPERTIES_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot set properties of materialized view .*";
-    private static final String GRANT_DELETE_PRIVILEGE_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot grant privilege DELETE on table .*";
-    private static final String DENY_DELETE_PRIVILEGE_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot deny privilege DELETE on table .*";
-    private static final String REVOKE_DELETE_PRIVILEGE_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot revoke privilege DELETE on table .*";
-
-    private static final String SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot set system session property .*";
-    private static final String SET_CATALOG_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot set catalog session property .*";
-    private static final String EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE = "Access Denied: Cannot execute function .*";
-    private static final String GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE = "Access Denied: .* cannot grant .*";
+    private static final Identity unknown = Identity.ofUser("some-unknown-user-id");
+    private static final SystemSecurityContext ADMIN = new SystemSecurityContext(admin, queryId, queryStart);
+    private static final SystemSecurityContext BOB = new SystemSecurityContext(bob, queryId, queryStart);
+    private static final SystemSecurityContext CHARLIE = new SystemSecurityContext(charlie, queryId, queryStart);
+    private static final SystemSecurityContext ALICE = new SystemSecurityContext(alice, queryId, queryStart);
+    private static final SystemSecurityContext JOE = new SystemSecurityContext(joe, queryId, queryStart);
+    private static final SystemSecurityContext UNKNOWN = new SystemSecurityContext(unknown, queryId, queryStart);
+
+    private static final String SHOWN_SCHEMAS_ACCESS_DENIED_MESSAGE = "Cannot show schemas";
+    private static final String CREATE_SCHEMA_ACCESS_DENIED_MESSAGE = "Cannot create schema .*";
+    private static final String DROP_SCHEMA_ACCESS_DENIED_MESSAGE = "Cannot drop schema .*";
+    private static final String RENAME_SCHEMA_ACCESS_DENIED_MESSAGE = "Cannot rename schema from .* to .*";
+    private static final String SHOW_CREATE_SCHEMA_ACCESS_DENIED_MESSAGE = "Cannot show create schema for .*";
+    private static final String GRANT_SCHEMA_ACCESS_DENIED_MESSAGE = "Cannot grant privilege %s on schema %s%s";
+    private static final String DENY_SCHEMA_ACCESS_DENIED_MESSAGE = "Cannot deny privilege %s on schema %s%s";
+    private static final String REVOKE_SCHEMA_ACCESS_DENIED_MESSAGE = "Cannot revoke privilege %s on schema %s%s";
+
+    private static final String SHOWN_TABLES_ACCESS_DENIED_MESSAGE = "Cannot show tables of .*";
+    private static final String SELECT_TABLE_ACCESS_DENIED_MESSAGE = "Cannot select from table .*";
+    private static final String SHOW_COLUMNS_ACCESS_DENIED_MESSAGE = "Cannot show columns of table .*";
+    private static final String ADD_COLUMNS_ACCESS_DENIED_MESSAGE = "Cannot add a column to table .*";
+    private static final String DROP_COLUMNS_ACCESS_DENIED_MESSAGE = "Cannot drop a column from table .*";
+    private static final String RENAME_COLUMNS_ACCESS_DENIED_MESSAGE = "Cannot rename a column in table .*";
+    private static final String TABLE_COMMENT_ACCESS_DENIED_MESSAGE = "Cannot comment table to .*";
+    private static final String INSERT_TABLE_ACCESS_DENIED_MESSAGE = "Cannot insert into table .*";
+    private static final String DELETE_TABLE_ACCESS_DENIED_MESSAGE = "Cannot delete from table .*";
+    private static final String TRUNCATE_TABLE_ACCESS_DENIED_MESSAGE = "Cannot truncate table .*";
+    private static final String DROP_TABLE_ACCESS_DENIED_MESSAGE = "Cannot drop table .*";
+    private static final String CREATE_TABLE_ACCESS_DENIED_MESSAGE = "Cannot show create table for .*";
+    private static final String RENAME_TABLE_ACCESS_DENIED_MESSAGE = "Cannot rename table .*";
+    private static final String SET_TABLE_PROPERTIES_ACCESS_DENIED_MESSAGE = "Cannot set table properties to .*";
+    private static final String CREATE_VIEW_ACCESS_DENIED_MESSAGE = "View owner '.*' cannot create view that selects from .*";
+    private static final String CREATE_MATERIALIZED_VIEW_ACCESS_DENIED_MESSAGE = "Cannot create materialized view .*";
+    private static final String DROP_MATERIALIZED_VIEW_ACCESS_DENIED_MESSAGE = "Cannot drop materialized view .*";
+    private static final String REFRESH_MATERIALIZED_VIEW_ACCESS_DENIED_MESSAGE = "Cannot refresh materialized view .*";
+    private static final String SET_MATERIALIZED_VIEW_PROPERTIES_ACCESS_DENIED_MESSAGE = "Cannot set properties of materialized view .*";
+    private static final String GRANT_DELETE_PRIVILEGE_ACCESS_DENIED_MESSAGE = "Cannot grant privilege DELETE on table .*";
+    private static final String DENY_DELETE_PRIVILEGE_ACCESS_DENIED_MESSAGE = "Cannot deny privilege DELETE on table .*";
+    private static final String REVOKE_DELETE_PRIVILEGE_ACCESS_DENIED_MESSAGE = "Cannot revoke privilege DELETE on table .*";
+    private static final String SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE = "Cannot show functions of .*";
+
+    private static final String SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE = "Cannot set system session property .*";
+    private static final String SET_CATALOG_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE = "Cannot set catalog session property .*";
+    private static final String EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE = "Cannot execute function .*";
+    private static final String GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE = ".* cannot grant .*";
+    private static final String EXECUTE_PROCEDURE_ACCESS_DENIED_MESSAGE = "Cannot execute procedure .*";
 
     protected abstract SystemAccessControl newFileBasedSystemAccessControl(File configFile, Map<String, String> properties);
 
     @Test
     public void testEverythingImplemented()
-            throws NoSuchMethodException
     {
-        assertAllMethodsOverridden(SystemAccessControl.class, FileBasedSystemAccessControl.class, ImmutableSet.of(
-                FileBasedSystemAccessControl.class.getMethod("checkCanViewQueryOwnedBy", SystemSecurityContext.class, Identity.class),
-                FileBasedSystemAccessControl.class.getMethod("filterViewQueryOwnedBy", SystemSecurityContext.class, Collection.class),
-                FileBasedSystemAccessControl.class.getMethod("checkCanKillQueryOwnedBy", SystemSecurityContext.class, Identity.class)));
+        assertAllMethodsOverridden(SystemAccessControl.class, FileBasedSystemAccessControl.class);
     }
 
     @Test
@@ -153,7 +149,7 @@ public void testRefreshing()
         SystemAccessControl accessControl = newFileBasedSystemAccessControl(configFile, ImmutableMap.of(
                 "security.refresh-period", "1ms"));
 
-        SystemSecurityContext alice = new SystemSecurityContext(BaseFileBasedSystemAccessControlTest.alice, queryId);
+        SystemSecurityContext alice = new SystemSecurityContext(BaseFileBasedSystemAccessControlTest.alice, queryId, queryStart);
         accessControl.checkCanCreateView(alice, aliceView);
         accessControl.checkCanCreateView(alice, aliceView);
         accessControl.checkCanCreateView(alice, aliceView);
@@ -182,9 +178,9 @@ public void testEmptyFile()
         accessControl.checkCanCreateSchema(UNKNOWN, new CatalogSchemaName("some-catalog", "unknown"), ImmutableMap.of());
         accessControl.checkCanDropSchema(UNKNOWN, new CatalogSchemaName("some-catalog", "unknown"));
         accessControl.checkCanRenameSchema(UNKNOWN, new CatalogSchemaName("some-catalog", "unknown"), "new_unknown");
-        accessControl.checkCanSetSchemaAuthorization(UNKNOWN,
-                new CatalogSchemaName("some-catalog", "unknown"),
-                new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(UNKNOWN, new CatalogSchemaName("some-catalog", "unknown"), new TrinoPrincipal(ROLE, "some_role")),
+                "Cannot set authorization for schema some-catalog.unknown to ROLE some_role");
         accessControl.checkCanShowCreateSchema(UNKNOWN, new CatalogSchemaName("some-catalog", "unknown"));
 
         accessControl.checkCanSelectFromColumns(UNKNOWN, new CatalogSchemaTableName("some-catalog", "unknown", "unknown"), ImmutableSet.of());
@@ -199,47 +195,38 @@ public void testEmptyFile()
         accessControl.checkCanRenameTable(UNKNOWN,
                 new CatalogSchemaTableName("some-catalog", "unknown", "unknown"),
                 new CatalogSchemaTableName("some-catalog", "unknown", "new_unknown"));
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(UNKNOWN, new CatalogSchemaTableName("some-catalog", "unknown", "unknown"), new TrinoPrincipal(ROLE, "some_role")),
+                "Cannot set authorization for table some-catalog.unknown.unknown to ROLE some_role");
+
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(UNKNOWN, new CatalogSchemaTableName("some-catalog", "unknown", "unknown"), new TrinoPrincipal(ROLE, "some_role")),
+                "Cannot set authorization for view some-catalog.unknown.unknown to ROLE some_role");
 
         accessControl.checkCanCreateMaterializedView(UNKNOWN, new CatalogSchemaTableName("some-catalog", "unknown", "unknown"), Map.of());
         accessControl.checkCanDropMaterializedView(UNKNOWN, new CatalogSchemaTableName("some-catalog", "unknown", "unknown"));
         accessControl.checkCanRefreshMaterializedView(UNKNOWN, new CatalogSchemaTableName("some-catalog", "unknown", "unknown"));
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(UNKNOWN, new CatalogSchemaTableName("some-catalog", "unknown", "unknown"), new TrinoPrincipal(ROLE, "some_role")),
+                "Cannot set authorization for view some-catalog.unknown.unknown to ROLE some_role");
 
         accessControl.checkCanSetUser(Optional.empty(), "unknown");
         accessControl.checkCanSetUser(Optional.of(new KerberosPrincipal("stuff@example.com")), "unknown");
 
-        accessControl.checkCanSetSystemSessionProperty(UNKNOWN, "anything");
+        accessControl.checkCanSetSystemSessionProperty(unknown, "anything");
         accessControl.checkCanSetCatalogSessionProperty(UNKNOWN, "unknown", "anything");
 
-        accessControl.checkCanExecuteQuery(UNKNOWN);
-        accessControl.checkCanViewQueryOwnedBy(UNKNOWN, anyone);
-        accessControl.checkCanKillQueryOwnedBy(UNKNOWN, anyone);
+        accessControl.checkCanExecuteQuery(unknown);
+        accessControl.checkCanViewQueryOwnedBy(unknown, anyone);
+        accessControl.checkCanKillQueryOwnedBy(unknown, anyone);
 
         // system information access is denied by default
-        assertThatThrownBy(() -> accessControl.checkCanReadSystemInformation(UNKNOWN))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot read system information");
-        assertThatThrownBy(() -> accessControl.checkCanWriteSystemInformation(UNKNOWN))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot write system information");
-    }
-
-    @Test
-    public void testEmptyFunctionKind()
-    {
-        assertThatThrownBy(() -> newFileBasedSystemAccessControl("empty-functions-kind.json"))
-                .hasRootCauseInstanceOf(IllegalStateException.class)
-                .hasRootCauseMessage("functionKinds cannot be empty, provide at least one function kind [SCALAR, AGGREGATE, WINDOW, TABLE]");
-    }
-
-    @Test
-    public void testDisallowFunctionKindRuleCombination()
-    {
-        assertThatThrownBy(() -> newFileBasedSystemAccessControl("file-based-disallow-function-rule-combination.json"))
-                .hasRootCauseInstanceOf(IllegalStateException.class)
-                .hasRootCauseMessage("Cannot define catalog for others function kinds than TABLE");
-        assertThatThrownBy(() -> newFileBasedSystemAccessControl("file-based-disallow-function-rule-combination-without-table.json"))
-                .hasRootCauseInstanceOf(IllegalStateException.class)
-                .hasRootCauseMessage("Cannot define catalog for others function kinds than TABLE");
+        assertAccessDenied(
+                () -> accessControl.checkCanReadSystemInformation(unknown),
+                "Cannot read system information");
+        assertAccessDenied(
+                () -> accessControl.checkCanWriteSystemInformation(unknown),
+                "Cannot write system information");
     }
 
     @Test
@@ -307,19 +294,6 @@ public void testSchemaRulesForCheckCanRenameSchema()
         assertAccessDenied(() -> accessControl.checkCanRenameSchema(CHARLIE, new CatalogSchemaName("some-catalog", "test"), "new_schema"), RENAME_SCHEMA_ACCESS_DENIED_MESSAGE);
     }
 
-    @Test
-    public void testSchemaRulesForCheckCanSetSchemaAuthorization()
-    {
-        SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-schema.json");
-
-        accessControl.checkCanSetSchemaAuthorization(ADMIN, new CatalogSchemaName("some-catalog", "test"), new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
-        accessControl.checkCanSetSchemaAuthorization(ADMIN, new CatalogSchemaName("some-catalog", "test"), new TrinoPrincipal(PrincipalType.USER, "some_user"));
-        accessControl.checkCanSetSchemaAuthorization(BOB, new CatalogSchemaName("some-catalog", "bob"), new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
-        accessControl.checkCanSetSchemaAuthorization(BOB, new CatalogSchemaName("some-catalog", "bob"), new TrinoPrincipal(PrincipalType.USER, "some_user"));
-        assertAccessDenied(() -> accessControl.checkCanSetSchemaAuthorization(BOB, new CatalogSchemaName("some-catalog", "test"), new TrinoPrincipal(PrincipalType.ROLE, "some_role")), AUTH_SCHEMA_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanSetSchemaAuthorization(BOB, new CatalogSchemaName("some-catalog", "test"), new TrinoPrincipal(PrincipalType.USER, "some_user")), AUTH_SCHEMA_ACCESS_DENIED_MESSAGE);
-    }
-
     @Test
     public void testSchemaRulesForCheckCanShowCreateSchema()
     {
@@ -345,7 +319,7 @@ public void testSchemaRulesForCheckCanShowCreateSchema()
     public void testGrantSchemaPrivilege(Privilege privilege, boolean grantOption)
     {
         SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-schema.json");
-        TrinoPrincipal grantee = new TrinoPrincipal(PrincipalType.USER, "alice");
+        TrinoPrincipal grantee = new TrinoPrincipal(USER, "alice");
 
         accessControl.checkCanGrantSchemaPrivilege(ADMIN, privilege, new CatalogSchemaName("some-catalog", "bob"), grantee, grantOption);
         accessControl.checkCanGrantSchemaPrivilege(ADMIN, privilege, new CatalogSchemaName("some-catalog", "staff"), grantee, grantOption);
@@ -375,7 +349,7 @@ public void testGrantSchemaPrivilege(Privilege privilege, boolean grantOption)
     public void testDenySchemaPrivilege()
     {
         SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-schema.json");
-        TrinoPrincipal grantee = new TrinoPrincipal(PrincipalType.USER, "alice");
+        TrinoPrincipal grantee = new TrinoPrincipal(USER, "alice");
 
         accessControl.checkCanDenySchemaPrivilege(ADMIN, UPDATE, new CatalogSchemaName("some-catalog", "bob"), grantee);
         accessControl.checkCanDenySchemaPrivilege(ADMIN, UPDATE, new CatalogSchemaName("some-catalog", "staff"), grantee);
@@ -405,7 +379,7 @@ public void testDenySchemaPrivilege()
     public void testRevokeSchemaPrivilege(Privilege privilege, boolean grantOption)
     {
         SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-schema.json");
-        TrinoPrincipal grantee = new TrinoPrincipal(PrincipalType.USER, "alice");
+        TrinoPrincipal grantee = new TrinoPrincipal(USER, "alice");
 
         accessControl.checkCanRevokeSchemaPrivilege(ADMIN, privilege, new CatalogSchemaName("some-catalog", "bob"), grantee, grantOption);
         accessControl.checkCanRevokeSchemaPrivilege(ADMIN, privilege, new CatalogSchemaName("some-catalog", "staff"), grantee, grantOption);
@@ -526,18 +500,8 @@ public void testTableRulesForCheckCanShowColumnsWithNoAccess()
     public void testFunctionRulesForCheckExecuteAndGrantExecuteFunctionWithNoAccess()
     {
         SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-no-access.json");
-        assertAccessDenied(() -> accessControl.checkCanExecuteFunction(ALICE, "some_function"), EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanExecuteFunction(ALICE, AGGREGATE, new CatalogSchemaRoutineName("alice-catalog", "schema", "some_function")), EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanExecuteFunction(ALICE, SCALAR, new CatalogSchemaRoutineName("alice-catalog", "schema", "some_function")), EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanExecuteFunction(ALICE, TABLE, new CatalogSchemaRoutineName("alice-catalog", "schema", "some_table_function")), EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanExecuteFunction(ALICE, WINDOW, new CatalogSchemaRoutineName("alice-catalog", "schema", "some_function")), EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-
-        TrinoPrincipal grantee = new TrinoPrincipal(USER, "some_user");
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, "some_function", grantee, true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, AGGREGATE, new CatalogSchemaRoutineName("alice-catalog", "schema", "some_function"), grantee, true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, SCALAR, new CatalogSchemaRoutineName("alice-catalog", "schema", "some_function"), grantee, true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, TABLE, new CatalogSchemaRoutineName("alice-catalog", "schema", "some_table_function"), grantee, true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, WINDOW, new CatalogSchemaRoutineName("alice-catalog", "schema", "some_function"), grantee, true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
+        assertThat(accessControl.canExecuteFunction(ALICE, new CatalogSchemaRoutineName("alice-catalog", "schema", "some_function"))).isFalse();
+        assertThat(accessControl.canCreateViewWithExecuteFunction(ALICE, new CatalogSchemaRoutineName("alice-catalog", "schema", "some_function"))).isFalse();
     }
 
     @Test
@@ -784,9 +748,9 @@ public void testTableRulesForMixedGroupUsers()
         SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-table-mixed-groups.json");
 
         SystemSecurityContext userGroup1Group2 = new SystemSecurityContext(Identity.forUser("user_1_2")
-                .withGroups(ImmutableSet.of("group1", "group2")).build(), Optional.empty());
+                .withGroups(ImmutableSet.of("group1", "group2")).build(), queryId, queryStart);
         SystemSecurityContext userGroup2 = new SystemSecurityContext(Identity.forUser("user_2")
-                .withGroups(ImmutableSet.of("group2")).build(), Optional.empty());
+                .withGroups(ImmutableSet.of("group2")).build(), queryId, queryStart);
 
         assertEquals(
                 accessControl.getColumnMask(
@@ -802,12 +766,16 @@ public void testTableRulesForMixedGroupUsers()
                         new CatalogSchemaTableName("some-catalog", "my_schema", "my_table"),
                         "col_a",
                         VARCHAR).orElseThrow(),
-                new ViewExpression(Optional.empty(), Optional.of("some-catalog"), Optional.of("my_schema"), "'mask_a'"));
+                ViewExpression.builder()
+                        .catalog("some-catalog")
+                        .schema("my_schema")
+                        .expression("'mask_a'")
+                        .build());
 
         SystemSecurityContext userGroup1Group3 = new SystemSecurityContext(Identity.forUser("user_1_3")
-                .withGroups(ImmutableSet.of("group1", "group3")).build(), Optional.empty());
+                .withGroups(ImmutableSet.of("group1", "group3")).build(), queryId, queryStart);
         SystemSecurityContext userGroup3 = new SystemSecurityContext(Identity.forUser("user_3")
-                .withGroups(ImmutableSet.of("group3")).build(), Optional.empty());
+                .withGroups(ImmutableSet.of("group3")).build(), queryId, queryStart);
 
         assertEquals(
                 accessControl.getRowFilters(
@@ -821,61 +789,11 @@ public void testTableRulesForMixedGroupUsers()
         assertEquals(rowFilters.size(), 1);
         assertViewExpressionEquals(
                 rowFilters.get(0),
-                new ViewExpression(Optional.empty(), Optional.of("some-catalog"), Optional.of("my_schema"), "country='US'"));
-    }
-
-    @Test
-    public void testCheckCanSetTableAuthorizationForAdmin()
-    {
-        SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-table.json");
-
-        accessControl.checkCanSetTableAuthorization(ADMIN, new CatalogSchemaTableName("some-catalog", "test", "test"), new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
-        accessControl.checkCanSetTableAuthorization(ADMIN, new CatalogSchemaTableName("some-catalog", "test", "test"), new TrinoPrincipal(PrincipalType.USER, "some_user"));
-    }
-
-    @Test
-    public void testCheckCanSetViewAuthorizationForAdmin()
-    {
-        SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-table.json");
-
-        accessControl.checkCanSetViewAuthorization(ADMIN, new CatalogSchemaTableName("some-catalog", "test", "test"), new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
-        accessControl.checkCanSetViewAuthorization(ADMIN, new CatalogSchemaTableName("some-catalog", "test", "test"), new TrinoPrincipal(PrincipalType.USER, "some_user"));
-    }
-
-    @Test
-    public void testCheckCanSetTableAuthorizationForOwner()
-    {
-        SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-table.json");
-
-        accessControl.checkCanSetTableAuthorization(ALICE, new CatalogSchemaTableName("some-catalog", "aliceschema", "test"), new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
-        accessControl.checkCanSetTableAuthorization(ALICE, new CatalogSchemaTableName("some-catalog", "aliceschema", "test"), new TrinoPrincipal(PrincipalType.USER, "some_user"));
-    }
-
-    @Test
-    public void testCheckCanSetViewAuthorizationForOwner()
-    {
-        SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-table.json");
-
-        accessControl.checkCanSetViewAuthorization(ALICE, new CatalogSchemaTableName("some-catalog", "aliceschema", "test"), new TrinoPrincipal(PrincipalType.ROLE, "some_role"));
-        accessControl.checkCanSetViewAuthorization(ALICE, new CatalogSchemaTableName("some-catalog", "aliceschema", "test"), new TrinoPrincipal(PrincipalType.USER, "some_user"));
-    }
-
-    @Test
-    public void testCheckCanSetTableAuthorizationForNonOwner()
-    {
-        SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-table.json");
-
-        assertAccessDenied(() -> accessControl.checkCanSetTableAuthorization(ALICE, new CatalogSchemaTableName("some-catalog", "test", "test"), new TrinoPrincipal(PrincipalType.ROLE, "some_role")), AUTH_TABLE_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanSetTableAuthorization(ALICE, new CatalogSchemaTableName("some-catalog", "test", "test"), new TrinoPrincipal(PrincipalType.USER, "some_user")), AUTH_TABLE_ACCESS_DENIED_MESSAGE);
-    }
-
-    @Test
-    public void testCheckCanSetViewAuthorizationForNonOwner()
-    {
-        SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-table.json");
-
-        assertAccessDenied(() -> accessControl.checkCanSetViewAuthorization(ALICE, new CatalogSchemaTableName("some-catalog", "test", "test"), new TrinoPrincipal(PrincipalType.ROLE, "some_role")), AUTH_VIEW_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanSetViewAuthorization(ALICE, new CatalogSchemaTableName("some-catalog", "test", "test"), new TrinoPrincipal(PrincipalType.USER, "some_user")), AUTH_VIEW_ACCESS_DENIED_MESSAGE);
+                ViewExpression.builder()
+                        .catalog("some-catalog")
+                        .schema("my_schema")
+                        .expression("country='US'")
+                        .build());
     }
 
     @Test
@@ -913,38 +831,26 @@ public void testCanSetUserOperations()
     {
         SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-catalog_principal.json");
 
-        try {
-            accessControl.checkCanSetUser(Optional.empty(), alice.getUser());
-            throw new AssertionError("expected AccessDeniedException");
-        }
-        catch (AccessDeniedException expected) {
-        }
+        assertAccessDenied(
+                () -> accessControl.checkCanSetUser(Optional.empty(), alice.getUser()),
+                "Principal null cannot become user alice");
 
         accessControl.checkCanSetUser(kerberosValidAlice.getPrincipal(), kerberosValidAlice.getUser());
         accessControl.checkCanSetUser(kerberosValidNonAsciiUser.getPrincipal(), kerberosValidNonAsciiUser.getUser());
-        try {
-            accessControl.checkCanSetUser(kerberosInvalidAlice.getPrincipal(), kerberosInvalidAlice.getUser());
-            throw new AssertionError("expected AccessDeniedException");
-        }
-        catch (AccessDeniedException expected) {
-        }
+        assertAccessDenied(
+                () -> accessControl.checkCanSetUser(kerberosInvalidAlice.getPrincipal(), kerberosInvalidAlice.getUser()),
+                "Principal mallory/example.com@EXAMPLE.COM cannot become user alice");
 
         accessControl.checkCanSetUser(kerberosValidShare.getPrincipal(), kerberosValidShare.getUser());
-        try {
-            accessControl.checkCanSetUser(kerberosInValidShare.getPrincipal(), kerberosInValidShare.getUser());
-            throw new AssertionError("expected AccessDeniedException");
-        }
-        catch (AccessDeniedException expected) {
-        }
+        assertAccessDenied(
+                () -> accessControl.checkCanSetUser(kerberosInValidShare.getPrincipal(), kerberosInValidShare.getUser()),
+                "Principal invalid/example.com@EXAMPLE.COM cannot become user alice");
 
         accessControl.checkCanSetUser(validSpecialRegexWildDot.getPrincipal(), validSpecialRegexWildDot.getUser());
         accessControl.checkCanSetUser(validSpecialRegexEndQuote.getPrincipal(), validSpecialRegexEndQuote.getUser());
-        try {
-            accessControl.checkCanSetUser(invalidSpecialRegex.getPrincipal(), invalidSpecialRegex.getUser());
-            throw new AssertionError("expected AccessDeniedException");
-        }
-        catch (AccessDeniedException expected) {
-        }
+        assertAccessDenied(
+                () -> accessControl.checkCanSetUser(invalidSpecialRegex.getPrincipal(), invalidSpecialRegex.getUser()),
+                "Principal special/.*@EXAMPLE.COM cannot become user alice");
 
         SystemAccessControl accessControlNoPatterns = newFileBasedSystemAccessControl("file-based-system-catalog.json");
         accessControlNoPatterns.checkCanSetUser(kerberosValidAlice.getPrincipal(), kerberosValidAlice.getUser());
@@ -955,56 +861,56 @@ public void testQuery()
     {
         SystemAccessControl accessControlManager = newFileBasedSystemAccessControl("query.json");
 
-        accessControlManager.checkCanExecuteQuery(new SystemSecurityContext(admin, queryId));
-        accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(admin, queryId), any);
-        assertEquals(accessControlManager.filterViewQueryOwnedBy(new SystemSecurityContext(admin, queryId), ImmutableSet.of("a", "b")), ImmutableSet.of("a", "b"));
-        accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(admin, queryId), any);
+        accessControlManager.checkCanExecuteQuery(admin);
+        accessControlManager.checkCanViewQueryOwnedBy(admin, any);
+        assertEquals(accessControlManager.filterViewQueryOwnedBy(admin, ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b"))), ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b")));
+        accessControlManager.checkCanKillQueryOwnedBy(admin, any);
 
-        accessControlManager.checkCanExecuteQuery(new SystemSecurityContext(alice, queryId));
-        accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(alice, queryId), any);
-        assertEquals(accessControlManager.filterViewQueryOwnedBy(new SystemSecurityContext(alice, queryId), ImmutableSet.of("a", "b")), ImmutableSet.of("a", "b"));
-        assertThatThrownBy(() -> accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(alice, queryId), any))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
+        accessControlManager.checkCanExecuteQuery(alice);
+        accessControlManager.checkCanViewQueryOwnedBy(alice, any);
+        assertEquals(accessControlManager.filterViewQueryOwnedBy(alice, ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b"))), ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b")));
+        assertAccessDenied(
+                () -> accessControlManager.checkCanKillQueryOwnedBy(alice, any),
+                "Cannot view query");
 
-        assertThatThrownBy(() -> accessControlManager.checkCanExecuteQuery(new SystemSecurityContext(bob, queryId)))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
-        assertThatThrownBy(() -> accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(bob, queryId), any))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
-        assertEquals(accessControlManager.filterViewQueryOwnedBy(new SystemSecurityContext(bob, queryId), ImmutableSet.of("a", "b")), ImmutableSet.of());
-        accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(bob, queryId), any);
-
-        accessControlManager.checkCanExecuteQuery(new SystemSecurityContext(dave, queryId));
-        accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(dave, queryId), alice);
-        accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(dave, queryId), dave);
-        assertEquals(accessControlManager.filterViewQueryOwnedBy(new SystemSecurityContext(dave, queryId), ImmutableSet.of("alice", "bob", "dave", "admin")),
-                ImmutableSet.of("alice", "dave"));
-        assertThatThrownBy(() -> accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(dave, queryId), alice))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
-        assertThatThrownBy(() -> accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(dave, queryId), bob))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
-        assertThatThrownBy(() -> accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(dave, queryId), bob))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
-        assertThatThrownBy(() -> accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(dave, queryId), admin))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanExecuteQuery(bob),
+                "Cannot view query");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanViewQueryOwnedBy(bob, any),
+                "Cannot view query");
+        assertEquals(accessControlManager.filterViewQueryOwnedBy(bob, ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b"))), ImmutableSet.of());
+        accessControlManager.checkCanKillQueryOwnedBy(bob, any);
+
+        accessControlManager.checkCanExecuteQuery(dave);
+        accessControlManager.checkCanViewQueryOwnedBy(dave, alice);
+        accessControlManager.checkCanViewQueryOwnedBy(dave, dave);
+        assertEquals(accessControlManager.filterViewQueryOwnedBy(dave, ImmutableSet.of(Identity.ofUser("alice"), Identity.ofUser("bob"), Identity.ofUser("dave"), Identity.ofUser("admin"))),
+                ImmutableSet.of(Identity.ofUser("alice"), Identity.ofUser("dave")));
+        assertAccessDenied(
+                () -> accessControlManager.checkCanKillQueryOwnedBy(dave, alice),
+                "Cannot view query");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanKillQueryOwnedBy(dave, bob),
+                "Cannot view query");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanViewQueryOwnedBy(dave, bob),
+                "Cannot view query");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanViewQueryOwnedBy(dave, admin),
+                "Cannot view query");
 
         Identity contractor = Identity.forUser("some-other-contractor").withGroups(ImmutableSet.of("contractors")).build();
-        accessControlManager.checkCanExecuteQuery(new SystemSecurityContext(contractor, queryId));
-        accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(contractor, queryId), dave);
-        assertThatThrownBy(() -> accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(contractor, queryId), dave))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
+        accessControlManager.checkCanExecuteQuery(contractor);
+        accessControlManager.checkCanViewQueryOwnedBy(contractor, dave);
+        assertAccessDenied(
+                () -> accessControlManager.checkCanKillQueryOwnedBy(contractor, dave),
+                "Cannot view query");
 
-        accessControlManager.checkCanExecuteQuery(new SystemSecurityContext(nonAsciiUser, queryId));
-        accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(nonAsciiUser, queryId), any);
-        assertEquals(accessControlManager.filterViewQueryOwnedBy(new SystemSecurityContext(nonAsciiUser, queryId), ImmutableSet.of("a", "b")), ImmutableSet.of("a", "b"));
-        accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(nonAsciiUser, queryId), any);
+        accessControlManager.checkCanExecuteQuery(nonAsciiUser);
+        accessControlManager.checkCanViewQueryOwnedBy(nonAsciiUser, any);
+        assertEquals(accessControlManager.filterViewQueryOwnedBy(nonAsciiUser, ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b"))), ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b")));
+        accessControlManager.checkCanKillQueryOwnedBy(nonAsciiUser, any);
     }
 
     @Test
@@ -1019,10 +925,10 @@ public void testQueryNotSet()
     {
         SystemAccessControl accessControlManager = newFileBasedSystemAccessControl("file-based-system-catalog.json");
 
-        accessControlManager.checkCanExecuteQuery(new SystemSecurityContext(bob, queryId));
-        accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(bob, queryId), any);
-        assertEquals(accessControlManager.filterViewQueryOwnedBy(new SystemSecurityContext(bob, queryId), ImmutableSet.of("a", "b")), ImmutableSet.of("a", "b"));
-        accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(bob, queryId), any);
+        accessControlManager.checkCanExecuteQuery(bob);
+        accessControlManager.checkCanViewQueryOwnedBy(bob, any);
+        assertEquals(accessControlManager.filterViewQueryOwnedBy(bob, ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b"))), ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b")));
+        accessControlManager.checkCanKillQueryOwnedBy(bob, any);
     }
 
     @Test
@@ -1031,51 +937,50 @@ public void testQueryDocsExample()
         File rulesFile = new File("../../docs/src/main/sphinx/security/query-access.json");
         SystemAccessControl accessControlManager = newFileBasedSystemAccessControl(rulesFile, ImmutableMap.of());
 
-        accessControlManager.checkCanExecuteQuery(new SystemSecurityContext(admin, queryId));
-        accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(admin, queryId), any);
-        assertEquals(accessControlManager.filterViewQueryOwnedBy(new SystemSecurityContext(admin, queryId), ImmutableSet.of("a", "b")), ImmutableSet.of("a", "b"));
-        accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(admin, queryId), any);
+        accessControlManager.checkCanExecuteQuery(admin);
+        accessControlManager.checkCanViewQueryOwnedBy(admin, any);
+        assertEquals(accessControlManager.filterViewQueryOwnedBy(admin, ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b"))), ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b")));
+        accessControlManager.checkCanKillQueryOwnedBy(admin, any);
 
-        accessControlManager.checkCanExecuteQuery(new SystemSecurityContext(alice, queryId));
-        assertThatThrownBy(() -> accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(alice, queryId), any))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
-        assertEquals(accessControlManager.filterViewQueryOwnedBy(new SystemSecurityContext(alice, queryId), ImmutableSet.of("a", "b")), ImmutableSet.of());
-        accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(alice, queryId), any);
+        accessControlManager.checkCanExecuteQuery(alice);
+        assertAccessDenied(
+                () -> accessControlManager.checkCanViewQueryOwnedBy(alice, any),
+                "Cannot view query");
+        assertEquals(accessControlManager.filterViewQueryOwnedBy(alice, ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b"))), ImmutableSet.of());
+        accessControlManager.checkCanKillQueryOwnedBy(alice, any);
 
-        accessControlManager.checkCanExecuteQuery(new SystemSecurityContext(bob, queryId));
-        assertThatThrownBy(() -> accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(bob, queryId), any))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
-        assertEquals(accessControlManager.filterViewQueryOwnedBy(new SystemSecurityContext(bob, queryId), ImmutableSet.of("a", "b")), ImmutableSet.of());
-        assertThatThrownBy(() -> accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(bob, queryId), any))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
-
-        accessControlManager.checkCanExecuteQuery(new SystemSecurityContext(dave, queryId));
-        accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(dave, queryId), alice);
-        accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(dave, queryId), dave);
-        assertEquals(accessControlManager.filterViewQueryOwnedBy(new SystemSecurityContext(dave, queryId), ImmutableSet.of("alice", "bob", "dave", "admin")),
-                ImmutableSet.of("alice", "dave"));
-        assertThatThrownBy(() -> accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(dave, queryId), alice))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
-        assertThatThrownBy(() -> accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(dave, queryId), bob))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
-        assertThatThrownBy(() -> accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(dave, queryId), bob))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
-        assertThatThrownBy(() -> accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(dave, queryId), admin))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
+        accessControlManager.checkCanExecuteQuery(alice);
+        assertAccessDenied(
+                () -> accessControlManager.checkCanViewQueryOwnedBy(bob, any),
+                "Cannot view query");
+        assertEquals(accessControlManager.filterViewQueryOwnedBy(bob, ImmutableSet.of(Identity.ofUser("a"), Identity.ofUser("b"))), ImmutableSet.of());
+        assertAccessDenied(
+                () -> accessControlManager.checkCanKillQueryOwnedBy(bob, any),
+                "Cannot view query");
+
+        accessControlManager.checkCanExecuteQuery(dave);
+        accessControlManager.checkCanViewQueryOwnedBy(dave, alice);
+        accessControlManager.checkCanViewQueryOwnedBy(dave, dave);
+        assertEquals(accessControlManager.filterViewQueryOwnedBy(dave, ImmutableSet.of(Identity.ofUser("alice"), Identity.ofUser("bob"), Identity.ofUser("dave"), Identity.ofUser("admin"))),
+                ImmutableSet.of(Identity.ofUser("alice"), Identity.ofUser("dave")));
+        assertAccessDenied(
+                () -> accessControlManager.checkCanKillQueryOwnedBy(dave, alice),
+                "Cannot view query");
+        assertAccessDenied(() -> accessControlManager.checkCanKillQueryOwnedBy(dave, bob),
+                "Cannot view query");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanViewQueryOwnedBy(dave, bob),
+                "Cannot view query");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanViewQueryOwnedBy(dave, admin),
+                "Cannot view query");
 
         Identity contractor = Identity.forUser("some-other-contractor").withGroups(ImmutableSet.of("contractors")).build();
-        accessControlManager.checkCanExecuteQuery(new SystemSecurityContext(contractor, queryId));
-        accessControlManager.checkCanViewQueryOwnedBy(new SystemSecurityContext(contractor, queryId), dave);
-        assertThatThrownBy(() -> accessControlManager.checkCanKillQueryOwnedBy(new SystemSecurityContext(contractor, queryId), dave))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot view query");
+        accessControlManager.checkCanExecuteQuery(contractor);
+        accessControlManager.checkCanViewQueryOwnedBy(contractor, dave);
+        assertAccessDenied(
+                () -> accessControlManager.checkCanKillQueryOwnedBy(contractor, dave),
+                "Cannot view query");
     }
 
     @Test
@@ -1083,23 +988,23 @@ public void testSystemInformation()
     {
         SystemAccessControl accessControlManager = newFileBasedSystemAccessControl("system-information.json");
 
-        accessControlManager.checkCanReadSystemInformation(new SystemSecurityContext(admin, Optional.empty()));
-        accessControlManager.checkCanWriteSystemInformation(new SystemSecurityContext(admin, Optional.empty()));
+        accessControlManager.checkCanReadSystemInformation(admin);
+        accessControlManager.checkCanWriteSystemInformation(admin);
 
-        accessControlManager.checkCanReadSystemInformation(new SystemSecurityContext(alice, Optional.empty()));
-        assertThatThrownBy(() -> accessControlManager.checkCanWriteSystemInformation(new SystemSecurityContext(alice, Optional.empty())))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot write system information");
+        accessControlManager.checkCanReadSystemInformation(alice);
+        assertAccessDenied(
+                () -> accessControlManager.checkCanWriteSystemInformation(alice),
+                "Cannot write system information");
 
-        assertThatThrownBy(() -> accessControlManager.checkCanReadSystemInformation(new SystemSecurityContext(bob, Optional.empty())))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot read system information");
-        assertThatThrownBy(() -> accessControlManager.checkCanWriteSystemInformation(new SystemSecurityContext(bob, Optional.empty())))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot write system information");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanReadSystemInformation(bob),
+                "Cannot read system information");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanWriteSystemInformation(bob),
+                "Cannot write system information");
 
-        accessControlManager.checkCanReadSystemInformation(new SystemSecurityContext(nonAsciiUser, Optional.empty()));
-        accessControlManager.checkCanWriteSystemInformation(new SystemSecurityContext(nonAsciiUser, Optional.empty()));
+        accessControlManager.checkCanReadSystemInformation(nonAsciiUser);
+        accessControlManager.checkCanWriteSystemInformation(nonAsciiUser);
     }
 
     @Test
@@ -1107,12 +1012,12 @@ public void testSystemInformationNotSet()
     {
         SystemAccessControl accessControlManager = newFileBasedSystemAccessControl("file-based-system-catalog.json");
 
-        assertThatThrownBy(() -> accessControlManager.checkCanReadSystemInformation(new SystemSecurityContext(bob, Optional.empty())))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot read system information");
-        assertThatThrownBy(() -> accessControlManager.checkCanWriteSystemInformation(new SystemSecurityContext(bob, Optional.empty())))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot write system information");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanReadSystemInformation(bob),
+                "Cannot read system information");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanWriteSystemInformation(bob),
+                "Cannot write system information");
     }
 
     @Test
@@ -1121,51 +1026,20 @@ public void testSystemInformationDocsExample()
         File rulesFile = new File("../../docs/src/main/sphinx/security/system-information-access.json");
         SystemAccessControl accessControlManager = newFileBasedSystemAccessControl(rulesFile, ImmutableMap.of());
 
-        accessControlManager.checkCanReadSystemInformation(new SystemSecurityContext(admin, Optional.empty()));
-        accessControlManager.checkCanWriteSystemInformation(new SystemSecurityContext(admin, Optional.empty()));
-
-        accessControlManager.checkCanReadSystemInformation(new SystemSecurityContext(alice, Optional.empty()));
-        assertThatThrownBy(() -> accessControlManager.checkCanWriteSystemInformation(new SystemSecurityContext(alice, Optional.empty())))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot write system information");
-
-        assertThatThrownBy(() -> accessControlManager.checkCanReadSystemInformation(new SystemSecurityContext(bob, Optional.empty())))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot read system information");
-        assertThatThrownBy(() -> accessControlManager.checkCanWriteSystemInformation(new SystemSecurityContext(bob, Optional.empty())))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessage("Access Denied: Cannot write system information");
-    }
-
-    @Test
-    public void testSchemaOperations()
-    {
-        SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-catalog.json");
-
-        TrinoPrincipal user = new TrinoPrincipal(PrincipalType.USER, "some_user");
-        TrinoPrincipal role = new TrinoPrincipal(PrincipalType.ROLE, "some_user");
+        accessControlManager.checkCanReadSystemInformation(admin);
+        accessControlManager.checkCanWriteSystemInformation(admin);
 
-        accessControl.checkCanSetSchemaAuthorization(new SystemSecurityContext(admin, queryId), new CatalogSchemaName("alice-catalog", "some_schema"), user);
-        accessControl.checkCanSetSchemaAuthorization(new SystemSecurityContext(admin, queryId), new CatalogSchemaName("alice-catalog", "some_schema"), role);
-
-        accessControl.checkCanSetSchemaAuthorization(new SystemSecurityContext(alice, queryId), new CatalogSchemaName("alice-catalog", "some_schema"), user);
-        accessControl.checkCanSetSchemaAuthorization(new SystemSecurityContext(alice, queryId), new CatalogSchemaName("alice-catalog", "some_schema"), role);
-
-        assertThatThrownBy(() -> accessControl.checkCanSetSchemaAuthorization(new SystemSecurityContext(bob, queryId), new CatalogSchemaName("alice-catalog", "some_schema"), user))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessageStartingWith("Access Denied: Cannot set authorization for schema alice-catalog.some_schema");
-
-        assertThatThrownBy(() -> accessControl.checkCanSetSchemaAuthorization(new SystemSecurityContext(bob, queryId), new CatalogSchemaName("alice-catalog", "some_schema"), role))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessageStartingWith("Access Denied: Cannot set authorization for schema alice-catalog.some_schema");
-
-        assertThatThrownBy(() -> accessControl.checkCanSetSchemaAuthorization(new SystemSecurityContext(alice, queryId), new CatalogSchemaName("secret", "some_schema"), user))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessageStartingWith("Access Denied: Cannot set authorization for schema secret.some_schema");
+        accessControlManager.checkCanReadSystemInformation(alice);
+        assertAccessDenied(
+                () -> accessControlManager.checkCanWriteSystemInformation(alice),
+                "Cannot write system information");
 
-        assertThatThrownBy(() -> accessControl.checkCanSetSchemaAuthorization(new SystemSecurityContext(alice, queryId), new CatalogSchemaName("secret", "some_schema"), role))
-                .isInstanceOf(AccessDeniedException.class)
-                .hasMessageStartingWith("Access Denied: Cannot set authorization for schema secret.some_schema");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanReadSystemInformation(bob),
+                "Cannot read system information");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanWriteSystemInformation(bob),
+                "Cannot write system information");
     }
 
     @Test
@@ -1173,18 +1047,18 @@ public void testSessionPropertyRules()
     {
         SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-session-property.json");
 
-        accessControl.checkCanSetSystemSessionProperty(ADMIN, "dangerous");
-        accessControl.checkCanSetSystemSessionProperty(ADMIN, "any");
-        accessControl.checkCanSetSystemSessionProperty(ALICE, "safe");
-        accessControl.checkCanSetSystemSessionProperty(ALICE, "unsafe");
-        accessControl.checkCanSetSystemSessionProperty(ALICE, "staff");
-        accessControl.checkCanSetSystemSessionProperty(BOB, "safe");
-        accessControl.checkCanSetSystemSessionProperty(BOB, "staff");
-        assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(BOB, "unsafe"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(ALICE, "dangerous"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(CHARLIE, "safe"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(CHARLIE, "staff"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(JOE, "staff"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
+        accessControl.checkCanSetSystemSessionProperty(admin, "dangerous");
+        accessControl.checkCanSetSystemSessionProperty(admin, "any");
+        accessControl.checkCanSetSystemSessionProperty(alice, "safe");
+        accessControl.checkCanSetSystemSessionProperty(alice, "unsafe");
+        accessControl.checkCanSetSystemSessionProperty(alice, "staff");
+        accessControl.checkCanSetSystemSessionProperty(bob, "safe");
+        accessControl.checkCanSetSystemSessionProperty(bob, "staff");
+        assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(bob, "unsafe"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(alice, "dangerous"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(charlie, "safe"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(charlie, "staff"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(joe, "staff"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
 
         accessControl.checkCanSetCatalogSessionProperty(ADMIN, "any", "dangerous");
         accessControl.checkCanSetCatalogSessionProperty(ADMIN, "alice-catalog", "dangerous");
@@ -1208,23 +1082,24 @@ public void testSessionPropertyDocsExample()
     {
         File rulesFile = new File("../../docs/src/main/sphinx/security/session-property-access.json");
         SystemAccessControl accessControl = newFileBasedSystemAccessControl(rulesFile, ImmutableMap.of());
-        SystemSecurityContext bannedUser = new SystemSecurityContext(Identity.ofUser("banned_user"), queryId);
+        Identity bannedUser = Identity.ofUser("banned_user");
+        SystemSecurityContext bannedUserContext = new SystemSecurityContext(Identity.ofUser("banned_user"), queryId, queryStart);
 
-        accessControl.checkCanSetSystemSessionProperty(ADMIN, "any");
-        assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(ALICE, "any"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
+        accessControl.checkCanSetSystemSessionProperty(admin, "any");
+        assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(alice, "any"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
         assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(bannedUser, "any"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
 
-        accessControl.checkCanSetSystemSessionProperty(ADMIN, "resource_overcommit");
-        accessControl.checkCanSetSystemSessionProperty(ALICE, "resource_overcommit");
+        accessControl.checkCanSetSystemSessionProperty(admin, "resource_overcommit");
+        accessControl.checkCanSetSystemSessionProperty(alice, "resource_overcommit");
         assertAccessDenied(() -> accessControl.checkCanSetSystemSessionProperty(bannedUser, "resource_overcommit"), SET_SYSTEM_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
 
         accessControl.checkCanSetCatalogSessionProperty(ADMIN, "hive", "any");
         assertAccessDenied(() -> accessControl.checkCanSetCatalogSessionProperty(ALICE, "hive", "any"), SET_CATALOG_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanSetCatalogSessionProperty(bannedUser, "hive", "any"), SET_CATALOG_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanSetCatalogSessionProperty(bannedUserContext, "hive", "any"), SET_CATALOG_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
 
         accessControl.checkCanSetCatalogSessionProperty(ADMIN, "hive", "bucket_execution_enabled");
         accessControl.checkCanSetCatalogSessionProperty(ALICE, "hive", "bucket_execution_enabled");
-        assertAccessDenied(() -> accessControl.checkCanSetCatalogSessionProperty(bannedUser, "hive", "bucket_execution_enabled"), SET_CATALOG_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanSetCatalogSessionProperty(bannedUserContext, "hive", "bucket_execution_enabled"), SET_CATALOG_SESSION_PROPERTY_ACCESS_DENIED_MESSAGE);
     }
 
     @Test
@@ -1308,7 +1183,7 @@ public void testFilterSchemas()
 
         assertEquals(accessControl.filterSchemas(ADMIN, "specific-catalog", ImmutableSet.of("specific-schema", "unknown")), ImmutableSet.of("specific-schema", "unknown"));
         assertEquals(accessControl.filterSchemas(ALICE, "specific-catalog", ImmutableSet.of("specific-schema", "unknown")), ImmutableSet.of("specific-schema"));
-        assertEquals(accessControl.filterSchemas(BOB, "specific-catalog", ImmutableSet.of("specific-schema", "unknown")), ImmutableSet.of("specific-schema"));
+        assertEquals(accessControl.filterSchemas(BOB, "specific-catalog", ImmutableSet.of("specific-schema")), ImmutableSet.of("specific-schema"));
         assertEquals(accessControl.filterSchemas(CHARLIE, "specific-catalog", ImmutableSet.of("specific-schema", "unknown")), ImmutableSet.of("specific-schema"));
 
         assertEquals(accessControl.filterSchemas(ADMIN, "alice-catalog", ImmutableSet.of("alice-schema", "bob-schema", "unknown")), ImmutableSet.of("alice-schema", "bob-schema", "unknown"));
@@ -1406,6 +1281,55 @@ public void testSchemaRulesForCheckCanShowTables()
         assertAccessDenied(() -> accessControl.checkCanShowTables(CHARLIE, new CatalogSchemaName("unknown", "any")), SHOWN_TABLES_ACCESS_DENIED_MESSAGE);
     }
 
+    @Test
+    public void testSchemaRulesForCheckCanShowFunctions()
+    {
+        SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-visibility.json");
+
+        accessControl.checkCanShowFunctions(ADMIN, new CatalogSchemaName("specific-catalog", "specific-schema"));
+        accessControl.checkCanShowFunctions(ADMIN, new CatalogSchemaName("bob-catalog", "bob-schema"));
+        accessControl.checkCanShowFunctions(ADMIN, new CatalogSchemaName("bob-catalog", "any"));
+        accessControl.checkCanShowFunctions(ADMIN, new CatalogSchemaName("alice-catalog", "alice-schema"));
+        accessControl.checkCanShowFunctions(ADMIN, new CatalogSchemaName("alice-catalog", "any"));
+        accessControl.checkCanShowFunctions(ADMIN, new CatalogSchemaName("secret", "secret"));
+        accessControl.checkCanShowFunctions(ADMIN, new CatalogSchemaName("hidden", "any"));
+        accessControl.checkCanShowFunctions(ADMIN, new CatalogSchemaName("open-to-all", "any"));
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(ADMIN, new CatalogSchemaName("blocked-catalog", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        accessControl.checkCanShowFunctions(ADMIN, new CatalogSchemaName("unknown", "any"));
+
+        accessControl.checkCanShowFunctions(ALICE, new CatalogSchemaName("specific-catalog", "specific-schema"));
+        accessControl.checkCanShowFunctions(ALICE, new CatalogSchemaName("alice-catalog", "alice-schema"));
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(ALICE, new CatalogSchemaName("bob-catalog", "bob-schema")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(ALICE, new CatalogSchemaName("secret", "secret")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(ALICE, new CatalogSchemaName("hidden", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(ALICE, new CatalogSchemaName("open-to-all", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(ALICE, new CatalogSchemaName("blocked-catalog", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(ALICE, new CatalogSchemaName("unknown", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+
+        accessControl.checkCanShowFunctions(BOB, new CatalogSchemaName("specific-catalog", "specific-schema"));
+        accessControl.checkCanShowFunctions(BOB, new CatalogSchemaName("bob-catalog", "bob-schema"));
+        accessControl.checkCanShowFunctions(BOB, new CatalogSchemaName("alice-catalog", "bob-schema"));
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(BOB, new CatalogSchemaName("bob-catalog", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(BOB, new CatalogSchemaName("alice-catalog", "alice-schema")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(BOB, new CatalogSchemaName("alice-catalog", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(BOB, new CatalogSchemaName("secret", "secret")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(BOB, new CatalogSchemaName("hidden", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(BOB, new CatalogSchemaName("open-to-all", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(BOB, new CatalogSchemaName("blocked-catalog", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(BOB, new CatalogSchemaName("unknown", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+
+        accessControl.checkCanShowFunctions(CHARLIE, new CatalogSchemaName("specific-catalog", "specific-schema"));
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, new CatalogSchemaName("bob-catalog", "bob-schema")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, new CatalogSchemaName("bob-catalog", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, new CatalogSchemaName("alice-catalog", "alice-schema")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, new CatalogSchemaName("alice-catalog", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, new CatalogSchemaName("secret", "secret")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, new CatalogSchemaName("hidden", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, new CatalogSchemaName("open-to-all", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, new CatalogSchemaName("blocked-catalog", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(() -> accessControl.checkCanShowFunctions(CHARLIE, new CatalogSchemaName("unknown", "any")), SHOWN_FUNCTIONS_ACCESS_DENIED_MESSAGE);
+    }
+
     @Test
     public void testGetColumnMask()
     {
@@ -1425,7 +1349,11 @@ public void testGetColumnMask()
                         new CatalogSchemaTableName("some-catalog", "bobschema", "bobcolumns"),
                         "masked",
                         VARCHAR).orElseThrow(),
-                new ViewExpression(Optional.empty(), Optional.of("some-catalog"), Optional.of("bobschema"), "'mask'"));
+                ViewExpression.builder()
+                        .catalog("some-catalog")
+                        .schema("bobschema")
+                        .expression("'mask'")
+                        .build());
 
         assertViewExpressionEquals(
                 accessControl.getColumnMask(
@@ -1433,7 +1361,12 @@ public void testGetColumnMask()
                         new CatalogSchemaTableName("some-catalog", "bobschema", "bobcolumns"),
                         "masked_with_user",
                         VARCHAR).orElseThrow(),
-                new ViewExpression(Optional.of("mask-user"), Optional.of("some-catalog"), Optional.of("bobschema"), "'mask-with-user'"));
+                ViewExpression.builder()
+                        .identity("mask-user")
+                        .catalog("some-catalog")
+                        .schema("bobschema")
+                        .expression("'mask-with-user'")
+                        .build());
     }
 
     @Test
@@ -1449,13 +1382,22 @@ public void testGetRowFilter()
         assertEquals(rowFilters.size(), 1);
         assertViewExpressionEquals(
                 rowFilters.get(0),
-                new ViewExpression(Optional.empty(), Optional.of("some-catalog"), Optional.of("bobschema"), "starts_with(value, 'filter')"));
+                ViewExpression.builder()
+                        .catalog("some-catalog")
+                        .schema("bobschema")
+                        .expression("starts_with(value, 'filter')")
+                        .build());
 
         rowFilters = accessControl.getRowFilters(CHARLIE, new CatalogSchemaTableName("some-catalog", "bobschema", "bobcolumns_with_grant"));
         assertEquals(rowFilters.size(), 1);
         assertViewExpressionEquals(
                 rowFilters.get(0),
-                new ViewExpression(Optional.of("filter-user"), Optional.of("some-catalog"), Optional.of("bobschema"), "starts_with(value, 'filter-with-user')"));
+                ViewExpression.builder()
+                        .identity("filter-user")
+                        .catalog("some-catalog")
+                        .schema("bobschema")
+                        .expression("starts_with(value, 'filter-with-user')")
+                        .build());
     }
 
     private static void assertViewExpressionEquals(ViewExpression actual, ViewExpression expected)
@@ -1464,43 +1406,334 @@ private static void assertViewExpressionEquals(ViewExpression actual, ViewExpres
         assertEquals(actual.getCatalog(), expected.getCatalog(), "Catalog");
         assertEquals(actual.getSchema(), expected.getSchema(), "Schema");
         assertEquals(actual.getExpression(), expected.getExpression(), "Expression");
+        assertEquals(actual.getPath(), expected.getPath(), "Path");
+    }
+
+    @Test
+    public void testProcedureRulesForCheckCanExecute()
+    {
+        SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-visibility.json");
+
+        accessControl.checkCanExecuteProcedure(BOB, new CatalogSchemaRoutineName("alice-catalog", new SchemaRoutineName("procedure-schema", "some_procedure")));
+        assertAccessDenied(
+                () -> accessControl.checkCanExecuteProcedure(BOB, new CatalogSchemaRoutineName("alice-catalog", new SchemaRoutineName("some-schema", "some_procedure"))),
+                EXECUTE_PROCEDURE_ACCESS_DENIED_MESSAGE);
+        assertAccessDenied(
+                () -> accessControl.checkCanExecuteProcedure(BOB, new CatalogSchemaRoutineName("alice-catalog", new SchemaRoutineName("procedure-schema", "another_procedure"))),
+                EXECUTE_PROCEDURE_ACCESS_DENIED_MESSAGE);
+
+        assertAccessDenied(
+                () -> accessControl.checkCanExecuteProcedure(CHARLIE, new CatalogSchemaRoutineName("open-to-all", new SchemaRoutineName("some-schema", "some_procedure"))),
+                EXECUTE_PROCEDURE_ACCESS_DENIED_MESSAGE);
+
+        assertAccessDenied(
+                () -> accessControl.checkCanExecuteProcedure(ALICE, new CatalogSchemaRoutineName("alice-catalog", new SchemaRoutineName("procedure-schema", "some_procedure"))),
+                EXECUTE_PROCEDURE_ACCESS_DENIED_MESSAGE);
     }
 
     @Test
     public void testFunctionRulesForCheckCanExecute()
     {
         SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-visibility.json");
-        assertAccessDenied(() -> accessControl.checkCanExecuteFunction(ADMIN, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function")), EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        accessControl.checkCanExecuteFunction(ALICE, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"));
-        assertAccessDenied(() -> accessControl.checkCanExecuteFunction(BOB, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function")), EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanExecuteFunction(CHARLIE, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function")), EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanExecuteFunction(ADMIN, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_function")), EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanExecuteFunction(ALICE, "some_function"), EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        accessControl.checkCanExecuteFunction(BOB, "some_function");
-        assertAccessDenied(() -> accessControl.checkCanExecuteFunction(CHARLIE, "some_function"), EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
+        assertThat(accessControl.canExecuteFunction(BOB, new CatalogSchemaRoutineName("specific-catalog", "system", "some_function"))).isTrue();
+
+        assertThat(accessControl.canExecuteFunction(ADMIN, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(ADMIN, new CatalogSchemaRoutineName("specific-catalog", "system", "some_function"))).isFalse();
+
+        assertThat(accessControl.canExecuteFunction(ALICE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"))).isTrue();
+        assertThat(accessControl.canExecuteFunction(ALICE, new CatalogSchemaRoutineName("specific-catalog", "system", "some_function"))).isFalse();
+
+        assertThat(accessControl.canExecuteFunction(BOB, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(BOB, new CatalogSchemaRoutineName("specific-catalog", "system", "some_function"))).isTrue();
+
+        assertThat(accessControl.canExecuteFunction(CHARLIE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"))).isFalse();
+        assertThat(accessControl.canExecuteFunction(CHARLIE, new CatalogSchemaRoutineName("specific-catalog", "system", "some_function"))).isFalse();
     }
 
     @Test
-    public void testFunctionRulesForCheckCanGrantExecute()
+    public void testFunctionRulesForCheckCanCreateView()
     {
         SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-visibility.json");
-        accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"), new TrinoPrincipal(USER, ADMIN.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"), new TrinoPrincipal(USER, ALICE.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"), new TrinoPrincipal(USER, BOB.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"), new TrinoPrincipal(USER, CHARLIE.getIdentity().getUser()), true);
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_function"), new TrinoPrincipal(USER, ADMIN.getIdentity().getUser()), true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, "some_function", new TrinoPrincipal(USER, ALICE.getIdentity().getUser()), true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, "some_function", new TrinoPrincipal(USER, BOB.getIdentity().getUser()), true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(ALICE, "some_function", new TrinoPrincipal(USER, CHARLIE.getIdentity().getUser()), true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"), new TrinoPrincipal(USER, ADMIN.getIdentity().getUser()), true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"), new TrinoPrincipal(USER, ALICE.getIdentity().getUser()), true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"), new TrinoPrincipal(USER, BOB.getIdentity().getUser()), true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"), new TrinoPrincipal(USER, CHARLIE.getIdentity().getUser()), true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        assertAccessDenied(() -> accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, TABLE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_function"), new TrinoPrincipal(USER, ADMIN.getIdentity().getUser()), true), GRANT_EXECUTE_FUNCTION_ACCESS_DENIED_MESSAGE);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, "some_function", new TrinoPrincipal(USER, ALICE.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, "some_function", new TrinoPrincipal(USER, BOB.getIdentity().getUser()), true);
-        accessControl.checkCanGrantExecuteFunctionPrivilege(BOB, "some_function", new TrinoPrincipal(USER, CHARLIE.getIdentity().getUser()), true);
+        assertThat(accessControl.canCreateViewWithExecuteFunction(ALICE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"))).isTrue();
+        assertThat(accessControl.canCreateViewWithExecuteFunction(ALICE, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_function"))).isFalse();
+        assertThat(accessControl.canCreateViewWithExecuteFunction(ALICE, new CatalogSchemaRoutineName("specific-catalog", "builtin", "some_table_function"))).isFalse();
+        assertThat(accessControl.canCreateViewWithExecuteFunction(ALICE, new CatalogSchemaRoutineName("specific-catalog", "builtin", "some_function"))).isFalse();
+
+        assertThat(accessControl.canCreateViewWithExecuteFunction(BOB, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_table_function"))).isFalse();
+        assertThat(accessControl.canCreateViewWithExecuteFunction(BOB, new CatalogSchemaRoutineName("ptf-catalog", "ptf_schema", "some_function"))).isFalse();
+        assertThat(accessControl.canCreateViewWithExecuteFunction(BOB, new CatalogSchemaRoutineName("specific-catalog", "builtin", "some_table_function"))).isFalse();
+        assertThat(accessControl.canCreateViewWithExecuteFunction(BOB, new CatalogSchemaRoutineName("specific-catalog", "builtin", "some_function"))).isTrue();
+    }
+
+    @Test
+    public void testSchemaAuthorization()
+    {
+        SystemAccessControl accessControl = newFileBasedSystemAccessControl("authorization.json");
+
+        CatalogSchemaName schema = new CatalogSchemaName("some-catalog", "test");
+        CatalogSchemaName ownedByUser = new CatalogSchemaName("some-catalog", "owned_by_user");
+        CatalogSchemaName ownedByGroup = new CatalogSchemaName("some-catalog", "owned_by_group");
+        CatalogSchemaName ownedByRole = new CatalogSchemaName("some-catalog", "owned_by_role");
+
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("user", "group", "role"), schema, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for schema some-catalog.test to ROLE new_role");
+
+        // access to schema granted to user
+        accessControl.checkCanSetSchemaAuthorization(user("owner_authorized", "group", "role"), ownedByUser, new TrinoPrincipal(USER, "new_user"));
+        accessControl.checkCanSetSchemaAuthorization(user("owner", "authorized", "role"), ownedByUser, new TrinoPrincipal(ROLE, "new_role"));
+        accessControl.checkCanSetSchemaAuthorization(user("owner", "group", "authorized"), ownedByUser, new TrinoPrincipal(ROLE, "new_role"));
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("owner_without_authorization_access", "group", "role"), ownedByUser, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for schema some-catalog.owned_by_user to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("owner_DENY_authorized", "group", "role"), ownedByUser, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for schema some-catalog.owned_by_user to USER new_user");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("owner", "DENY_authorized", "role"), ownedByUser, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for schema some-catalog.owned_by_user to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("owner", "group", "DENY_authorized"), ownedByUser, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for schema some-catalog.owned_by_user to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("owner", "group", "authorized"), ownedByUser, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for schema some-catalog.owned_by_user to USER new_user");
+
+        // access to schema granted to group
+        accessControl.checkCanSetSchemaAuthorization(user("authorized", "owner", "role"), ownedByGroup, new TrinoPrincipal(USER, "new_user"));
+        accessControl.checkCanSetSchemaAuthorization(user("user", "owner", "authorized"), ownedByGroup, new TrinoPrincipal(ROLE, "new_role"));
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("user", "owner", "role"), ownedByGroup, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for schema some-catalog.owned_by_group to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("DENY_authorized", "owner", "role"), ownedByGroup, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for schema some-catalog.owned_by_group to USER new_user");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("user", "owner", "DENY_authorized"), ownedByGroup, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for schema some-catalog.owned_by_group to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("user", "owner", "authorized"), ownedByGroup, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for schema some-catalog.owned_by_group to USER new_user");
+
+        // access to schema granted to role
+        accessControl.checkCanSetSchemaAuthorization(user("authorized", "group", "owner"), ownedByRole, new TrinoPrincipal(USER, "new_user"));
+        accessControl.checkCanSetSchemaAuthorization(user("user", "group", "owner_authorized"), ownedByRole, new TrinoPrincipal(ROLE, "new_role"));
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("user", "group", "owner"), ownedByRole, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for schema some-catalog.owned_by_role to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("DENY_authorized", "group", "owner"), ownedByRole, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for schema some-catalog.owned_by_role to USER new_user");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("user", "group", "owner_DENY_authorized"), ownedByRole, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for schema some-catalog.owned_by_role to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetSchemaAuthorization(user("user", "group", "owner_authorized"), ownedByRole, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for schema some-catalog.owned_by_role to USER new_user");
+    }
+
+    @Test
+    public void testTableAuthorization()
+    {
+        SystemAccessControl accessControl = newFileBasedSystemAccessControl("authorization.json");
+
+        CatalogSchemaTableName table = new CatalogSchemaTableName("some-catalog", "test", "table");
+        CatalogSchemaTableName ownedByUser = new CatalogSchemaTableName("some-catalog", "test", "owned_by_user");
+        CatalogSchemaTableName ownedByGroup = new CatalogSchemaTableName("some-catalog", "test", "owned_by_group");
+        CatalogSchemaTableName ownedByRole = new CatalogSchemaTableName("some-catalog", "test", "owned_by_role");
+
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("user", "group", "role"), table, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for table some-catalog.test.table to ROLE new_role");
+
+        // access to table granted to user
+        accessControl.checkCanSetTableAuthorization(user("owner_authorized", "group", "role"), ownedByUser, new TrinoPrincipal(USER, "new_user"));
+        accessControl.checkCanSetTableAuthorization(user("owner", "group", "authorized"), ownedByUser, new TrinoPrincipal(ROLE, "new_role"));
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("owner_without_authorization_access", "group", "role"), ownedByUser, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for table some-catalog.test.owned_by_user to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("owner_DENY_authorized", "group", "role"), ownedByUser, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for table some-catalog.test.owned_by_user to USER new_user");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("owner", "group", "DENY_authorized"), ownedByUser, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for table some-catalog.test.owned_by_user to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("owner", "group", "authorized"), ownedByUser, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for table some-catalog.test.owned_by_user to USER new_user");
+
+        // access to table granted to group
+        accessControl.checkCanSetTableAuthorization(user("authorized", "owner", "role"), ownedByGroup, new TrinoPrincipal(USER, "new_user"));
+        accessControl.checkCanSetTableAuthorization(user("user", "owner", "authorized"), ownedByGroup, new TrinoPrincipal(ROLE, "new_role"));
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("user", "owner", "role"), ownedByGroup, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for table some-catalog.test.owned_by_group to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("DENY_authorized", "owner", "role"), ownedByGroup, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for table some-catalog.test.owned_by_group to USER new_user");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("user", "owner", "DENY_authorized"), ownedByGroup, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for table some-catalog.test.owned_by_group to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("user", "owner", "authorized"), ownedByGroup, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for table some-catalog.test.owned_by_group to USER new_user");
+
+        // access to table granted to role
+        accessControl.checkCanSetTableAuthorization(user("authorized", "group", "owner"), ownedByRole, new TrinoPrincipal(USER, "new_user"));
+        accessControl.checkCanSetTableAuthorization(user("user", "group", "owner_authorized"), ownedByRole, new TrinoPrincipal(ROLE, "new_role"));
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("user", "group", "owner"), ownedByRole, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for table some-catalog.test.owned_by_role to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("DENY_authorized", "group", "owner"), ownedByRole, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for table some-catalog.test.owned_by_role to USER new_user");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("user", "group", "owner_DENY_authorized"), ownedByRole, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for table some-catalog.test.owned_by_role to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetTableAuthorization(user("user", "group", "owner_authorized"), ownedByRole, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for table some-catalog.test.owned_by_role to USER new_user");
+    }
+
+    @Test
+    public void testViewAuthorization()
+    {
+        SystemAccessControl accessControl = newFileBasedSystemAccessControl("authorization.json");
+
+        CatalogSchemaTableName table = new CatalogSchemaTableName("some-catalog", "test", "table");
+        CatalogSchemaTableName ownedByUser = new CatalogSchemaTableName("some-catalog", "test", "owned_by_user");
+        CatalogSchemaTableName ownedByGroup = new CatalogSchemaTableName("some-catalog", "test", "owned_by_group");
+        CatalogSchemaTableName ownedByRole = new CatalogSchemaTableName("some-catalog", "test", "owned_by_role");
+
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("user", "group", "role"), table, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for view some-catalog.test.table to ROLE new_role");
+
+        // access to table granted to user
+        accessControl.checkCanSetViewAuthorization(user("owner_authorized", "group", "role"), ownedByUser, new TrinoPrincipal(USER, "new_user"));
+        accessControl.checkCanSetViewAuthorization(user("owner", "group", "authorized"), ownedByUser, new TrinoPrincipal(ROLE, "new_role"));
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("owner_without_authorization_access", "group", "role"), ownedByUser, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for view some-catalog.test.owned_by_user to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("owner_DENY_authorized", "group", "role"), ownedByUser, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for view some-catalog.test.owned_by_user to USER new_user");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("owner", "group", "DENY_authorized"), ownedByUser, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for view some-catalog.test.owned_by_user to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("owner", "group", "authorized"), ownedByUser, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for view some-catalog.test.owned_by_user to USER new_user");
+
+        // access to table granted to group
+        accessControl.checkCanSetViewAuthorization(user("authorized", "owner", "role"), ownedByGroup, new TrinoPrincipal(USER, "new_user"));
+        accessControl.checkCanSetViewAuthorization(user("user", "owner", "authorized"), ownedByGroup, new TrinoPrincipal(ROLE, "new_role"));
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("user", "owner", "role"), ownedByGroup, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for view some-catalog.test.owned_by_group to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("DENY_authorized", "owner", "role"), ownedByGroup, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for view some-catalog.test.owned_by_group to USER new_user");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("user", "owner", "DENY_authorized"), ownedByGroup, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for view some-catalog.test.owned_by_group to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("user", "owner", "authorized"), ownedByGroup, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for view some-catalog.test.owned_by_group to USER new_user");
+
+        // access to table granted to role
+        accessControl.checkCanSetViewAuthorization(user("authorized", "group", "owner"), ownedByRole, new TrinoPrincipal(USER, "new_user"));
+        accessControl.checkCanSetViewAuthorization(user("user", "group", "owner_authorized"), ownedByRole, new TrinoPrincipal(ROLE, "new_role"));
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("user", "group", "owner"), ownedByRole, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for view some-catalog.test.owned_by_role to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("DENY_authorized", "group", "owner"), ownedByRole, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for view some-catalog.test.owned_by_role to USER new_user");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("user", "group", "owner_DENY_authorized"), ownedByRole, new TrinoPrincipal(ROLE, "new_role")),
+                "Cannot set authorization for view some-catalog.test.owned_by_role to ROLE new_role");
+        assertAccessDenied(
+                () -> accessControl.checkCanSetViewAuthorization(user("user", "group", "owner_authorized"), ownedByRole, new TrinoPrincipal(USER, "new_user")),
+                "Cannot set authorization for view some-catalog.test.owned_by_role to USER new_user");
+    }
+
+    @Test
+    public void testFunctionsFilter()
+    {
+        SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-access-function-filter.json");
+        Set<SchemaFunctionName> functions = ImmutableSet.<SchemaFunctionName>builder()
+                .add(new SchemaFunctionName("restricted", "any"))
+                .add(new SchemaFunctionName("secret", "any"))
+                .add(new SchemaFunctionName("aliceschema", "any"))
+                .add(new SchemaFunctionName("aliceschema", "bobfunction"))
+                .add(new SchemaFunctionName("bobschema", "bob_any"))
+                .add(new SchemaFunctionName("bobschema", "any"))
+                .add(new SchemaFunctionName("any", "any"))
+                .build();
+        assertEquals(accessControl.filterFunctions(ALICE, "any", functions), ImmutableSet.<SchemaFunctionName>builder()
+                .add(new SchemaFunctionName("aliceschema", "any"))
+                .add(new SchemaFunctionName("aliceschema", "bobfunction"))
+                .build());
+        assertEquals(accessControl.filterFunctions(BOB, "any", functions), ImmutableSet.<SchemaFunctionName>builder()
+                .add(new SchemaFunctionName("aliceschema", "bobfunction"))
+                .add(new SchemaFunctionName("bobschema", "bob_any"))
+                .build());
+        assertEquals(accessControl.filterFunctions(ADMIN, "any", functions), ImmutableSet.<SchemaFunctionName>builder()
+                .add(new SchemaFunctionName("secret", "any"))
+                .add(new SchemaFunctionName("aliceschema", "any"))
+                .add(new SchemaFunctionName("aliceschema", "bobfunction"))
+                .add(new SchemaFunctionName("bobschema", "bob_any"))
+                .add(new SchemaFunctionName("bobschema", "any"))
+                .add(new SchemaFunctionName("any", "any"))
+                .build());
+    }
+
+    @Test
+    public void testFunctionsFilterNoAccess()
+    {
+        SystemAccessControl accessControl = newFileBasedSystemAccessControl("file-based-system-no-access.json");
+
+        Set<SchemaFunctionName> functions = ImmutableSet.<SchemaFunctionName>builder()
+                .add(new SchemaFunctionName("restricted", "any"))
+                .add(new SchemaFunctionName("secret", "any"))
+                .add(new SchemaFunctionName("any", "any"))
+                .build();
+        assertEquals(accessControl.filterFunctions(ALICE, "any", functions), ImmutableSet.of());
+        assertEquals(accessControl.filterFunctions(BOB, "any", functions), ImmutableSet.of());
+    }
+
+    @Test
+    public void testAuthorizationDocsExample()
+    {
+        File rulesFile = new File("../../docs/src/main/sphinx/security/authorization.json");
+        SystemAccessControl accessControlManager = newFileBasedSystemAccessControl(rulesFile, ImmutableMap.of());
+        CatalogSchemaName schema = new CatalogSchemaName("catalog", "schema");
+        CatalogSchemaTableName tableOrView = new CatalogSchemaTableName("catalog", "schema", "table_or_view");
+        accessControlManager.checkCanSetSchemaAuthorization(ADMIN, schema, new TrinoPrincipal(USER, "alice"));
+        accessControlManager.checkCanSetSchemaAuthorization(ADMIN, schema, new TrinoPrincipal(ROLE, "role"));
+        accessControlManager.checkCanSetTableAuthorization(ADMIN, tableOrView, new TrinoPrincipal(USER, "alice"));
+        accessControlManager.checkCanSetTableAuthorization(ADMIN, tableOrView, new TrinoPrincipal(ROLE, "role"));
+        accessControlManager.checkCanSetViewAuthorization(ADMIN, tableOrView, new TrinoPrincipal(USER, "alice"));
+        accessControlManager.checkCanSetViewAuthorization(ADMIN, tableOrView, new TrinoPrincipal(ROLE, "role"));
+        assertAccessDenied(
+                () -> accessControlManager.checkCanSetSchemaAuthorization(ADMIN, schema, new TrinoPrincipal(USER, "bob")),
+                "Cannot set authorization for schema catalog.schema to USER bob");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanSetTableAuthorization(ADMIN, tableOrView, new TrinoPrincipal(USER, "bob")),
+                "Cannot set authorization for table catalog.schema.table_or_view to USER bob");
+        assertAccessDenied(
+                () -> accessControlManager.checkCanSetViewAuthorization(ADMIN, tableOrView, new TrinoPrincipal(USER, "bob")),
+                "Cannot set authorization for view catalog.schema.table_or_view to USER bob");
+    }
+
+    private static SystemSecurityContext user(String user, String group, String role)
+    {
+        Identity identity = Identity.forUser(user)
+                .withGroups(ImmutableSet.of(group))
+                .withEnabledRoles(ImmutableSet.of(role))
+                .build();
+        return new SystemSecurityContext(identity, queryId, queryStart);
     }
 
     @Test
@@ -1538,6 +1771,6 @@ private static void assertAccessDenied(ThrowingCallable callable, String expecte
     {
         assertThatThrownBy(callable)
                 .isInstanceOf(AccessDeniedException.class)
-                .hasMessageMatching(expectedMessage);
+                .hasMessageMatching("Access Denied: " + expectedMessage);
     }
 }
diff --git a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/TestFileBasedAccessControlConfig.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/TestFileBasedAccessControlConfig.java
index b218d2672270..7e79e656c65d 100644
--- a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/TestFileBasedAccessControlConfig.java
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/TestFileBasedAccessControlConfig.java
@@ -16,11 +16,10 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotNull;
 import org.testng.annotations.Test;
 
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotNull;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -94,7 +93,7 @@ public void testValidationWithLocalFile()
                 new FileBasedAccessControlConfig()
                     .setRefreshPeriod(Duration.valueOf("1ms")),
                 "configFile",
-                "may not be null",
+                "must not be null",
                 NotNull.class);
 
         assertFailsValidation(
@@ -132,7 +131,7 @@ public void testValidationWithUrl()
                 new FileBasedAccessControlConfig()
                         .setRefreshPeriod(Duration.valueOf("1ms")),
                 "configFile",
-                "may not be null",
+                "must not be null",
                 NotNull.class);
 
         assertFailsValidation(
@@ -148,7 +147,7 @@ public void testValidationWithUrl()
                         .setConfigFile(securityConfigUrl)
                         .setJsonPointer(null),
                 "jsonPointer",
-                "may not be null",
+                "must not be null",
                 NotNull.class);
 
         assertValidates(
diff --git a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/util/TestJsonUtils.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/util/TestJsonUtils.java
index 47e32eed38bc..8aded8864c92 100644
--- a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/util/TestJsonUtils.java
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/util/TestJsonUtils.java
@@ -14,12 +14,15 @@
 package io.trino.plugin.base.util;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 
+import static io.trino.plugin.base.util.JsonUtils.jsonFactory;
+import static io.trino.plugin.base.util.JsonUtils.jsonFactoryBuilder;
 import static io.trino.plugin.base.util.JsonUtils.parseJson;
 import static io.trino.plugin.base.util.TestJsonUtils.TestEnum.OPTION_A;
 import static java.nio.charset.StandardCharsets.US_ASCII;
@@ -70,4 +73,28 @@ public void testTrailingContent()
                 .hasMessage("Could not parse JSON")
                 .hasStackTraceContaining("Unrecognized token 'not': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')");
     }
+
+    @Test
+    public void testFactoryHasNoReadContraints()
+    {
+        assertReadConstraints(jsonFactory().streamReadConstraints());
+        assertReadConstraints(jsonFactoryBuilder().build().streamReadConstraints());
+    }
+
+    @Test
+    public void testBuilderHasNoReadConstraints()
+    {
+        assertReadConstraints(jsonFactoryBuilder().build().streamReadConstraints());
+    }
+
+    private static void assertReadConstraints(StreamReadConstraints constraints)
+    {
+        // Jackson 2.15 introduced read constraints limit that are too strict for
+        // Trino use-cases. Ensure that those limits are no longer present for JsonFactories.
+        //
+        // https://github.com/trinodb/trino/issues/17843
+        assertThat(constraints.getMaxStringLength()).isEqualTo(Integer.MAX_VALUE);
+        assertThat(constraints.getMaxNestingDepth()).isEqualTo(Integer.MAX_VALUE);
+        assertThat(constraints.getMaxNumberLength()).isEqualTo(Integer.MAX_VALUE);
+    }
 }
diff --git a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/util/TestingHttpServer.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/util/TestingHttpServer.java
index 53f7eb5c37f8..77cba7e0b3cc 100644
--- a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/util/TestingHttpServer.java
+++ b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/util/TestingHttpServer.java
@@ -23,11 +23,10 @@
 import io.airlift.http.server.TheServlet;
 import io.airlift.http.server.testing.TestingHttpServerModule;
 import io.airlift.node.testing.TestingNodeModule;
-
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/lib/trino-plugin-toolkit/src/test/resources/authorization-no-roles.json b/lib/trino-plugin-toolkit/src/test/resources/authorization-no-roles.json
new file mode 100644
index 000000000000..03b46ce87488
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/test/resources/authorization-no-roles.json
@@ -0,0 +1,37 @@
+{
+    "authorization": [
+        {
+            "original_user": ".*DENY.*",
+            "new_user": ".*",
+            "allow": false
+        },
+        {
+            "original_user": ".*authorized",
+            "new_user": ".*"
+        }
+    ],
+    "schemas": [
+        {
+            "user": "owner.*",
+            "schema": "owned_by_user",
+            "owner": true
+        },
+        {
+            "group": "owner.*",
+            "schema": "owned_by_group",
+            "owner": true
+        }
+    ],
+    "tables": [
+        {
+            "user": "owner.*",
+            "table": "owned_by_user",
+            "privileges": ["OWNERSHIP"]
+        },
+        {
+            "group": "owner*",
+            "table": "owned_by_group",
+            "privileges": ["OWNERSHIP"]
+        }
+    ]
+}
diff --git a/lib/trino-plugin-toolkit/src/test/resources/authorization.json b/lib/trino-plugin-toolkit/src/test/resources/authorization.json
new file mode 100644
index 000000000000..4d7bc337201a
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/test/resources/authorization.json
@@ -0,0 +1,69 @@
+{
+    "authorization": [
+        {
+            "original_user": ".*DENY.*",
+            "new_user": ".*",
+            "new_role": ".*",
+            "allow": false
+        },
+        {
+            "original_group": ".*DENY.*",
+            "new_user": ".*",
+            "new_role": ".*",
+            "allow": false
+        },
+        {
+            "original_role": ".*DENY.*",
+            "new_user": ".*",
+            "new_role": ".*",
+            "allow": false
+        },
+        {
+            "original_user": ".*authorized",
+            "new_user": ".*"
+        },
+        {
+            "original_group": ".*authorized",
+            "new_user": ".*",
+            "new_role": ".*"
+        },
+        {
+            "original_role": ".*authorized",
+            "new_role": ".*"
+        }
+    ],
+    "schemas": [
+        {
+            "user": "owner.*",
+            "schema": "owned_by_user",
+            "owner": true
+        },
+        {
+            "group": "owner.*",
+            "schema": "owned_by_group",
+            "owner": true
+        },
+        {
+            "role": "owner.*",
+            "schema": "owned_by_role",
+            "owner": true
+        }
+    ],
+    "tables": [
+        {
+            "user": "owner.*",
+            "table": "owned_by_user",
+            "privileges": ["OWNERSHIP"]
+        },
+        {
+            "group": "owner*",
+            "table": "owned_by_group",
+            "privileges": ["OWNERSHIP"]
+        },
+        {
+            "role": "owner.*",
+            "table": "owned_by_role",
+            "privileges": ["OWNERSHIP"]
+        }
+    ]
+}
diff --git a/lib/trino-plugin-toolkit/src/test/resources/disallow-function-rule-combination-without-table.json b/lib/trino-plugin-toolkit/src/test/resources/disallow-function-rule-combination-without-table.json
deleted file mode 100644
index b1dd8381c110..000000000000
--- a/lib/trino-plugin-toolkit/src/test/resources/disallow-function-rule-combination-without-table.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "functions": [
-        {
-            "schema": "sample_schema",
-            "function_kinds": [
-                "SCALAR",
-                "AGGREGATE",
-                "WINDOW"
-            ],
-            "privileges": [
-                "EXECUTE",
-                "GRANT_EXECUTE"
-            ]
-        }
-    ]
-}
diff --git a/lib/trino-plugin-toolkit/src/test/resources/disallow-function-rule-combination.json b/lib/trino-plugin-toolkit/src/test/resources/disallow-function-rule-combination.json
deleted file mode 100644
index 9a6f6f1abdb4..000000000000
--- a/lib/trino-plugin-toolkit/src/test/resources/disallow-function-rule-combination.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "functions": [
-        {
-            "schema": "sample_schema",
-            "function_kinds": [
-                "SCALAR",
-                "AGGREGATE",
-                "WINDOW",
-                "TABLE"
-            ],
-            "privileges": [
-                "EXECUTE",
-                "GRANT_EXECUTE"
-            ]
-        }
-    ]
-}
diff --git a/lib/trino-plugin-toolkit/src/test/resources/empty-functions-kind.json b/lib/trino-plugin-toolkit/src/test/resources/empty-functions-kind.json
deleted file mode 100644
index 3d8985a3023c..000000000000
--- a/lib/trino-plugin-toolkit/src/test/resources/empty-functions-kind.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "functions": [
-        {
-            "function_kinds": [
-            ],
-            "privileges": [
-                "EXECUTE",
-                "GRANT_EXECUTE"
-            ]
-        }
-    ]
-}
diff --git a/lib/trino-plugin-toolkit/src/test/resources/file-based-disallow-function-rule-combination-without-table.json b/lib/trino-plugin-toolkit/src/test/resources/file-based-disallow-function-rule-combination-without-table.json
deleted file mode 100644
index 2ddec5e5db39..000000000000
--- a/lib/trino-plugin-toolkit/src/test/resources/file-based-disallow-function-rule-combination-without-table.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "functions": [
-        {
-            "catalog": "sample_catalog",
-            "function_kinds": [
-                "SCALAR",
-                "AGGREGATE",
-                "WINDOW"
-            ],
-            "privileges": [
-                "EXECUTE",
-                "GRANT_EXECUTE"
-            ]
-        }
-    ]
-}
diff --git a/lib/trino-plugin-toolkit/src/test/resources/file-based-disallow-function-rule-combination.json b/lib/trino-plugin-toolkit/src/test/resources/file-based-disallow-function-rule-combination.json
deleted file mode 100644
index cc9218f066d9..000000000000
--- a/lib/trino-plugin-toolkit/src/test/resources/file-based-disallow-function-rule-combination.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "functions": [
-        {
-            "catalog": "sample_catalog",
-            "function_kinds": [
-                "SCALAR",
-                "AGGREGATE",
-                "TABLE",
-                "WINDOW"
-            ],
-            "privileges": [
-                "EXECUTE",
-                "GRANT_EXECUTE"
-            ]
-        }
-    ]
-}
diff --git a/lib/trino-plugin-toolkit/src/test/resources/file-based-system-access-function-filter.json b/lib/trino-plugin-toolkit/src/test/resources/file-based-system-access-function-filter.json
new file mode 100644
index 000000000000..0397f09452dc
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/test/resources/file-based-system-access-function-filter.json
@@ -0,0 +1,50 @@
+{
+    "catalogs": [
+        {
+            "allow": true
+        }
+    ],
+    "schemas": [
+        {
+            "schema": "restricted",
+            "owner": false
+        },
+        {
+            "role": "admin",
+            "owner": true
+        },
+        {
+            "user": "alice",
+            "schema": "aliceschema",
+            "owner": true
+        }
+    ],
+    "functions": [
+        {
+            "schema": "(restricted|secret)",
+            "privileges": []
+        },
+        {
+            "user": "admin",
+            "schema": ".*",
+            "privileges": ["EXECUTE"]
+        },
+        {
+            "user": "alice",
+            "schema": "aliceschema",
+            "privileges": ["EXECUTE"]
+        },
+        {
+            "user": "bob",
+            "schema": "bobschema",
+            "function": "bob.*",
+            "privileges": ["EXECUTE"]
+        },
+        {
+            "user": "bob",
+            "schema": "aliceschema",
+            "function": "bobfunction",
+            "privileges": ["EXECUTE"]
+        }
+    ]
+}
diff --git a/lib/trino-plugin-toolkit/src/test/resources/file-based-system-access-visibility.json b/lib/trino-plugin-toolkit/src/test/resources/file-based-system-access-visibility.json
index 8a399cf81068..8983e0235b3d 100644
--- a/lib/trino-plugin-toolkit/src/test/resources/file-based-system-access-visibility.json
+++ b/lib/trino-plugin-toolkit/src/test/resources/file-based-system-access-visibility.json
@@ -130,9 +130,6 @@
             "user": "alice",
             "catalog": "ptf-catalog",
             "schema": "ptf_schema",
-            "function_kinds": [
-                "TABLE"
-            ],
             "function": "some_table_function",
             "privileges": [
                 "EXECUTE",
@@ -141,16 +138,30 @@
         },
         {
             "user": "bob",
-            "function_kinds": [
-                "SCALAR",
-                "AGGREGATE",
-                "WINDOW"
-            ],
+            "catalog": "specific-catalog",
             "function": "some_function",
             "privileges": [
                 "EXECUTE",
                 "GRANT_EXECUTE"
             ]
         }
+    ],
+    "procedures": [
+        {
+            "user": "bob",
+            "catalog": "alice-catalog",
+            "schema": "procedure-schema",
+            "procedure": "some_procedure",
+            "privileges": [
+                "EXECUTE"
+            ]
+        },
+        {
+            "user": "alice",
+            "catalog": "alice-catalog",
+            "procedure": "some_procedure",
+            "privileges": [
+            ]
+        }
     ]
 }
diff --git a/lib/trino-plugin-toolkit/src/test/resources/function-filter.json b/lib/trino-plugin-toolkit/src/test/resources/function-filter.json
new file mode 100644
index 000000000000..a4c774538f1e
--- /dev/null
+++ b/lib/trino-plugin-toolkit/src/test/resources/function-filter.json
@@ -0,0 +1,45 @@
+{
+    "schemas": [
+        {
+            "schema": "restricted",
+            "owner": false
+        },
+        {
+            "user": "admin",
+            "owner": true
+        },
+        {
+            "user": "alice",
+            "schema": "aliceschema",
+            "owner": true
+        }
+    ],
+    "functions": [
+        {
+            "schema": "(restricted|secret)",
+            "privileges": []
+        },
+        {
+            "user": "admin",
+            "schema": ".*",
+            "privileges": ["EXECUTE"]
+        },
+        {
+            "user": "alice",
+            "schema": "aliceschema",
+            "privileges": ["EXECUTE"]
+        },
+        {
+            "user": "bob",
+            "schema": "bobschema",
+            "function": "bob.*",
+            "privileges": ["EXECUTE"]
+        },
+        {
+            "user": "bob",
+            "schema": "aliceschema",
+            "function": "bobfunction",
+            "privileges": ["EXECUTE"]
+        }
+    ]
+}
diff --git a/lib/trino-plugin-toolkit/src/test/resources/visibility-with-json-pointer.json b/lib/trino-plugin-toolkit/src/test/resources/visibility-with-json-pointer.json
index 35ad27ee5071..ba61cb05c1cb 100644
--- a/lib/trino-plugin-toolkit/src/test/resources/visibility-with-json-pointer.json
+++ b/lib/trino-plugin-toolkit/src/test/resources/visibility-with-json-pointer.json
@@ -51,9 +51,6 @@
             {
                 "user": "alice",
                 "schema": "ptf_schema",
-                "function_kinds": [
-                    "TABLE"
-                ],
                 "function": "some_table_function",
                 "privileges": [
                     "EXECUTE",
@@ -62,17 +59,30 @@
             },
             {
                 "user": "bob",
-                "function_kinds": [
-                    "SCALAR",
-                    "AGGREGATE",
-                    "WINDOW"
-                ],
+                "schema": "specific-schema",
                 "function": "some_function",
                 "privileges": [
                     "EXECUTE",
                     "GRANT_EXECUTE"
                 ]
             }
+        ],
+        "procedures": [
+            {
+                "user": "bob",
+                "schema": "procedure-schema",
+                "procedure": "some_procedure",
+                "privileges": [
+                    "EXECUTE"
+                ]
+            },
+            {
+                "user": "charlie",
+                "schema": "procedure-schema",
+                "procedure": "some_procedure",
+                "privileges": [
+                ]
+            }
         ]
     }
 }
diff --git a/lib/trino-plugin-toolkit/src/test/resources/visibility.json b/lib/trino-plugin-toolkit/src/test/resources/visibility.json
index a4b82487b59b..6942a7644c2d 100644
--- a/lib/trino-plugin-toolkit/src/test/resources/visibility.json
+++ b/lib/trino-plugin-toolkit/src/test/resources/visibility.json
@@ -50,10 +50,7 @@
         {
             "user": "alice",
             "schema": "ptf_schema",
-            "function_kinds": [
-                "TABLE"
-            ],
-            "function": "some_table_function",
+            "function": "some_function",
             "privileges": [
                 "EXECUTE",
                 "GRANT_EXECUTE"
@@ -61,16 +58,29 @@
         },
         {
             "user": "bob",
-            "function_kinds": [
-                "SCALAR",
-                "AGGREGATE",
-                "WINDOW"
-            ],
+            "schema": "any",
             "function": "some_function",
             "privileges": [
                 "EXECUTE",
                 "GRANT_EXECUTE"
             ]
         }
+    ],
+    "procedures": [
+    {
+        "user": "bob",
+        "schema": "procedure-schema",
+        "procedure": "some_procedure",
+        "privileges": [
+            "EXECUTE"
+        ]
+    },
+      {
+        "user": "charlie",
+        "schema": "procedure-schema",
+        "procedure": "some_procedure",
+        "privileges": [
+        ]
+      }
     ]
 }
diff --git a/lib/trino-record-decoder/pom.xml b/lib/trino-record-decoder/pom.xml
index 8c200fdc87d1..a244cda84631 100644
--- a/lib/trino-record-decoder/pom.xml
+++ b/lib/trino-record-decoder/pom.xml
@@ -5,27 +5,21 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-record-decoder</artifactId>
-    <name>trino-record-decoder</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
-        <!-- Trino SPI -->
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-        </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
@@ -33,12 +27,6 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -54,6 +42,11 @@
             <artifactId>protobuf-java</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java-util</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.squareup.wire</groupId>
             <artifactId>wire-runtime-jvm</artifactId>
@@ -65,8 +58,24 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
+        </dependency>
+
+        <!-- Trino SPI -->
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -84,7 +93,6 @@
             <artifactId>avro</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
@@ -103,22 +111,34 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
+            <artifactId>testing</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-protobuf-provider</artifactId>
+            <!-- This is under Confluent Community License and it should not be used with compile scope -->
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -135,6 +155,16 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>confluent</id>
+            <url>https://packages.confluent.io/maven/</url>
+        </repository>
+    </repositories>
+
     <build>
         <plugins>
             <plugin>
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/DispatchingRowDecoderFactory.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/DispatchingRowDecoderFactory.java
index b3f41d31773d..8ac2d73041a5 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/DispatchingRowDecoderFactory.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/DispatchingRowDecoderFactory.java
@@ -14,11 +14,10 @@
 package io.trino.decoder;
 
 import com.google.common.collect.ImmutableMap;
-
-import javax.inject.Inject;
+import com.google.inject.Inject;
+import io.trino.spi.connector.ConnectorSession;
 
 import java.util.Map;
-import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
@@ -32,9 +31,9 @@ public DispatchingRowDecoderFactory(Map<String, RowDecoderFactory> factories)
         this.factories = ImmutableMap.copyOf(factories);
     }
 
-    public RowDecoder create(String dataFormat, Map<String, String> decoderParams, Set<DecoderColumnHandle> columns)
+    public RowDecoder create(ConnectorSession session, RowDecoderSpec rowDecoderSpec)
     {
-        checkArgument(factories.containsKey(dataFormat), "unknown data format '%s'", dataFormat);
-        return factories.get(dataFormat).create(decoderParams, columns);
+        checkArgument(factories.containsKey(rowDecoderSpec.dataFormat()), "unknown data format '%s'", rowDecoderSpec.dataFormat());
+        return factories.get(rowDecoderSpec.dataFormat()).create(session, rowDecoderSpec);
     }
 }
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/FieldValueProvider.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/FieldValueProvider.java
index 12e53856fbfc..0aa111028852 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/FieldValueProvider.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/FieldValueProvider.java
@@ -15,7 +15,6 @@
 
 import io.airlift.slice.Slice;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
 
 /**
  * Base class for all providers that return values for a selected column.
@@ -42,9 +41,9 @@ public Slice getSlice()
         throw new TrinoException(DecoderErrorCode.DECODER_CONVERSION_NOT_SUPPORTED, "conversion to Slice not supported");
     }
 
-    public Block getBlock()
+    public Object getObject()
     {
-        throw new TrinoException(DecoderErrorCode.DECODER_CONVERSION_NOT_SUPPORTED, "conversion to Block not supported");
+        throw new TrinoException(DecoderErrorCode.DECODER_CONVERSION_NOT_SUPPORTED, "conversion not supported");
     }
 
     public abstract boolean isNull();
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/RowDecoderFactory.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/RowDecoderFactory.java
index 055ecb7022aa..275f8690c7e5 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/RowDecoderFactory.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/RowDecoderFactory.java
@@ -13,10 +13,9 @@
  */
 package io.trino.decoder;
 
-import java.util.Map;
-import java.util.Set;
+import io.trino.spi.connector.ConnectorSession;
 
 public interface RowDecoderFactory
 {
-    RowDecoder create(Map<String, String> decoderParams, Set<DecoderColumnHandle> columns);
+    RowDecoder create(ConnectorSession session, RowDecoderSpec rowDecoderSpec);
 }
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/RowDecoderSpec.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/RowDecoderSpec.java
new file mode 100644
index 000000000000..13648011bf37
--- /dev/null
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/RowDecoderSpec.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed 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 io.trino.decoder;
+
+import java.util.Map;
+import java.util.Set;
+
+import static java.util.Objects.requireNonNull;
+
+public record RowDecoderSpec(String dataFormat, Map<String, String> decoderParams, Set<DecoderColumnHandle> columns)
+{
+    public RowDecoderSpec
+    {
+        requireNonNull(dataFormat, "dataFormat is null");
+        requireNonNull(decoderParams, "decoderParams is null");
+        requireNonNull(columns, "columns is null");
+    }
+}
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/AvroColumnDecoder.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/AvroColumnDecoder.java
index 4927dd8d6586..ee614efc56dc 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/AvroColumnDecoder.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/AvroColumnDecoder.java
@@ -22,6 +22,10 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.BooleanType;
@@ -51,6 +55,8 @@
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.decoder.DecoderErrorCode.DECODER_CONVERSION_NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
 import static io.trino.spi.type.Varchars.truncateToLength;
 import static java.lang.Float.floatToIntBits;
 import static java.lang.String.format;
@@ -178,7 +184,7 @@ public boolean isNull()
         @Override
         public double getDouble()
         {
-            if (value instanceof Double || value instanceof Float) {
+            if (value instanceof Double) {
                 return ((Number) value).doubleValue();
             }
             throw new TrinoException(DECODER_CONVERSION_NOT_SUPPORTED, format("cannot decode object of '%s' as '%s' for column '%s'", value.getClass(), columnType, columnName));
@@ -212,7 +218,7 @@ public Slice getSlice()
         }
 
         @Override
-        public Block getBlock()
+        public Object getObject()
         {
             return serializeObject(null, value, columnType, columnName);
         }
@@ -226,7 +232,7 @@ private static Slice getSlice(Object value, Type type, String columnName)
 
         if (type instanceof VarbinaryType) {
             if (value instanceof ByteBuffer) {
-                return Slices.wrappedBuffer((ByteBuffer) value);
+                return Slices.wrappedHeapBuffer((ByteBuffer) value);
             }
             if (value instanceof GenericFixed) {
                 return Slices.wrappedBuffer(((GenericFixed) value).bytes());
@@ -236,13 +242,13 @@ private static Slice getSlice(Object value, Type type, String columnName)
         throw new TrinoException(DECODER_CONVERSION_NOT_SUPPORTED, format("cannot decode object of '%s' as '%s' for column '%s'", value.getClass(), type, columnName));
     }
 
-    private static Block serializeObject(BlockBuilder builder, Object value, Type type, String columnName)
+    private static Object serializeObject(BlockBuilder builder, Object value, Type type, String columnName)
     {
         if (type instanceof ArrayType) {
             return serializeList(builder, value, type, columnName);
         }
-        if (type instanceof MapType) {
-            return serializeMap(builder, value, type, columnName);
+        if (type instanceof MapType mapType) {
+            return serializeMap(builder, value, mapType, columnName);
         }
         if (type instanceof RowType) {
             return serializeRow(builder, value, type, columnName);
@@ -310,7 +316,7 @@ private static void serializePrimitive(BlockBuilder blockBuilder, Object value,
         throw new TrinoException(DECODER_CONVERSION_NOT_SUPPORTED, format("cannot decode object of '%s' as '%s' for column '%s'", value.getClass(), type, columnName));
     }
 
-    private static Block serializeMap(BlockBuilder parentBlockBuilder, Object value, Type type, String columnName)
+    private static SqlMap serializeMap(BlockBuilder parentBlockBuilder, Object value, MapType type, String columnName)
     {
         if (value == null) {
             checkState(parentBlockBuilder != null, "parentBlockBuilder is null");
@@ -319,59 +325,50 @@ private static Block serializeMap(BlockBuilder parentBlockBuilder, Object value,
         }
 
         Map<?, ?> map = (Map<?, ?>) value;
-        List<Type> typeParameters = type.getTypeParameters();
-        Type keyType = typeParameters.get(0);
-        Type valueType = typeParameters.get(1);
+        Type keyType = type.getKeyType();
+        Type valueType = type.getValueType();
 
-        BlockBuilder blockBuilder;
         if (parentBlockBuilder != null) {
-            blockBuilder = parentBlockBuilder;
-        }
-        else {
-            blockBuilder = type.createBlockBuilder(null, 1);
+            ((MapBlockBuilder) parentBlockBuilder).buildEntry((keyBuilder, valueBuilder) -> buildMap(columnName, map, keyType, valueType, keyBuilder, valueBuilder));
+            return null;
         }
+        return buildMapValue(type, map.size(), (keyBuilder, valueBuilder) -> buildMap(columnName, map, keyType, valueType, keyBuilder, valueBuilder));
+    }
 
-        BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
+    private static void buildMap(String columnName, Map<?, ?> map, Type keyType, Type valueType, BlockBuilder keyBuilder, BlockBuilder valueBuilder)
+    {
         for (Map.Entry<?, ?> entry : map.entrySet()) {
             if (entry.getKey() != null) {
-                keyType.writeSlice(entryBuilder, truncateToLength(utf8Slice(entry.getKey().toString()), keyType));
-                serializeObject(entryBuilder, entry.getValue(), valueType, columnName);
+                keyType.writeSlice(keyBuilder, truncateToLength(utf8Slice(entry.getKey().toString()), keyType));
+                serializeObject(valueBuilder, entry.getValue(), valueType, columnName);
             }
         }
-        blockBuilder.closeEntry();
-
-        if (parentBlockBuilder == null) {
-            return blockBuilder.getObject(0, Block.class);
-        }
-        return null;
     }
 
-    private static Block serializeRow(BlockBuilder parentBlockBuilder, Object value, Type type, String columnName)
+    private static SqlRow serializeRow(BlockBuilder blockBuilder, Object value, Type type, String columnName)
     {
         if (value == null) {
-            checkState(parentBlockBuilder != null, "parent block builder is null");
-            parentBlockBuilder.appendNull();
+            checkState(blockBuilder != null, "block builder is null");
+            blockBuilder.appendNull();
             return null;
         }
 
-        BlockBuilder blockBuilder;
-        if (parentBlockBuilder != null) {
-            blockBuilder = parentBlockBuilder;
-        }
-        else {
-            blockBuilder = type.createBlockBuilder(null, 1);
+        RowType rowType = (RowType) type;
+        if (blockBuilder == null) {
+            return buildRowValue(rowType, fieldBuilders -> buildRow(rowType, columnName, (GenericRecord) value, fieldBuilders));
         }
-        BlockBuilder singleRowBuilder = blockBuilder.beginBlockEntry();
-        GenericRecord record = (GenericRecord) value;
-        List<Field> fields = ((RowType) type).getFields();
-        for (Field field : fields) {
+
+        ((RowBlockBuilder) blockBuilder).buildEntry(fieldBuilders -> buildRow(rowType, columnName, (GenericRecord) value, fieldBuilders));
+        return null;
+    }
+
+    private static void buildRow(RowType type, String columnName, GenericRecord record, List<BlockBuilder> fieldBuilders)
+    {
+        List<Field> fields = type.getFields();
+        for (int i = 0; i < fields.size(); i++) {
+            Field field = fields.get(i);
             checkState(field.getName().isPresent(), "field name not found");
-            serializeObject(singleRowBuilder, record.get(field.getName().get()), field.getType(), columnName);
+            serializeObject(fieldBuilders.get(i), record.get(field.getName().get()), field.getType(), columnName);
         }
-        blockBuilder.closeEntry();
-        if (parentBlockBuilder == null) {
-            return blockBuilder.getObject(0, Block.class);
-        }
-        return null;
     }
 }
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/AvroRowDecoderFactory.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/AvroRowDecoderFactory.java
index c63410ece71b..a02aebd590c1 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/AvroRowDecoderFactory.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/AvroRowDecoderFactory.java
@@ -13,18 +13,15 @@
  */
 package io.trino.decoder.avro;
 
-import io.trino.decoder.DecoderColumnHandle;
+import com.google.inject.Inject;
 import io.trino.decoder.RowDecoder;
 import io.trino.decoder.RowDecoderFactory;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.decoder.dummy.DummyRowDecoderFactory;
+import io.trino.spi.connector.ConnectorSession;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericRecord;
 
-import javax.inject.Inject;
-
-import java.util.Map;
-import java.util.Set;
-
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
@@ -46,23 +43,22 @@ public AvroRowDecoderFactory(AvroReaderSupplier.Factory avroReaderSupplierFactor
     }
 
     @Override
-    public RowDecoder create(Map<String, String> decoderParams, Set<DecoderColumnHandle> columns)
+    public RowDecoder create(ConnectorSession session, RowDecoderSpec rowDecoderSpec)
     {
-        requireNonNull(columns, "columns is null");
-        if (columns.isEmpty()) {
+        if (rowDecoderSpec.columns().isEmpty()) {
             // For select count(*)
             return DummyRowDecoderFactory.DECODER_INSTANCE;
         }
 
-        String dataSchema = requireNonNull(decoderParams.get(DATA_SCHEMA), format("%s cannot be null", DATA_SCHEMA));
+        String dataSchema = requireNonNull(rowDecoderSpec.decoderParams().get(DATA_SCHEMA), format("%s cannot be null", DATA_SCHEMA));
         Schema parsedSchema = (new Schema.Parser()).parse(dataSchema);
         if (parsedSchema.getType().equals(Schema.Type.RECORD)) {
             AvroReaderSupplier<GenericRecord> avroReaderSupplier = avroReaderSupplierFactory.create(parsedSchema);
             AvroDeserializer<GenericRecord> dataDecoder = avroDeserializerFactory.create(avroReaderSupplier);
-            return new GenericRecordRowDecoder(dataDecoder, columns);
+            return new GenericRecordRowDecoder(dataDecoder, rowDecoderSpec.columns());
         }
         AvroReaderSupplier<Object> avroReaderSupplier = avroReaderSupplierFactory.create(parsedSchema);
         AvroDeserializer<Object> dataDecoder = avroDeserializerFactory.create(avroReaderSupplier);
-        return new SingleValueRowDecoder(dataDecoder, getOnlyElement(columns));
+        return new SingleValueRowDecoder(dataDecoder, getOnlyElement(rowDecoderSpec.columns()));
     }
 }
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/GenericRecordRowDecoder.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/GenericRecordRowDecoder.java
index a68f990f0fbd..3261060c52b5 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/GenericRecordRowDecoder.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/GenericRecordRowDecoder.java
@@ -46,7 +46,13 @@ public GenericRecordRowDecoder(AvroDeserializer<GenericRecord> deserializer, Set
     @Override
     public Optional<Map<DecoderColumnHandle, FieldValueProvider>> decodeRow(byte[] data)
     {
-        GenericRecord avroRecord = deserializer.deserialize(data);
+        GenericRecord avroRecord;
+        try {
+            avroRecord = deserializer.deserialize(data);
+        }
+        catch (RuntimeException e) {
+            return Optional.empty();
+        }
         return Optional.of(columnDecoders.stream()
                 .collect(toImmutableMap(Map.Entry::getKey, entry -> entry.getValue().decodeField(avroRecord))));
     }
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/SingleValueRowDecoder.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/SingleValueRowDecoder.java
index 014619bb2037..eefab278a3a4 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/SingleValueRowDecoder.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/SingleValueRowDecoder.java
@@ -23,7 +23,7 @@
 
 import static java.util.Objects.requireNonNull;
 
-class SingleValueRowDecoder
+public class SingleValueRowDecoder
         implements RowDecoder
 {
     private final DecoderColumnHandle column;
@@ -32,13 +32,19 @@ class SingleValueRowDecoder
     public SingleValueRowDecoder(AvroDeserializer<Object> deserializer, DecoderColumnHandle column)
     {
         this.deserializer = requireNonNull(deserializer, "deserializer is null");
-        this.column = requireNonNull(column, "columns is null");
+        this.column = requireNonNull(column, "column is null");
     }
 
     @Override
     public Optional<Map<DecoderColumnHandle, FieldValueProvider>> decodeRow(byte[] data)
     {
-        Object avroValue = deserializer.deserialize(data);
+        Object avroValue;
+        try {
+            avroValue = deserializer.deserialize(data);
+        }
+        catch (RuntimeException e) {
+            return Optional.empty();
+        }
         return Optional.of(ImmutableMap.of(column, new AvroColumnDecoder.ObjectValueProvider(avroValue, column.getType(), column.getName())));
     }
 }
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/csv/CsvColumnDecoder.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/csv/CsvColumnDecoder.java
index 23a80643457b..ed7f90f3da90 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/csv/CsvColumnDecoder.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/csv/CsvColumnDecoder.java
@@ -92,7 +92,6 @@ public boolean isNull()
                 return tokens[columnIndex].isEmpty();
             }
 
-            @SuppressWarnings("SimplifiableConditionalExpression")
             @Override
             public boolean getBoolean()
             {
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/csv/CsvRowDecoderFactory.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/csv/CsvRowDecoderFactory.java
index fd8674f54e90..50a3a6896472 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/csv/CsvRowDecoderFactory.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/csv/CsvRowDecoderFactory.java
@@ -13,19 +13,17 @@
  */
 package io.trino.decoder.csv;
 
-import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.RowDecoder;
 import io.trino.decoder.RowDecoderFactory;
-
-import java.util.Map;
-import java.util.Set;
+import io.trino.decoder.RowDecoderSpec;
+import io.trino.spi.connector.ConnectorSession;
 
 public class CsvRowDecoderFactory
         implements RowDecoderFactory
 {
     @Override
-    public RowDecoder create(Map<String, String> decoderParams, Set<DecoderColumnHandle> columns)
+    public RowDecoder create(ConnectorSession session, RowDecoderSpec rowDecoderSpec)
     {
-        return new CsvRowDecoder(columns);
+        return new CsvRowDecoder(rowDecoderSpec.columns());
     }
 }
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/dummy/DummyRowDecoderFactory.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/dummy/DummyRowDecoderFactory.java
index 9b27428cdbc6..4f3fd2d28bd6 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/dummy/DummyRowDecoderFactory.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/dummy/DummyRowDecoderFactory.java
@@ -13,12 +13,10 @@
  */
 package io.trino.decoder.dummy;
 
-import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.RowDecoder;
 import io.trino.decoder.RowDecoderFactory;
-
-import java.util.Map;
-import java.util.Set;
+import io.trino.decoder.RowDecoderSpec;
+import io.trino.spi.connector.ConnectorSession;
 
 public class DummyRowDecoderFactory
         implements RowDecoderFactory
@@ -26,7 +24,7 @@ public class DummyRowDecoderFactory
     public static final RowDecoder DECODER_INSTANCE = new DummyRowDecoder();
 
     @Override
-    public RowDecoder create(Map<String, String> decoderParams, Set<DecoderColumnHandle> columns)
+    public RowDecoder create(ConnectorSession session, RowDecoderSpec rowDecoderSpec)
     {
         return DECODER_INSTANCE;
     }
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/json/AbstractDateTimeJsonValueProvider.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/json/AbstractDateTimeJsonValueProvider.java
index b63bc4286f28..27716e66b44a 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/json/AbstractDateTimeJsonValueProvider.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/json/AbstractDateTimeJsonValueProvider.java
@@ -84,7 +84,7 @@ public final long getLong()
         }
         if (type.equals(TIME_TZ_MILLIS)) {
             int offsetMinutes = getTimeZone().getZoneId().getRules().getOffset(Instant.ofEpochMilli(millis)).getTotalSeconds() / 60;
-            return packTimeWithTimeZone((millis + (offsetMinutes * 60 * MILLISECONDS_PER_SECOND)) * NANOSECONDS_PER_MILLISECOND, offsetMinutes);
+            return packTimeWithTimeZone((millis + (offsetMinutes * 60L * MILLISECONDS_PER_SECOND)) * NANOSECONDS_PER_MILLISECOND, offsetMinutes);
         }
 
         throw new IllegalStateException("Unsupported type: " + type);
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/json/JsonRowDecoderFactory.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/json/JsonRowDecoderFactory.java
index ba0e9c78e0b9..a5ee6f203f3a 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/json/JsonRowDecoderFactory.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/json/JsonRowDecoderFactory.java
@@ -14,12 +14,13 @@
 package io.trino.decoder.json;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.inject.Inject;
 import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.RowDecoder;
 import io.trino.decoder.RowDecoderFactory;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.spi.TrinoException;
-
-import javax.inject.Inject;
+import io.trino.spi.connector.ConnectorSession;
 
 import java.util.Map;
 import java.util.Optional;
@@ -44,10 +45,9 @@ public JsonRowDecoderFactory(ObjectMapper objectMapper)
     }
 
     @Override
-    public RowDecoder create(Map<String, String> decoderParams, Set<DecoderColumnHandle> columns)
+    public RowDecoder create(ConnectorSession session, RowDecoderSpec rowDecoderSpec)
     {
-        requireNonNull(columns, "columns is null");
-        return new JsonRowDecoder(objectMapper, chooseFieldDecoders(columns));
+        return new JsonRowDecoder(objectMapper, chooseFieldDecoders(rowDecoderSpec.columns()));
     }
 
     private Map<DecoderColumnHandle, JsonFieldDecoder> chooseFieldDecoders(Set<DecoderColumnHandle> columns)
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/DescriptorProvider.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/DescriptorProvider.java
new file mode 100644
index 000000000000..f0d063d6c9aa
--- /dev/null
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/DescriptorProvider.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed 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 io.trino.decoder.protobuf;
+
+import com.google.protobuf.Descriptors.Descriptor;
+import io.trino.spi.TrinoException;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Optional;
+
+import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
+
+public interface DescriptorProvider
+{
+    Optional<Descriptor> getDescriptorFromTypeUrl(String url);
+
+    default String getContents(String url)
+    {
+        requireNonNull(url, "url is null");
+        ByteArrayOutputStream typeBytes = new ByteArrayOutputStream();
+        try (InputStream stream = new URL(url).openStream()) {
+            stream.transferTo(typeBytes);
+        }
+        catch (IOException e) {
+            throw new TrinoException(GENERIC_USER_ERROR, "Failed to read schema from URL", e);
+        }
+        return typeBytes.toString(UTF_8);
+    }
+}
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/DummyDescriptorProvider.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/DummyDescriptorProvider.java
new file mode 100644
index 000000000000..2bdcf1519810
--- /dev/null
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/DummyDescriptorProvider.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed 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 io.trino.decoder.protobuf;
+
+import com.google.protobuf.Descriptors.Descriptor;
+
+import java.util.Optional;
+
+public class DummyDescriptorProvider
+        implements DescriptorProvider
+{
+    @Override
+    public Optional<Descriptor> getDescriptorFromTypeUrl(String url)
+    {
+        return Optional.empty();
+    }
+}
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/FileDescriptorProvider.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/FileDescriptorProvider.java
new file mode 100644
index 000000000000..28009bedf929
--- /dev/null
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/FileDescriptorProvider.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed 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 io.trino.decoder.protobuf;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.protobuf.Descriptors;
+import com.google.protobuf.Descriptors.Descriptor;
+import io.trino.spi.TrinoException;
+
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+
+import static com.google.common.base.Preconditions.checkState;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.decoder.protobuf.ProtobufErrorCode.INVALID_PROTO_FILE;
+import static io.trino.decoder.protobuf.ProtobufRowDecoderFactory.DEFAULT_MESSAGE;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+public class FileDescriptorProvider
+        implements DescriptorProvider
+{
+    private final LoadingCache<String, Descriptor> protobufTypeUrlCache;
+
+    public FileDescriptorProvider()
+    {
+        protobufTypeUrlCache = buildNonEvictableCache(
+                CacheBuilder.newBuilder().maximumSize(1000),
+                CacheLoader.from(this::loadDescriptorFromType));
+    }
+
+    @Override
+    public Optional<Descriptor> getDescriptorFromTypeUrl(String url)
+    {
+        try {
+            requireNonNull(url, "url is null");
+            return Optional.of(protobufTypeUrlCache.get(url));
+        }
+        catch (ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Descriptor loadDescriptorFromType(String url)
+    {
+        try {
+            Descriptor descriptor = ProtobufUtils.getFileDescriptor(getContents(url)).findMessageTypeByName(DEFAULT_MESSAGE);
+            checkState(descriptor != null, format("Message %s not found", DEFAULT_MESSAGE));
+            return descriptor;
+        }
+        catch (Descriptors.DescriptorValidationException e) {
+            throw new TrinoException(INVALID_PROTO_FILE, "Unable to parse protobuf schema", e);
+        }
+    }
+}
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufColumnDecoder.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufColumnDecoder.java
index 56118db9f00e..ad6478a18701 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufColumnDecoder.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufColumnDecoder.java
@@ -13,11 +13,21 @@
  */
 package io.trino.decoder.protobuf;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableSet;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor;
+import com.google.protobuf.Descriptors.OneofDescriptor;
 import com.google.protobuf.DynamicMessage;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.Message;
+import com.google.protobuf.util.JsonFormat;
+import com.google.protobuf.util.JsonFormat.TypeRegistry;
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
 import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.FieldValueProvider;
 import io.trino.spi.TrinoException;
@@ -33,21 +43,35 @@
 import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.TinyintType;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeManager;
+import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
 
+import static com.fasterxml.jackson.databind.SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS;
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
+import static io.trino.spi.type.StandardTypes.JSON;
+import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class ProtobufColumnDecoder
 {
+    // Trino JSON types are expected to be sorted by key
+    private static final ObjectMapper mapper = JsonMapper.builder().configure(ORDER_MAP_ENTRIES_BY_KEYS, true).build();
+    private static final String ANY_TYPE_NAME = "google.protobuf.Any";
+    private static final Slice EMPTY_JSON = Slices.utf8Slice("{}");
+
     private static final Set<Type> SUPPORTED_PRIMITIVE_TYPES = ImmutableSet.of(
             BooleanType.BOOLEAN,
             TinyintType.TINYINT,
@@ -61,11 +85,17 @@ public class ProtobufColumnDecoder
     private final Type columnType;
     private final String columnMapping;
     private final String columnName;
+    private final TypeManager typeManager;
+    private final DescriptorProvider descriptorProvider;
+    private final Type jsonType;
 
-    public ProtobufColumnDecoder(DecoderColumnHandle columnHandle)
+    public ProtobufColumnDecoder(DecoderColumnHandle columnHandle, TypeManager typeManager, DescriptorProvider descriptorProvider)
     {
         try {
             requireNonNull(columnHandle, "columnHandle is null");
+            this.typeManager = requireNonNull(typeManager, "typeManager is null");
+            this.descriptorProvider = requireNonNull(descriptorProvider, "descriptorProvider is null");
+            this.jsonType = typeManager.getType(new TypeSignature(JSON));
             this.columnType = columnHandle.getType();
             this.columnMapping = columnHandle.getMapping();
             this.columnName = columnHandle.getName();
@@ -81,7 +111,7 @@ public ProtobufColumnDecoder(DecoderColumnHandle columnHandle)
         }
     }
 
-    private static boolean isSupportedType(Type type)
+    private boolean isSupportedType(Type type)
     {
         if (isSupportedPrimitive(type)) {
             return true;
@@ -106,7 +136,8 @@ private static boolean isSupportedType(Type type)
             }
             return true;
         }
-        return false;
+
+        return type.equals(jsonType);
     }
 
     private static boolean isSupportedPrimitive(Type type)
@@ -118,22 +149,34 @@ private static boolean isSupportedPrimitive(Type type)
 
     public FieldValueProvider decodeField(DynamicMessage dynamicMessage)
     {
-        return new ProtobufValueProvider(locateField(dynamicMessage, columnMapping), columnType, columnName);
+        return new ProtobufValueProvider(locateField(dynamicMessage, columnMapping), columnType, columnName, typeManager);
     }
 
     @Nullable
-    private static Object locateField(DynamicMessage message, String columnMapping)
+    private Object locateField(DynamicMessage message, String columnMapping)
     {
         Object value = message;
         Optional<Descriptor> valueDescriptor = Optional.of(message.getDescriptorForType());
         for (String pathElement : Splitter.on('/').omitEmptyStrings().split(columnMapping)) {
             if (valueDescriptor.filter(descriptor -> descriptor.findFieldByName(pathElement) != null).isEmpty()) {
-                return null;
+                // Search the message to see if this column is oneof type
+                Optional<OneofDescriptor> oneofDescriptor = message.getDescriptorForType().getOneofs().stream()
+                        .filter(descriptor -> descriptor.getName().equals(columnMapping))
+                        .findFirst();
+
+                return oneofDescriptor.map(descriptor -> createOneofJson(message, descriptor))
+                        .orElse(null);
             }
+
             FieldDescriptor fieldDescriptor = valueDescriptor.get().findFieldByName(pathElement);
             value = ((DynamicMessage) value).getField(fieldDescriptor);
             valueDescriptor = getDescriptor(fieldDescriptor);
         }
+
+        if (valueDescriptor.isPresent() && valueDescriptor.get().getFullName().equals(ANY_TYPE_NAME)) {
+            return createAnyJson((Message) value, valueDescriptor.get());
+        }
+
         return value;
     }
 
@@ -144,4 +187,70 @@ private static Optional<Descriptor> getDescriptor(FieldDescriptor fieldDescripto
         }
         return Optional.empty();
     }
+
+    private static Object createOneofJson(DynamicMessage message, OneofDescriptor descriptor)
+    {
+        // Collect all oneof field names from the descriptor
+        Set<String> oneofColumns = descriptor.getFields().stream()
+                .map(FieldDescriptor::getName)
+                .collect(toImmutableSet());
+
+        // Find the oneof field in the message; there will be at most one
+        List<Entry<FieldDescriptor, Object>> oneofFields = message.getAllFields().entrySet().stream()
+                .filter(entry -> oneofColumns.contains(entry.getKey().getName()))
+                .collect(toImmutableList());
+
+        if (oneofFields.size() > 1) {
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Expected to find at most one 'oneof' field in message, found fields: %s", oneofFields));
+        }
+
+        // If found, map the field to a JSON string containing a single field:value pair, else return an empty JSON string {}
+        if (!oneofFields.isEmpty()) {
+            try {
+                // Create a new DynamicMessage where the only set field is the oneof field, so we can use the protobuf-java-util to encode the message as JSON
+                // If we encoded the entire input message, it would include all fields
+                Entry<FieldDescriptor, Object> oneofField = oneofFields.get(0);
+                DynamicMessage oneofMessage = DynamicMessage.newBuilder(oneofField.getKey().getContainingType())
+                        .setField(oneofField.getKey(), oneofField.getValue())
+                        .build();
+                return Slices.utf8Slice(JsonFormat.printer()
+                        .omittingInsignificantWhitespace()
+                        .print(oneofMessage));
+            }
+            catch (Exception e) {
+                throw new TrinoException(GENERIC_INTERNAL_ERROR, "Failed to convert oneof message to JSON", e);
+            }
+        }
+        return EMPTY_JSON;
+    }
+
+    private Object createAnyJson(Message value, Descriptor valueDescriptor)
+    {
+        try {
+            String typeUrl = (String) value.getField(valueDescriptor.findFieldByName("type_url"));
+            Optional<Descriptor> descriptor = descriptorProvider.getDescriptorFromTypeUrl(typeUrl);
+            if (descriptor.isPresent()) {
+                return Slices.utf8Slice(sorted(JsonFormat.printer()
+                        .usingTypeRegistry(TypeRegistry.newBuilder().add(descriptor.get()).build())
+                        .omittingInsignificantWhitespace()
+                        .print(value)));
+            }
+            return null;
+        }
+        catch (InvalidProtocolBufferException e) {
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Failed to print JSON from 'any' message type", e);
+        }
+    }
+
+    private static String sorted(String json)
+    {
+        try {
+            // Trino JSON types are expected to be sorted by key
+            // This routine takes an input JSON string and sorts the entire tree by key, including nested maps
+            return mapper.writeValueAsString(mapper.treeToValue(mapper.readTree(json), Map.class));
+        }
+        catch (JsonProcessingException e) {
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Failed to process JSON", e);
+        }
+    }
 }
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufDecoderModule.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufDecoderModule.java
index e924905128aa..471c36156a9a 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufDecoderModule.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufDecoderModule.java
@@ -27,6 +27,7 @@ public class ProtobufDecoderModule
     public void configure(Binder binder)
     {
         binder.bind(DynamicMessageProvider.Factory.class).to(FixedSchemaDynamicMessageProvider.Factory.class).in(SINGLETON);
+        binder.bind(DescriptorProvider.class).to(DummyDescriptorProvider.class).in(SINGLETON);
         newMapBinder(binder, String.class, RowDecoderFactory.class).addBinding(ProtobufRowDecoder.NAME).to(ProtobufRowDecoderFactory.class).in(SINGLETON);
     }
 }
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufRowDecoder.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufRowDecoder.java
index 441e040ae1f7..4aa9ba4bca90 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufRowDecoder.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufRowDecoder.java
@@ -17,6 +17,7 @@
 import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.FieldValueProvider;
 import io.trino.decoder.RowDecoder;
+import io.trino.spi.type.TypeManager;
 
 import java.util.Map;
 import java.util.Optional;
@@ -34,13 +35,13 @@ public class ProtobufRowDecoder
     private final DynamicMessageProvider dynamicMessageProvider;
     private final Map<DecoderColumnHandle, ProtobufColumnDecoder> columnDecoders;
 
-    public ProtobufRowDecoder(DynamicMessageProvider dynamicMessageProvider, Set<DecoderColumnHandle> columns)
+    public ProtobufRowDecoder(DynamicMessageProvider dynamicMessageProvider, Set<DecoderColumnHandle> columns, TypeManager typeManager, DescriptorProvider descriptorProvider)
     {
         this.dynamicMessageProvider = requireNonNull(dynamicMessageProvider, "dynamicMessageSupplier is null");
         this.columnDecoders = columns.stream()
                 .collect(toImmutableMap(
                         identity(),
-                        ProtobufColumnDecoder::new));
+                        column -> new ProtobufColumnDecoder(column, typeManager, descriptorProvider)));
     }
 
     @Override
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufRowDecoderFactory.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufRowDecoderFactory.java
index 52778be4f1b1..77f0e44ce68e 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufRowDecoderFactory.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufRowDecoderFactory.java
@@ -13,16 +13,15 @@
  */
 package io.trino.decoder.protobuf;
 
-import io.trino.decoder.DecoderColumnHandle;
+import com.google.inject.Inject;
 import io.trino.decoder.RowDecoder;
 import io.trino.decoder.RowDecoderFactory;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.decoder.protobuf.DynamicMessageProvider.Factory;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
-import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 
 import static java.util.Objects.requireNonNull;
 
@@ -32,18 +31,24 @@ public class ProtobufRowDecoderFactory
     public static final String DEFAULT_MESSAGE = "schema";
 
     private final Factory dynamicMessageProviderFactory;
+    private final TypeManager typeManager;
+    private final DescriptorProvider descriptorProvider;
 
     @Inject
-    public ProtobufRowDecoderFactory(Factory dynamicMessageProviderFactory)
+    public ProtobufRowDecoderFactory(Factory dynamicMessageProviderFactory, TypeManager typeManager, DescriptorProvider descriptorProvider)
     {
         this.dynamicMessageProviderFactory = requireNonNull(dynamicMessageProviderFactory, "dynamicMessageProviderFactory is null");
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.descriptorProvider = requireNonNull(descriptorProvider, "descriptorProvider is null");
     }
 
     @Override
-    public RowDecoder create(Map<String, String> decoderParams, Set<DecoderColumnHandle> columns)
+    public RowDecoder create(ConnectorSession session, RowDecoderSpec rowDecoderSpec)
     {
         return new ProtobufRowDecoder(
-                dynamicMessageProviderFactory.create(Optional.ofNullable(decoderParams.get("dataSchema"))),
-                columns);
+                dynamicMessageProviderFactory.create(Optional.ofNullable(rowDecoderSpec.decoderParams().get("dataSchema"))),
+                rowDecoderSpec.columns(),
+                typeManager,
+                descriptorProvider);
     }
 }
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufValueProvider.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufValueProvider.java
index a7f80a2d4d88..649130a30a28 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufValueProvider.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/protobuf/ProtobufValueProvider.java
@@ -23,6 +23,10 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.BooleanType;
@@ -31,14 +35,16 @@
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RealType;
 import io.trino.spi.type.RowType;
+import io.trino.spi.type.RowType.Field;
 import io.trino.spi.type.SmallintType;
 import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.TinyintType;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeManager;
+import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Collection;
 import java.util.List;
@@ -48,6 +54,9 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.decoder.DecoderErrorCode.DECODER_CONVERSION_NOT_SUPPORTED;
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
+import static io.trino.spi.type.StandardTypes.JSON;
 import static io.trino.spi.type.TimestampType.MAX_SHORT_PRECISION;
 import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_SECOND;
 import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MICROSECOND;
@@ -65,12 +74,14 @@ public class ProtobufValueProvider
     private final Object value;
     private final Type columnType;
     private final String columnName;
+    private final Type jsonType;
 
-    public ProtobufValueProvider(@Nullable Object value, Type columnType, String columnName)
+    public ProtobufValueProvider(@Nullable Object value, Type columnType, String columnName, TypeManager typeManager)
     {
         this.value = value;
         this.columnType = requireNonNull(columnType, "columnType is null");
         this.columnName = requireNonNull(columnName, "columnName is null");
+        this.jsonType = typeManager.getType(new TypeSignature(JSON));
     }
 
     @Override
@@ -123,12 +134,12 @@ public Slice getSlice()
     }
 
     @Override
-    public Block getBlock()
+    public Object getObject()
     {
         return serializeObject(null, value, columnType, columnName);
     }
 
-    private static Slice getSlice(Object value, Type type, String columnName)
+    private Slice getSlice(Object value, Type type, String columnName)
     {
         requireNonNull(value, "value is null");
         if ((type instanceof VarcharType && value instanceof CharSequence) || value instanceof EnumValueDescriptor) {
@@ -139,28 +150,36 @@ private static Slice getSlice(Object value, Type type, String columnName)
             return Slices.wrappedBuffer(((ByteString) value).toByteArray());
         }
 
+        if (type.equals(jsonType)) {
+            return (Slice) value;
+        }
+
         throw new TrinoException(DECODER_CONVERSION_NOT_SUPPORTED, format("cannot decode object of '%s' as '%s' for column '%s'", value.getClass(), type, columnName));
     }
 
     @Nullable
-    private static Block serializeObject(BlockBuilder builder, Object value, Type type, String columnName)
+    private Object serializeObject(BlockBuilder builder, Object value, Type type, String columnName)
     {
         if (type instanceof ArrayType) {
             return serializeList(builder, value, type, columnName);
         }
-        if (type instanceof MapType) {
-            return serializeMap(builder, value, type, columnName);
+        if (type instanceof MapType mapType) {
+            return serializeMap(builder, value, mapType, columnName);
         }
         if (type instanceof RowType) {
             return serializeRow(builder, value, type, columnName);
         }
 
+        if (type.equals(jsonType)) {
+            return serializeJson(builder, value, type);
+        }
+
         serializePrimitive(builder, value, type, columnName);
         return null;
     }
 
     @Nullable
-    private static Block serializeList(BlockBuilder parentBlockBuilder, @Nullable Object value, Type type, String columnName)
+    private Block serializeList(BlockBuilder parentBlockBuilder, @Nullable Object value, Type type, String columnName)
     {
         if (value == null) {
             checkState(parentBlockBuilder != null, "parentBlockBuilder is null");
@@ -182,7 +201,7 @@ private static Block serializeList(BlockBuilder parentBlockBuilder, @Nullable Ob
         return blockBuilder.build();
     }
 
-    private static void serializePrimitive(BlockBuilder blockBuilder, @Nullable Object value, Type type, String columnName)
+    private void serializePrimitive(BlockBuilder blockBuilder, @Nullable Object value, Type type, String columnName)
     {
         requireNonNull(blockBuilder, "parent blockBuilder is null");
 
@@ -226,7 +245,7 @@ private static void serializePrimitive(BlockBuilder blockBuilder, @Nullable Obje
     }
 
     @Nullable
-    private static Block serializeMap(BlockBuilder parentBlockBuilder, @Nullable Object value, Type type, String columnName)
+    private SqlMap serializeMap(BlockBuilder parentBlockBuilder, @Nullable Object value, MapType type, String columnName)
     {
         if (value == null) {
             checkState(parentBlockBuilder != null, "parentBlockBuilder is null");
@@ -237,67 +256,67 @@ private static Block serializeMap(BlockBuilder parentBlockBuilder, @Nullable Obj
         Collection<DynamicMessage> dynamicMessages = ((Collection<?>) value).stream()
                 .map(DynamicMessage.class::cast)
                 .collect(toImmutableList());
-        List<Type> typeParameters = type.getTypeParameters();
-        Type keyType = typeParameters.get(0);
-        Type valueType = typeParameters.get(1);
+        Type keyType = type.getKeyType();
+        Type valueType = type.getValueType();
 
-        BlockBuilder blockBuilder;
         if (parentBlockBuilder != null) {
-            blockBuilder = parentBlockBuilder;
-        }
-        else {
-            blockBuilder = type.createBlockBuilder(null, 1);
+            ((MapBlockBuilder) parentBlockBuilder).buildEntry((keyBuilder, valueBuilder) -> buildMap(columnName, dynamicMessages, keyType, valueType, keyBuilder, valueBuilder));
+            return null;
         }
+        return buildMapValue(type, dynamicMessages.size(), (keyBuilder, valueBuilder) -> buildMap(columnName, dynamicMessages, keyType, valueType, keyBuilder, valueBuilder));
+    }
 
-        BlockBuilder entryBuilder = blockBuilder.beginBlockEntry();
+    private void buildMap(String columnName, Collection<DynamicMessage> dynamicMessages, Type keyType, Type valueType, BlockBuilder keyBuilder, BlockBuilder valueBuilder)
+    {
         for (DynamicMessage dynamicMessage : dynamicMessages) {
             if (dynamicMessage.getField(dynamicMessage.getDescriptorForType().findFieldByNumber(1)) != null) {
-                serializeObject(entryBuilder, dynamicMessage.getField(getFieldDescriptor(dynamicMessage, 1)), keyType, columnName);
-                serializeObject(entryBuilder, dynamicMessage.getField(getFieldDescriptor(dynamicMessage, 2)), valueType, columnName);
+                serializeObject(keyBuilder, dynamicMessage.getField(getFieldDescriptor(dynamicMessage, 1)), keyType, columnName);
+                serializeObject(valueBuilder, dynamicMessage.getField(getFieldDescriptor(dynamicMessage, 2)), valueType, columnName);
             }
         }
-        blockBuilder.closeEntry();
-
-        if (parentBlockBuilder == null) {
-            return blockBuilder.getObject(0, Block.class);
-        }
-        return null;
     }
 
     @Nullable
-    private static Block serializeRow(BlockBuilder parentBlockBuilder, @Nullable Object value, Type type, String columnName)
+    private SqlRow serializeRow(BlockBuilder blockBuilder, @Nullable Object value, Type type, String columnName)
     {
         if (value == null) {
-            checkState(parentBlockBuilder != null, "parent block builder is null");
-            parentBlockBuilder.appendNull();
+            checkState(blockBuilder != null, "parent block builder is null");
+            blockBuilder.appendNull();
             return null;
         }
 
-        BlockBuilder blockBuilder;
-        if (parentBlockBuilder != null) {
-            blockBuilder = parentBlockBuilder;
+        RowType rowType = (RowType) type;
+        if (blockBuilder == null) {
+            return buildRowValue(rowType, fieldBuilders -> buildRow(rowType, columnName, (DynamicMessage) value, fieldBuilders));
         }
-        else {
-            blockBuilder = type.createBlockBuilder(null, 1);
-        }
-        BlockBuilder singleRowBuilder = blockBuilder.beginBlockEntry();
-        DynamicMessage record = (DynamicMessage) value;
-        List<RowType.Field> fields = ((RowType) type).getFields();
-        for (RowType.Field field : fields) {
+        ((RowBlockBuilder) blockBuilder).buildEntry((fieldBuilders) -> buildRow(rowType, columnName, (DynamicMessage) value, fieldBuilders));
+        return null;
+    }
+
+    private void buildRow(RowType rowType, String columnName, DynamicMessage record, List<BlockBuilder> fieldBuilders)
+    {
+        List<RowType.Field> fields = rowType.getFields();
+        for (int i = 0; i < fields.size(); i++) {
+            Field field = fields.get(i);
             checkState(field.getName().isPresent(), "field name not found");
             FieldDescriptor fieldDescriptor = getFieldDescriptor(record, field.getName().get());
             checkState(fieldDescriptor != null, format("Unknown Field %s", field.getName().get()));
             serializeObject(
-                    singleRowBuilder,
+                    fieldBuilders.get(i),
                     record.getField(fieldDescriptor),
                     field.getType(),
                     columnName);
         }
-        blockBuilder.closeEntry();
-        if (parentBlockBuilder == null) {
-            return blockBuilder.getObject(0, Block.class);
+    }
+
+    @Nullable
+    private static Block serializeJson(BlockBuilder builder, Object value, Type type)
+    {
+        if (builder != null) {
+            type.writeObject(builder, value);
+            return null;
         }
-        return null;
+        return (Block) value;
     }
 
     private static long parseTimestamp(int precision, DynamicMessage timestamp)
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/raw/RawColumnDecoder.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/raw/RawColumnDecoder.java
index 55524eca52d7..870abf9cd341 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/raw/RawColumnDecoder.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/raw/RawColumnDecoder.java
@@ -290,7 +290,7 @@ private void checkEnoughBytes()
         @Override
         public Slice getSlice()
         {
-            Slice slice = Slices.wrappedBuffer(value.slice());
+            Slice slice = Slices.wrappedHeapBuffer(value.slice());
             return Varchars.truncateToLength(slice, columnType);
         }
     }
diff --git a/lib/trino-record-decoder/src/main/java/io/trino/decoder/raw/RawRowDecoderFactory.java b/lib/trino-record-decoder/src/main/java/io/trino/decoder/raw/RawRowDecoderFactory.java
index 05188f7230d1..e03fbe4115d8 100644
--- a/lib/trino-record-decoder/src/main/java/io/trino/decoder/raw/RawRowDecoderFactory.java
+++ b/lib/trino-record-decoder/src/main/java/io/trino/decoder/raw/RawRowDecoderFactory.java
@@ -13,19 +13,17 @@
  */
 package io.trino.decoder.raw;
 
-import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.RowDecoder;
 import io.trino.decoder.RowDecoderFactory;
-
-import java.util.Map;
-import java.util.Set;
+import io.trino.decoder.RowDecoderSpec;
+import io.trino.spi.connector.ConnectorSession;
 
 public class RawRowDecoderFactory
         implements RowDecoderFactory
 {
     @Override
-    public RowDecoder create(Map<String, String> decoderParams, Set<DecoderColumnHandle> columns)
+    public RowDecoder create(ConnectorSession session, RowDecoderSpec rowDecoderSpec)
     {
-        return new RawRowDecoder(columns);
+        return new RawRowDecoder(rowDecoderSpec.columns());
     }
 }
diff --git a/lib/trino-record-decoder/src/test/java/io/trino/decoder/avro/AvroDecoderTestUtil.java b/lib/trino-record-decoder/src/test/java/io/trino/decoder/avro/AvroDecoderTestUtil.java
index 99527599e3e6..2ec07462a90d 100644
--- a/lib/trino-record-decoder/src/test/java/io/trino/decoder/avro/AvroDecoderTestUtil.java
+++ b/lib/trino-record-decoder/src/test/java/io/trino/decoder/avro/AvroDecoderTestUtil.java
@@ -14,6 +14,8 @@
 package io.trino.decoder.avro;
 
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
@@ -32,16 +34,17 @@
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static java.lang.String.format;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
-public class AvroDecoderTestUtil
+public final class AvroDecoderTestUtil
 {
     private AvroDecoderTestUtil() {}
 
-    public static void checkPrimitiveValue(Object actual, Object expected)
+    private static void checkPrimitiveValue(Object actual, Object expected)
     {
         if (actual == null || expected == null) {
             assertNull(expected);
@@ -73,7 +76,7 @@ else if (isRealType(actual) && isRealType(expected)) {
         }
     }
 
-    public static boolean isIntegralType(Object value)
+    private static boolean isIntegralType(Object value)
     {
         return value instanceof Long
                 || value instanceof Integer
@@ -81,19 +84,11 @@ public static boolean isIntegralType(Object value)
                 || value instanceof Byte;
     }
 
-    public static boolean isRealType(Object value)
+    private static boolean isRealType(Object value)
     {
         return value instanceof Float || value instanceof Double;
     }
 
-    public static Object getObjectValue(Type type, Block block, int position)
-    {
-        if (block.isNull(position)) {
-            return null;
-        }
-        return type.getObjectValue(SESSION, block, position);
-    }
-
     public static void checkArrayValues(Block block, Type type, Object value)
     {
         assertNotNull(type, "Type is null");
@@ -105,119 +100,85 @@ public static void checkArrayValues(Block block, Type type, Object value)
 
         assertEquals(block.getPositionCount(), list.size());
         Type elementType = ((ArrayType) type).getElementType();
-        if (elementType instanceof ArrayType) {
-            for (int index = 0; index < block.getPositionCount(); index++) {
-                if (block.isNull(index)) {
-                    assertNull(list.get(index));
-                    continue;
-                }
-                Block arrayBlock = block.getObject(index, Block.class);
-                checkArrayValues(arrayBlock, elementType, list.get(index));
+        for (int index = 0; index < block.getPositionCount(); index++) {
+            if (block.isNull(index)) {
+                assertNull(list.get(index));
+                continue;
             }
-        }
-        else if (elementType instanceof MapType) {
-            for (int index = 0; index < block.getPositionCount(); index++) {
-                if (block.isNull(index)) {
-                    assertNull(list.get(index));
-                    continue;
-                }
-                Block mapBlock = block.getObject(index, Block.class);
-                checkMapValues(mapBlock, elementType, list.get(index));
+            if (elementType instanceof ArrayType arrayType) {
+                checkArrayValues(arrayType.getObject(block, index), elementType, list.get(index));
             }
-        }
-        else if (elementType instanceof RowType) {
-            for (int index = 0; index < block.getPositionCount(); index++) {
-                if (block.isNull(index)) {
-                    assertNull(list.get(index));
-                    continue;
-                }
-                Block rowBlock = block.getObject(index, Block.class);
-                checkRowValues(rowBlock, elementType, list.get(index));
+            else if (elementType instanceof MapType mapType) {
+                checkMapValues(mapType.getObject(block, index), elementType, list.get(index));
             }
-        }
-        else {
-            for (int index = 0; index < block.getPositionCount(); index++) {
-                checkPrimitiveValue(getObjectValue(elementType, block, index), list.get(index));
+            else if (elementType instanceof RowType rowType) {
+                checkRowValues(rowType.getObject(block, index), elementType, list.get(index));
+            }
+            else {
+                checkPrimitiveValue(elementType.getObjectValue(SESSION, block, index), list.get(index));
             }
         }
     }
 
-    public static void checkMapValues(Block block, Type type, Object value)
+    public static void checkMapValues(SqlMap sqlMap, Type type, Object value)
     {
         assertNotNull(type, "Type is null");
         assertTrue(type instanceof MapType, "Unexpected type");
         assertTrue(((MapType) type).getKeyType() instanceof VarcharType, "Unexpected key type");
-        assertNotNull(block, "Block is null");
+        assertNotNull(sqlMap, "sqlMap is null");
         assertNotNull(value, "Value is null");
 
-        Map<String, ?> expected = (Map<String, ?>) value;
+        Map<?, ?> expected = (Map<?, ?>) value;
+
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
 
-        assertEquals(block.getPositionCount(), expected.size() * 2);
+        assertEquals(sqlMap.getSize(), expected.size());
         Type valueType = ((MapType) type).getValueType();
-        if (valueType instanceof ArrayType) {
-            for (int index = 0; index < block.getPositionCount(); index += 2) {
-                String actualKey = VARCHAR.getSlice(block, index).toStringUtf8();
-                assertTrue(expected.containsKey(actualKey));
-                if (block.isNull(index + 1)) {
-                    assertNull(expected.get(actualKey));
-                    continue;
-                }
-                Block arrayBlock = block.getObject(index + 1, Block.class);
-                checkArrayValues(arrayBlock, valueType, expected.get(actualKey));
+        for (int index = 0; index < sqlMap.getSize(); index++) {
+            String actualKey = VARCHAR.getSlice(rawKeyBlock, rawOffset + index).toStringUtf8();
+            assertTrue(expected.containsKey(actualKey), "Key not found: %s".formatted(actualKey));
+            if (rawValueBlock.isNull(rawOffset + index)) {
+                assertNull(expected.get(actualKey));
+                continue;
             }
-        }
-        else if (valueType instanceof MapType) {
-            for (int index = 0; index < block.getPositionCount(); index += 2) {
-                String actualKey = VARCHAR.getSlice(block, index).toStringUtf8();
-                assertTrue(expected.containsKey(actualKey));
-                if (block.isNull(index + 1)) {
-                    assertNull(expected.get(actualKey));
-                    continue;
-                }
-                Block mapBlock = block.getObject(index + 1, Block.class);
-                checkMapValues(mapBlock, valueType, expected.get(actualKey));
+            if (valueType instanceof ArrayType arrayType) {
+                checkArrayValues(arrayType.getObject(rawValueBlock, rawOffset + index), valueType, expected.get(actualKey));
             }
-        }
-        else if (valueType instanceof RowType) {
-            for (int index = 0; index < block.getPositionCount(); index += 2) {
-                String actualKey = VARCHAR.getSlice(block, index).toStringUtf8();
-                assertTrue(expected.containsKey(actualKey));
-                if (block.isNull(index + 1)) {
-                    assertNull(expected.get(actualKey));
-                    continue;
-                }
-                Block rowBlock = block.getObject(index + 1, Block.class);
-                checkRowValues(rowBlock, valueType, expected.get(actualKey));
+            else if (valueType instanceof MapType mapType) {
+                checkMapValues(mapType.getObject(rawValueBlock, rawOffset + index), valueType, expected.get(actualKey));
             }
-        }
-        else {
-            for (int index = 0; index < block.getPositionCount(); index += 2) {
-                String actualKey = VARCHAR.getSlice(block, index).toStringUtf8();
-                assertTrue(expected.containsKey(actualKey));
-                checkPrimitiveValue(getObjectValue(valueType, block, index + 1), expected.get(actualKey));
+            else if (valueType instanceof RowType rowType) {
+                checkRowValues(rowType.getObject(rawValueBlock, rawOffset + index), valueType, expected.get(actualKey));
+            }
+            else {
+                checkPrimitiveValue(valueType.getObjectValue(SESSION, rawValueBlock, rawOffset + index), expected.get(actualKey));
             }
         }
     }
 
-    public static void checkRowValues(Block block, Type type, Object value)
+    public static void checkRowValues(SqlRow sqlRow, Type type, Object value)
     {
         assertNotNull(type, "Type is null");
         assertTrue(type instanceof RowType, "Unexpected type");
-        assertNotNull(block, "Block is null");
+        assertNotNull(sqlRow, "sqlRow is null");
         assertNotNull(value, "Value is null");
 
         GenericRecord record = (GenericRecord) value;
         RowType rowType = (RowType) type;
         assertEquals(record.getSchema().getFields().size(), rowType.getFields().size(), "Avro field size mismatch");
-        assertEquals(block.getPositionCount(), rowType.getFields().size(), "Trino type field size mismatch");
+        assertEquals(sqlRow.getFieldCount(), rowType.getFields().size(), "Trino type field size mismatch");
+        int rawIndex = sqlRow.getRawIndex();
         for (int fieldIndex = 0; fieldIndex < rowType.getFields().size(); fieldIndex++) {
             RowType.Field rowField = rowType.getFields().get(fieldIndex);
-            Object expectedValue = record.get(rowField.getName().get());
-            if (block.isNull(fieldIndex)) {
+            Object expectedValue = record.get(rowField.getName().orElseThrow());
+            Block fieldBlock = sqlRow.getRawFieldBlock(fieldIndex);
+            if (fieldBlock.isNull(rawIndex)) {
                 assertNull(expectedValue);
                 continue;
             }
-            checkField(block, rowField.getType(), fieldIndex, expectedValue);
+            checkField(fieldBlock, rowField.getType(), rawIndex, expectedValue);
         }
     }
 
@@ -225,20 +186,20 @@ private static void checkField(Block actualBlock, Type type, int position, Objec
     {
         assertNotNull(type, "Type is null");
         assertNotNull(actualBlock, "actualBlock is null");
-        assertTrue(!actualBlock.isNull(position));
+        assertFalse(actualBlock.isNull(position));
         assertNotNull(expectedValue, "expectedValue is null");
 
-        if (type instanceof ArrayType) {
-            checkArrayValues(actualBlock.getObject(position, Block.class), type, expectedValue);
+        if (type instanceof ArrayType arrayType) {
+            checkArrayValues(arrayType.getObject(actualBlock, position), type, expectedValue);
         }
-        else if (type instanceof MapType) {
-            checkMapValues(actualBlock.getObject(position, Block.class), type, expectedValue);
+        else if (type instanceof MapType mapType) {
+            checkMapValues(mapType.getObject(actualBlock, position), type, expectedValue);
         }
-        else if (type instanceof RowType) {
-            checkRowValues(actualBlock.getObject(position, Block.class), type, expectedValue);
+        else if (type instanceof RowType rowType) {
+            checkRowValues(rowType.getObject(actualBlock, position), type, expectedValue);
         }
         else {
-            checkPrimitiveValue(getObjectValue(type, actualBlock, position), expectedValue);
+            checkPrimitiveValue(type.getObjectValue(SESSION, actualBlock, position), expectedValue);
         }
     }
 }
diff --git a/lib/trino-record-decoder/src/test/java/io/trino/decoder/avro/TestAvroDecoder.java b/lib/trino-record-decoder/src/test/java/io/trino/decoder/avro/TestAvroDecoder.java
index 24ebb8f938b7..0a68febae1b7 100644
--- a/lib/trino-record-decoder/src/test/java/io/trino/decoder/avro/TestAvroDecoder.java
+++ b/lib/trino-record-decoder/src/test/java/io/trino/decoder/avro/TestAvroDecoder.java
@@ -21,8 +21,11 @@
 import io.trino.decoder.DecoderTestColumnHandle;
 import io.trino.decoder.FieldValueProvider;
 import io.trino.decoder.RowDecoder;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.BooleanType;
@@ -31,7 +34,6 @@
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarbinaryType;
-import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaBuilder;
 import org.apache.avro.SchemaBuilder.FieldAssembler;
@@ -60,6 +62,8 @@
 import static io.trino.decoder.avro.AvroDecoderTestUtil.checkArrayValues;
 import static io.trino.decoder.avro.AvroDecoderTestUtil.checkMapValues;
 import static io.trino.decoder.avro.AvroDecoderTestUtil.checkRowValues;
+import static io.trino.decoder.avro.AvroRowDecoderFactory.DATA_SCHEMA;
+import static io.trino.decoder.util.DecoderTestUtil.TESTING_SESSION;
 import static io.trino.decoder.util.DecoderTestUtil.checkIsNull;
 import static io.trino.decoder.util.DecoderTestUtil.checkValue;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -75,6 +79,7 @@
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.spi.type.VarcharType.createVarcharType;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
+import static java.lang.Float.floatToIntBits;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
@@ -83,7 +88,6 @@
 
 public class TestAvroDecoder
 {
-    private static final String DATA_SCHEMA = "dataSchema";
     private static final AvroRowDecoderFactory DECODER_FACTORY = new AvroRowDecoderFactory(new FixedSchemaAvroReaderSupplier.Factory(), new AvroFileDeserializer.Factory());
 
     private static final Type VARCHAR_MAP_TYPE = TESTING_TYPE_MANAGER.getType(mapType(VARCHAR.getTypeSignature(), VARCHAR.getTypeSignature()));
@@ -163,9 +167,9 @@ private Map<DecoderColumnHandle, FieldValueProvider> buildAndDecodeColumn(Decode
 
     private static Map<DecoderColumnHandle, FieldValueProvider> decodeRow(byte[] avroData, Set<DecoderColumnHandle> columns, Map<String, String> dataParams)
     {
-        RowDecoder rowDecoder = DECODER_FACTORY.create(dataParams, columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(AvroRowDecoderFactory.NAME, dataParams, columns));
         return rowDecoder.decodeRow(avroData)
-                .orElseThrow(AssertionError::new);
+                .orElseThrow(() -> new IllegalStateException("Problems during decode phase"));
     }
 
     private static byte[] buildAvroData(Schema schema, String name, Object value)
@@ -363,10 +367,8 @@ public void testSchemaEvolutionToIncompatibleType()
                 .toString();
 
         assertThatThrownBy(() -> decodeRow(originalIntData, ImmutableSet.of(stringColumnReadingIntData), ImmutableMap.of(DATA_SCHEMA, changedTypeSchema)))
-                .isInstanceOf(TrinoException.class)
-                .hasCauseExactlyInstanceOf(AvroTypeException.class)
-                .hasStackTraceContaining("Found int, expecting string")
-                .hasMessageMatching("Decoding Avro record failed.");
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageMatching("Problems during decode phase");
     }
 
     @Test
@@ -414,22 +416,13 @@ public void testIntDecodedAsTinyInt()
         checkValue(decodedRow, row, 100);
     }
 
-    @Test
-    public void testFloatDecodedAsDouble()
-    {
-        DecoderTestColumnHandle row = new DecoderTestColumnHandle(0, "row", DOUBLE, "float_field", null, null, false, false, false);
-        Map<DecoderColumnHandle, FieldValueProvider> decodedRow = buildAndDecodeColumn(row, "float_field", "\"float\"", 10.2f);
-
-        checkValue(decodedRow, row, 10.2);
-    }
-
     @Test
     public void testFloatDecodedAsReal()
     {
         DecoderTestColumnHandle row = new DecoderTestColumnHandle(0, "row", REAL, "float_field", null, null, false, false, false);
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = buildAndDecodeColumn(row, "float_field", "\"float\"", 10.2f);
 
-        checkValue(decodedRow, row, 10.2);
+        checkValue(decodedRow, row, floatToIntBits(10.2f));
     }
 
     @Test
@@ -738,7 +731,7 @@ public void testArrayOfMaps()
         DecoderTestColumnHandle row = new DecoderTestColumnHandle(0, "row", new ArrayType(REAL_MAP_TYPE), "array_field", null, null, false, false, false);
         GenericArray<Map<String, Float>> list = new GenericData.Array<>(schema, data);
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = buildAndDecodeColumn(row, "array_field", schema.toString(), list);
-        checkArrayValues(getBlock(decodedRow, row), row.getType(), data);
+        checkArrayValues((Block) getObject(decodedRow, row), row.getType(), data);
     }
 
     @Test
@@ -758,7 +751,7 @@ public void testArrayOfMapsWithNulls()
         DecoderTestColumnHandle row = new DecoderTestColumnHandle(0, "row", new ArrayType(REAL_MAP_TYPE), "array_field", null, null, false, false, false);
         GenericArray<Map<String, Float>> list = new GenericData.Array<>(schema, data);
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = buildAndDecodeColumn(row, "array_field", schema.toString(), list);
-        checkArrayValues(getBlock(decodedRow, row), row.getType(), data);
+        checkArrayValues((Block) getObject(decodedRow, row), row.getType(), data);
     }
 
     @Test
@@ -856,9 +849,9 @@ public void testMapOfArrayOfMapsWithDifferentKeys()
 
         DecoderTestColumnHandle row = new DecoderTestColumnHandle(0, "row", MAP_OF_ARRAY_OF_MAP_TYPE, "map_field", null, null, false, false, false);
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = buildAndDecodeColumn(row, "map_field", schema.toString(), data);
-        assertThatThrownBy(() -> checkArrayValue(decodedRow, row, mismatchedData))
+        assertThatThrownBy(() -> checkMapValue(decodedRow, row, mismatchedData))
                 .isInstanceOf(AssertionError.class)
-                .hasMessage("Unexpected type expected [true] but found [false]");
+                .hasMessageStartingWith("Key not found: sk3");
     }
 
     @Test
@@ -881,9 +874,9 @@ public void testMapOfArrayOfMapsWithDifferentValues()
 
         DecoderTestColumnHandle row = new DecoderTestColumnHandle(0, "row", MAP_OF_ARRAY_OF_MAP_TYPE, "map_field", null, null, false, false, false);
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = buildAndDecodeColumn(row, "map_field", schema.toString(), data);
-        assertThatThrownBy(() -> checkArrayValue(decodedRow, row, mismatchedData))
+        assertThatThrownBy(() -> checkMapValue(decodedRow, row, mismatchedData))
                 .isInstanceOf(AssertionError.class)
-                .hasMessage("Unexpected type expected [true] but found [false]");
+                .hasMessageMatching("expected \\[-2\\..*] but found \\[2\\..*]");
     }
 
     @Test
@@ -938,7 +931,7 @@ public void testMapWithDifferentKeys()
                 "key4", "def",
                 "key3", "zyx")))
                 .isInstanceOf(AssertionError.class)
-                .hasMessage("expected [true] but found [false]");
+                .hasMessageStartingWith("Key not found: key2");
     }
 
     @Test
@@ -1142,17 +1135,22 @@ public void testArrayOfRow()
 
     private static void checkRowValue(Map<DecoderColumnHandle, FieldValueProvider> decodedRow, DecoderColumnHandle handle, Object expected)
     {
-        checkRowValues(getBlock(decodedRow, handle), handle.getType(), expected);
+        checkRowValues((SqlRow) getObject(decodedRow, handle), handle.getType(), expected);
     }
 
     private static void checkArrayValue(Map<DecoderColumnHandle, FieldValueProvider> decodedRow, DecoderColumnHandle handle, Object expected)
     {
-        checkArrayValues(getBlock(decodedRow, handle), handle.getType(), expected);
+        checkArrayValues((Block) getObject(decodedRow, handle), handle.getType(), expected);
+    }
+
+    private static void checkMapValue(Map<DecoderColumnHandle, FieldValueProvider> decodedRow, DecoderColumnHandle handle, Object expected)
+    {
+        checkMapValues((SqlMap) getObject(decodedRow, handle), handle.getType(), expected);
     }
 
     private static void checkArrayItemIsNull(Map<DecoderColumnHandle, FieldValueProvider> decodedRow, DecoderColumnHandle handle, long[] expected)
     {
-        Block actualBlock = getBlock(decodedRow, handle);
+        Block actualBlock = (Block) getObject(decodedRow, handle);
         assertEquals(actualBlock.getPositionCount(), expected.length);
 
         for (int i = 0; i < actualBlock.getPositionCount(); i++) {
@@ -1163,14 +1161,14 @@ private static void checkArrayItemIsNull(Map<DecoderColumnHandle, FieldValueProv
 
     private static void checkMapValue(Map<DecoderColumnHandle, FieldValueProvider> decodedRow, DecoderTestColumnHandle handle, Object expected)
     {
-        checkMapValues(getBlock(decodedRow, handle), handle.getType(), expected);
+        checkMapValues((SqlMap) getObject(decodedRow, handle), handle.getType(), expected);
     }
 
-    private static Block getBlock(Map<DecoderColumnHandle, FieldValueProvider> decodedRow, DecoderColumnHandle handle)
+    private static Object getObject(Map<DecoderColumnHandle, FieldValueProvider> decodedRow, DecoderColumnHandle handle)
     {
         FieldValueProvider provider = decodedRow.get(handle);
         assertNotNull(provider);
-        return provider.getBlock();
+        return provider.getObject();
     }
 
     @Test
@@ -1216,7 +1214,7 @@ private void singleColumnDecoder(Type columnType)
                 .name("dummy").type().longType().noDefault()
                 .endRecord()
                 .toString();
-        DECODER_FACTORY.create(ImmutableMap.of(DATA_SCHEMA, someSchema), ImmutableSet.of(new DecoderTestColumnHandle(0, "some_column", columnType, "0", null, null, false, false, false)));
+        DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(AvroRowDecoderFactory.NAME, ImmutableMap.of(DATA_SCHEMA, someSchema), ImmutableSet.of(new DecoderTestColumnHandle(0, "some_column", columnType, "0", null, null, false, false, false))));
     }
 
     private void singleColumnDecoder(Type columnType, String mapping, String dataFormat, String formatHint, boolean keyDecoder, boolean hidden, boolean internal)
@@ -1226,6 +1224,6 @@ private void singleColumnDecoder(Type columnType, String mapping, String dataFor
                 .endRecord()
                 .toString();
 
-        DECODER_FACTORY.create(ImmutableMap.of(DATA_SCHEMA, someSchema), ImmutableSet.of(new DecoderTestColumnHandle(0, "some_column", columnType, mapping, dataFormat, formatHint, keyDecoder, hidden, internal)));
+        DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(AvroRowDecoderFactory.NAME, ImmutableMap.of(DATA_SCHEMA, someSchema), ImmutableSet.of(new DecoderTestColumnHandle(0, "some_column", columnType, mapping, dataFormat, formatHint, keyDecoder, hidden, internal))));
     }
 }
diff --git a/lib/trino-record-decoder/src/test/java/io/trino/decoder/csv/TestCsvDecoder.java b/lib/trino-record-decoder/src/test/java/io/trino/decoder/csv/TestCsvDecoder.java
index 2a298ee642bd..2d65ebc72318 100644
--- a/lib/trino-record-decoder/src/test/java/io/trino/decoder/csv/TestCsvDecoder.java
+++ b/lib/trino-record-decoder/src/test/java/io/trino/decoder/csv/TestCsvDecoder.java
@@ -18,6 +18,7 @@
 import io.trino.decoder.DecoderTestColumnHandle;
 import io.trino.decoder.FieldValueProvider;
 import io.trino.decoder.RowDecoder;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.BooleanType;
@@ -36,6 +37,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import static io.trino.decoder.util.DecoderTestUtil.TESTING_SESSION;
 import static io.trino.decoder.util.DecoderTestUtil.checkIsNull;
 import static io.trino.decoder.util.DecoderTestUtil.checkValue;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
@@ -62,7 +64,7 @@ public void testSimple()
         DecoderTestColumnHandle row7 = new DecoderTestColumnHandle(6, "row7", DoubleType.DOUBLE, "6", null, null, false, false, false);
 
         Set<DecoderColumnHandle> columns = ImmutableSet.of(row1, row2, row3, row4, row5, row6, row7);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(CsvRowDecoder.NAME, emptyMap(), columns));
 
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(csv.getBytes(StandardCharsets.UTF_8))
                 .orElseThrow(AssertionError::new);
@@ -93,7 +95,7 @@ public void testBoolean()
         DecoderTestColumnHandle row8 = new DecoderTestColumnHandle(7, "row8", BooleanType.BOOLEAN, "7", null, null, false, false, false);
 
         Set<DecoderColumnHandle> columns = ImmutableSet.of(row1, row2, row3, row4, row5, row6, row7, row8);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(CsvRowDecoder.NAME, emptyMap(), columns));
 
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(csv.getBytes(StandardCharsets.UTF_8))
                 .orElseThrow(AssertionError::new);
@@ -121,7 +123,7 @@ public void testNulls()
         DecoderTestColumnHandle row4 = new DecoderTestColumnHandle(3, "row4", BooleanType.BOOLEAN, "3", null, null, false, false, false);
 
         Set<DecoderColumnHandle> columns = ImmutableSet.of(row1, row2, row3, row4);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(CsvRowDecoder.NAME, emptyMap(), columns));
 
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(csv.getBytes(StandardCharsets.UTF_8))
                 .orElseThrow(AssertionError::new);
@@ -147,7 +149,7 @@ public void testLessTokensThanColumns()
         DecoderTestColumnHandle column6 = new DecoderTestColumnHandle(0, "column6", BooleanType.BOOLEAN, "5", null, null, false, false, false);
 
         Set<DecoderColumnHandle> columns = ImmutableSet.of(column1, column2, column3, column4, column5, column6);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(CsvRowDecoder.NAME, emptyMap(), columns));
 
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(csv.getBytes(StandardCharsets.UTF_8))
                 .orElseThrow(AssertionError::new);
@@ -231,7 +233,7 @@ private void singleColumnDecoder(Type columnType)
 
     private void singleColumnDecoder(Type columnType, String mapping, String dataFormat, String formatHint, boolean keyDecoder, boolean hidden, boolean internal)
     {
-        DECODER_FACTORY.create(emptyMap(), ImmutableSet.of(new DecoderTestColumnHandle(0, "column", columnType, mapping, dataFormat, formatHint, keyDecoder, hidden, internal)));
+        DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(CsvRowDecoder.NAME, emptyMap(), ImmutableSet.of(new DecoderTestColumnHandle(0, "column", columnType, mapping, dataFormat, formatHint, keyDecoder, hidden, internal))));
     }
 
     @Test
@@ -244,7 +246,7 @@ private FieldValueProvider fieldValueDecoderFor(BigintType type, String csv)
     {
         DecoderTestColumnHandle column = new DecoderTestColumnHandle(0, "column", type, "0", null, null, false, false, false);
         Set<DecoderColumnHandle> columns = ImmutableSet.of(column);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(CsvRowDecoder.NAME, emptyMap(), columns));
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(csv.getBytes(StandardCharsets.UTF_8))
                 .orElseThrow(AssertionError::new);
         return decodedRow.get(column);
diff --git a/lib/trino-record-decoder/src/test/java/io/trino/decoder/json/JsonFieldDecoderTester.java b/lib/trino-record-decoder/src/test/java/io/trino/decoder/json/JsonFieldDecoderTester.java
index 0b3a5cca666d..738ef4a12a80 100644
--- a/lib/trino-record-decoder/src/test/java/io/trino/decoder/json/JsonFieldDecoderTester.java
+++ b/lib/trino-record-decoder/src/test/java/io/trino/decoder/json/JsonFieldDecoderTester.java
@@ -20,12 +20,14 @@
 import io.trino.decoder.DecoderTestColumnHandle;
 import io.trino.decoder.FieldValueProvider;
 import io.trino.decoder.RowDecoder;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.Type;
 
 import java.util.Map;
 import java.util.Optional;
 
+import static io.trino.decoder.util.DecoderTestUtil.TESTING_SESSION;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.emptyMap;
@@ -130,7 +132,7 @@ private FieldValueProvider decode(Optional<String> jsonValue, Type type)
                 false,
                 false);
 
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), ImmutableSet.of(columnHandle));
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(JsonRowDecoder.NAME, emptyMap(), ImmutableSet.of(columnHandle)));
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(json.getBytes(UTF_8))
                 .orElseThrow(AssertionError::new);
         assertTrue(decodedRow.containsKey(columnHandle), format("column '%s' not found in decoded row", columnHandle.getName()));
diff --git a/lib/trino-record-decoder/src/test/java/io/trino/decoder/json/TestCustomDateTimeJsonFieldDecoder.java b/lib/trino-record-decoder/src/test/java/io/trino/decoder/json/TestCustomDateTimeJsonFieldDecoder.java
index a2c5d918c1f9..29c603c8f1c9 100644
--- a/lib/trino-record-decoder/src/test/java/io/trino/decoder/json/TestCustomDateTimeJsonFieldDecoder.java
+++ b/lib/trino-record-decoder/src/test/java/io/trino/decoder/json/TestCustomDateTimeJsonFieldDecoder.java
@@ -16,9 +16,11 @@
 import com.google.common.collect.ImmutableSet;
 import io.airlift.json.ObjectMapperProvider;
 import io.trino.decoder.DecoderTestColumnHandle;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.spi.TrinoException;
 import org.testng.annotations.Test;
 
+import static io.trino.decoder.util.DecoderTestUtil.TESTING_SESSION;
 import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
 import static io.trino.spi.type.DateTimeEncoding.packTimeWithTimeZone;
 import static io.trino.spi.type.DateType.DATE;
@@ -98,7 +100,7 @@ public void testInvalidFormatHint()
                 false,
                 false,
                 false);
-        assertThatThrownBy(() -> new JsonRowDecoderFactory(new ObjectMapperProvider().get()).create(emptyMap(), ImmutableSet.of(columnHandle)))
+        assertThatThrownBy(() -> new JsonRowDecoderFactory(new ObjectMapperProvider().get()).create(TESTING_SESSION, new RowDecoderSpec(JsonRowDecoder.NAME, emptyMap(), ImmutableSet.of(columnHandle))))
                 .isInstanceOf(TrinoException.class)
                 .hasMessageMatching("invalid Joda Time pattern 'XXMM/yyyy/dd H:m:sXX' passed as format hint for column 'some_column'");
     }
diff --git a/lib/trino-record-decoder/src/test/java/io/trino/decoder/json/TestJsonDecoder.java b/lib/trino-record-decoder/src/test/java/io/trino/decoder/json/TestJsonDecoder.java
index 079d453042dc..8bf3ef1fd7f2 100644
--- a/lib/trino-record-decoder/src/test/java/io/trino/decoder/json/TestJsonDecoder.java
+++ b/lib/trino-record-decoder/src/test/java/io/trino/decoder/json/TestJsonDecoder.java
@@ -20,6 +20,7 @@
 import io.trino.decoder.DecoderTestColumnHandle;
 import io.trino.decoder.FieldValueProvider;
 import io.trino.decoder.RowDecoder;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.Type;
 import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
@@ -30,6 +31,7 @@
 import java.util.Optional;
 import java.util.Set;
 
+import static io.trino.decoder.util.DecoderTestUtil.TESTING_SESSION;
 import static io.trino.decoder.util.DecoderTestUtil.checkIsNull;
 import static io.trino.decoder.util.DecoderTestUtil.checkValue;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -71,7 +73,7 @@ public void testSimple()
         DecoderTestColumnHandle column5 = new DecoderTestColumnHandle(4, "column5", BOOLEAN, "user/geo_enabled", null, null, false, false, false);
 
         Set<DecoderColumnHandle> columns = ImmutableSet.of(column1, column2, column3, column4, column5);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(JsonRowDecoder.NAME, emptyMap(), columns));
 
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(json)
                 .orElseThrow(AssertionError::new);
@@ -96,7 +98,7 @@ public void testNonExistent()
         DecoderTestColumnHandle column4 = new DecoderTestColumnHandle(3, "column4", BOOLEAN, "hello", null, null, false, false, false);
 
         Set<DecoderColumnHandle> columns = ImmutableSet.of(column1, column2, column3, column4);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(JsonRowDecoder.NAME, emptyMap(), columns));
 
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(json)
                 .orElseThrow(AssertionError::new);
@@ -120,7 +122,7 @@ public void testStringNumber()
         DecoderTestColumnHandle column4 = new DecoderTestColumnHandle(3, "column4", BIGINT, "a_string", null, null, false, false, false);
 
         Set<DecoderColumnHandle> columns = ImmutableSet.of(column1, column2, column3, column4);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(JsonRowDecoder.NAME, emptyMap(), columns));
 
         Optional<Map<DecoderColumnHandle, FieldValueProvider>> decodedRow = rowDecoder.decodeRow(json);
         assertTrue(decodedRow.isPresent());
@@ -219,6 +221,6 @@ private void singleColumnDecoder(Type columnType, String dataFormat)
     private void singleColumnDecoder(Type columnType, String mapping, String dataFormat)
     {
         String formatHint = "custom-date-time".equals(dataFormat) ? "MM/yyyy/dd H:m:s" : null;
-        DECODER_FACTORY.create(emptyMap(), ImmutableSet.of(new DecoderTestColumnHandle(0, "some_column", columnType, mapping, dataFormat, formatHint, false, false, false)));
+        DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(JsonRowDecoder.NAME, emptyMap(), ImmutableSet.of(new DecoderTestColumnHandle(0, "some_column", columnType, mapping, dataFormat, formatHint, false, false, false))));
     }
 }
diff --git a/lib/trino-record-decoder/src/test/java/io/trino/decoder/protobuf/TestProtobufDecoder.java b/lib/trino-record-decoder/src/test/java/io/trino/decoder/protobuf/TestProtobufDecoder.java
index 941c1f43365b..a5c78d760850 100644
--- a/lib/trino-record-decoder/src/test/java/io/trino/decoder/protobuf/TestProtobufDecoder.java
+++ b/lib/trino-record-decoder/src/test/java/io/trino/decoder/protobuf/TestProtobufDecoder.java
@@ -13,30 +13,47 @@
  */
 package io.trino.decoder.protobuf;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.io.Resources;
+import com.google.protobuf.Any;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.Timestamp;
 import io.airlift.slice.Slices;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaProvider;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaUtils;
 import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.DecoderTestColumnHandle;
 import io.trino.decoder.FieldValueProvider;
 import io.trino.decoder.RowDecoder;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.SqlTimestamp;
 import io.trino.spi.type.SqlVarbinary;
 import io.trino.testing.TestingSession;
+import io.trino.type.JsonType;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.net.URI;
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static com.google.common.io.Resources.getResource;
 import static io.trino.decoder.protobuf.ProtobufRowDecoderFactory.DEFAULT_MESSAGE;
+import static io.trino.decoder.util.DecoderTestUtil.TESTING_SESSION;
 import static io.trino.decoder.util.DecoderTestUtil.checkValue;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -51,15 +68,20 @@
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createVarcharType;
+import static io.trino.testing.DateTimeTestingUtils.sqlTimestampOf;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
+import static java.lang.Math.PI;
 import static java.lang.Math.floorDiv;
 import static java.lang.Math.floorMod;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
 
 public class TestProtobufDecoder
 {
-    private static final ProtobufRowDecoderFactory DECODER_FACTORY = new ProtobufRowDecoderFactory(new FixedSchemaDynamicMessageProvider.Factory());
+    private static final ProtobufRowDecoderFactory DECODER_FACTORY = new ProtobufRowDecoderFactory(new FixedSchemaDynamicMessageProvider.Factory(), TESTING_TYPE_MANAGER, new FileDescriptorProvider());
 
     @Test(dataProvider = "allTypesDataProvider", dataProviderClass = ProtobufDataProviders.class)
     public void testAllDataTypes(String stringData, Integer integerData, Long longData, Double doubleData, Float floatData, Boolean booleanData, String enumData, SqlTimestamp sqlTimestamp, byte[] bytesData)
@@ -104,6 +126,252 @@ public void testAllDataTypes(String stringData, Integer integerData, Long longDa
         checkValue(decodedRow, bytesColumn, Slices.wrappedBuffer(bytesData));
     }
 
+    @Test
+    public void testOneofFixedSchemaProvider()
+            throws Exception
+    {
+        Set<String> oneofColumnNames = Set.of(
+                "stringColumn",
+                "integerColumn",
+                "longColumn",
+                "doubleColumn",
+                "floatColumn",
+                "booleanColumn",
+                "numberColumn",
+                "timestampColumn",
+                "bytesColumn",
+                "rowColumn",
+                "nestedRowColumn");
+
+        // Uses the file-based schema parser which generates a Descriptor that does not have any oneof fields -- all are null
+        Descriptor descriptor = getDescriptor("test_oneof.proto");
+        for (String oneofColumnName : oneofColumnNames) {
+            assertNull(descriptor.findFieldByName(oneofColumnName));
+        }
+    }
+
+    @Test
+    public void testOneofConfluentSchemaProvider()
+            throws Exception
+    {
+        String stringData = "Trino";
+        int integerData = 1;
+        long longData = 493857959588286460L;
+        double doubleData = PI;
+        float floatData = 3.14f;
+        boolean booleanData = true;
+        String enumData = "ONE";
+        SqlTimestamp sqlTimestamp = sqlTimestampOf(3, LocalDateTime.parse("2020-12-12T15:35:45.923"));
+        byte[] bytesData = "X'65683F'".getBytes(UTF_8);
+
+        // Uses the Confluent schema parser to generate the Descriptor which will include the oneof columns as fields
+        Descriptor descriptor = ((ProtobufSchema) new ProtobufSchemaProvider()
+                .parseSchema(Resources.toString(getResource("decoder/protobuf/test_oneof.proto"), UTF_8), List.of(), true)
+                .get())
+                .toDescriptor();
+
+        // Build the Row message
+        Descriptor rowDescriptor = descriptor.findNestedTypeByName("Row");
+        DynamicMessage.Builder rowBuilder = DynamicMessage.newBuilder(rowDescriptor);
+        rowBuilder.setField(rowDescriptor.findFieldByName("string_column"), stringData);
+        rowBuilder.setField(rowDescriptor.findFieldByName("integer_column"), integerData);
+        rowBuilder.setField(rowDescriptor.findFieldByName("long_column"), longData);
+        rowBuilder.setField(rowDescriptor.findFieldByName("double_column"), doubleData);
+        rowBuilder.setField(rowDescriptor.findFieldByName("float_column"), floatData);
+        rowBuilder.setField(rowDescriptor.findFieldByName("boolean_column"), booleanData);
+        rowBuilder.setField(rowDescriptor.findFieldByName("number_column"), descriptor.findEnumTypeByName("Number").findValueByName(enumData));
+        rowBuilder.setField(rowDescriptor.findFieldByName("timestamp_column"), getTimestamp(sqlTimestamp));
+        rowBuilder.setField(rowDescriptor.findFieldByName("bytes_column"), bytesData);
+
+        DynamicMessage.Builder rowMessage = DynamicMessage.newBuilder(descriptor)
+                .setField(descriptor.findFieldByName("rowColumn"), rowBuilder.build());
+
+        Map<String, Object> expectedRowMessageValue = ImmutableMap.of("stringColumn", "Trino", "integerColumn", 1, "longColumn", "493857959588286460", "doubleColumn", 3.141592653589793, "floatColumn", 3.14, "booleanColumn", true, "numberColumn", "ONE", "timestampColumn", "2020-12-12T15:35:45.923Z", "bytesColumn", "WCc2NTY4M0Yn");
+
+        // Build the NestedRow message
+        Descriptor nestedDescriptor = descriptor.findNestedTypeByName("NestedRow");
+        DynamicMessage.Builder nestedMessageBuilder = DynamicMessage.newBuilder(nestedDescriptor);
+
+        nestedMessageBuilder.setField(nestedDescriptor.findFieldByName("nested_list"), ImmutableList.of(rowBuilder.build()));
+
+        Descriptor mapDescriptor = nestedDescriptor.findFieldByName("nested_map").getMessageType();
+        DynamicMessage.Builder mapBuilder = DynamicMessage.newBuilder(mapDescriptor);
+        mapBuilder.setField(mapDescriptor.findFieldByName("key"), "Key");
+        mapBuilder.setField(mapDescriptor.findFieldByName("value"), rowBuilder.build());
+        nestedMessageBuilder.setField(nestedDescriptor.findFieldByName("nested_map"), ImmutableList.of(mapBuilder.build()));
+
+        nestedMessageBuilder.setField(nestedDescriptor.findFieldByName("row"), rowBuilder.build());
+
+        DynamicMessage nestedMessage = nestedMessageBuilder.build();
+
+        {
+            // Empty message
+            assertOneof(DynamicMessage.newBuilder(descriptor), Map.of());
+        }
+        {
+            DynamicMessage.Builder message = DynamicMessage.newBuilder(descriptor)
+                    .setField(descriptor.findFieldByName("stringColumn"), stringData);
+            assertOneof(message, Map.of("stringColumn", stringData));
+        }
+        {
+            DynamicMessage.Builder message = DynamicMessage.newBuilder(descriptor)
+                    .setField(descriptor.findFieldByName("integerColumn"), integerData);
+            assertOneof(message, Map.of("integerColumn", integerData));
+        }
+        {
+            DynamicMessage.Builder message = DynamicMessage.newBuilder(descriptor)
+                    .setField(descriptor.findFieldByName("longColumn"), longData);
+            assertOneof(message, Map.of("longColumn", Long.toString(longData)));
+        }
+        {
+            DynamicMessage.Builder message = DynamicMessage.newBuilder(descriptor)
+                    .setField(descriptor.findFieldByName("doubleColumn"), doubleData);
+            assertOneof(message, Map.of("doubleColumn", doubleData));
+        }
+        {
+            DynamicMessage.Builder message = DynamicMessage.newBuilder(descriptor)
+                    .setField(descriptor.findFieldByName("floatColumn"), floatData);
+            assertOneof(message, Map.of("floatColumn", floatData));
+        }
+        {
+            DynamicMessage.Builder message = DynamicMessage.newBuilder(descriptor)
+                    .setField(descriptor.findFieldByName("booleanColumn"), booleanData);
+            assertOneof(message, Map.of("booleanColumn", booleanData));
+        }
+        {
+            DynamicMessage.Builder message = DynamicMessage.newBuilder(descriptor)
+                    .setField(descriptor.findFieldByName("numberColumn"), descriptor.findEnumTypeByName("Number").findValueByName(enumData));
+            assertOneof(message, Map.of("numberColumn", enumData));
+        }
+        {
+            DynamicMessage.Builder message = DynamicMessage.newBuilder(descriptor)
+                    .setField(descriptor.findFieldByName("timestampColumn"), getTimestamp(sqlTimestamp));
+            assertOneof(message, Map.of("timestampColumn", "2020-12-12T15:35:45.923Z"));
+        }
+        {
+            DynamicMessage.Builder message = DynamicMessage.newBuilder(descriptor)
+                    .setField(descriptor.findFieldByName("bytesColumn"), bytesData);
+            assertOneof(message, Map.of("bytesColumn", bytesData));
+        }
+        {
+            assertOneof(rowMessage, Map.of("rowColumn", expectedRowMessageValue));
+        }
+        {
+            DynamicMessage.Builder message = DynamicMessage.newBuilder(descriptor)
+                    .setField(descriptor.findFieldByName("nestedRowColumn"), nestedMessage);
+            assertOneof(message,
+                    Map.of("nestedRowColumn", ImmutableMap.of("nestedList", List.of(expectedRowMessageValue),
+                            "nestedMap", ImmutableMap.of("Key", expectedRowMessageValue),
+                            "row", expectedRowMessageValue)));
+        }
+    }
+
+    private void assertOneof(DynamicMessage.Builder messageBuilder,
+            Map<String, Object> setValue)
+            throws Exception
+    {
+        DecoderTestColumnHandle testColumnHandle = new DecoderTestColumnHandle(0, "column", VARCHAR, "column", null, null, false, false, false);
+        DecoderTestColumnHandle testOneofColumn = new DecoderTestColumnHandle(1, "testOneofColumn", JsonType.JSON, "testOneofColumn", null, null, false, false, false);
+
+        final var message = messageBuilder.setField(messageBuilder.getDescriptorForType().findFieldByName("column"), "value").build();
+
+        final var descriptor = ProtobufSchemaUtils.getSchema(message).toDescriptor();
+        final var decoder = new ProtobufRowDecoder(new FixedSchemaDynamicMessageProvider(descriptor), ImmutableSet.of(testColumnHandle, testOneofColumn), TESTING_TYPE_MANAGER, new FileDescriptorProvider());
+
+        Map<DecoderColumnHandle, FieldValueProvider> decodedRow = decoder
+                .decodeRow(message.toByteArray())
+                .orElseThrow(AssertionError::new);
+
+        assertEquals(decodedRow.size(), 2);
+
+        final var obj = new ObjectMapper();
+        final var expected = obj.writeValueAsString(setValue);
+
+        assertEquals(decodedRow.get(testColumnHandle).getSlice().toStringUtf8(), "value");
+        assertEquals(decodedRow.get(testOneofColumn).getSlice().toStringUtf8(), expected);
+    }
+
+    @Test
+    public void testAnyTypeWithDummyDescriptor()
+            throws Exception
+    {
+        String stringData = "Trino";
+
+        Descriptor allDataTypesDescriptor = getDescriptor("all_datatypes.proto");
+        DynamicMessage.Builder messageBuilder = DynamicMessage.newBuilder(allDataTypesDescriptor);
+        messageBuilder.setField(allDataTypesDescriptor.findFieldByName("stringColumn"), stringData);
+
+        Descriptor anyTypeDescriptor = getDescriptor("test_any.proto");
+        DynamicMessage.Builder testAnyBuilder = DynamicMessage.newBuilder(anyTypeDescriptor);
+        testAnyBuilder.setField(anyTypeDescriptor.findFieldByName("id"), 1);
+        testAnyBuilder.setField(anyTypeDescriptor.findFieldByName("anyMessage"), Any.pack(messageBuilder.build()));
+        DynamicMessage testAny = testAnyBuilder.build();
+
+        DecoderTestColumnHandle testAnyColumn = new DecoderTestColumnHandle(0, "anyMessage", JsonType.JSON, "anyMessage", null, null, false, false, false);
+        ProtobufRowDecoder decoder = new ProtobufRowDecoder(new FixedSchemaDynamicMessageProvider(anyTypeDescriptor), ImmutableSet.of(testAnyColumn), TESTING_TYPE_MANAGER, new DummyDescriptorProvider());
+
+        Map<DecoderColumnHandle, FieldValueProvider> decodedRow = decoder
+                .decodeRow(testAny.toByteArray())
+                .orElseThrow(AssertionError::new);
+
+        assertTrue(decodedRow.get(testAnyColumn).isNull());
+    }
+
+    @Test
+    public void testAnyTypeWithFileDescriptor()
+            throws Exception
+    {
+        String stringData = "Trino";
+        int integerData = 1;
+        long longData = 493857959588286460L;
+        double doubleData = PI;
+        float floatData = 3.14f;
+        boolean booleanData = true;
+        String enumData = "ONE";
+        SqlTimestamp sqlTimestamp = sqlTimestampOf(3, LocalDateTime.parse("2020-12-12T15:35:45.923"));
+        byte[] bytesData = "X'65683F'".getBytes(UTF_8);
+
+        Descriptor allDataTypesDescriptor = getDescriptor("all_datatypes.proto");
+        DynamicMessage.Builder messageBuilder = DynamicMessage.newBuilder(allDataTypesDescriptor);
+        messageBuilder.setField(allDataTypesDescriptor.findFieldByName("stringColumn"), stringData);
+        messageBuilder.setField(allDataTypesDescriptor.findFieldByName("integerColumn"), integerData);
+        messageBuilder.setField(allDataTypesDescriptor.findFieldByName("longColumn"), longData);
+        messageBuilder.setField(allDataTypesDescriptor.findFieldByName("doubleColumn"), doubleData);
+        messageBuilder.setField(allDataTypesDescriptor.findFieldByName("floatColumn"), floatData);
+        messageBuilder.setField(allDataTypesDescriptor.findFieldByName("booleanColumn"), booleanData);
+        messageBuilder.setField(allDataTypesDescriptor.findFieldByName("numberColumn"), allDataTypesDescriptor.findEnumTypeByName("Number").findValueByName(enumData));
+        messageBuilder.setField(allDataTypesDescriptor.findFieldByName("timestampColumn"), getTimestamp(sqlTimestamp));
+        messageBuilder.setField(allDataTypesDescriptor.findFieldByName("bytesColumn"), bytesData);
+
+        // Get URI of parent directory of the descriptor file
+        // Any.pack concatenates the message type's full name to the given prefix
+        URI anySchemaTypeUrl = new File(Resources.getResource("decoder/protobuf/any/all_datatypes/schema").getFile()).getParentFile().toURI();
+        Descriptor descriptor = getDescriptor("test_any.proto");
+        DynamicMessage.Builder testAnyBuilder = DynamicMessage.newBuilder(descriptor);
+        testAnyBuilder.setField(descriptor.findFieldByName("id"), 1);
+        testAnyBuilder.setField(descriptor.findFieldByName("anyMessage"), Any.pack(messageBuilder.build(), anySchemaTypeUrl.toString()));
+        DynamicMessage testAny = testAnyBuilder.build();
+
+        DecoderTestColumnHandle testOneOfColumn = new DecoderTestColumnHandle(0, "anyMessage", JsonType.JSON, "anyMessage", null, null, false, false, false);
+        ProtobufRowDecoder decoder = new ProtobufRowDecoder(new FixedSchemaDynamicMessageProvider(descriptor), ImmutableSet.of(testOneOfColumn), TESTING_TYPE_MANAGER, new FileDescriptorProvider());
+
+        Map<DecoderColumnHandle, FieldValueProvider> decodedRow = decoder
+                .decodeRow(testAny.toByteArray())
+                .orElseThrow(AssertionError::new);
+
+        JsonNode actual = new ObjectMapper().readTree(decodedRow.get(testOneOfColumn).getSlice().toStringUtf8());
+        assertTrue(actual.get("@type").textValue().contains("schema"));
+        assertEquals(actual.get("stringColumn").textValue(), stringData);
+        assertEquals(actual.get("integerColumn").intValue(), integerData);
+        assertEquals(actual.get("longColumn").textValue(), Long.toString(longData));
+        assertEquals(actual.get("doubleColumn").doubleValue(), doubleData);
+        assertEquals(actual.get("floatColumn").floatValue(), floatData);
+        assertEquals(actual.get("booleanColumn").booleanValue(), booleanData);
+        assertEquals(actual.get("numberColumn").textValue(), enumData);
+        assertEquals(actual.get("timestampColumn").textValue(), "2020-12-12T15:35:45.923Z");
+        assertEquals(actual.get("bytesColumn").binaryValue(), bytesData);
+    }
+
     @Test(dataProvider = "allTypesDataProvider", dataProviderClass = ProtobufDataProviders.class)
     public void testStructuralDataTypes(String stringData, Integer integerData, Long longData, Double doubleData, Float floatData, Boolean booleanData, String enumData, SqlTimestamp sqlTimestamp, byte[] bytesData)
             throws Exception
@@ -160,24 +428,25 @@ public void testStructuralDataTypes(String stringData, Integer integerData, Long
 
         assertEquals(decodedRow.size(), 3);
 
-        Block listBlock = decodedRow.get(listColumn).getBlock();
+        Block listBlock = (Block) decodedRow.get(listColumn).getObject();
         assertEquals(VARCHAR.getSlice(listBlock, 0).toStringUtf8(), "Presto");
 
-        Block mapBlock = decodedRow.get(mapColumn).getBlock();
-        assertEquals(VARCHAR.getSlice(mapBlock, 0).toStringUtf8(), "Key");
-        assertEquals(VARCHAR.getSlice(mapBlock, 1).toStringUtf8(), "Value");
+        SqlMap sqlMap = (SqlMap) decodedRow.get(mapColumn).getObject();
+        assertEquals(VARCHAR.getSlice(sqlMap.getRawKeyBlock(), sqlMap.getRawOffset()).toStringUtf8(), "Key");
+        assertEquals(VARCHAR.getSlice(sqlMap.getRawValueBlock(), sqlMap.getRawOffset()).toStringUtf8(), "Value");
 
-        Block rowBlock = decodedRow.get(rowColumn).getBlock();
+        SqlRow sqlRow = (SqlRow) decodedRow.get(rowColumn).getObject();
+        int rawIndex = sqlRow.getRawIndex();
         ConnectorSession session = TestingSession.testSessionBuilder().build().toConnectorSession();
-        assertEquals(VARCHAR.getObjectValue(session, rowBlock, 0), stringData);
-        assertEquals(INTEGER.getObjectValue(session, rowBlock, 1), integerData);
-        assertEquals(BIGINT.getObjectValue(session, rowBlock, 2), longData);
-        assertEquals(DOUBLE.getObjectValue(session, rowBlock, 3), doubleData);
-        assertEquals(REAL.getObjectValue(session, rowBlock, 4), floatData);
-        assertEquals(BOOLEAN.getObjectValue(session, rowBlock, 5), booleanData);
-        assertEquals(VARCHAR.getObjectValue(session, rowBlock, 6), enumData);
-        assertEquals(TIMESTAMP_MICROS.getObjectValue(session, rowBlock, 7), sqlTimestamp.roundTo(6));
-        assertEquals(VARBINARY.getObjectValue(session, rowBlock, 8), new SqlVarbinary(bytesData));
+        assertEquals(VARCHAR.getObjectValue(session, sqlRow.getRawFieldBlock(0), rawIndex), stringData);
+        assertEquals(INTEGER.getObjectValue(session, sqlRow.getRawFieldBlock(1), rawIndex), integerData);
+        assertEquals(BIGINT.getObjectValue(session, sqlRow.getRawFieldBlock(2), rawIndex), longData);
+        assertEquals(DOUBLE.getObjectValue(session, sqlRow.getRawFieldBlock(3), rawIndex), doubleData);
+        assertEquals(REAL.getObjectValue(session, sqlRow.getRawFieldBlock(4), rawIndex), floatData);
+        assertEquals(BOOLEAN.getObjectValue(session, sqlRow.getRawFieldBlock(5), rawIndex), booleanData);
+        assertEquals(VARCHAR.getObjectValue(session, sqlRow.getRawFieldBlock(6), rawIndex), enumData);
+        assertEquals(TIMESTAMP_MICROS.getObjectValue(session, sqlRow.getRawFieldBlock(7), rawIndex), sqlTimestamp.roundTo(6));
+        assertEquals(VARBINARY.getObjectValue(session, sqlRow.getRawFieldBlock(8), rawIndex), new SqlVarbinary(bytesData));
     }
 
     @Test
@@ -207,7 +476,7 @@ public void testMissingFieldInRowType()
                 .decodeRow(messageBuilder.build().toByteArray())
                 .orElseThrow(AssertionError::new);
 
-        assertThatThrownBy(() -> decodedRow.get(rowColumn).getBlock())
+        assertThatThrownBy(() -> decodedRow.get(rowColumn).getObject())
                 .hasMessageMatching("Unknown Field unknown_mapping");
     }
 
@@ -269,7 +538,7 @@ private Timestamp getTimestamp(SqlTimestamp sqlTimestamp)
     private RowDecoder createRowDecoder(String fileName, Set<DecoderColumnHandle> columns)
             throws Exception
     {
-        return DECODER_FACTORY.create(ImmutableMap.of("dataSchema", ProtobufUtils.getProtoFile("decoder/protobuf/" + fileName)), columns);
+        return DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(ProtobufRowDecoder.NAME, ImmutableMap.of("dataSchema", ProtobufUtils.getProtoFile("decoder/protobuf/" + fileName)), columns));
     }
 
     private Descriptor getDescriptor(String fileName)
diff --git a/lib/trino-record-decoder/src/test/java/io/trino/decoder/raw/TestRawDecoder.java b/lib/trino-record-decoder/src/test/java/io/trino/decoder/raw/TestRawDecoder.java
index 98533650ea8c..d535a205471b 100644
--- a/lib/trino-record-decoder/src/test/java/io/trino/decoder/raw/TestRawDecoder.java
+++ b/lib/trino-record-decoder/src/test/java/io/trino/decoder/raw/TestRawDecoder.java
@@ -18,6 +18,7 @@
 import io.trino.decoder.DecoderTestColumnHandle;
 import io.trino.decoder.FieldValueProvider;
 import io.trino.decoder.RowDecoder;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.BooleanType;
@@ -38,6 +39,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import static io.trino.decoder.util.DecoderTestUtil.TESTING_SESSION;
 import static io.trino.decoder.util.DecoderTestUtil.checkIsNull;
 import static io.trino.decoder.util.DecoderTestUtil.checkValue;
 import static io.trino.spi.type.DoubleType.DOUBLE;
@@ -58,7 +60,7 @@ public void testEmptyRecord()
         byte[] emptyRow = new byte[0];
         DecoderTestColumnHandle column = new DecoderTestColumnHandle(0, "row1", createUnboundedVarcharType(), null, "BYTE", null, false, false, false);
         Set<DecoderColumnHandle> columns = ImmutableSet.of(column);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(RawRowDecoder.NAME, emptyMap(), columns));
 
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(emptyRow)
                 .orElseThrow(AssertionError::new);
@@ -86,7 +88,7 @@ public void testSimple()
         DecoderTestColumnHandle row5 = new DecoderTestColumnHandle(4, "row5", createVarcharType(10), "15", null, null, false, false, false);
 
         Set<DecoderColumnHandle> columns = ImmutableSet.of(row1, row2, row3, row4, row5);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(RawRowDecoder.NAME, emptyMap(), columns));
 
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(row)
                 .orElseThrow(AssertionError::new);
@@ -112,7 +114,7 @@ public void testFixedWithString()
         DecoderTestColumnHandle row4 = new DecoderTestColumnHandle(3, "row4", createVarcharType(100), "5:8", null, null, false, false, false);
 
         Set<DecoderColumnHandle> columns = ImmutableSet.of(row1, row2, row3, row4);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(RawRowDecoder.NAME, emptyMap(), columns));
 
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(row)
                 .orElseThrow(AssertionError::new);
@@ -142,7 +144,7 @@ public void testFloatStuff()
         DecoderTestColumnHandle row2 = new DecoderTestColumnHandle(1, "row2", DOUBLE, "8", "FLOAT", null, false, false, false);
 
         Set<DecoderColumnHandle> columns = ImmutableSet.of(row1, row2);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(RawRowDecoder.NAME, emptyMap(), columns));
 
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(row)
                 .orElseThrow(AssertionError::new);
@@ -216,7 +218,7 @@ public void testBooleanStuff()
                 row32,
                 row33,
                 row34);
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(RawRowDecoder.NAME, emptyMap(), columns));
 
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(row)
                 .orElseThrow(AssertionError::new);
@@ -425,7 +427,7 @@ public void testGetValueTwice()
         Set<DecoderColumnHandle> columns = ImmutableSet.of(
                 col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11);
 
-        RowDecoder rowDecoder = DECODER_FACTORY.create(emptyMap(), columns);
+        RowDecoder rowDecoder = DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(RawRowDecoder.NAME, emptyMap(), columns));
 
         Map<DecoderColumnHandle, FieldValueProvider> decodedRow = rowDecoder.decodeRow(row)
                 .orElseThrow(AssertionError::new);
@@ -470,6 +472,6 @@ private void singleColumnDecoder(Type columnType, String mapping, String dataFor
 
     private void singleColumnDecoder(Type columnType, String mapping, String dataFormat, String formatHint, boolean keyDecoder, boolean hidden, boolean internal)
     {
-        DECODER_FACTORY.create(emptyMap(), ImmutableSet.of(new DecoderTestColumnHandle(0, "some_column", columnType, mapping, dataFormat, formatHint, keyDecoder, hidden, internal)));
+        DECODER_FACTORY.create(TESTING_SESSION, new RowDecoderSpec(RawRowDecoder.NAME, emptyMap(), ImmutableSet.of(new DecoderTestColumnHandle(0, "some_column", columnType, mapping, dataFormat, formatHint, keyDecoder, hidden, internal))));
     }
 }
diff --git a/lib/trino-record-decoder/src/test/java/io/trino/decoder/util/DecoderTestUtil.java b/lib/trino-record-decoder/src/test/java/io/trino/decoder/util/DecoderTestUtil.java
index 8ec8fe29ee60..1437b1a7b839 100644
--- a/lib/trino-record-decoder/src/test/java/io/trino/decoder/util/DecoderTestUtil.java
+++ b/lib/trino-record-decoder/src/test/java/io/trino/decoder/util/DecoderTestUtil.java
@@ -16,6 +16,8 @@
 import io.airlift.slice.Slice;
 import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.FieldValueProvider;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.testing.TestingConnectorSession;
 
 import java.util.Map;
 
@@ -25,6 +27,8 @@
 
 public final class DecoderTestUtil
 {
+    public static final ConnectorSession TESTING_SESSION = TestingConnectorSession.builder().build();
+
     private DecoderTestUtil() {}
 
     public static void checkValue(Map<DecoderColumnHandle, FieldValueProvider> decodedRow, DecoderColumnHandle handle, Slice value)
diff --git a/lib/trino-record-decoder/src/test/resources/decoder/protobuf/any/all_datatypes/schema b/lib/trino-record-decoder/src/test/resources/decoder/protobuf/any/all_datatypes/schema
new file mode 100644
index 000000000000..f74aa197f167
--- /dev/null
+++ b/lib/trino-record-decoder/src/test/resources/decoder/protobuf/any/all_datatypes/schema
@@ -0,0 +1,21 @@
+// Copy of all_datatypes.proto which is a resolvable URL when packed into a google.protobuf.Any type
+
+syntax = "proto3";
+
+import "google/protobuf/timestamp.proto";
+
+message schema {
+  string stringColumn = 1 ;
+  uint32 integerColumn = 2;
+  uint64 longColumn = 3;
+  double doubleColumn = 4;
+  float floatColumn = 5;
+  bool booleanColumn = 6;
+  enum Number {
+    ZERO = 0;
+    ONE = 1;
+  };
+  Number numberColumn = 7;
+  google.protobuf.Timestamp timestampColumn = 8;
+  bytes bytesColumn = 9;
+}
diff --git a/lib/trino-record-decoder/src/test/resources/decoder/protobuf/test_any.proto b/lib/trino-record-decoder/src/test/resources/decoder/protobuf/test_any.proto
new file mode 100644
index 000000000000..748764be4f43
--- /dev/null
+++ b/lib/trino-record-decoder/src/test/resources/decoder/protobuf/test_any.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+import "google/protobuf/any.proto";
+
+message schema {
+    int32 id = 1;
+    google.protobuf.Any anyMessage = 2;
+}
diff --git a/lib/trino-record-decoder/src/test/resources/decoder/protobuf/test_oneof.proto b/lib/trino-record-decoder/src/test/resources/decoder/protobuf/test_oneof.proto
new file mode 100644
index 000000000000..b45d8fdfe76c
--- /dev/null
+++ b/lib/trino-record-decoder/src/test/resources/decoder/protobuf/test_oneof.proto
@@ -0,0 +1,45 @@
+syntax = "proto3";
+
+import "google/protobuf/timestamp.proto";
+
+message schema {
+    enum Number {
+        ZERO = 0;
+        ONE = 1;
+        TWO = 2;
+    };
+    message Row {
+        string string_column = 1;
+        uint32 integer_column = 2;
+        uint64 long_column = 3;
+        double double_column = 4;
+        float float_column = 5;
+        bool boolean_column = 6;
+        Number number_column = 7;
+        google.protobuf.Timestamp timestamp_column = 8;
+        bytes bytes_column = 9;
+    };
+    message NestedRow {
+        repeated Row nested_list = 1;
+        map<string, Row> nested_map = 2;
+        Row row = 3;
+    };
+    oneof testOneofColumn {
+        string stringColumn = 1;
+        uint32 integerColumn = 2;
+        uint64 longColumn = 3;
+        double doubleColumn = 4;
+        float floatColumn = 5;
+        bool booleanColumn = 6;
+        Number numberColumn = 7;
+        google.protobuf.Timestamp timestampColumn = 8;
+        bytes bytesColumn = 9;
+        Row rowColumn = 10;
+        NestedRow nestedRowColumn = 11;
+    }
+    oneof testOneofColumn2 {
+        string stringColumn2 = 12;
+        uint32 integerColumn2 = 23;
+    }
+    string column = 14;
+}
diff --git a/mvnw b/mvnw
index 5643201c7d82..8d937f4c14f1 100755
--- a/mvnw
+++ b/mvnw
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------
-# Maven Start Up Batch script
+# Apache Maven Wrapper startup batch script, version 3.2.0
 #
 # Required ENV vars:
 # ------------------
@@ -27,7 +27,6 @@
 #
 # Optional ENV vars
 # -----------------
-#   M2_HOME - location of maven2's installed home dir
 #   MAVEN_OPTS - parameters passed to the Java VM when running Maven
 #     e.g. to debug Maven itself, use
 #       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -54,7 +53,7 @@ fi
 cygwin=false;
 darwin=false;
 mingw=false
-case "`uname`" in
+case "$(uname)" in
   CYGWIN*) cygwin=true ;;
   MINGW*) mingw=true;;
   Darwin*) darwin=true
@@ -62,9 +61,9 @@ case "`uname`" in
     # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
     if [ -z "$JAVA_HOME" ]; then
       if [ -x "/usr/libexec/java_home" ]; then
-        export JAVA_HOME="`/usr/libexec/java_home`"
+        JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
       else
-        export JAVA_HOME="/Library/Java/Home"
+        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
       fi
     fi
     ;;
@@ -72,68 +71,38 @@ esac
 
 if [ -z "$JAVA_HOME" ] ; then
   if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=`java-config --jre-home`
+    JAVA_HOME=$(java-config --jre-home)
   fi
 fi
 
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  M2_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
-
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
-
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --unix "$M2_HOME"`
   [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
   [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
 fi
 
 # For Mingw, ensure paths are in UNIX format before anything is touched
 if $mingw ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME="`(cd "$M2_HOME"; pwd)`"
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
+    JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
 fi
 
 if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="`which javac`"
-  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+  javaExecutable="$(which javac)"
+  if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
     # readlink(1) is not available as standard on Solaris 10.
-    readLink=`which readlink`
-    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+    readLink=$(which readlink)
+    if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
       if $darwin ; then
-        javaHome="`dirname \"$javaExecutable\"`"
-        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+        javaHome="$(dirname "\"$javaExecutable\"")"
+        javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
       else
-        javaExecutable="`readlink -f \"$javaExecutable\"`"
+        javaExecutable="$(readlink -f "\"$javaExecutable\"")"
       fi
-      javaHome="`dirname \"$javaExecutable\"`"
-      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      javaHome="$(dirname "\"$javaExecutable\"")"
+      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
       JAVA_HOME="$javaHome"
       export JAVA_HOME
     fi
@@ -149,7 +118,7 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD="`\\unset -f command; \\command -v java`"
+    JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
   fi
 fi
 
@@ -163,12 +132,9 @@ if [ -z "$JAVA_HOME" ] ; then
   echo "Warning: JAVA_HOME environment variable is not set."
 fi
 
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
 # traverses directory structure from process work directory to filesystem root
 # first directory with .mvn subdirectory is considered project base directory
 find_maven_basedir() {
-
   if [ -z "$1" ]
   then
     echo "Path not specified to find_maven_basedir"
@@ -184,96 +150,99 @@ find_maven_basedir() {
     fi
     # workaround for JBEAP-8937 (on Solaris 10/Sparc)
     if [ -d "${wdir}" ]; then
-      wdir=`cd "$wdir/.."; pwd`
+      wdir=$(cd "$wdir/.." || exit 1; pwd)
     fi
     # end of workaround
   done
-  echo "${basedir}"
+  printf '%s' "$(cd "$basedir" || exit 1; pwd)"
 }
 
 # concatenates all lines of a file
 concat_lines() {
   if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' < "$1")"
+    # Remove \r in case we run on Windows within Git Bash
+    # and check out the repository with auto CRLF management
+    # enabled. Otherwise, we may read lines that are delimited with
+    # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
+    # splitting rules.
+    tr -s '\r\n' ' ' < "$1"
+  fi
+}
+
+log() {
+  if [ "$MVNW_VERBOSE" = true ]; then
+    printf '%s\n' "$1"
   fi
 }
 
-BASE_DIR=`find_maven_basedir "$(pwd)"`
+BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
 if [ -z "$BASE_DIR" ]; then
   exit 1;
 fi
 
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
+log "$MAVEN_PROJECTBASEDIR"
+
 ##########################################################################################
 # Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
 # This allows using the maven wrapper in projects that prohibit checking in binary data.
 ##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found .mvn/wrapper/maven-wrapper.jar"
-    fi
+wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
+if [ -r "$wrapperJarPath" ]; then
+    log "Found $wrapperJarPath"
 else
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
-    fi
+    log "Couldn't find $wrapperJarPath, downloading it ..."
+
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
     fi
-    while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+    while IFS="=" read -r key value; do
+      # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
+      safeValue=$(echo "$value" | tr -d '\r')
+      case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
       esac
-    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Downloading from: $jarUrl"
-    fi
-    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+    log "Downloading from: $wrapperUrl"
+
     if $cygwin; then
-      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+      wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
     fi
 
     if command -v wget > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found wget ... using wget"
-        fi
+        log "Found wget ... using wget"
+        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
         if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
         else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
         fi
     elif command -v curl > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found curl ... using curl"
-        fi
+        log "Found curl ... using curl"
+        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
         if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl -o "$wrapperJarPath" "$jarUrl" -f
+            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
         else
-            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
         fi
-
     else
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Falling back to using Java to download"
-        fi
-        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        log "Falling back to using Java to download"
+        javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
         # For Cygwin, switch paths to Windows format before running javac
         if $cygwin; then
-          javaClass=`cygpath --path --windows "$javaClass"`
+          javaSource=$(cygpath --path --windows "$javaSource")
+          javaClass=$(cygpath --path --windows "$javaClass")
         fi
-        if [ -e "$javaClass" ]; then
-            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Compiling MavenWrapperDownloader.java ..."
-                fi
-                # Compiling the Java class
-                ("$JAVA_HOME/bin/javac" "$javaClass")
+        if [ -e "$javaSource" ]; then
+            if [ ! -e "$javaClass" ]; then
+                log " - Compiling MavenWrapperDownloader.java ..."
+                ("$JAVA_HOME/bin/javac" "$javaSource")
             fi
-            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                # Running the downloader
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Running MavenWrapperDownloader.java ..."
-                fi
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            if [ -e "$javaClass" ]; then
+                log " - Running MavenWrapperDownloader.java ..."
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
             fi
         fi
     fi
@@ -282,35 +251,58 @@ fi
 # End of extension
 ##########################################################################################
 
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
+# If specified, validate the SHA-256 sum of the Maven wrapper jar file
+wrapperSha256Sum=""
+while IFS="=" read -r key value; do
+  case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
+  esac
+done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+if [ -n "$wrapperSha256Sum" ]; then
+  wrapperSha256Result=false
+  if command -v sha256sum > /dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  elif command -v shasum > /dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
+    echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
+    exit 1
+  fi
+  if [ $wrapperSha256Result = false ]; then
+    echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
+    echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
+    echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
+    exit 1
+  fi
 fi
+
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
   [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
   [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
   [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
 fi
 
 # Provide a "standardized" way to retrieve the CLI args that will
 # work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
 export MAVEN_CMD_LINE_ARGS
 
 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
+# shellcheck disable=SC2086 # safe args
 exec "$JAVACMD" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \
   -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" \
   "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/plugin/trino-accumulo-iterators/pom.xml b/plugin/trino-accumulo-iterators/pom.xml
index 8a2cf34eff75..be46006c0b45 100644
--- a/plugin/trino-accumulo-iterators/pom.xml
+++ b/plugin/trino-accumulo-iterators/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-accumulo-iterators</artifactId>
-    <description>Accumulo Iterators for the Trino Accumulo Connector</description>
     <packaging>jar</packaging>
+    <description>Accumulo Iterators for the Trino Accumulo Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -45,8 +45,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-accumulo-iterators/src/test/java/io/trino/server/TestDummy.java b/plugin/trino-accumulo-iterators/src/test/java/io/trino/server/TestDummy.java
index dea00f6fd596..b560df431cb6 100644
--- a/plugin/trino-accumulo-iterators/src/test/java/io/trino/server/TestDummy.java
+++ b/plugin/trino-accumulo-iterators/src/test/java/io/trino/server/TestDummy.java
@@ -13,7 +13,7 @@
  */
 package io.trino.server;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestDummy
 {
diff --git a/plugin/trino-accumulo/pom.xml b/plugin/trino-accumulo/pom.xml
index 8c95073e03c3..0a8d2238c99c 100644
--- a/plugin/trino-accumulo/pom.xml
+++ b/plugin/trino-accumulo/pom.xml
@@ -5,17 +5,17 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-accumulo</artifactId>
-    <description>Trino - Accumulo Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Accumulo Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <dep.curator.version>2.12.0</dep.curator.version>
+        <dep.curator.version>2.13.0</dep.curator.version>
     </properties>
 
     <dependencyManagement>
@@ -30,19 +30,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-accumulo-iterators</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -76,45 +75,35 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.prestosql.hadoop</groupId>
+            <artifactId>hadoop-apache</artifactId>
+            <version>${dep.accumulo-hadoop.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-accumulo-iterators</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>io.prestosql.hadoop</groupId>
-            <artifactId>hadoop-apache</artifactId>
-            <version>${dep.accumulo-hadoop.version}</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -122,33 +111,21 @@
             <artifactId>accumulo-core</artifactId>
             <version>${dep.accumulo.version}</version>
             <exclusions>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.htrace</groupId>
-                    <artifactId>htrace-core</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>com.beust</groupId>
                     <artifactId>jcommander</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>commons-beanutils</groupId>
-                    <artifactId>commons-beanutils-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-utils</artifactId>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-utils</artifactId>
+                    <groupId>commons-beanutils</groupId>
+                    <artifactId>commons-beanutils-core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
+                    <groupId>commons-cli</groupId>
+                    <artifactId>commons-cli</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -159,8 +136,16 @@
                     <artifactId>jline</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>commons-cli</groupId>
-                    <artifactId>commons-cli</artifactId>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.htrace</groupId>
+                    <artifactId>htrace-core</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.maven.scm</groupId>
@@ -171,8 +156,12 @@
                     <artifactId>maven-scm-provider-svnexe</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
+                    <groupId>org.codehaus.plexus</groupId>
+                    <artifactId>plexus-utils</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.plexus</groupId>
+                    <artifactId>plexus-utils</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -194,35 +183,33 @@
             <artifactId>zookeeper</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>log4j-over-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -232,13 +219,34 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>log4j-over-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.docker-java</groupId>
+            <artifactId>docker-java-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
             <scope>test</scope>
-
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -251,7 +259,6 @@
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
             <scope>test</scope>
-
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -278,12 +285,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.docker-java</groupId>
-            <artifactId>docker-java-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -296,6 +297,18 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
@@ -312,15 +325,34 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>copy-iterators</id>
-                        <!-- the resource is not needed for compilation -->
-                        <phase>process-test-classes</phase>
                         <goals>
                             <goal>copy</goal>
                         </goals>
+                        <!-- the resource is not needed for compilation -->
+                        <phase>process-test-classes</phase>
                         <configuration>
                             <skip>false</skip>
                             <artifactItems>
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloClient.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloClient.java
index 0b34a842b832..33004c61e939 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloClient.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloClient.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.plugin.accumulo.conf.AccumuloConfig;
 import io.trino.plugin.accumulo.conf.AccumuloSessionProperties;
@@ -53,8 +54,6 @@
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.hadoop.io.Text;
 
-import javax.inject.Inject;
-
 import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -115,7 +114,14 @@ public AccumuloClient(
 
         // The default namespace is created in ZooKeeperMetadataManager's constructor
         if (!tableManager.namespaceExists(DEFAULT_SCHEMA)) {
-            tableManager.createNamespace(DEFAULT_SCHEMA);
+            try {
+                tableManager.createNamespace(DEFAULT_SCHEMA);
+            }
+            catch (TrinoException e) {
+                if (!e.getErrorCode().equals(ALREADY_EXISTS.toErrorCode())) {
+                    throw e;
+                }
+            }
         }
     }
 
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloConnector.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloConnector.java
index 824e3eebe49f..6caf14fa623f 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloConnector.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloConnector.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.accumulo;
 
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.plugin.accumulo.conf.AccumuloSessionProperties;
 import io.trino.plugin.accumulo.conf.AccumuloTableProperties;
@@ -28,8 +29,6 @@
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloConnectorFactory.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloConnectorFactory.java
index 2971a2c812a1..0f33a73f145d 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloConnectorFactory.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloConnectorFactory.java
@@ -23,7 +23,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class AccumuloConnectorFactory
@@ -43,7 +43,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
         requireNonNull(catalogName, "catalogName is null");
         requireNonNull(config, "config is null");
         requireNonNull(context, "context is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 new JsonModule(),
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloMetadata.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloMetadata.java
index 003f8a0c755c..14902550a85d 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloMetadata.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloMetadata.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
 import io.airlift.json.ObjectMapperProvider;
@@ -45,8 +46,6 @@
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.statistics.ComputedStatistics;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
@@ -90,8 +89,11 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
+        if (cascade) {
+            throw new TrinoException(NOT_SUPPORTED, "This connector does not support dropping schemas with CASCADE option");
+        }
         client.dropSchema(schemaName);
     }
 
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloMetadataFactory.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloMetadataFactory.java
index ba78dfea1344..76a1f552e6a0 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloMetadataFactory.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloMetadataFactory.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.accumulo;
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloModule.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloModule.java
index 0cd020dd1a72..c75b28125631 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloModule.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloModule.java
@@ -14,7 +14,9 @@
 package io.trino.plugin.accumulo;
 
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Module;
+import com.google.inject.Provider;
 import com.google.inject.Scopes;
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
@@ -35,9 +37,6 @@
 import org.apache.accumulo.core.client.ZooKeeperInstance;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static io.airlift.json.JsonCodecBinder.jsonCodecBinder;
 import static io.trino.plugin.accumulo.AccumuloErrorCode.UNEXPECTED_ACCUMULO_ERROR;
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloSplitManager.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloSplitManager.java
index d0b0b5172317..77ecf0ad4df9 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloSplitManager.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloSplitManager.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.accumulo;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.accumulo.model.AccumuloColumnConstraint;
 import io.trino.plugin.accumulo.model.AccumuloColumnHandle;
 import io.trino.plugin.accumulo.model.AccumuloSplit;
@@ -34,8 +35,6 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.predicate.TupleDomain.ColumnDomain;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloTableManager.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloTableManager.java
index 7b5462cd3169..3530d48f14a0 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloTableManager.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloTableManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.accumulo;
 
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.spi.TrinoException;
 import org.apache.accumulo.core.client.AccumuloException;
@@ -27,8 +28,6 @@
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.hadoop.io.Text;
 
-import javax.inject.Inject;
-
 import java.util.EnumSet;
 import java.util.Map;
 import java.util.Set;
@@ -36,6 +35,7 @@
 import static io.trino.plugin.accumulo.AccumuloErrorCode.ACCUMULO_TABLE_DNE;
 import static io.trino.plugin.accumulo.AccumuloErrorCode.ACCUMULO_TABLE_EXISTS;
 import static io.trino.plugin.accumulo.AccumuloErrorCode.UNEXPECTED_ACCUMULO_ERROR;
+import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -58,7 +58,10 @@ public void createNamespace(String schema)
         try {
             connector.namespaceOperations().create(schema);
         }
-        catch (AccumuloException | AccumuloSecurityException | NamespaceExistsException e) {
+        catch (NamespaceExistsException e) {
+            throw new TrinoException(ALREADY_EXISTS, "Namespace already exists: " + schema, e);
+        }
+        catch (AccumuloException | AccumuloSecurityException e) {
             throw new TrinoException(UNEXPECTED_ACCUMULO_ERROR, "Failed to create Accumulo namespace: " + schema, e);
         }
     }
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/conf/AccumuloConfig.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/conf/AccumuloConfig.java
index 1fb2b5ddf438..b509ddd801a9 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/conf/AccumuloConfig.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/conf/AccumuloConfig.java
@@ -17,9 +17,8 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/conf/AccumuloSessionProperties.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/conf/AccumuloSessionProperties.java
index 02e17bacedde..b3be64afe77e 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/conf/AccumuloSessionProperties.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/conf/AccumuloSessionProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.accumulo.conf;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.plugin.base.session.PropertyMetadataUtil.durationProperty;
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/index/ColumnCardinalityCache.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/index/ColumnCardinalityCache.java
index 810cd1806600..297b4ac33c46 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/index/ColumnCardinalityCache.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/index/ColumnCardinalityCache.java
@@ -21,13 +21,15 @@
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.MultimapBuilder;
+import com.google.inject.Inject;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.plugin.accumulo.conf.AccumuloConfig;
 import io.trino.plugin.accumulo.model.AccumuloColumnConstraint;
 import io.trino.spi.TrinoException;
+import jakarta.annotation.PreDestroy;
 import org.apache.accumulo.core.client.BatchScanner;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.data.Key;
@@ -37,9 +39,6 @@
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.hadoop.io.Text;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -57,7 +56,7 @@
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.collect.Streams.stream;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.plugin.accumulo.AccumuloErrorCode.UNEXPECTED_ACCUMULO_ERROR;
 import static io.trino.plugin.accumulo.index.Indexer.CARDINALITY_CQ_AS_TEXT;
 import static io.trino.plugin.accumulo.index.Indexer.getIndexColumnFamily;
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/index/IndexLookup.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/index/IndexLookup.java
index e2914148e1e9..949cb15cecfb 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/index/IndexLookup.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/index/IndexLookup.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
+import com.google.inject.Inject;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
@@ -25,6 +26,7 @@
 import io.trino.plugin.accumulo.serializers.AccumuloRowSerializer;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
+import jakarta.annotation.PreDestroy;
 import org.apache.accumulo.core.client.BatchScanner;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
@@ -35,9 +37,6 @@
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.hadoop.io.Text;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/index/Indexer.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/index/Indexer.java
index 69fc33c6e5ed..acb4faf70196 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/index/Indexer.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/index/Indexer.java
@@ -22,6 +22,7 @@
 import com.google.common.collect.Table;
 import com.google.common.primitives.Bytes;
 import com.google.common.primitives.UnsignedBytes;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.plugin.accumulo.Types;
 import io.trino.plugin.accumulo.iterators.MaxByteArrayCombiner;
 import io.trino.plugin.accumulo.iterators.MinByteArrayCombiner;
@@ -50,8 +51,6 @@
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.hadoop.io.Text;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.io.Closeable;
 import java.nio.ByteBuffer;
 import java.util.Collection;
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/io/AccumuloPageSinkProvider.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/io/AccumuloPageSinkProvider.java
index 9e4c17685836..5b74af24caf1 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/io/AccumuloPageSinkProvider.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/io/AccumuloPageSinkProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.accumulo.io;
 
+import com.google.inject.Inject;
 import io.trino.plugin.accumulo.AccumuloClient;
 import io.trino.plugin.accumulo.conf.AccumuloConfig;
 import io.trino.plugin.accumulo.model.AccumuloTableHandle;
@@ -25,8 +26,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import org.apache.accumulo.core.client.Connector;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 /**
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/io/AccumuloRecordSetProvider.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/io/AccumuloRecordSetProvider.java
index d7a1ee7a11de..6f4ec39e2f56 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/io/AccumuloRecordSetProvider.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/io/AccumuloRecordSetProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.accumulo.io;
 
+import com.google.inject.Inject;
 import io.trino.plugin.accumulo.conf.AccumuloConfig;
 import io.trino.plugin.accumulo.model.AccumuloColumnHandle;
 import io.trino.plugin.accumulo.model.AccumuloSplit;
@@ -26,8 +27,6 @@
 import io.trino.spi.connector.RecordSet;
 import org.apache.accumulo.core.client.Connector;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/metadata/ZooKeeperMetadataManager.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/metadata/ZooKeeperMetadataManager.java
index c7e078363e33..aaf13db45a55 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/metadata/ZooKeeperMetadataManager.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/metadata/ZooKeeperMetadataManager.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.json.ObjectMapperProvider;
 import io.trino.plugin.accumulo.conf.AccumuloConfig;
 import io.trino.plugin.base.TypeDeserializer;
@@ -29,8 +30,6 @@
 import org.apache.curator.retry.RetryForever;
 import org.apache.zookeeper.KeeperException;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Locale;
@@ -300,7 +299,7 @@ private boolean isAccumuloTable(SchemaTableName tableName)
                 return false;
             }
 
-            throw new TrinoException(ZOOKEEPER_ERROR, "Error checking if path %s is an AccumuloTable object", e);
+            throw new TrinoException(ZOOKEEPER_ERROR, "Error checking if path is an AccumuloTable object", e);
         }
     }
 
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/model/Field.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/model/Field.java
index 80811984e444..74d3ac2cbe01 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/model/Field.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/model/Field.java
@@ -19,15 +19,13 @@
 import io.airlift.slice.Slice;
 import io.trino.plugin.accumulo.Types;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.ArrayBlock;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
 
 import java.sql.Time;
 import java.sql.Timestamp;
-import java.util.Arrays;
-import java.util.Objects;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
@@ -44,7 +42,6 @@
 import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
-import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.Float.intBitsToFloat;
 import static java.lang.Math.floorDiv;
 import static java.lang.Math.toIntExact;
@@ -68,57 +65,6 @@ public Field(Object nativeValue, Type type, boolean indexed)
         this.indexed = indexed;
     }
 
-    public Field(Field field)
-    {
-        this.type = field.type;
-        this.indexed = false;
-
-        if (Types.isArrayType(this.type) || Types.isMapType(this.type)) {
-            this.value = field.value;
-            return;
-        }
-
-        if (type.equals(BIGINT)) {
-            this.value = field.getLong();
-        }
-        else if (type.equals(BOOLEAN)) {
-            this.value = field.getBoolean();
-        }
-        else if (type.equals(DATE)) {
-            this.value = field.getDate();
-        }
-        else if (type.equals(DOUBLE)) {
-            this.value = field.getDouble();
-        }
-        else if (type.equals(INTEGER)) {
-            this.value = field.getInt();
-        }
-        else if (type.equals(REAL)) {
-            this.value = field.getFloat();
-        }
-        else if (type.equals(SMALLINT)) {
-            this.value = field.getShort();
-        }
-        else if (type.equals(TIME_MILLIS)) {
-            this.value = new Time(field.getTime().getTime());
-        }
-        else if (type.equals(TIMESTAMP_MILLIS)) {
-            this.value = new Timestamp(field.getTimestamp().getTime());
-        }
-        else if (type.equals(TINYINT)) {
-            this.value = field.getByte();
-        }
-        else if (type.equals(VARBINARY)) {
-            this.value = Arrays.copyOf(field.getVarbinary(), field.getVarbinary().length);
-        }
-        else if (type.equals(VARCHAR)) {
-            this.value = field.getVarchar();
-        }
-        else {
-            throw new TrinoException(NOT_SUPPORTED, "Unsupported type " + type);
-        }
-    }
-
     public Type getType()
     {
         return type;
@@ -164,9 +110,9 @@ public Integer getInt()
         return (Integer) value;
     }
 
-    public Block getMap()
+    public SqlMap getMap()
     {
-        return (Block) value;
+        return (SqlMap) value;
     }
 
     public Object getObject()
@@ -209,59 +155,6 @@ public boolean isNull()
         return value == null;
     }
 
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(value, type, indexed);
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        boolean retval = true;
-        if (obj instanceof Field field) {
-            if (type.equals(field.getType())) {
-                if (this.isNull() && field.isNull()) {
-                    retval = true;
-                }
-                else if (this.isNull() != field.isNull()) {
-                    retval = false;
-                }
-                else if (type.equals(VARBINARY)) {
-                    // special case for byte arrays
-                    // aren't they so fancy
-                    retval = Arrays.equals((byte[]) value, (byte[]) field.getObject());
-                }
-                else if (type.equals(DATE) || type.equals(TIME_MILLIS) || type.equals(TIMESTAMP_MILLIS)) {
-                    retval = value.toString().equals(field.getObject().toString());
-                }
-                else {
-                    if (value instanceof Block) {
-                        retval = equals((Block) value, (Block) field.getObject());
-                    }
-                    else {
-                        retval = value.equals(field.getObject());
-                    }
-                }
-            }
-        }
-        return retval;
-    }
-
-    private static boolean equals(Block block1, Block block2)
-    {
-        boolean retval = block1.getPositionCount() == block2.getPositionCount();
-        for (int i = 0; i < block1.getPositionCount() && retval; ++i) {
-            if (block1 instanceof ArrayBlock && block2 instanceof ArrayBlock) {
-                retval = equals(block1.getObject(i, Block.class), block2.getObject(i, Block.class));
-            }
-            else {
-                retval = block1.compareTo(i, 0, block1.getSliceLength(i), block2, i, 0, block2.getSliceLength(i)) == 0;
-            }
-        }
-        return retval;
-    }
-
     @Override
     public String toString()
     {
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/model/Row.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/model/Row.java
index bf43b5b60484..3b5c674a5fc9 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/model/Row.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/model/Row.java
@@ -16,10 +16,7 @@
 import io.trino.spi.type.Type;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 import static java.util.Objects.requireNonNull;
 
@@ -29,12 +26,6 @@ public class Row
 
     public Row() {}
 
-    public Row(Row row)
-    {
-        requireNonNull(row, "row is null");
-        fields.addAll(row.fields.stream().map(Field::new).collect(Collectors.toList()));
-    }
-
     public Row addField(Field field)
     {
         requireNonNull(field, "field is null");
@@ -54,33 +45,11 @@ public Field getField(int i)
         return fields.get(i);
     }
 
-    /**
-     * Gets a list of all internal fields. Any changes to this list will affect this row.
-     *
-     * @return List of fields
-     */
-    public List<Field> getFields()
-    {
-        return fields;
-    }
-
     public int length()
     {
         return fields.size();
     }
 
-    @Override
-    public int hashCode()
-    {
-        return Arrays.hashCode(fields.toArray());
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        return obj instanceof Row && Objects.equals(this.fields, ((Row) obj).getFields());
-    }
-
     @Override
     public String toString()
     {
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/AccumuloRowSerializer.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/AccumuloRowSerializer.java
index 889b2ff96ce6..e83836255815 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/AccumuloRowSerializer.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/AccumuloRowSerializer.java
@@ -16,8 +16,13 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slice;
 import io.trino.plugin.accumulo.Types;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.MapType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeUtils;
 import io.trino.spi.type.VarcharType;
@@ -32,6 +37,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
+
 /**
  * Interface for deserializing the data in Accumulo into a Trino row.
  * <p>
@@ -248,16 +255,12 @@ static AccumuloRowSerializer getDefault()
      * @param type Map type
      * @return Map value
      */
-    Block getMap(String name, Type type);
+    SqlMap getMap(String name, Type type);
 
     /**
      * Encode the given map Block into the given Text object.
-     *
-     * @param text Text object to set
-     * @param type Map type
-     * @param block Map block
      */
-    void setMap(Text text, Type type, Block block);
+    void setMap(Text text, Type type, SqlMap map);
 
     /**
      * Gets the Short value of the given Trino column.
@@ -342,9 +345,9 @@ static AccumuloRowSerializer getDefault()
     /**
      * Encodes a Trino Java object to a byte array based on the given type.
      * <p>
-     * Java Lists and Maps can be converted to Blocks using
+     * Java Lists and Maps can be converted to Trino values using
      * {@link AccumuloRowSerializer#getBlockFromArray(Type, java.util.List)} and
-     * {@link AccumuloRowSerializer#getBlockFromMap(Type, Map)}
+     * {@link AccumuloRowSerializer#getSqlMapFromMap(Type, Map)}
      * <p>
      * <table summary="Expected data types">
      * <tr>
@@ -505,19 +508,19 @@ static List<Object> getArrayFromBlock(Type elementType, Block block)
     }
 
     /**
-     * Given the map type and Trino Block, decodes the Block into a map of values.
-     *
-     * @param type Map type
-     * @param block Map block
-     * @return List of values
+     * Given the map type and Trino SqlMap, decodes the SqlMap into a Java map of values.
      */
-    static Map<Object, Object> getMapFromBlock(Type type, Block block)
+    static Map<Object, Object> getMapFromSqlMap(Type type, SqlMap sqlMap)
     {
-        Map<Object, Object> map = new HashMap<>(block.getPositionCount() / 2);
+        Map<Object, Object> map = new HashMap<>(sqlMap.getSize());
         Type keyType = Types.getKeyType(type);
         Type valueType = Types.getValueType(type);
-        for (int i = 0; i < block.getPositionCount(); i += 2) {
-            map.put(readObject(keyType, block, i), readObject(valueType, block, i + 1));
+
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            map.put(readObject(keyType, rawKeyBlock, rawOffset + i), readObject(valueType, rawValueBlock, rawOffset + i));
         }
         return map;
     }
@@ -539,32 +542,29 @@ static Block getBlockFromArray(Type elementType, List<?> array)
     }
 
     /**
-     * Encodes the given map into a Block.
+     * Encodes the given Java map into a SqlMap.
      *
-     * @param mapType Trino type of the map
+     * @param type Trino type of the map
      * @param map Map of key/value pairs to encode
-     * @return Trino Block
+     * @return Trino SqlMap
      */
-    static Block getBlockFromMap(Type mapType, Map<?, ?> map)
+    static SqlMap getSqlMapFromMap(Type type, Map<?, ?> map)
     {
-        Type keyType = mapType.getTypeParameters().get(0);
-        Type valueType = mapType.getTypeParameters().get(1);
-
-        BlockBuilder mapBlockBuilder = mapType.createBlockBuilder(null, 1);
-        BlockBuilder builder = mapBlockBuilder.beginBlockEntry();
-
-        for (Entry<?, ?> entry : map.entrySet()) {
-            writeObject(builder, keyType, entry.getKey());
-            writeObject(builder, valueType, entry.getValue());
-        }
-
-        mapBlockBuilder.closeEntry();
-        return (Block) mapType.getObject(mapBlockBuilder, 0);
+        MapType mapType = (MapType) type;
+        Type keyType = mapType.getKeyType();
+        Type valueType = mapType.getValueType();
+
+        return buildMapValue(mapType, map.size(), (keyBuilder, valueBuilder) -> {
+            map.forEach((key, value) -> {
+                writeObject(keyBuilder, keyType, key);
+                writeObject(valueBuilder, valueType, value);
+            });
+        });
     }
 
     /**
      * Recursive helper function used by {@link AccumuloRowSerializer#getBlockFromArray} and
-     * {@link AccumuloRowSerializer#getBlockFromMap} to add the given object to the given block
+     * {@link AccumuloRowSerializer#getSqlMapFromMap} to add the given object to the given block
      * builder. Supports nested complex types!
      *
      * @param builder Block builder
@@ -574,20 +574,20 @@ static Block getBlockFromMap(Type mapType, Map<?, ?> map)
     static void writeObject(BlockBuilder builder, Type type, Object obj)
     {
         if (Types.isArrayType(type)) {
-            BlockBuilder arrayBldr = builder.beginBlockEntry();
-            Type elementType = Types.getElementType(type);
-            for (Object item : (List<?>) obj) {
-                writeObject(arrayBldr, elementType, item);
-            }
-            builder.closeEntry();
+            ((ArrayBlockBuilder) builder).buildEntry(elementBuilder -> {
+                Type elementType = Types.getElementType(type);
+                for (Object item : (List<?>) obj) {
+                    writeObject(elementBuilder, elementType, item);
+                }
+            });
         }
-        else if (Types.isMapType(type)) {
-            BlockBuilder mapBlockBuilder = builder.beginBlockEntry();
-            for (Entry<?, ?> entry : ((Map<?, ?>) obj).entrySet()) {
-                writeObject(mapBlockBuilder, Types.getKeyType(type), entry.getKey());
-                writeObject(mapBlockBuilder, Types.getValueType(type), entry.getValue());
-            }
-            builder.closeEntry();
+        else if (type instanceof MapType mapType) {
+            ((MapBlockBuilder) builder).buildEntry((keyBuilder, valueBuilder) -> {
+                for (Entry<?, ?> entry : ((Map<?, ?>) obj).entrySet()) {
+                    writeObject(keyBuilder, mapType.getKeyType(), entry.getKey());
+                    writeObject(valueBuilder, mapType.getValueType(), entry.getValue());
+                }
+            });
         }
         else {
             TypeUtils.writeNativeValue(type, builder, obj);
@@ -596,7 +596,7 @@ else if (Types.isMapType(type)) {
 
     /**
      * Recursive helper function used by {@link AccumuloRowSerializer#getArrayFromBlock} and
-     * {@link AccumuloRowSerializer#getMapFromBlock} to decode the Block into a Java type.
+     * {@link AccumuloRowSerializer#getMapFromSqlMap} to decode the Block into a Java type.
      *
      * @param type Trino type
      * @param block Block to decode
@@ -605,12 +605,12 @@ else if (Types.isMapType(type)) {
      */
     static Object readObject(Type type, Block block, int position)
     {
-        if (Types.isArrayType(type)) {
-            Type elementType = Types.getElementType(type);
-            return getArrayFromBlock(elementType, block.getObject(position, Block.class));
+        if (type instanceof ArrayType arrayType) {
+            Type elementType = arrayType.getElementType();
+            return getArrayFromBlock(elementType, arrayType.getObject(block, position));
         }
-        if (Types.isMapType(type)) {
-            return getMapFromBlock(type, block.getObject(position, Block.class));
+        if (type instanceof MapType mapType) {
+            return getMapFromSqlMap(type, mapType.getObject(block, position));
         }
         if (type.getJavaType() == Slice.class) {
             Slice slice = (Slice) TypeUtils.readNativeValue(type, block, position);
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/LexicoderRowSerializer.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/LexicoderRowSerializer.java
index bdb887df1f7d..a5b58bda031b 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/LexicoderRowSerializer.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/LexicoderRowSerializer.java
@@ -19,6 +19,7 @@
 import io.trino.plugin.accumulo.Types;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
 import org.apache.accumulo.core.client.lexicoder.BytesLexicoder;
@@ -244,15 +245,15 @@ public void setLong(Text text, Long value)
     }
 
     @Override
-    public Block getMap(String name, Type type)
+    public SqlMap getMap(String name, Type type)
     {
-        return AccumuloRowSerializer.getBlockFromMap(type, decode(type, getFieldValue(name)));
+        return AccumuloRowSerializer.getSqlMapFromMap(type, decode(type, getFieldValue(name)));
     }
 
     @Override
-    public void setMap(Text text, Type type, Block block)
+    public void setMap(Text text, Type type, SqlMap map)
     {
-        text.set(encode(type, block));
+        text.set(encode(type, map));
     }
 
     @Override
@@ -328,7 +329,7 @@ public byte[] encode(Type type, Object value)
             toEncode = AccumuloRowSerializer.getArrayFromBlock(Types.getElementType(type), (Block) value);
         }
         else if (Types.isMapType(type)) {
-            toEncode = AccumuloRowSerializer.getMapFromBlock(type, (Block) value);
+            toEncode = AccumuloRowSerializer.getMapFromSqlMap(type, (SqlMap) value);
         }
         else if (type.equals(BIGINT) && value instanceof Integer) {
             toEncode = ((Integer) value).longValue();
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/StringRowSerializer.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/StringRowSerializer.java
index cbb21b5db0c4..b368fabb83e4 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/StringRowSerializer.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/StringRowSerializer.java
@@ -19,6 +19,7 @@
 import io.trino.plugin.accumulo.Types;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.type.Type;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
@@ -214,13 +215,13 @@ public void setLong(Text text, Long value)
     }
 
     @Override
-    public Block getMap(String name, Type type)
+    public SqlMap getMap(String name, Type type)
     {
         throw new TrinoException(NOT_SUPPORTED, "maps are not (yet?) supported for StringRowSerializer");
     }
 
     @Override
-    public void setMap(Text text, Type type, Block block)
+    public void setMap(Text text, Type type, SqlMap map)
     {
         throw new TrinoException(NOT_SUPPORTED, "maps are not (yet?) supported for StringRowSerializer");
     }
diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloClient.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloClient.java
index 5d96a15d8332..472b9711d10b 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloClient.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloClient.java
@@ -24,9 +24,10 @@
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import org.apache.accumulo.core.client.Connector;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.HashMap;
 import java.util.List;
@@ -34,14 +35,16 @@
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertNotNull;
 
+@TestInstance(PER_CLASS)
 public class TestAccumuloClient
 {
     private AccumuloClient client;
     private ZooKeeperMetadataManager zooKeeperMetadataManager;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -55,7 +58,7 @@ public void setUp()
         client = new AccumuloClient(connector, config, zooKeeperMetadataManager, new AccumuloTableManager(connector), new IndexLookup(connector, new ColumnCardinalityCache(connector, config)));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         zooKeeperMetadataManager = null;
diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloConnectorTest.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloConnectorTest.java
index aab39ff3ad93..dd5b96d8c4d1 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloConnectorTest.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloConnectorTest.java
@@ -20,8 +20,8 @@
 import io.trino.testing.TestingConnectorBehavior;
 import io.trino.testing.sql.TestTable;
 import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
 import org.testng.SkipException;
-import org.testng.annotations.Test;
 
 import java.util.Optional;
 
@@ -52,41 +52,27 @@ protected QueryRunner createQueryRunner()
         return createAccumuloQueryRunner(ImmutableMap.of());
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
-            case SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_CREATE_VIEW:
-                return true;
-
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return false;
-
-            case SUPPORTS_ROW_TYPE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_DROP_SCHEMA_CASCADE,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -196,6 +182,7 @@ public void testInsertDuplicateRows()
         }
     }
 
+    @Test
     @Override
     public void testShowColumns()
     {
diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/index/TestIndexer.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/index/TestIndexer.java
index fd391d4d7a8d..dacc8fce0505 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/index/TestIndexer.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/index/TestIndexer.java
@@ -33,8 +33,9 @@
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Iterator;
 import java.util.Map.Entry;
@@ -43,9 +44,11 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 
+@TestInstance(PER_CLASS)
 public class TestIndexer
 {
     private static final LexicoderRowSerializer SERIALIZER = new LexicoderRowSerializer();
@@ -75,7 +78,7 @@ private static byte[] encode(Type type, Object v)
     private Mutation m2v;
     private AccumuloTable table;
 
-    @BeforeClass
+    @BeforeAll
     public void setupClass()
     {
         AccumuloColumnHandle c1 = new AccumuloColumnHandle("id", Optional.empty(), Optional.empty(), VARCHAR, 0, "", Optional.empty(), false);
diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestAccumuloSplit.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestAccumuloSplit.java
index 4867e409edca..6335c4c5f790 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestAccumuloSplit.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestAccumuloSplit.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.json.JsonCodec;
 import org.apache.accumulo.core.data.Range;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.stream.Collectors;
diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestField.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestField.java
index fa9f2eef810b..9edc7755aaec 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestField.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestField.java
@@ -18,11 +18,12 @@
 import io.airlift.slice.Slices;
 import io.trino.plugin.accumulo.serializers.AccumuloRowSerializer;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignatureParameter;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Time;
 import java.sql.Timestamp;
@@ -45,14 +46,17 @@
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.lang.Float.floatToIntBits;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestField
 {
-    @Test(expectedExceptions = NullPointerException.class, expectedExceptionsMessageRegExp = "type is null")
+    @Test
     public void testTypeIsNull()
     {
-        new Field(null, null);
+        assertThatThrownBy(() -> new Field(null, null))
+                .isInstanceOf(NullPointerException.class)
+                .hasMessage("type is null");
     }
 
     @Test
@@ -64,9 +68,6 @@ public void testArray()
         assertEquals(f1.getArray(), expected);
         assertEquals(f1.getObject(), expected);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 
     @Test
@@ -82,9 +83,6 @@ public void testBoolean()
         assertEquals(f1.getBoolean().booleanValue(), false);
         assertEquals(f1.getObject(), false);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 
     @Test
@@ -96,9 +94,6 @@ public void testDate()
         assertEquals(f1.getDate(), expected);
         assertEquals(f1.getObject(), expected);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 
     @Test
@@ -110,9 +105,6 @@ public void testDouble()
         assertEquals(f1.getDouble(), expected);
         assertEquals(f1.getObject(), expected);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 
     @Test
@@ -124,9 +116,6 @@ public void testFloat()
         assertEquals(f1.getFloat(), expected);
         assertEquals(f1.getObject(), expected);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 
     @Test
@@ -138,9 +127,6 @@ public void testInt()
         assertEquals(f1.getInt(), expected);
         assertEquals(f1.getObject(), expected);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 
     @Test
@@ -152,9 +138,6 @@ public void testLong()
         assertEquals(f1.getLong(), expected);
         assertEquals(f1.getObject(), expected);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 
     @Test
@@ -163,7 +146,7 @@ public void testMap()
         Type type = TESTING_TYPE_MANAGER.getParameterizedType(StandardTypes.MAP, ImmutableList.of(
                 TypeSignatureParameter.typeParameter(VARCHAR.getTypeSignature()),
                 TypeSignatureParameter.typeParameter(BIGINT.getTypeSignature())));
-        Block expected = AccumuloRowSerializer.getBlockFromMap(type, ImmutableMap.of("a", 1L, "b", 2L, "c", 3L));
+        SqlMap expected = AccumuloRowSerializer.getSqlMapFromMap(type, ImmutableMap.of("a", 1L, "b", 2L, "c", 3L));
         Field f1 = new Field(expected, type);
         assertEquals(f1.getMap(), expected);
         assertEquals(f1.getObject(), expected);
@@ -179,9 +162,6 @@ public void testSmallInt()
         assertEquals(f1.getShort(), expected);
         assertEquals(f1.getObject(), expected);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 
     @Test
@@ -193,9 +173,6 @@ public void testTime()
         assertEquals(f1.getTime(), expected);
         assertEquals(f1.getObject(), expected);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 
     @Test
@@ -207,9 +184,6 @@ public void testTimestamp()
         assertEquals(f1.getTimestamp(), expected);
         assertEquals(f1.getObject(), expected);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 
     @Test
@@ -221,9 +195,6 @@ public void testTinyInt()
         assertEquals(f1.getByte(), expected);
         assertEquals(f1.getObject(), expected);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 
     @Test
@@ -235,9 +206,6 @@ public void testVarbinary()
         assertEquals(f1.getVarbinary(), expected);
         assertEquals(f1.getObject(), expected);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 
     @Test
@@ -249,8 +217,5 @@ public void testVarchar()
         assertEquals(f1.getVarchar(), expected);
         assertEquals(f1.getObject(), expected);
         assertEquals(f1.getType(), type);
-
-        Field f2 = new Field(f1);
-        assertEquals(f2, f1);
     }
 }
diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestRow.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestRow.java
index bff922ae3010..67de0e6a892d 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestRow.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestRow.java
@@ -17,7 +17,7 @@
 import io.airlift.slice.Slices;
 import io.trino.plugin.accumulo.serializers.AccumuloRowSerializer;
 import io.trino.spi.type.ArrayType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
@@ -63,9 +63,6 @@ public void testRow()
         r1.addField(null, VARCHAR);
 
         assertEquals(r1.length(), 14);
-
-        Row r2 = new Row(r1);
-        assertEquals(r2, r1);
     }
 
     @Test
diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestSerializedRange.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestSerializedRange.java
index cbc8029bb79c..7d6a4608d90b 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestSerializedRange.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestSerializedRange.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.accumulo.model;
 
 import org.apache.accumulo.core.data.Range;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 
diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/serializers/AbstractTestAccumuloRowSerializer.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/serializers/AbstractTestAccumuloRowSerializer.java
index d3f61920eeac..4cb85021afff 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/serializers/AbstractTestAccumuloRowSerializer.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/serializers/AbstractTestAccumuloRowSerializer.java
@@ -22,7 +22,7 @@
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Time;
 import java.sql.Timestamp;
@@ -185,12 +185,12 @@ public void testMap()
                 TypeSignatureParameter.typeParameter(VARCHAR.getTypeSignature()),
                 TypeSignatureParameter.typeParameter(BIGINT.getTypeSignature())));
         Map<Object, Object> expected = ImmutableMap.of("a", 1L, "b", 2L, "3", 3L);
-        byte[] data = serializer.encode(type, AccumuloRowSerializer.getBlockFromMap(type, expected));
+        byte[] data = serializer.encode(type, AccumuloRowSerializer.getSqlMapFromMap(type, expected));
         Map<Object, Object> actual = serializer.decode(type, data);
         assertEquals(actual, expected);
 
         deserializeData(serializer, data);
-        actual = AccumuloRowSerializer.getMapFromBlock(type, serializer.getMap(COLUMN_NAME, type));
+        actual = AccumuloRowSerializer.getMapFromSqlMap(type, serializer.getMap(COLUMN_NAME, type));
         assertEquals(actual, expected);
     }
 
diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/serializers/TestStringRowSerializer.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/serializers/TestStringRowSerializer.java
index 5818ecda2b77..99433934cbdc 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/serializers/TestStringRowSerializer.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/serializers/TestStringRowSerializer.java
@@ -13,6 +13,8 @@
  */
 package io.trino.plugin.accumulo.serializers;
 
+import org.junit.jupiter.api.Test;
+
 public class TestStringRowSerializer
         extends AbstractTestAccumuloRowSerializer
 {
@@ -21,12 +23,14 @@ public TestStringRowSerializer()
         super(StringRowSerializer.class);
     }
 
+    @Test
     @Override
     public void testArray()
     {
         // Arrays are not supported by StringRowSerializer
     }
 
+    @Test
     @Override
     public void testMap()
     {
diff --git a/plugin/trino-atop/pom.xml b/plugin/trino-atop/pom.xml
index d0f0e7fbce67..1c7cb1783a65 100644
--- a/plugin/trino-atop/pom.xml
+++ b/plugin/trino-atop/pom.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-atop</artifactId>
-    <description>Trino - Atop Connector</description>
 
     <packaging>trino-plugin</packaging>
+    <description>Trino - Atop Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -20,8 +20,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -50,44 +55,44 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-spi</artifactId>
@@ -95,24 +100,23 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -131,12 +135,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -150,8 +148,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnector.java b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnector.java
index cf39e88c9884..ed4a05c186fb 100644
--- a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnector.java
+++ b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnector.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.atop;
 
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorAccessControl;
@@ -23,8 +24,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnectorConfig.java b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnectorConfig.java
index 558a6cbafd33..4970619c5856 100644
--- a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnectorConfig.java
+++ b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnectorConfig.java
@@ -18,9 +18,8 @@
 import io.airlift.configuration.validation.FileExists;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.time.ZoneId;
 
diff --git a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnectorFactory.java b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnectorFactory.java
index 059c314e81fe..33d274583ac5 100644
--- a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnectorFactory.java
+++ b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnectorFactory.java
@@ -29,7 +29,7 @@
 
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.airlift.configuration.ConfigurationAwareModule.combine;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class AtopConnectorFactory
@@ -54,7 +54,7 @@ public String getName()
     public Connector create(String catalogName, Map<String, String> requiredConfig, ConnectorContext context)
     {
         requireNonNull(requiredConfig, "requiredConfig is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
             Bootstrap app = new Bootstrap(
diff --git a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopMetadata.java b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopMetadata.java
index 1a91bcc162c1..b5065f82ce7a 100644
--- a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopMetadata.java
+++ b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopMetadata.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.plugin.atop.AtopTable.AtopColumn;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
@@ -30,8 +31,6 @@
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopPageSource.java b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopPageSource.java
index fd0bb77b814b..776cf1111006 100644
--- a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopPageSource.java
+++ b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopPageSource.java
@@ -22,8 +22,7 @@
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.time.ZonedDateTime;
 import java.util.List;
diff --git a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopPageSourceProvider.java b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopPageSourceProvider.java
index b2ff78a6658e..7835afb9fe29 100644
--- a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopPageSourceProvider.java
+++ b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopPageSourceProvider.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.atop;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.atop.AtopTable.AtopColumn;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorPageSource;
@@ -26,8 +27,6 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.concurrent.Semaphore;
diff --git a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopProcessFactory.java b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopProcessFactory.java
index a55c04d79d09..3807d46aed2b 100644
--- a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopProcessFactory.java
+++ b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopProcessFactory.java
@@ -16,12 +16,11 @@
 import com.google.common.util.concurrent.SimpleTimeLimiter;
 import com.google.common.util.concurrent.TimeLimiter;
 import com.google.common.util.concurrent.UncheckedTimeoutException;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
 import io.trino.plugin.base.CatalogName;
 import io.trino.spi.TrinoException;
-
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopSplitManager.java b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopSplitManager.java
index 70987f660433..6238d13f0058 100644
--- a/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopSplitManager.java
+++ b/plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopSplitManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.atop;
 
+import com.google.inject.Inject;
 import io.trino.spi.Node;
 import io.trino.spi.NodeManager;
 import io.trino.spi.connector.ConnectorSession;
@@ -28,8 +29,6 @@
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.ValueSet;
 
-import javax.inject.Inject;
-
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
diff --git a/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopConnectorConfig.java b/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopConnectorConfig.java
index faf2b72cf67c..b78ac7f468b0 100644
--- a/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopConnectorConfig.java
+++ b/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopConnectorConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
 import io.trino.plugin.atop.AtopConnectorConfig.AtopSecurity;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopHang.java b/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopHang.java
index 028a3ac07283..c7430d429b52 100644
--- a/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopHang.java
+++ b/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopHang.java
@@ -16,9 +16,11 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Resources;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,12 +32,14 @@
 import static io.trino.plugin.atop.LocalAtopQueryRunner.createQueryRunner;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static java.nio.file.Files.createTempDirectory;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestAtopHang
 {
     private QueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -44,14 +48,15 @@ public void setUp()
         queryRunner = createQueryRunner(ImmutableMap.of("atop.executable-path", tempPath + "/hanging_atop.sh", "atop.executable-read-timeout", "1s"), AtopProcessFactory.class);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
         queryRunner = null;
     }
 
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testTimeout()
     {
         assertTrinoExceptionThrownBy(() -> queryRunner.execute("SELECT * FROM disks"))
diff --git a/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopPlugin.java b/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopPlugin.java
index 67a3f52011d5..b070ba0e176c 100644
--- a/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopPlugin.java
+++ b/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopPlugin.java
@@ -17,7 +17,7 @@
 import io.trino.spi.Plugin;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopSecurity.java b/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopSecurity.java
index 420582615984..dfeba0c8b5dd 100644
--- a/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopSecurity.java
+++ b/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopSecurity.java
@@ -19,9 +19,10 @@
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.Identity;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -30,12 +31,14 @@
 import static io.trino.plugin.atop.LocalAtopQueryRunner.createQueryRunner;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestAtopSecurity
 {
     private QueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -44,7 +47,7 @@ public void setUp()
         queryRunner = createQueryRunner(ImmutableMap.of("atop.security", "file", "security.config-file", path, "atop.executable-path", atopExecutable.toString()), TestingAtopFactory.class);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
diff --git a/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopSmoke.java b/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopSmoke.java
index c5e3e4db66e4..4432c807f61f 100644
--- a/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopSmoke.java
+++ b/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopSmoke.java
@@ -18,24 +18,27 @@
 import io.trino.testing.MaterializedRow;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.plugin.atop.LocalAtopQueryRunner.createQueryRunner;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestAtopSmoke
 {
     private QueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         queryRunner = createQueryRunner();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
@@ -65,8 +68,9 @@ private void assertThatQueryReturnsValue(@Language("SQL") String sql, Object exp
     {
         MaterializedResult rows = queryRunner.execute(sql);
         MaterializedRow materializedRow = Iterables.getOnlyElement(rows);
-        assertEquals(materializedRow.getFieldCount(), 1, "column count");
-        Object value = materializedRow.getField(0);
-        assertEquals(value, expected);
+        assertThat(materializedRow.getFieldCount())
+                .as("column count")
+                .isEqualTo(1);
+        assertThat(materializedRow.getField(0)).isEqualTo(expected);
     }
 }
diff --git a/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopSplit.java b/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopSplit.java
index 1092d92a33a9..a317dbae25a2 100644
--- a/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopSplit.java
+++ b/plugin/trino-atop/src/test/java/io/trino/plugin/atop/TestAtopSplit.java
@@ -15,12 +15,12 @@
 
 import io.airlift.json.JsonCodec;
 import io.trino.spi.HostAddress;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAtopSplit
 {
@@ -31,9 +31,9 @@ public void testSerialization()
         ZonedDateTime now = ZonedDateTime.now(ZoneId.of("+01:23"));
         AtopSplit split = new AtopSplit(HostAddress.fromParts("localhost", 123), now.toEpochSecond(), now.getZone().getId());
         AtopSplit decoded = codec.fromJson(codec.toJson(split));
-        assertEquals(decoded.getHost(), split.getHost());
-        assertEquals(decoded.getDate(), split.getDate());
-        assertEquals(decoded.getEpochSeconds(), split.getEpochSeconds());
-        assertEquals(decoded.getTimeZoneId(), split.getTimeZoneId());
+        assertThat(decoded.getHost()).isEqualTo(split.getHost());
+        assertThat(decoded.getDate()).isEqualTo(split.getDate());
+        assertThat(decoded.getEpochSeconds()).isEqualTo(split.getEpochSeconds());
+        assertThat(decoded.getTimeZoneId()).isEqualTo(split.getTimeZoneId());
     }
 }
diff --git a/plugin/trino-base-jdbc/pom.xml b/plugin/trino-base-jdbc/pom.xml
index 4a57c7821b0c..a9834698aef9 100644
--- a/plugin/trino-base-jdbc/pom.xml
+++ b/plugin/trino-base-jdbc/pom.xml
@@ -1,16 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-base-jdbc</artifactId>
-    <name>trino-base-jdbc</name>
     <description>Trino - Base JDBC Connector</description>
 
     <properties>
@@ -19,18 +18,29 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-matching</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
         </dependency>
 
         <dependency>
@@ -74,44 +84,33 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-jdbc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-matching</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -135,7 +134,30 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>json</artifactId>
@@ -149,28 +171,26 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <artifactId>trino-cache</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -194,6 +214,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-spi</artifactId>
@@ -225,18 +252,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -249,6 +264,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -258,10 +279,49 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
             <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <configuration>
+                    <rules combine.children="append">
+                        <RestrictImports>
+                            <reason>Use AssertJ assertions instead of TestNG</reason>
+                            <bannedImports>
+                                <bannedImport>org.testng.Assert.*</bannedImport>
+                                <bannedImport>org.testng.AssertJUnit.*</bannedImport>
+                                <bannedImport>org.testng.asserts.**</bannedImport>
+                            </bannedImports>
+                        </RestrictImports>
+                    </rules>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcClient.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcClient.java
index 1c7a47fd07a5..c4a208d0ea65 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcClient.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcClient.java
@@ -20,10 +20,12 @@
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.io.Closer;
 import io.airlift.log.Logger;
+import io.trino.plugin.base.mapping.IdentifierMapping;
+import io.trino.plugin.base.mapping.RemoteIdentifiers;
 import io.trino.plugin.jdbc.JdbcProcedureHandle.ProcedureQuery;
+import io.trino.plugin.jdbc.JdbcRemoteIdentifiers.JdbcRemoteIdentifiersFactory;
 import io.trino.plugin.jdbc.expression.ParameterizedExpression;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
@@ -43,8 +45,7 @@
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.sql.CallableStatement;
@@ -61,6 +62,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Set;
 import java.util.function.BiFunction;
@@ -81,6 +83,7 @@
 import static io.trino.plugin.jdbc.CaseSensitivity.CASE_SENSITIVE;
 import static io.trino.plugin.jdbc.JdbcErrorCode.JDBC_ERROR;
 import static io.trino.plugin.jdbc.JdbcWriteSessionProperties.getWriteBatchSize;
+import static io.trino.plugin.jdbc.JdbcWriteSessionProperties.getWriteParallelism;
 import static io.trino.plugin.jdbc.JdbcWriteSessionProperties.isNonTransactionalInsert;
 import static io.trino.plugin.jdbc.PredicatePushdownController.DISABLE_PUSHDOWN;
 import static io.trino.plugin.jdbc.StandardColumnMappings.varcharReadFunction;
@@ -110,6 +113,7 @@ public abstract class BaseJdbcClient
     protected final RemoteQueryModifier queryModifier;
     private final IdentifierMapping identifierMapping;
     private final boolean supportsRetries;
+    private final JdbcRemoteIdentifiersFactory jdbcRemoteIdentifiersFactory = new JdbcRemoteIdentifiersFactory(this);
 
     public BaseJdbcClient(
             String identifierQuote,
@@ -177,7 +181,7 @@ public List<SchemaTableName> getTableNames(ConnectorSession session, Optional<St
     {
         try (Connection connection = connectionFactory.openConnection(session)) {
             ConnectorIdentity identity = session.getIdentity();
-            Optional<String> remoteSchema = schema.map(schemaName -> identifierMapping.toRemoteSchemaName(identity, connection, schemaName));
+            Optional<String> remoteSchema = schema.map(schemaName -> identifierMapping.toRemoteSchemaName(getRemoteIdentifiers(connection), identity, schemaName));
             if (remoteSchema.isPresent() && !filterSchema(remoteSchema.get())) {
                 return ImmutableList.of();
             }
@@ -205,8 +209,9 @@ public Optional<JdbcTableHandle> getTableHandle(ConnectorSession session, Schema
     {
         try (Connection connection = connectionFactory.openConnection(session)) {
             ConnectorIdentity identity = session.getIdentity();
-            String remoteSchema = identifierMapping.toRemoteSchemaName(identity, connection, schemaTableName.getSchemaName());
-            String remoteTable = identifierMapping.toRemoteTableName(identity, connection, remoteSchema, schemaTableName.getTableName());
+            RemoteIdentifiers remoteIdentifiers = getRemoteIdentifiers(connection);
+            String remoteSchema = identifierMapping.toRemoteSchemaName(remoteIdentifiers, identity, schemaTableName.getSchemaName());
+            String remoteTable = identifierMapping.toRemoteTableName(remoteIdentifiers, identity, remoteSchema, schemaTableName.getTableName());
             try (ResultSet resultSet = getTables(connection, Optional.of(remoteSchema), Optional.of(remoteTable))) {
                 List<JdbcTableHandle> tableHandles = new ArrayList<>();
                 while (resultSet.next()) {
@@ -245,7 +250,8 @@ public JdbcTableHandle getTableHandle(ConnectorSession session, PreparedQuery pr
                     // The query is opaque, so we don't know referenced tables
                     Optional.empty(),
                     0,
-                    Optional.empty());
+                    Optional.empty(),
+                    ImmutableList.of());
         }
         catch (SQLException e) {
             throw new TrinoException(JDBC_ERROR, "Failed to get table handle for prepared query. " + firstNonNull(e.getMessage(), e), e);
@@ -620,50 +626,75 @@ protected JdbcOutputTableHandle createTable(ConnectorSession session, ConnectorT
 
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
-            String remoteSchema = identifierMapping.toRemoteSchemaName(identity, connection, schemaTableName.getSchemaName());
-            String remoteTable = identifierMapping.toRemoteTableName(identity, connection, remoteSchema, schemaTableName.getTableName());
-            String remoteTargetTableName = identifierMapping.toRemoteTableName(identity, connection, remoteSchema, targetTableName);
+            RemoteIdentifiers remoteIdentifiers = getRemoteIdentifiers(connection);
+            String remoteSchema = identifierMapping.toRemoteSchemaName(remoteIdentifiers, identity, schemaTableName.getSchemaName());
+            String remoteTable = identifierMapping.toRemoteTableName(remoteIdentifiers, identity, remoteSchema, schemaTableName.getTableName());
+            String remoteTargetTableName = identifierMapping.toRemoteTableName(remoteIdentifiers, identity, remoteSchema, targetTableName);
             String catalog = connection.getCatalog();
 
             verifyTableName(connection.getMetaData(), remoteTargetTableName);
 
-            List<ColumnMetadata> columns = tableMetadata.getColumns();
-            ImmutableList.Builder<String> columnNames = ImmutableList.builderWithExpectedSize(columns.size());
-            ImmutableList.Builder<Type> columnTypes = ImmutableList.builderWithExpectedSize(columns.size());
-            // columnList is only used for createTableSql - the extraColumns are not included on the JdbcOutputTableHandle
-            ImmutableList.Builder<String> columnList = ImmutableList.builderWithExpectedSize(columns.size() + (pageSinkIdColumn.isPresent() ? 1 : 0));
-
-            for (ColumnMetadata column : columns) {
-                String columnName = identifierMapping.toRemoteColumnName(connection, column.getName());
-                verifyColumnName(connection.getMetaData(), columnName);
-                columnNames.add(columnName);
-                columnTypes.add(column.getType());
-                columnList.add(getColumnDefinitionSql(session, column, columnName));
-            }
-
-            Optional<String> pageSinkIdColumnName = Optional.empty();
-            if (pageSinkIdColumn.isPresent()) {
-                String columnName = identifierMapping.toRemoteColumnName(connection, pageSinkIdColumn.get().getName());
-                pageSinkIdColumnName = Optional.of(columnName);
-                verifyColumnName(connection.getMetaData(), columnName);
-                columnList.add(getColumnDefinitionSql(session, pageSinkIdColumn.get(), columnName));
-            }
-
-            RemoteTableName remoteTableName = new RemoteTableName(Optional.ofNullable(catalog), Optional.ofNullable(remoteSchema), remoteTargetTableName);
-            for (String sql : createTableSqls(remoteTableName, columnList.build(), tableMetadata)) {
-                execute(session, connection, sql);
-            }
-
-            return new JdbcOutputTableHandle(
+            return createTable(
+                    session,
+                    connection,
+                    tableMetadata,
+                    remoteIdentifiers,
                     catalog,
                     remoteSchema,
                     remoteTable,
-                    columnNames.build(),
-                    columnTypes.build(),
-                    Optional.empty(),
-                    Optional.of(remoteTargetTableName),
-                    pageSinkIdColumnName);
+                    remoteTargetTableName,
+                    pageSinkIdColumn);
+        }
+    }
+
+    protected JdbcOutputTableHandle createTable(
+            ConnectorSession session,
+            Connection connection,
+            ConnectorTableMetadata tableMetadata,
+            RemoteIdentifiers remoteIdentifiers,
+            String catalog,
+            String remoteSchema,
+            String remoteTable,
+            String remoteTargetTableName,
+            Optional<ColumnMetadata> pageSinkIdColumn)
+            throws SQLException
+    {
+        List<ColumnMetadata> columns = tableMetadata.getColumns();
+        ImmutableList.Builder<String> columnNames = ImmutableList.builderWithExpectedSize(columns.size());
+        ImmutableList.Builder<Type> columnTypes = ImmutableList.builderWithExpectedSize(columns.size());
+        // columnList is only used for createTableSql - the extraColumns are not included on the JdbcOutputTableHandle
+        ImmutableList.Builder<String> columnList = ImmutableList.builderWithExpectedSize(columns.size() + (pageSinkIdColumn.isPresent() ? 1 : 0));
+
+        for (ColumnMetadata column : columns) {
+            String columnName = identifierMapping.toRemoteColumnName(remoteIdentifiers, column.getName());
+            verifyColumnName(connection.getMetaData(), columnName);
+            columnNames.add(columnName);
+            columnTypes.add(column.getType());
+            columnList.add(getColumnDefinitionSql(session, column, columnName));
+        }
+
+        Optional<String> pageSinkIdColumnName = Optional.empty();
+        if (pageSinkIdColumn.isPresent()) {
+            String columnName = identifierMapping.toRemoteColumnName(remoteIdentifiers, pageSinkIdColumn.get().getName());
+            pageSinkIdColumnName = Optional.of(columnName);
+            verifyColumnName(connection.getMetaData(), columnName);
+            columnList.add(getColumnDefinitionSql(session, pageSinkIdColumn.get(), columnName));
+        }
+
+        RemoteTableName remoteTableName = new RemoteTableName(Optional.ofNullable(catalog), Optional.ofNullable(remoteSchema), remoteTargetTableName);
+        for (String sql : createTableSqls(remoteTableName, columnList.build(), tableMetadata)) {
+            execute(session, connection, sql);
         }
+
+        return new JdbcOutputTableHandle(
+                catalog,
+                remoteSchema,
+                remoteTable,
+                columnNames.build(),
+                columnTypes.build(),
+                Optional.empty(),
+                Optional.of(remoteTargetTableName),
+                pageSinkIdColumnName);
     }
 
     protected List<String> createTableSqls(RemoteTableName remoteTableName, List<String> columns, ConnectorTableMetadata tableMetadata)
@@ -705,44 +736,46 @@ public JdbcOutputTableHandle beginInsertTable(ConnectorSession session, JdbcTabl
         verify(tableHandle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(tableHandle));
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
-            String remoteSchema = identifierMapping.toRemoteSchemaName(identity, connection, schemaTableName.getSchemaName());
-            String remoteTable = identifierMapping.toRemoteTableName(identity, connection, remoteSchema, schemaTableName.getTableName());
+            RemoteIdentifiers remoteIdentifiers = getRemoteIdentifiers(connection);
+            String remoteSchema = identifierMapping.toRemoteSchemaName(remoteIdentifiers, identity, schemaTableName.getSchemaName());
+            String remoteTable = identifierMapping.toRemoteTableName(remoteIdentifiers, identity, remoteSchema, schemaTableName.getTableName());
             String catalog = connection.getCatalog();
 
-            ImmutableList.Builder<String> columnNames = ImmutableList.builder();
-            ImmutableList.Builder<Type> columnTypes = ImmutableList.builder();
-            ImmutableList.Builder<JdbcTypeHandle> jdbcColumnTypes = ImmutableList.builder();
-            for (JdbcColumnHandle column : columns) {
-                columnNames.add(column.getColumnName());
-                columnTypes.add(column.getColumnType());
-                jdbcColumnTypes.add(column.getJdbcTypeHandle());
-            }
-
-            if (isNonTransactionalInsert(session)) {
-                return new JdbcOutputTableHandle(
-                        catalog,
-                        remoteSchema,
-                        remoteTable,
-                        columnNames.build(),
-                        columnTypes.build(),
-                        Optional.of(jdbcColumnTypes.build()),
-                        Optional.empty(),
-                        Optional.empty());
-            }
-
-            String remoteTemporaryTableName = identifierMapping.toRemoteTableName(identity, connection, remoteSchema, generateTemporaryTableName(session));
-            copyTableSchema(session, connection, catalog, remoteSchema, remoteTable, remoteTemporaryTableName, columnNames.build());
+            return beginInsertTable(
+                    session,
+                    connection,
+                    remoteIdentifiers,
+                    catalog,
+                    remoteSchema,
+                    remoteTable,
+                    columns);
+        }
+        catch (SQLException e) {
+            throw new TrinoException(JDBC_ERROR, e);
+        }
+    }
 
-            Optional<ColumnMetadata> pageSinkIdColumn = Optional.empty();
-            if (shouldUseFaultTolerantExecution(session)) {
-                pageSinkIdColumn = Optional.of(getPageSinkIdColumn(columnNames.build()));
-                addColumn(session, connection, new RemoteTableName(
-                        Optional.ofNullable(catalog),
-                        Optional.ofNullable(remoteSchema),
-                        remoteTemporaryTableName
-                ), pageSinkIdColumn.get());
-            }
+    protected JdbcOutputTableHandle beginInsertTable(
+            ConnectorSession session,
+            Connection connection,
+            RemoteIdentifiers remoteIdentifiers,
+            String catalog,
+            String remoteSchema,
+            String remoteTable,
+            List<JdbcColumnHandle> columns)
+            throws SQLException
+    {
+        ConnectorIdentity identity = session.getIdentity();
+        ImmutableList.Builder<String> columnNames = ImmutableList.builder();
+        ImmutableList.Builder<Type> columnTypes = ImmutableList.builder();
+        ImmutableList.Builder<JdbcTypeHandle> jdbcColumnTypes = ImmutableList.builder();
+        for (JdbcColumnHandle column : columns) {
+            columnNames.add(column.getColumnName());
+            columnTypes.add(column.getColumnType());
+            jdbcColumnTypes.add(column.getJdbcTypeHandle());
+        }
 
+        if (isNonTransactionalInsert(session)) {
             return new JdbcOutputTableHandle(
                     catalog,
                     remoteSchema,
@@ -750,12 +783,32 @@ public JdbcOutputTableHandle beginInsertTable(ConnectorSession session, JdbcTabl
                     columnNames.build(),
                     columnTypes.build(),
                     Optional.of(jdbcColumnTypes.build()),
-                    Optional.of(remoteTemporaryTableName),
-                    pageSinkIdColumn.map(column -> identifierMapping.toRemoteColumnName(connection, column.getName())));
+                    Optional.empty(),
+                    Optional.empty());
         }
-        catch (SQLException e) {
-            throw new TrinoException(JDBC_ERROR, e);
+
+        String remoteTemporaryTableName = identifierMapping.toRemoteTableName(remoteIdentifiers, identity, remoteSchema, generateTemporaryTableName(session));
+        copyTableSchema(session, connection, catalog, remoteSchema, remoteTable, remoteTemporaryTableName, columnNames.build());
+
+        Optional<ColumnMetadata> pageSinkIdColumn = Optional.empty();
+        if (shouldUseFaultTolerantExecution(session)) {
+            pageSinkIdColumn = Optional.of(getPageSinkIdColumn(columnNames.build()));
+            addColumn(session, connection, new RemoteTableName(
+                    Optional.ofNullable(catalog),
+                    Optional.ofNullable(remoteSchema),
+                    remoteTemporaryTableName
+            ), pageSinkIdColumn.get());
         }
+
+        return new JdbcOutputTableHandle(
+                catalog,
+                remoteSchema,
+                remoteTable,
+                columnNames.build(),
+                columnTypes.build(),
+                Optional.of(jdbcColumnTypes.build()),
+                Optional.of(remoteTemporaryTableName),
+                pageSinkIdColumn.map(column -> identifierMapping.toRemoteColumnName(remoteIdentifiers, column.getName())));
     }
 
     protected void copyTableSchema(ConnectorSession session, Connection connection, String catalogName, String schemaName, String tableName, String newTableName, List<String> columnNames)
@@ -807,8 +860,9 @@ protected void renameTable(ConnectorSession session, String catalogName, String
             String newTableName = newTable.getTableName();
             verifyTableName(connection.getMetaData(), newTableName);
             ConnectorIdentity identity = session.getIdentity();
-            String newRemoteSchemaName = identifierMapping.toRemoteSchemaName(identity, connection, newSchemaName);
-            String newRemoteTableName = identifierMapping.toRemoteTableName(identity, connection, newRemoteSchemaName, newTableName);
+            RemoteIdentifiers remoteIdentifiers = getRemoteIdentifiers(connection);
+            String newRemoteSchemaName = identifierMapping.toRemoteSchemaName(remoteIdentifiers, identity, newSchemaName);
+            String newRemoteTableName = identifierMapping.toRemoteTableName(remoteIdentifiers, identity, newRemoteSchemaName, newTableName);
             renameTable(session, connection, catalogName, remoteSchemaName, remoteTableName, newRemoteSchemaName, newRemoteTableName);
         }
         catch (SQLException e) {
@@ -825,7 +879,7 @@ protected void renameTable(ConnectorSession session, Connection connection, Stri
                 quoted(catalogName, newRemoteSchemaName, newRemoteTableName)));
     }
 
-    private RemoteTableName constructPageSinkIdsTable(ConnectorSession session, Connection connection, JdbcOutputTableHandle handle, Set<Long> pageSinkIds)
+    private RemoteTableName constructPageSinkIdsTable(ConnectorSession session, Connection connection, JdbcOutputTableHandle handle, Set<Long> pageSinkIds, Closer closer)
             throws SQLException
     {
         verify(handle.getPageSinkIdColumnName().isPresent(), "Output table handle's pageSinkIdColumn is empty");
@@ -849,6 +903,7 @@ private RemoteTableName constructPageSinkIdsTable(ConnectorSession session, Conn
         LongWriteFunction pageSinkIdWriter = (LongWriteFunction) toWriteMapping(session, TRINO_PAGE_SINK_ID_COLUMN_TYPE).getWriteFunction();
 
         execute(session, connection, pageSinkTableSql);
+        closer.register(() -> dropTable(session, pageSinkTable, true));
 
         try (PreparedStatement statement = connection.prepareStatement(pageSinkInsertSql)) {
             int batchSize = 0;
@@ -890,7 +945,7 @@ public void finishInsertTable(ConnectorSession session, JdbcOutputTableHandle ha
 
         // We conditionally create more than the one table, so keep a list of the tables that need to be dropped.
         Closer closer = Closer.create();
-        closer.register(() -> dropTable(session, temporaryTable));
+        closer.register(() -> dropTable(session, temporaryTable, true));
 
         try (Connection connection = getConnection(session, handle)) {
             verify(connection.getAutoCommit());
@@ -905,8 +960,7 @@ public void finishInsertTable(ConnectorSession session, JdbcOutputTableHandle ha
                     quoted(temporaryTable));
 
             if (handle.getPageSinkIdColumnName().isPresent()) {
-                RemoteTableName pageSinkTable = constructPageSinkIdsTable(session, connection, handle, pageSinkIds);
-                closer.register(() -> dropTable(session, pageSinkTable));
+                RemoteTableName pageSinkTable = constructPageSinkIdsTable(session, connection, handle, pageSinkIds, closer);
 
                 insertSql += format(" WHERE EXISTS (SELECT 1 FROM %s page_sink_table WHERE page_sink_table.%s = temp_table.%s)",
                         quoted(pageSinkTable),
@@ -961,7 +1015,7 @@ protected void addColumn(ConnectorSession session, Connection connection, Remote
     {
         String columnName = column.getName();
         verifyColumnName(connection.getMetaData(), columnName);
-        String remoteColumnName = identifierMapping.toRemoteColumnName(connection, columnName);
+        String remoteColumnName = identifierMapping.toRemoteColumnName(getRemoteIdentifiers(connection), columnName);
         String sql = format(
                 "ALTER TABLE %s ADD %s",
                 quoted(table),
@@ -975,7 +1029,7 @@ public void renameColumn(ConnectorSession session, JdbcTableHandle handle, JdbcC
         verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
-            String newRemoteColumnName = identifierMapping.toRemoteColumnName(connection, newColumnName);
+            String newRemoteColumnName = identifierMapping.toRemoteColumnName(getRemoteIdentifiers(connection), newColumnName);
             verifyColumnName(connection.getMetaData(), newRemoteColumnName);
             renameColumn(session, connection, handle.asPlainTable().getRemoteTableName(), jdbcColumn.getColumnName(), newRemoteColumnName);
         }
@@ -1000,7 +1054,7 @@ public void dropColumn(ConnectorSession session, JdbcTableHandle handle, JdbcCol
         verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
-            String remoteColumnName = identifierMapping.toRemoteColumnName(connection, column.getColumnName());
+            String remoteColumnName = identifierMapping.toRemoteColumnName(getRemoteIdentifiers(connection), column.getColumnName());
             String sql = format(
                     "ALTER TABLE %s DROP COLUMN %s",
                     quoted(handle.asPlainTable().getRemoteTableName()),
@@ -1017,7 +1071,7 @@ public void setColumnType(ConnectorSession session, JdbcTableHandle handle, Jdbc
     {
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
-            String remoteColumnName = identifierMapping.toRemoteColumnName(connection, column.getColumnName());
+            String remoteColumnName = identifierMapping.toRemoteColumnName(getRemoteIdentifiers(connection), column.getColumnName());
             String sql = format(
                     "ALTER TABLE %s ALTER COLUMN %s SET DATA TYPE %s",
                     quoted(handle.asPlainTable().getRemoteTableName()),
@@ -1034,10 +1088,10 @@ public void setColumnType(ConnectorSession session, JdbcTableHandle handle, Jdbc
     public void dropTable(ConnectorSession session, JdbcTableHandle handle)
     {
         verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
-        dropTable(session, handle.asPlainTable().getRemoteTableName());
+        dropTable(session, handle.asPlainTable().getRemoteTableName(), false);
     }
 
-    protected void dropTable(ConnectorSession session, RemoteTableName remoteTableName)
+    protected void dropTable(ConnectorSession session, RemoteTableName remoteTableName, boolean temporaryTable)
     {
         String sql = "DROP TABLE " + quoted(remoteTableName);
         execute(session, sql);
@@ -1047,10 +1101,12 @@ protected void dropTable(ConnectorSession session, RemoteTableName remoteTableNa
     public void rollbackCreateTable(ConnectorSession session, JdbcOutputTableHandle handle)
     {
         if (handle.getTemporaryTableName().isPresent()) {
-            dropTable(session, new JdbcTableHandle(
-                    new SchemaTableName(handle.getSchemaName(), handle.getTemporaryTableName().get()),
-                    new RemoteTableName(Optional.ofNullable(handle.getCatalogName()), Optional.ofNullable(handle.getSchemaName()), handle.getTemporaryTableName().get()),
-                    Optional.empty()));
+            dropTable(session,
+                    new RemoteTableName(
+                            Optional.ofNullable(handle.getCatalogName()),
+                            Optional.ofNullable(handle.getSchemaName()),
+                            handle.getTemporaryTableName().get()),
+                    true);
         }
     }
 
@@ -1133,7 +1189,7 @@ public void createSchema(ConnectorSession session, String schemaName)
         ConnectorIdentity identity = session.getIdentity();
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
-            schemaName = identifierMapping.toRemoteSchemaName(identity, connection, schemaName);
+            schemaName = identifierMapping.toRemoteSchemaName(getRemoteIdentifiers(connection), identity, schemaName);
             verifySchemaName(connection.getMetaData(), schemaName);
             createSchema(session, connection, schemaName);
         }
@@ -1149,23 +1205,27 @@ protected void createSchema(ConnectorSession session, Connection connection, Str
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
         ConnectorIdentity identity = session.getIdentity();
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
-            schemaName = identifierMapping.toRemoteSchemaName(identity, connection, schemaName);
-            dropSchema(session, connection, schemaName);
+            schemaName = identifierMapping.toRemoteSchemaName(getRemoteIdentifiers(connection), identity, schemaName);
+            dropSchema(session, connection, schemaName, cascade);
         }
         catch (SQLException e) {
             throw new TrinoException(JDBC_ERROR, e);
         }
     }
 
-    protected void dropSchema(ConnectorSession session, Connection connection, String remoteSchemaName)
+    protected void dropSchema(ConnectorSession session, Connection connection, String remoteSchemaName, boolean cascade)
             throws SQLException
     {
-        execute(session, connection, "DROP SCHEMA " + quoted(remoteSchemaName));
+        String dropSchema = "DROP SCHEMA " + quoted(remoteSchemaName);
+        if (cascade) {
+            dropSchema += " CASCADE";
+        }
+        execute(session, connection, dropSchema);
     }
 
     @Override
@@ -1174,8 +1234,9 @@ public void renameSchema(ConnectorSession session, String schemaName, String new
         ConnectorIdentity identity = session.getIdentity();
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
-            String remoteSchemaName = identifierMapping.toRemoteSchemaName(identity, connection, schemaName);
-            String newRemoteSchemaName = identifierMapping.toRemoteSchemaName(identity, connection, newSchemaName);
+            RemoteIdentifiers remoteIdentifiers = getRemoteIdentifiers(connection);
+            String remoteSchemaName = identifierMapping.toRemoteSchemaName(remoteIdentifiers, identity, schemaName);
+            String newRemoteSchemaName = identifierMapping.toRemoteSchemaName(remoteIdentifiers, identity, newSchemaName);
             verifySchemaName(connection.getMetaData(), newRemoteSchemaName);
             renameSchema(session, connection, remoteSchemaName, newRemoteSchemaName);
         }
@@ -1313,6 +1374,7 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
         checkArgument(handle.isNamedRelation(), "Unable to delete from synthetic table: %s", handle);
         checkArgument(handle.getLimit().isEmpty(), "Unable to delete when limit is set: %s", handle);
         checkArgument(handle.getSortOrder().isEmpty(), "Unable to delete when sort order is set: %s", handle);
+        checkArgument(handle.getUpdateAssignments().isEmpty(), "Unable to delete when update assignments are set: %s", handle);
         verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
@@ -1332,6 +1394,33 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
         }
     }
 
+    @Override
+    public OptionalLong update(ConnectorSession session, JdbcTableHandle handle)
+    {
+        checkArgument(handle.isNamedRelation(), "Unable to update from synthetic table: %s", handle);
+        checkArgument(handle.getLimit().isEmpty(), "Unable to update when limit is set: %s", handle);
+        checkArgument(handle.getSortOrder().isEmpty(), "Unable to update when sort order is set: %s", handle);
+        checkArgument(!handle.getUpdateAssignments().isEmpty(), "Unable to update when update assignments are not set: %s", handle);
+        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
+        try (Connection connection = connectionFactory.openConnection(session)) {
+            verify(connection.getAutoCommit());
+            PreparedQuery preparedQuery = queryBuilder.prepareUpdateQuery(
+                    this,
+                    session,
+                    connection,
+                    handle.getRequiredNamedRelation(),
+                    handle.getConstraint(),
+                    getAdditionalPredicate(handle.getConstraintExpressions(), Optional.empty()),
+                    handle.getUpdateAssignments());
+            try (PreparedStatement preparedStatement = queryBuilder.prepareStatement(this, session, connection, preparedQuery, Optional.empty())) {
+                return OptionalLong.of(preparedStatement.executeUpdate());
+            }
+        }
+        catch (SQLException e) {
+            throw new TrinoException(JDBC_ERROR, e);
+        }
+    }
+
     @Override
     public void truncateTable(ConnectorSession session, JdbcTableHandle handle)
     {
@@ -1340,6 +1429,12 @@ public void truncateTable(ConnectorSession session, JdbcTableHandle handle)
         execute(session, sql);
     }
 
+    @Override
+    public OptionalInt getMaxWriteParallelism(ConnectorSession session)
+    {
+        return OptionalInt.of(getWriteParallelism(session));
+    }
+
     protected void verifySchemaName(DatabaseMetaData databaseMetadata, String schemaName)
             throws SQLException
     {
@@ -1438,4 +1533,9 @@ private static ColumnMetadata getPageSinkIdColumn(List<String> otherColumnNames)
         }
         return new ColumnMetadata(columnName, TRINO_PAGE_SINK_ID_COLUMN_TYPE);
     }
+
+    public RemoteIdentifiers getRemoteIdentifiers(Connection connection)
+    {
+        return jdbcRemoteIdentifiersFactory.createJdbcRemoteIdentifies(connection);
+    }
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcConfig.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcConfig.java
index be6474a37c7d..be5106dcf54a 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcConfig.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcConfig.java
@@ -19,18 +19,17 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 import java.util.Optional;
 import java.util.Set;
 
 import static com.google.common.base.Strings.nullToEmpty;
+import static jakarta.validation.constraints.Pattern.Flag.CASE_INSENSITIVE;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static javax.validation.constraints.Pattern.Flag.CASE_INSENSITIVE;
 
 public class BaseJdbcConfig
 {
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/CachingJdbcClient.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/CachingJdbcClient.java
index f3c83b57f4c0..232632c7dd5b 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/CachingJdbcClient.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/CachingJdbcClient.java
@@ -18,9 +18,10 @@
 import com.google.common.cache.CacheStats;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.inject.Inject;
 import io.airlift.jmx.CacheStatsMBean;
 import io.airlift.units.Duration;
-import io.trino.collect.cache.EvictableCacheBuilder;
+import io.trino.cache.EvictableCacheBuilder;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.plugin.jdbc.IdentityCacheMapping.IdentityCacheKey;
 import io.trino.plugin.jdbc.JdbcProcedureHandle.ProcedureQuery;
@@ -45,8 +46,6 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -55,18 +54,18 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
-import java.util.function.Predicate;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.cache.CacheUtils.invalidateAllIf;
 import static io.trino.plugin.jdbc.BaseJdbcConfig.CACHING_DISABLED;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -216,6 +215,12 @@ public WriteMapping toWriteMapping(ConnectorSession session, Type type)
         return delegate.toWriteMapping(session, type);
     }
 
+    @Override
+    public Optional<Type> getSupportedType(ConnectorSession session, Type type)
+    {
+        return delegate.getSupportedType(session, type);
+    }
+
     @Override
     public boolean supportsAggregationPushdown(ConnectorSession session, JdbcTableHandle table, List<AggregateFunction> aggregates, Map<String, ColumnHandle> assignments, List<List<ColumnHandle>> groupingSets)
     {
@@ -447,9 +452,9 @@ public void createSchema(ConnectorSession session, String schemaName)
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
-        delegate.dropSchema(session, schemaName);
+        delegate.dropSchema(session, schemaName, cascade);
         invalidateSchemasCache();
     }
 
@@ -567,9 +572,15 @@ public Optional<TableScanRedirectApplicationResult> getTableScanRedirection(Conn
         return delegate.getTableScanRedirection(session, tableHandle);
     }
 
+    @Override
+    public OptionalInt getMaxWriteParallelism(ConnectorSession session)
+    {
+        return delegate.getMaxWriteParallelism(session);
+    }
+
     public void onDataChanged(SchemaTableName table)
     {
-        invalidateCache(statisticsCache, key -> key.mayReference(table));
+        invalidateAllIf(statisticsCache, key -> key.mayReference(table));
     }
 
     /**
@@ -580,7 +591,7 @@ public void onDataChanged(SchemaTableName table)
     @Deprecated
     public void onDataChanged(JdbcTableHandle handle)
     {
-        invalidateCache(statisticsCache, key -> key.equals(handle));
+        statisticsCache.invalidate(handle);
     }
 
     @Override
@@ -591,6 +602,14 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
         return deletedRowsCount;
     }
 
+    @Override
+    public OptionalLong update(ConnectorSession session, JdbcTableHandle handle)
+    {
+        OptionalLong updatedRowsCount = delegate.update(session, handle);
+        onDataChanged(handle.getRequiredNamedRelation().getSchemaTableName());
+        return updatedRowsCount;
+    }
+
     @Override
     public void truncateTable(ConnectorSession session, JdbcTableHandle handle)
     {
@@ -634,15 +653,15 @@ private void invalidateSchemasCache()
     private void invalidateTableCaches(SchemaTableName schemaTableName)
     {
         invalidateColumnsCache(schemaTableName);
-        invalidateCache(tableHandlesByNameCache, key -> key.tableName.equals(schemaTableName));
+        invalidateAllIf(tableHandlesByNameCache, key -> key.tableName.equals(schemaTableName));
         tableHandlesByQueryCache.invalidateAll();
-        invalidateCache(tableNamesCache, key -> key.schemaName.equals(Optional.of(schemaTableName.getSchemaName())));
-        invalidateCache(statisticsCache, key -> key.mayReference(schemaTableName));
+        invalidateAllIf(tableNamesCache, key -> key.schemaName.equals(Optional.of(schemaTableName.getSchemaName())));
+        invalidateAllIf(statisticsCache, key -> key.mayReference(schemaTableName));
     }
 
     private void invalidateColumnsCache(SchemaTableName table)
     {
-        invalidateCache(columnsCache, key -> key.table.equals(table));
+        invalidateAllIf(columnsCache, key -> key.table.equals(table));
     }
 
     @VisibleForTesting
@@ -687,18 +706,8 @@ CacheStats getStatisticsCacheStats()
         return statisticsCache.stats();
     }
 
-    private static <T, V> void invalidateCache(Cache<T, V> cache, Predicate<T> filterFunction)
-    {
-        Set<T> cacheKeys = cache.asMap().keySet().stream()
-                .filter(filterFunction)
-                .collect(toImmutableSet());
-
-        cache.invalidateAll(cacheKeys);
-    }
-
     private record ColumnsCacheKey(IdentityCacheKey identity, Map<String, Object> sessionProperties, SchemaTableName table)
     {
-        @SuppressWarnings("UnusedVariable") // TODO: Remove once https://github.com/google/error-prone/issues/2713 is fixed
         private ColumnsCacheKey
         {
             requireNonNull(identity, "identity is null");
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ConnectionFactory.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ConnectionFactory.java
index 825d41854c02..f55a0666de34 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ConnectionFactory.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ConnectionFactory.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.jdbc;
 
 import io.trino.spi.connector.ConnectorSession;
-
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DecimalConfig.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DecimalConfig.java
index 115873879f00..bd40864a1014 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DecimalConfig.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DecimalConfig.java
@@ -15,10 +15,9 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.math.RoundingMode;
 
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DecimalSessionSessionProperties.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DecimalSessionSessionProperties.java
index 892635bf7e64..f544cf88da83 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DecimalSessionSessionProperties.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DecimalSessionSessionProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.math.RoundingMode;
 import java.util.List;
 
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultJdbcMetadata.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultJdbcMetadata.java
index b73c81cfb940..47762fc13c5e 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultJdbcMetadata.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultJdbcMetadata.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -28,7 +29,6 @@
 import io.trino.spi.connector.Assignment;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
-import io.trino.spi.connector.ColumnSchema;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorOutputMetadata;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
@@ -46,6 +46,7 @@
 import io.trino.spi.connector.LimitApplicationResult;
 import io.trino.spi.connector.ProjectionApplicationResult;
 import io.trino.spi.connector.RetryMode;
+import io.trino.spi.connector.RowChangeParadigm;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.connector.SortItem;
@@ -57,9 +58,9 @@
 import io.trino.spi.expression.ConnectorExpression;
 import io.trino.spi.expression.Constant;
 import io.trino.spi.expression.Variable;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.statistics.ComputedStatistics;
@@ -73,6 +74,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
@@ -81,6 +83,7 @@
 import static com.google.common.base.Functions.identity;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Splitter.fixedLength;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.base.Verify.verifyNotNull;
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -96,6 +99,7 @@
 import static io.trino.plugin.jdbc.JdbcWriteSessionProperties.isNonTransactionalInsert;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.connector.RetryMode.NO_RETRIES;
+import static io.trino.spi.connector.RowChangeParadigm.CHANGE_ONLY_UPDATED_COLUMNS;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static java.lang.Math.max;
 import static java.util.Objects.requireNonNull;
@@ -103,6 +107,8 @@
 public class DefaultJdbcMetadata
         implements JdbcMetadata
 {
+    public static final int DEFAULT_COLUMN_ALIAS_LENGTH = 30;
+
     private static final String SYNTHETIC_COLUMN_NAME_PREFIX = "_pfgnrtd_";
     private static final String DELETE_ROW_ID = "_trino_artificial_column_handle_for_delete_row_id_";
     private static final String MERGE_ROW_ID = "$merge_row_id";
@@ -241,7 +247,8 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
                 handle.getColumns(),
                 handle.getOtherReferencedTables(),
                 handle.getNextSyntheticColumnId(),
-                handle.getAuthorization());
+                handle.getAuthorization(),
+                handle.getUpdateAssignments());
 
         return Optional.of(
                 remainingExpression.isPresent()
@@ -263,7 +270,8 @@ private JdbcTableHandle flushAttributesAsQuery(ConnectorSession session, JdbcTab
                 Optional.of(columns),
                 handle.getAllReferencedTables(),
                 handle.getNextSyntheticColumnId(),
-                handle.getAuthorization());
+                handle.getAuthorization(),
+                handle.getUpdateAssignments());
     }
 
     @Override
@@ -309,7 +317,8 @@ public Optional<ProjectionApplicationResult<ConnectorTableHandle>> applyProjecti
                         Optional.of(newColumns),
                         handle.getOtherReferencedTables(),
                         handle.getNextSyntheticColumnId(),
-                        handle.getAuthorization()),
+                        handle.getAuthorization(),
+                        handle.getUpdateAssignments()),
                 projections,
                 assignments.entrySet().stream()
                         .map(assignment -> new Assignment(
@@ -419,7 +428,8 @@ public Optional<AggregationApplicationResult<ConnectorTableHandle>> applyAggrega
                 Optional.of(newColumnsList),
                 handle.getAllReferencedTables(),
                 nextSyntheticColumnId,
-                handle.getAuthorization());
+                handle.getAuthorization(),
+                handle.getUpdateAssignments());
 
         return Optional.of(new AggregationApplicationResult<>(handle, projections.build(), resultAssignments.build(), ImmutableMap.of(), precalculateStatisticsForPushdown));
     }
@@ -453,18 +463,14 @@ public Optional<JoinApplicationResult<ConnectorTableHandle>> applyJoin(
 
         ImmutableMap.Builder<JdbcColumnHandle, JdbcColumnHandle> newLeftColumnsBuilder = ImmutableMap.builder();
         for (JdbcColumnHandle column : jdbcClient.getColumns(session, leftHandle)) {
-            newLeftColumnsBuilder.put(column, JdbcColumnHandle.builderFrom(column)
-                    .setColumnName(column.getColumnName() + "_" + nextSyntheticColumnId)
-                    .build());
+            newLeftColumnsBuilder.put(column, createSyntheticColumn(column, nextSyntheticColumnId));
             nextSyntheticColumnId++;
         }
         Map<JdbcColumnHandle, JdbcColumnHandle> newLeftColumns = newLeftColumnsBuilder.buildOrThrow();
 
         ImmutableMap.Builder<JdbcColumnHandle, JdbcColumnHandle> newRightColumnsBuilder = ImmutableMap.builder();
         for (JdbcColumnHandle column : jdbcClient.getColumns(session, rightHandle)) {
-            newRightColumnsBuilder.put(column, JdbcColumnHandle.builderFrom(column)
-                    .setColumnName(column.getColumnName() + "_" + nextSyntheticColumnId)
-                    .build());
+            newRightColumnsBuilder.put(column, createSyntheticColumn(column, nextSyntheticColumnId));
             nextSyntheticColumnId++;
         }
         Map<JdbcColumnHandle, JdbcColumnHandle> newRightColumns = newRightColumnsBuilder.buildOrThrow();
@@ -514,12 +520,31 @@ public Optional<JoinApplicationResult<ConnectorTableHandle>> applyJoin(
                                                 .addAll(rightReferencedTables)
                                                 .build())),
                         nextSyntheticColumnId,
-                        leftHandle.getAuthorization()),
+                        leftHandle.getAuthorization(),
+                        leftHandle.getUpdateAssignments()),
                 ImmutableMap.copyOf(newLeftColumns),
                 ImmutableMap.copyOf(newRightColumns),
                 precalculateStatisticsForPushdown));
     }
 
+    @VisibleForTesting
+    static JdbcColumnHandle createSyntheticColumn(JdbcColumnHandle column, int nextSyntheticColumnId)
+    {
+        verify(nextSyntheticColumnId >= 0, "nextSyntheticColumnId rolled over and is not monotonically increasing any more");
+
+        int sequentialNumberLength = String.valueOf(nextSyntheticColumnId).length();
+        int originalColumnNameLength = DEFAULT_COLUMN_ALIAS_LENGTH - sequentialNumberLength - "_".length();
+
+        String columnNameTruncated = fixedLength(originalColumnNameLength)
+                .split(column.getColumnName())
+                .iterator()
+                .next();
+        String columnName = columnNameTruncated + "_" + nextSyntheticColumnId;
+        return JdbcColumnHandle.builderFrom(column)
+                .setColumnName(columnName)
+                .build();
+    }
+
     private static Optional<JdbcColumnHandle> getVariableColumnHandle(Map<String, ColumnHandle> assignments, ConnectorExpression expression)
     {
         requireNonNull(assignments, "assignments is null");
@@ -576,7 +601,8 @@ public Optional<LimitApplicationResult<ConnectorTableHandle>> applyLimit(Connect
                 handle.getColumns(),
                 handle.getOtherReferencedTables(),
                 handle.getNextSyntheticColumnId(),
-                handle.getAuthorization());
+                handle.getAuthorization(),
+                handle.getUpdateAssignments());
 
         return Optional.of(new LimitApplicationResult<>(handle, jdbcClient.isLimitGuaranteed(session), precalculateStatisticsForPushdown));
     }
@@ -630,7 +656,8 @@ public Optional<TopNApplicationResult<ConnectorTableHandle>> applyTopN(
                 handle.getColumns(),
                 handle.getOtherReferencedTables(),
                 handle.getNextSyntheticColumnId(),
-                handle.getAuthorization());
+                handle.getAuthorization(),
+                handle.getUpdateAssignments());
 
         return Optional.of(new TopNApplicationResult<>(sortedTableHandle, jdbcClient.isTopNGuaranteed(session), precalculateStatisticsForPushdown));
     }
@@ -649,13 +676,7 @@ public Optional<TableFunctionApplicationResult<ConnectorTableHandle>> applyTable
 
     private TableFunctionApplicationResult<ConnectorTableHandle> getTableFunctionApplicationResult(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
-        ConnectorTableSchema tableSchema = getTableSchema(session, tableHandle);
-        Map<String, ColumnHandle> columnHandlesByName = getColumnHandles(session, tableHandle);
-        List<ColumnHandle> columnHandles = tableSchema.getColumns().stream()
-                .map(ColumnSchema::getName)
-                .map(columnHandlesByName::get)
-                .collect(toImmutableList());
-
+        List<ColumnHandle> columnHandles = ImmutableList.copyOf(getColumnHandles(session, tableHandle).values());
         return new TableFunctionApplicationResult<>(tableHandle, columnHandles);
     }
 
@@ -671,20 +692,25 @@ public Optional<TableScanRedirectApplicationResult> applyTableScanRedirect(Conne
     }
 
     @Override
-    public ConnectorTableSchema getTableSchema(ConnectorSession session, ConnectorTableHandle table)
+    public SchemaTableName getTableName(ConnectorSession session, ConnectorTableHandle table)
     {
-        if (table instanceof JdbcProcedureHandle procedureHandle) {
-            return new ConnectorTableSchema(
-                    getSchemaTableNameForProcedureHandle(),
-                    procedureHandle.getColumns().orElseThrow().stream()
-                            .map(JdbcColumnHandle::getColumnSchema)
-                            .collect(toImmutableList()));
+        if (table instanceof JdbcProcedureHandle) {
+            // TODO (https://github.com/trinodb/trino/issues/6694) SchemaTableName should not be required for synthetic JdbcProcedureHandle
+            return new SchemaTableName("_generated", "_generated_procedure");
         }
-
         JdbcTableHandle handle = (JdbcTableHandle) table;
+        return handle.isNamedRelation()
+                ? handle.getRequiredNamedRelation().getSchemaTableName()
+                // TODO (https://github.com/trinodb/trino/issues/6694) SchemaTableName should not be required for synthetic ConnectorTableHandle
+                : new SchemaTableName("_generated", "_generated_query");
+    }
 
+    @Override
+    public ConnectorTableSchema getTableSchema(ConnectorSession session, ConnectorTableHandle table)
+    {
+        JdbcTableHandle handle = (JdbcTableHandle) table;
         return new ConnectorTableSchema(
-                getSchemaTableName(handle),
+                handle.getRequiredNamedRelation().getSchemaTableName(),
                 jdbcClient.getColumns(session, handle).stream()
                         .map(JdbcColumnHandle::getColumnSchema)
                         .collect(toImmutableList()));
@@ -693,18 +719,9 @@ public ConnectorTableSchema getTableSchema(ConnectorSession session, ConnectorTa
     @Override
     public ConnectorTableMetadata getTableMetadata(ConnectorSession session, ConnectorTableHandle table)
     {
-        if (table instanceof JdbcProcedureHandle procedureHandle) {
-            return new ConnectorTableMetadata(
-                    getSchemaTableNameForProcedureHandle(),
-                    procedureHandle.getColumns().orElseThrow().stream()
-                            .map(JdbcColumnHandle::getColumnMetadata)
-                            .collect(toImmutableList()));
-        }
-
         JdbcTableHandle handle = (JdbcTableHandle) table;
-
         return new ConnectorTableMetadata(
-                getSchemaTableName(handle),
+                handle.getRequiredNamedRelation().getSchemaTableName(),
                 jdbcClient.getColumns(session, handle).stream()
                         .map(JdbcColumnHandle::getColumnMetadata)
                         .collect(toImmutableList()),
@@ -712,20 +729,6 @@ public ConnectorTableMetadata getTableMetadata(ConnectorSession session, Connect
                 getTableComment(handle));
     }
 
-    public static SchemaTableName getSchemaTableName(JdbcTableHandle handle)
-    {
-        return handle.isNamedRelation()
-                ? handle.getRequiredNamedRelation().getSchemaTableName()
-                // TODO (https://github.com/trinodb/trino/issues/6694) SchemaTableName should not be required for synthetic ConnectorTableHandle
-                : new SchemaTableName("_generated", "_generated_query");
-    }
-
-    private static SchemaTableName getSchemaTableNameForProcedureHandle()
-    {
-        // TODO (https://github.com/trinodb/trino/issues/6694) SchemaTableName should not be required for synthetic JdbcProcedureHandle
-        return new SchemaTableName("_generated", "_generated_procedure");
-    }
-
     public static Optional<String> getTableComment(JdbcTableHandle handle)
     {
         return handle.isNamedRelation() ? handle.getRequiredNamedRelation().getComment() : Optional.empty();
@@ -795,6 +798,12 @@ private void verifyRetryMode(ConnectorSession session, RetryMode retryMode)
         }
     }
 
+    @Override
+    public Optional<Type> getSupportedType(ConnectorSession session, Map<String, Object> tableProperties, Type type)
+    {
+        return jdbcClient.getSupportedType(session, type);
+    }
+
     @Override
     public ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, Optional<ConnectorTableLayout> layout, RetryMode retryMode)
     {
@@ -917,6 +926,24 @@ public OptionalLong executeDelete(ConnectorSession session, ConnectorTableHandle
         return jdbcClient.delete(session, (JdbcTableHandle) handle);
     }
 
+    @Override
+    public Optional<ConnectorTableHandle> applyUpdate(ConnectorSession session, ConnectorTableHandle handle, Map<ColumnHandle, Constant> assignments)
+    {
+        return Optional.of(((JdbcTableHandle) handle).withAssignments(assignments));
+    }
+
+    @Override
+    public RowChangeParadigm getRowChangeParadigm(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        return CHANGE_ONLY_UPDATED_COLUMNS;
+    }
+
+    @Override
+    public OptionalLong executeUpdate(ConnectorSession session, ConnectorTableHandle handle)
+    {
+        return jdbcClient.update(session, (JdbcTableHandle) handle);
+    }
+
     @Override
     public void truncateTable(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
@@ -1008,9 +1035,9 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
-        jdbcClient.dropSchema(session, schemaName);
+        jdbcClient.dropSchema(session, schemaName, cascade);
     }
 
     @Override
@@ -1019,6 +1046,12 @@ public void renameSchema(ConnectorSession session, String schemaName, String new
         jdbcClient.renameSchema(session, schemaName, newSchemaName);
     }
 
+    @Override
+    public OptionalInt getMaxWriterTasks(ConnectorSession session)
+    {
+        return jdbcClient.getMaxWriteParallelism(session);
+    }
+
     private static boolean isTableHandleForProcedure(ConnectorTableHandle tableHandle)
     {
         return tableHandle instanceof JdbcProcedureHandle;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultJdbcMetadataFactory.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultJdbcMetadataFactory.java
index 1abb12826210..76b1a91dc9dc 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultJdbcMetadataFactory.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultJdbcMetadataFactory.java
@@ -14,10 +14,9 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
 
-import javax.inject.Inject;
-
 import java.util.Set;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultQueryBuilder.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultQueryBuilder.java
index 4977bc7c6463..dfd3b0674329 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultQueryBuilder.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultQueryBuilder.java
@@ -176,6 +176,57 @@ public PreparedQuery prepareDeleteQuery(
         return new PreparedQuery(sql, accumulator.build());
     }
 
+    @Override
+    public PreparedQuery prepareUpdateQuery(
+            JdbcClient client,
+            ConnectorSession session,
+            Connection connection,
+            JdbcNamedRelationHandle baseRelation,
+            TupleDomain<ColumnHandle> tupleDomain,
+            Optional<ParameterizedExpression> additionalPredicate,
+            List<JdbcAssignmentItem> assignments)
+    {
+        ImmutableList.Builder<QueryParameter> accumulator = ImmutableList.builder();
+
+        String sql = "UPDATE " + getRelation(client, baseRelation.getRemoteTableName()) + " SET ";
+
+        assignments.forEach(entry -> {
+            JdbcColumnHandle columnHandle = entry.column();
+            accumulator.add(
+                    new QueryParameter(
+                            columnHandle.getJdbcTypeHandle(),
+                            columnHandle.getColumnType(),
+                            entry.queryParameter().getValue()));
+        });
+
+        sql += assignments.stream()
+                .map(JdbcAssignmentItem::column)
+                .map(columnHandle -> {
+                    String bindExpression = getWriteFunction(
+                            client,
+                            session,
+                            connection,
+                            columnHandle.getJdbcTypeHandle(),
+                            columnHandle.getColumnType())
+                            .getBindExpression();
+                    return client.quoted(columnHandle.getColumnName()) + " = " + bindExpression;
+                })
+                .collect(joining(", "));
+
+        ImmutableList.Builder<String> conjuncts = ImmutableList.builder();
+
+        toConjuncts(client, session, connection, tupleDomain, conjuncts, accumulator::add);
+        additionalPredicate.ifPresent(predicate -> {
+            conjuncts.add(predicate.expression());
+            accumulator.addAll(predicate.parameters());
+        });
+        List<String> clauses = conjuncts.build();
+        if (!clauses.isEmpty()) {
+            sql += " WHERE " + Joiner.on(" AND ").join(clauses);
+        }
+        return new PreparedQuery(sql, accumulator.build());
+    }
+
     @Override
     public PreparedStatement prepareStatement(
             JdbcClient client,
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DriverConnectionFactory.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DriverConnectionFactory.java
index 58f40a256108..4c6bcae53c86 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DriverConnectionFactory.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DriverConnectionFactory.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.credential.CredentialPropertiesProvider;
 import io.trino.plugin.jdbc.credential.CredentialProvider;
 import io.trino.plugin.jdbc.credential.DefaultCredentialPropertiesProvider;
@@ -34,6 +35,7 @@ public class DriverConnectionFactory
     private final String connectionUrl;
     private final Properties connectionProperties;
     private final CredentialPropertiesProvider<String, String> credentialPropertiesProvider;
+    private final TracingDataSource dataSource;
 
     public DriverConnectionFactory(Driver driver, BaseJdbcConfig config, CredentialProvider credentialProvider)
     {
@@ -45,16 +47,27 @@ public DriverConnectionFactory(Driver driver, BaseJdbcConfig config, CredentialP
 
     public DriverConnectionFactory(Driver driver, String connectionUrl, Properties connectionProperties, CredentialProvider credentialProvider)
     {
-        this(driver, connectionUrl, connectionProperties, new DefaultCredentialPropertiesProvider(credentialProvider));
+        this(driver, connectionUrl, connectionProperties, new DefaultCredentialPropertiesProvider(credentialProvider), OpenTelemetry.noop());
     }
 
-    public DriverConnectionFactory(Driver driver, String connectionUrl, Properties connectionProperties, CredentialPropertiesProvider<String, String> credentialPropertiesProvider)
+    public DriverConnectionFactory(Driver driver, String connectionUrl, Properties connectionProperties, CredentialProvider credentialProvider, OpenTelemetry openTelemetry)
+    {
+        this(driver, connectionUrl, connectionProperties, new DefaultCredentialPropertiesProvider(credentialProvider), openTelemetry);
+    }
+
+    public DriverConnectionFactory(
+            Driver driver,
+            String connectionUrl,
+            Properties connectionProperties,
+            CredentialPropertiesProvider<String, String> credentialPropertiesProvider,
+            OpenTelemetry openTelemetry)
     {
         this.driver = requireNonNull(driver, "driver is null");
         this.connectionUrl = requireNonNull(connectionUrl, "connectionUrl is null");
         this.connectionProperties = new Properties();
         this.connectionProperties.putAll(requireNonNull(connectionProperties, "connectionProperties is null"));
         this.credentialPropertiesProvider = requireNonNull(credentialPropertiesProvider, "credentialPropertiesProvider is null");
+        this.dataSource = new TracingDataSource(requireNonNull(openTelemetry, "openTelemetry is null"), driver, connectionUrl);
     }
 
     @Override
@@ -62,7 +75,7 @@ public Connection openConnection(ConnectorSession session)
             throws SQLException
     {
         Properties properties = getCredentialProperties(session.getIdentity());
-        Connection connection = driver.connect(connectionUrl, properties);
+        Connection connection = dataSource.getConnection(properties);
         checkState(connection != null, "Driver returned null connection, make sure the connection URL '%s' is valid for the driver %s", connectionUrl, driver);
         return connection;
     }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ExtraCredentialsBasedIdentityCacheMapping.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ExtraCredentialsBasedIdentityCacheMapping.java
index b61e0bc70403..bc0e10bb45dc 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ExtraCredentialsBasedIdentityCacheMapping.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ExtraCredentialsBasedIdentityCacheMapping.java
@@ -13,11 +13,10 @@
  */
 package io.trino.plugin.jdbc;
 
+import com.google.inject.Inject;
 import io.trino.plugin.jdbc.credential.ExtraCredentialConfig;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForBaseJdbc.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForBaseJdbc.java
index 993b0e9756a6..fa0f2669f63d 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForBaseJdbc.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForBaseJdbc.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForBaseJdbc
 {
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForJdbcDynamicFiltering.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForJdbcDynamicFiltering.java
index db0b2ceb424d..495303cc2d7b 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForJdbcDynamicFiltering.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForJdbcDynamicFiltering.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForJdbcDynamicFiltering
 {
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForLazyConnectionFactory.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForLazyConnectionFactory.java
deleted file mode 100644
index b4ffd2eda1fc..000000000000
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForLazyConnectionFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.jdbc;
-
-import javax.inject.Qualifier;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Retention(RUNTIME)
-@Target({FIELD, PARAMETER, METHOD})
-@Qualifier
-public @interface ForLazyConnectionFactory
-{
-}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForRecordCursor.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForRecordCursor.java
index 39f6292f917d..f61eb99c2e2f 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForRecordCursor.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForRecordCursor.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForRecordCursor
 {
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForReusableConnectionFactory.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForReusableConnectionFactory.java
index 32f8eb34dcdd..2bdb1e847824 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForReusableConnectionFactory.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForReusableConnectionFactory.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForReusableConnectionFactory
 {
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForwardingJdbcClient.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForwardingJdbcClient.java
index 794244cc9ec2..0e70ec7beb94 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForwardingJdbcClient.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ForwardingJdbcClient.java
@@ -39,6 +39,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Set;
 import java.util.function.Supplier;
@@ -123,6 +124,12 @@ public WriteMapping toWriteMapping(ConnectorSession session, Type type)
         return delegate().toWriteMapping(session, type);
     }
 
+    @Override
+    public Optional<Type> getSupportedType(ConnectorSession session, Type type)
+    {
+        return delegate().getSupportedType(session, type);
+    }
+
     @Override
     public boolean supportsAggregationPushdown(ConnectorSession session, JdbcTableHandle table, List<AggregateFunction> aggregates, Map<String, ColumnHandle> assignments, List<List<ColumnHandle>> groupingSets)
     {
@@ -379,9 +386,9 @@ public void createSchema(ConnectorSession session, String schemaName)
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
-        delegate().dropSchema(session, schemaName);
+        delegate().dropSchema(session, schemaName, cascade);
     }
 
     @Override
@@ -426,9 +433,21 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
         return delegate().delete(session, handle);
     }
 
+    @Override
+    public OptionalLong update(ConnectorSession session, JdbcTableHandle handle)
+    {
+        return delegate().update(session, handle);
+    }
+
     @Override
     public void truncateTable(ConnectorSession session, JdbcTableHandle handle)
     {
         delegate().truncateTable(session, handle);
     }
+
+    @Override
+    public OptionalInt getMaxWriteParallelism(ConnectorSession session)
+    {
+        return delegate().getMaxWriteParallelism(session);
+    }
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcAssignmentItem.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcAssignmentItem.java
new file mode 100644
index 000000000000..fd46ffbd778f
--- /dev/null
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcAssignmentItem.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed 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 io.trino.plugin.jdbc;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import static java.util.Objects.requireNonNull;
+
+public record JdbcAssignmentItem(@JsonProperty("column") JdbcColumnHandle column, @JsonProperty("queryParameter") QueryParameter queryParameter)
+{
+    public JdbcAssignmentItem
+    {
+        requireNonNull(column, "column is null");
+        requireNonNull(queryParameter, "queryParameter is null");
+    }
+}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcClient.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcClient.java
index 5a8e2ff3df48..9cb1e5ed7b43 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcClient.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcClient.java
@@ -40,6 +40,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Set;
 
@@ -73,6 +74,11 @@ default boolean schemaExists(ConnectorSession session, String schema)
 
     WriteMapping toWriteMapping(ConnectorSession session, Type type);
 
+    default Optional<Type> getSupportedType(ConnectorSession session, Type type)
+    {
+        return Optional.empty();
+    }
+
     default boolean supportsAggregationPushdown(ConnectorSession session, JdbcTableHandle table, List<AggregateFunction> aggregates, Map<String, ColumnHandle> assignments, List<List<ColumnHandle>> groupingSets)
     {
         return true;
@@ -206,7 +212,7 @@ default TableStatistics getTableStatistics(ConnectorSession session, JdbcTableHa
 
     void createSchema(ConnectorSession session, String schemaName);
 
-    void dropSchema(ConnectorSession session, String schemaName);
+    void dropSchema(ConnectorSession session, String schemaName, boolean cascade);
 
     void renameSchema(ConnectorSession session, String schemaName, String newSchemaName);
 
@@ -229,4 +235,8 @@ default Optional<TableScanRedirectApplicationResult> getTableScanRedirection(Con
     OptionalLong delete(ConnectorSession session, JdbcTableHandle handle);
 
     void truncateTable(ConnectorSession session, JdbcTableHandle handle);
+
+    OptionalLong update(ConnectorSession session, JdbcTableHandle handle);
+
+    OptionalInt getMaxWriteParallelism(ConnectorSession session);
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcConnector.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcConnector.java
index b0beee1f75a7..f6ff35936a33 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcConnector.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcConnector.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorMetadata;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
@@ -26,13 +27,11 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorTransactionHandle;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.procedure.Procedure;
-import io.trino.spi.ptf.ConnectorTableFunction;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcConnectorFactory.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcConnectorFactory.java
index 25a69c899b7e..6b0d90082c70 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcConnectorFactory.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcConnectorFactory.java
@@ -16,6 +16,7 @@
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import io.airlift.bootstrap.Bootstrap;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.base.CatalogName;
 import io.trino.spi.NodeManager;
 import io.trino.spi.VersionEmbedder;
@@ -28,7 +29,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class JdbcConnectorFactory
@@ -55,12 +56,13 @@ public Connector create(String catalogName, Map<String, String> requiredConfig,
     {
         requireNonNull(requiredConfig, "requiredConfig is null");
         requireNonNull(module, "module is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 binder -> binder.bind(TypeManager.class).toInstance(context.getTypeManager()),
                 binder -> binder.bind(NodeManager.class).toInstance(context.getNodeManager()),
                 binder -> binder.bind(VersionEmbedder.class).toInstance(context.getVersionEmbedder()),
+                binder -> binder.bind(OpenTelemetry.class).toInstance(context.getOpenTelemetry()),
                 binder -> binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName)),
                 new JdbcModule(),
                 module);
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDiagnosticModule.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDiagnosticModule.java
index 557095b85053..93bed3852ec8 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDiagnosticModule.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDiagnosticModule.java
@@ -18,6 +18,7 @@
 import com.google.inject.Module;
 import com.google.inject.Provider;
 import com.google.inject.Provides;
+import com.google.inject.Scopes;
 import com.google.inject.Singleton;
 import io.airlift.log.Logger;
 import io.trino.plugin.base.CatalogName;
@@ -39,11 +40,12 @@ public void configure(Binder binder)
     {
         binder.install(new MBeanServerModule());
         binder.install(new MBeanModule());
+        binder.bind(StatisticsAwareConnectionFactory.class).in(Scopes.SINGLETON);
 
         Provider<CatalogName> catalogName = binder.getProvider(CatalogName.class);
         newExporter(binder).export(Key.get(JdbcClient.class, StatsCollecting.class))
                 .as(generator -> generator.generatedNameOf(JdbcClient.class, catalogName.get().toString()));
-        newExporter(binder).export(Key.get(ConnectionFactory.class, StatsCollecting.class))
+        newExporter(binder).export(StatisticsAwareConnectionFactory.class)
                 .as(generator -> generator.generatedNameOf(ConnectionFactory.class, catalogName.get().toString()));
         newExporter(binder).export(JdbcClient.class)
                 .as(generator -> generator.generatedNameOf(CachingJdbcClient.class, catalogName.get().toString()));
@@ -65,12 +67,4 @@ public JdbcClient createJdbcClientWithStats(@ForBaseJdbc JdbcClient client, Cata
             return client;
         }));
     }
-
-    @Provides
-    @Singleton
-    @StatsCollecting
-    public static ConnectionFactory createConnectionFactoryWithStats(@ForBaseJdbc ConnectionFactory connectionFactory)
-    {
-        return new StatisticsAwareConnectionFactory(connectionFactory);
-    }
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDynamicFilteringConfig.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDynamicFilteringConfig.java
index 7d1189437bb4..2791158eee7d 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDynamicFilteringConfig.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDynamicFilteringConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDynamicFilteringSessionProperties.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDynamicFilteringSessionProperties.java
index 649c1be5c876..b9d1213d4006 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDynamicFilteringSessionProperties.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDynamicFilteringSessionProperties.java
@@ -14,13 +14,12 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.plugin.base.session.PropertyMetadataUtil.durationProperty;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDynamicFilteringSplitManager.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDynamicFilteringSplitManager.java
index 39e514bd2f80..de6a556c71af 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDynamicFilteringSplitManager.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcDynamicFilteringSplitManager.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
@@ -25,8 +26,6 @@
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.DynamicFilter;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcJoinPushdownSessionProperties.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcJoinPushdownSessionProperties.java
index 631d6c1d6ec0..d3e0f7c4495a 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcJoinPushdownSessionProperties.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcJoinPushdownSessionProperties.java
@@ -14,13 +14,12 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataConfig.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataConfig.java
index ad55614e4f53..039195481a86 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataConfig.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataConfig.java
@@ -17,8 +17,7 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.DefunctConfig;
 import io.airlift.configuration.LegacyConfig;
-
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Min;
 
 @DefunctConfig("allow-drop-table")
 public class JdbcMetadataConfig
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataSessionProperties.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataSessionProperties.java
index a812b7b324a8..d4ae2a0b5b12 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataSessionProperties.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataSessionProperties.java
@@ -14,13 +14,12 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcModule.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcModule.java
index 131c375e90f0..ba18738c0d96 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcModule.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcModule.java
@@ -16,23 +16,22 @@
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.inject.Binder;
 import com.google.inject.Key;
+import com.google.inject.Provider;
 import com.google.inject.Scopes;
 import com.google.inject.multibindings.Multibinder;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.plugin.base.CatalogName;
+import io.trino.plugin.base.mapping.IdentifierMappingModule;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifierModule;
-import io.trino.plugin.jdbc.mapping.IdentifierMappingModule;
 import io.trino.plugin.jdbc.procedure.FlushJdbcMetadataCacheProcedure;
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorPageSinkProvider;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
 import io.trino.spi.connector.ConnectorSplitManager;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.procedure.Procedure;
-import io.trino.spi.ptf.ConnectorTableFunction;
-
-import javax.annotation.PreDestroy;
-import javax.inject.Provider;
+import jakarta.annotation.PreDestroy;
 
 import java.util.concurrent.ExecutorService;
 
@@ -51,6 +50,7 @@ public void setup(Binder binder)
         install(new JdbcDiagnosticModule());
         install(new IdentifierMappingModule());
         install(new RemoteQueryModifierModule());
+        install(new RetryingConnectionFactoryModule());
 
         newOptionalBinder(binder, ConnectorAccessControl.class);
         newOptionalBinder(binder, QueryBuilder.class).setDefault().to(DefaultQueryBuilder.class).in(Scopes.SINGLETON);
@@ -89,10 +89,6 @@ public void setup(Binder binder)
 
         newSetBinder(binder, ConnectorTableFunction.class);
 
-        binder.bind(ConnectionFactory.class)
-                .annotatedWith(ForLazyConnectionFactory.class)
-                .to(Key.get(ConnectionFactory.class, StatsCollecting.class))
-                .in(Scopes.SINGLETON);
         install(conditionalModule(
                 QueryConfig.class,
                 QueryConfig::isReuseConnection,
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcOutputTableHandle.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcOutputTableHandle.java
index 4f82100f2168..91c9f5b0eb05 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcOutputTableHandle.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcOutputTableHandle.java
@@ -19,8 +19,7 @@
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcPageSink.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcPageSink.java
index c74fd1e5fe8b..a37c827085a7 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcPageSink.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcPageSink.java
@@ -220,7 +220,9 @@ public CompletableFuture<Collection<Slice>> finish()
             throw new TrinoException(JDBC_ERROR, "Failed to insert data: " + firstNonNull(e.getMessage(), e), e);
         }
         // pass the successful page sink id
-        return completedFuture(ImmutableList.of(Slices.wrappedLongArray(pageSinkId.getId())));
+        Slice value = Slices.allocate(Long.BYTES);
+        value.setLong(0, pageSinkId.getId());
+        return completedFuture(ImmutableList.of(value));
     }
 
     @SuppressWarnings("unused")
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcPageSinkProvider.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcPageSinkProvider.java
index df3827c1c6ef..3135b7c99af2 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcPageSinkProvider.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcPageSinkProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
+import com.google.inject.Inject;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
@@ -22,8 +23,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 public class JdbcPageSinkProvider
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcRecordCursor.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcRecordCursor.java
index a785cbedf3c0..ea3f47970332 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcRecordCursor.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcRecordCursor.java
@@ -20,8 +20,7 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -269,7 +268,6 @@ public boolean isNull(int field)
         }
     }
 
-    @SuppressWarnings("UnusedDeclaration")
     @Override
     public void close()
     {
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcRecordSetProvider.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcRecordSetProvider.java
index b79957aad799..f32b04049224 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcRecordSetProvider.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcRecordSetProvider.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.plugin.base.MappedRecordSet;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
@@ -24,8 +25,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.RecordSet;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcRemoteIdentifiers.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcRemoteIdentifiers.java
new file mode 100644
index 000000000000..aae8f54aa68c
--- /dev/null
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcRemoteIdentifiers.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed 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 io.trino.plugin.jdbc;
+
+import com.google.common.collect.ImmutableSet;
+import io.trino.plugin.base.mapping.RemoteIdentifiers;
+import io.trino.spi.TrinoException;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.plugin.jdbc.JdbcErrorCode.JDBC_ERROR;
+import static java.util.Objects.requireNonNull;
+
+public class JdbcRemoteIdentifiers
+        implements RemoteIdentifiers
+{
+    private final BaseJdbcClient baseJdbcClient;
+    private final Connection connection;
+    private final boolean storesUpperCase;
+
+    public JdbcRemoteIdentifiers(BaseJdbcClient baseJdbcClient, Connection connection, boolean storesUpperCase)
+    {
+        this.baseJdbcClient = requireNonNull(baseJdbcClient, "baseJdbcClient is null");
+        this.connection = requireNonNull(connection, "connection is null");
+        this.storesUpperCase = storesUpperCase;
+    }
+
+    @Override
+    public Set<String> getRemoteSchemas()
+    {
+        return baseJdbcClient.listSchemas(connection)
+                .stream()
+                .collect(toImmutableSet());
+    }
+
+    @Override
+    public Set<String> getRemoteTables(String remoteSchema)
+    {
+        try (ResultSet resultSet = baseJdbcClient.getTables(connection, Optional.of(remoteSchema), Optional.empty())) {
+            ImmutableSet.Builder<String> tableNames = ImmutableSet.builder();
+            while (resultSet.next()) {
+                tableNames.add(resultSet.getString("TABLE_NAME"));
+            }
+            return tableNames.build();
+        }
+        catch (SQLException e) {
+            throw new TrinoException(JDBC_ERROR, e);
+        }
+    }
+
+    @Override
+    public boolean storesUpperCaseIdentifiers()
+    {
+        return storesUpperCase;
+    }
+
+    public static class JdbcRemoteIdentifiersFactory
+    {
+        private final BaseJdbcClient baseJdbcClient;
+        private Boolean storesUpperCaseIdentifiers;
+
+        public JdbcRemoteIdentifiersFactory(BaseJdbcClient baseJdbcClient)
+        {
+            this.baseJdbcClient = requireNonNull(baseJdbcClient, "baseJdbcClient is null");
+        }
+
+        public JdbcRemoteIdentifiers createJdbcRemoteIdentifies(Connection connection)
+        {
+            return new JdbcRemoteIdentifiers(baseJdbcClient, connection, storesUpperCaseIdentifiers(connection));
+        }
+
+        private boolean storesUpperCaseIdentifiers(Connection connection)
+        {
+            if (storesUpperCaseIdentifiers != null) {
+                return storesUpperCaseIdentifiers;
+            }
+            try {
+                DatabaseMetaData metadata = connection.getMetaData();
+                storesUpperCaseIdentifiers = metadata.storesUpperCaseIdentifiers();
+                return storesUpperCaseIdentifiers;
+            }
+            catch (SQLException e) {
+                throw new TrinoException(JDBC_ERROR, e);
+            }
+        }
+    }
+}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcSortItem.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcSortItem.java
index 6ce11f1b0c4e..2fcf1addfb0e 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcSortItem.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcSortItem.java
@@ -15,10 +15,9 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.connector.SortOrder;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Objects;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcSplitManager.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcSplitManager.java
index cbb6082116b5..0a1002057ec4 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcSplitManager.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcSplitManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorSplitSource;
@@ -21,8 +22,6 @@
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.DynamicFilter;
 
-import javax.inject.Inject;
-
 import static io.trino.plugin.jdbc.JdbcDynamicFilteringSessionProperties.dynamicFilteringEnabled;
 import static java.util.Objects.requireNonNull;
 
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcTableHandle.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcTableHandle.java
index 3360bd49bdb9..c48c737cbd8a 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcTableHandle.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcTableHandle.java
@@ -21,9 +21,11 @@
 import io.trino.plugin.jdbc.expression.ParameterizedExpression;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.expression.Constant;
 import io.trino.spi.predicate.TupleDomain;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalLong;
@@ -31,6 +33,7 @@
 import java.util.stream.Collectors;
 
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static java.util.Objects.requireNonNull;
 
 public final class JdbcTableHandle
@@ -59,6 +62,7 @@ public final class JdbcTableHandle
 
     private final int nextSyntheticColumnId;
     private final Optional<String> authorization;
+    private final List<JdbcAssignmentItem> updateAssignments;
 
     public JdbcTableHandle(SchemaTableName schemaTableName, RemoteTableName remoteTableName, Optional<String> comment)
     {
@@ -71,7 +75,8 @@ public JdbcTableHandle(SchemaTableName schemaTableName, RemoteTableName remoteTa
                 Optional.empty(),
                 Optional.of(ImmutableSet.of()),
                 0,
-                Optional.empty());
+                Optional.empty(),
+                ImmutableList.of());
     }
 
     @JsonCreator
@@ -84,7 +89,8 @@ public JdbcTableHandle(
             @JsonProperty("columns") Optional<List<JdbcColumnHandle>> columns,
             @JsonProperty("otherReferencedTables") Optional<Set<SchemaTableName>> otherReferencedTables,
             @JsonProperty("nextSyntheticColumnId") int nextSyntheticColumnId,
-            @JsonProperty("authorization") Optional<String> authorization)
+            @JsonProperty("authorization") Optional<String> authorization,
+            @JsonProperty("updateAssignments") List<JdbcAssignmentItem> updateAssignments)
     {
         this.relationHandle = requireNonNull(relationHandle, "relationHandle is null");
         this.constraint = requireNonNull(constraint, "constraint is null");
@@ -96,6 +102,7 @@ public JdbcTableHandle(
         this.otherReferencedTables = otherReferencedTables.map(ImmutableSet::copyOf);
         this.nextSyntheticColumnId = nextSyntheticColumnId;
         this.authorization = requireNonNull(authorization, "authorization is null");
+        this.updateAssignments = requireNonNull(updateAssignments, "updateAssignments is null");
     }
 
     public JdbcTableHandle intersectedWithConstraint(TupleDomain<ColumnHandle> newConstraint)
@@ -109,7 +116,28 @@ public JdbcTableHandle intersectedWithConstraint(TupleDomain<ColumnHandle> newCo
                 columns,
                 otherReferencedTables,
                 nextSyntheticColumnId,
-                authorization);
+                authorization,
+                updateAssignments);
+    }
+
+    public JdbcTableHandle withAssignments(Map<ColumnHandle, Constant> assignments)
+    {
+        return new JdbcTableHandle(
+                relationHandle,
+                constraint,
+                constraintExpressions,
+                sortOrder,
+                limit,
+                columns,
+                otherReferencedTables,
+                nextSyntheticColumnId,
+                authorization,
+                assignments.entrySet()
+                        .stream()
+                        .map(e -> {
+                            return new JdbcAssignmentItem((JdbcColumnHandle) e.getKey(), new QueryParameter(e.getValue().getType(), Optional.ofNullable(e.getValue().getValue())));
+                        })
+                        .collect(toImmutableList()));
     }
 
     public JdbcNamedRelationHandle asPlainTable()
@@ -168,6 +196,12 @@ public Optional<Set<SchemaTableName>> getOtherReferencedTables()
         return otherReferencedTables;
     }
 
+    @JsonProperty
+    public List<JdbcAssignmentItem> getUpdateAssignments()
+    {
+        return updateAssignments;
+    }
+
     /**
      * Remote tables referenced by the query. {@link Optional#empty()} when unknown.
      */
@@ -236,13 +270,14 @@ public boolean equals(Object obj)
                 Objects.equals(this.limit, o.limit) &&
                 Objects.equals(this.columns, o.columns) &&
                 this.nextSyntheticColumnId == o.nextSyntheticColumnId &&
-                Objects.equals(this.authorization, o.authorization);
+                Objects.equals(this.authorization, o.authorization) &&
+                Objects.equals(this.updateAssignments, o.updateAssignments);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(relationHandle, constraint, constraintExpressions, sortOrder, limit, columns, nextSyntheticColumnId, authorization);
+        return Objects.hash(relationHandle, constraint, constraintExpressions, sortOrder, limit, columns, nextSyntheticColumnId, authorization, updateAssignments);
     }
 
     @Override
@@ -267,6 +302,10 @@ else if (!constraint.isAll()) {
         limit.ifPresent(value -> builder.append(" limit=").append(value));
         columns.ifPresent(value -> builder.append(" columns=").append(value));
         authorization.ifPresent(value -> builder.append(" authorization=").append(value));
+        if (!updateAssignments.isEmpty()) {
+            builder.append(" updateAssignments=");
+            updateAssignments.forEach(builder::append);
+        }
         return builder.toString();
     }
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcTransactionManager.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcTransactionManager.java
index 4a334b0c5910..050d1d38d123 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcTransactionManager.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcTransactionManager.java
@@ -13,11 +13,10 @@
  */
 package io.trino.plugin.jdbc;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcWriteConfig.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcWriteConfig.java
index 957781f05eeb..4e086d1deae7 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcWriteConfig.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcWriteConfig.java
@@ -15,15 +15,16 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 
 public class JdbcWriteConfig
 {
-    static final int MAX_ALLOWED_WRITE_BATCH_SIZE = 1_000_000;
+    public static final int MAX_ALLOWED_WRITE_BATCH_SIZE = 10_000_000;
+    static final int DEFAULT_WRITE_PARALELLISM = 8;
 
     private int writeBatchSize = 1000;
+    private int writeParallelism = DEFAULT_WRITE_PARALELLISM;
 
     // Do not create temporary table during insert.
     // This means that the write operation can fail and leave the table in an inconsistent state.
@@ -57,4 +58,19 @@ public JdbcWriteConfig setNonTransactionalInsert(boolean nonTransactionalInsert)
         this.nonTransactionalInsert = nonTransactionalInsert;
         return this;
     }
+
+    @Min(1)
+    @Max(128)
+    public int getWriteParallelism()
+    {
+        return writeParallelism;
+    }
+
+    @Config("write.parallelism")
+    @ConfigDescription("Maximum number of parallel write tasks")
+    public JdbcWriteConfig setWriteParallelism(int writeParallelism)
+    {
+        this.writeParallelism = writeParallelism;
+        return this;
+    }
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcWriteSessionProperties.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcWriteSessionProperties.java
index 038998229b7d..78e6d12d2298 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcWriteSessionProperties.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcWriteSessionProperties.java
@@ -14,13 +14,12 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.plugin.jdbc.JdbcWriteConfig.MAX_ALLOWED_WRITE_BATCH_SIZE;
@@ -34,6 +33,7 @@ public class JdbcWriteSessionProperties
 {
     public static final String WRITE_BATCH_SIZE = "write_batch_size";
     public static final String NON_TRANSACTIONAL_INSERT = "non_transactional_insert";
+    public static final String WRITE_PARALLELISM = "write_parallelism";
 
     private final List<PropertyMetadata<?>> properties;
 
@@ -52,6 +52,11 @@ public JdbcWriteSessionProperties(JdbcWriteConfig writeConfig)
                         "Do not use temporary table on insert to table",
                         writeConfig.isNonTransactionalInsert(),
                         false))
+                .add(integerProperty(
+                        WRITE_PARALLELISM,
+                        "Maximum number of parallel write tasks",
+                        writeConfig.getWriteParallelism(),
+                        false))
                 .build();
     }
 
@@ -66,6 +71,11 @@ public static int getWriteBatchSize(ConnectorSession session)
         return session.getProperty(WRITE_BATCH_SIZE, Integer.class);
     }
 
+    public static int getWriteParallelism(ConnectorSession session)
+    {
+        return session.getProperty(WRITE_PARALLELISM, Integer.class);
+    }
+
     public static boolean isNonTransactionalInsert(ConnectorSession session)
     {
         return session.getProperty(NON_TRANSACTIONAL_INSERT, Boolean.class);
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/LazyConnectionFactory.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/LazyConnectionFactory.java
index a32c6fa8ee24..284cc1ef8d01 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/LazyConnectionFactory.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/LazyConnectionFactory.java
@@ -13,12 +13,11 @@
  */
 package io.trino.plugin.jdbc;
 
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorSession;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
+import jakarta.annotation.Nullable;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -33,7 +32,7 @@ public final class LazyConnectionFactory
     private final ConnectionFactory delegate;
 
     @Inject
-    public LazyConnectionFactory(@ForLazyConnectionFactory ConnectionFactory delegate)
+    public LazyConnectionFactory(RetryingConnectionFactory delegate)
     {
         this.delegate = requireNonNull(delegate, "delegate is null");
     }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/MaxDomainCompactionThreshold.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/MaxDomainCompactionThreshold.java
index 79b235d0379c..6c2207599b39 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/MaxDomainCompactionThreshold.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/MaxDomainCompactionThreshold.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface MaxDomainCompactionThreshold
 {
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/QueryBuilder.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/QueryBuilder.java
index 1a71fd4aca4d..52cb58e80cb5 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/QueryBuilder.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/QueryBuilder.java
@@ -60,6 +60,15 @@ PreparedQuery prepareDeleteQuery(
             TupleDomain<ColumnHandle> tupleDomain,
             Optional<ParameterizedExpression> additionalPredicate);
 
+    PreparedQuery prepareUpdateQuery(
+            JdbcClient client,
+            ConnectorSession session,
+            Connection connection,
+            JdbcNamedRelationHandle baseRelation,
+            TupleDomain<ColumnHandle> tupleDomain,
+            Optional<ParameterizedExpression> additionalPredicate,
+            List<JdbcAssignmentItem> assignments);
+
     PreparedStatement prepareStatement(
             JdbcClient client,
             ConnectorSession session,
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/RemoteQueryCancellationModule.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/RemoteQueryCancellationModule.java
index a83cf38a77c7..4f322cf338c0 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/RemoteQueryCancellationModule.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/RemoteQueryCancellationModule.java
@@ -14,15 +14,14 @@
 package io.trino.plugin.jdbc;
 
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Key;
 import com.google.inject.Module;
+import com.google.inject.Provider;
 import com.google.inject.Scopes;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.plugin.base.CatalogName;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.util.concurrent.ExecutorService;
 
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/RetryingConnectionFactory.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/RetryingConnectionFactory.java
index 6063feaa0ecf..0993cdb26e59 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/RetryingConnectionFactory.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/RetryingConnectionFactory.java
@@ -14,15 +14,17 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.base.Throwables;
+import com.google.inject.Inject;
 import dev.failsafe.Failsafe;
 import dev.failsafe.FailsafeException;
 import dev.failsafe.RetryPolicy;
+import io.trino.plugin.jdbc.jmx.StatisticsAwareConnectionFactory;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.sql.SQLRecoverableException;
+import java.sql.SQLTransientException;
 
 import static java.time.temporal.ChronoUnit.MILLIS;
 import static java.time.temporal.ChronoUnit.SECONDS;
@@ -31,19 +33,22 @@
 public class RetryingConnectionFactory
         implements ConnectionFactory
 {
-    private static final RetryPolicy<Object> RETRY_POLICY = RetryPolicy.builder()
-            .withMaxDuration(java.time.Duration.of(30, SECONDS))
-            .withMaxAttempts(5)
-            .withBackoff(50, 5_000, MILLIS, 4)
-            .handleIf(RetryingConnectionFactory::isSqlRecoverableException)
-            .abortOn(TrinoException.class)
-            .build();
+    private final RetryPolicy<Object> retryPolicy;
 
     private final ConnectionFactory delegate;
 
-    public RetryingConnectionFactory(ConnectionFactory delegate)
+    @Inject
+    public RetryingConnectionFactory(StatisticsAwareConnectionFactory delegate, RetryStrategy retryStrategy)
     {
+        requireNonNull(retryStrategy);
         this.delegate = requireNonNull(delegate, "delegate is null");
+        this.retryPolicy = RetryPolicy.builder()
+                .withMaxDuration(java.time.Duration.of(30, SECONDS))
+                .withMaxAttempts(5)
+                .withBackoff(50, 5_000, MILLIS, 4)
+                .handleIf(retryStrategy::isExceptionRecoverable)
+                .abortOn(TrinoException.class)
+                .build();
     }
 
     @Override
@@ -51,7 +56,7 @@ public Connection openConnection(ConnectorSession session)
             throws SQLException
     {
         try {
-            return Failsafe.with(RETRY_POLICY)
+            return Failsafe.with(retryPolicy)
                     .get(() -> delegate.openConnection(session));
         }
         catch (FailsafeException ex) {
@@ -69,9 +74,19 @@ public void close()
         delegate.close();
     }
 
-    private static boolean isSqlRecoverableException(Throwable exception)
+    public interface RetryStrategy
     {
-        return Throwables.getCausalChain(exception).stream()
-                .anyMatch(SQLRecoverableException.class::isInstance);
+        boolean isExceptionRecoverable(Throwable exception);
+    }
+
+    public static class DefaultRetryStrategy
+            implements RetryStrategy
+    {
+        @Override
+        public boolean isExceptionRecoverable(Throwable exception)
+        {
+            return Throwables.getCausalChain(exception).stream()
+                    .anyMatch(SQLTransientException.class::isInstance);
+        }
     }
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/RetryingConnectionFactoryModule.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/RetryingConnectionFactoryModule.java
new file mode 100644
index 000000000000..a0815d38e84c
--- /dev/null
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/RetryingConnectionFactoryModule.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed 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 io.trino.plugin.jdbc;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Scopes;
+import io.trino.plugin.jdbc.RetryingConnectionFactory.DefaultRetryStrategy;
+import io.trino.plugin.jdbc.RetryingConnectionFactory.RetryStrategy;
+
+import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
+
+public class RetryingConnectionFactoryModule
+        extends AbstractModule
+{
+    @Override
+    public void configure()
+    {
+        bind(RetryingConnectionFactory.class).in(Scopes.SINGLETON);
+        newOptionalBinder(binder(), RetryStrategy.class)
+                .setDefault()
+                .to(DefaultRetryStrategy.class)
+                .in(Scopes.SINGLETON);
+    }
+}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ReusableConnectionFactory.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ReusableConnectionFactory.java
index 03792f9e5e0c..1250c1aa5bed 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ReusableConnectionFactory.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ReusableConnectionFactory.java
@@ -16,14 +16,13 @@
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.RemovalNotification;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.time.Duration;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ReusableConnectionFactoryModule.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ReusableConnectionFactoryModule.java
index 390e3daf6db0..c613808e445b 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ReusableConnectionFactoryModule.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ReusableConnectionFactoryModule.java
@@ -17,11 +17,10 @@
 import com.google.inject.Key;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.spi.NodeManager;
 
-import javax.inject.Singleton;
-
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
 
 public final class ReusableConnectionFactoryModule
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/StatsCollecting.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/StatsCollecting.java
index afbd269ad8de..1807f2c51d76 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/StatsCollecting.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/StatsCollecting.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface StatsCollecting
 {
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/TracingDataSource.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/TracingDataSource.java
new file mode 100644
index 000000000000..c9a1a91dca7f
--- /dev/null
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/TracingDataSource.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed 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 io.trino.plugin.jdbc;
+
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.jdbc.datasource.OpenTelemetryDataSource;
+
+import javax.sql.DataSource;
+
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.SQLException;
+import java.util.Properties;
+import java.util.logging.Logger;
+
+import static java.util.Objects.requireNonNull;
+
+public class TracingDataSource
+{
+    private final OpenTelemetry openTelemetry;
+    private final Driver driver;
+    private final String connectionUrl;
+
+    public TracingDataSource(OpenTelemetry openTelemetry, Driver driver, String connectionUrl)
+    {
+        this.openTelemetry = requireNonNull(openTelemetry, "openTelemetry is null");
+        this.driver = requireNonNull(driver, "driver is null");
+        this.connectionUrl = requireNonNull(connectionUrl, "connectionUrl is null");
+    }
+
+    public Connection getConnection(Properties properties)
+            throws SQLException
+    {
+        DataSource dataSource = new JdbcDataSource(driver, connectionUrl, properties);
+        try (OpenTelemetryDataSource openTelemetryDataSource = new OpenTelemetryDataSource(dataSource, openTelemetry)) {
+            return openTelemetryDataSource.getConnection();
+        }
+        catch (Exception e) {
+            throw new SQLException(e);
+        }
+    }
+
+    private static class JdbcDataSource
+            implements DataSource
+    {
+        private final Driver driver;
+        private final String connectionUrl;
+        private final Properties properties;
+
+        public JdbcDataSource(Driver driver, String connectionUrl, Properties properties)
+        {
+            this.driver = requireNonNull(driver, "driver is null");
+            this.connectionUrl = requireNonNull(connectionUrl, "connectionUrl is null");
+            this.properties = requireNonNull(properties, "properties is null");
+        }
+
+        @Override
+        public Connection getConnection()
+                throws SQLException
+        {
+            return driver.connect(connectionUrl, properties);
+        }
+
+        @Override
+        public Connection getConnection(String username, String password)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public PrintWriter getLogWriter()
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void setLogWriter(PrintWriter out)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void setLoginTimeout(int seconds)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public int getLoginTimeout()
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Logger getParentLogger()
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public <T> T unwrap(Class<T> iface)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean isWrapperFor(Class<?> iface)
+        {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/TypeHandlingJdbcConfig.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/TypeHandlingJdbcConfig.java
index 853b94faddd1..6ae730fee3db 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/TypeHandlingJdbcConfig.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/TypeHandlingJdbcConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.LegacyConfig;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class TypeHandlingJdbcConfig
 {
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/TypeHandlingJdbcSessionProperties.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/TypeHandlingJdbcSessionProperties.java
index 9e4757ea6476..9ef59f81cc4e 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/TypeHandlingJdbcSessionProperties.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/TypeHandlingJdbcSessionProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.spi.session.PropertyMetadata.enumProperty;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/CredentialProviderModule.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/CredentialProviderModule.java
index afb845ca921a..64823d3a46f6 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/CredentialProviderModule.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/CredentialProviderModule.java
@@ -16,13 +16,12 @@
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.airlift.configuration.ConfigurationFactory;
 import io.trino.plugin.jdbc.credential.file.ConfigFileBasedCredentialProviderConfig;
 import io.trino.plugin.jdbc.credential.keystore.KeyStoreBasedCredentialProviderConfig;
 
-import javax.inject.Singleton;
-
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/CredentialProviderTypeConfig.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/CredentialProviderTypeConfig.java
index df0ae78e1728..8886ed1a2108 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/CredentialProviderTypeConfig.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/CredentialProviderTypeConfig.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.jdbc.credential;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import static io.trino.plugin.jdbc.credential.CredentialProviderType.INLINE;
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/ExtraCredentialProvider.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/ExtraCredentialProvider.java
index 4a64578d191d..100977f71f27 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/ExtraCredentialProvider.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/ExtraCredentialProvider.java
@@ -13,10 +13,9 @@
  */
 package io.trino.plugin.jdbc.credential;
 
+import com.google.inject.Inject;
 import io.trino.spi.security.ConnectorIdentity;
 
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.Optional;
 
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/ForExtraCredentialProvider.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/ForExtraCredentialProvider.java
index c47cdb76f7bd..640849638ad4 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/ForExtraCredentialProvider.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/ForExtraCredentialProvider.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.jdbc.credential;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForExtraCredentialProvider
 {
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/file/ConfigFileBasedCredentialProviderConfig.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/file/ConfigFileBasedCredentialProviderConfig.java
index bd3c9424ce0d..48659f54fff7 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/file/ConfigFileBasedCredentialProviderConfig.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/file/ConfigFileBasedCredentialProviderConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class ConfigFileBasedCredentialProviderConfig
 {
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/keystore/KeyStoreBasedCredentialProviderConfig.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/keystore/KeyStoreBasedCredentialProviderConfig.java
index 7f7e95f8cd7a..c32f943e2189 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/keystore/KeyStoreBasedCredentialProviderConfig.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/credential/keystore/KeyStoreBasedCredentialProviderConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class KeyStoreBasedCredentialProviderConfig
 {
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/ExpressionMappingParser.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/ExpressionMappingParser.java
index ac975cef7567..f06e20be4a76 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/ExpressionMappingParser.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/ExpressionMappingParser.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.jdbc.expression;
 
 import com.google.common.collect.ImmutableMap;
+import org.antlr.v4.runtime.ANTLRErrorListener;
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
@@ -21,7 +22,6 @@
 import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.Recognizer;
 import org.antlr.v4.runtime.atn.PredictionMode;
-import org.antlr.v4.runtime.misc.ParseCancellationException;
 
 import java.util.Map;
 import java.util.Set;
@@ -32,7 +32,7 @@
 
 public class ExpressionMappingParser
 {
-    private static final BaseErrorListener ERROR_LISTENER = new BaseErrorListener()
+    private static final ANTLRErrorListener ERROR_LISTENER = new BaseErrorListener()
     {
         @Override
         public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String message, RecognitionException e)
@@ -77,7 +77,7 @@ public Object invokeParser(String input, Function<ConnectorExpressionPatternPars
                 parser.getInterpreter().setPredictionMode(PredictionMode.SLL);
                 tree = parseFunction.apply(parser);
             }
-            catch (ParseCancellationException ex) {
+            catch (IllegalArgumentException ex) {
                 // if we fail, parse with LL mode
                 tokenStream.seek(0); // rewind input stream
                 parser.reset();
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/ExpressionPatternBuilder.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/ExpressionPatternBuilder.java
index 81cac94ae034..2a5ef7a06550 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/ExpressionPatternBuilder.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/ExpressionPatternBuilder.java
@@ -14,10 +14,9 @@
 package io.trino.plugin.jdbc.expression;
 
 import com.google.common.collect.ImmutableMap;
+import jakarta.annotation.Nullable;
 import org.antlr.v4.runtime.ParserRuleContext;
 
-import javax.annotation.Nullable;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/RewriteLikeEscapeWithCaseSensitivity.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/RewriteLikeEscapeWithCaseSensitivity.java
new file mode 100644
index 000000000000..27f7264e6b8e
--- /dev/null
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/RewriteLikeEscapeWithCaseSensitivity.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed 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 io.trino.plugin.jdbc.expression;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.matching.Capture;
+import io.trino.matching.Captures;
+import io.trino.matching.Pattern;
+import io.trino.plugin.base.expression.ConnectorExpressionRule;
+import io.trino.plugin.jdbc.CaseSensitivity;
+import io.trino.plugin.jdbc.JdbcColumnHandle;
+import io.trino.plugin.jdbc.QueryParameter;
+import io.trino.spi.expression.Call;
+import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Variable;
+import io.trino.spi.type.VarcharType;
+
+import java.util.Optional;
+
+import static io.trino.matching.Capture.newCapture;
+import static io.trino.plugin.base.expression.ConnectorExpressionPatterns.argument;
+import static io.trino.plugin.base.expression.ConnectorExpressionPatterns.argumentCount;
+import static io.trino.plugin.base.expression.ConnectorExpressionPatterns.call;
+import static io.trino.plugin.base.expression.ConnectorExpressionPatterns.expression;
+import static io.trino.plugin.base.expression.ConnectorExpressionPatterns.functionName;
+import static io.trino.plugin.base.expression.ConnectorExpressionPatterns.type;
+import static io.trino.plugin.jdbc.CaseSensitivity.CASE_INSENSITIVE;
+import static io.trino.spi.expression.StandardFunctions.LIKE_FUNCTION_NAME;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static java.lang.String.format;
+
+public class RewriteLikeEscapeWithCaseSensitivity
+        implements ConnectorExpressionRule<Call, ParameterizedExpression>
+{
+    private static final Capture<ConnectorExpression> LIKE_VALUE = newCapture();
+    private static final Capture<ConnectorExpression> LIKE_PATTERN = newCapture();
+    private static final Capture<ConnectorExpression> ESCAPE_PATTERN = newCapture();
+    private static final Pattern<Call> PATTERN = call()
+            .with(functionName().equalTo(LIKE_FUNCTION_NAME))
+            .with(type().equalTo(BOOLEAN))
+            .with(argumentCount().equalTo(3))
+            .with(argument(0).matching(expression().capturedAs(LIKE_VALUE).with(type().matching(VarcharType.class::isInstance))))
+            .with(argument(1).matching(expression().capturedAs(LIKE_PATTERN).with(type().matching(VarcharType.class::isInstance))))
+            .with(argument(2).matching(expression().capturedAs(ESCAPE_PATTERN).with(type().matching(VarcharType.class::isInstance))));
+
+    @Override
+    public Pattern<Call> getPattern()
+    {
+        return PATTERN;
+    }
+
+    @Override
+    public Optional<ParameterizedExpression> rewrite(Call expression, Captures captures, RewriteContext<ParameterizedExpression> context)
+    {
+        ConnectorExpression capturedValue = captures.get(LIKE_VALUE);
+        if (capturedValue instanceof Variable variable) {
+            JdbcColumnHandle columnHandle = (JdbcColumnHandle) context.getAssignment(variable.getName());
+            Optional<CaseSensitivity> caseSensitivity = columnHandle.getJdbcTypeHandle().getCaseSensitivity();
+            if (caseSensitivity.orElse(CASE_INSENSITIVE) == CASE_INSENSITIVE) {
+                return Optional.empty();
+            }
+        }
+        Optional<ParameterizedExpression> value = context.defaultRewrite(capturedValue);
+        if (value.isEmpty()) {
+            return Optional.empty();
+        }
+
+        ImmutableList.Builder<QueryParameter> parameters = ImmutableList.builder();
+        parameters.addAll(value.get().parameters());
+        Optional<ParameterizedExpression> pattern = context.defaultRewrite(captures.get(LIKE_PATTERN));
+        if (pattern.isEmpty()) {
+            return Optional.empty();
+        }
+        parameters.addAll(pattern.get().parameters());
+
+        Optional<ParameterizedExpression> escape = context.defaultRewrite(captures.get(ESCAPE_PATTERN));
+        if (escape.isEmpty()) {
+            return Optional.empty();
+        }
+        parameters.addAll(escape.get().parameters());
+        return Optional.of(new ParameterizedExpression(format("%s LIKE %s ESCAPE %s", value.get().expression(), pattern.get().expression(), escape.get().expression()), parameters.build()));
+    }
+}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/RewriteLikeWithCaseSensitivity.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/RewriteLikeWithCaseSensitivity.java
new file mode 100644
index 000000000000..5532af4eaa4b
--- /dev/null
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/RewriteLikeWithCaseSensitivity.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed 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 io.trino.plugin.jdbc.expression;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.matching.Capture;
+import io.trino.matching.Captures;
+import io.trino.matching.Pattern;
+import io.trino.plugin.base.expression.ConnectorExpressionRule;
+import io.trino.plugin.jdbc.CaseSensitivity;
+import io.trino.plugin.jdbc.JdbcColumnHandle;
+import io.trino.plugin.jdbc.QueryParameter;
+import io.trino.spi.expression.Call;
+import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Variable;
+import io.trino.spi.type.VarcharType;
+
+import java.util.Optional;
+
+import static io.trino.matching.Capture.newCapture;
+import static io.trino.plugin.base.expression.ConnectorExpressionPatterns.argument;
+import static io.trino.plugin.base.expression.ConnectorExpressionPatterns.argumentCount;
+import static io.trino.plugin.base.expression.ConnectorExpressionPatterns.call;
+import static io.trino.plugin.base.expression.ConnectorExpressionPatterns.expression;
+import static io.trino.plugin.base.expression.ConnectorExpressionPatterns.functionName;
+import static io.trino.plugin.base.expression.ConnectorExpressionPatterns.type;
+import static io.trino.plugin.jdbc.CaseSensitivity.CASE_INSENSITIVE;
+import static io.trino.spi.expression.StandardFunctions.LIKE_FUNCTION_NAME;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static java.lang.String.format;
+
+public class RewriteLikeWithCaseSensitivity
+        implements ConnectorExpressionRule<Call, ParameterizedExpression>
+{
+    private static final Capture<ConnectorExpression> LIKE_VALUE = newCapture();
+    private static final Capture<ConnectorExpression> LIKE_PATTERN = newCapture();
+    private static final Pattern<Call> PATTERN = call()
+            .with(functionName().equalTo(LIKE_FUNCTION_NAME))
+            .with(type().equalTo(BOOLEAN))
+            .with(argumentCount().equalTo(2))
+            .with(argument(0).matching(expression().capturedAs(LIKE_VALUE).with(type().matching(VarcharType.class::isInstance))))
+            .with(argument(1).matching(expression().capturedAs(LIKE_PATTERN).with(type().matching(VarcharType.class::isInstance))));
+
+    @Override
+    public Pattern<Call> getPattern()
+    {
+        return PATTERN;
+    }
+
+    @Override
+    public Optional<ParameterizedExpression> rewrite(Call expression, Captures captures, RewriteContext<ParameterizedExpression> context)
+    {
+        ConnectorExpression capturedValue = captures.get(LIKE_VALUE);
+        if (capturedValue instanceof Variable variable) {
+            JdbcColumnHandle columnHandle = (JdbcColumnHandle) context.getAssignment(variable.getName());
+            Optional<CaseSensitivity> caseSensitivity = columnHandle.getJdbcTypeHandle().getCaseSensitivity();
+            if (caseSensitivity.orElse(CASE_INSENSITIVE) == CASE_INSENSITIVE) {
+                return Optional.empty();
+            }
+        }
+        Optional<ParameterizedExpression> value = context.defaultRewrite(capturedValue);
+        if (value.isEmpty()) {
+            return Optional.empty();
+        }
+
+        ImmutableList.Builder<QueryParameter> parameters = ImmutableList.builder();
+        parameters.addAll(value.get().parameters());
+        Optional<ParameterizedExpression> pattern = context.defaultRewrite(captures.get(LIKE_PATTERN));
+        if (pattern.isEmpty()) {
+            return Optional.empty();
+        }
+        parameters.addAll(pattern.get().parameters());
+        return Optional.of(new ParameterizedExpression(format("%s LIKE %s", value.get().expression(), pattern.get().expression()), parameters.build()));
+    }
+}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/JdbcApiStats.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/JdbcApiStats.java
index 876684714db3..76f646604f18 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/JdbcApiStats.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/JdbcApiStats.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.jdbc.jmx;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.stats.CounterStat;
 import io.airlift.stats.TimeStat;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 @ThreadSafe
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/JdbcClientStats.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/JdbcClientStats.java
index 1ed0947a3de2..01e90fc63527 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/JdbcClientStats.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/JdbcClientStats.java
@@ -64,6 +64,7 @@ public final class JdbcClientStats
     private final JdbcApiStats convertPredicate = new JdbcApiStats();
     private final JdbcApiStats getTableScanRedirection = new JdbcApiStats();
     private final JdbcApiStats delete = new JdbcApiStats();
+    private final JdbcApiStats update = new JdbcApiStats();
     private final JdbcApiStats truncateTable = new JdbcApiStats();
 
     @Managed
@@ -388,6 +389,13 @@ public JdbcApiStats getDelete()
         return delete;
     }
 
+    @Managed
+    @Nested
+    public JdbcApiStats getUpdate()
+    {
+        return update;
+    }
+
     @Managed
     @Nested
     public JdbcApiStats getTruncateTable()
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/StatisticsAwareConnectionFactory.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/StatisticsAwareConnectionFactory.java
index 6c9153997a06..9f59238ba790 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/StatisticsAwareConnectionFactory.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/StatisticsAwareConnectionFactory.java
@@ -13,7 +13,9 @@
  */
 package io.trino.plugin.jdbc.jmx;
 
+import com.google.inject.Inject;
 import io.trino.plugin.jdbc.ConnectionFactory;
+import io.trino.plugin.jdbc.ForBaseJdbc;
 import io.trino.spi.connector.ConnectorSession;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
@@ -30,7 +32,8 @@ public class StatisticsAwareConnectionFactory
     private final JdbcApiStats closeConnection = new JdbcApiStats();
     private final ConnectionFactory delegate;
 
-    public StatisticsAwareConnectionFactory(ConnectionFactory delegate)
+    @Inject
+    public StatisticsAwareConnectionFactory(@ForBaseJdbc ConnectionFactory delegate)
     {
         this.delegate = requireNonNull(delegate, "delegate is null");
     }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/StatisticsAwareJdbcClient.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/StatisticsAwareJdbcClient.java
index 62e70f57f36f..ae1e01d029e9 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/StatisticsAwareJdbcClient.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/jmx/StatisticsAwareJdbcClient.java
@@ -56,6 +56,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Set;
 
@@ -144,6 +145,12 @@ public WriteMapping toWriteMapping(ConnectorSession session, Type type)
         return stats.getToWriteMapping().wrap(() -> delegate().toWriteMapping(session, type));
     }
 
+    @Override
+    public Optional<Type> getSupportedType(ConnectorSession session, Type type)
+    {
+        return delegate.getSupportedType(session, type);
+    }
+
     @Override
     public boolean supportsAggregationPushdown(ConnectorSession session, JdbcTableHandle table, List<AggregateFunction> aggregates, Map<String, ColumnHandle> assignments, List<List<ColumnHandle>> groupingSets)
     {
@@ -399,9 +406,9 @@ public void createSchema(ConnectorSession session, String schemaName)
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
-        stats.getDropSchema().wrap(() -> delegate().dropSchema(session, schemaName));
+        stats.getDropSchema().wrap(() -> delegate().dropSchema(session, schemaName, cascade));
     }
 
     @Override
@@ -446,9 +453,21 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
         return stats.getDelete().wrap(() -> delegate().delete(session, handle));
     }
 
+    @Override
+    public OptionalLong update(ConnectorSession session, JdbcTableHandle handle)
+    {
+        return stats.getUpdate().wrap(() -> delegate().update(session, handle));
+    }
+
     @Override
     public void truncateTable(ConnectorSession session, JdbcTableHandle handle)
     {
         stats.getTruncateTable().wrap(() -> delegate().truncateTable(session, handle));
     }
+
+    @Override
+    public OptionalInt getMaxWriteParallelism(ConnectorSession session)
+    {
+        return delegate().getMaxWriteParallelism(session);
+    }
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/logging/FormatBasedRemoteQueryModifier.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/logging/FormatBasedRemoteQueryModifier.java
index e1ecb6fb2e9b..360e05927451 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/logging/FormatBasedRemoteQueryModifier.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/logging/FormatBasedRemoteQueryModifier.java
@@ -14,93 +14,39 @@
 package io.trino.plugin.jdbc.logging;
 
 import com.google.inject.Inject;
+import io.trino.plugin.base.logging.FormatInterpolator;
+import io.trino.plugin.base.logging.SessionInterpolatedValues;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.plugin.jdbc.JdbcErrorCode.JDBC_NON_TRANSIENT_ERROR;
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class FormatBasedRemoteQueryModifier
         implements RemoteQueryModifier
 {
-    private final String commentFormat;
+    private final FormatInterpolator<ConnectorSession> interpolator;
 
     @Inject
     public FormatBasedRemoteQueryModifier(FormatBasedRemoteQueryModifierConfig config)
     {
-        this.commentFormat = requireNonNull(config, "config is null").getFormat();
+        String commentFormat = requireNonNull(config, "config is null").getFormat();
         checkState(!commentFormat.isBlank(), "comment format is blank");
+        this.interpolator = new FormatInterpolator<>(commentFormat, SessionInterpolatedValues.values());
     }
 
     @Override
     public String apply(ConnectorSession session, String query)
     {
-        String message = commentFormat;
-        for (PredefinedValue predefinedValue : PredefinedValue.values()) {
-            if (message.contains(predefinedValue.getPredefinedValueCode())) {
-                message = message.replaceAll(predefinedValue.getMatchCase(), predefinedValue.value(session));
-            }
-        }
-        return query + " /*" + message + "*/";
+        return query + " /*" + checkForSqlInjection(interpolator.interpolate(session)) + "*/";
     }
 
-    enum PredefinedValue
+    private String checkForSqlInjection(String sql)
     {
-        QUERY_ID(ConnectorSession::getQueryId),
-        SOURCE(new SanitizedValuesProvider(session -> session.getSource().orElse(""), "$SOURCE")),
-        USER(ConnectorSession::getUser),
-        TRACE_TOKEN(new SanitizedValuesProvider(session -> session.getTraceToken().orElse(""), "$TRACE_TOKEN"));
-
-        private final Function<ConnectorSession, String> valueProvider;
-
-        PredefinedValue(Function<ConnectorSession, String> valueProvider)
-        {
-            this.valueProvider = valueProvider;
-        }
-
-        String getMatchCase()
-        {
-            return "\\$" + this.name();
-        }
-
-        String getPredefinedValueCode()
-        {
-            return "$" + this.name();
-        }
-
-        String value(ConnectorSession session)
-        {
-            return valueProvider.apply(session);
-        }
-    }
-
-    private static class SanitizedValuesProvider
-            implements Function<ConnectorSession, String>
-    {
-        private static final Predicate<String> VALIDATION_MATCHER = Pattern.compile("^[\\w_-]*$").asMatchPredicate();
-        private final Function<ConnectorSession, String> valueProvider;
-        private final String name;
-
-        private SanitizedValuesProvider(Function<ConnectorSession, String> valueProvider, String name)
-        {
-            this.valueProvider = requireNonNull(valueProvider, "valueProvider is null");
-            this.name = requireNonNull(name, "name is null");
-        }
-
-        @Override
-        public String apply(ConnectorSession session)
-        {
-            String value = valueProvider.apply(session);
-            if (VALIDATION_MATCHER.test(value)) {
-                return value;
-            }
-            throw new TrinoException(JDBC_NON_TRANSIENT_ERROR, format("Passed value %s as %s does not meet security criteria. It can contain only letters, digits, underscores and hyphens", value, name));
+        if (sql.contains("*/")) {
+            throw new TrinoException(JDBC_NON_TRANSIENT_ERROR, "Rendering metadata using 'query.comment-format' does not meet security criteria: " + sql);
         }
+        return sql;
     }
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/logging/FormatBasedRemoteQueryModifierConfig.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/logging/FormatBasedRemoteQueryModifierConfig.java
index 15533018c331..a699b99b6ab4 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/logging/FormatBasedRemoteQueryModifierConfig.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/logging/FormatBasedRemoteQueryModifierConfig.java
@@ -15,22 +15,13 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-import io.trino.plugin.jdbc.logging.FormatBasedRemoteQueryModifier.PredefinedValue;
+import io.trino.plugin.base.logging.SessionInterpolatedValues;
+import jakarta.validation.constraints.AssertTrue;
 
-import javax.validation.constraints.AssertTrue;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.MatchResult;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static java.util.stream.Collectors.joining;
+import static io.trino.plugin.base.logging.FormatInterpolator.hasValidPlaceholders;
 
 public class FormatBasedRemoteQueryModifierConfig
 {
-    private static final List<String> PREDEFINED_MATCHES = Arrays.stream(PredefinedValue.values()).map(PredefinedValue::getMatchCase).toList();
-    private static final Pattern VALIDATION_PATTERN = Pattern.compile("[\\w ,=]|" + String.join("|", PREDEFINED_MATCHES));
     private String format = "";
 
     @Config("query.comment-format")
@@ -49,10 +40,6 @@ public String getFormat()
     @AssertTrue(message = "Incorrect format it may consist of only letters, digits, underscores, commas, spaces, equal signs and predefined values")
     boolean isFormatValid()
     {
-        Matcher matcher = VALIDATION_PATTERN.matcher(format);
-        return matcher.results()
-                .map(MatchResult::group)
-                .collect(joining())
-                .equals(format);
+        return hasValidPlaceholders(format, SessionInterpolatedValues.values());
     }
 }
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/CachingIdentifierMapping.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/CachingIdentifierMapping.java
deleted file mode 100644
index 21850053b1a3..000000000000
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/CachingIdentifierMapping.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.jdbc.mapping;
-
-import com.google.common.base.CharMatcher;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import io.trino.collect.cache.NonKeyEvictableCache;
-import io.trino.plugin.jdbc.BaseJdbcClient;
-import io.trino.plugin.jdbc.mapping.IdentifierMappingModule.ForCachingIdentifierMapping;
-import io.trino.spi.TrinoException;
-import io.trino.spi.security.ConnectorIdentity;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Provider;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Function;
-
-import static com.google.common.base.MoreObjects.firstNonNull;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Verify.verify;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
-import static io.trino.plugin.jdbc.JdbcErrorCode.JDBC_ERROR;
-import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-public final class CachingIdentifierMapping
-        implements IdentifierMapping
-{
-    private final NonKeyEvictableCache<ConnectorIdentity, Mapping> remoteSchemaNames;
-    private final NonKeyEvictableCache<RemoteTableNameCacheKey, Mapping> remoteTableNames;
-    private final IdentifierMapping identifierMapping;
-    private final Provider<BaseJdbcClient> baseJdbcClient;
-
-    @Inject
-    public CachingIdentifierMapping(
-            MappingConfig mappingConfig,
-            @ForCachingIdentifierMapping IdentifierMapping identifierMapping,
-            Provider<BaseJdbcClient> baseJdbcClient)
-    {
-        CacheBuilder<Object, Object> remoteNamesCacheBuilder = CacheBuilder.newBuilder()
-                .expireAfterWrite(mappingConfig.getCaseInsensitiveNameMatchingCacheTtl().toMillis(), MILLISECONDS);
-        this.remoteSchemaNames = buildNonEvictableCacheWithWeakInvalidateAll(remoteNamesCacheBuilder);
-        this.remoteTableNames = buildNonEvictableCacheWithWeakInvalidateAll(remoteNamesCacheBuilder);
-
-        this.identifierMapping = requireNonNull(identifierMapping, "identifierMapping is null");
-        this.baseJdbcClient = requireNonNull(baseJdbcClient, "baseJdbcClient is null");
-    }
-
-    public void flushCache()
-    {
-        // Note: this may not invalidate ongoing loads (https://github.com/trinodb/trino/issues/10512, https://github.com/google/guava/issues/1881)
-        // This is acceptable, since this operation is invoked manually, and not relied upon for correctness.
-        remoteSchemaNames.invalidateAll();
-        remoteTableNames.invalidateAll();
-    }
-
-    @Override
-    public String fromRemoteSchemaName(String remoteSchemaName)
-    {
-        return identifierMapping.fromRemoteSchemaName(remoteSchemaName);
-    }
-
-    @Override
-    public String fromRemoteTableName(String remoteSchemaName, String remoteTableName)
-    {
-        return identifierMapping.fromRemoteTableName(remoteSchemaName, remoteTableName);
-    }
-
-    @Override
-    public String fromRemoteColumnName(String remoteColumnName)
-    {
-        return identifierMapping.fromRemoteColumnName(remoteColumnName);
-    }
-
-    @Override
-    public String toRemoteSchemaName(ConnectorIdentity identity, Connection connection, String schemaName)
-    {
-        requireNonNull(schemaName, "schemaName is null");
-        verify(CharMatcher.forPredicate(Character::isUpperCase).matchesNoneOf(schemaName), "Expected schema name from internal metadata to be lowercase: %s", schemaName);
-
-        try {
-            Mapping mapping = remoteSchemaNames.getIfPresent(identity);
-            if (mapping != null && !mapping.hasRemoteObject(schemaName)) {
-                // This might be a schema that has just been created. Force reload.
-                mapping = null;
-            }
-            if (mapping == null) {
-                mapping = createSchemaMapping(connection);
-                remoteSchemaNames.put(identity, mapping);
-            }
-            String remoteSchema = mapping.get(schemaName);
-            if (remoteSchema != null) {
-                return remoteSchema;
-            }
-        }
-        catch (RuntimeException e) {
-            throw new TrinoException(JDBC_ERROR, "Failed to find remote schema name: " + firstNonNull(e.getMessage(), e), e);
-        }
-
-        return identifierMapping.toRemoteSchemaName(identity, connection, schemaName);
-    }
-
-    @Override
-    public String toRemoteTableName(ConnectorIdentity identity, Connection connection, String remoteSchema, String tableName)
-    {
-        requireNonNull(remoteSchema, "remoteSchema is null");
-        requireNonNull(tableName, "tableName is null");
-        verify(CharMatcher.forPredicate(Character::isUpperCase).matchesNoneOf(tableName), "Expected table name from internal metadata to be lowercase: %s", tableName);
-
-        try {
-            RemoteTableNameCacheKey cacheKey = new RemoteTableNameCacheKey(identity, remoteSchema);
-            Mapping mapping = remoteTableNames.getIfPresent(cacheKey);
-            if (mapping != null && !mapping.hasRemoteObject(tableName)) {
-                // This might be a table that has just been created. Force reload.
-                mapping = null;
-            }
-            if (mapping == null) {
-                mapping = createTableMapping(connection, remoteSchema);
-                remoteTableNames.put(cacheKey, mapping);
-            }
-            String remoteTable = mapping.get(tableName);
-            if (remoteTable != null) {
-                return remoteTable;
-            }
-        }
-        catch (RuntimeException e) {
-            throw new TrinoException(JDBC_ERROR, "Failed to find remote table name: " + firstNonNull(e.getMessage(), e), e);
-        }
-
-        return identifierMapping.toRemoteTableName(identity, connection, remoteSchema, tableName);
-    }
-
-    @Override
-    public String toRemoteColumnName(Connection connection, String columnName)
-    {
-        return identifierMapping.toRemoteColumnName(connection, columnName);
-    }
-
-    private Mapping createSchemaMapping(Connection connection)
-    {
-        return createMapping(baseJdbcClient.get().listSchemas(connection), identifierMapping::fromRemoteSchemaName);
-    }
-
-    private Mapping createTableMapping(Connection connection, String remoteSchema)
-    {
-        return createMapping(
-                getTables(connection, remoteSchema),
-                remoteTableName -> identifierMapping.fromRemoteTableName(remoteSchema, remoteTableName));
-    }
-
-    private static Mapping createMapping(Collection<String> remoteNames, Function<String, String> mapping)
-    {
-        Map<String, String> map = new HashMap<>();
-        Set<String> duplicates = new HashSet<>();
-        for (String remoteName : remoteNames) {
-            String name = mapping.apply(remoteName);
-            if (duplicates.contains(name)) {
-                continue;
-            }
-            if (map.put(name, remoteName) != null) {
-                duplicates.add(name);
-                map.remove(name);
-            }
-        }
-        return new Mapping(map, duplicates);
-    }
-
-    private List<String> getTables(Connection connection, String remoteSchema)
-    {
-        try (ResultSet resultSet = baseJdbcClient.get().getTables(connection, Optional.of(remoteSchema), Optional.empty())) {
-            ImmutableList.Builder<String> tableNames = ImmutableList.builder();
-            while (resultSet.next()) {
-                tableNames.add(resultSet.getString("TABLE_NAME"));
-            }
-            return tableNames.build();
-        }
-        catch (SQLException e) {
-            throw new TrinoException(JDBC_ERROR, e);
-        }
-    }
-
-    private static final class Mapping
-    {
-        private final Map<String, String> mapping;
-        private final Set<String> duplicates;
-
-        public Mapping(Map<String, String> mapping, Set<String> duplicates)
-        {
-            this.mapping = ImmutableMap.copyOf(requireNonNull(mapping, "mapping is null"));
-            this.duplicates = ImmutableSet.copyOf(requireNonNull(duplicates, "duplicates is null"));
-        }
-
-        public boolean hasRemoteObject(String remoteName)
-        {
-            return mapping.containsKey(remoteName) || duplicates.contains(remoteName);
-        }
-
-        @Nullable
-        public String get(String remoteName)
-        {
-            checkArgument(!duplicates.contains(remoteName), "Ambiguous name: %s", remoteName);
-            return mapping.get(remoteName);
-        }
-    }
-}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/DefaultIdentifierMapping.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/DefaultIdentifierMapping.java
deleted file mode 100644
index 26c348ba58ac..000000000000
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/DefaultIdentifierMapping.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.jdbc.mapping;
-
-import io.trino.spi.TrinoException;
-import io.trino.spi.security.ConnectorIdentity;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-
-import static io.trino.plugin.jdbc.JdbcErrorCode.JDBC_ERROR;
-import static java.util.Locale.ENGLISH;
-
-public class DefaultIdentifierMapping
-        implements IdentifierMapping
-{
-    // Caching this on a field is LazyConnectorFactory friendly
-    private Boolean storesUpperCaseIdentifiers;
-
-    @Override
-    public String fromRemoteSchemaName(String remoteSchemaName)
-    {
-        return remoteSchemaName.toLowerCase(ENGLISH);
-    }
-
-    @Override
-    public String fromRemoteTableName(String remoteSchemaName, String remoteTableName)
-    {
-        return remoteTableName.toLowerCase(ENGLISH);
-    }
-
-    @Override
-    public String fromRemoteColumnName(String remoteColumnName)
-    {
-        return remoteColumnName.toLowerCase(ENGLISH);
-    }
-
-    @Override
-    public String toRemoteSchemaName(ConnectorIdentity identity, Connection connection, String schemaName)
-    {
-        return toRemoteIdentifier(connection, schemaName);
-    }
-
-    @Override
-    public String toRemoteTableName(ConnectorIdentity identity, Connection connection, String remoteSchema, String tableName)
-    {
-        return toRemoteIdentifier(connection, tableName);
-    }
-
-    @Override
-    public String toRemoteColumnName(Connection connection, String columnName)
-    {
-        return toRemoteIdentifier(connection, columnName);
-    }
-
-    private String toRemoteIdentifier(Connection connection, String identifier)
-    {
-        if (storesUpperCaseIdentifiers(connection)) {
-            return identifier.toUpperCase(ENGLISH);
-        }
-        return identifier;
-    }
-
-    private boolean storesUpperCaseIdentifiers(Connection connection)
-    {
-        if (storesUpperCaseIdentifiers != null) {
-            return storesUpperCaseIdentifiers;
-        }
-        try {
-            DatabaseMetaData metadata = connection.getMetaData();
-            storesUpperCaseIdentifiers = metadata.storesUpperCaseIdentifiers();
-            return storesUpperCaseIdentifiers;
-        }
-        catch (SQLException e) {
-            throw new TrinoException(JDBC_ERROR, e);
-        }
-    }
-}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/ForwardingIdentifierMapping.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/ForwardingIdentifierMapping.java
deleted file mode 100644
index ee5cb83c9c14..000000000000
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/ForwardingIdentifierMapping.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.jdbc.mapping;
-
-import io.trino.spi.security.ConnectorIdentity;
-
-import java.sql.Connection;
-import java.util.function.Supplier;
-
-import static java.util.Objects.requireNonNull;
-
-public abstract class ForwardingIdentifierMapping
-        implements IdentifierMapping
-{
-    public static IdentifierMapping of(Supplier<IdentifierMapping> delegateSupplier)
-    {
-        requireNonNull(delegateSupplier, "delegateSupplier is null");
-        return new ForwardingIdentifierMapping()
-        {
-            @Override
-            protected IdentifierMapping delegate()
-            {
-                return delegateSupplier.get();
-            }
-        };
-    }
-
-    protected abstract IdentifierMapping delegate();
-
-    @Override
-    public String fromRemoteSchemaName(String remoteSchemaName)
-    {
-        return delegate().fromRemoteSchemaName(remoteSchemaName);
-    }
-
-    @Override
-    public String fromRemoteTableName(String remoteSchemaName, String remoteTableName)
-    {
-        return delegate().fromRemoteTableName(remoteSchemaName, remoteTableName);
-    }
-
-    @Override
-    public String fromRemoteColumnName(String remoteColumnName)
-    {
-        return delegate().fromRemoteColumnName(remoteColumnName);
-    }
-
-    @Override
-    public String toRemoteSchemaName(ConnectorIdentity identity, Connection connection, String schemaName)
-    {
-        return delegate().toRemoteSchemaName(identity, connection, schemaName);
-    }
-
-    @Override
-    public String toRemoteTableName(ConnectorIdentity identity, Connection connection, String remoteSchema, String tableName)
-    {
-        return delegate().toRemoteTableName(identity, connection, remoteSchema, tableName);
-    }
-
-    @Override
-    public String toRemoteColumnName(Connection connection, String columnName)
-    {
-        return delegate().toRemoteColumnName(connection, columnName);
-    }
-}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/IdentifierMapping.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/IdentifierMapping.java
deleted file mode 100644
index 4e4e6027873c..000000000000
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/mapping/IdentifierMapping.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.jdbc.mapping;
-
-import io.trino.spi.security.ConnectorIdentity;
-
-import java.sql.Connection;
-
-public interface IdentifierMapping
-{
-    String fromRemoteSchemaName(String remoteSchemaName);
-
-    String fromRemoteTableName(String remoteSchemaName, String remoteTableName);
-
-    String fromRemoteColumnName(String remoteColumnName);
-
-    String toRemoteSchemaName(ConnectorIdentity identity, Connection connection, String schemaName);
-
-    String toRemoteTableName(ConnectorIdentity identity, Connection connection, String remoteSchema, String tableName);
-
-    String toRemoteColumnName(Connection connection, String columnName);
-}
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/procedure/FlushJdbcMetadataCacheProcedure.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/procedure/FlushJdbcMetadataCacheProcedure.java
index 93fdc3123374..78da58f40768 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/procedure/FlushJdbcMetadataCacheProcedure.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/procedure/FlushJdbcMetadataCacheProcedure.java
@@ -14,13 +14,12 @@
 package io.trino.plugin.jdbc.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.trino.plugin.base.mapping.CachingIdentifierMapping;
 import io.trino.plugin.jdbc.CachingJdbcClient;
-import io.trino.plugin.jdbc.mapping.CachingIdentifierMapping;
 import io.trino.spi.procedure.Procedure;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.lang.invoke.MethodHandle;
 import java.util.Optional;
 
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ptf/Procedure.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ptf/Procedure.java
index fc16067066a6..97323a917fdc 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ptf/Procedure.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ptf/Procedure.java
@@ -15,6 +15,8 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.airlift.slice.Slice;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorTableFunction;
 import io.trino.plugin.jdbc.JdbcColumnHandle;
@@ -22,21 +24,19 @@
 import io.trino.plugin.jdbc.JdbcProcedureHandle;
 import io.trino.plugin.jdbc.JdbcProcedureHandle.ProcedureQuery;
 import io.trino.plugin.jdbc.JdbcTransactionManager;
+import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.ptf.AbstractConnectorTableFunction;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-import io.trino.spi.ptf.Descriptor;
-import io.trino.spi.ptf.Descriptor.Field;
-import io.trino.spi.ptf.ScalarArgument;
-import io.trino.spi.ptf.ScalarArgumentSpecification;
-import io.trino.spi.ptf.TableFunctionAnalysis;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
+import io.trino.spi.function.table.AbstractConnectorTableFunction;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.Descriptor.Field;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.ScalarArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
 
 import java.util.List;
 import java.util.Map;
@@ -44,7 +44,7 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.spi.ptf.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
+import static io.trino.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
 
@@ -88,7 +88,11 @@ public ProcedureFunction(JdbcTransactionManager transactionManager)
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             ScalarArgument argument = (ScalarArgument) getOnlyElement(arguments.values());
             String procedureQuery = ((Slice) argument.getValue()).toStringUtf8();
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ptf/Query.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ptf/Query.java
index e2f0dd306f2f..7f708a7187fe 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ptf/Query.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ptf/Query.java
@@ -16,6 +16,8 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.airlift.slice.Slice;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorTableFunction;
 import io.trino.plugin.jdbc.JdbcColumnHandle;
@@ -23,21 +25,19 @@
 import io.trino.plugin.jdbc.JdbcTableHandle;
 import io.trino.plugin.jdbc.JdbcTransactionManager;
 import io.trino.plugin.jdbc.PreparedQuery;
+import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.ptf.AbstractConnectorTableFunction;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-import io.trino.spi.ptf.Descriptor;
-import io.trino.spi.ptf.Descriptor.Field;
-import io.trino.spi.ptf.ScalarArgument;
-import io.trino.spi.ptf.ScalarArgumentSpecification;
-import io.trino.spi.ptf.TableFunctionAnalysis;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
+import io.trino.spi.function.table.AbstractConnectorTableFunction;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.Descriptor.Field;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.ScalarArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
 
 import java.util.List;
 import java.util.Map;
@@ -45,7 +45,7 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.spi.ptf.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
+import static io.trino.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
 
@@ -88,7 +88,11 @@ public QueryFunction(JdbcTransactionManager transactionManager)
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             ScalarArgument argument = (ScalarArgument) getOnlyElement(arguments.values());
             String query = ((Slice) argument.getValue()).toStringUtf8();
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseAutomaticJoinPushdownTest.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseAutomaticJoinPushdownTest.java
index 57d5b31b1f9b..b287a33b0a3b 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseAutomaticJoinPushdownTest.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseAutomaticJoinPushdownTest.java
@@ -21,7 +21,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.sql.SqlExecutor;
 import io.trino.testing.sql.TestTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseCaseInsensitiveMappingTest.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseCaseInsensitiveMappingTest.java
index 4a15087eee02..5fc3f0d9c401 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseCaseInsensitiveMappingTest.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseCaseInsensitiveMappingTest.java
@@ -14,15 +14,15 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import io.airlift.log.Logging;
-import io.trino.plugin.jdbc.mapping.IdentifierMappingModule;
-import io.trino.plugin.jdbc.mapping.SchemaMappingRule;
-import io.trino.plugin.jdbc.mapping.TableMappingRule;
+import io.trino.plugin.base.mapping.IdentifierMappingModule;
+import io.trino.plugin.base.mapping.SchemaMappingRule;
+import io.trino.plugin.base.mapping.TableMappingRule;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.sql.SqlExecutor;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -32,14 +32,14 @@
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static io.airlift.log.Level.WARN;
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.updateRuleBasedIdentifierMappingFile;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.updateRuleBasedIdentifierMappingFile;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 // Tests are using JSON based identifier mapping which is one for all tests
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public abstract class BaseCaseInsensitiveMappingTest
         extends AbstractTestQueryFramework
 {
@@ -47,7 +47,7 @@ public abstract class BaseCaseInsensitiveMappingTest
 
     protected abstract SqlExecutor onRemoteDatabase();
 
-    @BeforeClass
+    @BeforeAll
     public void disableMappingRefreshVerboseLogging()
     {
         Logging logging = Logging.initialize();
@@ -90,11 +90,10 @@ public void testNonLowerCaseTableName()
             assertQuery(
                     "SELECT column_name FROM information_schema.columns WHERE table_name = 'nonlowercasetable'",
                     "VALUES 'lower_case_name', 'mixed_case_name', 'upper_case_name'");
-            assertEquals(
-                    computeActual("SHOW COLUMNS FROM someschema.nonlowercasetable").getMaterializedRows().stream()
+            assertThat(computeActual("SHOW COLUMNS FROM someschema.nonlowercasetable").getMaterializedRows().stream()
                             .map(row -> row.getField(0))
-                            .collect(toImmutableSet()),
-                    ImmutableSet.of("lower_case_name", "mixed_case_name", "upper_case_name"));
+                            .collect(toImmutableSet()))
+                    .containsOnly("lower_case_name", "mixed_case_name", "upper_case_name");
 
             // Note: until https://github.com/prestodb/presto/issues/2863 is resolved, this is *the* way to access the tables.
 
@@ -129,6 +128,8 @@ protected Optional<String> optionalFromDual()
     public void testSchemaNameClash()
             throws Exception
     {
+        updateRuleBasedIdentifierMappingFile(getMappingFile(), ImmutableList.of(), ImmutableList.of());
+
         String[] nameVariants = {"casesensitivename", "CaseSensitiveName", "CASESENSITIVENAME"};
         assertThat(Stream.of(nameVariants)
                 .map(name -> name.toLowerCase(ENGLISH))
@@ -158,6 +159,8 @@ public void testSchemaNameClash()
     public void testTableNameClash()
             throws Exception
     {
+        updateRuleBasedIdentifierMappingFile(getMappingFile(), ImmutableList.of(), ImmutableList.of());
+
         String[] nameVariants = {"casesensitivename", "CaseSensitiveName", "CASESENSITIVENAME"};
         assertThat(Stream.of(nameVariants)
                 .map(name -> name.toLowerCase(ENGLISH))
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectionCreationTest.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectionCreationTest.java
index cf022fb35d23..bec5406e0d18 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectionCreationTest.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectionCreationTest.java
@@ -13,12 +13,12 @@
  */
 package io.trino.plugin.jdbc;
 
+import io.trino.Session;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.testing.AbstractTestQueryFramework;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -28,17 +28,17 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.google.common.base.Verify.verify;
+import static io.trino.SystemSessionProperties.TASK_MAX_WRITER_COUNT;
 import static java.util.Collections.synchronizedMap;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true) // this class is stateful, see fields
 public abstract class BaseJdbcConnectionCreationTest
         extends AbstractTestQueryFramework
 {
     protected ConnectionCountingConnectionFactory connectionFactory;
 
-    @BeforeClass
+    @BeforeAll
     public void verifySetup()
     {
         // Test expects connectionFactory to be provided with AbstractTestQueryFramework.createQueryRunner implementation
@@ -46,7 +46,7 @@ public void verifySetup()
         connectionFactory.assertThatNoConnectionHasLeaked();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void destroy()
             throws Exception
     {
@@ -61,7 +61,11 @@ protected void assertJdbcConnections(@Language("SQL") String query, int expected
             assertQueryFails(query, errorMessage.get());
         }
         else {
-            getQueryRunner().execute(query);
+            // Disabling writers scaling to make expected number of opened connections constant
+            Session querySession = Session.builder(getSession())
+                    .setSystemProperty(TASK_MAX_WRITER_COUNT, "4")
+                    .build();
+            getQueryRunner().execute(querySession, query);
         }
         int after = connectionFactory.openConnections.get();
         assertThat(after - before).isEqualTo(expectedJdbcConnectionsCount);
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectorSmokeTest.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectorSmokeTest.java
index 709073084586..ddc45ee861b0 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectorSmokeTest.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectorSmokeTest.java
@@ -23,8 +23,16 @@ public abstract class BaseJdbcConnectorSmokeTest
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
         switch (connectorBehavior) {
-            case SUPPORTS_DELETE:
+            case SUPPORTS_UPDATE:
                 return true;
+            case SUPPORTS_ROW_LEVEL_UPDATE:
+                return false;
+            case SUPPORTS_MERGE: // not supported by any JDBC connector
+                return false;
+
+            case SUPPORTS_CREATE_VIEW: // not supported by DefaultJdbcMetadata
+            case SUPPORTS_CREATE_MATERIALIZED_VIEW: // not supported by DefaultJdbcMetadata
+                return false;
 
             default:
                 return super.hasBehavior(connectorBehavior);
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectorTest.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectorTest.java
index 2bf86868bf85..01ccd6290212 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectorTest.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectorTest.java
@@ -19,6 +19,7 @@
 import io.trino.spi.QueryId;
 import io.trino.spi.connector.JoinCondition;
 import io.trino.spi.connector.SortOrder;
+import io.trino.sql.planner.Plan;
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.ExchangeNode;
@@ -27,14 +28,15 @@
 import io.trino.sql.planner.plan.LimitNode;
 import io.trino.sql.planner.plan.MarkDistinctNode;
 import io.trino.sql.planner.plan.OutputNode;
-import io.trino.sql.planner.plan.ProjectNode;
 import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.sql.planner.plan.TopNNode;
 import io.trino.sql.planner.plan.ValuesNode;
 import io.trino.sql.query.QueryAssertions.QueryAssert;
 import io.trino.testing.BaseConnectorTest;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.MaterializedResultWithQueryId;
+import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
 import io.trino.testing.sql.SqlExecutor;
 import io.trino.testing.sql.TestTable;
@@ -42,7 +44,6 @@
 import org.intellij.lang.annotations.Language;
 import org.testng.SkipException;
 import org.testng.annotations.AfterClass;
-import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;
@@ -58,7 +59,7 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.MoreCollectors.toOptional;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
-import static io.trino.SystemSessionProperties.USE_MARK_DISTINCT;
+import static io.trino.SystemSessionProperties.MARK_DISTINCT_STRATEGY;
 import static io.trino.plugin.jdbc.JdbcDynamicFilteringSessionProperties.DYNAMIC_FILTERING_ENABLED;
 import static io.trino.plugin.jdbc.JdbcDynamicFilteringSessionProperties.DYNAMIC_FILTERING_WAIT_TIMEOUT;
 import static io.trino.plugin.jdbc.JdbcMetadataSessionProperties.DOMAIN_COMPACTION_THRESHOLD;
@@ -73,7 +74,7 @@
 import static io.trino.sql.planner.OptimizerConfig.JoinDistributionType.PARTITIONED;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
-import static io.trino.testing.DataProviders.toDataProvider;
+import static io.trino.sql.planner.optimizations.PlanNodeSearcher.searchFrom;
 import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_AGGREGATION_PUSHDOWN;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_AGGREGATION_PUSHDOWN_CORRELATION;
@@ -94,14 +95,19 @@
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_INEQUALITY;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_LIMIT_PUSHDOWN;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_MERGE;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_NATIVE_QUERY;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_NOT_NULL_CONSTRAINT;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_PREDICATE_ARITHMETIC_EXPRESSION_PUSHDOWN;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_PREDICATE_EXPRESSION_PUSHDOWN_WITH_LIKE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_PREDICATE_PUSHDOWN;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ROW_LEVEL_DELETE;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ROW_LEVEL_UPDATE;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ROW_TYPE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_TOPN_PUSHDOWN;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_TOPN_PUSHDOWN_WITH_VARCHAR;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_UPDATE;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.assertions.Assert.assertEventually;
 import static java.lang.String.format;
@@ -110,7 +116,6 @@
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertFalse;
 
 public abstract class BaseJdbcConnectorTest
         extends BaseConnectorTest
@@ -128,23 +133,19 @@ public void afterClass()
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_PREDICATE_EXPRESSION_PUSHDOWN:
-                // TODO support pushdown of complex expressions in predicates
-                return false;
-
-            case SUPPORTS_DYNAMIC_FILTER_PUSHDOWN:
-                // Dynamic filters can be pushed down only if predicate push down is supported.
-                // It is possible for a connector to have predicate push down support but not push down dynamic filters.
-                return super.hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN);
-
-            case SUPPORTS_DELETE:
-            case SUPPORTS_TRUNCATE:
-                return true;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_UPDATE -> true;
+            case SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_PREDICATE_EXPRESSION_PUSHDOWN,
+                    SUPPORTS_ROW_LEVEL_UPDATE -> false;
+            // Dynamic filters can be pushed down only if predicate push down is supported.
+            // It is possible for a connector to have predicate push down support but not push down dynamic filters.
+            // TODO default SUPPORTS_DYNAMIC_FILTER_PUSHDOWN to SUPPORTS_PREDICATE_PUSHDOWN
+            case SUPPORTS_DYNAMIC_FILTER_PUSHDOWN -> super.hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN);
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Test
@@ -320,7 +321,7 @@ public void testCaseSensitiveAggregationPushdown()
         boolean supportsSumDistinctPushdown = hasBehavior(SUPPORTS_AGGREGATION_PUSHDOWN);
 
         PlanMatchPattern aggregationOverTableScan = node(AggregationNode.class, node(TableScanNode.class));
-        PlanMatchPattern groupingAggregationOverTableScan = node(AggregationNode.class, node(ProjectNode.class, node(TableScanNode.class)));
+        PlanMatchPattern groupingAggregationOverTableScan = node(AggregationNode.class, node(TableScanNode.class));
         try (TestTable table = new TestTable(
                 getQueryRunner()::execute,
                 "test_cs_agg_pushdown",
@@ -456,7 +457,7 @@ public void testDistinctAggregationPushdown()
         }
 
         Session withMarkDistinct = Session.builder(getSession())
-                .setSystemProperty(USE_MARK_DISTINCT, "true")
+                .setSystemProperty(MARK_DISTINCT_STRATEGY, "always")
                 .build();
         // distinct aggregation
         assertThat(query(withMarkDistinct, "SELECT count(DISTINCT regionkey) FROM nation")).isFullyPushedDown();
@@ -467,32 +468,32 @@ public void testDistinctAggregationPushdown()
                 withMarkDistinct,
                 "SELECT count(DISTINCT comment) FROM nation",
                 hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY),
-                node(AggregationNode.class, node(ProjectNode.class, node(TableScanNode.class))));
+                node(AggregationNode.class, node(TableScanNode.class)));
         // two distinct aggregations
         assertConditionallyPushedDown(
                 withMarkDistinct,
                 "SELECT count(DISTINCT regionkey), sum(nationkey) FROM nation",
                 hasBehavior(SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT),
-                node(MarkDistinctNode.class, node(ExchangeNode.class, node(ExchangeNode.class, node(ProjectNode.class, node(TableScanNode.class))))));
+                node(MarkDistinctNode.class, node(ExchangeNode.class, node(ExchangeNode.class, node(TableScanNode.class)))));
         assertConditionallyPushedDown(
                 withMarkDistinct,
                 "SELECT sum(DISTINCT regionkey), sum(DISTINCT nationkey) FROM nation",
                 hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN),
-                node(MarkDistinctNode.class, node(ExchangeNode.class, node(ExchangeNode.class, node(ProjectNode.class, node(TableScanNode.class))))));
+                node(MarkDistinctNode.class, node(ExchangeNode.class, node(ExchangeNode.class, node(TableScanNode.class)))));
         // distinct aggregation and a non-distinct aggregation
         assertConditionallyPushedDown(
                 withMarkDistinct,
                 "SELECT count(DISTINCT regionkey), count(DISTINCT nationkey) FROM nation",
                 hasBehavior(SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT),
-                node(MarkDistinctNode.class, node(ExchangeNode.class, node(ExchangeNode.class, node(ProjectNode.class, node(TableScanNode.class))))));
+                node(MarkDistinctNode.class, node(ExchangeNode.class, node(ExchangeNode.class, node(TableScanNode.class)))));
         assertConditionallyPushedDown(
                 withMarkDistinct,
                 "SELECT sum(DISTINCT regionkey), count(nationkey) FROM nation",
                 hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN),
-                node(MarkDistinctNode.class, node(ExchangeNode.class, node(ExchangeNode.class, node(ProjectNode.class, node(TableScanNode.class))))));
+                node(MarkDistinctNode.class, node(ExchangeNode.class, node(ExchangeNode.class, node(TableScanNode.class)))));
 
         Session withoutMarkDistinct = Session.builder(getSession())
-                .setSystemProperty(USE_MARK_DISTINCT, "false")
+                .setSystemProperty(MARK_DISTINCT_STRATEGY, "none")
                 .build();
         // distinct aggregation
         assertThat(query(withoutMarkDistinct, "SELECT count(DISTINCT regionkey) FROM nation")).isFullyPushedDown();
@@ -503,7 +504,7 @@ public void testDistinctAggregationPushdown()
                 withoutMarkDistinct,
                 "SELECT count(DISTINCT comment) FROM nation",
                 hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY),
-                node(AggregationNode.class, node(ProjectNode.class, node(TableScanNode.class))));
+                node(AggregationNode.class, node(TableScanNode.class)));
         // two distinct aggregations
         assertConditionallyPushedDown(
                 withoutMarkDistinct,
@@ -605,7 +606,7 @@ public void testCountDistinctWithStringTypes()
 
                 assertThat(query("SELECT count(DISTINCT t_char), count(DISTINCT t_varchar) FROM " + testTable.getName()))
                         .matches("VALUES (BIGINT '7', BIGINT '7')")
-                        .isNotFullyPushedDown(MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class, ProjectNode.class);
+                        .isNotFullyPushedDown(MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class);
             }
             else {
                 // Single count(DISTINCT ...) can be pushed even down even if SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT == false as GROUP BY
@@ -622,7 +623,7 @@ public void testCountDistinctWithStringTypes()
                         getSession(),
                         "SELECT count(DISTINCT t_char), count(DISTINCT t_varchar) FROM " + testTable.getName(),
                         hasBehavior(SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT),
-                        node(MarkDistinctNode.class, node(ExchangeNode.class, node(ExchangeNode.class, node(ProjectNode.class, node(TableScanNode.class))))));
+                        node(MarkDistinctNode.class, node(ExchangeNode.class, node(ExchangeNode.class, node(TableScanNode.class)))));
             }
         }
     }
@@ -1016,7 +1017,7 @@ public void testTopNPushdown()
                 .isNotFullyPushedDown(
                         node(TopNNode.class, // FINAL TopN
                                 anyTree(node(JoinNode.class,
-                                        node(ExchangeNode.class, node(ProjectNode.class, node(TableScanNode.class))), // no PARTIAL TopN
+                                        node(ExchangeNode.class, node(TableScanNode.class)), // no PARTIAL TopN
                                         anyTree(node(TableScanNode.class))))));
     }
 
@@ -1204,148 +1205,144 @@ public void verifySupportsJoinPushdownWithFullJoinDeclaration()
                 .joinIsNotFullyPushedDown();
     }
 
-    @Test(dataProvider = "joinOperators")
-    public void testJoinPushdown(JoinOperator joinOperator)
+    @Test
+    public void testJoinPushdown()
     {
-        Session session = joinPushdownEnabled(getSession());
+        for (JoinOperator joinOperator : JoinOperator.values()) {
+            Session session = joinPushdownEnabled(getSession());
 
-        if (!hasBehavior(SUPPORTS_JOIN_PUSHDOWN)) {
-            assertThat(query(session, "SELECT r.name, n.name FROM nation n JOIN region r ON n.regionkey = r.regionkey"))
-                    .joinIsNotFullyPushedDown();
-            return;
-        }
+            if (!hasBehavior(SUPPORTS_JOIN_PUSHDOWN)) {
+                assertThat(query(session, "SELECT r.name, n.name FROM nation n JOIN region r ON n.regionkey = r.regionkey"))
+                        .joinIsNotFullyPushedDown();
+                return;
+            }
 
-        if (joinOperator == FULL_JOIN && !hasBehavior(SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN)) {
-            // Covered by verifySupportsJoinPushdownWithFullJoinDeclaration
-            return;
-        }
+            if (joinOperator == FULL_JOIN && !hasBehavior(SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN)) {
+                // Covered by verifySupportsJoinPushdownWithFullJoinDeclaration
+                return;
+            }
 
-        // Disable DF here for the sake of negative test cases' expected plan. With DF enabled, some operators return in DF's FilterNode and some do not.
-        Session withoutDynamicFiltering = Session.builder(session)
-                .setSystemProperty("enable_dynamic_filtering", "false")
-                .build();
+            // Disable DF here for the sake of negative test cases' expected plan. With DF enabled, some operators return in DF's FilterNode and some do not.
+            Session withoutDynamicFiltering = Session.builder(session)
+                    .setSystemProperty("enable_dynamic_filtering", "false")
+                    .build();
+
+            String notDistinctOperator = "IS NOT DISTINCT FROM";
+            List<String> nonEqualities = Stream.concat(
+                            Stream.of(JoinCondition.Operator.values())
+                                    .filter(operator -> operator != JoinCondition.Operator.EQUAL)
+                                    .map(JoinCondition.Operator::getValue),
+                            Stream.of(notDistinctOperator))
+                    .collect(toImmutableList());
+
+            try (TestTable nationLowercaseTable = new TestTable(
+                    // If a connector supports Join pushdown, but does not allow CTAS, we need to make the table creation here overridable.
+                    getQueryRunner()::execute,
+                    "nation_lowercase",
+                    "AS SELECT nationkey, lower(name) name, regionkey FROM nation")) {
+                // basic case
+                assertThat(query(session, format("SELECT r.name, n.name FROM nation n %s region r ON n.regionkey = r.regionkey", joinOperator))).isFullyPushedDown();
+
+                // join over different columns
+                assertThat(query(session, format("SELECT r.name, n.name FROM nation n %s region r ON n.nationkey = r.regionkey", joinOperator))).isFullyPushedDown();
+
+                // pushdown when using USING
+                assertThat(query(session, format("SELECT r.name, n.name FROM nation n %s region r USING(regionkey)", joinOperator))).isFullyPushedDown();
+
+                // varchar equality predicate
+                assertJoinConditionallyPushedDown(
+                        session,
+                        format("SELECT n.name, n2.regionkey FROM nation n %s nation n2 ON n.name = n2.name", joinOperator),
+                        hasBehavior(SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_EQUALITY));
+                assertJoinConditionallyPushedDown(
+                        session,
+                        format("SELECT n.name, nl.regionkey FROM nation n %s %s nl ON n.name = nl.name", joinOperator, nationLowercaseTable.getName()),
+                        hasBehavior(SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_EQUALITY));
 
-        String notDistinctOperator = "IS NOT DISTINCT FROM";
-        List<String> nonEqualities = Stream.concat(
-                        Stream.of(JoinCondition.Operator.values())
-                                .filter(operator -> operator != JoinCondition.Operator.EQUAL)
-                                .map(JoinCondition.Operator::getValue),
-                        Stream.of(notDistinctOperator))
-                .collect(toImmutableList());
+                // multiple bigint predicates
+                assertThat(query(session, format("SELECT n.name, c.name FROM nation n %s customer c ON n.nationkey = c.nationkey and n.regionkey = c.custkey", joinOperator)))
+                        .isFullyPushedDown();
 
-        try (TestTable nationLowercaseTable = new TestTable(
-                // If a connector supports Join pushdown, but does not allow CTAS, we need to make the table creation here overridable.
-                getQueryRunner()::execute,
-                "nation_lowercase",
-                "AS SELECT nationkey, lower(name) name, regionkey FROM nation")) {
-            // basic case
-            assertThat(query(session, format("SELECT r.name, n.name FROM nation n %s region r ON n.regionkey = r.regionkey", joinOperator))).isFullyPushedDown();
-
-            // join over different columns
-            assertThat(query(session, format("SELECT r.name, n.name FROM nation n %s region r ON n.nationkey = r.regionkey", joinOperator))).isFullyPushedDown();
-
-            // pushdown when using USING
-            assertThat(query(session, format("SELECT r.name, n.name FROM nation n %s region r USING(regionkey)", joinOperator))).isFullyPushedDown();
-
-            // varchar equality predicate
-            assertJoinConditionallyPushedDown(
-                    session,
-                    format("SELECT n.name, n2.regionkey FROM nation n %s nation n2 ON n.name = n2.name", joinOperator),
-                    hasBehavior(SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_EQUALITY));
-            assertJoinConditionallyPushedDown(
-                    session,
-                    format("SELECT n.name, nl.regionkey FROM nation n %s %s nl ON n.name = nl.name", joinOperator, nationLowercaseTable.getName()),
-                    hasBehavior(SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_EQUALITY));
-
-            // multiple bigint predicates
-            assertThat(query(session, format("SELECT n.name, c.name FROM nation n %s customer c ON n.nationkey = c.nationkey and n.regionkey = c.custkey", joinOperator)))
-                    .isFullyPushedDown();
+                // inequality
+                for (String operator : nonEqualities) {
+                    // bigint inequality predicate
+                    assertJoinConditionallyPushedDown(
+                            withoutDynamicFiltering,
+                            format("SELECT r.name, n.name FROM nation n %s region r ON n.regionkey %s r.regionkey", joinOperator, operator),
+                            expectJoinPushdown(operator) && expectJoinPushdowOnInequalityOperator(joinOperator));
+
+                    // varchar inequality predicate
+                    assertJoinConditionallyPushedDown(
+                            withoutDynamicFiltering,
+                            format("SELECT n.name, nl.name FROM nation n %s %s nl ON n.name %s nl.name", joinOperator, nationLowercaseTable.getName(), operator),
+                            expectVarcharJoinPushdown(operator) && expectJoinPushdowOnInequalityOperator(joinOperator));
+                }
+
+                // inequality along with an equality, which constitutes an equi-condition and allows filter to remain as part of the Join
+                for (String operator : nonEqualities) {
+                    assertJoinConditionallyPushedDown(
+                            session,
+                            format("SELECT n.name, c.name FROM nation n %s customer c ON n.nationkey = c.nationkey AND n.regionkey %s c.custkey", joinOperator, operator),
+                            expectJoinPushdown(operator));
+                }
+
+                // varchar inequality along with an equality, which constitutes an equi-condition and allows filter to remain as part of the Join
+                for (String operator : nonEqualities) {
+                    assertJoinConditionallyPushedDown(
+                            session,
+                            format("SELECT n.name, nl.name FROM nation n %s %s nl ON n.regionkey = nl.regionkey AND n.name %s nl.name", joinOperator, nationLowercaseTable.getName(), operator),
+                            expectVarcharJoinPushdown(operator));
+                }
+
+                // Join over a (double) predicate
+                assertThat(query(session, format("" +
+                        "SELECT c.name, n.name " +
+                        "FROM (SELECT * FROM customer WHERE acctbal > 8000) c " +
+                        "%s nation n ON c.custkey = n.nationkey", joinOperator)))
+                        .isFullyPushedDown();
 
-            // inequality
-            for (String operator : nonEqualities) {
-                // bigint inequality predicate
+                // Join over a varchar equality predicate
                 assertJoinConditionallyPushedDown(
-                        withoutDynamicFiltering,
-                        format("SELECT r.name, n.name FROM nation n %s region r ON n.regionkey %s r.regionkey", joinOperator, operator),
-                        expectJoinPushdown(operator) && expectJoinPushdowOnInequalityOperator(joinOperator));
+                        session,
+                        format("SELECT c.name, n.name FROM (SELECT * FROM customer WHERE address = 'TcGe5gaZNgVePxU5kRrvXBfkasDTea') c " +
+                                "%s nation n ON c.custkey = n.nationkey", joinOperator),
+                        hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY));
 
-                // varchar inequality predicate
+                // Join over a varchar inequality predicate
                 assertJoinConditionallyPushedDown(
-                        withoutDynamicFiltering,
-                        format("SELECT n.name, nl.name FROM nation n %s %s nl ON n.name %s nl.name", joinOperator, nationLowercaseTable.getName(), operator),
-                        expectVarcharJoinPushdown(operator) && expectJoinPushdowOnInequalityOperator(joinOperator));
-            }
+                        session,
+                        format("SELECT c.name, n.name FROM (SELECT * FROM customer WHERE address < 'TcGe5gaZNgVePxU5kRrvXBfkasDTea') c " +
+                                "%s nation n ON c.custkey = n.nationkey", joinOperator),
+                        hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY));
 
-            // inequality along with an equality, which constitutes an equi-condition and allows filter to remain as part of the Join
-            for (String operator : nonEqualities) {
+                // join over aggregation
                 assertJoinConditionallyPushedDown(
                         session,
-                        format("SELECT n.name, c.name FROM nation n %s customer c ON n.nationkey = c.nationkey AND n.regionkey %s c.custkey", joinOperator, operator),
-                        expectJoinPushdown(operator));
-            }
+                        format("SELECT * FROM (SELECT regionkey rk, count(nationkey) c FROM nation GROUP BY regionkey) n " +
+                                "%s region r ON n.rk = r.regionkey", joinOperator),
+                        hasBehavior(SUPPORTS_AGGREGATION_PUSHDOWN));
 
-            // varchar inequality along with an equality, which constitutes an equi-condition and allows filter to remain as part of the Join
-            for (String operator : nonEqualities) {
+                // join over LIMIT
                 assertJoinConditionallyPushedDown(
                         session,
-                        format("SELECT n.name, nl.name FROM nation n %s %s nl ON n.regionkey = nl.regionkey AND n.name %s nl.name", joinOperator, nationLowercaseTable.getName(), operator),
-                        expectVarcharJoinPushdown(operator));
-            }
+                        format("SELECT * FROM (SELECT nationkey FROM nation LIMIT 30) n " +
+                                "%s region r ON n.nationkey = r.regionkey", joinOperator),
+                        hasBehavior(SUPPORTS_LIMIT_PUSHDOWN));
 
-            // Join over a (double) predicate
-            assertThat(query(session, format("" +
-                    "SELECT c.name, n.name " +
-                    "FROM (SELECT * FROM customer WHERE acctbal > 8000) c " +
-                    "%s nation n ON c.custkey = n.nationkey", joinOperator)))
-                    .isFullyPushedDown();
+                // join over TopN
+                assertJoinConditionallyPushedDown(
+                        session,
+                        format("SELECT * FROM (SELECT nationkey FROM nation ORDER BY regionkey LIMIT 5) n " +
+                                "%s region r ON n.nationkey = r.regionkey", joinOperator),
+                        hasBehavior(SUPPORTS_TOPN_PUSHDOWN));
 
-            // Join over a varchar equality predicate
-            assertJoinConditionallyPushedDown(
-                    session,
-                    format("SELECT c.name, n.name FROM (SELECT * FROM customer WHERE address = 'TcGe5gaZNgVePxU5kRrvXBfkasDTea') c " +
-                            "%s nation n ON c.custkey = n.nationkey", joinOperator),
-                    hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY));
-
-            // Join over a varchar inequality predicate
-            assertJoinConditionallyPushedDown(
-                    session,
-                    format("SELECT c.name, n.name FROM (SELECT * FROM customer WHERE address < 'TcGe5gaZNgVePxU5kRrvXBfkasDTea') c " +
-                            "%s nation n ON c.custkey = n.nationkey", joinOperator),
-                    hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY));
-
-            // join over aggregation
-            assertJoinConditionallyPushedDown(
-                    session,
-                    format("SELECT * FROM (SELECT regionkey rk, count(nationkey) c FROM nation GROUP BY regionkey) n " +
-                            "%s region r ON n.rk = r.regionkey", joinOperator),
-                    hasBehavior(SUPPORTS_AGGREGATION_PUSHDOWN));
-
-            // join over LIMIT
-            assertJoinConditionallyPushedDown(
-                    session,
-                    format("SELECT * FROM (SELECT nationkey FROM nation LIMIT 30) n " +
-                            "%s region r ON n.nationkey = r.regionkey", joinOperator),
-                    hasBehavior(SUPPORTS_LIMIT_PUSHDOWN));
-
-            // join over TopN
-            assertJoinConditionallyPushedDown(
-                    session,
-                    format("SELECT * FROM (SELECT nationkey FROM nation ORDER BY regionkey LIMIT 5) n " +
-                            "%s region r ON n.nationkey = r.regionkey", joinOperator),
-                    hasBehavior(SUPPORTS_TOPN_PUSHDOWN));
-
-            // join over join
-            assertThat(query(session, "SELECT * FROM nation n, region r, customer c WHERE n.regionkey = r.regionkey AND r.regionkey = c.custkey"))
-                    .isFullyPushedDown();
+                // join over join
+                assertThat(query(session, "SELECT * FROM nation n, region r, customer c WHERE n.regionkey = r.regionkey AND r.regionkey = c.custkey"))
+                        .isFullyPushedDown();
+            }
         }
     }
 
-    @DataProvider
-    public Object[][] joinOperators()
-    {
-        return Stream.of(JoinOperator.values()).collect(toDataProvider());
-    }
-
     @Test
     public void testExplainAnalyzePhysicalReadWallTime()
     {
@@ -1515,6 +1512,170 @@ protected TestView createSleepingView(Duration minimalSleepDuration)
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public void testUpdateNotNullColumn()
+    {
+        // we don't support metadata update for null expressions yet, remove override as soon as support will be added
+        if (hasBehavior(SUPPORTS_ROW_LEVEL_UPDATE)) {
+            super.testUpdateNotNullColumn();
+            return;
+        }
+
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE));
+
+        if (!hasBehavior(SUPPORTS_NOT_NULL_CONSTRAINT)) {
+            assertQueryFails(
+                    "CREATE TABLE not_null_constraint (not_null_col INTEGER NOT NULL)",
+                    format("line 1:35: Catalog '%s' does not support non-null column for column name 'not_null_col'", getSession().getCatalog().orElseThrow()));
+            return;
+        }
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "update_not_null", "(nullable_col INTEGER, not_null_col INTEGER NOT NULL)")) {
+            assertUpdate(format("INSERT INTO %s (nullable_col, not_null_col) VALUES (1, 10)", table.getName()), 1);
+            assertQuery("SELECT * FROM " + table.getName(), "VALUES (1, 10)");
+            assertQueryFails("UPDATE " + table.getName() + " SET not_null_col = NULL WHERE nullable_col = 1", MODIFYING_ROWS_MESSAGE);
+            assertQueryFails("UPDATE " + table.getName() + " SET not_null_col = TRY(5/0) where nullable_col = 1", MODIFYING_ROWS_MESSAGE);
+        }
+    }
+
+    @Override
+    public void testUpdateRowType()
+    {
+        // we don't support metadata update for expressions yet, remove override as soon as support will be added
+        if (hasBehavior(SUPPORTS_ROW_LEVEL_UPDATE)) {
+            super.testUpdateRowType();
+            return;
+        }
+
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_UPDATE) && hasBehavior(SUPPORTS_ROW_TYPE));
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_update_with_predicates_on_row_types", "(int_t INT, row_t ROW(f1 INT, f2 INT))")) {
+            String tableName = table.getName();
+            assertUpdate("INSERT INTO " + tableName + " VALUES (1, ROW(2, 3)), (11, ROW(12, 13)), (21, ROW(22, 23))", 3);
+            assertQueryFails("UPDATE " + tableName + " SET int_t = int_t - 1 WHERE row_t.f2 = 3", MODIFYING_ROWS_MESSAGE);
+        }
+    }
+
+    @Override
+    public void testUpdateRowConcurrently()
+            throws Exception
+    {
+        // we don't support metadata update for expressions yet, remove override as soon as support will be added
+        if (hasBehavior(SUPPORTS_ROW_LEVEL_UPDATE)) {
+            super.testUpdateRowConcurrently();
+            return;
+        }
+
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_UPDATE));
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_update_row", "(a INT, b INT, c INT)", ImmutableList.of("1, 2, 3"))) {
+            assertQueryFails("UPDATE " + table.getName() + " SET a = a + 1", MODIFYING_ROWS_MESSAGE);
+        }
+    }
+
+    @Override
+    public void testUpdateAllValues()
+    {
+        // we don't support metadata update for update all, remove override as soon as support will be added
+        if (hasBehavior(SUPPORTS_ROW_LEVEL_UPDATE)) {
+            super.testUpdateAllValues();
+            return;
+        }
+
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_UPDATE));
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_update_all", "(a INT, b INT, c INT)", ImmutableList.of("1, 2, 3"))) {
+            assertQueryFails("UPDATE " + table.getName() + " SET a = 1, b = 1, c = 2", MODIFYING_ROWS_MESSAGE);
+        }
+    }
+
+    @Override
+    public void testUpdateWithPredicates()
+    {
+        // we don't support metadata update for expressions yet, remove override as soon as support will be added
+        // TODO add more test cases to basic test
+        if (hasBehavior(SUPPORTS_ROW_LEVEL_UPDATE)) {
+            super.testUpdateWithPredicates();
+            return;
+        }
+
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_UPDATE));
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_row_predicates", "(a INT, b INT, c INT)")) {
+            String tableName = table.getName();
+            assertUpdate("INSERT INTO " + tableName + " VALUES (1, 2, 3), (11, 12, 13), (21, 22, 23)", 3);
+            assertUpdate("UPDATE " + tableName + " SET a = 5 WHERE c = 3", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES (5, 2, 3), (11, 12, 13), (21, 22, 23)");
+
+            assertUpdate("UPDATE " + tableName + " SET c = 6 WHERE a = 11", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES (5, 2, 3), (11, 12, 6), (21, 22, 23)");
+
+            assertUpdate("UPDATE " + tableName + " SET b = 44 WHERE b = 22", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES (5, 2, 3), (11, 12, 6), (21, 44, 23)");
+
+            assertUpdate("UPDATE " + tableName + " SET b = 45 WHERE a > 5", 2);
+            assertQuery("SELECT * FROM " + tableName, "VALUES (5, 2, 3), (11, 45, 6), (21, 45, 23)");
+
+            assertUpdate("UPDATE " + tableName + " SET b = 46 WHERE a < 21", 2);
+            assertQuery("SELECT * FROM " + tableName, "VALUES (5, 46, 3), (11, 46, 6), (21, 45, 23)");
+
+            assertUpdate("UPDATE " + tableName + " SET b = 47 WHERE a != 11", 2);
+            assertQuery("SELECT * FROM " + tableName, "VALUES (5, 47, 3), (11, 46, 6), (21, 47, 23)");
+
+            assertUpdate("UPDATE " + tableName + " SET b = 48 WHERE a IN (5, 11)", 2);
+            assertQuery("SELECT * FROM " + tableName, "VALUES (5, 48, 3), (11, 48, 6), (21, 47, 23)");
+
+            assertUpdate("UPDATE " + tableName + " SET b = 49 WHERE a NOT IN (5, 11)", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES (5, 48, 3), (11, 48, 6), (21, 49, 23)");
+
+            assertQueryFails("UPDATE " + tableName + " SET b = b + 3 WHERE a NOT IN (5, 11)", MODIFYING_ROWS_MESSAGE);
+        }
+    }
+
+    @Test
+    public void testConstantUpdateWithVarcharEqualityPredicates()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_UPDATE));
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_update_varchar", "(col1 INT, col2 varchar(1))", ImmutableList.of("1, 'a'", "2, 'A'"))) {
+            if (!hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY)) {
+                assertQueryFails("UPDATE " + table.getName() + " SET col1 = 20 WHERE col2 = 'A'", MODIFYING_ROWS_MESSAGE);
+                return;
+            }
+            assertUpdate("UPDATE " + table.getName() + " SET col1 = 20 WHERE col2 = 'A'", 1);
+            assertQuery("SELECT * FROM " + table.getName(), "VALUES (1, 'a'), (20, 'A')");
+        }
+    }
+
+    @Test
+    public void testConstantUpdateWithVarcharInequalityPredicates()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_UPDATE));
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_update_varchar", "(col1 INT, col2 varchar(1))", ImmutableList.of("1, 'a'", "2, 'A'"))) {
+            if (!hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY)) {
+                assertQueryFails("UPDATE " + table.getName() + " SET col1 = 20 WHERE col2 != 'A'", MODIFYING_ROWS_MESSAGE);
+                return;
+            }
+
+            assertUpdate("UPDATE " + table.getName() + " SET col1 = 20 WHERE col2 != 'A'", 1);
+            assertQuery("SELECT * FROM " + table.getName(), "VALUES (20, 'a'), (2, 'A')");
+        }
+    }
+
+    @Test
+    public void testConstantUpdateWithVarcharGreaterAndLowerPredicate()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_UPDATE));
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_update_varchar", "(col1 INT, col2 varchar(1))", ImmutableList.of("1, 'a'", "2, 'A'"))) {
+            if (!hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY)) {
+                assertQueryFails("UPDATE " + table.getName() + " SET col1 = 20 WHERE col2 > 'A'", MODIFYING_ROWS_MESSAGE);
+                assertQueryFails("UPDATE " + table.getName() + " SET col1 = 20 WHERE col2 < 'A'", MODIFYING_ROWS_MESSAGE);
+                return;
+            }
+
+            assertUpdate("UPDATE " + table.getName() + " SET col1 = 20 WHERE col2 > 'A'", 1);
+            assertQuery("SELECT * FROM " + table.getName(), "VALUES (20, 'a'), (2, 'A')");
+
+            assertUpdate("UPDATE " + table.getName() + " SET col1 = 20 WHERE col2 < 'a'", 1);
+            assertQuery("SELECT * FROM " + table.getName(), "VALUES (20, 'a'), (20, 'A')");
+        }
+    }
+
     @Test
     public void testDeleteWithBigintEqualityPredicate()
     {
@@ -1554,7 +1715,7 @@ public void testDeleteWithVarcharInequalityPredicate()
         skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_ROW_LEVEL_DELETE));
         // TODO (https://github.com/trinodb/trino/issues/5901) Use longer table name once Oracle version is updated
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_delete_varchar", "(col varchar(1))", ImmutableList.of("'a'", "'A'", "null"))) {
-            if (!hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY)) {
+            if (!hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY) && !hasBehavior(SUPPORTS_MERGE)) {
                 assertQueryFails("DELETE FROM " + table.getName() + " WHERE col != 'A'", MODIFYING_ROWS_MESSAGE);
                 return;
             }
@@ -1570,7 +1731,7 @@ public void testDeleteWithVarcharGreaterAndLowerPredicate()
         skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_ROW_LEVEL_DELETE));
         // TODO (https://github.com/trinodb/trino/issues/5901) Use longer table name once Oracle version is updated
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_delete_varchar", "(col varchar(1))", ImmutableList.of("'0'", "'a'", "'A'", "'b'", "null"))) {
-            if (!hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY)) {
+            if (!hasBehavior(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY) && !hasBehavior(SUPPORTS_MERGE)) {
                 assertQueryFails("DELETE FROM " + table.getName() + " WHERE col < 'A'", MODIFYING_ROWS_MESSAGE);
                 assertQueryFails("DELETE FROM " + table.getName() + " WHERE col > 'A'", MODIFYING_ROWS_MESSAGE);
                 return;
@@ -1658,14 +1819,23 @@ public void testInsertWithoutTemporaryTable()
         }
     }
 
-    @Test(dataProvider = "batchSizeAndTotalNumberOfRowsToInsertDataProvider")
-    public void testWriteBatchSizeSessionProperty(Integer batchSize, Integer numberOfRows)
+    @Test
+    public void testWriteBatchSizeSessionProperty()
+    {
+        testWriteBatchSizeSessionProperty(10, 8); // number of rows < batch size
+        testWriteBatchSizeSessionProperty(10, 10); // number of rows = batch size
+        testWriteBatchSizeSessionProperty(10, 11); // number of rows > batch size
+        testWriteBatchSizeSessionProperty(10, 50); // number of rows = n * batch size
+        testWriteBatchSizeSessionProperty(10, 52); // number of rows > n * batch size
+    }
+
+    private void testWriteBatchSizeSessionProperty(int batchSize, int numberOfRows)
     {
         if (!hasBehavior(SUPPORTS_CREATE_TABLE)) {
             throw new SkipException("CREATE TABLE is required for write_batch_size test but is not supported");
         }
         Session session = Session.builder(getSession())
-                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "write_batch_size", batchSize.toString())
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "write_batch_size", Integer.toString(batchSize))
                 .build();
 
         try (TestTable table = new TestTable(
@@ -1678,6 +1848,45 @@ public void testWriteBatchSizeSessionProperty(Integer batchSize, Integer numberO
         }
     }
 
+    @Test
+    public void testWriteTaskParallelismSessionProperty()
+    {
+        testWriteTaskParallelismSessionProperty(1, 10_000);
+        testWriteTaskParallelismSessionProperty(2, 10_000);
+        testWriteTaskParallelismSessionProperty(4, 10_000);
+        testWriteTaskParallelismSessionProperty(16, 10_000);
+        testWriteTaskParallelismSessionProperty(32, 10_000);
+    }
+
+    private void testWriteTaskParallelismSessionProperty(int parallelism, int numberOfRows)
+    {
+        if (!hasBehavior(SUPPORTS_CREATE_TABLE)) {
+            throw new SkipException("CREATE TABLE is required for write_parallelism test but is not supported");
+        }
+
+        Session session = Session.builder(getSession())
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "write_parallelism", String.valueOf(parallelism))
+                .build();
+
+        QueryRunner queryRunner = getQueryRunner();
+        try (TestTable table = new TestTable(
+                queryRunner::execute,
+                "write_parallelism",
+                "(a varchar(128), b bigint)")) {
+            Plan plan = newTransaction()
+                    .singleStatement()
+                    .execute(session, (Session transactionSession) -> queryRunner.createPlan(
+                            transactionSession,
+                            "INSERT INTO " + table.getName() + " (a, b) SELECT clerk, orderkey FROM tpch.sf100.orders LIMIT " + numberOfRows));
+            TableWriterNode.WriterTarget target = ((TableWriterNode) searchFrom(plan.getRoot())
+                    .where(node -> node instanceof TableWriterNode)
+                    .findOnlyElement()).getTarget();
+
+            assertThat(target.getMaxWriterTasks(queryRunner.getMetadata(), getSession()))
+                    .hasValue(parallelism);
+        }
+    }
+
     private static List<String> buildRowsForInsert(int numberOfRows)
     {
         List<String> result = new ArrayList<>(numberOfRows);
@@ -1687,27 +1896,29 @@ private static List<String> buildRowsForInsert(int numberOfRows)
         return result;
     }
 
-    @DataProvider
-    public static Object[][] batchSizeAndTotalNumberOfRowsToInsertDataProvider()
+    @Test
+    public void verifySupportsNativeQueryDeclaration()
     {
-        return new Object[][] {
-                {10, 8},  // number of rows < batch size
-                {10, 10}, // number of rows = batch size
-                {10, 11}, // number of rows > batch size
-                {10, 50}, // number of rows = n * batch size
-                {10, 52}, // number of rows > n * batch size
-        };
+        if (hasBehavior(SUPPORTS_NATIVE_QUERY)) {
+            // Covered by testNativeQuerySelectFromNation
+            return;
+        }
+        assertQueryFails(
+                format("SELECT * FROM TABLE(system.query(query => 'SELECT name FROM %s.nation WHERE nationkey = 0'))", getSession().getSchema().orElseThrow()),
+                "line 1:21: Table function 'system.query' not registered");
     }
 
     @Test
     public void testNativeQuerySimple()
     {
+        skipTestUnless(hasBehavior(SUPPORTS_NATIVE_QUERY));
         assertQuery("SELECT * FROM TABLE(system.query(query => 'SELECT 1'))", "VALUES 1");
     }
 
     @Test
     public void testNativeQueryParameters()
     {
+        skipTestUnless(hasBehavior(SUPPORTS_NATIVE_QUERY));
         Session session = Session.builder(getSession())
                 .addPreparedStatement("my_query_simple", "SELECT * FROM TABLE(system.query(query => ?))")
                 .addPreparedStatement("my_query", "SELECT * FROM TABLE(system.query(query => format('SELECT %s FROM %s', ?, ?)))")
@@ -1719,6 +1930,7 @@ public void testNativeQueryParameters()
     @Test
     public void testNativeQuerySelectFromNation()
     {
+        skipTestUnless(hasBehavior(SUPPORTS_NATIVE_QUERY));
         assertQuery(
                 format("SELECT * FROM TABLE(system.query(query => 'SELECT name FROM %s.nation WHERE nationkey = 0'))", getSession().getSchema().orElseThrow()),
                 "VALUES 'ALGERIA'");
@@ -1727,6 +1939,7 @@ public void testNativeQuerySelectFromNation()
     @Test
     public void testNativeQuerySelectFromTestTable()
     {
+        skipTestUnless(hasBehavior(SUPPORTS_NATIVE_QUERY));
         try (TestTable testTable = simpleTable()) {
             assertQuery(
                     format("SELECT * FROM TABLE(system.query(query => 'SELECT * FROM %s'))", testTable.getName()),
@@ -1737,6 +1950,7 @@ public void testNativeQuerySelectFromTestTable()
     @Test
     public void testNativeQueryColumnAlias()
     {
+        skipTestUnless(hasBehavior(SUPPORTS_NATIVE_QUERY));
         // The output column type may differ per connector. Skipping the check because it's unrelated to the test purpose.
         assertThat(query(format("SELECT region_name FROM TABLE(system.query(query => 'SELECT name AS region_name FROM %s.region WHERE regionkey = 0'))", getSession().getSchema().orElseThrow())))
                 .skippingTypesCheck()
@@ -1746,6 +1960,7 @@ public void testNativeQueryColumnAlias()
     @Test
     public void testNativeQueryColumnAliasNotFound()
     {
+        skipTestUnless(hasBehavior(SUPPORTS_NATIVE_QUERY));
         assertQueryFails(
                 format("SELECT name FROM TABLE(system.query(query => 'SELECT name AS region_name FROM %s.region'))", getSession().getSchema().orElseThrow()),
                 ".* Column 'name' cannot be resolved");
@@ -1757,6 +1972,7 @@ public void testNativeQueryColumnAliasNotFound()
     @Test
     public void testNativeQuerySelectUnsupportedType()
     {
+        skipTestUnless(hasBehavior(SUPPORTS_NATIVE_QUERY));
         try (TestTable testTable = createTableWithUnsupportedColumn()) {
             String unqualifiedTableName = testTable.getName().replaceAll("^\\w+\\.", "");
             // Check that column 'two' is not supported.
@@ -1770,16 +1986,18 @@ public void testNativeQuerySelectUnsupportedType()
     @Test
     public void testNativeQueryCreateStatement()
     {
-        assertFalse(getQueryRunner().tableExists(getSession(), "numbers"));
+        skipTestUnless(hasBehavior(SUPPORTS_NATIVE_QUERY));
+        assertThat(getQueryRunner().tableExists(getSession(), "numbers")).isFalse();
         assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'CREATE TABLE numbers(n INTEGER)'))"))
                 .hasMessageContaining("Query not supported: ResultSetMetaData not available for query: CREATE TABLE numbers(n INTEGER)");
-        assertFalse(getQueryRunner().tableExists(getSession(), "numbers"));
+        assertThat(getQueryRunner().tableExists(getSession(), "numbers")).isFalse();
     }
 
     @Test
     public void testNativeQueryInsertStatementTableDoesNotExist()
     {
-        assertFalse(getQueryRunner().tableExists(getSession(), "non_existent_table"));
+        skipTestUnless(hasBehavior(SUPPORTS_NATIVE_QUERY));
+        assertThat(getQueryRunner().tableExists(getSession(), "non_existent_table")).isFalse();
         assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'INSERT INTO non_existent_table VALUES (1)'))"))
                 .hasMessageContaining("Failed to get table handle for prepared query");
     }
@@ -1787,6 +2005,7 @@ public void testNativeQueryInsertStatementTableDoesNotExist()
     @Test
     public void testNativeQueryInsertStatementTableExists()
     {
+        skipTestUnless(hasBehavior(SUPPORTS_NATIVE_QUERY));
         try (TestTable testTable = simpleTable()) {
             assertThatThrownBy(() -> query(format("SELECT * FROM TABLE(system.query(query => 'INSERT INTO %s VALUES (3)'))", testTable.getName())))
                     .hasMessageContaining(format("Query not supported: ResultSetMetaData not available for query: INSERT INTO %s VALUES (3)", testTable.getName()));
@@ -1797,6 +2016,7 @@ public void testNativeQueryInsertStatementTableExists()
     @Test
     public void testNativeQueryIncorrectSyntax()
     {
+        skipTestUnless(hasBehavior(SUPPORTS_NATIVE_QUERY));
         assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'some wrong syntax'))"))
                 .hasMessageContaining("Failed to get table handle for prepared query");
     }
@@ -1806,19 +2026,18 @@ protected TestTable simpleTable()
         return new TestTable(onRemoteDatabase(), format("%s.simple_table", getSession().getSchema().orElseThrow()), "(col BIGINT)", ImmutableList.of("1", "2"));
     }
 
-    @DataProvider
-    public Object[][] fixedJoinDistributionTypes()
-    {
-        return new Object[][] {{BROADCAST}, {PARTITIONED}};
-    }
-
-    @Test(dataProvider = "fixedJoinDistributionTypes")
-    public void testDynamicFiltering(JoinDistributionType joinDistributionType)
+    @Test
+    public void testDynamicFiltering()
     {
         skipTestUnless(hasBehavior(SUPPORTS_DYNAMIC_FILTER_PUSHDOWN));
+
         assertDynamicFiltering(
                 "SELECT * FROM orders a JOIN orders b ON a.orderkey = b.orderkey AND b.totalprice < 1000",
-                joinDistributionType);
+                BROADCAST);
+
+        assertDynamicFiltering(
+                "SELECT * FROM orders a JOIN orders b ON a.orderkey = b.orderkey AND b.totalprice < 1000",
+                PARTITIONED);
     }
 
     @Test
@@ -1833,6 +2052,11 @@ public void testDynamicFilteringWithAggregationGroupingColumn()
 
     @Test
     public void testDynamicFilteringWithAggregationAggregateColumn()
+    {
+        executeExclusively(this::testDynamicFilteringWithAggregationAggregateColumnUnsafe);
+    }
+
+    private void testDynamicFilteringWithAggregationAggregateColumnUnsafe()
     {
         skipTestUnless(hasBehavior(SUPPORTS_DYNAMIC_FILTER_PUSHDOWN));
         MaterializedResultWithQueryId resultWithQueryId = getDistributedQueryRunner()
@@ -1869,6 +2093,11 @@ public void testDynamicFilteringWithLimit()
 
     @Test
     public void testDynamicFilteringDomainCompactionThreshold()
+    {
+        executeExclusively(this::testDynamicFilteringDomainCompactionThresholdUnsafe);
+    }
+
+    private void testDynamicFilteringDomainCompactionThresholdUnsafe()
     {
         skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA));
         skipTestUnless(hasBehavior(SUPPORTS_DYNAMIC_FILTER_PUSHDOWN));
@@ -1941,6 +2170,11 @@ private void assertNoDynamicFiltering(@Language("SQL") String sql)
     }
 
     private void assertDynamicFiltering(@Language("SQL") String sql, JoinDistributionType joinDistributionType, boolean expectDynamicFiltering)
+    {
+        executeExclusively(() -> assertDynamicFilteringUnsafe(sql, joinDistributionType, expectDynamicFiltering));
+    }
+
+    private void assertDynamicFilteringUnsafe(@Language("SQL") String sql, JoinDistributionType joinDistributionType, boolean expectDynamicFiltering)
     {
         MaterializedResultWithQueryId dynamicFilteringResultWithQueryId = getDistributedQueryRunner().executeWithQueryId(
                 dynamicFiltering(joinDistributionType, true),
@@ -1995,8 +2229,14 @@ private Session dynamicFiltering(JoinDistributionType joinDistributionType, bool
                 .build();
     }
 
+    /**
+     * This method relies on global state of QueryTracker. It may fail because of QueryTracker.pruneExpiredQueries()
+     * You must ensure that query was issued and this method invoked in isolation -
+     * which guarantees that there is less other queries between query creation and obtaining query info than `query.max-history`
+     */
     private long getPhysicalInputPositions(QueryId queryId)
     {
+        // TODO https://github.com/trinodb/trino/issues/18499
         return getDistributedQueryRunner().getCoordinator()
                 .getQueryManager()
                 .getFullQueryInfo(queryId)
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcTableStatisticsTest.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcTableStatisticsTest.java
index d4793de2664a..bd1682a2125c 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcTableStatisticsTest.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcTableStatisticsTest.java
@@ -17,9 +17,9 @@
 import io.trino.SystemSessionProperties;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.sql.TestTable;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Locale;
 
@@ -27,14 +27,16 @@
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public abstract class BaseJdbcTableStatisticsTest
         extends AbstractTestQueryFramework
 {
     // Currently this class serves as a common "interface" to define cases that should be covered.
     //  TODO extend it to provide reusable blocks to reduce boiler-plate.
 
-    @BeforeClass
+    @BeforeAll
     public void setUpTables()
     {
         setUpTableFromTpch("region");
@@ -115,22 +117,19 @@ protected void checkEmptyTableStats(String tableName)
     @Test
     public abstract void testMaterializedView();
 
-    @Test(dataProvider = "testCaseColumnNamesDataProvider")
-    public abstract void testCaseColumnNames(String tableName);
-
-    @DataProvider
-    public Object[][] testCaseColumnNamesDataProvider()
+    @Test
+    public void testCaseColumnNames()
     {
-        return new Object[][] {
-                {"TEST_STATS_MIXED_UNQUOTED_UPPER"},
-                {"test_stats_mixed_unquoted_lower"},
-                {"test_stats_mixed_uNQuoTeD_miXED"},
-                {"\"TEST_STATS_MIXED_QUOTED_UPPER\""},
-                {"\"test_stats_mixed_quoted_lower\""},
-                {"\"test_stats_mixed_QuoTeD_miXED\""},
-        };
+        testCaseColumnNames("TEST_STATS_MIXED_UNQUOTED_UPPER");
+        testCaseColumnNames("test_stats_mixed_unquoted_lower");
+        testCaseColumnNames("test_stats_mixed_uNQuoTeD_miXED");
+        testCaseColumnNames("\"TEST_STATS_MIXED_QUOTED_UPPER\"");
+        testCaseColumnNames("\"test_stats_mixed_quoted_lower\"");
+        testCaseColumnNames("\"test_stats_mixed_QuoTeD_miXED\"");
     }
 
+    protected abstract void testCaseColumnNames(String tableName);
+
     @Test
     public abstract void testNumericCornerCases();
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/MetadataUtil.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/MetadataUtil.java
index 6a51d7cb49dc..c4bb0d5bf197 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/MetadataUtil.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/MetadataUtil.java
@@ -28,7 +28,7 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Locale.ENGLISH;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 final class MetadataUtil
 {
@@ -72,6 +72,6 @@ public static <T> void assertJsonRoundTrip(JsonCodec<T> codec, T object)
     {
         String json = codec.toJson(object);
         T copy = codec.fromJson(json);
-        assertEquals(copy, object);
+        assertThat(copy).isEqualTo(object);
     }
 }
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestBaseJdbcConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestBaseJdbcConfig.java
index 7aa257e57ca6..3f5d200bf650 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestBaseJdbcConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestBaseJdbcConfig.java
@@ -14,12 +14,10 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import io.airlift.configuration.ConfigurationFactory;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
-
-import javax.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.AssertTrue;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -30,8 +28,8 @@
 import static io.airlift.testing.ValidationAssertions.assertValidates;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
 
 public class TestBaseJdbcConfig
 {
@@ -74,16 +72,16 @@ public void testExplicitPropertyMappings()
 
         assertFullMapping(properties, expected);
 
-        assertEquals(expected.getJdbcTypesMappedToVarchar(), ImmutableSet.of("mytype", "struct_type1"));
+        assertThat(expected.getJdbcTypesMappedToVarchar()).containsOnly("mytype", "struct_type1");
     }
 
     @Test
     public void testConnectionUrlIsValid()
     {
         assertThatThrownBy(() -> buildConfig(ImmutableMap.of("connection-url", "jdbc:")))
-                .hasMessageContaining("must match the following regular expression: ^jdbc:[a-z0-9]+:(?s:.*)$");
+                .hasMessageContaining("must match \"^jdbc:[a-z0-9]+:(?s:.*)$\"");
         assertThatThrownBy(() -> buildConfig(ImmutableMap.of("connection-url", "jdbc:protocol")))
-                .hasMessageContaining("must match the following regular expression: ^jdbc:[a-z0-9]+:(?s:.*)$");
+                .hasMessageContaining("must match \"^jdbc:[a-z0-9]+:(?s:.*)$\"");
         buildConfig(ImmutableMap.of("connection-url", "jdbc:protocol:uri"));
         buildConfig(ImmutableMap.of("connection-url", "jdbc:protocol:"));
     }
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCachingJdbcClient.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCachingJdbcClient.java
index db012040d3c3..75b628f241d2 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCachingJdbcClient.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCachingJdbcClient.java
@@ -32,9 +32,11 @@
 import io.trino.spi.statistics.Estimate;
 import io.trino.spi.statistics.TableStatistics;
 import io.trino.testing.TestingConnectorSession;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -74,8 +76,9 @@
 import static java.util.function.Function.identity;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestCachingJdbcClient
 {
     private static final Duration FOREVER = Duration.succinctDuration(1, DAYS);
@@ -104,7 +107,7 @@ public class TestCachingJdbcClient
     private String schema;
     private ExecutorService executor;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
             throws Exception
     {
@@ -146,7 +149,7 @@ private CachingJdbcClient createCachingJdbcClient(boolean cacheMissing, long cac
         return createCachingJdbcClient(FOREVER, cacheMissing, cacheMaximumSize);
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
             throws Exception
     {
@@ -168,7 +171,7 @@ public void testSchemaNamesCached()
                 .afterRunning(() -> {
                     assertThat(cachingJdbcClient.getSchemaNames(SESSION)).contains(phantomSchema);
                 });
-        jdbcClient.dropSchema(SESSION, phantomSchema);
+        jdbcClient.dropSchema(SESSION, phantomSchema, false);
 
         assertThat(jdbcClient.getSchemaNames(SESSION)).doesNotContain(phantomSchema);
         assertSchemaNamesCache(cachingJdbcClient)
@@ -652,7 +655,8 @@ public void testCacheGetTableStatisticsWithQueryRelationHandle()
                 Optional.empty(),
                 Optional.of(Set.of(new SchemaTableName(schema, "first"))),
                 0,
-                Optional.empty());
+                Optional.empty(),
+                ImmutableList.of());
 
         // load
         assertStatisticsCacheStats(cachingJdbcClient).loads(1).misses(1).afterRunning(() -> {
@@ -841,7 +845,8 @@ public void testFlushCache()
         jdbcClient.dropTable(SESSION, first);
     }
 
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testConcurrentSchemaCreateAndDrop()
     {
         CachingJdbcClient cachingJdbcClient = cachingStatisticsAwareJdbcClient(FOREVER, true, 10000);
@@ -853,7 +858,7 @@ public void testConcurrentSchemaCreateAndDrop()
                 assertThat(cachingJdbcClient.getSchemaNames(session)).doesNotContain(schemaName);
                 cachingJdbcClient.createSchema(session, schemaName);
                 assertThat(cachingJdbcClient.getSchemaNames(session)).contains(schemaName);
-                cachingJdbcClient.dropSchema(session, schemaName);
+                cachingJdbcClient.dropSchema(session, schemaName, false);
                 assertThat(cachingJdbcClient.getSchemaNames(session)).doesNotContain(schemaName);
                 return null;
             }));
@@ -862,7 +867,8 @@ public void testConcurrentSchemaCreateAndDrop()
         futures.forEach(Futures::getUnchecked);
     }
 
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testLoadFailureNotSharedWhenDisabled()
             throws Exception
     {
@@ -1026,7 +1032,7 @@ public void testSpecificSchemaAndTableCaches()
 
         jdbcClient.dropTable(SESSION, first);
         jdbcClient.dropTable(SESSION, second);
-        jdbcClient.dropSchema(SESSION, secondSchema);
+        jdbcClient.dropSchema(SESSION, secondSchema, false);
     }
 
     private JdbcTableHandle getAnyTable(String schema)
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCredentialProviderTypeConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCredentialProviderTypeConfig.java
index ee536a562012..6119ca7e398a 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCredentialProviderTypeConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCredentialProviderTypeConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.plugin.jdbc.credential.CredentialProviderTypeConfig;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDecimalConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDecimalConfig.java
index 03bafa36bc5d..84f25f972c7a 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDecimalConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDecimalConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDefaultJdbcMetadata.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDefaultJdbcMetadata.java
index 7e196e9f7e76..81b09fba8f79 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDefaultJdbcMetadata.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDefaultJdbcMetadata.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
+import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -32,9 +33,10 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.testing.TestingConnectorSession;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Map;
@@ -42,6 +44,7 @@
 import java.util.function.Function;
 
 import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.plugin.jdbc.DefaultJdbcMetadata.createSyntheticColumn;
 import static io.trino.plugin.jdbc.TestingJdbcTypeHandle.JDBC_BIGINT;
 import static io.trino.plugin.jdbc.TestingJdbcTypeHandle.JDBC_VARCHAR;
 import static io.trino.spi.StandardErrorCode.NOT_FOUND;
@@ -52,30 +55,34 @@
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestDefaultJdbcMetadata
 {
     private TestingDatabase database;
     private DefaultJdbcMetadata metadata;
     private JdbcTableHandle tableHandle;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
             throws Exception
     {
         database = new TestingDatabase();
-        metadata = new DefaultJdbcMetadata(new GroupingSetsEnabledJdbcClient(database.getJdbcClient(), Optional.empty()), false, ImmutableSet.of());
+        metadata = new DefaultJdbcMetadata(new GroupingSetsEnabledJdbcClient(database.getJdbcClient(),
+                Optional.empty()),
+                false,
+                ImmutableSet.of());
         tableHandle = metadata.getTableHandle(SESSION, new SchemaTableName("example", "numbers"));
     }
 
     @Test
     public void testSupportsRetriesValidation()
     {
-        metadata = new DefaultJdbcMetadata(new GroupingSetsEnabledJdbcClient(database.getJdbcClient(), Optional.of(false)), false, ImmutableSet.of());
+        metadata = new DefaultJdbcMetadata(new GroupingSetsEnabledJdbcClient(database.getJdbcClient(),
+                Optional.of(false)),
+                false,
+                ImmutableSet.of());
         ConnectorTableMetadata tableMetadata = new ConnectorTableMetadata(new SchemaTableName("example", "numbers"), ImmutableList.of());
 
         assertThatThrownBy(() -> {
@@ -90,7 +97,10 @@ public void testSupportsRetriesValidation()
     @Test
     public void testNonTransactionalInsertValidation()
     {
-        metadata = new DefaultJdbcMetadata(new GroupingSetsEnabledJdbcClient(database.getJdbcClient(), Optional.of(true)), false, ImmutableSet.of());
+        metadata = new DefaultJdbcMetadata(new GroupingSetsEnabledJdbcClient(database.getJdbcClient(),
+                Optional.of(true)),
+                false,
+                ImmutableSet.of());
         ConnectorTableMetadata tableMetadata = new ConnectorTableMetadata(new SchemaTableName("example", "numbers"), ImmutableList.of());
 
         ConnectorSession session = TestingConnectorSession.builder()
@@ -107,7 +117,7 @@ public void testNonTransactionalInsertValidation()
         }).hasMessageContaining("Query and task retries are incompatible with non-transactional inserts");
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
             throws Exception
     {
@@ -118,24 +128,24 @@ public void tearDown()
     @Test
     public void testListSchemaNames()
     {
-        assertTrue(metadata.listSchemaNames(SESSION).containsAll(ImmutableSet.of("example", "tpch")));
+        assertThat(metadata.listSchemaNames(SESSION)).containsAll(ImmutableSet.of("example", "tpch"));
     }
 
     @Test
     public void testGetTableHandle()
     {
         JdbcTableHandle tableHandle = metadata.getTableHandle(SESSION, new SchemaTableName("example", "numbers"));
-        assertEquals(metadata.getTableHandle(SESSION, new SchemaTableName("example", "numbers")), tableHandle);
-        assertNull(metadata.getTableHandle(SESSION, new SchemaTableName("example", "unknown")));
-        assertNull(metadata.getTableHandle(SESSION, new SchemaTableName("unknown", "numbers")));
-        assertNull(metadata.getTableHandle(SESSION, new SchemaTableName("unknown", "unknown")));
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName("example", "numbers"))).isEqualTo(tableHandle);
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName("example", "unknown"))).isNull();
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName("unknown", "numbers"))).isNull();
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName("unknown", "unknown"))).isNull();
     }
 
     @Test
     public void testGetColumnHandles()
     {
         // known table
-        assertEquals(metadata.getColumnHandles(SESSION, tableHandle), ImmutableMap.of(
+        assertThat(metadata.getColumnHandles(SESSION, tableHandle)).isEqualTo(ImmutableMap.of(
                 "text", new JdbcColumnHandle("TEXT", JDBC_VARCHAR, VARCHAR),
                 "text_short", new JdbcColumnHandle("TEXT_SHORT", JDBC_VARCHAR, createVarcharType(32)),
                 "value", new JdbcColumnHandle("VALUE", JDBC_BIGINT, BIGINT)));
@@ -157,8 +167,8 @@ public void getTableMetadata()
     {
         // known table
         ConnectorTableMetadata tableMetadata = metadata.getTableMetadata(SESSION, tableHandle);
-        assertEquals(tableMetadata.getTable(), new SchemaTableName("example", "numbers"));
-        assertEquals(tableMetadata.getColumns(), ImmutableList.of(
+        assertThat(tableMetadata.getTable()).isEqualTo(new SchemaTableName("example", "numbers"));
+        assertThat(tableMetadata.getColumns()).isEqualTo(ImmutableList.of(
                 ColumnMetadata.builder().setName("text").setType(VARCHAR).setNullable(false).build(), // primary key is not null in H2
                 new ColumnMetadata("text_short", createVarcharType(32)),
                 new ColumnMetadata("value", BIGINT)));
@@ -166,8 +176,8 @@ public void getTableMetadata()
         // escaping name patterns
         JdbcTableHandle specialTableHandle = metadata.getTableHandle(SESSION, new SchemaTableName("exa_ple", "num_ers"));
         ConnectorTableMetadata specialTableMetadata = metadata.getTableMetadata(SESSION, specialTableHandle);
-        assertEquals(specialTableMetadata.getTable(), new SchemaTableName("exa_ple", "num_ers"));
-        assertEquals(specialTableMetadata.getColumns(), ImmutableList.of(
+        assertThat(specialTableMetadata.getTable()).isEqualTo(new SchemaTableName("exa_ple", "num_ers"));
+        assertThat(specialTableMetadata.getColumns()).isEqualTo(ImmutableList.of(
                 ColumnMetadata.builder().setName("te_t").setType(VARCHAR).setNullable(false).build(), // primary key is not null in H2
                 new ColumnMetadata("va%ue", BIGINT)));
 
@@ -188,7 +198,7 @@ private void unknownTableMetadata(JdbcTableHandle tableHandle)
     public void testListTables()
     {
         // all schemas
-        assertEquals(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.empty())), ImmutableSet.of(
+        assertThat(metadata.listTables(SESSION, Optional.empty())).containsOnly(
                 new SchemaTableName("example", "numbers"),
                 new SchemaTableName("example", "timestamps"),
                 new SchemaTableName("example", "view_source"),
@@ -196,31 +206,34 @@ public void testListTables()
                 new SchemaTableName("tpch", "orders"),
                 new SchemaTableName("tpch", "lineitem"),
                 new SchemaTableName("exa_ple", "table_with_float_col"),
-                new SchemaTableName("exa_ple", "num_ers")));
+                new SchemaTableName("exa_ple", "num_ers"));
 
         // specific schema
-        assertEquals(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.of("example"))), ImmutableSet.of(
-                new SchemaTableName("example", "numbers"),
-                new SchemaTableName("example", "timestamps"),
-                new SchemaTableName("example", "view_source"),
-                new SchemaTableName("example", "view")));
-        assertEquals(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.of("tpch"))), ImmutableSet.of(
-                new SchemaTableName("tpch", "orders"),
-                new SchemaTableName("tpch", "lineitem")));
-        assertEquals(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.of("exa_ple"))), ImmutableSet.of(
-                new SchemaTableName("exa_ple", "num_ers"),
-                new SchemaTableName("exa_ple", "table_with_float_col")));
+        assertThat(metadata.listTables(SESSION, Optional.of("example")))
+                .containsOnly(
+                        new SchemaTableName("example", "numbers"),
+                        new SchemaTableName("example", "timestamps"),
+                        new SchemaTableName("example", "view_source"),
+                        new SchemaTableName("example", "view"));
+
+        assertThat(metadata.listTables(SESSION, Optional.of("tpch")))
+                .containsOnly(
+                        new SchemaTableName("tpch", "orders"),
+                        new SchemaTableName("tpch", "lineitem"));
+
+        assertThat(metadata.listTables(SESSION, Optional.of("exa_ple")))
+                .containsOnly(
+                        new SchemaTableName("exa_ple", "num_ers"),
+                        new SchemaTableName("exa_ple", "table_with_float_col"));
 
         // unknown schema
-        assertEquals(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.of("unknown"))), ImmutableSet.of());
+        assertThat(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.of("unknown")))).isEmpty();
     }
 
     @Test
     public void getColumnMetadata()
     {
-        assertEquals(
-                metadata.getColumnMetadata(SESSION, tableHandle, new JdbcColumnHandle("text", JDBC_VARCHAR, VARCHAR)),
-                new ColumnMetadata("text", VARCHAR));
+        assertThat(metadata.getColumnMetadata(SESSION, tableHandle, new JdbcColumnHandle("text", JDBC_VARCHAR, VARCHAR))).isEqualTo(new ColumnMetadata("text", VARCHAR));
     }
 
     @Test
@@ -232,29 +245,29 @@ public void testCreateAndAlterTable()
         JdbcTableHandle handle = metadata.getTableHandle(SESSION, table);
 
         ConnectorTableMetadata layout = metadata.getTableMetadata(SESSION, handle);
-        assertEquals(layout.getTable(), table);
-        assertEquals(layout.getColumns().size(), 1);
-        assertEquals(layout.getColumns().get(0), new ColumnMetadata("text", VARCHAR));
+        assertThat(layout.getTable()).isEqualTo(table);
+        assertThat(layout.getColumns()).hasSize(1);
+        assertThat(layout.getColumns().get(0)).isEqualTo(new ColumnMetadata("text", VARCHAR));
 
         metadata.addColumn(SESSION, handle, new ColumnMetadata("x", VARCHAR));
         layout = metadata.getTableMetadata(SESSION, handle);
-        assertEquals(layout.getColumns().size(), 2);
-        assertEquals(layout.getColumns().get(0), new ColumnMetadata("text", VARCHAR));
-        assertEquals(layout.getColumns().get(1), new ColumnMetadata("x", VARCHAR));
+        assertThat(layout.getColumns()).hasSize(2);
+        assertThat(layout.getColumns().get(0)).isEqualTo(new ColumnMetadata("text", VARCHAR));
+        assertThat(layout.getColumns().get(1)).isEqualTo(new ColumnMetadata("x", VARCHAR));
 
         JdbcColumnHandle columnHandle = new JdbcColumnHandle("x", JDBC_VARCHAR, VARCHAR);
         metadata.dropColumn(SESSION, handle, columnHandle);
         layout = metadata.getTableMetadata(SESSION, handle);
-        assertEquals(layout.getColumns().size(), 1);
-        assertEquals(layout.getColumns().get(0), new ColumnMetadata("text", VARCHAR));
+        assertThat(layout.getColumns()).hasSize(1);
+        assertThat(layout.getColumns().get(0)).isEqualTo(new ColumnMetadata("text", VARCHAR));
 
         SchemaTableName newTableName = new SchemaTableName("example", "bar");
         metadata.renameTable(SESSION, handle, newTableName);
         handle = metadata.getTableHandle(SESSION, newTableName);
         layout = metadata.getTableMetadata(SESSION, handle);
-        assertEquals(layout.getTable(), newTableName);
-        assertEquals(layout.getColumns().size(), 1);
-        assertEquals(layout.getColumns().get(0), new ColumnMetadata("text", VARCHAR));
+        assertThat(layout.getTable()).isEqualTo(newTableName);
+        assertThat(layout.getColumns()).hasSize(1);
+        assertThat(layout.getColumns().get(0)).isEqualTo(new ColumnMetadata("text", VARCHAR));
     }
 
     @Test
@@ -304,7 +317,7 @@ public void testApplyFilterAfterAggregationPushdown()
         Domain domain = Domain.singleValue(VARCHAR, utf8Slice("one"));
         JdbcTableHandle tableHandleWithFilter = applyFilter(session, aggregatedTable, new Constraint(TupleDomain.withColumnDomains(ImmutableMap.of(groupByColumn, domain))));
 
-        assertEquals(tableHandleWithFilter.getConstraint().getDomains(), Optional.of(ImmutableMap.of(groupByColumn, domain)));
+        assertThat(tableHandleWithFilter.getConstraint().getDomains()).isEqualTo(Optional.of(ImmutableMap.of(groupByColumn, domain)));
     }
 
     @Test
@@ -323,14 +336,13 @@ public void testCombineFiltersWithAggregationPushdown()
 
         Domain secondDomain = Domain.multipleValues(VARCHAR, ImmutableList.of(utf8Slice("one"), utf8Slice("three")));
         JdbcTableHandle tableHandleWithFilter = applyFilter(session, aggregatedTable, new Constraint(TupleDomain.withColumnDomains(ImmutableMap.of(groupByColumn, secondDomain))));
-        assertEquals(
-                tableHandleWithFilter.getConstraint().getDomains(),
-                // The query effectively intersects firstDomain and secondDomain, but this is not visible in JdbcTableHandle.constraint,
-                // as firstDomain has been converted into a PreparedQuery
-                Optional.of(ImmutableMap.of(groupByColumn, secondDomain)));
-        assertEquals(
-                ((JdbcQueryRelationHandle) tableHandleWithFilter.getRelationHandle()).getPreparedQuery().getQuery(),
-                "SELECT \"TEXT\", count(*) AS \"_pfgnrtd_0\" " +
+        assertThat(tableHandleWithFilter.getConstraint().getDomains())
+                .isEqualTo(
+                    // The query effectively intersects firstDomain and secondDomain, but this is not visible in JdbcTableHandle.constraint,
+                    // as firstDomain has been converted into a PreparedQuery
+                    Optional.of(ImmutableMap.of(groupByColumn, secondDomain)));
+        assertThat(((JdbcQueryRelationHandle) tableHandleWithFilter.getRelationHandle()).getPreparedQuery().getQuery())
+                .isEqualTo("SELECT \"TEXT\", count(*) AS \"_pfgnrtd_0\" " +
                         "FROM \"" + database.getDatabaseName() + "\".\"EXAMPLE\".\"NUMBERS\" " +
                         "WHERE \"TEXT\" IN (?,?) " +
                         "GROUP BY \"TEXT\"");
@@ -354,12 +366,9 @@ public void testNonGroupKeyPredicatePushdown()
                 session,
                 aggregatedTable,
                 new Constraint(TupleDomain.withColumnDomains(ImmutableMap.of(nonGroupByColumn, domain))));
-        assertEquals(
-                tableHandleWithFilter.getConstraint().getDomains(),
-                Optional.of(ImmutableMap.of(nonGroupByColumn, domain)));
-        assertEquals(
-                ((JdbcQueryRelationHandle) tableHandleWithFilter.getRelationHandle()).getPreparedQuery().getQuery(),
-                "SELECT \"TEXT\", count(*) AS \"_pfgnrtd_0\" " +
+        assertThat(tableHandleWithFilter.getConstraint().getDomains()).isEqualTo(Optional.of(ImmutableMap.of(nonGroupByColumn, domain)));
+        assertThat(((JdbcQueryRelationHandle) tableHandleWithFilter.getRelationHandle()).getPreparedQuery().getQuery())
+                .isEqualTo("SELECT \"TEXT\", count(*) AS \"_pfgnrtd_0\" " +
                         "FROM \"" + database.getDatabaseName() + "\".\"EXAMPLE\".\"NUMBERS\" " +
                         "GROUP BY \"TEXT\"");
     }
@@ -383,16 +392,41 @@ public void testMultiGroupKeyPredicatePushdown()
                 session,
                 aggregatedTable,
                 new Constraint(TupleDomain.withColumnDomains(ImmutableMap.of(valueColumn, domain))));
-        assertEquals(
-                tableHandleWithFilter.getConstraint().getDomains(),
-                Optional.of(ImmutableMap.of(valueColumn, domain)));
-        assertEquals(
-                ((JdbcQueryRelationHandle) tableHandleWithFilter.getRelationHandle()).getPreparedQuery().getQuery(),
-                "SELECT \"TEXT\", \"VALUE\", count(*) AS \"_pfgnrtd_0\" " +
+        assertThat(tableHandleWithFilter.getConstraint().getDomains()).isEqualTo(Optional.of(ImmutableMap.of(valueColumn, domain)));
+        assertThat(((JdbcQueryRelationHandle) tableHandleWithFilter.getRelationHandle()).getPreparedQuery().getQuery())
+                .isEqualTo("SELECT \"TEXT\", \"VALUE\", count(*) AS \"_pfgnrtd_0\" " +
                         "FROM \"" + database.getDatabaseName() + "\".\"EXAMPLE\".\"NUMBERS\" " +
                         "GROUP BY GROUPING SETS ((\"TEXT\", \"VALUE\"), (\"TEXT\"))");
     }
 
+    @Test
+    public void testColumnAliasTruncation()
+    {
+        assertThat(createSyntheticColumn(column("column_0"), 999).getColumnName())
+                .isEqualTo("column_0_999");
+        assertThat(createSyntheticColumn(column("column_with_over_twenty_characters"), 100).getColumnName())
+                .isEqualTo("column_with_over_twenty_ch_100");
+        assertThat(createSyntheticColumn(column("column_with_over_twenty_characters"), Integer.MAX_VALUE).getColumnName())
+                .isEqualTo("column_with_over_tw_2147483647");
+    }
+
+    @Test
+    public void testNegativeSyntheticId()
+    {
+        JdbcColumnHandle column = column("column_0");
+
+        assertThatThrownBy(() -> createSyntheticColumn(column, -2147483648)).isInstanceOf(VerifyException.class);
+    }
+
+    private static JdbcColumnHandle column(String columnName)
+    {
+        return JdbcColumnHandle.builder()
+                .setJdbcTypeHandle(JDBC_VARCHAR)
+                .setColumnType(VARCHAR)
+                .setColumnName(columnName)
+                .build();
+    }
+
     private JdbcTableHandle applyCountAggregation(ConnectorSession session, ConnectorTableHandle tableHandle, List<List<ColumnHandle>> groupByColumns)
     {
         Optional<AggregationApplicationResult<ConnectorTableHandle>> aggResult = metadata.applyAggregation(
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDefaultJdbcQueryBuilder.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDefaultJdbcQueryBuilder.java
index c0afb6f9b632..0c04b64d4ad7 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDefaultJdbcQueryBuilder.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDefaultJdbcQueryBuilder.java
@@ -33,9 +33,10 @@
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.SqlTime;
 import io.trino.testing.TestingConnectorSession;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.math.BigDecimal;
 import java.sql.Connection;
@@ -89,9 +90,9 @@
 import static java.lang.String.format;
 import static java.time.temporal.ChronoUnit.DAYS;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestDefaultJdbcQueryBuilder
 {
     private static final JdbcNamedRelationHandle TEST_TABLE = new JdbcNamedRelationHandle(new SchemaTableName(
@@ -109,7 +110,7 @@ public class TestDefaultJdbcQueryBuilder
 
     private List<JdbcColumnHandle> columns;
 
-    @BeforeMethod
+    @BeforeEach
     public void setup()
             throws SQLException
     {
@@ -179,7 +180,7 @@ public void setup()
         }
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void teardown()
             throws Exception
     {
@@ -251,7 +252,7 @@ public void testNormalBuildSql()
                     builder.add((Long) resultSet.getObject("col_0"));
                 }
             }
-            assertEquals(builder.build(), ImmutableSet.of(68L, 180L, 196L));
+            assertThat(builder.build()).containsOnly(68L, 180L, 196L);
         }
     }
 
@@ -298,7 +299,7 @@ public void testBuildSqlWithDomainComplement()
                     builder.add((Long) resultSet.getObject("col_0"));
                 }
             }
-            assertEquals(builder.build(), LongStream.range(980, 1000).boxed().collect(toImmutableList()));
+            assertThat(builder.build()).containsExactlyElementsOf(LongStream.range(980, 1000).boxed().collect(toImmutableList()));
         }
     }
 
@@ -331,8 +332,8 @@ public void testBuildSqlWithFloat()
                     floatBuilder.add((Float) resultSet.getObject("col_10"));
                 }
             }
-            assertEquals(longBuilder.build(), ImmutableSet.of(0L, 14L));
-            assertEquals(floatBuilder.build(), ImmutableSet.of(100.0f, 114.0f));
+            assertThat(longBuilder.build()).containsOnly(0L, 14L);
+            assertThat(floatBuilder.build()).containsOnly(100.0f, 114.0f);
         }
     }
 
@@ -363,7 +364,7 @@ public void testBuildSqlWithVarchar()
                     builder.add((String) resultSet.getObject("col_3"));
                 }
             }
-            assertEquals(builder.build(), ImmutableSet.of("test_str_700", "test_str_701", "test_str_180", "test_str_196"));
+            assertThat(builder.build()).containsOnly("test_str_700", "test_str_701", "test_str_180", "test_str_196");
 
             assertContains(preparedStatement.toString(), "\"col_3\" >= ?");
             assertContains(preparedStatement.toString(), "\"col_3\" < ?");
@@ -447,8 +448,14 @@ public void testBuildSqlWithDateTime()
                     timeBuilder.add((Time) resultSet.getObject("col_5"));
                 }
             }
-            assertEquals(dateBuilder.build(), ImmutableSet.of(toDate(2016, 6, 7), toDate(2016, 6, 13), toDate(2016, 10, 21)));
-            assertEquals(timeBuilder.build(), ImmutableSet.of(toTime(8, 23, 37), toTime(20, 23, 37)));
+            assertThat(dateBuilder.build()).containsOnly(
+                    toDate(2016, 6, 7),
+                    toDate(2016, 6, 13),
+                    toDate(2016, 10, 21));
+
+            assertThat(timeBuilder.build()).containsOnly(
+                    toTime(8, 23, 37),
+                    toTime(20, 23, 37));
 
             assertContains(preparedStatement.toString(), "\"col_4\" >= ?");
             assertContains(preparedStatement.toString(), "\"col_4\" < ?");
@@ -486,11 +493,11 @@ public void testBuildSqlWithTimestamp()
                     builder.add((Timestamp) resultSet.getObject("col_6"));
                 }
             }
-            assertEquals(builder.build(), ImmutableSet.of(
+            assertThat(builder.build()).containsOnly(
                     toTimestamp(2016, 6, 3, 0, 23, 37),
                     toTimestamp(2016, 6, 8, 10, 23, 37),
                     toTimestamp(2016, 6, 9, 12, 23, 37),
-                    toTimestamp(2016, 10, 19, 16, 23, 37)));
+                    toTimestamp(2016, 10, 19, 16, 23, 37));
 
             assertContains(preparedStatement.toString(), "\"col_6\" > ?");
             assertContains(preparedStatement.toString(), "\"col_6\" <= ?");
@@ -527,7 +534,7 @@ public void testBuildJoinSql()
                     count++;
                 }
             }
-            assertEquals(count, 8);
+            assertThat(count).isEqualTo(8);
         }
     }
 
@@ -552,7 +559,7 @@ public void testBuildSqlWithLimit()
                     count++;
                 }
             }
-            assertEquals(count, 10);
+            assertThat(count).isEqualTo(10);
         }
     }
 
@@ -574,7 +581,7 @@ public void testEmptyBuildSql()
                     "FROM \"test_table\" " +
                     "WHERE \"col_1\" IS NULL");
             try (ResultSet resultSet = preparedStatement.executeQuery()) {
-                assertEquals(resultSet.next(), false);
+                assertThat(resultSet.next()).isFalse();
             }
         }
     }
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestForwardingConnection.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestForwardingConnection.java
index bcda536717bf..f906ccfb8eb4 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestForwardingConnection.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestForwardingConnection.java
@@ -14,7 +14,7 @@
 
 package io.trino.plugin.jdbc;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Connection;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestForwardingJdbcClient.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestForwardingJdbcClient.java
index 5b6b3344f7f5..dee67031533f 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestForwardingJdbcClient.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestForwardingJdbcClient.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 import static io.trino.spi.testing.InterfaceTestUtils.assertProperForwardingMethodsAreCalled;
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcCachingConnectorSmokeTest.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcCachingConnectorSmokeTest.java
index 9abcedccde86..a49967c249f4 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcCachingConnectorSmokeTest.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcCachingConnectorSmokeTest.java
@@ -16,116 +16,26 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
-import io.trino.testing.sql.JdbcSqlExecutor;
-import org.testng.annotations.Test;
-
-import java.util.Map;
-import java.util.Properties;
 
 import static io.trino.plugin.jdbc.H2QueryRunner.createH2QueryRunner;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestJdbcCachingConnectorSmokeTest
         extends BaseJdbcConnectorSmokeTest
 {
-    private JdbcSqlExecutor h2SqlExecutor;
-
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        Map<String, String> properties = ImmutableMap.<String, String>builder()
+        return createH2QueryRunner(REQUIRED_TPCH_TABLES, ImmutableMap.<String, String>builder()
                 .putAll(TestingH2JdbcModule.createProperties())
                 .put("metadata.cache-ttl", "10m")
                 .put("metadata.cache-missing", "true")
                 .put("case-insensitive-name-matching", "true")
-                .buildOrThrow();
-        this.h2SqlExecutor = new JdbcSqlExecutor(properties.get("connection-url"), new Properties());
-        return createH2QueryRunner(REQUIRED_TPCH_TABLES, properties);
-    }
-
-    @Test
-    public void testFlushMetadataCacheProcedureFlushMetadata()
-    {
-        h2SqlExecutor.execute("CREATE SCHEMA cached");
-        assertUpdate("CREATE TABLE cached.cached AS SELECT * FROM tpch.nation", 25);
-
-        // Verify that column cache is flushed
-        // Fill caches
-        assertQuerySucceeds("SELECT name, regionkey FROM cached.cached");
-
-        // Rename column outside Trino
-        h2SqlExecutor.execute("ALTER TABLE cached.cached ALTER COLUMN regionkey RENAME TO renamed");
-
-        String renamedColumnQuery = "SELECT name, renamed FROM cached.cached";
-        // Should fail as Trino has old metadata cached
-        assertThatThrownBy(() -> getQueryRunner().execute(renamedColumnQuery))
-                .hasMessageMatching(".*Column 'renamed' cannot be resolved");
-
-        // Should succeed after flushing Trino JDBC metadata cache
-        getQueryRunner().execute("CALL system.flush_metadata_cache()");
-        assertQuerySucceeds(renamedColumnQuery);
-
-        // Verify that table cache is flushed
-        String showTablesSql = "SHOW TABLES FROM cached";
-        // Fill caches
-        assertQuery(showTablesSql, "VALUES ('cached')");
-
-        // Rename table outside Trino
-        h2SqlExecutor.execute("ALTER TABLE cached.cached RENAME TO cached.renamed");
-
-        // Should still return old table name from cache
-        assertQuery(showTablesSql, "VALUES ('cached')");
-
-        // Should return new table name after cache flush
-        getQueryRunner().execute("CALL system.flush_metadata_cache()");
-        assertQuery(showTablesSql, "VALUES ('renamed')");
-
-        // Verify that schema cache is flushed
-        String showSchemasSql = "SHOW SCHEMAS from jdbc";
-        // Fill caches
-        assertQuery(showSchemasSql, "VALUES ('cached'), ('information_schema'), ('public'), ('tpch')");
-
-        // Rename schema outside Trino
-        h2SqlExecutor.execute("ALTER SCHEMA cached RENAME TO renamed");
-
-        // Should still return old schemas from cache
-        assertQuery(showSchemasSql, "VALUES ('cached'), ('information_schema'), ('public'), ('tpch')");
-
-        // Should return new schema name after cache flush
-        getQueryRunner().execute("CALL system.flush_metadata_cache()");
-        assertQuery(showSchemasSql, "VALUES ('information_schema'), ('renamed'), ('public'), ('tpch')");
-    }
-
-    @Test
-    public void testFlushMetadataCacheProcedureFlushIdentifierMapping()
-    {
-        assertUpdate("CREATE TABLE cached_name AS SELECT * FROM nation", 25);
-
-        // Should succeed. Trino will cache lowercase identifier mapping to uppercase
-        String query = "SELECT name, regionkey FROM cached_name";
-        assertQuerySucceeds(query);
-
-        // H2 stores unquoted names as uppercase. So this query should fail
-        assertThatThrownBy(() -> h2SqlExecutor.execute("SELECT * FROM tpch.\"cached_name\""))
-                .hasRootCauseMessage("Table \"cached_name\" not found (candidates are: \"CACHED_NAME\"); SQL statement:\n" +
-                        "SELECT * FROM tpch.\"cached_name\" [42103-214]");
-        // H2 stores unquoted names as uppercase. So this query should succeed
-        h2SqlExecutor.execute("SELECT * FROM tpch.\"CACHED_NAME\"");
-
-        // Rename to lowercase name outside Trino
-        h2SqlExecutor.execute("ALTER TABLE tpch.\"CACHED_NAME\" RENAME TO tpch.\"cached_name\"");
-
-        // Should fail as Trino has old lowercase identifier mapping to uppercase cached
-        assertThatThrownBy(() -> getQueryRunner().execute(query))
-                .hasMessageMatching("(?s)Table \"CACHED_NAME\" not found.*");
-
-        // Should succeed after flushing Trino cache
-        getQueryRunner().execute(getSession(), "CALL system.flush_metadata_cache()");
-        assertQuerySucceeds(query);
+                .buildOrThrow());
     }
 
     @Override
+    @SuppressWarnings("SwitchStatementWithTooFewBranches")
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
         switch (connectorBehavior) {
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcClient.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcClient.java
index 8d37fba442d0..4e3e7a3ecbdd 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcClient.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcClient.java
@@ -19,9 +19,10 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.SchemaTableName;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Optional;
 
@@ -41,9 +42,9 @@
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.util.Locale.ENGLISH;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestJdbcClient
 {
     private static final ConnectorSession session = testSessionBuilder().build().toConnectorSession();
@@ -52,7 +53,7 @@ public class TestJdbcClient
     private String catalogName;
     private JdbcClient jdbcClient;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -61,7 +62,7 @@ public void setUp()
         jdbcClient = database.getJdbcClient();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -72,27 +73,28 @@ public void tearDown()
     @Test
     public void testMetadata()
     {
-        assertTrue(jdbcClient.getSchemaNames(session).containsAll(ImmutableSet.of("example", "tpch")));
-        assertEquals(jdbcClient.getTableNames(session, Optional.of("example")), ImmutableList.of(
+        assertThat(jdbcClient.getSchemaNames(session).containsAll(ImmutableSet.of("example", "tpch"))).isTrue();
+        assertThat(jdbcClient.getTableNames(session, Optional.of("example"))).containsExactly(
                 new SchemaTableName("example", "numbers"),
                 new SchemaTableName("example", "timestamps"),
                 new SchemaTableName("example", "view_source"),
-                new SchemaTableName("example", "view")));
-        assertEquals(jdbcClient.getTableNames(session, Optional.of("tpch")), ImmutableList.of(
+                new SchemaTableName("example", "view"));
+
+        assertThat(jdbcClient.getTableNames(session, Optional.of("tpch"))).containsExactly(
                 new SchemaTableName("tpch", "lineitem"),
-                new SchemaTableName("tpch", "orders")));
+                new SchemaTableName("tpch", "orders"));
 
         SchemaTableName schemaTableName = new SchemaTableName("example", "numbers");
         Optional<JdbcTableHandle> table = jdbcClient.getTableHandle(session, schemaTableName);
-        assertTrue(table.isPresent(), "table is missing");
-        assertEquals(table.get().getRequiredNamedRelation().getRemoteTableName().getCatalogName().orElse(null), catalogName.toUpperCase(ENGLISH));
-        assertEquals(table.get().getRequiredNamedRelation().getRemoteTableName().getSchemaName().orElse(null), "EXAMPLE");
-        assertEquals(table.get().getRequiredNamedRelation().getRemoteTableName().getTableName(), "NUMBERS");
-        assertEquals(table.get().getRequiredNamedRelation().getSchemaTableName(), schemaTableName);
-        assertEquals(jdbcClient.getColumns(session, table.orElse(null)), ImmutableList.of(
+        assertThat(table.isPresent()).withFailMessage("table is missing").isTrue();
+        assertThat(table.get().getRequiredNamedRelation().getRemoteTableName().getCatalogName().orElse(null)).isEqualTo(catalogName.toUpperCase(ENGLISH));
+        assertThat(table.get().getRequiredNamedRelation().getRemoteTableName().getSchemaName().orElse(null)).isEqualTo("EXAMPLE");
+        assertThat(table.get().getRequiredNamedRelation().getRemoteTableName().getTableName()).isEqualTo("NUMBERS");
+        assertThat(table.get().getRequiredNamedRelation().getSchemaTableName()).isEqualTo(schemaTableName);
+        assertThat(jdbcClient.getColumns(session, table.orElse(null))).containsExactly(
                 new JdbcColumnHandle("TEXT", JDBC_VARCHAR, VARCHAR),
                 new JdbcColumnHandle("TEXT_SHORT", JDBC_VARCHAR, createVarcharType(32)),
-                new JdbcColumnHandle("VALUE", JDBC_BIGINT, BIGINT)));
+                new JdbcColumnHandle("VALUE", JDBC_BIGINT, BIGINT));
     }
 
     @Test
@@ -100,10 +102,10 @@ public void testMetadataWithSchemaPattern()
     {
         SchemaTableName schemaTableName = new SchemaTableName("exa_ple", "num_ers");
         Optional<JdbcTableHandle> table = jdbcClient.getTableHandle(session, schemaTableName);
-        assertTrue(table.isPresent(), "table is missing");
-        assertEquals(jdbcClient.getColumns(session, table.get()), ImmutableList.of(
+        assertThat(table.isPresent()).withFailMessage("table is missing").isTrue();
+        assertThat(jdbcClient.getColumns(session, table.get())).containsExactly(
                 new JdbcColumnHandle("TE_T", JDBC_VARCHAR, VARCHAR),
-                new JdbcColumnHandle("VA%UE", JDBC_BIGINT, BIGINT)));
+                new JdbcColumnHandle("VA%UE", JDBC_BIGINT, BIGINT));
     }
 
     @Test
@@ -111,12 +113,12 @@ public void testMetadataWithFloatAndDoubleCol()
     {
         SchemaTableName schemaTableName = new SchemaTableName("exa_ple", "table_with_float_col");
         Optional<JdbcTableHandle> table = jdbcClient.getTableHandle(session, schemaTableName);
-        assertTrue(table.isPresent(), "table is missing");
-        assertEquals(jdbcClient.getColumns(session, table.get()), ImmutableList.of(
+        assertThat(table.isPresent()).withFailMessage("table is missing").isTrue();
+        assertThat(jdbcClient.getColumns(session, table.get())).containsExactly(
                 new JdbcColumnHandle("COL1", JDBC_BIGINT, BIGINT),
                 new JdbcColumnHandle("COL2", JDBC_DOUBLE, DOUBLE),
                 new JdbcColumnHandle("COL3", JDBC_DOUBLE, DOUBLE),
-                new JdbcColumnHandle("COL4", JDBC_REAL, REAL)));
+                new JdbcColumnHandle("COL4", JDBC_REAL, REAL));
     }
 
     @Test
@@ -124,11 +126,11 @@ public void testMetadataWithTimestampCol()
     {
         SchemaTableName schemaTableName = new SchemaTableName("example", "timestamps");
         Optional<JdbcTableHandle> table = jdbcClient.getTableHandle(session, schemaTableName);
-        assertTrue(table.isPresent(), "table is missing");
-        assertEquals(jdbcClient.getColumns(session, table.get()), ImmutableList.of(
+        assertThat(table.isPresent()).withFailMessage("table is missing").isTrue();
+        assertThat(jdbcClient.getColumns(session, table.get())).containsExactly(
                 new JdbcColumnHandle("TS_3", JDBC_TIMESTAMP, TIMESTAMP_MILLIS),
                 new JdbcColumnHandle("TS_6", JDBC_TIMESTAMP, TIMESTAMP_MICROS),
-                new JdbcColumnHandle("TS_9", JDBC_TIMESTAMP, TIMESTAMP_NANOS)));
+                new JdbcColumnHandle("TS_9", JDBC_TIMESTAMP, TIMESTAMP_NANOS));
     }
 
     @Test
@@ -137,7 +139,7 @@ public void testCreateSchema()
         String schemaName = "test schema";
         jdbcClient.createSchema(session, schemaName);
         assertThat(jdbcClient.getSchemaNames(session)).contains(schemaName);
-        jdbcClient.dropSchema(session, schemaName);
+        jdbcClient.dropSchema(session, schemaName, false);
         assertThat(jdbcClient.getSchemaNames(session)).doesNotContain(schemaName);
     }
 
@@ -155,8 +157,10 @@ public void testRenameTable()
         jdbcClient.createTable(session, tableMetadata);
         jdbcClient.renameTable(session, jdbcClient.getTableHandle(session, oldTable).get(), newTable);
         jdbcClient.dropTable(session, jdbcClient.getTableHandle(session, newTable).get());
-        jdbcClient.dropSchema(session, schemaName);
-        assertThat(jdbcClient.getTableNames(session, Optional.empty())).doesNotContain(oldTable).doesNotContain(newTable);
+        jdbcClient.dropSchema(session, schemaName, false);
+        assertThat(jdbcClient.getTableNames(session, Optional.empty()))
+                .doesNotContain(oldTable)
+                .doesNotContain(newTable);
         assertThat(jdbcClient.getSchemaNames(session)).doesNotContain(schemaName);
     }
 }
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcColumnHandle.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcColumnHandle.java
index b0d60b4c9e9d..dffac4e56588 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcColumnHandle.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcColumnHandle.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc;
 
 import io.airlift.testing.EquivalenceTester;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectionCreation.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectionCreation.java
index 3e25566b866c..c894ac616299 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectionCreation.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectionCreation.java
@@ -19,13 +19,12 @@
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
+import io.opentelemetry.api.OpenTelemetry;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.credential.EmptyCredentialProvider;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.testing.QueryRunner;
 import org.h2.Driver;
-import org.intellij.lang.annotations.Language;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.Properties;
@@ -37,7 +36,6 @@
 import static io.trino.tpch.TpchTable.REGION;
 import static java.util.Objects.requireNonNull;
 
-@Test(singleThreaded = true) // inherited from BaseJdbcConnectionCreationTest
 public class TestJdbcConnectionCreation
         extends BaseJdbcConnectionCreationTest
 {
@@ -46,7 +44,7 @@ protected QueryRunner createQueryRunner()
             throws Exception
     {
         String connectionUrl = createH2ConnectionUrl();
-        DriverConnectionFactory delegate = new DriverConnectionFactory(new Driver(), connectionUrl, new Properties(), new EmptyCredentialProvider());
+        DriverConnectionFactory delegate = new DriverConnectionFactory(new Driver(), connectionUrl, new Properties(), new EmptyCredentialProvider(), OpenTelemetry.noop());
         this.connectionFactory = new ConnectionCountingConnectionFactory(delegate);
         return createH2QueryRunner(
                 ImmutableList.of(NATION, REGION),
@@ -56,37 +54,29 @@ protected QueryRunner createQueryRunner()
                 new TestingConnectionH2Module(connectionFactory));
     }
 
-    @Test(dataProvider = "testCases")
-    public void testJdbcConnectionCreations(@Language("SQL") String query, int expectedJdbcConnectionsCount, Optional<String> errorMessage)
+    @Test
+    public void testJdbcConnectionCreations()
     {
-        assertJdbcConnections(query, expectedJdbcConnectionsCount, errorMessage);
-    }
-
-    @DataProvider
-    public Object[][] testCases()
-    {
-        return new Object[][] {
-                {"SELECT * FROM nation LIMIT 1", 2, Optional.empty()},
-                {"SELECT * FROM nation ORDER BY nationkey LIMIT 1", 2, Optional.empty()},
-                {"SELECT * FROM nation WHERE nationkey = 1", 2, Optional.empty()},
-                {"SELECT avg(nationkey) FROM nation", 2, Optional.empty()},
-                {"SELECT * FROM nation, region", 3, Optional.empty()},
-                {"SELECT * FROM nation n, region r WHERE n.regionkey = r.regionkey", 3, Optional.empty()},
-                {"SELECT * FROM nation JOIN region USING(regionkey)", 3, Optional.empty()},
-                {"SELECT * FROM information_schema.schemata", 1, Optional.empty()},
-                {"SELECT * FROM information_schema.tables", 1, Optional.empty()},
-                {"SELECT * FROM information_schema.columns", 1, Optional.empty()},
-                {"SELECT * FROM nation", 2, Optional.empty()},
-                {"CREATE TABLE copy_of_nation AS SELECT * FROM nation", 6, Optional.empty()},
-                {"INSERT INTO copy_of_nation SELECT * FROM nation", 6, Optional.empty()},
-                {"DELETE FROM copy_of_nation WHERE nationkey = 3", 1, Optional.empty()},
-                {"UPDATE copy_of_nation SET name = 'POLAND' WHERE nationkey = 1", 1, Optional.of(MODIFYING_ROWS_MESSAGE)},
-                {"MERGE INTO copy_of_nation n USING region r ON r.regionkey= n.regionkey WHEN MATCHED THEN DELETE", 1, Optional.of(MODIFYING_ROWS_MESSAGE)},
-                {"DROP TABLE copy_of_nation", 1, Optional.empty()},
-                {"SHOW SCHEMAS", 1, Optional.empty()},
-                {"SHOW TABLES", 1, Optional.empty()},
-                {"SHOW STATS FOR nation", 1, Optional.empty()},
-        };
+        assertJdbcConnections("SELECT * FROM nation LIMIT 1", 2, Optional.empty());
+        assertJdbcConnections("SELECT * FROM nation ORDER BY nationkey LIMIT 1", 2, Optional.empty());
+        assertJdbcConnections("SELECT * FROM nation WHERE nationkey = 1", 2, Optional.empty());
+        assertJdbcConnections("SELECT avg(nationkey) FROM nation", 2, Optional.empty());
+        assertJdbcConnections("SELECT * FROM nation, region", 3, Optional.empty());
+        assertJdbcConnections("SELECT * FROM nation n, region r WHERE n.regionkey = r.regionkey", 3, Optional.empty());
+        assertJdbcConnections("SELECT * FROM nation JOIN region USING(regionkey)", 3, Optional.empty());
+        assertJdbcConnections("SELECT * FROM information_schema.schemata", 1, Optional.empty());
+        assertJdbcConnections("SELECT * FROM information_schema.tables", 1, Optional.empty());
+        assertJdbcConnections("SELECT * FROM information_schema.columns", 1, Optional.empty());
+        assertJdbcConnections("SELECT * FROM nation", 2, Optional.empty());
+        assertJdbcConnections("CREATE TABLE copy_of_nation AS SELECT * FROM nation", 6, Optional.empty());
+        assertJdbcConnections("INSERT INTO copy_of_nation SELECT * FROM nation", 6, Optional.empty());
+        assertJdbcConnections("DELETE FROM copy_of_nation WHERE nationkey = 3", 1, Optional.empty());
+        assertJdbcConnections("UPDATE copy_of_nation SET name = 'POLAND' WHERE nationkey = 1", 1, Optional.empty());
+        assertJdbcConnections("MERGE INTO copy_of_nation n USING region r ON r.regionkey= n.regionkey WHEN MATCHED THEN DELETE", 1, Optional.of(MODIFYING_ROWS_MESSAGE));
+        assertJdbcConnections("DROP TABLE copy_of_nation", 1, Optional.empty());
+        assertJdbcConnections("SHOW SCHEMAS", 1, Optional.empty());
+        assertJdbcConnections("SHOW TABLES", 1, Optional.empty());
+        assertJdbcConnections("SHOW STATS FOR nation", 1, Optional.empty());
     }
 
     private static class TestingConnectionH2Module
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectorTest.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectorTest.java
index 055bd544179e..ce5961f0ab33 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectorTest.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectorTest.java
@@ -56,42 +56,30 @@ protected QueryRunner createQueryRunner()
         return createH2QueryRunner(REQUIRED_TPCH_TABLES, properties);
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_LIMIT_PUSHDOWN:
-            case SUPPORTS_TOPN_PUSHDOWN:
-            case SUPPORTS_AGGREGATION_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-            case SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN_WITH_COMMENT:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN_WITH_COMMENT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN,
+                    SUPPORTS_ARRAY,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
+                    SUPPORTS_LIMIT_PUSHDOWN,
+                    SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
-    @Test(dataProvider = "largeInValuesCount")
-    public void testLargeIn(int valuesCount)
+    @org.junit.jupiter.api.Test
+    public void testLargeIn()
     {
-        throw new SkipException("This test should pass with H2, but takes too long (currently over a mninute) and is not that important");
+        // This test should pass with H2, but takes too long (currently over a mninute) and is not that important
     }
 
     @Override
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcDynamicFilteringConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcDynamicFilteringConfig.java
index db0cc50f995e..824525c8cdee 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcDynamicFilteringConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcDynamicFilteringConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcDynamicFilteringSplitManager.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcDynamicFilteringSplitManager.java
index 4615bbd02894..68b43110f8d3 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcDynamicFilteringSplitManager.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcDynamicFilteringSplitManager.java
@@ -26,7 +26,7 @@
 import io.trino.testing.TestingConnectorSession;
 import io.trino.testing.TestingSplitManager;
 import io.trino.testing.TestingTransactionHandle;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.Set;
@@ -37,8 +37,7 @@
 import static io.trino.plugin.jdbc.JdbcDynamicFilteringSessionProperties.DYNAMIC_FILTERING_WAIT_TIMEOUT;
 import static io.trino.spi.connector.Constraint.alwaysTrue;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJdbcDynamicFilteringSplitManager
 {
@@ -102,9 +101,9 @@ public void testBlockingTimeout()
 
         // verify that getNextBatch() future completes after a timeout
         CompletableFuture<?> future = splitSource.getNextBatch(100);
-        assertFalse(future.isDone());
+        assertThat(future.isDone()).isFalse();
         future.get(10, SECONDS);
-        assertTrue(splitSource.isFinished());
+        assertThat(splitSource.isFinished()).isTrue();
         splitSource.close();
     }
 }
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcFlushMetadataCacheProcedure.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcFlushMetadataCacheProcedure.java
new file mode 100644
index 000000000000..8fd09f0a4b8e
--- /dev/null
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcFlushMetadataCacheProcedure.java
@@ -0,0 +1,129 @@
+/*
+ * Licensed 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 io.trino.plugin.jdbc;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.sql.JdbcSqlExecutor;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import static io.trino.plugin.jdbc.H2QueryRunner.createH2QueryRunner;
+import static io.trino.tpch.TpchTable.NATION;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestJdbcFlushMetadataCacheProcedure
+        extends AbstractTestQueryFramework
+{
+    private JdbcSqlExecutor h2SqlExecutor;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .putAll(TestingH2JdbcModule.createProperties())
+                .put("metadata.cache-ttl", "10m")
+                .put("metadata.cache-missing", "true")
+                .put("case-insensitive-name-matching", "true")
+                .buildOrThrow();
+        this.h2SqlExecutor = new JdbcSqlExecutor(properties.get("connection-url"), new Properties());
+        return createH2QueryRunner(List.of(NATION), properties);
+    }
+
+    @Test
+    public void testFlushMetadataCacheProcedureFlushMetadata()
+    {
+        h2SqlExecutor.execute("CREATE SCHEMA cached");
+        assertUpdate("CREATE TABLE cached.cached AS SELECT * FROM tpch.nation", 25);
+
+        // Verify that column cache is flushed
+        // Fill caches
+        assertQuerySucceeds("SELECT name, regionkey FROM cached.cached");
+
+        // Rename column outside Trino
+        h2SqlExecutor.execute("ALTER TABLE cached.cached ALTER COLUMN regionkey RENAME TO renamed");
+
+        String renamedColumnQuery = "SELECT name, renamed FROM cached.cached";
+        // Should fail as Trino has old metadata cached
+        assertThatThrownBy(() -> getQueryRunner().execute(renamedColumnQuery))
+                .hasMessageMatching(".*Column 'renamed' cannot be resolved");
+
+        // Should succeed after flushing Trino JDBC metadata cache
+        getQueryRunner().execute("CALL system.flush_metadata_cache()");
+        assertQuerySucceeds(renamedColumnQuery);
+
+        // Verify that table cache is flushed
+        String showTablesSql = "SHOW TABLES FROM cached";
+        // Fill caches
+        assertQuery(showTablesSql, "VALUES ('cached')");
+
+        // Rename table outside Trino
+        h2SqlExecutor.execute("ALTER TABLE cached.cached RENAME TO cached.renamed");
+
+        // Should still return old table name from cache
+        assertQuery(showTablesSql, "VALUES ('cached')");
+
+        // Should return new table name after cache flush
+        getQueryRunner().execute("CALL system.flush_metadata_cache()");
+        assertQuery(showTablesSql, "VALUES ('renamed')");
+
+        // Verify that schema cache is flushed
+        String showSchemasSql = "SHOW SCHEMAS from jdbc";
+        // Fill caches
+        assertQuery(showSchemasSql, "VALUES ('cached'), ('information_schema'), ('public'), ('tpch')");
+
+        // Rename schema outside Trino
+        h2SqlExecutor.execute("ALTER SCHEMA cached RENAME TO renamed");
+
+        // Should still return old schemas from cache
+        assertQuery(showSchemasSql, "VALUES ('cached'), ('information_schema'), ('public'), ('tpch')");
+
+        // Should return new schema name after cache flush
+        getQueryRunner().execute("CALL system.flush_metadata_cache()");
+        assertQuery(showSchemasSql, "VALUES ('information_schema'), ('renamed'), ('public'), ('tpch')");
+    }
+
+    @Test
+    public void testFlushMetadataCacheProcedureFlushIdentifierMapping()
+    {
+        assertUpdate("CREATE TABLE cached_name AS SELECT * FROM nation", 25);
+
+        // Should succeed. Trino will cache lowercase identifier mapping to uppercase
+        String query = "SELECT name, regionkey FROM cached_name";
+        assertQuerySucceeds(query);
+
+        // H2 stores unquoted names as uppercase. So this query should fail
+        assertThatThrownBy(() -> h2SqlExecutor.execute("SELECT * FROM tpch.\"cached_name\""))
+                .hasRootCauseMessage("Table \"cached_name\" not found (candidates are: \"CACHED_NAME\"); SQL statement:\n" +
+                        "SELECT * FROM tpch.\"cached_name\" [42103-224]");
+        // H2 stores unquoted names as uppercase. So this query should succeed
+        h2SqlExecutor.execute("SELECT * FROM tpch.\"CACHED_NAME\"");
+
+        // Rename to lowercase name outside Trino
+        h2SqlExecutor.execute("ALTER TABLE tpch.\"CACHED_NAME\" RENAME TO tpch.\"cached_name\"");
+
+        // Should fail as Trino has old lowercase identifier mapping to uppercase cached
+        assertThatThrownBy(() -> getQueryRunner().execute(query))
+                .hasMessageMatching("(?s)Table \"CACHED_NAME\" not found.*");
+
+        // Should succeed after flushing Trino cache
+        getQueryRunner().execute(getSession(), "CALL system.flush_metadata_cache()");
+        assertQuerySucceeds(query);
+    }
+}
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcJoinPushdownConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcJoinPushdownConfig.java
index e51a320b88d6..cee596f251cd 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcJoinPushdownConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcJoinPushdownConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.configuration.testing.ConfigAssertions;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcMetadataConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcMetadataConfig.java
index ebc0bd2e87fb..ed09ca49e4ba 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcMetadataConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcMetadataConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcOutputTableHandle.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcOutputTableHandle.java
index b31a05689545..08c855703ee0 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcOutputTableHandle.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcOutputTableHandle.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcPlugin.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcPlugin.java
index 687315a3dd08..53650c1e182d 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcPlugin.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcPlugin.java
@@ -17,11 +17,11 @@
 import io.trino.spi.Plugin;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.plugin.jdbc.mapping.MappingConfig.CASE_INSENSITIVE_NAME_MATCHING;
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
+import static io.trino.plugin.base.mapping.MappingConfig.CASE_INSENSITIVE_NAME_MATCHING;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
 
 public class TestJdbcPlugin
 {
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcRecordSet.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcRecordSet.java
index 365c70ba591b..fd88605969c9 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcRecordSet.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcRecordSet.java
@@ -18,9 +18,10 @@
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.connector.SchemaTableName;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -35,10 +36,10 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createVarcharType;
 import static io.trino.testing.TestingConnectorSession.SESSION;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestJdbcRecordSet
 {
     private TestingDatabase database;
@@ -48,7 +49,7 @@ public class TestJdbcRecordSet
     private Map<String, JdbcColumnHandle> columnHandles;
     private ExecutorService executor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -60,7 +61,7 @@ public void setUp()
         executor = newDirectExecutorService();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -78,21 +79,21 @@ public void testGetColumnTypes()
                 new JdbcColumnHandle("text", JDBC_VARCHAR, VARCHAR),
                 new JdbcColumnHandle("text_short", JDBC_VARCHAR, createVarcharType(32)),
                 new JdbcColumnHandle("value", JDBC_BIGINT, BIGINT)));
-        assertEquals(recordSet.getColumnTypes(), ImmutableList.of(VARCHAR, createVarcharType(32), BIGINT));
+        assertThat(recordSet.getColumnTypes()).containsExactly(VARCHAR, createVarcharType(32), BIGINT);
 
         recordSet = createRecordSet(ImmutableList.of(
                 new JdbcColumnHandle("value", JDBC_BIGINT, BIGINT),
                 new JdbcColumnHandle("text", JDBC_VARCHAR, VARCHAR)));
-        assertEquals(recordSet.getColumnTypes(), ImmutableList.of(BIGINT, VARCHAR));
+        assertThat(recordSet.getColumnTypes()).containsExactly(BIGINT, VARCHAR);
 
         recordSet = createRecordSet(ImmutableList.of(
                 new JdbcColumnHandle("value", JDBC_BIGINT, BIGINT),
                 new JdbcColumnHandle("value", JDBC_BIGINT, BIGINT),
                 new JdbcColumnHandle("text", JDBC_VARCHAR, VARCHAR)));
-        assertEquals(recordSet.getColumnTypes(), ImmutableList.of(BIGINT, BIGINT, VARCHAR));
+        assertThat(recordSet.getColumnTypes()).containsExactly(BIGINT, BIGINT, VARCHAR);
 
         recordSet = createRecordSet(ImmutableList.of());
-        assertEquals(recordSet.getColumnTypes(), ImmutableList.of());
+        assertThat(recordSet.getColumnTypes()).isEmpty();
     }
 
     @Test
@@ -104,20 +105,20 @@ public void testCursorSimple()
                 columnHandles.get("value")));
 
         try (RecordCursor cursor = recordSet.cursor()) {
-            assertEquals(cursor.getType(0), VARCHAR);
-            assertEquals(cursor.getType(1), createVarcharType(32));
-            assertEquals(cursor.getType(2), BIGINT);
+            assertThat(cursor.getType(0)).isEqualTo(VARCHAR);
+            assertThat(cursor.getType(1)).isEqualTo(createVarcharType(32));
+            assertThat(cursor.getType(2)).isEqualTo(BIGINT);
 
             Map<String, Long> data = new LinkedHashMap<>();
             while (cursor.advanceNextPosition()) {
                 data.put(cursor.getSlice(0).toStringUtf8(), cursor.getLong(2));
-                assertEquals(cursor.getSlice(0), cursor.getSlice(1));
-                assertFalse(cursor.isNull(0));
-                assertFalse(cursor.isNull(1));
-                assertFalse(cursor.isNull(2));
+                assertThat(cursor.getSlice(0)).isEqualTo(cursor.getSlice(1));
+                assertThat(cursor.isNull(0)).isFalse();
+                assertThat(cursor.isNull(1)).isFalse();
+                assertThat(cursor.isNull(2)).isFalse();
             }
 
-            assertEquals(data, ImmutableMap.<String, Long>builder()
+            assertThat(data).isEqualTo(ImmutableMap.<String, Long>builder()
                     .put("one", 1L)
                     .put("two", 2L)
                     .put("three", 3L)
@@ -126,7 +127,7 @@ public void testCursorSimple()
                     .put("twelve", 12L)
                     .buildOrThrow());
 
-            assertThat(cursor.getReadTimeNanos()).isGreaterThan(0);
+            assertThat(cursor.getReadTimeNanos()).isPositive();
         }
     }
 
@@ -139,17 +140,17 @@ public void testCursorMixedOrder()
                 columnHandles.get("text")));
 
         try (RecordCursor cursor = recordSet.cursor()) {
-            assertEquals(cursor.getType(0), BIGINT);
-            assertEquals(cursor.getType(1), BIGINT);
-            assertEquals(cursor.getType(2), VARCHAR);
+            assertThat(cursor.getType(0)).isEqualTo(BIGINT);
+            assertThat(cursor.getType(1)).isEqualTo(BIGINT);
+            assertThat(cursor.getType(2)).isEqualTo(VARCHAR);
 
             Map<String, Long> data = new LinkedHashMap<>();
             while (cursor.advanceNextPosition()) {
-                assertEquals(cursor.getLong(0), cursor.getLong(1));
+                assertThat(cursor.getLong(0)).isEqualTo(cursor.getLong(1));
                 data.put(cursor.getSlice(2).toStringUtf8(), cursor.getLong(0));
             }
 
-            assertEquals(data, ImmutableMap.<String, Long>builder()
+            assertThat(data).isEqualTo(ImmutableMap.<String, Long>builder()
                     .put("one", 1L)
                     .put("two", 2L)
                     .put("three", 3L)
@@ -158,7 +159,7 @@ public void testCursorMixedOrder()
                     .put("twelve", 12L)
                     .buildOrThrow());
 
-            assertThat(cursor.getReadTimeNanos()).isGreaterThan(0);
+            assertThat(cursor.getReadTimeNanos()).isPositive();
         }
     }
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcRecordSetProvider.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcRecordSetProvider.java
index 228583b0a0cd..91e664ebf19f 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcRecordSetProvider.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcRecordSetProvider.java
@@ -27,9 +27,10 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.predicate.ValueSet;
 import io.trino.testing.TestingConnectorSession;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -46,9 +47,10 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createVarcharType;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestJdbcRecordSetProvider
 {
     private static final ConnectorSession SESSION = TestingConnectorSession.builder()
@@ -66,7 +68,7 @@ public class TestJdbcRecordSetProvider
 
     private ExecutorService executor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -83,7 +85,7 @@ public void setUp()
         executor = newDirectExecutorService();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -100,17 +102,17 @@ public void testGetRecordSet()
         ConnectorTransactionHandle transaction = new JdbcTransactionHandle();
         JdbcRecordSetProvider recordSetProvider = new JdbcRecordSetProvider(jdbcClient, executor);
         RecordSet recordSet = recordSetProvider.getRecordSet(transaction, SESSION, split, table, ImmutableList.of(textColumn, textShortColumn, valueColumn));
-        assertNotNull(recordSet, "recordSet is null");
+        assertThat(recordSet).withFailMessage("recordSet is null").isNotNull();
 
         RecordCursor cursor = recordSet.cursor();
-        assertNotNull(cursor, "cursor is null");
+        assertThat(cursor).withFailMessage("cursor is null").isNotNull();
 
         Map<String, Long> data = new LinkedHashMap<>();
         while (cursor.advanceNextPosition()) {
             data.put(cursor.getSlice(0).toStringUtf8(), cursor.getLong(2));
-            assertEquals(cursor.getSlice(0), cursor.getSlice(1));
+            assertThat(cursor.getSlice(0)).isEqualTo(cursor.getSlice(1));
         }
-        assertEquals(data, ImmutableMap.<String, Long>builder()
+        assertThat(data).isEqualTo(ImmutableMap.<String, Long>builder()
                 .put("one", 1L)
                 .put("two", 2L)
                 .put("three", 3L)
@@ -202,7 +204,8 @@ private RecordCursor getCursor(JdbcTableHandle jdbcTableHandle, List<JdbcColumnH
                 Optional.empty(),
                 jdbcTableHandle.getOtherReferencedTables(),
                 jdbcTableHandle.getNextSyntheticColumnId(),
-                Optional.empty());
+                Optional.empty(),
+                ImmutableList.of());
 
         ConnectorSplitSource splits = jdbcClient.getSplits(SESSION, jdbcTableHandle);
         JdbcSplit split = (JdbcSplit) getOnlyElement(getFutureValue(splits.getNextBatch(1000)).getSplits());
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcSplit.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcSplit.java
index f4a1852d3767..aa3202cbce9c 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcSplit.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcSplit.java
@@ -13,14 +13,13 @@
  */
 package io.trino.plugin.jdbc;
 
-import com.google.common.collect.ImmutableList;
 import io.airlift.json.JsonCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
 import static io.airlift.json.JsonCodec.jsonCodec;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJdbcSplit
 {
@@ -30,11 +29,11 @@ public class TestJdbcSplit
     public void testAddresses()
     {
         // split uses "example" scheme so no addresses are available and is not remotely accessible
-        assertEquals(split.getAddresses(), ImmutableList.of());
-        assertEquals(split.isRemotelyAccessible(), true);
+        assertThat(split.getAddresses()).isEmpty();
+        assertThat(split.isRemotelyAccessible()).isTrue();
 
         JdbcSplit jdbcSplit = new JdbcSplit(Optional.empty());
-        assertEquals(jdbcSplit.getAddresses(), ImmutableList.of());
+        assertThat(jdbcSplit.getAddresses()).isEmpty();
     }
 
     @Test
@@ -43,9 +42,9 @@ public void testJsonRoundTrip()
         JsonCodec<JdbcSplit> codec = jsonCodec(JdbcSplit.class);
         String json = codec.toJson(split);
         JdbcSplit copy = codec.fromJson(json);
-        assertEquals(copy.getAdditionalPredicate(), split.getAdditionalPredicate());
+        assertThat(copy.getAdditionalPredicate()).isEqualTo(split.getAdditionalPredicate());
 
-        assertEquals(copy.getAddresses(), ImmutableList.of());
-        assertEquals(copy.isRemotelyAccessible(), true);
+        assertThat(copy.getAddresses()).isEmpty();
+        assertThat(copy.isRemotelyAccessible()).isTrue();
     }
 }
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcStatisticsConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcStatisticsConfig.java
index 246a11da90b2..b48d9f144568 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcStatisticsConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcStatisticsConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcTableHandle.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcTableHandle.java
index 9f7baa9f47a1..c638aecf55da 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcTableHandle.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcTableHandle.java
@@ -19,7 +19,7 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.IntegerType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Types;
 import java.util.Optional;
@@ -73,7 +73,8 @@ private JdbcTableHandle createQueryBasedHandle()
                 Optional.of(ImmutableList.of(new JdbcColumnHandle("i", type, IntegerType.INTEGER))),
                 Optional.of(ImmutableSet.of()),
                 0,
-                Optional.empty());
+                Optional.empty(),
+                ImmutableList.of());
     }
 
     private JdbcTableHandle createNamedHandle()
@@ -91,6 +92,7 @@ private JdbcTableHandle createNamedHandle()
                 Optional.of(ImmutableList.of(new JdbcColumnHandle("i", type, IntegerType.INTEGER))),
                 Optional.of(ImmutableSet.of()),
                 0,
-                Optional.empty());
+                Optional.empty(),
+                ImmutableList.of());
     }
 }
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcTableProperties.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcTableProperties.java
index 7c80f854326f..2c354d50aa46 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcTableProperties.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcTableProperties.java
@@ -19,18 +19,15 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static io.trino.plugin.jdbc.H2QueryRunner.createH2QueryRunner;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.fail;
+import static org.assertj.core.api.Assertions.fail;
 
-// Single-threaded because of shared mutable state, e.g. onGetTableProperties
-@Test(singleThreaded = true)
 public class TestJdbcTableProperties
         extends AbstractTestQueryFramework
 {
@@ -53,12 +50,6 @@ public Map<String, Object> getTableProperties(ConnectorSession session, JdbcTabl
         return createH2QueryRunner(ImmutableList.copyOf(TpchTable.getTables()), properties, module);
     }
 
-    @BeforeTest
-    public void reset()
-    {
-        onGetTableProperties = () -> {};
-    }
-
     @Test
     public void testGetTablePropertiesIsNotCalledForSelect()
     {
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcWriteConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcWriteConfig.java
index b0e84043e49e..94ac8ba7aabb 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcWriteConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcWriteConfig.java
@@ -15,13 +15,14 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.configuration.ConfigurationFactory;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
 import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
 import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
 import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+import static io.trino.plugin.jdbc.JdbcWriteConfig.MAX_ALLOWED_WRITE_BATCH_SIZE;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -32,6 +33,7 @@ public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(JdbcWriteConfig.class)
                 .setWriteBatchSize(1000)
+                .setWriteParallelism(8)
                 .setNonTransactionalInsert(false));
     }
 
@@ -41,11 +43,13 @@ public void testExplicitPropertyMappings()
         Map<String, String> properties = ImmutableMap.<String, String>builder()
                 .put("write.batch-size", "24")
                 .put("insert.non-transactional-insert.enabled", "true")
+                .put("write.parallelism", "16")
                 .buildOrThrow();
 
         JdbcWriteConfig expected = new JdbcWriteConfig()
                 .setWriteBatchSize(24)
-                .setNonTransactionalInsert(true);
+                .setNonTransactionalInsert(true)
+                .setWriteParallelism(16);
 
         assertFullMapping(properties, expected);
     }
@@ -59,6 +63,9 @@ public void testWriteBatchSizeValidation()
         assertThatThrownBy(() -> makeConfig(ImmutableMap.of("write.batch-size", "0")))
                 .hasMessageContaining("write.batch-size: must be greater than or equal to 1");
 
+        assertThatThrownBy(() -> makeConfig(ImmutableMap.of("write.batch-size", String.valueOf(MAX_ALLOWED_WRITE_BATCH_SIZE + 1))))
+                .hasMessageContaining("write.batch-size: must be less than or equal to");
+
         assertThatCode(() -> makeConfig(ImmutableMap.of("write.batch-size", "1")))
                 .doesNotThrowAnyException();
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJmxStats.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJmxStats.java
index fe0f96a20c68..d8c1d4d3ea22 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJmxStats.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJmxStats.java
@@ -18,7 +18,7 @@
 import io.trino.spi.Plugin;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import javax.management.MBeanInfo;
 import javax.management.MBeanServer;
@@ -29,8 +29,7 @@
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static java.lang.String.format;
 import static java.lang.management.ManagementFactory.getPlatformMBeanServer;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJmxStats
 {
@@ -44,14 +43,14 @@ public void testJmxStatsExposure()
         MBeanServer mbeanServer = getPlatformMBeanServer();
         Set<ObjectName> objectNames = mbeanServer.queryNames(new ObjectName("io.trino.plugin.jdbc:*"), null);
 
-        assertTrue(objectNames.containsAll(
+        assertThat(objectNames.containsAll(
                 ImmutableSet.of(
                         new ObjectName("io.trino.plugin.jdbc:type=ConnectionFactory,name=test"),
-                        new ObjectName("io.trino.plugin.jdbc:type=JdbcClient,name=test"))));
+                        new ObjectName("io.trino.plugin.jdbc:type=JdbcClient,name=test")))).isTrue();
 
         for (ObjectName objectName : objectNames) {
             MBeanInfo mbeanInfo = mbeanServer.getMBeanInfo(objectName);
-            assertNotEquals(mbeanInfo.getAttributes().length, 0, format("Object %s doesn't expose JMX stats", objectName.getCanonicalName()));
+            assertThat(mbeanInfo.getAttributes().length).withFailMessage(format("Object %s doesn't expose JMX stats", objectName.getCanonicalName())).isNotEqualTo(0);
         }
     }
 }
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestLazyConnectionFactory.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestLazyConnectionFactory.java
index 8ff5b6b5e2b4..cd0fb3dd1d6e 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestLazyConnectionFactory.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestLazyConnectionFactory.java
@@ -13,9 +13,11 @@
  */
 package io.trino.plugin.jdbc;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 import io.trino.plugin.jdbc.credential.EmptyCredentialProvider;
 import org.h2.Driver;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Connection;
 import java.util.concurrent.ThreadLocalRandom;
@@ -30,11 +32,15 @@ public class TestLazyConnectionFactory
     public void testNoConnectionIsCreated()
             throws Exception
     {
-        ConnectionFactory failingConnectionFactory = session -> {
-            throw new AssertionError("Expected no connection creation");
-        };
+        Injector injector = Guice.createInjector(binder -> {
+            binder.bind(ConnectionFactory.class).annotatedWith(ForBaseJdbc.class).toInstance(
+                    session -> {
+                        throw new AssertionError("Expected no connection creation");
+                    });
+            binder.install(new RetryingConnectionFactoryModule());
+        });
 
-        try (LazyConnectionFactory lazyConnectionFactory = new LazyConnectionFactory(failingConnectionFactory);
+        try (LazyConnectionFactory lazyConnectionFactory = injector.getInstance(LazyConnectionFactory.class);
                 Connection ignored = lazyConnectionFactory.openConnection(SESSION)) {
             // no-op
         }
@@ -47,8 +53,13 @@ public void testConnectionCannotBeReusedAfterClose()
         BaseJdbcConfig config = new BaseJdbcConfig()
                 .setConnectionUrl(format("jdbc:h2:mem:test%s;DB_CLOSE_DELAY=-1", System.nanoTime() + ThreadLocalRandom.current().nextLong()));
 
-        try (DriverConnectionFactory h2ConnectionFactory = new DriverConnectionFactory(new Driver(), config, new EmptyCredentialProvider());
-                LazyConnectionFactory lazyConnectionFactory = new LazyConnectionFactory(h2ConnectionFactory)) {
+        Injector injector = Guice.createInjector(binder -> {
+            binder.bind(ConnectionFactory.class).annotatedWith(ForBaseJdbc.class).toInstance(
+                    new DriverConnectionFactory(new Driver(), config, new EmptyCredentialProvider()));
+            binder.install(new RetryingConnectionFactoryModule());
+        });
+
+        try (LazyConnectionFactory lazyConnectionFactory = injector.getInstance(LazyConnectionFactory.class)) {
             Connection connection = lazyConnectionFactory.openConnection(SESSION);
             connection.close();
             assertThatThrownBy(() -> connection.createStatement())
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestQueryConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestQueryConfig.java
index 4ce587551f9e..59c6c2769547 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestQueryConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestQueryConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestRemoteQueryCancellationConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestRemoteQueryCancellationConfig.java
index dd517ab6bc60..6a859e57cc40 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestRemoteQueryCancellationConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestRemoteQueryCancellationConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestRemoteTableName.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestRemoteTableName.java
index d1fec7cca4fc..f0879482ea7c 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestRemoteTableName.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestRemoteTableName.java
@@ -15,11 +15,11 @@
 package io.trino.plugin.jdbc;
 
 import io.airlift.json.JsonCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestRemoteTableName
 {
@@ -29,8 +29,8 @@ public void testJsonRoundTrip()
         JsonCodec<RemoteTableName> codec = JsonCodec.jsonCodec(RemoteTableName.class);
         RemoteTableName table = new RemoteTableName(Optional.of("catalog"), Optional.of("schema"), "table");
         RemoteTableName roundTrip = codec.fromJson(codec.toJson(table));
-        assertEquals(table.getCatalogName(), roundTrip.getCatalogName());
-        assertEquals(table.getSchemaName(), roundTrip.getSchemaName());
-        assertEquals(table.getTableName(), roundTrip.getTableName());
+        assertThat(table.getCatalogName()).isEqualTo(roundTrip.getCatalogName());
+        assertThat(table.getSchemaName()).isEqualTo(roundTrip.getSchemaName());
+        assertThat(table.getTableName()).isEqualTo(roundTrip.getTableName());
     }
 }
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestRetryingConnectionFactory.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestRetryingConnectionFactory.java
index 67cdba2ca468..d85c1c5d1ef8 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestRetryingConnectionFactory.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestRetryingConnectionFactory.java
@@ -13,31 +13,40 @@
  */
 package io.trino.plugin.jdbc;
 
+import com.google.common.base.Throwables;
+import com.google.inject.Guice;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.Scopes;
+import io.trino.plugin.jdbc.RetryingConnectionFactory.RetryStrategy;
 import io.trino.spi.StandardErrorCode;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.SQLRecoverableException;
+import java.sql.SQLTransientException;
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.stream.Stream;
 
 import static com.google.common.reflect.Reflection.newProxy;
+import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
 import static io.trino.plugin.jdbc.TestRetryingConnectionFactory.MockConnectorFactory.Action.RETURN;
 import static io.trino.plugin.jdbc.TestRetryingConnectionFactory.MockConnectorFactory.Action.THROW_NPE;
 import static io.trino.plugin.jdbc.TestRetryingConnectionFactory.MockConnectorFactory.Action.THROW_SQL_EXCEPTION;
 import static io.trino.plugin.jdbc.TestRetryingConnectionFactory.MockConnectorFactory.Action.THROW_SQL_RECOVERABLE_EXCEPTION;
+import static io.trino.plugin.jdbc.TestRetryingConnectionFactory.MockConnectorFactory.Action.THROW_SQL_TRANSIENT_EXCEPTION;
 import static io.trino.plugin.jdbc.TestRetryingConnectionFactory.MockConnectorFactory.Action.THROW_TRINO_EXCEPTION;
-import static io.trino.plugin.jdbc.TestRetryingConnectionFactory.MockConnectorFactory.Action.THROW_WRAPPED_SQL_RECOVERABLE_EXCEPTION;
+import static io.trino.plugin.jdbc.TestRetryingConnectionFactory.MockConnectorFactory.Action.THROW_WRAPPED_SQL_TRANSIENT_EXCEPTION;
 import static io.trino.spi.block.TestingSession.SESSION;
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
 
 public class TestRetryingConnectionFactory
 {
@@ -51,63 +60,130 @@ public void testEverythingImplemented()
     public void testSimplyReturnConnection()
             throws Exception
     {
-        MockConnectorFactory mock = new MockConnectorFactory(RETURN);
-        ConnectionFactory factory = new RetryingConnectionFactory(mock);
-        assertNotNull(factory.openConnection(SESSION));
-        assertEquals(mock.getCallCount(), 1);
+        Injector injector = createInjector(RETURN);
+        ConnectionFactory factory = injector.getInstance(RetryingConnectionFactory.class);
+        MockConnectorFactory mock = injector.getInstance(MockConnectorFactory.class);
+
+        Connection connection = factory.openConnection(SESSION);
+
+        assertThat(connection).isNotNull();
+        assertThat(mock.getCallCount()).isEqualTo(1);
     }
 
     @Test
     public void testRetryAndStopOnTrinoException()
     {
-        MockConnectorFactory mock = new MockConnectorFactory(THROW_SQL_RECOVERABLE_EXCEPTION, THROW_TRINO_EXCEPTION);
-        ConnectionFactory factory = new RetryingConnectionFactory(mock);
+        Injector injector = createInjector(THROW_SQL_TRANSIENT_EXCEPTION, THROW_TRINO_EXCEPTION);
+        ConnectionFactory factory = injector.getInstance(RetryingConnectionFactory.class);
+        MockConnectorFactory mock = injector.getInstance(MockConnectorFactory.class);
+
         assertThatThrownBy(() -> factory.openConnection(SESSION))
                 .isInstanceOf(TrinoException.class)
                 .hasMessage("Testing Trino exception");
-        assertEquals(mock.getCallCount(), 2);
+
+        assertThat(mock.getCallCount()).isEqualTo(2);
     }
 
     @Test
     public void testRetryAndStopOnSqlException()
     {
-        MockConnectorFactory mock = new MockConnectorFactory(THROW_SQL_RECOVERABLE_EXCEPTION, THROW_SQL_EXCEPTION);
-        ConnectionFactory factory = new RetryingConnectionFactory(mock);
+        Injector injector = createInjector(THROW_SQL_TRANSIENT_EXCEPTION, THROW_SQL_EXCEPTION);
+        ConnectionFactory factory = injector.getInstance(RetryingConnectionFactory.class);
+        MockConnectorFactory mock = injector.getInstance(MockConnectorFactory.class);
+
         assertThatThrownBy(() -> factory.openConnection(SESSION))
                 .isInstanceOf(SQLException.class)
                 .hasMessage("Testing sql exception");
-        assertEquals(mock.getCallCount(), 2);
+
+        assertThat(mock.getCallCount()).isEqualTo(2);
     }
 
     @Test
     public void testNullPointerException()
     {
-        MockConnectorFactory mock = new MockConnectorFactory(THROW_NPE);
-        ConnectionFactory factory = new RetryingConnectionFactory(mock);
+        Injector injector = createInjector(THROW_NPE);
+        ConnectionFactory factory = injector.getInstance(RetryingConnectionFactory.class);
+        MockConnectorFactory mock = injector.getInstance(MockConnectorFactory.class);
+
         assertThatThrownBy(() -> factory.openConnection(SESSION))
                 .isInstanceOf(NullPointerException.class)
                 .hasMessage("Testing NPE");
-        assertEquals(mock.getCallCount(), 1);
+
+        assertThat(mock.getCallCount()).isEqualTo(1);
     }
 
     @Test
     public void testRetryAndReturn()
             throws Exception
     {
-        MockConnectorFactory mock = new MockConnectorFactory(THROW_SQL_RECOVERABLE_EXCEPTION, RETURN);
-        ConnectionFactory factory = new RetryingConnectionFactory(mock);
-        assertNotNull(factory.openConnection(SESSION));
-        assertEquals(mock.getCallCount(), 2);
+        Injector injector = createInjector(THROW_SQL_TRANSIENT_EXCEPTION, RETURN);
+        ConnectionFactory factory = injector.getInstance(RetryingConnectionFactory.class);
+        MockConnectorFactory mock = injector.getInstance(MockConnectorFactory.class);
+
+        Connection connection = factory.openConnection(SESSION);
+
+        assertThat(connection).isNotNull();
+        assertThat(mock.getCallCount()).isEqualTo(2);
     }
 
     @Test
     public void testRetryOnWrappedAndReturn()
             throws Exception
     {
-        MockConnectorFactory mock = new MockConnectorFactory(THROW_WRAPPED_SQL_RECOVERABLE_EXCEPTION, RETURN);
-        ConnectionFactory factory = new RetryingConnectionFactory(mock);
-        assertNotNull(factory.openConnection(SESSION));
-        assertEquals(mock.getCallCount(), 2);
+        Injector injector = createInjector(THROW_WRAPPED_SQL_TRANSIENT_EXCEPTION, RETURN);
+        ConnectionFactory factory = injector.getInstance(RetryingConnectionFactory.class);
+        MockConnectorFactory mock = injector.getInstance(MockConnectorFactory.class);
+
+        Connection connection = factory.openConnection(SESSION);
+
+        assertThat(connection).isNotNull();
+        assertThat(mock.getCallCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void testOverridingRetryStrategyWorks()
+            throws Exception
+    {
+        Injector injector = createInjectorWithOverridenStrategy(THROW_SQL_RECOVERABLE_EXCEPTION, RETURN);
+        ConnectionFactory factory = injector.getInstance(RetryingConnectionFactory.class);
+        MockConnectorFactory mock = injector.getInstance(MockConnectorFactory.class);
+
+        Connection connection = factory.openConnection(SESSION);
+
+        assertThat(connection).isNotNull();
+        assertThat(mock.getCallCount()).isEqualTo(2);
+    }
+
+    private static Injector createInjector(MockConnectorFactory.Action... actions)
+    {
+        return Guice.createInjector(binder -> {
+            binder.bind(MockConnectorFactory.Action[].class).toInstance(actions);
+            binder.bind(MockConnectorFactory.class).in(Scopes.SINGLETON);
+            binder.bind(ConnectionFactory.class).annotatedWith(ForBaseJdbc.class).to(Key.get(MockConnectorFactory.class));
+            binder.install(new RetryingConnectionFactoryModule());
+        });
+    }
+
+    private static Injector createInjectorWithOverridenStrategy(MockConnectorFactory.Action... actions)
+    {
+        return Guice.createInjector(binder -> {
+            binder.bind(MockConnectorFactory.Action[].class).toInstance(actions);
+            binder.bind(MockConnectorFactory.class).in(Scopes.SINGLETON);
+            binder.bind(ConnectionFactory.class).annotatedWith(ForBaseJdbc.class).to(Key.get(MockConnectorFactory.class));
+            binder.install(new RetryingConnectionFactoryModule());
+            newOptionalBinder(binder, RetryStrategy.class).setBinding().to(OverrideRetryStrategy.class).in(Scopes.SINGLETON);
+        });
+    }
+
+    private static class OverrideRetryStrategy
+            implements RetryStrategy
+    {
+        @Override
+        public boolean isExceptionRecoverable(Throwable exception)
+        {
+            return Throwables.getCausalChain(exception).stream()
+                    .anyMatch(SQLRecoverableException.class::isInstance);
+        }
     }
 
     public static class MockConnectorFactory
@@ -116,6 +192,7 @@ public static class MockConnectorFactory
         private final Deque<Action> actions = new ArrayDeque<>();
         private int callCount;
 
+        @Inject
         public MockConnectorFactory(Action... actions)
         {
             Stream.of(actions)
@@ -146,6 +223,10 @@ public Connection openConnection(ConnectorSession session)
                     throw new SQLRecoverableException("Testing sql recoverable exception");
                 case THROW_WRAPPED_SQL_RECOVERABLE_EXCEPTION:
                     throw new RuntimeException(new SQLRecoverableException("Testing sql recoverable exception"));
+                case THROW_SQL_TRANSIENT_EXCEPTION:
+                    throw new SQLTransientException("Testing sql transient exception");
+                case THROW_WRAPPED_SQL_TRANSIENT_EXCEPTION:
+                    throw new RuntimeException(new SQLTransientException("Testing sql transient exception"));
             }
             throw new IllegalStateException("Unsupported action:" + action);
         }
@@ -156,6 +237,8 @@ public enum Action
             THROW_SQL_EXCEPTION,
             THROW_SQL_RECOVERABLE_EXCEPTION,
             THROW_WRAPPED_SQL_RECOVERABLE_EXCEPTION,
+            THROW_SQL_TRANSIENT_EXCEPTION,
+            THROW_WRAPPED_SQL_TRANSIENT_EXCEPTION,
             THROW_NPE,
             RETURN,
         }
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestReusableConnectionFactory.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestReusableConnectionFactory.java
index 14a045561ea2..78aa22254083 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestReusableConnectionFactory.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestReusableConnectionFactory.java
@@ -16,7 +16,7 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.testing.TestingConnectorSession;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Connection;
 import java.time.Duration;
@@ -24,7 +24,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static java.lang.Thread.sleep;
 import static java.util.Objects.requireNonNull;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestReusableConnectionFactory
 {
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestStatisticsAwareJdbcClient.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestStatisticsAwareJdbcClient.java
index e27f67fa9cb1..ce747f9436b4 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestStatisticsAwareJdbcClient.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestStatisticsAwareJdbcClient.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc;
 
 import io.trino.plugin.jdbc.jmx.StatisticsAwareJdbcClient;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 import static io.trino.spi.testing.InterfaceTestUtils.assertProperForwardingMethodsAreCalled;
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestTypeHandlingJdbcConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestTypeHandlingJdbcConfig.java
index 21b70585815d..910b06f5a06b 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestTypeHandlingJdbcConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestTypeHandlingJdbcConfig.java
@@ -15,7 +15,7 @@
 package io.trino.plugin.jdbc;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestingDatabase.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestingDatabase.java
index 5477d8e5ba3f..02ec936eeb8f 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestingDatabase.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestingDatabase.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.jdbc;
 
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.credential.EmptyCredentialProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitSource;
@@ -45,7 +46,7 @@ public TestingDatabase()
         String connectionUrl = "jdbc:h2:mem:" + databaseName + ";NON_KEYWORDS=KEY,VALUE"; // key and value are reserved keywords in H2 2.x
         jdbcClient = new TestingH2JdbcClient(
                 new BaseJdbcConfig(),
-                new DriverConnectionFactory(new Driver(), connectionUrl, new Properties(), new EmptyCredentialProvider()));
+                new DriverConnectionFactory(new Driver(), connectionUrl, new Properties(), new EmptyCredentialProvider(), OpenTelemetry.noop()));
 
         connection = DriverManager.getConnection(connectionUrl);
         connection.createStatement().execute("CREATE SCHEMA example");
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestingH2JdbcClient.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestingH2JdbcClient.java
index 80cce413f154..0278db254158 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestingH2JdbcClient.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestingH2JdbcClient.java
@@ -18,13 +18,13 @@
 import dev.failsafe.RetryPolicy;
 import io.airlift.log.Logger;
 import io.trino.plugin.base.aggregation.AggregateFunctionRewriter;
+import io.trino.plugin.base.mapping.DefaultIdentifierMapping;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.JdbcProcedureHandle.ProcedureQuery;
 import io.trino.plugin.jdbc.aggregation.ImplementCountAll;
 import io.trino.plugin.jdbc.expression.JdbcConnectorExpressionRewriterBuilder;
 import io.trino.plugin.jdbc.expression.RewriteVariable;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.DefaultIdentifierMapping;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestingH2JdbcModule.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestingH2JdbcModule.java
index 28859b5a7eb7..814450973758 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestingH2JdbcModule.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestingH2JdbcModule.java
@@ -19,10 +19,10 @@
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.credential.CredentialProvider;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.ptf.Query;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import org.h2.Driver;
 
 import java.util.Map;
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestCredentialConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestCredentialConfig.java
index 537ed174f923..1fd846c43258 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestCredentialConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestCredentialConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc.credential;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestCredentialProvider.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestCredentialProvider.java
index dfd37396809c..3b1850b40d0a 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestCredentialProvider.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestCredentialProvider.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.bootstrap.Bootstrap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.net.URISyntaxException;
@@ -24,7 +24,7 @@
 import java.util.Optional;
 
 import static com.google.common.io.Resources.getResource;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestCredentialProvider
 {
@@ -37,8 +37,8 @@ public void testInlineCredentialProvider()
                 "connection-password", "password_for_user_from_inline");
 
         CredentialProvider credentialProvider = getCredentialProvider(properties);
-        assertEquals(credentialProvider.getConnectionUser(Optional.empty()).get(), "user_from_inline");
-        assertEquals(credentialProvider.getConnectionPassword(Optional.empty()).get(), "password_for_user_from_inline");
+        assertThat(credentialProvider.getConnectionUser(Optional.empty()).get()).isEqualTo("user_from_inline");
+        assertThat(credentialProvider.getConnectionPassword(Optional.empty()).get()).isEqualTo("password_for_user_from_inline");
     }
 
     @Test
@@ -50,8 +50,8 @@ public void testFileCredentialProvider()
                 "connection-credential-file", getResourceFilePath("credentials.properties"));
 
         CredentialProvider credentialProvider = getCredentialProvider(properties);
-        assertEquals(credentialProvider.getConnectionUser(Optional.empty()).get(), "user_from_file");
-        assertEquals(credentialProvider.getConnectionPassword(Optional.empty()).get(), "password_for_user_from_file");
+        assertThat(credentialProvider.getConnectionUser(Optional.empty()).get()).isEqualTo("user_from_file");
+        assertThat(credentialProvider.getConnectionPassword(Optional.empty()).get()).isEqualTo("password_for_user_from_file");
     }
 
     @Test
@@ -70,8 +70,8 @@ public void testKeyStoreBasedCredentialProvider()
                 .buildOrThrow();
 
         CredentialProvider credentialProvider = getCredentialProvider(properties);
-        assertEquals(credentialProvider.getConnectionUser(Optional.empty()).get(), "user_from_keystore");
-        assertEquals(credentialProvider.getConnectionPassword(Optional.empty()).get(), "password_from_keystore");
+        assertThat(credentialProvider.getConnectionUser(Optional.empty()).get()).isEqualTo("user_from_keystore");
+        assertThat(credentialProvider.getConnectionPassword(Optional.empty()).get()).isEqualTo("password_from_keystore");
     }
 
     private CredentialProvider getCredentialProvider(Map<String, String> properties)
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestExtraCredentialConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestExtraCredentialConfig.java
index cb7cc513e775..5a931f40492f 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestExtraCredentialConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestExtraCredentialConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc.credential;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestExtraCredentialProvider.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestExtraCredentialProvider.java
index 048137db62e8..1c271992a58b 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestExtraCredentialProvider.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/TestExtraCredentialProvider.java
@@ -16,12 +16,12 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.bootstrap.Bootstrap;
 import io.trino.spi.security.ConnectorIdentity;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Optional;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestExtraCredentialProvider
 {
@@ -35,8 +35,8 @@ public void testUserNameOverwritten()
 
         CredentialProvider credentialProvider = getCredentialProvider(properties);
         Optional<ConnectorIdentity> identity = Optional.of(ConnectorIdentity.forUser("user").withExtraCredentials(ImmutableMap.of("user", "overwritten_user")).build());
-        assertEquals(credentialProvider.getConnectionUser(identity).get(), "overwritten_user");
-        assertEquals(credentialProvider.getConnectionPassword(identity).get(), "default_password");
+        assertThat(credentialProvider.getConnectionUser(identity).get()).isEqualTo("overwritten_user");
+        assertThat(credentialProvider.getConnectionPassword(identity).get()).isEqualTo("default_password");
     }
 
     @Test
@@ -49,8 +49,8 @@ public void testPasswordOverwritten()
 
         CredentialProvider credentialProvider = getCredentialProvider(properties);
         Optional<ConnectorIdentity> identity = Optional.of(ConnectorIdentity.forUser("user").withExtraCredentials(ImmutableMap.of("password", "overwritten_password")).build());
-        assertEquals(credentialProvider.getConnectionUser(identity).get(), "default_user");
-        assertEquals(credentialProvider.getConnectionPassword(identity).get(), "overwritten_password");
+        assertThat(credentialProvider.getConnectionUser(identity).get()).isEqualTo("default_user");
+        assertThat(credentialProvider.getConnectionPassword(identity).get()).isEqualTo("overwritten_password");
     }
 
     @Test
@@ -66,8 +66,8 @@ public void testCredentialsOverwritten()
         Optional<ConnectorIdentity> identity = Optional.of(ConnectorIdentity.forUser("user")
                 .withExtraCredentials(ImmutableMap.of("user", "overwritten_user", "password", "overwritten_password"))
                 .build());
-        assertEquals(credentialProvider.getConnectionUser(identity).get(), "overwritten_user");
-        assertEquals(credentialProvider.getConnectionPassword(identity).get(), "overwritten_password");
+        assertThat(credentialProvider.getConnectionUser(identity).get()).isEqualTo("overwritten_user");
+        assertThat(credentialProvider.getConnectionPassword(identity).get()).isEqualTo("overwritten_password");
     }
 
     @Test
@@ -81,14 +81,14 @@ public void testCredentialsNotOverwritten()
 
         CredentialProvider credentialProvider = getCredentialProvider(properties);
         Optional<ConnectorIdentity> identity = Optional.of(ConnectorIdentity.ofUser("user"));
-        assertEquals(credentialProvider.getConnectionUser(identity).get(), "default_user");
-        assertEquals(credentialProvider.getConnectionPassword(identity).get(), "default_password");
+        assertThat(credentialProvider.getConnectionUser(identity).get()).isEqualTo("default_user");
+        assertThat(credentialProvider.getConnectionPassword(identity).get()).isEqualTo("default_password");
 
         identity = Optional.of(ConnectorIdentity.forUser("user")
                 .withExtraCredentials(ImmutableMap.of("connection_user", "overwritten_user", "connection_password", "overwritten_password"))
                 .build());
-        assertEquals(credentialProvider.getConnectionUser(identity).get(), "default_user");
-        assertEquals(credentialProvider.getConnectionPassword(identity).get(), "default_password");
+        assertThat(credentialProvider.getConnectionUser(identity).get()).isEqualTo("default_user");
+        assertThat(credentialProvider.getConnectionPassword(identity).get()).isEqualTo("default_password");
     }
 
     private static CredentialProvider getCredentialProvider(Map<String, String> properties)
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/file/TestConfigFileBasedCredentialProviderConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/file/TestConfigFileBasedCredentialProviderConfig.java
index fc75a241c829..bcd90da2cc49 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/file/TestConfigFileBasedCredentialProviderConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/file/TestConfigFileBasedCredentialProviderConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc.credential.file;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/keystore/TestKeyStoreBasedCredentialProviderConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/keystore/TestKeyStoreBasedCredentialProviderConfig.java
index 9aaf10555268..00af13c499e3 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/keystore/TestKeyStoreBasedCredentialProviderConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/credential/keystore/TestKeyStoreBasedCredentialProviderConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc.credential.keystore;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/BaseTestRewriteLikeWithCaseSensitivity.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/BaseTestRewriteLikeWithCaseSensitivity.java
new file mode 100644
index 000000000000..fb7b8221193e
--- /dev/null
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/BaseTestRewriteLikeWithCaseSensitivity.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed 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 io.trino.plugin.jdbc.expression;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.matching.Match;
+import io.trino.plugin.base.expression.ConnectorExpressionRule;
+import io.trino.plugin.jdbc.JdbcColumnHandle;
+import io.trino.plugin.jdbc.JdbcTypeHandle;
+import io.trino.plugin.jdbc.QueryParameter;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.expression.Call;
+import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Variable;
+
+import java.sql.Types;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.common.collect.MoreCollectors.toOptional;
+import static io.trino.plugin.jdbc.CaseSensitivity.CASE_SENSITIVE;
+import static io.trino.plugin.jdbc.TestingJdbcTypeHandle.JDBC_BIGINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public abstract class BaseTestRewriteLikeWithCaseSensitivity
+{
+    protected abstract ConnectorExpressionRule<Call, ParameterizedExpression> getRewrite();
+
+    protected Optional<ParameterizedExpression> apply(Call expression)
+    {
+        Optional<Match> match = getRewrite().getPattern().match(expression).collect(toOptional());
+        if (match.isEmpty()) {
+            return Optional.empty();
+        }
+        return getRewrite().rewrite(expression, match.get().captures(), new ConnectorExpressionRule.RewriteContext<>()
+        {
+            @Override
+            public Map<String, ColumnHandle> getAssignments()
+            {
+                return Map.of("case_insensitive_value", new JdbcColumnHandle("case_insensitive_value", JDBC_BIGINT, VARCHAR),
+                        "case_sensitive_value", new JdbcColumnHandle("case_sensitive_value", new JdbcTypeHandle(Types.VARCHAR, Optional.of("varchar"), Optional.of(10), Optional.empty(), Optional.empty(), Optional.of(CASE_SENSITIVE)), VARCHAR));
+            }
+
+            @Override
+            public ConnectorSession getSession()
+            {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public Optional<ParameterizedExpression> defaultRewrite(ConnectorExpression expression)
+            {
+                if (expression instanceof Variable) {
+                    String name = ((Variable) expression).getName();
+                    return Optional.of(new ParameterizedExpression("\"" + name.replace("\"", "\"\"") + "\"", ImmutableList.of(new QueryParameter(expression.getType(), Optional.of(name)))));
+                }
+                return Optional.empty();
+            }
+        });
+    }
+
+    protected void assertNoRewrite(Call expression)
+    {
+        Optional<ParameterizedExpression> rewritten = apply(expression);
+        assertThat(rewritten).isEmpty();
+    }
+}
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestExpressionMappingParser.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestExpressionMappingParser.java
index 2842a0670ab2..8f5898895fe3 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestExpressionMappingParser.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestExpressionMappingParser.java
@@ -14,14 +14,14 @@
 package io.trino.plugin.jdbc.expression;
 
 import com.google.common.collect.ImmutableList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestExpressionMappingParser
 {
@@ -105,8 +105,8 @@ private static void assertExpressionPattern(String expressionPattern, Expression
 
     private static void assertExpressionPattern(String expressionPattern, String canonical, ExpressionPattern expected)
     {
-        assertEquals(expressionPattern(expressionPattern), expected);
-        assertEquals(expected.toString(), canonical);
+        assertThat(expressionPattern(expressionPattern)).isEqualTo(expected);
+        assertThat(expected.toString()).isEqualTo(canonical);
     }
 
     private static ExpressionPattern expressionPattern(String expressionPattern)
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestExpressionMatching.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestExpressionMatching.java
index 0c4b9dd69fbb..33cef6eaa585 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestExpressionMatching.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestExpressionMatching.java
@@ -19,7 +19,7 @@
 import io.trino.spi.expression.FunctionName;
 import io.trino.spi.expression.Variable;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestGenericRewrite.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestGenericRewrite.java
index 45357eb61735..2c9653790656 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestGenericRewrite.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestGenericRewrite.java
@@ -22,7 +22,7 @@
 import io.trino.spi.expression.ConnectorExpression;
 import io.trino.spi.expression.FunctionName;
 import io.trino.spi.expression.Variable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestRewriteComparison.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestRewriteComparison.java
index 06f4761dbe73..80e70a2e6007 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestRewriteComparison.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestRewriteComparison.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc.expression;
 
 import io.trino.sql.tree.ComparisonExpression;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.Stream;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestRewriteLikeEscapeWithCaseSensitivity.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestRewriteLikeEscapeWithCaseSensitivity.java
new file mode 100644
index 000000000000..36aa25a1b77a
--- /dev/null
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestRewriteLikeEscapeWithCaseSensitivity.java
@@ -0,0 +1,127 @@
+/*
+ * Licensed 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 io.trino.plugin.jdbc.expression;
+
+import io.trino.plugin.base.expression.ConnectorExpressionRule;
+import io.trino.plugin.jdbc.QueryParameter;
+import io.trino.spi.expression.Call;
+import io.trino.spi.expression.FunctionName;
+import io.trino.spi.expression.Variable;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Optional;
+
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestRewriteLikeEscapeWithCaseSensitivity
+        extends BaseTestRewriteLikeWithCaseSensitivity
+{
+    private final RewriteLikeEscapeWithCaseSensitivity rewrite = new RewriteLikeEscapeWithCaseSensitivity();
+
+    @Override
+    protected ConnectorExpressionRule<Call, ParameterizedExpression> getRewrite()
+    {
+        return rewrite;
+    }
+
+    @Test
+    public void testRewriteLikeEscapeCallInvalidNumberOfArguments()
+    {
+        Call expression = new Call(
+                BOOLEAN,
+                new FunctionName("$like"),
+                List.of(new Variable("case_sensitive_value", VARCHAR)));
+
+        assertNoRewrite(expression);
+    }
+
+    @Test
+    public void testRewriteLikeEscapeCallInvalidTypeValue()
+    {
+        Call expression = new Call(
+                BOOLEAN,
+                new FunctionName("$like"),
+                List.of(
+                        new Variable("case_sensitive_value", BIGINT),
+                        new Variable("pattern", VARCHAR),
+                        new Variable("escape", VARCHAR)));
+
+        assertNoRewrite(expression);
+    }
+
+    @Test
+    public void testRewriteLikeEscapeCallInvalidTypePattern()
+    {
+        Call expression = new Call(
+                BOOLEAN,
+                new FunctionName("$like"),
+                List.of(
+                        new Variable("case_sensitive_value", VARCHAR),
+                        new Variable("pattern", BIGINT),
+                        new Variable("escape", VARCHAR)));
+
+        assertNoRewrite(expression);
+    }
+
+    @Test
+    public void testRewriteLikeEscapeCallInvalidTypeEscape()
+    {
+        Call expression = new Call(
+                BOOLEAN,
+                new FunctionName("$like"),
+                List.of(
+                        new Variable("case_sensitive_value", VARCHAR),
+                        new Variable("pattern", VARCHAR),
+                        new Variable("escape", BIGINT)));
+
+        assertNoRewrite(expression);
+    }
+
+    @Test
+    public void testRewriteLikeEscapeCallOnCaseInsensitiveValue()
+    {
+        Call expression = new Call(
+                BOOLEAN,
+                new FunctionName("$like"),
+                List.of(
+                        new Variable("case_insensitive_value", VARCHAR),
+                        new Variable("pattern", VARCHAR),
+                        new Variable("escape", VARCHAR)));
+
+        assertNoRewrite(expression);
+    }
+
+    @Test
+    public void testRewriteLikeEscapeCallOnCaseSensitiveValue()
+    {
+        Call expression = new Call(
+                BOOLEAN,
+                new FunctionName("$like"),
+                List.of(
+                        new Variable("case_sensitive_value", VARCHAR),
+                        new Variable("pattern", VARCHAR),
+                        new Variable("escape", VARCHAR)));
+
+        ParameterizedExpression rewritten = apply(expression).orElseThrow();
+        assertThat(rewritten.expression()).isEqualTo("\"case_sensitive_value\" LIKE \"pattern\" ESCAPE \"escape\"");
+        assertThat(rewritten.parameters()).isEqualTo(List.of(
+                new QueryParameter(VARCHAR, Optional.of("case_sensitive_value")),
+                new QueryParameter(VARCHAR, Optional.of("pattern")),
+                new QueryParameter(VARCHAR, Optional.of("escape"))));
+    }
+}
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestRewriteLikeWithCaseSensitivity.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestRewriteLikeWithCaseSensitivity.java
new file mode 100644
index 000000000000..1ace66e7ac1e
--- /dev/null
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/expression/TestRewriteLikeWithCaseSensitivity.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed 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 io.trino.plugin.jdbc.expression;
+
+import io.trino.plugin.base.expression.ConnectorExpressionRule;
+import io.trino.plugin.jdbc.QueryParameter;
+import io.trino.spi.expression.Call;
+import io.trino.spi.expression.FunctionName;
+import io.trino.spi.expression.Variable;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Optional;
+
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestRewriteLikeWithCaseSensitivity
+        extends BaseTestRewriteLikeWithCaseSensitivity
+{
+    private final RewriteLikeWithCaseSensitivity rewrite = new RewriteLikeWithCaseSensitivity();
+
+    @Override
+    protected ConnectorExpressionRule<Call, ParameterizedExpression> getRewrite()
+    {
+        return rewrite;
+    }
+
+    @Test
+    public void testRewriteLikeEscapeCallInvalidNumberOfArguments()
+    {
+        Call expression = new Call(
+                BOOLEAN,
+                new FunctionName("$like"),
+                List.of(new Variable("case_sensitive_value", VARCHAR)));
+
+        assertNoRewrite(expression);
+    }
+
+    @Test
+    public void testRewriteLikeCallInvalidNumberOfArguments()
+    {
+        Call expression = new Call(
+                BOOLEAN,
+                new FunctionName("$like"),
+                List.of(new Variable("case_sensitive_value", VARCHAR)));
+
+        assertNoRewrite(expression);
+    }
+
+    @Test
+    public void testRewriteLikeCallInvalidTypeValue()
+    {
+        Call expression = new Call(
+                BOOLEAN,
+                new FunctionName("$like"),
+                List.of(
+                        new Variable("case_sensitive_value", BIGINT),
+                        new Variable("pattern", VARCHAR)));
+
+        assertNoRewrite(expression);
+    }
+
+    @Test
+    public void testRewriteLikeCallInvalidTypePattern()
+    {
+        Call expression = new Call(
+                BOOLEAN,
+                new FunctionName("$like"),
+                List.of(
+                        new Variable("case_sensitive_value", VARCHAR),
+                        new Variable("pattern", BIGINT)));
+
+        assertNoRewrite(expression);
+    }
+
+    @Test
+    public void testRewriteLikeCallOnCaseInsensitiveValue()
+    {
+        Call expression = new Call(
+                BOOLEAN,
+                new FunctionName("$like"),
+                List.of(
+                        new Variable("case_insensitive_value", VARCHAR),
+                        new Variable("pattern", VARCHAR)));
+
+        assertNoRewrite(expression);
+    }
+
+    @Test
+    public void testRewriteLikeCallOnCaseSensitiveValue()
+    {
+        Call expression = new Call(
+                BOOLEAN,
+                new FunctionName("$like"),
+                List.of(
+                        new Variable("case_sensitive_value", VARCHAR),
+                        new Variable("pattern", VARCHAR)));
+
+        ParameterizedExpression rewritten = apply(expression).orElseThrow();
+        assertThat(rewritten.expression()).isEqualTo("\"case_sensitive_value\" LIKE \"pattern\"");
+        assertThat(rewritten.parameters()).isEqualTo(List.of(
+                new QueryParameter(VARCHAR, Optional.of("case_sensitive_value")),
+                new QueryParameter(VARCHAR, Optional.of("pattern"))));
+    }
+}
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/jmx/TestStatisticsAwareConnectionFactory.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/jmx/TestStatisticsAwareConnectionFactory.java
index 4753d56c5512..35b85f0565dd 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/jmx/TestStatisticsAwareConnectionFactory.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/jmx/TestStatisticsAwareConnectionFactory.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.jdbc.jmx;
 
 import io.trino.plugin.jdbc.ConnectionFactory;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/logging/TestFormatBasedRemoteQueryModifier.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/logging/TestFormatBasedRemoteQueryModifier.java
index faa64733a79e..5f47dbc96b0e 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/logging/TestFormatBasedRemoteQueryModifier.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/logging/TestFormatBasedRemoteQueryModifier.java
@@ -16,8 +16,7 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.testing.TestingConnectorSession;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -80,23 +79,18 @@ public void testForSQLInjectionsByTraceToken()
 
         assertThatThrownBy(() -> modifier.apply(connectorSession, "SELECT * from USERS"))
                 .isInstanceOf(TrinoException.class)
-                .hasMessage("Passed value */; DROP TABLE TABLE_A; /* as $TRACE_TOKEN does not meet security criteria. It can contain only letters, digits, underscores and hyphens");
+                .hasMessageMatching("Rendering metadata using 'query.comment-format' does not meet security criteria: Query=.* Execution for user=Alice with source=source ttoken=\\*/; DROP TABLE TABLE_A; /\\*");
     }
 
     @Test
     public void testForSQLInjectionsBySource()
     {
-        TestingConnectorSession connectorSession = TestingConnectorSession.builder()
-                .setTraceToken("trace_token")
-                .setSource("*/; DROP TABLE TABLE_A; /*")
-                .setIdentity(ConnectorIdentity.ofUser("Alice"))
-                .build();
+        testForSQLInjectionsBySource("*/; DROP TABLE TABLE_A; /*");
+        testForSQLInjectionsBySource("Prefix */; DROP TABLE TABLE_A; /*");
+        testForSQLInjectionsBySource("""
 
-        FormatBasedRemoteQueryModifier modifier = createRemoteQueryModifier("Query=$QUERY_ID Execution for user=$USER with source=$SOURCE ttoken=$TRACE_TOKEN");
 
-        assertThatThrownBy(() -> modifier.apply(connectorSession, "SELECT * from USERS"))
-                .isInstanceOf(TrinoException.class)
-                .hasMessage("Passed value */; DROP TABLE TABLE_A; /* as $SOURCE does not meet security criteria. It can contain only letters, digits, underscores and hyphens");
+                                     Multiline */; DROP TABLE TABLE_A; /*""");
     }
 
     @Test
@@ -150,8 +144,22 @@ public void testFormatQueryModifierWithTraceToken()
                 .isEqualTo("SELECT * FROM USERS /*ttoken=valid-value*/");
     }
 
-    @Test(dataProvider = "validValues")
-    public void testFormatWithValidValues(String value)
+    @Test
+    public void testFormatWithValidValues()
+    {
+        testFormatWithValidValues("trino");
+        testFormatWithValidValues("123");
+        testFormatWithValidValues("1t2r3i4n0");
+        testFormatWithValidValues("trino-cli");
+        testFormatWithValidValues("trino_cli");
+        testFormatWithValidValues("trino-cli_123");
+        testFormatWithValidValues("123_trino-cli");
+        testFormatWithValidValues("123-trino_cli");
+        testFormatWithValidValues("-trino-cli");
+        testFormatWithValidValues("_trino_cli");
+    }
+
+    private void testFormatWithValidValues(String value)
     {
         TestingConnectorSession connectorSession = TestingConnectorSession.builder()
                 .setIdentity(ConnectorIdentity.ofUser("Alice"))
@@ -167,21 +175,19 @@ public void testFormatWithValidValues(String value)
                 .isEqualTo("SELECT * FROM USERS /*source=%1$s ttoken=%1$s*/".formatted(value));
     }
 
-    @DataProvider
-    public Object[][] validValues()
+    private void testForSQLInjectionsBySource(String sqlInjection)
     {
-        return new Object[][] {
-                {"trino"},
-                {"123"},
-                {"1t2r3i4n0"},
-                {"trino-cli"},
-                {"trino_cli"},
-                {"trino-cli_123"},
-                {"123_trino-cli"},
-                {"123-trino_cli"},
-                {"-trino-cli"},
-                {"_trino_cli"}
-        };
+        TestingConnectorSession connectorSession = TestingConnectorSession.builder()
+                .setTraceToken("trace_token")
+                .setSource(sqlInjection)
+                .setIdentity(ConnectorIdentity.ofUser("Alice"))
+                .build();
+
+        FormatBasedRemoteQueryModifier modifier = createRemoteQueryModifier("Query=$QUERY_ID Execution for user=$USER with source=$SOURCE ttoken=$TRACE_TOKEN");
+
+        assertThatThrownBy(() -> modifier.apply(connectorSession, "SELECT * from USERS"))
+                .isInstanceOf(TrinoException.class)
+                .hasMessageContaining("Rendering metadata using 'query.comment-format' does not meet security criteria: Query=");
     }
 
     private static FormatBasedRemoteQueryModifier createRemoteQueryModifier(String commentFormat)
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/logging/TestFormatBasedRemoteQueryModifierConfig.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/logging/TestFormatBasedRemoteQueryModifierConfig.java
index a261fd92e39e..5f0d2d4b49a6 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/logging/TestFormatBasedRemoteQueryModifierConfig.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/logging/TestFormatBasedRemoteQueryModifierConfig.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.jdbc.logging;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -23,7 +22,6 @@
 import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
 import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.util.Arrays.array;
 
 public class TestFormatBasedRemoteQueryModifierConfig
 {
@@ -43,40 +41,32 @@ public void testExplicitPropertyMappings()
         assertFullMapping(properties, expected);
     }
 
-    @Test(dataProvider = "getForbiddenValuesInFormat")
-    public void testInvalidFormatValue(String incorrectValue)
-    {
-        assertThat(new FormatBasedRemoteQueryModifierConfig().setFormat(incorrectValue).isFormatValid())
-                .isFalse();
-    }
-
-    @DataProvider
-    public static Object[][] getForbiddenValuesInFormat()
+    @Test
+    public void testInvalidFormatValue()
     {
-        return array(
-                array("*"),
-                array("("),
-                array(")"),
-                array("["),
-                array("]"),
-                array("{"),
-                array("}"),
-                array("&"),
-                array("@"),
-                array("!"),
-                array("#"),
-                array("%"),
-                array("^"),
-                array("$"),
-                array("\\"),
-                array("/"),
-                array("?"),
-                array(">"),
-                array("<"),
-                array(";"),
-                array("\""),
-                array(":"),
-                array("|"));
+        assertThat(configWithFormat("*").isFormatValid()).isFalse();
+        assertThat(configWithFormat("(").isFormatValid()).isFalse();
+        assertThat(configWithFormat(")").isFormatValid()).isFalse();
+        assertThat(configWithFormat("[").isFormatValid()).isFalse();
+        assertThat(configWithFormat("]").isFormatValid()).isFalse();
+        assertThat(configWithFormat("{").isFormatValid()).isFalse();
+        assertThat(configWithFormat("}").isFormatValid()).isFalse();
+        assertThat(configWithFormat("&").isFormatValid()).isFalse();
+        assertThat(configWithFormat("@").isFormatValid()).isFalse();
+        assertThat(configWithFormat("!").isFormatValid()).isFalse();
+        assertThat(configWithFormat("#").isFormatValid()).isFalse();
+        assertThat(configWithFormat("%").isFormatValid()).isFalse();
+        assertThat(configWithFormat("^").isFormatValid()).isFalse();
+        assertThat(configWithFormat("$").isFormatValid()).isFalse();
+        assertThat(configWithFormat("\\").isFormatValid()).isFalse();
+        assertThat(configWithFormat("/").isFormatValid()).isFalse();
+        assertThat(configWithFormat("?").isFormatValid()).isFalse();
+        assertThat(configWithFormat(">").isFormatValid()).isFalse();
+        assertThat(configWithFormat("<").isFormatValid()).isFalse();
+        assertThat(configWithFormat(";").isFormatValid()).isFalse();
+        assertThat(configWithFormat("\"").isFormatValid()).isFalse();
+        assertThat(configWithFormat(":").isFormatValid()).isFalse();
+        assertThat(configWithFormat("|").isFormatValid()).isFalse();
     }
 
     @Test
@@ -90,4 +80,9 @@ public void testValidFormatWithDuplicatedPredefinedValues()
     {
         assertThat(new FormatBasedRemoteQueryModifierConfig().setFormat("$QUERY_ID $QUERY_ID $USER $USER $SOURCE $SOURCE $TRACE_TOKEN $TRACE_TOKEN").isFormatValid()).isTrue();
     }
+
+    private FormatBasedRemoteQueryModifierConfig configWithFormat(String format)
+    {
+        return new FormatBasedRemoteQueryModifierConfig().setFormat(format);
+    }
 }
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/logging/TestFormatBasedRemoteQueryModifierModule.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/logging/TestFormatBasedRemoteQueryModifierModule.java
index b1035b7ae9ce..17a7852d7981 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/logging/TestFormatBasedRemoteQueryModifierModule.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/logging/TestFormatBasedRemoteQueryModifierModule.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.bootstrap.Bootstrap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/plugin/trino-bigquery/pom.xml b/plugin/trino-bigquery/pom.xml
index 3cb45df50849..36022823533f 100644
--- a/plugin/trino-bigquery/pom.xml
+++ b/plugin/trino-bigquery/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-bigquery</artifactId>
-    <description>Trino - BigQuery Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - BigQuery Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,14 +19,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.google.cloud</groupId>
-                <artifactId>libraries-bom</artifactId>
-                <type>pom</type>
-                <version>26.1.2</version>
-                <scope>import</scope>
-            </dependency>
-
             <dependency>
                 <groupId>io.opencensus</groupId>
                 <artifactId>opencensus-api</artifactId>
@@ -36,13 +28,12 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.11</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.4.15</version>
+                <version>4.4.16</version>
             </dependency>
 
             <dependency>
@@ -54,50 +45,32 @@
             <dependency>
                 <groupId>org.threeten</groupId>
                 <artifactId>threetenbp</artifactId>
-                <version>1.6.1</version>
+                <version>1.6.8</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
+            <groupId>com.google.api</groupId>
+            <artifactId>api-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -123,6 +96,10 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>listenablefuture</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -140,13 +117,17 @@
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-bigquery</artifactId>
             <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>listenablefuture</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>listenablefuture</artifactId>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -155,10 +136,6 @@
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-bigquerystorage</artifactId>
             <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>com.google.guava</groupId>
                     <artifactId>listenablefuture</artifactId>
@@ -167,6 +144,14 @@
                     <groupId>com.google.re2j</groupId>
                     <artifactId>re2j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -180,11 +165,6 @@
             <artifactId>google-cloud-core-http</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -201,6 +181,17 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.http-client</groupId>
+            <artifactId>google-http-client-apache-v2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
@@ -216,24 +207,64 @@
             <artifactId>failsafe</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>bootstrap</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>concurrent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-netty-shaded</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -256,17 +287,31 @@
             <artifactId>avro</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.14</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.threeten</groupId>
+            <artifactId>threetenbp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -277,8 +322,20 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -288,7 +345,24 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-client</artifactId>
@@ -299,13 +373,18 @@
             <groupId>io.trino</groupId>
             <artifactId>trino-exchange-filesystem</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.re2j</groupId>
+                    <artifactId>re2j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
             <scope>test</scope>
-
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -319,7 +398,6 @@
             <artifactId>trino-main</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -339,7 +417,6 @@
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
             <scope>test</scope>
-
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -350,25 +427,25 @@
 
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
+            <artifactId>trino-testing-containers</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-tpch</artifactId>
+            <artifactId>trino-testing-services</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.tpch</groupId>
-            <artifactId>tpch</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-tpch</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>io.trino.tpch</groupId>
+            <artifactId>tpch</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -384,10 +461,16 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.2.4</version>
+            <version>5.6.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -400,13 +483,34 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.basepom.maven</groupId>
                 <artifactId>duplicate-finder-maven-plugin</artifactId>
                 <configuration>
                     <ignoredResourcePatterns>
                         <ignoredResourcePattern>arrow-git.properties</ignoredResourcePattern>
-                        <ignoredResourcePattern>about.html</ignoredResourcePattern>
                     </ignoredResourcePatterns>
                 </configuration>
             </plugin>
@@ -437,6 +541,7 @@
                                 <exclude>**/TestBigQueryInstanceCleaner.java</exclude>
                                 <exclude>**/TestBigQueryCaseInsensitiveMapping.java</exclude>
                                 <exclude>**/TestBigQuery*FailureRecoveryTest.java</exclude>
+                                <exclude>**/TestBigQueryWithProxyConnectorSmokeTest.java</exclude>
                             </excludes>
                         </configuration>
                     </plugin>
@@ -463,6 +568,7 @@
                                 <include>**/TestBigQueryMetadata.java</include>
                                 <include>**/TestBigQueryInstanceCleaner.java</include>
                                 <include>**/TestBigQuery*FailureRecoveryTest.java</include>
+                                <include>**/TestBigQueryWithProxyConnectorSmokeTest.java</include>
                             </includes>
                         </configuration>
                     </plugin>
@@ -500,9 +606,7 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
-                <air.test.jvm.additional-arguments>
-                    --add-opens=java.base/java.nio=ALL-UNNAMED
-                </air.test.jvm.additional-arguments>
+                <air.test.jvm.additional-arguments>--add-opens=java.base/java.nio=ALL-UNNAMED</air.test.jvm.additional-arguments>
             </properties>
             <build>
                 <plugins>
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryArrowToPageConverter.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryArrowToPageConverter.java
index 46279fd985bc..fbfd8ff664d3 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryArrowToPageConverter.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryArrowToPageConverter.java
@@ -13,12 +13,12 @@
  */
 package io.trino.plugin.bigquery;
 
-import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slice;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Decimals;
@@ -26,7 +26,6 @@
 import io.trino.spi.type.LongTimestampWithTimeZone;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeSignatureParameter;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
 import org.apache.arrow.memory.ArrowBuf;
@@ -55,10 +54,8 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.airlift.slice.Slices.wrappedBuffer;
 import static io.trino.plugin.bigquery.BigQueryUtil.toBigQueryColumnName;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
@@ -81,8 +78,6 @@
 import static org.apache.arrow.compression.CommonsCompressionFactory.INSTANCE;
 import static org.apache.arrow.vector.complex.BaseRepeatedValueVector.OFFSET_WIDTH;
 import static org.apache.arrow.vector.types.Types.MinorType.DECIMAL256;
-import static org.apache.arrow.vector.types.Types.MinorType.LIST;
-import static org.apache.arrow.vector.types.Types.MinorType.STRUCT;
 
 public class BigQueryArrowToPageConverter
         implements AutoCloseable
@@ -168,8 +163,11 @@ else if (javaType == Slice.class) {
             else if (javaType == LongTimestampWithTimeZone.class) {
                 writeVectorValues(output, vector, index -> writeObjectTimestampWithTimezone(output, type, vector, index), offset, length);
             }
-            else if (javaType == Block.class) {
-                writeVectorValues(output, vector, index -> writeBlock(output, type, vector, index), offset, length);
+            else if (type instanceof ArrayType arrayType) {
+                writeVectorValues(output, vector, index -> writeArrayBlock(output, arrayType, vector, index), offset, length);
+            }
+            else if (type instanceof RowType rowType) {
+                writeVectorValues(output, vector, index -> writeRowBlock(output, rowType, vector, index), offset, length);
             }
             else {
                 throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Unhandled type for %s: %s", javaType.getSimpleName(), type));
@@ -235,55 +233,35 @@ private void writeObjectTimestampWithTimezone(BlockBuilder output, Type type, Fi
         type.writeObject(output, fromEpochMillisAndFraction(floorDiv(epochMicros, MICROSECONDS_PER_MILLISECOND), picosOfMillis, UTC_KEY));
     }
 
-    private void writeBlock(BlockBuilder output, Type type, FieldVector vector, int index)
+    private void writeArrayBlock(BlockBuilder output, ArrayType arrayType, FieldVector vector, int index)
     {
-        if (type instanceof ArrayType && vector.getMinorType() == LIST) {
-            writeArrayBlock(output, type, vector, index);
-            return;
-        }
-        if (type instanceof RowType && vector.getMinorType() == STRUCT) {
-            writeRowBlock(output, type, vector, index);
-            return;
-        }
-        throw new TrinoException(GENERIC_INTERNAL_ERROR, "Unhandled type for Block: " + type.getTypeSignature());
-    }
-
-    private void writeArrayBlock(BlockBuilder output, Type type, FieldVector vector, int index)
-    {
-        BlockBuilder block = output.beginBlockEntry();
-        Type elementType = getOnlyElement(type.getTypeParameters());
-
-        ArrowBuf offsetBuffer = vector.getOffsetBuffer();
+        Type elementType = arrayType.getElementType();
+        ((ArrayBlockBuilder) output).buildEntry(elementBuilder -> {
+            ArrowBuf offsetBuffer = vector.getOffsetBuffer();
 
-        int start = offsetBuffer.getInt((long) index * OFFSET_WIDTH);
-        int end = offsetBuffer.getInt((long) (index + 1) * OFFSET_WIDTH);
+            int start = offsetBuffer.getInt((long) index * OFFSET_WIDTH);
+            int end = offsetBuffer.getInt((long) (index + 1) * OFFSET_WIDTH);
 
-        FieldVector innerVector = ((ListVector) vector).getDataVector();
+            FieldVector innerVector = ((ListVector) vector).getDataVector();
 
-        TransferPair transferPair = innerVector.getTransferPair(allocator);
-        transferPair.splitAndTransfer(start, end - start);
-        try (FieldVector sliced = (FieldVector) transferPair.getTo()) {
-            convertType(block, elementType, sliced, 0, sliced.getValueCount());
-        }
-        output.closeEntry();
+            TransferPair transferPair = innerVector.getTransferPair(allocator);
+            transferPair.splitAndTransfer(start, end - start);
+            try (FieldVector sliced = (FieldVector) transferPair.getTo()) {
+                convertType(elementBuilder, elementType, sliced, 0, sliced.getValueCount());
+            }
+        });
     }
 
-    private void writeRowBlock(BlockBuilder output, Type type, FieldVector vector, int index)
+    private void writeRowBlock(BlockBuilder output, RowType rowType, FieldVector vector, int index)
     {
-        BlockBuilder builder = output.beginBlockEntry();
-        ImmutableList.Builder<String> fieldNamesBuilder = ImmutableList.builder();
-        for (int i = 0; i < type.getTypeSignature().getParameters().size(); i++) {
-            TypeSignatureParameter parameter = type.getTypeSignature().getParameters().get(i);
-            fieldNamesBuilder.add(parameter.getNamedTypeSignature().getName().orElse("field" + i));
-        }
-        List<String> fieldNames = fieldNamesBuilder.build();
-        checkState(fieldNames.size() == type.getTypeParameters().size(), "fieldNames size differs from type %s type parameters size", type);
-
-        for (int i = 0; i < type.getTypeParameters().size(); i++) {
-            FieldVector innerVector = ((StructVector) vector).getChild(fieldNames.get(i));
-            convertType(builder, type.getTypeParameters().get(i), innerVector, index, 1);
-        }
-        output.closeEntry();
+        List<RowType.Field> fields = rowType.getFields();
+        ((RowBlockBuilder) output).buildEntry(fieldBuilders -> {
+            for (int i = 0; i < fields.size(); i++) {
+                RowType.Field field = fields.get(i);
+                FieldVector innerVector = ((StructVector) vector).getChild(field.getName().orElse("field" + i));
+                convertType(fieldBuilders.get(i), field.getType(), innerVector, index, 1);
+            }
+        });
     }
 
     @Override
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClient.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClient.java
index 112b20de3af1..3d864a500d41 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClient.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClient.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.bigquery;
 
 import com.google.cloud.bigquery.BigQuery;
+import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption;
 import com.google.cloud.bigquery.BigQueryException;
 import com.google.cloud.bigquery.Dataset;
 import com.google.cloud.bigquery.DatasetId;
@@ -22,7 +23,6 @@
 import com.google.cloud.bigquery.InsertAllResponse;
 import com.google.cloud.bigquery.Job;
 import com.google.cloud.bigquery.JobInfo;
-import com.google.cloud.bigquery.JobInfo.CreateDisposition;
 import com.google.cloud.bigquery.JobStatistics;
 import com.google.cloud.bigquery.JobStatistics.QueryStatistics;
 import com.google.cloud.bigquery.QueryJobConfiguration;
@@ -38,8 +38,9 @@
 import com.google.common.collect.ImmutableSet;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
-import io.trino.collect.cache.EvictableCacheBuilder;
+import io.trino.cache.EvictableCacheBuilder;
 import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
 
@@ -68,6 +69,8 @@
 import static io.trino.plugin.bigquery.BigQueryErrorCode.BIGQUERY_FAILED_TO_EXECUTE_QUERY;
 import static io.trino.plugin.bigquery.BigQueryErrorCode.BIGQUERY_INVALID_STATEMENT;
 import static io.trino.plugin.bigquery.BigQueryErrorCode.BIGQUERY_LISTING_DATASET_ERROR;
+import static io.trino.plugin.bigquery.BigQuerySessionProperties.createDisposition;
+import static io.trino.plugin.bigquery.BigQuerySessionProperties.isQueryResultsCacheEnabled;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
@@ -81,6 +84,7 @@ public class BigQueryClient
     static final Set<TableDefinition.Type> TABLE_TYPES = ImmutableSet.of(TABLE, VIEW, MATERIALIZED_VIEW, EXTERNAL, SNAPSHOT);
 
     private final BigQuery bigQuery;
+    private final BigQueryLabelFactory labelFactory;
     private final ViewMaterializationCache materializationCache;
     private final boolean caseInsensitiveNameMatching;
     private final LoadingCache<String, List<Dataset>> remoteDatasetCache;
@@ -88,12 +92,14 @@ public class BigQueryClient
 
     public BigQueryClient(
             BigQuery bigQuery,
+            BigQueryLabelFactory labelFactory,
             boolean caseInsensitiveNameMatching,
             ViewMaterializationCache materializationCache,
             Duration metadataCacheTtl,
             Optional<String> configProjectId)
     {
         this.bigQuery = requireNonNull(bigQuery, "bigQuery is null");
+        this.labelFactory = requireNonNull(labelFactory, "labelFactory is null");
         this.materializationCache = requireNonNull(materializationCache, "materializationCache is null");
         this.caseInsensitiveNameMatching = caseInsensitiveNameMatching;
         this.remoteDatasetCache = EvictableCacheBuilder.newBuilder()
@@ -246,9 +252,14 @@ public void createSchema(DatasetInfo datasetInfo)
         bigQuery.create(datasetInfo);
     }
 
-    public void dropSchema(DatasetId datasetId)
+    public void dropSchema(DatasetId datasetId, boolean cascade)
     {
-        bigQuery.delete(datasetId);
+        if (cascade) {
+            bigQuery.delete(datasetId, DatasetDeleteOption.deleteContents());
+        }
+        else {
+            bigQuery.delete(datasetId);
+        }
     }
 
     public void createTable(TableInfo tableInfo)
@@ -266,30 +277,33 @@ Job create(JobInfo jobInfo)
         return bigQuery.create(jobInfo);
     }
 
-    public void executeUpdate(QueryJobConfiguration job)
+    public void executeUpdate(ConnectorSession session, QueryJobConfiguration job)
     {
         log.debug("Execute query: %s", job.getQuery());
-        try {
-            bigQuery.query(job);
-        }
-        catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new BigQueryException(BaseHttpServiceException.UNKNOWN_CODE, format("Failed to run the query [%s]", job.getQuery()), e);
-        }
+        execute(session, job);
     }
 
-    public TableResult query(String sql, boolean useQueryResultsCache, CreateDisposition createDisposition)
+    public TableResult executeQuery(ConnectorSession session, String sql)
     {
         log.debug("Execute query: %s", sql);
+        QueryJobConfiguration job = QueryJobConfiguration.newBuilder(sql)
+                .setUseQueryCache(isQueryResultsCacheEnabled(session))
+                .setCreateDisposition(createDisposition(session))
+                .build();
+        return execute(session, job);
+    }
+
+    private TableResult execute(ConnectorSession session, QueryJobConfiguration job)
+    {
+        QueryJobConfiguration jobWithQueryLabel = job.toBuilder()
+                .setLabels(labelFactory.getLabels(session))
+                .build();
         try {
-            return bigQuery.query(QueryJobConfiguration.newBuilder(sql)
-                    .setUseQueryCache(useQueryResultsCache)
-                    .setCreateDisposition(createDisposition)
-                    .build());
+            return bigQuery.query(jobWithQueryLabel);
         }
         catch (InterruptedException e) {
             Thread.currentThread().interrupt();
-            throw new BigQueryException(BaseHttpServiceException.UNKNOWN_CODE, format("Failed to run the query [%s]", sql), e);
+            throw new BigQueryException(BaseHttpServiceException.UNKNOWN_CODE, format("Failed to run the query [%s]", job.getQuery()), e);
         }
     }
 
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClientFactory.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClientFactory.java
index bc1a4d0280c8..882d44be341f 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClientFactory.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClientFactory.java
@@ -13,54 +13,50 @@
  */
 package io.trino.plugin.bigquery;
 
-import com.google.api.gax.rpc.HeaderProvider;
-import com.google.auth.Credentials;
-import com.google.auth.oauth2.ServiceAccountCredentials;
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQueryOptions;
 import com.google.common.cache.CacheBuilder;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
+import java.util.Set;
 
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 public class BigQueryClientFactory
 {
     private final IdentityCacheMapping identityCacheMapping;
-    private final BigQueryCredentialsSupplier credentialsSupplier;
-    private final Optional<String> parentProjectId;
     private final Optional<String> projectId;
     private final boolean caseInsensitiveNameMatching;
     private final ViewMaterializationCache materializationCache;
-    private final HeaderProvider headerProvider;
+    private final BigQueryLabelFactory labelFactory;
+
     private final NonEvictableCache<IdentityCacheMapping.IdentityCacheKey, BigQueryClient> clientCache;
     private final Duration metadataCacheTtl;
+    private final Set<BigQueryOptionsConfigurer> optionsConfigurers;
 
     @Inject
     public BigQueryClientFactory(
             IdentityCacheMapping identityCacheMapping,
-            BigQueryCredentialsSupplier credentialsSupplier,
             BigQueryConfig bigQueryConfig,
             ViewMaterializationCache materializationCache,
-            HeaderProvider headerProvider)
+            BigQueryLabelFactory labelFactory,
+            Set<BigQueryOptionsConfigurer> optionsConfigurers)
     {
         this.identityCacheMapping = requireNonNull(identityCacheMapping, "identityCacheMapping is null");
-        this.credentialsSupplier = requireNonNull(credentialsSupplier, "credentialsSupplier is null");
         requireNonNull(bigQueryConfig, "bigQueryConfig is null");
-        this.parentProjectId = bigQueryConfig.getParentProjectId();
         this.projectId = bigQueryConfig.getProjectId();
         this.caseInsensitiveNameMatching = bigQueryConfig.isCaseInsensitiveNameMatching();
         this.materializationCache = requireNonNull(materializationCache, "materializationCache is null");
-        this.headerProvider = requireNonNull(headerProvider, "headerProvider is null");
+        this.labelFactory = requireNonNull(labelFactory, "labelFactory is null");
         this.metadataCacheTtl = bigQueryConfig.getMetadataCacheTtl();
+        this.optionsConfigurers = requireNonNull(optionsConfigurers, "optionsConfigurers is null");
 
         CacheBuilder<Object, Object> cacheBuilder = CacheBuilder.newBuilder()
                 .expireAfterWrite(bigQueryConfig.getServiceCacheTtl().toMillis(), MILLISECONDS);
@@ -71,38 +67,20 @@ public BigQueryClientFactory(
     public BigQueryClient create(ConnectorSession session)
     {
         IdentityCacheMapping.IdentityCacheKey cacheKey = identityCacheMapping.getRemoteUserCacheKey(session);
-
         return uncheckedCacheGet(clientCache, cacheKey, () -> createBigQueryClient(session));
     }
 
     protected BigQueryClient createBigQueryClient(ConnectorSession session)
     {
-        return new BigQueryClient(createBigQuery(session), caseInsensitiveNameMatching, materializationCache, metadataCacheTtl, projectId);
+        return new BigQueryClient(createBigQuery(session), labelFactory, caseInsensitiveNameMatching, materializationCache, metadataCacheTtl, projectId);
     }
 
     protected BigQuery createBigQuery(ConnectorSession session)
     {
-        Optional<Credentials> credentials = credentialsSupplier.getCredentials(session);
-        String billingProjectId = calculateBillingProjectId(parentProjectId, credentials);
-        BigQueryOptions.Builder options = BigQueryOptions.newBuilder()
-                .setHeaderProvider(headerProvider)
-                .setProjectId(billingProjectId);
-        credentials.ifPresent(options::setCredentials);
+        BigQueryOptions.Builder options = BigQueryOptions.newBuilder();
+        for (BigQueryOptionsConfigurer configurer : optionsConfigurers) {
+            options = configurer.configure(options, session);
+        }
         return options.build().getService();
     }
-
-    // Note that at this point the config has been validated, which means that option 2 or option 3 will always be valid
-    static String calculateBillingProjectId(Optional<String> configParentProjectId, Optional<Credentials> credentials)
-    {
-        // 1. Get from configuration
-        return configParentProjectId
-                // 2. Get from the provided credentials, but only ServiceAccountCredentials contains the project id.
-                // All other credentials types (User, AppEngine, GCE, CloudShell, etc.) take it from the environment
-                .orElseGet(() -> credentials
-                        .filter(ServiceAccountCredentials.class::isInstance)
-                        .map(ServiceAccountCredentials.class::cast)
-                        .map(ServiceAccountCredentials::getProjectId)
-                        // 3. No configuration was provided, so get the default from the environment
-                        .orElseGet(BigQueryOptions::getDefaultProjectId));
-    }
 }
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConfig.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConfig.java
index 349eecf9e67c..2adfe99b09d4 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConfig.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConfig.java
@@ -19,15 +19,17 @@
 import io.airlift.configuration.DefunctConfig;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.annotation.PostConstruct;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import io.trino.plugin.base.logging.SessionInterpolatedValues;
+import jakarta.annotation.PostConstruct;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkState;
+import static io.trino.plugin.base.logging.FormatInterpolator.hasValidPlaceholders;
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
@@ -35,8 +37,6 @@
 @DefunctConfig("bigquery.case-insensitive-name-matching.cache-ttl")
 public class BigQueryConfig
 {
-    private static final int MAX_RPC_CONNECTIONS = 1024;
-
     public static final int DEFAULT_MAX_READ_ROWS_RETRIES = 3;
     public static final String VIEWS_ENABLED = "bigquery.views-enabled";
     public static final String EXPERIMENTAL_ARROW_SERIALIZATION_ENABLED = "bigquery.experimental.arrow-serialization.enabled";
@@ -56,12 +56,10 @@ public class BigQueryConfig
     private Duration serviceCacheTtl = new Duration(3, MINUTES);
     private Duration metadataCacheTtl = new Duration(0, MILLISECONDS);
     private boolean queryResultsCacheEnabled;
-
-    private int rpcInitialChannelCount = 1;
-    private int rpcMinChannelCount = 1;
-    private int rpcMaxChannelCount = 1;
-    private int minRpcPerChannel;
-    private int maxRpcPerChannel = Integer.MAX_VALUE;
+    private String queryLabelName;
+    private String queryLabelFormat;
+    private boolean proxyEnabled;
+    private int metadataParallelism = 2;
 
     public Optional<String> getProjectId()
     {
@@ -266,76 +264,63 @@ public BigQueryConfig setQueryResultsCacheEnabled(boolean queryResultsCacheEnabl
         return this;
     }
 
-    @Min(1)
-    @Max(MAX_RPC_CONNECTIONS)
-    public int getRpcInitialChannelCount()
+    public String getQueryLabelFormat()
     {
-        return rpcInitialChannelCount;
+        return queryLabelFormat;
     }
 
-    @ConfigHidden
-    @Config("bigquery.channel-pool.initial-size")
-    public BigQueryConfig setRpcInitialChannelCount(int rpcInitialChannelCount)
+    @Config("bigquery.job.label-format")
+    @ConfigDescription("Adds `bigquery.job.label-name` label to the BigQuery job with provided value format")
+    public BigQueryConfig setQueryLabelFormat(String queryLabelFormat)
     {
-        this.rpcInitialChannelCount = rpcInitialChannelCount;
+        this.queryLabelFormat = queryLabelFormat;
         return this;
     }
 
-    @Min(1)
-    @Max(MAX_RPC_CONNECTIONS)
-    public int getRpcMinChannelCount()
-    {
-        return rpcMinChannelCount;
-    }
-
-    @ConfigHidden
-    @Config("bigquery.channel-pool.min-size")
-    public BigQueryConfig setRpcMinChannelCount(int rpcMinChannelCount)
+    @AssertTrue(message = "Incorrect bigquery.job.label-format may consist of only letters, digits, underscores, commas, spaces, equal signs and predefined values")
+    boolean isQueryLabelFormatValid()
     {
-        this.rpcMinChannelCount = rpcMinChannelCount;
-        return this;
+        return queryLabelFormat == null || hasValidPlaceholders(queryLabelFormat, SessionInterpolatedValues.values());
     }
 
-    @Min(1)
-    @Max(MAX_RPC_CONNECTIONS)
-    public int getRpcMaxChannelCount()
+    public String getQueryLabelName()
     {
-        return rpcMaxChannelCount;
+        return queryLabelName;
     }
 
-    @ConfigHidden
-    @Config("bigquery.channel-pool.max-size")
-    public BigQueryConfig setRpcMaxChannelCount(int rpcMaxChannelCount)
+    @Config("bigquery.job.label-name")
+    @ConfigDescription("Adds label with the given name to the BigQuery job")
+    public BigQueryConfig setQueryLabelName(String queryLabelName)
     {
-        this.rpcMaxChannelCount = rpcMaxChannelCount;
+        this.queryLabelName = queryLabelName;
         return this;
     }
 
-    @Min(0)
-    public int getMinRpcPerChannel()
+    public boolean isProxyEnabled()
     {
-        return minRpcPerChannel;
+        return proxyEnabled;
     }
 
-    @ConfigHidden
-    @Config("bigquery.channel-pool.min-rpc-per-channel")
-    public BigQueryConfig setMinRpcPerChannel(int minRpcPerChannel)
+    @Config("bigquery.rpc-proxy.enabled")
+    @ConfigDescription("Enables proxying of RPC and gRPC requests to BigQuery APIs")
+    public BigQueryConfig setProxyEnabled(boolean proxyEnabled)
     {
-        this.minRpcPerChannel = minRpcPerChannel;
+        this.proxyEnabled = proxyEnabled;
         return this;
     }
 
     @Min(1)
-    public int getMaxRpcPerChannel()
+    @Max(32)
+    public int getMetadataParallelism()
     {
-        return maxRpcPerChannel;
+        return metadataParallelism;
     }
 
-    @ConfigHidden
-    @Config("bigquery.channel-pool.max-rpc-per-channel")
-    public BigQueryConfig setMaxRpcPerChannel(int maxRpcPerChannel)
+    @ConfigDescription("Limits metadata enumeration calls parallelism")
+    @Config("bigquery.metadata.parallelism")
+    public BigQueryConfig setMetadataParallelism(int metadataParallelism)
     {
-        this.maxRpcPerChannel = maxRpcPerChannel;
+        this.metadataParallelism = metadataParallelism;
         return this;
     }
 
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnector.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnector.java
index 86c992c3b497..27aa095f3656 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnector.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnector.java
@@ -13,6 +13,8 @@
  */
 package io.trino.plugin.bigquery;
 
+import com.google.inject.Inject;
+import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorMetadata;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.connector.Connector;
@@ -22,12 +24,10 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Set;
 
@@ -37,6 +37,7 @@
 public class BigQueryConnector
         implements Connector
 {
+    private final LifeCycleManager lifeCycleManager;
     private final BigQueryTransactionManager transactionManager;
     private final BigQuerySplitManager splitManager;
     private final BigQueryPageSourceProvider pageSourceProvider;
@@ -46,6 +47,7 @@ public class BigQueryConnector
 
     @Inject
     public BigQueryConnector(
+            LifeCycleManager lifeCycleManager,
             BigQueryTransactionManager transactionManager,
             BigQuerySplitManager splitManager,
             BigQueryPageSourceProvider pageSourceProvider,
@@ -53,6 +55,7 @@ public BigQueryConnector(
             Set<ConnectorTableFunction> connectorTableFunctions,
             Set<SessionPropertiesProvider> sessionPropertiesProviders)
     {
+        this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null");
         this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
         this.splitManager = requireNonNull(splitManager, "splitManager is null");
         this.pageSourceProvider = requireNonNull(pageSourceProvider, "pageSourceProvider is null");
@@ -116,4 +119,10 @@ public List<PropertyMetadata<?>> getSessionProperties()
     {
         return sessionProperties;
     }
+
+    @Override
+    public void shutdown()
+    {
+        lifeCycleManager.stop();
+    }
 }
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnectorFactory.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnectorFactory.java
index d48872fd9efb..468c83845adb 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnectorFactory.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnectorFactory.java
@@ -24,7 +24,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class BigQueryConnectorFactory
@@ -41,7 +41,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
     {
         requireNonNull(catalogName, "catalogName is null");
         requireNonNull(config, "config is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 new JsonModule(),
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnectorModule.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnectorModule.java
index 27081053e7ea..733fb33717f9 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnectorModule.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnectorModule.java
@@ -15,26 +15,39 @@
 
 import com.google.api.gax.rpc.FixedHeaderProvider;
 import com.google.api.gax.rpc.HeaderProvider;
+import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.inject.Binder;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
+import com.google.inject.multibindings.Multibinder;
+import com.google.inject.multibindings.OptionalBinder;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.trino.plugin.base.logging.FormatInterpolator;
+import io.trino.plugin.base.logging.SessionInterpolatedValues;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.plugin.bigquery.ptf.Query;
 import io.trino.spi.NodeManager;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 
+import java.lang.annotation.Target;
 import java.lang.management.ManagementFactory;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator;
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
+import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static io.trino.plugin.bigquery.BigQueryConfig.EXPERIMENTAL_ARROW_SERIALIZATION_ENABLED;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.util.concurrent.Executors.newFixedThreadPool;
 import static java.util.stream.Collectors.toSet;
 
 public class BigQueryConnectorModule
@@ -66,12 +79,29 @@ protected void setup(Binder binder)
             binder.bind(BigQueryPageSinkProvider.class).in(Scopes.SINGLETON);
             binder.bind(ViewMaterializationCache.class).in(Scopes.SINGLETON);
             configBinder(binder).bindConfig(BigQueryConfig.class);
+            configBinder(binder).bindConfig(BigQueryRpcConfig.class);
             install(conditionalModule(
                     BigQueryConfig.class,
                     BigQueryConfig::isArrowSerializationEnabled,
                     ClientModule::verifyPackageAccessAllowed));
             newSetBinder(binder, ConnectorTableFunction.class).addBinding().toProvider(Query.class).in(Scopes.SINGLETON);
             newSetBinder(binder, SessionPropertiesProvider.class).addBinding().to(BigQuerySessionProperties.class).in(Scopes.SINGLETON);
+
+            Multibinder<BigQueryOptionsConfigurer> optionsConfigurers = newSetBinder(binder, BigQueryOptionsConfigurer.class);
+            optionsConfigurers.addBinding().to(CredentialsOptionsConfigurer.class).in(Scopes.SINGLETON);
+            optionsConfigurers.addBinding().to(HeaderOptionsConfigurer.class).in(Scopes.SINGLETON);
+            optionsConfigurers.addBinding().to(RetryOptionsConfigurer.class).in(Scopes.SINGLETON);
+            optionsConfigurers.addBinding().to(GrpcChannelOptionsConfigurer.class).in(Scopes.SINGLETON);
+            newOptionalBinder(binder, ProxyTransportFactory.class);
+
+            install(conditionalModule(
+                    BigQueryConfig.class,
+                    BigQueryConfig::isProxyEnabled,
+                    proxyBinder -> {
+                        configBinder(proxyBinder).bindConfig(BigQueryProxyConfig.class);
+                        newSetBinder(proxyBinder, BigQueryOptionsConfigurer.class).addBinding().to(ProxyOptionsConfigurer.class).in(Scopes.SINGLETON);
+                        newOptionalBinder(binder, ProxyTransportFactory.class).setDefault().to(ProxyTransportFactory.DefaultProxyTransportFactory.class).in(Scopes.SINGLETON);
+                    }));
         }
 
         @Provides
@@ -81,6 +111,20 @@ public static HeaderProvider createHeaderProvider(NodeManager nodeManager)
             return FixedHeaderProvider.create("user-agent", "Trino/" + nodeManager.getCurrentNode().getVersion());
         }
 
+        @Provides
+        @Singleton
+        public static BigQueryLabelFactory labelFactory(BigQueryConfig config)
+        {
+            return new BigQueryLabelFactory(config.getQueryLabelName(), new FormatInterpolator<>(config.getQueryLabelFormat(), SessionInterpolatedValues.values()));
+        }
+
+        @Provides
+        @ForBigQuery
+        public ListeningExecutorService provideListeningExecutor(BigQueryConfig config)
+        {
+            return listeningDecorator(newFixedThreadPool(config.getMetadataParallelism(), daemonThreadsNamed("big-query-%s"))); // limit parallelism
+        }
+
         /**
          * Apache Arrow requires reflective access to certain Java internals prohibited since Java 17.
          * Adds an error to the {@code binder} if required --add-opens is not passed to the JVM.
@@ -124,10 +168,24 @@ protected void setup(Binder binder)
                     .to(IdentityCacheMapping.SingletonIdentityCacheMapping.class)
                     .in(Scopes.SINGLETON);
 
-            newOptionalBinder(binder, BigQueryCredentialsSupplier.class)
+            OptionalBinder<BigQueryCredentialsSupplier> credentialsSupplierBinder = newOptionalBinder(binder, BigQueryCredentialsSupplier.class);
+            credentialsSupplierBinder
                     .setDefault()
-                    .to(StaticBigQueryCredentialsSupplier.class)
+                    .to(DefaultBigQueryCredentialsProvider.class)
                     .in(Scopes.SINGLETON);
+
+            StaticCredentialsConfig staticCredentialsConfig = buildConfigObject(StaticCredentialsConfig.class);
+            if (staticCredentialsConfig.getCredentialsFile().isPresent() || staticCredentialsConfig.getCredentialsKey().isPresent()) {
+                credentialsSupplierBinder
+                        .setBinding()
+                        .to(StaticBigQueryCredentialsSupplier.class)
+                        .in(Scopes.SINGLETON);
+            }
         }
     }
+
+    @Target({PARAMETER, FIELD, METHOD, CONSTRUCTOR})
+    public @interface ForBigQuery
+    {
+    }
 }
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryErrorCode.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryErrorCode.java
index 06f042f46387..60fa13b0274b 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryErrorCode.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryErrorCode.java
@@ -30,6 +30,7 @@ public enum BigQueryErrorCode
     BIGQUERY_LISTING_DATASET_ERROR(4, EXTERNAL),
     BIGQUERY_UNSUPPORTED_OPERATION(5, USER_ERROR),
     BIGQUERY_INVALID_STATEMENT(6, USER_ERROR),
+    BIGQUERY_PROXY_SSL_INITIALIZATION_FAILED(7, EXTERNAL),
     /**/;
 
     private final ErrorCode errorCode;
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryGrpcOptionsConfigurer.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryGrpcOptionsConfigurer.java
new file mode 100644
index 000000000000..f1c7c667ccac
--- /dev/null
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryGrpcOptionsConfigurer.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.cloud.bigquery.storage.v1.BigQueryReadSettings;
+import io.trino.spi.connector.ConnectorSession;
+
+interface BigQueryGrpcOptionsConfigurer
+        extends BigQueryOptionsConfigurer
+{
+    @Override
+    default BigQueryReadSettings.Builder configure(BigQueryReadSettings.Builder builder, ConnectorSession session)
+    {
+        InstantiatingGrpcChannelProvider.Builder channelBuilder = ((InstantiatingGrpcChannelProvider) builder.getTransportChannelProvider()).toBuilder();
+        return builder.setTransportChannelProvider(configure(channelBuilder, session).build());
+    }
+
+    InstantiatingGrpcChannelProvider.Builder configure(InstantiatingGrpcChannelProvider.Builder channelBuilder, ConnectorSession session);
+}
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryLabelFactory.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryLabelFactory.java
new file mode 100644
index 000000000000..1586f416dfce
--- /dev/null
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryLabelFactory.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.common.base.CharMatcher;
+import io.trino.plugin.base.logging.FormatInterpolator;
+import io.trino.spi.connector.ConnectorSession;
+
+import java.util.Map;
+
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static com.google.common.base.Verify.verify;
+import static java.util.Objects.requireNonNull;
+
+public class BigQueryLabelFactory
+{
+    private static final CharMatcher ALLOWED_CHARS = CharMatcher.inRange('a', 'z')
+            .or(CharMatcher.inRange('0', '9'))
+            .or(CharMatcher.anyOf("_-"))
+            .precomputed();
+
+    private static final int MAX_LABEL_VALUE_LENGTH = 63;
+    private final String name;
+    private final FormatInterpolator<ConnectorSession> interpolator;
+
+    public BigQueryLabelFactory(String labelName, FormatInterpolator<ConnectorSession> interpolator)
+    {
+        this.name = labelName;
+        this.interpolator = requireNonNull(interpolator, "interpolator is null");
+    }
+
+    public Map<String, String> getLabels(ConnectorSession session)
+    {
+        if (isNullOrEmpty(name)) {
+            return Map.of();
+        }
+
+        String value = interpolator.interpolate(session).trim();
+        if (isNullOrEmpty(value)) {
+            return Map.of();
+        }
+
+        verifyLabelValue(name);
+        verifyLabelValue(value);
+        return Map.of(name, value);
+    }
+
+    private void verifyLabelValue(String value)
+    {
+        verify(value.length() <= MAX_LABEL_VALUE_LENGTH, "BigQuery label value cannot be longer than %s characters", MAX_LABEL_VALUE_LENGTH);
+        verify(ALLOWED_CHARS.matchesAllOf(value), "BigQuery label value can contain only lowercase letters, numeric characters, underscores, and dashes");
+    }
+}
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java
index 1147eaed7b2d..14a0657e9d74 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java
@@ -32,6 +32,8 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
 import com.google.common.io.Closer;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
 import io.trino.plugin.bigquery.BigQueryClient.RemoteDatabaseObject;
@@ -41,8 +43,10 @@
 import io.trino.spi.connector.Assignment;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
-import io.trino.spi.connector.ColumnSchema;
+import io.trino.spi.connector.ConnectorAnalyzeMetadata;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
+import io.trino.spi.connector.ConnectorMaterializedViewDefinition;
+import io.trino.spi.connector.ConnectorMergeTableHandle;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorOutputMetadata;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
@@ -50,7 +54,6 @@
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.ConnectorTableLayout;
 import io.trino.spi.connector.ConnectorTableMetadata;
-import io.trino.spi.connector.ConnectorTableSchema;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.ConstraintApplicationResult;
@@ -65,22 +68,24 @@
 import io.trino.spi.connector.TableFunctionApplicationResult;
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.statistics.ComputedStatistics;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
-
-import javax.inject.Inject;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -90,6 +95,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static com.google.common.util.concurrent.Futures.allAsList;
 import static io.trino.plugin.base.TemporaryTables.generateTemporaryTableName;
 import static io.trino.plugin.bigquery.BigQueryClient.buildColumnHandles;
 import static io.trino.plugin.bigquery.BigQueryErrorCode.BIGQUERY_FAILED_TO_EXECUTE_QUERY;
@@ -121,11 +127,12 @@ public class BigQueryMetadata
 
     private final BigQueryClientFactory bigQueryClientFactory;
     private final AtomicReference<Runnable> rollbackAction = new AtomicReference<>();
+    private final ListeningExecutorService executorService;
 
-    @Inject
-    public BigQueryMetadata(BigQueryClientFactory bigQueryClientFactory)
+    public BigQueryMetadata(BigQueryClientFactory bigQueryClientFactory, ListeningExecutorService executorService)
     {
         this.bigQueryClientFactory = requireNonNull(bigQueryClientFactory, "bigQueryClientFactory is null");
+        this.executorService = requireNonNull(executorService, "executorService is null");
     }
 
     @Override
@@ -186,27 +193,32 @@ public List<SchemaTableName> listTables(ConnectorSession session, Optional<Strin
         Set<String> remoteSchemaNames = remoteSchema.map(ImmutableSet::of)
                 .orElseGet(() -> ImmutableSet.copyOf(listRemoteSchemaNames(session)));
 
+        return processInParallel(remoteSchemaNames.stream().toList(), remoteSchemaName -> listTablesInRemoteSchema(client, projectId, remoteSchemaName))
+                .flatMap(Collection::stream)
+                .collect(toImmutableList());
+    }
+
+    private List<SchemaTableName> listTablesInRemoteSchema(BigQueryClient client, String projectId, String remoteSchemaName)
+    {
         ImmutableList.Builder<SchemaTableName> tableNames = ImmutableList.builder();
-        for (String remoteSchemaName : remoteSchemaNames) {
-            try {
-                Iterable<Table> tables = client.listTables(DatasetId.of(projectId, remoteSchemaName));
-                for (Table table : tables) {
-                    // filter ambiguous tables
-                    client.toRemoteTable(projectId, remoteSchemaName, table.getTableId().getTable().toLowerCase(ENGLISH), tables)
-                            .filter(RemoteDatabaseObject::isAmbiguous)
-                            .ifPresentOrElse(
-                                    remoteTable -> log.debug("Filtered out [%s.%s] from list of tables due to ambiguous name", remoteSchemaName, table.getTableId().getTable()),
-                                    () -> tableNames.add(new SchemaTableName(table.getTableId().getDataset(), table.getTableId().getTable())));
-                }
+        try {
+            Iterable<Table> tables = client.listTables(DatasetId.of(projectId, remoteSchemaName));
+            for (Table table : tables) {
+                // filter ambiguous tables
+                client.toRemoteTable(projectId, remoteSchemaName, table.getTableId().getTable().toLowerCase(ENGLISH), tables)
+                        .filter(RemoteDatabaseObject::isAmbiguous)
+                        .ifPresentOrElse(
+                                remoteTable -> log.debug("Filtered out [%s.%s] from list of tables due to ambiguous name", remoteSchemaName, table.getTableId().getTable()),
+                                () -> tableNames.add(new SchemaTableName(table.getTableId().getDataset(), table.getTableId().getTable())));
             }
-            catch (BigQueryException e) {
-                if (e.getCode() == 404 && e.getMessage().contains("Not found: Dataset")) {
-                    // Dataset not found error is ignored because listTables is used for metadata queries (SELECT FROM information_schema)
-                    log.debug("Dataset disappeared during listing operation: %s", remoteSchemaName);
-                }
-                else {
-                    throw new TrinoException(BIGQUERY_LISTING_DATASET_ERROR, "Exception happened during listing BigQuery dataset: " + remoteSchemaName, e);
-                }
+        }
+        catch (BigQueryException e) {
+            if (e.getCode() == 404 && e.getMessage().contains("Not found: Dataset")) {
+                // Dataset not found error is ignored because listTables is used for metadata queries (SELECT FROM information_schema)
+                log.debug("Dataset disappeared during listing operation: %s", remoteSchemaName);
+            }
+            else {
+                throw new TrinoException(BIGQUERY_LISTING_DATASET_ERROR, "Exception happened during listing BigQuery dataset: " + remoteSchemaName, e);
             }
         }
         return tableNames.build();
@@ -356,20 +368,51 @@ public ColumnMetadata getColumnMetadata(
     public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
     {
         log.debug("listTableColumns(session=%s, prefix=%s)", session, prefix);
-        ImmutableMap.Builder<SchemaTableName, List<ColumnMetadata>> columns = ImmutableMap.builder();
         List<SchemaTableName> tables = prefix.toOptionalSchemaTableName()
                 .<List<SchemaTableName>>map(ImmutableList::of)
                 .orElseGet(() -> listTables(session, prefix.getSchema()));
-        for (SchemaTableName tableName : tables) {
-            try {
-                Optional.ofNullable(getTableHandleIgnoringConflicts(session, tableName))
-                        .ifPresent(tableHandle -> columns.put(tableName, getTableMetadata(session, tableHandle).getColumns()));
-            }
-            catch (TableNotFoundException e) {
-                // table disappeared during listing operation
-            }
+
+        List<BigQueryTableHandle> tableHandles = processInParallel(tables, table -> getTableHandleIgnoringConflicts(session, table))
+                .filter(Objects::nonNull)
+                .map(BigQueryTableHandle.class::cast)
+                .collect(toImmutableList());
+
+        return processInParallel(tableHandles, tableHandle -> safeGetTableMetadata(session, tableHandle))
+                .filter(Objects::nonNull)
+                .collect(toImmutableMap(ConnectorTableMetadata::getTable, ConnectorTableMetadata::getColumns));
+    }
+
+    @Nullable
+    private ConnectorTableMetadata safeGetTableMetadata(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        try {
+            return getTableMetadata(session, tableHandle);
+        }
+        catch (TableNotFoundException e) {
+            // table disappeared during listing operation
+            return null;
+        }
+    }
+
+    protected <T, R> Stream<R> processInParallel(List<T> list, Function<T, R> function)
+    {
+        if (list.size() == 1) {
+            return Stream.of(function.apply(list.get(0)));
+        }
+
+        List<ListenableFuture<R>> futures = list.stream()
+                .map(element -> executorService.submit(() -> function.apply(element)))
+                .collect(toImmutableList());
+        try {
+            return allAsList(futures).get().stream();
+        }
+        catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RuntimeException(e);
+        }
+        catch (ExecutionException e) {
+            throw new RuntimeException(e.getCause());
         }
-        return columns.buildOrThrow();
     }
 
     @Override
@@ -382,12 +425,12 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
         BigQueryClient client = bigQueryClientFactory.create(session);
         String projectId = client.getProjectId();
         String remoteSchemaName = getRemoteSchemaName(client, projectId, schemaName);
-        client.dropSchema(DatasetId.of(projectId, remoteSchemaName));
+        client.dropSchema(DatasetId.of(projectId, remoteSchemaName), cascade);
     }
 
     private void setRollback(Runnable action)
@@ -523,7 +566,7 @@ public void truncateTable(ConnectorSession session, ConnectorTableHandle tableHa
                 quote(remoteTableName.getProjectId()),
                 quote(remoteTableName.getDatasetName()),
                 quote(remoteTableName.getTableName()));
-        client.executeUpdate(QueryJobConfiguration.of(sql));
+        client.executeUpdate(session, QueryJobConfiguration.of(sql));
     }
 
     @Override
@@ -605,7 +648,7 @@ private Optional<ConnectorOutputMetadata> finishInsert(
                     quote(pageSinkIdColumnName),
                     quote(pageSinkIdColumnName));
 
-            client.executeUpdate(QueryJobConfiguration.of(insertSql));
+            client.executeUpdate(session, QueryJobConfiguration.of(insertSql));
         }
         finally {
             try {
@@ -626,6 +669,41 @@ public Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session,
         return finishInsert(session, handle.getRemoteTableName(), handle.getTemporaryRemoteTableName(), handle.getPageSinkIdColumnName(), handle.getColumnNames(), fragments);
     }
 
+    @Override
+    public Optional<ConnectorTableHandle> applyDelete(ConnectorSession session, ConnectorTableHandle handle)
+    {
+        // TODO Fix BaseBigQueryFailureRecoveryTest when implementing this method
+        return ConnectorMetadata.super.applyDelete(session, handle);
+    }
+
+    @Override
+    public OptionalLong executeDelete(ConnectorSession session, ConnectorTableHandle handle)
+    {
+        // TODO Fix BaseBigQueryFailureRecoveryTest when implementing this method
+        return ConnectorMetadata.super.executeDelete(session, handle);
+    }
+
+    @Override
+    public ConnectorMergeTableHandle beginMerge(ConnectorSession session, ConnectorTableHandle tableHandle, RetryMode retryMode)
+    {
+        // TODO Fix BaseBigQueryFailureRecoveryTest when implementing this method
+        return ConnectorMetadata.super.beginMerge(session, tableHandle, retryMode);
+    }
+
+    @Override
+    public void createMaterializedView(ConnectorSession session, SchemaTableName viewName, ConnectorMaterializedViewDefinition definition, boolean replace, boolean ignoreExisting)
+    {
+        // TODO Fix BaseBigQueryFailureRecoveryTest when implementing this method
+        ConnectorMetadata.super.createMaterializedView(session, viewName, definition, replace, ignoreExisting);
+    }
+
+    @Override
+    public ConnectorAnalyzeMetadata getStatisticsCollectionMetadata(ConnectorSession session, ConnectorTableHandle tableHandle, Map<String, Object> analyzeProperties)
+    {
+        // TODO Fix BaseBigQueryFailureRecoveryTest when implementing this method
+        return ConnectorMetadata.super.getStatisticsCollectionMetadata(session, tableHandle, analyzeProperties);
+    }
+
     @Override
     public void setTableComment(ConnectorSession session, ConnectorTableHandle tableHandle, Optional<String> newComment)
     {
@@ -638,8 +716,7 @@ public void setTableComment(ConnectorSession session, ConnectorTableHandle table
                 quote(remoteTableName.getProjectId()),
                 quote(remoteTableName.getDatasetName()),
                 quote(remoteTableName.getTableName()));
-        client.executeUpdate(QueryJobConfiguration.newBuilder(sql)
-                .setQuery(sql)
+        client.executeUpdate(session, QueryJobConfiguration.newBuilder(sql)
                 .addPositionalParameter(QueryParameterValue.string(newComment.orElse(null)))
                 .build());
     }
@@ -658,8 +735,7 @@ public void setColumnComment(ConnectorSession session, ConnectorTableHandle tabl
                 quote(remoteTableName.getDatasetName()),
                 quote(remoteTableName.getTableName()),
                 quote(column.getName()));
-        client.executeUpdate(QueryJobConfiguration.newBuilder(sql)
-                .setQuery(sql)
+        client.executeUpdate(session, QueryJobConfiguration.newBuilder(sql)
                 .addPositionalParameter(QueryParameterValue.string(newComment.orElse(null)))
                 .build());
     }
@@ -723,13 +799,7 @@ public Optional<TableFunctionApplicationResult<ConnectorTableHandle>> applyTable
         }
 
         ConnectorTableHandle tableHandle = ((QueryHandle) handle).getTableHandle();
-        ConnectorTableSchema tableSchema = getTableSchema(session, tableHandle);
-        Map<String, ColumnHandle> columnHandlesByName = getColumnHandles(session, tableHandle);
-        List<ColumnHandle> columnHandles = tableSchema.getColumns().stream()
-                .map(ColumnSchema::getName)
-                .map(columnHandlesByName::get)
-                .collect(toImmutableList());
-
+        List<ColumnHandle> columnHandles = ImmutableList.copyOf(getColumnHandles(session, tableHandle).values());
         return Optional.of(new TableFunctionApplicationResult<>(tableHandle, columnHandles));
     }
 
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryOptionsConfigurer.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryOptionsConfigurer.java
new file mode 100644
index 000000000000..14f4bdcd8277
--- /dev/null
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryOptionsConfigurer.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.cloud.bigquery.storage.v1.BigQueryReadSettings;
+import io.trino.spi.connector.ConnectorSession;
+
+interface BigQueryOptionsConfigurer
+{
+    BigQueryOptions.Builder configure(BigQueryOptions.Builder builder, ConnectorSession session);
+
+    BigQueryReadSettings.Builder configure(BigQueryReadSettings.Builder builder, ConnectorSession session);
+}
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPageSink.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPageSink.java
index 4b9f9c126d66..e67d13702d0f 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPageSink.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPageSink.java
@@ -89,7 +89,9 @@ public CompletableFuture<?> appendPage(Page page)
     @Override
     public CompletableFuture<Collection<Slice>> finish()
     {
-        return completedFuture(ImmutableList.of(Slices.wrappedLongArray(pageSinkId.getId())));
+        Slice value = Slices.allocate(Long.BYTES);
+        value.setLong(0, pageSinkId.getId());
+        return completedFuture(ImmutableList.of(value));
     }
 
     @Override
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPageSinkProvider.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPageSinkProvider.java
index 8d7546f83636..a3423fa78670 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPageSinkProvider.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPageSinkProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.bigquery;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
 import io.trino.spi.connector.ConnectorPageSink;
@@ -21,8 +22,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPageSourceProvider.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPageSourceProvider.java
index 2cdf2f858566..b9a37f951a62 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPageSourceProvider.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPageSourceProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.bigquery;
 
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorPageSource;
@@ -23,15 +24,11 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.DynamicFilter;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.plugin.bigquery.BigQuerySessionProperties.createDisposition;
-import static io.trino.plugin.bigquery.BigQuerySessionProperties.isQueryResultsCacheEnabled;
 import static java.util.Objects.requireNonNull;
 
 public class BigQueryPageSourceProvider
@@ -112,12 +109,11 @@ private ConnectorPageSource createStoragePageSource(ConnectorSession session, Bi
     private ConnectorPageSource createQueryPageSource(ConnectorSession session, BigQueryTableHandle table, List<BigQueryColumnHandle> columnHandles, Optional<String> filter)
     {
         return new BigQueryQueryPageSource(
+                session,
                 bigQueryClientFactory.create(session),
                 table,
                 columnHandles.stream().map(BigQueryColumnHandle::getName).collect(toImmutableList()),
                 columnHandles.stream().map(BigQueryColumnHandle::getTrinoType).collect(toImmutableList()),
-                filter,
-                isQueryResultsCacheEnabled(session),
-                createDisposition(session));
+                filter);
     }
 }
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryProxyConfig.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryProxyConfig.java
new file mode 100644
index 000000000000..fa84553a8553
--- /dev/null
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryProxyConfig.java
@@ -0,0 +1,159 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
+import com.google.inject.ConfigurationException;
+import com.google.inject.spi.Message;
+import io.airlift.configuration.Config;
+import io.airlift.configuration.ConfigDescription;
+import io.airlift.configuration.ConfigSecuritySensitive;
+import io.airlift.configuration.validation.FileExists;
+import jakarta.annotation.PostConstruct;
+import jakarta.validation.constraints.NotNull;
+
+import java.io.File;
+import java.net.URI;
+import java.util.Optional;
+
+import static com.google.common.base.Strings.isNullOrEmpty;
+
+public class BigQueryProxyConfig
+{
+    private URI uri;
+    private Optional<String> username = Optional.empty();
+    private Optional<String> password = Optional.empty();
+    private File keystorePath;
+    private String keystorePassword;
+    private File truststorePath;
+    private String truststorePassword;
+
+    @NotNull
+    public URI getUri()
+    {
+        return uri;
+    }
+
+    @ConfigDescription("Proxy URI (host and port only)")
+    @Config("bigquery.rpc-proxy.uri")
+    public BigQueryProxyConfig setUri(URI uri)
+    {
+        this.uri = uri;
+        return this;
+    }
+
+    public Optional<String> getUsername()
+    {
+        return username;
+    }
+
+    @ConfigDescription("Username used to authenticate against proxy")
+    @Config("bigquery.rpc-proxy.username")
+    public BigQueryProxyConfig setUsername(String username)
+    {
+        this.username = Optional.ofNullable(username);
+        return this;
+    }
+
+    public Optional<String> getPassword()
+    {
+        return password;
+    }
+
+    @ConfigSecuritySensitive
+    @ConfigDescription("Password used to authenticate against proxy")
+    @Config("bigquery.rpc-proxy.password")
+    public BigQueryProxyConfig setPassword(String password)
+    {
+        this.password = Optional.ofNullable(password);
+        return this;
+    }
+
+    public Optional<@FileExists File> getKeystorePath()
+    {
+        return Optional.ofNullable(keystorePath);
+    }
+
+    @Config("bigquery.rpc-proxy.keystore-path")
+    @ConfigDescription("Path to a Java keystore file")
+    public BigQueryProxyConfig setKeystorePath(File keystorePath)
+    {
+        this.keystorePath = keystorePath;
+        return this;
+    }
+
+    public Optional<String> getKeystorePassword()
+    {
+        return Optional.ofNullable(keystorePassword);
+    }
+
+    @Config("bigquery.rpc-proxy.keystore-password")
+    @ConfigDescription("Password to a Java keystore file")
+    @ConfigSecuritySensitive
+    public BigQueryProxyConfig setKeystorePassword(String keystorePassword)
+    {
+        this.keystorePassword = keystorePassword;
+        return this;
+    }
+
+    public Optional<@FileExists File> getTruststorePath()
+    {
+        return Optional.ofNullable(truststorePath);
+    }
+
+    @Config("bigquery.rpc-proxy.truststore-path")
+    @ConfigDescription("Path to a Java truststore file")
+    public BigQueryProxyConfig setTruststorePath(File truststorePath)
+    {
+        this.truststorePath = truststorePath;
+        return this;
+    }
+
+    public Optional<String> getTruststorePassword()
+    {
+        return Optional.ofNullable(truststorePassword);
+    }
+
+    @Config("bigquery.rpc-proxy.truststore-password")
+    @ConfigDescription("Password to a Java truststore file")
+    @ConfigSecuritySensitive
+    public BigQueryProxyConfig setTruststorePassword(String truststorePassword)
+    {
+        this.truststorePassword = truststorePassword;
+        return this;
+    }
+
+    @PostConstruct
+    @VisibleForTesting
+    void validate()
+    {
+        if (!isNullOrEmpty(uri.getPath())) {
+            throw exception("BigQuery RPC proxy URI cannot specify path");
+        }
+
+        if ((username.isPresent() && password.isEmpty())) {
+            throw exception("bigquery.rpc-proxy.username was set but bigquery.rpc-proxy.password is empty");
+        }
+
+        if (username.isEmpty() && password.isPresent()) {
+            throw exception("bigquery.rpc-proxy.password was set but bigquery.rpc-proxy.username is empty");
+        }
+    }
+
+    private static ConfigurationException exception(String message)
+    {
+        return new ConfigurationException(ImmutableList.of(new Message(message)));
+    }
+}
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPseudoColumn.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPseudoColumn.java
index 7d96626d3c7e..d961d7618f28 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPseudoColumn.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryPseudoColumn.java
@@ -16,7 +16,6 @@
 import com.google.cloud.bigquery.Field;
 import com.google.cloud.bigquery.StandardSQLTypeName;
 import com.google.common.collect.ImmutableList;
-import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.type.Type;
 
 import static io.trino.spi.type.DateType.DATE;
@@ -64,13 +63,4 @@ public BigQueryColumnHandle getColumnHandle()
                 null,
                 true);
     }
-
-    public ColumnMetadata getColumnMetadata()
-    {
-        return ColumnMetadata.builder()
-                .setName(trinoColumnName)
-                .setType(trinoType)
-                .setHidden(true)
-                .build();
-    }
 }
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryQueryPageSource.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryQueryPageSource.java
index 11daeac84d56..7330328f5653 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryQueryPageSource.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryQueryPageSource.java
@@ -15,7 +15,6 @@
 
 import com.google.cloud.bigquery.FieldValue;
 import com.google.cloud.bigquery.FieldValueList;
-import com.google.cloud.bigquery.JobInfo.CreateDisposition;
 import com.google.cloud.bigquery.TableId;
 import com.google.cloud.bigquery.TableResult;
 import com.google.common.collect.ImmutableList;
@@ -24,9 +23,11 @@
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.connector.ConnectorPageSource;
+import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Decimals;
@@ -80,13 +81,12 @@ public class BigQueryQueryPageSource
     private boolean finished;
 
     public BigQueryQueryPageSource(
+            ConnectorSession session,
             BigQueryClient client,
             BigQueryTableHandle table,
             List<String> columnNames,
             List<Type> columnTypes,
-            Optional<String> filter,
-            boolean useQueryResultsCache,
-            CreateDisposition createDisposition)
+            Optional<String> filter)
     {
         requireNonNull(client, "client is null");
         requireNonNull(table, "table is null");
@@ -97,7 +97,7 @@ public BigQueryQueryPageSource(
         this.columnTypes = ImmutableList.copyOf(columnTypes);
         this.pageBuilder = new PageBuilder(columnTypes);
         String sql = buildSql(table, client.getProjectId(), ImmutableList.copyOf(columnNames), filter);
-        this.tableResult = client.query(sql, useQueryResultsCache, createDisposition);
+        this.tableResult = client.executeQuery(session, sql);
     }
 
     private static String buildSql(BigQueryTableHandle table, String projectId, List<String> columnNames, Optional<String> filter)
@@ -207,8 +207,22 @@ else if (type.getJavaType() == Int128.class) {
             else if (javaType == Slice.class) {
                 writeSlice(output, type, value);
             }
-            else if (javaType == Block.class) {
-                writeBlock(output, type, value);
+            else if (type instanceof ArrayType arrayType) {
+                ((ArrayBlockBuilder) output).buildEntry(elementBuilder -> {
+                    Type elementType = arrayType.getElementType();
+                    for (FieldValue element : value.getRepeatedValue()) {
+                        appendTo(elementType, element, elementBuilder);
+                    }
+                });
+            }
+            else if (type instanceof RowType rowType) {
+                FieldValueList record = value.getRecordValue();
+                List<RowType.Field> fields = rowType.getFields();
+                ((RowBlockBuilder) output).buildEntry(fieldBuilders -> {
+                    for (int index = 0; index < fields.size(); index++) {
+                        appendTo(fields.get(index).getType(), record.get(index), fieldBuilders.get(index));
+                    }
+                });
             }
             else {
                 throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Unhandled type for %s: %s", javaType.getSimpleName(), type));
@@ -232,31 +246,6 @@ else if (type instanceof VarbinaryType) {
         }
     }
 
-    private void writeBlock(BlockBuilder output, Type type, FieldValue value)
-    {
-        if (type instanceof ArrayType) {
-            BlockBuilder builder = output.beginBlockEntry();
-
-            for (FieldValue element : value.getRepeatedValue()) {
-                appendTo(type.getTypeParameters().get(0), element, builder);
-            }
-
-            output.closeEntry();
-            return;
-        }
-        if (type instanceof RowType) {
-            FieldValueList record = value.getRecordValue();
-            BlockBuilder builder = output.beginBlockEntry();
-
-            for (int index = 0; index < type.getTypeParameters().size(); index++) {
-                appendTo(type.getTypeParameters().get(index), record.get(index), builder);
-            }
-            output.closeEntry();
-            return;
-        }
-        throw new TrinoException(GENERIC_INTERNAL_ERROR, "Unhandled type for Block: " + type.getTypeSignature());
-    }
-
     @Override
     public void close() {}
 }
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryReadClientFactory.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryReadClientFactory.java
index 586ccacb254b..61b3322850a4 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryReadClientFactory.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryReadClientFactory.java
@@ -13,20 +13,16 @@
  */
 package io.trino.plugin.bigquery;
 
-import com.google.api.gax.core.FixedCredentialsProvider;
-import com.google.api.gax.grpc.ChannelPoolSettings;
-import com.google.api.gax.rpc.HeaderProvider;
-import com.google.auth.Credentials;
 import com.google.cloud.bigquery.storage.v1.BigQueryReadClient;
 import com.google.cloud.bigquery.storage.v1.BigQueryReadSettings;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.util.Optional;
+import java.util.Set;
 
+import static com.google.cloud.bigquery.storage.v1.BigQueryReadSettings.defaultGrpcTransportProviderBuilder;
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -36,40 +32,25 @@
  */
 public class BigQueryReadClientFactory
 {
-    private final BigQueryCredentialsSupplier credentialsSupplier;
-    private final HeaderProvider headerProvider;
-    private final ChannelPoolSettings channelPoolSettings;
+    private final Set<BigQueryOptionsConfigurer> configurers;
 
     @Inject
-    public BigQueryReadClientFactory(BigQueryConfig bigQueryConfig, BigQueryCredentialsSupplier bigQueryCredentialsSupplier, HeaderProvider headerProvider)
+    public BigQueryReadClientFactory(Set<BigQueryOptionsConfigurer> configurers)
     {
-        requireNonNull(bigQueryConfig, "bigQueryConfig is null");
-        this.credentialsSupplier = requireNonNull(bigQueryCredentialsSupplier, "credentialsSupplier is null");
-        this.headerProvider = requireNonNull(headerProvider, "headerProvider is null");
-
-        this.channelPoolSettings = ChannelPoolSettings.builder()
-                .setInitialChannelCount(bigQueryConfig.getRpcInitialChannelCount())
-                .setMinChannelCount(bigQueryConfig.getRpcMinChannelCount())
-                .setMaxChannelCount(bigQueryConfig.getRpcMaxChannelCount())
-                .setMinRpcsPerChannel(bigQueryConfig.getMinRpcPerChannel())
-                .setMaxRpcsPerChannel(bigQueryConfig.getMaxRpcPerChannel())
-                .build();
+        this.configurers = requireNonNull(configurers, "configurers is null");
     }
 
     BigQueryReadClient create(ConnectorSession session)
     {
-        Optional<Credentials> credentials = credentialsSupplier.getCredentials(session);
+        BigQueryReadSettings.Builder builder = BigQueryReadSettings
+                .newBuilder()
+                .setTransportChannelProvider(defaultGrpcTransportProviderBuilder().build());
 
+        for (BigQueryOptionsConfigurer configurer : configurers) {
+            builder = configurer.configure(builder, session);
+        }
         try {
-            BigQueryReadSettings.Builder clientSettings = BigQueryReadSettings.newBuilder()
-                    .setTransportChannelProvider(
-                            BigQueryReadSettings.defaultGrpcTransportProviderBuilder()
-                                    .setHeaderProvider(headerProvider)
-                                    .setChannelPoolSettings(channelPoolSettings)
-                                    .build());
-            credentials.ifPresent(value ->
-                    clientSettings.setCredentialsProvider(FixedCredentialsProvider.create(value)));
-            return BigQueryReadClient.create(clientSettings.build());
+            return BigQueryReadClient.create(builder.build());
         }
         catch (IOException e) {
             throw new UncheckedIOException("Error creating BigQueryReadClient", e);
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryRpcConfig.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryRpcConfig.java
new file mode 100644
index 000000000000..3cc24e7698d0
--- /dev/null
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryRpcConfig.java
@@ -0,0 +1,172 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import io.airlift.configuration.Config;
+import io.airlift.configuration.ConfigHidden;
+import io.airlift.units.Duration;
+import io.airlift.units.MaxDuration;
+import io.airlift.units.MinDuration;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+
+public class BigQueryRpcConfig
+{
+    private static final int MAX_RPC_CONNECTIONS = 1024;
+
+    private int rpcInitialChannelCount = 1;
+    private int rpcMinChannelCount = 1;
+    private int rpcMaxChannelCount = 1;
+    private int minRpcPerChannel;
+    private int maxRpcPerChannel = Integer.MAX_VALUE;
+    private int retries;
+    private Duration timeout = Duration.valueOf("0s");
+    private Duration retryDelay = Duration.valueOf("0s");
+    private double retryMultiplier = 1.0;
+
+    @Min(1)
+    @Max(MAX_RPC_CONNECTIONS)
+    public int getRpcInitialChannelCount()
+    {
+        return rpcInitialChannelCount;
+    }
+
+    @ConfigHidden
+    @Config("bigquery.channel-pool.initial-size")
+    public BigQueryRpcConfig setRpcInitialChannelCount(int rpcInitialChannelCount)
+    {
+        this.rpcInitialChannelCount = rpcInitialChannelCount;
+        return this;
+    }
+
+    @Min(1)
+    @Max(MAX_RPC_CONNECTIONS)
+    public int getRpcMinChannelCount()
+    {
+        return rpcMinChannelCount;
+    }
+
+    @ConfigHidden
+    @Config("bigquery.channel-pool.min-size")
+    public BigQueryRpcConfig setRpcMinChannelCount(int rpcMinChannelCount)
+    {
+        this.rpcMinChannelCount = rpcMinChannelCount;
+        return this;
+    }
+
+    @Min(1)
+    @Max(MAX_RPC_CONNECTIONS)
+    public int getRpcMaxChannelCount()
+    {
+        return rpcMaxChannelCount;
+    }
+
+    @ConfigHidden
+    @Config("bigquery.channel-pool.max-size")
+    public BigQueryRpcConfig setRpcMaxChannelCount(int rpcMaxChannelCount)
+    {
+        this.rpcMaxChannelCount = rpcMaxChannelCount;
+        return this;
+    }
+
+    @Min(0)
+    public int getMinRpcPerChannel()
+    {
+        return minRpcPerChannel;
+    }
+
+    @ConfigHidden
+    @Config("bigquery.channel-pool.min-rpc-per-channel")
+    public BigQueryRpcConfig setMinRpcPerChannel(int minRpcPerChannel)
+    {
+        this.minRpcPerChannel = minRpcPerChannel;
+        return this;
+    }
+
+    @Min(1)
+    public int getMaxRpcPerChannel()
+    {
+        return maxRpcPerChannel;
+    }
+
+    @ConfigHidden
+    @Config("bigquery.channel-pool.max-rpc-per-channel")
+    public BigQueryRpcConfig setMaxRpcPerChannel(int maxRpcPerChannel)
+    {
+        this.maxRpcPerChannel = maxRpcPerChannel;
+        return this;
+    }
+
+    @Min(0)
+    @Max(16)
+    public int getRetries()
+    {
+        return retries;
+    }
+
+    @ConfigHidden
+    @Config("bigquery.rpc-retries")
+    public BigQueryRpcConfig setRetries(int maxRetries)
+    {
+        this.retries = maxRetries;
+        return this;
+    }
+
+    @MinDuration("0s")
+    @MaxDuration("1m")
+    public Duration getTimeout()
+    {
+        return timeout;
+    }
+
+    @ConfigHidden
+    @Config("bigquery.rpc-timeout")
+    public BigQueryRpcConfig setTimeout(Duration timeout)
+    {
+        this.timeout = timeout;
+        return this;
+    }
+
+    @MinDuration("0s")
+    @MaxDuration("30s")
+    public Duration getRetryDelay()
+    {
+        return retryDelay;
+    }
+
+    @ConfigHidden
+    @Config("bigquery.rpc-retry-delay")
+    public BigQueryRpcConfig setRetryDelay(Duration retryDelay)
+    {
+        this.retryDelay = retryDelay;
+        return this;
+    }
+
+    @ConfigHidden
+    @Config("bigquery.rpc-retry-delay-multiplier")
+    public BigQueryRpcConfig setRetryMultiplier(double retryMultiplier)
+    {
+        this.retryMultiplier = retryMultiplier;
+        return this;
+    }
+
+    @DecimalMin("1.0")
+    @DecimalMax("2.0")
+    public double getRetryMultiplier()
+    {
+        return retryMultiplier;
+    }
+}
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQuerySessionProperties.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQuerySessionProperties.java
index 90f17f30d562..45147945f154 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQuerySessionProperties.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQuerySessionProperties.java
@@ -15,12 +15,11 @@
 
 import com.google.cloud.bigquery.JobInfo.CreateDisposition;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.spi.session.PropertyMetadata.booleanProperty;
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQuerySplitManager.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQuerySplitManager.java
index 0c4803b8a316..76c17430399f 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQuerySplitManager.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQuerySplitManager.java
@@ -20,6 +20,7 @@
 import com.google.cloud.bigquery.TableResult;
 import com.google.cloud.bigquery.storage.v1.ReadSession;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.spi.NodeManager;
@@ -37,8 +38,6 @@
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -50,8 +49,6 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.plugin.bigquery.BigQueryClient.TABLE_TYPES;
 import static io.trino.plugin.bigquery.BigQueryErrorCode.BIGQUERY_FAILED_TO_EXECUTE_QUERY;
-import static io.trino.plugin.bigquery.BigQuerySessionProperties.createDisposition;
-import static io.trino.plugin.bigquery.BigQuerySessionProperties.isQueryResultsCacheEnabled;
 import static io.trino.plugin.bigquery.BigQuerySessionProperties.isSkipViewMaterialization;
 import static io.trino.plugin.bigquery.BigQueryUtil.isWildcardTable;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
@@ -160,7 +157,7 @@ private List<BigQuerySplit> createEmptyProjection(ConnectorSession session, Tabl
             if (filter.isPresent()) {
                 // count the rows based on the filter
                 String sql = client.selectSql(remoteTableId, "COUNT(*)");
-                TableResult result = client.query(sql, isQueryResultsCacheEnabled(session), createDisposition(session));
+                TableResult result = client.executeQuery(session, sql);
                 numberOfRows = result.iterateAll().iterator().next().get(0).getLongValue();
             }
             else {
@@ -170,7 +167,7 @@ private List<BigQuerySplit> createEmptyProjection(ConnectorSession session, Tabl
                 // (and there's no mechanism to trigger an on-demand flush). This can lead to incorrect results for queries with empty projections.
                 if (TABLE_TYPES.contains(tableInfo.getDefinition().getType())) {
                     String sql = client.selectSql(remoteTableId, "COUNT(*)");
-                    TableResult result = client.query(sql, isQueryResultsCacheEnabled(session), createDisposition(session));
+                    TableResult result = client.executeQuery(session, sql);
                     numberOfRows = result.iterateAll().iterator().next().get(0).getLongValue();
                 }
                 else {
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryStorageAvroPageSource.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryStorageAvroPageSource.java
index c6d1e47b100c..f4bede11819d 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryStorageAvroPageSource.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryStorageAvroPageSource.java
@@ -21,8 +21,9 @@
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.DecimalType;
@@ -30,8 +31,8 @@
 import io.trino.spi.type.Int128;
 import io.trino.spi.type.LongTimestampWithTimeZone;
 import io.trino.spi.type.RowType;
+import io.trino.spi.type.RowType.Field;
 import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeSignatureParameter;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
 import org.apache.avro.Conversions.DecimalConversion;
@@ -46,7 +47,6 @@
 import java.io.UncheckedIOException;
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
@@ -204,8 +204,11 @@ else if (javaType == LongTimestampWithTimeZone.class) {
                 int picosOfMillis = toIntExact(floorMod(epochMicros, MICROSECONDS_PER_MILLISECOND)) * PICOSECONDS_PER_MICROSECOND;
                 type.writeObject(output, fromEpochMillisAndFraction(floorDiv(epochMicros, MICROSECONDS_PER_MILLISECOND), picosOfMillis, UTC_KEY));
             }
-            else if (javaType == Block.class) {
-                writeBlock(output, type, value);
+            else if (type instanceof ArrayType arrayType) {
+                writeArray((ArrayBlockBuilder) output, (List<?>) value, arrayType);
+            }
+            else if (type instanceof RowType rowType) {
+                writeRow((RowBlockBuilder) output, rowType, (GenericRecord) value);
             }
             else {
                 throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Unhandled type for %s: %s", javaType.getSimpleName(), type));
@@ -224,7 +227,7 @@ private static void writeSlice(BlockBuilder output, Type type, Object value)
         }
         else if (type instanceof VarbinaryType) {
             if (value instanceof ByteBuffer) {
-                type.writeSlice(output, Slices.wrappedBuffer((ByteBuffer) value));
+                type.writeSlice(output, Slices.wrappedHeapBuffer((ByteBuffer) value));
             }
             else {
                 output.appendNull();
@@ -247,34 +250,25 @@ private static void writeObject(BlockBuilder output, Type type, Object value)
         }
     }
 
-    private void writeBlock(BlockBuilder output, Type type, Object value)
+    private void writeArray(ArrayBlockBuilder output, List<?> value, ArrayType arrayType)
     {
-        if (type instanceof ArrayType && value instanceof List<?>) {
-            BlockBuilder builder = output.beginBlockEntry();
-
-            for (Object element : (List<?>) value) {
-                appendTo(type.getTypeParameters().get(0), element, builder);
+        Type elementType = arrayType.getElementType();
+        output.buildEntry(elementBuilder -> {
+            for (Object element : value) {
+                appendTo(elementType, element, elementBuilder);
             }
+        });
+    }
 
-            output.closeEntry();
-            return;
-        }
-        if (type instanceof RowType && value instanceof GenericRecord record) {
-            BlockBuilder builder = output.beginBlockEntry();
-
-            List<String> fieldNames = new ArrayList<>();
-            for (int i = 0; i < type.getTypeSignature().getParameters().size(); i++) {
-                TypeSignatureParameter parameter = type.getTypeSignature().getParameters().get(i);
-                fieldNames.add(parameter.getNamedTypeSignature().getName().orElse("field" + i));
-            }
-            checkState(fieldNames.size() == type.getTypeParameters().size(), "fieldName doesn't match with type size : %s", type);
-            for (int index = 0; index < type.getTypeParameters().size(); index++) {
-                appendTo(type.getTypeParameters().get(index), record.get(fieldNames.get(index)), builder);
+    private void writeRow(RowBlockBuilder output, RowType rowType, GenericRecord record)
+    {
+        List<Field> fields = rowType.getFields();
+        output.buildEntry(fieldBuilders -> {
+            for (int index = 0; index < fields.size(); index++) {
+                Field field = fields.get(index);
+                appendTo(field.getType(), record.get(field.getName().orElse("field" + index)), fieldBuilders.get(index));
             }
-            output.closeEntry();
-            return;
-        }
-        throw new TrinoException(GENERIC_INTERNAL_ERROR, "Unhandled type for Block: " + type.getTypeSignature());
+        });
     }
 
     @Override
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryTransactionManager.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryTransactionManager.java
index 7ce892363834..becfd9c5d277 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryTransactionManager.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryTransactionManager.java
@@ -13,12 +13,11 @@
  */
 package io.trino.plugin.bigquery;
 
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryType.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryType.java
index 3f831329201f..ab4f26b021b4 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryType.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryType.java
@@ -39,8 +39,7 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -94,7 +93,7 @@ private BigQueryType() {}
             1, // 9 digits after the dot
     };
     private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("''HH:mm:ss.SSSSSS''");
-    private static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("''yyyy-MM-dd HH:mm:ss.SSSSSS''");
+    private static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SSSSSS").withZone(UTC);
 
     private static RowType.Field toRawTypeField(String name, Field field)
     {
@@ -158,7 +157,6 @@ public static String timeToStringConverter(Object value)
         return TIME_FORMATTER.format(toZonedDateTime(epochSeconds, nanoAdjustment, UTC));
     }
 
-    @VisibleForTesting
     public static String timestampToStringConverter(Object value)
     {
         LongTimestampWithTimeZone timestamp = (LongTimestampWithTimeZone) value;
@@ -289,7 +287,7 @@ public static Optional<String> convertToString(Type type, StandardSQLTypeName bi
             case DATE:
                 return Optional.of(dateToStringConverter(value));
             case DATETIME:
-                return Optional.of(datetimeToStringConverter(value));
+                return Optional.of(datetimeToStringConverter(value)).map("'%s'"::formatted);
             case FLOAT64:
                 return Optional.of(floatToStringConverter(value));
             case INT64:
@@ -312,7 +310,7 @@ public static Optional<String> convertToString(Type type, StandardSQLTypeName bi
             case TIME:
                 return Optional.of(timeToStringConverter(value));
             case TIMESTAMP:
-                return Optional.of(timestampToStringConverter(value));
+                return Optional.of(timestampToStringConverter(value)).map("'%s'"::formatted);
             default:
                 throw new IllegalArgumentException("Unsupported type: " + bigqueryType);
         }
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryTypeUtils.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryTypeUtils.java
index 314a65ffc7b5..3bdcb3f30627 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryTypeUtils.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryTypeUtils.java
@@ -14,17 +14,16 @@
 package io.trino.plugin.bigquery;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.primitives.Shorts;
-import com.google.common.primitives.SignedBytes;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.LongTimestampWithTimeZone;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -33,6 +32,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static io.trino.plugin.bigquery.BigQueryType.timestampToStringConverter;
 import static io.trino.plugin.bigquery.BigQueryType.toZonedDateTime;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
@@ -44,13 +44,13 @@
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
+import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MICROS;
 import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_SECOND;
 import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MICROSECOND;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static java.lang.Math.floorDiv;
 import static java.lang.Math.floorMod;
-import static java.lang.Math.toIntExact;
 import static java.time.ZoneOffset.UTC;
 import static java.util.Collections.unmodifiableMap;
 
@@ -68,46 +68,50 @@ public static Object readNativeValue(Type type, Block block, int position)
             return null;
         }
 
-        // TODO https://github.com/trinodb/trino/issues/13741 Add support for time, timestamp with time zone, geography, map type
+        // TODO https://github.com/trinodb/trino/issues/13741 Add support for time, geography, map type
         if (type.equals(BOOLEAN)) {
-            return type.getBoolean(block, position);
+            return BOOLEAN.getBoolean(block, position);
         }
         if (type.equals(TINYINT)) {
-            return SignedBytes.checkedCast(type.getLong(block, position));
+            return TINYINT.getByte(block, position);
         }
         if (type.equals(SMALLINT)) {
-            return Shorts.checkedCast(type.getLong(block, position));
+            return SMALLINT.getShort(block, position);
         }
         if (type.equals(INTEGER)) {
-            return toIntExact(type.getLong(block, position));
+            return INTEGER.getInt(block, position);
         }
         if (type.equals(BIGINT)) {
-            return type.getLong(block, position);
+            return BIGINT.getLong(block, position);
         }
         if (type.equals(DOUBLE)) {
-            return type.getDouble(block, position);
+            return DOUBLE.getDouble(block, position);
         }
         if (type instanceof DecimalType) {
             return readBigDecimal((DecimalType) type, block, position).toString();
         }
-        if (type instanceof VarcharType) {
-            return type.getSlice(block, position).toStringUtf8();
+        if (type instanceof VarcharType varcharType) {
+            return varcharType.getSlice(block, position).toStringUtf8();
         }
         if (type.equals(VARBINARY)) {
-            return Base64.getEncoder().encodeToString(type.getSlice(block, position).getBytes());
+            return Base64.getEncoder().encodeToString(VARBINARY.getSlice(block, position).getBytes());
         }
         if (type.equals(DATE)) {
-            long days = type.getLong(block, position);
+            int days = DATE.getInt(block, position);
             return DATE_FORMATTER.format(LocalDate.ofEpochDay(days));
         }
         if (type.equals(TIMESTAMP_MICROS)) {
-            long epochMicros = type.getLong(block, position);
+            long epochMicros = TIMESTAMP_MICROS.getLong(block, position);
             long epochSeconds = floorDiv(epochMicros, MICROSECONDS_PER_SECOND);
             int nanoAdjustment = floorMod(epochMicros, MICROSECONDS_PER_SECOND) * NANOSECONDS_PER_MICROSECOND;
             return DATETIME_FORMATTER.format(toZonedDateTime(epochSeconds, nanoAdjustment, UTC));
         }
+        if (type.equals(TIMESTAMP_TZ_MICROS)) {
+            LongTimestampWithTimeZone timestamp = (LongTimestampWithTimeZone) TIMESTAMP_TZ_MICROS.getObject(block, position);
+            return timestampToStringConverter(timestamp);
+        }
         if (type instanceof ArrayType arrayType) {
-            Block arrayBlock = block.getObject(position, Block.class);
+            Block arrayBlock = arrayType.getObject(block, position);
             ImmutableList.Builder<Object> list = ImmutableList.builderWithExpectedSize(arrayBlock.getPositionCount());
             for (int i = 0; i < arrayBlock.getPositionCount(); i++) {
                 Object element = readNativeValue(arrayType.getElementType(), arrayBlock, i);
@@ -119,17 +123,18 @@ public static Object readNativeValue(Type type, Block block, int position)
             return list.build();
         }
         if (type instanceof RowType rowType) {
-            Block rowBlock = block.getObject(position, Block.class);
+            SqlRow sqlRow = rowType.getObject(block, position);
 
-            List<Type> fieldTypes = type.getTypeParameters();
-            if (fieldTypes.size() != rowBlock.getPositionCount()) {
+            List<Type> fieldTypes = rowType.getTypeParameters();
+            if (fieldTypes.size() != sqlRow.getFieldCount()) {
                 throw new TrinoException(GENERIC_INTERNAL_ERROR, "Expected row value field count does not match type field count");
             }
 
+            int rawIndex = sqlRow.getRawIndex();
             Map<String, Object> rowValue = new HashMap<>();
-            for (int i = 0; i < rowBlock.getPositionCount(); i++) {
-                String fieldName = rowType.getFields().get(i).getName().orElseThrow(() -> new IllegalArgumentException("Field name must exist in BigQuery"));
-                Object fieldValue = readNativeValue(fieldTypes.get(i), rowBlock, i);
+            for (int fieldIndex = 0; fieldIndex < sqlRow.getFieldCount(); fieldIndex++) {
+                String fieldName = rowType.getFields().get(fieldIndex).getName().orElseThrow(() -> new IllegalArgumentException("Field name must exist in BigQuery"));
+                Object fieldValue = readNativeValue(fieldTypes.get(fieldIndex), sqlRow.getRawFieldBlock(fieldIndex), rawIndex);
                 rowValue.put(fieldName, fieldValue);
             }
             return unmodifiableMap(rowValue);
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/CredentialsOptionsConfigurer.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/CredentialsOptionsConfigurer.java
new file mode 100644
index 000000000000..f44eab1a8ff1
--- /dev/null
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/CredentialsOptionsConfigurer.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.api.gax.core.FixedCredentialsProvider;
+import com.google.auth.Credentials;
+import com.google.auth.oauth2.ServiceAccountCredentials;
+import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.cloud.bigquery.storage.v1.BigQueryReadSettings;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.inject.Inject;
+import io.trino.spi.connector.ConnectorSession;
+
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public class CredentialsOptionsConfigurer
+        implements BigQueryOptionsConfigurer
+{
+    private final BigQueryCredentialsSupplier credentialsSupplier;
+    private final Optional<String> parentProjectId;
+
+    @Inject
+    public CredentialsOptionsConfigurer(BigQueryConfig bigQueryConfig, BigQueryCredentialsSupplier credentialsSupplier)
+    {
+        this.parentProjectId = requireNonNull(bigQueryConfig, "bigQueryConfig is null").getParentProjectId();
+        this.credentialsSupplier = requireNonNull(credentialsSupplier, "credentialsSupplier is null");
+    }
+
+    @Override
+    public BigQueryOptions.Builder configure(BigQueryOptions.Builder builder, ConnectorSession session)
+    {
+        Optional<Credentials> credentials = credentialsSupplier.getCredentials(session);
+        String billingProjectId = calculateBillingProjectId(parentProjectId, credentials);
+        credentials.ifPresent(builder::setCredentials);
+        builder.setProjectId(billingProjectId);
+        return builder;
+    }
+
+    @Override
+    public BigQueryReadSettings.Builder configure(BigQueryReadSettings.Builder builder, ConnectorSession session)
+    {
+        Optional<Credentials> credentials = credentialsSupplier.getCredentials(session);
+        credentials.ifPresent(value ->
+                builder.setCredentialsProvider(FixedCredentialsProvider.create(value)));
+        return builder;
+    }
+
+    // Note that at this point the config has been validated, which means that option 2 or option 3 will always be valid
+    @VisibleForTesting
+    static String calculateBillingProjectId(Optional<String> configParentProjectId, Optional<Credentials> credentials)
+    {
+        // 1. Get from configuration
+        return configParentProjectId
+                // 2. Get from the provided credentials, but only ServiceAccountCredentials contains the project id.
+                // All other credentials types (User, AppEngine, GCE, CloudShell, etc.) take it from the environment
+                .orElseGet(() -> credentials
+                        .filter(ServiceAccountCredentials.class::isInstance)
+                        .map(ServiceAccountCredentials.class::cast)
+                        .map(ServiceAccountCredentials::getProjectId)
+                        // 3. No configuration was provided, so get the default from the environment
+                        .orElseGet(BigQueryOptions::getDefaultProjectId));
+    }
+}
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/DefaultBigQueryCredentialsProvider.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/DefaultBigQueryCredentialsProvider.java
new file mode 100644
index 000000000000..f7443ad10319
--- /dev/null
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/DefaultBigQueryCredentialsProvider.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.auth.Credentials;
+import com.google.auth.oauth2.GoogleCredentials;
+import com.google.inject.Inject;
+import io.trino.spi.connector.ConnectorSession;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public class DefaultBigQueryCredentialsProvider
+        implements BigQueryCredentialsSupplier
+{
+    private final Optional<ProxyTransportFactory> transportFactory;
+
+    @Inject
+    public DefaultBigQueryCredentialsProvider(Optional<ProxyTransportFactory> transportFactory)
+    {
+        this.transportFactory = requireNonNull(transportFactory, "transportFactory is null");
+    }
+
+    @Override
+    public Optional<Credentials> getCredentials(ConnectorSession session)
+    {
+        return transportFactory.map(factory -> {
+            try {
+                return GoogleCredentials.getApplicationDefault(factory.getTransportOptions().getHttpTransportFactory());
+            }
+            catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        });
+    }
+}
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/DefaultBigQueryMetadataFactory.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/DefaultBigQueryMetadataFactory.java
index 42639033f165..ef45d7b5d64e 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/DefaultBigQueryMetadataFactory.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/DefaultBigQueryMetadataFactory.java
@@ -13,24 +13,28 @@
  */
 package io.trino.plugin.bigquery;
 
-import javax.inject.Inject;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.inject.Inject;
 
+import static io.trino.plugin.bigquery.BigQueryConnectorModule.ForBigQuery;
 import static java.util.Objects.requireNonNull;
 
 public class DefaultBigQueryMetadataFactory
         implements BigQueryMetadataFactory
 {
     private final BigQueryClientFactory bigQueryClient;
+    private final ListeningExecutorService executorService;
 
     @Inject
-    public DefaultBigQueryMetadataFactory(BigQueryClientFactory bigQueryClient)
+    public DefaultBigQueryMetadataFactory(BigQueryClientFactory bigQueryClient, @ForBigQuery ListeningExecutorService executorService)
     {
         this.bigQueryClient = requireNonNull(bigQueryClient, "bigQueryClient is null");
+        this.executorService = requireNonNull(executorService, "executorService is null");
     }
 
     @Override
     public BigQueryMetadata create(BigQueryTransactionHandle transaction)
     {
-        return new BigQueryMetadata(bigQueryClient);
+        return new BigQueryMetadata(bigQueryClient, executorService);
     }
 }
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/GrpcChannelOptionsConfigurer.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/GrpcChannelOptionsConfigurer.java
new file mode 100644
index 000000000000..5892f30d01be
--- /dev/null
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/GrpcChannelOptionsConfigurer.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.api.gax.grpc.ChannelPoolSettings;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.inject.Inject;
+import io.trino.spi.connector.ConnectorSession;
+
+public class GrpcChannelOptionsConfigurer
+        implements BigQueryGrpcOptionsConfigurer
+{
+    private final ChannelPoolSettings channelPoolSettings;
+
+    @Inject
+    public GrpcChannelOptionsConfigurer(BigQueryRpcConfig rpcConfig)
+    {
+        this.channelPoolSettings = ChannelPoolSettings.builder()
+                .setInitialChannelCount(rpcConfig.getRpcInitialChannelCount())
+                .setMinChannelCount(rpcConfig.getRpcMinChannelCount())
+                .setMaxChannelCount(rpcConfig.getRpcMaxChannelCount())
+                .setMinRpcsPerChannel(rpcConfig.getMinRpcPerChannel())
+                .setMaxRpcsPerChannel(rpcConfig.getMaxRpcPerChannel())
+                .build();
+    }
+
+    @Override
+    public BigQueryOptions.Builder configure(BigQueryOptions.Builder builder, ConnectorSession session)
+    {
+        return builder;
+    }
+
+    @Override
+    public InstantiatingGrpcChannelProvider.Builder configure(InstantiatingGrpcChannelProvider.Builder channelBuilder, ConnectorSession session)
+    {
+        return channelBuilder.setChannelPoolSettings(channelPoolSettings);
+    }
+}
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/HeaderOptionsConfigurer.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/HeaderOptionsConfigurer.java
new file mode 100644
index 000000000000..7b344fe583d8
--- /dev/null
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/HeaderOptionsConfigurer.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.rpc.HeaderProvider;
+import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.inject.Inject;
+import io.trino.spi.connector.ConnectorSession;
+
+import static java.util.Objects.requireNonNull;
+
+public class HeaderOptionsConfigurer
+        implements BigQueryGrpcOptionsConfigurer
+{
+    private final HeaderProvider headerProvider;
+
+    @Inject
+    public HeaderOptionsConfigurer(HeaderProvider headerProvider)
+    {
+        this.headerProvider = requireNonNull(headerProvider, "headerProvider is null");
+    }
+
+    @Override
+    public BigQueryOptions.Builder configure(BigQueryOptions.Builder builder, ConnectorSession session)
+    {
+        return builder.setHeaderProvider(headerProvider);
+    }
+
+    @Override
+    public InstantiatingGrpcChannelProvider.Builder configure(InstantiatingGrpcChannelProvider.Builder channelBuilder, ConnectorSession session)
+    {
+        return channelBuilder.setHeaderProvider(headerProvider);
+    }
+}
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ProxyOptionsConfigurer.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ProxyOptionsConfigurer.java
new file mode 100644
index 000000000000..2cbf4d4f3f21
--- /dev/null
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ProxyOptionsConfigurer.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.inject.Inject;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.netty.handler.ssl.ApplicationProtocolConfig;
+import io.grpc.netty.shaded.io.netty.handler.ssl.IdentityCipherSuiteFilter;
+import io.grpc.netty.shaded.io.netty.handler.ssl.JdkSslContext;
+import io.trino.spi.connector.ConnectorSession;
+
+import static com.google.common.base.Preconditions.checkState;
+import static io.grpc.netty.shaded.io.netty.handler.ssl.ClientAuth.OPTIONAL;
+import static java.util.Objects.requireNonNull;
+
+public class ProxyOptionsConfigurer
+        implements BigQueryGrpcOptionsConfigurer
+{
+    private final ProxyTransportFactory proxyTransportFactory;
+
+    @Inject
+    public ProxyOptionsConfigurer(ProxyTransportFactory proxyTransportFactory)
+    {
+        this.proxyTransportFactory = requireNonNull(proxyTransportFactory, "proxyTransportFactory is null");
+    }
+
+    @Override
+    public BigQueryOptions.Builder configure(BigQueryOptions.Builder builder, ConnectorSession session)
+    {
+        return builder.setTransportOptions(proxyTransportFactory.getTransportOptions());
+    }
+
+    @Override
+    public InstantiatingGrpcChannelProvider.Builder configure(InstantiatingGrpcChannelProvider.Builder channelBuilder, ConnectorSession session)
+    {
+        return channelBuilder.setChannelConfigurator(this::configureChannel);
+    }
+
+    private ManagedChannelBuilder configureChannel(ManagedChannelBuilder managedChannelBuilder)
+    {
+        checkState(managedChannelBuilder instanceof NettyChannelBuilder, "Expected ManagedChannelBuilder to be provider by Netty");
+        NettyChannelBuilder nettyChannelBuilder = (NettyChannelBuilder) managedChannelBuilder;
+        proxyTransportFactory.getSslContext().ifPresent(context -> {
+            JdkSslContext jdkSslContext = new JdkSslContext(context, true, null, IdentityCipherSuiteFilter.INSTANCE, new ApplicationProtocolConfig(
+                    ApplicationProtocolConfig.Protocol.ALPN,
+                    ApplicationProtocolConfig.SelectorFailureBehavior.CHOOSE_MY_LAST_PROTOCOL,
+                    ApplicationProtocolConfig.SelectedListenerFailureBehavior.ACCEPT,
+                    "h2"), OPTIONAL);
+            nettyChannelBuilder
+                    .sslContext(jdkSslContext)
+                    .useTransportSecurity();
+        });
+
+        return managedChannelBuilder.proxyDetector(proxyTransportFactory::createProxyDetector);
+    }
+}
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ProxyTransportFactory.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ProxyTransportFactory.java
new file mode 100644
index 000000000000..2127d4beedab
--- /dev/null
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ProxyTransportFactory.java
@@ -0,0 +1,150 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.api.client.http.apache.v2.ApacheHttpTransport;
+import com.google.cloud.http.HttpTransportOptions;
+import com.google.inject.Inject;
+import io.grpc.HttpConnectProxiedSocketAddress;
+import io.grpc.ProxiedSocketAddress;
+import io.trino.spi.TrinoException;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.HttpClient;
+import org.apache.http.conn.routing.HttpRoutePlanner;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.ProxyAuthenticationStrategy;
+import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
+
+import javax.net.ssl.SSLContext;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.security.GeneralSecurityException;
+import java.util.Optional;
+
+import static io.trino.plugin.base.ssl.SslUtils.createSSLContext;
+import static io.trino.plugin.bigquery.BigQueryErrorCode.BIGQUERY_PROXY_SSL_INITIALIZATION_FAILED;
+import static java.util.Objects.requireNonNull;
+
+public interface ProxyTransportFactory
+{
+    HttpTransportOptions getTransportOptions();
+
+    Optional<SSLContext> getSslContext();
+
+    ProxiedSocketAddress createProxyDetector(SocketAddress socketAddress);
+
+    class DefaultProxyTransportFactory
+            implements ProxyTransportFactory
+    {
+        private final HttpTransportOptions transportOptions;
+        private final Optional<SSLContext> sslContext;
+        private final URI proxyUri;
+        private final Optional<String> proxyUsername;
+        private final Optional<String> proxyPassword;
+
+        @Inject
+        public DefaultProxyTransportFactory(BigQueryProxyConfig proxyConfig)
+        {
+            requireNonNull(proxyConfig, "proxyConfig is null");
+            this.proxyUri = proxyConfig.getUri();
+            this.proxyUsername = proxyConfig.getUsername();
+            this.proxyPassword = proxyConfig.getPassword();
+
+            this.sslContext = buildSslContext(proxyConfig.getKeystorePath(), proxyConfig.getKeystorePassword(), proxyConfig.getTruststorePath(), proxyConfig.getTruststorePassword());
+            this.transportOptions = buildTransportOptions(sslContext, proxyUri, proxyUsername, proxyPassword);
+        }
+
+        @Override
+        public HttpTransportOptions getTransportOptions()
+        {
+            return transportOptions;
+        }
+
+        @Override
+        public Optional<SSLContext> getSslContext()
+        {
+            return sslContext;
+        }
+
+        @Override
+        public ProxiedSocketAddress createProxyDetector(SocketAddress socketAddress)
+        {
+            HttpConnectProxiedSocketAddress.Builder builder = HttpConnectProxiedSocketAddress.newBuilder()
+                    .setProxyAddress(new InetSocketAddress(proxyUri.getHost(), proxyUri.getPort()))
+                    .setTargetAddress((InetSocketAddress) socketAddress);
+
+            proxyUsername.ifPresent(builder::setUsername);
+            proxyPassword.ifPresent(builder::setPassword);
+
+            return builder.build();
+        }
+
+        private static HttpTransportOptions buildTransportOptions(Optional<SSLContext> sslContext, URI proxyUri, Optional<String> proxyUser, Optional<String> proxyPassword)
+        {
+            HttpHost proxyHost = new HttpHost(proxyUri.getHost(), proxyUri.getPort());
+            HttpRoutePlanner httpRoutePlanner = new DefaultProxyRoutePlanner(proxyHost);
+
+            HttpClientBuilder httpClientBuilder = ApacheHttpTransport.newDefaultHttpClientBuilder()
+                    .setRoutePlanner(httpRoutePlanner);
+
+            if (sslContext.isPresent()) {
+                SSLConnectionSocketFactory sslSocketFactory = new SSLConnectionSocketFactory(sslContext.get());
+                httpClientBuilder.setSSLSocketFactory(sslSocketFactory);
+            }
+
+            if (proxyUser.isPresent()) {
+                CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+                credentialsProvider.setCredentials(
+                        new AuthScope(proxyHost.getHostName(), proxyHost.getPort()),
+                        new UsernamePasswordCredentials(proxyUser.get(), proxyPassword.orElse("")));
+
+                httpClientBuilder
+                        .setProxyAuthenticationStrategy(ProxyAuthenticationStrategy.INSTANCE)
+                        .setDefaultCredentialsProvider(credentialsProvider);
+            }
+
+            HttpClient client = httpClientBuilder.build(); // TODO: close http client on catalog deregistration
+            return HttpTransportOptions.newBuilder()
+                    .setHttpTransportFactory(() -> new ApacheHttpTransport(client))
+                    .build();
+        }
+
+        private static Optional<SSLContext> buildSslContext(
+                Optional<File> keyStorePath,
+                Optional<String> keyStorePassword,
+                Optional<File> trustStorePath,
+                Optional<String> trustStorePassword)
+        {
+            if (keyStorePath.isEmpty() && trustStorePath.isEmpty()) {
+                return Optional.empty();
+            }
+
+            try {
+                return Optional.of(createSSLContext(keyStorePath, keyStorePassword, trustStorePath, trustStorePassword));
+            }
+            catch (GeneralSecurityException | IOException e) {
+                throw new TrinoException(BIGQUERY_PROXY_SSL_INITIALIZATION_FAILED, e);
+            }
+        }
+    }
+}
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/RetryOptionsConfigurer.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/RetryOptionsConfigurer.java
new file mode 100644
index 000000000000..56f25cf87349
--- /dev/null
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/RetryOptionsConfigurer.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.api.gax.retrying.RetrySettings;
+import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.cloud.bigquery.storage.v1.BigQueryReadSettings;
+import com.google.inject.Inject;
+import io.airlift.units.Duration;
+import io.trino.spi.connector.ConnectorSession;
+
+import static java.lang.Math.pow;
+import static java.util.Objects.requireNonNull;
+import static org.threeten.bp.temporal.ChronoUnit.MILLIS;
+
+public class RetryOptionsConfigurer
+        implements BigQueryOptionsConfigurer
+{
+    private final int retries;
+    private final Duration timeout;
+    private final Duration retryDelay;
+    private final double retryMultiplier;
+
+    @Inject
+    public RetryOptionsConfigurer(BigQueryRpcConfig rpcConfig)
+    {
+        requireNonNull(rpcConfig, "rpcConfig is null");
+        this.retries = rpcConfig.getRetries();
+        this.timeout = rpcConfig.getTimeout();
+        this.retryDelay = rpcConfig.getRetryDelay();
+        this.retryMultiplier = rpcConfig.getRetryMultiplier();
+    }
+
+    @Override
+    public BigQueryOptions.Builder configure(BigQueryOptions.Builder builder, ConnectorSession session)
+    {
+        return builder.setRetrySettings(retrySettings());
+    }
+
+    @Override
+    public BigQueryReadSettings.Builder configure(BigQueryReadSettings.Builder builder, ConnectorSession session)
+    {
+        try {
+            return builder.applyToAllUnaryMethods(methodBuilder -> {
+                methodBuilder.setRetrySettings(retrySettings());
+                return null;
+            });
+        }
+        catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private RetrySettings retrySettings()
+    {
+        long maxDelay = retryDelay.toMillis() * (long) pow(retryMultiplier, retries);
+
+        return RetrySettings.newBuilder()
+                .setMaxAttempts(retries)
+                .setTotalTimeout(org.threeten.bp.Duration.of(timeout.toMillis(), MILLIS))
+                .setInitialRetryDelay(org.threeten.bp.Duration.of(retryDelay.toMillis(), MILLIS))
+                .setRetryDelayMultiplier(retryMultiplier)
+                .setMaxRetryDelay(org.threeten.bp.Duration.of(maxDelay, MILLIS))
+                .build();
+    }
+}
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/StaticBigQueryCredentialsSupplier.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/StaticBigQueryCredentialsSupplier.java
index f11f98bd8caa..c59fdf9395fc 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/StaticBigQueryCredentialsSupplier.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/StaticBigQueryCredentialsSupplier.java
@@ -13,19 +13,22 @@
  */
 package io.trino.plugin.bigquery;
 
-import com.google.api.client.util.Base64;
 import com.google.auth.Credentials;
+import com.google.auth.http.HttpTransportFactory;
 import com.google.auth.oauth2.GoogleCredentials;
+import com.google.cloud.http.HttpTransportOptions;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.util.Base64;
 import java.util.Optional;
 
 public class StaticBigQueryCredentialsSupplier
@@ -34,14 +37,17 @@ public class StaticBigQueryCredentialsSupplier
     private final Supplier<Optional<Credentials>> credentialsCreator;
 
     @Inject
-    public StaticBigQueryCredentialsSupplier(StaticCredentialsConfig config)
+    public StaticBigQueryCredentialsSupplier(StaticCredentialsConfig config, Optional<ProxyTransportFactory> proxyTransportFactory)
     {
+        Optional<HttpTransportFactory> httpTransportFactory = proxyTransportFactory
+                .map(ProxyTransportFactory::getTransportOptions)
+                .map(HttpTransportOptions::getHttpTransportFactory);
         // lazy creation, cache once it's created
         Optional<Credentials> credentialsKey = config.getCredentialsKey()
-                .map(StaticBigQueryCredentialsSupplier::createCredentialsFromKey);
+                .map(key -> createCredentialsFromKey(httpTransportFactory, key));
 
         Optional<Credentials> credentialsFile = config.getCredentialsFile()
-                .map(StaticBigQueryCredentialsSupplier::createCredentialsFromFile);
+                .map(keyFile -> createCredentialsFromFile(httpTransportFactory, keyFile));
 
         this.credentialsCreator = Suppliers.memoize(() -> credentialsKey.or(() -> credentialsFile));
     }
@@ -52,23 +58,31 @@ public Optional<Credentials> getCredentials(ConnectorSession session)
         return credentialsCreator.get();
     }
 
-    private static Credentials createCredentialsFromKey(String key)
+    private static Credentials createCredentialsFromKey(Optional<HttpTransportFactory> httpTransportFactory, String key)
+    {
+        return createCredentialsFromStream(httpTransportFactory, new ByteArrayInputStream(Base64.getDecoder().decode(key)));
+    }
+
+    private static Credentials createCredentialsFromFile(Optional<HttpTransportFactory> httpTransportFactory, String file)
     {
         try {
-            return GoogleCredentials.fromStream(new ByteArrayInputStream(Base64.decodeBase64(key)));
+            return createCredentialsFromStream(httpTransportFactory, new FileInputStream(file));
         }
-        catch (IOException e) {
-            throw new UncheckedIOException("Failed to create Credentials from key", e);
+        catch (FileNotFoundException e) {
+            throw new UncheckedIOException("Failed to create Credentials from file", e);
         }
     }
 
-    private static Credentials createCredentialsFromFile(String file)
+    private static Credentials createCredentialsFromStream(Optional<HttpTransportFactory> httpTransportFactory, InputStream inputStream)
     {
         try {
-            return GoogleCredentials.fromStream(new FileInputStream(file));
+            if (httpTransportFactory.isPresent()) {
+                return GoogleCredentials.fromStream(inputStream, httpTransportFactory.get());
+            }
+            return GoogleCredentials.fromStream(inputStream);
         }
         catch (IOException e) {
-            throw new UncheckedIOException("Failed to create Credentials from file", e);
+            throw new UncheckedIOException("Failed to create Credentials from stream", e);
         }
     }
 }
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/StaticCredentialsConfig.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/StaticCredentialsConfig.java
index 1d3925cd168c..462e5b00b1ae 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/StaticCredentialsConfig.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/StaticCredentialsConfig.java
@@ -13,15 +13,12 @@
  */
 package io.trino.plugin.bigquery;
 
-import com.google.auth.oauth2.GoogleCredentials;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.configuration.validation.FileExists;
+import jakarta.validation.constraints.AssertTrue;
 
-import javax.validation.constraints.AssertTrue;
-
-import java.io.IOException;
 import java.util.Optional;
 
 public class StaticCredentialsConfig
@@ -29,23 +26,11 @@ public class StaticCredentialsConfig
     private Optional<String> credentialsKey = Optional.empty();
     private Optional<String> credentialsFile = Optional.empty();
 
-    @AssertTrue(message = "Exactly one of 'bigquery.credentials-key' or 'bigquery.credentials-file' must be specified, or the default GoogleCredentials could be created")
+    @AssertTrue(message = "Exactly one of 'bigquery.credentials-key' or 'bigquery.credentials-file' must be specified")
     public boolean isCredentialsConfigurationValid()
     {
         // only one of them (at most) should be present
-        if (credentialsKey.isPresent() && credentialsFile.isPresent()) {
-            return false;
-        }
-        // if no credentials were supplied, let's check if we can create the default ones
-        if (credentialsKey.isEmpty() && credentialsFile.isEmpty()) {
-            try {
-                GoogleCredentials.getApplicationDefault();
-            }
-            catch (IOException e) {
-                return false;
-            }
-        }
-        return true;
+        return credentialsKey.isEmpty() || credentialsFile.isEmpty();
     }
 
     public Optional<String> getCredentialsKey()
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ViewMaterializationCache.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ViewMaterializationCache.java
index be7d8bdc6f80..7fd20d731d58 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ViewMaterializationCache.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ViewMaterializationCache.java
@@ -22,19 +22,18 @@
 import com.google.cloud.bigquery.TableId;
 import com.google.cloud.bigquery.TableInfo;
 import com.google.common.cache.CacheBuilder;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.plugin.bigquery.BigQueryUtil.convertToBigQueryException;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ptf/Query.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ptf/Query.java
index bfd8ef34e5aa..fe2990f9ae43 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ptf/Query.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/ptf/Query.java
@@ -17,6 +17,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.cloud.bigquery.Schema;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.airlift.slice.Slice;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorTableFunction;
 import io.trino.plugin.bigquery.BigQueryClient;
@@ -24,21 +26,19 @@
 import io.trino.plugin.bigquery.BigQueryColumnHandle;
 import io.trino.plugin.bigquery.BigQueryQueryRelationHandle;
 import io.trino.plugin.bigquery.BigQueryTableHandle;
+import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.ptf.AbstractConnectorTableFunction;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-import io.trino.spi.ptf.Descriptor;
-import io.trino.spi.ptf.Descriptor.Field;
-import io.trino.spi.ptf.ScalarArgument;
-import io.trino.spi.ptf.ScalarArgumentSpecification;
-import io.trino.spi.ptf.TableFunctionAnalysis;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
+import io.trino.spi.function.table.AbstractConnectorTableFunction;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.Descriptor.Field;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.ScalarArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
 
 import java.util.List;
 import java.util.Map;
@@ -47,7 +47,7 @@
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.plugin.bigquery.Conversions.isSupportedType;
 import static io.trino.plugin.bigquery.Conversions.toColumnHandle;
-import static io.trino.spi.ptf.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
+import static io.trino.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
@@ -91,7 +91,11 @@ public QueryFunction(BigQueryClientFactory clientFactory)
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             ScalarArgument argument = (ScalarArgument) getOnlyElement(arguments.values());
             String query = ((Slice) argument.getValue()).toStringUtf8();
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryConnectorSmokeTest.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryConnectorSmokeTest.java
new file mode 100644
index 000000000000..d8e31af5d289
--- /dev/null
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryConnectorSmokeTest.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import io.trino.testing.BaseConnectorSmokeTest;
+import io.trino.testing.TestingConnectorBehavior;
+
+public abstract class BaseBigQueryConnectorSmokeTest
+        extends BaseConnectorSmokeTest
+{
+    @Override
+    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
+    {
+        return switch (connectorBehavior) {
+            case SUPPORTS_TRUNCATE -> true;
+            case SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
+}
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryConnectorTest.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryConnectorTest.java
index 5f0c789dc201..692239f4e65a 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryConnectorTest.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryConnectorTest.java
@@ -13,11 +13,12 @@
  */
 package io.trino.plugin.bigquery;
 
-import com.google.cloud.bigquery.TableDefinition;
 import io.airlift.units.Duration;
 import io.trino.Session;
+import io.trino.spi.QueryId;
 import io.trino.testing.BaseConnectorTest;
 import io.trino.testing.MaterializedResult;
+import io.trino.testing.MaterializedResultWithQueryId;
 import io.trino.testing.TestingConnectorBehavior;
 import io.trino.testing.sql.TestTable;
 import org.intellij.lang.annotations.Language;
@@ -27,21 +28,13 @@
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
-import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
-import static com.google.cloud.bigquery.TableDefinition.Type.EXTERNAL;
-import static com.google.cloud.bigquery.TableDefinition.Type.MATERIALIZED_VIEW;
-import static com.google.cloud.bigquery.TableDefinition.Type.SNAPSHOT;
-import static com.google.cloud.bigquery.TableDefinition.Type.TABLE;
-import static com.google.cloud.bigquery.TableDefinition.Type.VIEW;
 import static com.google.common.base.Strings.nullToEmpty;
-import static com.google.common.base.Verify.verify;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static io.trino.plugin.bigquery.BigQueryClient.TABLE_TYPES;
 import static io.trino.plugin.bigquery.BigQueryQueryRunner.BigQuerySqlExecutor;
 import static io.trino.plugin.bigquery.BigQueryQueryRunner.TEST_SCHEMA;
 import static io.trino.spi.type.VarcharType.VARCHAR;
@@ -49,7 +42,6 @@
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.assertions.Assert.assertEventually;
 import static java.lang.String.format;
-import static java.util.Locale.ENGLISH;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -71,41 +63,31 @@ public void initBigQueryExecutor(String gcpStorageBucket)
         this.gcpStorageBucket = gcpStorageBucket;
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN:
-            case SUPPORTS_RENAME_COLUMN:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return false;
-
-            case SUPPORTS_TRUNCATE:
-                return true;
-
-            case SUPPORTS_NEGATIVE_DATE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_TRUNCATE -> true;
+            case SUPPORTS_ADD_COLUMN,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_DEREFERENCE_PUSHDOWN,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_NEGATIVE_DATE,
+                    SUPPORTS_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_RENAME_COLUMN,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
-    @Test
     @Override
+    @org.junit.jupiter.api.Test
     public void testShowColumns()
     {
         assertThat(query("SHOW COLUMNS FROM orders")).matches(getDescribeOrdersResult());
@@ -207,12 +189,60 @@ public void testCreateTableIfNotExists()
         }
     }
 
-    @Test(dataProvider = "emptyProjectionSetupDataProvider")
-    public void testEmptyProjection(TableDefinition.Type tableType, String createSql, String dropSql)
+    @Test
+    public void testEmptyProjectionTable()
+    {
+        testEmptyProjection(
+                tableName -> onBigQuery("CREATE TABLE " + tableName + " AS SELECT * FROM tpch.region"),
+                tableName -> onBigQuery("DROP TABLE " + tableName));
+    }
+
+    @Test
+    public void testEmptyProjectionView()
+    {
+        testEmptyProjection(
+                viewName -> onBigQuery("CREATE VIEW " + viewName + " AS SELECT * FROM tpch.region"),
+                viewName -> onBigQuery("DROP VIEW " + viewName));
+    }
+
+    @Test
+    public void testEmptyProjectionMaterializedView()
+    {
+        testEmptyProjection(
+                materializedViewName -> onBigQuery("CREATE MATERIALIZED VIEW " + materializedViewName + " AS SELECT * FROM tpch.region"),
+                materializedViewName -> onBigQuery("DROP MATERIALIZED VIEW " + materializedViewName));
+    }
+
+    @Test
+    public void testEmptyProjectionExternalTable()
+    {
+        testEmptyProjection(
+                externalTableName -> onBigQuery("CREATE EXTERNAL TABLE " + externalTableName + " OPTIONS (format = 'CSV', uris = ['gs://" + gcpStorageBucket + "/tpch/tiny/region.csv'])"),
+                externalTableName -> onBigQuery("DROP EXTERNAL TABLE " + externalTableName));
+    }
+
+    @Test
+    public void testEmptyProjectionSnapshotTable()
+    {
+        // BigQuery has limits on how many snapshots/clones a single table can have and seems to miscount leading to failure when creating too many snapshots from single table
+        // For snapshot table test we use a different source table everytime
+        String regionCopy = TEST_SCHEMA + ".region_" + randomNameSuffix();
+        onBigQuery("CREATE TABLE " + regionCopy + " AS SELECT * FROM tpch.region");
+        try {
+            testEmptyProjection(
+                    snapshotTableName -> onBigQuery("CREATE SNAPSHOT TABLE " + snapshotTableName + " CLONE " + regionCopy),
+                    snapshotTableName -> onBigQuery("DROP SNAPSHOT TABLE " + snapshotTableName));
+        }
+        finally {
+            onBigQuery("DROP TABLE " + regionCopy);
+        }
+    }
+
+    private void testEmptyProjection(Consumer<String> createTable, Consumer<String> dropTable)
     {
         // Regression test for https://github.com/trinodb/trino/issues/14981, https://github.com/trinodb/trino/issues/5635 and https://github.com/trinodb/trino/issues/6696
-        String name = TEST_SCHEMA + ".test_empty_projection_" + tableType.name().toLowerCase(ENGLISH) + randomNameSuffix();
-        onBigQuery(createSql.formatted(name));
+        String name = TEST_SCHEMA + ".test_empty_projection_" + randomNameSuffix();
+        createTable.accept(name);
         try {
             assertQuery("SELECT count(*) FROM " + name, "VALUES 5");
             assertQuery("SELECT count(*) FROM " + name, "VALUES 5"); // repeated query to cover https://github.com/trinodb/trino/issues/6696
@@ -220,27 +250,10 @@ public void testEmptyProjection(TableDefinition.Type tableType, String createSql
             assertQuery("SELECT count(name) FROM " + name + " WHERE regionkey = 1", "VALUES 1");
         }
         finally {
-            onBigQuery(dropSql.formatted(name));
+            dropTable.accept(name);
         }
     }
 
-    @DataProvider
-    public Object[][] emptyProjectionSetupDataProvider()
-    {
-        Object[][] testCases = new Object[][] {
-                {TABLE, "CREATE TABLE %s AS SELECT * FROM tpch.region", "DROP TABLE %s"},
-                {VIEW, "CREATE VIEW %s AS SELECT * FROM tpch.region", "DROP VIEW %s"},
-                {MATERIALIZED_VIEW, "CREATE MATERIALIZED VIEW %s AS SELECT * FROM tpch.region", "DROP MATERIALIZED VIEW %s"},
-                {EXTERNAL, "CREATE EXTERNAL TABLE %s OPTIONS (format = 'CSV', uris = ['gs://" + gcpStorageBucket + "/tpch/tiny/region.csv'])", "DROP EXTERNAL TABLE %s"},
-                {SNAPSHOT, "CREATE SNAPSHOT TABLE %s CLONE tpch.region", "DROP SNAPSHOT TABLE %s"},
-        };
-        Set<TableDefinition.Type> testedTableTypes = Arrays.stream(testCases)
-                .map(array -> (TableDefinition.Type) array[0])
-                .collect(toImmutableSet());
-        verify(testedTableTypes.containsAll(TABLE_TYPES));
-        return testCases;
-    }
-
     @Override
     protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMappingTestSetup dataMappingTestSetup)
     {
@@ -253,7 +266,6 @@ protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMapp
             case "timestamp":
             case "timestamp(3)":
             case "timestamp(3) with time zone":
-            case "timestamp(6) with time zone":
                 return Optional.of(dataMappingTestSetup.asUnsupported());
         }
         return Optional.of(dataMappingTestSetup);
@@ -289,6 +301,32 @@ protected boolean isColumnNameRejected(Exception exception, String columnName, b
         return nullToEmpty(exception.getMessage()).matches(".*Invalid field name \"%s\". Fields must contain the allowed characters, and be at most 300 characters long..*".formatted(columnName.replace("\\", "\\\\")));
     }
 
+    @Override // Override because the base test exceeds rate limits per a table
+    public void testCommentColumn()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_comment_column_", "(a integer)")) {
+            // comment set
+            assertUpdate("COMMENT ON COLUMN " + table.getName() + ".a IS 'new comment'");
+            assertThat((String) computeScalar("SHOW CREATE TABLE " + table.getName())).contains("COMMENT 'new comment'");
+            assertThat(getColumnComment(table.getName(), "a")).isEqualTo("new comment");
+
+            // comment set to empty or deleted
+            assertUpdate("COMMENT ON COLUMN " + table.getName() + ".a IS NULL");
+            assertThat(getColumnComment(table.getName(), "a")).isEqualTo(null);
+        }
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_comment_column_", "(a integer COMMENT 'test comment')")) {
+            assertThat(getColumnComment(table.getName(), "a")).isEqualTo("test comment");
+            // comment set new value
+            assertUpdate("COMMENT ON COLUMN " + table.getName() + ".a IS 'updated comment'");
+            assertThat(getColumnComment(table.getName(), "a")).isEqualTo("updated comment");
+
+            // comment set empty
+            assertUpdate("COMMENT ON COLUMN " + table.getName() + ".a IS ''");
+            assertThat(getColumnComment(table.getName(), "a")).isEqualTo("");
+        }
+    }
+
     @Test
     public void testPartitionDateColumn()
     {
@@ -563,9 +601,13 @@ public void testBigQueryMaterializedView()
     @Test
     public void testBigQuerySnapshotTable()
     {
+        // BigQuery has limits on how many snapshots/clones a single table can have and seems to miscount leading to failure when creating too many snapshots from single table
+        // For snapshot table test we use a different source table everytime
+        String regionCopy = "region_" + randomNameSuffix();
         String snapshotTable = "test_snapshot" + randomNameSuffix();
         try {
-            onBigQuery("CREATE SNAPSHOT TABLE test." + snapshotTable + " CLONE tpch.region");
+            onBigQuery("CREATE TABLE test." + regionCopy + " AS SELECT * FROM tpch.region");
+            onBigQuery("CREATE SNAPSHOT TABLE test." + snapshotTable + " CLONE test." + regionCopy);
             assertQuery("SELECT table_type FROM information_schema.tables WHERE table_schema = 'test' AND table_name = '" + snapshotTable + "'", "VALUES 'BASE TABLE'");
 
             assertThat(query("DESCRIBE test." + snapshotTable)).matches("DESCRIBE tpch.region");
@@ -576,6 +618,7 @@ public void testBigQuerySnapshotTable()
         }
         finally {
             onBigQuery("DROP SNAPSHOT TABLE IF EXISTS test." + snapshotTable);
+            onBigQuery("DROP TABLE test." + regionCopy);
         }
     }
 
@@ -598,6 +641,50 @@ public void testBigQueryExternalTable()
         }
     }
 
+    @Test
+    public void testQueryLabeling()
+    {
+        Function<String, Session> sessionWithToken = token -> Session.builder(getSession())
+                .setTraceToken(Optional.of(token))
+                .build();
+
+        String materializedView = "test_query_label" + randomNameSuffix();
+        try {
+            onBigQuery("CREATE MATERIALIZED VIEW test." + materializedView + " AS SELECT count(1) AS cnt FROM tpch.region");
+
+            @Language("SQL")
+            String query = "SELECT * FROM test." + materializedView;
+
+            MaterializedResultWithQueryId result = getDistributedQueryRunner().executeWithQueryId(sessionWithToken.apply("first_token"), query);
+            assertLabelForTable(materializedView, result.getQueryId(), "first_token");
+
+            MaterializedResultWithQueryId result2 = getDistributedQueryRunner().executeWithQueryId(sessionWithToken.apply("second_token"), query);
+            assertLabelForTable(materializedView, result2.getQueryId(), "second_token");
+
+            assertThatThrownBy(() -> getDistributedQueryRunner().executeWithQueryId(sessionWithToken.apply("InvalidToken"), query))
+                    .hasMessageContaining("BigQuery label value can contain only lowercase letters, numeric characters, underscores, and dashes");
+        }
+        finally {
+            onBigQuery("DROP MATERIALIZED VIEW IF EXISTS test." + materializedView);
+        }
+    }
+
+    private void assertLabelForTable(String expectedView, QueryId queryId, String traceToken)
+    {
+        String expectedLabel = "q_" + queryId.toString() + "__t_" + traceToken;
+
+        @Language("SQL")
+        String checkForLabelQuery = """
+                    SELECT * FROM region-us.INFORMATION_SCHEMA.JOBS_BY_USER WHERE EXISTS(
+                        SELECT * FROM UNNEST(labels) AS label WHERE label.key = 'trino_query' AND label.value = '%s'
+                    )""".formatted(expectedLabel);
+
+        assertEventually(() -> assertThat(bigQuerySqlExecutor.executeQuery(checkForLabelQuery).getValues())
+                .extracting(values -> values.get("query").getStringValue())
+                .singleElement()
+                .matches(statement -> statement.contains(expectedView)));
+    }
+
     @Test
     public void testQueryCache()
     {
@@ -857,6 +944,13 @@ public void testInsertArray()
         }
     }
 
+    @Override
+    public void testInsertRowConcurrently()
+    {
+        // TODO https://github.com/trinodb/trino/issues/15158 Enable this test after switching to storage write API
+        throw new SkipException("Test fails with a timeout sometimes and is flaky");
+    }
+
     @Override
     protected String errorMessageForCreateTableAsSelectNegativeDate(String date)
     {
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryFailureRecoveryTest.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryFailureRecoveryTest.java
index 6f078afe32c2..c3cb503a014b 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryFailureRecoveryTest.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryFailureRecoveryTest.java
@@ -24,9 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-public class BaseBigQueryFailureRecoveryTest
+public abstract class BaseBigQueryFailureRecoveryTest
         extends BaseFailureRecoveryTest
 {
     public BaseBigQueryFailureRecoveryTest(RetryPolicy retryPolicy)
@@ -63,50 +61,49 @@ protected boolean areWriteRetriesSupported()
     @Override
     protected void testAnalyzeTable()
     {
-        assertThatThrownBy(super::testAnalyzeTable).hasMessageMatching("This connector does not support analyze");
+        // This connector does not support analyze
         throw new SkipException("skipped");
     }
 
     @Override
     protected void testDelete()
     {
-        assertThatThrownBy(super::testDeleteWithSubquery).hasMessageContaining("This connector does not support modifying table rows");
+        // This connector does not support modifying table rows
         throw new SkipException("skipped");
     }
 
     @Override
     protected void testDeleteWithSubquery()
     {
-        assertThatThrownBy(super::testDeleteWithSubquery).hasMessageContaining("This connector does not support modifying table rows");
+        // This connector does not support modifying table rows
         throw new SkipException("skipped");
     }
 
     @Override
     protected void testMerge()
     {
-        assertThatThrownBy(super::testMerge).hasMessageContaining("This connector does not support modifying table rows");
+        // This connector does not support modifying table rows
         throw new SkipException("skipped");
     }
 
     @Override
     protected void testRefreshMaterializedView()
     {
-        assertThatThrownBy(super::testRefreshMaterializedView)
-                .hasMessageContaining("This connector does not support creating materialized views");
+        // This connector does not support creating materialized views
         throw new SkipException("skipped");
     }
 
     @Override
     protected void testUpdate()
     {
-        assertThatThrownBy(super::testUpdate).hasMessageContaining("This connector does not support modifying table rows");
+        // This connector does not support modifying table rows
         throw new SkipException("skipped");
     }
 
     @Override
     protected void testUpdateWithSubquery()
     {
-        assertThatThrownBy(super::testUpdateWithSubquery).hasMessageContaining("This connector does not support modifying table rows");
+        // This connector does not support modifying table rows
         throw new SkipException("skipped");
     }
 }
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryTypeMapping.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryTypeMapping.java
index 039aa2097bb3..d2130132351d 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryTypeMapping.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryTypeMapping.java
@@ -18,7 +18,9 @@
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.RowType.Field;
+import io.trino.spi.type.TimeZoneKey;
 import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.TestingSession;
 import io.trino.testing.datatype.CreateAndInsertDataSetup;
 import io.trino.testing.datatype.CreateAndTrinoInsertDataSetup;
 import io.trino.testing.datatype.CreateAsSelectDataSetup;
@@ -27,10 +29,9 @@
 import io.trino.testing.sql.SqlExecutor;
 import io.trino.testing.sql.TestTable;
 import io.trino.testing.sql.TrinoSqlExecutor;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.time.ZoneId;
 import java.util.Optional;
 
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -45,6 +46,7 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
+import static java.time.ZoneOffset.UTC;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
@@ -53,13 +55,10 @@
 public abstract class BaseBigQueryTypeMapping
         extends AbstractTestQueryFramework
 {
-    private BigQueryQueryRunner.BigQuerySqlExecutor bigQuerySqlExecutor;
-
-    @BeforeClass(alwaysRun = true)
-    public void initBigQueryExecutor()
-    {
-        bigQuerySqlExecutor = new BigQueryQueryRunner.BigQuerySqlExecutor();
-    }
+    private final BigQueryQueryRunner.BigQuerySqlExecutor bigQuerySqlExecutor = new BigQueryQueryRunner.BigQuerySqlExecutor();
+    private final ZoneId jvmZone = ZoneId.systemDefault();
+    private final ZoneId vilnius = ZoneId.of("Europe/Vilnius");
+    private final ZoneId kathmandu = ZoneId.of("Asia/Kathmandu");
 
     @Test
     public void testBoolean()
@@ -103,8 +102,19 @@ public void testBytes()
                 .execute(getQueryRunner(), trinoCreateAndInsert("test.varbinary"));
     }
 
-    @Test(dataProvider = "bigqueryIntegerTypeProvider")
-    public void testInt64(String inputType)
+    @Test
+    public void testInt64()
+    {
+        testInt64("BYTEINT");
+        testInt64("TINYINT");
+        testInt64("SMALLINT");
+        testInt64("INTEGER");
+        testInt64("INT64");
+        testInt64("INT");
+        testInt64("BIGINT");
+    }
+
+    private void testInt64(String inputType)
     {
         SqlDataTypeTest.create()
                 .addRoundTrip(inputType, "-9223372036854775808", BIGINT, "-9223372036854775808")
@@ -115,21 +125,6 @@ public void testInt64(String inputType)
                 .execute(getQueryRunner(), bigqueryViewCreateAndInsert("test.integer"));
     }
 
-    @DataProvider
-    public Object[][] bigqueryIntegerTypeProvider()
-    {
-        // BYTEINT, TINYINT, SMALLINT, INTEGER, INT and BIGINT are aliases for INT64 in BigQuery
-        return new Object[][] {
-                {"BYTEINT"},
-                {"TINYINT"},
-                {"SMALLINT"},
-                {"INTEGER"},
-                {"INT64"},
-                {"INT"},
-                {"BIGINT"},
-        };
-    }
-
     @Test
     public void testTinyint()
     {
@@ -376,8 +371,14 @@ public void testUnsupportedBigNumericMappingView()
                 .hasMessageContaining("SELECT * not allowed from relation that has no columns");
     }
 
-    @Test(dataProvider = "bigqueryUnsupportedBigNumericTypeProvider")
-    public void testUnsupportedBigNumericMapping(String unsupportedTypeName)
+    @Test
+    public void testUnsupportedBigNumericMapping()
+    {
+        testUnsupportedBigNumericMapping("BIGNUMERIC");
+        testUnsupportedBigNumericMapping("BIGNUMERIC(40,2)");
+    }
+
+    private void testUnsupportedBigNumericMapping(String unsupportedTypeName)
     {
         try (TestTable table = new TestTable(getBigQuerySqlExecutor(), "test.unsupported_bignumeric", format("(supported_column INT64, unsupported_column %s)", unsupportedTypeName))) {
             assertQuery(
@@ -386,15 +387,6 @@ public void testUnsupportedBigNumericMapping(String unsupportedTypeName)
         }
     }
 
-    @DataProvider
-    public Object[][] bigqueryUnsupportedBigNumericTypeProvider()
-    {
-        return new Object[][] {
-                {"BIGNUMERIC"},
-                {"BIGNUMERIC(40,2)"},
-        };
-    }
-
     @Test
     public void testDate()
     {
@@ -529,41 +521,124 @@ public void testTime()
     @Test
     public void testTimestampWithTimeZone()
     {
-        SqlDataTypeTest.create()
+        testTimestampWithTimeZone(UTC);
+        testTimestampWithTimeZone(jvmZone);
+
+        // using two non-JVM zones so that we don't need to worry what BigQuery system zone is
+        testTimestampWithTimeZone(vilnius);
+        testTimestampWithTimeZone(kathmandu);
+        testTimestampWithTimeZone(TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId());
+    }
+
+    private void testTimestampWithTimeZone(ZoneId zoneId)
+    {
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(zoneId.getId()))
+                .build();
+
+        testTimestampWithTimeZone("TIMESTAMP(6) WITH TIME ZONE")
+                .execute(getQueryRunner(), trinoCreateAsSelect("test.timestamp_tz"))
+                .execute(getQueryRunner(), trinoCreateAsSelect(session, "test.timestamp_tz"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect("test.timestamp_tz"));
+
+        testTimestampWithTimeZone("TIMESTAMP")
+                .execute(getQueryRunner(), bigqueryCreateAndInsert("test.timestamp_tz"));
+    }
+
+    private SqlDataTypeTest testTimestampWithTimeZone(String inputType)
+    {
+        return SqlDataTypeTest.create()
                 // min value in BigQuery
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '0001-01-01 00:00:00.000000 UTC'",
+                .addRoundTrip(inputType, "TIMESTAMP '0001-01-01 00:00:00.000 UTC'",
                         TIMESTAMP_TZ_MICROS, "TIMESTAMP '0001-01-01 00:00:00.000000 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '1970-01-01 00:00:00.000000 UTC'",
-                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 00:00:00.000000 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '1970-01-01 00:00:00.000000 Asia/Kathmandu'",
-                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1969-12-31 18:30:00.000000 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '1970-01-01 00:00:00.000000+02:17'",
-                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1969-12-31 21:43:00.000000 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '1970-01-01 00:00:00.000000-07:31'",
-                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 07:31:00.000000 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '1958-01-01 13:18:03.123456 UTC'",
+                // before epoch
+                .addRoundTrip(inputType, "TIMESTAMP '1958-01-01 13:18:03.123 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1958-01-01 13:18:03.123000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1958-01-01 13:18:03.123456 UTC'",
                         TIMESTAMP_TZ_MICROS, "TIMESTAMP '1958-01-01 13:18:03.123456 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '1958-01-01 13:18:03.123000 Asia/Kathmandu'",
-                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1958-01-01 07:48:03.123000 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '1958-01-01 13:18:03.123000+02:17'",
-                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1958-01-01 11:01:03.123000 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '1958-01-01 13:18:03.123000-07:31'",
-                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1958-01-01 20:49:03.123000 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '2019-03-18 10:01:17.987654 UTC'",
+                .addRoundTrip(inputType, "TIMESTAMP '1958-01-01 13:18:03.123000 Asia/Kathmandu'",
+                         TIMESTAMP_TZ_MICROS, "TIMESTAMP '1958-01-01 07:48:03.123000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1969-12-31 23:59:59.999995 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1969-12-31 23:59:59.999995 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1969-12-31 23:59:59.999949 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1969-12-31 23:59:59.999949 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1969-12-31 23:59:59.999994 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1969-12-31 23:59:59.999994 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1970-01-01 00:00:00.000000 Asia/Kathmandu'",
+                         TIMESTAMP_TZ_MICROS, "TIMESTAMP '1969-12-31 18:30:00.000000 UTC'")
+                // epoch
+                .addRoundTrip(inputType, "TIMESTAMP '1970-01-01 00:00:00.000 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 00:00:00.000000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1970-01-01 00:00:00.000000 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 00:00:00.000000 UTC'")
+                // after epoch
+                .addRoundTrip(inputType, "TIMESTAMP '1970-01-01 00:00:01 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 00:00:01.000000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1970-01-01 00:00:01.1 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 00:00:01.100000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1970-01-01 00:00:01.12 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 00:00:01.120000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1970-01-01 00:00:01.123 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 00:00:01.123000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1970-01-01 00:00:01.1234 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 00:00:01.123400 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1970-01-01 00:00:01.12345 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 00:00:01.123450 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1970-01-01 00:00:01.123456 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 00:00:01.123456 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1970-01-01 00:13:42.000 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 00:13:42.000000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1970-01-01 00:13:42.123456 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1970-01-01 00:13:42.123456 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1986-01-01 00:13:07.000 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1986-01-01 00:13:07.000000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '1986-01-01 00:13:07.456789 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '1986-01-01 00:13:07.456789 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '2018-03-25 03:17:17.000 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '2018-03-25 03:17:17.000000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '2018-03-25 03:17:17.456789 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '2018-03-25 03:17:17.456789 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '2018-04-01 02:13:55.123 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '2018-04-01 02:13:55.123000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '2018-04-01 02:13:55.123456 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '2018-04-01 02:13:55.123456 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '2018-10-28 01:33:17.456 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '2018-10-28 01:33:17.456000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '2018-10-28 01:33:17.123456 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '2018-10-28 01:33:17.123456 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '2018-10-28 03:33:33.333 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '2018-10-28 03:33:33.333000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '2018-10-28 03:33:33.333333 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '2018-10-28 03:33:33.333333 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '2019-03-18 10:01:17.987 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '2019-03-18 10:01:17.987000 UTC'")
+                .addRoundTrip(inputType, "TIMESTAMP '2019-03-18 10:01:17.987654 UTC'",
                         TIMESTAMP_TZ_MICROS, "TIMESTAMP '2019-03-18 10:01:17.987654 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '2019-03-18 10:01:17.987000 Asia/Kathmandu'",
-                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '2019-03-18 04:16:17.987000 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '2019-03-18 10:01:17.987000+02:17'",
-                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '2019-03-18 07:44:17.987000 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '2019-03-18 10:01:17.987000-07:31'",
-                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '2019-03-18 17:32:17.987000 UTC'")
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '2021-09-07 23:59:59.999999-00:00'",
+                .addRoundTrip(inputType, "TIMESTAMP '2021-09-07 23:59:59.999999 UTC'",
                         TIMESTAMP_TZ_MICROS, "TIMESTAMP '2021-09-07 23:59:59.999999 UTC'")
                 // max value in BigQuery
-                .addRoundTrip("TIMESTAMP", "TIMESTAMP '9999-12-31 23:59:59.999999-00:00'",
-                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '9999-12-31 23:59:59.999999 UTC'")
-                .execute(getQueryRunner(), bigqueryCreateAndInsert("test.timestamp_tz"));
-        // TODO (https://github.com/trinodb/trino/pull/12210) Add support for timestamp with time zone type in views
+                .addRoundTrip(inputType, "TIMESTAMP '9999-12-31 23:59:59.999999 UTC'",
+                        TIMESTAMP_TZ_MICROS, "TIMESTAMP '9999-12-31 23:59:59.999999 UTC'");
+    }
+
+    @Test
+    public void testUnsupportedTimestampWithTimeZone()
+    {
+        try (TestTable table = new TestTable(getBigQuerySqlExecutor(), "test.unsupported_tz", "(col timestamp)")) {
+            assertQueryFails("INSERT INTO " + table.getName() + " VALUES (timestamp '-2021-09-07 23:59:59.999999 UTC')", "Failed to insert rows.*");
+            assertQueryFails("INSERT INTO " + table.getName() + " VALUES (timestamp '-0001-01-01 00:00:00.000000 UTC')", "Failed to insert rows.*");
+            assertQueryFails("INSERT INTO " + table.getName() + " VALUES (timestamp '0000-12-31 23:59:59.999999 UTC')", "Failed to insert rows.*");
+            assertQueryFails("INSERT INTO " + table.getName() + " VALUES (timestamp '10000-01-01 00:00:00.000000 UTC')", "Failed to insert rows.*");
+
+            assertThatThrownBy(() -> getBigQuerySqlExecutor().execute("INSERT INTO " + table.getName() + " VALUES (timestamp '-2021-09-07 23:59:59.999999 UTC')"))
+                    .hasMessageContaining("Invalid TIMESTAMP literal");
+            assertThatThrownBy(() -> getBigQuerySqlExecutor().execute("INSERT INTO " + table.getName() + " VALUES (timestamp '-0001-01-01 00:00:00.000000 UTC')"))
+                    .hasMessageContaining("Invalid TIMESTAMP literal");
+            assertThatThrownBy(() -> getBigQuerySqlExecutor().execute("INSERT INTO " + table.getName() + " VALUES (timestamp '0000-12-31 23:59:59.999999 UTC')"))
+                    .hasMessageContaining("Invalid TIMESTAMP literal");
+            assertThatThrownBy(() -> getBigQuerySqlExecutor().execute("INSERT INTO " + table.getName() + " VALUES (timestamp '10000-01-01 00:00:00.000000 UTC')"))
+                    .hasMessageContaining("Invalid TIMESTAMP literal");
+        }
     }
 
     @Test
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryQueryRunner.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryQueryRunner.java
index 32a2e4b72d29..15196c12fded 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryQueryRunner.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryQueryRunner.java
@@ -94,6 +94,10 @@ public static DistributedQueryRunner createQueryRunner(
             connectorProperties = new HashMap<>(ImmutableMap.copyOf(connectorProperties));
             connectorProperties.putIfAbsent("bigquery.views-enabled", "true");
             connectorProperties.putIfAbsent("bigquery.view-expire-duration", "30m");
+            connectorProperties.putIfAbsent("bigquery.rpc-retries", "4");
+            connectorProperties.putIfAbsent("bigquery.rpc-retry-delay", "200ms");
+            connectorProperties.putIfAbsent("bigquery.rpc-retry-delay-multiplier", "1.5");
+            connectorProperties.putIfAbsent("bigquery.rpc-timeout", "8s");
 
             queryRunner.installPlugin(new BigQueryPlugin());
             queryRunner.createCatalog(
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryTestView.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryTestView.java
index 7ffbf0818197..57c6228e07b8 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryTestView.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryTestView.java
@@ -14,32 +14,24 @@
 package io.trino.plugin.bigquery;
 
 import io.trino.testing.sql.SqlExecutor;
-import io.trino.testing.sql.TestTable;
-
-import java.util.List;
+import io.trino.testing.sql.TemporaryRelation;
 
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class BigQueryTestView
-        extends TestTable
+        implements TemporaryRelation
 {
-    private final TestTable table;
+    private final SqlExecutor sqlExecutor;
+    private final TemporaryRelation relation;
     private final String viewName;
 
-    public BigQueryTestView(SqlExecutor sqlExecutor, TestTable table)
-    {
-        super(sqlExecutor, table.getName(), null);
-        this.table = requireNonNull(table, "table is null");
-        this.viewName = table.getName() + "_view";
-    }
-
-    @Override
-    public void createAndInsert(List<String> rowsToInsert) {}
-
-    public void createView()
+    public BigQueryTestView(SqlExecutor sqlExecutor, TemporaryRelation relation)
     {
-        sqlExecutor.execute(format("CREATE VIEW %s AS SELECT * FROM %s", viewName, table.getName()));
+        this.sqlExecutor = requireNonNull(sqlExecutor, "sqlExecutor is null");
+        this.relation = requireNonNull(relation, "relation is null");
+        this.viewName = relation.getName() + "_view";
+        sqlExecutor.execute(format("CREATE VIEW %s AS SELECT * FROM %s", viewName, relation.getName()));
     }
 
     @Override
@@ -51,7 +43,8 @@ public String getName()
     @Override
     public void close()
     {
-        sqlExecutor.execute("DROP TABLE " + table.getName());
-        sqlExecutor.execute("DROP VIEW " + viewName);
+        try (relation) {
+            sqlExecutor.execute("DROP VIEW " + viewName);
+        }
     }
 }
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryViewCreateAndInsertDataSetup.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryViewCreateAndInsertDataSetup.java
index 481cb409edc7..bb47c50fb0e2 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryViewCreateAndInsertDataSetup.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryViewCreateAndInsertDataSetup.java
@@ -16,10 +16,11 @@
 import io.trino.testing.datatype.ColumnSetup;
 import io.trino.testing.datatype.CreateAndInsertDataSetup;
 import io.trino.testing.sql.SqlExecutor;
-import io.trino.testing.sql.TestTable;
+import io.trino.testing.sql.TemporaryRelation;
 
 import java.util.List;
 
+import static io.trino.plugin.base.util.Closables.closeAllSuppress;
 import static java.util.Objects.requireNonNull;
 
 public class BigQueryViewCreateAndInsertDataSetup
@@ -34,11 +35,15 @@ public BigQueryViewCreateAndInsertDataSetup(SqlExecutor sqlExecutor, String tabl
     }
 
     @Override
-    public TestTable setupTemporaryRelation(List<ColumnSetup> inputs)
+    public TemporaryRelation setupTemporaryRelation(List<ColumnSetup> inputs)
     {
-        TestTable table = super.setupTemporaryRelation(inputs);
-        BigQueryTestView view = new BigQueryTestView(sqlExecutor, table);
-        view.createView();
-        return view;
+        TemporaryRelation table = super.setupTemporaryRelation(inputs);
+        try {
+            return new BigQueryTestView(sqlExecutor, table);
+        }
+        catch (Throwable e) {
+            closeAllSuppress(e, table);
+            throw e;
+        }
     }
 }
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryArrowConnectorSmokeTest.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryArrowConnectorSmokeTest.java
index b8cd2ac67cbe..1c9bd37a9c83 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryArrowConnectorSmokeTest.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryArrowConnectorSmokeTest.java
@@ -14,12 +14,10 @@
 package io.trino.plugin.bigquery;
 
 import com.google.common.collect.ImmutableMap;
-import io.trino.testing.BaseConnectorSmokeTest;
 import io.trino.testing.QueryRunner;
-import io.trino.testing.TestingConnectorBehavior;
 
 public class TestBigQueryArrowConnectorSmokeTest
-        extends BaseConnectorSmokeTest
+        extends BaseBigQueryConnectorSmokeTest
 {
     @Override
     protected QueryRunner createQueryRunner()
@@ -30,20 +28,4 @@ protected QueryRunner createQueryRunner()
                 ImmutableMap.of("bigquery.experimental.arrow-serialization.enabled", "true"),
                 REQUIRED_TPCH_TABLES);
     }
-
-    @SuppressWarnings("DuplicateBranchesInSwitch")
-    @Override
-    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
-    {
-        switch (connectorBehavior) {
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
-    }
 }
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryAvroConnectorTest.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryAvroConnectorTest.java
index e1e5cbd9b81b..bb4566271ab9 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryAvroConnectorTest.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryAvroConnectorTest.java
@@ -46,7 +46,7 @@ protected QueryRunner createQueryRunner()
     {
         return BigQueryQueryRunner.createQueryRunner(
                 ImmutableMap.of(),
-                ImmutableMap.of(),
+                ImmutableMap.of("bigquery.job.label-name", "trino_query", "bigquery.job.label-format", "q_$QUERY_ID__t_$TRACE_TOKEN"),
                 REQUIRED_TPCH_TABLES);
     }
 
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryCaseInsensitiveMapping.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryCaseInsensitiveMapping.java
index d9760ee50d33..32b10c7a6289 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryCaseInsensitiveMapping.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryCaseInsensitiveMapping.java
@@ -21,8 +21,7 @@
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.TestTable;
 import io.trino.testing.sql.TestView;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.Stream;
 
@@ -35,18 +34,11 @@
 
 // With case-insensitive-name-matching enabled colliding schema/table names are considered as errors.
 // Some tests here create colliding names which can cause any other concurrent test to fail.
-@Test(singleThreaded = true)
 public class TestBigQueryCaseInsensitiveMapping
         // TODO extends BaseCaseInsensitiveMappingTest - https://github.com/trinodb/trino/issues/7864
         extends AbstractTestQueryFramework
 {
-    protected BigQuerySqlExecutor bigQuerySqlExecutor;
-
-    @BeforeClass(alwaysRun = true)
-    public void initBigQueryExecutor()
-    {
-        this.bigQuerySqlExecutor = new BigQuerySqlExecutor();
-    }
+    private final BigQuerySqlExecutor bigQuerySqlExecutor = new BigQuerySqlExecutor();
 
     @Override
     protected QueryRunner createQueryRunner()
@@ -216,11 +208,11 @@ public void testTableNameClash()
                     // listing must not fail but will filter out ambiguous names
                     assertThat(computeActual("SHOW TABLES FROM " + schema).getOnlyColumn()).doesNotContain("casesensitivename");
                     assertQueryReturnsEmptyResult("SELECT table_name FROM information_schema.tables WHERE table_schema = '" + schema + "'");
+                    assertQueryReturnsEmptyResult("SELECT column_name FROM information_schema.columns WHERE table_schema = '" + schema + "' AND table_name = 'casesensitivename'");
 
                     // queries which use the ambiguous object must fail
                     assertQueryFails("SHOW CREATE TABLE " + schema + ".casesensitivename", "Found ambiguous names in BigQuery.*");
                     assertQueryFails("SHOW COLUMNS FROM " + schema + ".casesensitivename", "Found ambiguous names in BigQuery.*");
-                    assertQueryFails("SELECT column_name FROM information_schema.columns WHERE table_schema = '" + schema + "' AND table_name = 'casesensitivename'", "Found ambiguous names in BigQuery.*");
                     assertQueryFails("SELECT * FROM " + schema + ".casesensitivename", "Found ambiguous names in BigQuery.*");
                     // TODO: test with INSERT and CTAS https://github.com/trinodb/trino/issues/6868, https://github.com/trinodb/trino/issues/6869
                 }
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryClientFactory.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryClientFactory.java
deleted file mode 100644
index 7db3d124455f..000000000000
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryClientFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.bigquery;
-
-import com.google.auth.Credentials;
-import com.google.auth.oauth2.GoogleCredentials;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.Optional;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TestBigQueryClientFactory
-{
-    @Test
-    public void testConfigurationOnly()
-    {
-        String projectId = BigQueryClientFactory.calculateBillingProjectId(Optional.of("pid"), Optional.empty());
-        assertThat(projectId).isEqualTo("pid");
-    }
-
-    @Test
-    public void testCredentialsOnly()
-            throws Exception
-    {
-        String projectId = BigQueryClientFactory.calculateBillingProjectId(Optional.empty(), credentials());
-        assertThat(projectId).isEqualTo("presto-bq-credentials-test");
-    }
-
-    @Test
-    public void testBothConfigurationAndCredentials()
-            throws Exception
-    {
-        String projectId = BigQueryClientFactory.calculateBillingProjectId(Optional.of("pid"), credentials());
-        assertThat(projectId).isEqualTo("pid");
-    }
-
-    private Optional<Credentials> credentials()
-            throws IOException
-    {
-        return Optional.of(GoogleCredentials.fromStream(getClass().getResourceAsStream("/test-account.json")));
-    }
-}
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryConfig.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryConfig.java
index af1b38892234..ce76d9eaa4c8 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryConfig.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -49,11 +49,10 @@ public void testDefaults()
                 .setViewsEnabled(false)
                 .setArrowSerializationEnabled(false)
                 .setQueryResultsCacheEnabled(false)
-                .setRpcInitialChannelCount(1)
-                .setMinRpcPerChannel(0)
-                .setMaxRpcPerChannel(Integer.MAX_VALUE)
-                .setRpcMinChannelCount(1)
-                .setRpcMaxChannelCount(1));
+                .setQueryLabelName(null)
+                .setQueryLabelFormat(null)
+                .setProxyEnabled(false)
+                .setMetadataParallelism(2));
     }
 
     @Test
@@ -75,11 +74,10 @@ public void testExplicitPropertyMappingsWithCredentialsKey()
                 .put("bigquery.service-cache-ttl", "10d")
                 .put("bigquery.metadata.cache-ttl", "5d")
                 .put("bigquery.query-results-cache.enabled", "true")
-                .put("bigquery.channel-pool.initial-size", "11")
-                .put("bigquery.channel-pool.min-size", "12")
-                .put("bigquery.channel-pool.max-size", "13")
-                .put("bigquery.channel-pool.min-rpc-per-channel", "14")
-                .put("bigquery.channel-pool.max-rpc-per-channel", "15")
+                .put("bigquery.job.label-name", "trino_job_name")
+                .put("bigquery.job.label-format", "$TRACE_TOKEN")
+                .put("bigquery.rpc-proxy.enabled", "true")
+                .put("bigquery.metadata.parallelism", "31")
                 .buildOrThrow();
 
         BigQueryConfig expected = new BigQueryConfig()
@@ -98,11 +96,10 @@ public void testExplicitPropertyMappingsWithCredentialsKey()
                 .setServiceCacheTtl(new Duration(10, DAYS))
                 .setMetadataCacheTtl(new Duration(5, DAYS))
                 .setQueryResultsCacheEnabled(true)
-                .setRpcInitialChannelCount(11)
-                .setRpcMinChannelCount(12)
-                .setRpcMaxChannelCount(13)
-                .setMinRpcPerChannel(14)
-                .setMaxRpcPerChannel(15);
+                .setQueryLabelName("trino_job_name")
+                .setQueryLabelFormat("$TRACE_TOKEN")
+                .setProxyEnabled(true)
+                .setMetadataParallelism(31);
 
         assertFullMapping(properties, expected);
     }
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryInstanceCleaner.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryInstanceCleaner.java
index 340f9b1ac872..bcd4d2f966c6 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryInstanceCleaner.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryInstanceCleaner.java
@@ -19,9 +19,9 @@
 import io.airlift.log.Logger;
 import io.trino.plugin.bigquery.BigQueryQueryRunner.BigQuerySqlExecutor;
 import io.trino.tpch.TpchTable;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.Collection;
@@ -36,7 +36,9 @@
 import static java.lang.String.join;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toUnmodifiableSet;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestBigQueryInstanceCleaner
 {
     public static final Logger LOG = Logger.get(TestBigQueryInstanceCleaner.class);
@@ -54,7 +56,7 @@ public class TestBigQueryInstanceCleaner
 
     private BigQuerySqlExecutor bigQuerySqlExecutor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         this.bigQuerySqlExecutor = new BigQuerySqlExecutor();
@@ -89,8 +91,15 @@ public void cleanUpDatasets()
         });
     }
 
-    @Test(dataProvider = "cleanUpSchemasDataProvider")
-    public void cleanUpTables(String schemaName)
+    @Test
+    public void cleanUpTables()
+    {
+        // Other schemas created by tests are taken care of by cleanUpDatasets
+        cleanUpTables(TPCH_SCHEMA);
+        cleanUpTables(TEST_SCHEMA);
+    }
+
+    private void cleanUpTables(String schemaName)
     {
         logObjectsCount(schemaName);
         if (!tablesToKeep.isEmpty()) {
@@ -128,16 +137,6 @@ public void cleanUpTables(String schemaName)
         logObjectsCount(schemaName);
     }
 
-    @DataProvider
-    public static Object[][] cleanUpSchemasDataProvider()
-    {
-        // Other schemas created by tests are taken care of by cleanUpDatasets
-        return new Object[][] {
-                {TPCH_SCHEMA},
-                {TEST_SCHEMA},
-        };
-    }
-
     private void logObjectsCount(String schemaName)
     {
         TableResult result = bigQuerySqlExecutor.executeQuery(format("" +
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryMetadata.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryMetadata.java
index 5520d294c635..770b665508ab 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryMetadata.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryMetadata.java
@@ -15,7 +15,7 @@
 
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQueryException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.bigquery.BigQueryQueryRunner.BigQuerySqlExecutor;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryMetadataCaching.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryMetadataCaching.java
index 41aa0e5ae36b..dc674d61a553 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryMetadataCaching.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryMetadataCaching.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.bigquery.BigQueryQueryRunner.BigQuerySqlExecutor;
 import static io.trino.testing.TestingNames.randomNameSuffix;
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryPlugin.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryPlugin.java
index 7b94582b1590..d3bf4f294c8c 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryPlugin.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryPlugin.java
@@ -14,7 +14,10 @@
 package io.trino.plugin.bigquery;
 
 import io.trino.spi.connector.ConnectorFactory;
-import org.testng.annotations.Test;
+import io.trino.testing.TestingConnectorContext;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.airlift.testing.Assertions.assertInstanceOf;
@@ -22,11 +25,18 @@
 public class TestBigQueryPlugin
 {
     @Test
-    public void testStartup()
+    public void testCreateConnector()
     {
         BigQueryPlugin plugin = new BigQueryPlugin();
         ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
         assertInstanceOf(factory, BigQueryConnectorFactory.class);
-        // TODO test the factory
+
+        factory.create(
+                        "test",
+                        Map.of(
+                                "bigquery.project-id", "xxx",
+                                "bigquery.credentials-key", "ewogICAgInR5cGUiOiAic2VydmljZV9hY2NvdW50IiwKICAgICJwcm9qZWN0X2lkIjogInByZXN0b3Rlc3QiLAogICAgInByaXZhdGVfa2V5X2lkIjogIngiLAogICAgInByaXZhdGVfa2V5IjogIi0tLS0tQkVHSU4gUFJJVkFURSBLRVktLS0tLVxuTUlJRXZRSUJBREFOQmdrcWhraUc5dzBCQVFFRkFBU0NCS2N3Z2dTakFnRUFBb0lCQVFDM3E0NkcrdlRtdllmR1xuUEVCcUZST2MwWllEUFE4Z1VRYlEvaWRiYXBQc0s3TUxIZEx1RUdzQkF4SjMyYkdKV2FXV1pKMlZvKzA2Y3E4UlxuM1VZdVJ5RDBvNVk5OTV3d0t5YUVMdjVHTHFxMlpkQ0U2MGNqbE8yeXM4dUg4MVJMQStOME9zUzI0WXAvTmw1V1xuMHl4bkVuaW5VSW5Hb1VteVJ0K1V1aTIxNTQ3WTZFeDFKMGdqVndoNWtBNTJBcG0xVzVjZ3JKUWgwMlZTNUZERlxudEtnWjlKNFUyZVQvM2RNUkFlN0dLaWtseGpMTktjSzJ6T3JuYVpzb0pBTnNrZ0xMdjhPaDJEdlpQbWd1dmtxL1xuUU4yRVRCSXVLRUxCbEN4ZHZkRVp5L2pPcUVmdW1xcWI4VTVqVk4vdit6Q0pZVHREcVRGVWxLRVZDbEVNV3BCUFxuR3dIUzg5MlRBZ01CQUFFQ2dnRUFVOWxuTE9vZXFjUTIydUlneWcwck1mbGdrY1ByUnVhV3hReHlMVUsvbXg3c1xuRXhRZmVuMVdURlQ1dG10VXFJNmJrTWdJUlF0Y1BzV2lkUFplbHJ2MEtKc1IrT0kwbEt6dVhZUVNvem1reDdZOVxuZHFEdWppanNSeHZidkFuekhuZjgrOC9raEZUODVFeU96dmFERzk4TDQ5NVp0NnRrT0pZd2RmWjA3Y2x6cGtQSVxudVNDMGRTMldFckZnT0JiK3BJZGFwU3dSN1gxOTlROGNsenhjYlVUUUJJaGJDMnFhUmUvelFBdHNIS3ArMHRRVFxuWEI0Z3A1bitXc0pGM2lmTlYwdkZ0VWRRUlNCNFBmRzExRW1lczBQTFpxV1ZYb2xGdWpVQW8xS0o3dXFWTVpoUlxuQTF6VEpEbzNaaklHUllvbmRHQWRHR1hrMU1rd1JCcGoxR0FRb08xSm9RS0JnUURjUFhLcjF0MlBVbnJMelN1UFxuNVM2ek9WMUVzNkpJbmpVaGtXNFFhcTQ4RFRYNEg2bkdTYkdyYW5tbVpyQXlWNytEeXZPWGVzaC9ITzJROWtlaFxuRlczaUVtQzBCZE9FeWVuRUJUNThidHR5VzlMVUtBVjhjendYTno4Q3lSQ0xGd292UDIzUjFkS3BZdGtsR0l6NVxuWjJaMEF1SEtzcWd2TC9Jeng2bU1QNU0rQXdLQmdRRFZmZ2ttMUJPVzhad3JvNFFjbE43bnlKN01lQ3BCTFZycVxuUU9OcThqeE5EaGpsT0VDSElZZmFTUUZLYXkwa2pBTndTQjRMYURuTXJTbmRJYWxqV3F1LzBtdThMLzNwQzg4MlxuOUhpNU1Mc1Jjb0trNDY5UnRLRVIxWEwvcE5sb1NTd2dkZWJtUWk3clhNUzFCQks4aFZ0UFFObmV0RE1sLy9JTFxuS3YzbmtycFZNUUtCZ0dnaUdiVU1PK2dIUEk1ZUxRbTFlRFkvbWt6Z2pvdTlXaXZNQW5sNnAzVTNYZHc2eEdBL1xuK2VTdHpHVVVTcDBUQmpkL1gxdXhMMW1DeVFUd25YK1pqVUlHSkhrYUJCL1dCRlN0a2hUdHFZN1J3Y2FVUWJ2TlxuRkkxNWpxNTNlUDM2MzlMbEw3eTJXQXZFOUJ6cEZjYmEwQU5zVld3c3V2N01zYjB2MjRlM2k1d1hBb0dCQUswWlxuL2kyZmN5ckdTRXdSendLbHFuN2c2ZkQ3MWJiM0lXb2lwc0tHR21LWDlaT1ZvcXh1Z1lwNSt6UHQ1ckpsWER4a1xuSFFnK3YrNjIwT1RkY0V5QXJoVmdkYjRtWTRmYjdXMnZsMXNBcWcwaGZkQllWRVM1WW9mbE85TVFSTDhMNVYyRVxuZTIxamFFdXA4a3liT3Qza2V2NnRwSG13UG5Dbk1BZmlHZkR6eFdWaEFvR0FYa1k5bjNsSDFISDJBUDhzMkNnNVxuN3o3NVhLYWtxWE9CMkNhTWFuOWxJd0FCVzhSam1IKzRiU2VVQ0kwM1hRRExrY1R3T0N3QStrL3FvZldBeW1ldVxudzU4Vzh5cGlWVGpDVDErUzh5VjhYL0htTERVa3VsTnUvY2psYlJPdnJmSlRIL2pNbVhhTEQxeVZlYXlxOFlGZFxubnl6SmpiR1BwdGsvYVRTYk5rQmpvdWM9XG4tLS0tLUVORCBQUklWQVRFIEtFWS0tLS0tXG4iLAogICAgImNsaWVudF9lbWFpbCI6ICJ4IiwKICAgICJjbGllbnRfaWQiOiAieCIsCiAgICAiYXV0aF91cmkiOiAiaHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29tL28vb2F1dGgyL2F1dGgiLAogICAgInRva2VuX3VyaSI6ICJodHRwczovL29hdXRoMi5nb29nbGVhcGlzLmNvbS90b2tlbiIsCiAgICAiYXV0aF9wcm92aWRlcl94NTA5X2NlcnRfdXJsIjogImh0dHBzOi8vd3d3Lmdvb2dsZWFwaXMuY29tL29hdXRoMi92MS9jZXJ0cyIsCiAgICAiY2xpZW50X3g1MDlfY2VydF91cmwiOiAiaHR0cHM6Ly93d3cuZ29vZ2xlYXBpcy5jb20vcm9ib3QvdjEvbWV0YWRhdGEveDUwOS9wcmVzdG90ZXN0JTQwcHJlc3RvdGVzdC5pYW0uZ3NlcnZpY2VhY2NvdW50LmNvbSIKfQo="),
+                        new TestingConnectorContext())
+                .shutdown();
     }
 }
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryProxyConfig.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryProxyConfig.java
new file mode 100644
index 000000000000..7c254608442e
--- /dev/null
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryProxyConfig.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.ConfigurationException;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestBigQueryProxyConfig
+{
+    @Test
+    public void testDefaults()
+    {
+        assertRecordedDefaults(recordDefaults(BigQueryProxyConfig.class)
+                .setUri(null)
+                .setPassword(null)
+                .setUsername(null)
+                .setKeystorePath(null)
+                .setKeystorePassword(null)
+                .setTruststorePath(null)
+                .setTruststorePassword(null));
+    }
+
+    @Test
+    public void testExplicitPropertyMappings()
+            throws IOException
+    {
+        Path keystoreFile = Files.createTempFile(null, null);
+        Path truststoreFile = Files.createTempFile(null, null);
+
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("bigquery.rpc-proxy.uri", "http://localhost:8000")
+                .put("bigquery.rpc-proxy.username", "username")
+                .put("bigquery.rpc-proxy.password", "password")
+                .put("bigquery.rpc-proxy.truststore-path", truststoreFile.toString())
+                .put("bigquery.rpc-proxy.truststore-password", "password-truststore")
+                .put("bigquery.rpc-proxy.keystore-path", keystoreFile.toString())
+                .put("bigquery.rpc-proxy.keystore-password", "password-keystore")
+                .buildOrThrow();
+
+        BigQueryProxyConfig expected = new BigQueryProxyConfig()
+                .setUri(URI.create("http://localhost:8000"))
+                .setUsername("username")
+                .setPassword("password")
+                .setKeystorePath(keystoreFile.toFile())
+                .setKeystorePassword("password-keystore")
+                .setTruststorePath(truststoreFile.toFile())
+                .setTruststorePassword("password-truststore");
+
+        assertFullMapping(properties, expected);
+    }
+
+    @Test
+    public void testInvalidConfiguration()
+    {
+        BigQueryProxyConfig config = new BigQueryProxyConfig();
+        config.setUri(URI.create("http://localhost:8000/path"));
+
+        assertThatThrownBy(config::validate)
+                .isInstanceOf(ConfigurationException.class)
+                .hasMessageContaining("BigQuery RPC proxy URI cannot specify path");
+
+        config.setUri(URI.create("http://localhost:8000"));
+
+        config.setUsername("username");
+
+        assertThatThrownBy(config::validate)
+                .isInstanceOf(ConfigurationException.class)
+                .hasMessageContaining("bigquery.rpc-proxy.username was set but bigquery.rpc-proxy.password is empty");
+
+        config.setUsername(null);
+        config.setPassword("password");
+
+        assertThatThrownBy(config::validate)
+                .isInstanceOf(ConfigurationException.class)
+                .hasMessageContaining("bigquery.rpc-proxy.password was set but bigquery.rpc-proxy.username is empty");
+
+        config.setUsername("username");
+        config.validate();
+    }
+}
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryRpcConfig.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryRpcConfig.java
new file mode 100644
index 000000000000..cb3d026106cc
--- /dev/null
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryRpcConfig.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.common.collect.ImmutableMap;
+import io.airlift.units.Duration;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+
+public class TestBigQueryRpcConfig
+{
+    @Test
+    public void testDefaults()
+    {
+        assertRecordedDefaults(recordDefaults(BigQueryRpcConfig.class)
+                .setRpcInitialChannelCount(1)
+                .setMinRpcPerChannel(0)
+                .setMaxRpcPerChannel(Integer.MAX_VALUE)
+                .setRpcMinChannelCount(1)
+                .setRpcMaxChannelCount(1)
+                .setRetries(0)
+                .setTimeout(Duration.valueOf("0s"))
+                .setRetryDelay(Duration.valueOf("0s"))
+                .setRetryMultiplier(1.0));
+    }
+
+    @Test
+    public void testExplicitPropertyMappings()
+    {
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("bigquery.channel-pool.initial-size", "11")
+                .put("bigquery.channel-pool.min-size", "12")
+                .put("bigquery.channel-pool.max-size", "13")
+                .put("bigquery.channel-pool.min-rpc-per-channel", "14")
+                .put("bigquery.channel-pool.max-rpc-per-channel", "15")
+                .put("bigquery.rpc-retries", "5")
+                .put("bigquery.rpc-timeout", "17s")
+                .put("bigquery.rpc-retry-delay", "10s")
+                .put("bigquery.rpc-retry-delay-multiplier", "1.2")
+                .buildOrThrow();
+
+        BigQueryRpcConfig expected = new BigQueryRpcConfig()
+                .setRpcInitialChannelCount(11)
+                .setRpcMinChannelCount(12)
+                .setRpcMaxChannelCount(13)
+                .setMinRpcPerChannel(14)
+                .setMaxRpcPerChannel(15)
+                .setRetries(5)
+                .setTimeout(Duration.valueOf("17s"))
+                .setRetryDelay(Duration.valueOf("10s"))
+                .setRetryMultiplier(1.2);
+
+        assertFullMapping(properties, expected);
+    }
+}
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryType.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryType.java
index fcfa1e7db870..6a91e3e299dd 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryType.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryType.java
@@ -13,7 +13,8 @@
  */
 package io.trino.plugin.bigquery;
 
-import org.testng.annotations.Test;
+import io.trino.spi.type.TimeZoneKey;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.airlift.slice.Slices.wrappedBuffer;
@@ -42,7 +43,10 @@ public void testTimestampToStringConverter()
     {
         assertThat(BigQueryType.timestampToStringConverter(
                 fromEpochSecondsAndFraction(1585658096, 123_456_000_000L, UTC_KEY)))
-                .isEqualTo("'2020-03-31 12:34:56.123456'");
+                .isEqualTo("2020-03-31 12:34:56.123456");
+        assertThat(BigQueryType.timestampToStringConverter(
+                fromEpochSecondsAndFraction(1585658096, 123_456_000_000L, TimeZoneKey.getTimeZoneKey("Asia/Kathmandu"))))
+                .isEqualTo("2020-03-31 12:34:56.123456");
     }
 
     @Test
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryWithDifferentProjectIdConnectorSmokeTest.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryWithDifferentProjectIdConnectorSmokeTest.java
index 0041889d1722..46d92cb7d98e 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryWithDifferentProjectIdConnectorSmokeTest.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryWithDifferentProjectIdConnectorSmokeTest.java
@@ -14,10 +14,8 @@
 package io.trino.plugin.bigquery;
 
 import com.google.common.collect.ImmutableMap;
-import io.trino.testing.BaseConnectorSmokeTest;
 import io.trino.testing.QueryRunner;
-import io.trino.testing.TestingConnectorBehavior;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -26,7 +24,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBigQueryWithDifferentProjectIdConnectorSmokeTest
-        extends BaseConnectorSmokeTest
+        extends BaseBigQueryConnectorSmokeTest
 {
     private static final String ALTERNATE_PROJECT_CATALOG = "bigquery";
     private static final String SERVICE_ACCOUNT_CATALOG = "service_account_bigquery";
@@ -47,22 +45,6 @@ protected QueryRunner createQueryRunner()
         return queryRunner;
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
-    @Override
-    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
-    {
-        switch (connectorBehavior) {
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
-    }
-
     @Test
     public void testCreateSchemasInDifferentProjectIdCatalog()
     {
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryWithProxyConnectorSmokeTest.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryWithProxyConnectorSmokeTest.java
new file mode 100644
index 000000000000..09113c4cd41b
--- /dev/null
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryWithProxyConnectorSmokeTest.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Resources;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.containers.MitmProxy;
+
+import java.io.File;
+import java.net.URISyntaxException;
+
+public class TestBigQueryWithProxyConnectorSmokeTest
+        extends BaseBigQueryConnectorSmokeTest
+{
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        MitmProxy proxy = closeAfterClass(MitmProxy.builder()
+                .withSSLCertificate(fromResources("proxy/cert.pem").toPath())
+                .build());
+        proxy.start();
+        QueryRunner queryRunner = BigQueryQueryRunner.createQueryRunner(
+                ImmutableMap.of(),
+                ImmutableMap.of(
+                        "bigquery.rpc-proxy.enabled", "true",
+                        "bigquery.rpc-proxy.uri", proxy.getProxyEndpoint(),
+                        "bigquery.rpc-proxy.truststore-path", fromResources("proxy/truststore.jks").getAbsolutePath(),
+                        "bigquery.rpc-proxy.truststore-password", "123456"),
+                REQUIRED_TPCH_TABLES);
+
+        return queryRunner;
+    }
+
+    private static File fromResources(String filename)
+    {
+        try {
+            return new File(Resources.getResource(filename).toURI());
+        }
+        catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestCredentialsOptionsConfigurer.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestCredentialsOptionsConfigurer.java
new file mode 100644
index 000000000000..4bbdc120e8c8
--- /dev/null
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestCredentialsOptionsConfigurer.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed 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 io.trino.plugin.bigquery;
+
+import com.google.auth.Credentials;
+import com.google.auth.oauth2.GoogleCredentials;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import static io.trino.plugin.bigquery.CredentialsOptionsConfigurer.calculateBillingProjectId;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestCredentialsOptionsConfigurer
+{
+    @Test
+    public void testConfigurationOnly()
+    {
+        String projectId = calculateBillingProjectId(Optional.of("pid"), Optional.empty());
+        assertThat(projectId).isEqualTo("pid");
+    }
+
+    @Test
+    public void testCredentialsOnly()
+            throws Exception
+    {
+        String projectId = calculateBillingProjectId(Optional.empty(), credentials());
+        assertThat(projectId).isEqualTo("presto-bq-credentials-test");
+    }
+
+    @Test
+    public void testBothConfigurationAndCredentials()
+            throws Exception
+    {
+        String projectId = calculateBillingProjectId(Optional.of("pid"), credentials());
+        assertThat(projectId).isEqualTo("pid");
+    }
+
+    private Optional<Credentials> credentials()
+            throws IOException
+    {
+        return Optional.of(GoogleCredentials.fromStream(getClass().getResourceAsStream("/test-account.json")));
+    }
+}
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestReadRowsHelper.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestReadRowsHelper.java
index 5e68d6990a49..7e098ee52396 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestReadRowsHelper.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestReadRowsHelper.java
@@ -18,7 +18,7 @@
 import com.google.common.collect.ImmutableList;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestStaticCredentialsConfig.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestStaticCredentialsConfig.java
index 44515758d0fa..83f494eb5145 100644
--- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestStaticCredentialsConfig.java
+++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestStaticCredentialsConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.ConfigurationException;
 import io.airlift.configuration.ConfigurationFactory;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -26,7 +26,7 @@
 
 import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
 import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 
diff --git a/plugin/trino-bigquery/src/test/resources/proxy/cert.conf b/plugin/trino-bigquery/src/test/resources/proxy/cert.conf
new file mode 100644
index 000000000000..958fdb94f160
--- /dev/null
+++ b/plugin/trino-bigquery/src/test/resources/proxy/cert.conf
@@ -0,0 +1,19 @@
+FQDN = *.googleapis.com
+ORGNAME = Trino
+ALTNAMES = DNS:$FQDN
+
+[ req ]
+default_bits = 2048
+default_md = sha256
+prompt = no
+encrypt_key = no
+distinguished_name = dn
+req_extensions = req_ext
+
+[ dn ]
+C = CH
+O = $ORGNAME
+CN = $FQDN
+
+[ req_ext ]
+subjectAltName = $ALTNAMES
diff --git a/plugin/trino-bigquery/src/test/resources/proxy/cert.crt b/plugin/trino-bigquery/src/test/resources/proxy/cert.crt
new file mode 100644
index 000000000000..10bf01c07373
--- /dev/null
+++ b/plugin/trino-bigquery/src/test/resources/proxy/cert.crt
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC9zCCAd8CFD26DzXQOsWQP51oazMFCyPU8yYEMA0GCSqGSIb3DQEBCwUAMDgx
+CzAJBgNVBAYTAkNIMQ4wDAYDVQQKDAVUcmlubzEZMBcGA1UEAwwQKi5nb29nbGVh
+cGlzLmNvbTAeFw0yMzA0MTgxOTAxNDVaFw0yMzA1MTgxOTAxNDVaMDgxCzAJBgNV
+BAYTAkNIMQ4wDAYDVQQKDAVUcmlubzEZMBcGA1UEAwwQKi5nb29nbGVhcGlzLmNv
+bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXMOTKWJ/cLM4/0xW61
+TaV1CYzRd8pOkkNu84GysBTyPo+1rU7LCt0KIuvsItsTaIqJQlF6Yy9l+Yi+yU80
+BdQDK/cWpjYxCMRlMmFPQfHMJzrdIMZ0F1/tCwBXd3E1LlgoJG/H6jaN4ILULDms
+5bOTCzSHKtilyS1eCO4r8n2BBuMtFV2SuIcqEEQLoEcJ2vQlEoq3W650teqthTtE
+831VOGoKoLcGg5nFxhtxIorT5Rp/GxafhKnbS165jlo4JVDjQzx6o97ooKRfSTT0
+7CdAEFTAk08zx1+DuILkz0oAGOfsSScQ41BD5D2UPjGB+j/g49c7V6RyAaqkPD6s
+BJUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEATF7YX6GSc/ENKhSlieIp8DJ8FDHx
+79mmo5iTOoA5PO1HDOwoFC7PR4XGy8jfQASRNzhNNsUDnZNgaO/U0kIOlCzslnia
+eLkbp14Rx2C2kkg6zetcCPipK0l3/gj1vL+bCClnvUeQtQRjm/mJYahG0yx5+4t5
+X15ys3MZjTx93UvxMzigF26u5+lPWx5srl2kaQ2Ejk6THivpzaHZnbiWKuTxgQTe
+KrZmZUmtqnNqIcRt0Btx/jHOj0gDy2+a/sBYod6/ZAl5wVJ5NRGepe/RZe4lrVXI
+OEK+VohuYLIrW53YMOAKhQly5fTOGxHfmKXi+iVjqdhCJcia3ZN8nV1ybg==
+-----END CERTIFICATE-----
diff --git a/plugin/trino-bigquery/src/test/resources/proxy/cert.pem b/plugin/trino-bigquery/src/test/resources/proxy/cert.pem
new file mode 100644
index 000000000000..752992bfc52c
--- /dev/null
+++ b/plugin/trino-bigquery/src/test/resources/proxy/cert.pem
@@ -0,0 +1,45 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAtcw5MpYn9wszj/TFbrVNpXUJjNF3yk6SQ27zgbKwFPI+j7Wt
+TssK3Qoi6+wi2xNoiolCUXpjL2X5iL7JTzQF1AMr9xamNjEIxGUyYU9B8cwnOt0g
+xnQXX+0LAFd3cTUuWCgkb8fqNo3ggtQsOazls5MLNIcq2KXJLV4I7ivyfYEG4y0V
+XZK4hyoQRAugRwna9CUSirdbrnS16q2FO0TzfVU4agqgtwaDmcXGG3EiitPlGn8b
+Fp+EqdtLXrmOWjglUONDPHqj3uigpF9JNPTsJ0AQVMCTTzPHX4O4guTPSgAY5+xJ
+JxDjUEPkPZQ+MYH6P+Dj1ztXpHIBqqQ8PqwElQIDAQABAoIBAHGKmhKJC27UlSCM
+jB5Hp7X1scA8NueoSNtK2VSgqC582SviGNqEH0XMBeF4+o/+wCT98uh2WqoIs19/
+YLVR1W4DiRrqD2b7GvGmDmAOIy6EBeBSqRyo9sxXfK568kNHJqmycIdLwXDPDXBI
+WVKwNEoCRVZKMS1b5ZirCULPOcS9mXboT9U8LjYj1OAlN/gdxUXtAvsWw/GJ3KEH
+0aHWw+zmqfGCcvm6qJ8aHAiuVk5lCYgVHl3AzAzNWoa4AoxzSt+Qs1t8PipsMjX1
+DKhPvtBKGqtLiCGyUbbOKqijzY5zbpiOyFLMQwextEg1rGSmd/Tw5l5uupN5l4Ws
+8YCDLUUCgYEA6zqsjJQ8XwSyHlxhFVBLKJHRjH55d+i168XyBBE6w+v451G01aix
++4EHkWyJJk93RnPVVgetXp6AOF8EFVQOZWS6YSpDx4wJgytlWuP5dajSCj9MNJkl
+wFFZ2GrSaBxZ271d2O5NVySWUhrqSzJSrUtt5KA85bFH2AUDIGUgSO8CgYEAxdm9
+BCoGQK10d6ZYJwwZYjKtobqyt0uY9jgX5aZmfXmdeFpfiNhxwAgQacQQBrWwpGXp
+yyUN5P0BbWzIYmyHwgsr/Ft7LhCfVBkIH+fK8+a0QUeLhwaYtFVe+Pmw9TPI+C+r
+j0pELvYN4G3K1mSut+DGD1/Ke7fPIsDAetoJIrsCgYBYWX5LgrW2HoZj/uB759+C
+yloBQdOPpPkHKB7BRlNjGPMwtrCL+0N2Kj1UcoaEvB4ZeRIssM9+FVwlUBKxjBOo
+I5AZRI2WmlNMT/VOkQe2GIVjUejmbIsQU73CGkUS02swrExeWQr1awmGpxNO0QTa
+j9UjpMeaod5RFXjaJwFcQwKBgFpIm/pUevn0rRsUa1GWMdcfrSAKJBeEhc6FllIT
+dt13K6aKBuJZcr7gbyz0bSPCsVKzttYemJKP6aDXbTGMuP6RPocv76v7pdkoew6k
+JXbbJhJL5Z2+ItzXwDj5KAkckm6+whjnGOodGgP51f+zfg8moPrPCYUfQYRoVO06
+pcSVAoGBAJ6UwgVpj6bAlKUiWqqfk/18QiTm9QYasaz3R8szh15dzcFLwZqAKuni
+3k8o+9RW7KliSck+xzuEt8CKF8s4jRYwqITyJkegEpGjh8JgZTGbIZ2dhDAFQKXg
+22cupzfLigdcb+1NdxNTRR5ZR5yXTGJ3sp306QQrZsf0vlacHCOF
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIC9zCCAd8CFD26DzXQOsWQP51oazMFCyPU8yYEMA0GCSqGSIb3DQEBCwUAMDgx
+CzAJBgNVBAYTAkNIMQ4wDAYDVQQKDAVUcmlubzEZMBcGA1UEAwwQKi5nb29nbGVh
+cGlzLmNvbTAeFw0yMzA0MTgxOTAxNDVaFw0yMzA1MTgxOTAxNDVaMDgxCzAJBgNV
+BAYTAkNIMQ4wDAYDVQQKDAVUcmlubzEZMBcGA1UEAwwQKi5nb29nbGVhcGlzLmNv
+bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXMOTKWJ/cLM4/0xW61
+TaV1CYzRd8pOkkNu84GysBTyPo+1rU7LCt0KIuvsItsTaIqJQlF6Yy9l+Yi+yU80
+BdQDK/cWpjYxCMRlMmFPQfHMJzrdIMZ0F1/tCwBXd3E1LlgoJG/H6jaN4ILULDms
+5bOTCzSHKtilyS1eCO4r8n2BBuMtFV2SuIcqEEQLoEcJ2vQlEoq3W650teqthTtE
+831VOGoKoLcGg5nFxhtxIorT5Rp/GxafhKnbS165jlo4JVDjQzx6o97ooKRfSTT0
+7CdAEFTAk08zx1+DuILkz0oAGOfsSScQ41BD5D2UPjGB+j/g49c7V6RyAaqkPD6s
+BJUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEATF7YX6GSc/ENKhSlieIp8DJ8FDHx
+79mmo5iTOoA5PO1HDOwoFC7PR4XGy8jfQASRNzhNNsUDnZNgaO/U0kIOlCzslnia
+eLkbp14Rx2C2kkg6zetcCPipK0l3/gj1vL+bCClnvUeQtQRjm/mJYahG0yx5+4t5
+X15ys3MZjTx93UvxMzigF26u5+lPWx5srl2kaQ2Ejk6THivpzaHZnbiWKuTxgQTe
+KrZmZUmtqnNqIcRt0Btx/jHOj0gDy2+a/sBYod6/ZAl5wVJ5NRGepe/RZe4lrVXI
+OEK+VohuYLIrW53YMOAKhQly5fTOGxHfmKXi+iVjqdhCJcia3ZN8nV1ybg==
+-----END CERTIFICATE-----
diff --git a/plugin/trino-bigquery/src/test/resources/proxy/generate.sh b/plugin/trino-bigquery/src/test/resources/proxy/generate.sh
new file mode 100755
index 000000000000..0713f7c05a71
--- /dev/null
+++ b/plugin/trino-bigquery/src/test/resources/proxy/generate.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -xeuo
+echo "Generate RSA key"
+openssl genrsa -out cert.key 2048
+echo "Create CRT from config"
+openssl req -new -x509 -key cert.key -config cert.conf -out cert.crt
+echo "Bundle private key and certificate for mitmproxy"
+cat cert.key cert.crt > cert.pem
+echo "Convert to DER format"
+openssl x509 -outform der -in cert.pem -out cert.der
+[ -e truststore.jks ] && rm truststore.jks
+echo "Import cert to trustore.jks"
+keytool -import -file cert.der -alias googleapis -keystore truststore.jks -storepass '123456' -noprompt
+rm cert.der cert.key
diff --git a/plugin/trino-bigquery/src/test/resources/proxy/truststore.jks b/plugin/trino-bigquery/src/test/resources/proxy/truststore.jks
new file mode 100644
index 000000000000..7050334d78b7
Binary files /dev/null and b/plugin/trino-bigquery/src/test/resources/proxy/truststore.jks differ
diff --git a/plugin/trino-blackhole/pom.xml b/plugin/trino-blackhole/pom.xml
index 0b6ebf57c1a6..6d648599f932 100644
--- a/plugin/trino-blackhole/pom.xml
+++ b/plugin/trino-blackhole/pom.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-blackhole</artifactId>
-    <description>Trino - Black Hole Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Black Hole Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,8 +19,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
@@ -34,39 +34,37 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -76,7 +74,30 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -91,13 +112,13 @@
 
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-tpch</artifactId>
+            <artifactId>trino-testing-services</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-tpch</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -114,8 +135,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleConnectorFactory.java b/plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleConnectorFactory.java
index 92d0d0978c6d..91c55cb08177 100644
--- a/plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleConnectorFactory.java
+++ b/plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleConnectorFactory.java
@@ -22,7 +22,7 @@
 
 import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 
 public class BlackHoleConnectorFactory
@@ -37,7 +37,7 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> requiredConfig, ConnectorContext context)
     {
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         ListeningScheduledExecutorService executorService = listeningDecorator(newSingleThreadScheduledExecutor(daemonThreadsNamed("blackhole")));
         return new BlackHoleConnector(
diff --git a/plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleMetadata.java b/plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleMetadata.java
index 512ad30ea6d5..170e7dc8e048 100644
--- a/plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleMetadata.java
+++ b/plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleMetadata.java
@@ -58,6 +58,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
@@ -146,6 +147,7 @@ public List<SchemaTableName> listTables(ConnectorSession session, Optional<Strin
                         .map(BlackHoleTableHandle::toSchemaTableName)
                         .collect(toList()))
                 .addAll(listViews(session, schemaName))
+                .addAll(listMaterializedViews(session, schemaName))
                 .build().asList();
     }
 
@@ -154,7 +156,7 @@ public Map<String, ColumnHandle> getColumnHandles(ConnectorSession session, Conn
     {
         BlackHoleTableHandle blackHoleTableHandle = (BlackHoleTableHandle) tableHandle;
         return blackHoleTableHandle.getColumnHandles().stream()
-                .collect(toImmutableMap(BlackHoleColumnHandle::getName, column -> column));
+                .collect(toImmutableMap(BlackHoleColumnHandle::getName, Function.identity()));
     }
 
     @Override
@@ -350,7 +352,7 @@ public ConnectorMergeTableHandle beginMerge(ConnectorSession session, ConnectorT
     }
 
     @Override
-    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics) {}
+    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle mergeTableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics) {}
 
     @Override
     public void truncateTable(ConnectorSession session, ConnectorTableHandle tableHandle) {}
@@ -392,6 +394,21 @@ private void checkSchemaExists(String schemaName)
         }
     }
 
+    @Override
+    public void setViewComment(ConnectorSession session, SchemaTableName viewName, Optional<String> comment)
+    {
+        ConnectorViewDefinition view = getView(session, viewName).orElseThrow(() -> new ViewNotFoundException(viewName));
+        views.put(viewName, new ConnectorViewDefinition(
+                view.getOriginalSql(),
+                view.getCatalog(),
+                view.getSchema(),
+                view.getColumns(),
+                comment,
+                view.getOwner(),
+                view.isRunAsInvoker(),
+                view.getPath()));
+    }
+
     @Override
     public void setViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
     {
@@ -405,6 +422,7 @@ public void setViewColumnComment(ConnectorSession session, SchemaTableName viewN
                         .collect(toImmutableList()),
                 view.getComment(),
                 view.getOwner(),
-                view.isRunAsInvoker()));
+                view.isRunAsInvoker(),
+                view.getPath()));
     }
 }
diff --git a/plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleNodePartitioningProvider.java b/plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleNodePartitioningProvider.java
index 2209ea8599e2..4ff82abc7f25 100644
--- a/plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleNodePartitioningProvider.java
+++ b/plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleNodePartitioningProvider.java
@@ -27,7 +27,7 @@
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.type.TypeUtils.NULL_HASH_CODE;
@@ -51,7 +51,7 @@ public BucketFunction getBucketFunction(
             int bucketCount)
     {
         List<MethodHandle> hashCodeInvokers = partitionChannelTypes.stream()
-                .map(type -> typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION)))
+                .map(type -> typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)))
                 .collect(toImmutableList());
 
         return (page, position) -> {
diff --git a/plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/TestBlackHoleMetadata.java b/plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/TestBlackHoleMetadata.java
index 696dc4ddd2ef..1fd7a4f489af 100644
--- a/plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/TestBlackHoleMetadata.java
+++ b/plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/TestBlackHoleMetadata.java
@@ -20,7 +20,7 @@
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.security.TrinoPrincipal;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -32,7 +32,7 @@
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBlackHoleMetadata
 {
@@ -47,9 +47,9 @@ public class TestBlackHoleMetadata
     @Test
     public void testCreateSchema()
     {
-        assertEquals(metadata.listSchemaNames(SESSION), ImmutableList.of("default"));
+        assertThat(metadata.listSchemaNames(SESSION)).isEqualTo(ImmutableList.of("default"));
         metadata.createSchema(SESSION, "test", ImmutableMap.of(), new TrinoPrincipal(USER, SESSION.getUser()));
-        assertEquals(metadata.listSchemaNames(SESSION), ImmutableList.of("default", "test"));
+        assertThat(metadata.listSchemaNames(SESSION)).isEqualTo(ImmutableList.of("default", "test"));
     }
 
     @Test
@@ -70,8 +70,8 @@ public void tableIsCreatedAfterCommits()
         metadata.finishCreateTable(SESSION, table, ImmutableList.of(), ImmutableList.of());
 
         List<SchemaTableName> tables = metadata.listTables(SESSION, Optional.empty());
-        assertEquals(tables.size(), 1, "Expected only one table.");
-        assertEquals(tables.get(0).getTableName(), "temp_table", "Expected table with name 'temp_table'");
+        assertThat(tables).hasSize(1);
+        assertThat(tables.get(0).getTableName()).isEqualTo("temp_table");
     }
 
     @Test
@@ -85,6 +85,6 @@ public void testCreateTableInNotExistSchema()
 
     private void assertThatNoTableIsCreated()
     {
-        assertEquals(metadata.listTables(SESSION, Optional.empty()), ImmutableList.of(), "No table was expected");
+        assertThat(metadata.listTables(SESSION, Optional.empty())).isEmpty();
     }
 }
diff --git a/plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/TestBlackHoleSmoke.java b/plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/TestBlackHoleSmoke.java
index abf31afeba1d..3597c9b91f11 100644
--- a/plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/TestBlackHoleSmoke.java
+++ b/plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/TestBlackHoleSmoke.java
@@ -22,9 +22,10 @@
 import io.trino.testing.MaterializedRow;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -38,27 +39,29 @@
 import static io.trino.plugin.blackhole.BlackHoleConnector.ROWS_PER_PAGE_PROPERTY;
 import static io.trino.plugin.blackhole.BlackHoleConnector.SPLIT_COUNT_PROPERTY;
 import static io.trino.plugin.blackhole.BlackHoleQueryRunner.createQueryRunner;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestBlackHoleSmoke
 {
     private QueryRunner queryRunner;
 
-    @BeforeTest
+    @BeforeAll
     public void setUp()
             throws Exception
     {
         queryRunner = createQueryRunner();
     }
 
-    @AfterTest(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         assertThatNoBlackHoleTableIsCreated();
@@ -69,11 +72,11 @@ public void tearDown()
     @Test
     public void testCreateSchema()
     {
-        assertEquals(queryRunner.execute("SHOW SCHEMAS FROM blackhole").getRowCount(), 2);
+        assertThat(queryRunner.execute("SHOW SCHEMAS FROM blackhole").getRowCount()).isEqualTo(2);
         assertThatQueryReturnsValue("CREATE TABLE test_schema as SELECT * FROM tpch.tiny.nation", 25L);
 
         queryRunner.execute("CREATE SCHEMA blackhole.test");
-        assertEquals(queryRunner.execute("SHOW SCHEMAS FROM blackhole").getRowCount(), 3);
+        assertThat(queryRunner.execute("SHOW SCHEMAS FROM blackhole").getRowCount()).isEqualTo(3);
         assertThatQueryReturnsValue("CREATE TABLE test.test_schema as SELECT * FROM tpch.tiny.region", 5L);
 
         assertThatQueryDoesNotReturnValues("DROP TABLE test_schema");
@@ -97,8 +100,8 @@ public void blackHoleConnectorUsage()
         assertThatQueryReturnsValue("CREATE TABLE nation as SELECT * FROM tpch.tiny.nation", 25L);
 
         List<QualifiedObjectName> tableNames = listBlackHoleTables();
-        assertEquals(tableNames.size(), 1, "Expected only one table.");
-        assertEquals(tableNames.get(0).getObjectName(), "nation", "Expected 'nation' table.");
+        assertThat(tableNames).hasSize(1);
+        assertThat(tableNames.get(0).getObjectName()).isEqualTo("nation");
 
         assertThatQueryReturnsValue("INSERT INTO nation SELECT * FROM tpch.tiny.nation", 25L);
 
@@ -140,7 +143,7 @@ public void testCreateTableInNotExistSchema()
                 .hasMessage("Schema schema1 not found");
 
         int tablesAfterCreate = listBlackHoleTables().size();
-        assertEquals(tablesBeforeCreate, tablesAfterCreate);
+        assertThat(tablesBeforeCreate).isEqualTo(tablesAfterCreate);
     }
 
     @Test
@@ -163,17 +166,60 @@ public void dataGenerationUsage()
         assertThatQueryReturnsValue("SELECT count(*) FROM nation", 6L, session);
 
         MaterializedResult rows = queryRunner.execute(session, "SELECT * FROM nation LIMIT 1");
-        assertEquals(rows.getRowCount(), 1);
+        assertThat(rows.getRowCount()).isEqualTo(1);
         MaterializedRow row = Iterables.getOnlyElement(rows);
-        assertEquals(row.getFieldCount(), 4);
-        assertEquals(row.getField(0), 0L);
-        assertEquals(row.getField(1), "****************");
-        assertEquals(row.getField(2), 0L);
-        assertEquals(row.getField(3), "****************");
+        assertThat(row.getFieldCount()).isEqualTo(4);
+        assertThat(row.getField(0)).isEqualTo(0L);
+        assertThat(row.getField(1)).isEqualTo("****************");
+        assertThat(row.getField(2)).isEqualTo(0L);
+        assertThat(row.getField(3)).isEqualTo("****************");
 
         assertThatQueryDoesNotReturnValues("DROP TABLE nation");
     }
 
+    @Test
+    public void testCreateViewWithComment()
+    {
+        String viewName = "test_crerate_view_with_comment_" + randomNameSuffix();
+        queryRunner.execute("CREATE VIEW " + viewName + " COMMENT 'test comment' AS SELECT * FROM tpch.tiny.nation");
+
+        assertThat(getTableComment(viewName)).isEqualTo("test comment");
+
+        queryRunner.execute("DROP VIEW " + viewName);
+    }
+
+    @Test
+    public void testCommentOnView()
+    {
+        String viewName = "test_comment_on_view_" + randomNameSuffix();
+        queryRunner.execute("CREATE VIEW " + viewName + " AS SELECT * FROM tpch.tiny.nation");
+
+        // comment set
+        queryRunner.execute("COMMENT ON VIEW " + viewName + " IS 'new comment'");
+        assertThat(getTableComment(viewName)).isEqualTo("new comment");
+
+        // comment deleted
+        queryRunner.execute("COMMENT ON VIEW " + viewName + " IS NULL");
+        assertThat(getTableComment(viewName)).isEqualTo(null);
+
+        // comment set to non-empty value before verifying setting empty comment
+        queryRunner.execute("COMMENT ON VIEW " + viewName + " IS 'updated comment'");
+        assertThat(getTableComment(viewName)).isEqualTo("updated comment");
+
+        // comment set to empty
+        queryRunner.execute("COMMENT ON VIEW " + viewName + " IS ''");
+        assertThat(getTableComment(viewName)).isEqualTo("");
+
+        queryRunner.execute("DROP VIEW " + viewName);
+    }
+
+    private String getTableComment(String tableName)
+    {
+        return (String) queryRunner.execute("SELECT comment FROM system.metadata.table_comments " +
+                "WHERE catalog_name = CURRENT_CATALOG AND schema_name = CURRENT_SCHEMA AND table_name = '" + tableName + "'")
+                .getOnlyValue();
+    }
+
     @Test
     public void fieldLength()
     {
@@ -193,14 +239,14 @@ public void fieldLength()
                 session);
 
         MaterializedResult rows = queryRunner.execute(session, "SELECT * FROM nation");
-        assertEquals(rows.getRowCount(), 1);
+        assertThat(rows.getRowCount()).isEqualTo(1);
         MaterializedRow row = Iterables.getOnlyElement(rows);
-        assertEquals(row.getFieldCount(), 5);
-        assertEquals(row.getField(0), 0L);
-        assertEquals(row.getField(1), "********");
-        assertEquals(row.getField(2), 0L);
-        assertEquals(row.getField(3), "********");
-        assertEquals(row.getField(4), "***"); // this one is shorter due to column type being VARCHAR(3)
+        assertThat(row.getFieldCount()).isEqualTo(5);
+        assertThat(row.getField(0)).isEqualTo(0L);
+        assertThat(row.getField(1)).isEqualTo("********");
+        assertThat(row.getField(2)).isEqualTo(0L);
+        assertThat(row.getField(3)).isEqualTo("********");
+        assertThat(row.getField(4)).isEqualTo("***"); // this one is shorter due to column type being VARCHAR(3)
 
         assertThatQueryDoesNotReturnValues("DROP TABLE nation");
     }
@@ -232,22 +278,22 @@ public void testSelectAllTypes()
     {
         createBlackholeAllTypesTable();
         MaterializedResult rows = queryRunner.execute("SELECT * FROM blackhole_all_types");
-        assertEquals(rows.getRowCount(), 1);
+        assertThat(rows.getRowCount()).isEqualTo(1);
         MaterializedRow row = Iterables.getOnlyElement(rows);
-        assertEquals(row.getFieldCount(), 13);
-        assertEquals(row.getField(0), "**********");
-        assertEquals(row.getField(1), 0L);
-        assertEquals(row.getField(2), 0);
-        assertEquals(row.getField(3), (short) 0);
-        assertEquals(row.getField(4), (byte) 0);
-        assertEquals(row.getField(5), 0.0f);
-        assertEquals(row.getField(6), 0.0);
-        assertEquals(row.getField(7), false);
-        assertEquals(row.getField(8), LocalDate.ofEpochDay(0));
-        assertEquals(row.getField(9), LocalDateTime.of(1970, 1, 1, 0, 0, 0));
-        assertEquals(row.getField(10), "****************".getBytes(UTF_8));
-        assertEquals(row.getField(11), new BigDecimal("0.00"));
-        assertEquals(row.getField(12), new BigDecimal("00000000000000000000.0000000000"));
+        assertThat(row.getFieldCount()).isEqualTo(13);
+        assertThat(row.getField(0)).isEqualTo("**********");
+        assertThat(row.getField(1)).isEqualTo(0L);
+        assertThat(row.getField(2)).isEqualTo(0);
+        assertThat(row.getField(3)).isEqualTo((short) 0);
+        assertThat(row.getField(4)).isEqualTo((byte) 0);
+        assertThat(row.getField(5)).isEqualTo(0.0f);
+        assertThat(row.getField(6)).isEqualTo(0.0);
+        assertThat(row.getField(7)).isEqualTo(false);
+        assertThat(row.getField(8)).isEqualTo(LocalDate.ofEpochDay(0));
+        assertThat(row.getField(9)).isEqualTo(LocalDateTime.of(1970, 1, 1, 0, 0, 0));
+        assertThat(row.getField(10)).isEqualTo("****************".getBytes(UTF_8));
+        assertThat(row.getField(11)).isEqualTo(new BigDecimal("0.00"));
+        assertThat(row.getField(12)).isEqualTo(new BigDecimal("00000000000000000000.0000000000"));
         dropBlackholeAllTypesTable();
     }
 
@@ -256,7 +302,7 @@ public void testSelectWithUnenforcedConstraint()
     {
         createBlackholeAllTypesTable();
         MaterializedResult rows = queryRunner.execute("SELECT * FROM blackhole_all_types where _bigint > 10");
-        assertEquals(rows.getRowCount(), 0);
+        assertThat(rows.getRowCount()).isEqualTo(0);
         dropBlackholeAllTypesTable();
     }
 
@@ -312,7 +358,7 @@ public void pageProcessingDelay()
 
         Stopwatch stopwatch = Stopwatch.createStarted();
 
-        assertEquals(queryRunner.execute(session, "SELECT * FROM nation").getRowCount(), 1);
+        assertThat(queryRunner.execute(session, "SELECT * FROM nation").getRowCount()).isEqualTo(1);
         queryRunner.execute(session, "INSERT INTO nation SELECT CAST(null AS BIGINT), CAST(null AS VARCHAR(25)), CAST(null AS BIGINT), CAST(null AS VARCHAR(152))");
 
         stopwatch.stop();
@@ -323,7 +369,7 @@ public void pageProcessingDelay()
 
     private void assertThatNoBlackHoleTableIsCreated()
     {
-        assertEquals(listBlackHoleTables().size(), 0, "No blackhole tables expected");
+        assertThat(listBlackHoleTables()).isEmpty();
     }
 
     private List<QualifiedObjectName> listBlackHoleTables()
@@ -341,10 +387,9 @@ private void assertThatQueryReturnsValue(String sql, Object expected, Session se
         MaterializedResult rows = session == null ? queryRunner.execute(sql) : queryRunner.execute(session, sql);
         MaterializedRow materializedRow = Iterables.getOnlyElement(rows);
         int fieldCount = materializedRow.getFieldCount();
-        assertEquals(fieldCount, 1, format("Expected only one column, but got '%d'", fieldCount));
-        Object value = materializedRow.getField(0);
-        assertEquals(value, expected);
-        assertEquals(Iterables.getOnlyElement(rows).getFieldCount(), 1);
+        assertThat(fieldCount).isEqualTo(1);
+        assertThat(materializedRow.getField(0)).isEqualTo(expected);
+        assertThat(Iterables.getOnlyElement(rows).getFieldCount()).isEqualTo(1);
     }
 
     private void assertThatQueryDoesNotReturnValues(String sql)
@@ -355,6 +400,6 @@ private void assertThatQueryDoesNotReturnValues(String sql)
     private void assertThatQueryDoesNotReturnValues(Session session, @Language("SQL") String sql)
     {
         MaterializedResult rows = session == null ? queryRunner.execute(sql) : queryRunner.execute(session, sql);
-        assertEquals(rows.getRowCount(), 0);
+        assertThat(rows.getRowCount()).isEqualTo(0);
     }
 }
diff --git a/plugin/trino-cassandra/pom.xml b/plugin/trino-cassandra/pom.xml
index 6cfaa61fc194..fa19d4cb12ac 100644
--- a/plugin/trino-cassandra/pom.xml
+++ b/plugin/trino-cassandra/pom.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-cassandra</artifactId>
-    <description>Trino - Cassandra Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Cassandra Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,36 +19,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.datastax.oss</groupId>
             <artifactId>java-driver-core</artifactId>
@@ -82,12 +52,6 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -99,37 +63,59 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>bootstrap</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.weakref</groupId>
-            <artifactId>jmxutils</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
-            <scope>runtime</scope>
+            <artifactId>log</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <artifactId>units</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-cassandra-4.4</artifactId>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.weakref</groupId>
+            <artifactId>jmxutils</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -140,8 +126,20 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -151,7 +149,30 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>concurrent</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -189,12 +210,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
@@ -213,6 +228,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
@@ -228,6 +249,28 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.basepom.maven</groupId>
                 <artifactId>duplicate-finder-maven-plugin</artifactId>
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraClientConfig.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraClientConfig.java
index cb60b962c53b..46de506aff0d 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraClientConfig.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraClientConfig.java
@@ -27,11 +27,10 @@
 import io.airlift.units.Duration;
 import io.airlift.units.MaxDuration;
 import io.airlift.units.MinDuration;
-
-import javax.annotation.Nullable;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 import java.io.File;
 import java.util.Arrays;
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraClientModule.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraClientModule.java
index 0df0633156e5..d4a877fec9c2 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraClientModule.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraClientModule.java
@@ -22,19 +22,21 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.FromStringDeserializer;
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import io.airlift.json.JsonCodec;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.cassandra.v4_4.CassandraTelemetry;
 import io.trino.plugin.cassandra.ptf.Query;
 import io.trino.spi.TrinoException;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeId;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import javax.net.ssl.SSLContext;
 
 import java.io.File;
@@ -110,7 +112,11 @@ protected Type _deserialize(String value, DeserializationContext context)
 
     @Singleton
     @Provides
-    public static CassandraSession createCassandraSession(CassandraTypeManager cassandraTypeManager, CassandraClientConfig config, JsonCodec<List<ExtraColumnMetadata>> extraColumnMetadataCodec)
+    public static CassandraSession createCassandraSession(
+            CassandraTypeManager cassandraTypeManager,
+            CassandraClientConfig config,
+            JsonCodec<List<ExtraColumnMetadata>> extraColumnMetadataCodec,
+            OpenTelemetry openTelemetry)
     {
         requireNonNull(extraColumnMetadataCodec, "extraColumnMetadataCodec is null");
 
@@ -177,7 +183,8 @@ public static CassandraSession createCassandraSession(CassandraTypeManager cassa
                 () -> {
                     contactPoints.forEach(contactPoint -> cqlSessionBuilder.addContactPoint(
                             createInetSocketAddress(contactPoint, config.getNativeProtocolPort())));
-                    return cqlSessionBuilder.build();
+                    CassandraTelemetry cassandraTelemetry = CassandraTelemetry.create(openTelemetry);
+                    return cassandraTelemetry.wrap(cqlSessionBuilder.build());
                 },
                 config.getNoHostAvailableRetryTimeout());
     }
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraConnector.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraConnector.java
index ca3d05f02f28..ae93af9301a3 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraConnector.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraConnector.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.cassandra;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -22,12 +23,10 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Set;
 
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraConnectorFactory.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraConnectorFactory.java
index 1aa3eeb3ca21..1b1a0c43bb5e 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraConnectorFactory.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraConnectorFactory.java
@@ -16,6 +16,7 @@
 import com.google.inject.Injector;
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.json.JsonModule;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.base.jmx.MBeanServerModule;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorContext;
@@ -24,7 +25,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class CassandraConnectorFactory
@@ -40,9 +41,10 @@ public String getName()
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
         requireNonNull(config, "config is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
+                binder -> binder.bind(OpenTelemetry.class).toInstance(context.getOpenTelemetry()),
                 new MBeanModule(),
                 new JsonModule(),
                 new CassandraClientModule(context.getTypeManager()),
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraMetadata.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraMetadata.java
index d411cd4c75b8..de4b76875ae7 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraMetadata.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraMetadata.java
@@ -18,6 +18,7 @@
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.slice.Slice;
 import io.trino.plugin.cassandra.ptf.Query.QueryHandle;
@@ -43,13 +44,11 @@
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.connector.TableFunctionApplicationResult;
 import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
 import io.trino.spi.statistics.ComputedStatistics;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPageSink.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPageSink.java
index 63cb3a965efa..0a9205756a41 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPageSink.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPageSink.java
@@ -23,8 +23,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.InetAddresses;
-import com.google.common.primitives.Shorts;
-import com.google.common.primitives.SignedBytes;
 import io.airlift.slice.Slice;
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
@@ -69,8 +67,6 @@
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.UuidType.trinoUuidToJavaUuid;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
-import static java.lang.Float.intBitsToFloat;
-import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 
@@ -83,7 +79,7 @@ public class CassandraPageSink
     private final List<Type> columnTypes;
     private final boolean generateUuid;
     private final int batchSize;
-    private final Function<Long, Object> toCassandraDate;
+    private final Function<Integer, Object> toCassandraDate;
     private final BatchStatementBuilder batchStatement = BatchStatement.builder(DefaultBatchType.LOGGED);
 
     public CassandraPageSink(
@@ -107,10 +103,10 @@ public CassandraPageSink(
         this.batchSize = batchSize;
 
         if (protocolVersion.getCode() <= ProtocolVersion.V3.getCode()) {
-            toCassandraDate = value -> DateTimeFormatter.ISO_LOCAL_DATE.format(LocalDate.ofEpochDay(toIntExact(value)));
+            toCassandraDate = value -> DateTimeFormatter.ISO_LOCAL_DATE.format(LocalDate.ofEpochDay(value));
         }
         else {
-            toCassandraDate = value -> LocalDate.ofEpochDay(toIntExact(value));
+            toCassandraDate = LocalDate::ofEpochDay;
         }
 
         ImmutableMap.Builder<String, Term> parameters = ImmutableMap.builder();
@@ -159,44 +155,44 @@ private void appendColumn(List<Object> values, Page page, int position, int chan
             values.add(null);
         }
         else if (BOOLEAN.equals(type)) {
-            values.add(type.getBoolean(block, position));
+            values.add(BOOLEAN.getBoolean(block, position));
         }
         else if (BIGINT.equals(type)) {
-            values.add(type.getLong(block, position));
+            values.add(BIGINT.getLong(block, position));
         }
         else if (INTEGER.equals(type)) {
-            values.add(toIntExact(type.getLong(block, position)));
+            values.add(INTEGER.getInt(block, position));
         }
         else if (SMALLINT.equals(type)) {
-            values.add(Shorts.checkedCast(type.getLong(block, position)));
+            values.add(SMALLINT.getShort(block, position));
         }
         else if (TINYINT.equals(type)) {
-            values.add(SignedBytes.checkedCast(type.getLong(block, position)));
+            values.add(TINYINT.getByte(block, position));
         }
         else if (DOUBLE.equals(type)) {
-            values.add(type.getDouble(block, position));
+            values.add(DOUBLE.getDouble(block, position));
         }
         else if (REAL.equals(type)) {
-            values.add(intBitsToFloat(toIntExact(type.getLong(block, position))));
+            values.add(REAL.getFloat(block, position));
         }
         else if (DATE.equals(type)) {
-            values.add(toCassandraDate.apply(type.getLong(block, position)));
+            values.add(toCassandraDate.apply(DATE.getInt(block, position)));
         }
         else if (TIME_NANOS.equals(type)) {
             long value = type.getLong(block, position);
             values.add(LocalTime.ofNanoOfDay(roundDiv(value, PICOSECONDS_PER_NANOSECOND) % NANOSECONDS_PER_DAY));
         }
         else if (TIMESTAMP_TZ_MILLIS.equals(type)) {
-            values.add(Instant.ofEpochMilli(unpackMillisUtc(type.getLong(block, position))));
+            values.add(Instant.ofEpochMilli(unpackMillisUtc(TIMESTAMP_TZ_MILLIS.getLong(block, position))));
         }
-        else if (type instanceof VarcharType) {
-            values.add(type.getSlice(block, position).toStringUtf8());
+        else if (type instanceof VarcharType varcharType) {
+            values.add(varcharType.getSlice(block, position).toStringUtf8());
         }
         else if (VARBINARY.equals(type)) {
-            values.add(type.getSlice(block, position).toByteBuffer());
+            values.add(VARBINARY.getSlice(block, position).toByteBuffer());
         }
         else if (UuidType.UUID.equals(type)) {
-            values.add(trinoUuidToJavaUuid(type.getSlice(block, position)));
+            values.add(trinoUuidToJavaUuid(UuidType.UUID.getSlice(block, position)));
         }
         else if (cassandraTypeManager.isIpAddressType(type)) {
             values.add(InetAddresses.forString((String) type.getObjectValue(null, block, position)));
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPageSinkProvider.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPageSinkProvider.java
index b51aae6d9d0c..c30229a63d62 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPageSinkProvider.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPageSinkProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.cassandra;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
 import io.trino.spi.connector.ConnectorPageSink;
@@ -21,8 +22,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
-import javax.inject.Inject;
-
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPartitionManager.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPartitionManager.java
index d65e779c60d0..e0c576e23d6e 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPartitionManager.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPartitionManager.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.plugin.cassandra.util.CassandraCqlUtils;
 import io.trino.spi.connector.ColumnHandle;
@@ -24,8 +25,6 @@
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -161,7 +160,7 @@ private List<Set<Object>> getPartitionKeysList(CassandraTable table, TupleDomain
                             Object value = range.getSingleValue();
 
                             CassandraType valueType = columnHandle.getCassandraType();
-                            if (cassandraTypeManager.isSupportedPartitionKey(valueType.getKind())) {
+                            if (valueType.getKind().isSupportedPartitionKey()) {
                                 columnValues.add(value);
                             }
                         }
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraRecordSetProvider.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraRecordSetProvider.java
index a43b396df853..87a9b891c002 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraRecordSetProvider.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraRecordSetProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.cassandra;
 
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.plugin.cassandra.util.CassandraCqlUtils;
 import io.trino.spi.connector.ColumnHandle;
@@ -23,8 +24,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.RecordSet;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSession.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSession.java
index 74b9f06c1e41..24cf9f411adf 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSession.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSession.java
@@ -457,7 +457,7 @@ public PreparedStatement prepare(SimpleStatement statement)
         return executeWithSession(session -> session.prepare(statement));
     }
 
-    public ResultSet execute(Statement statement)
+    public ResultSet execute(Statement<?> statement)
     {
         return executeWithSession(session -> session.execute(statement));
     }
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSessionProperties.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSessionProperties.java
index 5355b19f4ca9..e8d4d7d0da99 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSessionProperties.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSessionProperties.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.cassandra;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSplitManager.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSplitManager.java
index f4ff63df291b..8400fa8f88eb 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSplitManager.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSplitManager.java
@@ -21,6 +21,7 @@
 import com.datastax.oss.driver.internal.core.metadata.token.RandomTokenRange;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.plugin.cassandra.util.HostAddressFactory;
 import io.trino.spi.HostAddress;
@@ -35,8 +36,6 @@
 import io.trino.spi.connector.FixedSplitSource;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraTokenSplitManager.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraTokenSplitManager.java
index ca935f3d5628..3e5ff7ea4d4a 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraTokenSplitManager.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraTokenSplitManager.java
@@ -17,10 +17,9 @@
 import com.datastax.oss.driver.api.core.metadata.token.TokenRange;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.spi.TrinoException;
 
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraType.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraType.java
index 015d593a28ea..14456fb063c9 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraType.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraType.java
@@ -28,32 +28,45 @@ public class CassandraType
 {
     public enum Kind
     {
-        BOOLEAN,
-        TINYINT,
-        SMALLINT,
-        INT,
-        BIGINT,
-        FLOAT,
-        DOUBLE,
-        DECIMAL,
-        DATE,
-        TIME,
-        TIMESTAMP,
-        ASCII,
-        TEXT,
-        VARCHAR,
-        BLOB,
-        UUID,
-        TIMEUUID,
-        COUNTER,
-        VARINT,
-        INET,
-        CUSTOM,
-        LIST,
-        SET,
-        MAP,
-        TUPLE,
-        UDT,
+        BOOLEAN(true),
+        TINYINT(true),
+        SMALLINT(true),
+        INT(true),
+        BIGINT(true),
+        FLOAT(true),
+        DOUBLE(true),
+        DECIMAL(true),
+        DATE(true),
+        TIME(true),
+        TIMESTAMP(true),
+        ASCII(true),
+        TEXT(true),
+        VARCHAR(true),
+        BLOB(false),
+        UUID(true),
+        TIMEUUID(true),
+        COUNTER(false),
+        VARINT(false),
+        INET(true),
+        CUSTOM(false),
+        LIST(false),
+        SET(false),
+        MAP(false),
+        TUPLE(false),
+        UDT(false),
+        /**/;
+
+        private final boolean supportedPartitionKey;
+
+        Kind(boolean supportedPartitionKey)
+        {
+            this.supportedPartitionKey = supportedPartitionKey;
+        }
+
+        public boolean isSupportedPartitionKey()
+        {
+            return supportedPartitionKey;
+        }
     }
 
     private final Kind kind;
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraTypeManager.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraTypeManager.java
index b0244367300e..7e61b972fa85 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraTypeManager.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraTypeManager.java
@@ -34,9 +34,8 @@
 import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.RowBlockBuilder;
-import io.trino.spi.block.SingleRowBlockWriter;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.BooleanType;
@@ -79,6 +78,7 @@
 import static com.google.common.net.InetAddresses.toAddrString;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.airlift.slice.Slices.wrappedBuffer;
+import static io.airlift.slice.Slices.wrappedHeapBuffer;
 import static io.trino.plugin.cassandra.CassandraType.Kind.DATE;
 import static io.trino.plugin.cassandra.CassandraType.Kind.TIME;
 import static io.trino.plugin.cassandra.CassandraType.Kind.TIMESTAMP;
@@ -89,6 +89,7 @@
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
 import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
 import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
 import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_NANOSECOND;
@@ -116,62 +117,34 @@ public CassandraTypeManager(TypeManager typeManager)
 
     public Optional<CassandraType> toCassandraType(DataType dataType)
     {
-        switch (dataType.getProtocolCode()) {
-            case ProtocolConstants.DataType.ASCII:
-                return Optional.of(CassandraTypes.ASCII);
-            case ProtocolConstants.DataType.BIGINT:
-                return Optional.of(CassandraTypes.BIGINT);
-            case ProtocolConstants.DataType.BLOB:
-                return Optional.of(CassandraTypes.BLOB);
-            case ProtocolConstants.DataType.BOOLEAN:
-                return Optional.of(CassandraTypes.BOOLEAN);
-            case ProtocolConstants.DataType.COUNTER:
-                return Optional.of(CassandraTypes.COUNTER);
-            case ProtocolConstants.DataType.CUSTOM:
-                return Optional.of(CassandraTypes.CUSTOM);
-            case ProtocolConstants.DataType.DATE:
-                return Optional.of(CassandraTypes.DATE);
-            case ProtocolConstants.DataType.DECIMAL:
-                return Optional.of(CassandraTypes.DECIMAL);
-            case ProtocolConstants.DataType.DOUBLE:
-                return Optional.of(CassandraTypes.DOUBLE);
-            case ProtocolConstants.DataType.FLOAT:
-                return Optional.of(CassandraTypes.FLOAT);
-            case ProtocolConstants.DataType.INET:
-                return Optional.of(new CassandraType(
-                    CassandraType.Kind.INET,
-                    ipAddressType));
-            case ProtocolConstants.DataType.INT:
-                return Optional.of(CassandraTypes.INT);
-            case ProtocolConstants.DataType.LIST:
-                return Optional.of(CassandraTypes.LIST);
-            case ProtocolConstants.DataType.MAP:
-                return Optional.of(CassandraTypes.MAP);
-            case ProtocolConstants.DataType.SET:
-                return Optional.of(CassandraTypes.SET);
-            case ProtocolConstants.DataType.SMALLINT:
-                return Optional.of(CassandraTypes.SMALLINT);
-            case ProtocolConstants.DataType.TIME:
-                return Optional.of(CassandraTypes.TIME);
-            case ProtocolConstants.DataType.TIMESTAMP:
-                return Optional.of(CassandraTypes.TIMESTAMP);
-            case ProtocolConstants.DataType.TIMEUUID:
-                return Optional.of(CassandraTypes.TIMEUUID);
-            case ProtocolConstants.DataType.TINYINT:
-                return Optional.of(CassandraTypes.TINYINT);
-            case ProtocolConstants.DataType.TUPLE:
-                return createTypeForTuple(dataType);
-            case ProtocolConstants.DataType.UDT:
-                return createTypeForUserType(dataType);
-            case ProtocolConstants.DataType.UUID:
-                return Optional.of(CassandraTypes.UUID);
-            case ProtocolConstants.DataType.VARCHAR:
-                return Optional.of(CassandraTypes.VARCHAR);
-            case ProtocolConstants.DataType.VARINT:
-                return Optional.of(CassandraTypes.VARINT);
-            default:
-                return Optional.empty();
-        }
+        return switch (dataType.getProtocolCode()) {
+            case ProtocolConstants.DataType.ASCII -> Optional.of(CassandraTypes.ASCII);
+            case ProtocolConstants.DataType.BIGINT -> Optional.of(CassandraTypes.BIGINT);
+            case ProtocolConstants.DataType.BLOB -> Optional.of(CassandraTypes.BLOB);
+            case ProtocolConstants.DataType.BOOLEAN -> Optional.of(CassandraTypes.BOOLEAN);
+            case ProtocolConstants.DataType.COUNTER -> Optional.of(CassandraTypes.COUNTER);
+            case ProtocolConstants.DataType.CUSTOM -> Optional.of(CassandraTypes.CUSTOM);
+            case ProtocolConstants.DataType.DATE -> Optional.of(CassandraTypes.DATE);
+            case ProtocolConstants.DataType.DECIMAL -> Optional.of(CassandraTypes.DECIMAL);
+            case ProtocolConstants.DataType.DOUBLE -> Optional.of(CassandraTypes.DOUBLE);
+            case ProtocolConstants.DataType.FLOAT -> Optional.of(CassandraTypes.FLOAT);
+            case ProtocolConstants.DataType.INET -> Optional.of(new CassandraType(CassandraType.Kind.INET, ipAddressType));
+            case ProtocolConstants.DataType.INT -> Optional.of(CassandraTypes.INT);
+            case ProtocolConstants.DataType.LIST -> Optional.of(CassandraTypes.LIST);
+            case ProtocolConstants.DataType.MAP -> Optional.of(CassandraTypes.MAP);
+            case ProtocolConstants.DataType.SET -> Optional.of(CassandraTypes.SET);
+            case ProtocolConstants.DataType.SMALLINT -> Optional.of(CassandraTypes.SMALLINT);
+            case ProtocolConstants.DataType.TIME -> Optional.of(CassandraTypes.TIME);
+            case ProtocolConstants.DataType.TIMESTAMP -> Optional.of(CassandraTypes.TIMESTAMP);
+            case ProtocolConstants.DataType.TIMEUUID -> Optional.of(CassandraTypes.TIMEUUID);
+            case ProtocolConstants.DataType.TINYINT -> Optional.of(CassandraTypes.TINYINT);
+            case ProtocolConstants.DataType.TUPLE -> createTypeForTuple(dataType);
+            case ProtocolConstants.DataType.UDT -> createTypeForUserType(dataType);
+            case ProtocolConstants.DataType.UUID -> Optional.of(CassandraTypes.UUID);
+            case ProtocolConstants.DataType.VARCHAR -> Optional.of(CassandraTypes.VARCHAR);
+            case ProtocolConstants.DataType.VARINT -> Optional.of(CassandraTypes.VARINT);
+            default -> Optional.empty();
+        };
     }
 
     private Optional<CassandraType> createTypeForTuple(DataType dataType)
@@ -236,56 +209,29 @@ public NullableValue getColumnValue(CassandraType cassandraType, GettableByIndex
             return NullableValue.asNull(trinoType);
         }
 
-        switch (cassandraType.getKind()) {
-            case ASCII:
-            case TEXT:
-            case VARCHAR:
-                return NullableValue.of(trinoType, utf8Slice(row.getString(position)));
-            case INT:
-                return NullableValue.of(trinoType, (long) row.getInt(position));
-            case SMALLINT:
-                return NullableValue.of(trinoType, (long) row.getShort(position));
-            case TINYINT:
-                return NullableValue.of(trinoType, (long) row.getByte(position));
-            case BIGINT:
-            case COUNTER:
-                return NullableValue.of(trinoType, row.getLong(position));
-            case BOOLEAN:
-                return NullableValue.of(trinoType, row.getBoolean(position));
-            case DOUBLE:
-                return NullableValue.of(trinoType, row.getDouble(position));
-            case FLOAT:
-                return NullableValue.of(trinoType, (long) floatToRawIntBits(row.getFloat(position)));
-            case DECIMAL:
-                return NullableValue.of(trinoType, row.getBigDecimal(position).doubleValue());
-            case UUID:
-            case TIMEUUID:
-                return NullableValue.of(trinoType, javaUuidToTrinoUuid(row.getUuid(position)));
-            case TIME:
-                return NullableValue.of(trinoType, row.getLocalTime(position).toNanoOfDay() * PICOSECONDS_PER_NANOSECOND);
-            case TIMESTAMP:
-                return NullableValue.of(trinoType, packDateTimeWithZone(row.getInstant(position).toEpochMilli(), TimeZoneKey.UTC_KEY));
-            case DATE:
-                return NullableValue.of(trinoType, row.getLocalDate(position).toEpochDay());
-            case INET:
-                return NullableValue.of(trinoType, castFromVarcharToIpAddress(utf8Slice(toAddrString(row.getInetAddress(position)))));
-            case VARINT:
-                return NullableValue.of(trinoType, utf8Slice(row.getBigInteger(position).toString()));
-            case BLOB:
-            case CUSTOM:
-                return NullableValue.of(trinoType, wrappedBuffer(row.getBytesUnsafe(position)));
-            case SET:
-                return NullableValue.of(trinoType, utf8Slice(buildArrayValueFromSetType(row, position, dataTypeSupplier.get())));
-            case LIST:
-                return NullableValue.of(trinoType, utf8Slice(buildArrayValueFromListType(row, position, dataTypeSupplier.get())));
-            case MAP:
-                return NullableValue.of(trinoType, utf8Slice(buildMapValue(row, position, dataTypeSupplier.get())));
-            case TUPLE:
-                return NullableValue.of(trinoType, buildTupleValue(cassandraType, row, position));
-            case UDT:
-                return NullableValue.of(trinoType, buildUserTypeValue(cassandraType, row, position));
-        }
-        throw new IllegalStateException("Handling of type " + this + " is not implemented");
+        return switch (cassandraType.getKind()) {
+            case ASCII, TEXT, VARCHAR -> NullableValue.of(trinoType, utf8Slice(row.getString(position)));
+            case INT -> NullableValue.of(trinoType, (long) row.getInt(position));
+            case SMALLINT -> NullableValue.of(trinoType, (long) row.getShort(position));
+            case TINYINT -> NullableValue.of(trinoType, (long) row.getByte(position));
+            case BIGINT, COUNTER -> NullableValue.of(trinoType, row.getLong(position));
+            case BOOLEAN -> NullableValue.of(trinoType, row.getBoolean(position));
+            case DOUBLE -> NullableValue.of(trinoType, row.getDouble(position));
+            case FLOAT -> NullableValue.of(trinoType, (long) floatToRawIntBits(row.getFloat(position)));
+            case DECIMAL -> NullableValue.of(trinoType, row.getBigDecimal(position).doubleValue());
+            case UUID, TIMEUUID -> NullableValue.of(trinoType, javaUuidToTrinoUuid(row.getUuid(position)));
+            case TIME -> NullableValue.of(trinoType, row.getLocalTime(position).toNanoOfDay() * PICOSECONDS_PER_NANOSECOND);
+            case TIMESTAMP -> NullableValue.of(trinoType, packDateTimeWithZone(row.getInstant(position).toEpochMilli(), TimeZoneKey.UTC_KEY));
+            case DATE -> NullableValue.of(trinoType, row.getLocalDate(position).toEpochDay());
+            case INET -> NullableValue.of(trinoType, castFromVarcharToIpAddress(utf8Slice(toAddrString(row.getInetAddress(position)))));
+            case VARINT -> NullableValue.of(trinoType, utf8Slice(row.getBigInteger(position).toString()));
+            case BLOB, CUSTOM -> NullableValue.of(trinoType, wrappedHeapBuffer(row.getBytesUnsafe(position)));
+            case SET -> NullableValue.of(trinoType, utf8Slice(buildArrayValueFromSetType(row, position, dataTypeSupplier.get())));
+            case LIST -> NullableValue.of(trinoType, utf8Slice(buildArrayValueFromListType(row, position, dataTypeSupplier.get())));
+            case MAP -> NullableValue.of(trinoType, utf8Slice(buildMapValue(row, position, dataTypeSupplier.get())));
+            case TUPLE -> NullableValue.of(trinoType, buildTupleValue(cassandraType, row, position));
+            case UDT -> NullableValue.of(trinoType, buildUserTypeValue(cassandraType, row, position));
+        };
     }
 
     private String buildMapValue(GettableByIndex row, int position, DataType dataType)
@@ -340,41 +286,41 @@ String buildArrayValue(Collection<?> cassandraCollection, DataType elementType)
         return sb.toString();
     }
 
-    private Block buildTupleValue(CassandraType type, GettableByIndex row, int position)
+    private SqlRow buildTupleValue(CassandraType type, GettableByIndex row, int position)
     {
         verify(type.getKind() == TUPLE, "Not a TUPLE type");
         TupleValue tupleValue = row.getTupleValue(position);
-        RowBlockBuilder blockBuilder = (RowBlockBuilder) type.getTrinoType().createBlockBuilder(null, 1);
-        SingleRowBlockWriter singleRowBlockWriter = blockBuilder.beginBlockEntry();
-        int tuplePosition = 0;
-        for (CassandraType argumentType : type.getArgumentTypes()) {
-            int finalTuplePosition = tuplePosition;
-            NullableValue value = getColumnValue(argumentType, tupleValue, tuplePosition, () -> tupleValue.getType().getComponentTypes().get(finalTuplePosition));
-            writeNativeValue(argumentType.getTrinoType(), singleRowBlockWriter, value.getValue());
-            tuplePosition++;
-        }
-        // can I just return singleRowBlockWriter here? It extends AbstractSingleRowBlock and tests pass.
-        blockBuilder.closeEntry();
-        return (Block) type.getTrinoType().getObject(blockBuilder, 0);
+        return buildRowValue((RowType) type.getTrinoType(), fieldBuilders -> {
+            int tuplePosition = 0;
+            List<CassandraType> argumentTypes = type.getArgumentTypes();
+            for (int i = 0; i < argumentTypes.size(); i++) {
+                CassandraType argumentType = argumentTypes.get(i);
+                BlockBuilder fieldBuilder = fieldBuilders.get(i);
+                int finalTuplePosition = tuplePosition;
+                NullableValue value = getColumnValue(argumentType, tupleValue, tuplePosition, () -> tupleValue.getType().getComponentTypes().get(finalTuplePosition));
+                writeNativeValue(argumentType.getTrinoType(), fieldBuilder, value.getValue());
+                tuplePosition++;
+            }
+        });
     }
 
-    private Block buildUserTypeValue(CassandraType type, GettableByIndex row, int position)
+    private SqlRow buildUserTypeValue(CassandraType type, GettableByIndex row, int position)
     {
         verify(type.getKind() == UDT, "Not a user defined type: %s", type.getKind());
         UdtValue udtValue = row.getUdtValue(position);
-        RowBlockBuilder blockBuilder = (RowBlockBuilder) type.getTrinoType().createBlockBuilder(null, 1);
-        SingleRowBlockWriter singleRowBlockWriter = blockBuilder.beginBlockEntry();
-        int tuplePosition = 0;
-        List<DataType> udtTypeFieldTypes = udtValue.getType().getFieldTypes();
-        for (CassandraType argumentType : type.getArgumentTypes()) {
-            int finalTuplePosition = tuplePosition;
-            NullableValue value = getColumnValue(argumentType, udtValue, tuplePosition, () -> udtTypeFieldTypes.get(finalTuplePosition));
-            writeNativeValue(argumentType.getTrinoType(), singleRowBlockWriter, value.getValue());
-            tuplePosition++;
-        }
-
-        blockBuilder.closeEntry();
-        return (Block) type.getTrinoType().getObject(blockBuilder, 0);
+        return buildRowValue((RowType) type.getTrinoType(), fieldBuilders -> {
+            int tuplePosition = 0;
+            List<DataType> udtTypeFieldTypes = udtValue.getType().getFieldTypes();
+            List<CassandraType> argumentTypes = type.getArgumentTypes();
+            for (int i = 0; i < argumentTypes.size(); i++) {
+                CassandraType argumentType = argumentTypes.get(i);
+                BlockBuilder fieldBuilder = fieldBuilders.get(i);
+                int finalTuplePosition = tuplePosition;
+                NullableValue value = getColumnValue(argumentType, udtValue, tuplePosition, () -> udtTypeFieldTypes.get(finalTuplePosition));
+                writeNativeValue(argumentType.getTrinoType(), fieldBuilder, value.getValue());
+                tuplePosition++;
+            }
+        });
     }
 
     // TODO unify with toCqlLiteral
@@ -384,54 +330,25 @@ public String getColumnValueForCql(CassandraType type, Row row, int position)
             return null;
         }
 
-        switch (type.getKind()) {
-            case ASCII:
-            case TEXT:
-            case VARCHAR:
-                return quoteStringLiteral(row.getString(position));
-            case INT:
-                return Integer.toString(row.getInt(position));
-            case SMALLINT:
-                return Short.toString(row.getShort(position));
-            case TINYINT:
-                return Byte.toString(row.getByte(position));
-            case BIGINT:
-            case COUNTER:
-                return Long.toString(row.getLong(position));
-            case BOOLEAN:
-                return Boolean.toString(row.getBool(position));
-            case DOUBLE:
-                return Double.toString(row.getDouble(position));
-            case FLOAT:
-                return Float.toString(row.getFloat(position));
-            case DECIMAL:
-                return row.getBigDecimal(position).toString();
-            case UUID:
-            case TIMEUUID:
-                return row.getUuid(position).toString();
-            case TIME:
-                return quoteStringLiteral(row.getLocalTime(position).toString());
-            case TIMESTAMP:
-                return Long.toString(row.getInstant(position).toEpochMilli());
-            case DATE:
-                return quoteStringLiteral(row.getLocalDate(position).toString());
-            case INET:
-                return quoteStringLiteral(toAddrString(row.getInetAddress(position)));
-            case VARINT:
-                return row.getBigInteger(position).toString();
-            case BLOB:
-            case CUSTOM:
-                return Bytes.toHexString(row.getBytesUnsafe(position));
-
-            case LIST:
-            case SET:
-            case MAP:
-            case TUPLE:
-            case UDT:
-                // unsupported
-                break;
-        }
-        throw new IllegalStateException("Handling of type " + this + " is not implemented");
+        return switch (type.getKind()) {
+            case ASCII, TEXT, VARCHAR -> quoteStringLiteral(row.getString(position));
+            case INT -> Integer.toString(row.getInt(position));
+            case SMALLINT -> Short.toString(row.getShort(position));
+            case TINYINT -> Byte.toString(row.getByte(position));
+            case BIGINT, COUNTER -> Long.toString(row.getLong(position));
+            case BOOLEAN -> Boolean.toString(row.getBool(position));
+            case DOUBLE -> Double.toString(row.getDouble(position));
+            case FLOAT -> Float.toString(row.getFloat(position));
+            case DECIMAL -> row.getBigDecimal(position).toString();
+            case UUID, TIMEUUID -> row.getUuid(position).toString();
+            case TIME -> quoteStringLiteral(row.getLocalTime(position).toString());
+            case TIMESTAMP -> Long.toString(row.getInstant(position).toEpochMilli());
+            case DATE -> quoteStringLiteral(row.getLocalDate(position).toString());
+            case INET -> quoteStringLiteral(toAddrString(row.getInetAddress(position)));
+            case VARINT -> row.getBigInteger(position).toString();
+            case BLOB, CUSTOM -> Bytes.toHexString(row.getBytesUnsafe(position));
+            case LIST, SET, MAP, TUPLE, UDT -> throw new IllegalStateException("Handling of type " + this + " is not implemented");
+        };
     }
 
     // TODO unify with getColumnValueForCql
@@ -458,17 +375,11 @@ public String toCqlLiteral(CassandraType type, Object trinoNativeValue)
             value = trinoNativeValue.toString();
         }
 
-        switch (kind) {
-            case ASCII:
-            case TEXT:
-            case VARCHAR:
-                return quoteStringLiteral(value);
-            case INET:
-                // remove '/' in the string. e.g. /127.0.0.1
-                return quoteStringLiteral(value.substring(1));
-            default:
-                return value;
-        }
+        return switch (kind) {
+            case ASCII, TEXT, VARCHAR -> quoteStringLiteral(value);
+            case INET -> quoteStringLiteral(value.substring(1)); // remove '/' in the string. e.g. /127.0.0.1
+            default -> value;
+        };
     }
 
     private String objectToJson(Object cassandraValue, DataType dataType)
@@ -576,41 +487,6 @@ public Object getJavaValue(CassandraType.Kind kind, Object trinoNativeValue)
         throw new IllegalStateException("Back conversion not implemented for " + this);
     }
 
-    public boolean isSupportedPartitionKey(CassandraType.Kind kind)
-    {
-        switch (kind) {
-            case ASCII:
-            case TEXT:
-            case VARCHAR:
-            case BIGINT:
-            case BOOLEAN:
-            case DOUBLE:
-            case INET:
-            case INT:
-            case TINYINT:
-            case SMALLINT:
-            case FLOAT:
-            case DECIMAL:
-            case DATE:
-            case TIME:
-            case TIMESTAMP:
-            case UUID:
-            case TIMEUUID:
-                return true;
-            case COUNTER:
-            case BLOB:
-            case CUSTOM:
-            case VARINT:
-            case SET:
-            case LIST:
-            case MAP:
-            case TUPLE:
-            case UDT:
-            default:
-                return false;
-        }
-    }
-
     public boolean isFullySupported(DataType dataType)
     {
         if (toCassandraType(dataType).isEmpty()) {
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/ptf/Query.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/ptf/Query.java
index a675312ac117..5fa121920ef5 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/ptf/Query.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/ptf/Query.java
@@ -15,29 +15,32 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.airlift.slice.Slice;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorTableFunction;
 import io.trino.plugin.cassandra.CassandraColumnHandle;
 import io.trino.plugin.cassandra.CassandraMetadata;
 import io.trino.plugin.cassandra.CassandraQueryRelationHandle;
 import io.trino.plugin.cassandra.CassandraTableHandle;
+import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.ptf.AbstractConnectorTableFunction;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-import io.trino.spi.ptf.Descriptor;
-import io.trino.spi.ptf.Descriptor.Field;
-import io.trino.spi.ptf.ScalarArgument;
-import io.trino.spi.ptf.ScalarArgumentSpecification;
-import io.trino.spi.ptf.TableFunctionAnalysis;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-
+import io.trino.spi.function.table.AbstractConnectorTableFunction;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.Descriptor.Field;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.ScalarArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
+
+import java.lang.reflect.UndeclaredThrowableException;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -45,7 +48,8 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.spi.ptf.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
+import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
+import static io.trino.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
 
@@ -88,13 +92,23 @@ public QueryFunction(CassandraMetadata cassandraMetadata)
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             ScalarArgument argument = (ScalarArgument) getOnlyElement(arguments.values());
             String query = ((Slice) argument.getValue()).toStringUtf8();
 
             CassandraQueryRelationHandle queryRelationHandle = new CassandraQueryRelationHandle(query);
-            List<ColumnHandle> columnHandles = cassandraMetadata.getColumnHandles(query);
+            List<ColumnHandle> columnHandles;
+            try {
+                columnHandles = cassandraMetadata.getColumnHandles(query);
+            }
+            catch (UndeclaredThrowableException e) {
+                throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Cannot get column definition", Throwables.getRootCause(e));
+            }
             checkState(!columnHandles.isEmpty(), "Handle doesn't have columns info");
             Descriptor returnedType = new Descriptor(columnHandles.stream()
                     .map(CassandraColumnHandle.class::cast)
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/BaseCassandraConnectorSmokeTest.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/BaseCassandraConnectorSmokeTest.java
index 9e34964f781d..1196d712691f 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/BaseCassandraConnectorSmokeTest.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/BaseCassandraConnectorSmokeTest.java
@@ -16,7 +16,7 @@
 import io.trino.testing.BaseConnectorSmokeTest;
 import io.trino.testing.TestingConnectorBehavior;
 import io.trino.testing.sql.TestTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -32,38 +32,25 @@ public abstract class BaseCassandraConnectorSmokeTest
     public static final String KEYSPACE = "smoke_test";
     public static final ZonedDateTime TIMESTAMP_VALUE = ZonedDateTime.of(1970, 1, 1, 3, 4, 5, 0, ZoneId.of("UTC"));
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_CREATE_VIEW:
-                return false;
-
-            case SUPPORTS_DELETE:
-                return true;
-
-            case SUPPORTS_ARRAY:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ARRAY,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
+    @Test
     @Override
     public void testDeleteAllDataFromTable()
     {
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraClientConfig.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraClientConfig.java
index d647def8b039..ada4ca86577c 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraClientConfig.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraClientConfig.java
@@ -17,7 +17,7 @@
 import com.datastax.oss.driver.api.core.DefaultProtocolVersion;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraColumnHandle.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraColumnHandle.java
index d0823c5e6916..983e554841f1 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraColumnHandle.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraColumnHandle.java
@@ -19,18 +19,16 @@
 import io.airlift.json.ObjectMapperProvider;
 import io.trino.plugin.base.TypeDeserializer;
 import io.trino.spi.type.Type;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static org.testng.Assert.assertEquals;
 
 public class TestCassandraColumnHandle
 {
-    private JsonCodec<CassandraColumnHandle> codec;
+    private final JsonCodec<CassandraColumnHandle> codec;
 
-    @BeforeClass
-    public void setup()
+    public TestCassandraColumnHandle()
     {
         ObjectMapperProvider objectMapperProvider = new ObjectMapperProvider();
         objectMapperProvider.setJsonDeserializers(ImmutableMap.of(Type.class, new TypeDeserializer(TESTING_TYPE_MANAGER)));
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnector.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnector.java
index 174f58d186d0..44bcedea1250 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnector.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnector.java
@@ -19,8 +19,7 @@
 import com.google.common.net.InetAddresses;
 import com.google.common.primitives.Shorts;
 import com.google.common.primitives.SignedBytes;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.SingleRowBlock;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.Connector;
@@ -36,7 +35,6 @@
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.predicate.Domain;
@@ -49,9 +47,11 @@
 import io.trino.testing.TestingConnectorContext;
 import io.trino.testing.TestingConnectorSession;
 import io.trino.type.IpAddressType;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -87,11 +87,13 @@
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
+@TestInstance(PER_CLASS)
 public class TestCassandraConnector
 {
     protected static final String INVALID_DATABASE = "totally_invalid_database";
@@ -109,7 +111,7 @@ public class TestCassandraConnector
     private ConnectorSplitManager splitManager;
     private ConnectorRecordSetProvider recordSetProvider;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
             throws Exception
     {
@@ -143,7 +145,7 @@ public void setup()
         tableUdt = new SchemaTableName(database, TABLE_USER_DEFINED_TYPE.toLowerCase(ENGLISH));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         server.close();
@@ -163,8 +165,8 @@ public void testGetTableNames()
         assertTrue(tables.contains(table));
     }
 
-    // disabled until metadata manager is updated to handle invalid catalogs and schemas
-    @Test(enabled = false, expectedExceptions = SchemaNotFoundException.class)
+    @Test
+    @Disabled // disabled until metadata manager is updated to handle invalid catalogs and schemas
     public void testGetTableNamesException()
     {
         metadata.listTables(SESSION, Optional.of(INVALID_DATABASE));
@@ -283,14 +285,15 @@ public void testGetTupleType()
                     String keyValue = cursor.getSlice(columnIndex.get("key")).toStringUtf8();
                     assertEquals(keyValue, Long.toString(rowNumber));
 
-                    SingleRowBlock tupleValueBlock = (SingleRowBlock) cursor.getObject(columnIndex.get("typetuple"));
-                    assertThat(tupleValueBlock.getPositionCount()).isEqualTo(3);
+                    SqlRow tupleValueBlock = (SqlRow) cursor.getObject(columnIndex.get("typetuple"));
+                    assertThat(tupleValueBlock.getFieldCount()).isEqualTo(3);
 
                     CassandraColumnHandle tupleColumnHandle = (CassandraColumnHandle) columnHandles.get(columnIndex.get("typetuple"));
                     List<CassandraType> tupleArgumentTypes = tupleColumnHandle.getCassandraType().getArgumentTypes();
-                    assertThat(tupleArgumentTypes.get(0).getTrinoType().getLong(tupleValueBlock, 0)).isEqualTo(rowNumber);
-                    assertThat(tupleArgumentTypes.get(1).getTrinoType().getSlice(tupleValueBlock, 1).toStringUtf8()).isEqualTo("text-" + rowNumber);
-                    assertThat(tupleArgumentTypes.get(2).getTrinoType().getLong(tupleValueBlock, 2)).isEqualTo(Float.floatToRawIntBits(1.11f * rowNumber));
+                    int rawIndex = tupleValueBlock.getRawIndex();
+                    assertThat(tupleArgumentTypes.get(0).getTrinoType().getLong(tupleValueBlock.getRawFieldBlock(0), rawIndex)).isEqualTo(rowNumber);
+                    assertThat(tupleArgumentTypes.get(1).getTrinoType().getSlice(tupleValueBlock.getRawFieldBlock(1), rawIndex).toStringUtf8()).isEqualTo("text-" + rowNumber);
+                    assertThat(tupleArgumentTypes.get(2).getTrinoType().getLong(tupleValueBlock.getRawFieldBlock(2), rawIndex)).isEqualTo(Float.floatToRawIntBits(1.11f * rowNumber));
 
                     long newCompletedBytes = cursor.getCompletedBytes();
                     assertTrue(newCompletedBytes >= completedBytes);
@@ -332,34 +335,35 @@ public void testGetUserDefinedType()
 
                     rowNumber++;
 
-                    String keyValue = cursor.getSlice(columnIndex.get("key")).toStringUtf8();
-                    SingleRowBlock udtValue = (SingleRowBlock) cursor.getObject(columnIndex.get("typeudt"));
-
-                    assertEquals(keyValue, "key");
-                    assertEquals(VARCHAR.getSlice(udtValue, 0).toStringUtf8(), "text");
-                    assertEquals(trinoUuidToJavaUuid(UUID.getSlice(udtValue, 1)).toString(), "01234567-0123-0123-0123-0123456789ab");
-                    assertEquals(INTEGER.getLong(udtValue, 2), -2147483648);
-                    assertEquals(BIGINT.getLong(udtValue, 3), -9223372036854775808L);
-                    assertEquals(VARBINARY.getSlice(udtValue, 4).toStringUtf8(), "01234");
-                    assertEquals(TIMESTAMP_MILLIS.getLong(udtValue, 5), 117964800000L);
-                    assertEquals(VARCHAR.getSlice(udtValue, 6).toStringUtf8(), "ansi");
-                    assertTrue(BOOLEAN.getBoolean(udtValue, 7));
-                    assertEquals(DOUBLE.getDouble(udtValue, 8), 99999999999999997748809823456034029568D);
-                    assertEquals(DOUBLE.getDouble(udtValue, 9), 4.9407e-324);
-                    assertEquals(REAL.getObjectValue(SESSION, udtValue, 10), 1.4E-45f);
-                    assertEquals(InetAddresses.toAddrString(InetAddress.getByAddress(IpAddressType.IPADDRESS.getSlice(udtValue, 11).getBytes())), "0.0.0.0");
-                    assertEquals(VARCHAR.getSlice(udtValue, 12).toStringUtf8(), "varchar");
-                    assertEquals(VARCHAR.getSlice(udtValue, 13).toStringUtf8(), "-9223372036854775808");
-                    assertEquals(trinoUuidToJavaUuid(UUID.getSlice(udtValue, 14)).toString(), "d2177dd0-eaa2-11de-a572-001b779c76e3");
-                    assertEquals(VARCHAR.getSlice(udtValue, 15).toStringUtf8(), "[\"list\"]");
-                    assertEquals(VARCHAR.getSlice(udtValue, 16).toStringUtf8(), "{\"map\":1}");
-                    assertEquals(VARCHAR.getSlice(udtValue, 17).toStringUtf8(), "[true]");
-                    SingleRowBlock tupleValueBlock = (SingleRowBlock) udtValue.getObject(18, Block.class);
-                    assertThat(tupleValueBlock.getPositionCount()).isEqualTo(1);
-                    assertThat(INTEGER.getLong(tupleValueBlock, 0)).isEqualTo(123);
-                    SingleRowBlock udtValueBlock = (SingleRowBlock) udtValue.getObject(19, Block.class);
-                    assertThat(udtValueBlock.getPositionCount()).isEqualTo(1);
-                    assertThat(INTEGER.getLong(udtValueBlock, 0)).isEqualTo(999);
+                    String key = cursor.getSlice(columnIndex.get("key")).toStringUtf8();
+                    SqlRow value = (SqlRow) cursor.getObject(columnIndex.get("typeudt"));
+                    int valueRawIndex = value.getRawIndex();
+
+                    assertEquals(key, "key");
+                    assertEquals(VARCHAR.getSlice(value.getRawFieldBlock(0), valueRawIndex).toStringUtf8(), "text");
+                    assertEquals(trinoUuidToJavaUuid(UUID.getSlice(value.getRawFieldBlock(1), valueRawIndex)).toString(), "01234567-0123-0123-0123-0123456789ab");
+                    assertEquals(INTEGER.getInt(value.getRawFieldBlock(2), valueRawIndex), -2147483648);
+                    assertEquals(BIGINT.getLong(value.getRawFieldBlock(3), valueRawIndex), -9223372036854775808L);
+                    assertEquals(VARBINARY.getSlice(value.getRawFieldBlock(4), valueRawIndex).toStringUtf8(), "01234");
+                    assertEquals(TIMESTAMP_MILLIS.getLong(value.getRawFieldBlock(5), valueRawIndex), 117964800000L);
+                    assertEquals(VARCHAR.getSlice(value.getRawFieldBlock(6), valueRawIndex).toStringUtf8(), "ansi");
+                    assertTrue(BOOLEAN.getBoolean(value.getRawFieldBlock(7), valueRawIndex));
+                    assertEquals(DOUBLE.getDouble(value.getRawFieldBlock(8), valueRawIndex), 99999999999999997748809823456034029568D);
+                    assertEquals(DOUBLE.getDouble(value.getRawFieldBlock(9), valueRawIndex), 4.9407e-324);
+                    assertEquals(REAL.getObjectValue(SESSION, value.getRawFieldBlock(10), valueRawIndex), 1.4E-45f);
+                    assertEquals(InetAddresses.toAddrString(InetAddress.getByAddress(IpAddressType.IPADDRESS.getSlice(value.getRawFieldBlock(11), valueRawIndex).getBytes())), "0.0.0.0");
+                    assertEquals(VARCHAR.getSlice(value.getRawFieldBlock(12), valueRawIndex).toStringUtf8(), "varchar");
+                    assertEquals(VARCHAR.getSlice(value.getRawFieldBlock(13), valueRawIndex).toStringUtf8(), "-9223372036854775808");
+                    assertEquals(trinoUuidToJavaUuid(UUID.getSlice(value.getRawFieldBlock(14), valueRawIndex)).toString(), "d2177dd0-eaa2-11de-a572-001b779c76e3");
+                    assertEquals(VARCHAR.getSlice(value.getRawFieldBlock(15), valueRawIndex).toStringUtf8(), "[\"list\"]");
+                    assertEquals(VARCHAR.getSlice(value.getRawFieldBlock(16), valueRawIndex).toStringUtf8(), "{\"map\":1}");
+                    assertEquals(VARCHAR.getSlice(value.getRawFieldBlock(17), valueRawIndex).toStringUtf8(), "[true]");
+                    SqlRow tupleValue = value.getRawFieldBlock(18).getObject(valueRawIndex, SqlRow.class);
+                    assertThat(tupleValue.getFieldCount()).isEqualTo(1);
+                    assertThat(INTEGER.getInt(tupleValue.getRawFieldBlock(0), tupleValue.getRawIndex())).isEqualTo(123);
+                    SqlRow udtValue = value.getRawFieldBlock(19).getObject(valueRawIndex, SqlRow.class);
+                    assertThat(udtValue.getFieldCount()).isEqualTo(1);
+                    assertThat(INTEGER.getInt(udtValue.getRawFieldBlock(0), tupleValue.getRawIndex())).isEqualTo(999);
 
                     long newCompletedBytes = cursor.getCompletedBytes();
                     assertTrue(newCompletedBytes >= completedBytes);
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java
index bf256e8006a8..be2e072870be 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java
@@ -86,48 +86,29 @@ public class TestCassandraConnectorTest
     private CassandraServer server;
     private CassandraSession session;
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN:
-            case SUPPORTS_RENAME_COLUMN:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_CREATE_VIEW:
-                return false;
-
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return false;
-
-            case SUPPORTS_DELETE:
-            case SUPPORTS_TRUNCATE:
-                return true;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN,
+                    SUPPORTS_ARRAY,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_RENAME_COLUMN,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -190,7 +171,7 @@ protected String dataMappingTableName(String trinoTypeName)
         return "tmp_trino_" + System.nanoTime();
     }
 
-    @Test
+    @org.junit.jupiter.api.Test
     @Override
     public void testShowColumns()
     {
@@ -1411,29 +1392,35 @@ public void testNativeQueryColumnAliasNotFound()
     @Test
     public void testNativeQuerySelectFromTestTable()
     {
-        String tableName = "tpch.test_select" + randomNameSuffix();
-        onCassandra("CREATE TABLE " + tableName + "(col BIGINT PRIMARY KEY)");
+        String tableName = "test_select" + randomNameSuffix();
+        onCassandra("CREATE TABLE tpch." + tableName + "(col BIGINT PRIMARY KEY)");
+        onCassandra("INSERT INTO tpch." + tableName + "(col) VALUES (1)");
+        assertContainsEventually(() -> execute("SHOW TABLES FROM cassandra.tpch"), resultBuilder(getSession(), createUnboundedVarcharType())
+                .row(tableName)
+                .build(), new Duration(1, MINUTES));
 
-        onCassandra("INSERT INTO " + tableName + "(col) VALUES (1)");
         assertQuery(
-                "SELECT * FROM TABLE(cassandra.system.query(query => 'SELECT * FROM " + tableName + "'))",
+                "SELECT * FROM TABLE(cassandra.system.query(query => 'SELECT * FROM tpch." + tableName + "'))",
                 "VALUES 1");
 
-        onCassandra("DROP TABLE " + tableName);
+        onCassandra("DROP TABLE tpch." + tableName);
     }
 
     @Test
     public void testNativeQueryCaseSensitivity()
     {
-        String tableName = "tpch.test_case" + randomNameSuffix();
-        onCassandra("CREATE TABLE " + tableName + "(col_case BIGINT PRIMARY KEY, \"COL_CASE\" BIGINT)");
+        String tableName = "test_case" + randomNameSuffix();
+        onCassandra("CREATE TABLE tpch." + tableName + "(col_case BIGINT PRIMARY KEY, \"COL_CASE\" BIGINT)");
+        onCassandra("INSERT INTO tpch." + tableName + "(col_case, \"COL_CASE\") VALUES (1, 2)");
+        assertContainsEventually(() -> execute("SHOW TABLES FROM cassandra.tpch"), resultBuilder(getSession(), createUnboundedVarcharType())
+                .row(tableName)
+                .build(), new Duration(1, MINUTES));
 
-        onCassandra("INSERT INTO " + tableName + "(col_case, \"COL_CASE\") VALUES (1, 2)");
         assertQuery(
-                "SELECT * FROM TABLE(cassandra.system.query(query => 'SELECT * FROM " + tableName + "'))",
+                "SELECT * FROM TABLE(cassandra.system.query(query => 'SELECT * FROM tpch." + tableName + "'))",
                 "VALUES (1, 2)");
 
-        onCassandra("DROP TABLE " + tableName);
+        onCassandra("DROP TABLE tpch." + tableName);
     }
 
     @Test
@@ -1452,7 +1439,8 @@ public void testNativeQueryPreparingStatementFailure()
         String tableName = "test_insert" + randomNameSuffix();
         assertFalse(getQueryRunner().tableExists(getSession(), tableName));
         assertThatThrownBy(() -> query("SELECT * FROM TABLE(cassandra.system.query(query => 'INSERT INTO tpch." + tableName + "(col) VALUES (1)'))"))
-                .hasMessageContaining("unconfigured table");
+                .hasMessage("Cannot get column definition")
+                .hasStackTraceContaining("unconfigured table");
     }
 
     @Test
@@ -1461,6 +1449,9 @@ public void testNativeQueryUnsupportedStatement()
         String tableName = "test_unsupported_statement" + randomNameSuffix();
         onCassandra("CREATE TABLE tpch." + tableName + "(col INT PRIMARY KEY)");
         onCassandra("INSERT INTO tpch." + tableName + "(col) VALUES (1)");
+        assertContainsEventually(() -> execute("SHOW TABLES FROM cassandra.tpch"), resultBuilder(getSession(), createUnboundedVarcharType())
+                .row(tableName)
+                .build(), new Duration(1, MINUTES));
 
         assertThatThrownBy(() -> query("SELECT * FROM TABLE(cassandra.system.query(query => 'INSERT INTO tpch." + tableName + "(col) VALUES (3)'))"))
                 .hasMessage("Handle doesn't have columns info");
@@ -1476,7 +1467,8 @@ public void testNativeQueryUnsupportedStatement()
     public void testNativeQueryIncorrectSyntax()
     {
         assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'some wrong syntax'))"))
-                .hasMessageContaining("no viable alternative at input 'some'");
+                .hasMessage("Cannot get column definition")
+                .hasStackTraceContaining("no viable alternative at input 'some'");
     }
 
     @Override
@@ -1577,7 +1569,7 @@ private void assertSelect(String tableName)
         }
     }
 
-    private MaterializedResult execute(String sql)
+    private MaterializedResult execute(@Language("SQL") String sql)
     {
         return getQueryRunner().execute(SESSION, sql);
     }
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraProtocolVersionV3ConnectorSmokeTest.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraProtocolVersionV3ConnectorSmokeTest.java
index 7dd1953b3ab7..4e519d814a4f 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraProtocolVersionV3ConnectorSmokeTest.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraProtocolVersionV3ConnectorSmokeTest.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.TestTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Timestamp;
 
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraSplit.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraSplit.java
index 6f5a12bb0ddd..8245e79dcc0b 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraSplit.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraSplit.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.json.JsonCodec;
 import io.trino.spi.HostAddress;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTableHandle.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTableHandle.java
index f16884ae9763..bc7bf9c8b085 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTableHandle.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTableHandle.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.cassandra;
 
 import io.airlift.json.JsonCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTokenSplitManager.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTokenSplitManager.java
index 3ebc230fbc78..2cb21ddd41a1 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTokenSplitManager.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTokenSplitManager.java
@@ -14,9 +14,10 @@
 package io.trino.plugin.cassandra;
 
 import io.trino.plugin.cassandra.CassandraTokenSplitManager.TokenSplit;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Optional;
@@ -24,8 +25,10 @@
 import static io.trino.plugin.cassandra.CassandraTestingUtils.createKeyspace;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestCassandraTokenSplitManager
 {
     private static final int SPLIT_SIZE = 100;
@@ -36,7 +39,7 @@ public class TestCassandraTokenSplitManager
     private CassandraSession session;
     private CassandraTokenSplitManager splitManager;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -46,7 +49,7 @@ public void setUp()
         splitManager = new CassandraTokenSplitManager(session, SPLIT_SIZE, Optional.empty());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         server.close();
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTypeManager.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTypeManager.java
index dc89524abbf5..7ddb7f30b68e 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTypeManager.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTypeManager.java
@@ -18,7 +18,7 @@
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTypeMapping.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTypeMapping.java
index 7081bcaca1fb..6894781f8369 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTypeMapping.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTypeMapping.java
@@ -28,10 +28,10 @@
 import io.trino.testing.datatype.SqlDataTypeTest;
 import io.trino.testing.sql.TrinoSqlExecutor;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -68,7 +68,9 @@
 import static java.lang.String.format;
 import static java.time.ZoneOffset.UTC;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestCassandraTypeMapping
         extends AbstractTestQueryFramework
 {
@@ -99,7 +101,7 @@ public class TestCassandraTypeMapping
     private CassandraServer server;
     private CassandraSession session;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         checkState(jvmZone.getId().equals("America/Bahia_Banderas"), "This test assumes certain JVM time zone");
@@ -147,7 +149,7 @@ protected QueryRunner createQueryRunner()
                 ImmutableList.of());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanUp()
     {
         session.close();
@@ -473,21 +475,23 @@ public void testTrinoVarbinary()
                 .execute(getQueryRunner(), trinoCreateAndInsert("test_varbinary"));
     }
 
-    @Test(dataProvider = "sessionZonesDataProvider")
-    public void testDate(ZoneId sessionZone)
+    @Test
+    public void testDate()
     {
-        Session session = Session.builder(getSession())
-                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
-                .build();
+        for (ZoneId sessionZone : timezones()) {
+            Session session = Session.builder(getSession())
+                    .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                    .build();
 
-        dateTest(Function.identity())
-                .execute(getQueryRunner(), session, cassandraCreateAndInsert("tpch.test_date"));
+            dateTest(Function.identity())
+                    .execute(getQueryRunner(), session, cassandraCreateAndInsert("tpch.test_date"));
 
-        dateTest(inputLiteral -> format("DATE %s", inputLiteral))
-                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_date"))
-                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_date"))
-                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_date"))
-                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_date"));
+            dateTest(inputLiteral -> format("DATE %s", inputLiteral))
+                    .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_date"))
+                    .execute(getQueryRunner(), session, trinoCreateAsSelect("test_date"))
+                    .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_date"))
+                    .execute(getQueryRunner(), session, trinoCreateAndInsert("test_date"));
+        }
     }
 
     private SqlDataTypeTest dateTest(Function<String, String> inputLiteralFactory)
@@ -509,24 +513,26 @@ private SqlDataTypeTest dateTest(Function<String, String> inputLiteralFactory)
                 .addRoundTrip("date", inputLiteralFactory.apply("'5881580-07-11'"), DATE, "DATE '5881580-07-11'"); // max value in Cassandra and Trino
     }
 
-    @Test(dataProvider = "sessionZonesDataProvider")
-    public void testTime(ZoneId sessionZone)
+    @Test
+    public void testTime()
     {
-        LocalTime timeGapInJvmZone = LocalTime.of(0, 12, 34, 567_000_000);
-        checkIsGap(jvmZone, timeGapInJvmZone.atDate(LocalDate.ofEpochDay(0)));
+        for (ZoneId sessionZone : timezones()) {
+            LocalTime timeGapInJvmZone = LocalTime.of(0, 12, 34, 567_000_000);
+            checkIsGap(jvmZone, timeGapInJvmZone.atDate(LocalDate.ofEpochDay(0)));
 
-        Session session = Session.builder(getSession())
-                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
-                .build();
+            Session session = Session.builder(getSession())
+                    .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                    .build();
 
-        timeTypeTest("time(9)", trinoTimeInputLiteralFactory())
-                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_time"))
-                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_time"))
-                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_time"))
-                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_time"));
+            timeTypeTest("time(9)", trinoTimeInputLiteralFactory())
+                    .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_time"))
+                    .execute(getQueryRunner(), session, trinoCreateAsSelect("test_time"))
+                    .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_time"))
+                    .execute(getQueryRunner(), session, trinoCreateAndInsert("test_time"));
 
-        timeTypeTest("time", cassandraTimeInputLiteralFactory())
-                .execute(getQueryRunner(), session, cassandraCreateAndInsert("tpch.test_time"));
+            timeTypeTest("time", cassandraTimeInputLiteralFactory())
+                    .execute(getQueryRunner(), session, cassandraCreateAndInsert("tpch.test_time"));
+        }
     }
 
     private static SqlDataTypeTest timeTypeTest(String inputType, Function<String, String> inputLiteralFactory)
@@ -543,30 +549,34 @@ private static SqlDataTypeTest timeTypeTest(String inputType, Function<String, S
                 .addRoundTrip(inputType, inputLiteralFactory.apply("NULL"), createTimeType(9), "CAST(NULL AS TIME(9))");
     }
 
-    @Test(dataProvider = "sessionZonesDataProvider")
-    public void testCassandraTimestamp(ZoneId sessionZone)
+    @Test
+    public void testCassandraTimestamp()
     {
-        Session session = Session.builder(getSession())
-                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
-                .build();
+        for (ZoneId sessionZone : timezones()) {
+            Session session = Session.builder(getSession())
+                    .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                    .build();
 
-        timestampTest("timestamp", cassandraTimestampInputLiteralFactory(), timestampExpectedLiteralFactory())
-                .addRoundTrip("timestamp", "-1", TIMESTAMP_TZ_MILLIS, "AT_TIMEZONE(TIMESTAMP '1969-12-31 23:59:59.999 UTC', 'UTC')") // negative timestamp
-                .execute(getQueryRunner(), session, cassandraCreateAndInsert("tpch.test_cassandra_timestamp"));
+            timestampTest("timestamp", cassandraTimestampInputLiteralFactory(), timestampExpectedLiteralFactory())
+                    .addRoundTrip("timestamp", "-1", TIMESTAMP_TZ_MILLIS, "AT_TIMEZONE(TIMESTAMP '1969-12-31 23:59:59.999 UTC', 'UTC')") // negative timestamp
+                    .execute(getQueryRunner(), session, cassandraCreateAndInsert("tpch.test_cassandra_timestamp"));
+        }
     }
 
-    @Test(dataProvider = "sessionZonesDataProvider")
-    public void testTrinoTimestampWithTimeZone(ZoneId sessionZone)
-    {
-        Session session = Session.builder(getSession())
-                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
-                .build();
-
-        timestampTest("timestamp with time zone", trinoTimestampInputLiteralFactory(), timestampExpectedLiteralFactory())
-                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_trino_timestamp_with_time_zone"))
-                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_trino_timestamp_with_time_zone"))
-                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_trino_timestamp_with_time_zone"))
-                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_trino_timestamp_with_time_zone"));
+    @Test
+    public void testTrinoTimestampWithTimeZone()
+    {
+        for (ZoneId sessionZone : timezones()) {
+            Session session = Session.builder(getSession())
+                    .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                    .build();
+
+            timestampTest("timestamp with time zone", trinoTimestampInputLiteralFactory(), timestampExpectedLiteralFactory())
+                    .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_trino_timestamp_with_time_zone"))
+                    .execute(getQueryRunner(), session, trinoCreateAsSelect("test_trino_timestamp_with_time_zone"))
+                    .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_trino_timestamp_with_time_zone"))
+                    .execute(getQueryRunner(), session, trinoCreateAndInsert("test_trino_timestamp_with_time_zone"));
+        }
     }
 
     private SqlDataTypeTest timestampTest(String inputType, BiFunction<LocalDateTime, ZoneId, String> inputLiteralFactory, BiFunction<LocalDateTime, ZoneId, String> expectedLiteralFactory)
@@ -592,17 +602,15 @@ private SqlDataTypeTest timestampTest(String inputType, BiFunction<LocalDateTime
         return tests;
     }
 
-    @DataProvider
-    public Object[][] sessionZonesDataProvider()
+    public List<ZoneId> timezones()
     {
-        return new Object[][] {
-                {UTC},
-                {jvmZone},
+        return ImmutableList.of(
+                UTC,
+                jvmZone,
                 // using two non-JVM zones so that we don't need to worry what Cassandra system zone is
-                {vilnius},
-                {kathmandu},
-                {TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
-        };
+                vilnius,
+                kathmandu,
+                TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId());
     }
 
     @Test
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestJsonCassandraHandles.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestJsonCassandraHandles.java
index 28882db335e8..9bcc9d9e85de 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestJsonCassandraHandles.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestJsonCassandraHandles.java
@@ -21,7 +21,7 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestMurmur3PartitionerTokenRing.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestMurmur3PartitionerTokenRing.java
index 9c252a727d44..c70e9d7759de 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestMurmur3PartitionerTokenRing.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestMurmur3PartitionerTokenRing.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.cassandra;
 
 import com.datastax.oss.driver.internal.core.metadata.token.Murmur3Token;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigInteger;
 
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestRandomPartitionerTokenRing.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestRandomPartitionerTokenRing.java
index 4776da96f169..ee2ae94a2c2c 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestRandomPartitionerTokenRing.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestRandomPartitionerTokenRing.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.cassandra;
 
 import com.datastax.oss.driver.internal.core.metadata.token.RandomToken;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigInteger;
 
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/util/TestCassandraClusteringPredicatesExtractor.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/util/TestCassandraClusteringPredicatesExtractor.java
index 3570cfb64ecc..44833901f10b 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/util/TestCassandraClusteringPredicatesExtractor.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/util/TestCassandraClusteringPredicatesExtractor.java
@@ -24,8 +24,7 @@
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.cassandra.CassandraTestingUtils.CASSANDRA_TYPE_MANAGER;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -33,16 +32,14 @@
 
 public class TestCassandraClusteringPredicatesExtractor
 {
-    private static CassandraColumnHandle col1;
-    private static CassandraColumnHandle col2;
-    private static CassandraColumnHandle col3;
-    private static CassandraColumnHandle col4;
-    private static CassandraTable cassandraTable;
-    private static Version cassandraVersion;
+    private static final CassandraColumnHandle col1;
+    private static final CassandraColumnHandle col2;
+    private static final CassandraColumnHandle col3;
+    private static final CassandraColumnHandle col4;
+    private static final CassandraTable cassandraTable;
+    private static final Version cassandraVersion;
 
-    @BeforeTest
-    public void setUp()
-    {
+    static {
         col1 = new CassandraColumnHandle("partitionKey1", 1, CassandraTypes.BIGINT, true, false, false, false);
         col2 = new CassandraColumnHandle("clusteringKey1", 2, CassandraTypes.BIGINT, false, true, false, false);
         col3 = new CassandraColumnHandle("clusteringKey2", 3, CassandraTypes.BIGINT, false, true, false, false);
diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/util/TestHostAddressFactory.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/util/TestHostAddressFactory.java
index 8a52fd6d4b33..41ff67cd1b6e 100644
--- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/util/TestHostAddressFactory.java
+++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/util/TestHostAddressFactory.java
@@ -22,7 +22,7 @@
 import com.datastax.oss.driver.internal.core.metadata.DefaultNode;
 import com.google.common.collect.ImmutableSet;
 import io.trino.spi.HostAddress;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
diff --git a/plugin/trino-clickhouse/pom.xml b/plugin/trino-clickhouse/pom.xml
index 94578a112116..c557f2f8dfa6 100644
--- a/plugin/trino-clickhouse/pom.xml
+++ b/plugin/trino-clickhouse/pom.xml
@@ -5,19 +5,40 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-clickhouse</artifactId>
-    <description>Trino - ClickHouse Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - ClickHouse Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.clickhouse</groupId>
+            <artifactId>clickhouse-jdbc</artifactId>
+            <classifier>all</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -29,42 +50,46 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.clickhouse</groupId>
-            <artifactId>clickhouse-jdbc</artifactId>
-            <classifier>all</classifier>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>log</artifactId>
@@ -77,32 +102,18 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -147,12 +158,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -165,6 +170,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>clickhouse</artifactId>
@@ -189,4 +200,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java
index 34301bbaa6b7..fb50bcc386b7 100644
--- a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java
+++ b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java
@@ -23,10 +23,12 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.InetAddresses;
 import com.google.common.primitives.Shorts;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.plugin.base.aggregation.AggregateFunctionRewriter;
 import io.trino.plugin.base.aggregation.AggregateFunctionRule;
 import io.trino.plugin.base.expression.ConnectorExpressionRewriter;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcClient;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ColumnMapping;
@@ -50,7 +52,6 @@
 import io.trino.plugin.jdbc.expression.JdbcConnectorExpressionRewriterBuilder;
 import io.trino.plugin.jdbc.expression.ParameterizedExpression;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
@@ -68,9 +69,7 @@
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
+import jakarta.annotation.Nullable;
 
 import java.io.UncheckedIOException;
 import java.math.BigDecimal;
@@ -79,6 +78,7 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.sql.Connection;
+import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -87,6 +87,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -149,6 +150,7 @@
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.StandardErrorCode.INVALID_TABLE_PROPERTY;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_EMPTY;
 import static io.trino.spi.connector.ConnectorMetadata.MODIFYING_ROWS_MESSAGE;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -243,6 +245,26 @@ public boolean supportsAggregationPushdown(ConnectorSession session, JdbcTableHa
         return preventTextualTypeAggregationPushdown(groupingSets);
     }
 
+    @Override
+    public ResultSet getTables(Connection connection, Optional<String> schemaName, Optional<String> tableName)
+            throws SQLException
+    {
+        // Clickhouse maps their "database" to SQL catalogs and does not have schemas
+        DatabaseMetaData metadata = connection.getMetaData();
+        return metadata.getTables(
+                schemaName.orElse(null),
+                null,
+                escapeObjectNameForMetadataQuery(tableName, metadata.getSearchStringEscape()).orElse(null),
+                getTableTypes().map(types -> types.toArray(String[]::new)).orElse(null));
+    }
+
+    @Override
+    protected String getTableSchemaName(ResultSet resultSet)
+            throws SQLException
+    {
+        return resultSet.getString("TABLE_CAT");
+    }
+
     private static Optional<JdbcTypeHandle> toTypeHandle(DecimalType decimalType)
     {
         return Optional.of(new JdbcTypeHandle(Types.DECIMAL, Optional.of("Decimal"), Optional.of(decimalType.getPrecision()), Optional.of(decimalType.getScale()), Optional.empty(), Optional.empty()));
@@ -255,6 +277,9 @@ protected String quoted(@Nullable String catalog, @Nullable String schema, Strin
         if (!isNullOrEmpty(schema)) {
             sb.append(quoted(schema)).append(".");
         }
+        else if (!isNullOrEmpty(catalog)) {
+            sb.append(quoted(catalog)).append(".");
+        }
         sb.append(quoted(table));
         return sb.toString();
     }
@@ -278,6 +303,26 @@ protected void copyTableSchema(ConnectorSession session, Connection connection,
         }
     }
 
+    @Override
+    public Collection<String> listSchemas(Connection connection)
+    {
+        // for Clickhouse, we need to list catalogs instead of schemas
+        try (ResultSet resultSet = connection.getMetaData().getCatalogs()) {
+            ImmutableSet.Builder<String> schemaNames = ImmutableSet.builder();
+            while (resultSet.next()) {
+                String schemaName = resultSet.getString("TABLE_CAT");
+                // skip internal schemas
+                if (filterSchema(schemaName)) {
+                    schemaNames.add(schemaName);
+                }
+            }
+            return schemaNames.build();
+        }
+        catch (SQLException e) {
+            throw new TrinoException(JDBC_ERROR, e);
+        }
+    }
+
     @Override
     public Optional<String> getTableComment(ResultSet resultSet)
             throws SQLException
@@ -315,7 +360,7 @@ public Map<String, Object> getTableProperties(ConnectorSession session, JdbcTabl
                         "SELECT engine, sorting_key, partition_key, primary_key, sampling_key " +
                         "FROM system.tables " +
                         "WHERE database = ? AND name = ?")) {
-            statement.setString(1, tableHandle.asPlainTable().getRemoteTableName().getSchemaName().orElse(null));
+            statement.setString(1, tableHandle.asPlainTable().getRemoteTableName().getCatalogName().orElse(null));
             statement.setString(2, tableHandle.asPlainTable().getRemoteTableName().getTableName());
 
             try (ResultSet resultSet = statement.executeQuery()) {
@@ -407,9 +452,17 @@ protected void createSchema(ConnectorSession session, Connection connection, Str
     }
 
     @Override
-    protected void dropSchema(ConnectorSession session, Connection connection, String remoteSchemaName)
+    protected void dropSchema(ConnectorSession session, Connection connection, String remoteSchemaName, boolean cascade)
             throws SQLException
     {
+        // ClickHouse always deletes all tables inside the database https://clickhouse.com/docs/en/sql-reference/statements/drop
+        if (!cascade) {
+            try (ResultSet tables = getTables(connection, Optional.of(remoteSchemaName), Optional.empty())) {
+                if (tables.next()) {
+                    throw new TrinoException(SCHEMA_NOT_EMPTY, "Cannot drop non-empty schema '%s'".formatted(remoteSchemaName));
+                }
+            }
+        }
         execute(session, connection, "DROP DATABASE " + quoted(remoteSchemaName));
     }
 
@@ -424,7 +477,7 @@ protected void renameSchema(ConnectorSession session, Connection connection, Str
     public void addColumn(ConnectorSession session, JdbcTableHandle handle, ColumnMetadata column)
     {
         try (Connection connection = connectionFactory.openConnection(session)) {
-            String remoteColumnName = getIdentifierMapping().toRemoteColumnName(connection, column.getName());
+            String remoteColumnName = getIdentifierMapping().toRemoteColumnName(getRemoteIdentifiers(connection), column.getName());
             String sql = format(
                     "ALTER TABLE %s ADD COLUMN %s",
                     quoted(handle.asPlainTable().getRemoteTableName()),
@@ -479,11 +532,9 @@ protected Optional<List<String>> getTableTypes()
     protected void renameTable(ConnectorSession session, Connection connection, String catalogName, String remoteSchemaName, String remoteTableName, String newRemoteSchemaName, String newRemoteTableName)
             throws SQLException
     {
-        execute(session, connection, format("RENAME TABLE %s.%s TO %s.%s",
-                quoted(remoteSchemaName),
-                quoted(remoteTableName),
-                quoted(newRemoteSchemaName),
-                quoted(newRemoteTableName)));
+        execute(session, connection, format("RENAME TABLE %s TO %s",
+                quoted(catalogName, remoteSchemaName, remoteTableName),
+                quoted(catalogName, newRemoteSchemaName, newRemoteTableName)));
     }
 
     @Override
@@ -505,6 +556,12 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
         throw new TrinoException(NOT_SUPPORTED, MODIFYING_ROWS_MESSAGE);
     }
 
+    @Override
+    public OptionalLong update(ConnectorSession session, JdbcTableHandle handle)
+    {
+        throw new TrinoException(NOT_SUPPORTED, MODIFYING_ROWS_MESSAGE);
+    }
+
     @Override
     public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connection connection, JdbcTypeHandle typeHandle)
     {
diff --git a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClientModule.java b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClientModule.java
index a203b809ebe1..a343b3f6d981 100644
--- a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClientModule.java
+++ b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClientModule.java
@@ -20,6 +20,7 @@
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
 import io.airlift.configuration.ConfigBinder;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DecimalModule;
@@ -54,11 +55,11 @@ public void configure(Binder binder)
     @Provides
     @Singleton
     @ForBaseJdbc
-    public static ConnectionFactory createConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider)
+    public static ConnectionFactory createConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider, OpenTelemetry openTelemetry)
     {
         Properties properties = new Properties();
         // The connector expects byte array for FixedString and String types
         properties.setProperty(USE_BINARY_STRING.getKey(), "true");
-        return new ClickHouseConnectionFactory(new DriverConnectionFactory(new ClickHouseDriver(), config.getConnectionUrl(), properties, credentialProvider));
+        return new ClickHouseConnectionFactory(new DriverConnectionFactory(new ClickHouseDriver(), config.getConnectionUrl(), properties, credentialProvider, openTelemetry));
     }
 }
diff --git a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseConnectionFactory.java b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseConnectionFactory.java
index c916a8752966..36638eb7a6fa 100644
--- a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseConnectionFactory.java
+++ b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseConnectionFactory.java
@@ -16,8 +16,7 @@
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.ForwardingConnection;
 import io.trino.spi.connector.ConnectorSession;
-
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseSessionProperties.java b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseSessionProperties.java
index 5e9a46aa0012..61fb670c1959 100644
--- a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseSessionProperties.java
+++ b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseSessionProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.clickhouse;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.spi.session.PropertyMetadata.booleanProperty;
diff --git a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseTableProperties.java b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseTableProperties.java
index 780293095b99..8451658e05b4 100644
--- a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseTableProperties.java
+++ b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseTableProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.clickhouse;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.jdbc.TablePropertiesProvider;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/BaseClickHouseConnectorSmokeTest.java b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/BaseClickHouseConnectorSmokeTest.java
index 15171d829be1..0da1396a9064 100644
--- a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/BaseClickHouseConnectorSmokeTest.java
+++ b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/BaseClickHouseConnectorSmokeTest.java
@@ -15,7 +15,7 @@
 
 import io.trino.plugin.jdbc.BaseJdbcConnectorSmokeTest;
 import io.trino.testing.TestingConnectorBehavior;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,8 +26,11 @@ public abstract class BaseClickHouseConnectorSmokeTest
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
         switch (connectorBehavior) {
+            case SUPPORTS_UPDATE:
             case SUPPORTS_DELETE:
                 return false;
+            case SUPPORTS_TRUNCATE:
+                return true;
 
             default:
                 return super.hasBehavior(connectorBehavior);
diff --git a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/BaseClickHouseTypeMapping.java b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/BaseClickHouseTypeMapping.java
index 263c05870b98..12a08e8dc9c2 100644
--- a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/BaseClickHouseTypeMapping.java
+++ b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/BaseClickHouseTypeMapping.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.clickhouse;
 
+import com.google.common.collect.ImmutableList;
 import io.trino.Session;
 import io.trino.spi.type.TimeZoneKey;
 import io.trino.spi.type.UuidType;
@@ -26,13 +27,14 @@
 import io.trino.testing.sql.SqlExecutor;
 import io.trino.testing.sql.TestTable;
 import io.trino.testing.sql.TrinoSqlExecutor;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.List;
 import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkState;
@@ -55,7 +57,9 @@
 import static io.trino.type.IpAddressType.IPADDRESS;
 import static java.lang.String.format;
 import static java.time.ZoneOffset.UTC;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public abstract class BaseClickHouseTypeMapping
         extends AbstractTestQueryFramework
 {
@@ -69,7 +73,7 @@ public abstract class BaseClickHouseTypeMapping
 
     protected TestingClickHouseServer clickhouseServer;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         checkState(jvmZone.getId().equals("America/Bahia_Banderas"), "This test assumes certain JVM time zone");
@@ -595,46 +599,54 @@ public void testTrinoVarbinary()
                 .execute(getQueryRunner(), trinoCreateAsSelect("test_varbinary"));
     }
 
-    @Test(dataProvider = "sessionZonesDataProvider")
-    public void testDate(ZoneId sessionZone)
+    @Test
+    public void testDate()
     {
-        Session session = Session.builder(getSession())
-                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
-                .build();
-        SqlDataTypeTest.create()
-                .addRoundTrip("date", "DATE '1970-02-03'", DATE, "DATE '1970-02-03'")
-                .addRoundTrip("date", "DATE '2017-07-01'", DATE, "DATE '2017-07-01'") // summer on northern hemisphere (possible DST)
-                .addRoundTrip("date", "DATE '2017-01-01'", DATE, "DATE '2017-01-01'") // winter on northern hemisphere (possible DST on southern hemisphere)
-                .addRoundTrip("date", "DATE '1970-01-01'", DATE, "DATE '1970-01-01'")
-                .addRoundTrip("date", "DATE '1983-04-01'", DATE, "DATE '1983-04-01'")
-                .addRoundTrip("date", "DATE '1983-10-01'", DATE, "DATE '1983-10-01'")
-                .execute(getQueryRunner(), session, clickhouseCreateAndInsert("tpch.test_date"))
-                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_date"))
-                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_date"))
-                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_date"))
-                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_date"));
+        for (ZoneId sessionZone : timezones()) {
+            Session session = Session.builder(getSession())
+                    .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                    .build();
+            SqlDataTypeTest.create()
+                    .addRoundTrip("date", "DATE '1970-02-03'", DATE, "DATE '1970-02-03'")
+                    .addRoundTrip("date", "DATE '2017-07-01'", DATE, "DATE '2017-07-01'") // summer on northern hemisphere (possible DST)
+                    .addRoundTrip("date", "DATE '2017-01-01'", DATE, "DATE '2017-01-01'") // winter on northern hemisphere (possible DST on southern hemisphere)
+                    .addRoundTrip("date", "DATE '1970-01-01'", DATE, "DATE '1970-01-01'")
+                    .addRoundTrip("date", "DATE '1983-04-01'", DATE, "DATE '1983-04-01'")
+                    .addRoundTrip("date", "DATE '1983-10-01'", DATE, "DATE '1983-10-01'")
+                    .execute(getQueryRunner(), session, clickhouseCreateAndInsert("tpch.test_date"))
+                    .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_date"))
+                    .execute(getQueryRunner(), session, trinoCreateAsSelect("test_date"))
+                    .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_date"))
+                    .execute(getQueryRunner(), session, trinoCreateAndInsert("test_date"));
 
-        // Null
-        SqlDataTypeTest.create()
-                .addRoundTrip("date", "NULL", DATE, "CAST(NULL AS DATE)")
-                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_date"))
-                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_date"))
-                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_date"))
-                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_date"));
-        SqlDataTypeTest.create()
-                .addRoundTrip("Nullable(date)", "NULL", DATE, "CAST(NULL AS DATE)")
-                .execute(getQueryRunner(), session, clickhouseCreateAndInsert("tpch.test_date"));
+            // Null
+            SqlDataTypeTest.create()
+                    .addRoundTrip("date", "NULL", DATE, "CAST(NULL AS DATE)")
+                    .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_date"))
+                    .execute(getQueryRunner(), session, trinoCreateAsSelect("test_date"))
+                    .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_date"))
+                    .execute(getQueryRunner(), session, trinoCreateAndInsert("test_date"));
+            SqlDataTypeTest.create()
+                    .addRoundTrip("Nullable(date)", "NULL", DATE, "CAST(NULL AS DATE)")
+                    .execute(getQueryRunner(), session, clickhouseCreateAndInsert("tpch.test_date"));
+        }
+    }
+
+    @Test
+    public void testClickHouseDateMinMaxValues()
+    {
+        testClickHouseDateMinMaxValues("1970-01-01");
+        testClickHouseDateMinMaxValues("2149-06-06");
     }
 
-    @Test(dataProvider = "clickHouseDateMinMaxValuesDataProvider")
-    public void testClickHouseDateMinMaxValues(String date)
+    private void testClickHouseDateMinMaxValues(String date)
     {
         SqlDataTypeTest dateTests = SqlDataTypeTest.create()
                 .addRoundTrip("date", format("DATE '%s'", date), DATE, format("DATE '%s'", date));
 
-        for (Object[] timeZoneIds : sessionZonesDataProvider()) {
+        for (ZoneId timeZoneId : timezones()) {
             Session session = Session.builder(getSession())
-                    .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(((ZoneId) timeZoneIds[0]).getId()))
+                    .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(timeZoneId.getId()))
                     .build();
             dateTests
                     .execute(getQueryRunner(), session, clickhouseCreateAndInsert("tpch.test_date"))
@@ -645,20 +657,17 @@ public void testClickHouseDateMinMaxValues(String date)
         }
     }
 
-    @DataProvider
-    public Object[][] clickHouseDateMinMaxValuesDataProvider()
+    @Test
+    public void testUnsupportedDate()
     {
-        return new Object[][] {
-                {"1970-01-01"}, // min value in ClickHouse
-                {"2149-06-06"}, // max value in ClickHouse
-        };
+        testUnsupportedDate("1969-12-31");
+        testUnsupportedDate("2149-06-07");
     }
 
-    @Test(dataProvider = "unsupportedClickHouseDateValuesDataProvider")
-    public void testUnsupportedDate(String unsupportedDate)
+    private void testUnsupportedDate(String unsupportedDate)
     {
-        String minSupportedDate = (String) clickHouseDateMinMaxValuesDataProvider()[0][0];
-        String maxSupportedDate = (String) clickHouseDateMinMaxValuesDataProvider()[1][0];
+        String minSupportedDate = "1970-01-01";
+        String maxSupportedDate = "2149-06-06";
 
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_unsupported_date", "(dt date)")) {
             assertQueryFails(
@@ -672,36 +681,29 @@ public void testUnsupportedDate(String unsupportedDate)
         }
     }
 
-    @DataProvider
-    public Object[][] unsupportedClickHouseDateValuesDataProvider()
-    {
-        return new Object[][] {
-                {"1969-12-31"}, // min - 1 day
-                {"2149-06-07"}, // max + 1 day
-        };
-    }
-
-    @Test(dataProvider = "sessionZonesDataProvider")
-    public void testTimestamp(ZoneId sessionZone)
+    @Test
+    public void testTimestamp()
     {
-        Session session = Session.builder(getSession())
-                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
-                .build();
+        for (ZoneId sessionZone : timezones()) {
+            Session session = Session.builder(getSession())
+                    .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                    .build();
 
-        SqlDataTypeTest.create()
-                .addRoundTrip("timestamp(0)", "timestamp '1986-01-01 00:13:07'", createTimestampType(0), "TIMESTAMP '1986-01-01 00:13:07'") // time gap in Kathmandu
-                .addRoundTrip("timestamp(0)", "timestamp '2018-03-25 03:17:17'", createTimestampType(0), "TIMESTAMP '2018-03-25 03:17:17'") // time gap in Vilnius
-                .addRoundTrip("timestamp(0)", "timestamp '2018-10-28 01:33:17'", createTimestampType(0), "TIMESTAMP '2018-10-28 01:33:17'") // time doubled in JVM zone
-                .addRoundTrip("timestamp(0)", "timestamp '2018-10-28 03:33:33'", createTimestampType(0), "TIMESTAMP '2018-10-28 03:33:33'") // time double in Vilnius
-                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_timestamp"))
-                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_timestamp"))
-                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_timestamp"))
-                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_timestamp"));
+            SqlDataTypeTest.create()
+                    .addRoundTrip("timestamp(0)", "timestamp '1986-01-01 00:13:07'", createTimestampType(0), "TIMESTAMP '1986-01-01 00:13:07'") // time gap in Kathmandu
+                    .addRoundTrip("timestamp(0)", "timestamp '2018-03-25 03:17:17'", createTimestampType(0), "TIMESTAMP '2018-03-25 03:17:17'") // time gap in Vilnius
+                    .addRoundTrip("timestamp(0)", "timestamp '2018-10-28 01:33:17'", createTimestampType(0), "TIMESTAMP '2018-10-28 01:33:17'") // time doubled in JVM zone
+                    .addRoundTrip("timestamp(0)", "timestamp '2018-10-28 03:33:33'", createTimestampType(0), "TIMESTAMP '2018-10-28 03:33:33'") // time double in Vilnius
+                    .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_timestamp"))
+                    .execute(getQueryRunner(), session, trinoCreateAsSelect("test_timestamp"))
+                    .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_timestamp"))
+                    .execute(getQueryRunner(), session, trinoCreateAndInsert("test_timestamp"));
 
-        timestampTest("timestamp")
-                .execute(getQueryRunner(), session, clickhouseCreateAndInsert("tpch.test_timestamp"));
-        timestampTest("datetime")
-                .execute(getQueryRunner(), session, clickhouseCreateAndInsert("tpch.test_datetime"));
+            timestampTest("timestamp")
+                    .execute(getQueryRunner(), session, clickhouseCreateAndInsert("tpch.test_timestamp"));
+            timestampTest("datetime")
+                    .execute(getQueryRunner(), session, clickhouseCreateAndInsert("tpch.test_datetime"));
+        }
     }
 
     private SqlDataTypeTest timestampTest(String inputType)
@@ -720,8 +722,14 @@ protected SqlDataTypeTest unsupportedTimestampBecomeUnexpectedValueTest(String i
                 .addRoundTrip(inputType, "'1969-12-31 23:59:59'", createTimestampType(0), "TIMESTAMP '1970-01-01 00:00:00'");
     }
 
-    @Test(dataProvider = "clickHouseDateTimeMinMaxValuesDataProvider")
-    public void testClickHouseDateTimeMinMaxValues(String timestamp)
+    @Test
+    public void testClickHouseDateTimeMinMaxValues()
+    {
+        testClickHouseDateTimeMinMaxValues("1970-01-01 00:00:00"); // min value in ClickHouse
+        testClickHouseDateTimeMinMaxValues("2106-02-07 06:28:15"); // max value in ClickHouse
+    }
+
+    private void testClickHouseDateTimeMinMaxValues(String timestamp)
     {
         SqlDataTypeTest dateTests1 = SqlDataTypeTest.create()
                 .addRoundTrip("timestamp(0)", format("timestamp '%s'", timestamp), createTimestampType(0), format("TIMESTAMP '%s'", timestamp));
@@ -730,9 +738,9 @@ public void testClickHouseDateTimeMinMaxValues(String timestamp)
         SqlDataTypeTest dateTests3 = SqlDataTypeTest.create()
                 .addRoundTrip("datetime", format("'%s'", timestamp), createTimestampType(0), format("TIMESTAMP '%s'", timestamp));
 
-        for (Object[] timeZoneIds : sessionZonesDataProvider()) {
+        for (ZoneId timeZoneId : timezones()) {
             Session session = Session.builder(getSession())
-                    .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(((ZoneId) timeZoneIds[0]).getId()))
+                    .setTimeZoneKey(TimeZoneKey.getTimeZoneKey((timeZoneId).getId()))
                     .build();
             dateTests1
                     .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_timestamp"))
@@ -744,20 +752,17 @@ public void testClickHouseDateTimeMinMaxValues(String timestamp)
         }
     }
 
-    @DataProvider
-    public Object[][] clickHouseDateTimeMinMaxValuesDataProvider()
+    @Test
+    public void testUnsupportedTimestamp()
     {
-        return new Object[][] {
-                {"1970-01-01 00:00:00"}, // min value in ClickHouse
-                {"2106-02-07 06:28:15"}, // max value in ClickHouse
-        };
+        testUnsupportedTimestamp("1969-12-31 23:59:59"); // min - 1 second
+        testUnsupportedTimestamp("2106-02-07 06:28:16"); // max + 1 second
     }
 
-    @Test(dataProvider = "unsupportedTimestampDataProvider")
     public void testUnsupportedTimestamp(String unsupportedTimestamp)
     {
-        String minSupportedTimestamp = (String) clickHouseDateTimeMinMaxValuesDataProvider()[0][0];
-        String maxSupportedTimestamp = (String) clickHouseDateTimeMinMaxValuesDataProvider()[1][0];
+        String minSupportedTimestamp = "1970-01-01 00:00:00";
+        String maxSupportedTimestamp = "2106-02-07 06:28:15";
 
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_unsupported_timestamp", "(dt timestamp(0))")) {
             assertQueryFails(
@@ -771,24 +776,17 @@ public void testUnsupportedTimestamp(String unsupportedTimestamp)
         }
     }
 
-    @DataProvider
-    public Object[][] unsupportedTimestampDataProvider()
-    {
-        return new Object[][] {
-                {"1969-12-31 23:59:59"}, // min - 1 second
-                {"2106-02-07 06:28:16"}, // max + 1 second
-        };
-    }
-
-    @Test(dataProvider = "sessionZonesDataProvider")
-    public void testClickHouseDateTimeWithTimeZone(ZoneId sessionZone)
+    @Test
+    public void testClickHouseDateTimeWithTimeZone()
     {
-        Session session = Session.builder(getSession())
-                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
-                .build();
+        for (ZoneId sessionZone : timezones()) {
+            Session session = Session.builder(getSession())
+                    .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                    .build();
 
-        dateTimeWithTimeZoneTest(clickhouseDateTimeInputTypeFactory("datetime"))
-                .execute(getQueryRunner(), session, clickhouseCreateAndInsert("tpch.datetime_tz"));
+            dateTimeWithTimeZoneTest(clickhouseDateTimeInputTypeFactory("datetime"))
+                    .execute(getQueryRunner(), session, clickhouseCreateAndInsert("tpch.datetime_tz"));
+        }
     }
 
     private SqlDataTypeTest dateTimeWithTimeZoneTest(Function<ZoneId, String> inputTypeFactory)
@@ -837,17 +835,15 @@ private SqlDataTypeTest dateTimeWithTimeZoneTest(Function<ZoneId, String> inputT
         return tests;
     }
 
-    @DataProvider
-    public Object[][] sessionZonesDataProvider()
+    private List<ZoneId> timezones()
     {
-        return new Object[][] {
-                {UTC},
-                {jvmZone},
+        return ImmutableList.of(
+                UTC,
+                jvmZone,
                 // using two non-JVM zones so that we don't need to worry what ClickHouse system zone is
-                {vilnius},
-                {kathmandu},
-                {TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
-        };
+                vilnius,
+                kathmandu,
+                TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId());
     }
 
     @Test
diff --git a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestAltinityConnectorSmokeTest.java b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestAltinityConnectorSmokeTest.java
index e819a01d5f97..fb353d27e616 100644
--- a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestAltinityConnectorSmokeTest.java
+++ b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestAltinityConnectorSmokeTest.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.clickhouse.ClickHouseQueryRunner.createClickHouseQueryRunner;
 import static io.trino.plugin.clickhouse.TestingClickHouseServer.ALTINITY_DEFAULT_IMAGE;
@@ -34,6 +35,7 @@ protected QueryRunner createQueryRunner()
                 REQUIRED_TPCH_TABLES);
     }
 
+    @Test
     @Override
     public void testRenameSchema()
     {
diff --git a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseConfig.java b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseConfig.java
index 07c0a7e3a886..b9f3e649cc82 100644
--- a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseConfig.java
+++ b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseConfig.java
@@ -28,7 +28,7 @@
  */
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseConnectorTest.java b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseConnectorTest.java
index 88e5d15a1ece..fe7d59daeda6 100644
--- a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseConnectorTest.java
+++ b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseConnectorTest.java
@@ -15,7 +15,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import io.trino.Session;
 import io.trino.plugin.jdbc.BaseJdbcConnectorTest;
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.testing.MaterializedResult;
@@ -60,30 +59,29 @@ public class TestClickHouseConnectorTest
 {
     private TestingClickHouseServer clickhouseServer;
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY:
-            case SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY:
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_DELETE:
-                return false;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-            case SUPPORTS_NEGATIVE_DATE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_TRUNCATE -> true;
+            case SUPPORTS_AGGREGATION_PUSHDOWN_CORRELATION,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_COVARIANCE,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_REGRESSION,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_STDDEV,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_VARIANCE,
+                    SUPPORTS_ARRAY,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_NATIVE_QUERY,
+                    SUPPORTS_NEGATIVE_DATE,
+                    SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY,
+                    SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -114,6 +112,20 @@ public void testRenameColumn()
         throw new SkipException("TODO: test not implemented yet");
     }
 
+    @Override
+    public void testRenameColumnWithComment()
+    {
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_rename_column_",
+                "(id INT NOT NULL, col INT COMMENT 'test column comment') WITH (engine = 'MergeTree', order_by = ARRAY['id'])")) {
+            assertThat(getColumnComment(table.getName(), "col")).isEqualTo("test column comment");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " RENAME COLUMN col TO renamed_col");
+            assertThat(getColumnComment(table.getName(), "renamed_col")).isEqualTo("test column comment");
+        }
+    }
+
     @Override
     public void testAddColumnWithCommentSpecialCharacter(String comment)
     {
@@ -203,10 +215,24 @@ protected String tableDefinitionForAddColumn()
         return "(x VARCHAR NOT NULL) WITH (engine = 'MergeTree', order_by = ARRAY['x'])";
     }
 
-    @Override
-    public void testAddNotNullColumnToNonEmptyTable()
+    @Override // Overridden because the default storage type doesn't support adding columns
+    public void testAddNotNullColumnToEmptyTable()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_notnull_col_to_empty", "(a_varchar varchar NOT NULL)  WITH (engine = 'MergeTree', order_by = ARRAY['a_varchar'])")) {
+            String tableName = table.getName();
+
+            assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN b_varchar varchar NOT NULL");
+            assertFalse(columnIsNullable(tableName, "b_varchar"));
+            assertUpdate("INSERT INTO " + tableName + " VALUES ('a', 'b')", 1);
+            assertThat(query("TABLE " + tableName))
+                    .skippingTypesCheck()
+                    .matches("VALUES ('a', 'b')");
+        }
+    }
+
+    @Override // Overridden because (a) the default storage type doesn't support adding columns and (b) ClickHouse has implicit default value for new NON NULL column
+    public void testAddNotNullColumn()
     {
-        // Override because the default storage type doesn't support adding columns
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_notnull_col", "(a_varchar varchar NOT NULL)  WITH (engine = 'MergeTree', order_by = ARRAY['a_varchar'])")) {
             String tableName = table.getName();
 
@@ -554,8 +580,14 @@ protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMapp
                 return Optional.empty();
 
             case "date":
-                // TODO (https://github.com/trinodb/trino/issues/7101) enable the test
-                return Optional.empty();
+                // The connector supports date type, but these values are unsupported in ClickHouse
+                // See BaseClickHouseTypeMapping for additional test coverage
+                if (dataMappingTestSetup.getSampleValueLiteral().equals("DATE '0001-01-01'") ||
+                        dataMappingTestSetup.getSampleValueLiteral().equals("DATE '1582-10-05'") ||
+                        dataMappingTestSetup.getHighValueLiteral().equals("DATE '9999-12-31'")) {
+                    return Optional.empty();
+                }
+                return Optional.of(dataMappingTestSetup);
 
             case "time":
             case "time(6)":
@@ -660,115 +692,6 @@ public void testCharTrailingSpace()
         throw new SkipException("Implement test for ClickHouse");
     }
 
-    @Override
-    public void testNativeQuerySimple()
-    {
-        // table function disabled for ClickHouse, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertQueryFails("SELECT * FROM TABLE(system.query(query => 'SELECT 1'))", "line 1:21: Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQueryParameters()
-    {
-        // table function disabled for ClickHouse, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        Session session = Session.builder(getSession())
-                .addPreparedStatement("my_query_simple", "SELECT * FROM TABLE(system.query(query => ?))")
-                .addPreparedStatement("my_query", "SELECT * FROM TABLE(system.query(query => format('SELECT %s FROM %s', ?, ?)))")
-                .build();
-        assertQueryFails(session, "EXECUTE my_query_simple USING 'SELECT 1 a'", "line 1:21: Table function system.query not registered");
-        assertQueryFails(session, "EXECUTE my_query USING 'a', '(SELECT 2 a) t'", "line 1:21: Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQuerySelectFromNation()
-    {
-        // table function disabled for ClickHouse, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertQueryFails(
-                format("SELECT * FROM TABLE(system.query(query => 'SELECT name FROM %s.nation WHERE nationkey = 0'))", getSession().getSchema().orElseThrow()),
-                "line 1:21: Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQuerySelectFromTestTable()
-    {
-        // table function disabled for ClickHouse, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        try (TestTable testTable = simpleTable()) {
-            assertQueryFails(
-                    format("SELECT * FROM TABLE(system.query(query => 'SELECT * FROM %s'))", testTable.getName()),
-                    "line 1:21: Table function system.query not registered");
-        }
-    }
-
-    @Override
-    public void testNativeQueryColumnAlias()
-    {
-        // table function disabled for ClickHouse, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertQueryFails(
-                "SELECT * FROM TABLE(system.query(query => 'SELECT name AS region_name FROM tpch.region WHERE regionkey = 0'))",
-                ".* Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQueryColumnAliasNotFound()
-    {
-        // table function disabled for ClickHouse, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertQueryFails(
-                "SELECT name FROM TABLE(system.query(query => 'SELECT name AS region_name FROM tpch.region'))",
-                ".* Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQuerySelectUnsupportedType()
-    {
-        // table function disabled for ClickHouse, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        try (TestTable testTable = createTableWithUnsupportedColumn()) {
-            String unqualifiedTableName = testTable.getName().replaceAll("^\\w+\\.", "");
-            // Check that column 'two' is not supported.
-            assertQuery("SELECT column_name FROM information_schema.columns WHERE table_name = '" + unqualifiedTableName + "'", "VALUES 'one', 'three'");
-            assertUpdate("INSERT INTO " + testTable.getName() + " (one, three) VALUES (123, 'test')", 1);
-            assertThatThrownBy(() -> query(format("SELECT * FROM TABLE(system.query(query => 'SELECT * FROM %s'))", testTable.getName())))
-                    .hasMessage("line 1:21: Table function system.query not registered");
-        }
-    }
-
-    @Override
-    public void testNativeQueryCreateStatement()
-    {
-        // table function disabled for ClickHouse, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertFalse(getQueryRunner().tableExists(getSession(), "numbers"));
-        assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'CREATE TABLE numbers(n INTEGER)'))"))
-                .hasMessage("line 1:21: Table function system.query not registered");
-        assertFalse(getQueryRunner().tableExists(getSession(), "numbers"));
-    }
-
-    @Override
-    public void testNativeQueryInsertStatementTableDoesNotExist()
-    {
-        // table function disabled for ClickHouse, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertFalse(getQueryRunner().tableExists(getSession(), "non_existent_table"));
-        assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'INSERT INTO non_existent_table VALUES (1)'))"))
-                .hasMessage("line 1:21: Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQueryInsertStatementTableExists()
-    {
-        // table function disabled for ClickHouse, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        try (TestTable testTable = simpleTable()) {
-            assertThatThrownBy(() -> query(format("SELECT * FROM TABLE(system.query(query => 'INSERT INTO %s VALUES (3)'))", testTable.getName())))
-                    .hasMessage("line 1:21: Table function system.query not registered");
-            assertQuery("SELECT * FROM " + testTable.getName(), "VALUES 1, 2");
-        }
-    }
-
-    @Override
-    public void testNativeQueryIncorrectSyntax()
-    {
-        // table function disabled for ClickHouse, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'some wrong syntax'))"))
-                .hasMessage("line 1:21: Table function system.query not registered");
-    }
-
     @Override
     protected TestTable simpleTable()
     {
diff --git a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHousePlugin.java b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHousePlugin.java
index deed8e669dcd..9aac64931529 100644
--- a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHousePlugin.java
+++ b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHousePlugin.java
@@ -17,7 +17,7 @@
 import io.trino.spi.Plugin;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 
diff --git a/plugin/trino-delta-lake/pom.xml b/plugin/trino-delta-lake/pom.xml
index 9e49d62f3fe0..7f1c229c86fe 100644
--- a/plugin/trino-delta-lake/pom.xml
+++ b/plugin/trino-delta-lake/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-delta-lake</artifactId>
-    <description>Trino - Delta Lake Connector Plugin</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Delta Lake Connector Plugin</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -28,43 +28,44 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-filesystem</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-glue</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hdfs</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hive</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-parquet</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hadoop</groupId>
-            <artifactId>hadoop-apache</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hive</groupId>
-            <artifactId>hive-apache</artifactId>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
         </dependency>
 
         <dependency>
@@ -113,70 +114,78 @@
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-core</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-glue</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem-manager</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hdfs</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.cloud.bigdataoss</groupId>
-            <artifactId>gcs-connector</artifactId>
-            <classifier>shaded</classifier>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hive</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-parquet</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-column</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4-runtime</artifactId>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-format-structures</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-hadoop</artifactId>
         </dependency>
 
         <dependency>
@@ -189,11 +198,68 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-hadoop-toolkit</artifactId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-core</artifactId>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+                    <artifactId>jackson-dataformat-xml</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-storage-blob</artifactId>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.azure</groupId>
+                    <artifactId>azure-core-http-netty</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+                    <artifactId>jackson-dataformat-xml</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -203,37 +269,41 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hadoop-toolkit</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
+            <artifactId>trino-memory-context</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <groupId>io.trino.hadoop</groupId>
+            <artifactId>hadoop-apache</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>com.github.docker-java</groupId>
+            <artifactId>docker-java-api</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-exchange-filesystem</artifactId>
@@ -341,42 +411,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-core</artifactId>
-            <version>1.25.0</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-storage-blob</artifactId>
-            <version>12.14.4</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.docker-java</groupId>
-            <artifactId>docker-java-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -389,6 +423,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
@@ -424,18 +464,29 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.basepom.maven</groupId>
-                <artifactId>duplicate-finder-maven-plugin</artifactId>
-                <configuration>
-                    <ignoredResourcePatterns>
-                        <!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
-                        <ignoredResourcePattern>mime.types</ignoredResourcePattern>
-                        <ignoredResourcePattern>about.html</ignoredResourcePattern>
-                    </ignoredResourcePatterns>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
-
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <configuration>
                     <ignoredNonTestScopedDependencies>
@@ -471,6 +522,7 @@
                                 <exclude>**/TestDeltaLakeAdlsStorage.java</exclude>
                                 <exclude>**/TestDeltaLakeAdlsConnectorSmokeTest.java</exclude>
                                 <exclude>**/TestDeltaLakeGlueMetastore.java</exclude>
+                                <exclude>**/TestDeltaS3AndGlueMetastoreTest.java</exclude>
                                 <exclude>**/TestDeltaLakeCleanUpGlueMetastore.java</exclude>
                                 <exclude>**/TestDeltaLakeSharedGlueMetastoreViews.java</exclude>
                                 <exclude>**/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java</exclude>
@@ -489,7 +541,7 @@
         </profile>
 
         <profile>
-	    <!-- Tests which require third party cloud services are separated from the main test profile -->
+            <!-- Tests which require third party cloud services are separated from the main test profile -->
             <id>cloud-tests</id>
             <build>
                 <plugins>
@@ -501,6 +553,7 @@
                                 <include>**/TestDeltaLakeAdlsStorage.java</include>
                                 <include>**/TestDeltaLakeAdlsConnectorSmokeTest.java</include>
                                 <include>**/TestDeltaLakeGlueMetastore.java</include>
+                                <include>**/TestDeltaS3AndGlueMetastoreTest.java</include>
                                 <include>**/TestDeltaLakeCleanUpGlueMetastore.java</include>
                                 <include>**/TestDeltaLakeSharedGlueMetastoreViews.java</include>
                                 <include>**/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java</include>
@@ -509,6 +562,7 @@
                                 <include>**/TestDeltaLakeRegisterTableProcedureWithGlue.java</include>
                                 <include>**/TestDeltaLakeViewsGlueMetastore.java</include>
                                 <include>**/TestDeltaLakeConcurrentModificationGlueMetastore.java</include>
+                                <include>**/TestDeltaLakeGcsConnectorSmokeTest.java</include>
                             </includes>
                         </configuration>
                     </plugin>
@@ -532,22 +586,5 @@
                 </plugins>
             </build>
         </profile>
-
-        <profile>
-            <id>gcs-tests</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/TestDeltaLakeGcsConnectorSmokeTest.java</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
diff --git a/plugin/trino-delta-lake/src/main/antlr4/io/trino/plugin/deltalake/expression/SparkExpressionBase.g4 b/plugin/trino-delta-lake/src/main/antlr4/io/trino/plugin/deltalake/expression/SparkExpressionBase.g4
index de24f59148e9..f2931fe19dd4 100644
--- a/plugin/trino-delta-lake/src/main/antlr4/io/trino/plugin/deltalake/expression/SparkExpressionBase.g4
+++ b/plugin/trino-delta-lake/src/main/antlr4/io/trino/plugin/deltalake/expression/SparkExpressionBase.g4
@@ -14,6 +14,8 @@
 
 grammar SparkExpressionBase;
 
+options { caseInsensitive = true; }
+
 tokens {
     DELIMITER
 }
@@ -36,6 +38,7 @@ booleanExpression
 // workaround for https://github.com/antlr/antlr4/issues/780
 predicate[ParserRuleContext value]
     : comparisonOperator right=valueExpression          #comparison
+    | NOT? BETWEEN lower=valueExpression AND upper=valueExpression        #between
     ;
 
 valueExpression
@@ -48,6 +51,7 @@ valueExpression
 primaryExpression
     : number                                            #numericLiteral
     | booleanValue                                      #booleanLiteral
+    | NULL                                              #nullLiteral
     | string                                            #stringLiteral
     | identifier                                        #columnReference
     ;
@@ -77,9 +81,11 @@ number
     ;
 
 AND: 'AND';
+BETWEEN: 'BETWEEN';
 OR: 'OR';
 FALSE: 'FALSE';
 TRUE: 'TRUE';
+NULL: 'NULL';
 
 EQ: '=';
 NEQ: '<>' | '!=';
@@ -87,6 +93,7 @@ LT: '<';
 LTE: '<=';
 GT: '>';
 GTE: '>=';
+NOT: 'NOT';
 
 PLUS: '+';
 MINUS: '-';
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/AbstractDeltaLakePageSink.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/AbstractDeltaLakePageSink.java
index 7fbe150249f5..e8b7b8e42f43 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/AbstractDeltaLakePageSink.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/AbstractDeltaLakePageSink.java
@@ -21,16 +21,15 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.parquet.writer.ParquetSchemaConverter;
 import io.trino.parquet.writer.ParquetWriterOptions;
 import io.trino.plugin.deltalake.DataFileInfo.DataFileType;
-import io.trino.plugin.hive.FileWriter;
+import io.trino.plugin.deltalake.util.DeltaLakeWriteUtils;
 import io.trino.plugin.hive.HivePartitionKey;
 import io.trino.plugin.hive.parquet.ParquetFileWriter;
 import io.trino.plugin.hive.util.HiveUtil;
-import io.trino.plugin.hive.util.HiveWriteUtils;
 import io.trino.spi.Page;
 import io.trino.spi.PageIndexer;
 import io.trino.spi.PageIndexerFactory;
@@ -62,8 +61,8 @@
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getParquetWriterBlockSize;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getParquetWriterPageSize;
 import static io.trino.plugin.deltalake.DeltaLakeTypes.toParquetType;
-import static io.trino.plugin.deltalake.transactionlog.TransactionLogAccess.canonicalizeColumnName;
 import static io.trino.plugin.hive.util.HiveUtil.escapePathName;
+import static java.lang.Math.min;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.UUID.randomUUID;
@@ -95,8 +94,8 @@ public abstract class AbstractDeltaLakePageSink
 
     private final List<DeltaLakeWriter> writers = new ArrayList<>();
 
-    private final String tableLocation;
-    protected final String outputPathDirectory;
+    private final Location tableLocation;
+    protected final Location outputPathDirectory;
     private final ConnectorSession session;
     private final DeltaLakeWriterStats stats;
     private final String trinoVersion;
@@ -107,6 +106,7 @@ public abstract class AbstractDeltaLakePageSink
 
     private final List<Closeable> closedWriterRollbackActions = new ArrayList<>();
     protected final ImmutableList.Builder<DataFileInfo> dataFileInfos = ImmutableList.builder();
+    private final DeltaLakeParquetSchemaMapping parquetSchemaMapping;
 
     public AbstractDeltaLakePageSink(
             TypeOperators typeOperators,
@@ -116,11 +116,12 @@ public AbstractDeltaLakePageSink(
             TrinoFileSystemFactory fileSystemFactory,
             int maxOpenWriters,
             JsonCodec<DataFileInfo> dataFileInfoCodec,
-            String tableLocation,
-            String outputPathDirectory,
+            Location tableLocation,
+            Location outputPathDirectory,
             ConnectorSession session,
             DeltaLakeWriterStats stats,
-            String trinoVersion)
+            String trinoVersion,
+            DeltaLakeParquetSchemaMapping parquetSchemaMapping)
     {
         this.typeOperators = requireNonNull(typeOperators, "typeOperators is null");
         requireNonNull(inputColumns, "inputColumns is null");
@@ -130,6 +131,7 @@ public AbstractDeltaLakePageSink(
         this.fileSystem = requireNonNull(fileSystemFactory, "fileSystemFactory is null").create(session);
         this.maxOpenWriters = maxOpenWriters;
         this.dataFileInfoCodec = requireNonNull(dataFileInfoCodec, "dataFileInfoCodec is null");
+        this.parquetSchemaMapping = requireNonNull(parquetSchemaMapping, "parquetSchemaMapping is null");
 
         // determine the input index of the partition columns and data columns
         int[] partitionColumnInputIndex = new int[originalPartitionColumns.size()];
@@ -142,28 +144,26 @@ public AbstractDeltaLakePageSink(
         ImmutableList.Builder<Type> dataColumnTypes = ImmutableList.builder();
         ImmutableList.Builder<String> dataColumnNames = ImmutableList.builder();
 
-        Map<String, String> canonicalToOriginalPartitionColumns = new HashMap<>();
-        Map<String, Integer> canonicalToOriginalPartitionPositions = new HashMap<>();
+        Map<String, Integer> toOriginalPartitionPositions = new HashMap<>();
         int partitionColumnPosition = 0;
         for (String partitionColumnName : originalPartitionColumns) {
-            String canonicalizeColumnName = canonicalizeColumnName(partitionColumnName);
-            canonicalToOriginalPartitionColumns.put(canonicalizeColumnName, partitionColumnName);
-            canonicalToOriginalPartitionPositions.put(canonicalizeColumnName, partitionColumnPosition++);
+            toOriginalPartitionPositions.put(partitionColumnName, partitionColumnPosition++);
         }
         for (int inputIndex = 0; inputIndex < inputColumns.size(); inputIndex++) {
             DeltaLakeColumnHandle column = inputColumns.get(inputIndex);
             switch (column.getColumnType()) {
                 case PARTITION_KEY:
-                    int partitionPosition = canonicalToOriginalPartitionPositions.get(column.getName());
+                    int partitionPosition = toOriginalPartitionPositions.get(column.getColumnName());
                     partitionColumnInputIndex[partitionPosition] = inputIndex;
-                    originalPartitionColumnNames[partitionPosition] = canonicalToOriginalPartitionColumns.get(column.getName());
-                    partitionColumnTypes[partitionPosition] = column.getType();
+                    originalPartitionColumnNames[partitionPosition] = column.getColumnName();
+                    partitionColumnTypes[partitionPosition] = column.getBaseType();
                     break;
                 case REGULAR:
+                    verify(column.isBaseColumn(), "Unexpected dereference: %s", column);
                     dataColumnHandles.add(column);
                     dataColumnsInputIndex.add(inputIndex);
-                    dataColumnNames.add(column.getName());
-                    dataColumnTypes.add(column.getType());
+                    dataColumnNames.add(column.getBasePhysicalColumnName());
+                    dataColumnTypes.add(column.getBasePhysicalType());
                     break;
                 case SYNTHESIZED:
                     processSynthesizedColumn(column);
@@ -173,7 +173,6 @@ public AbstractDeltaLakePageSink(
             }
         }
 
-        addSpecialColumns(inputColumns, dataColumnHandles, dataColumnsInputIndex, dataColumnNames, dataColumnTypes);
         this.partitionColumnsInputIndex = partitionColumnInputIndex;
         this.dataColumnInputIndex = Ints.toArray(dataColumnsInputIndex.build());
         this.originalPartitionColumnNames = ImmutableList.copyOf(originalPartitionColumnNames);
@@ -195,13 +194,6 @@ public AbstractDeltaLakePageSink(
 
     protected abstract void processSynthesizedColumn(DeltaLakeColumnHandle column);
 
-    protected abstract void addSpecialColumns(
-            List<DeltaLakeColumnHandle> inputColumns,
-            ImmutableList.Builder<DeltaLakeColumnHandle> dataColumnHandles,
-            ImmutableList.Builder<Integer> dataColumnsInputIndex,
-            ImmutableList.Builder<String> dataColumnNames,
-            ImmutableList.Builder<Type> dataColumnTypes);
-
     protected abstract String getPathPrefix();
 
     protected abstract DataFileType getDataFileType();
@@ -269,17 +261,13 @@ public void abort()
     @Override
     public CompletableFuture<?> appendPage(Page page)
     {
-        if (page.getPositionCount() == 0) {
-            return NOT_BLOCKED;
-        }
-
-        while (page.getPositionCount() > MAX_PAGE_POSITIONS) {
-            Page chunk = page.getRegion(0, MAX_PAGE_POSITIONS);
-            page = page.getRegion(MAX_PAGE_POSITIONS, page.getPositionCount() - MAX_PAGE_POSITIONS);
+        int writeOffset = 0;
+        while (writeOffset < page.getPositionCount()) {
+            Page chunk = page.getRegion(writeOffset, min(page.getPositionCount() - writeOffset, MAX_PAGE_POSITIONS));
+            writeOffset += chunk.getPositionCount();
             writePage(chunk);
         }
 
-        writePage(page);
         return NOT_BLOCKED;
     }
 
@@ -358,23 +346,22 @@ private int[] getWriterIndexes(Page page)
                 closeWriter(writerIndex);
             }
 
-            String filePath = outputPathDirectory;
+            Location filePath = outputPathDirectory;
 
             List<String> partitionValues = createPartitionValues(partitionColumnTypes, partitionColumns, position);
             Optional<String> partitionName = Optional.empty();
             if (!originalPartitionColumnNames.isEmpty()) {
                 String partName = makePartName(originalPartitionColumnNames, partitionValues);
-                filePath = appendPath(outputPathDirectory, partName);
+                filePath = filePath.appendPath(partName);
                 partitionName = Optional.of(partName);
             }
 
-            String fileName = session.getQueryId() + "-" + randomUUID();
-            filePath = appendPath(filePath, fileName);
+            String fileName = session.getQueryId() + "_" + randomUUID();
+            filePath = filePath.appendPath(fileName);
 
-            FileWriter fileWriter = createParquetFileWriter(filePath);
+            ParquetFileWriter fileWriter = createParquetFileWriter(filePath);
 
             DeltaLakeWriter writer = new DeltaLakeWriter(
-                    fileSystem,
                     fileWriter,
                     tableLocation,
                     getRelativeFilePath(partitionName, fileName),
@@ -443,12 +430,12 @@ private static String makePartName(List<String> partitionColumns, List<String> p
 
     public static List<String> createPartitionValues(List<Type> partitionColumnTypes, Page partitionColumns, int position)
     {
-        return HiveWriteUtils.createPartitionValues(partitionColumnTypes, partitionColumns, position).stream()
+        return DeltaLakeWriteUtils.createPartitionValues(partitionColumnTypes, partitionColumns, position).stream()
                 .map(value -> value.equals(HivePartitionKey.HIVE_DEFAULT_DYNAMIC_PARTITION) ? null : value)
                 .collect(toList());
     }
 
-    private FileWriter createParquetFileWriter(String path)
+    private ParquetFileWriter createParquetFileWriter(Location path)
     {
         ParquetWriterOptions parquetWriterOptions = ParquetWriterOptions.builder()
                 .setMaxBlockSize(getParquetWriterBlockSize(session))
@@ -470,19 +457,17 @@ private FileWriter createParquetFileWriter(String path)
                 identityMapping[i] = i;
             }
 
-            ParquetSchemaConverter schemaConverter = new ParquetSchemaConverter(parquetTypes, dataColumnNames, false, false);
             return new ParquetFileWriter(
                     fileSystem.newOutputFile(path),
                     rollbackAction,
                     parquetTypes,
                     dataColumnNames,
-                    schemaConverter.getMessageType(),
-                    schemaConverter.getPrimitiveTypes(),
+                    parquetSchemaMapping.messageType(),
+                    parquetSchemaMapping.primitiveTypes(),
                     parquetWriterOptions,
                     identityMapping,
                     compressionCodec,
                     trinoVersion,
-                    false,
                     Optional.empty(),
                     Optional.empty());
         }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/AllowDeltaLakeManagedTableRename.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/AllowDeltaLakeManagedTableRename.java
index 46d3528d4545..e43de360d001 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/AllowDeltaLakeManagedTableRename.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/AllowDeltaLakeManagedTableRename.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.deltalake;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,5 +25,5 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface AllowDeltaLakeManagedTableRename {}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/AnalyzeHandle.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/AnalyzeHandle.java
index 64dd5f248aff..fb4c9cdbcd50 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/AnalyzeHandle.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/AnalyzeHandle.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableSet;
+import io.trino.plugin.deltalake.DeltaLakeAnalyzeProperties.AnalyzeMode;
 
 import java.time.Instant;
 import java.util.Optional;
@@ -25,26 +26,26 @@
 
 public class AnalyzeHandle
 {
-    private final boolean initialAnalyze;
+    private final AnalyzeMode analyzeMode;
     private final Optional<Instant> filesModifiedAfter;
     private final Optional<Set<String>> columns;
 
     @JsonCreator
     public AnalyzeHandle(
-            @JsonProperty("initialAnalyze") boolean initialAnalyze,
+            @JsonProperty("analyzeMode") AnalyzeMode analyzeMode,
             @JsonProperty("startTime") Optional<Instant> filesModifiedAfter,
             @JsonProperty("columns") Optional<Set<String>> columns)
     {
-        this.initialAnalyze = initialAnalyze;
+        this.analyzeMode = requireNonNull(analyzeMode, "analyzeMode is null");
         this.filesModifiedAfter = requireNonNull(filesModifiedAfter, "filesModifiedAfter is null");
         requireNonNull(columns, "columns is null");
         this.columns = columns.map(ImmutableSet::copyOf);
     }
 
     @JsonProperty
-    public boolean isInitialAnalyze()
+    public AnalyzeMode getAnalyzeMode()
     {
-        return initialAnalyze;
+        return analyzeMode;
     }
 
     @JsonProperty
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/CorruptedDeltaLakeTableHandle.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/CorruptedDeltaLakeTableHandle.java
index 8b1821bbba84..1dc5c93b3b9e 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/CorruptedDeltaLakeTableHandle.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/CorruptedDeltaLakeTableHandle.java
@@ -14,19 +14,21 @@
 package io.trino.plugin.deltalake;
 
 import io.trino.spi.TrinoException;
-import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.SchemaTableName;
 
 import static java.util.Objects.requireNonNull;
 
 public record CorruptedDeltaLakeTableHandle(
         SchemaTableName schemaTableName,
+        boolean managed,
+        String location,
         TrinoException originalException)
-        implements ConnectorTableHandle
+        implements LocatedTableHandle
 {
     public CorruptedDeltaLakeTableHandle
     {
         requireNonNull(schemaTableName, "schemaTableName is null");
+        requireNonNull(location, "location is null");
         requireNonNull(originalException, "originalException is null");
     }
 
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaHiveTypeTranslator.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaHiveTypeTranslator.java
index ae609bd9942d..f139b5566840 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaHiveTypeTranslator.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaHiveTypeTranslator.java
@@ -71,7 +71,7 @@ public static HiveType toHiveType(Type type)
         return HiveType.toHiveType(translate(type));
     }
 
-    // Copy from HiveTypeTranslator with a custom mapping for TimestampWithTimeZone
+    // Copy from HiveTypeTranslator with custom mappings for TimestampType and TimestampWithTimeZone
     public static TypeInfo translate(Type type)
     {
         requireNonNull(type, "type is null");
@@ -122,8 +122,8 @@ public static TypeInfo translate(Type type)
             verify(((TimestampWithTimeZoneType) type).getPrecision() == 3, "Unsupported type: %s", type);
             return HIVE_TIMESTAMP.getTypeInfo();
         }
-        if (type instanceof TimestampType) {
-            verify(((TimestampType) type).getPrecision() == 3, "Unsupported type: %s", type);
+        if (type instanceof TimestampType timestampType) {
+            verify(timestampType.getPrecision() == 3 || timestampType.getPrecision() == 6, "Unsupported type: %s", type);
             return HIVE_TIMESTAMP.getTypeInfo();
         }
         if (type instanceof DecimalType decimalType) {
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeAnalyzeProperties.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeAnalyzeProperties.java
index 720eba278966..27d07a958c21 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeAnalyzeProperties.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeAnalyzeProperties.java
@@ -14,14 +14,13 @@
 package io.trino.plugin.deltalake;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.TrinoException;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.SqlTimestampWithTimeZone;
 import io.trino.spi.type.TimestampWithTimeZoneType;
 
-import javax.inject.Inject;
-
 import java.time.Instant;
 import java.util.Collection;
 import java.util.List;
@@ -30,15 +29,24 @@
 import java.util.Set;
 
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.plugin.deltalake.DeltaLakeAnalyzeProperties.AnalyzeMode.INCREMENTAL;
 import static io.trino.spi.StandardErrorCode.INVALID_ANALYZE_PROPERTY;
+import static io.trino.spi.session.PropertyMetadata.enumProperty;
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.String.format;
 
 public class DeltaLakeAnalyzeProperties
 {
+    enum AnalyzeMode
+    {
+        INCREMENTAL,
+        FULL_REFRESH,
+    }
+
     public static final String FILES_MODIFIED_AFTER = "files_modified_after";
     public static final String COLUMNS_PROPERTY = "columns";
+    public static final String MODE_PROPERTY = "mode";
 
     private final List<PropertyMetadata<?>> analyzeProperties;
 
@@ -63,7 +71,13 @@ public DeltaLakeAnalyzeProperties()
                         null,
                         false,
                         DeltaLakeAnalyzeProperties::decodeColumnNames,
-                        value -> value));
+                        value -> value),
+                enumProperty(
+                        MODE_PROPERTY,
+                        "Analyze mode",
+                        AnalyzeMode.class,
+                        INCREMENTAL,
+                        false));
     }
 
     public List<PropertyMetadata<?>> getAnalyzeProperties()
@@ -76,6 +90,11 @@ public static Optional<Instant> getFilesModifiedAfterProperty(Map<String, Object
         return Optional.ofNullable((Instant) properties.get(FILES_MODIFIED_AFTER));
     }
 
+    public static AnalyzeMode getRefreshMode(Map<String, Object> properties)
+    {
+        return (AnalyzeMode) properties.get(MODE_PROPERTY);
+    }
+
     public static Optional<Set<String>> getColumnNames(Map<String, Object> properties)
     {
         @SuppressWarnings("unchecked")
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeAzureModule.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeAzureModule.java
deleted file mode 100644
index 2846ae1ff4e0..000000000000
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeAzureModule.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.deltalake;
-
-import com.google.inject.Binder;
-import com.google.inject.Module;
-import com.google.inject.Scopes;
-import com.google.inject.multibindings.MapBinder;
-import io.trino.plugin.deltalake.transactionlog.writer.AzureTransactionLogSynchronizer;
-import io.trino.plugin.deltalake.transactionlog.writer.TransactionLogSynchronizer;
-
-import static com.google.inject.multibindings.MapBinder.newMapBinder;
-
-public class DeltaLakeAzureModule
-        implements Module
-{
-    @Override
-    public void configure(Binder binder)
-    {
-        MapBinder<String, TransactionLogSynchronizer> logSynchronizerMapBinder = newMapBinder(binder, String.class, TransactionLogSynchronizer.class);
-        logSynchronizerMapBinder.addBinding("abfs").to(AzureTransactionLogSynchronizer.class).in(Scopes.SINGLETON);
-        logSynchronizerMapBinder.addBinding("abfss").to(AzureTransactionLogSynchronizer.class).in(Scopes.SINGLETON);
-    }
-}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeBucketFunction.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeBucketFunction.java
index c6b50eb6c89e..960eb7bfda2c 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeBucketFunction.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeBucketFunction.java
@@ -22,8 +22,9 @@
 import java.util.List;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
+import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static io.trino.spi.type.TypeUtils.NULL_HASH_CODE;
@@ -37,8 +38,9 @@ public class DeltaLakeBucketFunction
     public DeltaLakeBucketFunction(TypeOperators typeOperators, List<DeltaLakeColumnHandle> partitioningColumns, int bucketCount)
     {
         this.hashCodeInvokers = partitioningColumns.stream()
-                .map(DeltaLakeColumnHandle::getType)
-                .map(type -> typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION)))
+                .peek(column -> verify(column.isBaseColumn(), "Unexpected dereference: %s", column))
+                .map(DeltaLakeColumnHandle::getBaseType)
+                .map(type -> typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)))
                 .collect(toImmutableList());
         this.bucketCount = bucketCount;
     }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeCdfPageSink.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeCdfPageSink.java
index c9b6c283d7ec..84522e0fcffa 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeCdfPageSink.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeCdfPageSink.java
@@ -13,20 +13,16 @@
  */
 package io.trino.plugin.deltalake;
 
-import com.google.common.collect.ImmutableList;
 import io.airlift.json.JsonCodec;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.spi.PageIndexerFactory;
 import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 
 import java.util.List;
-import java.util.OptionalInt;
 
 import static io.trino.plugin.deltalake.DataFileInfo.DataFileType.CHANGE_DATA_FEED;
-import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
-import static io.trino.spi.type.VarcharType.VARCHAR;
 
 public class DeltaLakeCdfPageSink
         extends AbstractDeltaLakePageSink
@@ -42,11 +38,12 @@ public DeltaLakeCdfPageSink(
             TrinoFileSystemFactory fileSystemFactory,
             int maxOpenWriters,
             JsonCodec<DataFileInfo> dataFileInfoCodec,
-            String outputPath,
-            String tableLocation,
+            Location tableLocation,
+            Location outputPath,
             ConnectorSession session,
             DeltaLakeWriterStats stats,
-            String trinoVersion)
+            String trinoVersion,
+            DeltaLakeParquetSchemaMapping parquetSchemaMapping)
     {
         super(
                 typeOperators,
@@ -60,32 +57,13 @@ public DeltaLakeCdfPageSink(
                 outputPath,
                 session,
                 stats,
-                trinoVersion);
+                trinoVersion,
+                parquetSchemaMapping);
     }
 
     @Override
     protected void processSynthesizedColumn(DeltaLakeColumnHandle column) {}
 
-    @Override
-    protected void addSpecialColumns(
-            List<DeltaLakeColumnHandle> inputColumns,
-            ImmutableList.Builder<DeltaLakeColumnHandle> dataColumnHandles,
-            ImmutableList.Builder<Integer> dataColumnsInputIndices,
-            ImmutableList.Builder<String> dataColumnNames,
-            ImmutableList.Builder<Type> dataColumnTypes)
-    {
-        dataColumnHandles.add(new DeltaLakeColumnHandle(
-                CHANGE_TYPE_COLUMN_NAME,
-                VARCHAR,
-                OptionalInt.empty(),
-                CHANGE_TYPE_COLUMN_NAME,
-                VARCHAR,
-                REGULAR));
-        dataColumnsInputIndices.add(inputColumns.size());
-        dataColumnNames.add(CHANGE_TYPE_COLUMN_NAME);
-        dataColumnTypes.add(VARCHAR);
-    }
-
     @Override
     protected String getPathPrefix()
     {
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeColumnHandle.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeColumnHandle.java
index 6cf5ad66a140..73024812052f 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeColumnHandle.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeColumnHandle.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.deltalake;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.spi.connector.ColumnHandle;
@@ -23,9 +24,13 @@
 import java.util.Optional;
 import java.util.OptionalInt;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.slice.SizeOf.estimatedSizeOf;
 import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
 import static io.trino.plugin.deltalake.DeltaHiveTypeTranslator.toHiveType;
+import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.SYNTHESIZED;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.RowType.field;
@@ -39,6 +44,7 @@ public class DeltaLakeColumnHandle
 {
     private static final int INSTANCE_SIZE = instanceSize(DeltaLakeColumnHandle.class);
 
+    public static final String ROW_POSITION_COLUMN_NAME = "$row_position";
     public static final String ROW_ID_COLUMN_NAME = "$row_id";
 
     public static final Type MERGE_ROW_ID_TYPE = rowType(
@@ -55,64 +61,68 @@ public class DeltaLakeColumnHandle
     public static final String FILE_MODIFIED_TIME_COLUMN_NAME = "$file_modified_time";
     public static final Type FILE_MODIFIED_TIME_TYPE = TIMESTAMP_TZ_MILLIS;
 
-    private final String name;
-    private final Type type;
-    private final OptionalInt fieldId;
+    private final String baseColumnName;
+    private final Type baseType;
+    private final OptionalInt baseFieldId;
     // Hold field names in Parquet files
     // The value is same as 'name' when the column mapping mode is none
     // The value is same as 'delta.columnMapping.physicalName' when the column mapping mode is id or name. e.g. col-6707cc9e-f3aa-4e6b-b8ef-1b03d3475680
-    private final String physicalName;
+    private final String basePhysicalColumnName;
     // Hold type in Parquet files
     // The value is same as 'type' when the column mapping mode is none
     // The value is same as 'delta.columnMapping.physicalName' when the column mapping mode is id or name. e.g. row(col-5924c8b3-04cf-4146-abb5-2c229e7ff708 integer)
-    private final Type physicalType;
+    private final Type basePhysicalType;
     private final DeltaLakeColumnType columnType;
+    private final Optional<DeltaLakeColumnProjectionInfo> projectionInfo;
 
     @JsonCreator
     public DeltaLakeColumnHandle(
-            @JsonProperty("name") String name,
-            @JsonProperty("type") Type type,
-            @JsonProperty("fieldId") OptionalInt fieldId,
-            @JsonProperty("physicalName") String physicalName,
-            @JsonProperty("physicalType") Type physicalType,
-            @JsonProperty("columnType") DeltaLakeColumnType columnType)
-    {
-        this.name = requireNonNull(name, "name is null");
-        this.type = requireNonNull(type, "type is null");
-        this.fieldId = requireNonNull(fieldId, "fieldId is null");
-        this.physicalName = requireNonNull(physicalName, "physicalName is null");
-        this.physicalType = requireNonNull(physicalType, "physicalType is null");
+            @JsonProperty("baseColumnName") String baseColumnName,
+            @JsonProperty("baseType") Type baseType,
+            @JsonProperty("baseFieldId") OptionalInt baseFieldId,
+            @JsonProperty("basePhysicalColumnName") String basePhysicalColumnName,
+            @JsonProperty("basePhysicalType") Type basePhysicalType,
+            @JsonProperty("columnType") DeltaLakeColumnType columnType,
+            @JsonProperty("projectionInfo") Optional<DeltaLakeColumnProjectionInfo> projectionInfo)
+    {
+        this.baseColumnName = requireNonNull(baseColumnName, "baseColumnName is null");
+        this.baseType = requireNonNull(baseType, "baseType is null");
+        this.baseFieldId = requireNonNull(baseFieldId, "baseFieldId is null");
+        this.basePhysicalColumnName = requireNonNull(basePhysicalColumnName, "basePhysicalColumnName is null");
+        this.basePhysicalType = requireNonNull(basePhysicalType, "basePhysicalType is null");
         this.columnType = requireNonNull(columnType, "columnType is null");
+        checkArgument(projectionInfo.isEmpty() || columnType == REGULAR, "Projection info present for column type: %s", columnType);
+        this.projectionInfo = projectionInfo;
     }
 
     @JsonProperty
-    public String getName()
+    public String getBaseColumnName()
     {
-        return name;
+        return baseColumnName;
     }
 
     @JsonProperty
-    public Type getType()
+    public Type getBaseType()
     {
-        return type;
+        return baseType;
     }
 
     @JsonProperty
-    public OptionalInt getFieldId()
+    public OptionalInt getBaseFieldId()
     {
-        return fieldId;
+        return baseFieldId;
     }
 
     @JsonProperty
-    public String getPhysicalName()
+    public String getBasePhysicalColumnName()
     {
-        return physicalName;
+        return basePhysicalColumnName;
     }
 
     @JsonProperty
-    public Type getPhysicalType()
+    public Type getBasePhysicalType()
     {
-        return physicalType;
+        return basePhysicalType;
     }
 
     @JsonProperty
@@ -121,6 +131,12 @@ public DeltaLakeColumnType getColumnType()
         return columnType;
     }
 
+    @JsonProperty
+    public Optional<DeltaLakeColumnProjectionInfo> getProjectionInfo()
+    {
+        return projectionInfo;
+    }
+
     @Override
     public boolean equals(Object obj)
     {
@@ -131,56 +147,100 @@ public boolean equals(Object obj)
             return false;
         }
         DeltaLakeColumnHandle other = (DeltaLakeColumnHandle) obj;
-        return Objects.equals(this.name, other.name) &&
-                Objects.equals(this.type, other.type) &&
-                Objects.equals(this.fieldId, other.fieldId) &&
-                Objects.equals(this.physicalName, other.physicalName) &&
-                Objects.equals(this.physicalType, other.physicalType) &&
-                this.columnType == other.columnType;
+        return Objects.equals(this.baseColumnName, other.baseColumnName) &&
+                Objects.equals(this.baseType, other.baseType) &&
+                Objects.equals(this.baseFieldId, other.baseFieldId) &&
+                Objects.equals(this.basePhysicalColumnName, other.basePhysicalColumnName) &&
+                Objects.equals(this.basePhysicalType, other.basePhysicalType) &&
+                this.columnType == other.columnType &&
+                Objects.equals(this.projectionInfo, other.projectionInfo);
+    }
+
+    @JsonIgnore
+    public String getColumnName()
+    {
+        checkState(isBaseColumn(), "Unexpected dereference: %s", this);
+        return baseColumnName;
+    }
+
+    @JsonIgnore
+    public String getQualifiedPhysicalName()
+    {
+        return projectionInfo.map(projectionInfo -> basePhysicalColumnName + "#" + projectionInfo.getPartialName())
+                .orElse(basePhysicalColumnName);
     }
 
     public long getRetainedSizeInBytes()
     {
         // type is not accounted for as the instances are cached (by TypeRegistry) and shared
-        return INSTANCE_SIZE + estimatedSizeOf(name);
+        return INSTANCE_SIZE
+                + estimatedSizeOf(baseColumnName)
+                + sizeOf(baseFieldId)
+                + estimatedSizeOf(basePhysicalColumnName)
+                + projectionInfo.map(DeltaLakeColumnProjectionInfo::getRetainedSizeInBytes).orElse(0L);
+    }
+
+    @JsonIgnore
+    public boolean isBaseColumn()
+    {
+        return projectionInfo.isEmpty();
+    }
+
+    @JsonIgnore
+    public Type getType()
+    {
+        return projectionInfo.map(DeltaLakeColumnProjectionInfo::getType)
+                .orElse(baseType);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(name, type, fieldId, physicalName, physicalType, columnType);
+        return Objects.hash(baseColumnName, baseType, baseFieldId, basePhysicalColumnName, basePhysicalType, columnType, projectionInfo);
     }
 
     @Override
     public String toString()
     {
-        return name + ":" + type.getDisplayName() + ":" + columnType;
+        return getQualifiedPhysicalName() +
+                ":" + projectionInfo.map(DeltaLakeColumnProjectionInfo::getType).orElse(baseType).getDisplayName() +
+                ":" + columnType;
     }
 
     public HiveColumnHandle toHiveColumnHandle()
     {
         return new HiveColumnHandle(
-                physicalName, // this name is used for accessing Parquet files, so it should be physical name
+                basePhysicalColumnName, // this name is used for accessing Parquet files, so it should be physical name
                 0, // hiveColumnIndex; we provide fake value because we always find columns by name
-                toHiveType(physicalType),
-                physicalType,
-                Optional.empty(),
+                toHiveType(basePhysicalType),
+                basePhysicalType,
+                projectionInfo.map(DeltaLakeColumnProjectionInfo::toHiveColumnProjectionInfo),
                 columnType.toHiveColumnType(),
                 Optional.empty());
     }
 
+    public static DeltaLakeColumnHandle rowPositionColumnHandle()
+    {
+        return new DeltaLakeColumnHandle(ROW_POSITION_COLUMN_NAME, BIGINT, OptionalInt.empty(), ROW_POSITION_COLUMN_NAME, BIGINT, SYNTHESIZED, Optional.empty());
+    }
+
     public static DeltaLakeColumnHandle pathColumnHandle()
     {
-        return new DeltaLakeColumnHandle(PATH_COLUMN_NAME, PATH_TYPE, OptionalInt.empty(), PATH_COLUMN_NAME, PATH_TYPE, SYNTHESIZED);
+        return new DeltaLakeColumnHandle(PATH_COLUMN_NAME, PATH_TYPE, OptionalInt.empty(), PATH_COLUMN_NAME, PATH_TYPE, SYNTHESIZED, Optional.empty());
     }
 
     public static DeltaLakeColumnHandle fileSizeColumnHandle()
     {
-        return new DeltaLakeColumnHandle(FILE_SIZE_COLUMN_NAME, FILE_SIZE_TYPE, OptionalInt.empty(), FILE_SIZE_COLUMN_NAME, FILE_SIZE_TYPE, SYNTHESIZED);
+        return new DeltaLakeColumnHandle(FILE_SIZE_COLUMN_NAME, FILE_SIZE_TYPE, OptionalInt.empty(), FILE_SIZE_COLUMN_NAME, FILE_SIZE_TYPE, SYNTHESIZED, Optional.empty());
     }
 
     public static DeltaLakeColumnHandle fileModifiedTimeColumnHandle()
     {
-        return new DeltaLakeColumnHandle(FILE_MODIFIED_TIME_COLUMN_NAME, FILE_MODIFIED_TIME_TYPE, OptionalInt.empty(), FILE_MODIFIED_TIME_COLUMN_NAME, FILE_MODIFIED_TIME_TYPE, SYNTHESIZED);
+        return new DeltaLakeColumnHandle(FILE_MODIFIED_TIME_COLUMN_NAME, FILE_MODIFIED_TIME_TYPE, OptionalInt.empty(), FILE_MODIFIED_TIME_COLUMN_NAME, FILE_MODIFIED_TIME_TYPE, SYNTHESIZED, Optional.empty());
+    }
+
+    public static DeltaLakeColumnHandle mergeRowIdColumnHandle()
+    {
+        return new DeltaLakeColumnHandle(ROW_ID_COLUMN_NAME, MERGE_ROW_ID_TYPE, OptionalInt.empty(), ROW_ID_COLUMN_NAME, MERGE_ROW_ID_TYPE, SYNTHESIZED, Optional.empty());
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeColumnMetadata.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeColumnMetadata.java
index 820178191417..166fb7c99937 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeColumnMetadata.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeColumnMetadata.java
@@ -20,21 +20,22 @@
 import java.util.OptionalInt;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
-import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 
 public class DeltaLakeColumnMetadata
 {
     private final ColumnMetadata columnMetadata;
+    private final String name;
     private final OptionalInt fieldId;
     private final String physicalName;
     private final Type physicalColumnType;
 
-    public DeltaLakeColumnMetadata(ColumnMetadata columnMetadata, OptionalInt fieldId, String physicalName, Type physicalColumnType)
+    public DeltaLakeColumnMetadata(ColumnMetadata columnMetadata, String name, OptionalInt fieldId, String physicalName, Type physicalColumnType)
     {
         this.columnMetadata = requireNonNull(columnMetadata, "columnMetadata is null");
+        this.name = requireNonNull(name, "name is null");
         this.fieldId = requireNonNull(fieldId, "fieldId is null");
-        this.physicalName = physicalName.toLowerCase(ENGLISH);
+        this.physicalName = requireNonNull(physicalName, "physicalName is null");
         this.physicalColumnType = requireNonNull(physicalColumnType, "physicalColumnType is null");
     }
 
@@ -50,7 +51,7 @@ public OptionalInt getFieldId()
 
     public String getName()
     {
-        return columnMetadata.getName();
+        return name;
     }
 
     public Type getType()
@@ -73,6 +74,7 @@ public String toString()
     {
         return toStringHelper(this)
                 .add("columnMetadata", columnMetadata)
+                .add("name", name)
                 .add("fieldId", fieldId)
                 .add("physicalName", physicalName)
                 .add("physicalColumnType", physicalColumnType)
@@ -90,6 +92,7 @@ public boolean equals(Object o)
         }
         DeltaLakeColumnMetadata that = (DeltaLakeColumnMetadata) o;
         return Objects.equals(columnMetadata, that.columnMetadata) &&
+                Objects.equals(name, that.name) &&
                 Objects.equals(fieldId, that.fieldId) &&
                 Objects.equals(physicalName, that.physicalName) &&
                 Objects.equals(physicalColumnType, that.physicalColumnType);
@@ -98,6 +101,6 @@ public boolean equals(Object o)
     @Override
     public int hashCode()
     {
-        return Objects.hash(columnMetadata, fieldId, physicalName, physicalColumnType);
+        return Objects.hash(columnMetadata, name, fieldId, physicalName, physicalColumnType);
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeColumnProjectionInfo.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeColumnProjectionInfo.java
new file mode 100644
index 000000000000..f271638fdf74
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeColumnProjectionInfo.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableList;
+import io.airlift.slice.SizeOf;
+import io.trino.plugin.hive.HiveColumnProjectionInfo;
+import io.trino.spi.type.Type;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.airlift.slice.SizeOf.estimatedSizeOf;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.trino.plugin.deltalake.DeltaHiveTypeTranslator.toHiveType;
+import static java.util.Objects.requireNonNull;
+
+public class DeltaLakeColumnProjectionInfo
+{
+    private static final int INSTANCE_SIZE = instanceSize(DeltaLakeColumnProjectionInfo.class);
+
+    private final Type type;
+    private final List<Integer> dereferenceIndices;
+    private final List<String> dereferencePhysicalNames;
+
+    @JsonCreator
+    public DeltaLakeColumnProjectionInfo(
+            @JsonProperty("type") Type type,
+            @JsonProperty("dereferenceIndices") List<Integer> dereferenceIndices,
+            @JsonProperty("dereferencePhysicalNames") List<String> dereferencePhysicalNames)
+    {
+        this.type = requireNonNull(type, "type is null");
+        requireNonNull(dereferenceIndices, "dereferenceIndices is null");
+        requireNonNull(dereferencePhysicalNames, "dereferencePhysicalNames is null");
+        checkArgument(dereferenceIndices.size() > 0, "dereferenceIndices should not be empty");
+        checkArgument(dereferencePhysicalNames.size() > 0, "dereferencePhysicalNames should not be empty");
+        checkArgument(dereferenceIndices.size() == dereferencePhysicalNames.size(), "dereferenceIndices and dereferencePhysicalNames should have the same sizes");
+        this.dereferenceIndices = ImmutableList.copyOf(dereferenceIndices);
+        this.dereferencePhysicalNames = ImmutableList.copyOf(dereferencePhysicalNames);
+    }
+
+    @JsonProperty
+    public Type getType()
+    {
+        return type;
+    }
+
+    @JsonProperty
+    public List<Integer> getDereferenceIndices()
+    {
+        return dereferenceIndices;
+    }
+
+    @JsonProperty
+    public List<String> getDereferencePhysicalNames()
+    {
+        return dereferencePhysicalNames;
+    }
+
+    @JsonIgnore
+    public String getPartialName()
+    {
+        return String.join("#", dereferencePhysicalNames);
+    }
+
+    @JsonIgnore
+    public long getRetainedSizeInBytes()
+    {
+        // type is not accounted for as the instances are cached (by TypeRegistry) and shared
+        return INSTANCE_SIZE
+                + estimatedSizeOf(dereferenceIndices, SizeOf::sizeOf)
+                + estimatedSizeOf(dereferencePhysicalNames, SizeOf::estimatedSizeOf);
+    }
+
+    public HiveColumnProjectionInfo toHiveColumnProjectionInfo()
+    {
+        return new HiveColumnProjectionInfo(dereferenceIndices, dereferencePhysicalNames, toHiveType(type), type);
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        DeltaLakeColumnProjectionInfo that = (DeltaLakeColumnProjectionInfo) o;
+        return Objects.equals(this.type, that.type)
+                && Objects.equals(this.dereferenceIndices, that.dereferenceIndices)
+                && Objects.equals(this.dereferencePhysicalNames, that.dereferencePhysicalNames);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(type, dereferenceIndices, dereferencePhysicalNames);
+    }
+
+    @Override
+    public String toString()
+    {
+        return getPartialName() + ":" + type.getDisplayName();
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConfig.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConfig.java
index 352b18f6c684..9dd03f686b18 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConfig.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConfig.java
@@ -21,13 +21,12 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.plugin.hive.HiveCompressionCodec;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 import org.joda.time.DateTimeZone;
 
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
 import java.util.Optional;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
@@ -52,7 +51,7 @@ public class DeltaLakeConfig
     private long metadataCacheMaxSize = 1000;
     private DataSize dataFileCacheSize = DEFAULT_DATA_FILE_CACHE_SIZE;
     private Duration dataFileCacheTtl = new Duration(30, TimeUnit.MINUTES);
-    private int domainCompactionThreshold = 100;
+    private int domainCompactionThreshold = 1000;
     private int maxOutstandingSplits = 1_000;
     private int maxSplitsPerSecond = Integer.MAX_VALUE;
     private int maxInitialSplits = 200;
@@ -77,6 +76,8 @@ public class DeltaLakeConfig
     private boolean uniqueTableLocation = true;
     private boolean legacyCreateTableWithExistingLocationEnabled;
     private boolean registerTableProcedureEnabled;
+    private boolean projectionPushdownEnabled = true;
+    private boolean queryPartitionFilterRequired;
 
     public Duration getMetadataCacheTtl()
     {
@@ -475,4 +476,30 @@ public DeltaLakeConfig setRegisterTableProcedureEnabled(boolean registerTablePro
         this.registerTableProcedureEnabled = registerTableProcedureEnabled;
         return this;
     }
+
+    public boolean isProjectionPushdownEnabled()
+    {
+        return projectionPushdownEnabled;
+    }
+
+    @Config("delta.projection-pushdown-enabled")
+    @ConfigDescription("Read only required fields from a row type")
+    public DeltaLakeConfig setProjectionPushdownEnabled(boolean projectionPushdownEnabled)
+    {
+        this.projectionPushdownEnabled = projectionPushdownEnabled;
+        return this;
+    }
+
+    public boolean isQueryPartitionFilterRequired()
+    {
+        return queryPartitionFilterRequired;
+    }
+
+    @Config("delta.query-partition-filter-required")
+    @ConfigDescription("Require filter on at least one partition column")
+    public DeltaLakeConfig setQueryPartitionFilterRequired(boolean queryPartitionFilterRequired)
+    {
+        this.queryPartitionFilterRequired = queryPartitionFilterRequired;
+        return this;
+    }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConnector.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConnector.java
index 9d4db34ccf71..27fbebd74389 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConnector.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConnector.java
@@ -13,8 +13,10 @@
  */
 package io.trino.plugin.deltalake;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Injector;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorMetadata;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
@@ -32,6 +34,8 @@
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.connector.TableProcedureMetadata;
 import io.trino.spi.eventlistener.EventListener;
+import io.trino.spi.function.FunctionProvider;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.procedure.Procedure;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
@@ -51,6 +55,7 @@
 public class DeltaLakeConnector
         implements Connector
 {
+    private final Injector injector;
     private final LifeCycleManager lifeCycleManager;
     private final ConnectorSplitManager splitManager;
     private final ConnectorPageSourceProvider pageSourceProvider;
@@ -68,8 +73,11 @@ public class DeltaLakeConnector
     // Delta lake is not transactional but we use Trino transaction boundaries to create a per-query
     // caching Hive metastore clients. DeltaLakeTransactionManager is used to store those.
     private final DeltaLakeTransactionManager transactionManager;
+    private final Set<ConnectorTableFunction> tableFunctions;
+    private final FunctionProvider functionProvider;
 
     public DeltaLakeConnector(
+            Injector injector,
             LifeCycleManager lifeCycleManager,
             ConnectorSplitManager splitManager,
             ConnectorPageSourceProvider pageSourceProvider,
@@ -84,8 +92,11 @@ public DeltaLakeConnector(
             List<PropertyMetadata<?>> analyzeProperties,
             Optional<ConnectorAccessControl> accessControl,
             Set<EventListener> eventListeners,
-            DeltaLakeTransactionManager transactionManager)
+            DeltaLakeTransactionManager transactionManager,
+            Set<ConnectorTableFunction> tableFunctions,
+            FunctionProvider functionProvider)
     {
+        this.injector = requireNonNull(injector, "injector is null");
         this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null");
         this.splitManager = requireNonNull(splitManager, "splitManager is null");
         this.pageSourceProvider = requireNonNull(pageSourceProvider, "pageSourceProvider is null");
@@ -104,6 +115,8 @@ public DeltaLakeConnector(
         this.accessControl = requireNonNull(accessControl, "accessControl is null");
         this.eventListeners = ImmutableSet.copyOf(requireNonNull(eventListeners, "eventListeners is null"));
         this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
+        this.tableFunctions = ImmutableSet.copyOf(requireNonNull(tableFunctions, "tableFunctions is null"));
+        this.functionProvider = requireNonNull(functionProvider, "functionProvider is null");
     }
 
     @Override
@@ -223,4 +236,22 @@ public Set<ConnectorCapabilities> getCapabilities()
     {
         return immutableEnumSet(NOT_NULL_COLUMN_CONSTRAINT);
     }
+
+    @Override
+    public Set<ConnectorTableFunction> getTableFunctions()
+    {
+        return tableFunctions;
+    }
+
+    @Override
+    public Optional<FunctionProvider> getFunctionProvider()
+    {
+        return Optional.of(functionProvider);
+    }
+
+    @VisibleForTesting
+    public Injector getInjector()
+    {
+        return injector;
+    }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConnectorFactory.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConnectorFactory.java
index 2adb6d98fd14..01140d080070 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConnectorFactory.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConnectorFactory.java
@@ -23,7 +23,7 @@
 import java.util.Optional;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class DeltaLakeConnectorFactory
@@ -47,7 +47,7 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         ClassLoader classLoader = context.duplicatePluginClassLoader();
         try {
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeFunctionProvider.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeFunctionProvider.java
new file mode 100644
index 000000000000..de4732d88d34
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeFunctionProvider.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.google.inject.Inject;
+import io.trino.plugin.deltalake.functions.tablechanges.TableChangesProcessorProvider;
+import io.trino.plugin.deltalake.functions.tablechanges.TableChangesTableFunctionHandle;
+import io.trino.spi.function.FunctionProvider;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
+
+import static java.util.Objects.requireNonNull;
+
+public class DeltaLakeFunctionProvider
+        implements FunctionProvider
+{
+    private final TableChangesProcessorProvider tableChangesProcessorProvider;
+
+    @Inject
+    public DeltaLakeFunctionProvider(TableChangesProcessorProvider tableChangesProcessorProvider)
+    {
+        this.tableChangesProcessorProvider = requireNonNull(tableChangesProcessorProvider, "tableChangesProcessorProvider is null");
+    }
+
+    @Override
+    public TableFunctionProcessorProvider getTableFunctionProcessorProvider(ConnectorTableFunctionHandle functionHandle)
+    {
+        if (functionHandle instanceof TableChangesTableFunctionHandle) {
+            return tableChangesProcessorProvider;
+        }
+        throw new UnsupportedOperationException("Unsupported function: " + functionHandle);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeGcsModule.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeGcsModule.java
deleted file mode 100644
index 057b4d792eb8..000000000000
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeGcsModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.deltalake;
-
-import com.google.inject.Binder;
-import com.google.inject.Scopes;
-import io.airlift.configuration.AbstractConfigurationAwareModule;
-import io.trino.plugin.deltalake.transactionlog.writer.GcsTransactionLogSynchronizer;
-import io.trino.plugin.deltalake.transactionlog.writer.TransactionLogSynchronizer;
-
-import static com.google.inject.multibindings.MapBinder.newMapBinder;
-
-public class DeltaLakeGcsModule
-        extends AbstractConfigurationAwareModule
-{
-    @Override
-    protected void setup(Binder binder)
-    {
-        binder.bind(GcsStorageFactory.class).in(Scopes.SINGLETON);
-        newMapBinder(binder, String.class, TransactionLogSynchronizer.class).addBinding("gs").to(GcsTransactionLogSynchronizer.class).in(Scopes.SINGLETON);
-    }
-}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeHistoryTable.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeHistoryTable.java
index fa68cfec7717..adf6fe79b256 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeHistoryTable.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeHistoryTable.java
@@ -14,46 +14,72 @@
 package io.trino.plugin.deltalake;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.deltalake.transactionlog.CommitInfoEntry;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
+import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
+import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
 import io.trino.plugin.deltalake.util.PageListBuilder;
 import io.trino.spi.Page;
+import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.ConnectorTransactionHandle;
+import io.trino.spi.connector.EmptyPageSource;
 import io.trino.spi.connector.FixedPageSource;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SystemTable;
+import io.trino.spi.predicate.Domain;
+import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.TimeZoneKey;
 import io.trino.spi.type.TypeManager;
 
+import java.io.IOException;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.IntStream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.MoreCollectors.onlyElement;
+import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA;
+import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogDir;
+import static io.trino.plugin.deltalake.transactionlog.checkpoint.TransactionLogTail.getEntriesFromJson;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
 import static io.trino.spi.type.TypeSignature.mapType;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static java.util.Comparator.comparingLong;
 import static java.util.Objects.requireNonNull;
 
 public class DeltaLakeHistoryTable
         implements SystemTable
 {
+    private final SchemaTableName tableName;
+    private final String tableLocation;
+    private final TrinoFileSystemFactory fileSystemFactory;
+    private final TransactionLogAccess transactionLogAccess;
     private final ConnectorTableMetadata tableMetadata;
-    private final List<CommitInfoEntry> commitInfoEntries;
 
-    public DeltaLakeHistoryTable(SchemaTableName tableName, List<CommitInfoEntry> commitInfoEntries, TypeManager typeManager)
+    public DeltaLakeHistoryTable(
+            SchemaTableName tableName,
+            String tableLocation,
+            TrinoFileSystemFactory fileSystemFactory,
+            TransactionLogAccess transactionLogAccess,
+            TypeManager typeManager)
     {
         requireNonNull(typeManager, "typeManager is null");
-        this.commitInfoEntries = ImmutableList.copyOf(requireNonNull(commitInfoEntries, "commitInfoEntries is null")).stream()
-                .sorted(comparingLong(CommitInfoEntry::getVersion).reversed())
-                .collect(toImmutableList());
+        this.tableName = requireNonNull(tableName, "tableName is null");
+        this.tableLocation = requireNonNull(tableLocation, "tableLocation is null");
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
+        this.transactionLogAccess = requireNonNull(transactionLogAccess, "transactionLogAccess is null");
 
-        tableMetadata = new ConnectorTableMetadata(
+        this.tableMetadata = new ConnectorTableMetadata(
                 requireNonNull(tableName, "tableName is null"),
                 ImmutableList.<ColumnMetadata>builder()
                         .add(new ColumnMetadata("version", BIGINT))
@@ -85,13 +111,109 @@ public ConnectorTableMetadata getTableMetadata()
     @Override
     public ConnectorPageSource pageSource(ConnectorTransactionHandle transactionHandle, ConnectorSession session, TupleDomain<Integer> constraint)
     {
-        if (commitInfoEntries.isEmpty()) {
-            return new FixedPageSource(ImmutableList.of());
+        long snapshotVersion;
+        try {
+            // Verify the transaction log is readable
+            SchemaTableName baseTableName = new SchemaTableName(tableName.getSchemaName(), DeltaLakeTableName.tableNameFrom(tableName.getTableName()));
+            TableSnapshot tableSnapshot = transactionLogAccess.loadSnapshot(session, baseTableName, tableLocation);
+            snapshotVersion = tableSnapshot.getVersion();
+            transactionLogAccess.getMetadataEntry(tableSnapshot, session);
         }
-        return new FixedPageSource(buildPages(session));
+        catch (IOException e) {
+            throw new TrinoException(DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA, "Unable to load table metadata from location: " + tableLocation, e);
+        }
+
+        int versionColumnIndex = IntStream.range(0, tableMetadata.getColumns().size())
+                .filter(i -> tableMetadata.getColumns().get(i).getName().equals("version"))
+                .boxed()
+                .collect(onlyElement());
+
+        Optional<Long> startVersionExclusive = Optional.empty();
+        Optional<Long> endVersionInclusive = Optional.empty();
+
+        if (constraint.getDomains().isPresent()) {
+            Map<Integer, Domain> domains = constraint.getDomains().get();
+            if (domains.containsKey(versionColumnIndex)) {
+                Domain versionDomain = domains.get(versionColumnIndex); // The zero value here relies on the column ordering defined in the constructor
+                Range range = versionDomain.getValues().getRanges().getSpan();
+                if (range.isSingleValue()) {
+                    long value = (long) range.getSingleValue();
+                    startVersionExclusive = Optional.of(value - 1);
+                    endVersionInclusive = Optional.of(value);
+                }
+                else {
+                    Optional<Long> lowValue = range.getLowValue().map(Long.class::cast);
+                    if (lowValue.isPresent()) {
+                        startVersionExclusive = Optional.of(lowValue.get() - (range.isLowInclusive() ? 1 : 0));
+                    }
+
+                    Optional<Long> highValue = range.getHighValue().map(Long.class::cast);
+                    if (highValue.isPresent()) {
+                        endVersionInclusive = Optional.of(highValue.get() - (range.isHighInclusive() ? 0 : 1));
+                    }
+                }
+            }
+        }
+
+        if (startVersionExclusive.isPresent() && endVersionInclusive.isPresent() && startVersionExclusive.get() >= endVersionInclusive.get()) {
+            return new EmptyPageSource();
+        }
+
+        if (endVersionInclusive.isEmpty()) {
+            endVersionInclusive = Optional.of(snapshotVersion);
+        }
+
+        TrinoFileSystem fileSystem = fileSystemFactory.create(session);
+        try {
+            List<CommitInfoEntry> commitInfoEntries = loadNewTailBackward(fileSystem, tableLocation, startVersionExclusive, endVersionInclusive.get()).stream()
+                    .map(DeltaLakeTransactionLogEntry::getCommitInfo)
+                    .filter(Objects::nonNull)
+                    .collect(toImmutableList())
+                    .reverse();
+            return new FixedPageSource(buildPages(session, commitInfoEntries));
+        }
+        catch (TrinoException e) {
+            throw e;
+        }
+        catch (IOException | RuntimeException e) {
+            throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Error getting commit info entries from " + tableLocation, e);
+        }
+    }
+
+    // Load a section of the Transaction Log JSON entries. Optionally from a given end version (inclusive) through an start version (exclusive)
+    private static List<DeltaLakeTransactionLogEntry> loadNewTailBackward(
+            TrinoFileSystem fileSystem,
+            String tableLocation,
+            Optional<Long> startVersion,
+            long endVersion)
+            throws IOException
+    {
+        ImmutableList.Builder<DeltaLakeTransactionLogEntry> entriesBuilder = ImmutableList.builder();
+        String transactionLogDir = getTransactionLogDir(tableLocation);
+
+        long version = endVersion;
+        long entryNumber = version;
+        boolean endOfHead = false;
+
+        while (!endOfHead) {
+            Optional<List<DeltaLakeTransactionLogEntry>> results = getEntriesFromJson(entryNumber, transactionLogDir, fileSystem);
+            if (results.isPresent()) {
+                entriesBuilder.addAll(results.get());
+                version = entryNumber;
+                entryNumber--;
+            }
+            else {
+                // When there is a gap in the transaction log version, indicate the end of the current head
+                endOfHead = true;
+            }
+            if ((startVersion.isPresent() && version == startVersion.get() + 1) || entryNumber < 0) {
+                endOfHead = true;
+            }
+        }
+        return entriesBuilder.build();
     }
 
-    private List<Page> buildPages(ConnectorSession session)
+    private List<Page> buildPages(ConnectorSession session, List<CommitInfoEntry> commitInfoEntries)
     {
         PageListBuilder pagesBuilder = PageListBuilder.forTable(tableMetadata);
         TimeZoneKey timeZoneKey = session.getTimeZoneKey();
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeInsertTableHandle.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeInsertTableHandle.java
index 95425a4ae400..fef3c829aa11 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeInsertTableHandle.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeInsertTableHandle.java
@@ -17,7 +17,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
+import io.trino.spi.connector.SchemaTableName;
 
 import java.util.List;
 
@@ -26,27 +28,27 @@
 public class DeltaLakeInsertTableHandle
         implements ConnectorInsertTableHandle
 {
-    private final String schemaName;
-    private final String tableName;
+    private final SchemaTableName tableName;
     private final String location;
     private final MetadataEntry metadataEntry;
+    private final ProtocolEntry protocolEntry;
     private final List<DeltaLakeColumnHandle> inputColumns;
     private final long readVersion;
     private final boolean retriesEnabled;
 
     @JsonCreator
     public DeltaLakeInsertTableHandle(
-            @JsonProperty("schemaName") String schemaName,
-            @JsonProperty("tableName") String tableName,
+            @JsonProperty("tableName") SchemaTableName tableName,
             @JsonProperty("location") String location,
             @JsonProperty("metadataEntry") MetadataEntry metadataEntry,
+            @JsonProperty("protocolEntry") ProtocolEntry protocolEntry,
             @JsonProperty("inputColumns") List<DeltaLakeColumnHandle> inputColumns,
             @JsonProperty("readVersion") long readVersion,
             @JsonProperty("retriesEnabled") boolean retriesEnabled)
     {
-        this.schemaName = requireNonNull(schemaName, "schemaName is null");
         this.tableName = requireNonNull(tableName, "tableName is null");
         this.metadataEntry = requireNonNull(metadataEntry, "metadataEntry is null");
+        this.protocolEntry = requireNonNull(protocolEntry, "protocolEntry is null");
         this.inputColumns = ImmutableList.copyOf(inputColumns);
         this.location = requireNonNull(location, "location is null");
         this.readVersion = readVersion;
@@ -54,13 +56,7 @@ public DeltaLakeInsertTableHandle(
     }
 
     @JsonProperty
-    public String getSchemaName()
-    {
-        return schemaName;
-    }
-
-    @JsonProperty
-    public String getTableName()
+    public SchemaTableName getTableName()
     {
         return tableName;
     }
@@ -77,6 +73,12 @@ public MetadataEntry getMetadataEntry()
         return metadataEntry;
     }
 
+    @JsonProperty
+    public ProtocolEntry getProtocolEntry()
+    {
+        return protocolEntry;
+    }
+
     @JsonProperty
     public List<DeltaLakeColumnHandle> getInputColumns()
     {
@@ -94,4 +96,10 @@ public boolean isRetriesEnabled()
     {
         return retriesEnabled;
     }
+
+    @Override
+    public String toString()
+    {
+        return tableName + "[" + location + "]";
+    }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMergeSink.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMergeSink.java
index cbd247634705..e374d68f8bea 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMergeSink.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMergeSink.java
@@ -18,21 +18,19 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.parquet.ParquetReaderOptions;
-import io.trino.parquet.writer.ParquetSchemaConverter;
 import io.trino.parquet.writer.ParquetWriterOptions;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
-import io.trino.plugin.hive.FileWriter;
 import io.trino.plugin.hive.ReaderPageSource;
 import io.trino.plugin.hive.parquet.ParquetFileWriter;
 import io.trino.plugin.hive.parquet.ParquetPageSourceFactory;
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.ColumnarRow;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.connector.ConnectorMergeSink;
 import io.trino.spi.connector.ConnectorPageSink;
@@ -41,14 +39,12 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
-import org.apache.hadoop.fs.Path;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.format.CompressionCodec;
 import org.joda.time.DateTimeZone;
 import org.roaringbitmap.longlong.LongBitmapDataProvider;
 import org.roaringbitmap.longlong.Roaring64Bitmap;
 
-import javax.annotation.Nullable;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -57,10 +53,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 import java.util.stream.IntStream;
 
+import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.json.JsonCodec.listJsonCodec;
 import static io.airlift.slice.Slices.utf8Slice;
@@ -68,17 +66,17 @@
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.SYNTHESIZED;
 import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_BAD_WRITE;
+import static io.trino.plugin.deltalake.DeltaLakeMetadata.relativePath;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getCompressionCodec;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getParquetWriterBlockSize;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getParquetWriterPageSize;
 import static io.trino.plugin.deltalake.DeltaLakeTypes.toParquetType;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.deserializePartitionValue;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
+import static io.trino.spi.block.RowBlock.getRowFieldsFromBlock;
 import static io.trino.spi.predicate.Utils.nativeValueToBlock;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
@@ -102,7 +100,7 @@ public class DeltaLakeMergeSink
     private final JsonCodec<DataFileInfo> dataFileInfoCodec;
     private final JsonCodec<DeltaLakeMergeResult> mergeResultJsonCodec;
     private final DeltaLakeWriterStats writerStats;
-    private final String rootTableLocation;
+    private final Location rootTableLocation;
     private final ConnectorPageSink insertPageSink;
     private final List<DeltaLakeColumnHandle> dataColumns;
     private final List<DeltaLakeColumnHandle> nonSynthesizedColumns;
@@ -113,6 +111,7 @@ public class DeltaLakeMergeSink
     private final Map<Slice, FileDeletion> fileDeletions = new HashMap<>();
     private final int[] dataColumnsIndices;
     private final int[] dataAndRowIdColumnsIndices;
+    private final DeltaLakeParquetSchemaMapping parquetSchemaMapping;
 
     @Nullable
     private DeltaLakeCdfPageSink cdfPageSink;
@@ -126,12 +125,13 @@ public DeltaLakeMergeSink(
             JsonCodec<DataFileInfo> dataFileInfoCodec,
             JsonCodec<DeltaLakeMergeResult> mergeResultJsonCodec,
             DeltaLakeWriterStats writerStats,
-            String rootTableLocation,
+            Location rootTableLocation,
             ConnectorPageSink insertPageSink,
             List<DeltaLakeColumnHandle> tableColumns,
             int domainCompactionThreshold,
             Supplier<DeltaLakeCdfPageSink> cdfPageSinkSupplier,
-            boolean cdfEnabled)
+            boolean cdfEnabled,
+            DeltaLakeParquetSchemaMapping parquetSchemaMapping)
     {
         this.typeOperators = requireNonNull(typeOperators, "typeOperators is null");
         this.session = requireNonNull(session, "session is null");
@@ -154,6 +154,7 @@ public DeltaLakeMergeSink(
                 .collect(toImmutableList());
         this.cdfPageSinkSupplier = requireNonNull(cdfPageSinkSupplier);
         this.cdfEnabled = cdfEnabled;
+        this.parquetSchemaMapping = requireNonNull(parquetSchemaMapping, "parquetSchemaMapping is null");
         dataColumnsIndices = new int[tableColumnCount];
         dataAndRowIdColumnsIndices = new int[tableColumnCount + 1];
         for (int i = 0; i < tableColumnCount; i++) {
@@ -197,16 +198,18 @@ private void processInsertions(Optional<Page> optionalInsertionPage, String cdfO
 
     private void processDeletion(Page deletions, String cdfOperation)
     {
-        ColumnarRow rowIdRow = toColumnarRow(deletions.getBlock(deletions.getChannelCount() - 1));
-
-        for (int position = 0; position < rowIdRow.getPositionCount(); position++) {
-            Slice filePath = VARCHAR.getSlice(rowIdRow.getField(0), position);
-            long rowPosition = BIGINT.getLong(rowIdRow.getField(1), position);
-            Slice partitions = VARCHAR.getSlice(rowIdRow.getField(2), position);
+        List<Block> fields = getRowFieldsFromBlock(deletions.getBlock(deletions.getChannelCount() - 1));
+        Block filePathBlock = fields.get(0);
+        Block rowPositionBlock = fields.get(1);
+        Block partitionsBlock = fields.get(2);
+        for (int position = 0; position < filePathBlock.getPositionCount(); position++) {
+            Slice filePath = VARCHAR.getSlice(filePathBlock, position);
+            long rowPosition = BIGINT.getLong(rowPositionBlock, position);
+            Slice partitions = VARCHAR.getSlice(partitionsBlock, position);
 
             List<String> partitionValues = PARTITIONS_CODEC.fromJson(partitions.toStringUtf8());
 
-            FileDeletion deletion = fileDeletions.computeIfAbsent(filePath, x -> new FileDeletion(partitionValues));
+            FileDeletion deletion = fileDeletions.computeIfAbsent(filePath, ignored -> new FileDeletion(partitionValues));
 
             if (cdfOperation.equals(UPDATE_PREIMAGE_CDF_LABEL)) {
                 deletion.rowsDeletedByUpdate().addLong(rowPosition);
@@ -239,7 +242,7 @@ private DeltaLakeMergePage createPages(Page inputPage, int dataColumnCount)
         int updateDeletePositionCount = 0;
 
         for (int position = 0; position < positionCount; position++) {
-            int operation = toIntExact(TINYINT.getLong(operationBlock, position));
+            byte operation = TINYINT.getByte(operationBlock, position);
             switch (operation) {
                 case DELETE_OPERATION_NUMBER:
                     deletePositions[deletePositionCount] = position;
@@ -305,7 +308,7 @@ public CompletableFuture<Collection<Slice>> finish()
                 .forEach(fragments::add);
 
         fileDeletions.forEach((path, deletion) ->
-                fragments.addAll(rewriteFile(new Path(path.toStringUtf8()), deletion)));
+                fragments.addAll(rewriteFile(path.toStringUtf8(), deletion)));
 
         if (cdfEnabled && cdfPageSink != null) { // cdf may be enabled but there may be no update/deletion so sink was not instantiated
             MoreFutures.getDone(cdfPageSink.finish()).stream()
@@ -321,18 +324,18 @@ public CompletableFuture<Collection<Slice>> finish()
     }
 
     // In spite of the name "Delta" Lake, we must rewrite the entire file to delete rows.
-    private List<Slice> rewriteFile(Path sourcePath, FileDeletion deletion)
+    private List<Slice> rewriteFile(String sourcePath, FileDeletion deletion)
     {
         try {
-            Path rootTablePath = new Path(rootTableLocation);
-            String sourceRelativePath = rootTablePath.toUri().relativize(sourcePath.toUri()).toString();
+            String tablePath = rootTableLocation.toString();
+            Location sourceLocation = Location.of(sourcePath);
+            String sourceRelativePath = relativePath(tablePath, sourcePath);
 
-            Path targetPath = new Path(sourcePath.getParent(), session.getQueryId() + "_" + randomUUID());
-            String targetRelativePath = rootTablePath.toUri().relativize(targetPath.toUri()).toString();
-            FileWriter fileWriter = createParquetFileWriter(targetPath.toString(), dataColumns);
+            Location targetLocation = sourceLocation.sibling(session.getQueryId() + "_" + randomUUID());
+            String targetRelativePath = relativePath(tablePath, targetLocation.toString());
+            ParquetFileWriter fileWriter = createParquetFileWriter(targetLocation, dataColumns);
 
             DeltaLakeWriter writer = new DeltaLakeWriter(
-                    fileSystem,
                     fileWriter,
                     rootTableLocation,
                     targetRelativePath,
@@ -341,7 +344,7 @@ private List<Slice> rewriteFile(Path sourcePath, FileDeletion deletion)
                     dataColumns,
                     DATA);
 
-            Optional<DataFileInfo> newFileInfo = rewriteParquetFile(sourcePath, deletion, writer);
+            Optional<DataFileInfo> newFileInfo = rewriteParquetFile(sourceLocation, deletion, writer);
 
             DeltaLakeMergeResult result = new DeltaLakeMergeResult(Optional.of(sourceRelativePath), newFileInfo);
             return ImmutableList.of(utf8Slice(mergeResultJsonCodec.toJson(result)));
@@ -351,7 +354,7 @@ private List<Slice> rewriteFile(Path sourcePath, FileDeletion deletion)
         }
     }
 
-    private FileWriter createParquetFileWriter(String path, List<DeltaLakeColumnHandle> dataColumns)
+    private ParquetFileWriter createParquetFileWriter(Location path, List<DeltaLakeColumnHandle> dataColumns)
     {
         ParquetWriterOptions parquetWriterOptions = ParquetWriterOptions.builder()
                 .setMaxBlockSize(getParquetWriterBlockSize(session))
@@ -361,32 +364,26 @@ private FileWriter createParquetFileWriter(String path, List<DeltaLakeColumnHand
 
         try {
             Closeable rollbackAction = () -> fileSystem.deleteFile(path);
+            dataColumns.forEach(column -> verify(column.isBaseColumn(), "Unexpected dereference: %s", column));
 
             List<Type> parquetTypes = dataColumns.stream()
-                    .map(column -> toParquetType(typeOperators, column.getType()))
+                    .map(column -> toParquetType(typeOperators, column.getBasePhysicalType()))
                     .collect(toImmutableList());
-
             List<String> dataColumnNames = dataColumns.stream()
-                    .map(DeltaLakeColumnHandle::getName)
+                    .map(DeltaLakeColumnHandle::getBasePhysicalColumnName)
                     .collect(toImmutableList());
-            ParquetSchemaConverter schemaConverter = new ParquetSchemaConverter(
-                    parquetTypes,
-                    dataColumnNames,
-                    false,
-                    false);
 
             return new ParquetFileWriter(
                     fileSystem.newOutputFile(path),
                     rollbackAction,
                     parquetTypes,
                     dataColumnNames,
-                    schemaConverter.getMessageType(),
-                    schemaConverter.getPrimitiveTypes(),
+                    parquetSchemaMapping.messageType(),
+                    parquetSchemaMapping.primitiveTypes(),
                     parquetWriterOptions,
                     IntStream.range(0, dataColumns.size()).toArray(),
                     compressionCodec,
                     trinoVersion,
-                    false,
                     Optional.empty(),
                     Optional.empty());
         }
@@ -395,7 +392,7 @@ private FileWriter createParquetFileWriter(String path, List<DeltaLakeColumnHand
         }
     }
 
-    private Optional<DataFileInfo> rewriteParquetFile(Path path, FileDeletion deletion, DeltaLakeWriter fileWriter)
+    private Optional<DataFileInfo> rewriteParquetFile(Location path, FileDeletion deletion, DeltaLakeWriter fileWriter)
             throws IOException
     {
         LongBitmapDataProvider rowsDeletedByDelete = deletion.rowsDeletedByDelete();
@@ -481,7 +478,7 @@ private void storeCdfEntries(Page page, int[] deleted, int deletedCount, FileDel
                 }
                 else {
                     outputBlocks[i] = RunLengthEncodedBlock.create(nativeValueToBlock(
-                                    nonSynthesizedColumns.get(i).getType(),
+                                    nonSynthesizedColumns.get(i).getBaseType(),
                                     deserializePartitionValue(
                                             nonSynthesizedColumns.get(i),
                                             Optional.ofNullable(partitionValues.get(partitionIndex)))),
@@ -496,25 +493,26 @@ private void storeCdfEntries(Page page, int[] deleted, int deletedCount, FileDel
         }
     }
 
-    private ReaderPageSource createParquetPageSource(Path path)
+    private ReaderPageSource createParquetPageSource(Location path)
             throws IOException
     {
-        TrinoInputFile inputFile = fileSystem.newInputFile(path.toString());
-
+        TrinoInputFile inputFile = fileSystem.newInputFile(path);
+        long fileSize = inputFile.length();
         return ParquetPageSourceFactory.createPageSource(
                 inputFile,
                 0,
-                inputFile.length(),
+                fileSize,
                 dataColumns.stream()
                         .map(DeltaLakeColumnHandle::toHiveColumnHandle)
                         .collect(toImmutableList()),
-                TupleDomain.all(),
+                ImmutableList.of(TupleDomain.all()),
                 true,
                 parquetDateTimeZone,
                 new FileFormatDataSourceStats(),
                 new ParquetReaderOptions().withBloomFilter(false),
                 Optional.empty(),
-                domainCompactionThreshold);
+                domainCompactionThreshold,
+                OptionalLong.of(fileSize));
     }
 
     @Override
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadata.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadata.java
index 00d479af618e..75aed4c98c62 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadata.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadata.java
@@ -14,45 +14,53 @@
 package io.trino.plugin.deltalake;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.VerifyException;
 import com.google.common.collect.Comparators;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableTable;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
 import io.airlift.stats.cardinality.HyperLogLog;
 import io.airlift.units.DataSize;
-import io.trino.filesystem.FileEntry;
 import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.classloader.ClassLoaderSafeSystemTable;
+import io.trino.plugin.base.projection.ApplyProjectionUtil;
+import io.trino.plugin.deltalake.DeltaLakeAnalyzeProperties.AnalyzeMode;
+import io.trino.plugin.deltalake.expression.ParsingException;
 import io.trino.plugin.deltalake.expression.SparkExpressionParser;
 import io.trino.plugin.deltalake.metastore.DeltaLakeMetastore;
+import io.trino.plugin.deltalake.metastore.DeltaMetastoreTable;
 import io.trino.plugin.deltalake.metastore.NotADeltaLakeTableException;
 import io.trino.plugin.deltalake.procedure.DeltaLakeTableExecuteHandle;
 import io.trino.plugin.deltalake.procedure.DeltaLakeTableProcedureId;
 import io.trino.plugin.deltalake.procedure.DeltaTableOptimizeHandle;
+import io.trino.plugin.deltalake.statistics.CachingExtendedStatisticsAccess;
 import io.trino.plugin.deltalake.statistics.DeltaLakeColumnStatistics;
+import io.trino.plugin.deltalake.statistics.DeltaLakeTableStatisticsProvider;
 import io.trino.plugin.deltalake.statistics.ExtendedStatistics;
-import io.trino.plugin.deltalake.statistics.ExtendedStatisticsAccess;
 import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
-import io.trino.plugin.deltalake.transactionlog.CdfFileEntry;
+import io.trino.plugin.deltalake.transactionlog.CdcEntry;
 import io.trino.plugin.deltalake.transactionlog.CommitInfoEntry;
-import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeComputedStatistics;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.ColumnMappingMode;
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry.Format;
 import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.plugin.deltalake.transactionlog.RemoveFileEntry;
 import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
+import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
 import io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointWriterManager;
-import io.trino.plugin.deltalake.transactionlog.checkpoint.TransactionLogTail;
 import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeFileStatistics;
+import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeJsonFileStatistics;
 import io.trino.plugin.deltalake.transactionlog.writer.TransactionConflictException;
 import io.trino.plugin.deltalake.transactionlog.writer.TransactionLogWriter;
 import io.trino.plugin.deltalake.transactionlog.writer.TransactionLogWriterFactory;
@@ -72,10 +80,10 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.connector.Assignment;
 import io.trino.spi.connector.BeginTableExecuteResult;
-import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.ColumnNotFoundException;
 import io.trino.spi.connector.ConnectorAnalyzeMetadata;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorMergeTableHandle;
@@ -102,6 +110,8 @@
 import io.trino.spi.connector.TableColumnsMetadata;
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.connector.TableScanRedirectApplicationResult;
+import io.trino.spi.connector.ViewNotFoundException;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.expression.ConnectorExpression;
 import io.trino.spi.expression.Variable;
 import io.trino.spi.predicate.Domain;
@@ -113,6 +123,7 @@
 import io.trino.spi.statistics.ColumnStatisticMetadata;
 import io.trino.spi.statistics.ColumnStatisticType;
 import io.trino.spi.statistics.ComputedStatistics;
+import io.trino.spi.statistics.TableStatisticType;
 import io.trino.spi.statistics.TableStatistics;
 import io.trino.spi.statistics.TableStatisticsMetadata;
 import io.trino.spi.type.ArrayType;
@@ -121,65 +132,81 @@
 import io.trino.spi.type.HyperLogLogType;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
+import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.TimestampWithTimeZoneType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.VarcharType;
-import org.apache.hadoop.fs.Path;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.time.Instant;
 import java.util.ArrayDeque;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.common.collect.MoreCollectors.toOptional;
+import static com.google.common.collect.Maps.filterKeys;
 import static com.google.common.collect.Sets.difference;
 import static com.google.common.primitives.Ints.max;
+import static io.trino.filesystem.Locations.appendPath;
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.ProjectedColumnRepresentation;
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.extractSupportedProjectedColumns;
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.replaceWithNewVariables;
 import static io.trino.plugin.deltalake.DataFileInfo.DataFileType.DATA;
+import static io.trino.plugin.deltalake.DeltaLakeAnalyzeProperties.AnalyzeMode.FULL_REFRESH;
+import static io.trino.plugin.deltalake.DeltaLakeAnalyzeProperties.AnalyzeMode.INCREMENTAL;
 import static io.trino.plugin.deltalake.DeltaLakeAnalyzeProperties.getColumnNames;
 import static io.trino.plugin.deltalake.DeltaLakeAnalyzeProperties.getFilesModifiedAfterProperty;
+import static io.trino.plugin.deltalake.DeltaLakeAnalyzeProperties.getRefreshMode;
 import static io.trino.plugin.deltalake.DeltaLakeColumnHandle.FILE_MODIFIED_TIME_COLUMN_NAME;
-import static io.trino.plugin.deltalake.DeltaLakeColumnHandle.MERGE_ROW_ID_TYPE;
-import static io.trino.plugin.deltalake.DeltaLakeColumnHandle.ROW_ID_COLUMN_NAME;
+import static io.trino.plugin.deltalake.DeltaLakeColumnHandle.PATH_COLUMN_NAME;
 import static io.trino.plugin.deltalake.DeltaLakeColumnHandle.fileModifiedTimeColumnHandle;
 import static io.trino.plugin.deltalake.DeltaLakeColumnHandle.fileSizeColumnHandle;
+import static io.trino.plugin.deltalake.DeltaLakeColumnHandle.mergeRowIdColumnHandle;
 import static io.trino.plugin.deltalake.DeltaLakeColumnHandle.pathColumnHandle;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.PARTITION_KEY;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.SYNTHESIZED;
 import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_BAD_WRITE;
+import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_FILESYSTEM_ERROR;
 import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getHiveCatalogName;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isCollectExtendedStatisticsColumnStatisticsOnWrite;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isExtendedStatisticsEnabled;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isLegacyCreateTableWithExistingLocationEnabled;
+import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isProjectionPushdownEnabled;
+import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isQueryPartitionFilterRequired;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isTableStatisticsEnabled;
+import static io.trino.plugin.deltalake.DeltaLakeSplitManager.partitionMatchesPredicate;
 import static io.trino.plugin.deltalake.DeltaLakeTableProperties.CHANGE_DATA_FEED_ENABLED_PROPERTY;
 import static io.trino.plugin.deltalake.DeltaLakeTableProperties.CHECKPOINT_INTERVAL_PROPERTY;
+import static io.trino.plugin.deltalake.DeltaLakeTableProperties.COLUMN_MAPPING_MODE_PROPERTY;
 import static io.trino.plugin.deltalake.DeltaLakeTableProperties.LOCATION_PROPERTY;
 import static io.trino.plugin.deltalake.DeltaLakeTableProperties.PARTITIONED_BY_PROPERTY;
 import static io.trino.plugin.deltalake.DeltaLakeTableProperties.getChangeDataFeedEnabled;
@@ -190,25 +217,42 @@
 import static io.trino.plugin.deltalake.metastore.HiveMetastoreBackedDeltaLakeMetastore.TABLE_PROVIDER_VALUE;
 import static io.trino.plugin.deltalake.procedure.DeltaLakeTableProcedureId.OPTIMIZE;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.APPEND_ONLY_CONFIGURATION_KEY;
-import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.extractColumnMetadata;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.COLUMN_MAPPING_PHYSICAL_NAME_CONFIGURATION_KEY;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.ColumnMappingMode.ID;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.ColumnMappingMode.NAME;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.ColumnMappingMode.NONE;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.MAX_COLUMN_ID_CONFIGURATION_KEY;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.TIMESTAMP_NTZ_FEATURE_NAME;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.changeDataFeedEnabled;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.deserializeType;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.extractPartitionColumns;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.extractSchema;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.generateColumnMetadata;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getCheckConstraints;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getColumnComments;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getColumnIdentities;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getColumnInvariants;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getColumnMappingMode;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getColumnTypes;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getColumnsMetadata;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getColumnsNullability;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getExactColumnNames;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getGeneratedColumnExpressions;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getMaxColumnId;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.isAppendOnly;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.serializeColumnType;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.serializeSchemaAsJson;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.serializeStatsAsJson;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.unsupportedReaderFeatures;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.unsupportedWriterFeatures;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.validateType;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.verifySupportedColumnMapping;
 import static io.trino.plugin.deltalake.transactionlog.MetadataEntry.DELTA_CHANGE_DATA_FEED_ENABLED_PROPERTY;
 import static io.trino.plugin.deltalake.transactionlog.MetadataEntry.configurationForNewTable;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.getMandatoryCurrentVersion;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogDir;
+import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.METADATA;
+import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.PROTOCOL;
 import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME;
 import static io.trino.plugin.hive.TableType.EXTERNAL_TABLE;
 import static io.trino.plugin.hive.TableType.MANAGED_TABLE;
@@ -218,12 +262,14 @@
 import static io.trino.plugin.hive.util.HiveClassNames.HIVE_SEQUENCEFILE_OUTPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.LAZY_SIMPLE_SERDE_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.SEQUENCEFILE_INPUT_FORMAT_CLASS;
+import static io.trino.plugin.hive.util.HiveUtil.escapeTableName;
 import static io.trino.plugin.hive.util.HiveUtil.isDeltaLakeTable;
 import static io.trino.plugin.hive.util.HiveUtil.isHiveSystemSchema;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.StandardErrorCode.INVALID_ANALYZE_PROPERTY;
 import static io.trino.spi.StandardErrorCode.INVALID_SCHEMA_PROPERTY;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.StandardErrorCode.QUERY_REJECTED;
 import static io.trino.spi.connector.RetryMode.NO_RETRIES;
 import static io.trino.spi.connector.RowChangeParadigm.DELETE_ROW_AND_INSERT_ROW;
 import static io.trino.spi.connector.SchemaTableName.schemaTableName;
@@ -234,7 +280,9 @@
 import static io.trino.spi.predicate.Utils.blockToNativeValue;
 import static io.trino.spi.predicate.ValueSet.ofRanges;
 import static io.trino.spi.statistics.ColumnStatisticType.MAX_VALUE;
+import static io.trino.spi.statistics.ColumnStatisticType.MIN_VALUE;
 import static io.trino.spi.statistics.ColumnStatisticType.NUMBER_OF_DISTINCT_VALUES_SUMMARY;
+import static io.trino.spi.statistics.ColumnStatisticType.NUMBER_OF_NON_NULL_VALUES;
 import static io.trino.spi.statistics.ColumnStatisticType.TOTAL_SIZE_IN_BYTES;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -246,11 +294,14 @@
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.TypeUtils.isFloatingPointNaN;
+import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.String.format;
 import static java.time.Instant.EPOCH;
 import static java.util.Collections.singletonList;
 import static java.util.Collections.unmodifiableMap;
+import static java.util.Comparator.naturalOrder;
+import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static java.util.UUID.randomUUID;
 import static java.util.function.Function.identity;
@@ -270,8 +321,13 @@ public class DeltaLakeMetadata
     public static final String CREATE_TABLE_AS_OPERATION = "CREATE TABLE AS SELECT";
     public static final String CREATE_TABLE_OPERATION = "CREATE TABLE";
     public static final String ADD_COLUMN_OPERATION = "ADD COLUMNS";
+    public static final String DROP_COLUMN_OPERATION = "DROP COLUMNS";
+    public static final String RENAME_COLUMN_OPERATION = "RENAME COLUMN";
     public static final String INSERT_OPERATION = "WRITE";
     public static final String MERGE_OPERATION = "MERGE";
+    public static final String UPDATE_OPERATION = "UPDATE"; // used by old Trino versions and Spark
+    public static final String DELETE_OPERATION = "DELETE"; // used Trino for whole table/partition deletes as well as Spark
+    public static final String TRUNCATE_OPERATION = "TRUNCATE";
     public static final String OPTIMIZE_OPERATION = "OPTIMIZE";
     public static final String SET_TBLPROPERTIES_OPERATION = "SET TBLPROPERTIES";
     public static final String CHANGE_COLUMN_OPERATION = "CHANGE COLUMN";
@@ -279,9 +335,14 @@ public class DeltaLakeMetadata
 
     public static final int DEFAULT_READER_VERSION = 1;
     public static final int DEFAULT_WRITER_VERSION = 2;
-    // The highest reader and writer versions Trino supports writing to
-    public static final int MAX_WRITER_VERSION = 4;
+    // The highest reader and writer versions Trino supports
+    private static final int MAX_READER_VERSION = 3;
+    public static final int MAX_WRITER_VERSION = 7;
     private static final int CDF_SUPPORTED_WRITER_VERSION = 4;
+    private static final int COLUMN_MAPPING_MODE_SUPPORTED_READER_VERSION = 2;
+    private static final int COLUMN_MAPPING_MODE_SUPPORTED_WRITER_VERSION = 5;
+    private static final int TIMESTAMP_NTZ_SUPPORTED_READER_VERSION = 3;
+    private static final int TIMESTAMP_NTZ_SUPPORTED_WRITER_VERSION = 7;
 
     // Matches the dummy column Databricks stores in the metastore
     private static final List<Column> DUMMY_DATA_COLUMNS = ImmutableList.of(
@@ -289,11 +350,24 @@ public class DeltaLakeMetadata
     private static final Set<ColumnStatisticType> SUPPORTED_STATISTICS_TYPE = ImmutableSet.<ColumnStatisticType>builder()
             .add(TOTAL_SIZE_IN_BYTES)
             .add(NUMBER_OF_DISTINCT_VALUES_SUMMARY)
+            .add(MAX_VALUE)
+            .add(MIN_VALUE)
+            .add(NUMBER_OF_NON_NULL_VALUES)
             .build();
     private static final String ENABLE_NON_CONCURRENT_WRITES_CONFIGURATION_KEY = "delta.enable-non-concurrent-writes";
     public static final Set<String> UPDATABLE_TABLE_PROPERTIES = ImmutableSet.of(CHANGE_DATA_FEED_ENABLED_PROPERTY);
 
+    public static final Set<String> CHANGE_DATA_FEED_COLUMN_NAMES = ImmutableSet.<String>builder()
+            .add("_change_type")
+            .add("_commit_version")
+            .add("_commit_timestamp")
+            .build();
+
+    private static final String CHECK_CONSTRAINT_CONVERT_FAIL_EXPRESSION = "CAST(fail('Failed to convert Delta check constraints to Trino expression') AS boolean)";
+
     private final DeltaLakeMetastore metastore;
+    private final TransactionLogAccess transactionLogAccess;
+    private final DeltaLakeTableStatisticsProvider tableStatisticsProvider;
     private final TrinoFileSystemFactory fileSystemFactory;
     private final TypeManager typeManager;
     private final AccessControlMetadata accessControlMetadata;
@@ -309,13 +383,25 @@ public class DeltaLakeMetadata
     private final String nodeId;
     private final AtomicReference<Runnable> rollbackAction = new AtomicReference<>();
     private final DeltaLakeRedirectionsProvider deltaLakeRedirectionsProvider;
-    private final ExtendedStatisticsAccess statisticsAccess;
+    private final CachingExtendedStatisticsAccess statisticsAccess;
     private final boolean deleteSchemaLocationsFallback;
     private final boolean useUniqueTableLocation;
     private final boolean allowManagedTableRename;
+    private final Map<SchemaTableName, Long> queriedVersions = new ConcurrentHashMap<>();
+    private final Map<QueriedTable, TableSnapshot> queriedSnapshots = new ConcurrentHashMap<>();
+
+    private record QueriedTable(SchemaTableName schemaTableName, long version)
+    {
+        QueriedTable
+        {
+            requireNonNull(schemaTableName, "schemaTableName is null");
+        }
+    }
 
     public DeltaLakeMetadata(
             DeltaLakeMetastore metastore,
+            TransactionLogAccess transactionLogAccess,
+            DeltaLakeTableStatisticsProvider tableStatisticsProvider,
             TrinoFileSystemFactory fileSystemFactory,
             TypeManager typeManager,
             AccessControlMetadata accessControlMetadata,
@@ -330,11 +416,13 @@ public DeltaLakeMetadata(
             long defaultCheckpointInterval,
             boolean deleteSchemaLocationsFallback,
             DeltaLakeRedirectionsProvider deltaLakeRedirectionsProvider,
-            ExtendedStatisticsAccess statisticsAccess,
+            CachingExtendedStatisticsAccess statisticsAccess,
             boolean useUniqueTableLocation,
             boolean allowManagedTableRename)
     {
         this.metastore = requireNonNull(metastore, "metastore is null");
+        this.transactionLogAccess = requireNonNull(transactionLogAccess, "transactionLogAccess is null");
+        this.tableStatisticsProvider = requireNonNull(tableStatisticsProvider, "tableStatisticsProvider is null");
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         this.accessControlMetadata = requireNonNull(accessControlMetadata, "accessControlMetadata is null");
@@ -355,6 +443,36 @@ public DeltaLakeMetadata(
         this.allowManagedTableRename = allowManagedTableRename;
     }
 
+    public TableSnapshot getSnapshot(ConnectorSession session, SchemaTableName table, String tableLocation, long atVersion)
+    {
+        return getSnapshot(session, table, tableLocation, Optional.of(atVersion));
+    }
+
+    @VisibleForTesting
+    protected TableSnapshot getSnapshot(ConnectorSession session, SchemaTableName table, String tableLocation, Optional<Long> atVersion)
+    {
+        try {
+            if (atVersion.isEmpty()) {
+                atVersion = Optional.ofNullable(queriedVersions.get(table));
+            }
+            if (atVersion.isPresent()) {
+                long version = atVersion.get();
+                TableSnapshot snapshot = queriedSnapshots.get(new QueriedTable(table, version));
+                checkState(snapshot != null, "No previously loaded snapshot found for query %s, table %s [%s] at version %s", session.getQueryId(), table, tableLocation, version);
+                return snapshot;
+            }
+
+            TableSnapshot snapshot = transactionLogAccess.loadSnapshot(session, table, tableLocation);
+            // Lack of concurrency for given query is currently guaranteed by DeltaLakeMetadata
+            checkState(queriedVersions.put(table, snapshot.getVersion()) == null, "queriedLocations changed concurrently for %s", table);
+            queriedSnapshots.put(new QueriedTable(table, snapshot.getVersion()), snapshot);
+            return snapshot;
+        }
+        catch (IOException | RuntimeException e) {
+            throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Error getting snapshot for " + table, e);
+        }
+    }
+
     @Override
     public List<String> listSchemaNames(ConnectorSession session)
     {
@@ -387,9 +505,7 @@ public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session,
                 tableName.getSchemaName(),
                 tableName.getTableName().substring(0, metadataMarkerIndex));
 
-        Optional<Table> table = metastore.getHiveMetastore()
-                .getTable(tableNameBase.getSchemaName(), tableNameBase.getTableName());
-
+        Optional<Table> table = metastore.getRawMetastoreTable(tableNameBase.getSchemaName(), tableNameBase.getTableName());
         if (table.isEmpty() || VIRTUAL_VIEW.name().equals(table.get().getTableType())) {
             return Optional.empty();
         }
@@ -401,36 +517,62 @@ public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session,
     }
 
     @Override
-    public ConnectorTableHandle getTableHandle(ConnectorSession session, SchemaTableName tableName)
+    public LocatedTableHandle getTableHandle(ConnectorSession session, SchemaTableName tableName)
     {
         requireNonNull(tableName, "tableName is null");
         if (!DeltaLakeTableName.isDataTable(tableName.getTableName())) {
             // Pretend the table does not exist to produce better error message in case of table redirects to Hive
             return null;
         }
-        SchemaTableName dataTableName = new SchemaTableName(tableName.getSchemaName(), tableName.getTableName());
-        Optional<Table> table = metastore.getTable(dataTableName.getSchemaName(), dataTableName.getTableName());
+        Optional<DeltaMetastoreTable> table = metastore.getTable(tableName.getSchemaName(), tableName.getTableName());
         if (table.isEmpty()) {
             return null;
         }
+        boolean managed = table.get().managed();
 
-        TableSnapshot tableSnapshot = metastore.getSnapshot(dataTableName, session);
-        MetadataEntry metadataEntry;
+        String tableLocation = table.get().location();
+        TableSnapshot tableSnapshot = getSnapshot(session, tableName, tableLocation, Optional.empty());
+        Map<Class<?>, Object> logEntries;
         try {
-            metadataEntry = metastore.getMetadata(tableSnapshot, session);
+            logEntries = transactionLogAccess.getTransactionLogEntries(
+                    session,
+                    tableSnapshot,
+                    ImmutableSet.of(METADATA, PROTOCOL),
+                    entryStream -> entryStream
+                            .filter(entry -> entry.getMetaData() != null || entry.getProtocol() != null)
+                            .map(entry -> firstNonNull(entry.getMetaData(), entry.getProtocol())));
         }
         catch (TrinoException e) {
             if (e.getErrorCode().equals(DELTA_LAKE_INVALID_SCHEMA.toErrorCode())) {
-                return new CorruptedDeltaLakeTableHandle(dataTableName, e);
+                return new CorruptedDeltaLakeTableHandle(tableName, managed, tableLocation, e);
             }
             throw e;
         }
-        verifySupportedColumnMapping(getColumnMappingMode(metadataEntry));
+        MetadataEntry metadataEntry = (MetadataEntry) logEntries.get(MetadataEntry.class);
+        if (metadataEntry == null) {
+            return new CorruptedDeltaLakeTableHandle(tableName, managed, tableLocation, new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Metadata not found in transaction log for " + tableSnapshot.getTable()));
+        }
+        ProtocolEntry protocolEntry = (ProtocolEntry) logEntries.get(ProtocolEntry.class);
+        if (protocolEntry == null) {
+            return new CorruptedDeltaLakeTableHandle(tableName, managed, tableLocation, new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Protocol not found in transaction log for " + tableSnapshot.getTable()));
+        }
+        if (protocolEntry.getMinReaderVersion() > MAX_READER_VERSION) {
+            LOG.debug("Skip %s because the reader version is unsupported: %d", tableName, protocolEntry.getMinReaderVersion());
+            return null;
+        }
+        Set<String> unsupportedReaderFeatures = unsupportedReaderFeatures(protocolEntry.getReaderFeatures().orElse(ImmutableSet.of()));
+        if (!unsupportedReaderFeatures.isEmpty()) {
+            LOG.debug("Skip %s because the table contains unsupported reader features: %s", tableName, unsupportedReaderFeatures);
+            return null;
+        }
+        verifySupportedColumnMapping(getColumnMappingMode(metadataEntry, protocolEntry));
         return new DeltaLakeTableHandle(
-                dataTableName.getSchemaName(),
-                dataTableName.getTableName(),
-                metastore.getTableLocation(dataTableName),
+                tableName.getSchemaName(),
+                tableName.getTableName(),
+                managed,
+                tableLocation,
                 metadataEntry,
+                protocolEntry,
                 TupleDomain.all(),
                 TupleDomain.all(),
                 Optional.empty(),
@@ -438,8 +580,7 @@ public ConnectorTableHandle getTableHandle(ConnectorSession session, SchemaTable
                 Optional.empty(),
                 Optional.empty(),
                 Optional.empty(),
-                tableSnapshot.getVersion(),
-                false);
+                tableSnapshot.getVersion());
     }
 
     @Override
@@ -450,46 +591,79 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
                         .transformKeys(ColumnHandle.class::cast),
                 Optional.empty(),
                 Optional.empty(),
-                Optional.empty(),
                 ImmutableList.of());
     }
 
+    @Override
+    public SchemaTableName getTableName(ConnectorSession session, ConnectorTableHandle table)
+    {
+        if (table instanceof CorruptedDeltaLakeTableHandle corruptedTableHandle) {
+            return corruptedTableHandle.schemaTableName();
+        }
+        return ((DeltaLakeTableHandle) table).getSchemaTableName();
+    }
+
     @Override
     public ConnectorTableMetadata getTableMetadata(ConnectorSession session, ConnectorTableHandle table)
     {
         DeltaLakeTableHandle tableHandle = checkValidTableHandle(table);
-        String location = metastore.getTableLocation(tableHandle.getSchemaTableName());
-        Map<String, String> columnComments = getColumnComments(tableHandle.getMetadataEntry());
-        Map<String, Boolean> columnsNullability = getColumnsNullability(tableHandle.getMetadataEntry());
-        Map<String, String> columnGenerations = getGeneratedColumnExpressions(tableHandle.getMetadataEntry());
+        // This method does not calculate column metadata for the projected columns
+        checkArgument(tableHandle.getProjectedColumns().isEmpty(), "Unexpected projected columns");
+        MetadataEntry metadataEntry = tableHandle.getMetadataEntry();
+        ProtocolEntry protocolEntry = tableHandle.getProtocolEntry();
+
         List<String> constraints = ImmutableList.<String>builder()
-                .addAll(getCheckConstraints(tableHandle.getMetadataEntry()).values())
-                .addAll(getColumnInvariants(tableHandle.getMetadataEntry()).values()) // The internal logic for column invariants in Delta Lake is same as check constraints
+                .addAll(getCheckConstraints(metadataEntry, protocolEntry).values())
+                .addAll(getColumnInvariants(metadataEntry, protocolEntry).values()) // The internal logic for column invariants in Delta Lake is same as check constraints
                 .build();
-        List<ColumnMetadata> columns = getColumns(tableHandle.getMetadataEntry()).stream()
-                .map(column -> getColumnMetadata(column, columnComments.get(column.getName()), columnsNullability.getOrDefault(column.getName(), true), columnGenerations.get(column.getName())))
-                .collect(toImmutableList());
+        List<ColumnMetadata> columns = getTableColumnMetadata(metadataEntry, protocolEntry);
 
         ImmutableMap.Builder<String, Object> properties = ImmutableMap.<String, Object>builder()
-                .put(LOCATION_PROPERTY, location)
-                .put(PARTITIONED_BY_PROPERTY, tableHandle.getMetadataEntry().getCanonicalPartitionColumns());
+                .put(LOCATION_PROPERTY, tableHandle.getLocation());
+        List<String> partitionColumnNames = metadataEntry.getLowercasePartitionColumns();
+        if (!partitionColumnNames.isEmpty()) {
+            properties.put(PARTITIONED_BY_PROPERTY, partitionColumnNames);
+        }
 
-        Optional<Long> checkpointInterval = tableHandle.getMetadataEntry().getCheckpointInterval();
+        Optional<Long> checkpointInterval = metadataEntry.getCheckpointInterval();
         checkpointInterval.ifPresent(value -> properties.put(CHECKPOINT_INTERVAL_PROPERTY, value));
 
-        Optional<Boolean> changeDataFeedEnabled = tableHandle.getMetadataEntry().isChangeDataFeedEnabled();
-        changeDataFeedEnabled.ifPresent(value -> properties.put(CHANGE_DATA_FEED_ENABLED_PROPERTY, value));
+        changeDataFeedEnabled(metadataEntry, protocolEntry)
+                .ifPresent(value -> properties.put(CHANGE_DATA_FEED_ENABLED_PROPERTY, value));
+
+        ColumnMappingMode columnMappingMode = DeltaLakeSchemaSupport.getColumnMappingMode(metadataEntry, protocolEntry);
+        if (columnMappingMode != NONE) {
+            properties.put(COLUMN_MAPPING_MODE_PROPERTY, columnMappingMode.name());
+        }
 
         return new ConnectorTableMetadata(
                 tableHandle.getSchemaTableName(),
                 columns,
                 properties.buildOrThrow(),
-                Optional.ofNullable(tableHandle.getMetadataEntry().getDescription()),
+                Optional.ofNullable(metadataEntry.getDescription()),
                 constraints.stream()
-                        .map(SparkExpressionParser::toTrinoExpression)
+                        .map(constraint -> {
+                            try {
+                                return SparkExpressionParser.toTrinoExpression(constraint);
+                            }
+                            catch (ParsingException e) {
+                                return CHECK_CONSTRAINT_CONVERT_FAIL_EXPRESSION;
+                            }
+                        })
                         .collect(toImmutableList()));
     }
 
+    private List<ColumnMetadata> getTableColumnMetadata(MetadataEntry metadataEntry, ProtocolEntry protocolEntry)
+    {
+        Map<String, String> columnComments = getColumnComments(metadataEntry);
+        Map<String, Boolean> columnsNullability = getColumnsNullability(metadataEntry);
+        Map<String, String> columnGenerations = getGeneratedColumnExpressions(metadataEntry);
+        List<ColumnMetadata> columns = getColumns(metadataEntry, protocolEntry).stream()
+                .map(column -> getColumnMetadata(column, columnComments.get(column.getBaseColumnName()), columnsNullability.getOrDefault(column.getBaseColumnName(), true), columnGenerations.get(column.getBaseColumnName())))
+                .collect(toImmutableList());
+        return columns;
+    }
+
     @Override
     public List<SchemaTableName> listTables(ConnectorSession session, Optional<String> schemaName)
     {
@@ -505,8 +679,12 @@ public List<SchemaTableName> listTables(ConnectorSession session, Optional<Strin
     public Map<String, ColumnHandle> getColumnHandles(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
         DeltaLakeTableHandle table = checkValidTableHandle(tableHandle);
-        return getColumns(table.getMetadataEntry()).stream()
-                .collect(toImmutableMap(DeltaLakeColumnHandle::getName, identity()));
+        return table.getProjectedColumns()
+                .map(projectColumns -> (Collection<DeltaLakeColumnHandle>) projectColumns)
+                .orElseGet(() -> getColumns(table.getMetadataEntry(), table.getProtocolEntry())).stream()
+                // This method does not calculate column name for the projected columns
+                .peek(handle -> checkArgument(handle.isBaseColumn(), "Unsupported projected column: %s", handle))
+                .collect(toImmutableMap(DeltaLakeColumnHandle::getBaseColumnName, identity()));
     }
 
     @Override
@@ -514,11 +692,14 @@ public ColumnMetadata getColumnMetadata(ConnectorSession session, ConnectorTable
     {
         DeltaLakeTableHandle table = (DeltaLakeTableHandle) tableHandle;
         DeltaLakeColumnHandle column = (DeltaLakeColumnHandle) columnHandle;
+        if (column.getProjectionInfo().isPresent()) {
+            return getColumnMetadata(column, null, true, null);
+        }
         return getColumnMetadata(
                 column,
-                getColumnComments(table.getMetadataEntry()).get(column.getName()),
-                getColumnsNullability(table.getMetadataEntry()).getOrDefault(column.getName(), true),
-                getGeneratedColumnExpressions(table.getMetadataEntry()).get(column.getName()));
+                getColumnComments(table.getMetadataEntry()).get(column.getBaseColumnName()),
+                getColumnsNullability(table.getMetadataEntry()).getOrDefault(column.getBaseColumnName(), true),
+                getGeneratedColumnExpressions(table.getMetadataEntry()).get(column.getBaseColumnName()));
     }
 
     /**
@@ -543,7 +724,7 @@ public Optional<ConnectorTableLayout> getNewTableLayout(ConnectorSession session
     public Optional<ConnectorTableLayout> getInsertLayout(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
         DeltaLakeTableHandle deltaLakeTableHandle = (DeltaLakeTableHandle) tableHandle;
-        List<String> partitionColumnNames = deltaLakeTableHandle.getMetadataEntry().getCanonicalPartitionColumns();
+        List<String> partitionColumnNames = deltaLakeTableHandle.getMetadataEntry().getLowercasePartitionColumns();
 
         if (partitionColumnNames.isEmpty()) {
             return Optional.empty();
@@ -573,12 +754,20 @@ public Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession sessio
                             return Stream.of(TableColumnsMetadata.forRedirectedTable(table));
                         }
 
-                        MetadataEntry metadata = metastore.getMetadata(metastore.getSnapshot(table, session), session);
+                        Optional<DeltaMetastoreTable> metastoreTable = metastore.getTable(table.getSchemaName(), table.getTableName());
+                        if (metastoreTable.isEmpty()) {
+                            // this may happen when table is being deleted concurrently,
+                            return Stream.of();
+                        }
+                        String tableLocation = metastoreTable.get().location();
+                        TableSnapshot snapshot = getSnapshot(session, table, tableLocation, Optional.empty());
+                        MetadataEntry metadata = transactionLogAccess.getMetadataEntry(snapshot, session);
+                        ProtocolEntry protocol = transactionLogAccess.getProtocolEntry(session, snapshot);
                         Map<String, String> columnComments = getColumnComments(metadata);
                         Map<String, Boolean> columnsNullability = getColumnsNullability(metadata);
                         Map<String, String> columnGenerations = getGeneratedColumnExpressions(metadata);
-                        List<ColumnMetadata> columnMetadata = getColumns(metadata).stream()
-                                .map(column -> getColumnMetadata(column, columnComments.get(column.getName()), columnsNullability.getOrDefault(column.getName(), true), columnGenerations.get(column.getName())))
+                        List<ColumnMetadata> columnMetadata = getColumns(metadata, protocol).stream()
+                                .map(column -> getColumnMetadata(column, columnComments.get(column.getColumnName()), columnsNullability.getOrDefault(column.getBaseColumnName(), true), columnGenerations.get(column.getBaseColumnName())))
                                 .collect(toImmutableList());
                         return Stream.of(TableColumnsMetadata.forTable(table, columnMetadata));
                     }
@@ -595,11 +784,11 @@ public Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession sessio
                 .iterator();
     }
 
-    private List<DeltaLakeColumnHandle> getColumns(MetadataEntry deltaMetadata)
+    private List<DeltaLakeColumnHandle> getColumns(MetadataEntry deltaMetadata, ProtocolEntry protocolEntry)
     {
         ImmutableList.Builder<DeltaLakeColumnHandle> columns = ImmutableList.builder();
-        extractSchema(deltaMetadata, typeManager).stream()
-                .map(column -> toColumnHandle(column.getColumnMetadata(), column.getFieldId(), column.getPhysicalName(), column.getPhysicalColumnType(), deltaMetadata.getCanonicalPartitionColumns()))
+        extractSchema(deltaMetadata, protocolEntry, typeManager).stream()
+                .map(column -> toColumnHandle(column.getName(), column.getType(), column.getFieldId(), column.getPhysicalName(), column.getPhysicalColumnType(), deltaMetadata.getLowercasePartitionColumns()))
                 .forEach(columns::add);
         columns.add(pathColumnHandle());
         columns.add(fileSizeColumnHandle());
@@ -614,7 +803,7 @@ public TableStatistics getTableStatistics(ConnectorSession session, ConnectorTab
         if (!isTableStatisticsEnabled(session)) {
             return TableStatistics.empty();
         }
-        return metastore.getTableStatistics(session, handle);
+        return tableStatisticsProvider.getTableStatistics(session, handle, getSnapshot(session, handle));
     }
 
     @Override
@@ -622,9 +811,9 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
     {
         Optional<String> location = DeltaLakeSchemaProperties.getLocation(properties).map(locationUri -> {
             try {
-                fileSystemFactory.create(session).newInputFile(locationUri).exists();
+                fileSystemFactory.create(session).directoryExists(Location.of(locationUri));
             }
-            catch (IOException e) {
+            catch (IOException | IllegalArgumentException e) {
                 throw new TrinoException(INVALID_SCHEMA_PROPERTY, "Invalid location URI: " + locationUri, e);
             }
             return locationUri;
@@ -661,8 +850,32 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
+        if (cascade) {
+            for (SchemaTableName viewName : listViews(session, Optional.of(schemaName))) {
+                try {
+                    dropView(session, viewName);
+                }
+                catch (ViewNotFoundException e) {
+                    LOG.debug("View disappeared during DROP SCHEMA CASCADE: %s", viewName);
+                }
+            }
+            for (SchemaTableName tableName : listTables(session, Optional.of(schemaName))) {
+                ConnectorTableHandle table = getTableHandle(session, tableName, Optional.empty(), Optional.empty());
+                if (table == null) {
+                    LOG.debug("Table disappeared during DROP SCHEMA CASCADE: %s", tableName);
+                    continue;
+                }
+                try {
+                    dropTable(session, table);
+                }
+                catch (TableNotFoundException e) {
+                    LOG.debug("Table disappeared during DROP SCHEMA CASCADE: %s", tableName);
+                }
+            }
+        }
+
         Optional<String> location = metastore.getDatabase(schemaName)
                 .orElseThrow(() -> new SchemaNotFoundException(schemaName))
                 .getLocation();
@@ -671,7 +884,7 @@ public void dropSchema(ConnectorSession session, String schemaName)
         // If we see no files or can't see the location at all, use fallback.
         boolean deleteData = location.map(path -> {
             try {
-                return !fileSystemFactory.create(session).listFiles(path).hasNext();
+                return !fileSystemFactory.create(session).listFiles(Location.of(path)).hasNext();
             }
             catch (IOException | RuntimeException e) {
                 LOG.warn(e, "Could not check schema directory '%s'", path);
@@ -694,19 +907,15 @@ public void createTable(ConnectorSession session, ConnectorTableMetadata tableMe
         boolean external = true;
         String location = getLocation(tableMetadata.getProperties());
         if (location == null) {
-            String schemaLocation = getSchemaLocation(schema)
-                    .orElseThrow(() -> new TrinoException(NOT_SUPPORTED, "The 'location' property must be specified either for the table or the schema"));
-            String tableNameForLocation = tableName;
-            if (useUniqueTableLocation) {
-                tableNameForLocation += "-" + randomUUID().toString().replace("-", "");
-            }
-            location = new Path(schemaLocation, tableNameForLocation).toString();
-            checkPathContainsNoFiles(session, new Path(location));
+            location = getTableLocation(schema, tableName);
+            checkPathContainsNoFiles(session, Location.of(location));
             external = false;
         }
-        String deltaLogDirectory = getTransactionLogDir(location);
+        Location deltaLogDirectory = Location.of(getTransactionLogDir(location));
         Optional<Long> checkpointInterval = getCheckpointInterval(tableMetadata.getProperties());
         Optional<Boolean> changeDataFeedEnabled = getChangeDataFeedEnabled(tableMetadata.getProperties());
+        ColumnMappingMode columnMappingMode = DeltaLakeTableProperties.getColumnMappingMode(tableMetadata.getProperties());
+        AtomicInteger fieldId = new AtomicInteger();
 
         try {
             TrinoFileSystem fileSystem = fileSystemFactory.create(session);
@@ -714,31 +923,44 @@ public void createTable(ConnectorSession session, ConnectorTableMetadata tableMe
                 validateTableColumns(tableMetadata);
 
                 List<String> partitionColumns = getPartitionedBy(tableMetadata.getProperties());
-                List<DeltaLakeColumnHandle> deltaLakeColumns = tableMetadata.getColumns()
-                        .stream()
-                        .map(column -> toColumnHandle(column, column.getName(), column.getType(), partitionColumns))
-                        .collect(toImmutableList());
+                ImmutableList.Builder<String> columnNames = ImmutableList.builderWithExpectedSize(tableMetadata.getColumns().size());
+                ImmutableMap.Builder<String, Object> columnTypes = ImmutableMap.builderWithExpectedSize(tableMetadata.getColumns().size());
+                ImmutableMap.Builder<String, Map<String, Object>> columnsMetadata = ImmutableMap.builderWithExpectedSize(tableMetadata.getColumns().size());
+                boolean containsTimestampType = false;
+                for (ColumnMetadata column : tableMetadata.getColumns()) {
+                    columnNames.add(column.getName());
+                    columnTypes.put(column.getName(), serializeColumnType(columnMappingMode, fieldId, column.getType()));
+                    columnsMetadata.put(column.getName(), generateColumnMetadata(columnMappingMode, fieldId));
+                    if (!containsTimestampType) {
+                        containsTimestampType = containsTimestampType(column.getType());
+                    }
+                }
                 Map<String, String> columnComments = tableMetadata.getColumns().stream()
                         .filter(column -> column.getComment() != null)
                         .collect(toImmutableMap(ColumnMetadata::getName, ColumnMetadata::getComment));
                 Map<String, Boolean> columnsNullability = tableMetadata.getColumns().stream()
                         .collect(toImmutableMap(ColumnMetadata::getName, ColumnMetadata::isNullable));
-                TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriterWithoutTransactionIsolation(session, location);
+                OptionalInt maxFieldId = OptionalInt.empty();
+                if (columnMappingMode == ID || columnMappingMode == NAME) {
+                    maxFieldId = OptionalInt.of(fieldId.get());
+                }
 
+                TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriterWithoutTransactionIsolation(session, location);
                 appendTableEntries(
                         0,
                         transactionLogWriter,
                         randomUUID().toString(),
-                        deltaLakeColumns,
+                        columnNames.build(),
                         partitionColumns,
+                        columnTypes.buildOrThrow(),
                         columnComments,
                         columnsNullability,
-                        deltaLakeColumns.stream().collect(toImmutableMap(DeltaLakeColumnHandle::getName, ignored -> ImmutableMap.of())),
-                        configurationForNewTable(checkpointInterval, changeDataFeedEnabled),
+                        columnsMetadata.buildOrThrow(),
+                        configurationForNewTable(checkpointInterval, changeDataFeedEnabled, columnMappingMode, maxFieldId),
                         CREATE_TABLE_OPERATION,
                         session,
                         tableMetadata.getComment(),
-                        protocolEntryForNewTable(tableMetadata.getProperties()));
+                        protocolEntryForNewTable(containsTimestampType, tableMetadata.getProperties()));
 
                 setRollback(() -> deleteRecursivelyIfExists(fileSystem, deltaLogDirectory));
                 transactionLogWriter.flush();
@@ -759,11 +981,32 @@ public void createTable(ConnectorSession session, ConnectorTableMetadata tableMe
 
         Table table = buildTable(session, schemaTableName, location, external);
 
+        // Ensure the table has queryId set. This is relied on for exception handling
+        String queryId = session.getQueryId();
+        verify(
+                getQueryId(table).orElseThrow(() -> new IllegalArgumentException("Query id is not present")).equals(queryId),
+                "Table '%s' does not have correct query id set",
+                table);
+
         PrincipalPrivileges principalPrivileges = buildInitialPrivilegeSet(table.getOwner().orElseThrow());
-        metastore.createTable(
-                session,
-                table,
-                principalPrivileges);
+        // As a precaution, clear the caches
+        statisticsAccess.invalidateCache(schemaTableName, Optional.of(location));
+        transactionLogAccess.invalidateCache(schemaTableName, Optional.of(location));
+        try {
+            metastore.createTable(
+                    session,
+                    table,
+                    principalPrivileges);
+        }
+        catch (TableAlreadyExistsException e) {
+            // Ignore TableAlreadyExistsException when table looks like created by us.
+            // This may happen when an actually successful metastore create call is retried
+            // e.g. because of a timeout on our side.
+            Optional<Table> existingTable = metastore.getRawMetastoreTable(schemaName, tableName);
+            if (existingTable.isEmpty() || !isCreatedBy(existingTable.get(), queryId)) {
+                throw e;
+            }
+        }
     }
 
     public static Table buildTable(ConnectorSession session, SchemaTableName schemaTableName, String location, boolean isExternal)
@@ -823,30 +1066,79 @@ public DeltaLakeOutputTableHandle beginCreateTable(ConnectorSession session, Con
         boolean external = true;
         String location = getLocation(tableMetadata.getProperties());
         if (location == null) {
-            String schemaLocation = getSchemaLocation(schema)
-                    .orElseThrow(() -> new TrinoException(NOT_SUPPORTED, "The 'location' property must be specified either for the table or the schema"));
-            String tableNameForLocation = tableName;
-            if (useUniqueTableLocation) {
-                tableNameForLocation += "-" + randomUUID().toString().replace("-", "");
-            }
-            location = new Path(schemaLocation, tableNameForLocation).toString();
+            location = getTableLocation(schema, tableName);
             external = false;
         }
-        Path targetPath = new Path(location);
-        checkPathContainsNoFiles(session, targetPath);
 
-        setRollback(() -> deleteRecursivelyIfExists(fileSystemFactory.create(session), targetPath.toString()));
+        ColumnMappingMode columnMappingMode = DeltaLakeTableProperties.getColumnMappingMode(tableMetadata.getProperties());
+        AtomicInteger fieldId = new AtomicInteger();
+
+        Location finalLocation = Location.of(location);
+        checkPathContainsNoFiles(session, finalLocation);
+        setRollback(() -> deleteRecursivelyIfExists(fileSystemFactory.create(session), finalLocation));
+
+        boolean usePhysicalName = columnMappingMode == ID || columnMappingMode == NAME;
+        boolean containsTimestampType = false;
+        int columnSize = tableMetadata.getColumns().size();
+        ImmutableList.Builder<String> columnNames = ImmutableList.builderWithExpectedSize(columnSize);
+        ImmutableMap.Builder<String, Object> columnTypes = ImmutableMap.builderWithExpectedSize(columnSize);
+        ImmutableMap.Builder<String, Boolean> columnNullabilities = ImmutableMap.builderWithExpectedSize(columnSize);
+        ImmutableMap.Builder<String, Map<String, Object>> columnsMetadata = ImmutableMap.builderWithExpectedSize(columnSize);
+        ImmutableList.Builder<DeltaLakeColumnHandle> columnHandles = ImmutableList.builderWithExpectedSize(columnSize);
+        for (ColumnMetadata column : tableMetadata.getColumns()) {
+            columnNames.add(column.getName());
+            columnNullabilities.put(column.getName(), column.isNullable());
+            containsTimestampType |= containsTimestampType(column.getType());
+
+            Object serializedType = serializeColumnType(columnMappingMode, fieldId, column.getType());
+            Type physicalType = deserializeType(typeManager, serializedType, usePhysicalName);
+            columnTypes.put(column.getName(), serializedType);
+
+            OptionalInt id;
+            String physicalName;
+            Map<String, Object> columnMetadata;
+            switch (columnMappingMode) {
+                case NONE -> {
+                    id = OptionalInt.empty();
+                    physicalName = column.getName();
+                    columnMetadata = ImmutableMap.of();
+                }
+                case ID, NAME -> {
+                    columnMetadata = generateColumnMetadata(columnMappingMode, fieldId);
+                    id = OptionalInt.of(fieldId.get());
+                    physicalName = (String) columnMetadata.get(COLUMN_MAPPING_PHYSICAL_NAME_CONFIGURATION_KEY);
+                }
+                default -> throw new IllegalArgumentException("Unexpected column mapping mode: " + columnMappingMode);
+            }
+            columnHandles.add(toColumnHandle(column.getName(), column.getType(), id, physicalName, physicalType, partitionedBy));
+            columnsMetadata.put(column.getName(), columnMetadata);
+        }
+
+        String schemaString = serializeSchemaAsJson(
+                columnNames.build(),
+                columnTypes.buildOrThrow(),
+                ImmutableMap.of(),
+                columnNullabilities.buildOrThrow(),
+                columnsMetadata.buildOrThrow());
+
+        OptionalInt maxFieldId = OptionalInt.empty();
+        if (columnMappingMode == ID || columnMappingMode == NAME) {
+            maxFieldId = OptionalInt.of(fieldId.get());
+        }
 
         return new DeltaLakeOutputTableHandle(
                 schemaName,
                 tableName,
-                tableMetadata.getColumns().stream().map(column -> toColumnHandle(column, column.getName(), column.getType(), partitionedBy)).collect(toImmutableList()),
+                columnHandles.build(),
                 location,
                 getCheckpointInterval(tableMetadata.getProperties()),
                 external,
                 tableMetadata.getComment(),
                 getChangeDataFeedEnabled(tableMetadata.getProperties()),
-                protocolEntryForNewTable(tableMetadata.getProperties()));
+                schemaString,
+                columnMappingMode,
+                maxFieldId,
+                protocolEntryForNewTable(containsTimestampType, tableMetadata.getProperties()));
     }
 
     private Optional<String> getSchemaLocation(Database database)
@@ -859,11 +1151,22 @@ private Optional<String> getSchemaLocation(Database database)
         return schemaLocation;
     }
 
-    private void checkPathContainsNoFiles(ConnectorSession session, Path targetPath)
+    private String getTableLocation(Database schema, String tableName)
+    {
+        String schemaLocation = getSchemaLocation(schema)
+                .orElseThrow(() -> new TrinoException(NOT_SUPPORTED, "The 'location' property must be specified either for the table or the schema"));
+        String tableNameLocationComponent = escapeTableName(tableName);
+        if (useUniqueTableLocation) {
+            tableNameLocationComponent += "-" + randomUUID().toString().replace("-", "");
+        }
+        return appendPath(schemaLocation, tableNameLocationComponent);
+    }
+
+    private void checkPathContainsNoFiles(ConnectorSession session, Location targetPath)
     {
         try {
             TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-            if (fileSystem.listFiles(targetPath.toString()).hasNext()) {
+            if (fileSystem.listFiles(targetPath).hasNext()) {
                 throw new TrinoException(NOT_SUPPORTED, "Target location cannot contain any files: " + targetPath);
             }
         }
@@ -876,6 +1179,12 @@ private void validateTableColumns(ConnectorTableMetadata tableMetadata)
     {
         checkPartitionColumns(tableMetadata.getColumns(), getPartitionedBy(tableMetadata.getProperties()));
         checkColumnTypes(tableMetadata.getColumns());
+        if (getChangeDataFeedEnabled(tableMetadata.getProperties()).orElse(false)) {
+            Set<String> conflicts = Sets.intersection(tableMetadata.getColumns().stream().map(ColumnMetadata::getName).collect(toImmutableSet()), CHANGE_DATA_FEED_COLUMN_NAMES);
+            if (!conflicts.isEmpty()) {
+                throw new TrinoException(NOT_SUPPORTED, "Unable to use %s when change data feed is enabled".formatted(conflicts));
+            }
+        }
     }
 
     private static void checkPartitionColumns(List<ColumnMetadata> columns, List<String> partitionColumnNames)
@@ -887,9 +1196,17 @@ private static void checkPartitionColumns(List<ColumnMetadata> columns, List<Str
                 .filter(partitionColumnName -> !columnNames.contains(partitionColumnName))
                 .collect(toImmutableList());
 
+        if (columns.stream().filter(column -> partitionColumnNames.contains(column.getName()))
+                .anyMatch(column -> column.getType() instanceof ArrayType || column.getType() instanceof MapType || column.getType() instanceof RowType)) {
+            throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Using array, map or row type on partitioned columns is unsupported");
+        }
+
         if (!invalidPartitionNames.isEmpty()) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Table property 'partition_by' contained column names which do not exist: " + invalidPartitionNames);
         }
+        if (columns.size() == partitionColumnNames.size()) {
+            throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Using all columns for partition columns is unsupported");
+        }
     }
 
     private void checkColumnTypes(List<ColumnMetadata> columnMetadata)
@@ -900,7 +1217,7 @@ private void checkColumnTypes(List<ColumnMetadata> columnMetadata)
         }
     }
 
-    private static void deleteRecursivelyIfExists(TrinoFileSystem fileSystem, String path)
+    private static void deleteRecursivelyIfExists(TrinoFileSystem fileSystem, Location path)
     {
         try {
             fileSystem.deleteDirectory(path);
@@ -910,6 +1227,21 @@ private static void deleteRecursivelyIfExists(TrinoFileSystem fileSystem, String
         }
     }
 
+    private static boolean containsTimestampType(Type type)
+    {
+        if (type instanceof ArrayType arrayType) {
+            return containsTimestampType(arrayType.getElementType());
+        }
+        if (type instanceof MapType mapType) {
+            return containsTimestampType(mapType.getKeyType()) || containsTimestampType(mapType.getValueType());
+        }
+        if (type instanceof RowType rowType) {
+            return rowType.getFields().stream().anyMatch(field -> containsTimestampType(field.getType()));
+        }
+        checkArgument(type.getTypeParameters().isEmpty(), "Unexpected type parameters for type %s", type);
+        return type instanceof TimestampType;
+    }
+
     @Override
     public Optional<ConnectorOutputMetadata> finishCreateTable(
             ConnectorSession session,
@@ -928,7 +1260,8 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(
                 .map(dataFileInfoCodec::fromJson)
                 .collect(toImmutableList());
 
-        Table table = buildTable(session, schemaTableName(schemaName, tableName), location, handle.isExternal());
+        SchemaTableName schemaTableName = schemaTableName(schemaName, tableName);
+        Table table = buildTable(session, schemaTableName, location, handle.isExternal());
         // Ensure the table has queryId set. This is relied on for exception handling
         String queryId = session.getQueryId();
         verify(
@@ -936,6 +1269,13 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(
                 "Table '%s' does not have correct query id set",
                 table);
 
+        ColumnMappingMode columnMappingMode = handle.getColumnMappingMode();
+        String schemaString = handle.getSchemaString();
+        List<String> columnNames = handle.getInputColumns().stream().map(DeltaLakeColumnHandle::getBaseColumnName).collect(toImmutableList());
+        List<String> physicalPartitionNames = handle.getInputColumns().stream()
+                .filter(column -> column.getColumnType() == PARTITION_KEY)
+                .map(DeltaLakeColumnHandle::getBasePhysicalColumnName)
+                .collect(toImmutableList());
         try {
             // For CTAS there is no risk of multiple writers racing. Using writer without transaction isolation so we are not limiting support for CTAS to
             // filesystems for which we have proper implementations of TransactionLogSynchronizers.
@@ -945,17 +1285,14 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(
                     0,
                     transactionLogWriter,
                     randomUUID().toString(),
-                    handle.getInputColumns(),
+                    schemaString,
                     handle.getPartitionedBy(),
-                    ImmutableMap.of(),
-                    handle.getInputColumns().stream().collect(toImmutableMap(DeltaLakeColumnHandle::getName, ignored -> true)),
-                    handle.getInputColumns().stream().collect(toImmutableMap(DeltaLakeColumnHandle::getName, ignored -> ImmutableMap.of())),
-                    configurationForNewTable(handle.getCheckpointInterval(), handle.getChangeDataFeedEnabled()),
+                    configurationForNewTable(handle.getCheckpointInterval(), handle.getChangeDataFeedEnabled(), columnMappingMode, handle.getMaxColumnId()),
                     CREATE_TABLE_AS_OPERATION,
                     session,
                     handle.getComment(),
                     handle.getProtocolEntry());
-            appendAddFileEntries(transactionLogWriter, dataFileInfos, handle.getPartitionedBy(), true);
+            appendAddFileEntries(transactionLogWriter, dataFileInfos, physicalPartitionNames, columnNames, true);
             transactionLogWriter.flush();
 
             if (isCollectExtendedStatisticsColumnStatisticsOnWrite(session) && !computedStatistics.isEmpty()) {
@@ -963,17 +1300,26 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(
                         .map(DataFileInfo::getCreationTime)
                         .max(Long::compare)
                         .map(Instant::ofEpochMilli);
+                Map<String, String> physicalColumnMapping = DeltaLakeSchemaSupport.getColumnMetadata(schemaString, typeManager, columnMappingMode).stream()
+                        .map(e -> Map.entry(e.getName(), e.getPhysicalName()))
+                        .collect(toImmutableMap(Entry::getKey, Entry::getValue));
 
                 updateTableStatistics(
                         session,
                         Optional.empty(),
+                        schemaTableName,
                         location,
                         maxFileModificationTime,
-                        computedStatistics);
+                        computedStatistics,
+                        columnNames,
+                        Optional.of(physicalColumnMapping));
             }
 
             PrincipalPrivileges principalPrivileges = buildInitialPrivilegeSet(table.getOwner().orElseThrow());
 
+            // As a precaution, clear the caches
+            statisticsAccess.invalidateCache(schemaTableName, Optional.of(location));
+            transactionLogAccess.invalidateCache(schemaTableName, Optional.of(location));
             try {
                 metastore.createTable(session, table, principalPrivileges);
             }
@@ -981,7 +1327,7 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(
                 // Ignore TableAlreadyExistsException when table looks like created by us.
                 // This may happen when an actually successful metastore create call is retried
                 // e.g. because of a timeout on our side.
-                Optional<Table> existingTable = metastore.getTable(schemaName, tableName);
+                Optional<Table> existingTable = metastore.getRawMetastoreTable(schemaName, tableName);
                 if (existingTable.isEmpty() || !isCreatedBy(existingTable.get(), queryId)) {
                     throw e;
                 }
@@ -990,9 +1336,8 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(
         catch (Exception e) {
             // Remove the transaction log entry if the table creation fails
             try {
-                String transactionLogLocation = getTransactionLogDir(handle.getLocation());
-                TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-                fileSystem.deleteDirectory(transactionLogLocation);
+                Location transactionLogDir = Location.of(getTransactionLogDir(location));
+                fileSystemFactory.create(session).deleteDirectory(transactionLogDir);
             }
             catch (IOException ioException) {
                 // Nothing to do, the IOException is probably the same reason why the initial write failed
@@ -1010,7 +1355,7 @@ private static boolean isCreatedBy(Database database, String queryId)
         return databaseQueryId.isPresent() && databaseQueryId.get().equals(queryId);
     }
 
-    private static boolean isCreatedBy(Table table, String queryId)
+    public static boolean isCreatedBy(Table table, String queryId)
     {
         Optional<String> tableQueryId = getQueryId(table);
         return tableQueryId.isPresent() && tableQueryId.get().equals(queryId);
@@ -1020,34 +1365,31 @@ private static boolean isCreatedBy(Table table, String queryId)
     public void setTableComment(ConnectorSession session, ConnectorTableHandle tableHandle, Optional<String> comment)
     {
         DeltaLakeTableHandle handle = checkValidTableHandle(tableHandle);
-        checkSupportedWriterVersion(session, handle.getSchemaTableName());
+        checkSupportedWriterVersion(handle);
+        ColumnMappingMode columnMappingMode = getColumnMappingMode(handle.getMetadataEntry(), handle.getProtocolEntry());
+        if (columnMappingMode != ID && columnMappingMode != NAME && columnMappingMode != NONE) {
+            throw new TrinoException(NOT_SUPPORTED, "Setting a table comment with column mapping %s is not supported".formatted(columnMappingMode));
+        }
+        ProtocolEntry protocolEntry = handle.getProtocolEntry();
+        checkUnsupportedWriterFeatures(protocolEntry);
 
         ConnectorTableMetadata tableMetadata = getTableMetadata(session, handle);
 
         try {
             long commitVersion = handle.getReadVersion() + 1;
 
-            List<String> partitionColumns = getPartitionedBy(tableMetadata.getProperties());
-            List<DeltaLakeColumnHandle> columns = tableMetadata.getColumns().stream()
-                    .filter(column -> !column.isHidden())
-                    .map(column -> toColumnHandle(column, column.getName(), column.getType(), partitionColumns))
-                    .collect(toImmutableList());
-
             TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriter(session, handle.getLocation());
             appendTableEntries(
                     commitVersion,
                     transactionLogWriter,
                     handle.getMetadataEntry().getId(),
-                    columns,
-                    partitionColumns,
-                    getColumnComments(handle.getMetadataEntry()),
-                    getColumnsNullability(handle.getMetadataEntry()),
-                    getColumnsMetadata(handle.getMetadataEntry()),
+                    handle.getMetadataEntry().getSchemaString(),
+                    getPartitionedBy(tableMetadata.getProperties()),
                     handle.getMetadataEntry().getConfiguration(),
                     SET_TBLPROPERTIES_OPERATION,
                     session,
                     comment,
-                    getProtocolEntry(session, handle.getSchemaTableName()));
+                    protocolEntry);
             transactionLogWriter.flush();
         }
         catch (Exception e) {
@@ -1060,32 +1402,32 @@ public void setColumnComment(ConnectorSession session, ConnectorTableHandle tabl
     {
         DeltaLakeTableHandle deltaLakeTableHandle = (DeltaLakeTableHandle) tableHandle;
         DeltaLakeColumnHandle deltaLakeColumnHandle = (DeltaLakeColumnHandle) column;
-        checkSupportedWriterVersion(session, deltaLakeTableHandle.getSchemaTableName());
-
-        ConnectorTableMetadata tableMetadata = getTableMetadata(session, deltaLakeTableHandle);
+        verify(deltaLakeColumnHandle.isBaseColumn(), "Unexpected dereference: %s", column);
+        checkSupportedWriterVersion(deltaLakeTableHandle);
+        ColumnMappingMode columnMappingMode = getColumnMappingMode(deltaLakeTableHandle.getMetadataEntry(), deltaLakeTableHandle.getProtocolEntry());
+        if (columnMappingMode != ID && columnMappingMode != NAME && columnMappingMode != NONE) {
+            throw new TrinoException(NOT_SUPPORTED, "Setting a column comment with column mapping %s is not supported".formatted(columnMappingMode));
+        }
+        ProtocolEntry protocolEntry = deltaLakeTableHandle.getProtocolEntry();
+        checkUnsupportedWriterFeatures(protocolEntry);
 
         try {
             long commitVersion = deltaLakeTableHandle.getReadVersion() + 1;
 
-            List<String> partitionColumns = getPartitionedBy(tableMetadata.getProperties());
-            List<DeltaLakeColumnHandle> columns = tableMetadata.getColumns().stream()
-                    .filter(columnMetadata -> !columnMetadata.isHidden())
-                    .map(columnMetadata -> toColumnHandle(columnMetadata, columnMetadata.getName(), columnMetadata.getType(), partitionColumns))
-                    .collect(toImmutableList());
-
             ImmutableMap.Builder<String, String> columnComments = ImmutableMap.builder();
             columnComments.putAll(getColumnComments(deltaLakeTableHandle.getMetadataEntry()).entrySet().stream()
-                    .filter(e -> !e.getKey().equals(deltaLakeColumnHandle.getName()))
+                    .filter(e -> !e.getKey().equals(deltaLakeColumnHandle.getBaseColumnName()))
                     .collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
-            comment.ifPresent(s -> columnComments.put(deltaLakeColumnHandle.getName(), s));
+            comment.ifPresent(s -> columnComments.put(deltaLakeColumnHandle.getBaseColumnName(), s));
 
             TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriter(session, deltaLakeTableHandle.getLocation());
             appendTableEntries(
                     commitVersion,
                     transactionLogWriter,
                     deltaLakeTableHandle.getMetadataEntry().getId(),
-                    columns,
-                    partitionColumns,
+                    getExactColumnNames(deltaLakeTableHandle.getMetadataEntry()),
+                    deltaLakeTableHandle.getMetadataEntry().getOriginalPartitionColumns(),
+                    getColumnTypes(deltaLakeTableHandle.getMetadataEntry()),
                     columnComments.buildOrThrow(),
                     getColumnsNullability(deltaLakeTableHandle.getMetadataEntry()),
                     getColumnsMetadata(deltaLakeTableHandle.getMetadataEntry()),
@@ -1093,36 +1435,55 @@ public void setColumnComment(ConnectorSession session, ConnectorTableHandle tabl
                     CHANGE_COLUMN_OPERATION,
                     session,
                     Optional.ofNullable(deltaLakeTableHandle.getMetadataEntry().getDescription()),
-                    getProtocolEntry(session, deltaLakeTableHandle.getSchemaTableName()));
+                    protocolEntry);
             transactionLogWriter.flush();
         }
         catch (Exception e) {
-            throw new TrinoException(DELTA_LAKE_BAD_WRITE, format("Unable to add '%s' column comment for: %s.%s", deltaLakeColumnHandle.getName(), deltaLakeTableHandle.getSchemaName(), deltaLakeTableHandle.getTableName()), e);
+            throw new TrinoException(DELTA_LAKE_BAD_WRITE, format("Unable to add '%s' column comment for: %s.%s", deltaLakeColumnHandle.getBaseColumnName(), deltaLakeTableHandle.getSchemaName(), deltaLakeTableHandle.getTableName()), e);
         }
     }
 
+    @Override
+    public void setViewComment(ConnectorSession session, SchemaTableName viewName, Optional<String> comment)
+    {
+        trinoViewHiveMetastore.updateViewComment(session, viewName, comment);
+    }
+
+    @Override
+    public void setViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
+    {
+        trinoViewHiveMetastore.updateViewColumnComment(session, viewName, columnName, comment);
+    }
+
     @Override
     public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnMetadata newColumnMetadata)
     {
         DeltaLakeTableHandle handle = checkValidTableHandle(tableHandle);
-        checkSupportedWriterVersion(session, handle.getSchemaTableName());
+        ProtocolEntry protocolEntry = handle.getProtocolEntry();
+        checkSupportedWriterVersion(handle);
+        ColumnMappingMode columnMappingMode = getColumnMappingMode(handle.getMetadataEntry(), protocolEntry);
+        if (changeDataFeedEnabled(handle.getMetadataEntry(), protocolEntry).orElse(false) && CHANGE_DATA_FEED_COLUMN_NAMES.contains(newColumnMetadata.getName())) {
+            throw new TrinoException(NOT_SUPPORTED, "Column name %s is forbidden when change data feed is enabled".formatted(newColumnMetadata.getName()));
+        }
+        checkUnsupportedWriterFeatures(protocolEntry);
 
-        if (!newColumnMetadata.isNullable() && !metastore.getValidDataFiles(handle.getSchemaTableName(), session).isEmpty()) {
+        if (!newColumnMetadata.isNullable() && !transactionLogAccess.getActiveFiles(getSnapshot(session, handle), handle.getMetadataEntry(), handle.getProtocolEntry(), session).isEmpty()) {
             throw new TrinoException(DELTA_LAKE_BAD_WRITE, format("Unable to add NOT NULL column '%s' for non-empty table: %s.%s", newColumnMetadata.getName(), handle.getSchemaName(), handle.getTableName()));
         }
 
-        ConnectorTableMetadata tableMetadata = getTableMetadata(session, handle);
-
         try {
             long commitVersion = handle.getReadVersion() + 1;
 
-            List<String> partitionColumns = getPartitionedBy(tableMetadata.getProperties());
-            ImmutableList.Builder<DeltaLakeColumnHandle> columnsBuilder = ImmutableList.builder();
-            columnsBuilder.addAll(tableMetadata.getColumns().stream()
-                    .filter(column -> !column.isHidden())
-                    .map(column -> toColumnHandle(column, column.getName(), column.getType(), partitionColumns))
-                    .collect(toImmutableList()));
-            columnsBuilder.add(toColumnHandle(newColumnMetadata, newColumnMetadata.getName(), newColumnMetadata.getType(), partitionColumns));
+            AtomicInteger maxColumnId = switch (columnMappingMode) {
+                case NONE -> new AtomicInteger();
+                case ID, NAME -> new AtomicInteger(getMaxColumnId(handle.getMetadataEntry()));
+                default -> throw new IllegalArgumentException("Unexpected column mapping mode: " + columnMappingMode);
+            };
+
+            List<String> columnNames = ImmutableList.<String>builder()
+                    .addAll(getExactColumnNames(handle.getMetadataEntry()))
+                    .add(newColumnMetadata.getName())
+                    .build();
             ImmutableMap.Builder<String, String> columnComments = ImmutableMap.builder();
             columnComments.putAll(getColumnComments(handle.getMetadataEntry()));
             if (newColumnMetadata.getComment() != null) {
@@ -1131,26 +1492,38 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
             ImmutableMap.Builder<String, Boolean> columnsNullability = ImmutableMap.builder();
             columnsNullability.putAll(getColumnsNullability(handle.getMetadataEntry()));
             columnsNullability.put(newColumnMetadata.getName(), newColumnMetadata.isNullable());
+            Map<String, Object> columnTypes = ImmutableMap.<String, Object>builderWithExpectedSize(columnNames.size())
+                    .putAll(getColumnTypes(handle.getMetadataEntry()))
+                    .put(Map.entry(newColumnMetadata.getName(), serializeColumnType(columnMappingMode, maxColumnId, newColumnMetadata.getType())))
+                    .buildOrThrow();
 
             ImmutableMap.Builder<String, Map<String, Object>> columnMetadata = ImmutableMap.builder();
             columnMetadata.putAll(getColumnsMetadata(handle.getMetadataEntry()));
-            columnMetadata.put(newColumnMetadata.getName(), ImmutableMap.of());
+            columnMetadata.put(newColumnMetadata.getName(), generateColumnMetadata(columnMappingMode, maxColumnId));
+
+            Map<String, String> configuration = new HashMap<>(handle.getMetadataEntry().getConfiguration());
+            if (columnMappingMode == ID || columnMappingMode == NAME) {
+                checkArgument(maxColumnId.get() > 0, "maxColumnId must be larger than 0: %s", maxColumnId);
+                configuration.put(MAX_COLUMN_ID_CONFIGURATION_KEY, String.valueOf(maxColumnId.get()));
+            }
 
             TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriter(session, handle.getLocation());
             appendTableEntries(
                     commitVersion,
                     transactionLogWriter,
                     handle.getMetadataEntry().getId(),
-                    columnsBuilder.build(),
-                    partitionColumns,
-                    columnComments.buildOrThrow(),
-                    columnsNullability.buildOrThrow(),
-                    columnMetadata.buildOrThrow(),
-                    handle.getMetadataEntry().getConfiguration(),
+                    serializeSchemaAsJson(
+                            columnNames,
+                            columnTypes,
+                            columnComments.buildOrThrow(),
+                            columnsNullability.buildOrThrow(),
+                            columnMetadata.buildOrThrow()),
+                    handle.getMetadataEntry().getOriginalPartitionColumns(),
+                    configuration,
                     ADD_COLUMN_OPERATION,
                     session,
                     Optional.ofNullable(handle.getMetadataEntry().getDescription()),
-                    getProtocolEntry(session, handle.getSchemaTableName()));
+                    protocolEntry);
             transactionLogWriter.flush();
         }
         catch (Exception e) {
@@ -1158,12 +1531,166 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
         }
     }
 
+    @Override
+    public void dropColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle columnHandle)
+    {
+        DeltaLakeTableHandle table = (DeltaLakeTableHandle) tableHandle;
+        DeltaLakeColumnHandle deltaLakeColumn = (DeltaLakeColumnHandle) columnHandle;
+        verify(deltaLakeColumn.isBaseColumn(), "Unexpected dereference: %s", deltaLakeColumn);
+        String dropColumnName = deltaLakeColumn.getBaseColumnName();
+        MetadataEntry metadataEntry = table.getMetadataEntry();
+        ProtocolEntry protocolEntry = table.getProtocolEntry();
+        checkUnsupportedWriterFeatures(protocolEntry);
+
+        checkSupportedWriterVersion(table);
+        ColumnMappingMode columnMappingMode = getColumnMappingMode(metadataEntry, protocolEntry);
+        if (columnMappingMode != ColumnMappingMode.NAME && columnMappingMode != ColumnMappingMode.ID) {
+            throw new TrinoException(NOT_SUPPORTED, "Cannot drop column from table using column mapping mode " + columnMappingMode);
+        }
+
+        long commitVersion = table.getReadVersion() + 1;
+        List<String> partitionColumns = metadataEntry.getOriginalPartitionColumns();
+        if (partitionColumns.contains(dropColumnName)) {
+            throw new TrinoException(NOT_SUPPORTED, "Cannot drop partition column: " + dropColumnName);
+        }
+
+        // Use equalsIgnoreCase because the remote column name can contain uppercase characters
+        // Creating a table with ambiguous names (e.g. "a" and "A") is disallowed, so this should be safe
+        List<DeltaLakeColumnMetadata> columns = extractSchema(metadataEntry, protocolEntry, typeManager);
+        List<String> columnNames = getExactColumnNames(metadataEntry).stream()
+                .filter(name -> !name.equalsIgnoreCase(dropColumnName))
+                .collect(toImmutableList());
+        if (columns.size() == columnNames.size()) {
+            throw new ColumnNotFoundException(table.schemaTableName(), dropColumnName);
+        }
+        if (columnNames.size() == partitionColumns.size()) {
+            throw new TrinoException(NOT_SUPPORTED, "Dropping the last non-partition column is unsupported");
+        }
+        Map<String, String> lowerCaseToExactColumnNames = getExactColumnNames(metadataEntry).stream()
+                .collect(toImmutableMap(name -> name.toLowerCase(ENGLISH), name -> name));
+        Map<String, String> physicalColumnNameMapping = columns.stream()
+                .collect(toImmutableMap(DeltaLakeColumnMetadata::getName, DeltaLakeColumnMetadata::getPhysicalName));
+
+        Map<String, Object> columnTypes = filterKeys(getColumnTypes(metadataEntry), name -> !name.equalsIgnoreCase(dropColumnName));
+        Map<String, String> columnComments = filterKeys(getColumnComments(metadataEntry), name -> !name.equalsIgnoreCase(dropColumnName));
+        Map<String, Boolean> columnsNullability = filterKeys(getColumnsNullability(metadataEntry), name -> !name.equalsIgnoreCase(dropColumnName));
+        Map<String, Map<String, Object>> columnMetadata = filterKeys(getColumnsMetadata(metadataEntry), name -> !name.equalsIgnoreCase(dropColumnName));
+        try {
+            TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriter(session, table.getLocation());
+            appendTableEntries(
+                    commitVersion,
+                    transactionLogWriter,
+                    metadataEntry.getId(),
+                    columnNames,
+                    partitionColumns,
+                    columnTypes,
+                    columnComments,
+                    columnsNullability,
+                    columnMetadata,
+                    metadataEntry.getConfiguration(),
+                    DROP_COLUMN_OPERATION,
+                    session,
+                    Optional.ofNullable(metadataEntry.getDescription()),
+                    protocolEntry);
+            transactionLogWriter.flush();
+        }
+        catch (Exception e) {
+            throw new TrinoException(DELTA_LAKE_BAD_WRITE, format("Unable to drop '%s' column from: %s.%s", dropColumnName, table.getSchemaName(), table.getTableName()), e);
+        }
+
+        try {
+            statisticsAccess.readExtendedStatistics(session, table.getSchemaTableName(), table.getLocation()).ifPresent(existingStatistics -> {
+                ExtendedStatistics statistics = new ExtendedStatistics(
+                        existingStatistics.getAlreadyAnalyzedModifiedTimeMax(),
+                        existingStatistics.getColumnStatistics().entrySet().stream()
+                                .filter(stats -> !stats.getKey().equalsIgnoreCase(toPhysicalColumnName(dropColumnName, lowerCaseToExactColumnNames, Optional.of(physicalColumnNameMapping))))
+                                .collect(toImmutableMap(Entry::getKey, Entry::getValue)),
+                        existingStatistics.getAnalyzedColumns()
+                                .map(analyzedColumns -> analyzedColumns.stream().filter(column -> !column.equalsIgnoreCase(dropColumnName)).collect(toImmutableSet())));
+                statisticsAccess.updateExtendedStatistics(session, table.getSchemaTableName(), table.getLocation(), statistics);
+            });
+        }
+        catch (Exception e) {
+            LOG.warn(e, "Failed to update extended statistics when dropping %s column from %s table", dropColumnName, table.schemaTableName());
+        }
+    }
+
+    @Override
+    public void renameColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle columnHandle, String newColumnName)
+    {
+        DeltaLakeTableHandle table = (DeltaLakeTableHandle) tableHandle;
+        DeltaLakeColumnHandle deltaLakeColumn = (DeltaLakeColumnHandle) columnHandle;
+        verify(deltaLakeColumn.isBaseColumn(), "Unexpected dereference: %s", deltaLakeColumn);
+        String sourceColumnName = deltaLakeColumn.getBaseColumnName();
+        ProtocolEntry protocolEntry = table.getProtocolEntry();
+        checkUnsupportedWriterFeatures(protocolEntry);
+
+        checkSupportedWriterVersion(table);
+        if (changeDataFeedEnabled(table.getMetadataEntry(), protocolEntry).orElse(false)) {
+            throw new TrinoException(NOT_SUPPORTED, "Cannot rename column when change data feed is enabled");
+        }
+
+        MetadataEntry metadataEntry = table.getMetadataEntry();
+        ColumnMappingMode columnMappingMode = getColumnMappingMode(metadataEntry, protocolEntry);
+        if (columnMappingMode != ColumnMappingMode.NAME && columnMappingMode != ColumnMappingMode.ID) {
+            throw new TrinoException(NOT_SUPPORTED, "Cannot rename column in table using column mapping mode " + columnMappingMode);
+        }
+
+        long commitVersion = table.getReadVersion() + 1;
+
+        // Use equalsIgnoreCase because the remote column name can contain uppercase characters
+        // Creating a table with ambiguous names (e.g. "a" and "A") is disallowed, so this should be safe
+        List<String> partitionColumns = metadataEntry.getOriginalPartitionColumns().stream()
+                .map(columnName -> columnName.equalsIgnoreCase(sourceColumnName) ? newColumnName : columnName)
+                .collect(toImmutableList());
+
+        List<String> columnNames = getExactColumnNames(metadataEntry).stream()
+                .map(name -> name.equalsIgnoreCase(sourceColumnName) ? newColumnName : name)
+                .collect(toImmutableList());
+        Map<String, Object> columnTypes = getColumnTypes(metadataEntry).entrySet().stream()
+                .map(column -> column.getKey().equalsIgnoreCase(sourceColumnName) ? Map.entry(newColumnName, column.getValue()) : column)
+                .collect(toImmutableMap(Entry::getKey, Entry::getValue));
+        Map<String, String> columnComments = getColumnComments(metadataEntry).entrySet().stream()
+                .map(column -> column.getKey().equalsIgnoreCase(sourceColumnName) ? Map.entry(newColumnName, column.getValue()) : column)
+                .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
+        Map<String, Boolean> columnsNullability = getColumnsNullability(metadataEntry).entrySet().stream()
+                .map(column -> column.getKey().equalsIgnoreCase(sourceColumnName) ? Map.entry(newColumnName, column.getValue()) : column)
+                .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
+        Map<String, Map<String, Object>> columnMetadata = getColumnsMetadata(metadataEntry).entrySet().stream()
+                .map(column -> column.getKey().equalsIgnoreCase(sourceColumnName) ? Map.entry(newColumnName, column.getValue()) : column)
+                .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
+        try {
+            TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriter(session, table.getLocation());
+            appendTableEntries(
+                    commitVersion,
+                    transactionLogWriter,
+                    metadataEntry.getId(),
+                    columnNames,
+                    partitionColumns,
+                    columnTypes,
+                    columnComments,
+                    columnsNullability,
+                    columnMetadata,
+                    metadataEntry.getConfiguration(),
+                    RENAME_COLUMN_OPERATION,
+                    session,
+                    Optional.ofNullable(metadataEntry.getDescription()),
+                    protocolEntry);
+            transactionLogWriter.flush();
+            // Don't update extended statistics because it uses physical column names internally
+        }
+        catch (Exception e) {
+            throw new TrinoException(DELTA_LAKE_BAD_WRITE, format("Unable to rename '%s' column for: %s.%s", sourceColumnName, table.getSchemaName(), table.getTableName()), e);
+        }
+    }
+
     private void appendTableEntries(
             long commitVersion,
             TransactionLogWriter transactionLogWriter,
             String tableId,
-            List<DeltaLakeColumnHandle> columns,
+            List<String> columnNames,
             List<String> partitionColumnNames,
+            Map<String, Object> columnTypes,
             Map<String, String> columnComments,
             Map<String, Boolean> columnNullability,
             Map<String, Map<String, Object>> columnMetadata,
@@ -1172,6 +1699,31 @@ private void appendTableEntries(
             ConnectorSession session,
             Optional<String> comment,
             ProtocolEntry protocolEntry)
+    {
+        appendTableEntries(
+                commitVersion,
+                transactionLogWriter,
+                tableId,
+                serializeSchemaAsJson(columnNames, columnTypes, columnComments, columnNullability, columnMetadata),
+                partitionColumnNames,
+                configuration,
+                operation,
+                session,
+                comment,
+                protocolEntry);
+    }
+
+    private void appendTableEntries(
+            long commitVersion,
+            TransactionLogWriter transactionLogWriter,
+            String tableId,
+            String schemaString,
+            List<String> partitionColumnNames,
+            Map<String, String> configuration,
+            String operation,
+            ConnectorSession session,
+            Optional<String> comment,
+            ProtocolEntry protocolEntry)
     {
         long createdTime = System.currentTimeMillis();
         transactionLogWriter.appendCommitInfoEntry(getCommitInfoEntry(session, commitVersion, createdTime, operation, 0));
@@ -1184,21 +1736,29 @@ private void appendTableEntries(
                         null,
                         comment.orElse(null),
                         new Format("parquet", ImmutableMap.of()),
-                        serializeSchemaAsJson(columns, columnComments, columnNullability, columnMetadata),
+                        schemaString,
                         partitionColumnNames,
                         ImmutableMap.copyOf(configuration),
                         createdTime));
     }
 
-    private static void appendAddFileEntries(TransactionLogWriter transactionLogWriter, List<DataFileInfo> dataFileInfos, List<String> partitionColumnNames, boolean dataChange)
+    private static void appendAddFileEntries(TransactionLogWriter transactionLogWriter, List<DataFileInfo> dataFileInfos, List<String> partitionColumnNames, List<String> originalColumnNames, boolean dataChange)
             throws JsonProcessingException
     {
+        Map<String, String> toOriginalColumnNames = originalColumnNames.stream()
+                .collect(toImmutableMap(name -> name.toLowerCase(ENGLISH), identity()));
         for (DataFileInfo info : dataFileInfos) {
             // using Hashmap because partition values can be null
             Map<String, String> partitionValues = new HashMap<>();
             for (int i = 0; i < partitionColumnNames.size(); i++) {
                 partitionValues.put(partitionColumnNames.get(i), info.getPartitionValues().get(i));
             }
+
+            Optional<Map<String, Object>> minStats = toOriginalColumnNames(info.getStatistics().getMinValues(), toOriginalColumnNames);
+            Optional<Map<String, Object>> maxStats = toOriginalColumnNames(info.getStatistics().getMaxValues(), toOriginalColumnNames);
+            Optional<Map<String, Object>> nullStats = toOriginalColumnNames(info.getStatistics().getNullCount(), toOriginalColumnNames);
+            DeltaLakeJsonFileStatistics statisticsWithExactNames = new DeltaLakeJsonFileStatistics(info.getStatistics().getNumRecords(), minStats, maxStats, nullStats);
+
             partitionValues = unmodifiableMap(partitionValues);
 
             transactionLogWriter.appendAddFileEntry(
@@ -1208,25 +1768,28 @@ private static void appendAddFileEntries(TransactionLogWriter transactionLogWrit
                             info.getSize(),
                             info.getCreationTime(),
                             dataChange,
-                            Optional.of(serializeStatsAsJson(info.getStatistics())),
+                            Optional.of(serializeStatsAsJson(statisticsWithExactNames)),
                             Optional.empty(),
-                            ImmutableMap.of()));
+                            ImmutableMap.of(),
+                            Optional.empty()));
         }
     }
 
+    private static Optional<Map<String, Object>> toOriginalColumnNames(Optional<Map<String, Object>> statistics, Map</* lowercase*/ String, String> lowerCaseToExactColumnNames)
+    {
+        return statistics.map(statsMap -> statsMap.entrySet().stream()
+                .collect(toImmutableMap(
+                        // Lowercase column names because io.trino.parquet.reader.MetadataReader lowercase the path
+                        stats -> lowerCaseToExactColumnNames.getOrDefault(stats.getKey().toLowerCase(ENGLISH), stats.getKey()),
+                        Entry::getValue)));
+    }
+
     @Override
     public ConnectorInsertTableHandle beginInsert(ConnectorSession session, ConnectorTableHandle tableHandle, List<ColumnHandle> columns, RetryMode retryMode)
     {
         DeltaLakeTableHandle table = (DeltaLakeTableHandle) tableHandle;
-        if (!allowWrite(session, table)) {
-            String fileSystem = new Path(table.getLocation()).toUri().getScheme();
-            throw new TrinoException(
-                    NOT_SUPPORTED,
-                    format("Inserts are not enabled on the %1$s filesystem in order to avoid eventual data corruption which may be caused by concurrent data modifications on the table. " +
-                            "Writes to the %1$s filesystem can be however enabled with the '%2$s' configuration property.", fileSystem, ENABLE_NON_CONCURRENT_WRITES_CONFIGURATION_KEY));
-        }
-        checkUnsupportedGeneratedColumns(table.getMetadataEntry());
-        checkSupportedWriterVersion(session, table.getSchemaTableName());
+        checkWriteAllowed(session, table);
+        checkWriteSupported(table);
 
         List<DeltaLakeColumnHandle> inputColumns = columns.stream()
                 .map(handle -> (DeltaLakeColumnHandle) handle)
@@ -1237,19 +1800,19 @@ public ConnectorInsertTableHandle beginInsert(ConnectorSession session, Connecto
         // This check acts as a safeguard in cases where the input columns may differ from the table metadata case-sensitively
         checkAllColumnsPassedOnInsert(tableMetadata, inputColumns);
 
-        return createInsertHandle(session, retryMode, table, inputColumns, tableMetadata);
+        return createInsertHandle(session, retryMode, table, inputColumns);
     }
 
-    private DeltaLakeInsertTableHandle createInsertHandle(ConnectorSession session, RetryMode retryMode, DeltaLakeTableHandle table, List<DeltaLakeColumnHandle> inputColumns, ConnectorTableMetadata tableMetadata)
+    private DeltaLakeInsertTableHandle createInsertHandle(ConnectorSession session, RetryMode retryMode, DeltaLakeTableHandle table, List<DeltaLakeColumnHandle> inputColumns)
     {
-        String tableLocation = getLocation(tableMetadata.getProperties());
+        String tableLocation = table.getLocation();
         try {
             TrinoFileSystem fileSystem = fileSystemFactory.create(session);
             return new DeltaLakeInsertTableHandle(
-                    table.getSchemaName(),
-                    table.getTableName(),
+                    table.getSchemaTableName(),
                     tableLocation,
                     table.getMetadataEntry(),
+                    table.getProtocolEntry(),
                     inputColumns,
                     getMandatoryCurrentVersion(fileSystem, tableLocation),
                     retryMode != NO_RETRIES);
@@ -1267,7 +1830,8 @@ private void checkAllColumnsPassedOnInsert(ConnectorTableMetadata tableMetadata,
                 .collect(toImmutableList());
 
         List<String> insertColumnNames = insertColumns.stream()
-                .map(DeltaLakeColumnHandle::getName)
+                // Lowercase because the above allColumnNames uses lowercase
+                .map(column -> column.getBaseColumnName().toLowerCase(ENGLISH))
                 .collect(toImmutableList());
 
         checkArgument(allColumnNames.equals(insertColumnNames), "Not all table columns passed on INSERT; table columns=%s; insert columns=%s", allColumnNames, insertColumnNames);
@@ -1288,7 +1852,7 @@ public Optional<ConnectorOutputMetadata> finishInsert(
                 .collect(toImmutableList());
 
         if (handle.isRetriesEnabled()) {
-            cleanExtraOutputFiles(session, handle.getLocation(), dataFileInfos);
+            cleanExtraOutputFiles(session, Location.of(handle.getLocation()), dataFileInfos);
         }
 
         boolean writeCommitted = false;
@@ -1308,13 +1872,17 @@ public Optional<ConnectorOutputMetadata> finishInsert(
             // it is not obvious why we need to persist this readVersion
             transactionLogWriter.appendCommitInfoEntry(getCommitInfoEntry(session, commitVersion, createdTime, INSERT_OPERATION, handle.getReadVersion()));
 
-            // Note: during writes we want to preserve original case of partition columns
-            List<String> partitionColumns = handle.getMetadataEntry().getOriginalPartitionColumns();
-            appendAddFileEntries(transactionLogWriter, dataFileInfos, partitionColumns, true);
+            ColumnMappingMode columnMappingMode = getColumnMappingMode(handle.getMetadataEntry(), handle.getProtocolEntry());
+            List<String> partitionColumns = getPartitionColumns(
+                    handle.getMetadataEntry().getOriginalPartitionColumns(),
+                    handle.getInputColumns(),
+                    columnMappingMode);
+            List<String> exactColumnNames = getExactColumnNames(handle.getMetadataEntry());
+            appendAddFileEntries(transactionLogWriter, dataFileInfos, partitionColumns, exactColumnNames, true);
 
             transactionLogWriter.flush();
             writeCommitted = true;
-            writeCheckpointIfNeeded(session, new SchemaTableName(handle.getSchemaName(), handle.getTableName()), checkpointInterval, commitVersion);
+            writeCheckpointIfNeeded(session, handle.getTableName(), handle.getLocation(), handle.getReadVersion(), checkpointInterval, commitVersion);
 
             if (isCollectExtendedStatisticsColumnStatisticsOnWrite(session) && !computedStatistics.isEmpty() && !dataFileInfos.isEmpty()) {
                 // TODO (https://github.com/trinodb/trino/issues/16088) Add synchronization when version conflict for INSERT is resolved.
@@ -1325,9 +1893,13 @@ public Optional<ConnectorOutputMetadata> finishInsert(
                 updateTableStatistics(
                         session,
                         Optional.empty(),
+                        handle.getTableName(),
                         handle.getLocation(),
                         maxFileModificationTime,
-                        computedStatistics);
+                        computedStatistics,
+                        exactColumnNames,
+                        Optional.of(extractSchema(handle.getMetadataEntry(), handle.getProtocolEntry(), typeManager).stream()
+                                .collect(toImmutableMap(DeltaLakeColumnMetadata::getName, DeltaLakeColumnMetadata::getPhysicalName))));
             }
         }
         catch (Exception e) {
@@ -1341,6 +1913,31 @@ public Optional<ConnectorOutputMetadata> finishInsert(
         return Optional.empty();
     }
 
+    private static List<String> getPartitionColumns(List<String> originalPartitionColumns, List<DeltaLakeColumnHandle> dataColumns, ColumnMappingMode columnMappingMode)
+    {
+        return switch (columnMappingMode) {
+            case NAME, ID -> getPartitionColumnsForNameOrIdMapping(originalPartitionColumns, dataColumns);
+            case NONE -> originalPartitionColumns;
+            case UNKNOWN -> throw new TrinoException(NOT_SUPPORTED, "Unsupported column mapping mode");
+        };
+    }
+
+    private static List<String> getPartitionColumnsForNameOrIdMapping(List<String> originalPartitionColumns, List<DeltaLakeColumnHandle> dataColumns)
+    {
+        Map<String, DeltaLakeColumnHandle> nameToDataColumns = dataColumns.stream()
+                .collect(toImmutableMap(DeltaLakeColumnHandle::getColumnName, Function.identity()));
+        return originalPartitionColumns.stream()
+                .map(columnName -> {
+                    DeltaLakeColumnHandle dataColumn = nameToDataColumns.get(columnName);
+                    // During writes we want to preserve original case of partition columns, if the name is not different from the physical name
+                    if (dataColumn.getBasePhysicalColumnName().equalsIgnoreCase(columnName)) {
+                        return columnName;
+                    }
+                    return dataColumn.getBasePhysicalColumnName();
+                })
+                .collect(toImmutableList());
+    }
+
     @Override
     public RowChangeParadigm getRowChangeParadigm(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
@@ -1350,7 +1947,7 @@ public RowChangeParadigm getRowChangeParadigm(ConnectorSession session, Connecto
     @Override
     public ColumnHandle getMergeRowIdColumnHandle(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
-        return new DeltaLakeColumnHandle(ROW_ID_COLUMN_NAME, MERGE_ROW_ID_TYPE, OptionalInt.empty(), ROW_ID_COLUMN_NAME, MERGE_ROW_ID_TYPE, SYNTHESIZED);
+        return mergeRowIdColumnHandle();
     }
 
     @Override
@@ -1363,40 +1960,26 @@ public Optional<ConnectorPartitioningHandle> getUpdateLayout(ConnectorSession se
     public ConnectorMergeTableHandle beginMerge(ConnectorSession session, ConnectorTableHandle tableHandle, RetryMode retryMode)
     {
         DeltaLakeTableHandle handle = (DeltaLakeTableHandle) tableHandle;
-        if (isAppendOnly(handle.getMetadataEntry())) {
+        if (isAppendOnly(handle.getMetadataEntry(), handle.getProtocolEntry())) {
             throw new TrinoException(NOT_SUPPORTED, "Cannot modify rows from a table with '" + APPEND_ONLY_CONFIGURATION_KEY + "' set to true");
         }
-        if (!allowWrite(session, handle)) {
-            String fileSystem = new Path(handle.getLocation()).toUri().getScheme();
-            throw new TrinoException(
-                    NOT_SUPPORTED,
-                    format("Updates are not enabled on the %1$s filesystem in order to avoid eventual data corruption which may be caused by concurrent data modifications on the table. " +
-                            "Writes to the %1$s filesystem can be however enabled with the '%2$s' configuration property.", fileSystem, ENABLE_NON_CONCURRENT_WRITES_CONFIGURATION_KEY));
-        }
-        if (!getColumnInvariants(handle.getMetadataEntry()).isEmpty()) {
-            throw new TrinoException(NOT_SUPPORTED, "Updates are not supported for tables with delta invariants");
-        }
-        if (!getCheckConstraints(handle.getMetadataEntry()).isEmpty()) {
-            throw new TrinoException(NOT_SUPPORTED, "Writing to tables with CHECK constraints is not supported");
-        }
-        checkUnsupportedGeneratedColumns(handle.getMetadataEntry());
-        checkSupportedWriterVersion(session, handle.getSchemaTableName());
-
-        ConnectorTableMetadata tableMetadata = getTableMetadata(session, handle);
+        checkWriteAllowed(session, handle);
+        checkWriteSupported(handle);
 
-        List<DeltaLakeColumnHandle> inputColumns = getColumns(handle.getMetadataEntry()).stream()
+        List<DeltaLakeColumnHandle> inputColumns = getColumns(handle.getMetadataEntry(), handle.getProtocolEntry()).stream()
                 .filter(column -> column.getColumnType() != SYNTHESIZED)
                 .collect(toImmutableList());
 
-        DeltaLakeInsertTableHandle insertHandle = createInsertHandle(session, retryMode, handle, inputColumns, tableMetadata);
+        DeltaLakeInsertTableHandle insertHandle = createInsertHandle(session, retryMode, handle, inputColumns);
 
         return new DeltaLakeMergeTableHandle(handle, insertHandle);
     }
 
     @Override
-    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle mergeTableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
     {
-        DeltaLakeTableHandle handle = ((DeltaLakeMergeTableHandle) tableHandle).getTableHandle();
+        DeltaLakeMergeTableHandle mergeHandle = (DeltaLakeMergeTableHandle) mergeTableHandle;
+        DeltaLakeTableHandle handle = mergeHandle.getTableHandle();
 
         List<DeltaLakeMergeResult> mergeResults = fragments.stream()
                 .map(Slice::getBytes)
@@ -1413,21 +1996,19 @@ public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tabl
                 .flatMap(Optional::stream)
                 .collect(toImmutableList());
 
-        Map<Boolean, List<DataFileInfo>> splitted = allFiles.stream()
+        Map<Boolean, List<DataFileInfo>> split = allFiles.stream()
                 .collect(partitioningBy(dataFile -> dataFile.getDataFileType() == DATA));
 
-        List<DataFileInfo> newFiles = ImmutableList.copyOf(splitted.get(true));
+        List<DataFileInfo> newFiles = ImmutableList.copyOf(split.get(true));
+        List<DataFileInfo> cdcFiles = ImmutableList.copyOf(split.get(false));
 
-        List<DataFileInfo> cdfFiles = ImmutableList.copyOf(splitted.get(false));
-
-        if (handle.isRetriesEnabled()) {
-            cleanExtraOutputFilesForUpdate(session, handle.getLocation(), allFiles);
+        if (mergeHandle.getInsertTableHandle().isRetriesEnabled()) {
+            cleanExtraOutputFiles(session, Location.of(handle.getLocation()), allFiles);
         }
 
         Optional<Long> checkpointInterval = handle.getMetadataEntry().getCheckpointInterval();
 
-        String tableLocation = metastore.getTableLocation(handle.getSchemaTableName());
-
+        String tableLocation = handle.getLocation();
         boolean writeCommitted = false;
         try {
             TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriter(session, tableLocation);
@@ -1446,21 +2027,26 @@ public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tabl
 
             long writeTimestamp = Instant.now().toEpochMilli();
 
-            if (!cdfFiles.isEmpty()) {
-                appendCdfFileEntries(transactionLogWriter, cdfFiles, handle.getMetadataEntry().getOriginalPartitionColumns());
+            ColumnMappingMode columnMappingMode = getColumnMappingMode(handle.getMetadataEntry(), handle.getProtocolEntry());
+            List<String> partitionColumns = getPartitionColumns(
+                    handle.getMetadataEntry().getOriginalPartitionColumns(),
+                    mergeHandle.getInsertTableHandle().getInputColumns(),
+                    columnMappingMode);
+
+            if (!cdcFiles.isEmpty()) {
+                appendCdcFilesInfos(transactionLogWriter, cdcFiles, partitionColumns);
             }
 
             for (String file : oldFiles) {
-                transactionLogWriter.appendRemoveFileEntry(new RemoveFileEntry(file, writeTimestamp, true));
+                transactionLogWriter.appendRemoveFileEntry(new RemoveFileEntry(toUriFormat(file), writeTimestamp, true));
             }
 
-            List<String> partitionColumns = handle.getMetadataEntry().getOriginalPartitionColumns();
-            appendAddFileEntries(transactionLogWriter, newFiles, partitionColumns, true);
+            appendAddFileEntries(transactionLogWriter, newFiles, partitionColumns, getExactColumnNames(handle.getMetadataEntry()), true);
 
             transactionLogWriter.flush();
             writeCommitted = true;
 
-            writeCheckpointIfNeeded(session, new SchemaTableName(handle.getSchemaName(), handle.getTableName()), checkpointInterval, commitVersion);
+            writeCheckpointIfNeeded(session, handle.getSchemaTableName(), handle.getLocation(), handle.getReadVersion(), checkpointInterval, commitVersion);
         }
         catch (IOException | RuntimeException e) {
             if (!writeCommitted) {
@@ -1471,12 +2057,12 @@ public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tabl
         }
     }
 
-    private static void appendCdfFileEntries(
+    private static void appendCdcFilesInfos(
             TransactionLogWriter transactionLogWriter,
-            List<DataFileInfo> cdfFilesInfos,
+            List<DataFileInfo> cdcFilesInfos,
             List<String> partitionColumnNames)
     {
-        for (DataFileInfo info : cdfFilesInfos) {
+        for (DataFileInfo info : cdcFilesInfos) {
             // using Hashmap because partition values can be null
             Map<String, String> partitionValues = new HashMap<>();
             for (int i = 0; i < partitionColumnNames.size(); i++) {
@@ -1484,8 +2070,8 @@ private static void appendCdfFileEntries(
             }
             partitionValues = unmodifiableMap(partitionValues);
 
-            transactionLogWriter.appendCdfFileEntry(
-                    new CdfFileEntry(
+            transactionLogWriter.appendCdcEntry(
+                    new CdcEntry(
                             toUriFormat(info.getPath()),
                             partitionValues,
                             info.getSize()));
@@ -1501,6 +2087,7 @@ public Optional<ConnectorTableExecuteHandle> getTableHandleForExecute(
             RetryMode retryMode)
     {
         DeltaLakeTableHandle tableHandle = checkValidTableHandle(connectorTableHandle);
+        checkUnsupportedWriterFeatures(tableHandle.getProtocolEntry());
 
         DeltaLakeTableProcedureId procedureId;
         try {
@@ -1519,7 +2106,7 @@ private Optional<ConnectorTableExecuteHandle> getTableHandleForOptimize(DeltaLak
     {
         DataSize maxScannedFileSize = (DataSize) executeProperties.get("file_size_threshold");
 
-        List<DeltaLakeColumnHandle> columns = getColumns(tableHandle.getMetadataEntry()).stream()
+        List<DeltaLakeColumnHandle> columns = getColumns(tableHandle.getMetadataEntry(), tableHandle.getProtocolEntry()).stream()
                 .filter(column -> column.getColumnType() != SYNTHESIZED)
                 .collect(toImmutableList());
 
@@ -1528,6 +2115,7 @@ private Optional<ConnectorTableExecuteHandle> getTableHandleForOptimize(DeltaLak
                 OPTIMIZE,
                 new DeltaTableOptimizeHandle(
                         tableHandle.getMetadataEntry(),
+                        tableHandle.getProtocolEntry(),
                         columns,
                         tableHandle.getMetadataEntry().getOriginalPartitionColumns(),
                         maxScannedFileSize,
@@ -1550,12 +2138,12 @@ public Optional<ConnectorTableLayout> getLayoutForTableExecute(ConnectorSession
     private Optional<ConnectorTableLayout> getLayoutForOptimize(DeltaLakeTableExecuteHandle executeHandle)
     {
         DeltaTableOptimizeHandle optimizeHandle = (DeltaTableOptimizeHandle) executeHandle.getProcedureHandle();
-        List<String> partitionColumnNames = optimizeHandle.getMetadataEntry().getCanonicalPartitionColumns();
+        List<String> partitionColumnNames = optimizeHandle.getMetadataEntry().getLowercasePartitionColumns();
         if (partitionColumnNames.isEmpty()) {
             return Optional.empty();
         }
         Map<String, DeltaLakeColumnHandle> columnsByName = optimizeHandle.getTableColumns().stream()
-                .collect(toImmutableMap(columnHandle -> columnHandle.getName().toLowerCase(Locale.ENGLISH), identity()));
+                .collect(toImmutableMap(columnHandle -> columnHandle.getColumnName(), identity()));
         ImmutableList.Builder<DeltaLakeColumnHandle> partitioningColumns = ImmutableList.builder();
         for (String columnName : partitionColumnNames) {
             partitioningColumns.add(columnsByName.get(columnName));
@@ -1586,14 +2174,8 @@ private BeginTableExecuteResult<ConnectorTableExecuteHandle, ConnectorTableHandl
     {
         DeltaTableOptimizeHandle optimizeHandle = (DeltaTableOptimizeHandle) executeHandle.getProcedureHandle();
 
-        if (!allowWrite(session, table)) {
-            String fileSystem = new Path(table.getLocation()).toUri().getScheme();
-            throw new TrinoException(
-                    NOT_SUPPORTED,
-                    format("Optimize is not enabled on the %1$s filesystem in order to avoid eventual data corruption which may be caused by concurrent data modifications on the table. " +
-                            "Writes to the %1$s filesystem can be however enabled with the '%2$s' configuration property.", fileSystem, ENABLE_NON_CONCURRENT_WRITES_CONFIGURATION_KEY));
-        }
-        checkSupportedWriterVersion(session, table.getSchemaTableName());
+        checkWriteAllowed(session, table);
+        checkSupportedWriterVersion(table);
 
         return new BeginTableExecuteResult<>(
                 executeHandle.withProcedureHandle(optimizeHandle.withCurrentVersion(table.getReadVersion())),
@@ -1619,8 +2201,8 @@ private void finishOptimize(ConnectorSession session, DeltaLakeTableExecuteHandl
         String tableLocation = executeHandle.getTableLocation();
 
         // paths to be deleted
-        Set<Path> scannedPaths = splitSourceInfo.stream()
-                .map(file -> new Path((String) file))
+        Set<String> scannedPaths = splitSourceInfo.stream()
+                .map(String.class::cast)
                 .collect(toImmutableSet());
 
         // files to be added
@@ -1630,7 +2212,7 @@ private void finishOptimize(ConnectorSession session, DeltaLakeTableExecuteHandl
                 .collect(toImmutableList());
 
         if (optimizeHandle.isRetriesEnabled()) {
-            cleanExtraOutputFiles(session, executeHandle.getTableLocation(), dataFileInfos);
+            cleanExtraOutputFiles(session, Location.of(executeHandle.getTableLocation()), dataFileInfos);
         }
 
         boolean writeCommitted = false;
@@ -1645,19 +2227,28 @@ private void finishOptimize(ConnectorSession session, DeltaLakeTableExecuteHandl
 
             long writeTimestamp = Instant.now().toEpochMilli();
 
-            for (Path scannedPath : scannedPaths) {
-                String relativePath = new Path(tableLocation).toUri().relativize(scannedPath.toUri()).toString();
-                transactionLogWriter.appendRemoveFileEntry(new RemoveFileEntry(relativePath, writeTimestamp, false));
+            for (String scannedPath : scannedPaths) {
+                String relativePath = relativePath(tableLocation, scannedPath);
+                transactionLogWriter.appendRemoveFileEntry(new RemoveFileEntry(toUriFormat(relativePath), writeTimestamp, false));
             }
 
             // Note: during writes we want to preserve original case of partition columns
-            List<String> partitionColumns = optimizeHandle.getMetadataEntry().getOriginalPartitionColumns();
-            appendAddFileEntries(transactionLogWriter, dataFileInfos, partitionColumns, false);
+            List<String> partitionColumns = getPartitionColumns(
+                    optimizeHandle.getMetadataEntry().getOriginalPartitionColumns(),
+                    optimizeHandle.getTableColumns(),
+                    getColumnMappingMode(optimizeHandle.getMetadataEntry(), optimizeHandle.getProtocolEntry()));
+            appendAddFileEntries(transactionLogWriter, dataFileInfos, partitionColumns, getExactColumnNames(optimizeHandle.getMetadataEntry()), false);
 
             transactionLogWriter.flush();
             writeCommitted = true;
             Optional<Long> checkpointInterval = Optional.of(1L); // force checkpoint
-            writeCheckpointIfNeeded(session, executeHandle.getSchemaTableName(), checkpointInterval, commitVersion);
+            writeCheckpointIfNeeded(
+                    session,
+                    executeHandle.getSchemaTableName(),
+                    executeHandle.getTableLocation(),
+                    optimizeHandle.getCurrentVersion().orElseThrow(),
+                    checkpointInterval,
+                    commitVersion);
         }
         catch (Exception e) {
             if (!writeCommitted) {
@@ -1668,12 +2259,22 @@ private void finishOptimize(ConnectorSession session, DeltaLakeTableExecuteHandl
         }
     }
 
+    private void checkWriteAllowed(ConnectorSession session, DeltaLakeTableHandle table)
+    {
+        if (!allowWrite(session, table)) {
+            String fileSystem = Location.of(table.getLocation()).scheme().orElse("unknown");
+            throw new TrinoException(
+                    NOT_SUPPORTED,
+                    format("Writes are not enabled on the %1$s filesystem in order to avoid eventual data corruption which may be caused by concurrent data modifications on the table. " +
+                            "Writes to the %1$s filesystem can be however enabled with the '%2$s' configuration property.", fileSystem, ENABLE_NON_CONCURRENT_WRITES_CONFIGURATION_KEY));
+        }
+    }
+
     private boolean allowWrite(ConnectorSession session, DeltaLakeTableHandle tableHandle)
     {
         try {
-            String tableLocation = metastore.getTableLocation(tableHandle.getSchemaTableName());
-            Path tableMetadataDirectory = new Path(new Path(tableLocation).getParent().toString(), tableHandle.getTableName());
-            boolean requiresOptIn = transactionLogWriterFactory.newWriter(session, tableMetadataDirectory.toString()).isUnsafe();
+            String tableMetadataDirectory = getTransactionLogDir(tableHandle.getLocation());
+            boolean requiresOptIn = transactionLogWriterFactory.newWriter(session, tableMetadataDirectory).isUnsafe();
             return !requiresOptIn || unsafeWritesEnabled;
         }
         catch (TrinoException e) {
@@ -1684,6 +2285,28 @@ private boolean allowWrite(ConnectorSession session, DeltaLakeTableHandle tableH
         }
     }
 
+    private void checkWriteSupported(DeltaLakeTableHandle handle)
+    {
+        checkSupportedWriterVersion(handle);
+        checkUnsupportedGeneratedColumns(handle.getMetadataEntry());
+        ColumnMappingMode columnMappingMode = getColumnMappingMode(handle.getMetadataEntry(), handle.getProtocolEntry());
+        if (!(columnMappingMode == NONE || columnMappingMode == ColumnMappingMode.NAME || columnMappingMode == ColumnMappingMode.ID)) {
+            throw new TrinoException(NOT_SUPPORTED, "Writing with column mapping %s is not supported".formatted(columnMappingMode));
+        }
+        if (getColumnIdentities(handle.getMetadataEntry(), handle.getProtocolEntry()).values().stream().anyMatch(identity -> identity)) {
+            throw new TrinoException(NOT_SUPPORTED, "Writing to tables with identity columns is not supported");
+        }
+        checkUnsupportedWriterFeatures(handle.getProtocolEntry());
+    }
+
+    private static void checkUnsupportedWriterFeatures(ProtocolEntry protocolEntry)
+    {
+        Set<String> unsupportedWriterFeatures = unsupportedWriterFeatures(protocolEntry.getWriterFeatures().orElse(ImmutableSet.of()));
+        if (!unsupportedWriterFeatures.isEmpty()) {
+            throw new TrinoException(NOT_SUPPORTED, "Unsupported writer features: " + unsupportedWriterFeatures);
+        }
+    }
+
     private void checkUnsupportedGeneratedColumns(MetadataEntry metadataEntry)
     {
         Map<String, String> columnGeneratedExpressions = getGeneratedColumnExpressions(metadataEntry);
@@ -1692,38 +2315,63 @@ private void checkUnsupportedGeneratedColumns(MetadataEntry metadataEntry)
         }
     }
 
-    private void checkSupportedWriterVersion(ConnectorSession session, SchemaTableName schemaTableName)
+    private void checkSupportedWriterVersion(DeltaLakeTableHandle handle)
     {
-        int requiredWriterVersion = getProtocolEntry(session, schemaTableName).getMinWriterVersion();
+        int requiredWriterVersion = handle.getProtocolEntry().getMinWriterVersion();
         if (requiredWriterVersion > MAX_WRITER_VERSION) {
             throw new TrinoException(
                     NOT_SUPPORTED,
-                    format("Table %s requires Delta Lake writer version %d which is not supported", schemaTableName, requiredWriterVersion));
+                    format("Table %s requires Delta Lake writer version %d which is not supported", handle.getSchemaTableName(), requiredWriterVersion));
         }
     }
 
-    private ProtocolEntry getProtocolEntry(ConnectorSession session, SchemaTableName schemaTableName)
+    private TableSnapshot getSnapshot(ConnectorSession session, DeltaLakeTableHandle table)
     {
-        return metastore.getProtocol(session, metastore.getSnapshot(schemaTableName, session));
+        return getSnapshot(session, table.getSchemaTableName(), table.getLocation(), Optional.of(table.getReadVersion()));
     }
 
-    private ProtocolEntry protocolEntryForNewTable(Map<String, Object> properties)
+    private ProtocolEntry protocolEntryForNewTable(boolean containsTimestampType, Map<String, Object> properties)
     {
+        int readerVersion = DEFAULT_READER_VERSION;
         int writerVersion = DEFAULT_WRITER_VERSION;
+        Set<String> readerFeatures = new HashSet<>();
+        Set<String> writerFeatures = new HashSet<>();
         Optional<Boolean> changeDataFeedEnabled = getChangeDataFeedEnabled(properties);
         if (changeDataFeedEnabled.isPresent() && changeDataFeedEnabled.get()) {
             // Enabling cdf (change data feed) requires setting the writer version to 4
             writerVersion = CDF_SUPPORTED_WRITER_VERSION;
         }
-        return new ProtocolEntry(DEFAULT_READER_VERSION, writerVersion);
+        ColumnMappingMode columnMappingMode = DeltaLakeTableProperties.getColumnMappingMode(properties);
+        if (columnMappingMode == ID || columnMappingMode == NAME) {
+            // TODO Add 'columnMapping' feature to reader and writer features when supporting writer version 7
+            readerVersion = max(readerVersion, COLUMN_MAPPING_MODE_SUPPORTED_READER_VERSION);
+            writerVersion = max(writerVersion, COLUMN_MAPPING_MODE_SUPPORTED_WRITER_VERSION);
+        }
+        if (containsTimestampType) {
+            readerVersion = max(readerVersion, TIMESTAMP_NTZ_SUPPORTED_READER_VERSION);
+            writerVersion = max(writerVersion, TIMESTAMP_NTZ_SUPPORTED_WRITER_VERSION);
+            readerFeatures.add(TIMESTAMP_NTZ_FEATURE_NAME);
+            writerFeatures.add(TIMESTAMP_NTZ_FEATURE_NAME);
+        }
+        return new ProtocolEntry(
+                readerVersion,
+                writerVersion,
+                readerFeatures.isEmpty() ? Optional.empty() : Optional.of(readerFeatures),
+                writerFeatures.isEmpty() ? Optional.empty() : Optional.of(writerFeatures));
     }
 
-    private void writeCheckpointIfNeeded(ConnectorSession session, SchemaTableName table, Optional<Long> checkpointInterval, long newVersion)
+    private void writeCheckpointIfNeeded(
+            ConnectorSession session,
+            SchemaTableName table,
+            String tableLocation,
+            long readVersion,
+            Optional<Long> checkpointInterval,
+            long newVersion)
     {
         try {
             // We are writing checkpoint synchronously. It should not be long lasting operation for tables where transaction log is not humongous.
             // Tables with really huge transaction logs would behave poorly in read flow already.
-            TableSnapshot snapshot = metastore.getSnapshot(table, session);
+            TableSnapshot snapshot = getSnapshot(session, table, tableLocation, Optional.of(readVersion));
             long lastCheckpointVersion = snapshot.getLastCheckpointVersion().orElse(0L);
             if (newVersion - lastCheckpointVersion < checkpointInterval.orElse(defaultCheckpointInterval)) {
                 return;
@@ -1738,7 +2386,8 @@ private void writeCheckpointIfNeeded(ConnectorSession session, SchemaTableName t
                 LOG.info("Snapshot for table %s already at version %s when checkpoint requested for version %s", table, snapshot.getVersion(), newVersion);
             }
 
-            checkpointWriterManager.writeCheckpoint(session, snapshot);
+            TableSnapshot updatedSnapshot = snapshot.getUpdatedSnapshot(fileSystemFactory.create(session), Optional.of(newVersion)).orElseThrow();
+            checkpointWriterManager.writeCheckpoint(session, updatedSnapshot);
         }
         catch (Exception e) {
             // We can't fail here as transaction was already committed, in case of INSERT this could result
@@ -1749,8 +2398,10 @@ private void writeCheckpointIfNeeded(ConnectorSession session, SchemaTableName t
 
     private void cleanupFailedWrite(ConnectorSession session, String tableLocation, List<DataFileInfo> dataFiles)
     {
-        List<String> filesToDelete = dataFiles.stream()
-                .map(dataFile -> new Path(tableLocation, dataFile.getPath()).toString())
+        Location location = Location.of(tableLocation);
+        List<Location> filesToDelete = dataFiles.stream()
+                .map(DataFileInfo::getPath)
+                .map(location::appendPath)
                 .collect(toImmutableList());
         try {
             TrinoFileSystem fileSystem = fileSystemFactory.create(session);
@@ -1758,44 +2409,43 @@ private void cleanupFailedWrite(ConnectorSession session, String tableLocation,
         }
         catch (Exception e) {
             // Can be safely ignored since a VACUUM from DeltaLake will take care of such orphaned files
-            LOG.warn(e, "Failed cleanup of leftover files from failed write, files are: %s", dataFiles.stream()
-                    .map(dataFileInfo -> new Path(tableLocation, dataFileInfo.getPath()))
-                    .collect(toImmutableList()));
+            LOG.warn(e, "Failed cleanup of leftover files from failed write, files are: %s", filesToDelete);
         }
     }
 
     @Override
     public Optional<Object> getInfo(ConnectorTableHandle table)
     {
-        boolean isPartitioned = !((DeltaLakeTableHandle) table).getMetadataEntry().getCanonicalPartitionColumns().isEmpty();
+        boolean isPartitioned = !((DeltaLakeTableHandle) table).getMetadataEntry().getLowercasePartitionColumns().isEmpty();
         return Optional.of(new DeltaLakeInputInfo(isPartitioned));
     }
 
     @Override
     public void dropTable(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
-        SchemaTableName schemaTableName;
-        if (tableHandle instanceof CorruptedDeltaLakeTableHandle corruptedTableHandle) {
-            schemaTableName = corruptedTableHandle.schemaTableName();
-        }
-        else {
-            DeltaLakeTableHandle handle = (DeltaLakeTableHandle) tableHandle;
-            schemaTableName = handle.getSchemaTableName();
+        LocatedTableHandle handle = (LocatedTableHandle) tableHandle;
+        boolean deleteData = handle.managed();
+        metastore.dropTable(session, handle.schemaTableName(), handle.location(), deleteData);
+        if (deleteData) {
+            try {
+                fileSystemFactory.create(session).deleteDirectory(Location.of(handle.location()));
+            }
+            catch (IOException e) {
+                throw new TrinoException(DELTA_LAKE_FILESYSTEM_ERROR, format("Failed to delete directory %s of the table %s", handle.location(), handle.schemaTableName()), e);
+            }
         }
-
-        Table table = metastore.getTable(schemaTableName.getSchemaName(), schemaTableName.getTableName())
-                .orElseThrow(() -> new TableNotFoundException(schemaTableName));
-
-        metastore.dropTable(session, schemaTableName.getSchemaName(), schemaTableName.getTableName(), table.getTableType().equals(MANAGED_TABLE.toString()));
+        // As a precaution, clear the caches
+        statisticsAccess.invalidateCache(handle.schemaTableName(), Optional.of(handle.location()));
+        transactionLogAccess.invalidateCache(handle.schemaTableName(), Optional.of(handle.location()));
     }
 
     @Override
     public void renameTable(ConnectorSession session, ConnectorTableHandle tableHandle, SchemaTableName newTableName)
     {
         DeltaLakeTableHandle handle = checkValidTableHandle(tableHandle);
-        Table table = metastore.getTable(handle.getSchemaName(), handle.getTableName())
+        DeltaMetastoreTable table = metastore.getTable(handle.getSchemaName(), handle.getTableName())
                 .orElseThrow(() -> new TableNotFoundException(handle.getSchemaTableName()));
-        if (table.getTableType().equals(MANAGED_TABLE.name()) && !allowManagedTableRename) {
+        if (table.managed() && !allowManagedTableRename) {
             throw new TrinoException(NOT_SUPPORTED, "Renaming managed tables is not allowed with current metastore configuration");
         }
         metastore.renameTable(session, handle.getSchemaTableName(), newTableName);
@@ -1832,7 +2482,7 @@ public void setTableProperties(ConnectorSession session, ConnectorTableHandle ta
             throw new TrinoException(NOT_SUPPORTED, "The following properties cannot be updated: " + String.join(", ", unsupportedProperties));
         }
 
-        ProtocolEntry currentProtocolEntry = getProtocolEntry(session, handle.getSchemaTableName());
+        ProtocolEntry currentProtocolEntry = handle.getProtocolEntry();
 
         long createdTime = Instant.now().toEpochMilli();
 
@@ -1842,6 +2492,11 @@ public void setTableProperties(ConnectorSession session, ConnectorTableHandle ta
             boolean changeDataFeedEnabled = (Boolean) properties.get(CHANGE_DATA_FEED_ENABLED_PROPERTY)
                     .orElseThrow(() -> new IllegalArgumentException("The change_data_feed_enabled property cannot be empty"));
             if (changeDataFeedEnabled) {
+                Set<String> columnNames = getColumns(handle.getMetadataEntry(), handle.getProtocolEntry()).stream().map(DeltaLakeColumnHandle::getBaseColumnName).collect(toImmutableSet());
+                Set<String> conflicts = Sets.intersection(columnNames, CHANGE_DATA_FEED_COLUMN_NAMES);
+                if (!conflicts.isEmpty()) {
+                    throw new TrinoException(NOT_SUPPORTED, "Unable to enable change data feed because table contains %s columns".formatted(conflicts));
+                }
                 requiredWriterVersion = max(requiredWriterVersion, CDF_SUPPORTED_WRITER_VERSION);
             }
             Map<String, String> configuration = new HashMap<>(handle.getMetadataEntry().getConfiguration());
@@ -1854,7 +2509,7 @@ public void setTableProperties(ConnectorSession session, ConnectorTableHandle ta
 
         Optional<ProtocolEntry> protocolEntry = Optional.empty();
         if (requiredWriterVersion != currentProtocolEntry.getMinWriterVersion()) {
-            protocolEntry = Optional.of(new ProtocolEntry(currentProtocolEntry.getMinReaderVersion(), requiredWriterVersion));
+            protocolEntry = Optional.of(new ProtocolEntry(currentProtocolEntry.getMinReaderVersion(), requiredWriterVersion, currentProtocolEntry.getReaderFeatures(), currentProtocolEntry.getWriterFeatures()));
         }
 
         try {
@@ -1885,12 +2540,14 @@ private MetadataEntry buildMetadataEntry(MetadataEntry metadataEntry, Map<String
     }
 
     @Override
-    public Map<String, Object> getSchemaProperties(ConnectorSession session, CatalogSchemaName schemaName)
+    public Map<String, Object> getSchemaProperties(ConnectorSession session, String schemaName)
     {
-        String schema = schemaName.getSchemaName();
-        checkState(!schema.equals("information_schema") && !schema.equals("sys"), "Schema is not accessible: %s", schemaName);
-        Optional<Database> db = metastore.getDatabase(schema);
-        return db.map(DeltaLakeSchemaProperties::fromDatabase).orElseThrow(() -> new SchemaNotFoundException(schema));
+        if (isHiveSystemSchema(schemaName)) {
+            throw new TrinoException(NOT_SUPPORTED, "Schema properties are not supported for system schema: " + schemaName);
+        }
+        return metastore.getDatabase(schemaName)
+                .map(DeltaLakeSchemaProperties::fromDatabase)
+                .orElseThrow(() -> new SchemaNotFoundException(schemaName));
     }
 
     @Override
@@ -2007,7 +2664,21 @@ private void setRollback(Runnable action)
 
     private static String toUriFormat(String path)
     {
-        return new Path(path).toUri().toString();
+        verify(!path.startsWith("/") && !path.contains(":/"), "unexpected path: %s", path);
+        try {
+            return new URI(null, null, path, null).toString();
+        }
+        catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Invalid path: " + path, e);
+        }
+    }
+
+    static String relativePath(String basePath, String path)
+    {
+        String basePathDirectory = basePath.endsWith("/") ? basePath : basePath + "/";
+        checkArgument(path.startsWith(basePathDirectory) && (path.length() > basePathDirectory.length()),
+                "path [%s] must be a subdirectory of basePath [%s]", path, basePath);
+        return path.substring(basePathDirectory.length());
     }
 
     public void rollback()
@@ -2024,11 +2695,18 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
         DeltaLakeTableHandle tableHandle = (DeltaLakeTableHandle) handle;
         SchemaTableName tableName = tableHandle.getSchemaTableName();
 
-        Set<DeltaLakeColumnHandle> partitionColumns = ImmutableSet.copyOf(extractPartitionColumns(tableHandle.getMetadataEntry(), typeManager));
+        Set<DeltaLakeColumnHandle> partitionColumns = ImmutableSet.copyOf(extractPartitionColumns(tableHandle.getMetadataEntry(), tableHandle.getProtocolEntry(), typeManager));
         Map<ColumnHandle, Domain> constraintDomains = constraint.getSummary().getDomains().orElseThrow(() -> new IllegalArgumentException("constraint summary is NONE"));
 
         ImmutableMap.Builder<DeltaLakeColumnHandle, Domain> enforceableDomains = ImmutableMap.builder();
         ImmutableMap.Builder<DeltaLakeColumnHandle, Domain> unenforceableDomains = ImmutableMap.builder();
+        ImmutableSet.Builder<DeltaLakeColumnHandle> constraintColumns = ImmutableSet.builder();
+        // We need additional field to track partition columns used in queries as enforceDomains seem to be not catching
+        // cases when partition columns is used within complex filter as 'partitionColumn % 2 = 0'
+        constraint.getPredicateColumns().stream()
+                .flatMap(Collection::stream)
+                .map(DeltaLakeColumnHandle.class::cast)
+                .forEach(constraintColumns::add);
         for (Entry<ColumnHandle, Domain> domainEntry : constraintDomains.entrySet()) {
             DeltaLakeColumnHandle column = (DeltaLakeColumnHandle) domainEntry.getKey();
             if (!partitionColumns.contains(column)) {
@@ -2037,6 +2715,7 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
             else {
                 enforceableDomains.put(column, domainEntry.getValue());
             }
+            constraintColumns.add(column);
         }
 
         TupleDomain<DeltaLakeColumnHandle> newEnforcedConstraint = TupleDomain.withColumnDomains(enforceableDomains.buildOrThrow());
@@ -2044,8 +2723,10 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
         DeltaLakeTableHandle newHandle = new DeltaLakeTableHandle(
                 tableName.getSchemaName(),
                 tableName.getTableName(),
+                tableHandle.isManaged(),
                 tableHandle.getLocation(),
                 tableHandle.getMetadataEntry(),
+                tableHandle.getProtocolEntry(),
                 // Do not simplify the enforced constraint, the connector is guaranteeing the constraint will be applied as is.
                 // The unenforced constraint will still be checked by the engine.
                 tableHandle.getEnforcedPartitionConstraint()
@@ -2053,16 +2734,20 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
                 tableHandle.getNonPartitionConstraint()
                         .intersect(newUnenforcedConstraint)
                         .simplify(domainCompactionThreshold),
+                Sets.union(tableHandle.getConstraintColumns(), constraintColumns.build()),
                 tableHandle.getWriteType(),
                 tableHandle.getProjectedColumns(),
                 tableHandle.getUpdatedColumns(),
                 tableHandle.getUpdateRowIdColumns(),
                 Optional.empty(),
-                tableHandle.getReadVersion(),
-                tableHandle.isRetriesEnabled());
+                false,
+                false,
+                Optional.empty(),
+                tableHandle.getReadVersion());
 
         if (tableHandle.getEnforcedPartitionConstraint().equals(newHandle.getEnforcedPartitionConstraint()) &&
-                tableHandle.getNonPartitionConstraint().equals(newHandle.getNonPartitionConstraint())) {
+                tableHandle.getNonPartitionConstraint().equals(newHandle.getNonPartitionConstraint()) &&
+                tableHandle.getConstraintColumns().equals(newHandle.getConstraintColumns())) {
             return Optional.empty();
         }
 
@@ -2080,31 +2765,200 @@ public Optional<ProjectionApplicationResult<ConnectorTableHandle>> applyProjecti
             Map<String, ColumnHandle> assignments)
     {
         DeltaLakeTableHandle deltaLakeTableHandle = (DeltaLakeTableHandle) tableHandle;
-        Set<ColumnHandle> projectedColumns = ImmutableSet.copyOf(assignments.values());
 
-        if (deltaLakeTableHandle.getProjectedColumns().isPresent() &&
-                deltaLakeTableHandle.getProjectedColumns().get().equals(projectedColumns)) {
-            return Optional.empty();
+        // Create projected column representations for supported sub expressions. Simple column references and chain of
+        // dereferences on a variable are supported right now.
+        Set<ConnectorExpression> projectedExpressions = projections.stream()
+                .flatMap(expression -> extractSupportedProjectedColumns(expression).stream())
+                .collect(toImmutableSet());
+
+        Map<ConnectorExpression, ProjectedColumnRepresentation> columnProjections = projectedExpressions.stream()
+                .collect(toImmutableMap(Function.identity(), ApplyProjectionUtil::createProjectedColumnRepresentation));
+
+        // all references are simple variables
+        if (!isProjectionPushdownEnabled(session)
+                || columnProjections.values().stream().allMatch(ProjectedColumnRepresentation::isVariable)) {
+            Set<DeltaLakeColumnHandle> projectedColumns = assignments.values().stream()
+                    .map(DeltaLakeColumnHandle.class::cast)
+                    .collect(toImmutableSet());
+            // Check if column was projected already in previous call
+            if (deltaLakeTableHandle.getProjectedColumns().isPresent()
+                    && deltaLakeTableHandle.getProjectedColumns().get().equals(projectedColumns)) {
+                return Optional.empty();
+            }
+
+            List<Assignment> newColumnAssignments = assignments.entrySet().stream()
+                    .map(assignment -> new Assignment(
+                            assignment.getKey(),
+                            assignment.getValue(),
+                            ((DeltaLakeColumnHandle) assignment.getValue()).getBaseType()))
+                    .collect(toImmutableList());
+
+            return Optional.of(new ProjectionApplicationResult<>(
+                    deltaLakeTableHandle.withProjectedColumns(projectedColumns),
+                    projections,
+                    newColumnAssignments,
+                    false));
         }
 
-        List<ConnectorExpression> simpleProjections = projections.stream()
-                .filter(projection -> projection instanceof Variable)
-                .collect(toImmutableList());
+        Map<String, Assignment> newAssignments = new HashMap<>();
+        ImmutableMap.Builder<ConnectorExpression, Variable> newVariablesBuilder = ImmutableMap.builder();
+        ImmutableSet.Builder<DeltaLakeColumnHandle> projectedColumnsBuilder = ImmutableSet.builder();
 
-        List<Assignment> newColumnAssignments = assignments.entrySet().stream()
-                .map(assignment -> new Assignment(
-                        assignment.getKey(),
-                        assignment.getValue(),
-                        ((DeltaLakeColumnHandle) assignment.getValue()).getType()))
+        for (Map.Entry<ConnectorExpression, ProjectedColumnRepresentation> entry : columnProjections.entrySet()) {
+            ConnectorExpression expression = entry.getKey();
+            ProjectedColumnRepresentation projectedColumn = entry.getValue();
+
+            DeltaLakeColumnHandle projectedColumnHandle;
+            String projectedColumnName;
+
+            // See if input already contains a columnhandle for this projected column, avoid creating duplicates.
+            Optional<String> existingColumn = find(assignments, projectedColumn);
+
+            if (existingColumn.isPresent()) {
+                projectedColumnName = existingColumn.get();
+                projectedColumnHandle = (DeltaLakeColumnHandle) assignments.get(projectedColumnName);
+            }
+            else {
+                // Create a new column handle
+                DeltaLakeColumnHandle oldColumnHandle = (DeltaLakeColumnHandle) assignments.get(projectedColumn.getVariable().getName());
+                projectedColumnHandle = projectColumn(oldColumnHandle, projectedColumn.getDereferenceIndices(), expression.getType(), getColumnMappingMode(deltaLakeTableHandle.getMetadataEntry(), deltaLakeTableHandle.getProtocolEntry()));
+                projectedColumnName = projectedColumnHandle.getQualifiedPhysicalName();
+            }
+
+            Variable projectedColumnVariable = new Variable(projectedColumnName, expression.getType());
+            Assignment newAssignment = new Assignment(projectedColumnName, projectedColumnHandle, expression.getType());
+            newAssignments.putIfAbsent(projectedColumnName, newAssignment);
+
+            newVariablesBuilder.put(expression, projectedColumnVariable);
+            projectedColumnsBuilder.add(projectedColumnHandle);
+        }
+
+        // Modify projections to refer to new variables
+        Map<ConnectorExpression, Variable> newVariables = newVariablesBuilder.buildOrThrow();
+        List<ConnectorExpression> newProjections = projections.stream()
+                .map(expression -> replaceWithNewVariables(expression, newVariables))
                 .collect(toImmutableList());
 
+        List<Assignment> outputAssignments = ImmutableList.copyOf(newAssignments.values());
         return Optional.of(new ProjectionApplicationResult<>(
-                deltaLakeTableHandle.withProjectedColumns(projectedColumns),
-                simpleProjections,
-                newColumnAssignments,
+                deltaLakeTableHandle.withProjectedColumns(projectedColumnsBuilder.build()),
+                newProjections,
+                outputAssignments,
                 false));
     }
 
+    private static DeltaLakeColumnHandle projectColumn(DeltaLakeColumnHandle column, List<Integer> indices, Type projectedColumnType, ColumnMappingMode columnMappingMode)
+    {
+        if (indices.isEmpty()) {
+            return column;
+        }
+        Optional<DeltaLakeColumnProjectionInfo> existingProjectionInfo = column.getProjectionInfo();
+        ImmutableList.Builder<String> dereferenceNames = ImmutableList.builder();
+        ImmutableList.Builder<Integer> dereferenceIndices = ImmutableList.builder();
+
+        if (!column.isBaseColumn()) {
+            dereferenceNames.addAll(existingProjectionInfo.get().getDereferencePhysicalNames());
+            dereferenceIndices.addAll(existingProjectionInfo.get().getDereferenceIndices());
+        }
+
+        Type columnType = switch (columnMappingMode) {
+            case ID, NAME -> column.getBasePhysicalType();
+            case NONE -> column.getBaseType();
+            default -> throw new TrinoException(NOT_SUPPORTED, "Projecting columns with column mapping %s is not supported".formatted(columnMappingMode));
+        };
+
+        for (int index : dereferenceIndices.build()) {
+            RowType.Field field = ((RowType) columnType).getFields().get(index);
+            columnType = field.getType();
+        }
+
+        for (int index : indices) {
+            RowType.Field field = ((RowType) columnType).getFields().get(index);
+            dereferenceNames.add(field.getName().orElseThrow());
+            columnType = field.getType();
+        }
+        dereferenceIndices.addAll(indices);
+
+        DeltaLakeColumnProjectionInfo projectionInfo = new DeltaLakeColumnProjectionInfo(
+                projectedColumnType,
+                dereferenceIndices.build(),
+                dereferenceNames.build());
+
+        return new DeltaLakeColumnHandle(
+                column.getBaseColumnName(),
+                column.getBaseType(),
+                column.getBaseFieldId(),
+                column.getBasePhysicalColumnName(),
+                column.getBasePhysicalType(),
+                REGULAR,
+                Optional.of(projectionInfo));
+    }
+
+    /**
+     * Returns the assignment key corresponding to the column represented by {@param projectedColumn} in the {@param assignments}, if one exists.
+     * The variable in the {@param projectedColumn} can itself be a representation of another projected column. For example,
+     * say a projected column representation has variable "x" and a dereferenceIndices=[0]. "x" can in-turn map to a projected
+     * column handle with base="a" and [1, 2] as dereference indices. Then the method searches for a column handle in
+     * {@param assignments} with base="a" and dereferenceIndices=[1, 2, 0].
+     */
+    private static Optional<String> find(Map<String, ColumnHandle> assignments, ProjectedColumnRepresentation projectedColumn)
+    {
+        DeltaLakeColumnHandle variableColumn = (DeltaLakeColumnHandle) assignments.get(projectedColumn.getVariable().getName());
+
+        requireNonNull(variableColumn, "variableColumn is null");
+
+        String baseColumnName = variableColumn.getBaseColumnName();
+
+        List<Integer> variableColumnIndices = variableColumn.getProjectionInfo()
+                .map(DeltaLakeColumnProjectionInfo::getDereferenceIndices)
+                .orElse(ImmutableList.of());
+
+        List<Integer> projectionIndices = ImmutableList.<Integer>builder()
+                .addAll(variableColumnIndices)
+                .addAll(projectedColumn.getDereferenceIndices())
+                .build();
+
+        for (Map.Entry<String, ColumnHandle> entry : assignments.entrySet()) {
+            DeltaLakeColumnHandle column = (DeltaLakeColumnHandle) entry.getValue();
+            if (column.getBaseColumnName().equals(baseColumnName) &&
+                    column.getProjectionInfo()
+                            .map(DeltaLakeColumnProjectionInfo::getDereferenceIndices)
+                            .orElse(ImmutableList.of())
+                            .equals(projectionIndices)) {
+                return Optional.of(entry.getKey());
+            }
+        }
+
+        return Optional.empty();
+    }
+
+    @Override
+    public void validateScan(ConnectorSession session, ConnectorTableHandle handle)
+    {
+        DeltaLakeTableHandle deltaLakeTableHandle = (DeltaLakeTableHandle) handle;
+
+        if (isQueryPartitionFilterRequired(session)) {
+            List<String> partitionColumns = deltaLakeTableHandle.getMetadataEntry().getOriginalPartitionColumns();
+            if (!partitionColumns.isEmpty()) {
+                if (deltaLakeTableHandle.getAnalyzeHandle().isPresent()) {
+                    throw new TrinoException(
+                            QUERY_REJECTED,
+                            "ANALYZE statement can not be performed on partitioned tables because filtering is required on at least one partition. However, the partition filtering check can be disabled with the catalog session property 'query_partition_filter_required'.");
+                }
+                Set<String> referencedColumns =
+                        deltaLakeTableHandle.getConstraintColumns().stream()
+                                .map(DeltaLakeColumnHandle::getBaseColumnName)
+                                .collect(toImmutableSet());
+                if (Collections.disjoint(referencedColumns, partitionColumns)) {
+                    throw new TrinoException(
+                            QUERY_REJECTED,
+                            format("Filter required on %s for at least one partition column: %s", deltaLakeTableHandle.getSchemaTableName(), String.join(", ", partitionColumns)));
+                }
+            }
+        }
+    }
+
     @Override
     public Optional<TableScanRedirectApplicationResult> applyTableScanRedirect(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
@@ -2125,8 +2979,12 @@ public ConnectorAnalyzeMetadata getStatisticsCollectionMetadata(ConnectorSession
         MetadataEntry metadata = handle.getMetadataEntry();
 
         Optional<Instant> filesModifiedAfterFromProperties = getFilesModifiedAfterProperty(analyzeProperties);
+        AnalyzeMode analyzeMode = getRefreshMode(analyzeProperties);
 
-        Optional<ExtendedStatistics> statistics = statisticsAccess.readExtendedStatistics(session, handle.getLocation());
+        Optional<ExtendedStatistics> statistics = Optional.empty();
+        if (analyzeMode == INCREMENTAL) {
+            statistics = statisticsAccess.readExtendedStatistics(session, handle.getSchemaTableName(), handle.getLocation());
+        }
 
         Optional<Instant> alreadyAnalyzedModifiedTimeMax = statistics.map(ExtendedStatistics::getAlreadyAnalyzedModifiedTimeMax);
 
@@ -2138,10 +2996,8 @@ public ConnectorAnalyzeMetadata getStatisticsCollectionMetadata(ConnectorSession
                     alreadyAnalyzedModifiedTimeMax.orElse(EPOCH)));
         }
 
-        List<ColumnMetadata> columnsMetadata = extractColumnMetadata(metadata, typeManager);
-        Set<String> allColumnNames = columnsMetadata.stream()
-                .map(ColumnMetadata::getName)
-                .collect(toImmutableSet());
+        List<DeltaLakeColumnMetadata> columnsMetadata = extractSchema(metadata, handle.getProtocolEntry(), typeManager);
+        Set<String> allColumnNames = columnsMetadata.stream().map(columnMetadata -> columnMetadata.getName().toLowerCase(ENGLISH)).collect(Collectors.toSet());
         Optional<Set<String>> analyzeColumnNames = getColumnNames(analyzeProperties);
         if (analyzeColumnNames.isPresent()) {
             Set<String> columnNames = analyzeColumnNames.get();
@@ -2167,12 +3023,14 @@ public ConnectorAnalyzeMetadata getStatisticsCollectionMetadata(ConnectorSession
             }
         }
 
-        AnalyzeHandle analyzeHandle = new AnalyzeHandle(statistics.isEmpty(), filesModifiedAfter, analyzeColumnNames);
+        AnalyzeHandle analyzeHandle = new AnalyzeHandle(statistics.isEmpty() ? FULL_REFRESH : INCREMENTAL, filesModifiedAfter, analyzeColumnNames);
         DeltaLakeTableHandle newHandle = new DeltaLakeTableHandle(
                 handle.getSchemaTableName().getSchemaName(),
                 handle.getSchemaTableName().getTableName(),
+                handle.isManaged(),
                 handle.getLocation(),
                 metadata,
+                handle.getProtocolEntry(),
                 TupleDomain.all(),
                 TupleDomain.all(),
                 Optional.empty(),
@@ -2180,13 +3038,13 @@ public ConnectorAnalyzeMetadata getStatisticsCollectionMetadata(ConnectorSession
                 Optional.empty(),
                 Optional.empty(),
                 Optional.of(analyzeHandle),
-                handle.getReadVersion(),
-                false);
+                handle.getReadVersion());
 
         TableStatisticsMetadata statisticsMetadata = getStatisticsCollectionMetadata(
-                columnsMetadata,
+                columnsMetadata.stream().map(DeltaLakeColumnMetadata::getColumnMetadata).collect(toImmutableList()),
                 analyzeColumnNames.orElse(allColumnNames),
-                true);
+                statistics.isPresent(),
+                false);
 
         return new ConnectorAnalyzeMetadata(newHandle, statisticsMetadata);
     }
@@ -2204,23 +3062,28 @@ public TableStatisticsMetadata getStatisticsCollectionMetadataForWrite(Connector
 
         Optional<Set<String>> analyzeColumnNames = Optional.empty();
         String tableLocation = getLocation(tableMetadata.getProperties());
+        Optional<ExtendedStatistics> existingStatistics = Optional.empty();
         if (tableLocation != null) {
-            analyzeColumnNames = statisticsAccess.readExtendedStatistics(session, tableLocation)
-                    .flatMap(ExtendedStatistics::getAnalyzedColumns);
+            existingStatistics = statisticsAccess.readExtendedStatistics(session, tableMetadata.getTable(), tableLocation);
+            analyzeColumnNames = existingStatistics.flatMap(ExtendedStatistics::getAnalyzedColumns);
         }
 
         return getStatisticsCollectionMetadata(
                 tableMetadata.getColumns(),
                 analyzeColumnNames.orElse(allColumnNames),
-                // File modified time does not need to be collected as a statistics because it gets derived directly from files being written
-                false);
+                existingStatistics.isPresent(),
+                true);
     }
 
     private TableStatisticsMetadata getStatisticsCollectionMetadata(
             List<ColumnMetadata> tableColumns,
             Set<String> analyzeColumnNames,
-            boolean includeMaxFileModifiedTime)
+            boolean extendedStatisticsExists,
+            boolean isCollectionOnWrite)
     {
+        // Collect file statistics only when performing ANALYZE on a table without extended statistics
+        boolean collectFileStatistics = !extendedStatisticsExists && !isCollectionOnWrite;
+
         ImmutableSet.Builder<ColumnStatisticMetadata> columnStatistics = ImmutableSet.builder();
         tableColumns.stream()
                 .filter(DeltaLakeMetadata::shouldCollectExtendedStatistics)
@@ -2230,17 +3093,35 @@ private TableStatisticsMetadata getStatisticsCollectionMetadata(
                         columnStatistics.add(new ColumnStatisticMetadata(columnMetadata.getName(), TOTAL_SIZE_IN_BYTES));
                     }
                     columnStatistics.add(new ColumnStatisticMetadata(columnMetadata.getName(), NUMBER_OF_DISTINCT_VALUES_SUMMARY));
+                    if (collectFileStatistics) {
+                        // TODO: (https://github.com/trinodb/trino/issues/17055) Collect file level stats for VARCHAR type
+                        if (!columnMetadata.getType().equals(VARCHAR)
+                                && !columnMetadata.getType().equals(BOOLEAN)
+                                && !columnMetadata.getType().equals(VARBINARY)) {
+                            columnStatistics.add(new ColumnStatisticMetadata(columnMetadata.getName(), MIN_VALUE));
+                            columnStatistics.add(new ColumnStatisticMetadata(columnMetadata.getName(), MAX_VALUE));
+                        }
+                        columnStatistics.add(new ColumnStatisticMetadata(columnMetadata.getName(), NUMBER_OF_NON_NULL_VALUES));
+                    }
                 });
 
-        if (includeMaxFileModifiedTime) {
+        if (!isCollectionOnWrite) {
             // collect max(file modification time) for sake of incremental ANALYZE
+            // File modified time does not need to be collected as a statistics because it gets derived directly from files being written
             columnStatistics.add(new ColumnStatisticMetadata(FILE_MODIFIED_TIME_COLUMN_NAME, MAX_VALUE));
         }
 
+        Set<TableStatisticType> tableStatistics = ImmutableSet.of();
+        List<String> groupingColumns = ImmutableList.of();
+        if (collectFileStatistics) {
+            tableStatistics = ImmutableSet.of(TableStatisticType.ROW_COUNT);
+            groupingColumns = ImmutableList.of(PATH_COLUMN_NAME);
+        }
+
         return new TableStatisticsMetadata(
                 columnStatistics.build(),
-                ImmutableSet.of(),
-                ImmutableList.of());
+                tableStatistics,
+                groupingColumns);
     }
 
     private static boolean shouldCollectExtendedStatistics(ColumnMetadata columnMetadata)
@@ -2267,24 +3148,114 @@ public void finishStatisticsCollection(ConnectorSession session, ConnectorTableH
     {
         DeltaLakeTableHandle tableHandle = (DeltaLakeTableHandle) table;
         AnalyzeHandle analyzeHandle = tableHandle.getAnalyzeHandle().orElseThrow(() -> new IllegalArgumentException("analyzeHandle not set"));
-        String location = metastore.getTableLocation(tableHandle.getSchemaTableName());
+        if (analyzeHandle.getAnalyzeMode() == FULL_REFRESH) {
+            // TODO: Populate stats for incremental ANALYZE https://github.com/trinodb/trino/issues/18110
+            generateMissingFileStatistics(session, tableHandle, computedStatistics);
+        }
         Optional<Instant> maxFileModificationTime = getMaxFileModificationTime(computedStatistics);
+        Map<String, String> physicalColumnNameMapping = extractSchema(tableHandle.getMetadataEntry(), tableHandle.getProtocolEntry(), typeManager).stream()
+                .collect(toImmutableMap(DeltaLakeColumnMetadata::getName, DeltaLakeColumnMetadata::getPhysicalName));
         updateTableStatistics(
                 session,
                 Optional.of(analyzeHandle),
-                location,
+                tableHandle.getSchemaTableName(),
+                tableHandle.getLocation(),
                 maxFileModificationTime,
-                computedStatistics);
+                computedStatistics,
+                getExactColumnNames(tableHandle.getMetadataEntry()),
+                Optional.of(physicalColumnNameMapping));
+    }
+
+    private void generateMissingFileStatistics(ConnectorSession session, DeltaLakeTableHandle tableHandle, Collection<ComputedStatistics> computedStatistics)
+    {
+        Map<String, AddFileEntry> addFileEntriesWithNoStats = transactionLogAccess.getActiveFiles(
+                        getSnapshot(session, tableHandle), tableHandle.getMetadataEntry(), tableHandle.getProtocolEntry(), session)
+                .stream()
+                .filter(addFileEntry -> addFileEntry.getStats().isEmpty()
+                        || addFileEntry.getStats().get().getNumRecords().isEmpty()
+                        || addFileEntry.getStats().get().getMaxValues().isEmpty()
+                        || addFileEntry.getStats().get().getMinValues().isEmpty()
+                        || addFileEntry.getStats().get().getNullCount().isEmpty())
+                .filter(addFileEntry -> !URI.create(addFileEntry.getPath()).isAbsolute()) // TODO: Support absolute paths https://github.com/trinodb/trino/issues/18277
+                // Statistics returns whole path to file build in DeltaLakeSplitManager, so we need to create corresponding map key for AddFileEntry.
+                .collect(toImmutableMap(addFileEntry -> DeltaLakeSplitManager.buildSplitPath(Location.of(tableHandle.getLocation()), addFileEntry).toString(), identity()));
+
+        if (addFileEntriesWithNoStats.isEmpty()) {
+            return;
+        }
+
+        Map</* lowercase */ String, DeltaLakeColumnHandle> lowercaseToColumnsHandles = getColumns(tableHandle.getMetadataEntry(), tableHandle.getProtocolEntry()).stream()
+                .filter(column -> column.getColumnType() == REGULAR)
+                .collect(toImmutableMap(columnHandle -> columnHandle.getBaseColumnName().toLowerCase(ENGLISH), identity()));
+
+        List<AddFileEntry> updatedAddFileEntries = computedStatistics.stream()
+                .map(statistics -> {
+                    // Grouping by `PATH_COLUMN_NAME`.
+                    String filePathFromStatistics = VARCHAR.getSlice(statistics.getGroupingValues().get(0), 0).toStringUtf8();
+                    // Check if collected statistics are for files without stats.
+                    // If AddFileEntry is present in addFileEntriesWithNoStats means that it does not have statistics so prepare updated entry.
+                    // If null is returned from addFileEntriesWithNoStats means that statistics are present, and we don't need to do anything.
+                    AddFileEntry addFileEntry = addFileEntriesWithNoStats.get(filePathFromStatistics);
+                    if (addFileEntry != null) {
+                        return Optional.of(prepareUpdatedAddFileEntry(statistics, addFileEntry, lowercaseToColumnsHandles));
+                    }
+                    return Optional.<AddFileEntry>empty();
+                })
+                .flatMap(Optional::stream)
+                .collect(toImmutableList());
+
+        if (updatedAddFileEntries.isEmpty()) {
+            return;
+        }
+        try {
+            long createdTime = Instant.now().toEpochMilli();
+            long readVersion = tableHandle.getReadVersion();
+            long commitVersion = readVersion + 1;
+            TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriter(session, tableHandle.getLocation());
+            transactionLogWriter.appendCommitInfoEntry(getCommitInfoEntry(session, commitVersion, createdTime, OPTIMIZE_OPERATION, readVersion));
+            updatedAddFileEntries.forEach(transactionLogWriter::appendAddFileEntry);
+            transactionLogWriter.flush();
+        }
+        catch (Throwable e) {
+            throw new TrinoException(DELTA_LAKE_BAD_WRITE, "Unable to access file system for: " + tableHandle.getLocation(), e);
+        }
+    }
+
+    private AddFileEntry prepareUpdatedAddFileEntry(ComputedStatistics stats, AddFileEntry addFileEntry, Map</* lowercase */ String, DeltaLakeColumnHandle> lowercaseToColumnsHandles)
+    {
+        DeltaLakeJsonFileStatistics deltaLakeJsonFileStatistics = DeltaLakeComputedStatistics.toDeltaLakeJsonFileStatistics(stats, lowercaseToColumnsHandles);
+        try {
+            return new AddFileEntry(
+                    addFileEntry.getPath(),
+                    addFileEntry.getPartitionValues(), // preserve original case without canonicalization
+                    addFileEntry.getSize(),
+                    addFileEntry.getModificationTime(),
+                    false,
+                    Optional.of(serializeStatsAsJson(deltaLakeJsonFileStatistics)),
+                    Optional.empty(),
+                    addFileEntry.getTags(),
+                    addFileEntry.getDeletionVector());
+        }
+        catch (JsonProcessingException e) {
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Statistics serialization error", e);
+        }
     }
 
     private void updateTableStatistics(
             ConnectorSession session,
             Optional<AnalyzeHandle> analyzeHandle,
+            SchemaTableName schemaTableName,
             String location,
             Optional<Instant> maxFileModificationTime,
-            Collection<ComputedStatistics> computedStatistics)
+            Collection<ComputedStatistics> computedStatistics,
+            List<String> originalColumnNames,
+            Optional<Map<String, String>> physicalColumnNameMapping)
     {
-        Optional<ExtendedStatistics> oldStatistics = statisticsAccess.readExtendedStatistics(session, location);
+        Optional<ExtendedStatistics> oldStatistics = Optional.empty();
+        boolean loadExistingStats = analyzeHandle.isEmpty() || analyzeHandle.get().getAnalyzeMode() == INCREMENTAL;
+        if (loadExistingStats) {
+            oldStatistics = statisticsAccess.readExtendedStatistics(session, schemaTableName, location);
+        }
 
         // more elaborate logic for handling statistics model evaluation may need to be introduced in the future
         // for now let's have a simple check rejecting update
@@ -2293,11 +3264,19 @@ private void updateTableStatistics(
                         statistics.getModelVersion() == ExtendedStatistics.CURRENT_MODEL_VERSION,
                         "Existing table statistics are incompatible, run the drop statistics procedure on this table before re-analyzing"));
 
+        Map<String, String> lowerCaseToExactColumnNames = originalColumnNames.stream()
+                .collect(toImmutableMap(name -> name.toLowerCase(ENGLISH), identity()));
+
         Map<String, DeltaLakeColumnStatistics> oldColumnStatistics = oldStatistics.map(ExtendedStatistics::getColumnStatistics)
                 .orElseGet(ImmutableMap::of);
         Map<String, DeltaLakeColumnStatistics> newColumnStatistics = toDeltaLakeColumnStatistics(computedStatistics);
 
         Map<String, DeltaLakeColumnStatistics> mergedColumnStatistics = newColumnStatistics.entrySet().stream()
+                .map(entry -> {
+                    String columnName = entry.getKey();
+                    String physicalColumnName = toPhysicalColumnName(columnName, lowerCaseToExactColumnNames, physicalColumnNameMapping);
+                    return Map.entry(physicalColumnName, entry.getValue());
+                })
                 .collect(toImmutableMap(
                         Entry::getKey,
                         entry -> {
@@ -2327,9 +3306,12 @@ private void updateTableStatistics(
         }
 
         analyzedColumns.ifPresent(analyzeColumns -> {
-            if (!mergedColumnStatistics.keySet().equals(analyzeColumns)) {
+            Set<String> analyzePhysicalColumns = analyzeColumns.stream()
+                    .map(columnName -> toPhysicalColumnName(columnName, lowerCaseToExactColumnNames, physicalColumnNameMapping))
+                    .collect(toImmutableSet());
+            if (!mergedColumnStatistics.keySet().equals(analyzePhysicalColumns)) {
                 // sanity validation
-                throw new IllegalStateException(format("Unexpected columns in in mergedColumnStatistics %s; expected %s", mergedColumnStatistics.keySet(), analyzeColumns));
+                throw new IllegalStateException(format("Unexpected columns in in mergedColumnStatistics %s; expected %s", mergedColumnStatistics.keySet(), analyzePhysicalColumns));
             }
         });
 
@@ -2338,72 +3320,57 @@ private void updateTableStatistics(
                 mergedColumnStatistics,
                 analyzedColumns);
 
-        statisticsAccess.updateExtendedStatistics(session, location, mergedExtendedStatistics);
-    }
-
-    @Override
-    public boolean supportsReportingWrittenBytes(ConnectorSession session, ConnectorTableHandle connectorTableHandle)
-    {
-        return true;
-    }
-
-    @Override
-    public boolean supportsReportingWrittenBytes(ConnectorSession session, SchemaTableName fullTableName, Map<String, Object> tableProperties)
-    {
-        return true;
+        statisticsAccess.updateExtendedStatistics(session, schemaTableName, location, mergedExtendedStatistics);
     }
 
-    private void cleanExtraOutputFiles(ConnectorSession session, String baseLocation, List<DataFileInfo> validDataFiles)
+    private static String toPhysicalColumnName(String columnName, Map</* lowercase*/ String, String> lowerCaseToExactColumnNames, Optional<Map<String, String>> physicalColumnNameMapping)
     {
-        Set<String> writtenFilePaths = validDataFiles.stream()
-                .map(dataFileInfo -> baseLocation + "/" + dataFileInfo.getPath())
-                .collect(toImmutableSet());
-
-        cleanExtraOutputFiles(session, writtenFilePaths);
+        String originalColumnName = lowerCaseToExactColumnNames.get(columnName.toLowerCase(ENGLISH));
+        checkArgument(originalColumnName != null, "%s doesn't contain '%s'", lowerCaseToExactColumnNames.keySet(), columnName);
+        if (physicalColumnNameMapping.isPresent()) {
+            String physicalColumnName = physicalColumnNameMapping.get().get(originalColumnName);
+            return requireNonNull(physicalColumnName, () -> "%s doesn't exist in %s".formatted(columnName, physicalColumnNameMapping));
+        }
+        return originalColumnName;
     }
 
-    private void cleanExtraOutputFilesForUpdate(ConnectorSession session, String baseLocation, List<DataFileInfo> newFiles)
+    private void cleanExtraOutputFiles(ConnectorSession session, Location baseLocation, List<DataFileInfo> validDataFiles)
     {
-        Set<String> writtenFilePaths = newFiles.stream()
-                .map(dataFileInfo -> baseLocation + "/" + dataFileInfo.getPath())
+        Set<Location> writtenFilePaths = validDataFiles.stream()
+                .map(dataFileInfo -> baseLocation.appendPath(dataFileInfo.getPath()))
                 .collect(toImmutableSet());
 
         cleanExtraOutputFiles(session, writtenFilePaths);
     }
 
-    private void cleanExtraOutputFiles(ConnectorSession session, Set<String> validWrittenFilePaths)
+    private void cleanExtraOutputFiles(ConnectorSession session, Set<Location> validWrittenFilePaths)
     {
-        Set<String> fileLocations = validWrittenFilePaths.stream()
-                .map(path -> {
-                    int fileNameSeparatorPos = path.lastIndexOf("/");
-                    verify(fileNameSeparatorPos != -1 && fileNameSeparatorPos != 0, "invalid data file path: %s", path);
-                    return path.substring(0, fileNameSeparatorPos);
-                })
+        Set<Location> fileLocations = validWrittenFilePaths.stream()
+                .map(Location::parentDirectory)
                 .collect(toImmutableSet());
 
-        for (String location : fileLocations) {
+        for (Location location : fileLocations) {
             cleanExtraOutputFiles(session, session.getQueryId(), location, validWrittenFilePaths);
         }
     }
 
-    private void cleanExtraOutputFiles(ConnectorSession session, String queryId, String location, Set<String> filesToKeep)
+    private void cleanExtraOutputFiles(ConnectorSession session, String queryId, Location location, Set<Location> filesToKeep)
     {
-        Deque<String> filesToDelete = new ArrayDeque<>();
+        Deque<Location> filesToDelete = new ArrayDeque<>();
         try {
             LOG.debug("Deleting failed attempt files from %s for query %s", location, queryId);
             TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-            if (!fileSystem.newInputFile(location).exists()) {
-                // directory may not exist if no files were actually written
-                return;
-            }
 
             // files within given partition are written flat into location; we need to list recursively
             FileIterator iterator = fileSystem.listFiles(location);
             while (iterator.hasNext()) {
-                FileEntry file = iterator.next();
-                String fileName = new Path(file.location()).getName();
-                if (isFileCreatedByQuery(fileName, queryId) && !filesToKeep.contains(location + "/" + fileName)) {
-                    filesToDelete.add(fileName);
+                Location file = iterator.next().location();
+                if (!file.parentDirectory().equals(location)) {
+                    // we do not want recursive listing
+                    continue;
+                }
+                if (isFileCreatedByQuery(file, queryId) && !filesToKeep.contains(file)) {
+                    filesToDelete.add(file);
                 }
             }
 
@@ -2412,83 +3379,165 @@ private void cleanExtraOutputFiles(ConnectorSession session, String queryId, Str
             }
 
             LOG.info("Found %s files to delete and %s to retain in location %s for query %s", filesToDelete.size(), filesToKeep.size(), location, queryId);
-            ImmutableList.Builder<String> filesToDeleteBuilder = ImmutableList.builder();
-            Iterator<String> filesToDeleteIterator = filesToDelete.iterator();
-            while (filesToDeleteIterator.hasNext()) {
-                String fileName = filesToDeleteIterator.next();
-                LOG.debug("Going to delete failed attempt file %s/%s for query %s", location, fileName, queryId);
-                filesToDeleteBuilder.add(fileName);
-                filesToDeleteIterator.remove();
-            }
-
-            List<String> deletedFiles = filesToDeleteBuilder.build();
-            if (!deletedFiles.isEmpty()) {
-                fileSystem.deleteFiles(deletedFiles);
-                LOG.info("Deleted failed attempt files %s from %s for query %s", deletedFiles, location, queryId);
-            }
+            fileSystem.deleteFiles(filesToDelete);
         }
         catch (IOException e) {
-            throw new TrinoException(GENERIC_INTERNAL_ERROR,
-                    format("Could not clean up extraneous output files; remaining files: %s", filesToDelete), e);
+            throw new TrinoException(DELTA_LAKE_FILESYSTEM_ERROR, "Failed to clean up extraneous output files", e);
         }
     }
 
-    private boolean isFileCreatedByQuery(String fileName, String queryId)
+    private static boolean isFileCreatedByQuery(Location file, String queryId)
     {
         verify(!queryId.contains("-"), "queryId(%s) should not contain hyphens", queryId);
-        return fileName.startsWith(queryId + "-");
+        return file.fileName().startsWith(queryId + "-");
     }
 
     @Override
     public Optional<SystemTable> getSystemTable(ConnectorSession session, SchemaTableName tableName)
     {
-        return getRawSystemTable(session, tableName)
-                .map(systemTable -> new ClassLoaderSafeSystemTable(systemTable, getClass().getClassLoader()));
+        return getRawSystemTable(tableName).map(systemTable -> new ClassLoaderSafeSystemTable(systemTable, getClass().getClassLoader()));
     }
 
-    private Optional<SystemTable> getRawSystemTable(ConnectorSession session, SchemaTableName tableName)
+    private Optional<SystemTable> getRawSystemTable(SchemaTableName systemTableName)
     {
-        if (DeltaLakeTableName.isDataTable(tableName.getTableName())) {
+        Optional<DeltaLakeTableType> tableType = DeltaLakeTableName.tableTypeFrom(systemTableName.getTableName());
+        if (tableType.isEmpty() || tableType.get() == DeltaLakeTableType.DATA) {
             return Optional.empty();
         }
 
-        // Only when dealing with an actual system table proceed to retrieve the table handle
-        String name = DeltaLakeTableName.tableNameFrom(tableName.getTableName());
-        ConnectorTableHandle tableHandle;
+        String tableName = DeltaLakeTableName.tableNameFrom(systemTableName.getTableName());
+        Optional<DeltaMetastoreTable> table;
         try {
-            tableHandle = getTableHandle(session, new SchemaTableName(tableName.getSchemaName(), name));
+            table = metastore.getTable(systemTableName.getSchemaName(), tableName);
         }
         catch (NotADeltaLakeTableException e) {
-            // avoid dealing with non Delta Lake tables
             return Optional.empty();
         }
-        if (tableHandle == null) {
-            return Optional.empty();
-        }
-        if (tableHandle instanceof CorruptedDeltaLakeTableHandle) {
+        if (table.isEmpty()) {
             return Optional.empty();
         }
 
-        Optional<DeltaLakeTableType> tableType = DeltaLakeTableName.tableTypeFrom(tableName.getTableName());
-        if (tableType.isEmpty()) {
-            return Optional.empty();
-        }
-        SchemaTableName systemTableName = new SchemaTableName(tableName.getSchemaName(), DeltaLakeTableName.tableNameWithType(name, tableType.get()));
+        String tableLocation = table.get().location();
+
         return switch (tableType.get()) {
             case DATA -> throw new VerifyException("Unexpected DATA table type"); // Handled above.
             case HISTORY -> Optional.of(new DeltaLakeHistoryTable(
                     systemTableName,
-                    getCommitInfoEntries(((DeltaLakeTableHandle) tableHandle).getSchemaTableName(), session),
+                    tableLocation,
+                    fileSystemFactory,
+                    transactionLogAccess,
                     typeManager));
+            case PROPERTIES -> Optional.of(new DeltaLakePropertiesTable(systemTableName, tableLocation, transactionLogAccess));
         };
     }
 
+    @Override
+    public WriterScalingOptions getNewTableWriterScalingOptions(ConnectorSession session, SchemaTableName tableName, Map<String, Object> tableProperties)
+    {
+        return WriterScalingOptions.ENABLED;
+    }
+
+    @Override
+    public WriterScalingOptions getInsertWriterScalingOptions(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        return WriterScalingOptions.ENABLED;
+    }
+
+    @Override
+    public void truncateTable(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        executeDelete(session, checkValidTableHandle(tableHandle), TRUNCATE_OPERATION);
+    }
+
+    @Override
+    public Optional<ConnectorTableHandle> applyDelete(ConnectorSession session, ConnectorTableHandle handle)
+    {
+        DeltaLakeTableHandle tableHandle = (DeltaLakeTableHandle) handle;
+        if (changeDataFeedEnabled(tableHandle.getMetadataEntry(), tableHandle.getProtocolEntry()).orElse(false)) {
+            // For tables with CDF enabled the DELETE operation can't be performed only on metadata files
+            return Optional.empty();
+        }
+
+        return Optional.of(tableHandle);
+    }
+
+    @Override
+    public OptionalLong executeDelete(ConnectorSession session, ConnectorTableHandle handle)
+    {
+        return executeDelete(session, handle, DELETE_OPERATION);
+    }
+
+    private OptionalLong executeDelete(ConnectorSession session, ConnectorTableHandle handle, String operation)
+    {
+        DeltaLakeTableHandle tableHandle = (DeltaLakeTableHandle) handle;
+        if (isAppendOnly(tableHandle.getMetadataEntry(), tableHandle.getProtocolEntry())) {
+            throw new TrinoException(NOT_SUPPORTED, "Cannot modify rows from a table with '" + APPEND_ONLY_CONFIGURATION_KEY + "' set to true");
+        }
+        checkWriteAllowed(session, tableHandle);
+        checkWriteSupported(tableHandle);
+
+        String tableLocation = tableHandle.location();
+        List<AddFileEntry> activeFiles = getAddFileEntriesMatchingEnforcedPartitionConstraint(session, tableHandle);
+
+        try {
+            TransactionLogWriter transactionLogWriter = transactionLogWriterFactory.newWriter(session, tableLocation);
+
+            long writeTimestamp = Instant.now().toEpochMilli();
+            TrinoFileSystem fileSystem = fileSystemFactory.create(session);
+            long currentVersion = getMandatoryCurrentVersion(fileSystem, tableLocation);
+            if (currentVersion != tableHandle.getReadVersion()) {
+                throw new TransactionConflictException(format("Conflicting concurrent writes found. Expected transaction log version: %s, actual version: %s", tableHandle.getReadVersion(), currentVersion));
+            }
+            long commitVersion = currentVersion + 1;
+            transactionLogWriter.appendCommitInfoEntry(getCommitInfoEntry(session, commitVersion, writeTimestamp, operation, tableHandle.getReadVersion()));
+
+            long deletedRecords = 0L;
+            boolean allDeletedFilesStatsPresent = true;
+            for (AddFileEntry addFileEntry : activeFiles) {
+                transactionLogWriter.appendRemoveFileEntry(new RemoveFileEntry(addFileEntry.getPath(), writeTimestamp, true));
+
+                Optional<Long> fileRecords = addFileEntry.getStats().flatMap(DeltaLakeFileStatistics::getNumRecords);
+                allDeletedFilesStatsPresent &= fileRecords.isPresent();
+                deletedRecords += fileRecords.orElse(0L);
+            }
+
+            transactionLogWriter.flush();
+            writeCheckpointIfNeeded(
+                    session,
+                    tableHandle.getSchemaTableName(),
+                    tableHandle.location(),
+                    tableHandle.getReadVersion(),
+                    tableHandle.getMetadataEntry().getCheckpointInterval(),
+                    commitVersion);
+            return allDeletedFilesStatsPresent ? OptionalLong.of(deletedRecords) : OptionalLong.empty();
+        }
+        catch (Exception e) {
+            throw new TrinoException(DELTA_LAKE_BAD_WRITE, "Failed to write Delta Lake transaction log entry", e);
+        }
+    }
+
+    private List<AddFileEntry> getAddFileEntriesMatchingEnforcedPartitionConstraint(ConnectorSession session, DeltaLakeTableHandle tableHandle)
+    {
+        TableSnapshot tableSnapshot = getSnapshot(session, tableHandle);
+        List<AddFileEntry> validDataFiles = transactionLogAccess.getActiveFiles(tableSnapshot, tableHandle.getMetadataEntry(), tableHandle.getProtocolEntry(), session);
+        TupleDomain<DeltaLakeColumnHandle> enforcedPartitionConstraint = tableHandle.getEnforcedPartitionConstraint();
+        if (enforcedPartitionConstraint.isAll()) {
+            return validDataFiles;
+        }
+        Map<DeltaLakeColumnHandle, Domain> enforcedDomains = enforcedPartitionConstraint.getDomains().orElseThrow();
+        return validDataFiles.stream()
+                .filter(addAction -> partitionMatchesPredicate(addAction.getCanonicalPartitionValues(), enforcedDomains))
+                .collect(toImmutableList());
+    }
+
     private static Map<String, DeltaLakeColumnStatistics> toDeltaLakeColumnStatistics(Collection<ComputedStatistics> computedStatistics)
     {
-        // Only statistics for whole table are collected
-        ComputedStatistics singleStatistics = Iterables.getOnlyElement(computedStatistics);
-        return createColumnToComputedStatisticsMap(singleStatistics.getColumnStatistics()).entrySet().stream()
-                .collect(toImmutableMap(Entry::getKey, entry -> createDeltaLakeColumnStatistics(entry.getValue())));
+        return computedStatistics.stream()
+                .map(statistics -> createColumnToComputedStatisticsMap(statistics.getColumnStatistics()).entrySet().stream()
+                        .collect(toImmutableMap(Entry::getKey, entry -> createDeltaLakeColumnStatistics(entry.getValue()))))
+                .map(Map::entrySet)
+                .flatMap(Collection::stream)
+                .collect(toImmutableMap(Entry::getKey, Entry::getValue, DeltaLakeColumnStatistics::update));
     }
 
     private static Map<String, Map<ColumnStatisticType, Block>> createColumnToComputedStatisticsMap(Map<ColumnStatisticMetadata, Block> computedStatistics)
@@ -2520,7 +3569,7 @@ private static DeltaLakeColumnStatistics createDeltaLakeColumnStatistics(Map<Col
     private static OptionalLong getLongValue(Block block)
     {
         if (block.isNull(0)) {
-            return OptionalLong.of(0);
+            return OptionalLong.empty();
         }
         return OptionalLong.of(BIGINT.getLong(block, 0));
     }
@@ -2536,10 +3585,10 @@ private static HyperLogLog getHyperLogLogForNdv(Block block)
 
     private static Optional<Instant> getMaxFileModificationTime(Collection<ComputedStatistics> computedStatistics)
     {
-        // Only statistics for whole table are collected
-        ComputedStatistics singleStatistics = Iterables.getOnlyElement(computedStatistics);
-
-        return singleStatistics.getColumnStatistics().entrySet().stream()
+        return computedStatistics.stream()
+                .map(ComputedStatistics::getColumnStatistics)
+                .map(Map::entrySet)
+                .flatMap(Collection::stream)
                 .filter(entry -> entry.getKey().getColumnName().equals(FILE_MODIFIED_TIME_COLUMN_NAME))
                 .flatMap(entry -> {
                     ColumnStatisticMetadata columnStatisticMetadata = entry.getKey();
@@ -2551,7 +3600,7 @@ private static Optional<Instant> getMaxFileModificationTime(Collection<ComputedS
                     }
                     return Stream.of(Instant.ofEpochMilli(unpackMillisUtc(TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS.getLong(entry.getValue(), 0))));
                 })
-                .collect(toOptional());
+                .max(naturalOrder());
     }
 
     public DeltaLakeMetastore getMetastore()
@@ -2559,28 +3608,22 @@ public DeltaLakeMetastore getMetastore()
         return metastore;
     }
 
-    private List<CommitInfoEntry> getCommitInfoEntries(SchemaTableName table, ConnectorSession session)
+    private static ColumnMetadata getColumnMetadata(DeltaLakeColumnHandle column, @Nullable String comment, boolean nullability, @Nullable String generation)
     {
-        TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-        try {
-            return TransactionLogTail.loadNewTail(fileSystem, metastore.getTableLocation(table), Optional.empty()).getFileEntries().stream()
-                    .map(DeltaLakeTransactionLogEntry::getCommitInfo)
-                    .filter(Objects::nonNull)
-                    .collect(toImmutableList());
-        }
-        catch (TrinoException e) {
-            throw e;
+        String columnName;
+        Type columnType;
+        if (column.isBaseColumn()) {
+            columnName = column.getBaseColumnName();
+            columnType = column.getBaseType();
         }
-        catch (IOException | RuntimeException e) {
-            throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Error getting commit info entries for " + table, e);
+        else {
+            DeltaLakeColumnProjectionInfo projectionInfo = column.getProjectionInfo().get();
+            columnName = column.getQualifiedPhysicalName();
+            columnType = projectionInfo.getType();
         }
-    }
-
-    private static ColumnMetadata getColumnMetadata(DeltaLakeColumnHandle column, @Nullable String comment, boolean nullability, @Nullable String generation)
-    {
         return ColumnMetadata.builder()
-                .setName(column.getName())
-                .setType(column.getType())
+                .setName(columnName)
+                .setType(columnType)
                 .setHidden(column.getColumnType() == SYNTHESIZED)
                 .setComment(Optional.ofNullable(comment))
                 .setNullable(nullability)
@@ -2607,7 +3650,7 @@ public static TupleDomain<DeltaLakeColumnHandle> createStatisticsPredicate(
                         schema.stream()
                                 .filter(column -> canUseInPredicate(column.getColumnMetadata()))
                                 .collect(toImmutableMap(
-                                        column -> DeltaLakeMetadata.toColumnHandle(column.getColumnMetadata(), column.getFieldId(), column.getPhysicalName(), column.getPhysicalColumnType(), canonicalPartitionColumns),
+                                        column -> DeltaLakeMetadata.toColumnHandle(column.getName(), column.getType(), column.getFieldId(), column.getPhysicalName(), column.getPhysicalColumnType(), canonicalPartitionColumns),
                                         column -> buildColumnDomain(column, deltaLakeFileStatistics, canonicalPartitionColumns)))))
                 .orElseGet(TupleDomain::all);
     }
@@ -2644,7 +3687,7 @@ private static Domain buildColumnDomain(DeltaLakeColumnMetadata column, DeltaLak
         }
 
         boolean hasNulls = nullCount.get() > 0;
-        DeltaLakeColumnHandle deltaLakeColumnHandle = toColumnHandle(column.getColumnMetadata(), column.getFieldId(), column.getPhysicalName(), column.getPhysicalColumnType(), canonicalPartitionColumns);
+        DeltaLakeColumnHandle deltaLakeColumnHandle = toColumnHandle(column.getName(), column.getType(), column.getFieldId(), column.getPhysicalName(), column.getPhysicalColumnType(), canonicalPartitionColumns);
         Optional<Object> minValue = stats.getMinColumnValue(deltaLakeColumnHandle);
         if (minValue.isPresent() && isFloatingPointNaN(column.getType(), minValue.get())) {
             return allValues(column.getType(), hasNulls);
@@ -2700,21 +3743,17 @@ private static Domain allValues(Type type, boolean includeNull)
         return Domain.notNull(type);
     }
 
-    private static DeltaLakeColumnHandle toColumnHandle(ColumnMetadata column, String physicalName, Type physicalType, Collection<String> partitionColumns)
-    {
-        return toColumnHandle(column, OptionalInt.empty(), physicalName, physicalType, partitionColumns);
-    }
-
-    private static DeltaLakeColumnHandle toColumnHandle(ColumnMetadata column, OptionalInt fieldId, String physicalName, Type physicalType, Collection<String> partitionColumns)
+    private static DeltaLakeColumnHandle toColumnHandle(String originalName, Type type, OptionalInt fieldId, String physicalName, Type physicalType, Collection<String> partitionColumns)
     {
-        boolean isPartitionKey = partitionColumns.stream().anyMatch(partition -> partition.equalsIgnoreCase(column.getName()));
+        boolean isPartitionKey = partitionColumns.stream().anyMatch(partition -> partition.equalsIgnoreCase(originalName));
         return new DeltaLakeColumnHandle(
-                column.getName(),
-                column.getType(),
+                originalName,
+                type,
                 fieldId,
                 physicalName,
                 physicalType,
-                isPartitionKey ? PARTITION_KEY : REGULAR);
+                isPartitionKey ? PARTITION_KEY : REGULAR,
+                Optional.empty());
     }
 
     private static Optional<String> getQueryId(Database database)
@@ -2722,7 +3761,7 @@ private static Optional<String> getQueryId(Database database)
         return Optional.ofNullable(database.getParameters().get(PRESTO_QUERY_ID_NAME));
     }
 
-    private static Optional<String> getQueryId(Table table)
+    public static Optional<String> getQueryId(Table table)
     {
         return Optional.ofNullable(table.getParameters().get(PRESTO_QUERY_ID_NAME));
     }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadataFactory.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadataFactory.java
index 8bc6eb5f0bbb..158130874644 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadataFactory.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadataFactory.java
@@ -13,10 +13,12 @@
  */
 package io.trino.plugin.deltalake;
 
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.deltalake.metastore.HiveMetastoreBackedDeltaLakeMetastore;
 import io.trino.plugin.deltalake.statistics.CachingExtendedStatisticsAccess;
+import io.trino.plugin.deltalake.statistics.FileBasedTableStatisticsProvider;
 import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
 import io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointWriterManager;
 import io.trino.plugin.deltalake.transactionlog.writer.TransactionLogWriterFactory;
@@ -29,8 +31,6 @@
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static io.trino.plugin.hive.metastore.cache.CachingHiveMetastore.memoizeMetastore;
@@ -107,12 +107,11 @@ public DeltaLakeMetadata create(ConnectorIdentity identity)
                 hiveMetastoreFactory.createMetastore(Optional.of(identity)),
                 perTransactionMetastoreCacheMaximumSize);
         AccessControlMetadata accessControlMetadata = accessControlMetadataFactory.create(cachingHiveMetastore);
-        HiveMetastoreBackedDeltaLakeMetastore deltaLakeMetastore = new HiveMetastoreBackedDeltaLakeMetastore(
-                cachingHiveMetastore,
-                transactionLogAccess,
+        HiveMetastoreBackedDeltaLakeMetastore deltaLakeMetastore = new HiveMetastoreBackedDeltaLakeMetastore(cachingHiveMetastore);
+        FileBasedTableStatisticsProvider tableStatisticsProvider = new FileBasedTableStatisticsProvider(
                 typeManager,
-                statisticsAccess,
-                fileSystemFactory);
+                transactionLogAccess,
+                statisticsAccess);
         TrinoViewHiveMetastore trinoViewHiveMetastore = new TrinoViewHiveMetastore(
                 cachingHiveMetastore,
                 accessControlMetadata.isUsingSystemSecurity(),
@@ -120,6 +119,8 @@ public DeltaLakeMetadata create(ConnectorIdentity identity)
                 "Trino Delta Lake connector");
         return new DeltaLakeMetadata(
                 deltaLakeMetastore,
+                transactionLogAccess,
+                tableStatisticsProvider,
                 fileSystemFactory,
                 typeManager,
                 accessControlMetadata,
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeModule.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeModule.java
index c18ff8c17b4e..2801e8067b85 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeModule.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeModule.java
@@ -18,12 +18,14 @@
 import com.google.inject.Provider;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import com.google.inject.multibindings.Multibinder;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.base.security.ConnectorAccessControlModule;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
-import io.trino.plugin.deltalake.metastore.DeltaLakeMetastore;
+import io.trino.plugin.deltalake.functions.tablechanges.TableChangesFunctionProvider;
+import io.trino.plugin.deltalake.functions.tablechanges.TableChangesProcessorProvider;
 import io.trino.plugin.deltalake.procedure.DropExtendedStatsProcedure;
 import io.trino.plugin.deltalake.procedure.FlushMetadataCacheProcedure;
 import io.trino.plugin.deltalake.procedure.OptimizeTableProcedure;
@@ -44,16 +46,11 @@
 import io.trino.plugin.deltalake.transactionlog.writer.TransactionLogSynchronizerManager;
 import io.trino.plugin.deltalake.transactionlog.writer.TransactionLogWriterFactory;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
-import io.trino.plugin.hive.HiveLocationService;
-import io.trino.plugin.hive.HiveTransactionHandle;
-import io.trino.plugin.hive.HiveTransactionManager;
-import io.trino.plugin.hive.LocationService;
 import io.trino.plugin.hive.PropertiesSystemTableProvider;
 import io.trino.plugin.hive.SystemTableProvider;
 import io.trino.plugin.hive.TransactionalMetadata;
 import io.trino.plugin.hive.TransactionalMetadataFactory;
 import io.trino.plugin.hive.fs.DirectoryLister;
-import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.SemiTransactionalHiveMetastore;
 import io.trino.plugin.hive.metastore.thrift.TranslateHiveViews;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
@@ -61,16 +58,13 @@
 import io.trino.spi.connector.ConnectorNodePartitioningProvider;
 import io.trino.spi.connector.ConnectorPageSinkProvider;
 import io.trino.spi.connector.ConnectorPageSourceProvider;
-import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.TableProcedureMetadata;
+import io.trino.spi.function.FunctionProvider;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.procedure.Procedure;
-import io.trino.spi.security.ConnectorIdentity;
-
-import javax.inject.Singleton;
 
 import java.util.concurrent.ExecutorService;
-import java.util.function.BiFunction;
 
 import static com.google.inject.multibindings.MapBinder.newMapBinder;
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
@@ -113,13 +107,11 @@ public void setup(Binder binder)
         binder.bind(ConnectorPageSinkProvider.class).to(DeltaLakePageSinkProvider.class).in(Scopes.SINGLETON);
         binder.bind(ConnectorNodePartitioningProvider.class).to(DeltaLakeNodePartitioningProvider.class).in(Scopes.SINGLETON);
 
-        binder.bind(LocationService.class).to(HiveLocationService.class).in(Scopes.SINGLETON);
         binder.bind(DeltaLakeMetadataFactory.class).in(Scopes.SINGLETON);
         binder.bind(CachingExtendedStatisticsAccess.class).in(Scopes.SINGLETON);
         binder.bind(ExtendedStatisticsAccess.class).to(CachingExtendedStatisticsAccess.class).in(Scopes.SINGLETON);
         binder.bind(ExtendedStatisticsAccess.class).annotatedWith(ForCachingExtendedStatisticsAccess.class).to(MetaDirStatisticsAccess.class).in(Scopes.SINGLETON);
         jsonCodecBinder(binder).bindJsonCodec(ExtendedStatistics.class);
-        binder.bind(HiveTransactionManager.class).in(Scopes.SINGLETON);
         binder.bind(CheckpointSchemaManager.class).in(Scopes.SINGLETON);
         jsonCodecBinder(binder).bindJsonCodec(LastCheckpoint.class);
         binder.bind(CheckpointWriterManager.class).in(Scopes.SINGLETON);
@@ -152,22 +144,10 @@ public void setup(Binder binder)
 
         Multibinder<TableProcedureMetadata> tableProcedures = newSetBinder(binder, TableProcedureMetadata.class);
         tableProcedures.addBinding().toProvider(OptimizeTableProcedure.class).in(Scopes.SINGLETON);
-    }
-
-    @Singleton
-    @Provides
-    public BiFunction<ConnectorIdentity, HiveTransactionHandle, HiveMetastore> createHiveMetastoreGetter(DeltaLakeTransactionManager transactionManager)
-    {
-        return (identity, transactionHandle) ->
-                transactionManager.get(transactionHandle, identity).getMetastore().getHiveMetastore();
-    }
 
-    @Singleton
-    @Provides
-    public BiFunction<ConnectorSession, HiveTransactionHandle, DeltaLakeMetastore> createMetastoreGetter(DeltaLakeTransactionManager transactionManager)
-    {
-        return (connectorSession, transactionHandle) ->
-                transactionManager.get(transactionHandle, connectorSession.getIdentity()).getMetastore();
+        newSetBinder(binder, ConnectorTableFunction.class).addBinding().toProvider(TableChangesFunctionProvider.class).in(Scopes.SINGLETON);
+        binder.bind(FunctionProvider.class).to(DeltaLakeFunctionProvider.class).in(Scopes.SINGLETON);
+        binder.bind(TableChangesProcessorProvider.class).in(Scopes.SINGLETON);
     }
 
     @Singleton
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeNodePartitioningProvider.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeNodePartitioningProvider.java
index 82f4d4b83e95..f8dad65bcb3f 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeNodePartitioningProvider.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeNodePartitioningProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.deltalake;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.BucketFunction;
 import io.trino.spi.connector.ConnectorNodePartitioningProvider;
 import io.trino.spi.connector.ConnectorPartitioningHandle;
@@ -22,8 +23,6 @@
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeOperators;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 public class DeltaLakeNodePartitioningProvider
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeOutputTableHandle.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeOutputTableHandle.java
index 7b01c669ff09..5dff666c7526 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeOutputTableHandle.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeOutputTableHandle.java
@@ -17,11 +17,13 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.ColumnMappingMode;
 import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.OptionalInt;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.PARTITION_KEY;
@@ -38,6 +40,9 @@ public class DeltaLakeOutputTableHandle
     private final boolean external;
     private final Optional<String> comment;
     private final Optional<Boolean> changeDataFeedEnabled;
+    private final ColumnMappingMode columnMappingMode;
+    private final OptionalInt maxColumnId;
+    private final String schemaString;
     private final ProtocolEntry protocolEntry;
 
     @JsonCreator
@@ -50,6 +55,9 @@ public DeltaLakeOutputTableHandle(
             @JsonProperty("external") boolean external,
             @JsonProperty("comment") Optional<String> comment,
             @JsonProperty("changeDataFeedEnabled") Optional<Boolean> changeDataFeedEnabled,
+            @JsonProperty("schemaString") String schemaString,
+            @JsonProperty("columnMappingMode") ColumnMappingMode columnMappingMode,
+            @JsonProperty("maxColumnId") OptionalInt maxColumnId,
             @JsonProperty("protocolEntry") ProtocolEntry protocolEntry)
     {
         this.schemaName = requireNonNull(schemaName, "schemaName is null");
@@ -60,6 +68,9 @@ public DeltaLakeOutputTableHandle(
         this.external = external;
         this.comment = requireNonNull(comment, "comment is null");
         this.changeDataFeedEnabled = requireNonNull(changeDataFeedEnabled, "changeDataFeedEnabled is null");
+        this.schemaString = requireNonNull(schemaString, "schemaString is null");
+        this.columnMappingMode = requireNonNull(columnMappingMode, "columnMappingMode is null");
+        this.maxColumnId = requireNonNull(maxColumnId, "maxColumnId is null");
         this.protocolEntry = requireNonNull(protocolEntry, "protocolEntry is null");
     }
 
@@ -92,7 +103,7 @@ public List<String> getPartitionedBy()
     {
         return getInputColumns().stream()
                 .filter(column -> column.getColumnType() == PARTITION_KEY)
-                .map(DeltaLakeColumnHandle::getName)
+                .map(DeltaLakeColumnHandle::getColumnName)
                 .collect(toImmutableList());
     }
 
@@ -120,6 +131,24 @@ public Optional<Boolean> getChangeDataFeedEnabled()
         return changeDataFeedEnabled;
     }
 
+    @JsonProperty
+    public String getSchemaString()
+    {
+        return schemaString;
+    }
+
+    @JsonProperty
+    public ColumnMappingMode getColumnMappingMode()
+    {
+        return columnMappingMode;
+    }
+
+    @JsonProperty
+    public OptionalInt getMaxColumnId()
+    {
+        return maxColumnId;
+    }
+
     @JsonProperty
     public ProtocolEntry getProtocolEntry()
     {
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSink.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSink.java
index f2e38f245e0a..220807d15196 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSink.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSink.java
@@ -13,12 +13,11 @@
  */
 package io.trino.plugin.deltalake;
 
-import com.google.common.collect.ImmutableList;
 import io.airlift.json.JsonCodec;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.spi.PageIndexerFactory;
 import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 
 import java.util.List;
@@ -36,10 +35,11 @@ public DeltaLakePageSink(
             TrinoFileSystemFactory fileSystemFactory,
             int maxOpenWriters,
             JsonCodec<DataFileInfo> dataFileInfoCodec,
-            String tableLocation,
+            Location tableLocation,
             ConnectorSession session,
             DeltaLakeWriterStats stats,
-            String trinoVersion)
+            String trinoVersion,
+            DeltaLakeParquetSchemaMapping parquetSchemaMapping)
     {
         super(
                 typeOperators,
@@ -53,7 +53,8 @@ public DeltaLakePageSink(
                 tableLocation,
                 session,
                 stats,
-                trinoVersion);
+                trinoVersion,
+                parquetSchemaMapping);
     }
 
     @Override
@@ -62,15 +63,6 @@ protected void processSynthesizedColumn(DeltaLakeColumnHandle column)
         throw new IllegalStateException("Unexpected column type: " + column.getColumnType());
     }
 
-    @Override
-    protected void addSpecialColumns(
-            List<DeltaLakeColumnHandle> inputColumns,
-            ImmutableList.Builder<DeltaLakeColumnHandle> dataColumnHandles,
-            ImmutableList.Builder<Integer> dataColumnsInputIndex,
-            ImmutableList.Builder<String> dataColumnNames,
-            ImmutableList.Builder<Type> dataColumnTypes)
-    {}
-
     @Override
     protected String getPathPrefix()
     {
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSinkProvider.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSinkProvider.java
index bc525aa17c83..69dacb0d331f 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSinkProvider.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSinkProvider.java
@@ -13,11 +13,15 @@
  */
 package io.trino.plugin.deltalake;
 
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.deltalake.procedure.DeltaLakeTableExecuteHandle;
 import io.trino.plugin.deltalake.procedure.DeltaTableOptimizeHandle;
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.plugin.hive.NodeVersion;
 import io.trino.spi.PageIndexerFactory;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
@@ -33,19 +37,21 @@
 import io.trino.spi.type.TypeManager;
 import org.joda.time.DateTimeZone;
 
-import javax.inject.Inject;
-
 import java.util.List;
+import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.Set;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.plugin.deltalake.DeltaLakeCdfPageSink.CHANGE_DATA_FOLDER_NAME;
+import static io.trino.plugin.deltalake.DeltaLakeCdfPageSink.CHANGE_TYPE_COLUMN_NAME;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.PARTITION_KEY;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
+import static io.trino.plugin.deltalake.DeltaLakeParquetSchemas.createParquetSchemaMapping;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.changeDataFeedEnabled;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.extractSchema;
-import static java.lang.String.format;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
 
 public class DeltaLakePageSinkProvider
@@ -89,6 +95,11 @@ public DeltaLakePageSinkProvider(
     public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorOutputTableHandle outputTableHandle, ConnectorPageSinkId pageSinkId)
     {
         DeltaLakeOutputTableHandle tableHandle = (DeltaLakeOutputTableHandle) outputTableHandle;
+        DeltaLakeParquetSchemaMapping parquetSchemaMapping = createParquetSchemaMapping(
+                tableHandle.getSchemaString(),
+                typeManager,
+                tableHandle.getColumnMappingMode(),
+                tableHandle.getPartitionedBy());
         return new DeltaLakePageSink(
                 typeManager.getTypeOperators(),
                 tableHandle.getInputColumns(),
@@ -97,16 +108,19 @@ public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHa
                 fileSystemFactory,
                 maxPartitionsPerWriter,
                 dataFileInfoCodec,
-                tableHandle.getLocation(),
+                Location.of(tableHandle.getLocation()),
                 session,
                 stats,
-                trinoVersion);
+                trinoVersion,
+                parquetSchemaMapping);
     }
 
     @Override
     public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorInsertTableHandle insertTableHandle, ConnectorPageSinkId pageSinkId)
     {
         DeltaLakeInsertTableHandle tableHandle = (DeltaLakeInsertTableHandle) insertTableHandle;
+        MetadataEntry metadataEntry = tableHandle.getMetadataEntry();
+        DeltaLakeParquetSchemaMapping parquetSchemaMapping = createParquetSchemaMapping(metadataEntry, tableHandle.getProtocolEntry(), typeManager);
         return new DeltaLakePageSink(
                 typeManager.getTypeOperators(),
                 tableHandle.getInputColumns(),
@@ -115,10 +129,11 @@ public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHa
                 fileSystemFactory,
                 maxPartitionsPerWriter,
                 dataFileInfoCodec,
-                tableHandle.getLocation(),
+                Location.of(tableHandle.getLocation()),
                 session,
                 stats,
-                trinoVersion);
+                trinoVersion,
+                parquetSchemaMapping);
     }
 
     @Override
@@ -128,6 +143,7 @@ public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHa
         switch (executeHandle.getProcedureId()) {
             case OPTIMIZE:
                 DeltaTableOptimizeHandle optimizeHandle = (DeltaTableOptimizeHandle) executeHandle.getProcedureHandle();
+                DeltaLakeParquetSchemaMapping parquetSchemaMapping = createParquetSchemaMapping(optimizeHandle.getMetadataEntry(), optimizeHandle.getProtocolEntry(), typeManager);
                 return new DeltaLakePageSink(
                         typeManager.getTypeOperators(),
                         optimizeHandle.getTableColumns(),
@@ -136,10 +152,11 @@ public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHa
                         fileSystemFactory,
                         maxPartitionsPerWriter,
                         dataFileInfoCodec,
-                        executeHandle.getTableLocation(),
+                        Location.of(executeHandle.getTableLocation()),
                         session,
                         stats,
-                        trinoVersion);
+                        trinoVersion,
+                        parquetSchemaMapping);
         }
 
         throw new IllegalArgumentException("Unknown procedure: " + executeHandle.getProcedureId());
@@ -151,6 +168,7 @@ public ConnectorMergeSink createMergeSink(ConnectorTransactionHandle transaction
         DeltaLakeMergeTableHandle merge = (DeltaLakeMergeTableHandle) mergeHandle;
         DeltaLakeInsertTableHandle tableHandle = merge.getInsertTableHandle();
         ConnectorPageSink pageSink = createPageSink(transactionHandle, session, tableHandle, pageSinkId);
+        DeltaLakeParquetSchemaMapping parquetSchemaMapping = createParquetSchemaMapping(tableHandle.getMetadataEntry(), tableHandle.getProtocolEntry(), typeManager);
 
         return new DeltaLakeMergeSink(
                 typeManager.getTypeOperators(),
@@ -161,12 +179,13 @@ public ConnectorMergeSink createMergeSink(ConnectorTransactionHandle transaction
                 dataFileInfoCodec,
                 mergeResultJsonCodec,
                 stats,
-                tableHandle.getLocation(),
+                Location.of(tableHandle.getLocation()),
                 pageSink,
                 tableHandle.getInputColumns(),
                 domainCompactionThreshold,
                 () -> createCdfPageSink(merge, session),
-                changeDataFeedEnabled(tableHandle.getMetadataEntry()));
+                changeDataFeedEnabled(tableHandle.getMetadataEntry(), tableHandle.getProtocolEntry()).orElse(false),
+                parquetSchemaMapping);
     }
 
     private DeltaLakeCdfPageSink createCdfPageSink(
@@ -174,16 +193,32 @@ private DeltaLakeCdfPageSink createCdfPageSink(
             ConnectorSession session)
     {
         MetadataEntry metadataEntry = mergeTableHandle.getTableHandle().getMetadataEntry();
+        ProtocolEntry protocolEntry = mergeTableHandle.getTableHandle().getProtocolEntry();
         Set<String> partitionKeys = mergeTableHandle.getTableHandle().getMetadataEntry().getOriginalPartitionColumns().stream().collect(toImmutableSet());
-        List<DeltaLakeColumnHandle> allColumns = extractSchema(metadataEntry, typeManager).stream()
+        List<DeltaLakeColumnHandle> tableColumns = extractSchema(metadataEntry, protocolEntry, typeManager).stream()
                 .map(metadata -> new DeltaLakeColumnHandle(
                         metadata.getName(),
                         metadata.getType(),
                         metadata.getFieldId(),
                         metadata.getPhysicalName(),
                         metadata.getPhysicalColumnType(),
-                        partitionKeys.contains(metadata.getName()) ? PARTITION_KEY : REGULAR))
+                        partitionKeys.contains(metadata.getName()) ? PARTITION_KEY : REGULAR,
+                        Optional.empty()))
                 .collect(toImmutableList());
+        List<DeltaLakeColumnHandle> allColumns = ImmutableList.<DeltaLakeColumnHandle>builder()
+                .addAll(tableColumns)
+                .add(new DeltaLakeColumnHandle(
+                        CHANGE_TYPE_COLUMN_NAME,
+                        VARCHAR,
+                        OptionalInt.empty(),
+                        CHANGE_TYPE_COLUMN_NAME,
+                        VARCHAR,
+                        REGULAR,
+                        Optional.empty()))
+                .build();
+        Location tableLocation = Location.of(mergeTableHandle.getTableHandle().getLocation());
+
+        DeltaLakeParquetSchemaMapping parquetSchemaMapping = createParquetSchemaMapping(metadataEntry, protocolEntry, typeManager, true);
 
         return new DeltaLakeCdfPageSink(
                 typeManager.getTypeOperators(),
@@ -193,10 +228,11 @@ private DeltaLakeCdfPageSink createCdfPageSink(
                 fileSystemFactory,
                 maxPartitionsPerWriter,
                 dataFileInfoCodec,
-                format("%s/%s/", mergeTableHandle.getTableHandle().getLocation(), CHANGE_DATA_FOLDER_NAME),
-                mergeTableHandle.getTableHandle().getLocation(),
+                tableLocation,
+                tableLocation.appendPath(CHANGE_DATA_FOLDER_NAME),
                 session,
                 stats,
-                trinoVersion);
+                trinoVersion,
+                parquetSchemaMapping);
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSource.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSource.java
index e4aadb23956d..8eff63a9ffe4 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSource.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSource.java
@@ -15,6 +15,8 @@
 
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
+import io.trino.plugin.deltalake.delete.PageFilter;
+import io.trino.plugin.hive.ReaderProjectionsAdapter;
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
@@ -32,6 +34,7 @@
 import java.util.Optional;
 import java.util.OptionalLong;
 import java.util.Set;
+import java.util.function.Supplier;
 
 import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static io.airlift.slice.Slices.utf8Slice;
@@ -61,6 +64,8 @@ public class DeltaLakePageSource
     private final Block pathBlock;
     private final Block partitionsBlock;
     private final ConnectorPageSource delegate;
+    private final Optional<ReaderProjectionsAdapter> projectionsAdapter;
+    private final Supplier<Optional<PageFilter>> deletePredicate;
 
     public DeltaLakePageSource(
             List<DeltaLakeColumnHandle> columns,
@@ -68,13 +73,16 @@ public DeltaLakePageSource(
             Map<String, Optional<String>> partitionKeys,
             Optional<List<String>> partitionValues,
             ConnectorPageSource delegate,
+            Optional<ReaderProjectionsAdapter> projectionsAdapter,
             String path,
             long fileSize,
-            long fileModifiedTime)
+            long fileModifiedTime,
+            Supplier<Optional<PageFilter>> deletePredicate)
     {
         int size = columns.size();
         requireNonNull(partitionKeys, "partitionKeys is null");
         this.delegate = requireNonNull(delegate, "delegate is null");
+        this.projectionsAdapter = requireNonNull(projectionsAdapter, "projectionsAdapter is null");
 
         this.prefilledBlocks = new Block[size];
         this.delegateIndexes = new int[size];
@@ -87,34 +95,34 @@ public DeltaLakePageSource(
         Block partitionsBlock = null;
 
         for (DeltaLakeColumnHandle column : columns) {
-            if (partitionKeys.containsKey(column.getPhysicalName())) {
-                Type type = column.getType();
-                Object prefilledValue = deserializePartitionValue(column, partitionKeys.get(column.getPhysicalName()));
+            if (column.isBaseColumn() && partitionKeys.containsKey(column.getBasePhysicalColumnName())) {
+                Type type = column.getBaseType();
+                Object prefilledValue = deserializePartitionValue(column, partitionKeys.get(column.getBasePhysicalColumnName()));
                 prefilledBlocks[outputIndex] = Utils.nativeValueToBlock(type, prefilledValue);
                 delegateIndexes[outputIndex] = -1;
             }
-            else if (column.getName().equals(PATH_COLUMN_NAME)) {
+            else if (column.getBaseColumnName().equals(PATH_COLUMN_NAME)) {
                 prefilledBlocks[outputIndex] = Utils.nativeValueToBlock(PATH_TYPE, utf8Slice(path));
                 delegateIndexes[outputIndex] = -1;
             }
-            else if (column.getName().equals(FILE_SIZE_COLUMN_NAME)) {
+            else if (column.getBaseColumnName().equals(FILE_SIZE_COLUMN_NAME)) {
                 prefilledBlocks[outputIndex] = Utils.nativeValueToBlock(FILE_SIZE_TYPE, fileSize);
                 delegateIndexes[outputIndex] = -1;
             }
-            else if (column.getName().equals(FILE_MODIFIED_TIME_COLUMN_NAME)) {
+            else if (column.getBaseColumnName().equals(FILE_MODIFIED_TIME_COLUMN_NAME)) {
                 long packedTimestamp = packDateTimeWithZone(fileModifiedTime, UTC_KEY);
                 prefilledBlocks[outputIndex] = Utils.nativeValueToBlock(FILE_MODIFIED_TIME_TYPE, packedTimestamp);
                 delegateIndexes[outputIndex] = -1;
             }
-            else if (column.getName().equals(ROW_ID_COLUMN_NAME)) {
+            else if (column.getBaseColumnName().equals(ROW_ID_COLUMN_NAME)) {
                 rowIdIndex = outputIndex;
                 pathBlock = Utils.nativeValueToBlock(VARCHAR, utf8Slice(path));
                 partitionsBlock = Utils.nativeValueToBlock(VARCHAR, wrappedBuffer(PARTITIONS_CODEC.toJsonBytes(partitionValues.orElseThrow(() -> new IllegalStateException("partitionValues not provided")))));
                 delegateIndexes[outputIndex] = delegateIndex;
                 delegateIndex++;
             }
-            else if (missingColumnNames.contains(column.getName())) {
-                prefilledBlocks[outputIndex] = Utils.nativeValueToBlock(column.getType(), null);
+            else if (missingColumnNames.contains(column.getBaseColumnName())) {
+                prefilledBlocks[outputIndex] = Utils.nativeValueToBlock(column.getBaseType(), null);
                 delegateIndexes[outputIndex] = -1;
             }
             else {
@@ -127,6 +135,7 @@ else if (missingColumnNames.contains(column.getName())) {
         this.rowIdIndex = rowIdIndex;
         this.pathBlock = pathBlock;
         this.partitionsBlock = partitionsBlock;
+        this.deletePredicate = requireNonNull(deletePredicate, "deletePredicate is null");
     }
 
     @Override
@@ -161,6 +170,14 @@ public Page getNextPage()
             if (dataPage == null) {
                 return null;
             }
+            if (projectionsAdapter.isPresent()) {
+                dataPage = projectionsAdapter.get().adaptPage(dataPage);
+            }
+            Optional<PageFilter> deleteFilterPredicate = deletePredicate.get();
+            if (deleteFilterPredicate.isPresent()) {
+                dataPage = deleteFilterPredicate.get().apply(dataPage);
+            }
+
             int batchSize = dataPage.getPositionCount();
             Block[] blocks = new Block[prefilledBlocks.length];
             for (int i = 0; i < prefilledBlocks.length; i++) {
@@ -191,7 +208,7 @@ private Block createRowIdBlock(Block rowIndexBlock)
                 rowIndexBlock,
                 RunLengthEncodedBlock.create(partitionsBlock, positions),
         };
-        return RowBlock.fromFieldBlocks(positions, Optional.empty(), fields);
+        return RowBlock.fromFieldBlocks(positions, fields);
     }
 
     @Override
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSourceProvider.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSourceProvider.java
index 32e59a8be78e..4a56b213cd53 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSourceProvider.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSourceProvider.java
@@ -13,23 +13,34 @@
  */
 package io.trino.plugin.deltalake;
 
+import com.google.common.base.Suppliers;
 import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.parquet.ParquetDataSource;
 import io.trino.parquet.ParquetReaderOptions;
 import io.trino.parquet.reader.MetadataReader;
+import io.trino.plugin.deltalake.delete.PageFilter;
+import io.trino.plugin.deltalake.delete.PositionDeleteFilter;
+import io.trino.plugin.deltalake.transactionlog.DeletionVectorEntry;
 import io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.ColumnMappingMode;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveColumnHandle;
+import io.trino.plugin.hive.HiveColumnProjectionInfo;
+import io.trino.plugin.hive.HivePageSourceProvider;
 import io.trino.plugin.hive.ReaderPageSource;
+import io.trino.plugin.hive.ReaderProjectionsAdapter;
 import io.trino.plugin.hive.parquet.ParquetPageSourceFactory;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
 import io.trino.plugin.hive.parquet.TrinoParquetDataSource;
 import io.trino.spi.Page;
+import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.connector.ColumnHandle;
@@ -51,8 +62,7 @@
 import org.apache.parquet.schema.MessageType;
 import org.apache.parquet.schema.Type;
 import org.joda.time.DateTimeZone;
-
-import javax.inject.Inject;
+import org.roaringbitmap.longlong.Roaring64NavigableMap;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -60,21 +70,24 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.function.Supplier;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
 import static io.trino.plugin.deltalake.DeltaHiveTypeTranslator.toHiveType;
 import static io.trino.plugin.deltalake.DeltaLakeColumnHandle.ROW_ID_COLUMN_NAME;
+import static io.trino.plugin.deltalake.DeltaLakeColumnHandle.rowPositionColumnHandle;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
+import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getParquetMaxReadBlockRowCount;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getParquetMaxReadBlockSize;
-import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isParquetOptimizedNestedReaderEnabled;
-import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isParquetOptimizedReaderEnabled;
+import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getParquetSmallFileThreshold;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isParquetUseColumnIndex;
+import static io.trino.plugin.deltalake.delete.DeletionVectors.readDeletionVectors;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.extractSchema;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getColumnMappingMode;
 import static io.trino.plugin.hive.parquet.ParquetPageSourceFactory.PARQUET_ROW_INDEX_COLUMN;
@@ -133,16 +146,23 @@ public ConnectorPageSource createPageSource(
                 .collect(toImmutableList());
 
         List<DeltaLakeColumnHandle> regularColumns = deltaLakeColumns.stream()
-                .filter(column -> (column.getColumnType() == REGULAR) || column.getName().equals(ROW_ID_COLUMN_NAME))
+                .filter(column -> (column.getColumnType() == REGULAR) || column.getBaseColumnName().equals(ROW_ID_COLUMN_NAME))
                 .collect(toImmutableList());
 
         Map<String, Optional<String>> partitionKeys = split.getPartitionKeys();
-
+        ColumnMappingMode columnMappingMode = getColumnMappingMode(table.getMetadataEntry(), table.getProtocolEntry());
         Optional<List<String>> partitionValues = Optional.empty();
-        if (deltaLakeColumns.stream().anyMatch(column -> column.getName().equals(ROW_ID_COLUMN_NAME))) {
+        if (deltaLakeColumns.stream().anyMatch(column -> column.getBaseColumnName().equals(ROW_ID_COLUMN_NAME))) {
             partitionValues = Optional.of(new ArrayList<>());
-            for (DeltaLakeColumnMetadata column : extractSchema(table.getMetadataEntry(), typeManager)) {
-                Optional<String> value = partitionKeys.get(column.getName());
+            for (DeltaLakeColumnMetadata column : extractSchema(table.getMetadataEntry(), table.getProtocolEntry(), typeManager)) {
+                Optional<String> value = switch (columnMappingMode) {
+                    case NONE:
+                        yield partitionKeys.get(column.getName());
+                    case ID, NAME:
+                        yield partitionKeys.get(column.getPhysicalName());
+                    default:
+                        throw new IllegalStateException("Unknown column mapping mode");
+                };
                 if (value != null) {
                     partitionValues.get().add(value.orElse(null));
                 }
@@ -151,9 +171,8 @@ public ConnectorPageSource createPageSource(
 
         // We reach here when we could not prune the split using file level stats, table predicate
         // and the dynamic filter in the coordinator during split generation. The file level stats
-        // in DeltaLakeSplit#filePredicate could help to prune this split when a more selective dynamic filter
+        // in DeltaLakeSplit#statisticsPredicate could help to prune this split when a more selective dynamic filter
         // is available now, without having to access parquet file footer for row-group stats.
-        // We avoid sending DeltaLakeSplit#splitPredicate to workers by using table.getPredicate() here.
         TupleDomain<DeltaLakeColumnHandle> filteredSplitPredicate = TupleDomain.intersect(ImmutableList.of(
                 table.getNonPartitionConstraint(),
                 split.getStatisticsPredicate(),
@@ -164,6 +183,7 @@ public ConnectorPageSource createPageSource(
         if (filteredSplitPredicate.isAll() &&
                 split.getStart() == 0 && split.getLength() == split.getFileSize() &&
                 split.getFileRowCount().isPresent() &&
+                split.getDeletionVector().isEmpty() &&
                 (regularColumns.isEmpty() || onlyRowIdColumn(regularColumns))) {
             return new DeltaLakePageSource(
                     deltaLakeColumns,
@@ -171,31 +191,36 @@ public ConnectorPageSource createPageSource(
                     partitionKeys,
                     partitionValues,
                     generatePages(split.getFileRowCount().get(), onlyRowIdColumn(regularColumns)),
+                    Optional.empty(),
                     split.getPath(),
                     split.getFileSize(),
-                    split.getFileModifiedTime());
+                    split.getFileModifiedTime(),
+                    Optional::empty);
         }
 
-        TrinoInputFile inputFile = fileSystemFactory.create(session).newInputFile(split.getPath(), split.getFileSize());
+        Location location = Location.of(split.getPath());
+        TrinoFileSystem fileSystem = fileSystemFactory.create(session);
+        TrinoInputFile inputFile = fileSystem.newInputFile(location, split.getFileSize());
         ParquetReaderOptions options = parquetReaderOptions.withMaxReadBlockSize(getParquetMaxReadBlockSize(session))
                 .withMaxReadBlockRowCount(getParquetMaxReadBlockRowCount(session))
-                .withUseColumnIndex(isParquetUseColumnIndex(session))
-                .withBatchColumnReaders(isParquetOptimizedReaderEnabled(session))
-                .withBatchNestedColumnReaders(isParquetOptimizedNestedReaderEnabled(session));
+                .withSmallFileThreshold(getParquetSmallFileThreshold(session))
+                .withUseColumnIndex(isParquetUseColumnIndex(session));
 
-        ColumnMappingMode columnMappingMode = getColumnMappingMode(table.getMetadataEntry());
         Map<Integer, String> parquetFieldIdToName = columnMappingMode == ColumnMappingMode.ID ? loadParquetIdAndNameMapping(inputFile, options) : ImmutableMap.of();
 
         ImmutableSet.Builder<String> missingColumnNames = ImmutableSet.builder();
         ImmutableList.Builder<HiveColumnHandle> hiveColumnHandles = ImmutableList.builder();
         for (DeltaLakeColumnHandle column : regularColumns) {
-            if (column.getName().equals(ROW_ID_COLUMN_NAME)) {
+            if (column.getBaseColumnName().equals(ROW_ID_COLUMN_NAME)) {
                 hiveColumnHandles.add(PARQUET_ROW_INDEX_COLUMN);
                 continue;
             }
             toHiveColumnHandle(column, columnMappingMode, parquetFieldIdToName).ifPresentOrElse(
                     hiveColumnHandles::add,
-                    () -> missingColumnNames.add(column.getName()));
+                    () -> missingColumnNames.add(column.getBaseColumnName()));
+        }
+        if (split.getDeletionVector().isPresent() && !regularColumns.contains(rowPositionColumnHandle())) {
+            hiveColumnHandles.add(PARQUET_ROW_INDEX_COLUMN);
         }
 
         TupleDomain<HiveColumnHandle> parquetPredicate = getParquetTupleDomain(filteredSplitPredicate.simplify(domainCompactionThreshold), columnMappingMode, parquetFieldIdToName);
@@ -205,15 +230,34 @@ public ConnectorPageSource createPageSource(
                 split.getStart(),
                 split.getLength(),
                 hiveColumnHandles.build(),
-                parquetPredicate,
+                ImmutableList.of(parquetPredicate),
                 true,
                 parquetDateTimeZone,
                 fileFormatDataSourceStats,
                 options,
                 Optional.empty(),
-                domainCompactionThreshold);
+                domainCompactionThreshold,
+                OptionalLong.of(split.getFileSize()));
+
+        Optional<ReaderProjectionsAdapter> projectionsAdapter = pageSource.getReaderColumns().map(readerColumns ->
+                new ReaderProjectionsAdapter(
+                        hiveColumnHandles.build(),
+                        readerColumns,
+                        column -> ((HiveColumnHandle) column).getType(),
+                        HivePageSourceProvider::getProjection));
 
-        verify(pageSource.getReaderColumns().isEmpty(), "All columns expected to be base columns");
+        Supplier<Optional<PageFilter>> deletePredicate = Suppliers.memoize(() -> {
+            if (split.getDeletionVector().isEmpty()) {
+                return Optional.empty();
+            }
+
+            List<DeltaLakeColumnHandle> requiredColumns = ImmutableList.<DeltaLakeColumnHandle>builderWithExpectedSize(deltaLakeColumns.size() + 1)
+                    .addAll(deltaLakeColumns)
+                    .add(rowPositionColumnHandle())
+                    .build();
+            PositionDeleteFilter deleteFilter = readDeletes(fileSystem, Location.of(table.location()), split.getDeletionVector().get());
+            return Optional.of(deleteFilter.createPredicate(requiredColumns));
+        });
 
         return new DeltaLakePageSource(
                 deltaLakeColumns,
@@ -221,9 +265,25 @@ public ConnectorPageSource createPageSource(
                 partitionKeys,
                 partitionValues,
                 pageSource.get(),
+                projectionsAdapter,
                 split.getPath(),
                 split.getFileSize(),
-                split.getFileModifiedTime());
+                split.getFileModifiedTime(),
+                deletePredicate);
+    }
+
+    private PositionDeleteFilter readDeletes(
+            TrinoFileSystem fileSystem,
+            Location tableLocation,
+            DeletionVectorEntry deletionVector)
+    {
+        try {
+            Roaring64NavigableMap deletedRows = readDeletionVectors(fileSystem, tableLocation, deletionVector);
+            return new PositionDeleteFilter(deletedRows);
+        }
+        catch (IOException e) {
+            throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Failed to read deletion vectors", e);
+        }
     }
 
     public Map<Integer, String> loadParquetIdAndNameMapping(TrinoInputFile inputFile, ParquetReaderOptions options)
@@ -250,7 +310,7 @@ public static TupleDomain<HiveColumnHandle> getParquetTupleDomain(TupleDomain<De
 
         ImmutableMap.Builder<HiveColumnHandle, Domain> predicate = ImmutableMap.builder();
         effectivePredicate.getDomains().get().forEach((columnHandle, domain) -> {
-            String baseType = columnHandle.getType().getTypeSignature().getBase();
+            String baseType = columnHandle.getBaseType().getTypeSignature().getBase();
             // skip looking up predicates for complex types as Parquet only stores stats for primitives
             if (!baseType.equals(StandardTypes.MAP) && !baseType.equals(StandardTypes.ARRAY) && !baseType.equals(StandardTypes.ROW)) {
                 Optional<HiveColumnHandle> hiveColumnHandle = toHiveColumnHandle(columnHandle, columnMapping, fieldIdToName);
@@ -264,17 +324,19 @@ public static Optional<HiveColumnHandle> toHiveColumnHandle(DeltaLakeColumnHandl
     {
         switch (columnMapping) {
             case ID:
-                Integer fieldId = deltaLakeColumnHandle.getFieldId().orElseThrow(() -> new IllegalArgumentException("Field ID must exist"));
+                Integer fieldId = deltaLakeColumnHandle.getBaseFieldId().orElseThrow(() -> new IllegalArgumentException("Field ID must exist"));
                 if (!fieldIdToName.containsKey(fieldId)) {
                     return Optional.empty();
                 }
                 String fieldName = fieldIdToName.get(fieldId);
+                Optional<HiveColumnProjectionInfo> hiveColumnProjectionInfo = deltaLakeColumnHandle.getProjectionInfo()
+                        .map(DeltaLakeColumnProjectionInfo::toHiveColumnProjectionInfo);
                 return Optional.of(new HiveColumnHandle(
                         fieldName,
                         0,
-                        toHiveType(deltaLakeColumnHandle.getPhysicalType()),
-                        deltaLakeColumnHandle.getPhysicalType(),
-                        Optional.empty(),
+                        toHiveType(deltaLakeColumnHandle.getBasePhysicalType()),
+                        deltaLakeColumnHandle.getBasePhysicalType(),
+                        hiveColumnProjectionInfo,
                         deltaLakeColumnHandle.getColumnType().toHiveColumnType(),
                         Optional.empty()));
             case NAME:
@@ -289,7 +351,7 @@ public static Optional<HiveColumnHandle> toHiveColumnHandle(DeltaLakeColumnHandl
 
     private static boolean onlyRowIdColumn(List<DeltaLakeColumnHandle> columns)
     {
-        return columns.size() == 1 && getOnlyElement(columns).getName().equals(ROW_ID_COLUMN_NAME);
+        return columns.size() == 1 && getOnlyElement(columns).getBaseColumnName().equals(ROW_ID_COLUMN_NAME);
     }
 
     private static ConnectorPageSource generatePages(long totalRowCount, boolean projectRowNumber)
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeParquetSchemaMapping.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeParquetSchemaMapping.java
new file mode 100644
index 000000000000..4e329ec68dee
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeParquetSchemaMapping.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.spi.type.Type;
+import org.apache.parquet.schema.MessageType;
+
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Objects.requireNonNull;
+
+public record DeltaLakeParquetSchemaMapping(MessageType messageType, Map<List<String>, Type> primitiveTypes)
+{
+    public DeltaLakeParquetSchemaMapping
+    {
+        requireNonNull(messageType, "messageType is null");
+        primitiveTypes = ImmutableMap.copyOf(requireNonNull(primitiveTypes, "primitiveTypes is null"));
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeParquetSchemas.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeParquetSchemas.java
new file mode 100644
index 000000000000..9aa38e67ba91
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeParquetSchemas.java
@@ -0,0 +1,407 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.airlift.json.ObjectMapperProvider;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport;
+import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
+import io.trino.spi.Location;
+import io.trino.spi.TrinoException;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.StandardTypes;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeManager;
+import io.trino.spi.type.TypeNotFoundException;
+import io.trino.spi.type.TypeSignature;
+import org.apache.parquet.schema.GroupType;
+import org.apache.parquet.schema.LogicalTypeAnnotation;
+import org.apache.parquet.schema.PrimitiveType;
+import org.apache.parquet.schema.Types;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.OptionalInt;
+
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.Streams.stream;
+import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getColumnMappingMode;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.DateType.DATE;
+import static io.trino.spi.type.Decimals.MAX_PRECISION;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
+import static io.trino.spi.type.TinyintType.TINYINT;
+import static io.trino.spi.type.VarbinaryType.VARBINARY;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+import static org.apache.parquet.schema.LogicalTypeAnnotation.decimalType;
+import static org.apache.parquet.schema.Type.Repetition.OPTIONAL;
+import static org.apache.parquet.schema.Type.Repetition.REQUIRED;
+
+/**
+ * Delta Lake specific utility which converts the Delta table schema to
+ * a Parquet schema.
+ * This utility is used instead of Hive's
+ * {@link io.trino.parquet.writer.ParquetSchemaConverter}
+ * in order to be able to include the field IDs in the Parquet schema.
+ */
+public final class DeltaLakeParquetSchemas
+{
+    // Map precision to the number bytes needed for binary conversion.
+    // Based on org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe
+    private static final int[] PRECISION_TO_BYTE_COUNT = new int[MAX_PRECISION + 1];
+
+    static {
+        for (int precision = 1; precision <= MAX_PRECISION; precision++) {
+            // Estimated number of bytes needed.
+            PRECISION_TO_BYTE_COUNT[precision] = (int) Math.ceil((Math.log(Math.pow(10, precision) - 1) / Math.log(2) + 1) / 8);
+        }
+    }
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapperProvider().get();
+
+    private DeltaLakeParquetSchemas() {}
+
+    public static DeltaLakeParquetSchemaMapping createParquetSchemaMapping(MetadataEntry metadataEntry, ProtocolEntry protocolEntry, TypeManager typeManager)
+    {
+        return createParquetSchemaMapping(metadataEntry, protocolEntry, typeManager, false);
+    }
+
+    public static DeltaLakeParquetSchemaMapping createParquetSchemaMapping(MetadataEntry metadataEntry, ProtocolEntry protocolEntry, TypeManager typeManager, boolean addChangeDataFeedFields)
+    {
+        DeltaLakeSchemaSupport.ColumnMappingMode columnMappingMode = getColumnMappingMode(metadataEntry, protocolEntry);
+        return createParquetSchemaMapping(
+                metadataEntry.getSchemaString(),
+                typeManager,
+                columnMappingMode,
+                metadataEntry.getOriginalPartitionColumns(),
+                addChangeDataFeedFields);
+    }
+
+    public static DeltaLakeParquetSchemaMapping createParquetSchemaMapping(
+            String jsonSchema,
+            TypeManager typeManager,
+            DeltaLakeSchemaSupport.ColumnMappingMode columnMappingMode,
+            List<String> partitionColumnNames)
+    {
+        return createParquetSchemaMapping(jsonSchema, typeManager, columnMappingMode, partitionColumnNames, false);
+    }
+
+    private static DeltaLakeParquetSchemaMapping createParquetSchemaMapping(
+            String jsonSchema,
+            TypeManager typeManager,
+            DeltaLakeSchemaSupport.ColumnMappingMode columnMappingMode,
+            List<String> partitionColumnNames,
+            boolean addChangeDataFeedFields)
+    {
+        requireNonNull(typeManager, "typeManager is null");
+        requireNonNull(columnMappingMode, "columnMappingMode is null");
+        requireNonNull(partitionColumnNames, "partitionColumnNames is null");
+        Types.MessageTypeBuilder builder = Types.buildMessage();
+        ImmutableMap.Builder<List<String>, Type> primitiveTypesBuilder = ImmutableMap.builder();
+        try {
+            stream(OBJECT_MAPPER.readTree(jsonSchema).get("fields").elements())
+                    .filter(fieldNode -> !partitionColumnNames.contains(fieldNode.get("name").asText()))
+                    .map(fieldNode -> buildType(fieldNode, typeManager, columnMappingMode, ImmutableList.of(), primitiveTypesBuilder))
+                    .forEach(builder::addField);
+        }
+        catch (JsonProcessingException e) {
+            throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, getLocation(e), "Failed to parse serialized schema: " + jsonSchema, e);
+        }
+        if (addChangeDataFeedFields) {
+            builder.addField(buildPrimitiveType("string", typeManager, OPTIONAL, DeltaLakeCdfPageSink.CHANGE_TYPE_COLUMN_NAME, OptionalInt.empty(), ImmutableList.of(), primitiveTypesBuilder));
+        }
+
+        return new DeltaLakeParquetSchemaMapping(builder.named("trino_schema"), primitiveTypesBuilder.buildOrThrow());
+    }
+
+    private static org.apache.parquet.schema.Type buildType(
+            JsonNode fieldNode,
+            TypeManager typeManager,
+            DeltaLakeSchemaSupport.ColumnMappingMode columnMappingMode,
+            List<String> parent,
+            ImmutableMap.Builder<List<String>, Type> primitiveTypesBuilder)
+    {
+        JsonNode typeNode = fieldNode.get("type");
+        OptionalInt fieldId = OptionalInt.empty();
+        String physicalName;
+
+        switch (columnMappingMode) {
+            case ID -> {
+                String columnMappingId = fieldNode.get("metadata").get("delta.columnMapping.id").asText();
+                verify(!isNullOrEmpty(columnMappingId), "id is null or empty");
+                fieldId = OptionalInt.of(Integer.parseInt(columnMappingId));
+                // Databricks stores column statistics with physical name
+                physicalName = fieldNode.get("metadata").get("delta.columnMapping.physicalName").asText();
+                verify(!isNullOrEmpty(physicalName), "physicalName is null or empty");
+            }
+            case NAME -> {
+                physicalName = fieldNode.get("metadata").get("delta.columnMapping.physicalName").asText();
+                verify(!isNullOrEmpty(physicalName), "physicalName is null or empty");
+            }
+            case NONE -> {
+                physicalName = fieldNode.get("name").asText();
+                verify(!isNullOrEmpty(physicalName), "name is null or empty");
+            }
+            default -> throw new UnsupportedOperationException("Unsupported parameter columnMappingMode");
+        }
+
+        return buildType(typeNode, typeManager, OPTIONAL, physicalName, fieldId, columnMappingMode, parent, primitiveTypesBuilder);
+    }
+
+    private static org.apache.parquet.schema.Type buildType(
+            JsonNode typeNode,
+            TypeManager typeManager,
+            org.apache.parquet.schema.Type.Repetition repetition,
+            String name,
+            OptionalInt id,
+            DeltaLakeSchemaSupport.ColumnMappingMode columnMappingMode,
+            List<String> parent,
+            ImmutableMap.Builder<List<String>, Type> primitiveTypesBuilder)
+    {
+        if (typeNode.isContainerNode()) {
+            return buildContainerType(typeNode, typeManager, repetition, name, id, columnMappingMode, parent, primitiveTypesBuilder);
+        }
+
+        String primitiveType = typeNode.asText();
+        return buildPrimitiveType(primitiveType, typeManager, repetition, name, id, parent, primitiveTypesBuilder);
+    }
+
+    private static org.apache.parquet.schema.Type buildPrimitiveType(
+            String primitiveType,
+            TypeManager typeManager,
+            org.apache.parquet.schema.Type.Repetition repetition,
+            String name,
+            OptionalInt id,
+            List<String> parent,
+            ImmutableMap.Builder<List<String>, Type> primitiveTypesBuilder)
+    {
+        Types.PrimitiveBuilder<PrimitiveType> typeBuilder;
+        Type trinoType;
+        if (primitiveType.startsWith(StandardTypes.DECIMAL)) {
+            trinoType = typeManager.fromSqlType(primitiveType);
+            verify(trinoType instanceof DecimalType, "type %s does not map to Trino decimal".formatted(primitiveType));
+            DecimalType trinoDecimalType = (DecimalType) trinoType;
+            if (trinoDecimalType.getPrecision() <= 9) {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.INT32, repetition);
+            }
+            else if (trinoDecimalType.isShort()) {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.INT64, repetition);
+            }
+            else {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY, repetition)
+                        .length(PRECISION_TO_BYTE_COUNT[trinoDecimalType.getPrecision()]);
+            }
+            typeBuilder = typeBuilder.as(decimalType(trinoDecimalType.getScale(), trinoDecimalType.getPrecision()));
+            return buildType(name, id, parent, typeBuilder, trinoType, primitiveTypesBuilder);
+        }
+        switch (primitiveType) {
+            case "string" -> {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.BINARY, repetition).as(LogicalTypeAnnotation.stringType());
+                trinoType = VARCHAR;
+            }
+            case "byte" -> {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.INT32, repetition);
+                trinoType = TINYINT;
+            }
+            case "short" -> {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.INT32, repetition);
+                trinoType = SMALLINT;
+            }
+            case "integer" -> {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.INT32, repetition);
+                trinoType = INTEGER;
+            }
+            case "long" -> {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.INT64, repetition);
+                trinoType = BIGINT;
+            }
+            case "float" -> {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.FLOAT, repetition);
+                trinoType = REAL;
+            }
+            case "double" -> {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.DOUBLE, repetition);
+                trinoType = DOUBLE;
+            }
+            case "boolean" -> {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.BOOLEAN, repetition);
+                trinoType = BOOLEAN;
+            }
+            case "binary" -> {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.BINARY, repetition);
+                trinoType = VARBINARY;
+            }
+            case "date" -> {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.INT32, repetition).as(LogicalTypeAnnotation.dateType());
+                trinoType = DATE;
+            }
+            case "timestamp" -> {
+                // Spark / Delta Lake stores timestamps in UTC, but renders them in session time zone.
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.INT64, repetition).as(LogicalTypeAnnotation.timestampType(false, LogicalTypeAnnotation.TimeUnit.MILLIS));
+                trinoType = TIMESTAMP_MILLIS;
+            }
+            case "timestamp_ntz" -> {
+                typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.INT64, repetition).as(LogicalTypeAnnotation.timestampType(false, LogicalTypeAnnotation.TimeUnit.MICROS));
+                trinoType = TIMESTAMP_MICROS;
+            }
+            default -> throw new TrinoException(NOT_SUPPORTED, format("Unsupported primitive type: %s", primitiveType));
+        }
+
+        return buildType(name, id, parent, typeBuilder, trinoType, primitiveTypesBuilder);
+    }
+
+    private static PrimitiveType buildType(String name, OptionalInt id, List<String> parent, Types.PrimitiveBuilder<PrimitiveType> typeBuilder, Type trinoType, ImmutableMap.Builder<List<String>, Type> primitiveTypesBuilder)
+    {
+        if (id.isPresent()) {
+            typeBuilder.id(id.getAsInt());
+        }
+
+        List<String> fullName = ImmutableList.<String>builder().addAll(parent).add(name).build();
+        primitiveTypesBuilder.put(fullName, trinoType);
+
+        return typeBuilder.named(name);
+    }
+
+    private static org.apache.parquet.schema.Type buildContainerType(
+            JsonNode typeNode,
+            TypeManager typeManager,
+            org.apache.parquet.schema.Type.Repetition repetition,
+            String name,
+            OptionalInt id,
+            DeltaLakeSchemaSupport.ColumnMappingMode columnMappingMode,
+            List<String> parent,
+            ImmutableMap.Builder<List<String>, Type> primitiveTypesBuilder)
+    {
+        String containerType = typeNode.get("type").asText();
+        return switch (containerType) {
+            case "array" -> buildArrayType(typeNode, typeManager, repetition, name, id, columnMappingMode, parent, primitiveTypesBuilder);
+            case "map" -> buildMapType(typeNode, typeManager, repetition, name, id, columnMappingMode, parent, primitiveTypesBuilder);
+            case "struct" -> buildRowType(typeNode, typeManager, repetition, name, id, columnMappingMode, parent, primitiveTypesBuilder);
+            default -> throw new TypeNotFoundException(new TypeSignature(containerType));
+        };
+    }
+
+    private static org.apache.parquet.schema.Type buildArrayType(
+            JsonNode typeNode,
+            TypeManager typeManager,
+            org.apache.parquet.schema.Type.Repetition repetition,
+            String name,
+            OptionalInt id,
+            DeltaLakeSchemaSupport.ColumnMappingMode columnMappingMode,
+            List<String> parent,
+            ImmutableMap.Builder<List<String>, Type> primitiveTypesBuilder)
+    {
+        parent = ImmutableList.<String>builder().addAll(parent).add(name).add("list").build();
+
+        JsonNode elementTypeNode = typeNode.get("elementType");
+        org.apache.parquet.schema.Type elementType;
+
+        if (elementTypeNode.isContainerNode()) {
+            elementType = buildContainerType(elementTypeNode, typeManager, OPTIONAL, "element", OptionalInt.empty(), columnMappingMode, parent, primitiveTypesBuilder);
+        }
+        else {
+            elementType = buildType(elementTypeNode, typeManager, OPTIONAL, "element", OptionalInt.empty(), columnMappingMode, parent, primitiveTypesBuilder);
+        }
+
+        GroupType arrayType = Types.list(repetition)
+                .element(elementType)
+                .named(name);
+        if (id.isPresent()) {
+            arrayType = arrayType.withId(id.getAsInt());
+        }
+        return arrayType;
+    }
+
+    private static org.apache.parquet.schema.Type buildMapType(
+            JsonNode typeNode,
+            TypeManager typeManager,
+            org.apache.parquet.schema.Type.Repetition repetition,
+            String name,
+            OptionalInt id,
+            DeltaLakeSchemaSupport.ColumnMappingMode columnMappingMode,
+            List<String> parent,
+            ImmutableMap.Builder<List<String>, Type> primitiveTypesBuilder)
+    {
+        Types.MapBuilder<GroupType> builder = Types.map(repetition);
+        if (id.isPresent()) {
+            builder.id(id.getAsInt());
+        }
+
+        parent = ImmutableList.<String>builder().addAll(parent).add(name).add("key_value").build();
+
+        JsonNode keyTypeNode = typeNode.get("keyType");
+        org.apache.parquet.schema.Type keyType;
+        if (keyTypeNode.isContainerNode()) {
+            keyType = buildContainerType(keyTypeNode, typeManager, REQUIRED, "key", OptionalInt.empty(), columnMappingMode, parent, primitiveTypesBuilder);
+        }
+        else {
+            keyType = buildType(keyTypeNode, typeManager, REQUIRED, "key", OptionalInt.empty(), columnMappingMode, parent, primitiveTypesBuilder);
+        }
+        JsonNode valueTypeNode = typeNode.get("valueType");
+        org.apache.parquet.schema.Type valueType;
+        if (valueTypeNode.isContainerNode()) {
+            valueType = buildContainerType(valueTypeNode, typeManager, OPTIONAL, "value", OptionalInt.empty(), columnMappingMode, parent, primitiveTypesBuilder);
+        }
+        else {
+            valueType = buildType(valueTypeNode, typeManager, OPTIONAL, "value", OptionalInt.empty(), columnMappingMode, parent, primitiveTypesBuilder);
+        }
+
+        return builder
+                .key(keyType)
+                .value(valueType)
+                .named(name);
+    }
+
+    private static org.apache.parquet.schema.Type buildRowType(
+            JsonNode typeNode,
+            TypeManager typeManager,
+            org.apache.parquet.schema.Type.Repetition repetition,
+            String name,
+            OptionalInt id,
+            DeltaLakeSchemaSupport.ColumnMappingMode columnMappingMode,
+            List<String> parent,
+            ImmutableMap.Builder<List<String>, Type> primitiveTypesBuilder)
+    {
+        Types.GroupBuilder<GroupType> builder = Types.buildGroup(repetition);
+        if (id.isPresent()) {
+            builder.id(id.getAsInt());
+        }
+        List<String> currentParent = ImmutableList.<String>builder().addAll(parent).add(name).build();
+        stream(typeNode.get("fields").elements())
+                .map(node -> buildType(node, typeManager, columnMappingMode, currentParent, primitiveTypesBuilder))
+                .forEach(builder::addField);
+        return builder.named(name);
+    }
+
+    private static Optional<Location> getLocation(JsonProcessingException e)
+    {
+        return Optional.ofNullable(e.getLocation()).map(location -> new Location(location.getLineNr(), location.getColumnNr()));
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePropertiesTable.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePropertiesTable.java
new file mode 100644
index 000000000000..202b9efffb71
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePropertiesTable.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
+import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
+import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
+import io.trino.plugin.deltalake.util.PageListBuilder;
+import io.trino.spi.Page;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.ConnectorPageSource;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorTableMetadata;
+import io.trino.spi.connector.ConnectorTransactionHandle;
+import io.trino.spi.connector.FixedPageSource;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.SystemTable;
+import io.trino.spi.predicate.TupleDomain;
+
+import java.io.IOException;
+import java.util.List;
+
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.util.Objects.requireNonNull;
+
+public class DeltaLakePropertiesTable
+        implements SystemTable
+{
+    private static final String DELTA_FEATURE_PREFIX = "delta.feature.";
+    private static final String MIN_READER_VERSION_KEY = "delta.minReaderVersion";
+    private static final String MIN_WRITER_VERSION_KEY = "delta.minWriterVersion";
+
+    private static final List<ColumnMetadata> COLUMNS = ImmutableList.<ColumnMetadata>builder()
+            .add(new ColumnMetadata("key", VARCHAR))
+            .add(new ColumnMetadata("value", VARCHAR))
+            .build();
+
+    private final SchemaTableName tableName;
+    private final String tableLocation;
+    private final TransactionLogAccess transactionLogAccess;
+    private final ConnectorTableMetadata tableMetadata;
+
+    public DeltaLakePropertiesTable(SchemaTableName tableName, String tableLocation, TransactionLogAccess transactionLogAccess)
+    {
+        this.tableName = requireNonNull(tableName, "tableName is null");
+        this.tableLocation = requireNonNull(tableLocation, "tableLocation is null");
+        this.transactionLogAccess = requireNonNull(transactionLogAccess, "transactionLogAccess is null");
+        this.tableMetadata = new ConnectorTableMetadata(requireNonNull(tableName, "tableName is null"), COLUMNS);
+    }
+
+    @Override
+    public Distribution getDistribution()
+    {
+        return Distribution.SINGLE_COORDINATOR;
+    }
+
+    @Override
+    public ConnectorTableMetadata getTableMetadata()
+    {
+        return tableMetadata;
+    }
+
+    @Override
+    public ConnectorPageSource pageSource(ConnectorTransactionHandle transactionHandle, ConnectorSession session, TupleDomain<Integer> constraint)
+    {
+        MetadataEntry metadataEntry;
+        ProtocolEntry protocolEntry;
+
+        try {
+            SchemaTableName baseTableName = new SchemaTableName(tableName.getSchemaName(), DeltaLakeTableName.tableNameFrom(tableName.getTableName()));
+            TableSnapshot tableSnapshot = transactionLogAccess.loadSnapshot(session, baseTableName, tableLocation);
+            metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, session);
+            protocolEntry = transactionLogAccess.getProtocolEntry(session, tableSnapshot);
+        }
+        catch (IOException e) {
+            throw new TrinoException(DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA, "Unable to load table metadata from location: " + tableLocation, e);
+        }
+
+        return new FixedPageSource(buildPages(metadataEntry, protocolEntry));
+    }
+
+    private List<Page> buildPages(MetadataEntry metadataEntry, ProtocolEntry protocolEntry)
+    {
+        PageListBuilder pagesBuilder = PageListBuilder.forTable(tableMetadata);
+
+        metadataEntry.getConfiguration().forEach((key, value) -> {
+            pagesBuilder.beginRow();
+            pagesBuilder.appendVarchar(key);
+            pagesBuilder.appendVarchar(value);
+            pagesBuilder.endRow();
+        });
+
+        pagesBuilder.beginRow();
+        pagesBuilder.appendVarchar(MIN_READER_VERSION_KEY);
+        pagesBuilder.appendVarchar(String.valueOf(protocolEntry.getMinReaderVersion()));
+        pagesBuilder.endRow();
+
+        pagesBuilder.beginRow();
+        pagesBuilder.appendVarchar(MIN_WRITER_VERSION_KEY);
+        pagesBuilder.appendVarchar(String.valueOf(protocolEntry.getMinWriterVersion()));
+        pagesBuilder.endRow();
+
+        ImmutableSet.<String>builder()
+                .addAll(protocolEntry.getReaderFeatures().orElseGet(ImmutableSet::of))
+                .addAll(protocolEntry.getWriterFeatures().orElseGet(ImmutableSet::of))
+                .build().forEach(feature -> {
+                    pagesBuilder.beginRow();
+                    pagesBuilder.appendVarchar(DELTA_FEATURE_PREFIX + feature);
+                    pagesBuilder.appendVarchar("supported");
+                    pagesBuilder.endRow();
+                });
+
+        return pagesBuilder.build();
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeS3Module.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeS3Module.java
deleted file mode 100644
index fb3ece84d57e..000000000000
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeS3Module.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.deltalake;
-
-import com.google.inject.Binder;
-import com.google.inject.Module;
-import com.google.inject.Scopes;
-import com.google.inject.multibindings.MapBinder;
-import io.trino.plugin.deltalake.transactionlog.writer.S3NativeTransactionLogSynchronizer;
-import io.trino.plugin.deltalake.transactionlog.writer.TransactionLogSynchronizer;
-
-import static com.google.inject.multibindings.MapBinder.newMapBinder;
-import static io.airlift.json.JsonCodecBinder.jsonCodecBinder;
-
-public class DeltaLakeS3Module
-        implements Module
-{
-    @Override
-    public void configure(Binder binder)
-    {
-        MapBinder<String, TransactionLogSynchronizer> logSynchronizerMapBinder = newMapBinder(binder, String.class, TransactionLogSynchronizer.class);
-        jsonCodecBinder(binder).bindJsonCodec(S3NativeTransactionLogSynchronizer.LockFileContents.class);
-        logSynchronizerMapBinder.addBinding("s3").to(S3NativeTransactionLogSynchronizer.class).in(Scopes.SINGLETON);
-        logSynchronizerMapBinder.addBinding("s3a").to(S3NativeTransactionLogSynchronizer.class).in(Scopes.SINGLETON);
-        logSynchronizerMapBinder.addBinding("s3n").to(S3NativeTransactionLogSynchronizer.class).in(Scopes.SINGLETON);
-    }
-}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSecurityConfig.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSecurityConfig.java
index abcc2b258625..3e48dee8bf69 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSecurityConfig.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSecurityConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import static io.trino.plugin.deltalake.DeltaLakeSecurityModule.ALLOW_ALL;
 
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSessionProperties.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSessionProperties.java
index 82d2bb04326d..0ca4012c16e6 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSessionProperties.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSessionProperties.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.deltalake;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
@@ -25,14 +26,18 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
 import static io.trino.plugin.base.session.PropertyMetadataUtil.dataSizeProperty;
 import static io.trino.plugin.base.session.PropertyMetadataUtil.durationProperty;
+import static io.trino.plugin.base.session.PropertyMetadataUtil.validateMaxDataSize;
+import static io.trino.plugin.base.session.PropertyMetadataUtil.validateMinDataSize;
 import static io.trino.plugin.hive.HiveTimestampPrecision.MILLISECONDS;
+import static io.trino.plugin.hive.parquet.ParquetReaderConfig.PARQUET_READER_MAX_SMALL_FILE_THRESHOLD;
+import static io.trino.plugin.hive.parquet.ParquetWriterConfig.PARQUET_WRITER_MAX_BLOCK_SIZE;
+import static io.trino.plugin.hive.parquet.ParquetWriterConfig.PARQUET_WRITER_MAX_PAGE_SIZE;
+import static io.trino.plugin.hive.parquet.ParquetWriterConfig.PARQUET_WRITER_MIN_PAGE_SIZE;
 import static io.trino.spi.StandardErrorCode.INVALID_SESSION_PROPERTY;
 import static io.trino.spi.session.PropertyMetadata.booleanProperty;
 import static io.trino.spi.session.PropertyMetadata.enumProperty;
@@ -43,15 +48,14 @@
 public final class DeltaLakeSessionProperties
         implements SessionPropertiesProvider
 {
-    private static final String MAX_SPLIT_SIZE = "max_split_size";
-    private static final String MAX_INITIAL_SPLIT_SIZE = "max_initial_split_size";
+    public static final String MAX_SPLIT_SIZE = "max_split_size";
+    public static final String MAX_INITIAL_SPLIT_SIZE = "max_initial_split_size";
     public static final String VACUUM_MIN_RETENTION = "vacuum_min_retention";
     private static final String HIVE_CATALOG_NAME = "hive_catalog_name";
     private static final String PARQUET_MAX_READ_BLOCK_SIZE = "parquet_max_read_block_size";
-    private static final String PARQUET_MAX_READ_BLOCK_ROW_COUNT = "parquet.max_read_block_row_count";
+    private static final String PARQUET_MAX_READ_BLOCK_ROW_COUNT = "parquet_max_read_block_row_count";
+    private static final String PARQUET_SMALL_FILE_THRESHOLD = "parquet_small_file_threshold";
     private static final String PARQUET_USE_COLUMN_INDEX = "parquet_use_column_index";
-    private static final String PARQUET_OPTIMIZED_READER_ENABLED = "parquet_optimized_reader_enabled";
-    private static final String PARQUET_OPTIMIZED_NESTED_READER_ENABLED = "parquet_optimized_nested_reader_enabled";
     private static final String PARQUET_WRITER_BLOCK_SIZE = "parquet_writer_block_size";
     private static final String PARQUET_WRITER_PAGE_SIZE = "parquet_writer_page_size";
     private static final String TARGET_MAX_FILE_SIZE = "target_max_file_size";
@@ -64,6 +68,8 @@ public final class DeltaLakeSessionProperties
     public static final String EXTENDED_STATISTICS_ENABLED = "extended_statistics_enabled";
     public static final String EXTENDED_STATISTICS_COLLECT_ON_WRITE = "extended_statistics_collect_on_write";
     public static final String LEGACY_CREATE_TABLE_WITH_EXISTING_LOCATION_ENABLED = "legacy_create_table_with_existing_location_enabled";
+    private static final String PROJECTION_PUSHDOWN_ENABLED = "projection_pushdown_enabled";
+    private static final String QUERY_PARTITION_FILTER_REQUIRED = "query_partition_filter_required";
 
     private final List<PropertyMetadata<?>> sessionProperties;
 
@@ -113,30 +119,31 @@ public DeltaLakeSessionProperties(
                             }
                         },
                         false),
+                dataSizeProperty(
+                        PARQUET_SMALL_FILE_THRESHOLD,
+                        "Parquet: Size below which a parquet file will be read entirely",
+                        parquetReaderConfig.getSmallFileThreshold(),
+                        value -> validateMaxDataSize(PARQUET_SMALL_FILE_THRESHOLD, value, DataSize.valueOf(PARQUET_READER_MAX_SMALL_FILE_THRESHOLD)),
+                        false),
                 booleanProperty(
                         PARQUET_USE_COLUMN_INDEX,
                         "Use Parquet column index",
                         parquetReaderConfig.isUseColumnIndex(),
                         false),
-                booleanProperty(
-                        PARQUET_OPTIMIZED_READER_ENABLED,
-                        "Use optimized Parquet reader",
-                        parquetReaderConfig.isOptimizedReaderEnabled(),
-                        false),
-                booleanProperty(
-                        PARQUET_OPTIMIZED_NESTED_READER_ENABLED,
-                        "Use optimized Parquet reader for nested columns",
-                        parquetReaderConfig.isOptimizedNestedReaderEnabled(),
-                        false),
                 dataSizeProperty(
                         PARQUET_WRITER_BLOCK_SIZE,
                         "Parquet: Writer block size",
                         parquetWriterConfig.getBlockSize(),
+                        value -> validateMaxDataSize(PARQUET_WRITER_BLOCK_SIZE, value, DataSize.valueOf(PARQUET_WRITER_MAX_BLOCK_SIZE)),
                         false),
                 dataSizeProperty(
                         PARQUET_WRITER_PAGE_SIZE,
                         "Parquet: Writer page size",
                         parquetWriterConfig.getPageSize(),
+                        value -> {
+                            validateMinDataSize(PARQUET_WRITER_PAGE_SIZE, value, DataSize.valueOf(PARQUET_WRITER_MIN_PAGE_SIZE));
+                            validateMaxDataSize(PARQUET_WRITER_PAGE_SIZE, value, DataSize.valueOf(PARQUET_WRITER_MAX_PAGE_SIZE));
+                        },
                         false),
                 dataSizeProperty(
                         TARGET_MAX_FILE_SIZE,
@@ -185,6 +192,16 @@ public DeltaLakeSessionProperties(
                                 throw new TrinoException(INVALID_SESSION_PROPERTY, "Unsupported codec: LZ4");
                             }
                         },
+                        false),
+                booleanProperty(
+                        PROJECTION_PUSHDOWN_ENABLED,
+                        "Read only required fields from a row type",
+                        deltaLakeConfig.isProjectionPushdownEnabled(),
+                        false),
+                booleanProperty(
+                        QUERY_PARTITION_FILTER_REQUIRED,
+                        "Require filter on partition column",
+                        deltaLakeConfig.isQueryPartitionFilterRequired(),
                         false));
     }
 
@@ -224,19 +241,14 @@ public static int getParquetMaxReadBlockRowCount(ConnectorSession session)
         return session.getProperty(PARQUET_MAX_READ_BLOCK_ROW_COUNT, Integer.class);
     }
 
-    public static boolean isParquetUseColumnIndex(ConnectorSession session)
+    public static DataSize getParquetSmallFileThreshold(ConnectorSession session)
     {
-        return session.getProperty(PARQUET_USE_COLUMN_INDEX, Boolean.class);
+        return session.getProperty(PARQUET_SMALL_FILE_THRESHOLD, DataSize.class);
     }
 
-    public static boolean isParquetOptimizedReaderEnabled(ConnectorSession session)
-    {
-        return session.getProperty(PARQUET_OPTIMIZED_READER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isParquetOptimizedNestedReaderEnabled(ConnectorSession session)
+    public static boolean isParquetUseColumnIndex(ConnectorSession session)
     {
-        return session.getProperty(PARQUET_OPTIMIZED_NESTED_READER_ENABLED, Boolean.class);
+        return session.getProperty(PARQUET_USE_COLUMN_INDEX, Boolean.class);
     }
 
     public static DataSize getParquetWriterBlockSize(ConnectorSession session)
@@ -284,4 +296,14 @@ public static HiveCompressionCodec getCompressionCodec(ConnectorSession session)
     {
         return session.getProperty(COMPRESSION_CODEC, HiveCompressionCodec.class);
     }
+
+    public static boolean isProjectionPushdownEnabled(ConnectorSession session)
+    {
+        return session.getProperty(PROJECTION_PUSHDOWN_ENABLED, Boolean.class);
+    }
+
+    public static boolean isQueryPartitionFilterRequired(ConnectorSession session)
+    {
+        return session.getProperty(QUERY_PARTITION_FILTER_REQUIRED, Boolean.class);
+    }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSplit.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSplit.java
index 4161da6f360c..245c7e07a173 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSplit.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSplit.java
@@ -14,10 +14,12 @@
 package io.trino.plugin.deltalake;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.slice.SizeOf;
+import io.trino.plugin.deltalake.transactionlog.DeletionVectorEntry;
 import io.trino.spi.HostAddress;
 import io.trino.spi.SplitWeight;
 import io.trino.spi.connector.ConnectorSplit;
@@ -46,7 +48,7 @@ public class DeltaLakeSplit
     private final long fileSize;
     private final Optional<Long> fileRowCount;
     private final long fileModifiedTime;
-    private final List<HostAddress> addresses;
+    private final Optional<DeletionVectorEntry> deletionVector;
     private final SplitWeight splitWeight;
     private final TupleDomain<DeltaLakeColumnHandle> statisticsPredicate;
     private final Map<String, Optional<String>> partitionKeys;
@@ -59,7 +61,7 @@ public DeltaLakeSplit(
             @JsonProperty("fileSize") long fileSize,
             @JsonProperty("rowCount") Optional<Long> fileRowCount,
             @JsonProperty("fileModifiedTime") long fileModifiedTime,
-            @JsonProperty("addresses") List<HostAddress> addresses,
+            @JsonProperty("deletionVector") Optional<DeletionVectorEntry> deletionVector,
             @JsonProperty("splitWeight") SplitWeight splitWeight,
             @JsonProperty("statisticsPredicate") TupleDomain<DeltaLakeColumnHandle> statisticsPredicate,
             @JsonProperty("partitionKeys") Map<String, Optional<String>> partitionKeys)
@@ -70,7 +72,7 @@ public DeltaLakeSplit(
         this.fileSize = fileSize;
         this.fileRowCount = requireNonNull(fileRowCount, "rowCount is null");
         this.fileModifiedTime = fileModifiedTime;
-        this.addresses = ImmutableList.copyOf(requireNonNull(addresses, "addresses is null"));
+        this.deletionVector = requireNonNull(deletionVector, "deletionVector is null");
         this.splitWeight = requireNonNull(splitWeight, "splitWeight is null");
         this.statisticsPredicate = requireNonNull(statisticsPredicate, "statisticsPredicate is null");
         this.partitionKeys = requireNonNull(partitionKeys, "partitionKeys is null");
@@ -82,11 +84,11 @@ public boolean isRemotelyAccessible()
         return true;
     }
 
-    @JsonProperty
+    @JsonIgnore
     @Override
     public List<HostAddress> getAddresses()
     {
-        return addresses;
+        return ImmutableList.of();
     }
 
     @JsonProperty
@@ -132,6 +134,12 @@ public long getFileModifiedTime()
         return fileModifiedTime;
     }
 
+    @JsonProperty
+    public Optional<DeletionVectorEntry> getDeletionVector()
+    {
+        return deletionVector;
+    }
+
     /**
      * A TupleDomain representing the min/max statistics from the file this split was generated from. This does not contain any partitioning information.
      */
@@ -153,7 +161,7 @@ public long getRetainedSizeInBytes()
         return INSTANCE_SIZE
                 + estimatedSizeOf(path)
                 + sizeOf(fileRowCount, value -> LONG_INSTANCE_SIZE)
-                + estimatedSizeOf(addresses, HostAddress::getRetainedSizeInBytes)
+                + sizeOf(deletionVector, DeletionVectorEntry::sizeInBytes)
                 + splitWeight.getRetainedSizeInBytes()
                 + statisticsPredicate.getRetainedSizeInBytes(DeltaLakeColumnHandle::getRetainedSizeInBytes)
                 + estimatedSizeOf(partitionKeys, SizeOf::estimatedSizeOf, value -> sizeOf(value, SizeOf::estimatedSizeOf));
@@ -178,7 +186,8 @@ public String toString()
                 .add("length", length)
                 .add("fileSize", fileSize)
                 .add("rowCount", fileRowCount)
-                .add("addresses", addresses)
+                .add("fileModifiedTime", fileModifiedTime)
+                .add("deletionVector", deletionVector)
                 .add("statisticsPredicate", statisticsPredicate)
                 .add("partitionKeys", partitionKeys)
                 .toString();
@@ -197,9 +206,10 @@ public boolean equals(Object o)
         return start == that.start &&
                 length == that.length &&
                 fileSize == that.fileSize &&
+                fileModifiedTime == that.fileModifiedTime &&
                 path.equals(that.path) &&
                 fileRowCount.equals(that.fileRowCount) &&
-                addresses.equals(that.addresses) &&
+                deletionVector.equals(that.deletionVector) &&
                 Objects.equals(statisticsPredicate, that.statisticsPredicate) &&
                 Objects.equals(partitionKeys, that.partitionKeys);
     }
@@ -207,6 +217,6 @@ public boolean equals(Object o)
     @Override
     public int hashCode()
     {
-        return Objects.hash(path, start, length, fileSize, fileRowCount, addresses, statisticsPredicate, partitionKeys);
+        return Objects.hash(path, start, length, fileSize, fileRowCount, fileModifiedTime, deletionVector, statisticsPredicate, partitionKeys);
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSplitManager.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSplitManager.java
index 1f4797116e45..84b5e71caf1f 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSplitManager.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSplitManager.java
@@ -14,12 +14,19 @@
 package io.trino.plugin.deltalake;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorSplitSource;
-import io.trino.plugin.deltalake.metastore.DeltaLakeMetastore;
+import io.trino.plugin.deltalake.functions.tablechanges.TableChangesSplitSource;
+import io.trino.plugin.deltalake.functions.tablechanges.TableChangesTableFunctionHandle;
 import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
+import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
+import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
 import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeFileStatistics;
-import io.trino.plugin.hive.HiveTransactionHandle;
 import io.trino.spi.SplitWeight;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorSession;
@@ -30,13 +37,12 @@
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.FixedSplitSource;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.net.URI;
 import java.net.URLDecoder;
 import java.time.Instant;
@@ -46,13 +52,13 @@
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.BiFunction;
 import java.util.stream.Stream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.plugin.deltalake.DeltaLakeAnalyzeProperties.AnalyzeMode.FULL_REFRESH;
 import static io.trino.plugin.deltalake.DeltaLakeColumnHandle.pathColumnHandle;
 import static io.trino.plugin.deltalake.DeltaLakeMetadata.createStatisticsPredicate;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getDynamicFilteringWaitTimeout;
@@ -62,35 +68,42 @@
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.deserializePartitionValue;
 import static io.trino.spi.connector.FixedSplitSource.emptySplitSource;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.counting;
+import static java.util.stream.Collectors.groupingBy;
 
 public class DeltaLakeSplitManager
         implements ConnectorSplitManager
 {
     private final TypeManager typeManager;
-    private final BiFunction<ConnectorSession, HiveTransactionHandle, DeltaLakeMetastore> metastoreProvider;
+    private final TransactionLogAccess transactionLogAccess;
     private final ExecutorService executor;
     private final int maxInitialSplits;
     private final int maxSplitsPerSecond;
     private final int maxOutstandingSplits;
     private final double minimumAssignedSplitWeight;
+    private final TrinoFileSystemFactory fileSystemFactory;
+    private final DeltaLakeTransactionManager deltaLakeTransactionManager;
 
     @Inject
     public DeltaLakeSplitManager(
             TypeManager typeManager,
-            BiFunction<ConnectorSession, HiveTransactionHandle, DeltaLakeMetastore> metastoreProvider,
+            TransactionLogAccess transactionLogAccess,
             ExecutorService executor,
-            DeltaLakeConfig config)
+            DeltaLakeConfig config,
+            TrinoFileSystemFactory fileSystemFactory,
+            DeltaLakeTransactionManager deltaLakeTransactionManager)
     {
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
-        this.metastoreProvider = requireNonNull(metastoreProvider, "metastoreProvider is null");
+        this.transactionLogAccess = requireNonNull(transactionLogAccess, "transactionLogAccess is null");
         this.executor = requireNonNull(executor, "executor is null");
         this.maxInitialSplits = config.getMaxInitialSplits();
         this.maxSplitsPerSecond = config.getMaxSplitsPerSecond();
         this.maxOutstandingSplits = config.getMaxOutstandingSplits();
         this.minimumAssignedSplitWeight = config.getMinimumAssignedSplitWeight();
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
+        this.deltaLakeTransactionManager = requireNonNull(deltaLakeTransactionManager, "deltaLakeTransactionManager is null");
     }
 
     @Override
@@ -122,6 +135,15 @@ public ConnectorSplitSource getSplits(
         return new ClassLoaderSafeConnectorSplitSource(splitSource, DeltaLakeSplitManager.class.getClassLoader());
     }
 
+    @Override
+    public ConnectorSplitSource getSplits(ConnectorTransactionHandle transaction, ConnectorSession session, ConnectorTableFunctionHandle function)
+    {
+        if (function instanceof TableChangesTableFunctionHandle tableFunctionHandle) {
+            return new TableChangesSplitSource(session, fileSystemFactory, tableFunctionHandle);
+        }
+        throw new UnsupportedOperationException("Unrecognized function: " + function);
+    }
+
     private Stream<DeltaLakeSplit> getSplits(
             ConnectorTransactionHandle transaction,
             DeltaLakeTableHandle tableHandle,
@@ -130,16 +152,16 @@ private Stream<DeltaLakeSplit> getSplits(
             Set<ColumnHandle> columnsCoveredByDynamicFilter,
             Constraint constraint)
     {
-        DeltaLakeMetastore metastore = getMetastore(session, transaction);
-        String tableLocation = metastore.getTableLocation(tableHandle.getSchemaTableName());
-        List<AddFileEntry> validDataFiles = metastore.getValidDataFiles(tableHandle.getSchemaTableName(), session);
+        TableSnapshot tableSnapshot = deltaLakeTransactionManager.get(transaction, session.getIdentity())
+                .getSnapshot(session, tableHandle.getSchemaTableName(), tableHandle.getLocation(), tableHandle.getReadVersion());
+        List<AddFileEntry> validDataFiles = transactionLogAccess.getActiveFiles(tableSnapshot, tableHandle.getMetadataEntry(), tableHandle.getProtocolEntry(), session);
         TupleDomain<DeltaLakeColumnHandle> enforcedPartitionConstraint = tableHandle.getEnforcedPartitionConstraint();
         TupleDomain<DeltaLakeColumnHandle> nonPartitionConstraint = tableHandle.getNonPartitionConstraint();
         Domain pathDomain = getPathDomain(nonPartitionConstraint);
 
         boolean splittable =
                 // Delta Lake handles updates and deletes by copying entire data files, minus updates/deletes. Because of this we can only have one Split/UpdatablePageSource
-                // per file.
+                // per file. TODO (https://github.com/trinodb/trino/issues/17063) use deletion vectors instead of copy-on-write and remove DeltaLakeTableHandle.writeType
                 tableHandle.getWriteType().isEmpty() &&
                         // When only partitioning columns projected, there is no point splitting the files
                         mayAnyDataColumnProjected(tableHandle);
@@ -147,25 +169,29 @@ private Stream<DeltaLakeSplit> getSplits(
         Optional<Instant> filesModifiedAfter = tableHandle.getAnalyzeHandle().flatMap(AnalyzeHandle::getFilesModifiedAfter);
         Optional<Long> maxScannedFileSizeInBytes = maxScannedFileSize.map(DataSize::toBytes);
 
+        MetadataEntry metadataEntry = tableHandle.getMetadataEntry();
+        boolean isOptimize = tableHandle.isOptimize();
+        Set<Map<String, Optional<String>>> partitionsWithAtMostOneFile = isOptimize ? findPartitionsWithAtMostOneFile(validDataFiles) : ImmutableSet.of();
+
         Set<String> predicatedColumnNames = Stream.concat(
-                nonPartitionConstraint.getDomains().orElseThrow().keySet().stream(),
-                columnsCoveredByDynamicFilter.stream()
-                        .map(DeltaLakeColumnHandle.class::cast))
-                .map(column -> column.getName().toLowerCase(ENGLISH)) // TODO is DeltaLakeColumnHandle.name normalized?
+                        nonPartitionConstraint.getDomains().orElseThrow().keySet().stream(),
+                        columnsCoveredByDynamicFilter.stream()
+                                .map(DeltaLakeColumnHandle.class::cast))
+                .map(DeltaLakeColumnHandle::getBaseColumnName)
                 .collect(toImmutableSet());
-        List<DeltaLakeColumnMetadata> schema = extractSchema(tableHandle.getMetadataEntry(), typeManager);
+        List<DeltaLakeColumnMetadata> schema = extractSchema(metadataEntry, tableHandle.getProtocolEntry(), typeManager);
         List<DeltaLakeColumnMetadata> predicatedColumns = schema.stream()
-                .filter(column -> predicatedColumnNames.contains(column.getName())) // DeltaLakeColumnMetadata.name is lowercase
+                .filter(column -> predicatedColumnNames.contains(column.getName()))
                 .collect(toImmutableList());
-
         return validDataFiles.stream()
                 .flatMap(addAction -> {
-                    if (tableHandle.getAnalyzeHandle().isPresent() && !tableHandle.getAnalyzeHandle().get().isInitialAnalyze() && !addAction.isDataChange()) {
-                        // skip files which do not introduce data change on non-initial ANALYZE
+                    if (tableHandle.getAnalyzeHandle().isPresent() &&
+                            !(tableHandle.getAnalyzeHandle().get().getAnalyzeMode() == FULL_REFRESH) && !addAction.isDataChange()) {
+                        // skip files which do not introduce data change on non FULL REFRESH
                         return Stream.empty();
                     }
 
-                    String splitPath = buildSplitPath(tableLocation, addAction);
+                    String splitPath = buildSplitPath(Location.of(tableHandle.getLocation()), addAction).toString();
                     if (!pathMatchesPredicate(pathDomain, splitPath)) {
                         return Stream.empty();
                     }
@@ -174,7 +200,12 @@ private Stream<DeltaLakeSplit> getSplits(
                         return Stream.empty();
                     }
 
-                    if (maxScannedFileSizeInBytes.isPresent() && addAction.getSize() > maxScannedFileSizeInBytes.get()) {
+                    if (addAction.getDeletionVector().isEmpty() && maxScannedFileSizeInBytes.isPresent() && addAction.getSize() > maxScannedFileSizeInBytes.get()) {
+                        return Stream.empty();
+                    }
+
+                    // no need to rewrite small file that is the only one in its partition
+                    if (isOptimize && partitionsWithAtMostOneFile.contains(addAction.getCanonicalPartitionValues()) && maxScannedFileSizeInBytes.isPresent() && addAction.getSize() < maxScannedFileSizeInBytes.get()) {
                         return Stream.empty();
                     }
 
@@ -186,7 +217,7 @@ private Stream<DeltaLakeSplit> getSplits(
                     TupleDomain<DeltaLakeColumnHandle> statisticsPredicate = createStatisticsPredicate(
                             addAction,
                             predicatedColumns,
-                            tableHandle.getMetadataEntry().getCanonicalPartitionColumns());
+                            metadataEntry.getLowercasePartitionColumns());
                     if (!nonPartitionConstraint.overlaps(statisticsPredicate)) {
                         return Stream.empty();
                     }
@@ -195,10 +226,10 @@ private Stream<DeltaLakeSplit> getSplits(
                         Map<String, Optional<String>> partitionValues = addAction.getCanonicalPartitionValues();
                         Map<ColumnHandle, NullableValue> deserializedValues = constraint.getPredicateColumns().orElseThrow().stream()
                                 .map(DeltaLakeColumnHandle.class::cast)
-                                .filter(column -> partitionValues.containsKey(column.getName()))
+                                .filter(column -> column.isBaseColumn() && partitionValues.containsKey(column.getBaseColumnName()))
                                 .collect(toImmutableMap(identity(), column -> new NullableValue(
-                                        column.getType(),
-                                        deserializePartitionValue(column, partitionValues.get(column.getName())))));
+                                        column.getBaseType(),
+                                        deserializePartitionValue(column, partitionValues.get(column.getBaseColumnName())))));
                         if (!constraint.predicate().get().test(deserializedValues)) {
                             return Stream.empty();
                         }
@@ -216,13 +247,21 @@ private Stream<DeltaLakeSplit> getSplits(
                 });
     }
 
+    private Set<Map<String, Optional<String>>> findPartitionsWithAtMostOneFile(List<AddFileEntry> addFileEntries)
+    {
+        return addFileEntries.stream().collect(groupingBy(AddFileEntry::getCanonicalPartitionValues, counting())).entrySet().stream()
+                .filter(entry -> entry.getValue() <= 1)
+                .map(Map.Entry::getKey)
+                .collect(toImmutableSet());
+    }
+
     private static boolean mayAnyDataColumnProjected(DeltaLakeTableHandle tableHandle)
     {
         if (tableHandle.getProjectedColumns().isEmpty()) {
             return true;
         }
         return tableHandle.getProjectedColumns().get().stream()
-                .map(columnHandle -> ((DeltaLakeColumnHandle) columnHandle).getColumnType())
+                .map(DeltaLakeColumnHandle::getColumnType)
                 .anyMatch(DeltaLakeColumnType.REGULAR::equals);
     }
 
@@ -231,7 +270,7 @@ public static boolean partitionMatchesPredicate(Map<String, Optional<String>> pa
         for (Map.Entry<DeltaLakeColumnHandle, Domain> enforcedDomainsEntry : domains.entrySet()) {
             DeltaLakeColumnHandle partitionColumn = enforcedDomainsEntry.getKey();
             Domain partitionDomain = enforcedDomainsEntry.getValue();
-            if (!partitionDomain.includesNullableValue(deserializePartitionValue(partitionColumn, partitionKeys.get(partitionColumn.getPhysicalName())))) {
+            if (!partitionDomain.includesNullableValue(deserializePartitionValue(partitionColumn, partitionKeys.get(partitionColumn.getBasePhysicalColumnName())))) {
                 return false;
             }
         }
@@ -242,7 +281,7 @@ private static Domain getPathDomain(TupleDomain<DeltaLakeColumnHandle> effective
     {
         return effectivePredicate.getDomains()
                 .flatMap(domains -> Optional.ofNullable(domains.get(pathColumnHandle())))
-                .orElseGet(() -> Domain.all(pathColumnHandle().getType()));
+                .orElseGet(() -> Domain.all(pathColumnHandle().getBaseType()));
     }
 
     private static boolean pathMatchesPredicate(Domain pathDomain, String path)
@@ -270,7 +309,7 @@ private List<DeltaLakeSplit> splitsForFile(
                     fileSize,
                     addFileEntry.getStats().flatMap(DeltaLakeFileStatistics::getNumRecords),
                     addFileEntry.getModificationTime(),
-                    ImmutableList.of(),
+                    addFileEntry.getDeletionVector(),
                     SplitWeight.standard(),
                     statisticsPredicate,
                     partitionKeys));
@@ -295,7 +334,7 @@ private List<DeltaLakeSplit> splitsForFile(
                     fileSize,
                     Optional.empty(),
                     addFileEntry.getModificationTime(),
-                    ImmutableList.of(),
+                    addFileEntry.getDeletionVector(),
                     SplitWeight.fromProportion(Math.min(Math.max((double) splitSize / maxSplitSize, minimumAssignedSplitWeight), 1.0)),
                     statisticsPredicate,
                     partitionKeys));
@@ -306,7 +345,7 @@ private List<DeltaLakeSplit> splitsForFile(
         return splits.build();
     }
 
-    private static String buildSplitPath(String tableLocation, AddFileEntry addAction)
+    public static Location buildSplitPath(Location tableLocation, AddFileEntry addAction)
     {
         // paths are relative to the table location and are RFC 2396 URIs
         // https://github.com/delta-io/delta/blob/master/PROTOCOL.md#add-file-and-remove-file
@@ -315,18 +354,11 @@ private static String buildSplitPath(String tableLocation, AddFileEntry addActio
 
         // org.apache.hadoop.fs.azurebfs.AzureBlobFileSystem encodes the path as URL when opening files
         // https://issues.apache.org/jira/browse/HADOOP-18580
-        if (tableLocation.startsWith("abfs://") || tableLocation.startsWith("abfss://")) {
+        Optional<String> scheme = tableLocation.scheme();
+        if (scheme.isPresent() && (scheme.get().equals("abfs") || scheme.get().equals("abfss"))) {
             // Replace '+' with '%2B' beforehand. Otherwise, the character becomes a space ' ' by URL decode.
             path = URLDecoder.decode(path.replace("+", "%2B"), UTF_8);
         }
-        if (tableLocation.endsWith("/")) {
-            return tableLocation + path;
-        }
-        return tableLocation + "/" + path;
-    }
-
-    private DeltaLakeMetastore getMetastore(ConnectorSession session, ConnectorTransactionHandle transactionHandle)
-    {
-        return metastoreProvider.apply(session, (HiveTransactionHandle) transactionHandle);
+        return tableLocation.appendPath(path);
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSynchronizerModule.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSynchronizerModule.java
new file mode 100644
index 000000000000..bca3e6e25e75
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSynchronizerModule.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import com.google.inject.Scopes;
+import io.trino.plugin.deltalake.transactionlog.writer.AzureTransactionLogSynchronizer;
+import io.trino.plugin.deltalake.transactionlog.writer.GcsTransactionLogSynchronizer;
+import io.trino.plugin.deltalake.transactionlog.writer.S3NativeTransactionLogSynchronizer;
+import io.trino.plugin.deltalake.transactionlog.writer.TransactionLogSynchronizer;
+
+import static com.google.inject.multibindings.MapBinder.newMapBinder;
+import static io.airlift.json.JsonCodecBinder.jsonCodecBinder;
+
+public class DeltaLakeSynchronizerModule
+        implements Module
+{
+    @Override
+    public void configure(Binder binder)
+    {
+        var synchronizerBinder = newMapBinder(binder, String.class, TransactionLogSynchronizer.class);
+
+        // Azure
+        synchronizerBinder.addBinding("abfs").to(AzureTransactionLogSynchronizer.class).in(Scopes.SINGLETON);
+        synchronizerBinder.addBinding("abfss").to(AzureTransactionLogSynchronizer.class).in(Scopes.SINGLETON);
+
+        // GCS
+        synchronizerBinder.addBinding("gs").to(GcsTransactionLogSynchronizer.class).in(Scopes.SINGLETON);
+
+        // S3
+        jsonCodecBinder(binder).bindJsonCodec(S3NativeTransactionLogSynchronizer.LockFileContents.class);
+        synchronizerBinder.addBinding("s3").to(S3NativeTransactionLogSynchronizer.class).in(Scopes.SINGLETON);
+        synchronizerBinder.addBinding("s3a").to(S3NativeTransactionLogSynchronizer.class).in(Scopes.SINGLETON);
+        synchronizerBinder.addBinding("s3n").to(S3NativeTransactionLogSynchronizer.class).in(Scopes.SINGLETON);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableHandle.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableHandle.java
index 56e13d4f79ae..3b628f28d8d0 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableHandle.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableHandle.java
@@ -16,10 +16,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableSet;
 import io.airlift.units.DataSize;
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
-import io.trino.spi.connector.ColumnHandle;
-import io.trino.spi.connector.ConnectorTableHandle;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.TupleDomain;
 
@@ -33,7 +33,7 @@
 import static java.util.Objects.requireNonNull;
 
 public class DeltaLakeTableHandle
-        implements ConnectorTableHandle
+        implements LocatedTableHandle
 {
     // Insert is not included here because it uses a separate TableHandle type
     public enum WriteType
@@ -44,15 +44,16 @@ public enum WriteType
 
     private final String schemaName;
     private final String tableName;
+    private final boolean managed;
     private final String location;
     private final MetadataEntry metadataEntry;
+    private final ProtocolEntry protocolEntry;
     private final TupleDomain<DeltaLakeColumnHandle> enforcedPartitionConstraint;
     private final TupleDomain<DeltaLakeColumnHandle> nonPartitionConstraint;
     private final Optional<WriteType> writeType;
     private final long readVersion;
-    private final boolean retriesEnabled;
 
-    private final Optional<Set<ColumnHandle>> projectedColumns;
+    private final Optional<Set<DeltaLakeColumnHandle>> projectedColumns;
     // UPDATE only: The list of columns being updated
     private final Optional<List<DeltaLakeColumnHandle>> updatedColumns;
     // UPDATE only: The list of columns which need to be copied when applying updates to the new Parquet file
@@ -63,63 +64,75 @@ public enum WriteType
 
     // OPTIMIZE only. Coordinator-only
     private final boolean recordScannedFiles;
+    private final boolean isOptimize;
     private final Optional<DataSize> maxScannedFileSize;
+    // Used only for validation when config property delta.query-partition-filter-required is enabled.
+    private final Set<DeltaLakeColumnHandle> constraintColumns;
 
     @JsonCreator
     public DeltaLakeTableHandle(
             @JsonProperty("schemaName") String schemaName,
             @JsonProperty("tableName") String tableName,
+            @JsonProperty("managed") boolean managed,
             @JsonProperty("location") String location,
             @JsonProperty("metadataEntry") MetadataEntry metadataEntry,
+            @JsonProperty("protocolEntry") ProtocolEntry protocolEntry,
             @JsonProperty("enforcedPartitionConstraint") TupleDomain<DeltaLakeColumnHandle> enforcedPartitionConstraint,
             @JsonProperty("nonPartitionConstraint") TupleDomain<DeltaLakeColumnHandle> nonPartitionConstraint,
             @JsonProperty("writeType") Optional<WriteType> writeType,
-            @JsonProperty("projectedColumns") Optional<Set<ColumnHandle>> projectedColumns,
+            @JsonProperty("projectedColumns") Optional<Set<DeltaLakeColumnHandle>> projectedColumns,
             @JsonProperty("updatedColumns") Optional<List<DeltaLakeColumnHandle>> updatedColumns,
             @JsonProperty("updateRowIdColumns") Optional<List<DeltaLakeColumnHandle>> updateRowIdColumns,
             @JsonProperty("analyzeHandle") Optional<AnalyzeHandle> analyzeHandle,
-            @JsonProperty("readVersion") long readVersion,
-            @JsonProperty("retriesEnabled") boolean retriesEnabled)
+            @JsonProperty("readVersion") long readVersion)
     {
         this(
                 schemaName,
                 tableName,
+                managed,
                 location,
                 metadataEntry,
+                protocolEntry,
                 enforcedPartitionConstraint,
                 nonPartitionConstraint,
+                ImmutableSet.of(),
                 writeType,
                 projectedColumns,
                 updatedColumns,
                 updateRowIdColumns,
                 analyzeHandle,
                 false,
+                false,
                 Optional.empty(),
-                readVersion,
-                retriesEnabled);
+                readVersion);
     }
 
     public DeltaLakeTableHandle(
             String schemaName,
             String tableName,
+            boolean managed,
             String location,
             MetadataEntry metadataEntry,
+            ProtocolEntry protocolEntry,
             TupleDomain<DeltaLakeColumnHandle> enforcedPartitionConstraint,
             TupleDomain<DeltaLakeColumnHandle> nonPartitionConstraint,
+            Set<DeltaLakeColumnHandle> constraintColumns,
             Optional<WriteType> writeType,
-            Optional<Set<ColumnHandle>> projectedColumns,
+            Optional<Set<DeltaLakeColumnHandle>> projectedColumns,
             Optional<List<DeltaLakeColumnHandle>> updatedColumns,
             Optional<List<DeltaLakeColumnHandle>> updateRowIdColumns,
             Optional<AnalyzeHandle> analyzeHandle,
             boolean recordScannedFiles,
+            boolean isOptimize,
             Optional<DataSize> maxScannedFileSize,
-            long readVersion,
-            boolean retriesEnabled)
+            long readVersion)
     {
         this.schemaName = requireNonNull(schemaName, "schemaName is null");
         this.tableName = requireNonNull(tableName, "tableName is null");
+        this.managed = managed;
         this.location = requireNonNull(location, "location is null");
         this.metadataEntry = requireNonNull(metadataEntry, "metadataEntry is null");
+        this.protocolEntry = requireNonNull(protocolEntry, "protocolEntry is null");
         this.enforcedPartitionConstraint = requireNonNull(enforcedPartitionConstraint, "enforcedPartitionConstraint is null");
         this.nonPartitionConstraint = requireNonNull(nonPartitionConstraint, "nonPartitionConstraint is null");
         this.writeType = requireNonNull(writeType, "writeType is null");
@@ -130,27 +143,33 @@ public DeltaLakeTableHandle(
         this.updateRowIdColumns = requireNonNull(updateRowIdColumns, "rowIdColumns is null");
         this.analyzeHandle = requireNonNull(analyzeHandle, "analyzeHandle is null");
         this.recordScannedFiles = recordScannedFiles;
+        this.isOptimize = isOptimize;
         this.maxScannedFileSize = requireNonNull(maxScannedFileSize, "maxScannedFileSize is null");
         this.readVersion = readVersion;
-        this.retriesEnabled = retriesEnabled;
+        this.constraintColumns = ImmutableSet.copyOf(requireNonNull(constraintColumns, "constraintColumns is null"));
     }
 
-    public DeltaLakeTableHandle withProjectedColumns(Set<ColumnHandle> projectedColumns)
+    public DeltaLakeTableHandle withProjectedColumns(Set<DeltaLakeColumnHandle> projectedColumns)
     {
         return new DeltaLakeTableHandle(
                 schemaName,
                 tableName,
+                managed,
                 location,
                 metadataEntry,
+                protocolEntry,
                 enforcedPartitionConstraint,
                 nonPartitionConstraint,
+                constraintColumns,
                 writeType,
                 Optional.of(projectedColumns),
                 updatedColumns,
                 updateRowIdColumns,
                 analyzeHandle,
-                readVersion,
-                retriesEnabled);
+                recordScannedFiles,
+                isOptimize,
+                maxScannedFileSize,
+                readVersion);
     }
 
     public DeltaLakeTableHandle forOptimize(boolean recordScannedFiles, DataSize maxScannedFileSize)
@@ -158,19 +177,33 @@ public DeltaLakeTableHandle forOptimize(boolean recordScannedFiles, DataSize max
         return new DeltaLakeTableHandle(
                 schemaName,
                 tableName,
+                managed,
                 location,
                 metadataEntry,
+                protocolEntry,
                 enforcedPartitionConstraint,
                 nonPartitionConstraint,
+                constraintColumns,
                 writeType,
                 projectedColumns,
                 updatedColumns,
                 updateRowIdColumns,
                 analyzeHandle,
                 recordScannedFiles,
+                true,
                 Optional.of(maxScannedFileSize),
-                readVersion,
-                false);
+                readVersion);
+    }
+
+    @Override
+    public SchemaTableName schemaTableName()
+    {
+        return getSchemaTableName();
+    }
+
+    public SchemaTableName getSchemaTableName()
+    {
+        return new SchemaTableName(schemaName, tableName);
     }
 
     @JsonProperty
@@ -185,6 +218,24 @@ public String getTableName()
         return tableName;
     }
 
+    @Override
+    public boolean managed()
+    {
+        return isManaged();
+    }
+
+    @JsonProperty
+    public boolean isManaged()
+    {
+        return managed;
+    }
+
+    @Override
+    public String location()
+    {
+        return getLocation();
+    }
+
     @JsonProperty
     public String getLocation()
     {
@@ -197,6 +248,12 @@ public MetadataEntry getMetadataEntry()
         return metadataEntry;
     }
 
+    @JsonProperty
+    public ProtocolEntry getProtocolEntry()
+    {
+        return protocolEntry;
+    }
+
     @JsonProperty
     public TupleDomain<DeltaLakeColumnHandle> getEnforcedPartitionConstraint()
     {
@@ -210,14 +267,14 @@ public TupleDomain<DeltaLakeColumnHandle> getNonPartitionConstraint()
     }
 
     @JsonProperty
-    public Optional<DeltaLakeTableHandle.WriteType> getWriteType()
+    public Optional<WriteType> getWriteType()
     {
         return writeType;
     }
 
     // Projected columns are not needed on workers
     @JsonIgnore
-    public Optional<Set<ColumnHandle>> getProjectedColumns()
+    public Optional<Set<DeltaLakeColumnHandle>> getProjectedColumns()
     {
         return projectedColumns;
     }
@@ -247,26 +304,27 @@ public boolean isRecordScannedFiles()
     }
 
     @JsonIgnore
-    public Optional<DataSize> getMaxScannedFileSize()
+    public boolean isOptimize()
     {
-        return maxScannedFileSize;
+        return isOptimize;
     }
 
-    @JsonProperty
-    public long getReadVersion()
+    @JsonIgnore
+    public Optional<DataSize> getMaxScannedFileSize()
     {
-        return readVersion;
+        return maxScannedFileSize;
     }
 
-    @JsonProperty
-    public boolean isRetriesEnabled()
+    @JsonIgnore
+    public Set<DeltaLakeColumnHandle> getConstraintColumns()
     {
-        return retriesEnabled;
+        return constraintColumns;
     }
 
-    public SchemaTableName getSchemaTableName()
+    @JsonProperty
+    public long getReadVersion()
     {
-        return new SchemaTableName(schemaName, tableName);
+        return readVersion;
     }
 
     @Override
@@ -289,8 +347,10 @@ public boolean equals(Object o)
         return recordScannedFiles == that.recordScannedFiles &&
                 Objects.equals(schemaName, that.schemaName) &&
                 Objects.equals(tableName, that.tableName) &&
+                managed == that.managed &&
                 Objects.equals(location, that.location) &&
                 Objects.equals(metadataEntry, that.metadataEntry) &&
+                Objects.equals(protocolEntry, that.protocolEntry) &&
                 Objects.equals(enforcedPartitionConstraint, that.enforcedPartitionConstraint) &&
                 Objects.equals(nonPartitionConstraint, that.nonPartitionConstraint) &&
                 Objects.equals(writeType, that.writeType) &&
@@ -298,9 +358,9 @@ public boolean equals(Object o)
                 Objects.equals(updatedColumns, that.updatedColumns) &&
                 Objects.equals(updateRowIdColumns, that.updateRowIdColumns) &&
                 Objects.equals(analyzeHandle, that.analyzeHandle) &&
+                Objects.equals(isOptimize, that.isOptimize) &&
                 Objects.equals(maxScannedFileSize, that.maxScannedFileSize) &&
-                readVersion == that.readVersion &&
-                retriesEnabled == that.retriesEnabled;
+                readVersion == that.readVersion;
     }
 
     @Override
@@ -309,8 +369,10 @@ public int hashCode()
         return Objects.hash(
                 schemaName,
                 tableName,
+                managed,
                 location,
                 metadataEntry,
+                protocolEntry,
                 enforcedPartitionConstraint,
                 nonPartitionConstraint,
                 writeType,
@@ -319,8 +381,8 @@ public int hashCode()
                 updateRowIdColumns,
                 analyzeHandle,
                 recordScannedFiles,
+                isOptimize,
                 maxScannedFileSize,
-                readVersion,
-                retriesEnabled);
+                readVersion);
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableName.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableName.java
index 8a23bb13d289..0f8196b5965e 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableName.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableName.java
@@ -22,7 +22,6 @@
 
 import static io.trino.plugin.deltalake.DeltaLakeTableType.DATA;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static java.util.Objects.requireNonNull;
 
 public final class DeltaLakeTableName
 {
@@ -32,12 +31,6 @@ private DeltaLakeTableName() {}
             "(?<table>[^$@]+)" +
             "(?:\\$(?<type>[^@]+))?");
 
-    public static String tableNameWithType(String tableName, DeltaLakeTableType tableType)
-    {
-        requireNonNull(tableName, "tableName is null");
-        return tableName + "$" + tableType.name().toLowerCase(Locale.ENGLISH);
-    }
-
     public static String tableNameFrom(String name)
     {
         Matcher match = TABLE_PATTERN.matcher(name);
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableProperties.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableProperties.java
index 243baba55b7b..ad5b7fae89f1 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableProperties.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableProperties.java
@@ -14,13 +14,14 @@
 package io.trino.plugin.deltalake;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.ColumnMappingMode;
 import io.trino.spi.TrinoException;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -40,6 +41,7 @@ public class DeltaLakeTableProperties
     public static final String PARTITIONED_BY_PROPERTY = "partitioned_by";
     public static final String CHECKPOINT_INTERVAL_PROPERTY = "checkpoint_interval";
     public static final String CHANGE_DATA_FEED_ENABLED_PROPERTY = "change_data_feed_enabled";
+    public static final String COLUMN_MAPPING_MODE_PROPERTY = "column_mapping_mode";
 
     private final List<PropertyMetadata<?>> tableProperties;
 
@@ -74,6 +76,18 @@ public DeltaLakeTableProperties()
                         "Enables storing change data feed entries",
                         null,
                         false))
+                .add(stringProperty(
+                        COLUMN_MAPPING_MODE_PROPERTY,
+                        "Column mapping mode. Possible values: [ID, NAME, NONE]",
+                        // TODO: Consider using 'name' by default. 'none' column mapping doesn't support some statements
+                        ColumnMappingMode.NONE.name(),
+                        value -> {
+                            EnumSet<ColumnMappingMode> allowed = EnumSet.of(ColumnMappingMode.ID, ColumnMappingMode.NAME, ColumnMappingMode.NONE);
+                            if (allowed.stream().map(Enum::name).noneMatch(mode -> mode.equalsIgnoreCase(value))) {
+                                throw new IllegalArgumentException(format("Invalid value [%s]. Valid values: [ID, NAME, NONE]", value));
+                            }
+                        },
+                        false))
                 .build();
     }
 
@@ -109,4 +123,9 @@ public static Optional<Boolean> getChangeDataFeedEnabled(Map<String, Object> tab
     {
         return Optional.ofNullable((Boolean) tableProperties.get(CHANGE_DATA_FEED_ENABLED_PROPERTY));
     }
+
+    public static ColumnMappingMode getColumnMappingMode(Map<String, Object> tableProperties)
+    {
+        return ColumnMappingMode.valueOf(tableProperties.get(COLUMN_MAPPING_MODE_PROPERTY).toString().toUpperCase(ENGLISH));
+    }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableType.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableType.java
index 11c5101944a0..595e5230ac8c 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableType.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableType.java
@@ -17,4 +17,5 @@ public enum DeltaLakeTableType
 {
     DATA,
     HISTORY,
+    PROPERTIES,
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTransactionManager.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTransactionManager.java
index 6626f585360d..fa65cd3d8d31 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTransactionManager.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTransactionManager.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.deltalake;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.security.ConnectorIdentity;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeUpdateBucketFunction.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeUpdateBucketFunction.java
index 086c86849473..60bb7afdd969 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeUpdateBucketFunction.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeUpdateBucketFunction.java
@@ -15,7 +15,7 @@
 
 import io.airlift.slice.Slice;
 import io.trino.spi.Page;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.BucketFunction;
 
 import static io.trino.spi.type.VarcharType.VARCHAR;
@@ -33,8 +33,8 @@ public DeltaLakeUpdateBucketFunction(int bucketCount)
     @Override
     public int getBucket(Page page, int position)
     {
-        Block row = page.getBlock(0).getObject(position, Block.class);
-        Slice value = VARCHAR.getSlice(row, 0); // file path field of row ID
+        SqlRow row = page.getBlock(0).getObject(position, SqlRow.class);
+        Slice value = VARCHAR.getSlice(row.getRawFieldBlock(0), row.getRawIndex()); // file path field of row ID
         return (value.hashCode() & Integer.MAX_VALUE) % bucketCount;
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeWriter.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeWriter.java
index dcc2569d9db9..335d28ed217c 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeWriter.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeWriter.java
@@ -17,31 +17,30 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
-import io.trino.filesystem.TrinoFileSystem;
-import io.trino.filesystem.TrinoInputFile;
-import io.trino.parquet.ParquetReaderOptions;
+import io.trino.filesystem.Location;
 import io.trino.parquet.reader.MetadataReader;
 import io.trino.plugin.deltalake.DataFileInfo.DataFileType;
 import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeJsonFileStatistics;
-import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.FileWriter;
-import io.trino.plugin.hive.parquet.TrinoParquetDataSource;
+import io.trino.plugin.hive.parquet.ParquetFileWriter;
 import io.trino.spi.Page;
 import io.trino.spi.block.ArrayBlock;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.ColumnarArray;
 import io.trino.spi.block.ColumnarMap;
-import io.trino.spi.block.ColumnarRow;
+import io.trino.spi.block.DictionaryBlock;
 import io.trino.spi.block.LazyBlock;
 import io.trino.spi.block.LazyBlockLoader;
 import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.RowBlock;
+import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.TimestampWithTimeZoneType;
 import io.trino.spi.type.Type;
 import org.apache.parquet.column.statistics.Statistics;
+import org.apache.parquet.format.FileMetaData;
 import org.apache.parquet.hadoop.metadata.BlockMetaData;
 import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData;
 import org.apache.parquet.hadoop.metadata.ParquetMetadata;
@@ -56,19 +55,19 @@
 import java.util.function.Function;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.filesystem.Locations.appendPath;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeParquetStatisticsUtils.hasInvalidStatistics;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeParquetStatisticsUtils.jsonEncodeMax;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeParquetStatisticsUtils.jsonEncodeMin;
 import static io.trino.spi.block.ColumnarArray.toColumnarArray;
 import static io.trino.spi.block.ColumnarMap.toColumnarMap;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
 import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
 import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
+import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.function.UnaryOperator.identity;
@@ -76,31 +75,28 @@
 public class DeltaLakeWriter
         implements FileWriter
 {
-    private final TrinoFileSystem fileSystem;
-    private final FileWriter fileWriter;
-    private final String rootTableLocation;
+    private final ParquetFileWriter fileWriter;
+    private final Location rootTableLocation;
     private final String relativeFilePath;
     private final List<String> partitionValues;
     private final DeltaLakeWriterStats stats;
     private final long creationTime;
     private final Map<Integer, Function<Block, Block>> coercers;
     private final List<DeltaLakeColumnHandle> columnHandles;
+    private final DataFileType dataFileType;
 
     private long rowCount;
     private long inputSizeInBytes;
-    private DataFileType dataFileType;
 
     public DeltaLakeWriter(
-            TrinoFileSystem fileSystem,
-            FileWriter fileWriter,
-            String rootTableLocation,
+            ParquetFileWriter fileWriter,
+            Location rootTableLocation,
             String relativeFilePath,
             List<String> partitionValues,
             DeltaLakeWriterStats stats,
             List<DeltaLakeColumnHandle> columnHandles,
             DataFileType dataFileType)
     {
-        this.fileSystem = requireNonNull(fileSystem, "fileSystem is null");
         this.fileWriter = requireNonNull(fileWriter, "fileWriter is null");
         this.rootTableLocation = requireNonNull(rootTableLocation, "rootTableLocation is null");
         this.relativeFilePath = requireNonNull(relativeFilePath, "relativeFilePath is null");
@@ -111,13 +107,13 @@ public DeltaLakeWriter(
 
         ImmutableMap.Builder<Integer, Function<Block, Block>> coercers = ImmutableMap.builder();
         for (int i = 0; i < columnHandles.size(); i++) {
-            Optional<Function<Block, Block>> coercer = createCoercer(columnHandles.get(i).getType());
+            Optional<Function<Block, Block>> coercer = createCoercer(columnHandles.get(i).getBaseType());
             if (coercer.isPresent()) {
                 coercers.put(i, coercer.get());
             }
         }
         this.coercers = coercers.buildOrThrow();
-        this.dataFileType = dataFileType;
+        this.dataFileType = requireNonNull(dataFileType, "dataFileType is null");
     }
 
     @Override
@@ -136,7 +132,7 @@ public long getMemoryUsage()
     public void appendRows(Page originalPage)
     {
         Page page = originalPage;
-        if (coercers.size() > 0) {
+        if (!coercers.isEmpty()) {
             Block[] translatedBlocks = new Block[originalPage.getChannelCount()];
             for (int index = 0; index < translatedBlocks.length; index++) {
                 Block originalBlock = originalPage.getBlock(index);
@@ -185,55 +181,39 @@ public long getRowCount()
     public DataFileInfo getDataFileInfo()
             throws IOException
     {
-        List<String> dataColumnNames = columnHandles.stream().map(DeltaLakeColumnHandle::getName).collect(toImmutableList());
-        List<Type> dataColumnTypes = columnHandles.stream().map(DeltaLakeColumnHandle::getType).collect(toImmutableList());
+        Map</* lowercase */ String, Type> dataColumnTypes = columnHandles.stream()
+                // Lowercase because the subsequent logic expects lowercase
+                .collect(toImmutableMap(column -> column.getBasePhysicalColumnName().toLowerCase(ENGLISH), DeltaLakeColumnHandle::getBasePhysicalType));
         return new DataFileInfo(
                 relativeFilePath,
                 getWrittenBytes(),
                 creationTime,
                 dataFileType,
                 partitionValues,
-                readStatistics(fileSystem, rootTableLocation, dataColumnNames, dataColumnTypes, relativeFilePath, rowCount));
+                readStatistics(fileWriter.getFileMetadata(), rootTableLocation.appendPath(relativeFilePath), dataColumnTypes, rowCount));
     }
 
-    private static DeltaLakeJsonFileStatistics readStatistics(
-            TrinoFileSystem fileSystem,
-            String tableLocation,
-            List<String> dataColumnNames,
-            List<Type> dataColumnTypes,
-            String relativeFilePath,
-            Long rowCount)
+    private static DeltaLakeJsonFileStatistics readStatistics(FileMetaData fileMetaData, Location path, Map</* lowercase */ String, Type> typeForColumn, long rowCount)
             throws IOException
     {
-        ImmutableMap.Builder<String, Type> typeForColumn = ImmutableMap.builder();
-        for (int i = 0; i < dataColumnNames.size(); i++) {
-            typeForColumn.put(dataColumnNames.get(i), dataColumnTypes.get(i));
-        }
+        ParquetMetadata parquetMetadata = MetadataReader.createParquetMetadata(fileMetaData, path.fileName());
 
-        TrinoInputFile inputFile = fileSystem.newInputFile(appendPath(tableLocation, relativeFilePath));
-        try (TrinoParquetDataSource trinoParquetDataSource = new TrinoParquetDataSource(
-                inputFile,
-                new ParquetReaderOptions(),
-                new FileFormatDataSourceStats())) {
-            ParquetMetadata parquetMetadata = MetadataReader.readFooter(trinoParquetDataSource, Optional.empty());
-
-            ImmutableMultimap.Builder<String, ColumnChunkMetaData> metadataForColumn = ImmutableMultimap.builder();
-            for (BlockMetaData blockMetaData : parquetMetadata.getBlocks()) {
-                for (ColumnChunkMetaData columnChunkMetaData : blockMetaData.getColumns()) {
-                    if (columnChunkMetaData.getPath().size() != 1) {
-                        continue; // Only base column stats are supported
-                    }
-                    String columnName = getOnlyElement(columnChunkMetaData.getPath());
-                    metadataForColumn.put(columnName, columnChunkMetaData);
+        ImmutableMultimap.Builder<String, ColumnChunkMetaData> metadataForColumn = ImmutableMultimap.builder();
+        for (BlockMetaData blockMetaData : parquetMetadata.getBlocks()) {
+            for (ColumnChunkMetaData columnChunkMetaData : blockMetaData.getColumns()) {
+                if (columnChunkMetaData.getPath().size() != 1) {
+                    continue; // Only base column stats are supported
                 }
+                String columnName = getOnlyElement(columnChunkMetaData.getPath());
+                metadataForColumn.put(columnName, columnChunkMetaData);
             }
-
-            return mergeStats(metadataForColumn.build(), typeForColumn.buildOrThrow(), rowCount);
         }
+
+        return mergeStats(metadataForColumn.build(), typeForColumn, rowCount);
     }
 
     @VisibleForTesting
-    static DeltaLakeJsonFileStatistics mergeStats(Multimap<String, ColumnChunkMetaData> metadataForColumn, Map<String, Type> typeForColumn, long rowCount)
+    static DeltaLakeJsonFileStatistics mergeStats(Multimap<String, ColumnChunkMetaData> metadataForColumn, Map</* lowercase */ String, Type> typeForColumn, long rowCount)
     {
         Map<String, Optional<Statistics<?>>> statsForColumn = metadataForColumn.keySet().stream()
                 .collect(toImmutableMap(identity(), key -> mergeMetadataList(metadataForColumn.get(key))));
@@ -363,25 +343,61 @@ public RowCoercer(RowType rowType)
         @Override
         public Block apply(Block block)
         {
-            ColumnarRow rowBlock = toColumnarRow(block);
-            Block[] fields = new Block[fieldCoercers.size()];
+            block = block.getLoadedBlock();
+
+            if (block instanceof RunLengthEncodedBlock runLengthEncodedBlock) {
+                RowBlock rowBlock = (RowBlock) runLengthEncodedBlock.getValue();
+                RowBlock newRowBlock = RowBlock.fromNotNullSuppressedFieldBlocks(
+                        1,
+                        rowBlock.isNull(0) ? Optional.of(new boolean[]{true}) : Optional.empty(),
+                        coerceFields(rowBlock.getFieldBlocks()));
+                return RunLengthEncodedBlock.create(newRowBlock, runLengthEncodedBlock.getPositionCount());
+            }
+            if (block instanceof DictionaryBlock dictionaryBlock) {
+                RowBlock rowBlock = (RowBlock) dictionaryBlock.getDictionary();
+                List<Block> fieldBlocks = rowBlock.getFieldBlocks().stream()
+                        .map(dictionaryBlock::createProjection)
+                        .toList();
+                return RowBlock.fromNotNullSuppressedFieldBlocks(
+                        dictionaryBlock.getPositionCount(),
+                        getNulls(dictionaryBlock),
+                        coerceFields(fieldBlocks));
+            }
+            RowBlock rowBlock = (RowBlock) block;
+            return RowBlock.fromNotNullSuppressedFieldBlocks(
+                    rowBlock.getPositionCount(),
+                    getNulls(rowBlock),
+                    coerceFields(rowBlock.getFieldBlocks()));
+        }
+
+        private static Optional<boolean[]> getNulls(Block rowBlock)
+        {
+            if (!rowBlock.mayHaveNull()) {
+                return Optional.empty();
+            }
+
+            boolean[] valueIsNull = new boolean[rowBlock.getPositionCount()];
+            for (int i = 0; i < rowBlock.getPositionCount(); i++) {
+                valueIsNull[i] = rowBlock.isNull(i);
+            }
+            return Optional.of(valueIsNull);
+        }
+
+        private Block[] coerceFields(List<Block> fields)
+        {
+            checkArgument(fields.size() == fieldCoercers.size());
+            Block[] newFields = new Block[fieldCoercers.size()];
             for (int i = 0; i < fieldCoercers.size(); i++) {
                 Optional<Function<Block, Block>> coercer = fieldCoercers.get(i);
+                Block fieldBlock = fields.get(i);
                 if (coercer.isPresent()) {
-                    fields[i] = coercer.get().apply(rowBlock.getField(i));
+                    newFields[i] = coercer.get().apply(fieldBlock);
                 }
                 else {
-                    fields[i] = rowBlock.getField(i);
-                }
-            }
-            boolean[] valueIsNull = null;
-            if (rowBlock.mayHaveNull()) {
-                valueIsNull = new boolean[rowBlock.getPositionCount()];
-                for (int i = 0; i < rowBlock.getPositionCount(); i++) {
-                    valueIsNull[i] = rowBlock.isNull(i);
+                    newFields[i] = fieldBlock;
                 }
             }
-            return RowBlock.fromFieldBlocks(rowBlock.getPositionCount(), Optional.ofNullable(valueIsNull), fields);
+            return newFields;
         }
     }
 
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/GcsStorageFactory.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/GcsStorageFactory.java
deleted file mode 100644
index c5b9cff92b4a..000000000000
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/GcsStorageFactory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.deltalake;
-
-import com.google.cloud.hadoop.fs.gcs.TrinoGoogleHadoopFileSystemConfiguration;
-import com.google.cloud.hadoop.repackaged.gcs.com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.cloud.hadoop.repackaged.gcs.com.google.api.client.http.HttpTransport;
-import com.google.cloud.hadoop.repackaged.gcs.com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.cloud.hadoop.repackaged.gcs.com.google.api.services.storage.Storage;
-import com.google.cloud.hadoop.repackaged.gcs.com.google.cloud.hadoop.gcsio.GoogleCloudStorageOptions;
-import com.google.cloud.hadoop.repackaged.gcs.com.google.cloud.hadoop.util.CredentialFactory;
-import com.google.cloud.hadoop.repackaged.gcs.com.google.cloud.hadoop.util.HttpTransportFactory;
-import com.google.cloud.hadoop.repackaged.gcs.com.google.cloud.hadoop.util.RetryHttpInitializer;
-import io.trino.hdfs.HdfsContext;
-import io.trino.hdfs.HdfsEnvironment;
-import io.trino.plugin.hive.gcs.HiveGcsConfig;
-import io.trino.spi.TrinoException;
-import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.time.Duration;
-import java.util.Optional;
-
-import static com.google.common.base.Strings.nullToEmpty;
-import static io.trino.plugin.hive.gcs.GcsConfigurationProvider.GCS_OAUTH_KEY;
-import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Objects.requireNonNull;
-
-public class GcsStorageFactory
-{
-    private static final String APPLICATION_NAME = "Trino-Delta-Lake";
-
-    private final HdfsEnvironment hdfsEnvironment;
-    private final boolean useGcsAccessToken;
-    @Nullable
-    private final Optional<GoogleCredential> jsonGoogleCredential;
-
-    @Inject
-    public GcsStorageFactory(HdfsEnvironment hdfsEnvironment, HiveGcsConfig hiveGcsConfig)
-            throws IOException
-    {
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
-        this.useGcsAccessToken = hiveGcsConfig.isUseGcsAccessToken();
-        String jsonKeyFilePath = hiveGcsConfig.getJsonKeyFilePath();
-        if (jsonKeyFilePath != null) {
-            try (FileInputStream inputStream = new FileInputStream(jsonKeyFilePath)) {
-                jsonGoogleCredential = Optional.of(GoogleCredential.fromStream(inputStream).createScoped(CredentialFactory.DEFAULT_SCOPES));
-            }
-        }
-        else {
-            jsonGoogleCredential = Optional.empty();
-        }
-    }
-
-    public Storage create(ConnectorSession session, Path path)
-    {
-        try {
-            GoogleCloudStorageOptions gcsOptions = TrinoGoogleHadoopFileSystemConfiguration.getGcsOptionsBuilder(hdfsEnvironment.getConfiguration(new HdfsContext(session), path)).build();
-            HttpTransport httpTransport = HttpTransportFactory.createHttpTransport(
-                    gcsOptions.getTransportType(),
-                    gcsOptions.getProxyAddress(),
-                    gcsOptions.getProxyUsername(),
-                    gcsOptions.getProxyPassword(),
-                    Duration.ofMillis(gcsOptions.getHttpRequestReadTimeout()));
-            GoogleCredential credential;
-            if (useGcsAccessToken) {
-                String accessToken = nullToEmpty(session.getIdentity().getExtraCredentials().get(GCS_OAUTH_KEY));
-                try (ByteArrayInputStream inputStream = new ByteArrayInputStream(accessToken.getBytes(UTF_8))) {
-                    credential = GoogleCredential.fromStream(inputStream).createScoped(CredentialFactory.DEFAULT_SCOPES);
-                }
-            }
-            else {
-                credential = jsonGoogleCredential.get();
-            }
-            return new Storage.Builder(httpTransport, JacksonFactory.getDefaultInstance(), new RetryHttpInitializer(credential, APPLICATION_NAME))
-                    .setApplicationName(APPLICATION_NAME)
-                    .build();
-        }
-        catch (Exception e) {
-            throw new TrinoException(GENERIC_INTERNAL_ERROR, e);
-        }
-    }
-}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/InternalDeltaLakeConnectorFactory.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/InternalDeltaLakeConnectorFactory.java
index ae1708827841..5285c6c74f12 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/InternalDeltaLakeConnectorFactory.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/InternalDeltaLakeConnectorFactory.java
@@ -22,10 +22,13 @@
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.event.client.EventModule;
 import io.airlift.json.JsonModule;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.filesystem.hdfs.HdfsFileSystemModule;
+import io.trino.filesystem.manager.FileSystemModule;
 import io.trino.hdfs.HdfsModule;
 import io.trino.hdfs.authentication.HdfsAuthenticationModule;
+import io.trino.hdfs.gcs.HiveGcsModule;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.base.CatalogNameModule;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorAccessControl;
@@ -39,9 +42,6 @@
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.plugin.deltalake.metastore.DeltaLakeMetastoreModule;
 import io.trino.plugin.hive.NodeVersion;
-import io.trino.plugin.hive.azure.HiveAzureModule;
-import io.trino.plugin.hive.gcs.HiveGcsModule;
-import io.trino.plugin.hive.s3.HiveS3Module;
 import io.trino.spi.NodeManager;
 import io.trino.spi.PageIndexerFactory;
 import io.trino.spi.classloader.ThreadContextClassLoader;
@@ -54,6 +54,8 @@
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.TableProcedureMetadata;
 import io.trino.spi.eventlistener.EventListener;
+import io.trino.spi.function.FunctionProvider;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.procedure.Procedure;
 import io.trino.spi.type.TypeManager;
 import org.weakref.jmx.guice.MBeanModule;
@@ -86,27 +88,25 @@ public static Connector createConnector(
                     new JsonModule(),
                     new MBeanServerModule(),
                     new HdfsModule(),
-                    new HiveS3Module(),
-                    new DeltaLakeS3Module(),
-                    new HiveAzureModule(),
-                    new DeltaLakeAzureModule(),
                     new HiveGcsModule(),
-                    new DeltaLakeGcsModule(),
                     new HdfsAuthenticationModule(),
                     new CatalogNameModule(catalogName),
                     metastoreModule.orElse(new DeltaLakeMetastoreModule()),
                     new DeltaLakeModule(),
                     new DeltaLakeSecurityModule(),
+                    new DeltaLakeSynchronizerModule(),
+                    fileSystemFactory
+                            .map(factory -> (Module) binder -> binder.bind(TrinoFileSystemFactory.class).toInstance(factory))
+                            .orElseGet(FileSystemModule::new),
                     binder -> {
+                        binder.bind(OpenTelemetry.class).toInstance(context.getOpenTelemetry());
+                        binder.bind(Tracer.class).toInstance(context.getTracer());
                         binder.bind(NodeVersion.class).toInstance(new NodeVersion(context.getNodeManager().getCurrentNode().getVersion()));
                         binder.bind(NodeManager.class).toInstance(context.getNodeManager());
                         binder.bind(TypeManager.class).toInstance(context.getTypeManager());
                         binder.bind(PageIndexerFactory.class).toInstance(context.getPageIndexerFactory());
                         binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName));
                         newSetBinder(binder, EventListener.class);
-                        fileSystemFactory.ifPresentOrElse(
-                                factory -> binder.bind(TrinoFileSystemFactory.class).toInstance(factory),
-                                () -> binder.install(new HdfsFileSystemModule()));
                     },
                     module);
 
@@ -138,7 +138,11 @@ public static Connector createConnector(
             Set<Procedure> procedures = injector.getInstance(Key.get(new TypeLiteral<Set<Procedure>>() {}));
             Set<TableProcedureMetadata> tableProcedures = injector.getInstance(Key.get(new TypeLiteral<Set<TableProcedureMetadata>>() {}));
 
+            Set<ConnectorTableFunction> connectorTableFunctions = injector.getInstance(Key.get(new TypeLiteral<Set<ConnectorTableFunction>>() {}));
+            FunctionProvider functionProvider = injector.getInstance(FunctionProvider.class);
+
             return new DeltaLakeConnector(
+                    injector,
                     lifeCycleManager,
                     new ClassLoaderSafeConnectorSplitManager(splitManager, classLoader),
                     new ClassLoaderSafeConnectorPageSourceProvider(connectorPageSource, classLoader),
@@ -153,7 +157,9 @@ public static Connector createConnector(
                     deltaLakeAnalyzeProperties.getAnalyzeProperties(),
                     deltaAccessControl,
                     eventListeners,
-                    transactionManager);
+                    transactionManager,
+                    connectorTableFunctions,
+                    functionProvider);
         }
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/LocatedTableHandle.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/LocatedTableHandle.java
new file mode 100644
index 000000000000..80f51efb2a3a
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/LocatedTableHandle.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import io.trino.spi.connector.ConnectorTableHandle;
+import io.trino.spi.connector.SchemaTableName;
+
+public interface LocatedTableHandle
+        extends ConnectorTableHandle
+{
+    SchemaTableName schemaTableName();
+
+    boolean managed();
+
+    String location();
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/delete/Base85Codec.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/delete/Base85Codec.java
new file mode 100644
index 000000000000..f421ad1e1e0b
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/delete/Base85Codec.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.delete;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.math.IntMath;
+import com.google.common.primitives.SignedBytes;
+
+import java.util.Arrays;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+// This implements Base85 using the 4 byte block aligned encoding and character set from Z85 https://rfc.zeromq.org/spec/32
+// Delta Lake implementation is https://github.com/delta-io/delta/blob/master/kernel/kernel-api/src/main/java/io/delta/kernel/internal/deletionvectors/Base85Codec.java
+public final class Base85Codec
+{
+    @VisibleForTesting
+    static final int BASE = 85;
+    @VisibleForTesting
+    static final int BASE_2ND_POWER = IntMath.pow(BASE, 2);
+    @VisibleForTesting
+    static final int BASE_3RD_POWER = IntMath.pow(BASE, 3);
+    @VisibleForTesting
+    static final int BASE_4TH_POWER = IntMath.pow(BASE, 4);
+
+    private static final int ASCII_BITMASK = 0x7F;
+
+    // UUIDs always encode into 20 characters
+    static final int ENCODED_UUID_LENGTH = 20;
+
+    private static final String BASE85_CHARACTERS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-:+=^!/*?&<>()[]{}@%$#";
+
+    @VisibleForTesting
+    static final byte[] ENCODE_MAP = BASE85_CHARACTERS.getBytes(UTF_8);
+
+    // The bitmask is the same as largest possible value, so the length of the array must be one greater.
+    static final byte[] DECODE_MAP = new byte[ASCII_BITMASK + 1];
+
+    static {
+        // Following loop doesn't fill all values
+        Arrays.fill(DECODE_MAP, (byte) -1);
+        for (int i = 0; i < ENCODE_MAP.length; i++) {
+            DECODE_MAP[ENCODE_MAP[i]] = SignedBytes.checkedCast(i);
+        }
+    }
+
+    private Base85Codec() {}
+
+    public static byte[] decode(String encoded)
+    {
+        checkArgument(encoded.length() % 5 == 0, "Input should be 5 character aligned");
+        byte[] buffer = new byte[encoded.length() / 5 * 4];
+
+        int outputIndex = 0;
+        for (int inputIndex = 0; inputIndex < encoded.length(); inputIndex += 5) {
+            // word is a container for 32-bit of decoded output. Arithmetics below treat it as unsigned 32-bit integer (consciously overflow)
+            int word = 0;
+            word += decodeInputChar(encoded.charAt(inputIndex)) * BASE_4TH_POWER;
+            word += decodeInputChar(encoded.charAt(inputIndex + 1)) * BASE_3RD_POWER;
+            word += decodeInputChar(encoded.charAt(inputIndex + 2)) * BASE_2ND_POWER;
+            word += decodeInputChar(encoded.charAt(inputIndex + 3)) * BASE;
+            word += decodeInputChar(encoded.charAt(inputIndex + 4));
+
+            buffer[outputIndex] = (byte) (word >> 24);
+            //noinspection NumericCastThatLosesPrecision
+            buffer[outputIndex + 1] = (byte) (word >> 16);
+            //noinspection NumericCastThatLosesPrecision
+            buffer[outputIndex + 2] = (byte) (word >> 8);
+            //noinspection NumericCastThatLosesPrecision
+            buffer[outputIndex + 3] = (byte) word;
+            outputIndex += 4;
+        }
+        checkState(outputIndex == buffer.length);
+        return buffer;
+    }
+
+    private static int decodeInputChar(char input)
+    {
+        checkArgument(input == (input & ASCII_BITMASK), "Input character is not ASCII: [%s]", input);
+        byte decoded = DECODE_MAP[input & ASCII_BITMASK];
+        checkArgument(decoded != (byte) -1, "Invalid input character: [%s]", input);
+        return decoded;
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/delete/DeletionVectors.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/delete/DeletionVectors.java
new file mode 100644
index 000000000000..a7c4ed9c71fc
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/delete/DeletionVectors.java
@@ -0,0 +1,129 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.delete;
+
+import com.google.common.base.CharMatcher;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.plugin.deltalake.transactionlog.DeletionVectorEntry;
+import io.trino.spi.TrinoException;
+import org.roaringbitmap.RoaringBitmap;
+import org.roaringbitmap.longlong.Roaring64NavigableMap;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.UUID;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static java.lang.Math.toIntExact;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
+
+// https://github.com/delta-io/delta/blob/master/PROTOCOL.md#deletion-vector-format
+public final class DeletionVectors
+{
+    private static final int PORTABLE_ROARING_BITMAP_MAGIC_NUMBER = 1681511377;
+
+    private static final String UUID_MARKER = "u"; // relative path with random prefix on disk
+    private static final String PATH_MARKER = "p"; // absolute path on disk
+    private static final String INLINE_MARKER = "i"; // inline
+
+    private static final CharMatcher ALPHANUMERIC = CharMatcher.inRange('A', 'Z').or(CharMatcher.inRange('a', 'z')).or(CharMatcher.inRange('0', '9')).precomputed();
+
+    private DeletionVectors() {}
+
+    public static Roaring64NavigableMap readDeletionVectors(TrinoFileSystem fileSystem, Location location, DeletionVectorEntry deletionVector)
+            throws IOException
+    {
+        if (deletionVector.storageType().equals(UUID_MARKER)) {
+            TrinoInputFile inputFile = fileSystem.newInputFile(location.appendPath(toFileName(deletionVector.pathOrInlineDv())));
+            byte[] buffer = readDeletionVector(inputFile, deletionVector.offset().orElseThrow(), deletionVector.sizeInBytes());
+            Roaring64NavigableMap bitmaps = deserializeDeletionVectors(buffer);
+            if (bitmaps.getLongCardinality() != deletionVector.cardinality()) {
+                throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "The number of deleted rows expects %s but got %s".formatted(deletionVector.cardinality(), bitmaps.getLongCardinality()));
+            }
+            return bitmaps;
+        }
+        if (deletionVector.storageType().equals(INLINE_MARKER) || deletionVector.storageType().equals(PATH_MARKER)) {
+            throw new TrinoException(NOT_SUPPORTED, "Unsupported storage type for deletion vector: " + deletionVector.storageType());
+        }
+        throw new IllegalArgumentException("Unexpected storage type: " + deletionVector.storageType());
+    }
+
+    public static String toFileName(String pathOrInlineDv)
+    {
+        int randomPrefixLength = pathOrInlineDv.length() - Base85Codec.ENCODED_UUID_LENGTH;
+        String randomPrefix = pathOrInlineDv.substring(0, randomPrefixLength);
+        checkArgument(ALPHANUMERIC.matchesAllOf(randomPrefix), "Random prefix must be alphanumeric: %s", randomPrefix);
+        String prefix = randomPrefix.isEmpty() ? "" : randomPrefix + "/";
+        String encodedUuid = pathOrInlineDv.substring(randomPrefixLength);
+        UUID uuid = decodeUuid(encodedUuid);
+        return "%sdeletion_vector_%s.bin".formatted(prefix, uuid);
+    }
+
+    public static byte[] readDeletionVector(TrinoInputFile inputFile, int offset, int expectedSize)
+            throws IOException
+    {
+        byte[] bytes = new byte[expectedSize];
+        try (DataInputStream inputStream = new DataInputStream(inputFile.newStream())) {
+            checkState(inputStream.skip(offset) == offset);
+            int actualSize = inputStream.readInt();
+            if (actualSize != expectedSize) {
+                throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "The size of deletion vector %s expects %s but got %s".formatted(inputFile.location(), expectedSize, actualSize));
+            }
+            inputStream.readFully(bytes);
+        }
+        return bytes;
+    }
+
+    private static Roaring64NavigableMap deserializeDeletionVectors(byte[] bytes)
+            throws IOException
+    {
+        ByteBuffer buffer = ByteBuffer.wrap(bytes).order(LITTLE_ENDIAN);
+        checkArgument(buffer.order() == LITTLE_ENDIAN, "Byte order must be little endian: %s", buffer.order());
+        int magicNumber = buffer.getInt();
+        if (magicNumber == PORTABLE_ROARING_BITMAP_MAGIC_NUMBER) {
+            int size = toIntExact(buffer.getLong());
+            Roaring64NavigableMap bitmaps = new Roaring64NavigableMap();
+            for (int i = 0; i < size; i++) {
+                int key = buffer.getInt();
+                checkArgument(key >= 0, "key must not be negative: %s", key);
+
+                RoaringBitmap bitmap = new RoaringBitmap();
+                bitmap.deserialize(buffer);
+                bitmap.stream().forEach(bitmaps::add);
+
+                // there seems to be no better way to ask how many bytes bitmap.deserialize has read
+                int consumedBytes = bitmap.serializedSizeInBytes();
+                buffer.position(buffer.position() + consumedBytes);
+            }
+            return bitmaps;
+        }
+        throw new IllegalArgumentException("Unsupported magic number: " + magicNumber);
+    }
+
+    public static UUID decodeUuid(String encoded)
+    {
+        byte[] bytes = Base85Codec.decode(encoded);
+        ByteBuffer buffer = ByteBuffer.wrap(bytes);
+        checkArgument(buffer.remaining() == 16);
+        long highBits = buffer.getLong();
+        long lowBits = buffer.getLong();
+        return new UUID(highBits, lowBits);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/delete/PageFilter.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/delete/PageFilter.java
new file mode 100644
index 000000000000..7e0a7438e594
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/delete/PageFilter.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.delete;
+
+import io.trino.spi.Page;
+
+import java.util.function.Function;
+
+public interface PageFilter
+        extends Function<Page, Page> {}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/delete/PositionDeleteFilter.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/delete/PositionDeleteFilter.java
new file mode 100644
index 000000000000..42600b740c6f
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/delete/PositionDeleteFilter.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.delete;
+
+import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
+import io.trino.spi.block.Block;
+import org.roaringbitmap.longlong.Roaring64NavigableMap;
+
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.plugin.deltalake.DeltaLakeColumnHandle.ROW_POSITION_COLUMN_NAME;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static java.util.Objects.requireNonNull;
+
+public final class PositionDeleteFilter
+{
+    private final Roaring64NavigableMap deletedRows;
+
+    public PositionDeleteFilter(Roaring64NavigableMap deletedRows)
+    {
+        requireNonNull(deletedRows, "deletedRows is null");
+        checkArgument(!deletedRows.isEmpty(), "deletedRows is empty");
+        this.deletedRows = deletedRows;
+    }
+
+    public PageFilter createPredicate(List<DeltaLakeColumnHandle> columns)
+    {
+        int filePositionChannel = rowPositionChannel(columns);
+
+        return page -> {
+            int positionCount = page.getPositionCount();
+            int[] retained = new int[positionCount];
+            int retainedCount = 0;
+            Block block = page.getBlock(filePositionChannel);
+            for (int position = 0; position < positionCount; position++) {
+                long filePosition = BIGINT.getLong(block, position);
+                if (!deletedRows.contains(filePosition)) {
+                    retained[retainedCount] = position;
+                    retainedCount++;
+                }
+            }
+            if (retainedCount == positionCount) {
+                return page;
+            }
+            return page.getPositions(retained, 0, retainedCount);
+        };
+    }
+
+    private static int rowPositionChannel(List<DeltaLakeColumnHandle> columns)
+    {
+        for (int i = 0; i < columns.size(); i++) {
+            if (columns.get(i).getBaseColumnName().equals(ROW_POSITION_COLUMN_NAME)) {
+                return i;
+            }
+        }
+        throw new IllegalArgumentException("No row position column");
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/BetweenPredicate.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/BetweenPredicate.java
new file mode 100644
index 000000000000..9e4bebb530ef
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/BetweenPredicate.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.expression;
+
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public class BetweenPredicate
+        extends SparkExpression
+{
+    public enum Operator
+    {
+        BETWEEN("BETWEEN"),
+        NOT_BETWEEN("NOT BETWEEN");
+
+        private final String value;
+
+        Operator(String value)
+        {
+            this.value = value;
+        }
+
+        public String getValue()
+        {
+            return value;
+        }
+    }
+
+    private final Operator operator;
+    private final SparkExpression value;
+    private final SparkExpression min;
+    private final SparkExpression max;
+
+    public BetweenPredicate(Operator operator, SparkExpression value, SparkExpression min, SparkExpression max)
+    {
+        this.operator = requireNonNull(operator, "operator is null");
+        this.value = requireNonNull(value, "value is null");
+        this.min = requireNonNull(min, "min is null");
+        this.max = requireNonNull(max, "max is null");
+    }
+
+    public Operator getOperator()
+    {
+        return operator;
+    }
+
+    public SparkExpression getValue()
+    {
+        return value;
+    }
+
+    public SparkExpression getMin()
+    {
+        return min;
+    }
+
+    public SparkExpression getMax()
+    {
+        return max;
+    }
+
+    @Override
+    <R, C> R accept(SparkExpressionTreeVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitBetweenExpression(this, context);
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BetweenPredicate that = (BetweenPredicate) o;
+        return operator == that.operator &&
+                Objects.equals(value, that.value) &&
+                Objects.equals(min, that.min) &&
+                Objects.equals(max, that.max);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(operator, value, min, max);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("operator", operator)
+                .add("value", value)
+                .add("min", min)
+                .add("max", max)
+                .toString();
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/CaseInsensitiveStream.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/CaseInsensitiveStream.java
deleted file mode 100644
index 9e61d0058d95..000000000000
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/CaseInsensitiveStream.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.deltalake.expression;
-
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.IntStream;
-import org.antlr.v4.runtime.misc.Interval;
-
-import static java.util.Objects.requireNonNull;
-
-public class CaseInsensitiveStream
-        implements CharStream
-{
-    private final CharStream stream;
-
-    public CaseInsensitiveStream(CharStream stream)
-    {
-        this.stream = requireNonNull(stream, "stream is null");
-    }
-
-    @Override
-    public String getText(Interval interval)
-    {
-        return stream.getText(interval);
-    }
-
-    @Override
-    public void consume()
-    {
-        stream.consume();
-    }
-
-    @Override
-    public int LA(int i)
-    {
-        int result = stream.LA(i);
-
-        return switch (result) {
-            case 0, IntStream.EOF -> result;
-            default -> Character.toUpperCase(result);
-        };
-    }
-
-    @Override
-    public int mark()
-    {
-        return stream.mark();
-    }
-
-    @Override
-    public void release(int marker)
-    {
-        stream.release(marker);
-    }
-
-    @Override
-    public int index()
-    {
-        return stream.index();
-    }
-
-    @Override
-    public void seek(int index)
-    {
-        stream.seek(index);
-    }
-
-    @Override
-    public int size()
-    {
-        return stream.size();
-    }
-
-    @Override
-    public String getSourceName()
-    {
-        return stream.getSourceName();
-    }
-}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/NullLiteral.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/NullLiteral.java
new file mode 100644
index 000000000000..db6ec79beddd
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/NullLiteral.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.expression;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+
+public class NullLiteral
+        extends Literal
+{
+    @Override
+    public <R, C> R accept(SparkExpressionTreeVisitor<R, C> visitor, C context)
+    {
+        return visitor.visitNullLiteral(this, context);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .toString();
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionBuilder.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionBuilder.java
index c7b28ee8dcf3..740f7387d6c3 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionBuilder.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionBuilder.java
@@ -106,6 +106,20 @@ public Object visitOr(SparkExpressionBaseParser.OrContext context)
                 visit(context.right, SparkExpression.class));
     }
 
+    @Override
+    public SparkExpression visitBetween(SparkExpressionBaseParser.BetweenContext context)
+    {
+        BetweenPredicate.Operator operator = BetweenPredicate.Operator.BETWEEN;
+        if (context.NOT() != null) {
+            operator = BetweenPredicate.Operator.NOT_BETWEEN;
+        }
+        return new BetweenPredicate(
+                operator,
+                visit(context.value, SparkExpression.class),
+                visit(context.lower, SparkExpression.class),
+                visit(context.upper, SparkExpression.class));
+    }
+
     @Override
     public Object visitColumnReference(SparkExpressionBaseParser.ColumnReferenceContext context)
     {
@@ -150,6 +164,12 @@ public Object visitUnicodeStringLiteral(SparkExpressionBaseParser.UnicodeStringL
         return new StringLiteral(decodeUnicodeLiteral(context));
     }
 
+    @Override
+    public SparkExpression visitNullLiteral(SparkExpressionBaseParser.NullLiteralContext context)
+    {
+        return new NullLiteral();
+    }
+
     private static String decodeUnicodeLiteral(SparkExpressionBaseParser.UnicodeStringLiteralContext context)
     {
         String rawContent = unquote(context.getText());
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionConverter.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionConverter.java
index 0888b533925a..2a7ef89abc15 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionConverter.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionConverter.java
@@ -58,6 +58,16 @@ protected String visitLogicalExpression(LogicalExpression node, Void context)
             return "(%s %s %s)".formatted(process(node.getLeft(), context), node.getOperator().toString(), process(node.getRight(), context));
         }
 
+        @Override
+        protected String visitBetweenExpression(BetweenPredicate node, Void context)
+        {
+            return "(%s %s %s AND %s)".formatted(
+                    process(node.getValue(), context),
+                    node.getOperator().getValue(),
+                    process(node.getMin(), context),
+                    process(node.getMax(), context));
+        }
+
         @Override
         protected String visitIdentifier(Identifier node, Void context)
         {
@@ -81,5 +91,11 @@ protected String visitStringLiteral(StringLiteral node, Void context)
         {
             return "'" + node.getValue().replace("'", "''") + "'";
         }
+
+        @Override
+        protected String visitNullLiteral(NullLiteral node, Void context)
+        {
+            return "NULL";
+        }
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionParser.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionParser.java
index e25330e4684c..f426d63e6a70 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionParser.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionParser.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.deltalake.expression;
 
 import com.google.common.annotations.VisibleForTesting;
-import io.trino.spi.TrinoException;
+import org.antlr.v4.runtime.ANTLRErrorListener;
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
@@ -22,16 +22,14 @@
 import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.Recognizer;
 import org.antlr.v4.runtime.atn.PredictionMode;
-import org.antlr.v4.runtime.misc.ParseCancellationException;
 
 import java.util.function.Function;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 
 public final class SparkExpressionParser
 {
-    private static final BaseErrorListener ERROR_LISTENER = new BaseErrorListener()
+    private static final ANTLRErrorListener ERROR_LISTENER = new BaseErrorListener()
     {
         @Override
         public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String message, RecognitionException e)
@@ -44,13 +42,8 @@ private SparkExpressionParser() {}
 
     public static String toTrinoExpression(String sparkExpression)
     {
-        try {
-            SparkExpression expression = createExpression(sparkExpression);
-            return SparkExpressionConverter.toTrinoExpression(expression);
-        }
-        catch (ParsingException e) {
-            throw new TrinoException(NOT_SUPPORTED, "Unsupported Spark expression: " + sparkExpression, e);
-        }
+        SparkExpression expression = createExpression(sparkExpression);
+        return SparkExpressionConverter.toTrinoExpression(expression);
     }
 
     @VisibleForTesting
@@ -67,7 +60,7 @@ static SparkExpression createExpression(String expression)
     private static Object invokeParser(String input, Function<SparkExpressionBaseParser, ParserRuleContext> parseFunction)
     {
         try {
-            SparkExpressionBaseLexer lexer = new SparkExpressionBaseLexer(new CaseInsensitiveStream(CharStreams.fromString(input)));
+            SparkExpressionBaseLexer lexer = new SparkExpressionBaseLexer(CharStreams.fromString(input));
             CommonTokenStream tokenStream = new CommonTokenStream(lexer);
             SparkExpressionBaseParser parser = new SparkExpressionBaseParser(tokenStream);
 
@@ -83,7 +76,7 @@ private static Object invokeParser(String input, Function<SparkExpressionBasePar
                 parser.getInterpreter().setPredictionMode(PredictionMode.SLL);
                 tree = parseFunction.apply(parser);
             }
-            catch (ParseCancellationException ex) {
+            catch (ParsingException ex) {
                 // if we fail, parse with LL mode
                 tokenStream.seek(0); // rewind input stream
                 parser.reset();
@@ -94,7 +87,7 @@ private static Object invokeParser(String input, Function<SparkExpressionBasePar
             return new SparkExpressionBuilder().visit(tree);
         }
         catch (StackOverflowError e) {
-            throw new IllegalArgumentException("expression is too large (stack overflow while parsing)");
+            throw new ParsingException("expression is too large (stack overflow while parsing)");
         }
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionTreeVisitor.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionTreeVisitor.java
index eb80af1f4b25..b10c1f6f5246 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionTreeVisitor.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionTreeVisitor.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.deltalake.expression;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 public abstract class SparkExpressionTreeVisitor<R, C>
 {
@@ -29,6 +29,11 @@ protected R visitComparisonExpression(ComparisonExpression node, C context)
         return visitExpression(node, context);
     }
 
+    protected R visitBetweenExpression(BetweenPredicate node, C context)
+    {
+        return visitExpression(node, context);
+    }
+
     protected R visitLogicalExpression(LogicalExpression node, C context)
     {
         return visitExpression(node, context);
@@ -63,4 +68,9 @@ protected R visitStringLiteral(StringLiteral node, C context)
     {
         return visitLiteral(node, context);
     }
+
+    protected R visitNullLiteral(NullLiteral node, C context)
+    {
+        return visitLiteral(node, context);
+    }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesFileType.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesFileType.java
new file mode 100644
index 000000000000..ca28b16470fd
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesFileType.java
@@ -0,0 +1,20 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.functions.tablechanges;
+
+public enum TableChangesFileType
+{
+    DATA_FILE,
+    CDF_FILE,
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesFunction.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesFunction.java
new file mode 100644
index 000000000000..56cc9849ffb0
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesFunction.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.functions.tablechanges;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.slice.Slice;
+import io.trino.plugin.deltalake.CorruptedDeltaLakeTableHandle;
+import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
+import io.trino.plugin.deltalake.DeltaLakeMetadata;
+import io.trino.plugin.deltalake.DeltaLakeMetadataFactory;
+import io.trino.plugin.deltalake.DeltaLakeTableHandle;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorAccessControl;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorTableHandle;
+import io.trino.spi.connector.ConnectorTransactionHandle;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.function.table.AbstractConnectorTableFunction;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.ScalarArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.plugin.base.util.Functions.checkFunctionArgument;
+import static io.trino.plugin.deltalake.DeltaLakeColumnType.SYNTHESIZED;
+import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
+import static io.trino.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.lang.String.format;
+import static java.util.Locale.ENGLISH;
+import static java.util.Objects.requireNonNull;
+
+public class TableChangesFunction
+        extends AbstractConnectorTableFunction
+{
+    private static final String SCHEMA_NAME = "system";
+    private static final String NAME = "table_changes";
+    public static final String SCHEMA_NAME_ARGUMENT = "SCHEMA_NAME";
+    private static final String TABLE_NAME_ARGUMENT = "TABLE_NAME";
+    private static final String SINCE_VERSION_ARGUMENT = "SINCE_VERSION";
+    private static final String CHANGE_TYPE_COLUMN_NAME = "_change_type";
+    private static final String COMMIT_VERSION_COLUMN_NAME = "_commit_version";
+    private static final String COMMIT_TIMESTAMP_COLUMN_NAME = "_commit_timestamp";
+
+    private final DeltaLakeMetadataFactory deltaLakeMetadataFactory;
+
+    public TableChangesFunction(DeltaLakeMetadataFactory deltaLakeMetadataFactory)
+    {
+        super(
+                SCHEMA_NAME,
+                NAME,
+                ImmutableList.of(
+                        ScalarArgumentSpecification.builder().name(SCHEMA_NAME_ARGUMENT).type(VARCHAR).build(),
+                        ScalarArgumentSpecification.builder().name(TABLE_NAME_ARGUMENT).type(VARCHAR).build(),
+                        ScalarArgumentSpecification.builder().name(SINCE_VERSION_ARGUMENT).type(BIGINT).defaultValue(null).build()),
+                GENERIC_TABLE);
+        this.deltaLakeMetadataFactory = requireNonNull(deltaLakeMetadataFactory, "deltaLakeMetadataFactory is null");
+    }
+
+    @Override
+    public TableFunctionAnalysis analyze(
+            ConnectorSession session,
+            ConnectorTransactionHandle transaction,
+            Map<String, Argument> arguments,
+            ConnectorAccessControl accessControl)
+    {
+        ScalarArgument schemaNameArgument = (ScalarArgument) arguments.get(SCHEMA_NAME_ARGUMENT);
+        checkFunctionArgument(schemaNameArgument.getValue() != null, "schema_name cannot be null");
+        String schemaName = ((Slice) schemaNameArgument.getValue()).toStringUtf8();
+
+        ScalarArgument tableNameArgument = (ScalarArgument) arguments.get(TABLE_NAME_ARGUMENT);
+        checkFunctionArgument(tableNameArgument.getValue() != null, "table_name value for function table_changes() cannot be null");
+        String tableName = ((Slice) tableNameArgument.getValue()).toStringUtf8();
+
+        ScalarArgument sinceVersionArgument = (ScalarArgument) arguments.get(SINCE_VERSION_ARGUMENT);
+
+        Object sinceVersionValue = sinceVersionArgument.getValue();
+        long sinceVersion = -1; // -1 to start from 0 when since_version is not provided
+        if (sinceVersionValue != null) {
+            sinceVersion = (long) sinceVersionValue;
+            checkFunctionArgument(sinceVersion >= 0, "Invalid value of since_version: %s. It must not be negative.", sinceVersion);
+        }
+        long firstReadVersion = sinceVersion + 1; // +1 to ensure that the since_version is exclusive; may overflow
+
+        DeltaLakeMetadata deltaLakeMetadata = deltaLakeMetadataFactory.create(session.getIdentity());
+        SchemaTableName schemaTableName = new SchemaTableName(schemaName, tableName);
+        ConnectorTableHandle connectorTableHandle = deltaLakeMetadata.getTableHandle(session, schemaTableName);
+        if (connectorTableHandle == null) {
+            throw new TableNotFoundException(schemaTableName);
+        }
+        if (connectorTableHandle instanceof CorruptedDeltaLakeTableHandle corruptedTableHandle) {
+            throw corruptedTableHandle.createException();
+        }
+        DeltaLakeTableHandle tableHandle = (DeltaLakeTableHandle) connectorTableHandle;
+
+        if (sinceVersion > tableHandle.getReadVersion()) {
+            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format("since_version: %d is higher then current table version: %d", sinceVersion, tableHandle.getReadVersion()));
+        }
+        List<DeltaLakeColumnHandle> columnHandles = deltaLakeMetadata.getColumnHandles(session, tableHandle)
+                .values().stream()
+                .map(DeltaLakeColumnHandle.class::cast)
+                .filter(column -> column.getColumnType() != SYNTHESIZED)
+                .collect(toImmutableList());
+        accessControl.checkCanSelectFromColumns(null, schemaTableName, columnHandles.stream()
+                // Lowercase column names because users don't know the original names
+                .map(column -> column.getColumnName().toLowerCase(ENGLISH))
+                .collect(toImmutableSet()));
+
+        ImmutableList.Builder<Descriptor.Field> outputFields = ImmutableList.builder();
+        columnHandles.stream()
+                .map(columnHandle -> new Descriptor.Field(columnHandle.getColumnName(), Optional.of(columnHandle.getType())))
+                .forEach(outputFields::add);
+
+        // add at the end to follow Delta Lake convention
+        outputFields.add(new Descriptor.Field(CHANGE_TYPE_COLUMN_NAME, Optional.of(VARCHAR)));
+        outputFields.add(new Descriptor.Field(COMMIT_VERSION_COLUMN_NAME, Optional.of(BIGINT)));
+        outputFields.add(new Descriptor.Field(COMMIT_TIMESTAMP_COLUMN_NAME, Optional.of(TIMESTAMP_TZ_MILLIS)));
+
+        return TableFunctionAnalysis.builder()
+                .handle(new TableChangesTableFunctionHandle(schemaTableName, firstReadVersion, tableHandle.getReadVersion(), tableHandle.getLocation(), columnHandles))
+                .returnedType(new Descriptor(outputFields.build()))
+                .build();
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesFunctionProcessor.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesFunctionProcessor.java
new file mode 100644
index 000000000000..d5cf1f482538
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesFunctionProcessor.java
@@ -0,0 +1,222 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.functions.tablechanges;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.parquet.ParquetReaderOptions;
+import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
+import io.trino.plugin.deltalake.DeltaLakePageSource;
+import io.trino.plugin.hive.FileFormatDataSourceStats;
+import io.trino.plugin.hive.ReaderPageSource;
+import io.trino.plugin.hive.parquet.ParquetPageSourceFactory;
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.table.TableFunctionProcessorState;
+import io.trino.spi.function.table.TableFunctionSplitProcessor;
+import io.trino.spi.predicate.TupleDomain;
+import org.joda.time.DateTimeZone;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.plugin.deltalake.DeltaLakeCdfPageSink.CHANGE_TYPE_COLUMN_NAME;
+import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
+import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getParquetMaxReadBlockRowCount;
+import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getParquetMaxReadBlockSize;
+import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isParquetUseColumnIndex;
+import static io.trino.plugin.deltalake.functions.tablechanges.TableChangesFileType.CDF_FILE;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Finished.FINISHED;
+import static io.trino.spi.predicate.Utils.nativeValueToBlock;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
+import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
+import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.util.Objects.requireNonNull;
+
+public class TableChangesFunctionProcessor
+        implements TableFunctionSplitProcessor
+{
+    private static final int NUMBER_OF_ADDITIONAL_COLUMNS_FOR_CDF_FILE = 2;
+    private static final int NUMBER_OF_ADDITIONAL_COLUMNS_FOR_DATA_FILE = 3;
+
+    private static final Page EMPTY_PAGE = new Page(0);
+
+    private final TableChangesFileType fileType;
+    private final DeltaLakePageSource deltaLakePageSource;
+    private final Block currentVersionAsBlock;
+    private final Block currentVersionCommitTimestampAsBlock;
+
+    public TableChangesFunctionProcessor(
+            ConnectorSession session,
+            TrinoFileSystemFactory fileSystemFactory,
+            DateTimeZone parquetDateTimeZone,
+            int domainCompactionThreshold,
+            FileFormatDataSourceStats fileFormatDataSourceStats,
+            ParquetReaderOptions parquetReaderOptions,
+            TableChangesTableFunctionHandle handle,
+            TableChangesSplit tableChangesSplit)
+    {
+        requireNonNull(session, "session is null");
+        requireNonNull(fileSystemFactory, "fileSystemFactory is null");
+        requireNonNull(parquetDateTimeZone, "parquetDateTimeZone is null");
+        requireNonNull(fileFormatDataSourceStats, "fileFormatDataSourceStats is null");
+        requireNonNull(parquetReaderOptions, "parquetReaderOptions is null");
+        requireNonNull(handle, "handle is null");
+        requireNonNull(tableChangesSplit, "tableChangesSplit is null");
+
+        this.fileType = tableChangesSplit.fileType();
+        this.deltaLakePageSource = createDeltaLakePageSource(
+                session,
+                fileSystemFactory,
+                parquetDateTimeZone,
+                domainCompactionThreshold,
+                fileFormatDataSourceStats,
+                parquetReaderOptions,
+                handle,
+                tableChangesSplit);
+        this.currentVersionAsBlock = nativeValueToBlock(BIGINT, tableChangesSplit.currentVersion());
+        this.currentVersionCommitTimestampAsBlock = nativeValueToBlock(
+                TIMESTAMP_TZ_MILLIS,
+                packDateTimeWithZone(tableChangesSplit.currentVersionCommitTimestamp(), UTC_KEY));
+    }
+
+    @Override
+    public TableFunctionProcessorState process()
+    {
+        if (fileType == CDF_FILE) {
+            return processCdfFile();
+        }
+        return processDataFile();
+    }
+
+    private TableFunctionProcessorState processCdfFile()
+    {
+        Page page = deltaLakePageSource.getNextPage();
+        if (page != null) {
+            int filePageColumns = page.getChannelCount();
+            Block[] resultBlock = new Block[filePageColumns + NUMBER_OF_ADDITIONAL_COLUMNS_FOR_CDF_FILE];
+            for (int i = 0; i < filePageColumns; i++) {
+                resultBlock[i] = page.getBlock(i);
+            }
+            resultBlock[filePageColumns] = RunLengthEncodedBlock.create(
+                    currentVersionAsBlock, page.getPositionCount());
+            resultBlock[filePageColumns + 1] = RunLengthEncodedBlock.create(
+                    currentVersionCommitTimestampAsBlock, page.getPositionCount());
+            return TableFunctionProcessorState.Processed.produced(new Page(page.getPositionCount(), resultBlock));
+        }
+        if (deltaLakePageSource.isFinished()) {
+            return FINISHED;
+        }
+        return TableFunctionProcessorState.Processed.produced(EMPTY_PAGE);
+    }
+
+    private TableFunctionProcessorState processDataFile()
+    {
+        Page page = deltaLakePageSource.getNextPage();
+        if (page != null) {
+            int filePageColumns = page.getChannelCount();
+            Block[] blocks = new Block[filePageColumns + NUMBER_OF_ADDITIONAL_COLUMNS_FOR_DATA_FILE];
+            for (int i = 0; i < filePageColumns; i++) {
+                blocks[i] = page.getBlock(i);
+            }
+            blocks[filePageColumns] = RunLengthEncodedBlock.create(
+                    nativeValueToBlock(VARCHAR, utf8Slice("insert")), page.getPositionCount());
+            blocks[filePageColumns + 1] = RunLengthEncodedBlock.create(
+                    currentVersionAsBlock, page.getPositionCount());
+            blocks[filePageColumns + 2] = RunLengthEncodedBlock.create(
+                    currentVersionCommitTimestampAsBlock, page.getPositionCount());
+            return TableFunctionProcessorState.Processed.produced(new Page(page.getPositionCount(), blocks));
+        }
+        if (deltaLakePageSource.isFinished()) {
+            return FINISHED;
+        }
+        return TableFunctionProcessorState.Processed.produced(EMPTY_PAGE);
+    }
+
+    private static DeltaLakePageSource createDeltaLakePageSource(
+            ConnectorSession session,
+            TrinoFileSystemFactory fileSystemFactory,
+            DateTimeZone parquetDateTimeZone,
+            int domainCompactionThreshold,
+            FileFormatDataSourceStats fileFormatDataSourceStats,
+            ParquetReaderOptions parquetReaderOptions,
+            TableChangesTableFunctionHandle handle,
+            TableChangesSplit split)
+    {
+        TrinoFileSystem fileSystem = fileSystemFactory.create(session);
+        TrinoInputFile inputFile = fileSystem.newInputFile(Location.of(split.path()), split.fileSize());
+        Map<String, Optional<String>> partitionKeys = split.partitionKeys();
+
+        parquetReaderOptions = parquetReaderOptions
+                .withMaxReadBlockSize(getParquetMaxReadBlockSize(session))
+                .withMaxReadBlockRowCount(getParquetMaxReadBlockRowCount(session))
+                .withUseColumnIndex(isParquetUseColumnIndex(session));
+
+        List<DeltaLakeColumnHandle> splitColumns = switch (split.fileType()) {
+            case CDF_FILE -> ImmutableList.<DeltaLakeColumnHandle>builder().addAll(handle.columns())
+                    .add(new DeltaLakeColumnHandle(
+                            CHANGE_TYPE_COLUMN_NAME,
+                            VARCHAR,
+                            OptionalInt.empty(),
+                            CHANGE_TYPE_COLUMN_NAME,
+                            VARCHAR,
+                            REGULAR,
+                            Optional.empty()))
+                    .build();
+            case DATA_FILE -> handle.columns();
+        };
+
+        ReaderPageSource pageSource = ParquetPageSourceFactory.createPageSource(
+                inputFile,
+                0,
+                split.fileSize(),
+                splitColumns.stream().filter(column -> column.getColumnType() == REGULAR).map(DeltaLakeColumnHandle::toHiveColumnHandle).collect(toImmutableList()),
+                ImmutableList.of(TupleDomain.all()), // TODO add predicate pushdown https://github.com/trinodb/trino/issues/16990
+                true,
+                parquetDateTimeZone,
+                fileFormatDataSourceStats,
+                parquetReaderOptions,
+                Optional.empty(),
+                domainCompactionThreshold,
+                OptionalLong.empty());
+
+        verify(pageSource.getReaderColumns().isEmpty(), "Unexpected reader columns: %s", pageSource.getReaderColumns().orElse(null));
+
+        return new DeltaLakePageSource(
+                splitColumns,
+                ImmutableSet.of(),
+                partitionKeys,
+                Optional.empty(),
+                pageSource.get(),
+                Optional.empty(),
+                split.path(),
+                split.fileSize(),
+                0L,
+                Optional::empty);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesFunctionProvider.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesFunctionProvider.java
new file mode 100644
index 000000000000..07460bec8231
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesFunctionProvider.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.functions.tablechanges;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorTableFunction;
+import io.trino.plugin.deltalake.DeltaLakeMetadataFactory;
+import io.trino.spi.function.table.ConnectorTableFunction;
+
+import static java.util.Objects.requireNonNull;
+
+public class TableChangesFunctionProvider
+        implements Provider<ConnectorTableFunction>
+{
+    private final DeltaLakeMetadataFactory deltaLakeMetadataFactory;
+
+    @Inject
+    public TableChangesFunctionProvider(DeltaLakeMetadataFactory deltaLakeMetadataFactory)
+    {
+        this.deltaLakeMetadataFactory = requireNonNull(deltaLakeMetadataFactory, "deltaLakeMetadataFactory is null");
+    }
+
+    @Override
+    public ConnectorTableFunction get()
+    {
+        return new ClassLoaderSafeConnectorTableFunction(
+                new TableChangesFunction(deltaLakeMetadataFactory),
+                getClass().getClassLoader());
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesProcessorProvider.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesProcessorProvider.java
new file mode 100644
index 000000000000..5a250e87f73e
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesProcessorProvider.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.functions.tablechanges;
+
+import com.google.inject.Inject;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.parquet.ParquetReaderOptions;
+import io.trino.plugin.deltalake.DeltaLakeConfig;
+import io.trino.plugin.hive.FileFormatDataSourceStats;
+import io.trino.plugin.hive.parquet.ParquetReaderConfig;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorSplit;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
+import io.trino.spi.function.table.TableFunctionSplitProcessor;
+import org.joda.time.DateTimeZone;
+
+import static java.util.Objects.requireNonNull;
+
+public class TableChangesProcessorProvider
+        implements TableFunctionProcessorProvider
+{
+    private final TrinoFileSystemFactory fileSystemFactory;
+    private final DateTimeZone parquetDateTimeZone;
+    private final int domainCompactionThreshold;
+    private final FileFormatDataSourceStats fileFormatDataSourceStats;
+    private final ParquetReaderOptions parquetReaderOptions;
+
+    @Inject
+    public TableChangesProcessorProvider(
+            TrinoFileSystemFactory fileSystemFactory,
+            DeltaLakeConfig deltaLakeConfig,
+            FileFormatDataSourceStats fileFormatDataSourceStats,
+            ParquetReaderConfig parquetReaderConfig)
+    {
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
+        this.parquetDateTimeZone = deltaLakeConfig.getParquetDateTimeZone();
+        this.domainCompactionThreshold = deltaLakeConfig.getDomainCompactionThreshold();
+        this.fileFormatDataSourceStats = requireNonNull(fileFormatDataSourceStats, "fileFormatDataSourceStats is null");
+        this.parquetReaderOptions = parquetReaderConfig.toParquetReaderOptions();
+    }
+
+    @Override
+    public TableFunctionSplitProcessor getSplitProcessor(ConnectorSession session, ConnectorTableFunctionHandle handle, ConnectorSplit split)
+    {
+        return new TableChangesFunctionProcessor(
+                session,
+                fileSystemFactory,
+                parquetDateTimeZone,
+                domainCompactionThreshold,
+                fileFormatDataSourceStats,
+                parquetReaderOptions,
+                (TableChangesTableFunctionHandle) handle,
+                (TableChangesSplit) split);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesSplit.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesSplit.java
new file mode 100644
index 000000000000..bdc85d6e8d5a
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesSplit.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.functions.tablechanges;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.airlift.slice.SizeOf;
+import io.trino.spi.HostAddress;
+import io.trino.spi.SplitWeight;
+import io.trino.spi.connector.ConnectorSplit;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static io.airlift.slice.SizeOf.estimatedSizeOf;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+
+public record TableChangesSplit(
+        String path,
+        long fileSize,
+        Map<String, Optional<String>> partitionKeys,
+        long currentVersionCommitTimestamp,
+        TableChangesFileType fileType,
+        long currentVersion)
+        implements ConnectorSplit
+{
+    private static final int INSTANCE_SIZE = instanceSize(TableChangesSplit.class);
+
+    @JsonIgnore
+    @Override
+    public boolean isRemotelyAccessible()
+    {
+        return true;
+    }
+
+    @JsonIgnore
+    @Override
+    public List<HostAddress> getAddresses()
+    {
+        return ImmutableList.of();
+    }
+
+    @JsonIgnore
+    @Override
+    public Object getInfo()
+    {
+        return ImmutableMap.builder()
+                .put("path", path)
+                .put("length", fileSize)
+                .buildOrThrow();
+    }
+
+    @JsonIgnore
+    @Override
+    public SplitWeight getSplitWeight()
+    {
+        return SplitWeight.standard();
+    }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE
+                + estimatedSizeOf(path)
+                + estimatedSizeOf(partitionKeys, SizeOf::estimatedSizeOf, value -> sizeOf(value, SizeOf::estimatedSizeOf));
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesSplitSource.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesSplitSource.java
new file mode 100644
index 000000000000..a1d9c0da30d8
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesSplitSource.java
@@ -0,0 +1,170 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.functions.tablechanges;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.filesystem.Locations;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
+import io.trino.plugin.deltalake.transactionlog.CdcEntry;
+import io.trino.plugin.deltalake.transactionlog.CommitInfoEntry;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorSplit;
+import io.trino.spi.connector.ConnectorSplitSource;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.LongStream;
+import java.util.stream.Stream;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_BAD_DATA;
+import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_FILESYSTEM_ERROR;
+import static io.trino.plugin.deltalake.functions.tablechanges.TableChangesFileType.CDF_FILE;
+import static io.trino.plugin.deltalake.functions.tablechanges.TableChangesFileType.DATA_FILE;
+import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogDir;
+import static io.trino.plugin.deltalake.transactionlog.checkpoint.TransactionLogTail.getEntriesFromJson;
+import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
+import static java.lang.String.format;
+
+public class TableChangesSplitSource
+        implements ConnectorSplitSource
+{
+    private final String tableLocation;
+    private final Iterator<ConnectorSplit> splits;
+
+    public TableChangesSplitSource(
+            ConnectorSession session,
+            TrinoFileSystemFactory fileSystemFactory,
+            TableChangesTableFunctionHandle functionHandle)
+    {
+        tableLocation = functionHandle.tableLocation();
+        splits = prepareSplits(
+                functionHandle.firstReadVersion(),
+                functionHandle.tableReadVersion(),
+                getTransactionLogDir(functionHandle.tableLocation()),
+                fileSystemFactory.create(session))
+                .iterator();
+    }
+
+    private Stream<ConnectorSplit> prepareSplits(long currentVersion, long tableReadVersion, String transactionLogDir, TrinoFileSystem fileSystem)
+    {
+        return LongStream.range(currentVersion, tableReadVersion + 1)
+                .boxed()
+                .flatMap(version -> {
+                    try {
+                        List<DeltaLakeTransactionLogEntry> entries = getEntriesFromJson(version, transactionLogDir, fileSystem)
+                                .orElseThrow(() -> new TrinoException(DELTA_LAKE_BAD_DATA, "Delta Lake log entries are missing for version " + version));
+                        if (entries.isEmpty()) {
+                            return ImmutableList.<ConnectorSplit>of().stream();
+                        }
+                        List<CommitInfoEntry> commitInfoEntries = entries.stream()
+                                .map(DeltaLakeTransactionLogEntry::getCommitInfo)
+                                .filter(Objects::nonNull)
+                                .collect(toImmutableList());
+                        if (commitInfoEntries.size() != 1) {
+                            throw new TrinoException(DELTA_LAKE_BAD_DATA, "There should be exactly 1 commitInfo present in a metadata file");
+                        }
+                        CommitInfoEntry commitInfo = getOnlyElement(commitInfoEntries);
+
+                        List<ConnectorSplit> splits = new ArrayList<>();
+                        boolean containsCdcEntry = false;
+                        boolean containsRemoveEntry = false;
+                        for (DeltaLakeTransactionLogEntry entry : entries) {
+                            CdcEntry cdcEntry = entry.getCDC();
+                            if (cdcEntry != null) {
+                                containsCdcEntry = true;
+                                splits.add(mapToDeltaLakeTableChangesSplit(
+                                        commitInfo,
+                                        CDF_FILE,
+                                        cdcEntry.getSize(),
+                                        cdcEntry.getPath(),
+                                        cdcEntry.getCanonicalPartitionValues()));
+                            }
+                            if (entry.getRemove() != null && entry.getRemove().isDataChange()) {
+                                containsRemoveEntry = true;
+                            }
+                        }
+                        if (containsRemoveEntry && !containsCdcEntry) {
+                            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format("Change Data Feed is not enabled at version %d. Version contains 'remove' entries without 'cdc' entries", version));
+                        }
+                        if (!containsRemoveEntry) {
+                            for (DeltaLakeTransactionLogEntry entry : entries) {
+                                if (entry.getAdd() != null && entry.getAdd().isDataChange()) {
+                                    AddFileEntry addEntry = entry.getAdd();
+                                    splits.add(mapToDeltaLakeTableChangesSplit(
+                                            commitInfo,
+                                            DATA_FILE,
+                                            addEntry.getSize(),
+                                            addEntry.getPath(),
+                                            addEntry.getCanonicalPartitionValues()));
+                                }
+                            }
+                        }
+                        return splits.stream();
+                    }
+                    catch (IOException e) {
+                        throw new TrinoException(DELTA_LAKE_FILESYSTEM_ERROR, "Failed to access table metadata", e);
+                    }
+                });
+    }
+
+    @Override
+    public CompletableFuture<ConnectorSplitBatch> getNextBatch(int maxSize)
+    {
+        ImmutableList.Builder<ConnectorSplit> result = ImmutableList.builder();
+        int i = 0;
+        while (i < maxSize && splits.hasNext()) {
+            result.add(splits.next());
+            i++;
+        }
+        return CompletableFuture.completedFuture(new ConnectorSplitBatch(result.build(), isFinished()));
+    }
+
+    private TableChangesSplit mapToDeltaLakeTableChangesSplit(
+            CommitInfoEntry commitInfoEntry,
+            TableChangesFileType source,
+            long length,
+            String entryPath,
+            Map<String, Optional<String>> canonicalPartitionValues)
+    {
+        String path = Locations.appendPath(tableLocation, entryPath);
+        return new TableChangesSplit(
+                path,
+                length,
+                canonicalPartitionValues,
+                commitInfoEntry.getTimestamp(),
+                source,
+                commitInfoEntry.getVersion());
+    }
+
+    @Override
+    public void close() {}
+
+    @Override
+    public boolean isFinished()
+    {
+        return !splits.hasNext();
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesTableFunctionHandle.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesTableFunctionHandle.java
new file mode 100644
index 000000000000..61e96abb61f8
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/functions/tablechanges/TableChangesTableFunctionHandle.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.functions.tablechanges;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+
+import java.util.List;
+
+import static java.util.Objects.requireNonNull;
+
+public record TableChangesTableFunctionHandle(
+        SchemaTableName schemaTableName,
+        long firstReadVersion,
+        long tableReadVersion,
+        String tableLocation,
+        List<DeltaLakeColumnHandle> columns) implements ConnectorTableFunctionHandle
+{
+    public TableChangesTableFunctionHandle {
+        requireNonNull(schemaTableName, "schemaTableName is null");
+        requireNonNull(tableLocation, "tableLocation is null");
+        columns = ImmutableList.copyOf(columns);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/DeltaLakeMetastore.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/DeltaLakeMetastore.java
index 29abd3174dbb..598a10757cdf 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/DeltaLakeMetastore.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/DeltaLakeMetastore.java
@@ -13,18 +13,11 @@
  */
 package io.trino.plugin.deltalake.metastore;
 
-import io.trino.plugin.deltalake.DeltaLakeTableHandle;
-import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
-import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
-import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
-import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
 import io.trino.plugin.hive.metastore.Database;
-import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.PrincipalPrivileges;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.statistics.TableStatistics;
 
 import java.util.List;
 import java.util.Optional;
@@ -37,7 +30,9 @@ public interface DeltaLakeMetastore
 
     List<String> getAllTables(String databaseName);
 
-    Optional<Table> getTable(String databaseName, String tableName);
+    Optional<Table> getRawMetastoreTable(String databaseName, String tableName);
+
+    Optional<DeltaMetastoreTable> getTable(String databaseName, String tableName);
 
     void createDatabase(Database database);
 
@@ -45,21 +40,7 @@ public interface DeltaLakeMetastore
 
     void createTable(ConnectorSession session, Table table, PrincipalPrivileges principalPrivileges);
 
-    void dropTable(ConnectorSession session, String databaseName, String tableName, boolean deleteData);
+    void dropTable(ConnectorSession session, SchemaTableName schemaTableName, String tableLocation, boolean deleteData);
 
     void renameTable(ConnectorSession session, SchemaTableName from, SchemaTableName to);
-
-    MetadataEntry getMetadata(TableSnapshot tableSnapshot, ConnectorSession session);
-
-    ProtocolEntry getProtocol(ConnectorSession session, TableSnapshot table);
-
-    String getTableLocation(SchemaTableName table);
-
-    TableSnapshot getSnapshot(SchemaTableName table, ConnectorSession session);
-
-    List<AddFileEntry> getValidDataFiles(SchemaTableName table, ConnectorSession session);
-
-    TableStatistics getTableStatistics(ConnectorSession session, DeltaLakeTableHandle tableHandle);
-
-    HiveMetastore getHiveMetastore();
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/DeltaMetastoreTable.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/DeltaMetastoreTable.java
new file mode 100644
index 000000000000..efacc1a30788
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/DeltaMetastoreTable.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.metastore;
+
+import io.trino.spi.connector.SchemaTableName;
+
+import static java.util.Objects.requireNonNull;
+
+public record DeltaMetastoreTable(
+        SchemaTableName schemaTableName,
+        boolean managed,
+        String location)
+{
+    public DeltaMetastoreTable
+    {
+        requireNonNull(schemaTableName, "schemaTableName is null");
+        requireNonNull(location, "location is null");
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/HiveMetastoreBackedDeltaLakeMetastore.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/HiveMetastoreBackedDeltaLakeMetastore.java
index 0bde3bb82b7e..df3a1c1a8f15 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/HiveMetastoreBackedDeltaLakeMetastore.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/HiveMetastoreBackedDeltaLakeMetastore.java
@@ -13,20 +13,6 @@
  */
 package io.trino.plugin.deltalake.metastore;
 
-import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
-import io.trino.plugin.deltalake.DeltaLakeColumnMetadata;
-import io.trino.plugin.deltalake.DeltaLakeTableHandle;
-import io.trino.plugin.deltalake.statistics.CachingExtendedStatisticsAccess;
-import io.trino.plugin.deltalake.statistics.DeltaLakeColumnStatistics;
-import io.trino.plugin.deltalake.statistics.ExtendedStatistics;
-import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
-import io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport;
-import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
-import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
-import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
-import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
-import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeFileStatistics;
 import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.PrincipalPrivileges;
@@ -34,39 +20,15 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.connector.TableNotFoundException;
-import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.statistics.ColumnStatistics;
-import io.trino.spi.statistics.DoubleRange;
-import io.trino.spi.statistics.Estimate;
-import io.trino.spi.statistics.TableStatistics;
-import io.trino.spi.type.TypeManager;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.OptionalDouble;
-import java.util.Set;
 
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static io.trino.plugin.deltalake.DeltaLakeColumnType.PARTITION_KEY;
-import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
-import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_FILESYSTEM_ERROR;
 import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA;
-import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_TABLE;
 import static io.trino.plugin.deltalake.DeltaLakeMetadata.PATH_PROPERTY;
-import static io.trino.plugin.deltalake.DeltaLakeMetadata.createStatisticsPredicate;
-import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isExtendedStatisticsEnabled;
-import static io.trino.plugin.deltalake.DeltaLakeSplitManager.partitionMatchesPredicate;
-import static io.trino.plugin.hive.ViewReaderUtil.isHiveOrPrestoView;
-import static io.trino.spi.statistics.StatsUtil.toStatsRepresentation;
-import static java.lang.Double.NEGATIVE_INFINITY;
-import static java.lang.Double.NaN;
-import static java.lang.Double.POSITIVE_INFINITY;
+import static io.trino.plugin.hive.TableType.MANAGED_TABLE;
+import static io.trino.plugin.hive.ViewReaderUtil.isSomeKindOfAView;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
@@ -77,23 +39,10 @@ public class HiveMetastoreBackedDeltaLakeMetastore
     public static final String TABLE_PROVIDER_VALUE = "DELTA";
 
     private final HiveMetastore delegate;
-    private final TransactionLogAccess transactionLogAccess;
-    private final TypeManager typeManager;
-    private final CachingExtendedStatisticsAccess statisticsAccess;
-    private final TrinoFileSystemFactory fileSystemFactory;
 
-    public HiveMetastoreBackedDeltaLakeMetastore(
-            HiveMetastore delegate,
-            TransactionLogAccess transactionLogAccess,
-            TypeManager typeManager,
-            CachingExtendedStatisticsAccess statisticsAccess,
-            TrinoFileSystemFactory fileSystemFactory)
+    public HiveMetastoreBackedDeltaLakeMetastore(HiveMetastore delegate)
     {
         this.delegate = requireNonNull(delegate, "delegate is null");
-        this.transactionLogAccess = requireNonNull(transactionLogAccess, "transactionLogSupport is null");
-        this.typeManager = requireNonNull(typeManager, "typeManager is null");
-        this.statisticsAccess = requireNonNull(statisticsAccess, "statisticsAccess is null");
-        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
     }
 
     @Override
@@ -118,17 +67,27 @@ public List<String> getAllTables(String databaseName)
     }
 
     @Override
-    public Optional<Table> getTable(String databaseName, String tableName)
+    public Optional<Table> getRawMetastoreTable(String databaseName, String tableName)
     {
-        Optional<Table> candidate = delegate.getTable(databaseName, tableName);
-        candidate.ifPresent(HiveMetastoreBackedDeltaLakeMetastore::verifyDeltaLakeTable);
-        return candidate;
+        return delegate.getTable(databaseName, tableName);
+    }
+
+    @Override
+    public Optional<DeltaMetastoreTable> getTable(String databaseName, String tableName)
+    {
+        return getRawMetastoreTable(databaseName, tableName).map(table -> {
+            verifyDeltaLakeTable(table);
+            return new DeltaMetastoreTable(
+                    new SchemaTableName(databaseName, tableName),
+                    table.getTableType().equals(MANAGED_TABLE.name()),
+                    getTableLocation(table));
+        });
     }
 
     public static void verifyDeltaLakeTable(Table table)
     {
-        if (isHiveOrPrestoView(table)) {
-            // this is a Hive view, hence not a table
+        if (isSomeKindOfAView(table)) {
+            // Looks like a view, so not a table
             throw new NotADeltaLakeTableException(table.getDatabaseName(), table.getTableName());
         }
         if (!TABLE_PROVIDER_VALUE.equalsIgnoreCase(table.getParameters().get(TABLE_PROVIDER_PROPERTY))) {
@@ -151,34 +110,13 @@ public void dropDatabase(String databaseName, boolean deleteData)
     @Override
     public void createTable(ConnectorSession session, Table table, PrincipalPrivileges principalPrivileges)
     {
-        String tableLocation = table.getStorage().getLocation();
-        statisticsAccess.invalidateCache(tableLocation);
-        transactionLogAccess.invalidateCaches(tableLocation);
-        try {
-            TableSnapshot tableSnapshot = transactionLogAccess.loadSnapshot(table.getSchemaTableName(), tableLocation, session);
-            transactionLogAccess.getMetadataEntry(tableSnapshot, session); // verify metadata exists
-        }
-        catch (IOException | RuntimeException e) {
-            throw new TrinoException(DELTA_LAKE_INVALID_TABLE, "Failed to access table location: " + tableLocation, e);
-        }
         delegate.createTable(table, principalPrivileges);
     }
 
     @Override
-    public void dropTable(ConnectorSession session, String databaseName, String tableName, boolean deleteData)
+    public void dropTable(ConnectorSession session, SchemaTableName schemaTableName, String tableLocation, boolean deleteData)
     {
-        String tableLocation = getTableLocation(new SchemaTableName(databaseName, tableName));
-        delegate.dropTable(databaseName, tableName, deleteData);
-        statisticsAccess.invalidateCache(tableLocation);
-        transactionLogAccess.invalidateCaches(tableLocation);
-        if (deleteData) {
-            try {
-                fileSystemFactory.create(session).deleteDirectory(tableLocation);
-            }
-            catch (IOException e) {
-                throw new TrinoException(DELTA_LAKE_FILESYSTEM_ERROR, format("Failed to delete directory %s of the table %s", tableLocation, tableName), e);
-            }
-        }
+        delegate.dropTable(schemaTableName.getSchemaName(), schemaTableName.getTableName(), deleteData);
     }
 
     @Override
@@ -187,28 +125,6 @@ public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTa
         delegate.renameTable(from.getSchemaName(), from.getTableName(), to.getSchemaName(), to.getTableName());
     }
 
-    @Override
-    public MetadataEntry getMetadata(TableSnapshot tableSnapshot, ConnectorSession session)
-    {
-        return transactionLogAccess.getMetadataEntry(tableSnapshot, session);
-    }
-
-    @Override
-    public ProtocolEntry getProtocol(ConnectorSession session, TableSnapshot tableSnapshot)
-    {
-        return transactionLogAccess.getProtocolEntries(tableSnapshot, session)
-                .reduce((first, second) -> second)
-                .orElseThrow(() -> new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Protocol entry not found in transaction log for table " + tableSnapshot.getTable()));
-    }
-
-    @Override
-    public String getTableLocation(SchemaTableName tableName)
-    {
-        Table table = getTable(tableName.getSchemaName(), tableName.getTableName())
-                .orElseThrow(() -> new TableNotFoundException(tableName));
-        return getTableLocation(table);
-    }
-
     public static String getTableLocation(Table table)
     {
         Map<String, String> serdeParameters = table.getStorage().getSerdeParameters();
@@ -218,198 +134,4 @@ public static String getTableLocation(Table table)
         }
         return location;
     }
-
-    @Override
-    public TableSnapshot getSnapshot(SchemaTableName table, ConnectorSession session)
-    {
-        try {
-            return transactionLogAccess.loadSnapshot(table, getTableLocation(table), session);
-        }
-        catch (NotADeltaLakeTableException e) {
-            throw e;
-        }
-        catch (IOException | RuntimeException e) {
-            throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Error getting snapshot for " + table, e);
-        }
-    }
-
-    @Override
-    public List<AddFileEntry> getValidDataFiles(SchemaTableName table, ConnectorSession session)
-    {
-        return transactionLogAccess.getActiveFiles(getSnapshot(table, session), session);
-    }
-
-    @Override
-    public TableStatistics getTableStatistics(ConnectorSession session, DeltaLakeTableHandle tableHandle)
-    {
-        TableSnapshot tableSnapshot = getSnapshot(tableHandle.getSchemaTableName(), session);
-
-        double numRecords = 0L;
-
-        MetadataEntry metadata = transactionLogAccess.getMetadataEntry(tableSnapshot, session);
-        List<DeltaLakeColumnMetadata> columnMetadata = DeltaLakeSchemaSupport.extractSchema(metadata, typeManager);
-        List<DeltaLakeColumnHandle> columns = columnMetadata.stream()
-                .map(columnMeta -> new DeltaLakeColumnHandle(
-                        columnMeta.getName(),
-                        columnMeta.getType(),
-                        columnMeta.getFieldId(),
-                        columnMeta.getPhysicalName(),
-                        columnMeta.getPhysicalColumnType(),
-                        metadata.getCanonicalPartitionColumns().contains(columnMeta.getName()) ? PARTITION_KEY : REGULAR))
-                .collect(toImmutableList());
-
-        Map<DeltaLakeColumnHandle, Double> nullCounts = new HashMap<>();
-        columns.forEach(column -> nullCounts.put(column, 0.0));
-        Map<DeltaLakeColumnHandle, Double> minValues = new HashMap<>();
-        Map<DeltaLakeColumnHandle, Double> maxValues = new HashMap<>();
-        Map<DeltaLakeColumnHandle, Set<String>> partitioningColumnsDistinctValues = new HashMap<>();
-        columns.stream()
-                .filter(column -> column.getColumnType() == PARTITION_KEY)
-                .forEach(column -> partitioningColumnsDistinctValues.put(column, new HashSet<>()));
-
-        if (tableHandle.getEnforcedPartitionConstraint().isNone() || tableHandle.getNonPartitionConstraint().isNone()) {
-            return createZeroStatistics(columns);
-        }
-
-        Set<String> predicatedColumnNames = tableHandle.getNonPartitionConstraint().getDomains().orElseThrow().keySet().stream()
-                .map(DeltaLakeColumnHandle::getName)
-                .collect(toImmutableSet());
-        List<DeltaLakeColumnMetadata> predicatedColumns = columnMetadata.stream()
-                .filter(column -> predicatedColumnNames.contains(column.getName()))
-                .collect(toImmutableList());
-
-        for (AddFileEntry addEntry : transactionLogAccess.getActiveFiles(tableSnapshot, session)) {
-            Optional<? extends DeltaLakeFileStatistics> fileStatistics = addEntry.getStats();
-            if (fileStatistics.isEmpty()) {
-                // Open source Delta Lake does not collect stats
-                return TableStatistics.empty();
-            }
-            DeltaLakeFileStatistics stats = fileStatistics.get();
-            if (!partitionMatchesPredicate(addEntry.getCanonicalPartitionValues(), tableHandle.getEnforcedPartitionConstraint().getDomains().orElseThrow())) {
-                continue;
-            }
-
-            TupleDomain<DeltaLakeColumnHandle> statisticsPredicate = createStatisticsPredicate(
-                    addEntry,
-                    predicatedColumns,
-                    tableHandle.getMetadataEntry().getCanonicalPartitionColumns());
-            if (!tableHandle.getNonPartitionConstraint().overlaps(statisticsPredicate)) {
-                continue;
-            }
-
-            if (stats.getNumRecords().isEmpty()) {
-                // Not clear if it's possible for stats to be present with no row count, but bail out if that happens
-                return TableStatistics.empty();
-            }
-            numRecords += stats.getNumRecords().get();
-            for (DeltaLakeColumnHandle column : columns) {
-                if (column.getColumnType() == PARTITION_KEY) {
-                    Optional<String> partitionValue = addEntry.getCanonicalPartitionValues().get(column.getPhysicalName());
-                    if (partitionValue.isEmpty()) {
-                        nullCounts.merge(column, (double) stats.getNumRecords().get(), Double::sum);
-                    }
-                    else {
-                        // NULL is not counted as a distinct value
-                        // Code below assumes that values returned by addEntry.getCanonicalPartitionValues() are normalized,
-                        // it may not be true in case of real, doubles, timestamps etc
-                        partitioningColumnsDistinctValues.get(column).add(partitionValue.get());
-                    }
-                }
-                else {
-                    Optional<Long> maybeNullCount = stats.getNullCount(column.getPhysicalName());
-                    if (maybeNullCount.isPresent()) {
-                        nullCounts.put(column, nullCounts.get(column) + maybeNullCount.get());
-                    }
-                    else {
-                        // If any individual file fails to report null counts, fail to calculate the total for the table
-                        nullCounts.put(column, NaN);
-                    }
-                }
-
-                // Math.min returns NaN if any operand is NaN
-                stats.getMinColumnValue(column)
-                        .map(parsedValue -> toStatsRepresentation(column.getType(), parsedValue))
-                        .filter(OptionalDouble::isPresent)
-                        .map(OptionalDouble::getAsDouble)
-                        .ifPresent(parsedValueAsDouble -> minValues.merge(column, parsedValueAsDouble, Math::min));
-
-                stats.getMaxColumnValue(column)
-                        .map(parsedValue -> toStatsRepresentation(column.getType(), parsedValue))
-                        .filter(OptionalDouble::isPresent)
-                        .map(OptionalDouble::getAsDouble)
-                        .ifPresent(parsedValueAsDouble -> maxValues.merge(column, parsedValueAsDouble, Math::max));
-            }
-        }
-
-        if (numRecords == 0) {
-            return createZeroStatistics(columns);
-        }
-
-        TableStatistics.Builder statsBuilder = new TableStatistics.Builder().setRowCount(Estimate.of(numRecords));
-
-        Optional<ExtendedStatistics> statistics = Optional.empty();
-        if (isExtendedStatisticsEnabled(session)) {
-            statistics = statisticsAccess.readExtendedStatistics(session, tableHandle.getLocation());
-        }
-
-        for (DeltaLakeColumnHandle column : columns) {
-            ColumnStatistics.Builder columnStatsBuilder = new ColumnStatistics.Builder();
-            Double nullCount = nullCounts.get(column);
-            columnStatsBuilder.setNullsFraction(nullCount.isNaN() ? Estimate.unknown() : Estimate.of(nullCount / numRecords));
-
-            Double maxValue = maxValues.get(column);
-            Double minValue = minValues.get(column);
-
-            if (isValidInRange(maxValue) && isValidInRange(minValue)) {
-                columnStatsBuilder.setRange(new DoubleRange(minValue, maxValue));
-            }
-            else if (isValidInRange(maxValue)) {
-                columnStatsBuilder.setRange(new DoubleRange(NEGATIVE_INFINITY, maxValue));
-            }
-            else if (isValidInRange(minValue)) {
-                columnStatsBuilder.setRange(new DoubleRange(minValue, POSITIVE_INFINITY));
-            }
-
-            // extend statistics with NDV
-            if (column.getColumnType() == PARTITION_KEY) {
-                columnStatsBuilder.setDistinctValuesCount(Estimate.of(partitioningColumnsDistinctValues.get(column).size()));
-            }
-            if (statistics.isPresent()) {
-                DeltaLakeColumnStatistics deltaLakeColumnStatistics = statistics.get().getColumnStatistics().get(column.getName());
-                if (deltaLakeColumnStatistics != null && column.getColumnType() != PARTITION_KEY) {
-                    deltaLakeColumnStatistics.getTotalSizeInBytes().ifPresent(size -> columnStatsBuilder.setDataSize(Estimate.of(size)));
-                    columnStatsBuilder.setDistinctValuesCount(Estimate.of(deltaLakeColumnStatistics.getNdvSummary().cardinality()));
-                }
-            }
-
-            statsBuilder.setColumnStatistics(column, columnStatsBuilder.build());
-        }
-
-        return statsBuilder.build();
-    }
-
-    private TableStatistics createZeroStatistics(List<DeltaLakeColumnHandle> columns)
-    {
-        TableStatistics.Builder statsBuilder = new TableStatistics.Builder().setRowCount(Estimate.of(0));
-        for (DeltaLakeColumnHandle column : columns) {
-            ColumnStatistics.Builder columnStatistics = ColumnStatistics.builder();
-            columnStatistics.setNullsFraction(Estimate.of(0));
-            columnStatistics.setDistinctValuesCount(Estimate.of(0));
-            statsBuilder.setColumnStatistics(column, columnStatistics.build());
-        }
-
-        return statsBuilder.build();
-    }
-
-    private boolean isValidInRange(Double d)
-    {
-        // Delta considers NaN a valid min/max value but Trino does not
-        return d != null && !d.isNaN();
-    }
-
-    @Override
-    public HiveMetastore getHiveMetastore()
-    {
-        return delegate;
-    }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/glue/DeltaLakeGlueMetastoreTableFilterProvider.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/glue/DeltaLakeGlueMetastoreTableFilterProvider.java
index b6c6771183f1..fd3e8dbd6472 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/glue/DeltaLakeGlueMetastoreTableFilterProvider.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/metastore/glue/DeltaLakeGlueMetastoreTableFilterProvider.java
@@ -14,13 +14,14 @@
 package io.trino.plugin.deltalake.metastore.glue;
 
 import com.amazonaws.services.glue.model.Table;
-import io.trino.plugin.hive.metastore.glue.DefaultGlueMetastoreTableFilterProvider;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.trino.plugin.hive.util.HiveUtil;
 
 import java.util.function.Predicate;
 
+import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableParameters;
+
 public class DeltaLakeGlueMetastoreTableFilterProvider
         implements Provider<Predicate<Table>>
 {
@@ -36,7 +37,7 @@ public DeltaLakeGlueMetastoreTableFilterProvider(DeltaLakeGlueMetastoreConfig co
     public Predicate<Table> get()
     {
         if (hideNonDeltaLakeTables) {
-            return DefaultGlueMetastoreTableFilterProvider::isDeltaLakeTable;
+            return table -> HiveUtil.isDeltaLakeTable(getTableParameters(table));
         }
         return table -> true;
     }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/DeltaTableOptimizeHandle.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/DeltaTableOptimizeHandle.java
index 839311885c5b..150d2661750a 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/DeltaTableOptimizeHandle.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/DeltaTableOptimizeHandle.java
@@ -19,6 +19,7 @@
 import io.airlift.units.DataSize;
 import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 
 import java.util.List;
 import java.util.Optional;
@@ -30,6 +31,7 @@ public class DeltaTableOptimizeHandle
         extends DeltaTableProcedureHandle
 {
     private final MetadataEntry metadataEntry;
+    private final ProtocolEntry protocolEntry;
     private final List<DeltaLakeColumnHandle> tableColumns;
     private final List<String> originalPartitionColumns;
     private final DataSize maxScannedFileSize;
@@ -39,6 +41,7 @@ public class DeltaTableOptimizeHandle
     @JsonCreator
     public DeltaTableOptimizeHandle(
             MetadataEntry metadataEntry,
+            ProtocolEntry protocolEntry,
             List<DeltaLakeColumnHandle> tableColumns,
             List<String> originalPartitionColumns,
             DataSize maxScannedFileSize,
@@ -46,6 +49,7 @@ public DeltaTableOptimizeHandle(
             boolean retriesEnabled)
     {
         this.metadataEntry = requireNonNull(metadataEntry, "metadataEntry is null");
+        this.protocolEntry = requireNonNull(protocolEntry, "protocolEntry is null");
         this.tableColumns = ImmutableList.copyOf(requireNonNull(tableColumns, "tableColumns is null"));
         this.originalPartitionColumns = ImmutableList.copyOf(requireNonNull(originalPartitionColumns, "originalPartitionColumns is null"));
         this.maxScannedFileSize = requireNonNull(maxScannedFileSize, "maxScannedFileSize is null");
@@ -58,6 +62,7 @@ public DeltaTableOptimizeHandle withCurrentVersion(long currentVersion)
         checkState(this.currentVersion.isEmpty(), "currentVersion already set");
         return new DeltaTableOptimizeHandle(
                 metadataEntry,
+                protocolEntry,
                 tableColumns,
                 originalPartitionColumns,
                 maxScannedFileSize,
@@ -71,6 +76,12 @@ public MetadataEntry getMetadataEntry()
         return metadataEntry;
     }
 
+    @JsonProperty
+    public ProtocolEntry getProtocolEntry()
+    {
+        return protocolEntry;
+    }
+
     @JsonProperty
     public List<DeltaLakeColumnHandle> getTableColumns()
     {
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/DropExtendedStatsProcedure.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/DropExtendedStatsProcedure.java
index 0af6ac85e37e..6728b496a9c6 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/DropExtendedStatsProcedure.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/DropExtendedStatsProcedure.java
@@ -13,8 +13,11 @@
  */
 package io.trino.plugin.deltalake.procedure;
 
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.trino.plugin.deltalake.DeltaLakeMetadata;
 import io.trino.plugin.deltalake.DeltaLakeMetadataFactory;
+import io.trino.plugin.deltalake.LocatedTableHandle;
 import io.trino.plugin.deltalake.statistics.ExtendedStatisticsAccess;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorAccessControl;
@@ -23,9 +26,6 @@
 import io.trino.spi.procedure.Procedure;
 import io.trino.spi.procedure.Procedure.Argument;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 
@@ -79,10 +79,11 @@ public void dropStats(ConnectorSession session, ConnectorAccessControl accessCon
 
         SchemaTableName name = new SchemaTableName(schema, table);
         DeltaLakeMetadata metadata = metadataFactory.create(session.getIdentity());
-        if (metadata.getTableHandle(session, name) == null) {
+        LocatedTableHandle tableHandle = metadata.getTableHandle(session, name);
+        if (tableHandle == null) {
             throw new TrinoException(INVALID_PROCEDURE_ARGUMENT, format("Table '%s' does not exist", name));
         }
         accessControl.checkCanInsertIntoTable(null, name);
-        statsAccess.deleteExtendedStatistics(session, metadata.getMetastore().getTableLocation(name));
+        statsAccess.deleteExtendedStatistics(session, name, tableHandle.location());
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/FlushMetadataCacheProcedure.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/FlushMetadataCacheProcedure.java
index 43a997ac599b..94bde897865b 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/FlushMetadataCacheProcedure.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/FlushMetadataCacheProcedure.java
@@ -14,27 +14,19 @@
 package io.trino.plugin.deltalake.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.trino.plugin.deltalake.statistics.CachingExtendedStatisticsAccess;
 import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
-import io.trino.plugin.hive.metastore.HiveMetastore;
-import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
-import io.trino.plugin.hive.metastore.Table;
 import io.trino.plugin.hive.metastore.cache.CachingHiveMetastore;
 import io.trino.spi.TrinoException;
 import io.trino.spi.classloader.ThreadContextClassLoader;
-import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.procedure.Procedure;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.lang.invoke.MethodHandle;
 import java.util.Optional;
 
-import static io.trino.plugin.deltalake.metastore.HiveMetastoreBackedDeltaLakeMetastore.getTableLocation;
-import static io.trino.plugin.deltalake.metastore.HiveMetastoreBackedDeltaLakeMetastore.verifyDeltaLakeTable;
 import static io.trino.spi.StandardErrorCode.INVALID_PROCEDURE_ARGUMENT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.invoke.MethodHandles.lookup;
@@ -52,26 +44,23 @@ public class FlushMetadataCacheProcedure
 
     static {
         try {
-            FLUSH_METADATA_CACHE = lookup().unreflect(FlushMetadataCacheProcedure.class.getMethod("flushMetadataCache", ConnectorSession.class, String.class, String.class));
+            FLUSH_METADATA_CACHE = lookup().unreflect(FlushMetadataCacheProcedure.class.getMethod("flushMetadataCache", String.class, String.class));
         }
         catch (ReflectiveOperationException e) {
             throw new AssertionError(e);
         }
     }
 
-    private final HiveMetastoreFactory metastoreFactory;
     private final Optional<CachingHiveMetastore> cachingHiveMetastore;
     private final TransactionLogAccess transactionLogAccess;
     private final CachingExtendedStatisticsAccess extendedStatisticsAccess;
 
     @Inject
     public FlushMetadataCacheProcedure(
-            HiveMetastoreFactory metastoreFactory,
             Optional<CachingHiveMetastore> cachingHiveMetastore,
             TransactionLogAccess transactionLogAccess,
             CachingExtendedStatisticsAccess extendedStatisticsAccess)
     {
-        this.metastoreFactory = requireNonNull(metastoreFactory, "metastoreFactory is null");
         this.cachingHiveMetastore = requireNonNull(cachingHiveMetastore, "cachingHiveMetastore is null");
         this.transactionLogAccess = requireNonNull(transactionLogAccess, "transactionLogAccess is null");
         this.extendedStatisticsAccess = requireNonNull(extendedStatisticsAccess, "extendedStatisticsAccess is null");
@@ -90,14 +79,14 @@ public Procedure get()
                 true);
     }
 
-    public void flushMetadataCache(ConnectorSession session, String schemaName, String tableName)
+    public void flushMetadataCache(String schemaName, String tableName)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(getClass().getClassLoader())) {
-            doFlushMetadataCache(session, Optional.ofNullable(schemaName), Optional.ofNullable(tableName));
+            doFlushMetadataCache(Optional.ofNullable(schemaName), Optional.ofNullable(tableName));
         }
     }
 
-    private void doFlushMetadataCache(ConnectorSession session, Optional<String> schemaName, Optional<String> tableName)
+    private void doFlushMetadataCache(Optional<String> schemaName, Optional<String> tableName)
     {
         if (schemaName.isEmpty() && tableName.isEmpty()) {
             cachingHiveMetastore.ifPresent(CachingHiveMetastore::flushCache);
@@ -105,14 +94,10 @@ private void doFlushMetadataCache(ConnectorSession session, Optional<String> sch
             extendedStatisticsAccess.invalidateCache();
         }
         else if (schemaName.isPresent() && tableName.isPresent()) {
-            HiveMetastore metastore = metastoreFactory.createMetastore(Optional.of(session.getIdentity()));
-            Table table = metastore.getTable(schemaName.get(), tableName.get())
-                            .orElseThrow(() -> new TableNotFoundException(new SchemaTableName(schemaName.get(), tableName.get())));
-            verifyDeltaLakeTable(table);
-            cachingHiveMetastore.ifPresent(caching -> caching.invalidateTable(table.getDatabaseName(), table.getTableName()));
-            String tableLocation = getTableLocation(table);
-            transactionLogAccess.invalidateCaches(tableLocation);
-            extendedStatisticsAccess.invalidateCache(tableLocation);
+            SchemaTableName schemaTableName = new SchemaTableName(schemaName.get(), tableName.get());
+            cachingHiveMetastore.ifPresent(cachingMetastore -> cachingMetastore.invalidateTable(schemaName.get(), tableName.get()));
+            transactionLogAccess.invalidateCache(schemaTableName, Optional.empty());
+            extendedStatisticsAccess.invalidateCache(schemaTableName, Optional.empty());
         }
         else {
             throw new TrinoException(INVALID_PROCEDURE_ARGUMENT, "Illegal parameter set passed");
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/OptimizeTableProcedure.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/OptimizeTableProcedure.java
index 82cc6cb6e98c..07334a37b31b 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/OptimizeTableProcedure.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/OptimizeTableProcedure.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.deltalake.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Provider;
 import io.airlift.units.DataSize;
 import io.trino.spi.connector.TableProcedureMetadata;
 
-import javax.inject.Provider;
-
 import static io.trino.plugin.base.session.PropertyMetadataUtil.dataSizeProperty;
 import static io.trino.plugin.deltalake.procedure.DeltaLakeTableProcedureId.OPTIMIZE;
 import static io.trino.spi.connector.TableProcedureExecutionMode.distributedWithFilteringAndRepartitioning;
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/RegisterTableProcedure.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/RegisterTableProcedure.java
index 35f05ea3df2e..4ac20e34b303 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/RegisterTableProcedure.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/RegisterTableProcedure.java
@@ -14,11 +14,18 @@
 package io.trino.plugin.deltalake.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.deltalake.DeltaLakeConfig;
 import io.trino.plugin.deltalake.DeltaLakeMetadataFactory;
 import io.trino.plugin.deltalake.metastore.DeltaLakeMetastore;
+import io.trino.plugin.deltalake.statistics.CachingExtendedStatisticsAccess;
+import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
+import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
+import io.trino.plugin.hive.TableAlreadyExistsException;
 import io.trino.plugin.hive.metastore.PrincipalPrivileges;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.spi.TrinoException;
@@ -28,16 +35,18 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.procedure.Procedure;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
+import java.util.Optional;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
+import static com.google.common.base.Verify.verify;
 import static io.trino.plugin.base.util.Procedures.checkProcedureArgument;
 import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_FILESYSTEM_ERROR;
+import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_TABLE;
 import static io.trino.plugin.deltalake.DeltaLakeMetadata.buildTable;
+import static io.trino.plugin.deltalake.DeltaLakeMetadata.getQueryId;
+import static io.trino.plugin.deltalake.DeltaLakeMetadata.isCreatedBy;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogDir;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.buildInitialPrivilegeSet;
 import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
@@ -69,13 +78,22 @@ public class RegisterTableProcedure
     }
 
     private final DeltaLakeMetadataFactory metadataFactory;
+    private final TransactionLogAccess transactionLogAccess;
+    private final CachingExtendedStatisticsAccess statisticsAccess;
     private final TrinoFileSystemFactory fileSystemFactory;
     private final boolean registerTableProcedureEnabled;
 
     @Inject
-    public RegisterTableProcedure(DeltaLakeMetadataFactory metadataFactory, TrinoFileSystemFactory fileSystemFactory, DeltaLakeConfig deltaLakeConfig)
+    public RegisterTableProcedure(
+            DeltaLakeMetadataFactory metadataFactory,
+            TransactionLogAccess transactionLogAccess,
+            CachingExtendedStatisticsAccess statisticsAccess,
+            TrinoFileSystemFactory fileSystemFactory,
+            DeltaLakeConfig deltaLakeConfig)
     {
         this.metadataFactory = requireNonNull(metadataFactory, "metadataFactory is null");
+        this.transactionLogAccess = requireNonNull(transactionLogAccess, "transactionLogAccess is null");
+        this.statisticsAccess = requireNonNull(statisticsAccess, "statisticsAccess is null");
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.registerTableProcedureEnabled = deltaLakeConfig.isRegisterTableProcedureEnabled();
     }
@@ -130,7 +148,7 @@ private void doRegisterTable(
 
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
         try {
-            String transactionLogDir = getTransactionLogDir(tableLocation);
+            Location transactionLogDir = Location.of(getTransactionLogDir(tableLocation));
             if (!fileSystem.listFiles(transactionLogDir).hasNext()) {
                 throw new TrinoException(GENERIC_USER_ERROR, format("No transaction log found in location %s", transactionLogDir));
             }
@@ -142,9 +160,40 @@ private void doRegisterTable(
         Table table = buildTable(session, schemaTableName, tableLocation, true);
 
         PrincipalPrivileges principalPrivileges = buildInitialPrivilegeSet(table.getOwner().orElseThrow());
-        metastore.createTable(
-                session,
-                table,
-                principalPrivileges);
+        statisticsAccess.invalidateCache(schemaTableName, Optional.of(tableLocation));
+        transactionLogAccess.invalidateCache(schemaTableName, Optional.of(tableLocation));
+        // Verify we're registering a location with a valid table
+        try {
+            TableSnapshot tableSnapshot = transactionLogAccess.loadSnapshot(session, table.getSchemaTableName(), tableLocation);
+            transactionLogAccess.getMetadataEntry(tableSnapshot, session); // verify metadata exists
+        }
+        catch (TrinoException e) {
+            throw e;
+        }
+        catch (IOException | RuntimeException e) {
+            throw new TrinoException(DELTA_LAKE_INVALID_TABLE, "Failed to access table location: " + tableLocation, e);
+        }
+
+        // Ensure the table has queryId set. This is relied on for exception handling
+        String queryId = session.getQueryId();
+        verify(
+                getQueryId(table).orElseThrow(() -> new IllegalArgumentException("Query id is not present")).equals(queryId),
+                "Table '%s' does not have correct query id set",
+                table);
+        try {
+            metastore.createTable(
+                    session,
+                    table,
+                    principalPrivileges);
+        }
+        catch (TableAlreadyExistsException e) {
+            // Ignore TableAlreadyExistsException when table looks like created by us.
+            // This may happen when an actually successful metastore create call is retried
+            // e.g. because of a timeout on our side.
+            Optional<Table> existingTable = metastore.getRawMetastoreTable(schemaName, tableName);
+            if (existingTable.isEmpty() || !isCreatedBy(existingTable.get(), queryId)) {
+                throw e;
+            }
+        }
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/UnregisterTableProcedure.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/UnregisterTableProcedure.java
index 238c00b4f097..9d800ec8d61e 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/UnregisterTableProcedure.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/UnregisterTableProcedure.java
@@ -14,19 +14,22 @@
 package io.trino.plugin.deltalake.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.trino.plugin.deltalake.DeltaLakeMetadata;
 import io.trino.plugin.deltalake.DeltaLakeMetadataFactory;
-import io.trino.plugin.deltalake.metastore.DeltaLakeMetastore;
+import io.trino.plugin.deltalake.LocatedTableHandle;
+import io.trino.plugin.deltalake.statistics.CachingExtendedStatisticsAccess;
+import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.procedure.Procedure;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.lang.invoke.MethodHandle;
+import java.util.Optional;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static io.trino.plugin.base.util.Procedures.checkProcedureArgument;
@@ -55,11 +58,15 @@ public class UnregisterTableProcedure
     }
 
     private final DeltaLakeMetadataFactory metadataFactory;
+    private final TransactionLogAccess transactionLogAccess;
+    private final CachingExtendedStatisticsAccess statisticsAccess;
 
     @Inject
-    public UnregisterTableProcedure(DeltaLakeMetadataFactory metadataFactory)
+    public UnregisterTableProcedure(DeltaLakeMetadataFactory metadataFactory, TransactionLogAccess transactionLogAccess, CachingExtendedStatisticsAccess statisticsAccess)
     {
         this.metadataFactory = requireNonNull(metadataFactory, "metadataFactory is null");
+        this.transactionLogAccess = requireNonNull(transactionLogAccess, "transactionLogAccess is null");
+        this.statisticsAccess = requireNonNull(statisticsAccess, "statisticsAccess is null");
     }
 
     @Override
@@ -88,12 +95,15 @@ private void doUnregisterTable(ConnectorAccessControl accessControl, ConnectorSe
         SchemaTableName schemaTableName = new SchemaTableName(schemaName, tableName);
 
         accessControl.checkCanDropTable(null, schemaTableName);
-        DeltaLakeMetastore metastore = metadataFactory.create(session.getIdentity()).getMetastore();
+        DeltaLakeMetadata metadata = metadataFactory.create(session.getIdentity());
 
-        if (metastore.getDatabase(schemaName).isEmpty()) {
-            throw new SchemaNotFoundException(schemaTableName.getSchemaName());
+        LocatedTableHandle tableHandle = metadata.getTableHandle(session, schemaTableName);
+        if (tableHandle == null) {
+            throw new TableNotFoundException(schemaTableName);
         }
-
-        metastore.dropTable(session, schemaName, tableName, false);
+        metadata.getMetastore().dropTable(session, schemaTableName, tableHandle.location(), false);
+        // As a precaution, clear the caches
+        statisticsAccess.invalidateCache(schemaTableName, Optional.of(tableHandle.location()));
+        transactionLogAccess.invalidateCache(schemaTableName, Optional.of(tableHandle.location()));
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/VacuumProcedure.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/VacuumProcedure.java
index 37185a5db2a3..e8fb95bcfd55 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/VacuumProcedure.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/procedure/VacuumProcedure.java
@@ -14,10 +14,14 @@
 package io.trino.plugin.deltalake.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.filesystem.FileEntry;
 import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
@@ -28,6 +32,7 @@
 import io.trino.plugin.deltalake.DeltaLakeTableHandle;
 import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
 import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.plugin.deltalake.transactionlog.RemoveFileEntry;
 import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
 import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
@@ -40,9 +45,6 @@
 import io.trino.spi.procedure.Procedure;
 import io.trino.spi.procedure.Procedure.Argument;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 import java.time.Instant;
@@ -56,10 +58,13 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.plugin.base.util.Procedures.checkProcedureArgument;
+import static io.trino.plugin.deltalake.DeltaLakeMetadata.MAX_WRITER_VERSION;
 import static io.trino.plugin.deltalake.DeltaLakeMetadata.checkValidTableHandle;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getVacuumMinRetention;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.unsupportedWriterFeatures;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.TRANSACTION_LOG_DIRECTORY;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogDir;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.String.format;
 import static java.lang.invoke.MethodHandles.lookup;
@@ -171,18 +176,27 @@ private void doVacuum(
         accessControl.checkCanInsertIntoTable(null, tableName);
         accessControl.checkCanDeleteFromTable(null, tableName);
 
-        TableSnapshot tableSnapshot = transactionLogAccess.loadSnapshot(tableName, handle.getLocation(), session);
+        TableSnapshot tableSnapshot = metadata.getSnapshot(session, tableName, handle.getLocation(), handle.getReadVersion());
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(session, tableSnapshot);
+        if (protocolEntry.getMinWriterVersion() > MAX_WRITER_VERSION) {
+            throw new TrinoException(NOT_SUPPORTED, "Cannot execute vacuum procedure with %d writer version".formatted(protocolEntry.getMinWriterVersion()));
+        }
+        Set<String> unsupportedWriterFeatures = unsupportedWriterFeatures(protocolEntry.getWriterFeatures().orElse(ImmutableSet.of()));
+        if (!unsupportedWriterFeatures.isEmpty()) {
+            throw new TrinoException(NOT_SUPPORTED, "Cannot execute vacuum procedure with %s writer features".formatted(unsupportedWriterFeatures));
+        }
+
         String tableLocation = tableSnapshot.getTableLocation();
         String transactionLogDir = getTransactionLogDir(tableLocation);
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-        String commonPathPrefix = tableLocation + "/";
+        String commonPathPrefix = tableLocation.endsWith("/") ? tableLocation : tableLocation + "/";
         String queryId = session.getQueryId();
 
         // Retain all active files and every file removed by a "recent" transaction (except for the oldest "recent").
         // Any remaining file are not live, and not needed to read any "recent" snapshot.
         List<Long> recentVersions = transactionLogAccess.getPastTableVersions(fileSystem, transactionLogDir, threshold, tableSnapshot.getVersion());
         Set<String> retainedPaths = Stream.concat(
-                        transactionLogAccess.getActiveFiles(tableSnapshot, session).stream()
+                        transactionLogAccess.getActiveFiles(tableSnapshot, handle.getMetadataEntry(), handle.getProtocolEntry(), session).stream()
                                 .map(AddFileEntry::getPath),
                         transactionLogAccess.getJsonEntries(
                                         fileSystem,
@@ -213,11 +227,11 @@ private void doVacuum(
         long retainedUnknownFiles = 0;
         long removedFiles = 0;
 
-        List<String> filesToDelete = new ArrayList<>();
-        FileIterator listing = fileSystem.listFiles(tableLocation);
+        List<Location> filesToDelete = new ArrayList<>();
+        FileIterator listing = fileSystem.listFiles(Location.of(tableLocation));
         while (listing.hasNext()) {
             FileEntry entry = listing.next();
-            String location = entry.location();
+            String location = entry.location().toString();
             checkState(
                     location.startsWith(commonPathPrefix),
                     "Unexpected path [%s] returned when listing files under [%s]",
@@ -253,7 +267,7 @@ private void doVacuum(
             }
 
             log.debug("[%s] deleting file [%s] with modification time %s", queryId, location, modificationTime);
-            filesToDelete.add(location);
+            filesToDelete.add(entry.location());
             if (filesToDelete.size() == DELETE_BATCH_SIZE) {
                 fileSystem.deleteFiles(filesToDelete);
                 removedFiles += filesToDelete.size();
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/CachingExtendedStatisticsAccess.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/CachingExtendedStatisticsAccess.java
index 525460c66e32..a159e2f553e7 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/CachingExtendedStatisticsAccess.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/CachingExtendedStatisticsAccess.java
@@ -15,12 +15,12 @@
 
 import com.google.common.cache.Cache;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.inject.BindingAnnotation;
 import com.google.inject.Inject;
-import io.trino.collect.cache.EvictableCacheBuilder;
+import io.trino.cache.EvictableCacheBuilder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
-
-import javax.inject.Qualifier;
+import io.trino.spi.connector.SchemaTableName;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -28,7 +28,8 @@
 import java.util.Optional;
 
 import static com.google.common.base.Throwables.throwIfInstanceOf;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.CacheUtils.invalidateAllIf;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
@@ -44,7 +45,7 @@ public class CachingExtendedStatisticsAccess
     private static final long CACHE_MAX_SIZE = 1000;
 
     private final ExtendedStatisticsAccess delegate;
-    private final Cache<String, Optional<ExtendedStatistics>> cache = EvictableCacheBuilder.newBuilder()
+    private final Cache<CacheKey, Optional<ExtendedStatistics>> cache = EvictableCacheBuilder.newBuilder()
             .expireAfterWrite(CACHE_EXPIRATION)
             .maximumSize(CACHE_MAX_SIZE)
             .build();
@@ -56,10 +57,10 @@ public CachingExtendedStatisticsAccess(@ForCachingExtendedStatisticsAccess Exten
     }
 
     @Override
-    public Optional<ExtendedStatistics> readExtendedStatistics(ConnectorSession session, String tableLocation)
+    public Optional<ExtendedStatistics> readExtendedStatistics(ConnectorSession session, SchemaTableName schemaTableName, String tableLocation)
     {
         try {
-            return uncheckedCacheGet(cache, tableLocation, () -> delegate.readExtendedStatistics(session, tableLocation));
+            return uncheckedCacheGet(cache, new CacheKey(schemaTableName, tableLocation), () -> delegate.readExtendedStatistics(session, schemaTableName, tableLocation));
         }
         catch (UncheckedExecutionException e) {
             throwIfInstanceOf(e.getCause(), TrinoException.class);
@@ -68,17 +69,17 @@ public Optional<ExtendedStatistics> readExtendedStatistics(ConnectorSession sess
     }
 
     @Override
-    public void updateExtendedStatistics(ConnectorSession session, String tableLocation, ExtendedStatistics statistics)
+    public void updateExtendedStatistics(ConnectorSession session, SchemaTableName schemaTableName, String tableLocation, ExtendedStatistics statistics)
     {
-        delegate.updateExtendedStatistics(session, tableLocation, statistics);
-        cache.invalidate(tableLocation);
+        delegate.updateExtendedStatistics(session, schemaTableName, tableLocation, statistics);
+        cache.invalidate(new CacheKey(schemaTableName, tableLocation));
     }
 
     @Override
-    public void deleteExtendedStatistics(ConnectorSession session, String tableLocation)
+    public void deleteExtendedStatistics(ConnectorSession session, SchemaTableName schemaTableName, String tableLocation)
     {
-        delegate.deleteExtendedStatistics(session, tableLocation);
-        cache.invalidate(tableLocation);
+        delegate.deleteExtendedStatistics(session, schemaTableName, tableLocation);
+        cache.invalidate(new CacheKey(schemaTableName, tableLocation));
     }
 
     public void invalidateCache()
@@ -86,14 +87,26 @@ public void invalidateCache()
         cache.invalidateAll();
     }
 
-    public void invalidateCache(String tableLocation)
+    // for explicit cache invalidation
+    public void invalidateCache(SchemaTableName schemaTableName, Optional<String> tableLocation)
     {
-        // for explicit cache invalidation
-        cache.invalidate(tableLocation);
+        requireNonNull(schemaTableName, "schemaTableName is null");
+        // Invalidate by location in case one table (location) unregistered and re-register under different name
+        tableLocation.ifPresent(location -> invalidateAllIf(cache, cacheKey -> cacheKey.location().equals(location)));
+        invalidateAllIf(cache, cacheKey -> cacheKey.tableName().equals(schemaTableName));
     }
 
     @Retention(RUNTIME)
     @Target({FIELD, PARAMETER, METHOD})
-    @Qualifier
+    @BindingAnnotation
     public @interface ForCachingExtendedStatisticsAccess {}
+
+    private record CacheKey(SchemaTableName tableName, String location)
+    {
+        CacheKey
+        {
+            requireNonNull(tableName, "tableName is null");
+            requireNonNull(location, "location is null");
+        }
+    }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/DeltaLakeTableStatisticsProvider.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/DeltaLakeTableStatisticsProvider.java
new file mode 100644
index 000000000000..12f6c413c44e
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/DeltaLakeTableStatisticsProvider.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.statistics;
+
+import io.trino.plugin.deltalake.DeltaLakeTableHandle;
+import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.statistics.TableStatistics;
+
+public interface DeltaLakeTableStatisticsProvider
+{
+    TableStatistics getTableStatistics(ConnectorSession session, DeltaLakeTableHandle tableHandle, TableSnapshot tableSnapshot);
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/ExtendedStatisticsAccess.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/ExtendedStatisticsAccess.java
index a44cb0afc89d..0b1e58132815 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/ExtendedStatisticsAccess.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/ExtendedStatisticsAccess.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.deltalake.statistics;
 
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.SchemaTableName;
 
 import java.util.Optional;
 
@@ -21,14 +22,17 @@ public interface ExtendedStatisticsAccess
 {
     Optional<ExtendedStatistics> readExtendedStatistics(
             ConnectorSession session,
+            SchemaTableName schemaTableName,
             String tableLocation);
 
     void updateExtendedStatistics(
             ConnectorSession session,
+            SchemaTableName schemaTableName,
             String tableLocation,
             ExtendedStatistics statistics);
 
     void deleteExtendedStatistics(
             ConnectorSession session,
+            SchemaTableName schemaTableName,
             String tableLocation);
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/FileBasedTableStatisticsProvider.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/FileBasedTableStatisticsProvider.java
new file mode 100644
index 000000000000..eddcfcb99f84
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/FileBasedTableStatisticsProvider.java
@@ -0,0 +1,241 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.statistics;
+
+import com.google.inject.Inject;
+import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
+import io.trino.plugin.deltalake.DeltaLakeColumnMetadata;
+import io.trino.plugin.deltalake.DeltaLakeTableHandle;
+import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport;
+import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
+import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
+import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeFileStatistics;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.statistics.ColumnStatistics;
+import io.trino.spi.statistics.DoubleRange;
+import io.trino.spi.statistics.Estimate;
+import io.trino.spi.statistics.TableStatistics;
+import io.trino.spi.type.TypeManager;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.Set;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.plugin.deltalake.DeltaLakeColumnType.PARTITION_KEY;
+import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
+import static io.trino.plugin.deltalake.DeltaLakeMetadata.createStatisticsPredicate;
+import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isExtendedStatisticsEnabled;
+import static io.trino.plugin.deltalake.DeltaLakeSplitManager.partitionMatchesPredicate;
+import static io.trino.spi.statistics.StatsUtil.toStatsRepresentation;
+import static java.lang.Double.NEGATIVE_INFINITY;
+import static java.lang.Double.NaN;
+import static java.lang.Double.POSITIVE_INFINITY;
+import static java.util.Objects.requireNonNull;
+
+public class FileBasedTableStatisticsProvider
+        implements DeltaLakeTableStatisticsProvider
+{
+    private final TypeManager typeManager;
+    private final TransactionLogAccess transactionLogAccess;
+    private final CachingExtendedStatisticsAccess statisticsAccess;
+
+    @Inject
+    public FileBasedTableStatisticsProvider(
+            TypeManager typeManager,
+            TransactionLogAccess transactionLogAccess,
+            CachingExtendedStatisticsAccess statisticsAccess)
+    {
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.transactionLogAccess = requireNonNull(transactionLogAccess, "transactionLogAccess is null");
+        this.statisticsAccess = requireNonNull(statisticsAccess, "statisticsAccess is null");
+    }
+
+    @Override
+    public TableStatistics getTableStatistics(ConnectorSession session, DeltaLakeTableHandle tableHandle, TableSnapshot tableSnapshot)
+    {
+        double numRecords = 0L;
+
+        MetadataEntry metadata = tableHandle.getMetadataEntry();
+        List<DeltaLakeColumnMetadata> columnMetadata = DeltaLakeSchemaSupport.extractSchema(metadata, tableHandle.getProtocolEntry(), typeManager);
+        List<DeltaLakeColumnHandle> columns = columnMetadata.stream()
+                .map(columnMeta -> new DeltaLakeColumnHandle(
+                        columnMeta.getName(),
+                        columnMeta.getType(),
+                        columnMeta.getFieldId(),
+                        columnMeta.getPhysicalName(),
+                        columnMeta.getPhysicalColumnType(),
+                        metadata.getOriginalPartitionColumns().contains(columnMeta.getName()) ? PARTITION_KEY : REGULAR,
+                        Optional.empty()))
+                .collect(toImmutableList());
+
+        Map<DeltaLakeColumnHandle, Double> nullCounts = new HashMap<>();
+        columns.forEach(column -> nullCounts.put(column, 0.0));
+        Map<DeltaLakeColumnHandle, Double> minValues = new HashMap<>();
+        Map<DeltaLakeColumnHandle, Double> maxValues = new HashMap<>();
+        Map<DeltaLakeColumnHandle, Set<String>> partitioningColumnsDistinctValues = new HashMap<>();
+        columns.stream()
+                .filter(column -> column.getColumnType() == PARTITION_KEY)
+                .forEach(column -> partitioningColumnsDistinctValues.put(column, new HashSet<>()));
+
+        if (tableHandle.getEnforcedPartitionConstraint().isNone() || tableHandle.getNonPartitionConstraint().isNone()) {
+            return createZeroStatistics(columns);
+        }
+
+        Set<String> predicatedColumnNames = tableHandle.getNonPartitionConstraint().getDomains().orElseThrow().keySet().stream()
+                // TODO Statistics for column inside complex type is not collected (https://github.com/trinodb/trino/issues/17164)
+                .filter(DeltaLakeColumnHandle::isBaseColumn)
+                .map(DeltaLakeColumnHandle::getBaseColumnName)
+                .collect(toImmutableSet());
+        List<DeltaLakeColumnMetadata> predicatedColumns = columnMetadata.stream()
+                .filter(column -> predicatedColumnNames.contains(column.getName()))
+                .collect(toImmutableList());
+
+        for (AddFileEntry addEntry : transactionLogAccess.getActiveFiles(tableSnapshot, tableHandle.getMetadataEntry(), tableHandle.getProtocolEntry(), session)) {
+            Optional<? extends DeltaLakeFileStatistics> fileStatistics = addEntry.getStats();
+            if (fileStatistics.isEmpty()) {
+                // Open source Delta Lake does not collect stats
+                return TableStatistics.empty();
+            }
+            DeltaLakeFileStatistics stats = fileStatistics.get();
+            if (!partitionMatchesPredicate(addEntry.getCanonicalPartitionValues(), tableHandle.getEnforcedPartitionConstraint().getDomains().orElseThrow())) {
+                continue;
+            }
+
+            TupleDomain<DeltaLakeColumnHandle> statisticsPredicate = createStatisticsPredicate(
+                    addEntry,
+                    predicatedColumns,
+                    tableHandle.getMetadataEntry().getLowercasePartitionColumns());
+            if (!tableHandle.getNonPartitionConstraint().overlaps(statisticsPredicate)) {
+                continue;
+            }
+
+            if (stats.getNumRecords().isEmpty()) {
+                // Not clear if it's possible for stats to be present with no row count, but bail out if that happens
+                return TableStatistics.empty();
+            }
+            numRecords += stats.getNumRecords().get();
+            for (DeltaLakeColumnHandle column : columns) {
+                if (column.getColumnType() == PARTITION_KEY) {
+                    Optional<String> partitionValue = addEntry.getCanonicalPartitionValues().get(column.getBasePhysicalColumnName());
+                    if (partitionValue.isEmpty()) {
+                        nullCounts.merge(column, (double) stats.getNumRecords().get(), Double::sum);
+                    }
+                    else {
+                        // NULL is not counted as a distinct value
+                        // Code below assumes that values returned by addEntry.getCanonicalPartitionValues() are normalized,
+                        // it may not be true in case of real, doubles, timestamps etc
+                        partitioningColumnsDistinctValues.get(column).add(partitionValue.get());
+                    }
+                }
+                else {
+                    Optional<Long> maybeNullCount = column.isBaseColumn() ? stats.getNullCount(column.getBasePhysicalColumnName()) : Optional.empty();
+                    if (maybeNullCount.isPresent()) {
+                        nullCounts.put(column, nullCounts.get(column) + maybeNullCount.get());
+                    }
+                    else {
+                        // If any individual file fails to report null counts, fail to calculate the total for the table
+                        nullCounts.put(column, NaN);
+                    }
+                }
+
+                // Math.min returns NaN if any operand is NaN
+                stats.getMinColumnValue(column)
+                        .map(parsedValue -> toStatsRepresentation(column.getBaseType(), parsedValue))
+                        .filter(OptionalDouble::isPresent)
+                        .map(OptionalDouble::getAsDouble)
+                        .ifPresent(parsedValueAsDouble -> minValues.merge(column, parsedValueAsDouble, Math::min));
+
+                stats.getMaxColumnValue(column)
+                        .map(parsedValue -> toStatsRepresentation(column.getBaseType(), parsedValue))
+                        .filter(OptionalDouble::isPresent)
+                        .map(OptionalDouble::getAsDouble)
+                        .ifPresent(parsedValueAsDouble -> maxValues.merge(column, parsedValueAsDouble, Math::max));
+            }
+        }
+
+        if (numRecords == 0) {
+            return createZeroStatistics(columns);
+        }
+
+        TableStatistics.Builder statsBuilder = new TableStatistics.Builder().setRowCount(Estimate.of(numRecords));
+
+        Optional<ExtendedStatistics> statistics = Optional.empty();
+        if (isExtendedStatisticsEnabled(session)) {
+            statistics = statisticsAccess.readExtendedStatistics(session, tableHandle.getSchemaTableName(), tableHandle.getLocation());
+        }
+
+        for (DeltaLakeColumnHandle column : columns) {
+            ColumnStatistics.Builder columnStatsBuilder = new ColumnStatistics.Builder();
+            Double nullCount = nullCounts.get(column);
+            columnStatsBuilder.setNullsFraction(nullCount.isNaN() ? Estimate.unknown() : Estimate.of(nullCount / numRecords));
+
+            Double maxValue = maxValues.get(column);
+            Double minValue = minValues.get(column);
+
+            if (isValidInRange(maxValue) && isValidInRange(minValue)) {
+                columnStatsBuilder.setRange(new DoubleRange(minValue, maxValue));
+            }
+            else if (isValidInRange(maxValue)) {
+                columnStatsBuilder.setRange(new DoubleRange(NEGATIVE_INFINITY, maxValue));
+            }
+            else if (isValidInRange(minValue)) {
+                columnStatsBuilder.setRange(new DoubleRange(minValue, POSITIVE_INFINITY));
+            }
+
+            // extend statistics with NDV
+            if (column.getColumnType() == PARTITION_KEY) {
+                columnStatsBuilder.setDistinctValuesCount(Estimate.of(partitioningColumnsDistinctValues.get(column).size()));
+            }
+            if (statistics.isPresent()) {
+                DeltaLakeColumnStatistics deltaLakeColumnStatistics = statistics.get().getColumnStatistics().get(column.getBasePhysicalColumnName());
+                if (deltaLakeColumnStatistics != null && column.getColumnType() != PARTITION_KEY) {
+                    deltaLakeColumnStatistics.getTotalSizeInBytes().ifPresent(size -> columnStatsBuilder.setDataSize(Estimate.of(size)));
+                    columnStatsBuilder.setDistinctValuesCount(Estimate.of(deltaLakeColumnStatistics.getNdvSummary().cardinality()));
+                }
+            }
+
+            statsBuilder.setColumnStatistics(column, columnStatsBuilder.build());
+        }
+
+        return statsBuilder.build();
+    }
+
+    private TableStatistics createZeroStatistics(List<DeltaLakeColumnHandle> columns)
+    {
+        TableStatistics.Builder statsBuilder = new TableStatistics.Builder().setRowCount(Estimate.of(0));
+        for (DeltaLakeColumnHandle column : columns) {
+            ColumnStatistics.Builder columnStatistics = ColumnStatistics.builder();
+            columnStatistics.setNullsFraction(Estimate.of(0));
+            columnStatistics.setDistinctValuesCount(Estimate.of(0));
+            statsBuilder.setColumnStatistics(column, columnStatistics.build());
+        }
+
+        return statsBuilder.build();
+    }
+
+    private boolean isValidInRange(Double d)
+    {
+        // Delta considers NaN a valid min/max value but Trino does not
+        return d != null && !d.isNaN();
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/MetaDirStatisticsAccess.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/MetaDirStatisticsAccess.java
index a336c5509f21..3028b7fff31d 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/MetaDirStatisticsAccess.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/MetaDirStatisticsAccess.java
@@ -15,18 +15,21 @@
 
 import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.SchemaTableName;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Optional;
 
-import static io.trino.filesystem.Locations.appendPath;
+import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_FILESYSTEM_ERROR;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.TRANSACTION_LOG_DIRECTORY;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static java.lang.String.format;
@@ -56,24 +59,25 @@ public MetaDirStatisticsAccess(
     @Override
     public Optional<ExtendedStatistics> readExtendedStatistics(
             ConnectorSession session,
+            SchemaTableName schemaTableName,
             String tableLocation)
     {
-        return readExtendedStatistics(session, tableLocation, STATISTICS_META_DIR, STATISTICS_FILE)
-                .or(() -> readExtendedStatistics(session, tableLocation, STARBURST_META_DIR, STARBURST_STATISTICS_FILE));
+        Location location = Location.of(tableLocation);
+        return readExtendedStatistics(session, location, STATISTICS_META_DIR, STATISTICS_FILE)
+                .or(() -> readExtendedStatistics(session, location, STARBURST_META_DIR, STARBURST_STATISTICS_FILE));
     }
 
-    private Optional<ExtendedStatistics> readExtendedStatistics(ConnectorSession session, String tableLocation, String statisticsDirectory, String statisticsFile)
+    private Optional<ExtendedStatistics> readExtendedStatistics(ConnectorSession session, Location tableLocation, String statisticsDirectory, String statisticsFile)
     {
         try {
-            String statisticsPath = appendPath(tableLocation, appendPath(statisticsDirectory, statisticsFile));
+            Location statisticsPath = tableLocation.appendPath(statisticsDirectory).appendPath(statisticsFile);
             TrinoInputFile inputFile = fileSystemFactory.create(session).newInputFile(statisticsPath);
-            if (!inputFile.exists()) {
-                return Optional.empty();
-            }
-
             try (InputStream inputStream = inputFile.newStream()) {
                 return Optional.of(statisticsCodec.fromJson(inputStream.readAllBytes()));
             }
+            catch (FileNotFoundException e) {
+                return Optional.empty();
+            }
         }
         catch (IOException e) {
             throw new TrinoException(GENERIC_INTERNAL_ERROR, format("failed to read statistics with table location %s", tableLocation), e);
@@ -83,11 +87,12 @@ private Optional<ExtendedStatistics> readExtendedStatistics(ConnectorSession ses
     @Override
     public void updateExtendedStatistics(
             ConnectorSession session,
+            SchemaTableName schemaTableName,
             String tableLocation,
             ExtendedStatistics statistics)
     {
         try {
-            String statisticsPath = appendPath(tableLocation, appendPath(STATISTICS_META_DIR, STATISTICS_FILE));
+            Location statisticsPath = Location.of(tableLocation).appendPath(STATISTICS_META_DIR).appendPath(STATISTICS_FILE);
 
             TrinoFileSystem fileSystem = fileSystemFactory.create(session);
             try (OutputStream outputStream = fileSystem.newOutputFile(statisticsPath).createOrOverwrite()) {
@@ -95,20 +100,20 @@ public void updateExtendedStatistics(
             }
 
             // Remove outdated Starburst stats file, if it exists.
-            String starburstStatisticsPath = appendPath(tableLocation, appendPath(STARBURST_META_DIR, STARBURST_STATISTICS_FILE));
+            Location starburstStatisticsPath = Location.of(tableLocation).appendPath(STARBURST_META_DIR).appendPath(STARBURST_STATISTICS_FILE);
             if (fileSystem.newInputFile(starburstStatisticsPath).exists()) {
                 fileSystem.deleteFile(starburstStatisticsPath);
             }
         }
         catch (IOException e) {
-            throw new TrinoException(GENERIC_INTERNAL_ERROR, format("failed to store statistics with table location %s", tableLocation), e);
+            throw new TrinoException(DELTA_LAKE_FILESYSTEM_ERROR, "Failed to store statistics with table location: " + tableLocation, e);
         }
     }
 
     @Override
-    public void deleteExtendedStatistics(ConnectorSession session, String tableLocation)
+    public void deleteExtendedStatistics(ConnectorSession session, SchemaTableName schemaTableName, String tableLocation)
     {
-        String statisticsPath = appendPath(tableLocation, appendPath(STATISTICS_META_DIR, STATISTICS_FILE));
+        Location statisticsPath = Location.of(tableLocation).appendPath(STATISTICS_META_DIR).appendPath(STATISTICS_FILE);
         try {
             TrinoFileSystem fileSystem = fileSystemFactory.create(session);
             if (fileSystem.newInputFile(statisticsPath).exists()) {
@@ -116,7 +121,7 @@ public void deleteExtendedStatistics(ConnectorSession session, String tableLocat
             }
         }
         catch (IOException e) {
-            throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Error deleting statistics file %s", statisticsPath), e);
+            throw new TrinoException(DELTA_LAKE_FILESYSTEM_ERROR, "Error deleting statistics file: " + statisticsPath, e);
         }
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/AddFileEntry.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/AddFileEntry.java
index 87f061530d80..5b6c96d3a31c 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/AddFileEntry.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/AddFileEntry.java
@@ -22,19 +22,18 @@
 import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeFileStatistics;
 import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeJsonFileStatistics;
 import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeParquetFileStatistics;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.airlift.slice.SizeOf.estimatedSizeOf;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.serializeStatsAsJson;
-import static io.trino.plugin.deltalake.transactionlog.TransactionLogAccess.canonicalizeColumnName;
+import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.canonicalizePartitionValues;
 import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
 
 public class AddFileEntry
 {
@@ -48,6 +47,7 @@ public class AddFileEntry
     private final long modificationTime;
     private final boolean dataChange;
     private final Map<String, String> tags;
+    private final Optional<DeletionVectorEntry> deletionVector;
     private final Optional<? extends DeltaLakeFileStatistics> parsedStats;
 
     @JsonCreator
@@ -59,26 +59,17 @@ public AddFileEntry(
             @JsonProperty("dataChange") boolean dataChange,
             @JsonProperty("stats") Optional<String> stats,
             @JsonProperty("parsedStats") Optional<DeltaLakeParquetFileStatistics> parsedStats,
-            @JsonProperty("tags") @Nullable Map<String, String> tags)
+            @JsonProperty("tags") @Nullable Map<String, String> tags,
+            @JsonProperty("deletionVector") Optional<DeletionVectorEntry> deletionVector)
     {
         this.path = path;
         this.partitionValues = partitionValues;
-        this.canonicalPartitionValues = partitionValues.entrySet().stream()
-                .collect(toImmutableMap(
-                        // canonicalize partition keys to lowercase so they match column names used in DeltaLakeColumnHandle
-                        entry -> canonicalizeColumnName(entry.getKey()),
-                        entry -> {
-                            String value = entry.getValue();
-                            if (value == null || value.isEmpty()) {
-                                // For VARCHAR based partitions null and "" are treated the same
-                                return Optional.empty();
-                            }
-                            return Optional.of(value);
-                        }));
+        this.canonicalPartitionValues = canonicalizePartitionValues(partitionValues);
         this.size = size;
         this.modificationTime = modificationTime;
         this.dataChange = dataChange;
         this.tags = tags;
+        this.deletionVector = requireNonNull(deletionVector, "deletionVector is null");
 
         Optional<? extends DeltaLakeFileStatistics> resultParsedStats = Optional.empty();
         if (parsedStats.isPresent()) {
@@ -111,6 +102,9 @@ public Map<String, String> getPartitionValues()
         return partitionValues;
     }
 
+    /**
+     * @return the original key and canonical value. The value returns {@code Optional.empty()} when it's null or empty string.
+     */
     @JsonIgnore
     public Map<String, Optional<String>> getCanonicalPartitionValues()
     {
@@ -161,6 +155,12 @@ public Map<String, String> getTags()
         return tags;
     }
 
+    @JsonProperty
+    public Optional<DeletionVectorEntry> getDeletionVector()
+    {
+        return deletionVector;
+    }
+
     @Override
     public String toString()
     {
@@ -185,6 +185,7 @@ public boolean equals(Object o)
                 Objects.equals(partitionValues, that.partitionValues) &&
                 Objects.equals(canonicalPartitionValues, that.canonicalPartitionValues) &&
                 Objects.equals(tags, that.tags) &&
+                Objects.equals(deletionVector, that.deletionVector) &&
                 Objects.equals(parsedStats, that.parsedStats);
     }
 
@@ -199,6 +200,7 @@ public int hashCode()
                 modificationTime,
                 dataChange,
                 tags,
+                deletionVector,
                 parsedStats);
     }
 
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/CanonicalColumnName.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/CanonicalColumnName.java
index 3ae212b3b3ad..f843a4a1415f 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/CanonicalColumnName.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/CanonicalColumnName.java
@@ -64,6 +64,12 @@ public int hashCode()
         return this.hash;
     }
 
+    @Override
+    public String toString()
+    {
+        return originalName;
+    }
+
     public long getRetainedSize()
     {
         return INSTANCE_SIZE + SizeOf.estimatedSizeOf(originalName);
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/CdcEntry.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/CdcEntry.java
new file mode 100644
index 000000000000..e8230630d654
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/CdcEntry.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.transactionlog;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Map;
+import java.util.Optional;
+
+import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.canonicalizePartitionValues;
+import static java.lang.String.format;
+
+public class CdcEntry
+{
+    private final String path;
+    private final Map<String, String> partitionValues;
+    private final Map<String, Optional<String>> canonicalPartitionValues;
+    private final long size;
+    private final boolean dataChange;
+
+    @JsonCreator
+    public CdcEntry(
+            @JsonProperty("path") String path,
+            @JsonProperty("partitionValues") Map<String, String> partitionValues,
+            @JsonProperty("size") long size)
+    {
+        this.path = path;
+        this.partitionValues = partitionValues;
+        this.canonicalPartitionValues = canonicalizePartitionValues(partitionValues);
+        this.size = size;
+        this.dataChange = false;
+    }
+
+    @JsonProperty
+    public String getPath()
+    {
+        return path;
+    }
+
+    @JsonProperty
+    public Map<String, String> getPartitionValues()
+    {
+        return partitionValues;
+    }
+
+    @JsonIgnore // derived from partitionValues
+    public Map<String, Optional<String>> getCanonicalPartitionValues()
+    {
+        return canonicalPartitionValues;
+    }
+
+    @JsonProperty
+    public long getSize()
+    {
+        return size;
+    }
+
+    @JsonProperty("dataChange")
+    public boolean isDataChange()
+    {
+        return dataChange;
+    }
+
+    @Override
+    public String toString()
+    {
+        return format("CdcEntry{path=%s, partitionValues=%s, size=%d, dataChange=%b}",
+                path, partitionValues, size, dataChange);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/CdfFileEntry.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/CdfFileEntry.java
deleted file mode 100644
index 6a891622c729..000000000000
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/CdfFileEntry.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.deltalake.transactionlog;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Map;
-
-import static java.lang.String.format;
-
-public class CdfFileEntry
-{
-    private final String path;
-    private final Map<String, String> partitionValues;
-    private final long size;
-    private final boolean dataChange;
-
-    @JsonCreator
-    public CdfFileEntry(
-            @JsonProperty("path") String path,
-            @JsonProperty("partitionValues") Map<String, String> partitionValues,
-            @JsonProperty("size") long size)
-    {
-        this.path = path;
-        this.partitionValues = partitionValues;
-        this.size = size;
-        this.dataChange = false;
-    }
-
-    @JsonProperty
-    public String getPath()
-    {
-        return path;
-    }
-
-    @JsonProperty
-    public Map<String, String> getPartitionValues()
-    {
-        return partitionValues;
-    }
-
-    @JsonProperty
-    public long getSize()
-    {
-        return size;
-    }
-
-    @JsonProperty("dataChange")
-    public boolean isDataChange()
-    {
-        return dataChange;
-    }
-
-    @Override
-    public String toString()
-    {
-        return format("CdfFileEntry{path=%s, partitionValues=%s, size=%d, dataChange=%b}",
-                path, partitionValues, size, dataChange);
-    }
-}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeletionVectorEntry.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeletionVectorEntry.java
new file mode 100644
index 000000000000..94719ae02c71
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeletionVectorEntry.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.transactionlog;
+
+import java.util.OptionalInt;
+
+import static java.util.Objects.requireNonNull;
+
+// https://github.com/delta-io/delta/blob/master/PROTOCOL.md#deletion-vector-descriptor-schema
+public record DeletionVectorEntry(String storageType, String pathOrInlineDv, OptionalInt offset, int sizeInBytes, long cardinality)
+{
+    public DeletionVectorEntry
+    {
+        requireNonNull(storageType, "storageType is null");
+        requireNonNull(pathOrInlineDv, "pathOrInlineDv is null");
+        requireNonNull(offset, "offset is null");
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeComputedStatistics.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeComputedStatistics.java
new file mode 100644
index 000000000000..915b7304819b
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeComputedStatistics.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.transactionlog;
+
+import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
+import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeJsonFileStatistics;
+import io.trino.spi.block.Block;
+import io.trino.spi.statistics.ColumnStatisticMetadata;
+import io.trino.spi.statistics.ColumnStatisticType;
+import io.trino.spi.statistics.ComputedStatistics;
+import io.trino.spi.type.Type;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalLong;
+
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeParquetStatisticsUtils.toJsonValue;
+import static io.trino.spi.statistics.ColumnStatisticType.MAX_VALUE;
+import static io.trino.spi.statistics.ColumnStatisticType.MIN_VALUE;
+import static io.trino.spi.statistics.ColumnStatisticType.NUMBER_OF_NON_NULL_VALUES;
+import static io.trino.spi.statistics.TableStatisticType.ROW_COUNT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.TypeUtils.readNativeValue;
+import static io.trino.spi.type.VarbinaryType.VARBINARY;
+
+public final class DeltaLakeComputedStatistics
+{
+    private DeltaLakeComputedStatistics() {}
+
+    public static DeltaLakeJsonFileStatistics toDeltaLakeJsonFileStatistics(ComputedStatistics stats, Map</* lowercase */ String, DeltaLakeColumnHandle> lowercaseToColumnsHandles)
+    {
+        Optional<Long> rowCount = getLongValue(stats.getTableStatistics().get(ROW_COUNT)).stream().boxed().findFirst();
+
+        Optional<Map<String, Object>> minValues = Optional.of(getColumnStatistics(stats, MIN_VALUE, lowercaseToColumnsHandles));
+        Optional<Map<String, Object>> maxValues = Optional.of(getColumnStatistics(stats, MAX_VALUE, lowercaseToColumnsHandles));
+
+        Optional<Map<String, Object>> nullCount = Optional.empty();
+        if (rowCount.isPresent()) {
+            nullCount = Optional.of(getNullCount(stats, rowCount.get(), lowercaseToColumnsHandles));
+        }
+
+        return new DeltaLakeJsonFileStatistics(rowCount, minValues, maxValues, nullCount);
+    }
+
+    private static Map<String, Object> getNullCount(ComputedStatistics statistics, long rowCount, Map</* lowercase */ String, DeltaLakeColumnHandle> lowercaseToColumnsHandles)
+    {
+        return statistics.getColumnStatistics().entrySet().stream()
+                .filter(stats -> stats.getKey().getStatisticType() == NUMBER_OF_NON_NULL_VALUES
+                        && lowercaseToColumnsHandles.containsKey(stats.getKey().getColumnName()))
+                .map(stats -> Map.entry(lowercaseToColumnsHandles.get(stats.getKey().getColumnName()).getBasePhysicalColumnName(), getLongValue(stats.getValue())))
+                .filter(stats -> stats.getValue().isPresent())
+                .map(nonNullCount -> Map.entry(nonNullCount.getKey(), rowCount - nonNullCount.getValue().getAsLong()))
+                .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    private static Map<String, Object> getColumnStatistics(ComputedStatistics statistics, ColumnStatisticType statisticType, Map</* lowercase */ String, DeltaLakeColumnHandle> lowercaseToColumnsHandles)
+    {
+        return statistics.getColumnStatistics().entrySet().stream()
+                .filter(stats -> stats.getKey().getStatisticType().equals(statisticType)
+                        && lowercaseToColumnsHandles.containsKey(stats.getKey().getColumnName()))
+                .map(stats -> mapSingleStatisticsValueToJsonRepresentation(stats, lowercaseToColumnsHandles))
+                .filter(Optional::isPresent)
+                .flatMap(Optional::stream)
+                .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    private static Optional<Map.Entry<String, Object>> mapSingleStatisticsValueToJsonRepresentation(Map.Entry<ColumnStatisticMetadata, Block> statistics, Map</* lowercase */ String, DeltaLakeColumnHandle> lowercaseToColumnsHandles)
+    {
+        Type columnType = lowercaseToColumnsHandles.get(statistics.getKey().getColumnName()).getBasePhysicalType();
+        String physicalName = lowercaseToColumnsHandles.get(statistics.getKey().getColumnName()).getBasePhysicalColumnName();
+        if (columnType.equals(BOOLEAN) || columnType.equals(VARBINARY)) {
+            return Optional.empty();
+        }
+
+        Object value = readNativeValue(columnType, statistics.getValue(), 0);
+        Object jsonValue = toJsonValue(columnType, value);
+        if (jsonValue != null) {
+            return Optional.of(Map.entry(physicalName, jsonValue));
+        }
+        return Optional.empty();
+    }
+
+    private static OptionalLong getLongValue(Block block)
+    {
+        if (block == null || block.isNull(0)) {
+            return OptionalLong.empty();
+        }
+        return OptionalLong.of(block.getLong(0, 0));
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeDataFileCacheEntry.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeDataFileCacheEntry.java
index 72dbacae6b55..bc5f2f9d56f9 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeDataFileCacheEntry.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeDataFileCacheEntry.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.deltalake.transactionlog;
 
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.HashSet;
 import java.util.LinkedHashMap;
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeParquetStatisticsUtils.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeParquetStatisticsUtils.java
index adbba2203695..09b8c3944a05 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeParquetStatisticsUtils.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeParquetStatisticsUtils.java
@@ -18,9 +18,7 @@
 import io.airlift.slice.Slice;
 import io.trino.plugin.base.type.DecodedTimestamp;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.ColumnarRow;
-import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.DateType;
 import io.trino.spi.type.DecimalType;
@@ -31,6 +29,7 @@
 import io.trino.spi.type.TimestampWithTimeZoneType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.column.statistics.BinaryStatistics;
 import org.apache.parquet.column.statistics.DoubleStatistics;
 import org.apache.parquet.column.statistics.FloatStatistics;
@@ -40,8 +39,6 @@
 import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData;
 import org.apache.parquet.schema.LogicalTypeAnnotation;
 
-import javax.annotation.Nullable;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.Instant;
@@ -59,7 +56,7 @@
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.parquet.ParquetTimestampUtils.decodeInt96Timestamp;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
@@ -146,18 +143,15 @@ public static Object jsonValueToTrinoValue(Type type, @Nullable Object jsonValue
         if (type instanceof RowType rowType) {
             Map<?, ?> values = (Map<?, ?>) jsonValue;
             List<Type> fieldTypes = rowType.getTypeParameters();
-            BlockBuilder blockBuilder = new RowBlockBuilder(fieldTypes, null, 1);
-            BlockBuilder singleRowBlockWriter = blockBuilder.beginBlockEntry();
-            for (int i = 0; i < values.size(); ++i) {
-                Type fieldType = fieldTypes.get(i);
-                String fieldName = rowType.getFields().get(i).getName().orElseThrow(() -> new IllegalArgumentException("Field name must exist"));
-                Object fieldValue = jsonValueToTrinoValue(fieldType, values.remove(fieldName));
-                writeNativeValue(fieldType, singleRowBlockWriter, fieldValue);
-            }
-            checkState(values.isEmpty(), "All fields must be converted into Trino value: %s", values);
-
-            blockBuilder.closeEntry();
-            return blockBuilder.build();
+            return buildRowValue(rowType, fields -> {
+                for (int i = 0; i < values.size(); ++i) {
+                    Type fieldType = fieldTypes.get(i);
+                    String fieldName = rowType.getFields().get(i).getName().orElseThrow(() -> new IllegalArgumentException("Field name must exist"));
+                    Object fieldValue = jsonValueToTrinoValue(fieldType, values.remove(fieldName));
+                    writeNativeValue(fieldType, fields.get(i), fieldValue);
+                }
+                checkState(values.isEmpty(), "All fields must be converted into Trino value: %s", values);
+            });
         }
 
         throw new UnsupportedOperationException("Unsupported type: " + type);
@@ -177,7 +171,7 @@ public static Map<String, Object> toJsonValues(Map<String, Type> columnTypeMappi
     }
 
     @Nullable
-    private static Object toJsonValue(Type type, @Nullable Object value)
+    public static Object toJsonValue(Type type, @Nullable Object value)
     {
         if (value == null) {
             return null;
@@ -210,11 +204,12 @@ private static Object toJsonValue(Type type, @Nullable Object value)
             return ISO_INSTANT.format(ZonedDateTime.ofInstant(ts, UTC));
         }
         if (type instanceof RowType rowType) {
-            Block rowBlock = (Block) value;
+            SqlRow row = (SqlRow) value;
+            int rawIndex = row.getRawIndex();
             ImmutableMap.Builder<String, Object> fieldValues = ImmutableMap.builder();
-            for (int i = 0; i < rowBlock.getPositionCount(); i++) {
+            for (int i = 0; i < row.getFieldCount(); i++) {
                 RowType.Field field = rowType.getFields().get(i);
-                Object fieldValue = readNativeValue(field.getType(), rowBlock.getChildren().get(i), i);
+                Object fieldValue = readNativeValue(field.getType(), row.getRawFieldBlock(i), rawIndex);
                 Object jsonValue = toJsonValue(field.getType(), fieldValue);
                 if (jsonValue != null) {
                     fieldValues.put(field.getName().orElseThrow(), jsonValue);
@@ -250,31 +245,35 @@ private static Map<String, Object> jsonEncode(Map<String, Optional<Statistics<?>
     public static Map<String, Object> toNullCounts(Map<String, Type> columnTypeMapping, Map<String, Object> values)
     {
         ImmutableMap.Builder<String, Object> nullCounts = ImmutableMap.builderWithExpectedSize(values.size());
-        for (Map.Entry<String, Object> value : values.entrySet()) {
-            Type type = columnTypeMapping.get(value.getKey());
+        for (Map.Entry<String, Object> entry : values.entrySet()) {
+            Type type = columnTypeMapping.get(entry.getKey());
             requireNonNull(type, "type is null");
-            nullCounts.put(value.getKey(), toNullCount(type, value.getValue()));
+            Object value = entry.getValue();
+            if (type instanceof RowType rowType) {
+                value = toNullCount(rowType, (SqlRow) value);
+            }
+            nullCounts.put(entry.getKey(), value);
         }
         return nullCounts.buildOrThrow();
     }
 
-    private static Object toNullCount(Type type, Object value)
+    private static ImmutableMap<String, Object> toNullCount(RowType rowType, SqlRow row)
     {
-        if (type instanceof RowType rowType) {
-            ColumnarRow row = toColumnarRow((Block) value);
-            ImmutableMap.Builder<String, Object> nullCounts = ImmutableMap.builderWithExpectedSize(row.getPositionCount());
-            for (int i = 0; i < row.getPositionCount(); i++) {
-                RowType.Field field = rowType.getFields().get(i);
-                if (field.getType() instanceof RowType) {
-                    nullCounts.put(field.getName().orElseThrow(), toNullCount(field.getType(), row.getField(i)));
-                }
-                else {
-                    nullCounts.put(field.getName().orElseThrow(), BIGINT.getLong(row.getField(i), 0));
-                }
+        List<RowType.Field> fields = rowType.getFields();
+        ImmutableMap.Builder<String, Object> nullCounts = ImmutableMap.builderWithExpectedSize(fields.size());
+        for (int i = 0; i < fields.size(); i++) {
+            RowType.Field field = fields.get(i);
+            Block fieldBlock = row.getRawFieldBlock(i);
+            int fieldBlockIndex = row.getRawIndex();
+            String fieldName = field.getName().orElseThrow();
+            if (field.getType() instanceof RowType fieldRowType) {
+                nullCounts.put(fieldName, toNullCount(fieldRowType, fieldBlock.getObject(fieldBlockIndex, SqlRow.class)));
+            }
+            else {
+                nullCounts.put(fieldName, BIGINT.getLong(fieldBlock, fieldBlockIndex));
             }
-            return nullCounts.buildOrThrow();
         }
-        return value;
+        return nullCounts.buildOrThrow();
     }
 
     private static Optional<Object> getMin(Type type, Statistics<?> statistics)
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeSchemaSupport.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeSchemaSupport.java
index fb4f5f41141e..a7a21bf6e3a9 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeSchemaSupport.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeSchemaSupport.java
@@ -17,10 +17,12 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Enums;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import com.google.common.collect.Streams;
 import io.airlift.json.ObjectMapperProvider;
 import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
 import io.trino.plugin.deltalake.DeltaLakeColumnMetadata;
@@ -33,7 +35,7 @@
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
-import io.trino.spi.type.StandardTypes;
+import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.TimestampWithTimeZoneType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
@@ -41,23 +43,28 @@
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.TypeSignatureParameter;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.AbstractMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.Streams.stream;
+import static com.google.common.primitives.Booleans.countTrue;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.PARTITION_KEY;
 import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA;
+import static io.trino.plugin.deltalake.transactionlog.MetadataEntry.DELTA_CHANGE_DATA_FEED_ENABLED_PROPERTY;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -66,13 +73,15 @@
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
-import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
+import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.Boolean.parseBoolean;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
+import static java.util.Objects.requireNonNull;
 
 public final class DeltaLakeSchemaSupport
 {
@@ -80,6 +89,33 @@ private DeltaLakeSchemaSupport() {}
 
     public static final String APPEND_ONLY_CONFIGURATION_KEY = "delta.appendOnly";
     public static final String COLUMN_MAPPING_MODE_CONFIGURATION_KEY = "delta.columnMapping.mode";
+    public static final String COLUMN_MAPPING_PHYSICAL_NAME_CONFIGURATION_KEY = "delta.columnMapping.physicalName";
+    public static final String MAX_COLUMN_ID_CONFIGURATION_KEY = "delta.columnMapping.maxColumnId";
+    private static final String DELETION_VECTORS_CONFIGURATION_KEY = "delta.enableDeletionVectors";
+
+    // https://github.com/delta-io/delta/blob/master/PROTOCOL.md#valid-feature-names-in-table-features
+    private static final String APPEND_ONLY_FEATURE_NAME = "appendOnly";
+    private static final String CHANGE_DATA_FEED_FEATURE_NAME = "changeDataFeed";
+    private static final String CHECK_CONSTRAINTS_FEATURE_NAME = "checkConstraints";
+    private static final String COLUMN_MAPPING_FEATURE_NAME = "columnMapping";
+    private static final String DELETION_VECTORS_FEATURE_NAME = "deletionVectors";
+    private static final String IDENTITY_COLUMNS_FEATURE_NAME = "identityColumns";
+    private static final String INVARIANTS_FEATURE_NAME = "invariants";
+    public static final String TIMESTAMP_NTZ_FEATURE_NAME = "timestampNtz";
+
+    private static final Set<String> SUPPORTED_READER_FEATURES = ImmutableSet.<String>builder()
+            .add(COLUMN_MAPPING_FEATURE_NAME)
+            .add(TIMESTAMP_NTZ_FEATURE_NAME)
+            .add(DELETION_VECTORS_FEATURE_NAME)
+            .build();
+    private static final Set<String> SUPPORTED_WRITER_FEATURES = ImmutableSet.<String>builder()
+            .add(APPEND_ONLY_FEATURE_NAME)
+            .add(INVARIANTS_FEATURE_NAME)
+            .add(CHECK_CONSTRAINTS_FEATURE_NAME)
+            .add(CHANGE_DATA_FEED_FEATURE_NAME)
+            .add(COLUMN_MAPPING_FEATURE_NAME)
+            .add(TIMESTAMP_NTZ_FEATURE_NAME)
+            .build();
 
     public enum ColumnMappingMode
     {
@@ -105,41 +141,71 @@ public enum ColumnMappingMode
 
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapperProvider().get();
 
-    public static boolean isAppendOnly(MetadataEntry metadataEntry)
+    public static boolean isAppendOnly(MetadataEntry metadataEntry, ProtocolEntry protocolEntry)
     {
+        if (protocolEntry.supportsWriterFeatures() && !protocolEntry.writerFeaturesContains(APPEND_ONLY_FEATURE_NAME)) {
+            return false;
+        }
         return parseBoolean(metadataEntry.getConfiguration().getOrDefault(APPEND_ONLY_CONFIGURATION_KEY, "false"));
     }
 
-    public static ColumnMappingMode getColumnMappingMode(MetadataEntry metadata)
+    public static boolean isDeletionVectorEnabled(MetadataEntry metadataEntry, ProtocolEntry protocolEntry)
     {
+        if (protocolEntry.supportsWriterFeatures() && !protocolEntry.writerFeaturesContains(DELETION_VECTORS_FEATURE_NAME)) {
+            return false;
+        }
+        return parseBoolean(metadataEntry.getConfiguration().get(DELETION_VECTORS_CONFIGURATION_KEY));
+    }
+
+    public static ColumnMappingMode getColumnMappingMode(MetadataEntry metadata, ProtocolEntry protocolEntry)
+    {
+        if (protocolEntry.supportsReaderFeatures() || protocolEntry.supportsWriterFeatures()) {
+            boolean supportsColumnMappingReader = protocolEntry.readerFeaturesContains(COLUMN_MAPPING_FEATURE_NAME);
+            boolean supportsColumnMappingWriter = protocolEntry.writerFeaturesContains(COLUMN_MAPPING_FEATURE_NAME);
+            int columnMappingEnabled = countTrue(supportsColumnMappingReader, supportsColumnMappingWriter);
+            checkArgument(
+                    columnMappingEnabled == 0 || columnMappingEnabled == 2,
+                    "Both reader and writer features should must the same value for 'columnMapping'. reader: %s, writer: %s", supportsColumnMappingReader, supportsColumnMappingWriter);
+            if (columnMappingEnabled == 0) {
+                return ColumnMappingMode.NONE;
+            }
+        }
         String columnMappingMode = metadata.getConfiguration().getOrDefault(COLUMN_MAPPING_MODE_CONFIGURATION_KEY, "none");
         return Enums.getIfPresent(ColumnMappingMode.class, columnMappingMode.toUpperCase(ENGLISH)).or(ColumnMappingMode.UNKNOWN);
     }
 
-    public static List<DeltaLakeColumnHandle> extractPartitionColumns(MetadataEntry metadataEntry, TypeManager typeManager)
+    public static int getMaxColumnId(MetadataEntry metadata)
+    {
+        String maxColumnId = metadata.getConfiguration().get(MAX_COLUMN_ID_CONFIGURATION_KEY);
+        requireNonNull(maxColumnId, MAX_COLUMN_ID_CONFIGURATION_KEY + " metadata configuration property not found");
+        return Integer.parseInt(maxColumnId);
+    }
+
+    public static List<DeltaLakeColumnHandle> extractPartitionColumns(MetadataEntry metadataEntry, ProtocolEntry protocolEntry, TypeManager typeManager)
     {
-        return extractPartitionColumns(extractSchema(metadataEntry, typeManager), metadataEntry.getCanonicalPartitionColumns());
+        return extractPartitionColumns(extractSchema(metadataEntry, protocolEntry, typeManager), metadataEntry.getOriginalPartitionColumns());
     }
 
-    public static List<DeltaLakeColumnHandle> extractPartitionColumns(List<DeltaLakeColumnMetadata> schema, List<String> canonicalPartitionColumns)
+    public static List<DeltaLakeColumnHandle> extractPartitionColumns(List<DeltaLakeColumnMetadata> schema, List<String> originalPartitionColumns)
     {
-        if (canonicalPartitionColumns.isEmpty()) {
+        if (originalPartitionColumns.isEmpty()) {
             return ImmutableList.of();
         }
         return schema.stream()
-                .filter(entry -> canonicalPartitionColumns.contains(entry.getName()))
-                .map(entry -> new DeltaLakeColumnHandle(entry.getName(), entry.getType(), OptionalInt.empty(), entry.getPhysicalName(), entry.getPhysicalColumnType(), PARTITION_KEY))
+                .filter(entry -> originalPartitionColumns.contains(entry.getName()))
+                .map(entry -> new DeltaLakeColumnHandle(entry.getName(), entry.getType(), OptionalInt.empty(), entry.getPhysicalName(), entry.getPhysicalColumnType(), PARTITION_KEY, Optional.empty()))
                 .collect(toImmutableList());
     }
 
     public static String serializeSchemaAsJson(
-            List<DeltaLakeColumnHandle> columns,
+            List<String> columnNames,
+            Map<String, Object> columnTypes,
             Map<String, String> columnComments,
             Map<String, Boolean> columnNullability,
             Map<String, Map<String, Object>> columnMetadata)
     {
         try {
-            return OBJECT_MAPPER.writeValueAsString(serializeStructType(columns, columnComments, columnNullability, columnMetadata));
+            return OBJECT_MAPPER.writeValueAsString(serializeStructType(columnNames, columnTypes, columnComments, columnNullability, columnMetadata));
         }
         catch (JsonProcessingException e) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, getLocation(e), "Failed to encode Delta Lake schema", e);
@@ -147,33 +213,37 @@ public static String serializeSchemaAsJson(
     }
 
     private static Map<String, Object> serializeStructType(
-            List<DeltaLakeColumnHandle> columns,
+            List<String> columnNames,
+            Map<String, Object> columnTypes,
             Map<String, String> columnComments,
             Map<String, Boolean> columnNullability,
             Map<String, Map<String, Object>> columnMetadata)
     {
+        // https://github.com/delta-io/delta/blob/master/PROTOCOL.md#struct-type
         ImmutableMap.Builder<String, Object> schema = ImmutableMap.builder();
 
-        schema.put("fields", columns.stream()
-                .map(column -> {
-                    String columnName = column.getName();
-                    return serializeStructField(
-                            column.getName(),
-                            column.getType(),
-                            columnComments.get(columnName),
-                            columnNullability.get(columnName),
-                            columnMetadata.get(columnName));
-                })
-                .collect(toImmutableList()));
         schema.put("type", "struct");
+        schema.put("fields", columnNames.stream()
+                .map(columnName -> serializeStructField(
+                        columnName,
+                        columnTypes.get(columnName),
+                        columnComments.get(columnName),
+                        columnNullability.get(columnName),
+                        columnMetadata.get(columnName)))
+                .collect(toImmutableList()));
 
         return schema.buildOrThrow();
     }
 
-    private static Map<String, Object> serializeStructField(String name, Type type, @Nullable String comment, @Nullable Boolean nullable, @Nullable Map<String, Object> metadata)
+    private static Map<String, Object> serializeStructField(String name, Object type, @Nullable String comment, @Nullable Boolean nullable, @Nullable Map<String, Object> metadata)
     {
+        // https://github.com/delta-io/delta/blob/master/PROTOCOL.md#struct-field
         ImmutableMap.Builder<String, Object> fieldContents = ImmutableMap.builder();
 
+        fieldContents.put("name", name);
+        fieldContents.put("type", type);
+        fieldContents.put("nullable", nullable != null ? nullable : true);
+
         ImmutableMap.Builder<String, Object> columnMetadata = ImmutableMap.builder();
         if (comment != null) {
             columnMetadata.put("comment", comment);
@@ -183,63 +253,84 @@ private static Map<String, Object> serializeStructField(String name, Type type,
                     .filter(entry -> !entry.getKey().equals("comment"))
                     .forEach(entry -> columnMetadata.put(entry.getKey(), entry.getValue()));
         }
-
         fieldContents.put("metadata", columnMetadata.buildOrThrow());
-        fieldContents.put("name", name);
-        fieldContents.put("nullable", nullable != null ? nullable : true);
-        fieldContents.put("type", serializeColumnType(type));
 
         return fieldContents.buildOrThrow();
     }
 
-    private static Object serializeColumnType(Type columnType)
+    public static Object serializeColumnType(ColumnMappingMode columnMappingMode, AtomicInteger maxColumnId, Type columnType)
     {
         if (columnType instanceof ArrayType) {
-            return serializeArrayType((ArrayType) columnType);
+            return serializeArrayType(columnMappingMode, maxColumnId, (ArrayType) columnType);
         }
         if (columnType instanceof RowType) {
-            return serializeStructType((RowType) columnType);
+            return serializeStructType(columnMappingMode, maxColumnId, (RowType) columnType);
         }
         if (columnType instanceof MapType) {
-            return serializeMapType((MapType) columnType);
+            return serializeMapType(columnMappingMode, maxColumnId, (MapType) columnType);
         }
         return serializePrimitiveType(columnType);
     }
 
-    private static Map<String, Object> serializeArrayType(ArrayType arrayType)
+    private static Map<String, Object> serializeArrayType(ColumnMappingMode columnMappingMode, AtomicInteger maxColumnId, ArrayType arrayType)
     {
+        // https://github.com/delta-io/delta/blob/master/PROTOCOL.md#array-type
         ImmutableMap.Builder<String, Object> fields = ImmutableMap.builder();
 
         fields.put("type", "array");
+        fields.put("elementType", serializeColumnType(columnMappingMode, maxColumnId, arrayType.getElementType()));
         fields.put("containsNull", true);
-        fields.put("elementType", serializeColumnType(arrayType.getElementType()));
 
         return fields.buildOrThrow();
     }
 
-    private static Map<String, Object> serializeMapType(MapType mapType)
+    private static Map<String, Object> serializeMapType(ColumnMappingMode columnMappingMode, AtomicInteger maxColumnId, MapType mapType)
     {
+        // https://github.com/delta-io/delta/blob/master/PROTOCOL.md#map-type
         ImmutableMap.Builder<String, Object> fields = ImmutableMap.builder();
 
-        fields.put("keyType", serializeColumnType(mapType.getKeyType()));
         fields.put("type", "map");
+        fields.put("keyType", serializeColumnType(columnMappingMode, maxColumnId, mapType.getKeyType()));
+        fields.put("valueType", serializeColumnType(columnMappingMode, maxColumnId, mapType.getValueType()));
         fields.put("valueContainsNull", true);
-        fields.put("valueType", serializeColumnType(mapType.getValueType()));
 
         return fields.buildOrThrow();
     }
 
-    private static Map<String, Object> serializeStructType(RowType rowType)
+    private static Map<String, Object> serializeStructType(ColumnMappingMode columnMappingMode, AtomicInteger maxColumnId, RowType rowType)
     {
         ImmutableMap.Builder<String, Object> fields = ImmutableMap.builder();
 
         fields.put("type", "struct");
         fields.put("fields", rowType.getFields().stream()
-                .map(field -> serializeStructField(field.getName().orElse(null), field.getType(), null, null, null)).collect(toImmutableList()));
+                .map(field -> {
+                    Object fieldType = serializeColumnType(columnMappingMode, maxColumnId, field.getType());
+                    Map<String, Object> metadata = generateColumnMetadata(columnMappingMode, maxColumnId);
+                    return serializeStructField(field.getName().orElse(null), fieldType, null, null, metadata);
+                })
+                .collect(toImmutableList()));
 
         return fields.buildOrThrow();
     }
 
+    public static Map<String, Object> generateColumnMetadata(ColumnMappingMode columnMappingMode, AtomicInteger maxColumnId)
+    {
+        return switch (columnMappingMode) {
+            case NONE -> {
+                verify(maxColumnId.get() == 0, "maxColumnId must be 0 for column mapping mode 'none'");
+                yield ImmutableMap.of();
+            }
+            case ID, NAME -> ImmutableMap.<String, Object>builder()
+                    // Set both 'id' and 'physicalName' regardless of the mode https://github.com/delta-io/delta/blob/master/PROTOCOL.md#column-mapping
+                    // > There are two modes of column mapping, by name and by id.
+                    // > In both modes, every column - nested or leaf - is assigned a unique physical name, and a unique 32-bit integer as an id.
+                    .put("delta.columnMapping.id", maxColumnId.incrementAndGet())
+                    .put("delta.columnMapping.physicalName", "col-" + UUID.randomUUID()) // This logic is same as DeltaColumnMapping.generatePhysicalName in Delta Lake
+                    .buildOrThrow();
+            default -> throw new IllegalArgumentException("Unexpected column mapping mode: " + columnMappingMode);
+        };
+    }
+
     private static String serializePrimitiveType(Type type)
     {
         return serializeSupportedPrimitiveType(type)
@@ -248,6 +339,9 @@ private static String serializePrimitiveType(Type type)
 
     private static Optional<String> serializeSupportedPrimitiveType(Type type)
     {
+        if (type instanceof TimestampType) {
+            return Optional.of("timestamp_ntz");
+        }
         if (type instanceof TimestampWithTimeZoneType) {
             return Optional.of("timestamp");
         }
@@ -294,6 +388,7 @@ private static void validateStructuralType(Optional<Type> rootType, Type type)
     private static void validatePrimitiveType(Type type)
     {
         if (serializeSupportedPrimitiveType(type).isEmpty() ||
+                (type instanceof TimestampType && ((TimestampType) type).getPrecision() != 6) ||
                 (type instanceof TimestampWithTimeZoneType && ((TimestampWithTimeZoneType) type).getPrecision() != 3)) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Unsupported type: " + type);
         }
@@ -305,16 +400,16 @@ public static String serializeStatsAsJson(DeltaLakeFileStatistics fileStatistics
         return OBJECT_MAPPER.writeValueAsString(fileStatistics);
     }
 
-    public static List<ColumnMetadata> extractColumnMetadata(MetadataEntry metadataEntry, TypeManager typeManager)
+    public static List<ColumnMetadata> extractColumnMetadata(MetadataEntry metadataEntry, ProtocolEntry protocolEntry, TypeManager typeManager)
     {
-        return extractSchema(metadataEntry, typeManager).stream()
+        return extractSchema(metadataEntry, protocolEntry, typeManager).stream()
                 .map(DeltaLakeColumnMetadata::getColumnMetadata)
                 .collect(toImmutableList());
     }
 
-    public static List<DeltaLakeColumnMetadata> extractSchema(MetadataEntry metadataEntry, TypeManager typeManager)
+    public static List<DeltaLakeColumnMetadata> extractSchema(MetadataEntry metadataEntry, ProtocolEntry protocolEntry, TypeManager typeManager)
     {
-        ColumnMappingMode mappingMode = getColumnMappingMode(metadataEntry);
+        ColumnMappingMode mappingMode = getColumnMappingMode(metadataEntry, protocolEntry);
         verifySupportedColumnMapping(mappingMode);
         return Optional.ofNullable(metadataEntry.getSchemaString())
                 .map(json -> getColumnMetadata(json, typeManager, mappingMode))
@@ -328,8 +423,7 @@ public static void verifySupportedColumnMapping(ColumnMappingMode mappingMode)
         }
     }
 
-    @VisibleForTesting
-    static List<DeltaLakeColumnMetadata> getColumnMetadata(String json, TypeManager typeManager, ColumnMappingMode mappingMode)
+    public static List<DeltaLakeColumnMetadata> getColumnMetadata(String json, TypeManager typeManager, ColumnMappingMode mappingMode)
     {
         try {
             return stream(OBJECT_MAPPER.readTree(json).get("fields").elements())
@@ -375,7 +469,12 @@ private static DeltaLakeColumnMetadata mapColumn(TypeManager typeManager, JsonNo
                 .setNullable(nullable)
                 .setComment(Optional.ofNullable(getComment(node)))
                 .build();
-        return new DeltaLakeColumnMetadata(columnMetadata, fieldId, physicalName, physicalColumnType);
+        return new DeltaLakeColumnMetadata(columnMetadata, fieldName, fieldId, physicalName, physicalColumnType);
+    }
+
+    public static Map<String, Object> getColumnTypes(MetadataEntry metadataEntry)
+    {
+        return getColumnProperties(metadataEntry, node -> OBJECT_MAPPER.convertValue(node.get("type"), new TypeReference<>(){}));
     }
 
     public static Map<String, String> getColumnComments(MetadataEntry metadataEntry)
@@ -395,11 +494,38 @@ public static Map<String, Boolean> getColumnsNullability(MetadataEntry metadataE
         return getColumnProperties(metadataEntry, node -> node.get("nullable").asBoolean());
     }
 
-    public static Map<String, String> getColumnInvariants(MetadataEntry metadataEntry)
+    public static Map<String, Boolean> getColumnIdentities(MetadataEntry metadataEntry, ProtocolEntry protocolEntry)
+    {
+        if (protocolEntry.supportsWriterFeatures() && !protocolEntry.writerFeaturesContains(IDENTITY_COLUMNS_FEATURE_NAME)) {
+            return ImmutableMap.of();
+        }
+        return getColumnProperties(metadataEntry, DeltaLakeSchemaSupport::isIdentityColumn);
+    }
+
+    private static boolean isIdentityColumn(JsonNode node)
+    {
+        return Streams.stream(node.get("metadata").fieldNames())
+                .anyMatch(name -> name.startsWith("delta.identity."));
+    }
+
+    public static Map<String, String> getColumnInvariants(MetadataEntry metadataEntry, ProtocolEntry protocolEntry)
     {
+        if (protocolEntry.supportsWriterFeatures()) {
+            if (!protocolEntry.writerFeaturesContains(INVARIANTS_FEATURE_NAME)) {
+                return ImmutableMap.of();
+            }
+            return getColumnProperties(metadataEntry, DeltaLakeSchemaSupport::getInvariantsWriterFeature);
+        }
         return getColumnProperties(metadataEntry, DeltaLakeSchemaSupport::getInvariants);
     }
 
+    @Nullable
+    private static String getInvariantsWriterFeature(JsonNode node)
+    {
+        JsonNode invariants = node.get("metadata").get("delta.invariants");
+        return invariants == null ? null : invariants.asText();
+    }
+
     @Nullable
     private static String getInvariants(JsonNode node)
     {
@@ -429,17 +555,26 @@ private static String getGeneratedColumnExpressions(JsonNode node)
         return generationExpression == null ? null : generationExpression.asText();
     }
 
-    public static Map<String, String> getCheckConstraints(MetadataEntry metadataEntry)
+    public static Map<String, String> getCheckConstraints(MetadataEntry metadataEntry, ProtocolEntry protocolEntry)
     {
+        if (protocolEntry.supportsWriterFeatures() && !protocolEntry.writerFeaturesContains(CHECK_CONSTRAINTS_FEATURE_NAME)) {
+            return ImmutableMap.of();
+        }
         return metadataEntry.getConfiguration().entrySet().stream()
                 .filter(entry -> entry.getKey().startsWith("delta.constraints."))
                 .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 
-    public static boolean changeDataFeedEnabled(MetadataEntry metadataEntry)
+    public static Optional<Boolean> changeDataFeedEnabled(MetadataEntry metadataEntry, ProtocolEntry protocolEntry)
     {
-        String enableChangeDataFeed = metadataEntry.getConfiguration().getOrDefault("delta.enableChangeDataFeed", "false");
-        return parseBoolean(enableChangeDataFeed);
+        if (protocolEntry.supportsWriterFeatures() && !protocolEntry.writerFeaturesContains(CHANGE_DATA_FEED_FEATURE_NAME)) {
+            return Optional.empty();
+        }
+        String enableChangeDataFeed = metadataEntry.getConfiguration().get(DELTA_CHANGE_DATA_FEED_ENABLED_PROPERTY);
+        if (enableChangeDataFeed == null) {
+            return Optional.empty();
+        }
+        return Optional.of(parseBoolean(enableChangeDataFeed));
     }
 
     public static Map<String, Map<String, Object>> getColumnsMetadata(MetadataEntry metadataEntry)
@@ -467,59 +602,81 @@ private static <T> Map<String, T> getColumnProperty(String json, Function<JsonNo
         }
     }
 
+    /**
+     * @return the case-sensitive column names
+     */
+    public static List<String> getExactColumnNames(MetadataEntry metadataEntry)
+    {
+        try {
+            return stream(OBJECT_MAPPER.readTree(metadataEntry.getSchemaString()).get("fields").elements())
+                    .map(field -> field.get("name").asText())
+                    .collect(toImmutableList());
+        }
+        catch (JsonProcessingException e) {
+            throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, getLocation(e), "Failed to parse serialized schema: " + metadataEntry.getSchemaString(), e);
+        }
+    }
+
+    public static Set<String> unsupportedReaderFeatures(Set<String> features)
+    {
+        return Sets.difference(features, SUPPORTED_READER_FEATURES);
+    }
+
+    public static Set<String> unsupportedWriterFeatures(Set<String> features)
+    {
+        return Sets.difference(features, SUPPORTED_WRITER_FEATURES);
+    }
+
+    public static Type deserializeType(TypeManager typeManager, Object type, boolean usePhysicalName)
+    {
+        try {
+            String json = OBJECT_MAPPER.writeValueAsString(type);
+            return buildType(typeManager, OBJECT_MAPPER.readTree(json), usePhysicalName);
+        }
+        catch (JsonProcessingException e) {
+            throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Failed to deserialize type: " + type);
+        }
+    }
+
     private static Type buildType(TypeManager typeManager, JsonNode typeNode, boolean usePhysicalName)
     {
         if (typeNode.isContainerNode()) {
             return buildContainerType(typeManager, typeNode, usePhysicalName);
         }
         String primitiveType = typeNode.asText();
-        if (primitiveType.startsWith(StandardTypes.DECIMAL)) {
+        if (primitiveType.startsWith("decimal")) {
             return typeManager.fromSqlType(primitiveType);
         }
-        switch (primitiveType) {
-            case "string":
-                return VARCHAR;
-            case "long":
-                return BIGINT;
-            case "integer":
-                return INTEGER;
-            case "short":
-                return SMALLINT;
-            case "byte":
-                return TINYINT;
-            case "float":
-                return REAL;
-            case "double":
-                return DOUBLE;
-            case "boolean":
-                return BOOLEAN;
-            case "binary":
-                return VARBINARY;
-            case "date":
-                return DATE;
-            case "timestamp":
-                // Spark/DeltaLake stores timestamps in UTC, but renders them in session time zone.
-                // For more info, see https://delta-users.slack.com/archives/GKTUWT03T/p1585760533005400
-                // and https://cwiki.apache.org/confluence/display/Hive/Different+TIMESTAMP+types
-                return createTimestampWithTimeZoneType(3);
-            default:
-                throw new TypeNotFoundException(new TypeSignature(primitiveType));
-        }
+        return switch (primitiveType) {
+            case "string" -> VARCHAR;
+            case "long" -> BIGINT;
+            case "integer" -> INTEGER;
+            case "short" -> SMALLINT;
+            case "byte" -> TINYINT;
+            case "float" -> REAL;
+            case "double" -> DOUBLE;
+            case "boolean" -> BOOLEAN;
+            case "binary" -> VARBINARY;
+            case "date" -> DATE;
+            // https://github.com/delta-io/delta/blob/master/PROTOCOL.md#timestamp-without-timezone-timestampntz
+            case "timestamp_ntz" -> TIMESTAMP_MICROS;
+            // Spark/DeltaLake stores timestamps in UTC, but renders them in session time zone.
+            // For more info, see https://delta-users.slack.com/archives/GKTUWT03T/p1585760533005400
+            // and https://cwiki.apache.org/confluence/display/Hive/Different+TIMESTAMP+types
+            case "timestamp" -> TIMESTAMP_TZ_MILLIS;
+            default -> throw new TypeNotFoundException(new TypeSignature(primitiveType));
+        };
     }
 
     private static Type buildContainerType(TypeManager typeManager, JsonNode typeNode, boolean usePhysicalName)
     {
         String containerType = typeNode.get("type").asText();
-        switch (containerType) {
-            case "array":
-                return buildArrayType(typeManager, typeNode, usePhysicalName);
-            case "map":
-                return buildMapType(typeManager, typeNode, usePhysicalName);
-            case "struct":
-                return buildRowType(typeManager, typeNode, usePhysicalName);
-            default:
-                throw new TypeNotFoundException(new TypeSignature(containerType));
-        }
+        return switch (containerType) {
+            case "array" -> buildArrayType(typeManager, typeNode, usePhysicalName);
+            case "map" -> buildMapType(typeManager, typeNode, usePhysicalName);
+            case "struct" -> buildRowType(typeManager, typeNode, usePhysicalName);
+            default -> throw new TypeNotFoundException(new TypeSignature(containerType));
+        };
     }
 
     private static RowType buildRowType(TypeManager typeManager, JsonNode typeNode, boolean usePhysicalName)
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeTransactionLogEntry.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeTransactionLogEntry.java
index 13f89a08cdf2..cb86f1c99f4e 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeTransactionLogEntry.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeTransactionLogEntry.java
@@ -15,8 +15,9 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.annotation.Nullable;
 
-import javax.annotation.Nullable;
+import java.util.Objects;
 
 import static java.util.Objects.requireNonNull;
 
@@ -28,7 +29,7 @@ public class DeltaLakeTransactionLogEntry
     private final MetadataEntry metaData;
     private final ProtocolEntry protocol;
     private final CommitInfoEntry commitInfo;
-    private final CdfFileEntry cdfFileEntry;
+    private final CdcEntry cdcEntry;
 
     private DeltaLakeTransactionLogEntry(
             TransactionEntry txn,
@@ -37,7 +38,7 @@ private DeltaLakeTransactionLogEntry(
             MetadataEntry metaData,
             ProtocolEntry protocol,
             CommitInfoEntry commitInfo,
-            CdfFileEntry cdfFileEntry)
+            CdcEntry cdcEntry)
     {
         this.txn = txn;
         this.add = add;
@@ -45,7 +46,7 @@ private DeltaLakeTransactionLogEntry(
         this.metaData = metaData;
         this.protocol = protocol;
         this.commitInfo = commitInfo;
-        this.cdfFileEntry = cdfFileEntry;
+        this.cdcEntry = cdcEntry;
     }
 
     @JsonCreator
@@ -56,9 +57,9 @@ public static DeltaLakeTransactionLogEntry fromJson(
             @JsonProperty("metaData") MetadataEntry metaData,
             @JsonProperty("protocol") ProtocolEntry protocol,
             @JsonProperty("commitInfo") CommitInfoEntry commitInfo,
-            @JsonProperty("cdfFileEntry") CdfFileEntry cdfFileEntry)
+            @JsonProperty("cdc") CdcEntry cdcEntry)
     {
-        return new DeltaLakeTransactionLogEntry(txn, add, remove, metaData, protocol, commitInfo, cdfFileEntry);
+        return new DeltaLakeTransactionLogEntry(txn, add, remove, metaData, protocol, commitInfo, cdcEntry);
     }
 
     public static DeltaLakeTransactionLogEntry transactionEntry(TransactionEntry transaction)
@@ -97,10 +98,10 @@ public static DeltaLakeTransactionLogEntry removeFileEntry(RemoveFileEntry remov
         return new DeltaLakeTransactionLogEntry(null, null, removeFileEntry, null, null, null, null);
     }
 
-    public static DeltaLakeTransactionLogEntry cdfFileEntry(CdfFileEntry cdfFileEntry)
+    public static DeltaLakeTransactionLogEntry cdcEntry(CdcEntry cdcEntry)
     {
-        requireNonNull(cdfFileEntry, "cdfFileEntry is null");
-        return new DeltaLakeTransactionLogEntry(null, null, null, null, null, null, cdfFileEntry);
+        requireNonNull(cdcEntry, "cdcEntry is null");
+        return new DeltaLakeTransactionLogEntry(null, null, null, null, null, null, cdcEntry);
     }
 
     @Nullable
@@ -147,19 +148,44 @@ public CommitInfoEntry getCommitInfo()
 
     @Nullable
     @JsonProperty
-    public CdfFileEntry getCDC()
+    public CdcEntry getCDC()
     {
-        return cdfFileEntry;
+        return cdcEntry;
     }
 
     public DeltaLakeTransactionLogEntry withCommitInfo(CommitInfoEntry commitInfo)
     {
-        return new DeltaLakeTransactionLogEntry(txn, add, remove, metaData, protocol, commitInfo, cdfFileEntry);
+        return new DeltaLakeTransactionLogEntry(txn, add, remove, metaData, protocol, commitInfo, cdcEntry);
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        DeltaLakeTransactionLogEntry that = (DeltaLakeTransactionLogEntry) o;
+        return Objects.equals(txn, that.txn) &&
+                Objects.equals(add, that.add) &&
+                Objects.equals(remove, that.remove) &&
+                Objects.equals(metaData, that.metaData) &&
+                Objects.equals(protocol, that.protocol) &&
+                Objects.equals(commitInfo, that.commitInfo) &&
+                Objects.equals(cdcEntry, that.cdcEntry);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(txn, add, remove, metaData, protocol, commitInfo, cdcEntry);
     }
 
     @Override
     public String toString()
     {
-        return String.format("DeltaLakeTransactionLogEntry{%s, %s, %s, %s, %s, %s, %s}", txn, add, remove, metaData, protocol, commitInfo, cdfFileEntry);
+        return String.format("DeltaLakeTransactionLogEntry{%s, %s, %s, %s, %s, %s, %s}", txn, add, remove, metaData, protocol, commitInfo, cdcEntry);
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/MetadataEntry.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/MetadataEntry.java
index 9a5cf346a48e..6bd31e60a217 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/MetadataEntry.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/MetadataEntry.java
@@ -17,18 +17,22 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.ColumnMappingMode;
 import io.trino.spi.TrinoException;
 
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.OptionalInt;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.COLUMN_MAPPING_MODE_CONFIGURATION_KEY;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.MAX_COLUMN_ID_CONFIGURATION_KEY;
 import static java.lang.Long.parseLong;
 import static java.lang.String.format;
+import static java.util.Locale.ENGLISH;
 
 public class MetadataEntry
 {
@@ -67,7 +71,7 @@ public MetadataEntry(
         this.partitionColumns = partitionColumns;
         this.canonicalPartitionColumns = partitionColumns.stream()
                 // canonicalize partition keys to lowercase so they match column names used in DeltaLakeColumnHandle
-                .map(value -> value.toLowerCase(Locale.ENGLISH))
+                .map(value -> value.toLowerCase(ENGLISH))
                 .collect(toImmutableList());
         this.configuration = configuration;
         this.createdTime = createdTime;
@@ -116,7 +120,7 @@ public List<String> getOriginalPartitionColumns()
      * For use in read-path. Returns lowercase partition column names.
      */
     @JsonIgnore
-    public List<String> getCanonicalPartitionColumns()
+    public List<String> getLowercasePartitionColumns()
     {
         return canonicalPartitionColumns;
     }
@@ -157,27 +161,23 @@ public Optional<Long> getCheckpointInterval()
         }
     }
 
-    @JsonIgnore
-    public Optional<Boolean> isChangeDataFeedEnabled()
-    {
-        if (this.getConfiguration() == null) {
-            return Optional.empty();
-        }
-
-        String value = this.getConfiguration().get(DELTA_CHANGE_DATA_FEED_ENABLED_PROPERTY);
-        if (value == null) {
-            return Optional.empty();
-        }
-
-        boolean changeDataFeedEnabled = Boolean.parseBoolean(value);
-        return Optional.of(changeDataFeedEnabled);
-    }
-
-    public static Map<String, String> configurationForNewTable(Optional<Long> checkpointInterval, Optional<Boolean> changeDataFeedEnabled)
+    public static Map<String, String> configurationForNewTable(
+            Optional<Long> checkpointInterval,
+            Optional<Boolean> changeDataFeedEnabled,
+            ColumnMappingMode columnMappingMode,
+            OptionalInt maxFieldId)
     {
         ImmutableMap.Builder<String, String> configurationMapBuilder = ImmutableMap.builder();
         checkpointInterval.ifPresent(interval -> configurationMapBuilder.put(DELTA_CHECKPOINT_INTERVAL_PROPERTY, String.valueOf(interval)));
         changeDataFeedEnabled.ifPresent(enabled -> configurationMapBuilder.put(DELTA_CHANGE_DATA_FEED_ENABLED_PROPERTY, String.valueOf(enabled)));
+        switch (columnMappingMode) {
+            case NONE -> { /* do nothing */ }
+            case ID, NAME -> {
+                configurationMapBuilder.put(COLUMN_MAPPING_MODE_CONFIGURATION_KEY, columnMappingMode.name().toLowerCase(ENGLISH));
+                configurationMapBuilder.put(MAX_COLUMN_ID_CONFIGURATION_KEY, String.valueOf(maxFieldId.orElseThrow()));
+            }
+            case UNKNOWN -> throw new UnsupportedOperationException();
+        }
         return configurationMapBuilder.buildOrThrow();
     }
 
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/ProtocolEntry.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/ProtocolEntry.java
index 8bb39aa3ac19..7159b22e6b61 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/ProtocolEntry.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/ProtocolEntry.java
@@ -17,21 +17,39 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
 
 import static java.lang.String.format;
 
 public class ProtocolEntry
 {
+    private static final int MIN_VERSION_SUPPORTS_READER_FEATURES = 3;
+    private static final int MIN_VERSION_SUPPORTS_WRITER_FEATURES = 7;
+
     private final int minReaderVersion;
     private final int minWriterVersion;
+    private final Optional<Set<String>> readerFeatures;
+    private final Optional<Set<String>> writerFeatures;
 
     @JsonCreator
     public ProtocolEntry(
             @JsonProperty("minReaderVersion") int minReaderVersion,
-            @JsonProperty("minWriterVersion") int minWriterVersion)
+            @JsonProperty("minWriterVersion") int minWriterVersion,
+            // The delta protocol documentation mentions that readerFeatures & writerFeatures is Array[String], but their actual implementation is Set
+            @JsonProperty("readerFeatures") Optional<Set<String>> readerFeatures,
+            @JsonProperty("writerFeatures") Optional<Set<String>> writerFeatures)
     {
         this.minReaderVersion = minReaderVersion;
         this.minWriterVersion = minWriterVersion;
+        if (minReaderVersion < MIN_VERSION_SUPPORTS_READER_FEATURES && readerFeatures.isPresent()) {
+            throw new IllegalArgumentException("readerFeatures must not exist when minReaderVersion is less than " + MIN_VERSION_SUPPORTS_READER_FEATURES);
+        }
+        if (minWriterVersion < MIN_VERSION_SUPPORTS_WRITER_FEATURES && writerFeatures.isPresent()) {
+            throw new IllegalArgumentException("writerFeatures must not exist when minWriterVersion is less than " + MIN_VERSION_SUPPORTS_WRITER_FEATURES);
+        }
+        this.readerFeatures = readerFeatures;
+        this.writerFeatures = writerFeatures;
     }
 
     @JsonProperty
@@ -46,6 +64,38 @@ public int getMinWriterVersion()
         return minWriterVersion;
     }
 
+    @JsonProperty
+    public Optional<Set<String>> getReaderFeatures()
+    {
+        return readerFeatures;
+    }
+
+    @JsonProperty
+    public Optional<Set<String>> getWriterFeatures()
+    {
+        return writerFeatures;
+    }
+
+    public boolean supportsReaderFeatures()
+    {
+        return minReaderVersion >= MIN_VERSION_SUPPORTS_READER_FEATURES;
+    }
+
+    public boolean readerFeaturesContains(String featureName)
+    {
+        return readerFeatures.map(features -> features.contains(featureName)).orElse(false);
+    }
+
+    public boolean supportsWriterFeatures()
+    {
+        return minWriterVersion >= MIN_VERSION_SUPPORTS_WRITER_FEATURES;
+    }
+
+    public boolean writerFeaturesContains(String featureName)
+    {
+        return writerFeatures.map(features -> features.contains(featureName)).orElse(false);
+    }
+
     @Override
     public boolean equals(Object o)
     {
@@ -57,18 +107,25 @@ public boolean equals(Object o)
         }
         ProtocolEntry that = (ProtocolEntry) o;
         return minReaderVersion == that.minReaderVersion &&
-                minWriterVersion == that.minWriterVersion;
+                minWriterVersion == that.minWriterVersion &&
+                readerFeatures.equals(that.readerFeatures) &&
+                writerFeatures.equals(that.writerFeatures);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(minReaderVersion, minWriterVersion);
+        return Objects.hash(minReaderVersion, minWriterVersion, readerFeatures, writerFeatures);
     }
 
     @Override
     public String toString()
     {
-        return format("ProtocolEntry{minReaderVersion=%d, minWriterVersion=%d}", minReaderVersion, minWriterVersion);
+        return format(
+                "ProtocolEntry{minReaderVersion=%d, minWriterVersion=%d, readerFeatures=%s, writerFeatures=%s}",
+                minReaderVersion,
+                minWriterVersion,
+                readerFeatures,
+                writerFeatures);
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TableSnapshot.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TableSnapshot.java
index 167c34a4fd38..5069517239a8 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TableSnapshot.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TableSnapshot.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.deltalake.transactionlog;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.parquet.ParquetReaderOptions;
@@ -30,19 +30,18 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
 
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.Streams.stream;
-import static io.trino.filesystem.Locations.appendPath;
-import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_BAD_DATA;
 import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.readLastCheckpoint;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogDir;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.ADD;
-import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.METADATA;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
@@ -82,6 +81,7 @@ private TableSnapshot(
 
     public static TableSnapshot load(
             SchemaTableName table,
+            Optional<LastCheckpoint> lastCheckpoint,
             TrinoFileSystem fileSystem,
             String tableLocation,
             ParquetReaderOptions parquetReaderOptions,
@@ -89,7 +89,6 @@ public static TableSnapshot load(
             int domainCompactionThreshold)
             throws IOException
     {
-        Optional<LastCheckpoint> lastCheckpoint = readLastCheckpoint(fileSystem, tableLocation);
         Optional<Long> lastCheckpointVersion = lastCheckpoint.map(LastCheckpoint::getVersion);
         TransactionLogTail transactionLogTail = TransactionLogTail.loadNewTail(fileSystem, tableLocation, lastCheckpointVersion);
 
@@ -103,21 +102,30 @@ public static TableSnapshot load(
                 domainCompactionThreshold);
     }
 
-    public Optional<TableSnapshot> getUpdatedSnapshot(TrinoFileSystem fileSystem)
+    public Optional<TableSnapshot> getUpdatedSnapshot(TrinoFileSystem fileSystem, Optional<Long> toVersion)
             throws IOException
     {
-        Optional<LastCheckpoint> lastCheckpoint = readLastCheckpoint(fileSystem, tableLocation);
-        long lastCheckpointVersion = lastCheckpoint.map(LastCheckpoint::getVersion).orElse(0L);
-        long cachedLastCheckpointVersion = getLastCheckpointVersion().orElse(0L);
+        if (toVersion.isEmpty()) {
+            // Load any newer table snapshot
 
-        Optional<TransactionLogTail> updatedLogTail;
-        if (cachedLastCheckpointVersion == lastCheckpointVersion) {
-            updatedLogTail = logTail.getUpdatedTail(fileSystem, tableLocation);
-        }
-        else {
-            updatedLogTail = Optional.of(TransactionLogTail.loadNewTail(fileSystem, tableLocation, Optional.of(lastCheckpointVersion)));
+            Optional<LastCheckpoint> lastCheckpoint = readLastCheckpoint(fileSystem, tableLocation);
+            if (lastCheckpoint.isPresent()) {
+                long ourCheckpointVersion = getLastCheckpointVersion().orElse(0L);
+                if (ourCheckpointVersion != lastCheckpoint.get().getVersion()) {
+                    // There is a new checkpoint in the table, load anew
+                    return Optional.of(TableSnapshot.load(
+                            table,
+                            lastCheckpoint,
+                            fileSystem,
+                            tableLocation,
+                            parquetReaderOptions,
+                            checkpointRowStatisticsWritingEnabled,
+                            domainCompactionThreshold));
+                }
+            }
         }
 
+        Optional<TransactionLogTail> updatedLogTail = logTail.getUpdatedTail(fileSystem, tableLocation, toVersion);
         return updatedLogTail.map(transactionLogTail -> new TableSnapshot(
                 table,
                 lastCheckpoint,
@@ -158,13 +166,19 @@ public List<DeltaLakeTransactionLogEntry> getJsonTransactionLogEntries()
         return logTail.getFileEntries();
     }
 
+    public List<Transaction> getTransactions()
+    {
+        return logTail.getTransactions();
+    }
+
     public Stream<DeltaLakeTransactionLogEntry> getCheckpointTransactionLogEntries(
             ConnectorSession session,
             Set<CheckpointEntryIterator.EntryType> entryTypes,
             CheckpointSchemaManager checkpointSchemaManager,
             TypeManager typeManager,
             TrinoFileSystem fileSystem,
-            FileFormatDataSourceStats stats)
+            FileFormatDataSourceStats stats,
+            Optional<MetadataAndProtocolEntry> metadataAndProtocol)
             throws IOException
     {
         if (lastCheckpoint.isEmpty()) {
@@ -174,30 +188,25 @@ public Stream<DeltaLakeTransactionLogEntry> getCheckpointTransactionLogEntries(
         LastCheckpoint checkpoint = lastCheckpoint.get();
         // Add entries contain statistics. When struct statistics are used the format of the Parquet file depends on the schema. It is important to use the schema at the time
         // of the Checkpoint creation, in case the schema has evolved since it was written.
-        Optional<MetadataEntry> metadataEntry = entryTypes.contains(ADD) ?
-                Optional.of(getCheckpointMetadataEntry(
-                        session,
-                        checkpointSchemaManager,
-                        typeManager,
-                        fileSystem,
-                        stats,
-                        checkpoint)) :
-                Optional.empty();
+        if (entryTypes.contains(ADD)) {
+            checkState(metadataAndProtocol.isPresent(), "metadata and protocol information is needed to process the add log entries");
+        }
 
         Stream<DeltaLakeTransactionLogEntry> resultStream = Stream.empty();
-        for (String checkpointPath : getCheckpointPartPaths(checkpoint)) {
+        for (Location checkpointPath : getCheckpointPartPaths(checkpoint)) {
             TrinoInputFile checkpointFile = fileSystem.newInputFile(checkpointPath);
             resultStream = Stream.concat(
                     resultStream,
-                    getCheckpointTransactionLogEntries(
+                    stream(getCheckpointTransactionLogEntries(
                             session,
                             entryTypes,
-                            metadataEntry,
+                            metadataAndProtocol.map(MetadataAndProtocolEntry::metadataEntry),
+                            metadataAndProtocol.map(MetadataAndProtocolEntry::protocolEntry),
                             checkpointSchemaManager,
                             typeManager,
                             stats,
                             checkpoint,
-                            checkpointFile));
+                            checkpointFile)));
         }
         return resultStream;
     }
@@ -207,10 +216,11 @@ public Optional<Long> getLastCheckpointVersion()
         return lastCheckpoint.map(LastCheckpoint::getVersion);
     }
 
-    private Stream<DeltaLakeTransactionLogEntry> getCheckpointTransactionLogEntries(
+    private Iterator<DeltaLakeTransactionLogEntry> getCheckpointTransactionLogEntries(
             ConnectorSession session,
             Set<CheckpointEntryIterator.EntryType> entryTypes,
             Optional<MetadataEntry> metadataEntry,
+            Optional<ProtocolEntry> protocolEntry,
             CheckpointSchemaManager checkpointSchemaManager,
             TypeManager typeManager,
             FileFormatDataSourceStats stats,
@@ -225,7 +235,7 @@ private Stream<DeltaLakeTransactionLogEntry> getCheckpointTransactionLogEntries(
         catch (FileNotFoundException e) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, format("%s mentions a non-existent checkpoint file for table: %s", checkpoint, table));
         }
-        return stream(new CheckpointEntryIterator(
+        return new CheckpointEntryIterator(
                 checkpointFile,
                 session,
                 fileSize,
@@ -233,51 +243,33 @@ private Stream<DeltaLakeTransactionLogEntry> getCheckpointTransactionLogEntries(
                 typeManager,
                 entryTypes,
                 metadataEntry,
+                protocolEntry,
                 stats,
                 parquetReaderOptions,
                 checkpointRowStatisticsWritingEnabled,
-                domainCompactionThreshold));
+                domainCompactionThreshold);
     }
 
-    private MetadataEntry getCheckpointMetadataEntry(
-            ConnectorSession session,
-            CheckpointSchemaManager checkpointSchemaManager,
-            TypeManager typeManager,
-            TrinoFileSystem fileSystem,
-            FileFormatDataSourceStats stats,
-            LastCheckpoint checkpoint)
-            throws IOException
+    public record MetadataAndProtocolEntry(MetadataEntry metadataEntry, ProtocolEntry protocolEntry)
     {
-        for (String checkpointPath : getCheckpointPartPaths(checkpoint)) {
-            TrinoInputFile checkpointFile = fileSystem.newInputFile(checkpointPath);
-            Stream<DeltaLakeTransactionLogEntry> metadataEntries = getCheckpointTransactionLogEntries(
-                    session,
-                    ImmutableSet.of(METADATA),
-                    Optional.empty(),
-                    checkpointSchemaManager,
-                    typeManager,
-                    stats,
-                    checkpoint,
-                    checkpointFile);
-            Optional<DeltaLakeTransactionLogEntry> metadataEntry = metadataEntries.findFirst();
-            if (metadataEntry.isPresent()) {
-                return metadataEntry.get().getMetaData();
-            }
+        public MetadataAndProtocolEntry
+        {
+            requireNonNull(metadataEntry, "metadataEntry is null");
+            requireNonNull(protocolEntry, "protocolEntry is null");
         }
-        throw new TrinoException(DELTA_LAKE_BAD_DATA, "Checkpoint found without metadata entry: " + checkpoint);
     }
 
-    private List<String> getCheckpointPartPaths(LastCheckpoint checkpoint)
+    private List<Location> getCheckpointPartPaths(LastCheckpoint checkpoint)
     {
-        String transactionLogDir = getTransactionLogDir(tableLocation);
-        ImmutableList.Builder<String> paths = ImmutableList.builder();
+        Location transactionLogDir = Location.of(getTransactionLogDir(tableLocation));
+        ImmutableList.Builder<Location> paths = ImmutableList.builder();
         if (checkpoint.getParts().isEmpty()) {
-            paths.add(appendPath(transactionLogDir, format("%020d.checkpoint.parquet", checkpoint.getVersion())));
+            paths.add(transactionLogDir.appendPath("%020d.checkpoint.parquet".formatted(checkpoint.getVersion())));
         }
         else {
             int partsCount = checkpoint.getParts().get();
             for (int i = 1; i <= partsCount; i++) {
-                paths.add(appendPath(transactionLogDir, format("%020d.checkpoint.%010d.%010d.parquet", checkpoint.getVersion(), i, partsCount)));
+                paths.add(transactionLogDir.appendPath("%020d.checkpoint.%010d.%010d.parquet".formatted(checkpoint.getVersion(), i, partsCount)));
             }
         }
         return paths.build();
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/Transaction.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/Transaction.java
new file mode 100644
index 000000000000..40b424845825
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/Transaction.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.transactionlog;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+public record Transaction(long transactionId, List<DeltaLakeTransactionLogEntry> transactionEntries)
+{
+    public Transaction
+    {
+        checkArgument(transactionId >= 0, "transactionId must be >= 0");
+        transactionEntries = ImmutableList.copyOf(requireNonNull(transactionEntries, "transactionEntries is null"));
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TransactionLogAccess.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TransactionLogAccess.java
index 8e0e5f9ddeda..52ff743b8968 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TransactionLogAccess.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TransactionLogAccess.java
@@ -19,17 +19,20 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.primitives.Ints;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.inject.Inject;
 import io.airlift.jmx.CacheStatsMBean;
-import io.airlift.log.Logger;
-import io.trino.collect.cache.EvictableCacheBuilder;
+import io.trino.cache.EvictableCacheBuilder;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.parquet.ParquetReaderOptions;
 import io.trino.plugin.deltalake.DeltaLakeColumnMetadata;
 import io.trino.plugin.deltalake.DeltaLakeConfig;
+import io.trino.plugin.deltalake.transactionlog.TableSnapshot.MetadataAndProtocolEntry;
 import io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator;
 import io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointSchemaManager;
+import io.trino.plugin.deltalake.transactionlog.checkpoint.LastCheckpoint;
 import io.trino.plugin.deltalake.transactionlog.checkpoint.TransactionLogTail;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
@@ -45,12 +48,12 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.time.Instant;
+import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -69,7 +72,10 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.airlift.slice.SizeOf.estimatedSizeOf;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.trino.cache.CacheUtils.invalidateAllIf;
 import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA;
+import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.readLastCheckpoint;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogJsonEntryPath;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.ADD;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.COMMIT;
@@ -82,18 +88,17 @@
 
 public class TransactionLogAccess
 {
-    private static final Logger log = Logger.get(TransactionLogAccess.class);
-
     private final TypeManager typeManager;
     private final CheckpointSchemaManager checkpointSchemaManager;
     private final FileFormatDataSourceStats fileFormatDataSourceStats;
     private final TrinoFileSystemFactory fileSystemFactory;
     private final ParquetReaderOptions parquetReaderOptions;
-    private final Cache<String /* table location */, TableSnapshot> tableSnapshots;
-    private final Cache<String /* table location */, DeltaLakeDataFileCacheEntry> activeDataFileCache;
     private final boolean checkpointRowStatisticsWritingEnabled;
     private final int domainCompactionThreshold;
 
+    private final Cache<TableLocation, TableSnapshot> tableSnapshots;
+    private final Cache<TableVersion, DeltaLakeDataFileCacheEntry> activeDataFileCache;
+
     @Inject
     public TransactionLogAccess(
             TypeManager typeManager,
@@ -118,7 +123,7 @@ public TransactionLogAccess(
                 .recordStats()
                 .build();
         activeDataFileCache = EvictableCacheBuilder.newBuilder()
-                .weigher((Weigher<String, DeltaLakeDataFileCacheEntry>) (key, value) -> Ints.saturatedCast(estimatedSizeOf(key) + value.getRetainedSizeInBytes()))
+                .weigher((Weigher<TableVersion, DeltaLakeDataFileCacheEntry>) (key, value) -> Ints.saturatedCast(key.getRetainedSizeInBytes() + value.getRetainedSizeInBytes()))
                 .maximumWeight(deltaLakeConfig.getDataFileCacheSize().toBytes())
                 .expireAfterWrite(deltaLakeConfig.getDataFileCacheTtl().toMillis(), TimeUnit.MILLISECONDS)
                 .shareNothingWhenDisabled()
@@ -140,17 +145,20 @@ public CacheStatsMBean getMetadataCacheStats()
         return new CacheStatsMBean(tableSnapshots);
     }
 
-    public TableSnapshot loadSnapshot(SchemaTableName table, String tableLocation, ConnectorSession session)
+    public TableSnapshot loadSnapshot(ConnectorSession session, SchemaTableName table, String tableLocation)
             throws IOException
     {
-        TableSnapshot cachedSnapshot = tableSnapshots.getIfPresent(tableLocation);
+        TableLocation cacheKey = new TableLocation(table, tableLocation);
+        TableSnapshot cachedSnapshot = tableSnapshots.getIfPresent(cacheKey);
         TableSnapshot snapshot;
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
         if (cachedSnapshot == null) {
             try {
-                snapshot = tableSnapshots.get(tableLocation, () ->
+                Optional<LastCheckpoint> lastCheckpoint = readLastCheckpoint(fileSystem, tableLocation);
+                snapshot = tableSnapshots.get(cacheKey, () ->
                         TableSnapshot.load(
                                 table,
+                                lastCheckpoint,
                                 fileSystem,
                                 tableLocation,
                                 parquetReaderOptions,
@@ -163,10 +171,10 @@ public TableSnapshot loadSnapshot(SchemaTableName table, String tableLocation, C
             }
         }
         else {
-            Optional<TableSnapshot> updatedSnapshot = cachedSnapshot.getUpdatedSnapshot(fileSystem);
+            Optional<TableSnapshot> updatedSnapshot = cachedSnapshot.getUpdatedSnapshot(fileSystem, Optional.empty());
             if (updatedSnapshot.isPresent()) {
                 snapshot = updatedSnapshot.get();
-                tableSnapshots.asMap().replace(tableLocation, cachedSnapshot, snapshot);
+                tableSnapshots.asMap().replace(cacheKey, cachedSnapshot, snapshot);
             }
             else {
                 snapshot = cachedSnapshot;
@@ -181,10 +189,16 @@ public void flushCache()
         activeDataFileCache.invalidateAll();
     }
 
-    public void invalidateCaches(String tableLocation)
+    public void invalidateCache(SchemaTableName schemaTableName, Optional<String> tableLocation)
     {
-        tableSnapshots.invalidate(tableLocation);
-        activeDataFileCache.invalidate(tableLocation);
+        requireNonNull(schemaTableName, "schemaTableName is null");
+        // Invalidate by location in case one table (location) unregistered and re-register under different name
+        tableLocation.ifPresent(location -> {
+            invalidateAllIf(tableSnapshots, cacheKey -> cacheKey.location().equals(location));
+            invalidateAllIf(activeDataFileCache, cacheKey -> cacheKey.tableLocation().location().equals(location));
+        });
+        invalidateAllIf(tableSnapshots, cacheKey -> cacheKey.tableName().equals(schemaTableName));
+        invalidateAllIf(activeDataFileCache, cacheKey -> cacheKey.tableLocation().tableName().equals(schemaTableName));
     }
 
     public MetadataEntry getMetadataEntry(TableSnapshot tableSnapshot, ConnectorSession session)
@@ -205,62 +219,68 @@ public MetadataEntry getMetadataEntry(TableSnapshot tableSnapshot, ConnectorSess
                 .orElseThrow(() -> new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Metadata not found in transaction log for " + tableSnapshot.getTable()));
     }
 
-    public List<AddFileEntry> getActiveFiles(TableSnapshot tableSnapshot, ConnectorSession session)
+    public List<AddFileEntry> getActiveFiles(TableSnapshot tableSnapshot, MetadataEntry metadataEntry, ProtocolEntry protocolEntry, ConnectorSession session)
     {
         try {
-            String tableLocation = tableSnapshot.getTableLocation();
-            DeltaLakeDataFileCacheEntry cachedTable = activeDataFileCache.get(tableLocation, () -> {
-                List<AddFileEntry> activeFiles = loadActiveFiles(tableSnapshot, session);
-                return new DeltaLakeDataFileCacheEntry(tableSnapshot.getVersion(), activeFiles);
-            });
-            if (cachedTable.getVersion() > tableSnapshot.getVersion()) {
-                log.warn("Query run with outdated Transaction Log Snapshot, retrieved stale table entries for table: %s and query %s", tableSnapshot.getTable(), session.getQueryId());
-                return loadActiveFiles(tableSnapshot, session);
-            }
-            if (cachedTable.getVersion() < tableSnapshot.getVersion()) {
-                DeltaLakeDataFileCacheEntry updatedCacheEntry;
-                try {
-                    List<DeltaLakeTransactionLogEntry> newEntries = getJsonEntries(
-                            cachedTable.getVersion(),
-                            tableSnapshot.getVersion(),
-                            tableSnapshot,
-                            fileSystemFactory.create(session));
-                    updatedCacheEntry = cachedTable.withUpdatesApplied(newEntries, tableSnapshot.getVersion());
-                }
-                catch (MissingTransactionLogException e) {
-                    // Reset the cached table when there are transaction files which are newer than
-                    // the cached table version which are already garbage collected.
-                    List<AddFileEntry> activeFiles = loadActiveFiles(tableSnapshot, session);
-                    updatedCacheEntry = new DeltaLakeDataFileCacheEntry(tableSnapshot.getVersion(), activeFiles);
+            TableVersion tableVersion = new TableVersion(new TableLocation(tableSnapshot.getTable(), tableSnapshot.getTableLocation()), tableSnapshot.getVersion());
+
+            DeltaLakeDataFileCacheEntry cacheEntry = activeDataFileCache.get(tableVersion, () -> {
+                DeltaLakeDataFileCacheEntry oldCached = activeDataFileCache.asMap().keySet().stream()
+                        .filter(key -> key.tableLocation().equals(tableVersion.tableLocation()) &&
+                                key.version() < tableVersion.version())
+                        .flatMap(key -> Optional.ofNullable(activeDataFileCache.getIfPresent(key))
+                                .map(value -> Map.entry(key, value))
+                                .stream())
+                        .max(Comparator.comparing(entry -> entry.getKey().version()))
+                        .map(Map.Entry::getValue)
+                        .orElse(null);
+                if (oldCached != null) {
+                    try {
+                        List<DeltaLakeTransactionLogEntry> newEntries = getJsonEntries(
+                                oldCached.getVersion(),
+                                tableSnapshot.getVersion(),
+                                tableSnapshot,
+                                fileSystemFactory.create(session));
+                        return oldCached.withUpdatesApplied(newEntries, tableSnapshot.getVersion());
+                    }
+                    catch (MissingTransactionLogException e) {
+                        // The cached state cannot be used to calculate current state, as some
+                        // intermediate transaction files are expired.
+                    }
                 }
 
-                activeDataFileCache.asMap().replace(tableLocation, cachedTable, updatedCacheEntry);
-                cachedTable = updatedCacheEntry;
-            }
-            return cachedTable.getActiveFiles();
+                List<AddFileEntry> activeFiles = loadActiveFiles(tableSnapshot, metadataEntry, protocolEntry, session);
+                return new DeltaLakeDataFileCacheEntry(tableSnapshot.getVersion(), activeFiles);
+            });
+            return cacheEntry.getActiveFiles();
         }
-        catch (IOException | ExecutionException | UncheckedExecutionException e) {
+        catch (ExecutionException | UncheckedExecutionException e) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Failed accessing transaction log for table: " + tableSnapshot.getTable(), e);
         }
     }
 
-    private List<AddFileEntry> loadActiveFiles(TableSnapshot tableSnapshot, ConnectorSession session)
+    private List<AddFileEntry> loadActiveFiles(TableSnapshot tableSnapshot, MetadataEntry metadataEntry, ProtocolEntry protocolEntry, ConnectorSession session)
     {
-        try (Stream<AddFileEntry> entries = getEntries(
-                tableSnapshot,
-                ImmutableSet.of(ADD),
-                this::activeAddEntries,
+        List<Transaction> transactions = tableSnapshot.getTransactions();
+        try (Stream<DeltaLakeTransactionLogEntry> checkpointEntries = tableSnapshot.getCheckpointTransactionLogEntries(
                 session,
+                ImmutableSet.of(ADD),
+                checkpointSchemaManager,
+                typeManager,
                 fileSystemFactory.create(session),
-                fileFormatDataSourceStats)) {
-            List<AddFileEntry> activeFiles = entries.collect(toImmutableList());
-            return activeFiles;
+                fileFormatDataSourceStats,
+                Optional.of(new MetadataAndProtocolEntry(metadataEntry, protocolEntry)))) {
+            return activeAddEntries(checkpointEntries, transactions)
+                    .collect(toImmutableList());
+        }
+        catch (IOException e) {
+            throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Error reading transaction log for " + tableSnapshot.getTable(), e);
         }
     }
 
-    public static List<DeltaLakeColumnMetadata> columnsWithStats(MetadataEntry metadataEntry, TypeManager typeManager)
+    public static List<DeltaLakeColumnMetadata> columnsWithStats(MetadataEntry metadataEntry, ProtocolEntry protocolEntry, TypeManager typeManager)
     {
-        return columnsWithStats(DeltaLakeSchemaSupport.extractSchema(metadataEntry, typeManager), metadataEntry.getCanonicalPartitionColumns());
+        return columnsWithStats(DeltaLakeSchemaSupport.extractSchema(metadataEntry, protocolEntry, typeManager), metadataEntry.getOriginalPartitionColumns());
     }
 
     public static ImmutableList<DeltaLakeColumnMetadata> columnsWithStats(List<DeltaLakeColumnMetadata> schema, List<String> partitionColumns)
@@ -274,7 +294,7 @@ public static ImmutableList<DeltaLakeColumnMetadata> columnsWithStats(List<Delta
                 .collect(toImmutableList());
     }
 
-    private Stream<AddFileEntry> activeAddEntries(Stream<DeltaLakeTransactionLogEntry> checkpointEntries, Stream<DeltaLakeTransactionLogEntry> jsonEntries)
+    private Stream<AddFileEntry> activeAddEntries(Stream<DeltaLakeTransactionLogEntry> checkpointEntries, List<Transaction> transactions)
     {
         Map<String, AddFileEntry> activeJsonEntries = new LinkedHashMap<>();
         HashSet<String> removedFiles = new HashSet<>();
@@ -282,17 +302,22 @@ private Stream<AddFileEntry> activeAddEntries(Stream<DeltaLakeTransactionLogEntr
         // The json entries containing the last few entries in the log need to be applied on top of the parquet snapshot:
         // - Any files which have been removed need to be excluded
         // - Any files with newer add actions need to be updated with the most recent metadata
-        jsonEntries.forEach(deltaLakeTransactionLogEntry -> {
-            AddFileEntry addEntry = deltaLakeTransactionLogEntry.getAdd();
-            if (addEntry != null) {
-                activeJsonEntries.put(addEntry.getPath(), addEntry);
-            }
+        transactions.forEach(transaction -> {
+            Map<String, AddFileEntry> addFilesInTransaction = new LinkedHashMap<>();
+            Set<String> removedFilesInTransaction = new HashSet<>();
+            transaction.transactionEntries().forEach(deltaLakeTransactionLogEntry -> {
+                if (deltaLakeTransactionLogEntry.getAdd() != null) {
+                    addFilesInTransaction.put(deltaLakeTransactionLogEntry.getAdd().getPath(), deltaLakeTransactionLogEntry.getAdd());
+                }
+                else if (deltaLakeTransactionLogEntry.getRemove() != null) {
+                    removedFilesInTransaction.add(deltaLakeTransactionLogEntry.getRemove().getPath());
+                }
+            });
 
-            RemoveFileEntry removeEntry = deltaLakeTransactionLogEntry.getRemove();
-            if (removeEntry != null) {
-                activeJsonEntries.remove(removeEntry.getPath());
-                removedFiles.add(removeEntry.getPath());
-            }
+            // Process 'remove' entries first because deletion vectors register both 'add' and 'remove' entries and the 'add' entry should be kept
+            removedFiles.addAll(removedFilesInTransaction);
+            removedFilesInTransaction.forEach(activeJsonEntries::remove);
+            activeJsonEntries.putAll(addFilesInTransaction);
         });
 
         Stream<AddFileEntry> filteredCheckpointEntries = checkpointEntries
@@ -314,6 +339,30 @@ public Stream<RemoveFileEntry> getRemoveEntries(TableSnapshot tableSnapshot, Con
                 fileFormatDataSourceStats);
     }
 
+    public Map<Class<?>, Object> getTransactionLogEntries(
+            ConnectorSession session,
+            TableSnapshot tableSnapshot,
+            Set<CheckpointEntryIterator.EntryType> entryTypes,
+            Function<Stream<DeltaLakeTransactionLogEntry>, Stream<Object>> entryMapper)
+    {
+        Stream<Object> entries = getEntries(
+                tableSnapshot,
+                entryTypes,
+                (checkpointStream, jsonStream) -> entryMapper.apply(Stream.concat(checkpointStream, jsonStream.stream().map(Transaction::transactionEntries).flatMap(Collection::stream))),
+                session,
+                fileSystemFactory.create(session),
+                fileFormatDataSourceStats);
+
+        return entries.collect(toImmutableMap(Object::getClass, Function.identity(), (first, second) -> second));
+    }
+
+    public ProtocolEntry getProtocolEntry(ConnectorSession session, TableSnapshot tableSnapshot)
+    {
+        return getProtocolEntries(tableSnapshot, session)
+                .reduce((first, second) -> second)
+                .orElseThrow(() -> new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Protocol entry not found in transaction log for table " + tableSnapshot.getTable()));
+    }
+
     public Stream<ProtocolEntry> getProtocolEntries(TableSnapshot tableSnapshot, ConnectorSession session)
     {
         return getEntries(
@@ -351,19 +400,19 @@ public Stream<CommitInfoEntry> getCommitInfoEntries(TableSnapshot tableSnapshot,
     private <T> Stream<T> getEntries(
             TableSnapshot tableSnapshot,
             Set<CheckpointEntryIterator.EntryType> entryTypes,
-            BiFunction<Stream<DeltaLakeTransactionLogEntry>, Stream<DeltaLakeTransactionLogEntry>, Stream<T>> entryMapper,
+            BiFunction<Stream<DeltaLakeTransactionLogEntry>, List<Transaction>, Stream<T>> entryMapper,
             ConnectorSession session,
             TrinoFileSystem fileSystem,
             FileFormatDataSourceStats stats)
     {
         try {
-            Stream<DeltaLakeTransactionLogEntry> jsonEntries = tableSnapshot.getJsonTransactionLogEntries().stream();
+            List<Transaction> transactions = tableSnapshot.getTransactions();
             Stream<DeltaLakeTransactionLogEntry> checkpointEntries = tableSnapshot.getCheckpointTransactionLogEntries(
-                    session, entryTypes, checkpointSchemaManager, typeManager, fileSystem, stats);
+                    session, entryTypes, checkpointSchemaManager, typeManager, fileSystem, stats, Optional.empty());
 
             return entryMapper.apply(
                     checkpointEntries,
-                    jsonEntries);
+                    transactions);
         }
         catch (IOException e) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Error reading transaction log for " + tableSnapshot.getTable(), e);
@@ -384,7 +433,7 @@ private <T> Stream<T> getEntries(
         return getEntries(
                 tableSnapshot,
                 ImmutableSet.of(entryType),
-                (checkpointStream, jsonStream) -> entryMapper.apply(Stream.concat(checkpointStream, jsonStream)),
+                (checkpointStream, jsonStream) -> entryMapper.apply(Stream.concat(checkpointStream, jsonStream.stream().map(Transaction::transactionEntries).flatMap(Collection::stream))),
                 session,
                 fileSystem,
                 stats);
@@ -414,7 +463,7 @@ public List<Long> getPastTableVersions(TrinoFileSystem fileSystem, String transa
     {
         ImmutableList.Builder<Long> result = ImmutableList.builder();
         for (long version = lastVersion; version >= 0; version--) {
-            String entryPath = getTransactionLogJsonEntryPath(transactionLogDir, version);
+            Location entryPath = getTransactionLogJsonEntryPath(transactionLogDir, version);
             TrinoInputFile inputFile = fileSystem.newInputFile(entryPath);
             try {
                 if (inputFile.lastModified().isBefore(startAt)) {
@@ -447,22 +496,15 @@ private static List<DeltaLakeTransactionLogEntry> getJsonEntries(long startVersi
         return TransactionLogTail.loadNewTail(fileSystem, tableSnapshot.getTableLocation(), Optional.of(startVersion), Optional.of(endVersion)).getFileEntries();
     }
 
-    public static <T> String canonicalizeColumnName(String columnName)
+    public static String canonicalizeColumnName(String columnName)
     {
         return columnName.toLowerCase(Locale.ENGLISH);
     }
 
-    public static <T> Map<CanonicalColumnName, T> toCanonicalNameKeyedMap(Map<String, T> map)
-    {
-        return map.entrySet().stream()
-                .collect(toImmutableMap(
-                        entry -> new CanonicalColumnName(entry.getKey()),
-                        Map.Entry::getValue));
-    }
-
     public static <T> Map<CanonicalColumnName, T> toCanonicalNameKeyedMap(Map<String, T> map, Map<String, CanonicalColumnName> canonicalColumnNames)
     {
         return map.entrySet().stream()
+                .filter(entry -> entry.getValue() != null)
                 .collect(toImmutableMap(
                         entry -> requireNonNull(
                                 canonicalColumnNames.get(entry.getKey()),
@@ -479,4 +521,55 @@ public static <T> Map<String, T> toOriginalNameKeyedMap(Map<CanonicalColumnName,
                         entry -> entry.getKey().getOriginalName(),
                         Map.Entry::getValue));
     }
+
+    private record TableLocation(SchemaTableName tableName, String location)
+    {
+        private static final int INSTANCE_SIZE = instanceSize(TableLocation.class);
+
+        TableLocation
+        {
+            requireNonNull(tableName, "tableName is null");
+            requireNonNull(location, "location is null");
+        }
+
+        long getRetainedSizeInBytes()
+        {
+            return INSTANCE_SIZE +
+                    tableName.getRetainedSizeInBytes() +
+                    estimatedSizeOf(location);
+        }
+    }
+
+    private record TableVersion(TableLocation tableLocation, long version)
+    {
+        private static final int INSTANCE_SIZE = instanceSize(TableVersion.class);
+
+        TableVersion
+        {
+            requireNonNull(tableLocation, "tableLocation is null");
+        }
+
+        long getRetainedSizeInBytes()
+        {
+            return INSTANCE_SIZE +
+                    tableLocation.getRetainedSizeInBytes();
+        }
+    }
+
+    private record QueriedLocation(String queryId, String tableLocation)
+    {
+        QueriedLocation
+        {
+            requireNonNull(queryId, "queryId is null");
+            requireNonNull(tableLocation, "tableLocation is null");
+        }
+    }
+
+    private record QueriedTable(QueriedLocation queriedLocation, long version)
+    {
+        QueriedTable
+        {
+            requireNonNull(queriedLocation, "queriedLocation is null");
+        }
+    }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TransactionLogParser.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TransactionLogParser.java
index bf0053a8998b..134daf28960c 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TransactionLogParser.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TransactionLogParser.java
@@ -14,13 +14,13 @@
 package io.trino.plugin.deltalake.transactionlog;
 
 import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import dev.failsafe.Failsafe;
 import dev.failsafe.RetryPolicy;
 import io.airlift.json.ObjectMapperProvider;
 import io.airlift.log.Logger;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.plugin.base.util.JsonUtils;
@@ -29,10 +29,8 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Decimals;
-import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,6 +39,7 @@
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.ZonedDateTime;
 import java.time.chrono.IsoChronology;
 import java.time.format.DateTimeFormatter;
@@ -52,8 +51,9 @@
 import java.util.Optional;
 import java.util.function.Function;
 
+import static com.google.common.base.Verify.verify;
+import static com.google.common.math.LongMath.divide;
 import static io.airlift.slice.Slices.utf8Slice;
-import static io.trino.filesystem.Locations.appendPath;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogDir;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogJsonEntryPath;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
@@ -66,7 +66,10 @@
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
-import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
+import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
+import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_SECOND;
+import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MICROSECOND;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.Double.parseDouble;
@@ -75,6 +78,7 @@
 import static java.lang.Integer.parseInt;
 import static java.lang.Long.parseLong;
 import static java.lang.String.format;
+import static java.math.RoundingMode.UNNECESSARY;
 import static java.time.ZoneOffset.UTC;
 import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME;
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
@@ -87,7 +91,9 @@ public final class TransactionLogParser
 
     // Before 1900, Java Time and Joda Time are not consistent with java.sql.Date and java.util.Calendar
     // Since January 1, 1900 UTC is still December 31, 1899 in other zones, we are adding a 1 day margin.
-    public static final LocalDate START_OF_MODERN_ERA = LocalDate.of(1900, 1, 2);
+    private static final LocalDate START_OF_MODERN_ERA_DATE = LocalDate.of(1900, 1, 2);
+    public static final long START_OF_MODERN_ERA_EPOCH_DAY = START_OF_MODERN_ERA_DATE.toEpochDay();
+    public static final long START_OF_MODERN_ERA_EPOCH_MICROS = LocalDateTime.of(START_OF_MODERN_ERA_DATE, LocalTime.MIN).toEpochSecond(UTC) * MICROSECONDS_PER_SECOND;
 
     public static final String LAST_CHECKPOINT_FILENAME = "_last_checkpoint";
 
@@ -131,7 +137,6 @@ private TransactionLogParser() {}
             .withResolverStyle(ResolverStyle.STRICT);
 
     public static DeltaLakeTransactionLogEntry parseJson(String json)
-            throws JsonProcessingException
     {
         // lines are json strings followed by 'x' in some Databricks versions of Delta
         if (json.endsWith("x")) {
@@ -152,18 +157,25 @@ private static Object parseDecimal(DecimalType type, String valueString)
     @Nullable
     public static Object deserializePartitionValue(DeltaLakeColumnHandle column, Optional<String> valueString)
     {
-        return valueString.map(value -> deserializeColumnValue(column, value, TransactionLogParser::readPartitionTimestamp)).orElse(null);
+        return valueString.map(value -> deserializeColumnValue(column, value, TransactionLogParser::readPartitionTimestamp, TransactionLogParser::readPartitionTimestampWithZone)).orElse(null);
     }
 
     private static Long readPartitionTimestamp(String timestamp)
+    {
+        LocalDateTime localDateTime = LocalDateTime.parse(timestamp, PARTITION_TIMESTAMP_FORMATTER);
+        return localDateTime.toEpochSecond(UTC) * MICROSECONDS_PER_SECOND + divide(localDateTime.getNano(), NANOSECONDS_PER_MICROSECOND, UNNECESSARY);
+    }
+
+    private static Long readPartitionTimestampWithZone(String timestamp)
     {
         ZonedDateTime zonedDateTime = LocalDateTime.parse(timestamp, PARTITION_TIMESTAMP_FORMATTER).atZone(UTC);
         return packDateTimeWithZone(zonedDateTime.toInstant().toEpochMilli(), UTC_KEY);
     }
 
-    public static Object deserializeColumnValue(DeltaLakeColumnHandle column, String valueString, Function<String, Long> timestampReader)
+    public static Object deserializeColumnValue(DeltaLakeColumnHandle column, String valueString, Function<String, Long> timestampReader, Function<String, Long> timestampWithZoneReader)
     {
-        Type type = column.getType();
+        verify(column.isBaseColumn(), "Unexpected dereference: %s", column);
+        Type type = column.getBaseType();
         try {
             if (type.equals(BOOLEAN)) {
                 if (valueString.equalsIgnoreCase("true")) {
@@ -185,8 +197,8 @@ public static Object deserializeColumnValue(DeltaLakeColumnHandle column, String
             if (type.equals(BIGINT)) {
                 return parseLong(valueString);
             }
-            if (type.getBaseName().equals(StandardTypes.DECIMAL)) {
-                return parseDecimal((DecimalType) type, valueString);
+            if (type instanceof DecimalType decimalType) {
+                return parseDecimal(decimalType, valueString);
             }
             if (type.equals(REAL)) {
                 return (long) floatToRawIntBits(parseFloat(valueString));
@@ -198,9 +210,12 @@ public static Object deserializeColumnValue(DeltaLakeColumnHandle column, String
                 // date values are represented as yyyy-MM-dd
                 return LocalDate.parse(valueString).toEpochDay();
             }
-            if (type.equals(createTimestampWithTimeZoneType(3))) {
+            if (type.equals(TIMESTAMP_MICROS)) {
                 return timestampReader.apply(valueString);
             }
+            if (type.equals(TIMESTAMP_TZ_MILLIS)) {
+                return timestampWithZoneReader.apply(valueString);
+            }
             if (VARCHAR.equals(type)) {
                 return utf8Slice(valueString);
             }
@@ -208,13 +223,13 @@ public static Object deserializeColumnValue(DeltaLakeColumnHandle column, String
         catch (RuntimeException e) {
             throw new TrinoException(
                     GENERIC_INTERNAL_ERROR,
-                    format("Unable to parse value [%s] from column %s with type %s", valueString, column.getName(), column.getType()),
+                    format("Unable to parse value [%s] from column %s with type %s", valueString, column.getBaseColumnName(), column.getBaseType()),
                     e);
         }
         // Anything else is not a supported DeltaLake column
         throw new TrinoException(
                 GENERIC_INTERNAL_ERROR,
-                format("Unable to parse value [%s] from column %s with type %s", valueString, column.getName(), column.getType()));
+                format("Unable to parse value [%s] from column %s with type %s", valueString, column.getBaseColumnName(), column.getBaseType()));
     }
 
     static Optional<LastCheckpoint> readLastCheckpoint(TrinoFileSystem fileSystem, String tableLocation)
@@ -234,7 +249,7 @@ static Optional<LastCheckpoint> readLastCheckpoint(TrinoFileSystem fileSystem, S
     private static Optional<LastCheckpoint> tryReadLastCheckpoint(TrinoFileSystem fileSystem, String tableLocation)
             throws JsonParseException, JsonMappingException
     {
-        String checkpointPath = appendPath(getTransactionLogDir(tableLocation), LAST_CHECKPOINT_FILENAME);
+        Location checkpointPath = Location.of(getTransactionLogDir(tableLocation)).appendPath(LAST_CHECKPOINT_FILENAME);
         TrinoInputFile inputFile = fileSystem.newInputFile(checkpointPath);
         try (InputStream lastCheckpointInput = inputFile.newStream()) {
             // Note: there apparently is 8K buffering applied and _last_checkpoint should be much smaller.
@@ -259,7 +274,7 @@ public static long getMandatoryCurrentVersion(TrinoFileSystem fileSystem, String
 
         String transactionLogDir = getTransactionLogDir(tableLocation);
         while (true) {
-            String entryPath = getTransactionLogJsonEntryPath(transactionLogDir, version + 1);
+            Location entryPath = getTransactionLogJsonEntryPath(transactionLogDir, version + 1);
             if (!fileSystem.newInputFile(entryPath).exists()) {
                 return version;
             }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TransactionLogUtil.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TransactionLogUtil.java
index 27c63f881c55..30fd14eff95d 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TransactionLogUtil.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TransactionLogUtil.java
@@ -13,8 +13,13 @@
  */
 package io.trino.plugin.deltalake.transactionlog;
 
+import io.trino.filesystem.Location;
+
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.trino.filesystem.Locations.appendPath;
-import static java.lang.String.format;
 
 public final class TransactionLogUtil
 {
@@ -27,8 +32,23 @@ public static String getTransactionLogDir(String tableLocation)
         return appendPath(tableLocation, TRANSACTION_LOG_DIRECTORY);
     }
 
-    public static String getTransactionLogJsonEntryPath(String transactionLogDir, long entryNumber)
+    public static Location getTransactionLogJsonEntryPath(String transactionLogDir, long entryNumber)
+    {
+        return Location.of(transactionLogDir).appendPath("%020d.json".formatted(entryNumber));
+    }
+
+    public static Map<String, Optional<String>> canonicalizePartitionValues(Map<String, String> partitionValues)
     {
-        return appendPath(transactionLogDir, format("%020d.json", entryNumber));
+        return partitionValues.entrySet().stream()
+                .collect(toImmutableMap(
+                        Map.Entry::getKey,
+                        entry -> {
+                            String value = entry.getValue();
+                            if (value == null || value.isEmpty()) {
+                                // For VARCHAR based partitions null and "" are treated the same
+                                return Optional.empty();
+                            }
+                            return Optional.of(value);
+                        }));
     }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointBuilder.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointBuilder.java
index 0ec87c4119c8..e96925f6be21 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointBuilder.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointBuilder.java
@@ -20,8 +20,7 @@
 import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.plugin.deltalake.transactionlog.RemoveFileEntry;
 import io.trino.plugin.deltalake.transactionlog.TransactionEntry;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointEntryIterator.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointEntryIterator.java
index dd256ab281f9..1892b44643dd 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointEntryIterator.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointEntryIterator.java
@@ -13,7 +13,11 @@
  */
 package io.trino.plugin.deltalake.transactionlog.checkpoint;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.math.LongMath;
 import io.airlift.log.Logger;
 import io.trino.filesystem.TrinoInputFile;
@@ -22,6 +26,7 @@
 import io.trino.plugin.deltalake.DeltaLakeColumnMetadata;
 import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
 import io.trino.plugin.deltalake.transactionlog.CommitInfoEntry;
+import io.trino.plugin.deltalake.transactionlog.DeletionVectorEntry;
 import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
 import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
@@ -30,11 +35,23 @@
 import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeParquetFileStatistics;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveColumnHandle;
+import io.trino.plugin.hive.HiveColumnHandle.ColumnType;
+import io.trino.plugin.hive.HiveColumnProjectionInfo;
+import io.trino.plugin.hive.HiveType;
 import io.trino.plugin.hive.ReaderPageSource;
 import io.trino.plugin.hive.parquet.ParquetPageSourceFactory;
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlock;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.ByteArrayBlock;
+import io.trino.spi.block.IntArrayBlock;
+import io.trino.spi.block.LongArrayBlock;
+import io.trino.spi.block.MapBlock;
+import io.trino.spi.block.RowBlock;
+import io.trino.spi.block.SqlRow;
+import io.trino.spi.block.ValueBlock;
+import io.trino.spi.block.VariableWidthBlock;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.predicate.Domain;
@@ -46,53 +63,50 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeSignature;
-import io.trino.spi.type.VarcharType;
+import jakarta.annotation.Nullable;
 import org.joda.time.DateTimeZone;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.time.Instant;
 import java.util.ArrayDeque;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.OptionalLong;
 import java.util.Queue;
 import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
-import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_BAD_DATA;
 import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.extractSchema;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.isDeletionVectorEnabled;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogAccess.columnsWithStats;
-import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.START_OF_MODERN_ERA;
+import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.START_OF_MODERN_ERA_EPOCH_DAY;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.ADD;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.COMMIT;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.METADATA;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.PROTOCOL;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.REMOVE;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.TRANSACTION;
+import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
 import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
+import static io.trino.spi.type.Timestamps.MILLISECONDS_PER_DAY;
 import static io.trino.spi.type.TypeUtils.readNativeValue;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.lang.Math.floorDiv;
 import static java.lang.String.format;
 import static java.math.RoundingMode.UNNECESSARY;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.time.ZoneOffset.UTC;
 import static java.util.Objects.requireNonNull;
 
 public class CheckpointEntryIterator
-        implements Iterator<DeltaLakeTransactionLogEntry>
+        extends AbstractIterator<DeltaLakeTransactionLogEntry>
 {
     public enum EntryType
     {
@@ -127,7 +141,9 @@ public String getColumnName()
     private final List<CheckPointFieldExtractor> extractors;
     private final boolean checkpointRowStatisticsWritingEnabled;
     private MetadataEntry metadataEntry;
-    private List<DeltaLakeColumnMetadata> schema; // Use DeltaLakeColumnMetadata?
+    private ProtocolEntry protocolEntry;
+    private List<DeltaLakeColumnMetadata> schema;
+    private List<DeltaLakeColumnMetadata> columnsWithMinMaxStats;
     private Page page;
     private long pageIndex;
     private int pagePosition;
@@ -140,17 +156,18 @@ public CheckpointEntryIterator(
             TypeManager typeManager,
             Set<EntryType> fields,
             Optional<MetadataEntry> metadataEntry,
+            Optional<ProtocolEntry> protocolEntry,
             FileFormatDataSourceStats stats,
             ParquetReaderOptions parquetReaderOptions,
             boolean checkpointRowStatisticsWritingEnabled,
             int domainCompactionThreshold)
     {
-        this.checkpointPath = checkpoint.location();
+        this.checkpointPath = checkpoint.location().toString();
         this.session = requireNonNull(session, "session is null");
-        this.stringList = (ArrayType) typeManager.getType(TypeSignature.arrayType(VarcharType.VARCHAR.getTypeSignature()));
-        this.stringMap = (MapType) typeManager.getType(TypeSignature.mapType(VarcharType.VARCHAR.getTypeSignature(), VarcharType.VARCHAR.getTypeSignature()));
+        this.stringList = (ArrayType) typeManager.getType(TypeSignature.arrayType(VARCHAR.getTypeSignature()));
+        this.stringMap = (MapType) typeManager.getType(TypeSignature.mapType(VARCHAR.getTypeSignature(), VARCHAR.getTypeSignature()));
         this.checkpointRowStatisticsWritingEnabled = checkpointRowStatisticsWritingEnabled;
-        checkArgument(fields.size() > 0, "fields is empty");
+        checkArgument(!fields.isEmpty(), "fields is empty");
         Map<EntryType, CheckPointFieldExtractor> extractors = ImmutableMap.<EntryType, CheckPointFieldExtractor>builder()
                 .put(TRANSACTION, this::buildTxnEntry)
                 .put(ADD, this::buildAddEntry)
@@ -163,29 +180,33 @@ public CheckpointEntryIterator(
         if (fields.contains(ADD)) {
             checkArgument(metadataEntry.isPresent(), "Metadata entry must be provided when reading ADD entries from Checkpoint files");
             this.metadataEntry = metadataEntry.get();
-            this.schema = extractSchema(this.metadataEntry, typeManager);
+            checkArgument(protocolEntry.isPresent(), "Protocol entry must be provided when reading ADD entries from Checkpoint files");
+            this.protocolEntry = protocolEntry.get();
+            this.schema = extractSchema(this.metadataEntry, this.protocolEntry, typeManager);
+            this.columnsWithMinMaxStats = columnsWithStats(schema, this.metadataEntry.getOriginalPartitionColumns());
         }
 
-        List<HiveColumnHandle> columns = fields.stream()
-                .map(field -> buildColumnHandle(field, checkpointSchemaManager, this.metadataEntry).toHiveColumnHandle())
-                .collect(toImmutableList());
-
-        TupleDomain<HiveColumnHandle> tupleDomain = columns.size() > 1 ?
-                TupleDomain.all() :
-                TupleDomain.withColumnDomains(ImmutableMap.of(getOnlyElement(columns), Domain.notNull(getOnlyElement(columns).getType())));
+        ImmutableList.Builder<HiveColumnHandle> columnsBuilder = ImmutableList.builderWithExpectedSize(fields.size());
+        ImmutableList.Builder<TupleDomain<HiveColumnHandle>> disjunctDomainsBuilder = ImmutableList.builderWithExpectedSize(fields.size());
+        for (EntryType field : fields) {
+            HiveColumnHandle column = buildColumnHandle(field, checkpointSchemaManager, this.metadataEntry, this.protocolEntry).toHiveColumnHandle();
+            columnsBuilder.add(column);
+            disjunctDomainsBuilder.add(buildTupleDomainColumnHandle(field, column));
+        }
 
         ReaderPageSource pageSource = ParquetPageSourceFactory.createPageSource(
                 checkpoint,
                 0,
                 fileSize,
-                columns,
-                tupleDomain,
+                columnsBuilder.build(),
+                disjunctDomainsBuilder.build(), // OR-ed condition
                 true,
                 DateTimeZone.UTC,
                 stats,
                 parquetReaderOptions,
                 Optional.empty(),
-                domainCompactionThreshold);
+                domainCompactionThreshold,
+                OptionalLong.empty());
 
         verify(pageSource.getReaderColumns().isEmpty(), "All columns expected to be base columns");
 
@@ -196,32 +217,62 @@ public CheckpointEntryIterator(
                 .collect(toImmutableList());
     }
 
-    private DeltaLakeColumnHandle buildColumnHandle(EntryType entryType, CheckpointSchemaManager schemaManager, MetadataEntry metadataEntry)
+    private DeltaLakeColumnHandle buildColumnHandle(EntryType entryType, CheckpointSchemaManager schemaManager, MetadataEntry metadataEntry, ProtocolEntry protocolEntry)
     {
+        Type type = switch (entryType) {
+            case TRANSACTION -> schemaManager.getTxnEntryType();
+            case ADD -> schemaManager.getAddEntryType(metadataEntry, protocolEntry, true, true);
+            case REMOVE -> schemaManager.getRemoveEntryType();
+            case METADATA -> schemaManager.getMetadataEntryType();
+            case PROTOCOL -> schemaManager.getProtocolEntryType(true, true);
+            case COMMIT -> schemaManager.getCommitInfoEntryType();
+        };
+        return new DeltaLakeColumnHandle(entryType.getColumnName(), type, OptionalInt.empty(), entryType.getColumnName(), type, REGULAR, Optional.empty());
+    }
+
+    /**
+     * Constructs a TupleDomain which filters on a specific required primitive sub-column of the EntryType being
+     * not null for effectively pushing down the predicate to the Parquet reader.
+     * <p>
+     * The particular field we select for each action is a required fields per the Delta Log specification, please see
+     * https://github.com/delta-io/delta/blob/master/PROTOCOL.md#Actions This is also enforced when we read entries.
+     */
+    private TupleDomain<HiveColumnHandle> buildTupleDomainColumnHandle(EntryType entryType, HiveColumnHandle column)
+    {
+        String field;
         Type type;
         switch (entryType) {
-            case TRANSACTION:
-                type = schemaManager.getTxnEntryType();
-                break;
-            case ADD:
-                type = schemaManager.getAddEntryType(metadataEntry, true, true);
-                break;
-            case REMOVE:
-                type = schemaManager.getRemoveEntryType();
-                break;
-            case METADATA:
-                type = schemaManager.getMetadataEntryType();
-                break;
-            case PROTOCOL:
-                type = schemaManager.getProtocolEntryType();
-                break;
-            case COMMIT:
-                type = schemaManager.getCommitInfoEntryType();
-                break;
-            default:
-                throw new IllegalArgumentException("Unsupported Delta Lake checkpoint entry type: " + entryType);
-        }
-        return new DeltaLakeColumnHandle(entryType.getColumnName(), type, OptionalInt.empty(), entryType.getColumnName(), type, REGULAR);
+            case COMMIT, TRANSACTION -> {
+                field = "version";
+                type = BIGINT;
+            }
+            case ADD, REMOVE -> {
+                field = "path";
+                type = VARCHAR;
+            }
+            case METADATA -> {
+                field = "id";
+                type = VARCHAR;
+            }
+            case PROTOCOL -> {
+                field = "minReaderVersion";
+                type = BIGINT;
+            }
+            default -> throw new IllegalArgumentException("Unsupported Delta Lake checkpoint entry type: " + entryType);
+        }
+        HiveColumnHandle handle = new HiveColumnHandle(
+                column.getBaseColumnName(),
+                column.getBaseHiveColumnIndex(),
+                column.getBaseHiveType(),
+                column.getBaseType(),
+                Optional.of(new HiveColumnProjectionInfo(
+                        ImmutableList.of(0), // hiveColumnIndex; we provide fake value because we always find columns by name
+                        ImmutableList.of(field),
+                        HiveType.toHiveType(type),
+                        type)),
+                ColumnType.REGULAR,
+                column.getComment());
+        return TupleDomain.withColumnDomains(ImmutableMap.of(handle, Domain.notNull(handle.getType())));
     }
 
     private DeltaLakeTransactionLogEntry buildCommitInfoEntry(ConnectorSession session, Block block, int pagePosition)
@@ -233,41 +284,41 @@ private DeltaLakeTransactionLogEntry buildCommitInfoEntry(ConnectorSession sessi
         int commitInfoFields = 12;
         int jobFields = 5;
         int notebookFields = 1;
-        Block commitInfoEntryBlock = block.getObject(pagePosition, Block.class);
-        log.debug("Block %s has %s fields", block, commitInfoEntryBlock.getPositionCount());
-        if (commitInfoEntryBlock.getPositionCount() != commitInfoFields) {
+        SqlRow commitInfoRow = block.getObject(pagePosition, SqlRow.class);
+        log.debug("Block %s has %s fields", block, commitInfoRow.getFieldCount());
+        if (commitInfoRow.getFieldCount() != commitInfoFields) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA,
-                    format("Expected block %s to have %d children, but found %s", block, commitInfoFields, commitInfoEntryBlock.getPositionCount()));
+                    format("Expected block %s to have %d children, but found %s", block, commitInfoFields, commitInfoRow.getFieldCount()));
         }
-        Block jobBlock = commitInfoEntryBlock.getObject(6, Block.class);
-        if (jobBlock.getPositionCount() != jobFields) {
+        SqlRow jobRow = getRowField(commitInfoRow, 9);
+        if (jobRow.getFieldCount() != jobFields) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA,
-                    format("Expected block %s to have %d children, but found %s", jobBlock, jobFields, jobBlock.getPositionCount()));
+                    format("Expected block %s to have %d children, but found %s", jobRow, jobFields, jobRow.getFieldCount()));
         }
-        Block notebookBlock = commitInfoEntryBlock.getObject(7, Block.class);
-        if (notebookBlock.getPositionCount() != notebookFields) {
+        SqlRow notebookRow = getRowField(commitInfoRow, 7);
+        if (notebookRow.getFieldCount() != notebookFields) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA,
-                    format("Expected block %s to have %d children, but found %s", notebookBlock, notebookFields, notebookBlock.getPositionCount()));
+                    format("Expected block %s to have %d children, but found %s", notebookRow, notebookFields, notebookRow.getFieldCount()));
         }
         CommitInfoEntry result = new CommitInfoEntry(
-                getLong(commitInfoEntryBlock, 0),
-                getLong(commitInfoEntryBlock, 1),
-                getString(commitInfoEntryBlock, 2),
-                getString(commitInfoEntryBlock, 3),
-                getString(commitInfoEntryBlock, 4),
-                getMap(commitInfoEntryBlock, 5),
+                getLongField(commitInfoRow, 0),
+                getLongField(commitInfoRow, 1),
+                getStringField(commitInfoRow, 2),
+                getStringField(commitInfoRow, 3),
+                getStringField(commitInfoRow, 4),
+                getMapField(commitInfoRow, 5),
                 new CommitInfoEntry.Job(
-                        getString(jobBlock, 0),
-                        getString(jobBlock, 1),
-                        getString(jobBlock, 2),
-                        getString(jobBlock, 3),
-                        getString(jobBlock, 4)),
+                        getStringField(jobRow, 0),
+                        getStringField(jobRow, 1),
+                        getStringField(jobRow, 2),
+                        getStringField(jobRow, 3),
+                        getStringField(jobRow, 4)),
                 new CommitInfoEntry.Notebook(
-                        getString(notebookBlock, 0)),
-                getString(commitInfoEntryBlock, 8),
-                getLong(commitInfoEntryBlock, 9),
-                getString(commitInfoEntryBlock, 10),
-                Optional.of(getByte(commitInfoEntryBlock, 11) != 0));
+                        getStringField(notebookRow, 0)),
+                getStringField(commitInfoRow, 8),
+                getLongField(commitInfoRow, 9),
+                getStringField(commitInfoRow, 10),
+                Optional.of(getBooleanField(commitInfoRow, 11)));
         log.debug("Result: %s", result);
         return DeltaLakeTransactionLogEntry.commitInfoEntry(result);
     }
@@ -278,16 +329,23 @@ private DeltaLakeTransactionLogEntry buildProtocolEntry(ConnectorSession session
         if (block.isNull(pagePosition)) {
             return null;
         }
-        int protocolFields = 2;
-        Block protocolEntryBlock = block.getObject(pagePosition, Block.class);
-        log.debug("Block %s has %s fields", block, protocolEntryBlock.getPositionCount());
-        if (protocolEntryBlock.getPositionCount() != protocolFields) {
+        int minProtocolFields = 2;
+        int maxProtocolFields = 4;
+        SqlRow protocolEntryRow = block.getObject(pagePosition, SqlRow.class);
+        int fieldCount = protocolEntryRow.getFieldCount();
+        log.debug("Block %s has %s fields", block, fieldCount);
+        if (fieldCount < minProtocolFields || fieldCount > maxProtocolFields) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA,
-                    format("Expected block %s to have %d children, but found %s", block, protocolFields, protocolEntryBlock.getPositionCount()));
+                    format("Expected block %s to have between %d and %d children, but found %s", block, minProtocolFields, maxProtocolFields, fieldCount));
         }
+        Optional<Set<String>> readerFeatures = getOptionalSetField(protocolEntryRow, 2);
+        // The last entry should be writer feature when protocol entry size is 3 https://github.com/delta-io/delta/blob/master/PROTOCOL.md#disabled-features
+        Optional<Set<String>> writerFeatures = fieldCount != 4 ? readerFeatures : getOptionalSetField(protocolEntryRow, 3);
         ProtocolEntry result = new ProtocolEntry(
-                getInt(protocolEntryBlock, 0),
-                getInt(protocolEntryBlock, 1));
+                getIntField(protocolEntryRow, 0),
+                getIntField(protocolEntryRow, 1),
+                readerFeatures,
+                writerFeatures);
         log.debug("Result: %s", result);
         return DeltaLakeTransactionLogEntry.protocolEntry(result);
     }
@@ -300,28 +358,28 @@ private DeltaLakeTransactionLogEntry buildMetadataEntry(ConnectorSession session
         }
         int metadataFields = 8;
         int formatFields = 2;
-        Block metadataEntryBlock = block.getObject(pagePosition, Block.class);
-        log.debug("Block %s has %s fields", block, metadataEntryBlock.getPositionCount());
-        if (metadataEntryBlock.getPositionCount() != metadataFields) {
+        SqlRow metadataEntryRow = block.getObject(pagePosition, SqlRow.class);
+        log.debug("Block %s has %s fields", block, metadataEntryRow.getFieldCount());
+        if (metadataEntryRow.getFieldCount() != metadataFields) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA,
-                    format("Expected block %s to have %d children, but found %s", block, metadataFields, metadataEntryBlock.getPositionCount()));
+                    format("Expected block %s to have %d children, but found %s", block, metadataFields, metadataEntryRow.getFieldCount()));
         }
-        Block formatBlock = metadataEntryBlock.getObject(3, Block.class);
-        if (formatBlock.getPositionCount() != formatFields) {
+        SqlRow formatRow = getRowField(metadataEntryRow, 3);
+        if (formatRow.getFieldCount() != formatFields) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA,
-                    format("Expected block %s to have %d children, but found %s", formatBlock, formatFields, formatBlock.getPositionCount()));
+                    format("Expected block %s to have %d children, but found %s", formatRow, formatFields, formatRow.getFieldCount()));
         }
         MetadataEntry result = new MetadataEntry(
-                getString(metadataEntryBlock, 0),
-                getString(metadataEntryBlock, 1),
-                getString(metadataEntryBlock, 2),
+                getStringField(metadataEntryRow, 0),
+                getStringField(metadataEntryRow, 1),
+                getStringField(metadataEntryRow, 2),
                 new MetadataEntry.Format(
-                        getString(formatBlock, 0),
-                        getMap(formatBlock, 1)),
-                getString(metadataEntryBlock, 4),
-                getList(metadataEntryBlock, 5),
-                getMap(metadataEntryBlock, 6),
-                getLong(metadataEntryBlock, 7));
+                        getStringField(formatRow, 0),
+                        getMapField(formatRow, 1)),
+                getStringField(metadataEntryRow, 4),
+                getListField(metadataEntryRow, 5),
+                getMapField(metadataEntryRow, 6),
+                getLongField(metadataEntryRow, 7));
         log.debug("Result: %s", result);
         return DeltaLakeTransactionLogEntry.metadataEntry(result);
     }
@@ -333,16 +391,16 @@ private DeltaLakeTransactionLogEntry buildRemoveEntry(ConnectorSession session,
             return null;
         }
         int removeFields = 3;
-        Block removeEntryBlock = block.getObject(pagePosition, Block.class);
-        log.debug("Block %s has %s fields", block, removeEntryBlock.getPositionCount());
-        if (removeEntryBlock.getPositionCount() != removeFields) {
+        SqlRow removeEntryRow = block.getObject(pagePosition, SqlRow.class);
+        log.debug("Block %s has %s fields", block, removeEntryRow.getFieldCount());
+        if (removeEntryRow.getFieldCount() != removeFields) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA,
-                    format("Expected block %s to have %d children, but found %s", block, removeFields, removeEntryBlock.getPositionCount()));
+                    format("Expected block %s to have %d children, but found %s", block, removeFields, removeEntryRow.getFieldCount()));
         }
         RemoveFileEntry result = new RemoveFileEntry(
-                getString(removeEntryBlock, 0),
-                getLong(removeEntryBlock, 1),
-                getByte(removeEntryBlock, 2) != 0);
+                getStringField(removeEntryRow, 0),
+                getLongField(removeEntryRow, 1),
+                getBooleanField(removeEntryRow, 2));
         log.debug("Result: %s", result);
         return DeltaLakeTransactionLogEntry.removeFileEntry(result);
     }
@@ -353,75 +411,74 @@ private DeltaLakeTransactionLogEntry buildAddEntry(ConnectorSession session, Blo
         if (block.isNull(pagePosition)) {
             return null;
         }
-        Block addEntryBlock = block.getObject(pagePosition, Block.class);
-        log.debug("Block %s has %s fields", block, addEntryBlock.getPositionCount());
-
-        Map<String, String> partitionValues = getMap(addEntryBlock, 1);
-        long size = getLong(addEntryBlock, 2);
-        long modificationTime = getLong(addEntryBlock, 3);
-        boolean dataChange = getByte(addEntryBlock, 4) != 0;
-        Map<String, String> tags = getMap(addEntryBlock, 7);
-
-        String path = getString(addEntryBlock, 0);
-        AddFileEntry result;
-        if (!addEntryBlock.isNull(6)) {
-            result = new AddFileEntry(
-                    path,
-                    partitionValues,
-                    size,
-                    modificationTime,
-                    dataChange,
-                    Optional.empty(),
-                    Optional.of(parseStatisticsFromParquet(addEntryBlock.getObject(6, Block.class))),
-                    tags);
-        }
-        else if (!addEntryBlock.isNull(5)) {
-            result = new AddFileEntry(
-                    path,
-                    partitionValues,
-                    size,
-                    modificationTime,
-                    dataChange,
-                    Optional.of(getString(addEntryBlock, 5)),
-                    Optional.empty(),
-                    tags);
+        boolean deletionVectorsEnabled = isDeletionVectorEnabled(metadataEntry, protocolEntry);
+        SqlRow addEntryRow = block.getObject(pagePosition, SqlRow.class);
+        log.debug("Block %s has %s fields", block, addEntryRow.getFieldCount());
+
+        String path = getStringField(addEntryRow, 0);
+        Map<String, String> partitionValues = getMapField(addEntryRow, 1);
+        long size = getLongField(addEntryRow, 2);
+        long modificationTime = getLongField(addEntryRow, 3);
+        boolean dataChange = getBooleanField(addEntryRow, 4);
+
+        Optional<DeletionVectorEntry> deletionVector = Optional.empty();
+        int statsFieldIndex;
+        if (deletionVectorsEnabled) {
+            deletionVector = Optional.ofNullable(getRowField(addEntryRow, 5)).map(CheckpointEntryIterator::parseDeletionVectorFromParquet);
+            statsFieldIndex = 6;
         }
         else {
-            result = new AddFileEntry(
-                    path,
-                    partitionValues,
-                    size,
-                    modificationTime,
-                    dataChange,
-                    Optional.empty(),
-                    Optional.empty(),
-                    tags);
+            statsFieldIndex = 5;
+        }
+
+        Optional<DeltaLakeParquetFileStatistics> parsedStats = Optional.ofNullable(getRowField(addEntryRow, statsFieldIndex + 1)).map(this::parseStatisticsFromParquet);
+        Optional<String> stats = Optional.empty();
+        if (parsedStats.isEmpty()) {
+            stats = Optional.ofNullable(getStringField(addEntryRow, statsFieldIndex));
         }
 
+        Map<String, String> tags = getMapField(addEntryRow, statsFieldIndex + 2);
+        AddFileEntry result = new AddFileEntry(
+                path,
+                partitionValues,
+                size,
+                modificationTime,
+                dataChange,
+                stats,
+                parsedStats,
+                tags,
+                deletionVector);
+
         log.debug("Result: %s", result);
         return DeltaLakeTransactionLogEntry.addFileEntry(result);
     }
 
-    private DeltaLakeParquetFileStatistics parseStatisticsFromParquet(Block statsRowBlock)
+    private static DeletionVectorEntry parseDeletionVectorFromParquet(SqlRow row)
     {
-        if (metadataEntry == null) {
-            throw new TrinoException(DELTA_LAKE_BAD_DATA, "Checkpoint file found without metadata entry");
-        }
-        // Block ordering is determined by TransactionLogAccess#buildAddColumnHandle, using the same method to ensure blocks are matched with the correct column
-        List<DeltaLakeColumnMetadata> columnsWithMinMaxStats = columnsWithStats(schema, metadataEntry.getCanonicalPartitionColumns());
+        checkArgument(row.getFieldCount() == 5, "Deletion vector entry must have 5 fields");
+
+        String storageType = getStringField(row, 0);
+        String pathOrInlineDv = getStringField(row, 1);
+        OptionalInt offset = getOptionalIntField(row, 2);
+        int sizeInBytes = getIntField(row, 3);
+        long cardinality = getLongField(row, 4);
+        return new DeletionVectorEntry(storageType, pathOrInlineDv, offset, sizeInBytes, cardinality);
+    }
 
-        long numRecords = getLong(statsRowBlock, 0);
+    private DeltaLakeParquetFileStatistics parseStatisticsFromParquet(SqlRow statsRow)
+    {
+        long numRecords = getLongField(statsRow, 0);
 
         Optional<Map<String, Object>> minValues = Optional.empty();
         Optional<Map<String, Object>> maxValues = Optional.empty();
         Optional<Map<String, Object>> nullCount;
         if (!columnsWithMinMaxStats.isEmpty()) {
-            minValues = Optional.of(readMinMax(statsRowBlock, 1, columnsWithMinMaxStats));
-            maxValues = Optional.of(readMinMax(statsRowBlock, 2, columnsWithMinMaxStats));
-            nullCount = Optional.of(readNullCount(statsRowBlock, 3, schema));
+            minValues = Optional.of(parseMinMax(getRowField(statsRow, 1), columnsWithMinMaxStats));
+            maxValues = Optional.of(parseMinMax(getRowField(statsRow, 2), columnsWithMinMaxStats));
+            nullCount = Optional.of(parseNullCount(getRowField(statsRow, 3), schema));
         }
         else {
-            nullCount = Optional.of(readNullCount(statsRowBlock, 1, schema));
+            nullCount = Optional.of(parseNullCount(getRowField(statsRow, 1), schema));
         }
 
         return new DeltaLakeParquetFileStatistics(
@@ -431,14 +488,13 @@ private DeltaLakeParquetFileStatistics parseStatisticsFromParquet(Block statsRow
                 nullCount);
     }
 
-    private Map<String, Object> readMinMax(Block block, int blockPosition, List<DeltaLakeColumnMetadata> eligibleColumns)
+    private ImmutableMap<String, Object> parseMinMax(@Nullable SqlRow row, List<DeltaLakeColumnMetadata> eligibleColumns)
     {
-        if (block.isNull(blockPosition)) {
+        if (row == null) {
             // Statistics were not collected
             return ImmutableMap.of();
         }
 
-        Block valuesBlock = block.getObject(blockPosition, Block.class);
         ImmutableMap.Builder<String, Object> values = ImmutableMap.builder();
 
         for (int i = 0; i < eligibleColumns.size(); i++) {
@@ -446,53 +502,55 @@ private Map<String, Object> readMinMax(Block block, int blockPosition, List<Delt
             String name = metadata.getPhysicalName();
             Type type = metadata.getPhysicalColumnType();
 
-            if (valuesBlock.isNull(i)) {
+            ValueBlock fieldBlock = row.getUnderlyingFieldBlock(i);
+            int fieldIndex = row.getUnderlyingFieldPosition(i);
+            if (fieldBlock.isNull(fieldIndex)) {
                 continue;
             }
-            if (type instanceof RowType) {
+            if (type instanceof RowType rowType) {
                 if (checkpointRowStatisticsWritingEnabled) {
                     // RowType column statistics are not used for query planning, but need to be copied when writing out new Checkpoint files.
-                    values.put(name, valuesBlock.getSingleValueBlock(i));
+                    values.put(name, rowType.getObject(fieldBlock, fieldIndex));
                 }
                 continue;
             }
             if (type instanceof TimestampWithTimeZoneType) {
-                Instant instant = Instant.ofEpochMilli(LongMath.divide((Long) readNativeValue(TIMESTAMP_MILLIS, valuesBlock, i), MICROSECONDS_PER_MILLISECOND, UNNECESSARY));
-                if (!instant.atZone(UTC).toLocalDate().isBefore(START_OF_MODERN_ERA)) {
-                    values.put(name, packDateTimeWithZone(instant.toEpochMilli(), UTC_KEY));
+                long epochMillis = LongMath.divide((long) readNativeValue(TIMESTAMP_MILLIS, fieldBlock, fieldIndex), MICROSECONDS_PER_MILLISECOND, UNNECESSARY);
+                if (floorDiv(epochMillis, MILLISECONDS_PER_DAY) >= START_OF_MODERN_ERA_EPOCH_DAY) {
+                    values.put(name, packDateTimeWithZone(epochMillis, UTC_KEY));
                 }
                 continue;
             }
-            values.put(name, readNativeValue(type, valuesBlock, i));
+            values.put(name, readNativeValue(type, fieldBlock, fieldIndex));
         }
         return values.buildOrThrow();
     }
 
-    private Map<String, Object> readNullCount(Block block, int blockPosition, List<DeltaLakeColumnMetadata> columns)
+    private Map<String, Object> parseNullCount(SqlRow row, List<DeltaLakeColumnMetadata> columns)
     {
-        if (block.isNull(blockPosition)) {
+        if (row == null) {
             // Statistics were not collected
             return ImmutableMap.of();
         }
 
-        Block valuesBlock = block.getObject(blockPosition, Block.class);
         ImmutableMap.Builder<String, Object> values = ImmutableMap.builder();
-
         for (int i = 0; i < columns.size(); i++) {
             DeltaLakeColumnMetadata metadata = columns.get(i);
 
-            if (valuesBlock.isNull(i)) {
+            ValueBlock fieldBlock = row.getUnderlyingFieldBlock(i);
+            int fieldIndex = row.getUnderlyingFieldPosition(i);
+            if (fieldBlock.isNull(fieldIndex)) {
                 continue;
             }
             if (metadata.getType() instanceof RowType) {
                 if (checkpointRowStatisticsWritingEnabled) {
                     // RowType column statistics are not used for query planning, but need to be copied when writing out new Checkpoint files.
-                    values.put(metadata.getPhysicalName(), valuesBlock.getSingleValueBlock(i));
+                    values.put(metadata.getPhysicalName(), fieldBlock.getObject(fieldIndex, SqlRow.class));
                 }
                 continue;
             }
 
-            values.put(metadata.getPhysicalName(), getLong(valuesBlock, i));
+            values.put(metadata.getPhysicalName(), getLongField(row, i));
         }
         return values.buildOrThrow();
     }
@@ -504,75 +562,112 @@ private DeltaLakeTransactionLogEntry buildTxnEntry(ConnectorSession session, Blo
             return null;
         }
         int txnFields = 3;
-        Block txnEntryBlock = block.getObject(pagePosition, Block.class);
-        log.debug("Block %s has %s fields", block, txnEntryBlock.getPositionCount());
-        if (txnEntryBlock.getPositionCount() != txnFields) {
+        SqlRow txnEntryRow = block.getObject(pagePosition, SqlRow.class);
+        log.debug("Block %s has %s fields", block, txnEntryRow.getFieldCount());
+        if (txnEntryRow.getFieldCount() != txnFields) {
             throw new TrinoException(DELTA_LAKE_INVALID_SCHEMA,
-                    format("Expected block %s to have %d children, but found %s", block, txnFields, txnEntryBlock.getPositionCount()));
+                    format("Expected block %s to have %d children, but found %s", block, txnFields, txnEntryRow.getFieldCount()));
         }
         TransactionEntry result = new TransactionEntry(
-                getString(txnEntryBlock, 0),
-                getLong(txnEntryBlock, 1),
-                getLong(txnEntryBlock, 2));
+                getStringField(txnEntryRow, 0),
+                getLongField(txnEntryRow, 1),
+                getLongField(txnEntryRow, 2));
         log.debug("Result: %s", result);
         return DeltaLakeTransactionLogEntry.transactionEntry(result);
     }
 
     @Nullable
-    private String getString(Block block, int position)
+    private static SqlRow getRowField(SqlRow row, int field)
     {
-        if (block.isNull(position)) {
+        RowBlock valueBlock = (RowBlock) row.getUnderlyingFieldBlock(field);
+        int index = row.getUnderlyingFieldPosition(field);
+        if (valueBlock.isNull(index)) {
             return null;
         }
-        return block.getSlice(position, 0, block.getSliceLength(position)).toString(UTF_8);
+        return valueBlock.getRow(index);
     }
 
-    private long getLong(Block block, int position)
+    @Nullable
+    private static String getStringField(SqlRow row, int field)
     {
-        checkArgument(!block.isNull(position));
-        return block.getLong(position, 0);
+        VariableWidthBlock valueBlock = (VariableWidthBlock) row.getUnderlyingFieldBlock(field);
+        int index = row.getUnderlyingFieldPosition(field);
+        if (valueBlock.isNull(index)) {
+            return null;
+        }
+        return valueBlock.getSlice(index).toStringUtf8();
+    }
+
+    private static long getLongField(SqlRow row, int field)
+    {
+        LongArrayBlock valueBlock = (LongArrayBlock) row.getUnderlyingFieldBlock(field);
+        return valueBlock.getLong(row.getUnderlyingFieldPosition(field));
     }
 
-    private int getInt(Block block, int position)
+    private static int getIntField(SqlRow row, int field)
     {
-        checkArgument(!block.isNull(position));
-        return block.getInt(position, 0);
+        IntArrayBlock valueBlock = (IntArrayBlock) row.getUnderlyingFieldBlock(field);
+        return valueBlock.getInt(row.getUnderlyingFieldPosition(field));
     }
 
-    private byte getByte(Block block, int position)
+    private static OptionalInt getOptionalIntField(SqlRow row, int field)
     {
-        checkArgument(!block.isNull(position));
-        return block.getByte(position, 0);
+        IntArrayBlock valueBlock = (IntArrayBlock) row.getUnderlyingFieldBlock(field);
+        int index = row.getUnderlyingFieldPosition(field);
+        if (valueBlock.isNull(index)) {
+            return OptionalInt.empty();
+        }
+        return OptionalInt.of(valueBlock.getInt(index));
+    }
+
+    private static boolean getBooleanField(SqlRow row, int field)
+    {
+        ByteArrayBlock valueBlock = (ByteArrayBlock) row.getUnderlyingFieldBlock(field);
+        return valueBlock.getByte(row.getUnderlyingFieldPosition(field)) != 0;
     }
 
     @SuppressWarnings("unchecked")
-    private Map<String, String> getMap(Block block, int position)
+    private Map<String, String> getMapField(SqlRow row, int field)
     {
-        return (Map<String, String>) stringMap.getObjectValue(session, block, position);
+        MapBlock valueBlock = (MapBlock) row.getUnderlyingFieldBlock(field);
+        return (Map<String, String>) stringMap.getObjectValue(session, valueBlock, row.getUnderlyingFieldPosition(field));
     }
 
     @SuppressWarnings("unchecked")
-    private List<String> getList(Block block, int position)
+    private List<String> getListField(SqlRow row, int field)
     {
-        return (List<String>) stringList.getObjectValue(session, block, position);
+        ArrayBlock valueBlock = (ArrayBlock) row.getUnderlyingFieldBlock(field);
+        return (List<String>) stringList.getObjectValue(session, valueBlock, row.getUnderlyingFieldPosition(field));
     }
 
-    @Override
-    public boolean hasNext()
+    @SuppressWarnings("unchecked")
+    private Optional<Set<String>> getOptionalSetField(SqlRow row, int field)
     {
-        if (nextEntries.isEmpty()) {
-            fillNextEntries();
+        ArrayBlock valueBlock = (ArrayBlock) row.getUnderlyingFieldBlock(field);
+        int index = row.getUnderlyingFieldPosition(field);
+        if (valueBlock.isNull(index)) {
+            return Optional.empty();
         }
-        return !nextEntries.isEmpty();
+        List<String> list = (List<String>) stringList.getObjectValue(session, valueBlock, index);
+        return Optional.of(ImmutableSet.copyOf(list));
     }
 
     @Override
-    public DeltaLakeTransactionLogEntry next()
+    protected DeltaLakeTransactionLogEntry computeNext()
     {
-        if (!hasNext()) {
-            throw new NoSuchElementException();
+        if (nextEntries.isEmpty()) {
+            fillNextEntries();
+        }
+        if (!nextEntries.isEmpty()) {
+            return nextEntries.remove();
         }
-        return nextEntries.remove();
+        try {
+            pageSource.close();
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        return endOfData();
     }
 
     private boolean tryAdvancePage()
@@ -621,6 +716,12 @@ private void fillNextEntries()
         }
     }
 
+    @VisibleForTesting
+    OptionalLong getCompletedPositions()
+    {
+        return pageSource.getCompletedPositions();
+    }
+
     @FunctionalInterface
     public interface CheckPointFieldExtractor
     {
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointSchemaManager.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointSchemaManager.java
index 2a29d5dde06d..eaea241a3291 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointSchemaManager.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointSchemaManager.java
@@ -14,8 +14,10 @@
 package io.trino.plugin.deltalake.transactionlog.checkpoint;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.deltalake.DeltaLakeColumnMetadata;
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.BooleanType;
@@ -29,13 +31,12 @@
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.VarcharType;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.extractSchema;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.isDeletionVectorEnabled;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogAccess.columnsWithStats;
 import static java.util.Objects.requireNonNull;
 
@@ -43,6 +44,14 @@ public class CheckpointSchemaManager
 {
     private final TypeManager typeManager;
 
+    private static final RowType DELETION_VECTORS_TYPE = RowType.from(ImmutableList.<RowType.Field>builder()
+            .add(RowType.field("storageType", VarcharType.VARCHAR))
+            .add(RowType.field("pathOrInlineDv", VarcharType.VARCHAR))
+            .add(RowType.field("offset", IntegerType.INTEGER))
+            .add(RowType.field("sizeInBytes", IntegerType.INTEGER))
+            .add(RowType.field("cardinality", BigintType.BIGINT))
+            .build());
+
     private static final RowType TXN_ENTRY_TYPE = RowType.from(ImmutableList.of(
             RowType.field("appId", VarcharType.createUnboundedVarcharType()),
             RowType.field("version", BigintType.BIGINT),
@@ -53,19 +62,16 @@ public class CheckpointSchemaManager
             RowType.field("deletionTimestamp", BigintType.BIGINT),
             RowType.field("dataChange", BooleanType.BOOLEAN)));
 
-    private static final RowType PROTOCOL_ENTRY_TYPE = RowType.from(ImmutableList.of(
-            RowType.field("minReaderVersion", IntegerType.INTEGER),
-            RowType.field("minWriterVersion", IntegerType.INTEGER)));
-
     private final RowType metadataEntryType;
     private final RowType commitInfoEntryType;
+    private final ArrayType stringList;
 
     @Inject
     public CheckpointSchemaManager(TypeManager typeManager)
     {
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
 
-        ArrayType stringList = (ArrayType) this.typeManager.getType(TypeSignature.arrayType(VarcharType.VARCHAR.getTypeSignature()));
+        stringList = (ArrayType) this.typeManager.getType(TypeSignature.arrayType(VarcharType.VARCHAR.getTypeSignature()));
         MapType stringMap = (MapType) this.typeManager.getType(TypeSignature.mapType(VarcharType.VARCHAR.getTypeSignature(), VarcharType.VARCHAR.getTypeSignature()));
 
         metadataEntryType = RowType.from(ImmutableList.of(
@@ -106,10 +112,11 @@ public RowType getMetadataEntryType()
         return metadataEntryType;
     }
 
-    public RowType getAddEntryType(MetadataEntry metadataEntry, boolean requireWriteStatsAsJson, boolean requireWriteStatsAsStruct)
+    public RowType getAddEntryType(MetadataEntry metadataEntry, ProtocolEntry protocolEntry, boolean requireWriteStatsAsJson, boolean requireWriteStatsAsStruct)
     {
-        List<DeltaLakeColumnMetadata> allColumns = extractSchema(metadataEntry, typeManager);
-        List<DeltaLakeColumnMetadata> minMaxColumns = columnsWithStats(metadataEntry, typeManager);
+        List<DeltaLakeColumnMetadata> allColumns = extractSchema(metadataEntry, protocolEntry, typeManager);
+        List<DeltaLakeColumnMetadata> minMaxColumns = columnsWithStats(metadataEntry, protocolEntry, typeManager);
+        boolean deletionVectorEnabled = isDeletionVectorEnabled(metadataEntry, protocolEntry);
 
         ImmutableList.Builder<RowType.Field> minMaxFields = ImmutableList.builder();
         for (DeltaLakeColumnMetadata dataColumn : minMaxColumns) {
@@ -143,6 +150,9 @@ public RowType getAddEntryType(MetadataEntry metadataEntry, boolean requireWrite
         addFields.add(RowType.field("size", BigintType.BIGINT));
         addFields.add(RowType.field("modificationTime", BigintType.BIGINT));
         addFields.add(RowType.field("dataChange", BooleanType.BOOLEAN));
+        if (deletionVectorEnabled) {
+            addFields.add(RowType.field("deletionVector", DELETION_VECTORS_TYPE));
+        }
         if (requireWriteStatsAsJson) {
             addFields.add(RowType.field("stats", VarcharType.createUnboundedVarcharType()));
         }
@@ -176,9 +186,18 @@ public RowType getTxnEntryType()
         return TXN_ENTRY_TYPE;
     }
 
-    public RowType getProtocolEntryType()
+    public RowType getProtocolEntryType(boolean requireReaderFeatures, boolean requireWriterFeatures)
     {
-        return PROTOCOL_ENTRY_TYPE;
+        ImmutableList.Builder<RowType.Field> fields = ImmutableList.builder();
+        fields.add(RowType.field("minReaderVersion", IntegerType.INTEGER));
+        fields.add(RowType.field("minWriterVersion", IntegerType.INTEGER));
+        if (requireReaderFeatures) {
+            fields.add(RowType.field("readerFeatures", stringList));
+        }
+        if (requireWriterFeatures) {
+            fields.add(RowType.field("writerFeatures", stringList));
+        }
+        return RowType.from(fields.build());
     }
 
     public RowType getCommitInfoEntryType()
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointWriter.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointWriter.java
index dd2396ba3884..4f2c94a46abd 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointWriter.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointWriter.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.deltalake.transactionlog.checkpoint;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import io.trino.filesystem.TrinoOutputFile;
 import io.trino.parquet.writer.ParquetSchemaConverter;
@@ -29,27 +30,29 @@
 import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeJsonFileStatistics;
 import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeParquetFileStatistics;
 import io.trino.spi.PageBuilder;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.DateTimeEncoding;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
+import io.trino.spi.type.RowType.Field;
 import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
+import jakarta.annotation.Nullable;
 import org.apache.parquet.format.CompressionCodec;
 import org.joda.time.DateTimeZone;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeParquetStatisticsUtils.jsonValueToTrinoValue;
@@ -62,7 +65,6 @@
 import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
 import static io.trino.spi.type.TypeUtils.writeNativeValue;
 import static java.lang.Math.multiplyExact;
-import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toMap;
 
@@ -80,12 +82,20 @@ public class CheckpointWriter
     private final TypeManager typeManager;
     private final CheckpointSchemaManager checkpointSchemaManager;
     private final String trinoVersion;
+    private final ParquetWriterOptions parquetWriterOptions;
 
     public CheckpointWriter(TypeManager typeManager, CheckpointSchemaManager checkpointSchemaManager, String trinoVersion)
+    {
+        this(typeManager, checkpointSchemaManager, trinoVersion, ParquetWriterOptions.builder().build());
+    }
+
+    @VisibleForTesting
+    public CheckpointWriter(TypeManager typeManager, CheckpointSchemaManager checkpointSchemaManager, String trinoVersion, ParquetWriterOptions parquetWriterOptions)
     {
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         this.checkpointSchemaManager = requireNonNull(checkpointSchemaManager, "checkpointSchemaManager is null");
         this.trinoVersion = requireNonNull(trinoVersion, "trinoVersion is null");
+        this.parquetWriterOptions = requireNonNull(parquetWriterOptions, "parquetWriterOptions is null");
     }
 
     public void write(CheckpointEntries entries, TrinoOutputFile outputFile)
@@ -96,10 +106,12 @@ public void write(CheckpointEntries entries, TrinoOutputFile outputFile)
         // The default value is false in https://github.com/delta-io/delta/blob/master/PROTOCOL.md#checkpoint-format, but Databricks defaults to true
         boolean writeStatsAsStruct = Boolean.parseBoolean(configuration.getOrDefault(DELTA_CHECKPOINT_WRITE_STATS_AS_STRUCT_PROPERTY, "true"));
 
+        ProtocolEntry protocolEntry = entries.getProtocolEntry();
+
         RowType metadataEntryType = checkpointSchemaManager.getMetadataEntryType();
-        RowType protocolEntryType = checkpointSchemaManager.getProtocolEntryType();
+        RowType protocolEntryType = checkpointSchemaManager.getProtocolEntryType(protocolEntry.getReaderFeatures().isPresent(), protocolEntry.getWriterFeatures().isPresent());
         RowType txnEntryType = checkpointSchemaManager.getTxnEntryType();
-        RowType addEntryType = checkpointSchemaManager.getAddEntryType(entries.getMetadataEntry(), writeStatsAsJson, writeStatsAsStruct);
+        RowType addEntryType = checkpointSchemaManager.getAddEntryType(entries.getMetadataEntry(), entries.getProtocolEntry(), writeStatsAsJson, writeStatsAsStruct);
         RowType removeEntryType = checkpointSchemaManager.getRemoveEntryType();
 
         List<String> columnNames = ImmutableList.of(
@@ -121,10 +133,9 @@ public void write(CheckpointEntries entries, TrinoOutputFile outputFile)
                 outputFile.create(),
                 schemaConverter.getMessageType(),
                 schemaConverter.getPrimitiveTypes(),
-                ParquetWriterOptions.builder().build(),
+                parquetWriterOptions,
                 CompressionCodec.SNAPPY,
                 trinoVersion,
-                false,
                 Optional.of(DateTimeZone.UTC),
                 Optional.empty());
 
@@ -136,7 +147,7 @@ public void write(CheckpointEntries entries, TrinoOutputFile outputFile)
             writeTransactionEntry(pageBuilder, txnEntryType, transactionEntry);
         }
         for (AddFileEntry addFileEntry : entries.getAddFileEntries()) {
-            writeAddFileEntry(pageBuilder, addEntryType, addFileEntry, entries.getMetadataEntry(), writeStatsAsJson, writeStatsAsStruct);
+            writeAddFileEntry(pageBuilder, addEntryType, addFileEntry, entries.getMetadataEntry(), entries.getProtocolEntry(), writeStatsAsJson, writeStatsAsStruct);
         }
         for (RemoveFileEntry removeFileEntry : entries.getRemoveFileEntries()) {
             writeRemoveFileEntry(pageBuilder, removeEntryType, removeFileEntry);
@@ -150,23 +161,22 @@ public void write(CheckpointEntries entries, TrinoOutputFile outputFile)
     private void writeMetadataEntry(PageBuilder pageBuilder, RowType entryType, MetadataEntry metadataEntry)
     {
         pageBuilder.declarePosition();
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(METADATA_BLOCK_CHANNEL);
-        BlockBuilder entryBlockBuilder = blockBuilder.beginBlockEntry();
-        writeString(entryBlockBuilder, entryType, 0, "id", metadataEntry.getId());
-        writeString(entryBlockBuilder, entryType, 1, "name", metadataEntry.getName());
-        writeString(entryBlockBuilder, entryType, 2, "description", metadataEntry.getDescription());
-
-        RowType formatType = getInternalRowType(entryType, 3, "format");
-        BlockBuilder formatBlockBuilder = entryBlockBuilder.beginBlockEntry();
-        writeString(formatBlockBuilder, formatType, 0, "provider", metadataEntry.getFormat().getProvider());
-        writeStringMap(formatBlockBuilder, formatType, 1, "options", metadataEntry.getFormat().getOptions());
-        entryBlockBuilder.closeEntry();
-
-        writeString(entryBlockBuilder, entryType, 4, "schemaString", metadataEntry.getSchemaString());
-        writeStringList(entryBlockBuilder, entryType, 5, "partitionColumns", metadataEntry.getOriginalPartitionColumns());
-        writeStringMap(entryBlockBuilder, entryType, 6, "configuration", metadataEntry.getConfiguration());
-        writeLong(entryBlockBuilder, entryType, 7, "createdTime", metadataEntry.getCreatedTime());
-        blockBuilder.closeEntry();
+        ((RowBlockBuilder) pageBuilder.getBlockBuilder(METADATA_BLOCK_CHANNEL)).buildEntry(fieldBuilders -> {
+            writeString(fieldBuilders.get(0), entryType, 0, "id", metadataEntry.getId());
+            writeString(fieldBuilders.get(1), entryType, 1, "name", metadataEntry.getName());
+            writeString(fieldBuilders.get(2), entryType, 2, "description", metadataEntry.getDescription());
+
+            RowType formatType = getInternalRowType(entryType, 3, "format");
+            ((RowBlockBuilder) fieldBuilders.get(3)).buildEntry(formatBlockBuilders -> {
+                writeString(formatBlockBuilders.get(0), formatType, 0, "provider", metadataEntry.getFormat().getProvider());
+                writeStringMap(formatBlockBuilders.get(1), formatType, 1, "options", metadataEntry.getFormat().getOptions());
+            });
+
+            writeString(fieldBuilders.get(4), entryType, 4, "schemaString", metadataEntry.getSchemaString());
+            writeStringList(fieldBuilders.get(5), entryType, 5, "partitionColumns", metadataEntry.getOriginalPartitionColumns());
+            writeStringMap(fieldBuilders.get(6), entryType, 6, "configuration", metadataEntry.getConfiguration());
+            writeLong(fieldBuilders.get(7), entryType, 7, "createdTime", metadataEntry.getCreatedTime());
+        });
 
         // null for others
         appendNullOtherBlocks(pageBuilder, METADATA_BLOCK_CHANNEL);
@@ -175,11 +185,23 @@ private void writeMetadataEntry(PageBuilder pageBuilder, RowType entryType, Meta
     private void writeProtocolEntry(PageBuilder pageBuilder, RowType entryType, ProtocolEntry protocolEntry)
     {
         pageBuilder.declarePosition();
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(PROTOCOL_BLOCK_CHANNEL);
-        BlockBuilder entryBlockBuilder = blockBuilder.beginBlockEntry();
-        writeLong(entryBlockBuilder, entryType, 0, "minReaderVersion", (long) protocolEntry.getMinReaderVersion());
-        writeLong(entryBlockBuilder, entryType, 1, "minWriterVersion", (long) protocolEntry.getMinWriterVersion());
-        blockBuilder.closeEntry();
+        ((RowBlockBuilder) pageBuilder.getBlockBuilder(PROTOCOL_BLOCK_CHANNEL)).buildEntry(fieldBuilders -> {
+            int fieldId = 0;
+            writeLong(fieldBuilders.get(fieldId), entryType, fieldId, "minReaderVersion", (long) protocolEntry.getMinReaderVersion());
+            fieldId++;
+
+            writeLong(fieldBuilders.get(fieldId), entryType, fieldId, "minWriterVersion", (long) protocolEntry.getMinWriterVersion());
+            fieldId++;
+
+            if (protocolEntry.getReaderFeatures().isPresent()) {
+                writeStringList(fieldBuilders.get(fieldId), entryType, fieldId, "readerFeatures", protocolEntry.getReaderFeatures().get().stream().collect(toImmutableList()));
+                fieldId++;
+            }
+
+            if (protocolEntry.getWriterFeatures().isPresent()) {
+                writeStringList(fieldBuilders.get(fieldId), entryType, fieldId, "writerFeatures", protocolEntry.getWriterFeatures().get().stream().collect(toImmutableList()));
+            }
+        });
 
         // null for others
         appendNullOtherBlocks(pageBuilder, PROTOCOL_BLOCK_CHANNEL);
@@ -188,48 +210,61 @@ private void writeProtocolEntry(PageBuilder pageBuilder, RowType entryType, Prot
     private void writeTransactionEntry(PageBuilder pageBuilder, RowType entryType, TransactionEntry transactionEntry)
     {
         pageBuilder.declarePosition();
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(TXN_BLOCK_CHANNEL);
-        BlockBuilder entryBlockBuilder = blockBuilder.beginBlockEntry();
-        writeString(entryBlockBuilder, entryType, 0, "appId", transactionEntry.getAppId());
-        writeLong(entryBlockBuilder, entryType, 1, "version", transactionEntry.getVersion());
-        writeLong(entryBlockBuilder, entryType, 2, "lastUpdated", transactionEntry.getLastUpdated());
-        blockBuilder.closeEntry();
+        ((RowBlockBuilder) pageBuilder.getBlockBuilder(TXN_BLOCK_CHANNEL)).buildEntry(fieldBuilders -> {
+            writeString(fieldBuilders.get(0), entryType, 0, "appId", transactionEntry.getAppId());
+            writeLong(fieldBuilders.get(1), entryType, 1, "version", transactionEntry.getVersion());
+            writeLong(fieldBuilders.get(2), entryType, 2, "lastUpdated", transactionEntry.getLastUpdated());
+        });
 
         // null for others
         appendNullOtherBlocks(pageBuilder, TXN_BLOCK_CHANNEL);
     }
 
-    private void writeAddFileEntry(PageBuilder pageBuilder, RowType entryType, AddFileEntry addFileEntry, MetadataEntry metadataEntry, boolean writeStatsAsJson, boolean writeStatsAsStruct)
+    private void writeAddFileEntry(PageBuilder pageBuilder, RowType entryType, AddFileEntry addFileEntry, MetadataEntry metadataEntry, ProtocolEntry protocolEntry, boolean writeStatsAsJson, boolean writeStatsAsStruct)
     {
         pageBuilder.declarePosition();
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(ADD_BLOCK_CHANNEL);
-        BlockBuilder entryBlockBuilder = blockBuilder.beginBlockEntry();
-        int fieldId = 0;
-        writeString(entryBlockBuilder, entryType, fieldId++, "path", addFileEntry.getPath());
-        writeStringMap(entryBlockBuilder, entryType, fieldId++, "partitionValues", addFileEntry.getPartitionValues());
-        writeLong(entryBlockBuilder, entryType, fieldId++, "size", addFileEntry.getSize());
-        writeLong(entryBlockBuilder, entryType, fieldId++, "modificationTime", addFileEntry.getModificationTime());
-        writeBoolean(entryBlockBuilder, entryType, fieldId++, "dataChange", addFileEntry.isDataChange());
-        if (writeStatsAsJson) {
-            writeJsonStats(entryBlockBuilder, entryType, addFileEntry, metadataEntry, fieldId++);
-        }
-        if (writeStatsAsStruct) {
-            writeParsedStats(entryBlockBuilder, entryType, addFileEntry, fieldId++);
-        }
-        writeStringMap(entryBlockBuilder, entryType, fieldId++, "tags", addFileEntry.getTags());
-        blockBuilder.closeEntry();
+        RowBlockBuilder blockBuilder = (RowBlockBuilder) pageBuilder.getBlockBuilder(ADD_BLOCK_CHANNEL);
+        blockBuilder.buildEntry(fieldBuilders -> {
+            int fieldId = 0;
+            writeString(fieldBuilders.get(fieldId), entryType, fieldId, "path", addFileEntry.getPath());
+            fieldId++;
+
+            writeStringMap(fieldBuilders.get(fieldId), entryType, fieldId, "partitionValues", addFileEntry.getPartitionValues());
+            fieldId++;
+
+            writeLong(fieldBuilders.get(fieldId), entryType, fieldId, "size", addFileEntry.getSize());
+            fieldId++;
+
+            writeLong(fieldBuilders.get(fieldId), entryType, fieldId, "modificationTime", addFileEntry.getModificationTime());
+            fieldId++;
+
+            writeBoolean(fieldBuilders.get(fieldId), entryType, fieldId, "dataChange", addFileEntry.isDataChange());
+            fieldId++;
+
+            if (writeStatsAsJson) {
+                writeJsonStats(fieldBuilders.get(fieldId), entryType, addFileEntry, metadataEntry, protocolEntry, fieldId);
+                fieldId++;
+            }
+
+            if (writeStatsAsStruct) {
+                writeParsedStats(fieldBuilders.get(fieldId), entryType, addFileEntry, fieldId);
+                fieldId++;
+            }
+
+            writeStringMap(fieldBuilders.get(fieldId), entryType, fieldId, "tags", addFileEntry.getTags());
+        });
 
         // null for others
         appendNullOtherBlocks(pageBuilder, ADD_BLOCK_CHANNEL);
     }
 
-    private void writeJsonStats(BlockBuilder entryBlockBuilder, RowType entryType, AddFileEntry addFileEntry, MetadataEntry metadataEntry, int fieldId)
+    private void writeJsonStats(BlockBuilder entryBlockBuilder, RowType entryType, AddFileEntry addFileEntry, MetadataEntry metadataEntry, ProtocolEntry protocolEntry, int fieldId)
     {
         String statsJson = null;
         if (addFileEntry.getStats().isPresent()) {
             DeltaLakeFileStatistics statistics = addFileEntry.getStats().get();
             if (statistics instanceof DeltaLakeParquetFileStatistics parquetFileStatistics) {
-                Map<String, Type> columnTypeMapping = getColumnTypeMapping(metadataEntry);
+                Map<String, Type> columnTypeMapping = getColumnTypeMapping(metadataEntry, protocolEntry);
                 DeltaLakeJsonFileStatistics jsonFileStatistics = new DeltaLakeJsonFileStatistics(
                         parquetFileStatistics.getNumRecords(),
                         parquetFileStatistics.getMinValues().map(values -> toJsonValues(columnTypeMapping, values)),
@@ -244,10 +279,10 @@ private void writeJsonStats(BlockBuilder entryBlockBuilder, RowType entryType, A
         writeString(entryBlockBuilder, entryType, fieldId, "stats", statsJson);
     }
 
-    private Map<String, Type> getColumnTypeMapping(MetadataEntry deltaMetadata)
+    private Map<String, Type> getColumnTypeMapping(MetadataEntry deltaMetadata, ProtocolEntry protocolEntry)
     {
-        return extractSchema(deltaMetadata, typeManager).stream()
-                .collect(toImmutableMap(DeltaLakeColumnMetadata::getName, DeltaLakeColumnMetadata::getType));
+        return extractSchema(deltaMetadata, protocolEntry, typeManager).stream()
+                .collect(toImmutableMap(DeltaLakeColumnMetadata::getPhysicalName, DeltaLakeColumnMetadata::getPhysicalColumnType));
     }
 
     private Optional<String> getStatsString(DeltaLakeJsonFileStatistics parsedStats)
@@ -268,26 +303,30 @@ private void writeParsedStats(BlockBuilder entryBlockBuilder, RowType entryType,
             return;
         }
         DeltaLakeFileStatistics stats = addFileEntry.getStats().get();
-        BlockBuilder statsBlockBuilder = entryBlockBuilder.beginBlockEntry();
-
-        if (stats instanceof DeltaLakeParquetFileStatistics) {
-            writeLong(statsBlockBuilder, statsType, 0, "numRecords", stats.getNumRecords().orElse(null));
-            writeMinMaxMapAsFields(statsBlockBuilder, statsType, 1, "minValues", stats.getMinValues(), false);
-            writeMinMaxMapAsFields(statsBlockBuilder, statsType, 2, "maxValues", stats.getMaxValues(), false);
-            writeNullCountAsFields(statsBlockBuilder, statsType, 3, "nullCount", stats.getNullCount());
-        }
-        else {
-            int internalFieldId = 0;
-            writeLong(statsBlockBuilder, statsType, internalFieldId++, "numRecords", stats.getNumRecords().orElse(null));
-            if (statsType.getFields().stream().anyMatch(field -> field.getName().orElseThrow().equals("minValues"))) {
-                writeMinMaxMapAsFields(statsBlockBuilder, statsType, internalFieldId++, "minValues", stats.getMinValues(), true);
+        ((RowBlockBuilder) entryBlockBuilder).buildEntry(fieldBuilders -> {
+            if (stats instanceof DeltaLakeParquetFileStatistics) {
+                writeLong(fieldBuilders.get(0), statsType, 0, "numRecords", stats.getNumRecords().orElse(null));
+                writeMinMaxMapAsFields(fieldBuilders.get(1), statsType, 1, "minValues", stats.getMinValues(), false);
+                writeMinMaxMapAsFields(fieldBuilders.get(2), statsType, 2, "maxValues", stats.getMaxValues(), false);
+                writeNullCountAsFields(fieldBuilders.get(3), statsType, 3, "nullCount", stats.getNullCount());
             }
-            if (statsType.getFields().stream().anyMatch(field -> field.getName().orElseThrow().equals("maxValues"))) {
-                writeMinMaxMapAsFields(statsBlockBuilder, statsType, internalFieldId++, "maxValues", stats.getMaxValues(), true);
+            else {
+                int internalFieldId = 0;
+
+                writeLong(fieldBuilders.get(internalFieldId), statsType, internalFieldId, "numRecords", stats.getNumRecords().orElse(null));
+                internalFieldId++;
+
+                if (statsType.getFields().stream().anyMatch(field -> field.getName().orElseThrow().equals("minValues"))) {
+                    writeMinMaxMapAsFields(fieldBuilders.get(internalFieldId), statsType, internalFieldId, "minValues", stats.getMinValues(), true);
+                    internalFieldId++;
+                }
+                if (statsType.getFields().stream().anyMatch(field -> field.getName().orElseThrow().equals("maxValues"))) {
+                    writeMinMaxMapAsFields(fieldBuilders.get(internalFieldId), statsType, internalFieldId, "maxValues", stats.getMaxValues(), true);
+                    internalFieldId++;
+                }
+                writeNullCountAsFields(fieldBuilders.get(internalFieldId), statsType, internalFieldId, "nullCount", stats.getNullCount());
             }
-            writeNullCountAsFields(statsBlockBuilder, statsType, internalFieldId++, "nullCount", stats.getNullCount());
-        }
-        entryBlockBuilder.closeEntry();
+        });
     }
 
     private void writeMinMaxMapAsFields(BlockBuilder blockBuilder, RowType type, int fieldId, String fieldName, Optional<Map<String, Object>> values, boolean isJson)
@@ -304,37 +343,21 @@ private void writeNullCountAsFields(BlockBuilder blockBuilder, RowType type, int
 
     private void writeObjectMapAsFields(BlockBuilder blockBuilder, RowType type, int fieldId, String fieldName, Optional<Map<String, Object>> values)
     {
-        RowType.Field valuesField = validateAndGetField(type, fieldId, fieldName);
-        RowType valuesFieldType = (RowType) valuesField.getType();
-        BlockBuilder fieldBlockBuilder = blockBuilder.beginBlockEntry();
         if (values.isEmpty()) {
             blockBuilder.appendNull();
+            return;
         }
-        else {
-            for (RowType.Field valueField : valuesFieldType.getFields()) {
-                // anonymous row fields are not expected here
-                Object value = values.get().get(valueField.getName().orElseThrow());
-                if (valueField.getType() instanceof RowType) {
-                    Block rowBlock = (Block) value;
-                    // Statistics were not collected
-                    if (rowBlock == null) {
-                        fieldBlockBuilder.appendNull();
-                        continue;
-                    }
-                    checkState(rowBlock.getPositionCount() == 1, "Invalid RowType statistics for writing Delta Lake checkpoint");
-                    if (rowBlock.isNull(0)) {
-                        fieldBlockBuilder.appendNull();
-                    }
-                    else {
-                        valueField.getType().appendTo(rowBlock, 0, fieldBlockBuilder);
-                    }
-                }
-                else {
-                    writeNativeValue(valueField.getType(), fieldBlockBuilder, value);
-                }
+
+        Field valuesField = validateAndGetField(type, fieldId, fieldName);
+        List<Field> fields = ((RowType) valuesField.getType()).getFields();
+        ((RowBlockBuilder) blockBuilder).buildEntry(fieldBuilders -> {
+            for (int i = 0; i < fields.size(); i++) {
+                Field field = fields.get(i);
+                BlockBuilder fieldBlockBuilder = fieldBuilders.get(i);
+                Object value = values.get().get(field.getName().orElseThrow());
+                writeNativeValue(field.getType(), fieldBlockBuilder, value);
             }
-        }
-        blockBuilder.closeEntry();
+        });
     }
 
     private Optional<Map<String, Object>> preprocessMinMaxValues(RowType valuesType, Optional<Map<String, Object>> valuesOptional, boolean isJson)
@@ -350,7 +373,7 @@ private Optional<Map<String, Object>> preprocessMinMaxValues(RowType valuesType,
                             .collect(toMap(
                                     Map.Entry::getKey,
                                     entry -> {
-                                        Type type = fieldTypes.get(entry.getKey().toLowerCase(ENGLISH));
+                                        Type type = fieldTypes.get(entry.getKey());
                                         Object value = entry.getValue();
                                         if (isJson) {
                                             return jsonValueToTrinoValue(type, value);
@@ -369,27 +392,26 @@ private Optional<Map<String, Object>> preprocessNullCount(Optional<Map<String, O
     {
         return valuesOptional.map(
                 values ->
-                    values.entrySet().stream()
-                            .collect(toMap(
-                                    Map.Entry::getKey,
-                                    entry -> {
-                                        Object value = entry.getValue();
-                                        if (value instanceof Integer) {
-                                            return (long) (int) value;
-                                        }
-                                        return value;
-                                    })));
+                        values.entrySet().stream()
+                                .collect(toMap(
+                                        Map.Entry::getKey,
+                                        entry -> {
+                                            Object value = entry.getValue();
+                                            if (value instanceof Integer) {
+                                                return (long) (int) value;
+                                            }
+                                            return value;
+                                        })));
     }
 
     private void writeRemoveFileEntry(PageBuilder pageBuilder, RowType entryType, RemoveFileEntry removeFileEntry)
     {
         pageBuilder.declarePosition();
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(REMOVE_BLOCK_CHANNEL);
-        BlockBuilder entryBlockBuilder = blockBuilder.beginBlockEntry();
-        writeString(entryBlockBuilder, entryType, 0, "path", removeFileEntry.getPath());
-        writeLong(entryBlockBuilder, entryType, 1, "deletionTimestamp", removeFileEntry.getDeletionTimestamp());
-        writeBoolean(entryBlockBuilder, entryType, 2, "dataChange", removeFileEntry.isDataChange());
-        blockBuilder.closeEntry();
+        ((RowBlockBuilder) pageBuilder.getBlockBuilder(REMOVE_BLOCK_CHANNEL)).buildEntry(fieldBuilders -> {
+            writeString(fieldBuilders.get(0), entryType, 0, "path", removeFileEntry.getPath());
+            writeLong(fieldBuilders.get(1), entryType, 1, "deletionTimestamp", removeFileEntry.getDeletionTimestamp());
+            writeBoolean(fieldBuilders.get(2), entryType, 2, "dataChange", removeFileEntry.isDataChange());
+        });
 
         // null for others
         appendNullOtherBlocks(pageBuilder, REMOVE_BLOCK_CHANNEL);
@@ -440,17 +462,17 @@ private void writeStringMap(BlockBuilder blockBuilder, RowType type, int fieldId
             return;
         }
         MapType mapType = (MapType) field.getType();
-        BlockBuilder mapBuilder = blockBuilder.beginBlockEntry();
-        for (Map.Entry<String, String> entry : values.entrySet()) {
-            mapType.getKeyType().writeSlice(mapBuilder, utf8Slice(entry.getKey()));
-            if (entry.getValue() == null) {
-                mapBuilder.appendNull();
-            }
-            else {
-                mapType.getKeyType().writeSlice(mapBuilder, utf8Slice(entry.getValue()));
+        ((MapBlockBuilder) blockBuilder).buildEntry((keyBlockBuilder, valueBlockBuilder) -> {
+            for (Map.Entry<String, String> entry : values.entrySet()) {
+                mapType.getKeyType().writeSlice(keyBlockBuilder, utf8Slice(entry.getKey()));
+                if (entry.getValue() == null) {
+                    valueBlockBuilder.appendNull();
+                }
+                else {
+                    mapType.getValueType().writeSlice(valueBlockBuilder, utf8Slice(entry.getValue()));
+                }
             }
-        }
-        blockBuilder.closeEntry();
+        });
     }
 
     private void writeStringList(BlockBuilder blockBuilder, RowType type, int fieldId, String fieldName, @Nullable List<String> values)
@@ -462,16 +484,16 @@ private void writeStringList(BlockBuilder blockBuilder, RowType type, int fieldI
             return;
         }
         ArrayType arrayType = (ArrayType) field.getType();
-        BlockBuilder mapBuilder = blockBuilder.beginBlockEntry();
-        for (String value : values) {
-            if (value == null) {
-                mapBuilder.appendNull();
-            }
-            else {
-                arrayType.getElementType().writeSlice(mapBuilder, utf8Slice(value));
+        ((ArrayBlockBuilder) blockBuilder).buildEntry(elementBuilder -> {
+            for (String value : values) {
+                if (value == null) {
+                    elementBuilder.appendNull();
+                }
+                else {
+                    arrayType.getElementType().writeSlice(elementBuilder, utf8Slice(value));
+                }
             }
-        }
-        blockBuilder.closeEntry();
+        });
     }
 
     private RowType getInternalRowType(RowType type, int fieldId, String fieldName)
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointWriterManager.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointWriterManager.java
index 49fcd17ff41c..44ebc5d96aed 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointWriterManager.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointWriterManager.java
@@ -14,30 +14,32 @@
 package io.trino.plugin.deltalake.transactionlog.checkpoint;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoOutputFile;
 import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
 import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
+import io.trino.plugin.deltalake.transactionlog.TableSnapshot.MetadataAndProtocolEntry;
 import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.NodeVersion;
+import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UncheckedIOException;
+import java.util.List;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.MoreCollectors.toOptional;
-import static io.trino.filesystem.Locations.appendPath;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_INVALID_SCHEMA;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.LAST_CHECKPOINT_FILENAME;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogDir;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.ADD;
@@ -93,16 +95,19 @@ public void writeCheckpoint(ConnectorSession session, TableSnapshot snapshot)
             CheckpointBuilder checkpointBuilder = new CheckpointBuilder();
 
             TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-            Optional<DeltaLakeTransactionLogEntry> checkpointMetadataLogEntry = snapshot
+            List<DeltaLakeTransactionLogEntry> checkpointLogEntries = snapshot
                     .getCheckpointTransactionLogEntries(
                             session,
-                            ImmutableSet.of(METADATA),
+                            ImmutableSet.of(METADATA, PROTOCOL),
                             checkpointSchemaManager,
                             typeManager,
                             fileSystem,
-                            fileFormatDataSourceStats)
-                    .collect(toOptional());
-            if (checkpointMetadataLogEntry.isPresent()) {
+                            fileFormatDataSourceStats,
+                            Optional.empty())
+                    .filter(entry -> entry.getMetaData() != null || entry.getProtocol() != null)
+                    .collect(toImmutableList());
+
+            if (!checkpointLogEntries.isEmpty()) {
                 // TODO HACK: this call is required only to ensure that cachedMetadataEntry is set in snapshot (https://github.com/trinodb/trino/issues/12032),
                 // so we can read add entries below this should be reworked so we pass metadata entry explicitly to getCheckpointTransactionLogEntries,
                 // and we should get rid of `setCachedMetadata` in TableSnapshot to make it immutable.
@@ -110,25 +115,35 @@ public void writeCheckpoint(ConnectorSession session, TableSnapshot snapshot)
                 transactionLogAccess.getMetadataEntry(snapshot, session);
 
                 // register metadata entry in writer
-                checkState(checkpointMetadataLogEntry.get().getMetaData() != null, "metaData not present in log entry");
-                checkpointBuilder.addLogEntry(checkpointMetadataLogEntry.get());
+                DeltaLakeTransactionLogEntry metadataLogEntry = checkpointLogEntries.stream()
+                        .filter(logEntry -> logEntry.getMetaData() != null)
+                        .findFirst()
+                        .orElseThrow(() -> new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Metadata not found in transaction log for " + snapshot.getTable()));
+                DeltaLakeTransactionLogEntry protocolLogEntry = checkpointLogEntries.stream()
+                        .filter(logEntry -> logEntry.getProtocol() != null)
+                        .findFirst()
+                        .orElseThrow(() -> new TrinoException(DELTA_LAKE_INVALID_SCHEMA, "Protocol not found in transaction log for " + snapshot.getTable()));
+
+                checkpointBuilder.addLogEntry(metadataLogEntry);
+                checkpointBuilder.addLogEntry(protocolLogEntry);
 
                 // read remaining entries from checkpoint register them in writer
                 snapshot.getCheckpointTransactionLogEntries(
                                 session,
-                                ImmutableSet.of(PROTOCOL, TRANSACTION, ADD, REMOVE, COMMIT),
+                                ImmutableSet.of(TRANSACTION, ADD, REMOVE, COMMIT),
                                 checkpointSchemaManager,
                                 typeManager,
                                 fileSystem,
-                                fileFormatDataSourceStats)
+                                fileFormatDataSourceStats,
+                                Optional.of(new MetadataAndProtocolEntry(metadataLogEntry.getMetaData(), protocolLogEntry.getProtocol())))
                         .forEach(checkpointBuilder::addLogEntry);
             }
 
             snapshot.getJsonTransactionLogEntries()
                     .forEach(checkpointBuilder::addLogEntry);
 
-            String transactionLogDirectory = getTransactionLogDir(snapshot.getTableLocation());
-            String targetFile = appendPath(transactionLogDirectory, String.format("%020d.checkpoint.parquet", newCheckpointVersion));
+            Location transactionLogDir = Location.of(getTransactionLogDir(snapshot.getTableLocation()));
+            Location targetFile = transactionLogDir.appendPath("%020d.checkpoint.parquet".formatted(newCheckpointVersion));
             CheckpointWriter checkpointWriter = new CheckpointWriter(typeManager, checkpointSchemaManager, trinoVersion);
             CheckpointEntries checkpointEntries = checkpointBuilder.build();
             TrinoOutputFile checkpointFile = fileSystemFactory.create(session).newOutputFile(targetFile);
@@ -136,7 +151,7 @@ public void writeCheckpoint(ConnectorSession session, TableSnapshot snapshot)
 
             // update last checkpoint file
             LastCheckpoint newLastCheckpoint = new LastCheckpoint(newCheckpointVersion, checkpointEntries.size(), Optional.empty());
-            String checkpointPath = appendPath(transactionLogDirectory, LAST_CHECKPOINT_FILENAME);
+            Location checkpointPath = transactionLogDir.appendPath(LAST_CHECKPOINT_FILENAME);
             TrinoOutputFile outputFile = fileSystem.newOutputFile(checkpointPath);
             try (OutputStream outputStream = outputFile.createOrOverwrite()) {
                 outputStream.write(lastCheckpointCodec.toJsonBytes(newLastCheckpoint));
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TransactionLogTail.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TransactionLogTail.java
index c42265d716a9..2a7994a3de28 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TransactionLogTail.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TransactionLogTail.java
@@ -14,18 +14,23 @@
 package io.trino.plugin.deltalake.transactionlog.checkpoint;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
 import io.trino.plugin.deltalake.transactionlog.MissingTransactionLogException;
+import io.trino.plugin.deltalake.transactionlog.Transaction;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.parseJson;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogDir;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.getTransactionLogJsonEntryPath;
@@ -36,10 +41,10 @@ public class TransactionLogTail
 {
     private static final int JSON_LOG_ENTRY_READ_BUFFER_SIZE = 1024 * 1024;
 
-    private final List<DeltaLakeTransactionLogEntry> entries;
+    private final List<Transaction> entries;
     private final long version;
 
-    private TransactionLogTail(List<DeltaLakeTransactionLogEntry> entries, long version)
+    private TransactionLogTail(List<Transaction> entries, long version)
     {
         this.entries = ImmutableList.copyOf(requireNonNull(entries, "entries is null"));
         this.version = version;
@@ -62,10 +67,11 @@ public static TransactionLogTail loadNewTail(
             Optional<Long> endVersion)
             throws IOException
     {
-        ImmutableList.Builder<DeltaLakeTransactionLogEntry> entriesBuilder = ImmutableList.builder();
+        ImmutableList.Builder<Transaction> entriesBuilder = ImmutableList.builder();
 
         long version = startVersion.orElse(0L);
         long entryNumber = startVersion.map(start -> start + 1).orElse(0L);
+        checkArgument(endVersion.isEmpty() || entryNumber <= endVersion.get(), "Invalid start/end versions: %s, %s", startVersion, endVersion);
 
         String transactionLogDir = getTransactionLogDir(tableLocation);
         Optional<List<DeltaLakeTransactionLogEntry>> results;
@@ -74,13 +80,13 @@ public static TransactionLogTail loadNewTail(
         while (!endOfTail) {
             results = getEntriesFromJson(entryNumber, transactionLogDir, fileSystem);
             if (results.isPresent()) {
-                entriesBuilder.addAll(results.get());
+                entriesBuilder.add(new Transaction(entryNumber, results.get()));
                 version = entryNumber;
                 entryNumber++;
             }
             else {
                 if (endVersion.isPresent()) {
-                    throw new MissingTransactionLogException(getTransactionLogJsonEntryPath(transactionLogDir, entryNumber));
+                    throw new MissingTransactionLogException(getTransactionLogJsonEntryPath(transactionLogDir, entryNumber).toString());
                 }
                 endOfTail = true;
             }
@@ -93,40 +99,26 @@ public static TransactionLogTail loadNewTail(
         return new TransactionLogTail(entriesBuilder.build(), version);
     }
 
-    public Optional<TransactionLogTail> getUpdatedTail(TrinoFileSystem fileSystem, String tableLocation)
+    public Optional<TransactionLogTail> getUpdatedTail(TrinoFileSystem fileSystem, String tableLocation, Optional<Long> endVersion)
             throws IOException
     {
-        ImmutableList.Builder<DeltaLakeTransactionLogEntry> entriesBuilder = ImmutableList.builder();
-
-        long newVersion = version;
-
-        Optional<List<DeltaLakeTransactionLogEntry>> results;
-        boolean endOfTail = false;
-        while (!endOfTail) {
-            results = getEntriesFromJson(newVersion + 1, getTransactionLogDir(tableLocation), fileSystem);
-            if (results.isPresent()) {
-                if (version == newVersion) {
-                    // initialize entriesBuilder with entries we have already read
-                    entriesBuilder.addAll(entries);
-                }
-                entriesBuilder.addAll(results.get());
-                newVersion++;
-            }
-            else {
-                endOfTail = true;
-            }
-        }
-
-        if (newVersion == version) {
+        checkArgument(endVersion.isEmpty() || endVersion.get() > version, "Invalid endVersion, expected higher than %s, but got %s", version, endVersion);
+        TransactionLogTail newTail = loadNewTail(fileSystem, tableLocation, Optional.of(version), endVersion);
+        if (newTail.version == version) {
             return Optional.empty();
         }
-        return Optional.of(new TransactionLogTail(entriesBuilder.build(), newVersion));
+        return Optional.of(new TransactionLogTail(
+                ImmutableList.<Transaction>builder()
+                        .addAll(entries)
+                        .addAll(newTail.entries)
+                        .build(),
+                newTail.version));
     }
 
     public static Optional<List<DeltaLakeTransactionLogEntry>> getEntriesFromJson(long entryNumber, String transactionLogDir, TrinoFileSystem fileSystem)
             throws IOException
     {
-        String transactionLogFilePath = getTransactionLogJsonEntryPath(transactionLogDir, entryNumber);
+        Location transactionLogFilePath = getTransactionLogJsonEntryPath(transactionLogDir, entryNumber);
         TrinoInputFile inputFile = fileSystem.newInputFile(transactionLogFilePath);
         try (BufferedReader reader = new BufferedReader(
                 new InputStreamReader(inputFile.newStream(), UTF_8),
@@ -151,6 +143,11 @@ public static Optional<List<DeltaLakeTransactionLogEntry>> getEntriesFromJson(lo
     }
 
     public List<DeltaLakeTransactionLogEntry> getFileEntries()
+    {
+        return entries.stream().map(Transaction::transactionEntries).flatMap(Collection::stream).collect(toImmutableList());
+    }
+
+    public List<Transaction> getTransactions()
     {
         return entries;
     }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/statistics/DeltaLakeJsonFileStatistics.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/statistics/DeltaLakeJsonFileStatistics.java
index e92447868dd2..4977384c46e4 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/statistics/DeltaLakeJsonFileStatistics.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/statistics/DeltaLakeJsonFileStatistics.java
@@ -23,11 +23,11 @@
 import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
 import io.trino.plugin.deltalake.transactionlog.CanonicalColumnName;
 import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
+import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.TimestampWithTimeZoneType;
 import io.trino.spi.type.Type;
 
-import java.time.Instant;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Map;
@@ -35,17 +35,24 @@
 import java.util.Optional;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.math.LongMath.divide;
 import static io.airlift.slice.SizeOf.estimatedSizeOf;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.plugin.base.util.JsonUtils.parseJson;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogAccess.toCanonicalNameKeyedMap;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.JSON_STATISTICS_TIMESTAMP_FORMATTER;
-import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.START_OF_MODERN_ERA;
+import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.START_OF_MODERN_ERA_EPOCH_DAY;
+import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.START_OF_MODERN_ERA_EPOCH_MICROS;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.deserializeColumnValue;
 import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
 import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
 import static io.trino.spi.type.DateType.DATE;
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
+import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_SECOND;
+import static io.trino.spi.type.Timestamps.MILLISECONDS_PER_DAY;
+import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MICROSECOND;
+import static java.lang.Math.floorDiv;
+import static java.math.RoundingMode.UNNECESSARY;
 import static java.time.ZoneOffset.UTC;
 
 public class DeltaLakeJsonFileStatistics
@@ -112,32 +119,47 @@ public Optional<Map<String, Object>> getNullCount()
     @Override
     public Optional<Object> getMaxColumnValue(DeltaLakeColumnHandle columnHandle)
     {
-        Optional<Object> value = getStat(columnHandle.getPhysicalName(), maxValues);
+        if (!columnHandle.isBaseColumn()) {
+            return Optional.empty();
+        }
+        Optional<Object> value = getStat(columnHandle.getBasePhysicalColumnName(), maxValues);
         return value.flatMap(o -> deserializeStatisticsValue(columnHandle, String.valueOf(o)));
     }
 
     @Override
     public Optional<Object> getMinColumnValue(DeltaLakeColumnHandle columnHandle)
     {
-        Optional<Object> value = getStat(columnHandle.getPhysicalName(), minValues);
+        if (!columnHandle.isBaseColumn()) {
+            return Optional.empty();
+        }
+        Optional<Object> value = getStat(columnHandle.getBasePhysicalColumnName(), minValues);
         return value.flatMap(o -> deserializeStatisticsValue(columnHandle, String.valueOf(o)));
     }
 
     private Optional<Object> deserializeStatisticsValue(DeltaLakeColumnHandle columnHandle, String statValue)
     {
-        Object columnValue = deserializeColumnValue(columnHandle, statValue, DeltaLakeJsonFileStatistics::readStatisticsTimestamp);
+        if (!columnHandle.isBaseColumn()) {
+            return Optional.empty();
+        }
+        Object columnValue = deserializeColumnValue(columnHandle, statValue, DeltaLakeJsonFileStatistics::readStatisticsTimestamp, DeltaLakeJsonFileStatistics::readStatisticsTimestampWithZone);
 
-        Type columnType = columnHandle.getType();
+        Type columnType = columnHandle.getBaseType();
         if (columnType.equals(DATE)) {
             long epochDate = (long) columnValue;
-            if (LocalDate.ofEpochDay(epochDate).isBefore(START_OF_MODERN_ERA)) {
+            if (epochDate < START_OF_MODERN_ERA_EPOCH_DAY) {
+                return Optional.empty();
+            }
+        }
+        if (columnType instanceof TimestampType) {
+            long epochMicros = (long) columnValue;
+            if (epochMicros < START_OF_MODERN_ERA_EPOCH_MICROS) {
                 return Optional.empty();
             }
         }
         if (columnType instanceof TimestampWithTimeZoneType) {
             long packedTimestamp = (long) columnValue;
-            ZonedDateTime dateTime = ZonedDateTime.ofInstant(Instant.ofEpochMilli(unpackMillisUtc(packedTimestamp)), UTC);
-            if (dateTime.toLocalDate().isBefore(START_OF_MODERN_ERA)) {
+            long epochMillis = unpackMillisUtc(packedTimestamp);
+            if (floorDiv(epochMillis, MILLISECONDS_PER_DAY) < START_OF_MODERN_ERA_EPOCH_DAY) {
                 return Optional.empty();
             }
         }
@@ -146,6 +168,12 @@ private Optional<Object> deserializeStatisticsValue(DeltaLakeColumnHandle column
     }
 
     private static Long readStatisticsTimestamp(String timestamp)
+    {
+        LocalDateTime localDateTime = LocalDateTime.parse(timestamp, JSON_STATISTICS_TIMESTAMP_FORMATTER);
+        return localDateTime.toEpochSecond(UTC) * MICROSECONDS_PER_SECOND + divide(localDateTime.getNano(), NANOSECONDS_PER_MICROSECOND, UNNECESSARY);
+    }
+
+    private static Long readStatisticsTimestampWithZone(String timestamp)
     {
         ZonedDateTime zonedDateTime = ZonedDateTime.parse(timestamp, JSON_STATISTICS_TIMESTAMP_FORMATTER);
         return packDateTimeWithZone(zonedDateTime.toInstant().toEpochMilli(), UTC_KEY);
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/statistics/DeltaLakeParquetFileStatistics.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/statistics/DeltaLakeParquetFileStatistics.java
index 45cd2218ed4e..61185d5ad993 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/statistics/DeltaLakeParquetFileStatistics.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/statistics/DeltaLakeParquetFileStatistics.java
@@ -19,6 +19,8 @@
 import io.trino.plugin.deltalake.transactionlog.CanonicalColumnName;
 import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 
 import java.util.List;
 import java.util.Map;
@@ -82,13 +84,19 @@ public Optional<Map<String, Object>> getNullCount()
     @Override
     public Optional<Object> getMaxColumnValue(DeltaLakeColumnHandle columnHandle)
     {
-        return getStat(columnHandle.getPhysicalName(), maxValues);
+        if (!columnHandle.isBaseColumn()) {
+            return Optional.empty();
+        }
+        return getStat(columnHandle.getBasePhysicalColumnName(), maxValues);
     }
 
     @Override
     public Optional<Object> getMinColumnValue(DeltaLakeColumnHandle columnHandle)
     {
-        return getStat(columnHandle.getPhysicalName(), minValues);
+        if (!columnHandle.isBaseColumn()) {
+            return Optional.empty();
+        }
+        return getStat(columnHandle.getBasePhysicalColumnName(), minValues);
     }
 
     @Override
@@ -107,7 +115,7 @@ private Optional<Object> getStat(String columnName, Optional<Map<CanonicalColumn
         if (contents == null) {
             return Optional.empty();
         }
-        if (contents instanceof List || contents instanceof Map || contents instanceof Block) {
+        if (contents instanceof List || contents instanceof Map || contents instanceof Block || contents instanceof SqlMap || contents instanceof SqlRow) {
             log.debug("Skipping statistics value for column with complex value type: %s", columnName);
             return Optional.empty();
         }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/AzureTransactionLogSynchronizer.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/AzureTransactionLogSynchronizer.java
index a6651f7986e3..88eea49b431d 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/AzureTransactionLogSynchronizer.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/AzureTransactionLogSynchronizer.java
@@ -13,12 +13,11 @@
  */
 package io.trino.plugin.deltalake.transactionlog.writer;
 
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
-
-import javax.inject.Inject;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -41,10 +40,9 @@ public AzureTransactionLogSynchronizer(TrinoFileSystemFactory fileSystemFactory)
     // This approach should be compatible with OSS Delta Lake.
     // We assume ADLS Gen2 supports atomic renames which will not overwrite existing files
     @Override
-    public void write(ConnectorSession session, String clusterId, Path newLogEntryPath, byte[] entryContents)
+    public void write(ConnectorSession session, String clusterId, Location newLogEntryPath, byte[] entryContents)
     {
-        String tmpFileName = newLogEntryPath.getName() + "." + UUID.randomUUID() + ".tmp";
-        String tmpFilePath = new Path(newLogEntryPath.getParent(), tmpFileName).toString();
+        Location tmpFilePath = newLogEntryPath.appendSuffix("." + UUID.randomUUID() + ".tmp");
 
         boolean conflict = false;
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
@@ -53,7 +51,7 @@ public void write(ConnectorSession session, String clusterId, Path newLogEntryPa
                 outputStream.write(entryContents);
             }
             try {
-                fileSystem.renameFile(tmpFilePath, newLogEntryPath.toString());
+                fileSystem.renameFile(tmpFilePath, newLogEntryPath);
             }
             catch (IOException e) {
                 conflict = true;
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/GcsTransactionLogSynchronizer.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/GcsTransactionLogSynchronizer.java
index a5c30c631ed0..4c373e9de223 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/GcsTransactionLogSynchronizer.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/GcsTransactionLogSynchronizer.java
@@ -13,45 +13,37 @@
  */
 package io.trino.plugin.deltalake.transactionlog.writer;
 
-import com.google.cloud.hadoop.repackaged.gcs.com.google.api.client.http.ByteArrayContent;
-import com.google.cloud.hadoop.repackaged.gcs.com.google.api.services.storage.Storage;
-import com.google.cloud.hadoop.repackaged.gcs.com.google.api.services.storage.model.StorageObject;
-import com.google.cloud.hadoop.repackaged.gcs.com.google.cloud.hadoop.gcsio.StorageResourceId;
-import io.trino.plugin.deltalake.GcsStorageFactory;
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
-
-import javax.inject.Inject;
 
 import java.io.IOException;
+import java.io.OutputStream;
 import java.io.UncheckedIOException;
-import java.net.URI;
 
 import static java.util.Objects.requireNonNull;
 
 public class GcsTransactionLogSynchronizer
         implements TransactionLogSynchronizer
 {
-    private final GcsStorageFactory gcsStorageFactory;
+    private final TrinoFileSystemFactory fileSystemFactory;
 
     @Inject
-    public GcsTransactionLogSynchronizer(GcsStorageFactory gcsStorageFactory)
+    public GcsTransactionLogSynchronizer(TrinoFileSystemFactory fileSystemFactory)
     {
-        this.gcsStorageFactory = requireNonNull(gcsStorageFactory, "gcsStorageFactory is null");
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
     }
 
     // This approach is compatible with OSS Delta Lake
     // https://github.com/delta-io/delta/blob/225e2bbf9ecaf034d08ef8d2fee1929e51c951bf/storage/src/main/java/io/delta/storage/GCSLogStore.java
-    // This approach differs from the OSS Delta Lake corresponding implementation
-    // in the sense that it uses the `Storage` GCS API client directly (instead of Hadoop's `FSDataOutputStream`)
-    // in order to avoid leaked output streams in case of I/O exceptions occurring while uploading
-    // the blob content.
     @Override
-    public void write(ConnectorSession session, String clusterId, Path newLogEntryPath, byte[] entryContents)
+    public void write(ConnectorSession session, String clusterId, Location newLogEntryPath, byte[] entryContents)
     {
-        Storage storage = gcsStorageFactory.create(session, newLogEntryPath);
-        try {
-            createStorageObjectExclusively(newLogEntryPath.toUri(), entryContents, storage);
+        TrinoFileSystem fileSystem = fileSystemFactory.create(session);
+        try (OutputStream outputStream = fileSystem.newOutputFile(newLogEntryPath).createExclusive()) {
+            outputStream.write(entryContents);
         }
         catch (IOException e) {
             throw new UncheckedIOException(e);
@@ -63,29 +55,4 @@ public boolean isUnsafe()
     {
         return false;
     }
-
-    /**
-     * This method uses {@link Storage} Cloud Storage API client for creating synchronously a storage object
-     * with the specified path and content.
-     * <p>
-     * This approach avoids dealing with `FSDataOutputStream` exposed by the method
-     * `org.apache.hadoop.fs.FileSystem#create(org.apache.hadoop.fs.Path)` and the intricacies of handling
-     * exceptions which may occur while writing the content to the output stream.
-     */
-    private static void createStorageObjectExclusively(URI blobPath, byte[] content, Storage storage)
-            throws IOException
-    {
-        StorageResourceId storageResourceId = StorageResourceId.fromUriPath(blobPath, false);
-        Storage.Objects.Insert insert = storage.objects().insert(
-                storageResourceId.getBucketName(),
-                new StorageObject()
-                        .setName(storageResourceId.getObjectName()),
-                new ByteArrayContent("application/json", content));
-        // By setting `ifGenerationMatch` setting to `0`, the creation of the blob will succeed only
-        // if there are no live versions of the object. When the blob already exists, the operation
-        // will fail with the exception message `412 Precondition Failed`
-        insert.setIfGenerationMatch(0L);
-        insert.getMediaHttpUploader().setDirectUploadEnabled(true);
-        insert.execute();
-    }
 }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/NoIsolationSynchronizer.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/NoIsolationSynchronizer.java
index c7dea0406cb0..bda668ba7459 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/NoIsolationSynchronizer.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/NoIsolationSynchronizer.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.deltalake.transactionlog.writer;
 
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoOutputFile;
 import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
-
-import javax.inject.Inject;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -39,12 +38,12 @@ public NoIsolationSynchronizer(TrinoFileSystemFactory fileSystemFactory)
     }
 
     @Override
-    public void write(ConnectorSession session, String clusterId, Path newLogEntryPath, byte[] entryContents)
+    public void write(ConnectorSession session, String clusterId, Location newLogEntryPath, byte[] entryContents)
             throws UncheckedIOException
     {
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
         try {
-            TrinoOutputFile outputFile = fileSystem.newOutputFile(newLogEntryPath.toString());
+            TrinoOutputFile outputFile = fileSystem.newOutputFile(newLogEntryPath);
             try (OutputStream outputStream = outputFile.create()) {
                 outputStream.write(entryContents);
             }
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/S3NativeTransactionLogSynchronizer.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/S3NativeTransactionLogSynchronizer.java
index b1433f4ee40c..f102c1549795 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/S3NativeTransactionLogSynchronizer.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/S3NativeTransactionLogSynchronizer.java
@@ -16,17 +16,17 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
 import io.trino.filesystem.FileEntry;
 import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.TrinoInputFile;
 import io.trino.filesystem.TrinoOutputFile;
 import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
-
-import javax.inject.Inject;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -44,7 +44,6 @@
 import static java.lang.String.format;
 import static java.time.temporal.ChronoUnit.MINUTES;
 import static java.util.Objects.requireNonNull;
-import static org.apache.parquet.Preconditions.checkState;
 
 /**
  * The S3 Native synhcornizer is a {@link TransactionLogSynchronizer} for S3 that requires no other dependencies.
@@ -77,16 +76,16 @@ public boolean isUnsafe()
     }
 
     @Override
-    public void write(ConnectorSession session, String clusterId, Path newLogEntryPath, byte[] entryContents)
+    public void write(ConnectorSession session, String clusterId, Location newLogEntryPath, byte[] entryContents)
     {
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-        Path locksDirectory = new Path(newLogEntryPath.getParent(), LOCK_DIRECTORY);
-        String newEntryFilename = newLogEntryPath.getName();
+        Location locksDirectory = newLogEntryPath.sibling(LOCK_DIRECTORY);
+        String newEntryFilename = newLogEntryPath.fileName();
         Optional<LockInfo> myLockInfo = Optional.empty();
 
         try {
-            if (fileSystem.newInputFile(newLogEntryPath.toString()).exists()) {
-                throw new TransactionConflictException(newLogEntryPath + " already exists");
+            if (fileSystem.newInputFile(newLogEntryPath).exists()) {
+                throw new TransactionConflictException("Target file already exists: " + newLogEntryPath);
             }
 
             List<LockInfo> lockInfos = listLockInfos(fileSystem, locksDirectory);
@@ -137,10 +136,12 @@ public void write(ConnectorSession session, String clusterId, Path newLogEntryPa
             }
 
             // extra check if target file did not appear concurrently; e.g. due to conflict with TL writer which uses different synchronization mechanism (like DB)
-            checkState(!fileSystem.newInputFile(newLogEntryPath.toString()).exists(), format("Target file %s was created during locking", newLogEntryPath));
+            if (fileSystem.newInputFile(newLogEntryPath).exists()) {
+                throw new TransactionConflictException("Target file was created during locking: " + newLogEntryPath);
+            }
 
             // write transaction log entry
-            try (OutputStream outputStream = fileSystem.newOutputFile(newLogEntryPath.toString()).create()) {
+            try (OutputStream outputStream = fileSystem.newOutputFile(newLogEntryPath).create()) {
                 outputStream.write(entryContents);
             }
         }
@@ -160,14 +161,14 @@ public void write(ConnectorSession session, String clusterId, Path newLogEntryPa
         }
     }
 
-    private LockInfo writeNewLockInfo(TrinoFileSystem fileSystem, Path lockDirectory, String logEntryFilename, String clusterId, String queryId)
+    private LockInfo writeNewLockInfo(TrinoFileSystem fileSystem, Location lockDirectory, String logEntryFilename, String clusterId, String queryId)
             throws IOException
     {
         String lockFilename = logEntryFilename + "." + LOCK_INFIX + queryId;
         Instant expiration = Instant.now().plus(EXPIRATION_DURATION);
         LockFileContents contents = new LockFileContents(clusterId, queryId, expiration.toEpochMilli());
-        Path lockPath = new Path(lockDirectory, lockFilename);
-        TrinoOutputFile lockFile = fileSystem.newOutputFile(lockPath.toString());
+        Location lockPath = lockDirectory.appendPath(lockFilename);
+        TrinoOutputFile lockFile = fileSystem.newOutputFile(lockPath);
         byte[] contentsBytes = lockFileContentsJsonCodec.toJsonBytes(contents);
         try (OutputStream outputStream = lockFile.create()) {
             outputStream.write(contentsBytes);
@@ -175,36 +176,35 @@ private LockInfo writeNewLockInfo(TrinoFileSystem fileSystem, Path lockDirectory
         return new LockInfo(lockFilename, contents);
     }
 
-    private static void deleteLock(TrinoFileSystem fileSystem, Path lockDirectoryPath, LockInfo lockInfo)
+    private static void deleteLock(TrinoFileSystem fileSystem, Location lockDirectoryPath, LockInfo lockInfo)
             throws IOException
     {
-        Path lockPath = new Path(lockDirectoryPath, lockInfo.getLockFilename());
-        fileSystem.deleteFile(lockPath.toString());
+        fileSystem.deleteFile(lockDirectoryPath.appendPath(lockInfo.getLockFilename()));
     }
 
-    private List<LockInfo> listLockInfos(TrinoFileSystem fileSystem, Path lockDirectoryPath)
+    private List<LockInfo> listLockInfos(TrinoFileSystem fileSystem, Location lockDirectoryPath)
             throws IOException
     {
-        FileIterator files = fileSystem.listFiles(lockDirectoryPath.toString());
+        FileIterator files = fileSystem.listFiles(lockDirectoryPath);
         ImmutableList.Builder<LockInfo> lockInfos = ImmutableList.builder();
 
         while (files.hasNext()) {
             FileEntry entry = files.next();
-            String name = entry.location().substring(entry.location().lastIndexOf('/') + 1);
+            String name = entry.location().fileName();
             if (LOCK_FILENAME_PATTERN.matcher(name).matches()) {
-                Optional<LockInfo> lockInfo = parseLockFile(fileSystem, entry.location(), name);
-                lockInfo.ifPresent(lockInfos::add);
+                TrinoInputFile file = fileSystem.newInputFile(entry.location());
+                parseLockFile(file, name).ifPresent(lockInfos::add);
             }
         }
 
         return lockInfos.build();
     }
 
-    private Optional<LockInfo> parseLockFile(TrinoFileSystem fileSystem, String path, String name)
+    private Optional<LockInfo> parseLockFile(TrinoInputFile file, String name)
             throws IOException
     {
         byte[] bytes = null;
-        try (InputStream inputStream = fileSystem.newInputFile(path).newStream()) {
+        try (InputStream inputStream = file.newStream()) {
             bytes = inputStream.readAllBytes();
             LockFileContents lockFileContents = lockFileContentsJsonCodec.fromJson(bytes);
             return Optional.of(new LockInfo(name, lockFileContents));
@@ -214,7 +214,7 @@ private Optional<LockInfo> parseLockFile(TrinoFileSystem fileSystem, String path
             if (bytes != null) {
                 content = Base64.getEncoder().encodeToString(bytes);
             }
-            LOG.warn(e, "Could not parse lock file: %s; contents=%s", path, content);
+            LOG.warn(e, "Could not parse lock file: %s; contents=%s", file.location(), content);
             return Optional.empty();
         }
         catch (FileNotFoundException e) {
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogSynchronizer.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogSynchronizer.java
index 3aaa653f4729..74032c514cb6 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogSynchronizer.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogSynchronizer.java
@@ -13,8 +13,8 @@
  */
 package io.trino.plugin.deltalake.transactionlog.writer;
 
+import io.trino.filesystem.Location;
 import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
 
 public interface TransactionLogSynchronizer
 {
@@ -24,7 +24,7 @@ public interface TransactionLogSynchronizer
      * @throws TransactionConflictException If file cannot be written because of conflict with other transaction
      * @throws RuntimeException If some other unexpected error occurs
      */
-    void write(ConnectorSession session, String clusterId, Path newLogEntryPath, byte[] entryContents);
+    void write(ConnectorSession session, String clusterId, Location newLogEntryPath, byte[] entryContents);
 
     /**
      * Whether or not writes using this Synchronizer need to be enabled with the "delta.enable-non-concurrent-writes" config property.
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogSynchronizerManager.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogSynchronizerManager.java
index 7e681e9bff1e..89a5c3928bf1 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogSynchronizerManager.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogSynchronizerManager.java
@@ -14,14 +14,12 @@
 package io.trino.plugin.deltalake.transactionlog.writer;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
 import io.trino.spi.TrinoException;
-import org.apache.hadoop.fs.Path;
-
-import javax.inject.Inject;
 
 import java.util.Map;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
@@ -41,10 +39,10 @@ public TransactionLogSynchronizerManager(
         this.noIsolationSynchronizer = requireNonNull(noIsolationSynchronizer, "noIsolationSynchronizer is null");
     }
 
-    public TransactionLogSynchronizer getSynchronizer(Path tableLocation)
+    public TransactionLogSynchronizer getSynchronizer(String tableLocation)
     {
-        String uriScheme = tableLocation.toUri().getScheme();
-        checkArgument(uriScheme != null, "URI scheme undefined for " + tableLocation);
+        String uriScheme = Location.of(tableLocation).scheme()
+                .orElseThrow(() -> new IllegalArgumentException("URI scheme undefined for " + tableLocation));
         TransactionLogSynchronizer synchronizer = synchronizers.get(uriScheme.toLowerCase(ENGLISH));
         if (synchronizer == null) {
             throw new TrinoException(NOT_SUPPORTED, format("Cannot write to table in %s; %s not supported", tableLocation, uriScheme));
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogWriter.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogWriter.java
index 9c996c30d548..70ae104b8f6d 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogWriter.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogWriter.java
@@ -15,15 +15,15 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.airlift.json.ObjectMapperProvider;
+import io.trino.filesystem.Location;
 import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
-import io.trino.plugin.deltalake.transactionlog.CdfFileEntry;
+import io.trino.plugin.deltalake.transactionlog.CdcEntry;
 import io.trino.plugin.deltalake.transactionlog.CommitInfoEntry;
 import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
 import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.plugin.deltalake.transactionlog.RemoveFileEntry;
 import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -81,9 +81,9 @@ public void appendRemoveFileEntry(RemoveFileEntry removeFileEntry)
         entries.add(DeltaLakeTransactionLogEntry.removeFileEntry(removeFileEntry));
     }
 
-    public void appendCdfFileEntry(CdfFileEntry cdfFileEntry)
+    public void appendCdcEntry(CdcEntry cdcEntry)
     {
-        entries.add(DeltaLakeTransactionLogEntry.cdfFileEntry(cdfFileEntry));
+        entries.add(DeltaLakeTransactionLogEntry.cdcEntry(cdcEntry));
     }
 
     public boolean isUnsafe()
@@ -98,7 +98,7 @@ public void flush()
 
         String transactionLogLocation = getTransactionLogDir(tableLocation);
         CommitInfoEntry commitInfo = requireNonNull(commitInfoEntry.get().getCommitInfo(), "commitInfoEntry.get().getCommitInfo() is null");
-        String logEntry = getTransactionLogJsonEntryPath(transactionLogLocation, commitInfo.getVersion());
+        Location logEntry = getTransactionLogJsonEntryPath(transactionLogLocation, commitInfo.getVersion());
 
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         writeEntry(bos, commitInfoEntry.get());
@@ -107,7 +107,7 @@ public void flush()
         }
 
         String clusterId = commitInfoEntry.get().getCommitInfo().getClusterId();
-        logSynchronizer.write(session, clusterId, new Path(logEntry), bos.toByteArray());
+        logSynchronizer.write(session, clusterId, logEntry, bos.toByteArray());
     }
 
     private void writeEntry(OutputStream outputStream, DeltaLakeTransactionLogEntry deltaLakeTransactionLogEntry)
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogWriterFactory.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogWriterFactory.java
index 627ff4f7f9b5..c31e44f2f814 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogWriterFactory.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/writer/TransactionLogWriterFactory.java
@@ -14,10 +14,8 @@
 
 package io.trino.plugin.deltalake.transactionlog.writer;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
-
-import javax.inject.Inject;
 
 import static java.util.Objects.requireNonNull;
 
@@ -33,7 +31,7 @@ public TransactionLogWriterFactory(TransactionLogSynchronizerManager synchronize
 
     public TransactionLogWriter newWriter(ConnectorSession session, String tableLocation)
     {
-        TransactionLogSynchronizer synchronizer = synchronizerManager.getSynchronizer(new Path(tableLocation));
+        TransactionLogSynchronizer synchronizer = synchronizerManager.getSynchronizer(tableLocation);
         return new TransactionLogWriter(synchronizer, session, tableLocation);
     }
 
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/util/DeltaLakeWriteUtils.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/util/DeltaLakeWriteUtils.java
new file mode 100644
index 000000000000..a30846588cf2
--- /dev/null
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/util/DeltaLakeWriteUtils.java
@@ -0,0 +1,131 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.util;
+
+import com.google.common.base.CharMatcher;
+import com.google.common.collect.ImmutableList;
+import io.trino.spi.Page;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.VarcharType;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
+import java.util.List;
+
+import static com.google.common.io.BaseEncoding.base16;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_PARTITION_VALUE;
+import static io.trino.plugin.hive.HivePartitionKey.HIVE_DEFAULT_DYNAMIC_PARTITION;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
+import static io.trino.spi.type.DateType.DATE;
+import static io.trino.spi.type.Decimals.readBigDecimal;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
+import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
+import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_SECOND;
+import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MICROSECOND;
+import static io.trino.spi.type.TinyintType.TINYINT;
+import static java.lang.Math.floorDiv;
+import static java.lang.Math.floorMod;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+// Copied from io.trino.plugin.hive.util.HiveWriteUtils
+public final class DeltaLakeWriteUtils
+{
+    private static final DateTimeFormatter DELTA_DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    private static final DateTimeFormatter DELTA_TIMESTAMP_FORMATTER = new DateTimeFormatterBuilder()
+            .append(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
+            .optionalStart().appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true).optionalEnd()
+            .toFormatter();
+
+    private DeltaLakeWriteUtils() {}
+
+    public static List<String> createPartitionValues(List<Type> partitionColumnTypes, Page partitionColumns, int position)
+    {
+        ImmutableList.Builder<String> partitionValues = ImmutableList.builder();
+        for (int field = 0; field < partitionColumns.getChannelCount(); field++) {
+            String value = toPartitionValue(partitionColumnTypes.get(field), partitionColumns.getBlock(field), position);
+            // TODO https://github.com/trinodb/trino/issues/18950 Remove or fix the following condition
+            if (!CharMatcher.inRange((char) 0x20, (char) 0x7E).matchesAllOf(value)) {
+                String encoded = base16().withSeparator(" ", 2).encode(value.getBytes(UTF_8));
+                throw new TrinoException(HIVE_INVALID_PARTITION_VALUE, "Hive partition keys can only contain printable ASCII characters (0x20 - 0x7E). Invalid value: " + encoded);
+            }
+            partitionValues.add(value);
+        }
+        return partitionValues.build();
+    }
+
+    private static String toPartitionValue(Type type, Block block, int position)
+    {
+        // see HiveUtil#isValidPartitionType
+        if (block.isNull(position)) {
+            return HIVE_DEFAULT_DYNAMIC_PARTITION;
+        }
+        if (BOOLEAN.equals(type)) {
+            return String.valueOf(BOOLEAN.getBoolean(block, position));
+        }
+        if (BIGINT.equals(type)) {
+            return String.valueOf(BIGINT.getLong(block, position));
+        }
+        if (INTEGER.equals(type)) {
+            return String.valueOf(INTEGER.getInt(block, position));
+        }
+        if (SMALLINT.equals(type)) {
+            return String.valueOf(SMALLINT.getShort(block, position));
+        }
+        if (TINYINT.equals(type)) {
+            return String.valueOf(TINYINT.getByte(block, position));
+        }
+        if (REAL.equals(type)) {
+            return String.valueOf(REAL.getFloat(block, position));
+        }
+        if (DOUBLE.equals(type)) {
+            return String.valueOf(DOUBLE.getDouble(block, position));
+        }
+        if (type instanceof VarcharType varcharType) {
+            return varcharType.getSlice(block, position).toStringUtf8();
+        }
+        if (DATE.equals(type)) {
+            return LocalDate.ofEpochDay(DATE.getInt(block, position)).format(DELTA_DATE_FORMATTER);
+        }
+        if (TIMESTAMP_MILLIS.equals(type) || TIMESTAMP_MICROS.equals(type)) {
+            long epochMicros = type.getLong(block, position);
+            long epochSeconds = floorDiv(epochMicros, MICROSECONDS_PER_SECOND);
+            int nanosOfSecond = floorMod(epochMicros, MICROSECONDS_PER_SECOND) * NANOSECONDS_PER_MICROSECOND;
+            return LocalDateTime.ofEpochSecond(epochSeconds, nanosOfSecond, ZoneOffset.UTC).format(DELTA_TIMESTAMP_FORMATTER);
+        }
+        if (TIMESTAMP_TZ_MILLIS.equals(type)) {
+            long epochMillis = unpackMillisUtc(type.getLong(block, position));
+            return LocalDateTime.ofInstant(Instant.ofEpochMilli(epochMillis), ZoneOffset.UTC).format(DELTA_TIMESTAMP_FORMATTER);
+        }
+        if (type instanceof DecimalType decimalType) {
+            return readBigDecimal(decimalType, block, position).stripTrailingZeros().toPlainString();
+        }
+        throw new TrinoException(NOT_SUPPORTED, "Unsupported type for partition: " + type);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/util/PageListBuilder.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/util/PageListBuilder.java
index 1b520da08414..523d72040879 100644
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/util/PageListBuilder.java
+++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/util/PageListBuilder.java
@@ -17,6 +17,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.type.TimeZoneKey;
@@ -109,23 +110,21 @@ public void appendVarchar(String value)
 
     public void appendVarcharVarcharMap(Map<String, String> values)
     {
-        BlockBuilder column = nextColumn();
-        BlockBuilder map = column.beginBlockEntry();
-        values.forEach((key, value) -> {
+        MapBlockBuilder column = (MapBlockBuilder) nextColumn();
+        column.buildEntry((keyBuilder, valueBuilder) -> values.forEach((key, value) -> {
             if (key == null) {
-                map.appendNull();
+                keyBuilder.appendNull();
             }
             else {
-                VARCHAR.writeString(map, key);
+                VARCHAR.writeString(keyBuilder, key);
             }
             if (value == null) {
-                map.appendNull();
+                valueBuilder.appendNull();
             }
             else {
-                VARCHAR.writeString(map, value);
+                VARCHAR.writeString(valueBuilder, value);
             }
-        });
-        column.closeEntry();
+        }));
     }
 
     public BlockBuilder nextColumn()
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaFailureRecoveryTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaFailureRecoveryTest.java
index 7a09e6bcac5d..ded37cebc24b 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaFailureRecoveryTest.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaFailureRecoveryTest.java
@@ -13,11 +13,20 @@
  */
 package io.trino.plugin.deltalake;
 
+import com.google.common.collect.ImmutableMap;
 import io.trino.operator.RetryPolicy;
+import io.trino.plugin.exchange.filesystem.FileSystemExchangePlugin;
+import io.trino.plugin.exchange.filesystem.containers.MinioStorage;
+import io.trino.plugin.hive.containers.HiveMinioDataLake;
 import io.trino.spi.ErrorType;
 import io.trino.testing.BaseFailureRecoveryTest;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+import io.trino.tpch.TpchTable;
 import org.testng.annotations.DataProvider;
 
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import static io.trino.execution.FailureInjector.FAILURE_INJECTION_MESSAGE;
@@ -26,14 +35,55 @@
 import static io.trino.execution.FailureInjector.InjectedFailureType.TASK_GET_RESULTS_REQUEST_TIMEOUT;
 import static io.trino.execution.FailureInjector.InjectedFailureType.TASK_MANAGEMENT_REQUEST_FAILURE;
 import static io.trino.execution.FailureInjector.InjectedFailureType.TASK_MANAGEMENT_REQUEST_TIMEOUT;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner;
+import static io.trino.plugin.exchange.filesystem.containers.MinioStorage.getExchangeManagerProperties;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static java.lang.String.format;
+import static java.util.Locale.ENGLISH;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public abstract class BaseDeltaFailureRecoveryTest
         extends BaseFailureRecoveryTest
 {
+    private final String schema;
+    private final String bucketName;
+
     protected BaseDeltaFailureRecoveryTest(RetryPolicy retryPolicy)
     {
         super(retryPolicy);
+        this.schema = retryPolicy.name().toLowerCase(ENGLISH) + "_failure_recovery";
+        this.bucketName = "test-delta-lake-" + retryPolicy.name().toLowerCase(ENGLISH) + "-failure-recovery-" + randomNameSuffix();
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner(
+            List<TpchTable<?>> requiredTpchTables,
+            Map<String, String> configProperties,
+            Map<String, String> coordinatorProperties)
+            throws Exception
+    {
+        HiveMinioDataLake hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
+        hiveMinioDataLake.start();
+        MinioStorage minioStorage = closeAfterClass(new MinioStorage("test-exchange-spooling-" + randomNameSuffix()));
+        minioStorage.start();
+
+        DistributedQueryRunner queryRunner = createS3DeltaLakeQueryRunner(
+                DELTA_CATALOG,
+                schema,
+                configProperties,
+                coordinatorProperties,
+                ImmutableMap.of("delta.enable-non-concurrent-writes", "true"),
+                hiveMinioDataLake.getMinio().getMinioAddress(),
+                hiveMinioDataLake.getHiveHadoop(),
+                runner -> {
+                    runner.installPlugin(new FileSystemExchangePlugin());
+                    runner.loadExchangeManager("filesystem", getExchangeManagerProperties(minioStorage));
+                });
+        queryRunner.execute(format("CREATE SCHEMA %s WITH (location = 's3://%s/%s')", schema, bucketName, schema));
+        requiredTpchTables.forEach(table -> queryRunner.execute(format("CREATE TABLE %s AS SELECT * FROM tpch.tiny.%1$s", table.getTableName())));
+
+        return queryRunner;
     }
 
     @Override
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeAwsConnectorSmokeTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeAwsConnectorSmokeTest.java
index f436d31b653f..7be78e6804b8 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeAwsConnectorSmokeTest.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeAwsConnectorSmokeTest.java
@@ -13,23 +13,40 @@
  */
 package io.trino.plugin.deltalake;
 
+import io.trino.plugin.hive.containers.HiveHadoop;
 import io.trino.plugin.hive.containers.HiveMinioDataLake;
 import io.trino.testing.QueryRunner;
+import io.trino.testng.services.ManageTestResources;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public abstract class BaseDeltaLakeAwsConnectorSmokeTest
         extends BaseDeltaLakeConnectorSmokeTest
 {
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
+    protected HiveMinioDataLake hiveMinioDataLake;
+
     @Override
-    protected HiveMinioDataLake createHiveMinioDataLake()
+    protected HiveHadoop createHiveHadoop()
     {
-        hiveMinioDataLake = new HiveMinioDataLake(bucketName);
+        hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
         hiveMinioDataLake.start();
-        return hiveMinioDataLake;
+        return hiveMinioDataLake.getHiveHadoop();  // closed by superclass
+    }
+
+    @Override
+    @AfterAll
+    public void cleanUp()
+    {
+        hiveMinioDataLake = null; // closed by closeAfterClass
+        super.cleanUp();
     }
 
     @Override
@@ -58,15 +75,21 @@ protected List<String> getTableFiles(String tableName)
     }
 
     @Override
-    protected List<String> listCheckpointFiles(String transactionLogDirectory)
+    protected List<String> listFiles(String directory)
     {
-        return hiveMinioDataLake.listFiles(transactionLogDirectory)
-                .stream()
-                .filter(path -> path.contains("checkpoint.parquet"))
+        return hiveMinioDataLake.listFiles(directory).stream()
                 .map(path -> format("s3://%s/%s", bucketName, path))
                 .collect(toImmutableList());
     }
 
+    @Override
+    protected void deleteFile(String filePath)
+    {
+        String key = filePath.substring(bucketUrl().length());
+        hiveMinioDataLake.getMinioClient()
+                .removeObject(bucketName, key);
+    }
+
     @Override
     protected String bucketUrl()
     {
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeCompatibility.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeCompatibility.java
new file mode 100644
index 000000000000..3a9ed4155419
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeCompatibility.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.hive.containers.HiveMinioDataLake;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.QueryRunner;
+import io.trino.tpch.TpchTable;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public abstract class BaseDeltaLakeCompatibility
+        extends AbstractTestQueryFramework
+{
+    private static final String SCHEMA = "test_schema";
+
+    protected final String bucketName;
+    protected final String resourcePath;
+    protected HiveMinioDataLake hiveMinioDataLake;
+
+    public BaseDeltaLakeCompatibility(String resourcePath)
+    {
+        this.bucketName = "compatibility-test-queries-" + randomNameSuffix();
+        this.resourcePath = requireNonNull(resourcePath);
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
+        hiveMinioDataLake.start();
+        QueryRunner queryRunner = createS3DeltaLakeQueryRunner(
+                DELTA_CATALOG,
+                SCHEMA,
+                ImmutableMap.of(
+                        "delta.enable-non-concurrent-writes", "true",
+                        "delta.register-table-procedure.enabled", "true"),
+                hiveMinioDataLake.getMinio().getMinioAddress(),
+                hiveMinioDataLake.getHiveHadoop());
+        queryRunner.execute("CREATE SCHEMA " + SCHEMA + " WITH (location = 's3://" + bucketName + "/" + SCHEMA + "')");
+        TpchTable.getTables().forEach(table -> {
+            String tableName = table.getTableName();
+            hiveMinioDataLake.copyResources(resourcePath + tableName, SCHEMA + "/" + tableName);
+            queryRunner.execute(format("CALL system.register_table('%1$s', '%2$s', 's3://%3$s/%1$s/%2$s')",
+                    SCHEMA,
+                    tableName,
+                    bucketName));
+        });
+        return queryRunner;
+    }
+
+    @Test
+    public void testSelectAll()
+    {
+        for (TpchTable<?> table : TpchTable.getTables()) {
+            String tableName = table.getTableName();
+            assertThat(query("SELECT * FROM " + tableName))
+                    .skippingTypesCheck() // Delta Lake connector returns varchar, but TPCH connector returns varchar(n)
+                    .matches("SELECT * FROM tpch.tiny." + tableName);
+        }
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeConnectorSmokeTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeConnectorSmokeTest.java
index 317572b28a91..73b1e63f232f 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeConnectorSmokeTest.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeConnectorSmokeTest.java
@@ -23,9 +23,9 @@
 import io.trino.execution.QueryManager;
 import io.trino.operator.OperatorStats;
 import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
+import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
 import io.trino.plugin.hive.TestingHivePlugin;
 import io.trino.plugin.hive.containers.HiveHadoop;
-import io.trino.plugin.hive.containers.HiveMinioDataLake;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.thrift.BridgingHiveMetastore;
 import io.trino.spi.QueryId;
@@ -37,14 +37,14 @@
 import io.trino.testing.MaterializedRow;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
-import io.trino.testing.minio.MinioClient;
+import io.trino.testing.sql.TestTable;
 import io.trino.tpch.TpchTable;
 import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.testng.SkipException;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -59,8 +59,12 @@
 import static com.google.common.collect.Sets.union;
 import static io.trino.SystemSessionProperties.ENABLE_DYNAMIC_FILTERING;
 import static io.trino.SystemSessionProperties.JOIN_DISTRIBUTION_TYPE;
+import static io.trino.plugin.base.util.Closables.closeAllSuppress;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createDockerizedDeltaLakeQueryRunner;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.EXTENDED_STATISTICS_COLLECT_ON_WRITE;
+import static io.trino.plugin.deltalake.TestingDeltaLakeUtils.getConnectorService;
+import static io.trino.plugin.deltalake.TestingDeltaLakeUtils.getTableActiveFiles;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.TRANSACTION_LOG_DIRECTORY;
 import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
 import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.DELETE_TABLE;
@@ -80,10 +84,12 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public abstract class BaseDeltaLakeConnectorSmokeTest
         extends BaseConnectorSmokeTest
 {
@@ -96,22 +102,22 @@ public abstract class BaseDeltaLakeConnectorSmokeTest
                     .build()
                     .asList();
 
-    private static final List<String> NON_TPCH_TABLES = ImmutableList.of(
-            "invariants",
-            "person",
-            "foo",
-            "bar",
-            "old_dates",
-            "old_timestamps",
-            "nested_timestamps",
-            "nested_timestamps_parquet_stats",
-            "json_stats_on_row_type",
-            "parquet_stats_missing",
-            "uppercase_columns",
-            "default_partitions",
-            "insert_nonlowercase_columns",
-            "insert_nested_nonlowercase_columns",
-            "insert_nonlowercase_columns_partitioned");
+    private static final List<ResourceTable> NON_TPCH_TABLES = ImmutableList.of(
+            new ResourceTable("invariants", "deltalake/invariants"),
+            new ResourceTable("person", "databricks73/person"),
+            new ResourceTable("foo", "databricks73/foo"),
+            new ResourceTable("bar", "databricks73/bar"),
+            new ResourceTable("old_dates", "databricks73/old_dates"),
+            new ResourceTable("old_timestamps", "databricks73/old_timestamps"),
+            new ResourceTable("nested_timestamps", "databricks73/nested_timestamps"),
+            new ResourceTable("nested_timestamps_parquet_stats", "databricks73/nested_timestamps_parquet_stats"),
+            new ResourceTable("json_stats_on_row_type", "databricks104/json_stats_on_row_type"),
+            new ResourceTable("parquet_stats_missing", "databricks73/parquet_stats_missing"),
+            new ResourceTable("uppercase_columns", "databricks73/uppercase_columns"),
+            new ResourceTable("default_partitions", "databricks73/default_partitions"),
+            new ResourceTable("insert_nonlowercase_columns", "databricks73/insert_nonlowercase_columns"),
+            new ResourceTable("insert_nested_nonlowercase_columns", "databricks73/insert_nested_nonlowercase_columns"),
+            new ResourceTable("insert_nonlowercase_columns_partitioned", "databricks73/insert_nonlowercase_columns_partitioned"));
 
     // Cannot be too small, as implicit (time-based) cache invalidation can mask issues. Cannot be too big as some tests need to wait for cache
     // to be outdated.
@@ -119,16 +125,18 @@ public abstract class BaseDeltaLakeConnectorSmokeTest
 
     protected final String bucketName = "test-delta-lake-integration-smoke-test-" + randomNameSuffix();
 
-    protected HiveMinioDataLake hiveMinioDataLake;
+    protected HiveHadoop hiveHadoop;
     private HiveMetastore metastore;
+    private TransactionLogAccess transactionLogAccess;
 
     protected void environmentSetup() {}
 
-    protected abstract HiveMinioDataLake createHiveMinioDataLake()
+    protected abstract HiveHadoop createHiveHadoop()
             throws Exception;
 
-    protected abstract QueryRunner createDeltaLakeQueryRunner(Map<String, String> connectorProperties)
-            throws Exception;
+    protected abstract Map<String, String> hiveStorageConfiguration();
+
+    protected abstract Map<String, String> deltaStorageConfiguration();
 
     protected abstract void registerTableFromResources(String table, String resourcePath, QueryRunner queryRunner);
 
@@ -136,7 +144,9 @@ protected abstract QueryRunner createDeltaLakeQueryRunner(Map<String, String> co
 
     protected abstract List<String> getTableFiles(String tableName);
 
-    protected abstract List<String> listCheckpointFiles(String transactionLogDirectory);
+    protected abstract List<String> listFiles(String directory);
+
+    protected abstract void deleteFile(String filePath);
 
     @Override
     protected QueryRunner createQueryRunner()
@@ -144,69 +154,96 @@ protected QueryRunner createQueryRunner()
     {
         environmentSetup();
 
-        this.hiveMinioDataLake = closeAfterClass(createHiveMinioDataLake());
+        this.hiveHadoop = closeAfterClass(createHiveHadoop());
         this.metastore = new BridgingHiveMetastore(
                 testingThriftHiveMetastoreBuilder()
-                        .metastoreClient(hiveMinioDataLake.getHiveHadoop().getHiveMetastoreEndpoint())
+                        .metastoreClient(hiveHadoop.getHiveMetastoreEndpoint())
                         .build());
 
-        QueryRunner queryRunner = createDeltaLakeQueryRunner(
+        DistributedQueryRunner queryRunner = createDeltaLakeQueryRunner();
+        try {
+            this.transactionLogAccess = getConnectorService(queryRunner, TransactionLogAccess.class);
+
+            queryRunner.execute(format("CREATE SCHEMA %s WITH (location = '%s')", SCHEMA, getLocationForTable(bucketName, SCHEMA)));
+
+            REQUIRED_TPCH_TABLES.forEach(table -> queryRunner.execute(format(
+                    "CREATE TABLE %s WITH (location = '%s') AS SELECT * FROM tpch.tiny.%1$s",
+                    table.getTableName(),
+                    getLocationForTable(bucketName, table.getTableName()))));
+
+            /* Data (across 2 files) generated using:
+             * INSERT INTO foo VALUES
+             *   (1, 100, 'data1'),
+             *   (2, 200, 'data2')
+             *
+             * Data (across 2 files) generated using:
+             * INSERT INTO bar VALUES
+             *   (100, 'data100'),
+             *   (200, 'data200')
+             *
+             * INSERT INTO old_dates
+             * VALUES (DATE '0100-01-01', 1), (DATE '1582-10-15', 2), (DATE '1960-01-01', 3), (DATE '2020-01-01', 4)
+             *
+             * INSERT INTO test_timestamps VALUES
+             * (TIMESTAMP '0100-01-01 01:02:03', 1), (TIMESTAMP '1582-10-15 01:02:03', 2), (TIMESTAMP '1960-01-01 01:02:03', 3), (TIMESTAMP '2020-01-01 01:02:03', 4);
+             */
+            NON_TPCH_TABLES.forEach(table -> {
+                registerTableFromResources(table.tableName(), table.resourcePath(), queryRunner);
+            });
+
+            queryRunner.installPlugin(new TestingHivePlugin());
+
+            queryRunner.createCatalog(
+                    "hive",
+                    "hive",
+                    ImmutableMap.<String, String>builder()
+                            .put("hive.metastore.uri", "thrift://" + hiveHadoop.getHiveMetastoreEndpoint())
+                            .put("hive.allow-drop-table", "true")
+                            .putAll(hiveStorageConfiguration())
+                            .buildOrThrow());
+
+            return queryRunner;
+        }
+        catch (Throwable e) {
+            closeAllSuppress(e, queryRunner);
+            throw e;
+        }
+    }
+
+    private DistributedQueryRunner createDeltaLakeQueryRunner()
+            throws Exception
+    {
+        return createDockerizedDeltaLakeQueryRunner(
+                DELTA_CATALOG,
+                SCHEMA,
+                Map.of(),
+                Map.of(),
                 ImmutableMap.<String, String>builder()
                         .put("delta.metadata.cache-ttl", TEST_METADATA_CACHE_TTL_SECONDS + "s")
                         .put("delta.metadata.live-files.cache-ttl", TEST_METADATA_CACHE_TTL_SECONDS + "s")
                         .put("hive.metastore-cache-ttl", TEST_METADATA_CACHE_TTL_SECONDS + "s")
                         .put("delta.register-table-procedure.enabled", "true")
-                        .buildOrThrow());
-
-        queryRunner.execute(format("CREATE SCHEMA %s WITH (location = '%s')", SCHEMA, getLocationForTable(bucketName, SCHEMA)));
-
-        REQUIRED_TPCH_TABLES.forEach(table -> queryRunner.execute(format(
-                "CREATE TABLE %s WITH (location = '%s') AS SELECT * FROM tpch.tiny.%1$s",
-                table.getTableName(),
-                getLocationForTable(bucketName, table.getTableName()))));
-
-        /* Data (across 2 files) generated using:
-         * INSERT INTO foo VALUES
-         *   (1, 100, 'data1'),
-         *   (2, 200, 'data2')
-         *
-         * Data (across 2 files) generated using:
-         * INSERT INTO bar VALUES
-         *   (100, 'data100'),
-         *   (200, 'data200')
-         *
-         * INSERT INTO old_dates
-         * VALUES (DATE '0100-01-01', 1), (DATE '1582-10-15', 2), (DATE '1960-01-01', 3), (DATE '2020-01-01', 4)
-         *
-         * INSERT INTO test_timestamps VALUES
-         * (TIMESTAMP '0100-01-01 01:02:03', 1), (TIMESTAMP '1582-10-15 01:02:03', 2), (TIMESTAMP '1960-01-01 01:02:03', 3), (TIMESTAMP '2020-01-01 01:02:03', 4);
-         */
-        NON_TPCH_TABLES.forEach(table -> {
-            String resourcePath = "databricks/" + table;
-            registerTableFromResources(table, resourcePath, queryRunner);
-        });
-
-        return queryRunner;
+                        .put("hive.metastore.thrift.client.read-timeout", "1m") // read timed out sometimes happens with the default timeout
+                        .putAll(deltaStorageConfiguration())
+                        .buildOrThrow(),
+                hiveHadoop,
+                queryRunner -> {});
+    }
+
+    @AfterAll
+    public void cleanUp()
+    {
+        hiveHadoop = null; // closed by closeAfterClass
     }
 
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_CREATE_VIEW:
-                return true;
-
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_DELETE:
-            case SUPPORTS_UPDATE:
-            case SUPPORTS_MERGE:
-                return true;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_RENAME_SCHEMA -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Test
@@ -217,32 +254,30 @@ public void testDropSchemaExternalFiles()
         String subDir = schemaDir + "subdir/";
         String externalFile = subDir + "external-file";
 
-        HiveHadoop hadoopContainer = hiveMinioDataLake.getHiveHadoop();
-
         // Create file in a subdirectory of the schema directory before creating schema
-        hadoopContainer.executeInContainerFailOnError("hdfs", "dfs", "-mkdir", "-p", subDir);
-        hadoopContainer.executeInContainerFailOnError("hdfs", "dfs", "-touchz", externalFile);
+        hiveHadoop.executeInContainerFailOnError("hdfs", "dfs", "-mkdir", "-p", subDir);
+        hiveHadoop.executeInContainerFailOnError("hdfs", "dfs", "-touchz", externalFile);
 
         query(format("CREATE SCHEMA %s WITH (location = '%s')", schemaName, schemaDir));
-        assertThat(hadoopContainer.executeInContainer("hdfs", "dfs", "-test", "-e", externalFile).getExitCode())
+        assertThat(hiveHadoop.executeInContainer("hdfs", "dfs", "-test", "-e", externalFile).getExitCode())
                 .as("external file exists after creating schema")
                 .isEqualTo(0);
 
         query("DROP SCHEMA " + schemaName);
-        assertThat(hadoopContainer.executeInContainer("hdfs", "dfs", "-test", "-e", externalFile).getExitCode())
+        assertThat(hiveHadoop.executeInContainer("hdfs", "dfs", "-test", "-e", externalFile).getExitCode())
                 .as("external file exists after dropping schema")
                 .isEqualTo(0);
 
         // Test behavior without external file
-        hadoopContainer.executeInContainerFailOnError("hdfs", "dfs", "-rm", "-r", subDir);
+        hiveHadoop.executeInContainerFailOnError("hdfs", "dfs", "-rm", "-r", subDir);
 
         query(format("CREATE SCHEMA %s WITH (location = '%s')", schemaName, schemaDir));
-        assertThat(hadoopContainer.executeInContainer("hdfs", "dfs", "-test", "-d", schemaDir).getExitCode())
+        assertThat(hiveHadoop.executeInContainer("hdfs", "dfs", "-test", "-d", schemaDir).getExitCode())
                 .as("schema directory exists after creating schema")
                 .isEqualTo(0);
 
         query("DROP SCHEMA " + schemaName);
-        assertThat(hadoopContainer.executeInContainer("hdfs", "dfs", "-test", "-e", externalFile).getExitCode())
+        assertThat(hiveHadoop.executeInContainer("hdfs", "dfs", "-test", "-e", externalFile).getExitCode())
                 .as("schema directory deleted after dropping schema without external file")
                 .isEqualTo(1);
     }
@@ -289,7 +324,7 @@ public void testCreatePartitionedTable()
     public void testPathUriDecoding()
     {
         String tableName = "test_uri_table_" + randomNameSuffix();
-        registerTableFromResources(tableName, "databricks/uri", getQueryRunner());
+        registerTableFromResources(tableName, "deltalake/uri", getQueryRunner());
 
         assertQuery("SELECT * FROM " + tableName, "VALUES ('a=equal', 1), ('a:colon', 2), ('a+plus', 3), ('a space', 4), ('a%percent', 5)");
         String firstFilePath = (String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE y = 1");
@@ -316,7 +351,7 @@ public void testCreateTablePartitionValidation()
     public void testCreateTableThatAlreadyExists()
     {
         assertQueryFails("CREATE TABLE person (a int, b int) WITH (location = '" + getLocationForTable(bucketName, "different_person") + "')",
-                format(".*Table 'delta_lake.%s.person' already exists.*", SCHEMA));
+                format(".*Table 'delta.%s.person' already exists.*", SCHEMA));
     }
 
     @Test
@@ -330,13 +365,69 @@ public void testCreateTablePartitionOrdering()
         assertQuery("SELECT regionkey, nationkey, name, comment FROM " + tableName, "SELECT regionkey, nationkey, name, comment FROM nation");
     }
 
+    @Test
+    public void testOptimizeRewritesTable()
+    {
+        String tableName = "test_optimize_rewrites_table_" + randomNameSuffix();
+        String tableLocation = getLocationForTable(bucketName, tableName);
+        assertUpdate("CREATE TABLE " + tableName + " (key integer, value varchar) WITH (location = '" + tableLocation + "')");
+        try {
+            // DistributedQueryRunner sets node-scheduler.include-coordinator by default, so include coordinator
+            int workerCount = getQueryRunner().getNodeCount();
+
+            assertUpdate("INSERT INTO " + tableName + " VALUES (1, 'one')", 1);
+
+            for (int i = 0; i < 3; i++) {
+                Set<String> initialFiles = getActiveFiles(tableName);
+                computeActual("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
+                Set<String> filesAfterOptimize = getActiveFiles(tableName);
+                assertThat(filesAfterOptimize)
+                        .hasSizeBetween(1, workerCount)
+                        .containsExactlyElementsOf(initialFiles);
+            }
+
+            assertQuery("SELECT * FROM " + tableName, "VALUES(1, 'one')");
+        }
+        finally {
+            assertUpdate("DROP TABLE " + tableName);
+        }
+    }
+
+    @Test
+    public void testOptimizeRewritesPartitionedTable()
+    {
+        String tableName = "test_optimize_rewrites_partitioned_table_" + randomNameSuffix();
+        String tableLocation = getLocationForTable(bucketName, tableName);
+        assertUpdate("CREATE TABLE " + tableName + " (key integer, value varchar) WITH (location = '" + tableLocation + "', partitioned_by = ARRAY['key'])");
+        try {
+            // DistributedQueryRunner sets node-scheduler.include-coordinator by default, so include coordinator
+            int workerCount = getQueryRunner().getNodeCount();
+
+            assertUpdate("INSERT INTO " + tableName + " VALUES (1, 'one')", 1);
+            assertUpdate("INSERT INTO " + tableName + " VALUES (2, 'two')", 1);
+
+            for (int i = 0; i < 3; i++) {
+                Set<String> initialFiles = getActiveFiles(tableName);
+                computeActual("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
+                Set<String> filesAfterOptimize = getActiveFiles(tableName);
+                assertThat(filesAfterOptimize)
+                        .hasSizeBetween(1, workerCount)
+                        .containsExactlyInAnyOrderElementsOf(initialFiles);
+            }
+            assertQuery("SELECT * FROM " + tableName, "VALUES(1, 'one'), (2, 'two')");
+        }
+        finally {
+            assertUpdate("DROP TABLE " + tableName);
+        }
+    }
+
     @Test
     @Override
     public void testShowCreateTable()
     {
         assertThat(computeScalar("SHOW CREATE TABLE person"))
                 .isEqualTo(format(
-                        "CREATE TABLE delta_lake.%s.person (\n" +
+                        "CREATE TABLE delta.%s.person (\n" +
                                 "   name varchar,\n" +
                                 "   age integer,\n" +
                                 "   married boolean,\n" +
@@ -358,13 +449,6 @@ public void testInputDataSize()
     {
         DistributedQueryRunner queryRunner = (DistributedQueryRunner) getQueryRunner();
 
-        queryRunner.installPlugin(new TestingHivePlugin());
-        queryRunner.createCatalog(
-                "hive",
-                "hive",
-                ImmutableMap.of(
-                        "hive.metastore.uri", "thrift://" + hiveMinioDataLake.getHiveHadoop().getHiveMetastoreEndpoint(),
-                        "hive.allow-drop-table", "true"));
         String hiveTableName = "foo_hive";
         queryRunner.execute(
                 format("CREATE TABLE hive.%s.%s (foo_id bigint, bar_id bigint, data varchar) WITH (format = 'PARQUET', external_location = '%s')",
@@ -398,20 +482,19 @@ public void testHiddenColumns()
     public void testHiveViewsCannotBeAccessed()
     {
         String viewName = "dummy_view";
-        hiveMinioDataLake.getHiveHadoop().runOnHive(format("CREATE VIEW %1$s.%2$s AS SELECT * FROM %1$s.customer", SCHEMA, viewName));
-        assertEquals(computeScalar(format("SHOW TABLES LIKE '%s'", viewName)), viewName);
+        hiveHadoop.runOnHive(format("CREATE VIEW %1$s.%2$s AS SELECT * FROM %1$s.customer", SCHEMA, viewName));
         assertThatThrownBy(() -> computeActual("DESCRIBE " + viewName)).hasMessageContaining(format("%s.%s is not a Delta Lake table", SCHEMA, viewName));
-        hiveMinioDataLake.getHiveHadoop().runOnHive("DROP VIEW " + viewName);
+        hiveHadoop.runOnHive("DROP VIEW " + viewName);
     }
 
     @Test
     public void testNonDeltaTablesCannotBeAccessed()
     {
         String tableName = "hive_table";
-        hiveMinioDataLake.getHiveHadoop().runOnHive(format("CREATE TABLE %s.%s (id BIGINT)", SCHEMA, tableName));
+        hiveHadoop.runOnHive(format("CREATE TABLE %s.%s (id BIGINT)", SCHEMA, tableName));
         assertEquals(computeScalar(format("SHOW TABLES LIKE '%s'", tableName)), tableName);
         assertThatThrownBy(() -> computeActual("DESCRIBE " + tableName)).hasMessageContaining(tableName + " is not a Delta Lake table");
-        hiveMinioDataLake.getHiveHadoop().runOnHive(format("DROP TABLE %s.%s", SCHEMA, tableName));
+        hiveHadoop.runOnHive(format("DROP TABLE %s.%s", SCHEMA, tableName));
     }
 
     @Test
@@ -419,7 +502,7 @@ public void testDropDatabricksTable()
     {
         testDropTable(
                 "testdrop_databricks",
-                "io/trino/plugin/deltalake/testing/resources/databricks/nation");
+                "io/trino/plugin/deltalake/testing/resources/databricks73/nation");
     }
 
     @Test
@@ -455,8 +538,8 @@ public void testDropAndRecreateTable()
     @Test
     public void testDropColumnNotSupported()
     {
-        registerTableFromResources("testdropcolumn", "io/trino/plugin/deltalake/testing/resources/databricks/nation", getQueryRunner());
-        assertQueryFails("ALTER TABLE testdropcolumn DROP COLUMN comment", ".*This connector does not support dropping columns.*");
+        registerTableFromResources("testdropcolumn", "io/trino/plugin/deltalake/testing/resources/databricks73/nation", getQueryRunner());
+        assertQueryFails("ALTER TABLE testdropcolumn DROP COLUMN comment", "Cannot drop column from table using column mapping mode NONE");
     }
 
     @Test
@@ -647,6 +730,7 @@ private void validatePath(String schemaLocation, String schemaName, String table
         assertThat((String) materializedRows.get(0).getField(0)).matches(format("%s/%s.*", schemaLocation, tableName));
     }
 
+    @Test
     @Override
     public void testRenameTable()
     {
@@ -681,6 +765,7 @@ public void testRenameExternalTable()
         assertUpdate("DROP TABLE " + newTable);
     }
 
+    @Test
     @Override
     public void testRenameTableAcrossSchemas()
     {
@@ -941,18 +1026,21 @@ public void testConvertJsonStatisticsToParquetOnRowType()
     {
         assertQuery("SELECT count(*) FROM json_stats_on_row_type", "VALUES 2");
         String transactionLogDirectory = "json_stats_on_row_type/_delta_log";
-        String newTransactionFile = getLocationForTable(bucketName, "json_stats_on_row_type") + "/_delta_log/00000000000000000004.json";
-        String newCheckpointFile = getLocationForTable(bucketName, "json_stats_on_row_type") + "/_delta_log/00000000000000000004.checkpoint.parquet";
+        String tableLocation = getLocationForTable(bucketName, "json_stats_on_row_type");
+        String newTransactionFile = tableLocation + "/_delta_log/00000000000000000004.json";
+        String newCheckpointFile = tableLocation + "/_delta_log/00000000000000000004.checkpoint.parquet";
         assertThat(getTableFiles(transactionLogDirectory))
                 .doesNotContain(newTransactionFile, newCheckpointFile);
 
         assertUpdate("INSERT INTO json_stats_on_row_type SELECT CAST(row(3) AS row(x bigint)), CAST(row(row('test insert')) AS row(y row(nested varchar)))", 1);
         assertThat(getTableFiles(transactionLogDirectory))
                 .contains(newTransactionFile, newCheckpointFile);
-        assertThat(getAddFileEntries("json_stats_on_row_type")).hasSize(3);
 
-        // The first two entries created by Databricks have column stats. The last one doesn't have column stats because the connector doesn't support collecting it on row columns.
-        List<AddFileEntry> addFileEntries = getAddFileEntries("json_stats_on_row_type").stream().sorted(comparing(AddFileEntry::getModificationTime)).collect(toImmutableList());
+        // The first two entries created by Databricks have column stats.
+        // The last one doesn't have column stats because the connector doesn't support collecting it on row columns.
+        List<AddFileEntry> addFileEntries = getTableActiveFiles(transactionLogAccess, tableLocation).stream()
+                .sorted(comparing(AddFileEntry::getModificationTime))
+                .toList();
         assertThat(addFileEntries).hasSize(3);
         assertJsonStatistics(
                 addFileEntries.get(0),
@@ -975,15 +1063,11 @@ public void testConvertJsonStatisticsToParquetOnRowType()
                 "{\"numRecords\":1,\"minValues\":{},\"maxValues\":{},\"nullCount\":{}}");
     }
 
-    private List<AddFileEntry> getAddFileEntries(String tableName)
-            throws IOException
+    private static void assertJsonStatistics(AddFileEntry addFileEntry, @Language("JSON") String jsonStatistics)
     {
-        return TestingDeltaLakeUtils.getAddFileEntries(getLocationForTable(bucketName, tableName));
-    }
-
-    private void assertJsonStatistics(AddFileEntry addFileEntry, @Language("JSON") String jsonStatistics)
-    {
-        assertEquals(addFileEntry.getStatsString().orElseThrow(), jsonStatistics);
+        assertThat(addFileEntry.getStatsString().orElseThrow(() ->
+                new AssertionError("statsString is empty: " + addFileEntry)))
+                .isEqualTo(jsonStatistics);
     }
 
     @Test
@@ -1250,8 +1334,28 @@ public void testCheckpointing()
         assertUpdate("DROP TABLE " + tableName);
     }
 
-    @Test(dataProvider = "testCheckpointWriteStatsAsStructDataProvider")
-    public void testCheckpointWriteStatsAsStruct(String type, String sampleValue, String highValue, String nullsFraction, String minValue, String maxValue)
+    @Test
+    public void testCheckpointWriteStatsAsStruct()
+    {
+        testCheckpointWriteStatsAsStruct("boolean", "true", "false", "0.0", "null", "null");
+        testCheckpointWriteStatsAsStruct("integer", "1", "2147483647", "0.0", "1", "2147483647");
+        testCheckpointWriteStatsAsStruct("tinyint", "2", "127", "0.0", "2", "127");
+        testCheckpointWriteStatsAsStruct("smallint", "3", "32767", "0.0", "3", "32767");
+        testCheckpointWriteStatsAsStruct("bigint", "1000", "9223372036854775807", "0.0", "1000", "9223372036854775807");
+        testCheckpointWriteStatsAsStruct("real", "0.1", "999999.999", "0.0", "0.1", "1000000.0");
+        testCheckpointWriteStatsAsStruct("double", "1.0", "9999999999999.999", "0.0", "1.0", "'1.0E13'");
+        testCheckpointWriteStatsAsStruct("decimal(3,2)", "3.14", "9.99", "0.0", "3.14", "9.99");
+        testCheckpointWriteStatsAsStruct("decimal(30,1)", "12345", "99999999999999999999999999999.9", "0.0", "12345.0", "'1.0E29'");
+        testCheckpointWriteStatsAsStruct("varchar", "'test'", "'ŻŻŻŻŻŻŻŻŻŻ'", "0.0", "null", "null");
+        testCheckpointWriteStatsAsStruct("varbinary", "X'65683F'", "X'ffffffffffffffffffff'", "0.0", "null", "null");
+        testCheckpointWriteStatsAsStruct("date", "date '2021-02-03'", "date '9999-12-31'", "0.0", "'2021-02-03'", "'9999-12-31'");
+        testCheckpointWriteStatsAsStruct("timestamp(3) with time zone", "timestamp '2001-08-22 03:04:05.321 -08:00'", "timestamp '9999-12-31 23:59:59.999 +12:00'", "0.0", "'2001-08-22 11:04:05.321 UTC'", "'9999-12-31 11:59:59.999 UTC'");
+        testCheckpointWriteStatsAsStruct("array(int)", "array[1]", "array[2147483647]", "null", "null", "null");
+        testCheckpointWriteStatsAsStruct("map(varchar,int)", "map(array['foo', 'bar'], array[1, 2])", "map(array['foo', 'bar'], array[-2147483648, 2147483647])", "null", "null", "null");
+        testCheckpointWriteStatsAsStruct("row(x bigint)", "cast(row(1) as row(x bigint))", "cast(row(9223372036854775807) as row(x bigint))", "null", "null", "null");
+    }
+
+    private void testCheckpointWriteStatsAsStruct(String type, String sampleValue, String highValue, String nullsFraction, String minValue, String maxValue)
     {
         String tableName = "test_checkpoint_write_stats_as_struct_" + randomNameSuffix();
 
@@ -1278,30 +1382,6 @@ public void testCheckpointWriteStatsAsStruct(String type, String sampleValue, St
         assertUpdate("DROP TABLE " + tableName);
     }
 
-    @DataProvider
-    public Object[][] testCheckpointWriteStatsAsStructDataProvider()
-    {
-        // type, sampleValue, highValue, nullsFraction, minValue, maxValue
-        return new Object[][] {
-                {"boolean", "true", "false", "0.0", "null", "null"},
-                {"integer", "1", "2147483647", "0.0", "1", "2147483647"},
-                {"tinyint", "2", "127", "0.0", "2", "127"},
-                {"smallint", "3", "32767", "0.0", "3", "32767"},
-                {"bigint", "1000", "9223372036854775807", "0.0", "1000", "9223372036854775807"},
-                {"real", "0.1", "999999.999", "0.0", "0.1", "1000000.0"},
-                {"double", "1.0", "9999999999999.999", "0.0", "1.0", "'1.0E13'"},
-                {"decimal(3,2)", "3.14", "9.99", "0.0", "3.14", "9.99"},
-                {"decimal(30,1)", "12345", "99999999999999999999999999999.9", "0.0", "12345.0", "'1.0E29'"},
-                {"varchar", "'test'", "'ŻŻŻŻŻŻŻŻŻŻ'", "0.0", "null", "null"},
-                {"varbinary", "X'65683F'", "X'ffffffffffffffffffff'", "0.0", "null", "null"},
-                {"date", "date '2021-02-03'", "date '9999-12-31'", "0.0", "'2021-02-03'", "'9999-12-31'"},
-                {"timestamp(3) with time zone", "timestamp '2001-08-22 03:04:05.321 -08:00'", "timestamp '9999-12-31 23:59:59.999 +12:00'", "0.0", "'2001-08-22 11:04:05.321 UTC'", "'9999-12-31 11:59:59.999 UTC'"},
-                {"array(int)", "array[1]", "array[2147483647]", "null", "null", "null"},
-                {"map(varchar,int)", "map(array['foo', 'bar'], array[1, 2])", "map(array['foo', 'bar'], array[-2147483648, 2147483647])", "null", "null", "null"},
-                {"row(x bigint)", "cast(row(1) as row(x bigint))", "cast(row(9223372036854775807) as row(x bigint))", "null", "null", "null"},
-        };
-    }
-
     @Test
     public void testCheckpointWriteStatsAsStructWithPartiallyUnsupportedColumnStats()
     {
@@ -1338,21 +1418,13 @@ public void testDeltaLakeTableLocationChangedSameVersionNumber()
         testDeltaLakeTableLocationChanged(false, false, false);
     }
 
-    @Test(dataProvider = "testDeltaLakeTableLocationChangedPartitionedDataProvider")
-    public void testDeltaLakeTableLocationChangedPartitioned(boolean firstPartitioned, boolean secondPartitioned)
+    @Test
+    public void testDeltaLakeTableLocationChangedPartitioned()
             throws Exception
     {
-        testDeltaLakeTableLocationChanged(true, firstPartitioned, secondPartitioned);
-    }
-
-    @DataProvider
-    public Object[][] testDeltaLakeTableLocationChangedPartitionedDataProvider()
-    {
-        return new Object[][] {
-                {true, false},
-                {false, true},
-                {true, true},
-        };
+        testDeltaLakeTableLocationChanged(true, true, false);
+        testDeltaLakeTableLocationChanged(true, false, true);
+        testDeltaLakeTableLocationChanged(true, true, true);
     }
 
     private void testDeltaLakeTableLocationChanged(boolean fewerEntries, boolean firstPartitioned, boolean secondPartitioned)
@@ -1381,7 +1453,7 @@ private void testDeltaLakeTableLocationChanged(boolean fewerEntries, boolean fir
 
         MaterializedResult expectedDataAfterChange;
         String newLocation;
-        try (QueryRunner independentQueryRunner = createDeltaLakeQueryRunner(Map.of())) {
+        try (QueryRunner independentQueryRunner = createDeltaLakeQueryRunner()) {
             // Change table's location without main Delta Lake connector (main query runner) knowing about this
             newLocation = getLocationForTable(bucketName, "test_table_location_changed_new_" + randomNameSuffix());
 
@@ -1427,22 +1499,18 @@ private void testDeltaLakeTableLocationChanged(boolean fewerEntries, boolean fir
         }
 
         // Verify table schema gets reflected correctly
+        String qualifiedTableName = "%s.%s.%s".formatted(getSession().getCatalog().orElseThrow(), SCHEMA, tableName);
         assertThat(computeScalar("SHOW CREATE TABLE " + tableName))
-                .isEqualTo(format("" +
-                                "CREATE TABLE %s.%s.%s (\n" +
-                                "   a_number integer,\n" +
-                                "   a_string varchar,\n" +
-                                "   another_string varchar\n" +
-                                ")\n" +
-                                "WITH (\n" +
-                                "   location = '%s',\n" +
-                                "   partitioned_by = ARRAY[%s]\n" +
-                                ")",
-                        getSession().getCatalog().orElseThrow(),
-                        SCHEMA,
-                        tableName,
-                        newLocation,
-                        secondPartitioned ? "'a_number'" : ""));
+                .isEqualTo("" +
+                        "CREATE TABLE " + qualifiedTableName + " (\n" +
+                        "   a_number integer,\n" +
+                        "   a_string varchar,\n" +
+                        "   another_string varchar\n" +
+                        ")\n" +
+                        "WITH (\n" +
+                        "   location = '" + newLocation + "'" + (secondPartitioned ? "," : "") + "\n" +
+                        (secondPartitioned ? "   partitioned_by = ARRAY['a_number']\n" : "") +
+                        ")");
     }
 
     /**
@@ -1525,7 +1593,7 @@ public void testStatsSplitPruningBasedOnSepCreatedCheckpoint()
     public void testStatsSplitPruningBasedOnSepCreatedCheckpointOnTopOfCheckpointWithJustStructStats()
     {
         String tableName = "test_sep_checkpoint_stats_pruning_struct_stats_" + randomNameSuffix();
-        registerTableFromResources(tableName, "databricks/pruning/parquet_struct_statistics", getQueryRunner());
+        registerTableFromResources(tableName, "databricks73/pruning/parquet_struct_statistics", getQueryRunner());
         String transactionLogDirectory = format("%s/_delta_log", tableName);
 
         // there should be one checkpoint already (created by DB)
@@ -1602,6 +1670,52 @@ public void testVacuum()
         }
     }
 
+    @Test
+    public void testVacuumWithTrailingSlash()
+            throws Exception
+    {
+        String catalog = getSession().getCatalog().orElseThrow();
+        String tableName = "test_vacuum" + randomNameSuffix();
+        String tableLocation = getLocationForTable(bucketName, tableName) + "/";
+        Session sessionWithShortRetentionUnlocked = Session.builder(getSession())
+                .setCatalogSessionProperty(catalog, "vacuum_min_retention", "0s")
+                .build();
+        assertUpdate(
+                format("CREATE TABLE %s WITH (location = '%s', partitioned_by = ARRAY['regionkey']) AS SELECT * FROM tpch.tiny.nation", tableName, tableLocation),
+                25);
+        try {
+            Set<String> initialFiles = getActiveFiles(tableName);
+            assertThat(initialFiles).hasSize(5);
+
+            computeActual("UPDATE " + tableName + " SET nationkey = nationkey + 100");
+            Stopwatch timeSinceUpdate = Stopwatch.createStarted();
+            Set<String> updatedFiles = getActiveFiles(tableName);
+            assertThat(updatedFiles).hasSize(5).doesNotContainAnyElementsOf(initialFiles);
+            assertThat(getAllDataFilesFromTableDirectory(tableName)).isEqualTo(union(initialFiles, updatedFiles));
+
+            // vacuum with high retention period, nothing should change
+            assertUpdate(sessionWithShortRetentionUnlocked, "CALL system.vacuum(schema_name => CURRENT_SCHEMA, table_name => '" + tableName + "', retention => '10m')");
+            assertThat(query("SELECT * FROM " + tableName))
+                    .matches("SELECT nationkey + 100, CAST(name AS varchar), regionkey, CAST(comment AS varchar) FROM tpch.tiny.nation");
+            assertThat(getActiveFiles(tableName)).isEqualTo(updatedFiles);
+            assertThat(getAllDataFilesFromTableDirectory(tableName)).isEqualTo(union(initialFiles, updatedFiles));
+
+            // vacuum with low retention period
+            MILLISECONDS.sleep(1_000 - timeSinceUpdate.elapsed(MILLISECONDS) + 1);
+            assertUpdate(sessionWithShortRetentionUnlocked, "CALL system.vacuum(schema_name => CURRENT_SCHEMA, table_name => '" + tableName + "', retention => '1s')");
+            // table data shouldn't change
+            assertThat(query("SELECT * FROM " + tableName))
+                    .matches("SELECT nationkey + 100, CAST(name AS varchar), regionkey, CAST(comment AS varchar) FROM tpch.tiny.nation");
+            // active files shouldn't change
+            assertThat(getActiveFiles(tableName)).isEqualTo(updatedFiles);
+            // old files should be cleaned up
+            assertThat(getAllDataFilesFromTableDirectory(tableName)).isEqualTo(updatedFiles);
+        }
+        finally {
+            assertUpdate("DROP TABLE " + tableName);
+        }
+    }
+
     @Test
     public void testVacuumParameterValidation()
     {
@@ -1695,13 +1809,13 @@ public void testOptimizeParameterValidation()
     {
         assertQueryFails(
                 "ALTER TABLE no_such_table_exists EXECUTE OPTIMIZE",
-                format("line 1:7: Table 'delta_lake.%s.no_such_table_exists' does not exist", SCHEMA));
+                format("line 1:7: Table 'delta.%s.no_such_table_exists' does not exist", SCHEMA));
         assertQueryFails(
                 "ALTER TABLE nation EXECUTE OPTIMIZE (file_size_threshold => '33')",
-                "\\QUnable to set catalog 'delta_lake' table procedure 'OPTIMIZE' property 'file_size_threshold' to ['33']: size is not a valid data size string: 33");
+                "\\QUnable to set catalog 'delta' table procedure 'OPTIMIZE' property 'file_size_threshold' to ['33']: size is not a valid data size string: 33");
         assertQueryFails(
                 "ALTER TABLE nation EXECUTE OPTIMIZE (file_size_threshold => '33s')",
-                "\\QUnable to set catalog 'delta_lake' table procedure 'OPTIMIZE' property 'file_size_threshold' to ['33s']: Unknown unit: s");
+                "\\QUnable to set catalog 'delta' table procedure 'OPTIMIZE' property 'file_size_threshold' to ['33s']: Unknown unit: s");
     }
 
     @Test
@@ -1746,7 +1860,6 @@ public void testOptimizeWithEnforcedRepartitioning()
                 .setCatalog(getQueryRunner().getDefaultSession().getCatalog())
                 .setSchema(getQueryRunner().getDefaultSession().getSchema())
                 .setSystemProperty("use_preferred_write_partitioning", "true")
-                .setSystemProperty("preferred_write_partitioning_min_number_of_partitions", "1")
                 .build();
         String tableName = "test_optimize_partitioned_table_" + randomNameSuffix();
         String tableLocation = getLocationForTable(bucketName, tableName);
@@ -1879,6 +1992,54 @@ public void testOptimizeUsingForcedPartitioning()
         assertThat(getAllDataFilesFromTableDirectory(tableName)).isEqualTo(union(initialFiles, updatedFiles));
     }
 
+    @Test
+    public void testHistoryTable()
+    {
+        String tableName = "test_history_table_" + randomNameSuffix();
+        try (TestTable table = new TestTable(getQueryRunner()::execute, tableName, "(int_col INTEGER)")) {
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES 1, 2, 3", 3);
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES 4, 5, 6", 3);
+            assertUpdate("DELETE FROM " + table.getName() + " WHERE int_col = 1", 1);
+            assertUpdate("UPDATE " + table.getName() + " SET int_col = int_col * 2 WHERE int_col = 6", 1);
+
+            assertQuery("SELECT version, operation FROM \"" + table.getName() + "$history\"",
+                    "VALUES (0, 'CREATE TABLE'), (1, 'WRITE'), (2, 'WRITE'), (3, 'MERGE'), (4, 'MERGE')");
+            assertQuery("SELECT version, operation FROM \"" + table.getName() + "$history\" WHERE version = 3", "VALUES (3, 'MERGE')");
+            assertQuery("SELECT version, operation FROM \"" + table.getName() + "$history\" WHERE version > 3", "VALUES (4, 'MERGE')");
+            assertQuery("SELECT version, operation FROM \"" + table.getName() + "$history\" WHERE version >= 3 OR version = 1", "VALUES (1, 'WRITE'), (3, 'MERGE'), (4, 'MERGE')");
+            assertQuery("SELECT version, operation FROM \"" + table.getName() + "$history\" WHERE version >= 1 AND version < 3", "VALUES (1, 'WRITE'), (2, 'WRITE')");
+            assertThat(query("SELECT version, operation FROM \"" + table.getName() + "$history\" WHERE version > 1 AND version < 2")).returnsEmptyResult();
+        }
+    }
+
+    @Test
+    public void testHistoryTableWithDeletedTransactionLog()
+    {
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_history_table_with_deleted_transaction_log",
+                "(int_col INTEGER) WITH (checkpoint_interval = 3)")) {
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES 1, 2, 3", 3);
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES 4, 5, 6", 3);
+            assertUpdate("DELETE FROM " + table.getName() + " WHERE int_col = 1", 1);
+            assertUpdate("UPDATE " + table.getName() + " SET int_col = int_col * 2 WHERE int_col = 6", 1);
+
+            String tableLocation = getTableLocation(table.getName());
+            // Remove first two transaction logs to mimic log retention duration exceeds
+            deleteFile("%s/_delta_log/%020d.json".formatted(tableLocation, 0));
+            deleteFile("%s/_delta_log/%020d.json".formatted(tableLocation, 1));
+
+            assertQuery("SELECT version, operation FROM \"" + table.getName() + "$history\"", "VALUES (2, 'WRITE'), (3, 'MERGE'), (4, 'MERGE')");
+            assertThat(query("SELECT version, operation FROM \"" + table.getName() + "$history\" WHERE version = 1")).returnsEmptyResult();
+            assertQuery("SELECT version, operation FROM \"" + table.getName() + "$history\" WHERE version = 3", "VALUES (3, 'MERGE')");
+            assertQuery("SELECT version, operation FROM \"" + table.getName() + "$history\" WHERE version > 3", "VALUES (4, 'MERGE')");
+            assertQuery("SELECT version, operation FROM \"" + table.getName() + "$history\" WHERE version < 3", "VALUES (2, 'WRITE')");
+            assertQuery("SELECT version, operation FROM \"" + table.getName() + "$history\" WHERE version >= 3 OR version = 1", "VALUES (3, 'MERGE'), (4, 'MERGE')");
+            assertQuery("SELECT version, operation FROM \"" + table.getName() + "$history\" WHERE version >= 1 AND version < 3", "VALUES (2, 'WRITE')");
+            assertThat(query("SELECT version, operation FROM \"" + table.getName() + "$history\" WHERE version > 1 AND version < 2")).returnsEmptyResult();
+        }
+    }
+
     /**
      * @see BaseDeltaLakeRegisterTableProcedureTest for more detailed tests
      */
@@ -1956,12 +2117,10 @@ public void testUnregisterBrokenTable()
         String tableLocation = getTableLocation(tableName);
 
         // Break the table by deleting files from the storage
-        String key = tableLocation.substring(bucketUrl().length());
-        MinioClient minio = hiveMinioDataLake.getMinioClient();
-        for (String file : minio.listObjects(bucketName, key)) {
-            minio.removeObject(bucketName, file);
+        String directory = tableLocation.substring(bucketUrl().length());
+        for (String file : listFiles(directory)) {
+            deleteFile(file);
         }
-        assertThat(minio.listObjects(bucketName, key)).isEmpty();
 
         // Verify unregister_table successfully deletes the table from metastore
         assertUpdate("CALL system.unregister_table(CURRENT_SCHEMA, '" + tableName + "')");
@@ -1974,7 +2133,7 @@ public void testUnregisterTableNotExistingSchema()
         String schemaName = "test_unregister_table_not_existing_schema_" + randomNameSuffix();
         assertQueryFails(
                 "CALL system.unregister_table('" + schemaName + "', 'non_existent_table')",
-                "Schema " + schemaName + " not found");
+                "Table \\Q'" + schemaName + ".non_existent_table' not found");
     }
 
     @Test
@@ -2023,6 +2182,71 @@ public void testUnregisterTableAccessControl()
         assertUpdate("DROP TABLE " + tableName);
     }
 
+    @Test
+    public void testProjectionPushdownMultipleRows()
+    {
+        String tableName = "test_projection_pushdown_multiple_rows_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE " + tableName +
+                " (id BIGINT, nested1 ROW(child1 BIGINT, child2 VARCHAR, child3 INT), nested2 ROW(child1 DOUBLE, child2 BOOLEAN, child3 DATE))");
+        assertUpdate("INSERT INTO " + tableName + " VALUES" +
+                        " (100, ROW(10, 'a', 100), ROW(10.10, true, DATE '2023-04-19'))," +
+                        " (3, ROW(30, 'to_be_deleted', 300), ROW(30.30, false, DATE '2000-04-16'))," +
+                        " (2, ROW(20, 'b', 200), ROW(20.20, false, DATE '1990-04-20'))," +
+                        " (4, ROW(40, NULL, 400), NULL)," +
+                        " (5, NULL, ROW(NULL, true, NULL))",
+                5);
+        assertUpdate("UPDATE " + tableName + " SET id = 1 WHERE nested2.child3 = DATE '2023-04-19'", 1);
+        assertUpdate("DELETE FROM " + tableName + " WHERE nested1.child1 = 30 AND nested2.child2 = false", 1);
+
+        // Select one field from one row field
+        assertQuery("SELECT id, nested1.child1 FROM " + tableName, "VALUES (1, 10), (2, 20), (4, 40), (5, NULL)");
+        assertQuery("SELECT nested2.child3, id FROM " + tableName, "VALUES (DATE '2023-04-19', 1), (DATE '1990-04-20', 2), (NULL, 4), (NULL, 5)");
+
+        // Select one field each from multiple row fields
+        assertQuery("SELECT nested2.child1, id, nested1.child2 FROM " + tableName, "VALUES (10.10, 1, 'a'), (20.20, 2, 'b'), (NULL, 4, NULL), (NULL, 5, NULL)");
+
+        // Select multiple fields from one row field
+        assertQuery("SELECT nested1.child3, id, nested1.child2 FROM " + tableName, "VALUES (100, 1, 'a'), (200, 2, 'b'), (400, 4, NULL), (NULL, 5, NULL)");
+        assertQuery(
+                "SELECT nested2.child2, nested2.child3, id FROM " + tableName,
+                "VALUES (true, DATE '2023-04-19' , 1), (false, DATE '1990-04-20', 2), (NULL, NULL, 4), (true, NULL, 5)");
+
+        // Select multiple fields from multiple row fields
+        assertQuery(
+                "SELECT id, nested2.child1, nested1.child3, nested2.child2, nested1.child1 FROM " + tableName,
+                "VALUES (1, 10.10, 100, true, 10), (2, 20.20, 200, false, 20), (4, NULL, 400, NULL, 40), (5, NULL, NULL, true, NULL)");
+
+        // Select only nested fields
+        assertQuery("SELECT nested2.child2, nested1.child3 FROM " + tableName, "VALUES (true, 100), (false, 200), (NULL, 400), (true, NULL)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testPartitionFilterIncluded()
+    {
+        Session session = Session.builder(getSession())
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "query_partition_filter_required", "true")
+                .build();
+
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_no_partition_filter",
+                "(x varchar, part varchar) WITH (PARTITIONED_BY = ARRAY['part'])",
+                ImmutableList.of("'a', 'part_a'", "'b', 'part_b'"))) {
+            assertQueryFails(session, "SELECT * FROM %s WHERE x='a'".formatted(table.getName()), "Filter required on .*" + table.getName() + " for at least one partition column:.*");
+            assertQuery(session, "SELECT * FROM %s WHERE part='part_a'".formatted(table.getName()), "VALUES ('a', 'part_a')");
+        }
+    }
+
+    protected List<String> listCheckpointFiles(String transactionLogDirectory)
+    {
+        return listFiles(transactionLogDirectory).stream()
+                .filter(path -> path.contains("checkpoint.parquet"))
+                .collect(toImmutableList());
+    }
+
     private Set<String> getActiveFiles(String tableName)
     {
         return getActiveFiles(tableName, getQueryRunner().getDefaultSession());
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeMinioConnectorTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeMinioConnectorTest.java
deleted file mode 100644
index 8d05c2c1ae7e..000000000000
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeMinioConnectorTest.java
+++ /dev/null
@@ -1,974 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.deltalake;
-
-import com.google.common.base.Stopwatch;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import io.airlift.units.DataSize;
-import io.trino.Session;
-import io.trino.execution.QueryInfo;
-import io.trino.plugin.hive.containers.HiveMinioDataLake;
-import io.trino.testing.BaseConnectorTest;
-import io.trino.testing.DistributedQueryRunner;
-import io.trino.testing.MaterializedResult;
-import io.trino.testing.MaterializedResultWithQueryId;
-import io.trino.testing.MaterializedRow;
-import io.trino.testing.QueryRunner;
-import io.trino.testing.TestingConnectorBehavior;
-import io.trino.testing.sql.TestTable;
-import io.trino.tpch.TpchTable;
-import org.intellij.lang.annotations.Language;
-import org.testng.SkipException;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.common.collect.Sets.union;
-import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
-import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.TRANSACTION_LOG_DIRECTORY;
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.testing.MaterializedResult.resultBuilder;
-import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_SCHEMA;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-
-public abstract class BaseDeltaLakeMinioConnectorTest
-        extends BaseConnectorTest
-{
-    private static final String SCHEMA = "test_schema";
-
-    protected final String bucketName;
-    protected final String resourcePath;
-    protected HiveMinioDataLake hiveMinioDataLake;
-
-    public BaseDeltaLakeMinioConnectorTest(String bucketName, String resourcePath)
-    {
-        this.bucketName = requireNonNull(bucketName);
-        this.resourcePath = requireNonNull(resourcePath);
-    }
-
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
-        hiveMinioDataLake.start();
-        QueryRunner queryRunner = DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner(
-                DELTA_CATALOG,
-                SCHEMA,
-                ImmutableMap.of(
-                        "delta.enable-non-concurrent-writes", "true",
-                        "delta.register-table-procedure.enabled", "true"),
-                hiveMinioDataLake.getMinio().getMinioAddress(),
-                hiveMinioDataLake.getHiveHadoop());
-        queryRunner.execute("CREATE SCHEMA " + SCHEMA + " WITH (location = 's3://" + bucketName + "/" + SCHEMA + "')");
-        TpchTable.getTables().forEach(table -> {
-            String tableName = table.getTableName();
-            hiveMinioDataLake.copyResources(resourcePath + tableName, SCHEMA + "/" + tableName);
-            queryRunner.execute(format("CALL system.register_table('%1$s', '%2$s', 's3://%3$s/%1$s/%2$s')",
-                    SCHEMA,
-                    tableName,
-                    bucketName));
-        });
-        return queryRunner;
-    }
-
-    @SuppressWarnings("DuplicateBranchesInSwitch")
-    @Override
-    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
-    {
-        switch (connectorBehavior) {
-            case SUPPORTS_PREDICATE_PUSHDOWN:
-            case SUPPORTS_LIMIT_PUSHDOWN:
-            case SUPPORTS_TOPN_PUSHDOWN:
-            case SUPPORTS_AGGREGATION_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_DROP_COLUMN:
-            case SUPPORTS_RENAME_COLUMN:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_DELETE:
-            case SUPPORTS_UPDATE:
-            case SUPPORTS_MERGE:
-            case SUPPORTS_CREATE_VIEW:
-                return true;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
-    }
-
-    @Override
-    protected String errorMessageForInsertIntoNotNullColumn(String columnName)
-    {
-        return "NULL value not allowed for NOT NULL column: " + columnName;
-    }
-
-    @Override
-    protected void verifyConcurrentUpdateFailurePermissible(Exception e)
-    {
-        assertThat(e)
-                .hasMessage("Failed to write Delta Lake transaction log entry")
-                .cause()
-                .hasMessageMatching(
-                        "Transaction log locked.*" +
-                                "|.*/_delta_log/\\d+.json already exists" +
-                                "|Conflicting concurrent writes found..*" +
-                                "|Multiple live locks found for:.*" +
-                                "|Target file .* was created during locking");
-    }
-
-    @Override
-    protected void verifyConcurrentInsertFailurePermissible(Exception e)
-    {
-        assertThat(e)
-                .hasMessage("Failed to write Delta Lake transaction log entry")
-                .cause()
-                .hasMessageMatching(
-                        "Transaction log locked.*" +
-                                "|.*/_delta_log/\\d+.json already exists" +
-                                "|Conflicting concurrent writes found..*" +
-                                "|Multiple live locks found for:.*" +
-                                "|Target file .* was created during locking");
-    }
-
-    @Override
-    protected void verifyConcurrentAddColumnFailurePermissible(Exception e)
-    {
-        assertThat(e)
-                .hasMessageMatching("Unable to add '.*' column for: .*")
-                .cause()
-                .hasMessageMatching(
-                        "Transaction log locked.*" +
-                                "|.*/_delta_log/\\d+.json already exists" +
-                                "|Conflicting concurrent writes found..*" +
-                                "|Multiple live locks found for:.*" +
-                                "|Target file .* was created during locking");
-    }
-
-    @Override
-    protected Optional<DataMappingTestSetup> filterCaseSensitiveDataMappingTestData(DataMappingTestSetup dataMappingTestSetup)
-    {
-        String typeName = dataMappingTestSetup.getTrinoTypeName();
-        if (typeName.equals("char(1)")) {
-            return Optional.of(dataMappingTestSetup.asUnsupported());
-        }
-        return Optional.of(dataMappingTestSetup);
-    }
-
-    @Override
-    protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMappingTestSetup dataMappingTestSetup)
-    {
-        String typeName = dataMappingTestSetup.getTrinoTypeName();
-        if (typeName.equals("time") ||
-                typeName.equals("time(6)") ||
-                typeName.equals("timestamp") ||
-                typeName.equals("timestamp(6)") ||
-                typeName.equals("timestamp(6) with time zone") ||
-                typeName.equals("char(3)")) {
-            return Optional.of(dataMappingTestSetup.asUnsupported());
-        }
-        return Optional.of(dataMappingTestSetup);
-    }
-
-    @Override
-    protected Optional<String> filterColumnNameTestData(String columnName)
-    {
-        // TODO https://github.com/trinodb/trino/issues/11297: these should be cleanly rejected and filterColumnNameTestData() replaced with isColumnNameRejected()
-        Set<String> unsupportedColumnNames = ImmutableSet.of(
-                "atrailingspace ",
-                " aleadingspace",
-                "a,comma",
-                "a;semicolon",
-                "a space");
-        if (unsupportedColumnNames.contains(columnName)) {
-            return Optional.empty();
-        }
-
-        return Optional.of(columnName);
-    }
-
-    @Override
-    protected TestTable createTableWithDefaultColumns()
-    {
-        throw new SkipException("Delta Lake does not support columns with a default value");
-    }
-
-    @Override
-    protected MaterializedResult getDescribeOrdersResult()
-    {
-        return resultBuilder(getQueryRunner().getDefaultSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
-                .row("orderkey", "bigint", "", "")
-                .row("custkey", "bigint", "", "")
-                .row("orderstatus", "varchar", "", "")
-                .row("totalprice", "double", "", "")
-                .row("orderdate", "date", "", "")
-                .row("orderpriority", "varchar", "", "")
-                .row("clerk", "varchar", "", "")
-                .row("shippriority", "integer", "", "")
-                .row("comment", "varchar", "", "")
-                .build();
-    }
-
-    @Test
-    @Override
-    public void testShowCreateTable()
-    {
-        assertThat((String) computeScalar("SHOW CREATE TABLE orders"))
-                .matches("\\QCREATE TABLE " + DELTA_CATALOG + "." + SCHEMA + ".orders (\n" +
-                        "   orderkey bigint,\n" +
-                        "   custkey bigint,\n" +
-                        "   orderstatus varchar,\n" +
-                        "   totalprice double,\n" +
-                        "   orderdate date,\n" +
-                        "   orderpriority varchar,\n" +
-                        "   clerk varchar,\n" +
-                        "   shippriority integer,\n" +
-                        "   comment varchar\n" +
-                        ")\n" +
-                        "WITH (\n" +
-                        "   location = \\E'.*/test_schema/orders',\n\\Q" +
-                        "   partitioned_by = ARRAY[]\n" +
-                        ")");
-    }
-
-    // not pushdownable means not convertible to a tuple domain
-    @Test
-    public void testQueryNullPartitionWithNotPushdownablePredicate()
-    {
-        String tableName = "test_null_partitions_" + randomNameSuffix();
-        assertUpdate("" +
-                        "CREATE TABLE " + tableName + " (a, b, c) WITH (location = '" + format("s3://%s/%s", bucketName, tableName) + "', partitioned_by = ARRAY['c']) " +
-                        "AS VALUES (1, 1, 1), (2, 2, 2), (3, 3, 3), (null, null, null), (4, 4, 4)",
-                "VALUES 5");
-        assertQuery("SELECT a FROM " + tableName + " WHERE c % 5 = 1", "VALUES (1)");
-    }
-
-    @Test
-    public void testPartitionColumnOrderIsDifferentFromTableDefinition()
-    {
-        String tableName = "test_partition_order_is_different_from_table_definition_" + randomNameSuffix();
-        assertUpdate("" +
-                "CREATE TABLE " + tableName + "(data int, first varchar, second varchar) " +
-                "WITH (" +
-                "partitioned_by = ARRAY['second', 'first'], " +
-                "location = '" + format("s3://%s/%s", bucketName, tableName) + "')");
-
-        assertUpdate("INSERT INTO " + tableName + " VALUES (1, 'first#1', 'second#1')", 1);
-        assertQuery("SELECT * FROM " + tableName, "VALUES (1, 'first#1', 'second#1')");
-
-        assertUpdate("INSERT INTO " + tableName + " (data, first) VALUES (2, 'first#2')", 1);
-        assertQuery("SELECT * FROM " + tableName, "VALUES (1, 'first#1', 'second#1'), (2, 'first#2', NULL)");
-
-        assertUpdate("INSERT INTO " + tableName + " (data, second) VALUES (3, 'second#3')", 1);
-        assertQuery("SELECT * FROM " + tableName, "VALUES (1, 'first#1', 'second#1'), (2, 'first#2', NULL), (3, NULL, 'second#3')");
-
-        assertUpdate("INSERT INTO " + tableName + " (data) VALUES (4)", 1);
-        assertQuery("SELECT * FROM " + tableName, "VALUES (1, 'first#1', 'second#1'), (2, 'first#2', NULL), (3, NULL, 'second#3'), (4, NULL, NULL)");
-    }
-
-    @Override
-    public void testShowCreateSchema()
-    {
-        String schemaName = getSession().getSchema().orElseThrow();
-        assertThat((String) computeScalar("SHOW CREATE SCHEMA " + schemaName))
-                .isEqualTo(format("CREATE SCHEMA %s.%s\n" +
-                        "WITH (\n" +
-                        "   location = 's3://%s/test_schema'\n" +
-                        ")", getSession().getCatalog().orElseThrow(), schemaName, bucketName));
-    }
-
-    /**
-     * @see io.trino.plugin.deltalake.BaseDeltaLakeConnectorSmokeTest#testRenameExternalTable for more test coverage
-     */
-    @Override
-    public void testRenameTable()
-    {
-        assertThatThrownBy(super::testRenameTable)
-                .hasMessage("Renaming managed tables is not allowed with current metastore configuration")
-                .hasStackTraceContaining("SQL: ALTER TABLE test_rename_");
-    }
-
-    /**
-     * @see io.trino.plugin.deltalake.BaseDeltaLakeConnectorSmokeTest#testRenameExternalTableAcrossSchemas for more test coverage
-     */
-    @Override
-    public void testRenameTableAcrossSchema()
-    {
-        assertThatThrownBy(super::testRenameTableAcrossSchema)
-                .hasMessage("Renaming managed tables is not allowed with current metastore configuration")
-                .hasStackTraceContaining("SQL: ALTER TABLE test_rename_");
-    }
-
-    @Override
-    public void testRenameTableToUnqualifiedPreservesSchema()
-    {
-        assertThatThrownBy(super::testRenameTableToUnqualifiedPreservesSchema)
-                .hasMessage("Renaming managed tables is not allowed with current metastore configuration")
-                .hasStackTraceContaining("SQL: ALTER TABLE test_source_schema_");
-    }
-
-    @Override
-    public void testRenameTableToLongTableName()
-    {
-        assertThatThrownBy(super::testRenameTableToLongTableName)
-                .hasMessage("Renaming managed tables is not allowed with current metastore configuration")
-                .hasStackTraceContaining("SQL: ALTER TABLE test_rename_");
-    }
-
-    @Override
-    public void testDropNonEmptySchemaWithTable()
-    {
-        String schemaName = "test_drop_non_empty_schema_" + randomNameSuffix();
-        if (!hasBehavior(SUPPORTS_CREATE_SCHEMA)) {
-            return;
-        }
-
-        assertUpdate("CREATE SCHEMA " + schemaName + " WITH (location = 's3://" + bucketName + "/" + schemaName + "')");
-        assertUpdate("CREATE TABLE " + schemaName + ".t(x int)");
-        assertQueryFails("DROP SCHEMA " + schemaName, ".*Cannot drop non-empty schema '\\Q" + schemaName + "\\E'");
-        assertUpdate("DROP TABLE " + schemaName + ".t");
-        assertUpdate("DROP SCHEMA " + schemaName);
-    }
-
-    @Override
-    public void testCharVarcharComparison()
-    {
-        // Delta Lake doesn't have a char type
-        assertThatThrownBy(super::testCharVarcharComparison)
-                .hasStackTraceContaining("Unsupported type: char(3)");
-    }
-
-    @Test(dataProvider = "timestampValues")
-    public void testTimestampPredicatePushdown(String value)
-    {
-        String tableName = "test_parquet_timestamp_predicate_pushdown_" + randomNameSuffix();
-
-        assertUpdate("DROP TABLE IF EXISTS " + tableName);
-        assertUpdate("CREATE TABLE " + tableName + " (t TIMESTAMP WITH TIME ZONE)");
-        assertUpdate("INSERT INTO " + tableName + " VALUES (TIMESTAMP '" + value + "')", 1);
-
-        DistributedQueryRunner queryRunner = (DistributedQueryRunner) getQueryRunner();
-        MaterializedResultWithQueryId queryResult = queryRunner.executeWithQueryId(
-                getSession(),
-                "SELECT * FROM " + tableName + " WHERE t < TIMESTAMP '" + value + "'");
-        assertEquals(getQueryInfo(queryRunner, queryResult).getQueryStats().getProcessedInputDataSize().toBytes(), 0);
-
-        queryResult = queryRunner.executeWithQueryId(
-                getSession(),
-                "SELECT * FROM " + tableName + " WHERE t > TIMESTAMP '" + value + "'");
-        assertEquals(getQueryInfo(queryRunner, queryResult).getQueryStats().getProcessedInputDataSize().toBytes(), 0);
-
-        assertQueryStats(
-                getSession(),
-                "SELECT * FROM " + tableName + " WHERE t = TIMESTAMP '" + value + "'",
-                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
-                results -> {});
-    }
-
-    @DataProvider
-    public Object[][] timestampValues()
-    {
-        return new Object[][] {
-                {"1965-10-31 01:00:08.123 UTC"},
-                {"1965-10-31 01:00:08.999 UTC"},
-                {"1970-01-01 01:13:42.000 America/Bahia_Banderas"}, // There is a gap in JVM zone
-                {"1970-01-01 00:00:00.000 Asia/Kathmandu"},
-                {"2018-10-28 01:33:17.456 Europe/Vilnius"},
-                {"9999-12-31 23:59:59.999 UTC"}};
-    }
-
-    @Test
-    public void testAddColumnToPartitionedTable()
-    {
-        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_column_partitioned_table_", "(x VARCHAR, part VARCHAR) WITH (partitioned_by = ARRAY['part'])")) {
-            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'first', 'part-0001'", 1);
-            assertQueryFails("ALTER TABLE " + table.getName() + " ADD COLUMN x bigint", ".* Column 'x' already exists");
-            assertQueryFails("ALTER TABLE " + table.getName() + " ADD COLUMN part bigint", ".* Column 'part' already exists");
-
-            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN a varchar(50)");
-            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'second', 'part-0002', 'xxx'", 1);
-            assertQuery(
-                    "SELECT x, part, a FROM " + table.getName(),
-                    "VALUES ('first', 'part-0001', NULL), ('second', 'part-0002', 'xxx')");
-
-            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN b double");
-            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'third', 'part-0003', 'yyy', 33.3E0", 1);
-            assertQuery(
-                    "SELECT x, part, a, b FROM " + table.getName(),
-                    "VALUES ('first', 'part-0001', NULL, NULL), ('second', 'part-0002', 'xxx', NULL), ('third', 'part-0003', 'yyy', 33.3)");
-
-            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN IF NOT EXISTS c varchar(50)");
-            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN IF NOT EXISTS part varchar(50)");
-            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'fourth', 'part-0004', 'zzz', 55.3E0, 'newColumn'", 1);
-            assertQuery(
-                    "SELECT x, part, a, b, c FROM " + table.getName(),
-                    "VALUES ('first', 'part-0001', NULL, NULL, NULL), ('second', 'part-0002', 'xxx', NULL, NULL), ('third', 'part-0003', 'yyy', 33.3, NULL), ('fourth', 'part-0004', 'zzz', 55.3, 'newColumn')");
-        }
-    }
-
-    private QueryInfo getQueryInfo(DistributedQueryRunner queryRunner, MaterializedResultWithQueryId queryResult)
-    {
-        return queryRunner.getCoordinator().getQueryManager().getFullQueryInfo(queryResult.getQueryId());
-    }
-
-    @Test
-    public void testAddColumnAndOptimize()
-    {
-        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_column_and_optimize", "(x VARCHAR)")) {
-            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'first'", 1);
-
-            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN a varchar(50)");
-            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'second', 'xxx'", 1);
-            assertQuery(
-                    "SELECT x, a FROM " + table.getName(),
-                    "VALUES ('first', NULL), ('second', 'xxx')");
-
-            Set<String> beforeActiveFiles = getActiveFiles(table.getName());
-            computeActual("ALTER TABLE " + table.getName() + " EXECUTE OPTIMIZE");
-
-            // Verify OPTIMIZE happened, but table data didn't change
-            assertThat(beforeActiveFiles).isNotEqualTo(getActiveFiles(table.getName()));
-            assertQuery(
-                    "SELECT x, a FROM " + table.getName(),
-                    "VALUES ('first', NULL), ('second', 'xxx')");
-        }
-    }
-
-    @Test
-    public void testAddColumnAndVacuum()
-            throws Exception
-    {
-        Session sessionWithShortRetentionUnlocked = Session.builder(getSession())
-                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "vacuum_min_retention", "0s")
-                .build();
-
-        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_column_and_optimize", "(x VARCHAR)")) {
-            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'first'", 1);
-            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'second'", 1);
-
-            Set<String> initialFiles = getActiveFiles(table.getName());
-            assertThat(initialFiles).hasSize(2);
-
-            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN a varchar(50)");
-
-            assertUpdate("UPDATE " + table.getName() + " SET a = 'new column'", 2);
-            Stopwatch timeSinceUpdate = Stopwatch.createStarted();
-            Set<String> updatedFiles = getActiveFiles(table.getName());
-            assertThat(updatedFiles)
-                    .hasSizeGreaterThanOrEqualTo(1)
-                    .hasSizeLessThanOrEqualTo(2)
-                    .doesNotContainAnyElementsOf(initialFiles);
-            assertThat(getAllDataFilesFromTableDirectory(table.getName())).isEqualTo(union(initialFiles, updatedFiles));
-
-            assertQuery(
-                    "SELECT x, a FROM " + table.getName(),
-                    "VALUES ('first', 'new column'), ('second', 'new column')");
-
-            MILLISECONDS.sleep(1_000 - timeSinceUpdate.elapsed(MILLISECONDS) + 1);
-            assertUpdate(sessionWithShortRetentionUnlocked, "CALL system.vacuum(schema_name => CURRENT_SCHEMA, table_name => '" + table.getName() + "', retention => '1s')");
-
-            // Verify VACUUM happened, but table data didn't change
-            assertThat(getAllDataFilesFromTableDirectory(table.getName())).isEqualTo(updatedFiles);
-            assertQuery(
-                    "SELECT x, a FROM " + table.getName(),
-                    "VALUES ('first', 'new column'), ('second', 'new column')");
-        }
-    }
-
-    @Test
-    public void testTargetMaxFileSize()
-    {
-        String tableName = "test_default_max_file_size" + randomNameSuffix();
-        @Language("SQL") String createTableSql = format("CREATE TABLE %s AS SELECT * FROM tpch.sf1.lineitem LIMIT 100000", tableName);
-
-        Session session = Session.builder(getSession())
-                .setSystemProperty("task_writer_count", "1")
-                // task scale writers should be disabled since we want to write with a single task writer
-                .setSystemProperty("task_scale_writers_enabled", "false")
-                .build();
-        assertUpdate(session, createTableSql, 100000);
-        Set<String> initialFiles = getActiveFiles(tableName);
-        assertThat(initialFiles.size()).isLessThanOrEqualTo(3);
-        assertUpdate(format("DROP TABLE %s", tableName));
-
-        DataSize maxSize = DataSize.of(40, DataSize.Unit.KILOBYTE);
-        session = Session.builder(getSession())
-                .setSystemProperty("task_writer_count", "1")
-                // task scale writers should be disabled since we want to write with a single task writer
-                .setSystemProperty("task_scale_writers_enabled", "false")
-                .setCatalogSessionProperty("delta_lake", "target_max_file_size", maxSize.toString())
-                .build();
-
-        assertUpdate(session, createTableSql, 100000);
-        assertThat(query(format("SELECT count(*) FROM %s", tableName))).matches("VALUES BIGINT '100000'");
-        Set<String> updatedFiles = getActiveFiles(tableName);
-        assertThat(updatedFiles.size()).isGreaterThan(10);
-
-        MaterializedResult result = computeActual("SELECT DISTINCT \"$path\", \"$file_size\" FROM " + tableName);
-        for (MaterializedRow row : result) {
-            // allow up to a larger delta due to the very small max size and the relatively large writer chunk size
-            assertThat((Long) row.getField(1)).isLessThan(maxSize.toBytes() * 5);
-        }
-    }
-
-    @Test
-    public void testPathColumn()
-    {
-        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_path_column", "(x VARCHAR)")) {
-            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'first'", 1);
-            String firstFilePath = (String) computeScalar("SELECT \"$path\" FROM " + table.getName());
-            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'second'", 1);
-            String secondFilePath = (String) computeScalar("SELECT \"$path\" FROM " + table.getName() + " WHERE x = 'second'");
-
-            // Verify predicate correctness on $path column
-            assertQuery("SELECT x FROM " + table.getName() + " WHERE \"$path\" = '" + firstFilePath + "'", "VALUES 'first'");
-            assertQuery("SELECT x FROM " + table.getName() + " WHERE \"$path\" <> '" + firstFilePath + "'", "VALUES 'second'");
-            assertQuery("SELECT x FROM " + table.getName() + " WHERE \"$path\" IN ('" + firstFilePath + "', '" + secondFilePath + "')", "VALUES ('first'), ('second')");
-            assertQuery("SELECT x FROM " + table.getName() + " WHERE \"$path\" IS NOT NULL", "VALUES ('first'), ('second')");
-            assertQueryReturnsEmptyResult("SELECT x FROM " + table.getName() + " WHERE \"$path\" IS NULL");
-        }
-    }
-
-    @Test
-    public void testTableLocationTrailingSpace()
-    {
-        String tableName = "table_with_space_" + randomNameSuffix();
-        String tableLocationWithTrailingSpace = "s3://" + bucketName + "/" + tableName + " ";
-
-        assertUpdate(format("CREATE TABLE %s (customer VARCHAR) WITH (location = '%s')", tableName, tableLocationWithTrailingSpace));
-        assertUpdate("INSERT INTO " + tableName + " (customer) VALUES ('Aaron'), ('Bill')", 2);
-        assertQuery("SELECT * FROM " + tableName, "VALUES ('Aaron'), ('Bill')");
-
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
-    @Test
-    public void testTableLocationTrailingSlash()
-    {
-        String tableWithSlash = "table_with_slash";
-        String tableWithoutSlash = "table_without_slash";
-
-        assertUpdate(format("CREATE TABLE %s (customer VARCHAR) WITH (location = 's3://%s/%s/')", tableWithSlash, bucketName, tableWithSlash));
-        assertUpdate(format("INSERT INTO %s (customer) VALUES ('Aaron'), ('Bill')", tableWithSlash), 2);
-        assertQuery("SELECT * FROM " + tableWithSlash, "VALUES ('Aaron'), ('Bill')");
-
-        assertUpdate(format("CREATE TABLE %s (customer VARCHAR) WITH (location = 's3://%s/%s')", tableWithoutSlash, bucketName, tableWithoutSlash));
-        assertUpdate(format("INSERT INTO %s (customer) VALUES ('Carol'), ('Dave')", tableWithoutSlash), 2);
-        assertQuery("SELECT * FROM " + tableWithoutSlash, "VALUES ('Carol'), ('Dave')");
-
-        assertUpdate("DROP TABLE " + tableWithSlash);
-        assertUpdate("DROP TABLE " + tableWithoutSlash);
-    }
-
-    @Test
-    public void testMergeSimpleSelectPartitioned()
-    {
-        String targetTable = "merge_simple_target_" + randomNameSuffix();
-        String sourceTable = "merge_simple_source_" + randomNameSuffix();
-        assertUpdate(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])", targetTable, bucketName, targetTable));
-
-        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Buena'), ('Carol', 3, 'Cambridge'), ('Dave', 11, 'Devon')", targetTable), 4);
-
-        assertUpdate(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')", sourceTable, bucketName, sourceTable));
-
-        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 6, 'Arches'), ('Ed', 7, 'Etherville'), ('Carol', 9, 'Centreville'), ('Dave', 11, 'Darbyshire')", sourceTable), 4);
-
-        @Language("SQL") String sql = format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) +
-                "    WHEN MATCHED AND s.address = 'Centreville' THEN DELETE" +
-                "    WHEN MATCHED THEN UPDATE SET purchases = s.purchases + t.purchases, address = s.address" +
-                "    WHEN NOT MATCHED THEN INSERT (customer, purchases, address) VALUES(s.customer, s.purchases, s.address)";
-
-        assertUpdate(sql, 4);
-
-        assertQuery("SELECT * FROM " + targetTable, "VALUES ('Aaron', 11, 'Arches'), ('Ed', 7, 'Etherville'), ('Bill', 7, 'Buena'), ('Dave', 22, 'Darbyshire')");
-
-        assertUpdate("DROP TABLE " + sourceTable);
-        assertUpdate("DROP TABLE " + targetTable);
-    }
-
-    @Test(dataProvider = "partitionedProvider")
-    public void testMergeUpdateWithVariousLayouts(String partitionPhase)
-    {
-        String targetTable = "merge_formats_target_" + randomNameSuffix();
-        String sourceTable = "merge_formats_source_" + randomNameSuffix();
-        assertUpdate(format("CREATE TABLE %s (customer VARCHAR, purchase VARCHAR) WITH (location = 's3://%s/%s'%s)", targetTable, bucketName, targetTable, partitionPhase));
-
-        assertUpdate(format("INSERT INTO %s (customer, purchase) VALUES ('Dave', 'dates'), ('Lou', 'limes'), ('Carol', 'candles')", targetTable), 3);
-        assertQuery("SELECT * FROM " + targetTable, "VALUES ('Dave', 'dates'), ('Lou', 'limes'), ('Carol', 'candles')");
-
-        assertUpdate(format("CREATE TABLE %s (customer VARCHAR, purchase VARCHAR) WITH (location = 's3://%s/%s')", sourceTable, bucketName, sourceTable));
-
-        assertUpdate(format("INSERT INTO %s (customer, purchase) VALUES ('Craig', 'candles'), ('Len', 'limes'), ('Joe', 'jellybeans')", sourceTable), 3);
-
-        @Language("SQL") String sql = format("MERGE INTO %s t USING %s s ON (t.purchase = s.purchase)", targetTable, sourceTable) +
-                "    WHEN MATCHED AND s.purchase = 'limes' THEN DELETE" +
-                "    WHEN MATCHED THEN UPDATE SET customer = CONCAT(t.customer, '_', s.customer)" +
-                "    WHEN NOT MATCHED THEN INSERT (customer, purchase) VALUES(s.customer, s.purchase)";
-
-        assertUpdate(sql, 3);
-
-        assertQuery("SELECT * FROM " + targetTable, "VALUES ('Dave', 'dates'), ('Carol_Craig', 'candles'), ('Joe', 'jellybeans')");
-        assertUpdate("DROP TABLE " + sourceTable);
-        assertUpdate("DROP TABLE " + targetTable);
-    }
-
-    @DataProvider
-    public Object[][] partitionedProvider()
-    {
-        return new Object[][] {
-                {""},
-                {", partitioned_by = ARRAY['customer']"},
-                {", partitioned_by = ARRAY['purchase']"}
-        };
-    }
-
-    @Test(dataProvider = "partitionedProvider")
-    public void testMergeMultipleOperations(String partitioning)
-    {
-        int targetCustomerCount = 32;
-        String targetTable = "merge_multiple_" + randomNameSuffix();
-        assertUpdate(format("CREATE TABLE %s (purchase INT, zipcode INT, spouse VARCHAR, address VARCHAR, customer VARCHAR) WITH (location = 's3://%s/%s'%s)", targetTable, bucketName, targetTable, partitioning));
-        String originalInsertFirstHalf = IntStream.range(1, targetCustomerCount / 2)
-                .mapToObj(intValue -> format("('joe_%s', %s, %s, 'jan_%s', '%s Poe Ct')", intValue, 1000, 91000, intValue, intValue))
-                .collect(Collectors.joining(", "));
-        String originalInsertSecondHalf = IntStream.range(targetCustomerCount / 2, targetCustomerCount)
-                .mapToObj(intValue -> format("('joe_%s', %s, %s, 'jan_%s', '%s Poe Ct')", intValue, 2000, 92000, intValue, intValue))
-                .collect(Collectors.joining(", "));
-
-        assertUpdate(format("INSERT INTO %s (customer, purchase, zipcode, spouse, address) VALUES %s, %s", targetTable, originalInsertFirstHalf, originalInsertSecondHalf), targetCustomerCount - 1);
-
-        String firstMergeSource = IntStream.range(targetCustomerCount / 2, targetCustomerCount)
-                .mapToObj(intValue -> format("('joe_%s', %s, %s, 'jill_%s', '%s Eop Ct')", intValue, 3000, 83000, intValue, intValue))
-                .collect(Collectors.joining(", "));
-
-        assertUpdate(format("MERGE INTO %s t USING (VALUES %s) AS s(customer, purchase, zipcode, spouse, address)", targetTable, firstMergeSource) +
-                        "    ON t.customer = s.customer" +
-                        "    WHEN MATCHED THEN UPDATE SET purchase = s.purchase, zipcode = s.zipcode, spouse = s.spouse, address = s.address",
-                targetCustomerCount / 2);
-
-        assertQuery(
-                "SELECT customer, purchase, zipcode, spouse, address FROM " + targetTable,
-                format("VALUES %s, %s", originalInsertFirstHalf, firstMergeSource));
-
-        String nextInsert = IntStream.range(targetCustomerCount, targetCustomerCount * 3 / 2)
-                .mapToObj(intValue -> format("('jack_%s', %s, %s, 'jan_%s', '%s Poe Ct')", intValue, 4000, 74000, intValue, intValue))
-                .collect(Collectors.joining(", "));
-
-        assertUpdate(format("INSERT INTO %s (customer, purchase, zipcode, spouse, address) VALUES %s", targetTable, nextInsert), targetCustomerCount / 2);
-
-        String secondMergeSource = IntStream.range(1, targetCustomerCount * 3 / 2)
-                .mapToObj(intValue -> format("('joe_%s', %s, %s, 'jen_%s', '%s Poe Ct')", intValue, 5000, 85000, intValue, intValue))
-                .collect(Collectors.joining(", "));
-
-        assertUpdate(format("MERGE INTO %s t USING (VALUES %s) AS s(customer, purchase, zipcode, spouse, address)", targetTable, secondMergeSource) +
-                        "    ON t.customer = s.customer" +
-                        "    WHEN MATCHED AND t.zipcode = 91000 THEN DELETE" +
-                        "    WHEN MATCHED AND s.zipcode = 85000 THEN UPDATE SET zipcode = 60000" +
-                        "    WHEN MATCHED THEN UPDATE SET zipcode = s.zipcode, spouse = s.spouse, address = s.address" +
-                        "    WHEN NOT MATCHED THEN INSERT (customer, purchase, zipcode, spouse, address) VALUES(s.customer, s.purchase, s.zipcode, s.spouse, s.address)",
-                targetCustomerCount * 3 / 2 - 1);
-
-        String updatedBeginning = IntStream.range(targetCustomerCount / 2, targetCustomerCount)
-                .mapToObj(intValue -> format("('joe_%s', %s, %s, 'jill_%s', '%s Eop Ct')", intValue, 3000, 60000, intValue, intValue))
-                .collect(Collectors.joining(", "));
-        String updatedMiddle = IntStream.range(targetCustomerCount, targetCustomerCount * 3 / 2)
-                .mapToObj(intValue -> format("('joe_%s', %s, %s, 'jen_%s', '%s Poe Ct')", intValue, 5000, 85000, intValue, intValue))
-                .collect(Collectors.joining(", "));
-        String updatedEnd = IntStream.range(targetCustomerCount, targetCustomerCount * 3 / 2)
-                .mapToObj(intValue -> format("('jack_%s', %s, %s, 'jan_%s', '%s Poe Ct')", intValue, 4000, 74000, intValue, intValue))
-                .collect(Collectors.joining(", "));
-
-        assertQuery(
-                "SELECT customer, purchase, zipcode, spouse, address FROM " + targetTable,
-                format("VALUES %s, %s, %s", updatedBeginning, updatedMiddle, updatedEnd));
-
-        assertUpdate("DROP TABLE " + targetTable);
-    }
-
-    @Test
-    public void testMergeSimpleQueryPartitioned()
-    {
-        String targetTable = "merge_simple_" + randomNameSuffix();
-        assertUpdate(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])", targetTable, bucketName, targetTable));
-
-        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Buena'), ('Carol', 3, 'Cambridge'), ('Dave', 11, 'Devon')", targetTable), 4);
-
-        @Language("SQL") String query = format("MERGE INTO %s t USING ", targetTable) +
-                "(SELECT * FROM (VALUES ('Aaron', 6, 'Arches'), ('Carol', 9, 'Centreville'), ('Dave', 11, 'Darbyshire'), ('Ed', 7, 'Etherville'))) AS s(customer, purchases, address)" +
-                "    " +
-                "ON (t.customer = s.customer)" +
-                "    WHEN MATCHED AND s.address = 'Centreville' THEN DELETE" +
-                "    WHEN MATCHED THEN UPDATE SET purchases = s.purchases + t.purchases, address = s.address" +
-                "    WHEN NOT MATCHED THEN INSERT (customer, purchases, address) VALUES(s.customer, s.purchases, s.address)";
-        assertUpdate(query, 4);
-
-        assertQuery("SELECT * FROM " + targetTable, "VALUES ('Aaron', 11, 'Arches'), ('Bill', 7, 'Buena'), ('Dave', 22, 'Darbyshire'), ('Ed', 7, 'Etherville')");
-
-        assertUpdate("DROP TABLE " + targetTable);
-    }
-
-    @Test(dataProvider = "targetWithDifferentPartitioning")
-    public void testMergeMultipleRowsMatchFails(String createTableSql)
-    {
-        String targetTable = "merge_multiple_target_" + randomNameSuffix();
-        String sourceTable = "merge_multiple_source_" + randomNameSuffix();
-        assertUpdate(format(createTableSql, targetTable, bucketName, targetTable));
-
-        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Antioch')", targetTable), 2);
-
-        assertUpdate(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')", sourceTable, bucketName, sourceTable));
-
-        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 6, 'Adelphi'), ('Aaron', 8, 'Ashland')", sourceTable), 2);
-
-        assertThatThrownBy(() -> computeActual(format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) +
-                "    WHEN MATCHED THEN UPDATE SET address = s.address"))
-                .hasMessage("One MERGE target table row matched more than one source row");
-
-        assertUpdate(format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) +
-                        "    WHEN MATCHED AND s.address = 'Adelphi' THEN UPDATE SET address = s.address",
-                1);
-        assertQuery("SELECT customer, purchases, address FROM " + targetTable, "VALUES ('Aaron', 5, 'Adelphi'), ('Bill', 7, 'Antioch')");
-        assertUpdate("DROP TABLE " + sourceTable);
-        assertUpdate("DROP TABLE " + targetTable);
-    }
-
-    @DataProvider
-    public Object[][] targetWithDifferentPartitioning()
-    {
-        return new Object[][] {
-                {"CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')"},
-                {"CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer'])"},
-                {"CREATE TABLE %s (customer VARCHAR, address VARCHAR, purchases INT) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])"},
-                {"CREATE TABLE %s (purchases INT, customer VARCHAR, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address', 'customer'])"},
-                {"CREATE TABLE %s (purchases INT, address VARCHAR, customer VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address', 'customer'])"}
-        };
-    }
-
-    @Test(dataProvider = "targetAndSourceWithDifferentPartitioning")
-    public void testMergeWithDifferentPartitioning(String testDescription, String createTargetTableSql, String createSourceTableSql)
-    {
-        String targetTable = format("%s_target_%s", testDescription, randomNameSuffix());
-        String sourceTable = format("%s_source_%s", testDescription, randomNameSuffix());
-
-        assertUpdate(format(createTargetTableSql, targetTable, bucketName, targetTable));
-
-        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Buena'), ('Carol', 3, 'Cambridge'), ('Dave', 11, 'Devon')", targetTable), 4);
-
-        assertUpdate(format(createSourceTableSql, sourceTable, bucketName, sourceTable));
-
-        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 6, 'Arches'), ('Ed', 7, 'Etherville'), ('Carol', 9, 'Centreville'), ('Dave', 11, 'Darbyshire')", sourceTable), 4);
-
-        @Language("SQL") String sql = format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) +
-                "    WHEN MATCHED AND s.address = 'Centreville' THEN DELETE" +
-                "    WHEN MATCHED THEN UPDATE SET purchases = s.purchases + t.purchases, address = s.address" +
-                "    WHEN NOT MATCHED THEN INSERT (customer, purchases, address) VALUES(s.customer, s.purchases, s.address)";
-        assertUpdate(sql, 4);
-
-        assertQuery("SELECT * FROM " + targetTable, "VALUES ('Aaron', 11, 'Arches'), ('Bill', 7, 'Buena'), ('Dave', 22, 'Darbyshire'), ('Ed', 7, 'Etherville')");
-
-        assertUpdate("DROP TABLE " + sourceTable);
-        assertUpdate("DROP TABLE " + targetTable);
-    }
-
-    @DataProvider
-    public Object[][] targetAndSourceWithDifferentPartitioning()
-    {
-        return new Object[][] {
-                {
-                        "target_partitioned_source_and_target_partitioned",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address', 'customer'])",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
-                },
-                {
-                        "target_partitioned_source_and_target_partitioned",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer', 'address'])",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
-                },
-                {
-                        "target_flat_source_partitioned_by_customer",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')",
-                        "CREATE TABLE %s (purchases INT, address VARCHAR, customer VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer'])"
-                },
-                {
-                        "target_partitioned_by_customer_source_flat",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')",
-                },
-                {
-                        "target_bucketed_by_customer_source_flat",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer', 'address'])",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')",
-                },
-                {
-                        "target_partitioned_source_partitioned",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer'])",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
-                },
-                {
-                        "target_partitioned_target_partitioned",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer'])",
-                }
-        };
-    }
-
-    @Test
-    public void testTableWithNonNullableColumns()
-    {
-        String tableName = "test_table_with_non_nullable_columns_" + randomNameSuffix();
-        assertUpdate("CREATE TABLE " + tableName + "(col1 INTEGER NOT NULL, col2 INTEGER, col3 INTEGER)");
-        assertUpdate("INSERT INTO " + tableName + " VALUES(1, 10, 100)", 1);
-        assertUpdate("INSERT INTO " + tableName + " VALUES(2, 20, 200)", 1);
-        assertThatThrownBy(() -> query("INSERT INTO " + tableName + " VALUES(null, 30, 300)"))
-                .hasMessageContaining("NULL value not allowed for NOT NULL column: col1");
-        assertThatThrownBy(() -> query("INSERT INTO " + tableName + " VALUES(TRY(5/0), 40, 400)"))
-                .hasMessageContaining("NULL value not allowed for NOT NULL column: col1");
-
-        assertThatThrownBy(() -> query("UPDATE " + tableName + " SET col1 = NULL where col3 = 100"))
-                .hasMessageContaining("NULL value not allowed for NOT NULL column: col1");
-        assertThatThrownBy(() -> query("UPDATE " + tableName + " SET col1 = TRY(5/0) where col3 = 200"))
-                .hasMessageContaining("NULL value not allowed for NOT NULL column: col1");
-
-        assertQuery("SELECT * FROM " + tableName, "VALUES(1, 10, 100), (2, 20, 200)");
-    }
-
-    @Test
-    public void testThatEnableCdfTablePropertyIsShownForCtasTables()
-    {
-        String tableName = "test_show_create_show_property_for_table_created_with_ctas_" + randomNameSuffix();
-        assertUpdate("CREATE TABLE " + tableName + "(page_url, views)" +
-                "WITH (change_data_feed_enabled = true) " +
-                "AS VALUES ('url1', 1), ('url2', 2)", 2);
-        assertThat((String) computeScalar("SHOW CREATE TABLE " + tableName))
-                .contains("change_data_feed_enabled = true");
-    }
-
-    @Test
-    public void testAlterTableWithUnsupportedProperties()
-    {
-        String tableName = "test_alter_table_with_unsupported_properties_" + randomNameSuffix();
-
-        assertUpdate("CREATE TABLE " + tableName + " (a_number INT)");
-
-        assertQueryFails("ALTER TABLE " + tableName + " SET PROPERTIES change_data_feed_enabled = true, checkpoint_interval = 10",
-                "The following properties cannot be updated: checkpoint_interval");
-        assertQueryFails("ALTER TABLE " + tableName + " SET PROPERTIES partitioned_by = ARRAY['a']",
-                "The following properties cannot be updated: partitioned_by");
-
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
-    @Test
-    public void testSettingChangeDataFeedEnabledProperty()
-    {
-        String tableName = "test_enable_and_disable_cdf_" + randomNameSuffix();
-        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, domain VARCHAR, views INTEGER)");
-
-        assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES change_data_feed_enabled = false");
-        assertThat((String) computeScalar("SHOW CREATE TABLE " + tableName))
-                .contains("change_data_feed_enabled = false");
-
-        assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES change_data_feed_enabled = true");
-        assertThat((String) computeScalar("SHOW CREATE TABLE " + tableName)).contains("change_data_feed_enabled = true");
-
-        assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES change_data_feed_enabled = false");
-        assertThat((String) computeScalar("SHOW CREATE TABLE " + tableName)).contains("change_data_feed_enabled = false");
-
-        assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES change_data_feed_enabled = true");
-        assertThat((String) computeScalar("SHOW CREATE TABLE " + tableName))
-                .contains("change_data_feed_enabled = true");
-    }
-
-    @Override
-    protected void verifyAddNotNullColumnToNonEmptyTableFailurePermissible(Throwable e)
-    {
-        assertThat(e).hasMessageMatching("Unable to add NOT NULL column '.*' for non-empty table: .*");
-    }
-
-    @Override
-    protected String createSchemaSql(String schemaName)
-    {
-        return "CREATE SCHEMA " + schemaName + " WITH (location = 's3://" + bucketName + "/" + schemaName + "')";
-    }
-
-    @Override
-    protected OptionalInt maxSchemaNameLength()
-    {
-        return OptionalInt.of(128);
-    }
-
-    @Override
-    protected void verifySchemaNameLengthFailurePermissible(Throwable e)
-    {
-        assertThat(e).hasMessageMatching("(?s)(.*Read timed out)|(.*\"`NAME`\" that has maximum length of 128.*)");
-    }
-
-    @Override
-    protected OptionalInt maxTableNameLength()
-    {
-        return OptionalInt.of(128);
-    }
-
-    @Override
-    protected void verifyTableNameLengthFailurePermissible(Throwable e)
-    {
-        assertThat(e).hasMessageMatching("(?s)(.*Read timed out)|(.*\"`TBL_NAME`\" that has maximum length of 128.*)");
-    }
-
-    private Set<String> getActiveFiles(String tableName)
-    {
-        return getActiveFiles(tableName, getQueryRunner().getDefaultSession());
-    }
-
-    private Set<String> getActiveFiles(String tableName, Session session)
-    {
-        return computeActual(session, "SELECT DISTINCT \"$path\" FROM " + tableName).getOnlyColumnAsSet().stream()
-                .map(String.class::cast)
-                .collect(toImmutableSet());
-    }
-
-    private Set<String> getAllDataFilesFromTableDirectory(String tableName)
-    {
-        return getTableFiles(tableName).stream()
-                .filter(path -> !path.contains("/" + TRANSACTION_LOG_DIRECTORY))
-                .collect(toImmutableSet());
-    }
-
-    private List<String> getTableFiles(String tableName)
-    {
-        return hiveMinioDataLake.listFiles(format("%s/%s", SCHEMA, tableName)).stream()
-                .map(path -> format("s3://%s/%s", bucketName, path))
-                .collect(toImmutableList());
-    }
-}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeRegisterTableProcedureTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeRegisterTableProcedureTest.java
index 82d3d0ed19fd..94cbf68ea9cd 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeRegisterTableProcedureTest.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeRegisterTableProcedureTest.java
@@ -20,8 +20,9 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.io.IOException;
@@ -44,8 +45,10 @@
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertFalse;
 
+@TestInstance(PER_CLASS)
 public abstract class BaseDeltaLakeRegisterTableProcedureTest
         extends AbstractTestQueryFramework
 {
@@ -83,7 +86,7 @@ protected QueryRunner createQueryRunner()
 
     protected abstract HiveMetastore createTestMetastore(Path dataDirectory);
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws IOException
     {
@@ -226,14 +229,14 @@ public void testRegisterTableWithInvalidDeltaTable()
         String tableNameNew = "test_register_table_with_no_transaction_log_new_" + randomNameSuffix();
 
         // Delete files under transaction log directory and put an invalid log file to verify register_table call fails
-        String transactionLogDir = new URI(getTransactionLogDir(tableLocation)).getPath();
+        String transactionLogDir = URI.create(getTransactionLogDir(tableLocation)).getPath();
         deleteDirectoryContents(Path.of(transactionLogDir), ALLOW_INSECURE);
-        new File(getTransactionLogJsonEntryPath(transactionLogDir, 0)).createNewFile();
+        new File("/" + getTransactionLogJsonEntryPath(transactionLogDir, 0).path()).createNewFile();
 
         assertQueryFails(format("CALL system.register_table('%s', '%s', '%s')", SCHEMA, tableNameNew, tableLocation),
-                ".*Failed to access table location: (.*)");
+                ".*Metadata not found in transaction log for (.*)");
 
-        deleteRecursively(Path.of(new URI(tableLocation).getPath()), ALLOW_INSECURE);
+        deleteRecursively(Path.of(URI.create(tableLocation).getPath()), ALLOW_INSECURE);
         metastore.dropTable(SCHEMA, tableName, false);
     }
 
@@ -250,12 +253,12 @@ public void testRegisterTableWithNoTransactionLog()
         String tableNameNew = "test_register_table_with_no_transaction_log_new_" + randomNameSuffix();
 
         // Delete files under transaction log directory to verify register_table call fails
-        deleteDirectoryContents(Path.of(new URI(getTransactionLogDir(tableLocation)).getPath()), ALLOW_INSECURE);
+        deleteDirectoryContents(Path.of(URI.create(getTransactionLogDir(tableLocation)).getPath()), ALLOW_INSECURE);
 
         assertQueryFails(format("CALL system.register_table('%s', '%s', '%s')", SCHEMA, tableNameNew, tableLocation),
                 ".*No transaction log found in location (.*)");
 
-        deleteRecursively(Path.of(new URI(tableLocation).getPath()), ALLOW_INSECURE);
+        deleteRecursively(Path.of(URI.create(tableLocation).getPath()), ALLOW_INSECURE);
         metastore.dropTable(SCHEMA, tableName, false);
     }
 
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java
index 0735f42b9581..a6802850b378 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java
@@ -21,8 +21,9 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -34,10 +35,12 @@
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 /**
  * Tests querying views on a schema which has a mix of Hive and Delta Lake tables.
  */
+@TestInstance(PER_CLASS)
 public abstract class BaseDeltaLakeSharedMetastoreViewsTest
         extends AbstractTestQueryFramework
 {
@@ -154,7 +157,7 @@ public void testViewOnHiveTableCreatedInHiveIsReadableInDeltaLake()
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
             throws IOException
     {
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreWithTableRedirectionsTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreWithTableRedirectionsTest.java
index 8cebf9cf14f1..69545aa2a536 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreWithTableRedirectionsTest.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreWithTableRedirectionsTest.java
@@ -14,12 +14,15 @@
 package io.trino.plugin.deltalake;
 
 import io.trino.testing.AbstractTestQueryFramework;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public abstract class BaseDeltaLakeSharedMetastoreWithTableRedirectionsTest
         extends AbstractTestQueryFramework
 {
@@ -90,4 +93,11 @@ public void testShowSchemas()
                 showCreateDeltaLakeWithRedirectionsSchema,
                 getExpectedDeltaLakeCreateSchema("delta_with_redirections"));
     }
+
+    @Test
+    public void testPropertiesTable()
+    {
+        assertThat(query("SELECT * FROM delta_with_redirections." + schema + ".\"delta_table$properties\""))
+                .matches("SELECT * FROM hive_with_redirections." + schema + ".\"delta_table$properties\"");
+    }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeTableWithCustomLocation.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeTableWithCustomLocation.java
index ddf2ab7e80ad..025decd4a7bd 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeTableWithCustomLocation.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeTableWithCustomLocation.java
@@ -13,12 +13,13 @@
  */
 package io.trino.plugin.deltalake;
 
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.MaterializedRow;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -62,12 +63,12 @@ public void testCreateAndDrop()
         Table table = metastore.getTable(SCHEMA, tableName).orElseThrow();
         assertThat(table.getTableType()).isEqualTo(MANAGED_TABLE.name());
 
-        String tableLocation = table.getStorage().getLocation();
+        Location tableLocation = Location.of(table.getStorage().getLocation());
         TrinoFileSystem fileSystem = HDFS_FILE_SYSTEM_FACTORY.create(getSession().toConnectorSession());
         assertTrue(fileSystem.listFiles(tableLocation).hasNext(), "The directory corresponding to the table storage location should exist");
         List<MaterializedRow> materializedRows = computeActual("SELECT \"$path\" FROM " + tableName).getMaterializedRows();
         assertEquals(materializedRows.size(), 1);
-        String filePath = (String) materializedRows.get(0).getField(0);
+        Location filePath = Location.of((String) materializedRows.get(0).getField(0));
         assertTrue(fileSystem.listFiles(filePath).hasNext(), "The data file should exist");
         assertQuerySucceeds(format("DROP TABLE %s", tableName));
         assertFalse(metastore.getTable(SCHEMA, tableName).isPresent(), "Table should be dropped");
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java
index 6b777c759a74..a0a832626cab 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java
@@ -25,6 +25,7 @@
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
 
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
@@ -37,6 +38,7 @@
 import static io.trino.testing.QueryAssertions.copyTpchTables;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
+import static io.trino.testing.containers.Minio.MINIO_REGION;
 import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
@@ -45,7 +47,7 @@
 public final class DeltaLakeQueryRunner
 {
     private static final Logger log = Logger.get(DeltaLakeQueryRunner.class);
-    public static final String DELTA_CATALOG = "delta_lake";
+    public static final String DELTA_CATALOG = "delta";
     public static final String TPCH_SCHEMA = "tpch";
 
     private DeltaLakeQueryRunner() {}
@@ -104,14 +106,7 @@ public DistributedQueryRunner build()
                 queryRunner.createCatalog("tpcds", "tpcds");
 
                 queryRunner.installPlugin(new TestingDeltaLakePlugin());
-                Map<String, String> deltaProperties = new HashMap<>(this.deltaProperties.buildOrThrow());
-                if (!deltaProperties.containsKey("hive.metastore") && !deltaProperties.containsKey("hive.metastore.uri")) {
-                    Path dataDir = queryRunner.getCoordinator().getBaseDataDir().resolve(DELTA_CATALOG);
-                    deltaProperties.put("hive.metastore", "file");
-                    deltaProperties.put("hive.metastore.catalog.dir", dataDir.toUri().toString());
-                }
-
-                queryRunner.createCatalog(catalogName, CONNECTOR_NAME, deltaProperties);
+                queryRunner.createCatalog(catalogName, CONNECTOR_NAME, deltaProperties.buildOrThrow());
 
                 return queryRunner;
             }
@@ -122,19 +117,21 @@ public DistributedQueryRunner build()
         }
     }
 
-    public static DistributedQueryRunner createDeltaLakeQueryRunner(String catalogName)
-            throws Exception
-    {
-        return createDeltaLakeQueryRunner(catalogName, ImmutableMap.of(), ImmutableMap.of());
-    }
-
     public static DistributedQueryRunner createDeltaLakeQueryRunner(String catalogName, Map<String, String> extraProperties, Map<String, String> connectorProperties)
             throws Exception
     {
+        Map<String, String> deltaProperties = new HashMap<>(connectorProperties);
+        if (!deltaProperties.containsKey("hive.metastore") && !deltaProperties.containsKey("hive.metastore.uri")) {
+            Path metastoreDirectory = Files.createTempDirectory(catalogName);
+            metastoreDirectory.toFile().deleteOnExit();
+            deltaProperties.put("hive.metastore", "file");
+            deltaProperties.put("hive.metastore.catalog.dir", metastoreDirectory.toUri().toString());
+        }
+
         DistributedQueryRunner queryRunner = builder(createSession())
                 .setCatalogName(catalogName)
                 .setExtraProperties(extraProperties)
-                .setDeltaProperties(connectorProperties)
+                .setDeltaProperties(deltaProperties)
                 .build();
 
         queryRunner.execute("CREATE SCHEMA IF NOT EXISTS tpch");
@@ -165,11 +162,15 @@ public static DistributedQueryRunner createS3DeltaLakeQueryRunner(
                 coordinatorProperties,
                 extraProperties,
                 ImmutableMap.<String, String>builder()
-                        .put("hive.s3.aws-access-key", MINIO_ACCESS_KEY)
-                        .put("hive.s3.aws-secret-key", MINIO_SECRET_KEY)
-                        .put("hive.s3.endpoint", minioAddress)
-                        .put("hive.s3.path-style-access", "true")
-                        .put("hive.metastore-timeout", "1m") // read timed out sometimes happens with the default timeout
+                        .put("fs.hadoop.enabled", "false")
+                        .put("fs.native-s3.enabled", "true")
+                        .put("s3.aws-access-key", MINIO_ACCESS_KEY)
+                        .put("s3.aws-secret-key", MINIO_SECRET_KEY)
+                        .put("s3.region", MINIO_REGION)
+                        .put("s3.endpoint", minioAddress)
+                        .put("s3.path-style-access", "true")
+                        .put("s3.streaming.part-size", "5MB") // minimize memory usage
+                        .put("hive.metastore.thrift.client.read-timeout", "1m") // read timed out sometimes happens with the default timeout
                         .putAll(connectorProperties)
                         .buildOrThrow(),
                 testingHadoop,
@@ -213,21 +214,19 @@ public static DistributedQueryRunner createDockerizedDeltaLakeQueryRunner(
                 .setSchema(schemaName)
                 .build();
 
-        Builder builder = builder(session);
-        extraProperties.forEach(builder::addExtraProperty);
-        coordinatorProperties.forEach(builder::setSingleCoordinatorProperty);
-        return builder
+        return builder(session)
                 .setCatalogName(catalogName)
                 .setAdditionalSetup(additionalSetup)
+                .setCoordinatorProperties(coordinatorProperties)
+                .addExtraProperties(extraProperties)
                 .setDeltaProperties(ImmutableMap.<String, String>builder()
                         .put("hive.metastore.uri", "thrift://" + hiveHadoop.getHiveMetastoreEndpoint())
-                        .put("hive.s3.streaming.part-size", "5MB") //must be at least 5MB according to annotations on io.trino.plugin.hive.s3.HiveS3Config.getS3StreamingPartSize
                         .putAll(connectorProperties)
                         .buildOrThrow())
                 .build();
     }
 
-    private static String requiredNonEmptySystemProperty(String propertyName)
+    public static String requiredNonEmptySystemProperty(String propertyName)
     {
         String val = System.getProperty(propertyName);
         checkArgument(!isNullOrEmpty(val), format("System property %s must be non-empty", propertyName));
@@ -247,14 +246,18 @@ public static class DefaultDeltaLakeQueryRunnerMain
         public static void main(String[] args)
                 throws Exception
         {
+            Path metastoreDirectory = Files.createTempDirectory(DELTA_CATALOG);
+            metastoreDirectory.toFile().deleteOnExit();
             DistributedQueryRunner queryRunner = createDeltaLakeQueryRunner(
                     DELTA_CATALOG,
                     ImmutableMap.of("http-server.http.port", "8080"),
-                    ImmutableMap.of("delta.enable-non-concurrent-writes", "true"));
+                    ImmutableMap.of(
+                            "delta.enable-non-concurrent-writes", "true",
+                            "hive.metastore", "file",
+                            "hive.metastore.catalog.dir", metastoreDirectory.toUri().toString()));
 
-            Path baseDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve(DELTA_CATALOG);
             copyTpchTables(queryRunner, "tpch", TINY_SCHEMA_NAME, createSession(), TpchTable.getTables());
-            log.info("Data directory is: %s", baseDirectory);
+            log.info("Data directory is: %s", metastoreDirectory);
 
             Thread.sleep(10);
             Logger log = Logger.get(DeltaLakeQueryRunner.class);
@@ -263,19 +266,18 @@ public static void main(String[] args)
         }
     }
 
-    public static class DeltaLakeGlueQueryRunnerMain
+    public static class DeltaLakeExternalQueryRunnerMain
     {
         public static void main(String[] args)
                 throws Exception
         {
-            // Requires AWS credentials, which can be provided any way supported by the DefaultProviderChain
-            // See https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html#credentials-default
-            DistributedQueryRunner queryRunner = createDeltaLakeQueryRunner(
-                    DELTA_CATALOG,
-                    ImmutableMap.of("http-server.http.port", "8080"),
-                    ImmutableMap.of("hive.metastore", "glue"));
+            // Please set Delta Lake connector properties via VM options. e.g. -Dhive.metastore=glue -D..
+            DistributedQueryRunner queryRunner = builder()
+                    .setCatalogName(DELTA_CATALOG)
+                    .setExtraProperties(ImmutableMap.of("http-server.http.port", "8080"))
+                    .build();
 
-            Logger log = Logger.get(DeltaLakeGlueQueryRunnerMain.class);
+            Logger log = Logger.get(DeltaLakeExternalQueryRunnerMain.class);
             log.info("======== SERVER STARTED ========");
             log.info("\n====\n%s\n====", queryRunner.getCoordinator().getBaseUrl());
         }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/FileTestingTransactionLogSynchronizer.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/FileTestingTransactionLogSynchronizer.java
index cbcf835f7e70..1b2677996ab5 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/FileTestingTransactionLogSynchronizer.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/FileTestingTransactionLogSynchronizer.java
@@ -13,21 +13,31 @@
  */
 package io.trino.plugin.deltalake;
 
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoOutputFile;
 import io.trino.plugin.deltalake.transactionlog.writer.TransactionLogSynchronizer;
 import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UncheckedIOException;
 
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+import static java.util.Objects.requireNonNull;
 
 public class FileTestingTransactionLogSynchronizer
         implements TransactionLogSynchronizer
 {
+    private final TrinoFileSystemFactory fileSystemFactory;
+
+    @Inject
+    public FileTestingTransactionLogSynchronizer(TrinoFileSystemFactory fileSystemFactory)
+    {
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
+    }
+
     @Override
     public boolean isUnsafe()
     {
@@ -35,11 +45,11 @@ public boolean isUnsafe()
     }
 
     @Override
-    public void write(ConnectorSession session, String clusterId, Path newLogEntryPath, byte[] entryContents)
+    public void write(ConnectorSession session, String clusterId, Location newLogEntryPath, byte[] entryContents)
     {
         try {
-            TrinoFileSystem fileSystem = HDFS_FILE_SYSTEM_FACTORY.create(session);
-            TrinoOutputFile outputFile = fileSystem.newOutputFile(newLogEntryPath.toString());
+            TrinoFileSystem fileSystem = fileSystemFactory.create(session);
+            TrinoOutputFile outputFile = fileSystem.newOutputFile(newLogEntryPath);
             try (OutputStream outputStream = outputFile.createOrOverwrite()) {
                 outputStream.write(entryContents);
             }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/ResourceTable.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/ResourceTable.java
new file mode 100644
index 000000000000..960c27fe85e6
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/ResourceTable.java
@@ -0,0 +1,16 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+public record ResourceTable(String tableName, String resourcePath) {}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestCdfWithNumberOfSplitsGreaterThanMaxBatchSizeInSplitSource.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestCdfWithNumberOfSplitsGreaterThanMaxBatchSizeInSplitSource.java
new file mode 100644
index 000000000000..b1dd2d8bcd7d
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestCdfWithNumberOfSplitsGreaterThanMaxBatchSizeInSplitSource.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.QueryRunner;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createDeltaLakeQueryRunner;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestCdfWithNumberOfSplitsGreaterThanMaxBatchSizeInSplitSource
+        extends AbstractTestQueryFramework
+{
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        return createDeltaLakeQueryRunner(DELTA_CATALOG, ImmutableMap.of(
+                        "query.schedule-split-batch-size", "1",
+                        "node-scheduler.max-splits-per-node", "1",
+                        "node-scheduler.min-pending-splits-per-task", "1"),
+                ImmutableMap.of("delta.enable-non-concurrent-writes", "true"));
+    }
+
+    @Test
+    public void testReadCdfChanges()
+    {
+        String tableName = "test_basic_operations_on_table_with_cdf_enabled_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, domain VARCHAR, views INTEGER) WITH (change_data_feed_enabled = true)");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url1', 'domain1', 1), ('url2', 'domain2', 2), ('url3', 'domain3', 3)", 3);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url4', 'domain4', 4), ('url5', 'domain5', 2), ('url6', 'domain6', 6)", 3);
+
+        assertUpdate("UPDATE " + tableName + " SET page_url = 'url22' WHERE views = 2", 2);
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('tpch', '" + tableName + "'))",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, 'insert', BIGINT '1'),
+                            ('url2', 'domain2', 2, 'insert', BIGINT '1'),
+                            ('url3', 'domain3', 3, 'insert', BIGINT '1'),
+                            ('url4', 'domain4', 4, 'insert', BIGINT '2'),
+                            ('url5', 'domain5', 2, 'insert', BIGINT '2'),
+                            ('url6', 'domain6', 6, 'insert', BIGINT '2'),
+                            ('url2', 'domain2', 2, 'update_preimage', BIGINT '3'),
+                            ('url22', 'domain2', 2, 'update_postimage', BIGINT '3'),
+                            ('url5', 'domain5', 2, 'update_preimage', BIGINT '3'),
+                            ('url22', 'domain5', 2, 'update_postimage', BIGINT '3')
+                        """);
+
+        assertUpdate("DELETE FROM " + tableName + " WHERE views = 2", 2);
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('tpch', '" + tableName + "', 3))",
+                """
+                        VALUES
+                            ('url22', 'domain2', 2, 'delete', BIGINT '4'),
+                            ('url22', 'domain5', 2, 'delete', BIGINT '4')
+                        """);
+
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('tpch', '" + tableName + "')) ORDER BY _commit_version, _change_type, domain",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, 'insert', BIGINT '1'),
+                            ('url2', 'domain2', 2, 'insert', BIGINT '1'),
+                            ('url3', 'domain3', 3, 'insert', BIGINT '1'),
+                            ('url4', 'domain4', 4, 'insert', BIGINT '2'),
+                            ('url5', 'domain5', 2, 'insert', BIGINT '2'),
+                            ('url6', 'domain6', 6, 'insert', BIGINT '2'),
+                            ('url22', 'domain2', 2, 'update_postimage', BIGINT '3'),
+                            ('url22', 'domain5', 2, 'update_postimage', BIGINT '3'),
+                            ('url2', 'domain2', 2, 'update_preimage', BIGINT '3'),
+                            ('url5', 'domain5', 2, 'update_preimage', BIGINT '3'),
+                            ('url22', 'domain2', 2, 'delete', BIGINT '4'),
+                            ('url22', 'domain5', 2, 'delete', BIGINT '4')
+                        """);
+    }
+
+    private void assertTableChangesQuery(@Language("SQL") String sql, @Language("SQL") String expectedResult)
+    {
+        assertThat(query(sql))
+                .exceptColumns("_commit_timestamp")
+                .skippingTypesCheck()
+                .matches(expectedResult);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsConnectorSmokeTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsConnectorSmokeTest.java
index 891aadd0e95e..af5126549cf5 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsConnectorSmokeTest.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsConnectorSmokeTest.java
@@ -23,10 +23,9 @@
 import com.google.common.io.Resources;
 import com.google.common.reflect.ClassPath;
 import io.trino.plugin.hive.containers.HiveHadoop;
-import io.trino.plugin.hive.containers.HiveMinioDataLake;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Parameters;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -43,14 +42,17 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
-import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createAbfsDeltaLakeQueryRunner;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.requiredNonEmptySystemProperty;
+import static io.trino.plugin.hive.containers.HiveHadoop.HIVE3_IMAGE;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
 import static java.util.regex.Matcher.quoteReplacement;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.testcontainers.containers.Network.newNetwork;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeAdlsConnectorSmokeTest
         extends BaseDeltaLakeConnectorSmokeTest
 {
@@ -60,15 +62,11 @@ public class TestDeltaLakeAdlsConnectorSmokeTest
     private final BlobContainerClient azureContainerClient;
     private final String adlsDirectory;
 
-    @Parameters({
-            "hive.hadoop2.azure-abfs-container",
-            "hive.hadoop2.azure-abfs-account",
-            "hive.hadoop2.azure-abfs-access-key"})
-    public TestDeltaLakeAdlsConnectorSmokeTest(String container, String account, String accessKey)
+    public TestDeltaLakeAdlsConnectorSmokeTest()
     {
-        this.container = requireNonNull(container, "container is null");
-        this.account = requireNonNull(account, "account is null");
-        this.accessKey = requireNonNull(accessKey, "accessKey is null");
+        this.container = requireNonNull(System.getProperty("hive.hadoop2.azure-abfs-container"), "container is null");
+        this.account = requireNonNull(System.getProperty("hive.hadoop2.azure-abfs-account"), "account is null");
+        this.accessKey = requireNonNull(System.getProperty("hive.hadoop2.azure-abfs-access-key"), "accessKey is null");
 
         String connectionString = format("DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s;EndpointSuffix=core.windows.net", account, accessKey);
         BlobServiceClient blobServiceClient = new BlobServiceClientBuilder().connectionString(connectionString).buildClient();
@@ -77,7 +75,7 @@ public TestDeltaLakeAdlsConnectorSmokeTest(String container, String account, Str
     }
 
     @Override
-    protected HiveMinioDataLake createHiveMinioDataLake()
+    protected HiveHadoop createHiveHadoop()
             throws Exception
     {
         String abfsSpecificCoreSiteXmlContent = Resources.toString(Resources.getResource("io/trino/plugin/deltalake/hdp3.1-core-site.xml.abfs-template"), UTF_8)
@@ -89,26 +87,35 @@ protected HiveMinioDataLake createHiveMinioDataLake()
         hadoopCoreSiteXmlTempFile.toFile().deleteOnExit();
         Files.writeString(hadoopCoreSiteXmlTempFile, abfsSpecificCoreSiteXmlContent);
 
-        HiveMinioDataLake hiveMinioDataLake = new HiveMinioDataLake(
-                bucketName,
-                ImmutableMap.of("/etc/hadoop/conf/core-site.xml", hadoopCoreSiteXmlTempFile.normalize().toAbsolutePath().toString()),
-                HiveHadoop.HIVE3_IMAGE);
-        hiveMinioDataLake.start();
-        return hiveMinioDataLake;
+        HiveHadoop hiveHadoop = HiveHadoop.builder()
+                .withImage(HIVE3_IMAGE)
+                .withNetwork(closeAfterClass(newNetwork()))
+                .withFilesToMount(ImmutableMap.of("/etc/hadoop/conf/core-site.xml", hadoopCoreSiteXmlTempFile.normalize().toAbsolutePath().toString()))
+                .build();
+        hiveHadoop.start();
+        return hiveHadoop; // closed by superclass
     }
 
     @Override
-    protected QueryRunner createDeltaLakeQueryRunner(Map<String, String> connectorProperties)
-            throws Exception
+    protected Map<String, String> hiveStorageConfiguration()
+    {
+        return ImmutableMap.<String, String>builder()
+                .put("hive.azure.abfs-storage-account", requiredNonEmptySystemProperty("hive.hadoop2.azure-abfs-account"))
+                .put("hive.azure.abfs-access-key", requiredNonEmptySystemProperty("hive.hadoop2.azure-abfs-access-key"))
+                .buildOrThrow();
+    }
+
+    @Override
+    protected Map<String, String> deltaStorageConfiguration()
     {
-        return createAbfsDeltaLakeQueryRunner(DELTA_CATALOG, SCHEMA, ImmutableMap.of(), connectorProperties, hiveMinioDataLake.getHiveHadoop());
+        return hiveStorageConfiguration();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void removeTestData()
     {
         if (adlsDirectory != null) {
-            hiveMinioDataLake.getHiveHadoop().executeInContainerFailOnError("hadoop", "fs", "-rm", "-f", "-r", adlsDirectory);
+            hiveHadoop.executeInContainerFailOnError("hadoop", "fs", "-rm", "-f", "-r", adlsDirectory);
         }
         assertThat(azureContainerClient.listBlobsByHierarchy(bucketName + "/").stream()).hasSize(0);
     }
@@ -150,10 +157,9 @@ protected List<String> getTableFiles(String tableName)
     }
 
     @Override
-    protected List<String> listCheckpointFiles(String transactionLogDirectory)
+    protected List<String> listFiles(String directory)
     {
-        return listAllFilesRecursive(transactionLogDirectory).stream()
-                .filter(path -> path.contains("checkpoint.parquet"))
+        return listAllFilesRecursive(directory).stream()
                 .collect(toImmutableList());
     }
 
@@ -175,6 +181,14 @@ private List<String> listAllFilesRecursive(String directory)
                 .collect(toImmutableList());
     }
 
+    @Override
+    protected void deleteFile(String filePath)
+    {
+        String blobName = bucketName + "/" + filePath.substring(bucketUrl().length());
+        azureContainerClient.getBlobClient(blobName)
+                .delete();
+    }
+
     @Override
     protected String bucketUrl()
     {
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsStorage.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsStorage.java
index 9e5fb94216cb..066260afe557 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsStorage.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsStorage.java
@@ -19,11 +19,11 @@
 import io.trino.plugin.hive.containers.HiveHadoop;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.testcontainers.containers.Network;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -43,7 +43,9 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
 import static java.util.UUID.randomUUID;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeAdlsStorage
         extends AbstractTestQueryFramework
 {
@@ -58,15 +60,12 @@ public class TestDeltaLakeAdlsStorage
 
     private HiveHadoop hiveHadoop;
 
-    @Parameters({
-            "hive.hadoop2.azure-abfs-container",
-            "hive.hadoop2.azure-abfs-account",
-            "hive.hadoop2.azure-abfs-access-key"})
-    public TestDeltaLakeAdlsStorage(String container, String account, String accessKey)
+    public TestDeltaLakeAdlsStorage()
     {
+        String container = System.getProperty("hive.hadoop2.azure-abfs-container");
         requireNonNull(container, "container is null");
-        this.account = requireNonNull(account, "account is null");
-        this.accessKey = requireNonNull(accessKey, "accessKey is null");
+        this.account = requireNonNull(System.getProperty("hive.hadoop2.azure-abfs-account"), "account is null");
+        this.accessKey = requireNonNull(System.getProperty("hive.hadoop2.azure-abfs-access-key"), "accessKey is null");
 
         String directoryBase = format("abfs://%s@%s.dfs.core.windows.net", container, account);
         adlsDirectory = format("%s/tpch-tiny-%s/", directoryBase, randomUUID());
@@ -81,7 +80,7 @@ protected QueryRunner createQueryRunner()
                 .withNetwork(Network.newNetwork())
                 .withImage(HADOOP_BASE_IMAGE)
                 .withFilesToMount(ImmutableMap.of(
-                        "/tmp/tpch-tiny", getPathFromClassPathResource("io/trino/plugin/deltalake/testing/resources/databricks"),
+                        "/tmp/tpch-tiny", getPathFromClassPathResource("io/trino/plugin/deltalake/testing/resources/databricks73"),
                         "/etc/hadoop/conf/core-site.xml", hadoopCoreSiteXmlTempFile.toString()))
                 .build());
         hiveHadoop.start();
@@ -108,7 +107,7 @@ private Path createHadoopCoreSiteXmlTempFileWithAbfsSettings()
         return coreSiteXml;
     }
 
-    @BeforeClass(alwaysRun = true)
+    @BeforeAll
     public void setUp()
     {
         hiveHadoop.executeInContainerFailOnError("hadoop", "fs", "-mkdir", "-p", adlsDirectory);
@@ -118,7 +117,7 @@ public void setUp()
         });
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (adlsDirectory != null && hiveHadoop != null) {
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAnalyze.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAnalyze.java
index ae9541faee47..19fcdd41f38f 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAnalyze.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAnalyze.java
@@ -15,30 +15,53 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
+import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeFileStatistics;
 import io.trino.testing.AbstractTestQueryFramework;
-import io.trino.testing.DataProviders;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.TestTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
+import java.util.List;
 import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+import static com.google.common.base.Verify.verify;
+import static com.google.common.io.MoreFiles.deleteRecursively;
+import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.TPCH_SCHEMA;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createDeltaLakeQueryRunner;
 import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.EXTENDED_STATISTICS_COLLECT_ON_WRITE;
+import static io.trino.plugin.deltalake.DeltaTestingConnectorSession.SESSION;
+import static io.trino.plugin.deltalake.TestingDeltaLakeUtils.copyDirectoryContents;
+import static io.trino.plugin.deltalake.transactionlog.checkpoint.TransactionLogTail.getEntriesFromJson;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.INSERT_TABLE;
 import static io.trino.testing.TestingAccessControlManager.privilege;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static java.time.ZoneOffset.UTC;
+import static org.assertj.core.api.Assertions.assertThat;
 
 // smoke test which covers ANALYZE compatibility with different filesystems is part of BaseDeltaLakeConnectorSmokeTest
 public class TestDeltaLakeAnalyze
         extends AbstractTestQueryFramework
 {
+    private static final TrinoFileSystem FILE_SYSTEM = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS).create(SESSION);
+
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
@@ -46,7 +69,9 @@ protected QueryRunner createQueryRunner()
         return createDeltaLakeQueryRunner(
                 DELTA_CATALOG,
                 ImmutableMap.of(),
-                ImmutableMap.of("delta.enable-non-concurrent-writes", "true"));
+                ImmutableMap.of(
+                        "delta.enable-non-concurrent-writes", "true",
+                        "delta.register-table-procedure.enabled", "true"));
     }
 
     @Test
@@ -80,14 +105,21 @@ private void testAnalyze(Optional<Integer> checkpointInterval)
         // check that analyze does not change already calculated statistics
         assertUpdate("ANALYZE " + tableName);
 
+        String expectedStats = "VALUES " +
+                "('nationkey', null, 25.0, 0.0, null, 0, 24)," +
+                "('regionkey', null, 5.0, 0.0, null, 0, 4)," +
+                "('comment', 1857.0, 25.0, 0.0, null, null, null)," +
+                "('name', 177.0, 25.0, 0.0, null, null, null)," +
+                "(null, null, null, null, 25.0, null, null)";
         assertQuery(
                 "SHOW STATS FOR " + tableName,
-                "VALUES " +
-                        "('nationkey', null, 25.0, 0.0, null, 0, 24)," +
-                        "('regionkey', null, 5.0, 0.0, null, 0, 4)," +
-                        "('comment', 1857.0, 25.0, 0.0, null, null, null)," +
-                        "('name', 177.0, 25.0, 0.0, null, null, null)," +
-                        "(null, null, null, null, 25.0, null, null)");
+                expectedStats);
+
+        // check that analyze with mode = incremental returns the same result as analyze without mode
+        assertUpdate("ANALYZE " + tableName + " WITH(mode = 'incremental')");
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                expectedStats);
 
         // insert one more copy
         assertUpdate("INSERT INTO " + tableName + " SELECT * FROM tpch.sf1.nation", 25);
@@ -357,20 +389,32 @@ public void testAnalyzeSomeColumns()
                         "('name', null, null, 0.0, null, null, null)," +
                         "(null, null, null, null, 50.0, null, null)");
 
-        // drop stats
-        assertUpdate(format("CALL %s.system.drop_extended_stats('%s', '%s')", DELTA_CATALOG, TPCH_SCHEMA, tableName));
-
-        // now we should be able to analyze all columns
-        assertUpdate(format("ANALYZE %s", tableName));
+        // show that using full_refresh allows us to analyze any subset of columns
+        assertUpdate(format("ANALYZE %s WITH(mode = 'full_refresh', columns = ARRAY['nationkey', 'regionkey', 'name'])", tableName), 50);
         assertQuery(
                 "SHOW STATS FOR " + tableName,
                 "VALUES " +
                         "('nationkey', null, 50.0, 0.0, null, 0, 49)," +
                         "('regionkey', null, 10.0, 0.0, null, 0, 9)," +
-                        "('comment', 3764.0, 50.0, 0.0, null, null, null)," +
+                        "('comment', null, null, 0.0, null, null, null)," +
                         "('name', 379.0, 50.0, 0.0, null, null, null)," +
                         "(null, null, null, null, 50.0, null, null)");
 
+        String expectedFullStats = "VALUES " +
+                "('nationkey', null, 50.0, 0.0, null, 0, 49)," +
+                "('regionkey', null, 10.0, 0.0, null, 0, 9)," +
+                "('comment', 3764.0, 50.0, 0.0, null, null, null)," +
+                "('name', 379.0, 50.0, 0.0, null, null, null)," +
+                "(null, null, null, null, 50.0, null, null)";
+        assertUpdate(format("ANALYZE %s WITH(mode = 'full_refresh')", tableName), 50);
+        assertQuery("SHOW STATS FOR " + tableName, expectedFullStats);
+
+        // drop stats
+        assertUpdate(format("CALL %s.system.drop_extended_stats('%s', '%s')", DELTA_CATALOG, TPCH_SCHEMA, tableName));
+        // now we should be able to analyze all columns
+        assertUpdate(format("ANALYZE %s", tableName), 50);
+        assertQuery("SHOW STATS FOR " + tableName, expectedFullStats);
+
         // we and we should be able to reanalyze with a subset of columns
         assertUpdate(format("ANALYZE %s WITH(columns = ARRAY['nationkey', 'regionkey'])", tableName));
         assertQuery(
@@ -425,7 +469,7 @@ public void testDropExtendedStats()
             assertQuery(query, baseStats);
 
             // Re-analyzing should work
-            assertUpdate("ANALYZE " + table.getName());
+            assertUpdate("ANALYZE " + table.getName(), 25);
             assertQuery(query, extendedStats);
         }
     }
@@ -504,7 +548,7 @@ public void testCreateTableStatisticsWhenCollectionOnWriteDisabled()
                         "('name', null, null, 0.0, null, null, null)," +
                         "(null, null, null, null, 25.0, null, null)");
 
-        assertUpdate("ANALYZE " + tableName);
+        assertUpdate("ANALYZE " + tableName, 25);
 
         assertQuery(
                 "SHOW STATS FOR " + tableName,
@@ -540,7 +584,7 @@ public void testCreatePartitionedTableStatisticsWhenCollectionOnWriteDisabled()
                         "('name', null, null, 0.0, null, null, null)," +
                         "(null, null, null, null, 25.0, null, null)");
 
-        assertUpdate("ANALYZE " + tableName);
+        assertUpdate("ANALYZE " + tableName, 25);
 
         assertQuery(
                 "SHOW STATS FOR " + tableName,
@@ -721,8 +765,14 @@ public void testIncrementalStatisticsUpdateOnInsert()
         assertUpdate("DROP TABLE " + tableName);
     }
 
-    @Test(dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
-    public void testCollectStatsAfterColumnAdded(boolean collectOnWrite)
+    @Test
+    public void testCollectStatsAfterColumnAdded()
+    {
+        testCollectStatsAfterColumnAdded(false);
+        testCollectStatsAfterColumnAdded(true);
+    }
+
+    private void testCollectStatsAfterColumnAdded(boolean collectOnWrite)
     {
         String tableName = "test_collect_stats_after_column_added_" + randomNameSuffix();
         assertUpdate("CREATE TABLE " + tableName + " (col_int_1 bigint, col_varchar_1 varchar)");
@@ -765,6 +815,330 @@ public void testCollectStatsAfterColumnAdded(boolean collectOnWrite)
         assertUpdate("DROP TABLE " + tableName);
     }
 
+    @Test
+    public void testForceRecalculateStatsWithDeleteAndUpdate()
+    {
+        String tableName = "test_recalculate_all_stats_with_delete_and_update_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName
+                + " AS SELECT * FROM tpch.sf1.nation", 25);
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                        "('nationkey', null, 25.0, 0.0, null, 0, 24)," +
+                        "('regionkey', null, 5.0, 0.0, null, 0, 4)," +
+                        "('comment', 1857.0, 25.0, 0.0, null, null, null)," +
+                        "('name', 177.0, 25.0, 0.0, null, null, null)," +
+                        "(null, null, null, null, 25.0, null, null)");
+
+        // check that analyze does not change already calculated statistics
+        assertUpdate("ANALYZE " + tableName);
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                        "('nationkey', null, 25.0, 0.0, null, 0, 24)," +
+                        "('regionkey', null, 5.0, 0.0, null, 0, 4)," +
+                        "('comment', 1857.0, 25.0, 0.0, null, null, null)," +
+                        "('name', 177.0, 25.0, 0.0, null, null, null)," +
+                        "(null, null, null, null, 25.0, null, null)");
+
+        assertUpdate("DELETE FROM " + tableName + " WHERE nationkey = 1", 1);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                        "('nationkey', null, 24.0, 0.0, null, 0, 24)," +
+                        "('regionkey', null, 5.0, 0.0, null, 0, 4)," +
+                        "('comment', 1857.0, 24.0, 0.0, null, null, null)," +
+                        "('name', 177.0, 24.0, 0.0, null, null, null)," +
+                        "(null, null, null, null, 24.0, null, null)");
+        assertUpdate("UPDATE " + tableName + " SET name = null WHERE nationkey = 2", 1);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                        "('nationkey', null, 24.0, 0.0, null, 0, 24)," +
+                        "('regionkey', null, 5.0, 0.0, null, 0, 4)," +
+                        "('comment', 1857.0, 24.0, 0.0, null, null, null)," +
+                        "('name', 180.84782608695653, 23.5, 0.02083333333333337, null, null, null)," +
+                        "(null, null, null, null, 24.0, null, null)");
+
+        assertUpdate(format("ANALYZE %s", tableName));
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                        "('nationkey', null, 24.0, 0.0, null, 0, 24)," +
+                        "('regionkey', null, 5.0, 0.0, null, 0, 4)," +
+                        "('comment', 3638.0, 24.0, 0.0, null, null, null)," +
+                        "('name', 346.3695652173913, 23.5, 0.02083333333333337, null, null, null)," +
+                        "(null, null, null, null, 24.0, null, null)");
+
+        assertUpdate(format("ANALYZE %s WITH(mode = 'full_refresh')", tableName), 24);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                        "('nationkey', null, 24.0, 0.0, null, 0, 24)," +
+                        "('regionkey', null, 5.0, 0.0, null, 0, 4)," +
+                        "('comment', 1781.0, 24.0, 0.0, null, null, null)," +
+                        "('name', 162.0, 23.0, 0.041666666666666664, null, null, null)," +
+                        "(null, null, null, null, 24.0, null, null)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testForceRecalculateAllStats()
+    {
+        String tableName = "test_recalculate_all_stats_" + randomNameSuffix();
+        assertUpdate(
+                withStatsOnWrite(false),
+                "CREATE TABLE " + tableName + " AS SELECT nationkey, regionkey, name  FROM tpch.sf1.nation",
+                25);
+
+        assertUpdate(
+                withStatsOnWrite(true),
+                "INSERT INTO " + tableName + " VALUES(27, 1, 'name1')",
+                1);
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                        "('nationkey', null, 1.0, 0.0, null, 0, 27)," +
+                        "('regionkey', null, 1.0, 0.0, null, 0, 4)," +
+                        "('name', 5.0, 1.0, 0.0, null, null, null)," +
+                        "(null, null, null, null, 26.0, null, null)");
+
+        // check that analyze does not change already calculated statistics
+        assertUpdate("ANALYZE " + tableName);
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                        "('nationkey', null, 1.0, 0.0, null, 0, 27)," +
+                        "('regionkey', null, 1.0, 0.0, null, 0, 4)," +
+                        "('name', 5.0, 1.0, 0.0, null, null, null)," +
+                        "(null, null, null, null, 26.0, null, null)");
+
+        assertUpdate(format("ANALYZE %s WITH(mode = 'full_refresh')", tableName), 26);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                        "('nationkey', null, 26.0, 0.0, null, 0, 27)," +
+                        "('regionkey', null, 5.0, 0.0, null, 0, 4)," +
+                        "('name', 182.0, 26.0, 0.0, null, null, null)," +
+                        "(null, null, null, null, 26.0, null, null)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testNoStats()
+            throws Exception
+    {
+        String tableName = copyResourcesAndRegisterTable("no_stats", "trino410/no_stats");
+        String expectedData = "VALUES (42, 'foo'), (12, 'ab'), (null, null), (15, 'cd'), (15, 'bar')";
+
+        assertQuery("SELECT * FROM " + tableName, expectedData);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('c_int', null, null, null, null, null, null),
+                        ('c_str', null, null, null, null, null, null),
+                        (null, null, null, null, null, null, null)
+                        """);
+
+        assertUpdate("ANALYZE " + tableName, 5);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('c_int', null, 3.0, 0.2, null, 12, 42),
+                        ('c_str', 10.0, 4.0, 0.2, null, null, null),
+                        (null, null, null, null, 5.0, null, null)
+                        """);
+
+        // Ensure that ANALYZE does not change data
+        assertQuery("SELECT * FROM " + tableName, expectedData);
+
+        cleanExternalTable(tableName);
+    }
+
+    @Test
+    public void testNoColumnStats()
+            throws Exception
+    {
+        String tableName = copyResourcesAndRegisterTable("no_column_stats", "databricks73/no_column_stats");
+        assertQuery("SELECT * FROM " + tableName, "VALUES (42, 'foo')");
+
+        assertUpdate("ANALYZE " + tableName, 1);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('c_int', null, 1.0, 0.0, null, 42, 42),
+                        ('c_str', 3.0, 1.0, 0.0, null, null, null),
+                        (null, null, null, null, 1.0, null, null)
+                        """);
+
+        cleanExternalTable(tableName);
+    }
+
+    @Test
+    public void testNoColumnStatsMixedCase()
+            throws Exception
+    {
+        String tableName = copyResourcesAndRegisterTable("no_column_stats_mixed_case", "databricks104/no_column_stats_mixed_case");
+        String tableLocation = getTableLocation(tableName);
+        assertQuery("SELECT * FROM " + tableName, "VALUES (11, 'a'), (2, 'b'), (null, null)");
+
+        assertUpdate("ANALYZE " + tableName, 3);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('c_int', null, 2.0, 0.33333333, null, 2, 11),
+                        ('c_str', 2.0, 2.0, 0.33333333, null, null, null),
+                        (null, null, null, null, 3.0, null, null)
+                        """);
+
+        // Version 3 should be created with recalculated statistics.
+        List<DeltaLakeTransactionLogEntry> transactionLogAfterUpdate = getEntriesFromJson(3, tableLocation + "/_delta_log", FILE_SYSTEM).orElseThrow();
+        assertThat(transactionLogAfterUpdate).hasSize(2);
+        AddFileEntry updateAddFileEntry = transactionLogAfterUpdate.get(1).getAdd();
+        DeltaLakeFileStatistics updateStats = updateAddFileEntry.getStats().orElseThrow();
+        assertThat(updateStats.getMinValues().orElseThrow().get("c_Int")).isEqualTo(2);
+        assertThat(updateStats.getMaxValues().orElseThrow().get("c_Int")).isEqualTo(11);
+        assertThat(updateStats.getNullCount("c_Int").orElseThrow()).isEqualTo(1);
+        assertThat(updateStats.getNullCount("c_Str").orElseThrow()).isEqualTo(1);
+
+        cleanExternalTable(tableName);
+    }
+
+    @Test
+    public void testPartiallyNoStats()
+            throws Exception
+    {
+        String tableName = copyResourcesAndRegisterTable("no_stats", "trino410/no_stats");
+        // Add additional transaction log entry with statistics
+        assertUpdate("INSERT INTO " + tableName + " VALUES (1,'a'), (12,'b')", 2);
+        assertQuery("SELECT * FROM " + tableName, " VALUES (42, 'foo'), (12, 'ab'), (null, null), (15, 'cd'), (15, 'bar'), (1, 'a'), (12, 'b')");
+
+        // Simulate initial analysis
+        assertUpdate(format("CALL system.drop_extended_stats('%s', '%s')", TPCH_SCHEMA, tableName));
+
+        assertUpdate("ANALYZE " + tableName, 7);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('c_int', null, 4.0, 0.14285714285714285, null, 1, 42),
+                        ('c_str', 12.0, 6.0, 0.14285714285714285, null, null, null),
+                        (null, null, null, null, 7.0, null, null)
+                        """);
+
+        cleanExternalTable(tableName);
+    }
+
+    @Test
+    public void testNoStatsPartitionedTable()
+            throws Exception
+    {
+        String tableName = copyResourcesAndRegisterTable("no_stats_partitions", "trino410/no_stats_partitions");
+        assertQuery("SELECT * FROM " + tableName,
+                """
+                        VALUES
+                        ('p?p', 42, 'foo'),
+                        ('p?p', 12, 'ab'),
+                        (null, null, null),
+                        ('ppp', 15, 'cd'),
+                        ('ppp', 15, 'bar')
+                        """);
+
+        assertUpdate("ANALYZE " + tableName, 5);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('p_str', null, 2.0, 0.2, null, null, null),
+                        ('c_int', null, 3.0, 0.2, null, 12, 42),
+                        ('c_str', 10.0, 4.0, 0.2, null, null, null),
+                        (null, null, null, null, 5.0, null, null)
+                        """);
+
+        cleanExternalTable(tableName);
+    }
+
+    @Test
+    public void testNoStatsVariousTypes()
+            throws Exception
+    {
+        String tableName = copyResourcesAndRegisterTable("no_stats_various_types", "trino410/no_stats_various_types");
+        assertQuery("SELECT c_boolean, c_tinyint, c_smallint, c_integer, c_bigint, c_real, c_double, c_decimal1, c_decimal2, c_date1, CAST(c_timestamp AS TIMESTAMP), c_varchar1, c_varchar2, c_varbinary FROM " + tableName,
+                """
+                        VALUES
+                        (false, 37, 32123, 1274942432, 312739231274942432, 567.123, 1234567890123.123, 12.345, 123456789012.345, '1999-01-01', '2020-02-12 14:03:00', 'ab', 'de',  X'12ab3f'),
+                        (true, 127, 32767, 2147483647, 9223372036854775807, 999999.999, 9999999999999.999, 99.999, 999999999999.99, '2028-10-04', '2199-12-31 22:59:59.999', 'zzz', 'zzz',  X'ffffffffffffffffffff'),
+                        (null,null,null,null,null,null,null,null,null,null,null,null,null,null),
+                        (null,null,null,null,null,null,null,null,null,null,null,null,null,null)
+                        """);
+
+        assertUpdate("ANALYZE " + tableName, 4);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('c_boolean', null, 2.0, 0.5, null, null, null),
+                        ('c_tinyint', null, 2.0, 0.5, null, '37', '127'),
+                        ('c_smallint', null, 2.0, 0.5, null, '32123', '32767'),
+                        ('c_integer', null, 2.0, 0.5, null, '1274942432', '2147483647'),
+                        ('c_bigint', null, 2.0, 0.5, null, '312739231274942464', '9223372036854775807'),
+                        ('c_real', null, 2.0, 0.5, null, '567.123', '1000000.0'),
+                        ('c_double', null, 2.0, 0.5, null, '1.234567890123123E12', '9.999999999999998E12'),
+                        ('c_decimal1', null, 2.0, 0.5, null, '12.345', '99.999'),
+                        ('c_decimal2', null, 2.0, 0.5, null, '1.23456789012345E11', '9.9999999999999E11'),
+                        ('c_date1', null, 2.0, 0.5, null, '1999-01-01', '2028-10-04'),
+                        ('c_timestamp', null, 2.0, 0.5, null, '2020-02-12 14:03:00.000 UTC', '2199-12-31 22:59:59.999 UTC'),
+                        ('c_varchar1', 5.0, 2.0, 0.5, null, null, null),
+                        ('c_varchar2', 5.0, 2.0, 0.5, null, null, null),
+                        ('c_varbinary', 13.0, 2.0, 0.5, null, null, null),
+                        (null, null, null, null, 4.0, null, null)
+                        """);
+
+        cleanExternalTable(tableName);
+    }
+
+    @Test
+    public void testNoStatsWithColumnMappingModeId()
+            throws Exception
+    {
+        String tableName = copyResourcesAndRegisterTable("no_stats_column_mapping_id", "databricks104/no_stats_column_mapping_id");
+
+        assertQuery("SELECT * FROM " + tableName, " VALUES (42, 'foo'), (1, 'a'), (2, 'b'), (null, null)");
+
+        assertUpdate("ANALYZE " + tableName, 4);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('c_int', null, 3.0, 0.25, null, 1, 42),
+                        ('c_str', 5.0, 3.0, 0.25, null, null, null),
+                        (null, null, null, null, 4.0, null, null)
+                        """);
+
+        cleanExternalTable(tableName);
+    }
+
+    private String copyResourcesAndRegisterTable(String resourceTable, String resourcePath)
+            throws IOException, URISyntaxException
+    {
+        Path tableLocation = Files.createTempDirectory(null);
+        String tableName = resourceTable + randomNameSuffix();
+        URI resourcesLocation = getClass().getClassLoader().getResource(resourcePath).toURI();
+        copyDirectoryContents(Path.of(resourcesLocation), tableLocation);
+        assertUpdate(format("CALL system.register_table('%s', '%s', '%s')", getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+        return tableName;
+    }
+
     private Session withStatsOnWrite(boolean value)
     {
         Session session = getSession();
@@ -772,4 +1146,24 @@ private Session withStatsOnWrite(boolean value)
                 .setCatalogSessionProperty(session.getCatalog().orElseThrow(), EXTENDED_STATISTICS_COLLECT_ON_WRITE, Boolean.toString(value))
                 .build();
     }
+
+    private String getTableLocation(String tableName)
+    {
+        Pattern locationPattern = Pattern.compile(".*location = '(.*?)'.*", Pattern.DOTALL);
+        Matcher m = locationPattern.matcher((String) computeActual("SHOW CREATE TABLE " + tableName).getOnlyValue());
+        if (m.find()) {
+            String location = m.group(1);
+            verify(!m.find(), "Unexpected second match");
+            return location;
+        }
+        throw new IllegalStateException("Location not found in SHOW CREATE TABLE result");
+    }
+
+    private void cleanExternalTable(String tableName)
+            throws Exception
+    {
+        String tableLocation = getTableLocation(tableName);
+        assertUpdate("DROP TABLE " + tableName);
+        deleteRecursively(Path.of(new URI(tableLocation).getPath()), ALLOW_INSECURE);
+    }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeBasic.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeBasic.java
index 16cb7495eba1..f509397f05a0 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeBasic.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeBasic.java
@@ -13,108 +13,896 @@
  */
 package io.trino.plugin.deltalake;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.io.Resources;
+import io.airlift.json.ObjectMapperProvider;
+import io.trino.Session;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.filesystem.local.LocalInputFile;
+import io.trino.parquet.ParquetReaderOptions;
+import io.trino.parquet.reader.MetadataReader;
+import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
+import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
+import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeFileStatistics;
+import io.trino.plugin.hive.FileFormatDataSourceStats;
+import io.trino.plugin.hive.parquet.TrinoParquetDataSource;
+import io.trino.spi.type.TimeZoneKey;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import io.trino.testing.TestingSession;
+import org.apache.parquet.hadoop.metadata.FileMetaData;
+import org.apache.parquet.hadoop.metadata.ParquetMetadata;
+import org.apache.parquet.schema.PrimitiveType;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.ZoneId;
 import java.util.List;
-import java.util.stream.Stream;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.Iterators.getOnlyElement;
+import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createDeltaLakeQueryRunner;
+import static io.trino.plugin.deltalake.DeltaTestingConnectorSession.SESSION;
+import static io.trino.plugin.deltalake.TestingDeltaLakeUtils.copyDirectoryContents;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.getColumnsMetadata;
+import static io.trino.plugin.deltalake.transactionlog.checkpoint.TransactionLogTail.getEntriesFromJson;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+import static java.time.ZoneOffset.UTC;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertFalse;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeBasic
         extends AbstractTestQueryFramework
 {
-    private static final List<String> PERSON_TABLES = ImmutableList.of(
-            "person", "person_without_last_checkpoint", "person_without_old_jsons", "person_without_checkpoints");
-    private static final List<String> OTHER_TABLES = ImmutableList.of("no_column_stats");
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapperProvider().get();
+
+    private static final List<ResourceTable> PERSON_TABLES = ImmutableList.of(
+            new ResourceTable("person", "databricks73/person"),
+            new ResourceTable("person_without_last_checkpoint", "databricks73/person_without_last_checkpoint"),
+            new ResourceTable("person_without_old_jsons", "databricks73/person_without_old_jsons"),
+            new ResourceTable("person_without_checkpoints", "databricks73/person_without_checkpoints"));
+    private static final List<ResourceTable> OTHER_TABLES = ImmutableList.of(
+            new ResourceTable("stats_with_minmax_nulls", "deltalake/stats_with_minmax_nulls"),
+            new ResourceTable("no_column_stats", "databricks73/no_column_stats"),
+            new ResourceTable("deletion_vectors", "databricks122/deletion_vectors"),
+            new ResourceTable("timestamp_ntz", "databricks131/timestamp_ntz"),
+            new ResourceTable("timestamp_ntz_partition", "databricks131/timestamp_ntz_partition"));
+
+    // The col-{uuid} pattern for delta.columnMapping.physicalName
+    private static final Pattern PHYSICAL_COLUMN_NAME_PATTERN = Pattern.compile("^col-[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
+
+    private static final TrinoFileSystem FILE_SYSTEM = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS).create(SESSION);
+
+    private final ZoneId jvmZone = ZoneId.systemDefault();
+    private final ZoneId vilnius = ZoneId.of("Europe/Vilnius");
+    private final ZoneId kathmandu = ZoneId.of("Asia/Kathmandu");
 
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        return createDeltaLakeQueryRunner(DELTA_CATALOG, ImmutableMap.of(), ImmutableMap.of("delta.register-table-procedure.enabled", "true"));
+        return createDeltaLakeQueryRunner(DELTA_CATALOG, ImmutableMap.of(), ImmutableMap.of(
+                "delta.register-table-procedure.enabled", "true",
+                "delta.enable-non-concurrent-writes", "true"));
     }
 
-    @BeforeClass
+    @BeforeAll
     public void registerTables()
     {
-        for (String table : Iterables.concat(PERSON_TABLES, OTHER_TABLES)) {
-            String dataPath = getTableLocation(table).toExternalForm();
+        for (ResourceTable table : Iterables.concat(PERSON_TABLES, OTHER_TABLES)) {
+            String dataPath = getResourceLocation(table.resourcePath()).toExternalForm();
             getQueryRunner().execute(
-                    format("CALL system.register_table('%s', '%s', '%s')", getSession().getSchema().orElseThrow(), table, dataPath));
+                    format("CALL system.register_table('%s', '%s', '%s')", getSession().getSchema().orElseThrow(), table.tableName(), dataPath));
+        }
+    }
+
+    private URL getResourceLocation(String resourcePath)
+    {
+        return getClass().getClassLoader().getResource(resourcePath);
+    }
+
+    @Test
+    public void testDescribeTable()
+    {
+        for (ResourceTable table : PERSON_TABLES) {
+            // the schema is actually defined in the transaction log
+            assertQuery(
+                    format("DESCRIBE %s", table.tableName()),
+                    "VALUES " +
+                            "('name', 'varchar', '', ''), " +
+                            "('age', 'integer', '', ''), " +
+                            "('married', 'boolean', '', ''), " +
+                            "('gender', 'varchar', '', ''), " +
+                            "('phones', 'array(row(number varchar, label varchar))', '', ''), " +
+                            "('address', 'row(street varchar, city varchar, state varchar, zip varchar)', '', ''), " +
+                            "('income', 'double', '', '')");
+        }
+    }
+
+    @Test
+    public void testSimpleQueries()
+    {
+        for (ResourceTable table : PERSON_TABLES) {
+            assertQuery(format("SELECT COUNT(*) FROM %s", table.tableName()), "VALUES 12");
+            assertQuery(format("SELECT income FROM %s WHERE name = 'Bob'", table.tableName()), "VALUES 99000.00");
+            assertQuery(format("SELECT name FROM %s WHERE name LIKE 'B%%'", table.tableName()), "VALUES ('Bob'), ('Betty')");
+            assertQuery(format("SELECT DISTINCT gender FROM %s", table.tableName()), "VALUES ('M'), ('F'), (null)");
+            assertQuery(format("SELECT DISTINCT age FROM %s", table.tableName()), "VALUES (21), (25), (28), (29), (30), (42)");
+            assertQuery(format("SELECT name FROM %s WHERE age = 42", table.tableName()), "VALUES ('Alice'), ('Emma')");
         }
     }
 
-    private URL getTableLocation(String table)
+    @Test
+    public void testNoColumnStats()
     {
-        return getClass().getClassLoader().getResource("databricks/" + table);
+        // The table was created with delta.dataSkippingNumIndexedCols=0 property
+        assertQuery("SELECT c_str FROM no_column_stats WHERE c_int = 42", "VALUES 'foo'");
     }
 
-    @DataProvider
-    public Object[][] tableNames()
+    /**
+     * @see deltalake.column_mapping_mode_id
+     * @see deltalake.column_mapping_mode_name
+     */
+    @Test
+    public void testAddNestedColumnWithColumnMappingMode()
+            throws Exception
     {
-        return PERSON_TABLES.stream()
-                .map(table -> new Object[] {table})
-                .toArray(Object[][]::new);
+        testAddNestedColumnWithColumnMappingMode("id");
+        testAddNestedColumnWithColumnMappingMode("name");
     }
 
-    @Test(dataProvider = "tableNames")
-    public void testDescribeTable(String tableName)
+    private void testAddNestedColumnWithColumnMappingMode(String columnMappingMode)
+            throws Exception
+    {
+        // The table contains 'x' column with column mapping mode
+        String tableName = "test_add_column_" + randomNameSuffix();
+        Path tableLocation = Files.createTempFile(tableName, null);
+        copyDirectoryContents(new File(Resources.getResource("deltalake/column_mapping_mode_" + columnMappingMode).toURI()).toPath(), tableLocation);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+        assertThat(query("DESCRIBE " + tableName)).projected("Column", "Type").skippingTypesCheck().matches("VALUES ('x', 'integer')");
+        assertQueryReturnsEmptyResult("SELECT * FROM " + tableName);
+
+        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN second_col row(a array(integer), b map(integer, integer), c row(field integer))");
+        MetadataEntry metadata = loadMetadataEntry(1, tableLocation);
+        assertThat(metadata.getConfiguration().get("delta.columnMapping.maxColumnId"))
+                .isEqualTo("6"); // +5 comes from second_col + second_col.a + second_col.b + second_col.c + second_col.c.field
+
+        JsonNode schema = OBJECT_MAPPER.readTree(metadata.getSchemaString());
+        List<JsonNode> fields = ImmutableList.copyOf(schema.get("fields").elements());
+        assertThat(fields).hasSize(2);
+        JsonNode columnX = fields.get(0);
+        JsonNode columnY = fields.get(1);
+
+        List<JsonNode> rowFields = ImmutableList.copyOf(columnY.get("type").get("fields").elements());
+        assertThat(rowFields).hasSize(3);
+        JsonNode nestedArray = rowFields.get(0);
+        JsonNode nestedMap = rowFields.get(1);
+        JsonNode nestedRow = rowFields.get(2);
+
+        // Verify delta.columnMapping.id and delta.columnMapping.physicalName values
+        assertThat(columnX.get("metadata").get("delta.columnMapping.id").asInt()).isEqualTo(1);
+        assertThat(columnX.get("metadata").get("delta.columnMapping.physicalName").asText()).containsPattern(PHYSICAL_COLUMN_NAME_PATTERN);
+        assertThat(columnY.get("metadata").get("delta.columnMapping.id").asInt()).isEqualTo(6);
+        assertThat(columnY.get("metadata").get("delta.columnMapping.physicalName").asText()).containsPattern(PHYSICAL_COLUMN_NAME_PATTERN);
+
+        assertThat(nestedArray.get("metadata").get("delta.columnMapping.id").asInt()).isEqualTo(2);
+        assertThat(nestedArray.get("metadata").get("delta.columnMapping.physicalName").asText()).containsPattern(PHYSICAL_COLUMN_NAME_PATTERN);
+
+        assertThat(nestedMap.get("metadata").get("delta.columnMapping.id").asInt()).isEqualTo(3);
+        assertThat(nestedMap.get("metadata").get("delta.columnMapping.physicalName").asText()).containsPattern(PHYSICAL_COLUMN_NAME_PATTERN);
+
+        assertThat(nestedRow.get("metadata").get("delta.columnMapping.id").asInt()).isEqualTo(5);
+        assertThat(nestedRow.get("metadata").get("delta.columnMapping.physicalName").asText()).containsPattern(PHYSICAL_COLUMN_NAME_PATTERN);
+        assertThat(getOnlyElement(nestedRow.get("type").get("fields").elements()).get("metadata").get("delta.columnMapping.id").asInt()).isEqualTo(4);
+        assertThat(getOnlyElement(nestedRow.get("type").get("fields").elements()).get("metadata").get("delta.columnMapping.physicalName").asText()).containsPattern(PHYSICAL_COLUMN_NAME_PATTERN);
+
+        // Repeat adding a new column and verify the existing fields are preserved
+        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN third_col row(a array(integer), b map(integer, integer), c row(field integer))");
+        MetadataEntry thirdMetadata = loadMetadataEntry(2, tableLocation);
+        JsonNode latestSchema = OBJECT_MAPPER.readTree(thirdMetadata.getSchemaString());
+        List<JsonNode> latestFields = ImmutableList.copyOf(latestSchema.get("fields").elements());
+        assertThat(latestFields).hasSize(3);
+        JsonNode latestColumnX = latestFields.get(0);
+        JsonNode latestColumnY = latestFields.get(1);
+        assertThat(latestColumnX).isEqualTo(columnX);
+        assertThat(latestColumnY).isEqualTo(columnY);
+
+        assertThat(thirdMetadata.getConfiguration())
+                .containsEntry("delta.columnMapping.maxColumnId", "11");
+        assertThat(thirdMetadata.getSchemaString())
+                .containsPattern("(delta\\.columnMapping\\.id.*?){11}")
+                .containsPattern("(delta\\.columnMapping\\.physicalName.*?){11}");
+    }
+
+    /**
+     * @see deltalake.column_mapping_mode_id
+     * @see deltalake.column_mapping_mode_name
+     */
+    @Test
+    public void testOptimizeWithColumnMappingMode()
+            throws Exception
+    {
+        testOptimizeWithColumnMappingMode("id");
+        testOptimizeWithColumnMappingMode("name");
+    }
+
+    private void testOptimizeWithColumnMappingMode(String columnMappingMode)
+            throws Exception
+    {
+        // The table contains 'x' column with column mapping mode
+        String tableName = "test_optimize_" + randomNameSuffix();
+        Path tableLocation = Files.createTempFile(tableName, null);
+        copyDirectoryContents(new File(Resources.getResource("deltalake/column_mapping_mode_" + columnMappingMode).toURI()).toPath(), tableLocation);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+        assertThat(query("DESCRIBE " + tableName)).projected("Column", "Type").skippingTypesCheck().matches("VALUES ('x', 'integer')");
+        assertQueryReturnsEmptyResult("SELECT * FROM " + tableName);
+
+        MetadataEntry originalMetadata = loadMetadataEntry(0, tableLocation);
+        JsonNode schema = OBJECT_MAPPER.readTree(originalMetadata.getSchemaString());
+        List<JsonNode> fields = ImmutableList.copyOf(schema.get("fields").elements());
+        assertThat(fields).hasSize(1);
+        JsonNode column = fields.get(0);
+        String physicalName = column.get("metadata").get("delta.columnMapping.physicalName").asText();
+        int id = column.get("metadata").get("delta.columnMapping.id").asInt();
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES 10", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES 20", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES NULL", 1);
+        // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
+        assertUpdate(Session.builder(getQueryRunner().getDefaultSession())
+                        .setSystemProperty("task_min_writer_count", "1")
+                        .build(),
+                "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
+
+        // Verify 'add' entry contains the expected physical name in the stats
+        List<DeltaLakeTransactionLogEntry> transactionLog = getEntriesFromJson(4, tableLocation.resolve("_delta_log").toString(), FILE_SYSTEM).orElseThrow();
+        assertThat(transactionLog).hasSize(5);
+        assertThat(transactionLog.get(0).getCommitInfo()).isNotNull();
+        assertThat(transactionLog.get(1).getRemove()).isNotNull();
+        assertThat(transactionLog.get(2).getRemove()).isNotNull();
+        assertThat(transactionLog.get(3).getRemove()).isNotNull();
+        assertThat(transactionLog.get(4).getAdd()).isNotNull();
+        AddFileEntry addFileEntry = transactionLog.get(4).getAdd();
+        DeltaLakeFileStatistics stats = addFileEntry.getStats().orElseThrow();
+        assertThat(stats.getMinValues().orElseThrow().get(physicalName)).isEqualTo(10);
+        assertThat(stats.getMaxValues().orElseThrow().get(physicalName)).isEqualTo(20);
+        assertThat(stats.getNullCount(physicalName).orElseThrow()).isEqualTo(1);
+
+        // Verify optimized parquet file contains the expected physical id and name
+        TrinoInputFile inputFile = new LocalInputFile(tableLocation.resolve(addFileEntry.getPath()).toFile());
+        ParquetMetadata parquetMetadata = MetadataReader.readFooter(
+                    new TrinoParquetDataSource(inputFile, new ParquetReaderOptions(), new FileFormatDataSourceStats()),
+                    Optional.empty());
+        FileMetaData fileMetaData = parquetMetadata.getFileMetaData();
+        PrimitiveType physicalType = getOnlyElement(fileMetaData.getSchema().getColumns().iterator()).getPrimitiveType();
+        assertThat(physicalType.getName()).isEqualTo(physicalName);
+        if (columnMappingMode.equals("id")) {
+            assertThat(physicalType.getId().intValue()).isEqualTo(id);
+        }
+        else {
+            assertThat(physicalType.getId()).isNull();
+        }
+    }
+
+    /**
+     * @see deltalake.column_mapping_mode_id
+     * @see deltalake.column_mapping_mode_name
+     */
+    @Test
+    public void testDropColumnWithColumnMappingMode()
+            throws Exception
+    {
+        testDropColumnWithColumnMappingMode("id");
+        testDropColumnWithColumnMappingMode("name");
+    }
+
+    private void testDropColumnWithColumnMappingMode(String columnMappingMode)
+            throws Exception
+    {
+        // The table contains 'x' column with column mapping mode
+        String tableName = "test_add_column_" + randomNameSuffix();
+        Path tableLocation = Files.createTempFile(tableName, null);
+        copyDirectoryContents(new File(Resources.getResource("deltalake/column_mapping_mode_" + columnMappingMode).toURI()).toPath(), tableLocation);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+        assertThat(query("DESCRIBE " + tableName)).projected("Column", "Type").skippingTypesCheck().matches("VALUES ('x', 'integer')");
+        assertQueryReturnsEmptyResult("SELECT * FROM " + tableName);
+
+        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN second_col row(a array(integer), b map(integer, integer), c row(field integer))");
+        MetadataEntry metadata = loadMetadataEntry(1, tableLocation);
+        assertThat(metadata.getConfiguration().get("delta.columnMapping.maxColumnId"))
+                .isEqualTo("6"); // +5 comes from second_col + second_col.a + second_col.b + second_col.c + second_col.c.field
+        assertThat(metadata.getSchemaString())
+                .containsPattern("(delta\\.columnMapping\\.id.*?){6}")
+                .containsPattern("(delta\\.columnMapping\\.physicalName.*?){6}");
+
+        JsonNode schema = OBJECT_MAPPER.readTree(metadata.getSchemaString());
+        List<JsonNode> fields = ImmutableList.copyOf(schema.get("fields").elements());
+        assertThat(fields).hasSize(2);
+        JsonNode nestedColumn = fields.get(1);
+        List<JsonNode> rowFields = ImmutableList.copyOf(nestedColumn.get("type").get("fields").elements());
+        assertThat(rowFields).hasSize(3);
+
+        // Drop 'x' column and verify that nested metadata and table configuration are preserved
+        assertUpdate("ALTER TABLE " + tableName + " DROP COLUMN x");
+
+        MetadataEntry droppedMetadata = loadMetadataEntry(2, tableLocation);
+        JsonNode droppedSchema = OBJECT_MAPPER.readTree(droppedMetadata.getSchemaString());
+        List<JsonNode> droppedFields = ImmutableList.copyOf(droppedSchema.get("fields").elements());
+        assertThat(droppedFields).hasSize(1);
+        assertThat(droppedFields.get(0)).isEqualTo(nestedColumn);
+
+        assertThat(droppedMetadata.getConfiguration())
+                .isEqualTo(metadata.getConfiguration());
+        assertThat(droppedMetadata.getSchemaString())
+                .containsPattern("(delta\\.columnMapping\\.id.*?){5}")
+                .containsPattern("(delta\\.columnMapping\\.physicalName.*?){5}");
+    }
+
+    /**
+     * @see deltalake.column_mapping_mode_id
+     * @see deltalake.column_mapping_mode_name
+     */
+    @Test
+    public void testRenameColumnWithColumnMappingMode()
+            throws Exception
+    {
+        testRenameColumnWithColumnMappingMode("id");
+        testRenameColumnWithColumnMappingMode("name");
+    }
+
+    private void testRenameColumnWithColumnMappingMode(String columnMappingMode)
+            throws Exception
+    {
+        // The table contains 'x' column with column mapping mode
+        String tableName = "test_rename_column_" + randomNameSuffix();
+        Path tableLocation = Files.createTempFile(tableName, null);
+        copyDirectoryContents(new File(Resources.getResource("deltalake/column_mapping_mode_" + columnMappingMode).toURI()).toPath(), tableLocation);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+        assertQueryReturnsEmptyResult("SELECT * FROM " + tableName);
+
+        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN second_col row(a array(integer), b map(integer, integer), c row(field integer))");
+        MetadataEntry metadata = loadMetadataEntry(1, tableLocation);
+        assertThat(metadata.getConfiguration().get("delta.columnMapping.maxColumnId"))
+                .isEqualTo("6"); // +5 comes from second_col + second_col.a + second_col.b + second_col.c + second_col.c.field
+        assertThat(metadata.getSchemaString())
+                .containsPattern("(delta\\.columnMapping\\.id.*?){6}")
+                .containsPattern("(delta\\.columnMapping\\.physicalName.*?){6}");
+
+        JsonNode schema = OBJECT_MAPPER.readTree(metadata.getSchemaString());
+        List<JsonNode> fields = ImmutableList.copyOf(schema.get("fields").elements());
+        assertThat(fields).hasSize(2);
+        JsonNode integerColumn = fields.get(0);
+        JsonNode nestedColumn = fields.get(1);
+        List<JsonNode> rowFields = ImmutableList.copyOf(nestedColumn.get("type").get("fields").elements());
+        assertThat(rowFields).hasSize(3);
+
+        // Rename 'second_col' column and verify that nested metadata are same except for 'name' field and the table configuration are preserved
+        assertUpdate("ALTER TABLE " + tableName + " RENAME COLUMN second_col TO renamed_col");
+
+        MetadataEntry renamedMetadata = loadMetadataEntry(2, tableLocation);
+        JsonNode renamedSchema = OBJECT_MAPPER.readTree(renamedMetadata.getSchemaString());
+        List<JsonNode> renamedFields = ImmutableList.copyOf(renamedSchema.get("fields").elements());
+        assertThat(renamedFields).hasSize(2);
+        assertThat(renamedFields.get(0)).isEqualTo(integerColumn);
+        assertThat(renamedFields.get(1)).isNotEqualTo(nestedColumn);
+        JsonNode renamedColumn = ((ObjectNode) nestedColumn).put("name", "renamed_col");
+        assertThat(renamedFields.get(1)).isEqualTo(renamedColumn);
+
+        assertThat(renamedMetadata.getConfiguration())
+                .isEqualTo(metadata.getConfiguration());
+        assertThat(renamedMetadata.getSchemaString())
+                .containsPattern("(delta\\.columnMapping\\.id.*?){6}")
+                .containsPattern("(delta\\.columnMapping\\.physicalName.*?){6}");
+    }
+
+    /**
+     * @see deltalake.column_mapping_mode_id
+     * @see deltalake.column_mapping_mode_name
+     */
+    @Test
+    public void testWriterAfterRenameColumnWithColumnMappingMode()
+            throws Exception
+    {
+        testWriterAfterRenameColumnWithColumnMappingMode("id");
+        testWriterAfterRenameColumnWithColumnMappingMode("name");
+    }
+
+    private void testWriterAfterRenameColumnWithColumnMappingMode(String columnMappingMode)
+            throws Exception
+    {
+        String tableName = "test_writer_after_rename_column_" + randomNameSuffix();
+        Path tableLocation = Files.createTempFile(tableName, null);
+        copyDirectoryContents(new File(Resources.getResource("deltalake/column_mapping_mode_" + columnMappingMode).toURI()).toPath(), tableLocation);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+        assertQueryReturnsEmptyResult("SELECT * FROM " + tableName);
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES 1", 1);
+        assertUpdate("ALTER TABLE " + tableName + " RENAME COLUMN x to new_x");
+        assertQuery("SELECT * FROM " + tableName, "VALUES 1");
+
+        assertUpdate("UPDATE " + tableName + " SET new_x = 2", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES 2");
+
+        assertUpdate("MERGE INTO " + tableName + " USING (VALUES 42) t(dummy) ON false " +
+                " WHEN NOT MATCHED THEN INSERT VALUES (3)", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES 2, 3");
+
+        assertUpdate("DELETE FROM " + tableName + " WHERE new_x = 2", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES 3");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    /**
+     * @see deltalake.case_sensitive
+     */
+    @Test
+    public void testRequiresQueryPartitionFilterWithUppercaseColumnName()
+            throws Exception
+    {
+        String tableName = "test_require_partition_filter_" + randomNameSuffix();
+        Path tableLocation = Files.createTempFile(tableName, null);
+        copyDirectoryContents(new File(Resources.getResource("deltalake/case_sensitive").toURI()).toPath(), tableLocation);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+        assertQueryReturnsEmptyResult("SELECT * FROM " + tableName);
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES (1, 11), (2, 22)", 2);
+
+        assertQuery("SELECT * FROM " + tableName, "VALUES (1, 11), (2, 22)");
+
+        Session session = Session.builder(getSession())
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "query_partition_filter_required", "true")
+                .build();
+
+        assertQuery(session, format("SELECT * FROM %s WHERE \"part\" = 11", tableName), "VALUES (1, 11)");
+        assertQuery(session, format("SELECT * FROM %s WHERE \"PART\" = 11", tableName), "VALUES (1, 11)");
+        assertQuery(session, format("SELECT * FROM %s WHERE \"Part\" = 11", tableName), "VALUES (1, 11)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    /**
+     * @see deltalake.case_sensitive
+     */
+    @Test
+    public void testStatisticsWithColumnCaseSensitivity()
+            throws Exception
     {
-        // the schema is actually defined in the transaction log
+        String tableName = "test_column_case_sensitivity_" + randomNameSuffix();
+        Path tableLocation = Files.createTempFile(tableName, null);
+        copyDirectoryContents(new File(Resources.getResource("deltalake/case_sensitive").toURI()).toPath(), tableLocation);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+        assertQueryReturnsEmptyResult("SELECT * FROM " + tableName);
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES (10, 1), (20, 1), (null, 1)", 3);
+
+        List<DeltaLakeTransactionLogEntry> transactionLog = getEntriesFromJson(1, tableLocation.resolve("_delta_log").toString(), FILE_SYSTEM).orElseThrow();
+        assertThat(transactionLog).hasSize(2);
+        AddFileEntry addFileEntry = transactionLog.get(1).getAdd();
+        DeltaLakeFileStatistics stats = addFileEntry.getStats().orElseThrow();
+        assertThat(stats.getMinValues().orElseThrow().get("UPPER_CASE")).isEqualTo(10);
+        assertThat(stats.getMaxValues().orElseThrow().get("UPPER_CASE")).isEqualTo(20);
+        assertThat(stats.getNullCount("UPPER_CASE").orElseThrow()).isEqualTo(1);
+
+        assertUpdate("UPDATE " + tableName + " SET upper_case = upper_case + 10", 3);
+
+        List<DeltaLakeTransactionLogEntry> transactionLogAfterUpdate = getEntriesFromJson(2, tableLocation.resolve("_delta_log").toString(), FILE_SYSTEM).orElseThrow();
+        assertThat(transactionLogAfterUpdate).hasSize(3);
+        AddFileEntry updateAddFileEntry = transactionLogAfterUpdate.get(2).getAdd();
+        DeltaLakeFileStatistics updateStats = updateAddFileEntry.getStats().orElseThrow();
+        assertThat(updateStats.getMinValues().orElseThrow().get("UPPER_CASE")).isEqualTo(20);
+        assertThat(updateStats.getMaxValues().orElseThrow().get("UPPER_CASE")).isEqualTo(30);
+        assertThat(updateStats.getNullCount("UPPER_CASE").orElseThrow()).isEqualTo(1);
+
         assertQuery(
-                format("DESCRIBE %s", tableName),
-                "VALUES " +
-                        "('name', 'varchar', '', ''), " +
-                        "('age', 'integer', '', ''), " +
-                        "('married', 'boolean', '', ''), " +
-                        "('gender', 'varchar', '', ''), " +
-                        "('phones', 'array(row(number varchar, label varchar))', '', ''), " +
-                        "('address', 'row(street varchar, city varchar, state varchar, zip varchar)', '', ''), " +
-                        "('income', 'double', '', '')");
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('upper_case', null, 2.0, 0.3333333333333333, null, 20, 30),
+                        ('part', null, 1.0, 0.0, null, null, null),
+                        (null, null, null, null, 3.0, null, null)
+                        """);
+
+        assertUpdate(format("ANALYZE %s WITH(mode = 'full_refresh')", tableName), 3);
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('upper_case', null, 2.0, 0.3333333333333333, null, 20, 30),
+                        ('part', null, 1.0, 0.0, null, null, null),
+                        (null, null, null, null, 3.0, null, null)
+                        """);
     }
 
-    @Test(dataProvider = "tableNames")
-    public void testSimpleQueries(String tableName)
+    /**
+     * @see databricks131.timestamp_ntz
+     */
+    @Test
+    public void testDeltaTimestampNtz()
+            throws Exception
     {
-        assertQuery(format("SELECT COUNT(*) FROM %s", tableName), "VALUES 12");
-        assertQuery(format("SELECT income FROM %s WHERE name = 'Bob'", tableName), "VALUES 99000.00");
-        assertQuery(format("SELECT name FROM %s WHERE name LIKE 'B%%'", tableName), "VALUES ('Bob'), ('Betty')");
-        assertQuery(format("SELECT DISTINCT gender FROM %s", tableName), "VALUES ('M'), ('F'), (null)");
-        assertQuery(format("SELECT DISTINCT age FROM %s", tableName), "VALUES (21), (25), (28), (29), (30), (42)");
-        assertQuery(format("SELECT name FROM %s WHERE age = 42", tableName), "VALUES ('Alice'), ('Emma')");
+        testDeltaTimestampNtz(UTC);
+        testDeltaTimestampNtz(jvmZone);
+        // using two non-JVM zones so that we don't need to worry what Postgres system zone is
+        testDeltaTimestampNtz(vilnius);
+        testDeltaTimestampNtz(kathmandu);
+        testDeltaTimestampNtz(TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId());
+    }
+
+    private void testDeltaTimestampNtz(ZoneId sessionZone)
+            throws Exception
+    {
+        String tableName = "timestamp_ntz" + randomNameSuffix();
+        Path tableLocation = Files.createTempFile(tableName, null);
+        copyDirectoryContents(new File(Resources.getResource("databricks131/timestamp_ntz").toURI()).toPath(), tableLocation);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        assertQuery(
+                "DESCRIBE " + tableName,
+                "VALUES ('x', 'timestamp(6)', '', '')");
+
+        assertThat(query(session, "SELECT * FROM " + tableName))
+                .matches("""
+                            VALUES
+                            NULL,
+                            TIMESTAMP '-9999-12-31 23:59:59.999999',
+                            TIMESTAMP '-0001-01-01 00:00:00',
+                            TIMESTAMP '0000-01-01 00:00:00',
+                            TIMESTAMP '1582-10-05 00:00:00',
+                            TIMESTAMP '1582-10-14 23:59:59.999999',
+                            TIMESTAMP '2020-12-31 01:02:03.123456',
+                            TIMESTAMP '9999-12-31 23:59:59.999999'
+                            """);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                            VALUES
+                            ('x', null, null, 0.125, null, null, null),
+                            (null, null, null, null, 8.0, null, null)
+                            """);
+
+        // Verify the connector can insert into tables created by Databricks
+        assertUpdate(session, "INSERT INTO " + tableName + " VALUES TIMESTAMP '2023-01-02 03:04:05.123456'", 1);
+        assertQuery(session, "SELECT true FROM " + tableName + " WHERE x = TIMESTAMP '2023-01-02 03:04:05.123456'", "VALUES true");
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('x', null, 1.0, 0.1111111111111111, null, null, null),
+                        (null, null, null, null, 9.0, null, null)
+                        """);
+
+        assertUpdate("DROP TABLE " + tableName);
     }
 
     @Test
-    public void testNoColumnStats()
+    public void testTrinoCreateTableWithTimestampNtz()
+            throws Exception
     {
-        // Data generated using:
-        // CREATE TABLE no_column_stats
-        // USING delta
-        // LOCATION 's3://starburst-alex/delta/no_column_stats'
-        // TBLPROPERTIES (delta.dataSkippingNumIndexedCols=0)   -- collects only table stats (row count), but no column stats
-        // AS
-        // SELECT 42 AS c_int, 'foo' AS c_str
-        assertQuery("SELECT c_str FROM no_column_stats WHERE c_int = 42", "VALUES 'foo'");
+        testTrinoCreateTableWithTimestampNtz(UTC);
+        testTrinoCreateTableWithTimestampNtz(jvmZone);
+        // using two non-JVM zones so that we don't need to worry what Postgres system zone is
+        testTrinoCreateTableWithTimestampNtz(vilnius);
+        testTrinoCreateTableWithTimestampNtz(kathmandu);
+        testTrinoCreateTableWithTimestampNtz(TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId());
+    }
+
+    private void testTrinoCreateTableWithTimestampNtz(ZoneId sessionZone)
+            throws Exception
+    {
+        testTrinoCreateTableWithTimestampNtz(
+                sessionZone,
+                tableName -> {
+                    assertUpdate("CREATE TABLE " + tableName + "(x timestamp(6))");
+                    assertUpdate("INSERT INTO " + tableName + " VALUES timestamp '2023-01-02 03:04:05.123456'", 1);
+                });
+    }
+
+    @Test
+    public void testTrinoCreateTableAsSelectWithTimestampNtz()
+            throws Exception
+    {
+        testTrinoCreateTableAsSelectWithTimestampNtz(UTC);
+        testTrinoCreateTableAsSelectWithTimestampNtz(jvmZone);
+        // using two non-JVM zones so that we don't need to worry what Postgres system zone is
+        testTrinoCreateTableAsSelectWithTimestampNtz(vilnius);
+        testTrinoCreateTableAsSelectWithTimestampNtz(kathmandu);
+        testTrinoCreateTableAsSelectWithTimestampNtz(TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId());
+    }
+
+    private void testTrinoCreateTableAsSelectWithTimestampNtz(ZoneId sessionZone)
+            throws Exception
+    {
+        testTrinoCreateTableWithTimestampNtz(
+                sessionZone,
+                tableName -> assertUpdate("CREATE TABLE " + tableName + " AS SELECT timestamp '2023-01-02 03:04:05.123456' AS x", 1));
+    }
+
+    private void testTrinoCreateTableWithTimestampNtz(ZoneId sessionZone, Consumer<String> createTable)
+            throws IOException
+    {
+        String tableName = "test_create_table_timestamp_ntz" + randomNameSuffix();
+
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        createTable.accept(tableName);
+
+        assertQuery(session, "SELECT * FROM " + tableName, "VALUES TIMESTAMP '2023-01-02 03:04:05.123456'");
+
+        // Verify reader/writer version and features in ProtocolEntry
+        String tableLocation = getTableLocation(tableName);
+        List<DeltaLakeTransactionLogEntry> transactionLogs = getEntriesFromJson(0, tableLocation + "/_delta_log", FILE_SYSTEM).orElseThrow();
+        ProtocolEntry protocolEntry = transactionLogs.get(1).getProtocol();
+        assertThat(protocolEntry).isNotNull();
+        assertThat(protocolEntry.getMinReaderVersion()).isEqualTo(3);
+        assertThat(protocolEntry.getMinWriterVersion()).isEqualTo(7);
+        assertThat(protocolEntry.getReaderFeatures()).isEqualTo(Optional.of(ImmutableSet.of("timestampNtz")));
+        assertThat(protocolEntry.getWriterFeatures()).isEqualTo(Optional.of(ImmutableSet.of("timestampNtz")));
+
+        // Insert rows and verify results
+        assertUpdate(session,
+                "INSERT INTO " + tableName + " " + """
+                        VALUES
+                        NULL,
+                        TIMESTAMP '-9999-12-31 23:59:59.999999',
+                        TIMESTAMP '-0001-01-01 00:00:00',
+                        TIMESTAMP '0000-01-01 00:00:00',
+                        TIMESTAMP '1582-10-05 00:00:00',
+                        TIMESTAMP '1582-10-14 23:59:59.999999',
+                        TIMESTAMP '2020-12-31 01:02:03.123456',
+                        TIMESTAMP '9999-12-31 23:59:59.999999'
+                        """,
+                8);
+
+        assertThat(query(session, "SELECT * FROM " + tableName))
+                .matches("""
+                        VALUES
+                        NULL,
+                        TIMESTAMP '-9999-12-31 23:59:59.999999',
+                        TIMESTAMP '-0001-01-01 00:00:00',
+                        TIMESTAMP '0000-01-01 00:00:00',
+                        TIMESTAMP '1582-10-05 00:00:00',
+                        TIMESTAMP '1582-10-14 23:59:59.999999',
+                        TIMESTAMP '2020-12-31 01:02:03.123456',
+                        TIMESTAMP '2023-01-02 03:04:05.123456',
+                        TIMESTAMP '9999-12-31 23:59:59.999999'
+                        """);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('x', null, 8.0, 0.1111111111111111, null, null, null),
+                        (null, null, null, null, 9.0, null, null)
+                        """);
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testTrinoTimestampNtzComplexType()
+    {
+        testTrinoTimestampNtzComplexType(UTC);
+        testTrinoTimestampNtzComplexType(jvmZone);
+        // using two non-JVM zones so that we don't need to worry what Postgres system zone is
+        testTrinoTimestampNtzComplexType(vilnius);
+        testTrinoTimestampNtzComplexType(kathmandu);
+        testTrinoTimestampNtzComplexType(TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId());
+    }
+
+    private void testTrinoTimestampNtzComplexType(ZoneId sessionZone)
+    {
+        String tableName = "test_timestamp_ntz_complex_type" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE " + tableName + "(id int, array_col array(timestamp(6)), map_col map(timestamp(6), timestamp(6)), row_col row(child timestamp(6)))");
+
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        assertUpdate(
+                session,
+                "INSERT INTO " + tableName + " " + """
+                        VALUES (
+                         1,
+                         ARRAY[TIMESTAMP '2020-12-31 01:02:03.123456'],
+                         MAP(ARRAY[TIMESTAMP '2021-12-31 01:02:03.123456'], ARRAY[TIMESTAMP '2022-12-31 01:02:03.123456']),
+                         ROW(TIMESTAMP '2023-12-31 01:02:03.123456')
+                        )
+                        """,
+                1);
+
+        assertThat(query(session, "SELECT * FROM " + tableName))
+                .matches("""
+                        VALUES (
+                         1,
+                         ARRAY[TIMESTAMP '2020-12-31 01:02:03.123456'],
+                         MAP(ARRAY[TIMESTAMP '2021-12-31 01:02:03.123456'], ARRAY[TIMESTAMP '2022-12-31 01:02:03.123456']),
+                         CAST(ROW(TIMESTAMP '2023-12-31 01:02:03.123456') AS ROW(child timestamp(6)))
+                        )
+                        """);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('id', null, 1.0, 0.0, null, 1, 1),
+                        ('array_col', null, null, null, null, null, null),
+                        ('map_col', null, null, null, null, null, null),
+                        ('row_col', null, null, null, null, null, null),
+                        (null, null, null, null, 1.0, null, null)
+                        """);
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    /**
+     * @see databricks131.timestamp_ntz_partition
+     */
+    @Test
+    public void testTimestampNtzPartitioned()
+            throws Exception
+    {
+        testTimestampNtzPartitioned(UTC);
+        testTimestampNtzPartitioned(jvmZone);
+        // using two non-JVM zones so that we don't need to worry what Postgres system zone is
+        testTimestampNtzPartitioned(vilnius);
+        testTimestampNtzPartitioned(kathmandu);
+        testTimestampNtzPartitioned(TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId());
+    }
+
+    private void testTimestampNtzPartitioned(ZoneId sessionZone)
+            throws Exception
+    {
+        String tableName = "timestamp_ntz_partition" + randomNameSuffix();
+        Path tableLocation = Files.createTempFile(tableName, null);
+        copyDirectoryContents(new File(Resources.getResource("databricks131/timestamp_ntz_partition").toURI()).toPath(), tableLocation);
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        assertQuery(
+                "DESCRIBE " + tableName,
+                "VALUES ('id', 'integer', '', ''), ('part', 'timestamp(6)', '', '')");
+        assertThat((String) computeScalar("SHOW CREATE TABLE " + tableName))
+                .contains("partitioned_by = ARRAY['part']");
+
+        assertThat(query(session, "SELECT * FROM " + tableName))
+                .matches("""
+                            VALUES
+                            (1, NULL),
+                            (2, TIMESTAMP '-9999-12-31 23:59:59.999999'),
+                            (3, TIMESTAMP '-0001-01-01 00:00:00'),
+                            (4, TIMESTAMP '0000-01-01 00:00:00'),
+                            (5, TIMESTAMP '1582-10-05 00:00:00'),
+                            (6, TIMESTAMP '1582-10-14 23:59:59.999999'),
+                            (7, TIMESTAMP '2020-12-31 01:02:03.123456'),
+                            (8, TIMESTAMP '9999-12-31 23:59:59.999999')
+                        """);
+        assertQuery(session, "SELECT id FROM " + tableName + " WHERE part = TIMESTAMP '2020-12-31 01:02:03.123456'", "VALUES 7");
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                            VALUES
+                            ('id', null, null, 0.0, null, 1, 8),
+                            ('part', null, 7.0, 0.125, null, null, null),
+                            (null, null, null, null, 8.0, null, null)
+                            """);
+
+        // Verify the connector can insert into tables created by Databricks
+        assertUpdate(session, "INSERT INTO " + tableName + " VALUES (9, TIMESTAMP '2023-01-02 03:04:05.123456')", 1);
+        assertQuery(session, "SELECT part FROM " + tableName + " WHERE id = 9", "VALUES TIMESTAMP '2023-01-02 03:04:05.123456'");
+        assertQuery(session, "SELECT id FROM " + tableName + " WHERE part = TIMESTAMP '2023-01-02 03:04:05.123456'", "VALUES 9");
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                        ('id', null, 1.0, 0.0, null, 1, 9),
+                        ('part', null, 8.0, 0.1111111111111111, null, null, null),
+                        (null, null, null, null, 9.0, null, null)
+                        """);
+        List<DeltaLakeTransactionLogEntry> transactionLogs = getEntriesFromJson(2, tableLocation.resolve("_delta_log").toString(), FILE_SYSTEM).orElseThrow();
+        assertThat(transactionLogs).hasSize(2);
+        AddFileEntry addFileEntry = transactionLogs.get(1).getAdd();
+        assertThat(addFileEntry).isNotNull();
+        assertThat(addFileEntry.getPath()).startsWith("part=2023-01-02%2003%253A04%253A05.123456/");
+        assertThat(addFileEntry.getPartitionValues()).containsExactly(Map.entry("part", "2023-01-02 03:04:05.123456"));
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    /**
+     * @see databricks122.identity_columns
+     */
+    @Test
+    public void testIdentityColumns()
+            throws Exception
+    {
+        String tableName = "test_identity_columns_" + randomNameSuffix();
+        Path tableLocation = Files.createTempFile(tableName, null);
+        copyDirectoryContents(new File(Resources.getResource("databricks122/identity_columns").toURI()).toPath(), tableLocation);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+        assertQueryReturnsEmptyResult("SELECT * FROM " + tableName);
+
+        List<DeltaLakeTransactionLogEntry> transactionLog = getEntriesFromJson(0, tableLocation.resolve("_delta_log").toString(), FILE_SYSTEM).orElseThrow();
+        assertThat(transactionLog).hasSize(3);
+        MetadataEntry metadataEntry = transactionLog.get(2).getMetaData();
+        assertThat(getColumnsMetadata(metadataEntry).get("b"))
+                .containsExactly(
+                        entry("delta.identity.start", 1),
+                        entry("delta.identity.step", 1),
+                        entry("delta.identity.allowExplicitInsert", false));
+
+        // Verify a column operation preserves delta.identity.* column properties
+        assertUpdate("COMMENT ON COLUMN " + tableName + ".b IS 'test column comment'");
+
+        List<DeltaLakeTransactionLogEntry> transactionLogAfterComment = getEntriesFromJson(1, tableLocation.resolve("_delta_log").toString(), FILE_SYSTEM).orElseThrow();
+        assertThat(transactionLogAfterComment).hasSize(3);
+        MetadataEntry commentMetadataEntry = transactionLogAfterComment.get(2).getMetaData();
+        assertThat(getColumnsMetadata(commentMetadataEntry).get("b"))
+                .containsExactly(
+                        entry("comment", "test column comment"),
+                        entry("delta.identity.start", 1),
+                        entry("delta.identity.step", 1),
+                        entry("delta.identity.allowExplicitInsert", false));
+    }
+
+    /**
+     * @see databricks122.deletion_vectors
+     */
+    @Test
+    public void testDeletionVectors()
+    {
+        assertQuery("SELECT * FROM deletion_vectors", "VALUES (1, 11)");
     }
 
     @Test
@@ -134,7 +922,7 @@ public void testCorruptedExternalTableLocation()
         // create a bad_person table which is based on person table in temporary location
         String tableName = "bad_person_" + randomNameSuffix();
         Path tableLocation = Files.createTempFile(tableName, null);
-        copyDirectoryContents(Path.of(getTableLocation("person").toURI()), tableLocation);
+        copyDirectoryContents(Path.of(getResourceLocation("databricks73/person").toURI()), tableLocation);
         getQueryRunner().execute(
                 format("CALL system.register_table('%s', '%s', '%s')", getSession().getSchema().orElseThrow(), tableName, tableLocation));
         testCorruptedTableLocation(tableName, tableLocation, false);
@@ -153,6 +941,8 @@ private void testCorruptedTableLocation(String tableName, Path tableLocation, bo
 
         // Assert queries fail cleanly
         assertQueryFails("TABLE " + tableName, "Metadata not found in transaction log for tpch." + tableName);
+        assertQueryFails("SELECT * FROM \"" + tableName + "$history\"", "Metadata not found in transaction log for tpch." + tableName);
+        assertQueryFails("SELECT * FROM \"" + tableName + "$properties\"", "Metadata not found in transaction log for tpch." + tableName);
         assertQueryFails("SELECT * FROM " + tableName + " WHERE false", "Metadata not found in transaction log for tpch." + tableName);
         assertQueryFails("SELECT 1 FROM " + tableName + " WHERE false", "Metadata not found in transaction log for tpch." + tableName);
         assertQueryFails("SHOW CREATE TABLE " + tableName, "Metadata not found in transaction log for tpch." + tableName);
@@ -173,10 +963,11 @@ private void testCorruptedTableLocation(String tableName, Path tableLocation, bo
         assertQueryFails("UPDATE " + tableName + " SET foo = 'bar'", "Metadata not found in transaction log for tpch." + tableName);
         assertQueryFails("DELETE FROM " + tableName, "Metadata not found in transaction log for tpch." + tableName);
         assertQueryFails("MERGE INTO  " + tableName + " USING (SELECT 1 a) input ON true WHEN MATCHED THEN DELETE", "Metadata not found in transaction log for tpch." + tableName);
-        assertQueryFails("TRUNCATE TABLE " + tableName, "This connector does not support truncating tables");
+        assertQueryFails("TRUNCATE TABLE " + tableName, "Metadata not found in transaction log for tpch." + tableName);
         assertQueryFails("COMMENT ON TABLE " + tableName + " IS NULL", "Metadata not found in transaction log for tpch." + tableName);
         assertQueryFails("COMMENT ON COLUMN " + tableName + ".foo IS NULL", "Metadata not found in transaction log for tpch." + tableName);
         assertQueryFails("CALL system.vacuum(CURRENT_SCHEMA, '" + tableName + "', '7d')", "Metadata not found in transaction log for tpch." + tableName);
+        assertQueryFails("SELECT * FROM TABLE(system.table_changes('tpch', '" + tableName + "'))", "Metadata not found in transaction log for tpch." + tableName);
         assertQuerySucceeds("CALL system.drop_extended_stats(CURRENT_SCHEMA, '" + tableName + "')");
 
         // Avoid failing metadata queries
@@ -195,18 +986,68 @@ private void testCorruptedTableLocation(String tableName, Path tableLocation, bo
         }
     }
 
-    private void copyDirectoryContents(Path source, Path destination)
+    /**
+     * @see deltalake.stats_with_minmax_nulls
+     */
+    @Test
+    public void testStatsWithMinMaxValuesAsNulls()
+    {
+        assertQuery(
+                "SELECT * FROM stats_with_minmax_nulls",
+                """
+                   VALUES
+                   (0, 1),
+                   (1, 2),
+                   (3, 4),
+                   (3, 7),
+                   (NULL, NULL),
+                   (NULL, NULL)
+                   """);
+        assertQuery(
+                "SHOW STATS FOR stats_with_minmax_nulls",
+                """
+                   VALUES
+                   ('id', null, null, 0.3333333333333333, null, 0, 3),
+                   ('id2', null, null, 0.3333333333333333, null, 1, 7),
+                   (null, null, null, null, 6.0, null, null)
+                   """);
+    }
+
+    /**
+     * @see deltalake.multipart_checkpoint
+     */
+    @Test
+    public void testReadMultipartCheckpoint()
+            throws Exception
+    {
+        String tableName = "test_multipart_checkpoint_" + randomNameSuffix();
+        Path tableLocation = Files.createTempFile(tableName, null);
+        copyDirectoryContents(new File(Resources.getResource("deltalake/multipart_checkpoint").toURI()).toPath(), tableLocation);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+        assertThat(query("DESCRIBE " + tableName)).projected("Column", "Type").skippingTypesCheck().matches("VALUES ('c', 'integer')");
+        assertThat(query("SELECT * FROM " + tableName)).matches("VALUES 1, 2, 3, 4, 5, 6, 7");
+    }
+
+    private static MetadataEntry loadMetadataEntry(long entryNumber, Path tableLocation)
             throws IOException
     {
-        try (Stream<Path> stream = Files.walk(source)) {
-            stream.forEach(file -> {
-                try {
-                    Files.copy(file, destination.resolve(source.relativize(file)), REPLACE_EXISTING);
-                }
-                catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            });
+        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS).create(SESSION);
+        DeltaLakeTransactionLogEntry transactionLog = getEntriesFromJson(entryNumber, tableLocation.resolve("_delta_log").toString(), fileSystem).orElseThrow().stream()
+                .filter(log -> log.getMetaData() != null)
+                .collect(onlyElement());
+        return transactionLog.getMetaData();
+    }
+
+    private String getTableLocation(String tableName)
+    {
+        Pattern locationPattern = Pattern.compile(".*location = '(.*?)'.*", Pattern.DOTALL);
+        Matcher m = locationPattern.matcher((String) computeActual("SHOW CREATE TABLE " + tableName).getOnlyValue());
+        if (m.find()) {
+            String location = m.group(1);
+            verify(!m.find(), "Unexpected second match");
+            return location;
         }
+        throw new IllegalStateException("Location not found in SHOW CREATE TABLE result");
     }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeColumnMapping.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeColumnMapping.java
new file mode 100644
index 000000000000..8001bb889a27
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeColumnMapping.java
@@ -0,0 +1,147 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.airlift.json.ObjectMapperProvider;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
+import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.MoreCollectors.onlyElement;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createDeltaLakeQueryRunner;
+import static io.trino.plugin.deltalake.DeltaTestingConnectorSession.SESSION;
+import static io.trino.plugin.deltalake.transactionlog.checkpoint.TransactionLogTail.getEntriesFromJson;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDeltaLakeColumnMapping
+        extends AbstractTestQueryFramework
+{
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapperProvider().get();
+    // The col-{uuid} pattern for delta.columnMapping.physicalName
+    private static final Pattern PHYSICAL_COLUMN_NAME_PATTERN = Pattern.compile("^col-[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        return createDeltaLakeQueryRunner(DELTA_CATALOG, ImmutableMap.of(), ImmutableMap.of("delta.enable-non-concurrent-writes", "true"));
+    }
+
+    @Test
+    public void testCreateTableWithColumnMappingMode()
+            throws Exception
+    {
+        testCreateTableColumnMappingMode(tableName -> {
+            assertUpdate("CREATE TABLE " + tableName + "(a_int integer, a_row row(x integer)) WITH (column_mapping_mode='id')");
+            assertUpdate("INSERT INTO " + tableName + " VALUES (1, row(11))", 1);
+        });
+
+        testCreateTableColumnMappingMode(tableName -> {
+            assertUpdate("CREATE TABLE " + tableName + "(a_int integer, a_row row(x integer)) WITH (column_mapping_mode='name')");
+            assertUpdate("INSERT INTO " + tableName + " VALUES (1, row(11))", 1);
+        });
+    }
+
+    @Test
+    public void testCreateTableAsSelectWithColumnMappingMode()
+            throws Exception
+    {
+        testCreateTableColumnMappingMode(tableName ->
+                assertUpdate("CREATE TABLE " + tableName + " WITH (column_mapping_mode='id')" +
+                        " AS SELECT 1 AS a_int, CAST(row(11) AS row(x integer)) AS a_row", 1));
+
+        testCreateTableColumnMappingMode(tableName ->
+                assertUpdate("CREATE TABLE " + tableName + " WITH (column_mapping_mode='name')" +
+                        " AS SELECT 1 AS a_int, CAST(row(11) AS row(x integer)) AS a_row", 1));
+    }
+
+    private void testCreateTableColumnMappingMode(Consumer<String> createTable)
+            throws IOException
+    {
+        String tableName = "test_create_table_column_mapping_mode_" + randomNameSuffix();
+        createTable.accept(tableName);
+
+        assertThat(query("SELECT * FROM " + tableName))
+                .matches("VALUES (1, CAST(row(11) AS row(x integer)))");
+
+        String tableLocation = getTableLocation(tableName);
+        MetadataEntry metadata = loadMetadataEntry(0, Path.of(tableLocation));
+
+        assertThat(metadata.getConfiguration().get("delta.columnMapping.maxColumnId"))
+                .isEqualTo("3"); // 3 comes from a_int + a_row + a_row.x
+
+        JsonNode schema = OBJECT_MAPPER.readTree(metadata.getSchemaString());
+        List<JsonNode> fields = ImmutableList.copyOf(schema.get("fields").elements());
+        assertThat(fields).hasSize(2);
+        JsonNode intColumn = fields.get(0);
+        JsonNode rowColumn = fields.get(1);
+        List<JsonNode> rowFields = ImmutableList.copyOf(rowColumn.get("type").get("fields").elements());
+        assertThat(rowFields).hasSize(1);
+        JsonNode nestedInt = rowFields.get(0);
+
+        // Verify delta.columnMapping.id and delta.columnMapping.physicalName values
+        assertThat(intColumn.get("metadata").get("delta.columnMapping.id").asInt()).isEqualTo(1);
+        assertThat(intColumn.get("metadata").get("delta.columnMapping.physicalName").asText()).containsPattern(PHYSICAL_COLUMN_NAME_PATTERN);
+
+        assertThat(rowColumn.get("metadata").get("delta.columnMapping.id").asInt()).isEqualTo(3);
+        assertThat(rowColumn.get("metadata").get("delta.columnMapping.physicalName").asText()).containsPattern(PHYSICAL_COLUMN_NAME_PATTERN);
+
+        assertThat(nestedInt.get("metadata").get("delta.columnMapping.id").asInt()).isEqualTo(2);
+        assertThat(nestedInt.get("metadata").get("delta.columnMapping.physicalName").asText()).containsPattern(PHYSICAL_COLUMN_NAME_PATTERN);
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    private String getTableLocation(String tableName)
+    {
+        Pattern locationPattern = Pattern.compile(".*location = '(.*?)'.*", Pattern.DOTALL);
+        Matcher m = locationPattern.matcher((String) computeActual("SHOW CREATE TABLE " + tableName).getOnlyValue());
+        if (m.find()) {
+            String location = m.group(1);
+            verify(!m.find(), "Unexpected second match");
+            return location;
+        }
+        throw new IllegalStateException("Location not found in SHOW CREATE TABLE result");
+    }
+
+    private static MetadataEntry loadMetadataEntry(long entryNumber, Path tableLocation)
+            throws IOException
+    {
+        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS).create(SESSION);
+        DeltaLakeTransactionLogEntry transactionLog = getEntriesFromJson(entryNumber, tableLocation.resolve("_delta_log").toString(), fileSystem).orElseThrow().stream()
+                .filter(log -> log.getMetaData() != null)
+                .collect(onlyElement());
+        return transactionLog.getMetaData();
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConfig.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConfig.java
index 93ee7fade662..f374ebb6c605 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConfig.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConfig.java
@@ -17,7 +17,7 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.plugin.hive.HiveCompressionCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.TimeZone;
@@ -43,7 +43,7 @@ public void testDefaults()
                 .setDataFileCacheTtl(new Duration(30, MINUTES))
                 .setMetadataCacheTtl(new Duration(5, TimeUnit.MINUTES))
                 .setMetadataCacheMaxSize(1000)
-                .setDomainCompactionThreshold(100)
+                .setDomainCompactionThreshold(1000)
                 .setMaxSplitsPerSecond(Integer.MAX_VALUE)
                 .setMaxOutstandingSplits(1_000)
                 .setMaxInitialSplits(200)
@@ -67,7 +67,9 @@ public void testDefaults()
                 .setTargetMaxFileSize(DataSize.of(1, GIGABYTE))
                 .setUniqueTableLocation(true)
                 .setLegacyCreateTableWithExistingLocationEnabled(false)
-                .setRegisterTableProcedureEnabled(false));
+                .setRegisterTableProcedureEnabled(false)
+                .setProjectionPushdownEnabled(true)
+                .setQueryPartitionFilterRequired(false));
     }
 
     @Test
@@ -103,6 +105,8 @@ public void testExplicitPropertyMappings()
                 .put("delta.unique-table-location", "false")
                 .put("delta.legacy-create-table-with-existing-location.enabled", "true")
                 .put("delta.register-table-procedure.enabled", "true")
+                .put("delta.projection-pushdown-enabled", "false")
+                .put("delta.query-partition-filter-required", "true")
                 .buildOrThrow();
 
         DeltaLakeConfig expected = new DeltaLakeConfig()
@@ -134,7 +138,9 @@ public void testExplicitPropertyMappings()
                 .setTargetMaxFileSize(DataSize.of(2, GIGABYTE))
                 .setUniqueTableLocation(false)
                 .setLegacyCreateTableWithExistingLocationEnabled(true)
-                .setRegisterTableProcedureEnabled(true);
+                .setRegisterTableProcedureEnabled(true)
+                .setProjectionPushdownEnabled(false)
+                .setQueryPartitionFilterRequired(true);
 
         assertFullMapping(properties, expected);
     }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConnectorSmokeTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConnectorSmokeTest.java
deleted file mode 100644
index de5f5a9b9787..000000000000
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConnectorSmokeTest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.deltalake;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import io.airlift.json.ObjectMapperProvider;
-import io.airlift.units.Duration;
-import io.trino.plugin.deltalake.transactionlog.writer.S3NativeTransactionLogSynchronizer;
-import io.trino.plugin.hive.parquet.ParquetWriterConfig;
-import io.trino.testing.QueryRunner;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import static com.google.common.base.Verify.verify;
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.testing.assertions.Assert.assertEventually;
-import static java.lang.String.format;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-public class TestDeltaLakeConnectorSmokeTest
-        extends BaseDeltaLakeAwsConnectorSmokeTest
-{
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapperProvider().get();
-
-    @Override
-    protected QueryRunner createDeltaLakeQueryRunner(Map<String, String> connectorProperties)
-            throws Exception
-    {
-        verify(!new ParquetWriterConfig().isParquetOptimizedWriterEnabled(), "This test assumes the optimized Parquet writer is disabled by default");
-        return DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner(
-                DELTA_CATALOG,
-                SCHEMA,
-                ImmutableMap.<String, String>builder()
-                        .putAll(connectorProperties)
-                        .put("delta.enable-non-concurrent-writes", "true")
-                        .put("hive.s3.max-connections", "2")
-                        .buildOrThrow(),
-                hiveMinioDataLake.getMinio().getMinioAddress(),
-                hiveMinioDataLake.getHiveHadoop());
-    }
-
-    @Test(dataProvider = "writesLockedQueryProvider")
-    public void testWritesLocked(String writeStatement)
-            throws Exception
-    {
-        String tableName = "test_writes_locked" + randomNameSuffix();
-        try {
-            assertUpdate(
-                    format("CREATE TABLE %s (a_number, a_string) WITH (location = 's3://%s/%s') AS " +
-                                    "VALUES (1, 'ala'), (2, 'ma')",
-                            tableName,
-                            bucketName,
-                            tableName),
-                    2);
-
-            Set<String> originalFiles = ImmutableSet.copyOf(getTableFiles(tableName));
-            assertThat(originalFiles).isNotEmpty(); // sanity check
-
-            String lockFilePath = lockTable(tableName, java.time.Duration.ofMinutes(5));
-            assertThatThrownBy(() -> computeActual(format(writeStatement, tableName)))
-                    .hasStackTraceContaining("Transaction log locked(1); lockingCluster=some_cluster; lockingQuery=some_query");
-            assertThat(listLocks(tableName)).containsExactly(lockFilePath); // we should not delete exising, not-expired lock
-
-            // files from failed write should be cleaned up
-            Set<String> expectedFiles = ImmutableSet.<String>builder()
-                    .addAll(originalFiles)
-                    .add(lockFilePath)
-                    .build();
-            assertEventually(
-                    new Duration(5, TimeUnit.SECONDS),
-                    () -> assertThat(getTableFiles(tableName)).containsExactlyInAnyOrderElementsOf(expectedFiles));
-        }
-        finally {
-            assertUpdate("DROP TABLE " + tableName);
-        }
-    }
-
-    @DataProvider
-    public static Object[][] writesLockedQueryProvider()
-    {
-        return new Object[][] {
-                {"INSERT INTO %s VALUES (3, 'kota'), (4, 'psa')"},
-                {"UPDATE %s SET a_string = 'kota' WHERE a_number = 2"},
-                {"DELETE FROM %s WHERE a_number = 1"},
-        };
-    }
-
-    @Test(dataProvider = "writesLockExpiredValuesProvider")
-    public void testWritesLockExpired(String writeStatement, String expectedValues)
-            throws Exception
-    {
-        String tableName = "test_writes_locked" + randomNameSuffix();
-        assertUpdate(
-                format("CREATE TABLE %s (a_number, a_string) WITH (location = 's3://%s/%s') AS " +
-                                "VALUES (1, 'ala'), (2, 'ma')",
-                        tableName,
-                        bucketName,
-                        tableName),
-                2);
-
-        lockTable(tableName, java.time.Duration.ofSeconds(-5));
-        assertUpdate(format(writeStatement, tableName), 1);
-        assertQuery("SELECT * FROM " + tableName, expectedValues);
-        assertThat(listLocks(tableName)).isEmpty(); // expired lock should be cleaned up
-
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
-    @DataProvider
-    public static Object[][] writesLockExpiredValuesProvider()
-    {
-        return new Object[][] {
-                {"INSERT INTO %s VALUES (3, 'kota')", "VALUES (1,'ala'), (2,'ma'), (3,'kota')"},
-                {"UPDATE %s SET a_string = 'kota' WHERE a_number = 2", "VALUES (1,'ala'), (2,'kota')"},
-                {"DELETE FROM %s WHERE a_number = 2", "VALUES (1,'ala')"},
-        };
-    }
-
-    @Test(dataProvider = "writesLockInvalidContentsValuesProvider")
-    public void testWritesLockInvalidContents(String writeStatement, String expectedValues)
-    {
-        String tableName = "test_writes_locked" + randomNameSuffix();
-        assertUpdate(
-                format("CREATE TABLE %s (a_number, a_string) WITH (location = 's3://%s/%s') AS " +
-                                "VALUES (1, 'ala'), (2, 'ma')",
-                        tableName,
-                        bucketName,
-                        tableName),
-                2);
-
-        String lockFilePath = invalidLockTable(tableName);
-        assertUpdate(format(writeStatement, tableName), 1);
-        assertQuery("SELECT * FROM " + tableName, expectedValues);
-        assertThat(listLocks(tableName)).containsExactly(lockFilePath); // we should not delete unparsable lock file
-
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
-    @Test
-    public void testDeltaColumnInvariant()
-    {
-        String tableName = "test_invariants_" + randomNameSuffix();
-        hiveMinioDataLake.copyResources("databricks/invariants", tableName);
-        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(SCHEMA, tableName, getLocationForTable(bucketName, tableName)));
-
-        assertQuery("SELECT * FROM " + tableName, "VALUES 1");
-        assertUpdate("INSERT INTO " + tableName + " VALUES(2)", 1);
-        assertQuery("SELECT * FROM " + tableName, "VALUES (1), (2)");
-
-        assertThatThrownBy(() -> query("INSERT INTO " + tableName + " VALUES(3)"))
-                .hasMessageContaining("Check constraint violation: (\"dummy\" < 3)");
-        assertThatThrownBy(() -> query("UPDATE " + tableName + " SET dummy = 3 WHERE dummy = 1"))
-                .hasMessageContaining("Updating a table with a check constraint is not supported");
-
-        assertQuery("SELECT * FROM " + tableName, "VALUES (1), (2)");
-    }
-
-    @Test
-    public void testSchemaEvolutionOnTableWithColumnInvariant()
-    {
-        String tableName = "test_schema_evolution_on_table_with_column_invariant_" + randomNameSuffix();
-        hiveMinioDataLake.copyResources("databricks/invariants", tableName);
-        getQueryRunner().execute(format(
-                "CALL system.register_table('%s', '%s', '%s')",
-                SCHEMA,
-                tableName,
-                getLocationForTable(bucketName, tableName)));
-
-        assertThatThrownBy(() -> query("INSERT INTO " + tableName + " VALUES(3)"))
-                .hasMessageContaining("Check constraint violation: (\"dummy\" < 3)");
-
-        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN c INT");
-        assertUpdate("COMMENT ON COLUMN " + tableName + ".c IS 'example column comment'");
-        assertUpdate("COMMENT ON TABLE " + tableName + " IS 'example table comment'");
-
-        assertThatThrownBy(() -> query("INSERT INTO " + tableName + " VALUES(3, 30)"))
-                .hasMessageContaining("Check constraint violation: (\"dummy\" < 3)");
-
-        assertUpdate("INSERT INTO " + tableName + " VALUES(2, 20)", 1);
-        assertQuery("SELECT * FROM " + tableName, "VALUES (1, NULL), (2, 20)");
-    }
-
-    @DataProvider
-    public static Object[][] writesLockInvalidContentsValuesProvider()
-    {
-        return new Object[][] {
-                {"INSERT INTO %s VALUES (3, 'kota')", "VALUES (1,'ala'), (2,'ma'), (3,'kota')"},
-                {"UPDATE %s SET a_string = 'kota' WHERE a_number = 2", "VALUES (1,'ala'), (2,'kota')"},
-                {"DELETE FROM %s WHERE a_number = 2", "VALUES (1,'ala')"},
-        };
-    }
-
-    private String lockTable(String tableName, java.time.Duration lockDuration)
-            throws Exception
-    {
-        String lockFilePath = format("%s/00000000000000000001.json.sb-lock_blah", getLockFileDirectory(tableName));
-        String lockFileContents = OBJECT_MAPPER.writeValueAsString(
-                new S3NativeTransactionLogSynchronizer.LockFileContents("some_cluster", "some_query", Instant.now().plus(lockDuration).toEpochMilli()));
-        hiveMinioDataLake.writeFile(lockFileContents.getBytes(UTF_8), lockFilePath);
-        String lockUri = format("s3://%s/%s", bucketName, lockFilePath);
-        assertThat(listLocks(tableName)).containsExactly(lockUri); // sanity check
-        return lockUri;
-    }
-
-    private String invalidLockTable(String tableName)
-    {
-        String lockFilePath = format("%s/00000000000000000001.json.sb-lock_blah", getLockFileDirectory(tableName));
-        String invalidLockFileContents = "some very wrong json contents";
-        hiveMinioDataLake.writeFile(invalidLockFileContents.getBytes(UTF_8), lockFilePath);
-        String lockUri = format("s3://%s/%s", bucketName, lockFilePath);
-        assertThat(listLocks(tableName)).containsExactly(lockUri); // sanity check
-        return lockUri;
-    }
-
-    private List<String> listLocks(String tableName)
-    {
-        List<String> paths = hiveMinioDataLake.listFiles(getLockFileDirectory(tableName));
-        return paths.stream()
-                .filter(path -> path.contains(".sb-lock_"))
-                .map(path -> format("s3://%s/%s", bucketName, path))
-                .collect(toImmutableList());
-    }
-
-    private String getLockFileDirectory(String tableName)
-    {
-        return format("%s/_delta_log/_sb_lock", tableName);
-    }
-}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConnectorTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConnectorTest.java
new file mode 100644
index 000000000000..d07862db4413
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConnectorTest.java
@@ -0,0 +1,3078 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Resources;
+import io.airlift.units.DataSize;
+import io.trino.Session;
+import io.trino.execution.QueryInfo;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.ColumnMappingMode;
+import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.tpch.TpchPlugin;
+import io.trino.sql.planner.plan.TableDeleteNode;
+import io.trino.sql.planner.plan.TableFinishNode;
+import io.trino.sql.planner.plan.TableWriterNode;
+import io.trino.testing.BaseConnectorTest;
+import io.trino.testing.DataProviders;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.MaterializedResult;
+import io.trino.testing.MaterializedResultWithQueryId;
+import io.trino.testing.MaterializedRow;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.TestingConnectorBehavior;
+import io.trino.testing.containers.Minio;
+import io.trino.testing.minio.MinioClient;
+import io.trino.testing.sql.TestTable;
+import io.trino.testing.sql.TrinoSqlExecutor;
+import org.intellij.lang.annotations.Language;
+import org.testng.SkipException;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.nio.file.Path;
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.collect.Sets.union;
+import static io.trino.plugin.base.util.Closables.closeAllSuppress;
+import static io.trino.plugin.deltalake.DeltaLakeCdfPageSink.CHANGE_DATA_FOLDER_NAME;
+import static io.trino.plugin.deltalake.DeltaLakeMetadata.CHANGE_DATA_FEED_COLUMN_NAMES;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
+import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.TRANSACTION_LOG_DIRECTORY;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.planner.optimizations.PlanNodeSearcher.searchFrom;
+import static io.trino.testing.DataProviders.cartesianProduct;
+import static io.trino.testing.DataProviders.toDataProvider;
+import static io.trino.testing.DataProviders.trueFalse;
+import static io.trino.testing.MaterializedResult.resultBuilder;
+import static io.trino.testing.QueryAssertions.copyTpchTables;
+import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.EXECUTE_FUNCTION;
+import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.SELECT_COLUMN;
+import static io.trino.testing.TestingAccessControlManager.privilege;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_SCHEMA;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
+import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
+import static java.lang.String.format;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+public class TestDeltaLakeConnectorTest
+        extends BaseConnectorTest
+{
+    protected static final String SCHEMA = "test_schema";
+
+    protected final String bucketName = "test-bucket-" + randomNameSuffix();
+    protected MinioClient minioClient;
+    protected HiveMetastore metastore;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        Minio minio = closeAfterClass(Minio.builder().build());
+        minio.start();
+        minio.createBucket(bucketName);
+        minioClient = closeAfterClass(minio.createMinioClient());
+
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(testSessionBuilder()
+                        .setCatalog(DELTA_CATALOG)
+                        .setSchema(SCHEMA)
+                        .build())
+                .build();
+        Path metastoreDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("file-metastore");
+        metastore = createTestingFileHiveMetastore(metastoreDirectory.toFile());
+        try {
+            queryRunner.installPlugin(new TpchPlugin());
+            queryRunner.createCatalog("tpch", "tpch");
+
+            queryRunner.installPlugin(new DeltaLakePlugin());
+            queryRunner.createCatalog(DELTA_CATALOG, DeltaLakeConnectorFactory.CONNECTOR_NAME, ImmutableMap.<String, String>builder()
+                    .put("hive.metastore", "file")
+                    .put("hive.metastore.catalog.dir", metastoreDirectory.toString())
+                    .put("hive.metastore.disable-location-checks", "true")
+                    .put("hive.s3.aws-access-key", MINIO_ACCESS_KEY)
+                    .put("hive.s3.aws-secret-key", MINIO_SECRET_KEY)
+                    .put("hive.s3.endpoint", minio.getMinioAddress())
+                    .put("hive.s3.path-style-access", "true")
+                    .put("delta.enable-non-concurrent-writes", "true")
+                    .put("delta.register-table-procedure.enabled", "true")
+                    .buildOrThrow());
+
+            queryRunner.execute("CREATE SCHEMA " + SCHEMA + " WITH (location = 's3://" + bucketName + "/" + SCHEMA + "')");
+            queryRunner.execute("CREATE SCHEMA schemawithoutunderscore WITH (location = 's3://" + bucketName + "/schemawithoutunderscore')");
+            copyTpchTables(queryRunner, "tpch", TINY_SCHEMA_NAME, queryRunner.getDefaultSession(), REQUIRED_TPCH_TABLES);
+        }
+        catch (Throwable e) {
+            closeAllSuppress(e, queryRunner);
+            throw e;
+        }
+
+        return queryRunner;
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void tearDown()
+    {
+        minioClient = null; // closed by closeAfterClass
+    }
+
+    @Override
+    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
+    {
+        return switch (connectorBehavior) {
+            case SUPPORTS_REPORTING_WRITTEN_BYTES -> true;
+            case SUPPORTS_ADD_FIELD,
+                    SUPPORTS_AGGREGATION_PUSHDOWN,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_DROP_FIELD,
+                    SUPPORTS_LIMIT_PUSHDOWN,
+                    SUPPORTS_PREDICATE_PUSHDOWN,
+                    SUPPORTS_RENAME_FIELD,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
+
+    @Override
+    protected String errorMessageForInsertIntoNotNullColumn(String columnName)
+    {
+        return "NULL value not allowed for NOT NULL column: " + columnName;
+    }
+
+    @Override
+    protected void verifyConcurrentUpdateFailurePermissible(Exception e)
+    {
+        assertThat(e)
+                .hasMessage("Failed to write Delta Lake transaction log entry")
+                .cause()
+                .hasMessageMatching(transactionConflictErrors());
+    }
+
+    @Override
+    protected void verifyConcurrentInsertFailurePermissible(Exception e)
+    {
+        assertThat(e)
+                .hasMessage("Failed to write Delta Lake transaction log entry")
+                .cause()
+                .hasMessageMatching(transactionConflictErrors());
+    }
+
+    @Override
+    protected void verifyConcurrentAddColumnFailurePermissible(Exception e)
+    {
+        assertThat(e)
+                .hasMessageMatching("Unable to add '.*' column for: .*")
+                .cause()
+                .hasMessageMatching(transactionConflictErrors());
+    }
+
+    @Language("RegExp")
+    private static String transactionConflictErrors()
+    {
+        return "Transaction log locked.*" +
+                "|Target file already exists: .*/_delta_log/\\d+.json" +
+                "|Conflicting concurrent writes found\\..*" +
+                "|Multiple live locks found for:.*" +
+                "|Target file was created during locking: .*";
+    }
+
+    @Override
+    protected Optional<DataMappingTestSetup> filterCaseSensitiveDataMappingTestData(DataMappingTestSetup dataMappingTestSetup)
+    {
+        String typeName = dataMappingTestSetup.getTrinoTypeName();
+        if (typeName.equals("char(1)")) {
+            return Optional.of(dataMappingTestSetup.asUnsupported());
+        }
+        return Optional.of(dataMappingTestSetup);
+    }
+
+    @Override
+    protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMappingTestSetup dataMappingTestSetup)
+    {
+        String typeName = dataMappingTestSetup.getTrinoTypeName();
+        if (typeName.equals("time") ||
+                typeName.equals("time(6)") ||
+                typeName.equals("timestamp") ||
+                typeName.equals("timestamp(6) with time zone") ||
+                typeName.equals("char(3)")) {
+            return Optional.of(dataMappingTestSetup.asUnsupported());
+        }
+        return Optional.of(dataMappingTestSetup);
+    }
+
+    @Override
+    protected TestTable createTableWithDefaultColumns()
+    {
+        throw new SkipException("Delta Lake does not support columns with a default value");
+    }
+
+    @Override
+    protected MaterializedResult getDescribeOrdersResult()
+    {
+        return resultBuilder(getQueryRunner().getDefaultSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
+                .row("orderkey", "bigint", "", "")
+                .row("custkey", "bigint", "", "")
+                .row("orderstatus", "varchar", "", "")
+                .row("totalprice", "double", "", "")
+                .row("orderdate", "date", "", "")
+                .row("orderpriority", "varchar", "", "")
+                .row("clerk", "varchar", "", "")
+                .row("shippriority", "integer", "", "")
+                .row("comment", "varchar", "", "")
+                .build();
+    }
+
+    @Test
+    @Override
+    public void testShowCreateTable()
+    {
+        assertThat((String) computeScalar("SHOW CREATE TABLE orders"))
+                .matches("\\QCREATE TABLE " + DELTA_CATALOG + "." + SCHEMA + ".orders (\n" +
+                        "   orderkey bigint,\n" +
+                        "   custkey bigint,\n" +
+                        "   orderstatus varchar,\n" +
+                        "   totalprice double,\n" +
+                        "   orderdate date,\n" +
+                        "   orderpriority varchar,\n" +
+                        "   clerk varchar,\n" +
+                        "   shippriority integer,\n" +
+                        "   comment varchar\n" +
+                        ")\n" +
+                        "WITH (\n" +
+                        "   location = \\E'.*/test_schema/orders.*'\n\\Q" +
+                        ")");
+    }
+
+    // not pushdownable means not convertible to a tuple domain
+    @Test
+    public void testQueryNullPartitionWithNotPushdownablePredicate()
+    {
+        String tableName = "test_null_partitions_" + randomNameSuffix();
+        assertUpdate("" +
+                        "CREATE TABLE " + tableName + " (a, b, c) WITH (location = '" + format("s3://%s/%s", bucketName, tableName) + "', partitioned_by = ARRAY['c']) " +
+                        "AS VALUES (1, 1, 1), (2, 2, 2), (3, 3, 3), (null, null, null), (4, 4, 4)",
+                "VALUES 5");
+        assertQuery("SELECT a FROM " + tableName + " WHERE c % 5 = 1", "VALUES (1)");
+    }
+
+    @Test
+    public void testPartitionColumnOrderIsDifferentFromTableDefinition()
+    {
+        String tableName = "test_partition_order_is_different_from_table_definition_" + randomNameSuffix();
+        assertUpdate("" +
+                "CREATE TABLE " + tableName + "(data int, first varchar, second varchar) " +
+                "WITH (" +
+                "partitioned_by = ARRAY['second', 'first'], " +
+                "location = '" + format("s3://%s/%s", bucketName, tableName) + "')");
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES (1, 'first#1', 'second#1')", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES (1, 'first#1', 'second#1')");
+
+        assertUpdate("INSERT INTO " + tableName + " (data, first) VALUES (2, 'first#2')", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES (1, 'first#1', 'second#1'), (2, 'first#2', NULL)");
+
+        assertUpdate("INSERT INTO " + tableName + " (data, second) VALUES (3, 'second#3')", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES (1, 'first#1', 'second#1'), (2, 'first#2', NULL), (3, NULL, 'second#3')");
+
+        assertUpdate("INSERT INTO " + tableName + " (data) VALUES (4)", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES (1, 'first#1', 'second#1'), (2, 'first#2', NULL), (3, NULL, 'second#3'), (4, NULL, NULL)");
+    }
+
+    @Test
+    public void testCreateTableWithAllPartitionColumns()
+    {
+        String tableName = "test_create_table_all_partition_columns_" + randomNameSuffix();
+        assertQueryFails(
+                "CREATE TABLE " + tableName + "(part INT) WITH (partitioned_by = ARRAY['part'])",
+                "Using all columns for partition columns is unsupported");
+    }
+
+    @Test
+    public void testCreateTableAsSelectAllPartitionColumns()
+    {
+        String tableName = "test_create_table_all_partition_columns_" + randomNameSuffix();
+        assertQueryFails(
+                "CREATE TABLE " + tableName + " WITH (partitioned_by = ARRAY['part']) AS SELECT 1 part",
+                "Using all columns for partition columns is unsupported");
+    }
+
+    @Test
+    public void testCreateTableWithUnsupportedPartitionType()
+    {
+        String tableName = "test_create_table_unsupported_partition_types_" + randomNameSuffix();
+        assertQueryFails(
+                "CREATE TABLE " + tableName + "(a INT, part ARRAY(INT)) WITH (partitioned_by = ARRAY['part'])",
+                "Using array, map or row type on partitioned columns is unsupported");
+        assertQueryFails(
+                "CREATE TABLE " + tableName + "(a INT, part MAP(INT,INT)) WITH (partitioned_by = ARRAY['part'])",
+                "Using array, map or row type on partitioned columns is unsupported");
+        assertQueryFails(
+                "CREATE TABLE " + tableName + "(a INT, part ROW(field INT)) WITH (partitioned_by = ARRAY['part'])",
+                "Using array, map or row type on partitioned columns is unsupported");
+    }
+
+    @Test
+    public void testCreateTableAsSelectWithUnsupportedPartitionType()
+    {
+        String tableName = "test_ctas_unsupported_partition_types_" + randomNameSuffix();
+        assertQueryFails(
+                "CREATE TABLE " + tableName + " WITH (partitioned_by = ARRAY['part']) AS SELECT 1 a, array[1] part",
+                "Using array, map or row type on partitioned columns is unsupported");
+        assertQueryFails(
+                "CREATE TABLE " + tableName + " WITH (partitioned_by = ARRAY['part']) AS SELECT 1 a, map() part",
+                "Using array, map or row type on partitioned columns is unsupported");
+        assertQueryFails(
+                "CREATE TABLE " + tableName + " WITH (partitioned_by = ARRAY['part']) AS SELECT 1 a, row(1) part",
+                "Using array, map or row type on partitioned columns is unsupported");
+    }
+
+    @Override
+    public void testShowCreateSchema()
+    {
+        String schemaName = getSession().getSchema().orElseThrow();
+        assertThat((String) computeScalar("SHOW CREATE SCHEMA " + schemaName))
+                .isEqualTo(format("CREATE SCHEMA %s.%s\n" +
+                        "WITH (\n" +
+                        "   location = 's3://%s/test_schema'\n" +
+                        ")", getSession().getCatalog().orElseThrow(), schemaName, bucketName));
+    }
+
+    @Override
+    public void testDropNonEmptySchemaWithTable()
+    {
+        String schemaName = "test_drop_non_empty_schema_" + randomNameSuffix();
+        if (!hasBehavior(SUPPORTS_CREATE_SCHEMA)) {
+            return;
+        }
+
+        assertUpdate("CREATE SCHEMA " + schemaName + " WITH (location = 's3://" + bucketName + "/" + schemaName + "')");
+        assertUpdate("CREATE TABLE " + schemaName + ".t(x int)");
+        assertQueryFails("DROP SCHEMA " + schemaName, ".*Cannot drop non-empty schema '\\Q" + schemaName + "\\E'");
+        assertUpdate("DROP TABLE " + schemaName + ".t");
+        assertUpdate("DROP SCHEMA " + schemaName);
+    }
+
+    @Override
+    public void testDropColumn()
+    {
+        // Override because the connector doesn't support dropping columns with 'none' column mapping
+        // There are some tests in in io.trino.tests.product.deltalake.TestDeltaLakeColumnMappingMode
+        assertThatThrownBy(super::testDropColumn)
+                .hasMessageContaining("Cannot drop column from table using column mapping mode NONE");
+    }
+
+    @Override
+    public void testAddAndDropColumnName(String columnName)
+    {
+        // Override because the connector doesn't support dropping columns with 'none' column mapping
+        // There are some tests in in io.trino.tests.product.deltalake.TestDeltaLakeColumnMappingMode
+        assertThatThrownBy(() -> super.testAddAndDropColumnName(columnName))
+                .hasMessageContaining("Cannot drop column from table using column mapping mode NONE");
+    }
+
+    @Override
+    public void testDropAndAddColumnWithSameName()
+    {
+        // Override because the connector doesn't support dropping columns with 'none' column mapping
+        // There are some tests in in io.trino.tests.product.deltalake.TestDeltaLakeColumnMappingMode
+        assertThatThrownBy(super::testDropAndAddColumnWithSameName)
+                .hasMessageContaining("Cannot drop column from table using column mapping mode NONE");
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testDropPartitionColumn(ColumnMappingMode mode)
+    {
+        if (mode == ColumnMappingMode.NONE) {
+            throw new SkipException("Tested in testDropColumn");
+        }
+
+        String tableName = "test_drop_partition_column_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + "(data int, part int) WITH (partitioned_by = ARRAY['part'], column_mapping_mode = '" + mode + "')");
+
+        assertQueryFails("ALTER TABLE " + tableName + " DROP COLUMN part", "Cannot drop partition column: part");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testDropLastNonPartitionColumn()
+    {
+        String tableName = "test_drop_last_non_partition_column_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + "(data int, part int) WITH (partitioned_by = ARRAY['part'], column_mapping_mode = 'name')");
+
+        assertQueryFails("ALTER TABLE " + tableName + " DROP COLUMN data", "Dropping the last non-partition column is unsupported");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Override
+    public void testRenameColumn()
+    {
+        // Override because the connector doesn't support renaming columns with 'none' column mapping
+        // There are some tests in in io.trino.tests.product.deltalake.TestDeltaLakeColumnMappingMode
+        assertThatThrownBy(super::testRenameColumn)
+                .hasMessageContaining("Cannot rename column in table using column mapping mode NONE");
+    }
+
+    @Override
+    public void testRenameColumnWithComment()
+    {
+        // Override because the connector doesn't support renaming columns with 'none' column mapping
+        // There are some tests in in io.trino.tests.product.deltalake.TestDeltaLakeColumnMappingMode
+        assertThatThrownBy(super::testRenameColumnWithComment)
+                .hasMessageContaining("Cannot rename column in table using column mapping mode NONE");
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testDeltaRenameColumnWithComment(ColumnMappingMode mode)
+    {
+        if (mode == ColumnMappingMode.NONE) {
+            throw new SkipException("The connector doesn't support renaming columns with 'none' column mapping");
+        }
+
+        String tableName = "test_rename_column_" + randomNameSuffix();
+        assertUpdate("" +
+                "CREATE TABLE " + tableName +
+                "(col INT COMMENT 'test column comment', part INT COMMENT 'test partition comment')" +
+                "WITH (" +
+                "partitioned_by = ARRAY['part']," +
+                "location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'," +
+                "column_mapping_mode = '" + mode + "')");
+
+        assertUpdate("ALTER TABLE " + tableName + " RENAME COLUMN col TO new_col");
+        assertEquals(getColumnComment(tableName, "new_col"), "test column comment");
+
+        assertUpdate("ALTER TABLE " + tableName + " RENAME COLUMN part TO new_part");
+        assertEquals(getColumnComment(tableName, "new_part"), "test partition comment");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Override
+    public void testAlterTableRenameColumnToLongName()
+    {
+        // Override because the connector doesn't support renaming columns with 'none' column mapping
+        // There are some tests in in io.trino.tests.product.deltalake.TestDeltaLakeColumnMappingMode
+        assertThatThrownBy(super::testAlterTableRenameColumnToLongName)
+                .hasMessageContaining("Cannot rename column in table using column mapping mode NONE");
+    }
+
+    @Override
+    public void testRenameColumnName(String columnName)
+    {
+        // Override because the connector doesn't support renaming columns with 'none' column mapping
+        // There are some tests in in io.trino.tests.product.deltalake.TestDeltaLakeColumnMappingMode
+        assertThatThrownBy(() -> super.testRenameColumnName(columnName))
+                .hasMessageContaining("Cannot rename column in table using column mapping mode NONE");
+    }
+
+    @Override
+    public void testCharVarcharComparison()
+    {
+        // Delta Lake doesn't have a char type
+        assertThatThrownBy(super::testCharVarcharComparison)
+                .hasStackTraceContaining("Unsupported type: char(3)");
+    }
+
+    @Test(dataProvider = "timestampValues")
+    public void testTimestampPredicatePushdown(String value)
+    {
+        String tableName = "test_parquet_timestamp_predicate_pushdown_" + randomNameSuffix();
+
+        assertUpdate("DROP TABLE IF EXISTS " + tableName);
+        assertUpdate("CREATE TABLE " + tableName + " (t TIMESTAMP WITH TIME ZONE)");
+        assertUpdate("INSERT INTO " + tableName + " VALUES (TIMESTAMP '" + value + "')", 1);
+
+        DistributedQueryRunner queryRunner = (DistributedQueryRunner) getQueryRunner();
+        MaterializedResultWithQueryId queryResult = queryRunner.executeWithQueryId(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE t < TIMESTAMP '" + value + "'");
+        assertEquals(getQueryInfo(queryRunner, queryResult).getQueryStats().getProcessedInputDataSize().toBytes(), 0);
+
+        queryResult = queryRunner.executeWithQueryId(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE t > TIMESTAMP '" + value + "'");
+        assertEquals(getQueryInfo(queryRunner, queryResult).getQueryStats().getProcessedInputDataSize().toBytes(), 0);
+
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE t = TIMESTAMP '" + value + "'",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> {});
+    }
+
+    @Test
+    public void testTimestampPartition()
+    {
+        String tableName = "test_timestamp_ntz_partition_" + randomNameSuffix();
+
+        assertUpdate("DROP TABLE IF EXISTS " + tableName);
+        assertUpdate("CREATE TABLE " + tableName + "(id INT, part TIMESTAMP(6)) WITH (partitioned_by = ARRAY['part'])");
+        assertUpdate(
+                "INSERT INTO " + tableName + " VALUES " +
+                "(1, NULL)," +
+                "(2, TIMESTAMP '0001-01-01 00:00:00.000')," +
+                "(3, TIMESTAMP '2023-07-20 01:02:03.9999999')," +
+                "(4, TIMESTAMP '9999-12-31 23:59:59.999999')",
+                4);
+
+        assertThat(query("SELECT * FROM " + tableName))
+                .matches("VALUES " +
+                         "(1, NULL)," +
+                         "(2, TIMESTAMP '0001-01-01 00:00:00.000000')," +
+                         "(3, TIMESTAMP '2023-07-20 01:02:04.000000')," +
+                         "(4, TIMESTAMP '9999-12-31 23:59:59.999999')");
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                "('id', null, 4.0, 0.0, null, 1, 4)," +
+                "('part', null, 3.0, 0.25, null, null, null)," +
+                "(null, null, null, null, 4.0, null, null)");
+
+        assertThat((String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 1"))
+                .contains("/part=__HIVE_DEFAULT_PARTITION__/");
+        assertThat((String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 2"))
+                .contains("/part=0001-01-01 00%3A00%3A00/");
+        assertThat((String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 3"))
+                .contains("/part=2023-07-20 01%3A02%3A04/");
+        assertThat((String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 4"))
+                .contains("/part=9999-12-31 23%3A59%3A59.999999/");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testTimestampWithTimeZonePartition()
+    {
+        String tableName = "test_timestamp_tz_partition_" + randomNameSuffix();
+
+        assertUpdate("DROP TABLE IF EXISTS " + tableName);
+        assertUpdate("CREATE TABLE " + tableName + "(id INT, part TIMESTAMP WITH TIME ZONE) WITH (partitioned_by = ARRAY['part'])");
+        assertUpdate(
+                "INSERT INTO " + tableName + " VALUES " +
+                        "(1, NULL)," +
+                        "(2, TIMESTAMP '0001-01-01 00:00:00.000 UTC')," +
+                        "(3, TIMESTAMP '2023-07-20 01:02:03.9999 -01:00')," +
+                        "(4, TIMESTAMP '9999-12-31 23:59:59.999 UTC')",
+                4);
+
+        assertThat(query("SELECT * FROM " + tableName))
+                .matches("VALUES " +
+                        "(1, NULL)," +
+                        "(2, TIMESTAMP '0001-01-01 00:00:00.000 UTC')," +
+                        "(3, TIMESTAMP '2023-07-20 02:02:04.000 UTC')," +
+                        "(4, TIMESTAMP '9999-12-31 23:59:59.999 UTC')");
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                        "('id', null, 4.0, 0.0, null, 1, 4)," +
+                        "('part', null, 3.0, 0.25, null, null, null)," +
+                        "(null, null, null, null, 4.0, null, null)");
+
+        assertThat((String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 1"))
+                .contains("/part=__HIVE_DEFAULT_PARTITION__/");
+        assertThat((String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 2"))
+                .contains("/part=0001-01-01 00%3A00%3A00/");
+        assertThat((String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 3"))
+                .contains("/part=2023-07-20 02%3A02%3A04/");
+        assertThat((String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 4"))
+                .contains("/part=9999-12-31 23%3A59%3A59.999/");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @DataProvider
+    public Object[][] timestampValues()
+    {
+        return new Object[][] {
+                {"1965-10-31 01:00:08.123 UTC"},
+                {"1965-10-31 01:00:08.999 UTC"},
+                {"1970-01-01 01:13:42.000 America/Bahia_Banderas"}, // There is a gap in JVM zone
+                {"1970-01-01 00:00:00.000 Asia/Kathmandu"},
+                {"2018-10-28 01:33:17.456 Europe/Vilnius"},
+                {"9999-12-31 23:59:59.999 UTC"}};
+    }
+
+    @Test
+    public void testAddColumnToPartitionedTable()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_column_partitioned_table_", "(x VARCHAR, part VARCHAR) WITH (partitioned_by = ARRAY['part'])")) {
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'first', 'part-0001'", 1);
+            assertQueryFails("ALTER TABLE " + table.getName() + " ADD COLUMN x bigint", ".* Column 'x' already exists");
+            assertQueryFails("ALTER TABLE " + table.getName() + " ADD COLUMN part bigint", ".* Column 'part' already exists");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN a varchar(50)");
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'second', 'part-0002', 'xxx'", 1);
+            assertQuery(
+                    "SELECT x, part, a FROM " + table.getName(),
+                    "VALUES ('first', 'part-0001', NULL), ('second', 'part-0002', 'xxx')");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN b double");
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'third', 'part-0003', 'yyy', 33.3E0", 1);
+            assertQuery(
+                    "SELECT x, part, a, b FROM " + table.getName(),
+                    "VALUES ('first', 'part-0001', NULL, NULL), ('second', 'part-0002', 'xxx', NULL), ('third', 'part-0003', 'yyy', 33.3)");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN IF NOT EXISTS c varchar(50)");
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN IF NOT EXISTS part varchar(50)");
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'fourth', 'part-0004', 'zzz', 55.3E0, 'newColumn'", 1);
+            assertQuery(
+                    "SELECT x, part, a, b, c FROM " + table.getName(),
+                    "VALUES ('first', 'part-0001', NULL, NULL, NULL), ('second', 'part-0002', 'xxx', NULL, NULL), ('third', 'part-0003', 'yyy', 33.3, NULL), ('fourth', 'part-0004', 'zzz', 55.3, 'newColumn')");
+        }
+    }
+
+    private QueryInfo getQueryInfo(DistributedQueryRunner queryRunner, MaterializedResultWithQueryId queryResult)
+    {
+        return queryRunner.getCoordinator().getQueryManager().getFullQueryInfo(queryResult.getQueryId());
+    }
+
+    @Test
+    public void testAddColumnAndOptimize()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_column_and_optimize", "(x VARCHAR)")) {
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'first'", 1);
+
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN a varchar(50)");
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'second', 'xxx'", 1);
+            assertQuery(
+                    "SELECT x, a FROM " + table.getName(),
+                    "VALUES ('first', NULL), ('second', 'xxx')");
+
+            Set<String> beforeActiveFiles = getActiveFiles(table.getName());
+            computeActual("ALTER TABLE " + table.getName() + " EXECUTE OPTIMIZE");
+
+            // Verify OPTIMIZE happened, but table data didn't change
+            assertThat(beforeActiveFiles).isNotEqualTo(getActiveFiles(table.getName()));
+            assertQuery(
+                    "SELECT x, a FROM " + table.getName(),
+                    "VALUES ('first', NULL), ('second', 'xxx')");
+        }
+    }
+
+    @Test
+    public void testAddColumnAndVacuum()
+            throws Exception
+    {
+        Session sessionWithShortRetentionUnlocked = Session.builder(getSession())
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "vacuum_min_retention", "0s")
+                .build();
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_column_and_optimize", "(x VARCHAR)")) {
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'first'", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'second'", 1);
+
+            Set<String> initialFiles = getActiveFiles(table.getName());
+            assertThat(initialFiles).hasSize(2);
+
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN a varchar(50)");
+
+            assertUpdate("UPDATE " + table.getName() + " SET a = 'new column'", 2);
+            Stopwatch timeSinceUpdate = Stopwatch.createStarted();
+            Set<String> updatedFiles = getActiveFiles(table.getName());
+            assertThat(updatedFiles)
+                    .hasSizeGreaterThanOrEqualTo(1)
+                    .hasSizeLessThanOrEqualTo(2)
+                    .doesNotContainAnyElementsOf(initialFiles);
+            assertThat(getAllDataFilesFromTableDirectory(table.getName())).isEqualTo(union(initialFiles, updatedFiles));
+
+            assertQuery(
+                    "SELECT x, a FROM " + table.getName(),
+                    "VALUES ('first', 'new column'), ('second', 'new column')");
+
+            MILLISECONDS.sleep(1_000 - timeSinceUpdate.elapsed(MILLISECONDS) + 1);
+            assertUpdate(sessionWithShortRetentionUnlocked, "CALL system.vacuum(schema_name => CURRENT_SCHEMA, table_name => '" + table.getName() + "', retention => '1s')");
+
+            // Verify VACUUM happened, but table data didn't change
+            assertThat(getAllDataFilesFromTableDirectory(table.getName())).isEqualTo(updatedFiles);
+            assertQuery(
+                    "SELECT x, a FROM " + table.getName(),
+                    "VALUES ('first', 'new column'), ('second', 'new column')");
+        }
+    }
+
+    @Test
+    public void testTargetMaxFileSize()
+    {
+        String tableName = "test_default_max_file_size" + randomNameSuffix();
+        @Language("SQL") String createTableSql = format("CREATE TABLE %s AS SELECT * FROM tpch.sf1.lineitem LIMIT 100000", tableName);
+
+        Session session = Session.builder(getSession())
+                .setSystemProperty("task_min_writer_count", "1")
+                // task scale writers should be disabled since we want to write with a single task writer
+                .setSystemProperty("task_scale_writers_enabled", "false")
+                .build();
+        assertUpdate(session, createTableSql, 100000);
+        Set<String> initialFiles = getActiveFiles(tableName);
+        assertThat(initialFiles.size()).isLessThanOrEqualTo(3);
+        assertUpdate(format("DROP TABLE %s", tableName));
+
+        DataSize maxSize = DataSize.of(40, DataSize.Unit.KILOBYTE);
+        session = Session.builder(getSession())
+                .setSystemProperty("task_min_writer_count", "1")
+                // task scale writers should be disabled since we want to write with a single task writer
+                .setSystemProperty("task_scale_writers_enabled", "false")
+                .setCatalogSessionProperty("delta", "target_max_file_size", maxSize.toString())
+                .build();
+
+        assertUpdate(session, createTableSql, 100000);
+        assertThat(query(format("SELECT count(*) FROM %s", tableName))).matches("VALUES BIGINT '100000'");
+        Set<String> updatedFiles = getActiveFiles(tableName);
+        assertThat(updatedFiles.size()).isGreaterThan(10);
+
+        MaterializedResult result = computeActual("SELECT DISTINCT \"$path\", \"$file_size\" FROM " + tableName);
+        for (MaterializedRow row : result) {
+            // allow up to a larger delta due to the very small max size and the relatively large writer chunk size
+            assertThat((Long) row.getField(1)).isLessThan(maxSize.toBytes() * 5);
+        }
+    }
+
+    @Test
+    public void testPathColumn()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_path_column", "(x VARCHAR)")) {
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'first'", 1);
+            String firstFilePath = (String) computeScalar("SELECT \"$path\" FROM " + table.getName());
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT 'second'", 1);
+            String secondFilePath = (String) computeScalar("SELECT \"$path\" FROM " + table.getName() + " WHERE x = 'second'");
+
+            // Verify predicate correctness on $path column
+            assertQuery("SELECT x FROM " + table.getName() + " WHERE \"$path\" = '" + firstFilePath + "'", "VALUES 'first'");
+            assertQuery("SELECT x FROM " + table.getName() + " WHERE \"$path\" <> '" + firstFilePath + "'", "VALUES 'second'");
+            assertQuery("SELECT x FROM " + table.getName() + " WHERE \"$path\" IN ('" + firstFilePath + "', '" + secondFilePath + "')", "VALUES ('first'), ('second')");
+            assertQuery("SELECT x FROM " + table.getName() + " WHERE \"$path\" IS NOT NULL", "VALUES ('first'), ('second')");
+            assertQueryReturnsEmptyResult("SELECT x FROM " + table.getName() + " WHERE \"$path\" IS NULL");
+        }
+    }
+
+    @Test
+    public void testTableLocationTrailingSpace()
+    {
+        String tableName = "table_with_space_" + randomNameSuffix();
+        String tableLocationWithTrailingSpace = "s3://" + bucketName + "/" + tableName + " ";
+
+        assertUpdate(format("CREATE TABLE %s (customer VARCHAR) WITH (location = '%s')", tableName, tableLocationWithTrailingSpace));
+        assertUpdate("INSERT INTO " + tableName + " (customer) VALUES ('Aaron'), ('Bill')", 2);
+        assertQuery("SELECT * FROM " + tableName, "VALUES ('Aaron'), ('Bill')");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testTableLocationTrailingSlash()
+    {
+        String tableWithSlash = "table_with_slash";
+        String tableWithoutSlash = "table_without_slash";
+
+        assertUpdate(format("CREATE TABLE %s (customer VARCHAR) WITH (location = 's3://%s/%s/')", tableWithSlash, bucketName, tableWithSlash));
+        assertUpdate(format("INSERT INTO %s (customer) VALUES ('Aaron'), ('Bill')", tableWithSlash), 2);
+        assertQuery("SELECT * FROM " + tableWithSlash, "VALUES ('Aaron'), ('Bill')");
+
+        assertUpdate(format("CREATE TABLE %s (customer VARCHAR) WITH (location = 's3://%s/%s')", tableWithoutSlash, bucketName, tableWithoutSlash));
+        assertUpdate(format("INSERT INTO %s (customer) VALUES ('Carol'), ('Dave')", tableWithoutSlash), 2);
+        assertQuery("SELECT * FROM " + tableWithoutSlash, "VALUES ('Carol'), ('Dave')");
+
+        assertUpdate("DROP TABLE " + tableWithSlash);
+        assertUpdate("DROP TABLE " + tableWithoutSlash);
+    }
+
+    @Test
+    public void testMergeSimpleSelectPartitioned()
+    {
+        String targetTable = "merge_simple_target_" + randomNameSuffix();
+        String sourceTable = "merge_simple_source_" + randomNameSuffix();
+        assertUpdate(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])", targetTable, bucketName, targetTable));
+
+        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Buena'), ('Carol', 3, 'Cambridge'), ('Dave', 11, 'Devon')", targetTable), 4);
+
+        assertUpdate(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')", sourceTable, bucketName, sourceTable));
+
+        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 6, 'Arches'), ('Ed', 7, 'Etherville'), ('Carol', 9, 'Centreville'), ('Dave', 11, 'Darbyshire')", sourceTable), 4);
+
+        @Language("SQL") String sql = format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) +
+                "    WHEN MATCHED AND s.address = 'Centreville' THEN DELETE" +
+                "    WHEN MATCHED THEN UPDATE SET purchases = s.purchases + t.purchases, address = s.address" +
+                "    WHEN NOT MATCHED THEN INSERT (customer, purchases, address) VALUES(s.customer, s.purchases, s.address)";
+
+        assertUpdate(sql, 4);
+
+        assertQuery("SELECT * FROM " + targetTable, "VALUES ('Aaron', 11, 'Arches'), ('Ed', 7, 'Etherville'), ('Bill', 7, 'Buena'), ('Dave', 22, 'Darbyshire')");
+
+        assertUpdate("DROP TABLE " + sourceTable);
+        assertUpdate("DROP TABLE " + targetTable);
+    }
+
+    @Test(dataProvider = "partitionedProvider")
+    public void testMergeUpdateWithVariousLayouts(String partitionPhase)
+    {
+        String targetTable = "merge_formats_target_" + randomNameSuffix();
+        String sourceTable = "merge_formats_source_" + randomNameSuffix();
+        assertUpdate(format("CREATE TABLE %s (customer VARCHAR, purchase VARCHAR) WITH (location = 's3://%s/%s'%s)", targetTable, bucketName, targetTable, partitionPhase));
+
+        assertUpdate(format("INSERT INTO %s (customer, purchase) VALUES ('Dave', 'dates'), ('Lou', 'limes'), ('Carol', 'candles')", targetTable), 3);
+        assertQuery("SELECT * FROM " + targetTable, "VALUES ('Dave', 'dates'), ('Lou', 'limes'), ('Carol', 'candles')");
+
+        assertUpdate(format("CREATE TABLE %s (customer VARCHAR, purchase VARCHAR) WITH (location = 's3://%s/%s')", sourceTable, bucketName, sourceTable));
+
+        assertUpdate(format("INSERT INTO %s (customer, purchase) VALUES ('Craig', 'candles'), ('Len', 'limes'), ('Joe', 'jellybeans')", sourceTable), 3);
+
+        @Language("SQL") String sql = format("MERGE INTO %s t USING %s s ON (t.purchase = s.purchase)", targetTable, sourceTable) +
+                "    WHEN MATCHED AND s.purchase = 'limes' THEN DELETE" +
+                "    WHEN MATCHED THEN UPDATE SET customer = CONCAT(t.customer, '_', s.customer)" +
+                "    WHEN NOT MATCHED THEN INSERT (customer, purchase) VALUES(s.customer, s.purchase)";
+
+        assertUpdate(sql, 3);
+
+        assertQuery("SELECT * FROM " + targetTable, "VALUES ('Dave', 'dates'), ('Carol_Craig', 'candles'), ('Joe', 'jellybeans')");
+        assertUpdate("DROP TABLE " + sourceTable);
+        assertUpdate("DROP TABLE " + targetTable);
+    }
+
+    @DataProvider
+    public Object[][] partitionedProvider()
+    {
+        return new Object[][] {
+                {""},
+                {", partitioned_by = ARRAY['customer']"},
+                {", partitioned_by = ARRAY['purchase']"}
+        };
+    }
+
+    @Test(dataProvider = "partitionedProvider")
+    public void testMergeMultipleOperations(String partitioning)
+    {
+        int targetCustomerCount = 32;
+        String targetTable = "merge_multiple_" + randomNameSuffix();
+        assertUpdate(format("CREATE TABLE %s (purchase INT, zipcode INT, spouse VARCHAR, address VARCHAR, customer VARCHAR) WITH (location = 's3://%s/%s'%s)", targetTable, bucketName, targetTable, partitioning));
+        String originalInsertFirstHalf = IntStream.range(1, targetCustomerCount / 2)
+                .mapToObj(intValue -> format("('joe_%s', %s, %s, 'jan_%s', '%s Poe Ct')", intValue, 1000, 91000, intValue, intValue))
+                .collect(Collectors.joining(", "));
+        String originalInsertSecondHalf = IntStream.range(targetCustomerCount / 2, targetCustomerCount)
+                .mapToObj(intValue -> format("('joe_%s', %s, %s, 'jan_%s', '%s Poe Ct')", intValue, 2000, 92000, intValue, intValue))
+                .collect(Collectors.joining(", "));
+
+        assertUpdate(format("INSERT INTO %s (customer, purchase, zipcode, spouse, address) VALUES %s, %s", targetTable, originalInsertFirstHalf, originalInsertSecondHalf), targetCustomerCount - 1);
+
+        String firstMergeSource = IntStream.range(targetCustomerCount / 2, targetCustomerCount)
+                .mapToObj(intValue -> format("('joe_%s', %s, %s, 'jill_%s', '%s Eop Ct')", intValue, 3000, 83000, intValue, intValue))
+                .collect(Collectors.joining(", "));
+
+        assertUpdate(format("MERGE INTO %s t USING (VALUES %s) AS s(customer, purchase, zipcode, spouse, address)", targetTable, firstMergeSource) +
+                        "    ON t.customer = s.customer" +
+                        "    WHEN MATCHED THEN UPDATE SET purchase = s.purchase, zipcode = s.zipcode, spouse = s.spouse, address = s.address",
+                targetCustomerCount / 2);
+
+        assertQuery(
+                "SELECT customer, purchase, zipcode, spouse, address FROM " + targetTable,
+                format("VALUES %s, %s", originalInsertFirstHalf, firstMergeSource));
+
+        String nextInsert = IntStream.range(targetCustomerCount, targetCustomerCount * 3 / 2)
+                .mapToObj(intValue -> format("('jack_%s', %s, %s, 'jan_%s', '%s Poe Ct')", intValue, 4000, 74000, intValue, intValue))
+                .collect(Collectors.joining(", "));
+
+        assertUpdate(format("INSERT INTO %s (customer, purchase, zipcode, spouse, address) VALUES %s", targetTable, nextInsert), targetCustomerCount / 2);
+
+        String secondMergeSource = IntStream.range(1, targetCustomerCount * 3 / 2)
+                .mapToObj(intValue -> format("('joe_%s', %s, %s, 'jen_%s', '%s Poe Ct')", intValue, 5000, 85000, intValue, intValue))
+                .collect(Collectors.joining(", "));
+
+        assertUpdate(format("MERGE INTO %s t USING (VALUES %s) AS s(customer, purchase, zipcode, spouse, address)", targetTable, secondMergeSource) +
+                        "    ON t.customer = s.customer" +
+                        "    WHEN MATCHED AND t.zipcode = 91000 THEN DELETE" +
+                        "    WHEN MATCHED AND s.zipcode = 85000 THEN UPDATE SET zipcode = 60000" +
+                        "    WHEN MATCHED THEN UPDATE SET zipcode = s.zipcode, spouse = s.spouse, address = s.address" +
+                        "    WHEN NOT MATCHED THEN INSERT (customer, purchase, zipcode, spouse, address) VALUES(s.customer, s.purchase, s.zipcode, s.spouse, s.address)",
+                targetCustomerCount * 3 / 2 - 1);
+
+        String updatedBeginning = IntStream.range(targetCustomerCount / 2, targetCustomerCount)
+                .mapToObj(intValue -> format("('joe_%s', %s, %s, 'jill_%s', '%s Eop Ct')", intValue, 3000, 60000, intValue, intValue))
+                .collect(Collectors.joining(", "));
+        String updatedMiddle = IntStream.range(targetCustomerCount, targetCustomerCount * 3 / 2)
+                .mapToObj(intValue -> format("('joe_%s', %s, %s, 'jen_%s', '%s Poe Ct')", intValue, 5000, 85000, intValue, intValue))
+                .collect(Collectors.joining(", "));
+        String updatedEnd = IntStream.range(targetCustomerCount, targetCustomerCount * 3 / 2)
+                .mapToObj(intValue -> format("('jack_%s', %s, %s, 'jan_%s', '%s Poe Ct')", intValue, 4000, 74000, intValue, intValue))
+                .collect(Collectors.joining(", "));
+
+        assertQuery(
+                "SELECT customer, purchase, zipcode, spouse, address FROM " + targetTable,
+                format("VALUES %s, %s, %s", updatedBeginning, updatedMiddle, updatedEnd));
+
+        assertUpdate("DROP TABLE " + targetTable);
+    }
+
+    @Test
+    public void testMergeSimpleQueryPartitioned()
+    {
+        String targetTable = "merge_simple_" + randomNameSuffix();
+        assertUpdate(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])", targetTable, bucketName, targetTable));
+
+        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Buena'), ('Carol', 3, 'Cambridge'), ('Dave', 11, 'Devon')", targetTable), 4);
+
+        @Language("SQL") String query = format("MERGE INTO %s t USING ", targetTable) +
+                "(SELECT * FROM (VALUES ('Aaron', 6, 'Arches'), ('Carol', 9, 'Centreville'), ('Dave', 11, 'Darbyshire'), ('Ed', 7, 'Etherville'))) AS s(customer, purchases, address)" +
+                "    " +
+                "ON (t.customer = s.customer)" +
+                "    WHEN MATCHED AND s.address = 'Centreville' THEN DELETE" +
+                "    WHEN MATCHED THEN UPDATE SET purchases = s.purchases + t.purchases, address = s.address" +
+                "    WHEN NOT MATCHED THEN INSERT (customer, purchases, address) VALUES(s.customer, s.purchases, s.address)";
+        assertUpdate(query, 4);
+
+        assertQuery("SELECT * FROM " + targetTable, "VALUES ('Aaron', 11, 'Arches'), ('Bill', 7, 'Buena'), ('Dave', 22, 'Darbyshire'), ('Ed', 7, 'Etherville')");
+
+        assertUpdate("DROP TABLE " + targetTable);
+    }
+
+    @Test(dataProvider = "targetWithDifferentPartitioning")
+    public void testMergeMultipleRowsMatchFails(String createTableSql)
+    {
+        String targetTable = "merge_multiple_target_" + randomNameSuffix();
+        String sourceTable = "merge_multiple_source_" + randomNameSuffix();
+        assertUpdate(format(createTableSql, targetTable, bucketName, targetTable));
+
+        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Antioch')", targetTable), 2);
+
+        assertUpdate(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')", sourceTable, bucketName, sourceTable));
+
+        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 6, 'Adelphi'), ('Aaron', 8, 'Ashland')", sourceTable), 2);
+
+        assertThatThrownBy(() -> computeActual(format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) +
+                "    WHEN MATCHED THEN UPDATE SET address = s.address"))
+                .hasMessage("One MERGE target table row matched more than one source row");
+
+        assertUpdate(format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) +
+                        "    WHEN MATCHED AND s.address = 'Adelphi' THEN UPDATE SET address = s.address",
+                1);
+        assertQuery("SELECT customer, purchases, address FROM " + targetTable, "VALUES ('Aaron', 5, 'Adelphi'), ('Bill', 7, 'Antioch')");
+        assertUpdate("DROP TABLE " + sourceTable);
+        assertUpdate("DROP TABLE " + targetTable);
+    }
+
+    @DataProvider
+    public Object[][] targetWithDifferentPartitioning()
+    {
+        return new Object[][] {
+                {"CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')"},
+                {"CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer'])"},
+                {"CREATE TABLE %s (customer VARCHAR, address VARCHAR, purchases INT) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])"},
+                {"CREATE TABLE %s (purchases INT, customer VARCHAR, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address', 'customer'])"},
+                {"CREATE TABLE %s (purchases INT, address VARCHAR, customer VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address', 'customer'])"}
+        };
+    }
+
+    @Test(dataProvider = "targetAndSourceWithDifferentPartitioning")
+    public void testMergeWithDifferentPartitioning(String testDescription, String createTargetTableSql, String createSourceTableSql)
+    {
+        String targetTable = format("%s_target_%s", testDescription, randomNameSuffix());
+        String sourceTable = format("%s_source_%s", testDescription, randomNameSuffix());
+
+        assertUpdate(format(createTargetTableSql, targetTable, bucketName, targetTable));
+
+        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Buena'), ('Carol', 3, 'Cambridge'), ('Dave', 11, 'Devon')", targetTable), 4);
+
+        assertUpdate(format(createSourceTableSql, sourceTable, bucketName, sourceTable));
+
+        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 6, 'Arches'), ('Ed', 7, 'Etherville'), ('Carol', 9, 'Centreville'), ('Dave', 11, 'Darbyshire')", sourceTable), 4);
+
+        @Language("SQL") String sql = format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) +
+                "    WHEN MATCHED AND s.address = 'Centreville' THEN DELETE" +
+                "    WHEN MATCHED THEN UPDATE SET purchases = s.purchases + t.purchases, address = s.address" +
+                "    WHEN NOT MATCHED THEN INSERT (customer, purchases, address) VALUES(s.customer, s.purchases, s.address)";
+        assertUpdate(sql, 4);
+
+        assertQuery("SELECT * FROM " + targetTable, "VALUES ('Aaron', 11, 'Arches'), ('Bill', 7, 'Buena'), ('Dave', 22, 'Darbyshire'), ('Ed', 7, 'Etherville')");
+
+        assertUpdate("DROP TABLE " + sourceTable);
+        assertUpdate("DROP TABLE " + targetTable);
+    }
+
+    @DataProvider
+    public Object[][] targetAndSourceWithDifferentPartitioning()
+    {
+        return new Object[][] {
+                {
+                        "target_partitioned_source_and_target_partitioned",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address', 'customer'])",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
+                },
+                {
+                        "target_partitioned_source_and_target_partitioned",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer', 'address'])",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
+                },
+                {
+                        "target_flat_source_partitioned_by_customer",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')",
+                        "CREATE TABLE %s (purchases INT, address VARCHAR, customer VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer'])"
+                },
+                {
+                        "target_partitioned_by_customer_source_flat",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')",
+                },
+                {
+                        "target_bucketed_by_customer_source_flat",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer', 'address'])",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')",
+                },
+                {
+                        "target_partitioned_source_partitioned",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer'])",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
+                },
+                {
+                        "target_partitioned_target_partitioned",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer'])",
+                }
+        };
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testTableWithNonNullableColumns(ColumnMappingMode mode)
+    {
+        String tableName = "test_table_with_non_nullable_columns_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + "(col1 INTEGER NOT NULL, col2 INTEGER, col3 INTEGER) WITH (column_mapping_mode='" + mode + "')");
+        assertUpdate("INSERT INTO " + tableName + " VALUES(1, 10, 100)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES(2, 20, 200)", 1);
+        assertThatThrownBy(() -> query("INSERT INTO " + tableName + " VALUES(null, 30, 300)"))
+                .hasMessageContaining("NULL value not allowed for NOT NULL column: col1");
+        assertThatThrownBy(() -> query("INSERT INTO " + tableName + " VALUES(TRY(5/0), 40, 400)"))
+                .hasMessageContaining("NULL value not allowed for NOT NULL column: col1");
+
+        assertThatThrownBy(() -> query("UPDATE " + tableName + " SET col1 = NULL where col3 = 100"))
+                .hasMessageContaining("NULL value not allowed for NOT NULL column: col1");
+        assertThatThrownBy(() -> query("UPDATE " + tableName + " SET col1 = TRY(5/0) where col3 = 200"))
+                .hasMessageContaining("NULL value not allowed for NOT NULL column: col1");
+
+        assertQuery("SELECT * FROM " + tableName, "VALUES(1, 10, 100), (2, 20, 200)");
+    }
+
+    @Test(dataProvider = "changeDataFeedColumnNamesDataProvider")
+    public void testCreateTableWithChangeDataFeedColumnName(String columnName)
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_create_table_cdf", "(" + columnName + " int)")) {
+            assertTableColumnNames(table.getName(), columnName);
+        }
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_create_table_cdf", "AS SELECT 1 AS " + columnName)) {
+            assertTableColumnNames(table.getName(), columnName);
+        }
+    }
+
+    @Test(dataProvider = "changeDataFeedColumnNamesDataProvider")
+    public void testUnsupportedCreateTableWithChangeDataFeed(String columnName)
+    {
+        String tableName = "test_unsupported_create_table_cdf" + randomNameSuffix();
+
+        assertQueryFails(
+                "CREATE TABLE " + tableName + "(" + columnName + " int) WITH (change_data_feed_enabled = true)",
+                "\\QUnable to use [%s] when change data feed is enabled\\E".formatted(columnName));
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+
+        assertQueryFails(
+                "CREATE TABLE " + tableName + " WITH (change_data_feed_enabled = true) AS SELECT 1 AS " + columnName,
+                "\\QUnable to use [%s] when change data feed is enabled\\E".formatted(columnName));
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+    }
+
+    @Test(dataProvider = "changeDataFeedColumnNamesDataProvider")
+    public void testUnsupportedAddColumnWithChangeDataFeed(String columnName)
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_column", "(col int) WITH (change_data_feed_enabled = true)")) {
+            assertQueryFails(
+                    "ALTER TABLE " + table.getName() + " ADD COLUMN " + columnName + " int",
+                    "\\QColumn name %s is forbidden when change data feed is enabled\\E".formatted(columnName));
+            assertTableColumnNames(table.getName(), "col");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " SET PROPERTIES change_data_feed_enabled = false");
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN " + columnName + " int");
+            assertTableColumnNames(table.getName(), "col", columnName);
+        }
+    }
+
+    @Test(dataProvider = "changeDataFeedColumnNamesDataProvider")
+    public void testUnsupportedRenameColumnWithChangeDataFeed(String columnName)
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_rename_column", "(col int) WITH (change_data_feed_enabled = true)")) {
+            assertQueryFails(
+                    "ALTER TABLE " + table.getName() + " RENAME COLUMN col TO " + columnName,
+                    "Cannot rename column when change data feed is enabled");
+            assertTableColumnNames(table.getName(), "col");
+        }
+    }
+
+    @Test(dataProvider = "changeDataFeedColumnNamesDataProvider")
+    public void testUnsupportedSetTablePropertyWithChangeDataFeed(String columnName)
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_set_properties", "(" + columnName + " int)")) {
+            assertQueryFails(
+                    "ALTER TABLE " + table.getName() + " SET PROPERTIES change_data_feed_enabled = true",
+                    "\\QUnable to enable change data feed because table contains [%s] columns\\E".formatted(columnName));
+            assertThat((String) computeScalar("SHOW CREATE TABLE " + table.getName()))
+                    .doesNotContain("change_data_feed_enabled = true");
+        }
+    }
+
+    @DataProvider
+    public Object[][] changeDataFeedColumnNamesDataProvider()
+    {
+        return CHANGE_DATA_FEED_COLUMN_NAMES.stream().collect(toDataProvider());
+    }
+
+    @Test
+    public void testThatEnableCdfTablePropertyIsShownForCtasTables()
+    {
+        String tableName = "test_show_create_show_property_for_table_created_with_ctas_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + "(page_url, views)" +
+                "WITH (change_data_feed_enabled = true) " +
+                "AS VALUES ('url1', 1), ('url2', 2)", 2);
+        assertThat((String) computeScalar("SHOW CREATE TABLE " + tableName))
+                .contains("change_data_feed_enabled = true");
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testCreateTableWithColumnMappingMode(ColumnMappingMode mode)
+    {
+        testCreateTableColumnMappingMode(mode, tableName -> {
+            assertUpdate("CREATE TABLE " + tableName + "(a_int integer, a_row row(x integer)) WITH (column_mapping_mode='" + mode + "')");
+            assertUpdate("INSERT INTO " + tableName + " VALUES (1, row(11))", 1);
+        });
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testCreateTableAsSelectWithColumnMappingMode(ColumnMappingMode mode)
+    {
+        testCreateTableColumnMappingMode(mode, tableName ->
+                assertUpdate("CREATE TABLE " + tableName + " WITH (column_mapping_mode='" + mode + "')" +
+                        " AS SELECT 1 AS a_int, CAST(row(11) AS row(x integer)) AS a_row", 1));
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testCreatePartitionTableAsSelectWithColumnMappingMode(ColumnMappingMode mode)
+    {
+        testCreateTableColumnMappingMode(mode, tableName ->
+                assertUpdate("CREATE TABLE " + tableName + " WITH (column_mapping_mode='" + mode + "', partitioned_by=ARRAY['a_int'])" +
+                        " AS SELECT 1 AS a_int, CAST(row(11) AS row(x integer)) AS a_row", 1));
+    }
+
+    private void testCreateTableColumnMappingMode(ColumnMappingMode mode, Consumer<String> createTable)
+    {
+        String tableName = "test_create_table_column_mapping_" + randomNameSuffix();
+        createTable.accept(tableName);
+
+        String showCreateTableResult = (String) computeScalar("SHOW CREATE TABLE " + tableName);
+        if (mode != ColumnMappingMode.NONE) {
+            assertThat(showCreateTableResult).contains("column_mapping_mode = '" + mode + "'");
+        }
+        else {
+            assertThat(showCreateTableResult).doesNotContain("column_mapping_mode");
+        }
+
+        assertThat(query("SELECT * FROM " + tableName))
+                .matches("VALUES (1, CAST(row(11) AS row(x integer)))");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testDropAndAddColumnShowStatsForColumnMappingMode(ColumnMappingMode mode)
+    {
+        if (mode == ColumnMappingMode.NONE) {
+            throw new SkipException("Delta Lake doesn't support dropping columns with 'none' column mapping");
+        }
+
+        String tableName = "test_drop_add_column_show_stats_for_column_mapping_mode_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE " + tableName + " (a_number INT, b_number INT) WITH (column_mapping_mode='" + mode + "')");
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES (1, 10), (2, 20), (null, null)", 3);
+        assertUpdate("ANALYZE " + tableName);
+
+        assertQuery("SHOW STATS FOR " + tableName, "VALUES" +
+                "('a_number', null, 2.0, 0.33333333333, null, 1, 2)," +
+                "('b_number', null, 2.0, 0.33333333333, null, 10, 20)," +
+                "(null, null, null, null, 3.0, null, null)");
+
+        assertUpdate("ALTER TABLE " + tableName + " DROP COLUMN b_number");
+        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN b_number INT");
+
+        // Verify adding a new column with the same name doesn't allow accessing the old data
+        assertThat(query("SELECT * FROM " + tableName))
+                .matches("""
+                        VALUES
+                            (1, CAST(null AS INT)),
+                            (2, CAST(null AS INT)),
+                            (null, CAST(null AS INT))
+                        """);
+
+        // Ensure SHOW STATS doesn't return stats for the restored column
+        assertQuery("SHOW STATS FOR " + tableName, "VALUES" +
+                "('a_number', null, 2.0, 0.33333333333, null, 1, 2)," +
+                "('b_number', null, null, null, null, null, null)," +
+                "(null, null, null, null, 3.0, null, null)");
+
+        // SHOW STATS returns the expected stats after executing ANALYZE
+        assertUpdate("ANALYZE " + tableName);
+
+        assertQuery("SHOW STATS FOR " + tableName, "VALUES" +
+                "('a_number', null, 2.0, 0.33333333333, null, 1, 2)," +
+                "('b_number', 0.0, 0.0, 1.0, null, null, null)," +
+                "(null, null, null, null, 3.0, null, null)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testRenameColumnShowStatsForColumnMappingMode(ColumnMappingMode mode)
+    {
+        if (mode == ColumnMappingMode.NONE) {
+            throw new SkipException("The connector doesn't support renaming columns with 'none' column mapping");
+        }
+
+        String tableName = "test_rename_column_show_stats_for_column_mapping_mode_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE " + tableName + " (a_number INT, b_number INT) WITH (column_mapping_mode='" + mode + "')");
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES (1, 10), (2, 20), (null, null)", 3);
+        assertUpdate("ANALYZE " + tableName);
+
+        assertQuery("SHOW STATS FOR " + tableName, "VALUES" +
+                "('a_number', null, 2.0, 0.33333333333, null, 1, 2)," +
+                "('b_number', null, 2.0, 0.33333333333, null, 10, 20)," +
+                "(null, null, null, null, 3.0, null, null)");
+
+        // Ensure SHOW STATS return the same stats for the renamed column
+        assertUpdate("ALTER TABLE " + tableName + " RENAME COLUMN b_number TO new_b");
+        assertQuery("SHOW STATS FOR " + tableName, "VALUES" +
+                "('a_number', null, 2.0, 0.33333333333, null, 1, 2)," +
+                "('new_b', null, 2.0, 0.33333333333, null, 10, 20)," +
+                "(null, null, null, null, 3.0, null, null)");
+
+        // Re-analyzing should work
+        assertUpdate("ANALYZE " + tableName);
+        assertQuery("SHOW STATS FOR " + tableName, "VALUES" +
+                "('a_number', null, 2.0, 0.33333333333, null, 1, 2)," +
+                "('new_b', null, 2.0, 0.33333333333, null, 10, 20)," +
+                "(null, null, null, null, 3.0, null, null)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testCommentOnTableForColumnMappingMode(ColumnMappingMode mode)
+    {
+        String tableName = "test_comment_on_table_for_column_mapping_mode_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (a_number INT, b_number INT) WITH (column_mapping_mode='" + mode + "')");
+
+        assertUpdate("COMMENT ON TABLE " + tableName + " IS 'test comment' ");
+        assertThat(getTableComment(DELTA_CATALOG, SCHEMA, tableName)).isEqualTo("test comment");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testCommentOnColumnForColumnMappingMode(ColumnMappingMode mode)
+    {
+        String tableName = "test_comment_on_column_for_column_mapping_mode_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (a_number INT, b_number INT) WITH (column_mapping_mode='" + mode + "')");
+
+        assertUpdate("COMMENT ON COLUMN " + tableName + ".a_number IS 'test column comment'");
+        assertThat(getColumnComment(tableName, "a_number")).isEqualTo("test column comment");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testCreateTableWithCommentsForColumnMappingMode(ColumnMappingMode mode)
+    {
+        String tableName = "test_create_table_with_comments_for_column_mapping_mode_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (a_number INT COMMENT 'test column comment', b_number INT)  " +
+                "COMMENT 'test table comment' " +
+                "WITH (column_mapping_mode='" + mode + "')");
+
+        assertThat(getTableComment(DELTA_CATALOG, SCHEMA, tableName)).isEqualTo("test table comment");
+        assertThat(getColumnComment(tableName, "a_number")).isEqualTo("test column comment");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testSpecialCharacterColumnNamesWithColumnMappingMode(ColumnMappingMode mode)
+    {
+        String tableName = "test_special_characters_column_namnes_with_column_mapping_mode_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (\";{}()\\n\\t=\" INT) " +
+                "WITH (column_mapping_mode='" + mode + "', checkpoint_interval=3)");
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES (0)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (1)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (null)", 1);
+
+        assertQuery("SHOW STATS FOR " + tableName, "VALUES" +
+                "(';{}()\\n\\t=', null, 2.0, 0.33333333333, null, 0, 1)," +
+                "(null, null, null, null, 3.0, null, null)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test(dataProvider = "columnMappingWithTrueAndFalseDataProvider")
+    public void testDeltaColumnMappingModeAllDataTypes(ColumnMappingMode mode, boolean partitioned)
+    {
+        String tableName = "test_column_mapping_mode_name_all_types_" + randomNameSuffix();
+
+        assertUpdate("" +
+                "CREATE TABLE " + tableName + " (" +
+                "    a_boolean BOOLEAN," +
+                "    a_tinyint TINYINT," +
+                "    a_smallint SMALLINT," +
+                "    a_int INT," +
+                "    a_bigint BIGINT," +
+                "    a_decimal_5_2 DECIMAL(5,2)," +
+                "    a_decimal_21_3 DECIMAL(21,3)," +
+                "    a_double DOUBLE," +
+                "    a_float REAL," +
+                "    a_string VARCHAR," +
+                "    a_date DATE," +
+                "    a_timestamp TIMESTAMP(3) WITH TIME ZONE," +
+                "    a_binary VARBINARY," +
+                "    a_string_array ARRAY(VARCHAR)," +
+                "    a_struct_array ARRAY(ROW(a_string VARCHAR))," +
+                "    a_map MAP(VARCHAR, VARCHAR)," +
+                "    a_complex_map MAP(VARCHAR, ROW(a_string VARCHAR))," +
+                "    a_struct ROW(a_string VARCHAR, a_int INT)," +
+                "    a_complex_struct ROW(nested_struct ROW(a_string VARCHAR), a_int INT)" +
+                (partitioned ? ", part VARCHAR" : "") +
+                ")" +
+                "WITH (" +
+                (partitioned ? " partitioned_by = ARRAY['part']," : "") +
+                "column_mapping_mode = '" + mode + "'" +
+                ")");
+
+        assertUpdate("" +
+                "INSERT INTO " + tableName +
+                " VALUES " +
+                "(" +
+                "   true, " +
+                "   1, " +
+                "   10," +
+                "   100, " +
+                "   1000, " +
+                "   CAST('123.12' AS DECIMAL(5,2)), " +
+                "   CAST('123456789012345678.123' AS DECIMAL(21,3)), " +
+                "   DOUBLE '0', " +
+                "   REAL '0', " +
+                "   'a', " +
+                "   DATE '2020-08-21', " +
+                "   TIMESTAMP '2020-10-21 01:00:00.123 UTC', " +
+                "   X'abcd', " +
+                "   ARRAY['element 1'], " +
+                "   ARRAY[ROW('nested 1')], " +
+                "   MAP(ARRAY['key'], ARRAY['value1']), " +
+                "   MAP(ARRAY['key'], ARRAY[ROW('nested value1')]), " +
+                "   ROW('item 1', 1), " +
+                "   ROW(ROW('nested item 1'), 11) " +
+                (partitioned ? ", 'part1'" : "") +
+                "), " +
+                "(" +
+                "   true, " +
+                "   2, " +
+                "   20," +
+                "   200, " +
+                "   2000, " +
+                "   CAST('223.12' AS DECIMAL(5,2)), " +
+                "   CAST('223456789012345678.123' AS DECIMAL(21,3)), " +
+                "   DOUBLE '0', " +
+                "   REAL '0', " +
+                "   'b', " +
+                "   DATE '2020-08-22', " +
+                "   TIMESTAMP '2020-10-22 02:00:00.456 UTC', " +
+                "   X'abcd', " +
+                "   ARRAY['element 2'], " +
+                "   ARRAY[ROW('nested 2')], " +
+                "   MAP(ARRAY['key'], ARRAY[null]), " +
+                "   MAP(ARRAY['key'], ARRAY[null]), " +
+                "   ROW('item 2', 2), " +
+                "   ROW(ROW('nested item 2'), 22) " +
+                (partitioned ? ", 'part2'" : "") +
+                ")", 2);
+
+        String selectTrinoValues = "SELECT " +
+                "a_boolean, a_tinyint, a_smallint, a_int, a_bigint, a_decimal_5_2, a_decimal_21_3, a_double , a_float, a_string, a_date, a_binary, a_string_array[1], a_struct_array[1].a_string, a_map['key'], a_complex_map['key'].a_string, a_struct.a_string, a_struct.a_int, a_complex_struct.nested_struct.a_string, a_complex_struct.a_int " +
+                "FROM " + tableName;
+
+        assertThat(query(selectTrinoValues))
+                .skippingTypesCheck()
+                .matches("VALUES" +
+                        "(true, tinyint '1', smallint '10', integer '100', bigint '1000', decimal '123.12', decimal '123456789012345678.123', double '0', real '0', 'a', date '2020-08-21', X'abcd', 'element 1', 'nested 1', 'value1', 'nested value1', 'item 1', 1, 'nested item 1', 11)," +
+                        "(true, tinyint '2', smallint '20', integer '200', bigint '2000', decimal '223.12', decimal '223456789012345678.123', double '0.0', real '0.0', 'b', date '2020-08-22', X'abcd', 'element 2', 'nested 2', null, null, 'item 2', 2, 'nested item 2', 22)");
+
+        assertQuery(
+                "SELECT format('%1$tF %1$tT.%1$tL', a_timestamp) FROM " + tableName,
+                "VALUES '2020-10-21 01:00:00.123', '2020-10-22 02:00:00.456'");
+
+        assertUpdate("UPDATE " + tableName + " SET a_boolean = false where a_tinyint = 1", 1);
+        assertThat(query(selectTrinoValues))
+                .skippingTypesCheck()
+                .matches("VALUES" +
+                        "(false, tinyint '1', smallint '10', integer '100', bigint '1000', decimal '123.12', decimal '123456789012345678.123', double '0', real '0', 'a', date '2020-08-21', X'abcd', 'element 1', 'nested 1', 'value1', 'nested value1', 'item 1', 1, 'nested item 1', 11)," +
+                        "(true, tinyint '2', smallint '20', integer '200', bigint '2000', decimal '223.12', decimal '223456789012345678.123', double '0.0', real '0.0', 'b', date '2020-08-22', X'abcd', 'element 2', 'nested 2', null, null, 'item 2', 2, 'nested item 2', 22)");
+
+        assertUpdate("DELETE FROM " + tableName + " WHERE a_tinyint = 2", 1);
+        assertThat(query(selectTrinoValues))
+                .skippingTypesCheck()
+                .matches("VALUES" +
+                        "(false, tinyint '1', smallint '10', integer '100', bigint '1000', decimal '123.12', decimal '123456789012345678.123', double '0', real '0', 'a', date '2020-08-21', X'abcd', 'element 1', 'nested 1', 'value1', 'nested value1', 'item 1', 1, 'nested item 1', 11)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test(dataProvider = "columnMappingWithTrueAndFalseDataProvider")
+    public void testOptimizeProcedureColumnMappingMode(ColumnMappingMode mode, boolean partitioned)
+    {
+        String tableName = "test_optimize_column_mapping_mode_" + randomNameSuffix();
+
+        assertUpdate("" +
+                "CREATE TABLE " + tableName +
+                "(a_number INT, a_struct ROW(x INT), a_string VARCHAR) " +
+                "WITH (" +
+                (partitioned ? "partitioned_by=ARRAY['a_string']," : "") +
+                "location='s3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'," +
+                "column_mapping_mode='" + mode + "')");
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES (1, row(11), 'a')", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (2, row(22), 'b')", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (3, row(33), 'c')", 1);
+
+        Double stringColumnSize = partitioned ? null : 3.0;
+        String expectedStats = "VALUES" +
+                "('a_number', null, 3.0, 0.0, null, '1', '3')," +
+                "('a_struct', null, null, null, null, null, null)," +
+                "('a_string', " + stringColumnSize + ", 3.0, 0.0, null, null, null)," +
+                "(null, null, null, null, 3.0, null, null)";
+        assertQuery("SHOW STATS FOR " + tableName, expectedStats);
+
+        // Execute OPTIMIZE procedure and verify that the statistics is preserved and the table is still writable and readable
+        assertUpdate("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
+
+        assertQuery("SHOW STATS FOR " + tableName, expectedStats);
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES (4, row(44), 'd')", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (5, row(55), 'e')", 1);
+
+        assertQuery(
+                "SELECT a_number, a_struct.x, a_string FROM " + tableName,
+                "VALUES" +
+                        "(1, 11, 'a')," +
+                        "(2, 22, 'b')," +
+                        "(3, 33, 'c')," +
+                        "(4, 44, 'd')," +
+                        "(5, 55, 'e')");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    /**
+     * @see deltalake.write_stats_as_json_column_mapping_id
+     */
+    @Test(dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
+    public void testSupportedNonPartitionedColumnMappingIdWrites(boolean statsAsJsonEnabled)
+            throws Exception
+    {
+        testSupportedNonPartitionedColumnMappingWrites("write_stats_as_json_column_mapping_id", statsAsJsonEnabled);
+    }
+
+    /**
+     * @see deltalake.write_stats_as_json_column_mapping_name
+     */
+    @Test(dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
+    public void testSupportedNonPartitionedColumnMappingNameWrites(boolean statsAsJsonEnabled)
+            throws Exception
+    {
+        testSupportedNonPartitionedColumnMappingWrites("write_stats_as_json_column_mapping_name", statsAsJsonEnabled);
+    }
+
+    /**
+     * @see deltalake.write_stats_as_json_column_mapping_none
+     */
+    @Test(dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
+    public void testSupportedNonPartitionedColumnMappingNoneWrites(boolean statsAsJsonEnabled)
+            throws Exception
+    {
+        testSupportedNonPartitionedColumnMappingWrites("write_stats_as_json_column_mapping_none", statsAsJsonEnabled);
+    }
+
+    private void testSupportedNonPartitionedColumnMappingWrites(String resourceName, boolean statsAsJsonEnabled)
+            throws Exception
+    {
+        String tableName = "test_column_mapping_mode_" + randomNameSuffix();
+
+        String entry = Resources.toString(Resources.getResource("deltalake/%s/_delta_log/00000000000000000000.json".formatted(resourceName)), UTF_8)
+                .replace("%WRITE_STATS_AS_JSON%", Boolean.toString(statsAsJsonEnabled))
+                .replace("%WRITE_STATS_AS_STRUCT%", Boolean.toString(!statsAsJsonEnabled));
+
+        String targetPath = "%s/%s/_delta_log/00000000000000000000.json".formatted(SCHEMA, tableName);
+        minioClient.putObject(bucketName, entry.getBytes(UTF_8), targetPath);
+        String tableLocation = "s3://%s/%s/%s".formatted(bucketName, SCHEMA, tableName);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(SCHEMA, tableName, tableLocation));
+        assertQueryReturnsEmptyResult("SELECT * FROM " + tableName);
+
+        assertUpdate(
+                "INSERT INTO " + tableName + " VALUES " +
+                        "(1, 'first value', ARRAY[ROW('nested 1')], ROW('databricks 1'))," +
+                        "(2, 'two', ARRAY[ROW('nested 2')], ROW('databricks 2'))," +
+                        "(3, 'third value', ARRAY[ROW('nested 3')], ROW('databricks 3'))," +
+                        "(4, 'four', ARRAY[ROW('nested 4')], ROW('databricks 4'))",
+                4);
+
+        assertQuery(
+                "SELECT a_number, a_string, array_col[1].array_struct_element, nested.field1 FROM " + tableName,
+                "VALUES" +
+                        "(1, 'first value', 'nested 1', 'databricks 1')," +
+                        "(2, 'two', 'nested 2', 'databricks 2')," +
+                        "(3, 'third value', 'nested 3', 'databricks 3')," +
+                        "(4, 'four', 'nested 4', 'databricks 4')");
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES" +
+                        "('a_number', null, 4.0, 0.0, null, '1', '4')," +
+                        "('a_string', 29.0, 4.0, 0.0, null, null, null)," +
+                        "('array_col', null, null, null, null, null, null)," +
+                        "('nested', null, null, null, null, null, null)," +
+                        "(null, null, null, null, 4.0, null, null)");
+
+        assertUpdate("UPDATE " + tableName + " SET a_number = a_number + 10 WHERE a_number in (3, 4)", 2);
+        assertUpdate("UPDATE " + tableName + " SET a_number = a_number + 20 WHERE a_number in (1, 2)", 2);
+        assertQuery(
+                "SELECT a_number, a_string, array_col[1].array_struct_element, nested.field1 FROM " + tableName,
+                "VALUES" +
+                        "(21, 'first value', 'nested 1', 'databricks 1')," +
+                        "(22, 'two', 'nested 2', 'databricks 2')," +
+                        "(13, 'third value', 'nested 3', 'databricks 3')," +
+                        "(14, 'four', 'nested 4', 'databricks 4')");
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES" +
+                        "('a_number', null, 4.0, 0.0, null, '13', '22')," +
+                        "('a_string', 29.0, 4.0, 0.0, null, null, null)," +
+                        "('array_col', null, null, null, null, null, null)," +
+                        "('nested', null, null, null, null, null, null)," +
+                        "(null, null, null, null, 4.0, null, null)");
+
+        assertUpdate("DELETE FROM " + tableName + " WHERE a_number = 22", 1);
+        assertUpdate("DELETE FROM " + tableName + " WHERE a_number = 13", 1);
+        assertUpdate("DELETE FROM " + tableName + " WHERE a_number = 21", 1);
+        assertQuery(
+                "SELECT a_number, a_string, array_col[1].array_struct_element, nested.field1 FROM " + tableName,
+                "VALUES (14, 'four', 'nested 4', 'databricks 4')");
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES" +
+                        "('a_number', null, 1.0, 0.0, null, '14', '14')," +
+                        "('a_string', 29.0, 1.0, 0.0, null, null, null)," +
+                        "('array_col', null, null, null, null, null, null)," +
+                        "('nested', null, null, null, null, null, null)," +
+                        "(null, null, null, null, 1.0, null, null)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    /**
+     * @see deltalake.write_stats_as_json_partition_column_mapping_id
+     */
+    @Test(dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
+    public void testSupportedPartitionedColumnMappingIdWrites(boolean statsAsJsonEnabled)
+            throws Exception
+    {
+        testSupportedPartitionedColumnMappingWrites("write_stats_as_json_partition_column_mapping_id", statsAsJsonEnabled);
+    }
+
+    /**
+     * @see deltalake.write_stats_as_json_partition_column_mapping_name
+     */
+    @Test(dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
+    public void testSupportedPartitionedColumnMappingNameWrites(boolean statsAsJsonEnabled)
+            throws Exception
+    {
+        testSupportedPartitionedColumnMappingWrites("write_stats_as_json_partition_column_mapping_name", statsAsJsonEnabled);
+    }
+
+    /**
+     * @see deltalake.write_stats_as_json_partition_column_mapping_none
+     */
+    @Test(dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
+    public void testSupportedPartitionedColumnMappingNoneWrites(boolean statsAsJsonEnabled)
+            throws Exception
+    {
+        testSupportedPartitionedColumnMappingWrites("write_stats_as_json_partition_column_mapping_none", statsAsJsonEnabled);
+    }
+
+    private void testSupportedPartitionedColumnMappingWrites(String resourceName, boolean statsAsJsonEnabled)
+            throws Exception
+    {
+        String tableName = "test_column_mapping_mode_" + randomNameSuffix();
+
+        String entry = Resources.toString(Resources.getResource("deltalake/%s/_delta_log/00000000000000000000.json".formatted(resourceName)), UTF_8)
+                .replace("%WRITE_STATS_AS_JSON%", Boolean.toString(statsAsJsonEnabled))
+                .replace("%WRITE_STATS_AS_STRUCT%", Boolean.toString(!statsAsJsonEnabled));
+
+        String targetPath = "%s/%s/_delta_log/00000000000000000000.json".formatted(SCHEMA, tableName);
+        minioClient.putObject(bucketName, entry.getBytes(UTF_8), targetPath);
+        String tableLocation = "s3://%s/%s/%s".formatted(bucketName, SCHEMA, tableName);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(SCHEMA, tableName, tableLocation));
+        assertQueryReturnsEmptyResult("SELECT * FROM " + tableName);
+
+        assertUpdate(
+                "INSERT INTO " + tableName + " VALUES" +
+                        "(1, 'first value', ARRAY[ROW('nested 1')], ROW('databricks 1'))," +
+                        "(2, 'two', ARRAY[ROW('nested 2')], ROW('databricks 2'))," +
+                        "(3, 'third value', ARRAY[ROW('nested 3')], ROW('databricks 3'))," +
+                        "(4, 'four', ARRAY[ROW('nested 4')], ROW('databricks 4'))",
+                4);
+
+        assertQuery(
+                "SELECT a_number, a_string, array_col[1].array_struct_element, nested.field1 FROM " + tableName,
+                "VALUES" +
+                        "(1, 'first value', 'nested 1', 'databricks 1')," +
+                        "(2, 'two', 'nested 2', 'databricks 2')," +
+                        "(3, 'third value', 'nested 3', 'databricks 3')," +
+                        "(4, 'four', 'nested 4', 'databricks 4')");
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES" +
+                        "('a_number', null, 4.0, 0.0, null, '1', '4')," +
+                        "('a_string', null, 4.0, 0.0, null, null, null)," +
+                        "('array_col', null, null, null, null, null, null)," +
+                        "('nested', null, null, null, null, null, null)," +
+                        "(null, null, null, null, 4.0, null, null)");
+
+        assertUpdate("UPDATE " + tableName + " SET a_number = a_number + 10 WHERE a_number in (3, 4)", 2);
+        assertUpdate("UPDATE " + tableName + " SET a_number = a_number + 20 WHERE a_number in (1, 2)", 2);
+        assertQuery(
+                "SELECT a_number, a_string, array_col[1].array_struct_element, nested.field1 FROM " + tableName,
+                "VALUES" +
+                        "(21, 'first value', 'nested 1', 'databricks 1')," +
+                        "(22, 'two', 'nested 2', 'databricks 2')," +
+                        "(13, 'third value', 'nested 3', 'databricks 3')," +
+                        "(14, 'four', 'nested 4', 'databricks 4')");
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES" +
+                        "('a_number', null, 4.0, 0.0, null, '13', '22')," +
+                        "('a_string', null, 4.0, 0.0, null, null, null)," +
+                        "('array_col', null, null, null, null, null, null)," +
+                        "('nested', null, null, null, null, null, null)," +
+                        "(null, null, null, null, 4.0, null, null)");
+
+        assertUpdate("DELETE FROM " + tableName + " WHERE a_number = 22", 1);
+        assertUpdate("DELETE FROM " + tableName + " WHERE a_number = 13", 1);
+        assertUpdate("DELETE FROM " + tableName + " WHERE a_number = 21", 1);
+        assertQuery(
+                "SELECT a_number, a_string, array_col[1].array_struct_element, nested.field1 FROM " + tableName,
+                "VALUES (14, 'four', 'nested 4', 'databricks 4')");
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES" +
+                        "('a_number', null, 1.0, 0.0, null, '14', '14')," +
+                        "('a_string', null, 1.0, 0.0, null, null, null)," +
+                        "('array_col', null, null, null, null, null, null)," +
+                        "('nested', null, null, null, null, null, null)," +
+                        "(null, null, null, null, 1.0, null, null)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @DataProvider
+    public Object[][] columnMappingWithTrueAndFalseDataProvider()
+    {
+        return cartesianProduct(columnMappingModeDataProvider(), trueFalse());
+    }
+
+    @DataProvider
+    public Object[][] columnMappingModeDataProvider()
+    {
+        return Arrays.stream(ColumnMappingMode.values())
+                .filter(mode -> mode != ColumnMappingMode.UNKNOWN)
+                .collect(toDataProvider());
+    }
+
+    @Test
+    public void testCreateTableUnsupportedColumnMappingMode()
+    {
+        String tableName = "test_unsupported_column_mapping_mode_" + randomNameSuffix();
+
+        assertQueryFails("CREATE TABLE " + tableName + "(a integer) WITH (column_mapping_mode = 'illegal')",
+                ".* \\QInvalid value [illegal]. Valid values: [ID, NAME, NONE]");
+        assertQueryFails("CREATE TABLE " + tableName + " WITH (column_mapping_mode = 'illegal') AS SELECT 1 a",
+                ".* \\QInvalid value [illegal]. Valid values: [ID, NAME, NONE]");
+
+        assertQueryFails("CREATE TABLE " + tableName + "(a integer) WITH (column_mapping_mode = 'unknown')",
+                ".* \\QInvalid value [unknown]. Valid values: [ID, NAME, NONE]");
+        assertQueryFails("CREATE TABLE " + tableName + " WITH (column_mapping_mode = 'unknown') AS SELECT 1 a",
+                ".* \\QInvalid value [unknown]. Valid values: [ID, NAME, NONE]");
+
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+    }
+
+    @Test
+    public void testAlterTableWithUnsupportedProperties()
+    {
+        String tableName = "test_alter_table_with_unsupported_properties_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE " + tableName + " (a_number INT)");
+
+        assertQueryFails("ALTER TABLE " + tableName + " SET PROPERTIES change_data_feed_enabled = true, checkpoint_interval = 10",
+                "The following properties cannot be updated: checkpoint_interval");
+        assertQueryFails("ALTER TABLE " + tableName + " SET PROPERTIES partitioned_by = ARRAY['a']",
+                "The following properties cannot be updated: partitioned_by");
+        assertQueryFails("ALTER TABLE " + tableName + " SET PROPERTIES column_mapping_mode = 'ID'",
+                "The following properties cannot be updated: column_mapping_mode");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testSettingChangeDataFeedEnabledProperty()
+    {
+        String tableName = "test_enable_and_disable_cdf_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, domain VARCHAR, views INTEGER)");
+
+        assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES change_data_feed_enabled = false");
+        assertThat((String) computeScalar("SHOW CREATE TABLE " + tableName))
+                .contains("change_data_feed_enabled = false");
+
+        assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES change_data_feed_enabled = true");
+        assertThat((String) computeScalar("SHOW CREATE TABLE " + tableName)).contains("change_data_feed_enabled = true");
+
+        assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES change_data_feed_enabled = false");
+        assertThat((String) computeScalar("SHOW CREATE TABLE " + tableName)).contains("change_data_feed_enabled = false");
+
+        assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES change_data_feed_enabled = true");
+        assertThat((String) computeScalar("SHOW CREATE TABLE " + tableName))
+                .contains("change_data_feed_enabled = true");
+    }
+
+    @Test
+    public void testProjectionPushdownOnPartitionedTables()
+    {
+        String tableNamePartitionAtBeginning = "test_table_with_partition_at_beginning_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableNamePartitionAtBeginning + " (id BIGINT, root ROW(f1 BIGINT, f2 BIGINT)) WITH (partitioned_by = ARRAY['id'])");
+        assertUpdate("INSERT INTO " + tableNamePartitionAtBeginning + " VALUES (1, ROW(1, 2)), (1, ROW(2, 3)), (1, ROW(3, 4))", 3);
+        assertQuery("SELECT root.f1, id, root.f2 FROM " + tableNamePartitionAtBeginning, "VALUES (1, 1, 2), (2, 1, 3), (3, 1, 4)");
+        assertUpdate("DROP TABLE " + tableNamePartitionAtBeginning);
+
+        String tableNamePartitioningAtEnd = "tes_table_with_partition_at_end_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableNamePartitioningAtEnd + " (root ROW(f1 BIGINT, f2 BIGINT), id BIGINT) WITH (partitioned_by = ARRAY['id'])");
+        assertUpdate("INSERT INTO " + tableNamePartitioningAtEnd + " VALUES (ROW(1, 2), 1), (ROW(2, 3), 1), (ROW(3, 4), 1)", 3);
+        assertQuery("SELECT root.f2, id, root.f1 FROM " + tableNamePartitioningAtEnd, "VALUES (2, 1, 1), (3, 1, 2), (4, 1, 3)");
+        assertUpdate("DROP TABLE " + tableNamePartitioningAtEnd);
+    }
+
+    @Test
+    public void testProjectionPushdownColumnReorderInSchemaAndDataFile()
+    {
+        try (TestTable testTable = new TestTable(getQueryRunner()::execute,
+                "test_projection_pushdown_column_reorder_",
+                "(id BIGINT, nested1 ROW(a BIGINT, b VARCHAR, c INT), nested2 ROW(d DOUBLE, e BOOLEAN, f DATE))")) {
+            assertUpdate("INSERT INTO " + testTable.getName() + " VALUES (100, ROW(10, 'a', 100), ROW(10.10, true, DATE '2023-04-19'))", 1);
+            String tableDataFile = ((String) computeScalar("SELECT \"$path\" FROM " + testTable.getName()))
+                    .replaceFirst("s3://" + bucketName, "");
+
+            try (TestTable temporaryTable = new TestTable(
+                    getQueryRunner()::execute,
+                    "test_projection_pushdown_column_reorder_temporary_",
+                    "(nested2 ROW(d DOUBLE, e BOOLEAN, f DATE), id BIGINT, nested1 ROW(a BIGINT, b VARCHAR, c INT))")) {
+                assertUpdate("INSERT INTO " + temporaryTable.getName() + " VALUES (ROW(10.10, true, DATE '2023-04-19'), 100, ROW(10, 'a', 100))", 1);
+
+                String temporaryDataFile = ((String) computeScalar("SELECT \"$path\" FROM " + temporaryTable.getName()))
+                        .replaceFirst("s3://" + bucketName, "");
+
+                // Replace table1 data file with table2 data file, so that the table's schema and data's schema has different column order
+                minioClient.copyObject(bucketName, temporaryDataFile, bucketName, tableDataFile);
+            }
+
+            assertThat(query("SELECT nested2.e, nested1.a, nested2.f, nested1.b, id FROM " + testTable.getName()))
+                    .isFullyPushedDown();
+        }
+    }
+
+    @Test
+    public void testProjectionPushdownExplain()
+    {
+        String tableName = "test_projection_pushdown_explain_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (id BIGINT, root ROW(f1 BIGINT, f2 BIGINT)) WITH (partitioned_by = ARRAY['id'])");
+
+        assertExplain(
+                "EXPLAIN SELECT root.f2 FROM " + tableName,
+                "TableScan\\[table = (.*)]",
+                "root#f2 := root#f2:bigint:REGULAR");
+
+        Session sessionWithoutPushdown = Session.builder(getSession())
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "projection_pushdown_enabled", "false")
+                .build();
+        assertExplain(
+                sessionWithoutPushdown,
+                "EXPLAIN SELECT root.f2 FROM " + tableName,
+                "ScanProject\\[table = (.*)]",
+                "expr := \"root\"\\[2]",
+                "root := root:row\\(f1 bigint, f2 bigint\\):REGULAR");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testProjectionPushdownNonPrimitiveTypeExplain()
+    {
+        String tableName = "test_projection_pushdown_non_primtive_type_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE " + tableName +
+                " (id BIGINT, _row ROW(child BIGINT), _array ARRAY(ROW(child BIGINT)), _map MAP(BIGINT, BIGINT))");
+
+        assertExplain(
+                "EXPLAIN SELECT id, _row.child, _array[1].child, _map[1] FROM " + tableName,
+                "ScanProject\\[table = (.*)]",
+                "expr(.*) := \"_array(.*)\"\\[BIGINT '1']\\[1]",
+                "id(.*) := id:bigint:REGULAR",
+                // _array:array\\(row\\(child bigint\\)\\) is a symbol name, not a dereference expression.
+                "_array(.*) := _array:array\\(row\\(child bigint\\)\\):REGULAR",
+                "_map(.*) := _map:map\\(bigint, bigint\\):REGULAR",
+                "_row#child := _row#child:bigint:REGULAR");
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testReadCdfChanges(ColumnMappingMode mode)
+    {
+        String tableName = "test_basic_operations_on_table_with_cdf_enabled_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, domain VARCHAR, views INTEGER) " +
+                "WITH (change_data_feed_enabled = true, column_mapping_mode = '" + mode + "')");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url1', 'domain1', 1), ('url2', 'domain2', 2), ('url3', 'domain3', 3)", 3);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url4', 'domain4', 4), ('url5', 'domain5', 2), ('url6', 'domain6', 6)", 3);
+
+        assertUpdate("UPDATE " + tableName + " SET page_url = 'url22' WHERE views = 2", 2);
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "'))",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, 'insert', BIGINT '1'),
+                            ('url2', 'domain2', 2, 'insert', BIGINT '1'),
+                            ('url3', 'domain3', 3, 'insert', BIGINT '1'),
+                            ('url4', 'domain4', 4, 'insert', BIGINT '2'),
+                            ('url5', 'domain5', 2, 'insert', BIGINT '2'),
+                            ('url6', 'domain6', 6, 'insert', BIGINT '2'),
+                            ('url2', 'domain2', 2, 'update_preimage', BIGINT '3'),
+                            ('url22', 'domain2', 2, 'update_postimage', BIGINT '3'),
+                            ('url5', 'domain5', 2, 'update_preimage', BIGINT '3'),
+                            ('url22', 'domain5', 2, 'update_postimage', BIGINT '3')
+                        """);
+
+        assertUpdate("DELETE FROM " + tableName + " WHERE views = 2", 2);
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 3))",
+                """
+                        VALUES
+                            ('url22', 'domain2', 2, 'delete', BIGINT '4'),
+                            ('url22', 'domain5', 2, 'delete', BIGINT '4')
+                        """);
+
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "')) ORDER BY _commit_version, _change_type, domain",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, 'insert', BIGINT '1'),
+                            ('url2', 'domain2', 2, 'insert', BIGINT '1'),
+                            ('url3', 'domain3', 3, 'insert', BIGINT '1'),
+                            ('url4', 'domain4', 4, 'insert', BIGINT '2'),
+                            ('url5', 'domain5', 2, 'insert', BIGINT '2'),
+                            ('url6', 'domain6', 6, 'insert', BIGINT '2'),
+                            ('url22', 'domain2', 2, 'update_postimage', BIGINT '3'),
+                            ('url22', 'domain5', 2, 'update_postimage', BIGINT '3'),
+                            ('url2', 'domain2', 2, 'update_preimage', BIGINT '3'),
+                            ('url5', 'domain5', 2, 'update_preimage', BIGINT '3'),
+                            ('url22', 'domain2', 2, 'delete', BIGINT '4'),
+                            ('url22', 'domain5', 2, 'delete', BIGINT '4')
+                        """);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testReadCdfChangesOnPartitionedTable(ColumnMappingMode mode)
+    {
+        String tableName = "test_basic_operations_on_table_with_cdf_enabled_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, domain VARCHAR, views INTEGER) " +
+                "WITH (change_data_feed_enabled = true, partitioned_by = ARRAY['domain'], column_mapping_mode = '" + mode + "')");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url1', 'domain1', 1), ('url2', 'domain2', 2), ('url3', 'domain1', 3)", 3);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url4', 'domain1', 400), ('url5', 'domain2', 500), ('url6', 'domain3', 2)", 3);
+
+        assertUpdate("UPDATE " + tableName + " SET domain = 'domain4' WHERE views = 2", 2);
+        assertQuery("SELECT * FROM " + tableName, "" +
+                """
+                            VALUES
+                                ('url1', 'domain1', 1),
+                                ('url2', 'domain4', 2),
+                                ('url3', 'domain1', 3),
+                                ('url4', 'domain1', 400),
+                                ('url5', 'domain2', 500),
+                                ('url6', 'domain4', 2)
+                        """);
+
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "'))",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, 'insert', BIGINT '1'),
+                            ('url2', 'domain2', 2, 'insert', BIGINT '1'),
+                            ('url3', 'domain1', 3, 'insert', BIGINT '1'),
+                            ('url4', 'domain1', 400, 'insert', BIGINT '2'),
+                            ('url5', 'domain2', 500, 'insert', BIGINT '2'),
+                            ('url6', 'domain3', 2, 'insert', BIGINT '2'),
+                            ('url2', 'domain2', 2, 'update_preimage', BIGINT '3'),
+                            ('url2', 'domain4', 2, 'update_postimage', BIGINT '3'),
+                            ('url6', 'domain3', 2, 'update_preimage', BIGINT '3'),
+                            ('url6', 'domain4', 2, 'update_postimage', BIGINT '3')
+                        """);
+
+        assertUpdate("DELETE FROM " + tableName + " WHERE domain = 'domain4'", 2);
+        assertQuery("SELECT * FROM " + tableName,
+                """
+                            VALUES
+                                ('url1', 'domain1', 1),
+                                ('url3', 'domain1', 3),
+                                ('url4', 'domain1', 400),
+                                ('url5', 'domain2', 500)
+                        """);
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 3))",
+                """
+                        VALUES
+                            ('url2', 'domain4', 2, 'delete', BIGINT '4'),
+                            ('url6', 'domain4', 2, 'delete', BIGINT '4')
+                        """);
+    }
+
+    @Test
+    public void testCdfWithNameMappingModeOnTableWithColumnDropped()
+    {
+        testCdfWithMappingModeOnTableWithColumnDropped(ColumnMappingMode.NAME);
+    }
+
+    @Test
+    public void testCdfWithIdMappingModeOnTableWithColumnDropped()
+    {
+        testCdfWithMappingModeOnTableWithColumnDropped(ColumnMappingMode.ID);
+    }
+
+    private void testCdfWithMappingModeOnTableWithColumnDropped(ColumnMappingMode mode)
+    {
+        String tableName = "test_dropping_column_with_cdf_enabled_and_mapping_mode_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, page_views INTEGER, column_to_drop INTEGER) " +
+                "WITH (change_data_feed_enabled = true, column_mapping_mode = '" + mode + "')");
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url1', 1, 111)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url2', 2, 222)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url3', 3, 333)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url4', 4, 444)", 1);
+
+        assertUpdate("ALTER TABLE " + tableName + " DROP COLUMN column_to_drop");
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url5', 5)", 1);
+
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 0))",
+                """
+                        VALUES
+                            ('url1', 1, 'insert', BIGINT '1'),
+                            ('url2', 2, 'insert', BIGINT '2'),
+                            ('url3', 3, 'insert', BIGINT '3'),
+                            ('url4', 4, 'insert', BIGINT '4'),
+                            ('url5', 5, 'insert', BIGINT '6')
+                        """);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testReadMergeChanges(ColumnMappingMode mode)
+    {
+        String tableName1 = "test_basic_operations_on_table_with_cdf_enabled_merge_into_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName1 + " (page_url VARCHAR, domain VARCHAR, views INTEGER) " +
+                "WITH (change_data_feed_enabled = true, column_mapping_mode = '" + mode + "')");
+        assertUpdate("INSERT INTO " + tableName1 + " VALUES('url1', 'domain1', 1), ('url2', 'domain2', 2), ('url3', 'domain3', 3), ('url4', 'domain4', 4)", 4);
+
+        String tableName2 = "test_basic_operations_on_table_with_cdf_enabled_merge_from_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName2 + " (page_url VARCHAR, domain VARCHAR, views INTEGER)");
+        assertUpdate("INSERT INTO " + tableName2 + " VALUES('url1', 'domain10', 10), ('url2', 'domain20', 20), ('url5', 'domain5', 50)", 3);
+        assertUpdate("INSERT INTO " + tableName2 + " VALUES('url4', 'domain40', 40)", 1);
+
+        assertUpdate("MERGE INTO " + tableName1 + " tableWithCdf USING " + tableName2 + " source " +
+                "ON (tableWithCdf.page_url = source.page_url) " +
+                "WHEN MATCHED AND tableWithCdf.views > 1 " +
+                "THEN UPDATE SET views = (tableWithCdf.views + source.views) " +
+                "WHEN MATCHED AND tableWithCdf.views <= 1 " +
+                "THEN DELETE " +
+                "WHEN NOT MATCHED " +
+                "THEN INSERT (page_url, domain, views) VALUES (source.page_url, source.domain, source.views)", 4);
+
+        assertQuery("SELECT * FROM " + tableName1,
+                """
+                            VALUES
+                                ('url2', 'domain2', 22),
+                                ('url3', 'domain3', 3),
+                                ('url4', 'domain4', 44),
+                                ('url5', 'domain5', 50)
+                        """);
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName1 + "', 0))",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, 'insert', BIGINT '1'),
+                            ('url2', 'domain2', 2, 'insert', BIGINT '1'),
+                            ('url3', 'domain3', 3, 'insert', BIGINT '1'),
+                            ('url4', 'domain4', 4, 'insert', BIGINT '1'),
+                            ('url4', 'domain4', 4, 'update_preimage', BIGINT '2'),
+                            ('url4', 'domain4', 44, 'update_postimage', BIGINT '2'),
+                            ('url2', 'domain2', 2, 'update_preimage', BIGINT '2'),
+                            ('url2', 'domain2', 22, 'update_postimage', BIGINT '2'),
+                            ('url1', 'domain1', 1, 'delete', BIGINT '2'),
+                            ('url5', 'domain5', 50, 'insert', BIGINT '2')
+                        """);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testReadMergeChangesOnPartitionedTable(ColumnMappingMode mode)
+    {
+        String targetTable = "test_basic_operations_on_partitioned_table_with_cdf_enabled_target_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + targetTable + " (page_url VARCHAR, domain VARCHAR, views INTEGER) " +
+                "WITH (change_data_feed_enabled = true, partitioned_by = ARRAY['domain'], column_mapping_mode = '" + mode + "')");
+        assertUpdate("INSERT INTO " + targetTable + " VALUES('url1', 'domain1', 1), ('url2', 'domain2', 2), ('url3', 'domain3', 3), ('url4', 'domain1', 4)", 4);
+
+        String sourceTable1 = "test_basic_operations_on_partitioned_table_with_cdf_enabled_source_1_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + sourceTable1 + " (page_url VARCHAR, domain VARCHAR, views INTEGER)");
+        assertUpdate("INSERT INTO " + sourceTable1 + " VALUES('url1', 'domain1', 10), ('url2', 'domain2', 20), ('url5', 'domain3', 5)", 3);
+        assertUpdate("INSERT INTO " + sourceTable1 + " VALUES('url4', 'domain2', 40)", 1);
+
+        assertUpdate("MERGE INTO " + targetTable + " target USING " + sourceTable1 + " source " +
+                "ON (target.page_url = source.page_url) " +
+                "WHEN MATCHED AND target.views > 2 " +
+                "THEN UPDATE SET views = (target.views + source.views) " +
+                "WHEN MATCHED AND target.views <= 2 " +
+                "THEN DELETE " +
+                "WHEN NOT MATCHED " +
+                "THEN INSERT (page_url, domain, views) VALUES (source.page_url, source.domain, source.views)", 4);
+
+        assertQuery("SELECT * FROM " + targetTable,
+                """
+                        VALUES
+                            ('url3', 'domain3', 3),
+                            ('url4', 'domain1', 44),
+                            ('url5', 'domain3', 5)
+                        """);
+
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + targetTable + "'))",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, 'insert', 1),
+                            ('url2', 'domain2', 2, 'insert', BIGINT '1'),
+                            ('url3', 'domain3', 3, 'insert', BIGINT '1'),
+                            ('url4', 'domain1', 4, 'insert', BIGINT '1'),
+                            ('url1', 'domain1', 1, 'delete', BIGINT '2'),
+                            ('url2', 'domain2', 2, 'delete', BIGINT '2'),
+                            ('url4', 'domain1', 4, 'update_preimage', BIGINT '2'),
+                            ('url4', 'domain1', 44, 'update_postimage', BIGINT '2'),
+                            ('url5', 'domain3', 5, 'insert', BIGINT '2')
+                        """);
+
+        String sourceTable2 = "test_basic_operations_on_partitioned_table_with_cdf_enabled_source_1_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + sourceTable2 + " (page_url VARCHAR, domain VARCHAR, views INTEGER)");
+        assertUpdate("INSERT INTO " + sourceTable2 +
+                " VALUES('url3', 'domain1', 300), ('url4', 'domain2', 400), ('url5', 'domain3', 500), ('url6', 'domain1', 600)", 4);
+
+        assertUpdate("MERGE INTO " + targetTable + " target USING " + sourceTable2 + " source " +
+                "ON (target.page_url = source.page_url) " +
+                "WHEN MATCHED AND target.views > 3 " +
+                "THEN UPDATE SET domain = source.domain, views = (source.views + target.views) " +
+                "WHEN MATCHED AND target.views <= 3 " +
+                "THEN DELETE " +
+                "WHEN NOT MATCHED " +
+                "THEN INSERT (page_url, domain, views) VALUES (source.page_url, source.domain, source.views)", 4);
+
+        assertQuery("SELECT * FROM " + targetTable,
+                """
+                        VALUES
+                           ('url4', 'domain2', 444),
+                           ('url5', 'domain3', 505),
+                           ('url6', 'domain1', 600)
+                        """);
+
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + targetTable + "', 2))",
+                """
+                        VALUES
+                            ('url3', 'domain3', 3, 'delete', BIGINT '3'),
+                            ('url4', 'domain1', 44, 'update_preimage', BIGINT '3'),
+                            ('url4', 'domain2', 444, 'update_postimage', BIGINT '3'),
+                            ('url5', 'domain3', 5, 'update_preimage', BIGINT '3'),
+                            ('url5', 'domain3', 505, 'update_postimage', BIGINT '3'),
+                            ('url6', 'domain1', 600, 'insert', BIGINT '3')
+                        """);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testCdfCommitTimestamp(ColumnMappingMode mode)
+    {
+        String tableName = "test_cdf_commit_timestamp_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, domain VARCHAR, views INTEGER) " +
+                "WITH (change_data_feed_enabled = true, column_mapping_mode = '" + mode + "')");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url1', 'domain1', 1)", 1);
+        ZonedDateTime historyCommitTimestamp = (ZonedDateTime) computeScalar("SELECT timestamp FROM \"" + tableName + "$history\" WHERE version = 1");
+        ZonedDateTime tableChangesCommitTimestamp = (ZonedDateTime) computeScalar("SELECT _commit_timestamp FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 0)) WHERE _commit_Version = 1");
+        assertThat(historyCommitTimestamp).isEqualTo(tableChangesCommitTimestamp);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testReadDifferentChangeRanges(ColumnMappingMode mode)
+    {
+        String tableName = "test_reading_ranges_of_changes_on_table_with_cdf_enabled_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, domain VARCHAR, views INTEGER) " +
+                "WITH (change_data_feed_enabled = true, column_mapping_mode = '" + mode + "')");
+        assertQueryReturnsEmptyResult("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "'))");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url1', 'domain1', 1)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url2', 'domain2', 2)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url3', 'domain3', 3)", 1);
+        assertQueryReturnsEmptyResult("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 3))");
+
+        assertUpdate("UPDATE " + tableName + " SET page_url = 'url22' WHERE domain = 'domain2'", 1);
+        assertUpdate("UPDATE " + tableName + " SET page_url = 'url33' WHERE views = 3", 1);
+        assertUpdate("DELETE FROM " + tableName + " WHERE page_url = 'url1'", 1);
+
+        assertQuery("SELECT * FROM " + tableName,
+                """
+                        VALUES
+                           ('url22', 'domain2', 2),
+                           ('url33', 'domain3', 3)
+                        """);
+
+        assertQueryFails("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 1000))",
+                "since_version: 1000 is higher then current table version: 6");
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 0))",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, 'insert', BIGINT '1'),
+                            ('url2', 'domain2', 2, 'insert', BIGINT '2'),
+                            ('url3', 'domain3', 3, 'insert', BIGINT '3'),
+                            ('url2', 'domain2', 2, 'update_preimage', BIGINT '4'),
+                            ('url22', 'domain2', 2, 'update_postimage', BIGINT '4'),
+                            ('url3', 'domain3', 3, 'update_preimage', BIGINT '5'),
+                            ('url33', 'domain3', 3, 'update_postimage', BIGINT '5'),
+                            ('url1', 'domain1', 1, 'delete', BIGINT '6')
+                        """);
+
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "'))",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, 'insert', BIGINT '1'),
+                            ('url2', 'domain2', 2, 'insert', BIGINT '2'),
+                            ('url3', 'domain3', 3, 'insert', BIGINT '3'),
+                            ('url2', 'domain2', 2, 'update_preimage', BIGINT '4'),
+                            ('url22', 'domain2', 2, 'update_postimage', BIGINT '4'),
+                            ('url3', 'domain3', 3, 'update_preimage', BIGINT '5'),
+                            ('url33', 'domain3', 3, 'update_postimage', BIGINT '5'),
+                            ('url1', 'domain1', 1, 'delete', BIGINT '6')
+                        """);
+
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 3))",
+                """
+                        VALUES
+                            ('url2', 'domain2', 2, 'update_preimage', BIGINT '4'),
+                            ('url22', 'domain2', 2, 'update_postimage', BIGINT '4'),
+                            ('url3', 'domain3', 3, 'update_preimage', BIGINT '5'),
+                            ('url33', 'domain3', 3, 'update_postimage', BIGINT '5'),
+                            ('url1', 'domain1', 1, 'delete', BIGINT '6')
+                        """);
+
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 5))",
+                "VALUES ('url1', 'domain1', 1, 'delete', BIGINT '6')");
+        assertQueryFails("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 10))", "since_version: 10 is higher then current table version: 6");
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testReadChangesOnTableWithColumnAdded(ColumnMappingMode mode)
+    {
+        String tableName = "test_reading_changes_on_table_with_columns_added_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, domain VARCHAR, views INTEGER) " +
+                "WITH (change_data_feed_enabled = true, column_mapping_mode = '" + mode + "')");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url1', 'domain1', 1)", 1);
+        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN company VARCHAR");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url2', 'domain2', 2, 'starburst')", 1);
+
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "'))",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, null, 'insert', BIGINT '1'),
+                            ('url2', 'domain2', 2, 'starburst', 'insert', BIGINT '3')
+                        """);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testReadChangesOnTableWithRowColumn(ColumnMappingMode mode)
+    {
+        String tableName = "test_reading_changes_on_table_with_columns_added_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, costs ROW(month VARCHAR, amount BIGINT)) " +
+                "WITH (change_data_feed_enabled = true, column_mapping_mode = '" + mode + "')");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url1', ROW('01', 11))", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url2', ROW('02', 19))", 1);
+        assertUpdate("UPDATE " + tableName + " SET costs = ROW('02', 37) WHERE costs.month = '02'", 1);
+
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "'))",
+                """
+                        VALUES
+                            ('url1', ROW('01', BIGINT '11') , 'insert', BIGINT '1'),
+                            ('url2', ROW('02', BIGINT '19') , 'insert', BIGINT '2'),
+                            ('url2', ROW('02', BIGINT '19') , 'update_preimage', BIGINT '3'),
+                            ('url2', ROW('02', BIGINT '37') , 'update_postimage', BIGINT '3')
+                        """);
+
+        assertThat(query("SELECT costs.month, costs.amount, _commit_version FROM TABLE(system.table_changes('test_schema', '" + tableName + "'))"))
+                .matches("""
+                        VALUES
+                            (VARCHAR '01', BIGINT '11', BIGINT '1'),
+                            (VARCHAR '02', BIGINT '19', BIGINT '2'),
+                            (VARCHAR '02', BIGINT '19', BIGINT '3'),
+                            (VARCHAR '02', BIGINT '37', BIGINT '3')
+                        """);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testCdfOnTableWhichDoesntHaveItEnabledInitially(ColumnMappingMode mode)
+    {
+        String tableName = "test_cdf_on_table_without_it_initially_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, domain VARCHAR, views INTEGER) " +
+                "WITH (column_mapping_mode = '" + mode + "')");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url1', 'domain1', 1)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url2', 'domain2', 2)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url3', 'domain3', 3)", 1);
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 0))",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, 'insert', BIGINT '1'),
+                            ('url2', 'domain2', 2, 'insert', BIGINT '2'),
+                            ('url3', 'domain3', 3, 'insert', BIGINT '3')
+                        """);
+
+        assertUpdate("UPDATE " + tableName + " SET page_url = 'url22' WHERE domain = 'domain2'", 1);
+        assertQuerySucceeds("ALTER TABLE " + tableName + " SET PROPERTIES change_data_feed_enabled = true");
+        assertUpdate("UPDATE " + tableName + " SET page_url = 'url33' WHERE views = 3", 1);
+        assertUpdate("DELETE FROM " + tableName + " WHERE page_url = 'url1'", 1);
+
+        assertQuery("SELECT * FROM " + tableName,
+                """
+                        VALUES
+                           ('url22', 'domain2', 2),
+                           ('url33', 'domain3', 3)
+                        """);
+
+        assertQueryFails("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 3))",
+                "Change Data Feed is not enabled at version 4. Version contains 'remove' entries without 'cdc' entries");
+        assertQueryFails("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "'))",
+                "Change Data Feed is not enabled at version 4. Version contains 'remove' entries without 'cdc' entries");
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 5))",
+                """
+                        VALUES
+                            ('url3', 'domain3', 3, 'update_preimage', BIGINT '6'),
+                            ('url33', 'domain3', 3, 'update_postimage', BIGINT '6'),
+                            ('url1', 'domain1', 1, 'delete', BIGINT '7')
+                        """);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testReadChangesFromCtasTable(ColumnMappingMode mode)
+    {
+        String tableName = "test_basic_operations_on_table_with_cdf_enabled_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " WITH (change_data_feed_enabled = true, column_mapping_mode = '" + mode + "') " +
+                        "AS SELECT * FROM (VALUES" +
+                        "('url1', 'domain1', 1), " +
+                        "('url2', 'domain2', 2)) t(page_url, domain, views)",
+                2);
+
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "'))",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, 'insert', BIGINT '0'),
+                            ('url2', 'domain2', 2, 'insert', BIGINT '0')
+                        """);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testVacuumDeletesCdfFiles(ColumnMappingMode mode)
+            throws InterruptedException
+    {
+        String tableName = "test_vacuum_correctly_deletes_cdf_files_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, domain VARCHAR, views INTEGER) " +
+                "WITH (change_data_feed_enabled = true, column_mapping_mode = '" + mode + "')");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url1', 'domain1', 1), ('url3', 'domain3', 3), ('url2', 'domain2', 2)", 3);
+        assertUpdate("UPDATE " + tableName + " SET views = views * 10 WHERE views = 1", 1);
+        assertUpdate("UPDATE " + tableName + " SET views = views * 10 WHERE views = 2", 1);
+        Stopwatch timeSinceUpdate = Stopwatch.createStarted();
+        Thread.sleep(2000);
+        assertUpdate("UPDATE " + tableName + " SET views = views * 30 WHERE views = 3", 1);
+        Session sessionWithShortRetentionUnlocked = Session.builder(getSession())
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "vacuum_min_retention", "0s")
+                .build();
+        Set<String> allFilesFromCdfDirectory = getAllFilesFromCdfDirectory(tableName);
+        assertThat(allFilesFromCdfDirectory).hasSizeGreaterThanOrEqualTo(3);
+        long retention = timeSinceUpdate.elapsed().getSeconds();
+        getQueryRunner().execute(sessionWithShortRetentionUnlocked, "CALL delta.system.vacuum('test_schema', '" + tableName + "', '" + retention + "s')");
+        allFilesFromCdfDirectory = getAllFilesFromCdfDirectory(tableName);
+        assertThat(allFilesFromCdfDirectory).hasSizeBetween(1, 2);
+        assertQueryFails("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 2))", "Error opening Hive split.*/_change_data/.*The specified key does not exist.*");
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 3))",
+                """
+                        VALUES
+                            ('url3', 'domain3', 3, 'update_preimage', BIGINT '4'),
+                            ('url3', 'domain3', 90, 'update_postimage', BIGINT '4')
+                        """);
+    }
+
+    @Test(dataProvider = "columnMappingModeDataProvider")
+    public void testCdfWithOptimize(ColumnMappingMode mode)
+    {
+        String tableName = "test_cdf_with_optimize_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, domain VARCHAR, views INTEGER) " +
+                "WITH (change_data_feed_enabled = true, column_mapping_mode = '" + mode + "')");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url1', 'domain1', 1)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url2', 'domain2', 2)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url3', 'domain3', 3)", 1);
+        assertUpdate("UPDATE " + tableName + " SET views = views * 30 WHERE views = 3", 1);
+        computeActual("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url10', 'domain10', 10)", 1);
+        assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + tableName + "', 0))",
+                """
+                        VALUES
+                            ('url1', 'domain1', 1, 'insert', BIGINT '1'),
+                            ('url2', 'domain2', 2, 'insert', BIGINT '2'),
+                            ('url3', 'domain3', 3, 'insert', BIGINT '3'),
+                            ('url10', 'domain10', 10, 'insert', BIGINT '6'),
+                            ('url3', 'domain3', 3, 'update_preimage', BIGINT '4'),
+                            ('url3', 'domain3', 90, 'update_postimage', BIGINT '4')
+                        """);
+    }
+
+    @Test
+    public void testTableChangesAccessControl()
+    {
+        String tableName = "test_deny_table_changes_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (page_url VARCHAR, domain VARCHAR, views INTEGER) ");
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url1', 'domain1', 1)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url2', 'domain2', 2)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES('url3', 'domain3', 3)", 1);
+
+        assertAccessDenied(
+                "SELECT * FROM TABLE(system.table_changes('" + SCHEMA + "', '" + tableName + "', 0))",
+                "Cannot execute function .*",
+                privilege("delta.system.table_changes", EXECUTE_FUNCTION));
+
+        assertAccessDenied(
+                "SELECT * FROM TABLE(system.table_changes('" + SCHEMA + "', '" + tableName + "', 0))",
+                "Cannot select from columns .*",
+                privilege(tableName, SELECT_COLUMN));
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test(dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
+    public void testTableWithTrailingSlashLocation(boolean partitioned)
+    {
+        String tableName = "test_table_with_trailing_slash_location_" + randomNameSuffix();
+        String location = format("s3://%s/%s/", bucketName, tableName);
+
+        assertUpdate("CREATE TABLE " + tableName + "(col_str, col_int)" +
+                "WITH (location = '" + location + "'" +
+                (partitioned ? ",partitioned_by = ARRAY['col_str']" : "") +
+                ") " +
+                "AS VALUES ('str1', 1), ('str2', 2)", 2);
+        assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('str2', 2)");
+
+        assertUpdate("UPDATE " + tableName + " SET col_str = 'other'", 2);
+        assertQuery("SELECT * FROM " + tableName, "VALUES ('other', 1), ('other', 2)");
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES ('str3', 3)", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES ('other', 1), ('other', 2), ('str3', 3)");
+
+        assertUpdate("DELETE FROM " + tableName + " WHERE col_int = 2", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES ('other', 1), ('str3', 3)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test(dataProvider = "deleteFiltersForTable")
+    public void testDeleteWithFilter(String createTableSql, String deleteFilter, boolean pushDownDelete)
+    {
+        String table = "delete_with_filter_" + randomNameSuffix();
+        assertUpdate(format(createTableSql, table, bucketName, table));
+
+        assertUpdate(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Antioch'), ('Mary', 10, 'Adelphi'), ('Aaron', 3, 'Dallas')", table), 4);
+
+        assertUpdate(
+                getSession(),
+                format("DELETE FROM %s WHERE %s", table, deleteFilter),
+                2,
+                plan -> {
+                    if (pushDownDelete) {
+                        boolean tableDelete = searchFrom(plan.getRoot()).where(node -> node instanceof TableDeleteNode).matches();
+                        assertTrue(tableDelete, "A TableDeleteNode should be present");
+                    }
+                    else {
+                        TableFinishNode finishNode = searchFrom(plan.getRoot())
+                                .where(TableFinishNode.class::isInstance)
+                                .findOnlyElement();
+                        assertTrue(finishNode.getTarget() instanceof TableWriterNode.MergeTarget, "Delete operation should be performed through MERGE mechanism");
+                    }
+                });
+        assertQuery("SELECT customer, purchases, address FROM " + table, "VALUES ('Mary', 10, 'Adelphi'), ('Aaron', 3, 'Dallas')");
+        assertUpdate("DROP TABLE " + table);
+    }
+
+    @DataProvider
+    public Object[][] deleteFiltersForTable()
+    {
+        return new Object[][]{
+                {
+                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (location = 's3://%s/%s')",
+                        "address = 'Antioch'",
+                        false
+                },
+                {
+                        // delete filter applied on function over non-partitioned field
+                        "CREATE TABLE %s (customer VARCHAR, address VARCHAR, purchases INT) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
+                        "starts_with(address, 'Antioch')",
+                        false
+                },
+                {
+                        // delete filter applied on partitioned field
+                        "CREATE TABLE %s (customer VARCHAR, address VARCHAR, purchases INT) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
+                        "address = 'Antioch'",
+                        true
+                },
+                {
+                        // delete filter applied on partitioned field and on synthesized field
+                        "CREATE TABLE %s (customer VARCHAR, address VARCHAR, purchases INT) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
+                        "address = 'Antioch' AND \"$file_size\" > 0",
+                        false
+                },
+                {
+                        // delete filter applied on function over partitioned field
+                        "CREATE TABLE %s (customer VARCHAR, address VARCHAR, purchases INT) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address'])",
+                        "starts_with(address, 'Antioch')",
+                        false
+                },
+                {
+                        // delete filter applied on non-partitioned field
+                        "CREATE TABLE %s (customer VARCHAR, address VARCHAR, purchases INT) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer'])",
+                        "address = 'Antioch'",
+                        false
+                },
+                {
+                        // delete filter fully applied on composed partition
+                        "CREATE TABLE %s (purchases INT, customer VARCHAR, address VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address', 'customer'])",
+                        "address = 'Antioch' AND (customer = 'Aaron' OR customer = 'Bill')",
+                        true
+                },
+                {
+                        // delete filter applied only partly on first partitioned field
+                        "CREATE TABLE %s (purchases INT, address VARCHAR, customer VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['address', 'customer'])",
+                        "address = 'Antioch'",
+                        true
+                },
+                {
+                        // delete filter applied only partly on second partitioned field
+                        "CREATE TABLE %s (purchases INT, address VARCHAR, customer VARCHAR) WITH (location = 's3://%s/%s', partitioned_by = ARRAY['customer', 'address'])",
+                        "address = 'Antioch'",
+                        true
+                },
+        };
+    }
+
+    @Override
+    protected void verifyAddNotNullColumnToNonEmptyTableFailurePermissible(Throwable e)
+    {
+        assertThat(e).hasMessageMatching("Unable to add NOT NULL column '.*' for non-empty table: .*");
+    }
+
+    @Override
+    protected String createSchemaSql(String schemaName)
+    {
+        return "CREATE SCHEMA " + schemaName + " WITH (location = 's3://" + bucketName + "/" + schemaName + "')";
+    }
+
+    @Override
+    protected OptionalInt maxSchemaNameLength()
+    {
+        return OptionalInt.of(128);
+    }
+
+    @Override
+    protected void verifySchemaNameLengthFailurePermissible(Throwable e)
+    {
+        assertThat(e).hasMessageMatching("Schema name must be shorter than or equal to '128' characters but got.*");
+    }
+
+    @Override
+    protected OptionalInt maxTableNameLength()
+    {
+        return OptionalInt.of(128);
+    }
+
+    @Override
+    protected void verifyTableNameLengthFailurePermissible(Throwable e)
+    {
+        assertThat(e).hasMessageMatching("Table name must be shorter than or equal to '128' characters but got.*");
+    }
+
+    private Set<String> getActiveFiles(String tableName)
+    {
+        return getActiveFiles(tableName, getQueryRunner().getDefaultSession());
+    }
+
+    private Set<String> getActiveFiles(String tableName, Session session)
+    {
+        return computeActual(session, "SELECT DISTINCT \"$path\" FROM " + tableName).getOnlyColumnAsSet().stream()
+                .map(String.class::cast)
+                .collect(toImmutableSet());
+    }
+
+    private Set<String> getAllDataFilesFromTableDirectory(String tableName)
+    {
+        return getTableFiles(tableName).stream()
+                .filter(path -> !path.contains("/" + TRANSACTION_LOG_DIRECTORY))
+                .collect(toImmutableSet());
+    }
+
+    private List<String> getTableFiles(String tableName)
+    {
+        return minioClient.listObjects(bucketName, format("%s/%s", SCHEMA, tableName)).stream()
+                .map(path -> format("s3://%s/%s", bucketName, path))
+                .collect(toImmutableList());
+    }
+
+    private void assertTableChangesQuery(@Language("SQL") String sql, @Language("SQL") String expectedResult)
+    {
+        assertThat(query(sql))
+                .exceptColumns("_commit_timestamp")
+                .skippingTypesCheck()
+                .matches(expectedResult);
+    }
+
+    private Set<String> getAllFilesFromCdfDirectory(String tableName)
+    {
+        return getTableFiles(tableName).stream()
+                .filter(path -> path.contains("/" + CHANGE_DATA_FOLDER_NAME))
+                .collect(toImmutableSet());
+    }
+
+    @Test
+    public void testPartitionFilterQueryNotDemanded()
+    {
+        Map<String, String> catalogProperties = getSession().getCatalogProperties(getSession().getCatalog().orElseThrow());
+        assertThat(catalogProperties).doesNotContainKey("query_partition_filter_required");
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_filter_not_demanded",
+                "(x varchar, part varchar) WITH (partitioned_by = ARRAY['part'])",
+                ImmutableList.of("'a', 'part_a'", "'b', 'part_b'"))) {
+            assertQuery("SELECT * FROM %s WHERE x='a'".formatted(table.getName()), "VALUES('a', 'part_a')");
+            assertQuery("SELECT * FROM %s WHERE part='part_a'".formatted(table.getName()), "VALUES('a', 'part_a')");
+        }
+    }
+
+    @Test
+    public void testQueryWithoutPartitionOnNonPartitionedTableNotDemanded()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_no_partition_table_",
+                "(x varchar, part varchar)",
+                ImmutableList.of("('a', 'part_a')", "('b', 'part_b')"))) {
+            assertQuery(session, "SELECT * FROM %s WHERE x='a'".formatted(table.getName()), "VALUES('a', 'part_a')");
+            assertQuery(session, "SELECT * FROM %s WHERE part='part_a'".formatted(table.getName()), "VALUES('a', 'part_a')");
+        }
+    }
+
+    @Test
+    public void testQueryWithoutPartitionFilterNotAllowed()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_no_partition_filter_",
+                "(x varchar, part varchar) WITH (partitioned_by = ARRAY['part'])",
+                ImmutableList.of("('a', 'part_a')", "('b', 'part_b')"))) {
+            assertQueryFails(
+                    session,
+                    "SELECT * FROM %s WHERE x='a'".formatted(table.getName()),
+                    "Filter required on .*" + table.getName() + " for at least one partition column:.*");
+        }
+    }
+
+    @Test
+    public void testPartitionFilterRemovedByPlanner()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_filter_removed_",
+                "(x varchar, part varchar) WITH (partitioned_by = ARRAY['part'])",
+                ImmutableList.of("('a', 'part_a')", "('b', 'part_b')"))) {
+            assertQueryFails(
+                    session,
+                    "SELECT x FROM " + table.getName() + " WHERE part IS NOT NULL OR TRUE",
+                    "Filter required on .*" + table.getName() + " for at least one partition column:.*");
+        }
+    }
+
+    @Test
+    public void testPartitionFilterIncluded()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_filter_included",
+                "(x varchar, part integer) WITH (partitioned_by = ARRAY['part'])",
+                ImmutableList.of("('a', 1)", "('a', 2)", "('a', 3)", "('a', 4)", "('b', 1)", "('b', 2)", "('b', 3)", "('b', 4)"))) {
+            assertQuery(session, "SELECT * FROM " + table.getName() + " WHERE part = 1", "VALUES ('a', 1), ('b', 1)");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE part < 2", "VALUES 2");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE Part < 2", "VALUES 2");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE PART < 2", "VALUES 2");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE parT < 2", "VALUES 2");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE part % 2 = 0", "VALUES 4");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE part - 2 = 0", "VALUES 2");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE part * 4 = 4", "VALUES 2");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE part % 2 > 0", "VALUES 4");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE part % 2 = 1 and part IS NOT NULL", "VALUES 4");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE part IS NULL", "VALUES 0");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE part = 1 OR x = 'a' ", "VALUES 5");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE part = 1 AND  x = 'a' ", "VALUES 1");
+            assertQuery(session, "SELECT count(*) FROM " + table.getName() + " WHERE part IS NOT NULL", "VALUES 8");
+            assertQuery(session, "SELECT x, count(*) AS COUNT FROM " + table.getName() + " WHERE part > 2 GROUP BY x ", "VALUES ('a', 2), ('b', 2)");
+            assertQueryFails(session, "SELECT count(*) FROM " + table.getName() + " WHERE x= 'a'", "Filter required on .*" + table.getName() + " for at least one partition column:.*");
+        }
+    }
+
+    @Test
+    public void testRequiredPartitionFilterOnJoin()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+
+        try (TestTable leftTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_left_",
+                "(x varchar, part varchar)",
+                ImmutableList.of("('a', 'part_a')"));
+                    TestTable rightTable = new TestTable(
+                            new TrinoSqlExecutor(getQueryRunner(), session),
+                           "test_partition_right_",
+                            "(x varchar, part varchar) WITH (partitioned_by = ARRAY['part'])",
+                            ImmutableList.of("('a', 'part_a')"))) {
+            assertQueryFails(
+                    session,
+                    "SELECT a.x, b.x from %s a JOIN %s b on (a.x = b.x) where a.x = 'a'".formatted(leftTable.getName(), rightTable.getName()),
+                    "Filter required on .*" + rightTable.getName() + " for at least one partition column:.*");
+            assertQuery(
+                    session,
+                    "SELECT a.x, b.x from %s a JOIN %s b on (a.part = b.part) where a.part = 'part_a'".formatted(leftTable.getName(), rightTable.getName()),
+                    "VALUES ('a', 'a')");
+        }
+    }
+
+    @Test
+    public void testRequiredPartitionFilterOnJoinBothTablePartitioned()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+
+        try (TestTable leftTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_inferred_left_",
+                "(x varchar, part varchar) WITH (partitioned_by = ARRAY['part'])",
+                ImmutableList.of("('a', 'part_a')"));
+                    TestTable rightTable = new TestTable(
+                            new TrinoSqlExecutor(getQueryRunner(), session),
+                            "test_partition_inferred_right_",
+                            "(x varchar, part varchar) WITH (partitioned_by = ARRAY['part'])",
+                            ImmutableList.of("('a', 'part_a')"))) {
+            assertQueryFails(
+                    session,
+                    "SELECT a.x, b.x from %s a JOIN %s b on (a.x = b.x) where a.x = 'a'".formatted(leftTable.getName(), rightTable.getName()),
+                    "Filter required on .*" + leftTable.getName() + " for at least one partition column:.*");
+            assertQuery(
+                    session,
+                    "SELECT a.x, b.x from %s a JOIN %s b on (a.part = b.part) where a.part = 'part_a'".formatted(leftTable.getName(), rightTable.getName()),
+                    "VALUES ('a', 'a')");
+        }
+    }
+
+    @Test
+    public void testComplexPartitionPredicateWithCasting()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_predicate",
+                "(x varchar, part varchar) WITH (partitioned_by = ARRAY['part'])",
+                ImmutableList.of("('a', '1')", "('b', '2')"))) {
+            assertQuery(session, "SELECT * FROM " + table.getName() + " WHERE CAST (part AS integer) = 1", "VALUES ('a', 1)");
+        }
+    }
+
+    @Test
+    public void testPartitionPredicateInOuterQuery()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_predicate",
+                "(x integer, part integer) WITH (partitioned_by = ARRAY['part'])",
+                ImmutableList.of("(1, 11)", "(2, 22)"))) {
+            assertQuery(session, "SELECT * FROM (SELECT * FROM " + table.getName() + " WHERE x = 1) WHERE part = 11", "VALUES (1, 11)");
+        }
+    }
+
+    @Test
+    public void testPartitionPredicateInInnerQuery()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_predicate",
+                "(x integer, part integer) WITH (partitioned_by = ARRAY['part'])",
+                ImmutableList.of("(1, 11)", "(2, 22)"))) {
+            assertQuery(session, "SELECT * FROM (SELECT * FROM " + table.getName() + " WHERE part = 11) WHERE x = 1", "VALUES (1, 11)");
+        }
+    }
+
+    @Test
+    public void testPartitionPredicateFilterAndAnalyzeOnPartitionedTable()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_predicate_analyze_",
+                "(x integer, part integer) WITH (partitioned_by = ARRAY['part'])",
+                ImmutableList.of("(1, 11)", "(2, 22)"))) {
+            String expectedMessageRegExp = "ANALYZE statement can not be performed on partitioned tables because filtering is required on at least one partition." +
+                                           " However, the partition filtering check can be disabled with the catalog session property 'query_partition_filter_required'.";
+            assertQueryFails(session, "ANALYZE " + table.getName(), expectedMessageRegExp);
+            assertQueryFails(session, "EXPLAIN ANALYZE " + table.getName(), expectedMessageRegExp);
+        }
+    }
+
+    @Test
+    public void testPartitionPredicateFilterAndAnalyzeOnNonPartitionedTable()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable nonPartitioned = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_predicate_analyze_nonpartitioned",
+                "(a integer, b integer) ",
+                ImmutableList.of("(1, 11)", "(2, 22)"))) {
+            assertUpdate(session, "ANALYZE " + nonPartitioned.getName());
+            computeActual(session, "EXPLAIN ANALYZE " + nonPartitioned.getName());
+        }
+    }
+
+    @Test
+    public void testPartitionFilterMultiplePartition()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_filter_multiple_partition_",
+                "(x varchar, part1 integer, part2 integer) WITH (partitioned_by = ARRAY['part1', 'part2'])",
+                ImmutableList.of("('a', 1, 1)", "('a', 1, 2)", "('a', 2, 1)", "('a', 2, 2)", "('b', 1, 1)", "('b', 1, 2)", "('b', 2, 1)", "('b', 2, 2)"))) {
+            assertQuery(session, "SELECT count(*) FROM %s WHERE part1 = 1".formatted(table.getName()), "VALUES 4");
+            assertQuery(session, "SELECT count(*) FROM %s WHERE part2 = 1".formatted(table.getName()), "VALUES 4");
+            assertQuery(session, "SELECT count(*) FROM %s WHERE part1 = 1 AND part2 = 2".formatted(table.getName()), "VALUES 2");
+            assertQuery(session, "SELECT count(*) FROM %s WHERE part2 IS NOT NULL".formatted(table.getName()), "VALUES 8");
+            assertQuery(session, "SELECT count(*) FROM %s WHERE part2 IS NULL".formatted(table.getName()), "VALUES 0");
+            assertQuery(session, "SELECT count(*) FROM %s WHERE part2 < 0".formatted(table.getName()), "VALUES 0");
+            assertQuery(session, "SELECT count(*) FROM %s WHERE part1 = 1 OR part2 > 1".formatted(table.getName()), "VALUES 6");
+            assertQuery(session, "SELECT count(*) FROM %s WHERE part1 = 1 AND part2 > 1".formatted(table.getName()), "VALUES 2");
+            assertQuery(session, "SELECT count(*) FROM %s WHERE part1 IS NOT NULL OR part2 > 1".formatted(table.getName()), "VALUES 8");
+            assertQuery(session, "SELECT count(*) FROM %s WHERE part1 IS NOT NULL AND part2 > 1".formatted(table.getName()), "VALUES 4");
+            assertQuery(session, "SELECT count(*) FROM %s WHERE x = 'a' AND part2 = 2".formatted(table.getName()), "VALUES 2");
+            assertQuery(session, "SELECT x, PART1 * 10 + PART2 AS Y FROM %s WHERE x = 'a' AND part2 = 2".formatted(table.getName()), "VALUES ('a', 12), ('a', 22)");
+            assertQuery(session, "SELECT x, CAST (PART1 AS varchar) || CAST (PART2 AS varchar) FROM %s WHERE x = 'a' AND part2 = 2".formatted(table.getName()), "VALUES ('a', '12'), ('a', '22')");
+            assertQuery(session, "SELECT x, MAX(PART1) FROM %s WHERE part2 = 2 GROUP BY X".formatted(table.getName()), "VALUES ('a', 2), ('b', 2)");
+            assertQuery(session, "SELECT x, reduce_agg(part1, 0, (a, b) -> a + b, (a, b) -> a + b) FROM " + table.getName() + " WHERE part2 > 1 GROUP BY X", "VALUES ('a', 3), ('b', 3)");
+            String expectedMessageRegExp = "Filter required on .*" + table.getName() + " for at least one partition column:.*";
+            assertQueryFails(session, "SELECT X, CAST (PART1 AS varchar) || CAST (PART2 AS varchar) FROM %s WHERE x = 'a'".formatted(table.getName()), expectedMessageRegExp);
+            assertQueryFails(session, "SELECT count(*) FROM %s WHERE x='a'".formatted(table.getName()), expectedMessageRegExp);
+        }
+    }
+
+    @Test
+    public void testPartitionFilterRequiredAndOptimize()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_filter_optimize",
+                "(part integer, name varchar(50)) WITH (partitioned_by = ARRAY['part'])",
+                ImmutableList.of("(1, 'Bob')", "(2, 'Alice')"))) {
+            assertUpdate(session, "ALTER TABLE " + table.getName() + " ADD COLUMN last_name varchar(50)");
+            assertUpdate(session, "INSERT INTO " + table.getName() + " SELECT 3, 'John', 'Doe'", 1);
+
+            assertQuery(session,
+                    "SELECT part, name, last_name  FROM " + table.getName() + " WHERE part < 4",
+                    "VALUES (1, 'Bob', NULL), (2, 'Alice', NULL), (3, 'John', 'Doe')");
+
+            Set<String> beforeActiveFiles = getActiveFiles(table.getName());
+            assertQueryFails(session, "ALTER TABLE " + table.getName() + " EXECUTE OPTIMIZE", "Filter required on .*" + table.getName() + " for at least one partition column:.*");
+            computeActual(session, "ALTER TABLE " + table.getName() + " EXECUTE OPTIMIZE WHERE part=1");
+            assertThat(beforeActiveFiles).isEqualTo(getActiveFiles(table.getName()));
+
+            assertUpdate(session, "INSERT INTO " + table.getName() + " SELECT 1, 'Dave', 'Doe'", 1);
+            assertQuery(session,
+                    "SELECT part, name, last_name  FROM " + table.getName() + " WHERE part < 4",
+                    "VALUES (1, 'Bob', NULL), (2, 'Alice', NULL), (3, 'John', 'Doe'), (1, 'Dave', 'Doe')");
+            computeActual(session, "ALTER TABLE " + table.getName() + " EXECUTE OPTIMIZE WHERE part=1");
+            assertThat(beforeActiveFiles).isNotEqualTo(getActiveFiles(table.getName()));
+
+            assertQuery(session,
+                    "SELECT part, name, last_name  FROM " + table.getName() + " WHERE part < 4",
+                    "VALUES (1, 'Bob', NULL), (2, 'Alice', NULL), (3, 'John', 'Doe'), (1, 'Dave', 'Doe')");
+        }
+    }
+
+    @Test
+    public void testPartitionFilterEnabledAndOptimizeForNonPartitionedTable()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_filter_nonpartitioned_optimize",
+                "(part integer, name varchar(50))",
+                ImmutableList.of("(1, 'Bob')", "(2, 'Alice')"))) {
+            assertUpdate(session, "ALTER TABLE " + table.getName() + " ADD COLUMN last_name varchar(50)");
+            assertUpdate(session, "INSERT INTO " + table.getName() + " SELECT 3, 'John', 'Doe'", 1);
+
+            assertQuery(session,
+                    "SELECT part, name, last_name  FROM " + table.getName() + " WHERE part < 4",
+                    "VALUES (1, 'Bob', NULL), (2, 'Alice', NULL), (3, 'John', 'Doe')");
+
+            Set<String> beforeActiveFiles = getActiveFiles(table.getName());
+            computeActual(session, "ALTER TABLE " + table.getName() + " EXECUTE OPTIMIZE (file_size_threshold => '10kB')");
+
+            assertThat(beforeActiveFiles).isNotEqualTo(getActiveFiles(table.getName()));
+            assertQuery(session,
+                    "SELECT part, name, last_name  FROM " + table.getName() + " WHERE part < 4",
+                    "VALUES (1, 'Bob', NULL), (2, 'Alice', NULL), (3, 'John', 'Doe')");
+        }
+    }
+
+    @Test
+    public void testPartitionFilterRequiredAndWriteOperation()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_filter_table_changes",
+                "(x integer, part integer) WITH (partitioned_by = ARRAY['part'], change_data_feed_enabled = true)",
+                ImmutableList.of("(1, 11)", "(2, 22)", "(3, 33)"))) {
+            @Language("RegExp")
+            String expectedMessageRegExp = "Filter required on test_schema\\." + table.getName() + " for at least one partition column: part";
+
+            assertQueryFails(session, "UPDATE " + table.getName() + " SET x = 10 WHERE x = 1", expectedMessageRegExp);
+            assertUpdate(session, "UPDATE " + table.getName() + " SET x = 20 WHERE part = 22", 1);
+
+            assertQueryFails(session, "MERGE INTO " + table.getName() + " t " +
+                                      "USING (SELECT * FROM (VALUES (3, 99), (4,44))) AS s(x, part) " +
+                                      "ON t.x = s.x " +
+                                      "WHEN MATCHED THEN DELETE ", expectedMessageRegExp);
+            assertUpdate(session, "MERGE INTO " + table.getName() + " t " +
+                                  "USING (SELECT * FROM (VALUES (2, 22), (4 , 44))) AS s(x, part) " +
+                                  "ON (t.part = s.part) " +
+                                  "WHEN MATCHED THEN UPDATE " +
+                                  " SET x = t.x + s.x, part = t.part ", 1);
+
+            assertQueryFails(session, "MERGE INTO " + table.getName() + " t " +
+                                      "USING (SELECT * FROM (VALUES (4,44))) AS s(x, part) " +
+                                      "ON t.x = s.x " +
+                                      "WHEN NOT MATCHED THEN INSERT (x, part) VALUES(s.x, s.part) ", expectedMessageRegExp);
+            assertUpdate(session, "MERGE INTO " + table.getName() + " t " +
+                                  "USING (SELECT * FROM (VALUES (4, 44))) AS s(x, part) " +
+                                  "ON (t.part = s.part) " +
+                                  "WHEN NOT MATCHED THEN INSERT (x, part) VALUES(s.x, s.part) ", 1);
+
+            assertQueryFails(session, "DELETE FROM " + table.getName() + " WHERE x = 3", expectedMessageRegExp);
+            assertUpdate(session, "DELETE FROM " + table.getName() + " WHERE part = 33 and x = 3", 1);
+        }
+    }
+
+    @Test
+    public void testPartitionFilterRequiredAndTableChanges()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_filter_table_changes",
+                "(x integer, part integer) WITH (partitioned_by = ARRAY['part'], change_data_feed_enabled = true)")) {
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (1, 11)", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (2, 22)", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (3, 33)", 1);
+
+            @Language("RegExp")
+            String expectedMessageRegExp = "Filter required on test_schema\\." + table.getName() + " for at least one partition column: part";
+
+            assertQueryFails(session, "UPDATE " + table.getName() + " SET x = 10 WHERE x = 1", expectedMessageRegExp);
+            assertUpdate(session, "UPDATE " + table.getName() + " SET x = 20 WHERE part = 22", 1);
+            // TODO (https://github.com/trinodb/trino/issues/18498) Check for partition filter for table_changes when the following issue will be completed https://github.com/trinodb/trino/pull/17928
+            assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + table.getName() + "'))",
+                    """
+                            VALUES
+                                (1,   11,  'insert',           BIGINT '1'),
+                                (2,   22,  'insert',           BIGINT '2'),
+                                (3,   33,  'insert',           BIGINT '3'),
+                                (2,   22,  'update_preimage',  BIGINT '4'),
+                                (20,  22,  'update_postimage', BIGINT '4')
+                            """);
+
+            assertQueryFails(session, "DELETE FROM " + table.getName() + " WHERE x = 3", expectedMessageRegExp);
+            assertUpdate(session, "DELETE FROM " + table.getName() + " WHERE part = 33 and x = 3", 1);
+            assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + table.getName() + "', 4))",
+                    """
+                            VALUES
+                                (3, 33, 'delete', BIGINT '5')
+                            """);
+
+            assertTableChangesQuery("SELECT * FROM TABLE(system.table_changes('test_schema', '" + table.getName() + "')) ORDER BY _commit_version, _change_type, part",
+                    """
+                            VALUES
+                                (1,   11,  'insert',           BIGINT '1'),
+                                (2,   22,  'insert',           BIGINT '2'),
+                                (3,   33,  'insert',           BIGINT '3'),
+                                (2,   22,  'update_preimage',  BIGINT '4'),
+                                (20,  22,  'update_postimage', BIGINT '4'),
+                                (3,   33,  'delete',           BIGINT '5')
+                            """);
+        }
+    }
+
+    @Test
+    public void testPartitionFilterRequiredAndHistoryTable()
+    {
+        Session session = sessionWithPartitionFilterRequirement();
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_partition_filter_table_changes",
+                "(x integer, part integer) WITH (partitioned_by = ARRAY['part'], change_data_feed_enabled = true)")) {
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (1, 11)", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (2, 22)", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (3, 33)", 1);
+
+            @Language("RegExp")
+            String expectedMessageRegExp = "Filter required on test_schema\\." + table.getName() + " for at least one partition column: part";
+
+            assertQuery("SELECT version, operation, read_version FROM \"" + table.getName() + "$history\"",
+                    """
+                            VALUES
+                                (0, 'CREATE TABLE', 0),
+                                (1, 'WRITE', 0),
+                                (2, 'WRITE', 1),
+                                (3, 'WRITE', 2)
+                            """);
+
+            assertQueryFails(session, "UPDATE " + table.getName() + " SET x = 10 WHERE x = 1", expectedMessageRegExp);
+            assertUpdate(session, "UPDATE " + table.getName() + " SET x = 20 WHERE part = 22", 1);
+
+            assertQuery("SELECT version, operation, read_version FROM \"" + table.getName() + "$history\"",
+                    """
+                            VALUES
+                                (0, 'CREATE TABLE', 0),
+                                (1, 'WRITE', 0),
+                                (2, 'WRITE', 1),
+                                (3, 'WRITE', 2),
+                                (4, 'MERGE', 3)
+                            """);
+        }
+    }
+
+    @Override
+    protected Session withoutSmallFileThreshold(Session session)
+    {
+        return Session.builder(session)
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "parquet_small_file_threshold", "0B")
+                .build();
+    }
+
+    private Session sessionWithPartitionFilterRequirement()
+    {
+        return Session.builder(getSession())
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "query_partition_filter_required", "true")
+                .build();
+    }
+
+    @Test
+    public void testTrinoCacheInvalidatedOnCreateTable()
+    {
+        String tableName = "test_create_table_invalidate_cache_" + randomNameSuffix();
+        String tableLocation = "s3://%s/%s/%s".formatted(bucketName, SCHEMA, tableName);
+
+        String initialValues = "VALUES" +
+                               " (1, BOOLEAN 'false', TINYINT '-128')" +
+                               ",(2, BOOLEAN 'true', TINYINT '127')" +
+                               ",(3, BOOLEAN 'false', TINYINT '0')" +
+                               ",(4, BOOLEAN 'false', TINYINT '1')" +
+                               ",(5, BOOLEAN 'true', TINYINT '37')";
+        assertUpdate("CREATE TABLE " + tableName + "(id, boolean, tinyint) WITH (location = '" + tableLocation + "') AS " + initialValues, 5);
+        assertThat(query("SELECT * FROM " + tableName)).matches(initialValues);
+
+        metastore.dropTable(SCHEMA, tableName, false);
+        for (String file : minioClient.listObjects(bucketName, SCHEMA + "/" + tableName)) {
+            minioClient.removeObject(bucketName, file);
+        }
+
+        String newValues = "VALUES" +
+                           " (1, BOOLEAN 'true', TINYINT '1')" +
+                           ",(2, BOOLEAN 'true', TINYINT '1')" +
+                           ",(3, BOOLEAN 'false', TINYINT '2')" +
+                           ",(4, BOOLEAN 'true', TINYINT '3')" +
+                           ",(5, BOOLEAN 'true', TINYINT '5')" +
+                           ",(6, BOOLEAN 'false', TINYINT '8')" +
+                           ",(7, BOOLEAN 'true', TINYINT '13')";
+        assertUpdate("CREATE TABLE " + tableName + "(id, boolean, tinyint) WITH (location = '" + tableLocation + "') AS " + newValues, 7);
+        assertThat(query("SELECT * FROM " + tableName)).matches(newValues);
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeCreateSchemaInternalRetry.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeCreateSchemaInternalRetry.java
index bcb14e7853b5..33dc016113dc 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeCreateSchemaInternalRetry.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeCreateSchemaInternalRetry.java
@@ -26,8 +26,9 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -39,10 +40,12 @@
 import static com.google.inject.util.Modules.EMPTY_MODULE;
 import static io.trino.plugin.deltalake.DeltaLakeConnectorFactory.CONNECTOR_NAME;
 import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeCreateSchemaInternalRetry
         extends AbstractTestQueryFramework
 {
@@ -65,7 +68,7 @@ protected QueryRunner createQueryRunner()
         this.dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("delta_lake_data").toString();
         this.metastore = new FileHiveMetastore(
                 new NodeVersion("testversion"),
-                HDFS_ENVIRONMENT,
+                HDFS_FILE_SYSTEM_FACTORY,
                 new HiveMetastoreConfig().isHideDeltaLakeTables(),
                 new FileHiveMetastoreConfig()
                         .setCatalogDirectory(dataDirectory)
@@ -93,7 +96,7 @@ public synchronized void createDatabase(Database database)
         return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws IOException
     {
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeCreateTableInternalRetry.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeCreateTableInternalRetry.java
new file mode 100644
index 000000000000..5bc25447ad46
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeCreateTableInternalRetry.java
@@ -0,0 +1,173 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.Session;
+import io.trino.plugin.deltalake.metastore.TestingDeltaLakeMetastoreModule;
+import io.trino.plugin.hive.NodeVersion;
+import io.trino.plugin.hive.TableAlreadyExistsException;
+import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
+import io.trino.plugin.hive.metastore.PrincipalPrivileges;
+import io.trino.plugin.hive.metastore.Table;
+import io.trino.plugin.hive.metastore.file.FileHiveMetastore;
+import io.trino.plugin.hive.metastore.file.FileHiveMetastoreConfig;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.google.common.base.Verify.verify;
+import static com.google.common.io.MoreFiles.deleteRecursively;
+import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
+import static com.google.inject.util.Modules.EMPTY_MODULE;
+import static io.trino.plugin.deltalake.DeltaLakeConnectorFactory.CONNECTOR_NAME;
+import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestDeltaLakeCreateTableInternalRetry
+        extends AbstractTestQueryFramework
+{
+    private static final String CATALOG_NAME = "delta_lake";
+    private static final String SCHEMA_NAME = "test_create_table";
+
+    private String dataDirectory;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        Session session = testSessionBuilder()
+                .setCatalog(CATALOG_NAME)
+                .setSchema(SCHEMA_NAME)
+                .build();
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session).build();
+
+        dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("delta_lake_data").toString();
+        HiveMetastore metastore = new FileHiveMetastore(
+                new NodeVersion("testversion"),
+                HDFS_FILE_SYSTEM_FACTORY,
+                new HiveMetastoreConfig().isHideDeltaLakeTables(),
+                new FileHiveMetastoreConfig()
+                        .setCatalogDirectory(dataDirectory)
+                        .setMetastoreUser("test"))
+        {
+            @Override
+            public synchronized void createTable(Table table, PrincipalPrivileges principalPrivileges)
+            {
+                if (table.getTableName().startsWith("test_different_session")) {
+                    // By modifying query id test simulates that table was created from different session.
+                    table = Table.builder(table)
+                            .setParameters(ImmutableMap.of(PRESTO_QUERY_ID_NAME, "new_query_id"))
+                            .build();
+                }
+                // Simulate retry mechanism with timeout failure of ThriftHiveMetastore.
+                // 1. createTable correctly create table but timeout is triggered
+                // 2. Retry to createTable throws TableAlreadyExistsException
+                super.createTable(table, principalPrivileges);
+                throw new TableAlreadyExistsException(table.getSchemaTableName());
+            }
+        };
+        queryRunner.installPlugin(new TestingDeltaLakePlugin(Optional.of(new TestingDeltaLakeMetastoreModule(metastore)), Optional.empty(), EMPTY_MODULE));
+        queryRunner.createCatalog(CATALOG_NAME, CONNECTOR_NAME, Map.of("delta.register-table-procedure.enabled", "true"));
+        queryRunner.execute("CREATE SCHEMA " + SCHEMA_NAME);
+        return queryRunner;
+    }
+
+    @AfterAll
+    public void tearDown()
+            throws IOException
+    {
+        if (dataDirectory != null) {
+            deleteRecursively(Path.of(dataDirectory), ALLOW_INSECURE);
+        }
+    }
+
+    @Test
+    public void testCreateTableInternalRetry()
+    {
+        assertQuerySucceeds("CREATE TABLE test_ct_internal_retry(a int)");
+        assertQuery("SHOW TABLES LIKE 'test_ct_internal_retry'", "VALUES 'test_ct_internal_retry'");
+    }
+
+    @Test
+    public void testCreateTableAsSelectInternalRetry()
+    {
+        assertQuerySucceeds("CREATE TABLE test_ctas_internal_retry AS SELECT 1 a");
+        assertQuery("SHOW TABLES LIKE 'test_ctas_internal_retry'", "VALUES 'test_ctas_internal_retry'");
+    }
+
+    @Test
+    public void testRegisterTableInternalRetry()
+    {
+        assertQuerySucceeds("CREATE TABLE test_register_table_internal_retry AS SELECT 1 a");
+        String tableLocation = getTableLocation("test_register_table_internal_retry");
+        assertUpdate("CALL system.unregister_table(current_schema, 'test_register_table_internal_retry')");
+
+        assertQuerySucceeds("CALL system.register_table(current_schema, 'test_register_table_internal_retry', '" + tableLocation + "')");
+        assertQuery("SHOW TABLES LIKE 'test_register_table_internal_retry'", "VALUES 'test_register_table_internal_retry'");
+    }
+
+    @Test
+    public void testCreateTableFailureWithDifferentSession()
+    {
+        assertQueryFails("CREATE TABLE test_different_session_ct(a int)", "Table already exists: .*");
+        assertQuery("SHOW TABLES LIKE 'test_different_session_ct'", "VALUES 'test_different_session_ct'");
+    }
+
+    @Test
+    public void testCreateTableAsSelectFailureWithDifferentSession()
+    {
+        assertQueryFails("CREATE TABLE test_different_session_ctas_failure AS SELECT 1 a", "Failed to write Delta Lake transaction log entry");
+        assertQuery("SHOW TABLES LIKE 'test_different_session_ctas_failure'", "VALUES 'test_different_session_ctas_failure'");
+    }
+
+    @Test
+    public void testRegisterTableFailureWithDifferentSession()
+    {
+        assertQuerySucceeds("CREATE TABLE test_register_table_failure AS SELECT 1 a");
+        String tableLocation = getTableLocation("test_register_table_failure");
+        assertUpdate("CALL system.unregister_table(current_schema, 'test_register_table_failure')");
+
+        assertQueryFails(
+                "CALL system.register_table(current_schema, 'test_different_session_register_table_failure', '" + tableLocation + "')",
+                "Table already exists: .*");
+        assertQuery("SHOW TABLES LIKE 'test_different_session_register_table_failure'", "VALUES 'test_different_session_register_table_failure'");
+    }
+
+    private String getTableLocation(String tableName)
+    {
+        Pattern locationPattern = Pattern.compile(".*location = '(.*?)'.*", Pattern.DOTALL);
+        Matcher m = locationPattern.matcher((String) computeActual("SHOW CREATE TABLE " + tableName).getOnlyValue());
+        if (m.find()) {
+            String location = m.group(1);
+            verify(!m.find(), "Unexpected second match");
+            return location;
+        }
+        throw new IllegalStateException("Location not found in SHOW CREATE TABLE result");
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeCreateTableStatistics.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeCreateTableStatistics.java
index 2307832f5043..d05d12edce43 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeCreateTableStatistics.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeCreateTableStatistics.java
@@ -17,20 +17,22 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
 import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
+import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
 import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeFileStatistics;
 import io.trino.plugin.hive.containers.HiveMinioDataLake;
 import io.trino.spi.type.DateType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.DoubleType;
 import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -41,6 +43,9 @@
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner;
+import static io.trino.plugin.deltalake.TestingDeltaLakeUtils.getConnectorService;
+import static io.trino.plugin.deltalake.TestingDeltaLakeUtils.getTableActiveFiles;
 import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
 import static io.trino.spi.type.Decimals.MAX_SHORT_PRECISION;
 import static io.trino.spi.type.Decimals.encodeScaledValue;
@@ -58,7 +63,9 @@ public class TestDeltaLakeCreateTableStatistics
         extends AbstractTestQueryFramework
 {
     private static final String SCHEMA = "default";
+
     private String bucketName;
+    private TransactionLogAccess transactionLogAccess;
 
     @Override
     protected QueryRunner createQueryRunner()
@@ -67,12 +74,14 @@ protected QueryRunner createQueryRunner()
         this.bucketName = "delta-test-create-table-statistics-" + randomNameSuffix();
         HiveMinioDataLake hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
         hiveMinioDataLake.start();
-        return DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner(
+        DistributedQueryRunner queryRunner = createS3DeltaLakeQueryRunner(
                 DELTA_CATALOG,
                 SCHEMA,
                 ImmutableMap.of("delta.enable-non-concurrent-writes", "true"),
                 hiveMinioDataLake.getMinio().getMinioAddress(),
                 hiveMinioDataLake.getHiveHadoop());
+        this.transactionLogAccess = getConnectorService(queryRunner, TransactionLogAccess.class);
+        return queryRunner;
     }
 
     @Test
@@ -89,14 +98,14 @@ public void testComplexDataTypes()
             assertThat(entry.getStats()).isPresent();
             DeltaLakeFileStatistics fileStatistics = entry.getStats().get();
 
-            DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle("d", createUnboundedVarcharType(), OptionalInt.empty(), "d", createUnboundedVarcharType(), REGULAR);
+            DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle("d", createUnboundedVarcharType(), OptionalInt.empty(), "d", createUnboundedVarcharType(), REGULAR, Optional.empty());
             assertEquals(fileStatistics.getNumRecords(), Optional.of(2L));
             assertEquals(fileStatistics.getMinColumnValue(columnHandle), Optional.of(utf8Slice("foo")));
             assertEquals(fileStatistics.getMaxColumnValue(columnHandle), Optional.of(utf8Slice("moo")));
             assertEquals(fileStatistics.getNullCount("d"), Optional.of(0L));
 
             for (String complexColumn : ImmutableList.of("a", "b", "c")) {
-                columnHandle = new DeltaLakeColumnHandle(complexColumn, createUnboundedVarcharType(), OptionalInt.empty(), complexColumn, createUnboundedVarcharType(), REGULAR);
+                columnHandle = new DeltaLakeColumnHandle(complexColumn, createUnboundedVarcharType(), OptionalInt.empty(), complexColumn, createUnboundedVarcharType(), REGULAR, Optional.empty());
                 assertThat(fileStatistics.getMaxColumnValue(columnHandle)).isEmpty();
                 assertThat(fileStatistics.getMinColumnValue(columnHandle)).isEmpty();
                 assertThat(fileStatistics.getNullCount(complexColumn)).isEmpty();
@@ -104,116 +113,120 @@ public void testComplexDataTypes()
         }
     }
 
-    @DataProvider
-    public static Object[][] doubleTypes()
-    {
-        return new Object[][] {{"DOUBLE"}, {"REAL"}};
-    }
-
-    @Test(dataProvider = "doubleTypes")
-    public void testDoubleTypesNaN(String type)
+    @Test
+    public void testDoubleTypesNaN()
             throws Exception
     {
-        String columnName = "t_double";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR);
-        try (TestTable table = new TestTable("test_nan_", ImmutableList.of(columnName), format("VALUES CAST(nan() AS %1$s), CAST(0.0 AS %1$s)", type))) {
-            List<AddFileEntry> addFileEntries = getAddFileEntries(table.getName());
-            AddFileEntry entry = getOnlyElement(addFileEntries);
-            assertThat(entry.getStats()).isPresent();
-            DeltaLakeFileStatistics fileStatistics = entry.getStats().get();
-
-            assertEquals(fileStatistics.getNumRecords(), Optional.of(2L));
-            assertEquals(fileStatistics.getMinColumnValue(columnHandle), Optional.empty());
-            assertEquals(fileStatistics.getMaxColumnValue(columnHandle), Optional.empty());
-            assertEquals(fileStatistics.getNullCount(columnName), Optional.empty());
+        for (String type : Arrays.asList("DOUBLE", "REAL")) {
+            String columnName = "t_double";
+            DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR, Optional.empty());
+            try (TestTable table = new TestTable("test_nan_", ImmutableList.of(columnName), format("VALUES CAST(nan() AS %1$s), CAST(0.0 AS %1$s)", type))) {
+                List<AddFileEntry> addFileEntries = getAddFileEntries(table.getName());
+                AddFileEntry entry = getOnlyElement(addFileEntries);
+                assertThat(entry.getStats()).isPresent();
+                DeltaLakeFileStatistics fileStatistics = entry.getStats().get();
+
+                assertEquals(fileStatistics.getNumRecords(), Optional.of(2L));
+                assertEquals(fileStatistics.getMinColumnValue(columnHandle), Optional.empty());
+                assertEquals(fileStatistics.getMaxColumnValue(columnHandle), Optional.empty());
+                assertEquals(fileStatistics.getNullCount(columnName), Optional.empty());
+            }
         }
     }
 
-    @Test(dataProvider = "doubleTypes")
-    public void testDoubleTypesInf(String type)
+    @Test
+    public void testDoubleTypesInf()
             throws Exception
     {
-        String columnName = "t_double";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR);
-        try (TestTable table = new TestTable(
-                "test_inf_",
-                ImmutableList.of(columnName),
-                format("VALUES CAST(infinity() AS %1$s), CAST(0.0 AS %1$s), CAST((infinity() * -1) AS %1$s)", type))) {
-            List<AddFileEntry> addFileEntries = getAddFileEntries(table.getName());
-            AddFileEntry entry = getOnlyElement(addFileEntries);
-            assertThat(entry.getStats()).isPresent();
-            DeltaLakeFileStatistics fileStatistics = entry.getStats().get();
-
-            assertEquals(fileStatistics.getNumRecords(), Optional.of(3L));
-            assertEquals(fileStatistics.getMinColumnValue(columnHandle), Optional.of(NEGATIVE_INFINITY));
-            assertEquals(fileStatistics.getMaxColumnValue(columnHandle), Optional.of(POSITIVE_INFINITY));
-            assertEquals(fileStatistics.getNullCount(columnName), Optional.of(0L));
+        for (String type : Arrays.asList("DOUBLE", "REAL")) {
+            String columnName = "t_double";
+            DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR, Optional.empty());
+            try (TestTable table = new TestTable(
+                    "test_inf_",
+                    ImmutableList.of(columnName),
+                    format("VALUES CAST(infinity() AS %1$s), CAST(0.0 AS %1$s), CAST((infinity() * -1) AS %1$s)", type))) {
+                List<AddFileEntry> addFileEntries = getAddFileEntries(table.getName());
+                AddFileEntry entry = getOnlyElement(addFileEntries);
+                assertThat(entry.getStats()).isPresent();
+                DeltaLakeFileStatistics fileStatistics = entry.getStats().get();
+
+                assertEquals(fileStatistics.getNumRecords(), Optional.of(3L));
+                assertEquals(fileStatistics.getMinColumnValue(columnHandle), Optional.of(NEGATIVE_INFINITY));
+                assertEquals(fileStatistics.getMaxColumnValue(columnHandle), Optional.of(POSITIVE_INFINITY));
+                assertEquals(fileStatistics.getNullCount(columnName), Optional.of(0L));
+            }
         }
     }
 
-    @Test(dataProvider = "doubleTypes")
-    public void testDoubleTypesInfAndNaN(String type)
+    @Test
+    public void testDoubleTypesInfAndNaN()
             throws Exception
     {
-        String columnName = "t_double";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR);
-        try (TestTable table = new TestTable(
-                "test_inf_nan_",
-                ImmutableList.of(columnName),
-                format("VALUES CAST(nan() AS %1$s), CAST(0.0 AS %1$s), CAST(infinity() AS %1$s), CAST((infinity() * -1) AS %1$s)", type))) {
-            List<AddFileEntry> addFileEntries = getAddFileEntries(table.getName());
-            AddFileEntry entry = getOnlyElement(addFileEntries);
-            assertThat(entry.getStats()).isPresent();
-            DeltaLakeFileStatistics fileStatistics = entry.getStats().get();
-
-            assertEquals(fileStatistics.getNumRecords(), Optional.of(4L));
-            assertEquals(fileStatistics.getMinColumnValue(columnHandle), Optional.empty());
-            assertEquals(fileStatistics.getMaxColumnValue(columnHandle), Optional.empty());
-            assertEquals(fileStatistics.getNullCount(columnName), Optional.empty());
+        for (String type : Arrays.asList("DOUBLE", "REAL")) {
+            String columnName = "t_double";
+            DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR, Optional.empty());
+            try (TestTable table = new TestTable(
+                    "test_inf_nan_",
+                    ImmutableList.of(columnName),
+                    format("VALUES CAST(nan() AS %1$s), CAST(0.0 AS %1$s), CAST(infinity() AS %1$s), CAST((infinity() * -1) AS %1$s)", type))) {
+                List<AddFileEntry> addFileEntries = getAddFileEntries(table.getName());
+                AddFileEntry entry = getOnlyElement(addFileEntries);
+                assertThat(entry.getStats()).isPresent();
+                DeltaLakeFileStatistics fileStatistics = entry.getStats().get();
+
+                assertEquals(fileStatistics.getNumRecords(), Optional.of(4L));
+                assertEquals(fileStatistics.getMinColumnValue(columnHandle), Optional.empty());
+                assertEquals(fileStatistics.getMaxColumnValue(columnHandle), Optional.empty());
+                assertEquals(fileStatistics.getNullCount(columnName), Optional.empty());
+            }
         }
     }
 
-    @Test(dataProvider = "doubleTypes")
-    public void testDoubleTypesNaNPositive(String type)
+    @Test
+    public void testDoubleTypesNaNPositive()
             throws Exception
     {
-        String columnName = "t_double";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR);
-        try (TestTable table = new TestTable(
-                "test_nan_positive_",
-                ImmutableList.of(columnName),
-                format("VALUES CAST(nan() AS %1$s), CAST(1.0 AS %1$s), CAST(100.0 AS %1$s), CAST(0.0001 AS %1$s)", type))) {
-            List<AddFileEntry> addFileEntries = getAddFileEntries(table.getName());
-            AddFileEntry entry = getOnlyElement(addFileEntries);
-            assertThat(entry.getStats()).isPresent();
-            DeltaLakeFileStatistics fileStatistics = entry.getStats().get();
-
-            assertEquals(fileStatistics.getNumRecords(), Optional.of(4L));
-            assertEquals(fileStatistics.getMinColumnValue(columnHandle), Optional.empty());
-            assertEquals(fileStatistics.getMaxColumnValue(columnHandle), Optional.empty());
-            assertEquals(fileStatistics.getNullCount(columnName), Optional.empty());
+        for (String type : Arrays.asList("DOUBLE", "REAL")) {
+            String columnName = "t_double";
+            DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR, Optional.empty());
+            try (TestTable table = new TestTable(
+                    "test_nan_positive_",
+                    ImmutableList.of(columnName),
+                    format("VALUES CAST(nan() AS %1$s), CAST(1.0 AS %1$s), CAST(100.0 AS %1$s), CAST(0.0001 AS %1$s)", type))) {
+                List<AddFileEntry> addFileEntries = getAddFileEntries(table.getName());
+                AddFileEntry entry = getOnlyElement(addFileEntries);
+                assertThat(entry.getStats()).isPresent();
+                DeltaLakeFileStatistics fileStatistics = entry.getStats().get();
+
+                assertEquals(fileStatistics.getNumRecords(), Optional.of(4L));
+                assertEquals(fileStatistics.getMinColumnValue(columnHandle), Optional.empty());
+                assertEquals(fileStatistics.getMaxColumnValue(columnHandle), Optional.empty());
+                assertEquals(fileStatistics.getNullCount(columnName), Optional.empty());
+            }
         }
     }
 
-    @Test(dataProvider = "doubleTypes")
-    public void testDoubleTypesNaNNegative(String type)
+    @Test
+    public void testDoubleTypesNaNNegative()
             throws Exception
     {
-        String columnName = "t_double";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR);
-        try (TestTable table = new TestTable(
-                "test_nan_positive_",
-                ImmutableList.of(columnName),
-                format("VALUES CAST(nan() AS %1$s), CAST(-1.0 AS %1$s), CAST(-100.0 AS %1$s), CAST(-0.0001 AS %1$s)", type))) {
-            List<AddFileEntry> addFileEntries = getAddFileEntries(table.getName());
-            AddFileEntry entry = getOnlyElement(addFileEntries);
-            assertThat(entry.getStats()).isPresent();
-            DeltaLakeFileStatistics fileStatistics = entry.getStats().get();
-
-            assertEquals(fileStatistics.getNumRecords(), Optional.of(4L));
-            assertEquals(fileStatistics.getMinColumnValue(columnHandle), Optional.empty());
-            assertEquals(fileStatistics.getMaxColumnValue(columnHandle), Optional.empty());
-            assertEquals(fileStatistics.getNullCount(columnName), Optional.empty());
+        for (String type : Arrays.asList("DOUBLE", "REAL")) {
+            String columnName = "t_double";
+            DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR, Optional.empty());
+            try (TestTable table = new TestTable(
+                    "test_nan_positive_",
+                    ImmutableList.of(columnName),
+                    format("VALUES CAST(nan() AS %1$s), CAST(-1.0 AS %1$s), CAST(-100.0 AS %1$s), CAST(-0.0001 AS %1$s)", type))) {
+                List<AddFileEntry> addFileEntries = getAddFileEntries(table.getName());
+                AddFileEntry entry = getOnlyElement(addFileEntries);
+                assertThat(entry.getStats()).isPresent();
+                DeltaLakeFileStatistics fileStatistics = entry.getStats().get();
+
+                assertEquals(fileStatistics.getNumRecords(), Optional.of(4L));
+                assertEquals(fileStatistics.getMinColumnValue(columnHandle), Optional.empty());
+                assertEquals(fileStatistics.getMaxColumnValue(columnHandle), Optional.empty());
+                assertEquals(fileStatistics.getNullCount(columnName), Optional.empty());
+            }
         }
     }
 
@@ -246,7 +259,7 @@ private void testDecimal(int precision, int scale)
         String negative = "-1" + "0".repeat(precision - scale) + "." + "0".repeat(scale - 1) + "1";
 
         String columnName = "t_decimal";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DecimalType.createDecimalType(precision, scale), OptionalInt.empty(), columnName, DecimalType.createDecimalType(precision, scale), REGULAR);
+        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DecimalType.createDecimalType(precision, scale), OptionalInt.empty(), columnName, DecimalType.createDecimalType(precision, scale), REGULAR, Optional.empty());
         try (TestTable table = new TestTable(
                 "test_decimal_records_",
                 ImmutableList.of(columnName),
@@ -278,7 +291,7 @@ public void testNullRecords()
             throws Exception
     {
         String columnName = "t_double";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR);
+        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR, Optional.empty());
         try (TestTable table = new TestTable("test_null_records_", ImmutableList.of(columnName), "VALUES null, 0, null, 1")) {
             List<AddFileEntry> addFileEntries = getAddFileEntries(table.getName());
             AddFileEntry entry = getOnlyElement(addFileEntries);
@@ -297,7 +310,7 @@ public void testOnlyNullRecords()
             throws Exception
     {
         String columnName = "t_varchar";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, createUnboundedVarcharType(), OptionalInt.empty(), columnName, createUnboundedVarcharType(), REGULAR);
+        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, createUnboundedVarcharType(), OptionalInt.empty(), columnName, createUnboundedVarcharType(), REGULAR, Optional.empty());
         try (TestTable table = new TestTable(
                 "test_only_null_records_",
                 ImmutableList.of(columnName),
@@ -319,7 +332,7 @@ public void testDateRecords()
             throws Exception
     {
         String columnName = "t_date";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DateType.DATE, OptionalInt.empty(), columnName, DateType.DATE, REGULAR);
+        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DateType.DATE, OptionalInt.empty(), columnName, DateType.DATE, REGULAR, Optional.empty());
         try (TestTable table = new TestTable(
                 "test_date_records_",
                 ImmutableList.of(columnName),
@@ -341,7 +354,7 @@ public void testTimestampMilliRecords()
             throws Exception
     {
         String columnName = "t_timestamp";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, TIMESTAMP_TZ_MILLIS, OptionalInt.empty(), columnName, TIMESTAMP_TZ_MILLIS, REGULAR);
+        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, TIMESTAMP_TZ_MILLIS, OptionalInt.empty(), columnName, TIMESTAMP_TZ_MILLIS, REGULAR, Optional.empty());
         try (TestTable table = new TestTable(
                 "test_timestamp_records_",
                 ImmutableList.of(columnName),
@@ -367,7 +380,7 @@ public void testUnicodeValues()
             throws Exception
     {
         String columnName = "t_string";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, createUnboundedVarcharType(), OptionalInt.empty(), columnName, createUnboundedVarcharType(), REGULAR);
+        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, createUnboundedVarcharType(), OptionalInt.empty(), columnName, createUnboundedVarcharType(), REGULAR, Optional.empty());
         try (TestTable table = new TestTable("test_unicode_", ImmutableList.of(columnName), "VALUES 'ab\uFAD8', 'ab\uD83D\uDD74'")) {
             List<AddFileEntry> addFileEntries = getAddFileEntries(table.getName());
             AddFileEntry entry = getOnlyElement(addFileEntries);
@@ -386,7 +399,7 @@ public void testPartitionedTable()
             throws Exception
     {
         String columnName = "t_string";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, createUnboundedVarcharType(), OptionalInt.empty(), columnName, createUnboundedVarcharType(), REGULAR);
+        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, createUnboundedVarcharType(), OptionalInt.empty(), columnName, createUnboundedVarcharType(), REGULAR, Optional.empty());
         String partitionColumn = "t_int";
 
         try (TestTable table = new TestTable(
@@ -421,7 +434,7 @@ public void testMultiFileTableWithNaNValue()
             throws Exception
     {
         String columnName = "key";
-        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR);
+        DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(columnName, DoubleType.DOUBLE, OptionalInt.empty(), columnName, DoubleType.DOUBLE, REGULAR, Optional.empty());
         try (TestTable table = new TestTable(
                 "test_multi_file_table_nan_value_",
                 ImmutableList.of(columnName),
@@ -481,6 +494,6 @@ public void close()
     protected List<AddFileEntry> getAddFileEntries(String tableName)
             throws IOException
     {
-        return TestingDeltaLakeUtils.getAddFileEntries(format("s3://%s/%s", bucketName, tableName));
+        return getTableActiveFiles(transactionLogAccess, format("s3://%s/%s", bucketName, tableName));
     }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDatabricksCompatibility.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDatabricksCompatibility.java
new file mode 100644
index 000000000000..a2068607dbe6
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDatabricksCompatibility.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+public class TestDeltaLakeDatabricksCompatibility
+        extends BaseDeltaLakeCompatibility
+{
+    public TestDeltaLakeDatabricksCompatibility()
+    {
+        super("io/trino/plugin/deltalake/testing/resources/databricks73/");
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDatabricksConnectorTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDatabricksConnectorTest.java
deleted file mode 100644
index 99d6e4d6b68b..000000000000
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDatabricksConnectorTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.deltalake;
-
-public class TestDeltaLakeDatabricksConnectorTest
-        extends BaseDeltaLakeMinioConnectorTest
-{
-    public TestDeltaLakeDatabricksConnectorTest()
-    {
-        super("databricks-test-queries", "io/trino/plugin/deltalake/testing/resources/databricks/");
-    }
-}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDelete.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDelete.java
index c278f84ea1e2..b50bbf9b4790 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDelete.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDelete.java
@@ -16,16 +16,15 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.trino.plugin.hive.containers.HiveMinioDataLake;
-import io.trino.plugin.hive.parquet.ParquetWriterConfig;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Set;
 
-import static com.google.common.base.Verify.verify;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -34,19 +33,17 @@ public class TestDeltaLakeDelete
         extends AbstractTestQueryFramework
 {
     private static final String SCHEMA = "default";
-    private final String bucketName = "test-delta-lake-connector-test-" + randomNameSuffix();
 
+    private final String bucketName = "test-delta-lake-connector-test-" + randomNameSuffix();
     private HiveMinioDataLake hiveMinioDataLake;
 
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        verify(!new ParquetWriterConfig().isParquetOptimizedWriterEnabled(), "This test assumes the optimized Parquet writer is disabled by default");
-
         hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
         hiveMinioDataLake.start();
-        QueryRunner queryRunner = DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner(
+        QueryRunner queryRunner = createS3DeltaLakeQueryRunner(
                 DELTA_CATALOG,
                 SCHEMA,
                 ImmutableMap.of(
@@ -70,9 +67,13 @@ public void testTargetedDeleteWhenTableIsPartitionedWithColumnContainingSpecialC
                 "AS VALUES " +
                 "(1, 'with-hyphen'), " +
                 "(2, 'with:colon'), " +
-                "(3, 'with?question')", 3);
+                "(3, 'with:colon'), " + // create two rows in a single file to trigger parquet file rewrite on delete
+                "(4, 'with?question')", 4);
+        assertQuery("SELECT count(*), count(DISTINCT \"$path\"), col_name FROM " + tableName + " GROUP BY 3", "VALUES (1, 1, 'with-hyphen'), (2, 1, 'with:colon'), (1, 1, 'with?question')");
         assertUpdate("DELETE FROM " + tableName + " WHERE id = 2", 1);
-        assertQuery("SELECT * FROM " + tableName, "VALUES(1, 'with-hyphen'), (3, 'with?question')");
+        assertQuery("SELECT * FROM " + tableName, "VALUES (1, 'with-hyphen'), (3, 'with:colon'), (4, 'with?question')");
+        assertUpdate("DELETE FROM " + tableName, 3);
+        assertQueryReturnsEmptyResult("SELECT * FROM " + tableName);
     }
 
     @Test
@@ -89,7 +90,7 @@ public void testDeleteDatabricksMultiFile()
     {
         testDeleteMultiFile(
                 "multi_file_databricks" + randomNameSuffix(),
-                "io/trino/plugin/deltalake/testing/resources/databricks");
+                "io/trino/plugin/deltalake/testing/resources/databricks73");
     }
 
     @Test
@@ -171,7 +172,7 @@ public void testDeleteAllDatabricks()
         String tableName = "test_delete_all_databricks" + randomNameSuffix();
         Set<String> originalFiles = testDeleteAllAndReturnInitialDataLakeFilesSet(
                 tableName,
-                "io/trino/plugin/deltalake/testing/resources/databricks");
+                "io/trino/plugin/deltalake/testing/resources/databricks73");
 
         Set<String> expected = ImmutableSet.<String>builder()
                 .addAll(originalFiles)
@@ -184,9 +185,14 @@ public void testDeleteAllDatabricks()
     public void testDeleteAllOssDeltaLake()
     {
         String tableName = "test_delete_all_deltalake" + randomNameSuffix();
-        Set<String> originalFiles = testDeleteAllAndReturnInitialDataLakeFilesSet(
-                tableName,
-                "io/trino/plugin/deltalake/testing/resources/ossdeltalake");
+        hiveMinioDataLake.copyResources("io/trino/plugin/deltalake/testing/resources/ossdeltalake/customer", tableName);
+        Set<String> originalFiles = ImmutableSet.copyOf(hiveMinioDataLake.listFiles(tableName));
+        getQueryRunner().execute(format("CALL system.register_table('%s', '%s', '%s')", SCHEMA, tableName, getLocationForTable(tableName)));
+        assertQuery("SELECT * FROM " + tableName, "SELECT * FROM customer");
+        // There are `add` files in the transaction log without stats, reason why the DELETE statement on the whole table
+        // performed on the basis of metadata does not return the number of deleted records
+        assertUpdate("DELETE FROM " + tableName);
+        assertQuery("SELECT count(*) FROM " + tableName, "VALUES 0");
         Set<String> expected = ImmutableSet.<String>builder()
                 .addAll(originalFiles)
                 .add(tableName + "/_delta_log/00000000000000000001.json")
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDynamicFiltering.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDynamicFiltering.java
index 65a7097c6b6e..647c88e48f4e 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDynamicFiltering.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDynamicFiltering.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.execution.DynamicFilterConfig;
 import io.trino.execution.QueryStats;
@@ -36,8 +37,8 @@
 import io.trino.testing.QueryRunner;
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,7 +46,6 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Stream;
 
 import static com.google.common.base.Verify.verify;
 import static io.airlift.concurrent.MoreFutures.unmodifiableFuture;
@@ -53,8 +53,9 @@
 import static io.airlift.testing.Assertions.assertGreaterThan;
 import static io.trino.SystemSessionProperties.ENABLE_DYNAMIC_FILTERING;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner;
 import static io.trino.spi.connector.Constraint.alwaysTrue;
-import static io.trino.testing.DataProviders.toDataProvider;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tpch.TpchTable.LINE_ITEM;
 import static io.trino.tpch.TpchTable.ORDERS;
 import static java.lang.String.format;
@@ -64,8 +65,7 @@
 public class TestDeltaLakeDynamicFiltering
         extends AbstractTestQueryFramework
 {
-    private static final String BUCKET_NAME = "delta-lake-test-dynamic-filtering";
-
+    private final String bucketName = "delta-lake-test-dynamic-filtering-" + randomNameSuffix();
     private HiveMinioDataLake hiveMinioDataLake;
 
     @Override
@@ -73,10 +73,10 @@ protected QueryRunner createQueryRunner()
             throws Exception
     {
         verify(new DynamicFilterConfig().isEnableDynamicFiltering(), "this class assumes dynamic filtering is enabled by default");
-        hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(BUCKET_NAME));
+        hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
         hiveMinioDataLake.start();
 
-        QueryRunner queryRunner = DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner(
+        QueryRunner queryRunner = createS3DeltaLakeQueryRunner(
                 DELTA_CATALOG,
                 "default",
                 ImmutableMap.of("delta.register-table-procedure.enabled", "true"),
@@ -85,38 +85,34 @@ protected QueryRunner createQueryRunner()
 
         ImmutableList.of(LINE_ITEM, ORDERS).forEach(table -> {
             String tableName = table.getTableName();
-            hiveMinioDataLake.copyResources("io/trino/plugin/deltalake/testing/resources/databricks/" + tableName, tableName);
+            hiveMinioDataLake.copyResources("io/trino/plugin/deltalake/testing/resources/databricks73/" + tableName, tableName);
             queryRunner.execute(format("CALL %1$s.system.register_table('%2$s', '%3$s', 's3://%4$s/%3$s')",
                     DELTA_CATALOG,
                     "default",
                     tableName,
-                    BUCKET_NAME));
+                    bucketName));
         });
         return queryRunner;
     }
 
-    @DataProvider
-    public Object[][] joinDistributionTypes()
+    @Test
+    @Timeout(60)
+    public void testDynamicFiltering()
     {
-        return Stream.of(JoinDistributionType.values())
-                .collect(toDataProvider());
-    }
-
-    @Test(timeOut = 60_000, dataProvider = "joinDistributionTypes")
-    public void testDynamicFiltering(JoinDistributionType joinDistributionType)
-    {
-        String query = "SELECT * FROM lineitem JOIN orders ON lineitem.orderkey = orders.orderkey AND orders.totalprice > 59995 AND orders.totalprice < 60000";
-        MaterializedResultWithQueryId filteredResult = getDistributedQueryRunner().executeWithQueryId(sessionWithDynamicFiltering(true, joinDistributionType), query);
-        MaterializedResultWithQueryId unfilteredResult = getDistributedQueryRunner().executeWithQueryId(sessionWithDynamicFiltering(false, joinDistributionType), query);
-        assertEqualsIgnoreOrder(filteredResult.getResult().getMaterializedRows(), unfilteredResult.getResult().getMaterializedRows());
-
-        QueryInputStats filteredStats = getQueryInputStats(filteredResult.getQueryId());
-        QueryInputStats unfilteredStats = getQueryInputStats(unfilteredResult.getQueryId());
-        assertGreaterThan(unfilteredStats.numberOfSplits, filteredStats.numberOfSplits);
-        assertGreaterThan(unfilteredStats.inputPositions, filteredStats.inputPositions);
+        for (JoinDistributionType joinDistributionType : JoinDistributionType.values()) {
+            String query = "SELECT * FROM lineitem JOIN orders ON lineitem.orderkey = orders.orderkey AND orders.totalprice > 59995 AND orders.totalprice < 60000";
+            MaterializedResultWithQueryId filteredResult = getDistributedQueryRunner().executeWithQueryId(sessionWithDynamicFiltering(true, joinDistributionType), query);
+            MaterializedResultWithQueryId unfilteredResult = getDistributedQueryRunner().executeWithQueryId(sessionWithDynamicFiltering(false, joinDistributionType), query);
+            assertEqualsIgnoreOrder(filteredResult.getResult().getMaterializedRows(), unfilteredResult.getResult().getMaterializedRows());
+
+            QueryInputStats filteredStats = getQueryInputStats(filteredResult.getQueryId());
+            QueryInputStats unfilteredStats = getQueryInputStats(unfilteredResult.getQueryId());
+            assertGreaterThan(unfilteredStats.inputPositions, filteredStats.inputPositions);
+        }
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testIncompleteDynamicFilterTimeout()
             throws Exception
     {
@@ -131,7 +127,7 @@ public void testIncompleteDynamicFilterTimeout()
         Optional<TableHandle> tableHandle = runner.getMetadata().getTableHandle(session, tableName);
         assertTrue(tableHandle.isPresent());
         SplitSource splitSource = runner.getSplitManager()
-                .getSplits(session, tableHandle.get(), new IncompleteDynamicFilter(), alwaysTrue());
+                .getSplits(session, Span.getInvalid(), tableHandle.get(), new IncompleteDynamicFilter(), alwaysTrue());
         List<Split> splits = new ArrayList<>();
         while (!splitSource.isFinished()) {
             splits.addAll(splitSource.getNextBatch(1000).get().getSplits());
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDynamicPartitionPruningTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDynamicPartitionPruningTest.java
index 34b6f6a4a6ea..fe6e43fb92fd 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDynamicPartitionPruningTest.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeDynamicPartitionPruningTest.java
@@ -18,7 +18,7 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
-import org.testng.SkipException;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -30,6 +30,7 @@
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createDeltaLakeQueryRunner;
 import static java.lang.String.format;
 import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 public class TestDeltaLakeDynamicPartitionPruningTest
         extends BaseDynamicPartitionPruningTest
@@ -47,10 +48,11 @@ protected QueryRunner createQueryRunner()
         return queryRunner;
     }
 
+    @Test
     @Override
     public void testJoinDynamicFilteringMultiJoinOnBucketedTables()
     {
-        throw new SkipException("Delta Lake does not support bucketing");
+        abort("Delta Lake does not support bucketing");
     }
 
     @Override
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeFileOperations.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeFileOperations.java
index bbcfcfebac95..0e4f043f94f0 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeFileOperations.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeFileOperations.java
@@ -16,41 +16,63 @@
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.ImmutableMultiset;
 import com.google.common.collect.Multiset;
+import com.google.common.io.Resources;
 import io.trino.Session;
+import io.trino.SystemSessionProperties;
 import io.trino.filesystem.TrackingFileSystemFactory;
 import io.trino.filesystem.TrackingFileSystemFactory.OperationType;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
+import java.io.File;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.inject.util.Modules.EMPTY_MODULE;
 import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_EXISTS;
 import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_GET_LENGTH;
 import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_NEW_STREAM;
+import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.OUTPUT_FILE_CREATE;
+import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.OUTPUT_FILE_CREATE_OR_OVERWRITE;
 import static io.trino.plugin.base.util.Closables.closeAllSuppress;
+import static io.trino.plugin.deltalake.TestDeltaLakeFileOperations.FileType.CDF_DATA;
+import static io.trino.plugin.deltalake.TestDeltaLakeFileOperations.FileType.CHECKPOINT;
 import static io.trino.plugin.deltalake.TestDeltaLakeFileOperations.FileType.DATA;
 import static io.trino.plugin.deltalake.TestDeltaLakeFileOperations.FileType.LAST_CHECKPOINT;
+import static io.trino.plugin.deltalake.TestDeltaLakeFileOperations.FileType.STARBURST_EXTENDED_STATS_JSON;
 import static io.trino.plugin.deltalake.TestDeltaLakeFileOperations.FileType.TRANSACTION_LOG_JSON;
 import static io.trino.plugin.deltalake.TestDeltaLakeFileOperations.FileType.TRINO_EXTENDED_STATS_JSON;
+import static io.trino.plugin.deltalake.TestingDeltaLakeUtils.copyDirectoryContents;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
+import static io.trino.testing.MultisetAssertions.assertMultisetsEqual;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static java.lang.Math.toIntExact;
 import static java.util.Collections.nCopies;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toCollection;
-import static org.assertj.core.api.Assertions.assertThat;
 
 // single-threaded AccessTrackingFileSystemFactory is shared mutable state
-@Test(singleThreaded = true)
+@Execution(ExecutionMode.SAME_THREAD)
 public class TestDeltaLakeFileOperations
         extends AbstractTestQueryFramework
 {
+    private static final int MAX_PREFIXES_COUNT = 10;
+
     private TrackingFileSystemFactory trackingFileSystemFactory;
 
     @Override
@@ -62,10 +84,14 @@ protected DistributedQueryRunner createQueryRunner()
                 .setSchema("default")
                 .build();
         DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session)
+                .addCoordinatorProperty("optimizer.experimental-max-prefetched-information-schema-prefixes", Integer.toString(MAX_PREFIXES_COUNT))
                 .build();
         try {
             String metastoreDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("delta_lake_metastore").toFile().getAbsoluteFile().toURI().toString();
-            trackingFileSystemFactory = new TrackingFileSystemFactory(new HdfsFileSystemFactory(HDFS_ENVIRONMENT));
+            trackingFileSystemFactory = new TrackingFileSystemFactory(new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS));
+
+            queryRunner.installPlugin(new TpchPlugin());
+            queryRunner.createCatalog("tpch", "tpch");
 
             queryRunner.installPlugin(new TestingDeltaLakePlugin(Optional.empty(), Optional.of(trackingFileSystemFactory), EMPTY_MODULE));
             queryRunner.createCatalog(
@@ -74,7 +100,8 @@ protected DistributedQueryRunner createQueryRunner()
                     Map.of(
                             "hive.metastore", "file",
                             "hive.metastore.catalog.dir", metastoreDirectory,
-                            "delta.enable-non-concurrent-writes", "true"));
+                            "delta.enable-non-concurrent-writes", "true",
+                            "delta.register-table-procedure.enabled", "true"));
 
             queryRunner.execute("CREATE SCHEMA " + session.getSchema().orElseThrow());
             return queryRunner;
@@ -85,6 +112,98 @@ protected DistributedQueryRunner createQueryRunner()
         }
     }
 
+    @Test
+    public void testCreateTableAsSelect()
+    {
+        assertFileSystemAccesses(
+                "CREATE TABLE test_create_as_select AS SELECT 1 col_name",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(STARBURST_EXTENDED_STATS_JSON, "extendeded_stats.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(STARBURST_EXTENDED_STATS_JSON, "extendeded_stats.json", INPUT_FILE_EXISTS))
+                        .add(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", OUTPUT_FILE_CREATE))
+                        .add(new FileOperation(DATA, "no partition", OUTPUT_FILE_CREATE))
+                        .build());
+        assertUpdate("DROP TABLE test_create_as_select");
+
+        assertFileSystemAccesses(
+                "CREATE TABLE test_create_partitioned_as_select WITH (partitioned_by=ARRAY['key']) AS SELECT * FROM (VALUES (1, 'a'), (2, 'b')) t(key, col)",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(STARBURST_EXTENDED_STATS_JSON, "extendeded_stats.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(STARBURST_EXTENDED_STATS_JSON, "extendeded_stats.json", INPUT_FILE_EXISTS))
+                        .add(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", OUTPUT_FILE_CREATE))
+                        .add(new FileOperation(DATA, "key=1/", OUTPUT_FILE_CREATE))
+                        .add(new FileOperation(DATA, "key=2/", OUTPUT_FILE_CREATE))
+                        .build());
+        assertUpdate("DROP TABLE test_create_partitioned_as_select");
+    }
+
+    @Test
+    public void testReadUnpartitionedTable()
+    {
+        assertUpdate("DROP TABLE IF EXISTS test_read_unpartitioned");
+        assertUpdate("CREATE TABLE test_read_unpartitioned(key varchar, data varchar)");
+
+        // Create multiple files
+        assertUpdate("INSERT INTO test_read_unpartitioned(key, data) VALUES ('p1', '1-abc'), ('p1', '1-def'), ('p2', '2-abc'), ('p2', '2-def')", 4);
+        assertUpdate("INSERT INTO test_read_unpartitioned(key, data) VALUES ('p1', '1-baz'), ('p2', '2-baz')", 2);
+
+        // Read all columns
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'test_read_unpartitioned')");
+        assertFileSystemAccesses(
+                "TABLE test_read_unpartitioned",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(DATA, "no partition", INPUT_FILE_NEW_STREAM), 2)
+                        .build());
+
+        // Read with aggregation (this may involve fetching stats so may incur more file system accesses)
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'test_read_unpartitioned')");
+        assertFileSystemAccesses(
+                "SELECT key, max(data) FROM test_read_unpartitioned GROUP BY key",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(DATA, "no partition", INPUT_FILE_NEW_STREAM), 2)
+                        .build());
+
+        assertUpdate("DROP TABLE test_read_unpartitioned");
+    }
+
+    @Test
+    public void testReadTableCheckpointInterval()
+    {
+        assertUpdate("DROP TABLE IF EXISTS test_read_checkpoint");
+
+        assertUpdate("CREATE TABLE test_read_checkpoint(key varchar, data varchar) WITH (checkpoint_interval = 2)");
+        assertUpdate("INSERT INTO test_read_checkpoint(key, data) VALUES ('p1', '1-abc'), ('p1', '1-def'), ('p2', '2-abc'), ('p2', '2-def')", 4);
+        assertUpdate("INSERT INTO test_read_checkpoint(key, data) VALUES ('p1', '1-baz'), ('p2', '2-baz')", 2);
+
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'test_read_checkpoint')");
+        assertFileSystemAccesses(
+                "TABLE test_read_checkpoint",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(CHECKPOINT, "00000000000000000002.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 4) // TODO (https://github.com/trinodb/trino/issues/18916) should be checked once per query
+                        .addCopies(new FileOperation(CHECKPOINT, "00000000000000000002.checkpoint.parquet", INPUT_FILE_NEW_STREAM), 2) // TODO (https://github.com/trinodb/trino/issues/18916) should be checked once per query
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(DATA, "no partition", INPUT_FILE_NEW_STREAM), 2)
+                        .build());
+
+        assertUpdate("DROP TABLE test_read_checkpoint");
+    }
+
     @Test
     public void testReadWholePartition()
     {
@@ -97,18 +216,29 @@ public void testReadWholePartition()
 
         // Read partition and data columns
         assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'test_read_part_key')");
+        assertFileSystemAccesses(
+                "TABLE test_read_part_key",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(DATA, "key=p1/", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(DATA, "key=p2/", INPUT_FILE_NEW_STREAM), 2)
+                        .build());
+
+        // Read with aggregation (this may involve fetching stats so may incur more file system accesses)
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'test_read_part_key')");
         assertFileSystemAccesses(
                 "SELECT key, max(data) FROM test_read_part_key GROUP BY key",
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM), 3) // TODO (https://github.com/trinodb/trino/issues/16782) should be checked once per query
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), 3) // TODO (https://github.com/trinodb/trino/issues/16780) why is last transaction log accessed more times than others?
-                        .addCopies(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_EXISTS), 1)
-                        .addCopies(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(DATA, "key=p1/", INPUT_FILE_GET_LENGTH), 2)
-                        .addCopies(new FileOperation(DATA, "key=p2/", INPUT_FILE_GET_LENGTH), 2)
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_NEW_STREAM))
                         .addCopies(new FileOperation(DATA, "key=p1/", INPUT_FILE_NEW_STREAM), 2)
                         .addCopies(new FileOperation(DATA, "key=p2/", INPUT_FILE_NEW_STREAM), 2)
                         .build());
@@ -118,13 +248,12 @@ public void testReadWholePartition()
         assertFileSystemAccesses(
                 "SELECT key, count(*) FROM test_read_part_key GROUP BY key",
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM), 3) // TODO (https://github.com/trinodb/trino/issues/16782) should be checked once per query
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), 3) // TODO (https://github.com/trinodb/trino/issues/16780) why is last transaction log accessed more times than others?
-                        .addCopies(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_EXISTS), 1)
-                        .addCopies(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_NEW_STREAM), 1)
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_NEW_STREAM))
                         .build());
 
         // Read partition column only, one partition only
@@ -132,13 +261,11 @@ public void testReadWholePartition()
         assertFileSystemAccesses(
                 "SELECT count(*) FROM test_read_part_key WHERE key = 'p1'",
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM), 3) // TODO (https://github.com/trinodb/trino/issues/16782) should be checked once per query
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), 3) // TODO (https://github.com/trinodb/trino/issues/16780) why is last transaction log accessed more times than others?
-                        .addCopies(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_EXISTS), 1)
-                        .addCopies(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_NEW_STREAM), 1)
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
                         .build());
 
         // Read partition and synthetic columns
@@ -146,34 +273,493 @@ public void testReadWholePartition()
         assertFileSystemAccesses(
                 "SELECT count(*), array_agg(\"$path\"), max(\"$file_modified_time\") FROM test_read_part_key GROUP BY key",
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM), 3) // TODO (https://github.com/trinodb/trino/issues/16782) should be checked once per query
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), 3) // TODO (https://github.com/trinodb/trino/issues/16780) why is last transaction log accessed more times than others?
-                        .addCopies(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_EXISTS), 1)
-                        .addCopies(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_NEW_STREAM), 1)
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        // Read only row count
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'test_read_part_key')");
+        assertFileSystemAccesses(
+                "SELECT count(*) FROM test_read_part_key",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
                         .build());
 
         assertUpdate("DROP TABLE test_read_part_key");
     }
 
+    @Test
+    public void testReadWholePartitionSplittableFile()
+    {
+        String catalog = getSession().getCatalog().orElseThrow();
+
+        assertUpdate("DROP TABLE IF EXISTS test_read_whole_splittable_file");
+        assertUpdate("CREATE TABLE test_read_whole_splittable_file(key varchar, data varchar) WITH (partitioned_by=ARRAY['key'])");
+
+        assertUpdate(
+                Session.builder(getSession())
+                        .setSystemProperty(SystemSessionProperties.WRITER_SCALING_MIN_DATA_PROCESSED, "1PB")
+                        .build(),
+                "INSERT INTO test_read_whole_splittable_file SELECT 'single partition', comment FROM tpch.tiny.orders", 15000);
+
+        Session session = Session.builder(getSession())
+                .setCatalogSessionProperty(catalog, DeltaLakeSessionProperties.MAX_SPLIT_SIZE, "1kB")
+                .setCatalogSessionProperty(catalog, DeltaLakeSessionProperties.MAX_INITIAL_SPLIT_SIZE, "1kB")
+                .build();
+
+        // Read partition column only
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'test_read_whole_splittable_file')");
+        assertFileSystemAccesses(
+                session,
+                "SELECT key, count(*) FROM test_read_whole_splittable_file GROUP BY key",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        // Read only row count
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'test_read_whole_splittable_file')");
+        assertFileSystemAccesses(
+                session,
+                "SELECT count(*) FROM test_read_whole_splittable_file",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        assertUpdate("DROP TABLE test_read_whole_splittable_file");
+    }
+
+    @Test
+    public void testSelfJoin()
+    {
+        assertUpdate("CREATE TABLE test_self_join_table AS SELECT 2 as age, 0 parent, 3 AS id", 1);
+        Session sessionWithoutDynamicFiltering = Session.builder(getSession())
+                // Disable dynamic filtering so that the second table data scan is not being pruned
+                .setSystemProperty("enable_dynamic_filtering", "false")
+                .build();
+
+        assertFileSystemAccesses(
+                sessionWithoutDynamicFiltering,
+                "SELECT child.age, parent.age FROM test_self_join_table child JOIN test_self_join_table parent ON child.parent = parent.id",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRINO_EXTENDED_STATS_JSON, "extended_stats.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(DATA, "no partition", INPUT_FILE_NEW_STREAM), 2)
+                        .build());
+
+        assertUpdate("DROP TABLE test_self_join_table");
+    }
+
+    @Test
+    public void testDeleteWholePartition()
+    {
+        assertUpdate("DROP TABLE IF EXISTS test_delete_part_key");
+        assertUpdate("CREATE TABLE test_delete_part_key(key varchar, data varchar) WITH (partitioned_by=ARRAY['key'])");
+
+        // Create multiple files per partition
+        assertUpdate("INSERT INTO test_delete_part_key(key, data) VALUES ('p1', '1-abc'), ('p1', '1-def'), ('p2', '2-abc'), ('p2', '2-def')", 4);
+        assertUpdate("INSERT INTO test_delete_part_key(key, data) VALUES ('p1', '1-baz'), ('p2', '2-baz')", 2);
+
+        // Delete partition column only
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'test_delete_part_key')");
+        assertFileSystemAccesses(
+                "DELETE FROM test_delete_part_key WHERE key = 'p1'",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM), 2) // TODO (https://github.com/trinodb/trino/issues/16782) should be checked once per query
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_EXISTS))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_EXISTS))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_EXISTS))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        assertUpdate("DROP TABLE test_delete_part_key");
+    }
+
+    @Test
+    public void testDeleteWholeTable()
+    {
+        assertUpdate("DROP TABLE IF EXISTS test_delete_whole_table");
+        assertUpdate("CREATE TABLE test_delete_whole_table(key varchar, data varchar)");
+
+        // Create multiple files per partition
+        assertUpdate("INSERT INTO test_delete_whole_table(key, data) VALUES ('p1', '1-abc'), ('p1', '1-def'), ('p2', '2-abc'), ('p2', '2-def')", 4);
+        assertUpdate("INSERT INTO test_delete_whole_table(key, data) VALUES ('p1', '1-baz'), ('p2', '2-baz')", 2);
+
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'test_delete_whole_table')");
+        assertFileSystemAccesses(
+                "DELETE FROM test_delete_whole_table WHERE true",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM), 2) // TODO (https://github.com/trinodb/trino/issues/16782) should be checked once per query
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_EXISTS))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_EXISTS))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_EXISTS))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        assertUpdate("DROP TABLE test_delete_whole_table");
+    }
+
+    @Test
+    public void testDeleteWithNonPartitionFilter()
+    {
+        assertUpdate("CREATE TABLE test_delete_with_non_partition_filter (page_url VARCHAR, key VARCHAR, views INTEGER) WITH (partitioned_by=ARRAY['key'])");
+        assertUpdate("INSERT INTO test_delete_with_non_partition_filter VALUES('url1', 'domain1', 1)", 1);
+        assertUpdate("INSERT INTO test_delete_with_non_partition_filter VALUES('url2', 'domain2', 2)", 1);
+        assertUpdate("INSERT INTO test_delete_with_non_partition_filter VALUES('url3', 'domain3', 3)", 1);
+
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'test_delete_with_non_partition_filter')");
+        assertFileSystemAccesses(
+                "DELETE FROM test_delete_with_non_partition_filter WHERE page_url ='url1'",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM), 3) // TODO (https://github.com/trinodb/trino/issues/16782) should be checked once per query
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_EXISTS), 2)
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_EXISTS), 2)
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_EXISTS), 2)
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000004.json", INPUT_FILE_EXISTS), 2)
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000004.json", OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000004.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(DATA, "key=domain1/", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(DATA, "key=domain1/", INPUT_FILE_GET_LENGTH), 2)
+                        .add(new FileOperation(DATA, "key=domain1/", OUTPUT_FILE_CREATE))
+                        .build());
+
+        assertUpdate("DROP TABLE test_delete_with_non_partition_filter");
+    }
+
+    @Test
+    public void testHistorySystemTable()
+    {
+        assertUpdate("CREATE TABLE test_history_system_table (a INT, b INT)");
+        assertUpdate("INSERT INTO test_history_system_table VALUES (1, 2)", 1);
+        assertUpdate("INSERT INTO test_history_system_table VALUES (2, 3)", 1);
+        assertUpdate("INSERT INTO test_history_system_table VALUES (3, 4)", 1);
+        assertUpdate("INSERT INTO test_history_system_table VALUES (4, 5)", 1);
+
+        assertFileSystemAccesses("SELECT * FROM \"test_history_system_table$history\"",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000004.json", INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000005.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        assertFileSystemAccesses("SELECT * FROM \"test_history_system_table$history\" WHERE version = 3",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000004.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000005.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        assertFileSystemAccesses("SELECT * FROM \"test_history_system_table$history\" WHERE version > 3",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000004.json", INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000005.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        assertFileSystemAccesses("SELECT * FROM \"test_history_system_table$history\" WHERE version >= 3 OR version = 1",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000004.json", INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000005.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        assertFileSystemAccesses("SELECT * FROM \"test_history_system_table$history\" WHERE version >= 1 AND version < 3",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000004.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000005.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        assertFileSystemAccesses("SELECT * FROM \"test_history_system_table$history\" WHERE version > 1 AND version < 2",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000004.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000005.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .build());
+    }
+
+    @Test
+    public void testTableChangesFileSystemAccess()
+    {
+        assertUpdate("CREATE TABLE table_changes_file_system_access (page_url VARCHAR, key VARCHAR, views INTEGER) WITH (change_data_feed_enabled = true, partitioned_by=ARRAY['key'])");
+        assertUpdate("INSERT INTO table_changes_file_system_access VALUES('url1', 'domain1', 1)", 1);
+        assertUpdate("INSERT INTO table_changes_file_system_access VALUES('url2', 'domain2', 2)", 1);
+        assertUpdate("INSERT INTO table_changes_file_system_access VALUES('url3', 'domain3', 3)", 1);
+        assertUpdate("UPDATE table_changes_file_system_access SET page_url = 'url22' WHERE key = 'domain2'", 1);
+        assertUpdate("UPDATE table_changes_file_system_access SET page_url = 'url33' WHERE views = 3", 1);
+        assertUpdate("DELETE FROM table_changes_file_system_access WHERE page_url = 'url1'", 1);
+
+        // The difference comes from the fact that during UPDATE queries there is no guarantee that rows that are going to be deleted and
+        // rows that are going to be inserted come on the same worker to io.trino.plugin.deltalake.DeltaLakeMergeSink.storeMergedRows
+        int cdfFilesForDomain2 = countCdfFilesForKey("domain2");
+        int cdfFilesForDomain3 = countCdfFilesForKey("domain3");
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'table_changes_file_system_access')");
+        assertFileSystemAccesses("SELECT * FROM TABLE(system.table_changes('default', 'table_changes_file_system_access'))",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000004.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000005.json", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000006.json", INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000007.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(CDF_DATA, "key=domain1/", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(CDF_DATA, "key=domain2/", INPUT_FILE_NEW_STREAM), cdfFilesForDomain2)
+                        .addCopies(new FileOperation(CDF_DATA, "key=domain3/", INPUT_FILE_NEW_STREAM), cdfFilesForDomain3)
+                        .add(new FileOperation(DATA, "key=domain1/", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(DATA, "key=domain2/", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(DATA, "key=domain3/", INPUT_FILE_NEW_STREAM))
+                        .build());
+    }
+
+    @Test
+    public void testInformationSchemaColumns()
+    {
+        for (int tables : Arrays.asList(3, MAX_PREFIXES_COUNT, MAX_PREFIXES_COUNT + 3)) {
+            String schemaName = "test_i_s_columns_schema" + randomNameSuffix();
+            assertUpdate("CREATE SCHEMA " + schemaName);
+            Session session = Session.builder(getSession())
+                    .setSchema(schemaName)
+                    .build();
+
+            for (int i = 0; i < tables; i++) {
+                assertUpdate(session, "CREATE TABLE test_select_i_s_columns" + i + "(id varchar, age integer)");
+                // Produce multiple snapshots and metadata files
+                assertUpdate(session, "INSERT INTO test_select_i_s_columns" + i + " VALUES ('abc', 11)", 1);
+                assertUpdate(session, "INSERT INTO test_select_i_s_columns" + i + " VALUES ('xyz', 12)", 1);
+
+                assertUpdate(session, "CREATE TABLE test_other_select_i_s_columns" + i + "(id varchar, age integer)"); // won't match the filter
+            }
+
+            // Bulk retrieval
+            assertFileSystemAccesses(session, "SELECT * FROM information_schema.columns WHERE table_schema = CURRENT_SCHEMA AND table_name LIKE 'test_select_i_s_columns%'",
+                    ImmutableMultiset.<FileOperation>builder()
+                            .addCopies(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), tables)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), tables)
+                            .build());
+
+            // Pointed lookup
+            assertFileSystemAccesses(session, "SELECT * FROM information_schema.columns WHERE table_schema = CURRENT_SCHEMA AND table_name = 'test_select_i_s_columns0'",
+                    ImmutableMultiset.<FileOperation>builder()
+                            .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                            .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                            .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                            .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                            .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                            .build());
+
+            // Pointed lookup with LIKE predicate (as if unintentional)
+            assertFileSystemAccesses(session, "SELECT * FROM information_schema.columns WHERE table_schema = CURRENT_SCHEMA AND table_name LIKE 'test_select_i_s_columns0'",
+                    ImmutableMultiset.<FileOperation>builder()
+                            .addCopies(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), tables)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), tables)
+                            .build());
+
+            // Pointed lookup via DESCRIBE (which does some additional things before delegating to information_schema.columns)
+            assertFileSystemAccesses(session, "DESCRIBE test_select_i_s_columns0",
+                    ImmutableMultiset.<FileOperation>builder()
+                            .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                            .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                            .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                            .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                            .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                            .build());
+
+            for (int i = 0; i < tables; i++) {
+                assertUpdate(session, "DROP TABLE test_select_i_s_columns" + i);
+                assertUpdate(session, "DROP TABLE test_other_select_i_s_columns" + i);
+            }
+        }
+    }
+
+    @Test
+    public void testSystemMetadataTableComments()
+    {
+        for (int tables : Arrays.asList(3, MAX_PREFIXES_COUNT, MAX_PREFIXES_COUNT + 3)) {
+            String schemaName = "test_s_m_table_comments" + randomNameSuffix();
+            assertUpdate("CREATE SCHEMA " + schemaName);
+            Session session = Session.builder(getSession())
+                    .setSchema(schemaName)
+                    .build();
+
+            for (int i = 0; i < tables; i++) {
+                assertUpdate(session, "CREATE TABLE test_select_s_m_t_comments" + i + "(id varchar, age integer)");
+                // Produce multiple snapshots and metadata files
+                assertUpdate(session, "INSERT INTO test_select_s_m_t_comments" + i + " VALUES ('abc', 11)", 1);
+                assertUpdate(session, "INSERT INTO test_select_s_m_t_comments" + i + " VALUES ('xyz', 12)", 1);
+
+                assertUpdate(session, "CREATE TABLE test_other_select_s_m_t_comments" + i + "(id varchar, age integer)"); // won't match the filter
+            }
+
+            // Bulk retrieval
+            assertFileSystemAccesses(session, "SELECT * FROM system.metadata.table_comments WHERE schema_name = CURRENT_SCHEMA AND table_name LIKE 'test_select_s_m_t_comments%'",
+                    ImmutableMultiset.<FileOperation>builder()
+                            .addCopies(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), tables)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), tables)
+                            .build());
+
+            // Bulk retrieval for two schemas
+            assertFileSystemAccesses(session, "SELECT * FROM system.metadata.table_comments WHERE schema_name IN (CURRENT_SCHEMA, 'non_existent') AND table_name LIKE 'test_select_s_m_t_comments%'",
+                    ImmutableMultiset.<FileOperation>builder()
+                            .addCopies(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), tables)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), tables)
+                            .build());
+
+            // Pointed lookup
+            assertFileSystemAccesses(session, "SELECT * FROM system.metadata.table_comments WHERE schema_name = CURRENT_SCHEMA AND table_name = 'test_select_s_m_t_comments0'",
+                    ImmutableMultiset.<FileOperation>builder()
+                            .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                            .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM))
+                            .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM))
+                            .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM))
+                            .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM))
+                            .build());
+
+            // Pointed lookup with LIKE predicate (as if unintentional)
+            assertFileSystemAccesses(session, "SELECT * FROM system.metadata.table_comments WHERE schema_name = CURRENT_SCHEMA AND table_name LIKE 'test_select_s_m_t_comments0'",
+                    ImmutableMultiset.<FileOperation>builder()
+                            .addCopies(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000000.json", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000001.json", INPUT_FILE_NEW_STREAM), tables * 2)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000002.json", INPUT_FILE_NEW_STREAM), tables)
+                            .addCopies(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000003.json", INPUT_FILE_NEW_STREAM), tables)
+                            .build());
+
+            for (int i = 0; i < tables; i++) {
+                assertUpdate(session, "DROP TABLE test_select_s_m_t_comments" + i);
+                assertUpdate(session, "DROP TABLE test_other_select_s_m_t_comments" + i);
+            }
+        }
+    }
+
+    @Test
+    public void testShowTables()
+    {
+        assertFileSystemAccesses("SHOW TABLES", ImmutableMultiset.of());
+    }
+
+    @Test
+    public void testReadMultipartCheckpoint()
+            throws Exception
+    {
+        String tableName = "test_multipart_checkpoint_" + randomNameSuffix();
+        Path tableLocation = Files.createTempFile(tableName, null);
+        copyDirectoryContents(new File(Resources.getResource("deltalake/multipart_checkpoint").toURI()).toPath(), tableLocation);
+
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(getSession().getSchema().orElseThrow(), tableName, tableLocation.toUri()));
+        assertFileSystemAccesses("SELECT * FROM " + tableName,
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(LAST_CHECKPOINT, "_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(CHECKPOINT, "00000000000000000006.checkpoint.0000000001.0000000002.parquet", INPUT_FILE_GET_LENGTH), 4) // TODO (https://github.com/trinodb/trino/issues/18916) should be checked once per query
+                        .addCopies(new FileOperation(CHECKPOINT, "00000000000000000006.checkpoint.0000000001.0000000002.parquet", INPUT_FILE_NEW_STREAM), 2) // TODO (https://github.com/trinodb/trino/issues/18916) should be checked once per query
+                        .addCopies(new FileOperation(CHECKPOINT, "00000000000000000006.checkpoint.0000000002.0000000002.parquet", INPUT_FILE_GET_LENGTH), 4) // TODO (https://github.com/trinodb/trino/issues/18916) should be checked once per query
+                        .addCopies(new FileOperation(CHECKPOINT, "00000000000000000006.checkpoint.0000000002.0000000002.parquet", INPUT_FILE_NEW_STREAM), 2) // TODO (https://github.com/trinodb/trino/issues/18916) should be checked once per query
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000007.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(TRANSACTION_LOG_JSON, "00000000000000000008.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(DATA, "no partition", INPUT_FILE_NEW_STREAM), 7)
+                        .build());
+    }
+
+    private int countCdfFilesForKey(String partitionValue)
+    {
+        String path = (String) computeScalar("SELECT \"$path\" FROM table_changes_file_system_access WHERE key = '" + partitionValue + "'");
+        String partitionKey = "key=" + partitionValue;
+        String tableLocation = path.substring(0, path.lastIndexOf(partitionKey));
+        String partitionCdfFolder = URI.create(tableLocation).getPath() + "_change_data/" + partitionKey + "/";
+        return toIntExact(Arrays.stream(new File(partitionCdfFolder).list()).filter(file -> !file.contains(".crc")).count());
+    }
+
     private void assertFileSystemAccesses(@Language("SQL") String query, Multiset<FileOperation> expectedAccesses)
     {
-        DistributedQueryRunner queryRunner = getDistributedQueryRunner();
+        assertFileSystemAccesses(getSession(), query, expectedAccesses);
+    }
+
+    private void assertFileSystemAccesses(Session session, @Language("SQL") String query, Multiset<FileOperation> expectedAccesses)
+    {
+        assertUpdate("CALL system.flush_metadata_cache()");
+
         trackingFileSystemFactory.reset();
-        queryRunner.executeWithQueryId(queryRunner.getDefaultSession(), query);
-        assertThat(getOperations())
-                .containsExactlyInAnyOrderElementsOf(expectedAccesses);
+        getDistributedQueryRunner().executeWithQueryId(session, query);
+        assertMultisetsEqual(getOperations(), expectedAccesses);
     }
 
     private Multiset<FileOperation> getOperations()
     {
         return trackingFileSystemFactory.getOperationCounts()
                 .entrySet().stream()
+                .filter(entry -> {
+                    String path = entry.getKey().location().path();
+                    return !path.endsWith(".trinoSchema") && !path.contains(".trinoPermissions");
+                })
                 .flatMap(entry -> nCopies(entry.getValue(), FileOperation.create(
-                        entry.getKey().getFilePath(),
-                        entry.getKey().getOperationType())).stream())
+                        entry.getKey().location().path(),
+                        entry.getKey().operationType())).stream())
                 .collect(toCollection(HashMultiset::create));
     }
 
@@ -185,17 +771,29 @@ public static FileOperation create(String path, OperationType operationType)
             if (path.matches(".*/_delta_log/_last_checkpoint")) {
                 return new FileOperation(LAST_CHECKPOINT, fileName, operationType);
             }
+            if (path.matches(".*/_delta_log/\\d+\\.checkpoint(\\.\\d+\\.\\d+)?\\.parquet")) {
+                return new FileOperation(CHECKPOINT, fileName, operationType);
+            }
             if (path.matches(".*/_delta_log/\\d+\\.json")) {
                 return new FileOperation(TRANSACTION_LOG_JSON, fileName, operationType);
             }
             if (path.matches(".*/_delta_log/_trino_meta/extended_stats.json")) {
                 return new FileOperation(TRINO_EXTENDED_STATS_JSON, fileName, operationType);
             }
+            if (path.matches(".*/_delta_log/_starburst_meta/extendeded_stats.json")) {
+                return new FileOperation(STARBURST_EXTENDED_STATS_JSON, fileName, operationType);
+            }
+            Pattern dataFilePattern = Pattern.compile(".*?/(?<partition>key=[^/]*/)?[^/]+");
+            if (path.matches(".*/_change_data/.*")) {
+                Matcher matcher = dataFilePattern.matcher(path);
+                if (matcher.matches()) {
+                    return new FileOperation(CDF_DATA, matcher.group("partition"), operationType);
+                }
+            }
             if (!path.contains("_delta_log")) {
-                Matcher matcher = Pattern.compile(".*/(?<partition>key=[^/]*/)(?<queryId>\\d{8}_\\d{6}_\\d{5}_\\w{5})-(?<uuid>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})")
-                        .matcher(path);
+                Matcher matcher = dataFilePattern.matcher(path);
                 if (matcher.matches()) {
-                    return new FileOperation(DATA, matcher.group("partition"), operationType);
+                    return new FileOperation(DATA, firstNonNull(matcher.group("partition"), "no partition"), operationType);
                 }
             }
             throw new IllegalArgumentException("File not recognized: " + path);
@@ -212,9 +810,12 @@ public static FileOperation create(String path, OperationType operationType)
     enum FileType
     {
         LAST_CHECKPOINT,
+        CHECKPOINT,
         TRANSACTION_LOG_JSON,
         TRINO_EXTENDED_STATS_JSON,
+        STARBURST_EXTENDED_STATS_JSON,
         DATA,
+        CDF_DATA,
         /**/;
     }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeFlushMetadataCacheProcedure.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeFlushMetadataCacheProcedure.java
index 57bcb27e2cb6..4bbe568ba3a7 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeFlushMetadataCacheProcedure.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeFlushMetadataCacheProcedure.java
@@ -19,28 +19,30 @@
 import io.trino.plugin.hive.metastore.thrift.BridgingHiveMetastore;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner;
 import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
 import static io.trino.plugin.hive.containers.HiveHadoop.HIVE3_IMAGE;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeFlushMetadataCacheProcedure
         extends AbstractTestQueryFramework
 {
-    private static final String BUCKET_NAME = "delta-lake-test-flush-metadata-cache";
-
+    private final String bucketName = "delta-lake-test-flush-metadata-cache-" + randomNameSuffix();
     private HiveMetastore metastore;
 
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        HiveMinioDataLake hiveMinioDataLake = new HiveMinioDataLake(BUCKET_NAME, HIVE3_IMAGE);
+        HiveMinioDataLake hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName, HIVE3_IMAGE));
         hiveMinioDataLake.start();
         metastore = new BridgingHiveMetastore(
                 testingThriftHiveMetastoreBuilder()
@@ -55,9 +57,8 @@ protected QueryRunner createQueryRunner()
                 hiveMinioDataLake.getHiveHadoop());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
-            throws IOException
     {
         metastore = null;
     }
@@ -65,7 +66,7 @@ public void tearDown()
     @Test
     public void testFlushMetadataCache()
     {
-        assertUpdate("CREATE SCHEMA cached WITH (location = 's3://" + BUCKET_NAME + "/cached')");
+        assertUpdate("CREATE SCHEMA cached WITH (location = 's3://" + bucketName + "/cached')");
         assertUpdate("CREATE TABLE cached.cached AS SELECT * FROM tpch.tiny.nation", 25);
 
         // Verify that column cache is flushed
@@ -88,7 +89,7 @@ public void testFlushMetadataCache()
         assertQuery(showTablesSql, "VALUES 'renamed'");
 
         // Verify that schema cache is flushed
-        String showSchemasSql = "SHOW SCHEMAS FROM delta_lake";
+        String showSchemasSql = "SHOW SCHEMAS FROM delta";
         // Fill caches
         assertQuery(showSchemasSql, "VALUES ('cached'), ('information_schema'), ('default')");
 
@@ -105,10 +106,32 @@ public void testFlushMetadataCache()
     }
 
     @Test
-    public void testFlushMetadataCacheTableNotFound()
+    public void testFlushMetadataCacheAfterTableCreated()
+    {
+        String schema = getSession().getSchema().orElseThrow();
+
+        String location = "s3://%s/test_flush_intermediate_tmp_table".formatted(bucketName);
+        assertUpdate("CREATE TABLE test_flush_intermediate_tmp_table WITH (location = '" + location + "') AS TABLE tpch.tiny.region", 5);
+
+        // This may cause the connector to cache the fact that the table does not exist
+        assertQueryFails("TABLE flush_metadata_after_table_created", "\\Qline 1:1: Table 'delta.default.flush_metadata_after_table_created' does not exist");
+
+        metastore.renameTable(schema, "test_flush_intermediate_tmp_table", schema, "flush_metadata_after_table_created");
+
+        // Verify cached state (we currently cache missing objects in CachingMetastore)
+        assertQueryFails("TABLE flush_metadata_after_table_created", "\\Qline 1:1: Table 'delta.default.flush_metadata_after_table_created' does not exist");
+
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => CURRENT_SCHEMA, table_name => 'flush_metadata_after_table_created')");
+        assertThat(query("TABLE flush_metadata_after_table_created"))
+                .skippingTypesCheck() // Delta has no parametric varchar
+                .matches("TABLE tpch.tiny.region");
+
+        assertUpdate("DROP TABLE flush_metadata_after_table_created");
+    }
+
+    @Test
+    public void testFlushMetadataCacheNonExistentTable()
     {
-        assertQueryFails(
-                "CALL system.flush_metadata_cache(schema_name => 'test_not_existing_schema', table_name => 'test_not_existing_table')",
-                "Table 'test_not_existing_schema.test_not_existing_table' not found");
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => 'test_not_existing_schema', table_name => 'test_not_existing_table')");
     }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeGcsConnectorSmokeTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeGcsConnectorSmokeTest.java
index 6d6094cb7789..5570743d3df0 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeGcsConnectorSmokeTest.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeGcsConnectorSmokeTest.java
@@ -21,22 +21,20 @@
 import com.google.common.reflect.ClassPath;
 import io.airlift.log.Logger;
 import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoOutputFile;
 import io.trino.hadoop.ConfigurationInstantiator;
-import io.trino.plugin.hive.containers.HiveMinioDataLake;
-import io.trino.plugin.hive.gcs.GoogleGcsConfigurationInitializer;
-import io.trino.plugin.hive.gcs.HiveGcsConfig;
-import io.trino.testing.DistributedQueryRunner;
+import io.trino.hdfs.gcs.GoogleGcsConfigurationInitializer;
+import io.trino.hdfs.gcs.HiveGcsConfig;
+import io.trino.plugin.hive.containers.HiveHadoop;
 import io.trino.testing.QueryRunner;
 import org.apache.hadoop.conf.Configuration;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Parameters;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.TestInstance;
 
-import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
@@ -49,14 +47,14 @@
 import java.util.regex.Pattern;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
-import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createDockerizedDeltaLakeQueryRunner;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.plugin.hive.containers.HiveHadoop.HIVE3_IMAGE;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
 import static java.util.regex.Matcher.quoteReplacement;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.testcontainers.containers.Network.newNetwork;
 
 /**
  * This test requires these variables to connect to GCS:
@@ -64,6 +62,7 @@
  * - gcp-credentials-key: A base64 encoded copy of the JSON authentication file for the service account used to connect to GCP.
  *   For example, `cat service-account-key.json | base64`
  */
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeGcsConnectorSmokeTest
         extends BaseDeltaLakeConnectorSmokeTest
 {
@@ -74,25 +73,25 @@ public class TestDeltaLakeGcsConnectorSmokeTest
     private final String gcpCredentialKey;
 
     private Path gcpCredentialsFile;
+    private String gcpCredentials;
     private TrinoFileSystem fileSystem;
 
-    @Parameters({"testing.gcp-storage-bucket", "testing.gcp-credentials-key"})
-    public TestDeltaLakeGcsConnectorSmokeTest(String gcpStorageBucket, String gcpCredentialKey)
+    public TestDeltaLakeGcsConnectorSmokeTest()
     {
-        this.gcpStorageBucket = requireNonNull(gcpStorageBucket, "gcpStorageBucket is null");
-        this.gcpCredentialKey = requireNonNull(gcpCredentialKey, "gcpCredentialKey is null");
+        this.gcpStorageBucket = requireNonNull(System.getProperty("testing.gcp-storage-bucket"), "GCP storage bucket is null");
+        this.gcpCredentialKey = requireNonNull(System.getProperty("testing.gcp-credentials-key"), "GCP credential key is null");
     }
 
     @Override
     protected void environmentSetup()
     {
-        InputStream jsonKey = new ByteArrayInputStream(Base64.getDecoder().decode(gcpCredentialKey));
+        byte[] jsonKeyBytes = Base64.getDecoder().decode(gcpCredentialKey);
+        gcpCredentials = new String(jsonKeyBytes, UTF_8);
         try {
             this.gcpCredentialsFile = Files.createTempFile("gcp-credentials", ".json", READ_ONLY_PERMISSIONS);
             gcpCredentialsFile.toFile().deleteOnExit();
-            Files.write(gcpCredentialsFile, jsonKey.readAllBytes());
-
-            HiveGcsConfig gcsConfig = new HiveGcsConfig().setJsonKeyFilePath(gcpCredentialsFile.toAbsolutePath().toString());
+            Files.write(gcpCredentialsFile, jsonKeyBytes);
+            HiveGcsConfig gcsConfig = new HiveGcsConfig().setJsonKey(gcpCredentials);
             Configuration configuration = ConfigurationInstantiator.newEmptyConfiguration();
             new GoogleGcsConfigurationInitializer(gcsConfig).initializeConfiguration(configuration);
         }
@@ -101,12 +100,12 @@ protected void environmentSetup()
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void removeTestData()
     {
         if (fileSystem != null) {
             try {
-                fileSystem.deleteDirectory(bucketUrl());
+                fileSystem.deleteDirectory(Location.of(bucketUrl()));
             }
             catch (IOException e) {
                 // The GCS bucket should be configured to expire objects automatically. Clean up issues do not need to fail the test.
@@ -117,7 +116,7 @@ public void removeTestData()
     }
 
     @Override
-    protected HiveMinioDataLake createHiveMinioDataLake()
+    protected HiveHadoop createHiveHadoop()
             throws Exception
     {
         String gcpSpecificCoreSiteXmlContent = Resources.toString(Resources.getResource("io/trino/plugin/deltalake/hdp3.1-core-site.xml.gcs-template"), UTF_8)
@@ -127,39 +126,40 @@ protected HiveMinioDataLake createHiveMinioDataLake()
         hadoopCoreSiteXmlTempFile.toFile().deleteOnExit();
         Files.writeString(hadoopCoreSiteXmlTempFile, gcpSpecificCoreSiteXmlContent);
 
-        HiveMinioDataLake dataLake = new HiveMinioDataLake(
-                bucketName,
-                ImmutableMap.of(
+        HiveHadoop hiveHadoop = HiveHadoop.builder()
+                .withImage(HIVE3_IMAGE)
+                .withNetwork(closeAfterClass(newNetwork()))
+                .withFilesToMount(ImmutableMap.of(
                         "/etc/hadoop/conf/core-site.xml", hadoopCoreSiteXmlTempFile.normalize().toAbsolutePath().toString(),
-                        "/etc/hadoop/conf/gcp-credentials.json", gcpCredentialsFile.toAbsolutePath().toString()),
-                HIVE3_IMAGE);
-        dataLake.start();
-        return dataLake;
+                        "/etc/hadoop/conf/gcp-credentials.json", gcpCredentialsFile.toAbsolutePath().toString()))
+                .build();
+        hiveHadoop.start();
+        return hiveHadoop; // closed by superclass
     }
 
     @Override
-    protected QueryRunner createDeltaLakeQueryRunner(Map<String, String> connectorProperties)
-            throws Exception
+    protected Map<String, String> hiveStorageConfiguration()
     {
-        DistributedQueryRunner runner = createDockerizedDeltaLakeQueryRunner(
-                DELTA_CATALOG,
-                SCHEMA,
-                ImmutableMap.of(),
-                ImmutableMap.of(),
-                ImmutableMap.<String, String>builder()
-                        .putAll(connectorProperties)
-                        .put("hive.gcs.json-key-file-path", gcpCredentialsFile.toAbsolutePath().toString())
-                        .put("delta.unique-table-location", "false")
-                        .buildOrThrow(),
-                hiveMinioDataLake.getHiveHadoop(),
-                queryRunner -> {});
-        this.fileSystem = HDFS_FILE_SYSTEM_FACTORY.create(runner.getDefaultSession().toConnectorSession());
-        return runner;
+        return ImmutableMap.<String, String>builder()
+                .put("hive.gcs.json-key", gcpCredentials)
+                .buildOrThrow();
+    }
+
+    @Override
+    protected Map<String, String> deltaStorageConfiguration()
+    {
+        return ImmutableMap.<String, String>builder()
+                .putAll(hiveStorageConfiguration())
+                // TODO why not unique table locations? (This is here since 52bf6680c1b25516f6e8e64f82ada089abc0c9d3.)
+                .put("delta.unique-table-location", "false")
+                .buildOrThrow();
     }
 
     @Override
     protected void registerTableFromResources(String table, String resourcePath, QueryRunner queryRunner)
     {
+        this.fileSystem = HDFS_FILE_SYSTEM_FACTORY.create(queryRunner.getDefaultSession().toConnectorSession());
+
         String targetDirectory = bucketUrl() + table;
 
         try {
@@ -171,7 +171,7 @@ protected void registerTableFromResources(String table, String resourcePath, Que
             for (ClassPath.ResourceInfo resourceInfo : resources) {
                 String fileName = resourceInfo.getResourceName().replaceFirst("^" + Pattern.quote(resourcePath), quoteReplacement(targetDirectory));
                 ByteSource byteSource = resourceInfo.asByteSource();
-                TrinoOutputFile trinoOutputFile = fileSystem.newOutputFile(fileName);
+                TrinoOutputFile trinoOutputFile = fileSystem.newOutputFile(Location.of(fileName));
                 try (OutputStream fileStream = trinoOutputFile.createOrOverwrite()) {
                     ByteStreams.copy(byteSource.openBufferedStream(), fileStream);
                 }
@@ -197,10 +197,9 @@ protected List<String> getTableFiles(String tableName)
     }
 
     @Override
-    protected List<String> listCheckpointFiles(String transactionLogDirectory)
+    protected List<String> listFiles(String directory)
     {
-        return listAllFilesRecursive(transactionLogDirectory).stream()
-                .filter(path -> path.contains("checkpoint.parquet"))
+        return listAllFilesRecursive(directory).stream()
                 .collect(toImmutableList());
     }
 
@@ -208,9 +207,9 @@ private List<String> listAllFilesRecursive(String directory)
     {
         ImmutableList.Builder<String> locations = ImmutableList.builder();
         try {
-            FileIterator files = fileSystem.listFiles(bucketUrl() + directory);
+            FileIterator files = fileSystem.listFiles(Location.of(bucketUrl()).appendPath(directory));
             while (files.hasNext()) {
-                locations.add(files.next().location());
+                locations.add(files.next().location().toString());
             }
             return locations.build();
         }
@@ -222,6 +221,17 @@ private List<String> listAllFilesRecursive(String directory)
         }
     }
 
+    @Override
+    protected void deleteFile(String filePath)
+    {
+        try {
+            fileSystem.deleteFile(Location.of(filePath));
+        }
+        catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @Override
     protected String bucketUrl()
     {
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeLegacyCreateTableWithExistingLocation.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeLegacyCreateTableWithExistingLocation.java
index 280c4523cefb..eb7e873011d2 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeLegacyCreateTableWithExistingLocation.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeLegacyCreateTableWithExistingLocation.java
@@ -18,8 +18,9 @@
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,17 +28,18 @@
 
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createDeltaLakeQueryRunner;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeLegacyCreateTableWithExistingLocation
         extends AbstractTestQueryFramework
 {
-    private static final String CATALOG_NAME = "delta_lake";
-
     private File dataDirectory;
     private HiveMetastore metastore;
 
@@ -49,7 +51,7 @@ protected QueryRunner createQueryRunner()
         this.metastore = createTestingFileHiveMetastore(dataDirectory);
 
         return createDeltaLakeQueryRunner(
-                CATALOG_NAME,
+                DELTA_CATALOG,
                 ImmutableMap.of(),
                 ImmutableMap.of(
                         "delta.unique-table-location", "true",
@@ -57,7 +59,7 @@ protected QueryRunner createQueryRunner()
                         "hive.metastore.catalog.dir", dataDirectory.getPath()));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws IOException
     {
@@ -77,14 +79,14 @@ public void testLegacyCreateTable()
         String tableLocation = (String) computeScalar("SELECT DISTINCT regexp_replace(\"$path\", '/[^/]*$', '') FROM " + tableName);
         metastore.dropTable("tpch", tableName, false);
 
-        assertQueryFails(format("CREATE TABLE %s.%s.%s (dummy int) with (location = '%s')", CATALOG_NAME, "tpch", tableName, tableLocation),
+        assertQueryFails(format("CREATE TABLE %s.%s.%s (dummy int) with (location = '%s')", DELTA_CATALOG, "tpch", tableName, tableLocation),
                 ".*Using CREATE TABLE with an existing table content is deprecated.*");
 
         Session sessionWithLegacyCreateTableEnabled = Session
                 .builder(getSession())
-                .setCatalogSessionProperty(CATALOG_NAME, "legacy_create_table_with_existing_location_enabled", "true")
+                .setCatalogSessionProperty(DELTA_CATALOG, "legacy_create_table_with_existing_location_enabled", "true")
                 .build();
-        assertQuerySucceeds(sessionWithLegacyCreateTableEnabled, format("CREATE TABLE %s.%s.%s (dummy int) with (location = '%s')", CATALOG_NAME, "tpch", tableName, tableLocation));
+        assertQuerySucceeds(sessionWithLegacyCreateTableEnabled, format("CREATE TABLE %s.%s.%s (dummy int) with (location = '%s')", DELTA_CATALOG, "tpch", tableName, tableLocation));
 
         assertQuery("SELECT * FROM " + tableName, "VALUES (1, 'INDIA', true)");
 
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeMetadata.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeMetadata.java
index 06f152f0f665..267eb2f41ffc 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeMetadata.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeMetadata.java
@@ -19,18 +19,19 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
 import com.google.inject.Provides;
+import com.google.inject.Scopes;
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.json.JsonModule;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
-import io.trino.filesystem.hdfs.HdfsFileSystemModule;
 import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.deltalake.metastore.DeltaLakeMetastore;
 import io.trino.plugin.deltalake.metastore.DeltaLakeMetastoreModule;
 import io.trino.plugin.deltalake.metastore.HiveMetastoreBackedDeltaLakeMetastore;
-import io.trino.plugin.deltalake.statistics.CachingExtendedStatisticsAccess;
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
-import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.plugin.hive.NodeVersion;
 import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
@@ -57,14 +58,15 @@
 import io.trino.spi.type.DateType;
 import io.trino.spi.type.DoubleType;
 import io.trino.spi.type.RowType;
+import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.VarcharType;
 import io.trino.testing.TestingConnectorContext;
 import io.trino.tests.BogusType;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.io.IOException;
@@ -75,22 +77,28 @@
 import java.util.Set;
 import java.util.UUID;
 
+import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.airlift.testing.Closeables.closeAll;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
-import static io.trino.plugin.hive.HiveTableProperties.PARTITIONED_BY_PROPERTY;
+import static io.trino.plugin.deltalake.DeltaLakeTableProperties.COLUMN_MAPPING_MODE_PROPERTY;
+import static io.trino.plugin.deltalake.DeltaLakeTableProperties.PARTITIONED_BY_PROPERTY;
+import static io.trino.plugin.deltalake.DeltaTestingConnectorSession.SESSION;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.spi.security.PrincipalType.USER;
 import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
-import static io.trino.testing.TestingConnectorSession.SESSION;
 import static java.nio.file.Files.createTempDirectory;
 import static java.util.Locale.ENGLISH;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeMetadata
 {
     private static final String DATABASE_NAME = "mock_database";
@@ -100,23 +108,63 @@ public class TestDeltaLakeMetadata
     private static final ColumnMetadata TIMESTAMP_COLUMN = new ColumnMetadata("timestamp_column", TIMESTAMP_MILLIS);
     private static final ColumnMetadata MISSING_COLUMN = new ColumnMetadata("missing_column", BIGINT);
 
+    private static final RowType BOGUS_ROW_FIELD = RowType.from(ImmutableList.of(
+            new RowType.Field(Optional.of("test_field"), BogusType.BOGUS)));
+    private static final RowType NESTED_ROW_FIELD = RowType.from(ImmutableList.of(
+            new RowType.Field(Optional.of("child1"), INTEGER),
+            new RowType.Field(Optional.of("child2"), INTEGER)));
+    private static final RowType HIGHLY_NESTED_ROW_FIELD = RowType.from(ImmutableList.of(
+            new RowType.Field(Optional.of("grandparent"), RowType.from(ImmutableList.of(
+                    new RowType.Field(Optional.of("parent"), RowType.from(ImmutableList.of(
+                            new RowType.Field(Optional.of("child"), INTEGER)))))))));
+
     private static final DeltaLakeColumnHandle BOOLEAN_COLUMN_HANDLE =
-            new DeltaLakeColumnHandle("boolean_column_name", BooleanType.BOOLEAN, OptionalInt.empty(), "boolean_column_name", BooleanType.BOOLEAN, REGULAR);
+            new DeltaLakeColumnHandle("boolean_column_name", BooleanType.BOOLEAN, OptionalInt.empty(), "boolean_column_name", BooleanType.BOOLEAN, REGULAR, Optional.empty());
     private static final DeltaLakeColumnHandle DOUBLE_COLUMN_HANDLE =
-            new DeltaLakeColumnHandle("double_column_name", DoubleType.DOUBLE, OptionalInt.empty(), "double_column_name", DoubleType.DOUBLE, REGULAR);
+            new DeltaLakeColumnHandle("double_column_name", DoubleType.DOUBLE, OptionalInt.empty(), "double_column_name", DoubleType.DOUBLE, REGULAR, Optional.empty());
     private static final DeltaLakeColumnHandle BOGUS_COLUMN_HANDLE =
-            new DeltaLakeColumnHandle("bogus_column_name", BogusType.BOGUS, OptionalInt.empty(), "bogus_column_name", BogusType.BOGUS, REGULAR);
+            new DeltaLakeColumnHandle("bogus_column_name", BogusType.BOGUS, OptionalInt.empty(), "bogus_column_name", BogusType.BOGUS, REGULAR, Optional.empty());
     private static final DeltaLakeColumnHandle VARCHAR_COLUMN_HANDLE =
-            new DeltaLakeColumnHandle("varchar_column_name", VarcharType.VARCHAR, OptionalInt.empty(), "varchar_column_name", VarcharType.VARCHAR, REGULAR);
+            new DeltaLakeColumnHandle("varchar_column_name", VarcharType.VARCHAR, OptionalInt.empty(), "varchar_column_name", VarcharType.VARCHAR, REGULAR, Optional.empty());
     private static final DeltaLakeColumnHandle DATE_COLUMN_HANDLE =
-            new DeltaLakeColumnHandle("date_column_name", DateType.DATE, OptionalInt.empty(), "date_column_name", DateType.DATE, REGULAR);
+            new DeltaLakeColumnHandle("date_column_name", DateType.DATE, OptionalInt.empty(), "date_column_name", DateType.DATE, REGULAR, Optional.empty());
+    private static final DeltaLakeColumnHandle NESTED_COLUMN_HANDLE =
+            new DeltaLakeColumnHandle("nested_column_name", NESTED_ROW_FIELD, OptionalInt.empty(), "nested_column_name", NESTED_ROW_FIELD, REGULAR, Optional.empty());
+    private static final DeltaLakeColumnHandle EXPECTED_NESTED_COLUMN_HANDLE =
+            new DeltaLakeColumnHandle(
+                    "nested_column_name",
+                    NESTED_ROW_FIELD,
+                    OptionalInt.empty(),
+                    "nested_column_name",
+                    NESTED_ROW_FIELD,
+                    REGULAR,
+                    Optional.of(new DeltaLakeColumnProjectionInfo(INTEGER, ImmutableList.of(1), ImmutableList.of("child2"))));
+    private static final DeltaLakeColumnHandle NESTED_COLUMN_HANDLE_WITH_PROJECTION =
+            new DeltaLakeColumnHandle(
+                    "highly_nested_column_name",
+                    HIGHLY_NESTED_ROW_FIELD,
+                    OptionalInt.empty(),
+                    "highly_nested_column_name",
+                    HIGHLY_NESTED_ROW_FIELD,
+                    REGULAR,
+                    Optional.of(new DeltaLakeColumnProjectionInfo(INTEGER, ImmutableList.of(0, 0), ImmutableList.of("grandparent", "parent"))));
+    private static final DeltaLakeColumnHandle EXPECTED_NESTED_COLUMN_HANDLE_WITH_PROJECTION =
+            new DeltaLakeColumnHandle(
+                    "highly_nested_column_name",
+                    HIGHLY_NESTED_ROW_FIELD,
+                    OptionalInt.empty(),
+                    "highly_nested_column_name",
+                    HIGHLY_NESTED_ROW_FIELD,
+                    REGULAR,
+                    Optional.of(new DeltaLakeColumnProjectionInfo(INTEGER, ImmutableList.of(0, 0, 0), ImmutableList.of("grandparent", "parent", "child"))));
 
     private static final Map<String, ColumnHandle> SYNTHETIC_COLUMN_ASSIGNMENTS = ImmutableMap.of(
             "test_synthetic_column_name_1", BOGUS_COLUMN_HANDLE,
             "test_synthetic_column_name_2", VARCHAR_COLUMN_HANDLE);
-
-    private static final RowType BOGUS_ROW_FIELD = RowType.from(ImmutableList.of(
-            new RowType.Field(Optional.of("test_field"), BogusType.BOGUS)));
+    private static final Map<String, ColumnHandle> NESTED_COLUMN_ASSIGNMENTS = ImmutableMap.of("nested_column_name", NESTED_COLUMN_HANDLE);
+    private static final Map<String, ColumnHandle> EXPECTED_NESTED_COLUMN_ASSIGNMENTS = ImmutableMap.of("nested_column_name#child2", EXPECTED_NESTED_COLUMN_HANDLE);
+    private static final Map<String, ColumnHandle> HIGHLY_NESTED_COLUMN_ASSIGNMENTS = ImmutableMap.of("highly_nested_column_name#grandparent#parent", NESTED_COLUMN_HANDLE_WITH_PROJECTION);
+    private static final Map<String, ColumnHandle> EXPECTED_HIGHLY_NESTED_COLUMN_ASSIGNMENTS = ImmutableMap.of("highly_nested_column_name#grandparent#parent#child", EXPECTED_NESTED_COLUMN_HANDLE_WITH_PROJECTION);
 
     private static final ConnectorExpression DOUBLE_PROJECTION = new Variable("double_projection", DoubleType.DOUBLE);
     private static final ConnectorExpression BOOLEAN_PROJECTION = new Variable("boolean_projection", BooleanType.BOOLEAN);
@@ -124,11 +172,33 @@ public class TestDeltaLakeMetadata
             BOGUS_ROW_FIELD,
             new Constant(1, BOGUS_ROW_FIELD),
             0);
+    private static final ConnectorExpression NESTED_DEREFERENCE_PROJECTION = new FieldDereference(
+            INTEGER,
+            new Variable("nested_column_name", NESTED_ROW_FIELD),
+            1);
+    private static final ConnectorExpression EXPECTED_NESTED_DEREFERENCE_PROJECTION = new Variable(
+            "nested_column_name#child2",
+            INTEGER);
+    private static final ConnectorExpression HIGHLY_NESTED_DEREFERENCE_PROJECTION = new FieldDereference(
+            INTEGER,
+            new Variable("highly_nested_column_name#grandparent#parent", HIGHLY_NESTED_ROW_FIELD),
+            0);
+    private static final ConnectorExpression EXPECTED_HIGHLY_NESTED_DEREFERENCE_PROJECTION = new Variable(
+            "highly_nested_column_name#grandparent#parent#child",
+            INTEGER);
 
     private static final List<ConnectorExpression> SIMPLE_COLUMN_PROJECTIONS =
             ImmutableList.of(DOUBLE_PROJECTION, BOOLEAN_PROJECTION);
     private static final List<ConnectorExpression> DEREFERENCE_COLUMN_PROJECTIONS =
             ImmutableList.of(DOUBLE_PROJECTION, DEREFERENCE_PROJECTION, BOOLEAN_PROJECTION);
+    private static final List<ConnectorExpression> NESTED_DEREFERENCE_COLUMN_PROJECTIONS =
+            ImmutableList.of(NESTED_DEREFERENCE_PROJECTION);
+    private static final List<ConnectorExpression> EXPECTED_NESTED_DEREFERENCE_COLUMN_PROJECTIONS =
+            ImmutableList.of(EXPECTED_NESTED_DEREFERENCE_PROJECTION);
+    private static final List<ConnectorExpression> HIGHLY_NESTED_DEREFERENCE_COLUMN_PROJECTIONS =
+            ImmutableList.of(HIGHLY_NESTED_DEREFERENCE_PROJECTION);
+    private static final List<ConnectorExpression> EXPECTED_HIGHLY_NESTED_DEREFERENCE_COLUMN_PROJECTIONS =
+            ImmutableList.of(EXPECTED_HIGHLY_NESTED_DEREFERENCE_PROJECTION);
 
     private static final Set<DeltaLakeColumnHandle> PREDICATE_COLUMNS =
             ImmutableSet.of(BOOLEAN_COLUMN_HANDLE, DOUBLE_COLUMN_HANDLE);
@@ -136,7 +206,7 @@ public class TestDeltaLakeMetadata
     private File temporaryCatalogDirectory;
     private DeltaLakeMetadataFactory deltaLakeMetadataFactory;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws IOException
     {
@@ -163,23 +233,15 @@ public void setUp()
                 // test setup
                 binder -> {
                     binder.bind(HdfsEnvironment.class).toInstance(HDFS_ENVIRONMENT);
-                    binder.install(new HdfsFileSystemModule());
+                    binder.bind(TrinoHdfsFileSystemStats.class).toInstance(HDFS_FILE_SYSTEM_STATS);
+                    binder.bind(TrinoFileSystemFactory.class).to(HdfsFileSystemFactory.class).in(Scopes.SINGLETON);
                 },
                 new AbstractModule()
                 {
                     @Provides
-                    public DeltaLakeMetastore getDeltaLakeMetastore(
-                            @RawHiveMetastoreFactory HiveMetastoreFactory hiveMetastoreFactory,
-                            TransactionLogAccess transactionLogAccess,
-                            TypeManager typeManager,
-                            CachingExtendedStatisticsAccess statistics)
+                    public DeltaLakeMetastore getDeltaLakeMetastore(@RawHiveMetastoreFactory HiveMetastoreFactory hiveMetastoreFactory)
                     {
-                        return new HiveMetastoreBackedDeltaLakeMetastore(
-                                hiveMetastoreFactory.createMetastore(Optional.empty()),
-                                transactionLogAccess,
-                                typeManager,
-                                statistics,
-                                new HdfsFileSystemFactory(HDFS_ENVIRONMENT));
+                        return new HiveMetastoreBackedDeltaLakeMetastore(hiveMetastoreFactory.createMetastore(Optional.empty()));
                     }
                 });
 
@@ -199,7 +261,7 @@ public DeltaLakeMetastore getDeltaLakeMetastore(
                         .build());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -291,7 +353,9 @@ private ConnectorTableMetadata newTableMetadata(List<ColumnMetadata> tableColumn
                 tableColumns,
                 ImmutableMap.of(
                         PARTITIONED_BY_PROPERTY,
-                        getPartitionColumnNames(partitionTableColumns)));
+                        getPartitionColumnNames(partitionTableColumns),
+                        COLUMN_MAPPING_MODE_PROPERTY,
+                        "none"));
     }
 
     @Test
@@ -312,59 +376,63 @@ public void testGetInsertLayoutTableUnpartitioned()
                 .isNotPresent();
     }
 
-    @DataProvider
-    public Object[][] testApplyProjectionProvider()
+    @Test
+    public void testApplyProjection()
     {
-        return new Object[][] {
-                {
-                        ImmutableSet.of(),
-                        SYNTHETIC_COLUMN_ASSIGNMENTS,
-                        SIMPLE_COLUMN_PROJECTIONS,
-                        SIMPLE_COLUMN_PROJECTIONS,
-                        ImmutableSet.of(BOGUS_COLUMN_HANDLE, VARCHAR_COLUMN_HANDLE)
-                },
-                {
-                        // table handle already contains subset of expected projected columns
-                        ImmutableSet.of(BOGUS_COLUMN_HANDLE),
-                        SYNTHETIC_COLUMN_ASSIGNMENTS,
-                        SIMPLE_COLUMN_PROJECTIONS,
-                        SIMPLE_COLUMN_PROJECTIONS,
-                        ImmutableSet.of(BOGUS_COLUMN_HANDLE, VARCHAR_COLUMN_HANDLE)
-                },
-                {
-                        // table handle already contains superset of expected projected columns
-                        ImmutableSet.of(DOUBLE_COLUMN_HANDLE, BOOLEAN_COLUMN_HANDLE, DATE_COLUMN_HANDLE, BOGUS_COLUMN_HANDLE, VARCHAR_COLUMN_HANDLE),
-                        SYNTHETIC_COLUMN_ASSIGNMENTS,
-                        SIMPLE_COLUMN_PROJECTIONS,
-                        SIMPLE_COLUMN_PROJECTIONS,
-                        ImmutableSet.of(BOGUS_COLUMN_HANDLE, VARCHAR_COLUMN_HANDLE)
-                },
-                {
-                        // table handle has empty assignments
-                        ImmutableSet.of(DOUBLE_COLUMN_HANDLE, BOOLEAN_COLUMN_HANDLE, DATE_COLUMN_HANDLE, BOGUS_COLUMN_HANDLE, VARCHAR_COLUMN_HANDLE),
-                        ImmutableMap.of(),
-                        SIMPLE_COLUMN_PROJECTIONS,
-                        SIMPLE_COLUMN_PROJECTIONS,
-                        ImmutableSet.of()
-                },
-                {
-                        // table handle has dereference column projections (which should be filtered out)
-                        ImmutableSet.of(DOUBLE_COLUMN_HANDLE, BOOLEAN_COLUMN_HANDLE, DATE_COLUMN_HANDLE, BOGUS_COLUMN_HANDLE, VARCHAR_COLUMN_HANDLE),
-                        ImmutableMap.of(),
-                        DEREFERENCE_COLUMN_PROJECTIONS,
-                        SIMPLE_COLUMN_PROJECTIONS,
-                        ImmutableSet.of()
-                }
-        };
+        testApplyProjection(
+                ImmutableSet.of(),
+                SYNTHETIC_COLUMN_ASSIGNMENTS,
+                SIMPLE_COLUMN_PROJECTIONS,
+                SIMPLE_COLUMN_PROJECTIONS,
+                ImmutableSet.of(BOGUS_COLUMN_HANDLE, VARCHAR_COLUMN_HANDLE),
+                SYNTHETIC_COLUMN_ASSIGNMENTS);
+        testApplyProjection(
+                // table handle already contains subset of expected projected columns
+                ImmutableSet.of(BOGUS_COLUMN_HANDLE),
+                SYNTHETIC_COLUMN_ASSIGNMENTS,
+                SIMPLE_COLUMN_PROJECTIONS,
+                SIMPLE_COLUMN_PROJECTIONS,
+                ImmutableSet.of(BOGUS_COLUMN_HANDLE, VARCHAR_COLUMN_HANDLE),
+                SYNTHETIC_COLUMN_ASSIGNMENTS);
+        testApplyProjection(
+                // table handle already contains superset of expected projected columns
+                ImmutableSet.of(DOUBLE_COLUMN_HANDLE, BOOLEAN_COLUMN_HANDLE, DATE_COLUMN_HANDLE, BOGUS_COLUMN_HANDLE, VARCHAR_COLUMN_HANDLE),
+                SYNTHETIC_COLUMN_ASSIGNMENTS,
+                SIMPLE_COLUMN_PROJECTIONS,
+                SIMPLE_COLUMN_PROJECTIONS,
+                ImmutableSet.of(BOGUS_COLUMN_HANDLE, VARCHAR_COLUMN_HANDLE),
+                SYNTHETIC_COLUMN_ASSIGNMENTS);
+        testApplyProjection(
+                // table handle has empty assignments
+                ImmutableSet.of(DOUBLE_COLUMN_HANDLE, BOOLEAN_COLUMN_HANDLE, DATE_COLUMN_HANDLE, BOGUS_COLUMN_HANDLE, VARCHAR_COLUMN_HANDLE),
+                ImmutableMap.of(),
+                SIMPLE_COLUMN_PROJECTIONS,
+                SIMPLE_COLUMN_PROJECTIONS,
+                ImmutableSet.of(),
+                ImmutableMap.of());
+        testApplyProjection(
+                ImmutableSet.of(DOUBLE_COLUMN_HANDLE, BOOLEAN_COLUMN_HANDLE, DATE_COLUMN_HANDLE, BOGUS_COLUMN_HANDLE, VARCHAR_COLUMN_HANDLE),
+                ImmutableMap.of(),
+                DEREFERENCE_COLUMN_PROJECTIONS,
+                DEREFERENCE_COLUMN_PROJECTIONS,
+                ImmutableSet.of(),
+                ImmutableMap.of());
+        testApplyProjection(
+                ImmutableSet.of(NESTED_COLUMN_HANDLE),
+                NESTED_COLUMN_ASSIGNMENTS,
+                NESTED_DEREFERENCE_COLUMN_PROJECTIONS,
+                EXPECTED_NESTED_DEREFERENCE_COLUMN_PROJECTIONS,
+                ImmutableSet.of(EXPECTED_NESTED_COLUMN_HANDLE),
+                EXPECTED_NESTED_COLUMN_ASSIGNMENTS);
     }
 
-    @Test(dataProvider = "testApplyProjectionProvider")
-    public void testApplyProjection(
-            Set<ColumnHandle> inputProjectedColumns,
+    private void testApplyProjection(
+            Set<DeltaLakeColumnHandle> inputProjectedColumns,
             Map<String, ColumnHandle> inputAssignments,
             List<ConnectorExpression> inputProjections,
             List<ConnectorExpression> expectedProjections,
-            Set<ColumnHandle> expectedProjectedColumns)
+            Set<DeltaLakeColumnHandle> expectedProjectedColumns,
+            Map<String, ColumnHandle> expectedAssignments)
     {
         DeltaLakeMetadata deltaLakeMetadata = deltaLakeMetadataFactory.create(SESSION.getIdentity());
 
@@ -376,8 +444,7 @@ public void testApplyProjection(
                         inputAssignments)
                 .get();
 
-        assertThat(((DeltaLakeTableHandle) projection.getHandle())
-                .getProjectedColumns())
+        assertThat(((DeltaLakeTableHandle) projection.getHandle()).getProjectedColumns())
                 .isEqualTo(Optional.of(expectedProjectedColumns));
 
         assertThat(projection.getProjections())
@@ -386,7 +453,7 @@ public void testApplyProjection(
 
         assertThat(projection.getAssignments())
                 .usingRecursiveComparison()
-                .isEqualTo(createNewColumnAssignments(inputAssignments));
+                .isEqualTo(createNewColumnAssignments(expectedAssignments));
 
         assertThat(projection.isPrecalculateStatistics())
                 .isFalse();
@@ -440,13 +507,15 @@ public void testGetInputInfoForUnPartitionedTable()
         assertThat(deltaLakeMetadata.getInfo(tableHandle)).isEqualTo(Optional.of(new DeltaLakeInputInfo(false)));
     }
 
-    private static DeltaLakeTableHandle createDeltaLakeTableHandle(Set<ColumnHandle> projectedColumns, Set<DeltaLakeColumnHandle> constrainedColumns)
+    private static DeltaLakeTableHandle createDeltaLakeTableHandle(Set<DeltaLakeColumnHandle> projectedColumns, Set<DeltaLakeColumnHandle> constrainedColumns)
     {
         return new DeltaLakeTableHandle(
                 "test_schema_name",
                 "test_table_name",
+                true,
                 "test_location",
                 createMetadataEntry(),
+                new ProtocolEntry(1, 2, Optional.empty(), Optional.empty()),
                 createConstrainedColumnsTuple(constrainedColumns),
                 TupleDomain.all(),
                 Optional.of(DeltaLakeTableHandle.WriteType.UPDATE),
@@ -454,8 +523,7 @@ private static DeltaLakeTableHandle createDeltaLakeTableHandle(Set<ColumnHandle>
                 Optional.of(ImmutableList.of(BOOLEAN_COLUMN_HANDLE)),
                 Optional.of(ImmutableList.of(DOUBLE_COLUMN_HANDLE)),
                 Optional.empty(),
-                0,
-                false);
+                0);
     }
 
     private static TupleDomain<DeltaLakeColumnHandle> createConstrainedColumnsTuple(
@@ -464,7 +532,8 @@ private static TupleDomain<DeltaLakeColumnHandle> createConstrainedColumnsTuple(
         ImmutableMap.Builder<DeltaLakeColumnHandle, Domain> tupleBuilder = ImmutableMap.builder();
 
         constrainedColumns.forEach(column -> {
-            tupleBuilder.put(column, Domain.notNull(column.getType()));
+            verify(column.isBaseColumn(), "Unexpected dereference: %s", column);
+            tupleBuilder.put(column, Domain.notNull(column.getBaseType()));
         });
 
         return TupleDomain.withColumnDomains(tupleBuilder.buildOrThrow());
@@ -473,10 +542,14 @@ private static TupleDomain<DeltaLakeColumnHandle> createConstrainedColumnsTuple(
     private static List<Assignment> createNewColumnAssignments(Map<String, ColumnHandle> assignments)
     {
         return assignments.entrySet().stream()
-                .map(assignment -> new Assignment(
-                        assignment.getKey(),
-                        assignment.getValue(),
-                        ((DeltaLakeColumnHandle) assignment.getValue()).getType()))
+                .map(assignment -> {
+                    DeltaLakeColumnHandle column = ((DeltaLakeColumnHandle) assignment.getValue());
+                    Type type = column.getProjectionInfo().map(DeltaLakeColumnProjectionInfo::getType).orElse(column.getBaseType());
+                    return new Assignment(
+                            assignment.getKey(),
+                            assignment.getValue(),
+                            type);
+                })
                 .collect(toImmutableList());
     }
 
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeMinioAndHmsConnectorSmokeTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeMinioAndHmsConnectorSmokeTest.java
new file mode 100644
index 000000000000..2251f8a88202
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeMinioAndHmsConnectorSmokeTest.java
@@ -0,0 +1,279 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import io.airlift.json.ObjectMapperProvider;
+import io.airlift.units.Duration;
+import io.trino.plugin.deltalake.transactionlog.writer.S3NativeTransactionLogSynchronizer;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.assertions.Assert.assertEventually;
+import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
+import static io.trino.testing.containers.Minio.MINIO_REGION;
+import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
+import static java.lang.String.format;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+/**
+ * Delta Lake connector smoke test exercising Hive metastore and MinIO storage.
+ */
+public class TestDeltaLakeMinioAndHmsConnectorSmokeTest
+        extends BaseDeltaLakeAwsConnectorSmokeTest
+{
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapperProvider().get();
+
+    @Override
+    protected Map<String, String> hiveStorageConfiguration()
+    {
+        return ImmutableMap.<String, String>builder()
+                .put("hive.s3.aws-access-key", MINIO_ACCESS_KEY)
+                .put("hive.s3.aws-secret-key", MINIO_SECRET_KEY)
+                .put("hive.s3.endpoint", hiveMinioDataLake.getMinio().getMinioAddress())
+                .put("hive.s3.path-style-access", "true")
+                .put("hive.s3.max-connections", "2")
+                .buildOrThrow();
+    }
+
+    @Override
+    protected Map<String, String> deltaStorageConfiguration()
+    {
+        return ImmutableMap.<String, String>builder()
+                .put("fs.hadoop.enabled", "false")
+                .put("fs.native-s3.enabled", "true")
+                .put("s3.aws-access-key", MINIO_ACCESS_KEY)
+                .put("s3.aws-secret-key", MINIO_SECRET_KEY)
+                .put("s3.region", MINIO_REGION)
+                .put("s3.endpoint", hiveMinioDataLake.getMinio().getMinioAddress())
+                .put("s3.path-style-access", "true")
+                .put("s3.streaming.part-size", "5MB") // minimize memory usage
+                .put("s3.max-connections", "4") // verify no leaks
+                .put("delta.enable-non-concurrent-writes", "true")
+                .buildOrThrow();
+    }
+
+    @Test
+    public void testWritesLocked()
+            throws Exception
+    {
+        testWritesLocked("INSERT INTO %s VALUES (3, 'kota'), (4, 'psa')");
+        testWritesLocked("UPDATE %s SET a_string = 'kota' WHERE a_number = 2");
+        testWritesLocked("DELETE FROM %s WHERE a_number = 1");
+    }
+
+    private void testWritesLocked(String writeStatement)
+            throws Exception
+    {
+        String tableName = "test_writes_locked" + randomNameSuffix();
+        try {
+            assertUpdate(
+                    format("CREATE TABLE %s (a_number, a_string) WITH (location = 's3://%s/%s') AS " +
+                                    "VALUES (1, 'ala'), (2, 'ma')",
+                            tableName,
+                            bucketName,
+                            tableName),
+                    2);
+
+            Set<String> originalFiles = ImmutableSet.copyOf(getTableFiles(tableName));
+            assertThat(originalFiles).isNotEmpty(); // sanity check
+
+            String lockFilePath = lockTable(tableName, java.time.Duration.ofMinutes(5));
+            assertThatThrownBy(() -> computeActual(format(writeStatement, tableName)))
+                    .hasStackTraceContaining("Transaction log locked(1); lockingCluster=some_cluster; lockingQuery=some_query");
+            assertThat(listLocks(tableName)).containsExactly(lockFilePath); // we should not delete exising, not-expired lock
+
+            // files from failed write should be cleaned up
+            Set<String> expectedFiles = ImmutableSet.<String>builder()
+                    .addAll(originalFiles)
+                    .add(lockFilePath)
+                    .build();
+            assertEventually(
+                    new Duration(5, TimeUnit.SECONDS),
+                    () -> assertThat(getTableFiles(tableName)).containsExactlyInAnyOrderElementsOf(expectedFiles));
+        }
+        finally {
+            assertUpdate("DROP TABLE " + tableName);
+        }
+    }
+
+    @Test
+    public void testWritesLockExpired()
+            throws Exception
+    {
+        testWritesLockExpired("INSERT INTO %s VALUES (3, 'kota')", "VALUES (1,'ala'), (2,'ma'), (3,'kota')");
+        testWritesLockExpired("UPDATE %s SET a_string = 'kota' WHERE a_number = 2", "VALUES (1,'ala'), (2,'kota')");
+        testWritesLockExpired("DELETE FROM %s WHERE a_number = 2", "VALUES (1,'ala')");
+    }
+
+    private void testWritesLockExpired(String writeStatement, String expectedValues)
+            throws Exception
+    {
+        String tableName = "test_writes_locked" + randomNameSuffix();
+        assertUpdate(
+                format("CREATE TABLE %s (a_number, a_string) WITH (location = 's3://%s/%s') AS " +
+                                "VALUES (1, 'ala'), (2, 'ma')",
+                        tableName,
+                        bucketName,
+                        tableName),
+                2);
+
+        lockTable(tableName, java.time.Duration.ofSeconds(-5));
+        assertUpdate(format(writeStatement, tableName), 1);
+        assertQuery("SELECT * FROM " + tableName, expectedValues);
+        assertThat(listLocks(tableName)).isEmpty(); // expired lock should be cleaned up
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testWritesLockInvalidContents()
+    {
+        testWritesLockInvalidContents("INSERT INTO %s VALUES (3, 'kota')", "VALUES (1,'ala'), (2,'ma'), (3,'kota')");
+        testWritesLockInvalidContents("UPDATE %s SET a_string = 'kota' WHERE a_number = 2", "VALUES (1,'ala'), (2,'kota')");
+        testWritesLockInvalidContents("DELETE FROM %s WHERE a_number = 2", "VALUES (1,'ala')");
+    }
+
+    private void testWritesLockInvalidContents(String writeStatement, String expectedValues)
+    {
+        String tableName = "test_writes_locked" + randomNameSuffix();
+        assertUpdate(
+                format("CREATE TABLE %s (a_number, a_string) WITH (location = 's3://%s/%s') AS " +
+                                "VALUES (1, 'ala'), (2, 'ma')",
+                        tableName,
+                        bucketName,
+                        tableName),
+                2);
+
+        String lockFilePath = invalidLockTable(tableName);
+        assertUpdate(format(writeStatement, tableName), 1);
+        assertQuery("SELECT * FROM " + tableName, expectedValues);
+        assertThat(listLocks(tableName)).containsExactly(lockFilePath); // we should not delete unparsable lock file
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testDeltaColumnInvariant()
+    {
+        String tableName = "test_invariants_" + randomNameSuffix();
+        hiveMinioDataLake.copyResources("deltalake/invariants", tableName);
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(SCHEMA, tableName, getLocationForTable(bucketName, tableName)));
+
+        assertQuery("SELECT * FROM " + tableName, "VALUES 1");
+        assertUpdate("INSERT INTO " + tableName + " VALUES(2)", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES (1), (2)");
+
+        assertThatThrownBy(() -> query("INSERT INTO " + tableName + " VALUES(3)"))
+                .hasMessageContaining("Check constraint violation: (\"dummy\" < 3)");
+        assertThatThrownBy(() -> query("UPDATE " + tableName + " SET dummy = 3 WHERE dummy = 1"))
+                .hasMessageContaining("Check constraint violation: (\"dummy\" < 3)");
+
+        assertQuery("SELECT * FROM " + tableName, "VALUES (1), (2)");
+    }
+
+    /**
+     * @see databricks122.invariants_writer_feature
+     */
+    @Test
+    public void testDeltaColumnInvariantWriterFeature()
+    {
+        String tableName = "test_invariants_writer_feature_" + randomNameSuffix();
+        hiveMinioDataLake.copyResources("databricks122/invariants_writer_feature", tableName);
+        assertUpdate("CALL system.register_table('%s', '%s', '%s')".formatted(SCHEMA, tableName, getLocationForTable(bucketName, tableName)));
+
+        assertQuery("SELECT * FROM " + tableName, "VALUES 1");
+        assertUpdate("INSERT INTO " + tableName + " VALUES 2", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES 1, 2");
+
+        assertThatThrownBy(() -> query("INSERT INTO " + tableName + " VALUES 3"))
+                .hasMessageContaining("Check constraint violation: (\"col_invariants\" < 3)");
+        assertThatThrownBy(() -> query("UPDATE " + tableName + " SET col_invariants = 3 WHERE col_invariants = 1"))
+                .hasMessageContaining("Check constraint violation: (\"col_invariants\" < 3)");
+
+        assertQuery("SELECT * FROM " + tableName, "VALUES 1, 2");
+    }
+
+    @Test
+    public void testSchemaEvolutionOnTableWithColumnInvariant()
+    {
+        String tableName = "test_schema_evolution_on_table_with_column_invariant_" + randomNameSuffix();
+        hiveMinioDataLake.copyResources("deltalake/invariants", tableName);
+        getQueryRunner().execute(format(
+                "CALL system.register_table('%s', '%s', '%s')",
+                SCHEMA,
+                tableName,
+                getLocationForTable(bucketName, tableName)));
+
+        assertThatThrownBy(() -> query("INSERT INTO " + tableName + " VALUES(3)"))
+                .hasMessageContaining("Check constraint violation: (\"dummy\" < 3)");
+
+        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN c INT");
+        assertUpdate("COMMENT ON COLUMN " + tableName + ".c IS 'example column comment'");
+        assertUpdate("COMMENT ON TABLE " + tableName + " IS 'example table comment'");
+
+        assertThatThrownBy(() -> query("INSERT INTO " + tableName + " VALUES(3, 30)"))
+                .hasMessageContaining("Check constraint violation: (\"dummy\" < 3)");
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES(2, 20)", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES (1, NULL), (2, 20)");
+    }
+
+    private String lockTable(String tableName, java.time.Duration lockDuration)
+            throws Exception
+    {
+        String lockFilePath = format("%s/00000000000000000001.json.sb-lock_blah", getLockFileDirectory(tableName));
+        String lockFileContents = OBJECT_MAPPER.writeValueAsString(
+                new S3NativeTransactionLogSynchronizer.LockFileContents("some_cluster", "some_query", Instant.now().plus(lockDuration).toEpochMilli()));
+        hiveMinioDataLake.writeFile(lockFileContents.getBytes(UTF_8), lockFilePath);
+        String lockUri = format("s3://%s/%s", bucketName, lockFilePath);
+        assertThat(listLocks(tableName)).containsExactly(lockUri); // sanity check
+        return lockUri;
+    }
+
+    private String invalidLockTable(String tableName)
+    {
+        String lockFilePath = format("%s/00000000000000000001.json.sb-lock_blah", getLockFileDirectory(tableName));
+        String invalidLockFileContents = "some very wrong json contents";
+        hiveMinioDataLake.writeFile(invalidLockFileContents.getBytes(UTF_8), lockFilePath);
+        String lockUri = format("s3://%s/%s", bucketName, lockFilePath);
+        assertThat(listLocks(tableName)).containsExactly(lockUri); // sanity check
+        return lockUri;
+    }
+
+    private List<String> listLocks(String tableName)
+    {
+        List<String> paths = hiveMinioDataLake.listFiles(getLockFileDirectory(tableName));
+        return paths.stream()
+                .filter(path -> path.contains(".sb-lock_"))
+                .map(path -> format("s3://%s/%s", bucketName, path))
+                .collect(toImmutableList());
+    }
+
+    private String getLockFileDirectory(String tableName)
+    {
+        return format("%s/_delta_log/_sb_lock", tableName);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeOssDeltaLakeCompatibility.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeOssDeltaLakeCompatibility.java
new file mode 100644
index 000000000000..8393166248b6
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeOssDeltaLakeCompatibility.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+public class TestDeltaLakeOssDeltaLakeCompatibility
+        extends BaseDeltaLakeCompatibility
+{
+    public TestDeltaLakeOssDeltaLakeCompatibility()
+    {
+        super("io/trino/plugin/deltalake/testing/resources/ossdeltalake/");
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeOssDeltaLakeConnectorTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeOssDeltaLakeConnectorTest.java
deleted file mode 100644
index d19fbead5e60..000000000000
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeOssDeltaLakeConnectorTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.deltalake;
-
-public class TestDeltaLakeOssDeltaLakeConnectorTest
-        extends BaseDeltaLakeMinioConnectorTest
-{
-    public TestDeltaLakeOssDeltaLakeConnectorTest()
-    {
-        super("ossdeltalake-test-queries", "io/trino/plugin/deltalake/testing/resources/ossdeltalake/");
-    }
-}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePageSink.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePageSink.java
index 6aa43d6ab996..1494aeb6552c 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePageSink.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePageSink.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.deltalake;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
 import io.airlift.slice.Slice;
@@ -35,19 +36,21 @@
 import io.trino.tpch.LineItemColumn;
 import io.trino.tpch.LineItemGenerator;
 import io.trino.tpch.TpchColumnType;
-import io.trino.type.BlockTypeOperators;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.nio.file.Files;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
@@ -55,7 +58,11 @@
 import static io.trino.plugin.deltalake.DeltaLakeMetadata.DEFAULT_READER_VERSION;
 import static io.trino.plugin.deltalake.DeltaLakeMetadata.DEFAULT_WRITER_VERSION;
 import static io.trino.plugin.deltalake.DeltaTestingConnectorSession.SESSION;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.ColumnMappingMode.NONE;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.serializeColumnType;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.serializeSchemaAsJson;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DateType.DATE;
 import static io.trino.spi.type.DoubleType.DOUBLE;
@@ -153,6 +160,14 @@ private static ConnectorPageSink createPageSink(String outputPath, DeltaLakeWrit
     {
         HiveTransactionHandle transaction = new HiveTransactionHandle(false);
         DeltaLakeConfig deltaLakeConfig = new DeltaLakeConfig();
+        String schemaString = serializeSchemaAsJson(
+                getColumnHandles().stream().map(DeltaLakeColumnHandle::getColumnName).collect(toImmutableList()),
+                getColumnHandles().stream()
+                        .map(column -> Map.entry(column.getColumnName(), serializeColumnType(NONE, new AtomicInteger(), column.getType())))
+                        .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue)),
+                ImmutableMap.of(),
+                ImmutableMap.of(),
+                ImmutableMap.of());
         DeltaLakeOutputTableHandle tableHandle = new DeltaLakeOutputTableHandle(
                 SCHEMA_NAME,
                 TABLE_NAME,
@@ -162,11 +177,14 @@ private static ConnectorPageSink createPageSink(String outputPath, DeltaLakeWrit
                 true,
                 Optional.empty(),
                 Optional.of(false),
-                new ProtocolEntry(DEFAULT_READER_VERSION, DEFAULT_WRITER_VERSION));
+                schemaString,
+                NONE,
+                OptionalInt.empty(),
+                new ProtocolEntry(DEFAULT_READER_VERSION, DEFAULT_WRITER_VERSION, Optional.empty(), Optional.empty()));
 
         DeltaLakePageSinkProvider provider = new DeltaLakePageSinkProvider(
-                new GroupByHashPageIndexerFactory(new JoinCompiler(new TypeOperators()), new BlockTypeOperators()),
-                new HdfsFileSystemFactory(HDFS_ENVIRONMENT),
+                new GroupByHashPageIndexerFactory(new JoinCompiler(new TypeOperators())),
+                new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS),
                 JsonCodec.jsonCodec(DataFileInfo.class),
                 JsonCodec.jsonCodec(DeltaLakeMergeResult.class),
                 stats,
@@ -188,7 +206,8 @@ private static List<DeltaLakeColumnHandle> getColumnHandles()
                     OptionalInt.empty(),
                     column.getColumnName(),
                     getTrinoType(column.getType()),
-                    REGULAR));
+                    REGULAR,
+                    Optional.empty()));
         }
         return handles.build();
     }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeParquetSchemas.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeParquetSchemas.java
new file mode 100644
index 000000000000..bf671b7fdc2f
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeParquetSchemas.java
@@ -0,0 +1,356 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport;
+import io.trino.spi.type.TestingTypeManager;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeManager;
+import org.apache.parquet.schema.LogicalTypeAnnotation;
+import org.apache.parquet.schema.PrimitiveType;
+import org.apache.parquet.schema.Types;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static io.trino.plugin.deltalake.DeltaLakeParquetSchemas.createParquetSchemaMapping;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static org.apache.parquet.schema.Type.Repetition.OPTIONAL;
+import static org.apache.parquet.schema.Type.Repetition.REQUIRED;
+import static org.testng.Assert.assertEquals;
+
+public class TestDeltaLakeParquetSchemas
+{
+    private final TypeManager typeManager = new TestingTypeManager();
+
+    @Test
+    public void testStringFieldColumnMappingNoneUnpartitioned()
+    {
+        @Language("JSON")
+        String jsonSchema = """
+                {
+                    "type": "struct",
+                    "fields": [
+                        {
+                            "name": "a_string",
+                            "type": "string",
+                            "nullable": true,
+                            "metadata": {}
+                        }
+                    ]
+                }
+                """;
+        DeltaLakeSchemaSupport.ColumnMappingMode columnMappingMode = DeltaLakeSchemaSupport.ColumnMappingMode.NONE;
+        List<String> partitionColumnNames = ImmutableList.of();
+        org.apache.parquet.schema.Type expectedMessageType = Types.buildMessage()
+                .addField(Types.primitive(PrimitiveType.PrimitiveTypeName.BINARY, OPTIONAL)
+                        .as(LogicalTypeAnnotation.stringType())
+                        .named("a_string"))
+                .named("trino_schema");
+        Map<List<String>, Type> expectedPrimitiveTypes = ImmutableMap.<List<String>, Type>builder()
+                .put(List.of("a_string"), VARCHAR)
+                .buildOrThrow();
+
+        assertParquetSchemaMappingCreationAccuracy(jsonSchema, columnMappingMode, partitionColumnNames, expectedMessageType, expectedPrimitiveTypes);
+    }
+
+    @Test
+    public void testStringFieldColumnMappingNonePartitioned()
+    {
+        @Language("JSON")
+        String jsonSchema = """
+                {
+                     "type": "struct",
+                     "fields": [
+                         {
+                             "name": "a_string",
+                             "type": "string",
+                             "nullable": true,
+                             "metadata": {}
+                         },
+                         {
+                             "name": "part",
+                             "type": "string",
+                             "nullable": true,
+                             "metadata": {}
+                         }
+                     ]
+                 }
+                """;
+        DeltaLakeSchemaSupport.ColumnMappingMode columnMappingMode = DeltaLakeSchemaSupport.ColumnMappingMode.NONE;
+        List<String> partitionColumnNames = ImmutableList.of("part");
+        org.apache.parquet.schema.Type expectedMessageType = Types.buildMessage()
+                .addField(Types.primitive(PrimitiveType.PrimitiveTypeName.BINARY, OPTIONAL)
+                        .as(LogicalTypeAnnotation.stringType())
+                        .named("a_string"))
+                .named("trino_schema");
+        Map<List<String>, Type> expectedPrimitiveTypes = ImmutableMap.<List<String>, Type>builder()
+                .put(List.of("a_string"), VARCHAR)
+                .buildOrThrow();
+
+        assertParquetSchemaMappingCreationAccuracy(jsonSchema, columnMappingMode, partitionColumnNames, expectedMessageType, expectedPrimitiveTypes);
+    }
+
+    @Test
+    public void testStringFieldColumnMappingIdUnpartitioned()
+    {
+        @Language("JSON")
+        String jsonSchema = """
+                {
+                    "type": "struct",
+                    "fields": [
+                        {
+                            "name": "a_string",
+                            "type": "string",
+                            "nullable": true,
+                            "metadata": {
+                                "delta.columnMapping.id": 1,
+                                "delta.columnMapping.physicalName": "col-eafe32e6-bd93-47f7-8921-34b7a4e66a06"
+                            }
+                        }
+                    ]
+                }
+                """;
+        org.apache.parquet.schema.Type expectedMessageType = Types.buildMessage()
+                .addField(Types.primitive(PrimitiveType.PrimitiveTypeName.BINARY, OPTIONAL)
+                        .as(LogicalTypeAnnotation.stringType())
+                        .id(1)
+                        .named("col-eafe32e6-bd93-47f7-8921-34b7a4e66a06"))
+                .named("trino_schema");
+        Map<List<String>, Type> expectedPrimitiveTypes = ImmutableMap.<List<String>, Type>builder()
+                .put(List.of("col-eafe32e6-bd93-47f7-8921-34b7a4e66a06"), VARCHAR)
+                .buildOrThrow();
+
+        assertParquetSchemaMappingCreationAccuracy(jsonSchema, DeltaLakeSchemaSupport.ColumnMappingMode.ID, ImmutableList.of(), expectedMessageType, expectedPrimitiveTypes);
+    }
+
+    @Test
+    public void testStringFieldColumnMappingIdPartitioned()
+    {
+        @Language("JSON")
+        String jsonSchema = """
+                {
+                    "type": "struct",
+                    "fields": [
+                        {
+                            "name": "a_string",
+                            "type": "string",
+                            "nullable": true,
+                            "metadata": {
+                                "delta.columnMapping.id": 1,
+                                "delta.columnMapping.physicalName": "col-40feefa6-d999-4c90-a923-190ecea9191c"
+                            }
+                        },
+                        {
+                            "name": "part",
+                            "type": "string",
+                            "nullable": true,
+                            "metadata": {
+                                "delta.columnMapping.id": 2,
+                                "delta.columnMapping.physicalName": "col-77789070-4b77-44b4-adf2-32d5df94f9e7"
+                            }
+                        }
+                    ]
+                }
+                """;
+        org.apache.parquet.schema.Type expectedMessageType = Types.buildMessage()
+                .addField(Types.primitive(PrimitiveType.PrimitiveTypeName.BINARY, OPTIONAL)
+                        .as(LogicalTypeAnnotation.stringType())
+                        .id(1)
+                        .named("col-40feefa6-d999-4c90-a923-190ecea9191c"))
+                .named("trino_schema");
+        Map<List<String>, Type> expectedPrimitiveTypes = ImmutableMap.<List<String>, Type>builder()
+                .put(List.of("col-40feefa6-d999-4c90-a923-190ecea9191c"), VARCHAR)
+                .buildOrThrow();
+
+        assertParquetSchemaMappingCreationAccuracy(jsonSchema, DeltaLakeSchemaSupport.ColumnMappingMode.ID, ImmutableList.of("part"), expectedMessageType, expectedPrimitiveTypes);
+    }
+
+    @Test
+    public void testStringFieldColumnMappingNameUnpartitioned()
+    {
+        @Language("JSON")
+        String jsonSchema = """
+                {
+                    "type": "struct",
+                    "fields": [
+                        {
+                            "name": "a_string",
+                            "type": "string",
+                            "nullable": true,
+                            "metadata": {
+                                "delta.columnMapping.id": 1,
+                                "delta.columnMapping.physicalName": "col-0200c2be-bb8d-4be8-b724-674d71074143"
+                            }
+                        }
+                    ]
+                }
+                """;
+        org.apache.parquet.schema.Type expectedMessageType = Types.buildMessage()
+                .addField(Types.primitive(PrimitiveType.PrimitiveTypeName.BINARY, OPTIONAL)
+                        .as(LogicalTypeAnnotation.stringType())
+                        .id(1)
+                        .named("col-0200c2be-bb8d-4be8-b724-674d71074143"))
+                .named("trino_schema");
+        Map<List<String>, Type> expectedPrimitiveTypes = ImmutableMap.<List<String>, Type>builder()
+                .put(List.of("col-0200c2be-bb8d-4be8-b724-674d71074143"), VARCHAR)
+                .buildOrThrow();
+
+        assertParquetSchemaMappingCreationAccuracy(jsonSchema, DeltaLakeSchemaSupport.ColumnMappingMode.ID, ImmutableList.of(), expectedMessageType, expectedPrimitiveTypes);
+    }
+
+    @Test
+    public void testRowFieldColumnMappingNameUnpartitioned()
+    {
+        // Corresponds to Databricks Delta type `a_complex_struct STRUCT<nested_struct: STRUCT<a_string: STRING>, a_string_array ARRAY<STRING>, a_complex_map MAP<STRING, STRUCT<a_string: STRING>>>`
+        @Language("JSON")
+        String jsonSchema = """
+                {
+                    "type": "struct",
+                    "fields": [
+                        {
+                            "name": "a_complex_struct",
+                            "type": {
+                                "type": "struct",
+                                "fields": [
+                                    {
+                                        "name": "nested_struct",
+                                        "type": {
+                                            "type": "struct",
+                                            "fields": [
+                                                {
+                                                    "name": "a_string",
+                                                    "type": "string",
+                                                    "nullable": true,
+                                                    "metadata": {
+                                                        "delta.columnMapping.id": 3,
+                                                        "delta.columnMapping.physicalName": "col-1830cfed-bdd2-43c4-98c8-f2685cff6faf"
+                                                    }
+                                                }
+                                            ]
+                                        },
+                                        "nullable": true,
+                                        "metadata": {
+                                            "delta.columnMapping.id": 2,
+                                            "delta.columnMapping.physicalName": "col-5e0e4060-8e54-427b-8a8d-72a4fd6b67bd"
+                                        }
+                                    },
+                                    {
+                                        "name": "a_string_array",
+                                        "type": {
+                                            "type": "array",
+                                            "elementType": "string",
+                                            "containsNull": true
+                                        },
+                                        "nullable": true,
+                                        "metadata": {
+                                            "delta.columnMapping.id": 4,
+                                            "delta.columnMapping.physicalName": "col-ff99c229-b1ce-4971-bfbc-3a68fec3dfea"
+                                        }
+                                    },
+                                    {
+                                        "name": "a_complex_map",
+                                        "type": {
+                                            "type": "map",
+                                            "keyType": "string",
+                                            "valueType": {
+                                                "type": "struct",
+                                                "fields": [
+                                                    {
+                                                        "name": "a_string",
+                                                        "type": "string",
+                                                        "nullable": true,
+                                                        "metadata": {
+                                                            "delta.columnMapping.id": 6,
+                                                            "delta.columnMapping.physicalName": "col-5cb932a5-69aa-47e6-9d75-40f87bd8a239"
+                                                        }
+                                                    }
+                                                ]
+                                            },
+                                            "valueContainsNull": true
+                                        },
+                                        "nullable": true,
+                                        "metadata": {
+                                            "delta.columnMapping.id": 5,
+                                            "delta.columnMapping.physicalName": "col-85dededd-8dd2-4a81-ab3c-1439c1fd895a"
+                                        }
+                                    }
+                                ]
+                            },
+                            "nullable": true,
+                            "metadata": {
+                                "delta.columnMapping.id": 1,
+                                "delta.columnMapping.physicalName": "col-306694c6-846e-4c72-a3ea-976e4b19160a"
+                            }
+                        }
+                    ]
+                }
+                """;
+        org.apache.parquet.schema.Type expectedMessageType = Types.buildMessage()
+                .addField(Types.buildGroup(OPTIONAL)
+                        .addField(Types.buildGroup(OPTIONAL)
+                                .addField(Types.primitive(PrimitiveType.PrimitiveTypeName.BINARY, OPTIONAL)
+                                        .as(LogicalTypeAnnotation.stringType())
+                                        .id(3)
+                                        .named("col-1830cfed-bdd2-43c4-98c8-f2685cff6faf"))
+                                .id(2)
+                                .named("col-5e0e4060-8e54-427b-8a8d-72a4fd6b67bd"))
+                        .addField(Types.optionalList()
+                                .element(Types.primitive(PrimitiveType.PrimitiveTypeName.BINARY, OPTIONAL)
+                                        .as(LogicalTypeAnnotation.stringType())
+                                        .named("element"))
+                                .id(4)
+                                .named("col-ff99c229-b1ce-4971-bfbc-3a68fec3dfea"))
+                        .addField(Types.map(OPTIONAL)
+                                .key(Types.primitive(PrimitiveType.PrimitiveTypeName.BINARY, REQUIRED)
+                                        .as(LogicalTypeAnnotation.stringType())
+                                        .named("key"))
+                                .value(Types.buildGroup(OPTIONAL)
+                                        .addField(Types.primitive(PrimitiveType.PrimitiveTypeName.BINARY, OPTIONAL)
+                                                .as(LogicalTypeAnnotation.stringType())
+                                                .id(6)
+                                                .named("col-5cb932a5-69aa-47e6-9d75-40f87bd8a239"))
+                                        .named("value"))
+                                .id(5)
+                                .named("col-85dededd-8dd2-4a81-ab3c-1439c1fd895a"))
+                        .id(1)
+                        .named("col-306694c6-846e-4c72-a3ea-976e4b19160a"))
+                .named("trino_schema");
+        Map<List<String>, Type> expectedPrimitiveTypes = ImmutableMap.<List<String>, Type>builder()
+                .put(List.of("col-306694c6-846e-4c72-a3ea-976e4b19160a", "col-5e0e4060-8e54-427b-8a8d-72a4fd6b67bd", "col-1830cfed-bdd2-43c4-98c8-f2685cff6faf"), VARCHAR)
+                .put(List.of("col-306694c6-846e-4c72-a3ea-976e4b19160a", "col-ff99c229-b1ce-4971-bfbc-3a68fec3dfea", "list", "element"), VARCHAR)
+                .put(List.of("col-306694c6-846e-4c72-a3ea-976e4b19160a", "col-85dededd-8dd2-4a81-ab3c-1439c1fd895a", "key_value", "key"), VARCHAR)
+                .put(List.of("col-306694c6-846e-4c72-a3ea-976e4b19160a", "col-85dededd-8dd2-4a81-ab3c-1439c1fd895a", "key_value", "value", "col-5cb932a5-69aa-47e6-9d75-40f87bd8a239"), VARCHAR)
+                .buildOrThrow();
+
+        assertParquetSchemaMappingCreationAccuracy(
+                jsonSchema, DeltaLakeSchemaSupport.ColumnMappingMode.ID, ImmutableList.of(), expectedMessageType, expectedPrimitiveTypes);
+    }
+
+    private void assertParquetSchemaMappingCreationAccuracy(
+            @Language("JSON") String jsonSchema,
+            DeltaLakeSchemaSupport.ColumnMappingMode columnMappingMode,
+            List<String> partitionColumnNames,
+            org.apache.parquet.schema.Type expectedMessageType,
+            Map<List<String>, Type> expectedPrimitiveTypes)
+    {
+        DeltaLakeParquetSchemaMapping parquetSchemaMapping = createParquetSchemaMapping(jsonSchema, typeManager, columnMappingMode, partitionColumnNames);
+        assertEquals(parquetSchemaMapping.messageType(), expectedMessageType);
+        assertEquals(parquetSchemaMapping.primitiveTypes(), expectedPrimitiveTypes);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePartitioning.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePartitioning.java
index a387e8e434e1..3720624a77ac 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePartitioning.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePartitioning.java
@@ -16,14 +16,17 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createDeltaLakeQueryRunner;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakePartitioning
         extends AbstractTestQueryFramework
 {
@@ -34,7 +37,7 @@ protected QueryRunner createQueryRunner()
         return createDeltaLakeQueryRunner(DELTA_CATALOG, ImmutableMap.of(), ImmutableMap.of("delta.register-table-procedure.enabled", "true"));
     }
 
-    @BeforeClass
+    @BeforeAll
     public void registerTables()
     {
         String dataPath = getClass().getClassLoader().getResource("deltalake/partitions").toExternalForm();
@@ -141,7 +144,7 @@ public void testPartitionsSystemTableDoesNotExist()
     {
         assertQueryFails(
                 "SELECT * FROM \"partitions$partitions\"",
-                ".*'delta_lake\\.tpch\\.partitions\\$partitions' does not exist");
+                ".*'delta\\.tpch\\.partitions\\$partitions' does not exist");
     }
 
     @Test
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePerTransactionMetastoreCache.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePerTransactionMetastoreCache.java
index 0f8dd3a6cdec..9103e73a1f4c 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePerTransactionMetastoreCache.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePerTransactionMetastoreCache.java
@@ -16,96 +16,86 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultiset;
 import com.google.common.collect.Multiset;
+import com.google.common.reflect.ClassPath;
 import com.google.inject.Binder;
 import com.google.inject.Key;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
-import io.airlift.units.Duration;
 import io.trino.Session;
-import io.trino.plugin.hive.containers.HiveMinioDataLake;
+import io.trino.plugin.base.util.Closables;
 import io.trino.plugin.hive.metastore.CountingAccessHiveMetastore;
 import io.trino.plugin.hive.metastore.CountingAccessHiveMetastoreUtil;
 import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
 import io.trino.plugin.hive.metastore.RawHiveMetastoreFactory;
-import io.trino.plugin.hive.metastore.thrift.BridgingHiveMetastore;
-import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreConfig;
+import io.trino.plugin.hive.metastore.file.FileHiveMetastore;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchEntity;
 import io.trino.tpch.TpchTable;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
 
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
-import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
-import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Methods.GET_TABLE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_TABLE;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
-import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
-import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
 import static java.lang.String.format;
+import static java.nio.file.Files.createDirectories;
+import static java.nio.file.Files.write;
 import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.TimeUnit.MINUTES;
 
-@Test(singleThreaded = true) // tests use shared invocation counter map
 public class TestDeltaLakePerTransactionMetastoreCache
 {
-    private static final String BUCKET_NAME = "delta-lake-per-transaction-metastore-cache";
-    private HiveMinioDataLake hiveMinioDataLake;
     private CountingAccessHiveMetastore metastore;
 
     private DistributedQueryRunner createQueryRunner(boolean enablePerTransactionHiveMetastoreCaching)
             throws Exception
     {
-        boolean createdDeltaLake = false;
-        if (hiveMinioDataLake == null) {
-            // share environment between testcases to speed things up
-            hiveMinioDataLake = new HiveMinioDataLake(BUCKET_NAME);
-            hiveMinioDataLake.start();
-            createdDeltaLake = true;
-        }
         Session session = testSessionBuilder()
                 .setCatalog(DELTA_CATALOG)
                 .setSchema("default")
                 .build();
 
         DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session).build();
-
-        metastore = new CountingAccessHiveMetastore(new BridgingHiveMetastore(testingThriftHiveMetastoreBuilder()
-                .metastoreClient(hiveMinioDataLake.getHiveHadoop().getHiveMetastoreEndpoint())
-                .thriftMetastoreConfig(new ThriftMetastoreConfig()
-                        .setMetastoreTimeout(new Duration(1, MINUTES))) // read timed out sometimes happens with the default timeout
-                .build()));
-
-        queryRunner.installPlugin(new TestingDeltaLakePlugin(Optional.empty(), Optional.empty(), new CountingAccessMetastoreModule(metastore)));
-
-        ImmutableMap.Builder<String, String> deltaLakeProperties = ImmutableMap.builder();
-        deltaLakeProperties.put("hive.s3.aws-access-key", MINIO_ACCESS_KEY);
-        deltaLakeProperties.put("hive.s3.aws-secret-key", MINIO_SECRET_KEY);
-        deltaLakeProperties.put("hive.s3.endpoint", hiveMinioDataLake.getMinio().getMinioAddress());
-        deltaLakeProperties.put("hive.s3.path-style-access", "true");
-        deltaLakeProperties.put("hive.metastore", "test"); // use test value so we do not get clash with default bindings)
-        deltaLakeProperties.put("delta.register-table-procedure.enabled", "true");
-        if (!enablePerTransactionHiveMetastoreCaching) {
-            // almost disable the cache; 0 is not allowed as config property value
-            deltaLakeProperties.put("delta.per-transaction-metastore-cache-maximum-size", "1");
-        }
-
-        queryRunner.createCatalog(DELTA_CATALOG, "delta_lake", deltaLakeProperties.buildOrThrow());
-
-        if (createdDeltaLake) {
-            List<TpchTable<? extends TpchEntity>> tpchTables = List.of(TpchTable.NATION, TpchTable.REGION);
-            tpchTables.forEach(table -> {
+        try {
+            FileHiveMetastore fileMetastore = createTestingFileHiveMetastore(queryRunner.getCoordinator().getBaseDataDir().resolve("file-metastore").toFile());
+            metastore = new CountingAccessHiveMetastore(fileMetastore);
+            queryRunner.installPlugin(new TestingDeltaLakePlugin(Optional.empty(), Optional.empty(), new CountingAccessMetastoreModule(metastore)));
+
+            ImmutableMap.Builder<String, String> deltaLakeProperties = ImmutableMap.builder();
+            deltaLakeProperties.put("hive.metastore", "test"); // use test value so we do not get clash with default bindings)
+            deltaLakeProperties.put("delta.register-table-procedure.enabled", "true");
+            if (!enablePerTransactionHiveMetastoreCaching) {
+                // almost disable the cache; 0 is not allowed as config property value
+                deltaLakeProperties.put("delta.per-transaction-metastore-cache-maximum-size", "1");
+            }
+
+            queryRunner.createCatalog(DELTA_CATALOG, "delta_lake", deltaLakeProperties.buildOrThrow());
+            queryRunner.execute("CREATE SCHEMA " + session.getSchema().orElseThrow());
+
+            for (TpchTable<? extends TpchEntity> table : List.of(TpchTable.NATION, TpchTable.REGION)) {
                 String tableName = table.getTableName();
-                hiveMinioDataLake.copyResources("io/trino/plugin/deltalake/testing/resources/databricks/" + tableName, tableName);
-                queryRunner.execute(format("CALL %1$s.system.register_table('%2$s', '%3$s', 's3://%4$s/%3$s')",
-                        DELTA_CATALOG,
-                        "default",
-                        tableName,
-                        BUCKET_NAME));
-            });
+                String resourcePath = "io/trino/plugin/deltalake/testing/resources/databricks73/" + tableName + "/";
+                Path tableDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("%s-%s".formatted(tableName, randomNameSuffix()));
+
+                for (ClassPath.ResourceInfo resourceInfo : ClassPath.from(getClass().getClassLoader()).getResources()) {
+                    if (resourceInfo.getResourceName().startsWith(resourcePath)) {
+                        Path targetFile = tableDirectory.resolve(resourceInfo.getResourceName().substring(resourcePath.length()));
+                        createDirectories(targetFile.getParent());
+                        write(targetFile, resourceInfo.asByteSource().read());
+                    }
+                }
+
+                queryRunner.execute(format("CALL system.register_table(CURRENT_SCHEMA, '%s', '%s')", tableName, tableDirectory));
+            }
+        }
+        catch (Throwable e) {
+            Closables.closeAllSuppress(e, queryRunner);
+            throw e;
         }
 
         return queryRunner;
@@ -129,16 +119,6 @@ protected void setup(Binder binder)
         }
     }
 
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-            throws Exception
-    {
-        if (hiveMinioDataLake != null) {
-            hiveMinioDataLake.close();
-            hiveMinioDataLake = null;
-        }
-    }
-
     @Test
     public void testPerTransactionHiveMetastoreCachingEnabled()
             throws Exception
@@ -157,12 +137,9 @@ public void testPerTransactionHiveMetastoreCachingDisabled()
             throws Exception
     {
         try (DistributedQueryRunner queryRunner = createQueryRunner(false)) {
-            // Sanity check that getTable call is done more than twice if per-transaction cache is disabled.
-            // This is to be sure that `testPerTransactionHiveMetastoreCachingEnabled` passes because of per-transaction
-            // caching and not because of caching done by some other layer.
             assertMetastoreInvocations(queryRunner, "SELECT * FROM nation JOIN region ON nation.regionkey = region.regionkey",
                     ImmutableMultiset.builder()
-                            .addCopies(GET_TABLE, 12)
+                            .addCopies(GET_TABLE, 2)
                             .build());
         }
     }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePlugin.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePlugin.java
index 9b85235740fa..bbb315209d27 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePlugin.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePlugin.java
@@ -20,7 +20,7 @@
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -33,9 +33,9 @@ public class TestDeltaLakePlugin
     @Test
     public void testCreateConnector()
     {
-        Plugin plugin = new DeltaLakePlugin();
-        ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
-        factory.create("test", ImmutableMap.of("hive.metastore.uri", "thrift://foo:1234"), new TestingConnectorContext());
+        ConnectorFactory factory = getConnectorFactory();
+        factory.create("test", ImmutableMap.of("hive.metastore.uri", "thrift://foo:1234"), new TestingConnectorContext())
+                .shutdown();
     }
 
     @Test
@@ -43,20 +43,33 @@ public void testCreateTestingConnector()
     {
         Plugin plugin = new TestingDeltaLakePlugin();
         ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
-        factory.create("test", ImmutableMap.of("hive.metastore.uri", "thrift://foo:1234"), new TestingConnectorContext());
+        factory.create("test", ImmutableMap.of("hive.metastore.uri", "thrift://foo:1234"), new TestingConnectorContext())
+                .shutdown();
+    }
+
+    @Test
+    public void testTestingFileMetastore()
+    {
+        ConnectorFactory factory = getConnectorFactory();
+        factory.create(
+                        "test",
+                        ImmutableMap.of(
+                                "hive.metastore", "file",
+                                "hive.metastore.catalog.dir", "/tmp"),
+                        new TestingConnectorContext())
+                .shutdown();
     }
 
     @Test
     public void testThriftMetastore()
     {
-        Plugin plugin = new DeltaLakePlugin();
-        ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
+        ConnectorFactory factory = getConnectorFactory();
         factory.create(
-                "test",
-                ImmutableMap.of(
-                        "hive.metastore", "thrift",
-                        "hive.metastore.uri", "thrift://foo:1234"),
-                new TestingConnectorContext())
+                        "test",
+                        ImmutableMap.of(
+                                "hive.metastore", "thrift",
+                                "hive.metastore.uri", "thrift://foo:1234"),
+                        new TestingConnectorContext())
                 .shutdown();
 
         assertThatThrownBy(() -> factory.create(
@@ -74,14 +87,14 @@ public void testThriftMetastore()
     @Test
     public void testGlueMetastore()
     {
-        Plugin plugin = new DeltaLakePlugin();
-        ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
+        ConnectorFactory factory = getConnectorFactory();
         factory.create(
-                "test",
-                ImmutableMap.of(
-                        "hive.metastore", "glue",
-                        "hive.metastore.glue.region", "us-east-2"),
-                new TestingConnectorContext());
+                        "test",
+                        ImmutableMap.of(
+                                "hive.metastore", "glue",
+                                "hive.metastore.glue.region", "us-east-2"),
+                        new TestingConnectorContext())
+                .shutdown();
 
         assertThatThrownBy(() -> factory.create(
                 "test",
@@ -93,59 +106,34 @@ public void testGlueMetastore()
                 .hasMessageContaining("Error: Configuration property 'hive.metastore.uri' was not used");
     }
 
-    /**
-     * Verify the Alluxio metastore is not supported for Delta. Delta connector extends Hive connector and Hive connector supports Alluxio metastore.
-     * We explicitly disallow Alluxio metastore use with Delta.
-     */
-    @Test
-    public void testAlluxioMetastore()
-    {
-        Plugin plugin = new DeltaLakePlugin();
-        ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
-
-        assertThatThrownBy(() -> factory.create(
-                "test",
-                ImmutableMap.of("hive.metastore", "alluxio"),
-                new TestingConnectorContext()))
-                .hasMessageMatching("(?s)Unable to create injector, see the following errors:.*" +
-                        "Explicit bindings are required and HiveMetastoreFactory .* is not explicitly bound.*");
-
-        assertThatThrownBy(() -> factory.create(
-                "test",
-                ImmutableMap.of("hive.metastore", "alluxio-deprecated"),
-                new TestingConnectorContext()))
-                .hasMessageMatching("(?s)Unable to create injector, see the following errors:.*" +
-                        "Explicit bindings are required and HiveMetastoreFactory .* is not explicitly bound.*");
-    }
-
     @Test
     public void testNoCaching()
     {
-        Plugin plugin = new DeltaLakePlugin();
-        ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
+        ConnectorFactory factory = getConnectorFactory();
         factory.create("test",
-                ImmutableMap.of(
-                        "hive.metastore.uri", "thrift://foo:1234",
-                        "delta.metadata.cache-ttl", "0s"),
-                new TestingConnectorContext());
+                        ImmutableMap.of(
+                                "hive.metastore.uri", "thrift://foo:1234",
+                                "delta.metadata.cache-ttl", "0s"),
+                        new TestingConnectorContext())
+                .shutdown();
     }
 
     @Test
     public void testNoActiveDataFilesCaching()
     {
-        Plugin plugin = new DeltaLakePlugin();
-        ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
+        ConnectorFactory factory = getConnectorFactory();
         factory.create("test",
-                ImmutableMap.of(
-                        "hive.metastore.uri", "thrift://foo:1234",
-                        "delta.metadata.live-files.cache-ttl", "0s"),
-                new TestingConnectorContext());
+                        ImmutableMap.of(
+                                "hive.metastore.uri", "thrift://foo:1234",
+                                "delta.metadata.live-files.cache-ttl", "0s"),
+                        new TestingConnectorContext())
+                .shutdown();
     }
 
     @Test
     public void testHiveConfigIsNotBound()
     {
-        ConnectorFactory factory = getOnlyElement(new DeltaLakePlugin().getConnectorFactories());
+        ConnectorFactory factory = getConnectorFactory();
         assertThatThrownBy(() -> factory.create("test",
                 ImmutableMap.of(
                         "hive.metastore.uri", "thrift://foo:1234",
@@ -158,9 +146,7 @@ public void testHiveConfigIsNotBound()
     @Test
     public void testReadOnlyAllAccessControl()
     {
-        Plugin plugin = new DeltaLakePlugin();
-        ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
-
+        ConnectorFactory factory = getConnectorFactory();
         factory.create(
                         "test",
                         ImmutableMap.<String, String>builder()
@@ -174,9 +160,7 @@ public void testReadOnlyAllAccessControl()
     @Test
     public void testSystemAccessControl()
     {
-        Plugin plugin = new DeltaLakePlugin();
-        ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
-
+        ConnectorFactory factory = getConnectorFactory();
         Connector connector = factory.create(
                 "test",
                 ImmutableMap.<String, String>builder()
@@ -192,8 +176,7 @@ public void testSystemAccessControl()
     public void testFileBasedAccessControl()
             throws Exception
     {
-        Plugin plugin = new DeltaLakePlugin();
-        ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
+        ConnectorFactory factory = getConnectorFactory();
         File tempFile = File.createTempFile("test-delta-lake-plugin-access-control", ".json");
         tempFile.deleteOnExit();
         Files.writeString(tempFile.toPath(), "{}");
@@ -208,4 +191,9 @@ public void testFileBasedAccessControl()
                         new TestingConnectorContext())
                 .shutdown();
     }
+
+    private static ConnectorFactory getConnectorFactory()
+    {
+        return getOnlyElement(new DeltaLakePlugin().getConnectorFactories());
+    }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePreferredPartitioning.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePreferredPartitioning.java
index f3bcc8d092e7..b0ed424fef83 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePreferredPartitioning.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePreferredPartitioning.java
@@ -15,45 +15,70 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
-import io.trino.plugin.hive.containers.HiveMinioDataLake;
-import io.trino.plugin.hive.parquet.ParquetWriterConfig;
+import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import io.trino.testing.containers.Minio;
+import org.junit.jupiter.api.Test;
 
-import static com.google.common.base.Verify.verify;
-import static io.trino.SystemSessionProperties.PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS;
-import static io.trino.SystemSessionProperties.TASK_PARTITIONED_WRITER_COUNT;
+import static io.trino.SystemSessionProperties.TASK_MAX_WRITER_COUNT;
 import static io.trino.SystemSessionProperties.USE_PREFERRED_WRITE_PARTITIONING;
+import static io.trino.plugin.base.util.Closables.closeAllSuppress;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
-import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
+import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
 import static java.lang.String.format;
 import static java.util.UUID.randomUUID;
 
 public class TestDeltaLakePreferredPartitioning
         extends AbstractTestQueryFramework
 {
-    private static final String TEST_BUCKET_NAME = "mock-delta-lake-bucket";
     private static final int WRITE_PARTITIONING_TEST_PARTITIONS_COUNT = 101;
 
+    private final String bucketName = "mock-delta-lake-bucket-" + randomNameSuffix();
+    protected Minio minio;
+
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        verify(
-                !new ParquetWriterConfig().isParquetOptimizedWriterEnabled(),
-                "This test assumes the optimized Parquet writer is disabled by default");
-
-        HiveMinioDataLake hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(TEST_BUCKET_NAME));
-        hiveMinioDataLake.start();
-        return createS3DeltaLakeQueryRunner(
-                DELTA_CATALOG,
-                "default",
-                ImmutableMap.of(
-                        "delta.enable-non-concurrent-writes", "true",
-                        "delta.max-partitions-per-writer", String.valueOf(WRITE_PARTITIONING_TEST_PARTITIONS_COUNT - 1)),
-                hiveMinioDataLake.getMinio().getMinioAddress(),
-                hiveMinioDataLake.getHiveHadoop());
+        minio = closeAfterClass(Minio.builder().build());
+        minio.start();
+        minio.createBucket(bucketName);
+
+        String schema = "default";
+        Session session = testSessionBuilder()
+                .setCatalog(DELTA_CATALOG)
+                .setSchema(schema)
+                .build();
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session).build();
+        try {
+            queryRunner.installPlugin(new TpchPlugin());
+            queryRunner.createCatalog("tpch", "tpch");
+
+            queryRunner.installPlugin(new DeltaLakePlugin());
+            queryRunner.createCatalog(DELTA_CATALOG, DeltaLakeConnectorFactory.CONNECTOR_NAME, ImmutableMap.<String, String>builder()
+                    .put("hive.metastore", "file")
+                    .put("hive.metastore.catalog.dir", queryRunner.getCoordinator().getBaseDataDir().resolve("file-metastore").toString())
+                    .put("hive.s3.aws-access-key", MINIO_ACCESS_KEY)
+                    .put("hive.s3.aws-secret-key", MINIO_SECRET_KEY)
+                    .put("hive.s3.endpoint", minio.getMinioAddress())
+                    .put("hive.s3.path-style-access", "true")
+                    .put("delta.enable-non-concurrent-writes", "true")
+                    .put("delta.max-partitions-per-writer", String.valueOf(WRITE_PARTITIONING_TEST_PARTITIONS_COUNT - 1))
+                    .buildOrThrow());
+
+            queryRunner.execute("CREATE SCHEMA " + schema + " WITH (location = 's3://" + bucketName + "/" + schema + "')");
+        }
+        catch (Throwable e) {
+            closeAllSuppress(e, queryRunner);
+            throw e;
+        }
+
+        return queryRunner;
     }
 
     @Test
@@ -126,20 +151,19 @@ private static String generateRandomTableName()
         return "table_" + randomUUID().toString().replaceAll("-", "");
     }
 
-    private static String getLocationForTable(String tableName)
+    private String getLocationForTable(String tableName)
     {
-        return format("s3://%s/%s", TEST_BUCKET_NAME, tableName);
+        return format("s3://%s/%s", bucketName, tableName);
     }
 
     private Session withForcedPreferredPartitioning()
     {
         return Session.builder(getQueryRunner().getDefaultSession())
                 .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "true")
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
                 // It is important to explicitly set partitioned writer count to 1 since in above tests we are testing
                 // the open writers limit for partitions. So, with default value of 32 writer count, we will never
                 // hit that limit thus, tests will fail.
-                .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, "1")
+                .setSystemProperty(TASK_MAX_WRITER_COUNT, "1")
                 .build();
     }
 
@@ -150,7 +174,7 @@ private Session withoutPreferredPartitioning()
                 // It is important to explicitly set partitioned writer count to 1 since in above tests we are testing
                 // the open writers limit for partitions. So, with default value of 32 writer count, we will never
                 // hit that limit thus, tests will fail.
-                .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, "1")
+                .setSystemProperty(TASK_MAX_WRITER_COUNT, "1")
                 .build();
     }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeProjectionPushdownPlans.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeProjectionPushdownPlans.java
new file mode 100644
index 000000000000..07448e7d968f
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeProjectionPushdownPlans.java
@@ -0,0 +1,249 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import io.trino.Session;
+import io.trino.metadata.QualifiedObjectName;
+import io.trino.metadata.TableHandle;
+import io.trino.plugin.deltalake.metastore.TestingDeltaLakeMetastoreModule;
+import io.trino.plugin.hive.metastore.Database;
+import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.predicate.Domain;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.security.PrincipalType;
+import io.trino.sql.planner.assertions.BasePushdownPlanTest;
+import io.trino.testing.LocalQueryRunner;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.google.common.base.Predicates.equalTo;
+import static com.google.common.io.MoreFiles.deleteRecursively;
+import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
+import static com.google.inject.util.Modules.EMPTY_MODULE;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.any;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.join;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
+import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestDeltaLakeProjectionPushdownPlans
+        extends BasePushdownPlanTest
+{
+    private static final String CATALOG = "delta";
+    private static final String SCHEMA = "test_schema";
+
+    private File baseDir;
+
+    @Override
+    protected LocalQueryRunner createLocalQueryRunner()
+    {
+        Session session = testSessionBuilder()
+                .setCatalog(CATALOG)
+                .setSchema(SCHEMA)
+                .build();
+        try {
+            baseDir = Files.createTempDirectory("delta_lake_projection_pushdown").toFile();
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        HiveMetastore metastore = createTestingFileHiveMetastore(baseDir);
+        Database database = Database.builder()
+                .setDatabaseName(SCHEMA)
+                .setOwnerName(Optional.of("public"))
+                .setOwnerType(Optional.of(PrincipalType.ROLE))
+                .build();
+
+        metastore.createDatabase(database);
+
+        LocalQueryRunner queryRunner = LocalQueryRunner.create(session);
+        queryRunner.installPlugin(new TestingDeltaLakePlugin(Optional.of(new TestingDeltaLakeMetastoreModule(metastore)), Optional.empty(), EMPTY_MODULE));
+        queryRunner.createCatalog(CATALOG, "delta_lake", ImmutableMap.of());
+
+        return queryRunner;
+    }
+
+    @AfterAll
+    public void cleanup()
+            throws Exception
+    {
+        if (baseDir != null) {
+            deleteRecursively(baseDir.toPath(), ALLOW_INSECURE);
+        }
+    }
+
+    @Test
+    public void testPushdownDisabled()
+    {
+        String testTable = "test_pushdown_disabled_" + randomNameSuffix();
+
+        Session session = Session.builder(getQueryRunner().getDefaultSession())
+                .setCatalogSessionProperty(CATALOG, "projection_pushdown_enabled", "false")
+                .build();
+
+        getQueryRunner().execute(format(
+                "CREATE TABLE %s (col0) AS SELECT CAST(row(5, 6) AS row(a bigint, b bigint)) AS col0 WHERE false",
+                testTable));
+
+        assertPlan(
+                format("SELECT col0.a expr_a, col0.b expr_b FROM %s", testTable),
+                session,
+                any(
+                        project(
+                                ImmutableMap.of("expr", expression("col0[1]"), "expr_2", expression("col0[2]")),
+                                tableScan(testTable, ImmutableMap.of("col0", "col0")))));
+    }
+
+    @Test
+    public void testDereferencePushdown()
+    {
+        String testTable = "test_simple_projection_pushdown" + randomNameSuffix();
+        QualifiedObjectName completeTableName = new QualifiedObjectName(CATALOG, SCHEMA, testTable);
+
+        getQueryRunner().execute(format(
+                "CREATE TABLE %s (col0, col1) WITH (partitioned_by = ARRAY['col1']) AS" +
+                        " SELECT CAST(row(5, 6) AS row(x bigint, y bigint)) AS col0, 5 AS col1",
+                testTable));
+
+        Session session = getQueryRunner().getDefaultSession();
+
+        Optional<TableHandle> tableHandle = getTableHandle(session, completeTableName);
+        assertThat(tableHandle).as("expected the table handle to be present").isPresent();
+
+        Map<String, ColumnHandle> columns = getColumnHandles(session, completeTableName);
+
+        DeltaLakeColumnHandle column0Handle = (DeltaLakeColumnHandle) columns.get("col0");
+        DeltaLakeColumnHandle column1Handle = (DeltaLakeColumnHandle) columns.get("col1");
+
+        DeltaLakeColumnHandle columnX = createProjectedColumnHandle(column0Handle, ImmutableList.of(0), ImmutableList.of("x"));
+        DeltaLakeColumnHandle columnY = createProjectedColumnHandle(column0Handle, ImmutableList.of(1), ImmutableList.of("y"));
+
+        // Simple Projection pushdown
+        assertPlan(
+                "SELECT col0.x expr_x, col0.y expr_y FROM " + testTable,
+                any(tableScan(
+                        equalTo(((DeltaLakeTableHandle) tableHandle.get().getConnectorHandle()).withProjectedColumns(Set.of(columnX, columnY))),
+                        TupleDomain.all(),
+                        ImmutableMap.of("col0.x", equalTo(columnX), "col0.y", equalTo(columnY)))));
+
+        // Projection and predicate pushdown
+        assertPlan(
+                format("SELECT col0.x FROM %s WHERE col0.x = col1 + 3 and col0.y = 2", testTable),
+                anyTree(
+                        filter(
+                                "y = BIGINT '2' AND (x =  CAST((col1 + 3) AS BIGINT))",
+                                tableScan(
+                                        table -> {
+                                            DeltaLakeTableHandle deltaLakeTableHandle = (DeltaLakeTableHandle) table;
+                                            TupleDomain<DeltaLakeColumnHandle> unenforcedConstraint = deltaLakeTableHandle.getNonPartitionConstraint();
+                                            return deltaLakeTableHandle.getProjectedColumns().orElseThrow().equals(ImmutableSet.of(column1Handle, columnX, columnY)) &&
+                                                    unenforcedConstraint.equals(TupleDomain.withColumnDomains(ImmutableMap.of(columnY, Domain.singleValue(BIGINT, 2L))));
+                                        },
+                                        TupleDomain.all(),
+                                        ImmutableMap.of("y", columnY::equals, "x", columnX::equals, "col1", column1Handle::equals)))));
+
+        // Projection and predicate pushdown with overlapping columns
+        assertPlan(
+                format("SELECT col0, col0.y expr_y FROM %s WHERE col0.x = 5", testTable),
+                anyTree(
+                        filter(
+                                "x = BIGINT '5'",
+                                tableScan(
+                                        table -> {
+                                            DeltaLakeTableHandle deltaLakeTableHandle = (DeltaLakeTableHandle) table;
+                                            TupleDomain<DeltaLakeColumnHandle> unenforcedConstraint = deltaLakeTableHandle.getNonPartitionConstraint();
+                                            return deltaLakeTableHandle.getProjectedColumns().orElseThrow().equals(ImmutableSet.of(column0Handle, columnX)) &&
+                                                    unenforcedConstraint.equals(TupleDomain.withColumnDomains(ImmutableMap.of(columnX, Domain.singleValue(BIGINT, 5L))));
+                                        },
+                                        TupleDomain.all(),
+                                        ImmutableMap.of("col0", equalTo(column0Handle), "x", equalTo(columnX))))));
+
+        // Projection and predicate pushdown with joins
+        assertPlan(
+                format("SELECT T.col0.x, T.col0, T.col0.y FROM %s T join %s S on T.col1 = S.col1 WHERE (T.col0.x = 2)", testTable, testTable),
+                anyTree(
+                        project(
+                                ImmutableMap.of(
+                                        "expr_0_x", expression("expr_0[1]"),
+                                        "expr_0", expression("expr_0"),
+                                        "expr_0_y", expression("expr_0[2]")),
+                                join(INNER, builder -> builder
+                                        .equiCriteria("t_expr_1", "s_expr_1")
+                                        .left(
+                                                anyTree(
+                                                        filter(
+                                                                "x = BIGINT '2'",
+                                                                tableScan(
+                                                                        table -> {
+                                                                            DeltaLakeTableHandle deltaLakeTableHandle = (DeltaLakeTableHandle) table;
+                                                                            TupleDomain<DeltaLakeColumnHandle> unenforcedConstraint = deltaLakeTableHandle.getNonPartitionConstraint();
+                                                                            Set<DeltaLakeColumnHandle> expectedProjections = ImmutableSet.of(column0Handle, column1Handle, columnX);
+                                                                            TupleDomain<DeltaLakeColumnHandle> expectedUnenforcedConstraint = TupleDomain.withColumnDomains(
+                                                                                    ImmutableMap.of(columnX, Domain.singleValue(BIGINT, 2L)));
+                                                                            return deltaLakeTableHandle.getProjectedColumns().orElseThrow().equals(expectedProjections) &&
+                                                                                    unenforcedConstraint.equals(expectedUnenforcedConstraint);
+                                                                        },
+                                                                        TupleDomain.all(),
+                                                                        ImmutableMap.of("x", equalTo(columnX), "expr_0", equalTo(column0Handle), "t_expr_1", equalTo(column1Handle))))))
+                                        .right(
+                                                anyTree(
+                                                        tableScan(
+                                                                equalTo(((DeltaLakeTableHandle) tableHandle.get().getConnectorHandle()).withProjectedColumns(Set.of(column1Handle))),
+                                                                TupleDomain.all(),
+                                                                ImmutableMap.of("s_expr_1", equalTo(column1Handle)))))))));
+    }
+
+    private DeltaLakeColumnHandle createProjectedColumnHandle(
+            DeltaLakeColumnHandle baseColumnHandle,
+            List<Integer> dereferenceIndices,
+            List<String> dereferenceNames)
+    {
+        return new DeltaLakeColumnHandle(
+                baseColumnHandle.getBaseColumnName(),
+                baseColumnHandle.getBaseType(),
+                baseColumnHandle.getBaseFieldId(),
+                baseColumnHandle.getBasePhysicalColumnName(),
+                baseColumnHandle.getBasePhysicalType(),
+                DeltaLakeColumnType.REGULAR,
+                Optional.of(new DeltaLakeColumnProjectionInfo(
+                        BIGINT,
+                        dereferenceIndices,
+                        dereferenceNames)));
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeReadTimestamps.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeReadTimestamps.java
index 6a8f66354b77..7201465bf043 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeReadTimestamps.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeReadTimestamps.java
@@ -19,8 +19,9 @@
 import io.trino.Session;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -48,8 +49,9 @@
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
 import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeReadTimestamps
         extends AbstractTestQueryFramework
 {
@@ -97,10 +99,10 @@ protected QueryRunner createQueryRunner()
         return createDeltaLakeQueryRunner(DELTA_CATALOG, ImmutableMap.of(), ImmutableMap.of("delta.register-table-procedure.enabled", "true"));
     }
 
-    @BeforeClass
+    @BeforeAll
     public void registerTables()
     {
-        String dataPath = getClass().getClassLoader().getResource("databricks/read_timestamps").toExternalForm();
+        String dataPath = getClass().getClassLoader().getResource("databricks73/read_timestamps").toExternalForm();
         getQueryRunner().execute(format("CALL system.register_table('%s', 'read_timestamps', '%s')", getSession().getSchema().orElseThrow(), dataPath));
     }
 
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeRegisterTableProcedureWithFileMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeRegisterTableProcedureWithFileMetastore.java
index 0067bbb5a1bf..51f19e3ed7b2 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeRegisterTableProcedureWithFileMetastore.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeRegisterTableProcedureWithFileMetastore.java
@@ -17,7 +17,7 @@
 
 import java.nio.file.Path;
 
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 
 public class TestDeltaLakeRegisterTableProcedureWithFileMetastore
         extends BaseDeltaLakeRegisterTableProcedureTest
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSecurityConfig.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSecurityConfig.java
index e6f64b6bde09..ae75a5eec095 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSecurityConfig.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSecurityConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.deltalake;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreViews.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreViews.java
index bc95c4f1c7d6..d7b05c329675 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreViews.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreViews.java
@@ -17,7 +17,7 @@
 
 import java.nio.file.Path;
 
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 
 public class TestDeltaLakeSharedFileMetastoreViews
         extends BaseDeltaLakeSharedMetastoreViewsTest
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreWithTableRedirections.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreWithTableRedirections.java
index 683837239094..442456778740 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreWithTableRedirections.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreWithTableRedirections.java
@@ -18,7 +18,8 @@
 import io.trino.plugin.hive.TestingHivePlugin;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.TestInstance;
 
 import java.nio.file.Path;
 import java.util.Map;
@@ -26,7 +27,9 @@
 import static io.trino.plugin.deltalake.DeltaLakeConnectorFactory.CONNECTOR_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeSharedFileMetastoreWithTableRedirections
         extends BaseDeltaLakeSharedMetastoreWithTableRedirectionsTest
 {
@@ -72,7 +75,7 @@ protected QueryRunner createQueryRunner()
         return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
     {
         getQueryRunner().execute("DROP TABLE IF EXISTS hive_with_redirections." + schema + ".region");
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java
index 8febb700f6ea..72a95c7fd8a9 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java
@@ -20,13 +20,15 @@
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.TestInstance;
 
 import java.nio.file.Path;
 
 import static io.trino.plugin.hive.metastore.glue.GlueHiveMetastore.createTestingGlueHiveMetastore;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 /**
  * Tests metadata operations on a schema which has a mix of Hive and Delta Lake tables.
@@ -34,6 +36,7 @@
  * Requires AWS credentials, which can be provided any way supported by the DefaultProviderChain
  * See https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html#credentials-default
  */
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeSharedGlueMetastoreWithTableRedirections
         extends BaseDeltaLakeSharedMetastoreWithTableRedirectionsTest
 {
@@ -80,7 +83,7 @@ protected QueryRunner createQueryRunner()
         return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
     {
         try {
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedHiveMetastoreWithViews.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedHiveMetastoreWithViews.java
index 27cde310909e..c7b62bd865e3 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedHiveMetastoreWithViews.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedHiveMetastoreWithViews.java
@@ -19,23 +19,26 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Map;
 
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
 import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeSharedHiveMetastoreWithViews
         extends AbstractTestQueryFramework
 {
     protected final String schema = "test_shared_schema_with_hive_views_" + randomNameSuffix();
     private final String bucketName = "delta-lake-shared-hive-with-views-" + randomNameSuffix();
-
     private HiveMinioDataLake hiveMinioDataLake;
 
     @Override
@@ -45,7 +48,7 @@ protected QueryRunner createQueryRunner()
         this.hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
         this.hiveMinioDataLake.start();
 
-        DistributedQueryRunner queryRunner = DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner(
+        DistributedQueryRunner queryRunner = createS3DeltaLakeQueryRunner(
                 "delta",
                 schema,
                 ImmutableMap.of("delta.enable-non-concurrent-writes", "true"),
@@ -76,7 +79,7 @@ protected QueryRunner createQueryRunner()
         return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
     {
         assertQuerySucceeds("DROP TABLE IF EXISTS hive." + schema + ".hive_table");
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSplitManager.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSplitManager.java
index 933b939dbcac..ff5ea4be8ac6 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSplitManager.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSplitManager.java
@@ -16,17 +16,29 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.MoreExecutors;
+import io.airlift.json.JsonCodec;
+import io.airlift.json.JsonCodecFactory;
 import io.airlift.units.DataSize;
-import io.trino.plugin.deltalake.metastore.DeltaLakeMetastore;
+import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.plugin.deltalake.statistics.CachingExtendedStatisticsAccess;
+import io.trino.plugin.deltalake.statistics.ExtendedStatistics;
+import io.trino.plugin.deltalake.statistics.MetaDirStatisticsAccess;
 import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
 import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
+import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
+import io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointSchemaManager;
+import io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointWriterManager;
+import io.trino.plugin.deltalake.transactionlog.checkpoint.LastCheckpoint;
+import io.trino.plugin.deltalake.transactionlog.writer.NoIsolationSynchronizer;
+import io.trino.plugin.deltalake.transactionlog.writer.TransactionLogSynchronizerManager;
+import io.trino.plugin.deltalake.transactionlog.writer.TransactionLogWriterFactory;
+import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveTransactionHandle;
-import io.trino.plugin.hive.metastore.Database;
-import io.trino.plugin.hive.metastore.HiveMetastore;
-import io.trino.plugin.hive.metastore.PrincipalPrivileges;
-import io.trino.plugin.hive.metastore.Table;
+import io.trino.plugin.hive.NodeVersion;
+import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
+import io.trino.plugin.hive.metastore.UnimplementedHiveMetastore;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
 import io.trino.plugin.hive.parquet.ParquetWriterConfig;
 import io.trino.spi.SplitWeight;
@@ -35,19 +47,21 @@
 import io.trino.spi.connector.ConnectorSplitSource;
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.DynamicFilter;
-import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.statistics.TableStatistics;
 import io.trino.spi.type.TypeManager;
 import io.trino.testing.TestingConnectorContext;
 import io.trino.testing.TestingConnectorSession;
-import org.testng.annotations.Test;
+import io.trino.testing.TestingNodeManager;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static org.testng.Assert.assertEquals;
 
 public class TestDeltaLakeSplitManager
@@ -67,8 +81,10 @@ public class TestDeltaLakeSplitManager
     private static final DeltaLakeTableHandle tableHandle = new DeltaLakeTableHandle(
             "schema",
             "table",
-            "location",
+            true,
+            TABLE_PATH,
             metadataEntry,
+            new ProtocolEntry(1, 2, Optional.empty(), Optional.empty()),
             TupleDomain.all(),
             TupleDomain.all(),
             Optional.empty(),
@@ -76,8 +92,8 @@ public class TestDeltaLakeSplitManager
             Optional.empty(),
             Optional.empty(),
             Optional.empty(),
-            0,
-            false);
+            0);
+    private final HiveTransactionHandle transactionHandle = new HiveTransactionHandle(true);
 
     @Test
     public void testInitialSplits()
@@ -159,31 +175,78 @@ private DeltaLakeSplitManager setupSplitManager(List<AddFileEntry> addFileEntrie
         TestingConnectorContext context = new TestingConnectorContext();
         TypeManager typeManager = context.getTypeManager();
 
-        MockDeltaLakeMetastore metastore = new MockDeltaLakeMetastore();
-        metastore.setValidDataFiles(addFileEntries);
+        HdfsFileSystemFactory hdfsFileSystemFactory = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS);
+        TransactionLogAccess transactionLogAccess = new TransactionLogAccess(
+                typeManager,
+                new CheckpointSchemaManager(typeManager),
+                deltaLakeConfig,
+                new FileFormatDataSourceStats(),
+                hdfsFileSystemFactory,
+                new ParquetReaderConfig())
+        {
+            @Override
+            public List<AddFileEntry> getActiveFiles(TableSnapshot tableSnapshot, MetadataEntry metadataEntry, ProtocolEntry protocolEntry, ConnectorSession session)
+            {
+                return addFileEntries;
+            }
+        };
+
+        CheckpointWriterManager checkpointWriterManager = new CheckpointWriterManager(
+                typeManager,
+                new CheckpointSchemaManager(typeManager),
+                hdfsFileSystemFactory,
+                new NodeVersion("test_version"),
+                transactionLogAccess,
+                new FileFormatDataSourceStats(),
+                JsonCodec.jsonCodec(LastCheckpoint.class));
+
+        DeltaLakeMetadataFactory metadataFactory = new DeltaLakeMetadataFactory(
+                HiveMetastoreFactory.ofInstance(new UnimplementedHiveMetastore()),
+                hdfsFileSystemFactory,
+                transactionLogAccess,
+                typeManager,
+                DeltaLakeAccessControlMetadataFactory.DEFAULT,
+                new DeltaLakeConfig(),
+                JsonCodec.jsonCodec(DataFileInfo.class),
+                JsonCodec.jsonCodec(DeltaLakeMergeResult.class),
+                new TransactionLogWriterFactory(
+                        new TransactionLogSynchronizerManager(ImmutableMap.of(), new NoIsolationSynchronizer(hdfsFileSystemFactory))),
+                new TestingNodeManager(),
+                checkpointWriterManager,
+                DeltaLakeRedirectionsProvider.NOOP,
+                new CachingExtendedStatisticsAccess(new MetaDirStatisticsAccess(HDFS_FILE_SYSTEM_FACTORY, new JsonCodecFactory().jsonCodec(ExtendedStatistics.class))),
+                true,
+                new NodeVersion("test_version"));
+
+        ConnectorSession session = testingConnectorSessionWithConfig(deltaLakeConfig);
+        DeltaLakeTransactionManager deltaLakeTransactionManager = new DeltaLakeTransactionManager(metadataFactory);
+        deltaLakeTransactionManager.begin(transactionHandle);
+        deltaLakeTransactionManager.get(transactionHandle, session.getIdentity()).getSnapshot(session, tableHandle.getSchemaTableName(), TABLE_PATH, Optional.empty());
         return new DeltaLakeSplitManager(
                 typeManager,
-                (session, transaction) -> metastore,
+                transactionLogAccess,
                 MoreExecutors.newDirectExecutorService(),
-                deltaLakeConfig);
+                deltaLakeConfig,
+                HDFS_FILE_SYSTEM_FACTORY,
+                deltaLakeTransactionManager);
     }
 
     private AddFileEntry addFileEntryOfSize(long fileSize)
     {
-        return new AddFileEntry(FILE_PATH, ImmutableMap.of(), fileSize, 0, false, Optional.empty(), Optional.empty(), ImmutableMap.of());
+        return new AddFileEntry(FILE_PATH, ImmutableMap.of(), fileSize, 0, false, Optional.empty(), Optional.empty(), ImmutableMap.of(), Optional.empty());
     }
 
     private DeltaLakeSplit makeSplit(long start, long splitSize, long fileSize, double minimumAssignedSplitWeight)
     {
         SplitWeight splitWeight = SplitWeight.fromProportion(Math.min(Math.max((double) fileSize / splitSize, minimumAssignedSplitWeight), 1.0));
-        return new DeltaLakeSplit(FULL_PATH, start, splitSize, fileSize, Optional.empty(), 0, ImmutableList.of(), splitWeight, TupleDomain.all(), ImmutableMap.of());
+        return new DeltaLakeSplit(FULL_PATH, start, splitSize, fileSize, Optional.empty(), 0, Optional.empty(), splitWeight, TupleDomain.all(), ImmutableMap.of());
     }
 
     private List<DeltaLakeSplit> getSplits(DeltaLakeSplitManager splitManager, DeltaLakeConfig deltaLakeConfig)
             throws ExecutionException, InterruptedException
     {
         ConnectorSplitSource splitSource = splitManager.getSplits(
-                new HiveTransactionHandle(false),
+                transactionHandle,
                 testingConnectorSessionWithConfig(deltaLakeConfig),
                 tableHandle,
                 DynamicFilter.EMPTY,
@@ -206,111 +269,4 @@ private ConnectorSession testingConnectorSessionWithConfig(DeltaLakeConfig delta
                 .setPropertyMetadata(sessionProperties.getSessionProperties())
                 .build();
     }
-
-    private static class MockDeltaLakeMetastore
-            implements DeltaLakeMetastore
-    {
-        private List<AddFileEntry> validDataFiles;
-
-        public void setValidDataFiles(List<AddFileEntry> validDataFiles)
-        {
-            this.validDataFiles = ImmutableList.copyOf(validDataFiles);
-        }
-
-        @Override
-        public List<String> getAllDatabases()
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public Optional<Database> getDatabase(String databaseName)
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public List<String> getAllTables(String databaseName)
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public Optional<Table> getTable(String databaseName, String tableName)
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public void createDatabase(Database database)
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public void dropDatabase(String databaseName, boolean deleteData)
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public void createTable(ConnectorSession session, Table table, PrincipalPrivileges principalPrivileges)
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public void dropTable(ConnectorSession session, String databaseName, String tableName, boolean deleteData)
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTableName to)
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public MetadataEntry getMetadata(TableSnapshot tableSnapshot, ConnectorSession session)
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public ProtocolEntry getProtocol(ConnectorSession session, TableSnapshot tableSnapshot)
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public String getTableLocation(SchemaTableName table)
-        {
-            return TABLE_PATH;
-        }
-
-        @Override
-        public TableSnapshot getSnapshot(SchemaTableName table, ConnectorSession session)
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public List<AddFileEntry> getValidDataFiles(SchemaTableName table, ConnectorSession session)
-        {
-            return validDataFiles;
-        }
-
-        @Override
-        public TableStatistics getTableStatistics(ConnectorSession session, DeltaLakeTableHandle tableHandle)
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-
-        @Override
-        public HiveMetastore getHiveMetastore()
-        {
-            throw new UnsupportedOperationException("Unimplemented");
-        }
-    }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSystemTables.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSystemTables.java
index 350fd44421f7..da9ed04ffecc 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSystemTables.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSystemTables.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createDeltaLakeQueryRunner;
@@ -78,7 +78,7 @@ public void testHistoryTable()
                     .matches("""
                             VALUES
                                 (BIGINT '5', VARCHAR 'OPTIMIZE', BIGINT '4', VARCHAR 'WriteSerializable', true),
-                                (BIGINT '4', VARCHAR 'MERGE', BIGINT '3', VARCHAR 'WriteSerializable', true),
+                                (BIGINT '4', VARCHAR 'DELETE', BIGINT '3', VARCHAR 'WriteSerializable', true),
                                 (BIGINT '3', VARCHAR 'MERGE', BIGINT '2', VARCHAR 'WriteSerializable', true),
                                 (BIGINT '2', VARCHAR 'WRITE', BIGINT '1', VARCHAR 'WriteSerializable', true),
                                 (BIGINT '1', VARCHAR 'WRITE', BIGINT '0', VARCHAR 'WriteSerializable', true),
@@ -90,4 +90,17 @@ public void testHistoryTable()
             assertUpdate("DROP TABLE IF EXISTS test_checkpoint_table");
         }
     }
+
+    @Test
+    public void testPropertiesTable()
+    {
+        String tableName = "test_simple_properties_table";
+        try {
+            assertUpdate("CREATE TABLE " + tableName + " (_bigint BIGINT) WITH (change_data_feed_enabled = true, checkpoint_interval = 5)");
+            assertQuery("SELECT * FROM \"" + tableName + "$properties\"", "VALUES ('delta.enableChangeDataFeed', 'true'), ('delta.checkpointInterval', '5'), ('delta.minReaderVersion', '1'), ('delta.minWriterVersion', '4')");
+        }
+        finally {
+            assertUpdate("DROP TABLE IF EXISTS " + tableName);
+        }
+    }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableName.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableName.java
index 2640a4fb2051..9177046aedc6 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableName.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableName.java
@@ -13,15 +13,16 @@
  */
 package io.trino.plugin.deltalake;
 
-import org.assertj.core.api.Assertions;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
 import static io.trino.plugin.deltalake.DeltaLakeTableType.DATA;
 import static io.trino.plugin.deltalake.DeltaLakeTableType.HISTORY;
+import static io.trino.plugin.deltalake.DeltaLakeTableType.PROPERTIES;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
@@ -33,6 +34,7 @@ public void testParse()
     {
         assertParseNameAndType("abc", "abc", DATA);
         assertParseNameAndType("abc$history", "abc", DeltaLakeTableType.HISTORY);
+        assertParseNameAndType("abc$properties", "abc", DeltaLakeTableType.PROPERTIES);
 
         assertNoValidTableType("abc$data");
         assertInvalid("abc@123", "Invalid Delta Lake table name: abc@123");
@@ -58,6 +60,7 @@ public void testTableNameFrom()
         assertEquals(DeltaLakeTableName.tableNameFrom("abc"), "abc");
         assertEquals(DeltaLakeTableName.tableNameFrom("abc$data"), "abc");
         assertEquals(DeltaLakeTableName.tableNameFrom("abc$history"), "abc");
+        assertEquals(DeltaLakeTableName.tableNameFrom("abc$properties"), "abc");
         assertEquals(DeltaLakeTableName.tableNameFrom("abc$invalid"), "abc");
     }
 
@@ -67,20 +70,14 @@ public void testTableTypeFrom()
         assertEquals(DeltaLakeTableName.tableTypeFrom("abc"), Optional.of(DATA));
         assertEquals(DeltaLakeTableName.tableTypeFrom("abc$data"), Optional.empty()); // it's invalid
         assertEquals(DeltaLakeTableName.tableTypeFrom("abc$history"), Optional.of(HISTORY));
+        assertEquals(DeltaLakeTableName.tableTypeFrom("abc$properties"), Optional.of(PROPERTIES));
 
         assertEquals(DeltaLakeTableName.tableTypeFrom("abc$invalid"), Optional.empty());
     }
 
-    @Test
-    public void testTableNameWithType()
-    {
-        assertEquals(DeltaLakeTableName.tableNameWithType("abc", DATA), "abc$data");
-        assertEquals(DeltaLakeTableName.tableNameWithType("abc", HISTORY), "abc$history");
-    }
-
     private static void assertNoValidTableType(String inputName)
     {
-        Assertions.assertThat(DeltaLakeTableName.tableTypeFrom(inputName))
+        assertThat(DeltaLakeTableName.tableTypeFrom(inputName))
                 .isEmpty();
     }
 
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableStatistics.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableStatistics.java
index bd3e1aa547fd..9807cdc6a37e 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableStatistics.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableStatistics.java
@@ -17,13 +17,17 @@
 import com.google.common.io.Resources;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createDeltaLakeQueryRunner;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeTableStatistics
         extends AbstractTestQueryFramework
 {
@@ -34,10 +38,10 @@ protected QueryRunner createQueryRunner()
         return createDeltaLakeQueryRunner(DELTA_CATALOG, ImmutableMap.of(), ImmutableMap.of("delta.register-table-procedure.enabled", "true"));
     }
 
-    @BeforeClass
+    @BeforeAll
     public void registerTables()
     {
-        String dataPath = Resources.getResource("databricks/person").toExternalForm();
+        String dataPath = Resources.getResource("databricks73/person").toExternalForm();
         getQueryRunner().execute(
                 format("CALL system.register_table('%s', 'person', '%s')", getSession().getSchema().orElseThrow(), dataPath));
     }
@@ -140,6 +144,30 @@ public void testShowStatsForQueryWithWhereClause()
                         "(null, null, null, null, 3.0, null, null)");
     }
 
+    @Test
+    public void testShowStatsForSelectNestedFieldWithWhereClause()
+    {
+        String tableName = "show_stats_select_nested_field_with_where_clause_" + randomNameSuffix();
+
+        assertUpdate(
+                "CREATE TABLE " + tableName + " (pk, int_col, row_col)" +
+                        "WITH(partitioned_by = ARRAY['pk']) " +
+                        "AS VALUES " +
+                        "('pk1', null, CAST(ROW(23, 'field1') AS ROW(f1 INT, f2 VARCHAR))), " +
+                        "(null, 12, CAST(ROW(24, 'field2') AS ROW(f1 INT, f2 VARCHAR))), " +
+                        "('pk1', 13, CAST(ROW(25, null) AS ROW(f1 INT, f2 VARCHAR))), " +
+                        "('pk1', 14, CAST(ROW(26, 'field1') AS ROW(f1 INT, f2 VARCHAR)))",
+                4);
+        assertQuery(
+                "SHOW STATS FOR (SELECT int_col, row_col.f1, row_col FROM " + tableName + " WHERE row_col.f2 IS NOT NULL)",
+                "VALUES " +
+                        //  column_name | data_size | distinct_values_count | nulls_fraction | row_count | low_value | high_value
+                        "('int_col', null, 3.0, 0.25, null, 12, 14), " +
+                        "('f1', null, null, null, null, null, null), " +
+                        "('row_col', null, null, null, null, null, null), " +
+                        "(null, null, null, null, null, null, null)");
+    }
+
     @Test
     public void testShowStatsForAllNullColumn()
     {
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingGlueMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingGlueMetastore.java
index d9c2128884f3..a5ae4e65a9dd 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingGlueMetastore.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingGlueMetastore.java
@@ -18,7 +18,8 @@
 import io.trino.Session;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 
@@ -27,7 +28,9 @@
 import static io.trino.plugin.deltalake.DeltaLakeConnectorFactory.CONNECTOR_NAME;
 import static io.trino.plugin.hive.metastore.glue.GlueHiveMetastore.createTestingGlueHiveMetastore;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeTableWithCustomLocationUsingGlueMetastore
         extends BaseDeltaLakeTableWithCustomLocation
 {
@@ -63,7 +66,7 @@ protected QueryRunner createQueryRunner()
         return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         try {
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingHiveMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingHiveMetastore.java
index 924ec1f48d37..eea54a4d91bc 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingHiveMetastore.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingHiveMetastore.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import static io.trino.plugin.deltalake.DeltaLakeConnectorFactory.CONNECTOR_NAME;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 
 public class TestDeltaLakeTableWithCustomLocationUsingHiveMetastore
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeUpdate.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeUpdate.java
index d0e160106ea1..965d5feb3ef4 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeUpdate.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeUpdate.java
@@ -15,14 +15,13 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.plugin.hive.containers.HiveMinioDataLake;
-import io.trino.plugin.hive.parquet.ParquetWriterConfig;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static com.google.common.base.Verify.verify;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 
@@ -42,11 +41,9 @@ public TestDeltaLakeUpdate()
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        verify(!new ParquetWriterConfig().isParquetOptimizedWriterEnabled(), "This test assumes the optimized Parquet writer is disabled by default");
-
         HiveMinioDataLake hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
         hiveMinioDataLake.start();
-        QueryRunner queryRunner = DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner(
+        QueryRunner queryRunner = createS3DeltaLakeQueryRunner(
                 DELTA_CATALOG,
                 SCHEMA,
                 ImmutableMap.of("delta.enable-non-concurrent-writes", "true"),
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeWriter.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeWriter.java
index 05f184c4c56c..1410ed80ad48 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeWriter.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeWriter.java
@@ -27,7 +27,7 @@
 import org.apache.parquet.hadoop.metadata.CompressionCodecName;
 import org.apache.parquet.schema.PrimitiveType;
 import org.apache.parquet.schema.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.ByteBuffer;
 import java.util.List;
@@ -58,7 +58,7 @@ public void testMergeIntStatistics()
                         Statistics.getBuilderForReading(intType).withMin(getIntByteArray(-100)).withMax(getIntByteArray(250)).withNumNulls(6).build()),
                 createMetaData(columnName, intType, 10,
                         Statistics.getBuilderForReading(intType).withMin(getIntByteArray(-200)).withMax(getIntByteArray(150)).withNumNulls(7).build()));
-        DeltaLakeColumnHandle intColumn = new DeltaLakeColumnHandle(columnName, INTEGER, OptionalInt.empty(), columnName, INTEGER, REGULAR);
+        DeltaLakeColumnHandle intColumn = new DeltaLakeColumnHandle(columnName, INTEGER, OptionalInt.empty(), columnName, INTEGER, REGULAR, Optional.empty());
 
         DeltaLakeFileStatistics fileStats = mergeStats(buildMultimap(columnName, metadata), ImmutableMap.of(columnName, INTEGER), 20);
         assertEquals(fileStats.getNumRecords(), Optional.of(20L));
@@ -77,7 +77,7 @@ public void testMergeFloatStatistics()
                         Statistics.getBuilderForReading(type).withMin(getFloatByteArray(0.01f)).withMax(getFloatByteArray(1.0f)).withNumNulls(6).build()),
                 createMetaData(columnName, type, 10,
                         Statistics.getBuilderForReading(type).withMin(getFloatByteArray(-2.001f)).withMax(getFloatByteArray(0.0f)).withNumNulls(7).build()));
-        DeltaLakeColumnHandle floatColumn = new DeltaLakeColumnHandle(columnName, REAL, OptionalInt.empty(), columnName, REAL, REGULAR);
+        DeltaLakeColumnHandle floatColumn = new DeltaLakeColumnHandle(columnName, REAL, OptionalInt.empty(), columnName, REAL, REGULAR, Optional.empty());
 
         DeltaLakeFileStatistics fileStats = mergeStats(buildMultimap(columnName, metadata), ImmutableMap.of(columnName, REAL), 20);
         assertEquals(fileStats.getNumRecords(), Optional.of(20L));
@@ -98,7 +98,7 @@ public void testMergeFloatNaNStatistics()
                         Statistics.getBuilderForReading(type).withMin(getFloatByteArray(Float.NaN)).withMax(getFloatByteArray(1.0f)).withNumNulls(6).build()),
                 createMetaData(columnName, type, 10,
                         Statistics.getBuilderForReading(type).withMin(getFloatByteArray(-2.001f)).withMax(getFloatByteArray(0.0f)).withNumNulls(7).build()));
-        DeltaLakeColumnHandle floatColumn = new DeltaLakeColumnHandle(columnName, REAL, OptionalInt.empty(), columnName, REAL, REGULAR);
+        DeltaLakeColumnHandle floatColumn = new DeltaLakeColumnHandle(columnName, REAL, OptionalInt.empty(), columnName, REAL, REGULAR, Optional.empty());
 
         DeltaLakeFileStatistics fileStats = mergeStats(buildMultimap(columnName, metadata), ImmutableMap.of(columnName, REAL), 20);
         assertEquals(fileStats.getNumRecords(), Optional.of(20L));
@@ -119,7 +119,7 @@ public void testMergeDoubleNaNStatistics()
                         Statistics.getBuilderForReading(type).withMin(getDoubleByteArray(Double.NaN)).withMax(getDoubleByteArray(1.0f)).withNumNulls(6).build()),
                 createMetaData(columnName, type, 10,
                         Statistics.getBuilderForReading(type).withMin(getDoubleByteArray(-2.001f)).withMax(getDoubleByteArray(0.0f)).withNumNulls(7).build()));
-        DeltaLakeColumnHandle doubleColumn = new DeltaLakeColumnHandle(columnName, DOUBLE, OptionalInt.empty(), columnName, DOUBLE, REGULAR);
+        DeltaLakeColumnHandle doubleColumn = new DeltaLakeColumnHandle(columnName, DOUBLE, OptionalInt.empty(), columnName, DOUBLE, REGULAR, Optional.empty());
 
         DeltaLakeFileStatistics fileStats = mergeStats(buildMultimap(columnName, metadata), ImmutableMap.of(columnName, DOUBLE), 20);
         assertEquals(fileStats.getNumRecords(), Optional.of(20L));
@@ -138,7 +138,7 @@ public void testMergeStringStatistics()
                         Statistics.getBuilderForReading(type).withMin("aba".getBytes(UTF_8)).withMax("ab⌘".getBytes(UTF_8)).withNumNulls(6).build()),
                 createMetaData(columnName, type, 10,
                         Statistics.getBuilderForReading(type).withMin("aba".getBytes(UTF_8)).withMax("abc".getBytes(UTF_8)).withNumNulls(6).build()));
-        DeltaLakeColumnHandle varcharColumn = new DeltaLakeColumnHandle(columnName, VarcharType.createUnboundedVarcharType(), OptionalInt.empty(), columnName, VarcharType.createUnboundedVarcharType(), REGULAR);
+        DeltaLakeColumnHandle varcharColumn = new DeltaLakeColumnHandle(columnName, VarcharType.createUnboundedVarcharType(), OptionalInt.empty(), columnName, VarcharType.createUnboundedVarcharType(), REGULAR, Optional.empty());
 
         DeltaLakeFileStatistics fileStats = mergeStats(buildMultimap(columnName, metadata), ImmutableMap.of(columnName, createUnboundedVarcharType()), 20);
         assertEquals(fileStats.getNumRecords(), Optional.of(20L));
@@ -157,7 +157,7 @@ public void testMergeStringUnicodeStatistics()
                         Statistics.getBuilderForReading(type).withMin("aba".getBytes(UTF_8)).withMax("ab\uFAD8".getBytes(UTF_8)).withNumNulls(6).build()),
                 createMetaData(columnName, type, 10,
                         Statistics.getBuilderForReading(type).withMin("aba".getBytes(UTF_8)).withMax("ab\uD83D\uDD74".getBytes(UTF_8)).withNumNulls(6).build()));
-        DeltaLakeColumnHandle varcharColumn = new DeltaLakeColumnHandle(columnName, VarcharType.createUnboundedVarcharType(), OptionalInt.empty(), columnName, VarcharType.createUnboundedVarcharType(), REGULAR);
+        DeltaLakeColumnHandle varcharColumn = new DeltaLakeColumnHandle(columnName, VarcharType.createUnboundedVarcharType(), OptionalInt.empty(), columnName, VarcharType.createUnboundedVarcharType(), REGULAR, Optional.empty());
 
         DeltaLakeFileStatistics fileStats = mergeStats(buildMultimap(columnName, metadata), ImmutableMap.of(columnName, createUnboundedVarcharType()), 20);
         assertEquals(fileStats.getNumRecords(), Optional.of(20L));
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaQueryFailureRecoveryTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaQueryFailureRecoveryTest.java
new file mode 100644
index 000000000000..318822d1e21d
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaQueryFailureRecoveryTest.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake;
+
+import io.trino.operator.RetryPolicy;
+
+public class TestDeltaQueryFailureRecoveryTest
+        extends BaseDeltaFailureRecoveryTest
+{
+    protected TestDeltaQueryFailureRecoveryTest()
+    {
+        super(RetryPolicy.QUERY);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaTaskFailureRecoveryTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaTaskFailureRecoveryTest.java
index d39a5ec966d6..ebc23dab3262 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaTaskFailureRecoveryTest.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaTaskFailureRecoveryTest.java
@@ -13,62 +13,13 @@
  */
 package io.trino.plugin.deltalake;
 
-import com.google.common.collect.ImmutableMap;
 import io.trino.operator.RetryPolicy;
-import io.trino.plugin.exchange.filesystem.FileSystemExchangePlugin;
-import io.trino.plugin.exchange.filesystem.containers.MinioStorage;
-import io.trino.plugin.hive.containers.HiveMinioDataLake;
-import io.trino.testing.DistributedQueryRunner;
-import io.trino.testing.QueryRunner;
-import io.trino.tpch.TpchTable;
-
-import java.util.List;
-import java.util.Map;
-
-import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
-import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner;
-import static io.trino.plugin.exchange.filesystem.containers.MinioStorage.getExchangeManagerProperties;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static java.lang.String.format;
 
 public class TestDeltaTaskFailureRecoveryTest
         extends BaseDeltaFailureRecoveryTest
 {
-    private static final String SCHEMA = "task_failure_recovery";
-    private final String bucketName = "test-delta-lake-task-failure-recovery-" + randomNameSuffix();
-
     protected TestDeltaTaskFailureRecoveryTest()
     {
         super(RetryPolicy.TASK);
     }
-
-    @Override
-    protected QueryRunner createQueryRunner(
-            List<TpchTable<?>> requiredTpchTables,
-            Map<String, String> configProperties,
-            Map<String, String> coordinatorProperties)
-            throws Exception
-    {
-        HiveMinioDataLake hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
-        hiveMinioDataLake.start();
-        MinioStorage minioStorage = closeAfterClass(new MinioStorage("test-exchange-spooling-" + randomNameSuffix()));
-        minioStorage.start();
-
-        DistributedQueryRunner queryRunner = createS3DeltaLakeQueryRunner(
-                DELTA_CATALOG,
-                SCHEMA,
-                configProperties,
-                coordinatorProperties,
-                ImmutableMap.of("delta.enable-non-concurrent-writes", "true"),
-                hiveMinioDataLake.getMinio().getMinioAddress(),
-                hiveMinioDataLake.getHiveHadoop(),
-                runner -> {
-                    runner.installPlugin(new FileSystemExchangePlugin());
-                    runner.loadExchangeManager("filesystem", getExchangeManagerProperties(minioStorage));
-                });
-        queryRunner.execute(format("CREATE SCHEMA %s WITH (location = 's3://%s/%s')", SCHEMA, bucketName, SCHEMA));
-        requiredTpchTables.forEach(table -> queryRunner.execute(format("CREATE TABLE %s AS SELECT * FROM tpch.tiny.%1$s", table.getTableName())));
-
-        return queryRunner;
-    }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestPredicatePushdown.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestPredicatePushdown.java
index 8605b499f973..2ca8bcde9c93 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestPredicatePushdown.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestPredicatePushdown.java
@@ -23,7 +23,7 @@
 import io.trino.testing.MaterializedResultWithQueryId;
 import io.trino.testing.MaterializedRow;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 import org.testng.asserts.SoftAssert;
 
 import java.nio.file.Path;
@@ -39,10 +39,10 @@
 public class TestPredicatePushdown
         extends AbstractTestQueryFramework
 {
-    private static final String BUCKET_NAME = "delta-test-pushdown";
-    private static final Path RESOURCE_PATH = Path.of("databricks/pushdown/");
+    private static final Path RESOURCE_PATH = Path.of("databricks73/pushdown/");
     private static final String TEST_SCHEMA = "default";
 
+    private final String bucketName = "delta-test-pushdown-" + randomNameSuffix();
     /**
      * This single-file Parquet table has known row groups. See the test
      * resource {@code pushdown/custkey_15rowgroups/README.md} for details.
@@ -55,7 +55,7 @@ public class TestPredicatePushdown
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(BUCKET_NAME));
+        hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
         hiveMinioDataLake.start();
         return createS3DeltaLakeQueryRunner(
                 DELTA_CATALOG,
@@ -231,7 +231,7 @@ String register(String namePrefix)
             hiveMinioDataLake.copyResources(RESOURCE_PATH.resolve(resourcePath).toString(), name);
             getQueryRunner().execute(format(
                     "CALL system.register_table(CURRENT_SCHEMA, '%2$s', 's3://%1$s/%2$s')",
-                    BUCKET_NAME,
+                    bucketName,
                     name));
             return name;
         }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestReadJsonTransactionLog.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestReadJsonTransactionLog.java
index b4a00f0f7ee7..3d87f04b4904 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestReadJsonTransactionLog.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestReadJsonTransactionLog.java
@@ -20,8 +20,7 @@
 import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
 import io.trino.plugin.deltalake.transactionlog.RemoveFileEntry;
 import io.trino.plugin.deltalake.transactionlog.checkpoint.LastCheckpoint;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -42,20 +41,21 @@ public class TestReadJsonTransactionLog
 {
     private final ObjectMapper objectMapper = new ObjectMapperProvider().get();
 
-    @DataProvider
-    public Object[][] dataSource()
+    @Test
+    public void testAdd()
     {
-        return new Object[][] {
-                {"databricks"},
-                {"deltalake"},
-        };
-    }
+        assertEquals(
+                readJsonTransactionLogs("databricks73/person/_delta_log")
+                        .map(this::deserialize)
+                        .map(DeltaLakeTransactionLogEntry::getAdd)
+                        .filter(Objects::nonNull)
+                        .map(AddFileEntry::getPath)
+                        .filter(Objects::nonNull)
+                        .count(),
+                18);
 
-    @Test(dataProvider = "dataSource")
-    public void testAdd(String dataSource)
-    {
         assertEquals(
-                readJsonTransactionLogs(String.format("%s/person/_delta_log", dataSource))
+                readJsonTransactionLogs("deltalake/person/_delta_log")
                         .map(this::deserialize)
                         .map(DeltaLakeTransactionLogEntry::getAdd)
                         .filter(Objects::nonNull)
@@ -65,11 +65,21 @@ public void testAdd(String dataSource)
                 18);
     }
 
-    @Test(dataProvider = "dataSource")
-    public void testRemove(String dataSource)
+    @Test
+    public void testRemove()
     {
         assertEquals(
-                readJsonTransactionLogs(String.format("%s/person/_delta_log", dataSource))
+                readJsonTransactionLogs("databricks73/person/_delta_log")
+                        .map(this::deserialize)
+                        .map(DeltaLakeTransactionLogEntry::getRemove)
+                        .filter(Objects::nonNull)
+                        .map(RemoveFileEntry::getPath)
+                        .filter(Objects::nonNull)
+                        .count(),
+                6);
+
+        assertEquals(
+                readJsonTransactionLogs("deltalake/person/_delta_log")
                         .map(this::deserialize)
                         .map(DeltaLakeTransactionLogEntry::getRemove)
                         .filter(Objects::nonNull)
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestSplitPruning.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestSplitPruning.java
index c2770b0d7a2f..38cc4ed9cefb 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestSplitPruning.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestSplitPruning.java
@@ -22,10 +22,11 @@
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -35,8 +36,10 @@
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createDeltaLakeQueryRunner;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestSplitPruning
         extends AbstractTestQueryFramework
 {
@@ -47,6 +50,7 @@ public class TestSplitPruning
             "float_nan",
             "float_inf",
             "no_stats",
+            "nested_fields",
             "timestamp",
             "test_partitioning",
             "parquet_struct_statistics",
@@ -61,84 +65,82 @@ protected QueryRunner createQueryRunner()
         return createDeltaLakeQueryRunner(DELTA_CATALOG, ImmutableMap.of(), ImmutableMap.of("delta.register-table-procedure.enabled", "true"));
     }
 
-    @BeforeClass
+    @BeforeAll
     public void registerTables()
     {
         for (String table : TABLES) {
-            String dataPath = Resources.getResource("databricks/pruning/" + table).toExternalForm();
+            String dataPath = Resources.getResource("databricks73/pruning/" + table).toExternalForm();
             getQueryRunner().execute(
                     format("CALL system.register_table('%s', '%s', '%s')", getSession().getSchema().orElseThrow(), table, dataPath));
         }
     }
 
-    @DataProvider
-    public Object[][] types()
-    {
-        return new Object[][] {{"float"}, {"double"}};
-    }
-
-    @Test(dataProvider = "types")
-    public void testStatsPruningInfinity(String type)
+    @Test
+    public void testStatsPruningInfinity()
     {
-        String tableName = type + "_inf";
-        // Data generated using:
-        // INSERT INTO pruning_inf_test VALUES
-        //   (1.0, 'a1', CAST('-Infinity' as DOUBLE)),
-        //   (1.0, 'b1', 100.0),
-        //   (2.0, 'a2', 200.0),
-        //   (2.0, 'b2', CAST('+Infinity' as DOUBLE)),
-        //   (3.0, 'a3', CAST('-Infinity' as DOUBLE)),
-        //   (3.0, 'b3', 150.0),
-        //   (3.0, 'c3', null),
-        //   (3.0, 'd3', CAST('+Infinity' as DOUBLE)),
-        //   (4.0, 'a4', null)
-
-        // a1, b1, a3, b3, c3 and d3 were processed, across 2 splits
-        assertResultAndSplitCount(
-                format("SELECT name FROM %s WHERE val < 200", tableName),
-                Set.of("a1", "b1", "a3", "b3"),
-                2);
-
-        // a1, b1, a3, b3, c3 and d3 were processed, across 2 splits
-        assertResultAndSplitCount(
-                format("SELECT name FROM %s WHERE val > 100", tableName),
-                Set.of("a2", "b2", "b3", "d3"),
-                2);
-
-        // 2 out of 4 splits
-        assertResultAndSplitCount(
-                format("SELECT name FROM %s WHERE val IS NULL", tableName),
-                Set.of("c3", "a4"),
-                2);
+        for (String type : Arrays.asList("float", "double")) {
+            String tableName = type + "_inf";
+            // Data generated using:
+            // INSERT INTO pruning_inf_test VALUES
+            //   (1.0, 'a1', CAST('-Infinity' as DOUBLE)),
+            //   (1.0, 'b1', 100.0),
+            //   (2.0, 'a2', 200.0),
+            //   (2.0, 'b2', CAST('+Infinity' as DOUBLE)),
+            //   (3.0, 'a3', CAST('-Infinity' as DOUBLE)),
+            //   (3.0, 'b3', 150.0),
+            //   (3.0, 'c3', null),
+            //   (3.0, 'd3', CAST('+Infinity' as DOUBLE)),
+            //   (4.0, 'a4', null)
+
+            // a1, b1, a3, b3, c3 and d3 were processed, across 2 splits
+            assertResultAndSplitCount(
+                    format("SELECT name FROM %s WHERE val < 200", tableName),
+                    Set.of("a1", "b1", "a3", "b3"),
+                    2);
+
+            // a1, b1, a3, b3, c3 and d3 were processed, across 2 splits
+            assertResultAndSplitCount(
+                    format("SELECT name FROM %s WHERE val > 100", tableName),
+                    Set.of("a2", "b2", "b3", "d3"),
+                    2);
+
+            // 2 out of 4 splits
+            assertResultAndSplitCount(
+                    format("SELECT name FROM %s WHERE val IS NULL", tableName),
+                    Set.of("c3", "a4"),
+                    2);
+        }
     }
 
-    @Test(dataProvider = "types")
-    public void testStatsPruningNaN(String type)
+    @Test
+    public void testStatsPruningNaN()
     {
-        String tableName = type + "_nan";
-        // Data generated using:
-        // INSERT INTO pruning_nan_test VALUES
-        //   (5.0, 'a5', CAST('NaN' as DOUBLE)),
-        //   (5.0, 'b5', 100),
-        //   (6.0, 'a6', CAST('NaN' as DOUBLE)),
-        //   (6.0, 'b6', CAST('+Infinity' as DOUBLE))
-
-        // no pruning, because the domain contains NaN
-        assertResultAndSplitCount(
-                format("SELECT name FROM %s WHERE val < 100", tableName),
-                Set.of(),
-                2);
-
-        // pruning works with the IS NULL predicate
-        assertResultAndSplitCount(
-                format("SELECT name FROM %s WHERE val IS NULL", tableName),
-                Set.of(),
-                0);
-
-        MaterializedResult result = getDistributedQueryRunner().execute(
-                getSession(),
-                format("SELECT name FROM %s WHERE val IS NOT NULL", tableName));
-        assertEquals(result.getOnlyColumnAsSet(), Set.of("a5", "b5", "a6", "b6"));
+        for (String type : Arrays.asList("float", "double")) {
+            String tableName = type + "_nan";
+            // Data generated using:
+            // INSERT INTO pruning_nan_test VALUES
+            //   (5.0, 'a5', CAST('NaN' as DOUBLE)),
+            //   (5.0, 'b5', 100),
+            //   (6.0, 'a6', CAST('NaN' as DOUBLE)),
+            //   (6.0, 'b6', CAST('+Infinity' as DOUBLE))
+
+            // no pruning, because the domain contains NaN
+            assertResultAndSplitCount(
+                    format("SELECT name FROM %s WHERE val < 100", tableName),
+                    Set.of(),
+                    2);
+
+            // pruning works with the IS NULL predicate
+            assertResultAndSplitCount(
+                    format("SELECT name FROM %s WHERE val IS NULL", tableName),
+                    Set.of(),
+                    0);
+
+            MaterializedResult result = getDistributedQueryRunner().execute(
+                    getSession(),
+                    format("SELECT name FROM %s WHERE val IS NOT NULL", tableName));
+            assertEquals(result.getOnlyColumnAsSet(), Set.of("a5", "b5", "a6", "b6"));
+        }
     }
 
     @Test
@@ -273,7 +275,7 @@ public void testPartitionPruningWithExpressionAndDomainFilter()
     public void testSplitGenerationError()
     {
         // log entry with invalid stats (low > high)
-        String dataPath = Resources.getResource("databricks/pruning/invalid_log").toExternalForm();
+        String dataPath = Resources.getResource("databricks73/pruning/invalid_log").toExternalForm();
         getQueryRunner().execute(
                 format("CALL system.register_table('%s', 'person', '%s')", getSession().getSchema().orElseThrow(), dataPath));
         assertQueryFails("SELECT name FROM person WHERE income < 1000", "Failed to generate splits for tpch.person");
@@ -358,6 +360,32 @@ public void testParquetStatisticsPruning()
         testCountQuery("SELECT count(*) FROM parquet_struct_statistics WHERE row = ROW(2, 'b')", 3, 9);
     }
 
+    @Test
+    public void testPrimitiveFieldsInsideRowColumnPruning()
+    {
+        assertResultAndSplitCount(
+                "SELECT grandparent.parent1.child1 FROM nested_fields WHERE id > 6",
+                Set.of(70.99, 80.99, 90.99, 100.99),
+                1);
+
+        assertResultAndSplitCount(
+                "SELECT grandparent.parent1.child1 FROM nested_fields WHERE id > 10",
+                Set.of(),
+                0);
+
+        // TODO pruning does not work on primitive fields inside a struct, expected splits should be 1 after file pruning (https://github.com/trinodb/trino/issues/17164)
+        assertResultAndSplitCount(
+                "SELECT grandparent.parent1.child1 FROM nested_fields WHERE parent.child1 > 600",
+                Set.of(70.99, 80.99, 90.99, 100.99),
+                2);
+
+        // TODO pruning does not work on primitive fields inside a struct, expected splits should be 0 after file pruning (https://github.com/trinodb/trino/issues/17164)
+        assertResultAndSplitCount(
+                "SELECT grandparent.parent1.child1 FROM nested_fields WHERE parent.child1 > 1000",
+                Set.of(),
+                2);
+    }
+
     @Test
     public void testJsonStatisticsPruningUppercaseColumn()
     {
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestTransactionLogAccess.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestTransactionLogAccess.java
index 1d3dd45303e2..281804f7bec3 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestTransactionLogAccess.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestTransactionLogAccess.java
@@ -41,8 +41,8 @@
 import io.trino.spi.type.IntegerType;
 import io.trino.spi.type.TypeManager;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.io.File;
 import java.io.IOException;
@@ -70,7 +70,9 @@
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.LAST_CHECKPOINT_FILENAME;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogUtil.TRANSACTION_LOG_DIRECTORY;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
+import static io.trino.testing.MultisetAssertions.assertMultisetsEqual;
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.lang.String.format;
@@ -79,11 +81,12 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toCollection;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true) // e.g. TrackingFileSystemFactory is shared mutable state
+@Execution(SAME_THREAD) // e.g. TrackingFileSystemFactory is shared mutable state
 public class TestTransactionLogAccess
 {
     private static final Set<String> EXPECTED_ADD_FILE_PATHS = ImmutableSet.of(
@@ -108,15 +111,15 @@ public class TestTransactionLogAccess
             new RemoveFileEntry("age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet", 1579190155406L, false),
             new RemoveFileEntry("age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet", 1579190163932L, false));
 
-    private final TrackingFileSystemFactory trackingFileSystemFactory = new TrackingFileSystemFactory(new HdfsFileSystemFactory(HDFS_ENVIRONMENT));
+    private final TrackingFileSystemFactory trackingFileSystemFactory = new TrackingFileSystemFactory(new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS));
 
     private TransactionLogAccess transactionLogAccess;
     private TableSnapshot tableSnapshot;
 
-    private void setupTransactionLogAccess(String tableName)
+    private void setupTransactionLogAccessFromResources(String tableName, String resourcePath)
             throws Exception
     {
-        setupTransactionLogAccess(tableName, getClass().getClassLoader().getResource("databricks/" + tableName).toString());
+        setupTransactionLogAccess(tableName, getClass().getClassLoader().getResource(resourcePath).toString());
     }
 
     private void setupTransactionLogAccess(String tableName, String tableLocation)
@@ -144,8 +147,10 @@ private void setupTransactionLogAccess(String tableName, String tableLocation, D
         DeltaLakeTableHandle tableHandle = new DeltaLakeTableHandle(
                 "schema",
                 tableName,
+                true,
                 "location",
                 new MetadataEntry("id", "test", "description", null, "", ImmutableList.of(), ImmutableMap.of(), 0),
+                new ProtocolEntry(1, 2, Optional.empty(), Optional.empty()),
                 TupleDomain.none(),
                 TupleDomain.none(),
                 Optional.empty(),
@@ -153,24 +158,23 @@ private void setupTransactionLogAccess(String tableName, String tableLocation, D
                 Optional.empty(),
                 Optional.empty(),
                 Optional.empty(),
-                0,
-                false);
+                0);
 
-        tableSnapshot = transactionLogAccess.loadSnapshot(tableHandle.getSchemaTableName(), tableLocation, SESSION);
+        tableSnapshot = transactionLogAccess.loadSnapshot(SESSION, tableHandle.getSchemaTableName(), tableLocation);
     }
 
     @Test
     public void testGetMetadataEntry()
             throws Exception
     {
-        setupTransactionLogAccess("person");
+        setupTransactionLogAccessFromResources("person", "databricks73/person");
 
         MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
 
         assertEquals(metadataEntry.getCreatedTime(), 1579190100722L);
         assertEquals(metadataEntry.getId(), "b6aeffad-da73-4dde-b68e-937e468b1fdf");
         assertThat(metadataEntry.getOriginalPartitionColumns()).containsOnly("age");
-        assertThat(metadataEntry.getCanonicalPartitionColumns()).containsOnly("age");
+        assertThat(metadataEntry.getLowercasePartitionColumns()).containsOnly("age");
 
         MetadataEntry.Format format = metadataEntry.getFormat();
         assertEquals(format.getOptions().keySet().size(), 0);
@@ -183,10 +187,10 @@ public void testGetMetadataEntry()
     public void testGetMetadataEntryUppercase()
             throws Exception
     {
-        setupTransactionLogAccess("uppercase_columns");
+        setupTransactionLogAccessFromResources("uppercase_columns", "databricks73/uppercase_columns");
         MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
         assertThat(metadataEntry.getOriginalPartitionColumns()).containsOnly("ALA");
-        assertThat(metadataEntry.getCanonicalPartitionColumns()).containsOnly("ala");
+        assertThat(metadataEntry.getLowercasePartitionColumns()).containsOnly("ala");
         assertEquals(tableSnapshot.getCachedMetadata(), Optional.of(metadataEntry));
     }
 
@@ -194,9 +198,11 @@ public void testGetMetadataEntryUppercase()
     public void testGetActiveAddEntries()
             throws Exception
     {
-        setupTransactionLogAccess("person");
+        setupTransactionLogAccessFromResources("person", "databricks73/person");
 
-        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
+        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
         Set<String> paths = addFileEntries
                 .stream()
                 .map(AddFileEntry::getPath)
@@ -224,9 +230,11 @@ public void testGetActiveAddEntries()
     public void testAddFileEntryUppercase()
             throws Exception
     {
-        setupTransactionLogAccess("uppercase_columns");
+        setupTransactionLogAccessFromResources("uppercase_columns", "databricks73/uppercase_columns");
 
-        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
+        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
         AddFileEntry addFileEntry = addFileEntries
                 .stream()
                 .filter(entry -> entry.getPath().equals("ALA=1/part-00000-20a863e0-890d-4776-8825-f9dccc8973ba.c000.snappy.parquet"))
@@ -237,7 +245,7 @@ public void testAddFileEntryUppercase()
                 .containsEntry("ALA", "1");
         assertThat(addFileEntry.getCanonicalPartitionValues())
                 .hasSize(1)
-                .containsEntry("ala", Optional.of("1"));
+                .containsEntry("ALA", Optional.of("1"));
     }
 
     @Test
@@ -247,8 +255,10 @@ public void testAddEntryPruning()
         // Test data contains two add entries which should be pruned:
         // - Added in the parquet checkpoint but removed in a JSON commit
         // - Added in a JSON commit and removed in a later JSON commit
-        setupTransactionLogAccess("person_test_pruning");
-        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+        setupTransactionLogAccessFromResources("person_test_pruning", "databricks73/person_test_pruning");
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
+        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
         Set<String> paths = addFileEntries
                 .stream()
                 .map(AddFileEntry::getPath)
@@ -262,8 +272,10 @@ public void testAddEntryPruning()
     public void testAddEntryOverrides()
             throws Exception
     {
-        setupTransactionLogAccess("person_test_pruning");
-        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+        setupTransactionLogAccessFromResources("person_test_pruning", "databricks73/person_test_pruning");
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
+        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
 
         // Test data contains two entries which are added multiple times, the most up to date one should be the only one in the active list
         List<String> overwrittenPaths = ImmutableList.of(
@@ -283,8 +295,10 @@ public void testAddEntryOverrides()
     public void testAddRemoveAdd()
             throws Exception
     {
-        setupTransactionLogAccess("person_test_pruning");
-        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+        setupTransactionLogAccessFromResources("person_test_pruning", "databricks73/person_test_pruning");
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
+        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
 
         // Test data contains an entry added by the parquet checkpoint, removed by a JSON action, and then added back by a later JSON action
         List<AddFileEntry> activeEntries = addFileEntries.stream()
@@ -299,7 +313,7 @@ public void testAddRemoveAdd()
     public void testGetRemoveEntries()
             throws Exception
     {
-        setupTransactionLogAccess("person");
+        setupTransactionLogAccessFromResources("person", "databricks73/person");
 
         try (Stream<RemoveFileEntry> removeEntries = transactionLogAccess.getRemoveEntries(tableSnapshot, SESSION)) {
             Set<RemoveFileEntry> removedEntries = removeEntries.collect(Collectors.toSet());
@@ -311,7 +325,7 @@ public void testGetRemoveEntries()
     public void testGetCommitInfoEntries()
             throws Exception
     {
-        setupTransactionLogAccess("person");
+        setupTransactionLogAccessFromResources("person", "databricks73/person");
         try (Stream<CommitInfoEntry> commitInfoEntries = transactionLogAccess.getCommitInfoEntries(tableSnapshot, SESSION)) {
             Set<CommitInfoEntry> entrySet = commitInfoEntries.collect(Collectors.toSet());
             assertEquals(
@@ -329,23 +343,20 @@ public void testGetCommitInfoEntries()
         }
     }
 
-    // Broader tests which validate common attributes across the wider data set
-    @DataProvider
-    public Object[][] tableNames()
+    @Test
+    public void testAllGetMetadataEntry()
+            throws Exception
     {
-        return new Object[][] {
-                {"person"},
-                {"person_without_last_checkpoint"},
-                {"person_without_old_jsons"},
-                {"person_without_checkpoints"}
-        };
+        testAllGetMetadataEntry("person", "databricks73/person");
+        testAllGetMetadataEntry("person_without_last_checkpoint", "databricks73/person_without_last_checkpoint");
+        testAllGetMetadataEntry("person_without_old_jsons", "databricks73/person_without_old_jsons");
+        testAllGetMetadataEntry("person_without_checkpoints", "databricks73/person_without_checkpoints");
     }
 
-    @Test(dataProvider = "tableNames")
-    public void testAllGetMetadataEntry(String tableName)
+    private void testAllGetMetadataEntry(String tableName, String resourcePath)
             throws Exception
     {
-        setupTransactionLogAccess(tableName);
+        setupTransactionLogAccessFromResources(tableName, resourcePath);
 
         transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
         MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
@@ -357,13 +368,23 @@ public void testAllGetMetadataEntry(String tableName)
         assertEquals(format.getProvider(), "parquet");
     }
 
-    @Test(dataProvider = "tableNames")
-    public void testAllGetActiveAddEntries(String tableName)
+    @Test
+    public void testAllGetActiveAddEntries()
             throws Exception
     {
-        setupTransactionLogAccess(tableName);
+        testAllGetActiveAddEntries("person", "databricks73/person");
+        testAllGetActiveAddEntries("person_without_last_checkpoint", "databricks73/person_without_last_checkpoint");
+        testAllGetActiveAddEntries("person_without_old_jsons", "databricks73/person_without_old_jsons");
+        testAllGetActiveAddEntries("person_without_checkpoints", "databricks73/person_without_checkpoints");
+    }
 
-        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+    private void testAllGetActiveAddEntries(String tableName, String resourcePath)
+            throws Exception
+    {
+        setupTransactionLogAccessFromResources(tableName, resourcePath);
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
+        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
         Set<String> paths = addFileEntries
                 .stream()
                 .map(AddFileEntry::getPath)
@@ -372,11 +393,20 @@ public void testAllGetActiveAddEntries(String tableName)
         assertEquals(paths, EXPECTED_ADD_FILE_PATHS);
     }
 
-    @Test(dataProvider = "tableNames")
-    public void testAllGetRemoveEntries(String tableName)
+    @Test
+    public void testAllGetRemoveEntries()
             throws Exception
     {
-        setupTransactionLogAccess(tableName);
+        testAllGetRemoveEntries("person", "databricks73/person");
+        testAllGetRemoveEntries("person_without_last_checkpoint", "databricks73/person_without_last_checkpoint");
+        testAllGetRemoveEntries("person_without_old_jsons", "databricks73/person_without_old_jsons");
+        testAllGetRemoveEntries("person_without_checkpoints", "databricks73/person_without_checkpoints");
+    }
+
+    private void testAllGetRemoveEntries(String tableName, String resourcePath)
+            throws Exception
+    {
+        setupTransactionLogAccessFromResources(tableName, resourcePath);
 
         try (Stream<RemoveFileEntry> removeEntries = transactionLogAccess.getRemoveEntries(tableSnapshot, SESSION)) {
             Set<String> removedPaths = removeEntries.map(RemoveFileEntry::getPath).collect(Collectors.toSet());
@@ -386,11 +416,20 @@ public void testAllGetRemoveEntries(String tableName)
         }
     }
 
-    @Test(dataProvider = "tableNames")
-    public void testAllGetProtocolEntries(String tableName)
+    @Test
+    public void testAllGetProtocolEntries()
             throws Exception
     {
-        setupTransactionLogAccess(tableName);
+        testAllGetProtocolEntries("person", "databricks73/person");
+        testAllGetProtocolEntries("person_without_last_checkpoint", "databricks73/person_without_last_checkpoint");
+        testAllGetProtocolEntries("person_without_old_jsons", "databricks73/person_without_old_jsons");
+        testAllGetProtocolEntries("person_without_checkpoints", "databricks73/person_without_checkpoints");
+    }
+
+    private void testAllGetProtocolEntries(String tableName, String resourcePath)
+            throws Exception
+    {
+        setupTransactionLogAccessFromResources(tableName, resourcePath);
 
         try (Stream<ProtocolEntry> protocolEntryStream = transactionLogAccess.getProtocolEntries(tableSnapshot, SESSION)) {
             List<ProtocolEntry> protocolEntries = protocolEntryStream.toList();
@@ -410,7 +449,7 @@ public void testMetadataCacheUpdates()
         File transactionLogDir = new File(tableDir, TRANSACTION_LOG_DIRECTORY);
         transactionLogDir.mkdirs();
 
-        java.nio.file.Path resourceDir = java.nio.file.Paths.get(getClass().getClassLoader().getResource("databricks/person/_delta_log").toURI());
+        java.nio.file.Path resourceDir = java.nio.file.Paths.get(getClass().getClassLoader().getResource("databricks73/person/_delta_log").toURI());
         for (int i = 0; i < 12; i++) {
             String extension = i == 10 ? ".checkpoint.parquet" : ".json";
             String fileName = format("%020d%s", i, extension);
@@ -423,7 +462,7 @@ public void testMetadataCacheUpdates()
 
         String lastTransactionName = format("%020d.json", 12);
         Files.copy(resourceDir.resolve(lastTransactionName), new File(transactionLogDir, lastTransactionName).toPath());
-        TableSnapshot updatedSnapshot = transactionLogAccess.loadSnapshot(new SchemaTableName("schema", tableName), tableDir.toURI().toString(), SESSION);
+        TableSnapshot updatedSnapshot = transactionLogAccess.loadSnapshot(SESSION, new SchemaTableName("schema", tableName), tableDir.toURI().toString());
         assertEquals(updatedSnapshot.getVersion(), 12);
     }
 
@@ -437,11 +476,12 @@ public void testUpdatingTailEntriesNoCheckpoint()
         File transactionLogDir = new File(tableDir, TRANSACTION_LOG_DIRECTORY);
         transactionLogDir.mkdirs();
 
-        File resourceDir = new File(getClass().getClassLoader().getResource("databricks/person/_delta_log").toURI());
+        File resourceDir = new File(getClass().getClassLoader().getResource("databricks73/person/_delta_log").toURI());
         copyTransactionLogEntry(0, 7, resourceDir, transactionLogDir);
         setupTransactionLogAccess(tableName, tableDir.toURI().toString());
-
-        List<AddFileEntry> activeDataFiles = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
+        List<AddFileEntry> activeDataFiles = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
 
         Set<String> dataFiles = ImmutableSet.of(
                 "age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet",
@@ -454,8 +494,8 @@ public void testUpdatingTailEntriesNoCheckpoint()
         assertEqualsIgnoreOrder(activeDataFiles.stream().map(AddFileEntry::getPath).collect(Collectors.toSet()), dataFiles);
 
         copyTransactionLogEntry(7, 9, resourceDir, transactionLogDir);
-        TableSnapshot updatedSnapshot = transactionLogAccess.loadSnapshot(new SchemaTableName("schema", tableName), tableDir.toURI().toString(), SESSION);
-        activeDataFiles = transactionLogAccess.getActiveFiles(updatedSnapshot, SESSION);
+        TableSnapshot updatedSnapshot = transactionLogAccess.loadSnapshot(SESSION, new SchemaTableName("schema", tableName), tableDir.toURI().toString());
+        activeDataFiles = transactionLogAccess.getActiveFiles(updatedSnapshot, metadataEntry, protocolEntry, SESSION);
 
         dataFiles = ImmutableSet.of(
                 "age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet",
@@ -479,11 +519,13 @@ public void testLoadingTailEntriesPastCheckpoint()
         File transactionLogDir = new File(tableDir, TRANSACTION_LOG_DIRECTORY);
         transactionLogDir.mkdirs();
 
-        File resourceDir = new File(getClass().getClassLoader().getResource("databricks/person/_delta_log").toURI());
+        File resourceDir = new File(getClass().getClassLoader().getResource("databricks73/person/_delta_log").toURI());
         copyTransactionLogEntry(0, 8, resourceDir, transactionLogDir);
         setupTransactionLogAccess(tableName, tableDir.toURI().toString());
 
-        List<AddFileEntry> activeDataFiles = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
+        List<AddFileEntry> activeDataFiles = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
 
         Set<String> dataFiles = ImmutableSet.of(
                 "age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet",
@@ -497,8 +539,8 @@ public void testLoadingTailEntriesPastCheckpoint()
 
         copyTransactionLogEntry(8, 12, resourceDir, transactionLogDir);
         Files.copy(new File(resourceDir, LAST_CHECKPOINT_FILENAME).toPath(), new File(transactionLogDir, LAST_CHECKPOINT_FILENAME).toPath());
-        TableSnapshot updatedSnapshot = transactionLogAccess.loadSnapshot(new SchemaTableName("schema", tableName), tableDir.toURI().toString(), SESSION);
-        activeDataFiles = transactionLogAccess.getActiveFiles(updatedSnapshot, SESSION);
+        TableSnapshot updatedSnapshot = transactionLogAccess.loadSnapshot(SESSION, new SchemaTableName("schema", tableName), tableDir.toURI().toString());
+        activeDataFiles = transactionLogAccess.getActiveFiles(updatedSnapshot, metadataEntry, protocolEntry, SESSION);
 
         dataFiles = ImmutableSet.of(
                 "age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet",
@@ -519,15 +561,19 @@ public void testLoadingTailEntriesPastCheckpoint()
     public void testIncrementalCacheUpdates()
             throws Exception
     {
+        setupTransactionLogAccessFromResources("person", "databricks73/person");
+
         String tableName = "person";
         File tempDir = Files.createTempDirectory(null).toFile();
         File tableDir = new File(tempDir, tableName);
         File transactionLogDir = new File(tableDir, TRANSACTION_LOG_DIRECTORY);
         transactionLogDir.mkdirs();
 
-        File resourceDir = new File(getClass().getClassLoader().getResource("databricks/person/_delta_log").toURI());
+        File resourceDir = new File(getClass().getClassLoader().getResource("databricks73/person/_delta_log").toURI());
         copyTransactionLogEntry(0, 12, resourceDir, transactionLogDir);
         Files.copy(new File(resourceDir, LAST_CHECKPOINT_FILENAME).toPath(), new File(transactionLogDir, LAST_CHECKPOINT_FILENAME).toPath());
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
 
         Set<String> originalDataFiles = ImmutableSet.of(
                 "age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet",
@@ -544,15 +590,15 @@ public void testIncrementalCacheUpdates()
         assertFileSystemAccesses(
                 () -> {
                     setupTransactionLogAccess(tableName, tableDir.toURI().toString());
-                    List<AddFileEntry> activeDataFiles = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+                    List<AddFileEntry> activeDataFiles = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
                     assertEqualsIgnoreOrder(activeDataFiles.stream().map(AddFileEntry::getPath).collect(Collectors.toSet()), originalDataFiles);
                 },
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 4) // TODO (https://github.com/trinodb/trino/issues/16775) why not e.g. once?
-                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_NEW_STREAM), 2)
-                        .addCopies(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM), 1)
+                        .add(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 2) // TODO (https://github.com/trinodb/trino/issues/16775) why not e.g. once?
+                        .add(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM))
                         .build());
 
         copyTransactionLogEntry(12, 14, resourceDir, transactionLogDir);
@@ -561,15 +607,15 @@ public void testIncrementalCacheUpdates()
                 "age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet");
         assertFileSystemAccesses(
                 () -> {
-                    TableSnapshot updatedTableSnapshot = transactionLogAccess.loadSnapshot(new SchemaTableName("schema", tableName), tableDir.toURI().toString(), SESSION);
-                    List<AddFileEntry> activeDataFiles = transactionLogAccess.getActiveFiles(updatedTableSnapshot, SESSION);
+                    TableSnapshot updatedTableSnapshot = transactionLogAccess.loadSnapshot(SESSION, new SchemaTableName("schema", tableName), tableDir.toURI().toString());
+                    List<AddFileEntry> activeDataFiles = transactionLogAccess.getActiveFiles(updatedTableSnapshot, metadataEntry, protocolEntry, SESSION);
                     assertEqualsIgnoreOrder(activeDataFiles.stream().map(AddFileEntry::getPath).collect(Collectors.toSet()), union(originalDataFiles, newDataFiles));
                 },
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM), 1)
+                        .add(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM))
                         .addCopies(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM), 2)
                         .addCopies(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM), 2)
-                        .addCopies(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM), 1)
+                        .add(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM))
                         .build());
     }
 
@@ -583,27 +629,29 @@ public void testSnapshotsAreConsistent()
         File transactionLogDir = new File(tableDir, TRANSACTION_LOG_DIRECTORY);
         transactionLogDir.mkdirs();
 
-        File resourceDir = new File(getClass().getClassLoader().getResource("databricks/person/_delta_log").toURI());
+        File resourceDir = new File(getClass().getClassLoader().getResource("databricks73/person/_delta_log").toURI());
         copyTransactionLogEntry(0, 12, resourceDir, transactionLogDir);
         Files.copy(new File(resourceDir, LAST_CHECKPOINT_FILENAME).toPath(), new File(transactionLogDir, LAST_CHECKPOINT_FILENAME).toPath());
 
         setupTransactionLogAccess(tableName, tableDir.toURI().toString());
-        List<AddFileEntry> expectedDataFiles = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
+        List<AddFileEntry> expectedDataFiles = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
 
         copyTransactionLogEntry(12, 14, resourceDir, transactionLogDir);
         Set<String> newDataFiles = ImmutableSet.of(
                 "age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet",
                 "age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet");
-        TableSnapshot updatedTableSnapshot = transactionLogAccess.loadSnapshot(new SchemaTableName("schema", tableName), tableDir.toURI().toString(), SESSION);
-        List<AddFileEntry> allDataFiles = transactionLogAccess.getActiveFiles(updatedTableSnapshot, SESSION);
-        List<AddFileEntry> dataFilesWithFixedVersion = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+        TableSnapshot updatedTableSnapshot = transactionLogAccess.loadSnapshot(SESSION, new SchemaTableName("schema", tableName), tableDir.toURI().toString());
+        List<AddFileEntry> allDataFiles = transactionLogAccess.getActiveFiles(updatedTableSnapshot, metadataEntry, protocolEntry, SESSION);
+        List<AddFileEntry> dataFilesWithFixedVersion = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
         for (String newFilePath : newDataFiles) {
             assertTrue(allDataFiles.stream().anyMatch(entry -> entry.getPath().equals(newFilePath)));
             assertTrue(dataFilesWithFixedVersion.stream().noneMatch(entry -> entry.getPath().equals(newFilePath)));
         }
 
         assertEquals(expectedDataFiles.size(), dataFilesWithFixedVersion.size());
-        List<ColumnMetadata> columns = extractColumnMetadata(transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION), TESTING_TYPE_MANAGER);
+        List<ColumnMetadata> columns = extractColumnMetadata(transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION), transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot), TESTING_TYPE_MANAGER);
         for (int i = 0; i < expectedDataFiles.size(); i++) {
             AddFileEntry expected = expectedDataFiles.get(i);
             AddFileEntry actual = dataFilesWithFixedVersion.get(i);
@@ -619,10 +667,10 @@ public void testSnapshotsAreConsistent()
             assertTrue(actual.getStats().isPresent());
 
             for (ColumnMetadata column : columns) {
-                DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(column.getName(), column.getType(), OptionalInt.empty(), column.getName(), column.getType(), REGULAR);
+                DeltaLakeColumnHandle columnHandle = new DeltaLakeColumnHandle(column.getName(), column.getType(), OptionalInt.empty(), column.getName(), column.getType(), REGULAR, Optional.empty());
                 assertEquals(expected.getStats().get().getMinColumnValue(columnHandle), actual.getStats().get().getMinColumnValue(columnHandle));
                 assertEquals(expected.getStats().get().getMaxColumnValue(columnHandle), actual.getStats().get().getMaxColumnValue(columnHandle));
-                assertEquals(expected.getStats().get().getNullCount(columnHandle.getName()), actual.getStats().get().getNullCount(columnHandle.getName()));
+                assertEquals(expected.getStats().get().getNullCount(columnHandle.getBaseColumnName()), actual.getStats().get().getNullCount(columnHandle.getBaseColumnName()));
                 assertEquals(expected.getStats().get().getNumRecords(), actual.getStats().get().getNumRecords());
             }
         }
@@ -641,18 +689,18 @@ public void testAddNewTransactionLogs()
         String tableLocation = tableDir.toURI().toString();
         SchemaTableName schemaTableName = new SchemaTableName("schema", tableName);
 
-        File resourceDir = new File(getClass().getClassLoader().getResource("databricks/person/_delta_log").toURI());
+        File resourceDir = new File(getClass().getClassLoader().getResource("databricks73/person/_delta_log").toURI());
         copyTransactionLogEntry(0, 1, resourceDir, transactionLogDir);
 
         setupTransactionLogAccess(tableName, tableLocation);
         assertEquals(tableSnapshot.getVersion(), 0L);
 
         copyTransactionLogEntry(1, 2, resourceDir, transactionLogDir);
-        TableSnapshot firstUpdate = transactionLogAccess.loadSnapshot(schemaTableName, tableLocation, SESSION);
+        TableSnapshot firstUpdate = transactionLogAccess.loadSnapshot(SESSION, schemaTableName, tableLocation);
         assertEquals(firstUpdate.getVersion(), 1L);
 
         copyTransactionLogEntry(2, 3, resourceDir, transactionLogDir);
-        TableSnapshot secondUpdate = transactionLogAccess.loadSnapshot(schemaTableName, tableLocation, SESSION);
+        TableSnapshot secondUpdate = transactionLogAccess.loadSnapshot(SESSION, schemaTableName, tableLocation);
         assertEquals(secondUpdate.getVersion(), 2L);
     }
 
@@ -662,9 +710,11 @@ public void testParquetStructStatistics()
     {
         // See README.md for table contents
         String tableName = "parquet_struct_statistics";
-        setupTransactionLogAccess(tableName, getClass().getClassLoader().getResource("databricks/pruning/" + tableName).toURI().toString());
+        setupTransactionLogAccess(tableName, getClass().getClassLoader().getResource("databricks73/pruning/" + tableName).toURI().toString());
 
-        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
+        List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
 
         AddFileEntry addFileEntry = addFileEntries.stream()
                 .filter(entry -> entry.getPath().equalsIgnoreCase("part-00000-0e22455f-5650-442f-a094-e1a8b7ed2271-c000.snappy.parquet"))
@@ -692,11 +742,11 @@ public void testParquetStructStatistics()
             // Types would need to be specified properly if stats were being read from JSON but are not can be ignored when reading parsed stats from parquet,
             // so it is safe to use INTEGER as a placeholder
             assertEquals(
-                    fileStats.getMinColumnValue(new DeltaLakeColumnHandle(columnName, IntegerType.INTEGER, OptionalInt.empty(), columnName, IntegerType.INTEGER, REGULAR)),
+                    fileStats.getMinColumnValue(new DeltaLakeColumnHandle(columnName, IntegerType.INTEGER, OptionalInt.empty(), columnName, IntegerType.INTEGER, REGULAR, Optional.empty())),
                     Optional.of(statsValues.get(columnName)));
 
             assertEquals(
-                    fileStats.getMaxColumnValue(new DeltaLakeColumnHandle(columnName, IntegerType.INTEGER, OptionalInt.empty(), columnName, IntegerType.INTEGER, REGULAR)),
+                    fileStats.getMaxColumnValue(new DeltaLakeColumnHandle(columnName, IntegerType.INTEGER, OptionalInt.empty(), columnName, IntegerType.INTEGER, REGULAR, Optional.empty())),
                     Optional.of(statsValues.get(columnName)));
         }
     }
@@ -706,7 +756,7 @@ public void testTableSnapshotsCacheDisabled()
             throws Exception
     {
         String tableName = "person";
-        String tableDir = getClass().getClassLoader().getResource("databricks/" + tableName).toURI().toString();
+        String tableDir = getClass().getClassLoader().getResource("databricks73/" + tableName).toURI().toString();
         DeltaLakeConfig cacheDisabledConfig = new DeltaLakeConfig();
         cacheDisabledConfig.setMetadataCacheTtl(new Duration(0, TimeUnit.SECONDS));
 
@@ -715,24 +765,24 @@ public void testTableSnapshotsCacheDisabled()
                     setupTransactionLogAccess(tableName, tableDir, cacheDisabledConfig);
                 },
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM), 1)
+                        .add(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM))
                         .build());
 
         // With the transaction log cache disabled, when loading the snapshot again, all the needed files will be opened again
         assertFileSystemAccesses(
                 () -> {
-                    transactionLogAccess.loadSnapshot(new SchemaTableName("schema", tableName), tableDir, SESSION);
+                    transactionLogAccess.loadSnapshot(SESSION, new SchemaTableName("schema", tableName), tableDir);
                 },
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM), 1)
+                        .add(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM))
                         .build());
     }
 
@@ -740,31 +790,35 @@ public void testTableSnapshotsCacheDisabled()
     public void testTableSnapshotsActiveDataFilesCache()
             throws Exception
     {
+        setupTransactionLogAccessFromResources("person", "databricks73/person");
+
         String tableName = "person";
-        String tableDir = getClass().getClassLoader().getResource("databricks/" + tableName).toURI().toString();
+        String tableDir = getClass().getClassLoader().getResource("databricks73/" + tableName).toURI().toString();
         DeltaLakeConfig shortLivedActiveDataFilesCacheConfig = new DeltaLakeConfig();
         shortLivedActiveDataFilesCacheConfig.setDataFileCacheTtl(new Duration(10, TimeUnit.MINUTES));
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
 
         assertFileSystemAccesses(
                 () -> {
                     setupTransactionLogAccess(tableName, tableDir, shortLivedActiveDataFilesCacheConfig);
-                    List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+                    List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
                     assertEquals(addFileEntries.size(), 12);
                 },
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 4) // TODO (https://github.com/trinodb/trino/issues/16775) why not e.g. once?
-                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 2) // TODO (https://github.com/trinodb/trino/issues/16775) why not e.g. once?
+                        .add(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_NEW_STREAM))
                         .build());
 
         // The internal data cache should still contain the data files for the table
         assertFileSystemAccesses(
                 () -> {
-                    List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+                    List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
                     assertEquals(addFileEntries.size(), 12);
                 },
                 ImmutableMultiset.of());
@@ -774,43 +828,47 @@ public void testTableSnapshotsActiveDataFilesCache()
     public void testFlushSnapshotAndActiveFileCache()
             throws Exception
     {
+        setupTransactionLogAccessFromResources("person", "databricks73/person");
+
         String tableName = "person";
-        String tableDir = getClass().getClassLoader().getResource("databricks/" + tableName).toURI().toString();
+        String tableDir = getClass().getClassLoader().getResource("databricks73/" + tableName).toURI().toString();
         DeltaLakeConfig shortLivedActiveDataFilesCacheConfig = new DeltaLakeConfig();
         shortLivedActiveDataFilesCacheConfig.setDataFileCacheTtl(new Duration(10, TimeUnit.MINUTES));
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
 
         assertFileSystemAccesses(
                 () -> {
                     setupTransactionLogAccess(tableName, tableDir, shortLivedActiveDataFilesCacheConfig);
-                    List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+                    List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
                     assertEquals(addFileEntries.size(), 12);
                 },
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 4) // TODO (https://github.com/trinodb/trino/issues/16775) why not e.g. once?
-                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 2) // TODO (https://github.com/trinodb/trino/issues/16775) why not e.g. once?
+                        .add(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_NEW_STREAM))
                         .build());
 
         // Flush all cache and then load snapshot and get active files
         transactionLogAccess.flushCache();
         assertFileSystemAccesses(
                 () -> {
-                    transactionLogAccess.loadSnapshot(new SchemaTableName("schema", tableName), tableDir, SESSION);
-                    List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+                    transactionLogAccess.loadSnapshot(SESSION, new SchemaTableName("schema", tableName), tableDir);
+                    List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
                     assertEquals(addFileEntries.size(), 12);
                 },
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 4) // TODO (https://github.com/trinodb/trino/issues/16775) why not e.g. once?
-                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 2) // TODO (https://github.com/trinodb/trino/issues/16775) why not e.g. once?
+                        .add(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_NEW_STREAM))
                         .build());
     }
 
@@ -818,37 +876,41 @@ public void testFlushSnapshotAndActiveFileCache()
     public void testTableSnapshotsActiveDataFilesCacheDisabled()
             throws Exception
     {
+        setupTransactionLogAccessFromResources("person", "databricks73/person");
+
         String tableName = "person";
-        String tableDir = getClass().getClassLoader().getResource("databricks/" + tableName).toURI().toString();
+        String tableDir = getClass().getClassLoader().getResource("databricks73/" + tableName).toURI().toString();
         DeltaLakeConfig shortLivedActiveDataFilesCacheConfig = new DeltaLakeConfig();
         shortLivedActiveDataFilesCacheConfig.setDataFileCacheTtl(new Duration(0, TimeUnit.SECONDS));
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
 
         assertFileSystemAccesses(
                 () -> {
                     setupTransactionLogAccess(tableName, tableDir, shortLivedActiveDataFilesCacheConfig);
-                    List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+                    List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
                     assertEquals(addFileEntries.size(), 12);
                 },
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 4) // TODO (https://github.com/trinodb/trino/issues/16775) why not e.g. once?
-                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000011.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000012.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000013.json", INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation("00000000000000000014.json", INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 2) // TODO (https://github.com/trinodb/trino/issues/16775) why not e.g. once?
+                        .add(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_NEW_STREAM))
                         .build());
 
         // With no caching for the transaction log entries, when loading the snapshot again,
         // the checkpoint file will be read again
         assertFileSystemAccesses(
                 () -> {
-                    List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, SESSION);
+                    List<AddFileEntry> addFileEntries = transactionLogAccess.getActiveFiles(tableSnapshot, metadataEntry, protocolEntry, SESSION);
                     assertEquals(addFileEntries.size(), 12);
                 },
                 ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 4) // TODO (https://github.com/trinodb/trino/issues/16775) why not e.g. once?
-                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_GET_LENGTH), 2) // TODO (https://github.com/trinodb/trino/issues/16775) why not e.g. once?
+                        .add(new FileOperation("00000000000000000010.checkpoint.parquet", INPUT_FILE_NEW_STREAM))
                         .build());
     }
 
@@ -870,7 +932,7 @@ private void assertFileSystemAccesses(ThrowingRunnable callback, Multiset<FileOp
     {
         trackingFileSystemFactory.reset();
         callback.run();
-        assertThat(getOperations()).containsExactlyInAnyOrderElementsOf(expectedAccesses);
+        assertMultisetsEqual(getOperations(), expectedAccesses);
     }
 
     private Multiset<FileOperation> getOperations()
@@ -878,8 +940,8 @@ private Multiset<FileOperation> getOperations()
         return trackingFileSystemFactory.getOperationCounts()
                 .entrySet().stream()
                 .flatMap(entry -> nCopies(entry.getValue(), new FileOperation(
-                        entry.getKey().getFilePath().replaceFirst(".*/_delta_log/", ""),
-                        entry.getKey().getOperationType())).stream())
+                        entry.getKey().location().toString().replaceFirst(".*/_delta_log/", ""),
+                        entry.getKey().operationType())).stream())
                 .collect(toCollection(HashMultiset::create));
     }
 
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestingDeltaLakeUtils.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestingDeltaLakeUtils.java
index a2313d42e24e..618c953171eb 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestingDeltaLakeUtils.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestingDeltaLakeUtils.java
@@ -13,39 +13,59 @@
  */
 package io.trino.plugin.deltalake;
 
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
+import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
+import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
 import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
-import io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointSchemaManager;
-import io.trino.plugin.hive.FileFormatDataSourceStats;
-import io.trino.plugin.hive.parquet.ParquetReaderConfig;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.testing.TestingConnectorContext;
+import io.trino.testing.DistributedQueryRunner;
 
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
+import java.util.stream.Stream;
 
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
 import static io.trino.testing.TestingConnectorSession.SESSION;
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
 public final class TestingDeltaLakeUtils
 {
     private TestingDeltaLakeUtils() {}
 
-    public static List<AddFileEntry> getAddFileEntries(String tableLocation)
+    public static <T> T getConnectorService(DistributedQueryRunner queryRunner, Class<T> clazz)
+    {
+        return ((DeltaLakeConnector) queryRunner.getCoordinator().getConnector(DELTA_CATALOG)).getInjector().getInstance(clazz);
+    }
+
+    public static List<AddFileEntry> getTableActiveFiles(TransactionLogAccess transactionLogAccess, String tableLocation)
             throws IOException
     {
         SchemaTableName dummyTable = new SchemaTableName("dummy_schema_placeholder", "dummy_table_placeholder");
-        TestingConnectorContext context = new TestingConnectorContext();
 
-        TransactionLogAccess transactionLogAccess = new TransactionLogAccess(
-                context.getTypeManager(),
-                new CheckpointSchemaManager(context.getTypeManager()),
-                new DeltaLakeConfig(),
-                new FileFormatDataSourceStats(),
-                new HdfsFileSystemFactory(HDFS_ENVIRONMENT),
-                new ParquetReaderConfig());
+        // force entries to have JSON serializable statistics
+        transactionLogAccess.flushCache();
 
-        return transactionLogAccess.getActiveFiles(transactionLogAccess.loadSnapshot(dummyTable, tableLocation, SESSION), SESSION);
+        TableSnapshot snapshot = transactionLogAccess.loadSnapshot(SESSION, dummyTable, tableLocation);
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(snapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, snapshot);
+        return transactionLogAccess.getActiveFiles(snapshot, metadataEntry, protocolEntry, SESSION);
+    }
+
+    public static void copyDirectoryContents(Path source, Path destination)
+            throws IOException
+    {
+        try (Stream<Path> stream = Files.walk(source)) {
+            stream.forEach(file -> {
+                try {
+                    Files.copy(file, destination.resolve(source.relativize(file)), REPLACE_EXISTING);
+                }
+                catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
     }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/delete/TestBase85Codec.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/delete/TestBase85Codec.java
new file mode 100644
index 000000000000..e03554d88446
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/delete/TestBase85Codec.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.delete;
+
+import org.junit.jupiter.api.Test;
+
+import java.nio.ByteBuffer;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.plugin.deltalake.delete.Base85Codec.BASE;
+import static io.trino.plugin.deltalake.delete.Base85Codec.BASE_2ND_POWER;
+import static io.trino.plugin.deltalake.delete.Base85Codec.BASE_3RD_POWER;
+import static io.trino.plugin.deltalake.delete.Base85Codec.BASE_4TH_POWER;
+import static io.trino.plugin.deltalake.delete.Base85Codec.ENCODE_MAP;
+import static io.trino.plugin.deltalake.delete.Base85Codec.decode;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestBase85Codec
+{
+    @Test
+    public void testDecodeBlocksIllegalCharacter()
+    {
+        assertThatThrownBy(() -> decode("ab" + 0x7F + "de")).hasMessageContaining("Input should be 5 character aligned");
+
+        assertThatThrownBy(() -> decode("abîde")).hasMessageContaining("Input character is not ASCII: [î]");
+        assertThatThrownBy(() -> decode("abπde")).hasMessageContaining("Input character is not ASCII: [π]");
+        assertThatThrownBy(() -> decode("ab\"de")).hasMessageContaining("Invalid input character: [\"]");
+    }
+
+    @Test
+    public void testEncodeBytes()
+    {
+        // The test case comes from https://rfc.zeromq.org/spec/32
+        //noinspection NumericCastThatLosesPrecision
+        byte[] inputBytes = new byte[] {(byte) 0x86, 0x4F, (byte) 0xD2, 0x6F, (byte) 0xB5, 0x59, (byte) 0xF7, 0x5B};
+        String encoded = encodeBytes(inputBytes);
+        assertThat(encoded).isEqualTo("HelloWorld");
+    }
+
+    @Test
+    public void testCodecRoundTrip()
+    {
+        assertThat(encodeBytes(Base85Codec.decode("HelloWorld")))
+                .isEqualTo("HelloWorld");
+        assertThat(encodeBytes(Base85Codec.decode("wi5b=000010000siXQKl0rr91000f55c8Xg0@@D72lkbi5=-{L")))
+                .isEqualTo("wi5b=000010000siXQKl0rr91000f55c8Xg0@@D72lkbi5=-{L");
+    }
+
+    @Test
+    public void testDecodeBytes()
+    {
+        String data = "HelloWorld";
+        byte[] bytes = Base85Codec.decode(data);
+        //noinspection NumericCastThatLosesPrecision
+        assertThat(bytes).isEqualTo(new byte[] {(byte) 0x86, 0x4F, (byte) 0xD2, 0x6F, (byte) 0xB5, 0x59, (byte) 0xF7, 0x5B});
+    }
+
+    private static String encodeBytes(byte[] input)
+    {
+        if (input.length % 4 == 0) {
+            return encodeBlocks(ByteBuffer.wrap(input));
+        }
+        int alignedLength = ((input.length + 4) / 4) * 4;
+        ByteBuffer buffer = ByteBuffer.allocate(alignedLength);
+        buffer.put(input);
+        while (buffer.hasRemaining()) {
+            buffer.put((byte) 0);
+        }
+        buffer.rewind();
+        return encodeBlocks(buffer);
+    }
+
+    private static String encodeBlocks(ByteBuffer buffer)
+    {
+        checkArgument(buffer.remaining() % 4 == 0);
+        int numBlocks = buffer.remaining() / 4;
+        // Every 4 byte block gets encoded into 5 bytes/chars
+        int outputLength = numBlocks * 5;
+        byte[] output = new byte[outputLength];
+        int outputIndex = 0;
+
+        while (buffer.hasRemaining()) {
+            long word = Integer.toUnsignedLong(buffer.getInt()) & 0x00000000ffffffffL;
+            output[outputIndex] = ENCODE_MAP[(int) (word / BASE_4TH_POWER)];
+            word %= BASE_4TH_POWER;
+            output[outputIndex + 1] = ENCODE_MAP[(int) (word / BASE_3RD_POWER)];
+            word %= BASE_3RD_POWER;
+            output[outputIndex + 2] = ENCODE_MAP[(int) (word / BASE_2ND_POWER)];
+            word %= BASE_2ND_POWER;
+            output[outputIndex + 3] = ENCODE_MAP[(int) (word / BASE)];
+            output[outputIndex + 4] = ENCODE_MAP[(int) (word % BASE)];
+            outputIndex += 5;
+        }
+        return new String(output, UTF_8);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/delete/TestDeletionVectors.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/delete/TestDeletionVectors.java
new file mode 100644
index 000000000000..de7c53c29091
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/delete/TestDeletionVectors.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.delete;
+
+import com.google.common.io.Resources;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.plugin.deltalake.transactionlog.DeletionVectorEntry;
+import org.junit.jupiter.api.Test;
+import org.roaringbitmap.longlong.Roaring64NavigableMap;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.OptionalInt;
+
+import static io.trino.plugin.deltalake.DeltaTestingConnectorSession.SESSION;
+import static io.trino.plugin.deltalake.delete.DeletionVectors.readDeletionVectors;
+import static io.trino.plugin.deltalake.delete.DeletionVectors.toFileName;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestDeletionVectors
+{
+    @Test
+    public void testUuidStorageType()
+            throws Exception
+    {
+        // The deletion vector has a deleted row at position 1
+        Path path = new File(Resources.getResource("databricks122/deletion_vectors").toURI()).toPath();
+        TrinoFileSystem fileSystem = HDFS_FILE_SYSTEM_FACTORY.create(SESSION);
+        DeletionVectorEntry deletionVector = new DeletionVectorEntry("u", "R7QFX3rGXPFLhHGq&7g<", OptionalInt.of(1), 34, 1);
+
+        Roaring64NavigableMap bitmaps = readDeletionVectors(fileSystem, Location.of(path.toString()), deletionVector);
+        assertThat(bitmaps.getLongCardinality()).isEqualTo(1);
+        assertThat(bitmaps.contains(0)).isFalse();
+        assertThat(bitmaps.contains(1)).isTrue();
+        assertThat(bitmaps.contains(2)).isFalse();
+    }
+
+    @Test
+    public void testUnsupportedPathStorageType()
+    {
+        TrinoFileSystem fileSystem = HDFS_FILE_SYSTEM_FACTORY.create(SESSION);
+        DeletionVectorEntry deletionVector = new DeletionVectorEntry("p", "s3://bucket/table/deletion_vector.bin", OptionalInt.empty(), 40, 1);
+        assertThatThrownBy(() -> readDeletionVectors(fileSystem, Location.of("s3://bucket/table"), deletionVector))
+                .hasMessageContaining("Unsupported storage type for deletion vector: p");
+    }
+
+    @Test
+    public void testUnsupportedInlineStorageType()
+    {
+        TrinoFileSystem fileSystem = HDFS_FILE_SYSTEM_FACTORY.create(SESSION);
+        DeletionVectorEntry deletionVector = new DeletionVectorEntry("i", "wi5b=000010000siXQKl0rr91000f55c8Xg0@@D72lkbi5=-{L", OptionalInt.empty(), 40, 1);
+        assertThatThrownBy(() -> readDeletionVectors(fileSystem, Location.of("s3://bucket/table"), deletionVector))
+                .hasMessageContaining("Unsupported storage type for deletion vector: i");
+    }
+
+    @Test
+    public void testToFileName()
+    {
+        assertThat(toFileName("R7QFX3rGXPFLhHGq&7g<")).isEqualTo("deletion_vector_a52eda8c-0a57-4636-814b-9c165388f7ca.bin");
+        assertThat(toFileName("ab^-aqEH.-t@S}K{vb[*k^")).isEqualTo("ab/deletion_vector_d2c639aa-8816-431a-aaf6-d3fe2512ff61.bin");
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/expression/TestSparkExpressionParser.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/expression/TestSparkExpressionParser.java
index a506ce62aad6..7e4299e6ab9a 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/expression/TestSparkExpressionParser.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/expression/TestSparkExpressionParser.java
@@ -15,10 +15,10 @@
 package io.trino.plugin.deltalake.expression;
 
 import io.trino.plugin.deltalake.expression.ArithmeticBinaryExpression.Operator;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.deltalake.expression.SparkExpressionParser.createExpression;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestSparkExpressionParser
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/expression/TestSparkExpressions.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/expression/TestSparkExpressions.java
index 8d2678ae4901..acffab7a6512 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/expression/TestSparkExpressions.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/expression/TestSparkExpressions.java
@@ -13,9 +13,8 @@
  */
 package io.trino.plugin.deltalake.expression;
 
-import io.trino.spi.TrinoException;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
@@ -139,6 +138,18 @@ public void testArithmeticBinary()
         assertExpressionTranslates("a = b ^ 1", "(\"a\" = (bitwise_xor(\"b\", 1)))");
     }
 
+    @Test
+    public void testBetween()
+    {
+        assertExpressionTranslates("a BETWEEN 1 AND 10", "(\"a\" BETWEEN 1 AND 10)");
+        assertExpressionTranslates("a NOT BETWEEN 1 AND 10", "(\"a\" NOT BETWEEN 1 AND 10)");
+        assertExpressionTranslates("a BETWEEN NULL AND 10", "(\"a\" BETWEEN NULL AND 10)");
+        assertExpressionTranslates("a BETWEEN 1 AND NULL", "(\"a\" BETWEEN 1 AND NULL)");
+        assertExpressionTranslates("a NOT BETWEEN NULL AND NULL", "(\"a\" NOT BETWEEN NULL AND NULL)");
+        assertExpressionTranslates("a not between null and null", "(\"a\" NOT BETWEEN NULL AND NULL)");
+        assertExpressionTranslates("a BETWEEN b AND c", "(\"a\" BETWEEN \"b\" AND \"c\")");
+    }
+
     @Test
     public void testInvalidNotBoolean()
     {
@@ -166,7 +177,6 @@ public void testUnsupportedOperator()
         assertParseFailure("a == 1");
         assertParseFailure("a = b::INTEGER");
         assertParseFailure("a = json_column:root");
-        assertParseFailure("a BETWEEN 1 AND 10");
         assertParseFailure("a IS NULL");
         assertParseFailure("a IS DISTINCT FROM b");
         assertParseFailure("a IS true");
@@ -209,7 +219,7 @@ private static String toTrinoExpression(@Language("SQL") String sparkExpression)
     private static void assertParseFailure(@Language("SQL") String sparkExpression)
     {
         assertThatThrownBy(() -> toTrinoExpression(sparkExpression))
-                .isInstanceOf(TrinoException.class)
-                .hasMessageContaining("Unsupported Spark expression: " + sparkExpression);
+                .isInstanceOf(ParsingException.class)
+                .hasMessageContaining("Cannot parse Spark expression");
     }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/TestDeltaLakeMetastoreAccessOperations.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/TestDeltaLakeMetastoreAccessOperations.java
index b7b760e24d98..a757a8026074 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/TestDeltaLakeMetastoreAccessOperations.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/TestDeltaLakeMetastoreAccessOperations.java
@@ -29,24 +29,26 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.Optional;
 
-import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Methods.CREATE_TABLE;
-import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Methods.GET_DATABASE;
-import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Methods.GET_TABLE;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.CREATE_TABLE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.DROP_TABLE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_ALL_DATABASES;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_ALL_TABLES_FROM_DATABASE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_DATABASE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_TABLE;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.util.Objects.requireNonNull;
 
-@Test(singleThreaded = true) // metastore invocation counters shares mutable state so can't be run from many threads simultaneously
 public class TestDeltaLakeMetastoreAccessOperations
         extends AbstractTestQueryFramework
 {
     private static final Session TEST_SESSION = testSessionBuilder()
-            .setCatalog("delta_lake")
+            .setCatalog("delta")
             .setSchema("test_schema")
             .build();
 
@@ -64,7 +66,7 @@ protected DistributedQueryRunner createQueryRunner()
         queryRunner.installPlugin(new TestingDeltaLakePlugin(Optional.empty(), Optional.empty(), new CountingAccessMetastoreModule(metastore)));
         ImmutableMap.Builder<String, String> deltaLakeProperties = ImmutableMap.builder();
         deltaLakeProperties.put("hive.metastore", "test"); // use test value so we do not get clash with default bindings)
-        queryRunner.createCatalog("delta_lake", "delta_lake", deltaLakeProperties.buildOrThrow());
+        queryRunner.createCatalog("delta", "delta_lake", deltaLakeProperties.buildOrThrow());
 
         queryRunner.execute("CREATE SCHEMA test_schema");
         return queryRunner;
@@ -239,8 +241,32 @@ public void testShowStatsForTableWithFilter()
                         .build());
     }
 
+    @Test
+    public void testDropTable()
+    {
+        assertUpdate("CREATE TABLE test_drop_table AS SELECT 20050910 as a_number", 1);
+
+        assertMetastoreInvocations("DROP TABLE test_drop_table",
+                ImmutableMultiset.builder()
+                        .add(GET_TABLE)
+                        .add(DROP_TABLE)
+                        .build());
+    }
+
+    @Test
+    public void testShowTables()
+    {
+        assertMetastoreInvocations("SHOW TABLES",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_TABLES_FROM_DATABASE)
+                        .build());
+    }
+
     private void assertMetastoreInvocations(@Language("SQL") String query, Multiset<?> expectedInvocations)
     {
+        assertUpdate("CALL system.flush_metadata_cache()");
+
         CountingAccessHiveMetastoreUtil.assertMetastoreInvocations(metastore, getQueryRunner(), getSession(), query, expectedInvocations);
     }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/TestDeltaLakeMetastoreStatistics.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/TestDeltaLakeMetastoreStatistics.java
deleted file mode 100644
index 4c71580fb6f5..000000000000
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/TestDeltaLakeMetastoreStatistics.java
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.deltalake.metastore;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.io.Resources;
-import io.airlift.json.JsonCodecFactory;
-import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
-import io.trino.plugin.deltalake.DeltaLakeConfig;
-import io.trino.plugin.deltalake.DeltaLakeTableHandle;
-import io.trino.plugin.deltalake.statistics.CachingExtendedStatisticsAccess;
-import io.trino.plugin.deltalake.statistics.DeltaLakeColumnStatistics;
-import io.trino.plugin.deltalake.statistics.ExtendedStatistics;
-import io.trino.plugin.deltalake.statistics.MetaDirStatisticsAccess;
-import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
-import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
-import io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointSchemaManager;
-import io.trino.plugin.hive.FileFormatDataSourceStats;
-import io.trino.plugin.hive.HiveType;
-import io.trino.plugin.hive.metastore.Column;
-import io.trino.plugin.hive.metastore.Database;
-import io.trino.plugin.hive.metastore.HiveMetastore;
-import io.trino.plugin.hive.metastore.PrincipalPrivileges;
-import io.trino.plugin.hive.metastore.Storage;
-import io.trino.plugin.hive.metastore.StorageFormat;
-import io.trino.plugin.hive.metastore.Table;
-import io.trino.plugin.hive.parquet.ParquetReaderConfig;
-import io.trino.spi.connector.ColumnHandle;
-import io.trino.spi.predicate.Domain;
-import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.security.PrincipalType;
-import io.trino.spi.statistics.ColumnStatistics;
-import io.trino.spi.statistics.Estimate;
-import io.trino.spi.statistics.TableStatistics;
-import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.DoubleType;
-import io.trino.spi.type.TypeManager;
-import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.nio.file.Files;
-import java.time.LocalDate;
-import java.util.Map;
-import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.OptionalLong;
-
-import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
-import static io.trino.plugin.deltalake.DeltaLakeMetadata.PATH_PROPERTY;
-import static io.trino.plugin.deltalake.DeltaTestingConnectorSession.SESSION;
-import static io.trino.plugin.deltalake.metastore.HiveMetastoreBackedDeltaLakeMetastore.TABLE_PROVIDER_PROPERTY;
-import static io.trino.plugin.deltalake.metastore.HiveMetastoreBackedDeltaLakeMetastore.TABLE_PROVIDER_VALUE;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.DateType.DATE;
-import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.IntegerType.INTEGER;
-import static io.trino.spi.type.RealType.REAL;
-import static io.trino.spi.type.SmallintType.SMALLINT;
-import static io.trino.spi.type.TinyintType.TINYINT;
-import static java.lang.Double.NEGATIVE_INFINITY;
-import static java.lang.Double.POSITIVE_INFINITY;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
-
-public class TestDeltaLakeMetastoreStatistics
-{
-    private static final ColumnHandle COLUMN_HANDLE = new DeltaLakeColumnHandle("val", DoubleType.DOUBLE, OptionalInt.empty(), "val", DoubleType.DOUBLE, REGULAR);
-
-    private DeltaLakeMetastore deltaLakeMetastore;
-    private HiveMetastore hiveMetastore;
-    private CachingExtendedStatisticsAccess statistics;
-
-    @BeforeClass
-    public void setupMetastore()
-            throws Exception
-    {
-        TestingConnectorContext context = new TestingConnectorContext();
-        TypeManager typeManager = context.getTypeManager();
-        CheckpointSchemaManager checkpointSchemaManager = new CheckpointSchemaManager(typeManager);
-
-        FileFormatDataSourceStats fileFormatDataSourceStats = new FileFormatDataSourceStats();
-
-        TransactionLogAccess transactionLogAccess = new TransactionLogAccess(
-                typeManager,
-                checkpointSchemaManager,
-                new DeltaLakeConfig(),
-                fileFormatDataSourceStats,
-                HDFS_FILE_SYSTEM_FACTORY,
-                new ParquetReaderConfig());
-
-        File tmpDir = Files.createTempDirectory(null).toFile();
-        File metastoreDir = new File(tmpDir, "metastore");
-        hiveMetastore = createTestingFileHiveMetastore(metastoreDir);
-
-        hiveMetastore.createDatabase(new Database("db_name", Optional.empty(), Optional.of("test"), Optional.of(PrincipalType.USER), Optional.empty(), ImmutableMap.of()));
-
-        statistics = new CachingExtendedStatisticsAccess(new MetaDirStatisticsAccess(HDFS_FILE_SYSTEM_FACTORY, new JsonCodecFactory().jsonCodec(ExtendedStatistics.class)));
-        deltaLakeMetastore = new HiveMetastoreBackedDeltaLakeMetastore(
-                hiveMetastore,
-                transactionLogAccess,
-                typeManager,
-                statistics,
-                HDFS_FILE_SYSTEM_FACTORY);
-    }
-
-    private DeltaLakeTableHandle registerTable(String tableName)
-    {
-        return registerTable(tableName, tableName);
-    }
-
-    private DeltaLakeTableHandle registerTable(String tableName, String directoryName)
-    {
-        String tableLocation = Resources.getResource("statistics/" + directoryName).toExternalForm();
-
-        Storage tableStorage = new Storage(
-                StorageFormat.create("serde", "input", "output"), Optional.of(tableLocation), Optional.empty(), true, ImmutableMap.of(PATH_PROPERTY, tableLocation));
-
-        hiveMetastore.createTable(
-                new Table(
-                        "db_name",
-                        tableName,
-                        Optional.of("test"),
-                        "EXTERNAL_TABLE",
-                        tableStorage,
-                        ImmutableList.of(new Column("val", HiveType.HIVE_DOUBLE, Optional.empty())),
-                        ImmutableList.of(),
-                        ImmutableMap.of(TABLE_PROVIDER_PROPERTY, TABLE_PROVIDER_VALUE),
-                        Optional.empty(),
-                        Optional.empty(),
-                        OptionalLong.empty()),
-                PrincipalPrivileges.fromHivePrivilegeInfos(ImmutableSet.of()));
-
-        return new DeltaLakeTableHandle(
-                "db_name",
-                tableName,
-                "location",
-                new MetadataEntry("id", "test", "description", null, "", ImmutableList.of(), ImmutableMap.of(), 0),
-                TupleDomain.all(),
-                TupleDomain.all(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.empty(),
-                0,
-                false);
-    }
-
-    @Test
-    public void testStatisticsNaN()
-    {
-        DeltaLakeTableHandle tableHandle = registerTable("nan");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        assertEquals(stats.getRowCount(), Estimate.of(1));
-        assertEquals(stats.getColumnStatistics().size(), 1);
-
-        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getRange(), Optional.empty());
-    }
-
-    @Test
-    public void testStatisticsInf()
-    {
-        DeltaLakeTableHandle tableHandle = registerTable("positive_infinity");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getRange().get().getMin(), POSITIVE_INFINITY);
-        assertEquals(columnStatistics.getRange().get().getMax(), POSITIVE_INFINITY);
-    }
-
-    @Test
-    public void testStatisticsNegInf()
-    {
-        DeltaLakeTableHandle tableHandle = registerTable("negative_infinity");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getRange().get().getMin(), NEGATIVE_INFINITY);
-        assertEquals(columnStatistics.getRange().get().getMax(), NEGATIVE_INFINITY);
-    }
-
-    @Test
-    public void testStatisticsNegZero()
-    {
-        DeltaLakeTableHandle tableHandle = registerTable("negative_zero");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getRange().get().getMin(), -0.0d);
-        assertEquals(columnStatistics.getRange().get().getMax(), -0.0d);
-    }
-
-    @Test
-    public void testStatisticsInfinityAndNaN()
-    {
-        // Stats with NaN values cannot be used
-        DeltaLakeTableHandle tableHandle = registerTable("infinity_nan");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getRange().get().getMin(), POSITIVE_INFINITY);
-        assertEquals(columnStatistics.getRange().get().getMax(), POSITIVE_INFINITY);
-    }
-
-    @Test
-    public void testStatisticsNegativeInfinityAndNaN()
-    {
-        // Stats with NaN values cannot be used
-        DeltaLakeTableHandle tableHandle = registerTable("negative_infinity_nan");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getRange().get().getMin(), NEGATIVE_INFINITY);
-        assertEquals(columnStatistics.getRange().get().getMax(), POSITIVE_INFINITY);
-    }
-
-    @Test
-    public void testStatisticsZeroAndNaN()
-    {
-        // Stats with NaN values cannot be used
-        DeltaLakeTableHandle tableHandle = registerTable("zero_nan");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getRange().get().getMin(), 0.0);
-        assertEquals(columnStatistics.getRange().get().getMax(), POSITIVE_INFINITY);
-    }
-
-    @Test
-    public void testStatisticsZeroAndInfinity()
-    {
-        DeltaLakeTableHandle tableHandle = registerTable("zero_infinity");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getRange().get().getMin(), 0.0);
-        assertEquals(columnStatistics.getRange().get().getMax(), POSITIVE_INFINITY);
-    }
-
-    @Test
-    public void testStatisticsZeroAndNegativeInfinity()
-    {
-        DeltaLakeTableHandle tableHandle = registerTable("zero_negative_infinity");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getRange().get().getMin(), NEGATIVE_INFINITY);
-        assertEquals(columnStatistics.getRange().get().getMax(), 0.0);
-    }
-
-    @Test
-    public void testStatisticsNaNWithMultipleFiles()
-    {
-        // Stats with NaN values cannot be used. This transaction combines a file with NaN min/max values with one with 0.0 min/max values
-        DeltaLakeTableHandle tableHandle = registerTable("nan_multi_file");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getRange(), Optional.empty());
-    }
-
-    @Test
-    public void testStatisticsMultipleFiles()
-    {
-        DeltaLakeTableHandle tableHandle = registerTable("basic_multi_file");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getRange().get().getMin(), -42.0);
-        assertEquals(columnStatistics.getRange().get().getMax(), 42.0);
-
-        DeltaLakeTableHandle tableHandleWithUnenforcedConstraint = new DeltaLakeTableHandle(
-                tableHandle.getSchemaName(),
-                tableHandle.getTableName(),
-                tableHandle.getLocation(),
-                tableHandle.getMetadataEntry(),
-                TupleDomain.all(),
-                TupleDomain.withColumnDomains(ImmutableMap.of((DeltaLakeColumnHandle) COLUMN_HANDLE, Domain.singleValue(DOUBLE, 42.0))),
-                tableHandle.getWriteType(),
-                tableHandle.getProjectedColumns(),
-                tableHandle.getUpdatedColumns(),
-                tableHandle.getUpdateRowIdColumns(),
-                tableHandle.getAnalyzeHandle(),
-                0,
-                false);
-        stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandleWithUnenforcedConstraint);
-        columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getRange().get().getMin(), 0.0);
-        assertEquals(columnStatistics.getRange().get().getMax(), 42.0);
-    }
-
-    @Test
-    public void testStatisticsNoRecords()
-    {
-        DeltaLakeTableHandle tableHandle = registerTable("zero_record_count", "basic_multi_file");
-        DeltaLakeTableHandle tableHandleWithNoneEnforcedConstraint = new DeltaLakeTableHandle(
-                tableHandle.getSchemaName(),
-                tableHandle.getTableName(),
-                tableHandle.getLocation(),
-                tableHandle.getMetadataEntry(),
-                TupleDomain.none(),
-                TupleDomain.all(),
-                tableHandle.getWriteType(),
-                tableHandle.getProjectedColumns(),
-                tableHandle.getUpdatedColumns(),
-                tableHandle.getUpdateRowIdColumns(),
-                tableHandle.getAnalyzeHandle(),
-                0,
-                false);
-        DeltaLakeTableHandle tableHandleWithNoneUnenforcedConstraint = new DeltaLakeTableHandle(
-                tableHandle.getSchemaName(),
-                tableHandle.getTableName(),
-                tableHandle.getLocation(),
-                tableHandle.getMetadataEntry(),
-                TupleDomain.all(),
-                TupleDomain.none(),
-                tableHandle.getWriteType(),
-                tableHandle.getProjectedColumns(),
-                tableHandle.getUpdatedColumns(),
-                tableHandle.getUpdateRowIdColumns(),
-                tableHandle.getAnalyzeHandle(),
-                0,
-                false);
-        // If either the table handle's constraint or the provided Constraint are none, it will cause a 0 record count to be reported
-        assertEmptyStats(deltaLakeMetastore.getTableStatistics(SESSION, tableHandleWithNoneEnforcedConstraint));
-        assertEmptyStats(deltaLakeMetastore.getTableStatistics(SESSION, tableHandleWithNoneUnenforcedConstraint));
-    }
-
-    private void assertEmptyStats(TableStatistics tableStatistics)
-    {
-        assertEquals(tableStatistics.getRowCount(), Estimate.of(0));
-        ColumnStatistics columnStatistics = tableStatistics.getColumnStatistics().get(COLUMN_HANDLE);
-        assertEquals(columnStatistics.getNullsFraction(), Estimate.of(0));
-        assertEquals(columnStatistics.getDistinctValuesCount(), Estimate.of(0));
-    }
-
-    @Test
-    public void testStatisticsParquetParsedStatistics()
-    {
-        // The transaction log for this table was created so that the checkpoints only write struct statistics, not json statistics
-        DeltaLakeTableHandle tableHandle = registerTable("parquet_struct_statistics");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        assertEquals(stats.getRowCount(), Estimate.of(9));
-
-        Map<ColumnHandle, ColumnStatistics> statisticsMap = stats.getColumnStatistics();
-        ColumnStatistics columnStats = statisticsMap.get(new DeltaLakeColumnHandle("dec_short", DecimalType.createDecimalType(5, 1), OptionalInt.empty(), "dec_short", DecimalType.createDecimalType(5, 1), REGULAR));
-        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
-        assertEquals(columnStats.getRange().get().getMin(), -10.1);
-        assertEquals(columnStats.getRange().get().getMax(), 10.1);
-
-        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("dec_long", DecimalType.createDecimalType(25, 3), OptionalInt.empty(), "dec_long", DecimalType.createDecimalType(25, 3), REGULAR));
-        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
-        assertEquals(columnStats.getRange().get().getMin(), -999999999999.123);
-        assertEquals(columnStats.getRange().get().getMax(), 999999999999.123);
-
-        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("l", BIGINT, OptionalInt.empty(), "l", BIGINT, REGULAR));
-        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
-        assertEquals(columnStats.getRange().get().getMin(), -10000000.0);
-        assertEquals(columnStats.getRange().get().getMax(), 10000000.0);
-
-        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("in", INTEGER, OptionalInt.empty(), "in", INTEGER, REGULAR));
-        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
-        assertEquals(columnStats.getRange().get().getMin(), -20000000.0);
-        assertEquals(columnStats.getRange().get().getMax(), 20000000.0);
-
-        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("sh", SMALLINT, OptionalInt.empty(), "sh", SMALLINT, REGULAR));
-        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
-        assertEquals(columnStats.getRange().get().getMin(), -123.0);
-        assertEquals(columnStats.getRange().get().getMax(), 123.0);
-
-        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("byt", TINYINT, OptionalInt.empty(), "byt", TINYINT, REGULAR));
-        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
-        assertEquals(columnStats.getRange().get().getMin(), -42.0);
-        assertEquals(columnStats.getRange().get().getMax(), 42.0);
-
-        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("fl", REAL, OptionalInt.empty(), "fl", REAL, REGULAR));
-        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
-        assertEquals((float) columnStats.getRange().get().getMin(), -0.123f);
-        assertEquals((float) columnStats.getRange().get().getMax(), 0.123f);
-
-        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("dou", DOUBLE, OptionalInt.empty(), "dou", DOUBLE, REGULAR));
-        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
-        assertEquals(columnStats.getRange().get().getMin(), -0.321);
-        assertEquals(columnStats.getRange().get().getMax(), 0.321);
-
-        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("dat", DATE, OptionalInt.empty(), "dat", DATE, REGULAR));
-        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
-        assertEquals(columnStats.getRange().get().getMin(), (double) LocalDate.parse("1900-01-01").toEpochDay());
-        assertEquals(columnStats.getRange().get().getMax(), (double) LocalDate.parse("5000-01-01").toEpochDay());
-    }
-
-    @Test
-    public void testStatisticsParquetParsedStatisticsNaNValues()
-    {
-        // The transaction log for this table was created so that the checkpoints only write struct statistics, not json statistics
-        // The table has a REAL and DOUBLE columns each with 9 values, one of them being NaN
-        DeltaLakeTableHandle tableHandle = registerTable("parquet_struct_statistics_nan");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        assertEquals(stats.getRowCount(), Estimate.of(9));
-
-        Map<ColumnHandle, ColumnStatistics> statisticsMap = stats.getColumnStatistics();
-        ColumnStatistics columnStats = statisticsMap.get(new DeltaLakeColumnHandle("fl", REAL, OptionalInt.empty(), "fl", REAL, REGULAR));
-        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
-        assertThat(columnStats.getRange()).isEmpty();
-
-        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("dou", DOUBLE, OptionalInt.empty(), "dou", DOUBLE, REGULAR));
-        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
-        assertThat(columnStats.getRange()).isEmpty();
-    }
-
-    @Test
-    public void testStatisticsParquetParsedStatisticsNullCount()
-    {
-        // The transaction log for this table was created so that the checkpoints only write struct statistics, not json statistics
-        // The table has one INTEGER column 'i' where 3 of the 9 values are null
-        DeltaLakeTableHandle tableHandle = registerTable("parquet_struct_statistics_null_count");
-        TableStatistics stats = deltaLakeMetastore.getTableStatistics(SESSION, tableHandle);
-        assertEquals(stats.getRowCount(), Estimate.of(9));
-
-        Map<ColumnHandle, ColumnStatistics> statisticsMap = stats.getColumnStatistics();
-        ColumnStatistics columnStats = statisticsMap.get(new DeltaLakeColumnHandle("i", INTEGER, OptionalInt.empty(), "i", INTEGER, REGULAR));
-        assertEquals(columnStats.getNullsFraction(), Estimate.of(3.0 / 9.0));
-    }
-
-    @Test
-    public void testExtendedStatisticsWithoutDataSize()
-    {
-        // Read extended_stats.json that was generated before supporting data_size
-        String tableLocation = Resources.getResource("statistics/extended_stats_without_data_size").toExternalForm();
-        Optional<ExtendedStatistics> extendedStatistics = statistics.readExtendedStatistics(SESSION, tableLocation);
-        assertThat(extendedStatistics).isNotEmpty();
-        Map<String, DeltaLakeColumnStatistics> columnStatistics = extendedStatistics.get().getColumnStatistics();
-        assertThat(columnStatistics).hasSize(3);
-    }
-
-    @Test
-    public void testExtendedStatisticsWithDataSize()
-    {
-        // Read extended_stats.json that was generated after supporting data_size
-        String tableLocation = Resources.getResource("statistics/extended_stats_with_data_size").toExternalForm();
-        Optional<ExtendedStatistics> extendedStatistics = statistics.readExtendedStatistics(SESSION, tableLocation);
-        assertThat(extendedStatistics).isNotEmpty();
-        Map<String, DeltaLakeColumnStatistics> columnStatistics = extendedStatistics.get().getColumnStatistics();
-        assertThat(columnStatistics).hasSize(3);
-        assertEquals(columnStatistics.get("regionkey").getTotalSizeInBytes(), OptionalLong.empty());
-        assertEquals(columnStatistics.get("name").getTotalSizeInBytes(), OptionalLong.of(34));
-        assertEquals(columnStatistics.get("comment").getTotalSizeInBytes(), OptionalLong.of(330));
-    }
-
-    @Test
-    public void testMergeExtendedStatisticsWithoutAndWithDataSize()
-    {
-        // Merge two extended stats files. The first file doesn't have totalSizeInBytes field and the second file has totalSizeInBytes field
-        Optional<ExtendedStatistics> statisticsWithoutDataSize = statistics.readExtendedStatistics(SESSION, Resources.getResource("statistics/extended_stats_without_data_size").toExternalForm());
-        Optional<ExtendedStatistics> statisticsWithDataSize = statistics.readExtendedStatistics(SESSION, Resources.getResource("statistics/extended_stats_with_data_size").toExternalForm());
-        assertThat(statisticsWithoutDataSize).isNotEmpty();
-        assertThat(statisticsWithDataSize).isNotEmpty();
-
-        Map<String, DeltaLakeColumnStatistics> columnStatisticsWithoutDataSize = statisticsWithoutDataSize.get().getColumnStatistics();
-        Map<String, DeltaLakeColumnStatistics> columnStatisticsWithDataSize = statisticsWithDataSize.get().getColumnStatistics();
-
-        DeltaLakeColumnStatistics mergedRegionKey = columnStatisticsWithoutDataSize.get("regionkey").update(columnStatisticsWithDataSize.get("regionkey"));
-        assertEquals(mergedRegionKey.getTotalSizeInBytes(), OptionalLong.empty());
-        assertEquals(mergedRegionKey.getNdvSummary().cardinality(), 5);
-
-        DeltaLakeColumnStatistics mergedName = columnStatisticsWithoutDataSize.get("name").update(columnStatisticsWithDataSize.get("name"));
-        assertEquals(mergedName.getTotalSizeInBytes(), OptionalLong.empty());
-        assertEquals(mergedName.getNdvSummary().cardinality(), 5);
-
-        DeltaLakeColumnStatistics mergedComment = columnStatisticsWithoutDataSize.get("comment").update(columnStatisticsWithDataSize.get("comment"));
-        assertEquals(mergedComment.getTotalSizeInBytes(), OptionalLong.empty());
-        assertEquals(mergedComment.getNdvSummary().cardinality(), 5);
-    }
-}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeCleanUpGlueMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeCleanUpGlueMetastore.java
index d6716dd463d3..7b8f34702341 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeCleanUpGlueMetastore.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeCleanUpGlueMetastore.java
@@ -21,7 +21,7 @@
 import com.amazonaws.services.glue.model.GetDatabasesResult;
 import io.airlift.log.Logger;
 import io.trino.plugin.hive.aws.AwsApiCallStats;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeConcurrentModificationGlueMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeConcurrentModificationGlueMetastore.java
index f4aaad48804b..3de0061d5582 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeConcurrentModificationGlueMetastore.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeConcurrentModificationGlueMetastore.java
@@ -16,6 +16,7 @@
 import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
 import com.amazonaws.services.glue.AWSGlueAsync;
 import com.amazonaws.services.glue.model.ConcurrentModificationException;
+import com.google.common.collect.ImmutableSet;
 import io.trino.Session;
 import io.trino.plugin.deltalake.TestingDeltaLakePlugin;
 import io.trino.plugin.deltalake.metastore.TestingDeltaLakeMetastoreModule;
@@ -27,8 +28,9 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -42,13 +44,14 @@
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static com.google.inject.util.Modules.EMPTY_MODULE;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_METASTORE_ERROR;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.plugin.hive.metastore.glue.GlueClientUtil.createAsyncGlueClient;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertFalse;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeConcurrentModificationGlueMetastore
         extends AbstractTestQueryFramework
 {
@@ -74,7 +77,7 @@ protected QueryRunner createQueryRunner()
         GlueHiveMetastoreConfig glueConfig = new GlueHiveMetastoreConfig()
                 .setDefaultWarehouseDir(dataDirectory.toUri().toString());
 
-        AWSGlueAsync glueClient = createAsyncGlueClient(glueConfig, DefaultAWSCredentialsProviderChain.getInstance(), Optional.empty(), stats.newRequestMetricsCollector());
+        AWSGlueAsync glueClient = createAsyncGlueClient(glueConfig, DefaultAWSCredentialsProviderChain.getInstance(), ImmutableSet.of(), stats.newRequestMetricsCollector());
         AWSGlueAsync proxiedGlueClient = newProxy(AWSGlueAsync.class, (proxy, method, args) -> {
             Object result;
             try {
@@ -92,7 +95,7 @@ protected QueryRunner createQueryRunner()
         });
 
         metastore = new GlueHiveMetastore(
-                HDFS_ENVIRONMENT,
+                HDFS_FILE_SYSTEM_FACTORY,
                 glueConfig,
                 directExecutor(),
                 new DefaultGlueColumnStatisticsProviderFactory(directExecutor(), directExecutor()),
@@ -117,7 +120,7 @@ public void testDropTableWithConcurrentModifications()
         assertFalse(getQueryRunner().tableExists(getSession(), tableName));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
             throws IOException
     {
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastore.java
index 927ac5812366..b21e3757b972 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastore.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastore.java
@@ -23,7 +23,9 @@
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.json.JsonModule;
-import io.trino.filesystem.hdfs.HdfsFileSystemModule;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.filesystem.manager.FileSystemModule;
 import io.trino.hdfs.HdfsEnvironment;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
@@ -48,14 +50,14 @@
 import io.trino.spi.type.TypeManager;
 import io.trino.testing.TestingConnectorContext;
 import io.trino.testing.TestingConnectorSession;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.Map;
@@ -76,17 +78,19 @@
 import static io.trino.plugin.hive.HiveStorageFormat.PARQUET;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
 import static io.trino.plugin.hive.HiveType.HIVE_STRING;
+import static io.trino.plugin.hive.TableType.EXTERNAL_TABLE;
+import static io.trino.plugin.hive.TableType.VIRTUAL_VIEW;
 import static io.trino.plugin.hive.metastore.StorageFormat.fromHiveStorageFormat;
 import static io.trino.spi.security.PrincipalType.ROLE;
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.hadoop.hive.metastore.TableType.EXTERNAL_TABLE;
-import static org.apache.hadoop.hive.metastore.TableType.VIRTUAL_VIEW;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeGlueMetastore
 {
     private File tempDir;
@@ -96,7 +100,7 @@ public class TestDeltaLakeGlueMetastore
     private String databaseName;
     private TestingConnectorSession session;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -118,15 +122,15 @@ public void setUp()
                     binder.bind(NodeManager.class).toInstance(context.getNodeManager());
                     binder.bind(PageIndexerFactory.class).toInstance(context.getPageIndexerFactory());
                     binder.bind(NodeVersion.class).toInstance(new NodeVersion("test_version"));
+                    binder.bind(OpenTelemetry.class).toInstance(context.getOpenTelemetry());
+                    binder.bind(Tracer.class).toInstance(context.getTracer());
                 },
                 // connector modules
                 new DeltaLakeMetastoreModule(),
                 new DeltaLakeModule(),
                 // test setup
-                binder -> {
-                    binder.bind(HdfsEnvironment.class).toInstance(HDFS_ENVIRONMENT);
-                    binder.install(new HdfsFileSystemModule());
-                });
+                binder -> binder.bind(HdfsEnvironment.class).toInstance(HDFS_ENVIRONMENT),
+                new FileSystemModule());
 
         Injector injector = app
                 .doNotInitializeLogging()
@@ -153,7 +157,7 @@ public void setUp()
                 .build());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -263,9 +267,9 @@ private Set<SchemaTableName> listTableColumns(DeltaLakeMetadata metadata, Schema
      * Creates a valid transaction log
      */
     private void createTransactionLog(String deltaLakeTableLocation)
-            throws URISyntaxException, IOException
+            throws IOException
     {
-        File deltaTableLogLocation = new File(new File(new URI(deltaLakeTableLocation)), "_delta_log");
+        File deltaTableLogLocation = new File(new File(URI.create(deltaLakeTableLocation)), "_delta_log");
         verify(deltaTableLogLocation.mkdirs(), "mkdirs() on '%s' failed", deltaTableLogLocation);
         String entry = Resources.toString(Resources.getResource("deltalake/person/_delta_log/00000000000000000000.json"), UTF_8);
         Files.writeString(new File(deltaTableLogLocation, "00000000000000000000.json").toPath(), entry);
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastoreConfig.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastoreConfig.java
index cd465dcb088e..e27b5e0fa45a 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastoreConfig.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastoreConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.deltalake.metastore.glue;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRenameToWithGlueMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRenameToWithGlueMetastore.java
index 2de176fe958a..4e15c1e55eef 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRenameToWithGlueMetastore.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRenameToWithGlueMetastore.java
@@ -19,15 +19,18 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.nio.file.Path;
 
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeRenameToWithGlueMetastore
         extends AbstractTestQueryFramework
 {
@@ -98,7 +101,7 @@ public void testRenameOfManagedTable()
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
     {
         assertUpdate("DROP SCHEMA IF EXISTS " + SCHEMA);
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeViewsGlueMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeViewsGlueMetastore.java
index 9e6fcbc90878..ca1176598fa5 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeViewsGlueMetastore.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeViewsGlueMetastore.java
@@ -22,8 +22,9 @@
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.TestTable;
 import io.trino.testing.sql.TestView;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -36,7 +37,9 @@
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDeltaLakeViewsGlueMetastore
         extends AbstractTestQueryFramework
 {
@@ -83,7 +86,7 @@ public void testCreateView()
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
             throws IOException
     {
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaS3AndGlueMetastoreTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaS3AndGlueMetastoreTest.java
new file mode 100644
index 000000000000..880ccb0ac3fe
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaS3AndGlueMetastoreTest.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.metastore.glue;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.deltalake.DeltaLakeQueryRunner;
+import io.trino.plugin.hive.BaseS3AndGlueMetastoreTest;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+
+import java.nio.file.Path;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
+import static io.trino.plugin.hive.metastore.glue.GlueHiveMetastore.createTestingGlueHiveMetastore;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDeltaS3AndGlueMetastoreTest
+        extends BaseS3AndGlueMetastoreTest
+{
+    public TestDeltaS3AndGlueMetastoreTest()
+    {
+        super("partitioned_by", "location", requireNonNull(System.getenv("S3_BUCKET"), "Environment variable not set: S3_BUCKET"));
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        metastore = createTestingGlueHiveMetastore(Path.of(schemaPath()));
+        DistributedQueryRunner queryRunner = DeltaLakeQueryRunner.builder()
+                .setCatalogName(DELTA_CATALOG)
+                .setDeltaProperties(ImmutableMap.<String, String>builder()
+                        .put("hive.metastore", "glue")
+                        .put("hive.metastore.glue.default-warehouse-dir", schemaPath())
+                        .put("delta.enable-non-concurrent-writes", "true")
+                        .buildOrThrow())
+                .build();
+        queryRunner.execute("CREATE SCHEMA " + schemaName + " WITH (location = '" + schemaPath() + "')");
+        return queryRunner;
+    }
+
+    @Override
+    protected void validateDataFiles(String partitionColumn, String tableName, String location)
+    {
+        getActiveFiles(tableName).forEach(dataFile ->
+        {
+            String locationDirectory = location.endsWith("/") ? location : location + "/";
+            String partitionPart = partitionColumn.isEmpty() ? "" : partitionColumn + "=[a-z0-9]+/";
+            assertThat(dataFile).matches("^" + Pattern.quote(locationDirectory) + partitionPart + "[a-zA-Z0-9_-]+$");
+            verifyPathExist(dataFile);
+        });
+    }
+
+    @Override
+    protected void validateMetadataFiles(String location)
+    {
+        String locationDirectory = location.endsWith("/") ? location : location + "/";
+        getAllMetadataDataFilesFromTableDirectory(location).forEach(metadataFile ->
+        {
+            assertThat(metadataFile).matches("^" + Pattern.quote(locationDirectory) + "_delta_log/[0-9]+.json$");
+            verifyPathExist(metadataFile);
+        });
+
+        assertThat(getExtendedStatisticsFileFromTableDirectory(location)).matches("^" + Pattern.quote(locationDirectory) + "_delta_log/_trino_meta/extended_stats.json$");
+    }
+
+    @Override
+    protected void validateFilesAfterDrop(String location)
+    {
+        // In Delta table created with location in treated as external, so files are not removed
+        assertThat(getTableFiles(location)).isNotEmpty();
+    }
+
+    @Override
+    protected Set<String> getAllDataFilesFromTableDirectory(String tableLocation)
+    {
+        return getTableFiles(tableLocation).stream()
+                .filter(path -> !path.contains("_delta_log"))
+                .collect(Collectors.toUnmodifiableSet());
+    }
+
+    private Set<String> getAllMetadataDataFilesFromTableDirectory(String tableLocation)
+    {
+        return getTableFiles(tableLocation).stream()
+                .filter(path -> path.contains("/metadata"))
+                .collect(Collectors.toUnmodifiableSet());
+    }
+
+    private String getExtendedStatisticsFileFromTableDirectory(String tableLocation)
+    {
+        return getOnlyElement(getTableFiles(tableLocation).stream()
+                .filter(path -> path.contains("/_trino_meta"))
+                .collect(Collectors.toUnmodifiableSet()));
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/statistics/TestDeltaLakeFileBasedTableStatisticsProvider.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/statistics/TestDeltaLakeFileBasedTableStatisticsProvider.java
new file mode 100644
index 000000000000..02aece4602b8
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/statistics/TestDeltaLakeFileBasedTableStatisticsProvider.java
@@ -0,0 +1,467 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.statistics;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Resources;
+import io.airlift.json.JsonCodecFactory;
+import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
+import io.trino.plugin.deltalake.DeltaLakeConfig;
+import io.trino.plugin.deltalake.DeltaLakeTableHandle;
+import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
+import io.trino.plugin.deltalake.transactionlog.TableSnapshot;
+import io.trino.plugin.deltalake.transactionlog.TransactionLogAccess;
+import io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointSchemaManager;
+import io.trino.plugin.hive.FileFormatDataSourceStats;
+import io.trino.plugin.hive.parquet.ParquetReaderConfig;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.predicate.Domain;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.statistics.ColumnStatistics;
+import io.trino.spi.statistics.Estimate;
+import io.trino.spi.statistics.TableStatistics;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.DoubleType;
+import io.trino.spi.type.TypeManager;
+import io.trino.testing.TestingConnectorContext;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+
+import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
+import static io.trino.plugin.deltalake.DeltaTestingConnectorSession.SESSION;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.DateType.DATE;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TinyintType.TINYINT;
+import static java.lang.Double.NEGATIVE_INFINITY;
+import static java.lang.Double.POSITIVE_INFINITY;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertEquals;
+
+public class TestDeltaLakeFileBasedTableStatisticsProvider
+{
+    private static final ColumnHandle COLUMN_HANDLE = new DeltaLakeColumnHandle("val", DoubleType.DOUBLE, OptionalInt.empty(), "val", DoubleType.DOUBLE, REGULAR, Optional.empty());
+
+    private final TransactionLogAccess transactionLogAccess;
+    private final CachingExtendedStatisticsAccess statistics;
+    private final DeltaLakeTableStatisticsProvider tableStatisticsProvider;
+
+    public TestDeltaLakeFileBasedTableStatisticsProvider()
+    {
+        TestingConnectorContext context = new TestingConnectorContext();
+        TypeManager typeManager = context.getTypeManager();
+        CheckpointSchemaManager checkpointSchemaManager = new CheckpointSchemaManager(typeManager);
+
+        FileFormatDataSourceStats fileFormatDataSourceStats = new FileFormatDataSourceStats();
+
+        transactionLogAccess = new TransactionLogAccess(
+                typeManager,
+                checkpointSchemaManager,
+                new DeltaLakeConfig(),
+                fileFormatDataSourceStats,
+                HDFS_FILE_SYSTEM_FACTORY,
+                new ParquetReaderConfig());
+
+        statistics = new CachingExtendedStatisticsAccess(new MetaDirStatisticsAccess(HDFS_FILE_SYSTEM_FACTORY, new JsonCodecFactory().jsonCodec(ExtendedStatistics.class)));
+        tableStatisticsProvider = new FileBasedTableStatisticsProvider(
+                typeManager,
+                transactionLogAccess,
+                statistics);
+    }
+
+    private DeltaLakeTableHandle registerTable(String tableName)
+    {
+        return registerTable(tableName, tableName);
+    }
+
+    private DeltaLakeTableHandle registerTable(String tableName, String directoryName)
+    {
+        String tableLocation = Resources.getResource("statistics/" + directoryName).toExternalForm();
+        SchemaTableName schemaTableName = new SchemaTableName("db_name", tableName);
+        TableSnapshot tableSnapshot;
+        try {
+            tableSnapshot = transactionLogAccess.loadSnapshot(SESSION, schemaTableName, tableLocation);
+        }
+        catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        return new DeltaLakeTableHandle(
+                schemaTableName.getSchemaName(),
+                schemaTableName.getTableName(),
+                false,
+                tableLocation,
+                metadataEntry,
+                new ProtocolEntry(1, 2, Optional.empty(), Optional.empty()),
+                TupleDomain.all(),
+                TupleDomain.all(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                0);
+    }
+
+    @Test
+    public void testStatisticsNaN()
+    {
+        DeltaLakeTableHandle tableHandle = registerTable("nan");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        assertEquals(stats.getRowCount(), Estimate.of(1));
+        assertEquals(stats.getColumnStatistics().size(), 1);
+
+        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getRange(), Optional.empty());
+    }
+
+    @Test
+    public void testStatisticsInf()
+    {
+        DeltaLakeTableHandle tableHandle = registerTable("positive_infinity");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getRange().get().getMin(), POSITIVE_INFINITY);
+        assertEquals(columnStatistics.getRange().get().getMax(), POSITIVE_INFINITY);
+    }
+
+    @Test
+    public void testStatisticsNegInf()
+    {
+        DeltaLakeTableHandle tableHandle = registerTable("negative_infinity");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getRange().get().getMin(), NEGATIVE_INFINITY);
+        assertEquals(columnStatistics.getRange().get().getMax(), NEGATIVE_INFINITY);
+    }
+
+    @Test
+    public void testStatisticsNegZero()
+    {
+        DeltaLakeTableHandle tableHandle = registerTable("negative_zero");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getRange().get().getMin(), -0.0d);
+        assertEquals(columnStatistics.getRange().get().getMax(), -0.0d);
+    }
+
+    @Test
+    public void testStatisticsInfinityAndNaN()
+    {
+        // Stats with NaN values cannot be used
+        DeltaLakeTableHandle tableHandle = registerTable("infinity_nan");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getRange().get().getMin(), POSITIVE_INFINITY);
+        assertEquals(columnStatistics.getRange().get().getMax(), POSITIVE_INFINITY);
+    }
+
+    @Test
+    public void testStatisticsNegativeInfinityAndNaN()
+    {
+        // Stats with NaN values cannot be used
+        DeltaLakeTableHandle tableHandle = registerTable("negative_infinity_nan");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getRange().get().getMin(), NEGATIVE_INFINITY);
+        assertEquals(columnStatistics.getRange().get().getMax(), POSITIVE_INFINITY);
+    }
+
+    @Test
+    public void testStatisticsZeroAndNaN()
+    {
+        // Stats with NaN values cannot be used
+        DeltaLakeTableHandle tableHandle = registerTable("zero_nan");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getRange().get().getMin(), 0.0);
+        assertEquals(columnStatistics.getRange().get().getMax(), POSITIVE_INFINITY);
+    }
+
+    @Test
+    public void testStatisticsZeroAndInfinity()
+    {
+        DeltaLakeTableHandle tableHandle = registerTable("zero_infinity");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getRange().get().getMin(), 0.0);
+        assertEquals(columnStatistics.getRange().get().getMax(), POSITIVE_INFINITY);
+    }
+
+    @Test
+    public void testStatisticsZeroAndNegativeInfinity()
+    {
+        DeltaLakeTableHandle tableHandle = registerTable("zero_negative_infinity");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getRange().get().getMin(), NEGATIVE_INFINITY);
+        assertEquals(columnStatistics.getRange().get().getMax(), 0.0);
+    }
+
+    @Test
+    public void testStatisticsNaNWithMultipleFiles()
+    {
+        // Stats with NaN values cannot be used. This transaction combines a file with NaN min/max values with one with 0.0 min/max values
+        DeltaLakeTableHandle tableHandle = registerTable("nan_multi_file");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getRange(), Optional.empty());
+    }
+
+    @Test
+    public void testStatisticsMultipleFiles()
+    {
+        DeltaLakeTableHandle tableHandle = registerTable("basic_multi_file");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        ColumnStatistics columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getRange().get().getMin(), -42.0);
+        assertEquals(columnStatistics.getRange().get().getMax(), 42.0);
+
+        DeltaLakeTableHandle tableHandleWithUnenforcedConstraint = new DeltaLakeTableHandle(
+                tableHandle.getSchemaName(),
+                tableHandle.getTableName(),
+                tableHandle.isManaged(),
+                tableHandle.getLocation(),
+                tableHandle.getMetadataEntry(),
+                tableHandle.getProtocolEntry(),
+                TupleDomain.all(),
+                TupleDomain.withColumnDomains(ImmutableMap.of((DeltaLakeColumnHandle) COLUMN_HANDLE, Domain.singleValue(DOUBLE, 42.0))),
+                tableHandle.getWriteType(),
+                tableHandle.getProjectedColumns(),
+                tableHandle.getUpdatedColumns(),
+                tableHandle.getUpdateRowIdColumns(),
+                tableHandle.getAnalyzeHandle(),
+                0);
+        stats = getTableStatistics(SESSION, tableHandleWithUnenforcedConstraint);
+        columnStatistics = stats.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getRange().get().getMin(), 0.0);
+        assertEquals(columnStatistics.getRange().get().getMax(), 42.0);
+    }
+
+    @Test
+    public void testStatisticsNoRecords()
+    {
+        DeltaLakeTableHandle tableHandle = registerTable("zero_record_count", "basic_multi_file");
+        DeltaLakeTableHandle tableHandleWithNoneEnforcedConstraint = new DeltaLakeTableHandle(
+                tableHandle.getSchemaName(),
+                tableHandle.getTableName(),
+                tableHandle.isManaged(),
+                tableHandle.getLocation(),
+                tableHandle.getMetadataEntry(),
+                tableHandle.getProtocolEntry(),
+                TupleDomain.none(),
+                TupleDomain.all(),
+                tableHandle.getWriteType(),
+                tableHandle.getProjectedColumns(),
+                tableHandle.getUpdatedColumns(),
+                tableHandle.getUpdateRowIdColumns(),
+                tableHandle.getAnalyzeHandle(),
+                0);
+        DeltaLakeTableHandle tableHandleWithNoneUnenforcedConstraint = new DeltaLakeTableHandle(
+                tableHandle.getSchemaName(),
+                tableHandle.getTableName(),
+                tableHandle.isManaged(),
+                tableHandle.getLocation(),
+                tableHandle.getMetadataEntry(),
+                tableHandle.getProtocolEntry(),
+                TupleDomain.all(),
+                TupleDomain.none(),
+                tableHandle.getWriteType(),
+                tableHandle.getProjectedColumns(),
+                tableHandle.getUpdatedColumns(),
+                tableHandle.getUpdateRowIdColumns(),
+                tableHandle.getAnalyzeHandle(),
+                0);
+        // If either the table handle's constraint or the provided Constraint are none, it will cause a 0 record count to be reported
+        assertEmptyStats(getTableStatistics(SESSION, tableHandleWithNoneEnforcedConstraint));
+        assertEmptyStats(getTableStatistics(SESSION, tableHandleWithNoneUnenforcedConstraint));
+    }
+
+    private void assertEmptyStats(TableStatistics tableStatistics)
+    {
+        assertEquals(tableStatistics.getRowCount(), Estimate.of(0));
+        ColumnStatistics columnStatistics = tableStatistics.getColumnStatistics().get(COLUMN_HANDLE);
+        assertEquals(columnStatistics.getNullsFraction(), Estimate.of(0));
+        assertEquals(columnStatistics.getDistinctValuesCount(), Estimate.of(0));
+    }
+
+    @Test
+    public void testStatisticsParquetParsedStatistics()
+    {
+        // The transaction log for this table was created so that the checkpoints only write struct statistics, not json statistics
+        DeltaLakeTableHandle tableHandle = registerTable("parquet_struct_statistics");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        assertEquals(stats.getRowCount(), Estimate.of(9));
+
+        Map<ColumnHandle, ColumnStatistics> statisticsMap = stats.getColumnStatistics();
+        ColumnStatistics columnStats = statisticsMap.get(new DeltaLakeColumnHandle("dec_short", DecimalType.createDecimalType(5, 1), OptionalInt.empty(), "dec_short", DecimalType.createDecimalType(5, 1), REGULAR, Optional.empty()));
+        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
+        assertEquals(columnStats.getRange().get().getMin(), -10.1);
+        assertEquals(columnStats.getRange().get().getMax(), 10.1);
+
+        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("dec_long", DecimalType.createDecimalType(25, 3), OptionalInt.empty(), "dec_long", DecimalType.createDecimalType(25, 3), REGULAR, Optional.empty()));
+        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
+        assertEquals(columnStats.getRange().get().getMin(), -999999999999.123);
+        assertEquals(columnStats.getRange().get().getMax(), 999999999999.123);
+
+        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("l", BIGINT, OptionalInt.empty(), "l", BIGINT, REGULAR, Optional.empty()));
+        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
+        assertEquals(columnStats.getRange().get().getMin(), -10000000.0);
+        assertEquals(columnStats.getRange().get().getMax(), 10000000.0);
+
+        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("in", INTEGER, OptionalInt.empty(), "in", INTEGER, REGULAR, Optional.empty()));
+        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
+        assertEquals(columnStats.getRange().get().getMin(), -20000000.0);
+        assertEquals(columnStats.getRange().get().getMax(), 20000000.0);
+
+        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("sh", SMALLINT, OptionalInt.empty(), "sh", SMALLINT, REGULAR, Optional.empty()));
+        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
+        assertEquals(columnStats.getRange().get().getMin(), -123.0);
+        assertEquals(columnStats.getRange().get().getMax(), 123.0);
+
+        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("byt", TINYINT, OptionalInt.empty(), "byt", TINYINT, REGULAR, Optional.empty()));
+        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
+        assertEquals(columnStats.getRange().get().getMin(), -42.0);
+        assertEquals(columnStats.getRange().get().getMax(), 42.0);
+
+        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("fl", REAL, OptionalInt.empty(), "fl", REAL, REGULAR, Optional.empty()));
+        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
+        assertEquals((float) columnStats.getRange().get().getMin(), -0.123f);
+        assertEquals((float) columnStats.getRange().get().getMax(), 0.123f);
+
+        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("dou", DOUBLE, OptionalInt.empty(), "dou", DOUBLE, REGULAR, Optional.empty()));
+        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
+        assertEquals(columnStats.getRange().get().getMin(), -0.321);
+        assertEquals(columnStats.getRange().get().getMax(), 0.321);
+
+        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("dat", DATE, OptionalInt.empty(), "dat", DATE, REGULAR, Optional.empty()));
+        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
+        assertEquals(columnStats.getRange().get().getMin(), (double) LocalDate.parse("1900-01-01").toEpochDay());
+        assertEquals(columnStats.getRange().get().getMax(), (double) LocalDate.parse("5000-01-01").toEpochDay());
+    }
+
+    @Test
+    public void testStatisticsParquetParsedStatisticsNaNValues()
+    {
+        // The transaction log for this table was created so that the checkpoints only write struct statistics, not json statistics
+        // The table has a REAL and DOUBLE columns each with 9 values, one of them being NaN
+        DeltaLakeTableHandle tableHandle = registerTable("parquet_struct_statistics_nan");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        assertEquals(stats.getRowCount(), Estimate.of(9));
+
+        Map<ColumnHandle, ColumnStatistics> statisticsMap = stats.getColumnStatistics();
+        ColumnStatistics columnStats = statisticsMap.get(new DeltaLakeColumnHandle("fl", REAL, OptionalInt.empty(), "fl", REAL, REGULAR, Optional.empty()));
+        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
+        assertThat(columnStats.getRange()).isEmpty();
+
+        columnStats = statisticsMap.get(new DeltaLakeColumnHandle("dou", DOUBLE, OptionalInt.empty(), "dou", DOUBLE, REGULAR, Optional.empty()));
+        assertEquals(columnStats.getNullsFraction(), Estimate.zero());
+        assertThat(columnStats.getRange()).isEmpty();
+    }
+
+    @Test
+    public void testStatisticsParquetParsedStatisticsNullCount()
+    {
+        // The transaction log for this table was created so that the checkpoints only write struct statistics, not json statistics
+        // The table has one INTEGER column 'i' where 3 of the 9 values are null
+        DeltaLakeTableHandle tableHandle = registerTable("parquet_struct_statistics_null_count");
+        TableStatistics stats = getTableStatistics(SESSION, tableHandle);
+        assertEquals(stats.getRowCount(), Estimate.of(9));
+
+        Map<ColumnHandle, ColumnStatistics> statisticsMap = stats.getColumnStatistics();
+        ColumnStatistics columnStats = statisticsMap.get(new DeltaLakeColumnHandle("i", INTEGER, OptionalInt.empty(), "i", INTEGER, REGULAR, Optional.empty()));
+        assertEquals(columnStats.getNullsFraction(), Estimate.of(3.0 / 9.0));
+    }
+
+    @Test
+    public void testExtendedStatisticsWithoutDataSize()
+    {
+        // Read extended_stats.json that was generated before supporting data_size
+        Optional<ExtendedStatistics> extendedStatistics = readExtendedStatisticsFromTableResource("statistics/extended_stats_without_data_size");
+        assertThat(extendedStatistics).isNotEmpty();
+        Map<String, DeltaLakeColumnStatistics> columnStatistics = extendedStatistics.get().getColumnStatistics();
+        assertThat(columnStatistics).hasSize(3);
+    }
+
+    @Test
+    public void testExtendedStatisticsWithDataSize()
+    {
+        // Read extended_stats.json that was generated after supporting data_size
+        Optional<ExtendedStatistics> extendedStatistics = readExtendedStatisticsFromTableResource("statistics/extended_stats_with_data_size");
+        assertThat(extendedStatistics).isNotEmpty();
+        Map<String, DeltaLakeColumnStatistics> columnStatistics = extendedStatistics.get().getColumnStatistics();
+        assertThat(columnStatistics).hasSize(3);
+        assertEquals(columnStatistics.get("regionkey").getTotalSizeInBytes(), OptionalLong.empty());
+        assertEquals(columnStatistics.get("name").getTotalSizeInBytes(), OptionalLong.of(34));
+        assertEquals(columnStatistics.get("comment").getTotalSizeInBytes(), OptionalLong.of(330));
+    }
+
+    @Test
+    public void testMergeExtendedStatisticsWithoutAndWithDataSize()
+    {
+        // Merge two extended stats files. The first file doesn't have totalSizeInBytes field and the second file has totalSizeInBytes field
+        Optional<ExtendedStatistics> statisticsWithoutDataSize = readExtendedStatisticsFromTableResource("statistics/extended_stats_without_data_size");
+        Optional<ExtendedStatistics> statisticsWithDataSize = readExtendedStatisticsFromTableResource("statistics/extended_stats_with_data_size");
+        assertThat(statisticsWithoutDataSize).isNotEmpty();
+        assertThat(statisticsWithDataSize).isNotEmpty();
+
+        Map<String, DeltaLakeColumnStatistics> columnStatisticsWithoutDataSize = statisticsWithoutDataSize.get().getColumnStatistics();
+        Map<String, DeltaLakeColumnStatistics> columnStatisticsWithDataSize = statisticsWithDataSize.get().getColumnStatistics();
+
+        DeltaLakeColumnStatistics mergedRegionKey = columnStatisticsWithoutDataSize.get("regionkey").update(columnStatisticsWithDataSize.get("regionkey"));
+        assertEquals(mergedRegionKey.getTotalSizeInBytes(), OptionalLong.empty());
+        assertEquals(mergedRegionKey.getNdvSummary().cardinality(), 5);
+
+        DeltaLakeColumnStatistics mergedName = columnStatisticsWithoutDataSize.get("name").update(columnStatisticsWithDataSize.get("name"));
+        assertEquals(mergedName.getTotalSizeInBytes(), OptionalLong.empty());
+        assertEquals(mergedName.getNdvSummary().cardinality(), 5);
+
+        DeltaLakeColumnStatistics mergedComment = columnStatisticsWithoutDataSize.get("comment").update(columnStatisticsWithDataSize.get("comment"));
+        assertEquals(mergedComment.getTotalSizeInBytes(), OptionalLong.empty());
+        assertEquals(mergedComment.getNdvSummary().cardinality(), 5);
+    }
+
+    private TableStatistics getTableStatistics(ConnectorSession session, DeltaLakeTableHandle tableHandle)
+    {
+        TableSnapshot tableSnapshot;
+        try {
+            tableSnapshot = transactionLogAccess.loadSnapshot(SESSION, tableHandle.getSchemaTableName(), tableHandle.getLocation());
+        }
+        catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        TableStatistics tableStatistics = tableStatisticsProvider.getTableStatistics(session, tableHandle, tableSnapshot);
+        return tableStatistics;
+    }
+
+    private Optional<ExtendedStatistics> readExtendedStatisticsFromTableResource(String tableLocationResourceName)
+    {
+        SchemaTableName name = new SchemaTableName("some_ignored_schema", "some_ignored_name");
+        String tableLocation = Resources.getResource(tableLocationResourceName).toExternalForm();
+        return statistics.readExtendedStatistics(SESSION, name, tableLocation);
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestDeltaLakeParquetStatisticsUtils.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestDeltaLakeParquetStatisticsUtils.java
index 4b5fb2feec79..e4fa3b469d45 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestDeltaLakeParquetStatisticsUtils.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestDeltaLakeParquetStatisticsUtils.java
@@ -21,7 +21,7 @@
 import org.apache.parquet.column.statistics.Statistics;
 import org.apache.parquet.schema.PrimitiveType;
 import org.apache.parquet.schema.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.ByteBuffer;
 import java.time.LocalDate;
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestDeltaLakeSchemaSupport.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestDeltaLakeSchemaSupport.java
index c404bb9706fe..f0924f859ed5 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestDeltaLakeSchemaSupport.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestDeltaLakeSchemaSupport.java
@@ -28,24 +28,26 @@
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
-import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
 import io.trino.spi.type.VarcharType;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.io.Resources.getResource;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
+import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.serializeColumnType;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.serializeSchemaAsJson;
 import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.serializeStatsAsJson;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -65,7 +67,7 @@
 import static io.trino.type.IntervalDayTimeType.INTERVAL_DAY_TIME;
 import static io.trino.type.IntervalYearMonthType.INTERVAL_YEAR_MONTH;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.testng.Assert.assertEquals;
 
 public class TestDeltaLakeSchemaSupport
@@ -164,6 +166,28 @@ public void testSerializeStatisticsAsJson()
                 "{\"numRecords\":100,\"minValues\":{\"c\":42},\"maxValues\":{\"c\":51},\"nullCount\":{\"c\":1}}");
     }
 
+    @Test
+    public void testSerializeStatisticsWithNullValuesAsJson()
+            throws JsonProcessingException
+    {
+        Map<String, Object> minValues = new HashMap<>();
+        Map<String, Object> maxValues = new HashMap<>();
+
+        // Case where the file contains one record and the column `c1` is a null in the record.
+        minValues.put("c1", null);
+        maxValues.put("c1", null);
+        minValues.put("c2", 10);
+        maxValues.put("c2", 26);
+
+        assertEquals(serializeStatsAsJson(
+                        new DeltaLakeJsonFileStatistics(
+                                Optional.of(1L),
+                                Optional.of(minValues),
+                                Optional.of(maxValues),
+                                Optional.of(ImmutableMap.of("c1", 1L, "c2", 0L)))),
+                "{\"numRecords\":1,\"minValues\":{\"c2\":10},\"maxValues\":{\"c2\":26},\"nullCount\":{\"c1\":1,\"c2\":0}}");
+    }
+
     @Test
     public void testSerializeSchemaAsJson()
             throws Exception
@@ -174,7 +198,8 @@ public void testSerializeSchemaAsJson()
                 OptionalInt.empty(),
                 "arr",
                 new ArrayType(new ArrayType(INTEGER)),
-                REGULAR);
+                REGULAR,
+                Optional.empty());
 
         DeltaLakeColumnHandle structColumn = new DeltaLakeColumnHandle(
                 "str",
@@ -190,7 +215,8 @@ public void testSerializeSchemaAsJson()
                         new RowType.Field(Optional.of("s2"), RowType.from(ImmutableList.of(
                                 new RowType.Field(Optional.of("i1"), INTEGER),
                                 new RowType.Field(Optional.of("d2"), DecimalType.createDecimalType(38, 0))))))),
-                REGULAR);
+                REGULAR,
+                Optional.empty());
 
         TypeOperators typeOperators = new TypeOperators();
         DeltaLakeColumnHandle mapColumn = new DeltaLakeColumnHandle(
@@ -205,12 +231,21 @@ public void testSerializeSchemaAsJson()
                         INTEGER,
                         new MapType(INTEGER, INTEGER, typeOperators),
                         typeOperators),
-                REGULAR);
+                REGULAR,
+                Optional.empty());
 
         URL expected = getResource("io/trino/plugin/deltalake/transactionlog/schema/nested_schema.json");
         ObjectMapper objectMapper = new ObjectMapper();
 
-        String jsonEncoding = serializeSchemaAsJson(ImmutableList.of(arrayColumn, structColumn, mapColumn), ImmutableMap.of(), ImmutableMap.of(), ImmutableMap.of());
+        List<DeltaLakeColumnHandle> columnHandles = ImmutableList.of(arrayColumn, structColumn, mapColumn);
+        ImmutableList.Builder<String> columnNames = ImmutableList.builderWithExpectedSize(columnHandles.size());
+        ImmutableMap.Builder<String, Object> columnTypes = ImmutableMap.builderWithExpectedSize(columnHandles.size());
+        for (DeltaLakeColumnHandle column : columnHandles) {
+            columnNames.add(column.getColumnName());
+            columnTypes.put(column.getColumnName(), serializeColumnType(ColumnMappingMode.NONE, new AtomicInteger(), column.getBaseType()));
+        }
+
+        String jsonEncoding = serializeSchemaAsJson(columnNames.build(), columnTypes.buildOrThrow(), ImmutableMap.of(), ImmutableMap.of(), ImmutableMap.of());
         assertThat(objectMapper.readTree(jsonEncoding)).isEqualTo(objectMapper.readTree(expected));
     }
 
@@ -224,70 +259,54 @@ public void testRoundTripComplexSchema()
         List<ColumnMetadata> schema = DeltaLakeSchemaSupport.getColumnMetadata(json, typeManager, ColumnMappingMode.NONE).stream()
                 .map(DeltaLakeColumnMetadata::getColumnMetadata)
                 .collect(toImmutableList());
-        List<DeltaLakeColumnHandle> columnHandles = schema.stream()
-                .map(metadata -> new DeltaLakeColumnHandle(metadata.getName(), metadata.getType(), OptionalInt.empty(), metadata.getName(), metadata.getType(), REGULAR))
-                .collect(toImmutableList());
-        ObjectMapper objectMapper = new ObjectMapper();
-        String jsonEncoding = serializeSchemaAsJson(columnHandles, ImmutableMap.of(), ImmutableMap.of(), ImmutableMap.of());
-        assertThat(objectMapper.readTree(jsonEncoding)).isEqualTo(objectMapper.readTree(expected));
-    }
-
-    @Test(dataProvider = "supportedTypes")
-    public void testValidPrimitiveTypes(Type type)
-    {
-        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(type)).doesNotThrowAnyException();
-    }
 
-    @DataProvider(name = "supportedTypes")
-    public static Object[][] supportedTypes()
-    {
-        return new Object[][] {
-                {BIGINT},
-                {INTEGER},
-                {SMALLINT},
-                {TINYINT},
-                {REAL},
-                {DOUBLE},
-                {BOOLEAN},
-                {VARBINARY},
-                {DATE},
-                {VARCHAR},
-                {DecimalType.createDecimalType(3)},
-                {TIMESTAMP_TZ_MILLIS},
-                {new MapType(TIMESTAMP_TZ_MILLIS, TIMESTAMP_TZ_MILLIS, new TypeOperators())},
-                {RowType.anonymous(ImmutableList.of(TIMESTAMP_TZ_MILLIS))},
-                {new ArrayType(TIMESTAMP_TZ_MILLIS)}};
-    }
+        ImmutableList.Builder<String> columnNames = ImmutableList.builderWithExpectedSize(schema.size());
+        ImmutableMap.Builder<String, Object> columnTypes = ImmutableMap.builderWithExpectedSize(schema.size());
+        for (ColumnMetadata column : schema) {
+            columnNames.add(column.getName());
+            columnTypes.put(column.getName(), serializeColumnType(ColumnMappingMode.NONE, new AtomicInteger(), column.getType()));
+        }
 
-    @Test(dataProvider = "unsupportedTypes")
-    public void testValidateTypeFailsOnUnsupportedPrimitiveType(Type type)
-    {
-        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(type)).hasMessage("Unsupported type: " + type);
+        ObjectMapper objectMapper = new ObjectMapper();
+        String jsonEncoding = serializeSchemaAsJson(columnNames.build(), columnTypes.buildOrThrow(), ImmutableMap.of(), ImmutableMap.of(), ImmutableMap.of());
+        assertThat(objectMapper.readTree(jsonEncoding)).isEqualTo(objectMapper.readTree(expected));
     }
 
-    @DataProvider(name = "unsupportedTypes")
-    public static Object[][] unsupportedTypes()
+    @Test
+    public void testValidPrimitiveTypes()
     {
-        return new Object[][] {
-                {CharType.createCharType(3)},
-                {TIMESTAMP_MILLIS},
-                {TIMESTAMP_SECONDS},
-                {INTERVAL_DAY_TIME},
-                {INTERVAL_YEAR_MONTH}};
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(BIGINT)).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(INTEGER)).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(SMALLINT)).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(TINYINT)).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(REAL)).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(DOUBLE)).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(BOOLEAN)).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(VARBINARY)).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(DATE)).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(VARCHAR)).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(DecimalType.createDecimalType(3))).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(TIMESTAMP_TZ_MILLIS)).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(new MapType(TIMESTAMP_TZ_MILLIS, TIMESTAMP_TZ_MILLIS, new TypeOperators()))).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(RowType.anonymous(ImmutableList.of(TIMESTAMP_TZ_MILLIS)))).doesNotThrowAnyException();
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(new ArrayType(TIMESTAMP_TZ_MILLIS))).doesNotThrowAnyException();
     }
 
-    @Test(dataProvider = "unsupportedNestedTimestamp")
-    public void testTimestampNestedInStructTypeIsNotSupported(Type type)
+    @Test
+    public void testValidateTypeFailsOnUnsupportedPrimitiveType()
     {
-        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(type)).hasMessage("Unsupported type: timestamp(0) with time zone");
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(CharType.createCharType(3))).hasMessage("Unsupported type: " + CharType.createCharType(3));
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(TIMESTAMP_MILLIS)).hasMessage("Unsupported type: " + TIMESTAMP_MILLIS);
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(TIMESTAMP_SECONDS)).hasMessage("Unsupported type: " + TIMESTAMP_SECONDS);
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(INTERVAL_DAY_TIME)).hasMessage("Unsupported type: " + INTERVAL_DAY_TIME);
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(INTERVAL_YEAR_MONTH)).hasMessage("Unsupported type: " + INTERVAL_YEAR_MONTH);
     }
 
-    @DataProvider(name = "unsupportedNestedTimestamp")
-    public static Object[][] unsupportedNestedTimestamp()
+    @Test
+    public void testTimestampNestedInStructTypeIsNotSupported()
     {
-        return new Object[][] {
-                {new MapType(TIMESTAMP_TZ_SECONDS, TIMESTAMP_TZ_SECONDS, new TypeOperators())},
-                {RowType.anonymous(ImmutableList.of(TIMESTAMP_TZ_SECONDS))},
-                {new ArrayType(TIMESTAMP_TZ_SECONDS)}};
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(new MapType(TIMESTAMP_TZ_SECONDS, TIMESTAMP_TZ_SECONDS, new TypeOperators()))).hasMessage("Unsupported type: timestamp(0) with time zone");
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(RowType.anonymous(ImmutableList.of(TIMESTAMP_TZ_SECONDS)))).hasMessage("Unsupported type: timestamp(0) with time zone");
+        assertThatCode(() -> DeltaLakeSchemaSupport.validateType(new ArrayType(TIMESTAMP_TZ_SECONDS))).hasMessage("Unsupported type: timestamp(0) with time zone");
     }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestProtocolEntry.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestProtocolEntry.java
new file mode 100644
index 000000000000..b5f2c478ca3d
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestProtocolEntry.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.transactionlog;
+
+import com.google.common.collect.ImmutableSet;
+import io.airlift.json.JsonCodec;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testng.Assert.assertEquals;
+
+public class TestProtocolEntry
+{
+    private final JsonCodec<ProtocolEntry> codec = JsonCodec.jsonCodec(ProtocolEntry.class);
+
+    @Test
+    public void testProtocolEntryFromJson()
+    {
+        @Language("JSON")
+        String json = "{\"minReaderVersion\":2,\"minWriterVersion\":5}";
+        assertEquals(
+                codec.fromJson(json),
+                new ProtocolEntry(2, 5, Optional.empty(), Optional.empty()));
+
+        @Language("JSON")
+        String jsonWithFeatures = "{\"minReaderVersion\":3,\"minWriterVersion\":7,\"readerFeatures\":[\"deletionVectors\"],\"writerFeatures\":[\"timestampNTZ\"]}";
+        assertEquals(
+                codec.fromJson(jsonWithFeatures),
+                new ProtocolEntry(3, 7, Optional.of(ImmutableSet.of("deletionVectors")), Optional.of(ImmutableSet.of("timestampNTZ"))));
+    }
+
+    @Test
+    public void testInvalidProtocolEntryFromJson()
+    {
+        @Language("JSON")
+        String invalidMinReaderVersion = "{\"minReaderVersion\":2,\"minWriterVersion\":7,\"readerFeatures\":[\"deletionVectors\"]}";
+        assertThatThrownBy(() -> codec.fromJson(invalidMinReaderVersion))
+                .hasMessageContaining("Invalid JSON string")
+                .hasStackTraceContaining("readerFeatures must not exist when minReaderVersion is less than 3");
+
+        @Language("JSON")
+        String invalidMinWriterVersion = "{\"minReaderVersion\":3,\"minWriterVersion\":6,\"writerFeatures\":[\"timestampNTZ\"]}";
+        assertThatThrownBy(() -> codec.fromJson(invalidMinWriterVersion))
+                .hasMessageContaining("Invalid JSON string")
+                .hasStackTraceContaining("writerFeatures must not exist when minWriterVersion is less than 7");
+    }
+
+    @Test
+    public void testProtocolEntryToJson()
+    {
+        assertEquals(
+                codec.toJson(new ProtocolEntry(2, 5, Optional.empty(), Optional.empty())),
+                """
+                {
+                  "minReaderVersion" : 2,
+                  "minWriterVersion" : 5
+                }""");
+
+        assertEquals(
+                codec.toJson(new ProtocolEntry(3, 7, Optional.of(ImmutableSet.of("deletionVectors")), Optional.of(ImmutableSet.of("timestampNTZ")))),
+                """
+                {
+                  "minReaderVersion" : 3,
+                  "minWriterVersion" : 7,
+                  "readerFeatures" : [ "deletionVectors" ],
+                  "writerFeatures" : [ "timestampNTZ" ]
+                }""");
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestTableSnapshot.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestTableSnapshot.java
index 50e124310a8d..3b6186fe7654 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestTableSnapshot.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestTableSnapshot.java
@@ -14,8 +14,6 @@
 package io.trino.plugin.deltalake.transactionlog;
 
 import com.google.common.collect.HashMultiset;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultiset;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multiset;
@@ -24,12 +22,17 @@
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.parquet.ParquetReaderOptions;
+import io.trino.plugin.deltalake.DeltaLakeConfig;
 import io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointSchemaManager;
+import io.trino.plugin.deltalake.transactionlog.checkpoint.LastCheckpoint;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
 import io.trino.spi.connector.SchemaTableName;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import io.trino.spi.type.TypeManager;
+import io.trino.testing.TestingConnectorContext;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -41,18 +44,24 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_NEW_STREAM;
+import static io.trino.plugin.deltalake.transactionlog.TableSnapshot.MetadataAndProtocolEntry;
+import static io.trino.plugin.deltalake.transactionlog.TableSnapshot.load;
+import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.readLastCheckpoint;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.ADD;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.PROTOCOL;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
+import static io.trino.testing.MultisetAssertions.assertMultisetsEqual;
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.util.Collections.nCopies;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toCollection;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true) // e.g. TrackingFileSystemFactory is shared mutable state
+@TestInstance(PER_METHOD) // e.g. TrackingFileSystemFactory is shared mutable state
 public class TestTableSnapshot
 {
     private final ParquetReaderOptions parquetReaderOptions = new ParquetReaderConfig().toParquetReaderOptions();
@@ -63,14 +72,14 @@ public class TestTableSnapshot
     private TrinoFileSystem trackingFileSystem;
     private String tableLocation;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
             throws URISyntaxException
     {
         checkpointSchemaManager = new CheckpointSchemaManager(TESTING_TYPE_MANAGER);
-        tableLocation = getClass().getClassLoader().getResource("databricks/person").toURI().toString();
+        tableLocation = getClass().getClassLoader().getResource("databricks73/person").toURI().toString();
 
-        trackingFileSystemFactory = new TrackingFileSystemFactory(new HdfsFileSystemFactory(HDFS_ENVIRONMENT));
+        trackingFileSystemFactory = new TrackingFileSystemFactory(new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS));
         trackingFileSystem = trackingFileSystemFactory.create(SESSION);
     }
 
@@ -81,8 +90,15 @@ public void testOnlyReadsTrailingJsonFiles()
         AtomicReference<TableSnapshot> tableSnapshot = new AtomicReference<>();
         assertFileSystemAccesses(
                 () -> {
-                    tableSnapshot.set(TableSnapshot.load(
-                            new SchemaTableName("schema", "person"), trackingFileSystem, tableLocation, parquetReaderOptions, true, domainCompactionThreshold));
+                    Optional<LastCheckpoint> lastCheckpoint = readLastCheckpoint(trackingFileSystem, tableLocation);
+                    tableSnapshot.set(load(
+                            new SchemaTableName("schema", "person"),
+                            lastCheckpoint,
+                            trackingFileSystem,
+                            tableLocation,
+                            parquetReaderOptions,
+                            true,
+                            domainCompactionThreshold));
                 },
                 ImmutableMultiset.<FileOperation>builder()
                         .addCopies(new FileOperation("_last_checkpoint", INPUT_FILE_NEW_STREAM), 1)
@@ -104,11 +120,29 @@ public void testOnlyReadsTrailingJsonFiles()
     public void readsCheckpointFile()
             throws IOException
     {
-        TableSnapshot tableSnapshot = TableSnapshot.load(
-                new SchemaTableName("schema", "person"), trackingFileSystem, tableLocation, parquetReaderOptions, true, domainCompactionThreshold);
-        tableSnapshot.setCachedMetadata(Optional.of(new MetadataEntry("id", "name", "description", null, "schema", ImmutableList.of(), ImmutableMap.of(), 0)));
+        Optional<LastCheckpoint> lastCheckpoint = readLastCheckpoint(trackingFileSystem, tableLocation);
+        TableSnapshot tableSnapshot = load(
+                new SchemaTableName("schema", "person"),
+                lastCheckpoint,
+                trackingFileSystem,
+                tableLocation,
+                parquetReaderOptions,
+                true,
+                domainCompactionThreshold);
+        TestingConnectorContext context = new TestingConnectorContext();
+        TypeManager typeManager = context.getTypeManager();
+        TransactionLogAccess transactionLogAccess = new TransactionLogAccess(
+                typeManager,
+                new CheckpointSchemaManager(typeManager),
+                new DeltaLakeConfig(),
+                new FileFormatDataSourceStats(),
+                trackingFileSystemFactory,
+                new ParquetReaderConfig());
+        MetadataEntry metadataEntry = transactionLogAccess.getMetadataEntry(tableSnapshot, SESSION);
+        ProtocolEntry protocolEntry = transactionLogAccess.getProtocolEntry(SESSION, tableSnapshot);
+        tableSnapshot.setCachedMetadata(Optional.of(metadataEntry));
         try (Stream<DeltaLakeTransactionLogEntry> stream = tableSnapshot.getCheckpointTransactionLogEntries(
-                SESSION, ImmutableSet.of(ADD), checkpointSchemaManager, TESTING_TYPE_MANAGER, trackingFileSystem, new FileFormatDataSourceStats())) {
+                SESSION, ImmutableSet.of(ADD), checkpointSchemaManager, TESTING_TYPE_MANAGER, trackingFileSystem, new FileFormatDataSourceStats(), Optional.of(new MetadataAndProtocolEntry(metadataEntry, protocolEntry)))) {
             List<DeltaLakeTransactionLogEntry> entries = stream.collect(toImmutableList());
 
             assertThat(entries).hasSize(9);
@@ -127,7 +161,8 @@ public void readsCheckpointFile()
                                     "\"nullCount\":{\"name\":0,\"married\":0,\"phones\":0,\"address\":{\"street\":0,\"city\":0,\"state\":0,\"zip\":0},\"income\":0}" +
                                     "}"),
                             Optional.empty(),
-                            null));
+                            null,
+                            Optional.empty()));
 
             assertThat(entries).element(7).extracting(DeltaLakeTransactionLogEntry::getAdd).isEqualTo(
                     new AddFileEntry(
@@ -143,12 +178,13 @@ public void readsCheckpointFile()
                                     "\"nullCount\":{\"name\":0,\"married\":0,\"phones\":0,\"address\":{\"street\":0,\"city\":0,\"state\":0,\"zip\":0},\"income\":0}" +
                                     "}"),
                             Optional.empty(),
-                            null));
+                            null,
+                            Optional.empty()));
         }
 
         // lets read two entry types in one call; add and protocol
         try (Stream<DeltaLakeTransactionLogEntry> stream = tableSnapshot.getCheckpointTransactionLogEntries(
-                SESSION, ImmutableSet.of(ADD, PROTOCOL), checkpointSchemaManager, TESTING_TYPE_MANAGER, trackingFileSystem, new FileFormatDataSourceStats())) {
+                SESSION, ImmutableSet.of(ADD, PROTOCOL), checkpointSchemaManager, TESTING_TYPE_MANAGER, trackingFileSystem, new FileFormatDataSourceStats(), Optional.of(new MetadataAndProtocolEntry(metadataEntry, protocolEntry)))) {
             List<DeltaLakeTransactionLogEntry> entries = stream.collect(toImmutableList());
 
             assertThat(entries).hasSize(10);
@@ -167,9 +203,10 @@ public void readsCheckpointFile()
                                     "\"nullCount\":{\"name\":0,\"married\":0,\"phones\":0,\"address\":{\"street\":0,\"city\":0,\"state\":0,\"zip\":0},\"income\":0}" +
                                     "}"),
                             Optional.empty(),
-                            null));
+                            null,
+                            Optional.empty()));
 
-            assertThat(entries).element(6).extracting(DeltaLakeTransactionLogEntry::getProtocol).isEqualTo(new ProtocolEntry(1, 2));
+            assertThat(entries).element(6).extracting(DeltaLakeTransactionLogEntry::getProtocol).isEqualTo(new ProtocolEntry(1, 2, Optional.empty(), Optional.empty()));
 
             assertThat(entries).element(8).extracting(DeltaLakeTransactionLogEntry::getAdd).isEqualTo(
                     new AddFileEntry(
@@ -185,7 +222,8 @@ public void readsCheckpointFile()
                                     "\"nullCount\":{\"name\":0,\"married\":0,\"phones\":0,\"address\":{\"street\":0,\"city\":0,\"state\":0,\"zip\":0},\"income\":0}" +
                                     "}"),
                             Optional.empty(),
-                            null));
+                            null,
+                            Optional.empty()));
         }
     }
 
@@ -193,8 +231,15 @@ public void readsCheckpointFile()
     public void testMaxTransactionId()
             throws IOException
     {
-        TableSnapshot tableSnapshot = TableSnapshot.load(
-                new SchemaTableName("schema", "person"), trackingFileSystem, tableLocation, parquetReaderOptions, true, domainCompactionThreshold);
+        Optional<LastCheckpoint> lastCheckpoint = readLastCheckpoint(trackingFileSystem, tableLocation);
+        TableSnapshot tableSnapshot = load(
+                new SchemaTableName("schema", "person"),
+                lastCheckpoint,
+                trackingFileSystem,
+                tableLocation,
+                parquetReaderOptions,
+                true,
+                domainCompactionThreshold);
         assertEquals(tableSnapshot.getVersion(), 13L);
     }
 
@@ -203,7 +248,7 @@ private void assertFileSystemAccesses(ThrowingRunnable callback, Multiset<FileOp
     {
         trackingFileSystemFactory.reset();
         callback.run();
-        assertThat(getOperations()).containsExactlyInAnyOrderElementsOf(expectedAccesses);
+        assertMultisetsEqual(getOperations(), expectedAccesses);
     }
 
     private Multiset<FileOperation> getOperations()
@@ -211,8 +256,8 @@ private Multiset<FileOperation> getOperations()
         return trackingFileSystemFactory.getOperationCounts()
                 .entrySet().stream()
                 .flatMap(entry -> nCopies(entry.getValue(), new FileOperation(
-                        entry.getKey().getFilePath().replaceFirst(".*/_delta_log/", ""),
-                        entry.getKey().getOperationType())).stream())
+                        entry.getKey().location().toString().replaceFirst(".*/_delta_log/", ""),
+                        entry.getKey().operationType())).stream())
                 .collect(toCollection(HashMultiset::create));
     }
 
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestTransactionLogParser.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestTransactionLogParser.java
index 5fb490967ed3..0e35b212be84 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestTransactionLogParser.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/TestTransactionLogParser.java
@@ -16,12 +16,13 @@
 
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.filesystem.Locations.appendPath;
 import static io.trino.plugin.deltalake.DeltaTestingConnectorSession.SESSION;
 import static io.trino.plugin.deltalake.transactionlog.TransactionLogParser.getMandatoryCurrentVersion;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static org.testng.Assert.assertEquals;
 
 public class TestTransactionLogParser
@@ -30,9 +31,9 @@ public class TestTransactionLogParser
     public void testGetCurrentVersion()
             throws Exception
     {
-        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT).create(SESSION);
+        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS).create(SESSION);
 
-        String basePath = getClass().getClassLoader().getResource("databricks").toURI().toString();
+        String basePath = getClass().getClassLoader().getResource("databricks73").toURI().toString();
 
         assertEquals(getMandatoryCurrentVersion(fileSystem, appendPath(basePath, "simple_table_without_checkpoint")), 9);
         assertEquals(getMandatoryCurrentVersion(fileSystem, appendPath(basePath, "simple_table_ending_on_checkpoint")), 10);
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestCheckpointBuilder.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestCheckpointBuilder.java
index dc36b246e8ea..292b816be1a4 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestCheckpointBuilder.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestCheckpointBuilder.java
@@ -18,7 +18,7 @@
 import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.plugin.deltalake.transactionlog.RemoveFileEntry;
 import io.trino.plugin.deltalake.transactionlog.TransactionEntry;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -44,8 +44,8 @@ public void testCheckpointBuilder()
         builder.addLogEntry(metadataEntry(metadata1));
         builder.addLogEntry(metadataEntry(metadata2));
 
-        ProtocolEntry protocol1 = new ProtocolEntry(1, 2);
-        ProtocolEntry protocol2 = new ProtocolEntry(3, 4);
+        ProtocolEntry protocol1 = new ProtocolEntry(1, 2, Optional.empty(), Optional.empty());
+        ProtocolEntry protocol2 = new ProtocolEntry(3, 4, Optional.empty(), Optional.empty());
         builder.addLogEntry(protocolEntry(protocol1));
         builder.addLogEntry(protocolEntry(protocol2));
 
@@ -58,10 +58,10 @@ public void testCheckpointBuilder()
         builder.addLogEntry(transactionEntry(app1TransactionV1));
         builder.addLogEntry(transactionEntry(app2TransactionV5));
 
-        AddFileEntry addA1 = new AddFileEntry("a", Map.of(), 1, 1, true, Optional.empty(), Optional.empty(), Map.of());
+        AddFileEntry addA1 = new AddFileEntry("a", Map.of(), 1, 1, true, Optional.empty(), Optional.empty(), Map.of(), Optional.empty());
         RemoveFileEntry removeA1 = new RemoveFileEntry("a", 1, true);
-        AddFileEntry addA2 = new AddFileEntry("a", Map.of(), 2, 1, true, Optional.empty(), Optional.empty(), Map.of());
-        AddFileEntry addB = new AddFileEntry("b", Map.of(), 1, 1, true, Optional.empty(), Optional.empty(), Map.of());
+        AddFileEntry addA2 = new AddFileEntry("a", Map.of(), 2, 1, true, Optional.empty(), Optional.empty(), Map.of(), Optional.empty());
+        AddFileEntry addB = new AddFileEntry("b", Map.of(), 1, 1, true, Optional.empty(), Optional.empty(), Map.of(), Optional.empty());
         RemoveFileEntry removeB = new RemoveFileEntry("b", 1, true);
         RemoveFileEntry removeC = new RemoveFileEntry("c", 1, true);
         builder.addLogEntry(addFileEntry(addA1));
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestCheckpointEntryIterator.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestCheckpointEntryIterator.java
index cfb725ac86f8..5cd49f81ac57 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestCheckpointEntryIterator.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestCheckpointEntryIterator.java
@@ -14,11 +14,16 @@
 package io.trino.plugin.deltalake.transactionlog.checkpoint;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterators;
+import io.airlift.units.DataSize;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoOutputFile;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.parquet.writer.ParquetWriterOptions;
 import io.trino.plugin.deltalake.DeltaLakeConfig;
 import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
 import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
@@ -27,10 +32,12 @@
 import io.trino.plugin.deltalake.transactionlog.RemoveFileEntry;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.util.List;
@@ -38,7 +45,10 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
+import java.util.stream.IntStream;
 
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.io.Resources.getResource;
 import static io.trino.plugin.deltalake.DeltaTestingConnectorSession.SESSION;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.ADD;
@@ -48,27 +58,41 @@
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.REMOVE;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.TRANSACTION;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestCheckpointEntryIterator
 {
-    private static final String TEST_CHECKPOINT = "databricks/person/_delta_log/00000000000000000010.checkpoint.parquet";
+    private static final String TEST_CHECKPOINT = "databricks73/person/_delta_log/00000000000000000010.checkpoint.parquet";
 
     private CheckpointSchemaManager checkpointSchemaManager;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         checkpointSchemaManager = new CheckpointSchemaManager(TESTING_TYPE_MANAGER);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         checkpointSchemaManager = null;
     }
 
+    @Test
+    public void testReadNoEntries()
+            throws Exception
+    {
+        URI checkpointUri = getResource(TEST_CHECKPOINT).toURI();
+        assertThatThrownBy(() -> createCheckpointEntryIterator(checkpointUri, ImmutableSet.of(), Optional.empty(), Optional.empty()))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("fields is empty");
+    }
+
     @Test
     public void testReadMetadataEntry()
             throws Exception
@@ -103,12 +127,73 @@ public void testReadMetadataEntry()
                                 1579190100722L));
     }
 
+    @Test
+    public void testReadProtocolEntries()
+            throws Exception
+    {
+        URI checkpointUri = getResource(TEST_CHECKPOINT).toURI();
+        CheckpointEntryIterator checkpointEntryIterator = createCheckpointEntryIterator(checkpointUri, ImmutableSet.of(PROTOCOL), Optional.empty(), Optional.empty());
+        List<DeltaLakeTransactionLogEntry> entries = ImmutableList.copyOf(checkpointEntryIterator);
+
+        assertThat(entries).hasSize(1);
+
+        assertThat(entries).element(0).extracting(DeltaLakeTransactionLogEntry::getProtocol).isEqualTo(
+                new ProtocolEntry(
+                        1,
+                        2,
+                        Optional.empty(),
+                        Optional.empty()));
+    }
+
+    @Test
+    public void testReadMetadataAndProtocolEntry()
+            throws Exception
+    {
+        URI checkpointUri = getResource(TEST_CHECKPOINT).toURI();
+        CheckpointEntryIterator checkpointEntryIterator = createCheckpointEntryIterator(checkpointUri, ImmutableSet.of(METADATA, PROTOCOL), Optional.empty(), Optional.empty());
+        List<DeltaLakeTransactionLogEntry> entries = ImmutableList.copyOf(checkpointEntryIterator);
+
+        assertThat(entries).hasSize(2);
+        assertThat(entries).containsExactlyInAnyOrder(
+                DeltaLakeTransactionLogEntry.metadataEntry(new MetadataEntry(
+                        "b6aeffad-da73-4dde-b68e-937e468b1fde",
+                        null,
+                        null,
+                        new MetadataEntry.Format("parquet", Map.of()),
+                        "{\"type\":\"struct\",\"fields\":[" +
+                                "{\"name\":\"name\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}," +
+                                "{\"name\":\"age\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}}," +
+                                "{\"name\":\"married\",\"type\":\"boolean\",\"nullable\":true,\"metadata\":{}}," +
+
+                                "{\"name\":\"phones\",\"type\":{\"type\":\"array\",\"elementType\":{\"type\":\"struct\",\"fields\":[" +
+                                "{\"name\":\"number\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}," +
+                                "{\"name\":\"label\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}]}," +
+                                "\"containsNull\":true},\"nullable\":true,\"metadata\":{}}," +
+
+                                "{\"name\":\"address\",\"type\":{\"type\":\"struct\",\"fields\":[" +
+                                "{\"name\":\"street\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}," +
+                                "{\"name\":\"city\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}," +
+                                "{\"name\":\"state\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}," +
+                                "{\"name\":\"zip\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}]},\"nullable\":true,\"metadata\":{}}," +
+
+                                "{\"name\":\"income\",\"type\":\"double\",\"nullable\":true,\"metadata\":{}}]}",
+                        List.of("age"),
+                        Map.of(),
+                        1579190100722L)),
+                DeltaLakeTransactionLogEntry.protocolEntry(
+                        new ProtocolEntry(
+                                1,
+                                2,
+                                Optional.empty(),
+                                Optional.empty())));
+    }
+
     @Test
     public void testReadAddEntries()
             throws Exception
     {
         URI checkpointUri = getResource(TEST_CHECKPOINT).toURI();
-        CheckpointEntryIterator checkpointEntryIterator = createCheckpointEntryIterator(checkpointUri, ImmutableSet.of(ADD), Optional.of(readMetadataEntry(checkpointUri)));
+        CheckpointEntryIterator checkpointEntryIterator = createCheckpointEntryIterator(checkpointUri, ImmutableSet.of(ADD), Optional.of(readMetadataEntry(checkpointUri)), Optional.of(readProtocolEntry(checkpointUri)));
         List<DeltaLakeTransactionLogEntry> entries = ImmutableList.copyOf(checkpointEntryIterator);
 
         assertThat(entries).hasSize(9);
@@ -127,7 +212,8 @@ public void testReadAddEntries()
                                 "\"nullCount\":{\"name\":0,\"married\":0,\"phones\":0,\"address\":{\"street\":0,\"city\":0,\"state\":0,\"zip\":0},\"income\":0}" +
                                 "}"),
                         Optional.empty(),
-                        null));
+                        null,
+                        Optional.empty()));
 
         assertThat(entries).element(7).extracting(DeltaLakeTransactionLogEntry::getAdd).isEqualTo(
                 new AddFileEntry(
@@ -143,7 +229,8 @@ public void testReadAddEntries()
                                 "\"nullCount\":{\"name\":0,\"married\":0,\"phones\":0,\"address\":{\"street\":0,\"city\":0,\"state\":0,\"zip\":0},\"income\":0}" +
                                 "}"),
                         Optional.empty(),
-                        null));
+                        null,
+                        Optional.empty()));
     }
 
     @Test
@@ -155,7 +242,8 @@ public void testReadAllEntries()
         CheckpointEntryIterator checkpointEntryIterator = createCheckpointEntryIterator(
                 checkpointUri,
                 ImmutableSet.of(METADATA, PROTOCOL, TRANSACTION, ADD, REMOVE, COMMIT),
-                Optional.of(readMetadataEntry(checkpointUri)));
+                Optional.of(readMetadataEntry(checkpointUri)),
+                Optional.of(readProtocolEntry(checkpointUri)));
         List<DeltaLakeTransactionLogEntry> entries = ImmutableList.copyOf(checkpointEntryIterator);
 
         assertThat(entries).hasSize(17);
@@ -164,7 +252,7 @@ public void testReadAllEntries()
         assertThat(entries).element(12).extracting(DeltaLakeTransactionLogEntry::getMetaData).isEqualTo(metadataEntry);
 
         // ProtocolEntry
-        assertThat(entries).element(11).extracting(DeltaLakeTransactionLogEntry::getProtocol).isEqualTo(new ProtocolEntry(1, 2));
+        assertThat(entries).element(11).extracting(DeltaLakeTransactionLogEntry::getProtocol).isEqualTo(new ProtocolEntry(1, 2, Optional.empty(), Optional.empty()));
 
         // TransactionEntry
         // not found in the checkpoint, TODO add a test
@@ -188,7 +276,8 @@ public void testReadAllEntries()
                                 "\"nullCount\":{\"name\":0,\"married\":0,\"phones\":0,\"address\":{\"street\":0,\"city\":0,\"state\":0,\"zip\":0},\"income\":0}" +
                                 "}"),
                         Optional.empty(),
-                        null));
+                        null,
+                        Optional.empty()));
 
         // RemoveFileEntry
         assertThat(entries).element(3).extracting(DeltaLakeTransactionLogEntry::getRemove).isEqualTo(
@@ -205,18 +294,117 @@ public void testReadAllEntries()
                 .isEmpty();
     }
 
+    @Test
+    public void testSkipRemoveEntries()
+            throws IOException
+    {
+        MetadataEntry metadataEntry = new MetadataEntry(
+                "metadataId",
+                "metadataName",
+                "metadataDescription",
+                new MetadataEntry.Format(
+                        "metadataFormatProvider",
+                        ImmutableMap.of()),
+                "{\"type\":\"struct\",\"fields\":" +
+                        "[{\"name\":\"ts\",\"type\":\"timestamp\",\"nullable\":true,\"metadata\":{}}]}",
+                ImmutableList.of("part_key"),
+                ImmutableMap.of(),
+                1000);
+        ProtocolEntry protocolEntry = new ProtocolEntry(10, 20, Optional.empty(), Optional.empty());
+        AddFileEntry addFileEntryJsonStats = new AddFileEntry(
+                "addFilePathJson",
+                ImmutableMap.of(),
+                1000,
+                1001,
+                true,
+                Optional.of("{" +
+                        "\"numRecords\":20," +
+                        "\"minValues\":{" +
+                        "\"ts\":\"2960-10-31T01:00:00.000Z\"" +
+                        "}," +
+                        "\"maxValues\":{" +
+                        "\"ts\":\"2960-10-31T02:00:00.000Z\"" +
+                        "}," +
+                        "\"nullCount\":{" +
+                        "\"ts\":1" +
+                        "}}"),
+                Optional.empty(),
+                ImmutableMap.of(),
+                Optional.empty());
+
+        int numRemoveEntries = 100;
+        Set<RemoveFileEntry> removeEntries = IntStream.range(0, numRemoveEntries).mapToObj(x ->
+                        new RemoveFileEntry(
+                                UUID.randomUUID().toString(),
+                                1000,
+                                true))
+                .collect(toImmutableSet());
+
+        CheckpointEntries entries = new CheckpointEntries(
+                metadataEntry,
+                protocolEntry,
+                ImmutableSet.of(),
+                ImmutableSet.of(addFileEntryJsonStats),
+                removeEntries);
+
+        CheckpointWriter writer = new CheckpointWriter(
+                TESTING_TYPE_MANAGER,
+                checkpointSchemaManager,
+                "test",
+                ParquetWriterOptions.builder() // approximately 2 rows per row group
+                        .setMaxBlockSize(DataSize.ofBytes(64L))
+                        .setMaxPageSize(DataSize.ofBytes(64L))
+                        .build());
+
+        File targetFile = File.createTempFile("testSkipRemoveEntries-", ".checkpoint.parquet");
+        targetFile.deleteOnExit();
+
+        String targetPath = "file://" + targetFile.getAbsolutePath();
+        targetFile.delete(); // file must not exist when writer is called
+        writer.write(entries, createOutputFile(targetPath));
+
+        CheckpointEntryIterator metadataAndProtocolEntryIterator =
+                createCheckpointEntryIterator(URI.create(targetPath), ImmutableSet.of(METADATA, PROTOCOL), Optional.empty(), Optional.empty());
+        CheckpointEntryIterator addEntryIterator = createCheckpointEntryIterator(
+                URI.create(targetPath),
+                ImmutableSet.of(ADD),
+                Optional.of(metadataEntry),
+                Optional.of(protocolEntry));
+        CheckpointEntryIterator removeEntryIterator =
+                createCheckpointEntryIterator(URI.create(targetPath), ImmutableSet.of(REMOVE), Optional.empty(), Optional.empty());
+        CheckpointEntryIterator txnEntryIterator =
+                createCheckpointEntryIterator(URI.create(targetPath), ImmutableSet.of(TRANSACTION), Optional.empty(), Optional.empty());
+
+        assertThat(Iterators.size(metadataAndProtocolEntryIterator)).isEqualTo(2);
+        assertThat(Iterators.size(addEntryIterator)).isEqualTo(1);
+        assertThat(Iterators.size(removeEntryIterator)).isEqualTo(numRemoveEntries);
+        assertThat(Iterators.size(txnEntryIterator)).isEqualTo(0);
+
+        assertThat(metadataAndProtocolEntryIterator.getCompletedPositions().orElseThrow()).isEqualTo(3L);
+        assertThat(addEntryIterator.getCompletedPositions().orElseThrow()).isEqualTo(2L);
+        assertThat(removeEntryIterator.getCompletedPositions().orElseThrow()).isEqualTo(100L);
+        assertThat(txnEntryIterator.getCompletedPositions().orElseThrow()).isEqualTo(0L);
+    }
+
     private MetadataEntry readMetadataEntry(URI checkpointUri)
             throws IOException
     {
-        CheckpointEntryIterator checkpointEntryIterator = createCheckpointEntryIterator(checkpointUri, ImmutableSet.of(METADATA), Optional.empty());
+        CheckpointEntryIterator checkpointEntryIterator = createCheckpointEntryIterator(checkpointUri, ImmutableSet.of(METADATA), Optional.empty(), Optional.empty());
         return Iterators.getOnlyElement(checkpointEntryIterator).getMetaData();
     }
 
-    private CheckpointEntryIterator createCheckpointEntryIterator(URI checkpointUri, Set<CheckpointEntryIterator.EntryType> entryTypes, Optional<MetadataEntry> metadataEntry)
+    private ProtocolEntry readProtocolEntry(URI checkpointUri)
+            throws IOException
+    {
+        CheckpointEntryIterator checkpointEntryIterator = createCheckpointEntryIterator(checkpointUri, ImmutableSet.of(PROTOCOL), Optional.empty(), Optional.empty());
+        return Iterators.getOnlyElement(checkpointEntryIterator).getProtocol();
+    }
+
+    private CheckpointEntryIterator createCheckpointEntryIterator(URI checkpointUri, Set<CheckpointEntryIterator.EntryType> entryTypes, Optional<MetadataEntry> metadataEntry, Optional<ProtocolEntry> protocolEntry)
             throws IOException
     {
-        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT).create(SESSION);
-        TrinoInputFile checkpointFile = fileSystem.newInputFile(checkpointUri.toString());
+        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS).create(SESSION);
+        TrinoInputFile checkpointFile = fileSystem.newInputFile(Location.of(checkpointUri.toString()));
 
         return new CheckpointEntryIterator(
                 checkpointFile,
@@ -226,9 +414,15 @@ private CheckpointEntryIterator createCheckpointEntryIterator(URI checkpointUri,
                 TESTING_TYPE_MANAGER,
                 entryTypes,
                 metadataEntry,
+                protocolEntry,
                 new FileFormatDataSourceStats(),
                 new ParquetReaderConfig().toParquetReaderOptions(),
                 true,
                 new DeltaLakeConfig().getDomainCompactionThreshold());
     }
+
+    private static TrinoOutputFile createOutputFile(String path)
+    {
+        return new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS).create(SESSION).newOutputFile(Location.of(path));
+    }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestCheckpointWriter.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestCheckpointWriter.java
index 0f63587b1a21..c17f72519d4e 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestCheckpointWriter.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestCheckpointWriter.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.slice.Slice;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.filesystem.TrinoOutputFile;
@@ -34,22 +35,19 @@
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.ColumnarRow;
-import io.trino.spi.block.RowBlock;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.Int128;
 import io.trino.spi.type.IntegerType;
 import io.trino.spi.type.TypeManager;
 import io.trino.util.DateTimeUtils;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.IntStream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
@@ -62,7 +60,7 @@
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.REMOVE;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.TRANSACTION;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.spi.predicate.Utils.nativeValueToBlock;
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
@@ -71,17 +69,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
-@Test
 public class TestCheckpointWriter
 {
     private final TypeManager typeManager = TESTING_TYPE_MANAGER;
-    private CheckpointSchemaManager checkpointSchemaManager;
-
-    @BeforeClass
-    public void setUp()
-    {
-        checkpointSchemaManager = new CheckpointSchemaManager(typeManager);
-    }
+    private final CheckpointSchemaManager checkpointSchemaManager = new CheckpointSchemaManager(typeManager);
 
     @Test
     public void testCheckpointWriteReadJsonRoundtrip()
@@ -120,7 +111,7 @@ public void testCheckpointWriteReadJsonRoundtrip()
                         "configOption1", "blah",
                         "configOption2", "plah"),
                 1000);
-        ProtocolEntry protocolEntry = new ProtocolEntry(10, 20);
+        ProtocolEntry protocolEntry = new ProtocolEntry(10, 20, Optional.empty(), Optional.empty());
         TransactionEntry transactionEntry = new TransactionEntry("appId", 1, 1001);
         AddFileEntry addFileEntryJsonStats = new AddFileEntry(
                 "addFilePathJson",
@@ -177,7 +168,8 @@ public void testCheckpointWriteReadJsonRoundtrip()
                 Optional.empty(),
                 ImmutableMap.of(
                         "someTag", "someValue",
-                        "otherTag", "otherValue"));
+                        "otherTag", "otherValue"),
+                Optional.empty());
 
         RemoveFileEntry removeFileEntry = new RemoveFileEntry(
                 "removeFilePath",
@@ -200,7 +192,7 @@ public void testCheckpointWriteReadJsonRoundtrip()
         targetFile.delete(); // file must not exist when writer is called
         writer.write(entries, createOutputFile(targetPath));
 
-        CheckpointEntries readEntries = readCheckpoint(targetPath, metadataEntry, true);
+        CheckpointEntries readEntries = readCheckpoint(targetPath, metadataEntry, protocolEntry, true);
         assertEquals(readEntries.getTransactionEntries(), entries.getTransactionEntries());
         assertEquals(readEntries.getRemoveFileEntries(), entries.getRemoveFileEntries());
         assertEquals(readEntries.getMetadataEntry(), entries.getMetadataEntry());
@@ -246,7 +238,7 @@ public void testCheckpointWriteReadParquetStatisticsRoundtrip()
                         "configOption1", "blah",
                         "configOption2", "plah"),
                 1000);
-        ProtocolEntry protocolEntry = new ProtocolEntry(10, 20);
+        ProtocolEntry protocolEntry = new ProtocolEntry(10, 20, Optional.empty(), Optional.empty());
         TransactionEntry transactionEntry = new TransactionEntry("appId", 1, 1001);
 
         Block[] minMaxRowFieldBlocks = new Block[]{
@@ -278,7 +270,7 @@ public void testCheckpointWriteReadParquetStatisticsRoundtrip()
                                 .put("fl", (long) Float.floatToIntBits(0.100f))
                                 .put("dou", 0.101d)
                                 .put("dat", (long) parseDate("2000-01-01"))
-                                .put("row", RowBlock.fromFieldBlocks(1, Optional.empty(), minMaxRowFieldBlocks).getSingleValueBlock(0))
+                                .put("row", new SqlRow(0, minMaxRowFieldBlocks))
                                 .buildOrThrow()),
                         Optional.of(ImmutableMap.<String, Object>builder()
                                 .put("ts", DateTimeUtils.convertToTimestampWithTimeZone(UTC_KEY, "2060-10-31 02:00:00"))
@@ -292,7 +284,7 @@ public void testCheckpointWriteReadParquetStatisticsRoundtrip()
                                 .put("fl", (long) Float.floatToIntBits(0.200f))
                                 .put("dou", 0.202d)
                                 .put("dat", (long) parseDate("3000-01-01"))
-                                .put("row", RowBlock.fromFieldBlocks(1, Optional.empty(), minMaxRowFieldBlocks).getSingleValueBlock(0))
+                                .put("row", new SqlRow(0, minMaxRowFieldBlocks))
                                 .buildOrThrow()),
                         Optional.of(ImmutableMap.<String, Object>builder()
                                 .put("ts", 1L)
@@ -309,11 +301,12 @@ public void testCheckpointWriteReadParquetStatisticsRoundtrip()
                                 .put("bin", 12L)
                                 .put("dat", 13L)
                                 .put("arr", 14L)
-                                .put("row", RowBlock.fromFieldBlocks(1, Optional.empty(), nullCountRowFieldBlocks).getSingleValueBlock(0))
+                                .put("row", new SqlRow(0, nullCountRowFieldBlocks))
                                 .buildOrThrow()))),
                 ImmutableMap.of(
                         "someTag", "someValue",
-                        "otherTag", "otherValue"));
+                        "otherTag", "otherValue"),
+                Optional.empty());
 
         RemoveFileEntry removeFileEntry = new RemoveFileEntry(
                 "removeFilePath",
@@ -336,7 +329,7 @@ public void testCheckpointWriteReadParquetStatisticsRoundtrip()
         targetFile.delete(); // file must not exist when writer is called
         writer.write(entries, createOutputFile(targetPath));
 
-        CheckpointEntries readEntries = readCheckpoint(targetPath, metadataEntry, true);
+        CheckpointEntries readEntries = readCheckpoint(targetPath, metadataEntry, protocolEntry, true);
         assertEquals(readEntries.getTransactionEntries(), entries.getTransactionEntries());
         assertEquals(readEntries.getRemoveFileEntries(), entries.getRemoveFileEntries());
         assertEquals(readEntries.getMetadataEntry(), entries.getMetadataEntry());
@@ -365,7 +358,7 @@ public void testDisablingRowStatistics()
                 ImmutableList.of(),
                 ImmutableMap.of(),
                 1000);
-        ProtocolEntry protocolEntry = new ProtocolEntry(10, 20);
+        ProtocolEntry protocolEntry = new ProtocolEntry(10, 20, Optional.empty(), Optional.empty());
         Block[] minMaxRowFieldBlocks = new Block[]{
                 nativeValueToBlock(IntegerType.INTEGER, 1L),
                 nativeValueToBlock(createUnboundedVarcharType(), utf8Slice("a"))
@@ -383,13 +376,11 @@ public void testDisablingRowStatistics()
                 Optional.empty(),
                 Optional.of(new DeltaLakeParquetFileStatistics(
                         Optional.of(5L),
-                        Optional.of(ImmutableMap.of(
-                                "row", RowBlock.fromFieldBlocks(1, Optional.empty(), minMaxRowFieldBlocks).getSingleValueBlock(0))),
-                        Optional.of(ImmutableMap.of(
-                                "row", RowBlock.fromFieldBlocks(1, Optional.empty(), minMaxRowFieldBlocks).getSingleValueBlock(0))),
-                        Optional.of(ImmutableMap.of(
-                                "row", RowBlock.fromFieldBlocks(1, Optional.empty(), nullCountRowFieldBlocks).getSingleValueBlock(0))))),
-                ImmutableMap.of());
+                        Optional.of(ImmutableMap.of("row", new SqlRow(0, minMaxRowFieldBlocks))),
+                        Optional.of(ImmutableMap.of("row", new SqlRow(0, minMaxRowFieldBlocks))),
+                        Optional.of(ImmutableMap.of("row", new SqlRow(0, nullCountRowFieldBlocks))))),
+                ImmutableMap.of(),
+                Optional.empty());
 
         CheckpointEntries entries = new CheckpointEntries(
                 metadataEntry,
@@ -407,7 +398,7 @@ public void testDisablingRowStatistics()
         targetFile.delete(); // file must not exist when writer is called
         writer.write(entries, createOutputFile(targetPath));
 
-        CheckpointEntries readEntries = readCheckpoint(targetPath, metadataEntry, false);
+        CheckpointEntries readEntries = readCheckpoint(targetPath, metadataEntry, protocolEntry, false);
         AddFileEntry addFileEntry = getOnlyElement(readEntries.getAddFileEntries());
         assertThat(addFileEntry.getStats()).isPresent();
 
@@ -427,7 +418,8 @@ private AddFileEntry makeComparable(AddFileEntry original)
                 original.isDataChange(),
                 original.getStatsString(),
                 makeComparable(original.getStats()),
-                original.getTags());
+                original.getTags(),
+                original.getDeletionVector());
     }
 
     private Optional<DeltaLakeParquetFileStatistics> makeComparable(Optional<? extends DeltaLakeFileStatistics> original)
@@ -455,12 +447,11 @@ private Optional<Map<String, Object>> makeComparableStatistics(Optional<Map<Stri
         ImmutableMap.Builder<String, Object> comparableStats = ImmutableMap.builder();
         for (String key : stats.keySet()) {
             Object statsValue = stats.get(key);
-            if (statsValue instanceof RowBlock rowBlock) {
-                ColumnarRow columnarRow = toColumnarRow(rowBlock);
-                int size = columnarRow.getFieldCount();
-                ImmutableList<Long> logicalSizes = IntStream.range(0, size)
-                        .mapToObj(columnarRow::getField)
-                        .map(Block::getLogicalSizeInBytes)
+            if (statsValue instanceof SqlRow sqlRow) {
+                // todo: this validation is just broken. The only way to compare values is to use types.
+                // see https://github.com/trinodb/trino/issues/19557
+                ImmutableList<String> logicalSizes = sqlRow.getRawFieldBlocks().stream()
+                        .map(block -> block.getUnderlyingValueBlock().getClass().getName())
                         .collect(toImmutableList());
                 comparableStats.put(key, logicalSizes);
             }
@@ -475,11 +466,11 @@ else if (statsValue instanceof Slice slice) {
         return Optional.of(comparableStats.buildOrThrow());
     }
 
-    private CheckpointEntries readCheckpoint(String checkpointPath, MetadataEntry metadataEntry, boolean rowStatisticsEnabled)
+    private CheckpointEntries readCheckpoint(String checkpointPath, MetadataEntry metadataEntry, ProtocolEntry protocolEntry, boolean rowStatisticsEnabled)
             throws IOException
     {
-        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT).create(SESSION);
-        TrinoInputFile checkpointFile = fileSystem.newInputFile(checkpointPath);
+        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS).create(SESSION);
+        TrinoInputFile checkpointFile = fileSystem.newInputFile(Location.of(checkpointPath));
 
         Iterator<DeltaLakeTransactionLogEntry> checkpointEntryIterator = new CheckpointEntryIterator(
                 checkpointFile,
@@ -489,6 +480,7 @@ private CheckpointEntries readCheckpoint(String checkpointPath, MetadataEntry me
                 typeManager,
                 ImmutableSet.of(METADATA, PROTOCOL, TRANSACTION, ADD, REMOVE),
                 Optional.of(metadataEntry),
+                Optional.of(protocolEntry),
                 new FileFormatDataSourceStats(),
                 new ParquetReaderConfig().toParquetReaderOptions(),
                 rowStatisticsEnabled,
@@ -505,6 +497,6 @@ private CheckpointEntries readCheckpoint(String checkpointPath, MetadataEntry me
 
     private static TrinoOutputFile createOutputFile(String path)
     {
-        return new HdfsFileSystemFactory(HDFS_ENVIRONMENT).create(SESSION).newOutputFile(path);
+        return new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS).create(SESSION).newOutputFile(Location.of(path));
     }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestTransactionLogTail.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestTransactionLogTail.java
index d8cf01714a4c..7d005a9928b8 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestTransactionLogTail.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/checkpoint/TestTransactionLogTail.java
@@ -16,44 +16,42 @@
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
 
 import static io.trino.plugin.deltalake.DeltaTestingConnectorSession.SESSION;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static java.lang.String.format;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 public class TestTransactionLogTail
 {
-    @Test(dataProvider = "dataSource")
-    public void testTail(String dataSource)
+    @Test
+    public void testTail()
             throws Exception
     {
-        String tableLocation = getClass().getClassLoader().getResource(format("%s/person", dataSource)).toURI().toString();
-        assertEquals(readJsonTransactionLogTails(tableLocation).size(), 7);
-        assertEquals(updateJsonTransactionLogTails(tableLocation).size(), 7);
+        testTail("databricks73");
+        testTail("deltalake");
     }
 
-    @DataProvider
-    public Object[][] dataSource()
+    private void testTail(String dataSource)
+            throws Exception
     {
-        return new Object[][] {
-                {"databricks"},
-                {"deltalake"}
-        };
+        String tableLocation = getClass().getClassLoader().getResource(format("%s/person", dataSource)).toURI().toString();
+        assertEquals(readJsonTransactionLogTails(tableLocation).size(), 7);
+        assertEquals(updateJsonTransactionLogTails(tableLocation).size(), 7);
     }
 
     private List<DeltaLakeTransactionLogEntry> updateJsonTransactionLogTails(String tableLocation)
             throws Exception
     {
-        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT).create(SESSION);
+        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS).create(SESSION);
         TransactionLogTail transactionLogTail = TransactionLogTail.loadNewTail(fileSystem, tableLocation, Optional.of(10L), Optional.of(12L));
-        Optional<TransactionLogTail> updatedLogTail = transactionLogTail.getUpdatedTail(fileSystem, tableLocation);
+        Optional<TransactionLogTail> updatedLogTail = transactionLogTail.getUpdatedTail(fileSystem, tableLocation, Optional.empty());
         assertTrue(updatedLogTail.isPresent());
         return updatedLogTail.get().getFileEntries();
     }
@@ -61,7 +59,7 @@ private List<DeltaLakeTransactionLogEntry> updateJsonTransactionLogTails(String
     private List<DeltaLakeTransactionLogEntry> readJsonTransactionLogTails(String tableLocation)
             throws Exception
     {
-        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT).create(SESSION);
+        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS).create(SESSION);
         TransactionLogTail transactionLogTail = TransactionLogTail.loadNewTail(fileSystem, tableLocation, Optional.of(10L));
         return transactionLogTail.getFileEntries();
     }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/statistics/BenchmarkExtendedStatistics.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/statistics/BenchmarkExtendedStatistics.java
index a7cbaf3323c7..de643f827f92 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/statistics/BenchmarkExtendedStatistics.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/statistics/BenchmarkExtendedStatistics.java
@@ -15,6 +15,7 @@
 
 import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
 import io.trino.spi.type.BigintType;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -31,7 +32,6 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 import org.openjdk.jmh.runner.options.VerboseMode;
-import org.testng.annotations.Test;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -80,7 +80,7 @@ public void setup()
         {
             columns = new ArrayList<>(columnsCount);
             for (int i = 0; i < columnsCount; i++) {
-                columns.add(new DeltaLakeColumnHandle("column_" + i, BigintType.BIGINT, OptionalInt.empty(), "column_" + i, BigintType.BIGINT, REGULAR));
+                columns.add(new DeltaLakeColumnHandle("column_" + i, BigintType.BIGINT, OptionalInt.empty(), "column_" + i, BigintType.BIGINT, REGULAR, Optional.empty()));
             }
 
             fileStatistics = new ArrayList<>(filesCount);
@@ -112,7 +112,7 @@ private Optional<Map<String, Object>> createColumnValueMap()
         {
             Map<String, Object> map = new HashMap<>();
             for (DeltaLakeColumnHandle column : columns) {
-                map.put(column.getName(), random.nextLong());
+                map.put(column.getBaseColumnName(), random.nextLong());
             }
             return Optional.of(map);
         }
@@ -127,7 +127,7 @@ public long benchmark(BenchmarkData benchmarkData)
                 DeltaLakeColumnHandle column = benchmarkData.columns.get(benchmarkData.random.nextInt(benchmarkData.columnsCount));
                 result += (long) statistics.getMaxColumnValue(column).get();
                 result += (long) statistics.getMinColumnValue(column).get();
-                result += statistics.getNullCount(column.getName()).get();
+                result += statistics.getNullCount(column.getBaseColumnName()).get();
             }
         }
         return result;
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/statistics/TestDeltaLakeFileStatistics.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/statistics/TestDeltaLakeFileStatistics.java
index b29539e002e2..9145e2d112c9 100644
--- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/statistics/TestDeltaLakeFileStatistics.java
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/transactionlog/statistics/TestDeltaLakeFileStatistics.java
@@ -16,13 +16,13 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.json.ObjectMapperProvider;
-import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoInputFile;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.filesystem.local.LocalInputFile;
 import io.trino.plugin.deltalake.DeltaLakeColumnHandle;
 import io.trino.plugin.deltalake.DeltaLakeConfig;
 import io.trino.plugin.deltalake.transactionlog.DeltaLakeTransactionLogEntry;
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
+import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator;
 import io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointSchemaManager;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
@@ -36,7 +36,7 @@
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeOperators;
 import io.trino.spi.type.VarcharType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.math.BigDecimal;
@@ -49,7 +49,7 @@
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.plugin.deltalake.DeltaLakeColumnType.REGULAR;
 import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.METADATA;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.deltalake.transactionlog.checkpoint.CheckpointEntryIterator.EntryType.PROTOCOL;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
@@ -88,13 +88,12 @@ public void testParseJsonStatistics()
     public void testParseParquetStatistics()
             throws Exception
     {
-        File statsFile = new File(getClass().getResource("/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000010.checkpoint.parquet").toURI());
+        File statsFile = new File(getClass().getResource("/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000010.checkpoint.parquet").toURI());
 
         TypeManager typeManager = TESTING_TYPE_MANAGER;
         CheckpointSchemaManager checkpointSchemaManager = new CheckpointSchemaManager(typeManager);
 
-        TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT).create(SESSION);
-        TrinoInputFile checkpointFile = fileSystem.newInputFile(statsFile.toURI().toString());
+        TrinoInputFile checkpointFile = new LocalInputFile(statsFile);
 
         CheckpointEntryIterator metadataEntryIterator = new CheckpointEntryIterator(
                 checkpointFile,
@@ -104,11 +103,26 @@ public void testParseParquetStatistics()
                 typeManager,
                 ImmutableSet.of(METADATA),
                 Optional.empty(),
+                Optional.empty(),
                 new FileFormatDataSourceStats(),
                 new ParquetReaderConfig().toParquetReaderOptions(),
                 true,
                 new DeltaLakeConfig().getDomainCompactionThreshold());
         MetadataEntry metadataEntry = getOnlyElement(metadataEntryIterator).getMetaData();
+        CheckpointEntryIterator protocolEntryIterator = new CheckpointEntryIterator(
+                checkpointFile,
+                SESSION,
+                checkpointFile.length(),
+                checkpointSchemaManager,
+                typeManager,
+                ImmutableSet.of(PROTOCOL),
+                Optional.empty(),
+                Optional.empty(),
+                new FileFormatDataSourceStats(),
+                new ParquetReaderConfig().toParquetReaderOptions(),
+                true,
+                new DeltaLakeConfig().getDomainCompactionThreshold());
+        ProtocolEntry protocolEntry = getOnlyElement(protocolEntryIterator).getProtocol();
 
         CheckpointEntryIterator checkpointEntryIterator = new CheckpointEntryIterator(
                 checkpointFile,
@@ -118,6 +132,7 @@ public void testParseParquetStatistics()
                 typeManager,
                 ImmutableSet.of(CheckpointEntryIterator.EntryType.ADD),
                 Optional.of(metadataEntry),
+                Optional.of(protocolEntry),
                 new FileFormatDataSourceStats(),
                 new ParquetReaderConfig().toParquetReaderOptions(),
                 true,
@@ -139,53 +154,53 @@ private static void testStatisticsValues(DeltaLakeFileStatistics fileStatistics)
     {
         assertEquals(fileStatistics.getNumRecords(), Optional.of(1L));
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("byt", TINYINT, OptionalInt.empty(), "byt", TINYINT, REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("byt", TINYINT, OptionalInt.empty(), "byt", TINYINT, REGULAR, Optional.empty())),
                 Optional.of(42L));
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("dat", DATE, OptionalInt.empty(), "dat", DATE, REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("dat", DATE, OptionalInt.empty(), "dat", DATE, REGULAR, Optional.empty())),
                 Optional.of(LocalDate.parse("5000-01-01").toEpochDay()));
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("dec_long", DecimalType.createDecimalType(25, 3), OptionalInt.empty(), "dec_long", DecimalType.createDecimalType(25, 3), REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("dec_long", DecimalType.createDecimalType(25, 3), OptionalInt.empty(), "dec_long", DecimalType.createDecimalType(25, 3), REGULAR, Optional.empty())),
                 Optional.of(encodeScaledValue(new BigDecimal("999999999999.123"), 3)));
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("dec_short", DecimalType.createDecimalType(5, 1), OptionalInt.empty(), "dec_short", DecimalType.createDecimalType(5, 1), REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("dec_short", DecimalType.createDecimalType(5, 1), OptionalInt.empty(), "dec_short", DecimalType.createDecimalType(5, 1), REGULAR, Optional.empty())),
                 Optional.of(new BigDecimal("10.1").unscaledValue().longValueExact()));
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("dou", DoubleType.DOUBLE, OptionalInt.empty(), "dou", DoubleType.DOUBLE, REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("dou", DoubleType.DOUBLE, OptionalInt.empty(), "dou", DoubleType.DOUBLE, REGULAR, Optional.empty())),
                 Optional.of(0.321));
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("fl", REAL, OptionalInt.empty(), "fl", REAL, REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("fl", REAL, OptionalInt.empty(), "fl", REAL, REGULAR, Optional.empty())),
                 Optional.of((long) floatToIntBits(0.123f)));
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("in", INTEGER, OptionalInt.empty(), "in", INTEGER, REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("in", INTEGER, OptionalInt.empty(), "in", INTEGER, REGULAR, Optional.empty())),
                 Optional.of(20000000L));
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("l", BIGINT, OptionalInt.empty(), "l", BIGINT, REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("l", BIGINT, OptionalInt.empty(), "l", BIGINT, REGULAR, Optional.empty())),
                 Optional.of(10000000L));
         Type rowType = RowType.rowType(RowType.field("s1", INTEGER), RowType.field("s3", VarcharType.createUnboundedVarcharType()));
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("row", rowType, OptionalInt.empty(), "row", rowType, REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("row", rowType, OptionalInt.empty(), "row", rowType, REGULAR, Optional.empty())),
                 Optional.empty());
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("arr", new ArrayType(INTEGER), OptionalInt.empty(), "arr", new ArrayType(INTEGER), REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("arr", new ArrayType(INTEGER), OptionalInt.empty(), "arr", new ArrayType(INTEGER), REGULAR, Optional.empty())),
                 Optional.empty());
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("m", new MapType(INTEGER, VarcharType.createUnboundedVarcharType(), new TypeOperators()), OptionalInt.empty(), "m", new MapType(INTEGER, VarcharType.createUnboundedVarcharType(), new TypeOperators()), REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("m", new MapType(INTEGER, VarcharType.createUnboundedVarcharType(), new TypeOperators()), OptionalInt.empty(), "m", new MapType(INTEGER, VarcharType.createUnboundedVarcharType(), new TypeOperators()), REGULAR, Optional.empty())),
                 Optional.empty());
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("sh", SMALLINT, OptionalInt.empty(), "sh", SMALLINT, REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("sh", SMALLINT, OptionalInt.empty(), "sh", SMALLINT, REGULAR, Optional.empty())),
                 Optional.of(123L));
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("str", VarcharType.createUnboundedVarcharType(), OptionalInt.empty(), "str", VarcharType.createUnboundedVarcharType(), REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("str", VarcharType.createUnboundedVarcharType(), OptionalInt.empty(), "str", VarcharType.createUnboundedVarcharType(), REGULAR, Optional.empty())),
                 Optional.of(utf8Slice("a")));
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("ts", TIMESTAMP_TZ_MILLIS, OptionalInt.empty(), "ts", TIMESTAMP_TZ_MILLIS, REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("ts", TIMESTAMP_TZ_MILLIS, OptionalInt.empty(), "ts", TIMESTAMP_TZ_MILLIS, REGULAR, Optional.empty())),
                 Optional.of(packDateTimeWithZone(LocalDateTime.parse("2960-10-31T01:00:00.000").toInstant(UTC).toEpochMilli(), UTC_KEY)));
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("bool", BOOLEAN, OptionalInt.empty(), "bool", BOOLEAN, REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("bool", BOOLEAN, OptionalInt.empty(), "bool", BOOLEAN, REGULAR, Optional.empty())),
                 Optional.empty());
         assertEquals(
-                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("bin", VARBINARY, OptionalInt.empty(), "bin", VARBINARY, REGULAR)),
+                fileStatistics.getMinColumnValue(new DeltaLakeColumnHandle("bin", VARBINARY, OptionalInt.empty(), "bin", VARBINARY, REGULAR, Optional.empty())),
                 Optional.empty());
     }
 }
diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/util/TestDeltaLakeWriteUtils.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/util/TestDeltaLakeWriteUtils.java
new file mode 100644
index 000000000000..d90031a92c8a
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/util/TestDeltaLakeWriteUtils.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed 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 io.trino.plugin.deltalake.util;
+
+import io.trino.spi.Page;
+import io.trino.spi.PageBuilder;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.SqlDecimal;
+import io.trino.spi.type.Type;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static io.trino.plugin.deltalake.util.DeltaLakeWriteUtils.createPartitionValues;
+import static io.trino.spi.type.DecimalType.createDecimalType;
+import static io.trino.spi.type.Decimals.writeBigDecimal;
+import static io.trino.spi.type.Decimals.writeShortDecimal;
+import static io.trino.spi.type.SqlDecimal.decimal;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDeltaLakeWriteUtils
+{
+    @Test
+    public void testCreatePartitionValuesDecimal()
+    {
+        assertCreatePartitionValuesDecimal(10, 0, "12345", "12345");
+        assertCreatePartitionValuesDecimal(10, 2, "123.45", "123.45");
+        assertCreatePartitionValuesDecimal(10, 2, "12345.00", "12345");
+        assertCreatePartitionValuesDecimal(5, 0, "12345", "12345");
+        assertCreatePartitionValuesDecimal(38, 2, "12345.00", "12345");
+        assertCreatePartitionValuesDecimal(38, 20, "12345.00000000000000000000", "12345");
+        assertCreatePartitionValuesDecimal(38, 20, "12345.67898000000000000000", "12345.67898");
+    }
+
+    private static void assertCreatePartitionValuesDecimal(int precision, int scale, String decimalValue, String expectedValue)
+    {
+        DecimalType decimalType = createDecimalType(precision, scale);
+        List<Type> types = List.of(decimalType);
+        SqlDecimal decimal = decimal(decimalValue, decimalType);
+
+        // verify the test values are as expected
+        assertThat(decimal.toString()).isEqualTo(decimalValue);
+        assertThat(decimal.toBigDecimal().toString()).isEqualTo(decimalValue);
+
+        PageBuilder pageBuilder = new PageBuilder(types);
+        pageBuilder.declarePosition();
+        writeDecimal(decimalType, decimal, pageBuilder.getBlockBuilder(0));
+        Page page = pageBuilder.build();
+
+        assertThat(createPartitionValues(types, page, 0))
+                .isEqualTo(List.of(expectedValue));
+    }
+
+    private static void writeDecimal(DecimalType decimalType, SqlDecimal decimal, BlockBuilder blockBuilder)
+    {
+        if (decimalType.isShort()) {
+            writeShortDecimal(blockBuilder, decimal.toBigDecimal().unscaledValue().longValue());
+        }
+        else {
+            writeBigDecimal(decimalType, blockBuilder, decimal.toBigDecimal());
+        }
+    }
+}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/README.md b/plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/_delta_log/00000000000000000002.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/_delta_log/00000000000000000002.checkpoint.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/_delta_log/00000000000000000002.checkpoint.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/_delta_log/00000000000000000002.checkpoint.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/_delta_log/_last_checkpoint
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/_delta_log/_last_checkpoint
rename to plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/_delta_log/_last_checkpoint
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/part-00000-4137b6c1-34fd-4926-a939-dc6a01571d9f-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/part-00000-4137b6c1-34fd-4926-a939-dc6a01571d9f-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/part-00000-4137b6c1-34fd-4926-a939-dc6a01571d9f-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/part-00000-4137b6c1-34fd-4926-a939-dc6a01571d9f-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/part-00000-df481541-fe59-4af2-a37f-68a39a1e2a5d-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/part-00000-df481541-fe59-4af2-a37f-68a39a1e2a5d-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/json_stats_on_row_type/part-00000-df481541-fe59-4af2-a37f-68a39a1e2a5d-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks104/json_stats_on_row_type/part-00000-df481541-fe59-4af2-a37f-68a39a1e2a5d-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/README.md b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/README.md
new file mode 100644
index 000000000000..15aede39f730
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/README.md
@@ -0,0 +1,10 @@
+Data generated using:
+
+```sql
+CREATE TABLE default.no_column_stats_mixed_case (c_Int int, c_Str string)
+    USING delta
+location 's3://starburstdata-test/no_column_stats_mixed_case'
+TBLPROPERTIES (delta.dataSkippingNumIndexedCols =0); -- collects only table stats (row count), but no column stats
+INSERT INTO no_column_stats_mixed_case VALUES (11, 'a'),(2, 'b'),(null, null);
+OPTIMIZE no_column_stats_mixed_case; -- As databricks creates 2 parquet files per insert this ensures that we have all data in one file
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..cce28a3de439
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1691579828400,"userId":"1596033064287166","userName":"slawomir.pajak@starburstdata.com","operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{\"delta.dataSkippingNumIndexedCols\":\"0\"}"},"notebook":{"notebookId":"2352283689975569"},"clusterId":"1118-145353-2w37w56t","isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Databricks-Runtime/10.4.x-scala2.12","txnId":"9f629833-7a39-4b28-9cd7-d8bea98c9cf4"}}
+{"protocol":{"minReaderVersion":1,"minWriterVersion":2}}
+{"metaData":{"id":"4b43177d-160f-4723-9025-a3328d1b866e","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"c_Int\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}},{\"name\":\"c_Str\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}]}","partitionColumns":[],"configuration":{"delta.dataSkippingNumIndexedCols":"0"},"createdTime":1691579828208}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/_delta_log/00000000000000000001.json
new file mode 100644
index 000000000000..e9894bb85d07
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/_delta_log/00000000000000000001.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1691579831734,"userId":"1596033064287166","userName":"slawomir.pajak@starburstdata.com","operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"notebook":{"notebookId":"2352283689975569"},"clusterId":"1118-145353-2w37w56t","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{"numFiles":"2","numOutputRows":"3","numOutputBytes":"1600"},"engineInfo":"Databricks-Runtime/10.4.x-scala2.12","txnId":"68aff1d9-204d-49c6-9add-bdaa3cd870f7"}}
+{"add":{"path":"part-00000-8dce356b-555b-4f79-9acb-1d0d8caa7194-c000.snappy.parquet","partitionValues":{},"size":800,"modificationTime":1691579832000,"dataChange":true,"stats":"{\"numRecords\":1}","tags":{"INSERTION_TIME":"1691579832000000","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"add":{"path":"part-00001-c4be8f9c-ffe0-4286-9904-62170d344825-c000.snappy.parquet","partitionValues":{},"size":800,"modificationTime":1691579832000,"dataChange":true,"stats":"{\"numRecords\":2}","tags":{"INSERTION_TIME":"1691579832000001","OPTIMIZE_TARGET_SIZE":"268435456"}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/_delta_log/00000000000000000002.json
new file mode 100644
index 000000000000..fa9c3d05dae4
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/_delta_log/00000000000000000002.json
@@ -0,0 +1,4 @@
+{"commitInfo":{"timestamp":1691579837840,"userId":"1596033064287166","userName":"slawomir.pajak@starburstdata.com","operation":"OPTIMIZE","operationParameters":{"zOrderBy":"[]","batchId":"0","auto":false,"predicate":"[]"},"notebook":{"notebookId":"2352283689975569"},"clusterId":"1118-145353-2w37w56t","readVersion":1,"isolationLevel":"SnapshotIsolation","isBlindAppend":false,"operationMetrics":{"numRemovedFiles":"2","numRemovedBytes":"1600","p25FileSize":"803","minFileSize":"803","numAddedFiles":"1","maxFileSize":"803","p75FileSize":"803","p50FileSize":"803","numAddedBytes":"803"},"engineInfo":"Databricks-Runtime/10.4.x-scala2.12","txnId":"0338a473-72bc-481b-b749-5c4e09336b66"}}
+{"remove":{"path":"part-00000-8dce356b-555b-4f79-9acb-1d0d8caa7194-c000.snappy.parquet","deletionTimestamp":1691579836702,"dataChange":false,"extendedFileMetadata":true,"partitionValues":{},"size":800,"tags":{"INSERTION_TIME":"1691579832000000","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"remove":{"path":"part-00001-c4be8f9c-ffe0-4286-9904-62170d344825-c000.snappy.parquet","deletionTimestamp":1691579836702,"dataChange":false,"extendedFileMetadata":true,"partitionValues":{},"size":800,"tags":{"INSERTION_TIME":"1691579832000001","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"add":{"path":"part-00000-e92cd043-c41f-4e58-b739-2ea947542840-c000.snappy.parquet","partitionValues":{},"size":803,"modificationTime":1691579838000,"dataChange":false,"stats":"{\"numRecords\":3}","tags":{"INSERTION_TIME":"1691579832000000","OPTIMIZE_TARGET_SIZE":"268435456"}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/part-00000-8dce356b-555b-4f79-9acb-1d0d8caa7194-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/part-00000-8dce356b-555b-4f79-9acb-1d0d8caa7194-c000.snappy.parquet
new file mode 100644
index 000000000000..8c8aa25319cf
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/part-00000-8dce356b-555b-4f79-9acb-1d0d8caa7194-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/part-00000-e92cd043-c41f-4e58-b739-2ea947542840-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/part-00000-e92cd043-c41f-4e58-b739-2ea947542840-c000.snappy.parquet
new file mode 100644
index 000000000000..dd86afefd151
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/part-00000-e92cd043-c41f-4e58-b739-2ea947542840-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/part-00001-c4be8f9c-ffe0-4286-9904-62170d344825-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/part-00001-c4be8f9c-ffe0-4286-9904-62170d344825-c000.snappy.parquet
new file mode 100644
index 000000000000..83d5f567d420
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks104/no_column_stats_mixed_case/part-00001-c4be8f9c-ffe0-4286-9904-62170d344825-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/8w/part-00001-46bd4dbe-c23b-4b4c-be4b-a7b6084a0c04-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/8w/part-00001-46bd4dbe-c23b-4b4c-be4b-a7b6084a0c04-c000.snappy.parquet
new file mode 100644
index 000000000000..a72558611be6
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/8w/part-00001-46bd4dbe-c23b-4b4c-be4b-a7b6084a0c04-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/Ah/part-00000-a506a823-8408-4d69-a5b3-fd9a7157d46b-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/Ah/part-00000-a506a823-8408-4d69-a5b3-fd9a7157d46b-c000.snappy.parquet
new file mode 100644
index 000000000000..824e665a7762
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/Ah/part-00000-a506a823-8408-4d69-a5b3-fd9a7157d46b-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/Nd/part-00000-a296d066-28da-44c1-96f0-18002fe4c0f9-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/Nd/part-00000-a296d066-28da-44c1-96f0-18002fe4c0f9-c000.snappy.parquet
new file mode 100644
index 000000000000..0ce82a16fd35
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/Nd/part-00000-a296d066-28da-44c1-96f0-18002fe4c0f9-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/README.md b/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/README.md
new file mode 100644
index 000000000000..79450872d425
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/README.md
@@ -0,0 +1,12 @@
+Data generated using:
+
+```sql
+CREATE TABLE default.no_stats_column_mapping_id
+USING delta
+location 's3://starburstdata-test/no_stats_column_mapping_id' 
+TBLPROPERTIES (delta.dataSkippingNumIndexedCols =0, 'delta.columnMapping.mode' = 'id')
+AS
+SELECT 42 AS c_int, 'foo' AS c_str;
+
+INSERT INTO no_stats_column_mapping_id VALUES (1, 'a'),(2, 'b'),(null, null);
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..e592fb9b32c8
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/_delta_log/00000000000000000000.json
@@ -0,0 +1,4 @@
+{"commitInfo":{"timestamp":1680263306942,"userId":"1596033064287166","userName":"slawomir.pajak@starburstdata.com","operation":"CREATE TABLE AS SELECT","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{\"delta.columnMapping.mode\":\"id\",\"delta.dataSkippingNumIndexedCols\":\"0\",\"delta.columnMapping.maxColumnId\":\"2\"}"},"notebook":{"notebookId":"2352283689975569"},"clusterId":"0729-143057-6p0k4d5m","isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"1","numOutputBytes":"1278"},"engineInfo":"Databricks-Runtime/10.4.x-scala2.12","txnId":"e2caad96-f591-405b-94de-739d8f57d1ad"}}
+{"protocol":{"minReaderVersion":2,"minWriterVersion":5}}
+{"metaData":{"id":"faf479b1-8e11-4524-b384-fd20ca6b1ca9","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"c_int\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":1,\"delta.columnMapping.physicalName\":\"col-9fd3421a-6f62-4ae9-9eb8-580091f53031\"}},{\"name\":\"c_str\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":2,\"delta.columnMapping.physicalName\":\"col-8dcbd36b-42e0-430d-b90f-eb2b71601a48\"}}]}","partitionColumns":[],"configuration":{"delta.columnMapping.mode":"id","delta.dataSkippingNumIndexedCols":"0","delta.columnMapping.maxColumnId":"2"},"createdTime":1680263306439}}
+{"add":{"path":"Ah/part-00000-a506a823-8408-4d69-a5b3-fd9a7157d46b-c000.snappy.parquet","partitionValues":{},"size":1278,"modificationTime":1680263307000,"dataChange":true,"stats":"{\"numRecords\":1}","tags":{"INSERTION_TIME":"1680263307000000","OPTIMIZE_TARGET_SIZE":"268435456"}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/_delta_log/00000000000000000001.json
new file mode 100644
index 000000000000..df13d3c9551c
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks104/no_stats_column_mapping_id/_delta_log/00000000000000000001.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1680263313335,"userId":"1596033064287166","userName":"slawomir.pajak@starburstdata.com","operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"notebook":{"notebookId":"2352283689975569"},"clusterId":"0729-143057-6p0k4d5m","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{"numFiles":"2","numOutputRows":"3","numOutputBytes":"2528"},"engineInfo":"Databricks-Runtime/10.4.x-scala2.12","txnId":"1238b68d-8949-410b-99d7-b5ae58058763"}}
+{"add":{"path":"Nd/part-00000-a296d066-28da-44c1-96f0-18002fe4c0f9-c000.snappy.parquet","partitionValues":{},"size":1264,"modificationTime":1680263314000,"dataChange":true,"stats":"{\"numRecords\":1}","tags":{"INSERTION_TIME":"1680263314000000","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"add":{"path":"8w/part-00001-46bd4dbe-c23b-4b4c-be4b-a7b6084a0c04-c000.snappy.parquet","partitionValues":{},"size":1264,"modificationTime":1680263314000,"dataChange":true,"stats":"{\"numRecords\":2}","tags":{"INSERTION_TIME":"1680263314000001","OPTIMIZE_TARGET_SIZE":"268435456"}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/README.md b/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/README.md
new file mode 100644
index 000000000000..f30f3b1279ae
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/README.md
@@ -0,0 +1,13 @@
+Data generated using Databricks 12.2:
+
+```sql
+CREATE TABLE default.test_deletion_vectors (
+  a INT,
+  b INT) 
+USING delta 
+LOCATION 's3://trino-ci-test/test_deletion_vectors' 
+TBLPROPERTIES ('delta.enableDeletionVectors' = true);
+
+INSERT INTO default.test_deletion_vectors VALUES (1, 11), (2, 22);
+DELETE FROM default.test_deletion_vectors WHERE a = 2;
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..4a5d53407173
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1682326581374,"operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{\"delta.enableDeletionVectors\":\"true\"}"},"isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Databricks-Runtime/12.2.x-scala2.12","txnId":"2cbfa481-d2b0-4f59-83f9-1261492dfd46"}}
+{"protocol":{"minReaderVersion":3,"minWriterVersion":7,"readerFeatures":["deletionVectors"],"writerFeatures":["deletionVectors"]}}
+{"metaData":{"id":"32f26f4b-95ba-4980-b209-0132e949b3e4","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"a\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}},{\"name\":\"b\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}}]}","partitionColumns":[],"configuration":{"delta.enableDeletionVectors":"true"},"createdTime":1682326580906}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/_delta_log/00000000000000000001.json
new file mode 100644
index 000000000000..7a5e8e6418b8
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/_delta_log/00000000000000000001.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1682326587253,"operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"2","numOutputBytes":"796"},"engineInfo":"Databricks-Runtime/12.2.x-scala2.12","txnId":"99cd5421-a1b9-40c6-8063-7298ec935fd6"}}
+{"add":{"path":"part-00000-0aa47759-3062-4e53-94c8-2e20a0796fee-c000.snappy.parquet","partitionValues":{},"size":796,"modificationTime":1682326588000,"dataChange":true,"stats":"{\"numRecords\":2,\"minValues\":{\"a\":1,\"b\":11},\"maxValues\":{\"a\":2,\"b\":22},\"nullCount\":{\"a\":0,\"b\":0},\"tightBounds\":true}","tags":{"INSERTION_TIME":"1682326588000000","MIN_INSERTION_TIME":"1682326588000000","MAX_INSERTION_TIME":"1682326588000000","OPTIMIZE_TARGET_SIZE":"268435456"}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/_delta_log/00000000000000000002.json
new file mode 100644
index 000000000000..00f135f1c8d2
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/_delta_log/00000000000000000002.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1682326592314,"operation":"DELETE","operationParameters":{"predicate":"[\"(spark_catalog.default.test_deletion_vectors_vsipbnhjjg.a = 2)\"]"},"readVersion":1,"isolationLevel":"WriteSerializable","isBlindAppend":false,"operationMetrics":{"numRemovedFiles":"0","numRemovedBytes":"0","numCopiedRows":"0","numDeletionVectorsAdded":"1","numDeletionVectorsRemoved":"0","numAddedChangeFiles":"0","executionTimeMs":"2046","numDeletedRows":"1","scanTimeMs":"1335","numAddedFiles":"0","numAddedBytes":"0","rewriteTimeMs":"709"},"engineInfo":"Databricks-Runtime/12.2.x-scala2.12","txnId":"219ffc4f-ff84-49d6-98a3-b0b105ce2a1e"}}
+{"remove":{"path":"part-00000-0aa47759-3062-4e53-94c8-2e20a0796fee-c000.snappy.parquet","deletionTimestamp":1682326592313,"dataChange":true,"extendedFileMetadata":true,"partitionValues":{},"size":796,"tags":{"INSERTION_TIME":"1682326588000000","MIN_INSERTION_TIME":"1682326588000000","MAX_INSERTION_TIME":"1682326588000000","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"add":{"path":"part-00000-0aa47759-3062-4e53-94c8-2e20a0796fee-c000.snappy.parquet","partitionValues":{},"size":796,"modificationTime":1682326588000,"dataChange":true,"stats":"{\"numRecords\":2,\"minValues\":{\"a\":1,\"b\":11},\"maxValues\":{\"a\":2,\"b\":22},\"nullCount\":{\"a\":0,\"b\":0},\"tightBounds\":false}","tags":{"INSERTION_TIME":"1682326588000000","MIN_INSERTION_TIME":"1682326588000000","MAX_INSERTION_TIME":"1682326588000000","OPTIMIZE_TARGET_SIZE":"268435456"},"deletionVector":{"storageType":"u","pathOrInlineDv":"R7QFX3rGXPFLhHGq&7g<","offset":1,"sizeInBytes":34,"cardinality":1}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/deletion_vector_a52eda8c-0a57-4636-814b-9c165388f7ca.bin b/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/deletion_vector_a52eda8c-0a57-4636-814b-9c165388f7ca.bin
new file mode 100644
index 000000000000..66b4b7369d9f
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/deletion_vector_a52eda8c-0a57-4636-814b-9c165388f7ca.bin differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/part-00000-0aa47759-3062-4e53-94c8-2e20a0796fee-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/part-00000-0aa47759-3062-4e53-94c8-2e20a0796fee-c000.snappy.parquet
new file mode 100644
index 000000000000..b4fbdc1f40bd
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks122/deletion_vectors/part-00000-0aa47759-3062-4e53-94c8-2e20a0796fee-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks122/identity_columns/README.md b/plugin/trino-delta-lake/src/test/resources/databricks122/identity_columns/README.md
new file mode 100644
index 000000000000..c35573f99fdc
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks122/identity_columns/README.md
@@ -0,0 +1,8 @@
+Data generated using Databricks 12.2:
+
+```sql
+CREATE TABLE default.identity_columns
+(a INT, b BIGINT GENERATED ALWAYS AS IDENTITY)
+USING DELTA
+LOCATION 's3://trino-ci-test/identity_columns'
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks122/identity_columns/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks122/identity_columns/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..5784e52b2363
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks122/identity_columns/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1691444586867,"operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{}"},"isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Databricks-Runtime/12.2.x-scala2.12","txnId":"4bb3f5c4-f46e-4dbe-96f9-3ca7bb87806e"}}
+{"protocol":{"minReaderVersion":1,"minWriterVersion":6}}
+{"metaData":{"id":"2aa8e284-c8cb-411c-a1a1-ba642472ad23","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"a\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}},{\"name\":\"b\",\"type\":\"long\",\"nullable\":true,\"metadata\":{\"delta.identity.start\":1,\"delta.identity.step\":1,\"delta.identity.allowExplicitInsert\":false}}]}","partitionColumns":[],"configuration":{},"createdTime":1691444586634}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks122/invariants_writer_feature/README.md b/plugin/trino-delta-lake/src/test/resources/databricks122/invariants_writer_feature/README.md
new file mode 100644
index 000000000000..cdf23861309c
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks122/invariants_writer_feature/README.md
@@ -0,0 +1,29 @@
+Data generated using Databricks 12.2:
+Using PySpark because Spark SQL doesn't support creating a table with column invariants.
+
+```py
+import pyspark.sql.types
+from delta.tables import DeltaTable
+
+schema = pyspark.sql.types.StructType([
+    pyspark.sql.types.StructField(
+        "col_invariants", 
+        dataType = pyspark.sql.types.IntegerType(), 
+        nullable = False, 
+        metadata = { "delta.invariants": "col_invariants < 3" } 
+    )
+])
+
+table = DeltaTable.create(spark) \
+    .tableName("test_invariants") \
+    .addColumns(schema) \
+    .location("s3://trino-ci-test/default/test_invariants") \
+    .property("delta.feature.invariants", "supported") \
+    .execute()
+
+spark.createDataFrame([(1,)], schema=schema).write.saveAsTable(
+    "test_invariants",
+    mode="append",
+    format="delta",
+)
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks122/invariants_writer_feature/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks122/invariants_writer_feature/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..a9db56379758
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks122/invariants_writer_feature/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1691571164476,"userId":"7853186923043731","userName":"yuya.ebihara@starburstdata.com","operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{\"delta.feature.invariants\":\"supported\"}"},"notebook":{"notebookId":"2299734316069194"},"clusterId":"0705-101043-4cc9r1rt","isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Databricks-Runtime/12.2.x-scala2.12","txnId":"f394c5c6-6666-4f7d-b550-3ffb8c600a1f"}}
+{"protocol":{"minReaderVersion":1,"minWriterVersion":7,"writerFeatures":["invariants"]}}
+{"metaData":{"id":"6f41a246-3858-45f0-b796-a0aae91eba36","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"col_invariants\",\"type\":\"integer\",\"nullable\":false,\"metadata\":{\"delta.invariants\":\"col_invariants < 3\"}}]}","partitionColumns":[],"configuration":{},"createdTime":1691571164139}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks122/invariants_writer_feature/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks122/invariants_writer_feature/_delta_log/00000000000000000001.json
new file mode 100644
index 000000000000..6a4235511580
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks122/invariants_writer_feature/_delta_log/00000000000000000001.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1691571169547,"userId":"7853186923043731","userName":"yuya.ebihara@starburstdata.com","operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"notebook":{"notebookId":"2299734316069194"},"clusterId":"0705-101043-4cc9r1rt","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"1","numOutputBytes":"650"},"engineInfo":"Databricks-Runtime/12.2.x-scala2.12","txnId":"583f8e25-7c75-4d46-9f9c-cc22fc801bd3"}}
+{"add":{"path":"part-00001-3e38bdb2-fccc-4bd0-8f60-4ce39aa50ef9-c000.snappy.parquet","partitionValues":{},"size":650,"modificationTime":1691571170000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"col_invariants\":1},\"maxValues\":{\"col_invariants\":1},\"nullCount\":{\"col_invariants\":0}}","tags":{"INSERTION_TIME":"1691571170000000","MIN_INSERTION_TIME":"1691571170000000","MAX_INSERTION_TIME":"1691571170000000","OPTIMIZE_TARGET_SIZE":"268435456"}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks122/invariants_writer_feature/part-00001-3e38bdb2-fccc-4bd0-8f60-4ce39aa50ef9-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks122/invariants_writer_feature/part-00001-3e38bdb2-fccc-4bd0-8f60-4ce39aa50ef9-c000.snappy.parquet
new file mode 100644
index 000000000000..b48ee2ad89b5
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks122/invariants_writer_feature/part-00001-3e38bdb2-fccc-4bd0-8f60-4ce39aa50ef9-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz/README.md b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz/README.md
new file mode 100644
index 000000000000..d17e3327f107
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz/README.md
@@ -0,0 +1,19 @@
+Data generated using Databricks 13.1:
+
+```sql
+CREATE TABLE default.test_timestamp_ntz 
+(x timestamp_ntz) 
+USING delta 
+LOCATION 's3://bucket/table'
+TBLPROPERTIES ('delta.feature.timestampNtz' = 'supported');
+
+INSERT INTO default.test_timestamp_ntz VALUES 
+(NULL),
+(TIMESTAMP_NTZ '-9999-12-31T23:59:59.999999'),
+(TIMESTAMP_NTZ '-0001-01-01T00:00:00.000000'),
+(TIMESTAMP_NTZ '0000-01-01T00:00:00.000000'), 
+(TIMESTAMP_NTZ '1582-10-05T00:00:00.000000'), 
+(TIMESTAMP_NTZ '1582-10-14T23:59:59.999999'), 
+(TIMESTAMP_NTZ '2020-12-31T01:02:03.123456'), 
+(TIMESTAMP_NTZ '9999-12-31T23:59:59.999999');
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..d8ec447d9ee4
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1684140545733,"userId":"7853186923043731","userName":"yuya.ebihara@starburstdata.com","operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{\"delta.feature.timestampntz\":\"supported\"}"},"notebook":{"notebookId":"824234330454407"},"clusterId":"0515-061003-bamkihe4","isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Databricks-Runtime/13.1.x-scala2.12","txnId":"74bed3b7-6080-4ca8-9ea7-536505dc6e24"}}
+{"protocol":{"minReaderVersion":3,"minWriterVersion":7,"readerFeatures":["timestampNtz"],"writerFeatures":["timestampNtz"]}}
+{"metaData":{"id":"54a9d74c-2777-4eed-85aa-8a95732f5a74","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"x\",\"type\":\"timestamp_ntz\",\"nullable\":true,\"metadata\":{}}]}","partitionColumns":[],"configuration":{},"createdTime":1684140544719}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz/_delta_log/00000000000000000001.json
new file mode 100644
index 000000000000..b651eb8575f8
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz/_delta_log/00000000000000000001.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1684140582215,"userId":"7853186923043731","userName":"yuya.ebihara@starburstdata.com","operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"notebook":{"notebookId":"824234330454407"},"clusterId":"0515-061003-bamkihe4","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"8","numOutputBytes":"673"},"tags":{"restoresDeletedRows":"false"},"engineInfo":"Databricks-Runtime/13.1.x-scala2.12","txnId":"38fb0b0b-17c0-4263-bc78-93b74a459cce"}}
+{"add":{"path":"part-00000-0ca99241-8aa7-4f33-981b-e6fd611fe062-c000.snappy.parquet","partitionValues":{},"size":673,"modificationTime":1684140581000,"dataChange":true,"stats":"{\"numRecords\":8,\"nullCount\":{\"x\":1}}","tags":{"INSERTION_TIME":"1684140581000000","MIN_INSERTION_TIME":"1684140581000000","MAX_INSERTION_TIME":"1684140581000000","OPTIMIZE_TARGET_SIZE":"268435456"}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz/part-00000-0ca99241-8aa7-4f33-981b-e6fd611fe062-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz/part-00000-0ca99241-8aa7-4f33-981b-e6fd611fe062-c000.snappy.parquet
new file mode 100644
index 000000000000..f0464d833e85
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz/part-00000-0ca99241-8aa7-4f33-981b-e6fd611fe062-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/README.md b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/README.md
new file mode 100644
index 000000000000..4baa9e3ae437
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/README.md
@@ -0,0 +1,20 @@
+Data generated using Databricks 13.1:
+
+```sql
+CREATE TABLE default.test_timestamp_ntz_partition
+(id int, part timestamp_ntz)
+USING delta 
+PARTITIONED BY (part)
+LOCATION 's3://bucket/table'
+TBLPROPERTIES ('delta.feature.timestampNtz' = 'supported');
+
+INSERT INTO default.test_timestamp_ntz_partition VALUES
+(1, NULL),
+(2, TIMESTAMP_NTZ '-9999-12-31T23:59:59.999999'),
+(3, TIMESTAMP_NTZ '-0001-01-01T00:00:00.000000'),
+(4, TIMESTAMP_NTZ '0000-01-01T00:00:00.000000'),
+(5, TIMESTAMP_NTZ '1582-10-05T00:00:00.000000'),
+(6, TIMESTAMP_NTZ '1582-10-14T23:59:59.999999'),
+(7, TIMESTAMP_NTZ '2020-12-31T01:02:03.123456'),
+(8, TIMESTAMP_NTZ '9999-12-31T23:59:59.999999');
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..f90e3a9e2852
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1684140745385,"userId":"7853186923043731","userName":"yuya.ebihara@starburstdata.com","operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[\"part\"]","properties":"{\"delta.feature.timestampntz\":\"supported\"}"},"notebook":{"notebookId":"824234330454407"},"clusterId":"0515-061003-bamkihe4","isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Databricks-Runtime/13.1.x-scala2.12","txnId":"ff274caf-70b4-46ad-967d-ef659a93e9cb"}}
+{"protocol":{"minReaderVersion":3,"minWriterVersion":7,"readerFeatures":["timestampNtz"],"writerFeatures":["timestampNtz"]}}
+{"metaData":{"id":"48f7b745-950d-487a-9a2a-bb9531465773","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"id\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}},{\"name\":\"part\",\"type\":\"timestamp_ntz\",\"nullable\":true,\"metadata\":{}}]}","partitionColumns":["part"],"configuration":{},"createdTime":1684140744975}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/_delta_log/00000000000000000001.json
new file mode 100644
index 000000000000..27e6fa0dde2e
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/_delta_log/00000000000000000001.json
@@ -0,0 +1,9 @@
+{"commitInfo":{"timestamp":1684140752612,"userId":"7853186923043731","userName":"yuya.ebihara@starburstdata.com","operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"notebook":{"notebookId":"824234330454407"},"clusterId":"0515-061003-bamkihe4","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{"numFiles":"8","numOutputRows":"8","numOutputBytes":"4592"},"tags":{"restoresDeletedRows":"false"},"engineInfo":"Databricks-Runtime/13.1.x-scala2.12","txnId":"00c7864f-036d-404e-9b4a-1c1d64ab6640"}}
+{"add":{"path":"part=__HIVE_DEFAULT_PARTITION__/part-00000-bd457a1b-4127-43e8-a7df-ef46a61f80f3.c000.snappy.parquet","partitionValues":{"part":null},"size":574,"modificationTime":1684140752000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"id\":1},\"maxValues\":{\"id\":1},\"nullCount\":{\"id\":0}}","tags":{"INSERTION_TIME":"1684140752000000","MIN_INSERTION_TIME":"1684140752000000","MAX_INSERTION_TIME":"1684140752000000","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"add":{"path":"part=-9999-12-31%2023%253A59%253A59.999999/part-00000-531c8750-ef01-49ca-92bf-f7af45a72ea0.c000.snappy.parquet","partitionValues":{"part":"-9999-12-31 23:59:59.999999"},"size":574,"modificationTime":1684140752000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"id\":2},\"maxValues\":{\"id\":2},\"nullCount\":{\"id\":0}}","tags":{"INSERTION_TIME":"1684140752000001","MIN_INSERTION_TIME":"1684140752000001","MAX_INSERTION_TIME":"1684140752000001","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"add":{"path":"part=-0001-01-01%2000%253A00%253A00/part-00000-1028f6ea-23ab-4048-8ca6-ee602119a2b9.c000.snappy.parquet","partitionValues":{"part":"-0001-01-01 00:00:00"},"size":574,"modificationTime":1684140752000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"id\":3},\"maxValues\":{\"id\":3},\"nullCount\":{\"id\":0}}","tags":{"INSERTION_TIME":"1684140752000002","MIN_INSERTION_TIME":"1684140752000002","MAX_INSERTION_TIME":"1684140752000002","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"add":{"path":"part=0000-01-01%2000%253A00%253A00/part-00000-7ea9d557-8828-4df3-bb78-928f47c623f7.c000.snappy.parquet","partitionValues":{"part":"0000-01-01 00:00:00"},"size":574,"modificationTime":1684140752000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"id\":4},\"maxValues\":{\"id\":4},\"nullCount\":{\"id\":0}}","tags":{"INSERTION_TIME":"1684140752000003","MIN_INSERTION_TIME":"1684140752000003","MAX_INSERTION_TIME":"1684140752000003","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"add":{"path":"part=1582-10-05%2000%253A00%253A00/part-00000-464939d6-b83c-4e84-b4ce-42d784af9615.c000.snappy.parquet","partitionValues":{"part":"1582-10-05 00:00:00"},"size":574,"modificationTime":1684140753000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"id\":5},\"maxValues\":{\"id\":5},\"nullCount\":{\"id\":0}}","tags":{"INSERTION_TIME":"1684140752000004","MIN_INSERTION_TIME":"1684140752000004","MAX_INSERTION_TIME":"1684140752000004","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"add":{"path":"part=1582-10-14%2023%253A59%253A59.999999/part-00000-0db54306-c35a-4d81-adbb-1e0600cda584.c000.snappy.parquet","partitionValues":{"part":"1582-10-14 23:59:59.999999"},"size":574,"modificationTime":1684140753000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"id\":6},\"maxValues\":{\"id\":6},\"nullCount\":{\"id\":0}}","tags":{"INSERTION_TIME":"1684140752000005","MIN_INSERTION_TIME":"1684140752000005","MAX_INSERTION_TIME":"1684140752000005","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"add":{"path":"part=2020-12-31%2001%253A02%253A03.123456/part-00000-a186173b-63f7-4c84-b9e9-ab9eb682df75.c000.snappy.parquet","partitionValues":{"part":"2020-12-31 01:02:03.123456"},"size":574,"modificationTime":1684140753000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"id\":7},\"maxValues\":{\"id\":7},\"nullCount\":{\"id\":0}}","tags":{"INSERTION_TIME":"1684140752000006","MIN_INSERTION_TIME":"1684140752000006","MAX_INSERTION_TIME":"1684140752000006","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"add":{"path":"part=9999-12-31%2023%253A59%253A59.999999/part-00000-3d5514b4-0b6f-47a5-83dd-5153056fe48f.c000.snappy.parquet","partitionValues":{"part":"9999-12-31 23:59:59.999999"},"size":574,"modificationTime":1684140753000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"id\":8},\"maxValues\":{\"id\":8},\"nullCount\":{\"id\":0}}","tags":{"INSERTION_TIME":"1684140752000007","MIN_INSERTION_TIME":"1684140752000007","MAX_INSERTION_TIME":"1684140752000007","OPTIMIZE_TARGET_SIZE":"268435456"}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=-0001-01-01 00%3A00%3A00/part-00000-1028f6ea-23ab-4048-8ca6-ee602119a2b9.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=-0001-01-01 00%3A00%3A00/part-00000-1028f6ea-23ab-4048-8ca6-ee602119a2b9.c000.snappy.parquet
new file mode 100644
index 000000000000..ada022746fc1
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=-0001-01-01 00%3A00%3A00/part-00000-1028f6ea-23ab-4048-8ca6-ee602119a2b9.c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=-9999-12-31 23%3A59%3A59.999999/part-00000-531c8750-ef01-49ca-92bf-f7af45a72ea0.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=-9999-12-31 23%3A59%3A59.999999/part-00000-531c8750-ef01-49ca-92bf-f7af45a72ea0.c000.snappy.parquet
new file mode 100644
index 000000000000..918e6f4441c3
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=-9999-12-31 23%3A59%3A59.999999/part-00000-531c8750-ef01-49ca-92bf-f7af45a72ea0.c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=0000-01-01 00%3A00%3A00/part-00000-7ea9d557-8828-4df3-bb78-928f47c623f7.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=0000-01-01 00%3A00%3A00/part-00000-7ea9d557-8828-4df3-bb78-928f47c623f7.c000.snappy.parquet
new file mode 100644
index 000000000000..6227170c9962
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=0000-01-01 00%3A00%3A00/part-00000-7ea9d557-8828-4df3-bb78-928f47c623f7.c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=1582-10-05 00%3A00%3A00/part-00000-464939d6-b83c-4e84-b4ce-42d784af9615.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=1582-10-05 00%3A00%3A00/part-00000-464939d6-b83c-4e84-b4ce-42d784af9615.c000.snappy.parquet
new file mode 100644
index 000000000000..09a4a5d39d1b
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=1582-10-05 00%3A00%3A00/part-00000-464939d6-b83c-4e84-b4ce-42d784af9615.c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=1582-10-14 23%3A59%3A59.999999/part-00000-0db54306-c35a-4d81-adbb-1e0600cda584.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=1582-10-14 23%3A59%3A59.999999/part-00000-0db54306-c35a-4d81-adbb-1e0600cda584.c000.snappy.parquet
new file mode 100644
index 000000000000..179fce2fe35b
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=1582-10-14 23%3A59%3A59.999999/part-00000-0db54306-c35a-4d81-adbb-1e0600cda584.c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=2020-12-31 01%3A02%3A03.123456/part-00000-a186173b-63f7-4c84-b9e9-ab9eb682df75.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=2020-12-31 01%3A02%3A03.123456/part-00000-a186173b-63f7-4c84-b9e9-ab9eb682df75.c000.snappy.parquet
new file mode 100644
index 000000000000..b2f15f412a4a
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=2020-12-31 01%3A02%3A03.123456/part-00000-a186173b-63f7-4c84-b9e9-ab9eb682df75.c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=9999-12-31 23%3A59%3A59.999999/part-00000-3d5514b4-0b6f-47a5-83dd-5153056fe48f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=9999-12-31 23%3A59%3A59.999999/part-00000-3d5514b4-0b6f-47a5-83dd-5153056fe48f.c000.snappy.parquet
new file mode 100644
index 000000000000..6c31da53509b
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=9999-12-31 23%3A59%3A59.999999/part-00000-3d5514b4-0b6f-47a5-83dd-5153056fe48f.c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=__HIVE_DEFAULT_PARTITION__/part-00000-bd457a1b-4127-43e8-a7df-ef46a61f80f3.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=__HIVE_DEFAULT_PARTITION__/part-00000-bd457a1b-4127-43e8-a7df-ef46a61f80f3.c000.snappy.parquet
new file mode 100644
index 000000000000..2462478c78b6
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks131/timestamp_ntz_partition/part=__HIVE_DEFAULT_PARTITION__/part-00000-bd457a1b-4127-43e8-a7df-ef46a61f80f3.c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/bar/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/bar/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/bar/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/bar/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/bar/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/bar/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/bar/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/bar/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/bar/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/bar/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/bar/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/bar/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/bar/part-00000-70cbd30d-efb0-4090-a7b4-c1de8083743b-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/bar/part-00000-70cbd30d-efb0-4090-a7b4-c1de8083743b-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/bar/part-00000-70cbd30d-efb0-4090-a7b4-c1de8083743b-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/bar/part-00000-70cbd30d-efb0-4090-a7b4-c1de8083743b-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/bar/part-00000-cb64d459-76c9-486e-a259-9d160116bdd0-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/bar/part-00000-cb64d459-76c9-486e-a259-9d160116bdd0-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/bar/part-00000-cb64d459-76c9-486e-a259-9d160116bdd0-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/bar/part-00000-cb64d459-76c9-486e-a259-9d160116bdd0-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000000.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000000.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000000.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000000.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000001.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000001.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000001.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000001.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000002.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000002.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000002.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000002.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000003.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000003.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000003.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000003.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/number_partition=1/string_partition=__HIVE_DEFAULT_PARTITION__/part-00000-eea11d6e-8b50-408d-93a1-ec56027682aa.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/number_partition=1/string_partition=__HIVE_DEFAULT_PARTITION__/part-00000-eea11d6e-8b50-408d-93a1-ec56027682aa.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/number_partition=1/string_partition=__HIVE_DEFAULT_PARTITION__/part-00000-eea11d6e-8b50-408d-93a1-ec56027682aa.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/number_partition=1/string_partition=__HIVE_DEFAULT_PARTITION__/part-00000-eea11d6e-8b50-408d-93a1-ec56027682aa.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/number_partition=__HIVE_DEFAULT_PARTITION__/string_partition=__HIVE_DEFAULT_PARTITION__/part-00000-3181df7e-a84a-41a3-b42a-83f522a83a03.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/number_partition=__HIVE_DEFAULT_PARTITION__/string_partition=__HIVE_DEFAULT_PARTITION__/part-00000-3181df7e-a84a-41a3-b42a-83f522a83a03.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/number_partition=__HIVE_DEFAULT_PARTITION__/string_partition=__HIVE_DEFAULT_PARTITION__/part-00000-3181df7e-a84a-41a3-b42a-83f522a83a03.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/number_partition=__HIVE_DEFAULT_PARTITION__/string_partition=__HIVE_DEFAULT_PARTITION__/part-00000-3181df7e-a84a-41a3-b42a-83f522a83a03.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/number_partition=__HIVE_DEFAULT_PARTITION__/string_partition=partition_a/part-00000-92431a70-4cc6-482b-8ae0-bdd568557439.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/number_partition=__HIVE_DEFAULT_PARTITION__/string_partition=partition_a/part-00000-92431a70-4cc6-482b-8ae0-bdd568557439.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/default_partitions/number_partition=__HIVE_DEFAULT_PARTITION__/string_partition=partition_a/part-00000-92431a70-4cc6-482b-8ae0-bdd568557439.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/default_partitions/number_partition=__HIVE_DEFAULT_PARTITION__/string_partition=partition_a/part-00000-92431a70-4cc6-482b-8ae0-bdd568557439.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/foo/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/foo/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/foo/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/foo/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/foo/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/foo/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/foo/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/foo/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/foo/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/foo/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/foo/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/foo/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/foo/part-00000-6f261ad3-ab3a-45e1-9047-01f9491f5a8c-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/foo/part-00000-6f261ad3-ab3a-45e1-9047-01f9491f5a8c-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/foo/part-00000-6f261ad3-ab3a-45e1-9047-01f9491f5a8c-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/foo/part-00000-6f261ad3-ab3a-45e1-9047-01f9491f5a8c-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/foo/part-00000-f61316e9-b279-4efa-94c8-5ababdacf768-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/foo/part-00000-f61316e9-b279-4efa-94c8-5ababdacf768-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/foo/part-00000-f61316e9-b279-4efa-94c8-5ababdacf768-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/foo/part-00000-f61316e9-b279-4efa-94c8-5ababdacf768-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/_delta_log/00000000000000000000.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/_delta_log/00000000000000000000.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/_delta_log/00000000000000000000.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/_delta_log/00000000000000000000.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/_delta_log/00000000000000000001.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/_delta_log/00000000000000000001.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/_delta_log/00000000000000000001.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/_delta_log/00000000000000000001.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/_delta_log/00000000000000000002.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/_delta_log/00000000000000000002.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/_delta_log/00000000000000000002.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/_delta_log/00000000000000000002.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/part-00000-43372cd6-9b92-40cf-bac1-0224a06b4141-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/part-00000-43372cd6-9b92-40cf-bac1-0224a06b4141-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/part-00000-43372cd6-9b92-40cf-bac1-0224a06b4141-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/part-00000-43372cd6-9b92-40cf-bac1-0224a06b4141-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/part-00000-44c24d68-b78c-492c-883e-0102c3713fbf-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/part-00000-44c24d68-b78c-492c-883e-0102c3713fbf-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/part-00000-44c24d68-b78c-492c-883e-0102c3713fbf-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/part-00000-44c24d68-b78c-492c-883e-0102c3713fbf-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/part-00001-55d13068-dd09-43fd-ad1a-42835e2befa6-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/part-00001-55d13068-dd09-43fd-ad1a-42835e2befa6-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/part-00001-55d13068-dd09-43fd-ad1a-42835e2befa6-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/part-00001-55d13068-dd09-43fd-ad1a-42835e2befa6-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/part-00001-dec1546d-b4ec-4f1c-9e32-d77f14fcd56d-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/part-00001-dec1546d-b4ec-4f1c-9e32-d77f14fcd56d-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nested_nonlowercase_columns/part-00001-dec1546d-b4ec-4f1c-9e32-d77f14fcd56d-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nested_nonlowercase_columns/part-00001-dec1546d-b4ec-4f1c-9e32-d77f14fcd56d-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/_delta_log/00000000000000000000.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/_delta_log/00000000000000000000.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/_delta_log/00000000000000000000.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/_delta_log/00000000000000000000.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/_delta_log/00000000000000000001.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/_delta_log/00000000000000000001.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/_delta_log/00000000000000000001.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/_delta_log/00000000000000000001.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/_delta_log/00000000000000000002.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/_delta_log/00000000000000000002.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/_delta_log/00000000000000000002.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/_delta_log/00000000000000000002.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/part-00000-b39d205b-cb2f-4244-ac37-14f35cf9fd51-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/part-00000-b39d205b-cb2f-4244-ac37-14f35cf9fd51-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/part-00000-b39d205b-cb2f-4244-ac37-14f35cf9fd51-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/part-00000-b39d205b-cb2f-4244-ac37-14f35cf9fd51-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/part-00000-b3d21043-34ec-49e6-a606-4a453f2b2d5d-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/part-00000-b3d21043-34ec-49e6-a606-4a453f2b2d5d-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/part-00000-b3d21043-34ec-49e6-a606-4a453f2b2d5d-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/part-00000-b3d21043-34ec-49e6-a606-4a453f2b2d5d-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/part-00001-0d4d7e36-7318-461a-8895-69a2e8e7df76-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/part-00001-0d4d7e36-7318-461a-8895-69a2e8e7df76-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/part-00001-0d4d7e36-7318-461a-8895-69a2e8e7df76-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/part-00001-0d4d7e36-7318-461a-8895-69a2e8e7df76-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/part-00001-a27d2c20-2300-48ec-b6cb-902b29121ae2-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/part-00001-a27d2c20-2300-48ec-b6cb-902b29121ae2-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns/part-00001-a27d2c20-2300-48ec-b6cb-902b29121ae2-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns/part-00001-a27d2c20-2300-48ec-b6cb-902b29121ae2-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=DaTaBrIcKs/part-00000-8929e1cb-84f3-4373-a87e-ac995db5a7b4.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=DaTaBrIcKs/part-00000-8929e1cb-84f3-4373-a87e-ac995db5a7b4.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=DaTaBrIcKs/part-00000-8929e1cb-84f3-4373-a87e-ac995db5a7b4.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=DaTaBrIcKs/part-00000-8929e1cb-84f3-4373-a87e-ac995db5a7b4.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=DaTaBrIcKs/part-00000-bd00087c-6128-4c2e-a2c2-842d3628753e.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=DaTaBrIcKs/part-00000-bd00087c-6128-4c2e-a2c2-842d3628753e.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=DaTaBrIcKs/part-00000-bd00087c-6128-4c2e-a2c2-842d3628753e.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=DaTaBrIcKs/part-00000-bd00087c-6128-4c2e-a2c2-842d3628753e.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=__HIVE_DEFAULT_PARTITION__/part-00001-74e18028-cf45-41fc-8cb6-b420018fdeaf.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=__HIVE_DEFAULT_PARTITION__/part-00001-74e18028-cf45-41fc-8cb6-b420018fdeaf.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=__HIVE_DEFAULT_PARTITION__/part-00001-74e18028-cf45-41fc-8cb6-b420018fdeaf.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=__HIVE_DEFAULT_PARTITION__/part-00001-74e18028-cf45-41fc-8cb6-b420018fdeaf.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=__HIVE_DEFAULT_PARTITION__/part-00001-fb0e719f-6805-4839-91fb-918e1b003d7b.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=__HIVE_DEFAULT_PARTITION__/part-00001-fb0e719f-6805-4839-91fb-918e1b003d7b.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=__HIVE_DEFAULT_PARTITION__/part-00001-fb0e719f-6805-4839-91fb-918e1b003d7b.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/MiXeD_CaSe_StRiNg=__HIVE_DEFAULT_PARTITION__/part-00001-fb0e719f-6805-4839-91fb-918e1b003d7b.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000000.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000000.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000000.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000000.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000001.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000001.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000001.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000001.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000002.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000002.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000002.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000002.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/insert_nonlowercase_columns_partitioned/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps/part-00000-50743692-12e7-4ffd-8bdd-f666f620be72-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps/part-00000-50743692-12e7-4ffd-8bdd-f666f620be72-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps/part-00000-50743692-12e7-4ffd-8bdd-f666f620be72-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps/part-00000-50743692-12e7-4ffd-8bdd-f666f620be72-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000006.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000006.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000006.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000007.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000007.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000007.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000008.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000008.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000008.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000008.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000009.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000009.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000009.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000009.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000010.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000010.checkpoint.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000010.json b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000010.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/00000000000000000010.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/00000000000000000010.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/_last_checkpoint
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/_delta_log/_last_checkpoint
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/_delta_log/_last_checkpoint
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-01abc26a-95b0-4179-8b49-d91a2410cd93-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-01abc26a-95b0-4179-8b49-d91a2410cd93-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-01abc26a-95b0-4179-8b49-d91a2410cd93-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-01abc26a-95b0-4179-8b49-d91a2410cd93-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-03c15ed6-8778-435e-9ab9-467e83ec84dc-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-03c15ed6-8778-435e-9ab9-467e83ec84dc-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-03c15ed6-8778-435e-9ab9-467e83ec84dc-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-03c15ed6-8778-435e-9ab9-467e83ec84dc-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-04200a92-bc84-4c35-80ea-910906481a4f-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-04200a92-bc84-4c35-80ea-910906481a4f-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-04200a92-bc84-4c35-80ea-910906481a4f-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-04200a92-bc84-4c35-80ea-910906481a4f-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-14cf0ed3-5e65-4d29-8fe3-362b279823e8-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-14cf0ed3-5e65-4d29-8fe3-362b279823e8-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-14cf0ed3-5e65-4d29-8fe3-362b279823e8-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-14cf0ed3-5e65-4d29-8fe3-362b279823e8-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-50743692-12e7-4ffd-8bdd-f666f620be72-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-50743692-12e7-4ffd-8bdd-f666f620be72-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-50743692-12e7-4ffd-8bdd-f666f620be72-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-50743692-12e7-4ffd-8bdd-f666f620be72-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-ab320428-f161-48de-a3ef-e4aff3b03447-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-ab320428-f161-48de-a3ef-e4aff3b03447-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-ab320428-f161-48de-a3ef-e4aff3b03447-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-ab320428-f161-48de-a3ef-e4aff3b03447-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-ad595774-679c-4e7b-a2f7-197d09fb86b0-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-ad595774-679c-4e7b-a2f7-197d09fb86b0-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-ad595774-679c-4e7b-a2f7-197d09fb86b0-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-ad595774-679c-4e7b-a2f7-197d09fb86b0-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-eb5caa9d-1841-4bc4-9aee-5b09af4cb32b-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-eb5caa9d-1841-4bc4-9aee-5b09af4cb32b-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-eb5caa9d-1841-4bc4-9aee-5b09af4cb32b-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-eb5caa9d-1841-4bc4-9aee-5b09af4cb32b-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-fa0de0b8-72ed-4d45-83d0-047de7094767-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-fa0de0b8-72ed-4d45-83d0-047de7094767-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-fa0de0b8-72ed-4d45-83d0-047de7094767-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-fa0de0b8-72ed-4d45-83d0-047de7094767-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-fe628d69-2a2a-490c-9115-9971777168de-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-fe628d69-2a2a-490c-9115-9971777168de-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/nested_timestamps_parquet_stats/part-00000-fe628d69-2a2a-490c-9115-9971777168de-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/nested_timestamps_parquet_stats/part-00000-fe628d69-2a2a-490c-9115-9971777168de-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks73/no_column_stats/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/no_column_stats/README.md
new file mode 100644
index 000000000000..cc4c674b95f9
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks73/no_column_stats/README.md
@@ -0,0 +1,10 @@
+Data generated using:
+
+```sql
+CREATE TABLE no_column_stats
+USING delta
+LOCATION 's3://starburst-alex/delta/no_column_stats'
+TBLPROPERTIES (delta.dataSkippingNumIndexedCols=0)   -- collects only table stats (row count), but no column stats
+AS
+SELECT 42 AS c_int, 'foo' AS c_str
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/no_column_stats/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/no_column_stats/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/no_column_stats/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/no_column_stats/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/no_column_stats/part-00000-590cf436-ab76-4290-b93b-a24810f54390-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/no_column_stats/part-00000-590cf436-ab76-4290-b93b-a24810f54390-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/no_column_stats/part-00000-590cf436-ab76-4290-b93b-a24810f54390-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/no_column_stats/part-00000-590cf436-ab76-4290-b93b-a24810f54390-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/old_dates/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/old_dates/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/old_dates/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/old_dates/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/old_dates/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/old_dates/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/old_dates/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/old_dates/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/old_dates/part-00000-4e939ac2-2487-4573-aa86-29a3b3e27d47-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/old_dates/part-00000-4e939ac2-2487-4573-aa86-29a3b3e27d47-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/old_dates/part-00000-4e939ac2-2487-4573-aa86-29a3b3e27d47-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/old_dates/part-00000-4e939ac2-2487-4573-aa86-29a3b3e27d47-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/old_dates/part-00001-e494b9fe-464a-45ec-bdbd-96c71b5fa570-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/old_dates/part-00001-e494b9fe-464a-45ec-bdbd-96c71b5fa570-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/old_dates/part-00001-e494b9fe-464a-45ec-bdbd-96c71b5fa570-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/old_dates/part-00001-e494b9fe-464a-45ec-bdbd-96c71b5fa570-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/old_dates/part-00002-c86c22bb-9076-4ab4-94cf-d38b51cae032-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/old_dates/part-00002-c86c22bb-9076-4ab4-94cf-d38b51cae032-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/old_dates/part-00002-c86c22bb-9076-4ab4-94cf-d38b51cae032-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/old_dates/part-00002-c86c22bb-9076-4ab4-94cf-d38b51cae032-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/old_dates/part-00003-0de75b5a-15f7-4798-9d7b-aa3ceb4432ff-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/old_dates/part-00003-0de75b5a-15f7-4798-9d7b-aa3ceb4432ff-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/old_dates/part-00003-0de75b5a-15f7-4798-9d7b-aa3ceb4432ff-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/old_dates/part-00003-0de75b5a-15f7-4798-9d7b-aa3ceb4432ff-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/old_timestamps/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/old_timestamps/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/old_timestamps/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/old_timestamps/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/old_timestamps/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/old_timestamps/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/old_timestamps/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/old_timestamps/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/old_timestamps/part-00000-d1d2749d-e75a-4b52-ae5d-9d7f4b515f1d-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/old_timestamps/part-00000-d1d2749d-e75a-4b52-ae5d-9d7f4b515f1d-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/old_timestamps/part-00000-d1d2749d-e75a-4b52-ae5d-9d7f4b515f1d-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/old_timestamps/part-00000-d1d2749d-e75a-4b52-ae5d-9d7f4b515f1d-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/old_timestamps/part-00001-808292c7-3cfb-4f68-9ae8-db6e899ef105-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/old_timestamps/part-00001-808292c7-3cfb-4f68-9ae8-db6e899ef105-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/old_timestamps/part-00001-808292c7-3cfb-4f68-9ae8-db6e899ef105-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/old_timestamps/part-00001-808292c7-3cfb-4f68-9ae8-db6e899ef105-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/old_timestamps/part-00002-d4a07e68-e1c3-4120-ab64-d5bf0a9a8130-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/old_timestamps/part-00002-d4a07e68-e1c3-4120-ab64-d5bf0a9a8130-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/old_timestamps/part-00002-d4a07e68-e1c3-4120-ab64-d5bf0a9a8130-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/old_timestamps/part-00002-d4a07e68-e1c3-4120-ab64-d5bf0a9a8130-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/old_timestamps/part-00003-98b77405-274a-47bd-b19b-8f434edbc2e3-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/old_timestamps/part-00003-98b77405-274a-47bd-b19b-8f434edbc2e3-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/old_timestamps/part-00003-98b77405-274a-47bd-b19b-8f434edbc2e3-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/old_timestamps/part-00003-98b77405-274a-47bd-b19b-8f434edbc2e3-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000006.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000006.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000006.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000007.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000007.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000007.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000008.json b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000008.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000008.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000008.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000009.json b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000009.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000009.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000009.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000010.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000010.checkpoint.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000010.json b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000010.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/00000000000000000010.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/00000000000000000010.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/_last_checkpoint
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/_delta_log/_last_checkpoint
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/_delta_log/_last_checkpoint
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-23a788af-acb6-434e-a9c9-aa15eefadab9-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-23a788af-acb6-434e-a9c9-aa15eefadab9-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-23a788af-acb6-434e-a9c9-aa15eefadab9-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-23a788af-acb6-434e-a9c9-aa15eefadab9-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-2e28c8a6-b954-4681-9e80-deda01ec8115-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-2e28c8a6-b954-4681-9e80-deda01ec8115-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-2e28c8a6-b954-4681-9e80-deda01ec8115-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-2e28c8a6-b954-4681-9e80-deda01ec8115-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-3880d75f-8df1-4f4d-9cdb-717f53353af2-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-3880d75f-8df1-4f4d-9cdb-717f53353af2-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-3880d75f-8df1-4f4d-9cdb-717f53353af2-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-3880d75f-8df1-4f4d-9cdb-717f53353af2-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-a4218de6-b786-43c6-b1dc-1d5bd449f4f8-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-a4218de6-b786-43c6-b1dc-1d5bd449f4f8-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-a4218de6-b786-43c6-b1dc-1d5bd449f4f8-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-a4218de6-b786-43c6-b1dc-1d5bd449f4f8-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-a9430040-28e5-4007-8be2-843ac4eeb489-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-a9430040-28e5-4007-8be2-843ac4eeb489-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-a9430040-28e5-4007-8be2-843ac4eeb489-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-a9430040-28e5-4007-8be2-843ac4eeb489-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-b5fd762d-96da-42e4-ad38-ca62743fc7c4-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-b5fd762d-96da-42e4-ad38-ca62743fc7c4-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-b5fd762d-96da-42e4-ad38-ca62743fc7c4-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-b5fd762d-96da-42e4-ad38-ca62743fc7c4-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-c21fa19d-e3c0-4224-95c7-92311279966c-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-c21fa19d-e3c0-4224-95c7-92311279966c-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-c21fa19d-e3c0-4224-95c7-92311279966c-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-c21fa19d-e3c0-4224-95c7-92311279966c-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-d5bf7aab-81d2-466b-b4b7-b9fb56e1742f-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-d5bf7aab-81d2-466b-b4b7-b9fb56e1742f-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-d5bf7aab-81d2-466b-b4b7-b9fb56e1742f-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-d5bf7aab-81d2-466b-b4b7-b9fb56e1742f-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-efdf1bb8-0e02-4d79-a16c-e402edd6b62a-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-efdf1bb8-0e02-4d79-a16c-e402edd6b62a-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/parquet_stats_missing/part-00000-efdf1bb8-0e02-4d79-a16c-e402edd6b62a-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/parquet_stats_missing/part-00000-efdf1bb8-0e02-4d79-a16c-e402edd6b62a-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000000.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000000.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000000.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000000.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000001.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000001.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000001.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000001.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000002.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000002.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000002.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000002.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000003.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000003.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000003.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000003.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000004.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000004.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000004.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000004.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000005.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000005.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000005.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000005.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000006.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000006.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000006.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000006.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000006.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000006.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000006.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000007.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000007.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000007.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000007.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000007.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000007.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000007.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000008.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000008.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000008.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000008.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000008.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000008.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000008.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000008.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000009.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000009.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000009.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000009.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000009.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000009.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000009.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000009.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000010.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000010.checkpoint.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000010.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000010.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000010.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000010.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000010.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000010.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000010.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000010.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000011.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000011.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000011.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000011.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000011.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000011.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000011.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000011.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000012.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000012.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000012.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000012.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000012.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000012.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000012.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000012.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000013.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000013.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000013.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000013.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000013.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000013.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/00000000000000000013.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/00000000000000000013.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/_last_checkpoint
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/_delta_log/_last_checkpoint
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/_delta_log/_last_checkpoint
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000006.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000006.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000006.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000007.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000007.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000007.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000008.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000008.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000008.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000008.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000009.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000009.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000009.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000009.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000010.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000010.checkpoint.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000010.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000010.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000010.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000010.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000011.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000011.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000011.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000011.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000012.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000012.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000012.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000012.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000013.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000013.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000013.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000013.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000014.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000014.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/00000000000000000014.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/00000000000000000014.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/_last_checkpoint
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_test_pruning/_delta_log/_last_checkpoint
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_test_pruning/_delta_log/_last_checkpoint
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000000.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000000.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000000.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000000.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000001.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000001.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000001.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000001.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000002.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000002.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000002.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000002.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000003.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000003.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000003.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000003.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000004.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000004.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000004.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000004.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000005.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000005.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000005.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000005.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000006.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000006.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000006.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000006.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000006.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000006.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000006.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000007.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000007.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000007.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000007.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000007.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000007.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000007.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000008.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000008.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000008.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000008.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000008.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000008.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000008.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000008.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000009.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000009.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000009.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000009.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000009.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000009.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000009.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000009.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000010.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000010.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000010.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000010.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000010.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000010.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000010.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000010.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000011.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000011.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000011.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000011.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000011.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000011.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000011.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000011.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000012.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000012.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000012.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000012.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000012.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000012.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000012.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000012.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000013.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000013.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000013.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000013.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000013.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000013.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/_delta_log/00000000000000000013.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/_delta_log/00000000000000000013.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_checkpoints/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_checkpoints/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000000.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000000.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000000.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000000.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000001.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000001.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000001.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000001.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000002.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000002.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000002.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000002.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000003.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000003.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000003.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000003.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000004.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000004.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000004.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000004.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000005.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000005.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000005.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000005.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000006.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000006.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000006.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000006.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000006.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000006.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000006.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000007.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000007.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000007.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000007.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000007.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000007.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000007.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000008.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000008.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000008.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000008.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000008.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000008.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000008.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000008.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000009.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000009.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000009.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000009.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000009.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000009.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000009.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000009.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000010.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000010.checkpoint.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000010.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000010.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000010.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000010.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000010.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000010.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000010.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000010.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000011.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000011.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000011.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000011.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000011.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000011.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000011.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000011.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000012.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000012.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000012.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000012.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000012.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000012.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000012.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000012.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000013.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000013.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000013.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000013.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000013.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000013.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/_delta_log/00000000000000000013.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/_delta_log/00000000000000000013.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_last_checkpoint/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_last_checkpoint/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000010.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000010.checkpoint.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000011.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000011.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000011.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000011.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000011.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000011.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000011.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000011.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000012.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000012.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000012.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000012.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000012.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000012.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000012.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000012.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000013.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000013.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000013.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000013.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000013.json b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000013.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/00000000000000000013.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/00000000000000000013.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/_last_checkpoint
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/_delta_log/_last_checkpoint
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/_delta_log/_last_checkpoint
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=21/part-00000-3d546786-bedc-407f-b9f7-e97aa12cce0f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=21/part-00001-290f0f26-19cf-4772-821e-36d55d9b7872.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=25/part-00000-22a101a1-8f09-425e-847e-cbbe4f894eea.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=25/part-00000-609e34b1-5466-4dbc-a780-2708166e7adb.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=25/part-00000-b7fbbe31-c7f9-44ed-8757-5c47d10c3e81.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=25/part-00001-aceaf062-1cd1-45cb-8f83-277ffebe995c.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=28/part-00000-40dd1707-1d42-4328-a59a-21f5c945fe60.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=29/part-00000-3794c463-cb0c-4beb-8d07-7cc1e3b5920f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=30/part-00000-37ccfcd3-b44b-4d04-a1e6-d2837da75f7a.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=30/part-00000-63c2205d-84a3-4a66-bd7c-f69f5af55bbc.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=30/part-00000-72a56c23-01ba-483a-9062-dd0accc86599.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=30/part-00000-7e43a3c3-ea26-4ae7-8eac-8f60cbb4df03.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=30/part-00002-5800be2e-2373-47d8-8b86-776a8ea9d69f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=42/part-00000-6aed618a-2beb-4edd-8466-653e67a9b380.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=42/part-00000-b82d8859-84a0-4f05-872c-206b07dd54f0.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/person_without_old_jsons/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/person_without_old_jsons/age=42/part-00003-0f53cae3-3e34-4876-b651-e1db9584dbc3.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_inf/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_inf/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_inf/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_inf/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_inf/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_inf/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_inf/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_inf/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_inf/part_key=1.0/part-00000-35886fe5-5a75-4085-b6e3-b77e265f0b69.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_inf/part_key=1.0/part-00000-35886fe5-5a75-4085-b6e3-b77e265f0b69.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_inf/part_key=1.0/part-00000-35886fe5-5a75-4085-b6e3-b77e265f0b69.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_inf/part_key=1.0/part-00000-35886fe5-5a75-4085-b6e3-b77e265f0b69.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_inf/part_key=2.0/part-00001-4dca9c5e-1266-4706-932f-75419ab52cb5.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_inf/part_key=2.0/part-00001-4dca9c5e-1266-4706-932f-75419ab52cb5.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_inf/part_key=2.0/part-00001-4dca9c5e-1266-4706-932f-75419ab52cb5.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_inf/part_key=2.0/part-00001-4dca9c5e-1266-4706-932f-75419ab52cb5.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_inf/part_key=3.0/part-00000-099156d2-f7e7-4d31-bf57-14830d6d3659.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_inf/part_key=3.0/part-00000-099156d2-f7e7-4d31-bf57-14830d6d3659.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_inf/part_key=3.0/part-00000-099156d2-f7e7-4d31-bf57-14830d6d3659.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_inf/part_key=3.0/part-00000-099156d2-f7e7-4d31-bf57-14830d6d3659.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_inf/part_key=4.0/part-00003-5033ee91-1e9e-4399-a64d-8580656f35a7.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_inf/part_key=4.0/part-00003-5033ee91-1e9e-4399-a64d-8580656f35a7.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_inf/part_key=4.0/part-00003-5033ee91-1e9e-4399-a64d-8580656f35a7.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_inf/part_key=4.0/part-00003-5033ee91-1e9e-4399-a64d-8580656f35a7.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_nan/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_nan/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_nan/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_nan/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_nan/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_nan/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_nan/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_nan/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_nan/part_key=5.0/part-00000-75bd12c9-bafd-41dc-b1ae-5a8382308137.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_nan/part_key=5.0/part-00000-75bd12c9-bafd-41dc-b1ae-5a8382308137.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_nan/part_key=5.0/part-00000-75bd12c9-bafd-41dc-b1ae-5a8382308137.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_nan/part_key=5.0/part-00000-75bd12c9-bafd-41dc-b1ae-5a8382308137.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_nan/part_key=6.0/part-00001-d0486dd4-1339-462b-9de1-d11cbe14e24f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_nan/part_key=6.0/part-00001-d0486dd4-1339-462b-9de1-d11cbe14e24f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/double_nan/part_key=6.0/part-00001-d0486dd4-1339-462b-9de1-d11cbe14e24f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/double_nan/part_key=6.0/part-00001-d0486dd4-1339-462b-9de1-d11cbe14e24f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_inf/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_inf/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_inf/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_inf/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_inf/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_inf/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_inf/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_inf/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_inf/part_key=1.0/part-00000-fecae78c-38f8-438a-bc05-451ea338c0bd.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_inf/part_key=1.0/part-00000-fecae78c-38f8-438a-bc05-451ea338c0bd.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_inf/part_key=1.0/part-00000-fecae78c-38f8-438a-bc05-451ea338c0bd.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_inf/part_key=1.0/part-00000-fecae78c-38f8-438a-bc05-451ea338c0bd.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_inf/part_key=2.0/part-00001-85001c6e-1d42-49a1-b975-083e680642c4.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_inf/part_key=2.0/part-00001-85001c6e-1d42-49a1-b975-083e680642c4.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_inf/part_key=2.0/part-00001-85001c6e-1d42-49a1-b975-083e680642c4.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_inf/part_key=2.0/part-00001-85001c6e-1d42-49a1-b975-083e680642c4.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_inf/part_key=3.0/part-00000-acb88926-db40-4001-a8f0-18348daa31ee.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_inf/part_key=3.0/part-00000-acb88926-db40-4001-a8f0-18348daa31ee.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_inf/part_key=3.0/part-00000-acb88926-db40-4001-a8f0-18348daa31ee.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_inf/part_key=3.0/part-00000-acb88926-db40-4001-a8f0-18348daa31ee.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_inf/part_key=4.0/part-00003-177aeaf4-bafd-4cff-abaf-daadd575a598.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_inf/part_key=4.0/part-00003-177aeaf4-bafd-4cff-abaf-daadd575a598.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_inf/part_key=4.0/part-00003-177aeaf4-bafd-4cff-abaf-daadd575a598.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_inf/part_key=4.0/part-00003-177aeaf4-bafd-4cff-abaf-daadd575a598.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_nan/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_nan/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_nan/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_nan/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_nan/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_nan/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_nan/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_nan/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_nan/part_key=5.0/part-00000-1e2bdd3f-bc1e-4a3f-a535-34ab2e7306b0.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_nan/part_key=5.0/part-00000-1e2bdd3f-bc1e-4a3f-a535-34ab2e7306b0.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_nan/part_key=5.0/part-00000-1e2bdd3f-bc1e-4a3f-a535-34ab2e7306b0.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_nan/part_key=5.0/part-00000-1e2bdd3f-bc1e-4a3f-a535-34ab2e7306b0.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_nan/part_key=6.0/part-00001-621cad83-d386-48dc-99e4-f72bd8e2254b.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_nan/part_key=6.0/part-00001-621cad83-d386-48dc-99e4-f72bd8e2254b.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/float_nan/part_key=6.0/part-00001-621cad83-d386-48dc-99e4-f72bd8e2254b.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/float_nan/part_key=6.0/part-00001-621cad83-d386-48dc-99e4-f72bd8e2254b.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/invalid_log/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/invalid_log/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/invalid_log/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/invalid_log/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/invalid_log/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/invalid_log/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/invalid_log/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/invalid_log/age=42/part-00000-951068bd-bcf4-4094-bb94-536f3c41d31f.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/invalid_log/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/invalid_log/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/invalid_log/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/invalid_log/age=42/part-00000-b26c891a-7288-4d96-9d3b-bef648f12a34.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/README.md
new file mode 100644
index 000000000000..a1c852b642aa
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/README.md
@@ -0,0 +1,17 @@
+Data generated using Databricks 10.4 LTS:
+
+```sql
+CREATE TABLE nested_fields (id INT, parent STRUCT<child1: BIGINT, child2: STRING>, grandparent STRUCT<parent1 STRUCT<child1: DOUBLE, child2: BOOLEAN>, parent2 STRUCT<child1: DATE>>) USING DELTA LOCATION 's3://starburst-test/nested_fields';
+
+INSERT INTO nested_fields VALUES
+    (1, struct('100', 'INDIA'), struct(struct(10.99, true), struct('2023-01-01'))),
+    (2, struct('200', 'POLAND'), struct(struct(20.99, false), struct('2023-02-01'))),
+    (3, struct('300', 'USA'), struct(struct(30.99, true), struct('2023-03-01'))),
+    (4, struct('400', 'AUSTRIA'), struct(struct(40.99, false), struct('2023-04-01'))),
+    (5, struct('500', 'JAPAN'), struct(struct(50.99, true), struct('2023-05-01'))),
+    (6, struct('600', 'UK'), struct(struct(60.99, false), struct('2023-06-01'))),
+    (7, struct('700', 'FRANCE'), struct(struct(70.99, true), struct('2023-07-01'))),
+    (8, struct('800', 'BRAZIL'), struct(struct(80.99, false), struct('2023-08-01'))),
+    (9, struct('900', 'NAMIBIA'), struct(struct(90.99, true), struct('2023-09-01'))),
+    (10, struct('1000', 'RSA'), struct(struct(100.99, false), struct('2023-10-01')));
+```
\ No newline at end of file
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..769d7c8f0782
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1681993589387,"userId":"7499806201888255","userName":"vikash.kumar@starburstdata.com","operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{}"},"notebook":{"notebookId":"4432842678029071"},"clusterId":"1118-145353-2w37w56t","isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Databricks-Runtime/10.4.x-scala2.12","txnId":"63491529-eec9-485b-9aca-662bac90be67"}}
+{"protocol":{"minReaderVersion":1,"minWriterVersion":2}}
+{"metaData":{"id":"735e2c32-06a1-4c03-a5a8-5d0b92c58f85","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"id\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}},{\"name\":\"parent\",\"type\":{\"type\":\"struct\",\"fields\":[{\"name\":\"child1\",\"type\":\"long\",\"nullable\":true,\"metadata\":{}},{\"name\":\"child2\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}]},\"nullable\":true,\"metadata\":{}},{\"name\":\"grandparent\",\"type\":{\"type\":\"struct\",\"fields\":[{\"name\":\"parent1\",\"type\":{\"type\":\"struct\",\"fields\":[{\"name\":\"child1\",\"type\":\"double\",\"nullable\":true,\"metadata\":{}},{\"name\":\"child2\",\"type\":\"boolean\",\"nullable\":true,\"metadata\":{}}]},\"nullable\":true,\"metadata\":{}},{\"name\":\"parent2\",\"type\":{\"type\":\"struct\",\"fields\":[{\"name\":\"child1\",\"type\":\"date\",\"nullable\":true,\"metadata\":{}}]},\"nullable\":true,\"metadata\":{}}]},\"nullable\":true,\"metadata\":{}}]}","partitionColumns":[],"configuration":{},"createdTime":1681993589155}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/_delta_log/00000000000000000001.json
new file mode 100644
index 000000000000..e5b3a603bfac
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/_delta_log/00000000000000000001.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1681993595946,"userId":"7499806201888255","userName":"vikash.kumar@starburstdata.com","operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"notebook":{"notebookId":"4432842678029071"},"clusterId":"1118-145353-2w37w56t","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true,"operationMetrics":{"numFiles":"2","numOutputRows":"10","numOutputBytes":"4731"},"engineInfo":"Databricks-Runtime/10.4.x-scala2.12","txnId":"cc74cc50-8684-4179-bddc-248ef4350d7c"}}
+{"add":{"path":"part-00000-8e3f6979-c368-4f48-b389-9b4dbf46de93-c000.snappy.parquet","partitionValues":{},"size":2366,"modificationTime":1681993596000,"dataChange":true,"stats":"{\"numRecords\":5,\"minValues\":{\"id\":1,\"parent\":{\"child1\":100,\"child2\":\"AUSTRIA\"},\"grandparent\":{\"parent1\":{\"child1\":10.99},\"parent2\":{\"child1\":\"2023-01-01\"}}},\"maxValues\":{\"id\":5,\"parent\":{\"child1\":500,\"child2\":\"USA\"},\"grandparent\":{\"parent1\":{\"child1\":50.99},\"parent2\":{\"child1\":\"2023-05-01\"}}},\"nullCount\":{\"id\":0,\"parent\":{\"child1\":0,\"child2\":0},\"grandparent\":{\"parent1\":{\"child1\":0,\"child2\":0},\"parent2\":{\"child1\":0}}}}","tags":{"INSERTION_TIME":"1681993596000000","OPTIMIZE_TARGET_SIZE":"268435456"}}}
+{"add":{"path":"part-00001-dd006b0f-93c6-4f87-801f-a8b7153a72ae-c000.snappy.parquet","partitionValues":{},"size":2365,"modificationTime":1681993596000,"dataChange":true,"stats":"{\"numRecords\":5,\"minValues\":{\"id\":6,\"parent\":{\"child1\":600,\"child2\":\"BRAZIL\"},\"grandparent\":{\"parent1\":{\"child1\":60.99},\"parent2\":{\"child1\":\"2023-06-01\"}}},\"maxValues\":{\"id\":10,\"parent\":{\"child1\":1000,\"child2\":\"UK\"},\"grandparent\":{\"parent1\":{\"child1\":100.99},\"parent2\":{\"child1\":\"2023-10-01\"}}},\"nullCount\":{\"id\":0,\"parent\":{\"child1\":0,\"child2\":0},\"grandparent\":{\"parent1\":{\"child1\":0,\"child2\":0},\"parent2\":{\"child1\":0}}}}","tags":{"INSERTION_TIME":"1681993596000001","OPTIMIZE_TARGET_SIZE":"268435456"}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/part-00000-8e3f6979-c368-4f48-b389-9b4dbf46de93-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/part-00000-8e3f6979-c368-4f48-b389-9b4dbf46de93-c000.snappy.parquet
new file mode 100644
index 000000000000..99dc517404d2
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/part-00000-8e3f6979-c368-4f48-b389-9b4dbf46de93-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/part-00001-dd006b0f-93c6-4f87-801f-a8b7153a72ae-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/part-00001-dd006b0f-93c6-4f87-801f-a8b7153a72ae-c000.snappy.parquet
new file mode 100644
index 000000000000..313d1526dfe0
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/nested_fields/part-00001-dd006b0f-93c6-4f87-801f-a8b7153a72ae-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/no_stats/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/no_stats/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/no_stats/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/no_stats/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/no_stats/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/no_stats/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/no_stats/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/no_stats/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/no_stats/part_key=1.0/part-00000-fecae78c-38f8-438a-bc05-451ea338c0bd.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/no_stats/part_key=1.0/part-00000-fecae78c-38f8-438a-bc05-451ea338c0bd.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/no_stats/part_key=1.0/part-00000-fecae78c-38f8-438a-bc05-451ea338c0bd.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/no_stats/part_key=1.0/part-00000-fecae78c-38f8-438a-bc05-451ea338c0bd.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/no_stats/part_key=2.0/part-00001-85001c6e-1d42-49a1-b975-083e680642c4.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/no_stats/part_key=2.0/part-00001-85001c6e-1d42-49a1-b975-083e680642c4.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/no_stats/part_key=2.0/part-00001-85001c6e-1d42-49a1-b975-083e680642c4.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/no_stats/part_key=2.0/part-00001-85001c6e-1d42-49a1-b975-083e680642c4.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/no_stats/part_key=3.0/part-00000-acb88926-db40-4001-a8f0-18348daa31ee.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/no_stats/part_key=3.0/part-00000-acb88926-db40-4001-a8f0-18348daa31ee.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/no_stats/part_key=3.0/part-00000-acb88926-db40-4001-a8f0-18348daa31ee.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/no_stats/part_key=3.0/part-00000-acb88926-db40-4001-a8f0-18348daa31ee.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/no_stats/part_key=4.0/part-00003-177aeaf4-bafd-4cff-abaf-daadd575a598.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/no_stats/part_key=4.0/part-00003-177aeaf4-bafd-4cff-abaf-daadd575a598.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/no_stats/part_key=4.0/part-00003-177aeaf4-bafd-4cff-abaf-daadd575a598.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/no_stats/part_key=4.0/part-00003-177aeaf4-bafd-4cff-abaf-daadd575a598.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000006.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000006.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000006.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000007.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000007.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000007.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000008.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000008.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000008.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000008.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000009.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000009.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000009.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000009.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000010.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000010.checkpoint.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000010.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000010.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/00000000000000000010.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/00000000000000000010.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/_last_checkpoint
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/_delta_log/_last_checkpoint
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/_delta_log/_last_checkpoint
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-02c2ced7-756d-4b85-a1cd-bd6651e89dfb-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-02c2ced7-756d-4b85-a1cd-bd6651e89dfb-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-02c2ced7-756d-4b85-a1cd-bd6651e89dfb-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-02c2ced7-756d-4b85-a1cd-bd6651e89dfb-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-0d1f5755-cdde-49da-803c-1ad8f995b8da-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-0d1f5755-cdde-49da-803c-1ad8f995b8da-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-0d1f5755-cdde-49da-803c-1ad8f995b8da-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-0d1f5755-cdde-49da-803c-1ad8f995b8da-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-0e22455f-5650-442f-a094-e1a8b7ed2271-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-0e22455f-5650-442f-a094-e1a8b7ed2271-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-0e22455f-5650-442f-a094-e1a8b7ed2271-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-0e22455f-5650-442f-a094-e1a8b7ed2271-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-17951bea-0d04-43c1-979c-ea1fac19b382-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-17951bea-0d04-43c1-979c-ea1fac19b382-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-17951bea-0d04-43c1-979c-ea1fac19b382-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-17951bea-0d04-43c1-979c-ea1fac19b382-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-63ccacf3-142b-464b-9888-7e1554c64220-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-63ccacf3-142b-464b-9888-7e1554c64220-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-63ccacf3-142b-464b-9888-7e1554c64220-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-63ccacf3-142b-464b-9888-7e1554c64220-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-a3937c44-1b9f-4398-8a6b-08aa0174e7f8-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-a3937c44-1b9f-4398-8a6b-08aa0174e7f8-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-a3937c44-1b9f-4398-8a6b-08aa0174e7f8-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-a3937c44-1b9f-4398-8a6b-08aa0174e7f8-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-c5e9359b-3522-4b41-ae08-af50a20b99a5-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-c5e9359b-3522-4b41-ae08-af50a20b99a5-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-c5e9359b-3522-4b41-ae08-af50a20b99a5-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-c5e9359b-3522-4b41-ae08-af50a20b99a5-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-ce9d03a6-039f-43ef-955f-2843c7f6d7ea-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-ce9d03a6-039f-43ef-955f-2843c7f6d7ea-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-ce9d03a6-039f-43ef-955f-2843c7f6d7ea-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-ce9d03a6-039f-43ef-955f-2843c7f6d7ea-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-e874d364-dd9e-472f-810d-90c9c985f6c8-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-e874d364-dd9e-472f-810d-90c9c985f6c8-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/parquet_struct_statistics/part-00000-e874d364-dd9e-472f-810d-90c9c985f6c8-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/parquet_struct_statistics/part-00000-e874d364-dd9e-472f-810d-90c9c985f6c8-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/part_key=-Infinity/part-00002-00e0efad-b3d9-4d70-ba55-f1d4c83cd675.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/part_key=-Infinity/part-00002-00e0efad-b3d9-4d70-ba55-f1d4c83cd675.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/part_key=-Infinity/part-00002-00e0efad-b3d9-4d70-ba55-f1d4c83cd675.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/part_key=-Infinity/part-00002-00e0efad-b3d9-4d70-ba55-f1d4c83cd675.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/part_key=7.0/part-00000-4b2022d9-27dc-42ce-a3be-1cebb7d303e4.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/part_key=7.0/part-00000-4b2022d9-27dc-42ce-a3be-1cebb7d303e4.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/part_key=7.0/part-00000-4b2022d9-27dc-42ce-a3be-1cebb7d303e4.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/part_key=7.0/part-00000-4b2022d9-27dc-42ce-a3be-1cebb7d303e4.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/part_key=Infinity/part-00003-2cab4d4e-6e68-4e68-9d5e-c29468593af0.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/part_key=Infinity/part-00003-2cab4d4e-6e68-4e68-9d5e-c29468593af0.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/part_key=Infinity/part-00003-2cab4d4e-6e68-4e68-9d5e-c29468593af0.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/part_key=Infinity/part-00003-2cab4d4e-6e68-4e68-9d5e-c29468593af0.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/part_key=NaN/part-00003-74fb7d5c-eda9-48c6-832a-13dd0178ad2e.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/part_key=NaN/part-00003-74fb7d5c-eda9-48c6-832a-13dd0178ad2e.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/part_key=NaN/part-00003-74fb7d5c-eda9-48c6-832a-13dd0178ad2e.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/part_key=NaN/part-00003-74fb7d5c-eda9-48c6-832a-13dd0178ad2e.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/part_key=__HIVE_DEFAULT_PARTITION__/part-00001-0b14a18c-7582-414b-969e-98a9075cf306.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/part_key=__HIVE_DEFAULT_PARTITION__/part-00001-0b14a18c-7582-414b-969e-98a9075cf306.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/part/part_key=__HIVE_DEFAULT_PARTITION__/part-00001-0b14a18c-7582-414b-969e-98a9075cf306.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/part/part_key=__HIVE_DEFAULT_PARTITION__/part-00001-0b14a18c-7582-414b-969e-98a9075cf306.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/t_varchar=a/part-00000-28393939-5f62-4205-99fa-f7a989a197d3.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/t_varchar=a/part-00000-28393939-5f62-4205-99fa-f7a989a197d3.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/t_varchar=a/part-00000-28393939-5f62-4205-99fa-f7a989a197d3.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/t_varchar=a/part-00000-28393939-5f62-4205-99fa-f7a989a197d3.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/t_varchar=b/part-00000-bca61531-f38a-497a-9862-10b978a7ab0b.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/t_varchar=b/part-00000-bca61531-f38a-497a-9862-10b978a7ab0b.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/t_varchar=b/part-00000-bca61531-f38a-497a-9862-10b978a7ab0b.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/t_varchar=b/part-00000-bca61531-f38a-497a-9862-10b978a7ab0b.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/t_varchar=c/part-00000-b44eebb3-7b60-4667-b224-9863cd81ab6b.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/t_varchar=c/part-00000-b44eebb3-7b60-4667-b224-9863cd81ab6b.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/test_partitioning/t_varchar=c/part-00000-b44eebb3-7b60-4667-b224-9863cd81ab6b.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/test_partitioning/t_varchar=c/part-00000-b44eebb3-7b60-4667-b224-9863cd81ab6b.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000000.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000000.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000000.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000000.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000001.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000001.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000001.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000001.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000002.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000002.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000002.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000002.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000003.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000003.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000003.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000003.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000004.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000004.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000004.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000004.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000005.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000005.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000005.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000005.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000006.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000006.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000006.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000006.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000006.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000006.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000006.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000007.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000007.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000007.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000007.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000007.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000007.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000007.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000008.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000008.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000008.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000008.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000008.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000008.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000008.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000008.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000009.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000009.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000009.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000009.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000009.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000009.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000009.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000009.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000010.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000010.checkpoint.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000010.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000010.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000010.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000010.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000010.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000010.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000010.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000010.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000011.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000011.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000011.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000011.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000011.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000011.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000011.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000011.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000012.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000012.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000012.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000012.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000012.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000012.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000012.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000012.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000013.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000013.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000013.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000013.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000013.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000013.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000013.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000013.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000014.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000014.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000014.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000014.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000014.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000014.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000014.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000014.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000015.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000015.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000015.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000015.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000015.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000015.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000015.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000015.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000016.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000016.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000016.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000016.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000016.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000016.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000016.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000016.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000017.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000017.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000017.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000017.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000017.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000017.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/00000000000000000017.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/00000000000000000017.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/_last_checkpoint
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/_delta_log/_last_checkpoint
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/_delta_log/_last_checkpoint
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1900-01-01 00%3A00%3A00/part-00000-53b84700-3193-4a47-ad24-3928690b7643.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1900-01-01 00%3A00%3A00/part-00000-53b84700-3193-4a47-ad24-3928690b7643.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1900-01-01 00%3A00%3A00/part-00000-53b84700-3193-4a47-ad24-3928690b7643.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1900-01-01 00%3A00%3A00/part-00000-53b84700-3193-4a47-ad24-3928690b7643.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1952-04-03 01%3A02%3A03.456789/part-00000-11905402-f412-4aa0-9bb7-a033a6a5c2a4.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1952-04-03 01%3A02%3A03.456789/part-00000-11905402-f412-4aa0-9bb7-a033a6a5c2a4.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1952-04-03 01%3A02%3A03.456789/part-00000-11905402-f412-4aa0-9bb7-a033a6a5c2a4.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1952-04-03 01%3A02%3A03.456789/part-00000-11905402-f412-4aa0-9bb7-a033a6a5c2a4.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1969-12-31 23%3A05%3A00.123456/part-00000-54afe94b-abc3-46fe-875a-99a89e12c4ec.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1969-12-31 23%3A05%3A00.123456/part-00000-54afe94b-abc3-46fe-875a-99a89e12c4ec.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1969-12-31 23%3A05%3A00.123456/part-00000-54afe94b-abc3-46fe-875a-99a89e12c4ec.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1969-12-31 23%3A05%3A00.123456/part-00000-54afe94b-abc3-46fe-875a-99a89e12c4ec.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1970-01-01 00%3A00%3A00/part-00000-1403b99b-7920-4f77-8095-86ce8096704d.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1970-01-01 00%3A00%3A00/part-00000-1403b99b-7920-4f77-8095-86ce8096704d.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1970-01-01 00%3A00%3A00/part-00000-1403b99b-7920-4f77-8095-86ce8096704d.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1970-01-01 00%3A00%3A00/part-00000-1403b99b-7920-4f77-8095-86ce8096704d.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1970-01-01 00%3A05%3A00.123456/part-00000-a6d783a7-e1fc-4914-87c2-7e026180d74b.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1970-01-01 00%3A05%3A00.123456/part-00000-a6d783a7-e1fc-4914-87c2-7e026180d74b.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1970-01-01 00%3A05%3A00.123456/part-00000-a6d783a7-e1fc-4914-87c2-7e026180d74b.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1970-01-01 00%3A05%3A00.123456/part-00000-a6d783a7-e1fc-4914-87c2-7e026180d74b.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1970-01-01 01%3A05%3A00.123456/part-00000-c915c6e2-8458-48ee-bf1f-575f9715f307.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1970-01-01 01%3A05%3A00.123456/part-00000-c915c6e2-8458-48ee-bf1f-575f9715f307.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1970-01-01 01%3A05%3A00.123456/part-00000-c915c6e2-8458-48ee-bf1f-575f9715f307.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1970-01-01 01%3A05%3A00.123456/part-00000-c915c6e2-8458-48ee-bf1f-575f9715f307.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1970-02-03 04%3A05%3A06.789/part-00000-7750833b-13f2-46b9-8f5e-30019fcdc0d2.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1970-02-03 04%3A05%3A06.789/part-00000-7750833b-13f2-46b9-8f5e-30019fcdc0d2.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1970-02-03 04%3A05%3A06.789/part-00000-7750833b-13f2-46b9-8f5e-30019fcdc0d2.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1970-02-03 04%3A05%3A06.789/part-00000-7750833b-13f2-46b9-8f5e-30019fcdc0d2.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1983-03-31 23%3A05%3A00.345678/part-00000-2de3ebdf-cd8a-47fe-93e4-6f6d4bcf49df.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1983-03-31 23%3A05%3A00.345678/part-00000-2de3ebdf-cd8a-47fe-93e4-6f6d4bcf49df.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1983-03-31 23%3A05%3A00.345678/part-00000-2de3ebdf-cd8a-47fe-93e4-6f6d4bcf49df.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1983-03-31 23%3A05%3A00.345678/part-00000-2de3ebdf-cd8a-47fe-93e4-6f6d4bcf49df.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1983-04-01 00%3A05%3A00.345678/part-00000-20183a04-7004-41dd-8c81-7c4e3be5a564.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1983-04-01 00%3A05%3A00.345678/part-00000-20183a04-7004-41dd-8c81-7c4e3be5a564.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1983-04-01 00%3A05%3A00.345678/part-00000-20183a04-7004-41dd-8c81-7c4e3be5a564.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1983-04-01 00%3A05%3A00.345678/part-00000-20183a04-7004-41dd-8c81-7c4e3be5a564.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1983-04-01 01%3A05%3A00.345678/part-00000-98a2ca07-6760-4bd4-91ed-a37dc39a7c2a.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1983-04-01 01%3A05%3A00.345678/part-00000-98a2ca07-6760-4bd4-91ed-a37dc39a7c2a.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1983-04-01 01%3A05%3A00.345678/part-00000-98a2ca07-6760-4bd4-91ed-a37dc39a7c2a.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1983-04-01 01%3A05%3A00.345678/part-00000-98a2ca07-6760-4bd4-91ed-a37dc39a7c2a.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1983-09-30 22%3A59%3A00.654321/part-00000-90ba1b05-3e80-48dc-85fb-ef6b7085863a.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1983-09-30 22%3A59%3A00.654321/part-00000-90ba1b05-3e80-48dc-85fb-ef6b7085863a.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1983-09-30 22%3A59%3A00.654321/part-00000-90ba1b05-3e80-48dc-85fb-ef6b7085863a.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1983-09-30 22%3A59%3A00.654321/part-00000-90ba1b05-3e80-48dc-85fb-ef6b7085863a.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1983-09-30 23%3A59%3A00.654321/part-00000-e3033d59-d718-45ca-ac8b-a2fa769c51b8.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1983-09-30 23%3A59%3A00.654321/part-00000-e3033d59-d718-45ca-ac8b-a2fa769c51b8.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1983-09-30 23%3A59%3A00.654321/part-00000-e3033d59-d718-45ca-ac8b-a2fa769c51b8.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1983-09-30 23%3A59%3A00.654321/part-00000-e3033d59-d718-45ca-ac8b-a2fa769c51b8.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1983-10-01 00%3A59%3A00.654321/part-00000-294b55f0-6916-4600-9086-17516ec11e56.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1983-10-01 00%3A59%3A00.654321/part-00000-294b55f0-6916-4600-9086-17516ec11e56.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1983-10-01 00%3A59%3A00.654321/part-00000-294b55f0-6916-4600-9086-17516ec11e56.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1983-10-01 00%3A59%3A00.654321/part-00000-294b55f0-6916-4600-9086-17516ec11e56.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1996-10-27 00%3A05%3A00.987/part-00000-8c3ec7f5-38a5-4ef3-ba1f-ad5734ac16af.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1996-10-27 00%3A05%3A00.987/part-00000-8c3ec7f5-38a5-4ef3-ba1f-ad5734ac16af.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1996-10-27 00%3A05%3A00.987/part-00000-8c3ec7f5-38a5-4ef3-ba1f-ad5734ac16af.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1996-10-27 00%3A05%3A00.987/part-00000-8c3ec7f5-38a5-4ef3-ba1f-ad5734ac16af.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1996-10-27 01%3A05%3A00.987/part-00000-a947b0c2-6aa8-4da7-8ecf-81bc04c7ec9b.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1996-10-27 01%3A05%3A00.987/part-00000-a947b0c2-6aa8-4da7-8ecf-81bc04c7ec9b.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1996-10-27 01%3A05%3A00.987/part-00000-a947b0c2-6aa8-4da7-8ecf-81bc04c7ec9b.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1996-10-27 01%3A05%3A00.987/part-00000-a947b0c2-6aa8-4da7-8ecf-81bc04c7ec9b.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1996-10-27 02%3A05%3A00.987/part-00000-92af646f-8d26-483e-a7ba-2db048432fe6.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1996-10-27 02%3A05%3A00.987/part-00000-92af646f-8d26-483e-a7ba-2db048432fe6.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=1996-10-27 02%3A05%3A00.987/part-00000-92af646f-8d26-483e-a7ba-2db048432fe6.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=1996-10-27 02%3A05%3A00.987/part-00000-92af646f-8d26-483e-a7ba-2db048432fe6.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=2017-07-01 00%3A00%3A00/part-00000-245cae09-959e-45cd-99f4-0633484076f3.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=2017-07-01 00%3A00%3A00/part-00000-245cae09-959e-45cd-99f4-0633484076f3.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=2017-07-01 00%3A00%3A00/part-00000-245cae09-959e-45cd-99f4-0633484076f3.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=2017-07-01 00%3A00%3A00/part-00000-245cae09-959e-45cd-99f4-0633484076f3.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=9999-12-31 23%3A59%3A59.999999/part-00000-570d8e52-652d-4892-8bdc-7fa5466ffa69.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=9999-12-31 23%3A59%3A59.999999/part-00000-570d8e52-652d-4892-8bdc-7fa5466ffa69.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/timestamp/col_0=UTC/col_1=9999-12-31 23%3A59%3A59.999999/part-00000-570d8e52-652d-4892-8bdc-7fa5466ffa69.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/timestamp/col_0=UTC/col_1=9999-12-31 23%3A59%3A59.999999/part-00000-570d8e52-652d-4892-8bdc-7fa5466ffa69.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/part-00000-3088f542-020d-4074-b24c-16634f0b1c62-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/part-00000-3088f542-020d-4074-b24c-16634f0b1c62-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/part-00000-3088f542-020d-4074-b24c-16634f0b1c62-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/part-00000-3088f542-020d-4074-b24c-16634f0b1c62-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/part-00000-584f8d6d-7e8e-4ba2-8b2c-02ec917b7179-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/part-00000-584f8d6d-7e8e-4ba2-8b2c-02ec917b7179-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/part-00000-584f8d6d-7e8e-4ba2-8b2c-02ec917b7179-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/part-00000-584f8d6d-7e8e-4ba2-8b2c-02ec917b7179-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/part-00000-6622a76a-3107-4f21-9bc7-bece21e24aef-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/part-00000-6622a76a-3107-4f21-9bc7-bece21e24aef-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/part-00000-6622a76a-3107-4f21-9bc7-bece21e24aef-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/part-00000-6622a76a-3107-4f21-9bc7-bece21e24aef-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/part-00000-b7dfce22-3171-499c-b0e8-ee979d5a40ef-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/part-00000-b7dfce22-3171-499c-b0e8-ee979d5a40ef-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_json_statistics/part-00000-b7dfce22-3171-499c-b0e8-ee979d5a40ef-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_json_statistics/part-00000-b7dfce22-3171-499c-b0e8-ee979d5a40ef-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_partitions/ALA=1/part-00000-a2ff44be-f94c-4c1c-8fc0-342c273b22e1.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_partitions/ALA=1/part-00000-a2ff44be-f94c-4c1c-8fc0-342c273b22e1.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_partitions/ALA=1/part-00000-a2ff44be-f94c-4c1c-8fc0-342c273b22e1.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_partitions/ALA=1/part-00000-a2ff44be-f94c-4c1c-8fc0-342c273b22e1.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_partitions/ALA=2/part-00001-efd26171-4ebf-410d-b556-6e18f11acc42.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_partitions/ALA=2/part-00001-efd26171-4ebf-410d-b556-6e18f11acc42.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_partitions/ALA=2/part-00001-efd26171-4ebf-410d-b556-6e18f11acc42.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_partitions/ALA=2/part-00001-efd26171-4ebf-410d-b556-6e18f11acc42.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_partitions/ALA=3/part-00001-51d389f1-c888-4557-9dfd-1a3b47895897.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_partitions/ALA=3/part-00001-51d389f1-c888-4557-9dfd-1a3b47895897.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_partitions/ALA=3/part-00001-51d389f1-c888-4557-9dfd-1a3b47895897.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_partitions/ALA=3/part-00001-51d389f1-c888-4557-9dfd-1a3b47895897.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_partitions/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_partitions/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_partitions/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_partitions/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_partitions/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_partitions/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_partitions/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_partitions/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_partitions/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_partitions/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_partitions/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_partitions/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000006.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000006.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000006.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000007.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000007.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000007.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000008.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000008.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000008.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000008.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000009.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000009.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000009.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000009.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000010.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000010.checkpoint.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000010.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000010.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000010.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/00000000000000000010.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/_last_checkpoint
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/_delta_log/_last_checkpoint
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/_delta_log/_last_checkpoint
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-035e3c9f-e0a2-45df-9cbd-f72c7f466757-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-035e3c9f-e0a2-45df-9cbd-f72c7f466757-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-035e3c9f-e0a2-45df-9cbd-f72c7f466757-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-035e3c9f-e0a2-45df-9cbd-f72c7f466757-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-1bef82fc-7e89-42f1-bf1d-aea11915464d-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-1bef82fc-7e89-42f1-bf1d-aea11915464d-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-1bef82fc-7e89-42f1-bf1d-aea11915464d-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-1bef82fc-7e89-42f1-bf1d-aea11915464d-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-3333ba5b-7e65-4e34-8bc1-cfa6a83bd43a-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-3333ba5b-7e65-4e34-8bc1-cfa6a83bd43a-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-3333ba5b-7e65-4e34-8bc1-cfa6a83bd43a-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-3333ba5b-7e65-4e34-8bc1-cfa6a83bd43a-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-4d4a6969-dfec-42a7-b8f8-ae38a5e81775-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-4d4a6969-dfec-42a7-b8f8-ae38a5e81775-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-4d4a6969-dfec-42a7-b8f8-ae38a5e81775-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-4d4a6969-dfec-42a7-b8f8-ae38a5e81775-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-54033b0c-eae5-4470-acc8-c35d719b95a0-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-54033b0c-eae5-4470-acc8-c35d719b95a0-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-54033b0c-eae5-4470-acc8-c35d719b95a0-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-54033b0c-eae5-4470-acc8-c35d719b95a0-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-6ccf825d-46ea-47be-973c-b3c31ade63da-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-6ccf825d-46ea-47be-973c-b3c31ade63da-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-6ccf825d-46ea-47be-973c-b3c31ade63da-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-6ccf825d-46ea-47be-973c-b3c31ade63da-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-84c719f6-e3c0-4f89-a3cc-ed07aaffc6c3-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-84c719f6-e3c0-4f89-a3cc-ed07aaffc6c3-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-84c719f6-e3c0-4f89-a3cc-ed07aaffc6c3-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-84c719f6-e3c0-4f89-a3cc-ed07aaffc6c3-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-9ea0e2f3-b7f8-434d-8a3a-ba2be3be23a1-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-9ea0e2f3-b7f8-434d-8a3a-ba2be3be23a1-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-9ea0e2f3-b7f8-434d-8a3a-ba2be3be23a1-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-9ea0e2f3-b7f8-434d-8a3a-ba2be3be23a1-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-c6d9240a-af02-4083-bcc6-e147b3acc8a1-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-c6d9240a-af02-4083-bcc6-e147b3acc8a1-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-c6d9240a-af02-4083-bcc6-e147b3acc8a1-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-c6d9240a-af02-4083-bcc6-e147b3acc8a1-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-f46d1642-439e-44e7-a053-9ff458c21d09-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-f46d1642-439e-44e7-a053-9ff458c21d09-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-f46d1642-439e-44e7-a053-9ff458c21d09-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-f46d1642-439e-44e7-a053-9ff458c21d09-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-f9e92025-e4a9-4fbe-89c5-b3d88a2ca720-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-f9e92025-e4a9-4fbe-89c5-b3d88a2ca720-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pruning/uppercase_columns_struct_statistics/part-00000-f9e92025-e4a9-4fbe-89c5-b3d88a2ca720-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pruning/uppercase_columns_struct_statistics/part-00000-f9e92025-e4a9-4fbe-89c5-b3d88a2ca720-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pushdown/custkey_15rowgroups/20210407_195902_00028_j22qr_42605418-6482-4fb9-9417-4fb0762dda2d b/plugin/trino-delta-lake/src/test/resources/databricks73/pushdown/custkey_15rowgroups/20210407_195902_00028_j22qr_42605418-6482-4fb9-9417-4fb0762dda2d
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pushdown/custkey_15rowgroups/20210407_195902_00028_j22qr_42605418-6482-4fb9-9417-4fb0762dda2d
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pushdown/custkey_15rowgroups/20210407_195902_00028_j22qr_42605418-6482-4fb9-9417-4fb0762dda2d
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pushdown/custkey_15rowgroups/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/pushdown/custkey_15rowgroups/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pushdown/custkey_15rowgroups/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pushdown/custkey_15rowgroups/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/pushdown/custkey_15rowgroups/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/pushdown/custkey_15rowgroups/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/pushdown/custkey_15rowgroups/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/pushdown/custkey_15rowgroups/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000000.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000000.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000000.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000000.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000001.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000001.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000001.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000001.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000002.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000002.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000002.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000002.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000003.crc b/plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000003.crc
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000003.crc
rename to plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000003.crc
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/col_0=America%2FBahia_Banderas/col_1=1899-12-31 16%3A59%3A00/col_2=1952-04-02 17%3A02%3A03.456789/col_3=1969-12-31 16%3A00%3A00/col_4=1970-02-02 21%3A05%3A06.789/col_5=2017-06-30 19%3A00%3A00/col_6=1969-12-31 16%3A05%3A00.123456/col_7=1969-12-31 15%3A05%3A00.123456/col_8=1969-12-31 17%3A05%3A00.123456/col_9=1996-10-26 19%3A05%3A00.987/col_10=1996-10-26 18%3A05%3A00.987/col_11=1996-10-26 20%3A05%3A00.987/col_12=1983-03-31 17%3A05%3A00.345678/col_13=1983-03-31 16%3A05%3A00.345678/col_14=1983-03-31 18%3A05%3A00.345678/col_15=1983-09-30 16%3A59%3A00.654321/col_16=1983-09-30 15%3A59%3A00.654321/col_17=1983-09-30 17%3A59%3A00.654321/col_18=9999-12-31 17%3A59%3A59.999999/part-00000-afeef968-a917-4d51-a652-e5a4214df453.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/col_0=America%2FBahia_Banderas/col_1=1899-12-31 16%3A59%3A00/col_2=1952-04-02 17%3A02%3A03.456789/col_3=1969-12-31 16%3A00%3A00/col_4=1970-02-02 21%3A05%3A06.789/col_5=2017-06-30 19%3A00%3A00/col_6=1969-12-31 16%3A05%3A00.123456/col_7=1969-12-31 15%3A05%3A00.123456/col_8=1969-12-31 17%3A05%3A00.123456/col_9=1996-10-26 19%3A05%3A00.987/col_10=1996-10-26 18%3A05%3A00.987/col_11=1996-10-26 20%3A05%3A00.987/col_12=1983-03-31 17%3A05%3A00.345678/col_13=1983-03-31 16%3A05%3A00.345678/col_14=1983-03-31 18%3A05%3A00.345678/col_15=1983-09-30 16%3A59%3A00.654321/col_16=1983-09-30 15%3A59%3A00.654321/col_17=1983-09-30 17%3A59%3A00.654321/col_18=9999-12-31 17%3A59%3A59.999999/part-00000-afeef968-a917-4d51-a652-e5a4214df453.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/col_0=America%2FBahia_Banderas/col_1=1899-12-31 16%3A59%3A00/col_2=1952-04-02 17%3A02%3A03.456789/col_3=1969-12-31 16%3A00%3A00/col_4=1970-02-02 21%3A05%3A06.789/col_5=2017-06-30 19%3A00%3A00/col_6=1969-12-31 16%3A05%3A00.123456/col_7=1969-12-31 15%3A05%3A00.123456/col_8=1969-12-31 17%3A05%3A00.123456/col_9=1996-10-26 19%3A05%3A00.987/col_10=1996-10-26 18%3A05%3A00.987/col_11=1996-10-26 20%3A05%3A00.987/col_12=1983-03-31 17%3A05%3A00.345678/col_13=1983-03-31 16%3A05%3A00.345678/col_14=1983-03-31 18%3A05%3A00.345678/col_15=1983-09-30 16%3A59%3A00.654321/col_16=1983-09-30 15%3A59%3A00.654321/col_17=1983-09-30 17%3A59%3A00.654321/col_18=9999-12-31 17%3A59%3A59.999999/part-00000-afeef968-a917-4d51-a652-e5a4214df453.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/col_0=America%2FBahia_Banderas/col_1=1899-12-31 16%3A59%3A00/col_2=1952-04-02 17%3A02%3A03.456789/col_3=1969-12-31 16%3A00%3A00/col_4=1970-02-02 21%3A05%3A06.789/col_5=2017-06-30 19%3A00%3A00/col_6=1969-12-31 16%3A05%3A00.123456/col_7=1969-12-31 15%3A05%3A00.123456/col_8=1969-12-31 17%3A05%3A00.123456/col_9=1996-10-26 19%3A05%3A00.987/col_10=1996-10-26 18%3A05%3A00.987/col_11=1996-10-26 20%3A05%3A00.987/col_12=1983-03-31 17%3A05%3A00.345678/col_13=1983-03-31 16%3A05%3A00.345678/col_14=1983-03-31 18%3A05%3A00.345678/col_15=1983-09-30 16%3A59%3A00.654321/col_16=1983-09-30 15%3A59%3A00.654321/col_17=1983-09-30 17%3A59%3A00.654321/col_18=9999-12-31 17%3A59%3A59.999999/part-00000-afeef968-a917-4d51-a652-e5a4214df453.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/col_0=Europe%2FVilnius/col_1=1900-01-01 01%3A24%3A00/col_2=1952-04-03 04%3A02%3A03.456789/col_3=1970-01-01 03%3A00%3A00/col_4=1970-02-03 07%3A05%3A06.789/col_5=2017-07-01 03%3A00%3A00/col_6=1970-01-01 03%3A05%3A00.123456/col_7=1970-01-01 02%3A05%3A00.123456/col_8=1970-01-01 04%3A05%3A00.123456/col_9=1996-10-27 03%3A05%3A00.987/col_10=1996-10-27 02%3A05%3A00.987/col_11=1996-10-27 04%3A05%3A00.987/col_12=1983-04-01 04%3A05%3A00.345678/col_13=1983-04-01 03%3A05%3A00.345678/col_14=1983-04-01 05%3A05%3A00.345678/col_15=1983-10-01 02%3A59%3A00.654321/col_16=1983-10-01 01%3A59%3A00.654321/col_17=1983-10-01 03%3A59%3A00.654321/col_18=10000-01-01 01%3A59%3A59.999999/part-00000-b945dfb5-9982-4f86-b903-dabef99caba1.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/col_0=Europe%2FVilnius/col_1=1900-01-01 01%3A24%3A00/col_2=1952-04-03 04%3A02%3A03.456789/col_3=1970-01-01 03%3A00%3A00/col_4=1970-02-03 07%3A05%3A06.789/col_5=2017-07-01 03%3A00%3A00/col_6=1970-01-01 03%3A05%3A00.123456/col_7=1970-01-01 02%3A05%3A00.123456/col_8=1970-01-01 04%3A05%3A00.123456/col_9=1996-10-27 03%3A05%3A00.987/col_10=1996-10-27 02%3A05%3A00.987/col_11=1996-10-27 04%3A05%3A00.987/col_12=1983-04-01 04%3A05%3A00.345678/col_13=1983-04-01 03%3A05%3A00.345678/col_14=1983-04-01 05%3A05%3A00.345678/col_15=1983-10-01 02%3A59%3A00.654321/col_16=1983-10-01 01%3A59%3A00.654321/col_17=1983-10-01 03%3A59%3A00.654321/col_18=10000-01-01 01%3A59%3A59.999999/part-00000-b945dfb5-9982-4f86-b903-dabef99caba1.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/col_0=Europe%2FVilnius/col_1=1900-01-01 01%3A24%3A00/col_2=1952-04-03 04%3A02%3A03.456789/col_3=1970-01-01 03%3A00%3A00/col_4=1970-02-03 07%3A05%3A06.789/col_5=2017-07-01 03%3A00%3A00/col_6=1970-01-01 03%3A05%3A00.123456/col_7=1970-01-01 02%3A05%3A00.123456/col_8=1970-01-01 04%3A05%3A00.123456/col_9=1996-10-27 03%3A05%3A00.987/col_10=1996-10-27 02%3A05%3A00.987/col_11=1996-10-27 04%3A05%3A00.987/col_12=1983-04-01 04%3A05%3A00.345678/col_13=1983-04-01 03%3A05%3A00.345678/col_14=1983-04-01 05%3A05%3A00.345678/col_15=1983-10-01 02%3A59%3A00.654321/col_16=1983-10-01 01%3A59%3A00.654321/col_17=1983-10-01 03%3A59%3A00.654321/col_18=10000-01-01 01%3A59%3A59.999999/part-00000-b945dfb5-9982-4f86-b903-dabef99caba1.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/col_0=Europe%2FVilnius/col_1=1900-01-01 01%3A24%3A00/col_2=1952-04-03 04%3A02%3A03.456789/col_3=1970-01-01 03%3A00%3A00/col_4=1970-02-03 07%3A05%3A06.789/col_5=2017-07-01 03%3A00%3A00/col_6=1970-01-01 03%3A05%3A00.123456/col_7=1970-01-01 02%3A05%3A00.123456/col_8=1970-01-01 04%3A05%3A00.123456/col_9=1996-10-27 03%3A05%3A00.987/col_10=1996-10-27 02%3A05%3A00.987/col_11=1996-10-27 04%3A05%3A00.987/col_12=1983-04-01 04%3A05%3A00.345678/col_13=1983-04-01 03%3A05%3A00.345678/col_14=1983-04-01 05%3A05%3A00.345678/col_15=1983-10-01 02%3A59%3A00.654321/col_16=1983-10-01 01%3A59%3A00.654321/col_17=1983-10-01 03%3A59%3A00.654321/col_18=10000-01-01 01%3A59%3A59.999999/part-00000-b945dfb5-9982-4f86-b903-dabef99caba1.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/col_0=UTC/col_1=1900-01-01 00%3A00%3A00/col_2=1952-04-03 01%3A02%3A03.456789/col_3=1970-01-01 00%3A00%3A00/col_4=1970-02-03 04%3A05%3A06.789/col_5=2017-07-01 00%3A00%3A00/col_6=1970-01-01 00%3A05%3A00.123456/col_7=1969-12-31 23%3A05%3A00.123456/col_8=1970-01-01 01%3A05%3A00.123456/col_9=1996-10-27 01%3A05%3A00.987/col_10=1996-10-27 00%3A05%3A00.987/col_11=1996-10-27 02%3A05%3A00.987/col_12=1983-04-01 00%3A05%3A00.345678/col_13=1983-03-31 23%3A05%3A00.345678/col_14=1983-04-01 01%3A05%3A00.345678/col_15=1983-09-30 23%3A59%3A00.654321/col_16=1983-09-30 22%3A59%3A00.654321/col_17=1983-10-01 00%3A59%3A00.654321/col_18=9999-12-31 23%3A59%3A59.999999/part-00000-721700d2-26d7-42a3-a8f9-b6601628ccd4.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/col_0=UTC/col_1=1900-01-01 00%3A00%3A00/col_2=1952-04-03 01%3A02%3A03.456789/col_3=1970-01-01 00%3A00%3A00/col_4=1970-02-03 04%3A05%3A06.789/col_5=2017-07-01 00%3A00%3A00/col_6=1970-01-01 00%3A05%3A00.123456/col_7=1969-12-31 23%3A05%3A00.123456/col_8=1970-01-01 01%3A05%3A00.123456/col_9=1996-10-27 01%3A05%3A00.987/col_10=1996-10-27 00%3A05%3A00.987/col_11=1996-10-27 02%3A05%3A00.987/col_12=1983-04-01 00%3A05%3A00.345678/col_13=1983-03-31 23%3A05%3A00.345678/col_14=1983-04-01 01%3A05%3A00.345678/col_15=1983-09-30 23%3A59%3A00.654321/col_16=1983-09-30 22%3A59%3A00.654321/col_17=1983-10-01 00%3A59%3A00.654321/col_18=9999-12-31 23%3A59%3A59.999999/part-00000-721700d2-26d7-42a3-a8f9-b6601628ccd4.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/read_timestamps/col_0=UTC/col_1=1900-01-01 00%3A00%3A00/col_2=1952-04-03 01%3A02%3A03.456789/col_3=1970-01-01 00%3A00%3A00/col_4=1970-02-03 04%3A05%3A06.789/col_5=2017-07-01 00%3A00%3A00/col_6=1970-01-01 00%3A05%3A00.123456/col_7=1969-12-31 23%3A05%3A00.123456/col_8=1970-01-01 01%3A05%3A00.123456/col_9=1996-10-27 01%3A05%3A00.987/col_10=1996-10-27 00%3A05%3A00.987/col_11=1996-10-27 02%3A05%3A00.987/col_12=1983-04-01 00%3A05%3A00.345678/col_13=1983-03-31 23%3A05%3A00.345678/col_14=1983-04-01 01%3A05%3A00.345678/col_15=1983-09-30 23%3A59%3A00.654321/col_16=1983-09-30 22%3A59%3A00.654321/col_17=1983-10-01 00%3A59%3A00.654321/col_18=9999-12-31 23%3A59%3A59.999999/part-00000-721700d2-26d7-42a3-a8f9-b6601628ccd4.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/read_timestamps/col_0=UTC/col_1=1900-01-01 00%3A00%3A00/col_2=1952-04-03 01%3A02%3A03.456789/col_3=1970-01-01 00%3A00%3A00/col_4=1970-02-03 04%3A05%3A06.789/col_5=2017-07-01 00%3A00%3A00/col_6=1970-01-01 00%3A05%3A00.123456/col_7=1969-12-31 23%3A05%3A00.123456/col_8=1970-01-01 01%3A05%3A00.123456/col_9=1996-10-27 01%3A05%3A00.987/col_10=1996-10-27 00%3A05%3A00.987/col_11=1996-10-27 02%3A05%3A00.987/col_12=1983-04-01 00%3A05%3A00.345678/col_13=1983-03-31 23%3A05%3A00.345678/col_14=1983-04-01 01%3A05%3A00.345678/col_15=1983-09-30 23%3A59%3A00.654321/col_16=1983-09-30 22%3A59%3A00.654321/col_17=1983-10-01 00%3A59%3A00.654321/col_18=9999-12-31 23%3A59%3A59.999999/part-00000-721700d2-26d7-42a3-a8f9-b6601628ccd4.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000006.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000006.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000006.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000007.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000007.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000007.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000008.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000008.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000008.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000008.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000009.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000009.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000009.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000009.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000010.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000010.checkpoint.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000010.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000010.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/00000000000000000010.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/00000000000000000010.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/_last_checkpoint
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/_delta_log/_last_checkpoint
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/_delta_log/_last_checkpoint
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-132cb407-0f83-4b06-9dc6-639f23baba79-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-132cb407-0f83-4b06-9dc6-639f23baba79-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-132cb407-0f83-4b06-9dc6-639f23baba79-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-132cb407-0f83-4b06-9dc6-639f23baba79-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-39aadeb3-8017-49b0-97cd-ed068caee353-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-39aadeb3-8017-49b0-97cd-ed068caee353-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-39aadeb3-8017-49b0-97cd-ed068caee353-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-39aadeb3-8017-49b0-97cd-ed068caee353-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-8f003f1f-2c6e-4a0b-a848-3f7e2ab1aa02-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-8f003f1f-2c6e-4a0b-a848-3f7e2ab1aa02-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-8f003f1f-2c6e-4a0b-a848-3f7e2ab1aa02-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-8f003f1f-2c6e-4a0b-a848-3f7e2ab1aa02-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-9542caf8-bad7-4cd5-9621-4e756b6767d7-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-9542caf8-bad7-4cd5-9621-4e756b6767d7-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-9542caf8-bad7-4cd5-9621-4e756b6767d7-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-9542caf8-bad7-4cd5-9621-4e756b6767d7-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-a956ee76-bb52-49f2-8ddc-8bae79a3a44f-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-a956ee76-bb52-49f2-8ddc-8bae79a3a44f-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-a956ee76-bb52-49f2-8ddc-8bae79a3a44f-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-a956ee76-bb52-49f2-8ddc-8bae79a3a44f-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-b4942635-7f3f-45f2-8d4d-c11e34d4a399-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-b4942635-7f3f-45f2-8d4d-c11e34d4a399-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-b4942635-7f3f-45f2-8d4d-c11e34d4a399-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-b4942635-7f3f-45f2-8d4d-c11e34d4a399-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-b54dbea5-ad33-4bb9-93e4-889dbbf666ce-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-b54dbea5-ad33-4bb9-93e4-889dbbf666ce-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-b54dbea5-ad33-4bb9-93e4-889dbbf666ce-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-b54dbea5-ad33-4bb9-93e4-889dbbf666ce-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-bbf9df63-ac4d-439e-b0a2-3e8a0e35c436-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-bbf9df63-ac4d-439e-b0a2-3e8a0e35c436-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-bbf9df63-ac4d-439e-b0a2-3e8a0e35c436-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-bbf9df63-ac4d-439e-b0a2-3e8a0e35c436-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-cd9819d1-1410-45d9-82e6-b2c35aea723f-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-cd9819d1-1410-45d9-82e6-b2c35aea723f-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-cd9819d1-1410-45d9-82e6-b2c35aea723f-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-cd9819d1-1410-45d9-82e6-b2c35aea723f-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-d7e268e6-197c-4e9e-a8c4-03ad0c6ab228-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-d7e268e6-197c-4e9e-a8c4-03ad0c6ab228-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_ending_on_checkpoint/part-00000-d7e268e6-197c-4e9e-a8c4-03ad0c6ab228-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_ending_on_checkpoint/part-00000-d7e268e6-197c-4e9e-a8c4-03ad0c6ab228-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000006.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000006.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000006.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000007.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000007.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000007.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000008.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000008.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000008.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000008.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000009.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000009.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000009.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000009.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000010.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000010.checkpoint.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000010.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000010.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000010.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000010.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000011.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000011.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/00000000000000000011.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/00000000000000000011.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/_last_checkpoint
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/_delta_log/_last_checkpoint
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/_delta_log/_last_checkpoint
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-132cb407-0f83-4b06-9dc6-639f23baba79-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-132cb407-0f83-4b06-9dc6-639f23baba79-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-132cb407-0f83-4b06-9dc6-639f23baba79-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-132cb407-0f83-4b06-9dc6-639f23baba79-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-39aadeb3-8017-49b0-97cd-ed068caee353-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-39aadeb3-8017-49b0-97cd-ed068caee353-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-39aadeb3-8017-49b0-97cd-ed068caee353-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-39aadeb3-8017-49b0-97cd-ed068caee353-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-4ae6c4f5-a00a-4d72-8e19-8fb58e5374ec-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-4ae6c4f5-a00a-4d72-8e19-8fb58e5374ec-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-4ae6c4f5-a00a-4d72-8e19-8fb58e5374ec-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-4ae6c4f5-a00a-4d72-8e19-8fb58e5374ec-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-8f003f1f-2c6e-4a0b-a848-3f7e2ab1aa02-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-8f003f1f-2c6e-4a0b-a848-3f7e2ab1aa02-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-8f003f1f-2c6e-4a0b-a848-3f7e2ab1aa02-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-8f003f1f-2c6e-4a0b-a848-3f7e2ab1aa02-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-9542caf8-bad7-4cd5-9621-4e756b6767d7-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-9542caf8-bad7-4cd5-9621-4e756b6767d7-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-9542caf8-bad7-4cd5-9621-4e756b6767d7-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-9542caf8-bad7-4cd5-9621-4e756b6767d7-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-a956ee76-bb52-49f2-8ddc-8bae79a3a44f-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-a956ee76-bb52-49f2-8ddc-8bae79a3a44f-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-a956ee76-bb52-49f2-8ddc-8bae79a3a44f-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-a956ee76-bb52-49f2-8ddc-8bae79a3a44f-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-b4942635-7f3f-45f2-8d4d-c11e34d4a399-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-b4942635-7f3f-45f2-8d4d-c11e34d4a399-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-b4942635-7f3f-45f2-8d4d-c11e34d4a399-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-b4942635-7f3f-45f2-8d4d-c11e34d4a399-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-b54dbea5-ad33-4bb9-93e4-889dbbf666ce-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-b54dbea5-ad33-4bb9-93e4-889dbbf666ce-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-b54dbea5-ad33-4bb9-93e4-889dbbf666ce-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-b54dbea5-ad33-4bb9-93e4-889dbbf666ce-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-bbf9df63-ac4d-439e-b0a2-3e8a0e35c436-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-bbf9df63-ac4d-439e-b0a2-3e8a0e35c436-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-bbf9df63-ac4d-439e-b0a2-3e8a0e35c436-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-bbf9df63-ac4d-439e-b0a2-3e8a0e35c436-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-cd9819d1-1410-45d9-82e6-b2c35aea723f-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-cd9819d1-1410-45d9-82e6-b2c35aea723f-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-cd9819d1-1410-45d9-82e6-b2c35aea723f-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-cd9819d1-1410-45d9-82e6-b2c35aea723f-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-d7e268e6-197c-4e9e-a8c4-03ad0c6ab228-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-d7e268e6-197c-4e9e-a8c4-03ad0c6ab228-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_past_checkpoint/part-00000-d7e268e6-197c-4e9e-a8c4-03ad0c6ab228-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_past_checkpoint/part-00000-d7e268e6-197c-4e9e-a8c4-03ad0c6ab228-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000006.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000006.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000006.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000007.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000007.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000007.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000008.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000008.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000008.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000008.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000009.json b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000009.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/_delta_log/00000000000000000009.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/_delta_log/00000000000000000009.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-132cb407-0f83-4b06-9dc6-639f23baba79-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-132cb407-0f83-4b06-9dc6-639f23baba79-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-132cb407-0f83-4b06-9dc6-639f23baba79-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-132cb407-0f83-4b06-9dc6-639f23baba79-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-39aadeb3-8017-49b0-97cd-ed068caee353-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-39aadeb3-8017-49b0-97cd-ed068caee353-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-39aadeb3-8017-49b0-97cd-ed068caee353-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-39aadeb3-8017-49b0-97cd-ed068caee353-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-9542caf8-bad7-4cd5-9621-4e756b6767d7-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-9542caf8-bad7-4cd5-9621-4e756b6767d7-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-9542caf8-bad7-4cd5-9621-4e756b6767d7-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-9542caf8-bad7-4cd5-9621-4e756b6767d7-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-a956ee76-bb52-49f2-8ddc-8bae79a3a44f-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-a956ee76-bb52-49f2-8ddc-8bae79a3a44f-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-a956ee76-bb52-49f2-8ddc-8bae79a3a44f-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-a956ee76-bb52-49f2-8ddc-8bae79a3a44f-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-b4942635-7f3f-45f2-8d4d-c11e34d4a399-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-b4942635-7f3f-45f2-8d4d-c11e34d4a399-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-b4942635-7f3f-45f2-8d4d-c11e34d4a399-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-b4942635-7f3f-45f2-8d4d-c11e34d4a399-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-b54dbea5-ad33-4bb9-93e4-889dbbf666ce-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-b54dbea5-ad33-4bb9-93e4-889dbbf666ce-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-b54dbea5-ad33-4bb9-93e4-889dbbf666ce-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-b54dbea5-ad33-4bb9-93e4-889dbbf666ce-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-bbf9df63-ac4d-439e-b0a2-3e8a0e35c436-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-bbf9df63-ac4d-439e-b0a2-3e8a0e35c436-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-bbf9df63-ac4d-439e-b0a2-3e8a0e35c436-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-bbf9df63-ac4d-439e-b0a2-3e8a0e35c436-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-cd9819d1-1410-45d9-82e6-b2c35aea723f-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-cd9819d1-1410-45d9-82e6-b2c35aea723f-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-cd9819d1-1410-45d9-82e6-b2c35aea723f-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-cd9819d1-1410-45d9-82e6-b2c35aea723f-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-d7e268e6-197c-4e9e-a8c4-03ad0c6ab228-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-d7e268e6-197c-4e9e-a8c4-03ad0c6ab228-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/simple_table_without_checkpoint/part-00000-d7e268e6-197c-4e9e-a8c4-03ad0c6ab228-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/simple_table_without_checkpoint/part-00000-d7e268e6-197c-4e9e-a8c4-03ad0c6ab228-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uppercase_columns/ALA=1/part-00000-20a863e0-890d-4776-8825-f9dccc8973ba.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/uppercase_columns/ALA=1/part-00000-20a863e0-890d-4776-8825-f9dccc8973ba.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uppercase_columns/ALA=1/part-00000-20a863e0-890d-4776-8825-f9dccc8973ba.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/uppercase_columns/ALA=1/part-00000-20a863e0-890d-4776-8825-f9dccc8973ba.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uppercase_columns/ALA=1/part-00001-8d561a88-21d7-49de-9311-6b7af3a5f0cf.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/uppercase_columns/ALA=1/part-00001-8d561a88-21d7-49de-9311-6b7af3a5f0cf.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uppercase_columns/ALA=1/part-00001-8d561a88-21d7-49de-9311-6b7af3a5f0cf.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/uppercase_columns/ALA=1/part-00001-8d561a88-21d7-49de-9311-6b7af3a5f0cf.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uppercase_columns/ALA=2/part-00001-24bc0846-e2b9-4fd7-9a7f-e0b418125932.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/databricks73/uppercase_columns/ALA=2/part-00001-24bc0846-e2b9-4fd7-9a7f-e0b418125932.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uppercase_columns/ALA=2/part-00001-24bc0846-e2b9-4fd7-9a7f-e0b418125932.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/databricks73/uppercase_columns/ALA=2/part-00001-24bc0846-e2b9-4fd7-9a7f-e0b418125932.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uppercase_columns/README.md b/plugin/trino-delta-lake/src/test/resources/databricks73/uppercase_columns/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uppercase_columns/README.md
rename to plugin/trino-delta-lake/src/test/resources/databricks73/uppercase_columns/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uppercase_columns/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/databricks73/uppercase_columns/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uppercase_columns/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/uppercase_columns/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uppercase_columns/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/databricks73/uppercase_columns/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uppercase_columns/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/databricks73/uppercase_columns/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/case_sensitive/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/case_sensitive/README.md
new file mode 100644
index 000000000000..09c1adb9c3e5
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/case_sensitive/README.md
@@ -0,0 +1,9 @@
+Data generated using OSS Delta Lake:
+
+```sql
+CREATE TABLE default.test
+(UPPER_CASE INT, PART INT)
+USING delta
+PARTITIONED BY (PART)
+LOCATION 's3://trino-ci-test/test'
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/case_sensitive/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/case_sensitive/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..7720098a3a03
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/case_sensitive/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1689680754872,"operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[\"PART\"]","properties":"{}"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Apache-Spark/3.3.2 Delta-Lake/2.3.0","txnId":"50d7d8f1-2ef7-441b-89e3-387ab101afdc"}}
+{"protocol":{"minReaderVersion":1,"minWriterVersion":2}}
+{"metaData":{"id":"7475e612-3759-4242-a688-c3cd872250d9","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"UPPER_CASE\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}},{\"name\":\"PART\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}}]}","partitionColumns":["PART"],"configuration":{},"createdTime":1689680754846}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/column_mapping_mode_id/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/column_mapping_mode_id/README.md
new file mode 100644
index 000000000000..6b6d486030cf
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/column_mapping_mode_id/README.md
@@ -0,0 +1,9 @@
+Data generated using OSS Delta Lake 2.3.0:
+
+```sql
+CREATE TABLE default.test 
+(x INT)
+USING delta
+LOCATION 's3://trino-ci-test/test'
+TBLPROPERTIES ('delta.columnMapping.mode' = 'id')
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/column_mapping_mode_id/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/column_mapping_mode_id/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..21a7d4f62b1b
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/column_mapping_mode_id/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1683522775322,"operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{\"delta.columnMapping.mode\":\"id\"}"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Apache-Spark/3.3.2 Delta-Lake/2.3.0","txnId":"0978e91a-4563-4a73-bf01-0f9dbd1f2bcd"}}
+{"protocol":{"minReaderVersion":2,"minWriterVersion":5}}
+{"metaData":{"id":"0c00f0e4-ce2b-4c7c-8cfd-27236c1b53a7","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"x\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":1,\"delta.columnMapping.physicalName\":\"col-326cdfa5-a117-4c98-b616-8f0080113b6b\"}}]}","partitionColumns":[],"configuration":{"delta.columnMapping.mode":"id","delta.columnMapping.maxColumnId":"1"},"createdTime":1683522775301}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/column_mapping_mode_name/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/column_mapping_mode_name/README.md
new file mode 100644
index 000000000000..4ac31fe0d5fd
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/column_mapping_mode_name/README.md
@@ -0,0 +1,9 @@
+Data generated using OSS Delta Lake 2.3.0:
+
+```sql
+CREATE TABLE default.test 
+(x INT)
+USING delta
+LOCATION 's3://trino-ci-test/test'
+TBLPROPERTIES ('delta.columnMapping.mode' = 'name')
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/column_mapping_mode_name/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/column_mapping_mode_name/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..ad5dfb1f8cee
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/column_mapping_mode_name/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1682750971045,"operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{\"delta.columnMapping.mode\":\"name\"}"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Apache-Spark/3.3.2 Delta-Lake/2.3.0","txnId":"2772694c-915a-4e06-88d0-f835b03fb1fd"}}
+{"protocol":{"minReaderVersion":2,"minWriterVersion":5}}
+{"metaData":{"id":"41fc8393-f206-47d0-95e2-3dcdfabf0947","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"x\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":1,\"delta.columnMapping.physicalName\":\"col-10dfd702-5125-4311-953a-946248cd1bbb\"}}]}","partitionColumns":[],"configuration":{"delta.columnMapping.mode":"name","delta.columnMapping.maxColumnId":"1"},"createdTime":1682750971018}}
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/invariants/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/invariants/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/invariants/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/deltalake/invariants/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/invariants/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/deltalake/invariants/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/invariants/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/deltalake/invariants/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/invariants/part-00000-ad851560-07d0-4bdf-a850-54c6e8211e4f-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/invariants/part-00000-ad851560-07d0-4bdf-a850-54c6e8211e4f-c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/invariants/part-00000-ad851560-07d0-4bdf-a850-54c6e8211e4f-c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/deltalake/invariants/part-00000-ad851560-07d0-4bdf-a850-54c6e8211e4f-c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/README.md
new file mode 100644
index 000000000000..99d540dbca44
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/README.md
@@ -0,0 +1,28 @@
+Data generated using Apache Spark 3.4.0 & Delta Lake OSS 2.4.0.
+
+This test resource is used to verify whether the reading from Delta Lake tables with 
+multi-part checkpoint files works as expected.
+
+Trino
+```
+CREATE TABLE multipartcheckpoint(c integer) with (checkpoint_interval = 6);
+```
+
+From https://docs.delta.io/latest/optimizations-oss.html
+
+> In Delta Lake, by default each checkpoint is written as a single Parquet file. To to use this feature, 
+> set the SQL configuration ``spark.databricks.delta.checkpoint.partSize=<n>``, where n is the limit of 
+> number of actions (such as `AddFile`) at which Delta Lake on Apache Spark will start parallelizing the 
+> checkpoint and attempt to write a maximum of this many actions per checkpoint file.
+
+Spark
+```
+SET spark.databricks.delta.checkpoint.partSize=3;
+INSERT INTO multipartcheckpoint values 1;
+INSERT INTO multipartcheckpoint values 2;
+INSERT INTO multipartcheckpoint values 3;
+INSERT INTO multipartcheckpoint values 4;
+INSERT INTO multipartcheckpoint values 5;
+INSERT INTO multipartcheckpoint values 6;
+INSERT INTO multipartcheckpoint values 7;
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..ba5929dec80d
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"version":0,"timestamp":1697439143958,"userId":"marius","userName":"marius","operation":"CREATE TABLE","operationParameters":{"queryId":"20231016_065223_00001_dhwpa"},"clusterId":"trino-428-191-g91ee252-presto-master","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true}}
+{"protocol":{"minReaderVersion":1,"minWriterVersion":2}}
+{"metaData":{"id":"ce0eab6c-75a5-4904-9f90-2fe73bedf1ce","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"c\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}}]}","partitionColumns":[],"configuration":{"delta.checkpointInterval":"6"},"createdTime":1697439143958}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000001.json
new file mode 100644
index 000000000000..6f728af0f9e0
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000001.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1697439172229,"operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"readVersion":0,"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"1","numOutputBytes":"449"},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"ff40545b-ceb7-4836-8b35-a2147cf21677"}}
+{"add":{"path":"part-00000-81f5948d-6e60-4582-b758-2424da5aef0f-c000.snappy.parquet","partitionValues":{},"size":449,"modificationTime":1697439172000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"c\":1},\"maxValues\":{\"c\":1},\"nullCount\":{\"c\":0}}"}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000002.json
new file mode 100644
index 000000000000..72ec0c619113
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000002.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1697439178642,"operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"readVersion":1,"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"1","numOutputBytes":"449"},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"e730895b-9e56-4738-90fb-ce62ab08f3b1"}}
+{"add":{"path":"part-00000-4a4be67a-1d35-4c93-ac3d-c1b26e2c5f3a-c000.snappy.parquet","partitionValues":{},"size":449,"modificationTime":1697439178000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"c\":2},\"maxValues\":{\"c\":2},\"nullCount\":{\"c\":0}}"}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000003.json
new file mode 100644
index 000000000000..5ce98ef913c7
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000003.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1697439181640,"operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"readVersion":2,"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"1","numOutputBytes":"449"},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"0ee530c2-daef-4e2e-b2ad-de64e3e7b940"}}
+{"add":{"path":"part-00000-aeede0e4-d6fd-4425-ab3e-be80963fe765-c000.snappy.parquet","partitionValues":{},"size":449,"modificationTime":1697439181000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"c\":3},\"maxValues\":{\"c\":3},\"nullCount\":{\"c\":0}}"}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000004.json
new file mode 100644
index 000000000000..8a079b24cc25
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000004.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1697439185136,"operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"readVersion":3,"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"1","numOutputBytes":"449"},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"3b236730-8187-4d5d-9c2e-ecb281788a15"}}
+{"add":{"path":"part-00000-30d20302-2223-4370-b4ec-9129845af85d-c000.snappy.parquet","partitionValues":{},"size":449,"modificationTime":1697439185000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"c\":4},\"maxValues\":{\"c\":4},\"nullCount\":{\"c\":0}}"}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000005.json
new file mode 100644
index 000000000000..92ad5eba1c9a
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000005.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1697439189907,"operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"readVersion":4,"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"1","numOutputBytes":"449"},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"1df6e97f-ab4c-4f6d-ac90-48f2e8d0086b"}}
+{"add":{"path":"part-00000-68d36678-1302-4d91-a23d-1049d2630b60-c000.snappy.parquet","partitionValues":{},"size":449,"modificationTime":1697439189000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"c\":5},\"maxValues\":{\"c\":5},\"nullCount\":{\"c\":0}}"}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000006.checkpoint.0000000001.0000000002.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000006.checkpoint.0000000001.0000000002.parquet
new file mode 100644
index 000000000000..5a8652e15f98
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000006.checkpoint.0000000001.0000000002.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000006.checkpoint.0000000002.0000000002.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000006.checkpoint.0000000002.0000000002.parquet
new file mode 100644
index 000000000000..fc88d59544d6
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000006.checkpoint.0000000002.0000000002.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000006.json b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000006.json
new file mode 100644
index 000000000000..94cd9a799777
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000006.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1697439194248,"operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"readVersion":5,"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"1","numOutputBytes":"449"},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"c757b395-39ce-4007-871f-b648423ec886"}}
+{"add":{"path":"part-00000-c2ea82b3-cbf3-413a-ade1-409a1ce69d9c-c000.snappy.parquet","partitionValues":{},"size":449,"modificationTime":1697439194000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"c\":6},\"maxValues\":{\"c\":6},\"nullCount\":{\"c\":0}}"}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000007.json b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000007.json
new file mode 100644
index 000000000000..60e3daf0a5a0
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/00000000000000000007.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1697439206526,"operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"readVersion":6,"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"1","numOutputBytes":"449"},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"692e911c-78a9-4e97-9fdd-5e2bf33c7a2a"}}
+{"add":{"path":"part-00000-07432bff-a65c-4b96-8775-074e4e99e771-c000.snappy.parquet","partitionValues":{},"size":449,"modificationTime":1697439206000,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"c\":7},\"maxValues\":{\"c\":7},\"nullCount\":{\"c\":0}}"}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/_last_checkpoint
new file mode 100644
index 000000000000..e5d513c4df3a
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/_delta_log/_last_checkpoint
@@ -0,0 +1 @@
+{"version":6,"size":8,"parts":2,"sizeInBytes":27011,"numOfAddFiles":6,"checkpointSchema":{"type":"struct","fields":[{"name":"txn","type":{"type":"struct","fields":[{"name":"appId","type":"string","nullable":true,"metadata":{}},{"name":"version","type":"long","nullable":true,"metadata":{}},{"name":"lastUpdated","type":"long","nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}},{"name":"add","type":{"type":"struct","fields":[{"name":"path","type":"string","nullable":true,"metadata":{}},{"name":"partitionValues","type":{"type":"map","keyType":"string","valueType":"string","valueContainsNull":true},"nullable":true,"metadata":{}},{"name":"size","type":"long","nullable":true,"metadata":{}},{"name":"modificationTime","type":"long","nullable":true,"metadata":{}},{"name":"dataChange","type":"boolean","nullable":true,"metadata":{}},{"name":"tags","type":{"type":"map","keyType":"string","valueType":"string","valueContainsNull":true},"nullable":true,"metadata":{}},{"name":"deletionVector","type":{"type":"struct","fields":[{"name":"storageType","type":"string","nullable":true,"metadata":{}},{"name":"pathOrInlineDv","type":"string","nullable":true,"metadata":{}},{"name":"offset","type":"integer","nullable":true,"metadata":{}},{"name":"sizeInBytes","type":"integer","nullable":true,"metadata":{}},{"name":"cardinality","type":"long","nullable":true,"metadata":{}},{"name":"maxRowIndex","type":"long","nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}},{"name":"stats","type":"string","nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}},{"name":"remove","type":{"type":"struct","fields":[{"name":"path","type":"string","nullable":true,"metadata":{}},{"name":"deletionTimestamp","type":"long","nullable":true,"metadata":{}},{"name":"dataChange","type":"boolean","nullable":true,"metadata":{}},{"name":"extendedFileMetadata","type":"boolean","nullable":true,"metadata":{}},{"name":"partitionValues","type":{"type":"map","keyType":"string","valueType":"string","valueContainsNull":true},"nullable":true,"metadata":{}},{"name":"size","type":"long","nullable":true,"metadata":{}},{"name":"deletionVector","type":{"type":"struct","fields":[{"name":"storageType","type":"string","nullable":true,"metadata":{}},{"name":"pathOrInlineDv","type":"string","nullable":true,"metadata":{}},{"name":"offset","type":"integer","nullable":true,"metadata":{}},{"name":"sizeInBytes","type":"integer","nullable":true,"metadata":{}},{"name":"cardinality","type":"long","nullable":true,"metadata":{}},{"name":"maxRowIndex","type":"long","nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}},{"name":"metaData","type":{"type":"struct","fields":[{"name":"id","type":"string","nullable":true,"metadata":{}},{"name":"name","type":"string","nullable":true,"metadata":{}},{"name":"description","type":"string","nullable":true,"metadata":{}},{"name":"format","type":{"type":"struct","fields":[{"name":"provider","type":"string","nullable":true,"metadata":{}},{"name":"options","type":{"type":"map","keyType":"string","valueType":"string","valueContainsNull":true},"nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}},{"name":"schemaString","type":"string","nullable":true,"metadata":{}},{"name":"partitionColumns","type":{"type":"array","elementType":"string","containsNull":true},"nullable":true,"metadata":{}},{"name":"configuration","type":{"type":"map","keyType":"string","valueType":"string","valueContainsNull":true},"nullable":true,"metadata":{}},{"name":"createdTime","type":"long","nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}},{"name":"protocol","type":{"type":"struct","fields":[{"name":"minReaderVersion","type":"integer","nullable":true,"metadata":{}},{"name":"minWriterVersion","type":"integer","nullable":true,"metadata":{}},{"name":"readerFeatures","type":{"type":"array","elementType":"string","containsNull":true},"nullable":true,"metadata":{}},{"name":"writerFeatures","type":{"type":"array","elementType":"string","containsNull":true},"nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}}]},"checksum":"e3aeff08e804e2c1d2d8367707f7efca"}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-07432bff-a65c-4b96-8775-074e4e99e771-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-07432bff-a65c-4b96-8775-074e4e99e771-c000.snappy.parquet
new file mode 100644
index 000000000000..8cd919e54929
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-07432bff-a65c-4b96-8775-074e4e99e771-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-30d20302-2223-4370-b4ec-9129845af85d-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-30d20302-2223-4370-b4ec-9129845af85d-c000.snappy.parquet
new file mode 100644
index 000000000000..6bbd485721bf
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-30d20302-2223-4370-b4ec-9129845af85d-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-4a4be67a-1d35-4c93-ac3d-c1b26e2c5f3a-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-4a4be67a-1d35-4c93-ac3d-c1b26e2c5f3a-c000.snappy.parquet
new file mode 100644
index 000000000000..07e176899a7b
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-4a4be67a-1d35-4c93-ac3d-c1b26e2c5f3a-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-68d36678-1302-4d91-a23d-1049d2630b60-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-68d36678-1302-4d91-a23d-1049d2630b60-c000.snappy.parquet
new file mode 100644
index 000000000000..08abfd031ef1
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-68d36678-1302-4d91-a23d-1049d2630b60-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-81f5948d-6e60-4582-b758-2424da5aef0f-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-81f5948d-6e60-4582-b758-2424da5aef0f-c000.snappy.parquet
new file mode 100644
index 000000000000..60fa1ce9a490
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-81f5948d-6e60-4582-b758-2424da5aef0f-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-aeede0e4-d6fd-4425-ab3e-be80963fe765-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-aeede0e4-d6fd-4425-ab3e-be80963fe765-c000.snappy.parquet
new file mode 100644
index 000000000000..a4045cfbcc4c
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-aeede0e4-d6fd-4425-ab3e-be80963fe765-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-c2ea82b3-cbf3-413a-ade1-409a1ce69d9c-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-c2ea82b3-cbf3-413a-ade1-409a1ce69d9c-c000.snappy.parquet
new file mode 100644
index 000000000000..92a77908f855
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/multipart_checkpoint/part-00000-c2ea82b3-cbf3-413a-ade1-409a1ce69d9c-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/README.md
new file mode 100644
index 000000000000..9141a22fa262
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/README.md
@@ -0,0 +1,25 @@
+Data generated using OSS Delta Lake 2.4.0 on Spark 3.4.0:
+
+```
+bin/spark-sql --packages io.delta:delta-core_2.12:2.4.0 \
+  --conf "spark.sql.extensions=io.delta.sql.DeltaSparkSessionExtension" \
+  --conf "spark.sql.catalog.spark_catalog=org.apache.spark.sql.delta.catalog.DeltaCatalog" \
+  --conf "spark.sql.jsonGenerator.ignoreNullFields=false" \
+  --conf "spark.sql.shuffle.partitions=1"
+```
+
+```sql
+CREATE TABLE delta.`/tmp/stats-with-minmax-nulls`
+USING DELTA
+TBLPROPERTIES('delta.checkpointInterval' = 2) AS
+SELECT /*+ REPARTITION(1) */ col1 as id, col2 as id2 FROM VALUES (0, 1),(1,2),(3, 4);
+
+INSERT INTO delta.`/tmp/stats-with-minmax-nulls` SELECT null, null;
+
+-- creates checkpoint
+-- Checkpoint file contains stats with min and max values as null
+-- .stats = {"numRecords":1,"minValues":{"id":null,"id2":null},"maxValues":{"id":null,"id2":null},"nullCount":{"id":1,"id2":1}}
+INSERT INTO delta.`/tmp/stats-with-minmax-nulls` SELECT 3, 7;
+
+INSERT INTO delta.`/tmp/stats-with-minmax-nulls` SELECT null, null;
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..8e733dd67cbe
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000000.json
@@ -0,0 +1,4 @@
+{"commitInfo":{"timestamp":1693934201274,"operation":"CREATE TABLE AS SELECT","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{\"delta.checkpointInterval\":\"2\"}"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"3","numOutputBytes":"691"},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"2459a754-928b-466c-9f40-3808106087e0"}}
+{"protocol":{"minReaderVersion":1,"minWriterVersion":2}}
+{"metaData":{"id":"07d79c56-8838-4e02-8fcc-a0768e2dcc74","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"id\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}},{\"name\":\"id2\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}}]}","partitionColumns":[],"configuration":{"delta.checkpointInterval":"2"},"createdTime":1693934199351}}
+{"add":{"path":"part-00000-6951e6ec-f8d3-4d17-9154-621a959a63d1-c000.snappy.parquet","partitionValues":{},"size":691,"modificationTime":1693934201197,"dataChange":true,"stats":"{\"numRecords\":3,\"minValues\":{\"id\":0,\"id2\":1},\"maxValues\":{\"id\":3,\"id2\":4},\"nullCount\":{\"id\":0,\"id2\":0}}"}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000001.json
new file mode 100644
index 000000000000..493f81276ab0
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000001.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1693934211471,"operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"readVersion":0,"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"1","numOutputBytes":"601"},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"af16e667-e54c-48dd-b47e-d03ada698276"}}
+{"add":{"path":"part-00000-c5c7f285-c008-4bc9-897e-5e6296ca92fa-c000.snappy.parquet","partitionValues":{},"size":601,"modificationTime":1693934211462,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"id\":null,\"id2\":null},\"maxValues\":{\"id\":null,\"id2\":null},\"nullCount\":{\"id\":1,\"id2\":1}}"}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000002.checkpoint.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000002.checkpoint.parquet
new file mode 100644
index 000000000000..d43aa2b8ad2c
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000002.checkpoint.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000002.json
new file mode 100644
index 000000000000..c7382610538a
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000002.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1693934216325,"operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"readVersion":1,"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"1","numOutputBytes":"675"},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"cf39a8af-c21b-4214-b10d-87c06ec0e816"}}
+{"add":{"path":"part-00000-0199254b-146e-48bb-afe8-a7e9be067d2c-c000.snappy.parquet","partitionValues":{},"size":675,"modificationTime":1693934216320,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"id\":3,\"id2\":7},\"maxValues\":{\"id\":3,\"id2\":7},\"nullCount\":{\"id\":0,\"id2\":0}}"}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000003.json
new file mode 100644
index 000000000000..49da5f040444
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/00000000000000000003.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"timestamp":1693934220075,"operation":"WRITE","operationParameters":{"mode":"Append","partitionBy":"[]"},"readVersion":2,"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"1","numOutputBytes":"601"},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"a48f157a-2e3b-4052-a15d-849aeeb32f00"}}
+{"add":{"path":"part-00000-8f59e289-fc7e-4ed9-9eff-83850a495126-c000.snappy.parquet","partitionValues":{},"size":601,"modificationTime":1693934220071,"dataChange":true,"stats":"{\"numRecords\":1,\"minValues\":{\"id\":null,\"id2\":null},\"maxValues\":{\"id\":null,\"id2\":null},\"nullCount\":{\"id\":1,\"id2\":1}}"}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/_last_checkpoint b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/_last_checkpoint
new file mode 100644
index 000000000000..623d90c78ca3
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/_delta_log/_last_checkpoint
@@ -0,0 +1 @@
+{"version":2,"size":5,"sizeInBytes":14475,"numOfAddFiles":3,"checkpointSchema":{"type":"struct","fields":[{"name":"txn","type":{"type":"struct","fields":[{"name":"appId","type":"string","nullable":true,"metadata":{}},{"name":"version","type":"long","nullable":true,"metadata":{}},{"name":"lastUpdated","type":"long","nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}},{"name":"add","type":{"type":"struct","fields":[{"name":"path","type":"string","nullable":true,"metadata":{}},{"name":"partitionValues","type":{"type":"map","keyType":"string","valueType":"string","valueContainsNull":true},"nullable":true,"metadata":{}},{"name":"size","type":"long","nullable":true,"metadata":{}},{"name":"modificationTime","type":"long","nullable":true,"metadata":{}},{"name":"dataChange","type":"boolean","nullable":true,"metadata":{}},{"name":"tags","type":{"type":"map","keyType":"string","valueType":"string","valueContainsNull":true},"nullable":true,"metadata":{}},{"name":"deletionVector","type":{"type":"struct","fields":[{"name":"storageType","type":"string","nullable":true,"metadata":{}},{"name":"pathOrInlineDv","type":"string","nullable":true,"metadata":{}},{"name":"offset","type":"integer","nullable":true,"metadata":{}},{"name":"sizeInBytes","type":"integer","nullable":true,"metadata":{}},{"name":"cardinality","type":"long","nullable":true,"metadata":{}},{"name":"maxRowIndex","type":"long","nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}},{"name":"stats","type":"string","nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}},{"name":"remove","type":{"type":"struct","fields":[{"name":"path","type":"string","nullable":true,"metadata":{}},{"name":"deletionTimestamp","type":"long","nullable":true,"metadata":{}},{"name":"dataChange","type":"boolean","nullable":true,"metadata":{}},{"name":"extendedFileMetadata","type":"boolean","nullable":true,"metadata":{}},{"name":"partitionValues","type":{"type":"map","keyType":"string","valueType":"string","valueContainsNull":true},"nullable":true,"metadata":{}},{"name":"size","type":"long","nullable":true,"metadata":{}},{"name":"deletionVector","type":{"type":"struct","fields":[{"name":"storageType","type":"string","nullable":true,"metadata":{}},{"name":"pathOrInlineDv","type":"string","nullable":true,"metadata":{}},{"name":"offset","type":"integer","nullable":true,"metadata":{}},{"name":"sizeInBytes","type":"integer","nullable":true,"metadata":{}},{"name":"cardinality","type":"long","nullable":true,"metadata":{}},{"name":"maxRowIndex","type":"long","nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}},{"name":"metaData","type":{"type":"struct","fields":[{"name":"id","type":"string","nullable":true,"metadata":{}},{"name":"name","type":"string","nullable":true,"metadata":{}},{"name":"description","type":"string","nullable":true,"metadata":{}},{"name":"format","type":{"type":"struct","fields":[{"name":"provider","type":"string","nullable":true,"metadata":{}},{"name":"options","type":{"type":"map","keyType":"string","valueType":"string","valueContainsNull":true},"nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}},{"name":"schemaString","type":"string","nullable":true,"metadata":{}},{"name":"partitionColumns","type":{"type":"array","elementType":"string","containsNull":true},"nullable":true,"metadata":{}},{"name":"configuration","type":{"type":"map","keyType":"string","valueType":"string","valueContainsNull":true},"nullable":true,"metadata":{}},{"name":"createdTime","type":"long","nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}},{"name":"protocol","type":{"type":"struct","fields":[{"name":"minReaderVersion","type":"integer","nullable":true,"metadata":{}},{"name":"minWriterVersion","type":"integer","nullable":true,"metadata":{}},{"name":"readerFeatures","type":{"type":"array","elementType":"string","containsNull":true},"nullable":true,"metadata":{}},{"name":"writerFeatures","type":{"type":"array","elementType":"string","containsNull":true},"nullable":true,"metadata":{}}]},"nullable":true,"metadata":{}}]},"checksum":"10ba1ca798b17a1e02acfbd146dc30f4"}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/part-00000-0199254b-146e-48bb-afe8-a7e9be067d2c-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/part-00000-0199254b-146e-48bb-afe8-a7e9be067d2c-c000.snappy.parquet
new file mode 100644
index 000000000000..194f596f7e50
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/part-00000-0199254b-146e-48bb-afe8-a7e9be067d2c-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/part-00000-6951e6ec-f8d3-4d17-9154-621a959a63d1-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/part-00000-6951e6ec-f8d3-4d17-9154-621a959a63d1-c000.snappy.parquet
new file mode 100644
index 000000000000..1eb8f3644c85
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/part-00000-6951e6ec-f8d3-4d17-9154-621a959a63d1-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/part-00000-8f59e289-fc7e-4ed9-9eff-83850a495126-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/part-00000-8f59e289-fc7e-4ed9-9eff-83850a495126-c000.snappy.parquet
new file mode 100644
index 000000000000..226a186781b5
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/part-00000-8f59e289-fc7e-4ed9-9eff-83850a495126-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/part-00000-c5c7f285-c008-4bc9-897e-5e6296ca92fa-c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/part-00000-c5c7f285-c008-4bc9-897e-5e6296ca92fa-c000.snappy.parquet
new file mode 100644
index 000000000000..226a186781b5
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/deltalake/stats_with_minmax_nulls/part-00000-c5c7f285-c008-4bc9-897e-5e6296ca92fa-c000.snappy.parquet differ
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uri/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/uri/README.md
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uri/README.md
rename to plugin/trino-delta-lake/src/test/resources/deltalake/uri/README.md
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uri/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/uri/_delta_log/00000000000000000000.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uri/_delta_log/00000000000000000000.json
rename to plugin/trino-delta-lake/src/test/resources/deltalake/uri/_delta_log/00000000000000000000.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uri/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/deltalake/uri/_delta_log/00000000000000000001.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uri/_delta_log/00000000000000000001.json
rename to plugin/trino-delta-lake/src/test/resources/deltalake/uri/_delta_log/00000000000000000001.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uri/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/deltalake/uri/_delta_log/00000000000000000002.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uri/_delta_log/00000000000000000002.json
rename to plugin/trino-delta-lake/src/test/resources/deltalake/uri/_delta_log/00000000000000000002.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uri/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/deltalake/uri/_delta_log/00000000000000000003.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uri/_delta_log/00000000000000000003.json
rename to plugin/trino-delta-lake/src/test/resources/deltalake/uri/_delta_log/00000000000000000003.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uri/_delta_log/00000000000000000004.json b/plugin/trino-delta-lake/src/test/resources/deltalake/uri/_delta_log/00000000000000000004.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uri/_delta_log/00000000000000000004.json
rename to plugin/trino-delta-lake/src/test/resources/deltalake/uri/_delta_log/00000000000000000004.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uri/_delta_log/00000000000000000005.json b/plugin/trino-delta-lake/src/test/resources/deltalake/uri/_delta_log/00000000000000000005.json
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uri/_delta_log/00000000000000000005.json
rename to plugin/trino-delta-lake/src/test/resources/deltalake/uri/_delta_log/00000000000000000005.json
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uri/part=a space/part-00000-8f81c841-6afe-445e-bd40-5531f4ad6164.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/uri/part=a space/part-00000-8f81c841-6afe-445e-bd40-5531f4ad6164.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uri/part=a space/part-00000-8f81c841-6afe-445e-bd40-5531f4ad6164.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/deltalake/uri/part=a space/part-00000-8f81c841-6afe-445e-bd40-5531f4ad6164.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uri/part=a%25percent/part-00000-f6243f45-fea9-4d0e-8744-ef23cfe2b99c.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/uri/part=a%25percent/part-00000-f6243f45-fea9-4d0e-8744-ef23cfe2b99c.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uri/part=a%25percent/part-00000-f6243f45-fea9-4d0e-8744-ef23cfe2b99c.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/deltalake/uri/part=a%25percent/part-00000-f6243f45-fea9-4d0e-8744-ef23cfe2b99c.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uri/part=a%3Acolon/part-00000-ab613d48-052b-4de3-916a-ee0d89139446.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/uri/part=a%3Acolon/part-00000-ab613d48-052b-4de3-916a-ee0d89139446.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uri/part=a%3Acolon/part-00000-ab613d48-052b-4de3-916a-ee0d89139446.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/deltalake/uri/part=a%3Acolon/part-00000-ab613d48-052b-4de3-916a-ee0d89139446.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uri/part=a%3Dequal/part-00000-d6a0dd7d-8416-436d-bb00-245452904a81.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/uri/part=a%3Dequal/part-00000-d6a0dd7d-8416-436d-bb00-245452904a81.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uri/part=a%3Dequal/part-00000-d6a0dd7d-8416-436d-bb00-245452904a81.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/deltalake/uri/part=a%3Dequal/part-00000-d6a0dd7d-8416-436d-bb00-245452904a81.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/databricks/uri/part=a+plus/part-00000-4aecc0d9-dfbf-4180-91f1-4fd762dbc279.c000.snappy.parquet b/plugin/trino-delta-lake/src/test/resources/deltalake/uri/part=a+plus/part-00000-4aecc0d9-dfbf-4180-91f1-4fd762dbc279.c000.snappy.parquet
similarity index 100%
rename from plugin/trino-delta-lake/src/test/resources/databricks/uri/part=a+plus/part-00000-4aecc0d9-dfbf-4180-91f1-4fd762dbc279.c000.snappy.parquet
rename to plugin/trino-delta-lake/src/test/resources/deltalake/uri/part=a+plus/part-00000-4aecc0d9-dfbf-4180-91f1-4fd762dbc279.c000.snappy.parquet
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_id/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_id/README.md
new file mode 100644
index 000000000000..358aa341b3cf
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_id/README.md
@@ -0,0 +1,14 @@
+Data generated using OSS Delta Lake 2.4.0:
+
+```sql
+CREATE TABLE default.?
+ (a_number INT, a_string STRING, array_col ARRAY<STRUCT<array_struct_element: STRING>>, nested STRUCT<field1: STRING>)
+ USING delta 
+ LOCATION 's3://?/databricks-compatibility-test-?'
+ TBLPROPERTIES (
+ 'delta.checkpointInterval' = 1, 
+ 'delta.checkpoint.writeStatsAsJson' = ?, 
+ 'delta.checkpoint.writeStatsAsStruct' = ?, 
+ 'delta.columnMapping.mode' = 'id'
+)
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_id/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_id/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..10d09d099c0f
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_id/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1693519271450,"operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{\"delta.checkpoint.writeStatsAsStruct\":\"%WRITE_STATS_AS_STRUCT%\",\"delta.checkpoint.writeStatsAsJson\":\"%WRITE_STATS_AS_JSON%\",\"delta.columnMapping.mode\":\"id\",\"delta.checkpointInterval\":\"1\"}"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"96d45bbb-6982-43d2-a82d-09fddc286e8d"}}
+{"protocol":{"minReaderVersion":2,"minWriterVersion":5}}
+{"metaData":{"id":"5d67ce60-ff62-4060-a468-f07166b10784","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"a_number\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":1,\"delta.columnMapping.physicalName\":\"col-9ec574bd-c2b3-4404-98b3-5c3c892fd00d\"}},{\"name\":\"a_string\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":2,\"delta.columnMapping.physicalName\":\"col-aeb0f18a-ca53-4b1c-b77e-96f718f1586c\"}},{\"name\":\"array_col\",\"type\":{\"type\":\"array\",\"elementType\":{\"type\":\"struct\",\"fields\":[{\"name\":\"array_struct_element\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":4,\"delta.columnMapping.physicalName\":\"col-84140a5c-de0b-4fef-adb1-c7185e00f5cf\"}}]},\"containsNull\":true},\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":3,\"delta.columnMapping.physicalName\":\"col-60f3d82b-9544-4d4a-aa82-0b4d7586b5c3\"}},{\"name\":\"nested\",\"type\":{\"type\":\"struct\",\"fields\":[{\"name\":\"field1\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":6,\"delta.columnMapping.physicalName\":\"col-bdac20c2-9374-4e8c-a91e-db4015b22398\"}}]},\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":5,\"delta.columnMapping.physicalName\":\"col-809ab77c-7ecf-47ff-b610-e273f8061a9a\"}}]}","partitionColumns":[],"configuration":{"delta.checkpoint.writeStatsAsStruct":"%WRITE_STATS_AS_STRUCT%","delta.checkpoint.writeStatsAsJson":"%WRITE_STATS_AS_JSON%","delta.columnMapping.mode":"id","delta.columnMapping.maxColumnId":"6","delta.checkpointInterval":"1"},"createdTime":1693519271098}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_name/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_name/README.md
new file mode 100644
index 000000000000..4bf8e91209be
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_name/README.md
@@ -0,0 +1,14 @@
+Data generated using OSS Delta Lake 2.4.0:
+
+```sql
+CREATE TABLE default.?
+ (a_number INT, a_string STRING, array_col ARRAY<STRUCT<array_struct_element: STRING>>, nested STRUCT<field1: STRING>)
+ USING delta 
+ LOCATION 's3://?/databricks-compatibility-test-?'
+ TBLPROPERTIES (
+ 'delta.checkpointInterval' = 1, 
+ 'delta.checkpoint.writeStatsAsJson' = ?, 
+ 'delta.checkpoint.writeStatsAsStruct' = ?, 
+ 'delta.columnMapping.mode' = 'name'
+)
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_name/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_name/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..f9c2e0c6e588
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_name/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1693519354203,"operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{\"delta.checkpoint.writeStatsAsStruct\":\"%WRITE_STATS_AS_STRUCT%\",\"delta.checkpoint.writeStatsAsJson\":\"%WRITE_STATS_AS_JSON%\",\"delta.columnMapping.mode\":\"name\",\"delta.checkpointInterval\":\"1\"}"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"28cb6685-70da-421a-9b80-5a2a06624c9b"}}
+{"protocol":{"minReaderVersion":2,"minWriterVersion":5}}
+{"metaData":{"id":"a6928233-764e-4b76-8d1e-044a856bf7e7","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"a_number\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":1,\"delta.columnMapping.physicalName\":\"col-890308a4-0e82-43e6-a5e0-6f853db57737\"}},{\"name\":\"a_string\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":2,\"delta.columnMapping.physicalName\":\"col-2e92215e-484c-4565-aa4c-7aed83383294\"}},{\"name\":\"array_col\",\"type\":{\"type\":\"array\",\"elementType\":{\"type\":\"struct\",\"fields\":[{\"name\":\"array_struct_element\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":4,\"delta.columnMapping.physicalName\":\"col-0b74eacc-2dd1-445b-836c-db7296873b26\"}}]},\"containsNull\":true},\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":3,\"delta.columnMapping.physicalName\":\"col-b51b17b5-63c2-4b6f-92e1-3fcf4f8be41f\"}},{\"name\":\"nested\",\"type\":{\"type\":\"struct\",\"fields\":[{\"name\":\"field1\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":6,\"delta.columnMapping.physicalName\":\"col-c5977c8b-f597-4f6c-9114-2a5d06ba3616\"}}]},\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":5,\"delta.columnMapping.physicalName\":\"col-a815bde9-3909-494d-a52c-02b662aef21e\"}}]}","partitionColumns":[],"configuration":{"delta.checkpoint.writeStatsAsStruct":"%WRITE_STATS_AS_STRUCT%","delta.checkpoint.writeStatsAsJson":"%WRITE_STATS_AS_JSON%","delta.columnMapping.mode":"name","delta.columnMapping.maxColumnId":"6","delta.checkpointInterval":"1"},"createdTime":1693519354164}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_none/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_none/README.md
new file mode 100644
index 000000000000..56089c031b22
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_none/README.md
@@ -0,0 +1,14 @@
+Data generated using OSS Delta Lake 2.4.0:
+
+```sql
+CREATE TABLE default.?
+ (a_number INT, a_string STRING, array_col ARRAY<STRUCT<array_struct_element: STRING>>, nested STRUCT<field1: STRING>)
+ USING delta 
+ LOCATION 's3://?/databricks-compatibility-test-?'
+ TBLPROPERTIES (
+ 'delta.checkpointInterval' = 1, 
+ 'delta.checkpoint.writeStatsAsJson' = ?, 
+ 'delta.checkpoint.writeStatsAsStruct' = ?, 
+ 'delta.columnMapping.mode' = 'none'
+)
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_none/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_none/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..b63e18b58ec4
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_column_mapping_none/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1692918419268,"operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[]","properties":"{\"delta.checkpoint.writeStatsAsStruct\":\"%WRITE_STATS_AS_STRUCT%\",\"delta.checkpoint.writeStatsAsJson\":\"%WRITE_STATS_AS_JSON%\",\"delta.columnMapping.mode\":\"none\",\"delta.checkpointInterval\":\"1\"}"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"304ccb52-a1cd-4a1e-b173-8b24fef8b296"}}
+{"protocol":{"minReaderVersion":1,"minWriterVersion":2}}
+{"metaData":{"id":"6133a0a3-3ccc-4784-a5a7-73681a89088d","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"a_number\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}},{\"name\":\"a_string\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}},{\"name\":\"array_col\",\"type\":{\"type\":\"array\",\"elementType\":{\"type\":\"struct\",\"fields\":[{\"name\":\"array_struct_element\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}]},\"containsNull\":true},\"nullable\":true,\"metadata\":{}},{\"name\":\"nested\",\"type\":{\"type\":\"struct\",\"fields\":[{\"name\":\"field1\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}]},\"nullable\":true,\"metadata\":{}}]}","partitionColumns":[],"configuration":{"delta.checkpoint.writeStatsAsStruct":"%WRITE_STATS_AS_STRUCT%","delta.checkpoint.writeStatsAsJson":"%WRITE_STATS_AS_JSON%","delta.columnMapping.mode":"none","delta.checkpointInterval":"1"},"createdTime":1692918418836}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_id/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_id/README.md
new file mode 100644
index 000000000000..a2d717ad4b5b
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_id/README.md
@@ -0,0 +1,15 @@
+Data generated using OSS Delta Lake 2.4.0:
+
+```sql
+CREATE TABLE default.?
+ (a_number INT, a_string STRING, array_col ARRAY<STRUCT<array_struct_element: STRING>>, nested STRUCT<field1: STRING>)
+ USING delta 
+ PARTITIONED BY (a_string)
+ LOCATION 's3://?/databricks-compatibility-test-?'
+ TBLPROPERTIES (
+ 'delta.checkpointInterval' = 1, 
+ 'delta.checkpoint.writeStatsAsJson' = ?, 
+ 'delta.checkpoint.writeStatsAsStruct' = ?, 
+ 'delta.columnMapping.mode' = 'id'
+)
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_id/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_id/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..01e9ef4646a3
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_id/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1693519951655,"operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[\"a_string\"]","properties":"{\"delta.checkpoint.writeStatsAsStruct\":\"%WRITE_STATS_AS_STRUCT%\",\"delta.checkpoint.writeStatsAsJson\":\"%WRITE_STATS_AS_JSON%\",\"delta.columnMapping.mode\":\"id\",\"delta.checkpointInterval\":\"1\"}"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"84f94c35-356e-4cd6-b6bd-2732beca650b"}}
+{"protocol":{"minReaderVersion":2,"minWriterVersion":5}}
+{"metaData":{"id":"758acf5d-d3c8-4aca-96c8-bf13c100be3e","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"a_number\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":1,\"delta.columnMapping.physicalName\":\"col-58a29de0-b7f2-47de-a2cf-1c3caf0df01b\"}},{\"name\":\"a_string\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":2,\"delta.columnMapping.physicalName\":\"col-bd258e61-4f78-4401-85ff-4e2230292a45\"}},{\"name\":\"array_col\",\"type\":{\"type\":\"array\",\"elementType\":{\"type\":\"struct\",\"fields\":[{\"name\":\"array_struct_element\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":4,\"delta.columnMapping.physicalName\":\"col-c3ba9608-1372-4c21-ab41-b46ccc16798c\"}}]},\"containsNull\":true},\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":3,\"delta.columnMapping.physicalName\":\"col-e0fe1af0-5508-4878-b8ff-35754833ffd3\"}},{\"name\":\"nested\",\"type\":{\"type\":\"struct\",\"fields\":[{\"name\":\"field1\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":6,\"delta.columnMapping.physicalName\":\"col-e6e138b7-6a3d-4387-9e0b-71b67ea0c921\"}}]},\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":5,\"delta.columnMapping.physicalName\":\"col-e920df12-fc88-4b98-be5a-8915a220b9f0\"}}]}","partitionColumns":["a_string"],"configuration":{"delta.checkpoint.writeStatsAsStruct":"%WRITE_STATS_AS_STRUCT%","delta.checkpoint.writeStatsAsJson":"%WRITE_STATS_AS_JSON%","delta.columnMapping.mode":"id","delta.columnMapping.maxColumnId":"6","delta.checkpointInterval":"1"},"createdTime":1693519951528}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_name/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_name/README.md
new file mode 100644
index 000000000000..66d00430e53d
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_name/README.md
@@ -0,0 +1,15 @@
+Data generated using OSS Delta Lake 2.4.0:
+
+```sql
+CREATE TABLE default.?
+ (a_number INT, a_string STRING, array_col ARRAY<STRUCT<array_struct_element: STRING>>, nested STRUCT<field1: STRING>)
+ USING delta 
+ PARTITIONED BY (a_string)
+ LOCATION 's3://?/databricks-compatibility-test-?'
+ TBLPROPERTIES (
+ 'delta.checkpointInterval' = 1, 
+ 'delta.checkpoint.writeStatsAsJson' = ?, 
+ 'delta.checkpoint.writeStatsAsStruct' = ?, 
+ 'delta.columnMapping.mode' = 'name'
+)
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_name/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_name/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..e3524a0c454b
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_name/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1693520067025,"operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[\"a_string\"]","properties":"{\"delta.checkpoint.writeStatsAsStruct\":\"%WRITE_STATS_AS_STRUCT%\",\"delta.checkpoint.writeStatsAsJson\":\"%WRITE_STATS_AS_JSON%\",\"delta.columnMapping.mode\":\"name\",\"delta.checkpointInterval\":\"1\"}"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"1157c365-871e-46e8-9905-4b73c922ffa1"}}
+{"protocol":{"minReaderVersion":2,"minWriterVersion":5}}
+{"metaData":{"id":"c5e86f5f-3640-46d9-a8fe-a66b7209d6bf","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"a_number\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":1,\"delta.columnMapping.physicalName\":\"col-94069d81-20a5-4298-a36d-4e2a8832fe75\"}},{\"name\":\"a_string\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":2,\"delta.columnMapping.physicalName\":\"col-64016fbf-79dd-4950-932e-790b4009795a\"}},{\"name\":\"array_col\",\"type\":{\"type\":\"array\",\"elementType\":{\"type\":\"struct\",\"fields\":[{\"name\":\"array_struct_element\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":4,\"delta.columnMapping.physicalName\":\"col-fb5808bc-196d-4d3d-8269-3e3706531671\"}}]},\"containsNull\":true},\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":3,\"delta.columnMapping.physicalName\":\"col-423133f1-1d1e-427a-ae7f-547f1ba05ff8\"}},{\"name\":\"nested\",\"type\":{\"type\":\"struct\",\"fields\":[{\"name\":\"field1\",\"type\":\"string\",\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":6,\"delta.columnMapping.physicalName\":\"col-fcecca1c-fa2e-4f30-b580-7f49f7fc9af8\"}}]},\"nullable\":true,\"metadata\":{\"delta.columnMapping.id\":5,\"delta.columnMapping.physicalName\":\"col-dec7441b-2164-4fa3-ba6d-104aa480231e\"}}]}","partitionColumns":["a_string"],"configuration":{"delta.checkpoint.writeStatsAsStruct":"%WRITE_STATS_AS_STRUCT%","delta.checkpoint.writeStatsAsJson":"%WRITE_STATS_AS_JSON%","delta.columnMapping.mode":"name","delta.columnMapping.maxColumnId":"6","delta.checkpointInterval":"1"},"createdTime":1693520066854}}
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_none/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_none/README.md
new file mode 100644
index 000000000000..006af667c8a2
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_none/README.md
@@ -0,0 +1,15 @@
+Data generated using OSS Delta Lake 2.4.0:
+
+```sql
+CREATE TABLE default.?
+ (a_number INT, a_string STRING, array_col ARRAY<STRUCT<array_struct_element: STRING>>, nested STRUCT<field1: STRING>)
+ USING delta 
+ PARTITIONED BY (a_string)
+ LOCATION 's3://?/databricks-compatibility-test-?'
+ TBLPROPERTIES (
+ 'delta.checkpointInterval' = 1, 
+ 'delta.checkpoint.writeStatsAsJson' = ?, 
+ 'delta.checkpoint.writeStatsAsStruct' = ?, 
+ 'delta.columnMapping.mode' = 'none'
+)
+```
diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_none/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_none/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..0aee0f5b3b5c
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/deltalake/write_stats_as_json_partition_column_mapping_none/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"timestamp":1692881426323,"operation":"CREATE TABLE","operationParameters":{"isManaged":"false","description":null,"partitionBy":"[\"a_string\"]","properties":"{\"delta.checkpoint.writeStatsAsStruct\":\"%WRITE_STATS_AS_STRUCT%\",\"delta.checkpoint.writeStatsAsJson\":\"%WRITE_STATS_AS_JSON%\",\"delta.columnMapping.mode\":\"none\",\"delta.checkpointInterval\":\"1\"}"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Apache-Spark/3.4.0 Delta-Lake/2.4.0","txnId":"5e2013a2-9c64-4bd9-b57c-1b6219204f55"}}
+{"protocol":{"minReaderVersion":1,"minWriterVersion":2}}
+{"metaData":{"id":"6ddd355f-e321-455d-97c1-2bddf8c4af01","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"a_number\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}},{\"name\":\"a_string\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}},{\"name\":\"array_col\",\"type\":{\"type\":\"array\",\"elementType\":{\"type\":\"struct\",\"fields\":[{\"name\":\"array_struct_element\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}]},\"containsNull\":true},\"nullable\":true,\"metadata\":{}},{\"name\":\"nested\",\"type\":{\"type\":\"struct\",\"fields\":[{\"name\":\"field1\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}]},\"nullable\":true,\"metadata\":{}}]}","partitionColumns":["a_string"],"configuration":{"delta.checkpoint.writeStatsAsStruct":"%WRITE_STATS_AS_STRUCT%","delta.checkpoint.writeStatsAsJson":"%WRITE_STATS_AS_JSON%","delta.columnMapping.mode":"none","delta.checkpointInterval":"1"},"createdTime":1692881425840}}
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/20230327_091401_00001_uve6g-cb7936ce-81f3-42fd-86bb-2b1b015f0357 b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/20230327_091401_00001_uve6g-cb7936ce-81f3-42fd-86bb-2b1b015f0357
new file mode 100644
index 000000000000..4c93f5b4b900
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/20230327_091401_00001_uve6g-cb7936ce-81f3-42fd-86bb-2b1b015f0357 differ
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/20230327_091416_00002_uve6g-b5644025-1cec-4ea5-b7f0-34ee34621ad4 b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/20230327_091416_00002_uve6g-b5644025-1cec-4ea5-b7f0-34ee34621ad4
new file mode 100644
index 000000000000..7470f253007a
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/20230327_091416_00002_uve6g-b5644025-1cec-4ea5-b7f0-34ee34621ad4 differ
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/README.md b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/README.md
new file mode 100644
index 000000000000..3ef554dd4512
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/README.md
@@ -0,0 +1,12 @@
+Data generated using Trino:
+
+```sql
+CREATE TABLE no_stats (c_int, c_str) AS VALUES (42, 'foo'), (12, 'ab'), (null, null);
+INSERT INTO no_stats VALUES (15,'cd'), (15,'bar');
+```
+
+with removed:
+
+- stats entries from json files
+- json crc files
+- _trino_metadata directory
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..854da5e65f1d
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/_delta_log/00000000000000000000.json
@@ -0,0 +1,4 @@
+{"commitInfo":{"version":0,"timestamp":1679908455798,"userId":"user","userName":"user","operation":"CREATE TABLE AS SELECT","operationParameters":{"queryId":"20230327_091401_00001_uve6g"},"clusterId":"trino-testversion-1a06e982-46d8-4376-a944-64994496bd1c","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true}}
+{"protocol":{"minReaderVersion":1,"minWriterVersion":2}}
+{"metaData":{"id":"1f2b445d-9f7e-495c-8af9-5d232b1d2e90","format":{"provider":"parquet","options":{}},"schemaString":"{\"fields\":[{\"metadata\":{},\"name\":\"c_int\",\"nullable\":true,\"type\":\"integer\"},{\"metadata\":{},\"name\":\"c_str\",\"nullable\":true,\"type\":\"string\"}],\"type\":\"struct\"}","partitionColumns":[],"configuration":{},"createdTime":1679908455798}}
+{"add":{"path":"20230327_091401_00001_uve6g-cb7936ce-81f3-42fd-86bb-2b1b015f0357","partitionValues":{},"size":316,"modificationTime":1679908451068,"dataChange":true}}
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/_delta_log/00000000000000000001.json
new file mode 100644
index 000000000000..964ce814f194
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats/_delta_log/00000000000000000001.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"version":1,"timestamp":1679908475552,"userId":"user","userName":"user","operation":"WRITE","operationParameters":{"queryId":"20230327_091416_00002_uve6g"},"clusterId":"trino-testversion-1a06e982-46d8-4376-a944-64994496bd1c","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true}}
+{"add":{"path":"20230327_091416_00002_uve6g-b5644025-1cec-4ea5-b7f0-34ee34621ad4","partitionValues":{},"size":336,"modificationTime":1679908475175,"dataChange":true,"tags":{}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/README.md b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/README.md
new file mode 100644
index 000000000000..682ccaa03758
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/README.md
@@ -0,0 +1,12 @@
+Data generated using Trino:
+
+```sql
+CREATE TABLE no_stats_partitions (p_str, c_int, c_str) WITH (partitioned_by = ARRAY['p_str'])AS VALUES ('p?p', 42, 'foo'), ('p?p', 12, 'ab'), (null, null, null);
+INSERT INTO no_stats_partitions VALUES ('ppp', 15,'cd'), ('ppp', 15,'bar');
+```
+
+with removed:
+
+- stats entries from json files
+- json crc files
+- _trino_metadata directory
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..bf402426be87
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/_delta_log/00000000000000000000.json
@@ -0,0 +1,5 @@
+{"commitInfo":{"version":0,"timestamp":1689249448038,"userId":"slawomirpajak","userName":"slawomirpajak","operation":"CREATE TABLE AS SELECT","operationParameters":{"queryId":"20230713_115727_00032_a56by"},"clusterId":"trino-testversion-cea94d1f-3343-4afb-a3d5-71223e42eee2","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true}}
+{"protocol":{"minReaderVersion":1,"minWriterVersion":2}}
+{"metaData":{"id":"0a1e1112-b841-4f6f-a3c4-10df5bd620dd","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"p_str\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}},{\"name\":\"c_int\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}},{\"name\":\"c_str\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}]}","partitionColumns":["p_str"],"configuration":{},"createdTime":1689249448038}}
+{"add":{"path":"p_str=__HIVE_DEFAULT_PARTITION__/20230713_115727_00032_a56by-1f51d644-5b97-4e83-8f7d-efcf70adb054","partitionValues":{"p_str":null},"size":263,"modificationTime":1689249447896,"dataChange":true,"tags":{}}}
+{"add":{"path":"p_str=p%253Fp/20230713_115727_00032_a56by-47e7a4da-4381-4201-8554-4878c66d5dc7","partitionValues":{"p_str":"p?p"},"size":319,"modificationTime":1689249447939,"dataChange":true,"tags":{}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/_delta_log/00000000000000000001.json
new file mode 100644
index 000000000000..ce87f1da6a89
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/_delta_log/00000000000000000001.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"version":1,"timestamp":1689249490051,"userId":"slawomirpajak","userName":"slawomirpajak","operation":"WRITE","operationParameters":{"queryId":"20230713_115809_00033_a56by"},"clusterId":"trino-testversion-cea94d1f-3343-4afb-a3d5-71223e42eee2","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true}}
+{"add":{"path":"p_str=ppp/20230713_115809_00033_a56by-ca41bb58-70aa-4648-91f1-395d01a944f7","partitionValues":{"p_str":"ppp"},"size":339,"modificationTime":1689249490003,"dataChange":true,"tags":{}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/p_str=__HIVE_DEFAULT_PARTITION__/20230713_115727_00032_a56by-1f51d644-5b97-4e83-8f7d-efcf70adb054 b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/p_str=__HIVE_DEFAULT_PARTITION__/20230713_115727_00032_a56by-1f51d644-5b97-4e83-8f7d-efcf70adb054
new file mode 100644
index 000000000000..d10c84eb693a
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/p_str=__HIVE_DEFAULT_PARTITION__/20230713_115727_00032_a56by-1f51d644-5b97-4e83-8f7d-efcf70adb054 differ
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/p_str=p%3Fp/20230713_115727_00032_a56by-47e7a4da-4381-4201-8554-4878c66d5dc7 b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/p_str=p%3Fp/20230713_115727_00032_a56by-47e7a4da-4381-4201-8554-4878c66d5dc7
new file mode 100644
index 000000000000..32e35a7691ec
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/p_str=p%3Fp/20230713_115727_00032_a56by-47e7a4da-4381-4201-8554-4878c66d5dc7 differ
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/p_str=ppp/20230713_115809_00033_a56by-ca41bb58-70aa-4648-91f1-395d01a944f7 b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/p_str=ppp/20230713_115809_00033_a56by-ca41bb58-70aa-4648-91f1-395d01a944f7
new file mode 100644
index 000000000000..5e61b00513d0
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_partitions/p_str=ppp/20230713_115809_00033_a56by-ca41bb58-70aa-4648-91f1-395d01a944f7 differ
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/20230330_123538_00034_5q98z-ab38af0e-a1a8-41ef-9145-ef1a08b8121d b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/20230330_123538_00034_5q98z-ab38af0e-a1a8-41ef-9145-ef1a08b8121d
new file mode 100644
index 000000000000..5ec9baf65b20
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/20230330_123538_00034_5q98z-ab38af0e-a1a8-41ef-9145-ef1a08b8121d differ
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/20230330_123544_00035_5q98z-4ecd4e57-f009-4bc1-accf-72f9cbf5c626 b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/20230330_123544_00035_5q98z-4ecd4e57-f009-4bc1-accf-72f9cbf5c626
new file mode 100644
index 000000000000..6f1652fa7eb0
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/20230330_123544_00035_5q98z-4ecd4e57-f009-4bc1-accf-72f9cbf5c626 differ
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/20230330_135427_00037_5q98z-9add1c0c-5871-4eb4-8e21-d59f24908d72 b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/20230330_135427_00037_5q98z-9add1c0c-5871-4eb4-8e21-d59f24908d72
new file mode 100644
index 000000000000..bf8b9109b0e7
Binary files /dev/null and b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/20230330_135427_00037_5q98z-9add1c0c-5871-4eb4-8e21-d59f24908d72 differ
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/README.md b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/README.md
new file mode 100644
index 000000000000..31177632bb4d
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/README.md
@@ -0,0 +1,16 @@
+Data generated using Trino:
+
+```sql
+CREATE TABLE no_stats_various_types (c_boolean boolean, c_tinyint tinyint, c_smallint smallint, c_integer integer, c_bigint bigint, c_real real, c_double double, c_decimal1 decimal(5,3), c_decimal2 decimal(15,3), c_date1 date, c_timestamp "timestamp with time zone", c_varchar1 varchar(3), c_varchar2 varchar, c_varbinary varbinary);
+INSERT INTO no_stats_various_types VALUES (false, 37, 32123, 1274942432, 312739231274942432, REAL '567.123', DOUBLE '1234567890123.123', 12.345, 123456789012.345, DATE '1999-01-01', TIMESTAMP '2020-02-12 15:03:00', 'ab', 'de',  X'12ab3f');
+INSERT INTO no_stats_various_types VALUES 
+(true, 127, 32767, 2147483647, 9223372036854775807, REAL '999999.999', DOUBLE '9999999999999.999', 99.999, 999999999999.99, DATE '2028-10-04', TIMESTAMP '2199-12-31 23:59:59.999', 'zzz', 'zzz',  X'ffffffffffffffffffff'),                
+(null,null,null,null,null,null,null,null,null,null,null,null,null,null);
+INSERT INTO no_stats_various_types VALUES (null,null,null,null,null,null,null,null,null,null,null,null,null,null);
+```
+
+with removed:
+
+- stats entries from json files
+- json crc files
+- _trino_metadata directory
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/_delta_log/00000000000000000000.json
new file mode 100644
index 000000000000..c8e4791d50d1
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/_delta_log/00000000000000000000.json
@@ -0,0 +1,3 @@
+{"commitInfo":{"version":0,"timestamp":1680179733535,"userId":"slawomirpajak","userName":"slawomirpajak","operation":"CREATE TABLE","operationParameters":{"queryId":"20230330_123533_00033_5q98z"},"clusterId":"trino-testversion-e7d1a343-22ce-43b2-bdff-b0a59729d02d","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true}}
+{"protocol":{"minReaderVersion":1,"minWriterVersion":2}}
+{"metaData":{"id":"152bd985-6cff-4aa8-9473-34b9dcd8919b","format":{"provider":"parquet","options":{}},"schemaString":"{\"fields\":[{\"metadata\":{},\"name\":\"c_boolean\",\"nullable\":true,\"type\":\"boolean\"},{\"metadata\":{},\"name\":\"c_tinyint\",\"nullable\":true,\"type\":\"byte\"},{\"metadata\":{},\"name\":\"c_smallint\",\"nullable\":true,\"type\":\"short\"},{\"metadata\":{},\"name\":\"c_integer\",\"nullable\":true,\"type\":\"integer\"},{\"metadata\":{},\"name\":\"c_bigint\",\"nullable\":true,\"type\":\"long\"},{\"metadata\":{},\"name\":\"c_real\",\"nullable\":true,\"type\":\"float\"},{\"metadata\":{},\"name\":\"c_double\",\"nullable\":true,\"type\":\"double\"},{\"metadata\":{},\"name\":\"c_decimal1\",\"nullable\":true,\"type\":\"decimal(5,3)\"},{\"metadata\":{},\"name\":\"c_decimal2\",\"nullable\":true,\"type\":\"decimal(15,3)\"},{\"metadata\":{},\"name\":\"c_date1\",\"nullable\":true,\"type\":\"date\"},{\"metadata\":{},\"name\":\"c_timestamp\",\"nullable\":true,\"type\":\"timestamp\"},{\"metadata\":{},\"name\":\"c_varchar1\",\"nullable\":true,\"type\":\"string\"},{\"metadata\":{},\"name\":\"c_varchar2\",\"nullable\":true,\"type\":\"string\"},{\"metadata\":{},\"name\":\"c_varbinary\",\"nullable\":true,\"type\":\"binary\"}],\"type\":\"struct\"}","partitionColumns":[],"configuration":{},"createdTime":1680179733535}}
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/_delta_log/00000000000000000001.json
new file mode 100644
index 000000000000..3430626b5595
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/_delta_log/00000000000000000001.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"version":1,"timestamp":1680179739389,"userId":"slawomirpajak","userName":"slawomirpajak","operation":"WRITE","operationParameters":{"queryId":"20230330_123538_00034_5q98z"},"clusterId":"trino-testversion-e7d1a343-22ce-43b2-bdff-b0a59729d02d","readVersion":0,"isolationLevel":"WriteSerializable","isBlindAppend":true}}
+{"add":{"path":"20230330_123538_00034_5q98z-ab38af0e-a1a8-41ef-9145-ef1a08b8121d","partitionValues":{},"size":1845,"modificationTime":1680179739297,"dataChange":true,"tags":{}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/_delta_log/00000000000000000002.json b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/_delta_log/00000000000000000002.json
new file mode 100644
index 000000000000..b01a2e6cc5fa
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/_delta_log/00000000000000000002.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"version":2,"timestamp":1680179744639,"userId":"slawomirpajak","userName":"slawomirpajak","operation":"WRITE","operationParameters":{"queryId":"20230330_123544_00035_5q98z"},"clusterId":"trino-testversion-e7d1a343-22ce-43b2-bdff-b0a59729d02d","readVersion":1,"isolationLevel":"WriteSerializable","isBlindAppend":true}}
+{"add":{"path":"20230330_123544_00035_5q98z-4ecd4e57-f009-4bc1-accf-72f9cbf5c626","partitionValues":{},"size":1890,"modificationTime":1680179744569,"dataChange":true,"tags":{}}}
diff --git a/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/_delta_log/00000000000000000003.json b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/_delta_log/00000000000000000003.json
new file mode 100644
index 000000000000..c7c05d000a19
--- /dev/null
+++ b/plugin/trino-delta-lake/src/test/resources/trino410/no_stats_various_types/_delta_log/00000000000000000003.json
@@ -0,0 +1,2 @@
+{"commitInfo":{"version":3,"timestamp":1680184468645,"userId":"slawomirpajak","userName":"slawomirpajak","operation":"WRITE","operationParameters":{"queryId":"20230330_135427_00037_5q98z"},"clusterId":"trino-testversion-e7d1a343-22ce-43b2-bdff-b0a59729d02d","readVersion":2,"isolationLevel":"WriteSerializable","isBlindAppend":true}}
+{"add":{"path":"20230330_135427_00037_5q98z-9add1c0c-5871-4eb4-8e21-d59f24908d72","partitionValues":{},"size":1401,"modificationTime":1680184468604,"dataChange":true,"tags":{}}}
diff --git a/plugin/trino-druid/pom.xml b/plugin/trino-druid/pom.xml
index b9662de5199d..4275e57c2ed3 100644
--- a/plugin/trino-druid/pom.xml
+++ b/plugin/trino-druid/pom.xml
@@ -1,27 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-druid</artifactId>
-    <description>Trino - Druid Jdbc Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Druid Jdbc Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-base-jdbc</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -34,8 +30,13 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-base-jdbc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <!-- Druid JDBC Connector -->
@@ -45,32 +46,30 @@
             <version>1.22.0</version>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-spi</artifactId>
@@ -78,24 +77,59 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <artifactId>jackson-core</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -116,6 +150,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
@@ -141,20 +182,8 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -167,7 +196,7 @@
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.31</version>
+            <version>2.3.32</version>
             <scope>test</scope>
         </dependency>
 
@@ -177,6 +206,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
@@ -195,4 +230,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-druid/src/main/java/io/trino/plugin/druid/DruidJdbcClient.java b/plugin/trino-druid/src/main/java/io/trino/plugin/druid/DruidJdbcClient.java
index cbea407c377e..042de87f9b17 100644
--- a/plugin/trino-druid/src/main/java/io/trino/plugin/druid/DruidJdbcClient.java
+++ b/plugin/trino-druid/src/main/java/io/trino/plugin/druid/DruidJdbcClient.java
@@ -13,7 +13,10 @@
  */
 package io.trino.plugin.druid;
 
-import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import io.trino.plugin.base.mapping.IdentifierMapping;
+import io.trino.plugin.base.mapping.RemoteIdentifiers;
 import io.trino.plugin.jdbc.BaseJdbcClient;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ColumnMapping;
@@ -21,6 +24,7 @@
 import io.trino.plugin.jdbc.JdbcColumnHandle;
 import io.trino.plugin.jdbc.JdbcNamedRelationHandle;
 import io.trino.plugin.jdbc.JdbcOutputTableHandle;
+import io.trino.plugin.jdbc.JdbcRemoteIdentifiers;
 import io.trino.plugin.jdbc.JdbcSplit;
 import io.trino.plugin.jdbc.JdbcTableHandle;
 import io.trino.plugin.jdbc.JdbcTypeHandle;
@@ -32,13 +36,13 @@
 import io.trino.plugin.jdbc.WriteMapping;
 import io.trino.plugin.jdbc.expression.ParameterizedExpression;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.Range;
+import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Decimals;
@@ -46,8 +50,6 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
 
-import javax.inject.Inject;
-
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
@@ -160,7 +162,7 @@ public DruidJdbcClient(BaseJdbcConfig config, ConnectionFactory connectionFactor
     @Override
     public Collection<String> listSchemas(Connection connection)
     {
-        return ImmutableList.of(DRUID_SCHEMA);
+        return ImmutableSet.of(DRUID_SCHEMA);
     }
 
     //Overridden to filter out tables that don't match schemaTableName
@@ -169,23 +171,28 @@ public Optional<JdbcTableHandle> getTableHandle(ConnectorSession session, Schema
     {
         String jdbcSchemaName = schemaTableName.getSchemaName();
         String jdbcTableName = schemaTableName.getTableName();
-        try (Connection connection = connectionFactory.openConnection(session);
-                ResultSet resultSet = getTables(connection, Optional.of(jdbcSchemaName), Optional.of(jdbcTableName))) {
-            List<JdbcTableHandle> tableHandles = new ArrayList<>();
-            while (resultSet.next()) {
-                String schemaName = resultSet.getString("TABLE_SCHEM");
-                String tableName = resultSet.getString("TABLE_NAME");
-                if (Objects.equals(schemaName, jdbcSchemaName) && Objects.equals(tableName, jdbcTableName)) {
-                    tableHandles.add(new JdbcTableHandle(
-                            schemaTableName,
-                            new RemoteTableName(Optional.of(DRUID_CATALOG), Optional.ofNullable(schemaName), tableName),
-                            Optional.empty()));
+        try (Connection connection = connectionFactory.openConnection(session)) {
+            ConnectorIdentity identity = session.getIdentity();
+            RemoteIdentifiers remoteIdentifiers = getRemoteIdentifiers(connection);
+            String remoteSchema = getIdentifierMapping().toRemoteSchemaName(remoteIdentifiers, identity, jdbcSchemaName);
+            String remoteTable = getIdentifierMapping().toRemoteTableName(remoteIdentifiers, identity, remoteSchema, jdbcTableName);
+            try (ResultSet resultSet = getTables(connection, Optional.of(remoteSchema), Optional.of(remoteTable))) {
+                List<JdbcTableHandle> tableHandles = new ArrayList<>();
+                while (resultSet.next()) {
+                    String schemaName = resultSet.getString("TABLE_SCHEM");
+                    String tableName = resultSet.getString("TABLE_NAME");
+                    if (Objects.equals(schemaName, remoteSchema) && Objects.equals(tableName, remoteTable)) {
+                        tableHandles.add(new JdbcTableHandle(
+                                schemaTableName,
+                                new RemoteTableName(Optional.of(DRUID_CATALOG), Optional.ofNullable(schemaName), tableName),
+                                Optional.empty()));
+                    }
                 }
+                if (tableHandles.isEmpty()) {
+                    return Optional.empty();
+                }
+                return Optional.of(getOnlyElement(tableHandles));
             }
-            if (tableHandles.isEmpty()) {
-                return Optional.empty();
-            }
-            return Optional.of(getOnlyElement(tableHandles));
         }
         catch (SQLException e) {
             throw new TrinoException(JDBC_ERROR, e);
@@ -408,7 +415,8 @@ private JdbcTableHandle prepareTableHandleForQuery(JdbcTableHandle table)
                     table.getColumns(),
                     table.getOtherReferencedTables(),
                     table.getNextSyntheticColumnId(),
-                    table.getAuthorization());
+                    table.getAuthorization(),
+                    table.getUpdateAssignments());
         }
 
         return table;
@@ -455,6 +463,12 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
         throw new TrinoException(NOT_SUPPORTED, MODIFYING_ROWS_MESSAGE);
     }
 
+    @Override
+    public OptionalLong update(ConnectorSession session, JdbcTableHandle handle)
+    {
+        throw new TrinoException(NOT_SUPPORTED, MODIFYING_ROWS_MESSAGE);
+    }
+
     @Override
     public void createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata)
     {
@@ -509,6 +523,18 @@ public void dropTable(ConnectorSession session, JdbcTableHandle handle)
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support dropping tables");
     }
 
+    @Override
+    public void renameTable(ConnectorSession session, JdbcTableHandle handle, SchemaTableName newTableName)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "This connector does not support renaming tables");
+    }
+
+    @Override
+    public void truncateTable(ConnectorSession session, JdbcTableHandle handle)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "This connector does not support truncating tables");
+    }
+
     @Override
     public void rollbackCreateTable(ConnectorSession session, JdbcOutputTableHandle handle)
     {
@@ -528,7 +554,7 @@ public void createSchema(ConnectorSession session, String schemaName)
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support dropping schemas");
     }
@@ -592,4 +618,10 @@ private WriteMapping legacyToWriteMapping(Type type)
         }
         throw new TrinoException(NOT_SUPPORTED, "Unsupported column type: " + type.getDisplayName());
     }
+
+    @Override
+    public RemoteIdentifiers getRemoteIdentifiers(Connection connection)
+    {
+        return new JdbcRemoteIdentifiers(this, connection, false);
+    }
 }
diff --git a/plugin/trino-druid/src/main/java/io/trino/plugin/druid/DruidJdbcClientModule.java b/plugin/trino-druid/src/main/java/io/trino/plugin/druid/DruidJdbcClientModule.java
index 6dd2d378f630..b5e1f88f2939 100644
--- a/plugin/trino-druid/src/main/java/io/trino/plugin/druid/DruidJdbcClientModule.java
+++ b/plugin/trino-druid/src/main/java/io/trino/plugin/druid/DruidJdbcClientModule.java
@@ -18,6 +18,7 @@
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DriverConnectionFactory;
@@ -25,7 +26,7 @@
 import io.trino.plugin.jdbc.JdbcClient;
 import io.trino.plugin.jdbc.credential.CredentialProvider;
 import io.trino.plugin.jdbc.ptf.Query;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import org.apache.calcite.avatica.remote.Driver;
 
 import java.util.Properties;
@@ -45,13 +46,14 @@ public void configure(Binder binder)
     @Provides
     @Singleton
     @ForBaseJdbc
-    public static ConnectionFactory createConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider)
+    public static ConnectionFactory createConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider, OpenTelemetry openTelemetry)
     {
         Properties connectionProperties = new Properties();
         return new DriverConnectionFactory(
                 new Driver(),
                 config.getConnectionUrl(),
                 connectionProperties,
-                credentialProvider);
+                credentialProvider,
+                openTelemetry);
     }
 }
diff --git a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/BaseDruidConnectorTest.java b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/BaseDruidConnectorTest.java
deleted file mode 100644
index f3fbf498292c..000000000000
--- a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/BaseDruidConnectorTest.java
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.druid;
-
-import io.trino.Session;
-import io.trino.plugin.jdbc.BaseJdbcConnectorTest;
-import io.trino.plugin.jdbc.JdbcTableHandle;
-import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.connector.SchemaTableName;
-import io.trino.sql.planner.assertions.PlanMatchPattern;
-import io.trino.sql.planner.plan.AggregationNode;
-import io.trino.sql.planner.plan.FilterNode;
-import io.trino.sql.planner.plan.JoinNode;
-import io.trino.sql.planner.plan.TableScanNode;
-import io.trino.sql.planner.plan.TopNNode;
-import io.trino.testing.MaterializedResult;
-import io.trino.testing.TestingConnectorBehavior;
-import io.trino.testing.sql.SqlExecutor;
-import org.intellij.lang.annotations.Language;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import static io.trino.plugin.druid.DruidQueryRunner.copyAndIngestTpchData;
-import static io.trino.plugin.druid.DruidTpchTables.SELECT_FROM_ORDERS;
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.output;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
-import static io.trino.testing.MaterializedResult.resultBuilder;
-import static java.lang.String.format;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertFalse;
-
-public abstract class BaseDruidConnectorTest
-        extends BaseJdbcConnectorTest
-{
-    protected TestingDruidServer druidServer;
-
-    @AfterClass(alwaysRun = true)
-    public void destroy()
-    {
-        if (druidServer != null) {
-            druidServer.close();
-            druidServer = null;
-        }
-    }
-
-    @SuppressWarnings("DuplicateBranchesInSwitch")
-    @Override
-    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
-    {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-            case SUPPORTS_AGGREGATION_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE:
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN:
-            case SUPPORTS_RENAME_COLUMN:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_INSERT:
-            case SUPPORTS_DELETE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
-    }
-
-    @Override
-    protected SqlExecutor onRemoteDatabase()
-    {
-        return druidServer::execute;
-    }
-
-    @Override
-    protected MaterializedResult getDescribeOrdersResult()
-    {
-        return resultBuilder(getSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
-                .row("__time", "timestamp(3)", "", "")
-                .row("clerk", "varchar", "", "") // String columns are reported only as varchar
-                .row("comment", "varchar", "", "")
-                .row("custkey", "bigint", "", "") // Long columns are reported as bigint
-                .row("orderdate", "varchar", "", "")
-                .row("orderkey", "bigint", "", "")
-                .row("orderpriority", "varchar", "", "")
-                .row("orderstatus", "varchar", "", "")
-                .row("shippriority", "bigint", "", "") // Druid doesn't support int type
-                .row("totalprice", "double", "", "")
-                .build();
-    }
-
-    @Override
-    public void testShowColumns()
-    {
-        assertThat(query("SHOW COLUMNS FROM orders")).matches(getDescribeOrdersResult());
-    }
-
-    @Test
-    @Override
-    public void testShowCreateTable()
-    {
-        assertThat(computeActual("SHOW CREATE TABLE orders").getOnlyValue())
-                .isEqualTo("CREATE TABLE druid.druid.orders (\n" +
-                        "   __time timestamp(3) NOT NULL,\n" +
-                        "   clerk varchar,\n" +
-                        "   comment varchar,\n" +
-                        "   custkey bigint NOT NULL,\n" +
-                        "   orderdate varchar,\n" +
-                        "   orderkey bigint NOT NULL,\n" +
-                        "   orderpriority varchar,\n" +
-                        "   orderstatus varchar,\n" +
-                        "   shippriority bigint NOT NULL,\n" +
-                        "   totalprice double NOT NULL\n" +
-                        ")");
-    }
-
-    @Test
-    @Override
-    public void testSelectInformationSchemaColumns()
-    {
-        String catalog = getSession().getCatalog().get();
-        String schema = getSession().getSchema().get();
-        String schemaPattern = schema.replaceAll(".$", "_");
-
-        @Language("SQL") String ordersTableWithColumns = "VALUES " +
-                "('orders', 'orderkey'), " +
-                "('orders', 'custkey'), " +
-                "('orders', 'orderstatus'), " +
-                "('orders', 'totalprice'), " +
-                "('orders', 'orderdate'), " +
-                "('orders', '__time'), " +
-                "('orders', 'orderpriority'), " +
-                "('orders', 'clerk'), " +
-                "('orders', 'shippriority'), " +
-                "('orders', 'comment')";
-
-        assertQuery("SELECT table_schema FROM information_schema.columns WHERE table_schema = '" + schema + "' GROUP BY table_schema", "VALUES '" + schema + "'");
-        assertQuery("SELECT table_name FROM information_schema.columns WHERE table_name = 'orders' GROUP BY table_name", "VALUES 'orders'");
-        assertQuery("SELECT table_name, column_name FROM information_schema.columns WHERE table_schema = '" + schema + "' AND table_name = 'orders'", ordersTableWithColumns);
-        assertQuery("SELECT table_name, column_name FROM information_schema.columns WHERE table_schema = '" + schema + "' AND table_name LIKE '%rders'", ordersTableWithColumns);
-        assertQuery("SELECT table_name, column_name FROM information_schema.columns WHERE table_schema LIKE '" + schemaPattern + "' AND table_name LIKE '_rder_'", ordersTableWithColumns);
-        assertQuery(
-                "SELECT table_name, column_name FROM information_schema.columns " +
-                        "WHERE table_catalog = '" + catalog + "' AND table_schema = '" + schema + "' AND table_name LIKE '%orders%'",
-                ordersTableWithColumns);
-
-        assertQuerySucceeds("SELECT * FROM information_schema.columns");
-        assertQuery("SELECT DISTINCT table_name, column_name FROM information_schema.columns WHERE table_name LIKE '_rders'", ordersTableWithColumns);
-        assertQuerySucceeds("SELECT * FROM information_schema.columns WHERE table_catalog = '" + catalog + "'");
-        assertQuerySucceeds("SELECT * FROM information_schema.columns WHERE table_catalog = '" + catalog + "' AND table_schema = '" + schema + "'");
-        assertQuery("SELECT table_name, column_name FROM information_schema.columns WHERE table_catalog = '" + catalog + "' AND table_schema = '" + schema + "' AND table_name LIKE '_rders'", ordersTableWithColumns);
-        assertQuerySucceeds("SELECT * FROM information_schema.columns WHERE table_catalog = '" + catalog + "' AND table_name LIKE '%'");
-        assertQuery("SELECT column_name FROM information_schema.columns WHERE table_catalog = 'something_else'", "SELECT '' WHERE false");
-    }
-
-    @Test
-    @Override
-    public void testSelectAll()
-    {
-        // List columns explicitly, as Druid has an additional __time column
-        assertQuery("SELECT orderkey, custkey, orderstatus, totalprice, orderdate, orderpriority, clerk, shippriority, comment  FROM orders");
-    }
-
-    /**
-     * This test verifies that the filtering we have in place to overcome Druid's limitation of
-     * not handling the escaping of search characters like % and _, works correctly.
-     * <p>
-     * See {@link DruidJdbcClient#getTableHandle(ConnectorSession, SchemaTableName)} and
-     * {@link DruidJdbcClient#getColumns(ConnectorSession, JdbcTableHandle)}
-     */
-    @Test
-    public void testFilteringForTablesAndColumns()
-            throws Exception
-    {
-        String sql = SELECT_FROM_ORDERS + " LIMIT 10";
-        String datasourceA = "some_table";
-        MaterializedResult materializedRows = getQueryRunner().execute(sql);
-        copyAndIngestTpchData(materializedRows, druidServer, datasourceA);
-        String datasourceB = "somextable";
-        copyAndIngestTpchData(materializedRows, druidServer, datasourceB);
-
-        // Assert that only columns from datsourceA are returned
-        MaterializedResult expectedColumns = MaterializedResult.resultBuilder(getSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
-                .row("__time", "timestamp(3)", "", "")
-                .row("clerk", "varchar", "", "") // String columns are reported only as varchar
-                .row("comment", "varchar", "", "")
-                .row("custkey", "bigint", "", "") // Long columns are reported as bigint
-                .row("orderdate", "varchar", "", "")
-                .row("orderkey", "bigint", "", "")
-                .row("orderpriority", "varchar", "", "")
-                .row("orderstatus", "varchar", "", "")
-                .row("shippriority", "bigint", "", "") // Druid doesn't support int type
-                .row("totalprice", "double", "", "")
-                .build();
-        assertThat(query("DESCRIBE " + datasourceA)).matches(expectedColumns);
-
-        // Assert that only columns from datsourceB are returned
-        expectedColumns = MaterializedResult.resultBuilder(getSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
-                .row("__time", "timestamp(3)", "", "")
-                .row("clerk_x", "varchar", "", "") // String columns are reported only as varchar
-                .row("comment_x", "varchar", "", "")
-                .row("custkey_x", "bigint", "", "") // Long columns are reported as bigint
-                .row("orderdate_x", "varchar", "", "")
-                .row("orderkey_x", "bigint", "", "")
-                .row("orderpriority_x", "varchar", "", "")
-                .row("orderstatus_x", "varchar", "", "")
-                .row("shippriority_x", "bigint", "", "") // Druid doesn't support int type
-                .row("totalprice_x", "double", "", "")
-                .build();
-        assertThat(query("DESCRIBE " + datasourceB)).matches(expectedColumns);
-    }
-
-    @Test
-    public void testLimitPushDown()
-    {
-        assertThat(query("SELECT name FROM nation LIMIT 30")).isFullyPushedDown(); // Use high limit for result determinism
-
-        // with filter over numeric column
-        assertThat(query("SELECT name FROM nation WHERE regionkey = 3 LIMIT 5")).isFullyPushedDown();
-
-        // with filter over varchar column
-        assertThat(query("SELECT name FROM nation WHERE name < 'EEE' LIMIT 5")).isFullyPushedDown();
-
-        // with aggregation
-        assertThat(query("SELECT max(regionkey) FROM nation LIMIT 5")).isNotFullyPushedDown(AggregationNode.class); // global aggregation, LIMIT removed TODO https://github.com/trinodb/trino/pull/4313
-        assertThat(query("SELECT regionkey, max(name) FROM nation GROUP BY regionkey LIMIT 5")).isNotFullyPushedDown(AggregationNode.class); // TODO https://github.com/trinodb/trino/pull/4313
-
-        // distinct limit can be pushed down even without aggregation pushdown
-        assertThat(query("SELECT DISTINCT regionkey FROM nation LIMIT 5")).isFullyPushedDown();
-
-        // with aggregation and filter over numeric column
-        assertThat(query("SELECT regionkey, count(*) FROM nation WHERE nationkey < 5 GROUP BY regionkey LIMIT 3")).isNotFullyPushedDown(AggregationNode.class); // TODO https://github.com/trinodb/trino/pull/4313
-        // with aggregation and filter over varchar column
-        assertThat(query("SELECT regionkey, count(*) FROM nation WHERE name < 'EGYPT' GROUP BY regionkey LIMIT 3")).isNotFullyPushedDown(AggregationNode.class); // TODO https://github.com/trinodb/trino/pull/4313
-
-        // with TopN over numeric column
-        assertThat(query("SELECT * FROM (SELECT regionkey FROM nation ORDER BY nationkey ASC LIMIT 10) LIMIT 5")).isNotFullyPushedDown(TopNNode.class);
-        // with TopN over varchar column
-        assertThat(query("SELECT * FROM (SELECT regionkey FROM nation ORDER BY name ASC LIMIT 10) LIMIT 5")).isNotFullyPushedDown(TopNNode.class);
-
-        // with join
-        PlanMatchPattern joinOverTableScans = node(JoinNode.class,
-                anyTree(node(TableScanNode.class)),
-                anyTree(node(TableScanNode.class)));
-        assertThat(query(
-                joinPushdownEnabled(getSession()),
-                "SELECT n.name, r.name " +
-                        "FROM nation n " +
-                        "LEFT JOIN region r USING (regionkey) " +
-                        "LIMIT 30"))
-                .isNotFullyPushedDown(joinOverTableScans);
-    }
-
-    @Test
-    @Override
-    public void testInsertNegativeDate()
-    {
-        throw new SkipException("Druid connector does not map 'orderdate' column to date type and INSERT statement");
-    }
-
-    @Test
-    @Override
-    public void testDateYearOfEraPredicate()
-    {
-        throw new SkipException("Druid connector does not map 'orderdate' column to date type");
-    }
-
-    @Override
-    public void testCharTrailingSpace()
-    {
-        assertThatThrownBy(super::testCharTrailingSpace)
-                .hasMessageContaining("Error while executing SQL \"CREATE TABLE druid.char_trailing_space");
-        throw new SkipException("Implement test for Druid");
-    }
-
-    @Override
-    public void testNativeQuerySelectFromTestTable()
-    {
-        throw new SkipException("cannot create test table for Druid");
-    }
-
-    @Override
-    public void testNativeQueryCreateStatement()
-    {
-        // override because Druid fails to prepare statement, while other connectors succeed in preparing statement and then fail because of no metadata available
-        assertFalse(getQueryRunner().tableExists(getSession(), "numbers"));
-        assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'CREATE TABLE numbers(n INTEGER)'))"))
-                .hasMessageContaining("Failed to get table handle for prepared query");
-        assertFalse(getQueryRunner().tableExists(getSession(), "numbers"));
-    }
-
-    @Override
-    public void testNativeQueryInsertStatementTableExists()
-    {
-        throw new SkipException("cannot create test table for Druid");
-    }
-
-    @Test
-    public void testPredicatePushdown()
-    {
-        // varchar equality
-        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE name = 'ROMANIA'"))
-                .matches("VALUES (BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar))")
-                .isFullyPushedDown();
-
-        // varchar range
-        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE name BETWEEN 'POLAND' AND 'RPA'"))
-                .matches("VALUES (BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar))")
-                .isFullyPushedDown();
-
-        // varchar IN without domain compaction
-        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE name IN ('POLAND', 'ROMANIA', 'VIETNAM')"))
-                .matches("VALUES " +
-                        "(BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar)), " +
-                        "(BIGINT '2', BIGINT '21', CAST('VIETNAM' AS varchar))")
-                .isFullyPushedDown();
-
-        // varchar IN with small compaction threshold
-        assertThat(query(
-                Session.builder(getSession())
-                        .setCatalogSessionProperty("druid", "domain_compaction_threshold", "1")
-                        .build(),
-                "SELECT regionkey, nationkey, name FROM nation WHERE name IN ('POLAND', 'ROMANIA', 'VIETNAM')"))
-                .matches("VALUES " +
-                        "(BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar)), " +
-                        "(BIGINT '2', BIGINT '21', CAST('VIETNAM' AS varchar))")
-                // Filter node is retained as no constraint is pushed into connector.
-                .isNotFullyPushedDown(FilterNode.class);
-
-        // varchar different case
-        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE name = 'romania'"))
-                .returnsEmptyResult()
-                .isFullyPushedDown();
-
-        // bigint equality
-        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE nationkey = 19"))
-                .matches("VALUES (BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar))")
-                .isFullyPushedDown();
-
-        // bigint equality with small compaction threshold
-        assertThat(query(
-                Session.builder(getSession())
-                        .setCatalogSessionProperty("druid", "domain_compaction_threshold", "1")
-                        .build(),
-                "SELECT regionkey, nationkey, name FROM nation WHERE nationkey IN (19, 21)"))
-                .matches("VALUES " +
-                        "(BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar)), " +
-                        "(BIGINT '2', BIGINT '21', CAST('VIETNAM' AS varchar))")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        // bigint range, with decimal to bigint simplification
-        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE nationkey BETWEEN 18.5 AND 19.5"))
-                .matches("VALUES (BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar))")
-                .isFullyPushedDown();
-
-        // Druid doesn't support Aggregation Pushdown
-        assertThat(query("SELECT * FROM (SELECT regionkey, sum(nationkey) FROM nation GROUP BY regionkey) WHERE regionkey = 3"))
-                .matches("VALUES (BIGINT '3', BIGINT '77')")
-                .isNotFullyPushedDown(AggregationNode.class);
-
-        // Druid doesn't support Aggregation Pushdown
-        assertThat(query("SELECT regionkey, sum(nationkey) FROM nation GROUP BY regionkey HAVING sum(nationkey) = 77"))
-                .matches("VALUES (BIGINT '3', BIGINT '77')")
-                .isNotFullyPushedDown(AggregationNode.class);
-    }
-
-    @Test
-    public void testPredicatePushdownForTimestampWithSecondsPrecision()
-    {
-        // timestamp equality
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time = TIMESTAMP '1992-01-04 00:00:00'"))
-                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
-                .isFullyPushedDown();
-
-        // timestamp comparison
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time < TIMESTAMP '1992-01-05'"))
-                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time <= TIMESTAMP '1992-01-04'"))
-                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time > TIMESTAMP '1998-11-28'"))
-                .matches("VALUES " +
-                        "(BIGINT '2', BIGINT '370', CAST('RAIL' AS varchar)), " +
-                        "(BIGINT '2', BIGINT '468', CAST('AIR' AS varchar))")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time >= TIMESTAMP '1998-11-29 00:00:00'"))
-                .matches("VALUES " +
-                        "(BIGINT '2', BIGINT '370', CAST('RAIL' AS varchar)), " +
-                        "(BIGINT '2', BIGINT '468', CAST('AIR' AS varchar))")
-                .isFullyPushedDown();
-
-        // timestamp range
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time BETWEEN TIMESTAMP '1992-01-01' AND TIMESTAMP '1992-01-05'"))
-                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
-                .isFullyPushedDown();
-
-        // varchar IN without domain compaction
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time IN (TIMESTAMP '1992-01-04', TIMESTAMP '1998-11-27 00:00:00.000', TIMESTAMP '1998-11-28')"))
-                .matches("VALUES " +
-                        "(BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar)), " +
-                        "(BIGINT '1', BIGINT '574', CAST('AIR' AS varchar))")
-                .isFullyPushedDown();
-
-        // varchar IN with small compaction threshold
-        assertThat(query(
-                Session.builder(getSession())
-                        .setCatalogSessionProperty("druid", "domain_compaction_threshold", "1")
-                        .build(),
-                "SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time IN (TIMESTAMP '1992-01-04', TIMESTAMP '1998-11-27 00:00:00', TIMESTAMP '1998-11-28')"))
-                .matches("VALUES " +
-                        "(BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar)), " +
-                        "(BIGINT '1', BIGINT '574', CAST('AIR' AS varchar))")
-                // Filter node is retained as no constraint is pushed into connector.
-                .isNotFullyPushedDown(FilterNode.class);
-    }
-
-    @Test
-    public void testPredicatePushdownForTimestampWithMillisPrecision()
-    {
-        // timestamp equality
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time = TIMESTAMP '1992-01-04 00:00:00.001'"))
-                .returnsEmptyResult()
-                .isNotFullyPushedDown(FilterNode.class);
-
-        // timestamp comparison
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time < TIMESTAMP '1992-01-05 00:00:00.001'"))
-                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time <= TIMESTAMP '1992-01-04 00:00:00.001'"))
-                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time > TIMESTAMP '1998-11-28 00:00:00.001'"))
-                .matches("VALUES " +
-                        "(BIGINT '2', BIGINT '370', CAST('RAIL' AS varchar)), " +
-                        "(BIGINT '2', BIGINT '468', CAST('AIR' AS varchar))")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time >= TIMESTAMP '1998-11-29 00:00:00.001'"))
-                .returnsEmptyResult()
-                .isNotFullyPushedDown(FilterNode.class);
-
-        // timestamp range
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time BETWEEN TIMESTAMP '1992-01-01 00:00:00.001' AND TIMESTAMP '1992-01-05'"))
-                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time BETWEEN TIMESTAMP '1992-01-01' AND TIMESTAMP '1992-01-05 00:00:00.001'"))
-                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        // timestamp IN without domain compaction
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time IN (TIMESTAMP '1992-01-04', TIMESTAMP '1998-11-27 00:00:00.000', TIMESTAMP '1998-11-28')"))
-                .matches("VALUES " +
-                        "(BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar)), " +
-                        "(BIGINT '1', BIGINT '574', CAST('AIR' AS varchar))")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time IN (TIMESTAMP '1992-01-04', TIMESTAMP '1998-11-27', TIMESTAMP '1998-11-28 00:00:00.001')"))
-                .matches("VALUES " +
-                        "(BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar)), " +
-                        "(BIGINT '1', BIGINT '574', CAST('AIR' AS varchar))")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        // timestamp IN with small compaction threshold
-        assertThat(query(
-                Session.builder(getSession())
-                        .setCatalogSessionProperty("druid", "domain_compaction_threshold", "1")
-                        .build(),
-                "SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time IN (TIMESTAMP '1992-01-04', TIMESTAMP '1998-11-27 00:00:00.000', TIMESTAMP '1998-11-28')"))
-                .matches("VALUES " +
-                        "(BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar)), " +
-                        "(BIGINT '1', BIGINT '574', CAST('AIR' AS varchar))")
-                // Filter node is retained as no constraint is pushed into connector.
-                .isNotFullyPushedDown(FilterNode.class);
-    }
-
-    @Test(dataProvider = "timestampValuesProvider")
-    public void testPredicatePushdownForTimestampWithHigherPrecision(String timestamp)
-    {
-        // timestamp equality
-        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time = TIMESTAMP '%s'", timestamp)))
-                .returnsEmptyResult()
-                .matches(output(
-                        values("linenumber", "partkey", "shipmode")));
-
-        // timestamp comparison
-        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time < TIMESTAMP '%s'", timestamp)))
-                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time <= TIMESTAMP '%s'", timestamp)))
-                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time > (TIMESTAMP '%s' + INTERVAL '2520' DAY)", timestamp)))
-                .matches("VALUES " +
-                        "(BIGINT '2', BIGINT '370', CAST('RAIL' AS varchar)), " +
-                        "(BIGINT '2', BIGINT '468', CAST('AIR' AS varchar))")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time >= (TIMESTAMP '%s' + INTERVAL '2521' DAY)", timestamp)))
-                .returnsEmptyResult()
-                .isNotFullyPushedDown(FilterNode.class);
-
-        // timestamp range
-        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time BETWEEN TIMESTAMP '1992-01-04' AND TIMESTAMP '%s'", timestamp)))
-                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        // varchar IN without domain compaction
-        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time IN (TIMESTAMP '1992-01-04', TIMESTAMP '1998-11-27', TIMESTAMP '%s')", timestamp)))
-                .matches("VALUES " +
-                        "(BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar)), " +
-                        "(BIGINT '1', BIGINT '574', CAST('AIR' AS varchar))")
-                .isNotFullyPushedDown(FilterNode.class);
-    }
-
-    @DataProvider
-    public Object[][] timestampValuesProvider()
-    {
-        return new Object[][] {
-                {"1992-01-04 00:00:00.1234"},
-                {"1992-01-04 00:00:00.12345"},
-                {"1992-01-04 00:00:00.123456"},
-                {"1992-01-04 00:00:00.1234567"},
-                {"1992-01-04 00:00:00.12345678"},
-                {"1992-01-04 00:00:00.123456789"},
-                {"1992-01-04 00:00:00.1234567891"},
-                {"1992-01-04 00:00:00.12345678912"},
-                {"1992-01-04 00:00:00.123456789123"}
-        };
-    }
-}
diff --git a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/DruidCreateAndInsertDataSetup.java b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/DruidCreateAndInsertDataSetup.java
index 88d033cf25eb..622f8f7a33a6 100644
--- a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/DruidCreateAndInsertDataSetup.java
+++ b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/DruidCreateAndInsertDataSetup.java
@@ -24,6 +24,7 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -75,7 +76,7 @@ private void ingestData(DruidTable testTable, List<ColumnSetup> inputs)
         String dataFilePath = format("%s/%s.tsv", druidServer.getHostWorkingDirectory(), testTable.getName());
         writeTsvFile(dataFilePath, inputs);
 
-        this.druidServer.ingestData(testTable.getName(), builder.build(), dataFilePath);
+        this.druidServer.ingestData(testTable.getName(), Optional.empty(), builder.build(), dataFilePath);
     }
 
     private TimestampSpec getTimestampSpec(List<ColumnSetup> inputs)
diff --git a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/DruidQueryRunner.java b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/DruidQueryRunner.java
index fb4259ea8f56..335c97ce1d76 100644
--- a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/DruidQueryRunner.java
+++ b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/DruidQueryRunner.java
@@ -32,6 +32,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static com.google.common.io.Resources.getResource;
@@ -56,7 +57,11 @@ public class DruidQueryRunner
 
     private DruidQueryRunner() {}
 
-    public static DistributedQueryRunner createDruidQueryRunnerTpch(TestingDruidServer testingDruidServer, Map<String, String> extraProperties, Iterable<TpchTable<?>> tables)
+    public static DistributedQueryRunner createDruidQueryRunnerTpch(
+            TestingDruidServer testingDruidServer,
+            Map<String, String> extraProperties,
+            Map<String, String> connectorProperties,
+            Iterable<TpchTable<?>> tables)
             throws Exception
     {
         DistributedQueryRunner queryRunner = null;
@@ -67,7 +72,7 @@ public static DistributedQueryRunner createDruidQueryRunnerTpch(TestingDruidServ
             queryRunner.installPlugin(new TpchPlugin());
             queryRunner.createCatalog("tpch", "tpch");
 
-            Map<String, String> connectorProperties = new HashMap<>();
+            connectorProperties = new HashMap<>(ImmutableMap.copyOf(connectorProperties));
             connectorProperties.putIfAbsent("connection-url", testingDruidServer.getJdbcUrl());
             queryRunner.installPlugin(new DruidJdbcPlugin());
             queryRunner.createCatalog("druid", "druid", connectorProperties);
@@ -91,6 +96,25 @@ public static DistributedQueryRunner createDruidQueryRunnerTpch(TestingDruidServ
         }
     }
 
+    public static void copyAndIngestTpchDataFromSourceToTarget(
+            MaterializedResult rows,
+            TestingDruidServer testingDruidServer,
+            String sourceDatasource,
+            String targetDatasource,
+            Optional<String> fileName)
+            throws IOException, InterruptedException
+    {
+        String tsvFileLocation = format("%s/%s.tsv", testingDruidServer.getHostWorkingDirectory(), targetDatasource);
+        writeDataAsTsv(rows, tsvFileLocation);
+        testingDruidServer.ingestData(
+                targetDatasource,
+                fileName,
+                Resources.toString(
+                        getResource(getIngestionSpecFileName(sourceDatasource)),
+                        Charset.defaultCharset()),
+                tsvFileLocation);
+    }
+
     public static void copyAndIngestTpchData(MaterializedResult rows, TestingDruidServer testingDruidServer, String druidDatasource)
             throws IOException, InterruptedException
     {
@@ -98,6 +122,7 @@ public static void copyAndIngestTpchData(MaterializedResult rows, TestingDruidSe
         writeDataAsTsv(rows, tsvFileLocation);
         testingDruidServer.ingestData(
                 druidDatasource,
+                Optional.empty(),
                 Resources.toString(
                         getResource(getIngestionSpecFileName(druidDatasource)),
                         Charset.defaultCharset()),
@@ -142,6 +167,7 @@ public static void main(String[] args)
         DistributedQueryRunner queryRunner = createDruidQueryRunnerTpch(
                 new TestingDruidServer(),
                 ImmutableMap.of("http-server.http.port", "8080"),
+                ImmutableMap.of(),
                 ImmutableList.of(ORDERS, LINE_ITEM, NATION, REGION, PART, CUSTOMER));
 
         Logger log = Logger.get(DruidQueryRunner.class);
diff --git a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidCaseInsensitiveMapping.java b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidCaseInsensitiveMapping.java
new file mode 100644
index 000000000000..90d991607b0d
--- /dev/null
+++ b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidCaseInsensitiveMapping.java
@@ -0,0 +1,234 @@
+/*
+ * Licensed 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 io.trino.plugin.druid;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.base.mapping.TableMappingRule;
+import io.trino.plugin.jdbc.BaseCaseInsensitiveMappingTest;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.MaterializedResult;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.sql.SqlExecutor;
+import io.trino.testng.services.ManageTestResources;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.updateRuleBasedIdentifierMappingFile;
+import static io.trino.plugin.druid.DruidQueryRunner.copyAndIngestTpchDataFromSourceToTarget;
+import static io.trino.plugin.druid.DruidQueryRunner.createDruidQueryRunnerTpch;
+import static io.trino.plugin.druid.DruidTpchTables.SELECT_FROM_ORDERS;
+import static io.trino.plugin.druid.DruidTpchTables.SELECT_FROM_REGION;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.tpch.TpchTable.ORDERS;
+import static io.trino.tpch.TpchTable.REGION;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assumptions.abort;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestDruidCaseInsensitiveMapping
+        extends BaseCaseInsensitiveMappingTest
+{
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
+    private TestingDruidServer druidServer;
+    private Path mappingFile;
+
+    @AfterAll
+    public void destroy()
+    {
+        if (druidServer != null) {
+            druidServer.close();
+            druidServer = null;
+        }
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        druidServer = new TestingDruidServer();
+        mappingFile = createRuleBasedIdentifierMappingFile();
+        DistributedQueryRunner queryRunner = createDruidQueryRunnerTpch(
+                druidServer,
+                ImmutableMap.of(),
+                ImmutableMap.of("case-insensitive-name-matching", "true",
+                        "case-insensitive-name-matching.config-file", mappingFile.toFile().getAbsolutePath(),
+                        "case-insensitive-name-matching.config-file.refresh-period", "1ms"), // ~always refresh
+                ImmutableList.of(ORDERS, REGION));
+        copyAndIngestTpchDataFromSourceToTarget(queryRunner.execute(SELECT_FROM_ORDERS + " LIMIT 10"), this.druidServer, "orders", "MiXeD_CaSe", Optional.empty());
+
+        return queryRunner;
+    }
+
+    @Override
+    protected Path getMappingFile()
+    {
+        return requireNonNull(mappingFile, "mappingFile is null");
+    }
+
+    @Override
+    protected SqlExecutor onRemoteDatabase()
+    {
+        return druidServer::execute;
+    }
+
+    @Override
+    @Test
+    public void testNonLowerCaseTableName()
+    {
+        MaterializedResult expectedColumns = MaterializedResult.resultBuilder(getQueryRunner().getDefaultSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
+                .row("__time", "timestamp(3)", "", "")
+                .row("clerk", "varchar", "", "") // String columns are reported only as varchar
+                .row("comment", "varchar", "", "")
+                .row("custkey", "bigint", "", "") // Long columns are reported as bigint
+                .row("orderdate", "varchar", "", "")
+                .row("orderkey", "bigint", "", "")
+                .row("orderpriority", "varchar", "", "")
+                .row("orderstatus", "varchar", "", "")
+                .row("shippriority", "bigint", "", "") // Druid doesn't support int type
+                .row("totalprice", "double", "", "")
+                .build();
+        MaterializedResult actualColumns = computeActual("DESCRIBE MiXeD_CaSe");
+        assertThat(actualColumns).isEqualTo(expectedColumns);
+        assertQuery("SELECT COUNT(1) FROM druid.druid.mixed_case", "VALUES 10");
+        assertQuery("SELECT COUNT(1) FROM druid.druid.MIXED_CASE", "VALUES 10");
+    }
+
+    @Override
+    @Test
+    public void testTableNameClash()
+            throws Exception
+    {
+        updateRuleBasedIdentifierMappingFile(getMappingFile(), ImmutableList.of(), ImmutableList.of());
+
+        copyAndIngestTpchDataFromSourceToTarget(
+                getQueryRunner().execute(SELECT_FROM_REGION),
+                this.druidServer,
+                "region",
+                "CaseSensitiveName",
+                Optional.empty());
+        copyAndIngestTpchDataFromSourceToTarget(
+                getQueryRunner().execute(SELECT_FROM_REGION),
+                this.druidServer,
+                "region",
+                "casesensitivename",
+                // when you create a second datasource with the same name (ignoring case) the filename mentioned in firehose's ingestion config, must match with the first one.
+                // Otherwise druid's loadstatus (and system tables) fails to register the second datasource created.
+                Optional.of("CaseSensitiveName"));
+
+        assertThat(computeActual("SHOW TABLES").getOnlyColumn().filter("casesensitivename"::equals)).hasSize(1);
+        assertQueryFails("SHOW COLUMNS FROM casesensitivename", "Failed to find remote table name: Ambiguous name: casesensitivename");
+        assertQueryFails("SELECT * FROM casesensitivename", "Failed to find remote table name: Ambiguous name: casesensitivename");
+    }
+
+    @Override
+    @Test
+    public void testTableNameRuleMapping()
+            throws Exception
+    {
+        updateRuleBasedIdentifierMappingFile(
+                getMappingFile(),
+                ImmutableList.of(),
+                ImmutableList.of(new TableMappingRule("druid", "remote_table", "trino_table")));
+
+        copyAndIngestTpchDataFromSourceToTarget(getQueryRunner().execute(SELECT_FROM_REGION), this.druidServer, "region", "remote_table", Optional.empty());
+
+        assertThat(computeActual("SHOW TABLES FROM druid").getOnlyColumn())
+                .contains("trino_table");
+        assertQuery("SELECT COUNT(1) FROM druid.druid.trino_table", "VALUES 5");
+    }
+
+    @Override
+    @Test
+    public void testTableNameClashWithRuleMapping()
+            throws Exception
+    {
+        String schema = "druid";
+        List<TableMappingRule> tableMappingRules = ImmutableList.of(
+                new TableMappingRule(schema, "CaseSensitiveName", "casesensitivename_a"),
+                new TableMappingRule(schema, "casesensitivename", "casesensitivename_b"));
+        updateRuleBasedIdentifierMappingFile(getMappingFile(), ImmutableList.of(), tableMappingRules);
+
+        copyAndIngestTpchDataFromSourceToTarget(
+                getQueryRunner().execute(SELECT_FROM_REGION),
+                this.druidServer,
+                "region",
+                "CaseSensitiveName",
+                Optional.empty());
+        copyAndIngestTpchDataFromSourceToTarget(
+                getQueryRunner().execute(SELECT_FROM_REGION),
+                this.druidServer,
+                "region",
+                "casesensitivename",
+                // when you create a second datasource with the same name (ignoring case) the filename mentioned in firehose's ingestion config, must match with the first one.
+                // Otherwise druid's loadstatus (and system tables) fails to register the second datasource created.
+                Optional.of("CaseSensitiveName"));
+
+        assertThat(computeActual("SHOW TABLES FROM druid")
+                .getOnlyColumn()
+                .map(String.class::cast)
+                .filter(anObject -> anObject.startsWith("casesensitivename")))
+                .hasSize(2);
+        assertQuery("SELECT COUNT(1) FROM druid.druid.casesensitivename_a", "VALUES 5");
+        assertQuery("SELECT COUNT(1) FROM druid.druid.casesensitivename_b", "VALUES 5");
+    }
+
+    @Override
+    @Test
+    public void testNonLowerCaseSchemaName()
+    {
+        // related to https://github.com/trinodb/trino/issues/14700
+        abort("Druid connector only supports schema 'druid'.");
+    }
+
+    @Override
+    @Test
+    public void testSchemaAndTableNameRuleMapping()
+    {
+        // related to https://github.com/trinodb/trino/issues/14700
+        abort("Druid connector only supports schema 'druid'.");
+    }
+
+    @Override
+    @Test
+    public void testSchemaNameClash()
+    {
+        // related to https://github.com/trinodb/trino/issues/14700
+        abort("Druid connector only supports schema 'druid'.");
+    }
+
+    @Override
+    @Test
+    public void testSchemaNameClashWithRuleMapping()
+    {
+        // related to https://github.com/trinodb/trino/issues/14700
+        abort("Druid connector only supports schema 'druid'.");
+    }
+
+    @Override
+    @Test
+    public void testSchemaNameRuleMapping()
+    {
+        // related to https://github.com/trinodb/trino/issues/14700
+        abort("Druid connector only supports schema 'druid'.");
+    }
+}
diff --git a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidConnectorTest.java b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidConnectorTest.java
index 7d9073fa547c..c4c2ae91868b 100644
--- a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidConnectorTest.java
+++ b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidConnectorTest.java
@@ -15,26 +15,569 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.Session;
+import io.trino.plugin.jdbc.BaseJdbcConnectorTest;
+import io.trino.plugin.jdbc.JdbcTableHandle;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.sql.planner.assertions.PlanMatchPattern;
+import io.trino.sql.planner.plan.AggregationNode;
+import io.trino.sql.planner.plan.FilterNode;
+import io.trino.sql.planner.plan.JoinNode;
+import io.trino.sql.planner.plan.TableScanNode;
+import io.trino.sql.planner.plan.TopNNode;
+import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
+import io.trino.testing.TestingConnectorBehavior;
+import io.trino.testing.sql.SqlExecutor;
+import org.intellij.lang.annotations.Language;
+import org.testng.SkipException;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
 
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
+import static io.trino.plugin.druid.DruidQueryRunner.copyAndIngestTpchData;
+import static io.trino.plugin.druid.DruidQueryRunner.createDruidQueryRunnerTpch;
+import static io.trino.plugin.druid.DruidTpchTables.SELECT_FROM_ORDERS;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.output;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
+import static io.trino.testing.MaterializedResult.resultBuilder;
 import static io.trino.tpch.TpchTable.CUSTOMER;
 import static io.trino.tpch.TpchTable.LINE_ITEM;
 import static io.trino.tpch.TpchTable.NATION;
 import static io.trino.tpch.TpchTable.ORDERS;
 import static io.trino.tpch.TpchTable.PART;
 import static io.trino.tpch.TpchTable.REGION;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testng.Assert.assertFalse;
 
 public class TestDruidConnectorTest
-        extends BaseDruidConnectorTest
+        extends BaseJdbcConnectorTest
 {
+    private TestingDruidServer druidServer;
+
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        this.druidServer = new TestingDruidServer();
-        return DruidQueryRunner.createDruidQueryRunnerTpch(
+        druidServer = closeAfterClass(new TestingDruidServer());
+        return createDruidQueryRunnerTpch(
                 druidServer,
                 ImmutableMap.of(),
+                ImmutableMap.of(),
                 ImmutableList.of(ORDERS, LINE_ITEM, NATION, REGION, PART, CUSTOMER));
     }
+
+    @AfterClass(alwaysRun = true)
+    public void destroy()
+    {
+        druidServer = null; // closed by closeAfterClass
+    }
+
+    @Override
+    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
+    {
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN,
+                    SUPPORTS_AGGREGATION_PUSHDOWN,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_INSERT,
+                    SUPPORTS_RENAME_COLUMN,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
+
+    @Override
+    protected SqlExecutor onRemoteDatabase()
+    {
+        return druidServer::execute;
+    }
+
+    @Override
+    protected MaterializedResult getDescribeOrdersResult()
+    {
+        return resultBuilder(getSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
+                .row("__time", "timestamp(3)", "", "")
+                .row("clerk", "varchar", "", "") // String columns are reported only as varchar
+                .row("comment", "varchar", "", "")
+                .row("custkey", "bigint", "", "") // Long columns are reported as bigint
+                .row("orderdate", "varchar", "", "")
+                .row("orderkey", "bigint", "", "")
+                .row("orderpriority", "varchar", "", "")
+                .row("orderstatus", "varchar", "", "")
+                .row("shippriority", "bigint", "", "") // Druid doesn't support int type
+                .row("totalprice", "double", "", "")
+                .build();
+    }
+
+    @org.junit.jupiter.api.Test
+    @Override
+    public void testShowColumns()
+    {
+        assertThat(query("SHOW COLUMNS FROM orders")).matches(getDescribeOrdersResult());
+    }
+
+    @Test
+    public void testDriverBehaviorForStoredUpperCaseIdentifiers()
+            throws SQLException
+    {
+        DatabaseMetaData metadata = druidServer.getConnection().getMetaData();
+        // if this fails we need to revisit the RemoteIdentifierSupplier implementation since the driver has probably been fixed - today it returns true even though identifiers are stored in lowercase
+        assertThat(metadata.storesUpperCaseIdentifiers()).isTrue();
+    }
+
+    @Test
+    @Override
+    public void testShowCreateTable()
+    {
+        assertThat(computeActual("SHOW CREATE TABLE orders").getOnlyValue())
+                .isEqualTo("CREATE TABLE druid.druid.orders (\n" +
+                        "   __time timestamp(3) NOT NULL,\n" +
+                        "   clerk varchar,\n" +
+                        "   comment varchar,\n" +
+                        "   custkey bigint NOT NULL,\n" +
+                        "   orderdate varchar,\n" +
+                        "   orderkey bigint NOT NULL,\n" +
+                        "   orderpriority varchar,\n" +
+                        "   orderstatus varchar,\n" +
+                        "   shippriority bigint NOT NULL,\n" +
+                        "   totalprice double NOT NULL\n" +
+                        ")");
+    }
+
+    @Test
+    @Override
+    public void testSelectInformationSchemaColumns()
+    {
+        String catalog = getSession().getCatalog().get();
+        String schema = getSession().getSchema().get();
+        String schemaPattern = schema.replaceAll(".$", "_");
+
+        @Language("SQL") String ordersTableWithColumns = "VALUES " +
+                "('orders', 'orderkey'), " +
+                "('orders', 'custkey'), " +
+                "('orders', 'orderstatus'), " +
+                "('orders', 'totalprice'), " +
+                "('orders', 'orderdate'), " +
+                "('orders', '__time'), " +
+                "('orders', 'orderpriority'), " +
+                "('orders', 'clerk'), " +
+                "('orders', 'shippriority'), " +
+                "('orders', 'comment')";
+
+        assertQuery("SELECT table_schema FROM information_schema.columns WHERE table_schema = '" + schema + "' GROUP BY table_schema", "VALUES '" + schema + "'");
+        assertQuery("SELECT table_name FROM information_schema.columns WHERE table_name = 'orders' GROUP BY table_name", "VALUES 'orders'");
+        assertQuery("SELECT table_name, column_name FROM information_schema.columns WHERE table_schema = '" + schema + "' AND table_name = 'orders'", ordersTableWithColumns);
+        assertQuery("SELECT table_name, column_name FROM information_schema.columns WHERE table_schema = '" + schema + "' AND table_name LIKE '%rders'", ordersTableWithColumns);
+        assertQuery("SELECT table_name, column_name FROM information_schema.columns WHERE table_schema LIKE '" + schemaPattern + "' AND table_name LIKE '_rder_'", ordersTableWithColumns);
+        assertQuery(
+                "SELECT table_name, column_name FROM information_schema.columns " +
+                        "WHERE table_catalog = '" + catalog + "' AND table_schema = '" + schema + "' AND table_name LIKE '%orders%'",
+                ordersTableWithColumns);
+
+        assertQuerySucceeds("SELECT * FROM information_schema.columns");
+        assertQuery("SELECT DISTINCT table_name, column_name FROM information_schema.columns WHERE table_name LIKE '_rders'", ordersTableWithColumns);
+        assertQuerySucceeds("SELECT * FROM information_schema.columns WHERE table_catalog = '" + catalog + "'");
+        assertQuerySucceeds("SELECT * FROM information_schema.columns WHERE table_catalog = '" + catalog + "' AND table_schema = '" + schema + "'");
+        assertQuery("SELECT table_name, column_name FROM information_schema.columns WHERE table_catalog = '" + catalog + "' AND table_schema = '" + schema + "' AND table_name LIKE '_rders'", ordersTableWithColumns);
+        assertQuerySucceeds("SELECT * FROM information_schema.columns WHERE table_catalog = '" + catalog + "' AND table_name LIKE '%'");
+        assertQuery("SELECT column_name FROM information_schema.columns WHERE table_catalog = 'something_else'", "SELECT '' WHERE false");
+    }
+
+    @Test
+    @Override
+    public void testSelectAll()
+    {
+        // List columns explicitly, as Druid has an additional __time column
+        assertQuery("SELECT orderkey, custkey, orderstatus, totalprice, orderdate, orderpriority, clerk, shippriority, comment  FROM orders");
+    }
+
+    /**
+     * This test verifies that the filtering we have in place to overcome Druid's limitation of
+     * not handling the escaping of search characters like % and _, works correctly.
+     * <p>
+     * See {@link DruidJdbcClient#getTableHandle(ConnectorSession, SchemaTableName)} and
+     * {@link DruidJdbcClient#getColumns(ConnectorSession, JdbcTableHandle)}
+     */
+    @Test
+    public void testFilteringForTablesAndColumns()
+            throws Exception
+    {
+        String sql = SELECT_FROM_ORDERS + " LIMIT 10";
+        String datasourceA = "some_table";
+        MaterializedResult materializedRows = getQueryRunner().execute(sql);
+        copyAndIngestTpchData(materializedRows, druidServer, datasourceA);
+        String datasourceB = "somextable";
+        copyAndIngestTpchData(materializedRows, druidServer, datasourceB);
+
+        // Assert that only columns from datsourceA are returned
+        MaterializedResult expectedColumns = MaterializedResult.resultBuilder(getSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
+                .row("__time", "timestamp(3)", "", "")
+                .row("clerk", "varchar", "", "") // String columns are reported only as varchar
+                .row("comment", "varchar", "", "")
+                .row("custkey", "bigint", "", "") // Long columns are reported as bigint
+                .row("orderdate", "varchar", "", "")
+                .row("orderkey", "bigint", "", "")
+                .row("orderpriority", "varchar", "", "")
+                .row("orderstatus", "varchar", "", "")
+                .row("shippriority", "bigint", "", "") // Druid doesn't support int type
+                .row("totalprice", "double", "", "")
+                .build();
+        assertThat(query("DESCRIBE " + datasourceA)).matches(expectedColumns);
+
+        // Assert that only columns from datsourceB are returned
+        expectedColumns = MaterializedResult.resultBuilder(getSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
+                .row("__time", "timestamp(3)", "", "")
+                .row("clerk_x", "varchar", "", "") // String columns are reported only as varchar
+                .row("comment_x", "varchar", "", "")
+                .row("custkey_x", "bigint", "", "") // Long columns are reported as bigint
+                .row("orderdate_x", "varchar", "", "")
+                .row("orderkey_x", "bigint", "", "")
+                .row("orderpriority_x", "varchar", "", "")
+                .row("orderstatus_x", "varchar", "", "")
+                .row("shippriority_x", "bigint", "", "") // Druid doesn't support int type
+                .row("totalprice_x", "double", "", "")
+                .build();
+        assertThat(query("DESCRIBE " + datasourceB)).matches(expectedColumns);
+    }
+
+    @Test
+    public void testLimitPushDown()
+    {
+        assertThat(query("SELECT name FROM nation LIMIT 30")).isFullyPushedDown(); // Use high limit for result determinism
+
+        // with filter over numeric column
+        assertThat(query("SELECT name FROM nation WHERE regionkey = 3 LIMIT 5")).isFullyPushedDown();
+
+        // with filter over varchar column
+        assertThat(query("SELECT name FROM nation WHERE name < 'EEE' LIMIT 5")).isFullyPushedDown();
+
+        // with aggregation
+        assertThat(query("SELECT max(regionkey) FROM nation LIMIT 5")).isNotFullyPushedDown(AggregationNode.class); // global aggregation, LIMIT removed TODO https://github.com/trinodb/trino/pull/4313
+        assertThat(query("SELECT regionkey, max(name) FROM nation GROUP BY regionkey LIMIT 5")).isNotFullyPushedDown(AggregationNode.class); // TODO https://github.com/trinodb/trino/pull/4313
+
+        // distinct limit can be pushed down even without aggregation pushdown
+        assertThat(query("SELECT DISTINCT regionkey FROM nation LIMIT 5")).isFullyPushedDown();
+
+        // with aggregation and filter over numeric column
+        assertThat(query("SELECT regionkey, count(*) FROM nation WHERE nationkey < 5 GROUP BY regionkey LIMIT 3")).isNotFullyPushedDown(AggregationNode.class); // TODO https://github.com/trinodb/trino/pull/4313
+        // with aggregation and filter over varchar column
+        assertThat(query("SELECT regionkey, count(*) FROM nation WHERE name < 'EGYPT' GROUP BY regionkey LIMIT 3")).isNotFullyPushedDown(AggregationNode.class); // TODO https://github.com/trinodb/trino/pull/4313
+
+        // with TopN over numeric column
+        assertThat(query("SELECT * FROM (SELECT regionkey FROM nation ORDER BY nationkey ASC LIMIT 10) LIMIT 5")).isNotFullyPushedDown(TopNNode.class);
+        // with TopN over varchar column
+        assertThat(query("SELECT * FROM (SELECT regionkey FROM nation ORDER BY name ASC LIMIT 10) LIMIT 5")).isNotFullyPushedDown(TopNNode.class);
+
+        // with join
+        PlanMatchPattern joinOverTableScans = node(JoinNode.class,
+                anyTree(node(TableScanNode.class)),
+                anyTree(node(TableScanNode.class)));
+        assertThat(query(
+                joinPushdownEnabled(getSession()),
+                "SELECT n.name, r.name " +
+                        "FROM nation n " +
+                        "LEFT JOIN region r USING (regionkey) " +
+                        "LIMIT 30"))
+                .isNotFullyPushedDown(joinOverTableScans);
+    }
+
+    @Test
+    @Override
+    public void testInsertNegativeDate()
+    {
+        throw new SkipException("Druid connector does not map 'orderdate' column to date type and INSERT statement");
+    }
+
+    @Test
+    @Override
+    public void testDateYearOfEraPredicate()
+    {
+        throw new SkipException("Druid connector does not map 'orderdate' column to date type");
+    }
+
+    @Override
+    public void testCharTrailingSpace()
+    {
+        assertThatThrownBy(super::testCharTrailingSpace)
+                .hasMessageContaining("Error while executing SQL \"CREATE TABLE druid.char_trailing_space");
+        throw new SkipException("Implement test for Druid");
+    }
+
+    @Override
+    public void testNativeQuerySelectFromTestTable()
+    {
+        throw new SkipException("cannot create test table for Druid");
+    }
+
+    @Override
+    public void testNativeQueryCreateStatement()
+    {
+        // override because Druid fails to prepare statement, while other connectors succeed in preparing statement and then fail because of no metadata available
+        assertFalse(getQueryRunner().tableExists(getSession(), "numbers"));
+        assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'CREATE TABLE numbers(n INTEGER)'))"))
+                .hasMessageContaining("Failed to get table handle for prepared query");
+        assertFalse(getQueryRunner().tableExists(getSession(), "numbers"));
+    }
+
+    @Override
+    public void testNativeQueryInsertStatementTableExists()
+    {
+        throw new SkipException("cannot create test table for Druid");
+    }
+
+    @Test
+    public void testPredicatePushdown()
+    {
+        // varchar equality
+        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE name = 'ROMANIA'"))
+                .matches("VALUES (BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar))")
+                .isFullyPushedDown();
+
+        // varchar range
+        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE name BETWEEN 'POLAND' AND 'RPA'"))
+                .matches("VALUES (BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar))")
+                .isFullyPushedDown();
+
+        // varchar IN without domain compaction
+        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE name IN ('POLAND', 'ROMANIA', 'VIETNAM')"))
+                .matches("VALUES " +
+                        "(BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar)), " +
+                        "(BIGINT '2', BIGINT '21', CAST('VIETNAM' AS varchar))")
+                .isFullyPushedDown();
+
+        // varchar IN with small compaction threshold
+        assertThat(query(
+                Session.builder(getSession())
+                        .setCatalogSessionProperty("druid", "domain_compaction_threshold", "1")
+                        .build(),
+                "SELECT regionkey, nationkey, name FROM nation WHERE name IN ('POLAND', 'ROMANIA', 'VIETNAM')"))
+                .matches("VALUES " +
+                        "(BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar)), " +
+                        "(BIGINT '2', BIGINT '21', CAST('VIETNAM' AS varchar))")
+                // Filter node is retained as no constraint is pushed into connector.
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // varchar different case
+        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE name = 'romania'"))
+                .returnsEmptyResult()
+                .isFullyPushedDown();
+
+        // bigint equality
+        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE nationkey = 19"))
+                .matches("VALUES (BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar))")
+                .isFullyPushedDown();
+
+        // bigint equality with small compaction threshold
+        assertThat(query(
+                Session.builder(getSession())
+                        .setCatalogSessionProperty("druid", "domain_compaction_threshold", "1")
+                        .build(),
+                "SELECT regionkey, nationkey, name FROM nation WHERE nationkey IN (19, 21)"))
+                .matches("VALUES " +
+                        "(BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar)), " +
+                        "(BIGINT '2', BIGINT '21', CAST('VIETNAM' AS varchar))")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // bigint range, with decimal to bigint simplification
+        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE nationkey BETWEEN 18.5 AND 19.5"))
+                .matches("VALUES (BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar))")
+                .isFullyPushedDown();
+
+        // Druid doesn't support Aggregation Pushdown
+        assertThat(query("SELECT * FROM (SELECT regionkey, sum(nationkey) FROM nation GROUP BY regionkey) WHERE regionkey = 3"))
+                .matches("VALUES (BIGINT '3', BIGINT '77')")
+                .isNotFullyPushedDown(AggregationNode.class);
+
+        // Druid doesn't support Aggregation Pushdown
+        assertThat(query("SELECT regionkey, sum(nationkey) FROM nation GROUP BY regionkey HAVING sum(nationkey) = 77"))
+                .matches("VALUES (BIGINT '3', BIGINT '77')")
+                .isNotFullyPushedDown(AggregationNode.class);
+    }
+
+    @Test
+    public void testPredicatePushdownForTimestampWithSecondsPrecision()
+    {
+        // timestamp equality
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time = TIMESTAMP '1992-01-04 00:00:00'"))
+                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
+                .isFullyPushedDown();
+
+        // timestamp comparison
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time < TIMESTAMP '1992-01-05'"))
+                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time <= TIMESTAMP '1992-01-04'"))
+                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time > TIMESTAMP '1998-11-28'"))
+                .matches("VALUES " +
+                        "(BIGINT '2', BIGINT '370', CAST('RAIL' AS varchar)), " +
+                        "(BIGINT '2', BIGINT '468', CAST('AIR' AS varchar))")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time >= TIMESTAMP '1998-11-29 00:00:00'"))
+                .matches("VALUES " +
+                        "(BIGINT '2', BIGINT '370', CAST('RAIL' AS varchar)), " +
+                        "(BIGINT '2', BIGINT '468', CAST('AIR' AS varchar))")
+                .isFullyPushedDown();
+
+        // timestamp range
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time BETWEEN TIMESTAMP '1992-01-01' AND TIMESTAMP '1992-01-05'"))
+                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
+                .isFullyPushedDown();
+
+        // varchar IN without domain compaction
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time IN (TIMESTAMP '1992-01-04', TIMESTAMP '1998-11-27 00:00:00.000', TIMESTAMP '1998-11-28')"))
+                .matches("VALUES " +
+                        "(BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar)), " +
+                        "(BIGINT '1', BIGINT '574', CAST('AIR' AS varchar))")
+                .isFullyPushedDown();
+
+        // varchar IN with small compaction threshold
+        assertThat(query(
+                Session.builder(getSession())
+                        .setCatalogSessionProperty("druid", "domain_compaction_threshold", "1")
+                        .build(),
+                "SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time IN (TIMESTAMP '1992-01-04', TIMESTAMP '1998-11-27 00:00:00', TIMESTAMP '1998-11-28')"))
+                .matches("VALUES " +
+                        "(BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar)), " +
+                        "(BIGINT '1', BIGINT '574', CAST('AIR' AS varchar))")
+                // Filter node is retained as no constraint is pushed into connector.
+                .isNotFullyPushedDown(FilterNode.class);
+    }
+
+    @Test
+    public void testPredicatePushdownForTimestampWithMillisPrecision()
+    {
+        // timestamp equality
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time = TIMESTAMP '1992-01-04 00:00:00.001'"))
+                .returnsEmptyResult()
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // timestamp comparison
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time < TIMESTAMP '1992-01-05 00:00:00.001'"))
+                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time <= TIMESTAMP '1992-01-04 00:00:00.001'"))
+                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time > TIMESTAMP '1998-11-28 00:00:00.001'"))
+                .matches("VALUES " +
+                        "(BIGINT '2', BIGINT '370', CAST('RAIL' AS varchar)), " +
+                        "(BIGINT '2', BIGINT '468', CAST('AIR' AS varchar))")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time >= TIMESTAMP '1998-11-29 00:00:00.001'"))
+                .returnsEmptyResult()
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // timestamp range
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time BETWEEN TIMESTAMP '1992-01-01 00:00:00.001' AND TIMESTAMP '1992-01-05'"))
+                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time BETWEEN TIMESTAMP '1992-01-01' AND TIMESTAMP '1992-01-05 00:00:00.001'"))
+                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // timestamp IN without domain compaction
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time IN (TIMESTAMP '1992-01-04', TIMESTAMP '1998-11-27 00:00:00.000', TIMESTAMP '1998-11-28')"))
+                .matches("VALUES " +
+                        "(BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar)), " +
+                        "(BIGINT '1', BIGINT '574', CAST('AIR' AS varchar))")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time IN (TIMESTAMP '1992-01-04', TIMESTAMP '1998-11-27', TIMESTAMP '1998-11-28 00:00:00.001')"))
+                .matches("VALUES " +
+                        "(BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar)), " +
+                        "(BIGINT '1', BIGINT '574', CAST('AIR' AS varchar))")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // timestamp IN with small compaction threshold
+        assertThat(query(
+                Session.builder(getSession())
+                        .setCatalogSessionProperty("druid", "domain_compaction_threshold", "1")
+                        .build(),
+                "SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time IN (TIMESTAMP '1992-01-04', TIMESTAMP '1998-11-27 00:00:00.000', TIMESTAMP '1998-11-28')"))
+                .matches("VALUES " +
+                        "(BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar)), " +
+                        "(BIGINT '1', BIGINT '574', CAST('AIR' AS varchar))")
+                // Filter node is retained as no constraint is pushed into connector.
+                .isNotFullyPushedDown(FilterNode.class);
+    }
+
+    @Test
+    public void testPredicatePushdownForTimestampWithHigherPrecision()
+    {
+        testPredicatePushdownForTimestampWithHigherPrecision("1992-01-04 00:00:00.1234");
+        testPredicatePushdownForTimestampWithHigherPrecision("1992-01-04 00:00:00.12345");
+        testPredicatePushdownForTimestampWithHigherPrecision("1992-01-04 00:00:00.123456");
+        testPredicatePushdownForTimestampWithHigherPrecision("1992-01-04 00:00:00.1234567");
+        testPredicatePushdownForTimestampWithHigherPrecision("1992-01-04 00:00:00.12345678");
+        testPredicatePushdownForTimestampWithHigherPrecision("1992-01-04 00:00:00.123456789");
+        testPredicatePushdownForTimestampWithHigherPrecision("1992-01-04 00:00:00.1234567891");
+        testPredicatePushdownForTimestampWithHigherPrecision("1992-01-04 00:00:00.12345678912");
+        testPredicatePushdownForTimestampWithHigherPrecision("1992-01-04 00:00:00.123456789123");
+    }
+
+    private void testPredicatePushdownForTimestampWithHigherPrecision(String timestamp)
+    {
+        // timestamp equality
+        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time = TIMESTAMP '%s'", timestamp)))
+                .returnsEmptyResult()
+                .matches(output(
+                        values("linenumber", "partkey", "shipmode")));
+
+        // timestamp comparison
+        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time < TIMESTAMP '%s'", timestamp)))
+                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time <= TIMESTAMP '%s'", timestamp)))
+                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time > (TIMESTAMP '%s' + INTERVAL '2520' DAY)", timestamp)))
+                .matches("VALUES " +
+                        "(BIGINT '2', BIGINT '370', CAST('RAIL' AS varchar)), " +
+                        "(BIGINT '2', BIGINT '468', CAST('AIR' AS varchar))")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time >= (TIMESTAMP '%s' + INTERVAL '2521' DAY)", timestamp)))
+                .returnsEmptyResult()
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // timestamp range
+        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time BETWEEN TIMESTAMP '1992-01-04' AND TIMESTAMP '%s'", timestamp)))
+                .matches("VALUES (BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar))")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // varchar IN without domain compaction
+        assertThat(query(format("SELECT linenumber, partkey, shipmode FROM lineitem WHERE __time IN (TIMESTAMP '1992-01-04', TIMESTAMP '1998-11-27', TIMESTAMP '%s')", timestamp)))
+                .matches("VALUES " +
+                        "(BIGINT '3', BIGINT '1673', CAST('RAIL' AS varchar)), " +
+                        "(BIGINT '1', BIGINT '574', CAST('AIR' AS varchar))")
+                .isNotFullyPushedDown(FilterNode.class);
+    }
 }
diff --git a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidJdbcPlugin.java b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidJdbcPlugin.java
index ce1a88b816df..72e4dc9bebab 100644
--- a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidJdbcPlugin.java
+++ b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidJdbcPlugin.java
@@ -17,7 +17,7 @@
 import io.trino.spi.Plugin;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 
diff --git a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidLatestConnectorSmokeTest.java b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidLatestConnectorSmokeTest.java
new file mode 100644
index 000000000000..a8aadb065602
--- /dev/null
+++ b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidLatestConnectorSmokeTest.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed 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 io.trino.plugin.druid;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.jdbc.BaseJdbcConnectorSmokeTest;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.TestingConnectorBehavior;
+import io.trino.testng.services.ManageTestResources;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import static io.trino.plugin.druid.DruidQueryRunner.createDruidQueryRunnerTpch;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestDruidLatestConnectorSmokeTest
+        extends BaseJdbcConnectorSmokeTest
+{
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
+    private TestingDruidServer druidServer;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        druidServer = closeAfterClass(new TestingDruidServer("apache/druid:0.20.0"));
+        return createDruidQueryRunnerTpch(
+                druidServer,
+                ImmutableMap.of(),
+                ImmutableMap.of(),
+                REQUIRED_TPCH_TABLES);
+    }
+
+    @AfterAll
+    public void destroy()
+    {
+        druidServer = null; // closed by closeAfterClass
+    }
+
+    @Override
+    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
+    {
+        return switch (connectorBehavior) {
+            case SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_INSERT,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
+
+    @Test
+    @Override // Override because an additional '__time' column exists
+    public void testSelectInformationSchemaColumns()
+    {
+        assertThat(query("SELECT column_name FROM information_schema.columns WHERE table_schema = 'druid' AND table_name = 'region'"))
+                .skippingTypesCheck()
+                .matches("VALUES '__time', 'regionkey', 'name', 'comment'");
+    }
+
+    @Test
+    @Override // Override because an additional '__time' column exists
+    public void testShowCreateTable()
+    {
+        assertThat(computeActual("SHOW CREATE TABLE region").getOnlyValue())
+                .isEqualTo("""
+                        CREATE TABLE druid.druid.region (
+                           __time timestamp(3) NOT NULL,
+                           comment varchar,
+                           name varchar,
+                           regionkey bigint NOT NULL
+                        )""");
+    }
+}
diff --git a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidLatestConnectorTest.java b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidLatestConnectorTest.java
deleted file mode 100644
index d7174e6a61d2..000000000000
--- a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidLatestConnectorTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.druid;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import io.trino.testing.QueryRunner;
-
-import static io.trino.tpch.TpchTable.CUSTOMER;
-import static io.trino.tpch.TpchTable.LINE_ITEM;
-import static io.trino.tpch.TpchTable.NATION;
-import static io.trino.tpch.TpchTable.ORDERS;
-import static io.trino.tpch.TpchTable.PART;
-import static io.trino.tpch.TpchTable.REGION;
-
-public class TestDruidLatestConnectorTest
-        extends BaseDruidConnectorTest
-{
-    private static final String LATEST_DRUID_DOCKER_IMAGE = "apache/druid:0.20.0";
-
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        this.druidServer = new TestingDruidServer(LATEST_DRUID_DOCKER_IMAGE);
-        return DruidQueryRunner.createDruidQueryRunnerTpch(
-                druidServer,
-                ImmutableMap.of(),
-                ImmutableList.of(ORDERS, LINE_ITEM, NATION, REGION, PART, CUSTOMER));
-    }
-}
diff --git a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidTypeMapping.java b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidTypeMapping.java
index a2801ffacc5e..3be97ff70345 100644
--- a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidTypeMapping.java
+++ b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestDruidTypeMapping.java
@@ -15,21 +15,35 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.druid.ingestion.IndexTaskBuilder;
+import io.trino.plugin.druid.ingestion.TimestampSpec;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.datatype.DataSetup;
 import io.trino.testing.datatype.SqlDataTypeTest;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.util.List;
+import java.util.Optional;
+
+import static io.trino.plugin.druid.DruidQueryRunner.createDruidQueryRunnerTpch;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static java.lang.String.format;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDruidTypeMapping
         extends AbstractTestQueryFramework
 {
@@ -41,10 +55,10 @@ protected QueryRunner createQueryRunner()
             throws Exception
     {
         this.druidServer = new TestingDruidServer(DRUID_DOCKER_IMAGE);
-        return DruidQueryRunner.createDruidQueryRunnerTpch(druidServer, ImmutableMap.of(), ImmutableList.of());
+        return createDruidQueryRunnerTpch(druidServer, ImmutableMap.of(), ImmutableMap.of(), ImmutableList.of());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         druidServer.close();
@@ -169,50 +183,78 @@ public void testVarchar()
                 .execute(getQueryRunner(), druidCreateAndInsert("test_unbounded_varchar"));
     }
 
-    @Test(dataProvider = "timestampValuesProvider")
-    public void testTimestamp(String inputLiteral, String expectedLiteral)
-    {
-        SqlDataTypeTest.create()
-                .addRoundTrip("__time", "timestamp", inputLiteral, TIMESTAMP_MILLIS, expectedLiteral)
-                .addRoundTrip("col_0", "long", "0", BIGINT, "BIGINT '0'")
-                .execute(getQueryRunner(), druidCreateAndInsert("test_timestamp"));
-    }
-
-    @DataProvider
-    public Object[][] timestampValuesProvider()
+    @Test
+    public void testTimestamp()
+            throws Exception
     {
-        return new Object[][] {
-                //before epoch
-                {"1958-01-01 13:18:03.123", "TIMESTAMP '1958-01-01 13:18:03.123'"},
+        int id = 1;
+        List<TimestampCase> rows = ImmutableList.<TimestampCase>builder()
+                // before epoch
+                .add(new TimestampCase("1958-01-01 13:18:03.123", "TIMESTAMP '1958-01-01 13:18:03.123'", id++))
                 // after epoch
-                {"2019-03-18 10:01:17.987", "TIMESTAMP '2019-03-18 10:01:17.987'"},
+                .add(new TimestampCase("2019-03-18 10:01:17.987", "TIMESTAMP '2019-03-18 10:01:17.987'", id++))
                 // time doubled in JVM zone
-                {"2018-10-28 01:33:17.456", "TIMESTAMP '2018-10-28 01:33:17.456'"},
+                .add(new TimestampCase("2018-10-28 01:33:17.456", "TIMESTAMP '2018-10-28 01:33:17.456'", id++))
                 // time doubled in JVM zone
-                {"2018-10-28 03:33:33.333", "TIMESTAMP '2018-10-28 03:33:33.333'"},
+                .add(new TimestampCase("2018-10-28 03:33:33.333", "TIMESTAMP '2018-10-28 03:33:33.333'", id++))
                 // epoch
-                {"1970-01-01 00:00:00.000", "TIMESTAMP '1970-01-01 00:00:00.000'"},
+                .add(new TimestampCase("1970-01-01 00:00:00.000", "TIMESTAMP '1970-01-01 00:00:00.000'", id++))
                 // time gap in JVM zone
-                {"1970-01-01 00:13:42.000", "TIMESTAMP '1970-01-01 00:13:42.000'"},
-                {"2018-04-01 02:13:55.123", "TIMESTAMP '2018-04-01 02:13:55.123'"},
+                .add(new TimestampCase("1970-01-01 00:13:42.000", "TIMESTAMP '1970-01-01 00:13:42.000'", id++))
+                .add(new TimestampCase("2018-04-01 02:13:55.123", "TIMESTAMP '2018-04-01 02:13:55.123'", id++))
                 // time gap in Vilnius
-                {"2018-03-25 03:17:17.000", "TIMESTAMP '2018-03-25 03:17:17.000'"},
+                .add(new TimestampCase("2018-03-25 03:17:17.000", "TIMESTAMP '2018-03-25 03:17:17.000'", id++))
                 // time gap in Kathmandu
-                {"1986-01-01 00:13:07.000", "TIMESTAMP '1986-01-01 00:13:07.000'"},
+                .add(new TimestampCase("1986-01-01 00:13:07.000", "TIMESTAMP '1986-01-01 00:13:07.000'", id++))
                 // test arbitrary time for all supported precisions
-                {"1970-01-01 00:00:00", "TIMESTAMP '1970-01-01 00:00:00.000'"},
-                {"1970-01-01 00:00:00.1", "TIMESTAMP '1970-01-01 00:00:00.100'"},
-                {"1970-01-01 00:00:00.12", "TIMESTAMP '1970-01-01 00:00:00.120'"},
-                {"1970-01-01 00:00:00.123", "TIMESTAMP '1970-01-01 00:00:00.123'"},
-                {"1970-01-01 00:00:00.1239", "TIMESTAMP '1970-01-01 00:00:00.123'"},
-                {"1970-01-01 00:00:00.12399", "TIMESTAMP '1970-01-01 00:00:00.123'"},
-                {"1970-01-01 00:00:00.123999", "TIMESTAMP '1970-01-01 00:00:00.123'"},
-                {"1970-01-01 00:00:00.1239999", "TIMESTAMP '1970-01-01 00:00:00.123'"},
-                {"1970-01-01 00:00:00.12399999", "TIMESTAMP '1970-01-01 00:00:00.123'"},
-                {"1970-01-01 00:00:00.123999999", "TIMESTAMP '1970-01-01 00:00:00.123'"},
+                .add(new TimestampCase("1970-01-01 00:00:01", "TIMESTAMP '1970-01-01 00:00:01.000'", id++))
+                .add(new TimestampCase("1970-01-01 00:00:02.1", "TIMESTAMP '1970-01-01 00:00:02.100'", id++))
+                .add(new TimestampCase("1970-01-01 00:00:03.12", "TIMESTAMP '1970-01-01 00:00:03.120'", id++))
+                .add(new TimestampCase("1970-01-01 00:00:04.123", "TIMESTAMP '1970-01-01 00:00:04.123'", id++))
+                .add(new TimestampCase("1970-01-01 00:00:05.1239", "TIMESTAMP '1970-01-01 00:00:05.123'", id++))
+                .add(new TimestampCase("1970-01-01 00:00:06.12399", "TIMESTAMP '1970-01-01 00:00:06.123'", id++))
+                .add(new TimestampCase("1970-01-01 00:00:07.123999", "TIMESTAMP '1970-01-01 00:00:07.123'", id++))
+                .add(new TimestampCase("1970-01-01 00:00:08.1239999", "TIMESTAMP '1970-01-01 00:00:08.123'", id++))
+                .add(new TimestampCase("1970-01-01 00:00:09.12399999", "TIMESTAMP '1970-01-01 00:00:09.123'", id++))
+                .add(new TimestampCase("1970-01-01 00:00:00.123999999", "TIMESTAMP '1970-01-01 00:00:00.123'", id++))
                 // before epoch with second fraction
-                {"1969-12-31 23:59:59.1230000", "TIMESTAMP '1969-12-31 23:59:59.123'"}
-        };
+                .add(new TimestampCase("1969-12-31 23:59:59.1230000", "TIMESTAMP '1969-12-31 23:59:59.123'", id))
+                .build();
+
+        try (DruidTable testTable = new DruidTable("test_timestamp")) {
+            String dataFilePath = format("%s/%s.tsv", druidServer.getHostWorkingDirectory(), testTable.getName());
+            try (BufferedWriter writer = new BufferedWriter(new FileWriter(dataFilePath, UTF_8))) {
+                for (TimestampCase row : rows) {
+                    writer.write("%s\t%s".formatted(row.inputLiteral, row.id));
+                    writer.newLine();
+                }
+            }
+            String dataSource = testTable.getName();
+            IndexTaskBuilder builder = new IndexTaskBuilder();
+            builder.setDatasource(dataSource);
+            TimestampSpec timestampSpec = new TimestampSpec("dummy_druid_ts", "auto");
+            builder.setTimestampSpec(timestampSpec);
+            builder.addColumn("id", "long");
+            druidServer.ingestData(testTable.getName(), Optional.empty(), builder.build(), dataFilePath);
+
+            for (TimestampCase row : rows) {
+                assertThat(query("SELECT __time FROM druid.druid." + testTable.getName() + " WHERE id = " + row.id))
+                        .as("input: %s, expected: %s, id: %s", row.inputLiteral, row.expectedLiteral, row.id)
+                        .matches("VALUES " + row.expectedLiteral);
+                assertThat(query("SELECT id FROM druid.druid." + testTable.getName() + " WHERE __time = " + row.expectedLiteral))
+                        .as("input: %s, expected: %s, id: %s", row.inputLiteral, row.expectedLiteral, row.id)
+                        .matches("VALUES BIGINT '" + row.id + "'");
+            }
+        }
+    }
+
+    private record TimestampCase(String inputLiteral, String expectedLiteral, int id)
+    {
+        private TimestampCase
+        {
+            requireNonNull(inputLiteral, "inputLiteral is null");
+            requireNonNull(expectedLiteral, "expectedLiteral is null");
+        }
     }
 
     private DataSetup druidCreateAndInsert(String dataSourceName)
diff --git a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestingDruidServer.java b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestingDruidServer.java
index e6f411edacbd..f8108b5c9130 100644
--- a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestingDruidServer.java
+++ b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/TestingDruidServer.java
@@ -13,7 +13,10 @@
  */
 package io.trino.plugin.druid;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.io.Closer;
 import com.google.common.io.MoreFiles;
 import okhttp3.OkHttpClient;
@@ -37,6 +40,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Map;
+import java.util.Optional;
 
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static java.lang.String.format;
@@ -212,7 +216,7 @@ public String getJdbcUrl()
 
     public void execute(String sql)
     {
-        try (Connection connection = DriverManager.getConnection(getJdbcUrl());
+        try (Connection connection = getConnection();
                 Statement statement = connection.createStatement()) {
             statement.execute(sql);
         }
@@ -221,6 +225,12 @@ public void execute(String sql)
         }
     }
 
+    public Connection getConnection()
+            throws SQLException
+    {
+        return DriverManager.getConnection(getJdbcUrl());
+    }
+
     public int getCoordinatorOverlordPort()
     {
         return coordinator.getMappedPort(DRUID_COORDINATOR_PORT);
@@ -231,12 +241,13 @@ private static String getJdbcUrl(int port)
         return format("jdbc:avatica:remote:url=http://localhost:%s/druid/v2/sql/avatica/", port);
     }
 
-    void ingestData(String datasource, String indexTask, String dataFilePath)
+    void ingestData(String datasource, Optional<String> fileName, String indexTask, String dataFilePath)
             throws IOException, InterruptedException
     {
         middleManager.withCopyFileToContainer(forHostPath(dataFilePath),
                 getMiddleManagerContainerPathForDataFile(dataFilePath));
 
+        indexTask = getReplacedIndexTask(datasource, fileName, indexTask);
         Request.Builder requestBuilder = new Request.Builder();
         requestBuilder.addHeader("content-type", "application/json;charset=utf-8")
                 .url("http://localhost:" + getCoordinatorOverlordPort() + "/druid/indexer/v1/task")
@@ -247,6 +258,28 @@ void ingestData(String datasource, String indexTask, String dataFilePath)
         }
     }
 
+    private String getReplacedIndexTask(String targetDataSource, Optional<String> fileName, String indexTask)
+    {
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            JsonNode jsonNode = mapper.readTree(indexTask);
+            // get the nested node and modify it
+            ((ObjectNode) jsonNode
+                    .get("spec")
+                    .get("dataSchema"))
+                    .put("dataSource", targetDataSource);
+            ((ObjectNode) jsonNode
+                    .get("spec")
+                    .get("ioConfig")
+                    .get("firehose"))
+                    .put("filter", fileName.orElse(targetDataSource) + ".tsv");
+            return mapper.writeValueAsString(jsonNode);
+        }
+        catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private boolean checkDatasourceAvailable(String datasource)
             throws IOException, InterruptedException
     {
diff --git a/plugin/trino-elasticsearch/pom.xml b/plugin/trino-elasticsearch/pom.xml
index cd2467d16bf5..b3967b96c2ea 100644
--- a/plugin/trino-elasticsearch/pom.xml
+++ b/plugin/trino-elasticsearch/pom.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-elasticsearch</artifactId>
-    <description>Trino - Elasticsearch Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Elasticsearch Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -21,100 +21,95 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
+            <exclusions>
+                <!-- org.elasticsearch:elasticsearch:6.8.23 brings in version 4.5.13 (vs 4.5.2)  -->
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-sts</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>stats</artifactId>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-core</artifactId>
-            <exclusions>
-                <!-- org.elasticsearch:elasticsearch:6.8.23 brings in version 4.5.13 (vs 4.5.2)  -->
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpclient</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>bootstrap</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-sts</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>concurrent</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>stats</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -133,7 +128,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
+            <version>4.5.14</version>
             <exclusions>
                 <!-- Brings in duplicate classes already in org.slf4j:jcl-over-slf4j (from io.airlift:log-manager) -->
                 <exclusion>
@@ -146,13 +141,13 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.4.13</version>
+            <version>4.4.16</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore-nio</artifactId>
-            <version>4.4.13</version>
+            <version>4.4.16</version>
         </dependency>
 
         <dependency>
@@ -164,16 +159,16 @@
                     <groupId>org.apache.logging.log4j</groupId>
                     <artifactId>log4j-api</artifactId>
                 </exclusion>
-                <!-- Brings in duplicate classes already in net.java.dev.jna:jna -->
-                <exclusion>
-                    <groupId>org.elasticsearch</groupId>
-                    <artifactId>jna</artifactId>
-                </exclusion>
                 <!-- trino-main brings in 8.4.1 (vs 7.7.3) -->
                 <exclusion>
                     <groupId>org.apache.lucene</groupId>
                     <artifactId>lucene-analyzers-common</artifactId>
                 </exclusion>
+                <!-- Brings in duplicate classes already in net.java.dev.jna:jna -->
+                <exclusion>
+                    <groupId>org.elasticsearch</groupId>
+                    <artifactId>jna</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -225,36 +220,33 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>node</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -264,7 +256,36 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>node</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>http-server</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-client</artifactId>
@@ -281,7 +302,6 @@
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
             <scope>test</scope>
-
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -295,7 +315,6 @@
             <artifactId>trino-main</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -336,32 +355,32 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>http-server</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>org.eclipse.jetty.toolchain</groupId>
+            <artifactId>jetty-jakarta-servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-servlet-api</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -420,5 +439,25 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/AwsSecurityConfig.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/AwsSecurityConfig.java
index e9d885ba5b73..8baf2b7b5485 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/AwsSecurityConfig.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/AwsSecurityConfig.java
@@ -17,8 +17,7 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.configuration.DefunctConfig;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConfig.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConfig.java
index ea3e7cb8f755..339dd233e6af 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConfig.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConfig.java
@@ -20,9 +20,8 @@
 import io.airlift.configuration.validation.FileExists;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.List;
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnector.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnector.java
index 468fe2154070..6014954e6acf 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnector.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnector.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.elasticsearch;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -22,11 +23,9 @@
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.SystemTable;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.Set;
 
 import static io.trino.spi.transaction.IsolationLevel.READ_COMMITTED;
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnectorFactory.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnectorFactory.java
index a7f745f31d8e..fcf338336270 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnectorFactory.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnectorFactory.java
@@ -28,7 +28,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class ElasticsearchConnectorFactory
@@ -47,7 +47,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
     {
         requireNonNull(catalogName, "catalogName is null");
         requireNonNull(config, "config is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 new MBeanModule(),
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnectorModule.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnectorModule.java
index 78ea5ea90de6..2cda1656af15 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnectorModule.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnectorModule.java
@@ -18,7 +18,7 @@
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.plugin.elasticsearch.client.ElasticsearchClient;
 import io.trino.plugin.elasticsearch.ptf.RawQuery;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchMetadata.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchMetadata.java
index b868d2db883a..adcf2a1e0bce 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchMetadata.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchMetadata.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.plugin.base.expression.ConnectorExpressions;
 import io.trino.plugin.elasticsearch.client.ElasticsearchClient;
@@ -42,13 +43,11 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
-import io.trino.spi.connector.ColumnSchema;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.ConnectorTableProperties;
-import io.trino.spi.connector.ConnectorTableSchema;
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.ConstraintApplicationResult;
 import io.trino.spi.connector.LimitApplicationResult;
@@ -60,9 +59,9 @@
 import io.trino.spi.expression.ConnectorExpression;
 import io.trino.spi.expression.Constant;
 import io.trino.spi.expression.Variable;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.StandardTypes;
@@ -70,8 +69,6 @@
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeSignature;
 
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -89,6 +86,7 @@
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Iterators.singletonIterator;
 import static io.airlift.slice.SliceUtf8.getCodePointAt;
+import static io.airlift.slice.SliceUtf8.lengthOfCodePoint;
 import static io.trino.plugin.elasticsearch.ElasticsearchTableHandle.Type.QUERY;
 import static io.trino.plugin.elasticsearch.ElasticsearchTableHandle.Type.SCAN;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
@@ -460,7 +458,6 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
                 handle.getConstraint(),
                 Optional.empty(),
                 Optional.empty(),
-                Optional.empty(),
                 ImmutableList.of());
     }
 
@@ -596,7 +593,7 @@ protected static String likeToRegexp(Slice pattern, Optional<Slice> escape)
         int position = 0;
         while (position < pattern.length()) {
             int currentChar = getCodePointAt(pattern, position);
-            position += 1;
+            position += lengthOfCodePoint(currentChar);
             checkEscape(!escaped || currentChar == '%' || currentChar == '_' || currentChar == escapeChar.get());
             if (!escaped && escapeChar.isPresent() && currentChar == escapeChar.get()) {
                 escaped = true;
@@ -659,13 +656,7 @@ public Optional<TableFunctionApplicationResult<ConnectorTableHandle>> applyTable
         }
 
         ConnectorTableHandle tableHandle = ((RawQueryFunctionHandle) handle).getTableHandle();
-        ConnectorTableSchema tableSchema = getTableSchema(session, tableHandle);
-        Map<String, ColumnHandle> columnHandlesByName = getColumnHandles(session, tableHandle);
-        List<ColumnHandle> columnHandles = tableSchema.getColumns().stream()
-                .map(ColumnSchema::getName)
-                .map(columnHandlesByName::get)
-                .collect(toImmutableList());
-
+        List<ColumnHandle> columnHandles = ImmutableList.copyOf(getColumnHandles(session, tableHandle).values());
         return Optional.of(new TableFunctionApplicationResult<>(tableHandle, columnHandles));
     }
 
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchPageSourceProvider.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchPageSourceProvider.java
index 55c82b45ebb5..474412174862 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchPageSourceProvider.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchPageSourceProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.elasticsearch;
 
+import com.google.inject.Inject;
 import io.trino.plugin.elasticsearch.client.ElasticsearchClient;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorPageSource;
@@ -24,8 +25,6 @@
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchSplitManager.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchSplitManager.java
index b6476dced867..b8e70d9350f1 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchSplitManager.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchSplitManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.elasticsearch;
 
+import com.google.inject.Inject;
 import io.trino.plugin.elasticsearch.client.ElasticsearchClient;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
@@ -23,8 +24,6 @@
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.FixedSplitSource;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/NodesSystemTable.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/NodesSystemTable.java
index a5f2e6431b1b..b63ca765a553 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/NodesSystemTable.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/NodesSystemTable.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.elasticsearch;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.elasticsearch.client.ElasticsearchClient;
 import io.trino.plugin.elasticsearch.client.ElasticsearchNode;
 import io.trino.spi.Node;
@@ -30,8 +31,6 @@
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import java.util.Set;
 
 import static io.trino.spi.type.VarcharType.VARCHAR;
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/PasswordConfig.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/PasswordConfig.java
index 74af4c987379..2271e1da6b5f 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/PasswordConfig.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/PasswordConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigSecuritySensitive;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class PasswordConfig
 {
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/client/ElasticsearchClient.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/client/ElasticsearchClient.java
index 484089f977f0..f23bb90862ae 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/client/ElasticsearchClient.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/client/ElasticsearchClient.java
@@ -27,6 +27,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.json.ObjectMapperProvider;
 import io.airlift.log.Logger;
@@ -36,6 +37,8 @@
 import io.trino.plugin.elasticsearch.ElasticsearchConfig;
 import io.trino.plugin.elasticsearch.PasswordConfig;
 import io.trino.spi.TrinoException;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
@@ -65,9 +68,6 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
 import javax.net.ssl.SSLContext;
 
 import java.io.File;
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/decoders/ArrayDecoder.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/decoders/ArrayDecoder.java
index acb5453153a8..2c6bd89b500c 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/decoders/ArrayDecoder.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/decoders/ArrayDecoder.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.plugin.elasticsearch.DecoderDescriptor;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.BlockBuilder;
 import org.elasticsearch.search.SearchHit;
 
@@ -40,15 +41,11 @@ public void decode(SearchHit hit, Supplier<Object> getter, BlockBuilder output)
         if (data == null) {
             output.appendNull();
         }
-        else if (data instanceof List) {
-            BlockBuilder array = output.beginBlockEntry();
-            ((List<?>) data).forEach(element -> elementDecoder.decode(hit, () -> element, array));
-            output.closeEntry();
+        else if (data instanceof List<?> list) {
+            ((ArrayBlockBuilder) output).buildEntry(elementBuilder -> list.forEach(element -> elementDecoder.decode(hit, () -> element, elementBuilder)));
         }
         else {
-            BlockBuilder array = output.beginBlockEntry();
-            elementDecoder.decode(hit, () -> data, array);
-            output.closeEntry();
+            ((ArrayBlockBuilder) output).buildEntry(elementBuilder -> elementDecoder.decode(hit, () -> data, elementBuilder));
         }
     }
 
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/decoders/RowDecoder.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/decoders/RowDecoder.java
index 49616e47ca07..abcaf7b3e75b 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/decoders/RowDecoder.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/decoders/RowDecoder.java
@@ -18,6 +18,7 @@
 import io.trino.plugin.elasticsearch.DecoderDescriptor;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import org.elasticsearch.search.SearchHit;
 
 import java.util.List;
@@ -53,12 +54,12 @@ public void decode(SearchHit hit, Supplier<Object> getter, BlockBuilder output)
             output.appendNull();
         }
         else if (data instanceof Map) {
-            BlockBuilder row = output.beginBlockEntry();
-            for (int i = 0; i < decoders.size(); i++) {
-                String field = fieldNames.get(i);
-                decoders.get(i).decode(hit, () -> getField((Map<String, Object>) data, field), row);
-            }
-            output.closeEntry();
+            ((RowBlockBuilder) output).buildEntry(fieldBuilders -> {
+                for (int i = 0; i < decoders.size(); i++) {
+                    String field = fieldNames.get(i);
+                    decoders.get(i).decode(hit, () -> getField((Map<String, Object>) data, field), fieldBuilders.get(i));
+                }
+            });
         }
         else {
             throw new TrinoException(TYPE_MISMATCH, format("Expected object for field '%s' of type ROW: %s [%s]", path, data, data.getClass().getSimpleName()));
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ptf/RawQuery.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ptf/RawQuery.java
index 80547cc2aaf9..c891b704e60d 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ptf/RawQuery.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ptf/RawQuery.java
@@ -15,27 +15,27 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.airlift.slice.Slice;
 import io.trino.plugin.elasticsearch.ElasticsearchColumnHandle;
 import io.trino.plugin.elasticsearch.ElasticsearchMetadata;
 import io.trino.plugin.elasticsearch.ElasticsearchTableHandle;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnSchema;
+import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.ConnectorTableSchema;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.ptf.AbstractConnectorTableFunction;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-import io.trino.spi.ptf.Descriptor;
-import io.trino.spi.ptf.ScalarArgument;
-import io.trino.spi.ptf.ScalarArgumentSpecification;
-import io.trino.spi.ptf.TableFunctionAnalysis;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
+import io.trino.spi.function.table.AbstractConnectorTableFunction;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.ScalarArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
 
 import java.util.List;
 import java.util.Map;
@@ -43,7 +43,7 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.plugin.elasticsearch.ElasticsearchTableHandle.Type.QUERY;
-import static io.trino.spi.ptf.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
+import static io.trino.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
@@ -96,7 +96,11 @@ public RawQueryFunction(ElasticsearchMetadata metadata)
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             String schema = ((Slice) ((ScalarArgument) arguments.get("SCHEMA")).getValue()).toStringUtf8();
             String index = ((Slice) ((ScalarArgument) arguments.get("INDEX")).getValue()).toStringUtf8();
diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java
index 71e2bb137a0e..5b53be176e71 100644
--- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java
+++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java
@@ -95,37 +95,29 @@ public final void destroy()
         client = null;
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_LIMIT_PUSHDOWN:
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE:
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN:
-            case SUPPORTS_RENAME_COLUMN:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_INSERT:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_INSERT,
+                    SUPPORTS_LIMIT_PUSHDOWN,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_RENAME_COLUMN,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     /**
@@ -140,13 +132,9 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
      * @return the amount of clauses to be used in large queries
      */
     @Override
-    protected Object[][] largeInValuesCountData()
+    protected List<Integer> largeInValuesCountData()
     {
-        return new Object[][] {
-                {200},
-                {500},
-                {1000}
-        };
+        return ImmutableList.of(200, 500, 1000);
     }
 
     @Test
@@ -224,7 +212,7 @@ public void testShowCreateTable()
                         ")");
     }
 
-    @Test
+    @org.junit.jupiter.api.Test
     @Override
     public void testShowColumns()
     {
@@ -1061,6 +1049,30 @@ public void testLike()
                 .put("text_column", "soome%text")
                 .buildOrThrow());
 
+        // Add another document to make sure utf8 character sequence length is right
+        index(indexName, ImmutableMap.<String, Object>builder()
+                .put("keyword_column", "中文")
+                .put("text_column", "中文")
+                .buildOrThrow());
+
+        // Add another document to make sure utf8 character sequence length is right
+        index(indexName, ImmutableMap.<String, Object>builder()
+                .put("keyword_column", "こんにちは")
+                .put("text_column", "こんにちは")
+                .buildOrThrow());
+
+        // Add another document to make sure utf8 character sequence length is right
+        index(indexName, ImmutableMap.<String, Object>builder()
+                .put("keyword_column", "안녕하세요")
+                .put("text_column", "안녕하세요")
+                .buildOrThrow());
+
+        // Add another document to make sure utf8 character sequence length is right
+        index(indexName, ImmutableMap.<String, Object>builder()
+                .put("keyword_column", "Привет")
+                .put("text_column", "Привет")
+                .buildOrThrow());
+
         assertThat(query("" +
                 "SELECT " +
                 "keyword_column " +
@@ -1083,6 +1095,38 @@ public void testLike()
                 "WHERE keyword_column LIKE 'soome$%%' ESCAPE '$'"))
                 .matches("VALUES VARCHAR 'soome%text'")
                 .isFullyPushedDown();
+
+        assertThat(query("" +
+                "SELECT " +
+                "text_column " +
+                "FROM " + indexName + " " +
+                "WHERE keyword_column LIKE '中%'"))
+                .matches("VALUES VARCHAR '中文'")
+                .isFullyPushedDown();
+
+        assertThat(query("" +
+                "SELECT " +
+                "text_column " +
+                "FROM " + indexName + " " +
+                "WHERE keyword_column LIKE 'こんに%'"))
+                .matches("VALUES VARCHAR 'こんにちは'")
+                .isFullyPushedDown();
+
+        assertThat(query("" +
+                "SELECT " +
+                "text_column " +
+                "FROM " + indexName + " " +
+                "WHERE keyword_column LIKE '안녕하%'"))
+                .matches("VALUES VARCHAR '안녕하세요'")
+                .isFullyPushedDown();
+
+        assertThat(query("" +
+                "SELECT " +
+                "text_column " +
+                "FROM " + indexName + " " +
+                "WHERE keyword_column LIKE 'При%'"))
+                .matches("VALUES VARCHAR 'Привет'")
+                .isFullyPushedDown();
     }
 
     @Test
diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestAwsSecurityConfig.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestAwsSecurityConfig.java
index 83cadcceb261..8bfb32eac484 100644
--- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestAwsSecurityConfig.java
+++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestAwsSecurityConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.elasticsearch;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchBackpressure.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchBackpressure.java
index b869ad0c2379..9412bdebe66d 100644
--- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchBackpressure.java
+++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchBackpressure.java
@@ -17,22 +17,29 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
+import io.trino.testng.services.ManageTestResources.Suppress;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.testcontainers.containers.Network;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 
 import static io.trino.plugin.elasticsearch.ElasticsearchQueryRunner.createElasticsearchQueryRunner;
 import static io.trino.tpch.TpchTable.ORDERS;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestElasticsearchBackpressure
         extends AbstractTestQueryFramework
 {
     private static final String image = "elasticsearch:7.0.0";
 
+    @Suppress(because = "Not a TestNG test class")
     private Network network;
+    @Suppress(because = "Not a TestNG test class")
     private ElasticsearchServer elasticsearch;
+    @Suppress(because = "Not a TestNG test class")
     private ElasticsearchNginxProxy elasticsearchNginxProxy;
 
     @Override
@@ -55,7 +62,7 @@ protected QueryRunner createQueryRunner()
                 "elasticsearch-backpressure");
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public final void destroy()
             throws IOException
     {
diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchConfig.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchConfig.java
index 9b3b8081b24c..4a74a4096701 100644
--- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchConfig.java
+++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchMetadata.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchMetadata.java
index e030a4157ab6..9ab47e1d93d6 100644
--- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchMetadata.java
+++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchMetadata.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.elasticsearch;
 
 import io.airlift.slice.Slices;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -34,6 +34,10 @@ public void testLikeToRegexp()
         assertEquals(likeToRegexp("s_.m%ex\\t", Optional.of("$")), "s.\\.m.*ex\\\\t");
         assertEquals(likeToRegexp("\000%", Optional.empty()), "\000.*");
         assertEquals(likeToRegexp("\000%", Optional.of("\000")), "%");
+        assertEquals(likeToRegexp("中文%", Optional.empty()), "中文.*");
+        assertEquals(likeToRegexp("こんにちは%", Optional.empty()), "こんにちは.*");
+        assertEquals(likeToRegexp("안녕하세요%", Optional.empty()), "안녕하세요.*");
+        assertEquals(likeToRegexp("Привет%", Optional.empty()), "Привет.*");
     }
 
     private static String likeToRegexp(String pattern, Optional<String> escapeChar)
diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchQueryBuilder.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchQueryBuilder.java
index fe688c2bacdd..a6d660033572 100644
--- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchQueryBuilder.java
+++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchQueryBuilder.java
@@ -28,7 +28,7 @@
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestPasswordAuthentication.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestPasswordAuthentication.java
index 8fb75d4a5281..a9ac0b5f6caf 100644
--- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestPasswordAuthentication.java
+++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestPasswordAuthentication.java
@@ -27,9 +27,10 @@
 import org.apache.http.nio.entity.NStringEntity;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -40,7 +41,9 @@
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestPasswordAuthentication
 {
     private static final String USER = "elastic_user";
@@ -50,7 +53,7 @@ public class TestPasswordAuthentication
     private RestHighLevelClient client;
     private QueryAssertions assertions;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -79,7 +82,7 @@ public void setUp()
         assertions = new QueryAssertions(runner);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public final void destroy()
             throws IOException
     {
diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestPasswordConfig.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestPasswordConfig.java
index 1c87b2b69725..d767ac265363 100644
--- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestPasswordConfig.java
+++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestPasswordConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.elasticsearch;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/client/TestExtractAddress.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/client/TestExtractAddress.java
index 889a19eeb548..fc8213bf8070 100644
--- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/client/TestExtractAddress.java
+++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/client/TestExtractAddress.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.elasticsearch.client;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-example-http/pom.xml b/plugin/trino-example-http/pom.xml
index c4ab624e425f..e39df530692f 100644
--- a/plugin/trino-example-http/pom.xml
+++ b/plugin/trino-example-http/pom.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-example-http</artifactId>
-    <description>Trino - Example HTTP Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Example HTTP Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,8 +18,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -38,40 +43,39 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>node</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-spi</artifactId>
@@ -79,33 +83,32 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <artifactId>jackson-databind</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>node</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>http-server</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>http-server</artifactId>
+            <artifactId>junit-extensions</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -115,6 +118,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -123,13 +132,13 @@
 
         <dependency>
             <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-servlet-api</artifactId>
+            <artifactId>jetty-jakarta-servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleClient.java b/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleClient.java
index 7fbc6a1b2b91..cbe93b18cad6 100644
--- a/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleClient.java
+++ b/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleClient.java
@@ -20,10 +20,9 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Resources;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
diff --git a/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConfig.java b/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConfig.java
index 79ccbdce90b1..e8ee8c7714ca 100644
--- a/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConfig.java
+++ b/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConfig.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.example;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.net.URI;
 
diff --git a/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConnector.java b/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConnector.java
index ae72aea98f71..d8a0b44cac41 100644
--- a/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConnector.java
+++ b/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConnector.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.example;
 
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -22,8 +23,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import static io.trino.plugin.example.ExampleTransactionHandle.INSTANCE;
 import static java.util.Objects.requireNonNull;
 
diff --git a/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConnectorFactory.java b/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConnectorFactory.java
index e6404fa984e4..1622437f4719 100644
--- a/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConnectorFactory.java
+++ b/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConnectorFactory.java
@@ -23,7 +23,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class ExampleConnectorFactory
@@ -39,7 +39,7 @@ public String getName()
     public Connector create(String catalogName, Map<String, String> requiredConfig, ConnectorContext context)
     {
         requireNonNull(requiredConfig, "requiredConfig is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         // A plugin is not required to use Guice; it is just very convenient
         Bootstrap app = new Bootstrap(
diff --git a/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleMetadata.java b/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleMetadata.java
index b964390904d2..2842528bbb2a 100644
--- a/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleMetadata.java
+++ b/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleMetadata.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -26,8 +27,6 @@
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.connector.TableNotFoundException;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleSplitManager.java b/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleSplitManager.java
index e41f44e0c32c..7df19da2800d 100644
--- a/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleSplitManager.java
+++ b/plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleSplitManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.example;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.connector.ConnectorSplitManager;
@@ -24,8 +25,6 @@
 import io.trino.spi.connector.FixedSplitSource;
 import io.trino.spi.connector.TableNotFoundException;
 
-import javax.inject.Inject;
-
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/ExampleHttpServer.java b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/ExampleHttpServer.java
index 55b729ff4f4c..8757a376e59e 100644
--- a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/ExampleHttpServer.java
+++ b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/ExampleHttpServer.java
@@ -25,11 +25,10 @@
 import io.airlift.http.server.testing.TestingHttpServer;
 import io.airlift.http.server.testing.TestingHttpServerModule;
 import io.airlift.node.testing.TestingNodeModule;
-
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleClient.java b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleClient.java
index 1aa5e1b2263c..992fdb6db6ce 100644
--- a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleClient.java
+++ b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleClient.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Resources;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.net.URL;
@@ -24,8 +24,7 @@
 import static io.trino.plugin.example.MetadataUtil.CATALOG_CODEC;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestExampleClient
 {
@@ -34,17 +33,21 @@ public void testMetadata()
             throws Exception
     {
         URL metadataUrl = Resources.getResource(TestExampleClient.class, "/example-data/example-metadata.json");
-        assertNotNull(metadataUrl, "metadataUrl is null");
+        assertThat(metadataUrl)
+                .describedAs("metadataUrl is null")
+                .isNotNull();
         URI metadata = metadataUrl.toURI();
         ExampleClient client = new ExampleClient(new ExampleConfig().setMetadata(metadata), CATALOG_CODEC);
-        assertEquals(client.getSchemaNames(), ImmutableSet.of("example", "tpch"));
-        assertEquals(client.getTableNames("example"), ImmutableSet.of("numbers"));
-        assertEquals(client.getTableNames("tpch"), ImmutableSet.of("orders", "lineitem"));
+        assertThat(client.getSchemaNames()).isEqualTo(ImmutableSet.of("example", "tpch"));
+        assertThat(client.getTableNames("example")).isEqualTo(ImmutableSet.of("numbers"));
+        assertThat(client.getTableNames("tpch")).isEqualTo(ImmutableSet.of("orders", "lineitem"));
 
         ExampleTable table = client.getTable("example", "numbers");
-        assertNotNull(table, "table is null");
-        assertEquals(table.getName(), "numbers");
-        assertEquals(table.getColumns(), ImmutableList.of(new ExampleColumn("text", createUnboundedVarcharType()), new ExampleColumn("value", BIGINT)));
-        assertEquals(table.getSources(), ImmutableList.of(metadata.resolve("numbers-1.csv"), metadata.resolve("numbers-2.csv")));
+        assertThat(table)
+                .describedAs("table is null")
+                .isNotNull();
+        assertThat(table.getName()).isEqualTo("numbers");
+        assertThat(table.getColumns()).isEqualTo(ImmutableList.of(new ExampleColumn("text", createUnboundedVarcharType()), new ExampleColumn("value", BIGINT)));
+        assertThat(table.getSources()).isEqualTo(ImmutableList.of(metadata.resolve("numbers-1.csv"), metadata.resolve("numbers-2.csv")));
     }
 }
diff --git a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleColumnHandle.java b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleColumnHandle.java
index 674261783022..f17d124e9651 100644
--- a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleColumnHandle.java
+++ b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleColumnHandle.java
@@ -14,12 +14,12 @@
 package io.trino.plugin.example;
 
 import io.airlift.testing.EquivalenceTester;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.example.MetadataUtil.COLUMN_CODEC;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestExampleColumnHandle
 {
@@ -30,7 +30,7 @@ public void testJsonRoundTrip()
     {
         String json = COLUMN_CODEC.toJson(columnHandle);
         ExampleColumnHandle copy = COLUMN_CODEC.fromJson(json);
-        assertEquals(copy, columnHandle);
+        assertThat(copy).isEqualTo(columnHandle);
     }
 
     @Test
diff --git a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleConfig.java b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleConfig.java
index 0e8870e9038e..9f5c02704e60 100644
--- a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleConfig.java
+++ b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.example;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.util.Map;
diff --git a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleMetadata.java b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleMetadata.java
index 9386a37c75e8..704aba27723a 100644
--- a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleMetadata.java
+++ b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleMetadata.java
@@ -22,8 +22,9 @@
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URL;
 import java.util.Optional;
@@ -32,23 +33,24 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.testing.TestingConnectorSession.SESSION;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestExampleMetadata
 {
     private static final ExampleTableHandle NUMBERS_TABLE_HANDLE = new ExampleTableHandle("example", "numbers");
     private ExampleMetadata metadata;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
             throws Exception
     {
         URL metadataUrl = Resources.getResource(TestExampleClient.class, "/example-data/example-metadata.json");
-        assertNotNull(metadataUrl, "metadataUrl is null");
+        assertThat(metadataUrl)
+                .describedAs("metadataUrl is null")
+                .isNotNull();
         ExampleClient client = new ExampleClient(new ExampleConfig().setMetadata(metadataUrl.toURI()), CATALOG_CODEC);
         metadata = new ExampleMetadata(client);
     }
@@ -56,23 +58,23 @@ public void setUp()
     @Test
     public void testListSchemaNames()
     {
-        assertEquals(metadata.listSchemaNames(SESSION), ImmutableSet.of("example", "tpch"));
+        assertThat(metadata.listSchemaNames(SESSION)).containsExactlyElementsOf(ImmutableSet.of("example", "tpch"));
     }
 
     @Test
     public void testGetTableHandle()
     {
-        assertEquals(metadata.getTableHandle(SESSION, new SchemaTableName("example", "numbers")), NUMBERS_TABLE_HANDLE);
-        assertNull(metadata.getTableHandle(SESSION, new SchemaTableName("example", "unknown")));
-        assertNull(metadata.getTableHandle(SESSION, new SchemaTableName("unknown", "numbers")));
-        assertNull(metadata.getTableHandle(SESSION, new SchemaTableName("unknown", "unknown")));
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName("example", "numbers"))).isEqualTo(NUMBERS_TABLE_HANDLE);
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName("example", "unknown"))).isNull();
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName("unknown", "numbers"))).isNull();
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName("unknown", "unknown"))).isNull();
     }
 
     @Test
     public void testGetColumnHandles()
     {
         // known table
-        assertEquals(metadata.getColumnHandles(SESSION, NUMBERS_TABLE_HANDLE), ImmutableMap.of(
+        assertThat(metadata.getColumnHandles(SESSION, NUMBERS_TABLE_HANDLE)).isEqualTo(ImmutableMap.of(
                 "text", new ExampleColumnHandle("text", createUnboundedVarcharType(), 0),
                 "value", new ExampleColumnHandle("value", BIGINT, 1)));
 
@@ -90,42 +92,41 @@ public void getTableMetadata()
     {
         // known table
         ConnectorTableMetadata tableMetadata = metadata.getTableMetadata(SESSION, NUMBERS_TABLE_HANDLE);
-        assertEquals(tableMetadata.getTable(), new SchemaTableName("example", "numbers"));
-        assertEquals(tableMetadata.getColumns(), ImmutableList.of(
+        assertThat(tableMetadata.getTable()).isEqualTo(new SchemaTableName("example", "numbers"));
+        assertThat(tableMetadata.getColumns()).isEqualTo(ImmutableList.of(
                 new ColumnMetadata("text", createUnboundedVarcharType()),
                 new ColumnMetadata("value", BIGINT)));
 
         // unknown tables should produce null
-        assertNull(metadata.getTableMetadata(SESSION, new ExampleTableHandle("unknown", "unknown")));
-        assertNull(metadata.getTableMetadata(SESSION, new ExampleTableHandle("example", "unknown")));
-        assertNull(metadata.getTableMetadata(SESSION, new ExampleTableHandle("unknown", "numbers")));
+        assertThat(metadata.getTableMetadata(SESSION, new ExampleTableHandle("unknown", "unknown"))).isNull();
+        assertThat(metadata.getTableMetadata(SESSION, new ExampleTableHandle("example", "unknown"))).isNull();
+        assertThat(metadata.getTableMetadata(SESSION, new ExampleTableHandle("unknown", "numbers"))).isNull();
     }
 
     @Test
     public void testListTables()
     {
         // all schemas
-        assertEquals(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.empty())), ImmutableSet.of(
+        assertThat(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.empty()))).isEqualTo(ImmutableSet.of(
                 new SchemaTableName("example", "numbers"),
                 new SchemaTableName("tpch", "orders"),
                 new SchemaTableName("tpch", "lineitem")));
 
         // specific schema
-        assertEquals(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.of("example"))), ImmutableSet.of(
+        assertThat(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.of("example")))).isEqualTo(ImmutableSet.of(
                 new SchemaTableName("example", "numbers")));
-        assertEquals(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.of("tpch"))), ImmutableSet.of(
+        assertThat(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.of("tpch")))).isEqualTo(ImmutableSet.of(
                 new SchemaTableName("tpch", "orders"),
                 new SchemaTableName("tpch", "lineitem")));
 
         // unknown schema
-        assertEquals(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.of("unknown"))), ImmutableSet.of());
+        assertThat(ImmutableSet.copyOf(metadata.listTables(SESSION, Optional.of("unknown")))).isEqualTo(ImmutableSet.of());
     }
 
     @Test
     public void getColumnMetadata()
     {
-        assertEquals(metadata.getColumnMetadata(SESSION, NUMBERS_TABLE_HANDLE, new ExampleColumnHandle("text", createUnboundedVarcharType(), 0)),
-                new ColumnMetadata("text", createUnboundedVarcharType()));
+        assertThat(metadata.getColumnMetadata(SESSION, NUMBERS_TABLE_HANDLE, new ExampleColumnHandle("text", createUnboundedVarcharType(), 0))).isEqualTo(new ColumnMetadata("text", createUnboundedVarcharType()));
 
         // example connector assumes that the table handle and column handle are
         // properly formed, so it will return a metadata object for any
@@ -147,9 +148,10 @@ public void testCreateTable()
                 .hasMessage("This connector does not support creating tables");
     }
 
-    @Test(expectedExceptions = TrinoException.class)
+    @Test
     public void testDropTableTable()
     {
-        metadata.dropTable(SESSION, NUMBERS_TABLE_HANDLE);
+        assertThatThrownBy(() -> metadata.dropTable(SESSION, NUMBERS_TABLE_HANDLE))
+                .isInstanceOf(TrinoException.class);
     }
 }
diff --git a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleRecordSet.java b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleRecordSet.java
index 29664547d074..2e1932d276b8 100644
--- a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleRecordSet.java
+++ b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleRecordSet.java
@@ -17,18 +17,20 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.RecordSet;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestExampleRecordSet
 {
     private ExampleHttpServer exampleHttpServer;
@@ -40,21 +42,21 @@ public void testGetColumnTypes()
         RecordSet recordSet = new ExampleRecordSet(new ExampleSplit(dataUri), ImmutableList.of(
                 new ExampleColumnHandle("text", createUnboundedVarcharType(), 0),
                 new ExampleColumnHandle("value", BIGINT, 1)));
-        assertEquals(recordSet.getColumnTypes(), ImmutableList.of(createUnboundedVarcharType(), BIGINT));
+        assertThat(recordSet.getColumnTypes()).isEqualTo(ImmutableList.of(createUnboundedVarcharType(), BIGINT));
 
         recordSet = new ExampleRecordSet(new ExampleSplit(dataUri), ImmutableList.of(
                 new ExampleColumnHandle("value", BIGINT, 1),
                 new ExampleColumnHandle("text", createUnboundedVarcharType(), 0)));
-        assertEquals(recordSet.getColumnTypes(), ImmutableList.of(BIGINT, createUnboundedVarcharType()));
+        assertThat(recordSet.getColumnTypes()).isEqualTo(ImmutableList.of(BIGINT, createUnboundedVarcharType()));
 
         recordSet = new ExampleRecordSet(new ExampleSplit(dataUri), ImmutableList.of(
                 new ExampleColumnHandle("value", BIGINT, 1),
                 new ExampleColumnHandle("value", BIGINT, 1),
                 new ExampleColumnHandle("text", createUnboundedVarcharType(), 0)));
-        assertEquals(recordSet.getColumnTypes(), ImmutableList.of(BIGINT, BIGINT, createUnboundedVarcharType()));
+        assertThat(recordSet.getColumnTypes()).isEqualTo(ImmutableList.of(BIGINT, BIGINT, createUnboundedVarcharType()));
 
         recordSet = new ExampleRecordSet(new ExampleSplit(dataUri), ImmutableList.of());
-        assertEquals(recordSet.getColumnTypes(), ImmutableList.of());
+        assertThat(recordSet.getColumnTypes()).isEqualTo(ImmutableList.of());
     }
 
     @Test
@@ -65,16 +67,16 @@ public void testCursorSimple()
                 new ExampleColumnHandle("value", BIGINT, 1)));
         RecordCursor cursor = recordSet.cursor();
 
-        assertEquals(cursor.getType(0), createUnboundedVarcharType());
-        assertEquals(cursor.getType(1), BIGINT);
+        assertThat(cursor.getType(0)).isEqualTo(createUnboundedVarcharType());
+        assertThat(cursor.getType(1)).isEqualTo(BIGINT);
 
         Map<String, Long> data = new LinkedHashMap<>();
         while (cursor.advanceNextPosition()) {
             data.put(cursor.getSlice(0).toStringUtf8(), cursor.getLong(1));
-            assertFalse(cursor.isNull(0));
-            assertFalse(cursor.isNull(1));
+            assertThat(cursor.isNull(0)).isFalse();
+            assertThat(cursor.isNull(1)).isFalse();
         }
-        assertEquals(data, ImmutableMap.<String, Long>builder()
+        assertThat(data).isEqualTo(ImmutableMap.<String, Long>builder()
                 .put("ten", 10L)
                 .put("eleven", 11L)
                 .put("twelve", 12L)
@@ -92,10 +94,10 @@ public void testCursorMixedOrder()
 
         Map<String, Long> data = new LinkedHashMap<>();
         while (cursor.advanceNextPosition()) {
-            assertEquals(cursor.getLong(0), cursor.getLong(1));
+            assertThat(cursor.getLong(0)).isEqualTo(cursor.getLong(1));
             data.put(cursor.getSlice(2).toStringUtf8(), cursor.getLong(0));
         }
-        assertEquals(data, ImmutableMap.<String, Long>builder()
+        assertThat(data).isEqualTo(ImmutableMap.<String, Long>builder()
                 .put("ten", 10L)
                 .put("eleven", 11L)
                 .put("twelve", 12L)
@@ -110,14 +112,14 @@ public void testCursorMixedOrder()
     // Start http server for testing
     //
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         exampleHttpServer = new ExampleHttpServer();
         dataUri = exampleHttpServer.resolve("/example-data/numbers-2.csv").toString();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (exampleHttpServer != null) {
diff --git a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleRecordSetProvider.java b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleRecordSetProvider.java
index fc1e09afbf8d..f4b0e6b8041b 100644
--- a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleRecordSetProvider.java
+++ b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleRecordSetProvider.java
@@ -18,9 +18,10 @@
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.RecordSet;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -28,9 +29,10 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.testing.TestingConnectorSession.SESSION;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestExampleRecordSetProvider
 {
     private ExampleHttpServer exampleHttpServer;
@@ -44,16 +46,20 @@ public void testGetRecordSet()
         RecordSet recordSet = recordSetProvider.getRecordSet(ExampleTransactionHandle.INSTANCE, SESSION, new ExampleSplit(dataUri), tableHandle, ImmutableList.of(
                 new ExampleColumnHandle("text", createUnboundedVarcharType(), 0),
                 new ExampleColumnHandle("value", BIGINT, 1)));
-        assertNotNull(recordSet, "recordSet is null");
+        assertThat(recordSet)
+                .describedAs("recordSet is null")
+                .isNotNull();
 
         RecordCursor cursor = recordSet.cursor();
-        assertNotNull(cursor, "cursor is null");
+        assertThat(cursor)
+                .describedAs("cursor is null")
+                .isNotNull();
 
         Map<String, Long> data = new LinkedHashMap<>();
         while (cursor.advanceNextPosition()) {
             data.put(cursor.getSlice(0).toStringUtf8(), cursor.getLong(1));
         }
-        assertEquals(data, ImmutableMap.<String, Long>builder()
+        assertThat(data).isEqualTo(ImmutableMap.<String, Long>builder()
                 .put("ten", 10L)
                 .put("eleven", 11L)
                 .put("twelve", 12L)
@@ -64,14 +70,14 @@ public void testGetRecordSet()
     // Start http server for testing
     //
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         exampleHttpServer = new ExampleHttpServer();
         dataUri = exampleHttpServer.resolve("/example-data/numbers-2.csv").toString();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (exampleHttpServer != null) {
diff --git a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleSplit.java b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleSplit.java
index afe215ec7b22..dd7825766caa 100644
--- a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleSplit.java
+++ b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleSplit.java
@@ -16,10 +16,10 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.json.JsonCodec;
 import io.trino.spi.HostAddress;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.json.JsonCodec.jsonCodec;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestExampleSplit
 {
@@ -30,23 +30,23 @@ public void testAddresses()
     {
         // http split with default port
         ExampleSplit httpSplit = new ExampleSplit("http://example.com/example");
-        assertEquals(httpSplit.getAddresses(), ImmutableList.of(HostAddress.fromString("example.com")));
-        assertEquals(httpSplit.isRemotelyAccessible(), true);
+        assertThat(httpSplit.getAddresses()).isEqualTo(ImmutableList.of(HostAddress.fromString("example.com")));
+        assertThat(httpSplit.isRemotelyAccessible()).isEqualTo(true);
 
         // http split with custom port
         httpSplit = new ExampleSplit("http://example.com:8080/example");
-        assertEquals(httpSplit.getAddresses(), ImmutableList.of(HostAddress.fromParts("example.com", 8080)));
-        assertEquals(httpSplit.isRemotelyAccessible(), true);
+        assertThat(httpSplit.getAddresses()).isEqualTo(ImmutableList.of(HostAddress.fromParts("example.com", 8080)));
+        assertThat(httpSplit.isRemotelyAccessible()).isEqualTo(true);
 
         // http split with default port
         ExampleSplit httpsSplit = new ExampleSplit("https://example.com/example");
-        assertEquals(httpsSplit.getAddresses(), ImmutableList.of(HostAddress.fromString("example.com")));
-        assertEquals(httpsSplit.isRemotelyAccessible(), true);
+        assertThat(httpsSplit.getAddresses()).isEqualTo(ImmutableList.of(HostAddress.fromString("example.com")));
+        assertThat(httpsSplit.isRemotelyAccessible()).isEqualTo(true);
 
         // http split with custom port
         httpsSplit = new ExampleSplit("https://example.com:8443/example");
-        assertEquals(httpsSplit.getAddresses(), ImmutableList.of(HostAddress.fromParts("example.com", 8443)));
-        assertEquals(httpsSplit.isRemotelyAccessible(), true);
+        assertThat(httpsSplit.getAddresses()).isEqualTo(ImmutableList.of(HostAddress.fromParts("example.com", 8443)));
+        assertThat(httpsSplit.isRemotelyAccessible()).isEqualTo(true);
     }
 
     @Test
@@ -55,9 +55,9 @@ public void testJsonRoundTrip()
         JsonCodec<ExampleSplit> codec = jsonCodec(ExampleSplit.class);
         String json = codec.toJson(split);
         ExampleSplit copy = codec.fromJson(json);
-        assertEquals(copy.getUri(), split.getUri());
+        assertThat(copy.getUri()).isEqualTo(split.getUri());
 
-        assertEquals(copy.getAddresses(), ImmutableList.of(HostAddress.fromString("127.0.0.1")));
-        assertEquals(copy.isRemotelyAccessible(), true);
+        assertThat(copy.getAddresses()).isEqualTo(ImmutableList.of(HostAddress.fromString("127.0.0.1")));
+        assertThat(copy.isRemotelyAccessible()).isEqualTo(true);
     }
 }
diff --git a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleTable.java b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleTable.java
index 16a6d3e4f698..707b8f769a1d 100644
--- a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleTable.java
+++ b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleTable.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.connector.ColumnMetadata;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 
 import static io.trino.plugin.example.MetadataUtil.TABLE_CODEC;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestExampleTable
 {
@@ -33,7 +33,7 @@ public class TestExampleTable
     @Test
     public void testColumnMetadata()
     {
-        assertEquals(exampleTable.getColumnsMetadata(), ImmutableList.of(
+        assertThat(exampleTable.getColumnsMetadata()).isEqualTo(ImmutableList.of(
                 new ColumnMetadata("a", createUnboundedVarcharType()),
                 new ColumnMetadata("b", BIGINT)));
     }
@@ -44,8 +44,8 @@ public void testRoundTrip()
         String json = TABLE_CODEC.toJson(exampleTable);
         ExampleTable exampleTableCopy = TABLE_CODEC.fromJson(json);
 
-        assertEquals(exampleTableCopy.getName(), exampleTable.getName());
-        assertEquals(exampleTableCopy.getColumns(), exampleTable.getColumns());
-        assertEquals(exampleTableCopy.getSources(), exampleTable.getSources());
+        assertThat(exampleTableCopy.getName()).isEqualTo(exampleTable.getName());
+        assertThat(exampleTableCopy.getColumns()).isEqualTo(exampleTable.getColumns());
+        assertThat(exampleTableCopy.getSources()).isEqualTo(exampleTable.getSources());
     }
 }
diff --git a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleTableHandle.java b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleTableHandle.java
index 6a76aad76a99..40b4232002c2 100644
--- a/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleTableHandle.java
+++ b/plugin/trino-example-http/src/test/java/io/trino/plugin/example/TestExampleTableHandle.java
@@ -15,10 +15,10 @@
 
 import io.airlift.json.JsonCodec;
 import io.airlift.testing.EquivalenceTester;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.json.JsonCodec.jsonCodec;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestExampleTableHandle
 {
@@ -30,7 +30,7 @@ public void testJsonRoundTrip()
         JsonCodec<ExampleTableHandle> codec = jsonCodec(ExampleTableHandle.class);
         String json = codec.toJson(tableHandle);
         ExampleTableHandle copy = codec.fromJson(json);
-        assertEquals(copy, tableHandle);
+        assertThat(copy).isEqualTo(tableHandle);
     }
 
     @Test
diff --git a/plugin/trino-example-jdbc/pom.xml b/plugin/trino-example-jdbc/pom.xml
index ab69494cb236..d2faee099f1f 100644
--- a/plugin/trino-example-jdbc/pom.xml
+++ b/plugin/trino-example-jdbc/pom.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-example-jdbc</artifactId>
-    <description>Trino - Example JDBC Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Example JDBC Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,8 +18,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-base-jdbc</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -28,41 +28,39 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-base-jdbc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-spi</artifactId>
@@ -70,34 +68,33 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <artifactId>jackson-databind</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
-            <scope>test</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing</artifactId>
-            <scope>test</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -106,12 +103,30 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>testing</artifactId>
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -120,7 +135,7 @@
 
         <dependency>
             <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-servlet-api</artifactId>
+            <artifactId>jetty-jakarta-servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -131,8 +146,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-example-jdbc/src/main/java/io/trino/plugin/example/ExampleClient.java b/plugin/trino-example-jdbc/src/main/java/io/trino/plugin/example/ExampleClient.java
index 2557af42ec8d..c04cfcb363c1 100644
--- a/plugin/trino-example-jdbc/src/main/java/io/trino/plugin/example/ExampleClient.java
+++ b/plugin/trino-example-jdbc/src/main/java/io/trino/plugin/example/ExampleClient.java
@@ -13,6 +13,8 @@
  */
 package io.trino.plugin.example;
 
+import com.google.inject.Inject;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcClient;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ColumnMapping;
@@ -21,15 +23,12 @@
 import io.trino.plugin.jdbc.QueryBuilder;
 import io.trino.plugin.jdbc.WriteMapping;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
 
-import javax.inject.Inject;
-
 import java.sql.Connection;
 import java.sql.Types;
 import java.util.Optional;
diff --git a/plugin/trino-example-jdbc/src/main/java/io/trino/plugin/example/ExampleClientModule.java b/plugin/trino-example-jdbc/src/main/java/io/trino/plugin/example/ExampleClientModule.java
index 328f65d1d808..fc76c6f39458 100644
--- a/plugin/trino-example-jdbc/src/main/java/io/trino/plugin/example/ExampleClientModule.java
+++ b/plugin/trino-example-jdbc/src/main/java/io/trino/plugin/example/ExampleClientModule.java
@@ -18,6 +18,7 @@
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DriverConnectionFactory;
@@ -41,10 +42,10 @@ public void setup(Binder binder)
     @Provides
     @Singleton
     @ForBaseJdbc
-    public static ConnectionFactory getConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider)
+    public static ConnectionFactory getConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider, OpenTelemetry openTelemetry)
             throws SQLException
     {
         Properties connectionProperties = new Properties();
-        return new DriverConnectionFactory(DriverManager.getDriver(config.getConnectionUrl()), config.getConnectionUrl(), connectionProperties, credentialProvider);
+        return new DriverConnectionFactory(DriverManager.getDriver(config.getConnectionUrl()), config.getConnectionUrl(), connectionProperties, credentialProvider, openTelemetry);
     }
 }
diff --git a/plugin/trino-example-jdbc/src/test/java/io/trino/plugin/example/TestExampleQueries.java b/plugin/trino-example-jdbc/src/test/java/io/trino/plugin/example/TestExampleQueries.java
index 4ad81efdb89c..c3b45a92e478 100644
--- a/plugin/trino-example-jdbc/src/test/java/io/trino/plugin/example/TestExampleQueries.java
+++ b/plugin/trino-example-jdbc/src/test/java/io/trino/plugin/example/TestExampleQueries.java
@@ -16,7 +16,7 @@
 
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestExampleQueries
         extends AbstractTestQueryFramework
diff --git a/plugin/trino-exchange-filesystem/pom.xml b/plugin/trino-exchange-filesystem/pom.xml
index 65f21b77d066..8f9078d883aa 100644
--- a/plugin/trino-exchange-filesystem/pom.xml
+++ b/plugin/trino-exchange-filesystem/pom.xml
@@ -4,75 +4,19 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-exchange-filesystem</artifactId>
-    <description>Trino - Exchange</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Exchange</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <awsjavasdk.version>2.17.151</awsjavasdk.version>
-        <azurejavasdk.version>1.1.1</azurejavasdk.version>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.azure</groupId>
-                <artifactId>azure-sdk-bom</artifactId>
-                <type>pom</type>
-                <version>${azurejavasdk.version}</version>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>software.amazon.awssdk</groupId>
-                <artifactId>bom</artifactId>
-                <type>pom</type>
-                <version>${awsjavasdk.version}</version>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>stats</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core</artifactId>
@@ -87,16 +31,20 @@
                     <artifactId>jcip-annotations</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
+                    <groupId>com.nimbusds</groupId>
+                    <artifactId>oauth2-oidc-sdk</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.java.dev.jna</groupId>
+                    <artifactId>jna-platform</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.projectlombok</groupId>
                     <artifactId>lombok</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>net.java.dev.jna</groupId>
-                    <artifactId>jna-platform</artifactId>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -119,7 +67,7 @@
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax</artifactId>
-            <version>2.17.0</version>
+            <version>2.34.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.protobuf</groupId>
@@ -129,6 +77,10 @@
                     <groupId>io.opencensus</groupId>
                     <artifactId>opencensus-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.threeten</groupId>
                     <artifactId>threetenbp</artifactId>
@@ -139,13 +91,13 @@
         <dependency>
             <groupId>com.google.auth</groupId>
             <artifactId>google-auth-library-credentials</artifactId>
-            <version>1.6.0</version>
+            <version>1.19.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.google.auth</groupId>
             <artifactId>google-auth-library-oauth2-http</artifactId>
-            <version>1.6.0</version>
+            <version>1.19.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -161,7 +113,7 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-core</artifactId>
-            <version>2.5.6</version>
+            <version>2.24.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.protobuf</groupId>
@@ -177,7 +129,7 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-storage</artifactId>
-            <version>2.5.1</version>
+            <version>2.27.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.auto.value</groupId>
@@ -195,6 +147,18 @@
                     <groupId>com.google.protobuf</groupId>
                     <artifactId>protobuf-java</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.re2j</groupId>
+                    <artifactId>re2j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.opencensus</groupId>
+                    <artifactId>opencensus-proto</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.checkerframework</groupId>
                     <artifactId>checker-qual</artifactId>
@@ -203,8 +167,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -217,31 +182,59 @@
             <artifactId>guice</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>bootstrap</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>concurrent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>stats</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.4.13</version>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.reactivestreams</groupId>
             <artifactId>reactive-streams</artifactId>
-            <version>1.0.3</version>
         </dependency>
 
         <dependency>
@@ -310,10 +303,9 @@
             <artifactId>utils</artifactId>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -324,8 +316,20 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -335,7 +339,12 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing-containers</artifactId>
@@ -349,14 +358,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/ExchangeSourceFile.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/ExchangeSourceFile.java
index 3c240e1ab7da..038fd37f1635 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/ExchangeSourceFile.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/ExchangeSourceFile.java
@@ -13,10 +13,9 @@
  */
 package io.trino.plugin.exchange.filesystem;
 
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.exchange.ExchangeId;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.net.URI;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/ExchangeStorageReader.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/ExchangeStorageReader.java
index fbc1ca40f28c..2aefe57c400b 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/ExchangeStorageReader.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/ExchangeStorageReader.java
@@ -14,10 +14,9 @@
 package io.trino.plugin.exchange.filesystem;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.slice.Slice;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.io.Closeable;
 import java.io.IOException;
 
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/ExchangeStorageWriter.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/ExchangeStorageWriter.java
index 54273c38c728..c21f3403c433 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/ExchangeStorageWriter.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/ExchangeStorageWriter.java
@@ -15,8 +15,7 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import io.airlift.slice.Slice;
-
-import javax.annotation.concurrent.NotThreadSafe;
+import io.trino.annotation.NotThreadSafe;
 
 @NotThreadSafe
 public interface ExchangeStorageWriter
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileStatus.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileStatus.java
index e1bdb6abdc63..ed02069f08e1 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileStatus.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileStatus.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchange.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchange.java
index 639c0f0883d9..77eeeb251d64 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchange.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchange.java
@@ -20,6 +20,7 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.plugin.exchange.filesystem.FileSystemExchangeSourceHandle.SourceFile;
 import io.trino.spi.exchange.Exchange;
 import io.trino.spi.exchange.ExchangeContext;
@@ -29,8 +30,6 @@
 import io.trino.spi.exchange.ExchangeSourceHandle;
 import io.trino.spi.exchange.ExchangeSourceHandleSource;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeConfig.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeConfig.java
index c2c3b8461ed8..05108e973fd0 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeConfig.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeConfig.java
@@ -19,10 +19,9 @@
 import io.airlift.configuration.DefunctConfig;
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.units.DataSize;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 import java.net.URI;
 import java.util.List;
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeManager.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeManager.java
index 3c6a3042fe3c..8eb51b17f80f 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeManager.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeManager.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.exchange.filesystem;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.TrinoException;
 import io.trino.spi.exchange.Exchange;
 import io.trino.spi.exchange.ExchangeContext;
@@ -22,8 +23,6 @@
 import io.trino.spi.exchange.ExchangeSinkInstanceHandle;
 import io.trino.spi.exchange.ExchangeSource;
 
-import javax.inject.Inject;
-
 import java.net.URI;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -122,4 +121,10 @@ public ExchangeSource createSource()
                 exchangeSourceConcurrentReaders,
                 exchangeSourceMaxFilesPerReader);
     }
+
+    @Override
+    public boolean supportsConcurrentReadAndWrite()
+    {
+        return false;
+    }
 }
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeSink.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeSink.java
index a28fedfe2ea5..e5cca22cae8a 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeSink.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeSink.java
@@ -17,6 +17,8 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.slice.SizeOf;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
@@ -25,9 +27,6 @@
 import io.trino.spi.exchange.ExchangeSink;
 import io.trino.spi.exchange.ExchangeSinkInstanceHandle;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.net.URI;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -300,7 +299,9 @@ public synchronized void write(Slice data)
                 currentBuffer = null;
             }
 
-            writeInternal(Slices.wrappedIntArray(data.length()));
+            Slice sizeSlice = Slices.allocate(Integer.BYTES);
+            sizeSlice.setInt(0, data.length());
+            writeInternal(sizeSlice);
             writeInternal(data);
 
             currentFileSize += requiredPageStorageSize;
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeSource.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeSource.java
index 086eca64b399..dacfc2252f09 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeSource.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeSource.java
@@ -19,13 +19,12 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.slice.Slice;
 import io.trino.spi.exchange.ExchangeSource;
 import io.trino.spi.exchange.ExchangeSourceHandle;
 import io.trino.spi.exchange.ExchangeSourceOutputSelector;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeStorage.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeStorage.java
index 501e033f3dc3..04d4406f2a7c 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeStorage.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/FileSystemExchangeStorage.java
@@ -22,7 +22,8 @@
 public interface FileSystemExchangeStorage
         extends AutoCloseable
 {
-    void createDirectories(URI dir) throws IOException;
+    void createDirectories(URI dir)
+            throws IOException;
 
     ExchangeStorageReader createExchangeStorageReader(List<ExchangeSourceFile> sourceFiles, int maxPageStorageSize);
 
@@ -37,5 +38,6 @@ public interface FileSystemExchangeStorage
     int getWriteBufferSize();
 
     @Override
-    void close() throws IOException;
+    void close()
+            throws IOException;
 }
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/azure/AzureBlobFileSystemExchangeStorage.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/azure/AzureBlobFileSystemExchangeStorage.java
index 2211ce7e4cd6..a72761317ade 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/azure/AzureBlobFileSystemExchangeStorage.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/azure/AzureBlobFileSystemExchangeStorage.java
@@ -36,23 +36,22 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.slice.SizeOf;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.Slices;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.plugin.exchange.filesystem.ExchangeSourceFile;
 import io.trino.plugin.exchange.filesystem.ExchangeStorageReader;
 import io.trino.plugin.exchange.filesystem.ExchangeStorageWriter;
 import io.trino.plugin.exchange.filesystem.FileStatus;
 import io.trino.plugin.exchange.filesystem.FileSystemExchangeStorage;
+import jakarta.annotation.PreDestroy;
 import reactor.core.publisher.Flux;
 
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/azure/ExchangeAzureConfig.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/azure/ExchangeAzureConfig.java
index 1117ef34f404..6aa60fe211fb 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/azure/ExchangeAzureConfig.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/azure/ExchangeAzureConfig.java
@@ -19,9 +19,8 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.MaxDataSize;
 import io.airlift.units.MinDataSize;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/local/LocalFileSystemExchangeStorage.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/local/LocalFileSystemExchangeStorage.java
index b36768949d39..f3a5ff4308c9 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/local/LocalFileSystemExchangeStorage.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/local/LocalFileSystemExchangeStorage.java
@@ -16,19 +16,18 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.MoreFiles;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.slice.InputStreamSliceInput;
 import io.airlift.slice.Slice;
 import io.airlift.units.DataSize;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.plugin.exchange.filesystem.ExchangeSourceFile;
 import io.trino.plugin.exchange.filesystem.ExchangeStorageReader;
 import io.trino.plugin.exchange.filesystem.ExchangeStorageWriter;
 import io.trino.plugin.exchange.filesystem.FileStatus;
 import io.trino.plugin.exchange.filesystem.FileSystemExchangeStorage;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -160,8 +159,13 @@ public synchronized Slice read()
                 return null;
             }
 
-            if (sliceInput != null && sliceInput.isReadable()) {
-                return sliceInput.readSlice(sliceInput.readInt());
+            if (sliceInput != null) {
+                if (sliceInput.isReadable()) {
+                    return sliceInput.readSlice(sliceInput.readInt());
+                }
+                else {
+                    sliceInput.close();
+                }
             }
 
             ExchangeSourceFile sourceFile = sourceFiles.poll();
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ByteBufferAsyncRequestBody.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ByteBufferAsyncRequestBody.java
deleted file mode 100644
index cf141169323c..000000000000
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ByteBufferAsyncRequestBody.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.exchange.filesystem.s3;
-
-import io.airlift.log.Logger;
-import org.reactivestreams.Subscriber;
-import org.reactivestreams.Subscription;
-import software.amazon.awssdk.core.async.AsyncRequestBody;
-import software.amazon.awssdk.core.internal.async.ByteArrayAsyncRequestBody;
-import software.amazon.awssdk.core.internal.util.Mimetype;
-
-import java.nio.ByteBuffer;
-import java.util.Optional;
-
-import static java.util.Objects.requireNonNull;
-
-/**
- * This class mimics the implementation of {@link ByteArrayAsyncRequestBody} except for we use a ByteBuffer
- * to avoid unnecessary memory copy
- *
- * An implementation of {@link AsyncRequestBody} for providing data from memory. This is created using static
- * methods on {@link AsyncRequestBody}
- *
- * @see AsyncRequestBody#fromBytes(byte[])
- * @see AsyncRequestBody#fromByteBuffer(ByteBuffer)
- * @see AsyncRequestBody#fromString(String)
- */
-public final class ByteBufferAsyncRequestBody
-        implements AsyncRequestBody
-{
-    private static final Logger log = Logger.get(ByteBufferAsyncRequestBody.class);
-
-    private final ByteBuffer byteBuffer;
-
-    private final String mimetype;
-
-    public ByteBufferAsyncRequestBody(ByteBuffer byteBuffer, String mimetype)
-    {
-        this.byteBuffer = requireNonNull(byteBuffer, "byteBuffer is null");
-        this.mimetype = requireNonNull(mimetype, "mimetype is null");
-    }
-
-    @Override
-    public Optional<Long> contentLength()
-    {
-        return Optional.of((long) byteBuffer.remaining());
-    }
-
-    @Override
-    public String contentType()
-    {
-        return mimetype;
-    }
-
-    @Override
-    public void subscribe(Subscriber<? super ByteBuffer> s)
-    {
-        // As per rule 1.9 we must throw NullPointerException if the subscriber parameter is null
-        if (s == null) {
-            throw new NullPointerException("Subscription MUST NOT be null.");
-        }
-
-        // As per 2.13, this method must return normally (i.e. not throw).
-        try {
-            s.onSubscribe(
-                    new Subscription() {
-                        private boolean done;
-
-                        @Override
-                        public void request(long n)
-                        {
-                            if (done) {
-                                return;
-                            }
-                            if (n > 0) {
-                                done = true;
-                                s.onNext(byteBuffer.asReadOnlyBuffer());
-                                s.onComplete();
-                            }
-                            else {
-                                s.onError(new IllegalArgumentException("§3.9: non-positive requests are not allowed!"));
-                            }
-                        }
-
-                        @Override
-                        public void cancel()
-                        {
-                            synchronized (this) {
-                                if (!done) {
-                                    done = true;
-                                }
-                            }
-                        }
-                    });
-        }
-        catch (Throwable ex) {
-            log.error(ex, " violated the Reactive Streams rule 2.13 by throwing an exception from onSubscribe.");
-        }
-    }
-
-    static AsyncRequestBody fromByteBuffer(ByteBuffer byteBuffer)
-    {
-        return new ByteBufferAsyncRequestBody(byteBuffer, Mimetype.MIMETYPE_OCTET_STREAM);
-    }
-}
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ExchangeS3Config.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ExchangeS3Config.java
index a65d32c9ab7c..326414b022fa 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ExchangeS3Config.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ExchangeS3Config.java
@@ -21,14 +21,13 @@
 import io.airlift.units.Duration;
 import io.airlift.units.MaxDataSize;
 import io.airlift.units.MinDataSize;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.model.StorageClass;
 
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
 import java.util.Optional;
 
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/S3FileSystemExchangeStorage.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/S3FileSystemExchangeStorage.java
index 3133b908ec5f..39a7c666d88c 100644
--- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/S3FileSystemExchangeStorage.java
+++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/S3FileSystemExchangeStorage.java
@@ -29,16 +29,21 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.Slices;
 import io.airlift.units.Duration;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.plugin.exchange.filesystem.ExchangeSourceFile;
 import io.trino.plugin.exchange.filesystem.ExchangeStorageReader;
 import io.trino.plugin.exchange.filesystem.ExchangeStorageWriter;
 import io.trino.plugin.exchange.filesystem.FileStatus;
 import io.trino.plugin.exchange.filesystem.FileSystemExchangeStorage;
+import jakarta.annotation.PreDestroy;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
@@ -77,12 +82,6 @@
 import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider;
 import software.amazon.awssdk.services.sts.model.AssumeRoleRequest;
 
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -120,6 +119,7 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.Objects.requireNonNullElseGet;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static software.amazon.awssdk.core.async.AsyncRequestBody.fromByteBufferUnsafe;
 import static software.amazon.awssdk.core.client.config.SdkAdvancedClientOption.USER_AGENT_PREFIX;
 import static software.amazon.awssdk.core.client.config.SdkAdvancedClientOption.USER_AGENT_SUFFIX;
 
@@ -712,7 +712,7 @@ public ListenableFuture<Void> write(Slice slice)
                         .key(key)
                         .storageClass(storageClass);
                 directUploadFuture = translateFailures(toListenableFuture(s3AsyncClient.putObject(putObjectRequestBuilder.build(),
-                        ByteBufferAsyncRequestBody.fromByteBuffer(slice.toByteBuffer()))));
+                        fromByteBufferUnsafe(slice.toByteBuffer()))));
                 stats.getPutObject().record(directUploadFuture);
                 stats.getPutObjectDataSizeInBytes().add(slice.length());
                 return directUploadFuture;
@@ -804,7 +804,7 @@ private ListenableFuture<CompletedPart> uploadPart(String uploadId, Slice slice,
                     .partNumber(partNumber);
             UploadPartRequest uploadPartRequest = uploadPartRequestBuilder.build();
             stats.getUploadPartDataSizeInBytes().add(slice.length());
-            return stats.getUploadPart().record(Futures.transform(toListenableFuture(s3AsyncClient.uploadPart(uploadPartRequest, ByteBufferAsyncRequestBody.fromByteBuffer(slice.toByteBuffer()))),
+            return stats.getUploadPart().record(Futures.transform(toListenableFuture(s3AsyncClient.uploadPart(uploadPartRequest, fromByteBufferUnsafe(slice.toByteBuffer()))),
                     uploadPartResponse -> CompletedPart.builder().eTag(uploadPartResponse.eTag()).partNumber(partNumber).build(), directExecutor()));
         }
 
diff --git a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/AbstractTestExchangeManager.java b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/AbstractTestExchangeManager.java
index 18d6d0d8d559..74a7584a1139 100644
--- a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/AbstractTestExchangeManager.java
+++ b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/AbstractTestExchangeManager.java
@@ -33,9 +33,10 @@
 import io.trino.spi.exchange.ExchangeSourceHandle;
 import io.trino.spi.exchange.ExchangeSourceHandleSource.ExchangeSourceHandleBatch;
 import io.trino.spi.exchange.ExchangeSourceOutputSelector;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.ArrayDeque;
 import java.util.List;
@@ -54,20 +55,21 @@
 import static java.lang.Math.toIntExact;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public abstract class AbstractTestExchangeManager
 {
     private ExchangeManager exchangeManager;
 
-    @BeforeClass
+    @BeforeAll
     public void init()
             throws Exception
     {
         exchangeManager = createExchangeManager();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void destroy()
             throws Exception
     {
@@ -158,7 +160,7 @@ public void testHappyPath()
         exchange.allRequiredSinksFinished();
 
         ExchangeSourceHandleBatch sourceHandleBatch = exchange.getSourceHandles().getNextBatch().get();
-        assertTrue(sourceHandleBatch.lastBatch());
+        assertThat(sourceHandleBatch.lastBatch()).isTrue();
         List<ExchangeSourceHandle> partitionHandles = sourceHandleBatch.handles();
         assertThat(partitionHandles).hasSize(2);
 
@@ -232,7 +234,7 @@ public void testLargePages()
         exchange.allRequiredSinksFinished();
 
         ExchangeSourceHandleBatch sourceHandleBatch = exchange.getSourceHandles().getNextBatch().get();
-        assertTrue(sourceHandleBatch.lastBatch());
+        assertThat(sourceHandleBatch.lastBatch()).isTrue();
         List<ExchangeSourceHandle> partitionHandles = sourceHandleBatch.handles();
         assertThat(partitionHandles).hasSize(10);
 
diff --git a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/TestFileSystemExchangeConfig.java b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/TestFileSystemExchangeConfig.java
index f62192eac852..b7c1c2bd0c52 100644
--- a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/TestFileSystemExchangeConfig.java
+++ b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/TestFileSystemExchangeConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/TestFileSystemExchangeSource.java b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/TestFileSystemExchangeSource.java
index e82e157ec166..bbfd3cfc5845 100644
--- a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/TestFileSystemExchangeSource.java
+++ b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/TestFileSystemExchangeSource.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.exchange.filesystem;
 
 import io.trino.plugin.exchange.filesystem.local.LocalFileSystemExchangeStorage;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/azure/TestExchangeAzureConfig.java b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/azure/TestExchangeAzureConfig.java
index 7717e149b63e..24ecea60be1c 100644
--- a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/azure/TestExchangeAzureConfig.java
+++ b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/azure/TestExchangeAzureConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/containers/MinioStorage.java b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/containers/MinioStorage.java
index 1aa0c93df658..66e07e6b3857 100644
--- a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/containers/MinioStorage.java
+++ b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/containers/MinioStorage.java
@@ -58,6 +58,7 @@ public void start()
                 .endpointOverride(URI.create("http://localhost:" + minio.getMinioApiEndpoint().getPort()))
                 .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(ACCESS_KEY, SECRET_KEY)))
                 .region(US_EAST_1)
+                .forcePathStyle(true)
                 .build();
         CreateBucketRequest createBucketRequest = CreateBucketRequest.builder()
                 .bucket(bucketName)
@@ -92,6 +93,7 @@ public static Map<String, String> getExchangeManagerProperties(MinioStorage mini
                 .put("exchange.s3.aws-access-key", MinioStorage.ACCESS_KEY)
                 .put("exchange.s3.aws-secret-key", MinioStorage.SECRET_KEY)
                 .put("exchange.s3.region", "us-east-1")
+                .put("exchange.s3.path-style-access", "true")
                 .put("exchange.s3.endpoint", "http://" + minioStorage.getMinio().getMinioApiEndpoint())
                 // create more granular source handles given the fault-tolerant execution target task input size is set to lower value for testing
                 .put("exchange.source-handle-target-data-size", "1MB")
diff --git a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/s3/TestExchangeS3Config.java b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/s3/TestExchangeS3Config.java
index 05156cc69f5d..20dd0077f2b1 100644
--- a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/s3/TestExchangeS3Config.java
+++ b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/s3/TestExchangeS3Config.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.services.s3.model.StorageClass;
 
diff --git a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/s3/TestS3FileSystemExchangeManager.java b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/s3/TestS3FileSystemExchangeManager.java
index 7b4b5b8c8520..9708b1f31a27 100644
--- a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/s3/TestS3FileSystemExchangeManager.java
+++ b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/s3/TestS3FileSystemExchangeManager.java
@@ -17,7 +17,7 @@
 import io.trino.plugin.exchange.filesystem.FileSystemExchangeManagerFactory;
 import io.trino.plugin.exchange.filesystem.containers.MinioStorage;
 import io.trino.spi.exchange.ExchangeManager;
-import org.testng.annotations.AfterClass;
+import org.junit.jupiter.api.AfterAll;
 
 import static io.trino.plugin.exchange.filesystem.containers.MinioStorage.getExchangeManagerProperties;
 import static java.util.UUID.randomUUID;
@@ -37,7 +37,7 @@ protected ExchangeManager createExchangeManager()
     }
 
     @Override
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void destroy()
             throws Exception
     {
diff --git a/plugin/trino-exchange-hdfs/pom.xml b/plugin/trino-exchange-hdfs/pom.xml
index 2527fb48ac67..4a1db2d3dfe6 100644
--- a/plugin/trino-exchange-hdfs/pom.xml
+++ b/plugin/trino-exchange-hdfs/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-exchange-hdfs</artifactId>
-    <description>Trino - Exchange HDFS</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Exchange HDFS</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,23 +18,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-exchange-filesystem</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hadoop-toolkit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hadoop</groupId>
-            <artifactId>hadoop-apache</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -53,28 +49,28 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-exchange-filesystem</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hadoop-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino.hadoop</groupId>
+            <artifactId>hadoop-apache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -82,10 +78,9 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -96,8 +91,20 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -107,10 +114,15 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-exchange-hdfs/src/main/java/io/trino/plugin/exchange/hdfs/ExchangeHdfsConfig.java b/plugin/trino-exchange-hdfs/src/main/java/io/trino/plugin/exchange/hdfs/ExchangeHdfsConfig.java
index a236cadc46c3..ab3e59ee6c87 100644
--- a/plugin/trino-exchange-hdfs/src/main/java/io/trino/plugin/exchange/hdfs/ExchangeHdfsConfig.java
+++ b/plugin/trino-exchange-hdfs/src/main/java/io/trino/plugin/exchange/hdfs/ExchangeHdfsConfig.java
@@ -21,8 +21,7 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.MaxDataSize;
 import io.airlift.units.MinDataSize;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.List;
diff --git a/plugin/trino-exchange-hdfs/src/main/java/io/trino/plugin/exchange/hdfs/HadoopFileSystemExchangeStorage.java b/plugin/trino-exchange-hdfs/src/main/java/io/trino/plugin/exchange/hdfs/HadoopFileSystemExchangeStorage.java
index 643df36670d2..09b0614ea679 100644
--- a/plugin/trino-exchange-hdfs/src/main/java/io/trino/plugin/exchange/hdfs/HadoopFileSystemExchangeStorage.java
+++ b/plugin/trino-exchange-hdfs/src/main/java/io/trino/plugin/exchange/hdfs/HadoopFileSystemExchangeStorage.java
@@ -15,8 +15,12 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.slice.InputStreamSliceInput;
 import io.airlift.slice.Slice;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.plugin.exchange.filesystem.ExchangeSourceFile;
 import io.trino.plugin.exchange.filesystem.ExchangeStorageReader;
 import io.trino.plugin.exchange.filesystem.ExchangeStorageWriter;
@@ -28,11 +32,6 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.RemoteIterator;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -175,8 +174,13 @@ public synchronized Slice read()
                 return null;
             }
 
-            if (sliceInput != null && sliceInput.isReadable()) {
-                return sliceInput.readSlice(sliceInput.readInt());
+            if (sliceInput != null) {
+                if (sliceInput.isReadable()) {
+                    return sliceInput.readSlice(sliceInput.readInt());
+                }
+                else {
+                    sliceInput.close();
+                }
             }
 
             ExchangeSourceFile sourceFile = sourceFiles.poll();
diff --git a/plugin/trino-exchange-hdfs/src/test/java/io/trino/plugin/exchange/hdfs/TestExchangeHdfsConfig.java b/plugin/trino-exchange-hdfs/src/test/java/io/trino/plugin/exchange/hdfs/TestExchangeHdfsConfig.java
index 3e4a83e78775..c35ef7a9644b 100644
--- a/plugin/trino-exchange-hdfs/src/test/java/io/trino/plugin/exchange/hdfs/TestExchangeHdfsConfig.java
+++ b/plugin/trino-exchange-hdfs/src/test/java/io/trino/plugin/exchange/hdfs/TestExchangeHdfsConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/plugin/trino-geospatial/pom.xml b/plugin/trino-geospatial/pom.xml
index 68adfee1031c..277fd5213323 100644
--- a/plugin/trino-geospatial/pom.xml
+++ b/plugin/trino-geospatial/pom.xml
@@ -1,22 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-geospatial</artifactId>
-    <description>Trino - Geospatial Plugin</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Geospatial Plugin</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.esri.geometry</groupId>
+            <artifactId>esri-geometry-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-array</artifactId>
@@ -28,21 +38,40 @@
         </dependency>
 
         <dependency>
-            <groupId>com.esri.geometry</groupId>
-            <artifactId>esri-geometry-api</artifactId>
+            <groupId>org.locationtech.jts</groupId>
+            <artifactId>jts-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.locationtech.jts</groupId>
-            <artifactId>jts-core</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -55,32 +84,36 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>concurrent</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-hive</artifactId>
@@ -150,30 +183,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -203,11 +212,5 @@
             <artifactId>jmh-generator-annprocess</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/BingTile.java b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/BingTile.java
index 2403c4752974..68f2e579e9e6 100644
--- a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/BingTile.java
+++ b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/BingTile.java
@@ -138,7 +138,7 @@ public String toQuadKey()
                 digit++;
             }
             if ((this.y & mask) != 0) {
-                digit += 2;
+                digit += (char) 2;
             }
             quadKey[this.zoomLevel - i] = digit;
         }
diff --git a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/BingTileFunctions.java b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/BingTileFunctions.java
index 6dbc00ebe57a..23c0422ed378 100644
--- a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/BingTileFunctions.java
+++ b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/BingTileFunctions.java
@@ -18,10 +18,11 @@
 import com.esri.core.geometry.ogc.OGCGeometry;
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slice;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedRowValueBuilder;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
@@ -108,28 +109,21 @@ public static final class BingTileCoordinatesFunction
     {
         private static final RowType BING_TILE_COORDINATES_ROW_TYPE = RowType.anonymous(ImmutableList.of(INTEGER, INTEGER));
 
-        private final PageBuilder pageBuilder;
+        private final BufferedRowValueBuilder rowValueBuilder;
 
         public BingTileCoordinatesFunction()
         {
-            pageBuilder = new PageBuilder(ImmutableList.of(BING_TILE_COORDINATES_ROW_TYPE));
+            rowValueBuilder = BufferedRowValueBuilder.createBuffered(BING_TILE_COORDINATES_ROW_TYPE);
         }
 
         @SqlType("row(x integer,y integer)")
-        public Block bingTileCoordinates(@SqlType(BingTileType.NAME) long input)
+        public SqlRow bingTileCoordinates(@SqlType(BingTileType.NAME) long input)
         {
-            if (pageBuilder.isFull()) {
-                pageBuilder.reset();
-            }
-            BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
             BingTile tile = BingTile.decode(input);
-            BlockBuilder tileBlockBuilder = blockBuilder.beginBlockEntry();
-            INTEGER.writeLong(tileBlockBuilder, tile.getX());
-            INTEGER.writeLong(tileBlockBuilder, tile.getY());
-            blockBuilder.closeEntry();
-            pageBuilder.declarePosition();
-
-            return BING_TILE_COORDINATES_ROW_TYPE.getObject(blockBuilder, blockBuilder.getPositionCount() - 1);
+            return rowValueBuilder.build(fields -> {
+                INTEGER.writeLong(fields.get(0), tile.getX());
+                INTEGER.writeLong(fields.get(1), tile.getY());
+            });
         }
     }
 
@@ -507,10 +501,10 @@ private static BingTile[] getTilesInBetween(BingTile leftUpperTile, BingTile rig
         checkArgument(leftUpperTile.getZoomLevel() > zoomLevel);
 
         int divisor = 1 << (leftUpperTile.getZoomLevel() - zoomLevel);
-        int minX = (int) Math.floor(leftUpperTile.getX() / divisor);
-        int maxX = (int) Math.floor(rightLowerTile.getX() / divisor);
-        int minY = (int) Math.floor(leftUpperTile.getY() / divisor);
-        int maxY = (int) Math.floor(rightLowerTile.getY() / divisor);
+        int minX = leftUpperTile.getX() / divisor;
+        int maxX = rightLowerTile.getX() / divisor;
+        int minY = leftUpperTile.getY() / divisor;
+        int maxY = rightLowerTile.getY() / divisor;
 
         BingTile[] tiles = new BingTile[(maxX - minX + 1) * (maxY - minY + 1)];
         int index = 0;
diff --git a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/BingTileType.java b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/BingTileType.java
index 659ce9d6585f..8f9d5e8b2453 100644
--- a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/BingTileType.java
+++ b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/BingTileType.java
@@ -24,7 +24,7 @@ public class BingTileType
     public static final BingTileType BING_TILE = new BingTileType();
     public static final String NAME = "BingTile";
 
-    public BingTileType()
+    private BingTileType()
     {
         super(new TypeSignature(NAME));
     }
@@ -42,6 +42,6 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
             return null;
         }
 
-        return BingTile.decode(block.getLong(position, 0));
+        return BingTile.decode(getLong(block, position));
     }
 }
diff --git a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/GeoFunctions.java b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/GeoFunctions.java
index 6e56501b2fd5..716bcce64cb1 100644
--- a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/GeoFunctions.java
+++ b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/GeoFunctions.java
@@ -48,10 +48,10 @@
 import io.trino.geospatial.serde.GeometrySerde;
 import io.trino.geospatial.serde.GeometrySerializationType;
 import io.trino.geospatial.serde.JtsGeometrySerde;
-import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.function.Description;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlNullable;
@@ -92,7 +92,7 @@
 import static com.esri.core.geometry.ogc.OGCGeometry.createFromEsriGeometry;
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.slice.Slices.utf8Slice;
-import static io.airlift.slice.Slices.wrappedBuffer;
+import static io.airlift.slice.Slices.wrappedHeapBuffer;
 import static io.trino.geospatial.GeometryType.GEOMETRY_COLLECTION;
 import static io.trino.geospatial.GeometryType.LINE_STRING;
 import static io.trino.geospatial.GeometryType.MULTI_LINE_STRING;
@@ -112,6 +112,7 @@
 import static io.trino.plugin.geospatial.GeometryType.GEOMETRY_TYPE_NAME;
 import static io.trino.plugin.geospatial.SphericalGeographyType.SPHERICAL_GEOGRAPHY_TYPE_NAME;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
 import static io.trino.spi.type.StandardTypes.BIGINT;
 import static io.trino.spi.type.StandardTypes.BOOLEAN;
 import static io.trino.spi.type.StandardTypes.DOUBLE;
@@ -387,7 +388,7 @@ public static Slice stAsText(@SqlType(GEOMETRY_TYPE_NAME) Slice input)
     @SqlType(VARBINARY)
     public static Slice stAsBinary(@SqlType(GEOMETRY_TYPE_NAME) Slice input)
     {
-        return wrappedBuffer(deserialize(input).asBinary());
+        return wrappedHeapBuffer(deserialize(input).asBinary());
     }
 
     @SqlNullable
@@ -1192,7 +1193,7 @@ public static Double stDistance(@SqlType(GEOMETRY_TYPE_NAME) Slice left, @SqlTyp
     @Description("Return the closest points on the two geometries")
     @ScalarFunction("geometry_nearest_points")
     @SqlType("row(" + GEOMETRY_TYPE_NAME + "," + GEOMETRY_TYPE_NAME + ")")
-    public static Block geometryNearestPoints(@SqlType(GEOMETRY_TYPE_NAME) Slice left, @SqlType(GEOMETRY_TYPE_NAME) Slice right)
+    public static SqlRow geometryNearestPoints(@SqlType(GEOMETRY_TYPE_NAME) Slice left, @SqlType(GEOMETRY_TYPE_NAME) Slice right)
     {
         Geometry leftGeometry = JtsGeometrySerde.deserialize(left);
         Geometry rightGeometry = JtsGeometrySerde.deserialize(right);
@@ -1201,18 +1202,13 @@ public static Block geometryNearestPoints(@SqlType(GEOMETRY_TYPE_NAME) Slice lef
         }
 
         RowType rowType = RowType.anonymous(ImmutableList.of(GEOMETRY, GEOMETRY));
-        PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(rowType));
         GeometryFactory geometryFactory = leftGeometry.getFactory();
         Coordinate[] nearestCoordinates = DistanceOp.nearestPoints(leftGeometry, rightGeometry);
 
-        BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-        BlockBuilder entryBlockBuilder = blockBuilder.beginBlockEntry();
-        GEOMETRY.writeSlice(entryBlockBuilder, JtsGeometrySerde.serialize(geometryFactory.createPoint(nearestCoordinates[0])));
-        GEOMETRY.writeSlice(entryBlockBuilder, JtsGeometrySerde.serialize(geometryFactory.createPoint(nearestCoordinates[1])));
-        blockBuilder.closeEntry();
-        pageBuilder.declarePosition();
-
-        return rowType.getObject(blockBuilder, blockBuilder.getPositionCount() - 1);
+        return buildRowValue(rowType, fieldBuilders -> {
+            GEOMETRY.writeSlice(fieldBuilders.get(0), serialize(geometryFactory.createPoint(nearestCoordinates[0])));
+            GEOMETRY.writeSlice(fieldBuilders.get(1), serialize(geometryFactory.createPoint(nearestCoordinates[1])));
+        });
     }
 
     @SqlNullable
@@ -1487,7 +1483,7 @@ private static Block spatialPartitions(KdbTree kdbTree, Rectangle envelope)
             for (Map.Entry<Integer, Rectangle> partition : partitions.entrySet()) {
                 if (envelope.getXMin() < partition.getValue().getXMax() && envelope.getYMin() < partition.getValue().getYMax()) {
                     BlockBuilder blockBuilder = IntegerType.INTEGER.createFixedSizeBlockBuilder(1);
-                    blockBuilder.writeInt(partition.getKey());
+                    IntegerType.INTEGER.writeInt(blockBuilder, partition.getKey());
                     return blockBuilder.build();
                 }
             }
@@ -1496,7 +1492,7 @@ private static Block spatialPartitions(KdbTree kdbTree, Rectangle envelope)
 
         BlockBuilder blockBuilder = IntegerType.INTEGER.createFixedSizeBlockBuilder(partitions.size());
         for (int id : partitions.keySet()) {
-            blockBuilder.writeInt(id);
+            IntegerType.INTEGER.writeInt(blockBuilder, id);
         }
 
         return blockBuilder.build();
diff --git a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/GeometryType.java b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/GeometryType.java
index b9f4129ec658..9904fbd0006f 100644
--- a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/GeometryType.java
+++ b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/GeometryType.java
@@ -16,6 +16,8 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.TypeSignature;
@@ -38,22 +40,12 @@ protected GeometryType(TypeSignature signature)
         super(signature, Slice.class);
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
-    }
-
     @Override
     public Slice getSlice(Block block, int position)
     {
-        return block.getSlice(position, 0, block.getSliceLength(position));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return valueBlock.getSlice(valuePosition);
     }
 
     @Override
@@ -73,7 +65,7 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int l
             blockBuilder.appendNull();
             return;
         }
-        blockBuilder.writeBytes(value, offset, length).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(value, offset, length);
     }
 
     @Override
@@ -82,7 +74,6 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         if (block.isNull(position)) {
             return null;
         }
-        Slice slice = block.getSlice(position, 0, block.getSliceLength(position));
-        return deserialize(slice).asText();
+        return deserialize(getSlice(block, position)).asText();
     }
 }
diff --git a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/KdbTreeType.java b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/KdbTreeType.java
index e548371ca3bd..f66e3afd1863 100644
--- a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/KdbTreeType.java
+++ b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/KdbTreeType.java
@@ -14,19 +14,40 @@
 package io.trino.plugin.geospatial;
 
 import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
 import io.trino.geospatial.KdbTree;
 import io.trino.geospatial.KdbTreeUtils;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.function.BlockIndex;
+import io.trino.spi.function.BlockPosition;
+import io.trino.spi.function.FlatFixed;
+import io.trino.spi.function.FlatFixedOffset;
+import io.trino.spi.function.FlatVariableWidth;
+import io.trino.spi.function.ScalarOperator;
 import io.trino.spi.type.AbstractVariableWidthType;
+import io.trino.spi.type.TypeOperatorDeclaration;
+import io.trino.spi.type.TypeOperators;
 import io.trino.spi.type.TypeSignature;
 
-import static io.airlift.slice.Slices.utf8Slice;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
+
+import static io.trino.spi.function.OperatorType.READ_VALUE;
+import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
+import static java.lang.invoke.MethodHandles.lookup;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 public final class KdbTreeType
         extends AbstractVariableWidthType
 {
+    private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(KdbTreeType.class, lookup(), Object.class);
+    private static final VarHandle INT_HANDLE = MethodHandles.byteArrayViewVarHandle(int[].class, ByteOrder.LITTLE_ENDIAN);
+
     public static final KdbTreeType KDB_TREE = new KdbTreeType();
     public static final String NAME = "KdbTree";
 
@@ -34,34 +55,27 @@ private KdbTreeType()
     {
         // The KDB tree type should be KdbTree but can not be since KdbTree is in
         // both the plugin class loader and the system class loader.  This was done
-        // so the plan optimizer can process geo spatial joins.
+        // so the plan optimizer can process geospatial joins.
         super(new TypeSignature(NAME), Object.class);
     }
 
     @Override
-    public Object getObjectValue(ConnectorSession session, Block block, int position)
+    public TypeOperatorDeclaration getTypeOperatorDeclaration(TypeOperators typeOperators)
     {
-        return getObject(block, position);
+        return TYPE_OPERATOR_DECLARATION;
     }
 
     @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
+    public Object getObjectValue(ConnectorSession session, Block block, int position)
     {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
+        return getObject(block, position);
     }
 
     @Override
     public void writeObject(BlockBuilder blockBuilder, Object value)
     {
-        String json = KdbTreeUtils.toJson(((KdbTree) value));
-        Slice bytes = utf8Slice(json);
-        blockBuilder.writeBytes(bytes, 0, bytes.length()).closeEntry();
+        byte[] jsonBytes = KdbTreeUtils.toJsonBytes(((KdbTree) value));
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(jsonBytes, 0, jsonBytes.length);
     }
 
     @Override
@@ -70,8 +84,86 @@ public Object getObject(Block block, int position)
         if (block.isNull(position)) {
             return null;
         }
-        Slice bytes = block.getSlice(position, 0, block.getSliceLength(position));
-        KdbTree kdbTree = KdbTreeUtils.fromJson(bytes.toStringUtf8());
-        return kdbTree;
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        String json = valueBlock.getSlice(valuePosition).toStringUtf8();
+        return KdbTreeUtils.fromJson(json);
+    }
+
+    @Override
+    public int getFlatFixedSize()
+    {
+        return 8;
+    }
+
+    @Override
+    public int getFlatVariableWidthSize(Block block, int position)
+    {
+        return block.getSliceLength(position);
+    }
+
+    @Override
+    public int relocateFlatVariableWidthOffsets(byte[] fixedSizeSlice, int fixedSizeOffset, byte[] variableSizeSlice, int variableSizeOffset)
+    {
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + Integer.BYTES, variableSizeOffset);
+        return (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static Object readFlat(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] variableSizeSlice)
+    {
+        int length = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+        int offset = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Integer.BYTES);
+
+        return KdbTreeUtils.fromJson(new String(variableSizeSlice, offset, length, UTF_8));
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void readFlatToBlock(
+            @FlatFixed byte[] fixedSizeSlice,
+            @FlatFixedOffset int fixedSizeOffset,
+            @FlatVariableWidth byte[] variableSizeSlice,
+            BlockBuilder blockBuilder)
+    {
+        int length = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset);
+        int offset = (int) INT_HANDLE.get(fixedSizeSlice, fixedSizeOffset + Integer.BYTES);
+
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(Slices.wrappedBuffer(variableSizeSlice, offset, length));
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeFlat(
+            Object value,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] variableWidthSlice,
+            int variableSizeOffset)
+    {
+        byte[] bytes = KdbTreeUtils.toJsonBytes(((KdbTree) value));
+        System.arraycopy(bytes, 0, variableWidthSlice, variableSizeOffset, bytes.length);
+
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset, bytes.length);
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + Integer.BYTES, variableSizeOffset);
+    }
+
+    @ScalarOperator(READ_VALUE)
+    private static void writeBlockToFlat(
+            @BlockPosition VariableWidthBlock block,
+            @BlockIndex int position,
+            byte[] fixedSizeSlice,
+            int fixedSizeOffset,
+            byte[] variableSizeSlice,
+            int variableSizeOffset)
+    {
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        Slice bytes = valueBlock.getSlice(valuePosition);
+        bytes.getBytes(0, variableSizeSlice, variableSizeOffset, bytes.length());
+
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset, bytes.length());
+        INT_HANDLE.set(fixedSizeSlice, fixedSizeOffset + Integer.BYTES, variableSizeOffset);
     }
 }
diff --git a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/SpatialPartitioningStateFactory.java b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/SpatialPartitioningStateFactory.java
index 3209562ae2f2..d24d4b262562 100644
--- a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/SpatialPartitioningStateFactory.java
+++ b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/SpatialPartitioningStateFactory.java
@@ -115,7 +115,7 @@ public void setSamples(List<Rectangle> samples)
         @Override
         public long getEstimatedSize()
         {
-            return INSTANCE_SIZE + partitionCounts.sizeOf() + counts.sizeOf() + envelopes.sizeOf() + samples.sizeOf() + ENVELOPE_SIZE * (envelopeCount + samplesCount);
+            return INSTANCE_SIZE + partitionCounts.sizeOf() + counts.sizeOf() + envelopes.sizeOf() + samples.sizeOf() + (long) ENVELOPE_SIZE * (envelopeCount + samplesCount);
         }
 
         @Override
diff --git a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/SphericalGeographyType.java b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/SphericalGeographyType.java
index 1dc207ca48ec..af01848db877 100644
--- a/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/SphericalGeographyType.java
+++ b/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/SphericalGeographyType.java
@@ -16,6 +16,8 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.TypeSignature;
@@ -33,22 +35,12 @@ private SphericalGeographyType()
         super(new TypeSignature(SPHERICAL_GEOGRAPHY_TYPE_NAME), Slice.class);
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
-    }
-
     @Override
     public Slice getSlice(Block block, int position)
     {
-        return block.getSlice(position, 0, block.getSliceLength(position));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return valueBlock.getSlice(valuePosition);
     }
 
     @Override
@@ -60,7 +52,7 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value)
     @Override
     public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int length)
     {
-        blockBuilder.writeBytes(value, offset, length).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(value, offset, length);
     }
 
     @Override
@@ -69,7 +61,6 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         if (block.isNull(position)) {
             return null;
         }
-        Slice slice = block.getSlice(position, 0, block.getSliceLength(position));
-        return deserialize(slice).asText();
+        return deserialize(getSlice(block, position)).asText();
     }
 }
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/AbstractTestExtractSpatial.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/AbstractTestExtractSpatial.java
new file mode 100644
index 000000000000..7ec1cf2d5eda
--- /dev/null
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/AbstractTestExtractSpatial.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed 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 io.trino.plugin.geospatial;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.spi.type.Type;
+import io.trino.sql.planner.Symbol;
+import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.FunctionCall;
+import io.trino.sql.tree.StringLiteral;
+
+import java.util.List;
+
+import static io.trino.plugin.geospatial.GeometryType.GEOMETRY;
+import static io.trino.plugin.geospatial.SphericalGeographyType.SPHERICAL_GEOGRAPHY;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
+
+public abstract class AbstractTestExtractSpatial
+        extends BaseRuleTest
+{
+    public AbstractTestExtractSpatial()
+    {
+        super(new GeoPlugin());
+    }
+
+    protected FunctionCall containsCall(Expression left, Expression right)
+    {
+        return functionCall("st_contains", ImmutableList.of(GEOMETRY, GEOMETRY), ImmutableList.of(left, right));
+    }
+
+    protected FunctionCall distanceCall(Expression left, Expression right)
+    {
+        return functionCall("st_distance", ImmutableList.of(GEOMETRY, GEOMETRY), ImmutableList.of(left, right));
+    }
+
+    protected FunctionCall sphericalDistanceCall(Expression left, Expression right)
+    {
+        return functionCall("st_distance", ImmutableList.of(SPHERICAL_GEOGRAPHY, SPHERICAL_GEOGRAPHY), ImmutableList.of(left, right));
+    }
+
+    protected FunctionCall geometryFromTextCall(Symbol symbol)
+    {
+        return functionCall("st_geometryfromtext", ImmutableList.of(VARCHAR), ImmutableList.of(symbol.toSymbolReference()));
+    }
+
+    protected FunctionCall geometryFromTextCall(String text)
+    {
+        return functionCall("st_geometryfromtext", ImmutableList.of(VARCHAR), ImmutableList.of(new StringLiteral(text)));
+    }
+
+    protected FunctionCall toSphericalGeographyCall(Symbol symbol)
+    {
+        return functionCall("to_spherical_geography", ImmutableList.of(GEOMETRY), ImmutableList.of(geometryFromTextCall(symbol)));
+    }
+
+    protected FunctionCall toPointCall(Expression x, Expression y)
+    {
+        return functionCall("st_point", ImmutableList.of(BIGINT, BIGINT), ImmutableList.of(x, y));
+    }
+
+    private FunctionCall functionCall(String name, List<Type> types, List<Expression> arguments)
+    {
+        return new FunctionCall(tester().getMetadata().resolveBuiltinFunction(name, fromTypes(types)).toQualifiedName(), arguments);
+    }
+}
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkBingTilesAround.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkBingTilesAround.java
index d024be8d3a88..bf4d5691963f 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkBingTilesAround.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkBingTilesAround.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.geospatial;
 
 import io.trino.jmh.Benchmarks;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -25,7 +26,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkEnvelopeIntersection.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkEnvelopeIntersection.java
index 0afde4eb8bd5..4100ad5a1894 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkEnvelopeIntersection.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkEnvelopeIntersection.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.geospatial;
 
 import io.airlift.slice.Slice;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -25,7 +26,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.concurrent.TimeUnit;
 
@@ -35,7 +35,7 @@
 import static io.trino.plugin.geospatial.GeoFunctions.stEnvelope;
 import static io.trino.plugin.geospatial.GeoFunctions.stGeometryFromText;
 import static io.trino.plugin.geospatial.GeoFunctions.stIntersection;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @State(Scope.Thread)
 @Fork(2)
@@ -82,7 +82,7 @@ public void validate()
         BenchmarkData data = new BenchmarkData();
         data.setup();
         BenchmarkEnvelopeIntersection benchmark = new BenchmarkEnvelopeIntersection();
-        assertEquals(deserialize(benchmark.envelopes(data)), deserialize(benchmark.geometries(data)));
+        assertThat(deserialize(benchmark.envelopes(data))).isEqualTo(deserialize(benchmark.geometries(data)));
     }
 
     public static void main(String[] args)
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkGeometryAggregations.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkGeometryAggregations.java
index 48ca6fcbc55c..73d792adfd5d 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkGeometryAggregations.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkGeometryAggregations.java
@@ -17,6 +17,7 @@
 import io.trino.plugin.memory.MemoryConnectorFactory;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.MaterializedResult;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -26,7 +27,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
-import org.testng.annotations.Test;
 
 import java.io.File;
 import java.nio.file.Files;
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkSTArea.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkSTArea.java
index bc0ed99ffee3..bf7c829b531b 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkSTArea.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkSTArea.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.geospatial;
 
 import io.airlift.slice.Slice;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -25,7 +26,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
@@ -37,7 +37,7 @@
 import static io.trino.plugin.geospatial.GeoFunctions.stGeometryFromText;
 import static io.trino.plugin.geospatial.GeoFunctions.toSphericalGeography;
 import static io.trino.plugin.geospatial.GeometryBenchmarkUtils.loadPolygon;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @State(Scope.Thread)
 @Fork(2)
@@ -107,10 +107,10 @@ public static void verify()
         data.setup();
         BenchmarkSTArea benchmark = new BenchmarkSTArea();
 
-        assertEquals(Math.round(1000 * (Double) benchmark.stSphericalArea(data) / 3.659E8), 1000);
-        assertEquals(Math.round(1000 * (Double) benchmark.stSphericalArea500k(data) / 38842273735.0), 1000);
-        assertEquals(benchmark.stArea(data), 0.05033099592771004);
-        assertEquals(Math.round(1000 * (Double) benchmark.stArea500k(data) / Math.PI), 1000);
+        assertThat(Math.round(1000 * (Double) benchmark.stSphericalArea(data) / 3.659E8)).isEqualTo(1000);
+        assertThat(Math.round(1000 * (Double) benchmark.stSphericalArea500k(data) / 38842273735.0)).isEqualTo(1000);
+        assertThat(benchmark.stArea(data)).isEqualTo(0.05033099592771004);
+        assertThat(Math.round(1000 * (Double) benchmark.stArea500k(data) / Math.PI)).isEqualTo(1000);
     }
 
     private static String createPolygon(int vertexCount)
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkSTIntersects.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkSTIntersects.java
index e87202eea943..f814a6bc0c6a 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkSTIntersects.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkSTIntersects.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.geospatial;
 
 import io.airlift.slice.Slice;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -25,7 +26,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkSpatialJoin.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkSpatialJoin.java
index 0e6a43fb8f66..cb322715a589 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkSpatialJoin.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/BenchmarkSpatialJoin.java
@@ -20,6 +20,7 @@
 import io.trino.plugin.memory.MemoryConnectorFactory;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.MaterializedResult;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -31,7 +32,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
-import org.testng.annotations.Test;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -45,9 +45,9 @@
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.openjdk.jmh.annotations.Mode.AverageTime;
 import static org.openjdk.jmh.annotations.Scope.Thread;
-import static org.testng.Assert.assertTrue;
 
 @SuppressWarnings("MethodMayBeStatic")
 @State(Thread)
@@ -111,7 +111,9 @@ public void dropPointsTable()
                 Metadata metadata = queryRunner.getMetadata();
                 QualifiedObjectName tableName = QualifiedObjectName.valueOf("memory.default.points");
                 Optional<TableHandle> tableHandle = metadata.getTableHandle(transactionSession, tableName);
-                assertTrue(tableHandle.isPresent(), "Table memory.default.points does not exist");
+                assertThat(tableHandle.isPresent())
+                        .describedAs("Table memory.default.points does not exist")
+                        .isTrue();
                 metadata.dropTable(transactionSession, tableHandle.get(), tableName.asCatalogSchemaTableName());
                 return null;
             });
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestBingTileFunctions.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestBingTileFunctions.java
index d06bb6358d47..230a916fb85c 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestBingTileFunctions.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestBingTileFunctions.java
@@ -43,7 +43,6 @@
 import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
-import static org.testng.Assert.assertEquals;
 
 @TestInstance(PER_CLASS)
 public class TestBingTileFunctions
@@ -72,8 +71,8 @@ public void testSerialization()
         ObjectMapper objectMapper = new ObjectMapper();
         BingTile tile = fromCoordinates(1, 2, 3);
         String json = objectMapper.writeValueAsString(tile);
-        assertEquals("{\"x\":1,\"y\":2,\"zoom\":3}", json);
-        assertEquals(tile, objectMapper.readerFor(BingTile.class).readValue(json));
+        assertThat("{\"x\":1,\"y\":2,\"zoom\":3}").isEqualTo(json);
+        assertThat(tile).isEqualTo(objectMapper.readerFor(BingTile.class).readValue(json));
     }
 
     @Test
@@ -106,27 +105,27 @@ public void testBingTile()
                 .isEqualTo("123030123010121");
 
         // Invalid calls: corrupt quadkeys
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tile", "''").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tile", "''")::evaluate)
                 .hasMessage("QuadKey must not be empty string");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tile", "'test'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tile", "'test'")::evaluate)
                 .hasMessage("Invalid QuadKey digit sequence: test");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tile", "'12345'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tile", "'12345'")::evaluate)
                 .hasMessage("Invalid QuadKey digit sequence: 12345");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tile", "'101010101010101010101010101010100101010101001010'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tile", "'101010101010101010101010101010100101010101001010'")::evaluate)
                 .hasMessage("QuadKey must be 23 characters or less");
 
         // Invalid calls: XY out of range
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tile", "10", "2", "3").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tile", "10", "2", "3")::evaluate)
                 .hasMessage("XY coordinates for a Bing tile at zoom level 3 must be within [0, 8) range");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tile", "2", "10", "3").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tile", "2", "10", "3")::evaluate)
                 .hasMessage("XY coordinates for a Bing tile at zoom level 3 must be within [0, 8) range");
 
         // Invalid calls: zoom level out of range
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tile", "2", "7", "37").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tile", "2", "7", "37")::evaluate)
                 .hasMessage("Zoom level must be <= 23");
     }
 
@@ -151,18 +150,18 @@ public void testPointToBingTile()
 
         // Invalid calls
         // Longitude out of range
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tile_at", "30.12", "600", "15").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tile_at", "30.12", "600", "15")::evaluate)
                 .hasMessage("Longitude must be between -180.0 and 180.0");
 
         // Latitude out of range
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tile_at", "300.12", "60", "15").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tile_at", "300.12", "60", "15")::evaluate)
                 .hasMessage("Latitude must be between -85.05112878 and 85.05112878");
 
         // Invalid zoom levels
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tile_at", "30.12", "60", "0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tile_at", "30.12", "60", "0")::evaluate)
                 .hasMessage("Zoom level must be > 0");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tile_at", "30.12", "60", "40").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tile_at", "30.12", "60", "40")::evaluate)
                 .hasMessage("Zoom level must be <= 23");
     }
 
@@ -293,14 +292,14 @@ public void testBingTilesAroundEdgeWithRadius()
     public void testBingTilesWithRadiusBadInput()
     {
         // Invalid radius
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tiles_around", "30.12", "60.0", "1", "-1").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tiles_around", "30.12", "60.0", "1", "-1")::evaluate)
                 .hasMessage("Radius must be >= 0");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tiles_around", "30.12", "60.0", "1", "2000").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tiles_around", "30.12", "60.0", "1", "2000")::evaluate)
                 .hasMessage("Radius must be <= 1,000 km");
 
         // Too many tiles
-        assertTrinoExceptionThrownBy(() -> assertions.function("bing_tiles_around", "30.12", "60.0", "20", "100").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("bing_tiles_around", "30.12", "60.0", "20", "100")::evaluate)
                 .hasMessage("The number of tiles covering input rectangle exceeds the limit of 1M. Number of tiles: 36699364. Radius: 100.0 km. Zoom level: 20.");
     }
 
@@ -636,7 +635,7 @@ public void testGeometryToBingTiles()
                 .hasMessage("Zoom level must be <= 23");
 
         // Input rectangle too large
-        assertTrinoExceptionThrownBy(() -> assertions.function("geometry_to_bing_tiles", "ST_Envelope(ST_GeometryFromText('LINESTRING (0 0, 80 80)'))", "16").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("geometry_to_bing_tiles", "ST_Envelope(ST_GeometryFromText('LINESTRING (0 0, 80 80)'))", "16")::evaluate)
                 .hasMessage("The number of tiles covering input rectangle exceeds the limit of 1M. Number of tiles: 370085804. Rectangle: xMin=0.00, yMin=0.00, xMax=80.00, yMax=80.00. Zoom level: 16.");
 
         assertThat(assertions.function("cardinality", "geometry_to_bing_tiles(ST_Envelope(ST_GeometryFromText('LINESTRING (0 0, 80 80)')), 5)"))
@@ -648,14 +647,14 @@ public void testGeometryToBingTiles()
         try (Stream<String> lines = Files.lines(Paths.get(filePath))) {
             largeWkt = lines.collect(onlyElement());
         }
-        assertTrinoExceptionThrownBy(() -> assertions.expression("geometry_to_bing_tiles(ST_GeometryFromText('" + largeWkt + "'), 16)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("geometry_to_bing_tiles(ST_GeometryFromText('" + largeWkt + "'), 16)")::evaluate)
                 .hasMessage("The zoom level is too high or the geometry is too complex to compute a set of covering Bing tiles. Please use a lower zoom level or convert the geometry to its bounding box using the ST_Envelope function.");
 
         assertThat(assertions.expression("cardinality(geometry_to_bing_tiles(ST_Envelope(ST_GeometryFromText('" + largeWkt + "')), 16))"))
                 .isEqualTo(19939L);
 
         // Zoom level is too high
-        assertTrinoExceptionThrownBy(() -> assertions.function("geometry_to_bing_tiles", "ST_GeometryFromText('POLYGON ((0 0, 0 20, 20 20, 0 0))')", "20").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("geometry_to_bing_tiles", "ST_GeometryFromText('POLYGON ((0 0, 0 20, 20 20, 0 0))')", "20")::evaluate)
                 .hasMessage("The zoom level is too high to compute a set of covering Bing tiles.");
 
         assertThat(assertions.function("cardinality", "geometry_to_bing_tiles(ST_GeometryFromText('POLYGON ((0 0, 0 20, 20 20, 0 0))'), 14)"))
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestEncodedPolylineFunctions.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestEncodedPolylineFunctions.java
index 412aef69d4e8..78d9750d7b10 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestEncodedPolylineFunctions.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestEncodedPolylineFunctions.java
@@ -92,10 +92,10 @@ public void testToEncodedPolyline()
                 .hasType(VARCHAR)
                 .isEqualTo("_p~iF~ps|U_ulLnnqC_mqNvxq`@oskPfgkJ");
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("to_encoded_polyline(ST_GeometryFromText('POINT (-120.2 38.5)'))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("to_encoded_polyline(ST_GeometryFromText('POINT (-120.2 38.5)'))")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
 
-        assertTrinoExceptionThrownBy(() -> assertions.expression("to_encoded_polyline(ST_GeometryFromText('MULTILINESTRING ((-122.39174 37.77701))'))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("to_encoded_polyline(ST_GeometryFromText('MULTILINESTRING ((-122.39174 37.77701))'))")::evaluate)
                 .hasErrorCode(INVALID_FUNCTION_ARGUMENT);
     }
 }
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestExtractSpatialInnerJoin.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestExtractSpatialInnerJoin.java
index 3e1515735a3e..e724ab2b3e8d 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestExtractSpatialInnerJoin.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestExtractSpatialInnerJoin.java
@@ -14,12 +14,15 @@
 package io.trino.plugin.geospatial;
 
 import com.google.common.collect.ImmutableMap;
+import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.iterative.rule.ExtractSpatialJoins.ExtractSpatialInnerJoin;
-import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
-import io.trino.sql.planner.iterative.rule.test.RuleAssert;
+import io.trino.sql.planner.iterative.rule.test.RuleBuilder;
 import io.trino.sql.planner.iterative.rule.test.RuleTester;
-import org.testng.annotations.Test;
+import io.trino.sql.tree.ComparisonExpression;
+import io.trino.sql.tree.LogicalExpression;
+import io.trino.sql.tree.LongLiteral;
+import io.trino.sql.tree.NotExpression;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.geospatial.GeometryType.GEOMETRY;
 import static io.trino.plugin.geospatial.SphericalGeographyType.SPHERICAL_GEOGRAPHY;
@@ -29,22 +32,21 @@
 import static io.trino.sql.planner.assertions.PlanMatchPattern.spatialJoin;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
+import static io.trino.sql.tree.ComparisonExpression.Operator.GREATER_THAN;
+import static io.trino.sql.tree.ComparisonExpression.Operator.LESS_THAN;
+import static io.trino.sql.tree.ComparisonExpression.Operator.NOT_EQUAL;
 
 public class TestExtractSpatialInnerJoin
-        extends BaseRuleTest
+        extends AbstractTestExtractSpatial
 {
-    public TestExtractSpatialInnerJoin()
-    {
-        super(new GeoPlugin());
-    }
-
     @Test
     public void testDoesNotFire()
     {
         // scalar expression
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(ST_GeometryFromText('POLYGON ...'), b)"),
+                        p.filter(
+                                containsCall(geometryFromTextCall("POLYGON ..."), p.symbol("b").toSymbolReference()),
                                 p.join(INNER,
                                         p.values(),
                                         p.values(p.symbol("b")))))
@@ -53,206 +55,93 @@ public void testDoesNotFire()
         // OR operand
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(ST_GeometryFromText(wkt), point) OR name_1 != name_2"),
-                                p.join(INNER,
-                                        p.values(p.symbol("wkt", VARCHAR), p.symbol("name_1")),
-                                        p.values(p.symbol("point", GEOMETRY), p.symbol("name_2")))))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    Symbol point = p.symbol("point", GEOMETRY);
+                    Symbol name1 = p.symbol("name_1");
+                    Symbol name2 = p.symbol("name_2");
+                    return p.filter(
+                            LogicalExpression.or(
+                                    containsCall(geometryFromTextCall(wkt), point.toSymbolReference()),
+                                    new ComparisonExpression(NOT_EQUAL, name1.toSymbolReference(), name2.toSymbolReference())),
+                            p.join(INNER, p.values(wkt, name1), p.values(point, name2)));
+                })
                 .doesNotFire();
 
         // NOT operator
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("NOT ST_Contains(ST_GeometryFromText(wkt), point)"),
-                                p.join(INNER,
-                                        p.values(p.symbol("wkt", VARCHAR), p.symbol("name_1")),
-                                        p.values(p.symbol("point", GEOMETRY), p.symbol("name_2")))))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    Symbol point = p.symbol("point", GEOMETRY);
+                    Symbol name1 = p.symbol("name_1");
+                    Symbol name2 = p.symbol("name_2");
+                    return p.filter(
+                            new NotExpression(containsCall(geometryFromTextCall(wkt), point.toSymbolReference())),
+                            p.join(INNER,
+                                    p.values(wkt, name1),
+                                    p.values(point, name2)));
+                })
                 .doesNotFire();
 
         // ST_Distance(...) > r
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Distance(a, b) > 5"),
-                                p.join(INNER,
-                                        p.values(p.symbol("a", GEOMETRY)),
-                                        p.values(p.symbol("b", GEOMETRY)))))
+                {
+                    Symbol a = p.symbol("a", GEOMETRY);
+                    Symbol b = p.symbol("b", GEOMETRY);
+                    return p.filter(
+                            new ComparisonExpression(GREATER_THAN, distanceCall(a.toSymbolReference(), b.toSymbolReference()), new LongLiteral("5")),
+                            p.join(INNER,
+                                    p.values(a),
+                                    p.values(b)));
+                })
                 .doesNotFire();
 
         // SphericalGeography operand
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Distance(a, b) < 5"),
-                                p.join(INNER,
-                                        p.values(p.symbol("a", SPHERICAL_GEOGRAPHY)),
-                                        p.values(p.symbol("b", SPHERICAL_GEOGRAPHY)))))
-                .doesNotFire();
-
-        assertRuleApplication()
-                .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(polygon, point)"),
-                                p.join(INNER,
-                                        p.values(p.symbol("polygon", SPHERICAL_GEOGRAPHY)),
-                                        p.values(p.symbol("point", SPHERICAL_GEOGRAPHY)))))
+                {
+                    Symbol a = p.symbol("a", SPHERICAL_GEOGRAPHY);
+                    Symbol b = p.symbol("b", SPHERICAL_GEOGRAPHY);
+                    return p.filter(
+                            new ComparisonExpression(LESS_THAN, sphericalDistanceCall(a.toSymbolReference(), b.toSymbolReference()), new LongLiteral("5")),
+                            p.join(INNER,
+                                    p.values(a),
+                                    p.values(b)));
+                })
                 .doesNotFire();
 
         // to_spherical_geography() operand
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Distance(to_spherical_geography(ST_GeometryFromText(wkt)), point) < 5"),
-                                p.join(INNER,
-                                        p.values(p.symbol("wkt", VARCHAR)),
-                                        p.values(p.symbol("point", SPHERICAL_GEOGRAPHY)))))
-                .doesNotFire();
-
-        assertRuleApplication()
-                .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(to_spherical_geography(ST_GeometryFromText(wkt)), point)"),
-                                p.join(INNER,
-                                        p.values(p.symbol("wkt", VARCHAR)),
-                                        p.values(p.symbol("point", SPHERICAL_GEOGRAPHY)))))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    Symbol point = p.symbol("point", SPHERICAL_GEOGRAPHY);
+                    return p.filter(
+                            new ComparisonExpression(LESS_THAN, sphericalDistanceCall(toSphericalGeographyCall(wkt), point.toSymbolReference()), new LongLiteral("5")),
+                            p.join(INNER,
+                                    p.values(wkt),
+                                    p.values(point)));
+                })
                 .doesNotFire();
     }
 
-    @Test
-    public void testDistanceQueries()
-    {
-        testSimpleDistanceQuery("ST_Distance(a, b) <= r", "ST_Distance(a, b) <= r");
-        testSimpleDistanceQuery("ST_Distance(b, a) <= r", "ST_Distance(b, a) <= r");
-        testSimpleDistanceQuery("r >= ST_Distance(a, b)", "ST_Distance(a, b) <= r");
-        testSimpleDistanceQuery("r >= ST_Distance(b, a)", "ST_Distance(b, a) <= r");
-
-        testSimpleDistanceQuery("ST_Distance(a, b) < r", "ST_Distance(a, b) < r");
-        testSimpleDistanceQuery("ST_Distance(b, a) < r", "ST_Distance(b, a) < r");
-        testSimpleDistanceQuery("r > ST_Distance(a, b)", "ST_Distance(a, b) < r");
-        testSimpleDistanceQuery("r > ST_Distance(b, a)", "ST_Distance(b, a) < r");
-
-        testSimpleDistanceQuery("ST_Distance(a, b) <= r AND name_a != name_b", "ST_Distance(a, b) <= r AND name_a != name_b");
-        testSimpleDistanceQuery("r > ST_Distance(a, b) AND name_a != name_b", "ST_Distance(a, b) < r AND name_a != name_b");
-
-        testRadiusExpressionInDistanceQuery("ST_Distance(a, b) <= decimal '1.2'", "ST_Distance(a, b) <= radius", "decimal '1.2'");
-        testRadiusExpressionInDistanceQuery("ST_Distance(b, a) <= decimal '1.2'", "ST_Distance(b, a) <= radius", "decimal '1.2'");
-        testRadiusExpressionInDistanceQuery("decimal '1.2' >= ST_Distance(a, b)", "ST_Distance(a, b) <= radius", "decimal '1.2'");
-        testRadiusExpressionInDistanceQuery("decimal '1.2' >= ST_Distance(b, a)", "ST_Distance(b, a) <= radius", "decimal '1.2'");
-
-        testRadiusExpressionInDistanceQuery("ST_Distance(a, b) < decimal '1.2'", "ST_Distance(a, b) < radius", "decimal '1.2'");
-        testRadiusExpressionInDistanceQuery("ST_Distance(b, a) < decimal '1.2'", "ST_Distance(b, a) < radius", "decimal '1.2'");
-        testRadiusExpressionInDistanceQuery("decimal '1.2' > ST_Distance(a, b)", "ST_Distance(a, b) < radius", "decimal '1.2'");
-        testRadiusExpressionInDistanceQuery("decimal '1.2' > ST_Distance(b, a)", "ST_Distance(b, a) < radius", "decimal '1.2'");
-
-        testRadiusExpressionInDistanceQuery("ST_Distance(a, b) <= decimal '1.2' AND name_a != name_b", "ST_Distance(a, b) <= radius AND name_a != name_b", "decimal '1.2'");
-        testRadiusExpressionInDistanceQuery("decimal '1.2' > ST_Distance(a, b) AND name_a != name_b", "ST_Distance(a, b) < radius AND name_a != name_b", "decimal '1.2'");
-
-        testRadiusExpressionInDistanceQuery("ST_Distance(a, b) <= 2 * r", "ST_Distance(a, b) <= radius", "2 * r");
-        testRadiusExpressionInDistanceQuery("ST_Distance(b, a) <= 2 * r", "ST_Distance(b, a) <= radius", "2 * r");
-        testRadiusExpressionInDistanceQuery("2 * r >= ST_Distance(a, b)", "ST_Distance(a, b) <= radius", "2 * r");
-        testRadiusExpressionInDistanceQuery("2 * r >= ST_Distance(b, a)", "ST_Distance(b, a) <= radius", "2 * r");
-
-        testRadiusExpressionInDistanceQuery("ST_Distance(a, b) < 2 * r", "ST_Distance(a, b) < radius", "2 * r");
-        testRadiusExpressionInDistanceQuery("ST_Distance(b, a) < 2 * r", "ST_Distance(b, a) < radius", "2 * r");
-        testRadiusExpressionInDistanceQuery("2 * r > ST_Distance(a, b)", "ST_Distance(a, b) < radius", "2 * r");
-        testRadiusExpressionInDistanceQuery("2 * r > ST_Distance(b, a)", "ST_Distance(b, a) < radius", "2 * r");
-
-        testRadiusExpressionInDistanceQuery("ST_Distance(a, b) <= 2 * r AND name_a != name_b", "ST_Distance(a, b) <= radius AND name_a != name_b", "2 * r");
-        testRadiusExpressionInDistanceQuery("2 * r > ST_Distance(a, b) AND name_a != name_b", "ST_Distance(a, b) < radius AND name_a != name_b", "2 * r");
-
-        testPointExpressionsInDistanceQuery("ST_Distance(ST_Point(lng_a, lat_a), ST_Point(lng_b, lat_b)) <= 5", "ST_Distance(point_a, point_b) <= radius", "5");
-        testPointExpressionsInDistanceQuery("ST_Distance(ST_Point(lng_b, lat_b), ST_Point(lng_a, lat_a)) <= 5", "ST_Distance(point_b, point_a) <= radius", "5");
-        testPointExpressionsInDistanceQuery("5 >= ST_Distance(ST_Point(lng_a, lat_a), ST_Point(lng_b, lat_b))", "ST_Distance(point_a, point_b) <= radius", "5");
-        testPointExpressionsInDistanceQuery("5 >= ST_Distance(ST_Point(lng_b, lat_b), ST_Point(lng_a, lat_a))", "ST_Distance(point_b, point_a) <= radius", "5");
-
-        testPointExpressionsInDistanceQuery("ST_Distance(ST_Point(lng_a, lat_a), ST_Point(lng_b, lat_b)) < 5", "ST_Distance(point_a, point_b) < radius", "5");
-        testPointExpressionsInDistanceQuery("ST_Distance(ST_Point(lng_b, lat_b), ST_Point(lng_a, lat_a)) < 5", "ST_Distance(point_b, point_a) < radius", "5");
-        testPointExpressionsInDistanceQuery("5 > ST_Distance(ST_Point(lng_a, lat_a), ST_Point(lng_b, lat_b))", "ST_Distance(point_a, point_b) < radius", "5");
-        testPointExpressionsInDistanceQuery("5 > ST_Distance(ST_Point(lng_b, lat_b), ST_Point(lng_a, lat_a))", "ST_Distance(point_b, point_a) < radius", "5");
-
-        testPointExpressionsInDistanceQuery("ST_Distance(ST_Point(lng_a, lat_a), ST_Point(lng_b, lat_b)) <= 5 AND name_a != name_b", "ST_Distance(point_a, point_b) <= radius AND name_a != name_b", "5");
-        testPointExpressionsInDistanceQuery("5 > ST_Distance(ST_Point(lng_a, lat_a), ST_Point(lng_b, lat_b)) AND name_a != name_b", "ST_Distance(point_a, point_b) < radius AND name_a != name_b", "5");
-
-        testPointAndRadiusExpressionsInDistanceQuery("ST_Distance(ST_Point(lng_a, lat_a), ST_Point(lng_b, lat_b)) <= 500 / (111000 * cos(lat_b))", "ST_Distance(point_a, point_b) <= radius", "500 / (111000 * cos(lat_b))");
-        testPointAndRadiusExpressionsInDistanceQuery("ST_Distance(ST_Point(lng_b, lat_b), ST_Point(lng_a, lat_a)) <= 500 / (111000 * cos(lat_b))", "ST_Distance(point_b, point_a) <= radius", "500 / (111000 * cos(lat_b))");
-        testPointAndRadiusExpressionsInDistanceQuery("500 / (111000 * cos(lat_b)) >= ST_Distance(ST_Point(lng_a, lat_a), ST_Point(lng_b, lat_b))", "ST_Distance(point_a, point_b) <= radius", "500 / (111000 * cos(lat_b))");
-        testPointAndRadiusExpressionsInDistanceQuery("500 / (111000 * cos(lat_b)) >= ST_Distance(ST_Point(lng_b, lat_b), ST_Point(lng_a, lat_a))", "ST_Distance(point_b, point_a) <= radius", "500 / (111000 * cos(lat_b))");
-
-        testPointAndRadiusExpressionsInDistanceQuery("ST_Distance(ST_Point(lng_a, lat_a), ST_Point(lng_b, lat_b)) < 500 / (111000 * cos(lat_b))", "ST_Distance(point_a, point_b) < radius", "500 / (111000 * cos(lat_b))");
-        testPointAndRadiusExpressionsInDistanceQuery("ST_Distance(ST_Point(lng_b, lat_b), ST_Point(lng_a, lat_a)) < 500 / (111000 * cos(lat_b))", "ST_Distance(point_b, point_a) < radius", "500 / (111000 * cos(lat_b))");
-        testPointAndRadiusExpressionsInDistanceQuery("500 / (111000 * cos(lat_b)) > ST_Distance(ST_Point(lng_a, lat_a), ST_Point(lng_b, lat_b))", "ST_Distance(point_a, point_b) < radius", "500 / (111000 * cos(lat_b))");
-        testPointAndRadiusExpressionsInDistanceQuery("500 / (111000 * cos(lat_b)) > ST_Distance(ST_Point(lng_b, lat_b), ST_Point(lng_a, lat_a))", "ST_Distance(point_b, point_a) < radius", "500 / (111000 * cos(lat_b))");
-
-        testPointAndRadiusExpressionsInDistanceQuery("ST_Distance(ST_Point(lng_a, lat_a), ST_Point(lng_b, lat_b)) <= 500 / (111000 * cos(lat_b)) AND name_a != name_b", "ST_Distance(point_a, point_b) <= radius AND name_a != name_b", "500 / (111000 * cos(lat_b))");
-        testPointAndRadiusExpressionsInDistanceQuery("500 / (111000 * cos(lat_b)) > ST_Distance(ST_Point(lng_a, lat_a), ST_Point(lng_b, lat_b)) AND name_a != name_b", "ST_Distance(point_a, point_b) < radius AND name_a != name_b", "500 / (111000 * cos(lat_b))");
-    }
-
-    private void testSimpleDistanceQuery(String filter, String newFilter)
-    {
-        assertRuleApplication()
-                .on(p ->
-                        p.filter(PlanBuilder.expression(filter),
-                                p.join(INNER,
-                                        p.values(p.symbol("a", GEOMETRY), p.symbol("name_a")),
-                                        p.values(p.symbol("b", GEOMETRY), p.symbol("name_b"), p.symbol("r")))))
-                .matches(
-                        spatialJoin(newFilter,
-                                values(ImmutableMap.of("a", 0, "name_a", 1)),
-                                values(ImmutableMap.of("b", 0, "name_b", 1, "r", 2))));
-    }
-
-    private void testRadiusExpressionInDistanceQuery(String filter, String newFilter, String radiusExpression)
-    {
-        assertRuleApplication()
-                .on(p ->
-                        p.filter(PlanBuilder.expression(filter),
-                                p.join(INNER,
-                                        p.values(p.symbol("a", GEOMETRY), p.symbol("name_a")),
-                                        p.values(p.symbol("b", GEOMETRY), p.symbol("name_b"), p.symbol("r")))))
-                .matches(
-                        spatialJoin(newFilter,
-                                values(ImmutableMap.of("a", 0, "name_a", 1)),
-                                project(ImmutableMap.of("radius", expression(radiusExpression)),
-                                        values(ImmutableMap.of("b", 0, "name_b", 1, "r", 2)))));
-    }
-
-    private void testPointExpressionsInDistanceQuery(String filter, String newFilter, String radiusExpression)
-    {
-        assertRuleApplication()
-                .on(p ->
-                        p.filter(PlanBuilder.expression(filter),
-                                p.join(INNER,
-                                        p.values(p.symbol("lat_a"), p.symbol("lng_a"), p.symbol("name_a")),
-                                        p.values(p.symbol("lat_b"), p.symbol("lng_b"), p.symbol("name_b")))))
-                .matches(
-                        spatialJoin(newFilter,
-                                project(ImmutableMap.of("point_a", expression("ST_Point(lng_a, lat_a)")),
-                                        values(ImmutableMap.of("lat_a", 0, "lng_a", 1, "name_a", 2))),
-                                project(ImmutableMap.of("point_b", expression("ST_Point(lng_b, lat_b)")),
-                                        project(ImmutableMap.of("radius", expression(radiusExpression)), values(ImmutableMap.of("lat_b", 0, "lng_b", 1, "name_b", 2))))));
-    }
-
-    private void testPointAndRadiusExpressionsInDistanceQuery(String filter, String newFilter, String radiusExpression)
-    {
-        assertRuleApplication()
-                .on(p ->
-                        p.filter(PlanBuilder.expression(filter),
-                                p.join(INNER,
-                                        p.values(p.symbol("lat_a"), p.symbol("lng_a"), p.symbol("name_a")),
-                                        p.values(p.symbol("lat_b"), p.symbol("lng_b"), p.symbol("name_b")))))
-                .matches(
-                        spatialJoin(newFilter,
-                                project(ImmutableMap.of("point_a", expression("ST_Point(lng_a, lat_a)")),
-                                        values(ImmutableMap.of("lat_a", 0, "lng_a", 1, "name_a", 2))),
-                                project(ImmutableMap.of("point_b", expression("ST_Point(lng_b, lat_b)")),
-                                        project(ImmutableMap.of("radius", expression(radiusExpression)),
-                                                values(ImmutableMap.of("lat_b", 0, "lng_b", 1, "name_b", 2))))));
-    }
-
     @Test
     public void testConvertToSpatialJoin()
     {
         // symbols
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(a, b)"),
-                                p.join(INNER,
-                                        p.values(p.symbol("a")),
-                                        p.values(p.symbol("b")))))
+                {
+                    Symbol a = p.symbol("a");
+                    Symbol b = p.symbol("b");
+                    return p.filter(
+                            containsCall(a.toSymbolReference(), b.toSymbolReference()),
+                            p.join(INNER,
+                                    p.values(a),
+                                    p.values(b)));
+                })
                 .matches(
                         spatialJoin("ST_Contains(a, b)",
                                 values(ImmutableMap.of("a", 0)),
@@ -261,10 +150,19 @@ public void testConvertToSpatialJoin()
         // AND
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("name_1 != name_2 AND ST_Contains(a, b)"),
-                                p.join(INNER,
-                                        p.values(p.symbol("a"), p.symbol("name_1")),
-                                        p.values(p.symbol("b"), p.symbol("name_2")))))
+                {
+                    Symbol a = p.symbol("a", GEOMETRY);
+                    Symbol b = p.symbol("b", GEOMETRY);
+                    Symbol name1 = p.symbol("name_1");
+                    Symbol name2 = p.symbol("name_2");
+                    return p.filter(
+                            LogicalExpression.and(
+                                    new ComparisonExpression(NOT_EQUAL, name1.toSymbolReference(), name2.toSymbolReference()),
+                                    containsCall(a.toSymbolReference(), b.toSymbolReference())),
+                            p.join(INNER,
+                                    p.values(a, name1),
+                                    p.values(b, name2)));
+                })
                 .matches(
                         spatialJoin("name_1 != name_2 AND ST_Contains(a, b)",
                                 values(ImmutableMap.of("a", 0, "name_1", 1)),
@@ -273,10 +171,19 @@ public void testConvertToSpatialJoin()
         // AND
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(a1, b1) AND ST_Contains(a2, b2)"),
-                                p.join(INNER,
-                                        p.values(p.symbol("a1"), p.symbol("a2")),
-                                        p.values(p.symbol("b1"), p.symbol("b2")))))
+                {
+                    Symbol a1 = p.symbol("a1");
+                    Symbol a2 = p.symbol("a2");
+                    Symbol b1 = p.symbol("b1");
+                    Symbol b2 = p.symbol("b2");
+                    return p.filter(
+                            LogicalExpression.and(
+                                    containsCall(a1.toSymbolReference(), b1.toSymbolReference()),
+                                    containsCall(a2.toSymbolReference(), b2.toSymbolReference())),
+                            p.join(INNER,
+                                    p.values(a1, a2),
+                                    p.values(b1, b2)));
+                })
                 .matches(
                         spatialJoin("ST_Contains(a1, b1) AND ST_Contains(a2, b2)",
                                 values(ImmutableMap.of("a1", 0, "a2", 1)),
@@ -288,10 +195,15 @@ public void testPushDownFirstArgument()
     {
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(ST_GeometryFromText(wkt), point)"),
-                                p.join(INNER,
-                                        p.values(p.symbol("wkt", VARCHAR)),
-                                        p.values(p.symbol("point", GEOMETRY)))))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    Symbol point = p.symbol("point", GEOMETRY);
+                    return p.filter(
+                            containsCall(geometryFromTextCall(wkt), point.toSymbolReference()),
+                            p.join(INNER,
+                                    p.values(wkt),
+                                    p.values(point)));
+                })
                 .matches(
                         spatialJoin("ST_Contains(st_geometryfromtext, point)",
                                 project(ImmutableMap.of("st_geometryfromtext", expression("ST_GeometryFromText(wkt)")), values(ImmutableMap.of("wkt", 0))),
@@ -299,10 +211,14 @@ public void testPushDownFirstArgument()
 
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(ST_GeometryFromText(wkt), ST_Point(0, 0))"),
-                                p.join(INNER,
-                                        p.values(p.symbol("wkt", VARCHAR)),
-                                        p.values())))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    return p.filter(
+                            containsCall(geometryFromTextCall(wkt), toPointCall(new LongLiteral("0"), new LongLiteral("0"))),
+                            p.join(INNER,
+                                    p.values(wkt),
+                                    p.values()));
+                })
                 .doesNotFire();
     }
 
@@ -311,10 +227,16 @@ public void testPushDownSecondArgument()
     {
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(polygon, ST_Point(lng, lat))"),
-                                p.join(INNER,
-                                        p.values(p.symbol("polygon", GEOMETRY)),
-                                        p.values(p.symbol("lat"), p.symbol("lng")))))
+                {
+                    Symbol polygon = p.symbol("polygon", GEOMETRY);
+                    Symbol lat = p.symbol("lat");
+                    Symbol lng = p.symbol("lng");
+                    return p.filter(
+                            containsCall(polygon.toSymbolReference(), toPointCall(lng.toSymbolReference(), lat.toSymbolReference())),
+                            p.join(INNER,
+                                    p.values(polygon),
+                                    p.values(lat, lng)));
+                })
                 .matches(
                         spatialJoin("ST_Contains(polygon, st_point)",
                                 values(ImmutableMap.of("polygon", 0)),
@@ -322,10 +244,15 @@ public void testPushDownSecondArgument()
 
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(ST_GeometryFromText('POLYGON ...'), ST_Point(lng, lat))"),
-                                p.join(INNER,
-                                        p.values(),
-                                        p.values(p.symbol("lat"), p.symbol("lng")))))
+                {
+                    Symbol lat = p.symbol("lat");
+                    Symbol lng = p.symbol("lng");
+                    return p.filter(
+                            containsCall(geometryFromTextCall("POLYGON ..."), toPointCall(lng.toSymbolReference(), lat.toSymbolReference())),
+                            p.join(INNER,
+                                    p.values(),
+                                    p.values(lat, lng)));
+                })
                 .doesNotFire();
     }
 
@@ -334,10 +261,16 @@ public void testPushDownBothArguments()
     {
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(ST_GeometryFromText(wkt), ST_Point(lng, lat))"),
-                                p.join(INNER,
-                                        p.values(p.symbol("wkt", VARCHAR)),
-                                        p.values(p.symbol("lat"), p.symbol("lng")))))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    Symbol lat = p.symbol("lat");
+                    Symbol lng = p.symbol("lng");
+                    return p.filter(
+                            containsCall(geometryFromTextCall(wkt), toPointCall(lng.toSymbolReference(), lat.toSymbolReference())),
+                            p.join(INNER,
+                                    p.values(wkt),
+                                    p.values(lat, lng)));
+                })
                 .matches(
                         spatialJoin("ST_Contains(st_geometryfromtext, st_point)",
                                 project(ImmutableMap.of("st_geometryfromtext", expression("ST_GeometryFromText(wkt)")), values(ImmutableMap.of("wkt", 0))),
@@ -349,10 +282,16 @@ public void testPushDownOppositeOrder()
     {
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(ST_GeometryFromText(wkt), ST_Point(lng, lat))"),
-                                p.join(INNER,
-                                        p.values(p.symbol("lat"), p.symbol("lng")),
-                                        p.values(p.symbol("wkt", VARCHAR)))))
+                {
+                    Symbol lat = p.symbol("lat");
+                    Symbol lng = p.symbol("lng");
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    return p.filter(
+                            containsCall(geometryFromTextCall(wkt), toPointCall(lng.toSymbolReference(), lat.toSymbolReference())),
+                            p.join(INNER,
+                                    p.values(lat, lng),
+                                    p.values(wkt)));
+                })
                 .matches(
                         spatialJoin("ST_Contains(st_geometryfromtext, st_point)",
                                 project(ImmutableMap.of("st_point", expression("ST_Point(lng, lat)")), values(ImmutableMap.of("lat", 0, "lng", 1))),
@@ -364,10 +303,20 @@ public void testPushDownAnd()
     {
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("name_1 != name_2 AND ST_Contains(ST_GeometryFromText(wkt), ST_Point(lng, lat))"),
-                                p.join(INNER,
-                                        p.values(p.symbol("wkt", VARCHAR), p.symbol("name_1")),
-                                        p.values(p.symbol("lat"), p.symbol("lng"), p.symbol("name_2")))))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    Symbol lat = p.symbol("lat");
+                    Symbol lng = p.symbol("lng");
+                    Symbol name1 = p.symbol("name_1");
+                    Symbol name2 = p.symbol("name_2");
+                    return p.filter(
+                            LogicalExpression.and(
+                                    new ComparisonExpression(NOT_EQUAL, name1.toSymbolReference(), name2.toSymbolReference()),
+                                    containsCall(geometryFromTextCall(wkt), toPointCall(lng.toSymbolReference(), lat.toSymbolReference()))),
+                            p.join(INNER,
+                                    p.values(wkt, name1),
+                                    p.values(lat, lng, name2)));
+                })
                 .matches(
                         spatialJoin("name_1 != name_2 AND ST_Contains(st_geometryfromtext, st_point)",
                                 project(ImmutableMap.of("st_geometryfromtext", expression("ST_GeometryFromText(wkt)")), values(ImmutableMap.of("wkt", 0, "name_1", 1))),
@@ -376,17 +325,26 @@ public void testPushDownAnd()
         // Multiple spatial functions - only the first one is being processed
         assertRuleApplication()
                 .on(p ->
-                        p.filter(PlanBuilder.expression("ST_Contains(ST_GeometryFromText(wkt1), geometry1) AND ST_Contains(ST_GeometryFromText(wkt2), geometry2)"),
-                                p.join(INNER,
-                                        p.values(p.symbol("wkt1", VARCHAR), p.symbol("wkt2", VARCHAR)),
-                                        p.values(p.symbol("geometry1"), p.symbol("geometry2")))))
+                {
+                    Symbol wkt1 = p.symbol("wkt1", VARCHAR);
+                    Symbol wkt2 = p.symbol("wkt2", VARCHAR);
+                    Symbol geometry1 = p.symbol("geometry1");
+                    Symbol geometry2 = p.symbol("geometry2");
+                    return p.filter(
+                            LogicalExpression.and(
+                                    containsCall(geometryFromTextCall(wkt1), geometry1.toSymbolReference()),
+                                    containsCall(geometryFromTextCall(wkt2), geometry2.toSymbolReference())),
+                            p.join(INNER,
+                                    p.values(wkt1, wkt2),
+                                    p.values(geometry1, geometry2)));
+                })
                 .matches(
                         spatialJoin("ST_Contains(st_geometryfromtext, geometry1) AND ST_Contains(ST_GeometryFromText(wkt2), geometry2)",
                                 project(ImmutableMap.of("st_geometryfromtext", expression("ST_GeometryFromText(wkt1)")), values(ImmutableMap.of("wkt1", 0, "wkt2", 1))),
                                 values(ImmutableMap.of("geometry1", 0, "geometry2", 1))));
     }
 
-    private RuleAssert assertRuleApplication()
+    private RuleBuilder assertRuleApplication()
     {
         RuleTester tester = tester();
         return tester.assertThat(new ExtractSpatialInnerJoin(tester.getPlannerContext(), tester.getSplitManager(), tester.getPageSourceManager(), tester.getTypeAnalyzer()));
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestExtractSpatialLeftJoin.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestExtractSpatialLeftJoin.java
index 30715497e21a..83859ac421cc 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestExtractSpatialLeftJoin.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestExtractSpatialLeftJoin.java
@@ -14,12 +14,16 @@
 package io.trino.plugin.geospatial;
 
 import com.google.common.collect.ImmutableMap;
+import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.assertions.PlanMatchPattern;
-import io.trino.sql.planner.iterative.rule.ExtractSpatialJoins.ExtractSpatialLeftJoin;
-import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
-import io.trino.sql.planner.iterative.rule.test.RuleAssert;
+import io.trino.sql.planner.iterative.rule.ExtractSpatialJoins;
+import io.trino.sql.planner.iterative.rule.test.RuleBuilder;
 import io.trino.sql.planner.iterative.rule.test.RuleTester;
-import org.testng.annotations.Test;
+import io.trino.sql.tree.ComparisonExpression;
+import io.trino.sql.tree.LogicalExpression;
+import io.trino.sql.tree.LongLiteral;
+import io.trino.sql.tree.NotExpression;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.geospatial.GeometryType.GEOMETRY;
 import static io.trino.plugin.geospatial.SphericalGeographyType.SPHERICAL_GEOGRAPHY;
@@ -27,88 +31,102 @@
 import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.spatialLeftJoin;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
-import static io.trino.sql.planner.iterative.rule.test.PlanBuilder.expression;
 import static io.trino.sql.planner.plan.JoinNode.Type.LEFT;
+import static io.trino.sql.tree.ComparisonExpression.Operator.NOT_EQUAL;
 
 public class TestExtractSpatialLeftJoin
-        extends BaseRuleTest
+        extends AbstractTestExtractSpatial
 {
-    public TestExtractSpatialLeftJoin()
-    {
-        super(new GeoPlugin());
-    }
-
     @Test
     public void testDoesNotFire()
     {
         // scalar expression
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(),
-                                p.values(p.symbol("b")),
-                                expression("ST_Contains(ST_GeometryFromText('POLYGON ...'), b)")))
+                {
+                    Symbol b = p.symbol("b", GEOMETRY);
+                    return p.join(LEFT,
+                            p.values(),
+                            p.values(b),
+                            containsCall(geometryFromTextCall("POLYGON ..."), b.toSymbolReference()));
+                })
                 .doesNotFire();
 
         // OR operand
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("wkt", VARCHAR), p.symbol("name_1")),
-                                p.values(p.symbol("point", GEOMETRY), p.symbol("name_2")),
-                                expression("ST_Contains(ST_GeometryFromText(wkt), point) OR name_1 != name_2")))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    Symbol point = p.symbol("point", GEOMETRY);
+                    Symbol name1 = p.symbol("name_1");
+                    Symbol name2 = p.symbol("name_2");
+                    return p.join(LEFT,
+                            p.values(wkt, name1),
+                            p.values(point, name2),
+                            LogicalExpression.or(
+                                    containsCall(geometryFromTextCall(wkt), point.toSymbolReference()),
+                                    new ComparisonExpression(NOT_EQUAL, name1.toSymbolReference(), name2.toSymbolReference())));
+                })
                 .doesNotFire();
 
         // NOT operator
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("wkt", VARCHAR), p.symbol("name_1")),
-                                p.values(p.symbol("point", GEOMETRY), p.symbol("name_2")),
-                                expression("NOT ST_Contains(ST_GeometryFromText(wkt), point)")))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    Symbol point = p.symbol("point", GEOMETRY);
+                    Symbol name1 = p.symbol("name_1");
+                    Symbol name2 = p.symbol("name_2");
+                    return p.join(LEFT,
+                            p.values(wkt, name1),
+                            p.values(point, name2),
+                            new NotExpression(containsCall(geometryFromTextCall(wkt), point.toSymbolReference())));
+                })
                 .doesNotFire();
 
         // ST_Distance(...) > r
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("a", GEOMETRY)),
-                                p.values(p.symbol("b", GEOMETRY)),
-                                expression("ST_Distance(a, b) > 5")))
+                {
+                    Symbol a = p.symbol("a", GEOMETRY);
+                    Symbol b = p.symbol("b", GEOMETRY);
+                    return p.join(LEFT,
+                            p.values(a),
+                            p.values(b),
+                            new ComparisonExpression(ComparisonExpression.Operator.GREATER_THAN,
+                                    distanceCall(a.toSymbolReference(), b.toSymbolReference()),
+                                    new LongLiteral("5")));
+                })
                 .doesNotFire();
 
         // SphericalGeography operand
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("a", SPHERICAL_GEOGRAPHY)),
-                                p.values(p.symbol("b", SPHERICAL_GEOGRAPHY)),
-                                expression("ST_Distance(a, b) < 5")))
-                .doesNotFire();
-
-        assertRuleApplication()
-                .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("polygon", SPHERICAL_GEOGRAPHY)),
-                                p.values(p.symbol("point", SPHERICAL_GEOGRAPHY)),
-                                expression("ST_Contains(polygon, point)")))
+                {
+                    Symbol a = p.symbol("a", SPHERICAL_GEOGRAPHY);
+                    Symbol b = p.symbol("b", SPHERICAL_GEOGRAPHY);
+                    return p.join(LEFT,
+                            p.values(a),
+                            p.values(b),
+                            new ComparisonExpression(ComparisonExpression.Operator.GREATER_THAN,
+                                    sphericalDistanceCall(a.toSymbolReference(), b.toSymbolReference()),
+                                    new LongLiteral("5")));
+                })
                 .doesNotFire();
 
         // to_spherical_geography() operand
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("wkt", VARCHAR)),
-                                p.values(p.symbol("point", SPHERICAL_GEOGRAPHY)),
-                                expression("ST_Distance(to_spherical_geography(ST_GeometryFromText(wkt)), point) < 5")))
-                .doesNotFire();
-
-        assertRuleApplication()
-                .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("wkt", VARCHAR)),
-                                p.values(p.symbol("point", SPHERICAL_GEOGRAPHY)),
-                                expression("ST_Contains(to_spherical_geography(ST_GeometryFromText(wkt)), point)")))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    Symbol point = p.symbol("point", SPHERICAL_GEOGRAPHY);
+                    return p.join(LEFT,
+                            p.values(wkt),
+                            p.values(point),
+                            new ComparisonExpression(ComparisonExpression.Operator.GREATER_THAN,
+                                    sphericalDistanceCall(toSphericalGeographyCall(wkt), point.toSymbolReference()),
+                                    new LongLiteral("5")));
+                })
                 .doesNotFire();
     }
 
@@ -118,10 +136,14 @@ public void testConvertToSpatialJoin()
         // symbols
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("a")),
-                                p.values(p.symbol("b")),
-                                expression("ST_Contains(a, b)")))
+                {
+                    Symbol a = p.symbol("a", GEOMETRY);
+                    Symbol b = p.symbol("b", GEOMETRY);
+                    return p.join(LEFT,
+                            p.values(a),
+                            p.values(b),
+                            containsCall(a.toSymbolReference(), b.toSymbolReference()));
+                })
                 .matches(
                         spatialLeftJoin("ST_Contains(a, b)",
                                 values(ImmutableMap.of("a", 0)),
@@ -130,10 +152,18 @@ public void testConvertToSpatialJoin()
         // AND
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("a"), p.symbol("name_1")),
-                                p.values(p.symbol("b"), p.symbol("name_2")),
-                                expression("name_1 != name_2 AND ST_Contains(a, b)")))
+                {
+                    Symbol a = p.symbol("a", GEOMETRY);
+                    Symbol b = p.symbol("b", GEOMETRY);
+                    Symbol name1 = p.symbol("name_1");
+                    Symbol name2 = p.symbol("name_2");
+                    return p.join(LEFT,
+                            p.values(a, name1),
+                            p.values(b, name2),
+                            LogicalExpression.and(
+                                    new ComparisonExpression(NOT_EQUAL, name1.toSymbolReference(), name2.toSymbolReference()),
+                                    containsCall(a.toSymbolReference(), b.toSymbolReference())));
+                })
                 .matches(
                         spatialLeftJoin("name_1 != name_2 AND ST_Contains(a, b)",
                                 values(ImmutableMap.of("a", 0, "name_1", 1)),
@@ -142,10 +172,18 @@ public void testConvertToSpatialJoin()
         // AND
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("a1"), p.symbol("a2")),
-                                p.values(p.symbol("b1"), p.symbol("b2")),
-                                expression("ST_Contains(a1, b1) AND ST_Contains(a2, b2)")))
+                {
+                    Symbol a1 = p.symbol("a1");
+                    Symbol a2 = p.symbol("a2");
+                    Symbol b1 = p.symbol("b1");
+                    Symbol b2 = p.symbol("b2");
+                    return p.join(LEFT,
+                            p.values(a1, a2),
+                            p.values(b1, b2),
+                            LogicalExpression.and(
+                                    containsCall(a1.toSymbolReference(), b1.toSymbolReference()),
+                                    containsCall(a2.toSymbolReference(), b2.toSymbolReference())));
+                })
                 .matches(
                         spatialLeftJoin("ST_Contains(a1, b1) AND ST_Contains(a2, b2)",
                                 values(ImmutableMap.of("a1", 0, "a2", 1)),
@@ -157,10 +195,14 @@ public void testPushDownFirstArgument()
     {
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("wkt", VARCHAR)),
-                                p.values(p.symbol("point", GEOMETRY)),
-                                expression("ST_Contains(ST_GeometryFromText(wkt), point)")))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    Symbol point = p.symbol("point", GEOMETRY);
+                    return p.join(LEFT,
+                            p.values(wkt),
+                            p.values(point),
+                            containsCall(geometryFromTextCall(wkt), point.toSymbolReference()));
+                })
                 .matches(
                         spatialLeftJoin("ST_Contains(st_geometryfromtext, point)",
                                 project(ImmutableMap.of("st_geometryfromtext", PlanMatchPattern.expression("ST_GeometryFromText(wkt)")), values(ImmutableMap.of("wkt", 0))),
@@ -168,10 +210,13 @@ public void testPushDownFirstArgument()
 
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("wkt", VARCHAR)),
-                                p.values(),
-                                expression("ST_Contains(ST_GeometryFromText(wkt), ST_Point(0, 0))")))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    return p.join(LEFT,
+                            p.values(wkt),
+                            p.values(),
+                            containsCall(geometryFromTextCall(wkt), toPointCall(new LongLiteral("0"), new LongLiteral("0"))));
+                })
                 .doesNotFire();
     }
 
@@ -180,10 +225,15 @@ public void testPushDownSecondArgument()
     {
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("polygon", GEOMETRY)),
-                                p.values(p.symbol("lat"), p.symbol("lng")),
-                                expression("ST_Contains(polygon, ST_Point(lng, lat))")))
+                {
+                    Symbol polygon = p.symbol("polygon", GEOMETRY);
+                    Symbol lat = p.symbol("lat");
+                    Symbol lng = p.symbol("lng");
+                    return p.join(LEFT,
+                            p.values(polygon),
+                            p.values(lat, lng),
+                            containsCall(polygon.toSymbolReference(), toPointCall(lng.toSymbolReference(), lat.toSymbolReference())));
+                })
                 .matches(
                         spatialLeftJoin("ST_Contains(polygon, st_point)",
                                 values(ImmutableMap.of("polygon", 0)),
@@ -191,10 +241,14 @@ public void testPushDownSecondArgument()
 
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(),
-                                p.values(p.symbol("lat"), p.symbol("lng")),
-                                expression("ST_Contains(ST_GeometryFromText('POLYGON ...'), ST_Point(lng, lat))")))
+                {
+                    Symbol lat = p.symbol("lat");
+                    Symbol lng = p.symbol("lng");
+                    return p.join(LEFT,
+                            p.values(),
+                            p.values(lat, lng),
+                            containsCall(geometryFromTextCall("POLYGON ..."), toPointCall(lng.toSymbolReference(), lat.toSymbolReference())));
+                })
                 .doesNotFire();
     }
 
@@ -203,10 +257,15 @@ public void testPushDownBothArguments()
     {
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("wkt", VARCHAR)),
-                                p.values(p.symbol("lat"), p.symbol("lng")),
-                                expression("ST_Contains(ST_GeometryFromText(wkt), ST_Point(lng, lat))")))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    Symbol lat = p.symbol("lat");
+                    Symbol lng = p.symbol("lng");
+                    return p.join(LEFT,
+                            p.values(wkt),
+                            p.values(lat, lng),
+                            containsCall(geometryFromTextCall(wkt), toPointCall(lng.toSymbolReference(), lat.toSymbolReference())));
+                })
                 .matches(
                         spatialLeftJoin("ST_Contains(st_geometryfromtext, st_point)",
                                 project(ImmutableMap.of("st_geometryfromtext", PlanMatchPattern.expression("ST_GeometryFromText(wkt)")), values(ImmutableMap.of("wkt", 0))),
@@ -218,10 +277,15 @@ public void testPushDownOppositeOrder()
     {
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("lat"), p.symbol("lng")),
-                                p.values(p.symbol("wkt", VARCHAR)),
-                                expression("ST_Contains(ST_GeometryFromText(wkt), ST_Point(lng, lat))")))
+                {
+                    Symbol lat = p.symbol("lat");
+                    Symbol lng = p.symbol("lng");
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    return p.join(LEFT,
+                            p.values(lat, lng),
+                            p.values(wkt),
+                            containsCall(geometryFromTextCall(wkt), toPointCall(lng.toSymbolReference(), lat.toSymbolReference())));
+                })
                 .matches(
                         spatialLeftJoin("ST_Contains(st_geometryfromtext, st_point)",
                                 project(ImmutableMap.of("st_point", PlanMatchPattern.expression("ST_Point(lng, lat)")), values(ImmutableMap.of("lat", 0, "lng", 1))),
@@ -233,10 +297,19 @@ public void testPushDownAnd()
     {
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("wkt", VARCHAR), p.symbol("name_1")),
-                                p.values(p.symbol("lat"), p.symbol("lng"), p.symbol("name_2")),
-                                expression("name_1 != name_2 AND ST_Contains(ST_GeometryFromText(wkt), ST_Point(lng, lat))")))
+                {
+                    Symbol wkt = p.symbol("wkt", VARCHAR);
+                    Symbol lat = p.symbol("lat");
+                    Symbol lng = p.symbol("lng");
+                    Symbol name1 = p.symbol("name_1");
+                    Symbol name2 = p.symbol("name_2");
+                    return p.join(LEFT,
+                            p.values(wkt, name1),
+                            p.values(lat, lng, name2),
+                            LogicalExpression.and(
+                                    new ComparisonExpression(NOT_EQUAL, name1.toSymbolReference(), name2.toSymbolReference()),
+                                    containsCall(geometryFromTextCall(wkt), toPointCall(lng.toSymbolReference(), lat.toSymbolReference()))));
+                })
                 .matches(
                         spatialLeftJoin("name_1 != name_2 AND ST_Contains(st_geometryfromtext, st_point)",
                                 project(ImmutableMap.of("st_geometryfromtext", PlanMatchPattern.expression("ST_GeometryFromText(wkt)")), values(ImmutableMap.of("wkt", 0, "name_1", 1))),
@@ -245,19 +318,27 @@ public void testPushDownAnd()
         // Multiple spatial functions - only the first one is being processed
         assertRuleApplication()
                 .on(p ->
-                        p.join(LEFT,
-                                p.values(p.symbol("wkt1", VARCHAR), p.symbol("wkt2", VARCHAR)),
-                                p.values(p.symbol("geometry1"), p.symbol("geometry2")),
-                                expression("ST_Contains(ST_GeometryFromText(wkt1), geometry1) AND ST_Contains(ST_GeometryFromText(wkt2), geometry2)")))
+                {
+                    Symbol wkt1 = p.symbol("wkt1", VARCHAR);
+                    Symbol wkt2 = p.symbol("wkt2", VARCHAR);
+                    Symbol geometry1 = p.symbol("geometry1");
+                    Symbol geometry2 = p.symbol("geometry2");
+                    return p.join(LEFT,
+                            p.values(wkt1, wkt2),
+                            p.values(geometry1, geometry2),
+                            LogicalExpression.and(
+                                    containsCall(geometryFromTextCall(wkt1), geometry1.toSymbolReference()),
+                                    containsCall(geometryFromTextCall(wkt2), geometry2.toSymbolReference())));
+                })
                 .matches(
                         spatialLeftJoin("ST_Contains(st_geometryfromtext, geometry1) AND ST_Contains(ST_GeometryFromText(wkt2), geometry2)",
                                 project(ImmutableMap.of("st_geometryfromtext", PlanMatchPattern.expression("ST_GeometryFromText(wkt1)")), values(ImmutableMap.of("wkt1", 0, "wkt2", 1))),
                                 values(ImmutableMap.of("geometry1", 0, "geometry2", 1))));
     }
 
-    private RuleAssert assertRuleApplication()
+    private RuleBuilder assertRuleApplication()
     {
         RuleTester tester = tester();
-        return tester().assertThat(new ExtractSpatialLeftJoin(tester.getPlannerContext(), tester.getSplitManager(), tester.getPageSourceManager(), tester.getTypeAnalyzer()));
+        return tester.assertThat(new ExtractSpatialJoins.ExtractSpatialLeftJoin(tester.getPlannerContext(), tester.getSplitManager(), tester.getPageSourceManager(), tester.getTypeAnalyzer()));
     }
 }
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestGeoFunctions.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestGeoFunctions.java
index 415a610ab544..cd43698c6ee7 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestGeoFunctions.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestGeoFunctions.java
@@ -42,7 +42,6 @@
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
-import static org.testng.Assert.assertEquals;
 
 @TestInstance(PER_CLASS)
 public class TestGeoFunctions
@@ -130,7 +129,7 @@ public void testGeometryGetObjectValue()
         GEOMETRY.writeSlice(builder, GeoFunctions.stPoint(1.2, 3.4));
         Block block = builder.build();
 
-        assertEquals("POINT (1.2 3.4)", GEOMETRY.getObjectValue(null, block, 0));
+        assertThat("POINT (1.2 3.4)").isEqualTo(GEOMETRY.getObjectValue(null, block, 0));
     }
 
     @Test
@@ -156,10 +155,10 @@ public void testSTLineFromText()
                 .hasType(VARCHAR)
                 .isEqualTo("LINESTRING (1 1, 2 2, 1 3)");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_AsText", "ST_LineFromText('MULTILINESTRING EMPTY')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_AsText", "ST_LineFromText('MULTILINESTRING EMPTY')")::evaluate)
                 .hasMessage("ST_LineFromText only applies to LINE_STRING. Input type is: MULTI_LINE_STRING");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_AsText", "ST_LineFromText('POLYGON ((1 1, 1 4, 4 4, 4 1))')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_AsText", "ST_LineFromText('POLYGON ((1 1, 1 4, 4 4, 4 1))')")::evaluate)
                 .hasMessage("ST_LineFromText only applies to LINE_STRING. Input type is: POLYGON");
     }
 
@@ -174,7 +173,7 @@ public void testSTPolygon()
                 .hasType(VARCHAR)
                 .isEqualTo("POLYGON ((1 1, 4 1, 4 4, 1 4, 1 1))");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_AsText", "ST_Polygon('LINESTRING (1 1, 2 2, 1 3)')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_AsText", "ST_Polygon('LINESTRING (1 1, 2 2, 1 3)')")::evaluate)
                 .hasMessage("ST_Polygon only applies to POLYGON. Input type is: LINE_STRING");
     }
 
@@ -244,10 +243,10 @@ public void testSTBuffer()
                 .isNull(GEOMETRY);
 
         // negative distance
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_Buffer", "ST_Point(0, 0)", "-1.2").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_Buffer", "ST_Point(0, 0)", "-1.2")::evaluate)
                 .hasMessage("distance is negative");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_Buffer", "ST_Point(0, 0)", "-infinity()").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_Buffer", "ST_Point(0, 0)", "-infinity()")::evaluate)
                 .hasMessage("distance is negative");
 
         // infinity() and nan() distance
@@ -255,7 +254,7 @@ public void testSTBuffer()
                 .hasType(VARCHAR)
                 .isEqualTo("MULTIPOLYGON EMPTY");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_Buffer", "ST_Point(0, 0)", "nan()").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_Buffer", "ST_Point(0, 0)", "nan()")::evaluate)
                 .hasMessage("distance is NaN");
     }
 
@@ -401,7 +400,7 @@ public void testSTIsClosed()
         assertThat(assertions.function("ST_IsClosed", "ST_GeometryFromText('LINESTRING (1 1, 2 2, 1 3)')"))
                 .isEqualTo(false);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_IsClosed", "ST_GeometryFromText('POLYGON ((1 1, 1 4, 4 4, 4 1))')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_IsClosed", "ST_GeometryFromText('POLYGON ((1 1, 1 4, 4 4, 4 1))')")::evaluate)
                 .hasMessage("ST_IsClosed only applies to LINE_STRING or MULTI_LINE_STRING. Input type is: POLYGON");
     }
 
@@ -461,7 +460,7 @@ public void testSimplifyGeometry()
                 .isEqualTo("POLYGON ((1 0, 4 0, 4 1, 3 1, 3 3, 2 3, 2 1, 1 1, 1 0))");
 
         // Negative distance tolerance is invalid.
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_AsText", "simplify_geometry(ST_GeometryFromText('POLYGON ((1 0, 1 1, 2 1, 2 3, 3 3, 3 1, 4 1, 4 0, 1 0))'), -0.5)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_AsText", "simplify_geometry(ST_GeometryFromText('POLYGON ((1 0, 1 1, 2 1, 2 3, 3 3, 3 1, 4 1, 4 0, 1 0))'), -0.5)")::evaluate)
                 .hasMessage("distanceTolerance is negative");
     }
 
@@ -539,7 +538,7 @@ public void testSTLength()
         assertThat(assertions.function("ST_Length", "ST_GeometryFromText('MULTILINESTRING ((1 1, 5 1), (2 4, 4 4))')"))
                 .isEqualTo(6.0);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_Length", "ST_GeometryFromText('POLYGON ((1 1, 1 4, 4 4, 4 1))')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_Length", "ST_GeometryFromText('POLYGON ((1 1, 1 4, 4 4, 4 1))')")::evaluate)
                 .hasMessage("ST_Length only applies to LINE_STRING or MULTI_LINE_STRING. Input type is: POLYGON");
     }
 
@@ -633,10 +632,10 @@ public void testLineLocatePoint()
         assertThat(assertions.function("line_locate_point", "ST_GeometryFromText('LINESTRING (0 0, 0 1, 2 1)')", "ST_GeometryFromText('POINT EMPTY')"))
                 .isNull(DOUBLE);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("line_locate_point", "ST_GeometryFromText('POLYGON ((1 1, 1 4, 4 4, 4 1))')", "ST_Point(0.4, 1)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("line_locate_point", "ST_GeometryFromText('POLYGON ((1 1, 1 4, 4 4, 4 1))')", "ST_Point(0.4, 1)")::evaluate)
                 .hasMessage("First argument to line_locate_point must be a LineString or a MultiLineString. Got: Polygon");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("line_locate_point", "ST_GeometryFromText('LINESTRING (0 0, 0 1, 2 1)')", "ST_GeometryFromText('POLYGON ((1 1, 1 4, 4 4, 4 1))')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("line_locate_point", "ST_GeometryFromText('LINESTRING (0 0, 0 1, 2 1)')", "ST_GeometryFromText('POLYGON ((1 1, 1 4, 4 4, 4 1))')")::evaluate)
                 .hasMessage("Second argument to line_locate_point must be a Point. Got: Polygon");
     }
 
@@ -664,13 +663,13 @@ public void testLineInterpolatePoint()
         assertLineInterpolatePoint("LINESTRING (0 0, 1 0, 1 9)", 0.5, "POINT (1 4)");
         assertLineInterpolatePoint("LINESTRING (0 0, 1 0, 1 9)", 1.0, "POINT (1 9)");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("line_interpolate_point", "ST_GeometryFromText('LINESTRING (0 0, 1 0, 1 9)')", "-0.5").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("line_interpolate_point", "ST_GeometryFromText('LINESTRING (0 0, 1 0, 1 9)')", "-0.5")::evaluate)
                 .hasMessage("fraction must be between 0 and 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("line_interpolate_point", "ST_GeometryFromText('LINESTRING (0 0, 1 0, 1 9)')", "2.0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("line_interpolate_point", "ST_GeometryFromText('LINESTRING (0 0, 1 0, 1 9)')", "2.0")::evaluate)
                 .hasMessage("fraction must be between 0 and 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("line_interpolate_point", "ST_GeometryFromText('POLYGON ((0 0, 1 1, 0 1, 1 0, 0 0))')", "0.2").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("line_interpolate_point", "ST_GeometryFromText('POLYGON ((0 0, 1 1, 0 1, 1 0, 0 0))')", "0.2")::evaluate)
                 .hasMessage("line_interpolate_point only applies to LINE_STRING. Input type is: POLYGON");
     }
 
@@ -686,13 +685,13 @@ public void testLineInterpolatePoints()
         assertLineInterpolatePoints("LINESTRING (0 0, 1 1, 10 10)", 0.5, "5.000000000000001 5.000000000000001", "10 10");
         assertLineInterpolatePoints("LINESTRING (0 0, 1 1, 10 10)", 1, "10 10");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("line_interpolate_points", "ST_GeometryFromText('LINESTRING (0 0, 1 0, 1 9)')", "-0.5").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("line_interpolate_points", "ST_GeometryFromText('LINESTRING (0 0, 1 0, 1 9)')", "-0.5")::evaluate)
                 .hasMessage("fraction must be between 0 and 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("line_interpolate_points", "ST_GeometryFromText('LINESTRING (0 0, 1 0, 1 9)')", "2.0").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("line_interpolate_points", "ST_GeometryFromText('LINESTRING (0 0, 1 0, 1 9)')", "2.0")::evaluate)
                 .hasMessage("fraction must be between 0 and 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("line_interpolate_points", "ST_GeometryFromText('POLYGON ((0 0, 1 1, 0 1, 1 0, 0 0))')", "0.2").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("line_interpolate_points", "ST_GeometryFromText('POLYGON ((0 0, 1 1, 0 1, 1 0, 0 0))')", "0.2")::evaluate)
                 .hasMessage("line_interpolate_point only applies to LINE_STRING. Input type is: POLYGON");
     }
 
@@ -839,7 +838,7 @@ public void testSTNumInteriorRing()
         assertThat(assertions.function("ST_NumInteriorRing", "ST_GeometryFromText('POLYGON ((0 0, 8 0, 0 8, 0 0), (1 1, 1 5, 5 1, 1 1))')"))
                 .isEqualTo(1L);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_NumInteriorRing", "ST_GeometryFromText('LINESTRING (8 4, 5 7)')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_NumInteriorRing", "ST_GeometryFromText('LINESTRING (8 4, 5 7)')")::evaluate)
                 .hasMessage("ST_NumInteriorRing only applies to POLYGON. Input type is: LINE_STRING");
     }
 
@@ -878,7 +877,7 @@ public void testSTIsRing()
         assertThat(assertions.function("ST_IsRing", "ST_GeometryFromText('LINESTRING (0 0, 1 1, 0 2, 0 0)')"))
                 .isEqualTo(true);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_IsRing", "ST_GeometryFromText('POLYGON ((2 0, 2 1, 3 1))')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_IsRing", "ST_GeometryFromText('POLYGON ((2 0, 2 1, 3 1))')")::evaluate)
                 .hasMessage("ST_IsRing only applies to LINE_STRING. Input type is: POLYGON");
     }
 
@@ -893,10 +892,10 @@ public void testSTStartEndPoint()
                 .hasType(VARCHAR)
                 .isEqualTo("POINT (5 6)");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_AsText", "ST_StartPoint(ST_GeometryFromText('POLYGON ((2 0, 2 1, 3 1))'))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_AsText", "ST_StartPoint(ST_GeometryFromText('POLYGON ((2 0, 2 1, 3 1))'))")::evaluate)
                 .hasMessage("ST_StartPoint only applies to LINE_STRING. Input type is: POLYGON");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_AsText", "ST_EndPoint(ST_GeometryFromText('POLYGON ((2 0, 2 1, 3 1))'))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_AsText", "ST_EndPoint(ST_GeometryFromText('POLYGON ((2 0, 2 1, 3 1))'))")::evaluate)
                 .hasMessage("ST_EndPoint only applies to LINE_STRING. Input type is: POLYGON");
     }
 
@@ -985,7 +984,7 @@ public void testSTXY()
         assertThat(assertions.function("ST_Y", "ST_GeometryFromText('POINT (1 2)')"))
                 .isEqualTo(2.0);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_Y", "ST_GeometryFromText('POLYGON ((2 0, 2 1, 3 1))')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_Y", "ST_GeometryFromText('POLYGON ((2 0, 2 1, 3 1))')")::evaluate)
                 .hasMessage("ST_Y only applies to POINT. Input type is: POLYGON");
     }
 
@@ -1213,10 +1212,10 @@ public void testSTExteriorRing()
                 .hasType(VARCHAR)
                 .isEqualTo("LINESTRING (0 0, 5 0, 5 5, 0 5, 0 0)");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_AsText", "ST_ExteriorRing(ST_GeometryFromText('LINESTRING (1 1, 2 2, 1 3)'))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_AsText", "ST_ExteriorRing(ST_GeometryFromText('LINESTRING (1 1, 2 2, 1 3)'))")::evaluate)
                 .hasMessage("ST_ExteriorRing only applies to POLYGON. Input type is: LINE_STRING");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_AsText", "ST_ExteriorRing(ST_GeometryFromText('MULTIPOLYGON (((1 1, 2 2, 1 3, 1 1)), ((4 4, 5 5, 4 6, 4 4)))'))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_AsText", "ST_ExteriorRing(ST_GeometryFromText('MULTIPOLYGON (((1 1, 2 2, 1 3, 1 1)), ((4 4, 5 5, 4 6, 4 4)))'))")::evaluate)
                 .hasMessage("ST_ExteriorRing only applies to POLYGON. Input type is: MULTI_POLYGON");
     }
 
@@ -1582,13 +1581,13 @@ public void testSTWithin()
     @Test
     public void testInvalidWKT()
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_LineFromText", "'LINESTRING (0 0, 1)'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_LineFromText", "'LINESTRING (0 0, 1)'")::evaluate)
                 .hasMessage("Invalid WKT: LINESTRING (0 0, 1)");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_GeometryFromText", "'POLYGON(0 0)'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_GeometryFromText", "'POLYGON(0 0)'")::evaluate)
                 .hasMessage("Invalid WKT: POLYGON(0 0)");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_Polygon", "'POLYGON(-1 1, 1 -1)'").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_Polygon", "'POLYGON(-1 1, 1 -1)'")::evaluate)
                 .hasMessage("Invalid WKT: POLYGON(-1 1, 1 -1)");
     }
 
@@ -1607,40 +1606,40 @@ public void testGreatCircleDistance()
         assertThat(assertions.function("great_circle_distance", "36.12", "-86.67", "36.12", "-86.67"))
                 .isEqualTo(0.0);
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("great_circle_distance", "100", "20", "30", "40").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("great_circle_distance", "100", "20", "30", "40")::evaluate)
                 .hasMessage("Latitude must be between -90 and 90");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("great_circle_distance", "10", "20", "300", "40").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("great_circle_distance", "10", "20", "300", "40")::evaluate)
                 .hasMessage("Latitude must be between -90 and 90");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("great_circle_distance", "10", "200", "30", "40").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("great_circle_distance", "10", "200", "30", "40")::evaluate)
                 .hasMessage("Longitude must be between -180 and 180");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("great_circle_distance", "10", "20", "30", "400").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("great_circle_distance", "10", "20", "30", "400")::evaluate)
                 .hasMessage("Longitude must be between -180 and 180");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("great_circle_distance", "nan()", "-86.67", "33.94", "-118.40").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("great_circle_distance", "nan()", "-86.67", "33.94", "-118.40")::evaluate)
                 .hasMessage("Latitude must be between -90 and 90");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("great_circle_distance", "infinity()", "-86.67", "33.94", "-118.40").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("great_circle_distance", "infinity()", "-86.67", "33.94", "-118.40")::evaluate)
                 .hasMessage("Latitude must be between -90 and 90");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("great_circle_distance", "36.12", "nan()", "33.94", "-118.40").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("great_circle_distance", "36.12", "nan()", "33.94", "-118.40")::evaluate)
                 .hasMessage("Longitude must be between -180 and 180");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("great_circle_distance", "36.12", "infinity()", "33.94", "-118.40").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("great_circle_distance", "36.12", "infinity()", "33.94", "-118.40")::evaluate)
                 .hasMessage("Longitude must be between -180 and 180");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("great_circle_distance", "36.12", "-86.67", "nan()", "-118.40").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("great_circle_distance", "36.12", "-86.67", "nan()", "-118.40")::evaluate)
                 .hasMessage("Latitude must be between -90 and 90");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("great_circle_distance", "36.12", "-86.67", "infinity()", "-118.40").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("great_circle_distance", "36.12", "-86.67", "infinity()", "-118.40")::evaluate)
                 .hasMessage("Latitude must be between -90 and 90");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("great_circle_distance", "36.12", "-86.67", "33.94", "nan()").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("great_circle_distance", "36.12", "-86.67", "33.94", "nan()")::evaluate)
                 .hasMessage("Longitude must be between -180 and 180");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("great_circle_distance", "36.12", "-86.67", "33.94", "infinity()").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("great_circle_distance", "36.12", "-86.67", "33.94", "infinity()")::evaluate)
                 .hasMessage("Longitude must be between -180 and 180");
     }
 
@@ -1673,9 +1672,9 @@ private void assertInteriorRings(String wkt, String... expected)
 
     private void assertInvalidInteriorRings(String wkt, String geometryType)
     {
-        assertTrinoExceptionThrownBy(() -> assertions.expression("transform(ST_InteriorRings(geometry), x -> ST_AsText(x))")
+        assertTrinoExceptionThrownBy(assertions.expression("transform(ST_InteriorRings(geometry), x -> ST_AsText(x))")
                 .binding("geometry", "ST_GeometryFromText('%s')".formatted(wkt))
-                .evaluate())
+                ::evaluate)
                 .hasMessage("ST_InteriorRings only applies to POLYGON. Input type is: %s".formatted(geometryType));
     }
 
@@ -1855,7 +1854,7 @@ public void testSTLineString()
                 .isEqualTo("LINESTRING (1 2, 3 4)");
 
         // Duplicate consecutive points throws exception
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_LineString", "array[ST_Point(1, 2), ST_Point(1, 2)]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_LineString", "array[ST_Point(1, 2), ST_Point(1, 2)]")::evaluate)
                 .hasMessage("Invalid input to ST_LineString: consecutive duplicate points at index 2");
 
         assertThat(assertions.function("ST_LineString", "array[ST_Point(1, 2), ST_Point(3, 4), ST_Point(1, 2)]"))
@@ -1873,33 +1872,33 @@ public void testSTLineString()
                 .isEqualTo("LINESTRING EMPTY");
 
         // Only points can be passed
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_LineString", "array[ST_Point(7,8), ST_GeometryFromText('LINESTRING (1 2, 3 4)')]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_LineString", "array[ST_Point(7,8), ST_GeometryFromText('LINESTRING (1 2, 3 4)')]")::evaluate)
                 .hasMessage("ST_LineString takes only an array of valid points, LineString was passed");
 
         // Nulls points are invalid
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_LineString", "array[NULL]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_LineString", "array[NULL]")::evaluate)
                 .hasMessage("Invalid input to ST_LineString: null point at index 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_LineString", "array[ST_Point(1,2), NULL]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_LineString", "array[ST_Point(1,2), NULL]")::evaluate)
                 .hasMessage("Invalid input to ST_LineString: null point at index 2");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_LineString", "array[ST_Point(1, 2), NULL, ST_Point(3, 4)]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_LineString", "array[ST_Point(1, 2), NULL, ST_Point(3, 4)]")::evaluate)
                 .hasMessage("Invalid input to ST_LineString: null point at index 2");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_LineString", "array[ST_Point(1, 2), NULL, ST_Point(3, 4), NULL]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_LineString", "array[ST_Point(1, 2), NULL, ST_Point(3, 4), NULL]")::evaluate)
                 .hasMessage("Invalid input to ST_LineString: null point at index 2");
 
         // Empty points are invalid
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_LineString", "array[ST_GeometryFromText('POINT EMPTY')]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_LineString", "array[ST_GeometryFromText('POINT EMPTY')]")::evaluate)
                 .hasMessage("Invalid input to ST_LineString: empty point at index 1");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_LineString", "array[ST_Point(1,2), ST_GeometryFromText('POINT EMPTY')]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_LineString", "array[ST_Point(1,2), ST_GeometryFromText('POINT EMPTY')]")::evaluate)
                 .hasMessage("Invalid input to ST_LineString: empty point at index 2");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_LineString", "array[ST_Point(1,2), ST_GeometryFromText('POINT EMPTY'), ST_Point(3,4)]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_LineString", "array[ST_Point(1,2), ST_GeometryFromText('POINT EMPTY'), ST_Point(3,4)]")::evaluate)
                 .hasMessage("Invalid input to ST_LineString: empty point at index 2");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_LineString", "array[ST_Point(1,2), ST_GeometryFromText('POINT EMPTY'), ST_Point(3,4), ST_GeometryFromText('POINT EMPTY')]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_LineString", "array[ST_Point(1,2), ST_GeometryFromText('POINT EMPTY'), ST_Point(3,4), ST_GeometryFromText('POINT EMPTY')]")::evaluate)
                 .hasMessage("Invalid input to ST_LineString: empty point at index 2");
     }
 
@@ -1926,7 +1925,7 @@ public void testMultiPoint()
         assertInvalidMultiPoint("geometry is not a point: LineString at index 2", "POINT (7 8)", "LINESTRING (1 2, 3 4)");
 
         // Null point raises exception
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_MultiPoint", "array[null]").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_MultiPoint", "array[null]")::evaluate)
                 .hasMessage("Invalid input to ST_MultiPoint: null at index 1");
 
         assertInvalidMultiPoint("null at index 3", "POINT (1 2)", "POINT (1 2)", null);
@@ -2124,7 +2123,7 @@ public void testSTGeometryFromBinary()
         assertGeomFromBinary("LINESTRING (0 0, 0 1, 0 1, 1 1, 1 0, 0 0)");
 
         // invalid binary
-        assertTrinoExceptionThrownBy(() -> assertions.function("ST_GeomFromBinary", "from_hex('deadbeef')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("ST_GeomFromBinary", "from_hex('deadbeef')")::evaluate)
                 .hasMessage("Invalid WKB");
     }
 
@@ -2159,22 +2158,22 @@ public void testGeometryFromHadoopShape()
         assertGeometryFromHadoopShape("000000000605000000000000000000F03F000000000000F03F00000000000018400000000000001840020000000A0000000000000005000000000000000000F03F000000000000F03F000000000000F03F0000000000000840000000000000084000000000000008400000000000000840000000000000F03F000000000000F03F000000000000F03F0000000000000040000000000000104000000000000000400000000000001840000000000000184000000000000018400000000000001840000000000000104000000000000000400000000000001040", "MULTIPOLYGON (((1 1, 3 1, 3 3, 1 3, 1 1)), ((2 4, 6 4, 6 6, 2 6, 2 4)))");
 
         // given hadoop shape is too short
-        assertTrinoExceptionThrownBy(() -> assertions.function("geometry_from_hadoop_shape", "from_hex('1234')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("geometry_from_hadoop_shape", "from_hex('1234')")::evaluate)
                 .hasMessage("Hadoop shape input is too short");
 
         // hadoop shape type invalid
-        assertTrinoExceptionThrownBy(() -> assertions.function("geometry_from_hadoop_shape", "from_hex('000000000701000000FFFFFFFFFFFFEFFFFFFFFFFFFFFFEFFF')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("geometry_from_hadoop_shape", "from_hex('000000000701000000FFFFFFFFFFFFEFFFFFFFFFFFFFFFEFFF')")::evaluate)
                 .hasMessage("Invalid Hadoop shape type: 7");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("geometry_from_hadoop_shape", "from_hex('00000000FF01000000FFFFFFFFFFFFEFFFFFFFFFFFFFFFEFFF')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("geometry_from_hadoop_shape", "from_hex('00000000FF01000000FFFFFFFFFFFFEFFFFFFFFFFFFFFFEFFF')")::evaluate)
                 .hasMessage("Invalid Hadoop shape type: -1");
 
         // esri shape invalid
-        assertTrinoExceptionThrownBy(() -> assertions.function("geometry_from_hadoop_shape", "from_hex('000000000101000000FFFFFFFFFFFFEFFFFFFFFFFFFFFFEF')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("geometry_from_hadoop_shape", "from_hex('000000000101000000FFFFFFFFFFFFEFFFFFFFFFFFFFFFEF')")::evaluate)
                 .hasMessage("Invalid Hadoop shape");
 
         // shape type is invalid for given shape
-        assertTrinoExceptionThrownBy(() -> assertions.function("geometry_from_hadoop_shape", "from_hex('000000000501000000000000000000F03F0000000000000040')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("geometry_from_hadoop_shape", "from_hex('000000000501000000000000000000F03F0000000000000040')")::evaluate)
                 .hasMessage("Invalid Hadoop shape");
     }
 
@@ -2236,22 +2235,16 @@ public void testGeometryJsonConversion()
         assertValidGeometryJson(
                 "{\"type\":\"MultiLineString\", \"coordinates\":[[[0.0,0.0],[1,10]],[[10,10],[20,30]],[[123,123],[456,789]]]}",
                 "MULTILINESTRING ((0 0, 1 10), (10 10, 20 30), (123 123, 456 789))");
+        assertValidGeometryJson("{\"type\":\"Point\"}", "POINT EMPTY");
+        assertValidGeometryJson("{\"type\":\"LineString\",\"coordinates\":null}", "LINESTRING EMPTY");
+        assertValidGeometryJson("{\"type\":\"MultiPoint\",\"invalidField\":[[10,10],[20,30]]}", "MULTIPOINT EMPTY");
+        assertValidGeometryJson("{\"type\":\"FeatureCollection\",\"features\":[]}", "GEOMETRYCOLLECTION EMPTY");
 
         // Valid JSON with invalid Geometry definition
-        assertInvalidGeometryJson("{\"type\":\"Point\"}",
-                "Invalid GeoJSON: Could not parse Point from GeoJson string.");
-        assertInvalidGeometryJson("{\"type\":\"LineString\",\"coordinates\":null}",
-                "Invalid GeoJSON: Could not parse LineString from GeoJson string.");
         assertInvalidGeometryJson("{ \"data\": {\"type\":\"Point\",\"coordinates\":[0,0]}}",
                 "Invalid GeoJSON: Could not parse Geometry from Json string.  No 'type' property found.");
-        assertInvalidGeometryJson("{\"type\":\"MultiPoint\",\"invalidField\":[[10,10],[20,30]]}",
-                "Invalid GeoJSON: Could not parse MultiPoint from GeoJson string.");
         assertInvalidGeometryJson("{\"type\":\"Feature\",\"geometry\":[],\"property\":\"foo\"}",
-                "Invalid GeoJSON: Could not parse Geometry from GeoJson string.  Unsupported 'type':Feature");
-        assertInvalidGeometryJson("{\"type\":\"FeatureCollection\",\"features\":[]}",
-                "Invalid GeoJSON: Could not parse Geometry from GeoJson string.  Unsupported 'type':FeatureCollection");
-        assertInvalidGeometryJson("{\"type\":\"MultiPoint\",\"missingCoordinates\":[]}",
-                "Invalid GeoJSON: Could not parse MultiPoint from GeoJson string.");
+                "Invalid GeoJSON: Could not parse Feature from GeoJson string.");
         assertInvalidGeometryJson("{\"coordinates\":[[[0.0,0.0],[1,10]],[[10,10],[20,30]],[[123,123],[456,789]]]}",
                 "Invalid GeoJSON: Could not parse Geometry from Json string.  No 'type' property found.");
 
@@ -2276,7 +2269,7 @@ private void assertValidGeometryJson(String json, String wkt)
 
     private void assertInvalidGeometryJson(String json, String message)
     {
-        assertTrinoExceptionThrownBy(() -> assertions.function("from_geojson_geometry", "'%s'".formatted(json)).evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("from_geojson_geometry", "'%s'".formatted(json))::evaluate)
                 .hasMessage(message);
     }
 }
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestGeoSpatialQueries.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestGeoSpatialQueries.java
index 75510ec484fa..6ad4742f952f 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestGeoSpatialQueries.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestGeoSpatialQueries.java
@@ -18,7 +18,7 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.testing.Closeables.closeAllSuppress;
 import static io.trino.plugin.geospatial.GeometryType.GEOMETRY;
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestKdbTreeCasts.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestKdbTreeCasts.java
index 43b84fcc06e4..81bbef7e19eb 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestKdbTreeCasts.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestKdbTreeCasts.java
@@ -70,7 +70,7 @@ public void test()
                 .hasType(VARCHAR)
                 .isEqualTo("KdbTree");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("typeof", "cast('' AS KdbTree)").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("typeof", "cast('' AS KdbTree)")::evaluate)
                 .hasMessage("Invalid JSON string for KDB tree")
                 .hasErrorCode(INVALID_CAST_ARGUMENT);
     }
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestKdbTreeType.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestKdbTreeType.java
index 7daae2d839f2..a233e1f26922 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestKdbTreeType.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestKdbTreeType.java
@@ -16,14 +16,17 @@
 import io.trino.geospatial.KdbTree;
 import io.trino.geospatial.KdbTree.Node;
 import io.trino.geospatial.Rectangle;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.type.AbstractTestType;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.OptionalInt;
 
 import static io.trino.plugin.geospatial.KdbTreeType.KDB_TREE;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestKdbTreeType
         extends AbstractTestType
@@ -33,7 +36,7 @@ protected TestKdbTreeType()
         super(KDB_TREE, KdbTree.class, createTestBlock());
     }
 
-    private static Block createTestBlock()
+    private static ValueBlock createTestBlock()
     {
         BlockBuilder blockBuilder = KDB_TREE.createBlockBuilder(null, 1);
         KdbTree kdbTree = new KdbTree(
@@ -43,7 +46,7 @@ private static Block createTestBlock()
                         Optional.empty(),
                         Optional.empty()));
         KDB_TREE.writeObject(blockBuilder, kdbTree);
-        return blockBuilder.build();
+        return blockBuilder.buildValueBlock();
     }
 
     @Override
@@ -51,4 +54,39 @@ protected Object getGreaterValue(Object value)
     {
         return null;
     }
+
+    @Test
+    public void testRange()
+    {
+        assertThat(type.getRange())
+                .isEmpty();
+    }
+
+    @Test
+    public void testPreviousValue()
+    {
+        Object sampleValue = getSampleValue();
+        if (!type.isOrderable()) {
+            assertThatThrownBy(() -> type.getPreviousValue(sampleValue))
+                    .isInstanceOf(IllegalStateException.class)
+                    .hasMessage("Type is not orderable: " + type);
+            return;
+        }
+        assertThat(type.getPreviousValue(sampleValue))
+                .isEmpty();
+    }
+
+    @Test
+    public void testNextValue()
+    {
+        Object sampleValue = getSampleValue();
+        if (!type.isOrderable()) {
+            assertThatThrownBy(() -> type.getNextValue(sampleValue))
+                    .isInstanceOf(IllegalStateException.class)
+                    .hasMessage("Type is not orderable: " + type);
+            return;
+        }
+        assertThat(type.getNextValue(sampleValue))
+                .isEmpty();
+    }
 }
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestRewriteSpatialPartitioningAggregation.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestRewriteSpatialPartitioningAggregation.java
index aa2ac22a3e9b..5b07999bc59c 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestRewriteSpatialPartitioningAggregation.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestRewriteSpatialPartitioningAggregation.java
@@ -18,9 +18,9 @@
 import io.trino.sql.planner.iterative.rule.RewriteSpatialPartitioningAggregation;
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
-import io.trino.sql.planner.iterative.rule.test.RuleAssert;
+import io.trino.sql.planner.iterative.rule.test.RuleBuilder;
 import io.trino.sql.planner.plan.AggregationNode;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.geospatial.GeometryType.GEOMETRY;
 import static io.trino.spi.type.IntegerType.INTEGER;
@@ -82,7 +82,7 @@ public void test()
                                         values("geometry"))));
     }
 
-    private RuleAssert assertRuleApplication()
+    private RuleBuilder assertRuleApplication()
     {
         return tester().assertThat(new RewriteSpatialPartitioningAggregation(tester().getPlannerContext()));
     }
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoinOperator.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoinOperator.java
index 0850cb1f9b6d..1fc1156ea8a4 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoinOperator.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoinOperator.java
@@ -44,10 +44,10 @@
 import io.trino.sql.planner.plan.SpatialJoinNode.Type;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.TestingTaskContext;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Optional;
@@ -76,12 +76,10 @@
 import static java.util.Collections.emptyIterator;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestSpatialJoinOperator
 {
     private static final String KDB_TREE_JSON = KdbTreeUtils.toJson(
@@ -104,7 +102,7 @@ public class TestSpatialJoinOperator
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp()
     {
         // Before/AfterMethod is chosen here because the executor needs to be shutdown
@@ -124,7 +122,7 @@ public void setUp()
         scheduledExecutor = newScheduledThreadPool(2, daemonThreadsNamed(getClass().getSimpleName() + "-scheduledExecutor-%s"));
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         executor.shutdownNow();
@@ -304,27 +302,36 @@ public void testYield()
         OperatorFactory joinOperatorFactory = new SpatialJoinOperatorFactory(2, new PlanNodeId("test"), INNER, probePages.getTypes(), Ints.asList(1), 0, Optional.empty(), pagesSpatialIndexFactory);
 
         Operator operator = joinOperatorFactory.createOperator(driverContext);
-        assertTrue(operator.needsInput());
+        assertThat(operator.needsInput()).isTrue();
         operator.addInput(probeInput.get(0));
         operator.finish();
 
         // we will yield 40 times due to filterFunction
         for (int i = 0; i < 40; i++) {
             driverContext.getYieldSignal().setWithDelay(5 * SECONDS.toNanos(1), driverContext.getYieldExecutor());
-            assertNull(operator.getOutput());
-            assertEquals(filterFunctionCalls.get(), i + 1, "Expected join to stop processing (yield) after calling filter function once");
+            assertThat(operator.getOutput()).isNull();
+            assertThat(filterFunctionCalls.get())
+                    .describedAs("Expected join to stop processing (yield) after calling filter function once")
+                    .isEqualTo(i + 1);
             driverContext.getYieldSignal().reset();
         }
         // delayed yield is not going to prevent operator from producing a page now (yield won't be forced because filter function won't be called anymore)
         driverContext.getYieldSignal().setWithDelay(5 * SECONDS.toNanos(1), driverContext.getYieldExecutor());
         Page output = operator.getOutput();
-        assertNotNull(output);
+        assertThat(output).isNotNull();
 
         // make sure we have 40 matches
-        assertEquals(output.getPositionCount(), 40);
+        assertThat(output.getPositionCount()).isEqualTo(40);
+    }
+
+    @Test
+    public void testDuplicateProbeFactory()
+            throws Exception
+    {
+        testDuplicateProbeFactory(true);
+        testDuplicateProbeFactory(false);
     }
 
-    @Test(dataProvider = "testDuplicateProbeFactoryDataProvider")
     public void testDuplicateProbeFactory(boolean createSecondaryOperators)
             throws Exception
     {
@@ -346,7 +353,7 @@ public void testDuplicateProbeFactory(boolean createSecondaryOperators)
             OperatorFactory secondFactory = firstFactory.duplicate();
             if (createSecondaryOperators) {
                 try (Operator secondOperator = secondFactory.createOperator(secondDriver)) {
-                    assertEquals(toPages(secondOperator, emptyIterator()), ImmutableList.of());
+                    assertThat(toPages(secondOperator, emptyIterator())).isEqualTo(ImmutableList.of());
                 }
             }
             secondFactory.noMoreOperators();
@@ -358,15 +365,6 @@ public void testDuplicateProbeFactory(boolean createSecondaryOperators)
         assertOperatorEquals(firstFactory, probeDriver, probePages.build(), expected);
     }
 
-    @DataProvider
-    public Object[][] testDuplicateProbeFactoryDataProvider()
-    {
-        return new Object[][] {
-                {true},
-                {false},
-        };
-    }
-
     @Test
     public void testDistanceQuery()
     {
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoinPlanning.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoinPlanning.java
index cf91f3130b61..20ab4f87706f 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoinPlanning.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoinPlanning.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.geospatial;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.slice.DynamicSliceOutput;
 import io.trino.Session;
@@ -26,14 +27,21 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.TestingBlockEncodingSerde;
+import io.trino.spi.type.Type;
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.sql.planner.assertions.PlanMatchPattern;
+import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.plan.ExchangeNode;
+import io.trino.sql.tree.Expression;
+import io.trino.sql.tree.FunctionCall;
+import io.trino.sql.tree.NotExpression;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Base64;
+import java.util.List;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -43,8 +51,11 @@
 import static io.trino.geospatial.KdbTree.Node.newLeaf;
 import static io.trino.metadata.LiteralFunction.LITERAL_FUNCTION_NAME;
 import static io.trino.plugin.geospatial.GeoFunctions.stPoint;
+import static io.trino.plugin.geospatial.GeometryType.GEOMETRY;
 import static io.trino.spi.StandardErrorCode.INVALID_SPATIAL_PARTITIONING;
 import static io.trino.spi.predicate.Utils.nativeValueToBlock;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.any;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
@@ -62,9 +73,10 @@
 import static java.lang.Math.cos;
 import static java.lang.Math.toRadians;
 import static java.lang.String.format;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestSpatialJoinPlanning
         extends BasePlanTest
 {
@@ -89,7 +101,7 @@ protected LocalQueryRunner createLocalQueryRunner()
         return queryRunner;
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         Block block = nativeValueToBlock(KdbTreeType.KDB_TREE, KdbTreeUtils.fromJson(KDB_TREE_JSON));
@@ -136,12 +148,12 @@ public void testSpatialJoinContains()
                         spatialJoin("st_contains(st_geometryfromtext, st_point)", Optional.of(KDB_TREE_JSON),
                                 anyTree(
                                         unnest(
-                                                project(ImmutableMap.of("partitions", expression(format("spatial_partitions(%s, st_point)", kdbTreeLiteral))),
+                                                project(ImmutableMap.of("partitions_a", expression(format("spatial_partitions(%s, st_point)", kdbTreeLiteral))),
                                                         project(ImmutableMap.of("st_point", expression("ST_Point(lng, lat)")),
                                                                 tableScan("points", ImmutableMap.of("lng", "lng", "lat", "lat", "name", "name")))))),
                                 anyTree(
                                         unnest(
-                                                project(ImmutableMap.of("partitions", expression(format("spatial_partitions(%s, st_geometryfromtext)", kdbTreeLiteral))),
+                                                project(ImmutableMap.of("partitions_b", expression(format("spatial_partitions(%s, st_geometryfromtext)", kdbTreeLiteral))),
                                                         project(ImmutableMap.of("st_geometryfromtext", expression("ST_GeometryFromText(cast(wkt as varchar))")),
                                                                 tableScan("polygons", ImmutableMap.of("wkt", "wkt", "name_2", "name")))))))));
     }
@@ -183,12 +195,12 @@ public void testSpatialJoinWithin()
                         spatialJoin("st_within(st_geometryfromtext, st_point)", Optional.of(KDB_TREE_JSON),
                                 anyTree(
                                         unnest(
-                                                project(ImmutableMap.of("partitions", expression(format("spatial_partitions(%s, st_point)", kdbTreeLiteral))),
+                                                project(ImmutableMap.of("partitions_a", expression(format("spatial_partitions(%s, st_point)", kdbTreeLiteral))),
                                                         project(ImmutableMap.of("st_point", expression("ST_Point(lng, lat)")),
                                                                 tableScan("points", ImmutableMap.of("lng", "lng", "lat", "lat", "name_a", "name")))))),
                                 anyTree(
                                         unnest(
-                                                project(ImmutableMap.of("partitions", expression(format("spatial_partitions(%s, st_geometryfromtext)", kdbTreeLiteral))),
+                                                project(ImmutableMap.of("partitions_b", expression(format("spatial_partitions(%s, st_geometryfromtext)", kdbTreeLiteral))),
                                                         project(ImmutableMap.of("st_geometryfromtext", expression("ST_GeometryFromText(cast(wkt as varchar))")),
                                                                 tableScan("polygons", ImmutableMap.of("wkt", "wkt", "name_b", "name")))))))));
     }
@@ -250,15 +262,15 @@ private void assertInvalidSpatialPartitioning(Session session, String sql, Strin
         LocalQueryRunner queryRunner = getQueryRunner();
         try {
             queryRunner.inTransaction(session, transactionSession -> {
-                queryRunner.createPlan(transactionSession, sql, OPTIMIZED_AND_VALIDATED, false, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+                queryRunner.createPlan(transactionSession, sql, queryRunner.getPlanOptimizers(false), OPTIMIZED_AND_VALIDATED, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
                 return null;
             });
-            fail(format("Expected query to fail: %s", sql));
+            throw new AssertionError(format("Expected query to fail: %s", sql));
         }
         catch (TrinoException ex) {
-            assertEquals(ex.getErrorCode(), INVALID_SPATIAL_PARTITIONING.toErrorCode());
+            assertThat(ex.getErrorCode()).isEqualTo(INVALID_SPATIAL_PARTITIONING.toErrorCode());
             if (!nullToEmpty(ex.getMessage()).matches(expectedMessageRegExp)) {
-                fail(format("Expected exception message '%s' to match '%s' for query: %s", ex.getMessage(), expectedMessageRegExp, sql), ex);
+                throw new AssertionError(format("Expected exception message '%s' to match '%s' for query: %s", ex.getMessage(), expectedMessageRegExp, sql), ex);
             }
         }
     }
@@ -287,11 +299,11 @@ public void testSpatialJoinIntersects()
                         spatialJoin("st_intersects(geometry_a, geometry_b)", Optional.of(KDB_TREE_JSON),
                                 anyTree(
                                         unnest(
-                                                project(ImmutableMap.of("partitions", expression(format("spatial_partitions(%s, geometry_a)", kdbTreeLiteral))),
+                                                project(ImmutableMap.of("partitions_a", expression(format("spatial_partitions(%s, geometry_a)", kdbTreeLiteral))),
                                                         project(ImmutableMap.of("geometry_a", expression("ST_GeometryFromText(cast(wkt_a as varchar))")),
                                                                 tableScan("polygons", ImmutableMap.of("wkt_a", "wkt", "name_a", "name")))))),
                                 anyTree(
-                                        project(ImmutableMap.of("partitions", expression(format("spatial_partitions(%s, geometry_b)", kdbTreeLiteral))),
+                                        project(ImmutableMap.of("partitions_b", expression(format("spatial_partitions(%s, geometry_b)", kdbTreeLiteral))),
                                                 project(ImmutableMap.of("geometry_b", expression("ST_GeometryFromText(cast(wkt_b as varchar))")),
                                                         tableScan("polygons", ImmutableMap.of("wkt_b", "wkt", "name_b", "name"))))))));
     }
@@ -338,14 +350,14 @@ public void testDistanceQuery()
                                                 project(
                                                         ImmutableMap.of(
                                                                 "st_point_a", expression(point21x21Literal),
-                                                                "partitions", expression(format("spatial_partitions(%s, %s)", kdbTreeLiteral, point21x21Literal))),
+                                                                "partitions_a", expression(format("spatial_partitions(%s, %s)", kdbTreeLiteral, point21x21Literal))),
                                                         singleRow()))),
                                 anyTree(
                                         unnest(
                                                 project(
                                                         ImmutableMap.of(
                                                                 "st_point_b", expression(point21x21Literal),
-                                                                "partitions", expression(format("spatial_partitions(%s, %s, 3.1e0)", kdbTreeLiteral, point21x21Literal)),
+                                                                "partitions_b", expression(format("spatial_partitions(%s, %s, 3.1e0)", kdbTreeLiteral, point21x21Literal)),
                                                                 "radius", expression("3.1e0")),
                                                         singleRow()))))));
     }
@@ -375,15 +387,18 @@ public void testNotIntersects()
                         "           WHERE NOT ST_Intersects(ST_GeometryFromText(a.wkt), ST_GeometryFromText(b.wkt))", singleRow()),
                 anyTree(
                         filter(
-                                "NOT ST_Intersects(ST_GeometryFromText(cast(wkt_a as varchar)), ST_GeometryFromText(cast(wkt_b as varchar)))",
+                                new NotExpression(
+                                        functionCall("ST_Intersects", ImmutableList.of(GEOMETRY, GEOMETRY), ImmutableList.of(
+                                                functionCall("ST_GeometryFromText", ImmutableList.of(VARCHAR), ImmutableList.of(PlanBuilder.expression("cast(wkt_a as varchar)"))),
+                                                functionCall("ST_GeometryFromText", ImmutableList.of(VARCHAR), ImmutableList.of(PlanBuilder.expression("cast(wkt_b as varchar)")))))),
                                 join(INNER, builder -> builder
                                         .left(
                                                 project(
-                                                        ImmutableMap.of("wkt_a", expression("(CASE WHEN (rand() >= 0E0) THEN 'POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))' END)"), "name_a", expression("'a'")),
+                                                        ImmutableMap.of("wkt_a", expression("(CASE WHEN (random() >= 0E0) THEN 'POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))' END)"), "name_a", expression("'a'")),
                                                         singleRow()))
                                         .right(
                                                 any(project(
-                                                        ImmutableMap.of("wkt_b", expression("(CASE WHEN (rand() >= 0E0) THEN 'POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))' END)"), "name_b", expression("'a'")),
+                                                        ImmutableMap.of("wkt_b", expression("(CASE WHEN (random() >= 0E0) THEN 'POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))' END)"), "name_b", expression("'a'")),
                                                         singleRow())))))));
     }
 
@@ -454,7 +469,7 @@ public void testSpatialLeftJoins()
                         "FROM points a LEFT JOIN polygons b " +
                         "ON ST_Contains(ST_GeometryFromText(wkt), ST_Point(lng, lat)) AND rand() < 0.5",
                 anyTree(
-                        spatialLeftJoin("st_contains(st_geometryfromtext, st_point) AND rand() < 5e-1",
+                        spatialLeftJoin("st_contains(st_geometryfromtext, st_point) AND random() < 5e-1",
                                 project(ImmutableMap.of("st_point", expression("ST_Point(lng, lat)")),
                                         tableScan("points", ImmutableMap.of("lng", "lng", "lat", "lat", "name_a", "name"))),
                                 anyTree(
@@ -487,7 +502,7 @@ public void testDistributedSpatialJoinOverUnion()
                 anyTree(
                         spatialJoin("st_contains(g1, g3)", Optional.of(KDB_TREE_JSON),
                                 anyTree(
-                                        unnest(exchange(ExchangeNode.Scope.REMOTE, ExchangeNode.Type.REPARTITION,
+                                        unnest(exchange(ExchangeNode.Scope.LOCAL, ExchangeNode.Type.REPARTITION,
                                                 project(ImmutableMap.of("p1", expression(format("spatial_partitions(%s, g1)", kdbTreeLiteral))),
                                                         project(ImmutableMap.of("g1", expression("ST_GeometryFromText(cast(name_a1 as varchar))")),
                                                                 tableScan("region", ImmutableMap.of("name_a1", "name")))),
@@ -513,7 +528,7 @@ public void testDistributedSpatialJoinOverUnion()
                                                         project(ImmutableMap.of("g1", expression("ST_GeometryFromText(cast(name_a as varchar))")),
                                                                 tableScan("customer", ImmutableMap.of("name_a", "name")))))),
                                 anyTree(
-                                        unnest(exchange(ExchangeNode.Scope.REMOTE, ExchangeNode.Type.REPARTITION,
+                                        unnest(exchange(ExchangeNode.Scope.LOCAL, ExchangeNode.Type.REPARTITION,
                                                 project(ImmutableMap.of("p2", expression(format("spatial_partitions(%s, g2)", kdbTreeLiteral))),
                                                         project(ImmutableMap.of("g2", expression("ST_GeometryFromText(cast(name_b1 as varchar))")),
                                                                 tableScan("region", ImmutableMap.of("name_b1", "name")))),
@@ -554,4 +569,9 @@ private static String doubleLiteral(double value)
         checkArgument(Double.isFinite(value));
         return format("%.16E", value);
     }
+
+    private FunctionCall functionCall(String name, List<Type> types, List<Expression> arguments)
+    {
+        return new FunctionCall(getQueryRunner().getMetadata().resolveBuiltinFunction(name, fromTypes(types)).toQualifiedName(), arguments);
+    }
 }
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoins.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoins.java
index 96b615288528..8693030d20ab 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoins.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoins.java
@@ -18,17 +18,19 @@
 import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.spi.security.PrincipalType;
+import io.trino.sql.query.QueryAssertions;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.Optional;
 
 import static io.trino.SystemSessionProperties.SPATIAL_PARTITIONING_TABLE_NAME;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSpatialJoins
         extends AbstractTestQueryFramework
@@ -399,4 +401,21 @@ public void testSpatialJoinOverFullJoinWithOrPredicate()
                         "ON ST_Contains(ST_GeometryFromText(b.wkt), ST_Point(a.latitude1, a.longitude1)) OR ST_Contains(ST_GeometryFromText(b.wkt), ST_Point(a.latitude2, a.longitude2))",
                 "VALUES ('x', 'a'), ('y', 'b'), ('y', 'c'), (NULL, 'd'), (NULL, 'empty'), ('z', NULL), (NULL, 'null'), ('null', NULL)");
     }
+
+    @Test
+    public void testLeftJoin()
+    {
+        assertThat(new QueryAssertions(getQueryRunner()).query("""
+                WITH
+                    points(lat, lon) AS ( VALUES (0.5, 0.5), (2, 2) ),
+                    polygons(id, x) AS ( VALUES (1, ST_GeometryFromText('POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))')) )
+                SELECT id, lat, lon
+                FROM points LEFT JOIN polygons ON st_contains(x, ST_Point(lat, lon))
+                """))
+                .matches("""
+                        VALUES
+                            (1, 0.5, 0.5),
+                            (NULL, 2, 2)
+                        """);
+    }
 }
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialPartitioningInternalAggregation.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialPartitioningInternalAggregation.java
index 7be8b7c40624..8207cd03895e 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialPartitioningInternalAggregation.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialPartitioningInternalAggregation.java
@@ -30,10 +30,9 @@
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.sql.tree.QualifiedName;
+import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.OptionalInt;
@@ -50,17 +49,17 @@
 import static io.trino.sql.planner.plan.AggregationNode.Step.SINGLE;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.math.RoundingMode.CEILING;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSpatialPartitioningInternalAggregation
 {
-    @DataProvider(name = "partitionCount")
-    public static Object[][] partitionCountProvider()
+    @Test
+    public void test()
     {
-        return new Object[][] {{100}, {10}};
+        test(10);
+        test(100);
     }
 
-    @Test(dataProvider = "partitionCount")
     public void test(int partitionCount)
     {
         LocalQueryRunner runner = LocalQueryRunner.builder(testSessionBuilder().build())
@@ -68,12 +67,14 @@ public void test(int partitionCount)
         runner.installPlugin(new GeoPlugin());
 
         TestingAggregationFunction function = new TestingFunctionResolution(runner)
-                .getAggregateFunction(QualifiedName.of("spatial_partitioning"), fromTypes(GEOMETRY, INTEGER));
+                .getAggregateFunction("spatial_partitioning", fromTypes(GEOMETRY, INTEGER));
 
         List<OGCGeometry> geometries = makeGeometries();
         Block geometryBlock = makeGeometryBlock(geometries);
 
-        Block partitionCountBlock = BlockAssertions.createRepeatedValuesBlock(partitionCount, geometries.size());
+        BlockBuilder blockBuilder = INTEGER.createBlockBuilder(null, 1);
+        INTEGER.writeInt(blockBuilder, partitionCount);
+        Block partitionCountBlock = RunLengthEncodedBlock.create(blockBuilder.build(), geometries.size());
 
         Rectangle expectedExtent = new Rectangle(-10, -10, Math.nextUp(10.0), Math.nextUp(10.0));
         String expectedValue = getSpatialPartitioning(expectedExtent, geometries, partitionCount);
@@ -84,12 +85,12 @@ public void test(int partitionCount)
         Aggregator aggregator = aggregatorFactory.createAggregator();
         aggregator.processPage(page);
         String aggregation = (String) BlockAssertions.getOnlyValue(function.getFinalType(), getFinalBlock(function.getFinalType(), aggregator));
-        assertEquals(aggregation, expectedValue);
+        assertThat(aggregation).isEqualTo(expectedValue);
 
         GroupedAggregator groupedAggregator = aggregatorFactory.createGroupedAggregator();
-        groupedAggregator.processPage(createGroupByIdBlock(0, page.getPositionCount()), page);
+        groupedAggregator.processPage(0, createGroupByIdBlock(0, page.getPositionCount()), page);
         String groupValue = (String) getGroupValue(function.getFinalType(), groupedAggregator, 0);
-        assertEquals(groupValue, expectedValue);
+        assertThat(groupValue).isEqualTo(expectedValue);
     }
 
     private List<OGCGeometry> makeGeometries()
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSphericalGeoFunctions.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSphericalGeoFunctions.java
index ee101ecc3c88..da0d4147b484 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSphericalGeoFunctions.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSphericalGeoFunctions.java
@@ -40,7 +40,6 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
-import static org.testng.Assert.assertEquals;
 
 @TestInstance(PER_CLASS)
 public class TestSphericalGeoFunctions
@@ -87,7 +86,7 @@ public void testGetObjectValue()
         }
         Block block = builder.build();
         for (int i = 0; i < wktList.size(); i++) {
-            assertEquals(wktList.get(i), SPHERICAL_GEOGRAPHY.getObjectValue(null, block, i));
+            assertThat(wktList.get(i)).isEqualTo(SPHERICAL_GEOGRAPHY.getObjectValue(null, block, i));
         }
     }
 
@@ -157,28 +156,28 @@ public void testToAndFromSphericalGeography()
                 .matches("ST_GeometryFromText('GEOMETRYCOLLECTION (POINT (-40.2 28.9), LINESTRING (-40.2 28.9, -40.2 31.9, -37.2 31.9), POLYGON ((-40.2 28.9, -37.2 28.9, -37.2 31.9, -40.2 31.9, -40.2 28.9)))')");
 
         // geometries containing invalid latitude or longitude values
-        assertTrinoExceptionThrownBy(() -> assertions.function("to_spherical_geography", "ST_GeometryFromText('POINT (-340.2 28.9)')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("to_spherical_geography", "ST_GeometryFromText('POINT (-340.2 28.9)')")::evaluate)
                 .hasMessage("Longitude must be between -180 and 180");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("to_spherical_geography", "ST_GeometryFromText('MULTIPOINT ((-40.2 128.9), (-40.2 31.9))')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("to_spherical_geography", "ST_GeometryFromText('MULTIPOINT ((-40.2 128.9), (-40.2 31.9))')")::evaluate)
                 .hasMessage("Latitude must be between -90 and 90");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("to_spherical_geography", "ST_GeometryFromText('LINESTRING (-40.2 28.9, -40.2 31.9, 237.2 31.9)')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("to_spherical_geography", "ST_GeometryFromText('LINESTRING (-40.2 28.9, -40.2 31.9, 237.2 31.9)')")::evaluate)
                 .hasMessage("Longitude must be between -180 and 180");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("to_spherical_geography", "ST_GeometryFromText('MULTILINESTRING ((-40.2 28.9, -40.2 31.9), (-40.2 131.9, -37.2 31.9))')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("to_spherical_geography", "ST_GeometryFromText('MULTILINESTRING ((-40.2 28.9, -40.2 31.9), (-40.2 131.9, -37.2 31.9))')")::evaluate)
                 .hasMessage("Latitude must be between -90 and 90");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("to_spherical_geography", "ST_GeometryFromText('POLYGON ((-40.2 28.9, -40.2 31.9, 237.2 31.9, -37.2 28.9, -40.2 28.9))')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("to_spherical_geography", "ST_GeometryFromText('POLYGON ((-40.2 28.9, -40.2 31.9, 237.2 31.9, -37.2 28.9, -40.2 28.9))')")::evaluate)
                 .hasMessage("Longitude must be between -180 and 180");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("to_spherical_geography", "ST_GeometryFromText('POLYGON ((-40.2 28.9, -40.2 31.9, -37.2 131.9, -37.2 28.9, -40.2 28.9), (-39.2 29.9, -39.2 30.9, -38.2 30.9, -38.2 29.9, -39.2 29.9))')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("to_spherical_geography", "ST_GeometryFromText('POLYGON ((-40.2 28.9, -40.2 31.9, -37.2 131.9, -37.2 28.9, -40.2 28.9), (-39.2 29.9, -39.2 30.9, -38.2 30.9, -38.2 29.9, -39.2 29.9))')")::evaluate)
                 .hasMessage("Latitude must be between -90 and 90");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("to_spherical_geography", "ST_GeometryFromText('MULTIPOLYGON (((-40.2 28.9, -40.2 31.9, -37.2 31.9, -37.2 28.9, -40.2 28.9)), ((-39.2 29.9, -39.2 30.9, 238.2 30.9, -38.2 29.9, -39.2 29.9)))')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("to_spherical_geography", "ST_GeometryFromText('MULTIPOLYGON (((-40.2 28.9, -40.2 31.9, -37.2 31.9, -37.2 28.9, -40.2 28.9)), ((-39.2 29.9, -39.2 30.9, 238.2 30.9, -38.2 29.9, -39.2 29.9)))')")::evaluate)
                 .hasMessage("Longitude must be between -180 and 180");
 
-        assertTrinoExceptionThrownBy(() -> assertions.function("to_spherical_geography", "ST_GeometryFromText('GEOMETRYCOLLECTION (POINT (-40.2 28.9), LINESTRING (-40.2 28.9, -40.2 131.9, -37.2 31.9), POLYGON ((-40.2 28.9, -40.2 31.9, -37.2 31.9, -37.2 28.9, -40.2 28.9)))')").evaluate())
+        assertTrinoExceptionThrownBy(assertions.function("to_spherical_geography", "ST_GeometryFromText('GEOMETRYCOLLECTION (POINT (-40.2 28.9), LINESTRING (-40.2 28.9, -40.2 131.9, -37.2 31.9), POLYGON ((-40.2 28.9, -40.2 31.9, -37.2 31.9, -37.2 28.9, -40.2 28.9)))')")::evaluate)
                 .hasMessage("Latitude must be between -90 and 90");
     }
 
@@ -217,15 +216,15 @@ public void testArea()
                 .isEqualTo((Object) null);
 
         // Invalid polygon (too few vertices)
-        assertTrinoExceptionThrownBy(() -> assertions.expression("ST_Area(to_spherical_geography(ST_GeometryFromText('POLYGON((90 0, 0 0))')))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("ST_Area(to_spherical_geography(ST_GeometryFromText('POLYGON((90 0, 0 0))')))")::evaluate)
                 .hasMessage("Polygon is not valid: a loop contains less then 3 vertices.");
 
         // Invalid data type (point)
-        assertTrinoExceptionThrownBy(() -> assertions.expression("ST_Area(to_spherical_geography(ST_GeometryFromText('POINT (0 1)')))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("ST_Area(to_spherical_geography(ST_GeometryFromText('POINT (0 1)')))")::evaluate)
                 .hasMessage("When applied to SphericalGeography inputs, ST_Area only supports POLYGON or MULTI_POLYGON. Input type is: POINT");
 
         //Invalid Polygon (duplicated point)
-        assertTrinoExceptionThrownBy(() -> assertions.expression("ST_Area(to_spherical_geography(ST_GeometryFromText('POLYGON((0 0, 0 1, 1 1, 1 1, 1 0, 0 0))')))").evaluate())
+        assertTrinoExceptionThrownBy(assertions.expression("ST_Area(to_spherical_geography(ST_GeometryFromText('POLYGON((0 0, 0 1, 1 1, 1 1, 1 0, 0 0))')))")::evaluate)
                 .hasMessage("Polygon is not valid: it has two identical consecutive vertices");
 
         // A polygon around the North Pole
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/AbstractTestGeoAggregationFunctions.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/AbstractTestGeoAggregationFunctions.java
index f0f0de9968b7..64dcbf97b4bd 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/AbstractTestGeoAggregationFunctions.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/AbstractTestGeoAggregationFunctions.java
@@ -20,10 +20,10 @@
 import io.trino.metadata.TestingFunctionResolution;
 import io.trino.plugin.geospatial.GeoPlugin;
 import io.trino.spi.Page;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -36,13 +36,15 @@
 import static io.trino.operator.aggregation.AggregationTestUtils.assertAggregation;
 import static io.trino.plugin.geospatial.GeometryType.GEOMETRY;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public abstract class AbstractTestGeoAggregationFunctions
 {
     private LocalQueryRunner runner;
     private TestingFunctionResolution functionResolution;
 
-    @BeforeClass
+    @BeforeAll
     public final void initTestFunctions()
     {
         runner = LocalQueryRunner.builder(TEST_SESSION).build();
@@ -50,7 +52,7 @@ public final void initTestFunctions()
         functionResolution = new TestingFunctionResolution(runner);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public final void destroyTestFunctions()
     {
         closeAllRuntimeException(runner);
@@ -82,7 +84,7 @@ protected void assertAggregatedGeometries(String testDescription, String expecte
         // Test in forward and reverse order to verify that ordering doesn't affect the output
         assertAggregation(
                 functionResolution,
-                QualifiedName.of(getFunctionName()),
+                getFunctionName(),
                 fromTypes(GEOMETRY),
                 equalityFunction,
                 testDescription,
@@ -91,7 +93,7 @@ protected void assertAggregatedGeometries(String testDescription, String expecte
         Collections.reverse(geometrySlices);
         assertAggregation(
                 functionResolution,
-                QualifiedName.of(getFunctionName()),
+                getFunctionName(),
                 fromTypes(GEOMETRY),
                 equalityFunction,
                 testDescription,
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryConvexHullGeoAggregation.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryConvexHullGeoAggregation.java
index 60625c331681..aa0725ebd11e 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryConvexHullGeoAggregation.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryConvexHullGeoAggregation.java
@@ -13,8 +13,7 @@
  */
 package io.trino.plugin.geospatial.aggregation;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -26,426 +25,321 @@
 public class TestGeometryConvexHullGeoAggregation
         extends AbstractTestGeoAggregationFunctions
 {
-    @DataProvider(name = "point")
-    public Object[][] point()
+    @Test
+    public void testPoint()
     {
-        return new Object[][] {
-                {
-                        "identity",
-                        "POINT (1 2)",
-                        new String[] {"POINT (1 2)", "POINT (1 2)", "POINT (1 2)"},
-                },
-                {
-                        "no input yields null",
-                        null,
-                        new String[] {},
-                },
-                {
-                        "null before value yields the value",
-                        "POINT (1 2)",
-                        new String[] {null, "POINT (1 2)"},
-                },
-                {
-                        "null after value yields the value",
-                        "POINT (1 2)",
-                        new String[] {"POINT (1 2)", null},
-                },
-                {
-                        "empty with non-empty",
-                        "POINT (1 2)",
-                        new String[] {"POINT EMPTY", "POINT (1 2)"},
-                },
-                {
-                        "2 disjoint points return linestring",
-                        "LINESTRING (1 2, 3 4)",
-                        new String[] {"POINT (1 2)", "POINT (3 4)"},
-                },
-                {
-                        "points lying on the same line return linestring",
-                        "LINESTRING (3 3, 1 1)",
-                        new String[] {"POINT (1 1)", "POINT (2 2)", "POINT (3 3)"},
-                },
-                {
-                        "points forming a polygon return polygon",
-                        "POLYGON ((5 8, 2 3, 1 1, 5 8))",
-                        new String[] {"POINT (1 1)", "POINT (2 3)", "POINT (5 8)"},
-                }
-        };
+        assertAggregatedGeometries(
+                "identity",
+                "POINT (1 2)",
+                "POINT (1 2)",
+                "POINT (1 2)",
+                "POINT (1 2)");
+
+        assertAggregatedGeometries(
+                "no input yields null",
+                null);
+
+        assertAggregatedGeometries(
+                "null before value yields the value",
+                "POINT (1 2)",
+                null, "POINT (1 2)");
+
+        assertAggregatedGeometries(
+                "null after value yields the value",
+                "POINT (1 2)",
+                "POINT (1 2)",
+                null);
+
+        assertAggregatedGeometries(
+                "empty with non-empty",
+                "POINT (1 2)",
+                "POINT EMPTY",
+                "POINT (1 2)");
+
+        assertAggregatedGeometries(
+                "2 disjoint points return linestring",
+                "LINESTRING (1 2, 3 4)",
+                "POINT (1 2)",
+                "POINT (3 4)");
+
+        assertAggregatedGeometries(
+                "points lying on the same line return linestring",
+                "LINESTRING (3 3, 1 1)",
+                "POINT (1 1)",
+                "POINT (2 2)",
+                "POINT (3 3)");
+
+        assertAggregatedGeometries(
+                "points forming a polygon return polygon",
+                "POLYGON ((5 8, 2 3, 1 1, 5 8))",
+                "POINT (1 1)",
+                "POINT (2 3)",
+                "POINT (5 8)");
     }
 
-    @DataProvider(name = "linestring")
-    public Object[][] linestring()
+    @Test
+
+    public void testLinestring()
     {
-        return new Object[][] {
-                {
-                        "identity",
-                        "LINESTRING (1 1, 2 2)",
-                        new String[] {"LINESTRING (1 1, 2 2)", "LINESTRING (1 1, 2 2)",
-                                "LINESTRING (1 1, 2 2)"},
-                },
-                {
-                        "empty with non-empty",
-                        "LINESTRING (1 1, 2 2)",
-                        new String[] {"LINESTRING EMPTY", "LINESTRING (1 1, 2 2)"},
-                },
-                {
-                        "overlap",
-                        "LINESTRING (1 1, 4 4)",
-                        new String[] {"LINESTRING (1 1, 2 2, 3 3)", "LINESTRING (2 2, 3 3, 4 4)"},
-                },
-                {
-                        "disjoint returns polygon",
-                        "POLYGON ((1 1, 3 3, 3 4, 1 2, 1 1))",
-                        new String[] {"LINESTRING (1 1, 2 2, 3 3)", "LINESTRING (1 2, 2 3, 3 4)"},
-                },
-                {
-                        "cut through returns polygon",
-                        "POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1)),",
-                        new String[] {"LINESTRING (1 1, 3 3)", "LINESTRING (3 1, 1 3)"},
-                },
-        };
+        assertAggregatedGeometries(
+                "identity",
+                "LINESTRING (1 1, 2 2)",
+                "LINESTRING (1 1, 2 2)",
+                "LINESTRING (1 1, 2 2)",
+                "LINESTRING (1 1, 2 2)");
+
+        assertAggregatedGeometries(
+                "empty with non-empty",
+                "LINESTRING (1 1, 2 2)",
+                "LINESTRING EMPTY",
+                "LINESTRING (1 1, 2 2)");
+
+        assertAggregatedGeometries(
+                "overlap",
+                "LINESTRING (1 1, 4 4)",
+                "LINESTRING (1 1, 2 2, 3 3)",
+                "LINESTRING (2 2, 3 3, 4 4)");
+
+        assertAggregatedGeometries(
+                "disjoint returns polygon",
+                "POLYGON ((1 1, 3 3, 3 4, 1 2, 1 1))",
+                "LINESTRING (1 1, 2 2, 3 3)",
+                "LINESTRING (1 2, 2 3, 3 4)");
+
+        assertAggregatedGeometries(
+                "cut through returns polygon",
+                "POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1)),",
+                "LINESTRING (1 1, 3 3)",
+                "LINESTRING (3 1, 1 3)");
     }
 
-    @DataProvider(name = "polygon")
-    public Object[][] polygon()
+    @Test
+    public void testPolygon()
     {
-        return new Object[][] {
-                {
-                        "identity",
-                        "POLYGON ((2 2, 1 1, 3 1, 2 2))",
-                        new String[] {
-                                "POLYGON ((2 2, 1 1, 3 1, 2 2))",
-                                "POLYGON ((2 2, 1 1, 3 1, 2 2))",
-                                "POLYGON ((2 2, 1 1, 3 1, 2 2))",
-                        },
-                },
-                {
-                        "empty with non-empty",
-                        "POLYGON ((2 2, 1 1, 3 1, 2 2))",
-                        new String[] {
-                                "POLYGON EMPTY",
-                                "POLYGON ((2 2, 1 1, 3 1, 2 2))",
-                        },
-                },
-                {
-                        "three overlapping triangles",
-                        "POLYGON ((1 1, 5 1, 4 2, 2 2, 1 1))",
-                        new String[] {
-                                "POLYGON ((2 2, 3 1, 1 1, 2 2))",
-                                "POLYGON ((3 2, 4 1, 2 1, 3 2))",
-                                "POLYGON ((4 2, 5 1, 3 1, 4 2))",
-                        },
-                },
-                {
-                        "two triangles touching at 3 1 returns polygon",
-                        "POLYGON ((1 1, 5 1, 4 2, 2 2, 1 1))",
-                        new String[] {
-                                "POLYGON ((2 2, 3 1, 1 1, 2 2))",
-                                "POLYGON ((4 2, 5 1, 3 1, 4 2))",
-                        },
-                },
-                {
-                        "two disjoint triangles returns polygon",
-                        "POLYGON ((1 1, 6 1, 5 2, 2 2, 1 1))",
-                        new String[] {
-                                "POLYGON ((2 2, 3 1, 1 1, 2 2))",
-                                "POLYGON ((5 2, 6 1, 4 1, 5 2))",
-                        },
-                },
-                {
-                        "polygon with hole returns the exterior polygon",
-                        "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
-                        new String[] {
-                                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))",
-                                "POLYGON ((3 3, 4 3, 4 4, 3 4, 3 3))",
-                        },
-                },
-                {
-                        "polygon with hole with shape larger than hole is simplified",
-                        "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
-                        new String[] {
-                                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))",
-                                "POLYGON ((2 2, 5 2, 5 5, 2 5, 2 2))",
-                        },
-                },
-                {
-                        "polygon with hole with shape smaller than hole returns the exterior polygon",
-                        "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
-                        new String[] {
-                                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))",
-                                "POLYGON ((3.25 3.25, 3.75 3.25, 3.75 3.75, 3.25 3.75, 3.25 3.25))",
-                        },
-                },
-                {
-                        "polygon with hole with several smaller pieces which fill hole returns the exterior polygon",
-                        "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
-                        new String[] {
-                                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))",
-                                "POLYGON ((3 3, 3 3.5, 3.5 3.5, 3.5 3, 3 3))",
-                                "POLYGON ((3.5 3.5, 3.5 4, 4 4, 4 3.5, 3.5 3.5))",
-                                "POLYGON ((3 3.5, 3 4, 3.5 4, 3.5 3.5, 3 3.5))",
-                                "POLYGON ((3.5 3, 3.5 3.5, 4 3.5, 4 3, 3.5 3))",
-                        },
-                },
-                {
-                        "two overlapping rectangles",
-                        "POLYGON ((3 1, 4 1, 6 3, 6 4, 4 6, 3 6, 1 4, 1 3, 3 1))",
-                        new String[] {
-                                "POLYGON ((1 3, 1 4, 6 4, 6 3, 1 3))",
-                                "POLYGON ((3 1, 4 1, 4 6, 3 6, 3 1))",
-                        },
-                },
-                {
-                        "touching squares",
-                        "POLYGON ((3 1, 4 1, 6 3, 6 4, 4 6, 3 6, 1 4, 1 3, 3 1))",
-                        new String[] {
-                                "POLYGON ((1 3, 1 4, 3 4, 3 3, 1 3))",
-                                "POLYGON ((3 3, 3 4, 4 4, 4 3, 3 3))",
-                                "POLYGON ((4 3, 4 4, 6 4, 6 3, 4 3))",
-                                "POLYGON ((3 1, 4 1, 4 3, 3 3, 3 1))",
-                                "POLYGON ((3 4, 3 6, 4 6, 4 4, 3 4))",
-                        },
-                },
-                {
-                        "square with touching point becomes simplified polygon",
-                        "POLYGON ((1 1, 3 1, 3 2, 3 3, 1 3, 1 1))",
-                        new String[] {
-                                "POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))",
-                                "POINT (3 2)",
-                        },
-                },
-        };
+        assertAggregatedGeometries(
+                "identity",
+                "POLYGON ((2 2, 1 1, 3 1, 2 2))",
+                "POLYGON ((2 2, 1 1, 3 1, 2 2))",
+                "POLYGON ((2 2, 1 1, 3 1, 2 2))",
+                "POLYGON ((2 2, 1 1, 3 1, 2 2))");
+
+        assertAggregatedGeometries(
+                "empty with non-empty",
+                "POLYGON ((2 2, 1 1, 3 1, 2 2))",
+                "POLYGON EMPTY",
+                "POLYGON ((2 2, 1 1, 3 1, 2 2))");
+
+        assertAggregatedGeometries(
+                "three overlapping triangles",
+                "POLYGON ((1 1, 5 1, 4 2, 2 2, 1 1))",
+                "POLYGON ((2 2, 3 1, 1 1, 2 2))",
+                "POLYGON ((3 2, 4 1, 2 1, 3 2))",
+                "POLYGON ((4 2, 5 1, 3 1, 4 2))");
+
+        assertAggregatedGeometries(
+                "two triangles touching at 3 1 returns polygon",
+                "POLYGON ((1 1, 5 1, 4 2, 2 2, 1 1))",
+                "POLYGON ((2 2, 3 1, 1 1, 2 2))",
+                "POLYGON ((4 2, 5 1, 3 1, 4 2))");
+
+        assertAggregatedGeometries(
+                "two disjoint triangles returns polygon",
+                "POLYGON ((1 1, 6 1, 5 2, 2 2, 1 1))",
+                "POLYGON ((2 2, 3 1, 1 1, 2 2))",
+                "POLYGON ((5 2, 6 1, 4 1, 5 2))");
+
+        assertAggregatedGeometries(
+                "polygon with hole returns the exterior polygon",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))",
+                "POLYGON ((3 3, 4 3, 4 4, 3 4, 3 3))");
+
+        assertAggregatedGeometries(
+                "polygon with hole with shape larger than hole is simplified",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))",
+                "POLYGON ((2 2, 5 2, 5 5, 2 5, 2 2))");
+
+        assertAggregatedGeometries(
+                "polygon with hole with shape smaller than hole returns the exterior polygon",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))",
+                "POLYGON ((3.25 3.25, 3.75 3.25, 3.75 3.75, 3.25 3.75, 3.25 3.25))");
+
+        assertAggregatedGeometries(
+                "polygon with hole with several smaller pieces which fill hole returns the exterior polygon",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))",
+                "POLYGON ((3 3, 3 3.5, 3.5 3.5, 3.5 3, 3 3))",
+                "POLYGON ((3.5 3.5, 3.5 4, 4 4, 4 3.5, 3.5 3.5))",
+                "POLYGON ((3 3.5, 3 4, 3.5 4, 3.5 3.5, 3 3.5))",
+                "POLYGON ((3.5 3, 3.5 3.5, 4 3.5, 4 3, 3.5 3))");
+
+        assertAggregatedGeometries(
+                "two overlapping rectangles",
+                "POLYGON ((3 1, 4 1, 6 3, 6 4, 4 6, 3 6, 1 4, 1 3, 3 1))",
+                "POLYGON ((1 3, 1 4, 6 4, 6 3, 1 3))",
+                "POLYGON ((3 1, 4 1, 4 6, 3 6, 3 1))");
+
+        assertAggregatedGeometries(
+                "touching squares",
+                "POLYGON ((3 1, 4 1, 6 3, 6 4, 4 6, 3 6, 1 4, 1 3, 3 1))",
+                "POLYGON ((1 3, 1 4, 3 4, 3 3, 1 3))",
+                "POLYGON ((3 3, 3 4, 4 4, 4 3, 3 3))",
+                "POLYGON ((4 3, 4 4, 6 4, 6 3, 4 3))",
+                "POLYGON ((3 1, 4 1, 4 3, 3 3, 3 1))",
+                "POLYGON ((3 4, 3 6, 4 6, 4 4, 3 4))");
+
+        assertAggregatedGeometries(
+                "square with touching point becomes simplified polygon",
+                "POLYGON ((1 1, 3 1, 3 2, 3 3, 1 3, 1 1))",
+                "POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))",
+                "POINT (3 2)");
     }
 
-    @DataProvider(name = "multipoint")
-    public Object[][] multipoint()
+    @Test
+    public void testMultipoint()
     {
-        return new Object[][] {
-                {
-                        "lying on the same line",
-                        "LINESTRING (1 2, 4 8)",
-                        new String[] {
-                                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
-                                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
-                                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
-                        },
-                },
-                {
-                        "empty with non-empty",
-                        "LINESTRING (1 2, 4 8)",
-                        new String[] {
-                                "MULTIPOINT EMPTY",
-                                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
-                        },
-                },
-                {
-                        "disjoint",
-                        "LINESTRING (1 2, 4 8)",
-                        new String[] {
-                                "MULTIPOINT ((1 2), (2 4))",
-                                "MULTIPOINT ((3 6), (4 8))",
-                        },
-                },
-                {
-                        "overlap",
-                        "LINESTRING (1 2, 4 8)",
-                        new String[] {
-                                "MULTIPOINT ((1 2), (2 4))",
-                                "MULTIPOINT ((2 4), (3 6))",
-                                "MULTIPOINT ((3 6), (4 8))",
-                        },
-                },
-        };
+        assertAggregatedGeometries(
+                "lying on the same line",
+                "LINESTRING (1 2, 4 8)",
+                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
+                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
+                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))");
+
+        assertAggregatedGeometries(
+                "empty with non-empty",
+                "LINESTRING (1 2, 4 8)",
+                "MULTIPOINT EMPTY",
+                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))");
+
+        assertAggregatedGeometries(
+                "disjoint",
+                "LINESTRING (1 2, 4 8)",
+                "MULTIPOINT ((1 2), (2 4))",
+                "MULTIPOINT ((3 6), (4 8))");
+
+        assertAggregatedGeometries(
+                "overlap",
+                "LINESTRING (1 2, 4 8)",
+                "MULTIPOINT ((1 2), (2 4))",
+                "MULTIPOINT ((2 4), (3 6))",
+                "MULTIPOINT ((3 6), (4 8))");
     }
 
-    @DataProvider(name = "multilinestring")
-    public Object[][] multilinestring()
+    @Test
+    public void testMultilinestring()
     {
-        return new Object[][] {
-                {
-                        "identity",
-                        "POLYGON ((4 1, 5 1, 2 5, 1 5, 4 1))",
-                        new String[] {
-                                "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))",
-                                "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))",
-                                "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))",
-                        },
-                },
-                {
-                        "empty with non-empty",
-                        "POLYGON ((4 1, 5 1, 2 5, 1 5, 4 1))",
-                        new String[] {
-                                "MULTILINESTRING EMPTY",
-                                "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))",
-                        },
-                },
-                {
-                        "disjoint",
-                        "POLYGON ((4 5, 1 5, 4 1, 7 1, 4 5))",
-                        new String[] {
-                                "MULTILINESTRING ((1 5, 4 1), (3 5, 6 1))",
-                                "MULTILINESTRING ((2 5, 5 1), (4 5, 7 1))",
-                        },
-                },
-                {
-                        "disjoint aggregates with cut through",
-                        "POLYGON ((1 3, 4 1, 6 1, 8 3, 3 5, 1 5, 1 3))",
-                        new String[] {
-                                "MULTILINESTRING ((1 5, 4 1), (3 5, 6 1))",
-                                "LINESTRING (1 3, 8 3)",
-                        },
-                },
-        };
+        assertAggregatedGeometries(
+                "identity",
+                "POLYGON ((4 1, 5 1, 2 5, 1 5, 4 1))",
+                "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))",
+                "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))",
+                "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))");
+
+        assertAggregatedGeometries(
+                "empty with non-empty",
+                "POLYGON ((4 1, 5 1, 2 5, 1 5, 4 1))",
+                "MULTILINESTRING EMPTY",
+                "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))");
+
+        assertAggregatedGeometries(
+                "disjoint",
+                "POLYGON ((4 5, 1 5, 4 1, 7 1, 4 5))",
+                "MULTILINESTRING ((1 5, 4 1), (3 5, 6 1))",
+                "MULTILINESTRING ((2 5, 5 1), (4 5, 7 1))");
+
+        assertAggregatedGeometries(
+                "disjoint aggregates with cut through",
+                "POLYGON ((1 3, 4 1, 6 1, 8 3, 3 5, 1 5, 1 3))",
+                "MULTILINESTRING ((1 5, 4 1), (3 5, 6 1))",
+                "LINESTRING (1 3, 8 3)");
     }
 
-    @DataProvider(name = "multipolygon")
-    public Object[][] multipolygon()
+    @Test
+    public void testMultipolygon()
     {
-        return new Object[][] {
-                {
-                        "identity",
-                        "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))",
-                        new String[] {
-                                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))",
-                                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))",
-                                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))",
-                        },
-                },
-                {
-                        "empty with non-empty",
-                        "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))",
-                        new String[] {
-                                "MULTIPOLYGON EMPTY",
-                                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))",
-                        },
-                },
-                {
-                        "disjoint",
-                        "POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))",
-                        new String[] {
-                                "MULTIPOLYGON ((( 0 0, 0 2, 2 2, 2 0, 0 0 )), (( 0 3, 0 5, 2 5, 2 3, 0 3 )))",
-                                "MULTIPOLYGON ((( 3 0, 3 2, 5 2, 5 0, 3 0 )), (( 3 3, 3 5, 5 5, 5 3, 3 3 )))",
-                        },
-                },
-                {
-                        "overlapping multipolygons",
-                        "POLYGON ((1 1, 5 1, 4 2, 2 2, 1 1))",
-                        new String[] {
-                                "MULTIPOLYGON (((2 2, 3 1, 1 1, 2 2)), ((3 2, 4 1, 2 1, 3 2)))",
-                                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))",
-                        },
-                },
-        };
+        assertAggregatedGeometries(
+                "identity",
+                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))",
+                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))",
+                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))",
+                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))");
+
+        assertAggregatedGeometries(
+                "empty with non-empty",
+                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))",
+                "MULTIPOLYGON EMPTY",
+                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))");
+
+        assertAggregatedGeometries(
+                "disjoint",
+                "POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))",
+                "MULTIPOLYGON ((( 0 0, 0 2, 2 2, 2 0, 0 0 )), (( 0 3, 0 5, 2 5, 2 3, 0 3 )))",
+                "MULTIPOLYGON ((( 3 0, 3 2, 5 2, 5 0, 3 0 )), (( 3 3, 3 5, 5 5, 5 3, 3 3 )))");
+
+        assertAggregatedGeometries(
+                "overlapping multipolygon",
+                "POLYGON ((1 1, 5 1, 4 2, 2 2, 1 1))",
+                "MULTIPOLYGON (((2 2, 3 1, 1 1, 2 2)), ((3 2, 4 1, 2 1, 3 2)))",
+                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))");
     }
 
-    @DataProvider(name = "1000points")
-    public Object[][] points1000()
+    @Test
+    public void test1000Points()
             throws Exception
     {
         Path filePath = new File(getResource("1000_points.txt").toURI()).toPath();
         List<String> points = Files.readAllLines(filePath);
-        return new Object[][] {
-                {
-                        "1000points",
-                        "POLYGON ((0.7642699 0.000490129, 0.92900103 0.005068898, 0.97419316 0.019917727, 0.99918157 0.063635945, 0.9997078 0.10172784, 0.9973114 0.41161585, 0.9909166 0.94222105, 0.9679412 0.9754768, 0.95201814 0.9936909, 0.44082636 0.9999601, 0.18622541 0.998157, 0.07163471 0.98902994, 0.066090584 0.9885783, 0.024429202 0.9685611, 0.0044354796 0.8878008, 0.0025004745 0.81172496, 0.0015820265 0.39900982, 0.001614511 0.00065791607, 0.7642699 0.000490129))",
-                        points.toArray(new String[0]),
-                },
-        };
-    }
-
-    @DataProvider(name = "geometryCollection")
-    public Object[][] geometryCollection()
-    {
-        return new Object[][] {
-                {
-                        "identity",
-                        "POLYGON ((0 0, 5 0, 5 2, 0 2, 0 0))",
-                        new String[] {"MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((3 0, 5 0, 5 2, 3 2, 3 0)))",
-                                "GEOMETRYCOLLECTION ( POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0)), POLYGON ((3 0, 5 0, 5 2, 3 2, 3 0)))",
-                                "GEOMETRYCOLLECTION ( POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0)), POLYGON ((3 0, 5 0, 5 2, 3 2, 3 0)))"},
-                },
-                {
-                        "empty with non-empty",
-                        "POLYGON ((0 0, 5 0, 5 2, 0 2, 0 0))",
-                        new String[] {"GEOMETRYCOLLECTION EMPTY",
-                                "GEOMETRYCOLLECTION ( POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0)), POLYGON ((3 0, 5 0, 5 2, 3 2, 3 0)))"},
-                },
-                {
-                        "overlapping geometry collections",
-                        "POLYGON ((1 1, 5 1, 4 2, 2 2, 1 1))",
-                        new String[] {"GEOMETRYCOLLECTION ( POLYGON ((2 2, 3 1, 1 1, 2 2)), POLYGON ((3 2, 4 1, 2 1, 3 2)) )",
-                                "GEOMETRYCOLLECTION ( POLYGON ((4 2, 5 1, 3 1, 4 2)) )"},
-                },
-                {
-                        "disjoint geometry collection of polygons",
-                        "POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))",
-                        new String[] {"GEOMETRYCOLLECTION ( POLYGON (( 0 0, 0 2, 2 2, 2 0, 0 0 )), POLYGON (( 0 3, 0 5, 2 5, 2 3, 0 3 )) )",
-                                "GEOMETRYCOLLECTION ( POLYGON (( 3 0, 3 2, 5 2, 5 0, 3 0 )), POLYGON (( 3 3, 3 5, 5 5, 5 3, 3 3 )) )"},
-                },
-                {
-                        "square with a line crossed",
-                        "POLYGON ((0 2, 1 1, 3 1, 5 2, 3 3, 1 3, 0 2))",
-                        new String[] {"POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "LINESTRING (0 2, 5 2)"},
-                },
-                {
-                        "square with adjacent line",
-                        "POLYGON ((0 5, 1 1, 3 1, 5 5, 0 5))",
-                        new String[] {"POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "LINESTRING (0 5, 5 5)"},
-                },
-                {
-                        "square with adjacent point",
-                        "POLYGON ((5 2, 3 3, 1 3, 1 1, 3 1, 5 2))",
-                        new String[] {"POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "POINT (5 2)"},
-                },
-        };
-    }
 
-    @Test(dataProvider = "point")
-    public void testPoint(String testDescription, String expectedWkt, String... wkts)
-    {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkts);
+        assertAggregatedGeometries(
+                "1000points",
+                "POLYGON ((0.7642699 0.000490129, 0.92900103 0.005068898, 0.97419316 0.019917727, 0.99918157 0.063635945, 0.9997078 0.10172784, 0.9973114 0.41161585, 0.9909166 0.94222105, 0.9679412 0.9754768, 0.95201814 0.9936909, 0.44082636 0.9999601, 0.18622541 0.998157, 0.07163471 0.98902994, 0.066090584 0.9885783, 0.024429202 0.9685611, 0.0044354796 0.8878008, 0.0025004745 0.81172496, 0.0015820265 0.39900982, 0.001614511 0.00065791607, 0.7642699 0.000490129))",
+                points.toArray(new String[0]));
     }
 
-    @Test(dataProvider = "linestring")
-    public void testLineString(String testDescription, String expectedWkt, String... wkts)
+    @Test
+    public void testGeometryCollection()
     {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkts);
-    }
+        assertAggregatedGeometries(
+                "identity",
+                "POLYGON ((0 0, 5 0, 5 2, 0 2, 0 0))",
+                "MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((3 0, 5 0, 5 2, 3 2, 3 0)))",
+                "GEOMETRYCOLLECTION ( POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0)), POLYGON ((3 0, 5 0, 5 2, 3 2, 3 0)))",
+                "GEOMETRYCOLLECTION ( POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0)), POLYGON ((3 0, 5 0, 5 2, 3 2, 3 0)))");
 
-    @Test(dataProvider = "polygon")
-    public void testPolygon(String testDescription, String expectedWkt, String... wkts)
-    {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkts);
-    }
+        assertAggregatedGeometries(
+                "empty with non-empty",
+                "POLYGON ((0 0, 5 0, 5 2, 0 2, 0 0))",
+                "GEOMETRYCOLLECTION EMPTY",
+                "GEOMETRYCOLLECTION ( POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0)), POLYGON ((3 0, 5 0, 5 2, 3 2, 3 0)))");
 
-    @Test(dataProvider = "multipoint")
-    public void testMultipoint(String testDescription, String expectedWkt, String... wkt)
-    {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkt);
-    }
+        assertAggregatedGeometries(
+                "overlapping geometry collections",
+                "POLYGON ((1 1, 5 1, 4 2, 2 2, 1 1))",
+                "GEOMETRYCOLLECTION ( POLYGON ((2 2, 3 1, 1 1, 2 2)), POLYGON ((3 2, 4 1, 2 1, 3 2)) )",
+                "GEOMETRYCOLLECTION ( POLYGON ((4 2, 5 1, 3 1, 4 2)) )");
 
-    @Test(dataProvider = "multilinestring")
-    public void testMultilinestring(String testDescription, String expectedWkt, String... wkt)
-    {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkt);
-    }
+        assertAggregatedGeometries(
+                "disjoint geometry collection of polygons",
+                "POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))",
+                "GEOMETRYCOLLECTION ( POLYGON (( 0 0, 0 2, 2 2, 2 0, 0 0 )), POLYGON (( 0 3, 0 5, 2 5, 2 3, 0 3 )) )",
+                "GEOMETRYCOLLECTION ( POLYGON (( 3 0, 3 2, 5 2, 5 0, 3 0 )), POLYGON (( 3 3, 3 5, 5 5, 5 3, 3 3 )) )");
 
-    @Test(dataProvider = "multipolygon")
-    public void testMultipolygon(String testDescription, String expectedWkt, String... wkt)
-    {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkt);
-    }
+        assertAggregatedGeometries(
+                "square with a line crossed",
+                "POLYGON ((0 2, 1 1, 3 1, 5 2, 3 3, 1 3, 0 2))",
+                "POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "LINESTRING (0 2, 5 2)");
 
-    @Test(dataProvider = "1000points")
-    public void test1000Points(String testDescription, String expectedWkt, String... wkt)
-    {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkt);
-    }
+        assertAggregatedGeometries(
+                "square with adjacent line",
+                "POLYGON ((0 5, 1 1, 3 1, 5 5, 0 5))",
+                "POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "LINESTRING (0 5, 5 5)");
 
-    @Test(dataProvider = "geometryCollection")
-    public void testGeometryCollection(String testDescription, String expectedWkt, String... wkt)
-    {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkt);
+        assertAggregatedGeometries(
+                "square with adjacent point",
+                "POLYGON ((5 2, 3 3, 1 3, 1 1, 3 1, 5 2))",
+                "POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "POINT (5 2)");
     }
 
     @Override
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryStateFactory.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryStateFactory.java
index 642a82b326c8..dd47e52b4f8a 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryStateFactory.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryStateFactory.java
@@ -14,12 +14,9 @@
 package io.trino.plugin.geospatial.aggregation;
 
 import com.esri.core.geometry.ogc.OGCGeometry;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestGeometryStateFactory
 {
@@ -29,8 +26,8 @@ public class TestGeometryStateFactory
     public void testCreateSingleStateEmpty()
     {
         GeometryState state = factory.createSingleState();
-        assertNull(state.getGeometry());
-        assertEquals(0, state.getEstimatedSize());
+        assertThat(state.getGeometry()).isNull();
+        assertThat(0).isEqualTo(state.getEstimatedSize());
     }
 
     @Test
@@ -38,37 +35,41 @@ public void testCreateSingleStatePresent()
     {
         GeometryState state = factory.createSingleState();
         state.setGeometry(OGCGeometry.fromText("POINT (1 2)"));
-        assertEquals(OGCGeometry.fromText("POINT (1 2)"), state.getGeometry());
-        assertTrue(state.getEstimatedSize() > 0, "Estimated memory size was " + state.getEstimatedSize());
+        assertThat(OGCGeometry.fromText("POINT (1 2)")).isEqualTo(state.getGeometry());
+        assertThat(state.getEstimatedSize() > 0)
+                .describedAs("Estimated memory size was " + state.getEstimatedSize())
+                .isTrue();
     }
 
     @Test
     public void testCreateGroupedStateEmpty()
     {
         GeometryState state = factory.createGroupedState();
-        assertNull(state.getGeometry());
-        assertTrue(state.getEstimatedSize() > 0, "Estimated memory size was " + state.getEstimatedSize());
+        assertThat(state.getGeometry()).isNull();
+        assertThat(state.getEstimatedSize() > 0)
+                .describedAs("Estimated memory size was " + state.getEstimatedSize())
+                .isTrue();
     }
 
     @Test
     public void testCreateGroupedStatePresent()
     {
         GeometryState state = factory.createGroupedState();
-        assertNull(state.getGeometry());
-        assertTrue(state instanceof GeometryStateFactory.GroupedGeometryState);
+        assertThat(state.getGeometry()).isNull();
+        assertThat(state instanceof GeometryStateFactory.GroupedGeometryState).isTrue();
         GeometryStateFactory.GroupedGeometryState groupedState = (GeometryStateFactory.GroupedGeometryState) state;
 
         groupedState.setGroupId(1);
-        assertNull(state.getGeometry());
+        assertThat(state.getGeometry()).isNull();
         groupedState.setGeometry(OGCGeometry.fromText("POINT (1 2)"));
-        assertEquals(state.getGeometry(), OGCGeometry.fromText("POINT (1 2)"));
+        assertThat(state.getGeometry()).isEqualTo(OGCGeometry.fromText("POINT (1 2)"));
 
         groupedState.setGroupId(2);
-        assertNull(state.getGeometry());
+        assertThat(state.getGeometry()).isNull();
         groupedState.setGeometry(OGCGeometry.fromText("POINT (3 4)"));
-        assertEquals(state.getGeometry(), OGCGeometry.fromText("POINT (3 4)"));
+        assertThat(state.getGeometry()).isEqualTo(OGCGeometry.fromText("POINT (3 4)"));
 
         groupedState.setGroupId(1);
-        assertNotNull(state.getGeometry());
+        assertThat(state.getGeometry()).isNotNull();
     }
 }
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryStateSerializer.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryStateSerializer.java
index 0d7908a91c18..167e3d72fc3c 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryStateSerializer.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryStateSerializer.java
@@ -20,11 +20,10 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.AccumulatorStateFactory;
 import io.trino.spi.function.AccumulatorStateSerializer;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.geospatial.aggregation.GeometryStateFactory.GroupedGeometryState;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestGeometryStateSerializer
 {
@@ -41,12 +40,12 @@ public void testSerializeDeserialize()
         serializer.serialize(state, builder);
         Block block = builder.build();
 
-        assertEquals(GeometryType.GEOMETRY.getObjectValue(null, block, 0), "POINT (1 2)");
+        assertThat(GeometryType.GEOMETRY.getObjectValue(null, block, 0)).isEqualTo("POINT (1 2)");
 
         state.setGeometry(null);
         serializer.deserialize(block, 0, state);
 
-        assertEquals(state.getGeometry().asText(), "POINT (1 2)");
+        assertThat(state.getGeometry().asText()).isEqualTo("POINT (1 2)");
     }
 
     @Test
@@ -69,18 +68,18 @@ public void testSerializeDeserializeGrouped()
         serializer.serialize(state, builder);
         Block block = builder.build();
 
-        assertEquals(GeometryType.GEOMETRY.getObjectValue(null, block, 0), "POINT (1 2)");
+        assertThat(GeometryType.GEOMETRY.getObjectValue(null, block, 0)).isEqualTo("POINT (1 2)");
 
         state.setGeometry(null);
         serializer.deserialize(block, 0, state);
 
         // Assert the state of group 1
-        assertEquals(state.getGeometry().asText(), "POINT (1 2)");
+        assertThat(state.getGeometry().asText()).isEqualTo("POINT (1 2)");
         // Verify nothing changed in group 2
         state.setGroupId(2);
-        assertEquals(state.getGeometry().asText(), "POINT (2 3)");
+        assertThat(state.getGeometry().asText()).isEqualTo("POINT (2 3)");
         // Groups we did not touch are null
         state.setGroupId(3);
-        assertNull(state.getGeometry());
+        assertThat(state.getGeometry()).isNull();
     }
 }
diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryUnionGeoAggregation.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryUnionGeoAggregation.java
index 1c1634b6b549..dfcc8a7f87f2 100644
--- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryUnionGeoAggregation.java
+++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/aggregation/TestGeometryUnionGeoAggregation.java
@@ -16,10 +16,10 @@
 import com.google.common.base.Joiner;
 import io.trino.plugin.geospatial.GeoPlugin;
 import io.trino.sql.query.QueryAssertions;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Arrays;
 import java.util.List;
@@ -29,20 +29,22 @@
 import static java.util.Collections.reverse;
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestGeometryUnionGeoAggregation
         extends AbstractTestGeoAggregationFunctions
 {
     private QueryAssertions assertions;
 
-    @BeforeClass
+    @BeforeAll
     public void init()
     {
         assertions = new QueryAssertions();
         assertions.addPlugin(new GeoPlugin());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
     {
         assertions.close();
@@ -51,321 +53,256 @@ public void teardown()
 
     private static final Joiner COMMA_JOINER = Joiner.on(",");
 
-    @DataProvider(name = "point")
-    public Object[][] point()
+    @Test
+    public void testPoint()
     {
-        return new Object[][] {
-                {
-                        "identity",
-                        "POINT (1 2)",
-                        new String[] {"POINT (1 2)", "POINT (1 2)", "POINT (1 2)"},
-                },
-                {
-                        "no input yields null",
-                        null,
-                        new String[] {},
-                },
-                {
-                        "empty with non-empty",
-                        "POINT (1 2)",
-                        new String[] {"POINT EMPTY", "POINT (1 2)"},
-                },
-                {
-                        "disjoint returns multipoint",
-                        "MULTIPOINT ((1 2), (3 4))",
-                        new String[] {"POINT (1 2)", "POINT (3 4)"},
-                },
-        };
-    }
+        test(
+                "identity",
+                "POINT (1 2)",
+                "POINT (1 2)", "POINT (1 2)", "POINT (1 2)");
 
-    @DataProvider(name = "linestring")
-    public Object[][] linestring()
-    {
-        return new Object[][] {
-                {
-                        "identity",
-                        "LINESTRING (1 1, 2 2)",
-                        new String[] {"LINESTRING (1 1, 2 2)", "LINESTRING (1 1, 2 2)", "LINESTRING (1 1, 2 2)"},
-                },
-                {
-                        "empty with non-empty",
-                        "LINESTRING (1 1, 2 2)",
-                        new String[] {"LINESTRING EMPTY", "LINESTRING (1 1, 2 2)"},
-                },
-                {
-                        "overlap",
-                        "LINESTRING (1 1, 2 2, 3 3, 4 4)",
-                        new String[] {"LINESTRING (1 1, 2 2, 3 3)", "LINESTRING (2 2, 3 3, 4 4)"},
-                },
-                {
-                        "disjoint returns multistring",
-                        "MULTILINESTRING ((1 1, 2 2, 3 3), (1 2, 2 3, 3 4))",
-                        new String[] {"LINESTRING (1 1, 2 2, 3 3)", "LINESTRING (1 2, 2 3, 3 4)"},
-                },
-                {
-                        "cut through returns multistring",
-                        "MULTILINESTRING ((1 1, 2 2), (3 1, 2 2), (2 2, 3 3), (2 2, 1 3))",
-                        new String[] {"LINESTRING (1 1, 3 3)", "LINESTRING (3 1, 1 3)"},
-                },
-        };
-    }
+        test(
+                "no input yields null",
+                null);
 
-    @DataProvider(name = "polygon")
-    public Object[][] polygon()
-    {
-        return new Object[][] {
-                {
-                        "identity",
-                        "POLYGON ((2 2, 1 1, 3 1, 2 2))",
-                        new String[] {"POLYGON ((2 2, 1 1, 3 1, 2 2))", "POLYGON ((2 2, 1 1, 3 1, 2 2))", "POLYGON ((2 2, 1 1, 3 1, 2 2))"},
-                },
-                {
-                        "empty with non-empty",
-                        "POLYGON ((2 2, 1 1, 3 1, 2 2))",
-                        new String[] {"POLYGON EMPTY)", "POLYGON ((2 2, 1 1, 3 1, 2 2))"},
-                },
-                {
-                        "three overlapping triangles",
-                        "POLYGON ((1 1, 2 1, 3 1, 4 1, 5 1, 4 2, 3.5 1.5, 3 2, 2.5 1.5, 2 2, 1 1))",
-                        new String[] {"POLYGON ((2 2, 3 1, 1 1, 2 2))", "POLYGON ((3 2, 4 1, 2 1, 3 2))", "POLYGON ((4 2, 5 1, 3 1, 4 2))"},
-                },
-                {
-                        "two triangles touching at 3 1 returns multipolygon",
-                        "MULTIPOLYGON (((1 1, 3 1, 2 2, 1 1)), ((3 1, 5 1, 4 2, 3 1)))",
-                        new String[] {"POLYGON ((2 2, 3 1, 1 1, 2 2))", "POLYGON ((4 2, 5 1, 3 1, 4 2))"},
-                },
-                {
-                        "two disjoint triangles returns multipolygon",
-                        "MULTIPOLYGON (((1 1, 3 1, 2 2, 1 1)), ((4 1, 6 1, 5 2, 4 1)))",
-                        new String[] {"POLYGON ((2 2, 3 1, 1 1, 2 2))", "POLYGON ((5 2, 6 1, 4 1, 5 2))"},
-                },
-                {
-                        "polygon with hole that is filled is simplified",
-                        "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
-                        new String[] {"POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))", "POLYGON ((3 3, 4 3, 4 4, 3 4, 3 3))"},
-                },
-                {
-                        "polygon with hole with shape larger than hole is simplified",
-                        "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
-                        new String[] {"POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))", "POLYGON ((2 2, 5 2, 5 5, 2 5, 2 2))"},
-                },
-                {
-                        "polygon with hole with shape smaller than hole becomes multipolygon",
-                        "MULTIPOLYGON (((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 3 4, 4 4, 4 3, 3 3)), ((3.25 3.25, 3.75 3.25, 3.75 3.75, 3.25 3.75, 3.25 3.25)))",
-                        new String[] {"POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))", "POLYGON ((3.25 3.25, 3.75 3.25, 3.75 3.75, 3.25 3.75, 3.25 3.25))"},
-                },
-                {
-                        "polygon with hole with several smaller pieces which fill hole simplify into polygon",
-                        "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
-                        new String[] {"POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))", "POLYGON ((3 3, 3 3.5, 3.5 3.5, 3.5 3, 3 3))",
-                                "POLYGON ((3.5 3.5, 3.5 4, 4 4, 4 3.5, 3.5 3.5))", "POLYGON ((3 3.5, 3 4, 3.5 4, 3.5 3.5, 3 3.5))",
-                                "POLYGON ((3.5 3, 3.5 3.5, 4 3.5, 4 3, 3.5 3))"},
-                },
-                {
-                        "two overlapping rectangles becomes cross",
-                        "POLYGON ((3 1, 4 1, 4 3, 6 3, 6 4, 4 4, 4 6, 3 6, 3 4, 1 4, 1 3, 3 3, 3 1))",
-                        new String[] {"POLYGON ((1 3, 1 4, 6 4, 6 3, 1 3))", "POLYGON ((3 1, 4 1, 4 6, 3 6, 3 1))"},
-                },
-                {
-                        "touching squares become single cross",
-                        "POLYGON ((3 1, 4 1, 4 3, 6 3, 6 4, 4 4, 4 6, 3 6, 3 4, 1 4, 1 3, 3 3, 3 1))",
-                        new String[] {"POLYGON ((1 3, 1 4, 3 4, 3 3, 1 3))", "POLYGON ((3 3, 3 4, 4 4, 4 3, 3 3))", "POLYGON ((4 3, 4 4, 6 4, 6 3, 4 3))",
-                                "POLYGON ((3 1, 4 1, 4 3, 3 3, 3 1))", "POLYGON ((3 4, 3 6, 4 6, 4 4, 3 4))"},
-                },
-                {
-                        "square with touching point becomes simplified polygon",
-                        "POLYGON ((1 1, 3 1, 3 2, 3 3, 1 3, 1 1))",
-                        new String[] {"POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "POINT (3 2)"},
-                },
-        };
-    }
+        test(
+                "empty with non-empty",
+                "POINT (1 2)",
+                "POINT EMPTY", "POINT (1 2)");
 
-    @DataProvider(name = "multipoint")
-    public Object[][] multipoint()
-    {
-        return new Object[][] {
-                {
-                        "identity",
-                        "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
-                        new String[] {"MULTIPOINT ((1 2), (2 4), (3 6), (4 8))", "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))", "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))"},
-                },
-                {
-                        "empty with non-empty",
-                        "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
-                        new String[] {"MULTIPOINT EMPTY", "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))"},
-                },
-                {
-                        "disjoint",
-                        "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
-                        new String[] {"MULTIPOINT ((1 2), (2 4))", "MULTIPOINT ((3 6), (4 8))"},
-                },
-                {
-                        "overlap",
-                        "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
-                        new String[] {"MULTIPOINT ((1 2), (2 4))", "MULTIPOINT ((2 4), (3 6))", "MULTIPOINT ((3 6), (4 8))"},
-                },
-        };
+        test(
+                "disjoint returns multipoint",
+                "MULTIPOINT ((1 2), (3 4))",
+                "POINT (1 2)", "POINT (3 4)");
     }
 
-    @DataProvider(name = "multilinestring")
-    public Object[][] multilinestring()
+    @Test
+    public void testLinestring()
     {
-        return new Object[][] {
-                {
-                        "identity",
-                        "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))",
-                        new String[] {"MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))", "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))", "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))"},
-                },
-                {
-                        "empty with non-empty",
-                        "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))",
-                        new String[] {"MULTILINESTRING EMPTY", "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))"},
-                },
-                {
-                        "disjoint",
-                        "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1), (3 5, 6 1), (4 5, 7 1))",
-                        new String[] {"MULTILINESTRING ((1 5, 4 1), (3 5, 6 1))", "MULTILINESTRING ((2 5, 5 1), (4 5, 7 1))"},
-                },
-                {
-                        "disjoint aggregates with cut through",
-                        "MULTILINESTRING ((2.5 3, 4 1), (3.5 3, 5 1), (4.5 3, 6 1), (5.5 3, 7 1), (1 3, 2.5 3), (2.5 3, 3.5 3), (1 5, 2.5 3), (3.5 3, 4.5 3), (2 5, 3.5 3), (4.5 3, 5.5 3), (3 5, 4.5 3), (5.5 3, 8 3), (4 5, 5.5 3))",
-                        new String[] {"MULTILINESTRING ((1 5, 4 1), (3 5, 6 1))", "MULTILINESTRING ((2 5, 5 1), (4 5, 7 1))", "LINESTRING (1 3, 8 3)"},
-                },
-        };
-    }
+        test(
+                "identity",
+                "LINESTRING (1 1, 2 2)",
+                "LINESTRING (1 1, 2 2)", "LINESTRING (1 1, 2 2)", "LINESTRING (1 1, 2 2)");
 
-    @DataProvider(name = "multipolygon")
-    public Object[][] multipolygon()
-    {
-        return new Object[][] {
-                {
-                        "identity",
-                        "MULTIPOLYGON (((4 2, 3 1, 5 1, 4 2)), ((14 12, 13 11, 15 11, 14 12)))",
-                        new String[] {"MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)), ((14 12, 15 11, 13 11, 14 12)))",
-                                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)), ((14 12, 15 11, 13 11, 14 12)))"},
-                },
-                {
-                        "empty with non-empty",
-                        "MULTIPOLYGON (((4 2, 3 1, 5 1, 4 2)), ((14 12, 13 11, 15 11, 14 12)))",
-                        new String[] {"MULTIPOLYGON EMPTY", "MULTIPOLYGON (((4 2, 5 1, 3 1, 4 2)), ((14 12, 15 11, 13 11, 14 12)))"},
-                },
-                {
-                        "disjoint",
-                        "MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((3 0, 5 0, 5 2, 3 2, 3 0)), ((0 3, 2 3, 2 5, 0 5, 0 3)), ((3 3, 5 3, 5 5, 3 5, 3 3)))",
-                        new String[] {"MULTIPOLYGON ((( 0 0, 0 2, 2 2, 2 0, 0 0 )), (( 0 3, 0 5, 2 5, 2 3, 0 3 )))",
-                                "MULTIPOLYGON ((( 3 0, 3 2, 5 2, 5 0, 3 0 )), (( 3 3, 3 5, 5 5, 5 3, 3 3 )))"},
-                },
-                {
-                        "overlapping multipolygons are simplified",
-                        "POLYGON ((1 1, 2 1, 3 1, 4 1, 5 1, 4 2, 3.5 1.5, 3 2, 2.5 1.5, 2 2, 1 1))",
-                        new String[] {"MULTIPOLYGON (((2 2, 3 1, 1 1, 2 2)), ((3 2, 4 1, 2 1, 3 2)))", "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))"},
-                },
-                {
-                        "overlapping multipolygons become single cross",
-                        "POLYGON ((3 1, 4 1, 4 3, 6 3, 6 4, 4 4, 4 6, 3 6, 3 4, 1 4, 1 3, 3 3, 3 1))",
-                        new String[] {"MULTIPOLYGON (((1 3, 1 4, 3 4, 3 3, 1 3)), ((3 3, 3 4, 4 4, 4 3, 3 3)), ((4 3, 4 4, 6 4, 6 3, 4 3)))",
-                                "MULTIPOLYGON (((3 1, 4 1, 4 3, 3 3, 3 1)), ((3 4, 3 6, 4 6, 4 4, 3 4)))"},
-                },
-        };
-    }
+        test(
+                "empty with non-empty",
+                "LINESTRING (1 1, 2 2)",
+                "LINESTRING EMPTY", "LINESTRING (1 1, 2 2)");
 
-    @DataProvider(name = "geometrycollection")
-    public Object[][] geometryCollection()
-    {
-        return new Object[][] {
-                {
-                        "identity",
-                        "MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((3 0, 5 0, 5 2, 3 2, 3 0)))",
-                        new String[] {"MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((3 0, 5 0, 5 2, 3 2, 3 0)))",
-                                "GEOMETRYCOLLECTION ( POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0)), POLYGON ((3 0, 5 0, 5 2, 3 2, 3 0)))",
-                                "GEOMETRYCOLLECTION ( POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0)), POLYGON ((3 0, 5 0, 5 2, 3 2, 3 0)))"},
-                },
-                {
-                        "empty collection with empty collection",
-                        "GEOMETRYCOLLECTION EMPTY",
-                        new String[] {"GEOMETRYCOLLECTION EMPTY",
-                                "GEOMETRYCOLLECTION EMPTY"},
-                },
-                {
-                        "empty with non-empty",
-                        "MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((3 0, 5 0, 5 2, 3 2, 3 0)))",
-                        new String[] {"GEOMETRYCOLLECTION EMPTY",
-                                "GEOMETRYCOLLECTION ( POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0)), POLYGON ((3 0, 5 0, 5 2, 3 2, 3 0)))"},
-                },
-                {
-                        "overlapping geometry collections are simplified",
-                        "POLYGON ((1 1, 2 1, 3 1, 4 1, 5 1, 4 2, 3.5 1.5, 3 2, 2.5 1.5, 2 2, 1 1))",
-                        new String[] {"GEOMETRYCOLLECTION ( POLYGON ((2 2, 3 1, 1 1, 2 2)), POLYGON ((3 2, 4 1, 2 1, 3 2)) )",
-                                "GEOMETRYCOLLECTION ( POLYGON ((4 2, 5 1, 3 1, 4 2)) )"},
-                },
-                {
-                        "disjoint geometry collection of polygons becomes multipolygon",
-                        "MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((3 0, 5 0, 5 2, 3 2, 3 0)), ((0 3, 2 3, 2 5, 0 5, 0 3)), ((3 3, 5 3, 5 5, 3 5, 3 3)))",
-                        new String[] {"GEOMETRYCOLLECTION ( POLYGON (( 0 0, 0 2, 2 2, 2 0, 0 0 )), POLYGON (( 0 3, 0 5, 2 5, 2 3, 0 3 )) )",
-                                "GEOMETRYCOLLECTION ( POLYGON (( 3 0, 3 2, 5 2, 5 0, 3 0 )), POLYGON (( 3 3, 3 5, 5 5, 5 3, 3 3 )) )"},
-                },
-                {
-                        "square with a line crossed becomes geometry collection",
-                        "GEOMETRYCOLLECTION (MULTILINESTRING ((0 2, 1 2), (3 2, 5 2)), POLYGON ((1 1, 3 1, 3 2, 3 3, 1 3, 1 2, 1 1)))",
-                        new String[] {"POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "LINESTRING (0 2, 5 2)"},
-                },
-                {
-                        "square with adjacent line becomes geometry collection",
-                        "GEOMETRYCOLLECTION (LINESTRING (0 5, 5 5), POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1)))",
-                        new String[] {"POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "LINESTRING (0 5, 5 5)"},
-                },
-                {
-                        "square with adjacent point becomes geometry collection",
-                        "GEOMETRYCOLLECTION (POINT (5 2), POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1)))",
-                        new String[] {"POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "POINT (5 2)"},
-                },
-        };
-    }
+        test(
+                "overlap",
+                "LINESTRING (1 1, 2 2, 3 3, 4 4)",
+                "LINESTRING (1 1, 2 2, 3 3)", "LINESTRING (2 2, 3 3, 4 4)");
 
-    @Test(dataProvider = "point")
-    public void testPoint(String testDescription, String expectedWkt, String... wkts)
-    {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkts);
-        assertArrayAggAndGeometryUnion(expectedWkt, wkts);
+        test(
+                "disjoint returns multistring",
+                "MULTILINESTRING ((1 1, 2 2, 3 3), (1 2, 2 3, 3 4))",
+                "LINESTRING (1 1, 2 2, 3 3)", "LINESTRING (1 2, 2 3, 3 4)");
+
+        test(
+                "cut through returns multistring",
+                "MULTILINESTRING ((1 1, 2 2), (3 1, 2 2), (2 2, 3 3), (2 2, 1 3))",
+                "LINESTRING (1 1, 3 3)", "LINESTRING (3 1, 1 3)");
     }
 
-    @Test(dataProvider = "linestring")
-    public void testLineString(String testDescription, String expectedWkt, String... wkts)
+    @Test
+    public void testPolygon()
     {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkts);
-        assertArrayAggAndGeometryUnion(expectedWkt, wkts);
+        test(
+                "identity",
+                "POLYGON ((2 2, 1 1, 3 1, 2 2))",
+                "POLYGON ((2 2, 1 1, 3 1, 2 2))", "POLYGON ((2 2, 1 1, 3 1, 2 2))", "POLYGON ((2 2, 1 1, 3 1, 2 2))");
+
+        test(
+                "empty with non-empty",
+                "POLYGON ((2 2, 1 1, 3 1, 2 2))",
+                "POLYGON EMPTY)", "POLYGON ((2 2, 1 1, 3 1, 2 2))");
+
+        test(
+                "three overlapping triangles",
+                "POLYGON ((1 1, 2 1, 3 1, 4 1, 5 1, 4 2, 3.5 1.5, 3 2, 2.5 1.5, 2 2, 1 1))",
+                "POLYGON ((2 2, 3 1, 1 1, 2 2))", "POLYGON ((3 2, 4 1, 2 1, 3 2))", "POLYGON ((4 2, 5 1, 3 1, 4 2))");
+
+        test(
+                "two triangles touching at 3 1 returns multipolygon",
+                "MULTIPOLYGON (((1 1, 3 1, 2 2, 1 1)), ((3 1, 5 1, 4 2, 3 1)))",
+                "POLYGON ((2 2, 3 1, 1 1, 2 2))", "POLYGON ((4 2, 5 1, 3 1, 4 2))");
+
+        test(
+                "two disjoint triangles returns multipolygon",
+                "MULTIPOLYGON (((1 1, 3 1, 2 2, 1 1)), ((4 1, 6 1, 5 2, 4 1)))",
+                "POLYGON ((2 2, 3 1, 1 1, 2 2))", "POLYGON ((5 2, 6 1, 4 1, 5 2))");
+
+        test(
+                "polygon with hole that is filled is simplified",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))", "POLYGON ((3 3, 4 3, 4 4, 3 4, 3 3))");
+
+        test(
+                "polygon with hole with shape larger than hole is simplified",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))", "POLYGON ((2 2, 5 2, 5 5, 2 5, 2 2))");
+
+        test(
+                "polygon with hole with shape smaller than hole becomes multipolygon",
+                "MULTIPOLYGON (((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 3 4, 4 4, 4 3, 3 3)), ((3.25 3.25, 3.75 3.25, 3.75 3.75, 3.25 3.75, 3.25 3.25)))",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))", "POLYGON ((3.25 3.25, 3.75 3.25, 3.75 3.75, 3.25 3.75, 3.25 3.25))");
+
+        test(
+                "polygon with hole with several smaller pieces which fill hole simplify into polygon",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1))",
+                "POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1), (3 3, 4 3, 4 4, 3 4, 3 3))", "POLYGON ((3 3, 3 3.5, 3.5 3.5, 3.5 3, 3 3))",
+                "POLYGON ((3.5 3.5, 3.5 4, 4 4, 4 3.5, 3.5 3.5))", "POLYGON ((3 3.5, 3 4, 3.5 4, 3.5 3.5, 3 3.5))",
+                "POLYGON ((3.5 3, 3.5 3.5, 4 3.5, 4 3, 3.5 3))");
+
+        test(
+                "two overlapping rectangles becomes cross",
+                "POLYGON ((3 1, 4 1, 4 3, 6 3, 6 4, 4 4, 4 6, 3 6, 3 4, 1 4, 1 3, 3 3, 3 1))",
+                "POLYGON ((1 3, 1 4, 6 4, 6 3, 1 3))", "POLYGON ((3 1, 4 1, 4 6, 3 6, 3 1))");
+
+        test(
+                "touching squares become single cross",
+                "POLYGON ((3 1, 4 1, 4 3, 6 3, 6 4, 4 4, 4 6, 3 6, 3 4, 1 4, 1 3, 3 3, 3 1))",
+                "POLYGON ((1 3, 1 4, 3 4, 3 3, 1 3))", "POLYGON ((3 3, 3 4, 4 4, 4 3, 3 3))", "POLYGON ((4 3, 4 4, 6 4, 6 3, 4 3))",
+                "POLYGON ((3 1, 4 1, 4 3, 3 3, 3 1))", "POLYGON ((3 4, 3 6, 4 6, 4 4, 3 4))");
+
+        test(
+                "square with touching point becomes simplified polygon",
+                "POLYGON ((1 1, 3 1, 3 2, 3 3, 1 3, 1 1))",
+                "POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "POINT (3 2)");
     }
 
-    @Test(dataProvider = "polygon")
-    public void testPolygon(String testDescription, String expectedWkt, String... wkts)
+    @Test
+    public void testMultipoint()
     {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkts);
-        assertArrayAggAndGeometryUnion(expectedWkt, wkts);
+        test(
+                "identity",
+                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
+                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))", "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))", "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))");
+
+        test(
+                "empty with non-empty",
+                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
+                "MULTIPOINT EMPTY", "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))");
+
+        test(
+                "disjoint",
+                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
+                "MULTIPOINT ((1 2), (2 4))", "MULTIPOINT ((3 6), (4 8))");
+
+        test(
+                "overlap",
+                "MULTIPOINT ((1 2), (2 4), (3 6), (4 8))",
+                "MULTIPOINT ((1 2), (2 4))", "MULTIPOINT ((2 4), (3 6))", "MULTIPOINT ((3 6), (4 8))");
     }
 
-    @Test(dataProvider = "multipoint")
-    public void testMultiPoint(String testDescription, String expectedWkt, String... wkts)
+    @Test
+    public void testMultilinestring()
     {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkts);
-        assertArrayAggAndGeometryUnion(expectedWkt, wkts);
+        test(
+                "identity",
+                "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))",
+                "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))", "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))", "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))");
+
+        test(
+                "empty with non-empty",
+                "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))",
+                "MULTILINESTRING EMPTY", "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1))");
+
+        test(
+                "disjoint",
+                "MULTILINESTRING ((1 5, 4 1), (2 5, 5 1), (3 5, 6 1), (4 5, 7 1))",
+                "MULTILINESTRING ((1 5, 4 1), (3 5, 6 1))", "MULTILINESTRING ((2 5, 5 1), (4 5, 7 1))");
+
+        test(
+                "disjoint aggregates with cut through",
+                "MULTILINESTRING ((2.5 3, 4 1), (3.5 3, 5 1), (4.5 3, 6 1), (5.5 3, 7 1), (1 3, 2.5 3), (2.5 3, 3.5 3), (1 5, 2.5 3), (3.5 3, 4.5 3), (2 5, 3.5 3), (4.5 3, 5.5 3), (3 5, 4.5 3), (5.5 3, 8 3), (4 5, 5.5 3))",
+                "MULTILINESTRING ((1 5, 4 1), (3 5, 6 1))", "MULTILINESTRING ((2 5, 5 1), (4 5, 7 1))", "LINESTRING (1 3, 8 3)");
     }
 
-    @Test(dataProvider = "multilinestring")
-    public void testMultiLineString(String testDescription, String expectedWkt, String... wkts)
+    @Test
+    public void testMultipolygon()
     {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkts);
-        assertArrayAggAndGeometryUnion(expectedWkt, wkts);
+        test(
+                "identity",
+                "MULTIPOLYGON (((4 2, 3 1, 5 1, 4 2)), ((14 12, 13 11, 15 11, 14 12)))",
+                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)), ((14 12, 15 11, 13 11, 14 12)))",
+                "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)), ((14 12, 15 11, 13 11, 14 12)))");
+
+        test(
+                "empty with non-empty",
+                "MULTIPOLYGON (((4 2, 3 1, 5 1, 4 2)), ((14 12, 13 11, 15 11, 14 12)))",
+                "MULTIPOLYGON EMPTY", "MULTIPOLYGON (((4 2, 5 1, 3 1, 4 2)), ((14 12, 15 11, 13 11, 14 12)))");
+
+        test(
+                "disjoint",
+                "MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((3 0, 5 0, 5 2, 3 2, 3 0)), ((0 3, 2 3, 2 5, 0 5, 0 3)), ((3 3, 5 3, 5 5, 3 5, 3 3)))",
+                "MULTIPOLYGON ((( 0 0, 0 2, 2 2, 2 0, 0 0 )), (( 0 3, 0 5, 2 5, 2 3, 0 3 )))",
+                "MULTIPOLYGON ((( 3 0, 3 2, 5 2, 5 0, 3 0 )), (( 3 3, 3 5, 5 5, 5 3, 3 3 )))");
+
+        test(
+                "overlapping multipolygons are simplified",
+                "POLYGON ((1 1, 2 1, 3 1, 4 1, 5 1, 4 2, 3.5 1.5, 3 2, 2.5 1.5, 2 2, 1 1))",
+                "MULTIPOLYGON (((2 2, 3 1, 1 1, 2 2)), ((3 2, 4 1, 2 1, 3 2)))", "MULTIPOLYGON(((4 2, 5 1, 3 1, 4 2)))");
+
+        test(
+                "overlapping multipolygons become single cross",
+                "POLYGON ((3 1, 4 1, 4 3, 6 3, 6 4, 4 4, 4 6, 3 6, 3 4, 1 4, 1 3, 3 3, 3 1))",
+                "MULTIPOLYGON (((1 3, 1 4, 3 4, 3 3, 1 3)), ((3 3, 3 4, 4 4, 4 3, 3 3)), ((4 3, 4 4, 6 4, 6 3, 4 3)))",
+                "MULTIPOLYGON (((3 1, 4 1, 4 3, 3 3, 3 1)), ((3 4, 3 6, 4 6, 4 4, 3 4)))");
     }
 
-    @Test(dataProvider = "multipolygon")
-    public void testMultiPolygon(String testDescription, String expectedWkt, String... wkts)
+    @Test
+    public void testGeometryCollection()
     {
-        assertAggregatedGeometries(testDescription, expectedWkt, wkts);
-        assertArrayAggAndGeometryUnion(expectedWkt, wkts);
+        test(
+                "identity",
+                "MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((3 0, 5 0, 5 2, 3 2, 3 0)))",
+                "MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((3 0, 5 0, 5 2, 3 2, 3 0)))",
+                "GEOMETRYCOLLECTION ( POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0)), POLYGON ((3 0, 5 0, 5 2, 3 2, 3 0)))",
+                "GEOMETRYCOLLECTION ( POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0)), POLYGON ((3 0, 5 0, 5 2, 3 2, 3 0)))");
+
+        test(
+                "empty collection with empty collection",
+                "GEOMETRYCOLLECTION EMPTY",
+                "GEOMETRYCOLLECTION EMPTY",
+                "GEOMETRYCOLLECTION EMPTY");
+
+        test(
+                "empty with non-empty",
+                "MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((3 0, 5 0, 5 2, 3 2, 3 0)))",
+                "GEOMETRYCOLLECTION EMPTY",
+                "GEOMETRYCOLLECTION ( POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0)), POLYGON ((3 0, 5 0, 5 2, 3 2, 3 0)))");
+
+        test(
+                "overlapping geometry collections are simplified",
+                "POLYGON ((1 1, 2 1, 3 1, 4 1, 5 1, 4 2, 3.5 1.5, 3 2, 2.5 1.5, 2 2, 1 1))",
+                "GEOMETRYCOLLECTION ( POLYGON ((2 2, 3 1, 1 1, 2 2)), POLYGON ((3 2, 4 1, 2 1, 3 2)) )",
+                "GEOMETRYCOLLECTION ( POLYGON ((4 2, 5 1, 3 1, 4 2)) )");
+
+        test(
+                "disjoint geometry collection of polygons becomes multipolygon",
+                "MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((3 0, 5 0, 5 2, 3 2, 3 0)), ((0 3, 2 3, 2 5, 0 5, 0 3)), ((3 3, 5 3, 5 5, 3 5, 3 3)))",
+                "GEOMETRYCOLLECTION ( POLYGON (( 0 0, 0 2, 2 2, 2 0, 0 0 )), POLYGON (( 0 3, 0 5, 2 5, 2 3, 0 3 )) )",
+                "GEOMETRYCOLLECTION ( POLYGON (( 3 0, 3 2, 5 2, 5 0, 3 0 )), POLYGON (( 3 3, 3 5, 5 5, 5 3, 3 3 )) )");
+
+        test(
+                "square with a line crossed becomes geometry collection",
+                "GEOMETRYCOLLECTION (MULTILINESTRING ((0 2, 1 2), (3 2, 5 2)), POLYGON ((1 1, 3 1, 3 2, 3 3, 1 3, 1 2, 1 1)))",
+                "POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "LINESTRING (0 2, 5 2)");
+
+        test(
+                "square with adjacent line becomes geometry collection",
+                "GEOMETRYCOLLECTION (LINESTRING (0 5, 5 5), POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1)))",
+                "POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "LINESTRING (0 5, 5 5)");
+
+        test(
+                "square with adjacent point becomes geometry collection",
+                "GEOMETRYCOLLECTION (POINT (5 2), POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1)))",
+                "POLYGON ((1 1, 3 1, 3 3, 1 3, 1 1))", "POINT (5 2)");
     }
 
-    @Test(dataProvider = "geometrycollection")
-    public void testGeometryCollection(String testDescription, String expectedWkt, String... wkts)
+    private void test(String testDescription, String expectedWkt, String... wkts)
     {
         assertAggregatedGeometries(testDescription, expectedWkt, wkts);
         assertArrayAggAndGeometryUnion(expectedWkt, wkts);
diff --git a/plugin/trino-google-sheets/pom.xml b/plugin/trino-google-sheets/pom.xml
index 92b6f5db2d09..2dd5d2aa95b1 100644
--- a/plugin/trino-google-sheets/pom.xml
+++ b/plugin/trino-google-sheets/pom.xml
@@ -1,58 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-google-sheets</artifactId>
-    <description>Trino - Google Sheets Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Google Sheets Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-        </dependency>
-
-        <!-- gsheets deps -->
         <dependency>
             <groupId>com.google.api-client</groupId>
             <artifactId>google-api-client</artifactId>
@@ -83,7 +47,7 @@
         <dependency>
             <groupId>com.google.http-client</groupId>
             <artifactId>google-http-client</artifactId>
-            <version>1.35.0</version>
+            <version>1.43.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -106,37 +70,52 @@
         <dependency>
             <groupId>com.google.oauth-client</groupId>
             <artifactId>google-oauth-client</artifactId>
-            <version>1.31.0</version>
+            <version>1.33.3</version>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>bootstrap</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <artifactId>json</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>node</artifactId>
-            <scope>runtime</scope>
+            <artifactId>log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <artifactId>trino-cache</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -147,8 +126,20 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -158,17 +149,16 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
-            <scope>test</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing</artifactId>
-            <scope>test</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>node</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -177,12 +167,36 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>testing</artifactId>
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-tpch</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -191,13 +205,13 @@
 
         <dependency>
             <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-servlet-api</artifactId>
+            <artifactId>jetty-jakarta-servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsClient.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsClient.java
index 3ace4b901d43..c21b8d114b2b 100644
--- a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsClient.java
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsClient.java
@@ -20,21 +20,22 @@
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.sheets.v4.Sheets;
 import com.google.api.services.sheets.v4.SheetsScopes;
+import com.google.api.services.sheets.v4.model.ValueRange;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
-import io.airlift.units.Duration;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.EvictableCacheBuilder;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.VarcharType;
 
-import javax.inject.Inject;
-
 import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -51,8 +52,9 @@
 import static com.google.api.client.googleapis.javanet.GoogleNetHttpTransport.newTrustedTransport;
 import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.plugin.google.sheets.SheetsErrorCode.SHEETS_BAD_CREDENTIALS_ERROR;
+import static io.trino.plugin.google.sheets.SheetsErrorCode.SHEETS_INSERT_ERROR;
 import static io.trino.plugin.google.sheets.SheetsErrorCode.SHEETS_METASTORE_ERROR;
 import static io.trino.plugin.google.sheets.SheetsErrorCode.SHEETS_TABLE_LOAD_ERROR;
 import static io.trino.plugin.google.sheets.SheetsErrorCode.SHEETS_UNKNOWN_TABLE_ERROR;
@@ -70,10 +72,13 @@ public class SheetsClient
     private static final String APPLICATION_NAME = "trino google sheets integration";
     private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
 
-    private static final List<String> SCOPES = ImmutableList.of(SheetsScopes.SPREADSHEETS_READONLY);
+    private static final List<String> SCOPES = ImmutableList.of(SheetsScopes.SPREADSHEETS);
+
+    private static final String INSERT_VALUE_OPTION = "RAW";
+    private static final String INSERT_DATA_OPTION = "INSERT_ROWS";
 
     private final NonEvictableLoadingCache<String, Optional<String>> tableSheetMappingCache;
-    private final NonEvictableLoadingCache<String, List<List<Object>>> sheetDataCache;
+    private final LoadingCache<String, List<List<Object>>> sheetDataCache;
 
     private final Optional<String> metadataSheetId;
 
@@ -87,7 +92,7 @@ public SheetsClient(SheetsConfig config, JsonCodec<Map<String, List<SheetsTable>
         this.metadataSheetId = config.getMetadataSheetId();
 
         try {
-            this.sheetsService = new Sheets.Builder(newTrustedTransport(), JSON_FACTORY, setTimeout(getCredentials(config), config.getReadTimeout())).setApplicationName(APPLICATION_NAME).build();
+            this.sheetsService = new Sheets.Builder(newTrustedTransport(), JSON_FACTORY, setTimeout(getCredentials(config), config)).setApplicationName(APPLICATION_NAME).build();
         }
         catch (GeneralSecurityException | IOException e) {
             throw new TrinoException(SHEETS_BAD_CREDENTIALS_ERROR, e);
@@ -96,7 +101,7 @@ public SheetsClient(SheetsConfig config, JsonCodec<Map<String, List<SheetsTable>
         long maxCacheSize = config.getSheetsDataMaxCacheSize();
 
         this.tableSheetMappingCache = buildNonEvictableCache(
-                newCacheBuilder(expiresAfterWriteMillis, maxCacheSize),
+                CacheBuilder.newBuilder().expireAfterWrite(expiresAfterWriteMillis, MILLISECONDS).maximumSize(maxCacheSize),
                 new CacheLoader<>()
                 {
                     @Override
@@ -112,9 +117,10 @@ public Map<String, Optional<String>> loadAll(Iterable<? extends String> tableLis
                     }
                 });
 
-        this.sheetDataCache = buildNonEvictableCache(
-                newCacheBuilder(expiresAfterWriteMillis, maxCacheSize),
-                CacheLoader.from(this::readAllValuesFromSheetExpression));
+        this.sheetDataCache = EvictableCacheBuilder.newBuilder()
+                .expireAfterWrite(expiresAfterWriteMillis, MILLISECONDS)
+                .maximumSize(maxCacheSize)
+                .build(CacheLoader.from(this::readAllValuesFromSheetExpression));
     }
 
     public Optional<SheetsTable> getTable(SheetsConnectorTableHandle tableHandle)
@@ -182,8 +188,7 @@ public Set<String> getTableNames()
     public List<List<Object>> readAllValues(String tableName)
     {
         try {
-            String sheetExpression = tableSheetMappingCache.getUnchecked(tableName)
-                    .orElseThrow(() -> new TrinoException(SHEETS_UNKNOWN_TABLE_ERROR, "Sheet expression not found for table " + tableName));
+            String sheetExpression = getCachedSheetExpressionForTable(tableName);
             return readAllValuesFromSheet(sheetExpression);
         }
         catch (UncheckedExecutionException e) {
@@ -203,6 +208,27 @@ public List<List<Object>> readAllValuesFromSheet(String sheetExpression)
         }
     }
 
+    public void insertIntoSheet(String sheetExpression, List<List<Object>> rows)
+    {
+        ValueRange body = new ValueRange().setValues(rows);
+        SheetsSheetIdAndRange sheetIdAndRange = new SheetsSheetIdAndRange(sheetExpression);
+        try {
+            sheetsService.spreadsheets().values().append(sheetIdAndRange.getSheetId(), sheetIdAndRange.getRange(), body)
+                    .setValueInputOption(INSERT_VALUE_OPTION)
+                    .setInsertDataOption(INSERT_DATA_OPTION)
+                    .execute();
+        }
+        catch (IOException e) {
+            throw new TrinoException(SHEETS_INSERT_ERROR, "Error inserting data to sheet: ", e);
+        }
+
+        // Flush the cache contents for the table that was written to.
+        // This is a best-effort solution, since the Google Sheets API seems to be eventually consistent.
+        // If the table written to will be queried directly afterward the inserts might not have been propagated yet.
+        // and the users needs to wait till the cached version alters out.
+        sheetDataCache.invalidate(sheetExpression);
+    }
+
     public static List<List<String>> convertToStringValues(List<List<Object>> values)
     {
         return values.stream()
@@ -219,6 +245,12 @@ private Optional<String> getSheetExpressionForTable(String tableName)
         return tableSheetMap.get(tableName);
     }
 
+    public String getCachedSheetExpressionForTable(String tableName)
+    {
+        return tableSheetMappingCache.getUnchecked(tableName)
+                .orElseThrow(() -> new TrinoException(SHEETS_UNKNOWN_TABLE_ERROR, "Sheet expression not found for table " + tableName));
+    }
+
     private Map<String, Optional<String>> getAllTableSheetExpressionMapping()
     {
         if (metadataSheetId.isEmpty()) {
@@ -291,17 +323,17 @@ private List<List<Object>> readAllValuesFromSheetExpression(String sheetExpressi
         }
     }
 
-    private static CacheBuilder<Object, Object> newCacheBuilder(long expiresAfterWriteMillis, long maximumSize)
+    private HttpRequestInitializer setTimeout(HttpRequestInitializer requestInitializer, SheetsConfig config)
     {
-        return CacheBuilder.newBuilder().expireAfterWrite(expiresAfterWriteMillis, MILLISECONDS).maximumSize(maximumSize);
-    }
+        requireNonNull(config.getConnectionTimeout(), "connectionTimeout is null");
+        requireNonNull(config.getReadTimeout(), "readTimeout is null");
+        requireNonNull(config.getWriteTimeout(), "writeTimeout is null");
 
-    private static HttpRequestInitializer setTimeout(HttpRequestInitializer requestInitializer, Duration readTimeout)
-    {
-        requireNonNull(readTimeout, "readTimeout is null");
         return httpRequest -> {
             requestInitializer.initialize(httpRequest);
-            httpRequest.setReadTimeout(toIntExact(readTimeout.toMillis()));
+            httpRequest.setConnectTimeout(toIntExact(config.getConnectionTimeout().toMillis()));
+            httpRequest.setReadTimeout(toIntExact(config.getReadTimeout().toMillis()));
+            httpRequest.setWriteTimeout(toIntExact(config.getWriteTimeout().toMillis()));
         };
     }
 }
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConfig.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConfig.java
index a35d8311d68e..497c38c8e960 100644
--- a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConfig.java
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConfig.java
@@ -20,10 +20,9 @@
 import io.airlift.configuration.validation.FileExists;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -35,7 +34,10 @@ public class SheetsConfig
     private Optional<String> metadataSheetId = Optional.empty();
     private int sheetsDataMaxCacheSize = 1000;
     private Duration sheetsDataExpireAfterWrite = new Duration(5, TimeUnit.MINUTES);
-    private Duration readTimeout = new Duration(20, TimeUnit.SECONDS); // 20s is the default timeout of com.google.api.client.http.HttpRequest
+    // 20s is the default timeout of com.google.api.client.http.HttpRequest
+    private Duration connectionTimeout = new Duration(20, TimeUnit.SECONDS);
+    private Duration readTimeout = new Duration(20, TimeUnit.SECONDS);
+    private Duration writeTimeout = new Duration(20, TimeUnit.SECONDS);
 
     @AssertTrue(message = "Exactly one of 'gsheets.credentials-key' or 'gsheets.credentials-path' must be specified")
     public boolean isCredentialsConfigurationValid()
@@ -118,6 +120,20 @@ public SheetsConfig setSheetsDataExpireAfterWrite(Duration sheetsDataExpireAfter
         return this;
     }
 
+    @MinDuration("0ms")
+    public Duration getConnectionTimeout()
+    {
+        return connectionTimeout;
+    }
+
+    @Config("gsheets.connection-timeout")
+    @ConfigDescription("Timeout when connection to Google Sheets API")
+    public SheetsConfig setConnectionTimeout(Duration connectionTimeout)
+    {
+        this.connectionTimeout = connectionTimeout;
+        return this;
+    }
+
     @MinDuration("0ms")
     public Duration getReadTimeout()
     {
@@ -125,9 +141,24 @@ public Duration getReadTimeout()
     }
 
     @Config("gsheets.read-timeout")
+    @ConfigDescription("Timeout when reading from Google Sheets API")
     public SheetsConfig setReadTimeout(Duration readTimeout)
     {
         this.readTimeout = readTimeout;
         return this;
     }
+
+    @MinDuration("0ms")
+    public Duration getWriteTimeout()
+    {
+        return writeTimeout;
+    }
+
+    @Config("gsheets.write-timeout")
+    @ConfigDescription("Timeout when writing to Google Sheets API")
+    public SheetsConfig setWriteTimeout(Duration writeTimeout)
+    {
+        this.writeTimeout = writeTimeout;
+        return this;
+    }
 }
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConnector.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConnector.java
index 166d0f426408..c96155eef701 100644
--- a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConnector.java
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConnector.java
@@ -14,18 +14,18 @@
 package io.trino.plugin.google.sheets;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
+import io.trino.spi.connector.ConnectorPageSinkProvider;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.Set;
 
 import static io.trino.plugin.google.sheets.SheetsTransactionHandle.INSTANCE;
@@ -38,6 +38,7 @@ public class SheetsConnector
     private final SheetsMetadata metadata;
     private final SheetsSplitManager splitManager;
     private final SheetsRecordSetProvider recordSetProvider;
+    private final SheetsPageSinkProvider pageSinkProvider;
     private final Set<ConnectorTableFunction> connectorTableFunctions;
 
     @Inject
@@ -46,12 +47,14 @@ public SheetsConnector(
             SheetsMetadata metadata,
             SheetsSplitManager splitManager,
             SheetsRecordSetProvider recordSetProvider,
+            SheetsPageSinkProvider pageSinkProvider,
             Set<ConnectorTableFunction> connectorTableFunctions)
     {
         this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null");
         this.metadata = requireNonNull(metadata, "metadata is null");
         this.splitManager = requireNonNull(splitManager, "splitManager is null");
         this.recordSetProvider = requireNonNull(recordSetProvider, "recordSetProvider is null");
+        this.pageSinkProvider = requireNonNull(pageSinkProvider, "pageSinkProvider is null");
         this.connectorTableFunctions = ImmutableSet.copyOf(requireNonNull(connectorTableFunctions, "connectorTableFunctions is null"));
     }
 
@@ -79,12 +82,24 @@ public ConnectorRecordSetProvider getRecordSetProvider()
         return recordSetProvider;
     }
 
+    @Override
+    public ConnectorPageSinkProvider getPageSinkProvider()
+    {
+        return pageSinkProvider;
+    }
+
     @Override
     public Set<ConnectorTableFunction> getTableFunctions()
     {
         return connectorTableFunctions;
     }
 
+    @Override
+    public boolean isSingleStatementWritesOnly()
+    {
+        return true;
+    }
+
     @Override
     public final void shutdown()
     {
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConnectorFactory.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConnectorFactory.java
index 80af7eea21e7..48f42250d0b8 100644
--- a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConnectorFactory.java
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConnectorFactory.java
@@ -23,7 +23,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class SheetsConnectorFactory
@@ -39,7 +39,7 @@ public String getName()
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
         requireNonNull(config, "config is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 new JsonModule(),
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConnectorInsertTableHandle.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConnectorInsertTableHandle.java
new file mode 100644
index 000000000000..bfcbb157e840
--- /dev/null
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsConnectorInsertTableHandle.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed 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 io.trino.plugin.google.sheets;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableList;
+import io.trino.spi.connector.ConnectorInsertTableHandle;
+
+import java.util.List;
+
+import static java.util.Objects.requireNonNull;
+
+public class SheetsConnectorInsertTableHandle
+        implements ConnectorInsertTableHandle
+{
+    private final String tableName;
+    private final List<SheetsColumnHandle> columns;
+
+    @JsonCreator
+    public SheetsConnectorInsertTableHandle(
+            @JsonProperty("tableName") String tableName,
+            @JsonProperty("columns") List<SheetsColumnHandle> columns)
+    {
+        this.tableName = requireNonNull(tableName, "tableName is null");
+        this.columns = ImmutableList.copyOf(requireNonNull(columns, "columns is null"));
+    }
+
+    @JsonProperty
+    public String getTableName()
+    {
+        return tableName;
+    }
+
+    @JsonProperty
+    public List<SheetsColumnHandle> getColumns()
+    {
+        return columns;
+    }
+}
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsErrorCode.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsErrorCode.java
index 00871e4530f1..8a760ac1c542 100644
--- a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsErrorCode.java
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsErrorCode.java
@@ -27,7 +27,9 @@ public enum SheetsErrorCode
     SHEETS_BAD_CREDENTIALS_ERROR(0, EXTERNAL),
     SHEETS_METASTORE_ERROR(1, EXTERNAL),
     SHEETS_UNKNOWN_TABLE_ERROR(2, USER_ERROR),
-    SHEETS_TABLE_LOAD_ERROR(3, INTERNAL_ERROR);
+    SHEETS_TABLE_LOAD_ERROR(3, INTERNAL_ERROR),
+    SHEETS_INSERT_ERROR(4, INTERNAL_ERROR),
+    /**/;
 
     private final ErrorCode errorCode;
 
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsMetadata.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsMetadata.java
index eb7fce10e248..75b745537c14 100644
--- a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsMetadata.java
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsMetadata.java
@@ -15,22 +15,28 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
+import io.airlift.slice.Slice;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
-import io.trino.spi.connector.ColumnSchema;
+import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorMetadata;
+import io.trino.spi.connector.ConnectorOutputMetadata;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.ConnectorTableMetadata;
-import io.trino.spi.connector.ConnectorTableSchema;
+import io.trino.spi.connector.ConnectorTableProperties;
+import io.trino.spi.connector.RetryMode;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.connector.TableFunctionApplicationResult;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-
-import javax.inject.Inject;
+import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.statistics.ComputedStatistics;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -40,6 +46,9 @@
 import static io.trino.plugin.google.sheets.SheetsConnectorTableHandle.tableNotFound;
 import static io.trino.plugin.google.sheets.SheetsErrorCode.SHEETS_UNKNOWN_TABLE_ERROR;
 import static io.trino.plugin.google.sheets.ptf.Sheet.SheetFunctionHandle;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.connector.RetryMode.NO_RETRIES;
+import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class SheetsMetadata
@@ -133,6 +142,12 @@ private Optional<ConnectorTableMetadata> getTableMetadata(SchemaTableName tableN
         return Optional.empty();
     }
 
+    @Override
+    public ConnectorTableProperties getTableProperties(ConnectorSession session, ConnectorTableHandle table)
+    {
+        return new ConnectorTableProperties();
+    }
+
     @Override
     public List<SchemaTableName> listTables(ConnectorSession session, Optional<String> schemaName)
     {
@@ -152,6 +167,33 @@ public ColumnMetadata getColumnMetadata(ConnectorSession session, ConnectorTable
         return ((SheetsColumnHandle) columnHandle).getColumnMetadata();
     }
 
+    @Override
+    public ConnectorInsertTableHandle beginInsert(ConnectorSession session, ConnectorTableHandle tableHandle, List<ColumnHandle> columns, RetryMode retryMode)
+    {
+        if (retryMode != NO_RETRIES) {
+            throw new TrinoException(NOT_SUPPORTED, "This connector does not support query retries");
+        }
+
+        if (!(tableHandle instanceof SheetsNamedTableHandle namedTableHandle)) {
+            throw new TrinoException(NOT_SUPPORTED, format("Can only insert into named tables. Found table handle type: %s", tableHandle));
+        }
+
+        SheetsTable table = sheetsClient.getTable(namedTableHandle.getTableName())
+                .orElseThrow(() -> new TableNotFoundException(namedTableHandle.getSchemaTableName()));
+
+        List<SheetsColumnHandle> columnHandles = new ArrayList<>(table.getColumnsMetadata().size());
+        for (int id = 0; id < table.getColumnsMetadata().size(); id++) {
+            columnHandles.add(new SheetsColumnHandle(table.getColumnsMetadata().get(id).getName(), table.getColumnsMetadata().get(id).getType(), id));
+        }
+        return new SheetsConnectorInsertTableHandle(namedTableHandle.getTableName(), columnHandles);
+    }
+
+    @Override
+    public Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session, ConnectorInsertTableHandle insertHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    {
+        return Optional.empty();
+    }
+
     @Override
     public Optional<TableFunctionApplicationResult<ConnectorTableHandle>> applyTableFunction(ConnectorSession session, ConnectorTableFunctionHandle handle)
     {
@@ -160,13 +202,7 @@ public Optional<TableFunctionApplicationResult<ConnectorTableHandle>> applyTable
         }
 
         ConnectorTableHandle tableHandle = ((SheetFunctionHandle) handle).getTableHandle();
-        ConnectorTableSchema tableSchema = getTableSchema(session, tableHandle);
-        Map<String, ColumnHandle> columnHandlesByName = getColumnHandles(session, tableHandle);
-        List<ColumnHandle> columnHandles = tableSchema.getColumns().stream()
-                .map(ColumnSchema::getName)
-                .map(columnHandlesByName::get)
-                .collect(toImmutableList());
-
+        List<ColumnHandle> columnHandles = ImmutableList.copyOf(getColumnHandles(session, tableHandle).values());
         return Optional.of(new TableFunctionApplicationResult<>(tableHandle, columnHandles));
     }
 
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsModule.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsModule.java
index 3353ed2ecf9f..f9609261107d 100644
--- a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsModule.java
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsModule.java
@@ -17,7 +17,7 @@
 import com.google.inject.Module;
 import com.google.inject.Scopes;
 import io.trino.plugin.google.sheets.ptf.Sheet;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static io.airlift.configuration.ConfigBinder.configBinder;
@@ -35,6 +35,7 @@ public void configure(Binder binder)
         binder.bind(SheetsClient.class).in(Scopes.SINGLETON);
         binder.bind(SheetsSplitManager.class).in(Scopes.SINGLETON);
         binder.bind(SheetsRecordSetProvider.class).in(Scopes.SINGLETON);
+        binder.bind(SheetsPageSinkProvider.class).in(Scopes.SINGLETON);
 
         configBinder(binder).bindConfig(SheetsConfig.class);
 
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsNamedTableHandle.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsNamedTableHandle.java
index ea015b98c0f6..c4bbf4c5b7c0 100644
--- a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsNamedTableHandle.java
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsNamedTableHandle.java
@@ -54,6 +54,11 @@ public int hashCode()
         return Objects.hash(schemaTableName);
     }
 
+    public SchemaTableName getSchemaTableName()
+    {
+        return schemaTableName;
+    }
+
     @Override
     public boolean equals(Object obj)
     {
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsPageSink.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsPageSink.java
new file mode 100644
index 000000000000..7b8d3ca35d34
--- /dev/null
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsPageSink.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed 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 io.trino.plugin.google.sheets;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.slice.Slice;
+import io.trino.spi.Page;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.connector.ConnectorPageSink;
+import io.trino.spi.type.Type;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.CompletableFuture.completedFuture;
+
+public class SheetsPageSink
+        implements ConnectorPageSink
+{
+    private final SheetsClient sheetsClient;
+    private final String tableName;
+    private final List<SheetsColumnHandle> columns;
+
+    public SheetsPageSink(SheetsClient sheetsClient, String tableName, List<SheetsColumnHandle> columns)
+    {
+        this.sheetsClient = requireNonNull(sheetsClient, "sheetsClient is null");
+        this.tableName = requireNonNull(tableName, "tableName is null");
+        this.columns = ImmutableList.copyOf(requireNonNull(columns, "columns is null"));
+    }
+
+    @Override
+    public CompletableFuture<?> appendPage(Page page)
+    {
+        String sheetExpression = sheetsClient.getCachedSheetExpressionForTable(tableName);
+        List<List<Object>> rows = new ArrayList<>();
+        for (int position = 0; position < page.getPositionCount(); position++) {
+            List<Object> row = new ArrayList<>();
+            for (int channel = 0; channel < page.getChannelCount(); channel++) {
+                row.add(getObjectValue(columns.get(channel).getColumnType(), page.getBlock(channel), position));
+            }
+            rows.add(row);
+        }
+        sheetsClient.insertIntoSheet(sheetExpression, rows);
+        return NOT_BLOCKED;
+    }
+
+    private String getObjectValue(Type type, Block block, int position)
+    {
+        if (type.equals(VARCHAR)) {
+            return type.getSlice(block, position).toStringUtf8();
+        }
+        throw new TrinoException(NOT_SUPPORTED, "Unsupported type " + type + " when writing to Google sheets tables");
+    }
+
+    @Override
+    public CompletableFuture<Collection<Slice>> finish()
+    {
+        return completedFuture(ImmutableList.of());
+    }
+
+    @Override
+    public void abort() {}
+}
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsPageSinkProvider.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsPageSinkProvider.java
new file mode 100644
index 000000000000..60e9aee49a44
--- /dev/null
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsPageSinkProvider.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed 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 io.trino.plugin.google.sheets;
+
+import com.google.inject.Inject;
+import io.trino.spi.connector.ConnectorInsertTableHandle;
+import io.trino.spi.connector.ConnectorOutputTableHandle;
+import io.trino.spi.connector.ConnectorPageSink;
+import io.trino.spi.connector.ConnectorPageSinkId;
+import io.trino.spi.connector.ConnectorPageSinkProvider;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorTransactionHandle;
+
+import static java.util.Objects.requireNonNull;
+
+public class SheetsPageSinkProvider
+        implements ConnectorPageSinkProvider
+{
+    private final SheetsClient sheetsClient;
+
+    @Inject
+    public SheetsPageSinkProvider(SheetsClient sheetsClient)
+    {
+        this.sheetsClient = requireNonNull(sheetsClient, "sheetsClient is null");
+    }
+
+    @Override
+    public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorOutputTableHandle outputTableHandle, ConnectorPageSinkId pageSinkId)
+    {
+        throw new UnsupportedOperationException("Google Sheets connector does not support creating page sinks using a ConnectorOutputTableHandle");
+    }
+
+    @Override
+    public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorInsertTableHandle insertTableHandle, ConnectorPageSinkId pageSinkId)
+    {
+        SheetsConnectorInsertTableHandle handle = (SheetsConnectorInsertTableHandle) insertTableHandle;
+        return new SheetsPageSink(sheetsClient, handle.getTableName(), handle.getColumns());
+    }
+}
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsSheetIdAndRange.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsSheetIdAndRange.java
new file mode 100644
index 000000000000..53f400a89d43
--- /dev/null
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsSheetIdAndRange.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed 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 io.trino.plugin.google.sheets;
+
+public class SheetsSheetIdAndRange
+{
+    // By default, loading up to 10k rows from the first tab of the sheet
+    private static final String DEFAULT_RANGE = "$1:$10000";
+    private static final String DELIMITER_HASH = "#";
+
+    private final String sheetId;
+    private final String range;
+
+    public SheetsSheetIdAndRange(String sheetExpression)
+    {
+        String[] tableOptions = sheetExpression.split(DELIMITER_HASH);
+        this.sheetId = tableOptions[0];
+        if (tableOptions.length > 1) {
+            this.range = tableOptions[1];
+        }
+        else {
+            this.range = DEFAULT_RANGE;
+        }
+    }
+
+    public String getSheetId()
+    {
+        return sheetId;
+    }
+
+    public String getRange()
+    {
+        return range;
+    }
+}
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsSplit.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsSplit.java
index 09a4db35c686..738e11639241 100644
--- a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsSplit.java
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsSplit.java
@@ -22,11 +22,9 @@
 import io.trino.spi.connector.ConnectorSplit;
 
 import java.util.List;
-import java.util.Optional;
 
 import static io.airlift.slice.SizeOf.estimatedSizeOf;
 import static io.airlift.slice.SizeOf.instanceSize;
-import static io.airlift.slice.SizeOf.sizeOf;
 import static java.util.Objects.requireNonNull;
 
 public class SheetsSplit
@@ -34,42 +32,13 @@ public class SheetsSplit
 {
     private static final int INSTANCE_SIZE = instanceSize(SheetsSplit.class);
 
-    private final Optional<String> schemaName;
-    private final Optional<String> tableName;
-    private final Optional<String> sheetExpression;
     private final List<List<String>> values;
-    private final List<HostAddress> hostAddresses;
 
     @JsonCreator
     public SheetsSplit(
-            @JsonProperty("schemaName") Optional<String> schemaName,
-            @JsonProperty("tableName") Optional<String> tableName,
-            @JsonProperty("sheetExpression") Optional<String> sheetExpression,
             @JsonProperty("values") List<List<String>> values)
     {
-        this.schemaName = requireNonNull(schemaName, "schemaName is null");
-        this.tableName = requireNonNull(tableName, "tableName is null");
-        this.sheetExpression = requireNonNull(sheetExpression, "sheetExpression is null");
         this.values = requireNonNull(values, "values is null");
-        this.hostAddresses = ImmutableList.of();
-    }
-
-    @JsonProperty
-    public Optional<String> getSchemaName()
-    {
-        return schemaName;
-    }
-
-    @JsonProperty
-    public Optional<String> getTableName()
-    {
-        return tableName;
-    }
-
-    @JsonProperty
-    public Optional<String> getSheetExpression()
-    {
-        return sheetExpression;
     }
 
     @JsonProperty
@@ -87,17 +56,13 @@ public boolean isRemotelyAccessible()
     @Override
     public List<HostAddress> getAddresses()
     {
-        return hostAddresses;
+        return ImmutableList.of();
     }
 
     @Override
     public Object getInfo()
     {
-        ImmutableMap.Builder<Object, Object> builder = ImmutableMap.builder()
-                .put("hostAddresses", hostAddresses);
-        schemaName.ifPresent(name -> builder.put("schemaName", name));
-        tableName.ifPresent(name -> builder.put("tableName", name));
-        sheetExpression.ifPresent(expression -> builder.put("sheetExpression", expression));
+        ImmutableMap.Builder<Object, Object> builder = ImmutableMap.builder();
         return builder.buildOrThrow();
     }
 
@@ -105,10 +70,6 @@ public Object getInfo()
     public long getRetainedSizeInBytes()
     {
         return INSTANCE_SIZE
-                + sizeOf(schemaName, SizeOf::estimatedSizeOf)
-                + sizeOf(tableName, SizeOf::estimatedSizeOf)
-                + sizeOf(sheetExpression, SizeOf::estimatedSizeOf)
-                + estimatedSizeOf(values, value -> estimatedSizeOf(value, SizeOf::estimatedSizeOf))
-                + estimatedSizeOf(hostAddresses, HostAddress::getRetainedSizeInBytes);
+                + estimatedSizeOf(values, value -> estimatedSizeOf(value, SizeOf::estimatedSizeOf));
     }
 }
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsSplitManager.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsSplitManager.java
index e9370e9523ef..51e2f342bae7 100644
--- a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsSplitManager.java
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/SheetsSplitManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.google.sheets;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.connector.ConnectorSplitManager;
@@ -23,12 +24,9 @@
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.FixedSplitSource;
 
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 import static io.trino.plugin.google.sheets.SheetsConnectorTableHandle.tableNotFound;
 import static java.util.Objects.requireNonNull;
@@ -58,29 +56,8 @@ public ConnectorSplitSource getSplits(
                 .orElseThrow(() -> tableNotFound(tableHandle));
 
         List<ConnectorSplit> splits = new ArrayList<>();
-        splits.add(sheetsSplitFromTableHandle(tableHandle, table.getValues()));
+        splits.add(new SheetsSplit(table.getValues()));
         Collections.shuffle(splits);
         return new FixedSplitSource(splits);
     }
-
-    private static SheetsSplit sheetsSplitFromTableHandle(
-            SheetsConnectorTableHandle tableHandle,
-            List<List<String>> values)
-    {
-        if (tableHandle instanceof SheetsNamedTableHandle namedTableHandle) {
-            return new SheetsSplit(
-                    Optional.of(namedTableHandle.getSchemaName()),
-                    Optional.of(namedTableHandle.getTableName()),
-                    Optional.empty(),
-                    values);
-        }
-        if (tableHandle instanceof SheetsSheetTableHandle sheetTableHandle) {
-            return new SheetsSplit(
-                    Optional.empty(),
-                    Optional.empty(),
-                    Optional.of(sheetTableHandle.getSheetExpression()),
-                    values);
-        }
-        throw new IllegalStateException("Found unexpected table handle type " + tableHandle);
-    }
 }
diff --git a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/ptf/Sheet.java b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/ptf/Sheet.java
index 1fa098db8060..3bb9e6d7996e 100644
--- a/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/ptf/Sheet.java
+++ b/plugin/trino-google-sheets/src/main/java/io/trino/plugin/google/sheets/ptf/Sheet.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.airlift.slice.Slice;
 import io.trino.plugin.google.sheets.SheetsClient;
 import io.trino.plugin.google.sheets.SheetsColumnHandle;
@@ -24,19 +25,18 @@
 import io.trino.plugin.google.sheets.SheetsMetadata;
 import io.trino.plugin.google.sheets.SheetsSheetTableHandle;
 import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.ptf.AbstractConnectorTableFunction;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-import io.trino.spi.ptf.Descriptor;
-import io.trino.spi.ptf.ScalarArgument;
-import io.trino.spi.ptf.ScalarArgumentSpecification;
-import io.trino.spi.ptf.TableFunctionAnalysis;
-
-import javax.inject.Provider;
+import io.trino.spi.function.table.AbstractConnectorTableFunction;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.ScalarArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
 
 import java.util.List;
 import java.util.Map;
@@ -47,7 +47,7 @@
 import static io.trino.plugin.google.sheets.SheetsClient.DEFAULT_RANGE;
 import static io.trino.plugin.google.sheets.SheetsClient.RANGE_SEPARATOR;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
-import static io.trino.spi.ptf.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
+import static io.trino.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
 
@@ -98,7 +98,11 @@ public SheetFunction(SheetsMetadata metadata)
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             String sheetId = ((Slice) ((ScalarArgument) arguments.get(ID_ARGUMENT)).getValue()).toStringUtf8();
             validateSheetId(sheetId);
diff --git a/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/SheetsQueryRunner.java b/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/SheetsQueryRunner.java
index 0cb04e8cf647..fdf87f705c08 100644
--- a/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/SheetsQueryRunner.java
+++ b/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/SheetsQueryRunner.java
@@ -17,6 +17,7 @@
 import io.airlift.log.Logger;
 import io.airlift.log.Logging;
 import io.trino.Session;
+import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.testing.DistributedQueryRunner;
 
 import java.util.HashMap;
@@ -46,11 +47,14 @@ public static DistributedQueryRunner createSheetsQueryRunner(
             connectorProperties = new HashMap<>(ImmutableMap.copyOf(connectorProperties));
             connectorProperties.putIfAbsent("gsheets.credentials-path", getTestCredentialsPath());
             connectorProperties.putIfAbsent("gsheets.max-data-cache-size", "1000");
-            connectorProperties.putIfAbsent("gsheets.data-cache-ttl", "5m");
+            connectorProperties.putIfAbsent("gsheets.data-cache-ttl", "1m");
 
             queryRunner.installPlugin(new SheetsPlugin());
             queryRunner.createCatalog(GOOGLE_SHEETS, GOOGLE_SHEETS, connectorProperties);
 
+            queryRunner.installPlugin(new TpchPlugin());
+            queryRunner.createCatalog("tpch", "tpch", ImmutableMap.of());
+
             return queryRunner;
         }
         catch (Throwable e) {
diff --git a/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestGoogleSheets.java b/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestGoogleSheets.java
index 1980a38d5eee..d441a98fd2bd 100644
--- a/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestGoogleSheets.java
+++ b/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestGoogleSheets.java
@@ -13,46 +13,135 @@
  */
 package io.trino.plugin.google.sheets;
 
+import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
+import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.services.sheets.v4.Sheets;
+import com.google.api.services.sheets.v4.SheetsScopes;
+import com.google.api.services.sheets.v4.model.Sheet;
+import com.google.api.services.sheets.v4.model.SheetProperties;
+import com.google.api.services.sheets.v4.model.Spreadsheet;
+import com.google.api.services.sheets.v4.model.SpreadsheetProperties;
+import com.google.api.services.sheets.v4.model.UpdateValuesResponse;
+import com.google.api.services.sheets.v4.model.ValueRange;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.airlift.units.Duration;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
 
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import static com.google.api.client.googleapis.javanet.GoogleNetHttpTransport.newTrustedTransport;
 import static io.trino.plugin.google.sheets.SheetsQueryRunner.createSheetsQueryRunner;
 import static io.trino.plugin.google.sheets.TestSheetsPlugin.DATA_SHEET_ID;
-import static io.trino.plugin.google.sheets.TestSheetsPlugin.TEST_METADATA_SHEET_ID;
+import static io.trino.plugin.google.sheets.TestSheetsPlugin.getTestCredentialsPath;
+import static io.trino.testing.assertions.Assert.assertEventually;
+import static java.lang.Math.toIntExact;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
 
 public class TestGoogleSheets
         extends AbstractTestQueryFramework
 {
+    private static final String APPLICATION_NAME = "trino google sheets integration test";
+    private static final String TEST_SPREADSHEET_NAME = "Trino integration test";
+
+    private Sheets sheetsService;
+    private String spreadsheetId;
+
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        return createSheetsQueryRunner(
-                ImmutableMap.of(),
-                ImmutableMap.of(
-                        "gsheets.read-timeout", "1m",
-                        "gsheets.metadata-sheet-id", TEST_METADATA_SHEET_ID));
+        sheetsService = getSheetsService();
+        spreadsheetId = createSpreadsheetWithTestdata();
+        return createSheetsQueryRunner(ImmutableMap.of(), ImmutableMap.of(
+                "gsheets.metadata-sheet-id", spreadsheetId + "#Metadata",
+                "gsheets.connection-timeout", "1m",
+                "gsheets.read-timeout", "1m",
+                "gsheets.write-timeout", "1m"));
+    }
+
+    // This test currently only creates spreadsheets and does not delete them afterward.
+    // This is due to the fact that the Google Sheets API does not support deleting spreadsheets,
+    // the Drive API needs to be used (see https://github.com/trinodb/trino/pull/15026 for details)
+    private String createSpreadsheetWithTestdata()
+            throws IOException
+    {
+        Spreadsheet spreadsheet = new Spreadsheet()
+                .setProperties(new SpreadsheetProperties().setTitle(TEST_SPREADSHEET_NAME))
+                .setSheets(ImmutableList.of(
+                        new Sheet().setProperties(new SheetProperties().setTitle("Metadata")),
+                        new Sheet().setProperties(new SheetProperties().setTitle("Number Text")),
+                        new Sheet().setProperties(new SheetProperties().setTitle("Table with duplicate and missing column names")),
+                        new Sheet().setProperties(new SheetProperties().setTitle("Nation Insert test"))));
+
+        spreadsheet = sheetsService.spreadsheets().create(spreadsheet).setFields("spreadsheetId").execute();
+        String spreadsheetId = spreadsheet.getSpreadsheetId();
+
+        ValueRange updateValues = new ValueRange().setValues(ImmutableList.of(
+                ImmutableList.of("Table Name", "Sheet ID", "Owner", "Notes"),
+                ImmutableList.of("metadata_table", spreadsheetId + "#Metadata", "", "Self reference to this sheet as table"),
+                ImmutableList.of("number_text", spreadsheetId + "#Number Text", "alice", "Table to test type mapping"),
+                ImmutableList.of("table_with_duplicate_and_missing_column_names", spreadsheetId + "#Table with duplicate and missing column names", "bob", "Table to test behaviour with duplicate columns"),
+                ImmutableList.of("nation_insert_test", spreadsheetId + "#Nation Insert test", "", "Table containing tpch nation table to test inserts")));
+        UpdateValuesResponse updateResult = sheetsService.spreadsheets().values()
+                .update(spreadsheetId, "Metadata", updateValues)
+                .setValueInputOption("RAW")
+                .execute();
+        assertThat(toIntExact(updateResult.getUpdatedRows())).isEqualTo(5);
+
+        updateValues = new ValueRange().setValues(ImmutableList.of(
+                ImmutableList.of("number", "text"),
+                ImmutableList.of("1", "one"),
+                ImmutableList.of("2", "two"),
+                ImmutableList.of("3", "three"),
+                ImmutableList.of("4", "four"),
+                ImmutableList.of("5", "five")));
+        updateResult = sheetsService.spreadsheets().values()
+                .update(spreadsheetId, "Number Text", updateValues)
+                .setValueInputOption("RAW")
+                .execute();
+        assertThat(toIntExact(updateResult.getUpdatedRows())).isEqualTo(6);
+
+        updateValues = new ValueRange().setValues(ImmutableList.of(
+                ImmutableList.of("a", "A", "", "C"),
+                ImmutableList.of("1", "2", "3", "4")));
+        updateResult = sheetsService.spreadsheets().values()
+                .update(spreadsheetId, "Table with duplicate and missing column names", updateValues)
+                .setValueInputOption("RAW")
+                .execute();
+        assertThat(toIntExact(updateResult.getUpdatedRows())).isEqualTo(2);
+
+        updateValues = new ValueRange().setValues(ImmutableList.of(ImmutableList.of("nationkey", "name", "regionkey", "comment")));
+        updateResult = sheetsService.spreadsheets().values().update(spreadsheetId, "Nation Insert test", updateValues)
+                .setValueInputOption("RAW")
+                .execute();
+        assertThat(toIntExact(updateResult.getUpdatedRows())).isEqualTo(1);
+
+        return spreadsheetId;
     }
 
     @Test
     public void testListTable()
     {
-        assertQuery("show tables", "SELECT * FROM (VALUES 'metadata_table', 'number_text', 'table_with_duplicate_and_missing_column_names')");
+        @Language("SQL") String expectedTableNamesStatement = "SELECT * FROM (VALUES 'metadata_table', 'number_text', 'table_with_duplicate_and_missing_column_names', 'nation_insert_test')";
+        assertQuery("show tables", expectedTableNamesStatement);
         assertQueryReturnsEmptyResult("SHOW TABLES IN gsheets.information_schema LIKE 'number_text'");
-        assertQuery("select table_name from gsheets.information_schema.tables WHERE table_schema <> 'information_schema'", "SELECT * FROM (VALUES 'metadata_table', 'number_text', 'table_with_duplicate_and_missing_column_names')");
-        assertQuery("select table_name from gsheets.information_schema.tables WHERE table_schema <> 'information_schema' LIMIT 1000", "SELECT * FROM (VALUES 'metadata_table', 'number_text', 'table_with_duplicate_and_missing_column_names')");
-        assertEquals(getQueryRunner().execute("select table_name from gsheets.information_schema.tables WHERE table_schema = 'unknown_schema'").getRowCount(), 0);
+        assertQuery("select table_name from gsheets.information_schema.tables WHERE table_schema <> 'information_schema'", expectedTableNamesStatement);
+        assertQuery("select table_name from gsheets.information_schema.tables WHERE table_schema <> 'information_schema' LIMIT 1000", expectedTableNamesStatement);
+        assertThat(getQueryRunner().execute("select table_name from gsheets.information_schema.tables WHERE table_schema = 'unknown_schema'").getRowCount()).isEqualTo(0);
     }
 
     @Test
     public void testDescTable()
     {
         assertQuery("desc number_text", "SELECT * FROM (VALUES('number','varchar','',''), ('text','varchar','',''))");
-        assertQuery("desc metadata_table", "SELECT * FROM (VALUES('table name','varchar','',''), ('sheetid_sheetname','varchar','',''), "
+        assertQuery("desc metadata_table", "SELECT * FROM (VALUES('table name','varchar','',''), ('sheet id','varchar','',''), "
                 + "('owner','varchar','',''), ('notes','varchar','',''))");
     }
 
@@ -205,4 +294,34 @@ public void testSheetQueryWithInvalidSheetId()
         assertThatThrownBy(() -> query("SELECT * FROM TABLE(gsheets.system.sheet(id => 'DOESNOTEXIST'))"))
                 .hasMessageContaining("Failed reading data from sheet: DOESNOTEXIST");
     }
+
+    @Test
+    public void testInsertIntoTable()
+            throws Exception
+    {
+        assertQuery("SELECT count(*) FROM nation_insert_test", "SELECT 0");
+        assertUpdate("INSERT INTO nation_insert_test SELECT cast(nationkey as varchar), cast(name as varchar), cast(regionkey as varchar), cast(comment as varchar) FROM tpch.tiny.nation", 25);
+        assertEventually(
+                new Duration(5, TimeUnit.MINUTES),
+                new Duration(30, TimeUnit.SECONDS),
+                () -> assertQuery("SELECT * FROM nation_insert_test", "SELECT * FROM nation"));
+    }
+
+    private Sheets getSheetsService()
+            throws Exception
+    {
+        return new Sheets.Builder(newTrustedTransport(),
+                JacksonFactory.getDefaultInstance(),
+                getCredentials())
+                .setApplicationName(APPLICATION_NAME)
+                .build();
+    }
+
+    private GoogleCredential getCredentials()
+            throws Exception
+    {
+        String credentialsPath = getTestCredentialsPath();
+        return GoogleCredential.fromStream(new FileInputStream(credentialsPath))
+                .createScoped(ImmutableList.of(SheetsScopes.SPREADSHEETS, SheetsScopes.DRIVE));
+    }
 }
diff --git a/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestGoogleSheetsWithoutMetadataSheetId.java b/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestGoogleSheetsWithoutMetadataSheetId.java
index 6a6d9db6ef0b..871edb83b227 100644
--- a/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestGoogleSheetsWithoutMetadataSheetId.java
+++ b/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestGoogleSheetsWithoutMetadataSheetId.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.google.sheets.SheetsQueryRunner.createSheetsQueryRunner;
 import static io.trino.plugin.google.sheets.TestSheetsPlugin.DATA_SHEET_ID;
diff --git a/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestSheetsConfig.java b/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestSheetsConfig.java
index e02be6ee93fd..5b5b6f1b2412 100644
--- a/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestSheetsConfig.java
+++ b/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestSheetsConfig.java
@@ -16,9 +16,8 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.configuration.ConfigurationFactory;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
-
-import javax.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.AssertTrue;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -34,7 +33,7 @@
 import static io.airlift.testing.ValidationAssertions.assertFailsValidation;
 import static io.airlift.testing.ValidationAssertions.assertValidates;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSheetsConfig
 {
@@ -50,7 +49,9 @@ public void testDefaults()
                 .setMetadataSheetId(null)
                 .setSheetsDataMaxCacheSize(1000)
                 .setSheetsDataExpireAfterWrite(new Duration(5, TimeUnit.MINUTES))
-                .setReadTimeout(new Duration(20, TimeUnit.SECONDS)));
+                .setConnectionTimeout(new Duration(20, TimeUnit.SECONDS))
+                .setReadTimeout(new Duration(20, TimeUnit.SECONDS))
+                .setWriteTimeout(new Duration(20, TimeUnit.SECONDS)));
     }
 
     @Test
@@ -64,18 +65,22 @@ public void testExplicitPropertyMappingsCredentialsPath()
                 .put("gsheets.metadata-sheet-id", "foo_bar_sheet_id#Sheet1")
                 .put("gsheets.max-data-cache-size", "2000")
                 .put("gsheets.data-cache-ttl", "10m")
-                .put("gsheets.read-timeout", "1m")
+                .put("gsheets.connection-timeout", "1m")
+                .put("gsheets.read-timeout", "2m")
+                .put("gsheets.write-timeout", "3m")
                 .buildOrThrow();
 
         ConfigurationFactory configurationFactory = new ConfigurationFactory(properties);
         SheetsConfig config = configurationFactory.build(SheetsConfig.class);
 
-        assertEquals(config.getCredentialsKey(), Optional.empty());
-        assertEquals(config.getCredentialsFilePath(), Optional.of(credentialsFile.toString()));
-        assertEquals(config.getMetadataSheetId(), Optional.of("foo_bar_sheet_id#Sheet1"));
-        assertEquals(config.getSheetsDataMaxCacheSize(), 2000);
-        assertEquals(config.getSheetsDataExpireAfterWrite(), Duration.valueOf("10m"));
-        assertEquals(config.getReadTimeout(), Duration.valueOf("1m"));
+        assertThat(config.getCredentialsKey()).isEqualTo(Optional.empty());
+        assertThat(config.getCredentialsFilePath()).isEqualTo(Optional.of(credentialsFile.toString()));
+        assertThat(config.getMetadataSheetId()).isEqualTo(Optional.of("foo_bar_sheet_id#Sheet1"));
+        assertThat(config.getSheetsDataMaxCacheSize()).isEqualTo(2000);
+        assertThat(config.getSheetsDataExpireAfterWrite()).isEqualTo(Duration.valueOf("10m"));
+        assertThat(config.getConnectionTimeout()).isEqualTo(Duration.valueOf("1m"));
+        assertThat(config.getReadTimeout()).isEqualTo(Duration.valueOf("2m"));
+        assertThat(config.getWriteTimeout()).isEqualTo(Duration.valueOf("3m"));
     }
 
     @Test
@@ -92,12 +97,12 @@ public void testExplicitPropertyMappingsCredentialsKey()
         ConfigurationFactory configurationFactory = new ConfigurationFactory(properties);
         SheetsConfig config = configurationFactory.build(SheetsConfig.class);
 
-        assertEquals(config.getCredentialsKey(), Optional.of(BASE_64_ENCODED_TEST_KEY));
-        assertEquals(config.getCredentialsFilePath(), Optional.empty());
-        assertEquals(config.getMetadataSheetId(), Optional.of("foo_bar_sheet_id#Sheet1"));
-        assertEquals(config.getSheetsDataMaxCacheSize(), 2000);
-        assertEquals(config.getSheetsDataExpireAfterWrite(), Duration.valueOf("10m"));
-        assertEquals(config.getReadTimeout(), Duration.valueOf("1m"));
+        assertThat(config.getCredentialsKey()).isEqualTo(Optional.of(BASE_64_ENCODED_TEST_KEY));
+        assertThat(config.getCredentialsFilePath()).isEqualTo(Optional.empty());
+        assertThat(config.getMetadataSheetId()).isEqualTo(Optional.of("foo_bar_sheet_id#Sheet1"));
+        assertThat(config.getSheetsDataMaxCacheSize()).isEqualTo(2000);
+        assertThat(config.getSheetsDataExpireAfterWrite()).isEqualTo(Duration.valueOf("10m"));
+        assertThat(config.getReadTimeout()).isEqualTo(Duration.valueOf("1m"));
     }
 
     @Test
diff --git a/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestSheetsConnectorTableHandle.java b/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestSheetsConnectorTableHandle.java
index bded6bdf5139..c574410be461 100644
--- a/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestSheetsConnectorTableHandle.java
+++ b/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestSheetsConnectorTableHandle.java
@@ -14,9 +14,9 @@
 package io.trino.plugin.google.sheets;
 
 import io.airlift.json.JsonCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSheetsConnectorTableHandle
 {
@@ -31,7 +31,7 @@ public void testRoundTripWithNamedTable()
         String json = namedCodec.toJson(expected);
         SheetsNamedTableHandle actual = namedCodec.fromJson(json);
 
-        assertEquals(actual, expected);
+        assertThat(actual).isEqualTo(expected);
     }
 
     @Test
@@ -42,6 +42,6 @@ public void testRoundTripWithSheetTable()
         String json = sheetCodec.toJson(expected);
         SheetsSheetTableHandle actual = sheetCodec.fromJson(json);
 
-        assertEquals(actual, expected);
+        assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestSheetsPlugin.java b/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestSheetsPlugin.java
index 037e55d0408b..f03fe410009b 100644
--- a/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestSheetsPlugin.java
+++ b/plugin/trino-google-sheets/src/test/java/io/trino/plugin/google/sheets/TestSheetsPlugin.java
@@ -19,7 +19,7 @@
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -29,7 +29,7 @@
 import static io.trino.plugin.google.sheets.SheetsQueryRunner.GOOGLE_SHEETS;
 import static java.io.File.createTempFile;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSheetsPlugin
 {
@@ -55,7 +55,7 @@ public void testCreateConnector()
         ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
         ImmutableMap.Builder<String, String> propertiesMap = ImmutableMap.<String, String>builder().put("gsheets.credentials-path", getTestCredentialsPath()).put("gsheets.metadata-sheet-id", TEST_METADATA_SHEET_ID);
         Connector connector = factory.create(GOOGLE_SHEETS, propertiesMap.buildOrThrow(), new TestingConnectorContext());
-        assertNotNull(connector);
+        assertThat(connector).isNotNull();
         connector.shutdown();
     }
 }
diff --git a/plugin/trino-hive-hadoop2/bin/run_hive_alluxio_tests.sh b/plugin/trino-hive-hadoop2/bin/run_hive_alluxio_tests.sh
deleted file mode 100755
index eff9a3aafb56..000000000000
--- a/plugin/trino-hive-hadoop2/bin/run_hive_alluxio_tests.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail -x
-
-. "${BASH_SOURCE%/*}/common.sh"
-
-abort_if_not_gib_impacted
-
-export ALLUXIO_BASE_IMAGE="alluxio/alluxio"
-export ALLUXIO_IMAGE_TAG="2.1.2"
-
-ALLUXIO_DOCKER_COMPOSE_LOCATION="${INTEGRATION_TESTS_ROOT}/conf/alluxio-docker.yml"
-
-function check_alluxio() {
-    run_in_alluxio alluxio fsadmin report
-}
-
-function run_in_alluxio() {
-    docker exec -e ALLUXIO_JAVA_OPTS=" -Dalluxio.master.hostname=localhost" \
-           "$(alluxio_master_container)" $@
-}
-
-# Arguments:
-#   $1: container name
-function get_alluxio_container() {
-    docker-compose -f "${ALLUXIO_DOCKER_COMPOSE_LOCATION}" ps -q "$1" | grep .
-}
-
-function alluxio_master_container() {
-    get_alluxio_container alluxio-master
-}
-
-function main () {
-    cleanup_docker_containers "${DOCKER_COMPOSE_LOCATION}" "${ALLUXIO_DOCKER_COMPOSE_LOCATION}"
-    start_docker_containers "${DOCKER_COMPOSE_LOCATION}" "${ALLUXIO_DOCKER_COMPOSE_LOCATION}"
-    retry check_hadoop
-    retry check_alluxio & # data can be generated while we wait for alluxio to start
-
-    # generate test data
-    exec_in_hadoop_master_container sudo -Eu hdfs hdfs dfs -mkdir /alluxio
-    exec_in_hadoop_master_container sudo -Eu hdfs hdfs dfs -chmod 777 /alluxio
-    exec_in_hadoop_master_container sudo -Eu hive beeline -u jdbc:hive2://localhost:10000/default -n hive -f /docker/sql/create-test.sql
-
-    # Alluxio currently doesn't support views
-    exec_in_hadoop_master_container sudo -Eu hive beeline -u jdbc:hive2://localhost:10000/default -n hive -e 'DROP VIEW trino_test_view;'
-
-    stop_unnecessary_hadoop_services
-
-    wait # make sure alluxio has started
-
-    run_in_alluxio alluxio table attachdb hive thrift://hadoop-master:9083 default
-    run_in_alluxio alluxio table ls default
-
-    # run product tests
-    pushd ${PROJECT_ROOT}
-    set +e
-    ./mvnw ${MAVEN_TEST:--B} -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-alluxio \
-           -Dtest.alluxio.host=localhost \
-           -Dtest.alluxio.port=19998 \
-           -DHADOOP_USER_NAME=hive
-    EXIT_CODE=$?
-    set -e
-    popd
-
-    cleanup_docker_containers "${DOCKER_COMPOSE_LOCATION}" "${ALLUXIO_DOCKER_COMPOSE_LOCATION}"
-
-    exit ${EXIT_CODE}
-}
-
-main
diff --git a/plugin/trino-hive-hadoop2/bin/run_hive_s3_select_json_tests.sh b/plugin/trino-hive-hadoop2/bin/run_hive_s3_select_json_tests.sh
deleted file mode 100755
index 1d7976ede475..000000000000
--- a/plugin/trino-hive-hadoop2/bin/run_hive_s3_select_json_tests.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env bash
-
-# Similar to run_hive_s3_tests.sh, but has only Amazon S3 Select JSON tests. This is in a separate file as the JsonSerDe
-# class is only available in Hadoop 3.1 version, and so we would only test JSON pushdown against the 3.1 version.
-
-set -euo pipefail -x
-
-. "${BASH_SOURCE%/*}/common.sh"
-
-abort_if_not_gib_impacted
-
-check_vars S3_BUCKET S3_BUCKET_ENDPOINT \
-    AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY
-
-cleanup_hadoop_docker_containers
-start_hadoop_docker_containers
-
-test_directory="$(date '+%Y%m%d-%H%M%S')-$(uuidgen | sha1sum | cut -b 1-6)-s3select-json"
-
-# insert AWS credentials
-deploy_core_site_xml core-site.xml.s3-template \
-    AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY S3_BUCKET_ENDPOINT
-
-# create test tables
-# can't use create_test_tables because the first table is created with different commands
-table_path="s3a://${S3_BUCKET}/${test_directory}/trino_s3select_test_external_fs_json/"
-exec_in_hadoop_master_container hadoop fs -mkdir -p "${table_path}"
-exec_in_hadoop_master_container /docker/files/hadoop-put.sh /docker/files/test_table.json{,.gz,.bz2} "${table_path}"
-exec_in_hadoop_master_container sudo -Eu hive beeline -u jdbc:hive2://localhost:10000/default -n hive -e "
-    CREATE EXTERNAL TABLE trino_s3select_test_external_fs_json(col_1 bigint, col_2 bigint)
-        ROW FORMAT SERDE 'org.apache.hive.hcatalog.data.JsonSerDe'
-        LOCATION '${table_path}'"
-
-table_path="s3a://${S3_BUCKET}/${test_directory}/trino_s3select_test_json_scan_range_pushdown/"
-exec_in_hadoop_master_container hadoop fs -mkdir -p "${table_path}"
-exec_in_hadoop_master_container /docker/files/hadoop-put.sh /docker/files/test_table_json_scan_range_select_pushdown_{1,2,3}.json "${table_path}"
-exec_in_hadoop_master_container sudo -Eu hive beeline -u jdbc:hive2://localhost:10000/default -n hive -e "
-    CREATE EXTERNAL TABLE trino_s3select_test_json_scan_range_pushdown(col_1 bigint, col_2 string, col_3 string,
-    col_4 string, col_5 string, col_6 string, col_7 string, col_8 string, col_9 string, col_10 string, col_11 string,
-    col_12 string, col_13 string, col_14 string)
-        ROW FORMAT SERDE 'org.apache.hive.hcatalog.data.JsonSerDe'
-        LOCATION '${table_path}'"
-stop_unnecessary_hadoop_services
-
-# restart hive-metastore to apply S3 changes in core-site.xml
-docker exec "$(hadoop_master_container)" supervisorctl restart hive-metastore
-retry check_hadoop
-
-# run product tests
-pushd "${PROJECT_ROOT}"
-set +e
-./mvnw ${MAVEN_TEST:--B} -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-s3-select-json \
-    -DHADOOP_USER_NAME=hive \
-    -Dhive.hadoop2.metastoreHost=localhost \
-    -Dhive.hadoop2.metastorePort=9083 \
-    -Dhive.hadoop2.databaseName=default \
-    -Dhive.hadoop2.s3.awsAccessKey="${AWS_ACCESS_KEY_ID}" \
-    -Dhive.hadoop2.s3.awsSecretKey="${AWS_SECRET_ACCESS_KEY}" \
-    -Dhive.hadoop2.s3.writableBucket="${S3_BUCKET}" \
-    -Dhive.hadoop2.s3.testDirectory="${test_directory}"
-EXIT_CODE=$?
-set -e
-popd
-
-cleanup_hadoop_docker_containers
-
-exit "${EXIT_CODE}"
diff --git a/plugin/trino-hive-hadoop2/bin/run_hive_s3_tests.sh b/plugin/trino-hive-hadoop2/bin/run_hive_s3_tests.sh
index 57c3c090bf75..0b9fb473e6db 100755
--- a/plugin/trino-hive-hadoop2/bin/run_hive_s3_tests.sh
+++ b/plugin/trino-hive-hadoop2/bin/run_hive_s3_tests.sh
@@ -46,38 +46,6 @@ exec_in_hadoop_master_container /usr/bin/hive -e "
     LOCATION '${table_path}'
     TBLPROPERTIES ('skip.header.line.count'='2', 'skip.footer.line.count'='2')"
 
-table_path="s3a://${S3_BUCKET}/${test_directory}/trino_s3select_test_external_fs_with_pipe_delimiter/"
-exec_in_hadoop_master_container hadoop fs -mkdir -p "${table_path}"
-exec_in_hadoop_master_container hadoop fs -put -f /docker/files/test_table_with_pipe_delimiter.csv{,.gz,.bz2} "${table_path}"
-exec_in_hadoop_master_container /usr/bin/hive -e "
-    CREATE EXTERNAL TABLE trino_s3select_test_external_fs_with_pipe_delimiter(t_bigint bigint, s_bigint bigint)
-    ROW FORMAT DELIMITED
-    FIELDS TERMINATED BY '|'
-    STORED AS TEXTFILE
-    LOCATION '${table_path}'"
-
-table_path="s3a://${S3_BUCKET}/${test_directory}/trino_s3select_test_external_fs_with_comma_delimiter/"
-exec_in_hadoop_master_container hadoop fs -mkdir -p "${table_path}"
-exec_in_hadoop_master_container hadoop fs -put -f /docker/files/test_table_with_comma_delimiter.csv{,.gz,.bz2} "${table_path}"
-exec_in_hadoop_master_container /usr/bin/hive -e "
-    CREATE EXTERNAL TABLE trino_s3select_test_external_fs_with_comma_delimiter(t_bigint bigint, s_bigint bigint)
-    ROW FORMAT DELIMITED
-    FIELDS TERMINATED BY ','
-    STORED AS TEXTFILE
-    LOCATION '${table_path}'"
-
-table_path="s3a://${S3_BUCKET}/${test_directory}/trino_s3select_test_csv_scan_range_pushdown/"
-exec_in_hadoop_master_container hadoop fs -mkdir -p "${table_path}"
-exec_in_hadoop_master_container /docker/files/hadoop-put.sh /docker/files/test_table_csv_scan_range_select_pushdown_{1,2,3}.csv "${table_path}"
-exec_in_hadoop_master_container sudo -Eu hive beeline -u jdbc:hive2://localhost:10000/default -n hive -e "
-    CREATE EXTERNAL TABLE trino_s3select_test_csv_scan_range_pushdown(index bigint, id string, value1 bigint, value2 bigint, value3 bigint,
-     value4 bigint, value5 bigint, title string, firstname string, lastname string, flag string, day bigint,
-     month bigint, year bigint, country string, comment string, email string, identifier string)
-    ROW FORMAT DELIMITED
-    FIELDS TERMINATED BY '|'
-    STORED AS TEXTFILE
-    LOCATION '${table_path}'"
-
 stop_unnecessary_hadoop_services
 
 # restart hive-metastore to apply S3 changes in core-site.xml
diff --git a/plugin/trino-hive-hadoop2/conf/alluxio-docker.yml b/plugin/trino-hive-hadoop2/conf/alluxio-docker.yml
deleted file mode 100644
index dc3c35a0c0c3..000000000000
--- a/plugin/trino-hive-hadoop2/conf/alluxio-docker.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-version: '2'
-services:
-  alluxio-master:
-    hostname: alluxio-master
-    image: '${ALLUXIO_BASE_IMAGE}:${ALLUXIO_IMAGE_TAG}'
-    command: master
-    environment:
-      ALLUXIO_MASTER_JAVA_OPTS: >
-        -Dalluxio.master.hostname=localhost
-        -Dalluxio.master.mount.table.root.ufs=hdfs://hadoop-master:9000/alluxio
-        -Dalluxio.security.authorization.permission.enabled=false
-        -Dalluxio.master.security.impersonation.presto.users=*
-    ports:
-      - '19200:19200' # Master Embedded Journal
-      - '19999:19999' # Master UI
-      - '19998:19998' # Master RPC
-      - '20003:20003' # Job Master Embedded Journal
-      - '20001:20001' # Job Master RPC
-      - '20002:20002' # Job Master HTTP
-    volumes:
-      - ./files:/docker/files:ro
-  alluxio-worker:
-    hostname: alluxio-worker
-    image: '${ALLUXIO_BASE_IMAGE}:${ALLUXIO_IMAGE_TAG}'
-    command: worker
-    shm_size: '500mb'
-    environment:
-      ALLUXIO_WORKER_JAVA_OPTS: >
-        -Dalluxio.worker.hostname=localhost
-        -Dalluxio.master.hostname=alluxio-master
-        -Dalluxio.worker.memory.size=500m
-    ports:
-      - '29999:29999' # Worker RPC
-      - '30000:30000' # Worker HTTP
-      - '30001:30001' # Job Worker RPC
-      - '30002:30002' # Job Worker Data
-      - '30003:30003' # Job Worker HTTP
diff --git a/plugin/trino-hive-hadoop2/pom.xml b/plugin/trino-hive-hadoop2/pom.xml
index 324f62428a20..cbf153442e5d 100644
--- a/plugin/trino-hive-hadoop2/pom.xml
+++ b/plugin/trino-hive-hadoop2/pom.xml
@@ -5,57 +5,80 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-hive-hadoop2</artifactId>
-    <description>Trino - Hive Connector - Apache Hadoop 2.x</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Hive Connector - Apache Hadoop 2.x</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-hive</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-filesystem</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hadoop-toolkit</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-hdfs</artifactId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-s3</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hadoop</groupId>
-            <artifactId>hadoop-apache</artifactId>
+            <groupId>com.qubole.rubix</groupId>
+            <artifactId>rubix-presto-shaded</artifactId>
             <scope>runtime</scope>
         </dependency>
 
@@ -84,55 +107,53 @@
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-core</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-s3</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hadoop-toolkit</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.qubole.rubix</groupId>
-            <artifactId>rubix-presto-shaded</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hdfs</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.alluxio</groupId>
-            <artifactId>alluxio-shaded-client</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
+            <groupId>io.trino.hadoop</groupId>
+            <artifactId>hadoop-apache</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <groupId>org.alluxio</groupId>
+            <artifactId>alluxio-shaded-client</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-hive</artifactId>
@@ -172,8 +193,8 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>io.trino.hive</groupId>
+            <artifactId>hive-apache</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -183,6 +204,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -190,6 +217,33 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>default</id>
@@ -204,13 +258,8 @@
                         <configuration>
                             <excludes>
                                 <exclude>**/TestHive.java</exclude>
-                                <exclude>**/TestHiveAlluxioMetastore.java</exclude>
                                 <exclude>**/TestHiveThriftMetastoreWithS3.java</exclude>
                                 <exclude>**/TestHiveFileSystemS3.java</exclude>
-                                <exclude>**/TestHiveFileSystemS3SelectPushdown.java</exclude>
-                                <exclude>**/TestHiveFileSystemS3SelectJsonPushdown.java</exclude>
-                                <exclude>**/TestHiveFileSystemS3SelectCsvPushdownWithSplits.java</exclude>
-                                <exclude>**/TestHiveFileSystemS3SelectJsonPushdownWithSplits.java</exclude>
                                 <exclude>**/TestHiveFileSystemWasb.java</exclude>
                                 <exclude>**/TestHiveFileSystemAbfsAccessKey.java</exclude>
                                 <exclude>**/TestHiveFileSystemAbfsOAuth.java</exclude>
@@ -249,25 +298,6 @@
                             <includes>
                                 <include>**/TestHiveThriftMetastoreWithS3.java</include>
                                 <include>**/TestHiveFileSystemS3.java</include>
-                                <include>**/TestHiveFileSystemS3SelectPushdown.java</include>
-                                <include>**/TestHiveFileSystemS3SelectCsvPushdownWithSplits.java</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>test-hive-hadoop2-s3-select-json</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/TestHiveFileSystemS3SelectJsonPushdown.java</include>
-                                <include>**/TestHiveFileSystemS3SelectJsonPushdownWithSplits.java</include>
                             </includes>
                         </configuration>
                     </plugin>
@@ -338,21 +368,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>test-hive-hadoop2-alluxio</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/TestHiveAlluxioMetastore.java</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileSystemAbfs.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileSystemAbfs.java
index 5c4cbaadec01..532323a3ffa0 100644
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileSystemAbfs.java
+++ b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileSystemAbfs.java
@@ -21,9 +21,9 @@
 import io.trino.hdfs.HdfsConfig;
 import io.trino.hdfs.HdfsConfiguration;
 import io.trino.hdfs.HdfsConfigurationInitializer;
+import io.trino.hdfs.azure.HiveAzureConfig;
+import io.trino.hdfs.azure.TrinoAzureConfigurationInitializer;
 import io.trino.plugin.hive.AbstractTestHive.Transaction;
-import io.trino.plugin.hive.azure.HiveAzureConfig;
-import io.trino.plugin.hive.azure.TrinoAzureConfigurationInitializer;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.SchemaTableName;
@@ -66,7 +66,6 @@ protected void setup(String host, int port, String databaseName, String containe
                 checkParameter(host, "host"),
                 port,
                 checkParameter(databaseName, "database name"),
-                false,
                 createHdfsConfiguration());
     }
 
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileSystemS3.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileSystemS3.java
deleted file mode 100644
index a6b4dcccfa8b..000000000000
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileSystemS3.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import com.google.common.collect.ImmutableSet;
-import io.trino.hdfs.ConfigurationInitializer;
-import io.trino.hdfs.DynamicHdfsConfiguration;
-import io.trino.hdfs.HdfsConfig;
-import io.trino.hdfs.HdfsConfiguration;
-import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.plugin.hive.s3.HiveS3Config;
-import io.trino.plugin.hive.s3.TrinoS3ConfigurationInitializer;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.testng.annotations.Test;
-
-import java.util.Arrays;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static java.lang.String.format;
-import static org.testng.Assert.assertFalse;
-import static org.testng.util.Strings.isNullOrEmpty;
-
-public abstract class AbstractTestHiveFileSystemS3
-        extends AbstractTestHiveFileSystem
-{
-    private String awsAccessKey;
-    private String awsSecretKey;
-    private String writableBucket;
-    private String testDirectory;
-
-    protected void setup(
-            String host,
-            int port,
-            String databaseName,
-            String awsAccessKey,
-            String awsSecretKey,
-            String writableBucket,
-            String testDirectory,
-            boolean s3SelectPushdownEnabled)
-    {
-        checkArgument(!isNullOrEmpty(host), "Expected non empty host");
-        checkArgument(!isNullOrEmpty(databaseName), "Expected non empty databaseName");
-        checkArgument(!isNullOrEmpty(awsAccessKey), "Expected non empty awsAccessKey");
-        checkArgument(!isNullOrEmpty(awsSecretKey), "Expected non empty awsSecretKey");
-        checkArgument(!isNullOrEmpty(writableBucket), "Expected non empty writableBucket");
-        checkArgument(!isNullOrEmpty(testDirectory), "Expected non empty testDirectory");
-        this.awsAccessKey = awsAccessKey;
-        this.awsSecretKey = awsSecretKey;
-        this.writableBucket = writableBucket;
-        this.testDirectory = testDirectory;
-
-        setup(host, port, databaseName, s3SelectPushdownEnabled, createHdfsConfiguration());
-    }
-
-    private HdfsConfiguration createHdfsConfiguration()
-    {
-        ConfigurationInitializer s3Config = new TrinoS3ConfigurationInitializer(new HiveS3Config()
-                .setS3AwsAccessKey(awsAccessKey)
-                .setS3AwsSecretKey(awsSecretKey));
-        HdfsConfigurationInitializer initializer = new HdfsConfigurationInitializer(new HdfsConfig(), ImmutableSet.of(s3Config));
-        return new DynamicHdfsConfiguration(initializer, ImmutableSet.of());
-    }
-
-    @Override
-    protected Path getBasePath()
-    {
-        // HDP 3.1 does not understand s3:// out of the box.
-        return new Path(format("s3a://%s/%s/", writableBucket, testDirectory));
-    }
-
-    @Test
-    public void testIgnoreHadoopFolderMarker()
-            throws Exception
-    {
-        Path basePath = getBasePath();
-        FileSystem fs = hdfsEnvironment.getFileSystem(TESTING_CONTEXT, basePath);
-
-        String markerFileName = "test_table_$folder$";
-        Path filePath = new Path(basePath, markerFileName);
-        fs.create(filePath).close();
-
-        assertFalse(Arrays.stream(fs.listStatus(basePath)).anyMatch(file -> file.getPath().getName().equalsIgnoreCase(markerFileName)));
-    }
-}
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHive.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHive.java
index 1fdb20091a50..5229758a4297 100644
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHive.java
+++ b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHive.java
@@ -13,24 +13,31 @@
  */
 package io.trino.plugin.hive;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.net.HostAndPort;
+import io.trino.spi.connector.ConnectorMetadata;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.SchemaTablePrefix;
 import org.apache.hadoop.net.NetUtils;
-import org.testng.SkipException;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.abort;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 // staging directory is shared mutable state
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestHive
         extends AbstractTestHive
 {
-    @Parameters({"test.metastore", "test.database"})
-    @BeforeClass
-    public void initialize(String metastore, String database)
+    @BeforeAll
+    public void initialize()
     {
+        String metastore = System.getProperty("test.metastore");
+        String database = System.getProperty("test.database");
         String hadoopMasterIp = System.getProperty("hadoop-master-ip");
         if (hadoopMasterIp != null) {
             // Even though Hadoop is accessed by proxy, Hadoop still tries to resolve hadoop-master
@@ -50,6 +57,7 @@ public void forceTestNgToRespectSingleThreaded()
         // https://github.com/cbeust/testng/issues/2361#issuecomment-688393166 a workaround it to add a dummy test to the leaf test class.
     }
 
+    @Test
     @Override
     public void testHideDeltaLakeTables()
     {
@@ -61,7 +69,17 @@ public void testHideDeltaLakeTables()
                         "  \\[\\1]\n" +
                         "but found.*");
 
-        throw new SkipException("not supported");
+        abort("not supported");
+    }
+
+    @Test
+    public void testHiveViewsHaveNoColumns()
+    {
+        try (Transaction transaction = newTransaction()) {
+            ConnectorMetadata metadata = transaction.getMetadata();
+            assertThat(listTableColumns(metadata, newSession(), new SchemaTablePrefix(view.getSchemaName(), view.getTableName())))
+                    .isEmpty();
+        }
     }
 
     @Test
@@ -75,4 +93,101 @@ public void testHiveViewTranslationError()
             // TODO: combine this with tests for successful translation (currently in TestHiveViews product test)
         }
     }
+
+    @Test
+    @Override
+    public void testUpdateBasicPartitionStatistics()
+            throws Exception
+    {
+        SchemaTableName tableName = temporaryTable("update_basic_partition_statistics");
+        try {
+            createDummyPartitionedTable(tableName, STATISTICS_PARTITIONED_TABLE_COLUMNS);
+            // When the table has partitions, but row count statistics are set to zero, we treat this case as empty
+            // statistics to avoid underestimation in the CBO. This scenario may be caused when other engines are
+            // used to ingest data into partitioned hive tables.
+            testUpdatePartitionStatistics(
+                    tableName,
+                    EMPTY_ROWCOUNT_STATISTICS,
+                    ImmutableList.of(BASIC_STATISTICS_1, BASIC_STATISTICS_2),
+                    ImmutableList.of(BASIC_STATISTICS_2, BASIC_STATISTICS_1));
+        }
+        finally {
+            dropTable(tableName);
+        }
+    }
+
+    @Test
+    @Override
+    public void testUpdatePartitionColumnStatistics()
+            throws Exception
+    {
+        SchemaTableName tableName = temporaryTable("update_partition_column_statistics");
+        try {
+            createDummyPartitionedTable(tableName, STATISTICS_PARTITIONED_TABLE_COLUMNS);
+            // When the table has partitions, but row count statistics are set to zero, we treat this case as empty
+            // statistics to avoid underestimation in the CBO. This scenario may be caused when other engines are
+            // used to ingest data into partitioned hive tables.
+            testUpdatePartitionStatistics(
+                    tableName,
+                    EMPTY_ROWCOUNT_STATISTICS,
+                    ImmutableList.of(STATISTICS_1_1, STATISTICS_1_2, STATISTICS_2),
+                    ImmutableList.of(STATISTICS_1_2, STATISTICS_1_1, STATISTICS_2));
+        }
+        finally {
+            dropTable(tableName);
+        }
+    }
+
+    @Test
+    @Override
+    public void testUpdatePartitionColumnStatisticsEmptyOptionalFields()
+            throws Exception
+    {
+        SchemaTableName tableName = temporaryTable("update_partition_column_statistics");
+        try {
+            createDummyPartitionedTable(tableName, STATISTICS_PARTITIONED_TABLE_COLUMNS);
+            // When the table has partitions, but row count statistics are set to zero, we treat this case as empty
+            // statistics to avoid underestimation in the CBO. This scenario may be caused when other engines are
+            // used to ingest data into partitioned hive tables.
+            testUpdatePartitionStatistics(
+                    tableName,
+                    EMPTY_ROWCOUNT_STATISTICS,
+                    ImmutableList.of(STATISTICS_EMPTY_OPTIONAL_FIELDS),
+                    ImmutableList.of(STATISTICS_EMPTY_OPTIONAL_FIELDS));
+        }
+        finally {
+            dropTable(tableName);
+        }
+    }
+
+    @Test
+    @Override
+    public void testStorePartitionWithStatistics()
+            throws Exception
+    {
+        // When the table has partitions, but row count statistics are set to zero, we treat this case as empty
+        // statistics to avoid underestimation in the CBO. This scenario may be caused when other engines are
+        // used to ingest data into partitioned hive tables.
+        testStorePartitionWithStatistics(STATISTICS_PARTITIONED_TABLE_COLUMNS, STATISTICS_1, STATISTICS_2, STATISTICS_1_1, EMPTY_ROWCOUNT_STATISTICS);
+    }
+
+    @Test
+    @Override
+    public void testDataColumnProperties()
+    {
+        // Column properties are currently not supported in ThriftHiveMetastore
+        assertThatThrownBy(super::testDataColumnProperties)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Persisting column properties is not supported: Column{name=id, type=bigint}");
+    }
+
+    @Test
+    @Override
+    public void testPartitionColumnProperties()
+    {
+        // Column properties are currently not supported in ThriftHiveMetastore
+        assertThatThrownBy(super::testPartitionColumnProperties)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Persisting column properties is not supported: Column{name=part_key, type=varchar(256)}");
+    }
 }
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveAlluxioMetastore.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveAlluxioMetastore.java
deleted file mode 100644
index 02cd4791b5cd..000000000000
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveAlluxioMetastore.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import alluxio.client.table.TableMasterClient;
-import alluxio.conf.PropertyKey;
-import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
-import io.trino.plugin.hive.metastore.alluxio.AlluxioHiveMetastore;
-import io.trino.plugin.hive.metastore.alluxio.AlluxioHiveMetastoreConfig;
-import io.trino.plugin.hive.metastore.alluxio.AlluxioMetastoreModule;
-import org.testng.SkipException;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
-
-public class TestHiveAlluxioMetastore
-        extends AbstractTestHive
-{
-    @Parameters({"test.alluxio.host", "test.alluxio.port"})
-    @BeforeClass
-    public void setup(String host, String port)
-    {
-        System.setProperty(PropertyKey.Name.SECURITY_LOGIN_USERNAME, "presto");
-        System.setProperty(PropertyKey.Name.MASTER_HOSTNAME, host);
-        HiveConfig hiveConfig = new HiveConfig()
-                .setParquetTimeZone("UTC")
-                .setRcfileTimeZone("UTC");
-
-        AlluxioHiveMetastoreConfig alluxioConfig = new AlluxioHiveMetastoreConfig();
-        alluxioConfig.setMasterAddress(host + ":" + port);
-        TableMasterClient client = AlluxioMetastoreModule.createCatalogMasterClient(alluxioConfig);
-        setup("default", hiveConfig, new AlluxioHiveMetastore(client, new HiveMetastoreConfig()), HDFS_ENVIRONMENT);
-    }
-
-    @Override
-    public void testBucketSortedTables()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testBucketedTableEvolution()
-    {
-        // Alluxio metastore does not support create/insert/update operations
-    }
-
-    @Override
-    public void testBucketedSortedTableEvolution()
-    {
-        // Alluxio metastore does not support create/insert/update operations
-    }
-
-    @Override
-    public void testBucketedTableValidation()
-            throws Exception
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testBucketedTableEvolutionWithDifferentReadBucketCount()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testEmptyOrcFile()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testPerTransactionDirectoryListerCache()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    // specifically disable so that expected exception on the superclass don't fail this test
-    @Override
-    @Test(enabled = false)
-    public void testEmptyRcBinaryFile()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    // specifically disable so that expected exception on the superclass don't fail this test
-    @Override
-    @Test(enabled = false)
-    public void testEmptyRcTextFile()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    // specifically disable so that expected exception on the superclass don't fail this test
-    @Override
-    @Test(enabled = false)
-    public void testEmptySequenceFile()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testEmptyTableCreation()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testEmptyTextFile()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testGetPartitions()
-    {
-        // Alluxio metastore treats null comment as empty comment
-    }
-
-    @Override
-    public void testGetPartitionsWithBindings()
-    {
-        // Alluxio metastore treats null comment as empty comment
-    }
-
-    @Override
-    public void testGetPartitionsWithFilter()
-    {
-        // Alluxio metastore returns incorrect results
-    }
-
-    @Override
-    public void testHideDeltaLakeTables()
-    {
-        // Alluxio metastore does not support create operations
-        throw new SkipException("not supported");
-    }
-
-    @Override
-    public void testDisallowQueryingOfIcebergTables()
-    {
-        // Alluxio metastore does not support create operations
-        throw new SkipException("not supported");
-    }
-
-    @Override
-    public void testIllegalStorageFormatDuringTableScan()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testInsert()
-    {
-        // Alluxio metastore does not support insert/update operations
-    }
-
-    @Override
-    public void testInsertIntoExistingPartition()
-    {
-        // Alluxio metastore does not support insert/update operations
-    }
-
-    @Override
-    public void testInsertIntoExistingPartitionEmptyStatistics()
-    {
-        // Alluxio metastore does not support insert/update operations
-    }
-
-    @Override
-    public void testInsertIntoNewPartition()
-    {
-        // Alluxio metastore does not support insert/update operations
-    }
-
-    @Override
-    public void testInsertOverwriteUnpartitioned()
-    {
-        // Alluxio metastore does not support insert/update operations
-    }
-
-    @Override
-    public void testInsertUnsupportedWriteType()
-    {
-        // Alluxio metastore does not support insert/update operations
-    }
-
-    @Override
-    public void testMetadataDelete()
-    {
-        // Alluxio metastore does not support create/delete operations
-    }
-
-    @Override
-    public void testMismatchSchemaTable()
-    {
-        // Alluxio metastore does not support create/delete operations
-    }
-
-    @Override
-    public void testPartitionStatisticsSampling()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testApplyProjection()
-    {
-        // Alluxio metastore does not support create/delete operations
-    }
-
-    @Override
-    public void testApplyRedirection()
-    {
-        // Alluxio metastore does not support create/delete operations
-    }
-
-    @Override
-    public void testMaterializedViewMetadata()
-    {
-        // Alluxio metastore does not support create/delete operations
-    }
-
-    @Override
-    public void testOrcPageSourceMetrics()
-    {
-        // Alluxio metastore does not support create/insert/delete operations
-    }
-
-    @Override
-    public void testParquetPageSourceMetrics()
-    {
-        // Alluxio metastore does not support create/insert/delete operations
-    }
-
-    @Override
-    public void testPreferredInsertLayout()
-    {
-        // Alluxio metastore does not support insert layout operations
-    }
-
-    @Override
-    public void testInsertBucketedTableLayout()
-    {
-        // Alluxio metastore does not support insert layout operations
-    }
-
-    @Override
-    public void testInsertPartitionedBucketedTableLayout()
-    {
-        // Alluxio metastore does not support insert layout operations
-    }
-
-    @Override
-    public void testStorePartitionWithStatistics()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testRenameTable()
-    {
-        // Alluxio metastore does not support update operations
-    }
-
-    @Override
-    public void testTableCreation()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testTableCreationWithTrailingSpaceInLocation()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testTableCreationIgnoreExisting()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testTableCreationRollback()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testTransactionDeleteInsert()
-    {
-        // Alluxio metastore does not support insert/update/delete operations
-    }
-
-    @Override
-    public void testTypesOrc()
-            throws Exception
-    {
-        super.testTypesOrc();
-    }
-
-    @Override
-    public void testUpdateBasicPartitionStatistics()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testUpdateBasicTableStatistics()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testUpdatePartitionColumnStatistics()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testUpdatePartitionColumnStatisticsEmptyOptionalFields()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testInputInfoWhenTableIsPartitioned()
-    {
-        // Alluxio metastore does not support create/delete operations
-    }
-
-    @Override
-    public void testInputInfoWhenTableIsNotPartitioned()
-    {
-        // Alluxio metastore does not support create/delete operations
-    }
-
-    @Override
-    public void testInputInfoWithParquetTableFormat()
-    {
-        // Alluxio metastore does not support create/delete operations
-    }
-
-    @Override
-    public void testUpdateTableColumnStatistics()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testUpdateTableColumnStatisticsEmptyOptionalFields()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testViewCreation()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testNewDirectoryPermissions()
-    {
-        // Alluxio metastore does not support create operations
-    }
-
-    @Override
-    public void testInsertBucketedTransactionalTableLayout()
-            throws Exception
-    {
-        // Alluxio metastore does not support insert/update/delete operations
-    }
-
-    @Override
-    public void testInsertPartitionedBucketedTransactionalTableLayout()
-            throws Exception
-    {
-        // Alluxio metastore does not support insert/update/delete operations
-    }
-
-    @Override
-    public void testCreateEmptyTableShouldNotCreateStagingDirectory()
-    {
-        // Alluxio metastore does not support create operations
-    }
-}
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemAbfsAccessKey.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemAbfsAccessKey.java
index 7300194872d2..539fc8ffcc47 100644
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemAbfsAccessKey.java
+++ b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemAbfsAccessKey.java
@@ -13,29 +13,29 @@
  */
 package io.trino.plugin.hive;
 
-import io.trino.plugin.hive.azure.HiveAzureConfig;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Parameters;
+import io.trino.hdfs.azure.HiveAzureConfig;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
 public class TestHiveFileSystemAbfsAccessKey
         extends AbstractTestHiveFileSystemAbfs
 {
     private String accessKey;
 
-    @Parameters({
-            "hive.hadoop2.metastoreHost",
-            "hive.hadoop2.metastorePort",
-            "hive.hadoop2.databaseName",
-            "hive.hadoop2.abfs.container",
-            "hive.hadoop2.abfs.account",
-            "hive.hadoop2.abfs.accessKey",
-            "hive.hadoop2.abfs.testDirectory",
-    })
-    @BeforeClass
-    public void setup(String host, int port, String databaseName, String container, String account, String accessKey, String testDirectory)
+    @BeforeAll
+    public void setup()
     {
-        this.accessKey = checkParameter(accessKey, "access key");
-        super.setup(host, port, databaseName, container, account, testDirectory);
+        this.accessKey = checkParameter(System.getProperty("hive.hadoop2.abfs.accessKey"), "access key");
+        super.setup(
+                System.getProperty("hive.hadoop2.metastoreHost"),
+                Integer.getInteger("hive.hadoop2.metastorePort"),
+                System.getProperty("hive.hadoop2.databaseName"),
+                System.getProperty("hive.hadoop2.abfs.container"),
+                System.getProperty("hive.hadoop2.abfs.account"),
+                System.getProperty("hive.hadoop2.abfs.testDirectory"));
     }
 
     @Override
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemAbfsOAuth.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemAbfsOAuth.java
index 2eb1df40d1e7..36adb3a9db31 100644
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemAbfsOAuth.java
+++ b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemAbfsOAuth.java
@@ -13,10 +13,13 @@
  */
 package io.trino.plugin.hive;
 
-import io.trino.plugin.hive.azure.HiveAzureConfig;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Parameters;
+import io.trino.hdfs.azure.HiveAzureConfig;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
 public class TestHiveFileSystemAbfsOAuth
         extends AbstractTestHiveFileSystemAbfs
 {
@@ -24,33 +27,19 @@ public class TestHiveFileSystemAbfsOAuth
     private String clientId;
     private String secret;
 
-    @Parameters({
-            "hive.hadoop2.metastoreHost",
-            "hive.hadoop2.metastorePort",
-            "hive.hadoop2.databaseName",
-            "test.hive.azure.abfs.container",
-            "test.hive.azure.abfs.storage-account",
-            "test.hive.azure.abfs.test-directory",
-            "test.hive.azure.abfs.oauth.endpoint",
-            "test.hive.azure.abfs.oauth.client-id",
-            "test.hive.azure.abfs.oauth.secret",
-    })
-    @BeforeClass
-    public void setup(
-            String host,
-            int port,
-            String databaseName,
-            String container,
-            String account,
-            String testDirectory,
-            String clientEndpoint,
-            String clientId,
-            String clientSecret)
+    @BeforeAll
+    public void setup()
     {
-        this.endpoint = checkParameter(clientEndpoint, "endpoint");
-        this.clientId = checkParameter(clientId, "client ID");
-        this.secret = checkParameter(clientSecret, "secret");
-        super.setup(host, port, databaseName, container, account, testDirectory);
+        this.endpoint = checkParameter(System.getProperty("test.hive.azure.abfs.oauth.endpoint"), "endpoint");
+        this.clientId = checkParameter(System.getProperty("test.hive.azure.abfs.oauth.client-id"), "client ID");
+        this.secret = checkParameter(System.getProperty("test.hive.azure.abfs.oauth.secret"), "secret");
+        super.setup(
+                System.getProperty("hive.hadoop2.metastoreHost"),
+                Integer.getInteger("hive.hadoop2.metastorePort"),
+                System.getProperty("hive.hadoop2.databaseName"),
+                System.getProperty("test.hive.azure.abfs.container"),
+                System.getProperty("test.hive.azure.abfs.storage-account"),
+                System.getProperty("test.hive.azure.abfs.test-directory"));
     }
 
     @Override
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemAdl.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemAdl.java
index 59fe0e7b1be4..88758304df51 100644
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemAdl.java
+++ b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemAdl.java
@@ -19,13 +19,13 @@
 import io.trino.hdfs.HdfsConfig;
 import io.trino.hdfs.HdfsConfiguration;
 import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.plugin.hive.azure.HiveAzureConfig;
-import io.trino.plugin.hive.azure.TrinoAzureConfigurationInitializer;
+import io.trino.hdfs.azure.HiveAzureConfig;
+import io.trino.hdfs.azure.TrinoAzureConfigurationInitializer;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.FileNotFoundException;
 import java.util.UUID;
@@ -33,10 +33,12 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 import static org.testng.util.Strings.isNullOrEmpty;
 
+@TestInstance(PER_CLASS)
 public class TestHiveFileSystemAdl
         extends AbstractTestHiveFileSystem
 {
@@ -46,19 +48,18 @@ public class TestHiveFileSystemAdl
     private String refreshUrl;
     private String testDirectory;
 
-    @Parameters({
-            "hive.hadoop2.metastoreHost",
-            "hive.hadoop2.metastorePort",
-            "hive.hadoop2.databaseName",
-            "hive.hadoop2.adl.name",
-            "hive.hadoop2.adl.clientId",
-            "hive.hadoop2.adl.credential",
-            "hive.hadoop2.adl.refreshUrl",
-            "hive.hadoop2.adl.testDirectory",
-    })
-    @BeforeClass
-    public void setup(String host, int port, String databaseName, String dataLakeName, String clientId, String credential, String refreshUrl, String testDirectory)
+    @BeforeAll
+    public void setup()
     {
+        String host = System.getProperty("hive.hadoop2.metastoreHost");
+        int port = Integer.getInteger("hive.hadoop2.metastorePort");
+        String databaseName = System.getProperty("hive.hadoop2.databaseName");
+        String dataLakeName = System.getProperty("hive.hadoop2.adl.name");
+        String clientId = System.getProperty("hive.hadoop2.adl.clientId");
+        String credential = System.getProperty("hive.hadoop2.adl.credential");
+        String refreshUrl = System.getProperty("hive.hadoop2.adl.refreshUrl");
+        String testDirectory = System.getProperty("hive.hadoop2.adl.testDirectory");
+
         checkArgument(!isNullOrEmpty(host), "expected non empty host");
         checkArgument(!isNullOrEmpty(databaseName), "expected non empty databaseName");
         checkArgument(!isNullOrEmpty(dataLakeName), "expected non empty dataLakeName");
@@ -73,7 +74,7 @@ public void setup(String host, int port, String databaseName, String dataLakeNam
         this.refreshUrl = refreshUrl;
         this.testDirectory = testDirectory;
 
-        super.setup(host, port, databaseName, false, createHdfsConfiguration());
+        super.setup(host, port, databaseName, createHdfsConfiguration());
     }
 
     private HdfsConfiguration createHdfsConfiguration()
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemS3.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemS3.java
index de826be81efc..448b085b728d 100644
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemS3.java
+++ b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemS3.java
@@ -13,24 +13,253 @@
  */
 package io.trino.plugin.hive;
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Parameters;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.client.builder.AwsClientBuilder;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.ObjectMetadata;
+import com.amazonaws.services.s3.model.PutObjectRequest;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Streams;
+import com.google.common.net.MediaType;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.hdfs.ConfigurationInitializer;
+import io.trino.hdfs.DynamicHdfsConfiguration;
+import io.trino.hdfs.HdfsConfig;
+import io.trino.hdfs.HdfsConfiguration;
+import io.trino.hdfs.HdfsConfigurationInitializer;
+import io.trino.hdfs.HdfsNamenodeStats;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
+import io.trino.hdfs.s3.HiveS3Config;
+import io.trino.hdfs.s3.TrinoS3ConfigurationInitializer;
+import io.trino.plugin.hive.fs.FileSystemDirectoryLister;
+import io.trino.plugin.hive.fs.HiveFileIterator;
+import io.trino.plugin.hive.fs.TrinoFileStatus;
+import io.trino.plugin.hive.metastore.Column;
+import io.trino.plugin.hive.metastore.StorageFormat;
+import io.trino.plugin.hive.metastore.Table;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.plugin.hive.HiveTestUtils.SESSION;
+import static io.trino.plugin.hive.HiveType.HIVE_LONG;
+import static io.trino.plugin.hive.HiveType.HIVE_STRING;
+import static java.io.InputStream.nullInputStream;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.testng.Assert.assertFalse;
+import static org.testng.util.Strings.isNullOrEmpty;
+
+@TestInstance(PER_CLASS)
 public class TestHiveFileSystemS3
-        extends AbstractTestHiveFileSystemS3
+        extends AbstractTestHiveFileSystem
 {
-    @Parameters({
-            "hive.hadoop2.metastoreHost",
-            "hive.hadoop2.metastorePort",
-            "hive.hadoop2.databaseName",
-            "hive.hadoop2.s3.awsAccessKey",
-            "hive.hadoop2.s3.awsSecretKey",
-            "hive.hadoop2.s3.writableBucket",
-            "hive.hadoop2.s3.testDirectory",
-    })
-    @BeforeClass
-    public void setup(String host, int port, String databaseName, String awsAccessKey, String awsSecretKey, String writableBucket, String testDirectory)
+    private static final MediaType DIRECTORY_MEDIA_TYPE = MediaType.create("application", "x-directory");
+    private String awsAccessKey;
+    private String awsSecretKey;
+    private String writableBucket;
+    private String testDirectory;
+    private AmazonS3 s3Client;
+
+    @BeforeAll
+    public void setup()
+    {
+        String host = System.getProperty("hive.hadoop2.metastoreHost");
+        int port = Integer.getInteger("hive.hadoop2.metastorePort");
+        String databaseName = System.getProperty("hive.hadoop2.databaseName");
+        String s3endpoint = System.getProperty("hive.hadoop2.s3.endpoint");
+        String awsAccessKey = System.getProperty("hive.hadoop2.s3.awsAccessKey");
+        String awsSecretKey = System.getProperty("hive.hadoop2.s3.awsSecretKey");
+        String writableBucket = System.getProperty("hive.hadoop2.s3.writableBucket");
+        String testDirectory = System.getProperty("hive.hadoop2.s3.testDirectory");
+
+        checkArgument(!isNullOrEmpty(host), "Expected non empty host");
+        checkArgument(!isNullOrEmpty(databaseName), "Expected non empty databaseName");
+        checkArgument(!isNullOrEmpty(awsAccessKey), "Expected non empty awsAccessKey");
+        checkArgument(!isNullOrEmpty(awsSecretKey), "Expected non empty awsSecretKey");
+        checkArgument(!isNullOrEmpty(s3endpoint), "Expected non empty s3endpoint");
+        checkArgument(!isNullOrEmpty(writableBucket), "Expected non empty writableBucket");
+        checkArgument(!isNullOrEmpty(testDirectory), "Expected non empty testDirectory");
+        this.awsAccessKey = awsAccessKey;
+        this.awsSecretKey = awsSecretKey;
+        this.writableBucket = writableBucket;
+        this.testDirectory = testDirectory;
+
+        s3Client = AmazonS3Client.builder()
+                .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(s3endpoint, null))
+                .withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(awsAccessKey, awsSecretKey)))
+                .build();
+
+        setup(host, port, databaseName, createHdfsConfiguration());
+    }
+
+    private HdfsConfiguration createHdfsConfiguration()
+    {
+        ConfigurationInitializer s3Config = new TrinoS3ConfigurationInitializer(new HiveS3Config()
+                .setS3AwsAccessKey(awsAccessKey)
+                .setS3AwsSecretKey(awsSecretKey));
+        HdfsConfigurationInitializer initializer = new HdfsConfigurationInitializer(new HdfsConfig(), ImmutableSet.of(s3Config));
+        return new DynamicHdfsConfiguration(initializer, ImmutableSet.of());
+    }
+
+    @Override
+    protected Path getBasePath()
+    {
+        // HDP 3.1 does not understand s3:// out of the box.
+        return new Path(format("s3a://%s/%s/", writableBucket, testDirectory));
+    }
+
+    @Test
+    public void testIgnoreHadoopFolderMarker()
+            throws Exception
+    {
+        Path basePath = getBasePath();
+        FileSystem fs = hdfsEnvironment.getFileSystem(TESTING_CONTEXT, basePath);
+
+        String markerFileName = "test_table_$folder$";
+        Path filePath = new Path(basePath, markerFileName);
+        fs.create(filePath).close();
+
+        assertFalse(Arrays.stream(fs.listStatus(basePath)).anyMatch(file -> file.getPath().getName().equalsIgnoreCase(markerFileName)));
+    }
+
+    /**
+     * Tests the same functionality like {@link #testFileIteratorPartitionedListing()} with the
+     * setup done by native {@link AmazonS3}
+     */
+    @Test
+    public void testFileIteratorPartitionedListingNativeS3Client()
+            throws Exception
+    {
+        Table.Builder tableBuilder = Table.builder()
+                .setDatabaseName(table.getSchemaName())
+                .setTableName(table.getTableName())
+                .setDataColumns(ImmutableList.of(new Column("data", HIVE_LONG, Optional.empty())))
+                .setPartitionColumns(ImmutableList.of(new Column("part", HIVE_STRING, Optional.empty())))
+                .setOwner(Optional.empty())
+                .setTableType("fake");
+        tableBuilder.getStorageBuilder()
+                .setStorageFormat(StorageFormat.fromHiveStorageFormat(HiveStorageFormat.CSV));
+        Table fakeTable = tableBuilder.build();
+
+        Path basePath = new Path(getBasePath(), "test-file-iterator-partitioned-listing-native-setup");
+        FileSystem fs = hdfsEnvironment.getFileSystem(TESTING_CONTEXT, basePath);
+        TrinoFileSystem trinoFileSystem = new HdfsFileSystemFactory(hdfsEnvironment, new TrinoHdfsFileSystemStats()).create(SESSION);
+        fs.mkdirs(basePath);
+        String basePrefix = basePath.toUri().getPath().substring(1);
+
+        // Expected file system tree:
+        // test-file-iterator-partitioned-listing-native-setup/
+        //      .hidden/
+        //          nested-file-in-hidden.txt
+        //      part=simple/
+        //          _hidden-file.txt
+        //          plain-file.txt
+        //      part=nested/
+        //          parent/
+        //             _nested-hidden-file.txt
+        //             nested-file.txt
+        //      part=plus+sign/
+        //          plus-file.txt
+        //      part=percent%sign/
+        //          percent-file.txt
+        //      part=url%20encoded/
+        //          url-encoded-file.txt
+        //      part=level1|level2/
+        //          pipe-file.txt
+        //          parent1/
+        //             parent2/
+        //                deeply-nested-file.txt
+        //      part=level1 | level2/
+        //          pipe-blanks-file.txt
+        //      empty-directory/
+        //      .hidden-in-base.txt
+
+        createFile(writableBucket, format("%s/.hidden/nested-file-in-hidden.txt", basePrefix));
+        createFile(writableBucket, format("%s/part=simple/_hidden-file.txt", basePrefix));
+        createFile(writableBucket, format("%s/part=simple/plain-file.txt", basePrefix));
+        createFile(writableBucket, format("%s/part=nested/parent/_nested-hidden-file.txt", basePrefix));
+        createFile(writableBucket, format("%s/part=nested/parent/nested-file.txt", basePrefix));
+        createFile(writableBucket, format("%s/part=plus+sign/plus-file.txt", basePrefix));
+        createFile(writableBucket, format("%s/part=percent%%sign/percent-file.txt", basePrefix));
+        createFile(writableBucket, format("%s/part=url%%20encoded/url-encoded-file.txt", basePrefix));
+        createFile(writableBucket, format("%s/part=level1|level2/pipe-file.txt", basePrefix));
+        createFile(writableBucket, format("%s/part=level1|level2/parent1/parent2/deeply-nested-file.txt", basePrefix));
+        createFile(writableBucket, format("%s/part=level1 | level2/pipe-blanks-file.txt", basePrefix));
+        createDirectory(writableBucket, format("%s/empty-directory/", basePrefix));
+        createFile(writableBucket, format("%s/.hidden-in-base.txt", basePrefix));
+
+        // List recursively through hive file iterator
+        HiveFileIterator recursiveIterator = new HiveFileIterator(
+                fakeTable,
+                Location.of(basePath.toString()),
+                trinoFileSystem,
+                new FileSystemDirectoryLister(),
+                new HdfsNamenodeStats(),
+                HiveFileIterator.NestedDirectoryPolicy.RECURSE);
+
+        List<String> recursiveListing = Streams.stream(recursiveIterator)
+                .map(TrinoFileStatus::getPath)
+                .toList();
+        // Should not include directories, or files underneath hidden directories
+        assertThat(recursiveListing).containsExactlyInAnyOrder(
+                format("%s/part=simple/plain-file.txt", basePath),
+                format("%s/part=nested/parent/nested-file.txt", basePath),
+                format("%s/part=plus+sign/plus-file.txt", basePath),
+                format("%s/part=percent%%sign/percent-file.txt", basePath),
+                format("%s/part=url%%20encoded/url-encoded-file.txt", basePath),
+                format("%s/part=level1|level2/pipe-file.txt", basePath),
+                format("%s/part=level1|level2/parent1/parent2/deeply-nested-file.txt", basePath),
+                format("%s/part=level1 | level2/pipe-blanks-file.txt", basePath));
+
+        HiveFileIterator shallowIterator = new HiveFileIterator(
+                fakeTable,
+                Location.of(basePath.toString()),
+                trinoFileSystem,
+                new FileSystemDirectoryLister(),
+                new HdfsNamenodeStats(),
+                HiveFileIterator.NestedDirectoryPolicy.IGNORED);
+        List<Path> shallowListing = Streams.stream(shallowIterator)
+                .map(TrinoFileStatus::getPath)
+                .map(Path::new)
+                .toList();
+        // Should not include any hidden files, folders, or nested files
+        assertThat(shallowListing).isEmpty();
+    }
+
+    protected void createDirectory(String bucketName, String key)
+    {
+        // create meta-data for your folder and set content-length to 0
+        ObjectMetadata metadata = new ObjectMetadata();
+        metadata.setContentLength(0);
+        metadata.setContentType(DIRECTORY_MEDIA_TYPE.toString());
+        // create a PutObjectRequest passing the folder name suffixed by /
+        if (!key.endsWith("/")) {
+            key += "/";
+        }
+        PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, nullInputStream(), metadata);
+        // send request to S3 to create folder
+        s3Client.putObject(putObjectRequest);
+    }
+
+    protected void createFile(String bucketName, String key)
     {
-        super.setup(host, port, databaseName, awsAccessKey, awsSecretKey, writableBucket, testDirectory, false);
+        ObjectMetadata metadata = new ObjectMetadata();
+        metadata.setContentLength(0);
+        PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, nullInputStream(), metadata);
+        s3Client.putObject(putObjectRequest);
     }
 }
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemWasb.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemWasb.java
index 73b7fcd53c24..955675b7d1d5 100644
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemWasb.java
+++ b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemWasb.java
@@ -19,16 +19,18 @@
 import io.trino.hdfs.HdfsConfig;
 import io.trino.hdfs.HdfsConfiguration;
 import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.plugin.hive.azure.HiveAzureConfig;
-import io.trino.plugin.hive.azure.TrinoAzureConfigurationInitializer;
+import io.trino.hdfs.azure.HiveAzureConfig;
+import io.trino.hdfs.azure.TrinoAzureConfigurationInitializer;
 import org.apache.hadoop.fs.Path;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Parameters;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.util.Strings.isNullOrEmpty;
 
+@TestInstance(PER_CLASS)
 public class TestHiveFileSystemWasb
         extends AbstractTestHiveFileSystem
 {
@@ -37,18 +39,17 @@ public class TestHiveFileSystemWasb
     private String accessKey;
     private String testDirectory;
 
-    @Parameters({
-            "hive.hadoop2.metastoreHost",
-            "hive.hadoop2.metastorePort",
-            "hive.hadoop2.databaseName",
-            "hive.hadoop2.wasb.container",
-            "hive.hadoop2.wasb.account",
-            "hive.hadoop2.wasb.accessKey",
-            "hive.hadoop2.wasb.testDirectory",
-    })
-    @BeforeClass
-    public void setup(String host, int port, String databaseName, String container, String account, String accessKey, String testDirectory)
+    @BeforeAll
+    public void setup()
     {
+        String host = System.getProperty("hive.hadoop2.metastoreHost");
+        int port = Integer.getInteger("hive.hadoop2.metastorePort");
+        String databaseName = System.getProperty("hive.hadoop2.databaseName");
+        String container = System.getProperty("hive.hadoop2.wasb.container");
+        String account = System.getProperty("hive.hadoop2.wasb.account");
+        String accessKey = System.getProperty("hive.hadoop2.wasb.accessKey");
+        String testDirectory = System.getProperty("hive.hadoop2.wasb.testDirectory");
+
         checkArgument(!isNullOrEmpty(host), "expected non empty host");
         checkArgument(!isNullOrEmpty(databaseName), "expected non empty databaseName");
         checkArgument(!isNullOrEmpty(container), "expected non empty container");
@@ -61,7 +62,7 @@ public void setup(String host, int port, String databaseName, String container,
         this.accessKey = accessKey;
         this.testDirectory = testDirectory;
 
-        super.setup(host, port, databaseName, false, createHdfsConfiguration());
+        super.setup(host, port, databaseName, createHdfsConfiguration());
     }
 
     private HdfsConfiguration createHdfsConfiguration()
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHivePlugin.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHivePlugin.java
index 682afab7fe82..b02ae6e60bba 100644
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHivePlugin.java
+++ b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHivePlugin.java
@@ -78,6 +78,19 @@ public void testCreateConnector()
         factory.create("test", ImmutableMap.of("hive.metastore.uri", "thrift://foo:1234"), new TestingConnectorContext()).shutdown();
     }
 
+    @Test
+    public void testTestingFileMetastore()
+    {
+        ConnectorFactory factory = getHiveConnectorFactory();
+        factory.create(
+                        "test",
+                        ImmutableMap.of(
+                                "hive.metastore", "file",
+                                "hive.metastore.catalog.dir", "/tmp"),
+                        new TestingConnectorContext())
+                .shutdown();
+    }
+
     @Test
     public void testThriftMetastore()
     {
@@ -114,20 +127,6 @@ public void testGlueMetastore()
                 .hasMessageContaining("Error: Configuration property 'hive.metastore.uri' was not used");
     }
 
-    @Test
-    public void testAlluxioMetastore()
-    {
-        ConnectorFactory factory = getHiveConnectorFactory();
-
-        factory.create(
-                "test",
-                ImmutableMap.of(
-                        "hive.metastore", "alluxio-deprecated",
-                        "hive.metastore.alluxio.master.address", "dummy:1234"),
-                new TestingConnectorContext())
-                .shutdown();
-    }
-
     @Test
     public void testRecordingMetastore()
     {
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/S3SelectTestHelper.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/S3SelectTestHelper.java
deleted file mode 100644
index 383de59458ad..000000000000
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/S3SelectTestHelper.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.net.HostAndPort;
-import io.airlift.concurrent.BoundedExecutor;
-import io.airlift.json.JsonCodec;
-import io.airlift.stats.CounterStat;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
-import io.trino.hdfs.ConfigurationInitializer;
-import io.trino.hdfs.DynamicHdfsConfiguration;
-import io.trino.hdfs.HdfsConfig;
-import io.trino.hdfs.HdfsConfiguration;
-import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.hdfs.HdfsEnvironment;
-import io.trino.hdfs.authentication.NoHdfsAuthentication;
-import io.trino.plugin.base.CatalogName;
-import io.trino.plugin.hive.AbstractTestHiveFileSystem.TestingHiveMetastore;
-import io.trino.plugin.hive.DefaultHiveMaterializedViewMetadataFactory;
-import io.trino.plugin.hive.GenericHiveRecordCursorProvider;
-import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.HiveLocationService;
-import io.trino.plugin.hive.HiveMetadataFactory;
-import io.trino.plugin.hive.HivePageSourceProvider;
-import io.trino.plugin.hive.HivePartitionManager;
-import io.trino.plugin.hive.HiveSplitManager;
-import io.trino.plugin.hive.HiveTransactionManager;
-import io.trino.plugin.hive.LocationService;
-import io.trino.plugin.hive.NamenodeStats;
-import io.trino.plugin.hive.NodeVersion;
-import io.trino.plugin.hive.NoneHiveRedirectionsProvider;
-import io.trino.plugin.hive.PartitionUpdate;
-import io.trino.plugin.hive.PartitionsSystemTableProvider;
-import io.trino.plugin.hive.PropertiesSystemTableProvider;
-import io.trino.plugin.hive.aws.athena.PartitionProjectionService;
-import io.trino.plugin.hive.fs.FileSystemDirectoryLister;
-import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
-import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
-import io.trino.plugin.hive.metastore.thrift.BridgingHiveMetastore;
-import io.trino.plugin.hive.s3.HiveS3Config;
-import io.trino.plugin.hive.s3.TrinoS3ConfigurationInitializer;
-import io.trino.plugin.hive.security.SqlStandardAccessControlMetadata;
-import io.trino.spi.connector.ColumnHandle;
-import io.trino.spi.connector.ConnectorPageSourceProvider;
-import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.connector.ConnectorSplitManager;
-import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.type.TestingTypeManager;
-import io.trino.testing.MaterializedResult;
-import org.apache.hadoop.fs.Path;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.stream.LongStream;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
-import static io.airlift.concurrent.Threads.daemonThreadsNamed;
-import static io.trino.plugin.hive.HiveFileSystemTestUtils.filterTable;
-import static io.trino.plugin.hive.HiveFileSystemTestUtils.getSplitsCount;
-import static io.trino.plugin.hive.HiveTestUtils.getDefaultHivePageSourceFactories;
-import static io.trino.plugin.hive.HiveTestUtils.getDefaultHiveRecordCursorProviders;
-import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
-import static io.trino.spi.connector.MetadataProvider.NOOP_METADATA_PROVIDER;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
-import static java.lang.String.format;
-import static java.util.concurrent.Executors.newCachedThreadPool;
-import static java.util.concurrent.Executors.newScheduledThreadPool;
-import static org.testng.util.Strings.isNullOrEmpty;
-
-public class S3SelectTestHelper
-{
-    private HdfsEnvironment hdfsEnvironment;
-    private LocationService locationService;
-    private TestingHiveMetastore metastoreClient;
-    private HiveMetadataFactory metadataFactory;
-    private HiveTransactionManager transactionManager;
-    private ConnectorSplitManager splitManager;
-    private ConnectorPageSourceProvider pageSourceProvider;
-
-    private ExecutorService executorService;
-    private HiveConfig hiveConfig;
-    private ScheduledExecutorService heartbeatService;
-
-    public S3SelectTestHelper(String host,
-                              int port,
-                              String databaseName,
-                              String awsAccessKey,
-                              String awsSecretKey,
-                              String writableBucket,
-                              String testDirectory,
-                              HiveConfig hiveConfig)
-    {
-        checkArgument(!isNullOrEmpty(host), "Expected non empty host");
-        checkArgument(!isNullOrEmpty(databaseName), "Expected non empty databaseName");
-        checkArgument(!isNullOrEmpty(awsAccessKey), "Expected non empty awsAccessKey");
-        checkArgument(!isNullOrEmpty(awsSecretKey), "Expected non empty awsSecretKey");
-        checkArgument(!isNullOrEmpty(writableBucket), "Expected non empty writableBucket");
-        checkArgument(!isNullOrEmpty(testDirectory), "Expected non empty testDirectory");
-
-        executorService = newCachedThreadPool(daemonThreadsNamed("s3select-tests-%s"));
-        heartbeatService = newScheduledThreadPool(1);
-
-        ConfigurationInitializer s3Config = new TrinoS3ConfigurationInitializer(new HiveS3Config()
-                .setS3AwsAccessKey(awsAccessKey)
-                .setS3AwsSecretKey(awsSecretKey));
-        HdfsConfigurationInitializer initializer = new HdfsConfigurationInitializer(new HdfsConfig(), ImmutableSet.of(s3Config));
-        HdfsConfiguration hdfsConfiguration = new DynamicHdfsConfiguration(initializer, ImmutableSet.of());
-
-        this.hiveConfig = hiveConfig;
-        HivePartitionManager hivePartitionManager = new HivePartitionManager(this.hiveConfig);
-
-        hdfsEnvironment = new HdfsEnvironment(hdfsConfiguration, new HdfsConfig(), new NoHdfsAuthentication());
-        locationService = new HiveLocationService(hdfsEnvironment);
-        JsonCodec<PartitionUpdate> partitionUpdateCodec = JsonCodec.jsonCodec(PartitionUpdate.class);
-
-        metastoreClient = new TestingHiveMetastore(
-                new BridgingHiveMetastore(
-                        testingThriftHiveMetastoreBuilder()
-                                .metastoreClient(HostAndPort.fromParts(host, port))
-                                .hiveConfig(this.hiveConfig)
-                                .hdfsEnvironment(hdfsEnvironment)
-                                .build()),
-                new Path(format("s3a://%s/%s/", writableBucket, testDirectory)),
-                hdfsEnvironment);
-        metadataFactory = new HiveMetadataFactory(
-                new CatalogName("hive"),
-                this.hiveConfig,
-                new HiveMetastoreConfig(),
-                HiveMetastoreFactory.ofInstance(metastoreClient),
-                new HdfsFileSystemFactory(hdfsEnvironment),
-                hdfsEnvironment,
-                hivePartitionManager,
-                newDirectExecutorService(),
-                heartbeatService,
-                TESTING_TYPE_MANAGER,
-                NOOP_METADATA_PROVIDER,
-                locationService,
-                partitionUpdateCodec,
-                new NodeVersion("test_version"),
-                new NoneHiveRedirectionsProvider(),
-                ImmutableSet.of(
-                        new PartitionsSystemTableProvider(hivePartitionManager, TESTING_TYPE_MANAGER),
-                        new PropertiesSystemTableProvider()),
-                new DefaultHiveMaterializedViewMetadataFactory(),
-                SqlStandardAccessControlMetadata::new,
-                new FileSystemDirectoryLister(),
-                new PartitionProjectionService(this.hiveConfig, ImmutableMap.of(), new TestingTypeManager()),
-                true);
-        transactionManager = new HiveTransactionManager(metadataFactory);
-
-        splitManager = new HiveSplitManager(
-                transactionManager,
-                hivePartitionManager,
-                new HdfsFileSystemFactory(hdfsEnvironment),
-                new NamenodeStats(),
-                hdfsEnvironment,
-                new BoundedExecutor(executorService, this.hiveConfig.getMaxSplitIteratorThreads()),
-                new CounterStat(),
-                this.hiveConfig.getMaxOutstandingSplits(),
-                this.hiveConfig.getMaxOutstandingSplitsSize(),
-                this.hiveConfig.getMinPartitionBatchSize(),
-                this.hiveConfig.getMaxPartitionBatchSize(),
-                this.hiveConfig.getMaxInitialSplits(),
-                this.hiveConfig.getSplitLoaderConcurrency(),
-                this.hiveConfig.getMaxSplitsPerSecond(),
-                this.hiveConfig.getRecursiveDirWalkerEnabled(),
-                TESTING_TYPE_MANAGER,
-                this.hiveConfig.getMaxPartitionsPerScan());
-
-        pageSourceProvider = new HivePageSourceProvider(
-                TESTING_TYPE_MANAGER,
-                hdfsEnvironment,
-                this.hiveConfig,
-                getDefaultHivePageSourceFactories(hdfsEnvironment, this.hiveConfig),
-                getDefaultHiveRecordCursorProviders(this.hiveConfig, hdfsEnvironment),
-                new GenericHiveRecordCursorProvider(hdfsEnvironment, this.hiveConfig));
-    }
-
-    public S3SelectTestHelper(String host,
-                              int port,
-                              String databaseName,
-                              String awsAccessKey,
-                              String awsSecretKey,
-                              String writableBucket,
-                              String testDirectory)
-    {
-        this(host, port, databaseName, awsAccessKey, awsSecretKey, writableBucket, testDirectory, new HiveConfig().setS3SelectPushdownEnabled(true));
-    }
-
-    public HiveTransactionManager getTransactionManager()
-    {
-        return transactionManager;
-    }
-
-    public ConnectorSplitManager getSplitManager()
-    {
-        return splitManager;
-    }
-
-    public ConnectorPageSourceProvider getPageSourceProvider()
-    {
-        return pageSourceProvider;
-    }
-
-    public HiveConfig getHiveConfig()
-    {
-        return hiveConfig;
-    }
-
-    public void tearDown()
-    {
-        hdfsEnvironment = null;
-        locationService = null;
-        metastoreClient = null;
-        metadataFactory = null;
-        transactionManager = null;
-        splitManager = null;
-        pageSourceProvider = null;
-        hiveConfig = null;
-        if (executorService != null) {
-            executorService.shutdownNow();
-            executorService = null;
-        }
-        if (heartbeatService != null) {
-            heartbeatService.shutdownNow();
-            heartbeatService = null;
-        }
-    }
-
-    int getTableSplitsCount(SchemaTableName table)
-    {
-        return getSplitsCount(
-                table,
-                getTransactionManager(),
-                getHiveConfig(),
-                getSplitManager());
-    }
-
-    MaterializedResult getFilteredTableResult(SchemaTableName table, ColumnHandle column)
-    {
-        try {
-            return filterTable(
-                    table,
-                    List.of(column),
-                    getTransactionManager(),
-                    getHiveConfig(),
-                    getPageSourceProvider(),
-                    getSplitManager());
-        }
-        catch (IOException ignored) {
-        }
-
-        return null;
-    }
-
-    static MaterializedResult expectedResult(ConnectorSession session, int start, int end)
-    {
-        MaterializedResult.Builder builder = MaterializedResult.resultBuilder(session, BIGINT);
-        LongStream.rangeClosed(start, end).forEach(builder::row);
-        return builder.build();
-    }
-
-    static boolean isSplitCountInOpenInterval(int splitCount,
-                                       int lowerBound,
-                                       int upperBound)
-    {
-        // Split number may vary, the minimum number of splits being obtained with
-        // the first split of maxInitialSplitSize and the rest of maxSplitSize
-        return lowerBound < splitCount && splitCount < upperBound;
-    }
-}
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/TestHiveFileSystemS3SelectCsvPushdownWithSplits.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/TestHiveFileSystemS3SelectCsvPushdownWithSplits.java
deleted file mode 100644
index 2edc5bd71f0b..000000000000
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/TestHiveFileSystemS3SelectCsvPushdownWithSplits.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import io.airlift.units.DataSize;
-import io.trino.plugin.hive.HiveConfig;
-import io.trino.spi.connector.ColumnHandle;
-import io.trino.spi.connector.SchemaTableName;
-import io.trino.testing.MaterializedResult;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-import java.util.Optional;
-
-import static io.airlift.units.DataSize.Unit.KILOBYTE;
-import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
-import static io.trino.plugin.hive.HiveColumnHandle.createBaseColumn;
-import static io.trino.plugin.hive.HiveFileSystemTestUtils.newSession;
-import static io.trino.plugin.hive.HiveType.HIVE_INT;
-import static io.trino.plugin.hive.s3select.S3SelectTestHelper.expectedResult;
-import static io.trino.plugin.hive.s3select.S3SelectTestHelper.isSplitCountInOpenInterval;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
-import static org.testng.Assert.assertTrue;
-
-public class TestHiveFileSystemS3SelectCsvPushdownWithSplits
-{
-    private String host;
-    private int port;
-    private String databaseName;
-    private String awsAccessKey;
-    private String awsSecretKey;
-    private String writableBucket;
-    private String testDirectory;
-
-    private SchemaTableName tableCsvWithSplits;
-
-    @Parameters({
-            "hive.hadoop2.metastoreHost",
-            "hive.hadoop2.metastorePort",
-            "hive.hadoop2.databaseName",
-            "hive.hadoop2.s3.awsAccessKey",
-            "hive.hadoop2.s3.awsSecretKey",
-            "hive.hadoop2.s3.writableBucket",
-            "hive.hadoop2.s3.testDirectory",
-    })
-    @BeforeClass
-    public void setup(String host, int port, String databaseName, String awsAccessKey, String awsSecretKey, String writableBucket, String testDirectory)
-    {
-        this.host = host;
-        this.port = port;
-        this.databaseName = databaseName;
-        this.awsAccessKey = awsAccessKey;
-        this.awsSecretKey = awsSecretKey;
-        this.writableBucket = writableBucket;
-        this.testDirectory = testDirectory;
-
-        tableCsvWithSplits = new SchemaTableName(databaseName, "trino_s3select_test_csv_scan_range_pushdown");
-    }
-
-    @DataProvider(name = "testSplitSize")
-    public static Object[][] splitSizeParametersProvider()
-    {
-        return new Object[][] {{3, 2, 15, 30}, {50, 30, 2, 4}};
-    }
-
-    @Test(dataProvider = "testSplitSize")
-    public void testQueryPushdownWithSplitSizeForCsv(int maxSplitSizeKB,
-                                               int maxInitialSplitSizeKB,
-                                               int minSplitCount,
-                                               int maxSplitCount)
-    {
-        S3SelectTestHelper s3SelectTestHelper = null;
-        try {
-            HiveConfig hiveConfig = new HiveConfig()
-                    .setS3SelectPushdownEnabled(true)
-                    .setMaxSplitSize(DataSize.of(maxSplitSizeKB, KILOBYTE))
-                    .setMaxInitialSplitSize(DataSize.of(maxInitialSplitSizeKB, KILOBYTE));
-            s3SelectTestHelper = new S3SelectTestHelper(
-                    host,
-                    port,
-                    databaseName,
-                    awsAccessKey,
-                    awsSecretKey,
-                    writableBucket,
-                    testDirectory,
-                    hiveConfig);
-
-            int tableSplitsCount = s3SelectTestHelper.getTableSplitsCount(tableCsvWithSplits);
-            assertTrue(isSplitCountInOpenInterval(tableSplitsCount, minSplitCount, maxSplitCount));
-
-            ColumnHandle indexColumn = createBaseColumn("index", 0, HIVE_INT, BIGINT, REGULAR, Optional.empty());
-            MaterializedResult filteredTableResult = s3SelectTestHelper.getFilteredTableResult(tableCsvWithSplits, indexColumn);
-            assertEqualsIgnoreOrder(filteredTableResult,
-                    expectedResult(newSession(s3SelectTestHelper.getHiveConfig()), 1, 300));
-        }
-        finally {
-            if (s3SelectTestHelper != null) {
-                s3SelectTestHelper.tearDown();
-            }
-        }
-    }
-}
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/TestHiveFileSystemS3SelectJsonPushdown.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/TestHiveFileSystemS3SelectJsonPushdown.java
deleted file mode 100644
index 260d03608d2c..000000000000
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/TestHiveFileSystemS3SelectJsonPushdown.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.spi.connector.ColumnHandle;
-import io.trino.spi.connector.SchemaTableName;
-import io.trino.testing.MaterializedResult;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import java.util.Optional;
-
-import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
-import static io.trino.plugin.hive.HiveColumnHandle.createBaseColumn;
-import static io.trino.plugin.hive.HiveFileSystemTestUtils.filterTable;
-import static io.trino.plugin.hive.HiveFileSystemTestUtils.newSession;
-import static io.trino.plugin.hive.HiveFileSystemTestUtils.readTable;
-import static io.trino.plugin.hive.HiveType.HIVE_INT;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
-
-public class TestHiveFileSystemS3SelectJsonPushdown
-{
-    private SchemaTableName tableJson;
-
-    private S3SelectTestHelper s3SelectTestHelper;
-
-    @Parameters({
-            "hive.hadoop2.metastoreHost",
-            "hive.hadoop2.metastorePort",
-            "hive.hadoop2.databaseName",
-            "hive.hadoop2.s3.awsAccessKey",
-            "hive.hadoop2.s3.awsSecretKey",
-            "hive.hadoop2.s3.writableBucket",
-            "hive.hadoop2.s3.testDirectory",
-    })
-    @BeforeClass
-    public void setup(String host, int port, String databaseName, String awsAccessKey, String awsSecretKey, String writableBucket, String testDirectory)
-    {
-        s3SelectTestHelper = new S3SelectTestHelper(host, port, databaseName, awsAccessKey, awsSecretKey, writableBucket, testDirectory);
-        tableJson = new SchemaTableName(databaseName, "trino_s3select_test_external_fs_json");
-    }
-
-    @Test
-    public void testGetRecordsJson()
-            throws Exception
-    {
-        assertEqualsIgnoreOrder(
-                readTable(tableJson,
-                        s3SelectTestHelper.getTransactionManager(),
-                        s3SelectTestHelper.getHiveConfig(),
-                        s3SelectTestHelper.getPageSourceProvider(),
-                        s3SelectTestHelper.getSplitManager()),
-                MaterializedResult.resultBuilder(newSession(s3SelectTestHelper.getHiveConfig()), BIGINT, BIGINT)
-                        .row(2L, 4L).row(5L, 6L) // test_table.json
-                        .row(7L, 23L).row(28L, 22L).row(13L, 10L) // test_table.json.gz
-                        .row(1L, 19L).row(6L, 3L).row(24L, 22L).row(100L, 77L) // test_table.json.bz2
-                        .build());
-    }
-
-    @Test
-    public void testFilterRecordsJson()
-            throws Exception
-    {
-        List<ColumnHandle> projectedColumns = ImmutableList.of(
-                createBaseColumn("col_1", 0, HIVE_INT, BIGINT, REGULAR, Optional.empty()));
-
-        assertEqualsIgnoreOrder(
-                filterTable(tableJson,
-                        projectedColumns,
-                        s3SelectTestHelper.getTransactionManager(),
-                        s3SelectTestHelper.getHiveConfig(),
-                        s3SelectTestHelper.getPageSourceProvider(),
-                        s3SelectTestHelper.getSplitManager()),
-                MaterializedResult.resultBuilder(newSession(s3SelectTestHelper.getHiveConfig()), BIGINT)
-                        .row(2L).row(5L) // test_table.json
-                        .row(7L).row(28L).row(13L) // test_table.json.gz
-                        .row(1L).row(6L).row(24L).row(100L) // test_table.json.bz2
-                        .build());
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-    {
-        s3SelectTestHelper.tearDown();
-    }
-}
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/TestHiveFileSystemS3SelectJsonPushdownWithSplits.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/TestHiveFileSystemS3SelectJsonPushdownWithSplits.java
deleted file mode 100644
index 1998ec9368da..000000000000
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/TestHiveFileSystemS3SelectJsonPushdownWithSplits.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import io.airlift.units.DataSize;
-import io.trino.plugin.hive.HiveConfig;
-import io.trino.spi.connector.ColumnHandle;
-import io.trino.spi.connector.SchemaTableName;
-import io.trino.testing.MaterializedResult;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-import java.util.Optional;
-
-import static io.airlift.units.DataSize.Unit.KILOBYTE;
-import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
-import static io.trino.plugin.hive.HiveColumnHandle.createBaseColumn;
-import static io.trino.plugin.hive.HiveFileSystemTestUtils.newSession;
-import static io.trino.plugin.hive.HiveType.HIVE_INT;
-import static io.trino.plugin.hive.s3select.S3SelectTestHelper.expectedResult;
-import static io.trino.plugin.hive.s3select.S3SelectTestHelper.isSplitCountInOpenInterval;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
-import static org.testng.Assert.assertTrue;
-
-public class TestHiveFileSystemS3SelectJsonPushdownWithSplits
-{
-    private String host;
-    private int port;
-    private String databaseName;
-    private String awsAccessKey;
-    private String awsSecretKey;
-    private String writableBucket;
-    private String testDirectory;
-
-    private SchemaTableName tableJsonWithSplits;
-
-    @Parameters({
-            "hive.hadoop2.metastoreHost",
-            "hive.hadoop2.metastorePort",
-            "hive.hadoop2.databaseName",
-            "hive.hadoop2.s3.awsAccessKey",
-            "hive.hadoop2.s3.awsSecretKey",
-            "hive.hadoop2.s3.writableBucket",
-            "hive.hadoop2.s3.testDirectory",
-    })
-    @BeforeClass
-    public void setup(String host, int port, String databaseName, String awsAccessKey, String awsSecretKey, String writableBucket, String testDirectory)
-    {
-        this.host = host;
-        this.port = port;
-        this.databaseName = databaseName;
-        this.awsAccessKey = awsAccessKey;
-        this.awsSecretKey = awsSecretKey;
-        this.writableBucket = writableBucket;
-        this.testDirectory = testDirectory;
-
-        this.tableJsonWithSplits = new SchemaTableName(databaseName, "trino_s3select_test_json_scan_range_pushdown");
-    }
-
-    @DataProvider(name = "testSplitSize")
-    public static Object[][] splitSizeParametersProvider()
-    {
-        return new Object[][] {{15, 10, 6, 12}, {50, 30, 2, 4}};
-    }
-
-    @Test(dataProvider = "testSplitSize")
-    public void testQueryPushdownWithSplitSizeForJson(int maxSplitSizeKB,
-                                                      int maxInitialSplitSizeKB,
-                                                      int minSplitCount,
-                                                      int maxSplitCount)
-    {
-        S3SelectTestHelper s3SelectTestHelper = null;
-        try {
-            HiveConfig hiveConfig = new HiveConfig()
-                    .setS3SelectPushdownEnabled(true)
-                    .setMaxSplitSize(DataSize.of(maxSplitSizeKB, KILOBYTE))
-                    .setMaxInitialSplitSize(DataSize.of(maxInitialSplitSizeKB, KILOBYTE));
-            s3SelectTestHelper = new S3SelectTestHelper(
-                    host,
-                    port,
-                    databaseName,
-                    awsAccessKey,
-                    awsSecretKey,
-                    writableBucket,
-                    testDirectory,
-                    hiveConfig);
-
-            int tableSplitsCount = s3SelectTestHelper.getTableSplitsCount(tableJsonWithSplits);
-            assertTrue(isSplitCountInOpenInterval(tableSplitsCount, minSplitCount, maxSplitCount));
-
-            ColumnHandle indexColumn = createBaseColumn("col_1", 0, HIVE_INT, BIGINT, REGULAR, Optional.empty());
-            MaterializedResult filteredTableResult = s3SelectTestHelper.getFilteredTableResult(tableJsonWithSplits, indexColumn);
-            assertEqualsIgnoreOrder(filteredTableResult,
-                    expectedResult(newSession(s3SelectTestHelper.getHiveConfig()), 1, 300));
-        }
-        finally {
-            if (s3SelectTestHelper != null) {
-                s3SelectTestHelper.tearDown();
-            }
-        }
-    }
-}
diff --git a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/TestHiveFileSystemS3SelectPushdown.java b/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/TestHiveFileSystemS3SelectPushdown.java
deleted file mode 100644
index 1b5a8c27a455..000000000000
--- a/plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/s3select/TestHiveFileSystemS3SelectPushdown.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.plugin.hive.AbstractTestHiveFileSystemS3;
-import io.trino.spi.connector.ColumnHandle;
-import io.trino.spi.connector.SchemaTableName;
-import io.trino.testing.MaterializedResult;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import java.util.Optional;
-
-import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
-import static io.trino.plugin.hive.HiveColumnHandle.createBaseColumn;
-import static io.trino.plugin.hive.HiveType.HIVE_INT;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
-
-public class TestHiveFileSystemS3SelectPushdown
-        extends AbstractTestHiveFileSystemS3
-{
-    protected SchemaTableName tableWithPipeDelimiter;
-    protected SchemaTableName tableWithCommaDelimiter;
-
-    @Parameters({
-            "hive.hadoop2.metastoreHost",
-            "hive.hadoop2.metastorePort",
-            "hive.hadoop2.databaseName",
-            "hive.hadoop2.s3.awsAccessKey",
-            "hive.hadoop2.s3.awsSecretKey",
-            "hive.hadoop2.s3.writableBucket",
-            "hive.hadoop2.s3.testDirectory",
-    })
-    @BeforeClass
-    public void setup(String host, int port, String databaseName, String awsAccessKey, String awsSecretKey, String writableBucket, String testDirectory)
-    {
-        super.setup(host, port, databaseName, awsAccessKey, awsSecretKey, writableBucket, testDirectory, true);
-        tableWithPipeDelimiter = new SchemaTableName(database, "trino_s3select_test_external_fs_with_pipe_delimiter");
-        tableWithCommaDelimiter = new SchemaTableName(database, "trino_s3select_test_external_fs_with_comma_delimiter");
-    }
-
-    @Test
-    public void testGetRecordsWithPipeDelimiter()
-            throws Exception
-    {
-        assertEqualsIgnoreOrder(
-                readTable(tableWithPipeDelimiter),
-                MaterializedResult.resultBuilder(newSession(), BIGINT, BIGINT)
-                    .row(1L, 2L).row(3L, 4L).row(55L, 66L) // test_table_with_pipe_delimiter.csv
-                    .row(27L, 10L).row(8L, 2L).row(456L, 789L) // test_table_with_pipe_delimiter.csv.gzip
-                    .row(22L, 11L).row(78L, 76L).row(1L, 2L).row(36L, 90L) // test_table_with_pipe_delimiter.csv.bz2
-                    .build());
-    }
-
-    @Test
-    public void testFilterRecordsWithPipeDelimiter()
-            throws Exception
-    {
-        List<ColumnHandle> projectedColumns = ImmutableList.of(
-                createBaseColumn("t_bigint", 0, HIVE_INT, BIGINT, REGULAR, Optional.empty()));
-
-        assertEqualsIgnoreOrder(
-                filterTable(tableWithPipeDelimiter, projectedColumns),
-                MaterializedResult.resultBuilder(newSession(), BIGINT)
-                        .row(1L).row(3L).row(55L) // test_table_with_pipe_delimiter.csv
-                        .row(27L).row(8L).row(456L) // test_table_with_pipe_delimiter.csv.gzip
-                        .row(22L).row(78L).row(1L).row(36L) // test_table_with_pipe_delimiter.csv.bz2
-                        .build());
-    }
-
-    @Test
-    public void testGetRecordsWithCommaDelimiter()
-            throws Exception
-    {
-        assertEqualsIgnoreOrder(
-                readTable(tableWithCommaDelimiter),
-                MaterializedResult.resultBuilder(newSession(), BIGINT, BIGINT)
-                        .row(7L, 1L).row(19L, 10L).row(1L, 345L) // test_table_with_comma_delimiter.csv
-                        .row(27L, 10L).row(28L, 9L).row(90L, 94L) // test_table_with_comma_delimiter.csv.gzip
-                        .row(11L, 24L).row(1L, 6L).row(21L, 12L).row(0L, 0L) // test_table_with_comma_delimiter.csv.bz2
-                        .build());
-    }
-
-    @Test
-    public void testFilterRecordsWithCommaDelimiter()
-            throws Exception
-    {
-        List<ColumnHandle> projectedColumns = ImmutableList.of(
-                createBaseColumn("t_bigint", 0, HIVE_INT, BIGINT, REGULAR, Optional.empty()));
-
-        assertEqualsIgnoreOrder(
-                filterTable(tableWithCommaDelimiter, projectedColumns),
-                MaterializedResult.resultBuilder(newSession(), BIGINT)
-                        .row(7L).row(19L).row(1L) // test_table_with_comma_delimiter.csv
-                        .row(27L).row(28L).row(90L) // test_table_with_comma_delimiter.csv.gzip
-                        .row(11L).row(1L).row(21L).row(0L) // test_table_with_comma_delimiter.csv.bz2
-                        .build());
-    }
-}
diff --git a/plugin/trino-hive/pom.xml b/plugin/trino-hive/pom.xml
index 9e4f7084a735..169641c45ae8 100644
--- a/plugin/trino-hive/pom.xml
+++ b/plugin/trino-hive/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-hive</artifactId>
-    <name>trino-hive</name>
     <description>Trino - Hive Connector</description>
 
     <properties>
@@ -28,58 +27,48 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-filesystem</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hdfs</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hive-formats</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-glue</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-memory-context</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-sts</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-orc</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-parquet</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hadoop</groupId>
-            <artifactId>hadoop-apache</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hive</groupId>
-            <artifactId>hive-apache</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hive</groupId>
-            <artifactId>hive-thrift</artifactId>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
         </dependency>
 
         <dependency>
@@ -107,11 +96,6 @@
             <artifactId>event</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>http-client</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>jmx</artifactId>
@@ -143,121 +127,118 @@
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-core</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-glue</artifactId>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-aws-sdk-1.11</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-s3</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-sts</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem-manager</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hdfs</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.cloud.bigdataoss</groupId>
-            <artifactId>gcs-connector</artifactId>
-            <classifier>shaded</classifier>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hive-formats</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-memory-context</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-orc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-parquet</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.linkedin.calcite</groupId>
-            <artifactId>calcite-core</artifactId>
-            <classifier>shaded</classifier>
+            <groupId>io.trino.coral</groupId>
+            <artifactId>coral</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.linkedin.coral</groupId>
-            <artifactId>coral-common</artifactId>
+            <groupId>io.trino.hadoop</groupId>
+            <artifactId>hadoop-apache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.linkedin.coral</groupId>
-            <artifactId>coral-hive</artifactId>
+            <groupId>io.trino.hive</groupId>
+            <artifactId>hive-thrift</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.linkedin.coral</groupId>
-            <artifactId>coral-trino</artifactId>
+            <groupId>it.unimi.dsi</groupId>
+            <artifactId>fastutil</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.qubole.rubix</groupId>
-            <artifactId>rubix-presto-shaded</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>it.unimi.dsi</groupId>
-            <artifactId>fastutil</artifactId>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-column</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-common</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-format-structures</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.alluxio</groupId>
-            <artifactId>alluxio-shaded-client</artifactId>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-hadoop</artifactId>
         </dependency>
 
         <dependency>
@@ -275,10 +256,39 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-hadoop-toolkit</artifactId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-s3</artifactId>
             <scope>runtime</scope>
         </dependency>
 
@@ -289,46 +299,67 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.xerial.snappy</groupId>
-            <artifactId>snappy-java</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hadoop-toolkit</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.spotbugs</groupId>
+                    <artifactId>spotbugs-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.jcip</groupId>
+                    <artifactId>jcip-annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk-trace</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <!-- for benchmark -->
@@ -338,22 +369,22 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-client</artifactId>
+            <artifactId>trino-exchange-filesystem</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-exchange-filesystem</artifactId>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-exchange-filesystem</artifactId>
+            <artifactId>trino-filesystem</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -415,31 +446,15 @@
         </dependency>
 
         <dependency>
-            <groupId>io.trino.tpch</groupId>
-            <artifactId>tpch</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>io.trino.hive</groupId>
+            <artifactId>hive-apache</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
+            <groupId>io.trino.tpch</groupId>
+            <artifactId>tpch</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.github.spotbugs</groupId>
-                    <artifactId>spotbugs-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>net.jcip</groupId>
-                    <artifactId>jcip-annotations</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -510,18 +525,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-
-            <plugin>
-                <groupId>org.basepom.maven</groupId>
-                <artifactId>duplicate-finder-maven-plugin</artifactId>
-                <configuration>
-                    <ignoredResourcePatterns>
-                        <!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
-                        <ignoredResourcePattern>mime.types</ignoredResourcePattern>
-                        <ignoredResourcePattern>about.html</ignoredResourcePattern>
-                    </ignoredResourcePatterns>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -539,8 +542,11 @@
                         <configuration>
                             <excludes>
                                 <exclude>**/TestHiveGlueMetastore.java</exclude>
+                                <exclude>**/TestHiveS3AndGlueMetastoreTest.java</exclude>
+                                <exclude>**/TestHiveConcurrentModificationGlueMetastore.java</exclude>
                                 <exclude>**/TestTrinoS3FileSystemAwsS3.java</exclude>
                                 <exclude>**/TestFullParquetReader.java</exclude>
+                                <exclude>**/TestParquetReader.java</exclude>
                                 <exclude>**/Test*FailureRecoveryTest.java</exclude>
                             </excludes>
                         </configuration>
@@ -576,6 +582,7 @@
                         <configuration>
                             <includes>
                                 <include>**/TestFullParquetReader.java</include>
+                                <include>**/TestParquetReader.java</include>
                             </includes>
                         </configuration>
                     </plugin>
@@ -593,6 +600,8 @@
                         <configuration>
                             <includes>
                                 <include>**/TestHiveGlueMetastore.java</include>
+                                <include>**/TestHiveS3AndGlueMetastoreTest.java</include>
+                                <include>**/TestHiveConcurrentModificationGlueMetastore.java</include>
                                 <include>**/TestTrinoS3FileSystemAwsS3.java</include>
                             </includes>
                         </configuration>
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/AbstractHiveAcidWriters.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/AbstractHiveAcidWriters.java
deleted file mode 100644
index 17cab8f8a15f..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/AbstractHiveAcidWriters.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import com.google.common.annotations.VisibleForTesting;
-import io.trino.plugin.hive.HiveWriterFactory.RowIdSortingFileWriterMaker;
-import io.trino.plugin.hive.acid.AcidOperation;
-import io.trino.plugin.hive.acid.AcidTransaction;
-import io.trino.plugin.hive.orc.OrcFileWriter;
-import io.trino.plugin.hive.orc.OrcFileWriterFactory;
-import io.trino.spi.Page;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.ColumnarRow;
-import io.trino.spi.block.LongArrayBlock;
-import io.trino.spi.block.RunLengthEncodedBlock;
-import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-
-import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.hdfs.ConfigurationUtils.toJobConf;
-import static io.trino.orc.OrcWriter.OrcOperation.DELETE;
-import static io.trino.orc.OrcWriter.OrcOperation.INSERT;
-import static io.trino.plugin.hive.HivePageSource.BUCKET_CHANNEL;
-import static io.trino.plugin.hive.HivePageSource.ORIGINAL_TRANSACTION_CHANNEL;
-import static io.trino.plugin.hive.HivePageSource.ROW_ID_CHANNEL;
-import static io.trino.plugin.hive.HiveStorageFormat.ORC;
-import static io.trino.plugin.hive.acid.AcidSchema.ACID_COLUMN_NAMES;
-import static io.trino.plugin.hive.acid.AcidSchema.createAcidSchema;
-import static io.trino.plugin.hive.metastore.StorageFormat.fromHiveStorageFormat;
-import static io.trino.plugin.hive.util.AcidTables.deleteDeltaSubdir;
-import static io.trino.plugin.hive.util.AcidTables.deltaSubdir;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
-import static io.trino.spi.predicate.Utils.nativeValueToBlock;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.IntegerType.INTEGER;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-
-public abstract class AbstractHiveAcidWriters
-{
-    protected static final Block DELETE_OPERATION_BLOCK = nativeValueToBlock(INTEGER, Long.valueOf(DELETE.getOperationNumber()));
-    protected static final Block INSERT_OPERATION_BLOCK = nativeValueToBlock(INTEGER, Long.valueOf(INSERT.getOperationNumber()));
-
-    // The bucketPath looks like .../delta_nnnnnnn_mmmmmmm_ssss/bucket_bbbbb(_aaaa)?
-    public static final Pattern BUCKET_PATH_MATCHER = Pattern.compile("(?s)(?<rootDir>.*)/(?<dirStart>delta_[\\d]+_[\\d]+)_(?<statementId>[\\d]+)/(?<filenameBase>bucket_(?<bucketNumber>[\\d]+))(?<attemptId>_[\\d]+)?$");
-    // The original file path looks like .../nnnnnnn_m(_copy_ccc)?
-    public static final Pattern ORIGINAL_FILE_PATH_MATCHER = Pattern.compile("(?s)(?<rootDir>.*)/(?<filename>(?<bucketNumber>[\\d]+)_(?<rest>.*)?)$");
-    // After compaction, the bucketPath looks like .../base_nnnnnnn(_vmmmmmmm)?/bucket_bbbbb(_aaaa)?
-    public static final Pattern BASE_PATH_MATCHER = Pattern.compile("(?s)(?<rootDir>.*)/(?<dirStart>base_[-]?[\\d]+(_v[\\d]+)?)/(?<filenameBase>bucket_(?<bucketNumber>[\\d]+))(?<attemptId>_[\\d]+)?$");
-
-    protected final AcidTransaction transaction;
-    protected final OptionalInt bucketNumber;
-    protected final int statementId;
-    protected final Block bucketValueBlock;
-
-    private final Optional<RowIdSortingFileWriterMaker> sortingFileWriterMaker;
-    private final OrcFileWriterFactory orcFileWriterFactory;
-    private final Configuration configuration;
-    protected final ConnectorSession session;
-    private final AcidOperation updateKind;
-    private final Properties hiveAcidSchema;
-    protected final Block hiveRowTypeNullsBlock;
-    protected Path deltaDirectory;
-    protected final Path deleteDeltaDirectory;
-    private final String bucketFilename;
-
-    protected Optional<FileWriter> deleteFileWriter = Optional.empty();
-    protected Optional<FileWriter> insertFileWriter = Optional.empty();
-
-    public AbstractHiveAcidWriters(
-            AcidTransaction transaction,
-            int statementId,
-            OptionalInt bucketNumber,
-            Optional<RowIdSortingFileWriterMaker> sortingFileWriterMaker,
-            Path bucketPath,
-            boolean originalFile,
-            OrcFileWriterFactory orcFileWriterFactory,
-            Configuration configuration,
-            ConnectorSession session,
-            TypeManager typeManager,
-            HiveType hiveRowType,
-            AcidOperation updateKind)
-    {
-        this.transaction = requireNonNull(transaction, "transaction is null");
-        this.statementId = statementId;
-        this.bucketNumber = requireNonNull(bucketNumber, "bucketNumber is null");
-        this.sortingFileWriterMaker = requireNonNull(sortingFileWriterMaker, "sortingFileWriterMaker is null");
-        this.bucketValueBlock = nativeValueToBlock(INTEGER, Long.valueOf(OrcFileWriter.computeBucketValue(bucketNumber.orElse(0), statementId)));
-        this.orcFileWriterFactory = requireNonNull(orcFileWriterFactory, "orcFileWriterFactory is null");
-        this.configuration = requireNonNull(configuration, "configuration is null");
-        this.session = requireNonNull(session, "session is null");
-        checkArgument(transaction.isTransactional(), "Not in a transaction: %s", transaction);
-        this.updateKind = requireNonNull(updateKind, "updateKind is null");
-        this.hiveAcidSchema = createAcidSchema(hiveRowType);
-        this.hiveRowTypeNullsBlock = nativeValueToBlock(hiveRowType.getType(typeManager), null);
-        requireNonNull(bucketPath, "bucketPath is null");
-        checkArgument(updateKind != AcidOperation.MERGE || sortingFileWriterMaker.isPresent(), "updateKind is MERGE but sortingFileWriterMaker is not present");
-        Matcher matcher;
-        if (originalFile) {
-            matcher = ORIGINAL_FILE_PATH_MATCHER.matcher(bucketPath.toString());
-            checkArgument(matcher.matches(), "Original file bucketPath doesn't have the required format: %s", bucketPath);
-            this.bucketFilename = format("bucket_%05d", bucketNumber.isEmpty() ? 0 : bucketNumber.getAsInt());
-        }
-        else {
-            matcher = BASE_PATH_MATCHER.matcher(bucketPath.toString());
-            if (matcher.matches()) {
-                this.bucketFilename = matcher.group("filenameBase");
-            }
-            else {
-                matcher = BUCKET_PATH_MATCHER.matcher(bucketPath.toString());
-                checkArgument(matcher.matches(), "bucketPath doesn't have the required format: %s", bucketPath);
-                this.bucketFilename = matcher.group("filenameBase");
-            }
-        }
-        long writeId = transaction.getWriteId();
-        this.deltaDirectory = new Path(format("%s/%s", matcher.group("rootDir"), deltaSubdir(writeId, statementId)));
-        this.deleteDeltaDirectory = new Path(format("%s/%s", matcher.group("rootDir"), deleteDeltaSubdir(writeId, statementId)));
-    }
-
-    protected Page buildDeletePage(Block rowIds, long writeId)
-    {
-        return buildDeletePage(rowIds, writeId, hiveRowTypeNullsBlock);
-    }
-
-    @VisibleForTesting
-    public static Page buildDeletePage(Block rowIdsRowBlock, long writeId, Block rowTypeNullsBlock)
-    {
-        ColumnarRow columnarRow = toColumnarRow(rowIdsRowBlock);
-        checkArgument(!columnarRow.mayHaveNull(), "The rowIdsRowBlock may not have null rows");
-        int positionCount = rowIdsRowBlock.getPositionCount();
-        // We've verified that the rowIds block has no null rows, so it's okay to get the field blocks
-        Block[] blockArray = {
-                RunLengthEncodedBlock.create(DELETE_OPERATION_BLOCK, positionCount),
-                columnarRow.getField(ORIGINAL_TRANSACTION_CHANNEL),
-                columnarRow.getField(BUCKET_CHANNEL),
-                columnarRow.getField(ROW_ID_CHANNEL),
-                RunLengthEncodedBlock.create(BIGINT, writeId, positionCount),
-                RunLengthEncodedBlock.create(rowTypeNullsBlock, positionCount),
-        };
-        return new Page(blockArray);
-    }
-
-    @VisibleForTesting
-    public static Block createRowIdBlock(int positionCount, int rowCounter)
-    {
-        long[] rowIds = new long[positionCount];
-        for (int index = 0; index < positionCount; index++) {
-            rowIds[index] = rowCounter;
-            rowCounter++;
-        }
-        return new LongArrayBlock(positionCount, Optional.empty(), rowIds);
-    }
-
-    protected FileWriter getOrCreateDeleteFileWriter()
-    {
-        if (deleteFileWriter.isEmpty()) {
-            Properties schemaCopy = new Properties();
-            schemaCopy.putAll(hiveAcidSchema);
-            Path deletePath = new Path(format("%s/%s", deleteDeltaDirectory, bucketFilename));
-            deleteFileWriter = orcFileWriterFactory.createFileWriter(
-                    deletePath,
-                    ACID_COLUMN_NAMES,
-                    fromHiveStorageFormat(ORC),
-                    schemaCopy,
-                    toJobConf(configuration),
-                    session,
-                    bucketNumber,
-                    transaction,
-                    true,
-                    WriterKind.DELETE);
-            if (updateKind == AcidOperation.MERGE) {
-                deleteFileWriter = Optional.of(sortingFileWriterMaker.orElseThrow(() -> new IllegalArgumentException("sortingFileWriterMaker not present"))
-                        .makeFileWriter(getWriter(deleteFileWriter), deletePath));
-            }
-        }
-        return getWriter(deleteFileWriter);
-    }
-
-    private FileWriter getWriter(Optional<FileWriter> writer)
-    {
-        return writer.orElseThrow(() -> new IllegalArgumentException("writer is not present"));
-    }
-
-    protected FileWriter getOrCreateInsertFileWriter()
-    {
-        if (insertFileWriter.isEmpty()) {
-            Properties schemaCopy = new Properties();
-            schemaCopy.putAll(hiveAcidSchema);
-            insertFileWriter = orcFileWriterFactory.createFileWriter(
-                    new Path(format("%s/%s", deltaDirectory, bucketFilename)),
-                    ACID_COLUMN_NAMES,
-                    fromHiveStorageFormat(ORC),
-                    schemaCopy,
-                    toJobConf(configuration),
-                    session,
-                    bucketNumber,
-                    transaction,
-                    true,
-                    WriterKind.INSERT);
-        }
-        return getWriter(insertFileWriter);
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/AcidInfo.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/AcidInfo.java
index cc60fe11c284..bdf1e7213057 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/AcidInfo.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/AcidInfo.java
@@ -19,7 +19,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ListMultimap;
 import io.airlift.slice.SizeOf;
-import org.apache.hadoop.fs.Path;
+import io.trino.filesystem.Location;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -197,48 +197,48 @@ public long getRetainedSizeInBytes()
         }
     }
 
-    public static Builder builder(Path partitionPath)
+    public static Builder builder(Location partitionPath)
     {
         return new Builder(partitionPath);
     }
 
     public static class Builder
     {
-        private final Path partitionLocation;
+        private final Location partitionLocation;
         private final List<String> deleteDeltaDirectories = new ArrayList<>();
         private final ListMultimap<Integer, OriginalFileInfo> bucketIdToOriginalFileInfoMap = ArrayListMultimap.create();
         private boolean orcAcidVersionValidated;
 
-        private Builder(Path partitionPath)
+        private Builder(Location partitionPath)
         {
             partitionLocation = requireNonNull(partitionPath, "partitionPath is null");
         }
 
-        public Builder addDeleteDelta(Path deleteDeltaPath)
+        public Builder addDeleteDelta(Location deleteDeltaPath)
         {
             requireNonNull(deleteDeltaPath, "deleteDeltaPath is null");
-            Path partitionPathFromDeleteDelta = deleteDeltaPath.getParent();
+            Location partitionPathFromDeleteDelta = deleteDeltaPath.parentDirectory();
             checkArgument(
                     partitionLocation.equals(partitionPathFromDeleteDelta),
                     "Partition location in DeleteDelta '%s' does not match stored location '%s'",
-                    deleteDeltaPath.getParent().toString(),
+                    partitionPathFromDeleteDelta,
                     partitionLocation);
 
-            deleteDeltaDirectories.add(deleteDeltaPath.getName());
+            deleteDeltaDirectories.add(deleteDeltaPath.fileName());
             return this;
         }
 
-        public Builder addOriginalFile(Path originalFilePath, long originalFileLength, int bucketId)
+        public Builder addOriginalFile(Location originalFilePath, long originalFileSize, int bucketId)
         {
             requireNonNull(originalFilePath, "originalFilePath is null");
-            Path partitionPathFromOriginalPath = originalFilePath.getParent();
+            Location partitionPathFromOriginalPath = originalFilePath.parentDirectory();
             // originalFilePath has scheme in the prefix (i.e. scheme://<path>), extract path from uri and compare.
             checkArgument(
-                    partitionLocation.toUri().getPath().equals(partitionPathFromOriginalPath.toUri().getPath()),
+                    partitionLocation.equals(partitionPathFromOriginalPath),
                     "Partition location in OriginalFile '%s' does not match stored location '%s'",
-                    originalFilePath.getParent().toString(),
+                    partitionPathFromOriginalPath,
                     partitionLocation);
-            bucketIdToOriginalFileInfoMap.put(bucketId, new OriginalFileInfo(originalFilePath.getName(), originalFileLength));
+            bucketIdToOriginalFileInfoMap.put(bucketId, new OriginalFileInfo(originalFilePath.fileName(), originalFileSize));
             return this;
         }
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/AllowHiveTableRename.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/AllowHiveTableRename.java
index 12d6b7c44795..bb08bd645829 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/AllowHiveTableRename.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/AllowHiveTableRename.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,5 +25,5 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface AllowHiveTableRename {}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/BackgroundHiveSplitLoader.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/BackgroundHiveSplitLoader.java
index 36a8a488bd14..8b79ea2c23a6 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/BackgroundHiveSplitLoader.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/BackgroundHiveSplitLoader.java
@@ -18,16 +18,18 @@
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Multimaps;
 import com.google.common.collect.Streams;
 import com.google.common.io.CharStreams;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.airlift.units.Duration;
 import io.trino.filesystem.FileEntry;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.hdfs.HdfsContext;
-import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.HdfsNamenodeStats;
 import io.trino.plugin.hive.HiveSplit.BucketConversion;
 import io.trino.plugin.hive.HiveSplit.BucketValidation;
 import io.trino.plugin.hive.fs.DirectoryLister;
@@ -35,8 +37,8 @@
 import io.trino.plugin.hive.fs.TrinoFileStatus;
 import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.Partition;
+import io.trino.plugin.hive.metastore.StorageFormat;
 import io.trino.plugin.hive.metastore.Table;
-import io.trino.plugin.hive.s3select.S3SelectPushdown;
 import io.trino.plugin.hive.util.AcidTables.AcidState;
 import io.trino.plugin.hive.util.AcidTables.ParsedDelta;
 import io.trino.plugin.hive.util.HiveBucketing.BucketingVersion;
@@ -51,25 +53,10 @@
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.FileSplit;
-import org.apache.hadoop.mapred.InputFormat;
-import org.apache.hadoop.mapred.InputSplit;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.JobConfigurable;
-import org.apache.hadoop.mapred.TextInputFormat;
-import org.apache.hadoop.mapreduce.MRConfig;
-import org.apache.hadoop.util.StringUtils;
-
-import java.io.BufferedReader;
+
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.lang.annotation.Annotation;
-import java.nio.charset.StandardCharsets;
-import java.security.Principal;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Deque;
@@ -77,10 +64,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Properties;
-import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -96,24 +83,24 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.google.common.collect.Maps.fromProperties;
 import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static io.airlift.concurrent.MoreFutures.addExceptionCallback;
 import static io.airlift.concurrent.MoreFutures.toListenableFuture;
-import static io.trino.hdfs.ConfigurationUtils.toJobConf;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_BAD_DATA;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_EXCEEDED_PARTITION_LIMIT;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_FILE_NOT_FOUND;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_BUCKET_FILES;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_METADATA;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_PARTITION_VALUE;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_UNKNOWN_ERROR;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_UNSUPPORTED_FORMAT;
 import static io.trino.plugin.hive.HiveSessionProperties.getMaxInitialSplitSize;
 import static io.trino.plugin.hive.HiveSessionProperties.isForceLocalScheduling;
 import static io.trino.plugin.hive.HiveSessionProperties.isValidateBucketing;
+import static io.trino.plugin.hive.HiveStorageFormat.TEXTFILE;
+import static io.trino.plugin.hive.HiveStorageFormat.getHiveStorageFormat;
 import static io.trino.plugin.hive.fs.HiveFileIterator.NestedDirectoryPolicy.FAIL;
 import static io.trino.plugin.hive.fs.HiveFileIterator.NestedDirectoryPolicy.IGNORED;
 import static io.trino.plugin.hive.fs.HiveFileIterator.NestedDirectoryPolicy.RECURSE;
@@ -125,19 +112,20 @@
 import static io.trino.plugin.hive.util.AcidTables.readAcidVersionFile;
 import static io.trino.plugin.hive.util.HiveClassNames.SYMLINK_TEXT_INPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveUtil.checkCondition;
+import static io.trino.plugin.hive.util.HiveUtil.getDeserializerClassName;
 import static io.trino.plugin.hive.util.HiveUtil.getFooterCount;
 import static io.trino.plugin.hive.util.HiveUtil.getHeaderCount;
-import static io.trino.plugin.hive.util.HiveUtil.getInputFormat;
+import static io.trino.plugin.hive.util.HiveUtil.getInputFormatName;
 import static io.trino.plugin.hive.util.HiveUtil.getPartitionKeyColumnHandles;
 import static io.trino.plugin.hive.util.PartitionMatchSupplier.createPartitionMatchSupplier;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static java.lang.Integer.parseInt;
 import static java.lang.Math.max;
 import static java.lang.String.format;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.max;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.hadoop.fs.Path.getPathWithoutSchemeAndAuthority;
 
 public class BackgroundHiveSplitLoader
         implements HiveSplitLoader
@@ -155,23 +143,18 @@ public class BackgroundHiveSplitLoader
 
     private static final ListenableFuture<Void> COMPLETED_FUTURE = immediateVoidFuture();
 
-    private static final String FILE_INPUT_FORMAT_INPUT_DIR = "mapreduce.input.fileinputformat.inputdir";
-
     private final Table table;
     private final TupleDomain<? extends ColumnHandle> compactEffectivePredicate;
     private final DynamicFilter dynamicFilter;
     private final long dynamicFilteringWaitTimeoutMillis;
     private final TypeManager typeManager;
     private final Optional<BucketSplitInfo> tableBucketInfo;
-    private final HdfsEnvironment hdfsEnvironment;
-    private final HdfsContext hdfsContext;
-    private final NamenodeStats namenodeStats;
+    private final HdfsNamenodeStats hdfsNamenodeStats;
     private final DirectoryLister directoryLister;
     private final TrinoFileSystemFactory fileSystemFactory;
     private final int loaderConcurrency;
     private final boolean recursiveDirWalkerEnabled;
     private final boolean ignoreAbsentPartitions;
-    private final boolean optimizeSymlinkListing;
     private final Executor executor;
     private final ConnectorSession session;
     private final ConcurrentLazyQueue<HivePartitionMetadata> partitions;
@@ -213,14 +196,12 @@ public BackgroundHiveSplitLoader(
             Optional<BucketSplitInfo> tableBucketInfo,
             ConnectorSession session,
             TrinoFileSystemFactory fileSystemFactory,
-            HdfsEnvironment hdfsEnvironment,
-            NamenodeStats namenodeStats,
+            HdfsNamenodeStats hdfsNamenodeStats,
             DirectoryLister directoryLister,
             Executor executor,
             int loaderConcurrency,
             boolean recursiveDirWalkerEnabled,
             boolean ignoreAbsentPartitions,
-            boolean optimizeSymlinkListing,
             Optional<ValidWriteIdList> validWriteIds,
             Optional<Long> maxSplitFileSize,
             int maxPartitions)
@@ -235,18 +216,15 @@ public BackgroundHiveSplitLoader(
         checkArgument(loaderConcurrency > 0, "loaderConcurrency must be > 0, found: %s", loaderConcurrency);
         this.session = session;
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
-        this.hdfsEnvironment = hdfsEnvironment;
-        this.namenodeStats = namenodeStats;
+        this.hdfsNamenodeStats = hdfsNamenodeStats;
         this.directoryLister = directoryLister;
         this.recursiveDirWalkerEnabled = recursiveDirWalkerEnabled;
         this.ignoreAbsentPartitions = ignoreAbsentPartitions;
-        this.optimizeSymlinkListing = optimizeSymlinkListing;
         requireNonNull(executor, "executor is null");
         // direct executor is not supported in this implementation due to locking specifics
         checkExecutorIsNotDirectExecutor(executor);
         this.executor = executor;
         this.partitions = new ConcurrentLazyQueue<>(partitions);
-        this.hdfsContext = new HdfsContext(session);
         this.validWriteIds = requireNonNull(validWriteIds, "validWriteIds is null");
         this.maxSplitFileSize = requireNonNull(maxSplitFileSize, "maxSplitFileSize is null");
         this.maxPartitions = maxPartitions;
@@ -415,7 +393,9 @@ private ListenableFuture<Void> loadPartition(HivePartitionMetadata partition)
     {
         HivePartition hivePartition = partition.getHivePartition();
         String partitionName = hivePartition.getPartitionId();
-        Properties schema = getPartitionSchema(table, partition.getPartition());
+        Properties schema = partition.getPartition()
+                .map(value -> getHiveSchema(value, table))
+                .orElseGet(() -> getHiveSchema(table));
         List<HivePartitionKey> partitionKeys = getPartitionKeys(table, partition.getPartition());
         TupleDomain<HiveColumnHandle> effectivePredicate = compactEffectivePredicate.transformKeys(HiveColumnHandle.class::cast);
 
@@ -425,59 +405,44 @@ private ListenableFuture<Void> loadPartition(HivePartitionMetadata partition)
             return COMPLETED_FUTURE;
         }
 
-        Path path = new Path(getPartitionLocation(table, partition.getPartition()));
-        Configuration configuration = hdfsEnvironment.getConfiguration(hdfsContext, path);
-        InputFormat<?, ?> inputFormat = getInputFormat(configuration, schema, false);
-        FileSystem fs = hdfsEnvironment.getFileSystem(hdfsContext, path);
-        boolean s3SelectPushdownEnabled = S3SelectPushdown.shouldEnablePushdownForTable(session, table, path.toString(), partition.getPartition());
-        // S3 Select pushdown works at the granularity of individual S3 objects for compressed files
-        // and finer granularity for uncompressed files using scan range feature.
-        boolean shouldEnableSplits = S3SelectPushdown.isSplittable(s3SelectPushdownEnabled, schema, inputFormat, path);
+        Location location = Location.of(getPartitionLocation(table, partition.getPartition()));
+
         // Skip header / footer lines are not splittable except for a special case when skip.header.line.count=1
-        boolean splittable = shouldEnableSplits && getFooterCount(schema) == 0 && getHeaderCount(schema) <= 1;
+        boolean splittable = getFooterCount(schema) == 0 && getHeaderCount(schema) <= 1;
 
-        if (inputFormat.getClass().getName().equals(SYMLINK_TEXT_INPUT_FORMAT_CLASS)) {
+        if (SYMLINK_TEXT_INPUT_FORMAT_CLASS.equals(getInputFormatName(schema).orElse(null))) {
             if (tableBucketInfo.isPresent()) {
                 throw new TrinoException(NOT_SUPPORTED, "Bucketed table in SymlinkTextInputFormat is not yet supported");
             }
-            InputFormat<?, ?> targetInputFormat = getInputFormat(configuration, schema, true);
-            List<Path> targetPaths = hdfsEnvironment.doAs(
-                    hdfsContext.getIdentity(),
-                    () -> getTargetPathsFromSymlink(fs, path));
-            Set<Path> parents = targetPaths.stream()
-                    .map(Path::getParent)
-                    .distinct()
-                    .collect(toImmutableSet());
-            if (optimizeSymlinkListing && parents.size() == 1 && !recursiveDirWalkerEnabled) {
-                Optional<Iterator<InternalHiveSplit>> manifestFileIterator = buildManifestFileIterator(
-                        targetInputFormat,
-                        partitionName,
-                        schema,
-                        partitionKeys,
-                        effectivePredicate,
-                        partitionMatchSupplier,
-                        s3SelectPushdownEnabled,
-                        partition.getTableToPartitionMapping(),
-                        getOnlyElement(parents),
-                        targetPaths,
-                        splittable);
-                if (manifestFileIterator.isPresent()) {
-                    fileIterators.addLast(manifestFileIterator.get());
-                    return COMPLETED_FUTURE;
-                }
-            }
-            return createHiveSymlinkSplits(
+            HiveStorageFormat targetStorageFormat = getSymlinkStorageFormat(getDeserializerClassName(schema));
+            ListMultimap<Location, Location> targets = getTargetLocationsByParentFromSymlink(location);
+
+            InternalHiveSplitFactory splitFactory = new InternalHiveSplitFactory(
                     partitionName,
-                    targetInputFormat,
+                    targetStorageFormat,
                     schema,
                     partitionKeys,
                     effectivePredicate,
                     partitionMatchSupplier,
-                    s3SelectPushdownEnabled,
                     partition.getTableToPartitionMapping(),
-                    targetPaths);
+                    Optional.empty(),
+                    Optional.empty(),
+                    getMaxInitialSplitSize(session),
+                    isForceLocalScheduling(session),
+                    maxSplitFileSize);
+
+            for (Entry<Location, List<Location>> entry : Multimaps.asMap(targets).entrySet()) {
+                fileIterators.addLast(buildManifestFileIterator(splitFactory, entry.getKey(), entry.getValue(), splittable));
+            }
+
+            return COMPLETED_FUTURE;
         }
 
+        StorageFormat rawStorageFormat = partition.getPartition()
+                .map(Partition::getStorage).orElseGet(table::getStorage).getStorageFormat();
+        HiveStorageFormat storageFormat = getHiveStorageFormat(rawStorageFormat)
+                .orElseThrow(() -> new TrinoException(HIVE_INVALID_METADATA, "Unsupported storage format: %s %s".formatted(hivePartition, rawStorageFormat)));
+
         Optional<BucketConversion> bucketConversion = Optional.empty();
         boolean bucketConversionRequiresWorkerParticipation = false;
         if (partition.getPartition().isPresent()) {
@@ -504,9 +469,8 @@ private ListenableFuture<Void> loadPartition(HivePartitionMetadata partition)
         }
 
         InternalHiveSplitFactory splitFactory = new InternalHiveSplitFactory(
-                fs,
                 partitionName,
-                inputFormat,
+                storageFormat,
                 schema,
                 partitionKeys,
                 effectivePredicate,
@@ -516,48 +480,32 @@ private ListenableFuture<Void> loadPartition(HivePartitionMetadata partition)
                 bucketValidation,
                 getMaxInitialSplitSize(session),
                 isForceLocalScheduling(session),
-                s3SelectPushdownEnabled,
                 maxSplitFileSize);
 
-        // To support custom input formats, we want to call getSplits()
-        // on the input format to obtain file splits.
-        if (shouldUseFileSplitsFromInputFormat(inputFormat)) {
-            if (tableBucketInfo.isPresent()) {
-                throw new TrinoException(NOT_SUPPORTED, "Trino cannot read bucketed partition in an input format with UseFileSplitsFromInputFormat annotation: " + inputFormat.getClass().getSimpleName());
-            }
-
-            if (isTransactionalTable(table.getParameters())) {
-                throw new TrinoException(NOT_SUPPORTED, "Hive transactional tables in an input format with UseFileSplitsFromInputFormat annotation are not supported: " + inputFormat.getClass().getSimpleName());
-            }
-
-            JobConf jobConf = toJobConf(configuration);
-            jobConf.set(FILE_INPUT_FORMAT_INPUT_DIR, StringUtils.escapeString(path.toString()));
-            // Pass SerDes and Table parameters into input format configuration
-            fromProperties(schema).forEach(jobConf::set);
-            InputSplit[] splits = hdfsEnvironment.doAs(hdfsContext.getIdentity(), () -> inputFormat.getSplits(jobConf, 0));
-
-            return addSplitsToSource(splits, splitFactory);
-        }
-
         if (isTransactionalTable(table.getParameters())) {
-            return getTransactionalSplits(path, splittable, bucketConversion, splitFactory);
+            return getTransactionalSplits(location, splittable, bucketConversion, splitFactory);
         }
 
+        TrinoFileSystem trinoFileSystem = fileSystemFactory.create(session);
         // Bucketed partitions are fully loaded immediately since all files must be loaded to determine the file to bucket mapping
         if (tableBucketInfo.isPresent()) {
-            List<TrinoFileStatus> files = listBucketFiles(path, fs, splitFactory.getPartitionName());
+            List<TrinoFileStatus> files = listBucketFiles(trinoFileSystem, location, splitFactory.getPartitionName());
             return hiveSplitSource.addToQueue(getBucketedSplits(files, splitFactory, tableBucketInfo.get(), bucketConversion, splittable, Optional.empty()));
         }
 
-        fileIterators.addLast(createInternalHiveSplitIterator(path, fs, splitFactory, splittable, Optional.empty()));
+        fileIterators.addLast(createInternalHiveSplitIterator(trinoFileSystem, location, splitFactory, splittable, Optional.empty()));
 
         return COMPLETED_FUTURE;
     }
 
-    private List<TrinoFileStatus> listBucketFiles(Path path, FileSystem fs, String partitionName)
+    private List<TrinoFileStatus> listBucketFiles(TrinoFileSystem fs, Location location, String partitionName)
     {
         try {
-            return ImmutableList.copyOf(new HiveFileIterator(table, path, fs, directoryLister, namenodeStats, FAIL, ignoreAbsentPartitions));
+            HiveFileIterator fileIterator = new HiveFileIterator(table, location, fs, directoryLister, hdfsNamenodeStats, FAIL);
+            if (!fileIterator.hasNext() && !ignoreAbsentPartitions) {
+                checkPartitionLocationExists(fs, location);
+            }
+            return ImmutableList.copyOf(fileIterator);
         }
         catch (HiveFileIterator.NestedDirectoryNotAllowedException e) {
             // Fail here to be on the safe side. This seems to be the same as what Hive does
@@ -566,127 +514,43 @@ private List<TrinoFileStatus> listBucketFiles(Path path, FileSystem fs, String p
         }
     }
 
-    private ListenableFuture<Void> createHiveSymlinkSplits(
-            String partitionName,
-            InputFormat<?, ?> targetInputFormat,
-            Properties schema,
-            List<HivePartitionKey> partitionKeys,
-            TupleDomain<HiveColumnHandle> effectivePredicate,
-            BooleanSupplier partitionMatchSupplier,
-            boolean s3SelectPushdownEnabled,
-            TableToPartitionMapping tableToPartitionMapping,
-            List<Path> targetPaths)
-            throws IOException
-    {
-        ListenableFuture<Void> lastResult = COMPLETED_FUTURE;
-        for (Path targetPath : targetPaths) {
-            // the splits must be generated using the file system for the target path
-            // get the configuration for the target path -- it may be a different hdfs instance
-            FileSystem targetFilesystem = hdfsEnvironment.getFileSystem(hdfsContext, targetPath);
-            JobConf targetJob = toJobConf(targetFilesystem.getConf());
-            targetJob.setInputFormat(TextInputFormat.class);
-            Optional<Principal> principal = hdfsContext.getIdentity().getPrincipal();
-            if (principal.isPresent()) {
-                targetJob.set(MRConfig.FRAMEWORK_NAME, MRConfig.CLASSIC_FRAMEWORK_NAME);
-                targetJob.set(MRConfig.MASTER_USER_NAME, principal.get().getName());
-            }
-            if (targetInputFormat instanceof JobConfigurable) {
-                ((JobConfigurable) targetInputFormat).configure(targetJob);
-            }
-            targetJob.set(FILE_INPUT_FORMAT_INPUT_DIR, StringUtils.escapeString(targetPath.toString()));
-            InputSplit[] targetSplits = hdfsEnvironment.doAs(
-                    hdfsContext.getIdentity(),
-                    () -> targetInputFormat.getSplits(targetJob, 0));
-
-            InternalHiveSplitFactory splitFactory = new InternalHiveSplitFactory(
-                    targetFilesystem,
-                    partitionName,
-                    targetInputFormat,
-                    schema,
-                    partitionKeys,
-                    effectivePredicate,
-                    partitionMatchSupplier,
-                    tableToPartitionMapping,
-                    Optional.empty(),
-                    Optional.empty(),
-                    getMaxInitialSplitSize(session),
-                    isForceLocalScheduling(session),
-                    s3SelectPushdownEnabled,
-                    maxSplitFileSize);
-            lastResult = addSplitsToSource(targetSplits, splitFactory);
-            if (stopped) {
-                return COMPLETED_FUTURE;
-            }
-        }
-        return lastResult;
-    }
-
     @VisibleForTesting
-    Optional<Iterator<InternalHiveSplit>> buildManifestFileIterator(
-            InputFormat<?, ?> targetInputFormat,
-            String partitionName,
-            Properties schema,
-            List<HivePartitionKey> partitionKeys,
-            TupleDomain<HiveColumnHandle> effectivePredicate,
-            BooleanSupplier partitionMatchSupplier,
-            boolean s3SelectPushdownEnabled,
-            TableToPartitionMapping tableToPartitionMapping,
-            Path parent,
-            List<Path> paths,
-            boolean splittable)
-            throws IOException
+    Iterator<InternalHiveSplit> buildManifestFileIterator(InternalHiveSplitFactory splitFactory, Location location, List<Location> paths, boolean splittable)
     {
-        FileSystem targetFilesystem = hdfsEnvironment.getFileSystem(hdfsContext, parent);
-
-        Map<Path, TrinoFileStatus> fileStatuses = new HashMap<>();
-        HiveFileIterator fileStatusIterator = new HiveFileIterator(table, parent, targetFilesystem, directoryLister, namenodeStats, IGNORED, false);
-        fileStatusIterator.forEachRemaining(status -> fileStatuses.put(getPathWithoutSchemeAndAuthority(status.getPath()), status));
-
-        List<TrinoFileStatus> locatedFileStatuses = new ArrayList<>();
-        for (Path path : paths) {
-            TrinoFileStatus status = fileStatuses.get(getPathWithoutSchemeAndAuthority(path));
-            // This check will catch all directories in the manifest since HiveFileIterator will not return any directories.
-            // Some files may not be listed by HiveFileIterator - if those are included in the manifest this check will fail as well.
-            if (status == null) {
-                return Optional.empty();
-            }
-
-            locatedFileStatuses.add(status);
-        }
-
-        InternalHiveSplitFactory splitFactory = new InternalHiveSplitFactory(
-                targetFilesystem,
-                partitionName,
-                targetInputFormat,
-                schema,
-                partitionKeys,
-                effectivePredicate,
-                partitionMatchSupplier,
-                tableToPartitionMapping,
-                Optional.empty(),
-                Optional.empty(),
-                getMaxInitialSplitSize(session),
-                isForceLocalScheduling(session),
-                s3SelectPushdownEnabled,
-                maxSplitFileSize);
-
-        return Optional.of(createInternalHiveSplitIterator(splitFactory, splittable, Optional.empty(), locatedFileStatuses.stream()));
+        TrinoFileSystem trinoFileSystem = fileSystemFactory.create(session);
+
+        Map<String, TrinoFileStatus> fileStatuses = new HashMap<>();
+        Iterator<TrinoFileStatus> fileStatusIterator = new HiveFileIterator(table, location, trinoFileSystem, directoryLister, hdfsNamenodeStats, RECURSE);
+        if (!fileStatusIterator.hasNext()) {
+            checkPartitionLocationExists(trinoFileSystem, location);
+        }
+        fileStatusIterator.forEachRemaining(status -> fileStatuses.put(Location.of(status.getPath()).path(), status));
+        Stream<TrinoFileStatus> fileStream = paths.stream()
+                .map(path -> {
+                    TrinoFileStatus status = fileStatuses.get(path.path());
+                    if (status == null) {
+                        throw new TrinoException(HIVE_FILE_NOT_FOUND, "Manifest file from the location [%s] contains non-existent path: %s".formatted(location, path));
+                    }
+                    return status;
+                });
+        return createInternalHiveSplitIterator(splitFactory, splittable, Optional.empty(), fileStream);
     }
 
-    private ListenableFuture<Void> getTransactionalSplits(Path path, boolean splittable, Optional<BucketConversion> bucketConversion, InternalHiveSplitFactory splitFactory)
+    private ListenableFuture<Void> getTransactionalSplits(Location path, boolean splittable, Optional<BucketConversion> bucketConversion, InternalHiveSplitFactory splitFactory)
             throws IOException
     {
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
         ValidWriteIdList writeIds = validWriteIds.orElseThrow(() -> new IllegalStateException("No validWriteIds present"));
-        AcidState acidState = getAcidState(fileSystem, path.toString(), writeIds);
+        AcidState acidState = getAcidState(fileSystem, path, writeIds);
 
         boolean fullAcid = isFullAcidTable(table.getParameters());
         AcidInfo.Builder acidInfoBuilder = AcidInfo.builder(path);
 
         if (fullAcid) {
             // From Hive version >= 3.0, delta/base files will always have file '_orc_acid_version' with value >= '2'.
-            Optional<String> baseOrDeltaPath = acidState.baseDirectory().or(() ->
-                    acidState.deltas().stream().findFirst().map(ParsedDelta::path));
+            Optional<Location> baseOrDeltaPath = acidState.baseDirectory()
+                    .or(() -> acidState.deltas().stream().findFirst()
+                            .map(delta -> Location.of(delta.path())));
 
             if (baseOrDeltaPath.isPresent() && readAcidVersionFile(fileSystem, baseOrDeltaPath.get()) >= 2) {
                 // Trino cannot read ORC ACID tables with version < 2 (written by Hive older than 3.0)
@@ -711,7 +575,7 @@ private ListenableFuture<Void> getTransactionalSplits(Path path, boolean splitta
                     throw new TrinoException(HIVE_BAD_DATA, "Unexpected delete delta for a non full ACID table '%s'. Would be ignored by the reader: %s"
                             .formatted(table.getSchemaTableName(), delta.path()));
                 }
-                acidInfoBuilder.addDeleteDelta(new Path(delta.path()));
+                acidInfoBuilder.addDeleteDelta(Location.of(delta.path()));
             }
             else {
                 for (FileEntry file : delta.files()) {
@@ -722,7 +586,7 @@ private ListenableFuture<Void> getTransactionalSplits(Path path, boolean splitta
 
         for (FileEntry entry : acidState.originalFiles()) {
             // Hive requires "original" files of transactional tables to conform to the bucketed tables naming pattern, to match them with delete deltas.
-            acidInfoBuilder.addOriginalFile(new Path(entry.location()), entry.length(), getRequiredBucketNumber(entry.location()));
+            acidInfoBuilder.addOriginalFile(entry.location(), entry.length(), getRequiredBucketNumber(entry.location()));
         }
 
         if (tableBucketInfo.isPresent()) {
@@ -768,39 +632,30 @@ private static Optional<AcidInfo> acidInfo(boolean fullAcid, AcidInfo.Builder bu
         return fullAcid ? builder.build() : Optional.empty();
     }
 
-    private static Optional<AcidInfo> acidInfoForOriginalFiles(boolean fullAcid, AcidInfo.Builder builder, String path)
+    private static Optional<AcidInfo> acidInfoForOriginalFiles(boolean fullAcid, AcidInfo.Builder builder, Location location)
     {
-        return fullAcid ? Optional.of(builder.buildWithRequiredOriginalFiles(getRequiredBucketNumber(path))) : Optional.empty();
+        return fullAcid ? Optional.of(builder.buildWithRequiredOriginalFiles(getRequiredBucketNumber(location))) : Optional.empty();
     }
 
-    private ListenableFuture<Void> addSplitsToSource(InputSplit[] targetSplits, InternalHiveSplitFactory splitFactory)
-            throws IOException
+    private Iterator<InternalHiveSplit> createInternalHiveSplitIterator(TrinoFileSystem fileSystem, Location location, InternalHiveSplitFactory splitFactory, boolean splittable, Optional<AcidInfo> acidInfo)
     {
-        ListenableFuture<Void> lastResult = COMPLETED_FUTURE;
-        for (InputSplit inputSplit : targetSplits) {
-            Optional<InternalHiveSplit> internalHiveSplit = splitFactory.createInternalHiveSplit((FileSplit) inputSplit);
-            if (internalHiveSplit.isPresent()) {
-                lastResult = hiveSplitSource.addToQueue(internalHiveSplit.get());
-            }
-            if (stopped) {
-                return COMPLETED_FUTURE;
-            }
+        Iterator<TrinoFileStatus> iterator = new HiveFileIterator(table, location, fileSystem, directoryLister, hdfsNamenodeStats, recursiveDirWalkerEnabled ? RECURSE : IGNORED);
+        if (!iterator.hasNext() && !ignoreAbsentPartitions) {
+            checkPartitionLocationExists(fileSystem, location);
         }
-        return lastResult;
-    }
-
-    private static boolean shouldUseFileSplitsFromInputFormat(InputFormat<?, ?> inputFormat)
-    {
-        return Arrays.stream(inputFormat.getClass().getAnnotations())
-                .map(Annotation::annotationType)
-                .map(Class::getSimpleName)
-                .anyMatch(name -> name.equals("UseFileSplitsFromInputFormat"));
+        return createInternalHiveSplitIterator(splitFactory, splittable, acidInfo, Streams.stream(iterator));
     }
 
-    private Iterator<InternalHiveSplit> createInternalHiveSplitIterator(Path path, FileSystem fileSystem, InternalHiveSplitFactory splitFactory, boolean splittable, Optional<AcidInfo> acidInfo)
+    private static void checkPartitionLocationExists(TrinoFileSystem fileSystem, Location location)
     {
-        Iterator<TrinoFileStatus> iterator = new HiveFileIterator(table, path, fileSystem, directoryLister, namenodeStats, recursiveDirWalkerEnabled ? RECURSE : IGNORED, ignoreAbsentPartitions);
-        return createInternalHiveSplitIterator(splitFactory, splittable, acidInfo, Streams.stream(iterator));
+        try {
+            if (!fileSystem.directoryExists(location).orElse(true)) {
+                throw new TrinoException(HIVE_FILE_NOT_FOUND, "Partition location does not exist: " + location);
+            }
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_FILESYSTEM_ERROR, "Failed checking directory path:" + location, e);
+        }
     }
 
     private static Iterator<InternalHiveSplit> createInternalHiveSplitIterator(InternalHiveSplitFactory splitFactory, boolean splittable, Optional<AcidInfo> acidInfo, Stream<TrinoFileStatus> fileStream)
@@ -826,7 +681,7 @@ private List<InternalHiveSplit> getBucketedSplits(
     {
         int readBucketCount = bucketSplitInfo.getReadBucketCount();
         int tableBucketCount = bucketSplitInfo.getTableBucketCount();
-        int partitionBucketCount = bucketConversion.map(BucketConversion::getPartitionBucketCount).orElse(tableBucketCount);
+        int partitionBucketCount = bucketConversion.map(BucketConversion::partitionBucketCount).orElse(tableBucketCount);
         int bucketCount = max(readBucketCount, partitionBucketCount);
 
         checkState(readBucketCount <= tableBucketCount, "readBucketCount(%s) should be less than or equal to tableBucketCount(%s)", readBucketCount, tableBucketCount);
@@ -834,7 +689,7 @@ private List<InternalHiveSplit> getBucketedSplits(
         // build mapping of file name to bucket
         ListMultimap<Integer, TrinoFileStatus> bucketFiles = ArrayListMultimap.create();
         for (TrinoFileStatus file : files) {
-            String fileName = file.getPath().getName();
+            String fileName = Location.of(file.getPath()).fileName();
             OptionalInt bucket = getBucketNumber(fileName);
             if (bucket.isPresent()) {
                 bucketFiles.put(bucket.getAsInt(), file);
@@ -931,10 +786,10 @@ static void validateFileBuckets(ListMultimap<Integer, TrinoFileStatus> bucketFil
         }
     }
 
-    private static int getRequiredBucketNumber(String path)
+    private static int getRequiredBucketNumber(Location location)
     {
-        return getBucketNumber(path.substring(path.lastIndexOf('/') + 1))
-                .orElseThrow(() -> new IllegalStateException("Cannot get bucket number from path: " + path));
+        return getBucketNumber(location.fileName())
+                .orElseThrow(() -> new IllegalStateException("Cannot get bucket number from location: " + location));
     }
 
     @VisibleForTesting
@@ -955,23 +810,40 @@ public static boolean hasAttemptId(String bucketFilename)
         return matcher.matches() && matcher.group(2) != null;
     }
 
-    private static List<Path> getTargetPathsFromSymlink(FileSystem fileSystem, Path symlinkDir)
+    private static HiveStorageFormat getSymlinkStorageFormat(String serde)
     {
+        // LazySimpleSerDe is used by TEXTFILE and SEQUENCEFILE. Use TEXTFILE per Hive behavior.
+        if (serde.equals(TEXTFILE.getSerde())) {
+            return TEXTFILE;
+        }
+        return Arrays.stream(HiveStorageFormat.values())
+                .filter(format -> serde.equals(format.getSerde()))
+                .findFirst()
+                .orElseThrow(() -> new TrinoException(HIVE_UNSUPPORTED_FORMAT, "Unknown SerDe for SymlinkTextInputFormat: " + serde));
+    }
+
+    private ListMultimap<Location, Location> getTargetLocationsByParentFromSymlink(Location symlinkDir)
+    {
+        TrinoFileSystem fileSystem = fileSystemFactory.create(session);
         try {
-            FileStatus[] symlinks = fileSystem.listStatus(symlinkDir, path ->
-                    !path.getName().startsWith("_") && !path.getName().startsWith("."));
-            List<Path> targets = new ArrayList<>();
+            ListMultimap<Location, Location> targets = ArrayListMultimap.create();
+            FileIterator iterator = fileSystem.listFiles(symlinkDir);
+            while (iterator.hasNext()) {
+                Location location = iterator.next().location();
+                String name = location.fileName();
+                if (name.startsWith("_") || name.startsWith(".")) {
+                    continue;
+                }
 
-            for (FileStatus symlink : symlinks) {
-                try (BufferedReader reader = new BufferedReader(new InputStreamReader(fileSystem.open(symlink.getPath()), StandardCharsets.UTF_8))) {
+                try (Reader reader = new InputStreamReader(fileSystem.newInputFile(location).newStream(), UTF_8)) {
                     CharStreams.readLines(reader).stream()
-                            .map(Path::new)
-                            .forEach(targets::add);
+                            .map(Location::of)
+                            .forEach(target -> targets.put(target.parentDirectory(), target));
                 }
             }
             return targets;
         }
-        catch (IOException e) {
+        catch (IOException | IllegalArgumentException e) {
             throw new TrinoException(HIVE_BAD_DATA, "Error parsing symlinks from: " + symlinkDir, e);
         }
     }
@@ -998,14 +870,6 @@ private static List<HivePartitionKey> getPartitionKeys(Table table, Optional<Par
         return partitionKeys.build();
     }
 
-    private static Properties getPartitionSchema(Table table, Optional<Partition> partition)
-    {
-        if (partition.isEmpty()) {
-            return getHiveSchema(table);
-        }
-        return getHiveSchema(partition.get(), table);
-    }
-
     public static class BucketSplitInfo
     {
         private final BucketingVersion bucketingVersion;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ConcurrentLazyQueue.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ConcurrentLazyQueue.java
index d499b31e521e..5bc361f6e8bc 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ConcurrentLazyQueue.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ConcurrentLazyQueue.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive;
 
-import javax.annotation.concurrent.GuardedBy;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 
 import java.util.Iterator;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/FileWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/FileWriter.java
index 9a719a5bdd02..e7b0a7ee2ee8 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/FileWriter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/FileWriter.java
@@ -16,7 +16,6 @@
 import io.trino.spi.Page;
 
 import java.io.Closeable;
-import java.util.Optional;
 
 public interface FileWriter
 {
@@ -34,9 +33,4 @@ public interface FileWriter
     void rollback();
 
     long getValidationCpuNanos();
-
-    default Optional<Runnable> getVerificationTask()
-    {
-        return Optional.empty();
-    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ForHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ForHiveMetastore.java
index 052aa6b3c678..1b5ca893bff4 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ForHiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ForHiveMetastore.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForHiveMetastore
 {
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ForHiveTransactionHeartbeats.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ForHiveTransactionHeartbeats.java
index e52cee3e4004..a98e27d43f1f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ForHiveTransactionHeartbeats.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ForHiveTransactionHeartbeats.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,5 +25,5 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForHiveTransactionHeartbeats {}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/GenericHiveRecordCursor.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/GenericHiveRecordCursor.java
deleted file mode 100644
index e67c25cd8136..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/GenericHiveRecordCursor.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import io.airlift.slice.Slice;
-import io.airlift.slice.Slices;
-import io.trino.hadoop.TextLineLengthLimitExceededException;
-import io.trino.plugin.base.type.DecodedTimestamp;
-import io.trino.plugin.base.type.TrinoTimestampEncoder;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.type.CharType;
-import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.Int128;
-import io.trino.spi.type.LongTimestamp;
-import io.trino.spi.type.TimestampType;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.VarcharType;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.common.type.Date;
-import org.apache.hadoop.hive.common.type.HiveChar;
-import org.apache.hadoop.hive.common.type.HiveDecimal;
-import org.apache.hadoop.hive.common.type.HiveVarchar;
-import org.apache.hadoop.hive.common.type.Timestamp;
-import org.apache.hadoop.hive.serde2.Deserializer;
-import org.apache.hadoop.hive.serde2.SerDeException;
-import org.apache.hadoop.hive.serde2.io.HiveCharWritable;
-import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.StructField;
-import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
-import org.apache.hadoop.io.BinaryComparable;
-import org.apache.hadoop.io.BytesWritable;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.mapred.RecordReader;
-
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-import static io.trino.plugin.base.type.TrinoTimestampEncoderFactory.createTimestampEncoder;
-import static io.trino.plugin.base.util.Closables.closeAllSuppress;
-import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_BAD_DATA;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_CURSOR_ERROR;
-import static io.trino.plugin.hive.util.HiveUtil.getDeserializer;
-import static io.trino.plugin.hive.util.HiveUtil.getTableObjectInspector;
-import static io.trino.plugin.hive.util.HiveUtil.isStructuralType;
-import static io.trino.plugin.hive.util.SerDeUtils.getBlockObject;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.BooleanType.BOOLEAN;
-import static io.trino.spi.type.Chars.truncateToLengthAndTrimSpaces;
-import static io.trino.spi.type.DateType.DATE;
-import static io.trino.spi.type.Decimals.rescale;
-import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.IntegerType.INTEGER;
-import static io.trino.spi.type.RealType.REAL;
-import static io.trino.spi.type.SmallintType.SMALLINT;
-import static io.trino.spi.type.TinyintType.TINYINT;
-import static io.trino.spi.type.VarbinaryType.VARBINARY;
-import static io.trino.spi.type.Varchars.truncateToLength;
-import static java.lang.Float.floatToRawIntBits;
-import static java.lang.Math.max;
-import static java.lang.Math.min;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-import static org.joda.time.DateTimeZone.UTC;
-
-public class GenericHiveRecordCursor<K, V extends Writable>
-        implements RecordCursor
-{
-    private final Path path;
-    private final RecordReader<K, V> recordReader;
-    private final K key;
-    private final V value;
-
-    private final Deserializer deserializer;
-
-    private final Type[] types;
-    private final HiveType[] hiveTypes;
-
-    private final StructObjectInspector rowInspector;
-    private final ObjectInspector[] fieldInspectors;
-    private final StructField[] structFields;
-
-    private final boolean[] loaded;
-    private final boolean[] booleans;
-    private final long[] longs;
-    private final double[] doubles;
-    private final Slice[] slices;
-    private final Object[] objects;
-    private final boolean[] nulls;
-    private final TrinoTimestampEncoder<?>[] timestampEncoders;
-
-    private final long totalBytes;
-
-    private long completedBytes;
-    private Object rowData;
-    private boolean closed;
-
-    public GenericHiveRecordCursor(
-            Configuration configuration,
-            Path path,
-            RecordReader<K, V> recordReader,
-            long totalBytes,
-            Properties splitSchema,
-            List<HiveColumnHandle> columns)
-    {
-        requireNonNull(path, "path is null");
-        requireNonNull(recordReader, "recordReader is null");
-        checkArgument(totalBytes >= 0, "totalBytes is negative");
-        requireNonNull(splitSchema, "splitSchema is null");
-        requireNonNull(columns, "columns is null");
-
-        this.path = path;
-        this.recordReader = recordReader;
-        this.totalBytes = totalBytes;
-        this.key = recordReader.createKey();
-        this.value = recordReader.createValue();
-
-        this.deserializer = getDeserializer(configuration, splitSchema);
-        this.rowInspector = getTableObjectInspector(deserializer);
-
-        int size = columns.size();
-
-        this.types = new Type[size];
-        this.hiveTypes = new HiveType[size];
-
-        this.structFields = new StructField[size];
-        this.fieldInspectors = new ObjectInspector[size];
-
-        this.loaded = new boolean[size];
-        this.booleans = new boolean[size];
-        this.longs = new long[size];
-        this.doubles = new double[size];
-        this.slices = new Slice[size];
-        this.objects = new Object[size];
-        this.nulls = new boolean[size];
-        this.timestampEncoders = new TrinoTimestampEncoder[size];
-
-        // initialize data columns
-        for (int i = 0; i < columns.size(); i++) {
-            HiveColumnHandle column = columns.get(i);
-            checkState(column.getColumnType() == REGULAR, "column type must be regular");
-
-            Type columnType = column.getType();
-            types[i] = columnType;
-            if (columnType instanceof TimestampType) {
-                timestampEncoders[i] = createTimestampEncoder((TimestampType) columnType, UTC);
-            }
-            hiveTypes[i] = column.getHiveType();
-
-            StructField field = rowInspector.getStructFieldRef(column.getName());
-            structFields[i] = field;
-            fieldInspectors[i] = field.getFieldObjectInspector();
-        }
-    }
-
-    @Override
-    public long getCompletedBytes()
-    {
-        if (!closed) {
-            updateCompletedBytes();
-        }
-        return completedBytes;
-    }
-
-    @Override
-    public long getReadTimeNanos()
-    {
-        return 0;
-    }
-
-    private void updateCompletedBytes()
-    {
-        try {
-            @SuppressWarnings("NumericCastThatLosesPrecision")
-            long newCompletedBytes = (long) (totalBytes * recordReader.getProgress());
-            completedBytes = min(totalBytes, max(completedBytes, newCompletedBytes));
-        }
-        catch (IOException ignored) {
-        }
-    }
-
-    @Override
-    public Type getType(int field)
-    {
-        return types[field];
-    }
-
-    @Override
-    public boolean advanceNextPosition()
-    {
-        try {
-            if (closed || !recordReader.next(key, value)) {
-                close();
-                return false;
-            }
-
-            // Only deserialize the value if atleast one column is required
-            if (types.length > 0) {
-                // reset loaded flags
-                Arrays.fill(loaded, false);
-
-                // decode value
-                rowData = deserializer.deserialize(value);
-            }
-
-            return true;
-        }
-        catch (IOException | SerDeException | RuntimeException e) {
-            closeAllSuppress(e, this);
-            if (e instanceof TextLineLengthLimitExceededException) {
-                throw new TrinoException(HIVE_BAD_DATA, "Line too long in text file: " + path, e);
-            }
-            throw new TrinoException(HIVE_CURSOR_ERROR, e);
-        }
-    }
-
-    @Override
-    public boolean getBoolean(int fieldId)
-    {
-        checkState(!closed, "Cursor is closed");
-
-        validateType(fieldId, boolean.class);
-        if (!loaded[fieldId]) {
-            parseBooleanColumn(fieldId);
-        }
-        return booleans[fieldId];
-    }
-
-    private void parseBooleanColumn(int column)
-    {
-        loaded[column] = true;
-
-        Object fieldData = rowInspector.getStructFieldData(rowData, structFields[column]);
-
-        if (fieldData == null) {
-            nulls[column] = true;
-        }
-        else {
-            Object fieldValue = ((PrimitiveObjectInspector) fieldInspectors[column]).getPrimitiveJavaObject(fieldData);
-            checkState(fieldValue != null, "fieldValue should not be null");
-            booleans[column] = (Boolean) fieldValue;
-            nulls[column] = false;
-        }
-    }
-
-    @Override
-    public long getLong(int fieldId)
-    {
-        checkState(!closed, "Cursor is closed");
-
-        validateType(fieldId, long.class);
-        if (!loaded[fieldId]) {
-            parseLongColumn(fieldId);
-        }
-        return longs[fieldId];
-    }
-
-    private void parseLongColumn(int column)
-    {
-        loaded[column] = true;
-
-        Object fieldData = rowInspector.getStructFieldData(rowData, structFields[column]);
-
-        if (fieldData == null) {
-            nulls[column] = true;
-        }
-        else {
-            Object fieldValue = ((PrimitiveObjectInspector) fieldInspectors[column]).getPrimitiveJavaObject(fieldData);
-            checkState(fieldValue != null, "fieldValue should not be null");
-            longs[column] = getLongExpressedValue(fieldValue, column);
-            nulls[column] = false;
-        }
-    }
-
-    private long getLongExpressedValue(Object value, int column)
-    {
-        if (value instanceof Date) {
-            return ((Date) value).toEpochDay();
-        }
-        if (value instanceof Timestamp) {
-            return shortTimestamp((Timestamp) value, column);
-        }
-        if (value instanceof Float) {
-            return floatToRawIntBits(((Float) value));
-        }
-        return ((Number) value).longValue();
-    }
-
-    @Override
-    public double getDouble(int fieldId)
-    {
-        checkState(!closed, "Cursor is closed");
-
-        validateType(fieldId, double.class);
-        if (!loaded[fieldId]) {
-            parseDoubleColumn(fieldId);
-        }
-        return doubles[fieldId];
-    }
-
-    private void parseDoubleColumn(int column)
-    {
-        loaded[column] = true;
-
-        Object fieldData = rowInspector.getStructFieldData(rowData, structFields[column]);
-
-        if (fieldData == null) {
-            nulls[column] = true;
-        }
-        else {
-            Object fieldValue = ((PrimitiveObjectInspector) fieldInspectors[column]).getPrimitiveJavaObject(fieldData);
-            checkState(fieldValue != null, "fieldValue should not be null");
-            doubles[column] = ((Number) fieldValue).doubleValue();
-            nulls[column] = false;
-        }
-    }
-
-    @Override
-    public Slice getSlice(int fieldId)
-    {
-        checkState(!closed, "Cursor is closed");
-
-        validateType(fieldId, Slice.class);
-        if (!loaded[fieldId]) {
-            parseStringColumn(fieldId);
-        }
-        return slices[fieldId];
-    }
-
-    private void parseStringColumn(int column)
-    {
-        loaded[column] = true;
-
-        Object fieldData = rowInspector.getStructFieldData(rowData, structFields[column]);
-
-        if (fieldData == null) {
-            nulls[column] = true;
-        }
-        else {
-            PrimitiveObjectInspector inspector = (PrimitiveObjectInspector) fieldInspectors[column];
-            Slice value;
-            if (inspector.preferWritable()) {
-                value = parseStringFromPrimitiveWritableObjectValue(types[column], inspector.getPrimitiveWritableObject(fieldData));
-            }
-            else {
-                value = parseStringFromPrimitiveJavaObjectValue(types[column], inspector.getPrimitiveJavaObject(fieldData));
-            }
-            slices[column] = value;
-            nulls[column] = false;
-        }
-    }
-
-    private static Slice trimStringToCharacterLimits(Type type, Slice value)
-    {
-        if (type instanceof VarcharType) {
-            return truncateToLength(value, type);
-        }
-        if (type instanceof CharType) {
-            return truncateToLengthAndTrimSpaces(value, type);
-        }
-        return value;
-    }
-
-    private static Slice parseStringFromPrimitiveWritableObjectValue(Type type, Object fieldValue)
-    {
-        checkState(fieldValue != null, "fieldValue should not be null");
-        BinaryComparable hiveValue;
-        if (fieldValue instanceof Text) {
-            hiveValue = (Text) fieldValue;
-        }
-        else if (fieldValue instanceof BytesWritable) {
-            hiveValue = (BytesWritable) fieldValue;
-        }
-        else if (fieldValue instanceof HiveVarcharWritable) {
-            hiveValue = ((HiveVarcharWritable) fieldValue).getTextValue();
-        }
-        else if (fieldValue instanceof HiveCharWritable) {
-            hiveValue = ((HiveCharWritable) fieldValue).getTextValue();
-        }
-        else {
-            throw new IllegalStateException("unsupported string field type: " + fieldValue.getClass().getName());
-        }
-        // create a slice view over the hive value and trim to character limits
-        Slice value = trimStringToCharacterLimits(type, Slices.wrappedBuffer(hiveValue.getBytes(), 0, hiveValue.getLength()));
-        // store a copy of the bytes, since the hive reader can reuse the underlying buffer
-        return Slices.copyOf(value);
-    }
-
-    private static Slice parseStringFromPrimitiveJavaObjectValue(Type type, Object fieldValue)
-    {
-        checkState(fieldValue != null, "fieldValue should not be null");
-        Slice value;
-        if (fieldValue instanceof String) {
-            value = Slices.utf8Slice((String) fieldValue);
-        }
-        else if (fieldValue instanceof byte[]) {
-            value = Slices.wrappedBuffer((byte[]) fieldValue);
-        }
-        else if (fieldValue instanceof HiveVarchar) {
-            value = Slices.utf8Slice(((HiveVarchar) fieldValue).getValue());
-        }
-        else if (fieldValue instanceof HiveChar) {
-            value = Slices.utf8Slice(((HiveChar) fieldValue).getValue());
-        }
-        else {
-            throw new IllegalStateException("unsupported string field type: " + fieldValue.getClass().getName());
-        }
-        value = trimStringToCharacterLimits(type, value);
-        // Copy the slice if the value was trimmed and is now smaller than the backing buffer
-        if (!value.isCompact()) {
-            return Slices.copyOf(value);
-        }
-        return value;
-    }
-
-    private void parseDecimalColumn(int column)
-    {
-        loaded[column] = true;
-
-        Object fieldData = rowInspector.getStructFieldData(rowData, structFields[column]);
-
-        if (fieldData == null) {
-            nulls[column] = true;
-        }
-        else {
-            Object fieldValue = ((PrimitiveObjectInspector) fieldInspectors[column]).getPrimitiveJavaObject(fieldData);
-            checkState(fieldValue != null, "fieldValue should not be null");
-
-            HiveDecimal decimal = (HiveDecimal) fieldValue;
-            DecimalType columnType = (DecimalType) types[column];
-            BigInteger unscaledDecimal = rescale(decimal.unscaledValue(), decimal.scale(), columnType.getScale());
-
-            if (columnType.isShort()) {
-                longs[column] = unscaledDecimal.longValue();
-            }
-            else {
-                objects[column] = Int128.valueOf(unscaledDecimal);
-            }
-            nulls[column] = false;
-        }
-    }
-
-    @Override
-    public Object getObject(int fieldId)
-    {
-        checkState(!closed, "Cursor is closed");
-
-        if (!loaded[fieldId]) {
-            parseObjectColumn(fieldId);
-        }
-        return objects[fieldId];
-    }
-
-    private void parseObjectColumn(int column)
-    {
-        loaded[column] = true;
-
-        Object fieldData = rowInspector.getStructFieldData(rowData, structFields[column]);
-
-        if (fieldData == null) {
-            nulls[column] = true;
-        }
-        else {
-            Type type = types[column];
-            if (type.getJavaType() == Block.class) {
-                objects[column] = getBlockObject(type, fieldData, fieldInspectors[column]);
-            }
-            else if (type instanceof TimestampType) {
-                Timestamp timestamp = (Timestamp) ((PrimitiveObjectInspector) fieldInspectors[column]).getPrimitiveJavaObject(fieldData);
-                objects[column] = longTimestamp(timestamp, column);
-            }
-            else {
-                throw new IllegalStateException("Unsupported type: " + type);
-            }
-            nulls[column] = false;
-        }
-    }
-
-    @Override
-    public boolean isNull(int fieldId)
-    {
-        checkState(!closed, "Cursor is closed");
-
-        if (!loaded[fieldId]) {
-            parseColumn(fieldId);
-        }
-        return nulls[fieldId];
-    }
-
-    private void parseColumn(int column)
-    {
-        Type type = types[column];
-        if (BOOLEAN.equals(type)) {
-            parseBooleanColumn(column);
-        }
-        else if (BIGINT.equals(type)) {
-            parseLongColumn(column);
-        }
-        else if (INTEGER.equals(type)) {
-            parseLongColumn(column);
-        }
-        else if (SMALLINT.equals(type)) {
-            parseLongColumn(column);
-        }
-        else if (TINYINT.equals(type)) {
-            parseLongColumn(column);
-        }
-        else if (REAL.equals(type)) {
-            parseLongColumn(column);
-        }
-        else if (DOUBLE.equals(type)) {
-            parseDoubleColumn(column);
-        }
-        else if (type instanceof VarcharType || VARBINARY.equals(type)) {
-            parseStringColumn(column);
-        }
-        else if (type instanceof CharType) {
-            parseStringColumn(column);
-        }
-        else if (isStructuralType(hiveTypes[column])) {
-            parseObjectColumn(column);
-        }
-        else if (DATE.equals(type)) {
-            parseLongColumn(column);
-        }
-        else if (type instanceof TimestampType) {
-            if (((TimestampType) type).isShort()) {
-                parseLongColumn(column);
-            }
-            else {
-                parseObjectColumn(column);
-            }
-        }
-        else if (type instanceof DecimalType) {
-            parseDecimalColumn(column);
-        }
-        else {
-            throw new UnsupportedOperationException("Unsupported column type: " + type);
-        }
-    }
-
-    private void validateType(int fieldId, Class<?> type)
-    {
-        if (!types[fieldId].getJavaType().equals(type)) {
-            // we don't use Preconditions.checkArgument because it requires boxing fieldId, which affects inner loop performance
-            throw new IllegalArgumentException(format("Expected field to be %s, actual %s (field %s)", type, types[fieldId], fieldId));
-        }
-    }
-
-    @Override
-    public void close()
-    {
-        // some hive input formats are broken and bad things can happen if you close them multiple times
-        if (closed) {
-            return;
-        }
-        closed = true;
-
-        updateCompletedBytes();
-
-        try {
-            recordReader.close();
-        }
-        catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    private long shortTimestamp(Timestamp value, int column)
-    {
-        @SuppressWarnings("unchecked")
-        TrinoTimestampEncoder<Long> encoder = (TrinoTimestampEncoder<Long>) timestampEncoders[column];
-        return encoder.getTimestamp(new DecodedTimestamp(value.toEpochSecond(), value.getNanos()));
-    }
-
-    private LongTimestamp longTimestamp(Timestamp value, int column)
-    {
-        @SuppressWarnings("unchecked")
-        TrinoTimestampEncoder<LongTimestamp> encoder = (TrinoTimestampEncoder<LongTimestamp>) timestampEncoders[column];
-        return encoder.getTimestamp(new DecodedTimestamp(value.toEpochSecond(), value.getNanos()));
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/GenericHiveRecordCursorProvider.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/GenericHiveRecordCursorProvider.java
deleted file mode 100644
index 488ceb9d243f..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/GenericHiveRecordCursorProvider.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import io.airlift.units.DataSize;
-import io.trino.hdfs.HdfsEnvironment;
-import io.trino.plugin.hive.util.HiveUtil;
-import io.trino.spi.TrinoException;
-import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.mapred.RecordReader;
-import org.apache.hadoop.mapreduce.lib.input.LineRecordReader;
-
-import javax.inject.Inject;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import java.util.Properties;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
-import static io.trino.plugin.hive.HivePageSourceProvider.projectBaseColumns;
-import static java.lang.Math.toIntExact;
-import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toUnmodifiableList;
-
-public class GenericHiveRecordCursorProvider
-        implements HiveRecordCursorProvider
-{
-    private final HdfsEnvironment hdfsEnvironment;
-    private final int textMaxLineLengthBytes;
-
-    @Inject
-    public GenericHiveRecordCursorProvider(HdfsEnvironment hdfsEnvironment, HiveConfig config)
-    {
-        this(hdfsEnvironment, config.getTextMaxLineLength());
-    }
-
-    public GenericHiveRecordCursorProvider(HdfsEnvironment hdfsEnvironment, DataSize textMaxLineLength)
-    {
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
-        this.textMaxLineLengthBytes = toIntExact(textMaxLineLength.toBytes());
-        checkArgument(textMaxLineLengthBytes >= 1, "textMaxLineLength must be at least 1 byte");
-    }
-
-    @Override
-    public Optional<ReaderRecordCursorWithProjections> createRecordCursor(
-            Configuration configuration,
-            ConnectorSession session,
-            Path path,
-            long start,
-            long length,
-            long fileSize,
-            Properties schema,
-            List<HiveColumnHandle> columns,
-            TupleDomain<HiveColumnHandle> effectivePredicate,
-            TypeManager typeManager,
-            boolean s3SelectPushdownEnabled)
-    {
-        configuration.setInt(LineRecordReader.MAX_LINE_LENGTH, textMaxLineLengthBytes);
-
-        // make sure the FileSystem is created with the proper Configuration object
-        try {
-            this.hdfsEnvironment.getFileSystem(session.getIdentity(), path, configuration);
-        }
-        catch (IOException e) {
-            throw new TrinoException(HIVE_FILESYSTEM_ERROR, "Failed getting FileSystem: " + path, e);
-        }
-
-        Optional<ReaderColumns> projections = projectBaseColumns(columns);
-        List<HiveColumnHandle> readerColumns = projections
-                .map(ReaderColumns::get)
-                .map(columnHandles -> columnHandles.stream()
-                        .map(HiveColumnHandle.class::cast)
-                        .collect(toUnmodifiableList()))
-                .orElse(columns);
-
-        RecordCursor cursor = hdfsEnvironment.doAs(session.getIdentity(), () -> {
-            RecordReader<?, ?> recordReader = HiveUtil.createRecordReader(
-                    configuration,
-                    path,
-                    start,
-                    length,
-                    schema,
-                    readerColumns);
-
-            try {
-                return new GenericHiveRecordCursor<>(
-                        configuration,
-                        path,
-                        genericRecordReader(recordReader),
-                        length,
-                        schema,
-                        readerColumns);
-            }
-            catch (Exception e) {
-                try {
-                    recordReader.close();
-                }
-                catch (IOException closeException) {
-                    if (e != closeException) {
-                        e.addSuppressed(closeException);
-                    }
-                }
-                throw e;
-            }
-        });
-
-        return Optional.of(new ReaderRecordCursorWithProjections(cursor, projections));
-    }
-
-    @SuppressWarnings("unchecked")
-    private static RecordReader<?, ? extends Writable> genericRecordReader(RecordReader<?, ?> recordReader)
-    {
-        return (RecordReader<?, ? extends Writable>) recordReader;
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HideDeltaLakeTables.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HideDeltaLakeTables.java
index 0db1a6f4a7b1..f7ae52545856 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HideDeltaLakeTables.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HideDeltaLakeTables.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface HideDeltaLakeTables
 {
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveAnalyzeProperties.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveAnalyzeProperties.java
index 36b0acee221d..549fc0c32995 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveAnalyzeProperties.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveAnalyzeProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.hive;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.TrinoException;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveApplyProjectionUtil.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveApplyProjectionUtil.java
index 547ca6e7612f..82dc15d0df50 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveApplyProjectionUtil.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveApplyProjectionUtil.java
@@ -13,110 +13,19 @@
  */
 package io.trino.plugin.hive;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.connector.ColumnHandle;
-import io.trino.spi.expression.Call;
-import io.trino.spi.expression.ConnectorExpression;
-import io.trino.spi.expression.Constant;
-import io.trino.spi.expression.FieldDereference;
-import io.trino.spi.expression.Variable;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static java.util.Objects.requireNonNull;
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.ProjectedColumnRepresentation;
 
 public final class HiveApplyProjectionUtil
 {
     private HiveApplyProjectionUtil() {}
 
-    public static List<ConnectorExpression> extractSupportedProjectedColumns(ConnectorExpression expression)
-    {
-        requireNonNull(expression, "expression is null");
-        ImmutableList.Builder<ConnectorExpression> supportedSubExpressions = ImmutableList.builder();
-        fillSupportedProjectedColumns(expression, supportedSubExpressions);
-        return supportedSubExpressions.build();
-    }
-
-    private static void fillSupportedProjectedColumns(ConnectorExpression expression, ImmutableList.Builder<ConnectorExpression> supportedSubExpressions)
-    {
-        if (isPushDownSupported(expression)) {
-            supportedSubExpressions.add(expression);
-            return;
-        }
-
-        // If the whole expression is not supported, look for a partially supported projection
-        for (ConnectorExpression child : expression.getChildren()) {
-            fillSupportedProjectedColumns(child, supportedSubExpressions);
-        }
-    }
-
-    @VisibleForTesting
-    static boolean isPushDownSupported(ConnectorExpression expression)
-    {
-        return expression instanceof Variable ||
-                (expression instanceof FieldDereference fieldDereference && isPushDownSupported(fieldDereference.getTarget()));
-    }
-
-    public static ProjectedColumnRepresentation createProjectedColumnRepresentation(ConnectorExpression expression)
-    {
-        ImmutableList.Builder<Integer> ordinals = ImmutableList.builder();
-
-        Variable target;
-        while (true) {
-            if (expression instanceof Variable variable) {
-                target = variable;
-                break;
-            }
-            if (expression instanceof FieldDereference dereference) {
-                ordinals.add(dereference.getField());
-                expression = dereference.getTarget();
-            }
-            else {
-                throw new IllegalArgumentException("expression is not a valid dereference chain");
-            }
-        }
-
-        return new ProjectedColumnRepresentation(target, ordinals.build().reverse());
-    }
-
-    /**
-     * Replace all connector expressions with variables as given by {@param expressionToVariableMappings} in a top down manner.
-     * i.e. if the replacement occurs for the parent, the children will not be visited.
-     */
-    public static ConnectorExpression replaceWithNewVariables(ConnectorExpression expression, Map<ConnectorExpression, Variable> expressionToVariableMappings)
-    {
-        if (expressionToVariableMappings.containsKey(expression)) {
-            return expressionToVariableMappings.get(expression);
-        }
-
-        if (expression instanceof Constant || expression instanceof Variable) {
-            return expression;
-        }
-
-        if (expression instanceof FieldDereference fieldDereference) {
-            ConnectorExpression newTarget = replaceWithNewVariables(fieldDereference.getTarget(), expressionToVariableMappings);
-            return new FieldDereference(expression.getType(), newTarget, fieldDereference.getField());
-        }
-
-        if (expression instanceof Call call) {
-            return new Call(
-                    call.getType(),
-                    call.getFunctionName(),
-                    call.getArguments().stream()
-                            .map(argument -> replaceWithNewVariables(argument, expressionToVariableMappings))
-                            .collect(toImmutableList()));
-        }
-
-        // We cannot skip processing for unsupported expression shapes. This may lead to variables being left in ProjectionApplicationResult
-        // which are no longer bound.
-        throw new UnsupportedOperationException("Unsupported expression: " + expression);
-    }
-
     /**
      * Returns the assignment key corresponding to the column represented by {@param projectedColumn} in the {@param assignments}, if one exists.
      * The variable in the {@param projectedColumn} can itself be a representation of another projected column. For example,
@@ -156,51 +65,4 @@ public static Optional<String> find(Map<String, ColumnHandle> assignments, Proje
 
         return Optional.empty();
     }
-
-    public static class ProjectedColumnRepresentation
-    {
-        private final Variable variable;
-        private final List<Integer> dereferenceIndices;
-
-        public ProjectedColumnRepresentation(Variable variable, List<Integer> dereferenceIndices)
-        {
-            this.variable = requireNonNull(variable, "variable is null");
-            this.dereferenceIndices = ImmutableList.copyOf(requireNonNull(dereferenceIndices, "dereferenceIndices is null"));
-        }
-
-        public Variable getVariable()
-        {
-            return variable;
-        }
-
-        public List<Integer> getDereferenceIndices()
-        {
-            return dereferenceIndices;
-        }
-
-        public boolean isVariable()
-        {
-            return dereferenceIndices.isEmpty();
-        }
-
-        @Override
-        public boolean equals(Object obj)
-        {
-            if (this == obj) {
-                return true;
-            }
-            if ((obj == null) || (getClass() != obj.getClass())) {
-                return false;
-            }
-            ProjectedColumnRepresentation that = (ProjectedColumnRepresentation) obj;
-            return Objects.equals(variable, that.variable) &&
-                    Objects.equals(dereferenceIndices, that.dereferenceIndices);
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hash(variable, dereferenceIndices);
-        }
-    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveBasicStatistics.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveBasicStatistics.java
index 58705a490d85..d83bf1bacc58 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveBasicStatistics.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveBasicStatistics.java
@@ -15,14 +15,12 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 import java.util.OptionalLong;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 @Immutable
@@ -85,10 +83,9 @@ public OptionalLong getOnDiskDataSizeInBytes()
         return onDiskDataSizeInBytes;
     }
 
-    public HiveBasicStatistics withAdjustedRowCount(long adjustment)
+    public HiveBasicStatistics withEmptyRowCount()
     {
-        checkArgument(rowCount.isPresent(), "rowCount isn't present");
-        return new HiveBasicStatistics(fileCount, OptionalLong.of(rowCount.getAsLong() + adjustment), inMemoryDataSizeInBytes, onDiskDataSizeInBytes);
+        return new HiveBasicStatistics(fileCount, OptionalLong.empty(), inMemoryDataSizeInBytes, onDiskDataSizeInBytes);
     }
 
     @Override
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveBucketAdapterRecordCursor.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveBucketAdapterRecordCursor.java
deleted file mode 100644
index c86ba7d82c4a..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveBucketAdapterRecordCursor.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import io.airlift.slice.Slice;
-import io.trino.plugin.hive.type.TypeInfo;
-import io.trino.plugin.hive.util.ForwardingRecordCursor;
-import io.trino.plugin.hive.util.HiveBucketing;
-import io.trino.plugin.hive.util.HiveBucketing.BucketingVersion;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeManager;
-
-import java.util.List;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_BUCKET_FILES;
-import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-
-public class HiveBucketAdapterRecordCursor
-        extends ForwardingRecordCursor
-{
-    private final RecordCursor delegate;
-    private final int[] bucketColumnIndices;
-    private final List<Class<?>> javaTypeList;
-    private final List<TypeInfo> typeInfoList;
-    private final BucketingVersion bucketingVersion;
-    private final int tableBucketCount;
-    private final int partitionBucketCount;
-    private final int bucketToKeep;
-
-    private final Object[] scratch;
-
-    public HiveBucketAdapterRecordCursor(
-            int[] bucketColumnIndices,
-            List<HiveType> bucketColumnHiveTypes,
-            BucketingVersion bucketingVersion,
-            int tableBucketCount,
-            int partitionBucketCount,
-            int bucketToKeep,
-            TypeManager typeManager,
-            RecordCursor delegate)
-    {
-        this.bucketColumnIndices = requireNonNull(bucketColumnIndices, "bucketColumnIndices is null");
-        this.delegate = requireNonNull(delegate, "delegate is null");
-        requireNonNull(bucketColumnHiveTypes, "bucketColumnHiveTypes is null");
-        this.javaTypeList = bucketColumnHiveTypes.stream()
-                .map(HiveType::getTypeSignature)
-                .map(typeManager::getType)
-                .map(Type::getJavaType)
-                .collect(toImmutableList());
-        this.typeInfoList = bucketColumnHiveTypes.stream()
-                .map(HiveType::getTypeInfo)
-                .collect(toImmutableList());
-        this.bucketingVersion = requireNonNull(bucketingVersion, "bucketingVersion is null");
-        this.tableBucketCount = tableBucketCount;
-        this.partitionBucketCount = partitionBucketCount;
-        this.bucketToKeep = bucketToKeep;
-
-        this.scratch = new Object[bucketColumnHiveTypes.size()];
-    }
-
-    @Override
-    protected RecordCursor delegate()
-    {
-        return delegate;
-    }
-
-    @Override
-    public boolean advanceNextPosition()
-    {
-        while (true) {
-            if (Thread.interrupted()) {
-                // Stop processing if the query has been destroyed.
-                Thread.currentThread().interrupt();
-                throw new TrinoException(GENERIC_INTERNAL_ERROR, "RecordCursor was interrupted");
-            }
-
-            boolean hasNextPosition = delegate.advanceNextPosition();
-            if (!hasNextPosition) {
-                return false;
-            }
-            for (int i = 0; i < scratch.length; i++) {
-                int index = bucketColumnIndices[i];
-                if (delegate.isNull(index)) {
-                    scratch[i] = null;
-                    continue;
-                }
-                Class<?> javaType = javaTypeList.get(i);
-                if (javaType == boolean.class) {
-                    scratch[i] = delegate.getBoolean(index);
-                }
-                else if (javaType == long.class) {
-                    scratch[i] = delegate.getLong(index);
-                }
-                else if (javaType == double.class) {
-                    scratch[i] = delegate.getDouble(index);
-                }
-                else if (javaType == Slice.class) {
-                    scratch[i] = delegate.getSlice(index);
-                }
-                else if (javaType == Block.class) {
-                    scratch[i] = delegate.getObject(index);
-                }
-                else {
-                    throw new UnsupportedOperationException("Unknown java type: " + javaType);
-                }
-            }
-            int bucket = HiveBucketing.getHiveBucket(bucketingVersion, tableBucketCount, typeInfoList, scratch);
-            if ((bucket - bucketToKeep) % partitionBucketCount != 0) {
-                throw new TrinoException(HIVE_INVALID_BUCKET_FILES, format(
-                        "A row that is supposed to be in bucket %s is encountered. Only rows in bucket %s (modulo %s) are expected",
-                        bucket, bucketToKeep % partitionBucketCount, partitionBucketCount));
-            }
-            if (bucket == bucketToKeep) {
-                return true;
-            }
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveBucketValidationRecordCursor.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveBucketValidationRecordCursor.java
deleted file mode 100644
index 8dca3520d1eb..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveBucketValidationRecordCursor.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.VerifyException;
-import io.airlift.slice.Slice;
-import io.trino.plugin.hive.type.TypeInfo;
-import io.trino.plugin.hive.util.ForwardingRecordCursor;
-import io.trino.plugin.hive.util.HiveBucketing.BucketingVersion;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.fs.Path;
-
-import java.util.List;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_BUCKET_FILES;
-import static io.trino.plugin.hive.HivePageSource.BucketValidator.VALIDATION_STRIDE;
-import static io.trino.plugin.hive.util.HiveBucketing.getHiveBucket;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-
-public class HiveBucketValidationRecordCursor
-        extends ForwardingRecordCursor
-{
-    private final RecordCursor delegate;
-    private final Path path;
-    private final int[] bucketColumnIndices;
-    private final List<Class<?>> javaTypeList;
-    private final List<TypeInfo> typeInfoList;
-    private final BucketingVersion bucketingVersion;
-    private final int bucketCount;
-    private final int expectedBucket;
-
-    private final Object[] scratch;
-
-    private int validationCounter;
-
-    public HiveBucketValidationRecordCursor(
-            Path path,
-            int[] bucketColumnIndices,
-            List<HiveType> bucketColumnTypes,
-            BucketingVersion bucketingVersion,
-            int bucketCount,
-            int expectedBucket,
-            TypeManager typeManager,
-            RecordCursor delegate)
-    {
-        this.path = requireNonNull(path, "path is null");
-        this.bucketColumnIndices = requireNonNull(bucketColumnIndices, "bucketColumnIndices is null");
-        requireNonNull(bucketColumnTypes, "bucketColumnTypes is null");
-        this.javaTypeList = bucketColumnTypes.stream()
-                .map(HiveType::getTypeSignature)
-                .map(typeManager::getType)
-                .map(Type::getJavaType)
-                .collect(toImmutableList());
-        this.typeInfoList = bucketColumnTypes.stream()
-                .map(HiveType::getTypeInfo)
-                .collect(toImmutableList());
-        this.bucketingVersion = requireNonNull(bucketingVersion, "bucketingVersion is null");
-        this.bucketCount = bucketCount;
-        this.expectedBucket = expectedBucket;
-        this.delegate = requireNonNull(delegate, "delegate is null");
-
-        this.scratch = new Object[bucketColumnTypes.size()];
-    }
-
-    @VisibleForTesting
-    @Override
-    public RecordCursor delegate()
-    {
-        return delegate;
-    }
-
-    @Override
-    public boolean advanceNextPosition()
-    {
-        if (!delegate.advanceNextPosition()) {
-            return false;
-        }
-
-        if (validationCounter > 0) {
-            validationCounter--;
-            return true;
-        }
-        validationCounter = VALIDATION_STRIDE - 1;
-
-        for (int i = 0; i < scratch.length; i++) {
-            int index = bucketColumnIndices[i];
-            if (delegate.isNull(index)) {
-                scratch[i] = null;
-                continue;
-            }
-            Class<?> javaType = javaTypeList.get(i);
-            if (javaType == boolean.class) {
-                scratch[i] = delegate.getBoolean(index);
-            }
-            else if (javaType == long.class) {
-                scratch[i] = delegate.getLong(index);
-            }
-            else if (javaType == double.class) {
-                scratch[i] = delegate.getDouble(index);
-            }
-            else if (javaType == Slice.class) {
-                scratch[i] = delegate.getSlice(index);
-            }
-            else if (javaType == Block.class) {
-                scratch[i] = delegate.getObject(index);
-            }
-            else {
-                throw new VerifyException("Unknown Java type: " + javaType);
-            }
-        }
-
-        int bucket = getHiveBucket(bucketingVersion, bucketCount, typeInfoList, scratch);
-        if (bucket != expectedBucket) {
-            throw new TrinoException(HIVE_INVALID_BUCKET_FILES,
-                    format("Hive table is corrupt. File '%s' is for bucket %s, but contains a row for bucket %s.", path, expectedBucket, bucket));
-        }
-
-        return true;
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCoercionRecordCursor.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCoercionRecordCursor.java
deleted file mode 100644
index 9034479ab349..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCoercionRecordCursor.java
+++ /dev/null
@@ -1,680 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
-import io.airlift.slice.Slice;
-import io.trino.plugin.hive.HivePageSourceProvider.ColumnMapping;
-import io.trino.plugin.hive.type.ListTypeInfo;
-import io.trino.plugin.hive.type.MapTypeInfo;
-import io.trino.plugin.hive.util.ForwardingRecordCursor;
-import io.trino.spi.PageBuilder;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.type.ArrayType;
-import io.trino.spi.type.MapType;
-import io.trino.spi.type.RowType;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeManager;
-import io.trino.spi.type.VarcharType;
-
-import java.util.List;
-
-import static io.airlift.slice.Slices.utf8Slice;
-import static io.trino.plugin.hive.HiveType.HIVE_BYTE;
-import static io.trino.plugin.hive.HiveType.HIVE_DOUBLE;
-import static io.trino.plugin.hive.HiveType.HIVE_FLOAT;
-import static io.trino.plugin.hive.HiveType.HIVE_INT;
-import static io.trino.plugin.hive.HiveType.HIVE_LONG;
-import static io.trino.plugin.hive.HiveType.HIVE_SHORT;
-import static io.trino.plugin.hive.util.HiveUtil.extractStructFieldTypes;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static java.lang.Float.intBitsToFloat;
-import static java.lang.Math.min;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-
-public class HiveCoercionRecordCursor
-        extends ForwardingRecordCursor
-{
-    private final RecordCursor delegate;
-    private final List<ColumnMapping> columnMappings;
-    private final Coercer[] coercers;
-
-    public HiveCoercionRecordCursor(
-            List<ColumnMapping> columnMappings,
-            TypeManager typeManager,
-            RecordCursor delegate)
-    {
-        requireNonNull(columnMappings, "columnMappings is null");
-        requireNonNull(typeManager, "typeManager is null");
-
-        this.delegate = requireNonNull(delegate, "delegate is null");
-        this.columnMappings = ImmutableList.copyOf(columnMappings);
-
-        int size = columnMappings.size();
-
-        this.coercers = new Coercer[size];
-
-        BridgingRecordCursor bridgingRecordCursor = new BridgingRecordCursor();
-
-        for (int columnIndex = 0; columnIndex < size; columnIndex++) {
-            ColumnMapping columnMapping = columnMappings.get(columnIndex);
-
-            if (columnMapping.getBaseTypeCoercionFrom().isPresent()) {
-                coercers[columnIndex] = createCoercer(typeManager, columnMapping.getBaseTypeCoercionFrom().get(), columnMapping.getHiveColumnHandle().getHiveType(), bridgingRecordCursor);
-            }
-        }
-    }
-
-    @Override
-    protected RecordCursor delegate()
-    {
-        return delegate;
-    }
-
-    @Override
-    public boolean advanceNextPosition()
-    {
-        for (int i = 0; i < columnMappings.size(); i++) {
-            if (coercers[i] != null) {
-                coercers[i].reset();
-            }
-        }
-        return delegate.advanceNextPosition();
-    }
-
-    @Override
-    public boolean getBoolean(int field)
-    {
-        if (coercers[field] == null) {
-            return delegate.getBoolean(field);
-        }
-        return coercers[field].getBoolean(delegate, field);
-    }
-
-    @Override
-    public long getLong(int field)
-    {
-        if (coercers[field] == null) {
-            return delegate.getLong(field);
-        }
-        return coercers[field].getLong(delegate, field);
-    }
-
-    @Override
-    public double getDouble(int field)
-    {
-        if (coercers[field] == null) {
-            return delegate.getDouble(field);
-        }
-        return coercers[field].getDouble(delegate, field);
-    }
-
-    @Override
-    public Slice getSlice(int field)
-    {
-        if (coercers[field] == null) {
-            return delegate.getSlice(field);
-        }
-        return coercers[field].getSlice(delegate, field);
-    }
-
-    @Override
-    public Object getObject(int field)
-    {
-        if (coercers[field] == null) {
-            return delegate.getObject(field);
-        }
-        return coercers[field].getObject(delegate, field);
-    }
-
-    @Override
-    public boolean isNull(int field)
-    {
-        if (coercers[field] == null) {
-            return delegate.isNull(field);
-        }
-        return coercers[field].isNull(delegate, field);
-    }
-
-    @VisibleForTesting
-    RecordCursor getRegularColumnRecordCursor()
-    {
-        return delegate;
-    }
-
-    private abstract static class Coercer
-    {
-        private boolean isNull;
-        private boolean loaded;
-
-        private boolean booleanValue;
-        private long longValue;
-        private double doubleValue;
-        private Slice sliceValue;
-        private Object objectValue;
-
-        public void reset()
-        {
-            isNull = false;
-            loaded = false;
-        }
-
-        public boolean isNull(RecordCursor delegate, int field)
-        {
-            assureLoaded(delegate, field);
-            return isNull;
-        }
-
-        public boolean getBoolean(RecordCursor delegate, int field)
-        {
-            assureLoaded(delegate, field);
-            return booleanValue;
-        }
-
-        public long getLong(RecordCursor delegate, int field)
-        {
-            assureLoaded(delegate, field);
-            return longValue;
-        }
-
-        public double getDouble(RecordCursor delegate, int field)
-        {
-            assureLoaded(delegate, field);
-            return doubleValue;
-        }
-
-        public Slice getSlice(RecordCursor delegate, int field)
-        {
-            assureLoaded(delegate, field);
-            return sliceValue;
-        }
-
-        public Object getObject(RecordCursor delegate, int field)
-        {
-            assureLoaded(delegate, field);
-            return objectValue;
-        }
-
-        private void assureLoaded(RecordCursor delegate, int field)
-        {
-            if (!loaded) {
-                isNull = delegate.isNull(field);
-                if (!isNull) {
-                    coerce(delegate, field);
-                }
-                loaded = true;
-            }
-        }
-
-        protected abstract void coerce(RecordCursor delegate, int field);
-
-        protected void setBoolean(boolean value)
-        {
-            booleanValue = value;
-        }
-
-        protected void setLong(long value)
-        {
-            longValue = value;
-        }
-
-        protected void setDouble(double value)
-        {
-            doubleValue = value;
-        }
-
-        protected void setSlice(Slice value)
-        {
-            sliceValue = value;
-        }
-
-        protected void setObject(Object value)
-        {
-            objectValue = value;
-        }
-
-        protected void setIsNull(boolean isNull)
-        {
-            this.isNull = isNull;
-        }
-    }
-
-    private static Coercer createCoercer(TypeManager typeManager, HiveType fromHiveType, HiveType toHiveType, BridgingRecordCursor bridgingRecordCursor)
-    {
-        Type fromType = typeManager.getType(fromHiveType.getTypeSignature());
-        Type toType = typeManager.getType(toHiveType.getTypeSignature());
-        if (toType instanceof VarcharType && (fromHiveType.equals(HIVE_BYTE) || fromHiveType.equals(HIVE_SHORT) || fromHiveType.equals(HIVE_INT) || fromHiveType.equals(HIVE_LONG))) {
-            return new IntegerNumberToVarcharCoercer();
-        }
-        if (fromType instanceof VarcharType && (toHiveType.equals(HIVE_BYTE) || toHiveType.equals(HIVE_SHORT) || toHiveType.equals(HIVE_INT) || toHiveType.equals(HIVE_LONG))) {
-            return new VarcharToIntegerNumberCoercer(toHiveType);
-        }
-        if (fromHiveType.equals(HIVE_BYTE) && toHiveType.equals(HIVE_SHORT) || toHiveType.equals(HIVE_INT) || toHiveType.equals(HIVE_LONG)) {
-            return new IntegerNumberUpscaleCoercer();
-        }
-        if (fromHiveType.equals(HIVE_SHORT) && toHiveType.equals(HIVE_INT) || toHiveType.equals(HIVE_LONG)) {
-            return new IntegerNumberUpscaleCoercer();
-        }
-        if (fromHiveType.equals(HIVE_INT) && toHiveType.equals(HIVE_LONG)) {
-            return new IntegerNumberUpscaleCoercer();
-        }
-        if (fromHiveType.equals(HIVE_FLOAT) && toHiveType.equals(HIVE_DOUBLE)) {
-            return new FloatToDoubleCoercer();
-        }
-        if ((fromType instanceof ArrayType) && (toType instanceof ArrayType)) {
-            return new ListCoercer(typeManager, fromHiveType, toHiveType, bridgingRecordCursor);
-        }
-        if ((fromType instanceof MapType) && (toType instanceof MapType)) {
-            return new MapCoercer(typeManager, fromHiveType, toHiveType, bridgingRecordCursor);
-        }
-        if ((fromType instanceof RowType) && (toType instanceof RowType)) {
-            return new StructCoercer(typeManager, fromHiveType, toHiveType, bridgingRecordCursor);
-        }
-
-        throw new TrinoException(NOT_SUPPORTED, format("Unsupported coercion from %s to %s", fromHiveType, toHiveType));
-    }
-
-    private static class IntegerNumberUpscaleCoercer
-            extends Coercer
-    {
-        @Override
-        public void coerce(RecordCursor delegate, int field)
-        {
-            setLong(delegate.getLong(field));
-        }
-    }
-
-    private static class IntegerNumberToVarcharCoercer
-            extends Coercer
-    {
-        @Override
-        public void coerce(RecordCursor delegate, int field)
-        {
-            setSlice(utf8Slice(String.valueOf(delegate.getLong(field))));
-        }
-    }
-
-    private static class FloatToDoubleCoercer
-            extends Coercer
-    {
-        @Override
-        protected void coerce(RecordCursor delegate, int field)
-        {
-            setDouble(intBitsToFloat((int) delegate.getLong(field)));
-        }
-    }
-
-    private static class VarcharToIntegerNumberCoercer
-            extends Coercer
-    {
-        private final long maxValue;
-        private final long minValue;
-
-        public VarcharToIntegerNumberCoercer(HiveType type)
-        {
-            if (type.equals(HIVE_BYTE)) {
-                minValue = Byte.MIN_VALUE;
-                maxValue = Byte.MAX_VALUE;
-            }
-            else if (type.equals(HIVE_SHORT)) {
-                minValue = Short.MIN_VALUE;
-                maxValue = Short.MAX_VALUE;
-            }
-            else if (type.equals(HIVE_INT)) {
-                minValue = Integer.MIN_VALUE;
-                maxValue = Integer.MAX_VALUE;
-            }
-            else if (type.equals(HIVE_LONG)) {
-                minValue = Long.MIN_VALUE;
-                maxValue = Long.MAX_VALUE;
-            }
-            else {
-                throw new TrinoException(NOT_SUPPORTED, format("Could not create Coercer from varchar to %s", type));
-            }
-        }
-
-        @Override
-        public void coerce(RecordCursor delegate, int field)
-        {
-            try {
-                long value = Long.parseLong(delegate.getSlice(field).toStringUtf8());
-                if (minValue <= value && value <= maxValue) {
-                    setLong(value);
-                }
-                else {
-                    setIsNull(true);
-                }
-            }
-            catch (NumberFormatException e) {
-                setIsNull(true);
-            }
-        }
-    }
-
-    private static class ListCoercer
-            extends Coercer
-    {
-        private final Type fromElementType;
-        private final Type toType;
-        private final Type toElementType;
-        private final Coercer elementCoercer;
-        private final BridgingRecordCursor bridgingRecordCursor;
-        private final PageBuilder pageBuilder;
-
-        public ListCoercer(TypeManager typeManager, HiveType fromHiveType, HiveType toHiveType, BridgingRecordCursor bridgingRecordCursor)
-        {
-            requireNonNull(typeManager, "typeManager is null");
-            requireNonNull(fromHiveType, "fromHiveType is null");
-            requireNonNull(toHiveType, "toHiveType is null");
-            this.bridgingRecordCursor = requireNonNull(bridgingRecordCursor, "bridgingRecordCursor is null");
-            HiveType fromElementHiveType = HiveType.valueOf(((ListTypeInfo) fromHiveType.getTypeInfo()).getListElementTypeInfo().getTypeName());
-            HiveType toElementHiveType = HiveType.valueOf(((ListTypeInfo) toHiveType.getTypeInfo()).getListElementTypeInfo().getTypeName());
-            this.fromElementType = fromElementHiveType.getType(typeManager);
-            this.toType = toHiveType.getType(typeManager);
-            this.toElementType = toElementHiveType.getType(typeManager);
-            this.elementCoercer = fromElementHiveType.equals(toElementHiveType) ? null : createCoercer(typeManager, fromElementHiveType, toElementHiveType, bridgingRecordCursor);
-            this.pageBuilder = elementCoercer == null ? null : new PageBuilder(ImmutableList.of(toType));
-        }
-
-        @Override
-        public void coerce(RecordCursor delegate, int field)
-        {
-            if (delegate.isNull(field)) {
-                setIsNull(true);
-                return;
-            }
-            Block block = (Block) delegate.getObject(field);
-            if (pageBuilder.isFull()) {
-                pageBuilder.reset();
-            }
-            BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-            BlockBuilder listBuilder = blockBuilder.beginBlockEntry();
-            for (int i = 0; i < block.getPositionCount(); i++) {
-                if (elementCoercer == null) {
-                    toElementType.appendTo(block, i, listBuilder);
-                }
-                else {
-                    if (block.isNull(i)) {
-                        listBuilder.appendNull();
-                    }
-                    else {
-                        rewriteBlock(fromElementType, toElementType, block, i, listBuilder, elementCoercer, bridgingRecordCursor);
-                    }
-                }
-            }
-            blockBuilder.closeEntry();
-            pageBuilder.declarePosition();
-            setObject(toType.getObject(blockBuilder, blockBuilder.getPositionCount() - 1));
-        }
-    }
-
-    private static class MapCoercer
-            extends Coercer
-    {
-        private final List<Type> fromKeyValueTypes;
-        private final Type toType;
-        private final List<Type> toKeyValueTypes;
-        private final Coercer[] coercers;
-        private final BridgingRecordCursor bridgingRecordCursor;
-        private final PageBuilder pageBuilder;
-
-        public MapCoercer(TypeManager typeManager, HiveType fromHiveType, HiveType toHiveType, BridgingRecordCursor bridgingRecordCursor)
-        {
-            requireNonNull(typeManager, "typeManager is null");
-            requireNonNull(fromHiveType, "fromHiveType is null");
-            requireNonNull(toHiveType, "toHiveType is null");
-            this.bridgingRecordCursor = requireNonNull(bridgingRecordCursor, "bridgingRecordCursor is null");
-            HiveType fromKeyHiveType = HiveType.valueOf(((MapTypeInfo) fromHiveType.getTypeInfo()).getMapKeyTypeInfo().getTypeName());
-            HiveType fromValueHiveType = HiveType.valueOf(((MapTypeInfo) fromHiveType.getTypeInfo()).getMapValueTypeInfo().getTypeName());
-            HiveType toKeyHiveType = HiveType.valueOf(((MapTypeInfo) toHiveType.getTypeInfo()).getMapKeyTypeInfo().getTypeName());
-            HiveType toValueHiveType = HiveType.valueOf(((MapTypeInfo) toHiveType.getTypeInfo()).getMapValueTypeInfo().getTypeName());
-            this.fromKeyValueTypes = fromHiveType.getType(typeManager).getTypeParameters();
-            this.toType = toHiveType.getType(typeManager);
-            this.toKeyValueTypes = toType.getTypeParameters();
-            this.coercers = new Coercer[2];
-            coercers[0] = fromKeyHiveType.equals(toKeyHiveType) ? null : createCoercer(typeManager, fromKeyHiveType, toKeyHiveType, bridgingRecordCursor);
-            coercers[1] = fromValueHiveType.equals(toValueHiveType) ? null : createCoercer(typeManager, fromValueHiveType, toValueHiveType, bridgingRecordCursor);
-            this.pageBuilder = coercers[0] == null && coercers[1] == null ? null : new PageBuilder(ImmutableList.of(toType));
-        }
-
-        @Override
-        public void coerce(RecordCursor delegate, int field)
-        {
-            if (delegate.isNull(field)) {
-                setIsNull(true);
-                return;
-            }
-            Block block = (Block) delegate.getObject(field);
-            if (pageBuilder.isFull()) {
-                pageBuilder.reset();
-            }
-            BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-            BlockBuilder mapBuilder = blockBuilder.beginBlockEntry();
-            for (int i = 0; i < block.getPositionCount(); i++) {
-                int k = i % 2;
-                if (coercers[k] == null) {
-                    toKeyValueTypes.get(k).appendTo(block, i, mapBuilder);
-                }
-                else {
-                    if (block.isNull(i)) {
-                        mapBuilder.appendNull();
-                    }
-                    else {
-                        rewriteBlock(fromKeyValueTypes.get(k), toKeyValueTypes.get(k), block, i, mapBuilder, coercers[k], bridgingRecordCursor);
-                    }
-                }
-            }
-            blockBuilder.closeEntry();
-            pageBuilder.declarePosition();
-            setObject(toType.getObject(blockBuilder, blockBuilder.getPositionCount() - 1));
-        }
-    }
-
-    private static class StructCoercer
-            extends Coercer
-    {
-        private final Type toType;
-        private final List<Type> fromFieldTypes;
-        private final List<Type> toFieldTypes;
-        private final Coercer[] coercers;
-        private final BridgingRecordCursor bridgingRecordCursor;
-        private final PageBuilder pageBuilder;
-
-        public StructCoercer(TypeManager typeManager, HiveType fromHiveType, HiveType toHiveType, BridgingRecordCursor bridgingRecordCursor)
-        {
-            requireNonNull(typeManager, "typeManager is null");
-            requireNonNull(fromHiveType, "fromHiveType is null");
-            requireNonNull(toHiveType, "toHiveType is null");
-            this.bridgingRecordCursor = requireNonNull(bridgingRecordCursor, "bridgingRecordCursor is null");
-            List<HiveType> fromFieldHiveTypes = extractStructFieldTypes(fromHiveType);
-            List<HiveType> toFieldHiveTypes = extractStructFieldTypes(toHiveType);
-            this.fromFieldTypes = fromHiveType.getType(typeManager).getTypeParameters();
-            this.toType = toHiveType.getType(typeManager);
-            this.toFieldTypes = toType.getTypeParameters();
-            this.coercers = new Coercer[toFieldHiveTypes.size()];
-            for (int i = 0; i < min(fromFieldHiveTypes.size(), toFieldHiveTypes.size()); i++) {
-                if (!fromFieldTypes.get(i).equals(toFieldTypes.get(i))) {
-                    coercers[i] = createCoercer(typeManager, fromFieldHiveTypes.get(i), toFieldHiveTypes.get(i), bridgingRecordCursor);
-                }
-            }
-            this.pageBuilder = new PageBuilder(ImmutableList.of(toType));
-        }
-
-        @Override
-        public void coerce(RecordCursor delegate, int field)
-        {
-            if (delegate.isNull(field)) {
-                setIsNull(true);
-                return;
-            }
-            Block block = (Block) delegate.getObject(field);
-            if (pageBuilder.isFull()) {
-                pageBuilder.reset();
-            }
-            BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(0);
-            BlockBuilder rowBuilder = blockBuilder.beginBlockEntry();
-            for (int i = 0; i < toFieldTypes.size(); i++) {
-                if (i >= fromFieldTypes.size() || block.isNull(i)) {
-                    rowBuilder.appendNull();
-                }
-                else if (coercers[i] == null) {
-                    toFieldTypes.get(i).appendTo(block, i, rowBuilder);
-                }
-                else {
-                    rewriteBlock(fromFieldTypes.get(i), toFieldTypes.get(i), block, i, rowBuilder, coercers[i], bridgingRecordCursor);
-                }
-            }
-            blockBuilder.closeEntry();
-            pageBuilder.declarePosition();
-            setObject(toType.getObject(blockBuilder, blockBuilder.getPositionCount() - 1));
-        }
-    }
-
-    private static void rewriteBlock(
-            Type fromType,
-            Type toType,
-            Block block,
-            int position,
-            BlockBuilder blockBuilder,
-            Coercer coercer,
-            BridgingRecordCursor bridgingRecordCursor)
-    {
-        Class<?> fromJavaType = fromType.getJavaType();
-        if (fromJavaType == long.class) {
-            bridgingRecordCursor.setValue(fromType.getLong(block, position));
-        }
-        else if (fromJavaType == double.class) {
-            bridgingRecordCursor.setValue(fromType.getDouble(block, position));
-        }
-        else if (fromJavaType == boolean.class) {
-            bridgingRecordCursor.setValue(fromType.getBoolean(block, position));
-        }
-        else if (fromJavaType == Slice.class) {
-            bridgingRecordCursor.setValue(fromType.getSlice(block, position));
-        }
-        else if (fromJavaType == Block.class) {
-            bridgingRecordCursor.setValue(fromType.getObject(block, position));
-        }
-        else {
-            bridgingRecordCursor.setValue(null);
-        }
-        coercer.reset();
-        Class<?> toJaveType = toType.getJavaType();
-        if (coercer.isNull(bridgingRecordCursor, 0)) {
-            blockBuilder.appendNull();
-        }
-        else if (toJaveType == long.class) {
-            toType.writeLong(blockBuilder, coercer.getLong(bridgingRecordCursor, 0));
-        }
-        else if (toJaveType == double.class) {
-            toType.writeDouble(blockBuilder, coercer.getDouble(bridgingRecordCursor, 0));
-        }
-        else if (toJaveType == boolean.class) {
-            toType.writeBoolean(blockBuilder, coercer.getBoolean(bridgingRecordCursor, 0));
-        }
-        else if (toJaveType == Slice.class) {
-            toType.writeSlice(blockBuilder, coercer.getSlice(bridgingRecordCursor, 0));
-        }
-        else if (toJaveType == Block.class) {
-            toType.writeObject(blockBuilder, coercer.getObject(bridgingRecordCursor, 0));
-        }
-        else {
-            throw new TrinoException(NOT_SUPPORTED, format("Unsupported coercion from %s to %s", fromType.getDisplayName(), toType.getDisplayName()));
-        }
-        coercer.reset();
-        bridgingRecordCursor.close();
-    }
-
-    private static class BridgingRecordCursor
-            implements RecordCursor
-    {
-        private Object value;
-
-        public void setValue(Object value)
-        {
-            this.value = value;
-        }
-
-        @Override
-        public long getCompletedBytes()
-        {
-            return 0;
-        }
-
-        @Override
-        public long getReadTimeNanos()
-        {
-            return 0;
-        }
-
-        @Override
-        public Type getType(int field)
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean advanceNextPosition()
-        {
-            return true;
-        }
-
-        @Override
-        public boolean getBoolean(int field)
-        {
-            return (Boolean) value;
-        }
-
-        @Override
-        public long getLong(int field)
-        {
-            return (Long) value;
-        }
-
-        @Override
-        public double getDouble(int field)
-        {
-            return (Double) value;
-        }
-
-        @Override
-        public Slice getSlice(int field)
-        {
-            return (Slice) value;
-        }
-
-        @Override
-        public Object getObject(int field)
-        {
-            return value;
-        }
-
-        @Override
-        public boolean isNull(int field)
-        {
-            return value == null;
-        }
-
-        @Override
-        public void close()
-        {
-            this.value = null;
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveColumnProjectionInfo.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveColumnProjectionInfo.java
index 79c9f099cfc5..ceaf4ec5fedc 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveColumnProjectionInfo.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveColumnProjectionInfo.java
@@ -107,6 +107,12 @@ public boolean equals(Object obj)
                 Objects.equals(this.type, other.type);
     }
 
+    @Override
+    public String toString()
+    {
+        return partialName + ":" + type.getDisplayName();
+    }
+
     public static String generatePartialName(List<String> dereferenceNames)
     {
         return dereferenceNames.stream()
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCompressionCodec.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCompressionCodec.java
index 92eaea95cd20..bc8307909b17 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCompressionCodec.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCompressionCodec.java
@@ -13,8 +13,8 @@
  */
 package io.trino.plugin.hive;
 
+import io.trino.hive.formats.avro.AvroCompressionKind;
 import io.trino.orc.metadata.CompressionKind;
-import org.apache.avro.file.DataFileConstants;
 import org.apache.parquet.format.CompressionCodec;
 
 import java.util.Optional;
@@ -23,30 +23,30 @@
 
 public enum HiveCompressionCodec
 {
-    NONE(null, CompressionKind.NONE, CompressionCodec.UNCOMPRESSED, DataFileConstants.NULL_CODEC),
-    SNAPPY(io.trino.hive.formats.compression.CompressionKind.SNAPPY, CompressionKind.SNAPPY, CompressionCodec.SNAPPY, DataFileConstants.SNAPPY_CODEC),
+    NONE(null, CompressionKind.NONE, CompressionCodec.UNCOMPRESSED, AvroCompressionKind.NULL),
+    SNAPPY(io.trino.hive.formats.compression.CompressionKind.SNAPPY, CompressionKind.SNAPPY, CompressionCodec.SNAPPY, AvroCompressionKind.SNAPPY),
     LZ4(io.trino.hive.formats.compression.CompressionKind.LZ4, CompressionKind.LZ4, CompressionCodec.LZ4, null),
-    ZSTD(io.trino.hive.formats.compression.CompressionKind.ZSTD, CompressionKind.ZSTD, CompressionCodec.ZSTD, DataFileConstants.ZSTANDARD_CODEC),
+    ZSTD(io.trino.hive.formats.compression.CompressionKind.ZSTD, CompressionKind.ZSTD, CompressionCodec.ZSTD, AvroCompressionKind.ZSTANDARD),
     // Using DEFLATE for GZIP for Avro for now so Avro files can be written in default configuration
     // TODO(https://github.com/trinodb/trino/issues/12580) change GZIP to be unsupported for Avro when we change Trino default compression to be storage format aware
-    GZIP(io.trino.hive.formats.compression.CompressionKind.GZIP, CompressionKind.ZLIB, CompressionCodec.GZIP, DataFileConstants.DEFLATE_CODEC);
+    GZIP(io.trino.hive.formats.compression.CompressionKind.GZIP, CompressionKind.ZLIB, CompressionCodec.GZIP, AvroCompressionKind.DEFLATE);
 
     private final Optional<io.trino.hive.formats.compression.CompressionKind> hiveCompressionKind;
     private final CompressionKind orcCompressionKind;
     private final CompressionCodec parquetCompressionCodec;
 
-    private final Optional<String> avroCompressionCodec;
+    private final Optional<AvroCompressionKind> avroCompressionKind;
 
     HiveCompressionCodec(
             io.trino.hive.formats.compression.CompressionKind hiveCompressionKind,
             CompressionKind orcCompressionKind,
             CompressionCodec parquetCompressionCodec,
-            String avroCompressionCodec)
+            AvroCompressionKind avroCompressionKind)
     {
         this.hiveCompressionKind = Optional.ofNullable(hiveCompressionKind);
         this.orcCompressionKind = requireNonNull(orcCompressionKind, "orcCompressionKind is null");
         this.parquetCompressionCodec = requireNonNull(parquetCompressionCodec, "parquetCompressionCodec is null");
-        this.avroCompressionCodec = Optional.ofNullable(avroCompressionCodec);
+        this.avroCompressionKind = Optional.ofNullable(avroCompressionKind);
     }
 
     public Optional<io.trino.hive.formats.compression.CompressionKind> getHiveCompressionKind()
@@ -64,8 +64,8 @@ public CompressionCodec getParquetCompressionCodec()
         return parquetCompressionCodec;
     }
 
-    public Optional<String> getAvroCompressionCodec()
+    public Optional<AvroCompressionKind> getAvroCompressionKind()
     {
-        return avroCompressionCodec;
+        return avroCompressionKind;
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCompressionCodecs.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCompressionCodecs.java
index 63b7a718c275..b86ef0ce3d28 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCompressionCodecs.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCompressionCodecs.java
@@ -17,6 +17,8 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_UNSUPPORTED_FORMAT;
+
 public final class HiveCompressionCodecs
 {
     private HiveCompressionCodecs() {}
@@ -26,7 +28,7 @@ public static HiveCompressionCodec selectCompressionCodec(ConnectorSession sessi
         HiveCompressionOption compressionOption = HiveSessionProperties.getCompressionCodec(session);
         return HiveStorageFormat.getHiveStorageFormat(storageFormat)
                 .map(format -> selectCompressionCodec(compressionOption, format))
-                .orElseGet(() -> selectCompressionCodecForUnknownStorageFormat(compressionOption));
+                .orElseGet(() -> selectCompressionCodec(compressionOption));
     }
 
     public static HiveCompressionCodec selectCompressionCodec(ConnectorSession session, HiveStorageFormat storageFormat)
@@ -39,8 +41,8 @@ public static HiveCompressionCodec selectCompressionCodec(HiveCompressionOption
         HiveCompressionCodec selectedCodec = selectCompressionCodec(compressionOption);
 
         // perform codec vs format validation
-        if (storageFormat == HiveStorageFormat.AVRO && selectedCodec.getAvroCompressionCodec().isEmpty()) {
-            throw new TrinoException(HiveErrorCode.HIVE_UNSUPPORTED_FORMAT, "Compression codec " + selectedCodec + " not supported for " + storageFormat);
+        if (storageFormat == HiveStorageFormat.AVRO && selectedCodec.getAvroCompressionKind().isEmpty()) {
+            throw new TrinoException(HIVE_UNSUPPORTED_FORMAT, "Compression codec %s not supported for AVRO".formatted(selectedCodec));
         }
 
         return selectedCodec;
@@ -56,15 +58,4 @@ private static HiveCompressionCodec selectCompressionCodec(HiveCompressionOption
             case GZIP -> HiveCompressionCodec.GZIP;
         };
     }
-
-    private static HiveCompressionCodec selectCompressionCodecForUnknownStorageFormat(HiveCompressionOption compressionOption)
-    {
-        return switch (compressionOption) {
-            case NONE -> HiveCompressionCodec.NONE;
-            case SNAPPY -> HiveCompressionCodec.SNAPPY;
-            case LZ4 -> HiveCompressionCodec.LZ4;
-            case ZSTD -> HiveCompressionCodec.ZSTD;
-            case GZIP -> HiveCompressionCodec.GZIP;
-        };
-    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConfig.java
index c4ef2be9c518..0f54cc3af1ec 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConfig.java
@@ -25,21 +25,21 @@
 import io.airlift.units.MaxDataSize;
 import io.airlift.units.MinDataSize;
 import io.trino.plugin.hive.HiveSessionProperties.InsertExistingPartitionsBehavior;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 import org.joda.time.DateTimeZone;
 
-import javax.annotation.Nullable;
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.TimeZone;
 
 import static io.airlift.units.DataSize.Unit.GIGABYTE;
+import static io.airlift.units.DataSize.Unit.KILOBYTE;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.plugin.hive.HiveSessionProperties.InsertExistingPartitionsBehavior.APPEND;
 import static io.trino.plugin.hive.HiveSessionProperties.InsertExistingPartitionsBehavior.ERROR;
@@ -58,6 +58,10 @@
         "hive.assume-canonical-partition-keys",
         "hive.partition-use-column-names",
         "hive.allow-corrupt-writes-for-testing",
+        "hive.optimize-symlink-listing",
+        "hive.s3select-pushdown.enabled",
+        "hive.s3select-pushdown.experimental-textfile-pushdown-enabled",
+        "hive.s3select-pushdown.max-connections",
 })
 public class HiveConfig
 {
@@ -71,7 +75,7 @@ public class HiveConfig
     private DataSize maxSplitSize = DataSize.of(64, MEGABYTE);
     private int maxPartitionsPerScan = 1_000_000;
     private int maxPartitionsForEagerLoad = 100_000;
-    private int maxOutstandingSplits = 1_000;
+    private int maxOutstandingSplits = 3_000;
     private DataSize maxOutstandingSplitsSize = DataSize.of(256, MEGABYTE);
     private int maxSplitIteratorThreads = 1_000;
     private int minPartitionBatchSize = 10;
@@ -80,7 +84,7 @@ public class HiveConfig
     private int splitLoaderConcurrency = 64;
     private Integer maxSplitsPerSecond;
     private DataSize maxInitialSplitSize;
-    private int domainCompactionThreshold = 100;
+    private int domainCompactionThreshold = 1000;
     private boolean forceLocalScheduling;
     private boolean recursiveDirWalkerEnabled;
     private boolean ignoreAbsentPartitions;
@@ -133,17 +137,14 @@ public class HiveConfig
     private boolean ignoreCorruptedStatistics;
     private boolean collectColumnStatisticsOnWrite = true;
 
-    private boolean s3SelectPushdownEnabled;
-    private int s3SelectPushdownMaxConnections = 500;
-
     private boolean isTemporaryStagingDirectoryEnabled = true;
     private String temporaryStagingDirectoryPath = "/tmp/presto-${USER}";
     private boolean delegateTransactionalManagedTableLocationToMetastore;
 
     private Duration fileStatusCacheExpireAfterWrite = new Duration(1, MINUTES);
-    private long fileStatusCacheMaxSize = 1000 * 1000;
+    private DataSize fileStatusCacheMaxRetainedSize = DataSize.of(1, GIGABYTE);
     private List<String> fileStatusCacheTables = ImmutableList.of();
-    private long perTransactionFileStatusCacheMaximumSize = 1000 * 1000;
+    private DataSize perTransactionFileStatusCacheMaxRetainedSize = DataSize.of(100, MEGABYTE);
 
     private boolean translateHiveViews;
     private boolean legacyHiveViewTranslation;
@@ -162,8 +163,6 @@ public class HiveConfig
 
     private HiveTimestampPrecision timestampPrecision = HiveTimestampPrecision.DEFAULT_PRECISION;
 
-    private boolean optimizeSymlinkListing = true;
-
     private Optional<String> icebergCatalogName = Optional.empty();
     private Optional<String> deltaLakeCatalogName = Optional.empty();
     private Optional<String> hudiCatalogName = Optional.empty();
@@ -755,17 +754,28 @@ public HiveConfig setFileStatusCacheTables(String fileStatusCacheTables)
         return this;
     }
 
-    @Min(0)
-    public long getPerTransactionFileStatusCacheMaximumSize()
+    @MinDataSize("0MB")
+    @NotNull
+    public DataSize getPerTransactionFileStatusCacheMaxRetainedSize()
     {
-        return perTransactionFileStatusCacheMaximumSize;
+        return perTransactionFileStatusCacheMaxRetainedSize;
     }
 
-    @Config("hive.per-transaction-file-status-cache-maximum-size")
+    @Config("hive.per-transaction-file-status-cache.max-retained-size")
+    @ConfigDescription("Maximum retained size of file statuses cached by transactional file status cache")
+    public HiveConfig setPerTransactionFileStatusCacheMaxRetainedSize(DataSize perTransactionFileStatusCacheMaxRetainedSize)
+    {
+        this.perTransactionFileStatusCacheMaxRetainedSize = perTransactionFileStatusCacheMaxRetainedSize;
+        return this;
+    }
+
+    @Deprecated
+    @LegacyConfig(value = "hive.per-transaction-file-status-cache-maximum-size", replacedBy = "hive.per-transaction-file-status-cache.max-retained-size")
     @ConfigDescription("Maximum number of file statuses cached by transactional file status cache")
     public HiveConfig setPerTransactionFileStatusCacheMaximumSize(long perTransactionFileStatusCacheMaximumSize)
     {
-        this.perTransactionFileStatusCacheMaximumSize = perTransactionFileStatusCacheMaximumSize;
+        // assume some fixed size per entry in order to keep the deprecated property for backward compatibility
+        this.perTransactionFileStatusCacheMaxRetainedSize = DataSize.of(perTransactionFileStatusCacheMaximumSize, KILOBYTE);
         return this;
     }
 
@@ -810,15 +820,26 @@ public HiveConfig setHiveViewsRunAsInvoker(boolean hiveViewsRunAsInvoker)
         return this;
     }
 
-    public long getFileStatusCacheMaxSize()
+    @MinDataSize("0MB")
+    @NotNull
+    public DataSize getFileStatusCacheMaxRetainedSize()
+    {
+        return fileStatusCacheMaxRetainedSize;
+    }
+
+    @Config("hive.file-status-cache.max-retained-size")
+    public HiveConfig setFileStatusCacheMaxRetainedSize(DataSize fileStatusCacheMaxRetainedSize)
     {
-        return fileStatusCacheMaxSize;
+        this.fileStatusCacheMaxRetainedSize = fileStatusCacheMaxRetainedSize;
+        return this;
     }
 
-    @Config("hive.file-status-cache-size")
+    @Deprecated
+    @LegacyConfig(value = "hive.file-status-cache-size", replacedBy = "hive.file-status-cache.max-retained-size")
     public HiveConfig setFileStatusCacheMaxSize(long fileStatusCacheMaxSize)
     {
-        this.fileStatusCacheMaxSize = fileStatusCacheMaxSize;
+        // assume some fixed size per entry in order to keep the deprecated property for backward compatibility
+        this.fileStatusCacheMaxRetainedSize = DataSize.of(fileStatusCacheMaxSize, KILOBYTE);
         return this;
     }
 
@@ -978,32 +999,6 @@ public HiveConfig setCollectColumnStatisticsOnWrite(boolean collectColumnStatist
         return this;
     }
 
-    public boolean isS3SelectPushdownEnabled()
-    {
-        return s3SelectPushdownEnabled;
-    }
-
-    @Config("hive.s3select-pushdown.enabled")
-    @ConfigDescription("Enable query pushdown to AWS S3 Select service")
-    public HiveConfig setS3SelectPushdownEnabled(boolean s3SelectPushdownEnabled)
-    {
-        this.s3SelectPushdownEnabled = s3SelectPushdownEnabled;
-        return this;
-    }
-
-    @Min(1)
-    public int getS3SelectPushdownMaxConnections()
-    {
-        return s3SelectPushdownMaxConnections;
-    }
-
-    @Config("hive.s3select-pushdown.max-connections")
-    public HiveConfig setS3SelectPushdownMaxConnections(int s3SelectPushdownMaxConnections)
-    {
-        this.s3SelectPushdownMaxConnections = s3SelectPushdownMaxConnections;
-        return this;
-    }
-
     @Config("hive.temporary-staging-directory-enabled")
     @ConfigDescription("Should use (if possible) temporary staging directory for write operations")
     public HiveConfig setTemporaryStagingDirectoryEnabled(boolean temporaryStagingDirectoryEnabled)
@@ -1150,19 +1145,6 @@ public HiveConfig setTimestampPrecision(HiveTimestampPrecision timestampPrecisio
         return this;
     }
 
-    public boolean isOptimizeSymlinkListing()
-    {
-        return this.optimizeSymlinkListing;
-    }
-
-    @Config("hive.optimize-symlink-listing")
-    @ConfigDescription("Optimize listing for SymlinkTextFormat tables with files in a single directory")
-    public HiveConfig setOptimizeSymlinkListing(boolean optimizeSymlinkListing)
-    {
-        this.optimizeSymlinkListing = optimizeSymlinkListing;
-        return this;
-    }
-
     public Optional<String> getIcebergCatalogName()
     {
         return icebergCatalogName;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConnector.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConnector.java
index e52f5855100f..862c380f0a40 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConnector.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConnector.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Injector;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorMetadata;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
@@ -46,6 +47,7 @@
 public class HiveConnector
         implements Connector
 {
+    private final Injector injector;
     private final LifeCycleManager lifeCycleManager;
     private final ConnectorSplitManager splitManager;
     private final ConnectorPageSourceProvider pageSourceProvider;
@@ -68,6 +70,7 @@ public class HiveConnector
     private final boolean singleStatementWritesOnly;
 
     public HiveConnector(
+            Injector injector,
             LifeCycleManager lifeCycleManager,
             HiveTransactionManager transactionManager,
             ConnectorSplitManager splitManager,
@@ -87,6 +90,7 @@ public HiveConnector(
             boolean singleStatementWritesOnly,
             ClassLoader classLoader)
     {
+        this.injector = requireNonNull(injector, "injector is null");
         this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null");
         this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
         this.splitManager = requireNonNull(splitManager, "splitManager is null");
@@ -233,4 +237,9 @@ public Set<TableProcedureMetadata> getTableProcedures()
     {
         return tableProcedures;
     }
+
+    public Injector getInjector()
+    {
+        return injector;
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConnectorFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConnectorFactory.java
index cf9c40ac8ebc..f7e50db00269 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConnectorFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConnectorFactory.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class HiveConnectorFactory
@@ -50,7 +50,7 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         ClassLoader classLoader = context.duplicatePluginClassLoader();
         try {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveErrorCode.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveErrorCode.java
index c628d970b120..2018867e6381 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveErrorCode.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveErrorCode.java
@@ -67,6 +67,7 @@ public enum HiveErrorCode
     HIVE_TABLE_LOCK_NOT_ACQUIRED(40, EXTERNAL),
     HIVE_VIEW_TRANSLATION_ERROR(41, EXTERNAL),
     HIVE_PARTITION_NOT_FOUND(42, USER_ERROR),
+    HIVE_INVALID_TIMESTAMP_COERCION(43, EXTERNAL),
     /**/;
 
     private final ErrorCode errorCode;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveFileWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveFileWriterFactory.java
index 7f5463887d55..4efac69d9a8e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveFileWriterFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveFileWriterFactory.java
@@ -13,11 +13,10 @@
  */
 package io.trino.plugin.hive;
 
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.acid.AcidTransaction;
 import io.trino.plugin.hive.metastore.StorageFormat;
 import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobConf;
 
 import java.util.List;
 import java.util.Optional;
@@ -27,11 +26,11 @@
 public interface HiveFileWriterFactory
 {
     Optional<FileWriter> createFileWriter(
-            Path path,
+            Location location,
             List<String> inputColumnNames,
             StorageFormat storageFormat,
+            HiveCompressionCodec compressionCodec,
             Properties schema,
-            JobConf conf,
             ConnectorSession session,
             OptionalInt bucketNumber,
             AcidTransaction transaction,
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveFormatsConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveFormatsConfig.java
deleted file mode 100644
index 5a396802b633..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveFormatsConfig.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import io.airlift.configuration.Config;
-import io.airlift.configuration.ConfigDescription;
-
-public class HiveFormatsConfig
-{
-    private boolean csvNativeReaderEnabled = true;
-    private boolean csvNativeWriterEnabled = true;
-    private boolean jsonNativeReaderEnabled = true;
-    private boolean jsonNativeWriterEnabled = true;
-    private boolean openXJsonNativeReaderEnabled = true;
-    private boolean openXJsonNativeWriterEnabled = true;
-    private boolean regexNativeReaderEnabled = true;
-    private boolean textFileNativeReaderEnabled = true;
-    private boolean textFileNativeWriterEnabled = true;
-    private boolean sequenceFileNativeReaderEnabled = true;
-    private boolean sequenceFileNativeWriterEnabled = true;
-
-    public boolean isCsvNativeReaderEnabled()
-    {
-        return csvNativeReaderEnabled;
-    }
-
-    @Config("csv.native-reader.enabled")
-    @ConfigDescription("Use native CSV reader")
-    public HiveFormatsConfig setCsvNativeReaderEnabled(boolean csvNativeReaderEnabled)
-    {
-        this.csvNativeReaderEnabled = csvNativeReaderEnabled;
-        return this;
-    }
-
-    public boolean isCsvNativeWriterEnabled()
-    {
-        return csvNativeWriterEnabled;
-    }
-
-    @Config("csv.native-writer.enabled")
-    @ConfigDescription("Use native CSV writer")
-    public HiveFormatsConfig setCsvNativeWriterEnabled(boolean csvNativeWriterEnabled)
-    {
-        this.csvNativeWriterEnabled = csvNativeWriterEnabled;
-        return this;
-    }
-
-    public boolean isJsonNativeReaderEnabled()
-    {
-        return jsonNativeReaderEnabled;
-    }
-
-    @Config("json.native-reader.enabled")
-    @ConfigDescription("Use native JSON reader")
-    public HiveFormatsConfig setJsonNativeReaderEnabled(boolean jsonNativeReaderEnabled)
-    {
-        this.jsonNativeReaderEnabled = jsonNativeReaderEnabled;
-        return this;
-    }
-
-    public boolean isJsonNativeWriterEnabled()
-    {
-        return jsonNativeWriterEnabled;
-    }
-
-    @Config("json.native-writer.enabled")
-    @ConfigDescription("Use native JSON writer")
-    public HiveFormatsConfig setJsonNativeWriterEnabled(boolean jsonNativeWriterEnabled)
-    {
-        this.jsonNativeWriterEnabled = jsonNativeWriterEnabled;
-        return this;
-    }
-
-    public boolean isOpenXJsonNativeReaderEnabled()
-    {
-        return openXJsonNativeReaderEnabled;
-    }
-
-    @Config("openx-json.native-reader.enabled")
-    @ConfigDescription("Use native OpenXJson reader")
-    public HiveFormatsConfig setOpenXJsonNativeReaderEnabled(boolean openXJsonNativeReaderEnabled)
-    {
-        this.openXJsonNativeReaderEnabled = openXJsonNativeReaderEnabled;
-        return this;
-    }
-
-    public boolean isOpenXJsonNativeWriterEnabled()
-    {
-        return openXJsonNativeWriterEnabled;
-    }
-
-    @Config("openx-json.native-writer.enabled")
-    @ConfigDescription("Use native OpenXJson writer")
-    public HiveFormatsConfig setOpenXJsonNativeWriterEnabled(boolean openXJsonNativeWriterEnabled)
-    {
-        this.openXJsonNativeWriterEnabled = openXJsonNativeWriterEnabled;
-        return this;
-    }
-
-    public boolean isRegexNativeReaderEnabled()
-    {
-        return regexNativeReaderEnabled;
-    }
-
-    @Config("regex.native-reader.enabled")
-    @ConfigDescription("Use native REGEX reader")
-    public HiveFormatsConfig setRegexNativeReaderEnabled(boolean regexNativeReaderEnabled)
-    {
-        this.regexNativeReaderEnabled = regexNativeReaderEnabled;
-        return this;
-    }
-
-    public boolean isTextFileNativeReaderEnabled()
-    {
-        return textFileNativeReaderEnabled;
-    }
-
-    @Config("text-file.native-reader.enabled")
-    @ConfigDescription("Use native text file reader")
-    public HiveFormatsConfig setTextFileNativeReaderEnabled(boolean textFileNativeReaderEnabled)
-    {
-        this.textFileNativeReaderEnabled = textFileNativeReaderEnabled;
-        return this;
-    }
-
-    public boolean isTextFileNativeWriterEnabled()
-    {
-        return textFileNativeWriterEnabled;
-    }
-
-    @Config("text-file.native-writer.enabled")
-    @ConfigDescription("Use native text file writer")
-    public HiveFormatsConfig setTextFileNativeWriterEnabled(boolean textFileNativeWriterEnabled)
-    {
-        this.textFileNativeWriterEnabled = textFileNativeWriterEnabled;
-        return this;
-    }
-
-    public boolean isSequenceFileNativeReaderEnabled()
-    {
-        return sequenceFileNativeReaderEnabled;
-    }
-
-    @Config("sequence-file.native-reader.enabled")
-    @ConfigDescription("Use native sequence file reader")
-    public HiveFormatsConfig setSequenceFileNativeReaderEnabled(boolean sequenceFileNativeReaderEnabled)
-    {
-        this.sequenceFileNativeReaderEnabled = sequenceFileNativeReaderEnabled;
-        return this;
-    }
-
-    public boolean isSequenceFileNativeWriterEnabled()
-    {
-        return sequenceFileNativeWriterEnabled;
-    }
-
-    @Config("sequence-file.native-writer.enabled")
-    @ConfigDescription("Use native sequence file writer")
-    public HiveFormatsConfig setSequenceFileNativeWriterEnabled(boolean sequenceFileNativeWriterEnabled)
-    {
-        this.sequenceFileNativeWriterEnabled = sequenceFileNativeWriterEnabled;
-        return this;
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveLocationService.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveLocationService.java
index 503a16bacbcf..6da35e45ba4f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveLocationService.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveLocationService.java
@@ -13,6 +13,8 @@
  */
 package io.trino.plugin.hive;
 
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
 import io.trino.hdfs.HdfsContext;
 import io.trino.hdfs.HdfsEnvironment;
 import io.trino.plugin.hive.LocationHandle.WriteMode;
@@ -23,12 +25,9 @@
 import io.trino.spi.connector.ConnectorSession;
 import org.apache.hadoop.fs.Path;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_PATH_ALREADY_EXISTS;
-import static io.trino.plugin.hive.HiveSessionProperties.isTemporaryStagingDirectoryEnabled;
 import static io.trino.plugin.hive.LocationHandle.WriteMode.DIRECT_TO_TARGET_EXISTING_DIRECTORY;
 import static io.trino.plugin.hive.LocationHandle.WriteMode.DIRECT_TO_TARGET_NEW_DIRECTORY;
 import static io.trino.plugin.hive.LocationHandle.WriteMode.STAGE_AND_MOVE_TO_TARGET_DIRECTORY;
@@ -46,40 +45,44 @@ public class HiveLocationService
         implements LocationService
 {
     private final HdfsEnvironment hdfsEnvironment;
+    private final boolean temporaryStagingDirectoryEnabled;
+    private final String temporaryStagingDirectoryPath;
 
     @Inject
-    public HiveLocationService(HdfsEnvironment hdfsEnvironment)
+    public HiveLocationService(HdfsEnvironment hdfsEnvironment, HiveConfig hiveConfig)
     {
         this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
+        this.temporaryStagingDirectoryEnabled = hiveConfig.isTemporaryStagingDirectoryEnabled();
+        this.temporaryStagingDirectoryPath = hiveConfig.getTemporaryStagingDirectoryPath();
     }
 
     @Override
-    public Path forNewTable(SemiTransactionalHiveMetastore metastore, ConnectorSession session, String schemaName, String tableName)
+    public Location forNewTable(SemiTransactionalHiveMetastore metastore, ConnectorSession session, String schemaName, String tableName)
     {
         HdfsContext context = new HdfsContext(session);
-        Path targetPath = getTableDefaultLocation(context, metastore, hdfsEnvironment, schemaName, tableName);
+        Location targetPath = getTableDefaultLocation(context, metastore, hdfsEnvironment, schemaName, tableName);
 
         // verify the target directory for table
-        if (pathExists(context, hdfsEnvironment, targetPath)) {
+        if (pathExists(context, hdfsEnvironment, new Path(targetPath.toString()))) {
             throw new TrinoException(HIVE_PATH_ALREADY_EXISTS, format("Target directory for table '%s.%s' already exists: %s", schemaName, tableName, targetPath));
         }
         return targetPath;
     }
 
     @Override
-    public LocationHandle forNewTableAsSelect(SemiTransactionalHiveMetastore metastore, ConnectorSession session, String schemaName, String tableName, Optional<Path> externalLocation)
+    public LocationHandle forNewTableAsSelect(SemiTransactionalHiveMetastore metastore, ConnectorSession session, String schemaName, String tableName, Optional<Location> externalLocation)
     {
         HdfsContext context = new HdfsContext(session);
-        Path targetPath = externalLocation.orElseGet(() -> getTableDefaultLocation(context, metastore, hdfsEnvironment, schemaName, tableName));
+        Location targetPath = externalLocation.orElseGet(() -> getTableDefaultLocation(context, metastore, hdfsEnvironment, schemaName, tableName));
 
         // verify the target directory for the table
-        if (pathExists(context, hdfsEnvironment, targetPath)) {
+        if (pathExists(context, hdfsEnvironment, new Path(targetPath.toString()))) {
             throw new TrinoException(HIVE_PATH_ALREADY_EXISTS, format("Target directory for table '%s.%s' already exists: %s", schemaName, tableName, targetPath));
         }
 
         // TODO detect when existing table's location is a on a different file system than the temporary directory
-        if (shouldUseTemporaryDirectory(session, context, targetPath, externalLocation)) {
-            Path writePath = createTemporaryPath(session, context, hdfsEnvironment, targetPath);
+        if (shouldUseTemporaryDirectory(context, new Path(targetPath.toString()), externalLocation.isPresent())) {
+            Location writePath = createTemporaryPath(context, hdfsEnvironment, new Path(targetPath.toString()), temporaryStagingDirectoryPath);
             return new LocationHandle(targetPath, writePath, STAGE_AND_MOVE_TO_TARGET_DIRECTORY);
         }
         return new LocationHandle(targetPath, targetPath, DIRECT_TO_TARGET_NEW_DIRECTORY);
@@ -89,10 +92,10 @@ public LocationHandle forNewTableAsSelect(SemiTransactionalHiveMetastore metasto
     public LocationHandle forExistingTable(SemiTransactionalHiveMetastore metastore, ConnectorSession session, Table table)
     {
         HdfsContext context = new HdfsContext(session);
-        Path targetPath = new Path(table.getStorage().getLocation());
+        Location targetPath = Location.of(table.getStorage().getLocation());
 
-        if (shouldUseTemporaryDirectory(session, context, targetPath, Optional.empty()) && !isTransactionalTable(table.getParameters())) {
-            Path writePath = createTemporaryPath(session, context, hdfsEnvironment, targetPath);
+        if (shouldUseTemporaryDirectory(context, new Path(targetPath.toString()), false) && !isTransactionalTable(table.getParameters())) {
+            Location writePath = createTemporaryPath(context, hdfsEnvironment, new Path(targetPath.toString()), temporaryStagingDirectoryPath);
             return new LocationHandle(targetPath, writePath, STAGE_AND_MOVE_TO_TARGET_DIRECTORY);
         }
         return new LocationHandle(targetPath, targetPath, DIRECT_TO_TARGET_EXISTING_DIRECTORY);
@@ -102,19 +105,19 @@ public LocationHandle forExistingTable(SemiTransactionalHiveMetastore metastore,
     public LocationHandle forOptimize(SemiTransactionalHiveMetastore metastore, ConnectorSession session, Table table)
     {
         // For OPTIMIZE write result files directly to table directory; that is needed by the commit logic in HiveMetadata#finishTableExecute
-        Path targetPath = new Path(table.getStorage().getLocation());
+        Location targetPath = Location.of(table.getStorage().getLocation());
         return new LocationHandle(targetPath, targetPath, DIRECT_TO_TARGET_EXISTING_DIRECTORY);
     }
 
-    private boolean shouldUseTemporaryDirectory(ConnectorSession session, HdfsContext context, Path path, Optional<Path> externalLocation)
+    private boolean shouldUseTemporaryDirectory(HdfsContext context, Path path, boolean hasExternalLocation)
     {
-        return isTemporaryStagingDirectoryEnabled(session)
+        return temporaryStagingDirectoryEnabled
                 // skip using temporary directory for S3
                 && !isS3FileSystem(context, hdfsEnvironment, path)
                 // skip using temporary directory if destination is encrypted; it's not possible to move a file between encryption zones
                 && !isHdfsEncrypted(context, hdfsEnvironment, path)
                 // Skip using temporary directory if destination is external. Target may be on a different file system.
-                && externalLocation.isEmpty();
+                && !hasExternalLocation;
     }
 
     @Override
@@ -138,27 +141,23 @@ public WriteInfo getPartitionWriteInfo(LocationHandle locationHandle, Optional<P
         if (partition.isPresent()) {
             // existing partition
             WriteMode writeMode = locationHandle.getWriteMode();
-            Path targetPath = new Path(partition.get().getStorage().getLocation());
-            Path writePath = getPartitionWritePath(locationHandle, partitionName, writeMode, targetPath);
+            Location targetPath = Location.of(partition.get().getStorage().getLocation());
+            Location writePath = getPartitionWritePath(locationHandle, partitionName, writeMode, targetPath);
             return new WriteInfo(targetPath, writePath, writeMode);
         }
         // new partition
         return new WriteInfo(
-                new Path(locationHandle.getTargetPath(), partitionName),
-                new Path(locationHandle.getWritePath(), partitionName),
+                locationHandle.getTargetPath().appendPath(partitionName),
+                locationHandle.getWritePath().appendPath(partitionName),
                 locationHandle.getWriteMode());
     }
 
-    private Path getPartitionWritePath(LocationHandle locationHandle, String partitionName, WriteMode writeMode, Path targetPath)
+    private static Location getPartitionWritePath(LocationHandle locationHandle, String partitionName, WriteMode writeMode, Location targetPath)
     {
-        switch (writeMode) {
-            case STAGE_AND_MOVE_TO_TARGET_DIRECTORY:
-                return new Path(locationHandle.getWritePath(), partitionName);
-            case DIRECT_TO_TARGET_EXISTING_DIRECTORY:
-                return targetPath;
-            case DIRECT_TO_TARGET_NEW_DIRECTORY:
-                throw new UnsupportedOperationException(format("inserting into existing partition is not supported for %s", writeMode));
-        }
-        throw new UnsupportedOperationException("Unexpected write mode: " + writeMode);
+        return switch (writeMode) {
+            case STAGE_AND_MOVE_TO_TARGET_DIRECTORY -> locationHandle.getWritePath().appendPath(partitionName);
+            case DIRECT_TO_TARGET_EXISTING_DIRECTORY -> targetPath;
+            case DIRECT_TO_TARGET_NEW_DIRECTORY -> throw new UnsupportedOperationException(format("inserting into existing partition is not supported for %s", writeMode));
+        };
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMaterializedViewMetadata.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMaterializedViewMetadata.java
index d932c92d3b26..f47ad0dba86c 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMaterializedViewMetadata.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMaterializedViewMetadata.java
@@ -44,4 +44,6 @@ public interface HiveMaterializedViewMetadata
     void renameMaterializedView(ConnectorSession session, SchemaTableName existingViewName, SchemaTableName newViewName);
 
     void setMaterializedViewProperties(ConnectorSession session, SchemaTableName viewName, Map<String, Optional<Object>> properties);
+
+    void setMaterializedViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment);
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java
index 395736172fd7..0b4d7b2e138d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java
@@ -28,14 +28,14 @@
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
 import io.airlift.units.DataSize;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.filesystem.TrinoOutputFile;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
-import io.trino.hdfs.HdfsContext;
 import io.trino.hdfs.HdfsEnvironment;
 import io.trino.plugin.base.CatalogName;
-import io.trino.plugin.hive.HiveApplyProjectionUtil.ProjectedColumnRepresentation;
+import io.trino.plugin.base.projection.ApplyProjectionUtil;
+import io.trino.plugin.base.projection.ApplyProjectionUtil.ProjectedColumnRepresentation;
 import io.trino.plugin.hive.HiveSessionProperties.InsertExistingPartitionsBehavior;
 import io.trino.plugin.hive.LocationService.WriteInfo;
 import io.trino.plugin.hive.acid.AcidOperation;
@@ -57,7 +57,6 @@
 import io.trino.plugin.hive.statistics.HiveStatisticsProvider;
 import io.trino.plugin.hive.util.HiveBucketing;
 import io.trino.plugin.hive.util.HiveUtil;
-import io.trino.plugin.hive.util.HiveWriteUtils;
 import io.trino.plugin.hive.util.SerdeConstants;
 import io.trino.spi.ErrorType;
 import io.trino.spi.Page;
@@ -66,7 +65,6 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.connector.Assignment;
 import io.trino.spi.connector.BeginTableExecuteResult;
-import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
@@ -103,8 +101,11 @@
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.connector.TableScanRedirectApplicationResult;
 import io.trino.spi.connector.ViewNotFoundException;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.expression.ConnectorExpression;
 import io.trino.spi.expression.Variable;
+import io.trino.spi.function.LanguageFunction;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.TupleDomain;
@@ -124,19 +125,12 @@
 import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
+import io.trino.spi.type.VarcharType;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaParseException;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.LocatedFileStatus;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.RemoteIterator;
-import org.apache.hadoop.hive.ql.exec.FileSinkOperator;
-import org.apache.hadoop.mapred.JobConf;
-
-import java.io.File;
+
+import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -160,20 +154,17 @@
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.hdfs.ConfigurationUtils.toJobConf;
-import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.extractSupportedProjectedColumns;
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.replaceWithNewVariables;
 import static io.trino.plugin.hive.HiveAnalyzeProperties.getColumnNames;
 import static io.trino.plugin.hive.HiveAnalyzeProperties.getPartitionList;
-import static io.trino.plugin.hive.HiveApplyProjectionUtil.extractSupportedProjectedColumns;
 import static io.trino.plugin.hive.HiveApplyProjectionUtil.find;
-import static io.trino.plugin.hive.HiveApplyProjectionUtil.replaceWithNewVariables;
 import static io.trino.plugin.hive.HiveBasicStatistics.createEmptyStatistics;
 import static io.trino.plugin.hive.HiveBasicStatistics.createZeroStatistics;
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.PARTITION_KEY;
@@ -181,7 +172,6 @@
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.SYNTHESIZED;
 import static io.trino.plugin.hive.HiveColumnHandle.createBaseColumn;
 import static io.trino.plugin.hive.HiveColumnHandle.mergeRowIdColumnHandle;
-import static io.trino.plugin.hive.HiveCompressionCodecs.selectCompressionCodec;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_COLUMN_ORDER_MISMATCH;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_CONCURRENT_MODIFICATION_DETECTED;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
@@ -190,7 +180,6 @@
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_UNKNOWN_ERROR;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_UNSUPPORTED_FORMAT;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_VIEW_TRANSLATION_ERROR;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_CLOSE_ERROR;
 import static io.trino.plugin.hive.HivePartitionManager.extractPartitionValues;
 import static io.trino.plugin.hive.HiveSessionProperties.NON_TRANSACTIONAL_OPTIMIZE_ENABLED;
 import static io.trino.plugin.hive.HiveSessionProperties.getDeltaLakeCatalogName;
@@ -238,6 +227,7 @@
 import static io.trino.plugin.hive.HiveTableProperties.getAvroSchemaUrl;
 import static io.trino.plugin.hive.HiveTableProperties.getBucketProperty;
 import static io.trino.plugin.hive.HiveTableProperties.getExternalLocation;
+import static io.trino.plugin.hive.HiveTableProperties.getExtraProperties;
 import static io.trino.plugin.hive.HiveTableProperties.getFooterSkipCount;
 import static io.trino.plugin.hive.HiveTableProperties.getHeaderSkipCount;
 import static io.trino.plugin.hive.HiveTableProperties.getHiveStorageFormat;
@@ -264,8 +254,10 @@
 import static io.trino.plugin.hive.ViewReaderUtil.PRESTO_VIEW_FLAG;
 import static io.trino.plugin.hive.ViewReaderUtil.createViewReader;
 import static io.trino.plugin.hive.ViewReaderUtil.encodeViewData;
-import static io.trino.plugin.hive.ViewReaderUtil.isHiveOrPrestoView;
-import static io.trino.plugin.hive.ViewReaderUtil.isPrestoView;
+import static io.trino.plugin.hive.ViewReaderUtil.isHiveView;
+import static io.trino.plugin.hive.ViewReaderUtil.isSomeKindOfAView;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoMaterializedView;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoView;
 import static io.trino.plugin.hive.acid.AcidTransaction.NO_ACID_TRANSACTION;
 import static io.trino.plugin.hive.acid.AcidTransaction.forCreateTable;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.buildInitialPrivilegeSet;
@@ -279,19 +271,17 @@
 import static io.trino.plugin.hive.metastore.SemiTransactionalHiveMetastore.cleanExtraOutputFiles;
 import static io.trino.plugin.hive.metastore.StorageFormat.VIEW_STORAGE_FORMAT;
 import static io.trino.plugin.hive.metastore.StorageFormat.fromHiveStorageFormat;
+import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.STATS_PROPERTIES;
 import static io.trino.plugin.hive.type.Category.PRIMITIVE;
 import static io.trino.plugin.hive.util.AcidTables.deltaSubdir;
 import static io.trino.plugin.hive.util.AcidTables.isFullAcidTable;
 import static io.trino.plugin.hive.util.AcidTables.isTransactionalTable;
 import static io.trino.plugin.hive.util.AcidTables.writeAcidVersionFile;
-import static io.trino.plugin.hive.util.CompressionConfigUtil.configureCompression;
 import static io.trino.plugin.hive.util.HiveBucketing.getHiveBucketHandle;
 import static io.trino.plugin.hive.util.HiveBucketing.isSupportedBucketing;
-import static io.trino.plugin.hive.util.HiveClassNames.HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS;
-import static io.trino.plugin.hive.util.HiveClassNames.ORC_OUTPUT_FORMAT_CLASS;
-import static io.trino.plugin.hive.util.HiveUtil.columnMetadataGetter;
 import static io.trino.plugin.hive.util.HiveUtil.getPartitionKeyColumnHandles;
 import static io.trino.plugin.hive.util.HiveUtil.getRegularColumnHandles;
+import static io.trino.plugin.hive.util.HiveUtil.getTableColumnMetadata;
 import static io.trino.plugin.hive.util.HiveUtil.hiveColumnHandles;
 import static io.trino.plugin.hive.util.HiveUtil.isDeltaLakeTable;
 import static io.trino.plugin.hive.util.HiveUtil.isHiveSystemSchema;
@@ -302,11 +292,8 @@
 import static io.trino.plugin.hive.util.HiveUtil.toPartitionValues;
 import static io.trino.plugin.hive.util.HiveUtil.verifyPartitionTypeSupported;
 import static io.trino.plugin.hive.util.HiveWriteUtils.checkTableIsWritable;
-import static io.trino.plugin.hive.util.HiveWriteUtils.checkedDelete;
 import static io.trino.plugin.hive.util.HiveWriteUtils.createPartitionValues;
-import static io.trino.plugin.hive.util.HiveWriteUtils.initializeSerializer;
 import static io.trino.plugin.hive.util.HiveWriteUtils.isFileCreatedByQuery;
-import static io.trino.plugin.hive.util.HiveWriteUtils.isS3FileSystem;
 import static io.trino.plugin.hive.util.HiveWriteUtils.isWritableType;
 import static io.trino.plugin.hive.util.RetryDriver.retry;
 import static io.trino.plugin.hive.util.Statistics.ReduceOperator.ADD;
@@ -331,6 +318,7 @@
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static java.lang.Boolean.parseBoolean;
 import static java.lang.String.format;
+import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.joining;
@@ -378,6 +366,7 @@ public class HiveMetadata
     private final CatalogName catalogName;
     private final SemiTransactionalHiveMetastore metastore;
     private final boolean autoCommit;
+    private final Set<HiveFileWriterFactory> fileWriterFactories;
     private final TrinoFileSystemFactory fileSystemFactory;
     private final HdfsEnvironment hdfsEnvironment;
     private final HivePartitionManager partitionManager;
@@ -406,6 +395,7 @@ public HiveMetadata(
             CatalogName catalogName,
             SemiTransactionalHiveMetastore metastore,
             boolean autoCommit,
+            Set<HiveFileWriterFactory> fileWriterFactories,
             TrinoFileSystemFactory fileSystemFactory,
             HdfsEnvironment hdfsEnvironment,
             HivePartitionManager partitionManager,
@@ -433,6 +423,7 @@ public HiveMetadata(
         this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.metastore = requireNonNull(metastore, "metastore is null");
         this.autoCommit = autoCommit;
+        this.fileWriterFactories = ImmutableSet.copyOf(requireNonNull(fileWriterFactories, "fileWriterFactories is null"));
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
         this.partitionManager = requireNonNull(partitionManager, "partitionManager is null");
@@ -470,6 +461,20 @@ public DirectoryLister getDirectoryLister()
         return directoryLister;
     }
 
+    @Override
+    public boolean schemaExists(ConnectorSession session, String schemaName)
+    {
+        if (!schemaName.equals(schemaName.toLowerCase(ENGLISH))) {
+            // Currently, Trino schemas are always lowercase, so this one cannot exist (https://github.com/trinodb/trino/issues/17)
+            // In fact, some metastores (e.g. Glue) store database names lowercase only, but accepted mixed case on lookup, so we need to filter out here.
+            return false;
+        }
+        if (isHiveSystemSchema(schemaName)) {
+            return false;
+        }
+        return metastore.getDatabase(schemaName).isPresent();
+    }
+
     @Override
     public List<String> listSchemaNames(ConnectorSession session)
     {
@@ -584,10 +589,19 @@ public Optional<SystemTable> getSystemTable(ConnectorSession session, SchemaTabl
         return Optional.empty();
     }
 
+    @Override
+    public SchemaTableName getTableName(ConnectorSession session, ConnectorTableHandle table)
+    {
+        return ((HiveTableHandle) table).getSchemaTableName();
+    }
+
     @Override
     public ConnectorTableMetadata getTableMetadata(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
-        return getTableMetadata(session, ((HiveTableHandle) tableHandle).getSchemaTableName());
+        HiveTableHandle handle = (HiveTableHandle) tableHandle;
+        // This method does not calculate column metadata for the projected columns
+        checkArgument(handle.getProjectedColumns().size() == handle.getPartitionColumns().size() + handle.getDataColumns().size(), "Unexpected projected columns");
+        return getTableMetadata(session, handle.getSchemaTableName());
     }
 
     private ConnectorTableMetadata getTableMetadata(ConnectorSession session, SchemaTableName tableName)
@@ -614,16 +628,29 @@ private ConnectorTableMetadata doGetTableMetadata(ConnectorSession session, Sche
             throw new TrinoException(UNSUPPORTED_TABLE_TYPE, format("Not a Hive table '%s'", tableName));
         }
 
-        if (!translateHiveViews && isHiveOrPrestoView(table)) {
+        boolean isTrinoView = isTrinoView(table);
+        boolean isHiveView = isHiveView(table);
+        boolean isTrinoMaterializedView = isTrinoMaterializedView(table);
+        if (isHiveView && translateHiveViews) {
+            // Produce metadata for a (translated) Hive view as if it was a table. This is incorrect from ConnectorMetadata.streamTableColumns
+            // perspective, but is done on purpose to keep information_schema.columns working.
+            // Because of fallback in ThriftHiveMetastoreClient.getAllViews, this method may return Trino/Presto views only,
+            // so HiveMetadata.getViews may fail to return Hive views.
+        }
+        else if (isHiveView) {
+            // When Hive view translation is not enabled, a Hive view is currently treated inconsistently
+            //  - getView treats this as an unusable view (fails instead of returning Optional.empty)
+            //  - getTableHandle treats this as a table (returns non-null)
+            // In any case, returning metadata is not useful.
             throw new TableNotFoundException(tableName);
         }
-
-        Function<HiveColumnHandle, ColumnMetadata> metadataGetter = columnMetadataGetter(table);
-        ImmutableList.Builder<ColumnMetadata> columns = ImmutableList.builder();
-        for (HiveColumnHandle columnHandle : hiveColumnHandles(table, typeManager, getTimestampPrecision(session))) {
-            columns.add(metadataGetter.apply(columnHandle));
+        else if (isTrinoView || isTrinoMaterializedView) {
+            // streamTableColumns should not include views and materialized views
+            throw new TableNotFoundException(tableName);
         }
 
+        List<ColumnMetadata> columns = getTableColumnMetadata(session, table, typeManager);
+
         // External location property
         ImmutableMap.Builder<String, Object> properties = ImmutableMap.builder();
         if (table.getTableType().equals(EXTERNAL_TABLE.name())) {
@@ -721,7 +748,7 @@ private ConnectorTableMetadata doGetTableMetadata(ConnectorSession session, Sche
         // Partition Projection specific properties
         properties.putAll(partitionProjectionService.getPartitionProjectionTrinoTableProperties(table));
 
-        return new ConnectorTableMetadata(tableName, columns.build(), properties.buildOrThrow(), comment);
+        return new ConnectorTableMetadata(tableName, columns, properties.buildOrThrow(), comment);
     }
 
     private static Optional<String> getCsvSerdeProperty(Table table, String key)
@@ -766,6 +793,17 @@ public Optional<Object> getInfo(ConnectorTableHandle tableHandle)
     @Override
     public List<SchemaTableName> listTables(ConnectorSession session, Optional<String> optionalSchemaName)
     {
+        if (optionalSchemaName.isEmpty()) {
+            Optional<List<SchemaTableName>> allTables = metastore.getAllTables();
+            if (allTables.isPresent()) {
+                return ImmutableList.<SchemaTableName>builder()
+                        .addAll(allTables.get().stream()
+                                .filter(table -> !isHiveSystemSchema(table.getSchemaName()))
+                                .collect(toImmutableList()))
+                        .addAll(listMaterializedViews(session, optionalSchemaName))
+                        .build();
+            }
+        }
         ImmutableList.Builder<SchemaTableName> tableNames = ImmutableList.builder();
         for (String schemaName : listSchemas(session, optionalSchemaName)) {
             for (String tableName : metastore.getAllTables(schemaName)) {
@@ -826,6 +864,7 @@ private Stream<TableColumnsMetadata> streamTableColumns(ConnectorSession session
             return Stream.empty();
         }
         catch (TableNotFoundException e) {
+            // it is not a table (e.g. it's a view) (TODO remove exception-driven logic for this case) OR
             // table disappeared during listing operation
             return Stream.empty();
         }
@@ -904,9 +943,9 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
     {
         Optional<String> location = HiveSchemaProperties.getLocation(properties).map(locationUri -> {
             try {
-                hdfsEnvironment.getFileSystem(new HdfsContext(session), new Path(locationUri));
+                fileSystemFactory.create(session).directoryExists(Location.of(locationUri));
             }
-            catch (IOException e) {
+            catch (IOException | IllegalArgumentException e) {
                 throw new TrinoException(INVALID_SCHEMA_PROPERTY, "Invalid location URI: " + locationUri, e);
             }
             return locationUri;
@@ -924,9 +963,36 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
-        metastore.dropDatabase(session, schemaName);
+        if (cascade) {
+            // List all objects first because such operations after adding/dropping/altering tables/views in a transaction is disallowed
+            List<SchemaTableName> views = listViews(session, Optional.of(schemaName));
+            List<SchemaTableName> tables = listTables(session, Optional.of(schemaName)).stream()
+                    .filter(table -> !views.contains(table))
+                    .collect(toImmutableList());
+
+            for (SchemaTableName viewName : views) {
+                dropView(session, viewName);
+            }
+
+            for (SchemaTableName tableName : tables) {
+                ConnectorTableHandle table = getTableHandle(session, tableName);
+                if (table == null) {
+                    log.debug("Table disappeared during DROP SCHEMA CASCADE: %s", tableName);
+                    continue;
+                }
+                dropTable(session, table);
+            }
+
+            // Commit and then drop database with raw metastore because exclusive operation after dropping object is disallowed in SemiTransactionalHiveMetastore
+            metastore.commit();
+            boolean deleteData = metastore.shouldDeleteDatabaseData(session, schemaName);
+            metastore.unsafeGetRawHiveMetastoreClosure().dropDatabase(schemaName, deleteData);
+        }
+        else {
+            metastore.dropDatabase(session, schemaName);
+        }
     }
 
     @Override
@@ -956,7 +1022,7 @@ public void createTable(ConnectorSession session, ConnectorTableMetadata tableMe
         }
 
         if (bucketProperty.isPresent() && getAvroSchemaLiteral(tableMetadata.getProperties()) != null) {
-            throw new TrinoException(NOT_SUPPORTED, "Bucketing/Partitioning columns not spported when Avro schema literal is set");
+            throw new TrinoException(NOT_SUPPORTED, "Bucketing/Partitioning columns not supported when Avro schema literal is set");
         }
 
         if (isTransactional) {
@@ -966,18 +1032,17 @@ public void createTable(ConnectorSession session, ConnectorTableMetadata tableMe
         validateTimestampColumns(tableMetadata.getColumns(), getTimestampPrecision(session));
         List<HiveColumnHandle> columnHandles = getColumnHandles(tableMetadata, ImmutableSet.copyOf(partitionedBy));
         HiveStorageFormat hiveStorageFormat = getHiveStorageFormat(tableMetadata.getProperties());
-        Map<String, String> tableProperties = getEmptyTableProperties(tableMetadata, bucketProperty, new HdfsContext(session));
+        Map<String, String> tableProperties = getEmptyTableProperties(tableMetadata, bucketProperty, session);
 
         hiveStorageFormat.validateColumns(columnHandles);
 
         Map<String, HiveColumnHandle> columnHandlesByName = Maps.uniqueIndex(columnHandles, HiveColumnHandle::getName);
-        List<Column> partitionColumns = partitionedBy.stream()
+        List<HiveColumnHandle> partitionColumns = partitionedBy.stream()
                 .map(columnHandlesByName::get)
-                .map(HiveColumnHandle::toMetastoreColumn)
                 .collect(toImmutableList());
         checkPartitionTypesSupported(partitionColumns);
 
-        Optional<Path> targetPath;
+        Optional<Location> targetPath;
         boolean external;
         String externalLocation = getExternalLocation(tableMetadata.getProperties());
         if (externalLocation != null) {
@@ -986,8 +1051,8 @@ public void createTable(ConnectorSession session, ConnectorTableMetadata tableMe
             }
 
             external = true;
-            targetPath = Optional.of(getExternalLocationAsPath(externalLocation));
-            checkExternalPath(new HdfsContext(session), targetPath.get());
+            targetPath = Optional.of(getValidatedExternalLocation(externalLocation));
+            checkExternalPathAndCreateIfNotExists(session, targetPath.get());
         }
         else {
             external = false;
@@ -1026,15 +1091,13 @@ public void createTable(ConnectorSession session, ConnectorTableMetadata tableMe
                 false);
     }
 
-    private Map<String, String> getEmptyTableProperties(ConnectorTableMetadata tableMetadata, Optional<HiveBucketProperty> bucketProperty, HdfsContext hdfsContext)
+    private Map<String, String> getEmptyTableProperties(ConnectorTableMetadata tableMetadata, Optional<HiveBucketProperty> bucketProperty, ConnectorSession session)
     {
         HiveStorageFormat hiveStorageFormat = getHiveStorageFormat(tableMetadata.getProperties());
         ImmutableMap.Builder<String, String> tableProperties = ImmutableMap.builder();
 
         // When metastore is configured with metastore.create.as.acid=true, it will also change Trino-created tables
         // behind the scenes. In particular, this won't work with CTAS.
-        // TODO (https://github.com/trinodb/trino/issues/1956) convert this into normal table property
-
         boolean transactional = HiveTableProperties.isTransactional(tableMetadata.getProperties()).orElse(false);
         tableProperties.put(TRANSACTIONAL, String.valueOf(transactional));
 
@@ -1059,7 +1122,7 @@ private Map<String, String> getEmptyTableProperties(ConnectorTableMetadata table
         checkAvroSchemaProperties(avroSchemaUrl, avroSchemaLiteral);
         if (avroSchemaUrl != null) {
             checkFormatForProperty(hiveStorageFormat, HiveStorageFormat.AVRO, AVRO_SCHEMA_URL);
-            tableProperties.put(AVRO_SCHEMA_URL_KEY, validateAndNormalizeAvroSchemaUrl(avroSchemaUrl, hdfsContext));
+            tableProperties.put(AVRO_SCHEMA_URL_KEY, validateAvroSchemaUrl(session, avroSchemaUrl));
         }
         else if (avroSchemaLiteral != null) {
             checkFormatForProperty(hiveStorageFormat, HiveStorageFormat.AVRO, AVRO_SCHEMA_LITERAL);
@@ -1163,7 +1226,27 @@ else if (avroSchemaLiteral != null) {
         // Partition Projection specific properties
         tableProperties.putAll(partitionProjectionService.getPartitionProjectionHiveTableProperties(tableMetadata));
 
-        return tableProperties.buildOrThrow();
+        Map<String, String> baseProperties = tableProperties.buildOrThrow();
+
+        // Extra properties
+        Map<String, String> extraProperties = getExtraProperties(tableMetadata.getProperties())
+                .orElseGet(ImmutableMap::of);
+        Set<String> illegalExtraProperties = Sets.intersection(
+                ImmutableSet.<String>builder()
+                        .addAll(baseProperties.keySet())
+                        .addAll(STATS_PROPERTIES)
+                        .build(),
+                extraProperties.keySet());
+        if (!illegalExtraProperties.isEmpty()) {
+            throw new TrinoException(
+                    INVALID_TABLE_PROPERTY,
+                    "Illegal keys in extra_properties: " + illegalExtraProperties);
+        }
+
+        return ImmutableMap.<String, String>builder()
+                .putAll(baseProperties)
+                .putAll(extraProperties)
+                .buildOrThrow();
     }
 
     private static void checkFormatForProperty(HiveStorageFormat actualStorageFormat, HiveStorageFormat expectedStorageFormat, String propertyName)
@@ -1190,28 +1273,17 @@ private void validateOrcBloomFilterColumns(ConnectorTableMetadata tableMetadata,
         }
     }
 
-    private String validateAndNormalizeAvroSchemaUrl(String url, HdfsContext context)
+    private String validateAvroSchemaUrl(ConnectorSession session, String url)
     {
         try {
-            new URL(url).openStream().close();
-            return url;
-        }
-        catch (MalformedURLException e) {
-            // try locally
-            if (new File(url).exists()) {
-                // hive needs url to have a protocol
-                return new File(url).toURI().toString();
-            }
-            // try hdfs
-            try {
-                if (!hdfsEnvironment.getFileSystem(context, new Path(url)).exists(new Path(url))) {
-                    throw new TrinoException(INVALID_TABLE_PROPERTY, "Cannot locate Avro schema file: " + url);
-                }
-                return url;
-            }
-            catch (IOException ex) {
-                throw new TrinoException(INVALID_TABLE_PROPERTY, "Avro schema file is not a valid file system URI: " + url, ex);
+            Location location = Location.of(url);
+            if (!fileSystemFactory.create(session).newInputFile(location).exists()) {
+                throw new TrinoException(INVALID_TABLE_PROPERTY, "Cannot locate Avro schema file: " + url);
             }
+            return location.toString();
+        }
+        catch (IllegalArgumentException e) {
+            throw new TrinoException(INVALID_TABLE_PROPERTY, "Avro schema file is not a valid file system URI: " + url, e);
         }
         catch (IOException e) {
             throw new TrinoException(INVALID_TABLE_PROPERTY, "Cannot open Avro schema file: " + url, e);
@@ -1236,35 +1308,59 @@ private static String validateAvroSchemaLiteral(String avroSchemaLiteral)
         }
     }
 
-    private static Path getExternalLocationAsPath(String location)
+    private static Location getValidatedExternalLocation(String location)
     {
+        Location validated;
         try {
-            return new Path(location);
+            validated = Location.of(location);
         }
         catch (IllegalArgumentException e) {
             throw new TrinoException(INVALID_TABLE_PROPERTY, "External location is not a valid file system URI: " + location, e);
         }
+
+        // TODO (https://github.com/trinodb/trino/issues/17803) We cannot accept locations with double slash until all relevant Hive connector components are migrated off Hadoop Path.
+        // Hadoop Path "normalizes location", e.g.:
+        //  - removes double slashes (such locations are rejected),
+        //  - removes trailing slash (such locations are accepted; foo/bar and foo/bar/ are treated as equivalent, and rejecting locations with trailing slash could pose UX issues)
+        //  - replaces file:///<local-path> with file:/<local-path> (such locations are accepted).
+        if (validated.path().contains("//")) {
+            throw new TrinoException(INVALID_TABLE_PROPERTY, "Unsupported location that cannot be internally represented: " + location);
+        }
+
+        return validated;
     }
 
-    private void checkExternalPath(HdfsContext context, Path path)
+    private void checkExternalPathAndCreateIfNotExists(ConnectorSession session, Location location)
     {
         try {
-            if (!isS3FileSystem(context, hdfsEnvironment, path)) {
-                if (!hdfsEnvironment.getFileSystem(context, path).isDirectory(path)) {
-                    throw new TrinoException(INVALID_TABLE_PROPERTY, "External location must be a directory: " + path);
+            if (!fileSystemFactory.create(session).directoryExists(location).orElse(true)) {
+                if (writesToNonManagedTablesEnabled) {
+                    createDirectory(session, location);
+                }
+                else {
+                    throw new TrinoException(INVALID_TABLE_PROPERTY, "External location must be a directory: " + location);
                 }
             }
         }
+        catch (IOException | IllegalArgumentException e) {
+            throw new TrinoException(INVALID_TABLE_PROPERTY, "External location is not a valid file system URI: " + location, e);
+        }
+    }
+
+    private void createDirectory(ConnectorSession session, Location location)
+    {
+        try {
+            fileSystemFactory.create(session).createDirectory(location);
+        }
         catch (IOException e) {
-            throw new TrinoException(INVALID_TABLE_PROPERTY, "External location is not a valid file system URI: " + path, e);
+            throw new TrinoException(INVALID_TABLE_PROPERTY, e.getMessage());
         }
     }
 
-    private void checkPartitionTypesSupported(List<Column> partitionColumns)
+    private void checkPartitionTypesSupported(List<HiveColumnHandle> partitionColumns)
     {
-        for (Column partitionColumn : partitionColumns) {
-            Type partitionType = typeManager.getType(partitionColumn.getType().getTypeSignature());
-            verifyPartitionTypeSupported(partitionColumn.getName(), partitionType);
+        for (HiveColumnHandle partitionColumn : partitionColumns) {
+            verifyPartitionTypeSupported(partitionColumn.getName(), partitionColumn.getType());
         }
     }
 
@@ -1278,7 +1374,7 @@ private static Table buildTableObject(
             List<String> partitionedBy,
             Optional<HiveBucketProperty> bucketProperty,
             Map<String, String> additionalTableParameters,
-            Optional<Path> targetPath,
+            Optional<Location> targetPath,
             boolean external,
             String prestoVersion,
             boolean usingSystemSecurity)
@@ -1397,7 +1493,7 @@ public void setTableComment(ConnectorSession session, ConnectorTableHandle table
     @Override
     public void setViewComment(ConnectorSession session, SchemaTableName viewName, Optional<String> comment)
     {
-        Table view = getView(viewName);
+        Table view = getTrinoView(viewName);
 
         ConnectorViewDefinition definition = toConnectorViewDefinition(session, viewName, Optional.of(view))
                 .orElseThrow(() -> new ViewNotFoundException(viewName));
@@ -1408,7 +1504,8 @@ public void setViewComment(ConnectorSession session, SchemaTableName viewName, O
                 definition.getColumns(),
                 comment,
                 definition.getOwner(),
-                definition.isRunAsInvoker());
+                definition.isRunAsInvoker(),
+                definition.getPath());
 
         replaceView(session, viewName, view, newDefinition);
     }
@@ -1416,7 +1513,7 @@ public void setViewComment(ConnectorSession session, SchemaTableName viewName, O
     @Override
     public void setViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
     {
-        Table view = getView(viewName);
+        Table view = getTrinoView(viewName);
 
         ConnectorViewDefinition definition = toConnectorViewDefinition(session, viewName, Optional.of(view))
                 .orElseThrow(() -> new ViewNotFoundException(viewName));
@@ -1429,16 +1526,24 @@ public void setViewColumnComment(ConnectorSession session, SchemaTableName viewN
                         .collect(toImmutableList()),
                 definition.getComment(),
                 definition.getOwner(),
-                definition.isRunAsInvoker());
+                definition.isRunAsInvoker(),
+                definition.getPath());
 
         replaceView(session, viewName, view, newDefinition);
     }
 
-    private Table getView(SchemaTableName viewName)
+    @Override
+    public void setMaterializedViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
+    {
+        hiveMaterializedViewMetadata.setMaterializedViewColumnComment(session, viewName, columnName, comment);
+    }
+
+    private Table getTrinoView(SchemaTableName viewName)
     {
         Table view = metastore.getTable(viewName.getSchemaName(), viewName.getTableName())
+                .filter(table -> isTrinoView(table) || isHiveView(table))
                 .orElseThrow(() -> new ViewNotFoundException(viewName));
-        if (translateHiveViews && !isPrestoView(view)) {
+        if (!isTrinoView(view)) {
             throw new HiveViewNotSupportedException(viewName);
         }
         return view;
@@ -1569,8 +1674,8 @@ private static List<String> canonicalizePartitionValues(String partitionName, Li
     @Override
     public HiveOutputTableHandle beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, Optional<ConnectorTableLayout> layout, RetryMode retryMode)
     {
-        Optional<Path> externalLocation = Optional.ofNullable(getExternalLocation(tableMetadata.getProperties()))
-                .map(HiveMetadata::getExternalLocationAsPath);
+        Optional<Location> externalLocation = Optional.ofNullable(getExternalLocation(tableMetadata.getProperties()))
+                .map(HiveMetadata::getValidatedExternalLocation);
         if (!createsOfNonManagedTablesEnabled && externalLocation.isPresent()) {
             throw new TrinoException(NOT_SUPPORTED, "Creating non-managed Hive tables is disabled");
         }
@@ -1621,7 +1726,7 @@ public HiveOutputTableHandle beginCreateTable(ConnectorSession session, Connecto
         String schemaName = schemaTableName.getSchemaName();
         String tableName = schemaTableName.getTableName();
 
-        Map<String, String> tableProperties = getEmptyTableProperties(tableMetadata, bucketProperty, new HdfsContext(session));
+        Map<String, String> tableProperties = getEmptyTableProperties(tableMetadata, bucketProperty, session);
         List<HiveColumnHandle> columnHandles = getColumnHandles(tableMetadata, ImmutableSet.copyOf(partitionedBy));
         HiveStorageFormat partitionStorageFormat = isRespectTableFormat(session) ? tableStorageFormat : getHiveStorageFormat(session);
 
@@ -1630,9 +1735,8 @@ public HiveOutputTableHandle beginCreateTable(ConnectorSession session, Connecto
         actualStorageFormat.validateColumns(columnHandles);
 
         Map<String, HiveColumnHandle> columnHandlesByName = Maps.uniqueIndex(columnHandles, HiveColumnHandle::getName);
-        List<Column> partitionColumns = partitionedBy.stream()
+        List<HiveColumnHandle> partitionColumns = partitionedBy.stream()
                 .map(columnHandlesByName::get)
-                .map(HiveColumnHandle::toMetastoreColumn)
                 .collect(toImmutableList());
         checkPartitionTypesSupported(partitionColumns);
 
@@ -1657,7 +1761,7 @@ public HiveOutputTableHandle beginCreateTable(ConnectorSession session, Connecto
                 retryMode != NO_RETRIES);
 
         WriteInfo writeInfo = locationService.getQueryWriteInfo(locationHandle);
-        metastore.declareIntentionToWrite(session, writeInfo.getWriteMode(), writeInfo.getWritePath(), schemaTableName);
+        metastore.declareIntentionToWrite(session, writeInfo.writeMode(), writeInfo.writePath(), schemaTableName);
 
         return result;
     }
@@ -1683,7 +1787,7 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(ConnectorSession sess
                 handle.getPartitionedBy(),
                 handle.getBucketProperty(),
                 handle.getAdditionalTableParameters(),
-                Optional.of(writeInfo.getTargetPath()),
+                Optional.of(writeInfo.targetPath()),
                 handle.isExternal(),
                 prestoVersion,
                 accessControlMetadata.isUsingSystemSecurity());
@@ -1692,12 +1796,13 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(ConnectorSession sess
         partitionUpdates = PartitionUpdate.mergePartitionUpdates(partitionUpdates);
 
         if (handle.getBucketProperty().isPresent() && isCreateEmptyBucketFiles(session)) {
-            List<PartitionUpdate> partitionUpdatesForMissingBuckets = computePartitionUpdatesForMissingBuckets(session, handle, table, true, partitionUpdates);
+            List<PartitionUpdate> partitionUpdatesForMissingBuckets = computePartitionUpdatesForMissingBuckets(session, handle, true, partitionUpdates);
             // replace partitionUpdates before creating the empty files so that those files will be cleaned up if we end up rollback
             partitionUpdates = PartitionUpdate.mergePartitionUpdates(concat(partitionUpdates, partitionUpdatesForMissingBuckets));
             for (PartitionUpdate partitionUpdate : partitionUpdatesForMissingBuckets) {
                 Optional<Partition> partition = table.getPartitionColumns().isEmpty() ? Optional.empty() : Optional.of(buildPartitionObject(session, table, partitionUpdate));
-                createEmptyFiles(session, partitionUpdate.getWritePath(), table, partition, partitionUpdate.getFileNames());
+                Location writePath = Location.of(partitionUpdate.getWritePath().toString());
+                createEmptyFiles(session, writePath, table, partition, partitionUpdate.getFileNames());
             }
             if (handle.isTransactional()) {
                 AcidTransaction transaction = handle.getTransaction();
@@ -1728,6 +1833,7 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(ConnectorSession sess
             tableStatistics = new PartitionStatistics(createEmptyStatistics(), ImmutableMap.of());
         }
 
+        Optional<Location> writePath = Optional.of(writeInfo.writePath());
         if (handle.getPartitionedBy().isEmpty()) {
             List<String> fileNames;
             if (partitionUpdates.isEmpty()) {
@@ -1737,10 +1843,10 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(ConnectorSession sess
             else {
                 fileNames = getOnlyElement(partitionUpdates).getFileNames();
             }
-            metastore.createTable(session, table, principalPrivileges, Optional.of(writeInfo.getWritePath()), Optional.of(fileNames), false, tableStatistics, handle.isRetriesEnabled());
+            metastore.createTable(session, table, principalPrivileges, writePath, Optional.of(fileNames), false, tableStatistics, handle.isRetriesEnabled());
         }
         else {
-            metastore.createTable(session, table, principalPrivileges, Optional.of(writeInfo.getWritePath()), Optional.empty(), false, tableStatistics, false);
+            metastore.createTable(session, table, principalPrivileges, writePath, Optional.empty(), false, tableStatistics, false);
         }
 
         if (!handle.getPartitionedBy().isEmpty()) {
@@ -1775,19 +1881,15 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(ConnectorSession sess
     private List<PartitionUpdate> computePartitionUpdatesForMissingBuckets(
             ConnectorSession session,
             HiveWritableTableHandle handle,
-            Table table,
             boolean isCreateTable,
             List<PartitionUpdate> partitionUpdates)
     {
         ImmutableList.Builder<PartitionUpdate> partitionUpdatesForMissingBucketsBuilder = ImmutableList.builder();
-        HiveStorageFormat storageFormat = table.getPartitionColumns().isEmpty() ? handle.getTableStorageFormat() : handle.getPartitionStorageFormat();
         for (PartitionUpdate partitionUpdate : partitionUpdates) {
             int bucketCount = handle.getBucketProperty().get().getBucketCount();
 
             List<String> fileNamesForMissingBuckets = computeFileNamesForMissingBuckets(
                     session,
-                    storageFormat,
-                    partitionUpdate.getTargetPath(),
                     bucketCount,
                     isCreateTable && handle.isTransactional(),
                     partitionUpdate);
@@ -1806,8 +1908,6 @@ private List<PartitionUpdate> computePartitionUpdatesForMissingBuckets(
 
     private List<String> computeFileNamesForMissingBuckets(
             ConnectorSession session,
-            HiveStorageFormat storageFormat,
-            Path targetPath,
             int bucketCount,
             boolean transactionalCreateTable,
             PartitionUpdate partitionUpdate)
@@ -1816,10 +1916,7 @@ private List<String> computeFileNamesForMissingBuckets(
             // fast path for common case
             return ImmutableList.of();
         }
-        HdfsContext hdfsContext = new HdfsContext(session);
-        JobConf conf = toJobConf(hdfsEnvironment.getConfiguration(hdfsContext, targetPath));
-        configureCompression(conf, selectCompressionCodec(session, storageFormat));
-        String fileExtension = HiveWriterFactory.getFileExtension(conf, fromHiveStorageFormat(storageFormat));
+
         Set<String> fileNames = ImmutableSet.copyOf(partitionUpdate.getFileNames());
         Set<Integer> bucketsWithFiles = fileNames.stream()
                 .map(HiveWriterFactory::getBucketFromFileName)
@@ -1830,21 +1927,16 @@ private List<String> computeFileNamesForMissingBuckets(
             if (bucketsWithFiles.contains(i)) {
                 continue;
             }
-            String fileName;
-            if (transactionalCreateTable) {
-                fileName = computeTransactionalBucketedFilename(i) + fileExtension;
-            }
-            else {
-                fileName = computeNonTransactionalBucketedFilename(session.getQueryId(), i) + fileExtension;
-            }
-            missingFileNamesBuilder.add(fileName);
+            missingFileNamesBuilder.add(transactionalCreateTable
+                    ? computeTransactionalBucketedFilename(i)
+                    : computeNonTransactionalBucketedFilename(session.getQueryId(), i));
         }
         List<String> missingFileNames = missingFileNamesBuilder.build();
         verify(fileNames.size() + missingFileNames.size() == bucketCount);
         return missingFileNames;
     }
 
-    private void createEmptyFiles(ConnectorSession session, Path path, Table table, Optional<Partition> partition, List<String> fileNames)
+    private void createEmptyFiles(ConnectorSession session, Location path, Table table, Optional<Partition> partition, List<String> fileNames)
     {
         Properties schema;
         StorageFormat format;
@@ -1857,48 +1949,24 @@ private void createEmptyFiles(ConnectorSession session, Path path, Table table,
             format = table.getStorage().getStorageFormat();
         }
 
-        HiveCompressionCodec compression = selectCompressionCodec(session, format);
-        if (format.getOutputFormat().equals(ORC_OUTPUT_FORMAT_CLASS) && (compression == HiveCompressionCodec.ZSTD)) {
-            compression = HiveCompressionCodec.GZIP; // ZSTD not supported by Hive ORC writer
-        }
-        JobConf conf = toJobConf(hdfsEnvironment.getConfiguration(new HdfsContext(session), path));
-        configureCompression(conf, compression);
-
-        // for simple line-oriented formats, just create an empty file directly
-        if (format.getOutputFormat().equals(HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS)) {
-            TrinoFileSystem fileSystem = new HdfsFileSystemFactory(hdfsEnvironment).create(session.getIdentity());
-            for (String fileName : fileNames) {
-                TrinoOutputFile trinoOutputFile = fileSystem.newOutputFile(new Path(path, fileName).toString());
-                try {
-                    // create empty file
-                    trinoOutputFile.create(newSimpleAggregatedMemoryContext()).close();
-                }
-                catch (IOException e) {
-                    throw new TrinoException(HIVE_WRITER_CLOSE_ERROR, "Error write empty file to Hive", e);
-                }
-            }
-            return;
-        }
-
-        hdfsEnvironment.doAs(session.getIdentity(), () -> {
-            for (String fileName : fileNames) {
-                writeEmptyFile(session, new Path(path, fileName), conf, schema, format.getSerde(), format.getOutputFormat());
-            }
-        });
-    }
-
-    private static void writeEmptyFile(ConnectorSession session, Path target, JobConf conf, Properties properties, String serde, String outputFormatName)
-    {
-        // Some serializers such as Avro set a property in the schema.
-        initializeSerializer(conf, properties, serde);
-
-        // The code below is not a try with resources because RecordWriter is not Closeable.
-        FileSinkOperator.RecordWriter recordWriter = HiveWriteUtils.createRecordWriter(target, conf, properties, outputFormatName, session);
-        try {
-            recordWriter.close(false);
-        }
-        catch (IOException e) {
-            throw new TrinoException(HIVE_WRITER_CLOSE_ERROR, "Error write empty file to Hive", e);
+        for (String fileName : fileNames) {
+            Location location = path.appendPath(fileName);
+            fileWriterFactories.stream()
+                    .map(factory -> factory.createFileWriter(
+                            location,
+                            ImmutableList.of(),
+                            format,
+                            HiveCompressionCodec.NONE,
+                            schema,
+                            session,
+                            OptionalInt.empty(),
+                            NO_ACID_TRANSACTION,
+                            false,
+                            WriterKind.INSERT))
+                    .flatMap(Optional::stream)
+                    .findFirst()
+                    .orElseThrow(() -> new TrinoException(HIVE_UNSUPPORTED_FORMAT, "Writing not supported for " + format))
+                    .commit();
         }
     }
 
@@ -1932,9 +2000,9 @@ public ConnectorMergeTableHandle beginMerge(ConnectorSession session, ConnectorT
     }
 
     @Override
-    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle mergeTableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
     {
-        HiveMergeTableHandle mergeHandle = (HiveMergeTableHandle) tableHandle;
+        HiveMergeTableHandle mergeHandle = (HiveMergeTableHandle) mergeTableHandle;
         HiveInsertTableHandle insertHandle = mergeHandle.getInsertHandle();
         HiveTableHandle handle = mergeHandle.getTableHandle();
         checkArgument(handle.isAcidMerge(), "handle should be a merge handle, but is %s", handle);
@@ -1963,7 +2031,7 @@ public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tabl
 
         LocationHandle locationHandle = locationService.forExistingTable(metastore, session, table);
         WriteInfo writeInfo = locationService.getQueryWriteInfo(locationHandle);
-        metastore.finishMerge(session, table.getDatabaseName(), table.getTableName(), writeInfo.getWritePath(), partitionMergeResults, partitions);
+        metastore.finishMerge(session, table.getDatabaseName(), table.getTableName(), writeInfo.writePath(), partitionMergeResults, partitions);
     }
 
     @Override
@@ -2034,7 +2102,7 @@ else if (isTransactional) {
 
         WriteInfo writeInfo = locationService.getQueryWriteInfo(locationHandle);
         if (getInsertExistingPartitionsBehavior(session) == InsertExistingPartitionsBehavior.OVERWRITE
-                && writeInfo.getWriteMode() == DIRECT_TO_TARGET_EXISTING_DIRECTORY) {
+                && writeInfo.writeMode() == DIRECT_TO_TARGET_EXISTING_DIRECTORY) {
             if (isTransactional) {
                 throw new TrinoException(NOT_SUPPORTED, "Overwriting existing partition in transactional tables doesn't support DIRECT_TO_TARGET_EXISTING_DIRECTORY write mode");
             }
@@ -2044,7 +2112,7 @@ else if (isTransactional) {
                 throw new TrinoException(NOT_SUPPORTED, "Overwriting existing partition in non auto commit context doesn't support DIRECT_TO_TARGET_EXISTING_DIRECTORY write mode");
             }
         }
-        metastore.declareIntentionToWrite(session, writeInfo.getWriteMode(), writeInfo.getWritePath(), tableName);
+        metastore.declareIntentionToWrite(session, writeInfo.writeMode(), writeInfo.writePath(), tableName);
         return result;
     }
 
@@ -2086,7 +2154,7 @@ private Table finishChangingTable(AcidOperation acidOperation, String changeDesc
         }
 
         if (handle.getBucketProperty().isPresent() && isCreateEmptyBucketFiles(session)) {
-            List<PartitionUpdate> partitionUpdatesForMissingBuckets = computePartitionUpdatesForMissingBuckets(session, handle, table, false, partitionUpdates);
+            List<PartitionUpdate> partitionUpdatesForMissingBuckets = computePartitionUpdatesForMissingBuckets(session, handle, false, partitionUpdates);
             // replace partitionUpdates before creating the empty files so that those files will be cleaned up if we end up rollback
             partitionUpdates = PartitionUpdate.mergePartitionUpdates(concat(partitionUpdates, partitionUpdatesForMissingBuckets));
             for (PartitionUpdate partitionUpdate : partitionUpdatesForMissingBuckets) {
@@ -2103,7 +2171,8 @@ private Table finishChangingTable(AcidOperation acidOperation, String changeDesc
                             statistics,
                             handle.isRetriesEnabled());
                 }
-                createEmptyFiles(session, partitionUpdate.getWritePath(), table, partition, partitionUpdate.getFileNames());
+                Location writePath = Location.of(partitionUpdate.getWritePath().toString());
+                createEmptyFiles(session, writePath, table, partition, partitionUpdate.getFileNames());
             }
         }
 
@@ -2135,7 +2204,15 @@ private Table finishChangingTable(AcidOperation acidOperation, String changeDesc
                     metastore.dropTable(session, handle.getSchemaName(), handle.getTableName());
 
                     // create the table with the new location
-                    metastore.createTable(session, table, principalPrivileges, Optional.of(partitionUpdate.getWritePath()), Optional.of(partitionUpdate.getFileNames()), false, partitionStatistics, handle.isRetriesEnabled());
+                    metastore.createTable(
+                            session,
+                            table,
+                            principalPrivileges,
+                            Optional.of(partitionUpdate.getWritePath()),
+                            Optional.of(partitionUpdate.getFileNames()),
+                            false,
+                            partitionStatistics,
+                            handle.isRetriesEnabled());
                 }
                 else if (partitionUpdate.getUpdateMode() == NEW || partitionUpdate.getUpdateMode() == APPEND) {
                     // insert into unpartitioned table
@@ -2191,8 +2268,8 @@ else if (partitionUpdate.getUpdateMode() == NEW || partitionUpdate.getUpdateMode
                     if (handle.getLocationHandle().getWriteMode() == DIRECT_TO_TARGET_EXISTING_DIRECTORY) {
                         removeNonCurrentQueryFiles(session, partitionUpdate.getTargetPath());
                         if (handle.isRetriesEnabled()) {
-                            HdfsContext hdfsContext = new HdfsContext(session);
-                            cleanExtraOutputFiles(hdfsEnvironment, hdfsContext, session.getQueryId(), partitionUpdate.getTargetPath(), ImmutableSet.copyOf(partitionUpdate.getFileNames()));
+                            TrinoFileSystem fileSystem = fileSystemFactory.create(session);
+                            cleanExtraOutputFiles(fileSystem, session.getQueryId(), partitionUpdate.getTargetPath(), ImmutableSet.copyOf(partitionUpdate.getFileNames()));
                         }
                     }
                     else {
@@ -2221,23 +2298,23 @@ else if (partitionUpdate.getUpdateMode() == NEW || partitionUpdate.getUpdateMode
         return table;
     }
 
-    private void removeNonCurrentQueryFiles(ConnectorSession session, Path partitionPath)
+    private void removeNonCurrentQueryFiles(ConnectorSession session, Location partitionLocation)
     {
         String queryId = session.getQueryId();
+        TrinoFileSystem fileSystem = fileSystemFactory.create(session);
         try {
-            FileSystem fileSystem = hdfsEnvironment.getFileSystem(new HdfsContext(session), partitionPath);
-            RemoteIterator<LocatedFileStatus> iterator = fileSystem.listFiles(partitionPath, false);
+            FileIterator iterator = fileSystem.listFiles(partitionLocation);
             while (iterator.hasNext()) {
-                Path file = iterator.next().getPath();
-                if (!isFileCreatedByQuery(file.getName(), queryId)) {
-                    checkedDelete(fileSystem, file, false);
+                Location location = iterator.next().location();
+                if (!isFileCreatedByQuery(location.fileName(), queryId)) {
+                    fileSystem.deleteFile(location);
                 }
             }
         }
         catch (Exception ex) {
             throw new TrinoException(
                     HIVE_FILESYSTEM_ERROR,
-                    format("Failed to delete partition %s files during overwrite", partitionPath),
+                    format("Failed to delete partition %s files during overwrite", partitionLocation),
                     ex);
         }
     }
@@ -2245,7 +2322,7 @@ private void removeNonCurrentQueryFiles(ConnectorSession session, Path partition
     private void createOrcAcidVersionFile(ConnectorIdentity identity, String deltaDirectory)
     {
         try {
-            writeAcidVersionFile(fileSystemFactory.create(identity), deltaDirectory);
+            writeAcidVersionFile(fileSystemFactory.create(identity), Location.of(deltaDirectory));
         }
         catch (IOException e) {
             throw new TrinoException(HIVE_FILESYSTEM_ERROR, "Exception writing _orc_acid_version file for delta directory: " + deltaDirectory, e);
@@ -2415,7 +2492,7 @@ private BeginTableExecuteResult<ConnectorTableExecuteHandle, ConnectorTableHandl
         HiveTableHandle hiveSourceTableHandle = (HiveTableHandle) sourceTableHandle;
 
         WriteInfo writeInfo = locationService.getQueryWriteInfo(hiveExecuteHandle.getLocationHandle());
-        String writeDeclarationId = metastore.declareIntentionToWrite(session, writeInfo.getWriteMode(), writeInfo.getWritePath(), hiveExecuteHandle.getSchemaTableName());
+        String writeDeclarationId = metastore.declareIntentionToWrite(session, writeInfo.writeMode(), writeInfo.writePath(), hiveExecuteHandle.getSchemaTableName());
 
         return new BeginTableExecuteResult<>(
                 hiveExecuteHandle
@@ -2507,32 +2584,29 @@ private void finishOptimize(ConnectorSession session, ConnectorTableExecuteHandl
                     handle.isRetriesEnabled());
         }
 
-        // get filesystem
-        FileSystem fs;
-        try {
-            fs = hdfsEnvironment.getFileSystem(new HdfsContext(session), new Path(table.getStorage().getLocation()));
-        }
-        catch (IOException e) {
-            throw new TrinoException(HIVE_FILESYSTEM_ERROR, e);
-        }
-
         // path to be deleted
-        Set<Path> scannedPaths = splitSourceInfo.stream()
-                .map(file -> new Path((String) file))
+        Set<Location> scannedPaths = splitSourceInfo.stream()
+                .map(file -> Location.of((String) file))
                 .collect(toImmutableSet());
         // track remaining files to be delted for error reporting
-        Set<Path> remainingFilesToDelete = new HashSet<>(scannedPaths);
+        Set<Location> remainingFilesToDelete = new HashSet<>(scannedPaths);
 
         // delete loop
+        TrinoFileSystem fileSystem = fileSystemFactory.create(session);
         boolean someDeleted = false;
-        Optional<Path> firstScannedPath = Optional.empty();
+        Optional<Location> firstScannedPath = Optional.empty();
         try {
-            for (Path scannedPath : scannedPaths) {
+            for (Location scannedPath : scannedPaths) {
                 if (firstScannedPath.isEmpty()) {
                     firstScannedPath = Optional.of(scannedPath);
                 }
                 retry().run("delete " + scannedPath, () -> {
-                    checkedDelete(fs, scannedPath, false);
+                    try {
+                        fileSystem.deleteFile(scannedPath);
+                    }
+                    catch (FileNotFoundException e) {
+                        // ignore missing files
+                    }
                     return null;
                 });
                 someDeleted = true;
@@ -2540,7 +2614,7 @@ private void finishOptimize(ConnectorSession session, ConnectorTableExecuteHandl
             }
         }
         catch (Exception e) {
-            if (!someDeleted && (firstScannedPath.isEmpty() || exists(fs, firstScannedPath.get()))) {
+            if (!someDeleted && (firstScannedPath.isEmpty() || exists(fileSystem, firstScannedPath.get()))) {
                 // we are good - we did not delete any source files so we can just throw error and allow rollback to happend
                 // if someDeleted flag is false we do extra checkig if first file we tried to delete is still there. There is a chance that
                 // fs.delete above could throw exception but file was actually deleted.
@@ -2557,10 +2631,10 @@ private void finishOptimize(ConnectorSession session, ConnectorTableExecuteHandl
         }
     }
 
-    private boolean exists(FileSystem fs, Path path)
+    private static boolean exists(TrinoFileSystem fs, Location location)
     {
         try {
-            return fs.exists(path);
+            return fs.newInputFile(location).exists();
         }
         catch (IOException e) {
             // on failure pessimistically assume file does not exist
@@ -2604,7 +2678,7 @@ public void createView(ConnectorSession session, SchemaTableName viewName, Conne
 
         Optional<Table> existing = metastore.getTable(viewName.getSchemaName(), viewName.getTableName());
         if (existing.isPresent()) {
-            if (!replace || !isPrestoView(existing.get())) {
+            if (!replace || !isTrinoView(existing.get())) {
                 throw new ViewAlreadyExistsException(viewName);
             }
 
@@ -2652,34 +2726,46 @@ public void dropView(ConnectorSession session, SchemaTableName viewName)
     @Override
     public List<SchemaTableName> listViews(ConnectorSession session, Optional<String> optionalSchemaName)
     {
+        Set<SchemaTableName> materializedViews = ImmutableSet.copyOf(listMaterializedViews(session, optionalSchemaName));
+        if (optionalSchemaName.isEmpty()) {
+            Optional<List<SchemaTableName>> allViews = metastore.getAllViews();
+            if (allViews.isPresent()) {
+                return allViews.get().stream()
+                        .filter(view -> !isHiveSystemSchema(view.getSchemaName()))
+                        .filter(view -> !materializedViews.contains(view))
+                        .collect(toImmutableList());
+            }
+        }
         ImmutableList.Builder<SchemaTableName> tableNames = ImmutableList.builder();
         for (String schemaName : listSchemas(session, optionalSchemaName)) {
             for (String tableName : metastore.getAllViews(schemaName)) {
-                tableNames.add(new SchemaTableName(schemaName, tableName));
+                SchemaTableName schemaTableName = new SchemaTableName(schemaName, tableName);
+                if (!materializedViews.contains(schemaTableName)) {
+                    tableNames.add(schemaTableName);
+                }
             }
         }
         return tableNames.build();
     }
 
     @Override
-    public Map<String, Object> getSchemaProperties(ConnectorSession session, CatalogSchemaName schemaName)
+    public Map<String, Object> getSchemaProperties(ConnectorSession session, String schemaName)
     {
-        checkState(!isHiveSystemSchema(schemaName.getSchemaName()), "Schema is not accessible: %s", schemaName);
-
-        Optional<Database> db = metastore.getDatabase(schemaName.getSchemaName());
-        if (db.isPresent()) {
-            return HiveSchemaProperties.fromDatabase(db.get());
+        if (isHiveSystemSchema(schemaName)) {
+            throw new TrinoException(NOT_SUPPORTED, "Schema properties are not supported for system schema: " + schemaName);
         }
-
-        throw new SchemaNotFoundException(schemaName.getSchemaName());
+        return metastore.getDatabase(schemaName)
+                .map(HiveSchemaProperties::fromDatabase)
+                .orElseThrow(() -> new SchemaNotFoundException(schemaName));
     }
 
     @Override
-    public Optional<TrinoPrincipal> getSchemaOwner(ConnectorSession session, CatalogSchemaName schemaName)
+    public Optional<TrinoPrincipal> getSchemaOwner(ConnectorSession session, String schemaName)
     {
-        checkState(!isHiveSystemSchema(schemaName.getSchemaName()), "Schema is not accessible: %s", schemaName);
-
-        return accessControlMetadata.getSchemaOwner(session, schemaName.getSchemaName()).map(HivePrincipal::toTrinoPrincipal);
+        if (isHiveSystemSchema(schemaName)) {
+            throw new TrinoException(NOT_SUPPORTED, "Schema owner is not supported for system schema: " + schemaName);
+        }
+        return accessControlMetadata.getSchemaOwner(session, schemaName).map(HivePrincipal::toTrinoPrincipal);
     }
 
     @Override
@@ -2720,10 +2806,19 @@ public Optional<ConnectorViewDefinition> getView(ConnectorSession session, Schem
     private Optional<ConnectorViewDefinition> toConnectorViewDefinition(ConnectorSession session, SchemaTableName viewName, Optional<Table> table)
     {
         return table
-                .filter(ViewReaderUtil::canDecodeView)
-                .map(view -> {
-                    if (!translateHiveViews && !isPrestoView(view)) {
-                        throw new HiveViewNotSupportedException(viewName);
+                .flatMap(view -> {
+                    if (isTrinoView(view)) {
+                        // can handle
+                    }
+                    else if (isHiveView(view)) {
+                        if (!translateHiveViews) {
+                            throw new HiveViewNotSupportedException(viewName);
+                        }
+                        // can handle
+                    }
+                    else {
+                        // actually not a view
+                        return Optional.empty();
                     }
 
                     ConnectorViewDefinition definition = createViewReader(metastore, session, view, typeManager, this::redirectTable, metadataProvider, hiveViewsRunAsInvoker, hiveViewsTimestampPrecision)
@@ -2737,9 +2832,10 @@ private Optional<ConnectorViewDefinition> toConnectorViewDefinition(ConnectorSes
                                 definition.getColumns(),
                                 definition.getComment(),
                                 view.getOwner(),
-                                false);
+                                false,
+                                definition.getPath());
                     }
-                    return definition;
+                    return Optional.of(definition);
                 });
     }
 
@@ -2877,7 +2973,6 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
         return new ConnectorTableProperties(
                 predicate,
                 tablePartitioning,
-                Optional.empty(),
                 discretePredicates,
                 sortingProperties);
     }
@@ -2946,7 +3041,7 @@ public Optional<ProjectionApplicationResult<ConnectorTableHandle>> applyProjecti
                 .collect(toImmutableSet());
 
         Map<ConnectorExpression, ProjectedColumnRepresentation> columnProjections = projectedExpressions.stream()
-                .collect(toImmutableMap(Function.identity(), HiveApplyProjectionUtil::createProjectedColumnRepresentation));
+                .collect(toImmutableMap(Function.identity(), ApplyProjectionUtil::createProjectedColumnRepresentation));
 
         HiveTableHandle hiveTableHandle = (HiveTableHandle) handle;
         // all references are simple variables
@@ -3322,6 +3417,15 @@ public Optional<ConnectorTableLayout> getNewTableLayout(ConnectorSession session
                 multipleWritersPerPartitionSupported));
     }
 
+    @Override
+    public Optional<Type> getSupportedType(ConnectorSession session, Map<String, Object> tableProperties, Type type)
+    {
+        if (type instanceof VarcharType varcharType && !varcharType.isUnbounded() && varcharType.getBoundedLength() == 0) {
+            return Optional.of(VarcharType.createVarcharType(1));
+        }
+        return Optional.empty();
+    }
+
     @Override
     public Optional<ConnectorTableLayout> getLayoutForTableExecute(ConnectorSession session, ConnectorTableExecuteHandle executeHandle)
     {
@@ -3388,6 +3492,41 @@ private List<ColumnStatisticMetadata> getColumnStatisticMetadata(String columnNa
                 .collect(toImmutableList());
     }
 
+    @Override
+    public Collection<LanguageFunction> listLanguageFunctions(ConnectorSession session, String schemaName)
+    {
+        return metastore.getFunctions(schemaName);
+    }
+
+    @Override
+    public Collection<LanguageFunction> getLanguageFunctions(ConnectorSession session, SchemaFunctionName name)
+    {
+        return metastore.getFunctions(name);
+    }
+
+    @Override
+    public boolean languageFunctionExists(ConnectorSession session, SchemaFunctionName name, String signatureToken)
+    {
+        return metastore.functionExists(name, signatureToken);
+    }
+
+    @Override
+    public void createLanguageFunction(ConnectorSession session, SchemaFunctionName name, LanguageFunction function, boolean replace)
+    {
+        if (replace) {
+            metastore.replaceFunction(name, function);
+        }
+        else {
+            metastore.createFunction(name, function);
+        }
+    }
+
+    @Override
+    public void dropLanguageFunction(ConnectorSession session, SchemaFunctionName name, String signatureToken)
+    {
+        metastore.dropFunction(name, signatureToken);
+    }
+
     @Override
     public boolean roleExists(ConnectorSession session, String role)
     {
@@ -3741,19 +3880,29 @@ public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session,
     {
         requireNonNull(session, "session is null");
         requireNonNull(tableName, "tableName is null");
+
+        Optional<String> icebergCatalogName = getIcebergCatalogName(session);
+        Optional<String> deltaLakeCatalogName = getDeltaLakeCatalogName(session);
+        Optional<String> hudiCatalogName = getHudiCatalogName(session);
+
+        if (icebergCatalogName.isEmpty() && deltaLakeCatalogName.isEmpty() && hudiCatalogName.isEmpty()) {
+            return Optional.empty();
+        }
+
         if (isHiveSystemSchema(tableName.getSchemaName())) {
             return Optional.empty();
         }
         // we need to chop off any "$partitions" and similar suffixes from table name while querying the metastore for the Table object
         TableNameSplitResult tableNameSplit = splitTableName(tableName.getTableName());
         Optional<Table> table = metastore.getTable(tableName.getSchemaName(), tableNameSplit.getBaseTableName());
-        if (table.isEmpty() || VIRTUAL_VIEW.name().equals(table.get().getTableType())) {
+        if (table.isEmpty() || isSomeKindOfAView(table.get())) {
             return Optional.empty();
         }
 
-        Optional<CatalogSchemaTableName> catalogSchemaTableName = redirectTableToIceberg(session, table.get())
-                .or(() -> redirectTableToDeltaLake(session, table.get()))
-                .or(() -> redirectTableToHudi(session, table.get()));
+        Optional<CatalogSchemaTableName> catalogSchemaTableName = Optional.<CatalogSchemaTableName>empty()
+                .or(() -> redirectTableToIceberg(icebergCatalogName, table.get()))
+                .or(() -> redirectTableToDeltaLake(deltaLakeCatalogName, table.get()))
+                .or(() -> redirectTableToHudi(hudiCatalogName, table.get()));
 
         // stitch back the suffix we cut off.
         return catalogSchemaTableName.map(name -> new CatalogSchemaTableName(
@@ -3763,9 +3912,8 @@ public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session,
                         name.getSchemaTableName().getTableName() + tableNameSplit.getSuffix().orElse(""))));
     }
 
-    private Optional<CatalogSchemaTableName> redirectTableToIceberg(ConnectorSession session, Table table)
+    private Optional<CatalogSchemaTableName> redirectTableToIceberg(Optional<String> targetCatalogName, Table table)
     {
-        Optional<String> targetCatalogName = getIcebergCatalogName(session);
         if (targetCatalogName.isEmpty()) {
             return Optional.empty();
         }
@@ -3775,9 +3923,8 @@ private Optional<CatalogSchemaTableName> redirectTableToIceberg(ConnectorSession
         return Optional.empty();
     }
 
-    private Optional<CatalogSchemaTableName> redirectTableToDeltaLake(ConnectorSession session, Table table)
+    private Optional<CatalogSchemaTableName> redirectTableToDeltaLake(Optional<String> targetCatalogName, Table table)
     {
-        Optional<String> targetCatalogName = getDeltaLakeCatalogName(session);
         if (targetCatalogName.isEmpty()) {
             return Optional.empty();
         }
@@ -3787,9 +3934,8 @@ private Optional<CatalogSchemaTableName> redirectTableToDeltaLake(ConnectorSessi
         return Optional.empty();
     }
 
-    private Optional<CatalogSchemaTableName> redirectTableToHudi(ConnectorSession session, Table table)
+    private Optional<CatalogSchemaTableName> redirectTableToHudi(Optional<String> targetCatalogName, Table table)
     {
-        Optional<String> targetCatalogName = getHudiCatalogName(session);
         if (targetCatalogName.isEmpty()) {
             return Optional.empty();
         }
@@ -3799,6 +3945,18 @@ private Optional<CatalogSchemaTableName> redirectTableToHudi(ConnectorSession se
         return Optional.empty();
     }
 
+    @Override
+    public WriterScalingOptions getNewTableWriterScalingOptions(ConnectorSession session, SchemaTableName tableName, Map<String, Object> tableProperties)
+    {
+        return WriterScalingOptions.ENABLED;
+    }
+
+    @Override
+    public WriterScalingOptions getInsertWriterScalingOptions(ConnectorSession session, ConnectorTableHandle tableHandle)
+    {
+        return WriterScalingOptions.ENABLED;
+    }
+
     private static TableNameSplitResult splitTableName(String tableName)
     {
         int metadataMarkerIndex = tableName.lastIndexOf('$');
@@ -3847,16 +4005,4 @@ private static boolean isQueryPartitionFilterRequiredForTable(ConnectorSession s
         return isQueryPartitionFilterRequired(session) &&
                 requiredSchemas.isEmpty() || requiredSchemas.contains(schemaTableName.getSchemaName());
     }
-
-    @Override
-    public boolean supportsReportingWrittenBytes(ConnectorSession session, ConnectorTableHandle connectorTableHandle)
-    {
-        return true;
-    }
-
-    @Override
-    public boolean supportsReportingWrittenBytes(ConnectorSession session, SchemaTableName schemaTableName, Map<String, Object> tableProperties)
-    {
-        return true;
-    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadataFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadataFactory.java
index 0bb3b152e599..278430f1b3c3 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadataFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadataFactory.java
@@ -13,6 +13,8 @@
  */
 package io.trino.plugin.hive;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.json.JsonCodec;
 import io.airlift.units.Duration;
@@ -21,7 +23,7 @@
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.aws.athena.PartitionProjectionService;
 import io.trino.plugin.hive.fs.DirectoryLister;
-import io.trino.plugin.hive.fs.TransactionScopeCachingDirectoryLister;
+import io.trino.plugin.hive.fs.TransactionScopeCachingDirectoryListerFactory;
 import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
 import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
 import io.trino.plugin.hive.metastore.SemiTransactionalHiveMetastore;
@@ -31,8 +33,6 @@
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Executor;
@@ -57,6 +57,7 @@ public class HiveMetadataFactory
     private final boolean hideDeltaLakeTables;
     private final long perTransactionCacheMaximumSize;
     private final HiveMetastoreFactory metastoreFactory;
+    private final Set<HiveFileWriterFactory> fileWriterFactories;
     private final TrinoFileSystemFactory fileSystemFactory;
     private final HdfsEnvironment hdfsEnvironment;
     private final HivePartitionManager partitionManager;
@@ -76,7 +77,7 @@ public class HiveMetadataFactory
     private final Optional<Duration> hiveTransactionHeartbeatInterval;
     private final ScheduledExecutorService heartbeatService;
     private final DirectoryLister directoryLister;
-    private final long perTransactionFileStatusCacheMaximumSize;
+    private final TransactionScopeCachingDirectoryListerFactory transactionScopeCachingDirectoryListerFactory;
     private final PartitionProjectionService partitionProjectionService;
     private final boolean allowTableRename;
     private final HiveTimestampPrecision hiveViewsTimestampPrecision;
@@ -87,6 +88,7 @@ public HiveMetadataFactory(
             HiveConfig hiveConfig,
             HiveMetastoreConfig hiveMetastoreConfig,
             HiveMetastoreFactory metastoreFactory,
+            Set<HiveFileWriterFactory> fileWriterFactories,
             TrinoFileSystemFactory fileSystemFactory,
             HdfsEnvironment hdfsEnvironment,
             HivePartitionManager partitionManager,
@@ -102,12 +104,14 @@ public HiveMetadataFactory(
             HiveMaterializedViewMetadataFactory hiveMaterializedViewMetadataFactory,
             AccessControlMetadataFactory accessControlMetadataFactory,
             DirectoryLister directoryLister,
+            TransactionScopeCachingDirectoryListerFactory transactionScopeCachingDirectoryListerFactory,
             PartitionProjectionService partitionProjectionService,
             @AllowHiveTableRename boolean allowTableRename)
     {
         this(
                 catalogName,
                 metastoreFactory,
+                fileWriterFactories,
                 fileSystemFactory,
                 hdfsEnvironment,
                 partitionManager,
@@ -137,7 +141,7 @@ public HiveMetadataFactory(
                 hiveMaterializedViewMetadataFactory,
                 accessControlMetadataFactory,
                 directoryLister,
-                hiveConfig.getPerTransactionFileStatusCacheMaximumSize(),
+                transactionScopeCachingDirectoryListerFactory,
                 partitionProjectionService,
                 allowTableRename,
                 hiveConfig.getTimestampPrecision());
@@ -146,6 +150,7 @@ public HiveMetadataFactory(
     public HiveMetadataFactory(
             CatalogName catalogName,
             HiveMetastoreFactory metastoreFactory,
+            Set<HiveFileWriterFactory> fileWriterFactories,
             TrinoFileSystemFactory fileSystemFactory,
             HdfsEnvironment hdfsEnvironment,
             HivePartitionManager partitionManager,
@@ -175,7 +180,7 @@ public HiveMetadataFactory(
             HiveMaterializedViewMetadataFactory hiveMaterializedViewMetadataFactory,
             AccessControlMetadataFactory accessControlMetadataFactory,
             DirectoryLister directoryLister,
-            long perTransactionFileStatusCacheMaximumSize,
+            TransactionScopeCachingDirectoryListerFactory transactionScopeCachingDirectoryListerFactory,
             PartitionProjectionService partitionProjectionService,
             boolean allowTableRename,
             HiveTimestampPrecision hiveViewsTimestampPrecision)
@@ -192,6 +197,7 @@ public HiveMetadataFactory(
         this.perTransactionCacheMaximumSize = perTransactionCacheMaximumSize;
 
         this.metastoreFactory = requireNonNull(metastoreFactory, "metastoreFactory is null");
+        this.fileWriterFactories = ImmutableSet.copyOf(requireNonNull(fileWriterFactories, "fileWriterFactories is null"));
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
         this.partitionManager = requireNonNull(partitionManager, "partitionManager is null");
@@ -218,7 +224,7 @@ public HiveMetadataFactory(
         this.maxPartitionDropsPerQuery = maxPartitionDropsPerQuery;
         this.heartbeatService = requireNonNull(heartbeatService, "heartbeatService is null");
         this.directoryLister = requireNonNull(directoryLister, "directoryLister is null");
-        this.perTransactionFileStatusCacheMaximumSize = perTransactionFileStatusCacheMaximumSize;
+        this.transactionScopeCachingDirectoryListerFactory = requireNonNull(transactionScopeCachingDirectoryListerFactory, "transactionScopeCachingDirectoryListerFactory is null");
         this.partitionProjectionService = requireNonNull(partitionProjectionService, "partitionProjectionService is null");
         this.allowTableRename = allowTableRename;
         this.hiveViewsTimestampPrecision = requireNonNull(hiveViewsTimestampPrecision, "hiveViewsTimestampPrecision is null");
@@ -230,16 +236,9 @@ public TransactionalMetadata create(ConnectorIdentity identity, boolean autoComm
         HiveMetastoreClosure hiveMetastoreClosure = new HiveMetastoreClosure(
                 memoizeMetastore(metastoreFactory.createMetastore(Optional.of(identity)), perTransactionCacheMaximumSize)); // per-transaction cache
 
-        DirectoryLister directoryLister;
-        if (perTransactionFileStatusCacheMaximumSize > 0) {
-            directoryLister = new TransactionScopeCachingDirectoryLister(this.directoryLister, perTransactionFileStatusCacheMaximumSize);
-        }
-        else {
-            directoryLister = this.directoryLister;
-        }
-
+        DirectoryLister directoryLister = transactionScopeCachingDirectoryListerFactory.get(this.directoryLister);
         SemiTransactionalHiveMetastore metastore = new SemiTransactionalHiveMetastore(
-                hdfsEnvironment,
+                fileSystemFactory,
                 hiveMetastoreClosure,
                 fileSystemExecutor,
                 dropExecutor,
@@ -255,6 +254,7 @@ public TransactionalMetadata create(ConnectorIdentity identity, boolean autoComm
                 catalogName,
                 metastore,
                 autoCommit,
+                fileWriterFactories,
                 fileSystemFactory,
                 hdfsEnvironment,
                 partitionManager,
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetastoreClosure.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetastoreClosure.java
index d6c5c97e1960..dc085d1c2827 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetastoreClosure.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetastoreClosure.java
@@ -30,10 +30,13 @@
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.function.LanguageFunction;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -86,11 +89,6 @@ public Set<HiveColumnStatisticType> getSupportedColumnStatistics(Type type)
         return delegate.getSupportedColumnStatistics(type);
     }
 
-    public PartitionStatistics getTableStatistics(String databaseName, String tableName)
-    {
-        return getTableStatistics(databaseName, tableName, Optional.empty());
-    }
-
     public PartitionStatistics getTableStatistics(String databaseName, String tableName, Optional<Set<String>> columns)
     {
         Table table = getExistingTable(databaseName, tableName);
@@ -152,9 +150,9 @@ public List<String> getAllTables(String databaseName)
         return delegate.getAllTables(databaseName);
     }
 
-    public List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue)
+    public Optional<List<SchemaTableName>> getAllTables()
     {
-        return delegate.getTablesWithParameter(databaseName, parameterKey, parameterValue);
+        return delegate.getAllTables();
     }
 
     public List<String> getAllViews(String databaseName)
@@ -162,6 +160,11 @@ public List<String> getAllViews(String databaseName)
         return delegate.getAllViews(databaseName);
     }
 
+    public Optional<List<SchemaTableName>> getAllViews()
+    {
+        return delegate.getAllViews();
+    }
+
     public void createDatabase(Database database)
     {
         delegate.createDatabase(database);
@@ -414,4 +417,34 @@ public void alterTransactionalTable(Table table, long transactionId, long writeI
     {
         delegate.alterTransactionalTable(table, transactionId, writeId, principalPrivileges);
     }
+
+    public boolean functionExists(SchemaFunctionName name, String signatureToken)
+    {
+        return delegate.functionExists(name.getSchemaName(), name.getFunctionName(), signatureToken);
+    }
+
+    public Collection<LanguageFunction> getFunctions(String schemaName)
+    {
+        return delegate.getFunctions(schemaName);
+    }
+
+    public Collection<LanguageFunction> getFunctions(SchemaFunctionName name)
+    {
+        return delegate.getFunctions(name.getSchemaName(), name.getFunctionName());
+    }
+
+    public void createFunction(SchemaFunctionName name, LanguageFunction function)
+    {
+        delegate.createFunction(name.getSchemaName(), name.getFunctionName(), function);
+    }
+
+    public void replaceFunction(SchemaFunctionName name, LanguageFunction function)
+    {
+        delegate.replaceFunction(name.getSchemaName(), name.getFunctionName(), function);
+    }
+
+    public void dropFunction(SchemaFunctionName name, String signatureToken)
+    {
+        delegate.dropFunction(name.getSchemaName(), name.getFunctionName(), signatureToken);
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveModule.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveModule.java
index 89df99798772..c081507cc289 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveModule.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveModule.java
@@ -18,14 +18,17 @@
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import com.google.inject.multibindings.Multibinder;
 import io.airlift.event.client.EventClient;
-import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.hdfs.HdfsNamenodeStats;
 import io.trino.hdfs.TrinoFileSystemCache;
 import io.trino.hdfs.TrinoFileSystemCacheStats;
 import io.trino.plugin.base.CatalogName;
+import io.trino.plugin.hive.avro.AvroFileWriterFactory;
+import io.trino.plugin.hive.avro.AvroPageSourceFactory;
 import io.trino.plugin.hive.fs.CachingDirectoryLister;
+import io.trino.plugin.hive.fs.TransactionScopeCachingDirectoryListerFactory;
 import io.trino.plugin.hive.line.CsvFileWriterFactory;
 import io.trino.plugin.hive.line.CsvPageSourceFactory;
 import io.trino.plugin.hive.line.JsonFileWriterFactory;
@@ -49,15 +52,11 @@
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
 import io.trino.plugin.hive.parquet.ParquetWriterConfig;
 import io.trino.plugin.hive.rcfile.RcFilePageSourceFactory;
-import io.trino.plugin.hive.s3select.S3SelectRecordCursorProvider;
-import io.trino.plugin.hive.s3select.TrinoS3ClientFactory;
 import io.trino.spi.connector.ConnectorNodePartitioningProvider;
 import io.trino.spi.connector.ConnectorPageSinkProvider;
 import io.trino.spi.connector.ConnectorPageSourceProvider;
 import io.trino.spi.connector.ConnectorSplitManager;
 
-import javax.inject.Singleton;
-
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 
@@ -87,14 +86,9 @@ public void configure(Binder binder)
         newOptionalBinder(binder, HiveMaterializedViewPropertiesProvider.class)
                 .setDefault().toInstance(ImmutableList::of);
 
-        binder.bind(TrinoS3ClientFactory.class).in(Scopes.SINGLETON);
-
         binder.bind(CachingDirectoryLister.class).in(Scopes.SINGLETON);
         newExporter(binder).export(CachingDirectoryLister.class).withGeneratedName();
 
-        binder.bind(NamenodeStats.class).in(Scopes.SINGLETON);
-        newExporter(binder).export(NamenodeStats.class).withGeneratedName();
-
         binder.bind(HiveWriterStats.class).in(Scopes.SINGLETON);
         newExporter(binder).export(HiveWriterStats.class).withGeneratedName();
 
@@ -110,6 +104,7 @@ public void configure(Binder binder)
                 .setDefault().to(DefaultHiveMaterializedViewMetadataFactory.class).in(Scopes.SINGLETON);
         newOptionalBinder(binder, TransactionalMetadataFactory.class)
                 .setDefault().to(HiveMetadataFactory.class).in(Scopes.SINGLETON);
+        binder.bind(TransactionScopeCachingDirectoryListerFactory.class).in(Scopes.SINGLETON);
         binder.bind(HiveTransactionManager.class).in(Scopes.SINGLETON);
         binder.bind(ConnectorSplitManager.class).to(HiveSplitManager.class).in(Scopes.SINGLETON);
         newExporter(binder).export(ConnectorSplitManager.class).as(generator -> generator.generatedNameOf(HiveSplitManager.class));
@@ -126,8 +121,9 @@ public void configure(Binder binder)
         newExporter(binder).export(TrinoFileSystemCacheStats.class)
                 .as(generator -> generator.generatedNameOf(io.trino.plugin.hive.fs.TrinoFileSystemCache.class));
 
-        configBinder(binder).bindConfig(HiveFormatsConfig.class);
-        binder.bind(TrinoFileSystemFactory.class).to(HdfsFileSystemFactory.class).in(Scopes.SINGLETON);
+        binder.bind(HdfsNamenodeStats.class).in(Scopes.SINGLETON);
+        newExporter(binder).export(HdfsNamenodeStats.class)
+                .as(generator -> generator.generatedNameOf(NamenodeStats.class));
 
         Multibinder<HivePageSourceFactory> pageSourceFactoryBinder = newSetBinder(binder, HivePageSourceFactory.class);
         pageSourceFactoryBinder.addBinding().to(CsvPageSourceFactory.class).in(Scopes.SINGLETON);
@@ -139,11 +135,7 @@ public void configure(Binder binder)
         pageSourceFactoryBinder.addBinding().to(OrcPageSourceFactory.class).in(Scopes.SINGLETON);
         pageSourceFactoryBinder.addBinding().to(ParquetPageSourceFactory.class).in(Scopes.SINGLETON);
         pageSourceFactoryBinder.addBinding().to(RcFilePageSourceFactory.class).in(Scopes.SINGLETON);
-
-        Multibinder<HiveRecordCursorProvider> recordCursorProviderBinder = newSetBinder(binder, HiveRecordCursorProvider.class);
-        recordCursorProviderBinder.addBinding().to(S3SelectRecordCursorProvider.class).in(Scopes.SINGLETON);
-
-        binder.bind(GenericHiveRecordCursorProvider.class).in(Scopes.SINGLETON);
+        pageSourceFactoryBinder.addBinding().to(AvroPageSourceFactory.class).in(Scopes.SINGLETON);
 
         Multibinder<HiveFileWriterFactory> fileWriterFactoryBinder = newSetBinder(binder, HiveFileWriterFactory.class);
         binder.bind(OrcFileWriterFactory.class).in(Scopes.SINGLETON);
@@ -158,6 +150,7 @@ public void configure(Binder binder)
         fileWriterFactoryBinder.addBinding().to(SimpleSequenceFileWriterFactory.class).in(Scopes.SINGLETON);
         fileWriterFactoryBinder.addBinding().to(OrcFileWriterFactory.class).in(Scopes.SINGLETON);
         fileWriterFactoryBinder.addBinding().to(RcFileFileWriterFactory.class).in(Scopes.SINGLETON);
+        fileWriterFactoryBinder.addBinding().to(AvroFileWriterFactory.class).in(Scopes.SINGLETON);
 
         configBinder(binder).bindConfig(ParquetReaderConfig.class);
         configBinder(binder).bindConfig(ParquetWriterConfig.class);
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveNodePartitioningProvider.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveNodePartitioningProvider.java
index ec4acee44ee7..20331da8df4d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveNodePartitioningProvider.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveNodePartitioningProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.hive;
 
+import com.google.inject.Inject;
 import io.trino.spi.NodeManager;
 import io.trino.spi.connector.BucketFunction;
 import io.trino.spi.connector.ConnectorBucketNodeMap;
@@ -25,8 +26,6 @@
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeOperators;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.function.ToIntFunction;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSink.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSink.java
index 3a98e9bf9937..c703ea951feb 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSink.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSink.java
@@ -19,10 +19,8 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
-import io.airlift.concurrent.MoreFutures;
 import io.airlift.json.JsonCodec;
 import io.airlift.slice.Slice;
-import io.trino.hdfs.HdfsEnvironment;
 import io.trino.plugin.hive.util.HiveBucketing.BucketingVersion;
 import io.trino.spi.Page;
 import io.trino.spi.PageIndexer;
@@ -48,16 +46,17 @@
 import java.util.OptionalInt;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executors;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static io.airlift.concurrent.MoreFutures.toCompletableFuture;
 import static io.airlift.slice.Slices.wrappedBuffer;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_TOO_MANY_OPEN_PARTITIONS;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_CLOSE_ERROR;
 import static io.trino.spi.type.IntegerType.INTEGER;
+import static java.lang.Math.min;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
@@ -77,7 +76,6 @@ public class HivePageSink
     private final HiveBucketFunction bucketFunction;
 
     private final HiveWriterPagePartitioner pagePartitioner;
-    private final HdfsEnvironment hdfsEnvironment;
 
     private final int maxOpenWriters;
     private final ListeningExecutorService writeVerificationExecutor;
@@ -86,8 +84,6 @@ public class HivePageSink
 
     private final List<HiveWriter> writers = new ArrayList<>();
 
-    private final ConnectorSession session;
-
     private final long targetMaxFileSize;
     private final List<Closeable> closedWriterRollbackActions = new ArrayList<>();
     private final List<Slice> partitionUpdates = new ArrayList<>();
@@ -105,7 +101,6 @@ public HivePageSink(
             boolean isTransactional,
             Optional<HiveBucketProperty> bucketProperty,
             PageIndexerFactory pageIndexerFactory,
-            HdfsEnvironment hdfsEnvironment,
             int maxOpenWriters,
             ListeningExecutorService writeVerificationExecutor,
             JsonCodec<PartitionUpdate> partitionUpdateCodec,
@@ -118,7 +113,6 @@ public HivePageSink(
         requireNonNull(pageIndexerFactory, "pageIndexerFactory is null");
 
         this.isTransactional = isTransactional;
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
         this.maxOpenWriters = maxOpenWriters;
         this.writeVerificationExecutor = requireNonNull(writeVerificationExecutor, "writeVerificationExecutor is null");
         this.partitionUpdateCodec = requireNonNull(partitionUpdateCodec, "partitionUpdateCodec is null");
@@ -166,7 +160,6 @@ public HivePageSink(
             bucketFunction = null;
         }
 
-        this.session = requireNonNull(session, "session is null");
         this.targetMaxFileSize = HiveSessionProperties.getTargetMaxFileSize(session).toBytes();
     }
 
@@ -191,13 +184,7 @@ public long getValidationCpuNanos()
     @Override
     public CompletableFuture<Collection<Slice>> finish()
     {
-        // Must be wrapped in doAs entirely
-        // Implicit FileSystem initializations are possible in HiveRecordWriter#commit -> RecordWriter#close
-        ListenableFuture<Collection<Slice>> result = hdfsEnvironment.doAs(
-                session.getIdentity(),
-                isMergeSink ? this::doMergeSinkFinish : this::doInsertSinkFinish);
-
-        return MoreFutures.toCompletableFuture(result);
+        return toCompletableFuture(isMergeSink ? doMergeSinkFinish() : doInsertSinkFinish());
     }
 
     private ListenableFuture<Collection<Slice>> doMergeSinkFinish()
@@ -243,13 +230,6 @@ private ListenableFuture<Collection<Slice>> doInsertSinkFinish()
 
     @Override
     public void abort()
-    {
-        // Must be wrapped in doAs entirely
-        // Implicit FileSystem initializations are possible in HiveRecordWriter#rollback -> RecordWriter#close
-        hdfsEnvironment.doAs(session.getIdentity(), this::doAbort);
-    }
-
-    private void doAbort()
     {
         List<Closeable> rollbackActions = Streams.concat(
                         writers.stream()
@@ -278,24 +258,13 @@ private void doAbort()
     @Override
     public CompletableFuture<?> appendPage(Page page)
     {
-        if (page.getPositionCount() > 0) {
-            // Must be wrapped in doAs entirely
-            // Implicit FileSystem initializations are possible in HiveRecordWriter#addRow or #createWriter
-            hdfsEnvironment.doAs(session.getIdentity(), () -> doAppend(page));
-        }
-
-        return NOT_BLOCKED;
-    }
-
-    private void doAppend(Page page)
-    {
-        while (page.getPositionCount() > MAX_PAGE_POSITIONS) {
-            Page chunk = page.getRegion(0, MAX_PAGE_POSITIONS);
-            page = page.getRegion(MAX_PAGE_POSITIONS, page.getPositionCount() - MAX_PAGE_POSITIONS);
+        int writeOffset = 0;
+        while (writeOffset < page.getPositionCount()) {
+            Page chunk = page.getRegion(writeOffset, min(page.getPositionCount() - writeOffset, MAX_PAGE_POSITIONS));
+            writeOffset += chunk.getPositionCount();
             writePage(chunk);
         }
-
-        writePage(page);
+        return NOT_BLOCKED;
     }
 
     private void writePage(Page page)
@@ -367,9 +336,6 @@ private void closeWriter(int writerIndex)
 
         PartitionUpdate partitionUpdate = writer.getPartitionUpdate();
         partitionUpdates.add(wrappedBuffer(partitionUpdateCodec.toJsonBytes(partitionUpdate)));
-        writer.getVerificationTask()
-                .map(Executors::callable)
-                .ifPresent(verificationTasks::add);
     }
 
     private int[] getWriterIndexes(Page page)
@@ -403,7 +369,7 @@ private int[] getWriterIndexes(Page page)
 
             OptionalInt bucketNumber = OptionalInt.empty();
             if (bucketBlock != null) {
-                bucketNumber = OptionalInt.of((int) INTEGER.getLong(bucketBlock, position));
+                bucketNumber = OptionalInt.of(INTEGER.getInt(bucketBlock, position));
             }
 
             writer = writerFactory.createWriter(partitionColumns, position, bucketNumber);
@@ -440,7 +406,7 @@ private Block buildBucketBlock(Page page)
         Page bucketColumnsPage = extractColumns(page, bucketColumns);
         for (int position = 0; position < page.getPositionCount(); position++) {
             int bucket = bucketFunction.getBucket(bucketColumnsPage, position);
-            bucketColumnBuilder.writeInt(bucket);
+            INTEGER.writeInt(bucketColumnBuilder, bucket);
         }
         return bucketColumnBuilder.build();
     }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSinkProvider.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSinkProvider.java
index 6c0ee6dc19c1..e772b27ad6ca 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSinkProvider.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSinkProvider.java
@@ -17,11 +17,11 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.inject.Inject;
 import io.airlift.event.client.EventClient;
 import io.airlift.json.JsonCodec;
 import io.airlift.units.DataSize;
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.hdfs.HdfsEnvironment;
 import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
 import io.trino.plugin.hive.metastore.HivePageSinkMetadataProvider;
 import io.trino.plugin.hive.metastore.SortingColumn;
@@ -39,9 +39,6 @@
 import io.trino.spi.connector.ConnectorTableExecuteHandle;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.type.TypeManager;
-import org.joda.time.DateTimeZone;
-
-import javax.inject.Inject;
 
 import java.util.List;
 import java.util.Map;
@@ -61,7 +58,6 @@ public class HivePageSinkProvider
 {
     private final Set<HiveFileWriterFactory> fileWriterFactories;
     private final TrinoFileSystemFactory fileSystemFactory;
-    private final HdfsEnvironment hdfsEnvironment;
     private final PageSorter pageSorter;
     private final HiveMetastoreFactory metastoreFactory;
     private final PageIndexerFactory pageIndexerFactory;
@@ -77,13 +73,13 @@ public class HivePageSinkProvider
     private final HiveSessionProperties hiveSessionProperties;
     private final HiveWriterStats hiveWriterStats;
     private final long perTransactionMetastoreCacheMaximumSize;
-    private final DateTimeZone parquetTimeZone;
+    private final boolean temporaryStagingDirectoryDirectoryEnabled;
+    private final String temporaryStagingDirectoryPath;
 
     @Inject
     public HivePageSinkProvider(
             Set<HiveFileWriterFactory> fileWriterFactories,
             TrinoFileSystemFactory fileSystemFactory,
-            HdfsEnvironment hdfsEnvironment,
             PageSorter pageSorter,
             HiveMetastoreFactory metastoreFactory,
             PageIndexerFactory pageIndexerFactory,
@@ -99,7 +95,6 @@ public HivePageSinkProvider(
     {
         this.fileWriterFactories = ImmutableSet.copyOf(requireNonNull(fileWriterFactories, "fileWriterFactories is null"));
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
         this.pageSorter = requireNonNull(pageSorter, "pageSorter is null");
         this.metastoreFactory = requireNonNull(metastoreFactory, "metastoreFactory is null");
         this.pageIndexerFactory = requireNonNull(pageIndexerFactory, "pageIndexerFactory is null");
@@ -115,7 +110,8 @@ public HivePageSinkProvider(
         this.hiveSessionProperties = requireNonNull(hiveSessionProperties, "hiveSessionProperties is null");
         this.hiveWriterStats = requireNonNull(hiveWriterStats, "hiveWriterStats is null");
         this.perTransactionMetastoreCacheMaximumSize = config.getPerTransactionMetastoreCacheMaximumSize();
-        this.parquetTimeZone = config.getParquetDateTimeZone();
+        this.temporaryStagingDirectoryDirectoryEnabled = config.isTemporaryStagingDirectoryEnabled();
+        this.temporaryStagingDirectoryPath = config.getTemporaryStagingDirectoryPath();
     }
 
     @Override
@@ -178,16 +174,16 @@ private HivePageSink createPageSink(HiveWritableTableHandle handle, boolean isCr
                         handle.getPageSinkMetadata(),
                         new HiveMetastoreClosure(memoizeMetastore(metastoreFactory.createMetastore(Optional.of(session.getIdentity())), perTransactionMetastoreCacheMaximumSize))),
                 typeManager,
-                hdfsEnvironment,
                 pageSorter,
                 writerSortBufferSize,
                 maxOpenSortFiles,
-                parquetTimeZone,
                 session,
                 nodeManager,
                 eventClient,
                 hiveSessionProperties,
-                hiveWriterStats);
+                hiveWriterStats,
+                temporaryStagingDirectoryDirectoryEnabled,
+                temporaryStagingDirectoryPath);
 
         return new HivePageSink(
                 handle,
@@ -196,7 +192,6 @@ private HivePageSink createPageSink(HiveWritableTableHandle handle, boolean isCr
                 handle.isTransactional(),
                 handle.getBucketProperty(),
                 pageIndexerFactory,
-                hdfsEnvironment,
                 maxOpenPartitions,
                 writeVerificationExecutor,
                 partitionUpdateCodec,
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSource.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSource.java
index aba96d2ee229..9946d06940f9 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSource.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSource.java
@@ -14,47 +14,25 @@
 package io.trino.plugin.hive;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.HivePageSourceProvider.BucketAdaptation;
 import io.trino.plugin.hive.HivePageSourceProvider.ColumnMapping;
-import io.trino.plugin.hive.coercions.CharCoercer;
-import io.trino.plugin.hive.coercions.DoubleToFloatCoercer;
-import io.trino.plugin.hive.coercions.FloatToDoubleCoercer;
-import io.trino.plugin.hive.coercions.IntegerNumberToVarcharCoercer;
-import io.trino.plugin.hive.coercions.IntegerNumberUpscaleCoercer;
-import io.trino.plugin.hive.coercions.VarcharCoercer;
-import io.trino.plugin.hive.coercions.VarcharToIntegerNumberCoercer;
-import io.trino.plugin.hive.type.Category;
-import io.trino.plugin.hive.type.ListTypeInfo;
-import io.trino.plugin.hive.type.MapTypeInfo;
+import io.trino.plugin.hive.coercions.CoercionUtils.CoercionContext;
+import io.trino.plugin.hive.coercions.TypeCoercer;
 import io.trino.plugin.hive.type.TypeInfo;
 import io.trino.plugin.hive.util.HiveBucketing.BucketingVersion;
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.ArrayBlock;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.ColumnarArray;
-import io.trino.spi.block.ColumnarMap;
-import io.trino.spi.block.ColumnarRow;
-import io.trino.spi.block.DictionaryBlock;
 import io.trino.spi.block.LazyBlock;
 import io.trino.spi.block.LazyBlockLoader;
-import io.trino.spi.block.RowBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.connector.ConnectorPageSource;
-import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.metrics.Metrics;
-import io.trino.spi.type.ArrayType;
-import io.trino.spi.type.CharType;
-import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.MapType;
-import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
-import io.trino.spi.type.VarcharType;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
-import org.apache.hadoop.fs.Path;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -73,26 +51,8 @@
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_BUCKET_FILES;
 import static io.trino.plugin.hive.HivePageSourceProvider.ColumnMappingKind.EMPTY;
 import static io.trino.plugin.hive.HivePageSourceProvider.ColumnMappingKind.PREFILLED;
-import static io.trino.plugin.hive.HiveType.HIVE_BYTE;
-import static io.trino.plugin.hive.HiveType.HIVE_DOUBLE;
-import static io.trino.plugin.hive.HiveType.HIVE_FLOAT;
-import static io.trino.plugin.hive.HiveType.HIVE_INT;
-import static io.trino.plugin.hive.HiveType.HIVE_LONG;
-import static io.trino.plugin.hive.HiveType.HIVE_SHORT;
-import static io.trino.plugin.hive.coercions.DecimalCoercers.createDecimalToDecimalCoercer;
-import static io.trino.plugin.hive.coercions.DecimalCoercers.createDecimalToDoubleCoercer;
-import static io.trino.plugin.hive.coercions.DecimalCoercers.createDecimalToRealCoercer;
-import static io.trino.plugin.hive.coercions.DecimalCoercers.createDecimalToVarcharCoercer;
-import static io.trino.plugin.hive.coercions.DecimalCoercers.createDoubleToDecimalCoercer;
-import static io.trino.plugin.hive.coercions.DecimalCoercers.createRealToDecimalCoercer;
+import static io.trino.plugin.hive.coercions.CoercionUtils.createCoercer;
 import static io.trino.plugin.hive.util.HiveBucketing.getHiveBucket;
-import static io.trino.plugin.hive.util.HiveUtil.extractStructFieldTypes;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static io.trino.spi.block.ColumnarArray.toColumnarArray;
-import static io.trino.spi.block.ColumnarMap.toColumnarMap;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
-import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.RealType.REAL;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
@@ -108,7 +68,7 @@ public class HivePageSource
     private final Optional<BucketValidator> bucketValidator;
     private final Object[] prefilledValues;
     private final Type[] types;
-    private final List<Optional<Function<Block, Block>>> coercers;
+    private final List<Optional<TypeCoercer<? extends Type, ? extends Type>>> coercers;
     private final Optional<ReaderProjectionsAdapter> projectionsAdapter;
 
     private final ConnectorPageSource delegate;
@@ -119,10 +79,12 @@ public HivePageSource(
             Optional<BucketValidator> bucketValidator,
             Optional<ReaderProjectionsAdapter> projectionsAdapter,
             TypeManager typeManager,
+            CoercionContext coercionContext,
             ConnectorPageSource delegate)
     {
         requireNonNull(columnMappings, "columnMappings is null");
         requireNonNull(typeManager, "typeManager is null");
+        requireNonNull(coercionContext, "coercionContext is null");
 
         this.delegate = requireNonNull(delegate, "delegate is null");
         this.columnMappings = columnMappings;
@@ -135,7 +97,7 @@ public HivePageSource(
 
         prefilledValues = new Object[size];
         types = new Type[size];
-        ImmutableList.Builder<Optional<Function<Block, Block>>> coercers = ImmutableList.builder();
+        ImmutableList.Builder<Optional<TypeCoercer<? extends Type, ? extends Type>>> coercers = ImmutableList.builder();
 
         for (int columnIndex = 0; columnIndex < size; columnIndex++) {
             ColumnMapping columnMapping = columnMappings.get(columnIndex);
@@ -150,7 +112,7 @@ public HivePageSource(
                         .orElse(ImmutableList.of());
                 HiveType fromType = columnMapping.getBaseTypeCoercionFrom().get().getHiveTypeForDereferences(dereferenceIndices).get();
                 HiveType toType = columnMapping.getHiveColumnHandle().getHiveType();
-                coercers.add(createCoercer(typeManager, fromType, toType));
+                coercers.add(createCoercer(typeManager, fromType, toType, coercionContext));
             }
             else {
                 coercers.add(Optional.empty());
@@ -227,7 +189,7 @@ public Page getNextPage()
                     case REGULAR:
                     case SYNTHESIZED:
                         Block block = dataPage.getBlock(columnMapping.getIndex());
-                        Optional<Function<Block, Block>> coercer = coercers.get(fieldId);
+                        Optional<TypeCoercer<? extends Type, ? extends Type>> coercer = coercers.get(fieldId);
                         if (coercer.isPresent()) {
                             block = new LazyBlock(batchSize, new CoercionLazyBlockLoader(block, coercer.get()));
                         }
@@ -294,224 +256,6 @@ public ConnectorPageSource getPageSource()
         return delegate;
     }
 
-    private static Optional<Function<Block, Block>> createCoercer(TypeManager typeManager, HiveType fromHiveType, HiveType toHiveType)
-    {
-        if (fromHiveType.equals(toHiveType)) {
-            return Optional.empty();
-        }
-
-        Type fromType = fromHiveType.getType(typeManager);
-        Type toType = toHiveType.getType(typeManager);
-
-        if (toType instanceof VarcharType toVarcharType && (fromHiveType.equals(HIVE_BYTE) || fromHiveType.equals(HIVE_SHORT) || fromHiveType.equals(HIVE_INT) || fromHiveType.equals(HIVE_LONG))) {
-            return Optional.of(new IntegerNumberToVarcharCoercer<>(fromType, toVarcharType));
-        }
-        if (fromType instanceof VarcharType fromVarcharType && (toHiveType.equals(HIVE_BYTE) || toHiveType.equals(HIVE_SHORT) || toHiveType.equals(HIVE_INT) || toHiveType.equals(HIVE_LONG))) {
-            return Optional.of(new VarcharToIntegerNumberCoercer<>(fromVarcharType, toType));
-        }
-        if (fromType instanceof VarcharType fromVarcharType && toType instanceof VarcharType toVarcharType) {
-            if (narrowerThan(toVarcharType, fromVarcharType)) {
-                return Optional.of(new VarcharCoercer(fromVarcharType, toVarcharType));
-            }
-            return Optional.empty();
-        }
-        if (fromType instanceof CharType fromCharType && toType instanceof CharType toCharType) {
-            if (narrowerThan(toCharType, fromCharType)) {
-                return Optional.of(new CharCoercer(fromCharType, toCharType));
-            }
-            return Optional.empty();
-        }
-        if (fromHiveType.equals(HIVE_BYTE) && (toHiveType.equals(HIVE_SHORT) || toHiveType.equals(HIVE_INT) || toHiveType.equals(HIVE_LONG))) {
-            return Optional.of(new IntegerNumberUpscaleCoercer<>(fromType, toType));
-        }
-        if (fromHiveType.equals(HIVE_SHORT) && (toHiveType.equals(HIVE_INT) || toHiveType.equals(HIVE_LONG))) {
-            return Optional.of(new IntegerNumberUpscaleCoercer<>(fromType, toType));
-        }
-        if (fromHiveType.equals(HIVE_INT) && toHiveType.equals(HIVE_LONG)) {
-            return Optional.of(new IntegerNumberUpscaleCoercer<>(fromType, toType));
-        }
-        if (fromHiveType.equals(HIVE_FLOAT) && toHiveType.equals(HIVE_DOUBLE)) {
-            return Optional.of(new FloatToDoubleCoercer());
-        }
-        if (fromHiveType.equals(HIVE_DOUBLE) && toHiveType.equals(HIVE_FLOAT)) {
-            return Optional.of(new DoubleToFloatCoercer());
-        }
-        if (fromType instanceof DecimalType fromDecimalType && toType instanceof DecimalType toDecimalType) {
-            return Optional.of(createDecimalToDecimalCoercer(fromDecimalType, toDecimalType));
-        }
-        if (fromType instanceof DecimalType fromDecimalType && toType == DOUBLE) {
-            return Optional.of(createDecimalToDoubleCoercer(fromDecimalType));
-        }
-        if (fromType instanceof DecimalType fromDecimalType && toType == REAL) {
-            return Optional.of(createDecimalToRealCoercer(fromDecimalType));
-        }
-        if (fromType instanceof DecimalType fromDecimalType && toType instanceof VarcharType toVarcharType) {
-            return Optional.of(createDecimalToVarcharCoercer(fromDecimalType, toVarcharType));
-        }
-        if (fromType == DOUBLE && toType instanceof DecimalType toDecimalType) {
-            return Optional.of(createDoubleToDecimalCoercer(toDecimalType));
-        }
-        if (fromType == REAL && toType instanceof DecimalType toDecimalType) {
-            return Optional.of(createRealToDecimalCoercer(toDecimalType));
-        }
-        if ((fromType instanceof ArrayType) && (toType instanceof ArrayType)) {
-            return Optional.of(new ListCoercer(typeManager, fromHiveType, toHiveType));
-        }
-        if ((fromType instanceof MapType) && (toType instanceof MapType)) {
-            return Optional.of(new MapCoercer(typeManager, fromHiveType, toHiveType));
-        }
-        if ((fromType instanceof RowType) && (toType instanceof RowType)) {
-            HiveType fromHiveTypeStruct = (fromHiveType.getCategory() == Category.UNION) ? HiveType.toHiveType(fromType) : fromHiveType;
-            HiveType toHiveTypeStruct = (toHiveType.getCategory() == Category.UNION) ? HiveType.toHiveType(toType) : toHiveType;
-
-            return Optional.of(new StructCoercer(typeManager, fromHiveTypeStruct, toHiveTypeStruct));
-        }
-
-        throw new TrinoException(NOT_SUPPORTED, format("Unsupported coercion from %s to %s", fromHiveType, toHiveType));
-    }
-
-    public static boolean narrowerThan(VarcharType first, VarcharType second)
-    {
-        requireNonNull(first, "first is null");
-        requireNonNull(second, "second is null");
-        if (first.isUnbounded() || second.isUnbounded()) {
-            return !first.isUnbounded();
-        }
-        return first.getBoundedLength() < second.getBoundedLength();
-    }
-
-    public static boolean narrowerThan(CharType first, CharType second)
-    {
-        requireNonNull(first, "first is null");
-        requireNonNull(second, "second is null");
-        return first.getLength() < second.getLength();
-    }
-
-    private static class ListCoercer
-            implements Function<Block, Block>
-    {
-        private final Optional<Function<Block, Block>> elementCoercer;
-
-        public ListCoercer(TypeManager typeManager, HiveType fromHiveType, HiveType toHiveType)
-        {
-            requireNonNull(typeManager, "typeManager is null");
-            requireNonNull(fromHiveType, "fromHiveType is null");
-            requireNonNull(toHiveType, "toHiveType is null");
-            HiveType fromElementHiveType = HiveType.valueOf(((ListTypeInfo) fromHiveType.getTypeInfo()).getListElementTypeInfo().getTypeName());
-            HiveType toElementHiveType = HiveType.valueOf(((ListTypeInfo) toHiveType.getTypeInfo()).getListElementTypeInfo().getTypeName());
-            this.elementCoercer = createCoercer(typeManager, fromElementHiveType, toElementHiveType);
-        }
-
-        @Override
-        public Block apply(Block block)
-        {
-            if (elementCoercer.isEmpty()) {
-                return block;
-            }
-            ColumnarArray arrayBlock = toColumnarArray(block);
-            Block elementsBlock = elementCoercer.get().apply(arrayBlock.getElementsBlock());
-            boolean[] valueIsNull = new boolean[arrayBlock.getPositionCount()];
-            int[] offsets = new int[arrayBlock.getPositionCount() + 1];
-            for (int i = 0; i < arrayBlock.getPositionCount(); i++) {
-                valueIsNull[i] = arrayBlock.isNull(i);
-                offsets[i + 1] = offsets[i] + arrayBlock.getLength(i);
-            }
-            return ArrayBlock.fromElementBlock(arrayBlock.getPositionCount(), Optional.of(valueIsNull), offsets, elementsBlock);
-        }
-    }
-
-    private static class MapCoercer
-            implements Function<Block, Block>
-    {
-        private final Type toType;
-        private final Optional<Function<Block, Block>> keyCoercer;
-        private final Optional<Function<Block, Block>> valueCoercer;
-
-        public MapCoercer(TypeManager typeManager, HiveType fromHiveType, HiveType toHiveType)
-        {
-            requireNonNull(typeManager, "typeManager is null");
-            requireNonNull(fromHiveType, "fromHiveType is null");
-            this.toType = toHiveType.getType(typeManager);
-            HiveType fromKeyHiveType = HiveType.valueOf(((MapTypeInfo) fromHiveType.getTypeInfo()).getMapKeyTypeInfo().getTypeName());
-            HiveType fromValueHiveType = HiveType.valueOf(((MapTypeInfo) fromHiveType.getTypeInfo()).getMapValueTypeInfo().getTypeName());
-            HiveType toKeyHiveType = HiveType.valueOf(((MapTypeInfo) toHiveType.getTypeInfo()).getMapKeyTypeInfo().getTypeName());
-            HiveType toValueHiveType = HiveType.valueOf(((MapTypeInfo) toHiveType.getTypeInfo()).getMapValueTypeInfo().getTypeName());
-            this.keyCoercer = createCoercer(typeManager, fromKeyHiveType, toKeyHiveType);
-            this.valueCoercer = createCoercer(typeManager, fromValueHiveType, toValueHiveType);
-        }
-
-        @Override
-        public Block apply(Block block)
-        {
-            ColumnarMap mapBlock = toColumnarMap(block);
-            Block keysBlock = keyCoercer.isEmpty() ? mapBlock.getKeysBlock() : keyCoercer.get().apply(mapBlock.getKeysBlock());
-            Block valuesBlock = valueCoercer.isEmpty() ? mapBlock.getValuesBlock() : valueCoercer.get().apply(mapBlock.getValuesBlock());
-            boolean[] valueIsNull = new boolean[mapBlock.getPositionCount()];
-            int[] offsets = new int[mapBlock.getPositionCount() + 1];
-            for (int i = 0; i < mapBlock.getPositionCount(); i++) {
-                valueIsNull[i] = mapBlock.isNull(i);
-                offsets[i + 1] = offsets[i] + mapBlock.getEntryCount(i);
-            }
-            return ((MapType) toType).createBlockFromKeyValue(Optional.of(valueIsNull), offsets, keysBlock, valuesBlock);
-        }
-    }
-
-    private static class StructCoercer
-            implements Function<Block, Block>
-    {
-        private final List<Optional<Function<Block, Block>>> coercers;
-        private final Block[] nullBlocks;
-
-        public StructCoercer(TypeManager typeManager, HiveType fromHiveType, HiveType toHiveType)
-        {
-            requireNonNull(typeManager, "typeManager is null");
-            requireNonNull(fromHiveType, "fromHiveType is null");
-            requireNonNull(toHiveType, "toHiveType is null");
-            List<HiveType> fromFieldTypes = extractStructFieldTypes(fromHiveType);
-            List<HiveType> toFieldTypes = extractStructFieldTypes(toHiveType);
-            ImmutableList.Builder<Optional<Function<Block, Block>>> coercers = ImmutableList.builder();
-            this.nullBlocks = new Block[toFieldTypes.size()];
-            for (int i = 0; i < toFieldTypes.size(); i++) {
-                if (i >= fromFieldTypes.size()) {
-                    nullBlocks[i] = toFieldTypes.get(i).getType(typeManager).createBlockBuilder(null, 1).appendNull().build();
-                    coercers.add(Optional.empty());
-                }
-                else {
-                    coercers.add(createCoercer(typeManager, fromFieldTypes.get(i), toFieldTypes.get(i)));
-                }
-            }
-            this.coercers = coercers.build();
-        }
-
-        @Override
-        public Block apply(Block block)
-        {
-            ColumnarRow rowBlock = toColumnarRow(block);
-            Block[] fields = new Block[coercers.size()];
-            int[] ids = new int[rowBlock.getField(0).getPositionCount()];
-            for (int i = 0; i < coercers.size(); i++) {
-                Optional<Function<Block, Block>> coercer = coercers.get(i);
-                if (coercer.isPresent()) {
-                    fields[i] = coercer.get().apply(rowBlock.getField(i));
-                }
-                else if (i < rowBlock.getFieldCount()) {
-                    fields[i] = rowBlock.getField(i);
-                }
-                else {
-                    fields[i] = DictionaryBlock.create(ids.length, nullBlocks[i], ids);
-                }
-            }
-            boolean[] valueIsNull = null;
-            if (rowBlock.mayHaveNull()) {
-                valueIsNull = new boolean[rowBlock.getPositionCount()];
-                for (int i = 0; i < rowBlock.getPositionCount(); i++) {
-                    valueIsNull[i] = rowBlock.isNull(i);
-                }
-            }
-            return RowBlock.fromFieldBlocks(rowBlock.getPositionCount(), Optional.ofNullable(valueIsNull), fields);
-        }
-    }
-
     private static final class CoercionLazyBlockLoader
             implements LazyBlockLoader
     {
@@ -590,7 +334,7 @@ public static class BucketValidator
         // validate every ~100 rows but using a prime number
         public static final int VALIDATION_STRIDE = 97;
 
-        private final Path path;
+        private final Location path;
         private final int[] bucketColumnIndices;
         private final List<TypeInfo> bucketColumnTypes;
         private final BucketingVersion bucketingVersion;
@@ -598,7 +342,7 @@ public static class BucketValidator
         private final int expectedBucket;
 
         public BucketValidator(
-                Path path,
+                Location path,
                 int[] bucketColumnIndices,
                 List<TypeInfo> bucketColumnTypes,
                 BucketingVersion bucketingVersion,
@@ -625,20 +369,5 @@ public void validate(Page page)
                 }
             }
         }
-
-        public RecordCursor wrapRecordCursor(RecordCursor delegate, TypeManager typeManager)
-        {
-            return new HiveBucketValidationRecordCursor(
-                    path,
-                    bucketColumnIndices,
-                    bucketColumnTypes.stream()
-                            .map(HiveType::toHiveType)
-                            .collect(toImmutableList()),
-                    bucketingVersion,
-                    bucketCount,
-                    expectedBucket,
-                    typeManager,
-                    delegate);
-        }
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSourceFactory.java
index 768893c7b80e..308fcb58b915 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSourceFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSourceFactory.java
@@ -13,11 +13,10 @@
  */
 package io.trino.plugin.hive;
 
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.acid.AcidTransaction;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.predicate.TupleDomain;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
 
 import java.util.List;
 import java.util.Optional;
@@ -27,9 +26,8 @@
 public interface HivePageSourceFactory
 {
     Optional<ReaderPageSource> createPageSource(
-            Configuration configuration,
             ConnectorSession session,
-            Path path,
+            Location path,
             long start,
             long length,
             long estimatedFileSize,
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSourceProvider.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSourceProvider.java
index 07d11c5f3ef8..113c17480f31 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSourceProvider.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePageSourceProvider.java
@@ -13,20 +13,20 @@
  */
 package io.trino.plugin.hive;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import io.trino.hdfs.HdfsContext;
-import io.trino.hdfs.HdfsEnvironment;
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.HivePageSource.BucketValidator;
-import io.trino.plugin.hive.HiveRecordCursorProvider.ReaderRecordCursorWithProjections;
 import io.trino.plugin.hive.HiveSplit.BucketConversion;
 import io.trino.plugin.hive.HiveSplit.BucketValidation;
 import io.trino.plugin.hive.acid.AcidTransaction;
+import io.trino.plugin.hive.coercions.CoercionUtils.CoercionContext;
 import io.trino.plugin.hive.type.TypeInfo;
 import io.trino.plugin.hive.util.HiveBucketing.BucketingVersion;
+import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorPageSourceProvider;
@@ -36,17 +36,10 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.EmptyPageSource;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.connector.RecordPageSource;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-
-import javax.inject.Inject;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -58,21 +51,27 @@
 import java.util.OptionalInt;
 import java.util.Properties;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.Maps.uniqueIndex;
-import static io.trino.plugin.hive.AbstractHiveAcidWriters.ORIGINAL_FILE_PATH_MATCHER;
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.PARTITION_KEY;
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.SYNTHESIZED;
 import static io.trino.plugin.hive.HiveColumnHandle.isRowIdColumnHandle;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_UNSUPPORTED_FORMAT;
 import static io.trino.plugin.hive.HivePageSourceProvider.ColumnMapping.toColumnHandles;
 import static io.trino.plugin.hive.HivePageSourceProvider.ColumnMappingKind.PREFILLED;
+import static io.trino.plugin.hive.HiveSessionProperties.getTimestampPrecision;
+import static io.trino.plugin.hive.coercions.CoercionUtils.createTypeFromCoercer;
 import static io.trino.plugin.hive.util.HiveBucketing.HiveBucketFilter;
 import static io.trino.plugin.hive.util.HiveBucketing.getHiveBucketFilter;
+import static io.trino.plugin.hive.util.HiveClassNames.ORC_SERDE_CLASS;
+import static io.trino.plugin.hive.util.HiveUtil.getDeserializerClassName;
+import static io.trino.plugin.hive.util.HiveUtil.getInputFormatName;
 import static io.trino.plugin.hive.util.HiveUtil.getPrefilledColumnValue;
 import static java.util.Objects.requireNonNull;
 import static java.util.function.Function.identity;
@@ -81,29 +80,19 @@
 public class HivePageSourceProvider
         implements ConnectorPageSourceProvider
 {
+    // The original file path looks like this: /root/dir/nnnnnnn_m(_copy_ccc)?
+    private static final Pattern ORIGINAL_FILE_PATH_MATCHER = Pattern.compile("(?s)(?<rootDir>.*)/(?<filename>(?<bucketNumber>\\d+)_(?<rest>.*)?)$");
+
     private final TypeManager typeManager;
-    private final HdfsEnvironment hdfsEnvironment;
     private final int domainCompactionThreshold;
     private final Set<HivePageSourceFactory> pageSourceFactories;
-    private final Set<HiveRecordCursorProvider> cursorProviders;
 
     @Inject
-    public HivePageSourceProvider(
-            TypeManager typeManager,
-            HdfsEnvironment hdfsEnvironment,
-            HiveConfig hiveConfig,
-            Set<HivePageSourceFactory> pageSourceFactories,
-            Set<HiveRecordCursorProvider> cursorProviders,
-            GenericHiveRecordCursorProvider genericCursorProvider)
+    public HivePageSourceProvider(TypeManager typeManager, HiveConfig hiveConfig, Set<HivePageSourceFactory> pageSourceFactories)
     {
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
         this.domainCompactionThreshold = hiveConfig.getDomainCompactionThreshold();
         this.pageSourceFactories = ImmutableSet.copyOf(requireNonNull(pageSourceFactories, "pageSourceFactories is null"));
-        this.cursorProviders = ImmutableSet.<HiveRecordCursorProvider>builder()
-                .addAll(requireNonNull(cursorProviders, "cursorProviders is null"))
-                .add(genericCursorProvider) // generic should be last, as a fallback option
-                .build();
     }
 
     @Override
@@ -126,16 +115,15 @@ public ConnectorPageSource createPageSource(
                 .map(HiveColumnHandle.class::cast)
                 .collect(toList());
 
-        Path path = new Path(hiveSplit.getPath());
-        boolean originalFile = ORIGINAL_FILE_PATH_MATCHER.matcher(path.toString()).matches();
+        boolean originalFile = ORIGINAL_FILE_PATH_MATCHER.matcher(hiveSplit.getPath()).matches();
 
         List<ColumnMapping> columnMappings = ColumnMapping.buildColumnMappings(
                 hiveSplit.getPartitionName(),
                 hiveSplit.getPartitionKeys(),
                 hiveColumns,
-                hiveSplit.getBucketConversion().map(BucketConversion::getBucketColumnHandles).orElse(ImmutableList.of()),
+                hiveSplit.getBucketConversion().map(BucketConversion::bucketColumnHandles).orElse(ImmutableList.of()),
                 hiveSplit.getTableToPartitionMapping(),
-                path,
+                hiveSplit.getPath(),
                 hiveSplit.getTableBucketNumber(),
                 hiveSplit.getEstimatedFileSize(),
                 hiveSplit.getFileModifiedTime());
@@ -146,28 +134,21 @@ public ConnectorPageSource createPageSource(
             return new EmptyPageSource();
         }
 
-        Configuration configuration = hdfsEnvironment.getConfiguration(new HdfsContext(session), path);
-
-        TupleDomain<HiveColumnHandle> simplifiedDynamicFilter = dynamicFilter
-                .getCurrentPredicate()
-                .transformKeys(HiveColumnHandle.class::cast).simplify(domainCompactionThreshold);
         Optional<ConnectorPageSource> pageSource = createHivePageSource(
                 pageSourceFactories,
-                cursorProviders,
-                configuration,
                 session,
-                path,
+                Location.of(hiveSplit.getPath()),
                 hiveSplit.getTableBucketNumber(),
                 hiveSplit.getStart(),
                 hiveSplit.getLength(),
                 hiveSplit.getEstimatedFileSize(),
                 hiveSplit.getSchema(),
-                hiveTable.getCompactEffectivePredicate().intersect(simplifiedDynamicFilter),
-                hiveColumns,
+                hiveTable.getCompactEffectivePredicate().intersect(
+                                dynamicFilter.getCurrentPredicate().transformKeys(HiveColumnHandle.class::cast))
+                        .simplify(domainCompactionThreshold),
                 typeManager,
                 hiveSplit.getBucketConversion(),
                 hiveSplit.getBucketValidation(),
-                hiveSplit.isS3SelectPushdownEnabled(),
                 hiveSplit.getAcidInfo(),
                 originalFile,
                 hiveTable.getTransaction(),
@@ -176,26 +157,27 @@ public ConnectorPageSource createPageSource(
         if (pageSource.isPresent()) {
             return pageSource.get();
         }
-        throw new RuntimeException("Could not find a file reader for split " + hiveSplit);
+
+        throw new TrinoException(HIVE_UNSUPPORTED_FORMAT, "Unsupported input format: serde=%s, format=%s, partition=%s, path=%s".formatted(
+                getDeserializerClassName(hiveSplit.getSchema()),
+                getInputFormatName(hiveSplit.getSchema()).orElse(null),
+                hiveSplit.getPartitionName(),
+                hiveSplit.getPath()));
     }
 
     public static Optional<ConnectorPageSource> createHivePageSource(
             Set<HivePageSourceFactory> pageSourceFactories,
-            Set<HiveRecordCursorProvider> cursorProviders,
-            Configuration configuration,
             ConnectorSession session,
-            Path path,
+            Location path,
             OptionalInt tableBucketNumber,
             long start,
             long length,
             long estimatedFileSize,
             Properties schema,
             TupleDomain<HiveColumnHandle> effectivePredicate,
-            List<HiveColumnHandle> columns,
             TypeManager typeManager,
             Optional<BucketConversion> bucketConversion,
             Optional<BucketValidation> bucketValidation,
-            boolean s3SelectPushdownEnabled,
             Optional<AcidInfo> acidInfo,
             boolean originalFile,
             AcidTransaction transaction,
@@ -210,11 +192,14 @@ public static Optional<ConnectorPageSource> createHivePageSource(
         Optional<BucketAdaptation> bucketAdaptation = createBucketAdaptation(bucketConversion, tableBucketNumber, regularAndInterimColumnMappings);
         Optional<BucketValidator> bucketValidator = createBucketValidator(path, bucketValidation, tableBucketNumber, regularAndInterimColumnMappings);
 
+        // Apache Hive reads Double.NaN as null when coerced to varchar for ORC file format
+        boolean treatNaNAsNull = ORC_SERDE_CLASS.equals(getDeserializerClassName(schema));
+        CoercionContext coercionContext = new CoercionContext(getTimestampPrecision(session), treatNaNAsNull);
+
         for (HivePageSourceFactory pageSourceFactory : pageSourceFactories) {
-            List<HiveColumnHandle> desiredColumns = toColumnHandles(regularAndInterimColumnMappings, true, typeManager);
+            List<HiveColumnHandle> desiredColumns = toColumnHandles(regularAndInterimColumnMappings, typeManager, coercionContext);
 
             Optional<ReaderPageSource> readerWithProjections = pageSourceFactory.createPageSource(
-                    configuration,
                     session,
                     path,
                     start,
@@ -243,70 +228,11 @@ public static Optional<ConnectorPageSource> createHivePageSource(
                         bucketValidator,
                         adapter,
                         typeManager,
+                        coercionContext,
                         pageSource));
             }
         }
 
-        for (HiveRecordCursorProvider provider : cursorProviders) {
-            // GenericHiveRecordCursor will automatically do the coercion without HiveCoercionRecordCursor
-            boolean doCoercion = !(provider instanceof GenericHiveRecordCursorProvider);
-
-            List<HiveColumnHandle> desiredColumns = toColumnHandles(regularAndInterimColumnMappings, doCoercion, typeManager);
-            Optional<ReaderRecordCursorWithProjections> readerWithProjections = provider.createRecordCursor(
-                    configuration,
-                    session,
-                    path,
-                    start,
-                    length,
-                    estimatedFileSize,
-                    schema,
-                    desiredColumns,
-                    effectivePredicate,
-                    typeManager,
-                    s3SelectPushdownEnabled);
-
-            if (readerWithProjections.isPresent()) {
-                RecordCursor delegate = readerWithProjections.get().getRecordCursor();
-                Optional<ReaderColumns> projections = readerWithProjections.get().getProjectedReaderColumns();
-
-                if (projections.isPresent()) {
-                    ReaderProjectionsAdapter projectionsAdapter = hiveProjectionsAdapter(desiredColumns, projections.get());
-                    delegate = new HiveReaderProjectionsAdaptingRecordCursor(delegate, projectionsAdapter);
-                }
-
-                checkArgument(acidInfo.isEmpty(), "Acid is not supported");
-
-                if (bucketAdaptation.isPresent()) {
-                    delegate = new HiveBucketAdapterRecordCursor(
-                            bucketAdaptation.get().getBucketColumnIndices(),
-                            bucketAdaptation.get().getBucketColumnHiveTypes(),
-                            bucketAdaptation.get().getBucketingVersion(),
-                            bucketAdaptation.get().getTableBucketCount(),
-                            bucketAdaptation.get().getPartitionBucketCount(),
-                            bucketAdaptation.get().getBucketToKeep(),
-                            typeManager,
-                            delegate);
-                }
-
-                // Need to wrap RcText and RcBinary into a wrapper, which will do the coercion for mismatch columns
-                if (doCoercion) {
-                    delegate = new HiveCoercionRecordCursor(regularAndInterimColumnMappings, typeManager, delegate);
-                }
-
-                // bucket adaptation already validates that data is in the right bucket
-                if (bucketAdaptation.isEmpty() && bucketValidator.isPresent()) {
-                    delegate = bucketValidator.get().wrapRecordCursor(delegate, typeManager);
-                }
-
-                HiveRecordCursor hiveRecordCursor = new HiveRecordCursor(columnMappings, delegate);
-                List<Type> columnTypes = columns.stream()
-                        .map(HiveColumnHandle::getType)
-                        .collect(toList());
-
-                return Optional.of(new RecordPageSource(columnTypes, hiveRecordCursor));
-            }
-        }
-
         return Optional.empty();
     }
 
@@ -348,8 +274,7 @@ private static ReaderProjectionsAdapter hiveProjectionsAdapter(List<HiveColumnHa
                 HivePageSourceProvider::getProjection);
     }
 
-    @VisibleForTesting
-    static List<Integer> getProjection(ColumnHandle expected, ColumnHandle read)
+    public static List<Integer> getProjection(ColumnHandle expected, ColumnHandle read)
     {
         HiveColumnHandle expectedColumn = (HiveColumnHandle) expected;
         HiveColumnHandle readColumn = (HiveColumnHandle) read;
@@ -459,7 +384,7 @@ public static List<ColumnMapping> buildColumnMappings(
                 List<HiveColumnHandle> columns,
                 List<HiveColumnHandle> requiredInterimColumns,
                 TableToPartitionMapping tableToPartitionMapping,
-                Path path,
+                String path,
                 OptionalInt bucketNumber,
                 long estimatedFileSize,
                 long fileModifiedTime)
@@ -552,12 +477,12 @@ public static List<ColumnMapping> extractRegularAndInterimColumnMappings(List<Co
                     .collect(toImmutableList());
         }
 
-        public static List<HiveColumnHandle> toColumnHandles(List<ColumnMapping> regularColumnMappings, boolean doCoercion, TypeManager typeManager)
+        public static List<HiveColumnHandle> toColumnHandles(List<ColumnMapping> regularColumnMappings, TypeManager typeManager, CoercionContext coercionContext)
         {
             return regularColumnMappings.stream()
                     .map(columnMapping -> {
                         HiveColumnHandle columnHandle = columnMapping.getHiveColumnHandle();
-                        if (!doCoercion || columnMapping.getBaseTypeCoercionFrom().isEmpty()) {
+                        if (columnMapping.getBaseTypeCoercionFrom().isEmpty()) {
                             return columnHandle;
                         }
                         HiveType fromHiveTypeBase = columnMapping.getBaseTypeCoercionFrom().get();
@@ -568,14 +493,14 @@ public static List<HiveColumnHandle> toColumnHandles(List<ColumnMapping> regular
                                     projectedColumn.getDereferenceIndices(),
                                     projectedColumn.getDereferenceNames(),
                                     fromHiveType,
-                                    fromHiveType.getType(typeManager));
+                                    createTypeFromCoercer(typeManager, fromHiveType, columnHandle.getHiveType(), coercionContext));
                         });
 
                         return new HiveColumnHandle(
                                 columnHandle.getBaseColumnName(),
                                 columnHandle.getBaseHiveColumnIndex(),
                                 fromHiveTypeBase,
-                                fromHiveTypeBase.getType(typeManager),
+                                createTypeFromCoercer(typeManager, fromHiveTypeBase, columnHandle.getBaseHiveType(), coercionContext),
                                 newColumnProjectionInfo,
                                 columnHandle.getColumnType(),
                                 columnHandle.getComment());
@@ -601,18 +526,18 @@ private static Optional<BucketAdaptation> createBucketAdaptation(Optional<Bucket
                     .collect(toList());
             Map<Integer, ColumnMapping> baseHiveColumnToBlockIndex = uniqueIndex(baseColumnMapping, mapping -> mapping.getHiveColumnHandle().getBaseHiveColumnIndex());
 
-            int[] bucketColumnIndices = conversion.getBucketColumnHandles().stream()
+            int[] bucketColumnIndices = conversion.bucketColumnHandles().stream()
                     .mapToInt(columnHandle -> baseHiveColumnToBlockIndex.get(columnHandle.getBaseHiveColumnIndex()).getIndex())
                     .toArray();
-            List<HiveType> bucketColumnHiveTypes = conversion.getBucketColumnHandles().stream()
+            List<HiveType> bucketColumnHiveTypes = conversion.bucketColumnHandles().stream()
                     .map(columnHandle -> baseHiveColumnToBlockIndex.get(columnHandle.getBaseHiveColumnIndex()).getHiveColumnHandle().getHiveType())
                     .collect(toImmutableList());
             return new BucketAdaptation(
                     bucketColumnIndices,
                     bucketColumnHiveTypes,
-                    conversion.getBucketingVersion(),
-                    conversion.getTableBucketCount(),
-                    conversion.getPartitionBucketCount(),
+                    conversion.bucketingVersion(),
+                    conversion.tableBucketCount(),
+                    conversion.partitionBucketCount(),
                     bucketNumber.getAsInt());
         });
     }
@@ -673,18 +598,18 @@ public int getBucketToKeep()
         }
     }
 
-    private static Optional<BucketValidator> createBucketValidator(Path path, Optional<BucketValidation> bucketValidation, OptionalInt bucketNumber, List<ColumnMapping> columnMappings)
+    private static Optional<BucketValidator> createBucketValidator(Location path, Optional<BucketValidation> bucketValidation, OptionalInt bucketNumber, List<ColumnMapping> columnMappings)
     {
         return bucketValidation.flatMap(validation -> {
             Map<Integer, ColumnMapping> baseHiveColumnToBlockIndex = columnMappings.stream()
                     .filter(mapping -> mapping.getHiveColumnHandle().isBaseColumn())
                     .collect(toImmutableMap(mapping -> mapping.getHiveColumnHandle().getBaseHiveColumnIndex(), identity()));
 
-            int[] bucketColumnIndices = new int[validation.getBucketColumns().size()];
+            int[] bucketColumnIndices = new int[validation.bucketColumns().size()];
 
             List<TypeInfo> bucketColumnTypes = new ArrayList<>();
-            for (int i = 0; i < validation.getBucketColumns().size(); i++) {
-                HiveColumnHandle column = validation.getBucketColumns().get(i);
+            for (int i = 0; i < validation.bucketColumns().size(); i++) {
+                HiveColumnHandle column = validation.bucketColumns().get(i);
                 ColumnMapping mapping = baseHiveColumnToBlockIndex.get(column.getBaseHiveColumnIndex());
                 if (mapping == null) {
                     // The bucket column is not read by the query, and thus invalid bucketing cannot
@@ -700,16 +625,24 @@ private static Optional<BucketValidator> createBucketValidator(Path path, Option
                     path,
                     bucketColumnIndices,
                     bucketColumnTypes,
-                    validation.getBucketingVersion(),
-                    validation.getBucketCount(),
+                    validation.bucketingVersion(),
+                    validation.bucketCount(),
                     bucketNumber.orElseThrow()));
         });
     }
 
     /**
-     * Creates a mapping between the input {@param columns} and base columns if required.
+     * Creates a mapping between the input {@param columns} and base columns based on baseHiveColumnIndex if required.
      */
     public static Optional<ReaderColumns> projectBaseColumns(List<HiveColumnHandle> columns)
+    {
+        return projectBaseColumns(columns, false);
+    }
+
+    /**
+     * Creates a mapping between the input {@param columns} and base columns based on baseHiveColumnIndex or baseColumnName if required.
+     */
+    public static Optional<ReaderColumns> projectBaseColumns(List<HiveColumnHandle> columns, boolean useColumnNames)
     {
         requireNonNull(columns, "columns is null");
 
@@ -720,16 +653,16 @@ public static Optional<ReaderColumns> projectBaseColumns(List<HiveColumnHandle>
 
         ImmutableList.Builder<ColumnHandle> projectedColumns = ImmutableList.builder();
         ImmutableList.Builder<Integer> outputColumnMapping = ImmutableList.builder();
-        Map<Integer, Integer> mappedHiveColumnIndices = new HashMap<>();
+        Map<Object, Integer> mappedHiveBaseColumnKeys = new HashMap<>();
         int projectedColumnCount = 0;
 
         for (HiveColumnHandle column : columns) {
-            int hiveColumnIndex = column.getBaseHiveColumnIndex();
-            Integer mapped = mappedHiveColumnIndices.get(hiveColumnIndex);
+            Object baseColumnKey = useColumnNames ? column.getBaseColumnName() : column.getBaseHiveColumnIndex();
+            Integer mapped = mappedHiveBaseColumnKeys.get(baseColumnKey);
 
             if (mapped == null) {
                 projectedColumns.add(column.getBaseColumn());
-                mappedHiveColumnIndices.put(hiveColumnIndex, projectedColumnCount);
+                mappedHiveBaseColumnKeys.put(baseColumnKey, projectedColumnCount);
                 outputColumnMapping.add(projectedColumnCount);
                 projectedColumnCount++;
             }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePartitionManager.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePartitionManager.java
index 09ec564c6d3f..b105971a8aac 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePartitionManager.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePartitionManager.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.inject.Inject;
 import io.trino.plugin.hive.metastore.SemiTransactionalHiveMetastore;
 import io.trino.plugin.hive.util.HiveBucketing.HiveBucketFilter;
 import io.trino.spi.connector.ColumnHandle;
@@ -28,9 +29,6 @@
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.type.Type;
-
-import javax.inject.Inject;
 
 import java.util.Iterator;
 import java.util.List;
@@ -45,7 +43,6 @@
 import static io.trino.plugin.hive.util.HiveBucketing.getHiveBucketFilter;
 import static io.trino.plugin.hive.util.HiveUtil.parsePartitionValue;
 import static io.trino.plugin.hive.util.HiveUtil.unescapePathName;
-import static java.util.stream.Collectors.toList;
 
 public class HivePartitionManager
 {
@@ -100,10 +97,6 @@ public HivePartitionResult getPartitions(SemiTransactionalHiveMetastore metastor
                     bucketFilter);
         }
 
-        List<Type> partitionTypes = partitionColumns.stream()
-                .map(HiveColumnHandle::getType)
-                .collect(toList());
-
         Optional<List<String>> partitionNames = Optional.empty();
         Iterable<HivePartition> partitionsIterable;
         Predicate<Map<ColumnHandle, NullableValue>> predicate = constraint.predicate().orElse(value -> true);
@@ -117,7 +110,7 @@ public HivePartitionResult getPartitions(SemiTransactionalHiveMetastore metastor
                     .orElseGet(() -> getFilteredPartitionNames(metastore, tableName, partitionColumns, compactEffectivePredicate));
             partitionsIterable = () -> partitionNamesList.stream()
                     // Apply extra filters which could not be done by getFilteredPartitionNames
-                    .map(partitionName -> parseValuesAndFilterPartition(tableName, partitionName, partitionColumns, partitionTypes, effectivePredicate, predicate))
+                    .map(partitionName -> parseValuesAndFilterPartition(tableName, partitionName, partitionColumns, effectivePredicate, predicate))
                     .filter(Optional::isPresent)
                     .map(Optional::get)
                     .iterator();
@@ -138,13 +131,9 @@ public HivePartitionResult getPartitions(ConnectorTableHandle tableHandle, List<
                 .map(HiveColumnHandle::getName)
                 .collect(toImmutableList());
 
-        List<Type> partitionColumnTypes = partitionColumns.stream()
-                .map(HiveColumnHandle::getType)
-                .collect(toImmutableList());
-
         List<HivePartition> partitionList = partitionValuesList.stream()
                 .map(partitionValues -> toPartitionName(partitionColumnNames, partitionValues))
-                .map(partitionName -> parseValuesAndFilterPartition(tableName, partitionName, partitionColumns, partitionColumnTypes, TupleDomain.all(), value -> true))
+                .map(partitionName -> parseValuesAndFilterPartition(tableName, partitionName, partitionColumns, TupleDomain.all(), value -> true))
                 .map(partition -> partition.orElseThrow(() -> new VerifyException("partition must exist")))
                 .collect(toImmutableList());
 
@@ -216,11 +205,10 @@ private Optional<HivePartition> parseValuesAndFilterPartition(
             SchemaTableName tableName,
             String partitionId,
             List<HiveColumnHandle> partitionColumns,
-            List<Type> partitionColumnTypes,
             TupleDomain<ColumnHandle> constraintSummary,
             Predicate<Map<ColumnHandle, NullableValue>> constraint)
     {
-        HivePartition partition = parsePartition(tableName, partitionId, partitionColumns, partitionColumnTypes);
+        HivePartition partition = parsePartition(tableName, partitionId, partitionColumns);
 
         if (partitionMatches(partitionColumns, constraintSummary, constraint, partition)) {
             return Optional.of(partition);
@@ -228,7 +216,7 @@ private Optional<HivePartition> parseValuesAndFilterPartition(
         return Optional.empty();
     }
 
-    private boolean partitionMatches(List<HiveColumnHandle> partitionColumns, TupleDomain<ColumnHandle> constraintSummary, Predicate<Map<ColumnHandle, NullableValue>> constraint, HivePartition partition)
+    private static boolean partitionMatches(List<HiveColumnHandle> partitionColumns, TupleDomain<ColumnHandle> constraintSummary, Predicate<Map<ColumnHandle, NullableValue>> constraint, HivePartition partition)
     {
         return partitionMatches(partitionColumns, constraintSummary, partition) && constraint.test(partition.getKeys());
     }
@@ -263,14 +251,13 @@ private List<String> getFilteredPartitionNames(SemiTransactionalHiveMetastore me
     public static HivePartition parsePartition(
             SchemaTableName tableName,
             String partitionName,
-            List<HiveColumnHandle> partitionColumns,
-            List<Type> partitionColumnTypes)
+            List<HiveColumnHandle> partitionColumns)
     {
         List<String> partitionValues = extractPartitionValues(partitionName);
-        ImmutableMap.Builder<ColumnHandle, NullableValue> builder = ImmutableMap.builder();
+        ImmutableMap.Builder<ColumnHandle, NullableValue> builder = ImmutableMap.builderWithExpectedSize(partitionColumns.size());
         for (int i = 0; i < partitionColumns.size(); i++) {
             HiveColumnHandle column = partitionColumns.get(i);
-            NullableValue parsedValue = parsePartitionValue(partitionName, partitionValues.get(i), partitionColumnTypes.get(i));
+            NullableValue parsedValue = parsePartitionValue(partitionName, partitionValues.get(i), column.getType());
             builder.put(column, parsedValue);
         }
         Map<ColumnHandle, NullableValue> values = builder.buildOrThrow();
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePartitionedBucketFunction.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePartitionedBucketFunction.java
index 3459a135b6d6..bdf79c7fa628 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePartitionedBucketFunction.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePartitionedBucketFunction.java
@@ -28,7 +28,7 @@
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Throwables.throwIfUnchecked;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
+import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
 import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
 import static io.trino.spi.function.InvocationConvention.simpleConvention;
 import static java.util.Objects.requireNonNull;
@@ -58,7 +58,7 @@ public HivePartitionedBucketFunction(
                 .collect(toImmutableList());
         this.firstPartitionColumnIndex = hiveBucketTypes.size();
         this.hashCodeInvokers = partitionColumnsTypes.stream()
-                .map(type -> typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION)))
+                .map(type -> typeOperators.getHashCodeOperator(type, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)))
                 .collect(toImmutableList());
         this.bucketCount = bucketCount;
     }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveReaderProjectionsAdaptingRecordCursor.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveReaderProjectionsAdaptingRecordCursor.java
deleted file mode 100644
index 4b22c13261b9..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveReaderProjectionsAdaptingRecordCursor.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import com.google.common.collect.Iterables;
-import io.airlift.slice.Slice;
-import io.trino.plugin.hive.ReaderProjectionsAdapter.ChannelMapping;
-import io.trino.plugin.hive.util.ForwardingRecordCursor;
-import io.trino.spi.block.Block;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.type.Type;
-
-import java.util.List;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static java.util.Objects.requireNonNull;
-
-/**
- * Applies projections on delegate fields provided by {@link ChannelMapping} to produce fields expected from this cursor.
- */
-public class HiveReaderProjectionsAdaptingRecordCursor
-        extends ForwardingRecordCursor
-{
-    private final RecordCursor delegate;
-    private final ChannelMapping[] channelMappings;
-    private final Type[] outputTypes;
-    private final Type[] inputTypes;
-
-    private final Type[] baseTypes;
-
-    public HiveReaderProjectionsAdaptingRecordCursor(RecordCursor delegate, ReaderProjectionsAdapter projectionsAdapter)
-    {
-        this.delegate = requireNonNull(delegate, "delegate is null");
-        requireNonNull(projectionsAdapter, "projectionsAdapter is null");
-
-        this.channelMappings = new ChannelMapping[projectionsAdapter.getOutputToInputMapping().size()];
-        projectionsAdapter.getOutputToInputMapping().toArray(channelMappings);
-
-        this.outputTypes = new Type[projectionsAdapter.getOutputTypes().size()];
-        projectionsAdapter.getOutputTypes().toArray(outputTypes);
-
-        this.inputTypes = new Type[projectionsAdapter.getInputTypes().size()];
-        projectionsAdapter.getInputTypes().toArray(inputTypes);
-
-        this.baseTypes = new Type[outputTypes.length];
-        for (int i = 0; i < baseTypes.length; i++) {
-            Type type = inputTypes[channelMappings[i].getInputChannelIndex()];
-            List<Integer> dereferences = channelMappings[i].getDereferenceSequence();
-            for (int j = 0; j < dereferences.size(); j++) {
-                type = type.getTypeParameters().get(dereferences.get(j));
-            }
-            baseTypes[i] = type;
-        }
-    }
-
-    @Override
-    protected RecordCursor delegate()
-    {
-        return delegate;
-    }
-
-    @Override
-    public Type getType(int field)
-    {
-        return outputTypes[field];
-    }
-
-    private Block applyDereferences(Block baseObject, List<Integer> dereferences, int length)
-    {
-        checkArgument(length <= dereferences.size());
-        Block current = baseObject;
-        for (int i = 0; i < length; i++) {
-            current = current.getObject(dereferences.get(i), Block.class);
-        }
-        return current;
-    }
-
-    @Override
-    public boolean getBoolean(int field)
-    {
-        int inputFieldIndex = channelMappings[field].getInputChannelIndex();
-        List<Integer> dereferences = channelMappings[field].getDereferenceSequence();
-
-        if (dereferences.isEmpty()) {
-            return delegate.getBoolean(inputFieldIndex);
-        }
-
-        // Get SingleRowBlock corresponding to the element at current position
-        Block elementBlock = (Block) delegate.getObject(inputFieldIndex);
-
-        // Apply dereferences except for the last one, which is type dependent
-        Block baseObject = applyDereferences(elementBlock, dereferences, dereferences.size() - 1);
-
-        return baseTypes[field].getBoolean(baseObject, Iterables.getLast(dereferences));
-    }
-
-    @Override
-    public long getLong(int field)
-    {
-        int inputFieldIndex = channelMappings[field].getInputChannelIndex();
-        List<Integer> dereferences = channelMappings[field].getDereferenceSequence();
-
-        if (dereferences.isEmpty()) {
-            return delegate.getLong(inputFieldIndex);
-        }
-
-        // Get SingleRowBlock corresponding to the element at current position
-        Block elementBlock = (Block) delegate.getObject(inputFieldIndex);
-
-        // Apply dereferences except for the last one, which is type dependent
-        Block baseObject = applyDereferences(elementBlock, dereferences, dereferences.size() - 1);
-
-        return baseTypes[field].getLong(baseObject, Iterables.getLast(dereferences));
-    }
-
-    @Override
-    public double getDouble(int field)
-    {
-        int inputFieldIndex = channelMappings[field].getInputChannelIndex();
-        List<Integer> dereferences = channelMappings[field].getDereferenceSequence();
-
-        if (dereferences.isEmpty()) {
-            return delegate.getDouble(inputFieldIndex);
-        }
-
-        // Get SingleRowBlock corresponding to the element at current position
-        Block elementBlock = (Block) delegate.getObject(inputFieldIndex);
-
-        // Apply dereferences except for the last one, which is type dependent
-        Block baseObject = applyDereferences(elementBlock, dereferences, dereferences.size() - 1);
-
-        return baseTypes[field].getDouble(baseObject, Iterables.getLast(dereferences));
-    }
-
-    @Override
-    public Slice getSlice(int field)
-    {
-        int inputFieldIndex = channelMappings[field].getInputChannelIndex();
-        List<Integer> dereferences = channelMappings[field].getDereferenceSequence();
-
-        if (dereferences.isEmpty()) {
-            return delegate.getSlice(inputFieldIndex);
-        }
-
-        // Get SingleRowBlock corresponding to the element at current position
-        Block elementBlock = (Block) delegate.getObject(inputFieldIndex);
-
-        // Apply dereferences except for the last one, which is type dependent
-        Block baseObject = applyDereferences(elementBlock, dereferences, dereferences.size() - 1);
-
-        return baseTypes[field].getSlice(baseObject, Iterables.getLast(dereferences));
-    }
-
-    @Override
-    public Object getObject(int field)
-    {
-        int inputFieldIndex = channelMappings[field].getInputChannelIndex();
-        List<Integer> dereferences = channelMappings[field].getDereferenceSequence();
-
-        if (dereferences.isEmpty()) {
-            return delegate.getObject(inputFieldIndex);
-        }
-
-        // Get SingleRowBlock corresponding to the element at current position
-        Block elementBlock = (Block) delegate.getObject(inputFieldIndex);
-
-        // Apply dereferences except for the last one, which is type dependent
-        Block baseObject = applyDereferences(elementBlock, dereferences, dereferences.size() - 1);
-
-        return baseTypes[field].getObject(baseObject, Iterables.getLast(dereferences));
-    }
-
-    @Override
-    public boolean isNull(int field)
-    {
-        int inputFieldIndex = channelMappings[field].getInputChannelIndex();
-        List<Integer> dereferences = channelMappings[field].getDereferenceSequence();
-
-        if (dereferences.isEmpty()) {
-            return delegate.isNull(inputFieldIndex);
-        }
-
-        if (delegate.isNull(inputFieldIndex)) {
-            return true;
-        }
-
-        // Get SingleRowBlock corresponding to the element at current position
-        Block baseObject = (Block) delegate.getObject(inputFieldIndex);
-
-        for (int j = 0; j < dereferences.size() - 1; j++) {
-            int dereferenceIndex = dereferences.get(j);
-            if (baseObject.isNull(dereferenceIndex)) {
-                return true;
-            }
-            baseObject = baseObject.getObject(dereferenceIndex, Block.class);
-        }
-
-        int finalDereference = Iterables.getLast(dereferences);
-        return baseObject.isNull(finalDereference);
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveRecordCursor.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveRecordCursor.java
deleted file mode 100644
index 172f8f480849..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveRecordCursor.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import com.google.common.annotations.VisibleForTesting;
-import io.airlift.slice.Slice;
-import io.trino.plugin.hive.HivePageSourceProvider.ColumnMapping;
-import io.trino.plugin.hive.util.ForwardingRecordCursor;
-import io.trino.spi.TrinoException;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.type.CharType;
-import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.VarcharType;
-
-import java.util.List;
-
-import static io.trino.plugin.hive.HivePageSourceProvider.ColumnMappingKind.EMPTY;
-import static io.trino.plugin.hive.HivePageSourceProvider.ColumnMappingKind.PREFILLED;
-import static io.trino.plugin.hive.HivePageSourceProvider.ColumnMappingKind.REGULAR;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.BooleanType.BOOLEAN;
-import static io.trino.spi.type.DateType.DATE;
-import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.IntegerType.INTEGER;
-import static io.trino.spi.type.RealType.REAL;
-import static io.trino.spi.type.SmallintType.SMALLINT;
-import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
-import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
-import static io.trino.spi.type.TinyintType.TINYINT;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-
-public class HiveRecordCursor
-        extends ForwardingRecordCursor
-{
-    private final RecordCursor delegate;
-
-    private final List<ColumnMapping> columnMappings;
-    private final Type[] types;
-
-    private final boolean[] booleans;
-    private final long[] longs;
-    private final double[] doubles;
-    private final Slice[] slices;
-    private final Object[] objects;
-    private final boolean[] nulls;
-
-    public HiveRecordCursor(List<ColumnMapping> columnMappings, RecordCursor delegate)
-    {
-        requireNonNull(columnMappings, "columnMappings is null");
-
-        this.delegate = requireNonNull(delegate, "delegate is null");
-        this.columnMappings = columnMappings;
-
-        int size = columnMappings.size();
-
-        this.types = new Type[size];
-
-        this.booleans = new boolean[size];
-        this.longs = new long[size];
-        this.doubles = new double[size];
-        this.slices = new Slice[size];
-        this.objects = new Object[size];
-        this.nulls = new boolean[size];
-
-        for (int columnIndex = 0; columnIndex < size; columnIndex++) {
-            ColumnMapping columnMapping = columnMappings.get(columnIndex);
-
-            if (columnMapping.getKind() == EMPTY) {
-                nulls[columnIndex] = true;
-            }
-            if (columnMapping.getKind() == PREFILLED) {
-                Object prefilledValue = columnMapping.getPrefilledValue().getValue();
-                String name = columnMapping.getHiveColumnHandle().getName();
-                Type type = columnMapping.getHiveColumnHandle().getType();
-                types[columnIndex] = type;
-
-                if (prefilledValue == null) {
-                    nulls[columnIndex] = true;
-                }
-                else if (BOOLEAN.equals(type)) {
-                    booleans[columnIndex] = (boolean) prefilledValue;
-                }
-                else if (TINYINT.equals(type)) {
-                    longs[columnIndex] = (long) prefilledValue;
-                }
-                else if (SMALLINT.equals(type)) {
-                    longs[columnIndex] = (long) prefilledValue;
-                }
-                else if (INTEGER.equals(type)) {
-                    longs[columnIndex] = (long) prefilledValue;
-                }
-                else if (BIGINT.equals(type)) {
-                    longs[columnIndex] = (long) prefilledValue;
-                }
-                else if (REAL.equals(type)) {
-                    longs[columnIndex] = (long) prefilledValue;
-                }
-                else if (DOUBLE.equals(type)) {
-                    doubles[columnIndex] = (double) prefilledValue;
-                }
-                else if (type instanceof VarcharType) {
-                    slices[columnIndex] = (Slice) prefilledValue;
-                }
-                else if (type instanceof CharType) {
-                    slices[columnIndex] = (Slice) prefilledValue;
-                }
-                else if (DATE.equals(type)) {
-                    longs[columnIndex] = (long) prefilledValue;
-                }
-                else if (TIMESTAMP_MILLIS.equals(type)) {
-                    longs[columnIndex] = (long) prefilledValue;
-                }
-                else if (TIMESTAMP_TZ_MILLIS.equals(type)) {
-                    longs[columnIndex] = (long) prefilledValue;
-                }
-                else if (type instanceof DecimalType decimalType && decimalType.isShort()) {
-                    longs[columnIndex] = (long) prefilledValue;
-                }
-                else if (type instanceof DecimalType decimalType && !decimalType.isShort()) {
-                    objects[columnIndex] = prefilledValue;
-                }
-                else {
-                    throw new TrinoException(NOT_SUPPORTED, format("Unsupported column type %s for prefilled column: %s", type.getDisplayName(), name));
-                }
-            }
-        }
-    }
-
-    @Override
-    protected RecordCursor delegate()
-    {
-        return delegate;
-    }
-
-    @Override
-    public Type getType(int field)
-    {
-        return types[field];
-    }
-
-    @Override
-    public boolean getBoolean(int field)
-    {
-        ColumnMapping columnMapping = columnMappings.get(field);
-        if (columnMapping.getKind() == REGULAR) {
-            return delegate.getBoolean(columnMapping.getIndex());
-        }
-        return booleans[field];
-    }
-
-    @Override
-    public long getLong(int field)
-    {
-        ColumnMapping columnMapping = columnMappings.get(field);
-        if (columnMapping.getKind() == REGULAR) {
-            return delegate.getLong(columnMapping.getIndex());
-        }
-        return longs[field];
-    }
-
-    @Override
-    public double getDouble(int field)
-    {
-        ColumnMapping columnMapping = columnMappings.get(field);
-        if (columnMapping.getKind() == REGULAR) {
-            return delegate.getDouble(columnMapping.getIndex());
-        }
-        return doubles[field];
-    }
-
-    @Override
-    public Slice getSlice(int field)
-    {
-        ColumnMapping columnMapping = columnMappings.get(field);
-        if (columnMapping.getKind() == REGULAR) {
-            return delegate.getSlice(columnMapping.getIndex());
-        }
-        return slices[field];
-    }
-
-    @Override
-    public Object getObject(int field)
-    {
-        ColumnMapping columnMapping = columnMappings.get(field);
-        if (columnMapping.getKind() == REGULAR) {
-            return delegate.getObject(columnMapping.getIndex());
-        }
-        return objects[field];
-    }
-
-    @Override
-    public boolean isNull(int field)
-    {
-        ColumnMapping columnMapping = columnMappings.get(field);
-        if (columnMapping.getKind() == REGULAR) {
-            return delegate.isNull(columnMapping.getIndex());
-        }
-        return nulls[field];
-    }
-
-    @VisibleForTesting
-    RecordCursor getRegularColumnRecordCursor()
-    {
-        return delegate;
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveRecordCursorProvider.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveRecordCursorProvider.java
deleted file mode 100644
index ca924cb27e48..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveRecordCursorProvider.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.Properties;
-
-import static java.util.Objects.requireNonNull;
-
-public interface HiveRecordCursorProvider
-{
-    Optional<ReaderRecordCursorWithProjections> createRecordCursor(
-            Configuration configuration,
-            ConnectorSession session,
-            Path path,
-            long start,
-            long length,
-            long fileSize,
-            Properties schema,
-            List<HiveColumnHandle> columns,
-            TupleDomain<HiveColumnHandle> effectivePredicate,
-            TypeManager typeManager,
-            boolean s3SelectPushdownEnabled);
-
-    /**
-     * A wrapper class for
-     * - delegate reader record cursor and
-     * - projection information for columns to be returned by the delegate
-     * <p>
-     * Empty {@param projectedReaderColumns} indicates that the delegate cursor reads the exact same columns provided to
-     * it in {@link HiveRecordCursorProvider#createRecordCursor}
-     */
-    class ReaderRecordCursorWithProjections
-    {
-        private final RecordCursor recordCursor;
-        private final Optional<ReaderColumns> projectedReaderColumns;
-
-        public ReaderRecordCursorWithProjections(RecordCursor recordCursor, Optional<ReaderColumns> projectedReaderColumns)
-        {
-            this.recordCursor = requireNonNull(recordCursor, "recordCursor is null");
-            this.projectedReaderColumns = requireNonNull(projectedReaderColumns, "projectedReaderColumns is null");
-        }
-
-        public RecordCursor getRecordCursor()
-        {
-            return recordCursor;
-        }
-
-        public Optional<ReaderColumns> getProjectedReaderColumns()
-        {
-            return projectedReaderColumns;
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSessionProperties.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSessionProperties.java
index 31ecc2bc631d..fbeb33a40a5c 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSessionProperties.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSessionProperties.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.orc.OrcWriteValidation.OrcWriteValidationMode;
@@ -27,8 +28,6 @@
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -40,6 +39,12 @@
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.plugin.base.session.PropertyMetadataUtil.dataSizeProperty;
 import static io.trino.plugin.base.session.PropertyMetadataUtil.durationProperty;
+import static io.trino.plugin.base.session.PropertyMetadataUtil.validateMaxDataSize;
+import static io.trino.plugin.base.session.PropertyMetadataUtil.validateMinDataSize;
+import static io.trino.plugin.hive.parquet.ParquetReaderConfig.PARQUET_READER_MAX_SMALL_FILE_THRESHOLD;
+import static io.trino.plugin.hive.parquet.ParquetWriterConfig.PARQUET_WRITER_MAX_BLOCK_SIZE;
+import static io.trino.plugin.hive.parquet.ParquetWriterConfig.PARQUET_WRITER_MAX_PAGE_SIZE;
+import static io.trino.plugin.hive.parquet.ParquetWriterConfig.PARQUET_WRITER_MIN_PAGE_SIZE;
 import static io.trino.spi.StandardErrorCode.INVALID_SESSION_PROPERTY;
 import static io.trino.spi.session.PropertyMetadata.booleanProperty;
 import static io.trino.spi.session.PropertyMetadata.doubleProperty;
@@ -61,17 +66,6 @@ public final class HiveSessionProperties
     private static final String PARALLEL_PARTITIONED_BUCKETED_WRITES = "parallel_partitioned_bucketed_writes";
     private static final String FORCE_LOCAL_SCHEDULING = "force_local_scheduling";
     private static final String INSERT_EXISTING_PARTITIONS_BEHAVIOR = "insert_existing_partitions_behavior";
-    private static final String CSV_NATIVE_READER_ENABLED = "csv_native_reader_enabled";
-    private static final String CSV_NATIVE_WRITER_ENABLED = "csv_native_writer_enabled";
-    private static final String JSON_NATIVE_READER_ENABLED = "json_native_reader_enabled";
-    private static final String JSON_NATIVE_WRITER_ENABLED = "json_native_writer_enabled";
-    private static final String OPENX_JSON_NATIVE_READER_ENABLED = "openx_json_native_reader_enabled";
-    private static final String OPENX_JSON_NATIVE_WRITER_ENABLED = "openx_json_native_writer_enabled";
-    private static final String REGEX_NATIVE_READER_ENABLED = "regex_native_reader_enabled";
-    private static final String TEXT_FILE_NATIVE_READER_ENABLED = "text_file_native_reader_enabled";
-    private static final String TEXT_FILE_NATIVE_WRITER_ENABLED = "text_file_native_writer_enabled";
-    private static final String SEQUENCE_FILE_NATIVE_READER_ENABLED = "sequence_file_native_reader_enabled";
-    private static final String SEQUENCE_FILE_NATIVE_WRITER_ENABLED = "sequence_file_native_writer_enabled";
     private static final String ORC_BLOOM_FILTERS_ENABLED = "orc_bloom_filters_enabled";
     private static final String ORC_MAX_MERGE_DISTANCE = "orc_max_merge_distance";
     private static final String ORC_MAX_BUFFER_SIZE = "orc_max_buffer_size";
@@ -99,8 +93,7 @@ public final class HiveSessionProperties
     private static final String PARQUET_USE_BLOOM_FILTER = "parquet_use_bloom_filter";
     private static final String PARQUET_MAX_READ_BLOCK_SIZE = "parquet_max_read_block_size";
     private static final String PARQUET_MAX_READ_BLOCK_ROW_COUNT = "parquet_max_read_block_row_count";
-    private static final String PARQUET_OPTIMIZED_READER_ENABLED = "parquet_optimized_reader_enabled";
-    private static final String PARQUET_OPTIMIZED_NESTED_READER_ENABLED = "parquet_optimized_nested_reader_enabled";
+    private static final String PARQUET_SMALL_FILE_THRESHOLD = "parquet_small_file_threshold";
     private static final String PARQUET_WRITER_BLOCK_SIZE = "parquet_writer_block_size";
     private static final String PARQUET_WRITER_PAGE_SIZE = "parquet_writer_page_size";
     private static final String PARQUET_WRITER_BATCH_SIZE = "parquet_writer_batch_size";
@@ -115,18 +108,13 @@ public final class HiveSessionProperties
     private static final String IGNORE_CORRUPTED_STATISTICS = "ignore_corrupted_statistics";
     private static final String COLLECT_COLUMN_STATISTICS_ON_WRITE = "collect_column_statistics_on_write";
     private static final String OPTIMIZE_MISMATCHED_BUCKET_COUNT = "optimize_mismatched_bucket_count";
-    private static final String S3_SELECT_PUSHDOWN_ENABLED = "s3_select_pushdown_enabled";
-    private static final String TEMPORARY_STAGING_DIRECTORY_ENABLED = "temporary_staging_directory_enabled";
-    private static final String TEMPORARY_STAGING_DIRECTORY_PATH = "temporary_staging_directory_path";
     private static final String DELEGATE_TRANSACTIONAL_MANAGED_TABLE_LOCATION_TO_METASTORE = "delegate_transactional_managed_table_location_to_metastore";
     private static final String IGNORE_ABSENT_PARTITIONS = "ignore_absent_partitions";
     private static final String QUERY_PARTITION_FILTER_REQUIRED = "query_partition_filter_required";
     private static final String QUERY_PARTITION_FILTER_REQUIRED_SCHEMAS = "query_partition_filter_required_schemas";
     private static final String PROJECTION_PUSHDOWN_ENABLED = "projection_pushdown_enabled";
     private static final String TIMESTAMP_PRECISION = "timestamp_precision";
-    private static final String PARQUET_OPTIMIZED_WRITER_ENABLED = "parquet_optimized_writer_enabled";
     private static final String DYNAMIC_FILTERING_WAIT_TIMEOUT = "dynamic_filtering_wait_timeout";
-    private static final String OPTIMIZE_SYMLINK_LISTING = "optimize_symlink_listing";
     private static final String HIVE_VIEWS_LEGACY_TRANSLATION = "hive_views_legacy_translation";
     private static final String ICEBERG_CATALOG_NAME = "iceberg_catalog_name";
     public static final String DELTA_LAKE_CATALOG_NAME = "delta_lake_catalog_name";
@@ -160,7 +148,6 @@ static boolean isValid(InsertExistingPartitionsBehavior value, boolean immutable
     @Inject
     public HiveSessionProperties(
             HiveConfig hiveConfig,
-            HiveFormatsConfig hiveFormatsConfig,
             OrcReaderConfig orcReaderConfig,
             OrcWriterConfig orcWriterConfig,
             ParquetReaderConfig parquetReaderConfig,
@@ -201,61 +188,6 @@ public HiveSessionProperties(
                         false,
                         value -> InsertExistingPartitionsBehavior.valueOf((String) value, hiveConfig.isImmutablePartitions()),
                         InsertExistingPartitionsBehavior::toString),
-                booleanProperty(
-                        CSV_NATIVE_READER_ENABLED,
-                        "Use native CSV reader",
-                        hiveFormatsConfig.isCsvNativeReaderEnabled(),
-                        false),
-                booleanProperty(
-                        CSV_NATIVE_WRITER_ENABLED,
-                        "Use native CSV writer",
-                        hiveFormatsConfig.isCsvNativeWriterEnabled(),
-                        false),
-                booleanProperty(
-                        JSON_NATIVE_READER_ENABLED,
-                        "Use native JSON reader",
-                        hiveFormatsConfig.isJsonNativeReaderEnabled(),
-                        false),
-                booleanProperty(
-                        JSON_NATIVE_WRITER_ENABLED,
-                        "Use native JSON writer",
-                        hiveFormatsConfig.isJsonNativeWriterEnabled(),
-                        false),
-                booleanProperty(
-                        OPENX_JSON_NATIVE_READER_ENABLED,
-                        "Use native OpenX JSON reader",
-                        hiveFormatsConfig.isOpenXJsonNativeReaderEnabled(),
-                        false),
-                booleanProperty(
-                        OPENX_JSON_NATIVE_WRITER_ENABLED,
-                        "Use native OpenX JSON writer",
-                        hiveFormatsConfig.isOpenXJsonNativeWriterEnabled(),
-                        false),
-                booleanProperty(
-                        REGEX_NATIVE_READER_ENABLED,
-                        "Use native REGEX reader",
-                        hiveFormatsConfig.isRegexNativeReaderEnabled(),
-                        false),
-                booleanProperty(
-                        TEXT_FILE_NATIVE_READER_ENABLED,
-                        "Use native text file reader",
-                        hiveFormatsConfig.isTextFileNativeReaderEnabled(),
-                        false),
-                booleanProperty(
-                        TEXT_FILE_NATIVE_WRITER_ENABLED,
-                        "Use native text file writer",
-                        hiveFormatsConfig.isTextFileNativeWriterEnabled(),
-                        false),
-                booleanProperty(
-                        SEQUENCE_FILE_NATIVE_READER_ENABLED,
-                        "Use native sequence file reader",
-                        hiveFormatsConfig.isSequenceFileNativeReaderEnabled(),
-                        false),
-                booleanProperty(
-                        SEQUENCE_FILE_NATIVE_WRITER_ENABLED,
-                        "Use native sequence file writer",
-                        hiveFormatsConfig.isSequenceFileNativeWriterEnabled(),
-                        false),
                 booleanProperty(
                         ORC_BLOOM_FILTERS_ENABLED,
                         "ORC: Enable bloom filters for predicate pushdown",
@@ -393,7 +325,7 @@ public HiveSessionProperties(
                         false),
                 booleanProperty(
                         PARQUET_USE_BLOOM_FILTER,
-                        "Use Parquet bloomfilter",
+                        "Use Parquet Bloom filters",
                         parquetReaderConfig.isUseBloomFilter(),
                         false),
                 dataSizeProperty(
@@ -413,25 +345,26 @@ public HiveSessionProperties(
                             }
                         },
                         false),
-                booleanProperty(
-                        PARQUET_OPTIMIZED_READER_ENABLED,
-                        "Use optimized Parquet reader",
-                        parquetReaderConfig.isOptimizedReaderEnabled(),
-                        false),
-                booleanProperty(
-                        PARQUET_OPTIMIZED_NESTED_READER_ENABLED,
-                        "Use optimized Parquet reader for nested columns",
-                        parquetReaderConfig.isOptimizedNestedReaderEnabled(),
+                dataSizeProperty(
+                        PARQUET_SMALL_FILE_THRESHOLD,
+                        "Parquet: Size below which a parquet file will be read entirely",
+                        parquetReaderConfig.getSmallFileThreshold(),
+                        value -> validateMaxDataSize(PARQUET_SMALL_FILE_THRESHOLD, value, DataSize.valueOf(PARQUET_READER_MAX_SMALL_FILE_THRESHOLD)),
                         false),
                 dataSizeProperty(
                         PARQUET_WRITER_BLOCK_SIZE,
                         "Parquet: Writer block size",
                         parquetWriterConfig.getBlockSize(),
+                        value -> validateMaxDataSize(PARQUET_WRITER_BLOCK_SIZE, value, DataSize.valueOf(PARQUET_WRITER_MAX_BLOCK_SIZE)),
                         false),
                 dataSizeProperty(
                         PARQUET_WRITER_PAGE_SIZE,
                         "Parquet: Writer page size",
                         parquetWriterConfig.getPageSize(),
+                        value -> {
+                            validateMinDataSize(PARQUET_WRITER_PAGE_SIZE, value, DataSize.valueOf(PARQUET_WRITER_MIN_PAGE_SIZE));
+                            validateMaxDataSize(PARQUET_WRITER_PAGE_SIZE, value, DataSize.valueOf(PARQUET_WRITER_MAX_PAGE_SIZE));
+                        },
                         false),
                 integerProperty(
                         PARQUET_WRITER_BATCH_SIZE,
@@ -505,21 +438,6 @@ public HiveSessionProperties(
                         "Experimental: Enable optimization to avoid shuffle when bucket count is compatible but not the same",
                         hiveConfig.isOptimizeMismatchedBucketCount(),
                         false),
-                booleanProperty(
-                        S3_SELECT_PUSHDOWN_ENABLED,
-                        "S3 Select pushdown enabled",
-                        hiveConfig.isS3SelectPushdownEnabled(),
-                        false),
-                booleanProperty(
-                        TEMPORARY_STAGING_DIRECTORY_ENABLED,
-                        "Should use temporary staging directory for write operations",
-                        hiveConfig.isTemporaryStagingDirectoryEnabled(),
-                        false),
-                stringProperty(
-                        TEMPORARY_STAGING_DIRECTORY_PATH,
-                        "Temporary staging directory location",
-                        hiveConfig.getTemporaryStagingDirectoryPath(),
-                        false),
                 booleanProperty(
                         DELEGATE_TRANSACTIONAL_MANAGED_TABLE_LOCATION_TO_METASTORE,
                         "When transactional managed table is created via Trino the location will not be set in request sent to HMS and location will be determined by metastore; if this property is set to true CREATE TABLE AS queries are not supported.",
@@ -563,21 +481,11 @@ public HiveSessionProperties(
                         HiveTimestampPrecision.class,
                         hiveConfig.getTimestampPrecision(),
                         false),
-                booleanProperty(
-                        PARQUET_OPTIMIZED_WRITER_ENABLED,
-                        "Enable optimized writer",
-                        parquetWriterConfig.isParquetOptimizedWriterEnabled(),
-                        false),
                 durationProperty(
                         DYNAMIC_FILTERING_WAIT_TIMEOUT,
                         "Duration to wait for completion of dynamic filters during split generation",
                         hiveConfig.getDynamicFilteringWaitTimeout(),
                         false),
-                booleanProperty(
-                        OPTIMIZE_SYMLINK_LISTING,
-                        "Optimize listing for SymlinkTextFormat tables with files in a single directory",
-                        hiveConfig.isOptimizeSymlinkListing(),
-                        false),
                 booleanProperty(
                         HIVE_VIEWS_LEGACY_TRANSLATION,
                         "Use legacy Hive view translation mechanism",
@@ -662,61 +570,6 @@ public static InsertExistingPartitionsBehavior getInsertExistingPartitionsBehavi
         return session.getProperty(INSERT_EXISTING_PARTITIONS_BEHAVIOR, InsertExistingPartitionsBehavior.class);
     }
 
-    public static boolean isCsvNativeReaderEnabled(ConnectorSession session)
-    {
-        return session.getProperty(CSV_NATIVE_READER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isCsvNativeWriterEnabled(ConnectorSession session)
-    {
-        return session.getProperty(CSV_NATIVE_WRITER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isJsonNativeReaderEnabled(ConnectorSession session)
-    {
-        return session.getProperty(JSON_NATIVE_READER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isJsonNativeWriterEnabled(ConnectorSession session)
-    {
-        return session.getProperty(JSON_NATIVE_WRITER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isOpenXJsonNativeReaderEnabled(ConnectorSession session)
-    {
-        return session.getProperty(OPENX_JSON_NATIVE_READER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isOpenXJsonNativeWriterEnabled(ConnectorSession session)
-    {
-        return session.getProperty(OPENX_JSON_NATIVE_WRITER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isRegexNativeReaderEnabled(ConnectorSession session)
-    {
-        return session.getProperty(REGEX_NATIVE_READER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isTextFileNativeReaderEnabled(ConnectorSession session)
-    {
-        return session.getProperty(TEXT_FILE_NATIVE_READER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isTextFileNativeWriterEnabled(ConnectorSession session)
-    {
-        return session.getProperty(TEXT_FILE_NATIVE_WRITER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isSequenceFileNativeReaderEnabled(ConnectorSession session)
-    {
-        return session.getProperty(SEQUENCE_FILE_NATIVE_READER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isSequenceFileNativeWriterEnabled(ConnectorSession session)
-    {
-        return session.getProperty(SEQUENCE_FILE_NATIVE_WRITER_ENABLED, Boolean.class);
-    }
-
     public static boolean isOrcBloomFiltersEnabled(ConnectorSession session)
     {
         return session.getProperty(ORC_BLOOM_FILTERS_ENABLED, Boolean.class);
@@ -859,14 +712,9 @@ public static int getParquetMaxReadBlockRowCount(ConnectorSession session)
         return session.getProperty(PARQUET_MAX_READ_BLOCK_ROW_COUNT, Integer.class);
     }
 
-    public static boolean isParquetOptimizedReaderEnabled(ConnectorSession session)
+    public static DataSize getParquetSmallFileThreshold(ConnectorSession session)
     {
-        return session.getProperty(PARQUET_OPTIMIZED_READER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isParquetOptimizedNestedReaderEnabled(ConnectorSession session)
-    {
-        return session.getProperty(PARQUET_OPTIMIZED_NESTED_READER_ENABLED, Boolean.class);
+        return session.getProperty(PARQUET_SMALL_FILE_THRESHOLD, DataSize.class);
     }
 
     public static DataSize getParquetWriterBlockSize(ConnectorSession session)
@@ -916,11 +764,6 @@ public static boolean isPropagateTableScanSortingProperties(ConnectorSession ses
         return session.getProperty(PROPAGATE_TABLE_SCAN_SORTING_PROPERTIES, Boolean.class);
     }
 
-    public static boolean isS3SelectPushdownEnabled(ConnectorSession session)
-    {
-        return session.getProperty(S3_SELECT_PUSHDOWN_ENABLED, Boolean.class);
-    }
-
     public static boolean isStatisticsEnabled(ConnectorSession session)
     {
         return session.getProperty(STATISTICS_ENABLED, Boolean.class);
@@ -950,16 +793,6 @@ public static boolean isOptimizedMismatchedBucketCount(ConnectorSession session)
         return session.getProperty(OPTIMIZE_MISMATCHED_BUCKET_COUNT, Boolean.class);
     }
 
-    public static boolean isTemporaryStagingDirectoryEnabled(ConnectorSession session)
-    {
-        return session.getProperty(TEMPORARY_STAGING_DIRECTORY_ENABLED, Boolean.class);
-    }
-
-    public static String getTemporaryStagingDirectoryPath(ConnectorSession session)
-    {
-        return session.getProperty(TEMPORARY_STAGING_DIRECTORY_PATH, String.class);
-    }
-
     public static boolean isDelegateTransactionalManagedTableLocationToMetastore(ConnectorSession session)
     {
         return session.getProperty(DELEGATE_TRANSACTIONAL_MANAGED_TABLE_LOCATION_TO_METASTORE, Boolean.class);
@@ -993,21 +826,11 @@ public static HiveTimestampPrecision getTimestampPrecision(ConnectorSession sess
         return session.getProperty(TIMESTAMP_PRECISION, HiveTimestampPrecision.class);
     }
 
-    public static boolean isParquetOptimizedWriterEnabled(ConnectorSession session)
-    {
-        return session.getProperty(PARQUET_OPTIMIZED_WRITER_ENABLED, Boolean.class);
-    }
-
     public static Duration getDynamicFilteringWaitTimeout(ConnectorSession session)
     {
         return session.getProperty(DYNAMIC_FILTERING_WAIT_TIMEOUT, Duration.class);
     }
 
-    public static boolean isOptimizeSymlinkListing(ConnectorSession session)
-    {
-        return session.getProperty(OPTIMIZE_SYMLINK_LISTING, Boolean.class);
-    }
-
     public static boolean isHiveViewsLegacyTranslation(ConnectorSession session)
     {
         return session.getProperty(HIVE_VIEWS_LEGACY_TRANSLATION, Boolean.class);
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSplit.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSplit.java
index 94cf0151e5e3..36b850648cf1 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSplit.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSplit.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -23,7 +24,6 @@
 import io.trino.spi.connector.ConnectorSplit;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Properties;
@@ -49,25 +49,18 @@ public class HiveSplit
     private final Properties schema;
     private final List<HivePartitionKey> partitionKeys;
     private final List<HostAddress> addresses;
-    private final String database;
-    private final String table;
     private final String partitionName;
     private final OptionalInt readBucketNumber;
     private final OptionalInt tableBucketNumber;
-    private final int statementId;
     private final boolean forceLocalScheduling;
     private final TableToPartitionMapping tableToPartitionMapping;
     private final Optional<BucketConversion> bucketConversion;
     private final Optional<BucketValidation> bucketValidation;
-    private final boolean s3SelectPushdownEnabled;
     private final Optional<AcidInfo> acidInfo;
-    private final long splitNumber;
     private final SplitWeight splitWeight;
 
     @JsonCreator
     public HiveSplit(
-            @JsonProperty("database") String database,
-            @JsonProperty("table") String table,
             @JsonProperty("partitionName") String partitionName,
             @JsonProperty("path") String path,
             @JsonProperty("start") long start,
@@ -76,24 +69,57 @@ public HiveSplit(
             @JsonProperty("fileModifiedTime") long fileModifiedTime,
             @JsonProperty("schema") Properties schema,
             @JsonProperty("partitionKeys") List<HivePartitionKey> partitionKeys,
-            @JsonProperty("addresses") List<HostAddress> addresses,
             @JsonProperty("readBucketNumber") OptionalInt readBucketNumber,
             @JsonProperty("tableBucketNumber") OptionalInt tableBucketNumber,
-            @JsonProperty("statementId") int statementId,
             @JsonProperty("forceLocalScheduling") boolean forceLocalScheduling,
             @JsonProperty("tableToPartitionMapping") TableToPartitionMapping tableToPartitionMapping,
             @JsonProperty("bucketConversion") Optional<BucketConversion> bucketConversion,
             @JsonProperty("bucketValidation") Optional<BucketValidation> bucketValidation,
-            @JsonProperty("s3SelectPushdownEnabled") boolean s3SelectPushdownEnabled,
             @JsonProperty("acidInfo") Optional<AcidInfo> acidInfo,
-            @JsonProperty("splitNumber") long splitNumber,
             @JsonProperty("splitWeight") SplitWeight splitWeight)
+    {
+        this(
+                partitionName,
+                path,
+                start,
+                length,
+                estimatedFileSize,
+                fileModifiedTime,
+                schema,
+                partitionKeys,
+                ImmutableList.of(),
+                readBucketNumber,
+                tableBucketNumber,
+                forceLocalScheduling,
+                tableToPartitionMapping,
+                bucketConversion,
+                bucketValidation,
+                acidInfo,
+                splitWeight);
+    }
+
+    public HiveSplit(
+            String partitionName,
+            String path,
+            long start,
+            long length,
+            long estimatedFileSize,
+            long fileModifiedTime,
+            Properties schema,
+            List<HivePartitionKey> partitionKeys,
+            List<HostAddress> addresses,
+            OptionalInt readBucketNumber,
+            OptionalInt tableBucketNumber,
+            boolean forceLocalScheduling,
+            TableToPartitionMapping tableToPartitionMapping,
+            Optional<BucketConversion> bucketConversion,
+            Optional<BucketValidation> bucketValidation,
+            Optional<AcidInfo> acidInfo,
+            SplitWeight splitWeight)
     {
         checkArgument(start >= 0, "start must be positive");
         checkArgument(length >= 0, "length must be positive");
         checkArgument(estimatedFileSize >= 0, "estimatedFileSize must be positive");
-        requireNonNull(database, "database is null");
-        requireNonNull(table, "table is null");
         requireNonNull(partitionName, "partitionName is null");
         requireNonNull(path, "path is null");
         requireNonNull(schema, "schema is null");
@@ -106,8 +132,6 @@ public HiveSplit(
         requireNonNull(bucketValidation, "bucketValidation is null");
         requireNonNull(acidInfo, "acidInfo is null");
 
-        this.database = database;
-        this.table = table;
         this.partitionName = partitionName;
         this.path = path;
         this.start = start;
@@ -119,29 +143,14 @@ public HiveSplit(
         this.addresses = ImmutableList.copyOf(addresses);
         this.readBucketNumber = readBucketNumber;
         this.tableBucketNumber = tableBucketNumber;
-        this.statementId = statementId;
         this.forceLocalScheduling = forceLocalScheduling;
         this.tableToPartitionMapping = tableToPartitionMapping;
         this.bucketConversion = bucketConversion;
         this.bucketValidation = bucketValidation;
-        this.s3SelectPushdownEnabled = s3SelectPushdownEnabled;
         this.acidInfo = acidInfo;
-        this.splitNumber = splitNumber;
         this.splitWeight = requireNonNull(splitWeight, "splitWeight is null");
     }
 
-    @JsonProperty
-    public String getDatabase()
-    {
-        return database;
-    }
-
-    @JsonProperty
-    public String getTable()
-    {
-        return table;
-    }
-
     @JsonProperty
     public String getPartitionName()
     {
@@ -190,7 +199,8 @@ public List<HivePartitionKey> getPartitionKeys()
         return partitionKeys;
     }
 
-    @JsonProperty
+    // do not serialize addresses as they are not needed on workers
+    @JsonIgnore
     @Override
     public List<HostAddress> getAddresses()
     {
@@ -209,12 +219,6 @@ public OptionalInt getTableBucketNumber()
         return tableBucketNumber;
     }
 
-    @JsonProperty
-    public int getStatementId()
-    {
-        return statementId;
-    }
-
     @JsonProperty
     public boolean isForceLocalScheduling()
     {
@@ -245,24 +249,12 @@ public boolean isRemotelyAccessible()
         return !forceLocalScheduling;
     }
 
-    @JsonProperty
-    public boolean isS3SelectPushdownEnabled()
-    {
-        return s3SelectPushdownEnabled;
-    }
-
     @JsonProperty
     public Optional<AcidInfo> getAcidInfo()
     {
         return acidInfo;
     }
 
-    @JsonProperty
-    public long getSplitNumber()
-    {
-        return splitNumber;
-    }
-
     @JsonProperty
     @Override
     public SplitWeight getSplitWeight()
@@ -278,8 +270,6 @@ public long getRetainedSizeInBytes()
                 + estimatedSizeOf(schema, key -> estimatedSizeOf((String) key), value -> estimatedSizeOf((String) value))
                 + estimatedSizeOf(partitionKeys, HivePartitionKey::getEstimatedSizeInBytes)
                 + estimatedSizeOf(addresses, HostAddress::getRetainedSizeInBytes)
-                + estimatedSizeOf(database)
-                + estimatedSizeOf(table)
                 + estimatedSizeOf(partitionName)
                 + sizeOf(readBucketNumber)
                 + sizeOf(tableBucketNumber)
@@ -299,13 +289,9 @@ public Object getInfo()
                 .put("length", length)
                 .put("estimatedFileSize", estimatedFileSize)
                 .put("hosts", addresses)
-                .put("database", database)
-                .put("table", table)
                 .put("forceLocalScheduling", forceLocalScheduling)
                 .put("partitionName", partitionName)
                 .put("deserializerClassName", getDeserializerClassName(schema))
-                .put("s3SelectPushdownEnabled", s3SelectPushdownEnabled)
-                .put("splitNumber", splitNumber)
                 .buildOrThrow();
     }
 
@@ -320,116 +306,40 @@ public String toString()
                 .toString();
     }
 
-    public static class BucketConversion
+    public record BucketConversion(
+            BucketingVersion bucketingVersion,
+            int tableBucketCount,
+            int partitionBucketCount,
+            // tableBucketNumber is needed, but can be found in tableBucketNumber field of HiveSplit.
+            List<HiveColumnHandle> bucketColumnHandles)
     {
         private static final int INSTANCE_SIZE = instanceSize(BucketConversion.class);
 
-        private final BucketingVersion bucketingVersion;
-        private final int tableBucketCount;
-        private final int partitionBucketCount;
-        private final List<HiveColumnHandle> bucketColumnNames;
-        // tableBucketNumber is needed, but can be found in tableBucketNumber field of HiveSplit.
-
-        @JsonCreator
-        public BucketConversion(
-                @JsonProperty("bucketingVersion") BucketingVersion bucketingVersion,
-                @JsonProperty("tableBucketCount") int tableBucketCount,
-                @JsonProperty("partitionBucketCount") int partitionBucketCount,
-                @JsonProperty("bucketColumnHandles") List<HiveColumnHandle> bucketColumnHandles)
+        public BucketConversion
         {
-            this.bucketingVersion = requireNonNull(bucketingVersion, "bucketingVersion is null");
-            this.tableBucketCount = tableBucketCount;
-            this.partitionBucketCount = partitionBucketCount;
-            this.bucketColumnNames = requireNonNull(bucketColumnHandles, "bucketColumnHandles is null");
-        }
-
-        @JsonProperty
-        public BucketingVersion getBucketingVersion()
-        {
-            return bucketingVersion;
-        }
-
-        @JsonProperty
-        public int getTableBucketCount()
-        {
-            return tableBucketCount;
-        }
-
-        @JsonProperty
-        public int getPartitionBucketCount()
-        {
-            return partitionBucketCount;
-        }
-
-        @JsonProperty
-        public List<HiveColumnHandle> getBucketColumnHandles()
-        {
-            return bucketColumnNames;
-        }
-
-        @Override
-        public boolean equals(Object o)
-        {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            BucketConversion that = (BucketConversion) o;
-            return tableBucketCount == that.tableBucketCount &&
-                    partitionBucketCount == that.partitionBucketCount &&
-                    Objects.equals(bucketColumnNames, that.bucketColumnNames);
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hash(tableBucketCount, partitionBucketCount, bucketColumnNames);
+            requireNonNull(bucketingVersion, "bucketingVersion is null");
+            requireNonNull(bucketColumnHandles, "bucketColumnHandles is null");
+            bucketColumnHandles = ImmutableList.copyOf(requireNonNull(bucketColumnHandles, "bucketColumnHandles is null"));
         }
 
         public long getRetainedSizeInBytes()
         {
             return INSTANCE_SIZE
-                    + estimatedSizeOf(bucketColumnNames, HiveColumnHandle::getRetainedSizeInBytes);
+                    + estimatedSizeOf(bucketColumnHandles, HiveColumnHandle::getRetainedSizeInBytes);
         }
     }
 
-    public static class BucketValidation
+    public record BucketValidation(
+            BucketingVersion bucketingVersion,
+            int bucketCount,
+            List<HiveColumnHandle> bucketColumns)
     {
         private static final int INSTANCE_SIZE = instanceSize(BucketValidation.class);
 
-        private final BucketingVersion bucketingVersion;
-        private final int bucketCount;
-        private final List<HiveColumnHandle> bucketColumns;
-
-        @JsonCreator
-        public BucketValidation(
-                @JsonProperty("bucketingVersion") BucketingVersion bucketingVersion,
-                @JsonProperty("bucketCount") int bucketCount,
-                @JsonProperty("bucketColumns") List<HiveColumnHandle> bucketColumns)
-        {
-            this.bucketingVersion = requireNonNull(bucketingVersion, "bucketingVersion is null");
-            this.bucketCount = bucketCount;
-            this.bucketColumns = ImmutableList.copyOf(requireNonNull(bucketColumns, "bucketColumns is null"));
-        }
-
-        @JsonProperty
-        public BucketingVersion getBucketingVersion()
-        {
-            return bucketingVersion;
-        }
-
-        @JsonProperty
-        public int getBucketCount()
-        {
-            return bucketCount;
-        }
-
-        @JsonProperty
-        public List<HiveColumnHandle> getBucketColumns()
+        public BucketValidation
         {
-            return bucketColumns;
+            requireNonNull(bucketingVersion, "bucketingVersion is null");
+            bucketColumns = ImmutableList.copyOf(requireNonNull(bucketColumns, "bucketColumns is null"));
         }
 
         public long getRetainedSizeInBytes()
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSplitManager.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSplitManager.java
index e3336944ba85..7b04d6bfd01e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSplitManager.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSplitManager.java
@@ -18,11 +18,13 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.PeekingIterator;
+import com.google.common.collect.Streams;
+import com.google.inject.Inject;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.stats.CounterStat;
 import io.airlift.units.DataSize;
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.HdfsNamenodeStats;
 import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.Partition;
 import io.trino.plugin.hive.metastore.SemiTransactionalHiveMetastore;
@@ -43,17 +45,16 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.type.TypeManager;
+import jakarta.annotation.Nullable;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
@@ -61,7 +62,9 @@
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
+import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Iterators.peekingIterator;
 import static com.google.common.collect.Iterators.singletonIterator;
 import static com.google.common.collect.Iterators.transform;
@@ -74,7 +77,6 @@
 import static io.trino.plugin.hive.HiveSessionProperties.getDynamicFilteringWaitTimeout;
 import static io.trino.plugin.hive.HiveSessionProperties.getTimestampPrecision;
 import static io.trino.plugin.hive.HiveSessionProperties.isIgnoreAbsentPartitions;
-import static io.trino.plugin.hive.HiveSessionProperties.isOptimizeSymlinkListing;
 import static io.trino.plugin.hive.HiveSessionProperties.isPropagateTableScanSortingProperties;
 import static io.trino.plugin.hive.HiveSessionProperties.isUseOrcColumnNames;
 import static io.trino.plugin.hive.HiveSessionProperties.isUseParquetColumnNames;
@@ -103,8 +105,7 @@ public class HiveSplitManager
     private final HiveTransactionManager transactionManager;
     private final HivePartitionManager partitionManager;
     private final TrinoFileSystemFactory fileSystemFactory;
-    private final NamenodeStats namenodeStats;
-    private final HdfsEnvironment hdfsEnvironment;
+    private final HdfsNamenodeStats hdfsNamenodeStats;
     private final Executor executor;
     private final int maxOutstandingSplits;
     private final DataSize maxOutstandingSplitsSize;
@@ -124,8 +125,7 @@ public HiveSplitManager(
             HiveTransactionManager transactionManager,
             HivePartitionManager partitionManager,
             TrinoFileSystemFactory fileSystemFactory,
-            NamenodeStats namenodeStats,
-            HdfsEnvironment hdfsEnvironment,
+            HdfsNamenodeStats hdfsNamenodeStats,
             ExecutorService executorService,
             VersionEmbedder versionEmbedder,
             TypeManager typeManager)
@@ -134,8 +134,7 @@ public HiveSplitManager(
                 transactionManager,
                 partitionManager,
                 fileSystemFactory,
-                namenodeStats,
-                hdfsEnvironment,
+                hdfsNamenodeStats,
                 versionEmbedder.embedVersion(new BoundedExecutor(executorService, hiveConfig.getMaxSplitIteratorThreads())),
                 new CounterStat(),
                 hiveConfig.getMaxOutstandingSplits(),
@@ -154,8 +153,7 @@ public HiveSplitManager(
             HiveTransactionManager transactionManager,
             HivePartitionManager partitionManager,
             TrinoFileSystemFactory fileSystemFactory,
-            NamenodeStats namenodeStats,
-            HdfsEnvironment hdfsEnvironment,
+            HdfsNamenodeStats hdfsNamenodeStats,
             Executor executor,
             CounterStat highMemorySplitSourceCounter,
             int maxOutstandingSplits,
@@ -172,8 +170,7 @@ public HiveSplitManager(
         this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
         this.partitionManager = requireNonNull(partitionManager, "partitionManager is null");
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
-        this.namenodeStats = requireNonNull(namenodeStats, "namenodeStats is null");
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
+        this.hdfsNamenodeStats = requireNonNull(hdfsNamenodeStats, "hdfsNamenodeStats is null");
         this.executor = new ErrorCodedExecutor(executor);
         this.highMemorySplitSourceCounter = requireNonNull(highMemorySplitSourceCounter, "highMemorySplitSourceCounter is null");
         checkArgument(maxOutstandingSplits >= 1, "maxOutstandingSplits must be at least 1");
@@ -218,6 +215,18 @@ public ConnectorSplitSource getSplits(
             throw new HiveNotReadableException(tableName, Optional.empty(), tableNotReadable);
         }
 
+        // get buckets from first partition (arbitrary)
+        Optional<HiveBucketFilter> bucketFilter = hiveTable.getBucketFilter();
+
+        // validate bucket bucketed execution
+        Optional<HiveBucketHandle> bucketHandle = hiveTable.getBucketHandle();
+
+        bucketHandle.ifPresent(bucketing ->
+                verify(bucketing.getReadBucketCount() <= bucketing.getTableBucketCount(),
+                        "readBucketCount (%s) is greater than the tableBucketCount (%s) which generally points to an issue in plan generation",
+                        bucketing.getReadBucketCount(),
+                        bucketing.getTableBucketCount()));
+
         // get partitions
         Iterator<HivePartition> partitions = partitionManager.getPartitions(metastore, hiveTable);
 
@@ -229,27 +238,18 @@ public ConnectorSplitSource getSplits(
             return emptySplitSource();
         }
 
-        // get buckets from first partition (arbitrary)
-        Optional<HiveBucketFilter> bucketFilter = hiveTable.getBucketFilter();
-
-        // validate bucket bucketed execution
-        Optional<HiveBucketHandle> bucketHandle = hiveTable.getBucketHandle();
-
-        if (bucketHandle.isPresent()) {
-            if (bucketHandle.get().getReadBucketCount() > bucketHandle.get().getTableBucketCount()) {
-                throw new TrinoException(
-                        GENERIC_INTERNAL_ERROR,
-                        "readBucketCount (%s) is greater than the tableBucketCount (%s) which generally points to an issue in plan generation");
-            }
-        }
+        Set<String> neededColumnNames = Streams.concat(hiveTable.getProjectedColumns().stream(), hiveTable.getConstraintColumns().stream())
+                .map(columnHandle -> ((HiveColumnHandle) columnHandle).getBaseColumnName()) // possible duplicates are handled by toImmutableSet at the end
+                .map(columnName -> columnName.toLowerCase(ENGLISH))
+                .collect(toImmutableSet());
 
         Iterator<HivePartitionMetadata> hivePartitions = getPartitionMetadata(
                 session,
                 metastore,
                 table,
-                tableName,
                 peekingIterator(partitions),
-                bucketHandle.map(HiveBucketHandle::toTableBucketProperty));
+                bucketHandle.map(HiveBucketHandle::toTableBucketProperty),
+                neededColumnNames);
 
         HiveSplitLoader hiveSplitLoader = new BackgroundHiveSplitLoader(
                 table,
@@ -261,14 +261,12 @@ public ConnectorSplitSource getSplits(
                 createBucketSplitInfo(bucketHandle, bucketFilter),
                 session,
                 fileSystemFactory,
-                hdfsEnvironment,
-                namenodeStats,
+                hdfsNamenodeStats,
                 transactionalMetadata.getDirectoryLister(),
                 executor,
                 splitLoaderConcurrency,
                 recursiveDfsWalkerEnabled,
                 !hiveTable.getPartitionColumns().isEmpty() && isIgnoreAbsentPartitions(session),
-                isOptimizeSymlinkListing(session),
                 metastore.getValidWriteIds(session, hiveTable)
                         .map(value -> value.getTableValidWriteIdList(table.getDatabaseName() + "." + table.getTableName())),
                 hiveTable.getMaxScannedFileSize(),
@@ -302,9 +300,9 @@ private Iterator<HivePartitionMetadata> getPartitionMetadata(
             ConnectorSession session,
             SemiTransactionalHiveMetastore metastore,
             Table table,
-            SchemaTableName tableName,
             PeekingIterator<HivePartition> hivePartitions,
-            Optional<HiveBucketProperty> bucketProperty)
+            Optional<HiveBucketProperty> bucketProperty,
+            Set<String> neededColumnNames)
     {
         if (!hivePartitions.hasNext()) {
             return emptyIterator();
@@ -317,90 +315,41 @@ private Iterator<HivePartitionMetadata> getPartitionMetadata(
             return singletonIterator(new HivePartitionMetadata(firstPartition, Optional.empty(), TableToPartitionMapping.empty()));
         }
 
-        Optional<HiveStorageFormat> storageFormat = getHiveStorageFormat(table.getStorage().getStorageFormat());
+        HiveTimestampPrecision hiveTimestampPrecision = getTimestampPrecision(session);
+        boolean propagateTableScanSortingProperties = isPropagateTableScanSortingProperties(session);
+        boolean usePartitionColumnNames = isPartitionUsesColumnNames(session, getHiveStorageFormat(table.getStorage().getStorageFormat()));
 
         Iterator<List<HivePartition>> partitionNameBatches = partitionExponentially(hivePartitions, minPartitionBatchSize, maxPartitionBatchSize);
         Iterator<List<HivePartitionMetadata>> partitionBatches = transform(partitionNameBatches, partitionBatch -> {
-            Map<String, Optional<Partition>> batch = metastore.getPartitionsByNames(
+            SchemaTableName tableName = table.getSchemaTableName();
+            Map<String, Optional<Partition>> partitions = metastore.getPartitionsByNames(
                     tableName.getSchemaName(),
                     tableName.getTableName(),
                     Lists.transform(partitionBatch, HivePartition::getPartitionId));
-            ImmutableMap.Builder<String, Partition> partitionBuilder = ImmutableMap.builder();
-            for (Map.Entry<String, Optional<Partition>> entry : batch.entrySet()) {
-                if (entry.getValue().isEmpty()) {
-                    throw new TrinoException(HIVE_PARTITION_DROPPED_DURING_QUERY, "Partition no longer exists: " + entry.getKey());
-                }
-                partitionBuilder.put(entry.getKey(), entry.getValue().get());
-            }
-            Map<String, Partition> partitions = partitionBuilder.buildOrThrow();
+
             if (partitionBatch.size() != partitions.size()) {
                 throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Expected %s partitions but found %s", partitionBatch.size(), partitions.size()));
             }
 
-            ImmutableList.Builder<HivePartitionMetadata> results = ImmutableList.builder();
+            ImmutableList.Builder<HivePartitionMetadata> results = ImmutableList.builderWithExpectedSize(partitionBatch.size());
             for (HivePartition hivePartition : partitionBatch) {
-                Partition partition = partitions.get(hivePartition.getPartitionId());
+                Optional<Partition> partition = partitions.get(hivePartition.getPartitionId());
                 if (partition == null) {
                     throw new TrinoException(GENERIC_INTERNAL_ERROR, "Partition not loaded: " + hivePartition);
                 }
-                String partName = makePartitionName(table, partition);
-
-                // verify partition is online
-                verifyOnline(tableName, Optional.of(partName), getProtectMode(partition), partition.getParameters());
-
-                // verify partition is not marked as non-readable
-                String partitionNotReadable = partition.getParameters().get(OBJECT_NOT_READABLE);
-                if (!isNullOrEmpty(partitionNotReadable)) {
-                    throw new HiveNotReadableException(tableName, Optional.of(partName), partitionNotReadable);
-                }
-
-                // Verify that the partition schema matches the table schema.
-                // Either adding or dropping columns from the end of the table
-                // without modifying existing partitions is allowed, but every
-                // column that exists in both the table and partition must have
-                // the same type.
-                List<Column> tableColumns = table.getDataColumns();
-                List<Column> partitionColumns = partition.getColumns();
-                if ((tableColumns == null) || (partitionColumns == null)) {
-                    throw new TrinoException(HIVE_INVALID_METADATA, format("Table '%s' or partition '%s' has null columns", tableName, partName));
-                }
-                TableToPartitionMapping tableToPartitionMapping = getTableToPartitionMapping(session, storageFormat, tableName, partName, tableColumns, partitionColumns);
-
-                if (bucketProperty.isPresent()) {
-                    HiveBucketProperty partitionBucketProperty = partition.getStorage().getBucketProperty()
-                            .orElseThrow(() -> new TrinoException(HIVE_PARTITION_SCHEMA_MISMATCH, format(
-                                    "Hive table (%s) is bucketed but partition (%s) is not bucketed",
-                                    hivePartition.getTableName(),
-                                    hivePartition.getPartitionId())));
-                    int tableBucketCount = bucketProperty.get().getBucketCount();
-                    int partitionBucketCount = partitionBucketProperty.getBucketCount();
-                    List<String> tableBucketColumns = bucketProperty.get().getBucketedBy();
-                    List<String> partitionBucketColumns = partitionBucketProperty.getBucketedBy();
-                    if (!tableBucketColumns.equals(partitionBucketColumns) || !isBucketCountCompatible(tableBucketCount, partitionBucketCount)) {
-                        throw new TrinoException(HIVE_PARTITION_SCHEMA_MISMATCH, format(
-                                "Hive table (%s) bucketing (columns=%s, buckets=%s) is not compatible with partition (%s) bucketing (columns=%s, buckets=%s)",
-                                hivePartition.getTableName(),
-                                tableBucketColumns,
-                                tableBucketCount,
-                                hivePartition.getPartitionId(),
-                                partitionBucketColumns,
-                                partitionBucketCount));
-                    }
-                    if (isPropagateTableScanSortingProperties(session)) {
-                        List<SortingColumn> tableSortedColumns = bucketProperty.get().getSortedBy();
-                        List<SortingColumn> partitionSortedColumns = partitionBucketProperty.getSortedBy();
-                        if (!isSortingCompatible(tableSortedColumns, partitionSortedColumns)) {
-                            throw new TrinoException(HIVE_PARTITION_SCHEMA_MISMATCH, format(
-                                    "Hive table (%s) sorting by %s is not compatible with partition (%s) sorting by %s. This restriction can be avoided by disabling propagate_table_scan_sorting_properties.",
-                                    hivePartition.getTableName(),
-                                    tableSortedColumns.stream().map(HiveUtil::sortingColumnToString).collect(toImmutableList()),
-                                    hivePartition.getPartitionId(),
-                                    partitionSortedColumns.stream().map(HiveUtil::sortingColumnToString).collect(toImmutableList())));
-                        }
-                    }
+                if (partition.isEmpty()) {
+                    throw new TrinoException(HIVE_PARTITION_DROPPED_DURING_QUERY, "Partition no longer exists: " + hivePartition.getPartitionId());
                 }
-
-                results.add(new HivePartitionMetadata(hivePartition, Optional.of(partition), tableToPartitionMapping));
+                results.add(toPartitionMetadata(
+                        typeManager,
+                        hiveTimestampPrecision,
+                        propagateTableScanSortingProperties,
+                        usePartitionColumnNames,
+                        table,
+                        bucketProperty,
+                        hivePartition,
+                        partition.get(),
+                        neededColumnNames));
             }
 
             return results.build();
@@ -410,14 +359,96 @@ private Iterator<HivePartitionMetadata> getPartitionMetadata(
                 .iterator();
     }
 
-    private TableToPartitionMapping getTableToPartitionMapping(ConnectorSession session, Optional<HiveStorageFormat> storageFormat, SchemaTableName tableName, String partName, List<Column> tableColumns, List<Column> partitionColumns)
+    private static HivePartitionMetadata toPartitionMetadata(
+            TypeManager typeManager,
+            HiveTimestampPrecision hiveTimestampPrecision,
+            boolean propagateTableScanSortingProperties,
+            boolean usePartitionColumnNames,
+            Table table,
+            Optional<HiveBucketProperty> bucketProperty,
+            HivePartition hivePartition,
+            Partition partition,
+            Set<String> neededColumnNames)
     {
-        HiveTimestampPrecision hiveTimestampPrecision = getTimestampPrecision(session);
-        if (storageFormat.isPresent() && isPartitionUsesColumnNames(session, storageFormat.get())) {
-            return getTableToPartitionMappingByColumnNames(tableName, partName, tableColumns, partitionColumns, hiveTimestampPrecision);
+        SchemaTableName tableName = table.getSchemaTableName();
+        String partName = makePartitionName(table, partition);
+        // verify partition is online
+        verifyOnline(tableName, Optional.of(partName), getProtectMode(partition), partition.getParameters());
+
+        // verify partition is not marked as non-readable
+        String partitionNotReadable = partition.getParameters().get(OBJECT_NOT_READABLE);
+        if (!isNullOrEmpty(partitionNotReadable)) {
+            throw new HiveNotReadableException(tableName, Optional.of(partName), partitionNotReadable);
+        }
+
+        // Verify that the partition schema matches the table schema.
+        // Either adding or dropping columns from the end of the table
+        // without modifying existing partitions is allowed, but every
+        // column that exists in both the table and partition must have
+        // the same type.
+        List<Column> tableColumns = table.getDataColumns();
+        List<Column> partitionColumns = partition.getColumns();
+        if ((tableColumns == null) || (partitionColumns == null)) {
+            throw new TrinoException(HIVE_INVALID_METADATA, format("Table '%s' or partition '%s' has null columns", tableName, partName));
+        }
+
+        TableToPartitionMapping tableToPartitionMapping = getTableToPartitionMapping(usePartitionColumnNames, typeManager, hiveTimestampPrecision, tableName, partName, tableColumns, partitionColumns, neededColumnNames);
+
+        if (bucketProperty.isPresent()) {
+            HiveBucketProperty partitionBucketProperty = partition.getStorage().getBucketProperty()
+                    .orElseThrow(() -> new TrinoException(HIVE_PARTITION_SCHEMA_MISMATCH, format(
+                            "Hive table (%s) is bucketed but partition (%s) is not bucketed",
+                            tableName,
+                            partName)));
+            int tableBucketCount = bucketProperty.get().getBucketCount();
+            int partitionBucketCount = partitionBucketProperty.getBucketCount();
+            List<String> tableBucketColumns = bucketProperty.get().getBucketedBy();
+            List<String> partitionBucketColumns = partitionBucketProperty.getBucketedBy();
+            if (!tableBucketColumns.equals(partitionBucketColumns) || !isBucketCountCompatible(tableBucketCount, partitionBucketCount)) {
+                throw new TrinoException(HIVE_PARTITION_SCHEMA_MISMATCH, format(
+                        "Hive table (%s) bucketing (columns=%s, buckets=%s) is not compatible with partition (%s) bucketing (columns=%s, buckets=%s)",
+                        tableName,
+                        tableBucketColumns,
+                        tableBucketCount,
+                        partName,
+                        partitionBucketColumns,
+                        partitionBucketCount));
+            }
+            if (propagateTableScanSortingProperties) {
+                List<SortingColumn> tableSortedColumns = bucketProperty.get().getSortedBy();
+                List<SortingColumn> partitionSortedColumns = partitionBucketProperty.getSortedBy();
+                if (!isSortingCompatible(tableSortedColumns, partitionSortedColumns)) {
+                    throw new TrinoException(HIVE_PARTITION_SCHEMA_MISMATCH, format(
+                            "Hive table (%s) sorting by %s is not compatible with partition (%s) sorting by %s. This restriction can be avoided by disabling propagate_table_scan_sorting_properties.",
+                            tableName,
+                            tableSortedColumns.stream().map(HiveUtil::sortingColumnToString).collect(toImmutableList()),
+                            partName,
+                            partitionSortedColumns.stream().map(HiveUtil::sortingColumnToString).collect(toImmutableList())));
+                }
+            }
+        }
+        return new HivePartitionMetadata(hivePartition, Optional.of(partition), tableToPartitionMapping);
+    }
+
+    private static TableToPartitionMapping getTableToPartitionMapping(
+            boolean usePartitionColumnNames,
+            TypeManager typeManager,
+            HiveTimestampPrecision hiveTimestampPrecision,
+            SchemaTableName tableName,
+            String partName,
+            List<Column> tableColumns,
+            List<Column> partitionColumns,
+            Set<String> neededColumnNames)
+    {
+        if (usePartitionColumnNames) {
+            return getTableToPartitionMappingByColumnNames(typeManager, tableName, partName, tableColumns, partitionColumns, neededColumnNames, hiveTimestampPrecision);
         }
         ImmutableMap.Builder<Integer, HiveTypeName> columnCoercions = ImmutableMap.builder();
         for (int i = 0; i < min(partitionColumns.size(), tableColumns.size()); i++) {
+            if (!neededColumnNames.contains(tableColumns.get(i).getName().toLowerCase(ENGLISH))) {
+                // skip columns not used in the query
+                continue;
+            }
             HiveType tableType = tableColumns.get(i).getType();
             HiveType partitionType = partitionColumns.get(i).getType();
             if (!tableType.equals(partitionType)) {
@@ -430,27 +461,36 @@ private TableToPartitionMapping getTableToPartitionMapping(ConnectorSession sess
         return mapColumnsByIndex(columnCoercions.buildOrThrow());
     }
 
-    private static boolean isPartitionUsesColumnNames(ConnectorSession session, HiveStorageFormat storageFormat)
+    private static boolean isPartitionUsesColumnNames(ConnectorSession session, Optional<HiveStorageFormat> storageFormat)
     {
-        switch (storageFormat) {
-            case AVRO:
-                return true;
-            case JSON:
-                return true;
-            case ORC:
-                return isUseOrcColumnNames(session);
-            case PARQUET:
-                return isUseParquetColumnNames(session);
-            default:
-                return false;
+        if (storageFormat.isEmpty()) {
+            return false;
         }
+        return switch (storageFormat.get()) {
+            case AVRO, JSON -> true;
+            case ORC -> isUseOrcColumnNames(session);
+            case PARQUET -> isUseParquetColumnNames(session);
+            default -> false;
+        };
     }
 
-    private TableToPartitionMapping getTableToPartitionMappingByColumnNames(SchemaTableName tableName, String partName, List<Column> tableColumns, List<Column> partitionColumns, HiveTimestampPrecision hiveTimestampPrecision)
+    private static TableToPartitionMapping getTableToPartitionMappingByColumnNames(
+            TypeManager typeManager,
+            SchemaTableName tableName,
+            String partName,
+            List<Column> tableColumns,
+            List<Column> partitionColumns,
+            Set<String> neededColumnNames,
+            HiveTimestampPrecision hiveTimestampPrecision)
     {
-        ImmutableMap.Builder<String, Integer> partitionColumnIndexesBuilder = ImmutableMap.builder();
+        ImmutableMap.Builder<String, Integer> partitionColumnIndexesBuilder = ImmutableMap.builderWithExpectedSize(partitionColumns.size());
         for (int i = 0; i < partitionColumns.size(); i++) {
-            partitionColumnIndexesBuilder.put(partitionColumns.get(i).getName().toLowerCase(ENGLISH), i);
+            String columnName = partitionColumns.get(i).getName().toLowerCase(ENGLISH);
+            if (!neededColumnNames.contains(columnName)) {
+                // skip columns not used in the query
+                continue;
+            }
+            partitionColumnIndexesBuilder.put(columnName, i);
         }
         Map<String, Integer> partitionColumnsByIndex = partitionColumnIndexesBuilder.buildOrThrow();
 
@@ -477,7 +517,7 @@ private TableToPartitionMapping getTableToPartitionMappingByColumnNames(SchemaTa
         return new TableToPartitionMapping(Optional.of(tableToPartitionColumns.buildOrThrow()), columnCoercions.buildOrThrow());
     }
 
-    private TrinoException tablePartitionColumnMismatchException(SchemaTableName tableName, String partName, String tableColumnName, HiveType tableType, String partitionColumnName, HiveType partitionType)
+    private static TrinoException tablePartitionColumnMismatchException(SchemaTableName tableName, String partName, String tableColumnName, HiveType tableType, String partitionColumnName, HiveType partitionType)
     {
         return new TrinoException(HIVE_PARTITION_SCHEMA_MISMATCH, format("" +
                         "There is a mismatch between the table and partition schemas. " +
@@ -539,7 +579,7 @@ protected List<T> computeNext()
                 }
 
                 int count = 0;
-                ImmutableList.Builder<T> builder = ImmutableList.builder();
+                ImmutableList.Builder<T> builder = ImmutableList.builderWithExpectedSize(currentSize);
                 while (values.hasNext() && count < currentSize) {
                     builder.add(values.next());
                     ++count;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSplitSource.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSplitSource.java
index 2a100a7680b4..63f36aec0269 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSplitSource.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveSplitSource.java
@@ -75,7 +75,6 @@ class HiveSplitSource
     private final DataSize maxSplitSize;
     private final DataSize maxInitialSplitSize;
     private final AtomicInteger remainingInitialSplits;
-    private final AtomicLong numberOfProcessedSplits;
 
     private final HiveSplitLoader splitLoader;
     private final AtomicReference<State> stateReference;
@@ -114,7 +113,6 @@ private HiveSplitSource(
         this.maxSplitSize = getMaxSplitSize(session);
         this.maxInitialSplitSize = getMaxInitialSplitSize(session);
         this.remainingInitialSplits = new AtomicInteger(maxInitialSplits);
-        this.numberOfProcessedSplits = new AtomicLong(0);
         this.splitWeightProvider = isSizeBasedSplitWeightsEnabled(session) ? new SizeBasedSplitWeightProvider(getMinimumAssignedSplitWeight(session), maxSplitSize) : HiveSplitWeightProvider.uniformStandardWeightProvider();
         this.recordScannedFiles = recordScannedFiles;
     }
@@ -299,8 +297,6 @@ else if (maxSplitBytes * 2 >= remainingBlockBytes) {
                 }
 
                 resultBuilder.add(new HiveSplit(
-                        databaseName,
-                        tableName,
                         internalSplit.getPartitionName(),
                         internalSplit.getPath(),
                         internalSplit.getStart(),
@@ -312,14 +308,11 @@ else if (maxSplitBytes * 2 >= remainingBlockBytes) {
                         block.getAddresses(),
                         internalSplit.getReadBucketNumber(),
                         internalSplit.getTableBucketNumber(),
-                        internalSplit.getStatementId(),
                         internalSplit.isForceLocalScheduling(),
                         internalSplit.getTableToPartitionMapping(),
                         internalSplit.getBucketConversion(),
                         internalSplit.getBucketValidation(),
-                        internalSplit.isS3SelectPushdownEnabled(),
                         internalSplit.getAcidInfo(),
-                        numberOfProcessedSplits.getAndIncrement(),
                         splitWeightProvider.weightForSplitSizeInBytes(splitBytes)));
 
                 internalSplit.increaseStart(splitBytes);
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveStorageFormat.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveStorageFormat.java
index e8ff5e61d3f3..9be534ff19d8 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveStorageFormat.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveStorageFormat.java
@@ -13,8 +13,8 @@
  */
 package io.trino.plugin.hive;
 
-import io.airlift.units.DataSize;
-import io.airlift.units.DataSize.Unit;
+import com.google.common.collect.ImmutableMap;
+import io.trino.hive.formats.compression.CompressionKind;
 import io.trino.plugin.hive.metastore.StorageFormat;
 import io.trino.plugin.hive.type.Category;
 import io.trino.plugin.hive.type.MapTypeInfo;
@@ -26,11 +26,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 
 import static com.google.common.base.Functions.identity;
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.trino.plugin.hive.util.HiveClassNames.AVRO_CONTAINER_INPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.AVRO_CONTAINER_OUTPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.AVRO_SERDE_CLASS;
@@ -50,82 +48,70 @@
 import static io.trino.plugin.hive.util.HiveClassNames.PARQUET_HIVE_SERDE_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.RCFILE_INPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.RCFILE_OUTPUT_FORMAT_CLASS;
-import static io.trino.plugin.hive.util.HiveClassNames.REGEX_HIVE_SERDE_CLASS;
+import static io.trino.plugin.hive.util.HiveClassNames.REGEX_SERDE_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.SEQUENCEFILE_INPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.TEXT_INPUT_FORMAT_CLASS;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toMap;
 
 public enum HiveStorageFormat
 {
     ORC(
             ORC_SERDE_CLASS,
             ORC_INPUT_FORMAT_CLASS,
-            ORC_OUTPUT_FORMAT_CLASS,
-            DataSize.of(64, Unit.MEGABYTE)),
+            ORC_OUTPUT_FORMAT_CLASS),
     PARQUET(
             PARQUET_HIVE_SERDE_CLASS,
             MAPRED_PARQUET_INPUT_FORMAT_CLASS,
-            MAPRED_PARQUET_OUTPUT_FORMAT_CLASS,
-            DataSize.of(64, Unit.MEGABYTE)),
+            MAPRED_PARQUET_OUTPUT_FORMAT_CLASS),
     AVRO(
             AVRO_SERDE_CLASS,
             AVRO_CONTAINER_INPUT_FORMAT_CLASS,
-            AVRO_CONTAINER_OUTPUT_FORMAT_CLASS,
-            DataSize.of(64, Unit.MEGABYTE)),
+            AVRO_CONTAINER_OUTPUT_FORMAT_CLASS),
     RCBINARY(
             LAZY_BINARY_COLUMNAR_SERDE_CLASS,
             RCFILE_INPUT_FORMAT_CLASS,
-            RCFILE_OUTPUT_FORMAT_CLASS,
-            DataSize.of(8, Unit.MEGABYTE)),
+            RCFILE_OUTPUT_FORMAT_CLASS),
     RCTEXT(
             COLUMNAR_SERDE_CLASS,
             RCFILE_INPUT_FORMAT_CLASS,
-            RCFILE_OUTPUT_FORMAT_CLASS,
-            DataSize.of(8, Unit.MEGABYTE)),
+            RCFILE_OUTPUT_FORMAT_CLASS),
     SEQUENCEFILE(
             LAZY_SIMPLE_SERDE_CLASS,
             SEQUENCEFILE_INPUT_FORMAT_CLASS,
-            HIVE_SEQUENCEFILE_OUTPUT_FORMAT_CLASS,
-            DataSize.of(8, Unit.MEGABYTE)),
+            HIVE_SEQUENCEFILE_OUTPUT_FORMAT_CLASS),
     JSON(
             JSON_SERDE_CLASS,
             TEXT_INPUT_FORMAT_CLASS,
-            HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS,
-            DataSize.of(8, Unit.MEGABYTE)),
+            HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS),
     OPENX_JSON(
             OPENX_JSON_SERDE_CLASS,
             TEXT_INPUT_FORMAT_CLASS,
-            HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS,
-            DataSize.of(8, Unit.MEGABYTE)),
+            HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS),
     TEXTFILE(
             LAZY_SIMPLE_SERDE_CLASS,
             TEXT_INPUT_FORMAT_CLASS,
-            HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS,
-            DataSize.of(8, Unit.MEGABYTE)),
+            HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS),
     CSV(
             OPENCSV_SERDE_CLASS,
             TEXT_INPUT_FORMAT_CLASS,
-            HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS,
-            DataSize.of(8, Unit.MEGABYTE)),
+            HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS),
     REGEX(
-            REGEX_HIVE_SERDE_CLASS,
+            REGEX_SERDE_CLASS,
             TEXT_INPUT_FORMAT_CLASS,
-            HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS,
-            DataSize.of(8, Unit.MEGABYTE));
+            HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS);
 
     private final String serde;
     private final String inputFormat;
     private final String outputFormat;
-    private final DataSize estimatedWriterMemoryUsage;
 
-    HiveStorageFormat(String serde, String inputFormat, String outputFormat, DataSize estimatedWriterMemoryUsage)
+    HiveStorageFormat(String serde, String inputFormat, String outputFormat)
     {
         this.serde = requireNonNull(serde, "serde is null");
         this.inputFormat = requireNonNull(inputFormat, "inputFormat is null");
         this.outputFormat = requireNonNull(outputFormat, "outputFormat is null");
-        this.estimatedWriterMemoryUsage = requireNonNull(estimatedWriterMemoryUsage, "estimatedWriterMemoryUsage is null");
     }
 
     public String getSerde()
@@ -143,9 +129,13 @@ public String getOutputFormat()
         return outputFormat;
     }
 
-    public DataSize getEstimatedWriterMemoryUsage()
+    public boolean isSplittable(String path)
     {
-        return estimatedWriterMemoryUsage;
+        // Only uncompressed text input format is splittable
+        return switch (this) {
+            case ORC, PARQUET, AVRO, RCBINARY, RCTEXT, SEQUENCEFILE -> true;
+            case JSON, OPENX_JSON, TEXTFILE, CSV, REGEX -> CompressionKind.forFile(path).isEmpty();
+        };
     }
 
     public void validateColumns(List<HiveColumnHandle> handles)
@@ -179,45 +169,6 @@ else if (type.getCategory() == Category.PRIMITIVE) {
         }
     }
 
-    private static final Map<SerdeAndInputFormat, HiveStorageFormat> HIVE_STORAGE_FORMAT_FROM_STORAGE_FORMAT = Arrays.stream(HiveStorageFormat.values())
-            .collect(toImmutableMap(format -> new SerdeAndInputFormat(format.getSerde(), format.getInputFormat()), identity()));
-
-    private static final class SerdeAndInputFormat
-    {
-        private final String serde;
-        private final String inputFormat;
-
-        public SerdeAndInputFormat(String serde, String inputFormat)
-        {
-            this.serde = serde;
-            this.inputFormat = inputFormat;
-        }
-
-        @Override
-        public boolean equals(Object o)
-        {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            SerdeAndInputFormat that = (SerdeAndInputFormat) o;
-            return serde.equals(that.serde) && inputFormat.equals(that.inputFormat);
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hash(serde, inputFormat);
-        }
-    }
-
-    public static Optional<HiveStorageFormat> getHiveStorageFormat(StorageFormat storageFormat)
-    {
-        return Optional.ofNullable(HIVE_STORAGE_FORMAT_FROM_STORAGE_FORMAT.get(new SerdeAndInputFormat(storageFormat.getSerde(), storageFormat.getInputFormat())));
-    }
-
     private static PrimitiveTypeInfo primitiveTypeInfo(TypeInfo typeInfo)
     {
         return (PrimitiveTypeInfo) typeInfo;
@@ -227,4 +178,21 @@ private static MapTypeInfo mapTypeInfo(TypeInfo typeInfo)
     {
         return (MapTypeInfo) typeInfo;
     }
+
+    @SuppressWarnings("unused")
+    private record SerdeAndInputFormat(String serde, String inputFormat) {}
+
+    private static final Map<SerdeAndInputFormat, HiveStorageFormat> HIVE_STORAGE_FORMATS = ImmutableMap.<SerdeAndInputFormat, HiveStorageFormat>builder()
+            .putAll(Arrays.stream(values()).collect(
+                    toMap(format -> new SerdeAndInputFormat(format.getSerde(), format.getInputFormat()), identity())))
+            .put(new SerdeAndInputFormat(PARQUET_HIVE_SERDE_CLASS, "parquet.hive.DeprecatedParquetInputFormat"), PARQUET)
+            .put(new SerdeAndInputFormat(PARQUET_HIVE_SERDE_CLASS, "org.apache.hadoop.mapred.TextInputFormat"), PARQUET)
+            .put(new SerdeAndInputFormat(PARQUET_HIVE_SERDE_CLASS, "parquet.hive.MapredParquetInputFormat"), PARQUET)
+            .buildOrThrow();
+
+    public static Optional<HiveStorageFormat> getHiveStorageFormat(StorageFormat storageFormat)
+    {
+        return Optional.ofNullable(HIVE_STORAGE_FORMATS.get(
+                new SerdeAndInputFormat(storageFormat.getSerde(), storageFormat.getInputFormat())));
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveTableProperties.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveTableProperties.java
index 328f494cbbfc..51a70f9bc7e6 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveTableProperties.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveTableProperties.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.hive.metastore.SortingColumn;
 import io.trino.plugin.hive.orc.OrcWriterConfig;
 import io.trino.plugin.hive.util.HiveBucketing.BucketingVersion;
@@ -21,8 +22,8 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
-
-import javax.inject.Inject;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.TypeManager;
 
 import java.util.List;
 import java.util.Map;
@@ -69,13 +70,15 @@ public class HiveTableProperties
     public static final String REGEX_CASE_INSENSITIVE = "regex_case_insensitive";
     public static final String TRANSACTIONAL = "transactional";
     public static final String AUTO_PURGE = "auto_purge";
+    public static final String EXTRA_PROPERTIES = "extra_properties";
 
     private final List<PropertyMetadata<?>> tableProperties;
 
     @Inject
     public HiveTableProperties(
             HiveConfig config,
-            OrcWriterConfig orcWriterConfig)
+            OrcWriterConfig orcWriterConfig,
+            TypeManager typeManager)
     {
         tableProperties = ImmutableList.of(
                 stringProperty(
@@ -173,7 +176,25 @@ public HiveTableProperties(
                         PARTITION_PROJECTION_LOCATION_TEMPLATE,
                         "Partition projection location template",
                         null,
-                        false));
+                        false),
+                new PropertyMetadata<>(
+                        EXTRA_PROPERTIES,
+                        "Extra table properties",
+                        new MapType(VARCHAR, VARCHAR, typeManager.getTypeOperators()),
+                        Map.class,
+                        null,
+                        true, // currently not shown in SHOW CREATE TABLE
+                        value -> {
+                            Map<String, String> extraProperties = (Map<String, String>) value;
+                            if (extraProperties.containsValue(null)) {
+                                throw new TrinoException(INVALID_TABLE_PROPERTY, format("Extra table property value cannot be null '%s'", extraProperties));
+                            }
+                            if (extraProperties.containsKey(null)) {
+                                throw new TrinoException(INVALID_TABLE_PROPERTY, format("Extra table property key cannot be null '%s'", extraProperties));
+                            }
+                            return extraProperties;
+                        },
+                        value -> value));
     }
 
     public List<PropertyMetadata<?>> getTableProperties()
@@ -311,4 +332,9 @@ public static Optional<Boolean> isAutoPurge(Map<String, Object> tableProperties)
     {
         return Optional.ofNullable((Boolean) tableProperties.get(AUTO_PURGE));
     }
+
+    public static Optional<Map<String, String>> getExtraProperties(Map<String, Object> tableProperties)
+    {
+        return Optional.ofNullable((Map<String, String>) tableProperties.get(EXTRA_PROPERTIES));
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveTransactionManager.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveTransactionManager.java
index d0293b78e2d2..2525487b0d50 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveTransactionManager.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveTransactionManager.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.hive;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.security.ConnectorIdentity;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveType.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveType.java
index 210d05c3cc94..d4c9b7e851d7 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveType.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveType.java
@@ -35,16 +35,15 @@
 import static com.google.common.base.Strings.lenientFormat;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.slice.SizeOf.instanceSize;
+import static io.trino.hive.formats.UnionToRowCoercionUtils.UNION_FIELD_FIELD_PREFIX;
+import static io.trino.hive.formats.UnionToRowCoercionUtils.UNION_FIELD_TAG_NAME;
+import static io.trino.hive.formats.UnionToRowCoercionUtils.UNION_FIELD_TAG_TYPE;
 import static io.trino.plugin.hive.HiveStorageFormat.AVRO;
 import static io.trino.plugin.hive.HiveStorageFormat.ORC;
 import static io.trino.plugin.hive.HiveTimestampPrecision.DEFAULT_PRECISION;
 import static io.trino.plugin.hive.type.TypeInfoFactory.getPrimitiveTypeInfo;
 import static io.trino.plugin.hive.type.TypeInfoUtils.getTypeInfoFromTypeString;
 import static io.trino.plugin.hive.type.TypeInfoUtils.getTypeInfosFromTypeString;
-import static io.trino.plugin.hive.util.HiveTypeTranslator.UNION_FIELD_FIELD_PREFIX;
-import static io.trino.plugin.hive.util.HiveTypeTranslator.UNION_FIELD_TAG_NAME;
-import static io.trino.plugin.hive.util.HiveTypeTranslator.UNION_FIELD_TAG_TYPE;
-import static io.trino.plugin.hive.util.HiveTypeTranslator.fromPrimitiveType;
 import static io.trino.plugin.hive.util.HiveTypeTranslator.toTypeInfo;
 import static io.trino.plugin.hive.util.HiveTypeTranslator.toTypeSignature;
 import static io.trino.plugin.hive.util.SerdeConstants.BIGINT_TYPE_NAME;
@@ -56,6 +55,7 @@
 import static io.trino.plugin.hive.util.SerdeConstants.INT_TYPE_NAME;
 import static io.trino.plugin.hive.util.SerdeConstants.SMALLINT_TYPE_NAME;
 import static io.trino.plugin.hive.util.SerdeConstants.STRING_TYPE_NAME;
+import static io.trino.plugin.hive.util.SerdeConstants.TIMESTAMPLOCALTZ_TYPE_NAME;
 import static io.trino.plugin.hive.util.SerdeConstants.TIMESTAMP_TYPE_NAME;
 import static io.trino.plugin.hive.util.SerdeConstants.TINYINT_TYPE_NAME;
 import static java.util.Objects.requireNonNull;
@@ -73,6 +73,7 @@ public final class HiveType
     public static final HiveType HIVE_DOUBLE = new HiveType(getPrimitiveTypeInfo(DOUBLE_TYPE_NAME));
     public static final HiveType HIVE_STRING = new HiveType(getPrimitiveTypeInfo(STRING_TYPE_NAME));
     public static final HiveType HIVE_TIMESTAMP = new HiveType(getPrimitiveTypeInfo(TIMESTAMP_TYPE_NAME));
+    public static final HiveType HIVE_TIMESTAMPLOCALTZ = new HiveType(getPrimitiveTypeInfo(TIMESTAMPLOCALTZ_TYPE_NAME));
     public static final HiveType HIVE_DATE = new HiveType(getPrimitiveTypeInfo(DATE_TYPE_NAME));
     public static final HiveType HIVE_BINARY = new HiveType(getPrimitiveTypeInfo(BINARY_TYPE_NAME));
 
@@ -162,35 +163,50 @@ public boolean isSupportedType(StorageFormat storageFormat)
         return isSupportedType(getTypeInfo(), storageFormat);
     }
 
-    public static boolean isSupportedType(TypeInfo typeInfo, StorageFormat storageFormat)
+    private static boolean isSupportedType(TypeInfo typeInfo, StorageFormat storageFormat)
     {
-        switch (typeInfo.getCategory()) {
-            case PRIMITIVE:
-                return fromPrimitiveType((PrimitiveTypeInfo) typeInfo) != null;
-            case MAP:
-                MapTypeInfo mapTypeInfo = (MapTypeInfo) typeInfo;
-                return isSupportedType(mapTypeInfo.getMapKeyTypeInfo(), storageFormat) && isSupportedType(mapTypeInfo.getMapValueTypeInfo(), storageFormat);
-            case LIST:
-                ListTypeInfo listTypeInfo = (ListTypeInfo) typeInfo;
-                return isSupportedType(listTypeInfo.getListElementTypeInfo(), storageFormat);
-            case STRUCT:
-                StructTypeInfo structTypeInfo = (StructTypeInfo) typeInfo;
-                return structTypeInfo.getAllStructFieldTypeInfos().stream()
-                        .allMatch(fieldTypeInfo -> isSupportedType(fieldTypeInfo, storageFormat));
-            case UNION:
-                // This feature (reading uniontypes as structs) has only been verified against Avro and ORC tables. Here's a discussion:
-                //   1. Avro tables are supported and verified.
-                //   2. ORC tables are supported and verified.
-                //   3. The Parquet format doesn't support uniontypes itself so there's no need to add support for it in Trino.
-                //   4. TODO: RCFile tables are not supported yet.
-                //   5. TODO: The support for Avro is done in SerDeUtils so it's possible that formats other than Avro are also supported. But verification is needed.
-                if (storageFormat.getSerde().equalsIgnoreCase(AVRO.getSerde()) || storageFormat.getSerde().equalsIgnoreCase(ORC.getSerde())) {
-                    UnionTypeInfo unionTypeInfo = (UnionTypeInfo) typeInfo;
-                    return unionTypeInfo.getAllUnionObjectTypeInfos().stream()
-                            .allMatch(fieldTypeInfo -> isSupportedType(fieldTypeInfo, storageFormat));
-                }
-        }
-        return false;
+        return switch (typeInfo.getCategory()) {
+            case PRIMITIVE -> isSupported((PrimitiveTypeInfo) typeInfo);
+            case MAP -> isSupportedType(((MapTypeInfo) typeInfo).getMapKeyTypeInfo(), storageFormat) &&
+                    isSupportedType(((MapTypeInfo) typeInfo).getMapValueTypeInfo(), storageFormat);
+            case LIST -> isSupportedType(((ListTypeInfo) typeInfo).getListElementTypeInfo(), storageFormat);
+            case STRUCT -> ((StructTypeInfo) typeInfo).getAllStructFieldTypeInfos().stream().allMatch(fieldTypeInfo -> isSupportedType(fieldTypeInfo, storageFormat));
+            case UNION ->
+                    // This feature (reading union types as structs) has only been verified against Avro and ORC tables. Here's a discussion:
+                    //   1. Avro tables are supported and verified.
+                    //   2. ORC tables are supported and verified.
+                    //   3. The Parquet format doesn't support union types itself so there's no need to add support for it in Trino.
+                    //   4. TODO: RCFile tables are not supported yet.
+                    //   5. TODO: The support for Avro is done in SerDeUtils so it's possible that formats other than Avro are also supported. But verification is needed.
+                    storageFormat.getSerde().equalsIgnoreCase(AVRO.getSerde()) ||
+                            storageFormat.getSerde().equalsIgnoreCase(ORC.getSerde()) ||
+                            ((UnionTypeInfo) typeInfo).getAllUnionObjectTypeInfos().stream().allMatch(fieldTypeInfo -> isSupportedType(fieldTypeInfo, storageFormat));
+        };
+    }
+
+    private static boolean isSupported(PrimitiveTypeInfo typeInfo)
+    {
+        return switch (typeInfo.getPrimitiveCategory()) {
+            case BOOLEAN,
+                    BYTE,
+                    SHORT,
+                    INT,
+                    LONG,
+                    FLOAT,
+                    DOUBLE,
+                    STRING,
+                    VARCHAR,
+                    CHAR,
+                    DATE,
+                    TIMESTAMP,
+                    TIMESTAMPLOCALTZ,
+                    BINARY,
+                    DECIMAL -> true;
+            case INTERVAL_YEAR_MONTH,
+                    INTERVAL_DAY_TIME,
+                    VOID,
+                    UNKNOWN -> false;
+        };
     }
 
     @JsonCreator
@@ -235,8 +251,8 @@ public Optional<HiveType> getHiveTypeForDereferences(List<Integer> dereferences)
             else if (typeInfo instanceof UnionTypeInfo unionTypeInfo) {
                 try {
                     if (fieldIndex == 0) {
-                        //  union's tag field, defined in {@link io.trino.plugin.hive.util.HiveTypeTranslator#toTypeSignature}
-                        return Optional.of(HiveType.toHiveType(UNION_FIELD_TAG_TYPE));
+                        //  union's tag field, defined in {@link io.trino.hive.formats.UnionToRowCoercionUtils}
+                        return Optional.of(toHiveType(UNION_FIELD_TAG_TYPE));
                     }
                     else {
                         typeInfo = unionTypeInfo.getAllUnionObjectTypeInfos().get(fieldIndex - 1);
@@ -294,7 +310,6 @@ else if (typeInfo instanceof UnionTypeInfo unionTypeInfo) {
 
     public long getRetainedSizeInBytes()
     {
-        // typeInfo is not accounted for as the instances are cached (by TypeInfoFactory) and shared
-        return INSTANCE_SIZE + hiveTypeName.getEstimatedSizeInBytes();
+        return INSTANCE_SIZE + hiveTypeName.getEstimatedSizeInBytes() + typeInfo.getRetainedSizeInBytes();
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveUpdateBucketFunction.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveUpdateBucketFunction.java
index ba2db3bc99e8..17b010d1d70c 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveUpdateBucketFunction.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveUpdateBucketFunction.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive;
 
 import io.trino.spi.Page;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.BucketFunction;
 
 import static io.trino.plugin.hive.HivePageSource.BUCKET_CHANNEL;
@@ -33,8 +33,8 @@ public HiveUpdateBucketFunction(int bucketCount)
     @Override
     public int getBucket(Page page, int position)
     {
-        Block bucketBlock = page.getBlock(0).getObject(position, Block.class);
-        long value = INTEGER.getLong(bucketBlock, BUCKET_CHANNEL);
+        SqlRow bucketRow = page.getBlock(0).getObject(position, SqlRow.class);
+        long value = INTEGER.getInt(bucketRow.getRawFieldBlock(BUCKET_CHANNEL), bucketRow.getRawIndex());
         return (int) (value & Integer.MAX_VALUE) % bucketCount;
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveWriter.java
index 7628b45362c5..f8d7b66b2a1b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveWriter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveWriter.java
@@ -99,11 +99,6 @@ long getValidationCpuNanos()
         return fileWriter.getValidationCpuNanos();
     }
 
-    public Optional<Runnable> getVerificationTask()
-    {
-        return fileWriter.getVerificationTask();
-    }
-
     public void rollback()
     {
         fileWriter.rollback();
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveWriterFactory.java
index 99fb96308172..4c07825cddca 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveWriterFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveWriterFactory.java
@@ -21,10 +21,10 @@
 import com.google.common.collect.Sets;
 import io.airlift.event.client.EventClient;
 import io.airlift.units.DataSize;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.hdfs.HdfsContext;
-import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hive.formats.compression.CompressionKind;
 import io.trino.plugin.hive.HiveSessionProperties.InsertExistingPartitionsBehavior;
 import io.trino.plugin.hive.LocationService.WriteInfo;
 import io.trino.plugin.hive.PartitionUpdate.UpdateMode;
@@ -46,14 +46,6 @@
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.io.compress.CompressionCodec;
-import org.apache.hadoop.io.compress.DefaultCodec;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.util.ReflectionUtils;
-import org.joda.time.DateTimeZone;
 
 import java.io.IOException;
 import java.security.Principal;
@@ -77,7 +69,6 @@
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.Maps.immutableEntry;
 import static com.google.common.collect.MoreCollectors.onlyElement;
-import static io.trino.hdfs.ConfigurationUtils.toJobConf;
 import static io.trino.plugin.hive.HiveCompressionCodecs.selectCompressionCodec;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_METADATA;
@@ -87,9 +78,7 @@
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_TABLE_READ_ONLY;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_UNSUPPORTED_FORMAT;
 import static io.trino.plugin.hive.HiveSessionProperties.getInsertExistingPartitionsBehavior;
-import static io.trino.plugin.hive.HiveSessionProperties.getTemporaryStagingDirectoryPath;
 import static io.trino.plugin.hive.HiveSessionProperties.getTimestampPrecision;
-import static io.trino.plugin.hive.HiveSessionProperties.isTemporaryStagingDirectoryEnabled;
 import static io.trino.plugin.hive.HiveType.toHiveType;
 import static io.trino.plugin.hive.LocationHandle.WriteMode.DIRECT_TO_TARGET_EXISTING_DIRECTORY;
 import static io.trino.plugin.hive.acid.AcidOperation.CREATE_TABLE;
@@ -98,8 +87,6 @@
 import static io.trino.plugin.hive.util.AcidTables.deltaSubdir;
 import static io.trino.plugin.hive.util.AcidTables.isFullAcidTable;
 import static io.trino.plugin.hive.util.AcidTables.isInsertOnlyTable;
-import static io.trino.plugin.hive.util.CompressionConfigUtil.assertCompressionConfigured;
-import static io.trino.plugin.hive.util.CompressionConfigUtil.configureCompression;
 import static io.trino.plugin.hive.util.HiveClassNames.HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveUtil.getColumnNames;
 import static io.trino.plugin.hive.util.HiveUtil.getColumnTypes;
@@ -118,7 +105,6 @@
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
-import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.COMPRESSRESULT;
 
 public class HiveWriterFactory
 {
@@ -149,7 +135,6 @@ public class HiveWriterFactory
     private final HivePageSinkMetadataProvider pageSinkMetadataProvider;
     private final TypeManager typeManager;
     private final PageSorter pageSorter;
-    private final JobConf conf;
 
     private final Table table;
     private final DataSize sortBufferSize;
@@ -157,7 +142,6 @@ public class HiveWriterFactory
     private final boolean sortedWritingTempStagingPathEnabled;
     private final String sortedWritingTempStagingPath;
     private final InsertExistingPartitionsBehavior insertExistingPartitionsBehavior;
-    private final DateTimeZone parquetTimeZone;
 
     private final ConnectorSession session;
     private final OptionalInt bucketCount;
@@ -189,16 +173,16 @@ public HiveWriterFactory(
             String queryId,
             HivePageSinkMetadataProvider pageSinkMetadataProvider,
             TypeManager typeManager,
-            HdfsEnvironment hdfsEnvironment,
             PageSorter pageSorter,
             DataSize sortBufferSize,
             int maxOpenSortFiles,
-            DateTimeZone parquetTimeZone,
             ConnectorSession session,
             NodeManager nodeManager,
             EventClient eventClient,
             HiveSessionProperties hiveSessionProperties,
-            HiveWriterStats hiveWriterStats)
+            HiveWriterStats hiveWriterStats,
+            boolean sortedWritingTempStagingPathEnabled,
+            String sortedWritingTempStagingPath)
     {
         this.fileWriterFactories = ImmutableSet.copyOf(requireNonNull(fileWriterFactories, "fileWriterFactories is null"));
         this.fileSystem = fileSystemFactory.create(session);
@@ -220,10 +204,9 @@ public HiveWriterFactory(
         this.pageSorter = requireNonNull(pageSorter, "pageSorter is null");
         this.sortBufferSize = requireNonNull(sortBufferSize, "sortBufferSize is null");
         this.maxOpenSortFiles = maxOpenSortFiles;
-        this.sortedWritingTempStagingPathEnabled = isTemporaryStagingDirectoryEnabled(session);
-        this.sortedWritingTempStagingPath = getTemporaryStagingDirectoryPath(session);
+        this.sortedWritingTempStagingPathEnabled = sortedWritingTempStagingPathEnabled;
+        this.sortedWritingTempStagingPath = requireNonNull(sortedWritingTempStagingPath, "sortedWritingTempStagingPath is null");
         this.insertExistingPartitionsBehavior = getInsertExistingPartitionsBehavior(session);
-        this.parquetTimeZone = requireNonNull(parquetTimeZone, "parquetTimeZone is null");
 
         // divide input columns into partition and data columns
         ImmutableList.Builder<String> partitionColumnNames = ImmutableList.builder();
@@ -256,17 +239,14 @@ public HiveWriterFactory(
         this.dataColumns = dataColumns.build();
         this.isCreateTransactionalTable = isCreateTable && transaction.isTransactional();
 
-        Path writePath;
         if (isCreateTable) {
             this.table = null;
             WriteInfo writeInfo = locationService.getQueryWriteInfo(locationHandle);
-            checkArgument(writeInfo.getWriteMode() != DIRECT_TO_TARGET_EXISTING_DIRECTORY, "CREATE TABLE write mode cannot be DIRECT_TO_TARGET_EXISTING_DIRECTORY");
-            writePath = writeInfo.getWritePath();
+            checkArgument(writeInfo.writeMode() != DIRECT_TO_TARGET_EXISTING_DIRECTORY, "CREATE TABLE write mode cannot be DIRECT_TO_TARGET_EXISTING_DIRECTORY");
         }
         else {
             this.table = pageSinkMetadataProvider.getTable()
                     .orElseThrow(() -> new TrinoException(HIVE_INVALID_METADATA, format("Table '%s.%s' was dropped during insert", schemaName, tableName)));
-            writePath = locationService.getQueryWriteInfo(locationHandle).getWritePath();
         }
 
         this.bucketCount = requireNonNull(bucketCount, "bucketCount is null");
@@ -289,17 +269,6 @@ public HiveWriterFactory(
                 .filter(entry -> entry.getValue() != null)
                 .collect(toImmutableMap(Entry::getKey, entry -> entry.getValue().toString()));
 
-        Configuration conf = hdfsEnvironment.getConfiguration(new HdfsContext(session), writePath);
-        this.conf = toJobConf(conf);
-
-        // make sure the FileSystem is created with the correct Configuration object
-        try {
-            hdfsEnvironment.getFileSystem(session.getIdentity(), writePath, conf);
-        }
-        catch (IOException e) {
-            throw new TrinoException(HIVE_FILESYSTEM_ERROR, "Failed getting FileSystem: " + writePath, e);
-        }
-
         this.hiveWriterStats = requireNonNull(hiveWriterStats, "hiveWriterStats is null");
     }
 
@@ -333,7 +302,7 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
         Properties schema;
         WriteInfo writeInfo;
         StorageFormat outputStorageFormat;
-        JobConf outputConf = new JobConf(conf);
+        HiveCompressionCodec compressionCodec;
         if (partition.isEmpty()) {
             if (table == null) {
                 // Write to: a new partition in a new partitioned table,
@@ -357,18 +326,18 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
                     // a new partition in a new partitioned table
                     writeInfo = locationService.getPartitionWriteInfo(locationHandle, partition, partitionName.get());
 
-                    if (!writeInfo.getWriteMode().isWritePathSameAsTargetPath()) {
+                    if (!writeInfo.writeMode().isWritePathSameAsTargetPath()) {
                         // When target path is different from write path,
                         // verify that the target directory for the partition does not already exist
-                        String writeInfoTargetPath = writeInfo.getTargetPath().toString();
+                        Location writeInfoTargetPath = writeInfo.targetPath();
                         try {
-                            if (fileSystem.newInputFile(writeInfoTargetPath).exists()) {
+                            if (fileSystem.directoryExists(writeInfoTargetPath).orElse(false)) {
                                 throw new TrinoException(HIVE_PATH_ALREADY_EXISTS, format(
                                         "Target directory for new partition '%s' of table '%s.%s' already exists: %s",
                                         partitionName,
                                         schemaName,
                                         tableName,
-                                        writeInfo.getTargetPath()));
+                                        writeInfo.targetPath()));
                             }
                         }
                         catch (IOException e) {
@@ -408,12 +377,12 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
             if (partitionName.isPresent()) {
                 // Write to a new partition
                 outputStorageFormat = fromHiveStorageFormat(partitionStorageFormat);
-                configureCompression(outputConf, selectCompressionCodec(session, partitionStorageFormat));
+                compressionCodec = selectCompressionCodec(session, partitionStorageFormat);
             }
             else {
                 // Write to a new/existing unpartitioned table
                 outputStorageFormat = fromHiveStorageFormat(tableStorageFormat);
-                configureCompression(outputConf, selectCompressionCodec(session, tableStorageFormat));
+                compressionCodec = selectCompressionCodec(session, tableStorageFormat);
             }
         }
         else {
@@ -447,7 +416,7 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
                     HiveWriteUtils.checkPartitionIsWritable(partitionName.get(), partition.get());
 
                     outputStorageFormat = partition.get().getStorage().getStorageFormat();
-                    configureCompression(outputConf, selectCompressionCodec(session, outputStorageFormat));
+                    compressionCodec = selectCompressionCodec(session, outputStorageFormat);
                     schema = getHiveSchema(partition.get(), table);
 
                     writeInfo = locationService.getPartitionWriteInfo(locationHandle, partition, partitionName.get());
@@ -461,7 +430,7 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
                     updateMode = UpdateMode.OVERWRITE;
 
                     outputStorageFormat = fromHiveStorageFormat(partitionStorageFormat);
-                    configureCompression(outputConf, selectCompressionCodec(session, partitionStorageFormat));
+                    compressionCodec = selectCompressionCodec(session, partitionStorageFormat);
                     schema = getHiveSchema(table);
 
                     writeInfo = locationService.getPartitionWriteInfo(locationHandle, Optional.empty(), partitionName.get());
@@ -473,28 +442,20 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
             }
         }
 
-        // verify compression was properly set by each of code paths above
-        assertCompressionConfigured(outputConf);
-
         additionalTableParameters.forEach(schema::setProperty);
 
         validateSchema(partitionName, schema);
 
         int bucketToUse = bucketNumber.isEmpty() ? 0 : bucketNumber.getAsInt();
 
-        Path path;
-        String fileNameWithExtension;
+        Location path = writeInfo.writePath();
         if (transaction.isAcidTransactionRunning() && transaction.getOperation() != CREATE_TABLE) {
             String subdir = computeAcidSubdir(transaction);
-            Path subdirPath = new Path(writeInfo.getWritePath(), subdir);
             String nameFormat = table != null && isInsertOnlyTable(table.getParameters()) ? "%05d_0" : "bucket_%05d";
-            path = new Path(subdirPath, format(nameFormat, bucketToUse));
-            fileNameWithExtension = path.getName();
+            path = path.appendPath(subdir).appendPath(nameFormat.formatted(bucketToUse));
         }
         else {
-            String fileName = computeFileName(bucketNumber);
-            fileNameWithExtension = fileName + getFileExtension(outputConf, outputStorageFormat);
-            path = new Path(writeInfo.getWritePath(), fileNameWithExtension);
+            path = path.appendPath(computeFileName(bucketNumber) + getFileExtension(compressionCodec, outputStorageFormat));
         }
 
         boolean useAcidSchema = isCreateTransactionalTable || (table != null && isFullAcidTable(table.getParameters()));
@@ -506,8 +467,18 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
                     .filter(factory -> factory instanceof OrcFileWriterFactory)
                     .collect(onlyElement());
             checkArgument(hiveRowtype.isPresent(), "rowTypes not present");
-            RowIdSortingFileWriterMaker fileWriterMaker = (deleteWriter, deletePath) -> makeRowIdSortingWriter(deleteWriter, deletePath);
-            hiveFileWriter = new MergeFileWriter(transaction, 0, bucketNumber, fileWriterMaker, path, orcFileWriterFactory, inputColumns, conf, session, typeManager, hiveRowtype.get());
+            hiveFileWriter = new MergeFileWriter(
+                    transaction,
+                    0,
+                    bucketNumber,
+                    this::makeRowIdSortingWriter,
+                    path.toString(),
+                    orcFileWriterFactory,
+                    compressionCodec,
+                    inputColumns,
+                    session,
+                    typeManager,
+                    hiveRowtype.get());
         }
         else {
             for (HiveFileWriterFactory fileWriterFactory : fileWriterFactories) {
@@ -517,8 +488,8 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
                                 .map(DataColumn::getName)
                                 .collect(toList()),
                         outputStorageFormat,
+                        compressionCodec,
                         schema,
-                        outputConf,
                         session,
                         bucketNumber,
                         transaction,
@@ -533,20 +504,10 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
         }
 
         if (hiveFileWriter == null) {
-            hiveFileWriter = new RecordFileWriter(
-                    path,
-                    dataColumns.stream()
-                            .map(DataColumn::getName)
-                            .collect(toList()),
-                    outputStorageFormat,
-                    schema,
-                    partitionStorageFormat.getEstimatedWriterMemoryUsage(),
-                    outputConf,
-                    typeManager,
-                    parquetTimeZone,
-                    session);
+            throw new TrinoException(HIVE_UNSUPPORTED_FORMAT, "Writing not supported for " + outputStorageFormat);
         }
 
+        String writePath = path.toString();
         String writerImplementation = hiveFileWriter.getClass().getName();
 
         Consumer<HiveWriter> onCommit = hiveWriter -> {
@@ -561,7 +522,7 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
 
             eventClient.post(new WriteCompletedEvent(
                     session.getQueryId(),
-                    path.toString(),
+                    writePath,
                     schemaName,
                     tableName,
                     partitionName.orElse(null),
@@ -577,16 +538,14 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
         };
 
         if (!sortedBy.isEmpty()) {
-            Path tempFilePath;
+            Location tempFilePath;
             if (sortedWritingTempStagingPathEnabled) {
-                String tempPrefix = sortedWritingTempStagingPath.replace(
-                        "${USER}",
-                        new HdfsContext(session).getIdentity().getUser());
-                tempPrefix = setSchemeToFileIfAbsent(tempPrefix);
-                tempFilePath = new Path(tempPrefix, ".tmp-sort." + path.getParent().getName() + "." + path.getName());
+                String stagingPath = sortedWritingTempStagingPath.replace("${USER}", session.getIdentity().getUser());
+                Location tempPrefix = setSchemeToFileIfAbsent(Location.of(stagingPath));
+                tempFilePath = tempPrefix.appendPath(".tmp-sort.%s.%s".formatted(path.parentDirectory().fileName(), path.fileName()));
             }
             else {
-                tempFilePath = new Path(path.getParent(), ".tmp-sort." + path.getName());
+                tempFilePath = path.parentDirectory().appendPath(".tmp-sort." + path.fileName());
             }
 
             List<Type> types = dataColumns.stream()
@@ -611,7 +570,7 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
 
             hiveFileWriter = new SortingFileWriter(
                     fileSystem,
-                    tempFilePath.toString(),
+                    tempFilePath,
                     hiveFileWriter,
                     sortBufferSize,
                     maxOpenSortFiles,
@@ -627,22 +586,22 @@ public HiveWriter createWriter(Page partitionColumns, int position, OptionalInt
                 hiveFileWriter,
                 partitionName,
                 updateMode,
-                fileNameWithExtension,
-                writeInfo.getWritePath().toString(),
-                writeInfo.getTargetPath().toString(),
+                path.fileName(),
+                writeInfo.writePath().toString(),
+                writeInfo.targetPath().toString(),
                 onCommit,
                 hiveWriterStats);
     }
 
     public interface RowIdSortingFileWriterMaker
     {
-        SortingFileWriter makeFileWriter(FileWriter deleteFileWriter, Path path);
+        SortingFileWriter makeFileWriter(FileWriter deleteFileWriter, Location path);
     }
 
-    public SortingFileWriter makeRowIdSortingWriter(FileWriter deleteFileWriter, Path path)
+    public SortingFileWriter makeRowIdSortingWriter(FileWriter deleteFileWriter, Location path)
     {
-        String parentPath = setSchemeToFileIfAbsent(path.getParent().toString());
-        Path tempFilePath = new Path(parentPath, ".tmp-sort." + path.getName());
+        Location parentPath = setSchemeToFileIfAbsent(path.parentDirectory());
+        Location tempFilePath = parentPath.appendPath(".tmp-sort." + path.fileName());
         // The ORC columns are: operation, originalTransaction, bucket, rowId, row
         // The deleted rows should be sorted by originalTransaction, then by rowId
         List<Integer> sortFields = ImmutableList.of(1, 3);
@@ -652,7 +611,7 @@ public SortingFileWriter makeRowIdSortingWriter(FileWriter deleteFileWriter, Pat
 
         return new SortingFileWriter(
                 fileSystem,
-                tempFilePath.toString(),
+                tempFilePath,
                 deleteFileWriter,
                 sortBufferSize,
                 maxOpenSortFiles,
@@ -778,39 +737,22 @@ public static int getBucketFromFileName(String fileName)
         return Integer.parseInt(matcher.group(1));
     }
 
-    public static String getFileExtension(JobConf conf, StorageFormat storageFormat)
+    public static String getFileExtension(HiveCompressionCodec compression, StorageFormat format)
     {
         // text format files must have the correct extension when compressed
-        if (!HiveConf.getBoolVar(conf, COMPRESSRESULT) || !HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS.equals(storageFormat.getOutputFormat())) {
-            return "";
-        }
-
-        String compressionCodecClass = conf.get("mapred.output.compression.codec");
-        if (compressionCodecClass == null) {
-            return new DefaultCodec().getDefaultExtension();
-        }
-
-        try {
-            Class<? extends CompressionCodec> codecClass = conf.getClassByName(compressionCodecClass).asSubclass(CompressionCodec.class);
-            return ReflectionUtils.newInstance(codecClass, conf).getDefaultExtension();
-        }
-        catch (ClassNotFoundException e) {
-            throw new TrinoException(HIVE_UNSUPPORTED_FORMAT, "Compression codec not found: " + compressionCodecClass, e);
-        }
-        catch (RuntimeException e) {
-            throw new TrinoException(HIVE_UNSUPPORTED_FORMAT, "Failed to load compression codec: " + compressionCodecClass, e);
-        }
+        return compression.getHiveCompressionKind()
+                .filter(ignored -> format.getOutputFormat().equals(HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS))
+                .map(CompressionKind::getFileExtension)
+                .orElse("");
     }
 
     @VisibleForTesting
-    static String setSchemeToFileIfAbsent(String pathString)
+    static Location setSchemeToFileIfAbsent(Location location)
     {
-        Path path = new Path(pathString);
-        String scheme = path.toUri().getScheme();
-        if (scheme == null || scheme.equals("")) {
-            return "file:///" + pathString;
+        if (location.scheme().isPresent()) {
+            return location;
         }
-        return pathString;
+        return Location.of("file:///" + location.path());
     }
 
     private static class DataColumn
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/InternalHiveConnectorFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/InternalHiveConnectorFactory.java
index 0631707d7cd2..464a1d1641b8 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/InternalHiveConnectorFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/InternalHiveConnectorFactory.java
@@ -23,9 +23,16 @@
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.event.client.EventModule;
 import io.airlift.json.JsonModule;
-import io.trino.filesystem.hdfs.HdfsFileSystemModule;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.manager.FileSystemModule;
 import io.trino.hdfs.HdfsModule;
 import io.trino.hdfs.authentication.HdfsAuthenticationModule;
+import io.trino.hdfs.cos.HiveCosModule;
+import io.trino.hdfs.gcs.HiveGcsModule;
+import io.trino.hdfs.rubix.RubixEnabledConfig;
+import io.trino.hdfs.rubix.RubixModule;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.base.CatalogNameModule;
 import io.trino.plugin.base.TypeDeserializerModule;
@@ -39,17 +46,11 @@
 import io.trino.plugin.base.jmx.MBeanServerModule;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.plugin.hive.aws.athena.PartitionProjectionModule;
-import io.trino.plugin.hive.azure.HiveAzureModule;
-import io.trino.plugin.hive.cos.HiveCosModule;
 import io.trino.plugin.hive.fs.CachingDirectoryListerModule;
 import io.trino.plugin.hive.fs.DirectoryLister;
-import io.trino.plugin.hive.gcs.HiveGcsModule;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastoreModule;
 import io.trino.plugin.hive.procedure.HiveProcedureModule;
-import io.trino.plugin.hive.rubix.RubixEnabledConfig;
-import io.trino.plugin.hive.rubix.RubixModule;
-import io.trino.plugin.hive.s3.HiveS3Module;
 import io.trino.plugin.hive.security.HiveSecurityModule;
 import io.trino.plugin.hive.security.SystemTableAwareAccessControl;
 import io.trino.spi.NodeManager;
@@ -85,7 +86,7 @@ private InternalHiveConnectorFactory() {}
 
     public static Connector createConnector(String catalogName, Map<String, String> config, ConnectorContext context, Module module)
     {
-        return createConnector(catalogName, config, context, module, Optional.empty(), Optional.empty());
+        return createConnector(catalogName, config, context, module, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
     }
 
     public static Connector createConnector(
@@ -94,6 +95,8 @@ public static Connector createConnector(
             ConnectorContext context,
             Module module,
             Optional<HiveMetastore> metastore,
+            Optional<TrinoFileSystemFactory> fileSystemFactory,
+            Optional<OpenTelemetry> openTelemetry,
             Optional<DirectoryLister> directoryLister)
     {
         requireNonNull(config, "config is null");
@@ -111,18 +114,20 @@ public static Connector createConnector(
                     new PartitionProjectionModule(),
                     new CachingDirectoryListerModule(directoryLister),
                     new HdfsModule(),
-                    new HiveS3Module(),
                     new HiveGcsModule(),
-                    new HiveAzureModule(),
                     new HiveCosModule(),
                     conditionalModule(RubixEnabledConfig.class, RubixEnabledConfig::isCacheEnabled, new RubixModule()),
                     new HiveMetastoreModule(metastore),
                     new HiveSecurityModule(),
                     new HdfsAuthenticationModule(),
-                    new HdfsFileSystemModule(),
+                    fileSystemFactory
+                            .map(factory -> (Module) binder -> binder.bind(TrinoFileSystemFactory.class).toInstance(factory))
+                            .orElseGet(FileSystemModule::new),
                     new HiveProcedureModule(),
                     new MBeanServerModule(),
                     binder -> {
+                        binder.bind(OpenTelemetry.class).toInstance(openTelemetry.orElse(context.getOpenTelemetry()));
+                        binder.bind(Tracer.class).toInstance(context.getTracer());
                         binder.bind(NodeVersion.class).toInstance(new NodeVersion(context.getNodeManager().getCurrentNode().getVersion()));
                         binder.bind(NodeManager.class).toInstance(context.getNodeManager());
                         binder.bind(VersionEmbedder.class).toInstance(context.getVersionEmbedder());
@@ -163,6 +168,7 @@ public static Connector createConnector(
                     .map(accessControl -> new ClassLoaderSafeConnectorAccessControl(accessControl, classLoader));
 
             return new HiveConnector(
+                    injector,
                     lifeCycleManager,
                     transactionManager,
                     new ClassLoaderSafeConnectorSplitManager(splitManager, classLoader),
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/InternalHiveSplit.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/InternalHiveSplit.java
index b97fa5f11ed2..ae6c28e0c63b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/InternalHiveSplit.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/InternalHiveSplit.java
@@ -14,18 +14,16 @@
 package io.trino.plugin.hive;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.plugin.hive.HiveSplit.BucketConversion;
 import io.trino.plugin.hive.HiveSplit.BucketValidation;
 import io.trino.spi.HostAddress;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Properties;
 import java.util.function.BooleanSupplier;
-import java.util.function.Supplier;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
@@ -51,22 +49,16 @@ public class InternalHiveSplit
     private final String partitionName;
     private final OptionalInt readBucketNumber;
     private final OptionalInt tableBucketNumber;
-    // This supplier returns an unused statementId, to guarantee that created split
-    // files do not collide.  Successive calls return the next sequential integer,
-    // starting with zero.
-    private final Supplier<Integer> statementIdSupplier;
     private final boolean splittable;
     private final boolean forceLocalScheduling;
     private final TableToPartitionMapping tableToPartitionMapping;
     private final Optional<BucketConversion> bucketConversion;
     private final Optional<BucketValidation> bucketValidation;
-    private final boolean s3SelectPushdownEnabled;
     private final Optional<AcidInfo> acidInfo;
     private final BooleanSupplier partitionMatchSupplier;
 
     private long start;
     private int currentBlockIndex;
-    private int statementId;
 
     public InternalHiveSplit(
             String partitionName,
@@ -80,13 +72,11 @@ public InternalHiveSplit(
             List<InternalHiveBlock> blocks,
             OptionalInt readBucketNumber,
             OptionalInt tableBucketNumber,
-            Supplier<Integer> statementIdSupplier,
             boolean splittable,
             boolean forceLocalScheduling,
             TableToPartitionMapping tableToPartitionMapping,
             Optional<BucketConversion> bucketConversion,
             Optional<BucketValidation> bucketValidation,
-            boolean s3SelectPushdownEnabled,
             Optional<AcidInfo> acidInfo,
             BooleanSupplier partitionMatchSupplier)
     {
@@ -100,7 +90,6 @@ public InternalHiveSplit(
         requireNonNull(blocks, "blocks is null");
         requireNonNull(readBucketNumber, "readBucketNumber is null");
         requireNonNull(tableBucketNumber, "tableBucketNumber is null");
-        requireNonNull(statementIdSupplier, "statementIdSupplier is null");
         requireNonNull(tableToPartitionMapping, "tableToPartitionMapping is null");
         requireNonNull(bucketConversion, "bucketConversion is null");
         requireNonNull(bucketValidation, "bucketValidation is null");
@@ -118,14 +107,11 @@ public InternalHiveSplit(
         this.blocks = ImmutableList.copyOf(blocks);
         this.readBucketNumber = readBucketNumber;
         this.tableBucketNumber = tableBucketNumber;
-        this.statementIdSupplier = statementIdSupplier;
-        this.statementId = statementIdSupplier.get();
         this.splittable = splittable;
         this.forceLocalScheduling = forceLocalScheduling;
         this.tableToPartitionMapping = tableToPartitionMapping;
         this.bucketConversion = bucketConversion;
         this.bucketValidation = bucketValidation;
-        this.s3SelectPushdownEnabled = s3SelectPushdownEnabled;
         this.acidInfo = acidInfo;
         this.partitionMatchSupplier = partitionMatchSupplier;
     }
@@ -155,11 +141,6 @@ public long getFileModifiedTime()
         return fileModifiedTime;
     }
 
-    public boolean isS3SelectPushdownEnabled()
-    {
-        return s3SelectPushdownEnabled;
-    }
-
     public Properties getSchema()
     {
         return schema;
@@ -185,11 +166,6 @@ public OptionalInt getTableBucketNumber()
         return tableBucketNumber;
     }
 
-    public int getStatementId()
-    {
-        return statementId;
-    }
-
     public boolean isSplittable()
     {
         return splittable;
@@ -228,7 +204,6 @@ public boolean isDone()
 
     public void increaseStart(long value)
     {
-        statementId = statementIdSupplier.get();
         start += value;
         if (start == currentBlock().getEnd()) {
             currentBlockIndex++;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/LegacyHiveViewReader.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/LegacyHiveViewReader.java
index 6da51a5c8729..835633831eeb 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/LegacyHiveViewReader.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/LegacyHiveViewReader.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.hive;
 
+import com.google.common.collect.ImmutableList;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.spi.TrinoException;
@@ -51,6 +52,7 @@ public ConnectorViewDefinition decodeViewData(String viewData, Table table, Cata
                         .collect(toImmutableList()),
                 Optional.ofNullable(table.getParameters().get(TABLE_COMMENT)),
                 Optional.empty(), // will be filled in later by HiveMetadata
-                hiveViewsRunAsInvoker);
+                hiveViewsRunAsInvoker,
+                ImmutableList.of());
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/LocationHandle.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/LocationHandle.java
index 22a6e072dab4..95b51def1c06 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/LocationHandle.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/LocationHandle.java
@@ -15,21 +15,18 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.hadoop.fs.Path;
+import io.trino.filesystem.Location;
 
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class LocationHandle
 {
-    private final Path targetPath;
-    private final Path writePath;
+    private final Location targetPath;
+    private final Location writePath;
     private final WriteMode writeMode;
 
-    public LocationHandle(
-            Path targetPath,
-            Path writePath,
-            WriteMode writeMode)
+    public LocationHandle(Location targetPath, Location writePath, WriteMode writeMode)
     {
         if (writeMode.isWritePathSameAsTargetPath() && !targetPath.equals(writePath)) {
             throw new IllegalArgumentException(format("targetPath is expected to be same as writePath for writeMode %s", writeMode));
@@ -46,19 +43,19 @@ public LocationHandle(
             @JsonProperty("writeMode") WriteMode writeMode)
     {
         this(
-                new Path(requireNonNull(targetPath, "targetPath is null")),
-                new Path(requireNonNull(writePath, "writePath is null")),
+                Location.of(requireNonNull(targetPath, "targetPath is null")),
+                Location.of(requireNonNull(writePath, "writePath is null")),
                 writeMode);
     }
 
     // This method should only be called by LocationService
-    Path getTargetPath()
+    Location getTargetPath()
     {
         return targetPath;
     }
 
     // This method should only be called by LocationService
-    Path getWritePath()
+    Location getWritePath()
     {
         return writePath;
     }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/LocationService.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/LocationService.java
index 7e3e1aa20a5d..f57759d353ad 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/LocationService.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/LocationService.java
@@ -13,11 +13,12 @@
  */
 package io.trino.plugin.hive;
 
+import io.trino.filesystem.Location;
+import io.trino.plugin.hive.LocationHandle.WriteMode;
 import io.trino.plugin.hive.metastore.Partition;
 import io.trino.plugin.hive.metastore.SemiTransactionalHiveMetastore;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
 
 import java.util.Optional;
 
@@ -25,9 +26,9 @@
 
 public interface LocationService
 {
-    Path forNewTable(SemiTransactionalHiveMetastore metastore, ConnectorSession session, String schemaName, String tableName);
+    Location forNewTable(SemiTransactionalHiveMetastore metastore, ConnectorSession session, String schemaName, String tableName);
 
-    LocationHandle forNewTableAsSelect(SemiTransactionalHiveMetastore metastore, ConnectorSession session, String schemaName, String tableName, Optional<Path> externalLocation);
+    LocationHandle forNewTableAsSelect(SemiTransactionalHiveMetastore metastore, ConnectorSession session, String schemaName, String tableName, Optional<Location> externalLocation);
 
     LocationHandle forExistingTable(SemiTransactionalHiveMetastore metastore, ConnectorSession session, Table table);
 
@@ -47,23 +48,20 @@ public interface LocationService
      */
     WriteInfo getPartitionWriteInfo(LocationHandle locationHandle, Optional<Partition> partition, String partitionName);
 
-    class WriteInfo
+    record WriteInfo(Location targetPath, Location writePath, WriteMode writeMode)
     {
-        private final Path targetPath;
-        private final Path writePath;
-        private final LocationHandle.WriteMode writeMode;
-
-        public WriteInfo(Path targetPath, Path writePath, LocationHandle.WriteMode writeMode)
+        public WriteInfo
         {
-            this.targetPath = requireNonNull(targetPath, "targetPath is null");
-            this.writePath = requireNonNull(writePath, "writePath is null");
-            this.writeMode = requireNonNull(writeMode, "writeMode is null");
+            requireNonNull(targetPath, "targetPath is null");
+            requireNonNull(writePath, "writePath is null");
+            requireNonNull(writeMode, "writeMode is null");
         }
 
         /**
          * Target path for the partition, unpartitioned table, or the query.
          */
-        public Path getTargetPath()
+        @Override
+        public Location targetPath()
         {
             return targetPath;
         }
@@ -73,14 +71,10 @@ public Path getTargetPath()
          * <p>
          * It may be the same as {@code targetPath}.
          */
-        public Path getWritePath()
+        @Override
+        public Location writePath()
         {
             return writePath;
         }
-
-        public LocationHandle.WriteMode getWriteMode()
-        {
-            return writeMode;
-        }
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/MergeFileWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/MergeFileWriter.java
index 7bf1380d8695..1001e61a0d1e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/MergeFileWriter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/MergeFileWriter.java
@@ -15,36 +15,76 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.Closer;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.HiveWriterFactory.RowIdSortingFileWriterMaker;
-import io.trino.plugin.hive.acid.AcidOperation;
 import io.trino.plugin.hive.acid.AcidTransaction;
 import io.trino.plugin.hive.orc.OrcFileWriterFactory;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.RowBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.MergePage;
 import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.orc.OrcWriter.OrcOperation.DELETE;
+import static io.trino.orc.OrcWriter.OrcOperation.INSERT;
+import static io.trino.plugin.hive.HivePageSource.BUCKET_CHANNEL;
+import static io.trino.plugin.hive.HivePageSource.ORIGINAL_TRANSACTION_CHANNEL;
+import static io.trino.plugin.hive.HivePageSource.ROW_ID_CHANNEL;
+import static io.trino.plugin.hive.HiveStorageFormat.ORC;
+import static io.trino.plugin.hive.acid.AcidSchema.ACID_COLUMN_NAMES;
+import static io.trino.plugin.hive.acid.AcidSchema.createAcidSchema;
+import static io.trino.plugin.hive.metastore.StorageFormat.fromHiveStorageFormat;
+import static io.trino.plugin.hive.orc.OrcFileWriter.computeBucketValue;
+import static io.trino.plugin.hive.util.AcidTables.deleteDeltaSubdir;
+import static io.trino.plugin.hive.util.AcidTables.deltaSubdir;
+import static io.trino.spi.block.RowBlock.getRowFieldsFromBlock;
 import static io.trino.spi.connector.MergePage.createDeleteAndInsertPages;
+import static io.trino.spi.predicate.Utils.nativeValueToBlock;
 import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.IntegerType.INTEGER;
 import static java.util.Objects.requireNonNull;
 
 public class MergeFileWriter
-        extends AbstractHiveAcidWriters
         implements FileWriter
 {
+    // The bucketPath looks like this: /root/dir/delta_nnnnnnn_mmmmmmm_ssss/bucket_bbbbb(_aaaa)?
+    private static final Pattern BUCKET_PATH_MATCHER = Pattern.compile("(?s)(?<rootDir>.*)/(?<dirStart>delta_\\d+_\\d+)_(?<statementId>\\d+)/(?<filenameBase>bucket_(?<bucketNumber>\\d+))(?<attemptId>_\\d+)?$");
+
+    // After compaction, the bucketPath looks like this: /root/dir/base_nnnnnnn(_vmmmmmmm)?/bucket_bbbbb(_aaaa)?
+    private static final Pattern BASE_PATH_MATCHER = Pattern.compile("(?s)(?<rootDir>.*)/(?<dirStart>base_-?\\d+(_v\\d+)?)/(?<filenameBase>bucket_(?<bucketNumber>\\d+))(?<attemptId>_\\d+)?$");
+
+    private static final Block DELETE_OPERATION_BLOCK = nativeValueToBlock(INTEGER, (long) DELETE.getOperationNumber());
+    private static final Block INSERT_OPERATION_BLOCK = nativeValueToBlock(INTEGER, (long) INSERT.getOperationNumber());
+
+    private final AcidTransaction transaction;
+    private final OptionalInt bucketNumber;
+    private final Block bucketValueBlock;
+    private final ConnectorSession session;
+    private final Block hiveRowTypeNullsBlock;
+    private final Location deltaDirectory;
+    private final Location deleteDeltaDirectory;
     private final List<HiveColumnHandle> inputColumns;
+    private final RowIdSortingFileWriterMaker sortingFileWriterMaker;
+    private final OrcFileWriterFactory orcFileWriterFactory;
+    private final HiveCompressionCodec compressionCodec;
+    private final Properties hiveAcidSchema;
+    private final String bucketFilename;
+    private Optional<FileWriter> deleteFileWriter = Optional.empty();
+    private Optional<FileWriter> insertFileWriter = Optional.empty();
 
     private int deleteRowCount;
     private int insertRowCount;
@@ -54,26 +94,33 @@ public MergeFileWriter(
             int statementId,
             OptionalInt bucketNumber,
             RowIdSortingFileWriterMaker sortingFileWriterMaker,
-            Path bucketPath,
+            String bucketPath,
             OrcFileWriterFactory orcFileWriterFactory,
+            HiveCompressionCodec compressionCodec,
             List<HiveColumnHandle> inputColumns,
-            Configuration configuration,
             ConnectorSession session,
             TypeManager typeManager,
             HiveType hiveRowType)
     {
-        super(transaction,
-                statementId,
-                bucketNumber,
-                Optional.of(sortingFileWriterMaker),
-                bucketPath,
-                false,
-                orcFileWriterFactory,
-                configuration,
-                session,
-                typeManager,
-                hiveRowType,
-                AcidOperation.MERGE);
+        this.transaction = requireNonNull(transaction, "transaction is null");
+        this.bucketNumber = requireNonNull(bucketNumber, "bucketNumber is null");
+        this.sortingFileWriterMaker = requireNonNull(sortingFileWriterMaker, "sortingFileWriterMaker is null");
+        this.bucketValueBlock = nativeValueToBlock(INTEGER, (long) computeBucketValue(bucketNumber.orElse(0), statementId));
+        this.orcFileWriterFactory = requireNonNull(orcFileWriterFactory, "orcFileWriterFactory is null");
+        this.compressionCodec = requireNonNull(compressionCodec, "compressionCodec is null");
+        this.session = requireNonNull(session, "session is null");
+        checkArgument(transaction.isTransactional(), "Not in a transaction: %s", transaction);
+        this.hiveAcidSchema = createAcidSchema(hiveRowType);
+        this.hiveRowTypeNullsBlock = nativeValueToBlock(hiveRowType.getType(typeManager), null);
+        Matcher matcher = BASE_PATH_MATCHER.matcher(bucketPath);
+        if (!matcher.matches()) {
+            matcher = BUCKET_PATH_MATCHER.matcher(bucketPath);
+            checkArgument(matcher.matches(), "bucketPath doesn't have the required format: %s", bucketPath);
+        }
+        this.bucketFilename = matcher.group("filenameBase");
+        long writeId = transaction.getWriteId();
+        this.deltaDirectory = Location.of(matcher.group("rootDir")).appendPath(deltaSubdir(writeId, statementId));
+        this.deleteDeltaDirectory = Location.of(matcher.group("rootDir")).appendPath(deleteDeltaSubdir(writeId, statementId));
         this.inputColumns = requireNonNull(inputColumns, "inputColumns is null");
     }
 
@@ -106,7 +153,7 @@ public static Page buildInsertPage(Page insertPage, long writeId, List<HiveColum
                 .filter(column -> !column.isPartitionKey() && !column.isHidden())
                 .map(column -> insertPage.getBlock(column.getBaseHiveColumnIndex()))
                 .collect(toImmutableList());
-        Block mergedColumnsBlock = RowBlock.fromFieldBlocks(positionCount, Optional.empty(), dataColumns.toArray(new Block[] {}));
+        Block mergedColumnsBlock = RowBlock.fromFieldBlocks(positionCount, dataColumns.toArray(new Block[] {}));
         Block currentTransactionBlock = RunLengthEncodedBlock.create(BIGINT, writeId, positionCount);
         Block[] blockArray = {
                 RunLengthEncodedBlock.create(INSERT_OPERATION_BLOCK, positionCount),
@@ -176,4 +223,81 @@ public PartitionUpdateAndMergeResults getPartitionUpdateAndMergeResults(Partitio
                 deleteRowCount,
                 deleteFileWriter.isPresent() ? Optional.of(deleteDeltaDirectory.toString()) : Optional.empty());
     }
+
+    private Page buildDeletePage(Block rowIds, long writeId)
+    {
+        int positionCount = rowIds.getPositionCount();
+        if (rowIds.mayHaveNull()) {
+            for (int position = 0; position < positionCount; position++) {
+                checkArgument(!rowIds.isNull(position), "The rowIdsRowBlock may not have null rows");
+            }
+        }
+        List<Block> fields = getRowFieldsFromBlock(rowIds);
+        Block[] blockArray = {
+                RunLengthEncodedBlock.create(DELETE_OPERATION_BLOCK, positionCount),
+                fields.get(ORIGINAL_TRANSACTION_CHANNEL),
+                fields.get(BUCKET_CHANNEL),
+                fields.get(ROW_ID_CHANNEL),
+                RunLengthEncodedBlock.create(BIGINT, writeId, positionCount),
+                RunLengthEncodedBlock.create(hiveRowTypeNullsBlock, positionCount),
+        };
+        return new Page(blockArray);
+    }
+
+    private FileWriter getOrCreateInsertFileWriter()
+    {
+        if (insertFileWriter.isEmpty()) {
+            Properties schemaCopy = new Properties();
+            schemaCopy.putAll(hiveAcidSchema);
+            insertFileWriter = orcFileWriterFactory.createFileWriter(
+                    deltaDirectory.appendPath(bucketFilename),
+                    ACID_COLUMN_NAMES,
+                    fromHiveStorageFormat(ORC),
+                    compressionCodec,
+                    schemaCopy,
+                    session,
+                    bucketNumber,
+                    transaction,
+                    true,
+                    WriterKind.INSERT);
+        }
+        return getWriter(insertFileWriter);
+    }
+
+    private FileWriter getOrCreateDeleteFileWriter()
+    {
+        if (deleteFileWriter.isEmpty()) {
+            Properties schemaCopy = new Properties();
+            schemaCopy.putAll(hiveAcidSchema);
+            Location deletePath = deleteDeltaDirectory.appendPath(bucketFilename);
+            FileWriter writer = getWriter(orcFileWriterFactory.createFileWriter(
+                    deletePath,
+                    ACID_COLUMN_NAMES,
+                    fromHiveStorageFormat(ORC),
+                    compressionCodec,
+                    schemaCopy,
+                    session,
+                    bucketNumber,
+                    transaction,
+                    true,
+                    WriterKind.DELETE));
+            deleteFileWriter = Optional.of(sortingFileWriterMaker.makeFileWriter(writer, deletePath));
+        }
+        return getWriter(deleteFileWriter);
+    }
+
+    private static Block createRowIdBlock(int positionCount, int rowCounter)
+    {
+        long[] rowIds = new long[positionCount];
+        for (int index = 0; index < positionCount; index++) {
+            rowIds[index] = rowCounter;
+            rowCounter++;
+        }
+        return new LongArrayBlock(positionCount, Optional.empty(), rowIds);
+    }
+
+    private static FileWriter getWriter(Optional<FileWriter> writer)
+    {
+        return writer.orElseThrow(() -> new IllegalArgumentException("writer is not present"));
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/MonitoredTrinoInputFile.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/MonitoredTrinoInputFile.java
deleted file mode 100644
index b1b9f20c97b1..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/MonitoredTrinoInputFile.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import io.trino.filesystem.TrinoInput;
-import io.trino.filesystem.TrinoInputFile;
-import io.trino.filesystem.TrinoInputStream;
-
-import java.io.IOException;
-import java.time.Instant;
-
-import static java.util.Objects.requireNonNull;
-
-public class MonitoredTrinoInputFile
-        implements TrinoInputFile
-{
-    private final FileFormatDataSourceStats stats;
-    private final TrinoInputFile delegate;
-
-    public MonitoredTrinoInputFile(FileFormatDataSourceStats stats, TrinoInputFile delegate)
-    {
-        this.stats = requireNonNull(stats, "stats is null");
-        this.delegate = requireNonNull(delegate, "delegate is null");
-    }
-
-    @Override
-    public TrinoInput newInput()
-            throws IOException
-    {
-        return new MonitoredTrinoInput(stats, delegate.newInput());
-    }
-
-    @Override
-    public TrinoInputStream newStream()
-            throws IOException
-    {
-        return new MonitoredTrinoInputStream(stats, delegate.newStream());
-    }
-
-    @Override
-    public long length()
-            throws IOException
-    {
-        return delegate.length();
-    }
-
-    @Override
-    public Instant lastModified()
-            throws IOException
-    {
-        return delegate.lastModified();
-    }
-
-    @Override
-    public boolean exists()
-            throws IOException
-    {
-        return delegate.exists();
-    }
-
-    @Override
-    public String location()
-    {
-        return delegate.location();
-    }
-
-    @Override
-    public String toString()
-    {
-        return delegate.toString();
-    }
-
-    private static final class MonitoredTrinoInput
-            implements TrinoInput
-    {
-        private final FileFormatDataSourceStats stats;
-        private final TrinoInput delegate;
-
-        public MonitoredTrinoInput(FileFormatDataSourceStats stats, TrinoInput delegate)
-        {
-            this.stats = requireNonNull(stats, "stats is null");
-            this.delegate = requireNonNull(delegate, "delegate is null");
-        }
-
-        @Override
-        public void readFully(long position, byte[] buffer, int bufferOffset, int bufferLength)
-                throws IOException
-        {
-            long readStart = System.nanoTime();
-            delegate.readFully(position, buffer, bufferOffset, bufferLength);
-            stats.readDataBytesPerSecond(bufferLength, System.nanoTime() - readStart);
-        }
-
-        @Override
-        public int readTail(byte[] buffer, int bufferOffset, int bufferLength)
-                throws IOException
-        {
-            long readStart = System.nanoTime();
-            int size = delegate.readTail(buffer, bufferOffset, bufferLength);
-            stats.readDataBytesPerSecond(size, System.nanoTime() - readStart);
-            return size;
-        }
-
-        @Override
-        public void close()
-                throws IOException
-        {
-            delegate.close();
-        }
-
-        @Override
-        public String toString()
-        {
-            return delegate.toString();
-        }
-    }
-
-    private static final class MonitoredTrinoInputStream
-            extends TrinoInputStream
-    {
-        private final FileFormatDataSourceStats stats;
-        private final TrinoInputStream delegate;
-
-        public MonitoredTrinoInputStream(FileFormatDataSourceStats stats, TrinoInputStream delegate)
-        {
-            this.stats = requireNonNull(stats, "stats is null");
-            this.delegate = requireNonNull(delegate, "delegate is null");
-        }
-
-        @Override
-        public long getPosition()
-                throws IOException
-        {
-            return delegate.getPosition();
-        }
-
-        @Override
-        public void seek(long position)
-                throws IOException
-        {
-            delegate.seek(position);
-        }
-
-        @Override
-        public int read()
-                throws IOException
-        {
-            long readStart = System.nanoTime();
-            int value = delegate.read();
-            stats.readDataBytesPerSecond(1, System.nanoTime() - readStart);
-            return value;
-        }
-
-        @Override
-        public int read(byte[] b, int off, int len)
-                throws IOException
-        {
-            long readStart = System.nanoTime();
-            int size = delegate.read(b, off, len);
-            stats.readDataBytesPerSecond(size, System.nanoTime() - readStart);
-            return size;
-        }
-
-        @Override
-        public long skip(long n)
-                throws IOException
-        {
-            long readStart = System.nanoTime();
-            long size = delegate.skip(n);
-            stats.readDataBytesPerSecond(size, System.nanoTime() - readStart);
-            return size;
-        }
-
-        @Override
-        public void close()
-                throws IOException
-        {
-            delegate.close();
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/NamenodeStats.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/NamenodeStats.java
index aa069cd1e4b6..84d0be3ed578 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/NamenodeStats.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/NamenodeStats.java
@@ -13,71 +13,7 @@
  */
 package io.trino.plugin.hive;
 
-import io.airlift.stats.CounterStat;
-import io.airlift.stats.TimeStat;
-import org.weakref.jmx.Managed;
-import org.weakref.jmx.Nested;
-
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-public class NamenodeStats
-{
-    private final CallStats listLocatedStatus = new CallStats();
-    private final CallStats remoteIteratorNext = new CallStats();
-
-    @Managed
-    @Nested
-    public CallStats getListLocatedStatus()
-    {
-        return listLocatedStatus;
-    }
-
-    @Managed
-    @Nested
-    public CallStats getRemoteIteratorNext()
-    {
-        return remoteIteratorNext;
-    }
-
-    public static class CallStats
-    {
-        private final TimeStat time = new TimeStat(TimeUnit.MILLISECONDS);
-        private final CounterStat totalFailures = new CounterStat();
-        private final CounterStat ioExceptions = new CounterStat();
-
-        public TimeStat.BlockTimer time()
-        {
-            return time.time();
-        }
-
-        public void recordException(Exception exception)
-        {
-            if (exception instanceof IOException) {
-                ioExceptions.update(1);
-            }
-            totalFailures.update(1);
-        }
-
-        @Managed
-        @Nested
-        public CounterStat getTotalFailures()
-        {
-            return totalFailures;
-        }
-
-        @Managed
-        @Nested
-        public CounterStat getIoExceptions()
-        {
-            return ioExceptions;
-        }
-
-        @Managed
-        @Nested
-        public TimeStat getTime()
-        {
-            return time;
-        }
-    }
-}
+/**
+ * Dummy class needed to preserve the legacy JMX object name.
+ */
+public final class NamenodeStats {}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/NoneHiveMaterializedViewMetadata.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/NoneHiveMaterializedViewMetadata.java
index 62bfc9e57033..a23d562b616d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/NoneHiveMaterializedViewMetadata.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/NoneHiveMaterializedViewMetadata.java
@@ -91,4 +91,10 @@ public void setMaterializedViewProperties(ConnectorSession session, SchemaTableN
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support setting materialized view properties");
     }
+
+    @Override
+    public void setMaterializedViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "This connector does not support setting materialized view column comment");
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/PartitionStatistics.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/PartitionStatistics.java
index d061e0039d53..f77000f0ea10 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/PartitionStatistics.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/PartitionStatistics.java
@@ -17,10 +17,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.plugin.hive.metastore.HiveColumnStatistics;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Map;
 import java.util.Objects;
 
@@ -61,11 +60,6 @@ public Map<String, HiveColumnStatistics> getColumnStatistics()
         return columnStatistics;
     }
 
-    public PartitionStatistics withAdjustedRowCount(long adjustment)
-    {
-        return new PartitionStatistics(basicStatistics.withAdjustedRowCount(adjustment), columnStatistics);
-    }
-
     @Override
     public boolean equals(Object o)
     {
@@ -100,6 +94,11 @@ public static Builder builder()
         return new Builder();
     }
 
+    public PartitionStatistics withBasicStatistics(HiveBasicStatistics basicStatistics)
+    {
+        return new PartitionStatistics(basicStatistics, columnStatistics);
+    }
+
     public static class Builder
     {
         private HiveBasicStatistics basicStatistics = HiveBasicStatistics.createEmptyStatistics();
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/PartitionUpdate.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/PartitionUpdate.java
index 926d02ae35c7..e6b26cf3327f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/PartitionUpdate.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/PartitionUpdate.java
@@ -17,8 +17,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multimaps;
+import io.trino.filesystem.Location;
 import io.trino.spi.TrinoException;
-import org.apache.hadoop.fs.Path;
 
 import java.util.Collection;
 import java.util.List;
@@ -33,8 +33,8 @@ public class PartitionUpdate
 {
     private final String name;
     private final UpdateMode updateMode;
-    private final Path writePath;
-    private final Path targetPath;
+    private final Location writePath;
+    private final Location targetPath;
     private final List<String> fileNames;
     private final long rowCount;
     private final long inMemoryDataSizeInBytes;
@@ -54,8 +54,8 @@ public PartitionUpdate(
         this(
                 name,
                 updateMode,
-                new Path(requireNonNull(writePath, "writePath is null")),
-                new Path(requireNonNull(targetPath, "targetPath is null")),
+                Location.of(requireNonNull(writePath, "writePath is null")),
+                Location.of(requireNonNull(targetPath, "targetPath is null")),
                 fileNames,
                 rowCount,
                 inMemoryDataSizeInBytes,
@@ -65,8 +65,8 @@ public PartitionUpdate(
     public PartitionUpdate(
             String name,
             UpdateMode updateMode,
-            Path writePath,
-            Path targetPath,
+            Location writePath,
+            Location targetPath,
             List<String> fileNames,
             long rowCount,
             long inMemoryDataSizeInBytes,
@@ -101,12 +101,12 @@ public UpdateMode getUpdateMode()
         return updateMode;
     }
 
-    public Path getWritePath()
+    public Location getWritePath()
     {
         return writePath;
     }
 
-    public Path getTargetPath()
+    public Location getTargetPath()
     {
         return targetPath;
     }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/PartitionsSystemTableProvider.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/PartitionsSystemTableProvider.java
index 24c8a45d06ec..c472e5010fce 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/PartitionsSystemTableProvider.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/PartitionsSystemTableProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.hive;
 
+import com.google.inject.Inject;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorSession;
@@ -24,15 +25,10 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.stream.IntStream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.Streams.stream;
 import static io.trino.plugin.hive.HiveSessionProperties.getTimestampPrecision;
 import static io.trino.plugin.hive.SystemTableHandler.PARTITIONS;
@@ -45,7 +41,6 @@
 import static io.trino.plugin.hive.util.HiveUtil.isIcebergTable;
 import static io.trino.plugin.hive.util.SystemTables.createSystemTable;
 import static java.util.Objects.requireNonNull;
-import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.toList;
 
 public class PartitionsSystemTableProvider
@@ -112,20 +107,14 @@ public Optional<SystemTable> getSystemTable(HiveMetadata metadata, ConnectorSess
                         .build())
                 .collect(toImmutableList());
 
-        Map<Integer, HiveColumnHandle> fieldIdToColumnHandle =
-                IntStream.range(0, partitionColumns.size())
-                        .boxed()
-                        .collect(toImmutableMap(identity(), partitionColumns::get));
-
         return Optional.of(createSystemTable(
                 new ConnectorTableMetadata(tableName, partitionSystemTableColumns),
                 constraint -> {
-                    Constraint targetConstraint = new Constraint(constraint.transformKeys(fieldIdToColumnHandle::get));
+                    Constraint targetConstraint = new Constraint(constraint.transformKeys(partitionColumns::get));
                     Iterable<List<Object>> records = () ->
                             stream(partitionManager.getPartitions(metadata.getMetastore(), sourceTableHandle, targetConstraint).getPartitions())
                                     .map(hivePartition ->
-                                            IntStream.range(0, partitionColumns.size())
-                                                    .mapToObj(fieldIdToColumnHandle::get)
+                                            partitionColumns.stream()
                                                     .map(columnHandle -> hivePartition.getKeys().get(columnHandle).getValue())
                                                     .collect(toList())) // nullable
                                     .iterator();
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/RcFileFileWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/RcFileFileWriterFactory.java
index dd606b22f624..98717d361a0c 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/RcFileFileWriterFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/RcFileFileWriterFactory.java
@@ -15,11 +15,11 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
-import io.trino.hdfs.HdfsEnvironment;
-import io.trino.hive.formats.compression.CompressionKind;
 import io.trino.hive.formats.encodings.ColumnEncodingFactory;
 import io.trino.hive.formats.encodings.binary.BinaryColumnEncodingFactory;
 import io.trino.hive.formats.encodings.text.TextColumnEncodingFactory;
@@ -31,13 +31,8 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
 import org.joda.time.DateTimeZone;
 
-import javax.inject.Inject;
-
 import java.io.Closeable;
 import java.io.OutputStream;
 import java.util.List;
@@ -63,28 +58,28 @@
 public class RcFileFileWriterFactory
         implements HiveFileWriterFactory
 {
+    private final TrinoFileSystemFactory fileSystemFactory;
     private final DateTimeZone timeZone;
-    private final HdfsEnvironment hdfsEnvironment;
     private final TypeManager typeManager;
     private final NodeVersion nodeVersion;
 
     @Inject
     public RcFileFileWriterFactory(
-            HdfsEnvironment hdfsEnvironment,
+            TrinoFileSystemFactory fileSystemFactory,
             TypeManager typeManager,
             NodeVersion nodeVersion,
             HiveConfig hiveConfig)
     {
-        this(hdfsEnvironment, typeManager, nodeVersion, hiveConfig.getRcfileDateTimeZone());
+        this(fileSystemFactory, typeManager, nodeVersion, hiveConfig.getRcfileDateTimeZone());
     }
 
     public RcFileFileWriterFactory(
-            HdfsEnvironment hdfsEnvironment,
+            TrinoFileSystemFactory fileSystemFactory,
             TypeManager typeManager,
             NodeVersion nodeVersion,
             DateTimeZone timeZone)
     {
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         this.nodeVersion = requireNonNull(nodeVersion, "nodeVersion is null");
         this.timeZone = requireNonNull(timeZone, "timeZone is null");
@@ -92,11 +87,11 @@ public RcFileFileWriterFactory(
 
     @Override
     public Optional<FileWriter> createFileWriter(
-            Path path,
+            Location location,
             List<String> inputColumnNames,
             StorageFormat storageFormat,
+            HiveCompressionCodec compressionCodec,
             Properties schema,
-            JobConf configuration,
             ConnectorSession session,
             OptionalInt bucketNumber,
             AcidTransaction transaction,
@@ -118,9 +113,6 @@ else if (COLUMNAR_SERDE_CLASS.equals(storageFormat.getSerde())) {
             return Optional.empty();
         }
 
-        Optional<CompressionKind> compressionKind = Optional.ofNullable(configuration.get(FileOutputFormat.COMPRESS_CODEC))
-                .map(CompressionKind::fromHadoopClassName);
-
         // existing tables and partitions may have columns in a different order than the writer is providing, so build
         // an index to rearrange columns in the proper order
         List<String> fileColumnNames = getColumnNames(schema);
@@ -133,16 +125,16 @@ else if (COLUMNAR_SERDE_CLASS.equals(storageFormat.getSerde())) {
                 .toArray();
 
         try {
-            TrinoFileSystem fileSystem = new HdfsFileSystemFactory(hdfsEnvironment).create(session.getIdentity());
+            TrinoFileSystem fileSystem = fileSystemFactory.create(session);
             AggregatedMemoryContext outputStreamMemoryContext = newSimpleAggregatedMemoryContext();
-            OutputStream outputStream = fileSystem.newOutputFile(path.toString()).create(outputStreamMemoryContext);
+            OutputStream outputStream = fileSystem.newOutputFile(location).create(outputStreamMemoryContext);
 
             Optional<Supplier<TrinoInputFile>> validationInputFactory = Optional.empty();
             if (isRcfileOptimizedWriterValidate(session)) {
-                validationInputFactory = Optional.of(() -> fileSystem.newInputFile(path.toString()));
+                validationInputFactory = Optional.of(() -> fileSystem.newInputFile(location));
             }
 
-            Closeable rollbackAction = () -> fileSystem.deleteFile(path.toString());
+            Closeable rollbackAction = () -> fileSystem.deleteFile(location);
 
             return Optional.of(new RcFileFileWriter(
                     outputStream,
@@ -150,7 +142,7 @@ else if (COLUMNAR_SERDE_CLASS.equals(storageFormat.getSerde())) {
                     rollbackAction,
                     columnEncodingFactory,
                     fileColumnTypes,
-                    compressionKind,
+                    compressionCodec.getHiveCompressionKind(),
                     fileInputColumnIndexes,
                     ImmutableMap.<String, String>builder()
                             .put(PRESTO_VERSION_NAME, nodeVersion.toString())
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ReaderColumns.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ReaderColumns.java
index 96f660723100..1c8b12d8a464 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ReaderColumns.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ReaderColumns.java
@@ -26,7 +26,8 @@
  * - the projected columns required by a connector level pagesource and
  * -  the columns supplied by format-specific page source
  * <p>
- * Currently used in {@link HivePageSource} and {@code io.trino.plugin.iceberg.IcebergPageSource}.
+ * Currently used in {@link HivePageSource}, {@code io.trino.plugin.iceberg.IcebergPageSource},
+ * and {@code io.trino.plugin.deltalake.DeltaLakePageSource}.
  */
 public class ReaderColumns
 {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ReaderProjectionsAdapter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ReaderProjectionsAdapter.java
index 224cb016b4f1..f24a10a4f57e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ReaderProjectionsAdapter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ReaderProjectionsAdapter.java
@@ -17,21 +17,18 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.ColumnarRow;
 import io.trino.spi.block.LazyBlock;
 import io.trino.spi.block.LazyBlockLoader;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
+import static io.trino.spi.block.RowBlock.getRowFieldsFromBlock;
 import static java.util.Objects.requireNonNull;
 
 public class ReaderProjectionsAdapter
@@ -138,61 +135,13 @@ private Block loadInternalBlock(List<Integer> dereferences, Block parentBlock)
                 return parentBlock.getLoadedBlock();
             }
 
-            ColumnarRow columnarRow = toColumnarRow(parentBlock);
+            List<Block> fields = getRowFieldsFromBlock(parentBlock);
 
             int dereferenceIndex = dereferences.get(0);
             List<Integer> remainingDereferences = dereferences.subList(1, dereferences.size());
 
-            Block fieldBlock = columnarRow.getField(dereferenceIndex);
-            Block loadedInternalBlock = loadInternalBlock(remainingDereferences, fieldBlock);
-
-            // Field blocks provided by ColumnarRow can have a smaller position count, because they do not store nulls.
-            // The following step adds null elements (when required) to the loaded block.
-            return adaptNulls(columnarRow, loadedInternalBlock);
-        }
-
-        private Block adaptNulls(ColumnarRow columnarRow, Block loadedInternalBlock)
-        {
-            if (!columnarRow.mayHaveNull()) {
-                return loadedInternalBlock;
-            }
-
-            // TODO: The current implementation copies over data to a new block builder when a null row element is found.
-            //  We can optimize this by using a Block implementation that uses a null vector of the parent row block and
-            //  the block for the field.
-
-            BlockBuilder newlyCreatedBlock = null;
-            int fieldBlockPosition = 0;
-
-            for (int i = 0; i < columnarRow.getPositionCount(); i++) {
-                boolean isRowNull = columnarRow.isNull(i);
-
-                if (isRowNull) {
-                    // A new block is only created when a null is encountered for the first time.
-                    if (newlyCreatedBlock == null) {
-                        newlyCreatedBlock = type.createBlockBuilder(null, columnarRow.getPositionCount());
-
-                        // Copy over all elements encountered so far to the new block
-                        for (int j = 0; j < i; j++) {
-                            type.appendTo(loadedInternalBlock, j, newlyCreatedBlock);
-                        }
-                    }
-                    newlyCreatedBlock.appendNull();
-                }
-                else {
-                    if (newlyCreatedBlock != null) {
-                        type.appendTo(loadedInternalBlock, fieldBlockPosition, newlyCreatedBlock);
-                    }
-                    fieldBlockPosition++;
-                }
-            }
-
-            if (newlyCreatedBlock == null) {
-                // If there was no need to create a null, return the original block
-                return loadedInternalBlock;
-            }
-
-            return newlyCreatedBlock.build();
+            Block fieldBlock = fields.get(dereferenceIndex);
+            return loadInternalBlock(remainingDereferences, fieldBlock);
         }
     }
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/RecordFileWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/RecordFileWriter.java
deleted file mode 100644
index 7874b0326b37..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/RecordFileWriter.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import io.airlift.units.DataSize;
-import io.trino.plugin.hive.metastore.StorageFormat;
-import io.trino.plugin.hive.parquet.ParquetRecordWriter;
-import io.trino.plugin.hive.util.FieldSetterFactory;
-import io.trino.plugin.hive.util.FieldSetterFactory.FieldSetter;
-import io.trino.plugin.hive.util.TextHeaderWriter;
-import io.trino.spi.Page;
-import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.ql.exec.FileSinkOperator.RecordWriter;
-import org.apache.hadoop.hive.serde2.SerDeException;
-import org.apache.hadoop.hive.serde2.Serializer;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.SettableStructObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.StructField;
-import org.apache.hadoop.mapred.JobConf;
-import org.joda.time.DateTimeZone;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.util.List;
-import java.util.Optional;
-import java.util.Properties;
-
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_CLOSE_ERROR;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_DATA_ERROR;
-import static io.trino.plugin.hive.HiveSessionProperties.getTimestampPrecision;
-import static io.trino.plugin.hive.util.HiveClassNames.HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS;
-import static io.trino.plugin.hive.util.HiveUtil.getColumnNames;
-import static io.trino.plugin.hive.util.HiveUtil.getColumnTypes;
-import static io.trino.plugin.hive.util.HiveWriteUtils.createRecordWriter;
-import static io.trino.plugin.hive.util.HiveWriteUtils.getRowColumnInspectors;
-import static io.trino.plugin.hive.util.HiveWriteUtils.initializeSerializer;
-import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toList;
-import static org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.getStandardStructObjectInspector;
-
-public class RecordFileWriter
-        implements FileWriter
-{
-    private static final int INSTANCE_SIZE = instanceSize(RecordFileWriter.class);
-
-    private final Path path;
-    private final JobConf conf;
-    private final int fieldCount;
-    private final Serializer serializer;
-    private final RecordWriter recordWriter;
-    private final SettableStructObjectInspector tableInspector;
-    private final List<StructField> structFields;
-    private final Object row;
-    private final FieldSetter[] setters;
-    private final long estimatedWriterMemoryUsage;
-
-    private boolean committed;
-    private long finalWrittenBytes = -1;
-
-    public RecordFileWriter(
-            Path path,
-            List<String> inputColumnNames,
-            StorageFormat storageFormat,
-            Properties schema,
-            DataSize estimatedWriterMemoryUsage,
-            JobConf conf,
-            TypeManager typeManager,
-            DateTimeZone parquetTimeZone,
-            ConnectorSession session)
-    {
-        this.path = requireNonNull(path, "path is null");
-        this.conf = requireNonNull(conf, "conf is null");
-
-        // existing tables may have columns in a different order
-        List<String> fileColumnNames = getColumnNames(schema);
-        List<Type> fileColumnTypes = getColumnTypes(schema).stream()
-                .map(hiveType -> hiveType.getType(typeManager, getTimestampPrecision(session)))
-                .collect(toList());
-
-        fieldCount = fileColumnNames.size();
-
-        String serde = storageFormat.getSerde();
-        serializer = initializeSerializer(conf, schema, serde);
-
-        List<ObjectInspector> objectInspectors = getRowColumnInspectors(fileColumnTypes);
-        tableInspector = getStandardStructObjectInspector(fileColumnNames, objectInspectors);
-
-        if (storageFormat.getOutputFormat().equals(HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS)) {
-            Optional<TextHeaderWriter> textHeaderWriter = Optional.of(new TextHeaderWriter(serializer, typeManager, session, fileColumnNames));
-            recordWriter = createRecordWriter(path, conf, schema, storageFormat.getOutputFormat(), session, textHeaderWriter);
-        }
-        else {
-            recordWriter = createRecordWriter(path, conf, schema, storageFormat.getOutputFormat(), session, Optional.empty());
-        }
-
-        // reorder (and possibly reduce) struct fields to match input
-        structFields = inputColumnNames.stream()
-                .map(tableInspector::getStructFieldRef)
-                .collect(toImmutableList());
-
-        row = tableInspector.create();
-
-        DateTimeZone timeZone = (recordWriter instanceof ParquetRecordWriter) ? parquetTimeZone : DateTimeZone.UTC;
-        FieldSetterFactory fieldSetterFactory = new FieldSetterFactory(timeZone);
-
-        setters = new FieldSetter[structFields.size()];
-        for (int i = 0; i < setters.length; i++) {
-            setters[i] = fieldSetterFactory.create(tableInspector, row, structFields.get(i), fileColumnTypes.get(structFields.get(i).getFieldID()));
-        }
-
-        this.estimatedWriterMemoryUsage = estimatedWriterMemoryUsage.toBytes();
-    }
-
-    @Override
-    public long getWrittenBytes()
-    {
-        if (recordWriter instanceof ExtendedRecordWriter) {
-            return ((ExtendedRecordWriter) recordWriter).getWrittenBytes();
-        }
-
-        if (committed) {
-            if (finalWrittenBytes != -1) {
-                return finalWrittenBytes;
-            }
-
-            try {
-                finalWrittenBytes = path.getFileSystem(conf).getFileStatus(path).getLen();
-                return finalWrittenBytes;
-            }
-            catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
-        }
-
-        // there is no good way to get this when RecordWriter is not yet committed
-        return 0;
-    }
-
-    @Override
-    public long getMemoryUsage()
-    {
-        return INSTANCE_SIZE + estimatedWriterMemoryUsage;
-    }
-
-    @Override
-    public void appendRows(Page dataPage)
-    {
-        for (int position = 0; position < dataPage.getPositionCount(); position++) {
-            appendRow(dataPage, position);
-        }
-    }
-
-    public void appendRow(Page dataPage, int position)
-    {
-        for (int field = 0; field < fieldCount; field++) {
-            Block block = dataPage.getBlock(field);
-            if (block.isNull(position)) {
-                tableInspector.setStructFieldData(row, structFields.get(field), null);
-            }
-            else {
-                setters[field].setField(block, position);
-            }
-        }
-
-        try {
-            recordWriter.write(serializer.serialize(row, tableInspector));
-        }
-        catch (SerDeException | IOException e) {
-            throw new TrinoException(HIVE_WRITER_DATA_ERROR, e);
-        }
-    }
-
-    @Override
-    public Closeable commit()
-    {
-        try {
-            recordWriter.close(false);
-            committed = true;
-        }
-        catch (IOException e) {
-            throw new TrinoException(HIVE_WRITER_CLOSE_ERROR, "Error committing write to Hive", e);
-        }
-
-        return createRollbackAction(path, conf);
-    }
-
-    @Override
-    public void rollback()
-    {
-        Closeable rollbackAction = createRollbackAction(path, conf);
-        try (rollbackAction) {
-            recordWriter.close(true);
-        }
-        catch (IOException e) {
-            throw new TrinoException(HIVE_WRITER_CLOSE_ERROR, "Error rolling back write to Hive", e);
-        }
-    }
-
-    private static Closeable createRollbackAction(Path path, JobConf conf)
-    {
-        return () -> path.getFileSystem(conf).delete(path, false);
-    }
-
-    @Override
-    public long getValidationCpuNanos()
-    {
-        // RecordFileWriter delegates to Hive RecordWriter and there is no validation
-        return 0;
-    }
-
-    @Override
-    public String toString()
-    {
-        return toStringHelper(this)
-                .add("path", path)
-                .toString();
-    }
-
-    public interface ExtendedRecordWriter
-            extends RecordWriter
-    {
-        long getWrittenBytes();
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/RecordingMetastoreConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/RecordingMetastoreConfig.java
index bc4413151c89..14e0cc8dcd05 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/RecordingMetastoreConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/RecordingMetastoreConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/SortingFileWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/SortingFileWriter.java
index 72bd5f247eed..59b9ee0e096d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/SortingFileWriter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/SortingFileWriter.java
@@ -17,6 +17,7 @@
 import com.google.common.io.Closer;
 import io.airlift.log.Logger;
 import io.airlift.units.DataSize;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.orc.OrcDataSink;
@@ -42,7 +43,6 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Optional;
 import java.util.PriorityQueue;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicLong;
@@ -67,7 +67,7 @@ public class SortingFileWriter
     private static final int INSTANCE_SIZE = instanceSize(SortingFileWriter.class);
 
     private final TrinoFileSystem fileSystem;
-    private final String tempFilePrefix;
+    private final Location tempFilePrefix;
     private final int maxOpenTempFiles;
     private final List<Type> types;
     private final List<Integer> sortFields;
@@ -75,13 +75,16 @@ public class SortingFileWriter
     private final FileWriter outputWriter;
     private final SortBuffer sortBuffer;
     private final TempFileSinkFactory tempFileSinkFactory;
-    private final Queue<TempFile> tempFiles = new PriorityQueue<>(comparing(TempFile::getSize));
+    private final Queue<TempFile> tempFiles = new PriorityQueue<>(comparing(TempFile::size));
     private final AtomicLong nextFileId = new AtomicLong();
     private final TypeOperators typeOperators;
 
+    private boolean flushed;
+    private long tempFilesWrittenBytes;
+
     public SortingFileWriter(
             TrinoFileSystem fileSystem,
-            String tempFilePrefix,
+            Location tempFilePrefix,
             FileWriter outputWriter,
             DataSize maxMemory,
             int maxOpenTempFiles,
@@ -108,7 +111,14 @@ public SortingFileWriter(
     @Override
     public long getWrittenBytes()
     {
-        return outputWriter.getWrittenBytes();
+        if (flushed) {
+            return outputWriter.getWrittenBytes();
+        }
+
+        // This is an approximation, since the outputWriter is not used until this write is committed.
+        // Returning an approximation is important as the value is used by the PageSink to split files
+        // into a reasonable size.
+        return tempFilesWrittenBytes;
     }
 
     @Override
@@ -129,6 +139,8 @@ public void appendRows(Page page)
     @Override
     public Closeable commit()
     {
+        flushed = true;
+
         Closeable rollbackAction = createRollbackAction(fileSystem, tempFiles);
         if (!sortBuffer.isEmpty()) {
             // skip temporary files entirely if the total output size is small
@@ -169,7 +181,7 @@ private static Closeable createRollbackAction(TrinoFileSystem fileSystem, Queue<
     {
         return () -> {
             for (TempFile file : tempFiles) {
-                cleanupFile(fileSystem, file.getPath());
+                cleanupFile(fileSystem, file.location());
             }
         };
     }
@@ -189,12 +201,6 @@ public String toString()
                 .toString();
     }
 
-    @Override
-    public Optional<Runnable> getVerificationTask()
-    {
-        return outputWriter.getVerificationTask();
-    }
-
     private void flushToTempFile()
     {
         writeTempFile(writer -> sortBuffer.flushTo(writer::writePage));
@@ -227,10 +233,9 @@ private void mergeFiles(Iterable<TempFile> files, Consumer<Page> consumer)
             Collection<Iterator<Page>> iterators = new ArrayList<>();
 
             for (TempFile tempFile : files) {
-                String file = tempFile.getPath();
-                TrinoInputFile inputFile = fileSystem.newInputFile(file);
+                TrinoInputFile inputFile = fileSystem.newInputFile(tempFile.location());
                 OrcDataSource dataSource = new HdfsOrcDataSource(
-                        new OrcDataSourceId(file),
+                        new OrcDataSourceId(tempFile.location().toString()),
                         inputFile.length(),
                         new OrcReaderOptions(),
                         inputFile,
@@ -243,7 +248,7 @@ private void mergeFiles(Iterable<TempFile> files, Consumer<Page> consumer)
                     .forEachRemaining(consumer);
 
             for (TempFile tempFile : files) {
-                fileSystem.deleteFile(tempFile.getPath());
+                fileSystem.deleteFile(tempFile.location());
             }
         }
         catch (IOException e) {
@@ -253,12 +258,13 @@ private void mergeFiles(Iterable<TempFile> files, Consumer<Page> consumer)
 
     private void writeTempFile(Consumer<TempFileWriter> consumer)
     {
-        String tempFile = getTempFileName();
+        Location tempFile = getTempFileName();
 
         try (TempFileWriter writer = new TempFileWriter(types, tempFileSinkFactory.createSink(fileSystem, tempFile))) {
             consumer.accept(writer);
             writer.close();
             tempFiles.add(new TempFile(tempFile, writer.getWrittenBytes()));
+            tempFilesWrittenBytes += writer.getWrittenBytes();
         }
         catch (IOException | UncheckedIOException e) {
             cleanupFile(fileSystem, tempFile);
@@ -266,56 +272,33 @@ private void writeTempFile(Consumer<TempFileWriter> consumer)
         }
     }
 
-    private static void cleanupFile(TrinoFileSystem fileSystem, String file)
+    private static void cleanupFile(TrinoFileSystem fileSystem, Location location)
     {
         try {
-            fileSystem.deleteFile(file);
+            fileSystem.deleteFile(location);
         }
         catch (IOException e) {
-            log.warn(e, "Failed to delete temporary file: %s", file);
+            log.warn(e, "Failed to delete temporary file: %s", location);
         }
     }
 
-    private String getTempFileName()
+    private Location getTempFileName()
     {
-        return tempFilePrefix + "." + nextFileId.getAndIncrement();
+        return Location.of(tempFilePrefix + "." + nextFileId.getAndIncrement());
     }
 
-    private static class TempFile
+    private record TempFile(Location location, long size)
     {
-        private final String path;
-        private final long size;
-
-        public TempFile(String path, long size)
+        public TempFile
         {
             checkArgument(size >= 0, "size is negative");
-            this.path = requireNonNull(path, "path is null");
-            this.size = size;
-        }
-
-        public String getPath()
-        {
-            return path;
-        }
-
-        public long getSize()
-        {
-            return size;
-        }
-
-        @Override
-        public String toString()
-        {
-            return toStringHelper(this)
-                    .add("path", path)
-                    .add("size", size)
-                    .toString();
+            requireNonNull(location, "location is null");
         }
     }
 
     public interface TempFileSinkFactory
     {
-        OrcDataSink createSink(TrinoFileSystem fileSystem, String path)
+        OrcDataSink createSink(TrinoFileSystem fileSystem, Location location)
                 throws IOException;
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/SortingFileWriterConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/SortingFileWriterConfig.java
index e6f6608c34ea..189f36bd9ece 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/SortingFileWriterConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/SortingFileWriterConfig.java
@@ -18,9 +18,8 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.MaxDataSize;
 import io.airlift.units.MinDataSize;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TableToPartitionMapping.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TableToPartitionMapping.java
index db508f597aea..fcabc3ba27d7 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TableToPartitionMapping.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TableToPartitionMapping.java
@@ -17,6 +17,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
+import it.unimi.dsi.fastutil.ints.Int2IntArrayMap;
+import it.unimi.dsi.fastutil.ints.Int2IntMaps;
 
 import java.util.Map;
 import java.util.Objects;
@@ -25,6 +27,7 @@
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static io.airlift.slice.SizeOf.estimatedSizeOf;
 import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOfIntArray;
 import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
@@ -44,6 +47,7 @@ public static TableToPartitionMapping mapColumnsByIndex(Map<Integer, HiveTypeNam
     private static final int INSTANCE_SIZE = instanceSize(TableToPartitionMapping.class);
     private static final int INTEGER_INSTANCE_SIZE = instanceSize(Integer.class);
     private static final int OPTIONAL_INSTANCE_SIZE = instanceSize(Optional.class);
+    private static final int INT_2_INT_ARRAY_MAP_INSTANCE_SIZE = instanceSize(Int2IntArrayMap.class);
 
     private final Optional<Map<Integer, Integer>> tableToPartitionColumns;
     private final Map<Integer, HiveTypeName> partitionColumnCoercions;
@@ -57,7 +61,8 @@ public TableToPartitionMapping(
             this.tableToPartitionColumns = Optional.empty();
         }
         else {
-            this.tableToPartitionColumns = tableToPartitionColumns.map(ImmutableMap::copyOf);
+            // we use Int2IntArrayMap due to much lower memory footprint than ImmutableMap<Integer, Integer>
+            this.tableToPartitionColumns = tableToPartitionColumns.map(mapping -> Int2IntMaps.unmodifiable(new Int2IntArrayMap(mapping)));
         }
         this.partitionColumnCoercions = ImmutableMap.copyOf(requireNonNull(partitionColumnCoercions, "partitionColumnCoercions is null"));
     }
@@ -106,7 +111,7 @@ public int getEstimatedSizeInBytes()
                 estimatedSizeOf(partitionColumnCoercions, (Integer key) -> INTEGER_INSTANCE_SIZE, HiveTypeName::getEstimatedSizeInBytes) +
                 OPTIONAL_INSTANCE_SIZE +
                 tableToPartitionColumns
-                        .map(tableToPartitionColumns -> estimatedSizeOf(tableToPartitionColumns, (Integer key) -> INTEGER_INSTANCE_SIZE, (Integer value) -> INTEGER_INSTANCE_SIZE))
+                        .map(tableToPartitionColumns -> INT_2_INT_ARRAY_MAP_INSTANCE_SIZE + 2 * sizeOfIntArray(tableToPartitionColumns.size()))
                         .orElse(0L);
         return toIntExact(result);
     }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TableType.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TableType.java
index a23f65df7b67..8e7b8bab553b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TableType.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TableType.java
@@ -18,5 +18,8 @@ public enum TableType
     MANAGED_TABLE,
     EXTERNAL_TABLE,
     VIRTUAL_VIEW,
+    /**
+     * A table type denoting materialized view created by Hive, not by Trino.
+     */
     MATERIALIZED_VIEW,
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TrinoViewHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TrinoViewHiveMetastore.java
index 78533c7aa262..626bac260801 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TrinoViewHiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TrinoViewHiveMetastore.java
@@ -27,6 +27,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -38,7 +39,7 @@
 import static io.trino.plugin.hive.TableType.VIRTUAL_VIEW;
 import static io.trino.plugin.hive.TrinoViewUtil.createViewProperties;
 import static io.trino.plugin.hive.ViewReaderUtil.encodeViewData;
-import static io.trino.plugin.hive.ViewReaderUtil.isPrestoView;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoView;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.buildInitialPrivilegeSet;
 import static io.trino.plugin.hive.metastore.PrincipalPrivileges.NO_PRIVILEGES;
 import static io.trino.plugin.hive.metastore.StorageFormat.VIEW_STORAGE_FORMAT;
@@ -86,7 +87,7 @@ public void createView(ConnectorSession session, SchemaTableName schemaViewName,
 
         Optional<io.trino.plugin.hive.metastore.Table> existing = metastore.getTable(schemaViewName.getSchemaName(), schemaViewName.getTableName());
         if (existing.isPresent()) {
-            if (!replace || !isPrestoView(existing.get())) {
+            if (!replace || !isTrinoView(existing.get())) {
                 throw new ViewAlreadyExistsException(schemaViewName);
             }
 
@@ -167,10 +168,61 @@ public Optional<ConnectorViewDefinition> getView(SchemaTableName viewName)
         }
         return metastore.getTable(viewName.getSchemaName(), viewName.getTableName())
                 .flatMap(view -> TrinoViewUtil.getView(
-                        viewName,
                         view.getViewOriginalText(),
                         view.getTableType(),
                         view.getParameters(),
                         view.getOwner()));
     }
+
+    public void updateViewComment(ConnectorSession session, SchemaTableName viewName, Optional<String> comment)
+    {
+        io.trino.plugin.hive.metastore.Table view = metastore.getTable(viewName.getSchemaName(), viewName.getTableName())
+                .orElseThrow(() -> new ViewNotFoundException(viewName));
+
+        ConnectorViewDefinition definition = TrinoViewUtil.getView(view.getViewOriginalText(), view.getTableType(), view.getParameters(), view.getOwner())
+                .orElseThrow(() -> new ViewNotFoundException(viewName));
+        ConnectorViewDefinition newDefinition = new ConnectorViewDefinition(
+                definition.getOriginalSql(),
+                definition.getCatalog(),
+                definition.getSchema(),
+                definition.getColumns(),
+                comment,
+                definition.getOwner(),
+                definition.isRunAsInvoker(),
+                definition.getPath());
+
+        replaceView(session, viewName, view, newDefinition);
+    }
+
+    public void updateViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
+    {
+        io.trino.plugin.hive.metastore.Table view = metastore.getTable(viewName.getSchemaName(), viewName.getTableName())
+                .orElseThrow(() -> new ViewNotFoundException(viewName));
+
+        ConnectorViewDefinition definition = TrinoViewUtil.getView(view.getViewOriginalText(), view.getTableType(), view.getParameters(), view.getOwner())
+                .orElseThrow(() -> new ViewNotFoundException(viewName));
+        ConnectorViewDefinition newDefinition = new ConnectorViewDefinition(
+                definition.getOriginalSql(),
+                definition.getCatalog(),
+                definition.getSchema(),
+                definition.getColumns().stream()
+                        .map(currentViewColumn -> Objects.equals(columnName, currentViewColumn.getName()) ? new ConnectorViewDefinition.ViewColumn(currentViewColumn.getName(), currentViewColumn.getType(), comment) : currentViewColumn)
+                        .collect(toImmutableList()),
+                definition.getComment(),
+                definition.getOwner(),
+                definition.isRunAsInvoker(),
+                definition.getPath());
+
+        replaceView(session, viewName, view, newDefinition);
+    }
+
+    private void replaceView(ConnectorSession session, SchemaTableName viewName, io.trino.plugin.hive.metastore.Table view, ConnectorViewDefinition newDefinition)
+    {
+        io.trino.plugin.hive.metastore.Table.Builder viewBuilder = io.trino.plugin.hive.metastore.Table.builder(view)
+                .setViewOriginalText(Optional.of(encodeViewData(newDefinition)));
+
+        PrincipalPrivileges principalPrivileges = isUsingSystemSecurity ? NO_PRIVILEGES : buildInitialPrivilegeSet(session.getUser());
+
+        metastore.replaceTable(viewName.getSchemaName(), viewName.getTableName(), viewBuilder.build(), principalPrivileges);
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TrinoViewUtil.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TrinoViewUtil.java
index 189b2caa354d..1ae2b734c609 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TrinoViewUtil.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/TrinoViewUtil.java
@@ -16,7 +16,6 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorViewDefinition;
-import io.trino.spi.connector.SchemaTableName;
 
 import java.util.Map;
 import java.util.Optional;
@@ -28,30 +27,23 @@
 import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
 import static io.trino.plugin.hive.HiveMetadata.TRINO_CREATED_BY;
 import static io.trino.plugin.hive.ViewReaderUtil.PRESTO_VIEW_FLAG;
-import static io.trino.plugin.hive.ViewReaderUtil.isHiveOrPrestoView;
-import static io.trino.plugin.hive.ViewReaderUtil.isPrestoView;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoView;
 
 public final class TrinoViewUtil
 {
     private TrinoViewUtil() {}
 
     public static Optional<ConnectorViewDefinition> getView(
-            SchemaTableName viewName,
             Optional<String> viewOriginalText,
             String tableType,
             Map<String, String> tableParameters,
             Optional<String> tableOwner)
     {
-        if (!isView(tableType, tableParameters)) {
-            // Filter out Tables and Materialized Views
+        if (!isTrinoView(tableType, tableParameters)) {
+            // Filter out Tables, Hive views and Trino Materialized Views
             return Optional.empty();
         }
 
-        if (!isPrestoView(tableParameters)) {
-            // Hive views are not compatible
-            throw new HiveViewNotSupportedException(viewName);
-        }
-
         checkArgument(viewOriginalText.isPresent(), "viewOriginalText must be present");
         ConnectorViewDefinition definition = ViewReaderUtil.PrestoViewReader.decodeViewData(viewOriginalText.get());
         // use owner from table metadata if it exists
@@ -63,16 +55,12 @@ public static Optional<ConnectorViewDefinition> getView(
                     definition.getColumns(),
                     definition.getComment(),
                     tableOwner,
-                    false);
+                    false,
+                    definition.getPath());
         }
         return Optional.of(definition);
     }
 
-    private static boolean isView(String tableType, Map<String, String> tableParameters)
-    {
-        return isHiveOrPrestoView(tableType) && PRESTO_VIEW_COMMENT.equals(tableParameters.get(TABLE_COMMENT));
-    }
-
     public static Map<String, String> createViewProperties(ConnectorSession session, String trinoVersion, String connectorName)
     {
         return ImmutableMap.<String, String>builder()
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ViewReaderUtil.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ViewReaderUtil.java
index 643397f41494..4e9cffb9f723 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ViewReaderUtil.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ViewReaderUtil.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.hive;
 
+import com.google.common.collect.ImmutableList;
 import com.linkedin.coral.common.HiveMetastoreClient;
 import com.linkedin.coral.hive.hive2rel.HiveToRelConverter;
 import com.linkedin.coral.trino.rel2trino.RelToTrinoConverter;
@@ -49,6 +50,7 @@
 import static com.linkedin.coral.trino.rel2trino.functions.TrinoKeywordsConverter.quoteWordIfNotQuoted;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_VIEW_DATA;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_VIEW_TRANSLATION_ERROR;
+import static io.trino.plugin.hive.HiveMetadata.PRESTO_VIEW_COMMENT;
 import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
 import static io.trino.plugin.hive.HiveSessionProperties.isHiveViewsLegacyTranslation;
 import static io.trino.plugin.hive.HiveStorageFormat.TEXTFILE;
@@ -82,7 +84,7 @@ public static ViewReader createViewReader(
             boolean runHiveViewRunAsInvoker,
             HiveTimestampPrecision hiveViewsTimestampPrecision)
     {
-        if (isPrestoView(table)) {
+        if (isTrinoView(table)) {
             return new PrestoViewReader();
         }
         if (isHiveViewsLegacyTranslation(session)) {
@@ -130,35 +132,59 @@ private static CoralTableRedirectionResolver coralTableRedirectionResolver(
     private static final JsonCodec<ConnectorViewDefinition> VIEW_CODEC =
             new JsonCodecFactory(new ObjectMapperProvider()).jsonCodec(ConnectorViewDefinition.class);
 
-    public static boolean isPrestoView(Table table)
+    /**
+     * Returns true if table represents a Hive view, Trino/Presto view, materialized view or anything
+     * else that gets registered using table type "VIRTUAL_VIEW".
+     * Note: this method returns false for a table that represents Hive's own materialized view
+     * ("MATERIALIZED_VIEW" table type). Hive own's materialized views are currently treated as ordinary
+     * tables by Trino.
+     */
+    public static boolean isSomeKindOfAView(Table table)
     {
-        return isPrestoView(table.getParameters());
+        return table.getTableType().equals(VIRTUAL_VIEW.name());
     }
 
-    public static boolean isPrestoView(Map<String, String> tableParameters)
+    public static boolean isHiveView(Table table)
     {
-        return "true".equals(tableParameters.get(PRESTO_VIEW_FLAG));
+        return table.getTableType().equals(VIRTUAL_VIEW.name()) &&
+                !table.getParameters().containsKey(PRESTO_VIEW_FLAG);
     }
 
-    public static boolean isHiveOrPrestoView(Table table)
+    /**
+     * Returns true when the table represents a "Trino view" (AKA "presto view").
+     * Returns false for Hive views or Trino materialized views.
+     */
+    public static boolean isTrinoView(Table table)
     {
-        return isHiveOrPrestoView(table.getTableType());
+        return isTrinoView(table.getTableType(), table.getParameters());
     }
 
-    public static boolean isHiveOrPrestoView(String tableType)
+    /**
+     * Returns true when the table represents a "Trino view" (AKA "presto view").
+     * Returns false for Hive views or Trino materialized views.
+     */
+    public static boolean isTrinoView(String tableType, Map<String, String> tableParameters)
     {
-        return tableType.equals(VIRTUAL_VIEW.name());
+        // A Trino view can be recognized by table type "VIRTUAL_VIEW" and table parameters presto_view="true" and comment="Presto View" since their first implementation see
+        // https://github.com/trinodb/trino/blame/38bd0dff736024f3ae01dbbe7d1db5bd1d50c43e/presto-hive/src/main/java/com/facebook/presto/hive/HiveMetadata.java#L902.
+        return tableType.equals(VIRTUAL_VIEW.name()) &&
+                "true".equals(tableParameters.get(PRESTO_VIEW_FLAG)) &&
+                PRESTO_VIEW_COMMENT.equalsIgnoreCase(tableParameters.get(TABLE_COMMENT));
     }
 
-    public static boolean isTrinoMaterializedView(String tableType, Map<String, String> tableParameters)
+    public static boolean isTrinoMaterializedView(Table table)
     {
-        return isHiveOrPrestoView(tableType) && isPrestoView(tableParameters) && tableParameters.get(TABLE_COMMENT).equalsIgnoreCase(ICEBERG_MATERIALIZED_VIEW_COMMENT);
+        return isTrinoMaterializedView(table.getTableType(), table.getParameters());
     }
 
-    public static boolean canDecodeView(Table table)
+    public static boolean isTrinoMaterializedView(String tableType, Map<String, String> tableParameters)
     {
-        // we can decode Hive or Presto view
-        return table.getTableType().equals(VIRTUAL_VIEW.name());
+        // A Trino materialized view can be recognized by table type "VIRTUAL_VIEW" and table parameters presto_view="true" and comment="Presto Materialized View"
+        // since their first implementation see
+        // https://github.com/trinodb/trino/blame/ff4a1e31fb9cb49f1b960abfc16ad469e7126a64/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java#L898
+        return tableType.equals(VIRTUAL_VIEW.name()) &&
+                "true".equals(tableParameters.get(PRESTO_VIEW_FLAG)) &&
+                ICEBERG_MATERIALIZED_VIEW_COMMENT.equalsIgnoreCase(tableParameters.get(TABLE_COMMENT));
     }
 
     public static String encodeViewData(ConnectorViewDefinition definition)
@@ -216,7 +242,7 @@ public ConnectorViewDefinition decodeViewData(String viewSql, Table table, Catal
             try {
                 HiveToRelConverter hiveToRelConverter = new HiveToRelConverter(metastoreClient);
                 RelNode rel = hiveToRelConverter.convertView(table.getDatabaseName(), table.getTableName());
-                RelToTrinoConverter relToTrino = new RelToTrinoConverter();
+                RelToTrinoConverter relToTrino = new RelToTrinoConverter(metastoreClient);
                 String trinoSql = relToTrino.convert(rel);
                 RelDataType rowType = rel.getRowType();
                 List<ViewColumn> columns = rowType.getFieldList().stream()
@@ -232,9 +258,10 @@ public ConnectorViewDefinition decodeViewData(String viewSql, Table table, Catal
                         columns,
                         Optional.ofNullable(table.getParameters().get(TABLE_COMMENT)),
                         Optional.empty(), // will be filled in later by HiveMetadata
-                        hiveViewsRunAsInvoker);
+                        hiveViewsRunAsInvoker,
+                        ImmutableList.of());
             }
-            catch (RuntimeException e) {
+            catch (Throwable e) {
                 throw new TrinoException(HIVE_VIEW_TRANSLATION_ERROR,
                         format("Failed to translate Hive view '%s': %s",
                                 table.getSchemaTableName(),
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/WriteCompletedEvent.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/WriteCompletedEvent.java
index 784a475f2b66..1c3d7df15494 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/WriteCompletedEvent.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/WriteCompletedEvent.java
@@ -13,12 +13,11 @@
  */
 package io.trino.plugin.hive;
 
+import com.google.errorprone.annotations.Immutable;
 import io.airlift.event.client.EventField;
 import io.airlift.event.client.EventField.EventFieldMapping;
 import io.airlift.event.client.EventType;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.time.Instant;
 import java.util.Map;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/acid/AcidOperation.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/acid/AcidOperation.java
index e4a0f4b02c6d..cccd690104cb 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/acid/AcidOperation.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/acid/AcidOperation.java
@@ -13,35 +13,18 @@
  */
 package io.trino.plugin.hive.acid;
 
-import com.google.common.collect.ImmutableMap;
 import io.trino.hive.thrift.metastore.DataOperationType;
-import io.trino.orc.OrcWriter.OrcOperation;
-
-import java.util.Map;
-import java.util.Optional;
 
 public enum AcidOperation
 {
-    NONE,
-    CREATE_TABLE,
-    INSERT,
-    MERGE,
-    /**/;
-
-    private static final Map<AcidOperation, DataOperationType> DATA_OPERATION_TYPES = ImmutableMap.of(
-            INSERT, DataOperationType.INSERT,
-            MERGE, DataOperationType.UPDATE);
-
-    private static final Map<AcidOperation, OrcOperation> ORC_OPERATIONS = ImmutableMap.of(
-            INSERT, OrcOperation.INSERT);
-
-    public Optional<DataOperationType> getMetastoreOperationType()
-    {
-        return Optional.ofNullable(DATA_OPERATION_TYPES.get(this));
-    }
+    NONE, CREATE_TABLE, INSERT, MERGE;
 
-    public Optional<OrcOperation> getOrcOperation()
+    public DataOperationType getMetastoreOperationType()
     {
-        return Optional.ofNullable(ORC_OPERATIONS.get(this));
+        return switch (this) {
+            case INSERT -> DataOperationType.INSERT;
+            case MERGE -> DataOperationType.UPDATE;
+            default -> throw new IllegalStateException("No metastore operation for ACID operation " + this);
+        };
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroFileWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroFileWriterFactory.java
new file mode 100644
index 000000000000..9df3eb8aa98c
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroFileWriterFactory.java
@@ -0,0 +1,137 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.avro;
+
+import com.google.common.base.VerifyException;
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.TrinoOutputFile;
+import io.trino.hive.formats.avro.AvroCompressionKind;
+import io.trino.memory.context.AggregatedMemoryContext;
+import io.trino.plugin.hive.FileWriter;
+import io.trino.plugin.hive.HiveCompressionCodec;
+import io.trino.plugin.hive.HiveFileWriterFactory;
+import io.trino.plugin.hive.HiveTimestampPrecision;
+import io.trino.plugin.hive.NodeVersion;
+import io.trino.plugin.hive.WriterKind;
+import io.trino.plugin.hive.acid.AcidTransaction;
+import io.trino.plugin.hive.metastore.StorageFormat;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeManager;
+import org.apache.avro.Schema;
+
+import java.io.Closeable;
+import java.util.List;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.Properties;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_OPEN_ERROR;
+import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME;
+import static io.trino.plugin.hive.HiveMetadata.PRESTO_VERSION_NAME;
+import static io.trino.plugin.hive.HiveSessionProperties.getTimestampPrecision;
+import static io.trino.plugin.hive.util.HiveClassNames.AVRO_CONTAINER_OUTPUT_FORMAT_CLASS;
+import static io.trino.plugin.hive.util.HiveUtil.getColumnNames;
+import static io.trino.plugin.hive.util.HiveUtil.getColumnTypes;
+import static java.util.Objects.requireNonNull;
+
+public class AvroFileWriterFactory
+        implements HiveFileWriterFactory
+{
+    private final TrinoFileSystemFactory fileSystemFactory;
+    private final TypeManager typeManager;
+    private final NodeVersion nodeVersion;
+
+    @Inject
+    public AvroFileWriterFactory(
+            TrinoFileSystemFactory fileSystemFactory,
+            TypeManager typeManager,
+            NodeVersion nodeVersion)
+    {
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "hdfsEnvironment is null");
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.nodeVersion = requireNonNull(nodeVersion, "nodeVersion");
+    }
+
+    @Override
+    public Optional<FileWriter> createFileWriter(
+            Location location,
+            List<String> inputColumnNames,
+            StorageFormat storageFormat,
+            HiveCompressionCodec compressionCodec,
+            Properties schema,
+            ConnectorSession session,
+            OptionalInt bucketNumber,
+            AcidTransaction transaction,
+            boolean useAcidSchema,
+            WriterKind writerKind)
+    {
+        if (!AVRO_CONTAINER_OUTPUT_FORMAT_CLASS.equals(storageFormat.getOutputFormat())) {
+            return Optional.empty();
+        }
+
+        AvroCompressionKind compressionKind = compressionCodec.getAvroCompressionKind().orElse(AvroCompressionKind.NULL);
+        if (!compressionKind.isSupportedLocally()) {
+            throw new VerifyException("Avro Compression codec %s is not supported in the environment".formatted(compressionKind));
+        }
+
+        HiveTimestampPrecision hiveTimestampPrecision = getTimestampPrecision(session);
+        // existing tables and partitions may have columns in a different order than the writer is providing, so build
+        // an index to rearrange columns in the proper order
+        List<String> fileColumnNames = getColumnNames(schema);
+        List<Type> fileColumnTypes = getColumnTypes(schema).stream()
+                .map(hiveType -> hiveType.getType(typeManager, hiveTimestampPrecision))
+                .collect(toImmutableList());
+
+        List<Type> inputColumnTypes = inputColumnNames.stream().map(inputColumnName -> {
+            int index = fileColumnNames.indexOf(inputColumnName);
+            checkArgument(index >= 0, "Input column name [%s] not preset in file columns names %s", inputColumnName, fileColumnNames);
+            return fileColumnTypes.get(index);
+        }).collect(toImmutableList());
+
+        try {
+            TrinoFileSystem fileSystem = fileSystemFactory.create(session.getIdentity());
+            Schema fileSchema = AvroHiveFileUtils.determineSchemaOrThrowException(fileSystem, schema);
+            TrinoOutputFile outputFile = fileSystem.newOutputFile(location);
+            AggregatedMemoryContext outputStreamMemoryContext = newSimpleAggregatedMemoryContext();
+
+            Closeable rollbackAction = () -> fileSystem.deleteFile(location);
+
+            return Optional.of(new AvroHiveFileWriter(
+                    outputFile.create(outputStreamMemoryContext),
+                    outputStreamMemoryContext,
+                    fileSchema,
+                    new HiveAvroTypeManager(hiveTimestampPrecision),
+                    rollbackAction,
+                    inputColumnNames,
+                    inputColumnTypes,
+                    compressionKind,
+                    ImmutableMap.<String, String>builder()
+                            .put(PRESTO_VERSION_NAME, nodeVersion.toString())
+                            .put(PRESTO_QUERY_ID_NAME, session.getQueryId())
+                            .buildOrThrow()));
+        }
+        catch (Exception e) {
+            throw new TrinoException(HIVE_WRITER_OPEN_ERROR, "Error creating Avro Container file", e);
+        }
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroHiveConstants.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroHiveConstants.java
new file mode 100644
index 000000000000..8bbf18ad7c33
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroHiveConstants.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.avro;
+
+public final class AvroHiveConstants
+{
+    private AvroHiveConstants() {}
+
+    // file metadata
+    public static final String WRITER_TIME_ZONE = "writer.time.zone";
+
+    //hive table properties
+    public static final String SCHEMA_LITERAL = "avro.schema.literal";
+    public static final String SCHEMA_URL = "avro.schema.url";
+    public static final String SCHEMA_NONE = "none";
+    public static final String SCHEMA_NAMESPACE = "avro.schema.namespace";
+    public static final String SCHEMA_NAME = "avro.schema.name";
+    public static final String SCHEMA_DOC = "avro.schema.doc";
+    public static final String TABLE_NAME = "name";
+
+    // Hive Logical types
+    public static final String CHAR_TYPE_LOGICAL_NAME = "char";
+    public static final String VARCHAR_TYPE_LOGICAL_NAME = "varchar";
+    public static final String VARCHAR_AND_CHAR_LOGICAL_TYPE_LENGTH_PROP = "maxLength";
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroHiveFileUtils.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroHiveFileUtils.java
new file mode 100644
index 000000000000..2d81ff5d2921
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroHiveFileUtils.java
@@ -0,0 +1,300 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.avro;
+
+import com.google.common.base.Splitter;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoInputStream;
+import io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager;
+import io.trino.plugin.hive.HiveType;
+import io.trino.plugin.hive.type.CharTypeInfo;
+import io.trino.plugin.hive.type.DecimalTypeInfo;
+import io.trino.plugin.hive.type.ListTypeInfo;
+import io.trino.plugin.hive.type.MapTypeInfo;
+import io.trino.plugin.hive.type.PrimitiveCategory;
+import io.trino.plugin.hive.type.PrimitiveTypeInfo;
+import io.trino.plugin.hive.type.StructTypeInfo;
+import io.trino.plugin.hive.type.TypeInfo;
+import io.trino.plugin.hive.type.UnionTypeInfo;
+import io.trino.plugin.hive.type.VarcharTypeInfo;
+import org.apache.avro.LogicalType;
+import org.apache.avro.LogicalTypes;
+import org.apache.avro.Schema;
+import org.apache.avro.SchemaBuilder;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
+import static io.trino.plugin.hive.avro.AvroHiveConstants.CHAR_TYPE_LOGICAL_NAME;
+import static io.trino.plugin.hive.avro.AvroHiveConstants.SCHEMA_DOC;
+import static io.trino.plugin.hive.avro.AvroHiveConstants.SCHEMA_LITERAL;
+import static io.trino.plugin.hive.avro.AvroHiveConstants.SCHEMA_NAME;
+import static io.trino.plugin.hive.avro.AvroHiveConstants.SCHEMA_NAMESPACE;
+import static io.trino.plugin.hive.avro.AvroHiveConstants.SCHEMA_NONE;
+import static io.trino.plugin.hive.avro.AvroHiveConstants.SCHEMA_URL;
+import static io.trino.plugin.hive.avro.AvroHiveConstants.TABLE_NAME;
+import static io.trino.plugin.hive.avro.AvroHiveConstants.VARCHAR_AND_CHAR_LOGICAL_TYPE_LENGTH_PROP;
+import static io.trino.plugin.hive.avro.AvroHiveConstants.VARCHAR_TYPE_LOGICAL_NAME;
+import static io.trino.plugin.hive.util.HiveUtil.getColumnNames;
+import static io.trino.plugin.hive.util.HiveUtil.getColumnTypes;
+import static io.trino.plugin.hive.util.SerdeConstants.LIST_COLUMN_COMMENTS;
+import static java.util.Collections.emptyList;
+import static java.util.function.Predicate.not;
+import static java.util.function.UnaryOperator.identity;
+
+public final class AvroHiveFileUtils
+{
+    private final AtomicInteger recordNameSuffix = new AtomicInteger(0);
+
+    private AvroHiveFileUtils() {}
+
+    // Lifted and shifted from org.apache.hadoop.hive.serde2.avro.AvroSerdeUtils.determineSchemaOrThrowException
+    public static Schema determineSchemaOrThrowException(TrinoFileSystem fileSystem, Properties properties)
+            throws IOException
+    {
+        // Try pull schema from literal table property
+        String schemaString = properties.getProperty(SCHEMA_LITERAL, "");
+        if (!schemaString.isBlank() && !schemaString.equals(SCHEMA_NONE)) {
+            return getSchemaParser().parse(schemaString);
+        }
+
+        // Try pull schema directly from URL
+        String schemaURL = properties.getProperty(SCHEMA_URL, "");
+        if (!schemaURL.isBlank()) {
+            TrinoInputFile schemaFile = fileSystem.newInputFile(Location.of(schemaURL));
+            if (!schemaFile.exists()) {
+                throw new IOException("No avro schema file not found at " + schemaURL);
+            }
+            try (TrinoInputStream inputStream = schemaFile.newStream()) {
+                return getSchemaParser().parse(inputStream);
+            }
+            catch (IOException e) {
+                throw new IOException("Unable to read avro schema file from given path: " + schemaURL, e);
+            }
+        }
+        Schema schema = getSchemaFromProperties(properties);
+        properties.setProperty(SCHEMA_LITERAL, schema.toString());
+        return schema;
+    }
+
+    private static Schema getSchemaFromProperties(Properties properties)
+            throws IOException
+    {
+        List<String> columnNames = getColumnNames(properties);
+        List<HiveType> columnTypes = getColumnTypes(properties);
+        if (columnNames.isEmpty() || columnTypes.isEmpty()) {
+            throw new IOException("Unable to parse column names or column types from job properties to create Avro Schema");
+        }
+        if (columnNames.size() != columnTypes.size()) {
+            throw new IllegalArgumentException("Avro Schema initialization failed. Number of column name and column type differs. columnNames = %s, columnTypes = %s".formatted(columnNames, columnTypes));
+        }
+        List<String> columnComments = Optional.ofNullable(properties.getProperty(LIST_COLUMN_COMMENTS))
+                .filter(not(String::isBlank))
+                .map(Splitter.on('\0')::splitToList)
+                .orElse(emptyList());
+
+        final String tableName = properties.getProperty(TABLE_NAME);
+        final String tableComment = properties.getProperty(TABLE_COMMENT);
+
+        return constructSchemaFromParts(
+                columnNames,
+                columnTypes,
+                columnComments,
+                Optional.ofNullable(properties.getProperty(SCHEMA_NAMESPACE)),
+                Optional.ofNullable(properties.getProperty(SCHEMA_NAME, tableName)),
+                Optional.ofNullable(properties.getProperty(SCHEMA_DOC, tableComment)));
+    }
+
+    private static Schema constructSchemaFromParts(List<String> columnNames, List<HiveType> columnTypes,
+            List<String> columnComments, Optional<String> namespace, Optional<String> name, Optional<String> doc)
+    {
+        // create instance of this class to keep nested record naming consistent for any given inputs
+        AvroHiveFileUtils recordIncrementingUtil = new AvroHiveFileUtils();
+        SchemaBuilder.RecordBuilder<Schema> schemaBuilder = SchemaBuilder.record(name.orElse("baseRecord"));
+        namespace.ifPresent(schemaBuilder::namespace);
+        doc.ifPresent(schemaBuilder::doc);
+        SchemaBuilder.FieldAssembler<Schema> fieldBuilder = schemaBuilder.fields();
+
+        for (int i = 0; i < columnNames.size(); ++i) {
+            String comment = columnComments.size() > i ? columnComments.get(i) : null;
+            Schema fieldSchema = recordIncrementingUtil.avroSchemaForHiveType(columnTypes.get(i));
+            fieldBuilder = fieldBuilder
+                    .name(columnNames.get(i))
+                    .doc(comment)
+                    .type(fieldSchema)
+                    .withDefault(null);
+        }
+        return fieldBuilder.endRecord();
+    }
+
+    private Schema avroSchemaForHiveType(HiveType hiveType)
+    {
+        Schema schema = switch (hiveType.getCategory()) {
+            case PRIMITIVE -> createAvroPrimitive(hiveType);
+            case LIST -> {
+                ListTypeInfo listTypeInfo = (ListTypeInfo) hiveType.getTypeInfo();
+                yield Schema.createArray(avroSchemaForHiveType(HiveType.toHiveType(listTypeInfo.getListElementTypeInfo())));
+            }
+            case MAP -> {
+                MapTypeInfo mapTypeInfo = ((MapTypeInfo) hiveType.getTypeInfo());
+                TypeInfo keyTypeInfo = mapTypeInfo.getMapKeyTypeInfo();
+                if (!(keyTypeInfo instanceof PrimitiveTypeInfo primitiveKeyTypeInfo) ||
+                        primitiveKeyTypeInfo.getPrimitiveCategory() != PrimitiveCategory.STRING) {
+                    throw new UnsupportedOperationException("Key of Map must be a String");
+                }
+                TypeInfo valueTypeInfo = mapTypeInfo.getMapValueTypeInfo();
+                yield Schema.createMap(avroSchemaForHiveType(HiveType.toHiveType(valueTypeInfo)));
+            }
+            case STRUCT -> createAvroRecord(hiveType);
+            case UNION -> {
+                List<Schema> childSchemas = new ArrayList<>();
+                for (TypeInfo childTypeInfo : ((UnionTypeInfo) hiveType.getTypeInfo()).getAllUnionObjectTypeInfos()) {
+                    final Schema childSchema = avroSchemaForHiveType(HiveType.toHiveType(childTypeInfo));
+                    if (childSchema.getType() == Schema.Type.UNION) {
+                        childSchemas.addAll(childSchema.getTypes());
+                    }
+                    else {
+                        childSchemas.add(childSchema);
+                    }
+                }
+                yield Schema.createUnion(removeDuplicateNullSchemas(childSchemas));
+            }
+        };
+
+        return wrapInUnionWithNull(schema);
+    }
+
+    private static Schema createAvroPrimitive(HiveType hiveType)
+    {
+        if (!(hiveType.getTypeInfo() instanceof PrimitiveTypeInfo primitiveTypeInfo)) {
+            throw new IllegalStateException("HiveType in primitive category must have PrimitiveTypeInfo");
+        }
+        return switch (primitiveTypeInfo.getPrimitiveCategory()) {
+            case STRING -> Schema.create(Schema.Type.STRING);
+            case CHAR -> {
+                Schema charSchema = SchemaBuilder.builder().type(Schema.create(Schema.Type.STRING));
+                charSchema.addProp(LogicalType.LOGICAL_TYPE_PROP, CHAR_TYPE_LOGICAL_NAME);
+                charSchema.addProp(VARCHAR_AND_CHAR_LOGICAL_TYPE_LENGTH_PROP, ((CharTypeInfo) hiveType.getTypeInfo()).getLength());
+                yield charSchema;
+            }
+            case VARCHAR -> {
+                Schema varcharSchema = SchemaBuilder.builder().type(Schema.create(Schema.Type.STRING));
+                varcharSchema.addProp(LogicalType.LOGICAL_TYPE_PROP, VARCHAR_TYPE_LOGICAL_NAME);
+                varcharSchema.addProp(VARCHAR_AND_CHAR_LOGICAL_TYPE_LENGTH_PROP, ((VarcharTypeInfo) hiveType.getTypeInfo()).getLength());
+                yield varcharSchema;
+            }
+            case BINARY -> Schema.create(Schema.Type.BYTES);
+            case BYTE, SHORT, INT -> Schema.create(Schema.Type.INT);
+            case LONG -> Schema.create(Schema.Type.LONG);
+            case FLOAT -> Schema.create(Schema.Type.FLOAT);
+            case DOUBLE -> Schema.create(Schema.Type.DOUBLE);
+            case BOOLEAN -> Schema.create(Schema.Type.BOOLEAN);
+            case DECIMAL -> {
+                DecimalTypeInfo decimalTypeInfo = (DecimalTypeInfo) hiveType.getTypeInfo();
+                LogicalTypes.Decimal decimalLogicalType = LogicalTypes.decimal(decimalTypeInfo.precision(), decimalTypeInfo.scale());
+                yield decimalLogicalType.addToSchema(Schema.create(Schema.Type.BYTES));
+            }
+            case DATE -> NativeLogicalTypesAvroTypeManager.DATE_SCHEMA;
+            case TIMESTAMP -> NativeLogicalTypesAvroTypeManager.TIMESTAMP_MILLIS_SCHEMA;
+            case VOID -> Schema.create(Schema.Type.NULL);
+            default -> throw new UnsupportedOperationException(hiveType + " is not supported.");
+        };
+    }
+
+    private Schema createAvroRecord(HiveType hiveType)
+    {
+        if (!(hiveType.getTypeInfo() instanceof StructTypeInfo structTypeInfo)) {
+            throw new IllegalStateException("HiveType type info must be Struct Type info to make Avro Record");
+        }
+
+        final List<String> allStructFieldNames =
+                structTypeInfo.getAllStructFieldNames();
+        final List<TypeInfo> allStructFieldTypeInfo =
+                structTypeInfo.getAllStructFieldTypeInfos();
+        if (allStructFieldNames.size() != allStructFieldTypeInfo.size()) {
+            throw new IllegalArgumentException("Failed to generate avro schema from hive schema. " +
+                    "name and column type differs. names = " + allStructFieldNames + ", types = " +
+                    allStructFieldTypeInfo);
+        }
+
+        SchemaBuilder.FieldAssembler<Schema> fieldAssembler = SchemaBuilder
+                .record("record_" + recordNameSuffix.getAndIncrement())
+                .doc(structTypeInfo.toString())
+                .fields();
+
+        for (int i = 0; i < allStructFieldNames.size(); ++i) {
+            final TypeInfo childTypeInfo = allStructFieldTypeInfo.get(i);
+            final Schema fieldSchema = avroSchemaForHiveType(HiveType.toHiveType(childTypeInfo));
+            fieldAssembler = fieldAssembler
+                    .name(allStructFieldNames.get(i))
+                    .doc(childTypeInfo.toString())
+                    .type(fieldSchema)
+                    .withDefault(null);
+        }
+        return fieldAssembler.endRecord();
+    }
+
+    public static Schema wrapInUnionWithNull(Schema schema)
+    {
+        return switch (schema.getType()) {
+            case NULL -> schema;
+            case UNION -> Schema.createUnion(removeDuplicateNullSchemas(schema.getTypes()));
+            default -> Schema.createUnion(Arrays.asList(Schema.create(Schema.Type.NULL), schema));
+        };
+    }
+
+    private static List<Schema> removeDuplicateNullSchemas(List<Schema> childSchemas)
+    {
+        List<Schema> prunedSchemas = new ArrayList<>();
+        boolean isNullPresent = false;
+        for (Schema schema : childSchemas) {
+            if (schema.getType() == Schema.Type.NULL) {
+                isNullPresent = true;
+            }
+            else {
+                prunedSchemas.add(schema);
+            }
+        }
+        if (isNullPresent) {
+            prunedSchemas.add(0, Schema.create(Schema.Type.NULL));
+        }
+
+        return prunedSchemas;
+    }
+
+    static Map<String, String> getCanonicalToGivenFieldName(Schema schema)
+    {
+        // Lower case top level fields to allow for manually set avro schema (passed in via avro_schema_literal or avro_schema_url) to have uppercase field names
+        return schema.getFields().stream()
+                .map(Schema.Field::name)
+                .collect(toImmutableMap(fieldName -> fieldName.toLowerCase(Locale.ENGLISH), identity()));
+    }
+
+    private static Schema.Parser getSchemaParser()
+    {
+        // HIVE-24797: Disable validate default values when parsing Avro schemas.
+        return new Schema.Parser().setValidateDefaults(false);
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroHiveFileWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroHiveFileWriter.java
new file mode 100644
index 000000000000..6afed9a0631c
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroHiveFileWriter.java
@@ -0,0 +1,159 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.avro;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.io.CountingOutputStream;
+import io.trino.hive.formats.avro.AvroCompressionKind;
+import io.trino.hive.formats.avro.AvroFileWriter;
+import io.trino.hive.formats.avro.AvroTypeException;
+import io.trino.hive.formats.avro.AvroTypeManager;
+import io.trino.hive.formats.avro.AvroTypeUtils;
+import io.trino.memory.context.AggregatedMemoryContext;
+import io.trino.plugin.hive.FileWriter;
+import io.trino.spi.Page;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.type.Type;
+import org.apache.avro.Schema;
+import org.apache.avro.Schema.Field;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static com.google.common.base.Verify.verify;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_CLOSE_ERROR;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_DATA_ERROR;
+import static io.trino.plugin.hive.avro.AvroHiveFileUtils.getCanonicalToGivenFieldName;
+import static java.util.Objects.requireNonNull;
+
+public class AvroHiveFileWriter
+        implements FileWriter
+{
+    private static final int INSTANCE_SIZE = instanceSize(AvroHiveFileWriter.class);
+
+    private final AvroFileWriter fileWriter;
+    private final List<Block> typeCorrectNullBlocks;
+    private final CountingOutputStream countingOutputStream;
+    private final AggregatedMemoryContext outputStreamMemoryContext;
+
+    private final Closeable rollbackAction;
+
+    public AvroHiveFileWriter(
+            OutputStream outputStream,
+            AggregatedMemoryContext outputStreamMemoryContext,
+            Schema fileSchema,
+            AvroTypeManager typeManager,
+            Closeable rollbackAction,
+            List<String> inputColumnNames,
+            List<Type> inputColumnTypes,
+            AvroCompressionKind compressionKind,
+            Map<String, String> metadata)
+            throws IOException, AvroTypeException
+    {
+        countingOutputStream = new CountingOutputStream(requireNonNull(outputStream, "outputStream is null"));
+        this.outputStreamMemoryContext = requireNonNull(outputStreamMemoryContext, "outputStreamMemoryContext is null");
+        verify(requireNonNull(fileSchema, "fileSchema is null").getType() == Schema.Type.RECORD, "file schema must be record schema");
+        verify(inputColumnNames.size() == inputColumnTypes.size(), "column names must be equal to column types");
+        // file writer will reorder input columns to schema, we just need to impute nulls for schema fields without input columns
+        ImmutableList.Builder<String> outputColumnNames = ImmutableList.<String>builder();
+        ImmutableList.Builder<Type> outputColumnTypes = ImmutableList.<Type>builder().addAll(inputColumnTypes);
+        Map<String, String> canonicalToGivenFieldName = getCanonicalToGivenFieldName(fileSchema);
+        Map<String, Field> fields = fileSchema.getFields().stream().collect(Collectors.toMap(Field::name, Function.identity()));
+        for (String inputColumnName : inputColumnNames) {
+            Field field = fields.remove(canonicalToGivenFieldName.get(inputColumnName));
+            if (field == null) {
+                throw new AvroTypeException("File schema doesn't have input field " + inputColumnName);
+            }
+            outputColumnNames.add(field.name().toLowerCase(Locale.ENGLISH));
+        }
+        ImmutableList.Builder<Block> blocks = ImmutableList.builder();
+        for (Map.Entry<String, Field> entry : fields.entrySet()) {
+            outputColumnNames.add(entry.getKey().toLowerCase(Locale.ENGLISH));
+            Type type = AvroTypeUtils.typeFromAvro(entry.getValue().schema(), typeManager);
+            outputColumnTypes.add(type);
+            blocks.add(type.createBlockBuilder(null, 1).appendNull().build());
+        }
+        typeCorrectNullBlocks = blocks.build();
+        fileWriter = new AvroFileWriter(countingOutputStream, fileSchema, typeManager, compressionKind, metadata, outputColumnNames.build(), outputColumnTypes.build(), true);
+        this.rollbackAction = requireNonNull(rollbackAction, "rollbackAction is null");
+    }
+
+    @Override
+    public long getWrittenBytes()
+    {
+        return countingOutputStream.getCount();
+    }
+
+    @Override
+    public long getMemoryUsage()
+    {
+        return INSTANCE_SIZE + fileWriter.getRetainedSize() + outputStreamMemoryContext.getBytes();
+    }
+
+    @Override
+    public void appendRows(Page dataPage)
+    {
+        try {
+            Block[] blocks = new Block[dataPage.getChannelCount() + typeCorrectNullBlocks.size()];
+            for (int i = 0; i < dataPage.getChannelCount(); i++) {
+                blocks[i] = dataPage.getBlock(i);
+            }
+            for (int i = 0; i < typeCorrectNullBlocks.size(); i++) {
+                blocks[i + dataPage.getChannelCount()] = RunLengthEncodedBlock.create(typeCorrectNullBlocks.get(i), dataPage.getPositionCount());
+            }
+            fileWriter.write(new Page(blocks));
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_WRITER_DATA_ERROR, "Failed to write data page to Avro file", e);
+        }
+    }
+
+    @Override
+    public Closeable commit()
+    {
+        try {
+            fileWriter.close();
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_WRITER_CLOSE_ERROR, "Failed to close AvroFileWriter", e);
+        }
+        return rollbackAction;
+    }
+
+    @Override
+    public void rollback()
+    {
+        try (rollbackAction) {
+            fileWriter.close();
+        }
+        catch (Exception e) {
+            throw new TrinoException(HIVE_WRITER_CLOSE_ERROR, "Error rolling back write to Hive", e);
+        }
+    }
+
+    @Override
+    public long getValidationCpuNanos()
+    {
+        return 0;
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroPageSource.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroPageSource.java
new file mode 100644
index 000000000000..40398b749374
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroPageSource.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.avro;
+
+import io.airlift.units.DataSize;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.hive.formats.avro.AvroFileReader;
+import io.trino.hive.formats.avro.AvroTypeException;
+import io.trino.hive.formats.avro.AvroTypeManager;
+import io.trino.spi.Page;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorPageSource;
+import org.apache.avro.Schema;
+
+import java.io.IOException;
+import java.util.OptionalLong;
+
+import static io.trino.plugin.base.util.Closables.closeAllSuppress;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_CURSOR_ERROR;
+import static java.util.Objects.requireNonNull;
+
+public class AvroPageSource
+        implements ConnectorPageSource
+{
+    private static final long GUESSED_MEMORY_USAGE = DataSize.of(16, DataSize.Unit.MEGABYTE).toBytes();
+
+    private final String fileName;
+    private final AvroFileReader avroFileReader;
+
+    public AvroPageSource(
+            TrinoInputFile inputFile,
+            Schema schema,
+            AvroTypeManager avroTypeManager,
+            long offset,
+            long length)
+            throws IOException, AvroTypeException
+    {
+        fileName = requireNonNull(inputFile, "inputFile is null").location().fileName();
+        avroFileReader = new AvroFileReader(inputFile, schema, avroTypeManager, offset, OptionalLong.of(length));
+    }
+
+    @Override
+    public long getCompletedBytes()
+    {
+        return avroFileReader.getCompletedBytes();
+    }
+
+    @Override
+    public long getReadTimeNanos()
+    {
+        return avroFileReader.getReadTimeNanos();
+    }
+
+    @Override
+    public boolean isFinished()
+    {
+        try {
+            return !avroFileReader.hasNext();
+        }
+        catch (IOException | RuntimeException e) {
+            closeAllSuppress(e, this);
+            throw new TrinoException(HIVE_CURSOR_ERROR, "Failed to read Avro file: " + fileName, e);
+        }
+    }
+
+    @Override
+    public Page getNextPage()
+    {
+        try {
+            if (avroFileReader.hasNext()) {
+                return avroFileReader.next();
+            }
+            else {
+                return null;
+            }
+        }
+        catch (IOException | RuntimeException e) {
+            closeAllSuppress(e, this);
+            throw new TrinoException(HIVE_CURSOR_ERROR, "Failed to read Avro file: " + fileName, e);
+        }
+    }
+
+    @Override
+    public long getMemoryUsage()
+    {
+        return GUESSED_MEMORY_USAGE;
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        avroFileReader.close();
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroPageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroPageSourceFactory.java
new file mode 100644
index 000000000000..86fa1c60452d
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroPageSourceFactory.java
@@ -0,0 +1,244 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.avro;
+
+import com.google.inject.Inject;
+import io.airlift.slice.Slices;
+import io.airlift.units.DataSize;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoInputStream;
+import io.trino.filesystem.memory.MemoryInputFile;
+import io.trino.hive.formats.avro.AvroTypeException;
+import io.trino.plugin.hive.AcidInfo;
+import io.trino.plugin.hive.HiveColumnHandle;
+import io.trino.plugin.hive.HivePageSourceFactory;
+import io.trino.plugin.hive.HiveTimestampPrecision;
+import io.trino.plugin.hive.ReaderColumns;
+import io.trino.plugin.hive.ReaderPageSource;
+import io.trino.plugin.hive.acid.AcidTransaction;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.EmptyPageSource;
+import io.trino.spi.predicate.TupleDomain;
+import org.apache.avro.Schema;
+import org.apache.avro.SchemaBuilder;
+import org.apache.avro.util.internal.Accessor;
+
+import java.io.IOException;
+import java.util.AbstractCollection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.Properties;
+import java.util.Set;
+import java.util.UUID;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_CANNOT_OPEN_SPLIT;
+import static io.trino.plugin.hive.HivePageSourceProvider.projectBaseColumns;
+import static io.trino.plugin.hive.HiveSessionProperties.getTimestampPrecision;
+import static io.trino.plugin.hive.ReaderPageSource.noProjectionAdaptation;
+import static io.trino.plugin.hive.avro.AvroHiveFileUtils.getCanonicalToGivenFieldName;
+import static io.trino.plugin.hive.avro.AvroHiveFileUtils.wrapInUnionWithNull;
+import static io.trino.plugin.hive.util.HiveClassNames.AVRO_SERDE_CLASS;
+import static io.trino.plugin.hive.util.HiveUtil.getDeserializerClassName;
+import static io.trino.plugin.hive.util.HiveUtil.splitError;
+import static java.lang.Math.min;
+import static java.util.Objects.requireNonNull;
+
+public class AvroPageSourceFactory
+        implements HivePageSourceFactory
+{
+    private static final DataSize BUFFER_SIZE = DataSize.of(8, DataSize.Unit.MEGABYTE);
+
+    private final TrinoFileSystemFactory trinoFileSystemFactory;
+
+    @Inject
+    public AvroPageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory)
+    {
+        this.trinoFileSystemFactory = requireNonNull(trinoFileSystemFactory, "trinoFileSystemFactory is null");
+    }
+
+    @Override
+    public Optional<ReaderPageSource> createPageSource(
+            ConnectorSession session,
+            Location path,
+            long start,
+            long length,
+            long estimatedFileSize,
+            Properties schema,
+            List<HiveColumnHandle> columns,
+            TupleDomain<HiveColumnHandle> effectivePredicate,
+            Optional<AcidInfo> acidInfo,
+            OptionalInt bucketNumber,
+            boolean originalFile,
+            AcidTransaction transaction)
+    {
+        if (!AVRO_SERDE_CLASS.equals(getDeserializerClassName(schema))) {
+            return Optional.empty();
+        }
+        checkArgument(acidInfo.isEmpty(), "Acid is not supported");
+
+        List<HiveColumnHandle> projectedReaderColumns = columns;
+        Optional<ReaderColumns> readerProjections = projectBaseColumns(columns);
+
+        if (readerProjections.isPresent()) {
+            projectedReaderColumns = readerProjections.get().get().stream()
+                    .map(HiveColumnHandle.class::cast)
+                    .collect(toImmutableList());
+        }
+
+        TrinoFileSystem trinoFileSystem = trinoFileSystemFactory.create(session.getIdentity());
+        TrinoInputFile inputFile = trinoFileSystem.newInputFile(path);
+        HiveTimestampPrecision hiveTimestampPrecision = getTimestampPrecision(session);
+
+        Schema tableSchema;
+        try {
+            tableSchema = AvroHiveFileUtils.determineSchemaOrThrowException(trinoFileSystem, schema);
+        }
+        catch (IOException | org.apache.avro.AvroTypeException e) {
+            throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, "Unable to load or parse schema", e);
+        }
+
+        try {
+            length = min(inputFile.length() - start, length);
+            if (estimatedFileSize < BUFFER_SIZE.toBytes()) {
+                try (TrinoInputStream input = inputFile.newStream()) {
+                    byte[] data = input.readAllBytes();
+                    inputFile = new MemoryInputFile(path, Slices.wrappedBuffer(data));
+                }
+            }
+        }
+        catch (TrinoException e) {
+            throw e;
+        }
+        catch (Exception e) {
+            throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, splitError(e, path, start, length), e);
+        }
+
+        // Split may be empty now that the correct file size is known
+        if (length <= 0) {
+            return Optional.of(noProjectionAdaptation(new EmptyPageSource()));
+        }
+
+        Schema maskedSchema;
+        try {
+            maskedSchema = maskColumnsFromTableSchema(projectedReaderColumns, tableSchema);
+        }
+        catch (org.apache.avro.AvroTypeException e) {
+            throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, "Avro type resolution error when initializing split from %s".formatted(path), e);
+        }
+
+        if (maskedSchema.getFields().isEmpty()) {
+            // no non-masked columns to select from partition schema
+            // hack to return null rows with same total count as underlying data file
+            // will error if UUID is same name as base column for underlying storage table but should never
+            // return false data. If file data has f+uuid column in schema then resolution of read null from not null will fail.
+            SchemaBuilder.FieldAssembler<Schema> nullSchema = SchemaBuilder.record("null_only").fields();
+            for (int i = 0; i < Math.max(projectedReaderColumns.size(), 1); i++) {
+                String notAColumnName = null;
+                while (Objects.isNull(notAColumnName) || Objects.nonNull(tableSchema.getField(notAColumnName))) {
+                    notAColumnName = "f" + UUID.randomUUID().toString().replace('-', '_');
+                }
+                nullSchema = nullSchema.name(notAColumnName).type(Schema.create(Schema.Type.NULL)).withDefault(null);
+            }
+            try {
+                return Optional.of(noProjectionAdaptation(new AvroPageSource(inputFile, nullSchema.endRecord(), new HiveAvroTypeManager(hiveTimestampPrecision), start, length)));
+            }
+            catch (IOException e) {
+                throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, e);
+            }
+            catch (AvroTypeException e) {
+                throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, "Avro type resolution error when initializing split from %s".formatted(path), e);
+            }
+        }
+
+        try {
+            return Optional.of(new ReaderPageSource(new AvroPageSource(inputFile, maskedSchema, new HiveAvroTypeManager(hiveTimestampPrecision), start, length), readerProjections));
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, e);
+        }
+        catch (AvroTypeException e) {
+            throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, "Avro type resolution error when initializing split from %s".formatted(path), e);
+        }
+    }
+
+    private Schema maskColumnsFromTableSchema(List<HiveColumnHandle> columns, Schema tableSchema)
+    {
+        verify(tableSchema.getType() == Schema.Type.RECORD);
+        Set<String> maskedColumns = columns.stream().map(HiveColumnHandle::getBaseColumnName).collect(LinkedHashSet::new, HashSet::add, AbstractCollection::addAll);
+
+        SchemaBuilder.FieldAssembler<Schema> maskedSchema = SchemaBuilder.builder()
+                .record(tableSchema.getName())
+                .namespace(tableSchema.getNamespace())
+                .fields();
+        Map<String, String> lowerToGivenName = getCanonicalToGivenFieldName(tableSchema);
+
+        for (String columnName : maskedColumns) {
+            Schema.Field field = tableSchema.getField(columnName);
+            if (Objects.isNull(field)) {
+                if (!lowerToGivenName.containsKey(columnName)) {
+                    throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, "Unable to find column %s in table Avro schema %s".formatted(columnName, tableSchema.getFullName()));
+                }
+                field = tableSchema.getField(lowerToGivenName.get(columnName));
+            }
+            if (field.hasDefaultValue()) {
+                try {
+                    Object defaultObj = Accessor.defaultValue(field);
+                    maskedSchema = maskedSchema
+                            .name(field.name())
+                            .aliases(field.aliases().toArray(String[]::new))
+                            .doc(field.doc())
+                            .type(field.schema())
+                            .withDefault(defaultObj);
+                }
+                catch (org.apache.avro.AvroTypeException e) {
+                    // in order to maintain backwards compatibility invalid defaults are mapped to null
+                    // behavior defined by io.trino.tests.product.hive.TestAvroSchemaStrictness.testInvalidUnionDefaults
+                    // solution is to make the field nullable and default-able to null. Any place default would be used, null will be
+                    if (e.getMessage().contains("Invalid default")) {
+                        maskedSchema = maskedSchema
+                                .name(field.name())
+                                .aliases(field.aliases().toArray(String[]::new))
+                                .doc(field.doc())
+                                .type(wrapInUnionWithNull(field.schema()))
+                                .withDefault(null);
+                    }
+                    else {
+                        throw e;
+                    }
+                }
+            }
+            else {
+                maskedSchema = maskedSchema
+                        .name(field.name())
+                        .aliases(field.aliases().toArray(String[]::new))
+                        .doc(field.doc())
+                        .type(field.schema())
+                        .noDefault();
+            }
+        }
+        return maskedSchema.endRecord();
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroRecordWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroRecordWriter.java
deleted file mode 100644
index e62be19b2d9e..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/AvroRecordWriter.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.avro;
-
-import io.trino.plugin.hive.RecordFileWriter.ExtendedRecordWriter;
-import org.apache.avro.Schema;
-import org.apache.avro.file.CodecFactory;
-import org.apache.avro.file.DataFileWriter;
-import org.apache.avro.generic.GenericDatumWriter;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.hadoop.fs.FSDataOutputStream;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.ql.exec.FileSinkOperator.RecordWriter;
-import org.apache.hadoop.hive.ql.io.avro.AvroGenericRecordWriter;
-import org.apache.hadoop.hive.serde2.avro.AvroSerdeException;
-import org.apache.hadoop.hive.serde2.avro.AvroSerdeUtils;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.mapred.JobConf;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import static org.apache.avro.file.CodecFactory.DEFAULT_DEFLATE_LEVEL;
-import static org.apache.avro.file.DataFileConstants.DEFLATE_CODEC;
-import static org.apache.avro.mapred.AvroJob.OUTPUT_CODEC;
-import static org.apache.avro.mapred.AvroOutputFormat.DEFLATE_LEVEL_KEY;
-
-public class AvroRecordWriter
-        implements ExtendedRecordWriter
-{
-    private final RecordWriter delegate;
-    private final FSDataOutputStream outputStream;
-
-    public AvroRecordWriter(Path path, JobConf jobConf, boolean isCompressed, Properties properties)
-            throws IOException
-    {
-        Schema schema;
-        try {
-            schema = AvroSerdeUtils.determineSchemaOrThrowException(jobConf, properties);
-        }
-        catch (AvroSerdeException e) {
-            throw new IOException(e);
-        }
-        GenericDatumWriter<GenericRecord> genericDatumWriter = new GenericDatumWriter<>(schema);
-        DataFileWriter<GenericRecord> dataFileWriter = new DataFileWriter<>(genericDatumWriter);
-
-        if (isCompressed) {
-            int level = jobConf.getInt(DEFLATE_LEVEL_KEY, DEFAULT_DEFLATE_LEVEL);
-            String codecName = jobConf.get(OUTPUT_CODEC, DEFLATE_CODEC);
-            CodecFactory factory = codecName.equals(DEFLATE_CODEC)
-                    ? CodecFactory.deflateCodec(level)
-                    : CodecFactory.fromString(codecName);
-            dataFileWriter.setCodec(factory);
-        }
-
-        outputStream = path.getFileSystem(jobConf).create(path);
-        dataFileWriter.create(schema, outputStream);
-        delegate = new AvroGenericRecordWriter(dataFileWriter);
-    }
-
-    @Override
-    public long getWrittenBytes()
-    {
-        return outputStream.getPos();
-    }
-
-    @Override
-    public void write(Writable writable)
-            throws IOException
-    {
-        delegate.write(writable);
-    }
-
-    @Override
-    public void close(boolean abort)
-            throws IOException
-    {
-        delegate.close(abort);
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/HiveAvroTypeManager.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/HiveAvroTypeManager.java
new file mode 100644
index 000000000000..adf95a909e8b
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/HiveAvroTypeManager.java
@@ -0,0 +1,267 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.avro;
+
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
+import io.trino.hive.formats.avro.AvroTypeException;
+import io.trino.hive.formats.avro.NativeLogicalTypesAvroTypeManager;
+import io.trino.plugin.hive.HiveTimestampPrecision;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.BooleanType;
+import io.trino.spi.type.Chars;
+import io.trino.spi.type.LongTimestamp;
+import io.trino.spi.type.SqlTimestamp;
+import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.Timestamps;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.Varchars;
+import org.apache.avro.Schema;
+import org.joda.time.DateTimeZone;
+
+import java.nio.charset.StandardCharsets;
+import java.time.ZoneId;
+import java.util.Map;
+import java.util.Optional;
+import java.util.TimeZone;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+
+import static io.trino.plugin.hive.avro.AvroHiveConstants.CHAR_TYPE_LOGICAL_NAME;
+import static io.trino.plugin.hive.avro.AvroHiveConstants.VARCHAR_AND_CHAR_LOGICAL_TYPE_LENGTH_PROP;
+import static io.trino.plugin.hive.avro.AvroHiveConstants.VARCHAR_TYPE_LOGICAL_NAME;
+import static io.trino.spi.type.CharType.createCharType;
+import static io.trino.spi.type.TimestampType.createTimestampType;
+import static io.trino.spi.type.Timestamps.roundDiv;
+import static io.trino.spi.type.VarcharType.createVarcharType;
+import static java.time.ZoneOffset.UTC;
+import static java.util.Objects.requireNonNull;
+
+public class HiveAvroTypeManager
+        extends NativeLogicalTypesAvroTypeManager
+{
+    private final AtomicReference<ZoneId> convertToTimezone = new AtomicReference<>(UTC);
+    private final TimestampType hiveSessionTimestamp;
+
+    public HiveAvroTypeManager(HiveTimestampPrecision hiveTimestampPrecision)
+    {
+        hiveSessionTimestamp = createTimestampType(requireNonNull(hiveTimestampPrecision, "hiveTimestampPrecision is null").getPrecision());
+    }
+
+    @Override
+    public void configure(Map<String, byte[]> fileMetadata)
+    {
+        if (fileMetadata.containsKey(AvroHiveConstants.WRITER_TIME_ZONE)) {
+            convertToTimezone.set(ZoneId.of(new String(fileMetadata.get(AvroHiveConstants.WRITER_TIME_ZONE), StandardCharsets.UTF_8)));
+        }
+        else {
+            // legacy path allows this conversion to be skipped with {@link org.apache.hadoop.conf.Configuration} param
+            // currently no way to set that configuration in Trino
+            convertToTimezone.set(TimeZone.getDefault().toZoneId());
+        }
+    }
+
+    @Override
+    public Optional<Type> overrideTypeForSchema(Schema schema)
+            throws AvroTypeException
+    {
+        if (schema.getType() == Schema.Type.NULL) {
+            // allows of dereference when no base columns from file used
+            // BooleanType chosen rather arbitrarily to be stuffed with null
+            // in response to behavior defined by io.trino.tests.product.hive.TestAvroSchemaStrictness.testInvalidUnionDefaults
+            return Optional.of(BooleanType.BOOLEAN);
+        }
+        ValidateLogicalTypeResult result = validateLogicalType(schema);
+        // mapped in from HiveType translator
+        // TODO replace with sealed class case match syntax when stable
+        if (result instanceof NativeLogicalTypesAvroTypeManager.NoLogicalType ignored) {
+            return Optional.empty();
+        }
+        if (result instanceof NonNativeAvroLogicalType nonNativeAvroLogicalType) {
+            return switch (nonNativeAvroLogicalType.getLogicalTypeName()) {
+                case VARCHAR_TYPE_LOGICAL_NAME, CHAR_TYPE_LOGICAL_NAME -> Optional.of(getHiveLogicalVarCharOrCharType(schema, nonNativeAvroLogicalType));
+                default -> Optional.empty();
+            };
+        }
+        if (result instanceof NativeLogicalTypesAvroTypeManager.InvalidNativeAvroLogicalType invalidNativeAvroLogicalType) {
+            return switch (invalidNativeAvroLogicalType.getLogicalTypeName()) {
+                case TIMESTAMP_MILLIS, DATE, DECIMAL -> throw invalidNativeAvroLogicalType.getCause();
+                default -> Optional.empty(); // Other logical types ignored by hive/don't map to hive types
+            };
+        }
+        if (result instanceof NativeLogicalTypesAvroTypeManager.ValidNativeAvroLogicalType validNativeAvroLogicalType) {
+            return switch (validNativeAvroLogicalType.getLogicalType().getName()) {
+                case DATE -> super.overrideTypeForSchema(schema);
+                case TIMESTAMP_MILLIS -> Optional.of(hiveSessionTimestamp);
+                case DECIMAL -> {
+                    if (schema.getType() == Schema.Type.FIXED) {
+                        // for backwards compatibility
+                        throw new AvroTypeException("Hive does not support fixed decimal types");
+                    }
+                    yield super.overrideTypeForSchema(schema);
+                }
+                default -> Optional.empty(); // Other logical types ignored by hive/don't map to hive types
+            };
+        }
+        throw new IllegalStateException("Unhandled validate logical type result");
+    }
+
+    @Override
+    public Optional<BiConsumer<BlockBuilder, Object>> overrideBuildingFunctionForSchema(Schema schema)
+            throws AvroTypeException
+    {
+        ValidateLogicalTypeResult result = validateLogicalType(schema);
+        // TODO replace with sealed class case match syntax when stable
+        if (result instanceof NativeLogicalTypesAvroTypeManager.NoLogicalType ignored) {
+            return Optional.empty();
+        }
+        if (result instanceof NonNativeAvroLogicalType nonNativeAvroLogicalType) {
+            return switch (nonNativeAvroLogicalType.getLogicalTypeName()) {
+                case VARCHAR_TYPE_LOGICAL_NAME, CHAR_TYPE_LOGICAL_NAME -> {
+                    Type type = getHiveLogicalVarCharOrCharType(schema, nonNativeAvroLogicalType);
+                    if (nonNativeAvroLogicalType.getLogicalTypeName().equals(VARCHAR_TYPE_LOGICAL_NAME)) {
+                        yield Optional.of(((blockBuilder, obj) -> {
+                            type.writeSlice(blockBuilder, Varchars.truncateToLength(Slices.utf8Slice(obj.toString()), type));
+                        }));
+                    }
+                    else {
+                        yield Optional.of(((blockBuilder, obj) -> {
+                            type.writeSlice(blockBuilder, Chars.truncateToLengthAndTrimSpaces(Slices.utf8Slice(obj.toString()), type));
+                        }));
+                    }
+                }
+                default -> Optional.empty();
+            };
+        }
+        if (result instanceof NativeLogicalTypesAvroTypeManager.InvalidNativeAvroLogicalType invalidNativeAvroLogicalType) {
+            return switch (invalidNativeAvroLogicalType.getLogicalTypeName()) {
+                case TIMESTAMP_MILLIS, DATE, DECIMAL -> throw invalidNativeAvroLogicalType.getCause();
+                default -> Optional.empty(); // Other logical types ignored by hive/don't map to hive types
+            };
+        }
+        if (result instanceof NativeLogicalTypesAvroTypeManager.ValidNativeAvroLogicalType validNativeAvroLogicalType) {
+            return switch (validNativeAvroLogicalType.getLogicalType().getName()) {
+                case TIMESTAMP_MILLIS -> {
+                    if (hiveSessionTimestamp.isShort()) {
+                        yield Optional.of((blockBuilder, obj) -> {
+                            Long millisSinceEpochUTC = (Long) obj;
+                            hiveSessionTimestamp.writeLong(blockBuilder, DateTimeZone.forTimeZone(TimeZone.getTimeZone(convertToTimezone.get())).convertUTCToLocal(millisSinceEpochUTC) * Timestamps.MICROSECONDS_PER_MILLISECOND);
+                        });
+                    }
+                    else {
+                        yield Optional.of((blockBuilder, obj) -> {
+                            Long millisSinceEpochUTC = (Long) obj;
+                            LongTimestamp longTimestamp = new LongTimestamp(DateTimeZone.forTimeZone(TimeZone.getTimeZone(convertToTimezone.get())).convertUTCToLocal(millisSinceEpochUTC) * Timestamps.MICROSECONDS_PER_MILLISECOND, 0);
+                            hiveSessionTimestamp.writeObject(blockBuilder, longTimestamp);
+                        });
+                    }
+                }
+                case DATE, DECIMAL -> super.overrideBuildingFunctionForSchema(schema);
+                default -> Optional.empty(); // Other logical types ignored by hive/don't map to hive types
+            };
+        }
+        throw new IllegalStateException("Unhandled validate logical type result");
+    }
+
+    @Override
+    public Optional<BiFunction<Block, Integer, Object>> overrideBlockToAvroObject(Schema schema, Type type)
+            throws AvroTypeException
+    {
+        ValidateLogicalTypeResult result = validateLogicalType(schema);
+        // TODO replace with sealed class case match syntax when stable
+        if (result instanceof NativeLogicalTypesAvroTypeManager.NoLogicalType ignored) {
+            return Optional.empty();
+        }
+        if (result instanceof NonNativeAvroLogicalType nonNativeAvroLogicalType) {
+            return switch (nonNativeAvroLogicalType.getLogicalTypeName()) {
+                case VARCHAR_TYPE_LOGICAL_NAME, CHAR_TYPE_LOGICAL_NAME -> {
+                    Type expectedType = getHiveLogicalVarCharOrCharType(schema, nonNativeAvroLogicalType);
+                    if (!expectedType.equals(type)) {
+                        throw new AvroTypeException("Type provided for column [%s] is incompatible with type for schema: %s".formatted(type, expectedType));
+                    }
+                    yield Optional.of((block, pos) -> ((Slice) expectedType.getObject(block, pos)).toStringUtf8());
+                }
+                default -> Optional.empty();
+            };
+        }
+        if (result instanceof NativeLogicalTypesAvroTypeManager.InvalidNativeAvroLogicalType invalidNativeAvroLogicalType) {
+            return switch (invalidNativeAvroLogicalType.getLogicalTypeName()) {
+                case TIMESTAMP_MILLIS, DATE, DECIMAL -> throw invalidNativeAvroLogicalType.getCause();
+                default -> Optional.empty(); // Other logical types ignored by hive/don't map to hive types
+            };
+        }
+        if (result instanceof NativeLogicalTypesAvroTypeManager.ValidNativeAvroLogicalType validNativeAvroLogicalType) {
+            return switch (validNativeAvroLogicalType.getLogicalType().getName()) {
+                case TIMESTAMP_MILLIS -> {
+                    if (!(type instanceof TimestampType timestampType)) {
+                        throw new AvroTypeException("Can't represent avro logical type %s with Trino Type %s".formatted(validNativeAvroLogicalType.getLogicalType().getName(), type));
+                    }
+                    if (timestampType.isShort()) {
+                        yield Optional.of((block, pos) -> {
+                            long millis = roundDiv(timestampType.getLong(block, pos), Timestamps.MICROSECONDS_PER_MILLISECOND);
+                            // see org.apache.hadoop.hive.serde2.avro.AvroSerializer.serializePrimitive
+                            return DateTimeZone.forTimeZone(TimeZone.getDefault()).convertLocalToUTC(millis, false);
+                        });
+                    }
+                    else {
+                        yield Optional.of((block, pos) ->
+                        {
+                            SqlTimestamp timestamp = (SqlTimestamp) timestampType.getObject(block, pos);
+                            // see org.apache.hadoop.hive.serde2.avro.AvroSerializer.serializePrimitive
+                            return DateTimeZone.forTimeZone(TimeZone.getDefault()).convertLocalToUTC(timestamp.getMillis(), false);
+                        });
+                    }
+                }
+                case DATE, DECIMAL -> super.overrideBlockToAvroObject(schema, type);
+                default -> Optional.empty(); // Other logical types ignored by hive/don't map to hive types
+            };
+        }
+        throw new IllegalStateException("Unhandled validate logical type result");
+    }
+
+    private static Type getHiveLogicalVarCharOrCharType(Schema schema, NonNativeAvroLogicalType nonNativeAvroLogicalType)
+            throws AvroTypeException
+    {
+        if (schema.getType() != Schema.Type.STRING) {
+            throw new AvroTypeException("Unsupported Avro type for Hive Logical Type in schema " + schema);
+        }
+        Object maxLengthObject = schema.getObjectProp(VARCHAR_AND_CHAR_LOGICAL_TYPE_LENGTH_PROP);
+        if (maxLengthObject == null) {
+            throw new AvroTypeException("Missing property maxLength in schema for Hive Type " + nonNativeAvroLogicalType.getLogicalTypeName());
+        }
+        try {
+            int maxLength;
+            if (maxLengthObject instanceof String maxLengthString) {
+                maxLength = Integer.parseInt(maxLengthString);
+            }
+            else if (maxLengthObject instanceof Number maxLengthNumber) {
+                maxLength = maxLengthNumber.intValue();
+            }
+            else {
+                throw new AvroTypeException("Unrecognized property type for " + VARCHAR_AND_CHAR_LOGICAL_TYPE_LENGTH_PROP + " in schema " + schema);
+            }
+            if (nonNativeAvroLogicalType.getLogicalTypeName().equals(VARCHAR_TYPE_LOGICAL_NAME)) {
+                return createVarcharType(maxLength);
+            }
+            else {
+                return createCharType(maxLength);
+            }
+        }
+        catch (NumberFormatException numberFormatException) {
+            throw new AvroTypeException("Property maxLength not convertible to Integer in Hive Logical type schema " + schema);
+        }
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/AwsApiCallStats.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/AwsApiCallStats.java
index a1b2d1456c85..ff650da566cb 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/AwsApiCallStats.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/AwsApiCallStats.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.hive.aws;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.stats.CounterStat;
 import io.airlift.stats.TimeStat;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.concurrent.Callable;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/AwsSdkClientCoreStats.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/AwsSdkClientCoreStats.java
index f77df3a512fe..0fb4d6aa918e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/AwsSdkClientCoreStats.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/AwsSdkClientCoreStats.java
@@ -18,13 +18,12 @@
 import com.amazonaws.metrics.RequestMetricCollector;
 import com.amazonaws.util.AWSRequestMetrics;
 import com.amazonaws.util.TimingInfo;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.stats.CounterStat;
 import io.airlift.stats.TimeStat;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/athena/PartitionProjection.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/athena/PartitionProjection.java
index 5c6f0c88fa0f..e20d8ed7f244 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/athena/PartitionProjection.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/athena/PartitionProjection.java
@@ -20,7 +20,6 @@
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
-import org.apache.hadoop.fs.Path;
 
 import java.util.List;
 import java.util.Map;
@@ -82,7 +81,7 @@ public Optional<List<String>> getProjectedPartitionNamesByFilter(List<String> co
                 .collect(toImmutableList());
         return Optional.of(cartesianProduct(projectedPartitionValues)
                 .stream()
-                .map(parts -> String.join(Path.SEPARATOR, parts))
+                .map(parts -> String.join("/", parts))
                 .collect(toImmutableList()));
     }
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/athena/PartitionProjectionMetastoreDecorator.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/athena/PartitionProjectionMetastoreDecorator.java
index 5ae67f922958..c221e87e5ad9 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/athena/PartitionProjectionMetastoreDecorator.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/athena/PartitionProjectionMetastoreDecorator.java
@@ -14,6 +14,7 @@
 
 package io.trino.plugin.hive.aws.athena;
 
+import com.google.inject.Inject;
 import io.trino.plugin.hive.metastore.ForwardingHiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastoreDecorator;
@@ -22,8 +23,6 @@
 import io.trino.spi.TrinoException;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/athena/PartitionProjectionService.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/athena/PartitionProjectionService.java
index 205ad0cd9d1b..d9175050adec 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/athena/PartitionProjectionService.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/aws/athena/PartitionProjectionService.java
@@ -17,6 +17,7 @@
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.aws.athena.projection.Projection;
 import io.trino.plugin.hive.aws.athena.projection.ProjectionFactory;
@@ -29,8 +30,6 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Locale;
@@ -100,7 +99,7 @@ public Map<String, Object> getPartitionProjectionTrinoTableProperties(Table tabl
         return trinoTablePropertiesBuilder.buildOrThrow();
     }
 
-    public Map<String, Object> getPartitionProjectionTrinoColumnProperties(Table table, String columnName)
+    public static Map<String, Object> getPartitionProjectionTrinoColumnProperties(Table table, String columnName)
     {
         Map<String, String> metastoreTableProperties = table.getParameters();
         return rewriteColumnProjectionProperties(metastoreTableProperties, columnName);
@@ -294,7 +293,7 @@ else if (!columnProjections.isEmpty()) {
         return new PartitionProjection(projectionEnabledProperty.orElse(false), storageLocationTemplate, columnProjections);
     }
 
-    private Map<String, Object> rewriteColumnProjectionProperties(Map<String, String> metastoreTableProperties, String columnName)
+    private static Map<String, Object> rewriteColumnProjectionProperties(Map<String, String> metastoreTableProperties, String columnName)
     {
         ImmutableMap.Builder<String, Object> trinoTablePropertiesBuilder = ImmutableMap.builder();
         rewriteProperty(
@@ -308,13 +307,13 @@ private Map<String, Object> rewriteColumnProjectionProperties(Map<String, String
                 trinoTablePropertiesBuilder,
                 getMetastoreProjectionPropertyKey(columnName, COLUMN_PROJECTION_VALUES_SUFFIX),
                 COLUMN_PROJECTION_VALUES,
-                this::splitCommaSeparatedString);
+                PartitionProjectionService::splitCommaSeparatedString);
         rewriteProperty(
                 metastoreTableProperties,
                 trinoTablePropertiesBuilder,
                 getMetastoreProjectionPropertyKey(columnName, COLUMN_PROJECTION_RANGE_SUFFIX),
                 COLUMN_PROJECTION_RANGE,
-                this::splitCommaSeparatedString);
+                PartitionProjectionService::splitCommaSeparatedString);
         rewriteProperty(
                 metastoreTableProperties,
                 trinoTablePropertiesBuilder,
@@ -356,7 +355,7 @@ private Projection parseColumnProjection(String columnName, Type columnType, Map
         return projectionFactory.create(columnName, columnType, columnProperties);
     }
 
-    private <I, V> void rewriteProperty(
+    private static <I, V> void rewriteProperty(
             Map<String, I> sourceProperties,
             ImmutableMap.Builder<String, V> targetPropertiesBuilder,
             String sourcePropertyKey,
@@ -372,7 +371,7 @@ private TrinoException columnProjectionException(String message)
         return new TrinoException(INVALID_COLUMN_PROPERTY, message);
     }
 
-    private List<String> splitCommaSeparatedString(String value)
+    private static List<String> splitCommaSeparatedString(String value)
     {
         return Splitter.on(',')
                 .trimResults()
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/CharCoercer.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/CharCoercer.java
index 54df1a03794a..0c9ecdf76cb8 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/CharCoercer.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/CharCoercer.java
@@ -19,7 +19,7 @@
 import io.trino.spi.type.CharType;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.plugin.hive.HivePageSource.narrowerThan;
+import static io.trino.plugin.hive.coercions.CoercionUtils.narrowerThan;
 import static io.trino.spi.type.Chars.truncateToLengthAndTrimSpaces;
 
 public class CharCoercer
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/CoercionUtils.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/CoercionUtils.java
new file mode 100644
index 000000000000..9ea765a36048
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/CoercionUtils.java
@@ -0,0 +1,459 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.coercions;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.plugin.hive.HiveTimestampPrecision;
+import io.trino.plugin.hive.HiveType;
+import io.trino.plugin.hive.coercions.DateCoercer.VarcharToDateCoercer;
+import io.trino.plugin.hive.coercions.TimestampCoercer.VarcharToLongTimestampCoercer;
+import io.trino.plugin.hive.coercions.TimestampCoercer.VarcharToShortTimestampCoercer;
+import io.trino.plugin.hive.type.Category;
+import io.trino.plugin.hive.type.ListTypeInfo;
+import io.trino.plugin.hive.type.MapTypeInfo;
+import io.trino.plugin.hive.type.StructTypeInfo;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlock;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ColumnarArray;
+import io.trino.spi.block.ColumnarMap;
+import io.trino.spi.block.DictionaryBlock;
+import io.trino.spi.block.LazyBlock;
+import io.trino.spi.block.RowBlock;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.BigintType;
+import io.trino.spi.type.CharType;
+import io.trino.spi.type.DateType;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.IntegerType;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.RowType.Field;
+import io.trino.spi.type.SmallintType;
+import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.TinyintType;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeManager;
+import io.trino.spi.type.VarcharType;
+
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.plugin.hive.HiveType.HIVE_BYTE;
+import static io.trino.plugin.hive.HiveType.HIVE_DOUBLE;
+import static io.trino.plugin.hive.HiveType.HIVE_FLOAT;
+import static io.trino.plugin.hive.HiveType.HIVE_INT;
+import static io.trino.plugin.hive.HiveType.HIVE_LONG;
+import static io.trino.plugin.hive.HiveType.HIVE_SHORT;
+import static io.trino.plugin.hive.coercions.DecimalCoercers.createDecimalToDecimalCoercer;
+import static io.trino.plugin.hive.coercions.DecimalCoercers.createDecimalToDoubleCoercer;
+import static io.trino.plugin.hive.coercions.DecimalCoercers.createDecimalToInteger;
+import static io.trino.plugin.hive.coercions.DecimalCoercers.createDecimalToRealCoercer;
+import static io.trino.plugin.hive.coercions.DecimalCoercers.createDecimalToVarcharCoercer;
+import static io.trino.plugin.hive.coercions.DecimalCoercers.createDoubleToDecimalCoercer;
+import static io.trino.plugin.hive.coercions.DecimalCoercers.createRealToDecimalCoercer;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.block.ColumnarArray.toColumnarArray;
+import static io.trino.spi.block.ColumnarMap.toColumnarMap;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+public final class CoercionUtils
+{
+    private CoercionUtils() {}
+
+    public static Type createTypeFromCoercer(TypeManager typeManager, HiveType fromHiveType, HiveType toHiveType, CoercionContext coercionContext)
+    {
+        return createCoercer(typeManager, fromHiveType, toHiveType, coercionContext)
+                .map(TypeCoercer::getFromType)
+                .orElseGet(() -> fromHiveType.getType(typeManager, coercionContext.timestampPrecision()));
+    }
+
+    public static Optional<TypeCoercer<? extends Type, ? extends Type>> createCoercer(TypeManager typeManager, HiveType fromHiveType, HiveType toHiveType, CoercionContext coercionContext)
+    {
+        if (fromHiveType.equals(toHiveType)) {
+            return Optional.empty();
+        }
+
+        Type fromType = fromHiveType.getType(typeManager, coercionContext.timestampPrecision());
+        Type toType = toHiveType.getType(typeManager, coercionContext.timestampPrecision());
+
+        if (toType instanceof VarcharType toVarcharType && (fromHiveType.equals(HIVE_BYTE) || fromHiveType.equals(HIVE_SHORT) || fromHiveType.equals(HIVE_INT) || fromHiveType.equals(HIVE_LONG))) {
+            return Optional.of(new IntegerNumberToVarcharCoercer<>(fromType, toVarcharType));
+        }
+        if (fromType instanceof VarcharType fromVarcharType && (toHiveType.equals(HIVE_BYTE) || toHiveType.equals(HIVE_SHORT) || toHiveType.equals(HIVE_INT) || toHiveType.equals(HIVE_LONG))) {
+            return Optional.of(new VarcharToIntegerNumberCoercer<>(fromVarcharType, toType));
+        }
+        if (fromType instanceof VarcharType varcharType && toType instanceof TimestampType timestampType) {
+            if (timestampType.isShort()) {
+                return Optional.of(new VarcharToShortTimestampCoercer(varcharType, timestampType));
+            }
+            return Optional.of(new VarcharToLongTimestampCoercer(varcharType, timestampType));
+        }
+        if (fromType instanceof VarcharType fromVarcharType && toType instanceof VarcharType toVarcharType) {
+            if (narrowerThan(toVarcharType, fromVarcharType)) {
+                return Optional.of(new VarcharCoercer(fromVarcharType, toVarcharType));
+            }
+            return Optional.empty();
+        }
+        if (fromType instanceof VarcharType fromVarcharType && toType instanceof DateType toDateType) {
+            return Optional.of(new VarcharToDateCoercer(fromVarcharType, toDateType));
+        }
+        if (fromType instanceof CharType fromCharType && toType instanceof CharType toCharType) {
+            if (narrowerThan(toCharType, fromCharType)) {
+                return Optional.of(new CharCoercer(fromCharType, toCharType));
+            }
+            return Optional.empty();
+        }
+        if (fromHiveType.equals(HIVE_BYTE) && (toHiveType.equals(HIVE_SHORT) || toHiveType.equals(HIVE_INT) || toHiveType.equals(HIVE_LONG))) {
+            return Optional.of(new IntegerNumberUpscaleCoercer<>(fromType, toType));
+        }
+        if (fromHiveType.equals(HIVE_SHORT) && (toHiveType.equals(HIVE_INT) || toHiveType.equals(HIVE_LONG))) {
+            return Optional.of(new IntegerNumberUpscaleCoercer<>(fromType, toType));
+        }
+        if (fromHiveType.equals(HIVE_INT) && toHiveType.equals(HIVE_LONG)) {
+            return Optional.of(new IntegerToBigintCoercer());
+        }
+        if (fromHiveType.equals(HIVE_FLOAT) && toHiveType.equals(HIVE_DOUBLE)) {
+            return Optional.of(new FloatToDoubleCoercer());
+        }
+        if (fromHiveType.equals(HIVE_DOUBLE) && toHiveType.equals(HIVE_FLOAT)) {
+            return Optional.of(new DoubleToFloatCoercer());
+        }
+        if (fromType instanceof DecimalType fromDecimalType && toType instanceof DecimalType toDecimalType) {
+            return Optional.of(createDecimalToDecimalCoercer(fromDecimalType, toDecimalType));
+        }
+        if (fromType instanceof DecimalType fromDecimalType && toType == DOUBLE) {
+            return Optional.of(createDecimalToDoubleCoercer(fromDecimalType));
+        }
+        if (fromType instanceof DecimalType fromDecimalType && toType == REAL) {
+            return Optional.of(createDecimalToRealCoercer(fromDecimalType));
+        }
+        if (fromType instanceof DecimalType fromDecimalType && toType instanceof VarcharType toVarcharType) {
+            return Optional.of(createDecimalToVarcharCoercer(fromDecimalType, toVarcharType));
+        }
+        if (fromType instanceof DecimalType fromDecimalType &&
+                (toType instanceof TinyintType ||
+                        toType instanceof SmallintType ||
+                        toType instanceof IntegerType ||
+                        toType instanceof BigintType)) {
+            return Optional.of(createDecimalToInteger(fromDecimalType, toType));
+        }
+        if (fromType == DOUBLE && toType instanceof DecimalType toDecimalType) {
+            return Optional.of(createDoubleToDecimalCoercer(toDecimalType));
+        }
+        if (fromType == REAL && toType instanceof DecimalType toDecimalType) {
+            return Optional.of(createRealToDecimalCoercer(toDecimalType));
+        }
+        if (fromType instanceof TimestampType && toType instanceof VarcharType varcharType) {
+            return Optional.of(new TimestampCoercer.LongTimestampToVarcharCoercer(TIMESTAMP_NANOS, varcharType));
+        }
+        if (fromType == DOUBLE && toType instanceof VarcharType toVarcharType) {
+            return Optional.of(new DoubleToVarcharCoercer(toVarcharType, coercionContext.treatNaNAsNull()));
+        }
+        if ((fromType instanceof ArrayType) && (toType instanceof ArrayType)) {
+            return createCoercerForList(
+                    typeManager,
+                    (ListTypeInfo) fromHiveType.getTypeInfo(),
+                    (ListTypeInfo) toHiveType.getTypeInfo(),
+                    coercionContext);
+        }
+        if ((fromType instanceof MapType) && (toType instanceof MapType)) {
+            return createCoercerForMap(
+                    typeManager,
+                    (MapTypeInfo) fromHiveType.getTypeInfo(),
+                    (MapTypeInfo) toHiveType.getTypeInfo(),
+                    coercionContext);
+        }
+        if ((fromType instanceof RowType) && (toType instanceof RowType)) {
+            HiveType fromHiveTypeStruct = (fromHiveType.getCategory() == Category.UNION) ? HiveType.toHiveType(fromType) : fromHiveType;
+            HiveType toHiveTypeStruct = (toHiveType.getCategory() == Category.UNION) ? HiveType.toHiveType(toType) : toHiveType;
+
+            return createCoercerForStruct(
+                    typeManager,
+                    (StructTypeInfo) fromHiveTypeStruct.getTypeInfo(),
+                    (StructTypeInfo) toHiveTypeStruct.getTypeInfo(),
+                    coercionContext);
+        }
+
+        throw new TrinoException(NOT_SUPPORTED, format("Unsupported coercion from %s to %s", fromHiveType, toHiveType));
+    }
+
+    public static boolean narrowerThan(VarcharType first, VarcharType second)
+    {
+        requireNonNull(first, "first is null");
+        requireNonNull(second, "second is null");
+        if (first.isUnbounded() || second.isUnbounded()) {
+            return !first.isUnbounded();
+        }
+        return first.getBoundedLength() < second.getBoundedLength();
+    }
+
+    public static boolean narrowerThan(CharType first, CharType second)
+    {
+        requireNonNull(first, "first is null");
+        requireNonNull(second, "second is null");
+        return first.getLength() < second.getLength();
+    }
+
+    private static Optional<TypeCoercer<? extends Type, ? extends Type>> createCoercerForList(
+            TypeManager typeManager,
+            ListTypeInfo fromListTypeInfo,
+            ListTypeInfo toListTypeInfo,
+            CoercionContext coercionContext)
+    {
+        HiveType fromElementHiveType = HiveType.valueOf(fromListTypeInfo.getListElementTypeInfo().getTypeName());
+        HiveType toElementHiveType = HiveType.valueOf(toListTypeInfo.getListElementTypeInfo().getTypeName());
+
+        return createCoercer(typeManager, fromElementHiveType, toElementHiveType, coercionContext)
+                .map(elementCoercer -> new ListCoercer(new ArrayType(elementCoercer.getFromType()), new ArrayType(elementCoercer.getToType()), elementCoercer));
+    }
+
+    private static Optional<TypeCoercer<? extends Type, ? extends Type>> createCoercerForMap(
+            TypeManager typeManager,
+            MapTypeInfo fromMapTypeInfo,
+            MapTypeInfo toMapTypeInfo,
+            CoercionContext coercionContext)
+    {
+        HiveType fromKeyHiveType = HiveType.valueOf(fromMapTypeInfo.getMapKeyTypeInfo().getTypeName());
+        HiveType fromValueHiveType = HiveType.valueOf(fromMapTypeInfo.getMapValueTypeInfo().getTypeName());
+        HiveType toKeyHiveType = HiveType.valueOf(toMapTypeInfo.getMapKeyTypeInfo().getTypeName());
+        HiveType toValueHiveType = HiveType.valueOf(toMapTypeInfo.getMapValueTypeInfo().getTypeName());
+        Optional<TypeCoercer<? extends Type, ? extends Type>> keyCoercer = createCoercer(typeManager, fromKeyHiveType, toKeyHiveType, coercionContext);
+        Optional<TypeCoercer<? extends Type, ? extends Type>> valueCoercer = createCoercer(typeManager, fromValueHiveType, toValueHiveType, coercionContext);
+        MapType fromType = new MapType(
+                keyCoercer.map(TypeCoercer::getFromType).orElseGet(() -> fromKeyHiveType.getType(typeManager, coercionContext.timestampPrecision())),
+                valueCoercer.map(TypeCoercer::getFromType).orElseGet(() -> fromValueHiveType.getType(typeManager, coercionContext.timestampPrecision())),
+                typeManager.getTypeOperators());
+
+        MapType toType = new MapType(
+                keyCoercer.map(TypeCoercer::getToType).orElseGet(() -> toKeyHiveType.getType(typeManager, coercionContext.timestampPrecision())),
+                valueCoercer.map(TypeCoercer::getToType).orElseGet(() -> toValueHiveType.getType(typeManager, coercionContext.timestampPrecision())),
+                typeManager.getTypeOperators());
+
+        return Optional.of(new MapCoercer(fromType, toType, keyCoercer, valueCoercer));
+    }
+
+    private static Optional<TypeCoercer<? extends Type, ? extends Type>> createCoercerForStruct(
+            TypeManager typeManager,
+            StructTypeInfo fromStructTypeInfo,
+            StructTypeInfo toStructTypeInfo,
+            CoercionContext coercionContext)
+    {
+        ImmutableList.Builder<Optional<TypeCoercer<? extends Type, ? extends Type>>> coercers = ImmutableList.builder();
+        ImmutableList.Builder<Field> fromField = ImmutableList.builder();
+        ImmutableList.Builder<Field> toField = ImmutableList.builder();
+
+        List<String> fromStructFieldName = fromStructTypeInfo.getAllStructFieldNames();
+        List<String> toStructFieldNames = toStructTypeInfo.getAllStructFieldNames();
+
+        for (int i = 0; i < toStructFieldNames.size(); i++) {
+            HiveType toStructFieldType = HiveType.valueOf(toStructTypeInfo.getAllStructFieldTypeInfos().get(i).getTypeName());
+            if (i >= fromStructFieldName.size()) {
+                toField.add(new Field(
+                        Optional.of(toStructFieldNames.get(i)),
+                        toStructFieldType.getType(typeManager, coercionContext.timestampPrecision())));
+                coercers.add(Optional.empty());
+            }
+            else {
+                HiveType fromStructFieldType = HiveType.valueOf(fromStructTypeInfo.getAllStructFieldTypeInfos().get(i).getTypeName());
+
+                Optional<TypeCoercer<? extends Type, ? extends Type>> coercer = createCoercer(typeManager, fromStructFieldType, toStructFieldType, coercionContext);
+
+                fromField.add(new Field(
+                        Optional.of(fromStructFieldName.get(i)),
+                        coercer.map(TypeCoercer::getFromType).orElseGet(() -> fromStructFieldType.getType(typeManager, coercionContext.timestampPrecision()))));
+                toField.add(new Field(
+                        Optional.of(toStructFieldNames.get(i)),
+                        coercer.map(TypeCoercer::getToType).orElseGet(() -> toStructFieldType.getType(typeManager, coercionContext.timestampPrecision()))));
+
+                coercers.add(coercer);
+            }
+        }
+
+        return Optional.of(new StructCoercer(RowType.from(fromField.build()), RowType.from(toField.build()), coercers.build()));
+    }
+
+    private static class ListCoercer
+            extends TypeCoercer<ArrayType, ArrayType>
+    {
+        private final TypeCoercer<? extends Type, ? extends Type> elementCoercer;
+
+        public ListCoercer(ArrayType fromType, ArrayType toType, TypeCoercer<? extends Type, ? extends Type> elementCoercer)
+        {
+            super(fromType, toType);
+            this.elementCoercer = requireNonNull(elementCoercer, "elementCoercer is null");
+        }
+
+        @Override
+        public Block apply(Block block)
+        {
+            ColumnarArray arrayBlock = toColumnarArray(block);
+            Block elementsBlock = elementCoercer.apply(arrayBlock.getElementsBlock());
+            boolean[] valueIsNull = new boolean[arrayBlock.getPositionCount()];
+            int[] offsets = new int[arrayBlock.getPositionCount() + 1];
+            for (int i = 0; i < arrayBlock.getPositionCount(); i++) {
+                valueIsNull[i] = arrayBlock.isNull(i);
+                offsets[i + 1] = offsets[i] + arrayBlock.getLength(i);
+            }
+            return ArrayBlock.fromElementBlock(arrayBlock.getPositionCount(), Optional.of(valueIsNull), offsets, elementsBlock);
+        }
+
+        @Override
+        protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
+        {
+            throw new UnsupportedOperationException("Not supported");
+        }
+    }
+
+    private static class MapCoercer
+            extends TypeCoercer<MapType, MapType>
+    {
+        private final Optional<TypeCoercer<? extends Type, ? extends Type>> keyCoercer;
+        private final Optional<TypeCoercer<? extends Type, ? extends Type>> valueCoercer;
+
+        public MapCoercer(
+                MapType fromType,
+                MapType toType,
+                Optional<TypeCoercer<? extends Type, ? extends Type>> keyCoercer,
+                Optional<TypeCoercer<? extends Type, ? extends Type>> valueCoercer)
+        {
+            super(fromType, toType);
+            this.keyCoercer = requireNonNull(keyCoercer, "keyCoercer is null");
+            this.valueCoercer = requireNonNull(valueCoercer, "valueCoercer is null");
+        }
+
+        @Override
+        public Block apply(Block block)
+        {
+            ColumnarMap mapBlock = toColumnarMap(block);
+            Block keysBlock = keyCoercer.isEmpty() ? mapBlock.getKeysBlock() : keyCoercer.get().apply(mapBlock.getKeysBlock());
+            Block valuesBlock = valueCoercer.isEmpty() ? mapBlock.getValuesBlock() : valueCoercer.get().apply(mapBlock.getValuesBlock());
+            boolean[] valueIsNull = new boolean[mapBlock.getPositionCount()];
+            int[] offsets = new int[mapBlock.getPositionCount() + 1];
+            for (int i = 0; i < mapBlock.getPositionCount(); i++) {
+                valueIsNull[i] = mapBlock.isNull(i);
+                offsets[i + 1] = offsets[i] + mapBlock.getEntryCount(i);
+            }
+            return toType.createBlockFromKeyValue(Optional.of(valueIsNull), offsets, keysBlock, valuesBlock);
+        }
+
+        @Override
+        protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
+        {
+            throw new UnsupportedOperationException("Not supported");
+        }
+    }
+
+    private static class StructCoercer
+            extends TypeCoercer<RowType, RowType>
+    {
+        private final List<Optional<TypeCoercer<? extends Type, ? extends Type>>> coercers;
+
+        public StructCoercer(RowType fromType, RowType toType, List<Optional<TypeCoercer<? extends Type, ? extends Type>>> coercers)
+        {
+            super(fromType, toType);
+            checkArgument(toType.getTypeParameters().size() == coercers.size());
+            checkArgument(fromType.getTypeParameters().size() <= coercers.size());
+            this.coercers = ImmutableList.copyOf(requireNonNull(coercers, "coercers is null"));
+        }
+
+        @Override
+        public Block apply(Block block)
+        {
+            if (block instanceof LazyBlock lazyBlock) {
+                // only load the top level block so non-coerced fields are not loaded
+                block = lazyBlock.getBlock();
+            }
+
+            if (block instanceof RunLengthEncodedBlock runLengthEncodedBlock) {
+                RowBlock rowBlock = (RowBlock) runLengthEncodedBlock.getValue();
+                RowBlock newRowBlock = RowBlock.fromNotNullSuppressedFieldBlocks(
+                        1,
+                        rowBlock.isNull(0) ? Optional.of(new boolean[]{true}) : Optional.empty(),
+                        coerceFields(rowBlock.getFieldBlocks()));
+                return RunLengthEncodedBlock.create(newRowBlock, runLengthEncodedBlock.getPositionCount());
+            }
+            if (block instanceof DictionaryBlock dictionaryBlock) {
+                RowBlock rowBlock = (RowBlock) dictionaryBlock.getDictionary();
+                // create a dictionary block for each field, by rewraping the nested fields in a new dictionary
+                List<Block> fieldBlocks = rowBlock.getFieldBlocks().stream()
+                        .map(dictionaryBlock::createProjection)
+                        .toList();
+                // coerce the wrapped fields, so only the used dictionary values are coerced
+                Block[] newFields = coerceFields(fieldBlocks);
+                return RowBlock.fromNotNullSuppressedFieldBlocks(
+                        dictionaryBlock.getPositionCount(),
+                        getNulls(dictionaryBlock),
+                        newFields);
+            }
+            RowBlock rowBlock = (RowBlock) block;
+            return RowBlock.fromNotNullSuppressedFieldBlocks(
+                    rowBlock.getPositionCount(),
+                    getNulls(rowBlock),
+                    coerceFields(rowBlock.getFieldBlocks()));
+        }
+
+        private static Optional<boolean[]> getNulls(Block rowBlock)
+        {
+            if (!rowBlock.mayHaveNull()) {
+                return Optional.empty();
+            }
+
+            boolean[] valueIsNull = new boolean[rowBlock.getPositionCount()];
+            for (int i = 0; i < rowBlock.getPositionCount(); i++) {
+                valueIsNull[i] = rowBlock.isNull(i);
+            }
+            return Optional.of(valueIsNull);
+        }
+
+        private Block[] coerceFields(List<Block> fields)
+        {
+            Block[] newFields = new Block[coercers.size()];
+            for (int i = 0; i < coercers.size(); i++) {
+                Optional<TypeCoercer<? extends Type, ? extends Type>> coercer = coercers.get(i);
+                if (coercer.isPresent()) {
+                    newFields[i] = coercer.get().apply(fields.get(i));
+                }
+                else if (i < fields.size()) {
+                    newFields[i] = fields.get(i);
+                }
+                else {
+                    newFields[i] = RunLengthEncodedBlock.create(toType.getTypeParameters().get(i), null, fields.get(0).getPositionCount());
+                }
+            }
+            return newFields;
+        }
+
+        @Override
+        protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
+        {
+            throw new UnsupportedOperationException("Not supported");
+        }
+    }
+
+    public record CoercionContext(HiveTimestampPrecision timestampPrecision, boolean treatNaNAsNull)
+    {
+        public CoercionContext
+        {
+            requireNonNull(timestampPrecision, "timestampPrecision is null");
+        }
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/DateCoercer.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/DateCoercer.java
new file mode 100644
index 000000000000..3b9398a9e925
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/DateCoercer.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.coercions;
+
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.DateType;
+import io.trino.spi.type.VarcharType;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeParseException;
+
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_TIMESTAMP_COERCION;
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;
+
+public final class DateCoercer
+{
+    private static final long START_OF_MODERN_ERA_DAYS = java.time.LocalDate.of(1900, 1, 1).toEpochDay();
+
+    private DateCoercer() {}
+
+    public static class VarcharToDateCoercer
+            extends TypeCoercer<VarcharType, DateType>
+    {
+        public VarcharToDateCoercer(VarcharType fromType, DateType toType)
+        {
+            super(fromType, toType);
+        }
+
+        @Override
+        protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
+        {
+            String value = fromType.getSlice(block, position).toStringUtf8();
+            try {
+                LocalDate localDate = ISO_LOCAL_DATE.parse(value, LocalDate::from);
+                if (localDate.toEpochDay() < START_OF_MODERN_ERA_DAYS) {
+                    throw new TrinoException(HIVE_INVALID_TIMESTAMP_COERCION, "Coercion on historical dates is not supported");
+                }
+                toType.writeLong(blockBuilder, localDate.toEpochDay());
+            }
+            catch (DateTimeParseException ignored) {
+                throw new IllegalArgumentException("Invalid date value: " + value + " is not a valid date");
+            }
+        }
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/DecimalCoercers.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/DecimalCoercers.java
index 1422489c8188..5dc835cb463b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/DecimalCoercers.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/DecimalCoercers.java
@@ -22,11 +22,12 @@
 import io.trino.spi.type.DoubleType;
 import io.trino.spi.type.Int128;
 import io.trino.spi.type.RealType;
+import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
 
-import java.util.function.Function;
-
 import static io.trino.spi.StandardErrorCode.INVALID_ARGUMENTS;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DecimalConversions.doubleToLongDecimal;
 import static io.trino.spi.type.DecimalConversions.doubleToShortDecimal;
 import static io.trino.spi.type.DecimalConversions.longDecimalToDouble;
@@ -41,7 +42,10 @@
 import static io.trino.spi.type.DecimalConversions.shortToShortCast;
 import static io.trino.spi.type.Decimals.longTenToNth;
 import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TinyintType.TINYINT;
 import static java.lang.Math.min;
 import static java.lang.String.format;
 
@@ -49,7 +53,7 @@ public final class DecimalCoercers
 {
     private DecimalCoercers() {}
 
-    public static Function<Block, Block> createDecimalToDecimalCoercer(DecimalType fromType, DecimalType toType)
+    public static TypeCoercer<DecimalType, DecimalType> createDecimalToDecimalCoercer(DecimalType fromType, DecimalType toType)
     {
         if (fromType.isShort()) {
             if (toType.isShort()) {
@@ -148,7 +152,7 @@ protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int pos
         }
     }
 
-    public static Function<Block, Block> createDecimalToDoubleCoercer(DecimalType fromType)
+    public static TypeCoercer<DecimalType, DoubleType> createDecimalToDoubleCoercer(DecimalType fromType)
     {
         if (fromType.isShort()) {
             return new ShortDecimalToDoubleCoercer(fromType);
@@ -191,7 +195,7 @@ protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int pos
         }
     }
 
-    public static Function<Block, Block> createDecimalToRealCoercer(DecimalType fromType)
+    public static TypeCoercer<DecimalType, RealType> createDecimalToRealCoercer(DecimalType fromType)
     {
         if (fromType.isShort()) {
             return new ShortDecimalToRealCoercer(fromType);
@@ -234,7 +238,7 @@ protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int pos
         }
     }
 
-    public static Function<Block, Block> createDecimalToVarcharCoercer(DecimalType fromType, VarcharType toType)
+    public static TypeCoercer<DecimalType, VarcharType> createDecimalToVarcharCoercer(DecimalType fromType, VarcharType toType)
     {
         if (fromType.isShort()) {
             return new ShortDecimalToVarcharCoercer(fromType, toType);
@@ -288,7 +292,101 @@ protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int pos
         }
     }
 
-    public static Function<Block, Block> createDoubleToDecimalCoercer(DecimalType toType)
+    public static <T extends Type> TypeCoercer<DecimalType, T> createDecimalToInteger(DecimalType fromType, T toType)
+    {
+        if (fromType.isShort()) {
+            return new ShortDecimalToIntegerCoercer<>(fromType, toType);
+        }
+        return new LongDecimalToIntegerCoercer<T>(fromType, toType);
+    }
+
+    private abstract static class AbstractDecimalToIntegerNumberCoercer<T extends Type>
+            extends TypeCoercer<DecimalType, T>
+    {
+        protected final long minValue;
+        protected final long maxValue;
+
+        public AbstractDecimalToIntegerNumberCoercer(DecimalType fromType, T toType)
+        {
+            super(fromType, toType);
+
+            if (toType.equals(TINYINT)) {
+                minValue = Byte.MIN_VALUE;
+                maxValue = Byte.MAX_VALUE;
+            }
+            else if (toType.equals(SMALLINT)) {
+                minValue = Short.MIN_VALUE;
+                maxValue = Short.MAX_VALUE;
+            }
+            else if (toType.equals(INTEGER)) {
+                minValue = Integer.MIN_VALUE;
+                maxValue = Integer.MAX_VALUE;
+            }
+            else if (toType.equals(BIGINT)) {
+                minValue = Long.MIN_VALUE;
+                maxValue = Long.MAX_VALUE;
+            }
+            else {
+                throw new TrinoException(NOT_SUPPORTED, format("Could not create Coercer from Decimal to %s", toType));
+            }
+        }
+
+        @Override
+        protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
+        {
+            String stringValue = getStringValue(block, position);
+            int dotPosition = stringValue.indexOf(".");
+            long longValue;
+            try {
+                longValue = Long.parseLong(stringValue.substring(0, dotPosition > 0 ? dotPosition : stringValue.length()));
+            }
+            catch (NumberFormatException e) {
+                blockBuilder.appendNull();
+                return;
+            }
+            // Hive truncates digits (also before the decimal point), which can be perceived as a bug
+            if (longValue < minValue || longValue > maxValue) {
+                blockBuilder.appendNull();
+            }
+            else {
+                toType.writeLong(blockBuilder, longValue);
+            }
+        }
+
+        protected abstract String getStringValue(Block block, int position);
+    }
+
+    private static class LongDecimalToIntegerCoercer<T extends Type>
+            extends AbstractDecimalToIntegerNumberCoercer<T>
+    {
+        public LongDecimalToIntegerCoercer(DecimalType fromType, T toType)
+        {
+            super(fromType, toType);
+        }
+
+        @Override
+        protected String getStringValue(Block block, int position)
+        {
+            return Decimals.toString((Int128) fromType.getObject(block, position), fromType.getScale());
+        }
+    }
+
+    private static class ShortDecimalToIntegerCoercer<T extends Type>
+            extends AbstractDecimalToIntegerNumberCoercer<T>
+    {
+        public ShortDecimalToIntegerCoercer(DecimalType fromType, T toType)
+        {
+            super(fromType, toType);
+        }
+
+        @Override
+        protected String getStringValue(Block block, int position)
+        {
+            return Decimals.toString(fromType.getLong(block, position), fromType.getScale());
+        }
+    }
+
+    public static TypeCoercer<DoubleType, DecimalType> createDoubleToDecimalCoercer(DecimalType toType)
     {
         if (toType.isShort()) {
             return new DoubleToShortDecimalCoercer(toType);
@@ -328,7 +426,7 @@ protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int pos
         }
     }
 
-    public static Function<Block, Block> createRealToDecimalCoercer(DecimalType toType)
+    public static TypeCoercer<RealType, DecimalType> createRealToDecimalCoercer(DecimalType toType)
     {
         if (toType.isShort()) {
             return new RealToShortDecimalCoercer(toType);
@@ -348,7 +446,7 @@ public RealToShortDecimalCoercer(DecimalType toType)
         protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
         {
             toType.writeLong(blockBuilder,
-                    realToShortDecimal(fromType.getLong(block, position), toType.getPrecision(), toType.getScale()));
+                    realToShortDecimal(fromType.getFloat(block, position), toType.getPrecision(), toType.getScale()));
         }
     }
 
@@ -364,7 +462,7 @@ public RealToLongDecimalCoercer(DecimalType toType)
         protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
         {
             toType.writeObject(blockBuilder,
-                    realToLongDecimal(fromType.getLong(block, position), toType.getPrecision(), toType.getScale()));
+                    realToLongDecimal(fromType.getFloat(block, position), toType.getPrecision(), toType.getScale()));
         }
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/DoubleToVarcharCoercer.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/DoubleToVarcharCoercer.java
new file mode 100644
index 000000000000..2d0e13576eb1
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/DoubleToVarcharCoercer.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.coercions;
+
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.DoubleType;
+import io.trino.spi.type.VarcharType;
+
+import static io.airlift.slice.SliceUtf8.countCodePoints;
+import static io.trino.spi.StandardErrorCode.INVALID_ARGUMENTS;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static java.lang.String.format;
+
+public class DoubleToVarcharCoercer
+        extends TypeCoercer<DoubleType, VarcharType>
+{
+    private final boolean treatNaNAsNull;
+
+    public DoubleToVarcharCoercer(VarcharType toType, boolean treatNaNAsNull)
+    {
+        super(DOUBLE, toType);
+        this.treatNaNAsNull = treatNaNAsNull;
+    }
+
+    @Override
+    protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
+    {
+        double doubleValue = DOUBLE.getDouble(block, position);
+
+        if (Double.isNaN(doubleValue) && treatNaNAsNull) {
+            blockBuilder.appendNull();
+            return;
+        }
+
+        Slice converted = Slices.utf8Slice(Double.toString(doubleValue));
+        if (!toType.isUnbounded() && countCodePoints(converted) > toType.getBoundedLength()) {
+            throw new TrinoException(INVALID_ARGUMENTS, format("Varchar representation of %s exceeds %s bounds", doubleValue, toType));
+        }
+        toType.writeSlice(blockBuilder, converted);
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/FloatToDoubleCoercer.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/FloatToDoubleCoercer.java
index 6920b00d53ad..5a9ce09968e7 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/FloatToDoubleCoercer.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/FloatToDoubleCoercer.java
@@ -16,12 +16,12 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.type.DoubleType;
 import io.trino.spi.type.RealType;
 
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.RealType.REAL;
-import static java.lang.Float.intBitsToFloat;
 
 public class FloatToDoubleCoercer
         extends TypeCoercer<RealType, DoubleType>
@@ -31,9 +31,19 @@ public FloatToDoubleCoercer()
         super(REAL, DOUBLE);
     }
 
+    @Override
+    public Block apply(Block block)
+    {
+        // data may have already been coerced by the Avro reader
+        if (block instanceof LongArrayBlock) {
+            return block;
+        }
+        return super.apply(block);
+    }
+
     @Override
     protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
     {
-        DOUBLE.writeDouble(blockBuilder, intBitsToFloat((int) REAL.getLong(block, position)));
+        DOUBLE.writeDouble(blockBuilder, REAL.getFloat(block, position));
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/IntegerToBigintCoercer.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/IntegerToBigintCoercer.java
new file mode 100644
index 000000000000..3cf4706b1855
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/IntegerToBigintCoercer.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.coercions;
+
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.LongArrayBlock;
+import io.trino.spi.type.BigintType;
+import io.trino.spi.type.IntegerType;
+
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.IntegerType.INTEGER;
+
+public class IntegerToBigintCoercer
+        extends TypeCoercer<IntegerType, BigintType>
+{
+    public IntegerToBigintCoercer()
+    {
+        super(INTEGER, BIGINT);
+    }
+
+    @Override
+    public Block apply(Block block)
+    {
+        // data may have already been coerced by the Avro reader
+        if (block instanceof LongArrayBlock) {
+            return block;
+        }
+        return super.apply(block);
+    }
+
+    @Override
+    protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
+    {
+        BIGINT.writeLong(blockBuilder, INTEGER.getInt(block, position));
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/TimestampCoercer.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/TimestampCoercer.java
new file mode 100644
index 000000000000..0b903a3561b4
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/TimestampCoercer.java
@@ -0,0 +1,158 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.coercions;
+
+import io.airlift.slice.Slice;
+import io.airlift.slice.Slices;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.LongTimestamp;
+import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.VarcharType;
+
+import java.time.LocalDateTime;
+import java.time.chrono.IsoChronology;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.DateTimeParseException;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_TIMESTAMP_COERCION;
+import static io.trino.spi.type.TimestampType.MAX_PRECISION;
+import static io.trino.spi.type.TimestampType.MAX_SHORT_PRECISION;
+import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_SECOND;
+import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MICROSECOND;
+import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_NANOSECOND;
+import static io.trino.spi.type.Timestamps.SECONDS_PER_DAY;
+import static io.trino.spi.type.Timestamps.round;
+import static io.trino.spi.type.Timestamps.roundDiv;
+import static io.trino.spi.type.Varchars.truncateToLength;
+import static java.lang.Math.floorDiv;
+import static java.lang.Math.floorMod;
+import static java.lang.Math.toIntExact;
+import static java.lang.String.format;
+import static java.time.ZoneOffset.UTC;
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME;
+import static java.time.format.ResolverStyle.STRICT;
+
+public final class TimestampCoercer
+{
+    private static final DateTimeFormatter LOCAL_DATE_TIME = new DateTimeFormatterBuilder()
+            .parseCaseInsensitive()
+            .append(ISO_LOCAL_DATE)
+            .appendLiteral(' ')
+            .append(ISO_LOCAL_TIME)
+            .toFormatter()
+            .withResolverStyle(STRICT)
+            .withChronology(IsoChronology.INSTANCE);
+
+    // Before 1900, Java Time and Joda Time are not consistent with java.sql.Date and java.util.Calendar
+    private static final long START_OF_MODERN_ERA_SECONDS = java.time.LocalDate.of(1900, 1, 1).toEpochDay() * SECONDS_PER_DAY;
+
+    private TimestampCoercer() {}
+
+    public static class LongTimestampToVarcharCoercer
+            extends TypeCoercer<TimestampType, VarcharType>
+    {
+        public LongTimestampToVarcharCoercer(TimestampType fromType, VarcharType toType)
+        {
+            super(fromType, toType);
+        }
+
+        @Override
+        protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
+        {
+            LongTimestamp timestamp = (LongTimestamp) fromType.getObject(block, position);
+
+            long epochSecond = floorDiv(timestamp.getEpochMicros(), MICROSECONDS_PER_SECOND);
+            long microsFraction = floorMod(timestamp.getEpochMicros(), MICROSECONDS_PER_SECOND);
+            // Hive timestamp has nanoseconds precision, so no truncation here
+            long nanosFraction = (microsFraction * NANOSECONDS_PER_MICROSECOND) + (timestamp.getPicosOfMicro() / PICOSECONDS_PER_NANOSECOND);
+            if (epochSecond < START_OF_MODERN_ERA_SECONDS) {
+                throw new TrinoException(HIVE_INVALID_TIMESTAMP_COERCION, "Coercion on historical dates is not supported");
+            }
+
+            toType.writeSlice(
+                    blockBuilder,
+                    truncateToLength(
+                            Slices.utf8Slice(
+                                    LOCAL_DATE_TIME.format(LocalDateTime.ofEpochSecond(epochSecond, toIntExact(nanosFraction), UTC))),
+                            toType));
+        }
+    }
+
+    public static class VarcharToShortTimestampCoercer
+            extends TypeCoercer<VarcharType, TimestampType>
+    {
+        public VarcharToShortTimestampCoercer(VarcharType fromType, TimestampType toType)
+        {
+            super(fromType, toType);
+            checkArgument(toType.isShort(), format("TIMESTAMP precision must be in range [0, %s]: %s", MAX_PRECISION, toType.getPrecision()));
+        }
+
+        @Override
+        protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
+        {
+            try {
+                Slice value = fromType.getSlice(block, position);
+                LocalDateTime dateTime = LOCAL_DATE_TIME.parse(value.toStringUtf8(), LocalDateTime::from);
+                long epochSecond = dateTime.toEpochSecond(UTC);
+                if (epochSecond < START_OF_MODERN_ERA_SECONDS) {
+                    throw new TrinoException(HIVE_INVALID_TIMESTAMP_COERCION, "Coercion on historical dates is not supported");
+                }
+                long roundedNanos = round(dateTime.getNano(), 9 - toType.getPrecision());
+                long epochMicros = epochSecond * MICROSECONDS_PER_SECOND + roundDiv(roundedNanos, NANOSECONDS_PER_MICROSECOND);
+                toType.writeLong(blockBuilder, epochMicros);
+            }
+            catch (DateTimeParseException ignored) {
+                // Hive treats invalid String as null instead of propagating exception
+                // In case of bigger tables with all values being invalid, log output will be huge so avoiding log here.
+                blockBuilder.appendNull();
+            }
+        }
+    }
+
+    public static class VarcharToLongTimestampCoercer
+            extends TypeCoercer<VarcharType, TimestampType>
+    {
+        public VarcharToLongTimestampCoercer(VarcharType fromType, TimestampType toType)
+        {
+            super(fromType, toType);
+            checkArgument(!toType.isShort(), format("Precision must be in the range [%s, %s]", MAX_SHORT_PRECISION + 1, MAX_PRECISION));
+        }
+
+        @Override
+        protected void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position)
+        {
+            try {
+                Slice value = fromType.getSlice(block, position);
+                LocalDateTime dateTime = LOCAL_DATE_TIME.parse(value.toStringUtf8(), LocalDateTime::from);
+                long epochSecond = dateTime.toEpochSecond(UTC);
+                if (epochSecond < START_OF_MODERN_ERA_SECONDS) {
+                    throw new TrinoException(HIVE_INVALID_TIMESTAMP_COERCION, "Coercion on historical dates is not supported");
+                }
+                long epochMicros = epochSecond * MICROSECONDS_PER_SECOND + dateTime.getNano() / NANOSECONDS_PER_MICROSECOND;
+                int picosOfMicro = (dateTime.getNano() % NANOSECONDS_PER_MICROSECOND) * PICOSECONDS_PER_NANOSECOND;
+                toType.writeObject(blockBuilder, new LongTimestamp(epochMicros, picosOfMicro));
+            }
+            catch (DateTimeParseException ignored) {
+                // Hive treats invalid String as null instead of propagating exception
+                // In case of bigger tables with all values being invalid, log output will be huge so avoiding log here.
+                blockBuilder.appendNull();
+            }
+        }
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/TypeCoercer.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/TypeCoercer.java
index d46abf730103..528187e6d14b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/TypeCoercer.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/TypeCoercer.java
@@ -49,4 +49,14 @@ public Block apply(Block block)
     }
 
     protected abstract void applyCoercedValue(BlockBuilder blockBuilder, Block block, int position);
+
+    public Type getFromType()
+    {
+        return fromType;
+    }
+
+    public Type getToType()
+    {
+        return toType;
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/VarcharCoercer.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/VarcharCoercer.java
index 9ce92ce7c1fe..c434989c6637 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/VarcharCoercer.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/coercions/VarcharCoercer.java
@@ -19,7 +19,7 @@
 import io.trino.spi.type.VarcharType;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.plugin.hive.HivePageSource.narrowerThan;
+import static io.trino.plugin.hive.coercions.CoercionUtils.narrowerThan;
 import static io.trino.spi.type.Varchars.truncateToLength;
 
 public class VarcharCoercer
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/BlockLocation.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/BlockLocation.java
index 631ec3b4de31..9f95a0af6165 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/BlockLocation.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/BlockLocation.java
@@ -13,58 +13,42 @@
  */
 package io.trino.plugin.hive.fs;
 
-import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Interner;
+import com.google.common.collect.Interners;
 import io.trino.filesystem.FileEntry.Block;
 
-import javax.annotation.Nullable;
-
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static java.util.Objects.requireNonNull;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOfObjectArray;
 
 public class BlockLocation
 {
+    private static final long INSTANCE_SIZE = instanceSize(BlockLocation.class);
+
+    /**
+     * Number of hosts will be low compared to potential number of splits. Host
+     * set will also be limited and slowly changing even in most extreme cases.
+     * Interning host names allows to have significant memory savings on coordinator.
+     */
+    private static final Interner<String> HOST_INTERNER = Interners.newWeakInterner();
+
     private final List<String> hosts;
     private final long offset;
     private final long length;
 
-    public static List<BlockLocation> fromHiveBlockLocations(@Nullable org.apache.hadoop.fs.BlockLocation[] blockLocations)
-    {
-        if (blockLocations == null) {
-            return ImmutableList.of();
-        }
-
-        return Arrays.stream(blockLocations)
-                .map(BlockLocation::new)
-                .collect(toImmutableList());
-    }
-
     public BlockLocation(Block block)
     {
-        this.hosts = ImmutableList.copyOf(block.hosts());
+        this.hosts = block.hosts().stream()
+                .map(HOST_INTERNER::intern)
+                .collect(toImmutableList());
         this.offset = block.offset();
         this.length = block.length();
     }
 
-    public BlockLocation(org.apache.hadoop.fs.BlockLocation blockLocation)
-    {
-        requireNonNull(blockLocation, "blockLocation is null");
-        try {
-            this.hosts = ImmutableList.copyOf(blockLocation.getHosts());
-        }
-        catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-        this.offset = blockLocation.getOffset();
-        this.length = blockLocation.getLength();
-    }
-
     public List<String> getHosts()
     {
         return hosts;
@@ -80,6 +64,12 @@ public long getLength()
         return length;
     }
 
+    public long getRetainedSizeInBytes()
+    {
+        // host names are interned (shared)
+        return INSTANCE_SIZE + sizeOfObjectArray(hosts.size());
+    }
+
     @Override
     public boolean equals(Object o)
     {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/CachingDirectoryLister.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/CachingDirectoryLister.java
index bddd0487fd25..2c212394888b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/CachingDirectoryLister.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/CachingDirectoryLister.java
@@ -17,21 +17,20 @@
 import com.google.common.cache.Cache;
 import com.google.common.cache.Weigher;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
-import io.trino.collect.cache.EvictableCacheBuilder;
+import io.trino.cache.EvictableCacheBuilder;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.metastore.Partition;
 import io.trino.plugin.hive.metastore.Storage;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SchemaTablePrefix;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.RemoteIterator;
 import org.weakref.jmx.Managed;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -40,7 +39,11 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
+import static io.airlift.slice.SizeOf.estimatedSizeOf;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOf;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
 public class CachingDirectoryLister
@@ -48,20 +51,20 @@ public class CachingDirectoryLister
 {
     //TODO use a cache key based on Path & SchemaTableName and iterate over the cache keys
     // to deal more efficiently with cache invalidation scenarios for partitioned tables.
-    private final Cache<DirectoryListingCacheKey, ValueHolder> cache;
+    private final Cache<Location, ValueHolder> cache;
     private final List<SchemaTablePrefix> tablePrefixes;
 
     @Inject
     public CachingDirectoryLister(HiveConfig hiveClientConfig)
     {
-        this(hiveClientConfig.getFileStatusCacheExpireAfterWrite(), hiveClientConfig.getFileStatusCacheMaxSize(), hiveClientConfig.getFileStatusCacheTables());
+        this(hiveClientConfig.getFileStatusCacheExpireAfterWrite(), hiveClientConfig.getFileStatusCacheMaxRetainedSize(), hiveClientConfig.getFileStatusCacheTables());
     }
 
-    public CachingDirectoryLister(Duration expireAfterWrite, long maxSize, List<String> tables)
+    public CachingDirectoryLister(Duration expireAfterWrite, DataSize maxSize, List<String> tables)
     {
         this.cache = EvictableCacheBuilder.newBuilder()
-                .maximumWeight(maxSize)
-                .weigher((Weigher<DirectoryListingCacheKey, ValueHolder>) (key, value) -> value.files.map(List::size).orElse(1))
+                .maximumWeight(maxSize.toBytes())
+                .weigher((Weigher<Location, ValueHolder>) (key, value) -> toIntExact(estimatedSizeOf(key.toString()) + value.getRetainedSizeInBytes()))
                 .expireAfterWrite(expireAfterWrite.toMillis(), TimeUnit.MILLISECONDS)
                 .shareNothingWhenDisabled()
                 .recordStats()
@@ -87,45 +90,31 @@ private static SchemaTablePrefix parseTableName(String tableName)
     }
 
     @Override
-    public RemoteIterator<TrinoFileStatus> list(FileSystem fs, Table table, Path path)
-            throws IOException
-    {
-        if (!isCacheEnabledFor(table.getSchemaTableName())) {
-            return new TrinoFileStatusRemoteIterator(fs.listLocatedStatus(path));
-        }
-
-        return listInternal(fs, new DirectoryListingCacheKey(path, false));
-    }
-
-    @Override
-    public RemoteIterator<TrinoFileStatus> listFilesRecursively(FileSystem fs, Table table, Path path)
+    public RemoteIterator<TrinoFileStatus> listFilesRecursively(TrinoFileSystem fs, Table table, Location location)
             throws IOException
     {
         if (!isCacheEnabledFor(table.getSchemaTableName())) {
-            return new TrinoFileStatusRemoteIterator(fs.listFiles(path, true));
+            return new TrinoFileStatusRemoteIterator(fs.listFiles(location));
         }
 
-        return listInternal(fs, new DirectoryListingCacheKey(path, true));
+        return listInternal(fs, location);
     }
 
-    private RemoteIterator<TrinoFileStatus> listInternal(FileSystem fs, DirectoryListingCacheKey cacheKey)
+    private RemoteIterator<TrinoFileStatus> listInternal(TrinoFileSystem fs, Location location)
             throws IOException
     {
-        ValueHolder cachedValueHolder = uncheckedCacheGet(cache, cacheKey, ValueHolder::new);
+        ValueHolder cachedValueHolder = uncheckedCacheGet(cache, location, ValueHolder::new);
         if (cachedValueHolder.getFiles().isPresent()) {
             return new SimpleRemoteIterator(cachedValueHolder.getFiles().get().iterator());
         }
 
-        return cachingRemoteIterator(cachedValueHolder, createListingRemoteIterator(fs, cacheKey), cacheKey);
+        return cachingRemoteIterator(cachedValueHolder, createListingRemoteIterator(fs, location), location);
     }
 
-    private static RemoteIterator<TrinoFileStatus> createListingRemoteIterator(FileSystem fs, DirectoryListingCacheKey cacheKey)
+    private static RemoteIterator<TrinoFileStatus> createListingRemoteIterator(TrinoFileSystem fs, Location location)
             throws IOException
     {
-        if (cacheKey.isRecursiveFilesOnly()) {
-            return new TrinoFileStatusRemoteIterator(fs.listFiles(cacheKey.getPath(), true));
-        }
-        return new TrinoFileStatusRemoteIterator(fs.listLocatedStatus(cacheKey.getPath()));
+        return new TrinoFileStatusRemoteIterator(fs.listFiles(location));
     }
 
     @Override
@@ -133,7 +122,7 @@ public void invalidate(Table table)
     {
         if (isCacheEnabledFor(table.getSchemaTableName()) && isLocationPresent(table.getStorage())) {
             if (table.getPartitionColumns().isEmpty()) {
-                cache.invalidateAll(DirectoryListingCacheKey.allKeysWithPath(new Path(table.getStorage().getLocation())));
+                cache.invalidate(Location.of(table.getStorage().getLocation()));
             }
             else {
                 // a partitioned table can have multiple paths in cache
@@ -146,11 +135,11 @@ public void invalidate(Table table)
     public void invalidate(Partition partition)
     {
         if (isCacheEnabledFor(partition.getSchemaTableName()) && isLocationPresent(partition.getStorage())) {
-            cache.invalidateAll(DirectoryListingCacheKey.allKeysWithPath(new Path(partition.getStorage().getLocation())));
+            cache.invalidate(Location.of(partition.getStorage().getLocation()));
         }
     }
 
-    private RemoteIterator<TrinoFileStatus> cachingRemoteIterator(ValueHolder cachedValueHolder, RemoteIterator<TrinoFileStatus> iterator, DirectoryListingCacheKey key)
+    private RemoteIterator<TrinoFileStatus> cachingRemoteIterator(ValueHolder cachedValueHolder, RemoteIterator<TrinoFileStatus> iterator, Location location)
     {
         return new RemoteIterator<>()
         {
@@ -164,7 +153,7 @@ public boolean hasNext()
                 if (!hasNext) {
                     // The cachedValueHolder acts as an invalidation guard. If a cache invalidation happens while this iterator goes over
                     // the files from the specified path, the eventually outdated file listing will not be added anymore to the cache.
-                    cache.asMap().replace(key, cachedValueHolder, new ValueHolder(files));
+                    cache.asMap().replace(location, cachedValueHolder, new ValueHolder(files));
                 }
                 return hasNext;
             }
@@ -217,15 +206,9 @@ public long getRequestCount()
     }
 
     @VisibleForTesting
-    boolean isCached(Path path)
-    {
-        return isCached(new DirectoryListingCacheKey(path, false));
-    }
-
-    @VisibleForTesting
-    boolean isCached(DirectoryListingCacheKey cacheKey)
+    boolean isCached(Location location)
     {
-        ValueHolder cached = cache.getIfPresent(cacheKey);
+        ValueHolder cached = cache.getIfPresent(location);
         return cached != null && cached.getFiles().isPresent();
     }
 
@@ -247,6 +230,8 @@ private static boolean isLocationPresent(Storage storage)
      */
     private static class ValueHolder
     {
+        private static final long INSTANCE_SIZE = instanceSize(ValueHolder.class);
+
         private final Optional<List<TrinoFileStatus>> files;
 
         public ValueHolder()
@@ -263,5 +248,10 @@ public Optional<List<TrinoFileStatus>> getFiles()
         {
             return files;
         }
+
+        public long getRetainedSizeInBytes()
+        {
+            return INSTANCE_SIZE + sizeOf(files, value -> estimatedSizeOf(value, TrinoFileStatus::getRetainedSizeInBytes));
+        }
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/DirectoryLister.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/DirectoryLister.java
index 7983cdf1580a..def1b624a39b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/DirectoryLister.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/DirectoryLister.java
@@ -13,20 +13,16 @@
  */
 package io.trino.plugin.hive.fs;
 
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.hive.TableInvalidationCallback;
 import io.trino.plugin.hive.metastore.Table;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.RemoteIterator;
 
 import java.io.IOException;
 
 public interface DirectoryLister
         extends TableInvalidationCallback
 {
-    RemoteIterator<TrinoFileStatus> list(FileSystem fs, Table table, Path path)
-            throws IOException;
-
-    RemoteIterator<TrinoFileStatus> listFilesRecursively(FileSystem fs, Table table, Path path)
+    RemoteIterator<TrinoFileStatus> listFilesRecursively(TrinoFileSystem fs, Table table, Location location)
             throws IOException;
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/DirectoryListingCacheKey.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/DirectoryListingCacheKey.java
deleted file mode 100644
index 260646293d28..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/DirectoryListingCacheKey.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.fs;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.plugin.hive.metastore.Table;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-
-import java.util.List;
-import java.util.Objects;
-
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static java.util.Objects.requireNonNull;
-
-/**
- * A cache key designed for use in {@link CachingDirectoryLister} and {@link TransactionScopeCachingDirectoryLister}
- * that allows distinct cache entries to be created for both recursive, files-only listings and shallow listings
- * (that also might contain directories) at the same {@link Path}, ie: {@link DirectoryLister#list(FileSystem, Table, Path)}
- * and {@link DirectoryLister#listFilesRecursively(FileSystem, Table, Path)} results.
- */
-final class DirectoryListingCacheKey
-{
-    private final Path path;
-    private final int hashCode; // precomputed hashCode
-    private final boolean recursiveFilesOnly;
-
-    public DirectoryListingCacheKey(Path path, boolean recursiveFilesOnly)
-    {
-        this.path = requireNonNull(path, "path is null");
-        this.recursiveFilesOnly = recursiveFilesOnly;
-        this.hashCode = Objects.hash(path, recursiveFilesOnly);
-    }
-
-    public Path getPath()
-    {
-        return path;
-    }
-
-    public boolean isRecursiveFilesOnly()
-    {
-        return recursiveFilesOnly;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return hashCode;
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == null || (o.getClass() != this.getClass())) {
-            return false;
-        }
-        DirectoryListingCacheKey other = (DirectoryListingCacheKey) o;
-        return recursiveFilesOnly == other.recursiveFilesOnly
-                && hashCode == other.hashCode
-                && path.equals(other.path);
-    }
-
-    @Override
-    public String toString()
-    {
-        return toStringHelper(this)
-                .add("path", path)
-                .add("isRecursiveFilesOnly", recursiveFilesOnly)
-                .toString();
-    }
-
-    public static List<DirectoryListingCacheKey> allKeysWithPath(Path path)
-    {
-        return ImmutableList.of(new DirectoryListingCacheKey(path, true), new DirectoryListingCacheKey(path, false));
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/DirectoryListingFilter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/DirectoryListingFilter.java
new file mode 100644
index 000000000000..54dab7d98429
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/DirectoryListingFilter.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.fs;
+
+import io.trino.filesystem.Location;
+import jakarta.annotation.Nullable;
+
+import java.io.IOException;
+import java.util.NoSuchElementException;
+
+import static io.trino.filesystem.Locations.areDirectoryLocationsEquivalent;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Filters down the full listing of a path prefix to just the files directly in a given directory.
+ */
+public class DirectoryListingFilter
+        implements RemoteIterator<TrinoFileStatus>
+{
+    private final Location prefix;
+    private final RemoteIterator<TrinoFileStatus> delegateIterator;
+    private final boolean failOnUnexpectedFiles;
+
+    @Nullable private TrinoFileStatus nextElement;
+
+    public DirectoryListingFilter(Location prefix, RemoteIterator<TrinoFileStatus> delegateIterator, boolean failOnUnexpectedFiles)
+            throws IOException
+    {
+        this.prefix = requireNonNull(prefix, "prefix is null");
+        this.delegateIterator = requireNonNull(delegateIterator, "delegateIterator is null");
+        this.nextElement = findNextElement();
+        this.failOnUnexpectedFiles = failOnUnexpectedFiles;
+    }
+
+    @Override
+    public boolean hasNext()
+            throws IOException
+    {
+        return nextElement != null;
+    }
+
+    @Override
+    public TrinoFileStatus next()
+            throws IOException
+    {
+        if (!hasNext()) {
+            throw new NoSuchElementException();
+        }
+
+        TrinoFileStatus thisElement = nextElement;
+        this.nextElement = findNextElement();
+        return thisElement;
+    }
+
+    private TrinoFileStatus findNextElement()
+            throws IOException
+    {
+        while (delegateIterator.hasNext()) {
+            TrinoFileStatus candidate = delegateIterator.next();
+            Location parent = Location.of(candidate.getPath()).parentDirectory();
+            boolean directChild = areDirectoryLocationsEquivalent(parent, prefix);
+
+            if (!directChild && failOnUnexpectedFiles && !parentIsHidden(parent, prefix)) {
+                throw new HiveFileIterator.NestedDirectoryNotAllowedException(candidate.getPath());
+            }
+
+            if (directChild) {
+                return candidate;
+            }
+        }
+        return null;
+    }
+
+    private static boolean parentIsHidden(Location location, Location prefix)
+    {
+        if (location.equals(prefix)) {
+            return false;
+        }
+
+        if (location.fileName().startsWith(".") || location.fileName().startsWith("_")) {
+            return true;
+        }
+
+        return parentIsHidden(location.parentDirectory(), prefix);
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/HiveFileIterator.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/HiveFileIterator.java
index 19772aff5749..098b75183086 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/HiveFileIterator.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/HiveFileIterator.java
@@ -16,12 +16,11 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.AbstractIterator;
 import io.airlift.stats.TimeStat;
-import io.trino.plugin.hive.NamenodeStats;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.hdfs.HdfsNamenodeStats;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.spi.TrinoException;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.RemoteIterator;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -30,10 +29,9 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_FILE_NOT_FOUND;
+import static io.trino.plugin.hive.fs.HiveFileIterator.NestedDirectoryPolicy.FAIL;
 import static io.trino.plugin.hive.fs.HiveFileIterator.NestedDirectoryPolicy.RECURSE;
-import static java.util.Collections.emptyIterator;
 import static java.util.Objects.requireNonNull;
-import static org.apache.hadoop.fs.Path.SEPARATOR_CHAR;
 
 public class HiveFileIterator
         extends AbstractIterator<TrinoFileStatus>
@@ -45,32 +43,29 @@ public enum NestedDirectoryPolicy
         FAIL
     }
 
-    private final String pathPrefix;
     private final Table table;
-    private final FileSystem fileSystem;
+    private final Location location;
+    private final TrinoFileSystem fileSystem;
     private final DirectoryLister directoryLister;
-    private final NamenodeStats namenodeStats;
+    private final HdfsNamenodeStats namenodeStats;
     private final NestedDirectoryPolicy nestedDirectoryPolicy;
-    private final boolean ignoreAbsentPartitions;
     private final Iterator<TrinoFileStatus> remoteIterator;
 
     public HiveFileIterator(
             Table table,
-            Path path,
-            FileSystem fileSystem,
+            Location location,
+            TrinoFileSystem fileSystem,
             DirectoryLister directoryLister,
-            NamenodeStats namenodeStats,
-            NestedDirectoryPolicy nestedDirectoryPolicy,
-            boolean ignoreAbsentPartitions)
+            HdfsNamenodeStats namenodeStats,
+            NestedDirectoryPolicy nestedDirectoryPolicy)
     {
-        this.pathPrefix = path.toUri().getPath();
         this.table = requireNonNull(table, "table is null");
+        this.location = requireNonNull(location, "location is null");
         this.fileSystem = requireNonNull(fileSystem, "fileSystem is null");
         this.directoryLister = requireNonNull(directoryLister, "directoryLister is null");
         this.namenodeStats = requireNonNull(namenodeStats, "namenodeStats is null");
         this.nestedDirectoryPolicy = requireNonNull(nestedDirectoryPolicy, "nestedDirectoryPolicy is null");
-        this.ignoreAbsentPartitions = ignoreAbsentPartitions;
-        this.remoteIterator = getLocatedFileStatusRemoteIterator(path);
+        this.remoteIterator = getLocatedFileStatusRemoteIterator(location);
     }
 
     @Override
@@ -82,50 +77,27 @@ protected TrinoFileStatus computeNext()
             // Ignore hidden files and directories
             if (nestedDirectoryPolicy == RECURSE) {
                 // Search the full sub-path under the listed prefix for hidden directories
-                if (isHiddenOrWithinHiddenParentDirectory(status.getPath(), pathPrefix)) {
+                if (isHiddenOrWithinHiddenParentDirectory(Location.of(status.getPath()), location)) {
                     continue;
                 }
             }
-            else if (isHiddenFileOrDirectory(status.getPath())) {
+            else if (isHiddenFileOrDirectory(Location.of(status.getPath()))) {
                 continue;
             }
 
-            if (status.isDirectory()) {
-                switch (nestedDirectoryPolicy) {
-                    case IGNORED:
-                        continue;
-                    case RECURSE:
-                        // Recursive listings call listFiles which should not return directories, this is a contract violation
-                        // and can be handled the same way as the FAIL case
-                    case FAIL:
-                        throw new NestedDirectoryNotAllowedException(status.getPath());
-                }
-            }
             return status;
         }
 
         return endOfData();
     }
 
-    private Iterator<TrinoFileStatus> getLocatedFileStatusRemoteIterator(Path path)
+    private Iterator<TrinoFileStatus> getLocatedFileStatusRemoteIterator(Location location)
     {
         try (TimeStat.BlockTimer ignored = namenodeStats.getListLocatedStatus().time()) {
-            return new FileStatusIterator(table, path, fileSystem, directoryLister, namenodeStats, nestedDirectoryPolicy == RECURSE);
+            return new FileStatusIterator(table, location, fileSystem, directoryLister, namenodeStats, nestedDirectoryPolicy);
         }
-        catch (TrinoException e) {
-            if (ignoreAbsentPartitions) {
-                try {
-                    if (!fileSystem.exists(path)) {
-                        return emptyIterator();
-                    }
-                }
-                catch (Exception ee) {
-                    TrinoException trinoException = new TrinoException(HIVE_FILESYSTEM_ERROR, "Failed to check if path exists: " + path, ee);
-                    trinoException.addSuppressed(e);
-                    throw trinoException;
-                }
-            }
-            throw e;
+        catch (IOException e) {
+            throw new TrinoException(HIVE_FILESYSTEM_ERROR, "Failed to list files for location: " + location, e);
         }
     }
 
@@ -137,20 +109,21 @@ private TrinoFileStatus getLocatedFileStatus(Iterator<TrinoFileStatus> iterator)
     }
 
     @VisibleForTesting
-    static boolean isHiddenFileOrDirectory(Path path)
+    static boolean isHiddenFileOrDirectory(Location location)
     {
         // Only looks for the last part of the path
-        String pathString = path.toUri().getPath();
-        int lastSeparator = pathString.lastIndexOf(SEPARATOR_CHAR);
-        return containsHiddenPathPartAfterIndex(pathString, lastSeparator + 1);
+        String path = location.path();
+        int lastSeparator = path.lastIndexOf('/');
+        return containsHiddenPathPartAfterIndex(path, lastSeparator + 1);
     }
 
     @VisibleForTesting
-    static boolean isHiddenOrWithinHiddenParentDirectory(Path path, String prefix)
+    static boolean isHiddenOrWithinHiddenParentDirectory(Location path, Location rootLocation)
     {
-        String pathString = path.toUri().getPath();
+        String pathString = path.toString();
+        String prefix = rootLocation.toString();
         checkArgument(pathString.startsWith(prefix), "path %s does not start with prefix %s", pathString, prefix);
-        return containsHiddenPathPartAfterIndex(pathString, prefix.length() + 1);
+        return containsHiddenPathPartAfterIndex(pathString, prefix.endsWith("/") ? prefix.length() : prefix.length() + 1);
     }
 
     @VisibleForTesting
@@ -162,7 +135,7 @@ static boolean containsHiddenPathPartAfterIndex(String pathString, int startFrom
             if (firstNameChar == '.' || firstNameChar == '_') {
                 return true;
             }
-            int nextSeparator = pathString.indexOf(SEPARATOR_CHAR, startFromIndex);
+            int nextSeparator = pathString.indexOf('/', startFromIndex);
             if (nextSeparator < 0) {
                 break;
             }
@@ -174,20 +147,30 @@ static boolean containsHiddenPathPartAfterIndex(String pathString, int startFrom
     private static class FileStatusIterator
             implements Iterator<TrinoFileStatus>
     {
-        private final Path path;
-        private final NamenodeStats namenodeStats;
+        private final Location location;
+        private final HdfsNamenodeStats namenodeStats;
         private final RemoteIterator<TrinoFileStatus> fileStatusIterator;
 
-        private FileStatusIterator(Table table, Path path, FileSystem fileSystem, DirectoryLister directoryLister, NamenodeStats namenodeStats, boolean recursive)
+        private FileStatusIterator(
+                Table table,
+                Location location,
+                TrinoFileSystem fileSystem,
+                DirectoryLister directoryLister,
+                HdfsNamenodeStats namenodeStats,
+                NestedDirectoryPolicy nestedDirectoryPolicy)
+                throws IOException
         {
-            this.path = path;
+            this.location = location;
             this.namenodeStats = namenodeStats;
             try {
-                if (recursive) {
-                    this.fileStatusIterator = directoryLister.listFilesRecursively(fileSystem, table, path);
+                if (nestedDirectoryPolicy == RECURSE) {
+                    this.fileStatusIterator = directoryLister.listFilesRecursively(fileSystem, table, location);
                 }
                 else {
-                    this.fileStatusIterator = directoryLister.list(fileSystem, table, path);
+                    this.fileStatusIterator = new DirectoryListingFilter(
+                            location,
+                            directoryLister.listFilesRecursively(fileSystem, table, location),
+                            nestedDirectoryPolicy == FAIL);
                 }
             }
             catch (IOException e) {
@@ -221,24 +204,24 @@ private TrinoException processException(IOException exception)
         {
             namenodeStats.getRemoteIteratorNext().recordException(exception);
             if (exception instanceof FileNotFoundException) {
-                return new TrinoException(HIVE_FILE_NOT_FOUND, "Partition location does not exist: " + path);
+                return new TrinoException(HIVE_FILE_NOT_FOUND, "Partition location does not exist: " + location);
             }
-            return new TrinoException(HIVE_FILESYSTEM_ERROR, "Failed to list directory: " + path, exception);
+            return new TrinoException(HIVE_FILESYSTEM_ERROR, "Failed to list directory: " + location, exception);
         }
     }
 
     public static class NestedDirectoryNotAllowedException
             extends RuntimeException
     {
-        private final Path nestedDirectoryPath;
+        private final String nestedDirectoryPath;
 
-        public NestedDirectoryNotAllowedException(Path nestedDirectoryPath)
+        public NestedDirectoryNotAllowedException(String nestedDirectoryPath)
         {
             super("Nested sub-directories are not allowed: " + nestedDirectoryPath);
             this.nestedDirectoryPath = requireNonNull(nestedDirectoryPath, "nestedDirectoryPath is null");
         }
 
-        public Path getNestedDirectoryPath()
+        public String getNestedDirectoryPath()
         {
             return nestedDirectoryPath;
         }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/RemoteIterator.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/RemoteIterator.java
new file mode 100644
index 000000000000..dcbc296f6046
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/RemoteIterator.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.fs;
+
+import java.io.IOException;
+
+public interface RemoteIterator<T>
+{
+    boolean hasNext()
+            throws IOException;
+
+    T next()
+            throws IOException;
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/SimpleRemoteIterator.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/SimpleRemoteIterator.java
index 6277d5b98ad0..6c181f38432e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/SimpleRemoteIterator.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/SimpleRemoteIterator.java
@@ -13,8 +13,6 @@
  */
 package io.trino.plugin.hive.fs;
 
-import org.apache.hadoop.fs.RemoteIterator;
-
 import java.io.IOException;
 import java.util.Iterator;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TransactionDirectoryListingCacheKey.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TransactionDirectoryListingCacheKey.java
new file mode 100644
index 000000000000..d18c6fcf50f0
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TransactionDirectoryListingCacheKey.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.fs;
+
+import io.trino.filesystem.Location;
+
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static io.airlift.slice.SizeOf.estimatedSizeOf;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static java.util.Objects.requireNonNull;
+
+public class TransactionDirectoryListingCacheKey
+{
+    private static final long INSTANCE_SIZE = instanceSize(TransactionDirectoryListingCacheKey.class);
+
+    private final long transactionId;
+    private final Location path;
+
+    public TransactionDirectoryListingCacheKey(long transactionId, Location path)
+    {
+        this.transactionId = transactionId;
+        this.path = requireNonNull(path, "path is null");
+    }
+
+    public Location getPath()
+    {
+        return path;
+    }
+
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE + estimatedSizeOf(path.toString());
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TransactionDirectoryListingCacheKey that = (TransactionDirectoryListingCacheKey) o;
+        return transactionId == that.transactionId && path.equals(that.path);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(transactionId, path);
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("transactionId", transactionId)
+                .add("path", path)
+                .toString();
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TransactionScopeCachingDirectoryLister.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TransactionScopeCachingDirectoryLister.java
index e22f29823951..1f83b0ada254 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TransactionScopeCachingDirectoryLister.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TransactionScopeCachingDirectoryLister.java
@@ -16,16 +16,13 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.cache.Cache;
 import com.google.common.util.concurrent.UncheckedExecutionException;
-import io.trino.collect.cache.EvictableCacheBuilder;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.hive.metastore.Partition;
 import io.trino.plugin.hive.metastore.Storage;
 import io.trino.plugin.hive.metastore.Table;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.RemoteIterator;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -33,11 +30,14 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicLong;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static com.google.common.base.Throwables.throwIfUnchecked;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static io.airlift.slice.SizeOf.sizeOfObjectArray;
 import static java.util.Collections.synchronizedList;
 import static java.util.Objects.requireNonNull;
 
@@ -50,35 +50,27 @@
 public class TransactionScopeCachingDirectoryLister
         implements DirectoryLister
 {
+    private final long transactionId;
     //TODO use a cache key based on Path & SchemaTableName and iterate over the cache keys
     // to deal more efficiently with cache invalidation scenarios for partitioned tables.
-    private final Cache<DirectoryListingCacheKey, FetchingValueHolder> cache;
+    private final Cache<TransactionDirectoryListingCacheKey, FetchingValueHolder> cache;
     private final DirectoryLister delegate;
 
-    public TransactionScopeCachingDirectoryLister(DirectoryLister delegate, long maxFileStatuses)
+    public TransactionScopeCachingDirectoryLister(DirectoryLister delegate, long transactionId, Cache<TransactionDirectoryListingCacheKey, FetchingValueHolder> cache)
     {
-        EvictableCacheBuilder<DirectoryListingCacheKey, FetchingValueHolder> cacheBuilder = EvictableCacheBuilder.newBuilder()
-                .maximumWeight(maxFileStatuses)
-                .weigher((key, value) -> value.getCachedFilesSize());
-        this.cache = cacheBuilder.build();
         this.delegate = requireNonNull(delegate, "delegate is null");
+        this.transactionId = transactionId;
+        this.cache = requireNonNull(cache, "cache is null");
     }
 
     @Override
-    public RemoteIterator<TrinoFileStatus> list(FileSystem fs, Table table, Path path)
-            throws IOException
-    {
-        return listInternal(fs, table, new DirectoryListingCacheKey(path, false));
-    }
-
-    @Override
-    public RemoteIterator<TrinoFileStatus> listFilesRecursively(FileSystem fs, Table table, Path path)
+    public RemoteIterator<TrinoFileStatus> listFilesRecursively(TrinoFileSystem fs, Table table, Location location)
             throws IOException
     {
-        return listInternal(fs, table, new DirectoryListingCacheKey(path, true));
+        return listInternal(fs, table, new TransactionDirectoryListingCacheKey(transactionId, location));
     }
 
-    private RemoteIterator<TrinoFileStatus> listInternal(FileSystem fs, Table table, DirectoryListingCacheKey cacheKey)
+    private RemoteIterator<TrinoFileStatus> listInternal(TrinoFileSystem fs, Table table, TransactionDirectoryListingCacheKey cacheKey)
             throws IOException
     {
         FetchingValueHolder cachedValueHolder;
@@ -99,13 +91,10 @@ private RemoteIterator<TrinoFileStatus> listInternal(FileSystem fs, Table table,
         return cachingRemoteIterator(cachedValueHolder, cacheKey);
     }
 
-    private RemoteIterator<TrinoFileStatus> createListingRemoteIterator(FileSystem fs, Table table, DirectoryListingCacheKey cacheKey)
+    private RemoteIterator<TrinoFileStatus> createListingRemoteIterator(TrinoFileSystem fs, Table table, TransactionDirectoryListingCacheKey cacheKey)
             throws IOException
     {
-        if (cacheKey.isRecursiveFilesOnly()) {
-            return delegate.listFilesRecursively(fs, table, cacheKey.getPath());
-        }
-        return delegate.list(fs, table, cacheKey.getPath());
+        return delegate.listFilesRecursively(fs, table, cacheKey.getPath());
     }
 
     @Override
@@ -113,7 +102,7 @@ public void invalidate(Table table)
     {
         if (isLocationPresent(table.getStorage())) {
             if (table.getPartitionColumns().isEmpty()) {
-                cache.invalidateAll(DirectoryListingCacheKey.allKeysWithPath(new Path(table.getStorage().getLocation())));
+                cache.invalidate(new TransactionDirectoryListingCacheKey(transactionId, Location.of(table.getStorage().getLocation())));
             }
             else {
                 // a partitioned table can have multiple paths in cache
@@ -127,12 +116,12 @@ public void invalidate(Table table)
     public void invalidate(Partition partition)
     {
         if (isLocationPresent(partition.getStorage())) {
-            cache.invalidateAll(DirectoryListingCacheKey.allKeysWithPath(new Path(partition.getStorage().getLocation())));
+            cache.invalidate(new TransactionDirectoryListingCacheKey(transactionId, Location.of(partition.getStorage().getLocation())));
         }
         delegate.invalidate(partition);
     }
 
-    private RemoteIterator<TrinoFileStatus> cachingRemoteIterator(FetchingValueHolder cachedValueHolder, DirectoryListingCacheKey cacheKey)
+    private RemoteIterator<TrinoFileStatus> cachingRemoteIterator(FetchingValueHolder cachedValueHolder, TransactionDirectoryListingCacheKey cacheKey)
     {
         return new RemoteIterator<>()
         {
@@ -169,13 +158,13 @@ public TrinoFileStatus next()
     }
 
     @VisibleForTesting
-    boolean isCached(Path path)
+    boolean isCached(Location location)
     {
-        return isCached(new DirectoryListingCacheKey(path, false));
+        return isCached(new TransactionDirectoryListingCacheKey(transactionId, location));
     }
 
     @VisibleForTesting
-    boolean isCached(DirectoryListingCacheKey cacheKey)
+    boolean isCached(TransactionDirectoryListingCacheKey cacheKey)
     {
         FetchingValueHolder cached = cache.getIfPresent(cacheKey);
         return cached != null && cached.isFullyCached();
@@ -187,9 +176,13 @@ private static boolean isLocationPresent(Storage storage)
         return storage.getOptionalLocation().isPresent() && !storage.getLocation().isEmpty();
     }
 
-    private static class FetchingValueHolder
+    static class FetchingValueHolder
     {
+        private static final long ATOMIC_LONG_SIZE = instanceSize(AtomicLong.class);
+        private static final long INSTANCE_SIZE = instanceSize(FetchingValueHolder.class);
+
         private final List<TrinoFileStatus> cachedFiles = synchronizedList(new ArrayList<>());
+        private final AtomicLong cachedFilesSize = new AtomicLong();
         @GuardedBy("this")
         @Nullable
         private RemoteIterator<TrinoFileStatus> fileIterator;
@@ -207,9 +200,10 @@ public synchronized boolean isFullyCached()
             return fileIterator == null && exception == null;
         }
 
-        public int getCachedFilesSize()
+        public long getRetainedSizeInBytes()
         {
-            return cachedFiles.size();
+            // ignore fileIterator and exception as they are ephemeral
+            return INSTANCE_SIZE + ATOMIC_LONG_SIZE + sizeOfObjectArray(cachedFiles.size()) + cachedFilesSize.get();
         }
 
         public Iterator<TrinoFileStatus> getCachedFiles()
@@ -253,6 +247,7 @@ private synchronized Optional<TrinoFileStatus> fetchNextCachedFile(int index)
 
                 TrinoFileStatus fileStatus = fileIterator.next();
                 cachedFiles.add(fileStatus);
+                cachedFilesSize.addAndGet(fileStatus.getRetainedSizeInBytes());
                 return Optional.of(fileStatus);
             }
             catch (Exception exception) {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TransactionScopeCachingDirectoryListerFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TransactionScopeCachingDirectoryListerFactory.java
new file mode 100644
index 000000000000..68a08266b01a
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TransactionScopeCachingDirectoryListerFactory.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.fs;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.cache.Cache;
+import com.google.inject.Inject;
+import io.airlift.units.DataSize;
+import io.trino.cache.EvictableCacheBuilder;
+import io.trino.plugin.hive.HiveConfig;
+import io.trino.plugin.hive.fs.TransactionScopeCachingDirectoryLister.FetchingValueHolder;
+
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static java.lang.Math.toIntExact;
+import static java.util.Objects.requireNonNull;
+
+public class TransactionScopeCachingDirectoryListerFactory
+{
+    //TODO use a cache key based on Path & SchemaTableName and iterate over the cache keys
+    // to deal more efficiently with cache invalidation scenarios for partitioned tables.
+    private final Optional<Cache<TransactionDirectoryListingCacheKey, FetchingValueHolder>> cache;
+    private final AtomicLong nextTransactionId = new AtomicLong();
+
+    @Inject
+    public TransactionScopeCachingDirectoryListerFactory(HiveConfig hiveConfig)
+    {
+        this(requireNonNull(hiveConfig, "hiveConfig is null").getPerTransactionFileStatusCacheMaxRetainedSize(), Optional.empty());
+    }
+
+    @VisibleForTesting
+    TransactionScopeCachingDirectoryListerFactory(DataSize maxSize, Optional<Integer> concurrencyLevel)
+    {
+        if (maxSize.toBytes() > 0) {
+            EvictableCacheBuilder<TransactionDirectoryListingCacheKey, FetchingValueHolder> cacheBuilder = EvictableCacheBuilder.newBuilder()
+                    .maximumWeight(maxSize.toBytes())
+                    .weigher((key, value) -> toIntExact(key.getRetainedSizeInBytes() + value.getRetainedSizeInBytes()));
+            concurrencyLevel.ifPresent(cacheBuilder::concurrencyLevel);
+            this.cache = Optional.of(cacheBuilder.build());
+        }
+        else {
+            cache = Optional.empty();
+        }
+    }
+
+    public DirectoryLister get(DirectoryLister delegate)
+    {
+        return cache
+                .map(cache -> (DirectoryLister) new TransactionScopeCachingDirectoryLister(delegate, nextTransactionId.getAndIncrement(), cache))
+                .orElse(delegate);
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TrinoFileStatus.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TrinoFileStatus.java
index 98f57e3ff707..6a5cc7e17861 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TrinoFileStatus.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TrinoFileStatus.java
@@ -16,21 +16,23 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.filesystem.FileEntry;
 import io.trino.filesystem.FileEntry.Block;
-import org.apache.hadoop.fs.LocatedFileStatus;
-import org.apache.hadoop.fs.Path;
 
 import java.util.List;
 import java.util.Objects;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.airlift.slice.SizeOf.estimatedSizeOf;
+import static io.airlift.slice.SizeOf.instanceSize;
 import static java.util.Objects.requireNonNull;
 
 public class TrinoFileStatus
         implements Comparable<TrinoFileStatus>
 {
+    private static final long INSTANCE_SIZE = instanceSize(TrinoFileStatus.class);
+
     private final List<BlockLocation> blockLocations;
-    private final Path path;
+    private final String path;
     private final boolean isDirectory;
     private final long length;
     private final long modificationTime;
@@ -42,22 +44,13 @@ public TrinoFileStatus(FileEntry entry)
                         .stream()
                         .map(BlockLocation::new)
                         .collect(toImmutableList()),
-                new Path(entry.location()),
+                entry.location().toString(),
                 false,
                 entry.length(),
                 entry.lastModified().toEpochMilli());
     }
 
-    public TrinoFileStatus(LocatedFileStatus fileStatus)
-    {
-        this(BlockLocation.fromHiveBlockLocations(fileStatus.getBlockLocations()),
-                fileStatus.getPath(),
-                fileStatus.isDirectory(),
-                fileStatus.getLen(),
-                fileStatus.getModificationTime());
-    }
-
-    public TrinoFileStatus(List<BlockLocation> blockLocations, Path path, boolean isDirectory, long length, long modificationTime)
+    public TrinoFileStatus(List<BlockLocation> blockLocations, String path, boolean isDirectory, long length, long modificationTime)
     {
         this.blockLocations = ImmutableList.copyOf(requireNonNull(blockLocations, "blockLocations is null"));
         this.path = requireNonNull(path, "path is null");
@@ -71,16 +64,11 @@ public List<BlockLocation> getBlockLocations()
         return blockLocations;
     }
 
-    public Path getPath()
+    public String getPath()
     {
         return path;
     }
 
-    public boolean isDirectory()
-    {
-        return isDirectory;
-    }
-
     public long getLength()
     {
         return length;
@@ -91,6 +79,13 @@ public long getModificationTime()
         return modificationTime;
     }
 
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE
+                + estimatedSizeOf(blockLocations, BlockLocation::getRetainedSizeInBytes)
+                + estimatedSizeOf(path);
+    }
+
     @Override
     public int compareTo(TrinoFileStatus other)
     {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TrinoFileStatusRemoteIterator.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TrinoFileStatusRemoteIterator.java
index e6793698740a..730895748d7d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TrinoFileStatusRemoteIterator.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/fs/TrinoFileStatusRemoteIterator.java
@@ -13,8 +13,7 @@
  */
 package io.trino.plugin.hive.fs;
 
-import org.apache.hadoop.fs.LocatedFileStatus;
-import org.apache.hadoop.fs.RemoteIterator;
+import io.trino.filesystem.FileIterator;
 
 import java.io.IOException;
 
@@ -23,9 +22,9 @@
 public class TrinoFileStatusRemoteIterator
         implements RemoteIterator<TrinoFileStatus>
 {
-    private final RemoteIterator<LocatedFileStatus> iterator;
+    private final FileIterator iterator;
 
-    public TrinoFileStatusRemoteIterator(RemoteIterator<LocatedFileStatus> iterator)
+    public TrinoFileStatusRemoteIterator(FileIterator iterator)
     {
         this.iterator = requireNonNull(iterator, "iterator is null");
     }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/GoogleGcsConfigurationInitializer.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/GoogleGcsConfigurationInitializer.java
deleted file mode 100644
index 723f14edbed1..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/GoogleGcsConfigurationInitializer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.gcs;
-
-import com.google.cloud.hadoop.fs.gcs.GoogleHadoopFileSystem;
-import com.google.cloud.hadoop.util.AccessTokenProvider;
-import io.trino.hdfs.ConfigurationInitializer;
-import org.apache.hadoop.conf.Configuration;
-
-import javax.inject.Inject;
-
-import static com.google.cloud.hadoop.fs.gcs.GoogleHadoopFileSystemConfiguration.GCS_CONFIG_PREFIX;
-import static com.google.cloud.hadoop.fs.gcs.HadoopCredentialConfiguration.ACCESS_TOKEN_PROVIDER_IMPL_SUFFIX;
-import static com.google.cloud.hadoop.fs.gcs.HadoopCredentialConfiguration.ENABLE_SERVICE_ACCOUNTS_SUFFIX;
-import static com.google.cloud.hadoop.fs.gcs.HadoopCredentialConfiguration.SERVICE_ACCOUNT_JSON_KEYFILE_SUFFIX;
-
-public class GoogleGcsConfigurationInitializer
-        implements ConfigurationInitializer
-{
-    private final boolean useGcsAccessToken;
-    private final String jsonKeyFilePath;
-
-    @Inject
-    public GoogleGcsConfigurationInitializer(HiveGcsConfig config)
-    {
-        this.useGcsAccessToken = config.isUseGcsAccessToken();
-        this.jsonKeyFilePath = config.getJsonKeyFilePath();
-    }
-
-    @Override
-    public void initializeConfiguration(Configuration config)
-    {
-        config.set("fs.gs.impl", GoogleHadoopFileSystem.class.getName());
-
-        if (useGcsAccessToken) {
-            // use oauth token to authenticate with Google Cloud Storage
-            config.setBoolean(GCS_CONFIG_PREFIX + ENABLE_SERVICE_ACCOUNTS_SUFFIX.getKey(), false);
-            config.setClass(GCS_CONFIG_PREFIX + ACCESS_TOKEN_PROVIDER_IMPL_SUFFIX.getKey(), GcsAccessTokenProvider.class, AccessTokenProvider.class);
-        }
-        else if (jsonKeyFilePath != null) {
-            // use service account key file
-            config.setBoolean(GCS_CONFIG_PREFIX + ENABLE_SERVICE_ACCOUNTS_SUFFIX.getKey(), true);
-            config.set(GCS_CONFIG_PREFIX + SERVICE_ACCOUNT_JSON_KEYFILE_SUFFIX.getKey(), jsonKeyFilePath);
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/HiveGcsConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/HiveGcsConfig.java
deleted file mode 100644
index 17f38b16685c..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/gcs/HiveGcsConfig.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.gcs;
-
-import io.airlift.configuration.Config;
-import io.airlift.configuration.ConfigDescription;
-import io.airlift.configuration.validation.FileExists;
-
-public class HiveGcsConfig
-{
-    private boolean useGcsAccessToken;
-    private String jsonKeyFilePath;
-
-    @FileExists
-    public String getJsonKeyFilePath()
-    {
-        return jsonKeyFilePath;
-    }
-
-    @Config("hive.gcs.json-key-file-path")
-    @ConfigDescription("JSON key file used to access Google Cloud Storage")
-    public HiveGcsConfig setJsonKeyFilePath(String jsonKeyFilePath)
-    {
-        this.jsonKeyFilePath = jsonKeyFilePath;
-        return this;
-    }
-
-    public boolean isUseGcsAccessToken()
-    {
-        return useGcsAccessToken;
-    }
-
-    @Config("hive.gcs.use-access-token")
-    @ConfigDescription("Use client-provided OAuth token to access Google Cloud Storage")
-    public HiveGcsConfig setUseGcsAccessToken(boolean useGcsAccessToken)
-    {
-        this.useGcsAccessToken = useGcsAccessToken;
-        return this;
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/CsvFileWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/CsvFileWriterFactory.java
index 312fa9fa3142..3453ec78827a 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/CsvFileWriterFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/CsvFileWriterFactory.java
@@ -13,14 +13,12 @@
  */
 package io.trino.plugin.hive.line;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.formats.line.csv.CsvSerializerFactory;
 import io.trino.hive.formats.line.text.TextLineWriterFactory;
-import io.trino.plugin.hive.HiveSessionProperties;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 public class CsvFileWriterFactory
         extends LineFileWriterFactory
 {
@@ -31,7 +29,6 @@ public CsvFileWriterFactory(TrinoFileSystemFactory trinoFileSystemFactory, TypeM
                 typeManager,
                 new CsvSerializerFactory(),
                 new TextLineWriterFactory(),
-                HiveSessionProperties::isCsvNativeWriterEnabled,
                 true);
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/CsvPageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/CsvPageSourceFactory.java
index 99df5a062f34..1990dc670c47 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/CsvPageSourceFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/CsvPageSourceFactory.java
@@ -13,14 +13,11 @@
  */
 package io.trino.plugin.hive.line;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.formats.line.csv.CsvDeserializerFactory;
 import io.trino.hive.formats.line.text.TextLineReaderFactory;
-import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.HiveSessionProperties;
-
-import javax.inject.Inject;
 
 import static java.lang.Math.toIntExact;
 
@@ -28,12 +25,10 @@ public class CsvPageSourceFactory
         extends LinePageSourceFactory
 {
     @Inject
-    public CsvPageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, FileFormatDataSourceStats stats, HiveConfig config)
+    public CsvPageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, HiveConfig config)
     {
         super(trinoFileSystemFactory,
-                stats,
                 new CsvDeserializerFactory(),
-                new TextLineReaderFactory(1024, 1024, toIntExact(config.getTextMaxLineLength().toBytes())),
-                HiveSessionProperties::isCsvNativeReaderEnabled);
+                new TextLineReaderFactory(1024, 1024, toIntExact(config.getTextMaxLineLength().toBytes())));
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/JsonFileWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/JsonFileWriterFactory.java
index 8dc661dac53d..c5bfdb309afd 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/JsonFileWriterFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/JsonFileWriterFactory.java
@@ -13,14 +13,12 @@
  */
 package io.trino.plugin.hive.line;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.formats.line.json.JsonSerializerFactory;
 import io.trino.hive.formats.line.text.TextLineWriterFactory;
-import io.trino.plugin.hive.HiveSessionProperties;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 public class JsonFileWriterFactory
         extends LineFileWriterFactory
 {
@@ -31,7 +29,6 @@ public JsonFileWriterFactory(TrinoFileSystemFactory trinoFileSystemFactory, Type
                 typeManager,
                 new JsonSerializerFactory(),
                 new TextLineWriterFactory(),
-                HiveSessionProperties::isJsonNativeWriterEnabled,
                 false);
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/JsonPageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/JsonPageSourceFactory.java
index e0babc29ddd4..7f9e794ab1ab 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/JsonPageSourceFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/JsonPageSourceFactory.java
@@ -13,14 +13,11 @@
  */
 package io.trino.plugin.hive.line;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.formats.line.json.JsonDeserializerFactory;
 import io.trino.hive.formats.line.text.TextLineReaderFactory;
-import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.HiveSessionProperties;
-
-import javax.inject.Inject;
 
 import static java.lang.Math.toIntExact;
 
@@ -28,12 +25,10 @@ public class JsonPageSourceFactory
         extends LinePageSourceFactory
 {
     @Inject
-    public JsonPageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, FileFormatDataSourceStats stats, HiveConfig config)
+    public JsonPageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, HiveConfig config)
     {
         super(trinoFileSystemFactory,
-                stats,
                 new JsonDeserializerFactory(),
-                new TextLineReaderFactory(1024, 1024, toIntExact(config.getTextMaxLineLength().toBytes())),
-                HiveSessionProperties::isJsonNativeReaderEnabled);
+                new TextLineReaderFactory(1024, 1024, toIntExact(config.getTextMaxLineLength().toBytes())));
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/LineFileWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/LineFileWriterFactory.java
index 0ca22cf1ae30..6015b6dbc5cb 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/LineFileWriterFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/LineFileWriterFactory.java
@@ -16,9 +16,9 @@
 import io.airlift.slice.DynamicSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.hive.formats.compression.CompressionKind;
 import io.trino.hive.formats.line.Column;
 import io.trino.hive.formats.line.LineSerializer;
 import io.trino.hive.formats.line.LineSerializerFactory;
@@ -26,6 +26,7 @@
 import io.trino.hive.formats.line.LineWriterFactory;
 import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.plugin.hive.FileWriter;
+import io.trino.plugin.hive.HiveCompressionCodec;
 import io.trino.plugin.hive.HiveFileWriterFactory;
 import io.trino.plugin.hive.WriterKind;
 import io.trino.plugin.hive.acid.AcidTransaction;
@@ -36,9 +37,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -46,7 +44,6 @@
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Properties;
-import java.util.function.Predicate;
 import java.util.stream.IntStream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -66,7 +63,6 @@ public abstract class LineFileWriterFactory
 {
     private final TrinoFileSystemFactory fileSystemFactory;
     private final TypeManager typeManager;
-    private final Predicate<ConnectorSession> activation;
     private final LineSerializerFactory lineSerializerFactory;
     private final LineWriterFactory lineWriterFactory;
     private final boolean headerSupported;
@@ -76,12 +72,10 @@ protected LineFileWriterFactory(
             TypeManager typeManager,
             LineSerializerFactory lineSerializerFactory,
             LineWriterFactory lineWriterFactory,
-            Predicate<ConnectorSession> activation,
             boolean headerSupported)
     {
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
-        this.activation = requireNonNull(activation, "activation is null");
         this.lineSerializerFactory = requireNonNull(lineSerializerFactory, "lineSerializerFactory is null");
         this.lineWriterFactory = requireNonNull(lineWriterFactory, "lineWriterFactory is null");
         this.headerSupported = headerSupported;
@@ -89,11 +83,11 @@ protected LineFileWriterFactory(
 
     @Override
     public Optional<FileWriter> createFileWriter(
-            Path path,
+            Location location,
             List<String> inputColumnNames,
             StorageFormat storageFormat,
+            HiveCompressionCodec compressionCodec,
             Properties schema,
-            JobConf configuration,
             ConnectorSession session,
             OptionalInt bucketNumber,
             AcidTransaction transaction,
@@ -101,14 +95,10 @@ public Optional<FileWriter> createFileWriter(
             WriterKind writerKind)
     {
         if (!lineWriterFactory.getHiveOutputFormatClassName().equals(storageFormat.getOutputFormat()) ||
-                !lineSerializerFactory.getHiveSerDeClassNames().contains(storageFormat.getSerde()) ||
-                !activation.test(session)) {
+                !lineSerializerFactory.getHiveSerDeClassNames().contains(storageFormat.getSerde())) {
             return Optional.empty();
         }
 
-        Optional<CompressionKind> compressionKind = Optional.ofNullable(configuration.get(FileOutputFormat.COMPRESS_CODEC))
-                .map(CompressionKind::fromHadoopClassName);
-
         // existing tables and partitions may have columns in a different order than the writer is providing, so build
         // an index to rearrange columns in the proper order
         List<String> fileColumnNames = getColumnNames(schema);
@@ -129,9 +119,9 @@ public Optional<FileWriter> createFileWriter(
         try {
             TrinoFileSystem fileSystem = fileSystemFactory.create(session.getIdentity());
             AggregatedMemoryContext outputStreamMemoryContext = newSimpleAggregatedMemoryContext();
-            OutputStream outputStream = fileSystem.newOutputFile(path.toString()).create(outputStreamMemoryContext);
+            OutputStream outputStream = fileSystem.newOutputFile(location).create(outputStreamMemoryContext);
 
-            LineWriter lineWriter = lineWriterFactory.createLineWriter(session, outputStream, compressionKind);
+            LineWriter lineWriter = lineWriterFactory.createLineWriter(session, outputStream, compressionCodec.getHiveCompressionKind());
 
             Optional<Slice> header = getFileHeader(schema, columns);
             if (header.isPresent()) {
@@ -140,7 +130,7 @@ public Optional<FileWriter> createFileWriter(
             return Optional.of(new LineFileWriter(
                     lineWriter,
                     lineSerializer,
-                    () -> fileSystem.deleteFile(path.toString()),
+                    () -> fileSystem.deleteFile(location),
                     fileInputColumnIndexes));
         }
         catch (TrinoException e) {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/LinePageSource.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/LinePageSource.java
index f4afff0b37a1..5b3eb79d5f55 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/LinePageSource.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/LinePageSource.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.hive.line;
 
+import io.trino.filesystem.Location;
 import io.trino.hive.formats.line.LineBuffer;
 import io.trino.hive.formats.line.LineDeserializer;
 import io.trino.hive.formats.line.LineReader;
@@ -38,12 +39,12 @@ public class LinePageSource
     private final LineReader lineReader;
     private final LineDeserializer deserializer;
     private final LineBuffer lineBuffer;
-    private final String filePath;
+    private final Location filePath;
 
     private PageBuilder pageBuilder;
     private long completedPositions;
 
-    public LinePageSource(LineReader lineReader, LineDeserializer deserializer, LineBuffer lineBuffer, String filePath)
+    public LinePageSource(LineReader lineReader, LineDeserializer deserializer, LineBuffer lineBuffer, Location filePath)
     {
         this.lineReader = requireNonNull(lineReader, "lineReader is null");
         this.deserializer = requireNonNull(deserializer, "deserializer is null");
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/LinePageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/LinePageSourceFactory.java
index 42b8232ae150..54e802a0f557 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/LinePageSourceFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/LinePageSourceFactory.java
@@ -17,6 +17,7 @@
 import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
 import io.airlift.units.DataSize.Unit;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
@@ -27,10 +28,8 @@
 import io.trino.hive.formats.line.LineReader;
 import io.trino.hive.formats.line.LineReaderFactory;
 import io.trino.plugin.hive.AcidInfo;
-import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.HivePageSourceFactory;
-import io.trino.plugin.hive.MonitoredTrinoInputFile;
 import io.trino.plugin.hive.ReaderColumns;
 import io.trino.plugin.hive.ReaderPageSource;
 import io.trino.plugin.hive.acid.AcidTransaction;
@@ -38,15 +37,12 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.EmptyPageSource;
 import io.trino.spi.predicate.TupleDomain;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
 
 import java.io.InputStream;
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Properties;
-import java.util.function.Predicate;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -58,8 +54,7 @@
 import static io.trino.plugin.hive.util.HiveUtil.getDeserializerClassName;
 import static io.trino.plugin.hive.util.HiveUtil.getFooterCount;
 import static io.trino.plugin.hive.util.HiveUtil.getHeaderCount;
-import static java.lang.Math.min;
-import static java.lang.String.format;
+import static io.trino.plugin.hive.util.HiveUtil.splitError;
 import static java.util.Objects.requireNonNull;
 
 public abstract class LinePageSourceFactory
@@ -68,30 +63,23 @@ public abstract class LinePageSourceFactory
     private static final DataSize SMALL_FILE_SIZE = DataSize.of(8, Unit.MEGABYTE);
 
     private final TrinoFileSystemFactory fileSystemFactory;
-    private final FileFormatDataSourceStats stats;
     private final LineDeserializerFactory lineDeserializerFactory;
     private final LineReaderFactory lineReaderFactory;
-    private final Predicate<ConnectorSession> activation;
 
     protected LinePageSourceFactory(
             TrinoFileSystemFactory fileSystemFactory,
-            FileFormatDataSourceStats stats,
             LineDeserializerFactory lineDeserializerFactory,
-            LineReaderFactory lineReaderFactory,
-            Predicate<ConnectorSession> activation)
+            LineReaderFactory lineReaderFactory)
     {
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
-        this.stats = requireNonNull(stats, "stats is null");
         this.lineDeserializerFactory = requireNonNull(lineDeserializerFactory, "lineDeserializerFactory is null");
-        this.activation = requireNonNull(activation, "activation is null");
         this.lineReaderFactory = requireNonNull(lineReaderFactory, "lineReaderFactory is null");
     }
 
     @Override
     public Optional<ReaderPageSource> createPageSource(
-            Configuration configuration,
             ConnectorSession session,
-            Path path,
+            Location path,
             long start,
             long length,
             long estimatedFileSize,
@@ -104,8 +92,7 @@ public Optional<ReaderPageSource> createPageSource(
             AcidTransaction transaction)
     {
         if (!lineReaderFactory.getHiveOutputFormatClassName().equals(schema.getProperty(FILE_INPUT_FORMAT)) ||
-                !lineDeserializerFactory.getHiveSerDeClassNames().contains(getDeserializerClassName(schema)) ||
-                !activation.test(session)) {
+                !lineDeserializerFactory.getHiveSerDeClassNames().contains(getDeserializerClassName(schema))) {
             return Optional.empty();
         }
 
@@ -140,36 +127,27 @@ public Optional<ReaderPageSource> createPageSource(
                     Maps.fromProperties(schema));
         }
 
-        // buffer file if small
+        // Skip empty inputs
+        if (length == 0) {
+            return Optional.of(noProjectionAdaptation(new EmptyPageSource()));
+        }
+
         TrinoFileSystem trinoFileSystem = fileSystemFactory.create(session.getIdentity());
-        TrinoInputFile inputFile = new MonitoredTrinoInputFile(stats, trinoFileSystem.newInputFile(path.toString()));
+        TrinoInputFile inputFile = trinoFileSystem.newInputFile(path);
         try {
-            length = min(inputFile.length() - start, length);
-            if (!inputFile.exists()) {
-                throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, "File does not exist");
-            }
+            // buffer file if small
             if (estimatedFileSize < SMALL_FILE_SIZE.toBytes()) {
                 try (InputStream inputStream = inputFile.newStream()) {
                     byte[] data = inputStream.readAllBytes();
-                    inputFile = new MemoryInputFile(path.toString(), Slices.wrappedBuffer(data));
+                    inputFile = new MemoryInputFile(path, Slices.wrappedBuffer(data));
                 }
             }
-        }
-        catch (TrinoException e) {
-            throw e;
-        }
-        catch (Exception e) {
-            throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, splitError(e, path, start, length), e);
-        }
-
-        // Split may be empty now that the correct file size is known
-        if (length <= 0) {
-            return Optional.of(noProjectionAdaptation(new EmptyPageSource()));
-        }
-
-        try {
             LineReader lineReader = lineReaderFactory.createLineReader(inputFile, start, length, headerCount, footerCount);
-            LinePageSource pageSource = new LinePageSource(lineReader, lineDeserializer, lineReaderFactory.createLineBuffer(), path.toString());
+            // Split may be empty after discovering the real file size and skipping headers
+            if (lineReader.isClosed()) {
+                return Optional.of(noProjectionAdaptation(new EmptyPageSource()));
+            }
+            LinePageSource pageSource = new LinePageSource(lineReader, lineDeserializer, lineReaderFactory.createLineBuffer(), path);
             return Optional.of(new ReaderPageSource(pageSource, readerProjections));
         }
         catch (TrinoException e) {
@@ -179,9 +157,4 @@ public Optional<ReaderPageSource> createPageSource(
             throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, splitError(e, path, start, length), e);
         }
     }
-
-    private static String splitError(Throwable t, Path path, long start, long length)
-    {
-        return format("Error opening Hive split %s (offset=%s, length=%s): %s", path, start, length, t.getMessage());
-    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/OpenXJsonFileWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/OpenXJsonFileWriterFactory.java
index 4b77e34a57bd..e4097455d475 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/OpenXJsonFileWriterFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/OpenXJsonFileWriterFactory.java
@@ -13,14 +13,12 @@
  */
 package io.trino.plugin.hive.line;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.formats.line.openxjson.OpenXJsonSerializerFactory;
 import io.trino.hive.formats.line.text.TextLineWriterFactory;
-import io.trino.plugin.hive.HiveSessionProperties;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 public class OpenXJsonFileWriterFactory
         extends LineFileWriterFactory
 {
@@ -31,7 +29,6 @@ public OpenXJsonFileWriterFactory(TrinoFileSystemFactory trinoFileSystemFactory,
                 typeManager,
                 new OpenXJsonSerializerFactory(),
                 new TextLineWriterFactory(),
-                HiveSessionProperties::isOpenXJsonNativeWriterEnabled,
                 true);
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/OpenXJsonPageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/OpenXJsonPageSourceFactory.java
index 0426bee32361..1598ef6f0942 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/OpenXJsonPageSourceFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/OpenXJsonPageSourceFactory.java
@@ -13,14 +13,11 @@
  */
 package io.trino.plugin.hive.line;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.formats.line.openxjson.OpenXJsonDeserializerFactory;
 import io.trino.hive.formats.line.text.TextLineReaderFactory;
-import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.HiveSessionProperties;
-
-import javax.inject.Inject;
 
 import static java.lang.Math.toIntExact;
 
@@ -28,12 +25,10 @@ public class OpenXJsonPageSourceFactory
         extends LinePageSourceFactory
 {
     @Inject
-    public OpenXJsonPageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, FileFormatDataSourceStats stats, HiveConfig config)
+    public OpenXJsonPageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, HiveConfig config)
     {
         super(trinoFileSystemFactory,
-                stats,
                 new OpenXJsonDeserializerFactory(),
-                new TextLineReaderFactory(1024, 1024, toIntExact(config.getTextMaxLineLength().toBytes())),
-                HiveSessionProperties::isOpenXJsonNativeReaderEnabled);
+                new TextLineReaderFactory(1024, 1024, toIntExact(config.getTextMaxLineLength().toBytes())));
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/RegexFileWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/RegexFileWriterFactory.java
index 2eaeda18c5ae..ae3bc7d2a984 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/RegexFileWriterFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/RegexFileWriterFactory.java
@@ -13,15 +13,15 @@
  */
 package io.trino.plugin.hive.line;
 
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.FileWriter;
+import io.trino.plugin.hive.HiveCompressionCodec;
 import io.trino.plugin.hive.HiveFileWriterFactory;
 import io.trino.plugin.hive.WriterKind;
 import io.trino.plugin.hive.acid.AcidTransaction;
 import io.trino.plugin.hive.metastore.StorageFormat;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobConf;
 
 import java.util.List;
 import java.util.Optional;
@@ -29,25 +29,25 @@
 import java.util.Properties;
 
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_OPEN_ERROR;
-import static io.trino.plugin.hive.util.HiveClassNames.REGEX_HIVE_SERDE_CLASS;
+import static io.trino.plugin.hive.util.HiveClassNames.REGEX_SERDE_CLASS;
 
 public class RegexFileWriterFactory
         implements HiveFileWriterFactory
 {
     @Override
     public Optional<FileWriter> createFileWriter(
-            Path path,
+            Location location,
             List<String> inputColumnNames,
             StorageFormat storageFormat,
+            HiveCompressionCodec compressionCodec,
             Properties schema,
-            JobConf configuration,
             ConnectorSession session,
             OptionalInt bucketNumber,
             AcidTransaction transaction,
             boolean useAcidSchema,
             WriterKind writerKind)
     {
-        if (REGEX_HIVE_SERDE_CLASS.equals(storageFormat.getSerde())) {
+        if (REGEX_SERDE_CLASS.equals(storageFormat.getSerde())) {
             throw new TrinoException(HIVE_WRITER_OPEN_ERROR, "REGEX format is read-only");
         }
         return Optional.empty();
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/RegexPageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/RegexPageSourceFactory.java
index 138680a645ab..5af670e37210 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/RegexPageSourceFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/RegexPageSourceFactory.java
@@ -13,14 +13,11 @@
  */
 package io.trino.plugin.hive.line;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.formats.line.regex.RegexDeserializerFactory;
 import io.trino.hive.formats.line.text.TextLineReaderFactory;
-import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.HiveSessionProperties;
-
-import javax.inject.Inject;
 
 import static java.lang.Math.toIntExact;
 
@@ -28,12 +25,10 @@ public class RegexPageSourceFactory
         extends LinePageSourceFactory
 {
     @Inject
-    public RegexPageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, FileFormatDataSourceStats stats, HiveConfig config)
+    public RegexPageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, HiveConfig config)
     {
         super(trinoFileSystemFactory,
-                stats,
                 new RegexDeserializerFactory(),
-                new TextLineReaderFactory(1024, 1024, toIntExact(config.getTextMaxLineLength().toBytes())),
-                HiveSessionProperties::isRegexNativeReaderEnabled);
+                new TextLineReaderFactory(1024, 1024, toIntExact(config.getTextMaxLineLength().toBytes())));
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleSequenceFilePageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleSequenceFilePageSourceFactory.java
index d7f3e8735e48..f77a91b408b8 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleSequenceFilePageSourceFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleSequenceFilePageSourceFactory.java
@@ -13,14 +13,11 @@
  */
 package io.trino.plugin.hive.line;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.formats.line.sequence.SequenceFileReaderFactory;
 import io.trino.hive.formats.line.simple.SimpleDeserializerFactory;
-import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.HiveSessionProperties;
-
-import javax.inject.Inject;
 
 import static java.lang.Math.toIntExact;
 
@@ -28,12 +25,10 @@ public class SimpleSequenceFilePageSourceFactory
         extends LinePageSourceFactory
 {
     @Inject
-    public SimpleSequenceFilePageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, FileFormatDataSourceStats stats, HiveConfig config)
+    public SimpleSequenceFilePageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, HiveConfig config)
     {
         super(trinoFileSystemFactory,
-                stats,
                 new SimpleDeserializerFactory(),
-                new SequenceFileReaderFactory(1024, toIntExact(config.getTextMaxLineLength().toBytes())),
-                HiveSessionProperties::isSequenceFileNativeReaderEnabled);
+                new SequenceFileReaderFactory(1024, toIntExact(config.getTextMaxLineLength().toBytes())));
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleSequenceFileWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleSequenceFileWriterFactory.java
index 953453c389df..291a3c4c0edf 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleSequenceFileWriterFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleSequenceFileWriterFactory.java
@@ -13,15 +13,13 @@
  */
 package io.trino.plugin.hive.line;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.formats.line.sequence.SequenceFileWriterFactory;
 import io.trino.hive.formats.line.simple.SimpleSerializerFactory;
-import io.trino.plugin.hive.HiveSessionProperties;
 import io.trino.plugin.hive.NodeVersion;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 public class SimpleSequenceFileWriterFactory
         extends LineFileWriterFactory
 {
@@ -32,7 +30,6 @@ public SimpleSequenceFileWriterFactory(TrinoFileSystemFactory trinoFileSystemFac
                 typeManager,
                 new SimpleSerializerFactory(),
                 new SequenceFileWriterFactory(nodeVersion.toString()),
-                HiveSessionProperties::isSequenceFileNativeWriterEnabled,
                 false);
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleTextFilePageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleTextFilePageSourceFactory.java
index d18863fc2682..e283b9668c8d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleTextFilePageSourceFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleTextFilePageSourceFactory.java
@@ -13,14 +13,11 @@
  */
 package io.trino.plugin.hive.line;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.formats.line.simple.SimpleDeserializerFactory;
 import io.trino.hive.formats.line.text.TextLineReaderFactory;
-import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.HiveSessionProperties;
-
-import javax.inject.Inject;
 
 import static java.lang.Math.toIntExact;
 
@@ -28,12 +25,10 @@ public class SimpleTextFilePageSourceFactory
         extends LinePageSourceFactory
 {
     @Inject
-    public SimpleTextFilePageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, FileFormatDataSourceStats stats, HiveConfig config)
+    public SimpleTextFilePageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, HiveConfig config)
     {
         super(trinoFileSystemFactory,
-                stats,
                 new SimpleDeserializerFactory(),
-                new TextLineReaderFactory(1024, 1024, toIntExact(config.getTextMaxLineLength().toBytes())),
-                HiveSessionProperties::isTextFileNativeReaderEnabled);
+                new TextLineReaderFactory(1024, 1024, toIntExact(config.getTextMaxLineLength().toBytes())));
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleTextFileWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleTextFileWriterFactory.java
index 4d8b2f48bc8a..523eb8a35246 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleTextFileWriterFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/line/SimpleTextFileWriterFactory.java
@@ -13,14 +13,12 @@
  */
 package io.trino.plugin.hive.line;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.formats.line.simple.SimpleSerializerFactory;
 import io.trino.hive.formats.line.text.TextLineWriterFactory;
-import io.trino.plugin.hive.HiveSessionProperties;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 public class SimpleTextFileWriterFactory
         extends LineFileWriterFactory
 {
@@ -31,7 +29,6 @@ public SimpleTextFileWriterFactory(TrinoFileSystemFactory trinoFileSystemFactory
                 typeManager,
                 new SimpleSerializerFactory(),
                 new TextLineWriterFactory(),
-                HiveSessionProperties::isTextFileNativeWriterEnabled,
                 false);
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/BooleanStatistics.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/BooleanStatistics.java
index 89fbe9e72dea..c82544b21d7e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/BooleanStatistics.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/BooleanStatistics.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 import java.util.OptionalLong;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Column.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Column.java
index 6ada463d6c57..af1440c121c5 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Column.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Column.java
@@ -15,10 +15,11 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.plugin.hive.HiveType;
 
-import javax.annotation.concurrent.Immutable;
-
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -31,16 +32,28 @@ public class Column
     private final String name;
     private final HiveType type;
     private final Optional<String> comment;
+    private final Map<String, String> properties;
+
+    @Deprecated
+    public Column(
+            String name,
+            HiveType type,
+            Optional<String> comment)
+    {
+        this(name, type, comment, ImmutableMap.of());
+    }
 
     @JsonCreator
     public Column(
             @JsonProperty("name") String name,
             @JsonProperty("type") HiveType type,
-            @JsonProperty("comment") Optional<String> comment)
+            @JsonProperty("comment") Optional<String> comment,
+            @JsonProperty("properties") Map<String, String> properties)
     {
         this.name = requireNonNull(name, "name is null");
         this.type = requireNonNull(type, "type is null");
         this.comment = requireNonNull(comment, "comment is null");
+        this.properties = ImmutableMap.copyOf(requireNonNull(properties, "properties is null"));
     }
 
     @JsonProperty
@@ -61,6 +74,12 @@ public Optional<String> getComment()
         return comment;
     }
 
+    @JsonProperty
+    public Map<String, String> getProperties()
+    {
+        return properties;
+    }
+
     @Override
     public String toString()
     {
@@ -83,12 +102,13 @@ public boolean equals(Object o)
         Column column = (Column) o;
         return Objects.equals(name, column.name) &&
                 Objects.equals(type, column.type) &&
-                Objects.equals(comment, column.comment);
+                Objects.equals(comment, column.comment) &&
+                Objects.equals(properties, column.properties);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(name, type, comment);
+        return Objects.hash(name, type, comment, properties);
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/CoralSemiTransactionalHiveMSCAdapter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/CoralSemiTransactionalHiveMSCAdapter.java
index 1a676436978e..c432e3663f56 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/CoralSemiTransactionalHiveMSCAdapter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/CoralSemiTransactionalHiveMSCAdapter.java
@@ -57,7 +57,7 @@ public List<String> getAllDatabases()
 
     // returning null for missing entry is as per Coral's requirements
     @Override
-    public org.apache.hadoop.hive.metastore.api.Database getDatabase(String dbName)
+    public com.linkedin.coral.hive.metastore.api.Database getDatabase(String dbName)
     {
         return delegate.getDatabase(dbName)
                 .map(database -> toHiveDatabase(toMetastoreApiDatabase(database)))
@@ -71,7 +71,7 @@ public List<String> getAllTables(String dbName)
     }
 
     @Override
-    public org.apache.hadoop.hive.metastore.api.Table getTable(String dbName, String tableName)
+    public com.linkedin.coral.hive.metastore.api.Table getTable(String dbName, String tableName)
     {
         if (!dbName.isEmpty() && !tableName.isEmpty()) {
             Optional<Table> redirected = tableRedirection.redirect(new SchemaTableName(dbName, tableName));
@@ -85,9 +85,9 @@ public org.apache.hadoop.hive.metastore.api.Table getTable(String dbName, String
                 .orElse(null);
     }
 
-    private static org.apache.hadoop.hive.metastore.api.Database toHiveDatabase(Database database)
+    private static com.linkedin.coral.hive.metastore.api.Database toHiveDatabase(Database database)
     {
-        var result = new org.apache.hadoop.hive.metastore.api.Database();
+        var result = new com.linkedin.coral.hive.metastore.api.Database();
         result.setName(database.getName());
         result.setDescription(database.getDescription());
         result.setLocationUri(database.getLocationUri());
@@ -95,9 +95,9 @@ private static org.apache.hadoop.hive.metastore.api.Database toHiveDatabase(Data
         return result;
     }
 
-    private static org.apache.hadoop.hive.metastore.api.Table toHiveTable(Table table)
+    private static com.linkedin.coral.hive.metastore.api.Table toHiveTable(Table table)
     {
-        var result = new org.apache.hadoop.hive.metastore.api.Table();
+        var result = new com.linkedin.coral.hive.metastore.api.Table();
         result.setDbName(table.getDbName());
         result.setTableName(table.getTableName());
         result.setTableType(table.getTableType());
@@ -111,9 +111,9 @@ private static org.apache.hadoop.hive.metastore.api.Table toHiveTable(Table tabl
         return result;
     }
 
-    private static org.apache.hadoop.hive.metastore.api.StorageDescriptor toHiveStorageDescriptor(StorageDescriptor storage)
+    private static com.linkedin.coral.hive.metastore.api.StorageDescriptor toHiveStorageDescriptor(StorageDescriptor storage)
     {
-        var result = new org.apache.hadoop.hive.metastore.api.StorageDescriptor();
+        var result = new com.linkedin.coral.hive.metastore.api.StorageDescriptor();
         result.setCols(storage.getCols().stream()
                 .map(CoralSemiTransactionalHiveMSCAdapter::toHiveFieldSchema)
                 .toList());
@@ -127,9 +127,9 @@ private static org.apache.hadoop.hive.metastore.api.StorageDescriptor toHiveStor
         return result;
     }
 
-    private static org.apache.hadoop.hive.metastore.api.SerDeInfo toHiveSerdeInfo(SerDeInfo info)
+    private static com.linkedin.coral.hive.metastore.api.SerDeInfo toHiveSerdeInfo(SerDeInfo info)
     {
-        var result = new org.apache.hadoop.hive.metastore.api.SerDeInfo();
+        var result = new com.linkedin.coral.hive.metastore.api.SerDeInfo();
         result.setName(info.getName());
         result.setDescription(info.getDescription());
         result.setSerializationLib(info.getSerializationLib());
@@ -139,9 +139,9 @@ private static org.apache.hadoop.hive.metastore.api.SerDeInfo toHiveSerdeInfo(Se
         return result;
     }
 
-    private static org.apache.hadoop.hive.metastore.api.FieldSchema toHiveFieldSchema(FieldSchema field)
+    private static com.linkedin.coral.hive.metastore.api.FieldSchema toHiveFieldSchema(FieldSchema field)
     {
-        var result = new org.apache.hadoop.hive.metastore.api.FieldSchema();
+        var result = new com.linkedin.coral.hive.metastore.api.FieldSchema();
         result.setName(field.getName());
         result.setType(field.getType());
         result.setComment(field.getComment());
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Database.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Database.java
index e959d5bf1f49..00c1a657a28e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Database.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Database.java
@@ -16,10 +16,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.security.PrincipalType;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DatabaseFunctionKey.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DatabaseFunctionKey.java
new file mode 100644
index 000000000000..1237525abb70
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DatabaseFunctionKey.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.metastore;
+
+import static java.util.Objects.requireNonNull;
+
+public record DatabaseFunctionKey(String databaseName, String functionName)
+{
+    public DatabaseFunctionKey
+    {
+        requireNonNull(databaseName, "databaseName is null");
+        requireNonNull(functionName, "functionName is null");
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DatabaseFunctionSignatureKey.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DatabaseFunctionSignatureKey.java
new file mode 100644
index 000000000000..905d23fcdd50
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DatabaseFunctionSignatureKey.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.metastore;
+
+import static java.util.Objects.requireNonNull;
+
+public record DatabaseFunctionSignatureKey(
+        String databaseName,
+        String functionName,
+        String signatureToken)
+{
+    public DatabaseFunctionSignatureKey
+    {
+        requireNonNull(databaseName, "databaseName is null");
+        requireNonNull(functionName, "functionName is null");
+        requireNonNull(signatureToken, "signatureToken is null");
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DateStatistics.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DateStatistics.java
index af9bdb6d482c..995fab93470c 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DateStatistics.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DateStatistics.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.time.LocalDate;
 import java.util.Objects;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DecimalStatistics.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DecimalStatistics.java
index 3b64b9f6e4dd..1a30f7df2f33 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DecimalStatistics.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DecimalStatistics.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.math.BigDecimal;
 import java.util.Objects;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DecoratedHiveMetastoreModule.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DecoratedHiveMetastoreModule.java
index e94001191ff3..262086727b39 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DecoratedHiveMetastoreModule.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DecoratedHiveMetastoreModule.java
@@ -23,7 +23,7 @@
 import io.trino.plugin.hive.metastore.cache.ImpersonationCachingConfig;
 import io.trino.plugin.hive.metastore.cache.SharedHiveMetastoreCache;
 import io.trino.plugin.hive.metastore.cache.SharedHiveMetastoreCache.CachingHiveMetastoreFactory;
-import io.trino.plugin.hive.metastore.procedure.FlushHiveMetastoreCacheProcedure;
+import io.trino.plugin.hive.metastore.procedure.FlushMetadataCacheProcedure;
 import io.trino.plugin.hive.metastore.recording.RecordingHiveMetastoreDecoratorModule;
 import io.trino.spi.procedure.Procedure;
 import io.trino.spi.security.ConnectorIdentity;
@@ -64,7 +64,7 @@ protected void setup(Binder binder)
                 .as(generator -> generator.generatedNameOf(CachingHiveMetastore.class));
 
         if (installFlushMetadataCacheProcedure) {
-            newSetBinder(binder, Procedure.class).addBinding().toProvider(FlushHiveMetastoreCacheProcedure.class).in(Scopes.SINGLETON);
+            newSetBinder(binder, Procedure.class).addBinding().toProvider(FlushMetadataCacheProcedure.class).in(Scopes.SINGLETON);
         }
     }
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DoubleStatistics.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DoubleStatistics.java
index 62ec21118848..3027056032e0 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DoubleStatistics.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/DoubleStatistics.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 import java.util.OptionalDouble;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/ForwardingHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/ForwardingHiveMetastore.java
index 468aeb5f3cec..62fd8819995b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/ForwardingHiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/ForwardingHiveMetastore.java
@@ -22,10 +22,12 @@
 import io.trino.plugin.hive.acid.AcidTransaction;
 import io.trino.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -114,6 +116,12 @@ public List<String> getAllTables(String databaseName)
         return delegate.getAllTables(databaseName);
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllTables()
+    {
+        return delegate.getAllTables();
+    }
+
     @Override
     public List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue)
     {
@@ -126,6 +134,12 @@ public List<String> getAllViews(String databaseName)
         return delegate.getAllViews(databaseName);
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllViews()
+    {
+        return delegate.getAllViews();
+    }
+
     @Override
     public void createDatabase(Database database)
     {
@@ -453,4 +467,40 @@ public void alterTransactionalTable(
     {
         delegate.alterTransactionalTable(table, transactionId, writeId, principalPrivileges);
     }
+
+    @Override
+    public boolean functionExists(String databaseName, String functionName, String signatureToken)
+    {
+        return delegate.functionExists(databaseName, functionName, signatureToken);
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName)
+    {
+        return delegate.getFunctions(databaseName);
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName, String functionName)
+    {
+        return delegate.getFunctions(databaseName, functionName);
+    }
+
+    @Override
+    public void createFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        delegate.createFunction(databaseName, functionName, function);
+    }
+
+    @Override
+    public void replaceFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        delegate.replaceFunction(databaseName, functionName, function);
+    }
+
+    @Override
+    public void dropFunction(String databaseName, String functionName, String signatureToken)
+    {
+        delegate.dropFunction(databaseName, functionName, signatureToken);
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveColumnStatistics.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveColumnStatistics.java
index ae3dd1dfcfcc..c68c19f17413 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveColumnStatistics.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveColumnStatistics.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastore.java
index 3eec2fa212eb..0c5528d7f4e0 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastore.java
@@ -24,10 +24,12 @@
 import io.trino.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -62,10 +64,23 @@ default void updatePartitionStatistics(Table table, String partitionName, Functi
 
     List<String> getAllTables(String databaseName);
 
+    /**
+     * @return List of tables, views and materialized views names from all schemas or Optional.empty if operation is not supported
+     */
+    Optional<List<SchemaTableName>> getAllTables();
+
     List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue);
 
+    /**
+     * Lists views and materialized views from given database.
+     */
     List<String> getAllViews(String databaseName);
 
+    /**
+     * @return List of views including materialized views names from all schemas or Optional.empty if operation is not supported
+     */
+    Optional<List<SchemaTableName>> getAllViews();
+
     void createDatabase(Database database);
 
     void dropDatabase(String databaseName, boolean deleteData);
@@ -225,4 +240,16 @@ default void alterTransactionalTable(Table table, long transactionId, long write
     {
         throw new UnsupportedOperationException();
     }
+
+    boolean functionExists(String databaseName, String functionName, String signatureToken);
+
+    Collection<LanguageFunction> getFunctions(String databaseName);
+
+    Collection<LanguageFunction> getFunctions(String databaseName, String functionName);
+
+    void createFunction(String databaseName, String functionName, LanguageFunction function);
+
+    void replaceFunction(String databaseName, String functionName, LanguageFunction function);
+
+    void dropFunction(String databaseName, String functionName, String signatureToken);
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastoreModule.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastoreModule.java
index d703227a43e3..7735f2cb2bb7 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastoreModule.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastoreModule.java
@@ -50,10 +50,6 @@ protected void setup(Binder binder)
             bindMetastoreModule("thrift", new ThriftMetastoreModule());
             bindMetastoreModule("file", new FileMetastoreModule());
             bindMetastoreModule("glue", new GlueMetastoreModule());
-            // Load Alluxio metastore support through reflection. This makes Alluxio effectively an optional dependency
-            // and allows deploying Trino without the Alluxio jar. Can be useful if the integration is unused and is flagged
-            // by a security scanner.
-            bindMetastoreModule("alluxio-deprecated", deferredModule("io.trino.plugin.hive.metastore.alluxio.AlluxioMetastoreModule"));
         }
 
         install(new DecoratedHiveMetastoreModule(true));
@@ -67,26 +63,6 @@ private void bindMetastoreModule(String name, Module module)
                 module));
     }
 
-    private static Module deferredModule(String moduleClassName)
-    {
-        return new AbstractConfigurationAwareModule()
-        {
-            @Override
-            protected void setup(Binder binder)
-            {
-                try {
-                    install(Class.forName(moduleClassName)
-                            .asSubclass(Module.class)
-                            .getConstructor()
-                            .newInstance());
-                }
-                catch (ReflectiveOperationException e) {
-                    throw new RuntimeException("Problem loading module class: " + moduleClassName, e);
-                }
-            }
-        };
-    }
-
     @HideDeltaLakeTables
     @Singleton
     @Provides
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HivePartitionName.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HivePartitionName.java
index 1d5222d687ba..abf394ff1d69 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HivePartitionName.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HivePartitionName.java
@@ -16,8 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HivePrivilegeInfo.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HivePrivilegeInfo.java
index 25b6fc2ed852..41ce4a5d1ba0 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HivePrivilegeInfo.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HivePrivilegeInfo.java
@@ -16,11 +16,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.PrivilegeInfo;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Objects;
 import java.util.Set;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveTableName.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveTableName.java
index 82a43289964a..dde5609a0bac 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveTableName.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveTableName.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/IntegerStatistics.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/IntegerStatistics.java
index 3bf0ef4cf591..9b0a6d308871 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/IntegerStatistics.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/IntegerStatistics.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 import java.util.OptionalLong;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/MetastoreTypeConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/MetastoreTypeConfig.java
index 5c7f4ca51246..088e5b7b9602 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/MetastoreTypeConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/MetastoreTypeConfig.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.hive.metastore;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class MetastoreTypeConfig
 {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/MetastoreUtil.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/MetastoreUtil.java
index da195235bb36..405796542872 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/MetastoreUtil.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/MetastoreUtil.java
@@ -75,7 +75,6 @@
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.NUM_ROWS;
 import static io.trino.plugin.hive.util.HiveClassNames.AVRO_SERDE_CLASS;
 import static io.trino.plugin.hive.util.HiveUtil.makePartName;
-import static io.trino.plugin.hive.util.SerdeConstants.SERIALIZATION_DDL;
 import static io.trino.plugin.hive.util.SerdeConstants.SERIALIZATION_LIB;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.predicate.TupleDomain.withColumnDomains;
@@ -84,7 +83,6 @@
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
-import static org.apache.hadoop.hive.metastore.ColumnType.typeToThriftType;
 
 public final class MetastoreUtil
 {
@@ -99,7 +97,6 @@ public static Properties getHiveSchema(Table table)
                 table.getStorage(),
                 Optional.empty(),
                 table.getDataColumns(),
-                table.getDataColumns(),
                 table.getParameters(),
                 table.getDatabaseName(),
                 table.getTableName(),
@@ -112,7 +109,6 @@ public static Properties getHiveSchema(Partition partition, Table table)
         return getHiveSchema(
                 partition.getStorage(),
                 Optional.of(table.getStorage()),
-                partition.getColumns(),
                 table.getDataColumns(),
                 table.getParameters(),
                 table.getDatabaseName(),
@@ -123,7 +119,6 @@ public static Properties getHiveSchema(Partition partition, Table table)
     private static Properties getHiveSchema(
             Storage sd,
             Optional<Storage> tableSd,
-            List<Column> dataColumns,
             List<Column> tableDataColumns,
             Map<String, String> parameters,
             String databaseName,
@@ -182,8 +177,6 @@ private static Properties getHiveSchema(
         schema.setProperty(META_TABLE_COLUMN_TYPES, columnTypes);
         schema.setProperty("columns.comments", columnCommentBuilder.toString());
 
-        schema.setProperty(SERIALIZATION_DDL, toThriftDdl(tableName, dataColumns));
-
         StringBuilder partString = new StringBuilder();
         String partStringSep = "";
         StringBuilder partTypesString = new StringBuilder();
@@ -260,30 +253,6 @@ public static String getPartitionLocation(Table table, Optional<Partition> parti
         return partition.get().getStorage().getLocation();
     }
 
-    private static String toThriftDdl(String structName, List<Column> columns)
-    {
-        // Mimics function in Hive:
-        // MetaStoreUtils.getDDLFromFieldSchema(String, List<FieldSchema>)
-        StringBuilder ddl = new StringBuilder();
-        ddl.append("struct ");
-        ddl.append(structName);
-        ddl.append(" { ");
-        boolean first = true;
-        for (Column column : columns) {
-            if (first) {
-                first = false;
-            }
-            else {
-                ddl.append(", ");
-            }
-            ddl.append(typeToThriftType(column.getType().getHiveTypeName().toString()));
-            ddl.append(' ');
-            ddl.append(column.getName());
-        }
-        ddl.append("}");
-        return ddl.toString();
-    }
-
     private static ProtectMode getProtectMode(Map<String, String> parameters)
     {
         return ProtectMode.valueOf(nullToEmpty(parameters.get(ProtectMode.PARAMETER_NAME)));
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Partition.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Partition.java
index 6e509b9759e1..19e3e02bf80e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Partition.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Partition.java
@@ -18,17 +18,15 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.connector.SchemaTableName;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
-import static io.trino.plugin.hive.metastore.MetastoreUtil.adjustRowCount;
 import static java.util.Objects.requireNonNull;
 
 @Immutable
@@ -58,12 +56,6 @@ public Partition(
         this.parameters = ImmutableMap.copyOf(requireNonNull(parameters, "parameters is null"));
     }
 
-    @JsonIgnore
-    public Partition withAdjustedRowCount(String partitionName, long rowCountDelta)
-    {
-        return new Partition(databaseName, tableName, values, storage, columns, adjustRowCount(parameters, partitionName, rowCountDelta));
-    }
-
     @JsonProperty
     public String getDatabaseName()
     {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/PartitionFilter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/PartitionFilter.java
index e0f5418e4d4c..883b9a1641c2 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/PartitionFilter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/PartitionFilter.java
@@ -16,10 +16,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 import java.util.Objects;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/RawHiveMetastoreFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/RawHiveMetastoreFactory.java
index 9931e8db1910..a9d7b5b793b0 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/RawHiveMetastoreFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/RawHiveMetastoreFactory.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive.metastore;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface RawHiveMetastoreFactory
 {
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/SemiTransactionalHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/SemiTransactionalHiveMetastore.java
index 0b97ccb82b3f..a49ce5cdaae0 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/SemiTransactionalHiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/SemiTransactionalHiveMetastore.java
@@ -22,10 +22,16 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.errorprone.annotations.FormatMethod;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import dev.failsafe.Failsafe;
+import dev.failsafe.FailsafeException;
+import dev.failsafe.RetryPolicy;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
-import io.trino.hdfs.HdfsContext;
-import io.trino.hdfs.HdfsEnvironment;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.thrift.metastore.DataOperationType;
 import io.trino.plugin.hive.HiveBasicStatistics;
 import io.trino.plugin.hive.HiveColumnStatisticType;
@@ -43,24 +49,19 @@
 import io.trino.plugin.hive.acid.AcidTransaction;
 import io.trino.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege;
 import io.trino.plugin.hive.security.SqlStandardAccessControlMetadataMetastore;
-import io.trino.plugin.hive.util.RetryDriver;
 import io.trino.plugin.hive.util.ValidTxnWriteIdList;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.function.LanguageFunction;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.security.PrincipalType;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.LocatedFileStatus;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.RemoteIterator;
-
-import javax.annotation.concurrent.GuardedBy;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -68,9 +69,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -105,7 +104,8 @@
 import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME;
 import static io.trino.plugin.hive.LocationHandle.WriteMode.DIRECT_TO_TARGET_NEW_DIRECTORY;
 import static io.trino.plugin.hive.TableType.MANAGED_TABLE;
-import static io.trino.plugin.hive.ViewReaderUtil.isPrestoView;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoMaterializedView;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoView;
 import static io.trino.plugin.hive.acid.AcidTransaction.NO_ACID_TRANSACTION;
 import static io.trino.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege.OWNERSHIP;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.buildInitialPrivilegeSet;
@@ -113,10 +113,7 @@
 import static io.trino.plugin.hive.util.AcidTables.isTransactionalTable;
 import static io.trino.plugin.hive.util.HiveUtil.makePartName;
 import static io.trino.plugin.hive.util.HiveUtil.toPartitionValues;
-import static io.trino.plugin.hive.util.HiveWriteUtils.checkedDelete;
-import static io.trino.plugin.hive.util.HiveWriteUtils.createDirectory;
 import static io.trino.plugin.hive.util.HiveWriteUtils.isFileCreatedByQuery;
-import static io.trino.plugin.hive.util.HiveWriteUtils.pathExists;
 import static io.trino.plugin.hive.util.Statistics.ReduceOperator.SUBTRACT;
 import static io.trino.plugin.hive.util.Statistics.merge;
 import static io.trino.plugin.hive.util.Statistics.reduce;
@@ -143,16 +140,18 @@ public class SemiTransactionalHiveMetastore
     private static final int PARTITION_COMMIT_BATCH_SIZE = 20;
     private static final Pattern DELTA_DIRECTORY_MATCHER = Pattern.compile("(delete_)?delta_[\\d]+_[\\d]+_[\\d]+$");
 
-    private static final RetryDriver DELETE_RETRY = RetryDriver.retry()
-            .maxAttempts(3)
-            .exponentialBackoff(new Duration(1, SECONDS), new Duration(1, SECONDS), new Duration(10, SECONDS), 2.0);
+    private static final RetryPolicy<?> DELETE_RETRY_POLICY = RetryPolicy.builder()
+            .withDelay(java.time.Duration.ofSeconds(1))
+            .withMaxDuration(java.time.Duration.ofSeconds(30))
+            .withMaxAttempts(3)
+            .build();
 
     private static final Map<AcidOperation, ActionType> ACID_OPERATION_ACTION_TYPES = ImmutableMap.of(
             AcidOperation.INSERT, ActionType.INSERT_EXISTING,
             AcidOperation.MERGE, ActionType.MERGE);
 
     private final HiveMetastoreClosure delegate;
-    private final HdfsEnvironment hdfsEnvironment;
+    private final TrinoFileSystemFactory fileSystemFactory;
     private final Executor fileSystemExecutor;
     private final Executor dropExecutor;
     private final Executor updateExecutor;
@@ -189,7 +188,7 @@ public class SemiTransactionalHiveMetastore
     private Optional<HiveTransaction> currentHiveTransaction = Optional.empty();
 
     public SemiTransactionalHiveMetastore(
-            HdfsEnvironment hdfsEnvironment,
+            TrinoFileSystemFactory fileSystemFactory,
             HiveMetastoreClosure delegate,
             Executor fileSystemExecutor,
             Executor dropExecutor,
@@ -201,7 +200,7 @@ public SemiTransactionalHiveMetastore(
             ScheduledExecutorService heartbeatService,
             TableInvalidationCallback tableInvalidationCallback)
     {
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.delegate = requireNonNull(delegate, "delegate is null");
         this.fileSystemExecutor = requireNonNull(fileSystemExecutor, "fileSystemExecutor is null");
         this.dropExecutor = requireNonNull(dropExecutor, "dropExecutor is null");
@@ -244,6 +243,15 @@ public synchronized List<String> getAllTables(String databaseName)
         return delegate.getAllTables(databaseName);
     }
 
+    public synchronized Optional<List<SchemaTableName>> getAllTables()
+    {
+        checkReadable();
+        if (!tableActions.isEmpty()) {
+            throw new UnsupportedOperationException("Listing all tables after adding/dropping/altering tables/views in a transaction is not supported");
+        }
+        return delegate.getAllTables();
+    }
+
     public synchronized Optional<Table> getTable(String databaseName, String tableName)
     {
         checkReadable();
@@ -418,6 +426,15 @@ public synchronized List<String> getAllViews(String databaseName)
         return delegate.getAllViews(databaseName);
     }
 
+    public synchronized Optional<List<SchemaTableName>> getAllViews()
+    {
+        checkReadable();
+        if (!tableActions.isEmpty()) {
+            throw new UnsupportedOperationException("Listing all tables after adding/dropping/altering tables/views in a transaction is not supported");
+        }
+        return delegate.getAllViews();
+    }
+
     public synchronized void createDatabase(ConnectorSession session, Database database)
     {
         String queryId = session.getQueryId();
@@ -428,7 +445,7 @@ public synchronized void createDatabase(ConnectorSession session, Database datab
                 "Database '%s' does not have correct query id set",
                 database.getDatabaseName());
 
-        setExclusive((delegate, hdfsEnvironment) -> {
+        setExclusive(delegate -> {
             try {
                 delegate.createDatabase(database);
             }
@@ -452,45 +469,50 @@ private static boolean isCreatedBy(Database database, String queryId)
 
     public synchronized void dropDatabase(ConnectorSession session, String schemaName)
     {
-        Optional<Path> location = delegate.getDatabase(schemaName)
+        setExclusive(delegate -> {
+            boolean deleteData = shouldDeleteDatabaseData(session, schemaName);
+            delegate.dropDatabase(schemaName, deleteData);
+        });
+    }
+
+    public boolean shouldDeleteDatabaseData(ConnectorSession session, String schemaName)
+    {
+        Optional<Location> location = delegate.getDatabase(schemaName)
                 .orElseThrow(() -> new SchemaNotFoundException(schemaName))
                 .getLocation()
-                .map(Path::new);
-
-        setExclusive((delegate, hdfsEnvironment) -> {
-            // If we see files in the schema location, don't delete it.
-            // If we see no files, request deletion.
-            // If we fail to check the schema location, behave according to fallback.
-            boolean deleteData = location.map(path -> {
-                try {
-                    return !hdfsEnvironment.getFileSystem(new HdfsContext(session), path)
-                            .listLocatedStatus(path).hasNext();
-                }
-                catch (IOException | RuntimeException e) {
-                    log.warn(e, "Could not check schema directory '%s'", path);
-                    return deleteSchemaLocationsFallback;
-                }
-            }).orElse(deleteSchemaLocationsFallback);
+                .map(Location::of);
 
-            delegate.dropDatabase(schemaName, deleteData);
-        });
+        // If we see files in the schema location, don't delete it.
+        // If we see no files, request deletion.
+        // If we fail to check the schema location, behave according to fallback.
+        return location.map(path -> {
+            try {
+                TrinoFileSystem fileSystem = fileSystemFactory.create(session);
+                return !fileSystem.listFiles(path).hasNext() &&
+                        fileSystem.listDirectories(path).isEmpty();
+            }
+            catch (IOException e) {
+                log.warn(e, "Could not check schema directory '%s'", path);
+                return deleteSchemaLocationsFallback;
+            }
+        }).orElse(deleteSchemaLocationsFallback);
     }
 
     public synchronized void renameDatabase(String source, String target)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.renameDatabase(source, target));
+        setExclusive(delegate -> delegate.renameDatabase(source, target));
     }
 
     public synchronized void setDatabaseOwner(String source, HivePrincipal principal)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.setDatabaseOwner(source, principal));
+        setExclusive(delegate -> delegate.setDatabaseOwner(source, principal));
     }
 
     // TODO: Allow updating statistics for 2 tables in the same transaction
     public synchronized void setTableStatistics(Table table, PartitionStatistics tableStatistics)
     {
         AcidTransaction transaction = currentHiveTransaction.isPresent() ? currentHiveTransaction.get().getTransaction() : NO_ACID_TRANSACTION;
-        setExclusive((delegate, hdfsEnvironment) ->
+        setExclusive(delegate ->
                 delegate.updateTableStatistics(table.getDatabaseName(), table.getTableName(), transaction, statistics -> updatePartitionStatistics(statistics, tableStatistics)));
     }
 
@@ -501,7 +523,7 @@ public synchronized void setPartitionStatistics(Table table, Map<List<String>, P
                 toImmutableMap(
                         entry -> getPartitionName(table, entry.getKey()),
                         entry -> oldPartitionStats -> updatePartitionStatistics(oldPartitionStats, entry.getValue())));
-        setExclusive((delegate, hdfsEnvironment) ->
+        setExclusive(delegate ->
                 delegate.updatePartitionStatistics(
                         table.getDatabaseName(),
                         table.getTableName(),
@@ -543,7 +565,7 @@ public synchronized void createTable(
             ConnectorSession session,
             Table table,
             PrincipalPrivileges principalPrivileges,
-            Optional<Path> currentPath,
+            Optional<Location> currentLocation,
             Optional<List<String>> files,
             boolean ignoreExisting,
             PartitionStatistics statistics,
@@ -553,19 +575,17 @@ public synchronized void createTable(
         // When creating a table, it should never have partition actions. This is just a sanity check.
         checkNoPartitionAction(table.getDatabaseName(), table.getTableName());
         Action<TableAndMore> oldTableAction = tableActions.get(table.getSchemaTableName());
-        TableAndMore tableAndMore = new TableAndMore(table, Optional.of(principalPrivileges), currentPath, files, ignoreExisting, statistics, statistics, cleanExtraOutputFilesOnCommit);
+        TableAndMore tableAndMore = new TableAndMore(table, Optional.of(principalPrivileges), currentLocation, files, ignoreExisting, statistics, statistics, cleanExtraOutputFilesOnCommit);
         if (oldTableAction == null) {
-            HdfsContext hdfsContext = new HdfsContext(session);
-            tableActions.put(table.getSchemaTableName(), new Action<>(ActionType.ADD, tableAndMore, hdfsContext, session.getQueryId()));
+            tableActions.put(table.getSchemaTableName(), new Action<>(ActionType.ADD, tableAndMore, session.getIdentity(), session.getQueryId()));
             return;
         }
         switch (oldTableAction.getType()) {
             case DROP:
-                if (!oldTableAction.getHdfsContext().getIdentity().getUser().equals(session.getUser())) {
+                if (!oldTableAction.getIdentity().getUser().equals(session.getUser())) {
                     throw new TrinoException(TRANSACTION_CONFLICT, "Operation on the same table with different user in the same transaction is not supported");
                 }
-                HdfsContext hdfsContext = new HdfsContext(session);
-                tableActions.put(table.getSchemaTableName(), new Action<>(ActionType.ALTER, tableAndMore, hdfsContext, session.getQueryId()));
+                tableActions.put(table.getSchemaTableName(), new Action<>(ActionType.ALTER, tableAndMore, session.getIdentity(), session.getQueryId()));
                 return;
 
             case ADD:
@@ -588,8 +608,7 @@ public synchronized void dropTable(ConnectorSession session, String databaseName
         SchemaTableName schemaTableName = new SchemaTableName(databaseName, tableName);
         Action<TableAndMore> oldTableAction = tableActions.get(schemaTableName);
         if (oldTableAction == null || oldTableAction.getType() == ActionType.ALTER) {
-            HdfsContext hdfsContext = new HdfsContext(session);
-            tableActions.put(schemaTableName, new Action<>(ActionType.DROP, null, hdfsContext, session.getQueryId()));
+            tableActions.put(schemaTableName, new Action<>(ActionType.DROP, null, session.getIdentity(), session.getQueryId()));
             return;
         }
         switch (oldTableAction.getType()) {
@@ -609,12 +628,12 @@ public synchronized void dropTable(ConnectorSession session, String databaseName
 
     public synchronized void replaceTable(String databaseName, String tableName, Table table, PrincipalPrivileges principalPrivileges)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.replaceTable(databaseName, tableName, table, principalPrivileges));
+        setExclusive(delegate -> delegate.replaceTable(databaseName, tableName, table, principalPrivileges));
     }
 
     public synchronized void renameTable(String databaseName, String tableName, String newDatabaseName, String newTableName)
     {
-        setExclusive((delegate, hdfsEnvironment) -> {
+        setExclusive(delegate -> {
             Optional<Table> oldTable = delegate.getTable(databaseName, tableName);
             try {
                 delegate.renameTable(databaseName, tableName, newDatabaseName, newTableName);
@@ -628,32 +647,32 @@ public synchronized void renameTable(String databaseName, String tableName, Stri
 
     public synchronized void commentTable(String databaseName, String tableName, Optional<String> comment)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.commentTable(databaseName, tableName, comment));
+        setExclusive(delegate -> delegate.commentTable(databaseName, tableName, comment));
     }
 
     public synchronized void setTableOwner(String schema, String table, HivePrincipal principal)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.setTableOwner(schema, table, principal));
+        setExclusive(delegate -> delegate.setTableOwner(schema, table, principal));
     }
 
     public synchronized void commentColumn(String databaseName, String tableName, String columnName, Optional<String> comment)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.commentColumn(databaseName, tableName, columnName, comment));
+        setExclusive(delegate -> delegate.commentColumn(databaseName, tableName, columnName, comment));
     }
 
     public synchronized void addColumn(String databaseName, String tableName, String columnName, HiveType columnType, String columnComment)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.addColumn(databaseName, tableName, columnName, columnType, columnComment));
+        setExclusive(delegate -> delegate.addColumn(databaseName, tableName, columnName, columnType, columnComment));
     }
 
     public synchronized void renameColumn(String databaseName, String tableName, String oldColumnName, String newColumnName)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.renameColumn(databaseName, tableName, oldColumnName, newColumnName));
+        setExclusive(delegate -> delegate.renameColumn(databaseName, tableName, oldColumnName, newColumnName));
     }
 
     public synchronized void dropColumn(String databaseName, String tableName, String columnName)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.dropColumn(databaseName, tableName, columnName));
+        setExclusive(delegate -> delegate.dropColumn(databaseName, tableName, columnName));
     }
 
     public synchronized void finishChangingExistingTable(
@@ -661,7 +680,7 @@ public synchronized void finishChangingExistingTable(
             ConnectorSession session,
             String databaseName,
             String tableName,
-            Path currentLocation,
+            Location currentLocation,
             List<String> fileNames,
             PartitionStatistics statisticsUpdate,
             boolean cleanExtraOutputFilesOnCommit)
@@ -678,7 +697,6 @@ public synchronized void finishChangingExistingTable(
                 table = Table.builder(table).setWriteId(OptionalLong.of(currentHiveTransaction.orElseThrow().getTransaction().getWriteId())).build();
             }
             PartitionStatistics currentStatistics = getTableStatistics(databaseName, tableName, Optional.empty());
-            HdfsContext hdfsContext = new HdfsContext(session);
             tableActions.put(
                     schemaTableName,
                     new Action<>(
@@ -692,7 +710,7 @@ public synchronized void finishChangingExistingTable(
                                     merge(currentStatistics, statisticsUpdate),
                                     statisticsUpdate,
                                     cleanExtraOutputFilesOnCommit),
-                            hdfsContext,
+                            session.getIdentity(),
                             session.getQueryId()));
             return;
         }
@@ -723,17 +741,17 @@ public synchronized void truncateUnpartitionedTable(ConnectorSession session, St
         SchemaTableName schemaTableName = new SchemaTableName(databaseName, tableName);
         Table table = getTable(databaseName, tableName)
                 .orElseThrow(() -> new TableNotFoundException(schemaTableName));
-        if (!table.getTableType().equals(MANAGED_TABLE.toString())) {
+        if (!table.getTableType().equals(MANAGED_TABLE.name())) {
             throw new TrinoException(NOT_SUPPORTED, "Cannot delete from non-managed Hive table");
         }
         if (!table.getPartitionColumns().isEmpty()) {
             throw new IllegalArgumentException("Table is partitioned");
         }
 
-        Path path = new Path(table.getStorage().getLocation());
-        HdfsContext context = new HdfsContext(session);
-        setExclusive((delegate, hdfsEnvironment) -> {
-            RecursiveDeleteResult recursiveDeleteResult = recursiveDeleteFiles(hdfsEnvironment, context, path, ImmutableSet.of(""), false);
+        Location location = Location.of(table.getStorage().getLocation());
+        TrinoFileSystem fileSystem = fileSystemFactory.create(session.getIdentity());
+        setExclusive(delegate -> {
+            RecursiveDeleteResult recursiveDeleteResult = recursiveDeleteFiles(fileSystem, location, ImmutableSet.of(""), false);
             if (!recursiveDeleteResult.getNotDeletedEligibleItems().isEmpty()) {
                 throw new TrinoException(HIVE_FILESYSTEM_ERROR, format(
                         "Error deleting from unpartitioned table %s. These items cannot be deleted: %s",
@@ -747,7 +765,7 @@ public synchronized void finishMerge(
             ConnectorSession session,
             String databaseName,
             String tableName,
-            Path currentLocation,
+            Location currentLocation,
             List<PartitionUpdateAndMergeResults> partitionUpdateAndMergeResults,
             List<Partition> partitions)
     {
@@ -763,7 +781,6 @@ public synchronized void finishMerge(
         Action<TableAndMore> oldTableAction = tableActions.get(schemaTableName);
         if (oldTableAction == null) {
             Table table = getExistingTable(schemaTableName.getSchemaName(), schemaTableName.getTableName());
-            HdfsContext hdfsContext = new HdfsContext(session);
             PrincipalPrivileges principalPrivileges = table.getOwner().isEmpty() ? NO_PRIVILEGES :
                     buildInitialPrivilegeSet(table.getOwner().get());
             tableActions.put(
@@ -776,7 +793,7 @@ public synchronized void finishMerge(
                                     Optional.of(currentLocation),
                                     partitionUpdateAndMergeResults,
                                     partitions),
-                            hdfsContext,
+                            session.getIdentity(),
                             session.getQueryId()));
             return;
         }
@@ -949,7 +966,7 @@ public synchronized void addPartition(
             String databaseName,
             String tableName,
             Partition partition,
-            Path currentLocation,
+            Location currentLocation,
             Optional<List<String>> files,
             PartitionStatistics statistics,
             boolean cleanExtraOutputFilesOnCommit)
@@ -958,22 +975,21 @@ public synchronized void addPartition(
         checkArgument(getQueryId(partition).isPresent());
         Map<List<String>, Action<PartitionAndMore>> partitionActionsOfTable = partitionActions.computeIfAbsent(new SchemaTableName(databaseName, tableName), k -> new HashMap<>());
         Action<PartitionAndMore> oldPartitionAction = partitionActionsOfTable.get(partition.getValues());
-        HdfsContext hdfsContext = new HdfsContext(session);
         if (oldPartitionAction == null) {
             partitionActionsOfTable.put(
                     partition.getValues(),
-                    new Action<>(ActionType.ADD, new PartitionAndMore(partition, currentLocation, files, statistics, statistics, cleanExtraOutputFilesOnCommit), hdfsContext, session.getQueryId()));
+                    new Action<>(ActionType.ADD, new PartitionAndMore(partition, currentLocation, files, statistics, statistics, cleanExtraOutputFilesOnCommit), session.getIdentity(), session.getQueryId()));
             return;
         }
         switch (oldPartitionAction.getType()) {
             case DROP:
             case DROP_PRESERVE_DATA:
-                if (!oldPartitionAction.getHdfsContext().getIdentity().getUser().equals(session.getUser())) {
+                if (!oldPartitionAction.getIdentity().getUser().equals(session.getUser())) {
                     throw new TrinoException(TRANSACTION_CONFLICT, "Operation on the same partition with different user in the same transaction is not supported");
                 }
                 partitionActionsOfTable.put(
                         partition.getValues(),
-                        new Action<>(ActionType.ALTER, new PartitionAndMore(partition, currentLocation, files, statistics, statistics, cleanExtraOutputFilesOnCommit), hdfsContext, session.getQueryId()));
+                        new Action<>(ActionType.ALTER, new PartitionAndMore(partition, currentLocation, files, statistics, statistics, cleanExtraOutputFilesOnCommit), session.getIdentity(), session.getQueryId()));
                 return;
             case ADD:
             case ALTER:
@@ -990,12 +1006,11 @@ public synchronized void dropPartition(ConnectorSession session, String database
         Map<List<String>, Action<PartitionAndMore>> partitionActionsOfTable = partitionActions.computeIfAbsent(new SchemaTableName(databaseName, tableName), k -> new HashMap<>());
         Action<PartitionAndMore> oldPartitionAction = partitionActionsOfTable.get(partitionValues);
         if (oldPartitionAction == null) {
-            HdfsContext hdfsContext = new HdfsContext(session);
             if (deleteData) {
-                partitionActionsOfTable.put(partitionValues, new Action<>(ActionType.DROP, null, hdfsContext, session.getQueryId()));
+                partitionActionsOfTable.put(partitionValues, new Action<>(ActionType.DROP, null, session.getIdentity(), session.getQueryId()));
             }
             else {
-                partitionActionsOfTable.put(partitionValues, new Action<>(ActionType.DROP_PRESERVE_DATA, null, hdfsContext, session.getQueryId()));
+                partitionActionsOfTable.put(partitionValues, new Action<>(ActionType.DROP_PRESERVE_DATA, null, session.getIdentity(), session.getQueryId()));
             }
             return;
         }
@@ -1023,17 +1038,14 @@ public synchronized void finishInsertIntoExistingPartitions(
     {
         setShared();
         SchemaTableName schemaTableName = new SchemaTableName(databaseName, tableName);
-        HdfsContext context = new HdfsContext(session);
         Map<List<String>, Action<PartitionAndMore>> partitionActionsOfTable = partitionActions.computeIfAbsent(schemaTableName, k -> new HashMap<>());
 
         for (PartitionUpdateInfo partitionInfo : partitionUpdateInfos) {
             Action<PartitionAndMore> oldPartitionAction = partitionActionsOfTable.get(partitionInfo.partitionValues);
             if (oldPartitionAction != null) {
                 switch (oldPartitionAction.getType()) {
-                    case DROP, DROP_PRESERVE_DATA ->
-                            throw new PartitionNotFoundException(schemaTableName, partitionInfo.partitionValues);
-                    case ADD, ALTER, INSERT_EXISTING, MERGE ->
-                            throw new UnsupportedOperationException("Inserting into a partition that were added, altered, or inserted into in the same transaction is not supported");
+                    case DROP, DROP_PRESERVE_DATA -> throw new PartitionNotFoundException(schemaTableName, partitionInfo.partitionValues);
+                    case ADD, ALTER, INSERT_EXISTING, MERGE -> throw new UnsupportedOperationException("Inserting into a partition that were added, altered, or inserted into in the same transaction is not supported");
                     default -> throw new IllegalStateException("Unknown action type: " + oldPartitionAction.getType());
                 }
             }
@@ -1079,7 +1091,7 @@ public synchronized void finishInsertIntoExistingPartitions(
                                         merge(currentStatistics, partitionInfo.statisticsUpdate),
                                         partitionInfo.statisticsUpdate,
                                         cleanExtraOutputFilesOnCommit),
-                                context,
+                                session.getIdentity(),
                                 session.getQueryId()));
             }
         }
@@ -1109,13 +1121,13 @@ private static String getPartitionName(Table table, List<String> partitionValues
     @Override
     public synchronized void createRole(String role, String grantor)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.createRole(role, grantor));
+        setExclusive(delegate -> delegate.createRole(role, grantor));
     }
 
     @Override
     public synchronized void dropRole(String role)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.dropRole(role));
+        setExclusive(delegate -> delegate.dropRole(role));
     }
 
     @Override
@@ -1128,13 +1140,13 @@ public synchronized Set<String> listRoles()
     @Override
     public synchronized void grantRoles(Set<String> roles, Set<HivePrincipal> grantees, boolean adminOption, HivePrincipal grantor)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.grantRoles(roles, grantees, adminOption, grantor));
+        setExclusive(delegate -> delegate.grantRoles(roles, grantees, adminOption, grantor));
     }
 
     @Override
     public synchronized void revokeRoles(Set<String> roles, Set<HivePrincipal> grantees, boolean adminOption, HivePrincipal grantor)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.revokeRoles(roles, grantees, adminOption, grantor));
+        setExclusive(delegate -> delegate.revokeRoles(roles, grantees, adminOption, grantor));
     }
 
     @Override
@@ -1215,16 +1227,49 @@ private Table getExistingTable(String databaseName, String tableName)
     @Override
     public synchronized void grantTablePrivileges(String databaseName, String tableName, HivePrincipal grantee, HivePrincipal grantor, Set<HivePrivilege> privileges, boolean grantOption)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.grantTablePrivileges(databaseName, tableName, getRequiredTableOwner(databaseName, tableName), grantee, grantor, privileges, grantOption));
+        setExclusive(delegate -> delegate.grantTablePrivileges(databaseName, tableName, getRequiredTableOwner(databaseName, tableName), grantee, grantor, privileges, grantOption));
     }
 
     @Override
     public synchronized void revokeTablePrivileges(String databaseName, String tableName, HivePrincipal grantee, HivePrincipal grantor, Set<HivePrivilege> privileges, boolean grantOption)
     {
-        setExclusive((delegate, hdfsEnvironment) -> delegate.revokeTablePrivileges(databaseName, tableName, getRequiredTableOwner(databaseName, tableName), grantee, grantor, privileges, grantOption));
+        setExclusive(delegate -> delegate.revokeTablePrivileges(databaseName, tableName, getRequiredTableOwner(databaseName, tableName), grantee, grantor, privileges, grantOption));
+    }
+
+    public synchronized boolean functionExists(SchemaFunctionName name, String signatureToken)
+    {
+        checkReadable();
+        return delegate.functionExists(name, signatureToken);
+    }
+
+    public synchronized Collection<LanguageFunction> getFunctions(String schemaName)
+    {
+        checkReadable();
+        return delegate.getFunctions(schemaName);
+    }
+
+    public synchronized Collection<LanguageFunction> getFunctions(SchemaFunctionName name)
+    {
+        checkReadable();
+        return delegate.getFunctions(name);
+    }
+
+    public synchronized void createFunction(SchemaFunctionName name, LanguageFunction function)
+    {
+        setExclusive(delegate -> delegate.createFunction(name, function));
+    }
+
+    public synchronized void replaceFunction(SchemaFunctionName name, LanguageFunction function)
+    {
+        setExclusive(delegate -> delegate.replaceFunction(name, function));
+    }
+
+    public synchronized void dropFunction(SchemaFunctionName name, String signatureToken)
+    {
+        setExclusive(delegate -> delegate.dropFunction(name, signatureToken));
     }
 
-    public synchronized String declareIntentionToWrite(ConnectorSession session, WriteMode writeMode, Path stagingPathRoot, SchemaTableName schemaTableName)
+    public synchronized String declareIntentionToWrite(ConnectorSession session, WriteMode writeMode, Location stagingPathRoot, SchemaTableName schemaTableName)
     {
         setShared();
         if (writeMode == WriteMode.DIRECT_TO_TARGET_EXISTING_DIRECTORY) {
@@ -1233,11 +1278,11 @@ public synchronized String declareIntentionToWrite(ConnectorSession session, Wri
                 throw new TrinoException(NOT_SUPPORTED, "Cannot insert into a table with a partition that has been modified in the same transaction when Trino is configured to skip temporary directories.");
             }
         }
-        HdfsContext hdfsContext = new HdfsContext(session);
+        ConnectorIdentity identity = session.getIdentity();
         String queryId = session.getQueryId();
         String declarationId = queryId + "_" + declaredIntentionsToWriteCounter;
         declaredIntentionsToWriteCounter++;
-        declaredIntentionsToWrite.add(new DeclaredIntentionToWrite(declarationId, writeMode, hdfsContext, queryId, stagingPathRoot, schemaTableName));
+        declaredIntentionsToWrite.add(new DeclaredIntentionToWrite(declarationId, writeMode, identity, queryId, stagingPathRoot, schemaTableName));
         return declarationId;
     }
 
@@ -1265,7 +1310,7 @@ public synchronized void commit()
                     return;
                 case EXCLUSIVE_OPERATION_BUFFERED:
                     requireNonNull(bufferedExclusiveOperation, "bufferedExclusiveOperation is null");
-                    bufferedExclusiveOperation.execute(delegate, hdfsEnvironment);
+                    bufferedExclusiveOperation.execute(delegate);
                     return;
                 case FINISHED:
                     throw new IllegalStateException("Tried to commit buffered metastore operations after transaction has been committed/aborted");
@@ -1509,16 +1554,16 @@ private void commitShared()
                         committer.prepareDropTable(schemaTableName);
                         break;
                     case ALTER:
-                        committer.prepareAlterTable(action.getHdfsContext(), action.getQueryId(), action.getData());
+                        committer.prepareAlterTable(action.getIdentity(), action.getQueryId(), action.getData());
                         break;
                     case ADD:
-                        committer.prepareAddTable(action.getHdfsContext(), action.getQueryId(), action.getData());
+                        committer.prepareAddTable(action.getIdentity(), action.getQueryId(), action.getData());
                         break;
                     case INSERT_EXISTING:
-                        committer.prepareInsertExistingTable(action.getHdfsContext(), action.getQueryId(), action.getData());
+                        committer.prepareInsertExistingTable(action.getIdentity(), action.getQueryId(), action.getData());
                         break;
                     case MERGE:
-                        committer.prepareMergeExistingTable(action.getHdfsContext(), action.getData());
+                        committer.prepareMergeExistingTable(action.getIdentity(), action.getData());
                         break;
                     default:
                         throw new IllegalStateException("Unknown action type: " + action.getType());
@@ -1537,16 +1582,16 @@ private void commitShared()
                             committer.prepareDropPartition(schemaTableName, partitionValues, false);
                             break;
                         case ALTER:
-                            committer.prepareAlterPartition(action.getHdfsContext(), action.getQueryId(), action.getData());
+                            committer.prepareAlterPartition(action.getIdentity(), action.getQueryId(), action.getData());
                             break;
                         case ADD:
-                            committer.prepareAddPartition(action.getHdfsContext(), action.getQueryId(), action.getData());
+                            committer.prepareAddPartition(action.getIdentity(), action.getQueryId(), action.getData());
                             break;
                         case INSERT_EXISTING:
-                            committer.prepareInsertExistingPartition(action.getHdfsContext(), action.getQueryId(), action.getData());
+                            committer.prepareInsertExistingPartition(action.getIdentity(), action.getQueryId(), action.getData());
                             break;
                         case MERGE:
-                            committer.prepareInsertExistingPartition(action.getHdfsContext(), action.getQueryId(), action.getData());
+                            committer.prepareInsertExistingPartition(action.getIdentity(), action.getQueryId(), action.getData());
                             break;
                         default:
                             throw new IllegalStateException("Unknown action type: " + action.getType());
@@ -1675,19 +1720,18 @@ private void prepareDropTable(SchemaTableName schemaTableName)
                     }));
         }
 
-        private void prepareAlterTable(HdfsContext hdfsContext, String queryId, TableAndMore tableAndMore)
+        private void prepareAlterTable(ConnectorIdentity identity, String queryId, TableAndMore tableAndMore)
         {
             deleteOnly = false;
 
             Table table = tableAndMore.getTable();
-            String targetLocation = table.getStorage().getLocation();
+            Location targetLocation = Location.of(table.getStorage().getLocation());
             Table oldTable = delegate.getTable(table.getDatabaseName(), table.getTableName())
                     .orElseThrow(() -> new TrinoException(TRANSACTION_CONFLICT, "The table that this transaction modified was deleted in another transaction. " + table.getSchemaTableName()));
-            String oldTableLocation = oldTable.getStorage().getLocation();
-            Path oldTablePath = new Path(oldTableLocation);
+            Location oldTableLocation = Location.of(oldTable.getStorage().getLocation());
             tablesToInvalidate.add(oldTable);
 
-            cleanExtraOutputFiles(hdfsContext, queryId, tableAndMore);
+            cleanExtraOutputFiles(identity, queryId, tableAndMore);
 
             // Location of the old table and the new table can be different because we allow arbitrary directories through LocationService.
             // If the location of the old table is the same as the location of the new table:
@@ -1697,33 +1741,31 @@ private void prepareAlterTable(HdfsContext hdfsContext, String queryId, TableAnd
             // Otherwise,
             // * Remember we will need to delete the location of the old partition at the end if transaction successfully commits
             if (targetLocation.equals(oldTableLocation)) {
-                Path oldTableStagingPath = new Path(oldTablePath.getParent(), "_temp_" + oldTablePath.getName() + "_" + queryId);
+                Location location = asFileLocation(oldTableLocation);
+                Location oldTableStagingPath = location.parentDirectory().appendPath("_temp_" + location.fileName() + "_" + queryId);
                 renameDirectory(
-                        hdfsContext,
-                        hdfsEnvironment,
-                        oldTablePath,
+                        fileSystemFactory.create(identity),
+                        oldTableLocation,
                         oldTableStagingPath,
-                        () -> renameTasksForAbort.add(new DirectoryRenameTask(hdfsContext, oldTableStagingPath, oldTablePath)));
+                        () -> renameTasksForAbort.add(new DirectoryRenameTask(identity, oldTableStagingPath, oldTableLocation)));
                 if (!skipDeletionForAlter) {
-                    deletionTasksForFinish.add(new DirectoryDeletionTask(hdfsContext, oldTableStagingPath));
+                    deletionTasksForFinish.add(new DirectoryDeletionTask(identity, oldTableStagingPath));
                 }
             }
             else {
                 if (!skipDeletionForAlter) {
-                    deletionTasksForFinish.add(new DirectoryDeletionTask(hdfsContext, oldTablePath));
+                    deletionTasksForFinish.add(new DirectoryDeletionTask(identity, oldTableLocation));
                 }
             }
 
-            Path currentPath = tableAndMore.getCurrentLocation()
+            Location currentLocation = tableAndMore.getCurrentLocation()
                     .orElseThrow(() -> new IllegalArgumentException("location should be present for alter table"));
-            Path targetPath = new Path(targetLocation);
-            if (!targetPath.equals(currentPath)) {
+            if (!targetLocation.equals(currentLocation)) {
                 renameDirectory(
-                        hdfsContext,
-                        hdfsEnvironment,
-                        currentPath,
-                        targetPath,
-                        () -> cleanUpTasksForAbort.add(new DirectoryCleanUpTask(hdfsContext, targetPath, true)));
+                        fileSystemFactory.create(identity),
+                        currentLocation,
+                        targetLocation,
+                        () -> cleanUpTasksForAbort.add(new DirectoryCleanUpTask(identity, targetLocation, true)));
             }
             // Partition alter must happen regardless of whether original and current location is the same
             // because metadata might change: e.g. storage format, column types, etc
@@ -1736,39 +1778,38 @@ private void prepareAlterTable(HdfsContext hdfsContext, String queryId, TableAnd
                     false));
         }
 
-        private void prepareAddTable(HdfsContext context, String queryId, TableAndMore tableAndMore)
+        private void prepareAddTable(ConnectorIdentity identity, String queryId, TableAndMore tableAndMore)
         {
             deleteOnly = false;
 
-            cleanExtraOutputFiles(context, queryId, tableAndMore);
+            cleanExtraOutputFiles(identity, queryId, tableAndMore);
 
             Table table = tableAndMore.getTable();
             if (table.getTableType().equals(MANAGED_TABLE.name())) {
-                Optional<String> targetLocation = table.getStorage().getOptionalLocation();
+                Optional<Location> targetLocation = table.getStorage().getOptionalLocation().map(Location::of);
                 if (targetLocation.isPresent()) {
-                    checkArgument(!targetLocation.get().isEmpty(), "target location is empty");
-                    Optional<Path> currentPath = tableAndMore.getCurrentLocation();
-                    Path targetPath = new Path(targetLocation.get());
-                    if (table.getPartitionColumns().isEmpty() && currentPath.isPresent()) {
+                    Optional<Location> currentLocation = tableAndMore.getCurrentLocation();
+                    Location targetPath = targetLocation.get();
+                    TrinoFileSystem fileSystem = fileSystemFactory.create(identity);
+                    if (table.getPartitionColumns().isEmpty() && currentLocation.isPresent()) {
                         // CREATE TABLE AS SELECT unpartitioned table
-                        if (targetPath.equals(currentPath.get())) {
+                        if (targetPath.equals(currentLocation.get())) {
                             // Target path and current path are the same. Therefore, directory move is not needed.
                         }
                         else {
                             renameDirectory(
-                                    context,
-                                    hdfsEnvironment,
-                                    currentPath.get(),
+                                    fileSystem,
+                                    currentLocation.get(),
                                     targetPath,
-                                    () -> cleanUpTasksForAbort.add(new DirectoryCleanUpTask(context, targetPath, true)));
+                                    () -> cleanUpTasksForAbort.add(new DirectoryCleanUpTask(identity, targetPath, true)));
                         }
                     }
                     else {
                         // CREATE TABLE AS SELECT partitioned table, or
                         // CREATE TABLE partitioned/unpartitioned table (without data)
-                        if (pathExists(context, hdfsEnvironment, targetPath)) {
-                            if (currentPath.isPresent() && currentPath.get().equals(targetPath)) {
-                                // It is okay to skip directory creation when currentPath is equal to targetPath
+                        if (directoryExists(fileSystem, targetPath)) {
+                            if (currentLocation.isPresent() && currentLocation.get().equals(targetPath)) {
+                                // It is okay to skip directory creation when currentLocation is equal to targetPath
                                 // because the directory may have been created when creating partition directories.
                                 // However, it is important to note that the two being equal does not guarantee
                                 // a directory had been created.
@@ -1780,8 +1821,8 @@ private void prepareAddTable(HdfsContext context, String queryId, TableAndMore t
                             }
                         }
                         else {
-                            cleanUpTasksForAbort.add(new DirectoryCleanUpTask(context, targetPath, true));
-                            createDirectory(context, hdfsEnvironment, targetPath);
+                            cleanUpTasksForAbort.add(new DirectoryCleanUpTask(identity, targetPath, true));
+                            createDirectory(fileSystem, targetPath);
                         }
                     }
                 }
@@ -1790,22 +1831,23 @@ private void prepareAddTable(HdfsContext context, String queryId, TableAndMore t
             addTableOperations.add(new CreateTableOperation(table, tableAndMore.getPrincipalPrivileges(), tableAndMore.isIgnoreExisting(), tableAndMore.getStatisticsUpdate()));
         }
 
-        private void prepareInsertExistingTable(HdfsContext context, String queryId, TableAndMore tableAndMore)
+        private void prepareInsertExistingTable(ConnectorIdentity identity, String queryId, TableAndMore tableAndMore)
         {
             deleteOnly = false;
             Table table = tableAndMore.getTable();
-            Path targetPath = new Path(table.getStorage().getLocation());
+            Location targetPath = Location.of(table.getStorage().getLocation());
             tablesToInvalidate.add(table);
-            Path currentPath = tableAndMore.getCurrentLocation().orElseThrow();
-            cleanUpTasksForAbort.add(new DirectoryCleanUpTask(context, targetPath, false));
+            Location currentPath = tableAndMore.getCurrentLocation().orElseThrow();
+            cleanUpTasksForAbort.add(new DirectoryCleanUpTask(identity, targetPath, false));
 
             if (!targetPath.equals(currentPath)) {
                 // if staging directory is used we cherry-pick files to be moved
-                asyncRename(hdfsEnvironment, fileSystemExecutor, fileSystemOperationsCancelled, fileSystemOperationFutures, context, currentPath, targetPath, tableAndMore.getFileNames().orElseThrow());
+                TrinoFileSystem fileSystem = fileSystemFactory.create(identity);
+                asyncRename(fileSystem, fileSystemExecutor, fileSystemOperationsCancelled, fileSystemOperationFutures, currentPath, targetPath, tableAndMore.getFileNames().orElseThrow());
             }
             else {
                 // if we inserted directly into table directory we need to remove extra output files which should not be part of the table
-                cleanExtraOutputFiles(context, queryId, tableAndMore);
+                cleanExtraOutputFiles(identity, queryId, tableAndMore);
             }
             updateStatisticsOperations.add(new UpdateStatisticsOperation(
                     table.getSchemaTableName(),
@@ -1819,7 +1861,7 @@ private void prepareInsertExistingTable(HdfsContext context, String queryId, Tab
             }
         }
 
-        private void prepareMergeExistingTable(HdfsContext context, TableAndMore tableAndMore)
+        private void prepareMergeExistingTable(ConnectorIdentity identity, TableAndMore tableAndMore)
         {
             checkArgument(currentHiveTransaction.isPresent(), "currentHiveTransaction isn't present");
             AcidTransaction transaction = currentHiveTransaction.get().getTransaction();
@@ -1827,11 +1869,12 @@ private void prepareMergeExistingTable(HdfsContext context, TableAndMore tableAn
 
             deleteOnly = false;
             Table table = tableAndMore.getTable();
-            Path targetPath = new Path(table.getStorage().getLocation());
-            Path currentPath = tableAndMore.getCurrentLocation().get();
-            cleanUpTasksForAbort.add(new DirectoryCleanUpTask(context, targetPath, false));
+            Location targetPath = Location.of(table.getStorage().getLocation());
+            Location currentPath = tableAndMore.getCurrentLocation().orElseThrow();
+            cleanUpTasksForAbort.add(new DirectoryCleanUpTask(identity, targetPath, false));
             if (!targetPath.equals(currentPath)) {
-                asyncRename(hdfsEnvironment, fileSystemExecutor, fileSystemOperationsCancelled, fileSystemOperationFutures, context, currentPath, targetPath, tableAndMore.getFileNames().get());
+                TrinoFileSystem fileSystem = fileSystemFactory.create(identity);
+                asyncRename(fileSystem, fileSystemExecutor, fileSystemOperationsCancelled, fileSystemOperationFutures, currentPath, targetPath, tableAndMore.getFileNames().get());
             }
             updateStatisticsOperations.add(new UpdateStatisticsOperation(
                     table.getSchemaTableName(),
@@ -1858,7 +1901,7 @@ private void prepareDropPartition(SchemaTableName schemaTableName, List<String>
                     }));
         }
 
-        private void prepareAlterPartition(HdfsContext hdfsContext, String queryId, PartitionAndMore partitionAndMore)
+        private void prepareAlterPartition(ConnectorIdentity identity, String queryId, PartitionAndMore partitionAndMore)
         {
             deleteOnly = false;
 
@@ -1872,9 +1915,9 @@ private void prepareAlterPartition(HdfsContext hdfsContext, String queryId, Part
             String partitionName = getPartitionName(partition.getDatabaseName(), partition.getTableName(), partition.getValues());
             PartitionStatistics oldPartitionStatistics = getExistingPartitionStatistics(partition, partitionName);
             String oldPartitionLocation = oldPartition.getStorage().getLocation();
-            Path oldPartitionPath = new Path(oldPartitionLocation);
+            Location oldPartitionPath = asFileLocation(Location.of(oldPartitionLocation));
 
-            cleanExtraOutputFiles(hdfsContext, queryId, partitionAndMore);
+            cleanExtraOutputFiles(identity, queryId, partitionAndMore);
 
             // Location of the old partition and the new partition can be different because we allow arbitrary directories through LocationService.
             // If the location of the old partition is the same as the location of the new partition:
@@ -1884,32 +1927,30 @@ private void prepareAlterPartition(HdfsContext hdfsContext, String queryId, Part
             // Otherwise,
             // * Remember we will need to delete the location of the old partition at the end if transaction successfully commits
             if (targetLocation.equals(oldPartitionLocation)) {
-                Path oldPartitionStagingPath = new Path(oldPartitionPath.getParent(), "_temp_" + oldPartitionPath.getName() + "_" + queryId);
+                Location oldPartitionStagingPath = oldPartitionPath.sibling("_temp_" + oldPartitionPath.fileName() + "_" + queryId);
                 renameDirectory(
-                        hdfsContext,
-                        hdfsEnvironment,
+                        fileSystemFactory.create(identity),
                         oldPartitionPath,
                         oldPartitionStagingPath,
-                        () -> renameTasksForAbort.add(new DirectoryRenameTask(hdfsContext, oldPartitionStagingPath, oldPartitionPath)));
+                        () -> renameTasksForAbort.add(new DirectoryRenameTask(identity, oldPartitionStagingPath, oldPartitionPath)));
                 if (!skipDeletionForAlter) {
-                    deletionTasksForFinish.add(new DirectoryDeletionTask(hdfsContext, oldPartitionStagingPath));
+                    deletionTasksForFinish.add(new DirectoryDeletionTask(identity, oldPartitionStagingPath));
                 }
             }
             else {
                 if (!skipDeletionForAlter) {
-                    deletionTasksForFinish.add(new DirectoryDeletionTask(hdfsContext, oldPartitionPath));
+                    deletionTasksForFinish.add(new DirectoryDeletionTask(identity, oldPartitionPath));
                 }
             }
 
-            Path currentPath = partitionAndMore.getCurrentLocation();
-            Path targetPath = new Path(targetLocation);
+            Location currentPath = partitionAndMore.getCurrentLocation();
+            Location targetPath = Location.of(targetLocation);
             if (!targetPath.equals(currentPath)) {
                 renameDirectory(
-                        hdfsContext,
-                        hdfsEnvironment,
+                        fileSystemFactory.create(identity),
                         currentPath,
                         targetPath,
-                        () -> cleanUpTasksForAbort.add(new DirectoryCleanUpTask(hdfsContext, targetPath, true)));
+                        () -> cleanUpTasksForAbort.add(new DirectoryCleanUpTask(identity, targetPath, true)));
             }
             // Partition alter must happen regardless of whether original and current location is the same
             // because metadata might change: e.g. storage format, column types, etc
@@ -1918,24 +1959,27 @@ private void prepareAlterPartition(HdfsContext hdfsContext, String queryId, Part
                     new PartitionWithStatistics(oldPartition, partitionName, oldPartitionStatistics)));
         }
 
-        private void cleanExtraOutputFiles(HdfsContext hdfsContext, String queryId, PartitionAndMore partitionAndMore)
+        private void cleanExtraOutputFiles(ConnectorIdentity identity, String queryId, PartitionAndMore partitionAndMore)
         {
             if (!partitionAndMore.isCleanExtraOutputFilesOnCommit()) {
                 return;
             }
             verify(partitionAndMore.hasFileNames(), "fileNames expected to be set if isCleanExtraOutputFilesOnCommit is true");
 
-            SemiTransactionalHiveMetastore.cleanExtraOutputFiles(hdfsEnvironment, hdfsContext, queryId, partitionAndMore.getCurrentLocation(), ImmutableSet.copyOf(partitionAndMore.getFileNames()));
+            TrinoFileSystem fileSystem = fileSystemFactory.create(identity);
+            SemiTransactionalHiveMetastore.cleanExtraOutputFiles(fileSystem, queryId, partitionAndMore.getCurrentLocation(), ImmutableSet.copyOf(partitionAndMore.getFileNames()));
         }
 
-        private void cleanExtraOutputFiles(HdfsContext hdfsContext, String queryId, TableAndMore tableAndMore)
+        private void cleanExtraOutputFiles(ConnectorIdentity identity, String queryId, TableAndMore tableAndMore)
         {
             if (!tableAndMore.isCleanExtraOutputFilesOnCommit()) {
                 return;
             }
-            Path tableLocation = tableAndMore.getCurrentLocation().orElseThrow(() -> new IllegalArgumentException("currentLocation expected to be set if isCleanExtraOutputFilesOnCommit is true"));
+            TrinoFileSystem fileSystem = fileSystemFactory.create(identity);
+            Location tableLocation = tableAndMore.getCurrentLocation().orElseThrow(() ->
+                    new IllegalArgumentException("currentLocation expected to be set if isCleanExtraOutputFilesOnCommit is true"));
             List<String> files = tableAndMore.getFileNames().orElseThrow(() -> new IllegalArgumentException("fileNames expected to be set if isCleanExtraOutputFilesOnCommit is true"));
-            SemiTransactionalHiveMetastore.cleanExtraOutputFiles(hdfsEnvironment, hdfsContext, queryId, tableLocation, ImmutableSet.copyOf(files));
+            SemiTransactionalHiveMetastore.cleanExtraOutputFiles(fileSystem, queryId, tableLocation, ImmutableSet.copyOf(files));
         }
 
         private PartitionStatistics getExistingPartitionStatistics(Partition partition, String partitionName)
@@ -1964,16 +2008,16 @@ private PartitionStatistics getExistingPartitionStatistics(Partition partition,
             }
         }
 
-        private void prepareAddPartition(HdfsContext hdfsContext, String queryId, PartitionAndMore partitionAndMore)
+        private void prepareAddPartition(ConnectorIdentity identity, String queryId, PartitionAndMore partitionAndMore)
         {
             deleteOnly = false;
 
             Partition partition = partitionAndMore.getPartition();
             String targetLocation = partition.getStorage().getLocation();
-            Path currentPath = partitionAndMore.getCurrentLocation();
-            Path targetPath = new Path(targetLocation);
+            Location currentPath = partitionAndMore.getCurrentLocation();
+            Location targetPath = Location.of(targetLocation);
 
-            cleanExtraOutputFiles(hdfsContext, queryId, partitionAndMore);
+            cleanExtraOutputFiles(identity, queryId, partitionAndMore);
 
             PartitionAdder partitionAdder = partitionAdders.computeIfAbsent(
                     partition.getSchemaTableName(),
@@ -1983,19 +2027,19 @@ private void prepareAddPartition(HdfsContext hdfsContext, String queryId, Partit
                 if (fileSystemOperationsCancelled.get()) {
                     return;
                 }
-                if (pathExists(hdfsContext, hdfsEnvironment, currentPath)) {
+                TrinoFileSystem fileSystem = fileSystemFactory.create(identity);
+                if (directoryExists(fileSystem, currentPath)) {
                     if (!targetPath.equals(currentPath)) {
                         renameDirectory(
-                                hdfsContext,
-                                hdfsEnvironment,
+                                fileSystem,
                                 currentPath,
                                 targetPath,
-                                () -> cleanUpTasksForAbort.add(new DirectoryCleanUpTask(hdfsContext, targetPath, true)));
+                                () -> cleanUpTasksForAbort.add(new DirectoryCleanUpTask(identity, targetPath, true)));
                     }
                 }
                 else {
-                    cleanUpTasksForAbort.add(new DirectoryCleanUpTask(hdfsContext, targetPath, true));
-                    createDirectory(hdfsContext, hdfsEnvironment, targetPath);
+                    cleanUpTasksForAbort.add(new DirectoryCleanUpTask(identity, targetPath, true));
+                    createDirectory(fileSystem, targetPath);
                 }
             }, fileSystemExecutor));
 
@@ -2003,23 +2047,24 @@ private void prepareAddPartition(HdfsContext hdfsContext, String queryId, Partit
             partitionAdder.addPartition(new PartitionWithStatistics(partition, partitionName, partitionAndMore.getStatisticsUpdate()));
         }
 
-        private void prepareInsertExistingPartition(HdfsContext hdfsContext, String queryId, PartitionAndMore partitionAndMore)
+        private void prepareInsertExistingPartition(ConnectorIdentity identity, String queryId, PartitionAndMore partitionAndMore)
         {
             deleteOnly = false;
 
             Partition partition = partitionAndMore.getPartition();
             partitionsToInvalidate.add(partition);
-            Path targetPath = new Path(partition.getStorage().getLocation());
-            Path currentPath = partitionAndMore.getCurrentLocation();
-            cleanUpTasksForAbort.add(new DirectoryCleanUpTask(hdfsContext, targetPath, false));
+            Location targetPath = Location.of(partition.getStorage().getLocation());
+            Location currentPath = partitionAndMore.getCurrentLocation();
+            cleanUpTasksForAbort.add(new DirectoryCleanUpTask(identity, targetPath, false));
 
             if (!targetPath.equals(currentPath)) {
                 // if staging directory is used we cherry-pick files to be moved
-                asyncRename(hdfsEnvironment, fileSystemExecutor, fileSystemOperationsCancelled, fileSystemOperationFutures, hdfsContext, currentPath, targetPath, partitionAndMore.getFileNames());
+                TrinoFileSystem fileSystem = fileSystemFactory.create(identity);
+                asyncRename(fileSystem, fileSystemExecutor, fileSystemOperationsCancelled, fileSystemOperationFutures, currentPath, targetPath, partitionAndMore.getFileNames());
             }
             else {
                 // if we inserted directly into partition directory we need to remove extra output files which should not be part of the table
-                cleanExtraOutputFiles(hdfsContext, queryId, partitionAndMore);
+                cleanExtraOutputFiles(identity, queryId, partitionAndMore);
             }
 
             updateStatisticsOperations.add(new UpdateStatisticsOperation(
@@ -2035,15 +2080,19 @@ private void executeCleanupTasksForAbort(Collection<DeclaredIntentionToWrite> de
                     .map(DeclaredIntentionToWrite::getQueryId)
                     .collect(toImmutableSet());
             for (DirectoryCleanUpTask cleanUpTask : cleanUpTasksForAbort) {
-                recursiveDeleteFilesAndLog(cleanUpTask.getContext(), cleanUpTask.getPath(), queryIds, cleanUpTask.isDeleteEmptyDirectory(), "temporary directory commit abort");
+                recursiveDeleteFilesAndLog(cleanUpTask.identity(), cleanUpTask.location(), queryIds, cleanUpTask.deleteEmptyDirectory(), "temporary directory commit abort");
             }
         }
 
         private void executeDeletionTasksForFinish()
         {
             for (DirectoryDeletionTask deletionTask : deletionTasksForFinish) {
-                if (!deleteRecursivelyIfExists(deletionTask.getContext(), hdfsEnvironment, deletionTask.getPath())) {
-                    logCleanupFailure("Error deleting directory %s", deletionTask.getPath());
+                TrinoFileSystem fileSystem = fileSystemFactory.create(deletionTask.identity());
+                try {
+                    fileSystem.deleteDirectory(deletionTask.location());
+                }
+                catch (IOException e) {
+                    logCleanupFailure(e, "Error deleting directory: %s", deletionTask.location());
                 }
             }
         }
@@ -2054,12 +2103,13 @@ private void executeRenameTasksForAbort()
                 try {
                     // Ignore the task if the source directory doesn't exist.
                     // This is probably because the original rename that we are trying to undo here never succeeded.
-                    if (pathExists(directoryRenameTask.getContext(), hdfsEnvironment, directoryRenameTask.getRenameFrom())) {
-                        renameDirectory(directoryRenameTask.getContext(), hdfsEnvironment, directoryRenameTask.getRenameFrom(), directoryRenameTask.getRenameTo(), () -> {});
+                    TrinoFileSystem fileSystem = fileSystemFactory.create(directoryRenameTask.identity());
+                    if (directoryExists(fileSystem, directoryRenameTask.renameFrom())) {
+                        renameDirectory(fileSystem, directoryRenameTask.renameFrom(), directoryRenameTask.renameTo(), () -> {});
                     }
                 }
                 catch (Throwable throwable) {
-                    logCleanupFailure(throwable, "failed to undo rename of partition directory: %s to %s", directoryRenameTask.getRenameFrom(), directoryRenameTask.getRenameTo());
+                    logCleanupFailure(throwable, "failed to undo rename of partition directory: %s to %s", directoryRenameTask.renameFrom(), directoryRenameTask.renameTo());
                 }
             }
         }
@@ -2075,8 +2125,8 @@ private void pruneAndDeleteStagingDirectories(List<DeclaredIntentionToWrite> dec
                         .map(DeclaredIntentionToWrite::getQueryId)
                         .collect(toImmutableSet());
 
-                Path path = declaredIntentionToWrite.getRootPath();
-                recursiveDeleteFilesAndLog(declaredIntentionToWrite.getHdfsContext(), path, queryIds, true, "staging directory cleanup");
+                Location path = declaredIntentionToWrite.getRootPath();
+                recursiveDeleteFilesAndLog(declaredIntentionToWrite.getIdentity(), path, queryIds, true, "staging directory cleanup");
             }
         }
 
@@ -2296,7 +2346,7 @@ private void rollbackShared()
                         break;
                     }
 
-                    Path rootPath = declaredIntentionToWrite.getRootPath();
+                    Location rootPath = declaredIntentionToWrite.getRootPath();
 
                     // In the case of DIRECT_TO_TARGET_NEW_DIRECTORY, if the directory is not guaranteed to be unique
                     // for the query, it is possible that another query or compute engine may see the directory, wrote
@@ -2304,19 +2354,19 @@ private void rollbackShared()
                     // directories must be carried out conservatively. To be safe, we only delete files that start or
                     // end with the query IDs in this transaction.
                     recursiveDeleteFilesAndLog(
-                            declaredIntentionToWrite.getHdfsContext(),
+                            declaredIntentionToWrite.getIdentity(),
                             rootPath,
                             ImmutableSet.of(declaredIntentionToWrite.getQueryId()),
                             true,
                             format("staging/target_new directory rollback for table %s", declaredIntentionToWrite.getSchemaTableName()));
                     break;
                 case DIRECT_TO_TARGET_EXISTING_DIRECTORY:
-                    Set<Path> pathsToClean = new HashSet<>();
+                    Set<Location> pathsToClean = new HashSet<>();
 
                     // Check the base directory of the declared intention
                     // * existing partition may also be in this directory
                     // * this is where new partitions are created
-                    Path baseDirectory = declaredIntentionToWrite.getRootPath();
+                    Location baseDirectory = declaredIntentionToWrite.getRootPath();
                     pathsToClean.add(baseDirectory);
 
                     SchemaTableName schemaTableName = declaredIntentionToWrite.getSchemaTableName();
@@ -2337,11 +2387,10 @@ private void rollbackShared()
                             for (List<String> partitionNameBatch : Iterables.partition(partitionNames, 10)) {
                                 Collection<Optional<Partition>> partitions = delegate.getPartitionsByNames(schemaTableName.getSchemaName(), schemaTableName.getTableName(), partitionNameBatch).values();
                                 partitions.stream()
-                                        .filter(Optional::isPresent)
-                                        .map(Optional::get)
+                                        .flatMap(Optional::stream)
                                         .map(partition -> partition.getStorage().getLocation())
-                                        .map(Path::new)
-                                        .filter(path -> !isSameOrParent(baseDirectory, path))
+                                        .filter(path -> !path.startsWith(baseDirectory.toString()))
+                                        .map(Location::of)
                                         .forEach(pathsToClean::add);
                             }
                         }
@@ -2354,11 +2403,10 @@ private void rollbackShared()
                     }
 
                     // delete any file that starts or ends with the query ID
-                    for (Path path : pathsToClean) {
-                        // TODO: It is a known deficiency that some empty directory does not get cleaned up in S3.
+                    for (Location path : pathsToClean) {
                         // We cannot delete any of the directories here since we do not know who created them.
                         recursiveDeleteFilesAndLog(
-                                declaredIntentionToWrite.getHdfsContext(),
+                                declaredIntentionToWrite.getIdentity(),
                                 path,
                                 ImmutableSet.of(declaredIntentionToWrite.getQueryId()),
                                 false,
@@ -2434,19 +2482,6 @@ private void checkNoPartitionAction(String databaseName, String tableName)
         }
     }
 
-    private static boolean isSameOrParent(Path parent, Path child)
-    {
-        int parentDepth = parent.depth();
-        int childDepth = child.depth();
-        if (parentDepth > childDepth) {
-            return false;
-        }
-        for (int i = childDepth; i > parentDepth; i--) {
-            child = child.getParent();
-        }
-        return parent.equals(child);
-    }
-
     @FormatMethod
     private void logCleanupFailure(String format, Object... args)
     {
@@ -2475,37 +2510,23 @@ private static void addSuppressedExceptions(List<Throwable> suppressedExceptions
     }
 
     private static void asyncRename(
-            HdfsEnvironment hdfsEnvironment,
+            TrinoFileSystem fileSystem,
             Executor executor,
             AtomicBoolean cancelled,
             List<CompletableFuture<?>> fileRenameFutures,
-            HdfsContext context,
-            Path currentPath,
-            Path targetPath,
+            Location currentPath,
+            Location targetPath,
             List<String> fileNames)
     {
-        FileSystem fileSystem;
-        try {
-            fileSystem = hdfsEnvironment.getFileSystem(context, currentPath);
-        }
-        catch (IOException e) {
-            throw new TrinoException(HIVE_FILESYSTEM_ERROR, format("Error moving data files to final location. Error listing directory %s", currentPath), e);
-        }
-
         for (String fileName : fileNames) {
-            Path source = new Path(currentPath, fileName);
-            Path target = new Path(targetPath, fileName);
+            Location source = currentPath.appendPath(fileName);
+            Location target = targetPath.appendPath(fileName);
             fileRenameFutures.add(CompletableFuture.runAsync(() -> {
                 if (cancelled.get()) {
                     return;
                 }
                 try {
-                    if (fileSystem.exists(target)) {
-                        throw new TrinoException(HIVE_FILESYSTEM_ERROR, format("Error moving data files from %s to final location %s: target location already exists", source, target));
-                    }
-                    if (!fileSystem.rename(source, target)) {
-                        throw new TrinoException(HIVE_FILESYSTEM_ERROR, format("Error moving data files from %s to final location %s: rename not successful", source, target));
-                    }
+                    fileSystem.renameFile(source, target);
                 }
                 catch (IOException e) {
                     throw new TrinoException(HIVE_FILESYSTEM_ERROR, format("Error moving data files from %s to final location %s", source, target), e);
@@ -2514,11 +2535,10 @@ private static void asyncRename(
         }
     }
 
-    private void recursiveDeleteFilesAndLog(HdfsContext context, Path directory, Set<String> queryIds, boolean deleteEmptyDirectories, String reason)
+    private void recursiveDeleteFilesAndLog(ConnectorIdentity identity, Location directory, Set<String> queryIds, boolean deleteEmptyDirectories, String reason)
     {
         RecursiveDeleteResult recursiveDeleteResult = recursiveDeleteFiles(
-                hdfsEnvironment,
-                context,
+                fileSystemFactory.create(identity),
                 directory,
                 queryIds,
                 deleteEmptyDirectories);
@@ -2552,13 +2572,10 @@ else if (deleteEmptyDirectories && !recursiveDeleteResult.isDirectoryNoLongerExi
      * @param queryIds prefix or suffix of files that should be deleted
      * @param deleteEmptyDirectories whether empty directories should be deleted
      */
-    private static RecursiveDeleteResult recursiveDeleteFiles(HdfsEnvironment hdfsEnvironment, HdfsContext context, Path directory, Set<String> queryIds, boolean deleteEmptyDirectories)
+    private static RecursiveDeleteResult recursiveDeleteFiles(TrinoFileSystem fileSystem, Location directory, Set<String> queryIds, boolean deleteEmptyDirectories)
     {
-        FileSystem fileSystem;
         try {
-            fileSystem = hdfsEnvironment.getFileSystem(context, directory);
-
-            if (!fileSystem.exists(directory)) {
+            if (!fileSystem.directoryExists(directory).orElse(false)) {
                 return new RecursiveDeleteResult(true, ImmutableList.of());
             }
         }
@@ -2571,16 +2588,30 @@ private static RecursiveDeleteResult recursiveDeleteFiles(HdfsEnvironment hdfsEn
         return doRecursiveDeleteFiles(fileSystem, directory, queryIds, deleteEmptyDirectories);
     }
 
-    private static RecursiveDeleteResult doRecursiveDeleteFiles(FileSystem fileSystem, Path directory, Set<String> queryIds, boolean deleteEmptyDirectories)
+    private static RecursiveDeleteResult doRecursiveDeleteFiles(TrinoFileSystem fileSystem, Location directory, Set<String> queryIds, boolean deleteEmptyDirectories)
     {
         // don't delete hidden Trino directories use by FileHiveMetastore
-        if (directory.getName().startsWith(".trino")) {
+        directory = asFileLocation(directory);
+        if (directory.fileName().startsWith(".trino")) {
             return new RecursiveDeleteResult(false, ImmutableList.of());
         }
 
-        FileStatus[] allFiles;
+        // TODO: this lists recursively but only uses the first level
+        List<Location> allFiles = new ArrayList<>();
+        Set<Location> allDirectories;
         try {
-            allFiles = fileSystem.listStatus(directory);
+            FileIterator iterator = fileSystem.listFiles(directory);
+            while (iterator.hasNext()) {
+                Location location = iterator.next().location();
+                String child = location.toString().substring(directory.toString().length());
+                while (child.startsWith("/")) {
+                    child = child.substring(1);
+                }
+                if (!child.contains("/")) {
+                    allFiles.add(location);
+                }
+            }
+            allDirectories = fileSystem.listDirectories(directory);
         }
         catch (IOException e) {
             ImmutableList.Builder<String> notDeletedItems = ImmutableList.builder();
@@ -2590,44 +2621,37 @@ private static RecursiveDeleteResult doRecursiveDeleteFiles(FileSystem fileSyste
 
         boolean allDescendentsDeleted = true;
         ImmutableList.Builder<String> notDeletedEligibleItems = ImmutableList.builder();
-        for (FileStatus fileStatus : allFiles) {
-            if (fileStatus.isFile()) {
-                Path filePath = fileStatus.getPath();
-                String fileName = filePath.getName();
-                boolean eligible = false;
-                // don't delete hidden Trino directories use by FileHiveMetastore
-                if (!fileName.startsWith(".trino")) {
-                    eligible = queryIds.stream().anyMatch(id -> isFileCreatedByQuery(fileName, id));
-                }
-                if (eligible) {
-                    if (!deleteIfExists(fileSystem, filePath, false)) {
-                        allDescendentsDeleted = false;
-                        notDeletedEligibleItems.add(filePath.toString());
-                    }
-                }
-                else {
+        for (Location file : allFiles) {
+            String fileName = file.fileName();
+            boolean eligible = false;
+            // don't delete hidden Trino directories use by FileHiveMetastore
+            if (!fileName.startsWith(".trino")) {
+                eligible = queryIds.stream().anyMatch(id -> isFileCreatedByQuery(fileName, id));
+            }
+            if (eligible) {
+                if (!deleteFileIfExists(fileSystem, file)) {
                     allDescendentsDeleted = false;
-                }
-            }
-            else if (fileStatus.isDirectory()) {
-                RecursiveDeleteResult subResult = doRecursiveDeleteFiles(fileSystem, fileStatus.getPath(), queryIds, deleteEmptyDirectories);
-                if (!subResult.isDirectoryNoLongerExists()) {
-                    allDescendentsDeleted = false;
-                }
-                if (!subResult.getNotDeletedEligibleItems().isEmpty()) {
-                    notDeletedEligibleItems.addAll(subResult.getNotDeletedEligibleItems());
+                    notDeletedEligibleItems.add(file.toString());
                 }
             }
             else {
                 allDescendentsDeleted = false;
-                notDeletedEligibleItems.add(fileStatus.getPath().toString());
+            }
+        }
+        for (Location file : allDirectories) {
+            RecursiveDeleteResult subResult = doRecursiveDeleteFiles(fileSystem, file, queryIds, deleteEmptyDirectories);
+            if (!subResult.isDirectoryNoLongerExists()) {
+                allDescendentsDeleted = false;
+            }
+            if (!subResult.getNotDeletedEligibleItems().isEmpty()) {
+                notDeletedEligibleItems.addAll(subResult.getNotDeletedEligibleItems());
             }
         }
         // Unconditionally delete empty delta_ and delete_delta_ directories, because that's
         // what Hive does, and leaving them in place confuses delta file readers.
-        if (allDescendentsDeleted && (deleteEmptyDirectories || DELTA_DIRECTORY_MATCHER.matcher(directory.getName()).matches())) {
+        if (allDescendentsDeleted && (deleteEmptyDirectories || isDeltaDirectory(directory))) {
             verify(notDeletedEligibleItems.build().isEmpty());
-            if (!deleteIfExists(fileSystem, directory, false)) {
+            if (!deleteEmptyDirectoryIfExists(fileSystem, directory)) {
                 return new RecursiveDeleteResult(false, ImmutableList.of(directory + "/"));
             }
             return new RecursiveDeleteResult(true, ImmutableList.of());
@@ -2635,59 +2659,54 @@ else if (fileStatus.isDirectory()) {
         return new RecursiveDeleteResult(false, notDeletedEligibleItems.build());
     }
 
-    /**
-     * Attempts to remove the file or empty directory.
-     *
-     * @return true if the location no longer exists
-     */
-    private static boolean deleteIfExists(FileSystem fileSystem, Path path, boolean recursive)
+    private static boolean isDeltaDirectory(Location directory)
     {
-        try {
-            // attempt to delete the path
-            if (fileSystem.delete(path, recursive)) {
-                return true;
-            }
+        return DELTA_DIRECTORY_MATCHER.matcher(asFileLocation(directory).fileName()).matches();
+    }
 
-            // delete failed
-            // check if path still exists
-            return !fileSystem.exists(path);
+    private static boolean deleteFileIfExists(TrinoFileSystem fileSystem, Location location)
+    {
+        try {
+            fileSystem.deleteFile(location);
+            return true;
         }
-        catch (FileNotFoundException ignored) {
-            // path was already removed or never existed
+        catch (FileNotFoundException e) {
             return true;
         }
-        catch (IOException ignored) {
+        catch (IOException e) {
+            return false;
         }
-        return false;
     }
 
-    /**
-     * Attempts to remove the file or empty directory.
-     *
-     * @return true if the location no longer exists
-     */
-    private static boolean deleteRecursivelyIfExists(HdfsContext context, HdfsEnvironment hdfsEnvironment, Path path)
+    private static boolean deleteEmptyDirectoryIfExists(TrinoFileSystem fileSystem, Location location)
     {
-        FileSystem fileSystem;
         try {
-            fileSystem = hdfsEnvironment.getFileSystem(context, path);
+            if (fileSystem.listFiles(location).hasNext()) {
+                log.warn("Not deleting non-empty directory: %s", location);
+                return false;
+            }
+            fileSystem.deleteDirectory(location);
+            return true;
         }
-        catch (IOException ignored) {
-            return false;
+        catch (IOException e) {
+            try {
+                return !fileSystem.directoryExists(location).orElse(false);
+            }
+            catch (IOException ex) {
+                return false;
+            }
         }
-
-        return deleteIfExists(fileSystem, path, true);
     }
 
-    private static void renameDirectory(HdfsContext context, HdfsEnvironment hdfsEnvironment, Path source, Path target, Runnable runWhenPathDoesntExist)
+    private static void renameDirectory(TrinoFileSystem fileSystem, Location source, Location target, Runnable runWhenPathDoesntExist)
     {
-        if (pathExists(context, hdfsEnvironment, target)) {
-            throw new TrinoException(HIVE_PATH_ALREADY_EXISTS,
-                    format("Unable to rename from %s to %s: target directory already exists", source, target));
+        if (directoryExists(fileSystem, target)) {
+            throw new TrinoException(HIVE_PATH_ALREADY_EXISTS, format("Unable to rename from %s to %s: target directory already exists", source, target));
         }
 
-        if (!pathExists(context, hdfsEnvironment, target.getParent())) {
-            createDirectory(context, hdfsEnvironment, target.getParent());
+        Location parent = asFileLocation(target).parentDirectory();
+        if (!directoryExists(fileSystem, parent)) {
+            createDirectory(fileSystem, parent);
         }
 
         // The runnable will assume that if rename fails, it will be okay to delete the directory (if the directory is empty).
@@ -2695,15 +2714,33 @@ private static void renameDirectory(HdfsContext context, HdfsEnvironment hdfsEnv
         runWhenPathDoesntExist.run();
 
         try {
-            if (!hdfsEnvironment.getFileSystem(context, source).rename(source, target)) {
-                throw new TrinoException(HIVE_FILESYSTEM_ERROR, format("Failed to rename %s to %s: rename returned false", source, target));
-            }
+            fileSystem.renameDirectory(source, target);
         }
         catch (IOException e) {
             throw new TrinoException(HIVE_FILESYSTEM_ERROR, format("Failed to rename %s to %s", source, target), e);
         }
     }
 
+    private static void createDirectory(TrinoFileSystem fileSystem, Location directory)
+    {
+        try {
+            fileSystem.createDirectory(directory);
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_FILESYSTEM_ERROR, e);
+        }
+    }
+
+    private static boolean directoryExists(TrinoFileSystem fileSystem, Location directory)
+    {
+        try {
+            return fileSystem.directoryExists(directory).orElse(false);
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_FILESYSTEM_ERROR, e);
+        }
+    }
+
     private static Optional<String> getQueryId(Database database)
     {
         return Optional.ofNullable(database.getParameters().get(PRESTO_QUERY_ID_NAME));
@@ -2719,6 +2756,16 @@ private static Optional<String> getQueryId(Partition partition)
         return Optional.ofNullable(partition.getParameters().get(PRESTO_QUERY_ID_NAME));
     }
 
+    private static Location asFileLocation(Location location)
+    {
+        // TODO: this is to work around the file-only restriction of Location methods
+        String value = location.toString();
+        while (value.endsWith("/")) {
+            value = value.substring(0, value.length() - 1);
+        }
+        return Location.of(value);
+    }
+
     private void checkHoldsLock()
     {
         // This method serves a similar purpose at runtime as GuardedBy on method serves during static analysis.
@@ -2758,10 +2805,10 @@ public static class Action<T>
     {
         private final ActionType type;
         private final T data;
-        private final HdfsContext hdfsContext;
+        private final ConnectorIdentity identity;
         private final String queryId;
 
-        public Action(ActionType type, T data, HdfsContext hdfsContext, String queryId)
+        public Action(ActionType type, T data, ConnectorIdentity identity, String queryId)
         {
             this.type = requireNonNull(type, "type is null");
             if (type == ActionType.DROP || type == ActionType.DROP_PRESERVE_DATA) {
@@ -2771,7 +2818,7 @@ public Action(ActionType type, T data, HdfsContext hdfsContext, String queryId)
                 requireNonNull(data, "data is null");
             }
             this.data = data;
-            this.hdfsContext = requireNonNull(hdfsContext, "hdfsContext is null");
+            this.identity = requireNonNull(identity, "identity is null");
             this.queryId = requireNonNull(queryId, "queryId is null");
         }
 
@@ -2786,9 +2833,9 @@ public T getData()
             return data;
         }
 
-        public HdfsContext getHdfsContext()
+        public ConnectorIdentity getIdentity()
         {
-            return hdfsContext;
+            return identity;
         }
 
         public String getQueryId()
@@ -2811,7 +2858,7 @@ private static class TableAndMore
     {
         private final Table table;
         private final Optional<PrincipalPrivileges> principalPrivileges;
-        private final Optional<Path> currentLocation; // unpartitioned table only
+        private final Optional<Location> currentLocation; // unpartitioned table only
         private final Optional<List<String>> fileNames;
         private final boolean ignoreExisting;
         private final PartitionStatistics statistics;
@@ -2821,7 +2868,7 @@ private static class TableAndMore
         public TableAndMore(
                 Table table,
                 Optional<PrincipalPrivileges> principalPrivileges,
-                Optional<Path> currentLocation,
+                Optional<Location> currentLocation,
                 Optional<List<String>> fileNames,
                 boolean ignoreExisting,
                 PartitionStatistics statistics,
@@ -2857,7 +2904,7 @@ public PrincipalPrivileges getPrincipalPrivileges()
             return principalPrivileges.get();
         }
 
-        public Optional<Path> getCurrentLocation()
+        public Optional<Location> getCurrentLocation()
         {
             return currentLocation;
         }
@@ -2904,7 +2951,7 @@ private static class TableAndMergeResults
         private final List<PartitionUpdateAndMergeResults> partitionMergeResults;
         private final List<Partition> partitions;
 
-        public TableAndMergeResults(Table table, Optional<PrincipalPrivileges> principalPrivileges, Optional<Path> currentLocation, List<PartitionUpdateAndMergeResults> partitionMergeResults, List<Partition> partitions)
+        public TableAndMergeResults(Table table, Optional<PrincipalPrivileges> principalPrivileges, Optional<Location> currentLocation, List<PartitionUpdateAndMergeResults> partitionMergeResults, List<Partition> partitions)
         {
             super(table, principalPrivileges, currentLocation, Optional.empty(), false, PartitionStatistics.empty(), PartitionStatistics.empty(), false); // retries are not supported for transactional tables
             this.partitionMergeResults = requireNonNull(partitionMergeResults, "partitionMergeResults is null");
@@ -2932,13 +2979,13 @@ public String toString()
     private static class PartitionAndMore
     {
         private final Partition partition;
-        private final Path currentLocation;
+        private final Location currentLocation;
         private final Optional<List<String>> fileNames;
         private final PartitionStatistics statistics;
         private final PartitionStatistics statisticsUpdate;
         private final boolean cleanExtraOutputFilesOnCommit;
 
-        public PartitionAndMore(Partition partition, Path currentLocation, Optional<List<String>> fileNames, PartitionStatistics statistics, PartitionStatistics statisticsUpdate, boolean cleanExtraOutputFilesOnCommit)
+        public PartitionAndMore(Partition partition, Location currentLocation, Optional<List<String>> fileNames, PartitionStatistics statistics, PartitionStatistics statisticsUpdate, boolean cleanExtraOutputFilesOnCommit)
         {
             this.partition = requireNonNull(partition, "partition is null");
             this.currentLocation = requireNonNull(currentLocation, "currentLocation is null");
@@ -2953,7 +3000,7 @@ public Partition getPartition()
             return partition;
         }
 
-        public Path getCurrentLocation()
+        public Location getCurrentLocation()
         {
             return currentLocation;
         }
@@ -3015,16 +3062,16 @@ private static class DeclaredIntentionToWrite
     {
         private final String declarationId;
         private final WriteMode mode;
-        private final HdfsContext hdfsContext;
+        private final ConnectorIdentity identity;
         private final String queryId;
-        private final Path rootPath;
+        private final Location rootPath;
         private final SchemaTableName schemaTableName;
 
-        public DeclaredIntentionToWrite(String declarationId, WriteMode mode, HdfsContext hdfsContext, String queryId, Path stagingPathRoot, SchemaTableName schemaTableName)
+        public DeclaredIntentionToWrite(String declarationId, WriteMode mode, ConnectorIdentity identity, String queryId, Location stagingPathRoot, SchemaTableName schemaTableName)
         {
             this.declarationId = requireNonNull(declarationId, "declarationId is null");
             this.mode = requireNonNull(mode, "mode is null");
-            this.hdfsContext = requireNonNull(hdfsContext, "hdfsContext is null");
+            this.identity = requireNonNull(identity, "identity is null");
             this.queryId = requireNonNull(queryId, "queryId is null");
             this.rootPath = requireNonNull(stagingPathRoot, "stagingPathRoot is null");
             this.schemaTableName = requireNonNull(schemaTableName, "schemaTableName is null");
@@ -3040,9 +3087,9 @@ public WriteMode getMode()
             return mode;
         }
 
-        public HdfsContext getHdfsContext()
+        public ConnectorIdentity getIdentity()
         {
-            return hdfsContext;
+            return identity;
         }
 
         public String getQueryId()
@@ -3050,7 +3097,7 @@ public String getQueryId()
             return queryId;
         }
 
-        public Path getRootPath()
+        public Location getRootPath()
         {
             return rootPath;
         }
@@ -3065,7 +3112,7 @@ public String toString()
         {
             return toStringHelper(this)
                     .add("mode", mode)
-                    .add("hdfsContext", hdfsContext)
+                    .add("identity", identity)
                     .add("queryId", queryId)
                     .add("rootPath", rootPath)
                     .add("schemaTableName", schemaTableName)
@@ -3073,112 +3120,31 @@ public String toString()
         }
     }
 
-    private static class DirectoryCleanUpTask
+    private record DirectoryCleanUpTask(ConnectorIdentity identity, Location location, boolean deleteEmptyDirectory)
     {
-        private final HdfsContext context;
-        private final Path path;
-        private final boolean deleteEmptyDirectory;
-
-        public DirectoryCleanUpTask(HdfsContext context, Path path, boolean deleteEmptyDirectory)
-        {
-            this.context = context;
-            this.path = path;
-            this.deleteEmptyDirectory = deleteEmptyDirectory;
-        }
-
-        public HdfsContext getContext()
-        {
-            return context;
-        }
-
-        public Path getPath()
-        {
-            return path;
-        }
-
-        public boolean isDeleteEmptyDirectory()
-        {
-            return deleteEmptyDirectory;
-        }
-
-        @Override
-        public String toString()
+        public DirectoryCleanUpTask
         {
-            return toStringHelper(this)
-                    .add("context", context)
-                    .add("path", path)
-                    .add("deleteEmptyDirectory", deleteEmptyDirectory)
-                    .toString();
+            requireNonNull(identity, "identity is null");
+            requireNonNull(location, "location is null");
         }
     }
 
-    private static class DirectoryDeletionTask
+    private record DirectoryDeletionTask(ConnectorIdentity identity, Location location)
     {
-        private final HdfsContext context;
-        private final Path path;
-
-        public DirectoryDeletionTask(HdfsContext context, Path path)
-        {
-            this.context = context;
-            this.path = path;
-        }
-
-        public HdfsContext getContext()
-        {
-            return context;
-        }
-
-        public Path getPath()
-        {
-            return path;
-        }
-
-        @Override
-        public String toString()
+        public DirectoryDeletionTask
         {
-            return toStringHelper(this)
-                    .add("context", context)
-                    .add("path", path)
-                    .toString();
+            requireNonNull(identity, "identity is null");
+            requireNonNull(location, "location is null");
         }
     }
 
-    private static class DirectoryRenameTask
+    private record DirectoryRenameTask(ConnectorIdentity identity, Location renameFrom, Location renameTo)
     {
-        private final HdfsContext context;
-        private final Path renameFrom;
-        private final Path renameTo;
-
-        public DirectoryRenameTask(HdfsContext context, Path renameFrom, Path renameTo)
-        {
-            this.context = requireNonNull(context, "context is null");
-            this.renameFrom = requireNonNull(renameFrom, "renameFrom is null");
-            this.renameTo = requireNonNull(renameTo, "renameTo is null");
-        }
-
-        public HdfsContext getContext()
-        {
-            return context;
-        }
-
-        public Path getRenameFrom()
+        public DirectoryRenameTask
         {
-            return renameFrom;
-        }
-
-        public Path getRenameTo()
-        {
-            return renameTo;
-        }
-
-        @Override
-        public String toString()
-        {
-            return toStringHelper(this)
-                    .add("context", context)
-                    .add("renameFrom", renameFrom)
-                    .add("renameTo", renameTo)
-                    .toString();
+            requireNonNull(identity, "identity is null");
+            requireNonNull(renameFrom, "renameFrom is null");
+            requireNonNull(renameTo, "renameTo is null");
         }
     }
 
@@ -3274,7 +3240,7 @@ public void run(HiveMetastoreClosure metastore, AcidTransaction transaction)
             }
             tableCreated = true;
 
-            if (created && !isPrestoView(newTable)) {
+            if (created && !isTrinoView(newTable) && !isTrinoMaterializedView(newTable)) {
                 metastore.updateTableStatistics(newTable.getDatabaseName(), newTable.getTableName(), transaction, ignored -> statistics);
             }
         }
@@ -3586,7 +3552,7 @@ public List<String> getNotDeletedEligibleItems()
 
     private interface ExclusiveOperation
     {
-        void execute(HiveMetastoreClosure delegate, HdfsEnvironment hdfsEnvironment);
+        void execute(HiveMetastoreClosure delegate);
     }
 
     private long allocateWriteId(String dbName, String tableName, long transactionId)
@@ -3626,49 +3592,27 @@ public void commitTransaction(long transactionId)
         delegate.commitTransaction(transactionId);
     }
 
-    public static void cleanExtraOutputFiles(HdfsEnvironment hdfsEnvironment, HdfsContext hdfsContext, String queryId, Path path, Set<String> filesToKeep)
+    public static void cleanExtraOutputFiles(TrinoFileSystem fileSystem, String queryId, Location path, Set<String> filesToKeep)
     {
-        List<String> filesToDelete = new LinkedList<>();
+        List<Location> filesToDelete = new ArrayList<>();
         try {
-            log.debug("Deleting failed attempt files from %s for query %s", path, queryId);
-            FileSystem fileSystem = hdfsEnvironment.getFileSystem(hdfsContext, path);
-            if (!fileSystem.exists(path)) {
-                // directory may nat exit if no files were actually written
-                return;
-            }
-
-            // files are written flat in a single directory so we do not need to list recursively
-            RemoteIterator<LocatedFileStatus> iterator = fileSystem.listFiles(path, false);
-            while (iterator.hasNext()) {
-                Path file = iterator.next().getPath();
-                if (isFileCreatedByQuery(file.getName(), queryId) && !filesToKeep.contains(file.getName())) {
-                    filesToDelete.add(file.getName());
+            Failsafe.with(DELETE_RETRY_POLICY).run(() -> {
+                log.debug("Deleting failed attempt files from %s for query %s", path, queryId);
+
+                filesToDelete.clear();
+                FileIterator iterator = fileSystem.listFiles(path);
+                while (iterator.hasNext()) {
+                    Location file = iterator.next().location();
+                    if (isFileCreatedByQuery(file.fileName(), queryId) && !filesToKeep.contains(file.fileName())) {
+                        filesToDelete.add(file);
+                    }
                 }
-            }
-
-            ImmutableList.Builder<String> deletedFilesBuilder = ImmutableList.builder();
-            Iterator<String> filesToDeleteIterator = filesToDelete.iterator();
-            while (filesToDeleteIterator.hasNext()) {
-                String fileName = filesToDeleteIterator.next();
-                Path filePath = new Path(path, fileName);
-                log.debug("Deleting failed attempt file %s for query %s", filePath, queryId);
-                DELETE_RETRY.run("delete " + filePath, () -> {
-                    checkedDelete(fileSystem, filePath, false);
-                    return null;
-                });
-                deletedFilesBuilder.add(fileName);
-                filesToDeleteIterator.remove();
-            }
 
-            List<String> deletedFiles = deletedFilesBuilder.build();
-            if (!deletedFiles.isEmpty()) {
-                log.info("Deleted failed attempt files %s from %s for query %s", deletedFiles, path, queryId);
-            }
+                log.debug("Found %s failed attempt file(s) to delete for query %s", filesToDelete.size(), queryId);
+                fileSystem.deleteFiles(filesToDelete);
+            });
         }
-        catch (Exception e) {
-            if (e instanceof InterruptedException) {
-                Thread.currentThread().interrupt();
-            }
+        catch (FailsafeException e) {
             // If we fail here query will be rolled back. The optimal outcome would be for rollback to complete successfully and clean up everything for query.
             // Yet if we have problem here, probably rollback will also fail.
             //
@@ -3685,14 +3629,14 @@ public static void cleanExtraOutputFiles(HdfsEnvironment hdfsEnvironment, HdfsCo
         }
     }
 
-    public record PartitionUpdateInfo(List<String> partitionValues, Path currentLocation, List<String> fileNames, PartitionStatistics statisticsUpdate)
+    public record PartitionUpdateInfo(List<String> partitionValues, Location currentLocation, List<String> fileNames, PartitionStatistics statisticsUpdate)
     {
-        public PartitionUpdateInfo(List<String> partitionValues, Path currentLocation, List<String> fileNames, PartitionStatistics statisticsUpdate)
+        public PartitionUpdateInfo
         {
-            this.partitionValues = requireNonNull(partitionValues, "partitionValues is null");
-            this.currentLocation = requireNonNull(currentLocation, "currentLocation is null");
-            this.fileNames = requireNonNull(fileNames, "fileNames is null");
-            this.statisticsUpdate = requireNonNull(statisticsUpdate, "statisticsUpdate is null");
+            requireNonNull(partitionValues, "partitionValues is null");
+            requireNonNull(currentLocation, "currentLocation is null");
+            requireNonNull(fileNames, "fileNames is null");
+            requireNonNull(statisticsUpdate, "statisticsUpdate is null");
         }
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/SortingColumn.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/SortingColumn.java
index ce27bc094dfa..350475c15055 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/SortingColumn.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/SortingColumn.java
@@ -15,11 +15,10 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.SortOrder;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Locale;
 import java.util.Objects;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Storage.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Storage.java
index 8e42a3689048..824bc13ec766 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Storage.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Storage.java
@@ -16,10 +16,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.plugin.hive.HiveBucketProperty;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/StorageFormat.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/StorageFormat.java
index d87f0ddf9d0d..dc6834a04458 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/StorageFormat.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/StorageFormat.java
@@ -15,11 +15,10 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.plugin.hive.HiveStorageFormat;
 import io.trino.spi.TrinoException;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Objects;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Table.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Table.java
index 601846b56b1c..ba48867d8f7c 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Table.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Table.java
@@ -19,10 +19,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.connector.SchemaTableName;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -32,6 +31,7 @@
 import java.util.OptionalLong;
 import java.util.Set;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.stream.Stream;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
@@ -328,6 +328,17 @@ public Builder setParameter(String key, String value)
             return this;
         }
 
+        public Builder setParameter(String key, Optional<String> value)
+        {
+            if (value.isEmpty()) {
+                this.parameters.remove(key);
+            }
+            else {
+                this.parameters.put(key, value.get());
+            }
+            return this;
+        }
+
         public Builder setViewOriginalText(Optional<String> viewOriginalText)
         {
             this.viewOriginalText = viewOriginalText;
@@ -352,6 +363,11 @@ public Builder withStorage(Consumer<Storage.Builder> consumer)
             return this;
         }
 
+        public Builder apply(Function<Builder, Builder> function)
+        {
+            return function.apply(this);
+        }
+
         public Table build()
         {
             return new Table(
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/TablesWithParameterCacheKey.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/TablesWithParameterCacheKey.java
index e400473a5877..b7459209a706 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/TablesWithParameterCacheKey.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/TablesWithParameterCacheKey.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/UserDatabaseKey.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/UserDatabaseKey.java
index 534ed1e12b90..d25645aa5e0f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/UserDatabaseKey.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/UserDatabaseKey.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/UserTableKey.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/UserTableKey.java
index 8176f0b8bb9d..09210d39647f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/UserTableKey.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/UserTableKey.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/AlluxioHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/AlluxioHiveMetastore.java
deleted file mode 100644
index 4b2656678c67..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/AlluxioHiveMetastore.java
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.metastore.alluxio;
-
-import alluxio.client.table.TableMasterClient;
-import alluxio.exception.status.AlluxioStatusException;
-import alluxio.exception.status.NotFoundException;
-import alluxio.grpc.table.ColumnStatisticsInfo;
-import alluxio.grpc.table.Constraint;
-import alluxio.grpc.table.TableInfo;
-import alluxio.grpc.table.layout.hive.PartitionInfo;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import io.trino.plugin.hive.HiveBasicStatistics;
-import io.trino.plugin.hive.HiveColumnStatisticType;
-import io.trino.plugin.hive.HiveType;
-import io.trino.plugin.hive.PartitionStatistics;
-import io.trino.plugin.hive.acid.AcidTransaction;
-import io.trino.plugin.hive.metastore.Column;
-import io.trino.plugin.hive.metastore.Database;
-import io.trino.plugin.hive.metastore.HiveColumnStatistics;
-import io.trino.plugin.hive.metastore.HiveMetastore;
-import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
-import io.trino.plugin.hive.metastore.HivePrincipal;
-import io.trino.plugin.hive.metastore.HivePrivilegeInfo;
-import io.trino.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege;
-import io.trino.plugin.hive.metastore.Partition;
-import io.trino.plugin.hive.metastore.PartitionWithStatistics;
-import io.trino.plugin.hive.metastore.PrincipalPrivileges;
-import io.trino.plugin.hive.metastore.Table;
-import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil;
-import io.trino.spi.TrinoException;
-import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.security.RoleGrant;
-import io.trino.spi.type.Type;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.OptionalLong;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_METASTORE_ERROR;
-import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.getHiveBasicStatistics;
-import static io.trino.plugin.hive.util.HiveUtil.makePartName;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static java.util.Objects.requireNonNull;
-
-/**
- * Implementation of the {@link HiveMetastore} interface through Alluxio.
- */
-public class AlluxioHiveMetastore
-        implements HiveMetastore
-{
-    private final TableMasterClient client;
-
-    public AlluxioHiveMetastore(TableMasterClient client, HiveMetastoreConfig hiveMetastoreConfig)
-    {
-        this.client = requireNonNull(client, "client is null");
-        checkArgument(!hiveMetastoreConfig.isHideDeltaLakeTables(), "Hiding Delta Lake tables is not supported"); // TODO
-    }
-
-    @Override
-    public Optional<Database> getDatabase(String databaseName)
-    {
-        try {
-            return Optional.of(ProtoUtils.fromProto(client.getDatabase(databaseName)));
-        }
-        catch (AlluxioStatusException e) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, e);
-        }
-    }
-
-    @Override
-    public List<String> getAllDatabases()
-    {
-        try {
-            return client.getAllDatabases();
-        }
-        catch (AlluxioStatusException e) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, e);
-        }
-    }
-
-    @Override
-    public Optional<Table> getTable(String databaseName, String tableName)
-    {
-        try {
-            return Optional.of(ProtoUtils.fromProto(client.getTable(databaseName, tableName)));
-        }
-        catch (NotFoundException e) {
-            return Optional.empty();
-        }
-        catch (AlluxioStatusException e) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, e);
-        }
-    }
-
-    @Override
-    public Set<HiveColumnStatisticType> getSupportedColumnStatistics(Type type)
-    {
-        return ThriftMetastoreUtil.getSupportedColumnStatistics(type);
-    }
-
-    private Map<String, HiveColumnStatistics> groupStatisticsByColumn(List<ColumnStatisticsInfo> statistics, OptionalLong rowCount)
-    {
-        return statistics.stream()
-                .collect(toImmutableMap(ColumnStatisticsInfo::getColName, statisticsObj -> ProtoUtils.fromProto(statisticsObj.getData(), rowCount)));
-    }
-
-    @Override
-    public PartitionStatistics getTableStatistics(Table table)
-    {
-        try {
-            HiveBasicStatistics basicStats = ThriftMetastoreUtil.getHiveBasicStatistics(table.getParameters());
-            List<Column> columns = new ArrayList<>(table.getPartitionColumns());
-            columns.addAll(table.getDataColumns());
-            List<String> columnNames = columns.stream().map(Column::getName).collect(Collectors.toList());
-            List<ColumnStatisticsInfo> colStatsList = client.getTableColumnStatistics(table.getDatabaseName(), table.getTableName(), columnNames);
-            return new PartitionStatistics(basicStats, groupStatisticsByColumn(colStatsList, basicStats.getRowCount()));
-        }
-        catch (Exception e) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, e);
-        }
-    }
-
-    @Override
-    public Map<String, PartitionStatistics> getPartitionStatistics(Table table, List<Partition> partitions)
-    {
-        try {
-            List<String> dataColumns = table.getDataColumns().stream()
-                    .map(Column::getName)
-                    .collect(toImmutableList());
-            List<String> partitionColumns = table.getPartitionColumns().stream()
-                    .map(Column::getName)
-                    .collect(toImmutableList());
-
-            Map<String, HiveBasicStatistics> partitionBasicStatistics = partitions.stream()
-                    .collect(toImmutableMap(
-                            partition -> makePartName(partitionColumns, partition.getValues()),
-                            partition -> getHiveBasicStatistics(partition.getParameters())));
-            Map<String, OptionalLong> partitionRowCounts = partitionBasicStatistics.entrySet().stream()
-                    .collect(toImmutableMap(Map.Entry::getKey, entry -> entry.getValue().getRowCount()));
-
-            Map<String, List<ColumnStatisticsInfo>> colStatsMap = client.getPartitionColumnStatistics(table.getDatabaseName(), table.getTableName(),
-                    ImmutableList.copyOf(partitionBasicStatistics.keySet()), dataColumns);
-            Map<String, Map<String, HiveColumnStatistics>> partitionColumnStatistics = colStatsMap.entrySet().stream()
-                    .filter(entry -> !entry.getValue().isEmpty())
-                    .collect(toImmutableMap(
-                            Map.Entry::getKey,
-                            entry -> groupStatisticsByColumn(entry.getValue(), partitionRowCounts.getOrDefault(entry.getKey(), OptionalLong.empty()))));
-            ImmutableMap.Builder<String, PartitionStatistics> result = ImmutableMap.builder();
-            for (String partitionName : partitionBasicStatistics.keySet()) {
-                HiveBasicStatistics basicStatistics = partitionBasicStatistics.get(partitionName);
-                Map<String, HiveColumnStatistics> columnStatistics = partitionColumnStatistics.getOrDefault(partitionName, ImmutableMap.of());
-                result.put(partitionName, new PartitionStatistics(basicStatistics, columnStatistics));
-            }
-            return result.buildOrThrow();
-        }
-        catch (Exception e) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, e);
-        }
-    }
-
-    @Override
-    public void updateTableStatistics(
-            String databaseName,
-            String tableName,
-            AcidTransaction transaction,
-            Function<PartitionStatistics, PartitionStatistics> update)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "updateTableStatistics");
-    }
-
-    @Override
-    public void updatePartitionStatistics(
-            Table table,
-            Map<String, Function<PartitionStatistics, PartitionStatistics>> updates)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "updatePartitionStatistics");
-    }
-
-    @Override
-    public List<String> getAllTables(String databaseName)
-    {
-        try {
-            return client.getAllTables(databaseName);
-        }
-        catch (NotFoundException e) {
-            return new ArrayList<>(0);
-        }
-        catch (AlluxioStatusException e) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, e);
-        }
-    }
-
-    @Override
-    public List<String> getTablesWithParameter(
-            String databaseName,
-            String parameterKey,
-            String parameterValue)
-    {
-        try {
-            return client.getAllTables(databaseName).stream()
-                    .filter(tableName -> {
-                        // TODO Is there a way to do a bulk RPC?
-                        try {
-                            TableInfo table = client.getTable(databaseName, tableName);
-                            if (table == null) {
-                                return false;
-                            }
-                            String value = table.getParametersMap().get(parameterKey);
-                            return value != null && value.equals(parameterValue);
-                        }
-                        catch (AlluxioStatusException e) {
-                            throw new TrinoException(HIVE_METASTORE_ERROR, "Failed to get info for table: " + tableName, e);
-                        }
-                    })
-                    .collect(Collectors.toList());
-        }
-        catch (AlluxioStatusException e) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, e);
-        }
-    }
-
-    @Override
-    public List<String> getAllViews(String databaseName)
-    {
-        // TODO: Add views on the server side
-        return Collections.emptyList();
-    }
-
-    @Override
-    public void createDatabase(Database database)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "createDatabase");
-    }
-
-    @Override
-    public void dropDatabase(String databaseName, boolean deleteData)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "dropDatabase");
-    }
-
-    @Override
-    public void renameDatabase(String databaseName, String newDatabaseName)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "renameDatabase");
-    }
-
-    @Override
-    public void setDatabaseOwner(String databaseName, HivePrincipal principal)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "setDatabaseOwner");
-    }
-
-    @Override
-    public void createTable(Table table, PrincipalPrivileges principalPrivileges)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "createTable");
-    }
-
-    @Override
-    public void dropTable(String databaseName, String tableName, boolean deleteData)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "dropTable");
-    }
-
-    @Override
-    public void replaceTable(String databaseName, String tableName, Table newTable,
-            PrincipalPrivileges principalPrivileges)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "replaceTable");
-    }
-
-    @Override
-    public void renameTable(String databaseName, String tableName, String newDatabaseName,
-            String newTableName)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "renameTable");
-    }
-
-    @Override
-    public void commentTable(String databaseName, String tableName, Optional<String> comment)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "commentTable");
-    }
-
-    @Override
-    public void setTableOwner(String databaseName, String tableName, HivePrincipal principal)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "setTableOwner");
-    }
-
-    @Override
-    public void commentColumn(String databaseName, String tableName, String columnName, Optional<String> comment)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "commentColumn");
-    }
-
-    @Override
-    public void addColumn(String databaseName, String tableName, String columnName,
-            HiveType columnType, String columnComment)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "addColumn");
-    }
-
-    @Override
-    public void renameColumn(String databaseName, String tableName, String oldColumnName,
-            String newColumnName)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "renameColumn");
-    }
-
-    @Override
-    public void dropColumn(String databaseName, String tableName, String columnName)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "dropColumn");
-    }
-
-    @Override
-    public Optional<Partition> getPartition(Table table, List<String> partitionValues)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "getPartition");
-    }
-
-    @Override
-    public Optional<List<String>> getPartitionNamesByFilter(
-            String databaseName,
-            String tableName,
-            List<String> columnNames,
-            TupleDomain<String> partitionKeysFilter)
-    {
-        try {
-            List<PartitionInfo> partitionInfos = ProtoUtils.toPartitionInfoList(
-                    client.readTable(databaseName, tableName, Constraint.getDefaultInstance()));
-            List<String> partitionNames = partitionInfos.stream()
-                    .map(PartitionInfo::getPartitionName)
-                    .collect(Collectors.toList());
-            return Optional.of(partitionNames);
-        }
-        catch (AlluxioStatusException e) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, e);
-        }
-    }
-
-    @Override
-    public Map<String, Optional<Partition>> getPartitionsByNames(Table table, List<String> partitionNames)
-    {
-        if (partitionNames.isEmpty()) {
-            return Collections.emptyMap();
-        }
-        String databaseName = table.getDatabaseName();
-        String tableName = table.getTableName();
-
-        try {
-            // Get all partitions
-            List<PartitionInfo> partitionInfos = ProtoUtils.toPartitionInfoList(
-                    client.readTable(databaseName, tableName, Constraint.getDefaultInstance()));
-            // Check that table name is correct
-            // TODO also check for database name equality
-            partitionInfos = partitionInfos.stream()
-                    .filter(partition -> partition.getTableName().equals(tableName))
-                    .collect(Collectors.toList());
-            Map<String, Optional<Partition>> result = partitionInfos.stream()
-                    .filter(partitionName -> partitionNames.stream()
-                            .anyMatch(partitionName.getPartitionName()::equals))
-                    .collect(Collectors.toMap(
-                            PartitionInfo::getPartitionName,
-                            partitionInfo -> Optional.of(ProtoUtils.fromProto(partitionInfo))));
-            return Collections.unmodifiableMap(result);
-        }
-        catch (AlluxioStatusException e) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, e);
-        }
-    }
-
-    @Override
-    public void addPartitions(String databaseName, String tableName,
-            List<PartitionWithStatistics> partitions)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "addPartitions");
-    }
-
-    @Override
-    public void dropPartition(String databaseName, String tableName, List<String> parts,
-            boolean deleteData)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "dropPartition");
-    }
-
-    @Override
-    public void alterPartition(String databaseName, String tableName,
-            PartitionWithStatistics partition)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "alterPartition");
-    }
-
-    @Override
-    public void createRole(String role, String grantor)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "createRole");
-    }
-
-    @Override
-    public void dropRole(String role)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "dropRole");
-    }
-
-    @Override
-    public Set<String> listRoles()
-    {
-        throw new TrinoException(NOT_SUPPORTED, "listRoles");
-    }
-
-    @Override
-    public void grantRoles(Set<String> roles, Set<HivePrincipal> grantees, boolean withAdminOption,
-            HivePrincipal grantor)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "grantRoles");
-    }
-
-    @Override
-    public void revokeRoles(Set<String> roles, Set<HivePrincipal> grantees, boolean adminOptionFor,
-            HivePrincipal grantor)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "revokeRoles");
-    }
-
-    @Override
-    public Set<RoleGrant> listGrantedPrincipals(String role)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "listRoleGrants");
-    }
-
-    @Override
-    public Set<RoleGrant> listRoleGrants(HivePrincipal principal)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "listRoleGrants");
-    }
-
-    @Override
-    public void grantTablePrivileges(String databaseName, String tableName, String tableOwner, HivePrincipal grantee, HivePrincipal grantor, Set<HivePrivilege> privileges, boolean grantOption)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "grantTablePrivileges");
-    }
-
-    @Override
-    public void revokeTablePrivileges(String databaseName, String tableName, String tableOwner, HivePrincipal grantee, HivePrincipal grantor, Set<HivePrivilege> privileges, boolean grantOption)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "revokeTablePrivileges");
-    }
-
-    @Override
-    public Set<HivePrivilegeInfo> listTablePrivileges(String databaseName, String tableName, Optional<String> tableOwner, Optional<HivePrincipal> principal)
-    {
-        throw new TrinoException(NOT_SUPPORTED, "listTablePrivileges");
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/AlluxioHiveMetastoreConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/AlluxioHiveMetastoreConfig.java
deleted file mode 100644
index 028aef0a607b..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/AlluxioHiveMetastoreConfig.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.metastore.alluxio;
-
-import io.airlift.configuration.Config;
-import io.airlift.configuration.ConfigDescription;
-
-/**
- * Configuration for the Alluxio compatible hive metastore interface.
- */
-public class AlluxioHiveMetastoreConfig
-{
-    private String masterAddress;
-
-    public String getMasterAddress()
-    {
-        return masterAddress;
-    }
-
-    @Config("hive.metastore.alluxio.master.address")
-    @ConfigDescription("Alluxio master address")
-    public AlluxioHiveMetastoreConfig setMasterAddress(String masterAddress)
-    {
-        this.masterAddress = masterAddress;
-        return this;
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/AlluxioHiveMetastoreFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/AlluxioHiveMetastoreFactory.java
deleted file mode 100644
index 8737945d4568..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/AlluxioHiveMetastoreFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.metastore.alluxio;
-
-import alluxio.client.table.TableMasterClient;
-import io.trino.plugin.hive.metastore.HiveMetastore;
-import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
-import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
-import io.trino.spi.security.ConnectorIdentity;
-
-import javax.inject.Inject;
-
-import java.util.Optional;
-
-public class AlluxioHiveMetastoreFactory
-        implements HiveMetastoreFactory
-{
-    private final AlluxioHiveMetastore metastore;
-
-    @Inject
-    public AlluxioHiveMetastoreFactory(TableMasterClient client, HiveMetastoreConfig hiveMetastoreConfig)
-    {
-        // Alluxio metastore does not support impersonation, so just create a single shared instance
-        metastore = new AlluxioHiveMetastore(client, hiveMetastoreConfig);
-    }
-
-    @Override
-    public boolean isImpersonationEnabled()
-    {
-        return false;
-    }
-
-    @Override
-    public HiveMetastore createMetastore(Optional<ConnectorIdentity> identity)
-    {
-        return metastore;
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/AlluxioMetastoreModule.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/AlluxioMetastoreModule.java
deleted file mode 100644
index 67d737227f23..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/AlluxioMetastoreModule.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.metastore.alluxio;
-
-import alluxio.ClientContext;
-import alluxio.client.table.RetryHandlingTableMasterClient;
-import alluxio.client.table.TableMasterClient;
-import alluxio.conf.Configuration;
-import alluxio.conf.InstancedConfiguration;
-import alluxio.conf.PropertyKey;
-import alluxio.master.MasterClientContext;
-import com.google.inject.Binder;
-import com.google.inject.Key;
-import com.google.inject.Provides;
-import com.google.inject.Scopes;
-import io.airlift.configuration.AbstractConfigurationAwareModule;
-import io.trino.plugin.hive.AllowHiveTableRename;
-import io.trino.plugin.hive.metastore.HiveMetastore;
-import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
-import io.trino.plugin.hive.metastore.RawHiveMetastoreFactory;
-
-import static io.airlift.configuration.ConfigBinder.configBinder;
-
-/**
- * Module for an Alluxio metastore implementation of the {@link HiveMetastore} interface.
- */
-public class AlluxioMetastoreModule
-        extends AbstractConfigurationAwareModule
-{
-    @Override
-    protected void setup(Binder binder)
-    {
-        configBinder(binder).bindConfig(AlluxioHiveMetastoreConfig.class);
-
-        binder.bind(HiveMetastoreFactory.class).annotatedWith(RawHiveMetastoreFactory.class).to(AlluxioHiveMetastoreFactory.class).in(Scopes.SINGLETON);
-        binder.bind(Key.get(boolean.class, AllowHiveTableRename.class)).toInstance(false);
-    }
-
-    @Provides
-    public TableMasterClient provideCatalogMasterClient(AlluxioHiveMetastoreConfig config)
-    {
-        return createCatalogMasterClient(config);
-    }
-
-    public static TableMasterClient createCatalogMasterClient(AlluxioHiveMetastoreConfig config)
-    {
-        InstancedConfiguration conf = Configuration.modifiableGlobal();
-        String addr = config.getMasterAddress();
-        String[] parts = addr.split(":", 2);
-        conf.set(PropertyKey.MASTER_HOSTNAME, parts[0]);
-        if (parts.length > 1) {
-            conf.set(PropertyKey.MASTER_RPC_PORT, parts[1]);
-        }
-        MasterClientContext context = MasterClientContext
-                .newBuilder(ClientContext.create(conf)).build();
-        return new RetryHandlingTableMasterClient(context);
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/ProtoUtils.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/ProtoUtils.java
deleted file mode 100644
index de3397f019b0..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/alluxio/ProtoUtils.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.metastore.alluxio;
-
-import alluxio.grpc.table.BinaryColumnStatsData;
-import alluxio.grpc.table.BooleanColumnStatsData;
-import alluxio.grpc.table.ColumnStatisticsData;
-import alluxio.grpc.table.Date;
-import alluxio.grpc.table.DateColumnStatsData;
-import alluxio.grpc.table.Decimal;
-import alluxio.grpc.table.DecimalColumnStatsData;
-import alluxio.grpc.table.DoubleColumnStatsData;
-import alluxio.grpc.table.FieldSchema;
-import alluxio.grpc.table.Layout;
-import alluxio.grpc.table.LongColumnStatsData;
-import alluxio.grpc.table.PrincipalType;
-import alluxio.grpc.table.StringColumnStatsData;
-import alluxio.grpc.table.layout.hive.PartitionInfo;
-import alluxio.shaded.client.com.google.protobuf.InvalidProtocolBufferException;
-import com.google.common.collect.Lists;
-import io.trino.plugin.hive.HiveBucketProperty;
-import io.trino.plugin.hive.HiveType;
-import io.trino.plugin.hive.metastore.Column;
-import io.trino.plugin.hive.metastore.Database;
-import io.trino.plugin.hive.metastore.HiveColumnStatistics;
-import io.trino.plugin.hive.metastore.Partition;
-import io.trino.plugin.hive.metastore.SortingColumn;
-import io.trino.plugin.hive.metastore.StorageFormat;
-import io.trino.plugin.hive.metastore.Table;
-import io.trino.plugin.hive.util.HiveBucketing;
-import io.trino.spi.TrinoException;
-
-import javax.annotation.Nullable;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.OptionalDouble;
-import java.util.OptionalLong;
-import java.util.Set;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_METADATA;
-import static io.trino.plugin.hive.metastore.HiveColumnStatistics.createBinaryColumnStatistics;
-import static io.trino.plugin.hive.metastore.HiveColumnStatistics.createBooleanColumnStatistics;
-import static io.trino.plugin.hive.metastore.HiveColumnStatistics.createDateColumnStatistics;
-import static io.trino.plugin.hive.metastore.HiveColumnStatistics.createDecimalColumnStatistics;
-import static io.trino.plugin.hive.metastore.HiveColumnStatistics.createDoubleColumnStatistics;
-import static io.trino.plugin.hive.metastore.HiveColumnStatistics.createIntegerColumnStatistics;
-import static io.trino.plugin.hive.metastore.HiveColumnStatistics.createStringColumnStatistics;
-import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.fromMetastoreDistinctValuesCount;
-import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.fromMetastoreNullsCount;
-import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.getTotalSizeInBytes;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-
-public final class ProtoUtils
-{
-    private ProtoUtils() {}
-
-    public static Database fromProto(alluxio.grpc.table.Database db)
-    {
-        Optional<String> owner = Optional.ofNullable(db.getOwnerName());
-        Optional<io.trino.spi.security.PrincipalType> ownerType = owner.map(name -> db.getOwnerType() == PrincipalType.USER ? io.trino.spi.security.PrincipalType.USER : io.trino.spi.security.PrincipalType.ROLE);
-        return Database.builder()
-                .setDatabaseName(db.getDbName())
-                .setLocation(db.hasLocation() ? Optional.of(db.getLocation()) : Optional.empty())
-                .setOwnerName(owner)
-                .setOwnerType(ownerType)
-                .setComment(db.hasComment() ? Optional.of(db.getComment()) : Optional.empty())
-                .setParameters(db.getParameterMap())
-                .build();
-    }
-
-    public static Table fromProto(alluxio.grpc.table.TableInfo table)
-    {
-        if (!table.hasLayout()) {
-            throw new TrinoException(NOT_SUPPORTED, "Unsupported table metadata. missing layout.: " + table.getTableName());
-        }
-        Layout layout = table.getLayout();
-        if (!alluxio.table.ProtoUtils.isHiveLayout(layout)) {
-            throw new TrinoException(NOT_SUPPORTED, "Unsupported table layout: " + layout + " for table: " + table.getTableName());
-        }
-        try {
-            PartitionInfo partitionInfo = alluxio.table.ProtoUtils.toHiveLayout(layout);
-
-            // compute the data columns
-            Set<String> partitionColumns = table.getPartitionColsList().stream()
-                    .map(FieldSchema::getName)
-                    .collect(toImmutableSet());
-            List<FieldSchema> dataColumns = table.getSchema().getColsList().stream()
-                    .filter((f) -> !partitionColumns.contains(f.getName()))
-                    .collect(toImmutableList());
-
-            Map<String, String> tableParameters = table.getParametersMap();
-            Table.Builder builder = Table.builder()
-                    .setDatabaseName(table.getDbName())
-                    .setTableName(table.getTableName())
-                    .setOwner(Optional.ofNullable(table.getOwner()))
-                    .setTableType(table.getType().toString())
-                    .setDataColumns(dataColumns.stream()
-                            .map(ProtoUtils::fromProto)
-                            .collect(toImmutableList()))
-                    .setPartitionColumns(table.getPartitionColsList().stream()
-                            .map(ProtoUtils::fromProto)
-                            .collect(toImmutableList()))
-                    .setParameters(tableParameters)
-                    .setViewOriginalText(Optional.empty())
-                    .setViewExpandedText(Optional.empty());
-            alluxio.grpc.table.layout.hive.Storage storage = partitionInfo.getStorage();
-            builder.getStorageBuilder()
-                    .setSkewed(storage.getSkewed())
-                    .setStorageFormat(fromProto(storage.getStorageFormat()))
-                    .setLocation(storage.getLocation())
-                    .setBucketProperty(storage.hasBucketProperty() ? fromProto(tableParameters, storage.getBucketProperty()) : Optional.empty())
-                    .setSerdeParameters(storage.getStorageFormat().getSerdelibParametersMap());
-            return builder.build();
-        }
-        catch (InvalidProtocolBufferException e) {
-            throw new IllegalArgumentException("Failed to extract PartitionInfo from TableInfo", e);
-        }
-    }
-
-    static SortingColumn fromProto(alluxio.grpc.table.layout.hive.SortingColumn column)
-    {
-        if (column.getOrder().equals(alluxio.grpc.table.layout.hive.SortingColumn.SortingOrder.ASCENDING)) {
-            return new SortingColumn(column.getColumnName(), SortingColumn.Order.ASCENDING);
-        }
-        if (column.getOrder().equals(alluxio.grpc.table.layout.hive.SortingColumn.SortingOrder.DESCENDING)) {
-            return new SortingColumn(column.getColumnName(), SortingColumn.Order.DESCENDING);
-        }
-        throw new IllegalArgumentException("Invalid sort order: " + column.getOrder());
-    }
-
-    static Optional<HiveBucketProperty> fromProto(Map<String, String> tableParameters, alluxio.grpc.table.layout.hive.HiveBucketProperty property)
-    {
-        // must return empty if buckets <= 0
-        if (!property.hasBucketCount() || property.getBucketCount() <= 0) {
-            return Optional.empty();
-        }
-        List<SortingColumn> sortedBy = property.getSortedByList().stream()
-                .map(ProtoUtils::fromProto)
-                .collect(toImmutableList());
-        HiveBucketing.BucketingVersion bucketingVersion = HiveBucketing.getBucketingVersion(tableParameters);
-        return Optional.of(new HiveBucketProperty(property.getBucketedByList(), bucketingVersion, (int) property.getBucketCount(), sortedBy));
-    }
-
-    static StorageFormat fromProto(alluxio.grpc.table.layout.hive.StorageFormat format)
-    {
-        return StorageFormat.create(format.getSerde(), format.getInputFormat(), format.getOutputFormat());
-    }
-
-    private static Optional<BigDecimal> fromMetastoreDecimal(@Nullable Decimal decimal)
-    {
-        if (decimal == null) {
-            return Optional.empty();
-        }
-        return Optional.of(new BigDecimal(new BigInteger(decimal.getUnscaled().toByteArray()), decimal.getScale()));
-    }
-
-    private static Optional<LocalDate> fromMetastoreDate(@Nullable Date date)
-    {
-        if (date == null) {
-            return Optional.empty();
-        }
-        return Optional.of(LocalDate.ofEpochDay(date.getDaysSinceEpoch()));
-    }
-
-    public static HiveColumnStatistics fromProto(ColumnStatisticsData columnStatistics, OptionalLong rowCount)
-    {
-        if (columnStatistics.hasLongStats()) {
-            LongColumnStatsData longStatsData = columnStatistics.getLongStats();
-            OptionalLong min = longStatsData.hasLowValue() ? OptionalLong.of(longStatsData.getLowValue()) : OptionalLong.empty();
-            OptionalLong max = longStatsData.hasHighValue() ? OptionalLong.of(longStatsData.getHighValue()) : OptionalLong.empty();
-            OptionalLong nullsCount = longStatsData.hasNumNulls() ? fromMetastoreNullsCount(longStatsData.getNumNulls()) : OptionalLong.empty();
-            OptionalLong distinctValuesCount = longStatsData.hasNumDistincts() ? OptionalLong.of(longStatsData.getNumDistincts()) : OptionalLong.empty();
-            return createIntegerColumnStatistics(min, max, nullsCount, fromMetastoreDistinctValuesCount(distinctValuesCount, nullsCount, rowCount));
-        }
-        if (columnStatistics.hasDoubleStats()) {
-            DoubleColumnStatsData doubleStatsData = columnStatistics.getDoubleStats();
-            OptionalDouble min = doubleStatsData.hasLowValue() ? OptionalDouble.of(doubleStatsData.getLowValue()) : OptionalDouble.empty();
-            OptionalDouble max = doubleStatsData.hasHighValue() ? OptionalDouble.of(doubleStatsData.getHighValue()) : OptionalDouble.empty();
-            OptionalLong nullsCount = doubleStatsData.hasNumNulls() ? fromMetastoreNullsCount(doubleStatsData.getNumNulls()) : OptionalLong.empty();
-            OptionalLong distinctValuesCount = doubleStatsData.hasNumDistincts() ? OptionalLong.of(doubleStatsData.getNumDistincts()) : OptionalLong.empty();
-            return createDoubleColumnStatistics(min, max, nullsCount, fromMetastoreDistinctValuesCount(distinctValuesCount, nullsCount, rowCount));
-        }
-        if (columnStatistics.hasDecimalStats()) {
-            DecimalColumnStatsData decimalStatsData = columnStatistics.getDecimalStats();
-            Optional<BigDecimal> min = decimalStatsData.hasLowValue() ? fromMetastoreDecimal(decimalStatsData.getLowValue()) : Optional.empty();
-            Optional<BigDecimal> max = decimalStatsData.hasHighValue() ? fromMetastoreDecimal(decimalStatsData.getHighValue()) : Optional.empty();
-            OptionalLong nullsCount = decimalStatsData.hasNumNulls() ? fromMetastoreNullsCount(decimalStatsData.getNumNulls()) : OptionalLong.empty();
-            OptionalLong distinctValuesCount = decimalStatsData.hasNumDistincts() ? OptionalLong.of(decimalStatsData.getNumDistincts()) : OptionalLong.empty();
-            return createDecimalColumnStatistics(min, max, nullsCount, fromMetastoreDistinctValuesCount(distinctValuesCount, nullsCount, rowCount));
-        }
-        if (columnStatistics.hasDateStats()) {
-            DateColumnStatsData dateStatsData = columnStatistics.getDateStats();
-            Optional<LocalDate> min = dateStatsData.hasLowValue() ? fromMetastoreDate(dateStatsData.getLowValue()) : Optional.empty();
-            Optional<LocalDate> max = dateStatsData.hasHighValue() ? fromMetastoreDate(dateStatsData.getHighValue()) : Optional.empty();
-            OptionalLong nullsCount = dateStatsData.hasNumNulls() ? fromMetastoreNullsCount(dateStatsData.getNumNulls()) : OptionalLong.empty();
-            OptionalLong distinctValuesCount = dateStatsData.hasNumDistincts() ? OptionalLong.of(dateStatsData.getNumDistincts()) : OptionalLong.empty();
-            return createDateColumnStatistics(min, max, nullsCount, fromMetastoreDistinctValuesCount(distinctValuesCount, nullsCount, rowCount));
-        }
-        if (columnStatistics.hasBooleanStats()) {
-            BooleanColumnStatsData booleanStatsData = columnStatistics.getBooleanStats();
-            OptionalLong trueCount = OptionalLong.empty();
-            OptionalLong falseCount = OptionalLong.empty();
-            // Impala 'COMPUTE STATS' writes 1 as the numTrue and -1 as the numFalse
-            if (booleanStatsData.hasNumTrues() && booleanStatsData.hasNumFalses() && (booleanStatsData.getNumFalses() != -1)) {
-                trueCount = OptionalLong.of(booleanStatsData.getNumTrues());
-                falseCount = OptionalLong.of(booleanStatsData.getNumFalses());
-            }
-            return createBooleanColumnStatistics(
-                    trueCount,
-                    falseCount,
-                    booleanStatsData.hasNumNulls() ? fromMetastoreNullsCount(booleanStatsData.getNumNulls()) : OptionalLong.empty());
-        }
-        if (columnStatistics.hasStringStats()) {
-            StringColumnStatsData stringStatsData = columnStatistics.getStringStats();
-            OptionalLong maxColumnLength = stringStatsData.hasMaxColLen() ? OptionalLong.of(stringStatsData.getMaxColLen()) : OptionalLong.empty();
-            OptionalDouble averageColumnLength = stringStatsData.hasAvgColLen() ? OptionalDouble.of(stringStatsData.getAvgColLen()) : OptionalDouble.empty();
-            OptionalLong nullsCount = stringStatsData.hasNumNulls() ? fromMetastoreNullsCount(stringStatsData.getNumNulls()) : OptionalLong.empty();
-            OptionalLong distinctValuesCount = stringStatsData.hasNumDistincts() ? OptionalLong.of(stringStatsData.getNumDistincts()) : OptionalLong.empty();
-            return createStringColumnStatistics(
-                    maxColumnLength,
-                    getTotalSizeInBytes(averageColumnLength, rowCount, nullsCount),
-                    nullsCount,
-                    fromMetastoreDistinctValuesCount(distinctValuesCount, nullsCount, rowCount));
-        }
-        if (columnStatistics.hasBinaryStats()) {
-            BinaryColumnStatsData binaryStatsData = columnStatistics.getBinaryStats();
-            OptionalLong maxColumnLength = binaryStatsData.hasMaxColLen() ? OptionalLong.of(binaryStatsData.getMaxColLen()) : OptionalLong.empty();
-            OptionalDouble averageColumnLength = binaryStatsData.hasAvgColLen() ? OptionalDouble.of(binaryStatsData.getAvgColLen()) : OptionalDouble.empty();
-            OptionalLong nullsCount = binaryStatsData.hasNumNulls() ? fromMetastoreNullsCount(binaryStatsData.getNumNulls()) : OptionalLong.empty();
-            return createBinaryColumnStatistics(
-                    maxColumnLength,
-                    getTotalSizeInBytes(averageColumnLength, rowCount, nullsCount),
-                    nullsCount);
-        }
-        throw new TrinoException(HIVE_INVALID_METADATA, "Invalid column statistics data: " + columnStatistics);
-    }
-
-    static Column fromProto(alluxio.grpc.table.FieldSchema column)
-    {
-        Optional<String> comment = column.hasComment() ? Optional.of(column.getComment()) : Optional.empty();
-        return new Column(column.getName(), HiveType.valueOf(column.getType()), comment);
-    }
-
-    public static Partition fromProto(alluxio.grpc.table.layout.hive.PartitionInfo info)
-    {
-        Map<String, String> parametersMap = info.getParametersMap();
-        Partition.Builder builder = Partition.builder()
-                .setColumns(info.getDataColsList().stream()
-                        .map(ProtoUtils::fromProto)
-                        .collect(toImmutableList()))
-                .setDatabaseName(info.getDbName())
-                .setParameters(parametersMap)
-                .setValues(Lists.newArrayList(info.getValuesList()))
-                .setTableName(info.getTableName());
-
-        builder.getStorageBuilder()
-                .setSkewed(info.getStorage().getSkewed())
-                .setStorageFormat(fromProto(info.getStorage().getStorageFormat()))
-                .setLocation(info.getStorage().getLocation())
-                .setBucketProperty(info.getStorage().hasBucketProperty()
-                        ? fromProto(parametersMap, info.getStorage().getBucketProperty()) : Optional.empty())
-                .setSerdeParameters(info.getStorage().getStorageFormat().getSerdelibParametersMap());
-
-        return builder.build();
-    }
-
-    public static alluxio.grpc.table.layout.hive.PartitionInfo toPartitionInfo(alluxio.grpc.table.Partition part)
-    {
-        try {
-            return alluxio.table.ProtoUtils.extractHiveLayout(part);
-        }
-        catch (InvalidProtocolBufferException e) {
-            throw new IllegalArgumentException("Failed to extract PartitionInfo", e);
-        }
-    }
-
-    public static List<alluxio.grpc.table.layout.hive.PartitionInfo> toPartitionInfoList(List<alluxio.grpc.table.Partition> parts)
-    {
-        return parts.stream()
-                .map(ProtoUtils::toPartitionInfo)
-                .collect(toImmutableList());
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastore.java
index ef531e192ea8..f5175b239759 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastore.java
@@ -23,9 +23,11 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.google.errorprone.annotations.Immutable;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.jmx.CacheStatsMBean;
 import io.airlift.units.Duration;
-import io.trino.collect.cache.EvictableCacheBuilder;
+import io.trino.cache.EvictableCacheBuilder;
 import io.trino.hive.thrift.metastore.DataOperationType;
 import io.trino.plugin.hive.HiveColumnStatisticType;
 import io.trino.plugin.hive.HivePartition;
@@ -52,16 +54,13 @@
 import io.trino.plugin.hive.metastore.UserTableKey;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.Immutable;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -80,6 +79,7 @@
 import java.util.function.Supplier;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static com.google.common.base.Verify.verifyNotNull;
 import static com.google.common.cache.CacheLoader.asyncReloading;
@@ -88,7 +88,8 @@
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Sets.difference;
 import static com.google.common.util.concurrent.Futures.immediateFuture;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.CacheUtils.invalidateAllIf;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
 import static io.trino.plugin.hive.metastore.HivePartitionName.hivePartitionName;
 import static io.trino.plugin.hive.metastore.HiveTableName.hiveTableName;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.makePartitionName;
@@ -113,14 +114,17 @@ public enum StatsRecording
     }
 
     protected final HiveMetastore delegate;
+    private final boolean cacheMissing;
     private final LoadingCache<String, Optional<Database>> databaseCache;
     private final LoadingCache<String, List<String>> databaseNamesCache;
     private final LoadingCache<HiveTableName, Optional<Table>> tableCache;
     private final LoadingCache<String, List<String>> tableNamesCache;
+    private final LoadingCache<SingletonCacheKey, Optional<List<SchemaTableName>>> allTableNamesCache;
     private final LoadingCache<TablesWithParameterCacheKey, List<String>> tablesWithParameterCache;
     private final Cache<HiveTableName, AtomicReference<PartitionStatistics>> tableStatisticsCache;
     private final Cache<HivePartitionName, AtomicReference<PartitionStatistics>> partitionStatisticsCache;
     private final LoadingCache<String, List<String>> viewNamesCache;
+    private final LoadingCache<SingletonCacheKey, Optional<List<SchemaTableName>>> allViewNamesCache;
     private final Cache<HivePartitionName, AtomicReference<Optional<Partition>>> partitionCache;
     private final LoadingCache<PartitionFilter, Optional<List<String>>> partitionFilterCache;
     private final LoadingCache<UserTableKey, Set<HivePrivilegeInfo>> tablePrivilegesCache;
@@ -146,6 +150,7 @@ public static CachingHiveMetastoreBuilder builder(CachingHiveMetastoreBuilder ot
                 other.refreshMills,
                 other.maximumSize,
                 other.statsRecording,
+                other.cacheMissing,
                 other.partitionCacheEnabled);
     }
 
@@ -157,6 +162,8 @@ public static CachingHiveMetastore memoizeMetastore(HiveMetastore delegate, long
                 .statsCacheEnabled(true)
                 .maximumSize(maximumSize)
                 .statsRecording(StatsRecording.DISABLED)
+                .cacheMissing(true)
+                .partitionCacheEnabled(true)
                 .build();
     }
 
@@ -172,7 +179,8 @@ public static class CachingHiveMetastoreBuilder
         private OptionalLong refreshMills = OptionalLong.empty();
         private Long maximumSize;
         private StatsRecording statsRecording = StatsRecording.ENABLED;
-        private boolean partitionCacheEnabled = true;
+        private Boolean cacheMissing;
+        private Boolean partitionCacheEnabled;
 
         public CachingHiveMetastoreBuilder() {}
 
@@ -186,7 +194,8 @@ private CachingHiveMetastoreBuilder(
                 OptionalLong refreshMills,
                 Long maximumSize,
                 StatsRecording statsRecording,
-                boolean partitionCacheEnabled)
+                Boolean cacheMissing,
+                Boolean partitionCacheEnabled)
         {
             this.delegate = delegate;
             this.executor = executor;
@@ -197,6 +206,7 @@ private CachingHiveMetastoreBuilder(
             this.refreshMills = refreshMills;
             this.maximumSize = maximumSize;
             this.statsRecording = statsRecording;
+            this.cacheMissing = cacheMissing;
             this.partitionCacheEnabled = partitionCacheEnabled;
         }
 
@@ -272,6 +282,13 @@ public CachingHiveMetastoreBuilder statsRecording(StatsRecording statsRecording)
             return this;
         }
 
+        @CanIgnoreReturnValue
+        public CachingHiveMetastoreBuilder cacheMissing(boolean cacheMissing)
+        {
+            this.cacheMissing = cacheMissing;
+            return this;
+        }
+
         @CanIgnoreReturnValue
         public CachingHiveMetastoreBuilder partitionCacheEnabled(boolean partitionCacheEnabled)
         {
@@ -285,6 +302,8 @@ public CachingHiveMetastore build()
             requireNonNull(statsCacheEnabled, "statsCacheEnabled is null");
             requireNonNull(delegate, "delegate not set");
             requireNonNull(maximumSize, "maximumSize not set");
+            requireNonNull(cacheMissing, "cacheMissing not set");
+            requireNonNull(partitionCacheEnabled, "partitionCacheEnabled not set");
             return new CachingHiveMetastore(
                     delegate,
                     metadataCacheEnabled,
@@ -295,6 +314,7 @@ public CachingHiveMetastore build()
                     executor,
                     maximumSize,
                     statsRecording,
+                    cacheMissing,
                     partitionCacheEnabled);
         }
     }
@@ -309,10 +329,12 @@ protected CachingHiveMetastore(
             Optional<Executor> executor,
             long maximumSize,
             StatsRecording statsRecording,
+            boolean cacheMissing,
             boolean partitionCacheEnabled)
     {
         checkArgument(metadataCacheEnabled || statsCacheEnabled, "Cache not enabled");
         this.delegate = requireNonNull(delegate, "delegate is null");
+        this.cacheMissing = cacheMissing;
         requireNonNull(executor, "executor is null");
 
         CacheFactory cacheFactory;
@@ -340,10 +362,12 @@ protected CachingHiveMetastore(
         databaseNamesCache = cacheFactory.buildCache(ignored -> loadAllDatabases());
         databaseCache = cacheFactory.buildCache(this::loadDatabase);
         tableNamesCache = cacheFactory.buildCache(this::loadAllTables);
+        allTableNamesCache = cacheFactory.buildCache(ignore -> loadAllTables());
         tablesWithParameterCache = cacheFactory.buildCache(this::loadTablesMatchingParameter);
         tableStatisticsCache = statsCacheFactory.buildCache(this::refreshTableStatistics);
         tableCache = cacheFactory.buildCache(this::loadTable);
         viewNamesCache = cacheFactory.buildCache(this::loadAllViews);
+        allViewNamesCache = cacheFactory.buildCache(ignore -> loadAllViews());
         tablePrivilegesCache = cacheFactory.buildCache(key -> loadTablePrivileges(key.getDatabase(), key.getTable(), key.getOwner(), key.getPrincipal()));
         rolesCache = cacheFactory.buildCache(ignored -> loadRoles());
         roleGrantsCache = cacheFactory.buildCache(this::loadRoleGrants);
@@ -360,7 +384,9 @@ public void flushCache()
     {
         databaseNamesCache.invalidateAll();
         tableNamesCache.invalidateAll();
+        allTableNamesCache.invalidateAll();
         viewNamesCache.invalidateAll();
+        allViewNamesCache.invalidateAll();
         databaseCache.invalidateAll();
         tableCache.invalidateAll();
         partitionCache.invalidateAll();
@@ -401,6 +427,28 @@ private AtomicReference<PartitionStatistics> refreshTableStatistics(HiveTableNam
     private static <K, V> V get(LoadingCache<K, V> cache, K key)
     {
         try {
+            V value = cache.getUnchecked(key);
+            checkState(!(value instanceof Optional), "This must not be used for caches with Optional values, as it doesn't implement cacheMissing logic. Use getOptional()");
+            return value;
+        }
+        catch (UncheckedExecutionException e) {
+            throwIfInstanceOf(e.getCause(), TrinoException.class);
+            throw e;
+        }
+    }
+
+    private <K, V> Optional<V> getOptional(LoadingCache<K, Optional<V>> cache, K key)
+    {
+        try {
+            Optional<V> value = cache.getIfPresent(key);
+            @SuppressWarnings("OptionalAssignedToNull")
+            boolean valueIsPresent = value != null;
+            if (valueIsPresent) {
+                if (value.isPresent() || cacheMissing) {
+                    return value;
+                }
+                cache.invalidate(key);
+            }
             return cache.getUnchecked(key);
         }
         catch (UncheckedExecutionException e) {
@@ -524,7 +572,7 @@ private static <K, V> Map<K, V> getAll(
     @Override
     public Optional<Database> getDatabase(String databaseName)
     {
-        return get(databaseCache, databaseName);
+        return getOptional(databaseCache, databaseName);
     }
 
     private Optional<Database> loadDatabase(String databaseName)
@@ -543,16 +591,10 @@ private List<String> loadAllDatabases()
         return delegate.getAllDatabases();
     }
 
-    private Table getExistingTable(String databaseName, String tableName)
-    {
-        return getTable(databaseName, tableName)
-                .orElseThrow(() -> new TableNotFoundException(new SchemaTableName(databaseName, tableName)));
-    }
-
     @Override
     public Optional<Table> getTable(String databaseName, String tableName)
     {
-        return get(tableCache, hiveTableName(databaseName, tableName));
+        return getOptional(tableCache, hiveTableName(databaseName, tableName));
     }
 
     @Override
@@ -588,12 +630,6 @@ public PartitionStatistics getTableStatistics(Table table)
                 CachingHiveMetastore::mergePartitionColumnStatistics);
     }
 
-    private PartitionStatistics loadTableColumnStatistics(HiveTableName tableName)
-    {
-        Table table = getExistingTable(tableName.getDatabaseName(), tableName.getTableName());
-        return delegate.getTableStatistics(table);
-    }
-
     /**
      * The method will cache and return columns specified in the {@link Table#getDataColumns()}
      * but may return more if other columns are already cached for a given partition.
@@ -706,6 +742,17 @@ private List<String> loadAllTables(String databaseName)
         return delegate.getAllTables(databaseName);
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllTables()
+    {
+        return getOptional(allTableNamesCache, SingletonCacheKey.INSTANCE);
+    }
+
+    private Optional<List<SchemaTableName>> loadAllTables()
+    {
+        return delegate.getAllTables();
+    }
+
     @Override
     public List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue)
     {
@@ -729,6 +776,17 @@ private List<String> loadAllViews(String databaseName)
         return delegate.getAllViews(databaseName);
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllViews()
+    {
+        return getOptional(allViewNamesCache, SingletonCacheKey.INSTANCE);
+    }
+
+    private Optional<List<SchemaTableName>> loadAllViews()
+    {
+        return delegate.getAllViews();
+    }
+
     @Override
     public void createDatabase(Database database)
     {
@@ -894,31 +952,18 @@ public void dropColumn(String databaseName, String tableName, String columnName)
 
     public void invalidateTable(String databaseName, String tableName)
     {
-        invalidateTableCache(databaseName, tableName);
+        HiveTableName hiveTableName = new HiveTableName(databaseName, tableName);
+        tableCache.invalidate(hiveTableName);
         tableNamesCache.invalidate(databaseName);
+        allTableNamesCache.invalidateAll();
         viewNamesCache.invalidate(databaseName);
-        tablePrivilegesCache.asMap().keySet().stream()
-                .filter(userTableKey -> userTableKey.matches(databaseName, tableName))
-                .forEach(tablePrivilegesCache::invalidate);
-        invalidateTableStatisticsCache(databaseName, tableName);
+        allViewNamesCache.invalidateAll();
+        invalidateAllIf(tablePrivilegesCache, userTableKey -> userTableKey.matches(databaseName, tableName));
+        tableStatisticsCache.invalidate(hiveTableName);
         invalidateTablesWithParameterCache(databaseName, tableName);
         invalidatePartitionCache(databaseName, tableName);
     }
 
-    private void invalidateTableCache(String databaseName, String tableName)
-    {
-        tableCache.asMap().keySet().stream()
-                .filter(table -> table.getDatabaseName().equals(databaseName) && table.getTableName().equals(tableName))
-                .forEach(tableCache::invalidate);
-    }
-
-    private void invalidateTableStatisticsCache(String databaseName, String tableName)
-    {
-        tableStatisticsCache.asMap().keySet().stream()
-                .filter(table -> table.getDatabaseName().equals(databaseName) && table.getTableName().equals(tableName))
-                .forEach(tableCache::invalidate);
-    }
-
     private void invalidateTablesWithParameterCache(String databaseName, String tableName)
     {
         tablesWithParameterCache.asMap().keySet().stream()
@@ -943,7 +988,7 @@ public Optional<List<String>> getPartitionNamesByFilter(
             List<String> columnNames,
             TupleDomain<String> partitionKeysFilter)
     {
-        return get(partitionFilterCache, partitionFilter(databaseName, tableName, columnNames, partitionKeysFilter));
+        return getOptional(partitionFilterCache, partitionFilter(databaseName, tableName, columnNames, partitionKeysFilter));
     }
 
     private Optional<List<String>> loadPartitionNamesByFilter(PartitionFilter partitionFilter)
@@ -1119,15 +1164,9 @@ private void invalidatePartitionCache(String databaseName, String tableName, Pre
         Predicate<HivePartitionName> hivePartitionPredicate = partitionName -> partitionName.getHiveTableName().equals(hiveTableName) &&
                 partitionPredicate.test(partitionName.getPartitionName());
 
-        partitionCache.asMap().keySet().stream()
-                .filter(hivePartitionPredicate)
-                .forEach(partitionCache::invalidate);
-        partitionFilterCache.asMap().keySet().stream()
-                .filter(partitionFilter -> partitionFilter.getHiveTableName().equals(hiveTableName))
-                .forEach(partitionFilterCache::invalidate);
-        partitionStatisticsCache.asMap().keySet().stream()
-                .filter(hivePartitionPredicate)
-                .forEach(partitionStatisticsCache::invalidate);
+        invalidateAllIf(partitionCache, hivePartitionPredicate);
+        invalidateAllIf(partitionFilterCache, partitionFilter -> partitionFilter.getHiveTableName().equals(hiveTableName));
+        invalidateAllIf(partitionStatisticsCache, hivePartitionPredicate);
     }
 
     @Override
@@ -1168,7 +1207,7 @@ public Set<HivePrivilegeInfo> listTablePrivileges(String databaseName, String ta
     @Override
     public Optional<String> getConfigValue(String name)
     {
-        return get(configValuesCache, name);
+        return getOptional(configValuesCache, name);
     }
 
     private Optional<String> loadConfigValue(String name)
@@ -1291,14 +1330,40 @@ public void alterTransactionalTable(Table table, long transactionId, long writeI
         }
     }
 
-    private interface CacheFactory
+    @Override
+    public boolean functionExists(String databaseName, String functionName, String signatureToken)
+    {
+        return delegate.functionExists(databaseName, functionName, signatureToken);
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName)
+    {
+        return delegate.getFunctions(databaseName);
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName, String functionName)
+    {
+        return delegate.getFunctions(databaseName, functionName);
+    }
+
+    @Override
+    public void createFunction(String databaseName, String functionName, LanguageFunction function)
     {
-        <K, V> LoadingCache<K, V> buildCache(com.google.common.base.Function<K, V> loader);
+        delegate.createFunction(databaseName, functionName, function);
+    }
 
-        <K, V> Cache<K, V> buildCache(BiFunction<K, V, V> reloader);
+    @Override
+    public void replaceFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        delegate.replaceFunction(databaseName, functionName, function);
+    }
 
-        // use AtomicReference as value placeholder so that it's possible to avoid race between getAll and invalidate
-        <K, V> Cache<K, AtomicReference<V>> buildBulkCache();
+    @Override
+    public void dropFunction(String databaseName, String functionName, String signatureToken)
+    {
+        delegate.dropFunction(databaseName, functionName, signatureToken);
     }
 
     private static CacheFactory cacheFactory(
@@ -1308,44 +1373,7 @@ private static CacheFactory cacheFactory(
             long maximumSize,
             StatsRecording statsRecording)
     {
-        return new CacheFactory()
-        {
-            @Override
-            public <K, V> LoadingCache<K, V> buildCache(com.google.common.base.Function<K, V> loader)
-            {
-                return CachingHiveMetastore.buildCache(expiresAfterWriteMillis, refreshMillis, refreshExecutor, maximumSize, statsRecording, CacheLoader.from(loader));
-            }
-
-            @Override
-            public <K, V> Cache<K, V> buildCache(BiFunction<K, V, V> reloader)
-            {
-                CacheLoader<K, V> onlyReloader = new CacheLoader<>()
-                {
-                    @Override
-                    public V load(K key)
-                    {
-                        throw new UnsupportedOperationException();
-                    }
-
-                    @Override
-                    public ListenableFuture<V> reload(K key, V oldValue)
-                    {
-                        requireNonNull(key);
-                        requireNonNull(oldValue);
-                        // async reloading is configured in CachingHiveMetastore.buildCache if refreshMillis is present
-                        return immediateFuture(reloader.apply(key, oldValue));
-                    }
-                };
-                return CachingHiveMetastore.buildCache(expiresAfterWriteMillis, refreshMillis, refreshExecutor, maximumSize, statsRecording, onlyReloader);
-            }
-
-            @Override
-            public <K, V> Cache<K, AtomicReference<V>> buildBulkCache()
-            {
-                // disable refresh since it can't use the bulk loading and causes too many requests
-                return CachingHiveMetastore.buildBulkCache(expiresAfterWriteMillis, maximumSize, statsRecording);
-            }
-        };
+        return new CacheFactory(expiresAfterWriteMillis, refreshMillis, refreshExecutor, maximumSize, statsRecording);
     }
 
     private static CacheFactory neverCacheFactory()
@@ -1404,6 +1432,11 @@ private static <K, V> Cache<K, AtomicReference<V>> buildBulkCache(
         return cacheBuilder.build();
     }
 
+    private enum SingletonCacheKey
+    {
+        INSTANCE
+    }
+
     //
     // Stats used for non-impersonation shared caching
     //
@@ -1436,6 +1469,13 @@ public CacheStatsMBean getTableNamesStats()
         return new CacheStatsMBean(tableNamesCache);
     }
 
+    @Managed
+    @Nested
+    public CacheStatsMBean getAllTableNamesStats()
+    {
+        return new CacheStatsMBean(allTableNamesCache);
+    }
+
     @Managed
     @Nested
     public CacheStatsMBean getTableWithParameterStats()
@@ -1464,6 +1504,13 @@ public CacheStatsMBean getViewNamesStats()
         return new CacheStatsMBean(viewNamesCache);
     }
 
+    @Managed
+    @Nested
+    public CacheStatsMBean getAllViewNamesStats()
+    {
+        return new CacheStatsMBean(allViewNamesCache);
+    }
+
     @Managed
     @Nested
     public CacheStatsMBean getPartitionStats()
@@ -1536,6 +1583,11 @@ LoadingCache<String, List<String>> getTableNamesCache()
         return tableNamesCache;
     }
 
+    LoadingCache<SingletonCacheKey, Optional<List<SchemaTableName>>> getAllTableNamesCache()
+    {
+        return allTableNamesCache;
+    }
+
     LoadingCache<TablesWithParameterCacheKey, List<String>> getTablesWithParameterCache()
     {
         return tablesWithParameterCache;
@@ -1556,6 +1608,11 @@ LoadingCache<String, List<String>> getViewNamesCache()
         return viewNamesCache;
     }
 
+    LoadingCache<SingletonCacheKey, Optional<List<SchemaTableName>>> getAllViewNamesCache()
+    {
+        return allViewNamesCache;
+    }
+
     Cache<HivePartitionName, AtomicReference<Optional<Partition>>> getPartitionCache()
     {
         return partitionCache;
@@ -1590,4 +1647,55 @@ LoadingCache<String, Optional<String>> getConfigValuesCache()
     {
         return configValuesCache;
     }
+
+    private static class CacheFactory
+    {
+        private final OptionalLong expiresAfterWriteMillis;
+        private final OptionalLong refreshMillis;
+        private final Optional<Executor> refreshExecutor;
+        private final long maximumSize;
+        private final StatsRecording statsRecording;
+
+        public CacheFactory(OptionalLong expiresAfterWriteMillis, OptionalLong refreshMillis, Optional<Executor> refreshExecutor, long maximumSize, StatsRecording statsRecording)
+        {
+            this.expiresAfterWriteMillis = requireNonNull(expiresAfterWriteMillis, "expiresAfterWriteMillis is null");
+            this.refreshMillis = requireNonNull(refreshMillis, "refreshMillis is null");
+            this.refreshExecutor = requireNonNull(refreshExecutor, "refreshExecutor is null");
+            this.maximumSize = maximumSize;
+            this.statsRecording = requireNonNull(statsRecording, "statsRecording is null");
+        }
+
+        public <K, V> LoadingCache<K, V> buildCache(com.google.common.base.Function<K, V> loader)
+        {
+            return CachingHiveMetastore.buildCache(expiresAfterWriteMillis, refreshMillis, refreshExecutor, maximumSize, statsRecording, CacheLoader.from(loader));
+        }
+
+        public <K, V> Cache<K, V> buildCache(BiFunction<K, V, V> reloader)
+        {
+            CacheLoader<K, V> onlyReloader = new CacheLoader<>()
+            {
+                @Override
+                public V load(K key)
+                {
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public ListenableFuture<V> reload(K key, V oldValue)
+                {
+                    requireNonNull(key);
+                    requireNonNull(oldValue);
+                    // async reloading is configured in CachingHiveMetastore.buildCache if refreshMillis is present
+                    return immediateFuture(reloader.apply(key, oldValue));
+                }
+            };
+            return CachingHiveMetastore.buildCache(expiresAfterWriteMillis, refreshMillis, refreshExecutor, maximumSize, statsRecording, onlyReloader);
+        }
+
+        public <K, V> Cache<K, AtomicReference<V>> buildBulkCache()
+        {
+            // disable refresh since it can't use the bulk loading and causes too many requests
+            return CachingHiveMetastore.buildBulkCache(expiresAfterWriteMillis, maximumSize, statsRecording);
+        }
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastoreConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastoreConfig.java
index e5b53df08c38..eaae97eed9b5 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastoreConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastoreConfig.java
@@ -16,9 +16,8 @@
 import io.airlift.configuration.Config;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -34,6 +33,7 @@ public class CachingHiveMetastoreConfig
     private Optional<Duration> metastoreRefreshInterval = Optional.empty();
     private long metastoreCacheMaximumSize = 10000;
     private int maxMetastoreRefreshThreads = 10;
+    private boolean cacheMissing = true;
     private boolean partitionCacheEnabled = true;
 
     @NotNull
@@ -101,6 +101,18 @@ public CachingHiveMetastoreConfig setMaxMetastoreRefreshThreads(int maxMetastore
         return this;
     }
 
+    public boolean isCacheMissing()
+    {
+        return cacheMissing;
+    }
+
+    @Config("hive.metastore-cache.cache-missing")
+    public CachingHiveMetastoreConfig setCacheMissing(boolean cacheMissing)
+    {
+        this.cacheMissing = cacheMissing;
+        return this;
+    }
+
     public boolean isPartitionCacheEnabled()
     {
         return partitionCacheEnabled;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/ImpersonationCachingConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/ImpersonationCachingConfig.java
index 7a375f12bee2..15eb31787d94 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/ImpersonationCachingConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/ImpersonationCachingConfig.java
@@ -15,9 +15,8 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/SharedHiveMetastoreCache.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/SharedHiveMetastoreCache.java
index c008af2d5aa7..7c2ab0ece44f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/SharedHiveMetastoreCache.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/SharedHiveMetastoreCache.java
@@ -20,6 +20,7 @@
 import com.google.common.cache.LoadingCache;
 import com.google.common.math.LongMath;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.metastore.HiveMetastore;
@@ -28,14 +29,12 @@
 import io.trino.spi.NodeManager;
 import io.trino.spi.TrinoException;
 import io.trino.spi.security.ConnectorIdentity;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Function;
@@ -43,7 +42,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -97,6 +96,7 @@ public SharedHiveMetastoreCache(
                 .statsCacheTtl(statsCacheTtl)
                 .refreshInterval(config.getMetastoreRefreshInterval())
                 .maximumSize(config.getMetastoreCacheMaximumSize())
+                .cacheMissing(config.isCacheMissing())
                 .partitionCacheEnabled(config.isPartitionCacheEnabled());
     }
 
@@ -254,6 +254,13 @@ public AggregateCacheStatsMBean getTableNamesStats()
             return new AggregateCacheStatsMBean(CachingHiveMetastore::getTableNamesCache);
         }
 
+        @Managed
+        @Nested
+        public AggregateCacheStatsMBean getAllTableNamesStats()
+        {
+            return new AggregateCacheStatsMBean(CachingHiveMetastore::getAllTableNamesCache);
+        }
+
         @Managed
         @Nested
         public AggregateCacheStatsMBean getTableWithParameterStats()
@@ -282,6 +289,13 @@ public AggregateCacheStatsMBean getViewNamesStats()
             return new AggregateCacheStatsMBean(CachingHiveMetastore::getViewNamesCache);
         }
 
+        @Managed
+        @Nested
+        public AggregateCacheStatsMBean getAllViewNamesStats()
+        {
+            return new AggregateCacheStatsMBean(CachingHiveMetastore::getAllViewNamesCache);
+        }
+
         @Managed
         @Nested
         public AggregateCacheStatsMBean getPartitionStats()
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/Column.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/Column.java
new file mode 100644
index 000000000000..0eefe0c25f40
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/Column.java
@@ -0,0 +1,152 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.metastore.file;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.Immutable;
+import io.trino.plugin.hive.HiveType;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static java.util.Objects.requireNonNull;
+
+@Immutable
+public class Column
+{
+    private final String name;
+    private final HiveType type;
+    private final Optional<String> comment;
+    private final Map<String, String> properties;
+
+    @JsonCreator
+    public Column(
+            @JsonProperty("name") String name,
+            @JsonProperty("type") HiveType type,
+            @JsonProperty("comment") Optional<String> comment,
+            @JsonProperty("properties") Optional<Map<String, String>> properties)
+    {
+        this(
+                name,
+                type,
+                comment,
+                properties.orElse(ImmutableMap.of()));
+    }
+
+    public Column(
+            String name,
+            HiveType type,
+            Optional<String> comment,
+            Map<String, String> properties)
+    {
+        this.name = requireNonNull(name, "name is null");
+        this.type = requireNonNull(type, "type is null");
+        this.comment = requireNonNull(comment, "comment is null");
+        this.properties = ImmutableMap.copyOf(requireNonNull(properties, "properties is null"));
+    }
+
+    @JsonProperty
+    public String getName()
+    {
+        return name;
+    }
+
+    @JsonProperty
+    public HiveType getType()
+    {
+        return type;
+    }
+
+    @JsonProperty
+    public Optional<String> getComment()
+    {
+        return comment;
+    }
+
+    @JsonProperty
+    public Map<String, String> getProperties()
+    {
+        return properties;
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("name", name)
+                .add("type", type)
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Column column = (Column) o;
+        return Objects.equals(name, column.name) &&
+                Objects.equals(type, column.type) &&
+                Objects.equals(comment, column.comment) &&
+                Objects.equals(properties, column.properties);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(name, type, comment, properties);
+    }
+
+    public static List<Column> fromMetastoreModel(List<io.trino.plugin.hive.metastore.Column> metastoreColumns)
+    {
+        return metastoreColumns.stream()
+                .map(Column::fromMetastoreModel)
+                .collect(toImmutableList());
+    }
+
+    public static Column fromMetastoreModel(io.trino.plugin.hive.metastore.Column metastoreColumn)
+    {
+        return new Column(
+                metastoreColumn.getName(),
+                metastoreColumn.getType(),
+                metastoreColumn.getComment(),
+                metastoreColumn.getProperties());
+    }
+
+    public static List<io.trino.plugin.hive.metastore.Column> toMetastoreModel(List<Column> fileMetastoreColumns)
+    {
+        return fileMetastoreColumns.stream()
+                .map(Column::toMetastoreModel)
+                .collect(toImmutableList());
+    }
+
+    public static io.trino.plugin.hive.metastore.Column toMetastoreModel(Column fileMetastoreColumn)
+    {
+        return new io.trino.plugin.hive.metastore.Column(
+                fileMetastoreColumn.getName(),
+                fileMetastoreColumn.getType(),
+                fileMetastoreColumn.getComment(),
+                fileMetastoreColumn.getProperties());
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/DatabaseMetadata.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/DatabaseMetadata.java
index becd0a67b540..e58ed2f712ce 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/DatabaseMetadata.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/DatabaseMetadata.java
@@ -27,6 +27,7 @@
 public class DatabaseMetadata
 {
     private final Optional<String> writerVersion;
+    private final Optional<String> location;
     private final Optional<String> ownerName;
     private final Optional<PrincipalType> ownerType;
     private final Map<String, String> parameters;
@@ -34,11 +35,13 @@ public class DatabaseMetadata
     @JsonCreator
     public DatabaseMetadata(
             @JsonProperty("writerVersion") Optional<String> writerVersion,
+            @JsonProperty("location") Optional<String> location,
             @JsonProperty("ownerName") Optional<String> ownerName,
             @JsonProperty("ownerType") Optional<PrincipalType> ownerType,
             @JsonProperty("parameters") Map<String, String> parameters)
     {
         this.writerVersion = requireNonNull(writerVersion, "writerVersion is null");
+        this.location = requireNonNull(location, "location is null");
         this.ownerName = requireNonNull(ownerName, "ownerName is null");
         this.ownerType = requireNonNull(ownerType, "ownerType is null");
         this.parameters = ImmutableMap.copyOf(requireNonNull(parameters, "parameters is null"));
@@ -47,6 +50,7 @@ public DatabaseMetadata(
     public DatabaseMetadata(String currentVersion, Database database)
     {
         this.writerVersion = Optional.of(requireNonNull(currentVersion, "currentVersion is null"));
+        this.location = database.getLocation();
         this.ownerName = database.getOwnerName();
         this.ownerType = database.getOwnerType();
         this.parameters = database.getParameters();
@@ -58,6 +62,12 @@ public Optional<String> getWriterVersion()
         return writerVersion;
     }
 
+    @JsonProperty
+    public Optional<String> getLocation()
+    {
+        return location;
+    }
+
     @JsonProperty
     public Optional<String> getOwnerName()
     {
@@ -76,11 +86,11 @@ public Map<String, String> getParameters()
         return parameters;
     }
 
-    public Database toDatabase(String databaseName, String location)
+    public Database toDatabase(String databaseName, String databaseMetadataDirectory)
     {
         return Database.builder()
                 .setDatabaseName(databaseName)
-                .setLocation(Optional.of(location))
+                .setLocation(Optional.of(location.orElse(databaseMetadataDirectory)))
                 .setOwnerName(ownerName)
                 .setOwnerType(ownerType)
                 .setParameters(parameters)
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastore.java
index 7ded8a724ef0..8440287da119 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastore.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive.metastore.file;
 
-import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Splitter;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableList;
@@ -22,15 +22,15 @@
 import com.google.common.collect.ImmutableSet.Builder;
 import com.google.common.collect.Sets;
 import com.google.common.io.ByteStreams;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.json.JsonCodec;
-import io.trino.collect.cache.EvictableCacheBuilder;
-import io.trino.hdfs.DynamicHdfsConfiguration;
-import io.trino.hdfs.HdfsConfig;
-import io.trino.hdfs.HdfsConfiguration;
-import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.hdfs.HdfsContext;
-import io.trino.hdfs.HdfsEnvironment;
-import io.trino.hdfs.authentication.NoHdfsAuthentication;
+import io.trino.cache.EvictableCacheBuilder;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.TrinoOutputFile;
 import io.trino.plugin.hive.HiveBasicStatistics;
 import io.trino.plugin.hive.HiveColumnStatisticType;
 import io.trino.plugin.hive.HiveType;
@@ -40,12 +40,11 @@
 import io.trino.plugin.hive.SchemaAlreadyExistsException;
 import io.trino.plugin.hive.TableAlreadyExistsException;
 import io.trino.plugin.hive.TableType;
+import io.trino.plugin.hive.ViewReaderUtil;
 import io.trino.plugin.hive.acid.AcidTransaction;
-import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.HiveColumnStatistics;
 import io.trino.plugin.hive.metastore.HiveMetastore;
-import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
 import io.trino.plugin.hive.metastore.HivePrincipal;
 import io.trino.plugin.hive.metastore.HivePrivilegeInfo;
 import io.trino.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege;
@@ -60,24 +59,17 @@
 import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
-import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
-import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -95,11 +87,11 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.hash.Hashing.sha256;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_CONCURRENT_MODIFICATION_DETECTED;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_METASTORE_ERROR;
 import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
@@ -107,7 +99,7 @@
 import static io.trino.plugin.hive.TableType.EXTERNAL_TABLE;
 import static io.trino.plugin.hive.TableType.MANAGED_TABLE;
 import static io.trino.plugin.hive.TableType.MATERIALIZED_VIEW;
-import static io.trino.plugin.hive.TableType.VIRTUAL_VIEW;
+import static io.trino.plugin.hive.ViewReaderUtil.isSomeKindOfAView;
 import static io.trino.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege.OWNERSHIP;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.makePartitionName;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.verifyCanDropColumn;
@@ -120,10 +112,14 @@
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.updateStatisticsParameters;
 import static io.trino.plugin.hive.util.HiveUtil.DELTA_LAKE_PROVIDER;
 import static io.trino.plugin.hive.util.HiveUtil.SPARK_TABLE_PROVIDER_KEY;
+import static io.trino.plugin.hive.util.HiveUtil.escapePathName;
+import static io.trino.plugin.hive.util.HiveUtil.escapeSchemaName;
+import static io.trino.plugin.hive.util.HiveUtil.escapeTableName;
 import static io.trino.plugin.hive.util.HiveUtil.isIcebergTable;
 import static io.trino.plugin.hive.util.HiveUtil.toPartitionValues;
 import static io.trino.plugin.hive.util.HiveUtil.unescapePathName;
 import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
+import static io.trino.spi.StandardErrorCode.NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.security.PrincipalType.ROLE;
 import static io.trino.spi.security.PrincipalType.USER;
@@ -142,61 +138,41 @@ public class FileHiveMetastore
     private static final String ADMIN_ROLE_NAME = "admin";
     private static final String TRINO_SCHEMA_FILE_NAME_SUFFIX = ".trinoSchema";
     private static final String TRINO_PERMISSIONS_DIRECTORY_NAME = ".trinoPermissions";
+    private static final String TRINO_FUNCTIONS_DIRECTORY_NAME = ".trinoFunction";
     public static final String ROLES_FILE_NAME = ".roles";
     public static final String ROLE_GRANTS_FILE_NAME = ".roleGrants";
     // todo there should be a way to manage the admins list
     private static final Set<String> ADMIN_USERS = ImmutableSet.of("admin", "hive", "hdfs");
 
     // 128 is equals to the max database name length of Thrift Hive metastore
-    private static final int MAX_DATABASE_NAME_LENGTH = 128;
+    private static final int MAX_NAME_LENGTH = 128;
 
     private final String currentVersion;
     private final VersionCompatibility versionCompatibility;
-    private final HdfsEnvironment hdfsEnvironment;
-    private final Path catalogDirectory;
-    private final HdfsContext hdfsContext;
+    private final TrinoFileSystem fileSystem;
+    private final Location catalogDirectory;
+    private final boolean disableLocationChecks;
     private final boolean hideDeltaLakeTables;
-    private final FileSystem metadataFileSystem;
 
     private final JsonCodec<DatabaseMetadata> databaseCodec = JsonCodec.jsonCodec(DatabaseMetadata.class);
     private final JsonCodec<TableMetadata> tableCodec = JsonCodec.jsonCodec(TableMetadata.class);
     private final JsonCodec<PartitionMetadata> partitionCodec = JsonCodec.jsonCodec(PartitionMetadata.class);
     private final JsonCodec<List<PermissionMetadata>> permissionsCodec = JsonCodec.listJsonCodec(PermissionMetadata.class);
+    private final JsonCodec<LanguageFunction> functionCodec = JsonCodec.jsonCodec(LanguageFunction.class);
     private final JsonCodec<List<String>> rolesCodec = JsonCodec.listJsonCodec(String.class);
     private final JsonCodec<List<RoleGrant>> roleGrantsCodec = JsonCodec.listJsonCodec(RoleGrant.class);
 
     // TODO Remove this speed-up workaround once that https://github.com/trinodb/trino/issues/13115 gets implemented
     private final LoadingCache<String, List<String>> listTablesCache;
 
-    @VisibleForTesting
-    public static FileHiveMetastore createTestingFileHiveMetastore(File catalogDirectory)
-    {
-        HdfsConfig hdfsConfig = new HdfsConfig();
-        HdfsConfiguration hdfsConfiguration = new DynamicHdfsConfiguration(new HdfsConfigurationInitializer(hdfsConfig), ImmutableSet.of());
-        HdfsEnvironment hdfsEnvironment = new HdfsEnvironment(hdfsConfiguration, hdfsConfig, new NoHdfsAuthentication());
-        return new FileHiveMetastore(
-                new NodeVersion("testversion"),
-                hdfsEnvironment,
-                new HiveMetastoreConfig().isHideDeltaLakeTables(),
-                new FileHiveMetastoreConfig()
-                        .setCatalogDirectory(catalogDirectory.toURI().toString())
-                        .setMetastoreUser("test"));
-    }
-
-    public FileHiveMetastore(NodeVersion nodeVersion, HdfsEnvironment hdfsEnvironment, boolean hideDeltaLakeTables, FileHiveMetastoreConfig config)
+    public FileHiveMetastore(NodeVersion nodeVersion, TrinoFileSystemFactory fileSystemFactory, boolean hideDeltaLakeTables, FileHiveMetastoreConfig config)
     {
         this.currentVersion = nodeVersion.toString();
         this.versionCompatibility = requireNonNull(config.getVersionCompatibility(), "config.getVersionCompatibility() is null");
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
-        this.catalogDirectory = new Path(requireNonNull(config.getCatalogDirectory(), "catalogDirectory is null"));
-        this.hdfsContext = new HdfsContext(ConnectorIdentity.ofUser(config.getMetastoreUser()));
+        this.fileSystem = fileSystemFactory.create(ConnectorIdentity.ofUser(config.getMetastoreUser()));
+        this.catalogDirectory = Location.of(requireNonNull(config.getCatalogDirectory(), "catalogDirectory is null"));
+        this.disableLocationChecks = config.isDisableLocationChecks();
         this.hideDeltaLakeTables = hideDeltaLakeTables;
-        try {
-            metadataFileSystem = hdfsEnvironment.getFileSystem(hdfsContext, this.catalogDirectory);
-        }
-        catch (IOException e) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, e);
-        }
 
         listTablesCache = EvictableCacheBuilder.newBuilder()
                 .expireAfterWrite(10, SECONDS)
@@ -216,17 +192,13 @@ public synchronized void createDatabase(Database database)
                 database.getComment(),
                 database.getParameters());
 
-        if (database.getLocation().isPresent()) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, "Database cannot be created with a location set");
-        }
-
         verifyDatabaseNameLength(database.getDatabaseName());
         verifyDatabaseNotExists(database.getDatabaseName());
 
-        Path databaseMetadataDirectory = getDatabaseMetadataDirectory(database.getDatabaseName());
+        Location databaseMetadataDirectory = getDatabaseMetadataDirectory(database.getDatabaseName());
         writeSchemaFile(DATABASE, databaseMetadataDirectory, databaseCodec, new DatabaseMetadata(currentVersion, database), false);
         try {
-            metadataFileSystem.mkdirs(databaseMetadataDirectory);
+            fileSystem.createDirectory(databaseMetadataDirectory);
         }
         catch (IOException e) {
             throw new TrinoException(HIVE_METASTORE_ERROR, "Could not write database", e);
@@ -265,14 +237,11 @@ public synchronized void renameDatabase(String databaseName, String newDatabaseN
         getRequiredDatabase(databaseName);
         verifyDatabaseNotExists(newDatabaseName);
 
-        Path oldDatabaseMetadataDirectory = getDatabaseMetadataDirectory(databaseName);
-        Path newDatabaseMetadataDirectory = getDatabaseMetadataDirectory(newDatabaseName);
+        Location oldDatabaseMetadataDirectory = getDatabaseMetadataDirectory(databaseName);
+        Location newDatabaseMetadataDirectory = getDatabaseMetadataDirectory(newDatabaseName);
         try {
             renameSchemaFile(DATABASE, oldDatabaseMetadataDirectory, newDatabaseMetadataDirectory);
-
-            if (!metadataFileSystem.rename(oldDatabaseMetadataDirectory, newDatabaseMetadataDirectory)) {
-                throw new TrinoException(HIVE_METASTORE_ERROR, "Could not rename database metadata directory");
-            }
+            fileSystem.renameDirectory(oldDatabaseMetadataDirectory, newDatabaseMetadataDirectory);
         }
         catch (IOException e) {
             throw new TrinoException(HIVE_METASTORE_ERROR, e);
@@ -283,7 +252,7 @@ public synchronized void renameDatabase(String databaseName, String newDatabaseN
     public synchronized void setDatabaseOwner(String databaseName, HivePrincipal principal)
     {
         Database database = getRequiredDatabase(databaseName);
-        Path databaseMetadataDirectory = getDatabaseMetadataDirectory(database.getDatabaseName());
+        Location databaseMetadataDirectory = getDatabaseMetadataDirectory(database.getDatabaseName());
         Database newDatabase = Database.builder(database)
                 .setOwnerName(Optional.of(principal.getName()))
                 .setOwnerType(Optional.of(principal.getType()))
@@ -300,7 +269,7 @@ public synchronized Optional<Database> getDatabase(String databaseName)
         // Database names are stored lowercase. Accept non-lowercase name for compatibility with HMS (and Glue)
         String normalizedName = databaseName.toLowerCase(ENGLISH);
 
-        Path databaseMetadataDirectory = getDatabaseMetadataDirectory(normalizedName);
+        Location databaseMetadataDirectory = getDatabaseMetadataDirectory(normalizedName);
         return readSchemaFile(DATABASE, databaseMetadataDirectory, databaseCodec)
                 .map(databaseMetadata -> {
                     checkVersion(databaseMetadata.getWriterVersion());
@@ -316,8 +285,15 @@ private Database getRequiredDatabase(String databaseName)
 
     private void verifyDatabaseNameLength(String databaseName)
     {
-        if (databaseName.length() > MAX_DATABASE_NAME_LENGTH) {
-            throw new TrinoException(NOT_SUPPORTED, format("Schema name must be shorter than or equal to '%s' characters but got '%s'", MAX_DATABASE_NAME_LENGTH, databaseName.length()));
+        if (databaseName.length() > MAX_NAME_LENGTH) {
+            throw new TrinoException(NOT_SUPPORTED, format("Schema name must be shorter than or equal to '%s' characters but got '%s'", MAX_NAME_LENGTH, databaseName.length()));
+        }
+    }
+
+    private void verifyTableNameLength(String tableName)
+    {
+        if (tableName.length() > MAX_NAME_LENGTH) {
+            throw new TrinoException(NOT_SUPPORTED, format("Table name must be shorter than or equal to '%s' characters but got '%s'", MAX_NAME_LENGTH, tableName.length()));
         }
     }
 
@@ -331,38 +307,62 @@ private void verifyDatabaseNotExists(String databaseName)
     @Override
     public synchronized List<String> getAllDatabases()
     {
-        return getChildSchemaDirectories(DATABASE, catalogDirectory).stream()
-                .map(Path::getName)
-                .collect(toImmutableList());
+        try {
+            String prefix = catalogDirectory.toString();
+            Set<String> databases = new HashSet<>();
+
+            FileIterator iterator = fileSystem.listFiles(catalogDirectory);
+            while (iterator.hasNext()) {
+                Location location = iterator.next().location();
+
+                String child = location.toString().substring(prefix.length());
+                if (child.startsWith("/")) {
+                    child = child.substring(1);
+                }
+
+                int length = child.length() - TRINO_SCHEMA_FILE_NAME_SUFFIX.length();
+                if ((length > 1) && !child.contains("/") && child.startsWith(".") &&
+                        child.endsWith(TRINO_SCHEMA_FILE_NAME_SUFFIX)) {
+                    databases.add(child.substring(1, length));
+                }
+            }
+
+            return ImmutableList.copyOf(databases);
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
     }
 
     @Override
     public synchronized void createTable(Table table, PrincipalPrivileges principalPrivileges)
     {
+        verifyTableNameLength(table.getTableName());
         verifyDatabaseExists(table.getDatabaseName());
         verifyTableNotExists(table.getDatabaseName(), table.getTableName());
 
-        Path tableMetadataDirectory = getTableMetadataDirectory(table);
+        Location tableMetadataDirectory = getTableMetadataDirectory(table);
 
         // validate table location
-        if (table.getTableType().equals(VIRTUAL_VIEW.name())) {
+        if (isSomeKindOfAView(table)) {
             checkArgument(table.getStorage().getLocation().isEmpty(), "Storage location for view must be empty");
         }
         else if (table.getTableType().equals(MANAGED_TABLE.name())) {
-            if (!(new Path(table.getStorage().getLocation()).toString().contains(tableMetadataDirectory.toString()))) {
+            if (!disableLocationChecks && !table.getStorage().getLocation().contains(tableMetadataDirectory.toString())) {
                 throw new TrinoException(HIVE_METASTORE_ERROR, "Table directory must be " + tableMetadataDirectory);
             }
         }
         else if (table.getTableType().equals(EXTERNAL_TABLE.name())) {
-            try {
-                Path externalLocation = new Path(table.getStorage().getLocation());
-                FileSystem externalFileSystem = hdfsEnvironment.getFileSystem(hdfsContext, externalLocation);
-                if (!externalFileSystem.isDirectory(externalLocation)) {
-                    throw new TrinoException(HIVE_METASTORE_ERROR, "External table location does not exist");
+            if (!disableLocationChecks) {
+                try {
+                    Location externalLocation = Location.of(table.getStorage().getLocation());
+                    if (!fileSystem.directoryExists(externalLocation).orElse(true)) {
+                        throw new TrinoException(HIVE_METASTORE_ERROR, "External table location does not exist");
+                    }
+                }
+                catch (IOException e) {
+                    throw new TrinoException(HIVE_METASTORE_ERROR, "Could not validate external location", e);
                 }
-            }
-            catch (IOException e) {
-                throw new TrinoException(HIVE_METASTORE_ERROR, "Could not validate external location", e);
             }
         }
         else if (!table.getTableType().equals(MATERIALIZED_VIEW.name())) {
@@ -385,7 +385,7 @@ public synchronized Optional<Table> getTable(String databaseName, String tableNa
         requireNonNull(databaseName, "databaseName is null");
         requireNonNull(tableName, "tableName is null");
 
-        Path tableMetadataDirectory = getTableMetadataDirectory(databaseName, tableName);
+        Location tableMetadataDirectory = getTableMetadataDirectory(databaseName, tableName);
         return readSchemaFile(TABLE, tableMetadataDirectory, tableCodec)
                 .map(tableMetadata -> {
                     checkVersion(tableMetadata.getWriterVersion());
@@ -402,7 +402,7 @@ public synchronized void setTableOwner(String databaseName, String tableName, Hi
         }
 
         Table table = getRequiredTable(databaseName, tableName);
-        Path tableMetadataDirectory = getTableMetadataDirectory(table);
+        Location tableMetadataDirectory = getTableMetadataDirectory(table);
         Table newTable = Table.builder(table)
                 .setOwner(Optional.of(principal.getName()))
                 .build();
@@ -424,7 +424,7 @@ public synchronized PartitionStatistics getTableStatistics(Table table)
 
     private synchronized PartitionStatistics getTableStatistics(String databaseName, String tableName)
     {
-        Path tableMetadataDirectory = getTableMetadataDirectory(databaseName, tableName);
+        Location tableMetadataDirectory = getTableMetadataDirectory(databaseName, tableName);
         TableMetadata tableMetadata = readSchemaFile(TABLE, tableMetadataDirectory, tableCodec)
                 .orElseThrow(() -> new TableNotFoundException(new SchemaTableName(databaseName, tableName)));
         checkVersion(tableMetadata.getWriterVersion());
@@ -442,7 +442,7 @@ public synchronized Map<String, PartitionStatistics> getPartitionStatistics(Tabl
 
     private synchronized PartitionStatistics getPartitionStatisticsInternal(Table table, List<String> partitionValues)
     {
-        Path partitionDirectory = getPartitionMetadataDirectory(table, ImmutableList.copyOf(partitionValues));
+        Location partitionDirectory = getPartitionMetadataDirectory(table, ImmutableList.copyOf(partitionValues));
         PartitionMetadata partitionMetadata = readSchemaFile(PARTITION, partitionDirectory, partitionCodec)
                 .orElseThrow(() -> new PartitionNotFoundException(table.getSchemaTableName(), partitionValues));
         HiveBasicStatistics basicStatistics = getHiveBasicStatistics(partitionMetadata.getParameters());
@@ -475,7 +475,7 @@ public synchronized void updateTableStatistics(String databaseName, String table
         PartitionStatistics originalStatistics = getTableStatistics(databaseName, tableName);
         PartitionStatistics updatedStatistics = update.apply(originalStatistics);
 
-        Path tableMetadataDirectory = getTableMetadataDirectory(databaseName, tableName);
+        Location tableMetadataDirectory = getTableMetadataDirectory(databaseName, tableName);
         TableMetadata tableMetadata = readSchemaFile(TABLE, tableMetadataDirectory, tableCodec)
                 .orElseThrow(() -> new TableNotFoundException(new SchemaTableName(databaseName, tableName)));
         checkVersion(tableMetadata.getWriterVersion());
@@ -495,7 +495,7 @@ public synchronized void updatePartitionStatistics(Table table, Map<String, Func
             PartitionStatistics updatedStatistics = update.apply(originalStatistics);
 
             List<String> partitionValues = extractPartitionValues(partitionName);
-            Path partitionDirectory = getPartitionMetadataDirectory(table, partitionValues);
+            Location partitionDirectory = getPartitionMetadataDirectory(table, partitionValues);
             PartitionMetadata partitionMetadata = readSchemaFile(PARTITION, partitionDirectory, partitionCodec)
                     .orElseThrow(() -> new PartitionNotFoundException(new SchemaTableName(table.getDatabaseName(), table.getTableName()), partitionValues));
 
@@ -517,6 +517,12 @@ public synchronized List<String> getAllTables(String databaseName)
                 .collect(toImmutableList());
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllTables()
+    {
+        return Optional.empty();
+    }
+
     @Override
     public synchronized List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue)
     {
@@ -550,11 +556,35 @@ private List<String> doListAllTables(String databaseName)
             return ImmutableList.of();
         }
 
-        Path databaseMetadataDirectory = getDatabaseMetadataDirectory(databaseName);
-        List<String> tables = getChildSchemaDirectories(TABLE, databaseMetadataDirectory).stream()
-                .map(Path::getName)
-                .collect(toImmutableList());
-        return tables;
+        Location metadataDirectory = getDatabaseMetadataDirectory(databaseName);
+        try {
+            String prefix = metadataDirectory.toString();
+            Set<String> tables = new HashSet<>();
+
+            FileIterator iterator = fileSystem.listFiles(metadataDirectory);
+            while (iterator.hasNext()) {
+                Location location = iterator.next().location();
+
+                String child = location.toString().substring(prefix.length());
+                if (child.startsWith("/")) {
+                    child = child.substring(1);
+                }
+
+                if (child.startsWith(".") || (child.indexOf('/') != child.lastIndexOf('/'))) {
+                    continue;
+                }
+
+                int length = child.length() - TRINO_SCHEMA_FILE_NAME_SUFFIX.length() - 1;
+                if ((length >= 1) && child.endsWith("/" + TRINO_SCHEMA_FILE_NAME_SUFFIX)) {
+                    tables.add(child.substring(0, length));
+                }
+            }
+
+            return ImmutableList.copyOf(tables);
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
     }
 
     @Override
@@ -564,11 +594,17 @@ public synchronized List<String> getAllViews(String databaseName)
                 .map(tableName -> getTable(databaseName, tableName))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .filter(table -> table.getTableType().equals(VIRTUAL_VIEW.name()))
+                .filter(ViewReaderUtil::isSomeKindOfAView)
                 .map(Table::getTableName)
                 .collect(toImmutableList());
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllViews()
+    {
+        return Optional.empty();
+    }
+
     @Override
     public synchronized void dropTable(String databaseName, String tableName, boolean deleteData)
     {
@@ -577,7 +613,7 @@ public synchronized void dropTable(String databaseName, String tableName, boolea
 
         Table table = getRequiredTable(databaseName, tableName);
 
-        Path tableMetadataDirectory = getTableMetadataDirectory(databaseName, tableName);
+        Location tableMetadataDirectory = getTableMetadataDirectory(databaseName, tableName);
 
         if (deleteData) {
             deleteDirectoryAndSchema(TABLE, tableMetadataDirectory);
@@ -600,7 +636,7 @@ public synchronized void replaceTable(String databaseName, String tableName, Tab
             throw new TrinoException(HIVE_CONCURRENT_MODIFICATION_DETECTED, "Cannot update Iceberg table: supplied previous location does not match current location");
         }
 
-        Path tableMetadataDirectory = getTableMetadataDirectory(table);
+        Location tableMetadataDirectory = getTableMetadataDirectory(table);
         writeSchemaFile(TABLE, tableMetadataDirectory, tableCodec, new TableMetadata(currentVersion, newTable), true);
 
         // replace existing permissions
@@ -626,26 +662,21 @@ public synchronized void renameTable(String databaseName, String tableName, Stri
         getRequiredDatabase(newDatabaseName);
 
         // verify new table does not exist
+        verifyTableNameLength(newTableName);
         verifyTableNotExists(newDatabaseName, newTableName);
 
-        Path oldPath = getTableMetadataDirectory(databaseName, tableName);
-        Path newPath = getTableMetadataDirectory(newDatabaseName, newTableName);
+        Location oldPath = getTableMetadataDirectory(databaseName, tableName);
+        Location newPath = getTableMetadataDirectory(newDatabaseName, newTableName);
 
         try {
             if (isIcebergTable(table)) {
-                if (!metadataFileSystem.mkdirs(newPath)) {
-                    throw new TrinoException(HIVE_METASTORE_ERROR, "Could not create new table directory");
-                }
+                fileSystem.createDirectory(newPath);
                 // Iceberg metadata references files in old path, so these cannot be moved. Moving table description (metadata from metastore perspective) only.
-                if (!metadataFileSystem.rename(getSchemaPath(TABLE, oldPath), getSchemaPath(TABLE, newPath))) {
-                    throw new TrinoException(HIVE_METASTORE_ERROR, "Could not rename table schema file");
-                }
+                fileSystem.renameFile(getSchemaFile(TABLE, oldPath), getSchemaFile(TABLE, newPath));
                 // TODO drop data files when table is being dropped
             }
             else {
-                if (!metadataFileSystem.rename(oldPath, newPath)) {
-                    throw new TrinoException(HIVE_METASTORE_ERROR, "Could not rename table directory");
-                }
+                fileSystem.renameDirectory(oldPath, newPath);
             }
         }
         catch (IOException e) {
@@ -681,7 +712,7 @@ public synchronized void commentColumn(String databaseName, String tableName, St
             ImmutableList.Builder<Column> newDataColumns = ImmutableList.builder();
             for (Column fieldSchema : oldTable.getDataColumns()) {
                 if (fieldSchema.getName().equals(columnName)) {
-                    newDataColumns.add(new Column(columnName, fieldSchema.getType(), comment));
+                    newDataColumns.add(new Column(columnName, fieldSchema.getType(), comment, fieldSchema.getProperties()));
                 }
                 else {
                     newDataColumns.add(fieldSchema);
@@ -704,7 +735,7 @@ public synchronized void addColumn(String databaseName, String tableName, String
                     currentVersion,
                     ImmutableList.<Column>builder()
                             .addAll(oldTable.getDataColumns())
-                            .add(new Column(columnName, columnType, Optional.ofNullable(columnComment)))
+                            .add(new Column(columnName, columnType, Optional.ofNullable(columnComment), ImmutableMap.of()))
                             .build());
         });
     }
@@ -729,7 +760,7 @@ public synchronized void renameColumn(String databaseName, String tableName, Str
             ImmutableList.Builder<Column> newDataColumns = ImmutableList.builder();
             for (Column fieldSchema : oldTable.getDataColumns()) {
                 if (fieldSchema.getName().equals(oldColumnName)) {
-                    newDataColumns.add(new Column(newColumnName, fieldSchema.getType(), fieldSchema.getComment()));
+                    newDataColumns.add(new Column(newColumnName, fieldSchema.getType(), fieldSchema.getComment(), fieldSchema.getProperties()));
                 }
                 else {
                     newDataColumns.add(fieldSchema);
@@ -766,7 +797,7 @@ private void alterTable(String databaseName, String tableName, Function<TableMet
         requireNonNull(databaseName, "databaseName is null");
         requireNonNull(tableName, "tableName is null");
 
-        Path tableMetadataDirectory = getTableMetadataDirectory(databaseName, tableName);
+        Location tableMetadataDirectory = getTableMetadataDirectory(databaseName, tableName);
 
         TableMetadata oldTableSchema = readSchemaFile(TABLE, tableMetadataDirectory, tableCodec)
                 .orElseThrow(() -> new TableNotFoundException(new SchemaTableName(databaseName, tableName)));
@@ -793,23 +824,24 @@ public synchronized void addPartitions(String databaseName, String tableName, Li
         checkArgument(EnumSet.of(MANAGED_TABLE, EXTERNAL_TABLE).contains(tableType), "Invalid table type: %s", tableType);
 
         try {
-            Map<Path, byte[]> schemaFiles = new LinkedHashMap<>();
+            Map<Location, byte[]> schemaFiles = new LinkedHashMap<>();
             for (PartitionWithStatistics partitionWithStatistics : partitions) {
                 Partition partition = partitionWithStatistics.getPartition();
                 verifiedPartition(table, partition);
-                Path partitionMetadataDirectory = getPartitionMetadataDirectory(table, partition.getValues());
-                Path schemaPath = getSchemaPath(PARTITION, partitionMetadataDirectory);
-                if (metadataFileSystem.exists(schemaPath)) {
+                Location partitionMetadataDirectory = getPartitionMetadataDirectory(table, partition.getValues());
+                Location schemaPath = getSchemaFile(PARTITION, partitionMetadataDirectory);
+
+                if (fileSystem.directoryExists(schemaPath).orElse(false)) {
                     throw new TrinoException(HIVE_METASTORE_ERROR, "Partition already exists");
                 }
                 byte[] schemaJson = partitionCodec.toJsonBytes(new PartitionMetadata(table, partitionWithStatistics));
                 schemaFiles.put(schemaPath, schemaJson);
             }
 
-            Set<Path> createdFiles = new LinkedHashSet<>();
+            Set<Location> createdFiles = new LinkedHashSet<>();
             try {
-                for (Entry<Path, byte[]> entry : schemaFiles.entrySet()) {
-                    try (OutputStream outputStream = metadataFileSystem.create(entry.getKey())) {
+                for (Entry<Location, byte[]> entry : schemaFiles.entrySet()) {
+                    try (OutputStream outputStream = fileSystem.newOutputFile(entry.getKey()).create()) {
                         createdFiles.add(entry.getKey());
                         outputStream.write(entry.getValue());
                     }
@@ -819,11 +851,12 @@ public synchronized void addPartitions(String databaseName, String tableName, Li
                 }
             }
             catch (Throwable e) {
-                for (Path createdFile : createdFiles) {
-                    try {
-                        metadataFileSystem.delete(createdFile, false);
-                    }
-                    catch (IOException ignored) {
+                try {
+                    fileSystem.deleteFiles(createdFiles);
+                }
+                catch (IOException ex) {
+                    if (!e.equals(ex)) {
+                        e.addSuppressed(ex);
                     }
                 }
                 throw e;
@@ -836,21 +869,20 @@ public synchronized void addPartitions(String databaseName, String tableName, Li
 
     private void verifiedPartition(Table table, Partition partition)
     {
-        Path partitionMetadataDirectory = getPartitionMetadataDirectory(table, partition.getValues());
+        Location partitionMetadataDirectory = getPartitionMetadataDirectory(table, partition.getValues());
 
         if (table.getTableType().equals(MANAGED_TABLE.name())) {
-            if (!partitionMetadataDirectory.equals(new Path(partition.getStorage().getLocation()))) {
+            if (!partitionMetadataDirectory.equals(Location.of(partition.getStorage().getLocation()))) {
                 throw new TrinoException(HIVE_METASTORE_ERROR, "Partition directory must be " + partitionMetadataDirectory);
             }
         }
         else if (table.getTableType().equals(EXTERNAL_TABLE.name())) {
             try {
-                Path externalLocation = new Path(partition.getStorage().getLocation());
-                FileSystem externalFileSystem = hdfsEnvironment.getFileSystem(hdfsContext, externalLocation);
-                if (!externalFileSystem.isDirectory(externalLocation)) {
+                Location externalLocation = Location.of(partition.getStorage().getLocation());
+                if (!fileSystem.directoryExists(externalLocation).orElse(true)) {
                     throw new TrinoException(HIVE_METASTORE_ERROR, "External partition location does not exist");
                 }
-                if (isChildDirectory(catalogDirectory, externalLocation)) {
+                if (externalLocation.toString().startsWith(catalogDirectory.toString())) {
                     throw new TrinoException(HIVE_METASTORE_ERROR, "External partition location cannot be inside the system metadata directory");
                 }
             }
@@ -876,7 +908,7 @@ public synchronized void dropPartition(String databaseName, String tableName, Li
         }
         Table table = tableReference.get();
 
-        Path partitionMetadataDirectory = getPartitionMetadataDirectory(table, partitionValues);
+        Location partitionMetadataDirectory = getPartitionMetadataDirectory(table, partitionValues);
         if (deleteData) {
             deleteDirectoryAndSchema(PARTITION, partitionMetadataDirectory);
         }
@@ -893,7 +925,7 @@ public synchronized void alterPartition(String databaseName, String tableName, P
         Partition partition = partitionWithStatistics.getPartition();
         verifiedPartition(table, partition);
 
-        Path partitionMetadataDirectory = getPartitionMetadataDirectory(table, partition.getValues());
+        Location partitionMetadataDirectory = getPartitionMetadataDirectory(table, partition.getValues());
         writeSchemaFile(PARTITION, partitionMetadataDirectory, partitionCodec, new PartitionMetadata(table, partitionWithStatistics), true);
     }
 
@@ -1018,9 +1050,9 @@ private synchronized Set<RoleGrant> listRoleGrantsSanitized()
 
     private Set<RoleGrant> removeDuplicatedEntries(Set<RoleGrant> grants)
     {
-        Map<RoleGranteeTuple, RoleGrant> map = new HashMap<>();
+        Map<RoleGrantee, RoleGrant> map = new HashMap<>();
         for (RoleGrant grant : grants) {
-            RoleGranteeTuple tuple = new RoleGranteeTuple(grant.getRoleName(), HivePrincipal.from(grant.getGrantee()));
+            RoleGrantee tuple = new RoleGrantee(grant.getRoleName(), HivePrincipal.from(grant.getGrantee()));
             map.merge(tuple, grant, (first, second) -> first.isGrantable() ? first : second);
         }
         return ImmutableSet.copyOf(map.values());
@@ -1063,9 +1095,9 @@ private synchronized Optional<List<String>> getAllPartitionNames(String database
         }
         Table table = tableReference.get();
 
-        Path tableMetadataDirectory = getTableMetadataDirectory(table);
+        Location tableMetadataDirectory = getTableMetadataDirectory(table);
 
-        List<ArrayDeque<String>> partitions = listPartitions(tableMetadataDirectory, table.getPartitionColumns());
+        List<List<String>> partitions = listPartitions(tableMetadataDirectory, table.getPartitionColumns());
 
         List<String> partitionNames = partitions.stream()
                 .map(partitionValues -> makePartitionName(table.getPartitionColumns(), ImmutableList.copyOf(partitionValues)))
@@ -1077,44 +1109,40 @@ private synchronized Optional<List<String>> getAllPartitionNames(String database
 
     private boolean isValidPartition(Table table, String partitionName)
     {
+        Location location = getSchemaFile(PARTITION, getPartitionMetadataDirectory(table, partitionName));
         try {
-            return metadataFileSystem.exists(getSchemaPath(PARTITION, getPartitionMetadataDirectory(table, partitionName)));
+            return fileSystem.newInputFile(location).exists();
         }
         catch (IOException e) {
             return false;
         }
     }
 
-    private List<ArrayDeque<String>> listPartitions(Path director, List<Column> partitionColumns)
+    private List<List<String>> listPartitions(Location directory, List<io.trino.plugin.hive.metastore.Column> partitionColumns)
     {
         if (partitionColumns.isEmpty()) {
             return ImmutableList.of();
         }
 
         try {
-            String directoryPrefix = partitionColumns.get(0).getName() + '=';
-
-            List<ArrayDeque<String>> partitionValues = new ArrayList<>();
-            for (FileStatus fileStatus : metadataFileSystem.listStatus(director)) {
-                if (!fileStatus.isDirectory()) {
-                    continue;
-                }
-                if (!fileStatus.getPath().getName().startsWith(directoryPrefix)) {
-                    continue;
+            List<List<String>> partitionValues = new ArrayList<>();
+            FileIterator iterator = fileSystem.listFiles(directory);
+            while (iterator.hasNext()) {
+                Location location = iterator.next().location();
+                String path = location.toString().substring(directory.toString().length());
+
+                if (path.startsWith("/")) {
+                    path = path.substring(1);
                 }
 
-                List<ArrayDeque<String>> childPartitionValues;
-                if (partitionColumns.size() == 1) {
-                    childPartitionValues = ImmutableList.of(new ArrayDeque<>());
-                }
-                else {
-                    childPartitionValues = listPartitions(fileStatus.getPath(), partitionColumns.subList(1, partitionColumns.size()));
+                if (!path.endsWith("/" + TRINO_SCHEMA_FILE_NAME_SUFFIX)) {
+                    continue;
                 }
+                path = path.substring(0, path.length() - TRINO_SCHEMA_FILE_NAME_SUFFIX.length() - 1);
 
-                String value = unescapePathName(fileStatus.getPath().getName().substring(directoryPrefix.length()));
-                for (ArrayDeque<String> childPartition : childPartitionValues) {
-                    childPartition.addFirst(value);
-                    partitionValues.add(childPartition);
+                List<String> values = toPartitionValues(path);
+                if (values.size() == partitionColumns.size()) {
+                    partitionValues.add(values);
                 }
             }
             return partitionValues;
@@ -1130,7 +1158,7 @@ public synchronized Optional<Partition> getPartition(Table table, List<String> p
         requireNonNull(table, "table is null");
         requireNonNull(partitionValues, "partitionValues is null");
 
-        Path partitionDirectory = getPartitionMetadataDirectory(table, partitionValues);
+        Location partitionDirectory = getPartitionMetadataDirectory(table, partitionValues);
         return readSchemaFile(PARTITION, partitionDirectory, partitionCodec)
                 .map(partitionMetadata -> partitionMetadata.toPartition(table.getDatabaseName(), table.getTableName(), partitionValues, partitionDirectory.toString()));
     }
@@ -1160,7 +1188,7 @@ public synchronized Map<String, Optional<Partition>> getPartitionsByNames(Table
     public synchronized Set<HivePrivilegeInfo> listTablePrivileges(String databaseName, String tableName, Optional<String> tableOwner, Optional<HivePrincipal> principal)
     {
         Table table = getRequiredTable(databaseName, tableName);
-        Path permissionsDirectory = getPermissionsDirectory(table);
+        Location permissionsDirectory = getPermissionsDirectory(table);
         if (principal.isEmpty()) {
             Builder<HivePrivilegeInfo> privileges = ImmutableSet.<HivePrivilegeInfo>builder()
                     .addAll(readAllPermissions(permissionsDirectory));
@@ -1198,6 +1226,111 @@ public synchronized void revokeTablePrivileges(String databaseName, String table
         setTablePrivileges(grantee, databaseName, tableName, Sets.difference(currentPrivileges, privilegesToRemove));
     }
 
+    @Override
+    public synchronized boolean functionExists(String databaseName, String functionName, String signatureToken)
+    {
+        Location directory = getFunctionsDirectory(databaseName);
+        Location file = getFunctionFile(directory, functionName, signatureToken);
+        try {
+            return fileSystem.newInputFile(file).exists();
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+    }
+
+    @Override
+    public synchronized Collection<LanguageFunction> getFunctions(String databaseName)
+    {
+        return getFunctions(databaseName, Optional.empty());
+    }
+
+    @Override
+    public synchronized Collection<LanguageFunction> getFunctions(String databaseName, String functionName)
+    {
+        return getFunctions(databaseName, Optional.of(functionName));
+    }
+
+    private synchronized Collection<LanguageFunction> getFunctions(String databaseName, Optional<String> functionName)
+    {
+        ImmutableList.Builder<LanguageFunction> functions = ImmutableList.builder();
+        Location directory = getFunctionsDirectory(databaseName);
+        try {
+            FileIterator iterator = fileSystem.listFiles(directory);
+            while (iterator.hasNext()) {
+                Location location = iterator.next().location();
+                List<String> parts = Splitter.on('=').splitToList(location.fileName());
+                if (parts.size() != 2) {
+                    continue;
+                }
+
+                String name = unescapePathName(parts.get(0));
+                if (functionName.isPresent() && !name.equals(functionName.get())) {
+                    continue;
+                }
+
+                readFile("function", location, functionCodec).ifPresent(functions::add);
+            }
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+        return functions.build();
+    }
+
+    @Override
+    public synchronized void createFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        Location directory = getFunctionsDirectory(databaseName);
+        Location file = getFunctionFile(directory, functionName, function.signatureToken());
+        byte[] json = functionCodec.toJsonBytes(function);
+
+        try {
+            if (fileSystem.newInputFile(file).exists()) {
+                throw new TrinoException(ALREADY_EXISTS, "Function already exists");
+            }
+            try (OutputStream outputStream = fileSystem.newOutputFile(file).create()) {
+                outputStream.write(json);
+            }
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, "Could not write function", e);
+        }
+    }
+
+    @Override
+    public synchronized void replaceFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        Location directory = getFunctionsDirectory(databaseName);
+        Location file = getFunctionFile(directory, functionName, function.signatureToken());
+        byte[] json = functionCodec.toJsonBytes(function);
+
+        try {
+            try (OutputStream outputStream = fileSystem.newOutputFile(file).createOrOverwrite()) {
+                outputStream.write(json);
+            }
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, "Could not write function", e);
+        }
+    }
+
+    @Override
+    public synchronized void dropFunction(String databaseName, String functionName, String signatureToken)
+    {
+        Location directory = getFunctionsDirectory(databaseName);
+        Location file = getFunctionFile(directory, functionName, signatureToken);
+        try {
+            if (!fileSystem.newInputFile(file).exists()) {
+                throw new TrinoException(NOT_FOUND, "Function not found");
+            }
+            fileSystem.deleteFile(file);
+        }
+        catch (IOException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+    }
+
     private synchronized void setTablePrivileges(
             HivePrincipal grantee,
             String databaseName,
@@ -1212,14 +1345,11 @@ private synchronized void setTablePrivileges(
         try {
             Table table = getRequiredTable(databaseName, tableName);
 
-            Path permissionsDirectory = getPermissionsDirectory(table);
+            Location permissionsDirectory = getPermissionsDirectory(table);
 
-            boolean created = metadataFileSystem.mkdirs(permissionsDirectory);
-            if (!created && !metadataFileSystem.isDirectory(permissionsDirectory)) {
-                throw new TrinoException(HIVE_METASTORE_ERROR, "Could not create permissions directory");
-            }
+            fileSystem.createDirectory(permissionsDirectory);
 
-            Path permissionFilePath = getPermissionsPath(permissionsDirectory, grantee);
+            Location permissionFilePath = getPermissionsPath(permissionsDirectory, grantee);
             List<PermissionMetadata> permissions = privileges.stream()
                     .map(hivePrivilegeInfo -> new PermissionMetadata(hivePrivilegeInfo.getHivePrivilege(), hivePrivilegeInfo.isGrantOption(), grantee))
                     .collect(toList());
@@ -1233,67 +1363,44 @@ private synchronized void setTablePrivileges(
     private synchronized void deleteTablePrivileges(Table table)
     {
         try {
-            Path permissionsDirectory = getPermissionsDirectory(table);
-            metadataFileSystem.delete(permissionsDirectory, true);
+            Location permissionsDirectory = getPermissionsDirectory(table);
+            fileSystem.deleteDirectory(permissionsDirectory);
         }
         catch (IOException e) {
             throw new TrinoException(HIVE_METASTORE_ERROR, "Could not delete table permissions", e);
         }
     }
 
-    private List<Path> getChildSchemaDirectories(SchemaType type, Path metadataDirectory)
-    {
-        try {
-            if (!metadataFileSystem.isDirectory(metadataDirectory)) {
-                return ImmutableList.of();
-            }
-
-            ImmutableList.Builder<Path> childSchemaDirectories = ImmutableList.builder();
-            for (FileStatus child : metadataFileSystem.listStatus(metadataDirectory)) {
-                if (!child.isDirectory()) {
-                    continue;
-                }
-                Path childPath = child.getPath();
-                if (childPath.getName().startsWith(".")) {
-                    continue;
-                }
-                if (metadataFileSystem.isFile(getSchemaPath(type, childPath))) {
-                    childSchemaDirectories.add(childPath);
-                }
-            }
-            return childSchemaDirectories.build();
-        }
-        catch (IOException e) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, e);
-        }
-    }
-
-    private Set<HivePrivilegeInfo> readPermissionsFile(Path permissionFilePath)
+    private Set<HivePrivilegeInfo> readPermissionsFile(Location permissionFilePath)
     {
         return readFile("permissions", permissionFilePath, permissionsCodec).orElse(ImmutableList.of()).stream()
                 .map(PermissionMetadata::toHivePrivilegeInfo)
                 .collect(toImmutableSet());
     }
 
-    private Set<HivePrivilegeInfo> readAllPermissions(Path permissionsDirectory)
+    private Set<HivePrivilegeInfo> readAllPermissions(Location permissionsDirectory)
     {
         try {
-            return Arrays.stream(metadataFileSystem.listStatus(permissionsDirectory))
-                    .filter(FileStatus::isFile)
-                    .filter(file -> !file.getPath().getName().startsWith("."))
-                    .flatMap(file -> readPermissionsFile(file.getPath()).stream())
-                    .collect(toImmutableSet());
+            ImmutableSet.Builder<HivePrivilegeInfo> permissions = ImmutableSet.builder();
+            FileIterator iterator = fileSystem.listFiles(permissionsDirectory);
+            while (iterator.hasNext()) {
+                Location location = iterator.next().location();
+                if (!location.fileName().startsWith(".")) {
+                    permissions.addAll(readPermissionsFile(location));
+                }
+            }
+            return permissions.build();
         }
         catch (IOException e) {
             throw new TrinoException(HIVE_METASTORE_ERROR, e);
         }
     }
 
-    private void deleteDirectoryAndSchema(SchemaType type, Path metadataDirectory)
+    private void deleteDirectoryAndSchema(SchemaType type, Location metadataDirectory)
     {
         try {
-            Path schemaPath = getSchemaPath(type, metadataDirectory);
-            if (!metadataFileSystem.isFile(schemaPath)) {
+            Location schemaPath = getSchemaFile(type, metadataDirectory);
+            if (!fileSystem.newInputFile(schemaPath).exists()) {
                 // if there is no schema file, assume this is not a database, partition or table
                 return;
             }
@@ -1302,9 +1409,7 @@ private void deleteDirectoryAndSchema(SchemaType type, Path metadataDirectory)
             // (For cases when the schema file isn't in the metadata directory.)
             deleteSchemaFile(type, metadataDirectory);
 
-            if (!metadataFileSystem.delete(metadataDirectory, true)) {
-                throw new TrinoException(HIVE_METASTORE_ERROR, "Could not delete metadata directory");
-            }
+            fileSystem.deleteDirectory(metadataDirectory);
         }
         catch (IOException e) {
             throw new TrinoException(HIVE_METASTORE_ERROR, e);
@@ -1331,48 +1436,46 @@ private void checkVersion(Optional<String> writerVersion)
                 UNSAFE_ASSUME_COMPATIBILITY));
     }
 
-    private <T> Optional<T> readSchemaFile(SchemaType type, Path metadataDirectory, JsonCodec<T> codec)
+    private <T> Optional<T> readSchemaFile(SchemaType type, Location metadataDirectory, JsonCodec<T> codec)
     {
-        return readFile(type + " schema", getSchemaPath(type, metadataDirectory), codec);
+        return readFile(type + " schema", getSchemaFile(type, metadataDirectory), codec);
     }
 
-    private <T> Optional<T> readFile(String type, Path path, JsonCodec<T> codec)
+    private <T> Optional<T> readFile(String type, Location file, JsonCodec<T> codec)
     {
         try {
-            if (!metadataFileSystem.isFile(path)) {
-                return Optional.empty();
-            }
-
-            try (FSDataInputStream inputStream = metadataFileSystem.open(path)) {
+            try (InputStream inputStream = fileSystem.newInputFile(file).newStream()) {
                 byte[] json = ByteStreams.toByteArray(inputStream);
                 return Optional.of(codec.fromJson(json));
             }
         }
+        catch (FileNotFoundException e) {
+            return Optional.empty();
+        }
         catch (Exception e) {
             throw new TrinoException(HIVE_METASTORE_ERROR, "Could not read " + type, e);
         }
     }
 
-    private <T> void writeSchemaFile(SchemaType type, Path directory, JsonCodec<T> codec, T value, boolean overwrite)
+    private <T> void writeSchemaFile(SchemaType type, Location directory, JsonCodec<T> codec, T value, boolean overwrite)
     {
-        writeFile(type + " schema", getSchemaPath(type, directory), codec, value, overwrite);
+        writeFile(type + " schema", getSchemaFile(type, directory), codec, value, overwrite);
     }
 
-    private <T> void writeFile(String type, Path path, JsonCodec<T> codec, T value, boolean overwrite)
+    private <T> void writeFile(String type, Location location, JsonCodec<T> codec, T value, boolean overwrite)
     {
         try {
             byte[] json = codec.toJsonBytes(value);
 
             if (!overwrite) {
-                if (metadataFileSystem.exists(path)) {
+                if (fileSystem.newInputFile(location).exists()) {
                     throw new TrinoException(HIVE_METASTORE_ERROR, type + " file already exists");
                 }
             }
 
-            metadataFileSystem.mkdirs(path.getParent());
-
             // todo implement safer overwrite code
-            try (OutputStream outputStream = metadataFileSystem.create(path, overwrite)) {
+            TrinoOutputFile output = fileSystem.newOutputFile(location);
+            try (OutputStream outputStream = overwrite ? output.createOrOverwrite() : output.create()) {
                 outputStream.write(json);
             }
         }
@@ -1384,12 +1487,10 @@ private <T> void writeFile(String type, Path path, JsonCodec<T> codec, T value,
         }
     }
 
-    private void renameSchemaFile(SchemaType type, Path oldMetadataDirectory, Path newMetadataDirectory)
+    private void renameSchemaFile(SchemaType type, Location oldMetadataDirectory, Location newMetadataDirectory)
     {
         try {
-            if (!metadataFileSystem.rename(getSchemaPath(type, oldMetadataDirectory), getSchemaPath(type, newMetadataDirectory))) {
-                throw new TrinoException(HIVE_METASTORE_ERROR, "Could not rename " + type + " schema");
-            }
+            fileSystem.renameFile(getSchemaFile(type, oldMetadataDirectory), getSchemaFile(type, newMetadataDirectory));
         }
         catch (IOException e) {
             throw new TrinoException(HIVE_METASTORE_ERROR, "Could not rename " + type + " schema", e);
@@ -1399,12 +1500,10 @@ private void renameSchemaFile(SchemaType type, Path oldMetadataDirectory, Path n
         }
     }
 
-    private void deleteSchemaFile(SchemaType type, Path metadataDirectory)
+    private void deleteSchemaFile(SchemaType type, Location metadataDirectory)
     {
         try {
-            if (!metadataFileSystem.delete(getSchemaPath(type, metadataDirectory), false)) {
-                throw new TrinoException(HIVE_METASTORE_ERROR, "Could not delete " + type + " schema");
-            }
+            fileSystem.deleteFile(getSchemaFile(type, metadataDirectory));
         }
         catch (IOException e) {
             throw new TrinoException(HIVE_METASTORE_ERROR, "Could not delete " + type + " schema", e);
@@ -1414,122 +1513,91 @@ private void deleteSchemaFile(SchemaType type, Path metadataDirectory)
         }
     }
 
-    private Path getDatabaseMetadataDirectory(String databaseName)
+    private Location getDatabaseMetadataDirectory(String databaseName)
+    {
+        return catalogDirectory.appendPath(escapeSchemaName(databaseName));
+    }
+
+    private Location getFunctionsDirectory(String databaseName)
     {
-        return new Path(catalogDirectory, databaseName);
+        return getDatabaseMetadataDirectory(databaseName).appendPath(TRINO_FUNCTIONS_DIRECTORY_NAME);
     }
 
-    private Path getTableMetadataDirectory(Table table)
+    private Location getTableMetadataDirectory(Table table)
     {
         return getTableMetadataDirectory(table.getDatabaseName(), table.getTableName());
     }
 
-    private Path getTableMetadataDirectory(String databaseName, String tableName)
+    private Location getTableMetadataDirectory(String databaseName, String tableName)
     {
-        return new Path(getDatabaseMetadataDirectory(databaseName), tableName);
+        return getDatabaseMetadataDirectory(databaseName).appendPath(escapeTableName(tableName));
     }
 
-    private Path getPartitionMetadataDirectory(Table table, List<String> values)
+    private Location getPartitionMetadataDirectory(Table table, List<String> values)
     {
         String partitionName = makePartitionName(table.getPartitionColumns(), values);
         return getPartitionMetadataDirectory(table, partitionName);
     }
 
-    private Path getPartitionMetadataDirectory(Table table, String partitionName)
+    private Location getPartitionMetadataDirectory(Table table, String partitionName)
     {
-        Path tableMetadataDirectory = getTableMetadataDirectory(table);
-        return new Path(tableMetadataDirectory, partitionName);
+        return getTableMetadataDirectory(table).appendPath(partitionName);
     }
 
-    private Path getPermissionsDirectory(Table table)
+    private Location getPermissionsDirectory(Table table)
     {
-        return new Path(getTableMetadataDirectory(table), TRINO_PERMISSIONS_DIRECTORY_NAME);
+        return getTableMetadataDirectory(table).appendPath(TRINO_PERMISSIONS_DIRECTORY_NAME);
     }
 
-    private static Path getPermissionsPath(Path permissionsDirectory, HivePrincipal grantee)
+    private static Location getPermissionsPath(Location permissionsDirectory, HivePrincipal grantee)
     {
-        return new Path(permissionsDirectory, grantee.getType().toString().toLowerCase(Locale.US) + "_" + grantee.getName());
+        String granteeType = grantee.getType().toString().toLowerCase(Locale.US);
+        return permissionsDirectory.appendPath(granteeType + "_" + grantee.getName());
     }
 
-    private Path getRolesFile()
+    private Location getRolesFile()
     {
-        return new Path(catalogDirectory, ROLES_FILE_NAME);
+        return catalogDirectory.appendPath(ROLES_FILE_NAME);
     }
 
-    private Path getRoleGrantsFile()
+    private Location getRoleGrantsFile()
     {
-        return new Path(catalogDirectory, ROLE_GRANTS_FILE_NAME);
+        return catalogDirectory.appendPath(ROLE_GRANTS_FILE_NAME);
     }
 
-    private static Path getSchemaPath(SchemaType type, Path metadataDirectory)
+    private static Location getSchemaFile(SchemaType type, Location metadataDirectory)
     {
         if (type == DATABASE) {
-            return new Path(
-                    requireNonNull(metadataDirectory.getParent(), "Can't use root directory as database path"),
-                    format(".%s%s", metadataDirectory.getName(), TRINO_SCHEMA_FILE_NAME_SUFFIX));
+            String path = metadataDirectory.toString();
+            if (path.endsWith("/")) {
+                path = path.substring(0, path.length() - 1);
+            }
+            checkArgument(!path.isEmpty(), "Can't use root directory as database path: %s", metadataDirectory);
+            int index = path.lastIndexOf('/');
+            if (index >= 0) {
+                path = path.substring(0, index + 1) + "." + path.substring(index + 1);
+            }
+            else {
+                path = "." + path;
+            }
+            return Location.of(path).appendSuffix(TRINO_SCHEMA_FILE_NAME_SUFFIX);
         }
-        return new Path(metadataDirectory, TRINO_SCHEMA_FILE_NAME_SUFFIX);
+        return metadataDirectory.appendPath(TRINO_SCHEMA_FILE_NAME_SUFFIX);
     }
 
-    private static boolean isChildDirectory(Path parentDirectory, Path childDirectory)
+    private static Location getFunctionFile(Location directory, String functionName, String signatureToken)
     {
-        if (parentDirectory.equals(childDirectory)) {
-            return true;
-        }
-        if (childDirectory.isRoot()) {
-            return false;
-        }
-        return isChildDirectory(parentDirectory, childDirectory.getParent());
+        return directory.appendPath("%s=%s".formatted(
+                escapePathName(functionName),
+                sha256().hashUnencodedChars(signatureToken)));
     }
 
-    private static class RoleGranteeTuple
+    private record RoleGrantee(String role, HivePrincipal grantee)
     {
-        private final String role;
-        private final HivePrincipal grantee;
-
-        private RoleGranteeTuple(String role, HivePrincipal grantee)
-        {
-            this.role = requireNonNull(role, "role is null");
-            this.grantee = requireNonNull(grantee, "grantee is null");
-        }
-
-        public String getRole()
-        {
-            return role;
-        }
-
-        public HivePrincipal getGrantee()
-        {
-            return grantee;
-        }
-
-        @Override
-        public boolean equals(Object o)
-        {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            RoleGranteeTuple that = (RoleGranteeTuple) o;
-            return Objects.equals(role, that.role) &&
-                    Objects.equals(grantee, that.grantee);
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hash(role, grantee);
-        }
-
-        @Override
-        public String toString()
+        private RoleGrantee
         {
-            return toStringHelper(this)
-                    .add("role", role)
-                    .add("grantee", grantee)
-                    .toString();
+            requireNonNull(role, "role is null");
+            requireNonNull(grantee, "grantee is null");
         }
     }
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastoreConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastoreConfig.java
index ce404a15bec0..75c1baec81ca 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastoreConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastoreConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.DefunctConfig;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import static io.trino.plugin.hive.metastore.file.FileHiveMetastoreConfig.VersionCompatibility.NOT_SUPPORTED;
 
@@ -34,6 +33,7 @@ public enum VersionCompatibility
 
     private String catalogDirectory;
     private VersionCompatibility versionCompatibility = NOT_SUPPORTED;
+    private boolean disableLocationChecks; // TODO this should probably be true by default, to align with well-behaving metastores other than HMS
     private String metastoreUser = "presto";
 
     @NotNull
@@ -63,6 +63,18 @@ public FileHiveMetastoreConfig setVersionCompatibility(VersionCompatibility vers
         return this;
     }
 
+    public boolean isDisableLocationChecks()
+    {
+        return disableLocationChecks;
+    }
+
+    @Config("hive.metastore.disable-location-checks")
+    public FileHiveMetastoreConfig setDisableLocationChecks(boolean disableLocationChecks)
+    {
+        this.disableLocationChecks = disableLocationChecks;
+        return this;
+    }
+
     @NotNull
     public String getMetastoreUser()
     {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastoreFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastoreFactory.java
index 57f44d5192cd..6c74be568e15 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastoreFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastoreFactory.java
@@ -13,15 +13,14 @@
  */
 package io.trino.plugin.hive.metastore.file;
 
-import io.trino.hdfs.HdfsEnvironment;
+import com.google.inject.Inject;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.hive.HideDeltaLakeTables;
 import io.trino.plugin.hive.NodeVersion;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
 import io.trino.spi.security.ConnectorIdentity;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 public class FileHiveMetastoreFactory
@@ -30,10 +29,10 @@ public class FileHiveMetastoreFactory
     private final FileHiveMetastore metastore;
 
     @Inject
-    public FileHiveMetastoreFactory(NodeVersion nodeVersion, HdfsEnvironment hdfsEnvironment, @HideDeltaLakeTables boolean hideDeltaLakeTables, FileHiveMetastoreConfig config)
+    public FileHiveMetastoreFactory(NodeVersion nodeVersion, TrinoFileSystemFactory fileSystemFactory, @HideDeltaLakeTables boolean hideDeltaLakeTables, FileHiveMetastoreConfig config)
     {
         // file metastore does not support impersonation, so just create a single shared instance
-        metastore = new FileHiveMetastore(nodeVersion, hdfsEnvironment, hideDeltaLakeTables, config);
+        metastore = new FileHiveMetastore(nodeVersion, fileSystemFactory, hideDeltaLakeTables, config);
     }
 
     @Override
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/TableMetadata.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/TableMetadata.java
index 0779faac37e7..770b6fd6dea3 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/TableMetadata.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/TableMetadata.java
@@ -19,7 +19,6 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.plugin.hive.HiveBucketProperty;
 import io.trino.plugin.hive.HiveStorageFormat;
-import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.HiveColumnStatistics;
 import io.trino.plugin.hive.metastore.Storage;
 import io.trino.plugin.hive.metastore.StorageFormat;
@@ -47,6 +46,7 @@ public class TableMetadata
     private final Map<String, String> parameters;
 
     private final Optional<HiveStorageFormat> storageFormat;
+    private final Optional<StorageFormat> originalStorageFormat;
     private final Optional<HiveBucketProperty> bucketProperty;
     private final Map<String, String> serdeParameters;
 
@@ -66,6 +66,7 @@ public TableMetadata(
             @JsonProperty("partitionColumns") List<Column> partitionColumns,
             @JsonProperty("parameters") Map<String, String> parameters,
             @JsonProperty("storageFormat") Optional<HiveStorageFormat> storageFormat,
+            @JsonProperty("originalStorageFormat") Optional<StorageFormat> originalStorageFormat,
             @JsonProperty("bucketProperty") Optional<HiveBucketProperty> bucketProperty,
             @JsonProperty("serdeParameters") Map<String, String> serdeParameters,
             @JsonProperty("externalLocation") Optional<String> externalLocation,
@@ -81,6 +82,7 @@ public TableMetadata(
         this.parameters = ImmutableMap.copyOf(requireNonNull(parameters, "parameters is null"));
 
         this.storageFormat = requireNonNull(storageFormat, "storageFormat is null");
+        this.originalStorageFormat = requireNonNull(originalStorageFormat, "originalStorageFormat is null");
         this.bucketProperty = requireNonNull(bucketProperty, "bucketProperty is null");
         this.serdeParameters = requireNonNull(serdeParameters, "serdeParameters is null");
         this.externalLocation = requireNonNull(externalLocation, "externalLocation is null");
@@ -102,14 +104,20 @@ public TableMetadata(String currentVersion, Table table)
         writerVersion = Optional.of(requireNonNull(currentVersion, "currentVersion is null"));
         owner = table.getOwner();
         tableType = table.getTableType();
-        dataColumns = table.getDataColumns();
-        partitionColumns = table.getPartitionColumns();
+        dataColumns = Column.fromMetastoreModel(table.getDataColumns());
+        partitionColumns = Column.fromMetastoreModel(table.getPartitionColumns());
         parameters = table.getParameters();
 
         StorageFormat tableFormat = table.getStorage().getStorageFormat();
         storageFormat = Arrays.stream(HiveStorageFormat.values())
                 .filter(format -> tableFormat.equals(StorageFormat.fromHiveStorageFormat(format)))
                 .findFirst();
+        if (storageFormat.isPresent()) {
+            originalStorageFormat = Optional.empty();
+        }
+        else {
+            originalStorageFormat = Optional.of(tableFormat);
+        }
         bucketProperty = table.getStorage().getBucketProperty();
         serdeParameters = table.getStorage().getSerdeParameters();
 
@@ -182,6 +190,12 @@ public Optional<HiveStorageFormat> getStorageFormat()
         return storageFormat;
     }
 
+    @JsonProperty
+    public Optional<StorageFormat> getOriginalStorageFormat()
+    {
+        return originalStorageFormat;
+    }
+
     @JsonProperty
     public Optional<HiveBucketProperty> getBucketProperty()
     {
@@ -228,6 +242,7 @@ public TableMetadata withDataColumns(String currentVersion, List<Column> dataCol
                 partitionColumns,
                 parameters,
                 storageFormat,
+                originalStorageFormat,
                 bucketProperty,
                 serdeParameters,
                 externalLocation,
@@ -246,6 +261,7 @@ public TableMetadata withParameters(String currentVersion, Map<String, String> p
                 partitionColumns,
                 parameters,
                 storageFormat,
+                originalStorageFormat,
                 bucketProperty,
                 serdeParameters,
                 externalLocation,
@@ -264,6 +280,7 @@ public TableMetadata withColumnStatistics(String currentVersion, Map<String, Hiv
                 partitionColumns,
                 parameters,
                 storageFormat,
+                originalStorageFormat,
                 bucketProperty,
                 serdeParameters,
                 externalLocation,
@@ -281,12 +298,14 @@ public Table toTable(String databaseName, String tableName, String location)
                 tableType,
                 Storage.builder()
                         .setLocation(externalLocation.or(() -> Optional.ofNullable(parameters.get(LOCATION_PROPERTY))).orElse(location))
-                        .setStorageFormat(storageFormat.map(StorageFormat::fromHiveStorageFormat).orElse(VIEW_STORAGE_FORMAT))
+                        .setStorageFormat(storageFormat.map(StorageFormat::fromHiveStorageFormat)
+                                .or(() -> originalStorageFormat)
+                                .orElse(VIEW_STORAGE_FORMAT))
                         .setBucketProperty(bucketProperty)
                         .setSerdeParameters(serdeParameters)
                         .build(),
-                dataColumns,
-                partitionColumns,
+                Column.toMetastoreModel(dataColumns),
+                Column.toMetastoreModel(partitionColumns),
                 parameters,
                 viewOriginalText,
                 viewExpandedText,
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/DefaultGlueColumnStatisticsProviderFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/DefaultGlueColumnStatisticsProviderFactory.java
index bddefc6be066..c08a3f545aa0 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/DefaultGlueColumnStatisticsProviderFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/DefaultGlueColumnStatisticsProviderFactory.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.hive.metastore.glue;
 
 import com.amazonaws.services.glue.AWSGlueAsync;
-
-import javax.inject.Inject;
+import com.google.inject.Inject;
 
 import java.util.concurrent.Executor;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/DefaultGlueMetastoreTableFilterProvider.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/DefaultGlueMetastoreTableFilterProvider.java
index 63ef87298ec3..8e463704a527 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/DefaultGlueMetastoreTableFilterProvider.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/DefaultGlueMetastoreTableFilterProvider.java
@@ -14,17 +14,14 @@
 package io.trino.plugin.hive.metastore.glue;
 
 import com.amazonaws.services.glue.model.Table;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.trino.plugin.hive.HideDeltaLakeTables;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
-import java.util.Map;
 import java.util.function.Predicate;
 
-import static com.google.common.base.MoreObjects.firstNonNull;
-import static io.trino.plugin.hive.util.HiveUtil.DELTA_LAKE_PROVIDER;
-import static io.trino.plugin.hive.util.HiveUtil.SPARK_TABLE_PROVIDER_KEY;
+import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableParameters;
+import static io.trino.plugin.hive.util.HiveUtil.isDeltaLakeTable;
 import static java.util.function.Predicate.not;
 
 public class DefaultGlueMetastoreTableFilterProvider
@@ -42,14 +39,8 @@ public DefaultGlueMetastoreTableFilterProvider(@HideDeltaLakeTables boolean hide
     public Predicate<Table> get()
     {
         if (hideDeltaLakeTables) {
-            return not(DefaultGlueMetastoreTableFilterProvider::isDeltaLakeTable);
+            return not(table -> isDeltaLakeTable(getTableParameters(table)));
         }
         return table -> true;
     }
-
-    public static boolean isDeltaLakeTable(Table table)
-    {
-        Map<String, String> parameters = firstNonNull(table.getParameters(), Map.of());
-        return parameters.getOrDefault(SPARK_TABLE_PROVIDER_KEY, "").equalsIgnoreCase(DELTA_LAKE_PROVIDER);
-    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/ForGlueColumnStatisticsRead.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/ForGlueColumnStatisticsRead.java
index 15125b3c1fc8..5636c42a9354 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/ForGlueColumnStatisticsRead.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/ForGlueColumnStatisticsRead.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive.metastore.glue;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,5 +25,5 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForGlueColumnStatisticsRead {}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/ForGlueColumnStatisticsWrite.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/ForGlueColumnStatisticsWrite.java
index 40795d333e89..f6f7f2731ac5 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/ForGlueColumnStatisticsWrite.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/ForGlueColumnStatisticsWrite.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive.metastore.glue;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,5 +25,5 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForGlueColumnStatisticsWrite {}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/ForGlueHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/ForGlueHiveMetastore.java
index fb5af240f501..bb718759adf0 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/ForGlueHiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/ForGlueHiveMetastore.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive.metastore.glue;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,5 +25,5 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForGlueHiveMetastore {}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueClientUtil.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueClientUtil.java
index 4d010d88b6e0..dbfdcf2067ca 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueClientUtil.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueClientUtil.java
@@ -20,12 +20,11 @@
 import com.amazonaws.metrics.RequestMetricCollector;
 import com.amazonaws.services.glue.AWSGlueAsync;
 import com.amazonaws.services.glue.AWSGlueAsyncClientBuilder;
-import com.google.common.collect.ImmutableList;
 
-import java.util.Optional;
+import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.plugin.hive.aws.AwsCurrentRegionHolder.getCurrentRegionFromEC2Metadata;
+import static io.trino.hdfs.s3.AwsCurrentRegionHolder.getCurrentRegionFromEC2Metadata;
 
 public final class GlueClientUtil
 {
@@ -34,7 +33,7 @@ private GlueClientUtil() {}
     public static AWSGlueAsync createAsyncGlueClient(
             GlueHiveMetastoreConfig config,
             AWSCredentialsProvider credentialsProvider,
-            Optional<RequestHandler2> requestHandler,
+            Set<RequestHandler2> requestHandlers,
             RequestMetricCollector metricsCollector)
     {
         ClientConfiguration clientConfig = new ClientConfiguration()
@@ -44,10 +43,7 @@ public static AWSGlueAsync createAsyncGlueClient(
                 .withMetricsCollector(metricsCollector)
                 .withClientConfiguration(clientConfig);
 
-        ImmutableList.Builder<RequestHandler2> requestHandlers = ImmutableList.builder();
-        requestHandler.ifPresent(requestHandlers::add);
-        config.getCatalogId().ifPresent(catalogId -> requestHandlers.add(new GlueCatalogIdRequestHandler(catalogId)));
-        asyncGlueClientBuilder.setRequestHandlers(requestHandlers.build().toArray(RequestHandler2[]::new));
+        asyncGlueClientBuilder.setRequestHandlers(requestHandlers.toArray(RequestHandler2[]::new));
 
         if (config.getGlueEndpointUrl().isPresent()) {
             checkArgument(config.getGlueRegion().isPresent(), "Glue region must be set when Glue endpoint URL is set");
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueCredentialsProvider.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueCredentialsProvider.java
index 3e9851a35a6d..a6f13e0b6d2a 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueCredentialsProvider.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueCredentialsProvider.java
@@ -20,11 +20,10 @@
 import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.securitytoken.AWSSecurityTokenServiceClientBuilder;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
-import static io.trino.plugin.hive.aws.AwsCurrentRegionHolder.getCurrentRegionFromEC2Metadata;
+import static io.trino.hdfs.s3.AwsCurrentRegionHolder.getCurrentRegionFromEC2Metadata;
 import static java.lang.String.format;
 
 public class GlueCredentialsProvider
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastore.java
index 55b0eeea8a52..ad2767817b65 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastore.java
@@ -30,10 +30,12 @@
 import com.amazonaws.services.glue.model.ConcurrentModificationException;
 import com.amazonaws.services.glue.model.CreateDatabaseRequest;
 import com.amazonaws.services.glue.model.CreateTableRequest;
+import com.amazonaws.services.glue.model.CreateUserDefinedFunctionRequest;
 import com.amazonaws.services.glue.model.DatabaseInput;
 import com.amazonaws.services.glue.model.DeleteDatabaseRequest;
 import com.amazonaws.services.glue.model.DeletePartitionRequest;
 import com.amazonaws.services.glue.model.DeleteTableRequest;
+import com.amazonaws.services.glue.model.DeleteUserDefinedFunctionRequest;
 import com.amazonaws.services.glue.model.EntityNotFoundException;
 import com.amazonaws.services.glue.model.ErrorDetail;
 import com.amazonaws.services.glue.model.GetDatabaseRequest;
@@ -48,6 +50,9 @@
 import com.amazonaws.services.glue.model.GetTableResult;
 import com.amazonaws.services.glue.model.GetTablesRequest;
 import com.amazonaws.services.glue.model.GetTablesResult;
+import com.amazonaws.services.glue.model.GetUserDefinedFunctionRequest;
+import com.amazonaws.services.glue.model.GetUserDefinedFunctionsRequest;
+import com.amazonaws.services.glue.model.GetUserDefinedFunctionsResult;
 import com.amazonaws.services.glue.model.PartitionError;
 import com.amazonaws.services.glue.model.PartitionInput;
 import com.amazonaws.services.glue.model.PartitionValueList;
@@ -56,6 +61,8 @@
 import com.amazonaws.services.glue.model.UpdateDatabaseRequest;
 import com.amazonaws.services.glue.model.UpdatePartitionRequest;
 import com.amazonaws.services.glue.model.UpdateTableRequest;
+import com.amazonaws.services.glue.model.UpdateUserDefinedFunctionRequest;
+import com.amazonaws.services.glue.model.UserDefinedFunctionInput;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Throwables;
@@ -64,16 +71,21 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import com.google.inject.Inject;
 import dev.failsafe.Failsafe;
 import dev.failsafe.RetryPolicy;
 import io.airlift.concurrent.MoreFutures;
 import io.airlift.log.Logger;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.hdfs.DynamicHdfsConfiguration;
 import io.trino.hdfs.HdfsConfig;
 import io.trino.hdfs.HdfsConfiguration;
 import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.hdfs.HdfsContext;
 import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
 import io.trino.hdfs.authentication.NoHdfsAuthentication;
 import io.trino.plugin.hive.HiveColumnStatisticType;
 import io.trino.plugin.hive.HiveType;
@@ -98,25 +110,25 @@
 import io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter;
 import io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.GluePartitionConverter;
 import io.trino.plugin.hive.util.HiveUtil;
-import io.trino.plugin.hive.util.HiveWriteUtils;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnNotFoundException;
 import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
-import org.apache.hadoop.fs.Path;
+import jakarta.annotation.Nullable;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
+import java.io.IOException;
 import java.time.Duration;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -131,8 +143,9 @@
 import java.util.concurrent.Future;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
-import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.Comparators.lexicographical;
@@ -140,6 +153,8 @@
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_METADATA;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_METASTORE_ERROR;
 import static io.trino.plugin.hive.TableType.MANAGED_TABLE;
 import static io.trino.plugin.hive.TableType.VIRTUAL_VIEW;
@@ -148,13 +163,18 @@
 import static io.trino.plugin.hive.metastore.MetastoreUtil.verifyCanDropColumn;
 import static io.trino.plugin.hive.metastore.glue.AwsSdkUtil.getPaginatedResults;
 import static io.trino.plugin.hive.metastore.glue.GlueClientUtil.createAsyncGlueClient;
+import static io.trino.plugin.hive.metastore.glue.converter.GlueInputConverter.convertFunction;
 import static io.trino.plugin.hive.metastore.glue.converter.GlueInputConverter.convertPartition;
+import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableParameters;
 import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableTypeNullable;
 import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.mappedCopy;
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.getHiveBasicStatistics;
+import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.metastoreFunctionName;
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.updateStatisticsParameters;
+import static io.trino.plugin.hive.util.HiveUtil.escapeSchemaName;
 import static io.trino.plugin.hive.util.HiveUtil.toPartitionValues;
 import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
+import static io.trino.spi.StandardErrorCode.FUNCTION_NOT_FOUND;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.security.PrincipalType.USER;
 import static java.util.Objects.requireNonNull;
@@ -176,15 +196,14 @@ public class GlueHiveMetastore
     private static final int BATCH_UPDATE_PARTITION_MAX_PAGE_SIZE = 100;
     private static final int AWS_GLUE_GET_PARTITIONS_MAX_RESULTS = 1000;
     private static final Comparator<Iterable<String>> PARTITION_VALUE_COMPARATOR = lexicographical(String.CASE_INSENSITIVE_ORDER);
-    private static final Predicate<com.amazonaws.services.glue.model.Table> VIEWS_FILTER = table -> VIRTUAL_VIEW.name().equals(getTableTypeNullable(table));
+    private static final Predicate<com.amazonaws.services.glue.model.Table> SOME_KIND_OF_VIEW_FILTER = table -> VIRTUAL_VIEW.name().equals(getTableTypeNullable(table));
     private static final RetryPolicy<?> CONCURRENT_MODIFICATION_EXCEPTION_RETRY_POLICY = RetryPolicy.builder()
             .handleIf(throwable -> Throwables.getRootCause(throwable) instanceof ConcurrentModificationException)
             .withDelay(Duration.ofMillis(100))
             .withMaxRetries(3)
             .build();
 
-    private final HdfsEnvironment hdfsEnvironment;
-    private final HdfsContext hdfsContext;
+    private final TrinoFileSystem fileSystem;
     private final AWSGlueAsync glueClient;
     private final Optional<String> defaultDir;
     private final int partitionSegments;
@@ -196,7 +215,7 @@ public class GlueHiveMetastore
 
     @Inject
     public GlueHiveMetastore(
-            HdfsEnvironment hdfsEnvironment,
+            TrinoFileSystemFactory fileSystemFactory,
             GlueHiveMetastoreConfig glueConfig,
             @ForGlueHiveMetastore Executor partitionsReadExecutor,
             GlueColumnStatisticsProviderFactory columnStatisticsProviderFactory,
@@ -204,8 +223,7 @@ public GlueHiveMetastore(
             @ForGlueHiveMetastore GlueMetastoreStats stats,
             @ForGlueHiveMetastore Predicate<com.amazonaws.services.glue.model.Table> tableFilter)
     {
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
-        this.hdfsContext = new HdfsContext(ConnectorIdentity.ofUser(DEFAULT_METASTORE_USER));
+        this.fileSystem = fileSystemFactory.create(ConnectorIdentity.ofUser(DEFAULT_METASTORE_USER));
         this.glueClient = requireNonNull(glueClient, "glueClient is null");
         this.defaultDir = glueConfig.getDefaultWarehouseDir();
         this.partitionSegments = glueConfig.getPartitionSegments();
@@ -226,11 +244,11 @@ public static GlueHiveMetastore createTestingGlueHiveMetastore(java.nio.file.Pat
         GlueHiveMetastoreConfig glueConfig = new GlueHiveMetastoreConfig()
                 .setDefaultWarehouseDir(defaultWarehouseDir.toUri().toString());
         return new GlueHiveMetastore(
-                hdfsEnvironment,
+                new HdfsFileSystemFactory(hdfsEnvironment, new TrinoHdfsFileSystemStats()),
                 glueConfig,
                 directExecutor(),
                 new DefaultGlueColumnStatisticsProviderFactory(directExecutor(), directExecutor()),
-                createAsyncGlueClient(glueConfig, DefaultAWSCredentialsProviderChain.getInstance(), Optional.empty(), stats.newRequestMetricsCollector()),
+                createAsyncGlueClient(glueConfig, DefaultAWSCredentialsProviderChain.getInstance(), ImmutableSet.of(), stats.newRequestMetricsCollector()),
                 stats,
                 table -> true);
     }
@@ -318,14 +336,36 @@ public PartitionStatistics getTableStatistics(Table table)
     @Override
     public Map<String, PartitionStatistics> getPartitionStatistics(Table table, List<Partition> partitions)
     {
-        return columnStatisticsProvider.getPartitionColumnStatistics(partitions).entrySet().stream()
+        Map<String, PartitionStatistics> partitionBasicStatistics = columnStatisticsProvider.getPartitionColumnStatistics(partitions).entrySet().stream()
                 .collect(toImmutableMap(
                         entry -> makePartitionName(table, entry.getKey()),
                         entry -> new PartitionStatistics(getHiveBasicStatistics(entry.getKey().getParameters()), entry.getValue())));
+
+        long tableRowCount = partitionBasicStatistics.values().stream()
+                .mapToLong(partitionStatistics -> partitionStatistics.getBasicStatistics().getRowCount().orElse(0))
+                .sum();
+        if (!partitionBasicStatistics.isEmpty() && tableRowCount == 0) {
+            // When the table has partitions, but row count statistics are set to zero, we treat this case as empty
+            // statistics to avoid underestimation in the CBO. This scenario may be caused when other engines are
+            // used to ingest data into partitioned hive tables.
+            partitionBasicStatistics = partitionBasicStatistics.entrySet().stream()
+                    .map(entry -> new SimpleEntry<>(
+                                entry.getKey(),
+                                entry.getValue().withBasicStatistics(entry.getValue().getBasicStatistics().withEmptyRowCount())))
+                    .collect(toImmutableMap(SimpleEntry::getKey, SimpleEntry::getValue));
+        }
+
+        return partitionBasicStatistics;
     }
 
     @Override
     public void updateTableStatistics(String databaseName, String tableName, AcidTransaction transaction, Function<PartitionStatistics, PartitionStatistics> update)
+    {
+        Failsafe.with(CONCURRENT_MODIFICATION_EXCEPTION_RETRY_POLICY)
+                .run(() -> updateTableStatisticsInternal(databaseName, tableName, transaction, update));
+    }
+
+    private void updateTableStatisticsInternal(String databaseName, String tableName, AcidTransaction transaction, Function<PartitionStatistics, PartitionStatistics> update)
     {
         Table table = getExistingTable(databaseName, tableName);
         if (transaction.isAcidTransactionRunning()) {
@@ -368,12 +408,12 @@ private void updatePartitionStatisticsBatch(Table table, Map<String, Function<Pa
                 .collect(toImmutableMap(HiveUtil::toPartitionValues, identity()));
 
         List<Partition> partitions = batchGetPartition(table, ImmutableList.copyOf(updates.keySet()));
-        Map<Partition, Map<String, HiveColumnStatistics>> statisticsPerPartition = columnStatisticsProvider.getPartitionColumnStatistics(partitions);
+        Map<String, PartitionStatistics> partitionsStatistics = getPartitionStatistics(table, partitions);
 
-        statisticsPerPartition.forEach((partition, columnStatistics) -> {
+        partitions.forEach(partition -> {
             Function<PartitionStatistics, PartitionStatistics> update = updates.get(partitionValuesToName.get(partition.getValues()));
 
-            PartitionStatistics currentStatistics = new PartitionStatistics(getHiveBasicStatistics(partition.getParameters()), columnStatistics);
+            PartitionStatistics currentStatistics = partitionsStatistics.get(makePartitionName(table, partition));
             PartitionStatistics updatedStatistics = update.apply(currentStatistics);
 
             Map<String, String> updatedStatisticsParameters = updateStatisticsParameters(partition.getParameters(), updatedStatistics.getBasicStatistics());
@@ -415,58 +455,41 @@ private void updatePartitionStatisticsBatch(Table table, Map<String, Function<Pa
     @Override
     public List<String> getAllTables(String databaseName)
     {
-        try {
-            List<String> tableNames = getPaginatedResults(
-                    glueClient::getTables,
-                    new GetTablesRequest()
-                            .withDatabaseName(databaseName),
-                    GetTablesRequest::setNextToken,
-                    GetTablesResult::getNextToken,
-                    stats.getGetTables())
-                    .map(GetTablesResult::getTableList)
-                    .flatMap(List::stream)
-                    .filter(tableFilter)
-                    .map(com.amazonaws.services.glue.model.Table::getName)
-                    .collect(toImmutableList());
-            return tableNames;
-        }
-        catch (EntityNotFoundException | AccessDeniedException e) {
-            // database does not exist or permission denied
-            return ImmutableList.of();
-        }
-        catch (AmazonServiceException e) {
-            throw new TrinoException(HIVE_METASTORE_ERROR, e);
-        }
+        return getTableNames(databaseName, tableFilter);
+    }
+
+    @Override
+    public Optional<List<SchemaTableName>> getAllTables()
+    {
+        return Optional.empty();
     }
 
     @Override
-    public synchronized List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue)
+    public List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue)
     {
-        return getAllViews(databaseName, table -> parameterValue.equals(firstNonNull(table.getParameters(), ImmutableMap.of()).get(parameterKey)));
+        return getTableNames(databaseName, table -> parameterValue.equals(getTableParameters(table).get(parameterKey)));
     }
 
     @Override
     public List<String> getAllViews(String databaseName)
     {
-        return getAllViews(databaseName, table -> true);
+        return getTableNames(databaseName, SOME_KIND_OF_VIEW_FILTER);
+    }
+
+    @Override
+    public Optional<List<SchemaTableName>> getAllViews()
+    {
+        return Optional.empty();
     }
 
-    private List<String> getAllViews(String databaseName, Predicate<com.amazonaws.services.glue.model.Table> additionalFilter)
+    private List<String> getTableNames(String databaseName, Predicate<com.amazonaws.services.glue.model.Table> filter)
     {
         try {
-            List<String> views = getPaginatedResults(
-                    glueClient::getTables,
-                    new GetTablesRequest()
-                            .withDatabaseName(databaseName),
-                    GetTablesRequest::setNextToken,
-                    GetTablesResult::getNextToken,
-                    stats.getGetTables())
-                    .map(GetTablesResult::getTableList)
-                    .flatMap(List::stream)
-                    .filter(VIEWS_FILTER.and(additionalFilter))
+            List<String> tableNames = getGlueTables(databaseName)
+                    .filter(filter)
                     .map(com.amazonaws.services.glue.model.Table::getName)
                     .collect(toImmutableList());
-            return views;
+            return tableNames;
         }
         catch (EntityNotFoundException | AccessDeniedException e) {
             // database does not exist or permission denied
@@ -481,9 +504,10 @@ private List<String> getAllViews(String databaseName, Predicate<com.amazonaws.se
     public void createDatabase(Database database)
     {
         if (database.getLocation().isEmpty() && defaultDir.isPresent()) {
-            String databaseLocation = new Path(defaultDir.get(), database.getDatabaseName()).toString();
+            Location location = Location.of(defaultDir.get())
+                    .appendPath(escapeSchemaName(database.getDatabaseName()));
             database = Database.builder(database)
-                    .setLocation(Optional.of(databaseLocation))
+                    .setLocation(Optional.of(location.toString()))
                     .build();
         }
 
@@ -500,11 +524,16 @@ public void createDatabase(Database database)
         }
 
         if (database.getLocation().isPresent()) {
-            HiveWriteUtils.createDirectory(hdfsContext, hdfsEnvironment, new Path(database.getLocation().get()));
+            Location location = Location.of(database.getLocation().get());
+            try {
+                fileSystem.createDirectory(location);
+            }
+            catch (IOException e) {
+                throw new TrinoException(HIVE_FILESYSTEM_ERROR, "Failed to create directory: " + location, e);
+            }
         }
     }
 
-    // TODO: respect deleteData
     @Override
     public void dropDatabase(String databaseName, boolean deleteData)
     {
@@ -527,7 +556,7 @@ public void dropDatabase(String databaseName, boolean deleteData)
         }
 
         if (deleteData) {
-            location.ifPresent(path -> deleteDir(hdfsContext, hdfsEnvironment, new Path(path), true));
+            location.map(Location::of).ifPresent(this::deleteDir);
         }
     }
 
@@ -593,7 +622,7 @@ public void dropTable(String databaseName, String tableName, boolean deleteData)
         Optional<String> location = table.getStorage().getOptionalLocation()
                 .filter(not(String::isEmpty));
         if (deleteData && isManagedTable(table) && location.isPresent()) {
-            deleteDir(hdfsContext, hdfsEnvironment, new Path(location.get()), true);
+            deleteDir(Location.of(location.get()));
         }
     }
 
@@ -602,10 +631,10 @@ private static boolean isManagedTable(Table table)
         return table.getTableType().equals(MANAGED_TABLE.name());
     }
 
-    private static void deleteDir(HdfsContext context, HdfsEnvironment hdfsEnvironment, Path path, boolean recursive)
+    private void deleteDir(Location path)
     {
         try {
-            hdfsEnvironment.getFileSystem(context, path).delete(path, recursive);
+            fileSystem.deleteDirectory(path);
         }
         catch (Exception e) {
             // don't fail if unable to delete path
@@ -680,7 +709,7 @@ private TableInput convertGlueTableToTableInput(com.amazonaws.services.glue.mode
                 .withViewExpandedText(glueTable.getViewExpandedText())
                 .withTableType(getTableTypeNullable(glueTable))
                 .withTargetTable(glueTable.getTargetTable())
-                .withParameters(glueTable.getParameters());
+                .withParameters(getTableParameters(glueTable));
     }
 
     @Override
@@ -718,7 +747,56 @@ public void setTableOwner(String databaseName, String tableName, HivePrincipal p
     @Override
     public void commentColumn(String databaseName, String tableName, String columnName, Optional<String> comment)
     {
-        throw new TrinoException(NOT_SUPPORTED, "Column comment is not yet supported by Glue service");
+        Table table = getExistingTable(databaseName, tableName);
+        List<Column> dataColumns = table.getDataColumns();
+        List<Column> partitionColumns = table.getPartitionColumns();
+
+        Optional<Integer> matchingDataColumn = indexOfColumnWithName(dataColumns, columnName);
+        Optional<Integer> matchingPartitionColumn = indexOfColumnWithName(partitionColumns, columnName);
+
+        if (matchingDataColumn.isPresent() && matchingPartitionColumn.isPresent()) {
+            throw new TrinoException(HIVE_INVALID_METADATA, "Found two columns with names matching " + columnName);
+        }
+        if (matchingDataColumn.isEmpty() && matchingPartitionColumn.isEmpty()) {
+            throw new ColumnNotFoundException(table.getSchemaTableName(), columnName);
+        }
+
+        Table updatedTable = Table.builder(table)
+                .setDataColumns(matchingDataColumn.map(index -> setColumnCommentForIndex(dataColumns, index, comment)).orElse(dataColumns))
+                .setPartitionColumns(matchingPartitionColumn.map(index -> setColumnCommentForIndex(partitionColumns, index, comment)).orElse(partitionColumns))
+                .build();
+
+        replaceTable(databaseName, tableName, updatedTable, null);
+    }
+
+    private static Optional<Integer> indexOfColumnWithName(List<Column> columns, String columnName)
+    {
+        Optional<Integer> index = Optional.empty();
+        for (int i = 0; i < columns.size(); i++) {
+            // Glue columns are always lowercase
+            if (columns.get(i).getName().equals(columnName)) {
+                index.ifPresent(ignored -> {
+                    throw new TrinoException(HIVE_INVALID_METADATA, "Found two columns with names matching " + columnName);
+                });
+                index = Optional.of(i);
+            }
+        }
+        return index;
+    }
+
+    private static List<Column> setColumnCommentForIndex(List<Column> columns, int indexToUpdate, Optional<String> comment)
+    {
+        ImmutableList.Builder<Column> newColumns = ImmutableList.builder();
+        for (int i = 0; i < columns.size(); i++) {
+            Column originalColumn = columns.get(i);
+            if (i == indexToUpdate) {
+                newColumns.add(new Column(originalColumn.getName(), originalColumn.getType(), comment, originalColumn.getProperties()));
+            }
+            else {
+                newColumns.add(originalColumn);
+            }
+        }
+        return newColumns.build();
     }
 
     @Override
@@ -1054,7 +1132,7 @@ public void dropPartition(String databaseName, String tableName, List<String> pa
 
         String partLocation = partition.getStorage().getLocation();
         if (deleteData && isManagedTable(table) && !isNullOrEmpty(partLocation)) {
-            deleteDir(hdfsContext, hdfsEnvironment, new Path(partLocation), true);
+            deleteDir(Location.of(partLocation));
         }
     }
 
@@ -1150,6 +1228,130 @@ public void checkSupportsTransactions()
         throw new TrinoException(NOT_SUPPORTED, "Glue does not support ACID tables");
     }
 
+    @Override
+    public boolean functionExists(String databaseName, String functionName, String signatureToken)
+    {
+        try {
+            stats.getGetUserDefinedFunction().call(() ->
+                    glueClient.getUserDefinedFunction(new GetUserDefinedFunctionRequest()
+                            .withDatabaseName(databaseName)
+                            .withFunctionName(metastoreFunctionName(functionName, signatureToken))));
+            return true;
+        }
+        catch (EntityNotFoundException e) {
+            return false;
+        }
+        catch (AmazonServiceException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName)
+    {
+        return getFunctionsByPattern(databaseName, "trino__.*");
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName, String functionName)
+    {
+        return getFunctionsByPattern(databaseName, "trino__" + Pattern.quote(functionName) + "__.*");
+    }
+
+    private Collection<LanguageFunction> getFunctionsByPattern(String databaseName, String functionNamePattern)
+    {
+        try {
+            return getPaginatedResults(
+                    glueClient::getUserDefinedFunctions,
+                    new GetUserDefinedFunctionsRequest()
+                            .withDatabaseName(databaseName)
+                            .withPattern(functionNamePattern),
+                    GetUserDefinedFunctionsRequest::setNextToken,
+                    GetUserDefinedFunctionsResult::getNextToken,
+                    stats.getGetUserDefinedFunctions())
+                    .map(GetUserDefinedFunctionsResult::getUserDefinedFunctions)
+                    .flatMap(List::stream)
+                    .map(GlueToTrinoConverter::convertFunction)
+                    .collect(toImmutableList());
+        }
+        catch (EntityNotFoundException | AccessDeniedException e) {
+            return ImmutableList.of();
+        }
+        catch (AmazonServiceException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+    }
+
+    @Override
+    public void createFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        if (functionName.contains("__")) {
+            throw new TrinoException(NOT_SUPPORTED, "Function names with double underscore are not supported");
+        }
+        try {
+            UserDefinedFunctionInput functionInput = convertFunction(functionName, function);
+            stats.getCreateUserDefinedFunction().call(() ->
+                    glueClient.createUserDefinedFunction(new CreateUserDefinedFunctionRequest()
+                            .withDatabaseName(databaseName)
+                            .withFunctionInput(functionInput)));
+        }
+        catch (AlreadyExistsException e) {
+            throw new TrinoException(ALREADY_EXISTS, "Function already exists");
+        }
+        catch (EntityNotFoundException e) {
+            throw new SchemaNotFoundException(databaseName);
+        }
+        catch (AmazonServiceException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+    }
+
+    @Override
+    public void replaceFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        try {
+            UserDefinedFunctionInput functionInput = convertFunction(functionName, function);
+            stats.getUpdateUserDefinedFunction().call(() ->
+                    glueClient.updateUserDefinedFunction(new UpdateUserDefinedFunctionRequest()
+                            .withDatabaseName(databaseName)
+                            .withFunctionName(metastoreFunctionName(functionName, function.signatureToken()))
+                            .withFunctionInput(functionInput)));
+        }
+        catch (AmazonServiceException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+    }
+
+    @Override
+    public void dropFunction(String databaseName, String functionName, String signatureToken)
+    {
+        try {
+            stats.getDeleteUserDefinedFunction().call(() ->
+                    glueClient.deleteUserDefinedFunction(new DeleteUserDefinedFunctionRequest()
+                            .withDatabaseName(databaseName)
+                            .withFunctionName(metastoreFunctionName(functionName, signatureToken))));
+        }
+        catch (EntityNotFoundException e) {
+            throw new TrinoException(FUNCTION_NOT_FOUND, "Function not found");
+        }
+        catch (AmazonServiceException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+    }
+
+    private Stream<com.amazonaws.services.glue.model.Table> getGlueTables(String databaseName)
+    {
+        return getPaginatedResults(
+                glueClient::getTables,
+                new GetTablesRequest()
+                        .withDatabaseName(databaseName),
+                GetTablesRequest::setNextToken,
+                GetTablesResult::getNextToken,
+                stats.getGetTables())
+                .map(GetTablesResult::getTableList)
+                .flatMap(List::stream);
+    }
+
     static class StatsRecordingAsyncHandler<Request extends AmazonWebServiceRequest, Result>
             implements AsyncHandler<Request, Result>
     {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastoreConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastoreConfig.java
index 05862e3686bb..9d7873f73087 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastoreConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastoreConfig.java
@@ -17,10 +17,9 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.configuration.DefunctConfig;
-
-import javax.annotation.PostConstruct;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
+import jakarta.annotation.PostConstruct;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastoreFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastoreFactory.java
index 1b8e75565e24..9fb979be961a 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastoreFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastoreFactory.java
@@ -13,14 +13,13 @@
  */
 package io.trino.plugin.hive.metastore.glue;
 
+import com.google.inject.Inject;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
 import io.trino.spi.security.ConnectorIdentity;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueMetastoreModule.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueMetastoreModule.java
index 1c855ca4f4fd..77fcf7043200 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueMetastoreModule.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueMetastoreModule.java
@@ -24,8 +24,12 @@
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
 import com.google.inject.TypeLiteral;
+import com.google.inject.multibindings.Multibinder;
+import com.google.inject.multibindings.ProvidesIntoSet;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.awssdk.v1_11.AwsSdkTelemetry;
 import io.trino.plugin.hive.AllowHiveTableRename;
 import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
@@ -35,6 +39,7 @@
 import java.util.function.Predicate;
 
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
@@ -49,12 +54,12 @@ public class GlueMetastoreModule
     protected void setup(Binder binder)
     {
         GlueHiveMetastoreConfig glueConfig = buildConfigObject(GlueHiveMetastoreConfig.class);
-        glueConfig.getGlueProxyApiId().ifPresent(glueProxyApiId -> binder
-                .bind(Key.get(RequestHandler2.class, ForGlueHiveMetastore.class))
+        Multibinder<RequestHandler2> requestHandlers = newSetBinder(binder, RequestHandler2.class, ForGlueHiveMetastore.class);
+        glueConfig.getCatalogId().ifPresent(catalogId -> requestHandlers.addBinding().toInstance(new GlueCatalogIdRequestHandler(catalogId)));
+        glueConfig.getGlueProxyApiId().ifPresent(glueProxyApiId -> requestHandlers.addBinding()
                 .toInstance(new ProxyApiRequestHandler(glueProxyApiId)));
         configBinder(binder).bindConfig(HiveConfig.class);
         binder.bind(AWSCredentialsProvider.class).toProvider(GlueCredentialsProvider.class).in(Scopes.SINGLETON);
-        newOptionalBinder(binder, Key.get(RequestHandler2.class, ForGlueHiveMetastore.class));
 
         newOptionalBinder(binder, Key.get(new TypeLiteral<Predicate<Table>>() {}, ForGlueHiveMetastore.class))
                 .setDefault().toProvider(DefaultGlueMetastoreTableFilterProvider.class).in(Scopes.SINGLETON);
@@ -88,6 +93,17 @@ private Module getGlueStatisticsModule(Class<? extends GlueColumnStatisticsProvi
                 .in(Scopes.SINGLETON);
     }
 
+    @ProvidesIntoSet
+    @Singleton
+    @ForGlueHiveMetastore
+    public RequestHandler2 createRequestHandler(OpenTelemetry openTelemetry)
+    {
+        return AwsSdkTelemetry.builder(openTelemetry)
+                .setCaptureExperimentalSpanAttributes(true)
+                .build()
+                .newRequestHandler();
+    }
+
     @Provides
     @Singleton
     @ForGlueHiveMetastore
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueMetastoreStats.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueMetastoreStats.java
index 7067de2efaa5..4f714a4b95d2 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueMetastoreStats.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueMetastoreStats.java
@@ -47,6 +47,11 @@ public class GlueMetastoreStats
     private final AwsApiCallStats deleteColumnStatisticsForTable = new AwsApiCallStats();
     private final AwsApiCallStats updateColumnStatisticsForPartition = new AwsApiCallStats();
     private final AwsApiCallStats deleteColumnStatisticsForPartition = new AwsApiCallStats();
+    private final AwsApiCallStats getUserDefinedFunction = new AwsApiCallStats();
+    private final AwsApiCallStats getUserDefinedFunctions = new AwsApiCallStats();
+    private final AwsApiCallStats createUserDefinedFunction = new AwsApiCallStats();
+    private final AwsApiCallStats updateUserDefinedFunction = new AwsApiCallStats();
+    private final AwsApiCallStats deleteUserDefinedFunction = new AwsApiCallStats();
 
     private final AwsSdkClientCoreStats clientCoreStats = new AwsSdkClientCoreStats();
 
@@ -225,6 +230,41 @@ public AwsApiCallStats getDeleteColumnStatisticsForPartition()
         return deleteColumnStatisticsForPartition;
     }
 
+    @Managed
+    @Nested
+    public AwsApiCallStats getGetUserDefinedFunction()
+    {
+        return getUserDefinedFunction;
+    }
+
+    @Managed
+    @Nested
+    public AwsApiCallStats getGetUserDefinedFunctions()
+    {
+        return getUserDefinedFunctions;
+    }
+
+    @Managed
+    @Nested
+    public AwsApiCallStats getCreateUserDefinedFunction()
+    {
+        return createUserDefinedFunction;
+    }
+
+    @Managed
+    @Nested
+    public AwsApiCallStats getUpdateUserDefinedFunction()
+    {
+        return updateUserDefinedFunction;
+    }
+
+    @Managed
+    @Nested
+    public AwsApiCallStats getDeleteUserDefinedFunction()
+    {
+        return deleteUserDefinedFunction;
+    }
+
     @Managed
     @Flatten
     public AwsSdkClientCoreStats getClientCoreStats()
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/HiveGlueClientProvider.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/HiveGlueClientProvider.java
index 696f3bf28b12..22bd8d7a3e3f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/HiveGlueClientProvider.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/HiveGlueClientProvider.java
@@ -16,11 +16,11 @@
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.handlers.RequestHandler2;
 import com.amazonaws.services.glue.AWSGlueAsync;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
-import java.util.Optional;
+import java.util.Set;
 
 import static io.trino.plugin.hive.metastore.glue.GlueClientUtil.createAsyncGlueClient;
 import static java.util.Objects.requireNonNull;
@@ -31,24 +31,24 @@ public class HiveGlueClientProvider
     private final GlueMetastoreStats stats;
     private final AWSCredentialsProvider credentialsProvider;
     private final GlueHiveMetastoreConfig glueConfig; // TODO do not keep mutable config instance on a field
-    private final Optional<RequestHandler2> requestHandler;
+    private final Set<RequestHandler2> requestHandlers;
 
     @Inject
     public HiveGlueClientProvider(
             @ForGlueHiveMetastore GlueMetastoreStats stats,
             AWSCredentialsProvider credentialsProvider,
-            @ForGlueHiveMetastore Optional<RequestHandler2> requestHandler,
+            @ForGlueHiveMetastore Set<RequestHandler2> requestHandlers,
             GlueHiveMetastoreConfig glueConfig)
     {
         this.stats = requireNonNull(stats, "stats is null");
         this.credentialsProvider = requireNonNull(credentialsProvider, "credentialsProvider is null");
-        this.requestHandler = requireNonNull(requestHandler, "requestHandler is null");
+        this.requestHandlers = ImmutableSet.copyOf(requireNonNull(requestHandlers, "requestHandlers is null"));
         this.glueConfig = glueConfig;
     }
 
     @Override
     public AWSGlueAsync get()
     {
-        return createAsyncGlueClient(glueConfig, credentialsProvider, requestHandler, stats.newRequestMetricsCollector());
+        return createAsyncGlueClient(glueConfig, credentialsProvider, requestHandlers, stats.newRequestMetricsCollector());
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/converter/GlueInputConverter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/converter/GlueInputConverter.java
index dd6a818f73c4..4f600006fdbc 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/converter/GlueInputConverter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/converter/GlueInputConverter.java
@@ -16,10 +16,15 @@
 import com.amazonaws.services.glue.model.DatabaseInput;
 import com.amazonaws.services.glue.model.Order;
 import com.amazonaws.services.glue.model.PartitionInput;
+import com.amazonaws.services.glue.model.PrincipalType;
+import com.amazonaws.services.glue.model.ResourceType;
+import com.amazonaws.services.glue.model.ResourceUri;
 import com.amazonaws.services.glue.model.SerDeInfo;
 import com.amazonaws.services.glue.model.StorageDescriptor;
 import com.amazonaws.services.glue.model.TableInput;
+import com.amazonaws.services.glue.model.UserDefinedFunctionInput;
 import com.google.common.collect.ImmutableMap;
+import io.airlift.json.JsonCodec;
 import io.trino.plugin.hive.HiveBucketProperty;
 import io.trino.plugin.hive.PartitionStatistics;
 import io.trino.plugin.hive.metastore.Column;
@@ -28,15 +33,20 @@
 import io.trino.plugin.hive.metastore.PartitionWithStatistics;
 import io.trino.plugin.hive.metastore.Storage;
 import io.trino.plugin.hive.metastore.Table;
+import io.trino.spi.function.LanguageFunction;
 
 import java.util.List;
 import java.util.Optional;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.metastoreFunctionName;
+import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.toResourceUris;
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.updateStatisticsParameters;
 
 public final class GlueInputConverter
 {
+    static final JsonCodec<LanguageFunction> LANGUAGE_FUNCTION_CODEC = JsonCodec.jsonCodec(LanguageFunction.class);
+
     private GlueInputConverter() {}
 
     public static DatabaseInput convertDatabase(Database database)
@@ -111,11 +121,26 @@ private static StorageDescriptor convertStorage(Storage storage, List<Column> co
         return sd;
     }
 
-    private static com.amazonaws.services.glue.model.Column convertColumn(Column prestoColumn)
+    private static com.amazonaws.services.glue.model.Column convertColumn(Column trinoColumn)
     {
         return new com.amazonaws.services.glue.model.Column()
-                .withName(prestoColumn.getName())
-                .withType(prestoColumn.getType().toString())
-                .withComment(prestoColumn.getComment().orElse(null));
+                .withName(trinoColumn.getName())
+                .withType(trinoColumn.getType().toString())
+                .withComment(trinoColumn.getComment().orElse(null))
+                .withParameters(trinoColumn.getProperties());
+    }
+
+    public static UserDefinedFunctionInput convertFunction(String functionName, LanguageFunction function)
+    {
+        return new UserDefinedFunctionInput()
+                .withFunctionName(metastoreFunctionName(functionName, function.signatureToken()))
+                .withClassName("TrinoFunction")
+                .withOwnerType(PrincipalType.USER)
+                .withOwnerName(function.owner().orElse(null))
+                .withResourceUris(toResourceUris(LANGUAGE_FUNCTION_CODEC.toJsonBytes(function)).stream()
+                        .map(uri -> new ResourceUri()
+                                .withResourceType(ResourceType.FILE)
+                                .withUri(uri.getUri()))
+                        .toList());
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/converter/GlueToTrinoConverter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/converter/GlueToTrinoConverter.java
index e6c2307846a7..454402fdafc4 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/converter/GlueToTrinoConverter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/converter/GlueToTrinoConverter.java
@@ -15,8 +15,11 @@
 
 import com.amazonaws.services.glue.model.SerDeInfo;
 import com.amazonaws.services.glue.model.StorageDescriptor;
+import com.amazonaws.services.glue.model.UserDefinedFunction;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.hive.thrift.metastore.ResourceType;
+import io.trino.hive.thrift.metastore.ResourceUri;
 import io.trino.plugin.hive.HiveBucketProperty;
 import io.trino.plugin.hive.HiveStorageFormat;
 import io.trino.plugin.hive.HiveType;
@@ -32,15 +35,16 @@
 import io.trino.plugin.hive.util.HiveBucketing.BucketingVersion;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.security.PrincipalType;
+import jakarta.annotation.Nullable;
 import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 
-import javax.annotation.Nullable;
-
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
@@ -51,6 +55,8 @@
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_UNSUPPORTED_FORMAT;
 import static io.trino.plugin.hive.HiveType.HIVE_INT;
 import static io.trino.plugin.hive.TableType.EXTERNAL_TABLE;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoMaterializedView;
+import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.decodeFunction;
 import static io.trino.plugin.hive.metastore.util.Memoizers.memoizeLast;
 import static io.trino.plugin.hive.util.HiveUtil.isDeltaLakeTable;
 import static io.trino.plugin.hive.util.HiveUtil.isIcebergTable;
@@ -63,6 +69,12 @@ public final class GlueToTrinoConverter
 
     private GlueToTrinoConverter() {}
 
+    @SuppressModernizer // Usage of `Column.getParameters` is not allowed. Only this method can call that.
+    public static Map<String, String> getColumnParameters(com.amazonaws.services.glue.model.Column glueColumn)
+    {
+        return firstNonNull(glueColumn.getParameters(), ImmutableMap.of());
+    }
+
     public static String getTableType(com.amazonaws.services.glue.model.Table glueTable)
     {
         // Athena treats missing table type as EXTERNAL_TABLE.
@@ -76,6 +88,24 @@ public static String getTableTypeNullable(com.amazonaws.services.glue.model.Tabl
         return glueTable.getTableType();
     }
 
+    @SuppressModernizer // Usage of `Table.getParameters` is not allowed. Only this method can call that.
+    public static Map<String, String> getTableParameters(com.amazonaws.services.glue.model.Table glueTable)
+    {
+        return firstNonNull(glueTable.getParameters(), ImmutableMap.of());
+    }
+
+    @SuppressModernizer // Usage of `Partition.getParameters` is not allowed. Only this method can call that.
+    public static Map<String, String> getPartitionParameters(com.amazonaws.services.glue.model.Partition gluePartition)
+    {
+        return firstNonNull(gluePartition.getParameters(), ImmutableMap.of());
+    }
+
+    @SuppressModernizer // Usage of `SerDeInfo.getParameters` is not allowed. Only this method can call that.
+    public static Map<String, String> getSerDeInfoParameters(com.amazonaws.services.glue.model.SerDeInfo glueSerDeInfo)
+    {
+        return firstNonNull(glueSerDeInfo.getParameters(), ImmutableMap.of());
+    }
+
     public static Database convertDatabase(com.amazonaws.services.glue.model.Database glueDb)
     {
         return Database.builder()
@@ -95,31 +125,36 @@ public static Table convertTable(com.amazonaws.services.glue.model.Table glueTab
     {
         SchemaTableName table = new SchemaTableName(dbName, glueTable.getName());
 
-        Map<String, String> tableParameters = convertParameters(glueTable.getParameters());
+        String tableType = getTableType(glueTable);
+        Map<String, String> tableParameters = ImmutableMap.copyOf(getTableParameters(glueTable));
         Table.Builder tableBuilder = Table.builder()
                 .setDatabaseName(table.getSchemaName())
                 .setTableName(table.getTableName())
                 .setOwner(Optional.ofNullable(glueTable.getOwner()))
-                .setTableType(getTableType(glueTable))
+                .setTableType(tableType)
                 .setParameters(tableParameters)
                 .setViewOriginalText(Optional.ofNullable(glueTable.getViewOriginalText()))
                 .setViewExpandedText(Optional.ofNullable(glueTable.getViewExpandedText()));
 
         StorageDescriptor sd = glueTable.getStorageDescriptor();
 
-        if (isIcebergTable(tableParameters) || (sd == null && isDeltaLakeTable(tableParameters))) {
+        if (isIcebergTable(tableParameters) ||
+                (sd == null && isDeltaLakeTable(tableParameters)) ||
+                (sd == null && isTrinoMaterializedView(tableType, tableParameters))) {
             // Iceberg tables do not need to read the StorageDescriptor field, but we still need to return dummy properties for compatibility
             // Delta Lake tables only need to provide a dummy properties if a StorageDescriptor was not explicitly configured.
-            tableBuilder.setDataColumns(ImmutableList.of(new Column("dummy", HIVE_INT, Optional.empty())));
+            // Materialized views do not need to read the StorageDescriptor, but we still need to return dummy properties for compatibility
+            tableBuilder.setDataColumns(ImmutableList.of(new Column("dummy", HIVE_INT, Optional.empty(), ImmutableMap.of())));
             tableBuilder.getStorageBuilder().setStorageFormat(StorageFormat.fromHiveStorageFormat(HiveStorageFormat.PARQUET));
         }
         else {
             if (sd == null) {
                 throw new TrinoException(HIVE_UNSUPPORTED_FORMAT, "Table StorageDescriptor is null for table '%s' %s".formatted(table, glueTable));
             }
-            tableBuilder.setDataColumns(convertColumns(table, sd.getColumns(), sd.getSerdeInfo().getSerializationLibrary()));
+            boolean isCsv = sd.getSerdeInfo() != null && HiveStorageFormat.CSV.getSerde().equals(sd.getSerdeInfo().getSerializationLibrary());
+            tableBuilder.setDataColumns(convertColumns(table, sd.getColumns(), isCsv));
             if (glueTable.getPartitionKeys() != null) {
-                tableBuilder.setPartitionColumns(convertColumns(table, glueTable.getPartitionKeys(), sd.getSerdeInfo().getSerializationLibrary()));
+                tableBuilder.setPartitionColumns(convertColumns(table, glueTable.getPartitionKeys(), isCsv));
             }
             else {
                 tableBuilder.setPartitionColumns(ImmutableList.of());
@@ -131,15 +166,15 @@ public static Table convertTable(com.amazonaws.services.glue.model.Table glueTab
         return tableBuilder.build();
     }
 
-    private static Column convertColumn(SchemaTableName table, com.amazonaws.services.glue.model.Column glueColumn, String serde)
+    private static Column convertColumn(SchemaTableName table, com.amazonaws.services.glue.model.Column glueColumn, boolean isCsv)
     {
         // OpenCSVSerde deserializes columns from csv file into strings, so we set the column type from the metastore
         // to string to avoid cast exceptions.
-        if (HiveStorageFormat.CSV.getSerde().equals(serde)) {
+        if (isCsv) {
             //TODO(https://github.com/trinodb/trino/issues/7240) Add tests
-            return new Column(glueColumn.getName(), HiveType.HIVE_STRING, Optional.ofNullable(glueColumn.getComment()));
+            return new Column(glueColumn.getName(), HiveType.HIVE_STRING, Optional.ofNullable(glueColumn.getComment()), getColumnParameters(glueColumn));
         }
-        return new Column(glueColumn.getName(), convertType(table, glueColumn), Optional.ofNullable(glueColumn.getComment()));
+        return new Column(glueColumn.getName(), convertType(table, glueColumn), Optional.ofNullable(glueColumn.getComment()), getColumnParameters(glueColumn));
     }
 
     private static HiveType convertType(SchemaTableName table, com.amazonaws.services.glue.model.Column column)
@@ -152,22 +187,14 @@ private static HiveType convertType(SchemaTableName table, com.amazonaws.service
         }
     }
 
-    private static List<Column> convertColumns(SchemaTableName table, List<com.amazonaws.services.glue.model.Column> glueColumns, String serde)
-    {
-        return mappedCopy(glueColumns, glueColumn -> convertColumn(table, glueColumn, serde));
-    }
-
-    private static Map<String, String> convertParameters(Map<String, String> parameters)
+    private static List<Column> convertColumns(SchemaTableName table, List<com.amazonaws.services.glue.model.Column> glueColumns, boolean isCsv)
     {
-        if (parameters == null || parameters.isEmpty()) {
-            return ImmutableMap.of();
-        }
-        return ImmutableMap.copyOf(parameters);
+        return mappedCopy(glueColumns, glueColumn -> convertColumn(table, glueColumn, isCsv));
     }
 
     private static Function<Map<String, String>, Map<String, String>> parametersConverter()
     {
-        return memoizeLast(GlueToTrinoConverter::convertParameters);
+        return memoizeLast(ImmutableMap::copyOf);
     }
 
     private static boolean isNullOrEmpty(List<?> list)
@@ -178,7 +205,7 @@ private static boolean isNullOrEmpty(List<?> list)
     public static final class GluePartitionConverter
             implements Function<com.amazonaws.services.glue.model.Partition, Partition>
     {
-        private final Function<List<com.amazonaws.services.glue.model.Column>, List<Column>> columnsConverter;
+        private final BiFunction<List<com.amazonaws.services.glue.model.Column>, Boolean, List<Column>> columnsConverter;
         private final Function<Map<String, String>, Map<String, String>> parametersConverter = parametersConverter();
         private final StorageConverter storageConverter = new StorageConverter();
         private final String databaseName;
@@ -190,11 +217,8 @@ public GluePartitionConverter(Table table)
             requireNonNull(table, "table is null");
             this.databaseName = requireNonNull(table.getDatabaseName(), "databaseName is null");
             this.tableName = requireNonNull(table.getTableName(), "tableName is null");
-            this.tableParameters = convertParameters(table.getParameters());
-            this.columnsConverter = memoizeLast(glueColumns -> convertColumns(
-                    table.getSchemaTableName(),
-                    glueColumns,
-                    table.getStorage().getStorageFormat().getSerde()));
+            this.tableParameters = table.getParameters();
+            this.columnsConverter = memoizeLast((glueColumns, isCsv) -> convertColumns(table.getSchemaTableName(), glueColumns, isCsv));
         }
 
         @Override
@@ -209,12 +233,13 @@ public Partition apply(com.amazonaws.services.glue.model.Partition gluePartition
             if (!tableName.equals(gluePartition.getTableName())) {
                 throw new IllegalArgumentException(format("Unexpected tableName, expected: %s, but found: %s", tableName, gluePartition.getTableName()));
             }
+            boolean isCsv = sd.getSerdeInfo() != null && HiveStorageFormat.CSV.getSerde().equals(sd.getSerdeInfo().getSerializationLibrary());
             Partition.Builder partitionBuilder = Partition.builder()
                     .setDatabaseName(databaseName)
                     .setTableName(tableName)
                     .setValues(gluePartition.getValues()) // No memoization benefit
-                    .setColumns(columnsConverter.apply(sd.getColumns()))
-                    .setParameters(parametersConverter.apply(gluePartition.getParameters()));
+                    .setColumns(columnsConverter.apply(sd.getColumns(), isCsv))
+                    .setParameters(parametersConverter.apply(getPartitionParameters(gluePartition)));
 
             storageConverter.setStorageBuilder(sd, partitionBuilder.getStorageBuilder(), tableParameters);
 
@@ -239,7 +264,7 @@ public void setStorageBuilder(StorageDescriptor sd, Storage.Builder storageBuild
                     .setLocation(nullToEmpty(sd.getLocation()))
                     .setBucketProperty(convertToBucketProperty(tableParameters, sd))
                     .setSkewed(sd.getSkewedInfo() != null && !isNullOrEmpty(sd.getSkewedInfo().getSkewedColumnNames()))
-                    .setSerdeParameters(serdeParametersConverter.apply(serdeInfo.getParameters()))
+                    .setSerdeParameters(serdeParametersConverter.apply(getSerDeInfoParameters(serdeInfo)))
                     .build();
         }
 
@@ -287,6 +312,19 @@ public StorageFormat createStorageFormat(SerDeInfo serdeInfo, StorageDescriptor
         }
     }
 
+    public static LanguageFunction convertFunction(UserDefinedFunction function)
+    {
+        List<ResourceUri> uris = mappedCopy(function.getResourceUris(), uri -> new ResourceUri(ResourceType.FILE, uri.getUri()));
+
+        LanguageFunction result = decodeFunction(function.getFunctionName(), uris);
+
+        return new LanguageFunction(
+                result.signatureToken(),
+                result.sql(),
+                result.path(),
+                Optional.ofNullable(function.getOwnerName()));
+    }
+
     public static <T, R> List<R> mappedCopy(List<T> list, Function<T, R> mapper)
     {
         requireNonNull(list, "list is null");
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/procedure/FlushHiveMetastoreCacheProcedure.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/procedure/FlushHiveMetastoreCacheProcedure.java
deleted file mode 100644
index ce26847d00de..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/procedure/FlushHiveMetastoreCacheProcedure.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.metastore.procedure;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.plugin.hive.HiveErrorCode;
-import io.trino.plugin.hive.metastore.cache.CachingHiveMetastore;
-import io.trino.spi.TrinoException;
-import io.trino.spi.classloader.ThreadContextClassLoader;
-import io.trino.spi.procedure.Procedure;
-import io.trino.spi.type.ArrayType;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-
-import java.lang.invoke.MethodHandle;
-import java.util.List;
-import java.util.Optional;
-
-import static com.google.common.base.Preconditions.checkState;
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static java.lang.String.format;
-import static java.lang.invoke.MethodHandles.lookup;
-import static java.util.Locale.ENGLISH;
-import static java.util.Objects.requireNonNull;
-
-public class FlushHiveMetastoreCacheProcedure
-        implements Provider<Procedure>
-{
-    private static final String PROCEDURE_NAME = "flush_metadata_cache";
-
-    private static final String PARAM_SCHEMA_NAME = "SCHEMA_NAME";
-    private static final String PARAM_TABLE_NAME = "TABLE_NAME";
-    // Other procedures use plural naming, but it's kept for backward compatibility
-    @Deprecated
-    private static final String PARAM_PARTITION_COLUMN = "PARTITION_COLUMN";
-    @Deprecated
-    private static final String PARAM_PARTITION_VALUE = "PARTITION_VALUE";
-    private static final String PARAM_PARTITION_COLUMNS = "PARTITION_COLUMNS";
-    private static final String PARAM_PARTITION_VALUES = "PARTITION_VALUES";
-
-    private static final String PROCEDURE_USAGE_EXAMPLES = format(
-            "Valid usages:%n" +
-                    " - '%1$s()'%n" +
-                    " - %1$s(%2$s => ..., %3$s => ...)" +
-                    " - %1$s(%2$s => ..., %3$s => ..., %4$s => ARRAY['...'], %5$s => ARRAY['...'])",
-            PROCEDURE_NAME,
-            // Use lowercase parameter names per convention. In the usage example the names are not delimited.
-            PARAM_SCHEMA_NAME.toLowerCase(ENGLISH),
-            PARAM_TABLE_NAME.toLowerCase(ENGLISH),
-            PARAM_PARTITION_COLUMNS.toLowerCase(ENGLISH),
-            PARAM_PARTITION_VALUES.toLowerCase(ENGLISH));
-
-    private static final String INVALID_PARTITION_PARAMS_ERROR_MESSAGE = format(
-            "Procedure should only be invoked with single pair of partition definition named params: %1$s and %2$s or %3$s and %4$s",
-            PARAM_PARTITION_COLUMNS.toLowerCase(ENGLISH),
-            PARAM_PARTITION_VALUES.toLowerCase(ENGLISH),
-            PARAM_PARTITION_COLUMN.toLowerCase(ENGLISH),
-            PARAM_PARTITION_VALUE.toLowerCase(ENGLISH));
-
-    private static final MethodHandle FLUSH_HIVE_METASTORE_CACHE;
-
-    static {
-        try {
-            FLUSH_HIVE_METASTORE_CACHE = lookup().unreflect(FlushHiveMetastoreCacheProcedure.class.getMethod(
-                    "flushMetadataCache", String.class, String.class, List.class, List.class, List.class, List.class));
-        }
-        catch (ReflectiveOperationException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    private final Optional<CachingHiveMetastore> cachingHiveMetastore;
-
-    @Inject
-    public FlushHiveMetastoreCacheProcedure(Optional<CachingHiveMetastore> cachingHiveMetastore)
-    {
-        this.cachingHiveMetastore = requireNonNull(cachingHiveMetastore, "cachingHiveMetastore is null");
-    }
-
-    @Override
-    public Procedure get()
-    {
-        return new Procedure(
-                "system",
-                PROCEDURE_NAME,
-                ImmutableList.of(
-                        new Procedure.Argument(PARAM_SCHEMA_NAME, VARCHAR, false, null),
-                        new Procedure.Argument(PARAM_TABLE_NAME, VARCHAR, false, null),
-                        new Procedure.Argument(PARAM_PARTITION_COLUMNS, new ArrayType(VARCHAR), false, null),
-                        new Procedure.Argument(PARAM_PARTITION_VALUES, new ArrayType(VARCHAR), false, null),
-                        new Procedure.Argument(PARAM_PARTITION_COLUMN, new ArrayType(VARCHAR), false, null),
-                        new Procedure.Argument(PARAM_PARTITION_VALUE, new ArrayType(VARCHAR), false, null)),
-                FLUSH_HIVE_METASTORE_CACHE.bindTo(this),
-                true);
-    }
-
-    public void flushMetadataCache(
-            String schemaName,
-            String tableName,
-            List<String> partitionColumns,
-            List<String> partitionValues,
-            List<String> partitionColumn,
-            List<String> partitionValue)
-    {
-        Optional<List<String>> optionalPartitionColumns = Optional.ofNullable(partitionColumns);
-        Optional<List<String>> optionalPartitionValues = Optional.ofNullable(partitionValues);
-        Optional<List<String>> optionalPartitionColumn = Optional.ofNullable(partitionColumn);
-        Optional<List<String>> optionalPartitionValue = Optional.ofNullable(partitionValue);
-        checkState(partitionParamsUsed(optionalPartitionColumns, optionalPartitionValues, optionalPartitionColumn, optionalPartitionValue)
-                        || deprecatedPartitionParamsUsed(optionalPartitionColumns, optionalPartitionValues, optionalPartitionColumn, optionalPartitionValue)
-                        || partitionParamsNotUsed(optionalPartitionColumns, optionalPartitionValues, optionalPartitionColumn, optionalPartitionValue),
-                INVALID_PARTITION_PARAMS_ERROR_MESSAGE);
-
-        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(getClass().getClassLoader())) {
-            doFlushMetadataCache(
-                    Optional.ofNullable(schemaName),
-                    Optional.ofNullable(tableName),
-                    optionalPartitionColumns.or(() -> optionalPartitionColumn).orElse(ImmutableList.of()),
-                    optionalPartitionValues.or(() -> optionalPartitionValue).orElse(ImmutableList.of()));
-        }
-    }
-
-    private void doFlushMetadataCache(Optional<String> schemaName, Optional<String> tableName, List<String> partitionColumns, List<String> partitionValues)
-    {
-        CachingHiveMetastore cachingHiveMetastore = this.cachingHiveMetastore
-                .orElseThrow(() -> new TrinoException(HiveErrorCode.HIVE_METASTORE_ERROR, "Cannot flush, metastore cache is not enabled"));
-
-        checkState(
-                partitionColumns.size() == partitionValues.size(),
-                "Parameters partition_column and partition_value should have same length");
-
-        if (schemaName.isEmpty() && tableName.isEmpty() && partitionColumns.isEmpty()) {
-            cachingHiveMetastore.flushCache();
-        }
-        else if (schemaName.isPresent() && tableName.isPresent()) {
-            if (!partitionColumns.isEmpty()) {
-                cachingHiveMetastore.flushPartitionCache(schemaName.get(), tableName.get(), partitionColumns, partitionValues);
-            }
-            else {
-                cachingHiveMetastore.invalidateTable(schemaName.get(), tableName.get());
-            }
-        }
-        else {
-            throw new TrinoException(
-                    HiveErrorCode.HIVE_METASTORE_ERROR,
-                    "Illegal parameter set passed. " + PROCEDURE_USAGE_EXAMPLES);
-        }
-    }
-
-    private boolean partitionParamsNotUsed(
-            Optional<List<String>> partitionColumns,
-            Optional<List<String>> partitionValues,
-            Optional<List<String>> partitionColumn,
-            Optional<List<String>> partitionValue)
-    {
-        return partitionColumns.isEmpty() && partitionValues.isEmpty()
-                && partitionColumn.isEmpty() && partitionValue.isEmpty();
-    }
-
-    private boolean partitionParamsUsed(
-            Optional<List<String>> partitionColumns,
-            Optional<List<String>> partitionValues,
-            Optional<List<String>> partitionColumn,
-            Optional<List<String>> partitionValue)
-    {
-        return (partitionColumns.isPresent() || partitionValues.isPresent())
-                && partitionColumn.isEmpty() && partitionValue.isEmpty();
-    }
-
-    private boolean deprecatedPartitionParamsUsed(
-            Optional<List<String>> partitionColumns,
-            Optional<List<String>> partitionValues,
-            Optional<List<String>> partitionColumn,
-            Optional<List<String>> partitionValue)
-    {
-        return (partitionColumn.isPresent() || partitionValue.isPresent())
-                && partitionColumns.isEmpty() && partitionValues.isEmpty();
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/procedure/FlushMetadataCacheProcedure.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/procedure/FlushMetadataCacheProcedure.java
new file mode 100644
index 000000000000..0daf0cef0419
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/procedure/FlushMetadataCacheProcedure.java
@@ -0,0 +1,189 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.metastore.procedure;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.trino.plugin.hive.HiveErrorCode;
+import io.trino.plugin.hive.metastore.cache.CachingHiveMetastore;
+import io.trino.spi.StandardErrorCode;
+import io.trino.spi.TrinoException;
+import io.trino.spi.classloader.ThreadContextClassLoader;
+import io.trino.spi.procedure.Procedure;
+import io.trino.spi.type.ArrayType;
+
+import java.lang.invoke.MethodHandle;
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkState;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.lang.String.format;
+import static java.lang.invoke.MethodHandles.lookup;
+import static java.util.Locale.ENGLISH;
+import static java.util.Objects.requireNonNull;
+
+public class FlushMetadataCacheProcedure
+        implements Provider<Procedure>
+{
+    private static final String PROCEDURE_NAME = "flush_metadata_cache";
+
+    private static final String PARAM_SCHEMA_NAME = "SCHEMA_NAME";
+    private static final String PARAM_TABLE_NAME = "TABLE_NAME";
+    // Other procedures use plural naming, but it's kept for backward compatibility
+    @Deprecated
+    private static final String PARAM_PARTITION_COLUMN = "PARTITION_COLUMN";
+    @Deprecated
+    private static final String PARAM_PARTITION_VALUE = "PARTITION_VALUE";
+    private static final String PARAM_PARTITION_COLUMNS = "PARTITION_COLUMNS";
+    private static final String PARAM_PARTITION_VALUES = "PARTITION_VALUES";
+
+    private static final String PROCEDURE_USAGE_EXAMPLES = format(
+            "Valid usages:%n" +
+                    " - '%1$s()'%n" +
+                    " - %1$s(%2$s => ..., %3$s => ...)" +
+                    " - %1$s(%2$s => ..., %3$s => ..., %4$s => ARRAY['...'], %5$s => ARRAY['...'])",
+            PROCEDURE_NAME,
+            // Use lowercase parameter names per convention. In the usage example the names are not delimited.
+            PARAM_SCHEMA_NAME.toLowerCase(ENGLISH),
+            PARAM_TABLE_NAME.toLowerCase(ENGLISH),
+            PARAM_PARTITION_COLUMNS.toLowerCase(ENGLISH),
+            PARAM_PARTITION_VALUES.toLowerCase(ENGLISH));
+
+    private static final String INVALID_PARTITION_PARAMS_ERROR_MESSAGE = format(
+            "Procedure should only be invoked with single pair of partition definition named params: %1$s and %2$s or %3$s and %4$s",
+            PARAM_PARTITION_COLUMNS.toLowerCase(ENGLISH),
+            PARAM_PARTITION_VALUES.toLowerCase(ENGLISH),
+            PARAM_PARTITION_COLUMN.toLowerCase(ENGLISH),
+            PARAM_PARTITION_VALUE.toLowerCase(ENGLISH));
+
+    private static final MethodHandle FLUSH_HIVE_METASTORE_CACHE;
+
+    static {
+        try {
+            FLUSH_HIVE_METASTORE_CACHE = lookup().unreflect(FlushMetadataCacheProcedure.class.getMethod(
+                    "flushMetadataCache", String.class, String.class, List.class, List.class, List.class, List.class));
+        }
+        catch (ReflectiveOperationException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private final Optional<CachingHiveMetastore> cachingHiveMetastore;
+
+    @Inject
+    public FlushMetadataCacheProcedure(Optional<CachingHiveMetastore> cachingHiveMetastore)
+    {
+        this.cachingHiveMetastore = requireNonNull(cachingHiveMetastore, "cachingHiveMetastore is null");
+    }
+
+    @Override
+    public Procedure get()
+    {
+        return new Procedure(
+                "system",
+                PROCEDURE_NAME,
+                ImmutableList.of(
+                        new Procedure.Argument(PARAM_SCHEMA_NAME, VARCHAR, false, null),
+                        new Procedure.Argument(PARAM_TABLE_NAME, VARCHAR, false, null),
+                        new Procedure.Argument(PARAM_PARTITION_COLUMNS, new ArrayType(VARCHAR), false, null),
+                        new Procedure.Argument(PARAM_PARTITION_VALUES, new ArrayType(VARCHAR), false, null),
+                        new Procedure.Argument(PARAM_PARTITION_COLUMN, new ArrayType(VARCHAR), false, null),
+                        new Procedure.Argument(PARAM_PARTITION_VALUE, new ArrayType(VARCHAR), false, null)),
+                FLUSH_HIVE_METASTORE_CACHE.bindTo(this),
+                true);
+    }
+
+    public void flushMetadataCache(
+            String schemaName,
+            String tableName,
+            List<String> partitionColumns,
+            List<String> partitionValues,
+            List<String> partitionColumn,
+            List<String> partitionValue)
+    {
+        Optional<List<String>> optionalPartitionColumns = Optional.ofNullable(partitionColumns);
+        Optional<List<String>> optionalPartitionValues = Optional.ofNullable(partitionValues);
+        Optional<List<String>> optionalPartitionColumn = Optional.ofNullable(partitionColumn);
+        Optional<List<String>> optionalPartitionValue = Optional.ofNullable(partitionValue);
+        checkState(partitionParamsUsed(optionalPartitionColumns, optionalPartitionValues, optionalPartitionColumn, optionalPartitionValue)
+                        || deprecatedPartitionParamsUsed(optionalPartitionColumns, optionalPartitionValues, optionalPartitionColumn, optionalPartitionValue)
+                        || partitionParamsNotUsed(optionalPartitionColumns, optionalPartitionValues, optionalPartitionColumn, optionalPartitionValue),
+                INVALID_PARTITION_PARAMS_ERROR_MESSAGE);
+
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(getClass().getClassLoader())) {
+            doFlushMetadataCache(
+                    Optional.ofNullable(schemaName),
+                    Optional.ofNullable(tableName),
+                    optionalPartitionColumns.or(() -> optionalPartitionColumn).orElse(ImmutableList.of()),
+                    optionalPartitionValues.or(() -> optionalPartitionValue).orElse(ImmutableList.of()));
+        }
+    }
+
+    private void doFlushMetadataCache(Optional<String> schemaName, Optional<String> tableName, List<String> partitionColumns, List<String> partitionValues)
+    {
+        CachingHiveMetastore cachingHiveMetastore = this.cachingHiveMetastore
+                .orElseThrow(() -> new TrinoException(HiveErrorCode.HIVE_METASTORE_ERROR, "Cannot flush, metastore cache is not enabled"));
+
+        checkState(
+                partitionColumns.size() == partitionValues.size(),
+                "Parameters partition_column and partition_value should have same length");
+
+        if (schemaName.isEmpty() && tableName.isEmpty() && partitionColumns.isEmpty()) {
+            cachingHiveMetastore.flushCache();
+        }
+        else if (schemaName.isPresent() && tableName.isPresent()) {
+            if (!partitionColumns.isEmpty()) {
+                cachingHiveMetastore.flushPartitionCache(schemaName.get(), tableName.get(), partitionColumns, partitionValues);
+            }
+            else {
+                cachingHiveMetastore.invalidateTable(schemaName.get(), tableName.get());
+            }
+        }
+        else {
+            throw new TrinoException(StandardErrorCode.INVALID_PROCEDURE_ARGUMENT, "Illegal parameter set passed. " + PROCEDURE_USAGE_EXAMPLES);
+        }
+    }
+
+    private boolean partitionParamsNotUsed(
+            Optional<List<String>> partitionColumns,
+            Optional<List<String>> partitionValues,
+            Optional<List<String>> partitionColumn,
+            Optional<List<String>> partitionValue)
+    {
+        return partitionColumns.isEmpty() && partitionValues.isEmpty()
+                && partitionColumn.isEmpty() && partitionValue.isEmpty();
+    }
+
+    private boolean partitionParamsUsed(
+            Optional<List<String>> partitionColumns,
+            Optional<List<String>> partitionValues,
+            Optional<List<String>> partitionColumn,
+            Optional<List<String>> partitionValue)
+    {
+        return (partitionColumns.isPresent() || partitionValues.isPresent())
+                && partitionColumn.isEmpty() && partitionValue.isEmpty();
+    }
+
+    private boolean deprecatedPartitionParamsUsed(
+            Optional<List<String>> partitionColumns,
+            Optional<List<String>> partitionValues,
+            Optional<List<String>> partitionColumn,
+            Optional<List<String>> partitionValue)
+    {
+        return (partitionColumn.isPresent() || partitionValue.isPresent())
+                && partitionColumns.isEmpty() && partitionValues.isEmpty();
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/HiveMetastoreRecording.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/HiveMetastoreRecording.java
index 83b3809e9c87..b46de9394972 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/HiveMetastoreRecording.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/HiveMetastoreRecording.java
@@ -18,12 +18,16 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import com.google.errorprone.annotations.Immutable;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.units.Duration;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 import io.trino.plugin.hive.PartitionStatistics;
 import io.trino.plugin.hive.RecordingMetastoreConfig;
 import io.trino.plugin.hive.metastore.Database;
+import io.trino.plugin.hive.metastore.DatabaseFunctionKey;
+import io.trino.plugin.hive.metastore.DatabaseFunctionSignatureKey;
 import io.trino.plugin.hive.metastore.HivePartitionName;
 import io.trino.plugin.hive.metastore.HivePrincipal;
 import io.trino.plugin.hive.metastore.HivePrivilegeInfo;
@@ -34,16 +38,16 @@
 import io.trino.plugin.hive.metastore.TablesWithParameterCacheKey;
 import io.trino.plugin.hive.metastore.UserTableKey;
 import io.trino.spi.TrinoException;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.security.RoleGrant;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -54,9 +58,10 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.spi.StandardErrorCode.NOT_FOUND;
 import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNullElse;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 public class HiveMetastoreRecording
@@ -71,9 +76,11 @@ public class HiveMetastoreRecording
     private final NonEvictableCache<HiveTableName, Optional<Table>> tableCache;
     private final NonEvictableCache<HiveTableName, PartitionStatistics> tableStatisticsCache;
     private final NonEvictableCache<HivePartitionName, PartitionStatistics> partitionStatisticsCache;
-    private final NonEvictableCache<String, List<String>> allTablesCache;
+    private final NonEvictableCache<String, List<String>> tableNamesCache;
+    private final NonEvictableCache<SingletonCacheKey, Optional<List<SchemaTableName>>> allTableNamesCache;
     private final NonEvictableCache<TablesWithParameterCacheKey, List<String>> tablesWithParameterCache;
-    private final NonEvictableCache<String, List<String>> allViewsCache;
+    private final NonEvictableCache<String, List<String>> viewNamesCache;
+    private final NonEvictableCache<SingletonCacheKey, Optional<List<SchemaTableName>>> allViewNamesCache;
     private final NonEvictableCache<HivePartitionName, Optional<Partition>> partitionCache;
     private final NonEvictableCache<HiveTableName, Optional<List<String>>> partitionNamesCache;
     private final NonEvictableCache<PartitionFilter, Optional<List<String>>> partitionNamesByPartsCache;
@@ -81,10 +88,12 @@ public class HiveMetastoreRecording
     private final NonEvictableCache<UserTableKey, Set<HivePrivilegeInfo>> tablePrivilegesCache;
     private final NonEvictableCache<HivePrincipal, Set<RoleGrant>> roleGrantsCache;
     private final NonEvictableCache<String, Set<RoleGrant>> grantedPrincipalsCache;
+    private final NonEvictableCache<DatabaseFunctionSignatureKey, Boolean> functionExistsCache;
+    private final NonEvictableCache<String, Collection<LanguageFunction>> functionsByDatabaseCache;
+    private final NonEvictableCache<DatabaseFunctionKey, Collection<LanguageFunction>> functionsByNameCache;
 
     @Inject
     public HiveMetastoreRecording(RecordingMetastoreConfig config, JsonCodec<Recording> recordingCodec)
-            throws IOException
     {
         this.recordingCodec = recordingCodec;
         this.recordingPath = Paths.get(requireNonNull(config.getRecordingPath(), "recordingPath is null"));
@@ -95,9 +104,11 @@ public HiveMetastoreRecording(RecordingMetastoreConfig config, JsonCodec<Recordi
         tableCache = createCache(replay, recordingDuration);
         tableStatisticsCache = createCache(replay, recordingDuration);
         partitionStatisticsCache = createCache(replay, recordingDuration);
-        allTablesCache = createCache(replay, recordingDuration);
+        tableNamesCache = createCache(replay, recordingDuration);
+        allTableNamesCache = createCache(replay, recordingDuration);
         tablesWithParameterCache = createCache(replay, recordingDuration);
-        allViewsCache = createCache(replay, recordingDuration);
+        viewNamesCache = createCache(replay, recordingDuration);
+        allViewNamesCache = createCache(replay, recordingDuration);
         partitionCache = createCache(replay, recordingDuration);
         partitionNamesCache = createCache(replay, recordingDuration);
         partitionNamesByPartsCache = createCache(replay, recordingDuration);
@@ -105,6 +116,9 @@ public HiveMetastoreRecording(RecordingMetastoreConfig config, JsonCodec<Recordi
         tablePrivilegesCache = createCache(replay, recordingDuration);
         roleGrantsCache = createCache(replay, recordingDuration);
         grantedPrincipalsCache = createCache(replay, recordingDuration);
+        functionExistsCache = createCache(replay, recordingDuration);
+        functionsByDatabaseCache = createCache(replay, recordingDuration);
+        functionsByNameCache = createCache(replay, recordingDuration);
 
         if (replay) {
             loadRecording();
@@ -113,12 +127,14 @@ public HiveMetastoreRecording(RecordingMetastoreConfig config, JsonCodec<Recordi
 
     @VisibleForTesting
     void loadRecording()
-            throws IOException
     {
         Recording recording;
         try (GZIPInputStream inputStream = new GZIPInputStream(Files.newInputStream(recordingPath))) {
             recording = recordingCodec.fromJson(inputStream.readAllBytes());
         }
+        catch (RuntimeException | IOException e) {
+            throw new RuntimeException("Failed to load recording from: " + recordingPath, e);
+        }
 
         allDatabases = recording.getAllDatabases();
         allRoles = recording.getAllRoles();
@@ -126,9 +142,9 @@ void loadRecording()
         tableCache.putAll(toMap(recording.getTables()));
         tableStatisticsCache.putAll(toMap(recording.getTableStatistics()));
         partitionStatisticsCache.putAll(toMap(recording.getPartitionStatistics()));
-        allTablesCache.putAll(toMap(recording.getAllTables()));
+        tableNamesCache.putAll(toMap(recording.getAllTables()));
         tablesWithParameterCache.putAll(toMap(recording.getTablesWithParameter()));
-        allViewsCache.putAll(toMap(recording.getAllViews()));
+        viewNamesCache.putAll(toMap(recording.getAllViews()));
         partitionCache.putAll(toMap(recording.getPartitions()));
         partitionNamesCache.putAll(toMap(recording.getPartitionNames()));
         partitionNamesByPartsCache.putAll(toMap(recording.getPartitionNamesByParts()));
@@ -136,6 +152,9 @@ void loadRecording()
         tablePrivilegesCache.putAll(toMap(recording.getTablePrivileges()));
         roleGrantsCache.putAll(toMap(recording.getRoleGrants()));
         grantedPrincipalsCache.putAll(toMap(recording.getGrantedPrincipals()));
+        functionExistsCache.putAll(toMap(recording.getFunctionExists()));
+        functionsByDatabaseCache.putAll(toMap(recording.getFunctionsByDatabase()));
+        functionsByNameCache.putAll(toMap(recording.getFunctionsByName()));
     }
 
     public boolean isReplay()
@@ -176,7 +195,7 @@ public Map<String, PartitionStatistics> getPartitionStatistics(Set<HivePartition
 
     public List<String> getAllTables(String databaseName, Supplier<List<String>> valueSupplier)
     {
-        return loadValue(allTablesCache, databaseName, valueSupplier);
+        return loadValue(tableNamesCache, databaseName, valueSupplier);
     }
 
     public List<String> getTablesWithParameter(TablesWithParameterCacheKey tablesWithParameterCacheKey, Supplier<List<String>> valueSupplier)
@@ -186,7 +205,17 @@ public List<String> getTablesWithParameter(TablesWithParameterCacheKey tablesWit
 
     public List<String> getAllViews(String databaseName, Supplier<List<String>> valueSupplier)
     {
-        return loadValue(allViewsCache, databaseName, valueSupplier);
+        return loadValue(viewNamesCache, databaseName, valueSupplier);
+    }
+
+    public Optional<List<SchemaTableName>> getAllTables(Supplier<Optional<List<SchemaTableName>>> valueSupplier)
+    {
+        return loadValue(allTableNamesCache, SingletonCacheKey.INSTANCE, valueSupplier);
+    }
+
+    public Optional<List<SchemaTableName>> getAllViews(Supplier<Optional<List<SchemaTableName>>> valueSupplier)
+    {
+        return loadValue(allViewNamesCache, SingletonCacheKey.INSTANCE, valueSupplier);
     }
 
     public Optional<Partition> getPartition(HivePartitionName hivePartitionName, Supplier<Optional<Partition>> valueSupplier)
@@ -230,6 +259,21 @@ public Set<RoleGrant> listRoleGrants(HivePrincipal principal, Supplier<Set<RoleG
         return loadValue(roleGrantsCache, principal, valueSupplier);
     }
 
+    public boolean functionExists(DatabaseFunctionSignatureKey key, Supplier<Boolean> valueSupplier)
+    {
+        return loadValue(functionExistsCache, key, valueSupplier);
+    }
+
+    public Collection<LanguageFunction> getFunctions(String databaseName, Supplier<Collection<LanguageFunction>> valueSupplier)
+    {
+        return loadValue(functionsByDatabaseCache, databaseName, valueSupplier);
+    }
+
+    public Collection<LanguageFunction> getFunctions(DatabaseFunctionKey key, Supplier<Collection<LanguageFunction>> valueSupplier)
+    {
+        return loadValue(functionsByNameCache, key, valueSupplier);
+    }
+
     private static <K, V> NonEvictableCache<K, V> createCache(boolean reply, Duration recordingDuration)
     {
         if (reply) {
@@ -255,16 +299,19 @@ public void writeRecording()
                 toPairs(tableCache),
                 toPairs(tableStatisticsCache),
                 toPairs(partitionStatisticsCache),
-                toPairs(allTablesCache),
+                toPairs(tableNamesCache),
                 toPairs(tablesWithParameterCache),
-                toPairs(allViewsCache),
+                toPairs(viewNamesCache),
                 toPairs(partitionCache),
                 toPairs(partitionNamesCache),
                 toPairs(partitionNamesByPartsCache),
                 toPairs(partitionsByNamesCache),
                 toPairs(tablePrivilegesCache),
                 toPairs(roleGrantsCache),
-                toPairs(grantedPrincipalsCache));
+                toPairs(grantedPrincipalsCache),
+                toPairs(functionExistsCache),
+                toPairs(functionsByDatabaseCache),
+                toPairs(functionsByNameCache));
 
         try (GZIPOutputStream outputStream = new GZIPOutputStream(Files.newOutputStream(recordingPath))) {
             outputStream.write(recordingCodec.toJsonBytes(recording));
@@ -333,6 +380,9 @@ public static class Recording
         private final List<Pair<UserTableKey, Set<HivePrivilegeInfo>>> tablePrivileges;
         private final List<Pair<HivePrincipal, Set<RoleGrant>>> roleGrants;
         private final List<Pair<String, Set<RoleGrant>>> grantedPrincipals;
+        private final List<Pair<DatabaseFunctionSignatureKey, Boolean>> functionExists;
+        private final List<Pair<String, Collection<LanguageFunction>>> functionsByDatabase;
+        private final List<Pair<DatabaseFunctionKey, Collection<LanguageFunction>>> functionsByName;
 
         @JsonCreator
         public Recording(
@@ -351,7 +401,10 @@ public Recording(
                 @JsonProperty("partitionsByNames") List<Pair<HivePartitionName, Optional<Partition>>> partitionsByNames,
                 @JsonProperty("tablePrivileges") List<Pair<UserTableKey, Set<HivePrivilegeInfo>>> tablePrivileges,
                 @JsonProperty("roleGrants") List<Pair<HivePrincipal, Set<RoleGrant>>> roleGrants,
-                @JsonProperty("grantedPrincipals") List<Pair<String, Set<RoleGrant>>> grantedPrincipals)
+                @JsonProperty("grantedPrincipals") List<Pair<String, Set<RoleGrant>>> grantedPrincipals,
+                @JsonProperty("functionExists") List<Pair<DatabaseFunctionSignatureKey, Boolean>> functionExists,
+                @JsonProperty("functionsByDatabase") List<Pair<String, Collection<LanguageFunction>>> functionsByDatabase,
+                @JsonProperty("functionsByName") List<Pair<DatabaseFunctionKey, Collection<LanguageFunction>>> functionsByName)
         {
             this.allDatabases = allDatabases;
             this.allRoles = allRoles;
@@ -369,6 +422,9 @@ public Recording(
             this.tablePrivileges = tablePrivileges;
             this.roleGrants = roleGrants;
             this.grantedPrincipals = grantedPrincipals;
+            this.functionExists = requireNonNullElse(functionExists, List.of());
+            this.functionsByDatabase = requireNonNullElse(functionsByDatabase, List.of());
+            this.functionsByName = requireNonNullElse(functionsByName, List.of());
         }
 
         @JsonProperty
@@ -466,6 +522,24 @@ public List<Pair<HivePrincipal, Set<RoleGrant>>> getRoleGrants()
         {
             return roleGrants;
         }
+
+        @JsonProperty
+        public List<Pair<DatabaseFunctionSignatureKey, Boolean>> getFunctionExists()
+        {
+            return functionExists;
+        }
+
+        @JsonProperty
+        public List<Pair<String, Collection<LanguageFunction>>> getFunctionsByDatabase()
+        {
+            return functionsByDatabase;
+        }
+
+        @JsonProperty
+        public List<Pair<DatabaseFunctionKey, Collection<LanguageFunction>>> getFunctionsByName()
+        {
+            return functionsByName;
+        }
     }
 
     @Immutable
@@ -493,4 +567,9 @@ public V getValue()
             return value;
         }
     }
+
+    private enum SingletonCacheKey
+    {
+        INSTANCE
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/RecordingHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/RecordingHiveMetastore.java
index 7c8e7f53cbe2..22c3694bdedf 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/RecordingHiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/RecordingHiveMetastore.java
@@ -18,6 +18,8 @@
 import io.trino.plugin.hive.PartitionStatistics;
 import io.trino.plugin.hive.acid.AcidTransaction;
 import io.trino.plugin.hive.metastore.Database;
+import io.trino.plugin.hive.metastore.DatabaseFunctionKey;
+import io.trino.plugin.hive.metastore.DatabaseFunctionSignatureKey;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.HivePrincipal;
 import io.trino.plugin.hive.metastore.HivePrivilegeInfo;
@@ -28,10 +30,13 @@
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.plugin.hive.metastore.TablesWithParameterCacheKey;
 import io.trino.plugin.hive.metastore.UserTableKey;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -143,6 +148,18 @@ public List<String> getAllViews(String databaseName)
         return recording.getAllViews(databaseName, () -> delegate.getAllViews(databaseName));
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllTables()
+    {
+        return recording.getAllTables(delegate::getAllTables);
+    }
+
+    @Override
+    public Optional<List<SchemaTableName>> getAllViews()
+    {
+        return recording.getAllViews(delegate::getAllViews);
+    }
+
     @Override
     public void createDatabase(Database database)
     {
@@ -296,6 +313,49 @@ public Set<HivePrivilegeInfo> listTablePrivileges(String databaseName, String ta
                 () -> delegate.listTablePrivileges(databaseName, tableName, tableOwner, principal));
     }
 
+    @Override
+    public boolean functionExists(String databaseName, String functionName, String signatureToken)
+    {
+        return recording.functionExists(
+                new DatabaseFunctionSignatureKey(databaseName, functionName, signatureToken),
+                () -> delegate.functionExists(databaseName, functionName, signatureToken));
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName)
+    {
+        return recording.getFunctions(databaseName, () -> delegate.getFunctions(databaseName));
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName, String functionName)
+    {
+        return recording.getFunctions(
+                new DatabaseFunctionKey(databaseName, functionName),
+                () -> delegate.getFunctions(databaseName, functionName));
+    }
+
+    @Override
+    public void createFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        verifyRecordingMode();
+        delegate.createFunction(databaseName, functionName, function);
+    }
+
+    @Override
+    public void replaceFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        verifyRecordingMode();
+        delegate.replaceFunction(databaseName, functionName, function);
+    }
+
+    @Override
+    public void dropFunction(String databaseName, String functionName, String signatureToken)
+    {
+        verifyRecordingMode();
+        delegate.dropFunction(databaseName, functionName, signatureToken);
+    }
+
     @Override
     public void grantTablePrivileges(String databaseName, String tableName, String tableOwner, HivePrincipal grantee, HivePrincipal grantor, Set<HivePrivilege> privileges, boolean grantOption)
     {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/RecordingHiveMetastoreDecorator.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/RecordingHiveMetastoreDecorator.java
index 1a123d4ffeff..1451d381df4d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/RecordingHiveMetastoreDecorator.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/RecordingHiveMetastoreDecorator.java
@@ -13,11 +13,10 @@
  */
 package io.trino.plugin.hive.metastore.recording;
 
+import com.google.inject.Inject;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastoreDecorator;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 public class RecordingHiveMetastoreDecorator
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/WriteHiveMetastoreRecordingProcedure.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/WriteHiveMetastoreRecordingProcedure.java
index 6676a80321f7..1827d3a53047 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/WriteHiveMetastoreRecordingProcedure.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/recording/WriteHiveMetastoreRecordingProcedure.java
@@ -15,11 +15,10 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.RateLimiter;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.trino.spi.procedure.Procedure;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/BridgingHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/BridgingHiveMetastore.java
index 99ca6d5e2227..e643409116c2 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/BridgingHiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/BridgingHiveMetastore.java
@@ -37,10 +37,12 @@
 import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -58,7 +60,9 @@
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.fromMetastoreApiTable;
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.isAvroTableWithSchemaSet;
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.isCsvTable;
+import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.metastoreFunctionName;
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.toMetastoreApiDatabase;
+import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.toMetastoreApiFunction;
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.toMetastoreApiTable;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.security.PrincipalType.USER;
@@ -154,6 +158,18 @@ public List<String> getAllViews(String databaseName)
         return delegate.getAllViews(databaseName);
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllTables()
+    {
+        return delegate.getAllTables();
+    }
+
+    @Override
+    public Optional<List<SchemaTableName>> getAllViews()
+    {
+        return delegate.getAllViews();
+    }
+
     @Override
     public void createDatabase(Database database)
     {
@@ -545,4 +561,52 @@ public void alterTransactionalTable(Table table, long transactionId, long writeI
     {
         delegate.alterTransactionalTable(toMetastoreApiTable(table, principalPrivileges), transactionId, writeId);
     }
+
+    @Override
+    public boolean functionExists(String databaseName, String functionName, String signatureToken)
+    {
+        return delegate.getFunction(databaseName, ThriftMetastoreUtil.metastoreFunctionName(functionName, signatureToken)).isPresent();
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName)
+    {
+        return getFunctionsByPattern(databaseName, "trino__*");
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName, String functionName)
+    {
+        return getFunctionsByPattern(databaseName, "trino__" + functionName + "__*");
+    }
+
+    private Collection<LanguageFunction> getFunctionsByPattern(String databaseName, String functionNamePattern)
+    {
+        return delegate.getFunctions(databaseName, functionNamePattern).stream()
+                .map(name -> delegate.getFunction(databaseName, name))
+                .flatMap(Optional::stream)
+                .map(ThriftMetastoreUtil::fromMetastoreApiFunction)
+                .collect(toImmutableList());
+    }
+
+    @Override
+    public void createFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        if (functionName.contains("__")) {
+            throw new TrinoException(NOT_SUPPORTED, "Function names with double underscore are not supported");
+        }
+        delegate.createFunction(toMetastoreApiFunction(databaseName, functionName, function));
+    }
+
+    @Override
+    public void replaceFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        delegate.alterFunction(toMetastoreApiFunction(databaseName, functionName, function));
+    }
+
+    @Override
+    public void dropFunction(String databaseName, String functionName, String signatureToken)
+    {
+        delegate.dropFunction(databaseName, metastoreFunctionName(functionName, signatureToken));
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/BridgingHiveMetastoreFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/BridgingHiveMetastoreFactory.java
index 404ef6c729f5..140abcd519e9 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/BridgingHiveMetastoreFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/BridgingHiveMetastoreFactory.java
@@ -13,12 +13,11 @@
  */
 package io.trino.plugin.hive.metastore.thrift;
 
+import com.google.inject.Inject;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
 import io.trino.spi.security.ConnectorIdentity;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/CoalescingCounter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/CoalescingCounter.java
index 03648dbfb5da..0e842c8e3634 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/CoalescingCounter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/CoalescingCounter.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.hive.metastore.thrift;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.units.Duration;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.time.Clock;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/DefaultThriftMetastoreClientFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/DefaultThriftMetastoreClientFactory.java
index 86ddad67bb45..cb2319390b3e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/DefaultThriftMetastoreClientFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/DefaultThriftMetastoreClientFactory.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive.metastore.thrift;
 
 import com.google.common.net.HostAndPort;
+import com.google.inject.Inject;
 import io.airlift.security.pem.PemReader;
 import io.airlift.units.Duration;
 import io.trino.plugin.hive.metastore.thrift.ThriftHiveMetastoreClient.TransportSupplier;
@@ -21,7 +22,6 @@
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 
-import javax.inject.Inject;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
@@ -54,27 +54,32 @@ public class DefaultThriftMetastoreClientFactory
 {
     private final Optional<SSLContext> sslContext;
     private final Optional<HostAndPort> socksProxy;
-    private final int timeoutMillis;
+    private final int connectTimeoutMillis;
+    private final int readTimeoutMillis;
     private final HiveMetastoreAuthentication metastoreAuthentication;
     private final String hostname;
 
     private final MetastoreSupportsDateStatistics metastoreSupportsDateStatistics = new MetastoreSupportsDateStatistics();
     private final AtomicInteger chosenGetTableAlternative = new AtomicInteger(Integer.MAX_VALUE);
     private final AtomicInteger chosenTableParamAlternative = new AtomicInteger(Integer.MAX_VALUE);
-    private final AtomicInteger chosenGetAllViewsAlternative = new AtomicInteger(Integer.MAX_VALUE);
+    private final AtomicInteger chosenGetAllViewsPerDatabaseAlternative = new AtomicInteger(Integer.MAX_VALUE);
     private final AtomicInteger chosenAlterTransactionalTableAlternative = new AtomicInteger(Integer.MAX_VALUE);
     private final AtomicInteger chosenAlterPartitionsAlternative = new AtomicInteger(Integer.MAX_VALUE);
+    private final AtomicInteger chosenGetAllTablesAlternative = new AtomicInteger(Integer.MAX_VALUE);
+    private final AtomicInteger chosenGetAllViewsAlternative = new AtomicInteger(Integer.MAX_VALUE);
 
     public DefaultThriftMetastoreClientFactory(
             Optional<SSLContext> sslContext,
             Optional<HostAndPort> socksProxy,
-            Duration timeout,
+            Duration connectTimeout,
+            Duration readTimeout,
             HiveMetastoreAuthentication metastoreAuthentication,
             String hostname)
     {
         this.sslContext = requireNonNull(sslContext, "sslContext is null");
         this.socksProxy = requireNonNull(socksProxy, "socksProxy is null");
-        this.timeoutMillis = toIntExact(timeout.toMillis());
+        this.connectTimeoutMillis = toIntExact(connectTimeout.toMillis());
+        this.readTimeoutMillis = toIntExact(readTimeout.toMillis());
         this.metastoreAuthentication = requireNonNull(metastoreAuthentication, "metastoreAuthentication is null");
         this.hostname = requireNonNull(hostname, "hostname is null");
     }
@@ -93,7 +98,8 @@ public DefaultThriftMetastoreClientFactory(
                         config.getTruststorePath(),
                         Optional.ofNullable(config.getTruststorePassword())),
                 Optional.ofNullable(config.getSocksProxy()),
-                config.getMetastoreTimeout(),
+                config.getConnectTimeout(),
+                config.getReadTimeout(),
                 metastoreAuthentication,
                 nodeManager.getCurrentNode().getHost());
     }
@@ -114,6 +120,8 @@ protected ThriftMetastoreClient create(TransportSupplier transportSupplier, Stri
                 metastoreSupportsDateStatistics,
                 chosenGetTableAlternative,
                 chosenTableParamAlternative,
+                chosenGetAllTablesAlternative,
+                chosenGetAllViewsPerDatabaseAlternative,
                 chosenGetAllViewsAlternative,
                 chosenAlterTransactionalTableAlternative,
                 chosenAlterPartitionsAlternative);
@@ -122,7 +130,7 @@ protected ThriftMetastoreClient create(TransportSupplier transportSupplier, Stri
     private TTransport createTransport(HostAndPort address, Optional<String> delegationToken)
             throws TTransportException
     {
-        return Transport.create(address, sslContext, socksProxy, timeoutMillis, metastoreAuthentication, delegationToken);
+        return Transport.create(address, sslContext, socksProxy, connectTimeoutMillis, readTimeoutMillis, metastoreAuthentication, delegationToken);
     }
 
     private static Optional<SSLContext> buildSslContext(
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/FailureAwareThriftMetastoreClient.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/FailureAwareThriftMetastoreClient.java
index 613c6423654d..3a43d33139f3 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/FailureAwareThriftMetastoreClient.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/FailureAwareThriftMetastoreClient.java
@@ -18,6 +18,7 @@
 import io.trino.hive.thrift.metastore.Database;
 import io.trino.hive.thrift.metastore.EnvironmentContext;
 import io.trino.hive.thrift.metastore.FieldSchema;
+import io.trino.hive.thrift.metastore.Function;
 import io.trino.hive.thrift.metastore.HiveObjectPrivilege;
 import io.trino.hive.thrift.metastore.HiveObjectRef;
 import io.trino.hive.thrift.metastore.LockRequest;
@@ -30,10 +31,13 @@
 import io.trino.hive.thrift.metastore.Table;
 import io.trino.hive.thrift.metastore.TxnToWriteId;
 import io.trino.plugin.hive.acid.AcidOperation;
+import io.trino.spi.connector.SchemaTableName;
 import org.apache.thrift.TException;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
@@ -89,6 +93,13 @@ public List<String> getAllTables(String databaseName)
         return runWithHandle(() -> delegate.getAllTables(databaseName));
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllTables()
+            throws TException
+    {
+        return runWithHandle(() -> delegate.getAllTables());
+    }
+
     @Override
     public List<String> getAllViews(String databaseName)
             throws TException
@@ -96,6 +107,13 @@ public List<String> getAllViews(String databaseName)
         return runWithHandle(() -> delegate.getAllViews(databaseName));
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllViews()
+            throws TException
+    {
+        return runWithHandle(() -> delegate.getAllViews());
+    }
+
     @Override
     public List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue)
             throws TException
@@ -432,6 +450,41 @@ public void alterTransactionalTable(Table table, long transactionId, long writeI
         runWithHandle(() -> delegate.alterTransactionalTable(table, transactionId, writeId, context));
     }
 
+    @Override
+    public Function getFunction(String databaseName, String functionName)
+            throws TException
+    {
+        return runWithHandle(() -> delegate.getFunction(databaseName, functionName));
+    }
+
+    @Override
+    public Collection<String> getFunctions(String databaseName, String functionNamePattern)
+            throws TException
+    {
+        return runWithHandle(() -> delegate.getFunctions(databaseName, functionNamePattern));
+    }
+
+    @Override
+    public void createFunction(Function function)
+            throws TException
+    {
+        runWithHandle(() -> delegate.createFunction(function));
+    }
+
+    @Override
+    public void alterFunction(Function function)
+            throws TException
+    {
+        runWithHandle(() -> delegate.alterFunction(function));
+    }
+
+    @Override
+    public void dropFunction(String databaseName, String functionName)
+            throws TException
+    {
+        runWithHandle(() -> delegate.dropFunction(databaseName, functionName));
+    }
+
     private <T> T runWithHandle(ThrowingSupplier<T> supplier)
             throws TException
     {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/KerberosHiveMetastoreAuthentication.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/KerberosHiveMetastoreAuthentication.java
index 765417f1f91b..834928ea07d0 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/KerberosHiveMetastoreAuthentication.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/KerberosHiveMetastoreAuthentication.java
@@ -14,16 +14,16 @@
 package io.trino.plugin.hive.metastore.thrift;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.airlift.slice.BasicSliceInput;
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.Slices;
-import io.trino.hdfs.authentication.HadoopAuthentication;
+import io.trino.plugin.base.authentication.CachingKerberosAuthentication;
 import io.trino.plugin.hive.ForHiveMetastore;
 import org.apache.thrift.transport.TSaslClientTransport;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 
-import javax.inject.Inject;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
@@ -37,27 +37,27 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.hive.formats.ReadWriteUtils.readVInt;
 import static java.lang.Math.toIntExact;
+import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
-import static org.apache.hadoop.security.SecurityUtil.getServerPrincipal;
 
 public class KerberosHiveMetastoreAuthentication
         implements HiveMetastoreAuthentication
 {
     private final String hiveMetastoreServicePrincipal;
-    private final HadoopAuthentication authentication;
+    private final CachingKerberosAuthentication authentication;
 
     @Inject
     public KerberosHiveMetastoreAuthentication(
             MetastoreKerberosConfig config,
-            @ForHiveMetastore HadoopAuthentication authentication)
+            @ForHiveMetastore CachingKerberosAuthentication authentication)
     {
         this(config.getHiveMetastoreServicePrincipal(), authentication);
     }
 
-    public KerberosHiveMetastoreAuthentication(String hiveMetastoreServicePrincipal, HadoopAuthentication authentication)
+    public KerberosHiveMetastoreAuthentication(String hiveMetastoreServicePrincipal, CachingKerberosAuthentication authentication)
     {
         this.hiveMetastoreServicePrincipal = requireNonNull(hiveMetastoreServicePrincipal, "hiveMetastoreServicePrincipal is null");
         this.authentication = requireNonNull(authentication, "authentication is null");
@@ -67,11 +67,6 @@ public KerberosHiveMetastoreAuthentication(String hiveMetastoreServicePrincipal,
     public TTransport authenticate(TTransport rawTransport, String hiveMetastoreHost, Optional<String> delegationToken)
     {
         try {
-            String serverPrincipal = getServerPrincipal(hiveMetastoreServicePrincipal, hiveMetastoreHost);
-            String[] names = serverPrincipal.split("[/@]");
-            checkState(names.length == 3,
-                    "Kerberos principal name does NOT have the expected hostname part: %s", serverPrincipal);
-
             Map<String, String> saslProps = ImmutableMap.of(
                     Sasl.QOP, "auth-conf,auth",
                     Sasl.SERVER_AUTH, "true");
@@ -88,6 +83,12 @@ public TTransport authenticate(TTransport rawTransport, String hiveMetastoreHost
                         rawTransport);
             }
             else {
+                String[] names = hiveMetastoreServicePrincipal.split("[/@]");
+                checkArgument(names.length == 3, "Kerberos principal name does not have the expected hostname part: %s", hiveMetastoreServicePrincipal);
+                if (names[1].equals("_HOST")) {
+                    names[1] = hiveMetastoreHost.toLowerCase(ENGLISH);
+                }
+
                 saslTransport = new TSaslClientTransport(
                         "GSSAPI", // SaslRpcServer.AuthMethod.KERBEROS
                         null,
@@ -98,7 +99,7 @@ public TTransport authenticate(TTransport rawTransport, String hiveMetastoreHost
                         rawTransport);
             }
 
-            return new TUgiAssumingTransport(saslTransport, authentication.getUserGroupInformation());
+            return new TSubjectAssumingTransport(saslTransport, authentication.getSubject());
         }
         catch (IOException e) {
             throw new UncheckedIOException(e);
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/MetastoreKerberosConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/MetastoreKerberosConfig.java
index 1aa1ae1eb971..5fe8a20b6bce 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/MetastoreKerberosConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/MetastoreKerberosConfig.java
@@ -16,9 +16,8 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/MetastoreSupportsDateStatistics.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/MetastoreSupportsDateStatistics.java
index 53687a49b9d4..4459f349fbce 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/MetastoreSupportsDateStatistics.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/MetastoreSupportsDateStatistics.java
@@ -13,10 +13,9 @@
  */
 package io.trino.plugin.hive.metastore.thrift;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.units.Duration;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.concurrent.atomic.AtomicReference;
 
 import static io.trino.plugin.hive.metastore.thrift.MetastoreSupportsDateStatistics.DateStatisticsSupport.NOT_SUPPORTED;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/StaticMetastoreConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/StaticMetastoreConfig.java
index 1fb56bdf6fa4..6c89bb104935 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/StaticMetastoreConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/StaticMetastoreConfig.java
@@ -16,8 +16,7 @@
 import com.google.common.base.Splitter;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.net.URI;
 import java.util.List;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/StaticTokenAwareMetastoreClientFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/StaticTokenAwareMetastoreClientFactory.java
index dda309091ef5..bd881a37080c 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/StaticTokenAwareMetastoreClientFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/StaticTokenAwareMetastoreClientFactory.java
@@ -16,14 +16,13 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Ticker;
 import com.google.common.net.HostAndPort;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
 import io.trino.plugin.hive.metastore.thrift.FailureAwareThriftMetastoreClient.Callback;
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreAuthenticationConfig.ThriftMetastoreAuthenticationType;
+import jakarta.annotation.Nullable;
 import org.apache.thrift.TException;
 
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
 import java.net.URI;
 import java.util.Comparator;
 import java.util.List;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TSubjectAssumingTransport.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TSubjectAssumingTransport.java
new file mode 100644
index 000000000000..fed23b8bd1fc
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TSubjectAssumingTransport.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.metastore.thrift;
+
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportException;
+
+import javax.security.auth.Subject;
+
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+import static com.google.common.base.Throwables.throwIfInstanceOf;
+import static com.google.common.base.Throwables.throwIfUnchecked;
+import static java.util.Objects.requireNonNull;
+
+// based on org.apache.hadoop.hive.thrift.client.TUGIAssumingTransport
+public class TSubjectAssumingTransport
+        extends TFilterTransport
+{
+    private final Subject subject;
+
+    public TSubjectAssumingTransport(TTransport transport, Subject subject)
+    {
+        super(transport);
+        this.subject = requireNonNull(subject, "ugi is null");
+    }
+
+    @Override
+    public void open()
+            throws TTransportException
+    {
+        try {
+            Subject.doAs(subject, (PrivilegedExceptionAction<?>) () -> {
+                transport.open();
+                return null;
+            });
+        }
+        catch (PrivilegedActionException e) {
+            throwIfInstanceOf(e.getCause(), TTransportException.class);
+            throwIfUnchecked(e.getCause());
+            throw new RuntimeException(e.getCause());
+        }
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TUgiAssumingTransport.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TUgiAssumingTransport.java
deleted file mode 100644
index 4e610df875cd..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TUgiAssumingTransport.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.metastore.thrift;
-
-import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-
-import static io.trino.hdfs.authentication.UserGroupInformationUtils.executeActionInDoAs;
-import static java.util.Objects.requireNonNull;
-
-// based on org.apache.hadoop.hive.thrift.client.TUGIAssumingTransport
-public class TUgiAssumingTransport
-        extends TFilterTransport
-{
-    private final UserGroupInformation ugi;
-
-    public TUgiAssumingTransport(TTransport transport, UserGroupInformation ugi)
-    {
-        super(transport);
-        this.ugi = requireNonNull(ugi, "ugi is null");
-    }
-
-    @Override
-    public void open()
-            throws TTransportException
-    {
-        executeActionInDoAs(ugi, () -> {
-            transport.open();
-            return null;
-        });
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastore.java
index fe0ca923c499..f7127dbe9605 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastore.java
@@ -14,14 +14,17 @@
 package io.trino.plugin.hive.metastore.thrift;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.CharMatcher;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.concurrent.MoreFutures;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
-import io.trino.hdfs.HdfsContext;
-import io.trino.hdfs.HdfsEnvironment;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hive.thrift.metastore.AlreadyExistsException;
 import io.trino.hive.thrift.metastore.ColumnStatisticsObj;
 import io.trino.hive.thrift.metastore.ConfigValSecurityException;
@@ -79,21 +82,22 @@
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
-import org.apache.hadoop.fs.Path;
 import org.apache.thrift.TException;
-
-import javax.annotation.concurrent.ThreadSafe;
+import org.apache.thrift.transport.TTransportException;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalLong;
 import java.util.Set;
@@ -104,6 +108,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
+import static com.google.common.base.Strings.nullToEmpty;
 import static com.google.common.base.Throwables.throwIfUnchecked;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
@@ -131,6 +136,7 @@
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.updateStatisticsParameters;
 import static io.trino.plugin.hive.util.HiveUtil.makePartName;
 import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
+import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.security.PrincipalType.USER;
 import static java.lang.String.format;
@@ -144,9 +150,10 @@ public class ThriftHiveMetastore
     private static final Logger log = Logger.get(ThriftHiveMetastore.class);
 
     private static final String DEFAULT_METASTORE_USER = "presto";
+    private static final CharMatcher DOT_MATCHER = CharMatcher.is('.');
 
     private final Optional<ConnectorIdentity> identity;
-    private final HdfsEnvironment hdfsEnvironment;
+    private final TrinoFileSystemFactory fileSystemFactory;
     private final IdentityAwareMetastoreClientFactory metastoreClientFactory;
     private final double backoffScaleFactor;
     private final Duration minBackoffDelay;
@@ -158,12 +165,13 @@ public class ThriftHiveMetastore
     private final boolean translateHiveViews;
     private final boolean assumeCanonicalPartitionKeys;
     private final boolean useSparkTableStatisticsFallback;
+    private final boolean batchMetadataFetchEnabled;
     private final ThriftMetastoreStats stats;
     private final ExecutorService writeStatisticsExecutor;
 
     public ThriftHiveMetastore(
             Optional<ConnectorIdentity> identity,
-            HdfsEnvironment hdfsEnvironment,
+            TrinoFileSystemFactory fileSystemFactory,
             IdentityAwareMetastoreClientFactory metastoreClientFactory,
             double backoffScaleFactor,
             Duration minBackoffDelay,
@@ -175,11 +183,12 @@ public ThriftHiveMetastore(
             boolean translateHiveViews,
             boolean assumeCanonicalPartitionKeys,
             boolean useSparkTableStatisticsFallback,
+            boolean batchMetadataFetchEnabled,
             ThriftMetastoreStats stats,
             ExecutorService writeStatisticsExecutor)
     {
         this.identity = requireNonNull(identity, "identity is null");
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.metastoreClientFactory = requireNonNull(metastoreClientFactory, "metastoreClientFactory is null");
         this.backoffScaleFactor = backoffScaleFactor;
         this.minBackoffDelay = requireNonNull(minBackoffDelay, "minBackoffDelay is null");
@@ -191,6 +200,7 @@ public ThriftHiveMetastore(
         this.translateHiveViews = translateHiveViews;
         this.assumeCanonicalPartitionKeys = assumeCanonicalPartitionKeys;
         this.useSparkTableStatisticsFallback = useSparkTableStatisticsFallback;
+        this.batchMetadataFetchEnabled = batchMetadataFetchEnabled;
         this.stats = requireNonNull(stats, "stats is null");
         this.writeStatisticsExecutor = requireNonNull(writeStatisticsExecutor, "writeStatisticsExecutor is null");
     }
@@ -387,6 +397,22 @@ public Map<String, PartitionStatistics> getPartitionStatistics(Table table, List
                         }));
         Map<String, OptionalLong> partitionRowCounts = partitionBasicStatistics.entrySet().stream()
                 .collect(toImmutableMap(Map.Entry::getKey, entry -> entry.getValue().getRowCount()));
+
+        long tableRowCount = partitionRowCounts.values().stream()
+                .mapToLong(count -> count.orElse(0))
+                .sum();
+        if (!partitionRowCounts.isEmpty() && tableRowCount == 0) {
+            // When the table has partitions, but row count statistics are set to zero, we treat this case as empty
+            // statistics to avoid underestimation in the CBO. This scenario may be caused when other engines are
+            // used to ingest data into partitioned hive tables.
+            // https://github.com/trinodb/trino/issues/18798 Hive Metastore assumes any new partition statistics to at least have all parameters that the partition used to have
+            partitionBasicStatistics = partitionBasicStatistics.entrySet().stream()
+                    .map(entry -> new SimpleEntry<>(
+                            entry.getKey(),
+                            entry.getValue().withEmptyRowCount()))
+                    .collect(toImmutableMap(SimpleEntry::getKey, SimpleEntry::getValue));
+        }
+
         Map<String, Map<String, HiveColumnStatistics>> partitionColumnStatistics = getPartitionColumnStatistics(
                 table.getDbName(),
                 table.getTableName(),
@@ -573,6 +599,9 @@ private void deleteTableColumnStatistics(String databaseName, String tableName,
     public void updatePartitionStatistics(Table table, String partitionName, Function<PartitionStatistics, PartitionStatistics> update)
     {
         List<Partition> partitions = getPartitionsByNames(table.getDbName(), table.getTableName(), ImmutableList.of(partitionName));
+        if (partitions.isEmpty()) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, "No partition found for name: " + partitionName);
+        }
         if (partitions.size() != 1) {
             throw new TrinoException(HIVE_METASTORE_ERROR, "Metastore returned multiple partitions for name: " + partitionName);
         }
@@ -863,9 +892,76 @@ public List<String> getAllViews(String databaseName)
         }
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllTables()
+    {
+        if (!batchMetadataFetchEnabled) {
+            return Optional.empty();
+        }
+
+        try {
+            return retry()
+                    .stopOn(UnknownDBException.class)
+                    .stopOnIllegalExceptions()
+                    .run("getAllTables", stats.getGetAllTables().wrap(() -> {
+                        try (ThriftMetastoreClient client = createMetastoreClient()) {
+                            return client.getAllTables();
+                        }
+                    }));
+        }
+        catch (TTransportException e) {
+            log.warn(e, "Failed to get all views");
+            // fallback in case of HMS error
+            return Optional.empty();
+        }
+        catch (TException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+        catch (Exception e) {
+            throw propagate(e);
+        }
+    }
+
+    @Override
+    public Optional<List<SchemaTableName>> getAllViews()
+    {
+        // Without translateHiveViews, Hive views are represented as tables in Trino,
+        // and they should not be returned from ThriftHiveMetastore.getAllViews() call
+        if (!translateHiveViews) {
+            return Optional.empty();
+        }
+
+        if (!batchMetadataFetchEnabled) {
+            return Optional.empty();
+        }
+
+        try {
+            return retry()
+                    .stopOn(UnknownDBException.class)
+                    .stopOnIllegalExceptions()
+                    .run("getAllViews", stats.getGetAllViews().wrap(() -> {
+                        try (ThriftMetastoreClient client = createMetastoreClient()) {
+                            return client.getAllViews();
+                        }
+                    }));
+        }
+        catch (TTransportException e) {
+            log.warn(e, "Failed to get all tables");
+            // fallback in case of HMS error
+            return Optional.empty();
+        }
+        catch (TException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+        catch (Exception e) {
+            throw propagate(e);
+        }
+    }
+
     @Override
     public void createDatabase(Database database)
     {
+        validateObjectName(database.getName());
         try {
             retry()
                     .stopOn(AlreadyExistsException.class, InvalidObjectException.class, MetaException.class)
@@ -916,6 +1012,9 @@ public void dropDatabase(String databaseName, boolean deleteData)
     @Override
     public void alterDatabase(String databaseName, Database database)
     {
+        if (!Objects.equals(databaseName, database.getName())) {
+            validateObjectName(database.getName());
+        }
         try {
             retry()
                     .stopOn(NoSuchObjectException.class, MetaException.class)
@@ -941,6 +1040,7 @@ public void alterDatabase(String databaseName, Database database)
     @Override
     public void createTable(Table table)
     {
+        validateObjectName(table.getTableName());
         try {
             retry()
                     .stopOn(AlreadyExistsException.class, InvalidObjectException.class, MetaException.class, NoSuchObjectException.class)
@@ -993,7 +1093,7 @@ public void dropTable(String databaseName, String tableName, boolean deleteData)
                             client.dropTable(databaseName, tableName, deleteData);
                             String tableLocation = table.getSd().getLocation();
                             if (deleteFilesOnDrop && deleteData && isManagedTable(table) && !isNullOrEmpty(tableLocation)) {
-                                deleteDirRecursive(new Path(tableLocation));
+                                deleteDirRecursive(Location.of(tableLocation));
                             }
                         }
                         return null;
@@ -1010,12 +1110,12 @@ public void dropTable(String databaseName, String tableName, boolean deleteData)
         }
     }
 
-    private void deleteDirRecursive(Path path)
+    private void deleteDirRecursive(Location path)
     {
         try {
-            HdfsContext context = new HdfsContext(identity.orElseGet(() ->
-                    ConnectorIdentity.ofUser(DEFAULT_METASTORE_USER)));
-            hdfsEnvironment.getFileSystem(context, path).delete(path, true);
+            TrinoFileSystem fileSystem = fileSystemFactory.create(
+                    identity.orElseGet(() -> ConnectorIdentity.ofUser(DEFAULT_METASTORE_USER)));
+            fileSystem.deleteDirectory(path);
         }
         catch (IOException | RuntimeException e) {
             // don't fail if unable to delete path
@@ -1031,6 +1131,12 @@ private static boolean isManagedTable(Table table)
     @Override
     public void alterTable(String databaseName, String tableName, Table table)
     {
+        if (!Objects.equals(databaseName, table.getDbName())) {
+            validateObjectName(table.getDbName());
+        }
+        if (!Objects.equals(tableName, table.getTableName())) {
+            validateObjectName(table.getTableName());
+        }
         try {
             retry()
                     .stopOn(InvalidOperationException.class, MetaException.class)
@@ -1205,7 +1311,7 @@ public void dropPartition(String databaseName, String tableName, List<String> pa
                             client.dropPartition(databaseName, tableName, parts, deleteData);
                             String partitionLocation = partition.getSd().getLocation();
                             if (deleteFilesOnDrop && deleteData && !isNullOrEmpty(partitionLocation) && isManagedTable(client.getTable(databaseName, tableName))) {
-                                deleteDirRecursive(new Path(partitionLocation));
+                                deleteDirRecursive(Location.of(partitionLocation));
                             }
                         }
                         return null;
@@ -1915,6 +2021,123 @@ public void addDynamicPartitions(String dbName, String tableName, List<String> p
         }
     }
 
+    @Override
+    public Optional<io.trino.hive.thrift.metastore.Function> getFunction(String databaseName, String functionName)
+    {
+        try {
+            return retry()
+                    .stopOn(MetaException.class, NoSuchObjectException.class)
+                    .stopOnIllegalExceptions()
+                    .run("getFunction", stats.getGetFunction().wrap(() -> {
+                        try (ThriftMetastoreClient client = createMetastoreClient()) {
+                            return Optional.of(client.getFunction(databaseName, functionName));
+                        }
+                    }));
+        }
+        catch (NoSuchObjectException e) {
+            return Optional.empty();
+        }
+        catch (TException e) {
+            // Hive 2.x throws the wrong exception type
+            if ((e instanceof MetaException) && nullToEmpty(e.getMessage()).startsWith("NoSuchObjectException(")) {
+                return Optional.empty();
+            }
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+        catch (Exception e) {
+            throw propagate(e);
+        }
+    }
+
+    @Override
+    public Collection<String> getFunctions(String databaseName, String functionNamePattern)
+    {
+        try {
+            return retry()
+                    .stopOnIllegalExceptions()
+                    .run("getFunctions", stats.getGetFunctions().wrap(() -> {
+                        try (ThriftMetastoreClient client = createMetastoreClient()) {
+                            return client.getFunctions(databaseName, functionNamePattern);
+                        }
+                    }));
+        }
+        catch (TException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+        catch (Exception e) {
+            throw propagate(e);
+        }
+    }
+
+    @Override
+    public void createFunction(io.trino.hive.thrift.metastore.Function function)
+    {
+        try {
+            retry()
+                    .stopOn(AlreadyExistsException.class, InvalidObjectException.class, NoSuchObjectException.class)
+                    .stopOnIllegalExceptions()
+                    .run("createFunction", stats.getCreateFunction().wrap(() -> {
+                        try (ThriftMetastoreClient client = createMetastoreClient()) {
+                            client.createFunction(function);
+                            return null;
+                        }
+                    }));
+        }
+        catch (NoSuchObjectException e) {
+            throw new SchemaNotFoundException(function.getDbName());
+        }
+        catch (TException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+        catch (Exception e) {
+            throw propagate(e);
+        }
+    }
+
+    @Override
+    public void alterFunction(io.trino.hive.thrift.metastore.Function function)
+    {
+        try {
+            retry()
+                    .stopOn(InvalidOperationException.class)
+                    .stopOnIllegalExceptions()
+                    .run("alterFunction", stats.getAlterFunction().wrap(() -> {
+                        try (ThriftMetastoreClient client = createMetastoreClient()) {
+                            client.alterFunction(function);
+                            return null;
+                        }
+                    }));
+        }
+        catch (TException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+        catch (Exception e) {
+            throw propagate(e);
+        }
+    }
+
+    @Override
+    public void dropFunction(String databaseName, String functionName)
+    {
+        try {
+            retry()
+                    .stopOn(NoSuchObjectException.class)
+                    .stopOnIllegalExceptions()
+                    .run("dropFunction", stats.getDropFunction().wrap(() -> {
+                        try (ThriftMetastoreClient client = createMetastoreClient()) {
+                            client.dropFunction(databaseName, functionName);
+                            return null;
+                        }
+                    }));
+        }
+        catch (TException e) {
+            throw new TrinoException(HIVE_METASTORE_ERROR, e);
+        }
+        catch (Exception e) {
+            throw propagate(e);
+        }
+    }
+
     private static PrivilegeBag buildPrivilegeBag(
             String databaseName,
             String tableName,
@@ -1962,4 +2185,20 @@ private static RuntimeException propagate(Throwable throwable)
         throwIfUnchecked(throwable);
         throw new RuntimeException(throwable);
     }
+
+    private static void validateObjectName(String objectName)
+    {
+        if (isNullOrEmpty(objectName)) {
+            throw new IllegalArgumentException("The provided objectName cannot be null or empty");
+        }
+        if (DOT_MATCHER.matchesAllOf(objectName)) {
+            // '.' or '..' object names can cause the object to have an inaccurate location on the object storage
+            throw new TrinoException(GENERIC_USER_ERROR, format("Invalid object name: '%s'", objectName));
+        }
+        if (objectName.contains("/")) {
+            // Older HMS instances may allow names like 'foo/bar' which can cause managed tables to be
+            // saved in a different location than its intended schema directory
+            throw new TrinoException(GENERIC_USER_ERROR, format("Invalid object name: '%s'", objectName));
+        }
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastoreClient.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastoreClient.java
index 80e94ac172bb..fdd3ed79a10f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastoreClient.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastoreClient.java
@@ -32,6 +32,7 @@
 import io.trino.hive.thrift.metastore.Database;
 import io.trino.hive.thrift.metastore.EnvironmentContext;
 import io.trino.hive.thrift.metastore.FieldSchema;
+import io.trino.hive.thrift.metastore.Function;
 import io.trino.hive.thrift.metastore.GetPrincipalsInRoleRequest;
 import io.trino.hive.thrift.metastore.GetPrincipalsInRoleResponse;
 import io.trino.hive.thrift.metastore.GetRoleGrantsForPrincipalRequest;
@@ -56,6 +57,7 @@
 import io.trino.hive.thrift.metastore.Role;
 import io.trino.hive.thrift.metastore.RolePrincipalGrant;
 import io.trino.hive.thrift.metastore.Table;
+import io.trino.hive.thrift.metastore.TableMeta;
 import io.trino.hive.thrift.metastore.TableStatsRequest;
 import io.trino.hive.thrift.metastore.TableValidWriteIds;
 import io.trino.hive.thrift.metastore.ThriftHiveMetastore;
@@ -64,6 +66,7 @@
 import io.trino.plugin.base.util.LoggingInvocationHandler;
 import io.trino.plugin.hive.acid.AcidOperation;
 import io.trino.plugin.hive.metastore.thrift.MetastoreSupportsDateStatistics.DateStatisticsSupport;
+import io.trino.spi.connector.SchemaTableName;
 import org.apache.thrift.TApplicationException;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
@@ -71,8 +74,10 @@
 import org.apache.thrift.transport.TTransportException;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -114,6 +119,8 @@ public class ThriftHiveMetastoreClient
     private final MetastoreSupportsDateStatistics metastoreSupportsDateStatistics;
     private final AtomicInteger chosenGetTableAlternative;
     private final AtomicInteger chosenTableParamAlternative;
+    private final AtomicInteger chosenGetAllTablesAlternative;
+    private final AtomicInteger chosenGetAllViewsPerDatabaseAlternative;
     private final AtomicInteger chosenGetAllViewsAlternative;
     private final AtomicInteger chosenAlterTransactionalTableAlternative;
     private final AtomicInteger chosenAlterPartitionsAlternative;
@@ -124,6 +131,8 @@ public ThriftHiveMetastoreClient(
             MetastoreSupportsDateStatistics metastoreSupportsDateStatistics,
             AtomicInteger chosenGetTableAlternative,
             AtomicInteger chosenTableParamAlternative,
+            AtomicInteger chosenGetAllTablesAlternative,
+            AtomicInteger chosenGetAllViewsPerDatabaseAlternative,
             AtomicInteger chosenGetAllViewsAlternative,
             AtomicInteger chosenAlterTransactionalTableAlternative,
             AtomicInteger chosenAlterPartitionsAlternative)
@@ -134,9 +143,11 @@ public ThriftHiveMetastoreClient(
         this.metastoreSupportsDateStatistics = requireNonNull(metastoreSupportsDateStatistics, "metastoreSupportsDateStatistics is null");
         this.chosenGetTableAlternative = requireNonNull(chosenGetTableAlternative, "chosenGetTableAlternative is null");
         this.chosenTableParamAlternative = requireNonNull(chosenTableParamAlternative, "chosenTableParamAlternative is null");
-        this.chosenGetAllViewsAlternative = requireNonNull(chosenGetAllViewsAlternative, "chosenGetAllViewsAlternative is null");
+        this.chosenGetAllViewsPerDatabaseAlternative = requireNonNull(chosenGetAllViewsPerDatabaseAlternative, "chosenGetAllViewsPerDatabaseAlternative is null");
         this.chosenAlterTransactionalTableAlternative = requireNonNull(chosenAlterTransactionalTableAlternative, "chosenAlterTransactionalTableAlternative is null");
         this.chosenAlterPartitionsAlternative = requireNonNull(chosenAlterPartitionsAlternative, "chosenAlterPartitionsAlternative is null");
+        this.chosenGetAllTablesAlternative = requireNonNull(chosenGetAllTablesAlternative, "chosenGetAllTablesAlternative is null");
+        this.chosenGetAllViewsAlternative = requireNonNull(chosenGetAllViewsAlternative, "chosenGetAllViewsAlternative is null");
 
         connect();
     }
@@ -184,18 +195,48 @@ public List<String> getAllTables(String databaseName)
         return client.getAllTables(databaseName);
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllTables()
+            throws TException
+    {
+        return alternativeCall(
+                exception -> !isUnknownMethodExceptionalResponse(exception),
+                chosenGetAllTablesAlternative,
+                // Empty table types argument (the 3rd one) means all types of tables
+                () -> getSchemaTableNames(client.getTableMeta("*", "*", ImmutableList.of())),
+                Optional::empty);
+    }
+
     @Override
     public List<String> getAllViews(String databaseName)
             throws TException
     {
         return alternativeCall(
                 exception -> !isUnknownMethodExceptionalResponse(exception),
-                chosenGetAllViewsAlternative,
+                chosenGetAllViewsPerDatabaseAlternative,
                 () -> client.getTablesByType(databaseName, ".*", VIRTUAL_VIEW.name()),
                 // fallback to enumerating Presto views only (Hive views can still be executed, but will be listed as tables and not views)
                 () -> getTablesWithParameter(databaseName, PRESTO_VIEW_FLAG, "true"));
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllViews()
+            throws TException
+    {
+        return alternativeCall(
+                exception -> !isUnknownMethodExceptionalResponse(exception),
+                chosenGetAllViewsAlternative,
+                () -> getSchemaTableNames(client.getTableMeta("*", "*", ImmutableList.of(VIRTUAL_VIEW.name()))),
+                Optional::empty);
+    }
+
+    private static Optional<List<SchemaTableName>> getSchemaTableNames(List<TableMeta> tablesMetadata)
+    {
+        return Optional.of(tablesMetadata.stream()
+                .map(metadata -> new SchemaTableName(metadata.getDbName(), metadata.getTableName()))
+                .collect(toImmutableList()));
+    }
+
     @Override
     public List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue)
             throws TException
@@ -708,7 +749,7 @@ public void addDynamicPartitions(String dbName, String tableName, List<String> p
             throws TException
     {
         AddDynamicPartitions request = new AddDynamicPartitions(transactionId, writeId, dbName, tableName, partitionNames);
-        request.setOperationType(operation.getMetastoreOperationType().orElseThrow());
+        request.setOperationType(operation.getMetastoreOperationType());
         client.addDynamicPartitions(request);
     }
 
@@ -737,6 +778,41 @@ public void alterTransactionalTable(Table table, long transactionId, long writeI
                 });
     }
 
+    @Override
+    public Function getFunction(String databaseName, String functionName)
+            throws TException
+    {
+        return client.getFunction(databaseName, functionName);
+    }
+
+    @Override
+    public Collection<String> getFunctions(String databaseName, String functionNamePattern)
+            throws TException
+    {
+        return client.getFunctions(databaseName, functionNamePattern);
+    }
+
+    @Override
+    public void createFunction(Function function)
+            throws TException
+    {
+        client.createFunction(function);
+    }
+
+    @Override
+    public void alterFunction(Function function)
+            throws TException
+    {
+        client.alterFunction(function.getDbName(), function.getFunctionName(), function);
+    }
+
+    @Override
+    public void dropFunction(String databaseName, String functionName)
+            throws TException
+    {
+        client.dropFunction(databaseName, functionName);
+    }
+
     // Method needs to be final for @SafeVarargs to work
     @SafeVarargs
     @VisibleForTesting
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastoreFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastoreFactory.java
index 22e6ad93b158..35e60270e866 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastoreFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastoreFactory.java
@@ -13,15 +13,14 @@
  */
 package io.trino.plugin.hive.metastore.thrift;
 
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
-import io.trino.hdfs.HdfsEnvironment;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.hive.HideDeltaLakeTables;
 import io.trino.spi.security.ConnectorIdentity;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 
@@ -31,7 +30,7 @@
 public class ThriftHiveMetastoreFactory
         implements ThriftMetastoreFactory
 {
-    private final HdfsEnvironment hdfsEnvironment;
+    private final TrinoFileSystemFactory fileSystemFactory;
     private final IdentityAwareMetastoreClientFactory metastoreClientFactory;
     private final double backoffScaleFactor;
     private final Duration minBackoffDelay;
@@ -44,6 +43,7 @@ public class ThriftHiveMetastoreFactory
     private final boolean translateHiveViews;
     private final boolean assumeCanonicalPartitionKeys;
     private final boolean useSparkTableStatisticsFallback;
+    private final boolean batchMetadataFetchEnabled;
     private final ExecutorService writeStatisticsExecutor;
     private final ThriftMetastoreStats stats = new ThriftMetastoreStats();
 
@@ -53,11 +53,11 @@ public ThriftHiveMetastoreFactory(
             @HideDeltaLakeTables boolean hideDeltaLakeTables,
             @TranslateHiveViews boolean translateHiveViews,
             ThriftMetastoreConfig thriftConfig,
-            HdfsEnvironment hdfsEnvironment,
+            TrinoFileSystemFactory fileSystemFactory,
             @ThriftHiveWriteStatisticsExecutor ExecutorService writeStatisticsExecutor)
     {
         this.metastoreClientFactory = requireNonNull(metastoreClientFactory, "metastoreClientFactory is null");
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.backoffScaleFactor = thriftConfig.getBackoffScaleFactor();
         this.minBackoffDelay = thriftConfig.getMinBackoffDelay();
         this.maxBackoffDelay = thriftConfig.getMaxBackoffDelay();
@@ -71,6 +71,7 @@ public ThriftHiveMetastoreFactory(
 
         this.assumeCanonicalPartitionKeys = thriftConfig.isAssumeCanonicalPartitionKeys();
         this.useSparkTableStatisticsFallback = thriftConfig.isUseSparkTableStatisticsFallback();
+        this.batchMetadataFetchEnabled = thriftConfig.isBatchMetadataFetchEnabled();
         this.writeStatisticsExecutor = requireNonNull(writeStatisticsExecutor, "writeStatisticsExecutor is null");
     }
 
@@ -92,7 +93,7 @@ public ThriftMetastore createMetastore(Optional<ConnectorIdentity> identity)
     {
         return new ThriftHiveMetastore(
                 identity,
-                hdfsEnvironment,
+                fileSystemFactory,
                 metastoreClientFactory,
                 backoffScaleFactor,
                 minBackoffDelay,
@@ -104,6 +105,7 @@ public ThriftMetastore createMetastore(Optional<ConnectorIdentity> identity)
                 translateHiveViews,
                 assumeCanonicalPartitionKeys,
                 useSparkTableStatisticsFallback,
+                batchMetadataFetchEnabled,
                 stats,
                 writeStatisticsExecutor);
     }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveWriteStatisticsExecutor.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveWriteStatisticsExecutor.java
index b0a53b8d8915..1e80efe85ab1 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveWriteStatisticsExecutor.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveWriteStatisticsExecutor.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive.metastore.thrift;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,5 +25,5 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ThriftHiveWriteStatisticsExecutor {}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastore.java
index 97aa01ac3c26..4a05b588b444 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastore.java
@@ -35,6 +35,7 @@
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -65,10 +66,14 @@ public interface ThriftMetastore
 
     List<String> getAllTables(String databaseName);
 
+    Optional<List<SchemaTableName>> getAllTables();
+
     List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue);
 
     List<String> getAllViews(String databaseName);
 
+    Optional<List<SchemaTableName>> getAllViews();
+
     Optional<Database> getDatabase(String databaseName);
 
     void addPartitions(String databaseName, String tableName, List<PartitionWithStatistics> partitions);
@@ -220,4 +225,14 @@ default void addDynamicPartitions(String dbName, String tableName, List<String>
     {
         throw new UnsupportedOperationException();
     }
+
+    Optional<io.trino.hive.thrift.metastore.Function> getFunction(String databaseName, String functionName);
+
+    Collection<String> getFunctions(String databaseName, String functionNamePattern);
+
+    void createFunction(io.trino.hive.thrift.metastore.Function function);
+
+    void alterFunction(io.trino.hive.thrift.metastore.Function function);
+
+    void dropFunction(String databaseName, String functionName);
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreApiStats.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreApiStats.java
index b6ecc2ee5d68..90ea6c428b15 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreApiStats.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreApiStats.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.hive.metastore.thrift;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.stats.CounterStat;
 import io.airlift.stats.TimeStat;
 import io.trino.hive.thrift.metastore.MetaException;
@@ -21,8 +22,6 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.concurrent.Callable;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreAuthenticationConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreAuthenticationConfig.java
index 895fdaefd8d2..0573bafb7c03 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreAuthenticationConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreAuthenticationConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreAuthenticationConfig.ThriftMetastoreAuthenticationType.NONE;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreAuthenticationModule.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreAuthenticationModule.java
index d48422cdb8ea..9aeacf6d8c82 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreAuthenticationModule.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreAuthenticationModule.java
@@ -18,15 +18,14 @@
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
-import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.hdfs.authentication.HadoopAuthentication;
+import io.trino.plugin.base.authentication.CachingKerberosAuthentication;
+import io.trino.plugin.base.authentication.KerberosAuthentication;
 import io.trino.plugin.base.authentication.KerberosConfiguration;
 import io.trino.plugin.hive.ForHiveMetastore;
 
 import static com.google.inject.Scopes.SINGLETON;
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
 import static io.airlift.configuration.ConfigBinder.configBinder;
-import static io.trino.hdfs.authentication.AuthenticationModules.createCachingKerberosHadoopAuthentication;
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreAuthenticationConfig.ThriftMetastoreAuthenticationType.KERBEROS;
 
 public class ThriftMetastoreAuthenticationModule
@@ -61,14 +60,14 @@ public void configure(Binder binder)
         @Provides
         @Singleton
         @ForHiveMetastore
-        public HadoopAuthentication createHadoopAuthentication(MetastoreKerberosConfig config, HdfsConfigurationInitializer updater)
+        public CachingKerberosAuthentication createKerberosAuthentication(MetastoreKerberosConfig config)
         {
             String principal = config.getHiveMetastoreClientPrincipal();
             KerberosConfiguration.Builder builder = new KerberosConfiguration.Builder()
                     .withKerberosPrincipal(principal);
             config.getHiveMetastoreClientKeytab().ifPresent(builder::withKeytabLocation);
             config.getHiveMetastoreClientCredentialCacheLocation().ifPresent(builder::withCredentialCacheLocation);
-            return createCachingKerberosHadoopAuthentication(builder.build(), updater);
+            return new CachingKerberosAuthentication(new KerberosAuthentication(builder.build()));
         }
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreClient.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreClient.java
index 48510dfb6550..f571e018087f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreClient.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreClient.java
@@ -17,6 +17,7 @@
 import io.trino.hive.thrift.metastore.Database;
 import io.trino.hive.thrift.metastore.EnvironmentContext;
 import io.trino.hive.thrift.metastore.FieldSchema;
+import io.trino.hive.thrift.metastore.Function;
 import io.trino.hive.thrift.metastore.HiveObjectPrivilege;
 import io.trino.hive.thrift.metastore.HiveObjectRef;
 import io.trino.hive.thrift.metastore.LockRequest;
@@ -29,11 +30,14 @@
 import io.trino.hive.thrift.metastore.Table;
 import io.trino.hive.thrift.metastore.TxnToWriteId;
 import io.trino.plugin.hive.acid.AcidOperation;
+import io.trino.spi.connector.SchemaTableName;
 import org.apache.thrift.TException;
 
 import java.io.Closeable;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 public interface ThriftMetastoreClient
         extends Closeable
@@ -50,9 +54,15 @@ Database getDatabase(String databaseName)
     List<String> getAllTables(String databaseName)
             throws TException;
 
+    Optional<List<SchemaTableName>> getAllTables()
+            throws TException;
+
     List<String> getAllViews(String databaseName)
             throws TException;
 
+    Optional<List<SchemaTableName>> getAllViews()
+            throws TException;
+
     List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue)
             throws TException;
 
@@ -202,4 +212,19 @@ void addDynamicPartitions(String dbName, String tableName, List<String> partitio
 
     void alterTransactionalTable(Table table, long transactionId, long writeId, EnvironmentContext context)
             throws TException;
+
+    Function getFunction(String databaseName, String functionName)
+            throws TException;
+
+    Collection<String> getFunctions(String databaseName, String functionNamePattern)
+            throws TException;
+
+    void createFunction(Function function)
+            throws TException;
+
+    void alterFunction(Function function)
+            throws TException;
+
+    void dropFunction(String databaseName, String functionName)
+            throws TException;
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreConfig.java
index c930163e2f75..b8e0ef189e74 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreConfig.java
@@ -16,22 +16,23 @@
 import com.google.common.net.HostAndPort;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
+import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.configuration.validation.FileExists;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
 import io.trino.plugin.hive.util.RetryDriver;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
 public class ThriftMetastoreConfig
 {
-    private Duration metastoreTimeout = new Duration(10, TimeUnit.SECONDS);
+    private Duration connectTimeout = new Duration(10, TimeUnit.SECONDS);
+    private Duration readTimeout = new Duration(10, TimeUnit.SECONDS);
     private HostAndPort socksProxy;
     private int maxRetries = RetryDriver.DEFAULT_MAX_ATTEMPTS - 1;
     private double backoffScaleFactor = RetryDriver.DEFAULT_SCALE_FACTOR;
@@ -52,17 +53,35 @@ public class ThriftMetastoreConfig
     private String trustStorePassword;
     private boolean assumeCanonicalPartitionKeys;
     private int writeStatisticsThreads = 20;
+    private boolean batchMetadataFetchEnabled = true;
+
+    @NotNull
+    public Duration getConnectTimeout()
+    {
+        return connectTimeout;
+    }
+
+    @Config("hive.metastore.thrift.client.connect-timeout")
+    @LegacyConfig("hive.metastore-timeout")
+    @ConfigDescription("Socket connect timeout for metastore client")
+    public ThriftMetastoreConfig setConnectTimeout(Duration connectTimeout)
+    {
+        this.connectTimeout = connectTimeout;
+        return this;
+    }
 
     @NotNull
-    public Duration getMetastoreTimeout()
+    public Duration getReadTimeout()
     {
-        return metastoreTimeout;
+        return readTimeout;
     }
 
-    @Config("hive.metastore-timeout")
-    public ThriftMetastoreConfig setMetastoreTimeout(Duration metastoreTimeout)
+    @Config("hive.metastore.thrift.client.read-timeout")
+    @LegacyConfig("hive.metastore-timeout")
+    @ConfigDescription("Socket read timeout for metastore client")
+    public ThriftMetastoreConfig setReadTimeout(Duration readTimeout)
     {
-        this.metastoreTimeout = metastoreTimeout;
+        this.readTimeout = readTimeout;
         return this;
     }
 
@@ -262,6 +281,7 @@ public String getKeystorePassword()
 
     @Config("hive.metastore.thrift.client.ssl.key-password")
     @ConfigDescription("Password for the key store")
+    @ConfigSecuritySensitive
     public ThriftMetastoreConfig setKeystorePassword(String keystorePassword)
     {
         this.keystorePassword = keystorePassword;
@@ -289,6 +309,7 @@ public String getTruststorePassword()
 
     @Config("hive.metastore.thrift.client.ssl.trust-certificate-password")
     @ConfigDescription("Password for the trust store")
+    @ConfigSecuritySensitive
     public ThriftMetastoreConfig setTruststorePassword(String trustStorePassword)
     {
         this.trustStorePassword = trustStorePassword;
@@ -326,4 +347,17 @@ public ThriftMetastoreConfig setWriteStatisticsThreads(int writeStatisticsThread
         this.writeStatisticsThreads = writeStatisticsThreads;
         return this;
     }
+
+    public boolean isBatchMetadataFetchEnabled()
+    {
+        return batchMetadataFetchEnabled;
+    }
+
+    @Config("hive.metastore.thrift.batch-fetch.enabled")
+    @ConfigDescription("Enables fetching tables and views from all schemas in a single request")
+    public ThriftMetastoreConfig setBatchMetadataFetchEnabled(boolean batchMetadataFetchEnabled)
+    {
+        this.batchMetadataFetchEnabled = batchMetadataFetchEnabled;
+        return this;
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreModule.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreModule.java
index 4e638c35a7d1..fcf10a00303d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreModule.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreModule.java
@@ -25,8 +25,7 @@
 import io.trino.plugin.hive.ForHiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
 import io.trino.plugin.hive.metastore.RawHiveMetastoreFactory;
-
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import java.util.concurrent.ExecutorService;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreParameterParserUtils.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreParameterParserUtils.java
index f6c35e8b9d66..eff79827f3cb 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreParameterParserUtils.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreParameterParserUtils.java
@@ -15,8 +15,7 @@
 
 import com.google.common.primitives.Doubles;
 import com.google.common.primitives.Longs;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.math.BigDecimal;
 import java.time.DateTimeException;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreStats.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreStats.java
index f0a11175b016..ba33a3950c60 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreStats.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreStats.java
@@ -66,6 +66,11 @@ public class ThriftMetastoreStats
     private final ThriftMetastoreApiStats alterPartitions = new ThriftMetastoreApiStats();
     private final ThriftMetastoreApiStats addDynamicPartitions = new ThriftMetastoreApiStats();
     private final ThriftMetastoreApiStats alterTransactionalTable = new ThriftMetastoreApiStats();
+    private final ThriftMetastoreApiStats getFunction = new ThriftMetastoreApiStats();
+    private final ThriftMetastoreApiStats getFunctions = new ThriftMetastoreApiStats();
+    private final ThriftMetastoreApiStats createFunction = new ThriftMetastoreApiStats();
+    private final ThriftMetastoreApiStats alterFunction = new ThriftMetastoreApiStats();
+    private final ThriftMetastoreApiStats dropFunction = new ThriftMetastoreApiStats();
 
     @Managed
     @Nested
@@ -402,4 +407,39 @@ public ThriftMetastoreApiStats getAlterTransactionalTable()
     {
         return alterTransactionalTable;
     }
+
+    @Managed
+    @Nested
+    public ThriftMetastoreApiStats getGetFunction()
+    {
+        return getFunction;
+    }
+
+    @Managed
+    @Nested
+    public ThriftMetastoreApiStats getGetFunctions()
+    {
+        return getFunctions;
+    }
+
+    @Managed
+    @Nested
+    public ThriftMetastoreApiStats getCreateFunction()
+    {
+        return createFunction;
+    }
+
+    @Managed
+    @Nested
+    public ThriftMetastoreApiStats getAlterFunction()
+    {
+        return alterFunction;
+    }
+
+    @Managed
+    @Nested
+    public ThriftMetastoreApiStats getDropFunction()
+    {
+        return dropFunction;
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreUtil.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreUtil.java
index 07d2b270ba38..3dcffa63ac71 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreUtil.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreUtil.java
@@ -14,10 +14,17 @@
 package io.trino.plugin.hive.metastore.thrift;
 
 import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
+import com.google.common.io.ByteArrayDataOutput;
+import com.google.common.io.ByteStreams;
 import com.google.common.primitives.Shorts;
+import io.airlift.compress.Compressor;
+import io.airlift.compress.zstd.ZstdCompressor;
+import io.airlift.compress.zstd.ZstdDecompressor;
+import io.airlift.json.JsonCodec;
 import io.trino.hive.thrift.metastore.BinaryColumnStatsData;
 import io.trino.hive.thrift.metastore.BooleanColumnStatsData;
 import io.trino.hive.thrift.metastore.ColumnStatisticsObj;
@@ -27,10 +34,13 @@
 import io.trino.hive.thrift.metastore.DecimalColumnStatsData;
 import io.trino.hive.thrift.metastore.DoubleColumnStatsData;
 import io.trino.hive.thrift.metastore.FieldSchema;
+import io.trino.hive.thrift.metastore.FunctionType;
 import io.trino.hive.thrift.metastore.LongColumnStatsData;
 import io.trino.hive.thrift.metastore.Order;
 import io.trino.hive.thrift.metastore.PrincipalPrivilegeSet;
 import io.trino.hive.thrift.metastore.PrivilegeGrantInfo;
+import io.trino.hive.thrift.metastore.ResourceType;
+import io.trino.hive.thrift.metastore.ResourceUri;
 import io.trino.hive.thrift.metastore.RolePrincipalGrant;
 import io.trino.hive.thrift.metastore.SerDeInfo;
 import io.trino.hive.thrift.metastore.StorageDescriptor;
@@ -53,6 +63,7 @@
 import io.trino.plugin.hive.type.PrimitiveTypeInfo;
 import io.trino.plugin.hive.type.TypeInfo;
 import io.trino.spi.TrinoException;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.security.PrincipalType;
 import io.trino.spi.security.RoleGrant;
@@ -64,10 +75,10 @@
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.TimestampWithTimeZoneType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -93,6 +104,8 @@
 import static com.google.common.base.Strings.nullToEmpty;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.hash.Hashing.sha256;
+import static com.google.common.io.BaseEncoding.base64Url;
 import static io.trino.hive.thrift.metastore.ColumnStatisticsData.binaryStats;
 import static io.trino.hive.thrift.metastore.ColumnStatisticsData.booleanStats;
 import static io.trino.hive.thrift.metastore.ColumnStatisticsData.dateStats;
@@ -139,19 +152,21 @@
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static java.lang.Math.round;
+import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 
 public final class ThriftMetastoreUtil
 {
+    private static final JsonCodec<LanguageFunction> LANGUAGE_FUNCTION_CODEC = JsonCodec.jsonCodec(LanguageFunction.class);
     public static final String NUM_ROWS = "numRows";
     private static final String PUBLIC_ROLE_NAME = "public";
     private static final String ADMIN_ROLE_NAME = "admin";
     private static final String NUM_FILES = "numFiles";
     private static final String RAW_DATA_SIZE = "rawDataSize";
     private static final String TOTAL_SIZE = "totalSize";
-    private static final Set<String> STATS_PROPERTIES = ImmutableSet.of(NUM_FILES, NUM_ROWS, RAW_DATA_SIZE, TOTAL_SIZE);
+    public static final Set<String> STATS_PROPERTIES = ImmutableSet.of(NUM_FILES, NUM_ROWS, RAW_DATA_SIZE, TOTAL_SIZE);
 
     private ThriftMetastoreUtil() {}
 
@@ -665,6 +680,7 @@ public static PrincipalType fromMetastoreApiPrincipalType(io.trino.hive.thrift.m
 
     public static FieldSchema toMetastoreApiFieldSchema(Column column)
     {
+        checkArgument(column.getProperties().isEmpty(), "Persisting column properties is not supported: %s", column);
         return new FieldSchema(column.getName(), column.getType().getHiveTypeName().toString(), column.getComment().orElse(null));
     }
 
@@ -943,7 +959,7 @@ public static Set<HiveColumnStatisticType> getSupportedColumnStatistics(Type typ
         if (isNumericType(type) || type.equals(DATE)) {
             return ImmutableSet.of(MIN_VALUE, MAX_VALUE, NUMBER_OF_DISTINCT_VALUES, NUMBER_OF_NON_NULL_VALUES);
         }
-        if (type instanceof TimestampType) {
+        if (type instanceof TimestampType || type instanceof TimestampWithTimeZoneType) {
             // TODO (https://github.com/trinodb/trino/issues/5859) Add support for timestamp MIN_VALUE, MAX_VALUE
             return ImmutableSet.of(NUMBER_OF_DISTINCT_VALUES, NUMBER_OF_NON_NULL_VALUES);
         }
@@ -967,4 +983,71 @@ private static boolean isNumericType(Type type)
                 type.equals(DOUBLE) || type.equals(REAL) ||
                 type instanceof DecimalType;
     }
+
+    public static LanguageFunction fromMetastoreApiFunction(io.trino.hive.thrift.metastore.Function function)
+    {
+        LanguageFunction result = decodeFunction(function.getFunctionName(), function.getResourceUris());
+
+        return new LanguageFunction(
+                result.signatureToken(),
+                result.sql(),
+                result.path(),
+                Optional.ofNullable(function.getOwnerName()));
+    }
+
+    public static io.trino.hive.thrift.metastore.Function toMetastoreApiFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        return new io.trino.hive.thrift.metastore.Function()
+                .setDbName(databaseName)
+                .setFunctionName(metastoreFunctionName(functionName, function.signatureToken()))
+                .setClassName("TrinoFunction")
+                .setFunctionType(FunctionType.JAVA)
+                .setOwnerType(io.trino.hive.thrift.metastore.PrincipalType.USER)
+                .setOwnerName(function.owner().orElse(null))
+                .setResourceUris(toResourceUris(LANGUAGE_FUNCTION_CODEC.toJsonBytes(function)));
+    }
+
+    public static String metastoreFunctionName(String functionName, String signatureToken)
+    {
+        return "trino__%s__%s".formatted(functionName, sha256().hashUnencodedChars(signatureToken));
+    }
+
+    public static List<ResourceUri> toResourceUris(byte[] input)
+    {
+        Compressor compressor = new ZstdCompressor();
+        byte[] compressed = new byte[compressor.maxCompressedLength(input.length)];
+        int outputSize = compressor.compress(input, 0, input.length, compressed, 0, compressed.length);
+
+        ImmutableList.Builder<ResourceUri> resourceUris = ImmutableList.builder();
+        for (int offset = 0; offset < outputSize; offset += 750) {
+            int length = Math.min(750, outputSize - offset);
+            String encoded = base64Url().encode(compressed, offset, length);
+            resourceUris.add(new ResourceUri(ResourceType.FILE, encoded));
+        }
+        return resourceUris.build();
+    }
+
+    public static byte[] fromResourceUris(List<ResourceUri> resourceUris)
+    {
+        ByteArrayDataOutput bytes = ByteStreams.newDataOutput();
+        for (ResourceUri resourceUri : resourceUris) {
+            bytes.write(base64Url().decode(resourceUri.getUri()));
+        }
+        byte[] compressed = bytes.toByteArray();
+
+        long size = ZstdDecompressor.getDecompressedSize(compressed, 0, compressed.length);
+        byte[] output = new byte[toIntExact(size)];
+        new ZstdDecompressor().decompress(compressed, 0, compressed.length, output, 0, output.length);
+        return output;
+    }
+
+    public static LanguageFunction decodeFunction(String name, List<ResourceUri> uris)
+    {
+        try {
+            return LANGUAGE_FUNCTION_CODEC.fromJson(fromResourceUris(uris));
+        }
+        catch (RuntimeException e) {
+            throw new TrinoException(HIVE_INVALID_METADATA, "Failed to decode function: " + name, e);
+        }
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TokenFetchingMetastoreClientFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TokenFetchingMetastoreClientFactory.java
index 8edad9cd779b..75628e34cd8a 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TokenFetchingMetastoreClientFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TokenFetchingMetastoreClientFactory.java
@@ -16,20 +16,19 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.util.concurrent.UncheckedExecutionException;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import com.google.inject.Inject;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.plugin.base.security.UserNameProvider;
 import io.trino.plugin.hive.ForHiveMetastore;
 import io.trino.spi.TrinoException;
 import io.trino.spi.security.ConnectorIdentity;
 import org.apache.thrift.TException;
 
-import javax.inject.Inject;
-
 import java.time.Duration;
 import java.util.Optional;
 
 import static com.google.common.base.Throwables.throwIfInstanceOf;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_METASTORE_ERROR;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TranslateHiveViews.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TranslateHiveViews.java
index 74fe473854a7..5bf68bbd2329 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TranslateHiveViews.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/TranslateHiveViews.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive.metastore.thrift;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface TranslateHiveViews
 {
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/Transport.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/Transport.java
index f2f62cf47426..aa884c62712c 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/Transport.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/Transport.java
@@ -36,14 +36,15 @@ public static TTransport create(
             HostAndPort address,
             Optional<SSLContext> sslContext,
             Optional<HostAndPort> socksProxy,
-            int timeoutMillis,
+            int connectTimeoutMillis,
+            int readTimeoutMillis,
             HiveMetastoreAuthentication authentication,
             Optional<String> delegationToken)
             throws TTransportException
     {
         requireNonNull(address, "address is null");
         try {
-            TTransport rawTransport = createRaw(address, sslContext, socksProxy, timeoutMillis);
+            TTransport rawTransport = createRaw(address, sslContext, socksProxy, connectTimeoutMillis, readTimeoutMillis);
             TTransport authenticatedTransport = authentication.authenticate(rawTransport, address.getHost(), delegationToken);
             if (!authenticatedTransport.isOpen()) {
                 authenticatedTransport.open();
@@ -57,7 +58,12 @@ public static TTransport create(
 
     private Transport() {}
 
-    private static TTransport createRaw(HostAndPort address, Optional<SSLContext> sslContext, Optional<HostAndPort> socksProxy, int timeoutMillis)
+    private static TTransport createRaw(
+            HostAndPort address,
+            Optional<SSLContext> sslContext,
+            Optional<HostAndPort> socksProxy,
+            int connectTimeoutMillis,
+            int readTimeoutMillis)
             throws TTransportException
     {
         Proxy proxy = socksProxy
@@ -66,8 +72,8 @@ private static TTransport createRaw(HostAndPort address, Optional<SSLContext> ss
 
         Socket socket = new Socket(proxy);
         try {
-            socket.connect(new InetSocketAddress(address.getHost(), address.getPort()), timeoutMillis);
-            socket.setSoTimeout(timeoutMillis);
+            socket.connect(new InetSocketAddress(address.getHost(), address.getPort()), connectTimeoutMillis);
+            socket.setSoTimeout(readTimeoutMillis);
 
             if (sslContext.isPresent()) {
                 // SSL will connect to the SOCKS address when present
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/UgiBasedMetastoreClientFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/UgiBasedMetastoreClientFactory.java
index e601cf813c56..f69bd4575a94 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/UgiBasedMetastoreClientFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/UgiBasedMetastoreClientFactory.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.hive.metastore.thrift;
 
+import com.google.inject.Inject;
 import io.trino.plugin.base.security.UserNameProvider;
 import io.trino.plugin.hive.ForHiveMetastore;
 import io.trino.spi.security.ConnectorIdentity;
 import org.apache.thrift.TException;
 
-import javax.inject.Inject;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Optional;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/util/Memoizers.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/util/Memoizers.java
index 6b30d8965c04..2c911ffe0ea1 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/util/Memoizers.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/util/Memoizers.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive.metastore.util;
 
 import java.util.Objects;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
@@ -33,6 +34,13 @@ public static <I, O> Function<I, O> memoizeLast(Function<I, O> transform)
         return new Transforming<>(transform);
     }
 
+    public static <T, U, R> BiFunction<T, U, R> memoizeLast(BiFunction<T, U, R> transform)
+    {
+        requireNonNull(transform, "transform is null");
+        Function<Pair<T, U>, R> memoized = memoizeLast(pair -> transform.apply(pair.first, pair.second));
+        return (a, b) -> memoized.apply(new Pair<>(a, b));
+    }
+
     private static final class Simple<T>
             implements UnaryOperator<T>
     {
@@ -72,4 +80,6 @@ public O apply(I input)
             return lastOutput;
         }
     }
+
+    private record Pair<T, U>(T first, U second) {}
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcDeleteDeltaPageSource.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcDeleteDeltaPageSource.java
index 4d50ce58118c..d44084457184 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcDeleteDeltaPageSource.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcDeleteDeltaPageSource.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive.orc;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.orc.NameBasedFieldMapper;
@@ -29,7 +30,6 @@
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorPageSource;
-import org.apache.hadoop.fs.Path;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -74,10 +74,10 @@ public static Optional<ConnectorPageSource> createOrcDeleteDeltaPageSource(
             FileFormatDataSourceStats stats)
     {
         OrcDataSource orcDataSource;
-        String path = inputFile.location();
+        Location path = inputFile.location();
         try {
             orcDataSource = new HdfsOrcDataSource(
-                    new OrcDataSourceId(inputFile.location()),
+                    new OrcDataSourceId(path.toString()),
                     inputFile.length(),
                     options,
                     inputFile,
@@ -112,7 +112,7 @@ public static Optional<ConnectorPageSource> createOrcDeleteDeltaPageSource(
     }
 
     private OrcDeleteDeltaPageSource(
-            String path,
+            Location path,
             long fileSize,
             OrcReader reader,
             OrcDataSource orcDataSource,
@@ -122,7 +122,7 @@ private OrcDeleteDeltaPageSource(
         this.stats = requireNonNull(stats, "stats is null");
         this.orcDataSource = requireNonNull(orcDataSource, "orcDataSource is null");
 
-        verifyAcidSchema(reader, new Path(path));
+        verifyAcidSchema(reader, path);
         Map<String, OrcColumn> acidColumns = uniqueIndex(
                 reader.getRootColumn().getNestedColumns(),
                 orcColumn -> orcColumn.getColumnName().toLowerCase(ENGLISH));
@@ -211,7 +211,7 @@ public long getMemoryUsage()
         return memoryContext.getBytes();
     }
 
-    private static String openError(Throwable t, String path)
+    private static String openError(Throwable t, Location path)
     {
         return format("Error opening Hive delete delta file %s: %s", path, t.getMessage());
     }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcDeletedRows.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcDeletedRows.java
index c0a6bebcd016..a7204bab872d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcDeletedRows.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcDeletedRows.java
@@ -14,6 +14,8 @@
 package io.trino.plugin.hive.orc;
 
 import com.google.common.collect.ImmutableSet;
+import io.trino.annotation.NotThreadSafe;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
@@ -29,10 +31,7 @@
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.EmptyPageSource;
 import io.trino.spi.security.ConnectorIdentity;
-import org.apache.hadoop.fs.Path;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.NotThreadSafe;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -53,7 +52,6 @@
 import static io.trino.plugin.hive.util.AcidTables.bucketFileName;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
-import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
 @NotThreadSafe
@@ -222,7 +220,7 @@ private RowId getRowId(int position)
             }
             else {
                 originalTransaction = BIGINT.getLong(sourcePage.getBlock(ORIGINAL_TRANSACTION_INDEX), position);
-                int encodedBucketValue = toIntExact(INTEGER.getLong(sourcePage.getBlock(BUCKET_ID_INDEX), position));
+                int encodedBucketValue = INTEGER.getInt(sourcePage.getBlock(BUCKET_ID_INDEX), position);
                 AcidBucketCodec bucketCodec = AcidBucketCodec.forBucket(encodedBucketValue);
                 bucket = bucketCodec.decodeWriterId(encodedBucketValue);
                 statementId = bucketCodec.decodeStatementId(encodedBucketValue);
@@ -296,7 +294,7 @@ private class Loader
         @Nullable
         private ConnectorPageSource currentPageSource;
         @Nullable
-        private Path currentPath;
+        private Location currentPath;
         @Nullable
         private Page currentPage;
         private int currentPagePosition;
@@ -314,7 +312,7 @@ public Optional<Set<RowId>> loadOrYield()
                     if (currentPageSource == null) {
                         String deleteDeltaDirectory = deleteDeltaDirectories.next();
                         currentPath = createPath(acidInfo, deleteDeltaDirectory, sourceFileName);
-                        TrinoInputFile inputFile = fileSystem.newInputFile(currentPath.toString());
+                        TrinoInputFile inputFile = fileSystem.newInputFile(currentPath);
                         if (inputFile.exists()) {
                             currentPageSource = pageSourceFactory.createPageSource(inputFile).orElseGet(EmptyPageSource::new);
                         }
@@ -333,7 +331,7 @@ public Optional<Set<RowId>> loadOrYield()
 
                             while (currentPagePosition < currentPage.getPositionCount()) {
                                 long originalTransaction = BIGINT.getLong(currentPage.getBlock(ORIGINAL_TRANSACTION_INDEX), currentPagePosition);
-                                int encodedBucketValue = toIntExact(INTEGER.getLong(currentPage.getBlock(BUCKET_ID_INDEX), currentPagePosition));
+                                int encodedBucketValue = INTEGER.getInt(currentPage.getBlock(BUCKET_ID_INDEX), currentPagePosition);
                                 AcidBucketCodec bucketCodec = AcidBucketCodec.forBucket(encodedBucketValue);
                                 int bucket = bucketCodec.decodeWriterId(encodedBucketValue);
                                 int statement = bucketCodec.decodeStatementId(encodedBucketValue);
@@ -389,21 +387,21 @@ private static long retainedMemorySize(int rowCount, @Nullable Page currentPage)
         return sizeOfObjectArray(rowCount) + ((long) rowCount * RowId.INSTANCE_SIZE) + pageSize;
     }
 
-    private static Path createPath(AcidInfo acidInfo, String deleteDeltaDirectory, String fileName)
+    private static Location createPath(AcidInfo acidInfo, String deleteDeltaDirectory, String fileName)
     {
-        Path directory = new Path(acidInfo.getPartitionLocation(), deleteDeltaDirectory);
+        Location directory = Location.of(acidInfo.getPartitionLocation()).appendPath(deleteDeltaDirectory);
 
         // When direct insert is enabled base and delta directories contain bucket_[id]_[attemptId] files
         // but delete delta directories contain bucket files without attemptId so we have to remove it from filename.
         if (hasAttemptId(fileName)) {
-            return new Path(directory, fileName.substring(0, fileName.lastIndexOf('_')));
+            return directory.appendPath(fileName.substring(0, fileName.lastIndexOf('_')));
         }
 
         if (!acidInfo.getOriginalFiles().isEmpty()) {
             // Original file format is different from delete delta, construct delete delta file path from bucket ID of original file.
             return bucketFileName(directory, acidInfo.getBucketId());
         }
-        return new Path(directory, fileName);
+        return directory.appendPath(fileName);
     }
 
     private static class RowId
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcFileWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcFileWriter.java
index 1ee89cc936a3..553ce8255882 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcFileWriter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcFileWriter.java
@@ -52,6 +52,7 @@
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verify;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_CLOSE_ERROR;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_DATA_ERROR;
@@ -150,23 +151,21 @@ public long getMemoryUsage()
     public void appendRows(Page dataPage)
     {
         Block[] blocks = new Block[fileInputColumnIndexes.length];
-        boolean[] nullBlocksArray = new boolean[fileInputColumnIndexes.length];
-        boolean hasNullBlocks = false;
+        boolean hasUnwrittenColumn = false;
         int positionCount = dataPage.getPositionCount();
         for (int i = 0; i < fileInputColumnIndexes.length; i++) {
             int inputColumnIndex = fileInputColumnIndexes[i];
             if (inputColumnIndex < 0) {
-                hasNullBlocks = true;
                 blocks[i] = RunLengthEncodedBlock.create(nullBlocks.get(i), positionCount);
+                hasUnwrittenColumn = true;
             }
             else {
                 blocks[i] = dataPage.getBlock(inputColumnIndex);
             }
-            nullBlocksArray[i] = inputColumnIndex < 0;
         }
         if (transaction.isInsert() && useAcidSchema) {
-            Optional<boolean[]> nullBlocks = hasNullBlocks ? Optional.of(nullBlocksArray) : Optional.empty();
-            Block rowBlock = RowBlock.fromFieldBlocks(positionCount, nullBlocks, blocks);
+            verify(!hasUnwrittenColumn, "Unwritten columns are not supported for ACID transactional insert");
+            Block rowBlock = RowBlock.fromFieldBlocks(positionCount, blocks);
             blocks = buildAcidColumns(rowBlock, transaction);
         }
         Page page = new Page(dataPage.getPositionCount(), blocks);
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcFileWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcFileWriterFactory.java
index b9275dfe79d1..8ad0a0bd51c3 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcFileWriterFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcFileWriterFactory.java
@@ -14,10 +14,11 @@
 package io.trino.plugin.hive.orc;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
-import io.trino.hive.orc.OrcConf;
 import io.trino.orc.OrcDataSink;
 import io.trino.orc.OrcDataSource;
 import io.trino.orc.OrcDataSourceId;
@@ -25,9 +26,9 @@
 import io.trino.orc.OrcWriterOptions;
 import io.trino.orc.OrcWriterStats;
 import io.trino.orc.OutputStreamOrcDataSink;
-import io.trino.orc.metadata.CompressionKind;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.FileWriter;
+import io.trino.plugin.hive.HiveCompressionCodec;
 import io.trino.plugin.hive.HiveFileWriterFactory;
 import io.trino.plugin.hive.NodeVersion;
 import io.trino.plugin.hive.WriterKind;
@@ -37,13 +38,9 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobConf;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 
-import javax.inject.Inject;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.List;
@@ -53,7 +50,6 @@
 import java.util.function.Supplier;
 
 import static io.trino.orc.metadata.OrcType.createRootOrcType;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_UNSUPPORTED_FORMAT;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_OPEN_ERROR;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITE_VALIDATION_FAILED;
 import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME;
@@ -73,7 +69,6 @@
 import static io.trino.plugin.hive.util.HiveUtil.getColumnNames;
 import static io.trino.plugin.hive.util.HiveUtil.getColumnTypes;
 import static io.trino.plugin.hive.util.HiveUtil.getOrcWriterOptions;
-import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
 
@@ -126,11 +121,11 @@ public OrcWriterStats getStats()
 
     @Override
     public Optional<FileWriter> createFileWriter(
-            Path path,
+            Location location,
             List<String> inputColumnNames,
             StorageFormat storageFormat,
+            HiveCompressionCodec compressionCodec,
             Properties schema,
-            JobConf configuration,
             ConnectorSession session,
             OptionalInt bucketNumber,
             AcidTransaction transaction,
@@ -141,8 +136,6 @@ public Optional<FileWriter> createFileWriter(
             return Optional.empty();
         }
 
-        CompressionKind compression = getCompression(schema, configuration);
-
         // existing tables and partitions may have columns in a different order than the writer is providing, so build
         // an index to rearrange columns in the proper order
         List<String> fileColumnNames = getColumnNames(schema);
@@ -155,16 +148,15 @@ public Optional<FileWriter> createFileWriter(
                 .toArray();
         try {
             TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-            String stringPath = path.toString();
-            OrcDataSink orcDataSink = createOrcDataSink(fileSystem, stringPath);
+            OrcDataSink orcDataSink = createOrcDataSink(fileSystem, location);
 
             Optional<Supplier<OrcDataSource>> validationInputFactory = Optional.empty();
             if (isOrcOptimizedWriterValidate(session)) {
                 validationInputFactory = Optional.of(() -> {
                     try {
-                        TrinoInputFile inputFile = fileSystem.newInputFile(stringPath);
+                        TrinoInputFile inputFile = fileSystem.newInputFile(location);
                         return new HdfsOrcDataSource(
-                                new OrcDataSourceId(stringPath),
+                                new OrcDataSourceId(location.toString()),
                                 inputFile.length(),
                                 new OrcReaderOptions(),
                                 inputFile,
@@ -176,7 +168,7 @@ public Optional<FileWriter> createFileWriter(
                 });
             }
 
-            Closeable rollbackAction = () -> fileSystem.deleteFile(stringPath);
+            Closeable rollbackAction = () -> fileSystem.deleteFile(location);
 
             if (transaction.isInsert() && useAcidSchema) {
                 // Only add the ACID columns if the request is for insert-type operations - - for delete operations,
@@ -198,7 +190,7 @@ public Optional<FileWriter> createFileWriter(
                     fileColumnNames,
                     fileColumnTypes,
                     createRootOrcType(fileColumnNames, fileColumnTypes),
-                    compression,
+                    compressionCodec.getOrcCompressionKind(),
                     getOrcWriterOptions(schema, orcWriterOptions)
                             .withStripeMinSize(getOrcOptimizedWriterMinStripeSize(session))
                             .withStripeMaxSize(getOrcOptimizedWriterMaxStripeSize(session))
@@ -219,26 +211,9 @@ public Optional<FileWriter> createFileWriter(
         }
     }
 
-    public static OrcDataSink createOrcDataSink(TrinoFileSystem fileSystem, String path)
+    public static OrcDataSink createOrcDataSink(TrinoFileSystem fileSystem, Location location)
             throws IOException
     {
-        return OutputStreamOrcDataSink.create(fileSystem.newOutputFile(path));
-    }
-
-    private static CompressionKind getCompression(Properties schema, JobConf configuration)
-    {
-        String compressionName = OrcConf.COMPRESS.getString(schema, configuration);
-        if (compressionName == null) {
-            return CompressionKind.ZLIB;
-        }
-
-        CompressionKind compression;
-        try {
-            compression = CompressionKind.valueOf(compressionName.toUpperCase(ENGLISH));
-        }
-        catch (IllegalArgumentException e) {
-            throw new TrinoException(HIVE_UNSUPPORTED_FORMAT, "Unknown ORC compression type " + compressionName);
-        }
-        return compression;
+        return OutputStreamOrcDataSink.create(fileSystem.newOutputFile(location));
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcPageSource.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcPageSource.java
index af3b406a7aa0..9617f8edd126 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcPageSource.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcPageSource.java
@@ -27,6 +27,7 @@
 import io.trino.orc.metadata.OrcType;
 import io.trino.plugin.base.metrics.LongCount;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
+import io.trino.plugin.hive.coercions.TypeCoercer;
 import io.trino.plugin.hive.orc.OrcDeletedRows.MaskDeletedRowsFunction;
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
@@ -272,6 +273,11 @@ static ColumnAdaptation sourceColumn(int index)
             return new SourceColumn(index);
         }
 
+        static ColumnAdaptation coercedColumn(int index, TypeCoercer<?, ?> typeCoercer)
+        {
+            return new CoercedColumn(sourceColumn(index), typeCoercer);
+        }
+
         static ColumnAdaptation constantColumn(Block singleValueBlock)
         {
             return new ConstantAdaptation(singleValueBlock);
@@ -336,8 +342,7 @@ public SourceColumn(int index)
         @Override
         public Block block(Page sourcePage, MaskDeletedRowsFunction maskDeletedRowsFunction, long filePosition, OptionalLong startRowId)
         {
-            Block block = sourcePage.getBlock(index);
-            return new LazyBlock(maskDeletedRowsFunction.getPositionCount(), new MaskingBlockLoader(maskDeletedRowsFunction, block));
+            return new LazyBlock(maskDeletedRowsFunction.getPositionCount(), new MaskingBlockLoader(maskDeletedRowsFunction, sourcePage.getBlock(index)));
         }
 
         @Override
@@ -375,6 +380,36 @@ public Block load()
         }
     }
 
+    private static class CoercedColumn
+            implements ColumnAdaptation
+    {
+        private final ColumnAdaptation delegate;
+        private final TypeCoercer<?, ?> typeCoercer;
+
+        public CoercedColumn(ColumnAdaptation delegate, TypeCoercer<?, ?> typeCoercer)
+        {
+            this.delegate = requireNonNull(delegate, "delegate is null");
+            this.typeCoercer = requireNonNull(typeCoercer, "typeCoercer is null");
+        }
+
+        @Override
+        public Block block(Page sourcePage, MaskDeletedRowsFunction maskDeletedRowsFunction, long filePosition, OptionalLong startRowId)
+        {
+            Block block = delegate.block(sourcePage, maskDeletedRowsFunction, filePosition, startRowId);
+            return new LazyBlock(block.getPositionCount(), () -> typeCoercer.apply(block.getLoadedBlock()));
+        }
+
+        @Override
+        public String toString()
+        {
+            return toStringHelper(this)
+                    .add("delegate", delegate)
+                    .add("fromType", typeCoercer.getFromType())
+                    .add("toType", typeCoercer.getToType())
+                    .toString();
+        }
+    }
+
     /*
      * The rowId contains the ACID columns - - originalTransaction, rowId, bucket
      */
@@ -387,7 +422,6 @@ public Block block(Page page, MaskDeletedRowsFunction maskDeletedRowsFunction, l
             requireNonNull(page, "page is null");
             return maskDeletedRowsFunction.apply(fromFieldBlocks(
                     page.getPositionCount(),
-                    Optional.empty(),
                     new Block[] {
                             page.getBlock(ORIGINAL_TRANSACTION_CHANNEL),
                             page.getBlock(BUCKET_CHANNEL),
@@ -419,7 +453,6 @@ public Block block(Page sourcePage, MaskDeletedRowsFunction maskDeletedRowsFunct
             int positionCount = sourcePage.getPositionCount();
             return maskDeletedRowsFunction.apply(fromFieldBlocks(
                     positionCount,
-                    Optional.empty(),
                     new Block[] {
                             RunLengthEncodedBlock.create(ORIGINAL_FILE_TRANSACTION_ID_BLOCK, positionCount),
                             RunLengthEncodedBlock.create(bucketBlock, positionCount),
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcPageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcPageSourceFactory.java
index 0f02da60b347..4127b01f50dd 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcPageSourceFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcPageSourceFactory.java
@@ -16,7 +16,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
@@ -42,6 +44,7 @@
 import io.trino.plugin.hive.ReaderPageSource;
 import io.trino.plugin.hive.acid.AcidSchema;
 import io.trino.plugin.hive.acid.AcidTransaction;
+import io.trino.plugin.hive.coercions.TypeCoercer;
 import io.trino.plugin.hive.orc.OrcPageSource.ColumnAdaptation;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorPageSource;
@@ -49,14 +52,9 @@
 import io.trino.spi.connector.EmptyPageSource;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.type.Type;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
 import org.joda.time.DateTimeZone;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -96,9 +94,11 @@
 import static io.trino.plugin.hive.HiveSessionProperties.isUseOrcColumnNames;
 import static io.trino.plugin.hive.orc.OrcPageSource.ColumnAdaptation.mergedRowColumns;
 import static io.trino.plugin.hive.orc.OrcPageSource.handleException;
+import static io.trino.plugin.hive.orc.OrcTypeTranslator.createCoercer;
 import static io.trino.plugin.hive.util.AcidTables.isFullAcidTable;
 import static io.trino.plugin.hive.util.HiveClassNames.ORC_SERDE_CLASS;
 import static io.trino.plugin.hive.util.HiveUtil.getDeserializerClassName;
+import static io.trino.plugin.hive.util.HiveUtil.splitError;
 import static io.trino.plugin.hive.util.SerdeConstants.SERIALIZATION_LIB;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -172,9 +172,8 @@ public static Properties stripUnnecessaryProperties(Properties schema)
 
     @Override
     public Optional<ReaderPageSource> createPageSource(
-            Configuration configuration,
             ConnectorSession session,
-            Path path,
+            Location path,
             long start,
             long length,
             long estimatedFileSize,
@@ -200,7 +199,7 @@ public Optional<ReaderPageSource> createPageSource(
         }
 
         ConnectorPageSource orcPageSource = createOrcPageSource(
-                session.getIdentity(),
+                session,
                 path,
                 start,
                 length,
@@ -230,8 +229,8 @@ public Optional<ReaderPageSource> createPageSource(
     }
 
     private ConnectorPageSource createOrcPageSource(
-            ConnectorIdentity identity,
-            Path path,
+            ConnectorSession session,
+            Location path,
             long start,
             long length,
             long estimatedFileSize,
@@ -257,8 +256,8 @@ private ConnectorPageSource createOrcPageSource(
 
         boolean originalFilesPresent = acidInfo.isPresent() && !acidInfo.get().getOriginalFiles().isEmpty();
         try {
-            TrinoFileSystem fileSystem = fileSystemFactory.create(identity);
-            TrinoInputFile inputFile = fileSystem.newInputFile(path.toString());
+            TrinoFileSystem fileSystem = fileSystemFactory.create(session.getIdentity());
+            TrinoInputFile inputFile = fileSystem.newInputFile(path, estimatedFileSize);
             orcDataSource = new HdfsOrcDataSource(
                     new OrcDataSourceId(path.toString()),
                     estimatedFileSize,
@@ -364,9 +363,16 @@ else if (column.getBaseHiveColumnIndex() < fileColumns.size()) {
                 Type readType = column.getType();
                 if (orcColumn != null) {
                     int sourceIndex = fileReadColumns.size();
-                    columnAdaptations.add(ColumnAdaptation.sourceColumn(sourceIndex));
+                    Optional<TypeCoercer<?, ?>> coercer = createCoercer(orcColumn.getColumnType(), readType);
+                    if (coercer.isPresent()) {
+                        fileReadTypes.add(coercer.get().getFromType());
+                        columnAdaptations.add(ColumnAdaptation.coercedColumn(sourceIndex, coercer.get()));
+                    }
+                    else {
+                        columnAdaptations.add(ColumnAdaptation.sourceColumn(sourceIndex));
+                        fileReadTypes.add(readType);
+                    }
                     fileReadColumns.add(orcColumn);
-                    fileReadTypes.add(readType);
                     fileReadLayouts.add(projectedLayout);
 
                     // Add predicates on top-level and nested columns
@@ -397,9 +403,9 @@ else if (column.getBaseHiveColumnIndex() < fileColumns.size()) {
 
             Optional<OrcDeletedRows> deletedRows = acidInfo.map(info ->
                     new OrcDeletedRows(
-                            path.getName(),
+                            path.fileName(),
                             new OrcDeleteDeltaPageSourceFactory(options, stats),
-                            identity,
+                            session.getIdentity(),
                             fileSystemFactory,
                             info,
                             bucketNumber,
@@ -412,7 +418,7 @@ else if (column.getBaseHiveColumnIndex() < fileColumns.size()) {
                             acidInfo.get().getOriginalFiles(),
                             path,
                             fileSystemFactory,
-                            identity,
+                            session.getIdentity(),
                             options,
                             stats));
 
@@ -453,7 +459,7 @@ else if (column.getBaseHiveColumnIndex() < fileColumns.size()) {
         }
     }
 
-    private static void validateOrcAcidVersion(Path path, OrcReader reader)
+    private static void validateOrcAcidVersion(Location path, OrcReader reader)
     {
         // Trino cannot read ORC ACID tables with version < 2 (written by Hive older than 3.0)
         // See https://github.com/trinodb/trino/issues/2790#issuecomment-591901728 for more context
@@ -532,12 +538,7 @@ private static boolean hasOriginalFiles(AcidInfo acidInfo)
         return !acidInfo.getOriginalFiles().isEmpty();
     }
 
-    private static String splitError(Throwable t, Path path, long start, long length)
-    {
-        return format("Error opening Hive split %s (offset=%s, length=%s): %s", path, start, length, t.getMessage());
-    }
-
-    private static void verifyFileHasColumnNames(List<OrcColumn> columns, Path path)
+    private static void verifyFileHasColumnNames(List<OrcColumn> columns, Location path)
     {
         if (!columns.isEmpty() && columns.stream().map(OrcColumn::getColumnName).allMatch(physicalColumnName -> DEFAULT_HIVE_COLUMN_NAME_PATTERN.matcher(physicalColumnName).matches())) {
             throw new TrinoException(
@@ -546,7 +547,7 @@ private static void verifyFileHasColumnNames(List<OrcColumn> columns, Path path)
         }
     }
 
-    static void verifyAcidSchema(OrcReader orcReader, Path path)
+    static void verifyAcidSchema(OrcReader orcReader, Location path)
     {
         OrcColumn rootColumn = orcReader.getRootColumn();
         List<OrcColumn> nestedColumns = rootColumn.getNestedColumns();
@@ -569,7 +570,7 @@ static void verifyAcidSchema(OrcReader orcReader, Path path)
         verifyAcidColumn(orcReader, 5, AcidSchema.ACID_COLUMN_ROW_STRUCT, STRUCT, path);
     }
 
-    private static void verifyAcidColumn(OrcReader orcReader, int columnIndex, String columnName, OrcTypeKind columnType, Path path)
+    private static void verifyAcidColumn(OrcReader orcReader, int columnIndex, String columnName, OrcTypeKind columnType, Location path)
     {
         OrcColumn column = orcReader.getRootColumn().getNestedColumns().get(columnIndex);
         if (!column.getColumnName().toLowerCase(ENGLISH).equals(columnName.toLowerCase(ENGLISH))) {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcReaderConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcReaderConfig.java
index 65c637ff9987..695c0592c21d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcReaderConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcReaderConfig.java
@@ -17,8 +17,7 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.DataSize;
 import io.trino.orc.OrcReaderOptions;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class OrcReaderConfig
 {
@@ -152,4 +151,17 @@ public OrcReaderConfig setNestedLazy(boolean nestedLazy)
         options = options.withNestedLazy(nestedLazy);
         return this;
     }
+
+    public boolean isReadLegacyShortZoneId()
+    {
+        return options.isReadLegacyShortZoneId();
+    }
+
+    @Config("hive.orc.read-legacy-short-zone-id")
+    @ConfigDescription("Allow reads on ORC files with short zone ID in the stripe footer")
+    public OrcReaderConfig setReadLegacyShortZoneId(boolean readLegacyShortZoneId)
+    {
+        options = options.withReadLegacyShortZoneId(readLegacyShortZoneId);
+        return this;
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcTypeTranslator.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcTypeTranslator.java
new file mode 100644
index 000000000000..069913fcbba2
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcTypeTranslator.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.orc;
+
+import io.trino.orc.metadata.OrcType.OrcTypeKind;
+import io.trino.plugin.hive.coercions.DateCoercer.VarcharToDateCoercer;
+import io.trino.plugin.hive.coercions.DoubleToVarcharCoercer;
+import io.trino.plugin.hive.coercions.TimestampCoercer.LongTimestampToVarcharCoercer;
+import io.trino.plugin.hive.coercions.TimestampCoercer.VarcharToLongTimestampCoercer;
+import io.trino.plugin.hive.coercions.TimestampCoercer.VarcharToShortTimestampCoercer;
+import io.trino.plugin.hive.coercions.TypeCoercer;
+import io.trino.spi.type.DateType;
+import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.VarcharType;
+
+import java.util.Optional;
+
+import static io.trino.orc.metadata.OrcType.OrcTypeKind.DOUBLE;
+import static io.trino.orc.metadata.OrcType.OrcTypeKind.STRING;
+import static io.trino.orc.metadata.OrcType.OrcTypeKind.TIMESTAMP;
+import static io.trino.orc.metadata.OrcType.OrcTypeKind.VARCHAR;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
+import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+
+public final class OrcTypeTranslator
+{
+    private OrcTypeTranslator() {}
+
+    public static Optional<TypeCoercer<? extends Type, ? extends Type>> createCoercer(OrcTypeKind fromOrcType, Type toTrinoType)
+    {
+        if (fromOrcType == TIMESTAMP && toTrinoType instanceof VarcharType varcharType) {
+            return Optional.of(new LongTimestampToVarcharCoercer(TIMESTAMP_NANOS, varcharType));
+        }
+        if (isVarcharType(fromOrcType)) {
+            if (toTrinoType instanceof TimestampType timestampType) {
+                if (timestampType.isShort()) {
+                    return Optional.of(new VarcharToShortTimestampCoercer(createUnboundedVarcharType(), timestampType));
+                }
+                return Optional.of(new VarcharToLongTimestampCoercer(createUnboundedVarcharType(), timestampType));
+            }
+            if (toTrinoType instanceof DateType toDateType) {
+                return Optional.of(new VarcharToDateCoercer(createUnboundedVarcharType(), toDateType));
+            }
+            return Optional.empty();
+        }
+        if (fromOrcType == DOUBLE && toTrinoType instanceof VarcharType varcharType) {
+            return Optional.of(new DoubleToVarcharCoercer(varcharType, true));
+        }
+        return Optional.empty();
+    }
+
+    private static boolean isVarcharType(OrcTypeKind orcTypeKind)
+    {
+        return orcTypeKind == STRING || orcTypeKind == VARCHAR;
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcWriterConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcWriterConfig.java
index 46c2ebc41dfc..8ac8eb91670d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcWriterConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcWriterConfig.java
@@ -21,10 +21,9 @@
 import io.trino.orc.OrcWriteValidation.OrcWriteValidationMode;
 import io.trino.orc.OrcWriterOptions;
 import io.trino.orc.OrcWriterOptions.WriterIdentification;
-
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
 
 @DefunctConfig("hive.orc.optimized-writer.enabled")
 @SuppressWarnings("unused")
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OriginalFilesUtils.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OriginalFilesUtils.java
index b20eb1b1e002..8ae8660c3857 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OriginalFilesUtils.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OriginalFilesUtils.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive.orc;
 
-import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.orc.OrcDataSource;
@@ -23,7 +23,6 @@
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.spi.TrinoException;
 import io.trino.spi.security.ConnectorIdentity;
-import org.apache.hadoop.fs.Path;
 
 import java.util.Collection;
 
@@ -46,7 +45,7 @@ private OriginalFilesUtils() {}
      */
     public static long getPrecedingRowCount(
             Collection<OriginalFileInfo> originalFileInfos,
-            Path splitPath,
+            Location splitPath,
             TrinoFileSystemFactory fileSystemFactory,
             ConnectorIdentity identity,
             OrcReaderOptions options,
@@ -54,9 +53,11 @@ public static long getPrecedingRowCount(
     {
         long rowCount = 0;
         for (OriginalFileInfo originalFileInfo : originalFileInfos) {
-            Path path = new Path(splitPath.getParent() + "/" + originalFileInfo.getName());
-            if (path.compareTo(splitPath) < 0) {
-                rowCount += getRowsInFile(path.toString(), fileSystemFactory, identity, options, stats, originalFileInfo.getFileSize());
+            if (originalFileInfo.getName().compareTo(splitPath.fileName()) < 0) {
+                Location path = splitPath.sibling(originalFileInfo.getName());
+                TrinoInputFile inputFile = fileSystemFactory.create(identity)
+                        .newInputFile(path, originalFileInfo.getFileSize());
+                rowCount += getRowsInFile(inputFile, options, stats);
             }
         }
 
@@ -66,25 +67,17 @@ public static long getPrecedingRowCount(
     /**
      * Returns number of rows present in the file, based on the ORC footer.
      */
-    private static Long getRowsInFile(
-            String splitPath,
-            TrinoFileSystemFactory fileSystemFactory,
-            ConnectorIdentity identity,
-            OrcReaderOptions options,
-            FileFormatDataSourceStats stats,
-            long fileSize)
+    private static Long getRowsInFile(TrinoInputFile inputFile, OrcReaderOptions options, FileFormatDataSourceStats stats)
     {
         try {
-            TrinoFileSystem fileSystem = fileSystemFactory.create(identity);
-            TrinoInputFile inputFile = fileSystem.newInputFile(splitPath);
             try (OrcDataSource orcDataSource = new HdfsOrcDataSource(
-                    new OrcDataSourceId(splitPath),
-                    fileSize,
+                    new OrcDataSourceId(inputFile.location().toString()),
+                    inputFile.length(),
                     options,
                     inputFile,
                     stats)) {
                 OrcReader reader = createOrcReader(orcDataSource, options)
-                        .orElseThrow(() -> new TrinoException(HIVE_CANNOT_OPEN_SPLIT, "Could not read ORC footer from empty file: " + splitPath));
+                        .orElseThrow(() -> new TrinoException(HIVE_CANNOT_OPEN_SPLIT, "Could not read ORC footer from empty file: " + inputFile.location()));
                 return reader.getFooter().getNumberOfRows();
             }
         }
@@ -92,7 +85,7 @@ private static Long getRowsInFile(
             throw e;
         }
         catch (Exception e) {
-            throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, "Could not read ORC footer from file: " + splitPath, e);
+            throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, "Could not read ORC footer from file: " + inputFile.location(), e);
         }
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/MemoryParquetDataSource.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/MemoryParquetDataSource.java
new file mode 100644
index 000000000000..b5b848cb24b4
--- /dev/null
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/MemoryParquetDataSource.java
@@ -0,0 +1,151 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.parquet;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ListMultimap;
+import io.airlift.slice.Slice;
+import io.trino.filesystem.TrinoInput;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.memory.context.AggregatedMemoryContext;
+import io.trino.memory.context.LocalMemoryContext;
+import io.trino.parquet.ChunkReader;
+import io.trino.parquet.DiskRange;
+import io.trino.parquet.ParquetDataSource;
+import io.trino.parquet.ParquetDataSourceId;
+import io.trino.parquet.reader.ChunkedInputStream;
+import io.trino.plugin.hive.FileFormatDataSourceStats;
+import jakarta.annotation.Nullable;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static java.lang.Math.min;
+import static java.lang.Math.toIntExact;
+import static java.util.Objects.requireNonNull;
+
+public class MemoryParquetDataSource
+        implements ParquetDataSource
+{
+    private final ParquetDataSourceId id;
+    private final long readTimeNanos;
+    private final long readBytes;
+    private final LocalMemoryContext memoryUsage;
+    @Nullable
+    private Slice data;
+
+    public MemoryParquetDataSource(TrinoInputFile inputFile, AggregatedMemoryContext memoryContext, FileFormatDataSourceStats stats)
+            throws IOException
+    {
+        try (TrinoInput input = inputFile.newInput()) {
+            long readStart = System.nanoTime();
+            this.data = input.readTail(toIntExact(inputFile.length()));
+            this.readTimeNanos = System.nanoTime() - readStart;
+            stats.readDataBytesPerSecond(data.length(), readTimeNanos);
+        }
+        this.memoryUsage = memoryContext.newLocalMemoryContext(MemoryParquetDataSource.class.getSimpleName());
+        this.memoryUsage.setBytes(data.length());
+        this.readBytes = data.length();
+        this.id = new ParquetDataSourceId(inputFile.location().toString());
+    }
+
+    @Override
+    public ParquetDataSourceId getId()
+    {
+        return id;
+    }
+
+    @Override
+    public long getReadBytes()
+    {
+        return readBytes;
+    }
+
+    @Override
+    public long getReadTimeNanos()
+    {
+        return readTimeNanos;
+    }
+
+    @Override
+    public long getEstimatedSize()
+    {
+        return readBytes;
+    }
+
+    @Override
+    public Slice readTail(int length)
+    {
+        int readSize = min(data.length(), length);
+        return readFully(data.length() - readSize, readSize);
+    }
+
+    @Override
+    public final Slice readFully(long position, int length)
+    {
+        return data.slice(toIntExact(position), length);
+    }
+
+    @Override
+    public <K> Map<K, ChunkedInputStream> planRead(ListMultimap<K, DiskRange> diskRanges, AggregatedMemoryContext memoryContext)
+    {
+        requireNonNull(diskRanges, "diskRanges is null");
+
+        if (diskRanges.isEmpty()) {
+            return ImmutableMap.of();
+        }
+
+        ImmutableMap.Builder<K, ChunkedInputStream> builder = ImmutableMap.builder();
+        for (Map.Entry<K, Collection<DiskRange>> entry : diskRanges.asMap().entrySet()) {
+            List<ChunkReader> chunkReaders = entry.getValue().stream()
+                    .map(diskRange -> new ChunkReader()
+                    {
+                        @Override
+                        public long getDiskOffset()
+                        {
+                            return diskRange.getOffset();
+                        }
+
+                        @Override
+                        public Slice read()
+                        {
+                            return data.slice(toIntExact(diskRange.getOffset()), toIntExact(diskRange.getLength()));
+                        }
+
+                        @Override
+                        public void free() {}
+                    })
+                    .collect(toImmutableList());
+            builder.put(entry.getKey(), new ChunkedInputStream(chunkReaders));
+        }
+        return builder.buildOrThrow();
+    }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        data = null;
+        memoryUsage.close();
+    }
+
+    @Override
+    public final String toString()
+    {
+        return id.toString();
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetFileWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetFileWriter.java
index bf875ac6223b..daac2b82f748 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetFileWriter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetFileWriter.java
@@ -27,6 +27,7 @@
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.Type;
 import org.apache.parquet.format.CompressionCodec;
+import org.apache.parquet.format.FileMetaData;
 import org.apache.parquet.schema.MessageType;
 import org.joda.time.DateTimeZone;
 
@@ -50,7 +51,7 @@
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITE_VALIDATION_FAILED;
 import static java.util.Objects.requireNonNull;
 
-public class ParquetFileWriter
+public final class ParquetFileWriter
         implements FileWriter
 {
     private static final int INSTANCE_SIZE = instanceSize(ParquetFileWriter.class);
@@ -75,7 +76,6 @@ public ParquetFileWriter(
             int[] fileInputColumnIndexes,
             CompressionCodec compressionCodec,
             String trinoVersion,
-            boolean useBatchColumnReadersForVerification,
             Optional<DateTimeZone> parquetTimeZone,
             Optional<Supplier<ParquetDataSource>> validationInputFactory)
             throws IOException
@@ -92,7 +92,6 @@ public ParquetFileWriter(
                 parquetWriterOptions,
                 compressionCodec,
                 trinoVersion,
-                useBatchColumnReadersForVerification,
                 parquetTimeZone,
                 validationInputFactory.isPresent()
                         ? Optional.of(new ParquetWriteValidationBuilder(fileColumnTypes, fileColumnNames))
@@ -200,4 +199,9 @@ public String toString()
                 .add("writer", parquetWriter)
                 .toString();
     }
+
+    public FileMetaData getFileMetadata()
+    {
+        return parquetWriter.getFileMetaData();
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetFileWriterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetFileWriterFactory.java
index bb26c25ed7a6..49faff70afda 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetFileWriterFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetFileWriterFactory.java
@@ -13,6 +13,8 @@
  */
 package io.trino.plugin.hive.parquet;
 
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
@@ -22,6 +24,7 @@
 import io.trino.parquet.writer.ParquetWriterOptions;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.FileWriter;
+import io.trino.plugin.hive.HiveCompressionCodec;
 import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.HiveFileWriterFactory;
 import io.trino.plugin.hive.HiveSessionProperties;
@@ -33,16 +36,10 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.parquet.format.CompressionCodec;
-import org.apache.parquet.hadoop.ParquetOutputFormat;
 import org.joda.time.DateTimeZone;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 
-import javax.inject.Inject;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.List;
@@ -56,7 +53,6 @@
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_OPEN_ERROR;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITE_VALIDATION_FAILED;
 import static io.trino.plugin.hive.HiveSessionProperties.getTimestampPrecision;
-import static io.trino.plugin.hive.HiveSessionProperties.isParquetOptimizedReaderEnabled;
 import static io.trino.plugin.hive.HiveSessionProperties.isParquetOptimizedWriterValidate;
 import static io.trino.plugin.hive.util.HiveClassNames.MAPRED_PARQUET_OUTPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveUtil.getColumnNames;
@@ -90,21 +86,17 @@ public ParquetFileWriterFactory(
 
     @Override
     public Optional<FileWriter> createFileWriter(
-            Path path,
+            Location location,
             List<String> inputColumnNames,
             StorageFormat storageFormat,
+            HiveCompressionCodec compressionCodec,
             Properties schema,
-            JobConf conf,
             ConnectorSession session,
             OptionalInt bucketNumber,
             AcidTransaction transaction,
             boolean useAcidSchema,
             WriterKind writerKind)
     {
-        if (!HiveSessionProperties.isParquetOptimizedWriterEnabled(session)) {
-            return Optional.empty();
-        }
-
         if (!MAPRED_PARQUET_OUTPUT_FORMAT_CLASS.equals(storageFormat.getOutputFormat())) {
             return Optional.empty();
         }
@@ -115,10 +107,6 @@ public Optional<FileWriter> createFileWriter(
                 .setBatchSize(HiveSessionProperties.getParquetBatchSize(session))
                 .build();
 
-        CompressionCodec compressionCodec = Optional.ofNullable(conf.get(ParquetOutputFormat.COMPRESSION))
-                .map(CompressionCodec::valueOf)
-                .orElse(CompressionCodec.GZIP);
-
         List<String> fileColumnNames = getColumnNames(schema);
         List<Type> fileColumnTypes = getColumnTypes(schema).stream()
                 .map(hiveType -> hiveType.getType(typeManager, getTimestampPrecision(session)))
@@ -128,11 +116,10 @@ public Optional<FileWriter> createFileWriter(
                 .mapToInt(inputColumnNames::indexOf)
                 .toArray();
 
-        String pathString = path.toString();
         try {
             TrinoFileSystem fileSystem = fileSystemFactory.create(session);
 
-            Closeable rollbackAction = () -> fileSystem.deleteFile(pathString);
+            Closeable rollbackAction = () -> fileSystem.deleteFile(location);
 
             ParquetSchemaConverter schemaConverter = new ParquetSchemaConverter(
                     fileColumnTypes,
@@ -144,7 +131,7 @@ public Optional<FileWriter> createFileWriter(
             if (isParquetOptimizedWriterValidate(session)) {
                 validationInputFactory = Optional.of(() -> {
                     try {
-                        TrinoInputFile inputFile = fileSystem.newInputFile(pathString);
+                        TrinoInputFile inputFile = fileSystem.newInputFile(location);
                         return new TrinoParquetDataSource(inputFile, new ParquetReaderOptions(), readStats);
                     }
                     catch (IOException e) {
@@ -154,7 +141,7 @@ public Optional<FileWriter> createFileWriter(
             }
 
             return Optional.of(new ParquetFileWriter(
-                    fileSystem.newOutputFile(pathString),
+                    fileSystem.newOutputFile(location),
                     rollbackAction,
                     fileColumnTypes,
                     fileColumnNames,
@@ -162,9 +149,8 @@ public Optional<FileWriter> createFileWriter(
                     schemaConverter.getPrimitiveTypes(),
                     parquetWriterOptions,
                     fileInputColumnIndexes,
-                    compressionCodec,
+                    compressionCodec.getParquetCompressionCodec(),
                     nodeVersion.toString(),
-                    isParquetOptimizedReaderEnabled(session),
                     Optional.of(parquetTimeZone),
                     validationInputFactory));
         }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetPageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetPageSourceFactory.java
index ac7384a9bd90..5dd96adc51d0 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetPageSourceFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetPageSourceFactory.java
@@ -16,9 +16,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
+import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.parquet.BloomFilterStore;
 import io.trino.parquet.Field;
 import io.trino.parquet.ParquetCorruptionException;
@@ -33,6 +36,7 @@
 import io.trino.plugin.hive.AcidInfo;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveColumnHandle;
+import io.trino.plugin.hive.HiveColumnProjectionInfo;
 import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.HivePageSourceFactory;
 import io.trino.plugin.hive.HiveType;
@@ -44,8 +48,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.hadoop.metadata.BlockMetaData;
 import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData;
@@ -56,10 +58,9 @@
 import org.apache.parquet.io.MessageColumnIO;
 import org.apache.parquet.schema.GroupType;
 import org.apache.parquet.schema.MessageType;
+import org.apache.parquet.schema.Type;
 import org.joda.time.DateTimeZone;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
@@ -67,12 +68,15 @@
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.OptionalLong;
 import java.util.Properties;
 import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
+import static io.trino.parquet.BloomFilterStore.getBloomFilterStore;
 import static io.trino.parquet.ParquetTypeUtils.constructField;
 import static io.trino.parquet.ParquetTypeUtils.getColumnIO;
 import static io.trino.parquet.ParquetTypeUtils.getDescriptors;
@@ -87,9 +91,8 @@
 import static io.trino.plugin.hive.HivePageSourceProvider.projectSufficientColumns;
 import static io.trino.plugin.hive.HiveSessionProperties.getParquetMaxReadBlockRowCount;
 import static io.trino.plugin.hive.HiveSessionProperties.getParquetMaxReadBlockSize;
+import static io.trino.plugin.hive.HiveSessionProperties.getParquetSmallFileThreshold;
 import static io.trino.plugin.hive.HiveSessionProperties.isParquetIgnoreStatistics;
-import static io.trino.plugin.hive.HiveSessionProperties.isParquetOptimizedNestedReaderEnabled;
-import static io.trino.plugin.hive.HiveSessionProperties.isParquetOptimizedReaderEnabled;
 import static io.trino.plugin.hive.HiveSessionProperties.isParquetUseColumnIndex;
 import static io.trino.plugin.hive.HiveSessionProperties.isUseParquetColumnNames;
 import static io.trino.plugin.hive.HiveSessionProperties.useParquetBloomFilter;
@@ -157,9 +160,8 @@ public static Properties stripUnnecessaryProperties(Properties schema)
 
     @Override
     public Optional<ReaderPageSource> createPageSource(
-            Configuration configuration,
             ConnectorSession session,
-            Path path,
+            Location path,
             long start,
             long length,
             long estimatedFileSize,
@@ -178,26 +180,26 @@ public Optional<ReaderPageSource> createPageSource(
         checkArgument(acidInfo.isEmpty(), "Acid is not supported");
 
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-        TrinoInputFile inputFile = fileSystem.newInputFile(path.toString(), estimatedFileSize);
+        TrinoInputFile inputFile = fileSystem.newInputFile(path, estimatedFileSize);
 
         return Optional.of(createPageSource(
                 inputFile,
                 start,
                 length,
                 columns,
-                effectivePredicate,
+                ImmutableList.of(effectivePredicate),
                 isUseParquetColumnNames(session),
                 timeZone,
                 stats,
                 options.withIgnoreStatistics(isParquetIgnoreStatistics(session))
                         .withMaxReadBlockSize(getParquetMaxReadBlockSize(session))
                         .withMaxReadBlockRowCount(getParquetMaxReadBlockRowCount(session))
+                        .withSmallFileThreshold(getParquetSmallFileThreshold(session))
                         .withUseColumnIndex(isParquetUseColumnIndex(session))
-                        .withBloomFilter(useParquetBloomFilter(session))
-                        .withBatchColumnReaders(isParquetOptimizedReaderEnabled(session))
-                        .withBatchNestedColumnReaders(isParquetOptimizedNestedReaderEnabled(session)),
+                        .withBloomFilter(useParquetBloomFilter(session)),
                 Optional.empty(),
-                domainCompactionThreshold));
+                domainCompactionThreshold,
+                OptionalLong.of(estimatedFileSize)));
     }
 
     /**
@@ -208,23 +210,22 @@ public static ReaderPageSource createPageSource(
             long start,
             long length,
             List<HiveColumnHandle> columns,
-            TupleDomain<HiveColumnHandle> effectivePredicate,
+            List<TupleDomain<HiveColumnHandle>> disjunctTupleDomains,
             boolean useColumnNames,
             DateTimeZone timeZone,
             FileFormatDataSourceStats stats,
             ParquetReaderOptions options,
             Optional<ParquetWriteValidation> parquetWriteValidation,
-            int domainCompactionThreshold)
+            int domainCompactionThreshold,
+            OptionalLong estimatedFileSize)
     {
-        // Ignore predicates on partial columns for now.
-        effectivePredicate = effectivePredicate.filter((column, domain) -> column.isBaseColumn());
-
         MessageType fileSchema;
         MessageType requestedSchema;
         MessageColumnIO messageColumn;
         ParquetDataSource dataSource = null;
         try {
-            dataSource = new TrinoParquetDataSource(inputFile, options, stats);
+            AggregatedMemoryContext memoryContext = newSimpleAggregatedMemoryContext();
+            dataSource = createDataSource(inputFile, estimatedFileSize, options, memoryContext, stats);
 
             ParquetMetadata parquetMetadata = MetadataReader.readFooter(dataSource, parquetWriteValidation);
             FileMetaData fileMetaData = parquetMetadata.getFileMetaData();
@@ -236,11 +237,23 @@ public static ReaderPageSource createPageSource(
             messageColumn = getColumnIO(fileSchema, requestedSchema);
 
             Map<List<String>, ColumnDescriptor> descriptorsByPath = getDescriptors(fileSchema, requestedSchema);
-            TupleDomain<ColumnDescriptor> parquetTupleDomain = options.isIgnoreStatistics()
-                    ? TupleDomain.all()
-                    : getParquetTupleDomain(descriptorsByPath, effectivePredicate, fileSchema, useColumnNames);
-
-            TupleDomainParquetPredicate parquetPredicate = buildPredicate(requestedSchema, parquetTupleDomain, descriptorsByPath, timeZone);
+            List<TupleDomain<ColumnDescriptor>> parquetTupleDomains;
+            List<TupleDomainParquetPredicate> parquetPredicates;
+            if (options.isIgnoreStatistics()) {
+                parquetTupleDomains = ImmutableList.of();
+                parquetPredicates = ImmutableList.of();
+            }
+            else {
+                ImmutableList.Builder<TupleDomain<ColumnDescriptor>> parquetTupleDomainsBuilder = ImmutableList.builderWithExpectedSize(disjunctTupleDomains.size());
+                ImmutableList.Builder<TupleDomainParquetPredicate> parquetPredicatesBuilder = ImmutableList.builderWithExpectedSize(disjunctTupleDomains.size());
+                for (TupleDomain<HiveColumnHandle> tupleDomain : disjunctTupleDomains) {
+                    TupleDomain<ColumnDescriptor> parquetTupleDomain = getParquetTupleDomain(descriptorsByPath, tupleDomain, fileSchema, useColumnNames);
+                    parquetTupleDomainsBuilder.add(parquetTupleDomain);
+                    parquetPredicatesBuilder.add(buildPredicate(requestedSchema, parquetTupleDomain, descriptorsByPath, timeZone));
+                }
+                parquetTupleDomains = parquetTupleDomainsBuilder.build();
+                parquetPredicates = parquetPredicatesBuilder.build();
+            }
 
             long nextStart = 0;
             ImmutableList.Builder<BlockMetaData> blocks = ImmutableList.builder();
@@ -248,28 +261,32 @@ public static ReaderPageSource createPageSource(
             ImmutableList.Builder<Optional<ColumnIndexStore>> columnIndexes = ImmutableList.builder();
             for (BlockMetaData block : parquetMetadata.getBlocks()) {
                 long firstDataPage = block.getColumns().get(0).getFirstDataPageOffset();
-                Optional<ColumnIndexStore> columnIndex = getColumnIndexStore(dataSource, block, descriptorsByPath, parquetTupleDomain, options);
-                Optional<BloomFilterStore> bloomFilterStore = getBloomFilterStore(dataSource, block, parquetTupleDomain, options);
-
-                if (start <= firstDataPage && firstDataPage < start + length
-                        && predicateMatches(
-                        parquetPredicate,
-                        block,
-                        dataSource,
-                        descriptorsByPath,
-                        parquetTupleDomain,
-                        columnIndex,
-                        bloomFilterStore,
-                        timeZone,
-                        domainCompactionThreshold)) {
-                    blocks.add(block);
-                    blockStarts.add(nextStart);
-                    columnIndexes.add(columnIndex);
+                for (int i = 0; i < disjunctTupleDomains.size(); i++) {
+                    TupleDomain<ColumnDescriptor> parquetTupleDomain = parquetTupleDomains.get(i);
+                    TupleDomainParquetPredicate parquetPredicate = parquetPredicates.get(i);
+                    Optional<ColumnIndexStore> columnIndex = getColumnIndexStore(dataSource, block, descriptorsByPath, parquetTupleDomain, options);
+                    Optional<BloomFilterStore> bloomFilterStore = getBloomFilterStore(dataSource, block, parquetTupleDomain, options);
+                    if (start <= firstDataPage && firstDataPage < start + length
+                            && predicateMatches(
+                            parquetPredicate,
+                            block,
+                            dataSource,
+                            descriptorsByPath,
+                            parquetTupleDomain,
+                            columnIndex,
+                            bloomFilterStore,
+                            timeZone,
+                            domainCompactionThreshold)) {
+                        blocks.add(block);
+                        blockStarts.add(nextStart);
+                        columnIndexes.add(columnIndex);
+                        break;
+                    }
                 }
                 nextStart += block.getRowCount();
             }
 
-            Optional<ReaderColumns> readerProjections = projectBaseColumns(columns);
+            Optional<ReaderColumns> readerProjections = projectBaseColumns(columns, useColumnNames);
             List<HiveColumnHandle> baseColumns = readerProjections.map(projection ->
                             projection.get().stream()
                                     .map(HiveColumnHandle.class::cast)
@@ -285,10 +302,12 @@ && predicateMatches(
                     blockStarts.build(),
                     finalDataSource,
                     timeZone,
-                    newSimpleAggregatedMemoryContext(),
+                    memoryContext,
                     options,
                     exception -> handleException(dataSourceId, exception),
-                    Optional.of(parquetPredicate),
+                    // We avoid using disjuncts of parquetPredicate for page pruning in ParquetReader as currently column indexes
+                    // are not present in the Parquet files which are read with disjunct predicates.
+                    parquetPredicates.size() == 1 ? Optional.of(parquetPredicates.get(0)) : Optional.empty(),
                     columnIndexes.build(),
                     parquetWriteValidation);
             ConnectorPageSource parquetPageSource = createParquetPageSource(baseColumns, fileSchema, messageColumn, useColumnNames, parquetReaderProvider);
@@ -313,6 +332,20 @@ && predicateMatches(
         }
     }
 
+    public static ParquetDataSource createDataSource(
+            TrinoInputFile inputFile,
+            OptionalLong estimatedFileSize,
+            ParquetReaderOptions options,
+            AggregatedMemoryContext memoryContext,
+            FileFormatDataSourceStats stats)
+            throws IOException
+    {
+        if (estimatedFileSize.isEmpty() || estimatedFileSize.getAsLong() > options.getSmallFileThreshold().toBytes()) {
+            return new TrinoParquetDataSource(inputFile, options, stats);
+        }
+        return new MemoryParquetDataSource(inputFile, memoryContext, stats);
+    }
+
     public static Optional<MessageType> getParquetMessageType(List<HiveColumnHandle> columns, boolean useColumnNames, MessageType fileSchema)
     {
         Optional<MessageType> message = projectSufficientColumns(columns)
@@ -331,24 +364,19 @@ public static Optional<MessageType> getParquetMessageType(List<HiveColumnHandle>
 
     public static Optional<org.apache.parquet.schema.Type> getColumnType(HiveColumnHandle column, MessageType messageType, boolean useParquetColumnNames)
     {
-        Optional<org.apache.parquet.schema.Type> columnType = getBaseColumnParquetType(column, messageType, useParquetColumnNames);
-        if (columnType.isEmpty() || column.getHiveColumnProjectionInfo().isEmpty()) {
-            return columnType;
+        Optional<org.apache.parquet.schema.Type> baseColumnType = getBaseColumnParquetType(column, messageType, useParquetColumnNames);
+        if (baseColumnType.isEmpty() || column.getHiveColumnProjectionInfo().isEmpty()) {
+            return baseColumnType;
         }
-        GroupType baseType = columnType.get().asGroupType();
-        ImmutableList.Builder<org.apache.parquet.schema.Type> typeBuilder = ImmutableList.builder();
-        org.apache.parquet.schema.Type parentType = baseType;
+        GroupType baseType = baseColumnType.get().asGroupType();
+        Optional<List<org.apache.parquet.schema.Type>> subFieldTypesOptional = dereferenceSubFieldTypes(baseType, column.getHiveColumnProjectionInfo().get());
 
-        for (String name : column.getHiveColumnProjectionInfo().get().getDereferenceNames()) {
-            org.apache.parquet.schema.Type childType = getParquetTypeByName(name, parentType.asGroupType());
-            if (childType == null) {
-                return Optional.empty();
-            }
-            typeBuilder.add(childType);
-            parentType = childType;
+        // if there is a mismatch between parquet schema and the hive schema and the column cannot be dereferenced
+        if (subFieldTypesOptional.isEmpty()) {
+            return Optional.empty();
         }
 
-        List<org.apache.parquet.schema.Type> subfieldTypes = typeBuilder.build();
+        List<org.apache.parquet.schema.Type> subfieldTypes = subFieldTypesOptional.get();
         org.apache.parquet.schema.Type type = subfieldTypes.get(subfieldTypes.size() - 1);
         for (int i = subfieldTypes.size() - 2; i >= 0; --i) {
             GroupType groupType = subfieldTypes.get(i).asGroupType();
@@ -394,30 +422,6 @@ public static Optional<ColumnIndexStore> getColumnIndexStore(
         return Optional.of(new TrinoColumnIndexStore(dataSource, blockMetadata, columnsReadPaths, columnsFilteredPaths));
     }
 
-    public static Optional<BloomFilterStore> getBloomFilterStore(
-            ParquetDataSource dataSource,
-            BlockMetaData blockMetadata,
-            TupleDomain<ColumnDescriptor> parquetTupleDomain,
-            ParquetReaderOptions options)
-    {
-        if (!options.useBloomFilter() || parquetTupleDomain.isAll() || parquetTupleDomain.isNone()) {
-            return Optional.empty();
-        }
-
-        boolean hasBloomFilter = blockMetadata.getColumns().stream().anyMatch(BloomFilterStore::hasBloomFilter);
-        if (!hasBloomFilter) {
-            return Optional.empty();
-        }
-
-        Map<ColumnDescriptor, Domain> parquetDomains = parquetTupleDomain.getDomains()
-                .orElseThrow(() -> new IllegalStateException("Predicate other than none should have domains"));
-        Set<ColumnPath> columnsFilteredPaths = parquetDomains.keySet().stream()
-                .map(column -> ColumnPath.get(column.getPath()))
-                .collect(toImmutableSet());
-
-        return Optional.of(new BloomFilterStore(dataSource, blockMetadata, columnsFilteredPaths));
-    }
-
     public static TupleDomain<ColumnDescriptor> getParquetTupleDomain(
             Map<List<String>, ColumnDescriptor> descriptorsByPath,
             TupleDomain<HiveColumnHandle> effectivePredicate,
@@ -437,18 +441,32 @@ public static TupleDomain<ColumnDescriptor> getParquetTupleDomain(
             }
 
             ColumnDescriptor descriptor;
-            if (useColumnNames) {
-                descriptor = descriptorsByPath.get(ImmutableList.of(columnHandle.getName()));
+
+            Optional<org.apache.parquet.schema.Type> baseColumnType = getBaseColumnParquetType(columnHandle, fileSchema, useColumnNames);
+            // Parquet file has fewer column than partition
+            if (baseColumnType.isEmpty()) {
+                continue;
+            }
+
+            if (baseColumnType.get().isPrimitive()) {
+                descriptor = descriptorsByPath.get(ImmutableList.of(baseColumnType.get().getName()));
             }
             else {
-                Optional<org.apache.parquet.schema.Type> parquetField = getBaseColumnParquetType(columnHandle, fileSchema, false);
-                if (parquetField.isEmpty() || !parquetField.get().isPrimitive()) {
-                    // Parquet file has fewer column than partition
-                    // Or the field is a complex type
+                if (columnHandle.getHiveColumnProjectionInfo().isEmpty()) {
                     continue;
                 }
-                descriptor = descriptorsByPath.get(ImmutableList.of(parquetField.get().getName()));
+                Optional<List<Type>> subfieldTypes = dereferenceSubFieldTypes(baseColumnType.get().asGroupType(), columnHandle.getHiveColumnProjectionInfo().get());
+                // failed to look up subfields from the file schema
+                if (subfieldTypes.isEmpty()) {
+                    continue;
+                }
+
+                descriptor = descriptorsByPath.get(ImmutableList.<String>builder()
+                        .add(baseColumnType.get().getName())
+                        .addAll(subfieldTypes.get().stream().map(Type::getName).collect(toImmutableList()))
+                        .build());
             }
+
             if (descriptor != null) {
                 predicate.put(descriptor, entry.getValue());
             }
@@ -509,4 +527,32 @@ private static Optional<org.apache.parquet.schema.Type> getBaseColumnParquetType
 
         return Optional.empty();
     }
+
+    /**
+     * Dereferencing base parquet type based on projection info's dereference names.
+     * For example, when dereferencing baseType(level1Field0, level1Field1, Level1Field2(Level2Field0, Level2Field1))
+     * with a projection info's dereferenceNames list as (basetype, Level1Field2, Level2Field1).
+     * It would return a list of parquet types in the order of (level1Field2, Level2Field1)
+     *
+     * @return child fields on each level of dereferencing. Return Optional.empty when failed to do the lookup.
+     */
+    private static Optional<List<org.apache.parquet.schema.Type>> dereferenceSubFieldTypes(GroupType baseType, HiveColumnProjectionInfo projectionInfo)
+    {
+        checkArgument(baseType != null, "base type cannot be null when dereferencing");
+        checkArgument(projectionInfo != null, "hive column projection info cannot be null when doing dereferencing");
+
+        ImmutableList.Builder<org.apache.parquet.schema.Type> typeBuilder = ImmutableList.builder();
+        org.apache.parquet.schema.Type parentType = baseType;
+
+        for (String name : projectionInfo.getDereferenceNames()) {
+            org.apache.parquet.schema.Type childType = getParquetTypeByName(name, parentType.asGroupType());
+            if (childType == null) {
+                return Optional.empty();
+            }
+            typeBuilder.add(childType);
+            parentType = childType;
+        }
+
+        return Optional.of(typeBuilder.build());
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetReaderConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetReaderConfig.java
index ac36c43cb48f..b4b1841f6e8e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetReaderConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetReaderConfig.java
@@ -18,19 +18,23 @@
 import io.airlift.configuration.DefunctConfig;
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.units.DataSize;
+import io.airlift.units.MaxDataSize;
 import io.airlift.units.MinDataSize;
 import io.trino.parquet.ParquetReaderOptions;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 @DefunctConfig({
         "hive.parquet.fail-on-corrupted-statistics",
         "parquet.fail-on-corrupted-statistics",
+        "parquet.optimized-reader.enabled",
+        "parquet.optimized-nested-reader.enabled"
 })
 public class ParquetReaderConfig
 {
+    public static final String PARQUET_READER_MAX_SMALL_FILE_THRESHOLD = "15MB";
+
     private ParquetReaderOptions options = new ParquetReaderOptions();
 
     @Deprecated
@@ -117,43 +121,32 @@ public boolean isUseColumnIndex()
         return options.isUseColumnIndex();
     }
 
-    @Config("parquet.optimized-reader.enabled")
-    @ConfigDescription("Use optimized Parquet reader")
-    public ParquetReaderConfig setOptimizedReaderEnabled(boolean optimizedReaderEnabled)
-    {
-        options = options.withBatchColumnReaders(optimizedReaderEnabled);
-        return this;
-    }
-
-    public boolean isOptimizedReaderEnabled()
-    {
-        return options.useBatchColumnReaders();
-    }
-
-    @Config("parquet.optimized-nested-reader.enabled")
-    @ConfigDescription("Use optimized Parquet reader for nested columns")
-    public ParquetReaderConfig setOptimizedNestedReaderEnabled(boolean optimizedNestedReaderEnabled)
+    @Config("parquet.use-bloom-filter")
+    @ConfigDescription("Use Parquet Bloom filters")
+    public ParquetReaderConfig setUseBloomFilter(boolean useBloomFilter)
     {
-        options = options.withBatchNestedColumnReaders(optimizedNestedReaderEnabled);
+        options = options.withBloomFilter(useBloomFilter);
         return this;
     }
 
-    public boolean isOptimizedNestedReaderEnabled()
+    public boolean isUseBloomFilter()
     {
-        return options.useBatchNestedColumnReaders();
+        return options.useBloomFilter();
     }
 
-    @Config("parquet.use-bloom-filter")
-    @ConfigDescription("Enable using Parquet bloom filter")
-    public ParquetReaderConfig setUseBloomFilter(boolean useBloomFilter)
+    @Config("parquet.small-file-threshold")
+    @ConfigDescription("Size below which a parquet file will be read entirely")
+    public ParquetReaderConfig setSmallFileThreshold(DataSize smallFileThreshold)
     {
-        options = options.withBloomFilter(useBloomFilter);
+        options = options.withSmallFileThreshold(smallFileThreshold);
         return this;
     }
 
-    public boolean isUseBloomFilter()
+    @NotNull
+    @MaxDataSize(PARQUET_READER_MAX_SMALL_FILE_THRESHOLD)
+    public DataSize getSmallFileThreshold()
     {
-        return options.useBloomFilter();
+        return options.getSmallFileThreshold();
     }
 
     public ParquetReaderOptions toParquetReaderOptions()
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetRecordWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetRecordWriter.java
deleted file mode 100644
index bedff16e753e..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetRecordWriter.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.parquet;
-
-import io.trino.plugin.hive.RecordFileWriter.ExtendedRecordWriter;
-import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.ql.exec.FileSinkOperator.RecordWriter;
-import org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat;
-import org.apache.hadoop.hive.ql.io.parquet.write.ParquetRecordWriterWrapper;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.Reporter;
-import org.apache.parquet.hadoop.DisabledMemoryManager;
-import org.apache.parquet.hadoop.ParquetFileWriter;
-import org.apache.parquet.hadoop.ParquetOutputFormat;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.Properties;
-
-import static io.trino.plugin.hive.HiveSessionProperties.getParquetWriterBlockSize;
-import static io.trino.plugin.hive.HiveSessionProperties.getParquetWriterPageSize;
-import static java.util.Objects.requireNonNull;
-
-public final class ParquetRecordWriter
-        implements ExtendedRecordWriter
-{
-    private static final Field REAL_WRITER_FIELD;
-    private static final Field INTERNAL_WRITER_FIELD;
-    private static final Field FILE_WRITER_FIELD;
-
-    static {
-        try {
-            REAL_WRITER_FIELD = ParquetRecordWriterWrapper.class.getDeclaredField("realWriter");
-            INTERNAL_WRITER_FIELD = org.apache.parquet.hadoop.ParquetRecordWriter.class.getDeclaredField("internalWriter");
-            FILE_WRITER_FIELD = INTERNAL_WRITER_FIELD.getType().getDeclaredField("parquetFileWriter");
-
-            REAL_WRITER_FIELD.setAccessible(true);
-            INTERNAL_WRITER_FIELD.setAccessible(true);
-            FILE_WRITER_FIELD.setAccessible(true);
-
-            replaceHadoopParquetMemoryManager();
-        }
-        catch (ReflectiveOperationException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    public static RecordWriter create(Path target, JobConf conf, Properties properties, ConnectorSession session)
-            throws IOException, ReflectiveOperationException
-    {
-        conf.setLong(ParquetOutputFormat.BLOCK_SIZE, getParquetWriterBlockSize(session).toBytes());
-        conf.setLong(ParquetOutputFormat.PAGE_SIZE, getParquetWriterPageSize(session).toBytes());
-
-        RecordWriter recordWriter = new MapredParquetOutputFormat()
-                .getHiveRecordWriter(conf, target, Text.class, false, properties, Reporter.NULL);
-
-        Object realWriter = REAL_WRITER_FIELD.get(recordWriter);
-        Object internalWriter = INTERNAL_WRITER_FIELD.get(realWriter);
-        ParquetFileWriter fileWriter = (ParquetFileWriter) FILE_WRITER_FIELD.get(internalWriter);
-
-        return new ParquetRecordWriter(recordWriter, fileWriter);
-    }
-
-    public static void replaceHadoopParquetMemoryManager()
-    {
-        try {
-            Field memoryManager = org.apache.parquet.hadoop.ParquetOutputFormat.class.getDeclaredField("memoryManager");
-            memoryManager.setAccessible(true);
-            memoryManager.set(null, new DisabledMemoryManager());
-        }
-        catch (ReflectiveOperationException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    private final RecordWriter recordWriter;
-    private final ParquetFileWriter fileWriter;
-    private long length;
-
-    private ParquetRecordWriter(RecordWriter recordWriter, ParquetFileWriter fileWriter)
-    {
-        this.recordWriter = requireNonNull(recordWriter, "recordWriter is null");
-        this.fileWriter = requireNonNull(fileWriter, "fileWriter is null");
-    }
-
-    @Override
-    public long getWrittenBytes()
-    {
-        return length;
-    }
-
-    @Override
-    public void write(Writable value)
-            throws IOException
-    {
-        recordWriter.write(value);
-        length = fileWriter.getPos();
-    }
-
-    @Override
-    public void close(boolean abort)
-            throws IOException
-    {
-        recordWriter.close(abort);
-        if (!abort) {
-            length = fileWriter.getPos();
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetWriterConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetWriterConfig.java
index 386ab6b5904f..d870a6e097c0 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetWriterConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetWriterConfig.java
@@ -15,23 +15,33 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
+import io.airlift.configuration.DefunctConfig;
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.units.DataSize;
+import io.airlift.units.MaxDataSize;
+import io.airlift.units.MinDataSize;
 import io.trino.parquet.writer.ParquetWriterOptions;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
 import org.apache.parquet.hadoop.ParquetWriter;
 
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-
+@DefunctConfig({
+        "hive.parquet.optimized-writer.enabled",
+        "parquet.experimental-optimized-writer.enabled",
+        "parquet.optimized-writer.enabled",
+})
 public class ParquetWriterConfig
 {
-    private boolean parquetOptimizedWriterEnabled;
+    public static final String PARQUET_WRITER_MAX_BLOCK_SIZE = "2GB";
+    public static final String PARQUET_WRITER_MIN_PAGE_SIZE = "8kB";
+    public static final String PARQUET_WRITER_MAX_PAGE_SIZE = "8MB";
 
     private DataSize blockSize = DataSize.ofBytes(ParquetWriter.DEFAULT_BLOCK_SIZE);
     private DataSize pageSize = DataSize.ofBytes(ParquetWriter.DEFAULT_PAGE_SIZE);
     private int batchSize = ParquetWriterOptions.DEFAULT_BATCH_SIZE;
     private double validationPercentage = 5;
 
+    @MaxDataSize(PARQUET_WRITER_MAX_BLOCK_SIZE)
     public DataSize getBlockSize()
     {
         return blockSize;
@@ -45,6 +55,8 @@ public ParquetWriterConfig setBlockSize(DataSize blockSize)
         return this;
     }
 
+    @MinDataSize(PARQUET_WRITER_MIN_PAGE_SIZE)
+    @MaxDataSize(PARQUET_WRITER_MAX_PAGE_SIZE)
     public DataSize getPageSize()
     {
         return pageSize;
@@ -58,20 +70,6 @@ public ParquetWriterConfig setPageSize(DataSize pageSize)
         return this;
     }
 
-    public boolean isParquetOptimizedWriterEnabled()
-    {
-        return parquetOptimizedWriterEnabled;
-    }
-
-    @Config("parquet.optimized-writer.enabled")
-    @LegacyConfig({"hive.parquet.optimized-writer.enabled", "parquet.experimental-optimized-writer.enabled"})
-    @ConfigDescription("Enable optimized Parquet writer")
-    public ParquetWriterConfig setParquetOptimizedWriterEnabled(boolean parquetOptimizedWriterEnabled)
-    {
-        this.parquetOptimizedWriterEnabled = parquetOptimizedWriterEnabled;
-        return this;
-    }
-
     @Config("parquet.writer.batch-size")
     @ConfigDescription("Maximum number of rows passed to the writer in each batch")
     public ParquetWriterConfig setBatchSize(int batchSize)
@@ -92,7 +90,8 @@ public double getValidationPercentage()
         return validationPercentage;
     }
 
-    @Config("parquet.optimized-writer.validation-percentage")
+    @Config("parquet.writer.validation-percentage")
+    @LegacyConfig("parquet.optimized-writer.validation-percentage")
     @ConfigDescription("Percentage of parquet files to validate after write by re-reading the whole file")
     public ParquetWriterConfig setValidationPercentage(double validationPercentage)
     {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/TrinoParquetDataSource.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/TrinoParquetDataSource.java
index 134665394437..99ab9f48d63a 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/TrinoParquetDataSource.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/TrinoParquetDataSource.java
@@ -34,7 +34,7 @@ public class TrinoParquetDataSource
     public TrinoParquetDataSource(TrinoInputFile file, ParquetReaderOptions options, FileFormatDataSourceStats stats)
             throws IOException
     {
-        super(new ParquetDataSourceId(file.location()), file.length(), options);
+        super(new ParquetDataSourceId(file.location().toString()), file.length(), options);
         this.stats = requireNonNull(stats, "stats is null");
         this.input = file.newInput();
     }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/CreateEmptyPartitionProcedure.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/CreateEmptyPartitionProcedure.java
index 82b7d6eb7817..6a1096222001 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/CreateEmptyPartitionProcedure.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/CreateEmptyPartitionProcedure.java
@@ -14,6 +14,8 @@
 package io.trino.plugin.hive.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.airlift.json.JsonCodec;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
@@ -36,9 +38,6 @@
 import io.trino.spi.procedure.Procedure.Argument;
 import io.trino.spi.type.ArrayType;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 import java.util.Objects;
@@ -138,8 +137,8 @@ private void doCreateEmptyPartition(ConnectorSession session, ConnectorAccessCon
                         new PartitionUpdate(
                                 partitionName,
                                 UpdateMode.NEW,
-                                writeInfo.getWritePath(),
-                                writeInfo.getTargetPath(),
+                                writeInfo.writePath().toString(),
+                                writeInfo.targetPath().toString(),
                                 ImmutableList.of(),
                                 0,
                                 0,
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/DropStatsProcedure.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/DropStatsProcedure.java
index 311f6a490832..834784802597 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/DropStatsProcedure.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/DropStatsProcedure.java
@@ -14,6 +14,8 @@
 package io.trino.plugin.hive.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.HiveMetastoreClosure;
 import io.trino.plugin.hive.HiveTableHandle;
@@ -31,9 +33,6 @@
 import io.trino.spi.procedure.Procedure.Argument;
 import io.trino.spi.type.ArrayType;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/OptimizeTableProcedure.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/OptimizeTableProcedure.java
index 56229bface78..7b31a076a46f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/OptimizeTableProcedure.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/OptimizeTableProcedure.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.hive.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Provider;
 import io.airlift.units.DataSize;
 import io.trino.spi.connector.TableProcedureMetadata;
 
-import javax.inject.Provider;
-
 import static io.trino.plugin.base.session.PropertyMetadataUtil.dataSizeProperty;
 import static io.trino.spi.connector.TableProcedureExecutionMode.distributedWithFilteringAndRepartitioning;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/RegisterPartitionProcedure.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/RegisterPartitionProcedure.java
index 8ae4d3f7e594..eaf6295f5042 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/RegisterPartitionProcedure.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/RegisterPartitionProcedure.java
@@ -15,15 +15,17 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import io.trino.hdfs.HdfsContext;
-import io.trino.hdfs.HdfsEnvironment;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.PartitionStatistics;
 import io.trino.plugin.hive.TransactionalMetadataFactory;
 import io.trino.plugin.hive.metastore.Partition;
 import io.trino.plugin.hive.metastore.SemiTransactionalHiveMetastore;
 import io.trino.plugin.hive.metastore.Table;
-import io.trino.plugin.hive.util.HiveWriteUtils;
 import io.trino.spi.TrinoException;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorAccessControl;
@@ -32,16 +34,14 @@
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.procedure.Procedure;
 import io.trino.spi.type.ArrayType;
-import org.apache.hadoop.fs.Path;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
 
+import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 import java.util.Optional;
 
 import static io.trino.plugin.base.util.Procedures.checkProcedureArgument;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
 import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME;
 import static io.trino.plugin.hive.procedure.Procedures.checkIsPartitionedTable;
 import static io.trino.plugin.hive.procedure.Procedures.checkPartitionColumns;
@@ -70,14 +70,14 @@ public class RegisterPartitionProcedure
 
     private final boolean allowRegisterPartition;
     private final TransactionalMetadataFactory hiveMetadataFactory;
-    private final HdfsEnvironment hdfsEnvironment;
+    private final TrinoFileSystemFactory fileSystemFactory;
 
     @Inject
-    public RegisterPartitionProcedure(HiveConfig hiveConfig, TransactionalMetadataFactory hiveMetadataFactory, HdfsEnvironment hdfsEnvironment)
+    public RegisterPartitionProcedure(HiveConfig hiveConfig, TransactionalMetadataFactory hiveMetadataFactory, TrinoFileSystemFactory fileSystemFactory)
     {
         this.allowRegisterPartition = hiveConfig.isAllowRegisterPartition();
         this.hiveMetadataFactory = requireNonNull(hiveMetadataFactory, "hiveMetadataFactory is null");
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
     }
 
     @Override
@@ -115,7 +115,6 @@ private void doRegisterPartition(ConnectorSession session, ConnectorAccessContro
 
         SemiTransactionalHiveMetastore metastore = hiveMetadataFactory.create(session.getIdentity(), true).getMetastore();
 
-        HdfsContext hdfsContext = new HdfsContext(session);
         SchemaTableName schemaTableName = new SchemaTableName(schemaName, tableName);
 
         Table table = metastore.getTable(schemaName, tableName)
@@ -132,17 +131,18 @@ private void doRegisterPartition(ConnectorSession session, ConnectorAccessContro
             throw new TrinoException(ALREADY_EXISTS, format("Partition [%s] is already registered with location %s", partitionName, partition.get().getStorage().getLocation()));
         }
 
-        Path partitionLocation;
+        Location partitionLocation = Optional.ofNullable(location)
+                .map(Location::of)
+                .orElseGet(() -> Location.of(table.getStorage().getLocation()).appendPath(makePartName(partitionColumns, partitionValues)));
 
-        if (location == null) {
-            partitionLocation = new Path(table.getStorage().getLocation(), makePartName(partitionColumns, partitionValues));
-        }
-        else {
-            partitionLocation = new Path(location);
+        TrinoFileSystem fileSystem = fileSystemFactory.create(session);
+        try {
+            if (!fileSystem.directoryExists(partitionLocation).orElse(true)) {
+                throw new TrinoException(INVALID_PROCEDURE_ARGUMENT, "Partition location does not exist: " + partitionLocation);
+            }
         }
-
-        if (!HiveWriteUtils.pathExists(hdfsContext, hdfsEnvironment, partitionLocation)) {
-            throw new TrinoException(INVALID_PROCEDURE_ARGUMENT, "Partition location does not exist: " + partitionLocation);
+        catch (IOException e) {
+            throw new TrinoException(HIVE_FILESYSTEM_ERROR, "Failed checking partition location: " + partitionLocation, e);
         }
 
         metastore.addPartition(
@@ -158,7 +158,7 @@ private void doRegisterPartition(ConnectorSession session, ConnectorAccessContro
         metastore.commit();
     }
 
-    private static Partition buildPartitionObject(ConnectorSession session, Table table, List<String> partitionValues, Path location)
+    private static Partition buildPartitionObject(ConnectorSession session, Table table, List<String> partitionValues, Location location)
     {
         return Partition.builder()
                 .setDatabaseName(table.getDatabaseName())
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/SyncPartitionMetadataProcedure.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/SyncPartitionMetadataProcedure.java
index 922917bed138..3be1d4d10d3b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/SyncPartitionMetadataProcedure.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/SyncPartitionMetadataProcedure.java
@@ -15,10 +15,12 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import io.trino.hdfs.HdfsContext;
-import io.trino.hdfs.HdfsEnvironment;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.hive.PartitionStatistics;
 import io.trino.plugin.hive.TransactionalMetadataFactory;
 import io.trino.plugin.hive.metastore.Column;
@@ -33,22 +35,15 @@
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.procedure.Procedure;
 import io.trino.spi.procedure.Procedure.Argument;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
 
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Stream;
 
-import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.Sets.difference;
 import static io.trino.plugin.base.util.Procedures.checkProcedureArgument;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
 import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME;
@@ -57,6 +52,7 @@
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.Boolean.TRUE;
+import static java.lang.String.join;
 import static java.lang.invoke.MethodHandles.lookup;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
@@ -69,8 +65,6 @@ public enum SyncMode
         ADD, DROP, FULL
     }
 
-    private static final int BATCH_GET_PARTITIONS_BY_NAMES_MAX_PAGE_SIZE = 1000;
-
     private static final MethodHandle SYNC_PARTITION_METADATA;
 
     static {
@@ -83,15 +77,15 @@ public enum SyncMode
     }
 
     private final TransactionalMetadataFactory hiveMetadataFactory;
-    private final HdfsEnvironment hdfsEnvironment;
+    private final TrinoFileSystemFactory fileSystemFactory;
 
     @Inject
     public SyncPartitionMetadataProcedure(
             TransactionalMetadataFactory hiveMetadataFactory,
-            HdfsEnvironment hdfsEnvironment)
+            TrinoFileSystemFactory fileSystemFactory)
     {
         this.hiveMetadataFactory = requireNonNull(hiveMetadataFactory, "hiveMetadataFactory is null");
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
     }
 
     @Override
@@ -122,7 +116,6 @@ private void doSyncPartitionMetadata(ConnectorSession session, ConnectorAccessCo
         checkProcedureArgument(mode != null, "mode cannot be null");
 
         SyncMode syncMode = toSyncMode(mode);
-        HdfsContext hdfsContext = new HdfsContext(session);
         SemiTransactionalHiveMetastore metastore = hiveMetadataFactory.create(session.getIdentity(), true).getMetastore();
         SchemaTableName schemaTableName = new SchemaTableName(schemaName, tableName);
 
@@ -139,77 +132,74 @@ private void doSyncPartitionMetadata(ConnectorSession session, ConnectorAccessCo
             accessControl.checkCanDeleteFromTable(null, new SchemaTableName(schemaName, tableName));
         }
 
-        Path tableLocation = new Path(table.getStorage().getLocation());
+        Location tableLocation = Location.of(table.getStorage().getLocation());
 
-        Set<String> partitionsToAdd;
-        Set<String> partitionsToDrop;
+        Set<String> partitionsInMetastore = metastore.getPartitionNames(schemaName, tableName)
+                .map(ImmutableSet::copyOf)
+                .orElseThrow(() -> new TableNotFoundException(schemaTableName));
+        Set<String> partitionsInFileSystem = listPartitions(fileSystemFactory.create(session), tableLocation, table.getPartitionColumns(), caseSensitive);
 
-        try {
-            FileSystem fileSystem = hdfsEnvironment.getFileSystem(hdfsContext, tableLocation);
-            List<String> partitionsNamesInMetastore = metastore.getPartitionNames(schemaName, tableName)
-                    .orElseThrow(() -> new TableNotFoundException(schemaTableName));
-            List<String> partitionsInMetastore = getPartitionsInMetastore(schemaTableName, tableLocation, partitionsNamesInMetastore, metastore);
-            List<String> partitionsInFileSystem = listDirectory(fileSystem, fileSystem.getFileStatus(tableLocation), table.getPartitionColumns(), table.getPartitionColumns().size(), caseSensitive).stream()
-                    .map(fileStatus -> fileStatus.getPath().toUri())
-                    .map(uri -> tableLocation.toUri().relativize(uri).getPath())
-                    .collect(toImmutableList());
+        // partitions in file system but not in metastore
+        Set<String> partitionsToAdd = difference(partitionsInFileSystem, partitionsInMetastore);
 
-            // partitions in file system but not in metastore
-            partitionsToAdd = difference(partitionsInFileSystem, partitionsInMetastore);
-            // partitions in metastore but not in file system
-            partitionsToDrop = difference(partitionsInMetastore, partitionsInFileSystem);
-        }
-        catch (IOException e) {
-            throw new TrinoException(HIVE_FILESYSTEM_ERROR, e);
-        }
+        // partitions in metastore but not in file system
+        Set<String> partitionsToDrop = difference(partitionsInMetastore, partitionsInFileSystem);
 
         syncPartitions(partitionsToAdd, partitionsToDrop, syncMode, metastore, session, table);
     }
 
-    private List<String> getPartitionsInMetastore(SchemaTableName schemaTableName, Path tableLocation, List<String> partitionsNames, SemiTransactionalHiveMetastore metastore)
+    private static Set<String> listPartitions(TrinoFileSystem fileSystem, Location directory, List<Column> partitionColumns, boolean caseSensitive)
     {
-        ImmutableList.Builder<String> partitionsInMetastoreBuilder = ImmutableList.builderWithExpectedSize(partitionsNames.size());
-        for (List<String> partitionsNamesBatch : Lists.partition(partitionsNames, BATCH_GET_PARTITIONS_BY_NAMES_MAX_PAGE_SIZE)) {
-            metastore.getPartitionsByNames(schemaTableName.getSchemaName(), schemaTableName.getTableName(), partitionsNamesBatch).values().stream()
-                    .filter(Optional::isPresent).map(Optional::get)
-                    .map(partition -> new Path(partition.getStorage().getLocation()).toUri())
-                    .map(uri -> tableLocation.toUri().relativize(uri).getPath())
-                    .forEach(partitionsInMetastoreBuilder::add);
-        }
-        return partitionsInMetastoreBuilder.build();
+        return doListPartitions(fileSystem, directory, partitionColumns, partitionColumns.size(), caseSensitive, ImmutableList.of());
     }
 
-    private static List<FileStatus> listDirectory(FileSystem fileSystem, FileStatus current, List<Column> partitionColumns, int depth, boolean caseSensitive)
+    private static Set<String> doListPartitions(TrinoFileSystem fileSystem, Location directory, List<Column> partitionColumns, int depth, boolean caseSensitive, List<String> partitions)
     {
         if (depth == 0) {
-            return ImmutableList.of(current);
+            return ImmutableSet.of(join("/", partitions));
         }
 
+        ImmutableSet.Builder<String> result = ImmutableSet.builder();
+        for (Location location : listDirectories(fileSystem, directory)) {
+            String path = listedDirectoryName(directory, location);
+            Column column = partitionColumns.get(partitionColumns.size() - depth);
+            if (!isValidPartitionPath(path, column, caseSensitive)) {
+                continue;
+            }
+            List<String> current = ImmutableList.<String>builder().addAll(partitions).add(path).build();
+            result.addAll(doListPartitions(fileSystem, location, partitionColumns, depth - 1, caseSensitive, current));
+        }
+        return result.build();
+    }
+
+    private static Set<Location> listDirectories(TrinoFileSystem fileSystem, Location directory)
+    {
         try {
-            return Stream.of(fileSystem.listStatus(current.getPath()))
-                    .filter(fileStatus -> isValidPartitionPath(fileStatus, partitionColumns.get(partitionColumns.size() - depth), caseSensitive))
-                    .flatMap(directory -> listDirectory(fileSystem, directory, partitionColumns, depth - 1, caseSensitive).stream())
-                    .collect(toImmutableList());
+            return fileSystem.listDirectories(directory);
         }
         catch (IOException e) {
             throw new TrinoException(HIVE_FILESYSTEM_ERROR, e);
         }
     }
 
-    private static boolean isValidPartitionPath(FileStatus file, Column column, boolean caseSensitive)
+    private static String listedDirectoryName(Location directory, Location location)
     {
-        String path = file.getPath().getName();
-        if (!caseSensitive) {
-            path = path.toLowerCase(ENGLISH);
+        String prefix = directory.path();
+        if (!prefix.endsWith("/")) {
+            prefix += "/";
         }
-        String prefix = column.getName() + '=';
-        return file.isDirectory() && path.startsWith(prefix);
+        String path = location.path();
+        verify(path.endsWith("/"), "path does not end with slash: %s", location);
+        verify(path.startsWith(prefix), "path [%s] is not a child of directory [%s]", location, directory);
+        return path.substring(prefix.length(), path.length() - 1);
     }
 
-    // calculate relative complement of set b with respect to set a
-    private static Set<String> difference(List<String> a, List<String> b)
+    private static boolean isValidPartitionPath(String path, Column column, boolean caseSensitive)
     {
-        return Sets.difference(new HashSet<>(a), new HashSet<>(b));
+        if (!caseSensitive) {
+            path = path.toLowerCase(ENGLISH);
+        }
+        return path.startsWith(column.getName() + '=');
     }
 
     private static void syncPartitions(
@@ -241,7 +231,7 @@ private static void addPartitions(
                     table.getDatabaseName(),
                     table.getTableName(),
                     buildPartitionObject(session, table, name),
-                    new Path(table.getStorage().getLocation(), name),
+                    Location.of(table.getStorage().getLocation()).appendPath(name),
                     Optional.empty(), // no need for failed attempts cleanup
                     PartitionStatistics.empty(),
                     false);
@@ -274,7 +264,7 @@ private static Partition buildPartitionObject(ConnectorSession session, Table ta
                 .setParameters(ImmutableMap.of(PRESTO_QUERY_ID_NAME, session.getQueryId()))
                 .withStorage(storage -> storage
                         .setStorageFormat(table.getStorage().getStorageFormat())
-                        .setLocation(new Path(table.getStorage().getLocation(), partitionName).toString())
+                        .setLocation(Location.of(table.getStorage().getLocation()).appendPath(partitionName).toString())
                         .setBucketProperty(table.getStorage().getBucketProperty())
                         .setSerdeParameters(table.getStorage().getSerdeParameters()))
                 .build();
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/UnregisterPartitionProcedure.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/UnregisterPartitionProcedure.java
index e33f45dc9dfa..2ff444f2f30e 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/UnregisterPartitionProcedure.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/procedure/UnregisterPartitionProcedure.java
@@ -14,6 +14,8 @@
 package io.trino.plugin.hive.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.trino.plugin.hive.TransactionalMetadataFactory;
 import io.trino.plugin.hive.metastore.Partition;
 import io.trino.plugin.hive.metastore.SemiTransactionalHiveMetastore;
@@ -27,9 +29,6 @@
 import io.trino.spi.procedure.Procedure;
 import io.trino.spi.type.ArrayType;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rcfile/RcFilePageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rcfile/RcFilePageSourceFactory.java
index 8244cd0fa83f..e1ebd7f82818 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rcfile/RcFilePageSourceFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/rcfile/RcFilePageSourceFactory.java
@@ -15,14 +15,15 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
+import com.google.inject.Inject;
 import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
 import io.airlift.units.DataSize.Unit;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.filesystem.memory.MemoryInputFile;
-import io.trino.hdfs.HdfsEnvironment;
 import io.trino.hive.formats.FileCorruptionException;
 import io.trino.hive.formats.encodings.ColumnEncodingFactory;
 import io.trino.hive.formats.encodings.binary.BinaryColumnEncodingFactory;
@@ -30,12 +31,9 @@
 import io.trino.hive.formats.encodings.text.TextEncodingOptions;
 import io.trino.hive.formats.rcfile.RcFileReader;
 import io.trino.plugin.hive.AcidInfo;
-import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.HivePageSourceFactory;
-import io.trino.plugin.hive.HiveTimestampPrecision;
-import io.trino.plugin.hive.MonitoredTrinoInputFile;
 import io.trino.plugin.hive.ReaderColumns;
 import io.trino.plugin.hive.ReaderPageSource;
 import io.trino.plugin.hive.acid.AcidTransaction;
@@ -45,13 +43,8 @@
 import io.trino.spi.connector.EmptyPageSource;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
 import org.joda.time.DateTimeZone;
 
-import javax.inject.Inject;
-
 import java.io.InputStream;
 import java.util.List;
 import java.util.Optional;
@@ -63,14 +56,13 @@
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_BAD_DATA;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_CANNOT_OPEN_SPLIT;
 import static io.trino.plugin.hive.HivePageSourceProvider.projectBaseColumns;
-import static io.trino.plugin.hive.HiveSessionProperties.getTimestampPrecision;
 import static io.trino.plugin.hive.ReaderPageSource.noProjectionAdaptation;
 import static io.trino.plugin.hive.util.HiveClassNames.COLUMNAR_SERDE_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.LAZY_BINARY_COLUMNAR_SERDE_CLASS;
 import static io.trino.plugin.hive.util.HiveUtil.getDeserializerClassName;
+import static io.trino.plugin.hive.util.HiveUtil.splitError;
 import static io.trino.plugin.hive.util.SerdeConstants.SERIALIZATION_LIB;
 import static java.lang.Math.min;
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class RcFilePageSourceFactory
@@ -78,17 +70,13 @@ public class RcFilePageSourceFactory
 {
     private static final DataSize BUFFER_SIZE = DataSize.of(8, Unit.MEGABYTE);
 
-    private final TypeManager typeManager;
-    private final HdfsEnvironment hdfsEnvironment;
-    private final FileFormatDataSourceStats stats;
+    private final TrinoFileSystemFactory fileSystemFactory;
     private final DateTimeZone timeZone;
 
     @Inject
-    public RcFilePageSourceFactory(TypeManager typeManager, HdfsEnvironment hdfsEnvironment, FileFormatDataSourceStats stats, HiveConfig hiveConfig)
+    public RcFilePageSourceFactory(TrinoFileSystemFactory fileSystemFactory, HiveConfig hiveConfig)
     {
-        this.typeManager = requireNonNull(typeManager, "typeManager is null");
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
-        this.stats = requireNonNull(stats, "stats is null");
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.timeZone = hiveConfig.getRcfileDateTimeZone();
     }
 
@@ -104,9 +92,8 @@ public static Properties stripUnnecessaryProperties(Properties schema)
 
     @Override
     public Optional<ReaderPageSource> createPageSource(
-            Configuration configuration,
             ConnectorSession session,
-            Path path,
+            Location path,
             long start,
             long length,
             long estimatedFileSize,
@@ -141,8 +128,8 @@ else if (deserializerClassName.equals(COLUMNAR_SERDE_CLASS)) {
                     .collect(toImmutableList());
         }
 
-        TrinoFileSystem trinoFileSystem = new HdfsFileSystemFactory(hdfsEnvironment).create(session.getIdentity());
-        TrinoInputFile inputFile = new MonitoredTrinoInputFile(stats, trinoFileSystem.newInputFile(path.toString()));
+        TrinoFileSystem trinoFileSystem = fileSystemFactory.create(session.getIdentity());
+        TrinoInputFile inputFile = trinoFileSystem.newInputFile(path);
         try {
             length = min(inputFile.length() - start, length);
             if (!inputFile.exists()) {
@@ -151,7 +138,7 @@ else if (deserializerClassName.equals(COLUMNAR_SERDE_CLASS)) {
             if (estimatedFileSize < BUFFER_SIZE.toBytes()) {
                 try (InputStream inputStream = inputFile.newStream()) {
                     byte[] data = inputStream.readAllBytes();
-                    inputFile = new MemoryInputFile(path.toString(), Slices.wrappedBuffer(data));
+                    inputFile = new MemoryInputFile(path, Slices.wrappedBuffer(data));
                 }
             }
         }
@@ -169,9 +156,8 @@ else if (deserializerClassName.equals(COLUMNAR_SERDE_CLASS)) {
 
         try {
             ImmutableMap.Builder<Integer, Type> readColumns = ImmutableMap.builder();
-            HiveTimestampPrecision timestampPrecision = getTimestampPrecision(session);
             for (HiveColumnHandle column : projectedReaderColumns) {
-                readColumns.put(column.getBaseHiveColumnIndex(), column.getHiveType().getType(typeManager, timestampPrecision));
+                readColumns.put(column.getBaseHiveColumnIndex(), column.getType());
             }
 
             RcFileReader rcFileReader = new RcFileReader(
@@ -195,9 +181,4 @@ else if (deserializerClassName.equals(COLUMNAR_SERDE_CLASS)) {
             throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, message, e);
         }
     }
-
-    private static String splitError(Throwable t, Path path, long start, long length)
-    {
-        return format("Error opening Hive split %s (offset=%s, length=%s): %s", path, start, length, t.getMessage());
-    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3ConfigurationInitializer.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3ConfigurationInitializer.java
deleted file mode 100644
index 4739f2253963..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3ConfigurationInitializer.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3;
-
-import io.airlift.units.DataSize;
-import io.airlift.units.Duration;
-import io.trino.hdfs.ConfigurationInitializer;
-import org.apache.hadoop.conf.Configuration;
-
-import javax.inject.Inject;
-
-import java.io.File;
-import java.util.List;
-import java.util.Optional;
-
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ACCESS_KEY;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ACL_TYPE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_CONNECT_TIMEOUT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_CONNECT_TTL;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ENCRYPTION_MATERIALS_PROVIDER;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ENDPOINT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_EXTERNAL_ID;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_IAM_ROLE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_KMS_KEY_ID;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MAX_BACKOFF_TIME;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MAX_CLIENT_RETRIES;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MAX_CONNECTIONS;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MAX_ERROR_RETRIES;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MAX_RETRY_TIME;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MULTIPART_MIN_FILE_SIZE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MULTIPART_MIN_PART_SIZE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_NON_PROXY_HOSTS;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_PATH_STYLE_ACCESS;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_PIN_CLIENT_TO_CURRENT_REGION;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_PREEMPTIVE_BASIC_PROXY_AUTH;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_PROXY_HOST;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_PROXY_PASSWORD;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_PROXY_PORT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_PROXY_PROTOCOL;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_PROXY_USERNAME;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_REGION;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_REQUESTER_PAYS_ENABLED;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SECRET_KEY;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SIGNER_CLASS;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SIGNER_TYPE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SKIP_GLACIER_OBJECTS;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SOCKET_TIMEOUT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SSE_ENABLED;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SSE_KMS_KEY_ID;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SSE_TYPE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SSL_ENABLED;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_STAGING_DIRECTORY;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_STORAGE_CLASS;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_STREAMING_UPLOAD_ENABLED;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_STREAMING_UPLOAD_PART_SIZE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_STS_ENDPOINT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_STS_REGION;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_USER_AGENT_PREFIX;
-import static java.util.stream.Collectors.joining;
-
-public class TrinoS3ConfigurationInitializer
-        implements ConfigurationInitializer
-{
-    private final String awsAccessKey;
-    private final String awsSecretKey;
-    private final String endpoint;
-    private final String region;
-    private final TrinoS3StorageClass s3StorageClass;
-    private final TrinoS3SignerType signerType;
-    private final boolean pathStyleAccess;
-    private final String iamRole;
-    private final String externalId;
-    private final boolean sslEnabled;
-    private final boolean sseEnabled;
-    private final TrinoS3SseType sseType;
-    private final String encryptionMaterialsProvider;
-    private final String kmsKeyId;
-    private final String sseKmsKeyId;
-    private final int maxClientRetries;
-    private final int maxErrorRetries;
-    private final Duration maxBackoffTime;
-    private final Duration maxRetryTime;
-    private final Duration connectTimeout;
-    private final Optional<Duration> connectTtl;
-    private final Duration socketTimeout;
-    private final int maxConnections;
-    private final DataSize multipartMinFileSize;
-    private final DataSize multipartMinPartSize;
-    private final File stagingDirectory;
-    private final boolean pinClientToCurrentRegion;
-    private final String userAgentPrefix;
-    private final TrinoS3AclType aclType;
-    private final String signerClass;
-    private final boolean requesterPaysEnabled;
-    private final boolean skipGlacierObjects;
-    private final boolean s3StreamingUploadEnabled;
-    private final DataSize streamingPartSize;
-    private final String s3proxyHost;
-    private final int s3proxyPort;
-    private final TrinoS3Protocol s3ProxyProtocol;
-    private final List<String> s3nonProxyHosts;
-    private final String s3proxyUsername;
-    private final String s3proxyPassword;
-    private final boolean s3preemptiveBasicProxyAuth;
-    private final String s3StsEndpoint;
-    private final String s3StsRegion;
-
-    @Inject
-    public TrinoS3ConfigurationInitializer(HiveS3Config config)
-    {
-        this.awsAccessKey = config.getS3AwsAccessKey();
-        this.awsSecretKey = config.getS3AwsSecretKey();
-        this.endpoint = config.getS3Endpoint();
-        this.region = config.getS3Region();
-        this.s3StorageClass = config.getS3StorageClass();
-        this.signerType = config.getS3SignerType();
-        this.signerClass = config.getS3SignerClass();
-        this.pathStyleAccess = config.isS3PathStyleAccess();
-        this.iamRole = config.getS3IamRole();
-        this.externalId = config.getS3ExternalId();
-        this.sslEnabled = config.isS3SslEnabled();
-        this.sseEnabled = config.isS3SseEnabled();
-        this.sseType = config.getS3SseType();
-        this.encryptionMaterialsProvider = config.getS3EncryptionMaterialsProvider();
-        this.kmsKeyId = config.getS3KmsKeyId();
-        this.sseKmsKeyId = config.getS3SseKmsKeyId();
-        this.maxClientRetries = config.getS3MaxClientRetries();
-        this.maxErrorRetries = config.getS3MaxErrorRetries();
-        this.maxBackoffTime = config.getS3MaxBackoffTime();
-        this.maxRetryTime = config.getS3MaxRetryTime();
-        this.connectTimeout = config.getS3ConnectTimeout();
-        this.connectTtl = config.getS3ConnectTtl();
-        this.socketTimeout = config.getS3SocketTimeout();
-        this.maxConnections = config.getS3MaxConnections();
-        this.multipartMinFileSize = config.getS3MultipartMinFileSize();
-        this.multipartMinPartSize = config.getS3MultipartMinPartSize();
-        this.stagingDirectory = config.getS3StagingDirectory();
-        this.pinClientToCurrentRegion = config.isPinS3ClientToCurrentRegion();
-        this.userAgentPrefix = config.getS3UserAgentPrefix();
-        this.aclType = config.getS3AclType();
-        this.skipGlacierObjects = config.isSkipGlacierObjects();
-        this.requesterPaysEnabled = config.isRequesterPaysEnabled();
-        this.s3StreamingUploadEnabled = config.isS3StreamingUploadEnabled();
-        this.streamingPartSize = config.getS3StreamingPartSize();
-        this.s3proxyHost = config.getS3ProxyHost();
-        this.s3proxyPort = config.getS3ProxyPort();
-        this.s3ProxyProtocol = config.getS3ProxyProtocol();
-        this.s3nonProxyHosts = config.getS3NonProxyHosts();
-        this.s3proxyUsername = config.getS3ProxyUsername();
-        this.s3proxyPassword = config.getS3ProxyPassword();
-        this.s3preemptiveBasicProxyAuth = config.getS3PreemptiveBasicProxyAuth();
-        this.s3StsEndpoint = config.getS3StsEndpoint();
-        this.s3StsRegion = config.getS3StsRegion();
-    }
-
-    @Override
-    public void initializeConfiguration(Configuration config)
-    {
-        // re-map filesystem schemes to match Amazon Elastic MapReduce
-        config.set("fs.s3.impl", TrinoS3FileSystem.class.getName());
-        config.set("fs.s3a.impl", TrinoS3FileSystem.class.getName());
-        config.set("fs.s3n.impl", TrinoS3FileSystem.class.getName());
-
-        if (awsAccessKey != null) {
-            config.set(S3_ACCESS_KEY, awsAccessKey);
-        }
-        if (awsSecretKey != null) {
-            config.set(S3_SECRET_KEY, awsSecretKey);
-        }
-        if (endpoint != null) {
-            config.set(S3_ENDPOINT, endpoint);
-        }
-        if (region != null) {
-            config.set(S3_REGION, region);
-        }
-        config.set(S3_STORAGE_CLASS, s3StorageClass.name());
-        if (signerType != null) {
-            config.set(S3_SIGNER_TYPE, signerType.name());
-        }
-        if (signerClass != null) {
-            config.set(S3_SIGNER_CLASS, signerClass);
-        }
-        config.setBoolean(S3_PATH_STYLE_ACCESS, pathStyleAccess);
-        if (iamRole != null) {
-            config.set(S3_IAM_ROLE, iamRole);
-        }
-        if (externalId != null) {
-            config.set(S3_EXTERNAL_ID, externalId);
-        }
-        config.setBoolean(S3_SSL_ENABLED, sslEnabled);
-        config.setBoolean(S3_SSE_ENABLED, sseEnabled);
-        config.set(S3_SSE_TYPE, sseType.name());
-        if (encryptionMaterialsProvider != null) {
-            config.set(S3_ENCRYPTION_MATERIALS_PROVIDER, encryptionMaterialsProvider);
-        }
-        if (kmsKeyId != null) {
-            config.set(S3_KMS_KEY_ID, kmsKeyId);
-        }
-        if (sseKmsKeyId != null) {
-            config.set(S3_SSE_KMS_KEY_ID, sseKmsKeyId);
-        }
-        config.setInt(S3_MAX_CLIENT_RETRIES, maxClientRetries);
-        config.setInt(S3_MAX_ERROR_RETRIES, maxErrorRetries);
-        config.set(S3_MAX_BACKOFF_TIME, maxBackoffTime.toString());
-        config.set(S3_MAX_RETRY_TIME, maxRetryTime.toString());
-        config.set(S3_CONNECT_TIMEOUT, connectTimeout.toString());
-        connectTtl.ifPresent(duration -> config.set(S3_CONNECT_TTL, duration.toString()));
-        config.set(S3_SOCKET_TIMEOUT, socketTimeout.toString());
-        config.set(S3_STAGING_DIRECTORY, stagingDirectory.getPath());
-        config.setInt(S3_MAX_CONNECTIONS, maxConnections);
-        config.setLong(S3_MULTIPART_MIN_FILE_SIZE, multipartMinFileSize.toBytes());
-        config.setLong(S3_MULTIPART_MIN_PART_SIZE, multipartMinPartSize.toBytes());
-        config.setBoolean(S3_PIN_CLIENT_TO_CURRENT_REGION, pinClientToCurrentRegion);
-        config.set(S3_USER_AGENT_PREFIX, userAgentPrefix);
-        config.set(S3_ACL_TYPE, aclType.name());
-        config.setBoolean(S3_SKIP_GLACIER_OBJECTS, skipGlacierObjects);
-        config.setBoolean(S3_REQUESTER_PAYS_ENABLED, requesterPaysEnabled);
-        config.setBoolean(S3_STREAMING_UPLOAD_ENABLED, s3StreamingUploadEnabled);
-        config.setLong(S3_STREAMING_UPLOAD_PART_SIZE, streamingPartSize.toBytes());
-        if (s3proxyHost != null) {
-            config.set(S3_PROXY_HOST, s3proxyHost);
-        }
-        if (s3proxyPort > -1) {
-            config.setInt(S3_PROXY_PORT, s3proxyPort);
-        }
-        if (s3ProxyProtocol != null) {
-            config.set(S3_PROXY_PROTOCOL, s3ProxyProtocol.name());
-        }
-        if (s3nonProxyHosts != null) {
-            config.set(S3_NON_PROXY_HOSTS, s3nonProxyHosts.stream().collect(joining("|")));
-        }
-        if (s3proxyUsername != null) {
-            config.set(S3_PROXY_USERNAME, s3proxyUsername);
-        }
-        if (s3proxyPassword != null) {
-            config.set(S3_PROXY_PASSWORD, s3proxyPassword);
-        }
-        config.setBoolean(S3_PREEMPTIVE_BASIC_PROXY_AUTH, s3preemptiveBasicProxyAuth);
-        if (s3StsEndpoint != null) {
-            config.set(S3_STS_ENDPOINT, s3StsEndpoint);
-        }
-        if (s3StsRegion != null) {
-            config.set(S3_STS_REGION, s3StsRegion);
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/IonSqlQueryBuilder.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/IonSqlQueryBuilder.java
deleted file mode 100644
index 37f3648164ff..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/IonSqlQueryBuilder.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableList;
-import com.google.common.primitives.Shorts;
-import com.google.common.primitives.SignedBytes;
-import io.airlift.slice.Slice;
-import io.trino.plugin.hive.HiveColumnHandle;
-import io.trino.spi.TrinoException;
-import io.trino.spi.predicate.Domain;
-import io.trino.spi.predicate.Range;
-import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.Decimals;
-import io.trino.spi.type.Int128;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeManager;
-import io.trino.spi.type.VarcharType;
-import org.joda.time.format.DateTimeFormatter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_UNSUPPORTED_FORMAT;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.BooleanType.BOOLEAN;
-import static io.trino.spi.type.DateType.DATE;
-import static io.trino.spi.type.IntegerType.INTEGER;
-import static io.trino.spi.type.SmallintType.SMALLINT;
-import static io.trino.spi.type.TinyintType.TINYINT;
-import static java.lang.Math.toIntExact;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.TimeUnit.DAYS;
-import static java.util.stream.Collectors.joining;
-import static org.joda.time.chrono.ISOChronology.getInstanceUTC;
-import static org.joda.time.format.ISODateTimeFormat.date;
-
-/**
- * S3 Select uses Ion SQL++ query language. This class is used to construct a valid Ion SQL++ query
- * to be evaluated with S3 Select on an S3 object.
- */
-public class IonSqlQueryBuilder
-{
-    private static final DateTimeFormatter FORMATTER = date().withChronology(getInstanceUTC());
-    private static final String DATA_SOURCE = "S3Object s";
-    private final TypeManager typeManager;
-    private final S3SelectDataType s3SelectDataType;
-
-    public IonSqlQueryBuilder(TypeManager typeManager, S3SelectDataType s3SelectDataType)
-    {
-        this.typeManager = requireNonNull(typeManager, "typeManager is null");
-        this.s3SelectDataType = requireNonNull(s3SelectDataType, "s3SelectDataType is null");
-    }
-
-    public String buildSql(List<HiveColumnHandle> columns, TupleDomain<HiveColumnHandle> tupleDomain)
-    {
-        columns.forEach(column -> checkArgument(column.isBaseColumn(), "%s is not a base column", column));
-        tupleDomain.getDomains().ifPresent(domains -> {
-            domains.keySet().forEach(column -> checkArgument(column.isBaseColumn(), "%s is not a base column", column));
-        });
-
-        // SELECT clause
-        StringBuilder sql = new StringBuilder("SELECT ");
-
-        if (columns.isEmpty()) {
-            sql.append("' '");
-        }
-        else {
-            String columnNames = columns.stream()
-                    .map(this::getFullyQualifiedColumnName)
-                    .collect(joining(", "));
-            sql.append(columnNames);
-        }
-
-        // FROM clause
-        sql.append(" FROM ");
-        sql.append(DATA_SOURCE);
-
-        // WHERE clause
-        List<String> clauses = toConjuncts(columns, tupleDomain);
-        if (!clauses.isEmpty()) {
-            sql.append(" WHERE ")
-                    .append(Joiner.on(" AND ").join(clauses));
-        }
-
-        return sql.toString();
-    }
-
-    private String getFullyQualifiedColumnName(HiveColumnHandle column)
-    {
-        switch (s3SelectDataType) {
-            case JSON:
-                return format("s.%s", column.getBaseColumnName());
-            case CSV:
-                return format("s._%d", column.getBaseHiveColumnIndex() + 1);
-            default:
-                throw new TrinoException(HIVE_UNSUPPORTED_FORMAT, "Attempted to build SQL for unknown S3SelectDataType");
-        }
-    }
-
-    private List<String> toConjuncts(List<HiveColumnHandle> columns, TupleDomain<HiveColumnHandle> tupleDomain)
-    {
-        ImmutableList.Builder<String> builder = ImmutableList.builder();
-        for (HiveColumnHandle column : columns) {
-            Type type = column.getHiveType().getType(typeManager);
-            if (tupleDomain.getDomains().isPresent() && isSupported(type)) {
-                Domain domain = tupleDomain.getDomains().get().get(column);
-                if (domain != null) {
-                    builder.add(toPredicate(domain, type, column));
-                }
-            }
-        }
-        return builder.build();
-    }
-
-    private static boolean isSupported(Type type)
-    {
-        Type validType = requireNonNull(type, "type is null");
-        return validType.equals(BIGINT) ||
-                validType.equals(TINYINT) ||
-                validType.equals(SMALLINT) ||
-                validType.equals(INTEGER) ||
-                validType instanceof DecimalType ||
-                validType.equals(BOOLEAN) ||
-                validType.equals(DATE) ||
-                validType instanceof VarcharType;
-    }
-
-    private String toPredicate(Domain domain, Type type, HiveColumnHandle column)
-    {
-        checkArgument(domain.getType().isOrderable(), "Domain type must be orderable");
-
-        if (domain.getValues().isNone()) {
-            if (domain.isNullAllowed()) {
-                return getFullyQualifiedColumnName(column) + " = '' ";
-            }
-            return "FALSE";
-        }
-
-        if (domain.getValues().isAll()) {
-            if (domain.isNullAllowed()) {
-                return "TRUE";
-            }
-            return getFullyQualifiedColumnName(column) + " <> '' ";
-        }
-
-        List<String> disjuncts = new ArrayList<>();
-        List<Object> singleValues = new ArrayList<>();
-        for (Range range : domain.getValues().getRanges().getOrderedRanges()) {
-            checkState(!range.isAll());
-            if (range.isSingleValue()) {
-                singleValues.add(range.getSingleValue());
-                continue;
-            }
-            List<String> rangeConjuncts = new ArrayList<>();
-            if (!range.isLowUnbounded()) {
-                rangeConjuncts.add(toPredicate(range.isLowInclusive() ? ">=" : ">", range.getLowBoundedValue(), type, column));
-            }
-            if (!range.isHighUnbounded()) {
-                rangeConjuncts.add(toPredicate(range.isHighInclusive() ? "<=" : "<", range.getHighBoundedValue(), type, column));
-            }
-            // If rangeConjuncts is null, then the range was ALL, which should already have been checked for
-            checkState(!rangeConjuncts.isEmpty());
-            disjuncts.add("(" + Joiner.on(" AND ").join(rangeConjuncts) + ")");
-        }
-
-        // Add back all of the possible single values either as an equality or an IN predicate
-        if (singleValues.size() == 1) {
-            disjuncts.add(toPredicate("=", getOnlyElement(singleValues), type, column));
-        }
-        else if (singleValues.size() > 1) {
-            List<String> values = new ArrayList<>();
-            for (Object value : singleValues) {
-                checkType(type);
-                values.add(valueToQuery(type, value));
-            }
-            disjuncts.add(createColumn(type, column) + " IN (" + Joiner.on(",").join(values) + ")");
-        }
-
-        // Add nullability disjuncts
-        checkState(!disjuncts.isEmpty());
-        if (domain.isNullAllowed()) {
-            disjuncts.add(getFullyQualifiedColumnName(column) + " = '' ");
-        }
-
-        return "(" + Joiner.on(" OR ").join(disjuncts) + ")";
-    }
-
-    private String toPredicate(String operator, Object value, Type type, HiveColumnHandle column)
-    {
-        checkType(type);
-
-        return format("%s %s %s", createColumn(type, column), operator, valueToQuery(type, value));
-    }
-
-    private static void checkType(Type type)
-    {
-        checkArgument(isSupported(type), "Type not supported: %s", type);
-    }
-
-    private static String valueToQuery(Type type, Object value)
-    {
-        if (type.equals(BIGINT)) {
-            return String.valueOf((long) value);
-        }
-        if (type.equals(INTEGER)) {
-            return String.valueOf(toIntExact((long) value));
-        }
-        if (type.equals(SMALLINT)) {
-            return String.valueOf(Shorts.checkedCast((long) value));
-        }
-        if (type.equals(TINYINT)) {
-            return String.valueOf(SignedBytes.checkedCast((long) value));
-        }
-        if (type.equals(BOOLEAN)) {
-            return String.valueOf((boolean) value);
-        }
-        if (type.equals(DATE)) {
-            return "`" + FORMATTER.print(DAYS.toMillis((long) value)) + "`";
-        }
-        if (type.equals(VarcharType.VARCHAR)) {
-            return "'" + ((Slice) value).toStringUtf8() + "'";
-        }
-        if (type instanceof DecimalType decimalType) {
-            if (!decimalType.isShort()) {
-                return Decimals.toString((Int128) value, decimalType.getScale());
-            }
-            return Decimals.toString((long) value, decimalType.getScale());
-        }
-        return "'" + ((Slice) value).toStringUtf8() + "'";
-    }
-
-    private String createColumn(Type type, HiveColumnHandle columnHandle)
-    {
-        String column = getFullyQualifiedColumnName(columnHandle);
-
-        if (type.equals(BIGINT) || type.equals(INTEGER) || type.equals(SMALLINT) || type.equals(TINYINT)) {
-            return formatPredicate(column, "INT");
-        }
-        if (type.equals(BOOLEAN)) {
-            return formatPredicate(column, "BOOL");
-        }
-        if (type.equals(DATE)) {
-            return formatPredicate(column, "TIMESTAMP");
-        }
-        if (type instanceof DecimalType decimalType) {
-            return formatPredicate(column, format("DECIMAL(%s,%s)", decimalType.getPrecision(), decimalType.getScale()));
-        }
-        return column;
-    }
-
-    private String formatPredicate(String column, String type)
-    {
-        return format("case %s when '' then null else CAST(%s AS %s) end", column, column, type);
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectDataType.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectDataType.java
deleted file mode 100644
index 70872574d5db..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectDataType.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-public enum S3SelectDataType {
-    CSV,
-    JSON
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectLineRecordReader.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectLineRecordReader.java
deleted file mode 100644
index 3fea0afb33f9..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectLineRecordReader.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.amazonaws.AbortedException;
-import com.amazonaws.services.s3.model.AmazonS3Exception;
-import com.amazonaws.services.s3.model.CompressionType;
-import com.amazonaws.services.s3.model.InputSerialization;
-import com.amazonaws.services.s3.model.OutputSerialization;
-import com.amazonaws.services.s3.model.ScanRange;
-import com.amazonaws.services.s3.model.SelectObjectContentRequest;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.io.Closer;
-import io.airlift.units.Duration;
-import io.trino.plugin.hive.s3.HiveS3Config;
-import io.trino.plugin.hive.s3.TrinoS3FileSystem;
-import io.trino.spi.TrinoException;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.LongWritable;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.compress.BZip2Codec;
-import org.apache.hadoop.io.compress.CompressionCodec;
-import org.apache.hadoop.io.compress.CompressionCodecFactory;
-import org.apache.hadoop.io.compress.GzipCodec;
-import org.apache.hadoop.mapred.RecordReader;
-import org.apache.hadoop.util.LineReader;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.util.Properties;
-
-import static com.amazonaws.services.s3.model.ExpressionType.SQL;
-import static com.google.common.base.Throwables.throwIfInstanceOf;
-import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MAX_BACKOFF_TIME;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MAX_CLIENT_RETRIES;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MAX_RETRY_TIME;
-import static io.trino.plugin.hive.util.RetryDriver.retry;
-import static io.trino.plugin.hive.util.SerdeConstants.LINE_DELIM;
-import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
-import static java.lang.String.format;
-import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
-import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
-import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
-import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-@ThreadSafe
-public abstract class S3SelectLineRecordReader
-        implements RecordReader<LongWritable, Text>
-{
-    private InputStream selectObjectContent;
-    private long processedRecords;
-    private long recordsFromS3;
-    private long position;
-    private LineReader reader;
-    private boolean isFirstLine;
-    private static final Duration BACKOFF_MIN_SLEEP = new Duration(1, SECONDS);
-    private final TrinoS3SelectClient selectClient;
-    private final long start;
-    private final long end;
-    private final int maxAttempts;
-    private final Duration maxBackoffTime;
-    private final Duration maxRetryTime;
-    private final Closer closer = Closer.create();
-    private final SelectObjectContentRequest selectObjectContentRequest;
-    private final CompressionCodecFactory compressionCodecFactory;
-    private final String lineDelimiter;
-    private final Properties schema;
-    private final CompressionType compressionType;
-
-    public S3SelectLineRecordReader(
-            Configuration configuration,
-            Path path,
-            long start,
-            long length,
-            Properties schema,
-            String ionSqlQuery,
-            TrinoS3ClientFactory s3ClientFactory)
-    {
-        requireNonNull(configuration, "configuration is null");
-        requireNonNull(schema, "schema is null");
-        requireNonNull(path, "path is null");
-        requireNonNull(ionSqlQuery, "ionSqlQuery is null");
-        requireNonNull(s3ClientFactory, "s3ClientFactory is null");
-        this.lineDelimiter = (schema).getProperty(LINE_DELIM, "\n");
-        this.processedRecords = 0;
-        this.recordsFromS3 = 0;
-        this.start = start;
-        this.position = this.start;
-        this.end = this.start + length;
-        this.isFirstLine = true;
-
-        this.compressionCodecFactory = new CompressionCodecFactory(configuration);
-        this.compressionType = getCompressionType(path);
-        this.schema = schema;
-        this.selectObjectContentRequest = buildSelectObjectRequest(ionSqlQuery, path);
-
-        HiveS3Config defaults = new HiveS3Config();
-        this.maxAttempts = configuration.getInt(S3_MAX_CLIENT_RETRIES, defaults.getS3MaxClientRetries()) + 1;
-        this.maxBackoffTime = Duration.valueOf(configuration.get(S3_MAX_BACKOFF_TIME, defaults.getS3MaxBackoffTime().toString()));
-        this.maxRetryTime = Duration.valueOf(configuration.get(S3_MAX_RETRY_TIME, defaults.getS3MaxRetryTime().toString()));
-
-        this.selectClient = new TrinoS3SelectClient(configuration, s3ClientFactory);
-        closer.register(selectClient);
-    }
-
-    protected abstract InputSerialization buildInputSerialization();
-
-    protected abstract OutputSerialization buildOutputSerialization();
-
-    protected abstract boolean shouldEnableScanRange();
-
-    protected Properties getSchema()
-    {
-        return schema;
-    }
-
-    protected CompressionType getCompressionType()
-    {
-        return compressionType;
-    }
-
-    public SelectObjectContentRequest buildSelectObjectRequest(String query, Path path)
-    {
-        SelectObjectContentRequest selectObjectRequest = new SelectObjectContentRequest();
-        URI uri = path.toUri();
-        selectObjectRequest.setBucketName(TrinoS3FileSystem.extractBucketName(uri));
-        selectObjectRequest.setKey(TrinoS3FileSystem.keyFromPath(path));
-        selectObjectRequest.setExpression(query);
-        selectObjectRequest.setExpressionType(SQL);
-
-        InputSerialization selectObjectInputSerialization = buildInputSerialization();
-        selectObjectRequest.setInputSerialization(selectObjectInputSerialization);
-
-        OutputSerialization selectObjectOutputSerialization = buildOutputSerialization();
-        selectObjectRequest.setOutputSerialization(selectObjectOutputSerialization);
-
-        if (shouldEnableScanRange()) {
-            ScanRange scanRange = new ScanRange();
-            scanRange.setStart(getStart());
-            scanRange.setEnd(getEnd());
-            selectObjectRequest.setScanRange(scanRange);
-        }
-
-        return selectObjectRequest;
-    }
-
-    protected CompressionType getCompressionType(Path path)
-    {
-        CompressionCodec codec = compressionCodecFactory.getCodec(path);
-        if (codec == null) {
-            return CompressionType.NONE;
-        }
-        if (codec instanceof GzipCodec) {
-            return CompressionType.GZIP;
-        }
-        if (codec instanceof BZip2Codec) {
-            return CompressionType.BZIP2;
-        }
-        throw new TrinoException(NOT_SUPPORTED, "Compression extension not supported for S3 Select: " + path);
-    }
-
-    private int readLine(Text value)
-            throws IOException
-    {
-        try {
-            return retry()
-                    .maxAttempts(maxAttempts)
-                    .exponentialBackoff(BACKOFF_MIN_SLEEP, maxBackoffTime, maxRetryTime, 2.0)
-                    .stopOn(InterruptedException.class, UnrecoverableS3OperationException.class, AbortedException.class)
-                    .run("readRecordsContentStream", () -> {
-                        if (isFirstLine) {
-                            recordsFromS3 = 0;
-                            selectObjectContent = selectClient.getRecordsContent(selectObjectContentRequest);
-                            closer.register(selectObjectContent);
-                            reader = new LineReader(selectObjectContent, lineDelimiter.getBytes(StandardCharsets.UTF_8));
-                            closer.register(reader);
-                            isFirstLine = false;
-                        }
-                        try {
-                            return reader.readLine(value);
-                        }
-                        catch (RuntimeException e) {
-                            isFirstLine = true;
-                            recordsFromS3 = 0;
-                            if (e instanceof AmazonS3Exception) {
-                                switch (((AmazonS3Exception) e).getStatusCode()) {
-                                    case HTTP_FORBIDDEN:
-                                    case HTTP_NOT_FOUND:
-                                    case HTTP_BAD_REQUEST:
-                                        throw new UnrecoverableS3OperationException(selectClient.getBucketName(), selectClient.getKeyName(), e);
-                                }
-                            }
-                            throw e;
-                        }
-                    });
-        }
-        catch (InterruptedException | AbortedException e) {
-            Thread.currentThread().interrupt();
-            throw new InterruptedIOException();
-        }
-        catch (Exception e) {
-            throwIfInstanceOf(e, IOException.class);
-            throwIfUnchecked(e);
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public synchronized boolean next(LongWritable key, Text value)
-            throws IOException
-    {
-        while (true) {
-            int bytes = readLine(value);
-            if (bytes <= 0) {
-                if (!selectClient.isRequestComplete()) {
-                    throw new IOException("S3 Select request was incomplete as End Event was not received");
-                }
-                return false;
-            }
-            recordsFromS3++;
-            if (recordsFromS3 > processedRecords) {
-                position += bytes;
-                processedRecords++;
-                key.set(processedRecords);
-                return true;
-            }
-        }
-    }
-
-    @Override
-    public LongWritable createKey()
-    {
-        return new LongWritable();
-    }
-
-    @Override
-    public Text createValue()
-    {
-        return new Text();
-    }
-
-    @Override
-    public long getPos()
-    {
-        return position;
-    }
-
-    @Override
-    public void close()
-            throws IOException
-    {
-        closer.close();
-    }
-
-    @Override
-    public float getProgress()
-    {
-        return ((float) (position - start)) / (end - start);
-    }
-
-    /**
-     * This exception is for stopping retries for S3 Select calls that shouldn't be retried.
-     * For example, "Caused by: com.amazonaws.services.s3.model.AmazonS3Exception: Forbidden (Service: Amazon S3; Status Code: 403 ..."
-     */
-    @VisibleForTesting
-    static class UnrecoverableS3OperationException
-            extends RuntimeException
-    {
-        public UnrecoverableS3OperationException(String bucket, String key, Throwable cause)
-        {
-            // append bucket and key to the message
-            super(format("%s (Bucket: %s, Key: %s)", cause, bucket, key));
-        }
-    }
-
-    protected long getStart()
-    {
-        return start;
-    }
-
-    protected long getEnd()
-    {
-        return end;
-    }
-
-    protected String getLineDelimiter()
-    {
-        return lineDelimiter;
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectLineRecordReaderProvider.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectLineRecordReaderProvider.java
deleted file mode 100644
index 49221c398280..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectLineRecordReaderProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import io.trino.plugin.hive.s3select.csv.S3SelectCsvRecordReader;
-import io.trino.plugin.hive.s3select.json.S3SelectJsonRecordReader;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-
-import java.util.Optional;
-import java.util.Properties;
-
-/**
- * Returns an S3SelectLineRecordReader based on the serDe class. It supports CSV and JSON formats, and
- * will not push down any other formats.
- */
-public class S3SelectLineRecordReaderProvider
-{
-    private S3SelectLineRecordReaderProvider() {}
-
-    public static Optional<S3SelectLineRecordReader> get(Configuration configuration,
-                                                  Path path,
-                                                  long start,
-                                                  long length,
-                                                  Properties schema,
-                                                  String ionSqlQuery,
-                                                  TrinoS3ClientFactory s3ClientFactory,
-                                                  S3SelectDataType dataType)
-    {
-        switch (dataType) {
-            case CSV:
-                return Optional.of(new S3SelectCsvRecordReader(configuration, path, start, length, schema, ionSqlQuery, s3ClientFactory));
-            case JSON:
-                return Optional.of(new S3SelectJsonRecordReader(configuration, path, start, length, schema, ionSqlQuery, s3ClientFactory));
-            default:
-                // return empty if data type is not returned by the serDeMapper or unrecognizable by the LineRecordReader
-                return Optional.empty();
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectPushdown.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectPushdown.java
deleted file mode 100644
index 664a3389eeb5..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectPushdown.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.google.common.collect.ImmutableSet;
-import io.trino.plugin.hive.metastore.Column;
-import io.trino.plugin.hive.metastore.Partition;
-import io.trino.plugin.hive.metastore.Table;
-import io.trino.plugin.hive.type.DecimalTypeInfo;
-import io.trino.spi.connector.ConnectorSession;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.compress.BZip2Codec;
-import org.apache.hadoop.io.compress.GzipCodec;
-import org.apache.hadoop.mapred.InputFormat;
-import org.apache.hadoop.mapred.TextInputFormat;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.Set;
-
-import static io.trino.plugin.hive.HiveMetadata.SKIP_FOOTER_COUNT_KEY;
-import static io.trino.plugin.hive.HiveMetadata.SKIP_HEADER_COUNT_KEY;
-import static io.trino.plugin.hive.HiveSessionProperties.isS3SelectPushdownEnabled;
-import static io.trino.plugin.hive.metastore.MetastoreUtil.getHiveSchema;
-import static io.trino.plugin.hive.s3select.S3SelectSerDeDataTypeMapper.getDataType;
-import static io.trino.plugin.hive.util.HiveClassNames.TEXT_INPUT_FORMAT_CLASS;
-import static io.trino.plugin.hive.util.HiveUtil.getCompressionCodec;
-import static io.trino.plugin.hive.util.HiveUtil.getDeserializerClassName;
-import static io.trino.plugin.hive.util.HiveUtil.getInputFormatName;
-import static java.util.Objects.requireNonNull;
-
-/**
- * S3SelectPushdown uses Amazon S3 Select to push down queries to Amazon S3. This allows Presto to retrieve only a
- * subset of data rather than retrieving the full S3 object thus improving Presto query performance.
- */
-public final class S3SelectPushdown
-{
-    private static final Set<String> SUPPORTED_S3_PREFIXES = ImmutableSet.of("s3://", "s3a://", "s3n://");
-
-    /*
-     * Double and Real Types lose precision. Thus, they are not pushed down to S3. Please use Decimal Type if push down is desired.
-     *
-     * When S3 select support was added, Trino did not properly implement TIMESTAMP semantic. This was fixed in 2020, and TIMESTAMPS may be supportable now
-     * (https://github.com/trinodb/trino/issues/10962). Pushing down timestamps to s3select maybe still be problematic due to ION SQL comparing timestamps
-     * using precision.  This means timestamps with different precisions are not equal even actually they present the same instant of time.
-     */
-    private static final Set<String> SUPPORTED_COLUMN_TYPES = ImmutableSet.of(
-            "boolean",
-            "int",
-            "tinyint",
-            "smallint",
-            "bigint",
-            "string",
-            "decimal",
-            "date");
-
-    private S3SelectPushdown() {}
-
-    private static boolean isSerDeSupported(Properties schema)
-    {
-        String serdeName = getDeserializerClassName(schema);
-        return S3SelectSerDeDataTypeMapper.doesSerDeExist(serdeName);
-    }
-
-    private static boolean isInputFormatSupported(Properties schema)
-    {
-        String inputFormat = getInputFormatName(schema);
-
-        if (TEXT_INPUT_FORMAT_CLASS.equals(inputFormat)) {
-            if (!Objects.equals(schema.getProperty(SKIP_HEADER_COUNT_KEY, "0"), "0")) {
-                // S3 Select supports skipping one line of headers, but it was returning incorrect results for trino-hive-hadoop2/conf/files/test_table_with_header.csv.gz
-                // TODO https://github.com/trinodb/trino/issues/2349
-                return false;
-            }
-            if (!Objects.equals(schema.getProperty(SKIP_FOOTER_COUNT_KEY, "0"), "0")) {
-                // S3 Select does not support skipping footers
-                return false;
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    public static boolean isCompressionCodecSupported(InputFormat<?, ?> inputFormat, Path path)
-    {
-        if (inputFormat instanceof TextInputFormat textInputFormat) {
-            // S3 Select supports the following formats: uncompressed, GZIP and BZIP2.
-            return getCompressionCodec(textInputFormat, path)
-                    .map(codec -> (codec instanceof GzipCodec) || (codec instanceof BZip2Codec))
-                    .orElse(true);
-        }
-
-        return false;
-    }
-
-    public static boolean isSplittable(boolean s3SelectPushdownEnabled,
-                                       Properties schema,
-                                       InputFormat<?, ?> inputFormat,
-                                       Path path)
-    {
-        if (!s3SelectPushdownEnabled) {
-            return true;
-        }
-
-        if (isUncompressed(inputFormat, path)) {
-            return getDataType(getDeserializerClassName(schema)).isPresent();
-        }
-
-        return false;
-    }
-
-    private static boolean isUncompressed(InputFormat<?, ?> inputFormat, Path path)
-    {
-        if (inputFormat instanceof TextInputFormat textInputFormat) {
-            // S3 Select supports splitting uncompressed files
-            return getCompressionCodec(textInputFormat, path).isEmpty();
-        }
-
-        return false;
-    }
-
-    private static boolean areColumnTypesSupported(List<Column> columns)
-    {
-        requireNonNull(columns, "columns is null");
-
-        if (columns.isEmpty()) {
-            return false;
-        }
-
-        for (Column column : columns) {
-            String type = column.getType().getHiveTypeName().toString();
-            if (column.getType().getTypeInfo() instanceof DecimalTypeInfo) {
-                // skip precision and scale when check decimal type
-                type = "decimal";
-            }
-            if (!SUPPORTED_COLUMN_TYPES.contains(type)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private static boolean isS3Storage(String path)
-    {
-        return SUPPORTED_S3_PREFIXES.stream().anyMatch(path::startsWith);
-    }
-
-    public static boolean shouldEnablePushdownForTable(ConnectorSession session, Table table, String path, Optional<Partition> optionalPartition)
-    {
-        if (!isS3SelectPushdownEnabled(session)) {
-            return false;
-        }
-
-        if (path == null) {
-            return false;
-        }
-
-        // Hive table partitions could be on different storages,
-        // as a result, we have to check each individual optionalPartition
-        Properties schema = optionalPartition
-                .map(partition -> getHiveSchema(partition, table))
-                .orElseGet(() -> getHiveSchema(table));
-        return shouldEnablePushdownForTable(table, path, schema);
-    }
-
-    private static boolean shouldEnablePushdownForTable(Table table, String path, Properties schema)
-    {
-        return isS3Storage(path) &&
-                isSerDeSupported(schema) &&
-                isInputFormatSupported(schema) &&
-                areColumnTypesSupported(table.getDataColumns());
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectRecordCursor.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectRecordCursor.java
deleted file mode 100644
index 5525ecf68aca..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectRecordCursor.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.google.common.annotations.VisibleForTesting;
-import io.trino.plugin.hive.GenericHiveRecordCursor;
-import io.trino.plugin.hive.HiveColumnHandle;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.mapred.RecordReader;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static io.trino.plugin.hive.util.SerdeConstants.LIST_COLUMNS;
-import static io.trino.plugin.hive.util.SerdeConstants.LIST_COLUMN_TYPES;
-import static io.trino.plugin.hive.util.SerdeConstants.SERIALIZATION_DDL;
-import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toList;
-
-class S3SelectRecordCursor<K, V extends Writable>
-        extends GenericHiveRecordCursor<K, V>
-{
-    private static final String THRIFT_STRUCT = "struct";
-    private static final String START_STRUCT = "{";
-    private static final String END_STRUCT = "}";
-    private static final String FIELD_SEPARATOR = ",";
-
-    public S3SelectRecordCursor(
-            Configuration configuration,
-            Path path,
-            RecordReader<K, V> recordReader,
-            long totalBytes,
-            Properties splitSchema,
-            List<HiveColumnHandle> columns)
-    {
-        super(configuration, path, recordReader, totalBytes, updateSplitSchema(splitSchema, columns), columns);
-    }
-
-    // since s3select only returns the required column, not the whole columns
-    // we need to update the split schema to include only the required columns
-    // otherwise, Serde could not deserialize output from s3select to row data correctly
-    @VisibleForTesting
-    static Properties updateSplitSchema(Properties splitSchema, List<HiveColumnHandle> columns)
-    {
-        requireNonNull(splitSchema, "splitSchema is null");
-        requireNonNull(columns, "columns is null");
-        // clone split properties for update so as not to affect the original one
-        Properties updatedSchema = new Properties();
-        updatedSchema.putAll(splitSchema);
-        updatedSchema.setProperty(LIST_COLUMNS, buildColumns(columns));
-        updatedSchema.setProperty(LIST_COLUMN_TYPES, buildColumnTypes(columns));
-        ThriftTable thriftTable = parseThriftDdl(splitSchema.getProperty(SERIALIZATION_DDL));
-        updatedSchema.setProperty(SERIALIZATION_DDL,
-                thriftTableToDdl(pruneThriftTable(thriftTable, columns)));
-        return updatedSchema;
-    }
-
-    private static String buildColumns(List<HiveColumnHandle> columns)
-    {
-        if (columns == null || columns.isEmpty()) {
-            return "";
-        }
-        return columns.stream()
-                .map(HiveColumnHandle::getName)
-                .collect(Collectors.joining(","));
-    }
-
-    private static String buildColumnTypes(List<HiveColumnHandle> columns)
-    {
-        if (columns == null || columns.isEmpty()) {
-            return "";
-        }
-        return columns.stream()
-                .map(column -> column.getHiveType().getTypeInfo().getTypeName())
-                .collect(Collectors.joining(","));
-    }
-
-    /**
-     * Parse Thrift description of a table schema. Examples:
-     * <ul>
-     * <li><code>struct article { varchar article varchar author date date_pub int quantity}</code></li>
-     * <li><code>struct article { varchar article, varchar author, date date_pub, int quantity }</code></li>
-     * <li><code>struct article { varchar article, varchar author, date date_pub, int quantity}</code></li>
-     * </ul>
-     */
-    private static ThriftTable parseThriftDdl(String ddl)
-    {
-        if (isNullOrEmpty(ddl)) {
-            return null;
-        }
-        String[] parts = ddl.trim().split("\\s+");
-        checkArgument(parts.length >= 5, "Invalid Thrift DDL %s", ddl);
-        checkArgument(THRIFT_STRUCT.equals(parts[0]), "Thrift DDL should start with %s", THRIFT_STRUCT);
-        ThriftTable thriftTable = new ThriftTable();
-        thriftTable.setTableName(parts[1]);
-        checkArgument(START_STRUCT.equals(parts[2]), "Invalid Thrift DDL %s", ddl);
-        checkArgument(parts[parts.length - 1].endsWith(END_STRUCT), "Invalid Thrift DDL %s", ddl);
-        String lastColumnNameWithEndStruct = parts[parts.length - 1];
-        parts[parts.length - 1] = lastColumnNameWithEndStruct.substring(0, lastColumnNameWithEndStruct.length() - 1);
-        List<ThriftField> fields = new ArrayList<>();
-        for (int i = 3; i < parts.length - 1; i += 2) {
-            ThriftField thriftField = new ThriftField();
-            thriftField.setType(parts[i]);
-            String columnNameWithFieldSeparator = parts[i + 1];
-            if (columnNameWithFieldSeparator.endsWith(FIELD_SEPARATOR)) {
-                parts[i + 1] = columnNameWithFieldSeparator.substring(0, columnNameWithFieldSeparator.length() - 1);
-            }
-            thriftField.setName(parts[i + 1]);
-            fields.add(thriftField);
-        }
-        thriftTable.setFields(fields);
-
-        return thriftTable;
-    }
-
-    private static ThriftTable pruneThriftTable(ThriftTable thriftTable, List<HiveColumnHandle> columns)
-    {
-        if (thriftTable == null) {
-            return null;
-        }
-        List<ThriftField> fields = thriftTable.getFields();
-        if (fields == null || fields.isEmpty()) {
-            return thriftTable;
-        }
-        Set<String> columnNames = columns.stream()
-                .map(HiveColumnHandle::getName)
-                .collect(toImmutableSet());
-        List<ThriftField> filteredFields = fields.stream()
-                .filter(field -> columnNames.contains(field.getName()))
-                .collect(toList());
-        thriftTable.setFields(filteredFields);
-
-        return thriftTable;
-    }
-
-    private static String thriftTableToDdl(ThriftTable thriftTable)
-    {
-        if (thriftTable == null) {
-            return "";
-        }
-        List<ThriftField> fields = thriftTable.getFields();
-        if (fields == null || fields.isEmpty()) {
-            return "";
-        }
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(THRIFT_STRUCT)
-                .append(" ")
-                .append(thriftTable.getTableName())
-                .append(" ")
-                .append(START_STRUCT);
-        stringBuilder.append(fields.stream()
-                .map(field -> " " + field.getType() + " " + field.getName())
-                .collect(Collectors.joining(",")));
-        stringBuilder.append(END_STRUCT);
-
-        return stringBuilder.toString();
-    }
-
-    private static class ThriftField
-    {
-        private String type;
-        private String name;
-
-        private String getType()
-        {
-            return type;
-        }
-
-        private void setType(String type)
-        {
-            checkArgument(!isNullOrEmpty(type), "type is null or empty string");
-            this.type = type;
-        }
-
-        private String getName()
-        {
-            return name;
-        }
-
-        private void setName(String name)
-        {
-            requireNonNull(name, "name is null");
-            this.name = name;
-        }
-    }
-
-    private static class ThriftTable
-    {
-        private String tableName;
-        private List<ThriftField> fields;
-
-        private String getTableName()
-        {
-            return tableName;
-        }
-
-        private void setTableName(String tableName)
-        {
-            checkArgument(!isNullOrEmpty(tableName), "tableName is null or empty string");
-            this.tableName = tableName;
-        }
-
-        private List<ThriftField> getFields()
-        {
-            return fields;
-        }
-
-        private void setFields(List<ThriftField> fields)
-        {
-            requireNonNull(fields, "fields is null");
-            this.fields = fields;
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectRecordCursorProvider.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectRecordCursorProvider.java
deleted file mode 100644
index 355b56385290..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectRecordCursorProvider.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import io.trino.hdfs.HdfsEnvironment;
-import io.trino.plugin.hive.HiveColumnHandle;
-import io.trino.plugin.hive.HiveRecordCursorProvider;
-import io.trino.plugin.hive.ReaderColumns;
-import io.trino.plugin.hive.type.TypeInfo;
-import io.trino.spi.TrinoException;
-import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-
-import javax.inject.Inject;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.Set;
-import java.util.function.Function;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
-import static io.trino.plugin.hive.HivePageSourceProvider.projectBaseColumns;
-import static io.trino.plugin.hive.type.TypeInfoUtils.getTypeInfosFromTypeString;
-import static io.trino.plugin.hive.util.HiveUtil.getDeserializerClassName;
-import static io.trino.plugin.hive.util.SerdeConstants.COLUMN_NAME_DELIMITER;
-import static io.trino.plugin.hive.util.SerdeConstants.LIST_COLUMNS;
-import static io.trino.plugin.hive.util.SerdeConstants.LIST_COLUMN_TYPES;
-import static java.util.Objects.requireNonNull;
-
-public class S3SelectRecordCursorProvider
-        implements HiveRecordCursorProvider
-{
-    private final HdfsEnvironment hdfsEnvironment;
-    private final TrinoS3ClientFactory s3ClientFactory;
-
-    @Inject
-    public S3SelectRecordCursorProvider(HdfsEnvironment hdfsEnvironment, TrinoS3ClientFactory s3ClientFactory)
-    {
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
-        this.s3ClientFactory = requireNonNull(s3ClientFactory, "s3ClientFactory is null");
-    }
-
-    @Override
-    public Optional<ReaderRecordCursorWithProjections> createRecordCursor(
-            Configuration configuration,
-            ConnectorSession session,
-            Path path,
-            long start,
-            long length,
-            long fileSize,
-            Properties schema,
-            List<HiveColumnHandle> columns,
-            TupleDomain<HiveColumnHandle> effectivePredicate,
-            TypeManager typeManager,
-            boolean s3SelectPushdownEnabled)
-    {
-        if (!s3SelectPushdownEnabled) {
-            return Optional.empty();
-        }
-
-        try {
-            this.hdfsEnvironment.getFileSystem(session.getIdentity(), path, configuration);
-        }
-        catch (IOException e) {
-            throw new TrinoException(HIVE_FILESYSTEM_ERROR, "Failed getting FileSystem: " + path, e);
-        }
-
-        Optional<ReaderColumns> projectedReaderColumns = projectBaseColumns(columns);
-        // Ignore predicates on partial columns for now.
-        effectivePredicate = effectivePredicate.filter((column, domain) -> column.isBaseColumn());
-
-        List<HiveColumnHandle> readerColumns = projectedReaderColumns
-                .map(readColumns -> readColumns.get().stream().map(HiveColumnHandle.class::cast).collect(toImmutableList()))
-                .orElseGet(() -> ImmutableList.copyOf(columns));
-        // Query is not going to filter any data, no need to use S3 Select
-        if (!hasFilters(schema, effectivePredicate, readerColumns)) {
-            return Optional.empty();
-        }
-
-        String serdeName = getDeserializerClassName(schema);
-        Optional<S3SelectDataType> s3SelectDataTypeOptional = S3SelectSerDeDataTypeMapper.getDataType(serdeName);
-
-        if (s3SelectDataTypeOptional.isPresent()) {
-            S3SelectDataType s3SelectDataType = s3SelectDataTypeOptional.get();
-
-            IonSqlQueryBuilder queryBuilder = new IonSqlQueryBuilder(typeManager, s3SelectDataType);
-            String ionSqlQuery = queryBuilder.buildSql(readerColumns, effectivePredicate);
-            Optional<S3SelectLineRecordReader> recordReader = S3SelectLineRecordReaderProvider.get(configuration, path, start, length, schema,
-                    ionSqlQuery, s3ClientFactory, s3SelectDataType);
-
-            if (recordReader.isEmpty()) {
-                // S3 Select data type is not mapped to an S3SelectLineRecordReader
-                return Optional.empty();
-            }
-
-            RecordCursor cursor = new S3SelectRecordCursor<>(configuration, path, recordReader.get(), length, schema, readerColumns);
-            return Optional.of(new ReaderRecordCursorWithProjections(cursor, projectedReaderColumns));
-        }
-        // unsupported serdes
-        return Optional.empty();
-    }
-
-    private static boolean hasFilters(
-            Properties schema,
-            TupleDomain<HiveColumnHandle> effectivePredicate,
-            List<HiveColumnHandle> readerColumns)
-    {
-        //There are no effective predicates and readercolumns and columntypes are identical to schema
-        //means getting all data out of S3. We can use S3 GetObject instead of S3 SelectObjectContent in these cases.
-        if (effectivePredicate.isAll()) {
-            return !isEquivalentSchema(readerColumns, schema);
-        }
-        return true;
-    }
-
-    private static boolean isEquivalentSchema(List<HiveColumnHandle> readerColumns, Properties schema)
-    {
-        Set<String> projectedColumnNames = getColumnProperty(readerColumns, HiveColumnHandle::getName);
-        Set<String> projectedColumnTypes = getColumnProperty(readerColumns, column -> column.getHiveType().getTypeInfo().getTypeName());
-        return isEquivalentColumns(projectedColumnNames, schema) && isEquivalentColumnTypes(projectedColumnTypes, schema);
-    }
-
-    private static boolean isEquivalentColumns(Set<String> projectedColumnNames, Properties schema)
-    {
-        Set<String> columnNames;
-        String columnNameProperty = schema.getProperty(LIST_COLUMNS);
-        if (columnNameProperty.length() == 0) {
-            columnNames = ImmutableSet.of();
-        }
-        else {
-            String columnNameDelimiter = (String) schema.getOrDefault(COLUMN_NAME_DELIMITER, ",");
-            columnNames = Arrays.stream(columnNameProperty.split(columnNameDelimiter))
-                    .collect(toImmutableSet());
-        }
-        return projectedColumnNames.equals(columnNames);
-    }
-
-    private static boolean isEquivalentColumnTypes(Set<String> projectedColumnTypes, Properties schema)
-    {
-        String columnTypeProperty = schema.getProperty(LIST_COLUMN_TYPES);
-        Set<String> columnTypes;
-        if (columnTypeProperty.length() == 0) {
-            columnTypes = ImmutableSet.of();
-        }
-        else {
-            columnTypes = getTypeInfosFromTypeString(columnTypeProperty)
-                    .stream()
-                    .map(TypeInfo::getTypeName)
-                    .collect(toImmutableSet());
-        }
-        return projectedColumnTypes.equals(columnTypes);
-    }
-
-    private static Set<String> getColumnProperty(List<HiveColumnHandle> readerColumns, Function<HiveColumnHandle, String> mapper)
-    {
-        if (readerColumns.isEmpty()) {
-            return ImmutableSet.of();
-        }
-        return readerColumns.stream()
-                .map(mapper)
-                .collect(toImmutableSet());
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectSerDeDataTypeMapper.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectSerDeDataTypeMapper.java
deleted file mode 100644
index 4695eb1a7e3b..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/S3SelectSerDeDataTypeMapper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import java.util.Map;
-import java.util.Optional;
-
-import static io.trino.plugin.hive.util.HiveClassNames.JSON_SERDE_CLASS;
-import static io.trino.plugin.hive.util.HiveClassNames.LAZY_SIMPLE_SERDE_CLASS;
-
-public class S3SelectSerDeDataTypeMapper
-{
-    // Contains mapping of SerDe class name -> data type. Multiple SerDe classes can be mapped to the same data type.
-    private static final Map<String, S3SelectDataType> serDeToDataTypeMapping = Map.of(
-            LAZY_SIMPLE_SERDE_CLASS, S3SelectDataType.CSV,
-            JSON_SERDE_CLASS, S3SelectDataType.JSON);
-
-    private S3SelectSerDeDataTypeMapper() {}
-
-    public static Optional<S3SelectDataType> getDataType(String serdeName)
-    {
-        return Optional.ofNullable(serDeToDataTypeMapping.get(serdeName));
-    }
-
-    public static boolean doesSerDeExist(String serdeName)
-    {
-        return serDeToDataTypeMapping.containsKey(serdeName);
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/TrinoS3ClientFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/TrinoS3ClientFactory.java
deleted file mode 100644
index cb2c25f9a666..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/TrinoS3ClientFactory.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.Protocol;
-import com.amazonaws.SdkClientException;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.auth.BasicSessionCredentials;
-import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
-import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
-import com.amazonaws.regions.DefaultAwsRegionProviderChain;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3Builder;
-import com.amazonaws.services.s3.AmazonS3Client;
-import com.amazonaws.services.securitytoken.AWSSecurityTokenServiceClientBuilder;
-import io.airlift.log.Logger;
-import io.airlift.units.Duration;
-import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.s3.HiveS3Config;
-import io.trino.plugin.hive.s3.TrinoS3FileSystem;
-import org.apache.hadoop.conf.Configuration;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
-import java.net.URI;
-import java.util.Optional;
-
-import static com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
-import static com.amazonaws.regions.Regions.US_EAST_1;
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static com.google.common.base.Verify.verify;
-import static io.trino.plugin.hive.aws.AwsCurrentRegionHolder.getCurrentRegionFromEC2Metadata;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ACCESS_KEY;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_CONNECT_TIMEOUT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_CONNECT_TTL;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_CREDENTIALS_PROVIDER;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ENDPOINT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_EXTERNAL_ID;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_IAM_ROLE;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_MAX_ERROR_RETRIES;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_PIN_CLIENT_TO_CURRENT_REGION;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_ROLE_SESSION_NAME;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SECRET_KEY;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SESSION_TOKEN;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SOCKET_TIMEOUT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_SSL_ENABLED;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_STS_ENDPOINT;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_STS_REGION;
-import static io.trino.plugin.hive.s3.TrinoS3FileSystem.S3_USER_AGENT_PREFIX;
-import static java.lang.Math.toIntExact;
-import static java.lang.String.format;
-
-/**
- * This factory provides AmazonS3 client required for executing S3SelectPushdown requests.
- * Normal S3 GET requests use AmazonS3 clients initialized in {@link TrinoS3FileSystem} or EMRFS.
- * The ideal state will be to merge this logic with the two file systems and get rid of this
- * factory class.
- * Please do not use the client provided by this factory for any other use cases.
- */
-public class TrinoS3ClientFactory
-{
-    private static final Logger log = Logger.get(TrinoS3ClientFactory.class);
-    private static final String S3_SELECT_PUSHDOWN_MAX_CONNECTIONS = "hive.s3select-pushdown.max-connections";
-
-    private final boolean enabled;
-    private final int defaultMaxConnections;
-
-    @GuardedBy("this")
-    private AmazonS3 s3Client;
-
-    @Inject
-    public TrinoS3ClientFactory(HiveConfig config)
-    {
-        this.enabled = config.isS3SelectPushdownEnabled();
-        this.defaultMaxConnections = config.getS3SelectPushdownMaxConnections();
-    }
-
-    synchronized AmazonS3 getS3Client(Configuration config)
-    {
-        if (s3Client == null) {
-            s3Client = createS3Client(config);
-        }
-        return s3Client;
-    }
-
-    private AmazonS3 createS3Client(Configuration config)
-    {
-        HiveS3Config defaults = new HiveS3Config();
-        String userAgentPrefix = config.get(S3_USER_AGENT_PREFIX, defaults.getS3UserAgentPrefix());
-        int maxErrorRetries = config.getInt(S3_MAX_ERROR_RETRIES, defaults.getS3MaxErrorRetries());
-        boolean sslEnabled = config.getBoolean(S3_SSL_ENABLED, defaults.isS3SslEnabled());
-        Duration connectTimeout = Duration.valueOf(config.get(S3_CONNECT_TIMEOUT, defaults.getS3ConnectTimeout().toString()));
-        Duration socketTimeout = Duration.valueOf(config.get(S3_SOCKET_TIMEOUT, defaults.getS3SocketTimeout().toString()));
-        int maxConnections = config.getInt(S3_SELECT_PUSHDOWN_MAX_CONNECTIONS, defaultMaxConnections);
-
-        ClientConfiguration clientConfiguration = new ClientConfiguration()
-                .withMaxErrorRetry(maxErrorRetries)
-                .withProtocol(sslEnabled ? Protocol.HTTPS : Protocol.HTTP)
-                .withConnectionTimeout(toIntExact(connectTimeout.toMillis()))
-                .withSocketTimeout(toIntExact(socketTimeout.toMillis()))
-                .withMaxConnections(maxConnections)
-                .withUserAgentPrefix(userAgentPrefix)
-                .withUserAgentSuffix(enabled ? "Trino-select" : "Trino");
-
-        String connectTtlValue = config.get(S3_CONNECT_TTL);
-        if (!isNullOrEmpty(connectTtlValue)) {
-            clientConfiguration.setConnectionTTL(Duration.valueOf(connectTtlValue).toMillis());
-        }
-
-        AWSCredentialsProvider awsCredentialsProvider = getAwsCredentialsProvider(config);
-        AmazonS3Builder<? extends AmazonS3Builder<?, ?>, ? extends AmazonS3> clientBuilder = AmazonS3Client.builder()
-                .withCredentials(awsCredentialsProvider)
-                .withClientConfiguration(clientConfiguration)
-                .withMetricsCollector(TrinoS3FileSystem.getFileSystemStats().newRequestMetricCollector())
-                .enablePathStyleAccess();
-
-        boolean regionOrEndpointSet = false;
-
-        String endpoint = config.get(S3_ENDPOINT);
-        boolean pinS3ClientToCurrentRegion = config.getBoolean(S3_PIN_CLIENT_TO_CURRENT_REGION, defaults.isPinS3ClientToCurrentRegion());
-        verify(!pinS3ClientToCurrentRegion || endpoint == null,
-                "Invalid configuration: either endpoint can be set or S3 client can be pinned to the current region");
-
-        // use local region when running inside of EC2
-        if (pinS3ClientToCurrentRegion) {
-            clientBuilder.setRegion(getCurrentRegionFromEC2Metadata().getName());
-            regionOrEndpointSet = true;
-        }
-
-        if (!isNullOrEmpty(endpoint)) {
-            clientBuilder.withEndpointConfiguration(new EndpointConfiguration(endpoint, null));
-            regionOrEndpointSet = true;
-        }
-
-        if (!regionOrEndpointSet) {
-            clientBuilder.withRegion(US_EAST_1);
-            clientBuilder.setForceGlobalBucketAccessEnabled(true);
-        }
-
-        return clientBuilder.build();
-    }
-
-    private static AWSCredentialsProvider getAwsCredentialsProvider(Configuration conf)
-    {
-        Optional<AWSCredentials> credentials = getAwsCredentials(conf);
-        if (credentials.isPresent()) {
-            return new AWSStaticCredentialsProvider(credentials.get());
-        }
-
-        String providerClass = conf.get(S3_CREDENTIALS_PROVIDER);
-        if (!isNullOrEmpty(providerClass)) {
-            return getCustomAWSCredentialsProvider(conf, providerClass);
-        }
-
-        AWSCredentialsProvider provider = getAwsCredentials(conf)
-                .map(value -> (AWSCredentialsProvider) new AWSStaticCredentialsProvider(value))
-                .orElseGet(DefaultAWSCredentialsProviderChain::getInstance);
-
-        String iamRole = conf.get(S3_IAM_ROLE);
-        if (iamRole != null) {
-            String stsEndpointOverride = conf.get(S3_STS_ENDPOINT);
-            String stsRegionOverride = conf.get(S3_STS_REGION);
-            String s3RoleSessionName = conf.get(S3_ROLE_SESSION_NAME);
-            String externalId = conf.get(S3_EXTERNAL_ID);
-
-            AWSSecurityTokenServiceClientBuilder stsClientBuilder = AWSSecurityTokenServiceClientBuilder.standard()
-                    .withCredentials(provider);
-
-            String region;
-            if (!isNullOrEmpty(stsRegionOverride)) {
-                region = stsRegionOverride;
-            }
-            else {
-                DefaultAwsRegionProviderChain regionProviderChain = new DefaultAwsRegionProviderChain();
-                try {
-                    region = regionProviderChain.getRegion();
-                }
-                catch (SdkClientException ex) {
-                    log.warn("Falling back to default AWS region %s", US_EAST_1);
-                    region = US_EAST_1.getName();
-                }
-            }
-
-            if (!isNullOrEmpty(stsEndpointOverride)) {
-                stsClientBuilder.withEndpointConfiguration(new EndpointConfiguration(stsEndpointOverride, region));
-            }
-            else {
-                stsClientBuilder.withRegion(region);
-            }
-
-            provider = new STSAssumeRoleSessionCredentialsProvider.Builder(iamRole, s3RoleSessionName)
-                    .withExternalId(externalId)
-                    .withStsClient(stsClientBuilder.build())
-                    .build();
-        }
-
-        return provider;
-    }
-
-    private static AWSCredentialsProvider getCustomAWSCredentialsProvider(Configuration conf, String providerClass)
-    {
-        try {
-            return conf.getClassByName(providerClass)
-                    .asSubclass(AWSCredentialsProvider.class)
-                    .getConstructor(URI.class, Configuration.class)
-                    .newInstance(null, conf);
-        }
-        catch (ReflectiveOperationException e) {
-            throw new RuntimeException(format("Error creating an instance of %s", providerClass), e);
-        }
-    }
-
-    private static Optional<AWSCredentials> getAwsCredentials(Configuration conf)
-    {
-        String accessKey = conf.get(S3_ACCESS_KEY);
-        String secretKey = conf.get(S3_SECRET_KEY);
-
-        if (isNullOrEmpty(accessKey) || isNullOrEmpty(secretKey)) {
-            return Optional.empty();
-        }
-        String sessionToken = conf.get(S3_SESSION_TOKEN);
-        if (!isNullOrEmpty(sessionToken)) {
-            return Optional.of(new BasicSessionCredentials(accessKey, secretKey, sessionToken));
-        }
-
-        return Optional.of(new BasicAWSCredentials(accessKey, secretKey));
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/TrinoS3SelectClient.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/TrinoS3SelectClient.java
deleted file mode 100644
index e42777ac40f8..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/TrinoS3SelectClient.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.SelectObjectContentEventVisitor;
-import com.amazonaws.services.s3.model.SelectObjectContentRequest;
-import com.amazonaws.services.s3.model.SelectObjectContentResult;
-import org.apache.hadoop.conf.Configuration;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStream;
-
-import static com.amazonaws.services.s3.model.SelectObjectContentEvent.EndEvent;
-import static java.util.Objects.requireNonNull;
-
-class TrinoS3SelectClient
-        implements Closeable
-{
-    private final AmazonS3 s3Client;
-    private boolean requestComplete;
-    private SelectObjectContentRequest selectObjectRequest;
-    private SelectObjectContentResult selectObjectContentResult;
-
-    public TrinoS3SelectClient(Configuration configuration, TrinoS3ClientFactory s3ClientFactory)
-    {
-        requireNonNull(configuration, "configuration is null");
-        requireNonNull(s3ClientFactory, "s3ClientFactory is null");
-        this.s3Client = s3ClientFactory.getS3Client(configuration);
-    }
-
-    public InputStream getRecordsContent(SelectObjectContentRequest selectObjectRequest)
-    {
-        this.selectObjectRequest = requireNonNull(selectObjectRequest, "selectObjectRequest is null");
-        this.selectObjectContentResult = s3Client.selectObjectContent(selectObjectRequest);
-        return selectObjectContentResult.getPayload()
-                .getRecordsInputStream(
-                        new SelectObjectContentEventVisitor()
-                        {
-                            @Override
-                            public void visit(EndEvent endEvent)
-                            {
-                                requestComplete = true;
-                            }
-                        });
-    }
-
-    @Override
-    public void close()
-            throws IOException
-    {
-        selectObjectContentResult.close();
-    }
-
-    public String getKeyName()
-    {
-        return selectObjectRequest.getKey();
-    }
-
-    public String getBucketName()
-    {
-        return selectObjectRequest.getBucketName();
-    }
-
-    /**
-     * The End Event indicates all matching records have been transmitted.
-     * If the End Event is not received, the results may be incomplete.
-     */
-    public boolean isRequestComplete()
-    {
-        return requestComplete;
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/csv/S3SelectCsvRecordReader.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/csv/S3SelectCsvRecordReader.java
deleted file mode 100644
index 47d63095d82c..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/csv/S3SelectCsvRecordReader.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select.csv;
-
-import com.amazonaws.services.s3.model.CSVInput;
-import com.amazonaws.services.s3.model.CSVOutput;
-import com.amazonaws.services.s3.model.CompressionType;
-import com.amazonaws.services.s3.model.InputSerialization;
-import com.amazonaws.services.s3.model.OutputSerialization;
-import io.trino.plugin.hive.s3select.S3SelectLineRecordReader;
-import io.trino.plugin.hive.s3select.TrinoS3ClientFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-
-import java.util.Properties;
-
-import static io.trino.plugin.hive.util.SerdeConstants.ESCAPE_CHAR;
-import static io.trino.plugin.hive.util.SerdeConstants.FIELD_DELIM;
-import static io.trino.plugin.hive.util.SerdeConstants.QUOTE_CHAR;
-
-public class S3SelectCsvRecordReader
-        extends S3SelectLineRecordReader
-{
-    /*
-     * Sentinel unicode comment character (http://www.unicode.org/faq/private_use.html#nonchar_codes).
-     * It is expected that \uFDD0 sentinel comment character is not the first character in any row of user's CSV S3 object.
-     * The rows starting with \uFDD0 will be skipped by S3Select and will not be a part of the result set or aggregations.
-     * To process CSV objects that may contain \uFDD0 as first row character please disable S3SelectPushdown.
-     * TODO: Remove this proxy logic when S3Select API supports disabling of row level comments.
-     */
-
-    private static final String COMMENTS_CHAR_STR = "\uFDD0";
-    private static final String DEFAULT_FIELD_DELIMITER = ",";
-
-    public S3SelectCsvRecordReader(
-            Configuration configuration,
-            Path path,
-            long start,
-            long length,
-            Properties schema,
-            String ionSqlQuery,
-            TrinoS3ClientFactory s3ClientFactory)
-    {
-        super(configuration, path, start, length, schema, ionSqlQuery, s3ClientFactory);
-    }
-
-    @Override
-    public InputSerialization buildInputSerialization()
-    {
-        Properties schema = getSchema();
-        String fieldDelimiter = schema.getProperty(FIELD_DELIM, DEFAULT_FIELD_DELIMITER);
-        String quoteChar = schema.getProperty(QUOTE_CHAR, null);
-        String escapeChar = schema.getProperty(ESCAPE_CHAR, null);
-
-        CSVInput selectObjectCSVInputSerialization = new CSVInput();
-        selectObjectCSVInputSerialization.setRecordDelimiter(getLineDelimiter());
-        selectObjectCSVInputSerialization.setFieldDelimiter(fieldDelimiter);
-        selectObjectCSVInputSerialization.setComments(COMMENTS_CHAR_STR);
-        selectObjectCSVInputSerialization.setQuoteCharacter(quoteChar);
-        selectObjectCSVInputSerialization.setQuoteEscapeCharacter(escapeChar);
-
-        InputSerialization selectObjectInputSerialization = new InputSerialization();
-        selectObjectInputSerialization.setCompressionType(getCompressionType());
-        selectObjectInputSerialization.setCsv(selectObjectCSVInputSerialization);
-
-        return selectObjectInputSerialization;
-    }
-
-    @Override
-    public OutputSerialization buildOutputSerialization()
-    {
-        Properties schema = getSchema();
-        String fieldDelimiter = schema.getProperty(FIELD_DELIM, DEFAULT_FIELD_DELIMITER);
-        String quoteChar = schema.getProperty(QUOTE_CHAR, null);
-        String escapeChar = schema.getProperty(ESCAPE_CHAR, null);
-
-        OutputSerialization selectObjectOutputSerialization = new OutputSerialization();
-        CSVOutput selectObjectCSVOutputSerialization = new CSVOutput();
-        selectObjectCSVOutputSerialization.setRecordDelimiter(getLineDelimiter());
-        selectObjectCSVOutputSerialization.setFieldDelimiter(fieldDelimiter);
-        selectObjectCSVOutputSerialization.setQuoteCharacter(quoteChar);
-        selectObjectCSVOutputSerialization.setQuoteEscapeCharacter(escapeChar);
-        selectObjectOutputSerialization.setCsv(selectObjectCSVOutputSerialization);
-
-        return selectObjectOutputSerialization;
-    }
-
-    @Override
-    public boolean shouldEnableScanRange()
-    {
-        // Works for CSV if AllowQuotedRecordDelimiter is disabled.
-        boolean isQuotedRecordDelimiterAllowed = Boolean.TRUE.equals(
-                buildInputSerialization().getCsv().getAllowQuotedRecordDelimiter());
-        return CompressionType.NONE.equals(getCompressionType()) && !isQuotedRecordDelimiterAllowed;
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/json/S3SelectJsonRecordReader.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/json/S3SelectJsonRecordReader.java
deleted file mode 100644
index fa7d7be84654..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3select/json/S3SelectJsonRecordReader.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select.json;
-
-import com.amazonaws.services.s3.model.CompressionType;
-import com.amazonaws.services.s3.model.InputSerialization;
-import com.amazonaws.services.s3.model.JSONInput;
-import com.amazonaws.services.s3.model.JSONOutput;
-import com.amazonaws.services.s3.model.JSONType;
-import com.amazonaws.services.s3.model.OutputSerialization;
-import io.trino.plugin.hive.s3select.S3SelectLineRecordReader;
-import io.trino.plugin.hive.s3select.TrinoS3ClientFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-
-import java.util.Properties;
-
-public class S3SelectJsonRecordReader
-        extends S3SelectLineRecordReader
-{
-    public S3SelectJsonRecordReader(Configuration configuration,
-                             Path path,
-                             long start,
-                             long length,
-                             Properties schema,
-                             String ionSqlQuery,
-                             TrinoS3ClientFactory s3ClientFactory)
-    {
-        super(configuration, path, start, length, schema, ionSqlQuery, s3ClientFactory);
-    }
-
-    @Override
-    public InputSerialization buildInputSerialization()
-    {
-        // JSONType.LINES is the only JSON format supported by the Hive JsonSerDe.
-        JSONInput selectObjectJSONInputSerialization = new JSONInput();
-        selectObjectJSONInputSerialization.setType(JSONType.LINES);
-
-        InputSerialization selectObjectInputSerialization = new InputSerialization();
-        selectObjectInputSerialization.setCompressionType(getCompressionType());
-        selectObjectInputSerialization.setJson(selectObjectJSONInputSerialization);
-
-        return selectObjectInputSerialization;
-    }
-
-    @Override
-    public OutputSerialization buildOutputSerialization()
-    {
-        OutputSerialization selectObjectOutputSerialization = new OutputSerialization();
-        JSONOutput selectObjectJSONOutputSerialization = new JSONOutput();
-        selectObjectOutputSerialization.setJson(selectObjectJSONOutputSerialization);
-
-        return selectObjectOutputSerialization;
-    }
-
-    @Override
-    public boolean shouldEnableScanRange()
-    {
-        return CompressionType.NONE.equals(getCompressionType());
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/LegacyAccessControl.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/LegacyAccessControl.java
index 62e1ca2fc621..8f28b3e075e8 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/LegacyAccessControl.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/LegacyAccessControl.java
@@ -14,19 +14,18 @@
 package io.trino.plugin.hive.security;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.SchemaRoutineName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.security.ViewExpression;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -37,7 +36,6 @@
 import static io.trino.spi.security.AccessDeniedException.denyCommentTable;
 import static io.trino.spi.security.AccessDeniedException.denyDropColumn;
 import static io.trino.spi.security.AccessDeniedException.denyDropTable;
-import static io.trino.spi.security.AccessDeniedException.denyExecuteFunction;
 import static io.trino.spi.security.AccessDeniedException.denyRenameColumn;
 import static io.trino.spi.security.AccessDeniedException.denyRenameTable;
 import static java.lang.String.format;
@@ -196,6 +194,12 @@ public Set<String> filterColumns(ConnectorSecurityContext context, SchemaTableNa
         return columns;
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(ConnectorSecurityContext context, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        return tableColumns;
+    }
+
     @Override
     public void checkCanAddColumn(ConnectorSecurityContext context, SchemaTableName tableName)
     {
@@ -295,11 +299,6 @@ public void checkCanRenameMaterializedView(ConnectorSecurityContext context, Sch
     {
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-    }
-
     @Override
     public void checkCanSetMaterializedViewProperties(ConnectorSecurityContext context, SchemaTableName materializedViewName, Map<String, Optional<Object>> properties)
     {
@@ -373,11 +372,6 @@ public void checkCanSetRole(ConnectorSecurityContext context, String role)
     {
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(ConnectorSecurityContext context)
-    {
-    }
-
     @Override
     public void checkCanShowRoles(ConnectorSecurityContext context)
     {
@@ -404,32 +398,47 @@ public void checkCanExecuteTableProcedure(ConnectorSecurityContext context, Sche
     }
 
     @Override
-    public void checkCanExecuteFunction(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName function)
+    public boolean canExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
     {
-        switch (functionKind) {
-            case SCALAR, AGGREGATE, WINDOW:
-                return;
-            case TABLE:
-                denyExecuteFunction(function.toString());
-        }
-        throw new UnsupportedOperationException("Unsupported function kind: " + functionKind);
+        return !function.getSchemaName().equals("system");
     }
 
     @Override
-    public List<ViewExpression> getRowFilters(ConnectorSecurityContext context, SchemaTableName tableName)
+    public boolean canCreateViewWithExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
     {
-        return ImmutableList.of();
+        return canExecuteFunction(context, function);
     }
 
     @Override
-    public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    public void checkCanShowFunctions(ConnectorSecurityContext context, String schemaName)
     {
-        return Optional.empty();
     }
 
     @Override
-    public List<ViewExpression> getColumnMasks(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    public Set<SchemaFunctionName> filterFunctions(ConnectorSecurityContext context, Set<SchemaFunctionName> functionNames)
+    {
+        return functionNames;
+    }
+
+    @Override
+    public void checkCanCreateFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+    }
+
+    @Override
+    public void checkCanDropFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+    }
+
+    @Override
+    public List<ViewExpression> getRowFilters(ConnectorSecurityContext context, SchemaTableName tableName)
     {
         return ImmutableList.of();
     }
+
+    @Override
+    public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    {
+        return Optional.empty();
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SecurityConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SecurityConfig.java
index e48131d43ecb..79ea80dcfe9b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SecurityConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SecurityConfig.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.hive.security;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import static io.trino.plugin.hive.security.HiveSecurityModule.LEGACY;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SemiTransactionalLegacyAccessControlMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SemiTransactionalLegacyAccessControlMetastore.java
index e6c8a20cf85f..b549454f7fed 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SemiTransactionalLegacyAccessControlMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SemiTransactionalLegacyAccessControlMetastore.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.hive.security;
 
+import com.google.inject.Inject;
 import io.trino.plugin.hive.HiveTransactionManager;
 import io.trino.plugin.hive.metastore.SemiTransactionalHiveMetastore;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.spi.connector.ConnectorSecurityContext;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SemiTransactionalSqlStandardAccessControlMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SemiTransactionalSqlStandardAccessControlMetastore.java
index 4b8c9a9ab1fc..4eda573229d6 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SemiTransactionalSqlStandardAccessControlMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SemiTransactionalSqlStandardAccessControlMetastore.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.hive.security;
 
+import com.google.inject.Inject;
 import io.trino.plugin.hive.HiveTransactionManager;
 import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.HivePrincipal;
@@ -21,8 +22,6 @@
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.security.RoleGrant;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 import java.util.Set;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SqlStandardAccessControl.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SqlStandardAccessControl.java
index 0587986e8ce7..47416b11133b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SqlStandardAccessControl.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SqlStandardAccessControl.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.HivePrincipal;
@@ -24,18 +25,15 @@
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.SchemaRoutineName;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.function.FunctionKind;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.ConnectorIdentity;
-import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.security.ViewExpression;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,6 +59,7 @@
 import static io.trino.spi.security.AccessDeniedException.denyCommentColumn;
 import static io.trino.spi.security.AccessDeniedException.denyCommentTable;
 import static io.trino.spi.security.AccessDeniedException.denyCommentView;
+import static io.trino.spi.security.AccessDeniedException.denyCreateFunction;
 import static io.trino.spi.security.AccessDeniedException.denyCreateMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyCreateRole;
 import static io.trino.spi.security.AccessDeniedException.denyCreateSchema;
@@ -69,14 +68,13 @@
 import static io.trino.spi.security.AccessDeniedException.denyCreateViewWithSelect;
 import static io.trino.spi.security.AccessDeniedException.denyDeleteTable;
 import static io.trino.spi.security.AccessDeniedException.denyDropColumn;
+import static io.trino.spi.security.AccessDeniedException.denyDropFunction;
 import static io.trino.spi.security.AccessDeniedException.denyDropMaterializedView;
 import static io.trino.spi.security.AccessDeniedException.denyDropRole;
 import static io.trino.spi.security.AccessDeniedException.denyDropSchema;
 import static io.trino.spi.security.AccessDeniedException.denyDropTable;
 import static io.trino.spi.security.AccessDeniedException.denyDropView;
-import static io.trino.spi.security.AccessDeniedException.denyExecuteFunction;
 import static io.trino.spi.security.AccessDeniedException.denyExecuteTableProcedure;
-import static io.trino.spi.security.AccessDeniedException.denyGrantExecuteFunctionPrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyGrantRoles;
 import static io.trino.spi.security.AccessDeniedException.denyGrantTablePrivilege;
 import static io.trino.spi.security.AccessDeniedException.denyInsertTable;
@@ -99,14 +97,11 @@
 import static io.trino.spi.security.AccessDeniedException.denyShowColumns;
 import static io.trino.spi.security.AccessDeniedException.denyShowCreateSchema;
 import static io.trino.spi.security.AccessDeniedException.denyShowCreateTable;
-import static io.trino.spi.security.AccessDeniedException.denyShowRoleAuthorizationDescriptors;
 import static io.trino.spi.security.AccessDeniedException.denyShowRoles;
 import static io.trino.spi.security.AccessDeniedException.denyTruncateTable;
 import static io.trino.spi.security.AccessDeniedException.denyUpdateTableColumns;
 import static io.trino.spi.security.PrincipalType.ROLE;
 import static io.trino.spi.security.PrincipalType.USER;
-import static java.lang.String.format;
-import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toSet;
 
@@ -156,7 +151,7 @@ public void checkCanRenameSchema(ConnectorSecurityContext context, String schema
     @Override
     public void checkCanSetSchemaAuthorization(ConnectorSecurityContext context, String schemaName, TrinoPrincipal principal)
     {
-        if (!isDatabaseOwner(context, schemaName)) {
+        if (!isAdmin(context)) {
             denySetSchemaAuthorization(schemaName, principal);
         }
     }
@@ -273,6 +268,13 @@ public Set<String> filterColumns(ConnectorSecurityContext context, SchemaTableNa
         return columns;
     }
 
+    @Override
+    public Map<SchemaTableName, Set<String>> filterColumns(ConnectorSecurityContext context, Map<SchemaTableName, Set<String>> tableColumns)
+    {
+        // Default implementation is good enough. Explicit implementation is expected by the test though.
+        return ConnectorAccessControl.super.filterColumns(context, tableColumns);
+    }
+
     @Override
     public void checkCanAddColumn(ConnectorSecurityContext context, SchemaTableName tableName)
     {
@@ -308,7 +310,7 @@ public void checkCanAlterColumn(ConnectorSecurityContext context, SchemaTableNam
     @Override
     public void checkCanSetTableAuthorization(ConnectorSecurityContext context, SchemaTableName tableName, TrinoPrincipal principal)
     {
-        if (!isTableOwner(context, tableName)) {
+        if (!isAdmin(context)) {
             denySetTableAuthorization(tableName.toString(), principal);
         }
     }
@@ -373,7 +375,7 @@ public void checkCanRenameView(ConnectorSecurityContext context, SchemaTableName
     @Override
     public void checkCanSetViewAuthorization(ConnectorSecurityContext context, SchemaTableName viewName, TrinoPrincipal principal)
     {
-        if (!isTableOwner(context, viewName)) {
+        if (!isAdmin(context)) {
             denySetViewAuthorization(viewName.toString(), principal);
         }
     }
@@ -429,24 +431,6 @@ public void checkCanRenameMaterializedView(ConnectorSecurityContext context, Sch
         }
     }
 
-    @Override
-    public void checkCanGrantExecuteFunctionPrivilege(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName functionName, TrinoPrincipal grantee, boolean grantOption)
-    {
-        switch (functionKind) {
-            case SCALAR, AGGREGATE, WINDOW -> {
-                return;
-            }
-            case TABLE -> {
-                if (isAdmin(context)) {
-                    return;
-                }
-                String granteeAsString = format("%s '%s'", grantee.getType().name().toLowerCase(ENGLISH), grantee.getName());
-                denyGrantExecuteFunctionPrivilege(functionName.toString(), Identity.ofUser(context.getIdentity().getUser()), granteeAsString);
-            }
-        }
-        throw new UnsupportedOperationException("Unsupported function kind: " + functionKind);
-    }
-
     @Override
     public void checkCanSetMaterializedViewProperties(ConnectorSecurityContext context, SchemaTableName materializedViewName, Map<String, Optional<Object>> properties)
     {
@@ -571,14 +555,6 @@ public void checkCanSetRole(ConnectorSecurityContext context, String role)
         }
     }
 
-    @Override
-    public void checkCanShowRoleAuthorizationDescriptors(ConnectorSecurityContext context)
-    {
-        if (!isAdmin(context)) {
-            denyShowRoleAuthorizationDescriptors();
-        }
-    }
-
     @Override
     public void checkCanShowRoles(ConnectorSecurityContext context)
     {
@@ -611,38 +587,56 @@ public void checkCanExecuteTableProcedure(ConnectorSecurityContext context, Sche
     }
 
     @Override
-    public void checkCanExecuteFunction(ConnectorSecurityContext context, FunctionKind functionKind, SchemaRoutineName function)
+    public boolean canExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
     {
-        switch (functionKind) {
-            case SCALAR, AGGREGATE, WINDOW:
-                return;
-            case TABLE:
-                if (isAdmin(context)) {
-                    return;
-                }
-                denyExecuteFunction(function.toString());
-        }
-        throw new UnsupportedOperationException("Unsupported function kind: " + functionKind);
+        return !function.getSchemaName().equals("system") || isAdmin(context);
     }
 
     @Override
-    public List<ViewExpression> getRowFilters(ConnectorSecurityContext context, SchemaTableName tableName)
+    public boolean canCreateViewWithExecuteFunction(ConnectorSecurityContext context, SchemaRoutineName function)
     {
-        return ImmutableList.of();
+        return canExecuteFunction(context, function);
     }
 
     @Override
-    public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    public void checkCanShowFunctions(ConnectorSecurityContext context, String schemaName)
     {
-        return Optional.empty();
     }
 
     @Override
-    public List<ViewExpression> getColumnMasks(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    public Set<SchemaFunctionName> filterFunctions(ConnectorSecurityContext context, Set<SchemaFunctionName> functionNames)
+    {
+        return functionNames;
+    }
+
+    @Override
+    public void checkCanCreateFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        if (!isDatabaseOwner(context, function.getSchemaName())) {
+            denyCreateFunction(function.toString());
+        }
+    }
+
+    @Override
+    public void checkCanDropFunction(ConnectorSecurityContext context, SchemaRoutineName function)
+    {
+        if (!isDatabaseOwner(context, function.getSchemaName())) {
+            denyDropFunction(function.toString());
+        }
+    }
+
+    @Override
+    public List<ViewExpression> getRowFilters(ConnectorSecurityContext context, SchemaTableName tableName)
     {
         return ImmutableList.of();
     }
 
+    @Override
+    public Optional<ViewExpression> getColumnMask(ConnectorSecurityContext context, SchemaTableName tableName, String columnName, Type type)
+    {
+        return Optional.empty();
+    }
+
     private boolean isAdmin(ConnectorSecurityContext context)
     {
         return isRoleEnabled(context.getIdentity(), hivePrincipal -> metastore.listRoleGrants(context, hivePrincipal), ADMIN_ROLE_NAME);
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SystemTableAwareAccessControl.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SystemTableAwareAccessControl.java
index 0b19d67df60f..08329e51f19f 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SystemTableAwareAccessControl.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SystemTableAwareAccessControl.java
@@ -14,6 +14,7 @@
 
 package io.trino.plugin.hive.security;
 
+import com.google.inject.Inject;
 import io.trino.plugin.base.security.ForwardingConnectorAccessControl;
 import io.trino.plugin.hive.SystemTableProvider;
 import io.trino.spi.connector.ConnectorAccessControl;
@@ -21,8 +22,6 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.security.AccessDeniedException;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 import java.util.Set;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/CharTypeInfo.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/CharTypeInfo.java
index 4556b7eaf27f..78bd304823cb 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/CharTypeInfo.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/CharTypeInfo.java
@@ -14,11 +14,13 @@
 package io.trino.plugin.hive.type;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.plugin.hive.util.SerdeConstants.CHAR_TYPE_NAME;
 
 public final class CharTypeInfo
         extends BaseCharTypeInfo
 {
+    private static final int INSTANCE_SIZE = instanceSize(CharTypeInfo.class);
     public static final int MAX_CHAR_LENGTH = 255;
 
     public CharTypeInfo(int length)
@@ -39,4 +41,10 @@ public int hashCode()
     {
         return getLength();
     }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE + getDeclaredFieldsRetainedSizeInBytes();
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/DecimalTypeInfo.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/DecimalTypeInfo.java
index 72afd60b8bee..c43ff2a78aae 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/DecimalTypeInfo.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/DecimalTypeInfo.java
@@ -16,12 +16,14 @@
 import java.util.Objects;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.plugin.hive.util.SerdeConstants.DECIMAL_TYPE_NAME;
 
 // based on org.apache.hadoop.hive.serde2.typeinfo.DecimalTypeInfo
 public final class DecimalTypeInfo
         extends PrimitiveTypeInfo
 {
+    private static final int INSTANCE_SIZE = instanceSize(DecimalTypeInfo.class);
     public static final int MAX_PRECISION = 38;
     public static final int MAX_SCALE = 38;
 
@@ -71,4 +73,10 @@ public static String decimalTypeName(int precision, int scale)
     {
         return DECIMAL_TYPE_NAME + "(" + precision + "," + scale + ")";
     }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE + getDeclaredFieldsRetainedSizeInBytes();
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/ListTypeInfo.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/ListTypeInfo.java
index 0e59d407dff6..67037c0dbd12 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/ListTypeInfo.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/ListTypeInfo.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.hive.type;
 
+import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.plugin.hive.util.SerdeConstants.LIST_TYPE_NAME;
 import static java.util.Objects.requireNonNull;
 
@@ -20,6 +21,8 @@
 public final class ListTypeInfo
         extends TypeInfo
 {
+    private static final int INSTANCE_SIZE = instanceSize(UnionTypeInfo.class);
+
     private final TypeInfo elementTypeInfo;
 
     ListTypeInfo(TypeInfo elementTypeInfo)
@@ -56,4 +59,10 @@ public int hashCode()
     {
         return elementTypeInfo.hashCode();
     }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE + elementTypeInfo.getRetainedSizeInBytes();
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/MapTypeInfo.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/MapTypeInfo.java
index d5083ae4639c..f82a9d3a5af2 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/MapTypeInfo.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/MapTypeInfo.java
@@ -15,6 +15,7 @@
 
 import java.util.Objects;
 
+import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.plugin.hive.util.SerdeConstants.MAP_TYPE_NAME;
 import static java.util.Objects.requireNonNull;
 
@@ -22,6 +23,8 @@
 public final class MapTypeInfo
         extends TypeInfo
 {
+    private static final int INSTANCE_SIZE = instanceSize(UnionTypeInfo.class);
+
     private final TypeInfo keyTypeInfo;
     private final TypeInfo valueTypeInfo;
 
@@ -66,4 +69,10 @@ public int hashCode()
     {
         return Objects.hash(keyTypeInfo, valueTypeInfo);
     }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE + keyTypeInfo.getRetainedSizeInBytes() + valueTypeInfo.getRetainedSizeInBytes();
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/PrimitiveTypeInfo.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/PrimitiveTypeInfo.java
index c06bb21a3339..c280a6551a83 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/PrimitiveTypeInfo.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/PrimitiveTypeInfo.java
@@ -13,6 +13,9 @@
  */
 package io.trino.plugin.hive.type;
 
+import static com.google.common.base.Verify.verify;
+import static io.airlift.slice.SizeOf.estimatedSizeOf;
+import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.plugin.hive.type.TypeInfoUtils.getTypeEntryFromTypeName;
 import static java.util.Objects.requireNonNull;
 
@@ -21,6 +24,8 @@ public sealed class PrimitiveTypeInfo
         extends TypeInfo
         permits BaseCharTypeInfo, DecimalTypeInfo
 {
+    private static final int INSTANCE_SIZE = instanceSize(PrimitiveTypeInfo.class);
+
     protected final String typeName;
     private final PrimitiveCategory primitiveCategory;
 
@@ -62,4 +67,16 @@ public int hashCode()
     {
         return typeName.hashCode();
     }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        verify(getClass() == PrimitiveTypeInfo.class, "Method must be overridden in %s", getClass());
+        return INSTANCE_SIZE + getDeclaredFieldsRetainedSizeInBytes();
+    }
+
+    protected long getDeclaredFieldsRetainedSizeInBytes()
+    {
+        return estimatedSizeOf(typeName);
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/StructTypeInfo.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/StructTypeInfo.java
index a568579a45c2..cc9304d0b0d8 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/StructTypeInfo.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/StructTypeInfo.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive.type;
 
 import com.google.common.collect.ImmutableList;
+import io.airlift.slice.SizeOf;
 
 import java.util.Iterator;
 import java.util.List;
@@ -21,6 +22,8 @@
 import java.util.StringJoiner;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.airlift.slice.SizeOf.estimatedSizeOf;
+import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.plugin.hive.util.SerdeConstants.STRUCT_TYPE_NAME;
 import static java.util.Objects.requireNonNull;
 
@@ -28,6 +31,8 @@
 public final class StructTypeInfo
         extends TypeInfo
 {
+    private static final int INSTANCE_SIZE = instanceSize(StructTypeInfo.class);
+
     private final List<String> names;
     private final List<TypeInfo> typeInfos;
 
@@ -97,4 +102,12 @@ public int hashCode()
     {
         return Objects.hash(names, typeInfos);
     }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE +
+                estimatedSizeOf(names, SizeOf::estimatedSizeOf) +
+                estimatedSizeOf(typeInfos, TypeInfo::getRetainedSizeInBytes);
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/TypeInfo.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/TypeInfo.java
index bc808892859d..f11f3234584a 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/TypeInfo.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/TypeInfo.java
@@ -34,4 +34,6 @@ public final String toString()
 
     @Override
     public abstract int hashCode();
+
+    public abstract long getRetainedSizeInBytes();
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/UnionTypeInfo.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/UnionTypeInfo.java
index a4cbec25256c..1a3b43c79ed6 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/UnionTypeInfo.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/UnionTypeInfo.java
@@ -17,6 +17,8 @@
 
 import java.util.List;
 
+import static io.airlift.slice.SizeOf.estimatedSizeOf;
+import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.plugin.hive.util.SerdeConstants.UNION_TYPE_NAME;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
@@ -25,6 +27,8 @@
 public final class UnionTypeInfo
         extends TypeInfo
 {
+    private static final int INSTANCE_SIZE = instanceSize(UnionTypeInfo.class);
+
     private final List<TypeInfo> objectTypeInfos;
 
     UnionTypeInfo(List<TypeInfo> objectTypeInfos)
@@ -63,4 +67,10 @@ public int hashCode()
     {
         return objectTypeInfos.hashCode();
     }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE + estimatedSizeOf(objectTypeInfos, TypeInfo::getRetainedSizeInBytes);
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/VarcharTypeInfo.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/VarcharTypeInfo.java
index a322b2513cda..c2ce3bcf507c 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/VarcharTypeInfo.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/type/VarcharTypeInfo.java
@@ -14,12 +14,14 @@
 package io.trino.plugin.hive.type;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.airlift.slice.SizeOf.instanceSize;
 import static io.trino.plugin.hive.util.SerdeConstants.VARCHAR_TYPE_NAME;
 
 // based on org.apache.hadoop.hive.serde2.typeinfo.VarcharTypeInfo
 public final class VarcharTypeInfo
         extends BaseCharTypeInfo
 {
+    private static final int INSTANCE_SIZE = instanceSize(VarcharTypeInfo.class);
     public static final int MAX_VARCHAR_LENGTH = 65535;
 
     public VarcharTypeInfo(int length)
@@ -40,4 +42,10 @@ public int hashCode()
     {
         return getLength();
     }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE + getDeclaredFieldsRetainedSizeInBytes();
+    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/AcidTables.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/AcidTables.java
index ebb5b7a80047..a7f92eb734e6 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/AcidTables.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/AcidTables.java
@@ -22,11 +22,11 @@
 import com.google.common.collect.ListMultimap;
 import io.trino.filesystem.FileEntry;
 import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.filesystem.TrinoOutputFile;
 import io.trino.spi.TrinoException;
-import org.apache.hadoop.fs.Path;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -67,9 +67,9 @@ public static boolean isFullAcidTable(Map<String, String> parameters)
         return isTransactionalTable(parameters) && !isInsertOnlyTable(parameters);
     }
 
-    public static Path bucketFileName(Path subdir, int bucket)
+    public static Location bucketFileName(Location subdir, int bucket)
     {
-        return new Path(subdir, "bucket_%05d".formatted(bucket));
+        return subdir.appendPath("bucket_%05d".formatted(bucket));
     }
 
     public static String deltaSubdir(long writeId, int statementId)
@@ -82,7 +82,7 @@ public static String deleteDeltaSubdir(long writeId, int statementId)
         return "delete_" + deltaSubdir(writeId, statementId);
     }
 
-    public static void writeAcidVersionFile(TrinoFileSystem fileSystem, String deltaOrBaseDir)
+    public static void writeAcidVersionFile(TrinoFileSystem fileSystem, Location deltaOrBaseDir)
             throws IOException
     {
         TrinoOutputFile file = fileSystem.newOutputFile(versionFilePath(deltaOrBaseDir));
@@ -91,7 +91,7 @@ public static void writeAcidVersionFile(TrinoFileSystem fileSystem, String delta
         }
     }
 
-    public static int readAcidVersionFile(TrinoFileSystem fileSystem, String deltaOrBaseDir)
+    public static int readAcidVersionFile(TrinoFileSystem fileSystem, Location deltaOrBaseDir)
             throws IOException
     {
         TrinoInputFile file = fileSystem.newInputFile(versionFilePath(deltaOrBaseDir));
@@ -108,12 +108,12 @@ public static int readAcidVersionFile(TrinoFileSystem fileSystem, String deltaOr
         }
     }
 
-    private static String versionFilePath(String deltaOrBaseDir)
+    private static Location versionFilePath(Location deltaOrBaseDir)
     {
-        return deltaOrBaseDir + "/_orc_acid_version";
+        return deltaOrBaseDir.appendPath("_orc_acid_version");
     }
 
-    public static AcidState getAcidState(TrinoFileSystem fileSystem, String directory, ValidWriteIdList writeIdList)
+    public static AcidState getAcidState(TrinoFileSystem fileSystem, Location directory, ValidWriteIdList writeIdList)
             throws IOException
     {
         // directory = /hive/data/abc
@@ -126,7 +126,7 @@ public static AcidState getAcidState(TrinoFileSystem fileSystem, String director
         List<FileEntry> originalFiles = new ArrayList<>();
 
         for (FileEntry file : listFiles(fileSystem, directory)) {
-            String suffix = listingSuffix(directory, file.location());
+            String suffix = listingSuffix(directory.toString(), file.location().toString());
 
             int slash = suffix.indexOf('/');
             String name = (slash == -1) ? "" : suffix.substring(0, slash);
@@ -188,7 +188,7 @@ else if (file.length() > 0) {
             originalFiles.clear();
         }
 
-        originalFiles.sort(comparing(FileEntry::location));
+        originalFiles.sort(comparing(entry -> entry.location().toString()));
         workingDeltas.sort(null);
 
         List<ParsedDelta> deltas = new ArrayList<>();
@@ -217,7 +217,9 @@ else if ((prev != null) &&
             }
         }
 
-        return new AcidState(Optional.ofNullable(bestBasePath), bestBaseFiles, deltas, originalFiles);
+        Optional<Location> baseDirectory = Optional.ofNullable(bestBasePath).map(Location::of);
+
+        return new AcidState(baseDirectory, bestBaseFiles, deltas, originalFiles);
     }
 
     private static boolean isValidBase(ParsedBase base, ValidWriteIdList writeIdList, TrinoFileSystem fileSystem, String baseDir)
@@ -237,7 +239,8 @@ private static boolean isValidBase(ParsedBase base, ValidWriteIdList writeIdList
     private static boolean isCompacted(TrinoFileSystem fileSystem, String baseDir)
             throws IOException
     {
-        TrinoInputFile file = fileSystem.newInputFile(baseDir + "/_metadata_acid");
+        Location location = Location.of(baseDir).appendPath("_metadata_acid");
+        TrinoInputFile file = fileSystem.newInputFile(location);
         if (!file.exists()) {
             return false;
         }
@@ -305,14 +308,15 @@ static ParsedBase parseBase(String name)
                 parseLong(name.substring(index + 2)));
     }
 
-    private static List<FileEntry> listFiles(TrinoFileSystem fileSystem, String directory)
+    private static List<FileEntry> listFiles(TrinoFileSystem fileSystem, Location directory)
             throws IOException
     {
         List<FileEntry> files = new ArrayList<>();
         FileIterator iterator = fileSystem.listFiles(directory);
         while (iterator.hasNext()) {
             FileEntry file = iterator.next();
-            if (!file.location().contains("/_") && !file.location().contains("/.")) {
+            String path = file.location().path();
+            if (!path.contains("/_") && !path.contains("/.")) {
                 files.add(file);
             }
         }
@@ -329,7 +333,7 @@ private static String listingSuffix(String directory, String file)
     }
 
     public record AcidState(
-            Optional<String> baseDirectory,
+            Optional<Location> baseDirectory,
             List<FileEntry> baseFiles,
             List<ParsedDelta> deltas,
             List<FileEntry> originalFiles)
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/AsyncQueue.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/AsyncQueue.java
index ea0ca28c8f6b..42e81670ddac 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/AsyncQueue.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/AsyncQueue.java
@@ -17,9 +17,8 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/FieldSetterFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/FieldSetterFactory.java
deleted file mode 100644
index 1c8d16e7296b..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/FieldSetterFactory.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.util;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.primitives.Shorts;
-import com.google.common.primitives.SignedBytes;
-import io.trino.spi.block.Block;
-import io.trino.spi.type.ArrayType;
-import io.trino.spi.type.CharType;
-import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.LongTimestamp;
-import io.trino.spi.type.MapType;
-import io.trino.spi.type.RowType;
-import io.trino.spi.type.TimestampType;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.VarcharType;
-import org.apache.hadoop.hive.common.type.Timestamp;
-import org.apache.hadoop.hive.serde2.io.DateWritableV2;
-import org.apache.hadoop.hive.serde2.io.DoubleWritable;
-import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
-import org.apache.hadoop.hive.serde2.io.ShortWritable;
-import org.apache.hadoop.hive.serde2.io.TimestampWritableV2;
-import org.apache.hadoop.hive.serde2.objectinspector.SettableStructObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.StructField;
-import org.apache.hadoop.io.BooleanWritable;
-import org.apache.hadoop.io.ByteWritable;
-import org.apache.hadoop.io.BytesWritable;
-import org.apache.hadoop.io.FloatWritable;
-import org.apache.hadoop.io.IntWritable;
-import org.apache.hadoop.io.LongWritable;
-import org.apache.hadoop.io.Text;
-import org.joda.time.DateTimeZone;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static io.trino.plugin.hive.util.HiveWriteUtils.getField;
-import static io.trino.plugin.hive.util.HiveWriteUtils.getHiveDecimal;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.BooleanType.BOOLEAN;
-import static io.trino.spi.type.DateType.DATE;
-import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.IntegerType.INTEGER;
-import static io.trino.spi.type.RealType.REAL;
-import static io.trino.spi.type.SmallintType.SMALLINT;
-import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_SECOND;
-import static io.trino.spi.type.Timestamps.MILLISECONDS_PER_SECOND;
-import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MICROSECOND;
-import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_NANOSECOND;
-import static io.trino.spi.type.TinyintType.TINYINT;
-import static io.trino.spi.type.VarbinaryType.VARBINARY;
-import static java.lang.Float.intBitsToFloat;
-import static java.lang.Math.floorDiv;
-import static java.lang.Math.floorMod;
-import static java.lang.Math.toIntExact;
-import static java.util.Objects.requireNonNull;
-
-public final class FieldSetterFactory
-{
-    private final DateTimeZone timeZone;
-
-    public FieldSetterFactory(DateTimeZone timeZone)
-    {
-        this.timeZone = requireNonNull(timeZone, "timeZone is null");
-    }
-
-    public FieldSetter create(SettableStructObjectInspector rowInspector, Object row, StructField field, Type type)
-    {
-        if (BOOLEAN.equals(type)) {
-            return new BooleanFieldSetter(rowInspector, row, field);
-        }
-        if (BIGINT.equals(type)) {
-            return new BigintFieldSetter(rowInspector, row, field);
-        }
-        if (INTEGER.equals(type)) {
-            return new IntFieldSetter(rowInspector, row, field);
-        }
-        if (SMALLINT.equals(type)) {
-            return new SmallintFieldSetter(rowInspector, row, field);
-        }
-        if (TINYINT.equals(type)) {
-            return new TinyintFieldSetter(rowInspector, row, field);
-        }
-        if (REAL.equals(type)) {
-            return new FloatFieldSetter(rowInspector, row, field);
-        }
-        if (DOUBLE.equals(type)) {
-            return new DoubleFieldSetter(rowInspector, row, field);
-        }
-        if (type instanceof VarcharType) {
-            return new VarcharFieldSetter(rowInspector, row, field, type);
-        }
-        if (type instanceof CharType) {
-            return new CharFieldSetter(rowInspector, row, field, type);
-        }
-        if (VARBINARY.equals(type)) {
-            return new BinaryFieldSetter(rowInspector, row, field);
-        }
-        if (DATE.equals(type)) {
-            return new DateFieldSetter(rowInspector, row, field);
-        }
-        if (type instanceof TimestampType timestampType) {
-            return new TimestampFieldSetter(rowInspector, row, field, timestampType, timeZone);
-        }
-        if (type instanceof DecimalType decimalType) {
-            return new DecimalFieldSetter(rowInspector, row, field, decimalType);
-        }
-        if (type instanceof ArrayType arrayType) {
-            return new ArrayFieldSetter(rowInspector, row, field, arrayType.getElementType());
-        }
-        if (type instanceof MapType mapType) {
-            return new MapFieldSetter(rowInspector, row, field, mapType.getKeyType(), mapType.getValueType());
-        }
-        if (type instanceof RowType) {
-            return new RowFieldSetter(rowInspector, row, field, type.getTypeParameters());
-        }
-        throw new IllegalArgumentException("unsupported type: " + type);
-    }
-
-    public abstract static class FieldSetter
-    {
-        protected final SettableStructObjectInspector rowInspector;
-        protected final Object row;
-        protected final StructField field;
-
-        private FieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field)
-        {
-            this.rowInspector = requireNonNull(rowInspector, "rowInspector is null");
-            this.row = requireNonNull(row, "row is null");
-            this.field = requireNonNull(field, "field is null");
-        }
-
-        public abstract void setField(Block block, int position);
-    }
-
-    private static class BooleanFieldSetter
-            extends FieldSetter
-    {
-        private final BooleanWritable value = new BooleanWritable();
-
-        public BooleanFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field)
-        {
-            super(rowInspector, row, field);
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            value.set(BOOLEAN.getBoolean(block, position));
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-
-    private static class BigintFieldSetter
-            extends FieldSetter
-    {
-        private final LongWritable value = new LongWritable();
-
-        public BigintFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field)
-        {
-            super(rowInspector, row, field);
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            value.set(BIGINT.getLong(block, position));
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-
-    private static class IntFieldSetter
-            extends FieldSetter
-    {
-        private final IntWritable value = new IntWritable();
-
-        public IntFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field)
-        {
-            super(rowInspector, row, field);
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            value.set(toIntExact(INTEGER.getLong(block, position)));
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-
-    private static class SmallintFieldSetter
-            extends FieldSetter
-    {
-        private final ShortWritable value = new ShortWritable();
-
-        public SmallintFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field)
-        {
-            super(rowInspector, row, field);
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            value.set(Shorts.checkedCast(SMALLINT.getLong(block, position)));
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-
-    private static class TinyintFieldSetter
-            extends FieldSetter
-    {
-        private final ByteWritable value = new ByteWritable();
-
-        public TinyintFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field)
-        {
-            super(rowInspector, row, field);
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            value.set(SignedBytes.checkedCast(TINYINT.getLong(block, position)));
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-
-    private static class DoubleFieldSetter
-            extends FieldSetter
-    {
-        private final DoubleWritable value = new DoubleWritable();
-
-        public DoubleFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field)
-        {
-            super(rowInspector, row, field);
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            value.set(DOUBLE.getDouble(block, position));
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-
-    private static class FloatFieldSetter
-            extends FieldSetter
-    {
-        private final FloatWritable value = new FloatWritable();
-
-        public FloatFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field)
-        {
-            super(rowInspector, row, field);
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            value.set(intBitsToFloat((int) REAL.getLong(block, position)));
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-
-    private static class VarcharFieldSetter
-            extends FieldSetter
-    {
-        private final Text value = new Text();
-        private final Type type;
-
-        public VarcharFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field, Type type)
-        {
-            super(rowInspector, row, field);
-            this.type = type;
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            value.set(type.getSlice(block, position).getBytes());
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-
-    private static class CharFieldSetter
-            extends FieldSetter
-    {
-        private final Text value = new Text();
-        private final Type type;
-
-        public CharFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field, Type type)
-        {
-            super(rowInspector, row, field);
-            this.type = type;
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            value.set(type.getSlice(block, position).getBytes());
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-
-    private static class BinaryFieldSetter
-            extends FieldSetter
-    {
-        private final BytesWritable value = new BytesWritable();
-
-        public BinaryFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field)
-        {
-            super(rowInspector, row, field);
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            byte[] bytes = VARBINARY.getSlice(block, position).getBytes();
-            value.set(bytes, 0, bytes.length);
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-
-    private static class DateFieldSetter
-            extends FieldSetter
-    {
-        private final DateWritableV2 value = new DateWritableV2();
-
-        public DateFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field)
-        {
-            super(rowInspector, row, field);
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            value.set(toIntExact(DATE.getLong(block, position)));
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-
-    private static class TimestampFieldSetter
-            extends FieldSetter
-    {
-        private final DateTimeZone timeZone;
-        private final TimestampType type;
-        private final TimestampWritableV2 value = new TimestampWritableV2();
-
-        public TimestampFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field, TimestampType type, DateTimeZone timeZone)
-        {
-            super(rowInspector, row, field);
-            this.type = requireNonNull(type, "type is null");
-            this.timeZone = requireNonNull(timeZone, "timeZone is null");
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            long epochMicros;
-            int picosOfMicro;
-            if (type.isShort()) {
-                epochMicros = type.getLong(block, position);
-                picosOfMicro = 0;
-            }
-            else {
-                LongTimestamp longTimestamp = (LongTimestamp) type.getObject(block, position);
-                epochMicros = longTimestamp.getEpochMicros();
-                picosOfMicro = longTimestamp.getPicosOfMicro();
-            }
-
-            long epochSeconds = floorDiv(epochMicros, MICROSECONDS_PER_SECOND);
-            long picosOfSecond = (long) floorMod(epochMicros, MICROSECONDS_PER_SECOND) * PICOSECONDS_PER_MICROSECOND + picosOfMicro;
-
-            epochSeconds = convertLocalEpochSecondsToUtc(epochSeconds);
-            // no rounding since the data has nanosecond precision, at most
-            int nanosOfSecond = toIntExact(picosOfSecond / PICOSECONDS_PER_NANOSECOND);
-
-            Timestamp timestamp = Timestamp.ofEpochSecond(epochSeconds, nanosOfSecond);
-            value.set(timestamp);
-            rowInspector.setStructFieldData(row, field, value);
-        }
-
-        private long convertLocalEpochSecondsToUtc(long epochSeconds)
-        {
-            long epochMillis = epochSeconds * MILLISECONDS_PER_SECOND;
-            epochMillis = timeZone.convertLocalToUTC(epochMillis, false);
-            return epochMillis / MILLISECONDS_PER_SECOND;
-        }
-    }
-
-    private static class DecimalFieldSetter
-            extends FieldSetter
-    {
-        private final HiveDecimalWritable value = new HiveDecimalWritable();
-        private final DecimalType decimalType;
-
-        public DecimalFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field, DecimalType decimalType)
-        {
-            super(rowInspector, row, field);
-            this.decimalType = decimalType;
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            value.set(getHiveDecimal(decimalType, block, position));
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-
-    private class ArrayFieldSetter
-            extends FieldSetter
-    {
-        private final Type elementType;
-
-        public ArrayFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field, Type elementType)
-        {
-            super(rowInspector, row, field);
-            this.elementType = requireNonNull(elementType, "elementType is null");
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            Block arrayBlock = block.getObject(position, Block.class);
-
-            List<Object> list = new ArrayList<>(arrayBlock.getPositionCount());
-            for (int i = 0; i < arrayBlock.getPositionCount(); i++) {
-                list.add(getField(timeZone, elementType, arrayBlock, i));
-            }
-
-            rowInspector.setStructFieldData(row, field, list);
-        }
-    }
-
-    private class MapFieldSetter
-            extends FieldSetter
-    {
-        private final Type keyType;
-        private final Type valueType;
-
-        public MapFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field, Type keyType, Type valueType)
-        {
-            super(rowInspector, row, field);
-            this.keyType = requireNonNull(keyType, "keyType is null");
-            this.valueType = requireNonNull(valueType, "valueType is null");
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            Block mapBlock = block.getObject(position, Block.class);
-            Map<Object, Object> map = new HashMap<>(mapBlock.getPositionCount() * 2);
-            for (int i = 0; i < mapBlock.getPositionCount(); i += 2) {
-                map.put(
-                        getField(timeZone, keyType, mapBlock, i),
-                        getField(timeZone, valueType, mapBlock, i + 1));
-            }
-
-            rowInspector.setStructFieldData(row, field, map);
-        }
-    }
-
-    private class RowFieldSetter
-            extends FieldSetter
-    {
-        private final List<Type> fieldTypes;
-
-        public RowFieldSetter(SettableStructObjectInspector rowInspector, Object row, StructField field, List<Type> fieldTypes)
-        {
-            super(rowInspector, row, field);
-            this.fieldTypes = ImmutableList.copyOf(fieldTypes);
-        }
-
-        @Override
-        public void setField(Block block, int position)
-        {
-            Block rowBlock = block.getObject(position, Block.class);
-
-            // TODO reuse row object and use FieldSetters, like we do at the top level
-            // Ideally, we'd use the same recursive structure starting from the top, but
-            // this requires modeling row types in the same way we model table rows
-            // (multiple blocks vs all fields packed in a single block)
-            List<Object> value = new ArrayList<>(fieldTypes.size());
-            for (int i = 0; i < fieldTypes.size(); i++) {
-                value.add(getField(timeZone, fieldTypes.get(i), rowBlock, i));
-            }
-
-            rowInspector.setStructFieldData(row, field, value);
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/FooterAwareRecordReader.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/FooterAwareRecordReader.java
deleted file mode 100644
index a118e80da243..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/FooterAwareRecordReader.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.util;
-
-import org.apache.hadoop.hive.ql.exec.FooterBuffer;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.io.WritableComparable;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.RecordReader;
-
-import java.io.IOException;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static java.util.Objects.requireNonNull;
-
-public class FooterAwareRecordReader<K extends WritableComparable<?>, V extends Writable>
-        implements RecordReader<K, V>
-{
-    private final RecordReader<K, V> delegate;
-    private final JobConf job;
-    private final FooterBuffer footerBuffer = new FooterBuffer();
-
-    public FooterAwareRecordReader(RecordReader<K, V> delegate, int footerCount, JobConf job)
-            throws IOException
-    {
-        this.delegate = requireNonNull(delegate, "delegate is null");
-        this.job = requireNonNull(job, "job is null");
-
-        checkArgument(footerCount > 0, "footerCount is expected to be positive");
-
-        footerBuffer.initializeBuffer(job, delegate, footerCount, delegate.createKey(), delegate.createValue());
-    }
-
-    @Override
-    public boolean next(K key, V value)
-            throws IOException
-    {
-        return footerBuffer.updateBuffer(job, delegate, key, value);
-    }
-
-    @Override
-    public K createKey()
-    {
-        return delegate.createKey();
-    }
-
-    @Override
-    public V createValue()
-    {
-        return delegate.createValue();
-    }
-
-    @Override
-    public long getPos()
-            throws IOException
-    {
-        return delegate.getPos();
-    }
-
-    @Override
-    public void close()
-            throws IOException
-    {
-        delegate.close();
-    }
-
-    @Override
-    public float getProgress()
-            throws IOException
-    {
-        return delegate.getProgress();
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/ForwardingRecordCursor.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/ForwardingRecordCursor.java
deleted file mode 100644
index 3f1a410cd3f5..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/ForwardingRecordCursor.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.util;
-
-import io.airlift.slice.Slice;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.type.Type;
-
-public abstract class ForwardingRecordCursor
-        implements RecordCursor
-{
-    protected abstract RecordCursor delegate();
-
-    @Override
-    public long getCompletedBytes()
-    {
-        return delegate().getCompletedBytes();
-    }
-
-    @Override
-    public long getReadTimeNanos()
-    {
-        return delegate().getReadTimeNanos();
-    }
-
-    @Override
-    public Type getType(int field)
-    {
-        return delegate().getType(field);
-    }
-
-    @Override
-    public boolean advanceNextPosition()
-    {
-        return delegate().advanceNextPosition();
-    }
-
-    @Override
-    public boolean getBoolean(int field)
-    {
-        return delegate().getBoolean(field);
-    }
-
-    @Override
-    public long getLong(int field)
-    {
-        return delegate().getLong(field);
-    }
-
-    @Override
-    public double getDouble(int field)
-    {
-        return delegate().getDouble(field);
-    }
-
-    @Override
-    public Slice getSlice(int field)
-    {
-        return delegate().getSlice(field);
-    }
-
-    @Override
-    public Object getObject(int field)
-    {
-        return delegate().getObject(field);
-    }
-
-    @Override
-    public boolean isNull(int field)
-    {
-        return delegate().isNull(field);
-    }
-
-    @Override
-    public long getMemoryUsage()
-    {
-        return delegate().getMemoryUsage();
-    }
-
-    @Override
-    public void close()
-    {
-        delegate().close();
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBlockEncodingSerde.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBlockEncodingSerde.java
index d8f33da619c9..5b5b1dc2bb47 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBlockEncodingSerde.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBlockEncodingSerde.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive.util;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.slice.SliceInput;
 import io.airlift.slice.SliceOutput;
 import io.trino.spi.block.ArrayBlockEncoding;
@@ -29,13 +30,10 @@
 import io.trino.spi.block.RowBlockEncoding;
 import io.trino.spi.block.RunLengthBlockEncoding;
 import io.trino.spi.block.ShortArrayBlockEncoding;
-import io.trino.spi.block.SingleRowBlockEncoding;
 import io.trino.spi.block.VariableWidthBlockEncoding;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeId;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -74,7 +72,6 @@ public HiveBlockEncodingSerde()
         addBlockEncoding(new DictionaryBlockEncoding());
         addBlockEncoding(new ArrayBlockEncoding());
         addBlockEncoding(new RowBlockEncoding());
-        addBlockEncoding(new SingleRowBlockEncoding());
         addBlockEncoding(new RunLengthBlockEncoding());
         addBlockEncoding(new LazyBlockEncoding());
     }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBucketing.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBucketing.java
index 8886b681193b..f242e08048a3 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBucketing.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBucketing.java
@@ -125,11 +125,6 @@ public static int getHiveBucket(BucketingVersion bucketingVersion, int bucketCou
         return getBucketNumber(bucketingVersion.getBucketHashCode(types, page, position), bucketCount);
     }
 
-    public static int getHiveBucket(BucketingVersion bucketingVersion, int bucketCount, List<TypeInfo> types, Object[] values)
-    {
-        return getBucketNumber(bucketingVersion.getBucketHashCode(types, values), bucketCount);
-    }
-
     @VisibleForTesting
     static Optional<Set<Integer>> getHiveBuckets(BucketingVersion bucketingVersion, int bucketCount, List<TypeInfo> types, List<List<NullableValue>> values)
     {
@@ -215,8 +210,7 @@ public static Optional<HiveBucketFilter> getHiveBucketFilter(HiveTableHandle hiv
         }
 
         HiveBucketProperty hiveBucketProperty = hiveTable.getBucketHandle().get().toTableBucketProperty();
-        List<Column> dataColumns = hiveTable.getDataColumns().stream()
-                .map(HiveColumnHandle::toMetastoreColumn)
+        List<HiveColumnHandle> dataColumns = hiveTable.getDataColumns().stream()
                 .collect(toImmutableList());
 
         Optional<Map<ColumnHandle, List<NullableValue>>> bindings = TupleDomain.extractDiscreteValues(effectivePredicate);
@@ -247,7 +241,7 @@ public static Optional<HiveBucketFilter> getHiveBucketFilter(HiveTableHandle hiv
         return Optional.of(new HiveBucketFilter(builder.build()));
     }
 
-    private static Optional<Set<Integer>> getHiveBuckets(HiveBucketProperty hiveBucketProperty, List<Column> dataColumns, Map<ColumnHandle, List<NullableValue>> bindings)
+    private static Optional<Set<Integer>> getHiveBuckets(HiveBucketProperty hiveBucketProperty, List<HiveColumnHandle> dataColumns, Map<ColumnHandle, List<NullableValue>> bindings)
     {
         if (bindings.isEmpty()) {
             return Optional.empty();
@@ -258,8 +252,8 @@ private static Optional<Set<Integer>> getHiveBuckets(HiveBucketProperty hiveBuck
 
         // Verify the bucket column types are supported
         Map<String, HiveType> hiveTypes = new HashMap<>();
-        for (Column column : dataColumns) {
-            hiveTypes.put(column.getName(), column.getType());
+        for (HiveColumnHandle column : dataColumns) {
+            hiveTypes.put(column.getName(), column.getHiveType());
         }
         for (String column : bucketColumns) {
             if (!isTypeSupportedForBucketing(hiveTypes.get(column).getTypeInfo())) {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBucketingV1.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBucketingV1.java
index 6b6bafb816a7..ef7856a43c40 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBucketingV1.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBucketingV1.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.hive.util;
 
+import com.google.common.base.VerifyException;
 import com.google.common.primitives.Shorts;
 import com.google.common.primitives.SignedBytes;
 import io.airlift.slice.Slice;
@@ -23,11 +24,21 @@
 import io.trino.plugin.hive.type.TypeInfo;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.VarcharType;
 
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.DateType.DATE;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TinyintType.TINYINT;
 import static java.lang.Double.doubleToLongBits;
 import static java.lang.Float.floatToIntBits;
 import static java.lang.Float.intBitsToFloat;
@@ -76,51 +87,50 @@ static int hash(TypeInfo type, Block block, int position)
                 PrimitiveTypeInfo typeInfo = (PrimitiveTypeInfo) type;
                 PrimitiveCategory primitiveCategory = typeInfo.getPrimitiveCategory();
                 Type trinoType = requireNonNull(HiveTypeTranslator.fromPrimitiveType(typeInfo));
-                switch (primitiveCategory) {
-                    case BOOLEAN:
-                        return trinoType.getBoolean(block, position) ? 1 : 0;
-                    case BYTE:
-                        return SignedBytes.checkedCast(trinoType.getLong(block, position));
-                    case SHORT:
-                        return Shorts.checkedCast(trinoType.getLong(block, position));
-                    case INT:
-                        return toIntExact(trinoType.getLong(block, position));
-                    case LONG:
-                        long bigintValue = trinoType.getLong(block, position);
-                        return (int) ((bigintValue >>> 32) ^ bigintValue);
-                    case FLOAT:
-                        // convert to canonical NaN if necessary
-                        return floatToIntBits(intBitsToFloat(toIntExact(trinoType.getLong(block, position))));
-                    case DOUBLE:
-                        long doubleValue = doubleToLongBits(trinoType.getDouble(block, position));
-                        return (int) ((doubleValue >>> 32) ^ doubleValue);
-                    case STRING:
-                        return hashBytes(0, trinoType.getSlice(block, position));
-                    case VARCHAR:
-                        return hashBytes(1, trinoType.getSlice(block, position));
-                    case DATE:
-                        // day offset from 1970-01-01
-                        return toIntExact(trinoType.getLong(block, position));
-                    case TIMESTAMP:
-                        // We do not support bucketing on timestamp
-                        break;
-                    case DECIMAL:
-                    case CHAR:
-                    case BINARY:
-                    case TIMESTAMPLOCALTZ:
-                    case INTERVAL_YEAR_MONTH:
-                    case INTERVAL_DAY_TIME:
-                        // TODO
-                        break;
-                    case VOID:
-                    case UNKNOWN:
-                        break;
+                if (trinoType.equals(BOOLEAN)) {
+                    return BOOLEAN.getBoolean(block, position) ? 1 : 0;
+                }
+                if (trinoType.equals(TINYINT)) {
+                    return TINYINT.getByte(block, position);
                 }
+                if (trinoType.equals(SMALLINT)) {
+                    return SMALLINT.getShort(block, position);
+                }
+                if (trinoType.equals(INTEGER)) {
+                    return INTEGER.getInt(block, position);
+                }
+                if (trinoType.equals(BIGINT)) {
+                    long bigintValue = BIGINT.getLong(block, position);
+                    return (int) ((bigintValue >>> 32) ^ bigintValue);
+                }
+                if (trinoType.equals(REAL)) {
+                    // convert to canonical NaN if necessary
+                    return floatToIntBits(REAL.getFloat(block, position));
+                }
+                if (trinoType.equals(DOUBLE)) {
+                    long doubleValue = doubleToLongBits(DOUBLE.getDouble(block, position));
+                    return (int) ((doubleValue >>> 32) ^ doubleValue);
+                }
+                if (trinoType instanceof VarcharType varcharType) {
+                    int initial = switch (primitiveCategory) {
+                        case STRING -> 0;
+                        case VARCHAR -> 1;
+                        default -> throw new VerifyException("Unexpected category: " + primitiveCategory);
+                    };
+                    return hashBytes(initial, varcharType.getSlice(block, position));
+                }
+                if (trinoType.equals(DATE)) {
+                    // day offset from 1970-01-01
+                    return DATE.getInt(block, position);
+                }
+
+                // We do not support bucketing on the following:
+                // TIMESTAMP DECIMAL CHAR BINARY TIMESTAMPLOCALTZ INTERVAL_YEAR_MONTH INTERVAL_DAY_TIME VOID UNKNOWN
                 throw new UnsupportedOperationException("Computation of Hive bucket hashCode is not supported for Hive primitive category: " + primitiveCategory);
             case LIST:
                 return hashOfList((ListTypeInfo) type, block.getObject(position, Block.class));
             case MAP:
-                return hashOfMap((MapTypeInfo) type, block.getObject(position, Block.class));
+                return hashOfMap((MapTypeInfo) type, block.getObject(position, SqlMap.class));
             case STRUCT:
             case UNION:
                 // TODO: support more types, e.g. ROW
@@ -182,7 +192,7 @@ private static int hash(TypeInfo type, Object value)
             case LIST:
                 return hashOfList((ListTypeInfo) type, (Block) value);
             case MAP:
-                return hashOfMap((MapTypeInfo) type, (Block) value);
+                return hashOfMap((MapTypeInfo) type, (SqlMap) value);
             case STRUCT:
             case UNION:
                 // TODO: support more types, e.g. ROW
@@ -190,13 +200,18 @@ private static int hash(TypeInfo type, Object value)
         throw new UnsupportedOperationException("Computation of Hive bucket hashCode is not supported for Hive category: " + type.getCategory());
     }
 
-    private static int hashOfMap(MapTypeInfo type, Block singleMapBlock)
+    private static int hashOfMap(MapTypeInfo type, SqlMap sqlMap)
     {
         TypeInfo keyTypeInfo = type.getMapKeyTypeInfo();
         TypeInfo valueTypeInfo = type.getMapValueTypeInfo();
+
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
         int result = 0;
-        for (int i = 0; i < singleMapBlock.getPositionCount(); i += 2) {
-            result += hash(keyTypeInfo, singleMapBlock, i) ^ hash(valueTypeInfo, singleMapBlock, i + 1);
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            result += hash(keyTypeInfo, rawKeyBlock, rawOffset + i) ^ hash(valueTypeInfo, rawValueBlock, rawOffset + i);
         }
         return result;
     }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBucketingV2.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBucketingV2.java
index 65e6401e6021..e048bd9328a2 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBucketingV2.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveBucketingV2.java
@@ -24,11 +24,21 @@
 import io.trino.plugin.hive.type.TypeInfo;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.type.Type;
+import io.trino.spi.type.VarcharType;
 
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.DateType.DATE;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TinyintType.TINYINT;
 import static java.lang.Double.doubleToLongBits;
 import static java.lang.Double.doubleToRawLongBits;
 import static java.lang.Float.floatToIntBits;
@@ -79,53 +89,47 @@ private static int hash(TypeInfo type, Block block, int position)
                 PrimitiveTypeInfo typeInfo = (PrimitiveTypeInfo) type;
                 PrimitiveCategory primitiveCategory = typeInfo.getPrimitiveCategory();
                 Type trinoType = requireNonNull(HiveTypeTranslator.fromPrimitiveType(typeInfo));
-                switch (primitiveCategory) {
-                    case BOOLEAN:
-                        return trinoType.getBoolean(block, position) ? 1 : 0;
-                    case BYTE:
-                        return SignedBytes.checkedCast(trinoType.getLong(block, position));
-                    case SHORT:
-                        return murmur3(bytes(Shorts.checkedCast(trinoType.getLong(block, position))));
-                    case INT:
-                        return murmur3(bytes(toIntExact(trinoType.getLong(block, position))));
-                    case LONG:
-                        return murmur3(bytes(trinoType.getLong(block, position)));
-                    case FLOAT:
-                        // convert to canonical NaN if necessary
-                        // Sic! we're `floatToIntBits -> cast to float -> floatToRawIntBits` just as it is (implicitly) done in
-                        // https://github.com/apache/hive/blob/7dc47faddba9f079bbe2698aaa4d8712e7654f87/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java#L830
-                        return murmur3(bytes(floatToRawIntBits(floatToIntBits(intBitsToFloat(toIntExact(trinoType.getLong(block, position)))))));
-                    case DOUBLE:
-                        // Sic! we're `doubleToLongBits -> cast to double -> doubleToRawLongBits` just as it is (implicitly) done in
-                        // https://github.com/apache/hive/blob/7dc47faddba9f079bbe2698aaa4d8712e7654f87/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java#L836
-                        return murmur3(bytes(doubleToRawLongBits(doubleToLongBits(trinoType.getDouble(block, position)))));
-                    case STRING:
-                        return murmur3(trinoType.getSlice(block, position).getBytes());
-                    case VARCHAR:
-                        return murmur3(trinoType.getSlice(block, position).getBytes());
-                    case DATE:
-                        // day offset from 1970-01-01
-                        return murmur3(bytes(toIntExact(trinoType.getLong(block, position))));
-                    case TIMESTAMP:
-                        // We do not support bucketing on timestamp
-                        break;
-                    case DECIMAL:
-                    case CHAR:
-                    case BINARY:
-                    case TIMESTAMPLOCALTZ:
-                    case INTERVAL_YEAR_MONTH:
-                    case INTERVAL_DAY_TIME:
-                        // TODO
-                        break;
-                    case VOID:
-                    case UNKNOWN:
-                        break;
+                if (trinoType.equals(BOOLEAN)) {
+                    return BOOLEAN.getBoolean(block, position) ? 1 : 0;
+                }
+                if (trinoType.equals(TINYINT)) {
+                    return TINYINT.getByte(block, position);
                 }
+                if (trinoType.equals(SMALLINT)) {
+                    return murmur3(bytes(SMALLINT.getShort(block, position)));
+                }
+                if (trinoType.equals(INTEGER)) {
+                    return murmur3(bytes(INTEGER.getInt(block, position)));
+                }
+                if (trinoType.equals(BIGINT)) {
+                    return murmur3(bytes(BIGINT.getLong(block, position)));
+                }
+                if (trinoType.equals(REAL)) {
+                    // convert to canonical NaN if necessary
+                    // Sic! we're `floatToIntBits -> cast to float -> floatToRawIntBits` just as it is (implicitly) done in
+                    // https://github.com/apache/hive/blob/7dc47faddba9f079bbe2698aaa4d8712e7654f87/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java#L830
+                    return murmur3(bytes(floatToRawIntBits(floatToIntBits(REAL.getFloat(block, position)))));
+                }
+                if (trinoType.equals(DOUBLE)) {
+                    // Sic! we're `doubleToLongBits -> cast to double -> doubleToRawLongBits` just as it is (implicitly) done in
+                    // https://github.com/apache/hive/blob/7dc47faddba9f079bbe2698aaa4d8712e7654f87/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java#L836
+                    return murmur3(bytes(doubleToRawLongBits(doubleToLongBits(DOUBLE.getDouble(block, position)))));
+                }
+                if (trinoType instanceof VarcharType varcharType) {
+                    return murmur3(varcharType.getSlice(block, position).getBytes());
+                }
+                if (trinoType.equals(DATE)) {
+                    // day offset from 1970-01-01
+                    return murmur3(bytes(DATE.getInt(block, position)));
+                }
+
+                // We do not support bucketing on the following:
+                // TIMESTAMP DECIMAL CHAR BINARY TIMESTAMPLOCALTZ INTERVAL_YEAR_MONTH INTERVAL_DAY_TIME VOID UNKNOWN
                 throw new UnsupportedOperationException("Computation of Hive bucket hashCode is not supported for Hive primitive category: " + primitiveCategory);
             case LIST:
                 return hashOfList((ListTypeInfo) type, block.getObject(position, Block.class));
             case MAP:
-                return hashOfMap((MapTypeInfo) type, block.getObject(position, Block.class));
+                return hashOfMap((MapTypeInfo) type, block.getObject(position, SqlMap.class));
             case STRUCT:
             case UNION:
                 // TODO: support more types, e.g. ROW
@@ -190,7 +194,7 @@ private static int hash(TypeInfo type, Object value)
             case LIST:
                 return hashOfList((ListTypeInfo) type, (Block) value);
             case MAP:
-                return hashOfMap((MapTypeInfo) type, (Block) value);
+                return hashOfMap((MapTypeInfo) type, (SqlMap) value);
             case STRUCT:
             case UNION:
                 // TODO: support more types, e.g. ROW
@@ -198,15 +202,20 @@ private static int hash(TypeInfo type, Object value)
         throw new UnsupportedOperationException("Computation of Hive bucket hashCode is not supported for Hive category: " + type.getCategory());
     }
 
-    private static int hashOfMap(MapTypeInfo type, Block singleMapBlock)
+    private static int hashOfMap(MapTypeInfo type, SqlMap sqlMap)
     {
         TypeInfo keyTypeInfo = type.getMapKeyTypeInfo();
         TypeInfo valueTypeInfo = type.getMapValueTypeInfo();
+
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
         int result = 0;
-        for (int i = 0; i < singleMapBlock.getPositionCount(); i += 2) {
+        for (int i = 0; i < sqlMap.getSize(); i++) {
             // Sic! we're hashing map keys with v2 but map values with v1 just as in
             // https://github.com/apache/hive/blob/7dc47faddba9f079bbe2698aaa4d8712e7654f87/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java#L903-L904
-            result += hash(keyTypeInfo, singleMapBlock, i) ^ HiveBucketingV1.hash(valueTypeInfo, singleMapBlock, i + 1);
+            result += hash(keyTypeInfo, rawKeyBlock, rawOffset + i) ^ HiveBucketingV1.hash(valueTypeInfo, rawValueBlock, rawOffset + i);
         }
         return result;
     }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveClassNames.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveClassNames.java
index 4d21453cc7fc..42cbeb1e2f1d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveClassNames.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveClassNames.java
@@ -23,6 +23,10 @@ public final class HiveClassNames
     public static final String FILE_OUTPUT_FORMAT_CLASS = "org.apache.hadoop.mapred.FileOutputFormat";
     public static final String HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS = "org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat";
     public static final String HIVE_SEQUENCEFILE_OUTPUT_FORMAT_CLASS = "org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat";
+    public static final String HUDI_PARQUET_INPUT_FORMAT = "org.apache.hudi.hadoop.HoodieParquetInputFormat";
+    public static final String HUDI_PARQUET_REALTIME_INPUT_FORMAT = "org.apache.hudi.hadoop.realtime.HoodieParquetRealtimeInputFormat";
+    public static final String HUDI_INPUT_FORMAT = "com.uber.hoodie.hadoop.HoodieInputFormat";
+    public static final String HUDI_REALTIME_INPUT_FORMAT = "com.uber.hoodie.hadoop.realtime.HoodieRealtimeInputFormat";
     public static final String JSON_SERDE_CLASS = "org.apache.hive.hcatalog.data.JsonSerDe";
     public static final String OPENX_JSON_SERDE_CLASS = "org.openx.data.jsonserde.JsonSerDe";
     public static final String LAZY_BINARY_COLUMNAR_SERDE_CLASS = "org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe";
@@ -36,7 +40,7 @@ public final class HiveClassNames
     public static final String PARQUET_HIVE_SERDE_CLASS = "org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe";
     public static final String RCFILE_INPUT_FORMAT_CLASS = "org.apache.hadoop.hive.ql.io.RCFileInputFormat";
     public static final String RCFILE_OUTPUT_FORMAT_CLASS = "org.apache.hadoop.hive.ql.io.RCFileOutputFormat";
-    public static final String REGEX_HIVE_SERDE_CLASS = "org.apache.hadoop.hive.serde2.RegexSerDe";
+    public static final String REGEX_SERDE_CLASS = "org.apache.hadoop.hive.serde2.RegexSerDe";
     public static final String SEQUENCEFILE_INPUT_FORMAT_CLASS = "org.apache.hadoop.mapred.SequenceFileInputFormat";
     public static final String SYMLINK_TEXT_INPUT_FORMAT_CLASS = "org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat";
     public static final String TEXT_INPUT_FORMAT_CLASS = "org.apache.hadoop.mapred.TextInputFormat";
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveCoercionPolicy.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveCoercionPolicy.java
index ac9e4d353881..a79e398fe4bd 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveCoercionPolicy.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveCoercionPolicy.java
@@ -29,11 +29,13 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.plugin.hive.HiveType.HIVE_BYTE;
+import static io.trino.plugin.hive.HiveType.HIVE_DATE;
 import static io.trino.plugin.hive.HiveType.HIVE_DOUBLE;
 import static io.trino.plugin.hive.HiveType.HIVE_FLOAT;
 import static io.trino.plugin.hive.HiveType.HIVE_INT;
 import static io.trino.plugin.hive.HiveType.HIVE_LONG;
 import static io.trino.plugin.hive.HiveType.HIVE_SHORT;
+import static io.trino.plugin.hive.HiveType.HIVE_TIMESTAMP;
 import static io.trino.plugin.hive.util.HiveUtil.extractStructFieldTypes;
 import static java.lang.Math.min;
 import static java.lang.String.format;
@@ -62,13 +64,21 @@ private boolean canCoerce(HiveType fromHiveType, HiveType toHiveType, HiveTimest
                     toHiveType.equals(HIVE_BYTE) ||
                     toHiveType.equals(HIVE_SHORT) ||
                     toHiveType.equals(HIVE_INT) ||
-                    toHiveType.equals(HIVE_LONG);
+                    toHiveType.equals(HIVE_LONG) ||
+                    toHiveType.equals(HIVE_DATE) ||
+                    toHiveType.equals(HIVE_TIMESTAMP);
         }
         if (fromType instanceof CharType) {
             return toType instanceof CharType;
         }
         if (toType instanceof VarcharType) {
-            return fromHiveType.equals(HIVE_BYTE) || fromHiveType.equals(HIVE_SHORT) || fromHiveType.equals(HIVE_INT) || fromHiveType.equals(HIVE_LONG) || fromType instanceof DecimalType;
+            return fromHiveType.equals(HIVE_BYTE) ||
+                    fromHiveType.equals(HIVE_SHORT) ||
+                    fromHiveType.equals(HIVE_INT) ||
+                    fromHiveType.equals(HIVE_LONG) ||
+                    fromHiveType.equals(HIVE_TIMESTAMP) ||
+                    fromHiveType.equals(HIVE_DOUBLE) ||
+                    fromType instanceof DecimalType;
         }
         if (fromHiveType.equals(HIVE_BYTE)) {
             return toHiveType.equals(HIVE_SHORT) || toHiveType.equals(HIVE_INT) || toHiveType.equals(HIVE_LONG);
@@ -86,7 +96,13 @@ private boolean canCoerce(HiveType fromHiveType, HiveType toHiveType, HiveTimest
             return toHiveType.equals(HIVE_FLOAT) || toType instanceof DecimalType;
         }
         if (fromType instanceof DecimalType) {
-            return toType instanceof DecimalType || toHiveType.equals(HIVE_FLOAT) || toHiveType.equals(HIVE_DOUBLE);
+            return toType instanceof DecimalType ||
+                    toHiveType.equals(HIVE_FLOAT) ||
+                    toHiveType.equals(HIVE_DOUBLE) ||
+                    toHiveType.equals(HIVE_BYTE) ||
+                    toHiveType.equals(HIVE_SHORT) ||
+                    toHiveType.equals(HIVE_INT) ||
+                    toHiveType.equals(HIVE_LONG);
         }
 
         return canCoerceForList(fromHiveType, toHiveType, hiveTimestampPrecision)
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveTypeTranslator.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveTypeTranslator.java
index 1b44a0c8d466..574b26a76be3 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveTypeTranslator.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveTypeTranslator.java
@@ -37,14 +37,14 @@
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.TypeSignatureParameter;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.hive.formats.UnionToRowCoercionUtils.rowTypeSignatureForUnionOfTypes;
 import static io.trino.plugin.hive.HiveTimestampPrecision.DEFAULT_PRECISION;
 import static io.trino.plugin.hive.HiveType.HIVE_BINARY;
 import static io.trino.plugin.hive.HiveType.HIVE_BOOLEAN;
@@ -75,11 +75,11 @@
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TimestampType.createTimestampType;
+import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.TypeSignature.arrayType;
 import static io.trino.spi.type.TypeSignature.mapType;
 import static io.trino.spi.type.TypeSignature.rowType;
-import static io.trino.spi.type.TypeSignatureParameter.namedField;
 import static io.trino.spi.type.TypeSignatureParameter.typeParameter;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
@@ -91,10 +91,6 @@ public final class HiveTypeTranslator
 {
     private HiveTypeTranslator() {}
 
-    public static final String UNION_FIELD_TAG_NAME = "tag";
-    public static final String UNION_FIELD_FIELD_PREFIX = "field";
-    public static final Type UNION_FIELD_TAG_TYPE = TINYINT;
-
     public static TypeInfo toTypeInfo(Type type)
     {
         requireNonNull(type, "type is null");
@@ -212,13 +208,9 @@ public static TypeSignature toTypeSignature(TypeInfo typeInfo, HiveTimestampPrec
                 // Use a row type to represent a union type in Hive for reading
                 UnionTypeInfo unionTypeInfo = (UnionTypeInfo) typeInfo;
                 List<TypeInfo> unionObjectTypes = unionTypeInfo.getAllUnionObjectTypeInfos();
-                ImmutableList.Builder<TypeSignatureParameter> typeSignatures = ImmutableList.builder();
-                typeSignatures.add(namedField(UNION_FIELD_TAG_NAME, UNION_FIELD_TAG_TYPE.getTypeSignature()));
-                for (int i = 0; i < unionObjectTypes.size(); i++) {
-                    TypeInfo unionObjectType = unionObjectTypes.get(i);
-                    typeSignatures.add(namedField(UNION_FIELD_FIELD_PREFIX + i, toTypeSignature(unionObjectType, timestampPrecision)));
-                }
-                return rowType(typeSignatures.build());
+                return rowTypeSignatureForUnionOfTypes(unionObjectTypes.stream()
+                        .map(unionObjectType -> toTypeSignature(unionObjectType, timestampPrecision))
+                        .collect(toImmutableList()));
         }
         throw new TrinoException(NOT_SUPPORTED, format("Unsupported Hive type: %s", typeInfo));
     }
@@ -261,6 +253,8 @@ private static Type fromPrimitiveType(PrimitiveTypeInfo typeInfo, HiveTimestampP
                 return DATE;
             case TIMESTAMP:
                 return createTimestampType(timestampPrecision.getPrecision());
+            case TIMESTAMPLOCALTZ:
+                return createTimestampWithTimeZoneType(timestampPrecision.getPrecision());
             case BINARY:
                 return VARBINARY;
             case DECIMAL:
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveUtil.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveUtil.java
index 78976db0f36c..a5aae9edb77d 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveUtil.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveUtil.java
@@ -14,35 +14,29 @@
 package io.trino.plugin.hive.util;
 
 import com.google.common.base.CharMatcher;
-import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
-import io.airlift.compress.lzo.LzoCodec;
-import io.airlift.compress.lzo.LzopCodec;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceUtf8;
-import io.airlift.slice.Slices;
-import io.trino.hadoop.TextLineLengthLimitExceededException;
-import io.trino.hive.formats.compression.CompressionKind;
+import io.trino.filesystem.Location;
 import io.trino.orc.OrcWriterOptions;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.HivePartitionKey;
-import io.trino.plugin.hive.HiveStorageFormat;
 import io.trino.plugin.hive.HiveTimestampPrecision;
 import io.trino.plugin.hive.HiveType;
-import io.trino.plugin.hive.avro.TrinoAvroSerDe;
+import io.trino.plugin.hive.aws.athena.PartitionProjectionService;
 import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.SortingColumn;
 import io.trino.plugin.hive.metastore.Table;
-import io.trino.plugin.hive.type.Category;
 import io.trino.plugin.hive.type.StructTypeInfo;
 import io.trino.spi.ErrorCodeSupplier;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
@@ -54,26 +48,7 @@
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat;
-import org.apache.hadoop.hive.serde2.AbstractSerDe;
-import org.apache.hadoop.hive.serde2.Deserializer;
-import org.apache.hadoop.hive.serde2.SerDeException;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.io.WritableComparable;
-import org.apache.hadoop.io.compress.CompressionCodec;
-import org.apache.hadoop.io.compress.CompressionCodecFactory;
-import org.apache.hadoop.mapred.FileSplit;
-import org.apache.hadoop.mapred.InputFormat;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.RecordReader;
-import org.apache.hadoop.mapred.Reporter;
-import org.apache.hadoop.mapred.TextInputFormat;
-import org.apache.hadoop.util.ReflectionUtils;
+import jakarta.annotation.Nullable;
 import org.joda.time.DateTimeZone;
 import org.joda.time.Days;
 import org.joda.time.LocalDateTime;
@@ -84,12 +59,6 @@
 import org.joda.time.format.DateTimeParser;
 import org.joda.time.format.DateTimePrinter;
 
-import javax.annotation.Nullable;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.util.HexFormat;
 import java.util.List;
@@ -99,15 +68,10 @@
 import java.util.Properties;
 import java.util.function.Function;
 
-import static com.google.common.base.MoreObjects.firstNonNull;
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.concat;
-import static com.google.common.collect.Lists.newArrayList;
 import static io.airlift.slice.Slices.utf8Slice;
-import static io.trino.hdfs.ConfigurationUtils.copy;
-import static io.trino.hdfs.ConfigurationUtils.toJobConf;
 import static io.trino.hive.thrift.metastore.hive_metastoreConstants.FILE_INPUT_FORMAT;
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.PARTITION_KEY;
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
@@ -122,31 +86,28 @@
 import static io.trino.plugin.hive.HiveColumnHandle.isPathColumnHandle;
 import static io.trino.plugin.hive.HiveColumnHandle.partitionColumnHandle;
 import static io.trino.plugin.hive.HiveColumnHandle.pathColumnHandle;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_BAD_DATA;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_CANNOT_OPEN_SPLIT;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_METADATA;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_PARTITION_VALUE;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_SERDE_NOT_FOUND;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_UNSUPPORTED_FORMAT;
 import static io.trino.plugin.hive.HiveMetadata.ORC_BLOOM_FILTER_COLUMNS_KEY;
 import static io.trino.plugin.hive.HiveMetadata.ORC_BLOOM_FILTER_FPP_KEY;
 import static io.trino.plugin.hive.HiveMetadata.SKIP_FOOTER_COUNT_KEY;
 import static io.trino.plugin.hive.HiveMetadata.SKIP_HEADER_COUNT_KEY;
 import static io.trino.plugin.hive.HivePartitionKey.HIVE_DEFAULT_DYNAMIC_PARTITION;
-import static io.trino.plugin.hive.HiveStorageFormat.TEXTFILE;
+import static io.trino.plugin.hive.HiveSessionProperties.getTimestampPrecision;
 import static io.trino.plugin.hive.HiveTableProperties.ORC_BLOOM_FILTER_FPP;
 import static io.trino.plugin.hive.HiveType.toHiveTypes;
 import static io.trino.plugin.hive.metastore.SortingColumn.Order.ASCENDING;
 import static io.trino.plugin.hive.metastore.SortingColumn.Order.DESCENDING;
 import static io.trino.plugin.hive.util.HiveBucketing.isSupportedBucketing;
-import static io.trino.plugin.hive.util.HiveClassNames.AVRO_SERDE_CLASS;
-import static io.trino.plugin.hive.util.HiveClassNames.LAZY_SIMPLE_SERDE_CLASS;
-import static io.trino.plugin.hive.util.HiveClassNames.SYMLINK_TEXT_INPUT_FORMAT_CLASS;
-import static io.trino.plugin.hive.util.SerdeConstants.COLLECTION_DELIM;
+import static io.trino.plugin.hive.util.HiveClassNames.HUDI_INPUT_FORMAT;
+import static io.trino.plugin.hive.util.HiveClassNames.HUDI_PARQUET_INPUT_FORMAT;
+import static io.trino.plugin.hive.util.HiveClassNames.HUDI_PARQUET_REALTIME_INPUT_FORMAT;
+import static io.trino.plugin.hive.util.HiveClassNames.HUDI_REALTIME_INPUT_FORMAT;
 import static io.trino.plugin.hive.util.SerdeConstants.LIST_COLUMNS;
 import static io.trino.plugin.hive.util.SerdeConstants.LIST_COLUMN_TYPES;
 import static io.trino.plugin.hive.util.SerdeConstants.SERIALIZATION_LIB;
-import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -174,31 +135,21 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.joining;
-import static org.apache.hadoop.hive.serde2.ColumnProjectionUtils.READ_ALL_COLUMNS;
-import static org.apache.hadoop.hive.serde2.ColumnProjectionUtils.READ_COLUMN_IDS_CONF_STR;
 
 public final class HiveUtil
 {
     public static final String SPARK_TABLE_PROVIDER_KEY = "spark.sql.sources.provider";
     public static final String DELTA_LAKE_PROVIDER = "delta";
-    public static final String SPARK_TABLE_BUCKET_NUMBER_KEY = "spark.sql.sources.schema.numBuckets";
+    private static final String SPARK_TABLE_BUCKET_NUMBER_KEY = "spark.sql.sources.schema.numBuckets";
 
     public static final String ICEBERG_TABLE_TYPE_NAME = "table_type";
     public static final String ICEBERG_TABLE_TYPE_VALUE = "iceberg";
 
-    // Input formats class names are listed below as String due to hudi-hadoop-mr dependency is not in the context of trino-hive plugin
-    private static final String HUDI_PARQUET_INPUT_FORMAT = "org.apache.hudi.hadoop.HoodieParquetInputFormat";
-    private static final String HUDI_PARQUET_REALTIME_INPUT_FORMAT = "org.apache.hudi.hadoop.realtime.HoodieParquetRealtimeInputFormat";
-    private static final String HUDI_INPUT_FORMAT = "com.uber.hoodie.hadoop.HoodieInputFormat";
-    private static final String HUDI_REALTIME_INPUT_FORMAT = "com.uber.hoodie.hadoop.realtime.HoodieRealtimeInputFormat";
-
     private static final HexFormat HEX_UPPER_FORMAT = HexFormat.of().withUpperCase();
 
     private static final LocalDateTime EPOCH_DAY = new LocalDateTime(1970, 1, 1, 0, 0);
     private static final DateTimeFormatter HIVE_DATE_PARSER;
     private static final DateTimeFormatter HIVE_TIMESTAMP_PARSER;
-    private static final Field COMPRESSION_CODECS_FIELD;
 
     private static final String BIG_DECIMAL_POSTFIX = "BD";
 
@@ -208,6 +159,13 @@ public final class HiveUtil
             .or(CharMatcher.anyOf("\"#%'*/:=?\\\u007F{[]^"))
             .precomputed();
 
+    private static final CharMatcher DOT_MATCHER = CharMatcher.is('.');
+
+    public static String splitError(Throwable t, Location location, long start, long length)
+    {
+        return format("Error opening Hive split %s (offset=%s, length=%s): %s", location, start, length, t.getMessage());
+    }
+
     static {
         DateTimeParser[] timestampWithoutTimeZoneParser = {
                 DateTimeFormat.forPattern("yyyy-M-d").getParser(),
@@ -220,187 +178,18 @@ public final class HiveUtil
         DateTimePrinter timestampWithoutTimeZonePrinter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSSSSSSSS").getPrinter();
         HIVE_TIMESTAMP_PARSER = new DateTimeFormatterBuilder().append(timestampWithoutTimeZonePrinter, timestampWithoutTimeZoneParser).toFormatter().withZoneUTC();
         HIVE_DATE_PARSER = new DateTimeFormatterBuilder().append(timestampWithoutTimeZonePrinter, timestampWithoutTimeZoneParser).toFormatter().withZoneUTC();
-
-        try {
-            COMPRESSION_CODECS_FIELD = TextInputFormat.class.getDeclaredField("compressionCodecs");
-            COMPRESSION_CODECS_FIELD.setAccessible(true);
-        }
-        catch (ReflectiveOperationException e) {
-            throw new AssertionError(e);
-        }
     }
 
     private HiveUtil()
     {
     }
 
-    public static RecordReader<?, ?> createRecordReader(Configuration configuration, Path path, long start, long length, Properties schema, List<HiveColumnHandle> columns)
-    {
-        // determine which hive columns we will read
-        List<HiveColumnHandle> readColumns = columns.stream()
-                .filter(column -> column.getColumnType() == REGULAR)
-                .collect(toImmutableList());
-
-        // Projected columns are not supported here
-        readColumns.forEach(readColumn -> checkArgument(readColumn.isBaseColumn(), "column %s is not a base column", readColumn.getName()));
-
-        List<Integer> readHiveColumnIndexes = readColumns.stream()
-                .map(HiveColumnHandle::getBaseHiveColumnIndex)
-                .collect(toImmutableList());
-
-        // Tell hive the columns we would like to read, this lets hive optimize reading column oriented files
-        configuration = copy(configuration);
-        setReadColumns(configuration, readHiveColumnIndexes);
-
-        InputFormat<?, ?> inputFormat = getInputFormat(configuration, schema, true);
-        JobConf jobConf = toJobConf(configuration);
-        FileSplit fileSplit = new FileSplit(path, start, length, (String[]) null);
-
-        // propagate serialization configuration to getRecordReader
-        schema.stringPropertyNames().stream()
-                .filter(name -> name.startsWith("serialization."))
-                .forEach(name -> jobConf.set(name, schema.getProperty(name)));
-
-        configureCompressionCodecs(jobConf);
-
-        try {
-            @SuppressWarnings("unchecked")
-            RecordReader<? extends WritableComparable<?>, ? extends Writable> recordReader = (RecordReader<? extends WritableComparable<?>, ? extends Writable>)
-                    inputFormat.getRecordReader(fileSplit, jobConf, Reporter.NULL);
-
-            int headerCount = getHeaderCount(schema);
-            //  Only skip header rows when the split is at the beginning of the file
-            if (start == 0 && headerCount > 0) {
-                skipHeader(recordReader, headerCount);
-            }
-
-            int footerCount = getFooterCount(schema);
-            if (footerCount > 0) {
-                recordReader = new FooterAwareRecordReader<>(recordReader, footerCount, jobConf);
-            }
-
-            return recordReader;
-        }
-        catch (IOException e) {
-            if (e instanceof TextLineLengthLimitExceededException) {
-                throw new TrinoException(HIVE_BAD_DATA, "Line too long in text file: " + path, e);
-            }
-
-            throw new TrinoException(HIVE_CANNOT_OPEN_SPLIT, format("Error opening Hive split %s (offset=%s, length=%s) using %s: %s",
-                    path,
-                    start,
-                    length,
-                    getInputFormatName(schema),
-                    firstNonNull(e.getMessage(), e.getClass().getName())),
-                    e);
-        }
-    }
-
-    private static <K, V> void skipHeader(RecordReader<K, V> reader, int headerCount)
-            throws IOException
-    {
-        K key = reader.createKey();
-        V value = reader.createValue();
-
-        while (headerCount > 0) {
-            if (!reader.next(key, value)) {
-                return;
-            }
-            headerCount--;
-        }
-    }
-
-    public static void setReadColumns(Configuration configuration, List<Integer> readHiveColumnIndexes)
-    {
-        configuration.set(READ_COLUMN_IDS_CONF_STR, Joiner.on(',').join(readHiveColumnIndexes));
-        configuration.setBoolean(READ_ALL_COLUMNS, false);
-    }
-
-    private static void configureCompressionCodecs(JobConf jobConf)
-    {
-        // add Airlift LZO and LZOP to head of codecs list so as to not override existing entries
-        List<String> codecs = newArrayList(Splitter.on(",").trimResults().omitEmptyStrings().split(jobConf.get("io.compression.codecs", "")));
-        if (!codecs.contains(LzoCodec.class.getName())) {
-            codecs.add(0, LzoCodec.class.getName());
-        }
-        if (!codecs.contains(LzopCodec.class.getName())) {
-            codecs.add(0, LzopCodec.class.getName());
-        }
-        jobConf.set("io.compression.codecs", codecs.stream().collect(joining(",")));
-    }
-
-    public static Optional<CompressionCodec> getCompressionCodec(TextInputFormat inputFormat, Path file)
-    {
-        CompressionCodecFactory compressionCodecFactory;
-
-        try {
-            compressionCodecFactory = (CompressionCodecFactory) COMPRESSION_CODECS_FIELD.get(inputFormat);
-        }
-        catch (IllegalAccessException e) {
-            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Failed to find compressionCodec for inputFormat: " + inputFormat.getClass().getName(), e);
-        }
-
-        if (compressionCodecFactory == null) {
-            return Optional.empty();
-        }
-
-        return Optional.ofNullable(compressionCodecFactory.getCodec(file));
-    }
-
-    public static InputFormat<?, ?> getInputFormat(Configuration configuration, Properties schema, boolean symlinkTarget)
-    {
-        String inputFormatName = getInputFormatName(schema);
-        try {
-            JobConf jobConf = toJobConf(configuration);
-            configureCompressionCodecs(jobConf);
-
-            Class<? extends InputFormat<?, ?>> inputFormatClass = getInputFormatClass(jobConf, inputFormatName);
-            if (symlinkTarget && inputFormatClass.getName().equals(SYMLINK_TEXT_INPUT_FORMAT_CLASS)) {
-                String serde = getDeserializerClassName(schema);
-                // LazySimpleSerDe is used by TEXTFILE and SEQUENCEFILE. Default to TEXTFILE
-                // per Hive spec (https://hive.apache.org/javadocs/r2.1.1/api/org/apache/hadoop/hive/ql/io/SymlinkTextInputFormat.html)
-                if (serde.equals(TEXTFILE.getSerde())) {
-                    inputFormatClass = getInputFormatClass(jobConf, TEXTFILE.getInputFormat());
-                    return ReflectionUtils.newInstance(inputFormatClass, jobConf);
-                }
-                for (HiveStorageFormat format : HiveStorageFormat.values()) {
-                    if (serde.equals(format.getSerde())) {
-                        inputFormatClass = getInputFormatClass(jobConf, format.getInputFormat());
-                        return ReflectionUtils.newInstance(inputFormatClass, jobConf);
-                    }
-                }
-                throw new TrinoException(HIVE_UNSUPPORTED_FORMAT, "Unknown SerDe for SymlinkTextInputFormat: " + serde);
-            }
-
-            return ReflectionUtils.newInstance(inputFormatClass, jobConf);
-        }
-        catch (ClassNotFoundException | RuntimeException e) {
-            throw new TrinoException(HIVE_UNSUPPORTED_FORMAT, "Unable to create input format " + inputFormatName, e);
-        }
-    }
-
-    @SuppressWarnings({"unchecked", "RedundantCast"})
-    private static Class<? extends InputFormat<?, ?>> getInputFormatClass(JobConf conf, String inputFormatName)
-            throws ClassNotFoundException
-    {
-        // legacy names for Parquet
-        if ("parquet.hive.DeprecatedParquetInputFormat".equals(inputFormatName) ||
-                "parquet.hive.MapredParquetInputFormat".equals(inputFormatName)) {
-            return MapredParquetInputFormat.class;
-        }
-
-        Class<?> clazz = conf.getClassByName(inputFormatName);
-        return (Class<? extends InputFormat<?, ?>>) clazz.asSubclass(InputFormat.class);
-    }
-
-    public static String getInputFormatName(Properties schema)
+    public static Optional<String> getInputFormatName(Properties schema)
     {
-        String name = schema.getProperty(FILE_INPUT_FORMAT);
-        checkCondition(name != null, HIVE_INVALID_METADATA, "Table or partition is missing Hive input format property: %s", FILE_INPUT_FORMAT);
-        return name;
+        return Optional.ofNullable(schema.getProperty(FILE_INPUT_FORMAT));
     }
 
-    public static long parseHiveDate(String value)
+    private static long parseHiveDate(String value)
     {
         LocalDateTime date = HIVE_DATE_PARSER.parseLocalDateTime(value);
         if (!date.toLocalTime().equals(LocalTime.MIDNIGHT)) {
@@ -414,55 +203,6 @@ public static long parseHiveTimestamp(String value)
         return HIVE_TIMESTAMP_PARSER.parseMillis(value) * MICROSECONDS_PER_MILLISECOND;
     }
 
-    public static boolean isSplittable(InputFormat<?, ?> inputFormat, FileSystem fileSystem, Path path)
-    {
-        // TODO move this to HiveStorageFormat when Hadoop library is removed
-        switch (inputFormat.getClass().getSimpleName()) {
-            case "OrcInputFormat", "MapredParquetInputFormat", "AvroContainerInputFormat", "RCFileInputFormat", "SequenceFileInputFormat" -> {
-                // These formats have splitting built into the format
-                return true;
-            }
-            case "TextInputFormat" -> {
-                // Only uncompressed text input format is splittable
-                return CompressionKind.forFile(path.getName()).isEmpty();
-            }
-        }
-
-        // use reflection to get isSplittable method on FileInputFormat
-        Method method = null;
-        for (Class<?> clazz = inputFormat.getClass(); clazz != null; clazz = clazz.getSuperclass()) {
-            try {
-                method = clazz.getDeclaredMethod("isSplitable", FileSystem.class, Path.class);
-                break;
-            }
-            catch (NoSuchMethodException ignored) {
-            }
-        }
-
-        if (method == null) {
-            return false;
-        }
-        try {
-            method.setAccessible(true);
-            return (boolean) method.invoke(inputFormat, fileSystem, path);
-        }
-        catch (InvocationTargetException | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static StructObjectInspector getTableObjectInspector(Deserializer deserializer)
-    {
-        try {
-            ObjectInspector inspector = deserializer.getObjectInspector();
-            checkArgument(inspector.getCategory() == ObjectInspector.Category.STRUCT, "expected STRUCT: %s", inspector.getCategory());
-            return (StructObjectInspector) inspector;
-        }
-        catch (SerDeException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     public static String getDeserializerClassName(Properties schema)
     {
         String name = schema.getProperty(SERIALIZATION_LIB);
@@ -470,70 +210,7 @@ public static String getDeserializerClassName(Properties schema)
         return name;
     }
 
-    public static Deserializer getDeserializer(Configuration configuration, Properties schema)
-    {
-        String name = getDeserializerClassName(schema);
-
-        // for collection delimiter, Hive 1.x, 2.x uses "colelction.delim" but Hive 3.x uses "collection.delim"
-        // see also https://issues.apache.org/jira/browse/HIVE-16922
-        if (name.equals(LAZY_SIMPLE_SERDE_CLASS)) {
-            if (schema.containsKey("colelction.delim") && !schema.containsKey(COLLECTION_DELIM)) {
-                schema.setProperty(COLLECTION_DELIM, schema.getProperty("colelction.delim"));
-            }
-        }
-
-        Deserializer deserializer = createDeserializer(getDeserializerClass(name));
-        initializeDeserializer(configuration, deserializer, schema);
-        return deserializer;
-    }
-
-    private static Class<? extends Deserializer> getDeserializerClass(String name)
-    {
-        if (AVRO_SERDE_CLASS.equals(name)) {
-            return TrinoAvroSerDe.class;
-        }
-
-        try {
-            return Class.forName(name).asSubclass(Deserializer.class);
-        }
-        catch (ClassNotFoundException e) {
-            throw new TrinoException(HIVE_SERDE_NOT_FOUND, "deserializer does not exist: " + name);
-        }
-        catch (ClassCastException e) {
-            throw new RuntimeException("invalid deserializer class: " + name);
-        }
-    }
-
-    private static Deserializer createDeserializer(Class<? extends Deserializer> clazz)
-    {
-        try {
-            return clazz.getConstructor().newInstance();
-        }
-        catch (ReflectiveOperationException e) {
-            throw new RuntimeException("error creating deserializer: " + clazz.getName(), e);
-        }
-    }
-
-    private static void initializeDeserializer(Configuration configuration, Deserializer deserializer, Properties schema)
-    {
-        try {
-            configuration = copy(configuration); // Some SerDes (e.g. Avro) modify passed configuration
-            deserializer.initialize(configuration, schema);
-            validate(deserializer);
-        }
-        catch (SerDeException | RuntimeException e) {
-            throw new RuntimeException("error initializing deserializer: " + deserializer.getClass().getName(), e);
-        }
-    }
-
-    private static void validate(Deserializer deserializer)
-    {
-        if (deserializer instanceof AbstractSerDe && !((AbstractSerDe) deserializer).getConfigurationErrors().isEmpty()) {
-            throw new RuntimeException("There are configuration errors: " + ((AbstractSerDe) deserializer).getConfigurationErrors());
-        }
-    }
-
-    public static boolean isHiveNull(byte[] bytes)
+    private static boolean isHiveNull(byte[] bytes)
     {
         return bytes.length == 2 && bytes[0] == '\\' && bytes[1] == 'N';
     }
@@ -685,7 +362,7 @@ public static NullableValue parsePartitionValue(String partitionName, String val
             if (isNull) {
                 return NullableValue.asNull(type);
             }
-            return NullableValue.of(type, Slices.utf8Slice(value));
+            return NullableValue.of(type, utf8Slice(value));
         }
 
         throw new VerifyException(format("Unhandled type [%s] for partition: %s", type, partitionName));
@@ -696,12 +373,7 @@ public static boolean isStructuralType(Type type)
         return (type instanceof ArrayType) || (type instanceof MapType) || (type instanceof RowType);
     }
 
-    public static boolean isStructuralType(HiveType hiveType)
-    {
-        return hiveType.getCategory() == Category.LIST || hiveType.getCategory() == Category.MAP || hiveType.getCategory() == Category.STRUCT || hiveType.getCategory() == Category.UNION;
-    }
-
-    public static boolean booleanPartitionKey(String value, String name)
+    private static boolean booleanPartitionKey(String value, String name)
     {
         if (value.equalsIgnoreCase("true")) {
             return true;
@@ -712,7 +384,7 @@ public static boolean booleanPartitionKey(String value, String name)
         throw new TrinoException(HIVE_INVALID_PARTITION_VALUE, format("Invalid partition value '%s' for BOOLEAN partition key: %s", value, name));
     }
 
-    public static long bigintPartitionKey(String value, String name)
+    private static long bigintPartitionKey(String value, String name)
     {
         try {
             return parseLong(value);
@@ -722,7 +394,7 @@ public static long bigintPartitionKey(String value, String name)
         }
     }
 
-    public static long integerPartitionKey(String value, String name)
+    private static long integerPartitionKey(String value, String name)
     {
         try {
             return parseInt(value);
@@ -732,7 +404,7 @@ public static long integerPartitionKey(String value, String name)
         }
     }
 
-    public static long smallintPartitionKey(String value, String name)
+    private static long smallintPartitionKey(String value, String name)
     {
         try {
             return parseShort(value);
@@ -742,7 +414,7 @@ public static long smallintPartitionKey(String value, String name)
         }
     }
 
-    public static long tinyintPartitionKey(String value, String name)
+    private static long tinyintPartitionKey(String value, String name)
     {
         try {
             return parseByte(value);
@@ -752,7 +424,7 @@ public static long tinyintPartitionKey(String value, String name)
         }
     }
 
-    public static long floatPartitionKey(String value, String name)
+    private static long floatPartitionKey(String value, String name)
     {
         try {
             return floatToRawIntBits(parseFloat(value));
@@ -762,7 +434,7 @@ public static long floatPartitionKey(String value, String name)
         }
     }
 
-    public static double doublePartitionKey(String value, String name)
+    private static double doublePartitionKey(String value, String name)
     {
         try {
             return parseDouble(value);
@@ -772,7 +444,7 @@ public static double doublePartitionKey(String value, String name)
         }
     }
 
-    public static long datePartitionKey(String value, String name)
+    private static long datePartitionKey(String value, String name)
     {
         try {
             return parseHiveDate(value);
@@ -782,7 +454,7 @@ public static long datePartitionKey(String value, String name)
         }
     }
 
-    public static long timestampPartitionKey(String value, String name)
+    private static long timestampPartitionKey(String value, String name)
     {
         try {
             return parseHiveTimestamp(value);
@@ -792,12 +464,12 @@ public static long timestampPartitionKey(String value, String name)
         }
     }
 
-    public static long shortDecimalPartitionKey(String value, DecimalType type, String name)
+    private static long shortDecimalPartitionKey(String value, DecimalType type, String name)
     {
         return decimalPartitionKey(value, type, name).unscaledValue().longValue();
     }
 
-    public static Int128 longDecimalPartitionKey(String value, DecimalType type, String name)
+    private static Int128 longDecimalPartitionKey(String value, DecimalType type, String name)
     {
         return Int128.valueOf(decimalPartitionKey(value, type, name).unscaledValue());
     }
@@ -821,9 +493,9 @@ private static BigDecimal decimalPartitionKey(String value, DecimalType type, St
         }
     }
 
-    public static Slice varcharPartitionKey(String value, String name, Type columnType)
+    private static Slice varcharPartitionKey(String value, String name, Type columnType)
     {
-        Slice partitionKey = Slices.utf8Slice(value);
+        Slice partitionKey = utf8Slice(value);
         VarcharType varcharType = (VarcharType) columnType;
         if (!varcharType.isUnbounded() && SliceUtf8.countCodePoints(partitionKey) > varcharType.getBoundedLength()) {
             throw new TrinoException(HIVE_INVALID_PARTITION_VALUE, format("Invalid partition value '%s' for %s partition key: %s", value, columnType, name));
@@ -831,9 +503,9 @@ public static Slice varcharPartitionKey(String value, String name, Type columnTy
         return partitionKey;
     }
 
-    public static Slice charPartitionKey(String value, String name, Type columnType)
+    private static Slice charPartitionKey(String value, String name, Type columnType)
     {
-        Slice partitionKey = trimTrailingSpaces(Slices.utf8Slice(value));
+        Slice partitionKey = trimTrailingSpaces(utf8Slice(value));
         CharType charType = (CharType) columnType;
         if (SliceUtf8.countCodePoints(partitionKey) > charType.getLength()) {
             throw new TrinoException(HIVE_INVALID_PARTITION_VALUE, format("Invalid partition value '%s' for %s partition key: %s", value, columnType, name));
@@ -841,6 +513,13 @@ public static Slice charPartitionKey(String value, String name, Type columnType)
         return partitionKey;
     }
 
+    public static List<ColumnMetadata> getTableColumnMetadata(ConnectorSession session, Table table, TypeManager typeManager)
+    {
+        return hiveColumnHandles(table, typeManager, getTimestampPrecision(session)).stream()
+                .map(columnMetadataGetter(table))
+                .collect(toImmutableList());
+    }
+
     public static List<HiveColumnHandle> hiveColumnHandles(Table table, TypeManager typeManager, HiveTimestampPrecision timestampPrecision)
     {
         ImmutableList.Builder<HiveColumnHandle> columns = ImmutableList.builder();
@@ -939,7 +618,7 @@ public static List<String> toPartitionValues(String partitionName)
     public static NullableValue getPrefilledColumnValue(
             HiveColumnHandle columnHandle,
             HivePartitionKey partitionKey,
-            Path path,
+            String path,
             OptionalInt bucketNumber,
             long fileSize,
             long fileModifiedTime,
@@ -950,7 +629,7 @@ public static NullableValue getPrefilledColumnValue(
             columnValue = partitionKey.getValue();
         }
         else if (isPathColumnHandle(columnHandle)) {
-            columnValue = path.toString();
+            columnValue = path;
         }
         else if (isBucketColumnHandle(columnHandle)) {
             columnValue = String.valueOf(bucketNumber.getAsInt());
@@ -1125,8 +804,7 @@ public static boolean isDeltaLakeTable(Table table)
 
     public static boolean isDeltaLakeTable(Map<String, String> tableParameters)
     {
-        return tableParameters.containsKey(SPARK_TABLE_PROVIDER_KEY)
-                && tableParameters.get(SPARK_TABLE_PROVIDER_KEY).toLowerCase(ENGLISH).equals(DELTA_LAKE_PROVIDER);
+        return DELTA_LAKE_PROVIDER.equalsIgnoreCase(tableParameters.get(SPARK_TABLE_PROVIDER_KEY));
     }
 
     public static boolean isIcebergTable(Table table)
@@ -1187,6 +865,7 @@ public static Function<HiveColumnHandle, ColumnMetadata> columnMetadataGetter(Ta
                 .setComment(handle.isHidden() ? Optional.empty() : columnComment.get(handle.getName()))
                 .setExtraInfo(Optional.ofNullable(columnExtraInfo(handle.isPartitionKey())))
                 .setHidden(handle.isHidden())
+                .setProperties(PartitionProjectionService.getPartitionProjectionTrinoColumnProperties(table, handle.getName()))
                 .build();
     }
 
@@ -1230,6 +909,28 @@ public static String unescapePathName(String path)
         return sb.toString();
     }
 
+    public static String escapeSchemaName(String schemaName)
+    {
+        if (isNullOrEmpty(schemaName)) {
+            throw new IllegalArgumentException("The provided schemaName cannot be null or empty");
+        }
+        if (DOT_MATCHER.matchesAllOf(schemaName)) {
+            throw new TrinoException(GENERIC_USER_ERROR, "Invalid schema name");
+        }
+        return escapePathName(schemaName);
+    }
+
+    public static String escapeTableName(String tableName)
+    {
+        if (isNullOrEmpty(tableName)) {
+            throw new IllegalArgumentException("The provided tableName cannot be null or empty");
+        }
+        if (DOT_MATCHER.matchesAllOf(tableName)) {
+            throw new TrinoException(GENERIC_USER_ERROR, "Invalid table name");
+        }
+        return escapePathName(tableName);
+    }
+
     // copy of org.apache.hadoop.hive.common.FileUtils#escapePathName
     public static String escapePathName(String path)
     {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveWriteUtils.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveWriteUtils.java
index 7c814233bcf3..902a8cd0d80b 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveWriteUtils.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveWriteUtils.java
@@ -15,23 +15,19 @@
 
 import com.google.common.base.CharMatcher;
 import com.google.common.collect.ImmutableList;
-import com.google.common.primitives.Shorts;
-import com.google.common.primitives.SignedBytes;
+import io.trino.filesystem.Location;
 import io.trino.hdfs.HdfsContext;
 import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.rubix.CachingTrinoS3FileSystem;
+import io.trino.hdfs.s3.TrinoS3FileSystem;
 import io.trino.plugin.hive.HiveReadOnlyException;
-import io.trino.plugin.hive.HiveTimestampPrecision;
 import io.trino.plugin.hive.HiveType;
-import io.trino.plugin.hive.avro.AvroRecordWriter;
 import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.Partition;
 import io.trino.plugin.hive.metastore.ProtectMode;
 import io.trino.plugin.hive.metastore.SemiTransactionalHiveMetastore;
 import io.trino.plugin.hive.metastore.Storage;
 import io.trino.plugin.hive.metastore.Table;
-import io.trino.plugin.hive.parquet.ParquetRecordWriter;
-import io.trino.plugin.hive.rubix.CachingTrinoS3FileSystem;
-import io.trino.plugin.hive.s3.TrinoS3FileSystem;
 import io.trino.plugin.hive.type.ListTypeInfo;
 import io.trino.plugin.hive.type.MapTypeInfo;
 import io.trino.plugin.hive.type.PrimitiveCategory;
@@ -39,353 +35,144 @@
 import io.trino.plugin.hive.type.StructTypeInfo;
 import io.trino.plugin.hive.type.TypeInfo;
 import io.trino.spi.Page;
-import io.trino.spi.StandardErrorCode;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
-import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.Int128;
-import io.trino.spi.type.LongTimestamp;
-import io.trino.spi.type.MapType;
-import io.trino.spi.type.RowType;
-import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.viewfs.ViewFileSystem;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
-import org.apache.hadoop.hive.common.type.Date;
-import org.apache.hadoop.hive.common.type.HiveDecimal;
-import org.apache.hadoop.hive.common.type.Timestamp;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.ql.exec.FileSinkOperator.RecordWriter;
-import org.apache.hadoop.hive.ql.io.HiveOutputFormat;
-import org.apache.hadoop.hive.serde2.SerDeException;
-import org.apache.hadoop.hive.serde2.Serializer;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
-import org.apache.hadoop.hive.serde2.typeinfo.DecimalTypeInfo;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.Reporter;
-import org.joda.time.DateTimeZone;
-
-import java.io.FileNotFoundException;
+
 import java.io.IOException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 
-import static com.google.common.base.Verify.verify;
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.io.BaseEncoding.base16;
 import static io.trino.hdfs.FileSystemUtils.getRawFileSystem;
+import static io.trino.hdfs.s3.HiveS3Module.EMR_FS_CLASS_NAME;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_DATABASE_LOCATION_ERROR;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_PARTITION_VALUE;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_SERDE_NOT_FOUND;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITER_DATA_ERROR;
 import static io.trino.plugin.hive.HivePartitionKey.HIVE_DEFAULT_DYNAMIC_PARTITION;
-import static io.trino.plugin.hive.HiveSessionProperties.getTemporaryStagingDirectoryPath;
 import static io.trino.plugin.hive.TableType.MANAGED_TABLE;
 import static io.trino.plugin.hive.TableType.MATERIALIZED_VIEW;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.getProtectMode;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.verifyOnline;
-import static io.trino.plugin.hive.s3.HiveS3Module.EMR_FS_CLASS_NAME;
-import static io.trino.plugin.hive.type.VarcharTypeInfo.MAX_VARCHAR_LENGTH;
-import static io.trino.plugin.hive.util.HiveClassNames.AVRO_CONTAINER_OUTPUT_FORMAT_CLASS;
-import static io.trino.plugin.hive.util.HiveClassNames.HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS;
-import static io.trino.plugin.hive.util.HiveClassNames.HIVE_SEQUENCEFILE_OUTPUT_FORMAT_CLASS;
-import static io.trino.plugin.hive.util.HiveClassNames.MAPRED_PARQUET_OUTPUT_FORMAT_CLASS;
-import static io.trino.plugin.hive.util.HiveUtil.checkCondition;
-import static io.trino.plugin.hive.util.HiveUtil.isStructuralType;
+import static io.trino.plugin.hive.util.HiveUtil.escapeTableName;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.Chars.padSpaces;
 import static io.trino.spi.type.DateType.DATE;
+import static io.trino.spi.type.Decimals.readBigDecimal;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
-import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
 import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_SECOND;
-import static io.trino.spi.type.Timestamps.MILLISECONDS_PER_SECOND;
 import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MICROSECOND;
-import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_NANOSECOND;
 import static io.trino.spi.type.TinyintType.TINYINT;
-import static io.trino.spi.type.VarbinaryType.VARBINARY;
-import static java.lang.Float.intBitsToFloat;
 import static java.lang.Math.floorDiv;
 import static java.lang.Math.floorMod;
-import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Collections.unmodifiableList;
-import static java.util.Collections.unmodifiableMap;
 import static java.util.UUID.randomUUID;
-import static java.util.stream.Collectors.toList;
-import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.COMPRESSRESULT;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.getPrimitiveJavaObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.getPrimitiveWritableObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaBooleanObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaByteArrayObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaByteObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaDateObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaDoubleObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaFloatObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaIntObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaLongObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaShortObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaTimestampObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.writableBinaryObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.writableBooleanObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.writableByteObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.writableDateObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.writableDoubleObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.writableFloatObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.writableHiveCharObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.writableIntObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.writableLongObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.writableShortObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.writableStringObjectInspector;
-import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.writableTimestampObjectInspector;
-import static org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory.getCharTypeInfo;
-import static org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory.getVarcharTypeInfo;
 
 public final class HiveWriteUtils
 {
-    private HiveWriteUtils()
-    {
-    }
-
-    public static RecordWriter createRecordWriter(Path target, JobConf conf, Properties properties, String outputFormatName, ConnectorSession session)
-    {
-        return createRecordWriter(target, conf, properties, outputFormatName, session, Optional.empty());
-    }
-
-    public static RecordWriter createRecordWriter(Path target, JobConf conf, Properties properties, String outputFormatName, ConnectorSession session, Optional<TextHeaderWriter> textHeaderWriter)
-    {
-        try {
-            boolean compress = HiveConf.getBoolVar(conf, COMPRESSRESULT);
-            if (outputFormatName.equals(MAPRED_PARQUET_OUTPUT_FORMAT_CLASS)) {
-                return ParquetRecordWriter.create(target, conf, properties, session);
-            }
-            if (outputFormatName.equals(HIVE_IGNORE_KEY_OUTPUT_FORMAT_CLASS)) {
-                return new TextRecordWriter(target, conf, properties, compress, textHeaderWriter);
-            }
-            if (outputFormatName.equals(HIVE_SEQUENCEFILE_OUTPUT_FORMAT_CLASS)) {
-                return new SequenceFileRecordWriter(target, conf, Text.class, compress);
-            }
-            if (outputFormatName.equals(AVRO_CONTAINER_OUTPUT_FORMAT_CLASS)) {
-                return new AvroRecordWriter(target, conf, compress, properties);
-            }
-            Object writer = Class.forName(outputFormatName).getConstructor().newInstance();
-            return ((HiveOutputFormat<?, ?>) writer).getHiveRecordWriter(conf, target, Text.class, compress, properties, Reporter.NULL);
-        }
-        catch (IOException | ReflectiveOperationException e) {
-            throw new TrinoException(HIVE_WRITER_DATA_ERROR, e);
-        }
-    }
+    private static final DateTimeFormatter HIVE_DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    private static final DateTimeFormatter HIVE_TIMESTAMP_FORMATTER = new DateTimeFormatterBuilder()
+            .append(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
+            .optionalStart().appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true).optionalEnd()
+            .toFormatter();
 
-    public static Serializer initializeSerializer(Configuration conf, Properties properties, String serializerName)
+    private HiveWriteUtils()
     {
-        try {
-            Serializer result = (Serializer) Class.forName(serializerName).getConstructor().newInstance();
-            result.initialize(conf, properties);
-            return result;
-        }
-        catch (ClassNotFoundException e) {
-            throw new TrinoException(HIVE_SERDE_NOT_FOUND, "Serializer does not exist: " + serializerName);
-        }
-        catch (SerDeException | ReflectiveOperationException e) {
-            throw new TrinoException(HIVE_WRITER_DATA_ERROR, e);
-        }
-    }
-
-    public static ObjectInspector getJavaObjectInspector(Type type)
-    {
-        if (type.equals(BOOLEAN)) {
-            return javaBooleanObjectInspector;
-        }
-        if (type.equals(BIGINT)) {
-            return javaLongObjectInspector;
-        }
-        if (type.equals(INTEGER)) {
-            return javaIntObjectInspector;
-        }
-        if (type.equals(SMALLINT)) {
-            return javaShortObjectInspector;
-        }
-        if (type.equals(TINYINT)) {
-            return javaByteObjectInspector;
-        }
-        if (type.equals(REAL)) {
-            return javaFloatObjectInspector;
-        }
-        if (type.equals(DOUBLE)) {
-            return javaDoubleObjectInspector;
-        }
-        if (type instanceof VarcharType) {
-            return writableStringObjectInspector;
-        }
-        if (type instanceof CharType) {
-            return writableHiveCharObjectInspector;
-        }
-        if (type.equals(VARBINARY)) {
-            return javaByteArrayObjectInspector;
-        }
-        if (type.equals(DATE)) {
-            return javaDateObjectInspector;
-        }
-        if (type instanceof TimestampType) {
-            return javaTimestampObjectInspector;
-        }
-        if (type instanceof DecimalType decimalType) {
-            return getPrimitiveJavaObjectInspector(new DecimalTypeInfo(decimalType.getPrecision(), decimalType.getScale()));
-        }
-        if (type instanceof ArrayType arrayType) {
-            return ObjectInspectorFactory.getStandardListObjectInspector(getJavaObjectInspector(arrayType.getElementType()));
-        }
-        if (type instanceof MapType mapType) {
-            ObjectInspector keyObjectInspector = getJavaObjectInspector(mapType.getKeyType());
-            ObjectInspector valueObjectInspector = getJavaObjectInspector(mapType.getValueType());
-            return ObjectInspectorFactory.getStandardMapObjectInspector(keyObjectInspector, valueObjectInspector);
-        }
-        if (type instanceof RowType) {
-            return ObjectInspectorFactory.getStandardStructObjectInspector(
-                    type.getTypeSignature().getParameters().stream()
-                            .map(parameter -> parameter.getNamedTypeSignature().getName().get())
-                            .collect(toImmutableList()),
-                    type.getTypeParameters().stream()
-                            .map(HiveWriteUtils::getJavaObjectInspector)
-                            .collect(toImmutableList()));
-        }
-        throw new IllegalArgumentException("unsupported type: " + type);
     }
 
     public static List<String> createPartitionValues(List<Type> partitionColumnTypes, Page partitionColumns, int position)
     {
         ImmutableList.Builder<String> partitionValues = ImmutableList.builder();
         for (int field = 0; field < partitionColumns.getChannelCount(); field++) {
-            Object value = getField(DateTimeZone.UTC, partitionColumnTypes.get(field), partitionColumns.getBlock(field), position);
-            if (value == null) {
-                partitionValues.add(HIVE_DEFAULT_DYNAMIC_PARTITION);
-            }
-            else {
-                String valueString = value.toString();
-                if (!CharMatcher.inRange((char) 0x20, (char) 0x7E).matchesAllOf(valueString)) {
-                    throw new TrinoException(HIVE_INVALID_PARTITION_VALUE,
-                            "Hive partition keys can only contain printable ASCII characters (0x20 - 0x7E). Invalid value: " +
-                                    base16().withSeparator(" ", 2).encode(valueString.getBytes(UTF_8)));
-                }
-                partitionValues.add(valueString);
+            String value = toPartitionValue(partitionColumnTypes.get(field), partitionColumns.getBlock(field), position);
+            if (!CharMatcher.inRange((char) 0x20, (char) 0x7E).matchesAllOf(value)) {
+                String encoded = base16().withSeparator(" ", 2).encode(value.getBytes(UTF_8));
+                throw new TrinoException(HIVE_INVALID_PARTITION_VALUE, "Hive partition keys can only contain printable ASCII characters (0x20 - 0x7E). Invalid value: " + encoded);
             }
+            partitionValues.add(value);
         }
         return partitionValues.build();
     }
 
-    public static Object getField(DateTimeZone localZone, Type type, Block block, int position)
+    private static String toPartitionValue(Type type, Block block, int position)
     {
+        // see HiveUtil#isValidPartitionType
         if (block.isNull(position)) {
-            return null;
+            return HIVE_DEFAULT_DYNAMIC_PARTITION;
         }
         if (BOOLEAN.equals(type)) {
-            return type.getBoolean(block, position);
+            return String.valueOf(BOOLEAN.getBoolean(block, position));
         }
         if (BIGINT.equals(type)) {
-            return type.getLong(block, position);
+            return String.valueOf(BIGINT.getLong(block, position));
         }
         if (INTEGER.equals(type)) {
-            return toIntExact(type.getLong(block, position));
+            return String.valueOf(INTEGER.getInt(block, position));
         }
         if (SMALLINT.equals(type)) {
-            return Shorts.checkedCast(type.getLong(block, position));
+            return String.valueOf(SMALLINT.getShort(block, position));
         }
         if (TINYINT.equals(type)) {
-            return SignedBytes.checkedCast(type.getLong(block, position));
+            return String.valueOf(TINYINT.getByte(block, position));
         }
         if (REAL.equals(type)) {
-            return intBitsToFloat((int) type.getLong(block, position));
+            return String.valueOf(REAL.getFloat(block, position));
         }
         if (DOUBLE.equals(type)) {
-            return type.getDouble(block, position);
+            return String.valueOf(DOUBLE.getDouble(block, position));
         }
-        if (type instanceof VarcharType) {
-            return new Text(type.getSlice(block, position).getBytes());
+        if (type instanceof VarcharType varcharType) {
+            return varcharType.getSlice(block, position).toStringUtf8();
         }
         if (type instanceof CharType charType) {
-            return new Text(padSpaces(type.getSlice(block, position), charType).toStringUtf8());
-        }
-        if (VARBINARY.equals(type)) {
-            return type.getSlice(block, position).getBytes();
+            return padSpaces(charType.getSlice(block, position), charType).toStringUtf8();
         }
         if (DATE.equals(type)) {
-            return Date.ofEpochDay(toIntExact(type.getLong(block, position)));
+            return LocalDate.ofEpochDay(DATE.getInt(block, position)).format(HIVE_DATE_FORMATTER);
         }
-        if (type instanceof TimestampType) {
-            return getHiveTimestamp(localZone, (TimestampType) type, block, position);
+        if (TIMESTAMP_MILLIS.equals(type)) {
+            long epochMicros = type.getLong(block, position);
+            long epochSeconds = floorDiv(epochMicros, MICROSECONDS_PER_SECOND);
+            int nanosOfSecond = floorMod(epochMicros, MICROSECONDS_PER_SECOND) * NANOSECONDS_PER_MICROSECOND;
+            return LocalDateTime.ofEpochSecond(epochSeconds, nanosOfSecond, ZoneOffset.UTC).format(HIVE_TIMESTAMP_FORMATTER);
         }
         if (type instanceof DecimalType decimalType) {
-            return getHiveDecimal(decimalType, block, position);
+            return readBigDecimal(decimalType, block, position).stripTrailingZeros().toPlainString();
         }
-        if (type instanceof ArrayType) {
-            Type elementType = ((ArrayType) type).getElementType();
-            Block arrayBlock = block.getObject(position, Block.class);
-
-            List<Object> list = new ArrayList<>(arrayBlock.getPositionCount());
-            for (int i = 0; i < arrayBlock.getPositionCount(); i++) {
-                list.add(getField(localZone, elementType, arrayBlock, i));
-            }
-            return unmodifiableList(list);
-        }
-        if (type instanceof MapType) {
-            Type keyType = ((MapType) type).getKeyType();
-            Type valueType = ((MapType) type).getValueType();
-            Block mapBlock = block.getObject(position, Block.class);
-
-            Map<Object, Object> map = new HashMap<>();
-            for (int i = 0; i < mapBlock.getPositionCount(); i += 2) {
-                map.put(
-                        getField(localZone, keyType, mapBlock, i),
-                        getField(localZone, valueType, mapBlock, i + 1));
-            }
-            return unmodifiableMap(map);
-        }
-        if (type instanceof RowType) {
-            List<Type> fieldTypes = type.getTypeParameters();
-            Block rowBlock = block.getObject(position, Block.class);
-            checkCondition(
-                    fieldTypes.size() == rowBlock.getPositionCount(),
-                    StandardErrorCode.GENERIC_INTERNAL_ERROR,
-                    "Expected row value field count does not match type field count");
-            List<Object> row = new ArrayList<>(rowBlock.getPositionCount());
-            for (int i = 0; i < rowBlock.getPositionCount(); i++) {
-                row.add(getField(localZone, fieldTypes.get(i), rowBlock, i));
-            }
-            return unmodifiableList(row);
-        }
-        throw new TrinoException(NOT_SUPPORTED, "unsupported type: " + type);
+        throw new TrinoException(NOT_SUPPORTED, "Unsupported type for partition: " + type);
     }
 
     public static void checkTableIsWritable(Table table, boolean writesToNonManagedTablesEnabled)
     {
-        if (table.getTableType().equals(MATERIALIZED_VIEW.toString())) {
+        if (table.getTableType().equals(MATERIALIZED_VIEW.name())) {
             throw new TrinoException(NOT_SUPPORTED, "Cannot write to Hive materialized view");
         }
 
-        if (!writesToNonManagedTablesEnabled && !table.getTableType().equals(MANAGED_TABLE.toString())) {
+        if (!writesToNonManagedTablesEnabled && !table.getTableType().equals(MANAGED_TABLE.name())) {
             throw new TrinoException(NOT_SUPPORTED, "Cannot write to non-managed Hive table");
         }
 
@@ -433,7 +220,7 @@ private static void checkWritable(
         }
     }
 
-    public static Path getTableDefaultLocation(HdfsContext context, SemiTransactionalHiveMetastore metastore, HdfsEnvironment hdfsEnvironment, String schemaName, String tableName)
+    public static Location getTableDefaultLocation(HdfsContext context, SemiTransactionalHiveMetastore metastore, HdfsEnvironment hdfsEnvironment, String schemaName, String tableName)
     {
         Database database = metastore.getDatabase(schemaName)
                 .orElseThrow(() -> new SchemaNotFoundException(schemaName));
@@ -441,7 +228,7 @@ public static Path getTableDefaultLocation(HdfsContext context, SemiTransactiona
         return getTableDefaultLocation(database, context, hdfsEnvironment, schemaName, tableName);
     }
 
-    public static Path getTableDefaultLocation(Database database, HdfsContext context, HdfsEnvironment hdfsEnvironment, String schemaName, String tableName)
+    public static Location getTableDefaultLocation(Database database, HdfsContext context, HdfsEnvironment hdfsEnvironment, String schemaName, String tableName)
     {
         String location = database.getLocation()
                 .orElseThrow(() -> new TrinoException(HIVE_DATABASE_LOCATION_ERROR, format("Database '%s' location is not set", schemaName)));
@@ -456,7 +243,10 @@ public static Path getTableDefaultLocation(Database database, HdfsContext contex
             }
         }
 
-        return new Path(databasePath, tableName);
+        // Note: this results in `databaseLocation` being a "normalized location", e.g. not containing double slashes.
+        // TODO (https://github.com/trinodb/trino/issues/17803): We need to use normalized location until all relevant Hive connector components are migrated off Hadoop Path.
+        Location databaseLocation = Location.of(databasePath.toString());
+        return databaseLocation.appendPath(escapeTableName(tableName));
     }
 
     public static boolean pathExists(HdfsContext context, HdfsEnvironment hdfsEnvironment, Path path)
@@ -519,11 +309,10 @@ public static boolean isFileCreatedByQuery(String fileName, String queryId)
         return fileName.startsWith(queryId) || fileName.endsWith(queryId);
     }
 
-    public static Path createTemporaryPath(ConnectorSession session, HdfsContext context, HdfsEnvironment hdfsEnvironment, Path targetPath)
+    public static Location createTemporaryPath(HdfsContext context, HdfsEnvironment hdfsEnvironment, Path targetPath, String temporaryStagingDirectoryPath)
     {
         // use a per-user temporary directory to avoid permission problems
-        String temporaryPrefix = getTemporaryStagingDirectoryPath(session)
-                .replace("${USER}", context.getIdentity().getUser());
+        String temporaryPrefix = temporaryStagingDirectoryPath.replace("${USER}", context.getIdentity().getUser());
 
         // use relative temporary directory on ViewFS
         if (isViewFileSystem(context, hdfsEnvironment, targetPath)) {
@@ -540,7 +329,7 @@ public static Path createTemporaryPath(ConnectorSession session, HdfsContext con
             setDirectoryOwner(context, hdfsEnvironment, temporaryPath, targetPath);
         }
 
-        return temporaryPath;
+        return Location.of(temporaryPath.toString());
     }
 
     private static void setDirectoryOwner(HdfsContext context, HdfsEnvironment hdfsEnvironment, Path path, Path targetPath)
@@ -591,22 +380,6 @@ public static void createDirectory(HdfsContext context, HdfsEnvironment hdfsEnvi
         }
     }
 
-    public static void checkedDelete(FileSystem fileSystem, Path file, boolean recursive)
-            throws IOException
-    {
-        try {
-            if (!fileSystem.delete(file, recursive)) {
-                if (fileSystem.exists(file)) {
-                    // only throw exception if file still exists
-                    throw new IOException("Failed to delete " + file);
-                }
-            }
-        }
-        catch (FileNotFoundException ignored) {
-            // ok
-        }
-    }
-
     public static boolean isWritableType(HiveType hiveType)
     {
         return isWritableType(hiveType.getTypeInfo());
@@ -661,124 +434,4 @@ private static boolean isWritablePrimitiveType(PrimitiveCategory primitiveCatego
         }
         return false;
     }
-
-    public static List<ObjectInspector> getRowColumnInspectors(List<Type> types)
-    {
-        return types.stream()
-                .map(HiveWriteUtils::getRowColumnInspector)
-                .collect(toList());
-    }
-
-    public static ObjectInspector getRowColumnInspector(Type type)
-    {
-        if (type.equals(BOOLEAN)) {
-            return writableBooleanObjectInspector;
-        }
-
-        if (type.equals(BIGINT)) {
-            return writableLongObjectInspector;
-        }
-
-        if (type.equals(INTEGER)) {
-            return writableIntObjectInspector;
-        }
-
-        if (type.equals(SMALLINT)) {
-            return writableShortObjectInspector;
-        }
-
-        if (type.equals(TINYINT)) {
-            return writableByteObjectInspector;
-        }
-
-        if (type.equals(REAL)) {
-            return writableFloatObjectInspector;
-        }
-
-        if (type.equals(DOUBLE)) {
-            return writableDoubleObjectInspector;
-        }
-
-        if (type instanceof VarcharType varcharType) {
-            if (varcharType.isUnbounded()) {
-                // Unbounded VARCHAR is not supported by Hive.
-                // Values for such columns must be stored as STRING in Hive
-                return writableStringObjectInspector;
-            }
-            if (varcharType.getBoundedLength() <= MAX_VARCHAR_LENGTH) {
-                // VARCHAR columns with the length less than or equal to 65535 are supported natively by Hive
-                return getPrimitiveWritableObjectInspector(getVarcharTypeInfo(varcharType.getBoundedLength()));
-            }
-        }
-
-        if (type instanceof CharType charType) {
-            int charLength = charType.getLength();
-            return getPrimitiveWritableObjectInspector(getCharTypeInfo(charLength));
-        }
-
-        if (type.equals(VARBINARY)) {
-            return writableBinaryObjectInspector;
-        }
-
-        if (type.equals(DATE)) {
-            return writableDateObjectInspector;
-        }
-
-        if (type instanceof TimestampType) {
-            return writableTimestampObjectInspector;
-        }
-
-        if (type instanceof DecimalType decimalType) {
-            return getPrimitiveWritableObjectInspector(new DecimalTypeInfo(decimalType.getPrecision(), decimalType.getScale()));
-        }
-
-        if (isStructuralType(type)) {
-            return getJavaObjectInspector(type);
-        }
-
-        throw new IllegalArgumentException("unsupported type: " + type);
-    }
-
-    public static HiveDecimal getHiveDecimal(DecimalType decimalType, Block block, int position)
-    {
-        BigInteger unscaledValue;
-        if (decimalType.isShort()) {
-            unscaledValue = BigInteger.valueOf(decimalType.getLong(block, position));
-        }
-        else {
-            unscaledValue = ((Int128) decimalType.getObject(block, position)).toBigInteger();
-        }
-        return HiveDecimal.create(unscaledValue, decimalType.getScale());
-    }
-
-    private static Timestamp getHiveTimestamp(DateTimeZone localZone, TimestampType type, Block block, int position)
-    {
-        verify(type.getPrecision() <= HiveTimestampPrecision.MAX.getPrecision(), "Timestamp precision too high for Hive");
-
-        long epochMicros;
-        int nanosOfMicro;
-        if (type.isShort()) {
-            epochMicros = type.getLong(block, position);
-            nanosOfMicro = 0;
-        }
-        else {
-            LongTimestamp timestamp = (LongTimestamp) type.getObject(block, position);
-            epochMicros = timestamp.getEpochMicros();
-            nanosOfMicro = timestamp.getPicosOfMicro() / PICOSECONDS_PER_NANOSECOND;
-        }
-
-        long epochSeconds;
-        if (DateTimeZone.UTC.equals(localZone)) {
-            epochSeconds = floorDiv(epochMicros, MICROSECONDS_PER_SECOND);
-        }
-        else {
-            long localEpochMillis = floorDiv(epochMicros, MICROSECONDS_PER_MILLISECOND);
-            long utcEpochMillis = localZone.convertLocalToUTC(localEpochMillis, false);
-            epochSeconds = floorDiv(utcEpochMillis, MILLISECONDS_PER_SECOND);
-        }
-
-        int microsOfSecond = floorMod(epochMicros, MICROSECONDS_PER_SECOND);
-        int nanosOfSecond = microsOfSecond * NANOSECONDS_PER_MICROSECOND + nanosOfMicro;
-        return Timestamp.ofEpochSecond(epochSeconds, nanosOfSecond);
-    }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/InternalHiveSplitFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/InternalHiveSplitFactory.java
index 57cfd982f129..3395cfd426a9 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/InternalHiveSplitFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/InternalHiveSplitFactory.java
@@ -20,6 +20,7 @@
 import io.trino.plugin.hive.HivePartitionKey;
 import io.trino.plugin.hive.HiveSplit;
 import io.trino.plugin.hive.HiveSplit.BucketConversion;
+import io.trino.plugin.hive.HiveStorageFormat;
 import io.trino.plugin.hive.InternalHiveSplit;
 import io.trino.plugin.hive.InternalHiveSplit.InternalHiveBlock;
 import io.trino.plugin.hive.TableToPartitionMapping;
@@ -28,39 +29,28 @@
 import io.trino.plugin.hive.orc.OrcPageSourceFactory;
 import io.trino.plugin.hive.parquet.ParquetPageSourceFactory;
 import io.trino.plugin.hive.rcfile.RcFilePageSourceFactory;
-import io.trino.plugin.hive.s3select.S3SelectPushdown;
 import io.trino.spi.HostAddress;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.FileSplit;
-import org.apache.hadoop.mapred.InputFormat;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BooleanSupplier;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.plugin.hive.HiveColumnHandle.isPathColumnHandle;
-import static io.trino.plugin.hive.util.HiveUtil.isSplittable;
 import static java.util.Objects.requireNonNull;
 
 public class InternalHiveSplitFactory
 {
-    private final FileSystem fileSystem;
     private final String partitionName;
-    private final InputFormat<?, ?> inputFormat;
+    private final HiveStorageFormat storageFormat;
     private final Properties strippedSchema;
     private final List<HivePartitionKey> partitionKeys;
     private final Optional<Domain> pathDomain;
@@ -71,13 +61,10 @@ public class InternalHiveSplitFactory
     private final long minimumTargetSplitSizeInBytes;
     private final Optional<Long> maxSplitFileSize;
     private final boolean forceLocalScheduling;
-    private final boolean s3SelectPushdownEnabled;
-    private final Map<Integer, AtomicInteger> bucketStatementCounters = new ConcurrentHashMap<>();
 
     public InternalHiveSplitFactory(
-            FileSystem fileSystem,
             String partitionName,
-            InputFormat<?, ?> inputFormat,
+            HiveStorageFormat storageFormat,
             Properties schema,
             List<HivePartitionKey> partitionKeys,
             TupleDomain<HiveColumnHandle> effectivePredicate,
@@ -87,12 +74,10 @@ public InternalHiveSplitFactory(
             Optional<HiveSplit.BucketValidation> bucketValidation,
             DataSize minimumTargetSplitSize,
             boolean forceLocalScheduling,
-            boolean s3SelectPushdownEnabled,
             Optional<Long> maxSplitFileSize)
     {
-        this.fileSystem = requireNonNull(fileSystem, "fileSystem is null");
         this.partitionName = requireNonNull(partitionName, "partitionName is null");
-        this.inputFormat = requireNonNull(inputFormat, "inputFormat is null");
+        this.storageFormat = requireNonNull(storageFormat, "storageFormat is null");
         this.strippedSchema = stripUnnecessaryProperties(requireNonNull(schema, "schema is null"));
         this.partitionKeys = requireNonNull(partitionKeys, "partitionKeys is null");
         pathDomain = getPathDomain(requireNonNull(effectivePredicate, "effectivePredicate is null"));
@@ -101,7 +86,6 @@ public InternalHiveSplitFactory(
         this.bucketConversion = requireNonNull(bucketConversion, "bucketConversion is null");
         this.bucketValidation = requireNonNull(bucketValidation, "bucketValidation is null");
         this.forceLocalScheduling = forceLocalScheduling;
-        this.s3SelectPushdownEnabled = s3SelectPushdownEnabled;
         this.minimumTargetSplitSizeInBytes = minimumTargetSplitSize.toBytes();
         this.maxSplitFileSize = requireNonNull(maxSplitFileSize, "maxSplitFileSize is null");
         checkArgument(minimumTargetSplitSizeInBytes > 0, "minimumTargetSplitSize must be > 0, found: %s", minimumTargetSplitSize);
@@ -125,7 +109,7 @@ public Optional<InternalHiveSplit> createInternalHiveSplit(TrinoFileStatus statu
     {
         splittable = splittable &&
                 status.getLength() > minimumTargetSplitSizeInBytes &&
-                isSplittable(inputFormat, fileSystem, status.getPath());
+                storageFormat.isSplittable(status.getPath());
         return createInternalHiveSplit(
                 status.getPath(),
                 status.getBlockLocations(),
@@ -139,25 +123,8 @@ public Optional<InternalHiveSplit> createInternalHiveSplit(TrinoFileStatus statu
                 acidInfo);
     }
 
-    public Optional<InternalHiveSplit> createInternalHiveSplit(FileSplit split)
-            throws IOException
-    {
-        FileStatus file = fileSystem.getFileStatus(split.getPath());
-        return createInternalHiveSplit(
-                split.getPath(),
-                BlockLocation.fromHiveBlockLocations(fileSystem.getFileBlockLocations(file, split.getStart(), split.getLength())),
-                split.getStart(),
-                split.getLength(),
-                file.getLen(),
-                file.getModificationTime(),
-                OptionalInt.empty(),
-                OptionalInt.empty(),
-                false,
-                Optional.empty());
-    }
-
     private Optional<InternalHiveSplit> createInternalHiveSplit(
-            Path path,
+            String path,
             List<BlockLocation> blockLocations,
             long start,
             long length,
@@ -169,8 +136,7 @@ private Optional<InternalHiveSplit> createInternalHiveSplit(
             boolean splittable,
             Optional<AcidInfo> acidInfo)
     {
-        String pathString = path.toString();
-        if (!pathMatchesPredicate(pathDomain, pathString)) {
+        if (!pathMatchesPredicate(pathDomain, path)) {
             return Optional.empty();
         }
 
@@ -212,10 +178,9 @@ private Optional<InternalHiveSplit> createInternalHiveSplit(
             blocks = ImmutableList.of(new InternalHiveBlock(start, start + length, blocks.get(0).getAddresses()));
         }
 
-        int bucketNumberIndex = readBucketNumber.orElse(0);
         return Optional.of(new InternalHiveSplit(
                 partitionName,
-                pathString,
+                path,
                 start,
                 start + length,
                 estimatedFileSize,
@@ -225,18 +190,16 @@ private Optional<InternalHiveSplit> createInternalHiveSplit(
                 blocks,
                 readBucketNumber,
                 tableBucketNumber,
-                () -> bucketStatementCounters.computeIfAbsent(bucketNumberIndex, index -> new AtomicInteger()).getAndIncrement(),
                 splittable,
                 forceLocalScheduling && allBlocksHaveAddress(blocks),
                 tableToPartitionMapping,
                 bucketConversion,
                 bucketValidation,
-                s3SelectPushdownEnabled && S3SelectPushdown.isCompressionCodecSupported(inputFormat, path),
                 acidInfo,
                 partitionMatchSupplier));
     }
 
-    private static void checkBlocks(Path path, List<InternalHiveBlock> blocks, long start, long length)
+    private static void checkBlocks(String path, List<InternalHiveBlock> blocks, long start, long length)
     {
         checkArgument(start >= 0, "Split (%s) has negative start (%s)", path, start);
         checkArgument(length >= 0, "Split (%s) has negative length (%s)", path, length);
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/PartitionMatchSupplier.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/PartitionMatchSupplier.java
index 411d5c9bc704..bba535de1df7 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/PartitionMatchSupplier.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/PartitionMatchSupplier.java
@@ -19,8 +19,7 @@
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.predicate.TupleDomain;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.function.BooleanSupplier;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/RetryDriver.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/RetryDriver.java
index f3e5cacb6543..441e893c6c66 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/RetryDriver.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/RetryDriver.java
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
@@ -42,7 +41,6 @@ public class RetryDriver
     private final double scaleFactor;
     private final Duration maxRetryTime;
     private final List<Class<? extends Exception>> stopOnExceptions;
-    private final Optional<Runnable> retryRunnable;
 
     private RetryDriver(
             int maxAttempts,
@@ -50,8 +48,7 @@ private RetryDriver(
             Duration maxSleepTime,
             double scaleFactor,
             Duration maxRetryTime,
-            List<Class<? extends Exception>> stopOnExceptions,
-            Optional<Runnable> retryRunnable)
+            List<Class<? extends Exception>> stopOnExceptions)
     {
         this.maxAttempts = maxAttempts;
         this.minSleepTime = minSleepTime;
@@ -59,7 +56,6 @@ private RetryDriver(
         this.scaleFactor = scaleFactor;
         this.maxRetryTime = maxRetryTime;
         this.stopOnExceptions = stopOnExceptions;
-        this.retryRunnable = retryRunnable;
     }
 
     private RetryDriver()
@@ -69,8 +65,7 @@ private RetryDriver()
                 DEFAULT_SLEEP_TIME,
                 DEFAULT_SCALE_FACTOR,
                 DEFAULT_MAX_RETRY_TIME,
-                ImmutableList.of(),
-                Optional.empty());
+                ImmutableList.of());
     }
 
     public static RetryDriver retry()
@@ -80,17 +75,12 @@ public static RetryDriver retry()
 
     public final RetryDriver maxAttempts(int maxAttempts)
     {
-        return new RetryDriver(maxAttempts, minSleepTime, maxSleepTime, scaleFactor, maxRetryTime, stopOnExceptions, retryRunnable);
+        return new RetryDriver(maxAttempts, minSleepTime, maxSleepTime, scaleFactor, maxRetryTime, stopOnExceptions);
     }
 
     public final RetryDriver exponentialBackoff(Duration minSleepTime, Duration maxSleepTime, Duration maxRetryTime, double scaleFactor)
     {
-        return new RetryDriver(maxAttempts, minSleepTime, maxSleepTime, scaleFactor, maxRetryTime, stopOnExceptions, retryRunnable);
-    }
-
-    public final RetryDriver onRetry(Runnable retryRunnable)
-    {
-        return new RetryDriver(maxAttempts, minSleepTime, maxSleepTime, scaleFactor, maxRetryTime, stopOnExceptions, Optional.ofNullable(retryRunnable));
+        return new RetryDriver(maxAttempts, minSleepTime, maxSleepTime, scaleFactor, maxRetryTime, stopOnExceptions);
     }
 
     @SafeVarargs
@@ -102,7 +92,7 @@ public final RetryDriver stopOn(Class<? extends Exception>... classes)
                 .addAll(Arrays.asList(classes))
                 .build();
 
-        return new RetryDriver(maxAttempts, minSleepTime, maxSleepTime, scaleFactor, maxRetryTime, exceptions, retryRunnable);
+        return new RetryDriver(maxAttempts, minSleepTime, maxSleepTime, scaleFactor, maxRetryTime, exceptions);
     }
 
     public RetryDriver stopOnIllegalExceptions()
@@ -122,10 +112,6 @@ public <V> V run(String callableName, Callable<V> callable)
         while (true) {
             attempt++;
 
-            if (attempt > 1) {
-                retryRunnable.ifPresent(Runnable::run);
-            }
-
             try {
                 return callable.call();
             }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/SequenceFileRecordWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/SequenceFileRecordWriter.java
deleted file mode 100644
index 34400a63d2e6..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/SequenceFileRecordWriter.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.util;
-
-import io.trino.plugin.hive.RecordFileWriter.ExtendedRecordWriter;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.BytesWritable;
-import org.apache.hadoop.io.SequenceFile.Writer;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.Reporter;
-
-import java.io.Closeable;
-import java.io.IOException;
-
-import static org.apache.hadoop.hive.ql.exec.Utilities.createSequenceWriter;
-
-public class SequenceFileRecordWriter
-        implements ExtendedRecordWriter
-{
-    private long finalWrittenBytes = -1;
-    private final Writer writer;
-    private static final Writable EMPTY_KEY = new BytesWritable();
-
-    public SequenceFileRecordWriter(Path path, JobConf jobConf, Class<?> valueClass, boolean compressed)
-            throws IOException
-    {
-        writer = createSequenceWriter(jobConf, path.getFileSystem(jobConf), path, BytesWritable.class, valueClass, compressed, Reporter.NULL);
-    }
-
-    @Override
-    public long getWrittenBytes()
-    {
-        if (finalWrittenBytes != -1) {
-            return finalWrittenBytes;
-        }
-        try {
-            return writer.getLength();
-        }
-        catch (IOException e) {
-            return 0; // do nothing
-        }
-    }
-
-    @Override
-    public void write(Writable writable)
-            throws IOException
-    {
-        writer.append(EMPTY_KEY, writable);
-    }
-
-    @Override
-    public void close(boolean abort)
-            throws IOException
-    {
-        try (Closeable ignored = writer) {
-            if (finalWrittenBytes == -1) {
-                writer.hflush();
-                finalWrittenBytes = writer.getLength();
-            }
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/SerDeUtils.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/SerDeUtils.java
deleted file mode 100644
index 1000cebca302..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/SerDeUtils.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.util;
-
-import com.google.common.annotations.VisibleForTesting;
-import io.airlift.slice.Slices;
-import io.trino.plugin.base.type.DecodedTimestamp;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.type.CharType;
-import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.TimestampType;
-import io.trino.spi.type.Type;
-import org.apache.hadoop.hive.common.type.HiveChar;
-import org.apache.hadoop.hive.common.type.Timestamp;
-import org.apache.hadoop.hive.serde2.io.DateWritable;
-import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
-import org.apache.hadoop.hive.serde2.io.TimestampWritable;
-import org.apache.hadoop.hive.serde2.lazy.LazyDate;
-import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.StructField;
-import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.UnionObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.BinaryObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.BooleanObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.ByteObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.DateObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.FloatObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveCharObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveDecimalObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveVarcharObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.IntObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.LongObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.ShortObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.TimestampObjectInspector;
-import org.joda.time.DateTimeZone;
-
-import java.util.List;
-import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.plugin.base.type.TrinoTimestampEncoderFactory.createTimestampEncoder;
-import static io.trino.spi.type.Chars.truncateToLengthAndTrimSpaces;
-import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_SECOND;
-import static io.trino.spi.type.Timestamps.round;
-import static io.trino.spi.type.TinyintType.TINYINT;
-import static java.lang.Float.floatToRawIntBits;
-import static java.util.Objects.requireNonNull;
-
-public final class SerDeUtils
-{
-    private SerDeUtils() {}
-
-    public static Block getBlockObject(Type type, Object object, ObjectInspector objectInspector)
-    {
-        Block serialized = serializeObject(type, null, object, objectInspector);
-        return requireNonNull(serialized, "serialized is null");
-    }
-
-    public static Block serializeObject(Type type, BlockBuilder builder, Object object, ObjectInspector inspector)
-    {
-        return serializeObject(type, builder, object, inspector, true);
-    }
-
-    // This version supports optionally disabling the filtering of null map key, which should only be used for building test data sets
-    // that contain null map keys.  For production, null map keys are not allowed.
-    @VisibleForTesting
-    public static Block serializeObject(Type type, BlockBuilder builder, Object object, ObjectInspector inspector, boolean filterNullMapKeys)
-    {
-        switch (inspector.getCategory()) {
-            case PRIMITIVE:
-                serializePrimitive(type, builder, object, (PrimitiveObjectInspector) inspector);
-                return null;
-            case LIST:
-                return serializeList(type, builder, object, (ListObjectInspector) inspector);
-            case MAP:
-                return serializeMap(type, builder, object, (MapObjectInspector) inspector, filterNullMapKeys);
-            case STRUCT:
-                return serializeStruct(type, builder, object, (StructObjectInspector) inspector);
-            case UNION:
-                return serializeUnion(type, builder, object, (UnionObjectInspector) inspector);
-        }
-        throw new RuntimeException("Unknown object inspector category: " + inspector.getCategory());
-    }
-
-    private static void serializePrimitive(Type type, BlockBuilder builder, Object object, PrimitiveObjectInspector inspector)
-    {
-        requireNonNull(builder, "builder is null");
-
-        if (object == null) {
-            builder.appendNull();
-            return;
-        }
-
-        switch (inspector.getPrimitiveCategory()) {
-            case BOOLEAN:
-                type.writeBoolean(builder, ((BooleanObjectInspector) inspector).get(object));
-                return;
-            case BYTE:
-                type.writeLong(builder, ((ByteObjectInspector) inspector).get(object));
-                return;
-            case SHORT:
-                type.writeLong(builder, ((ShortObjectInspector) inspector).get(object));
-                return;
-            case INT:
-                type.writeLong(builder, ((IntObjectInspector) inspector).get(object));
-                return;
-            case LONG:
-                type.writeLong(builder, ((LongObjectInspector) inspector).get(object));
-                return;
-            case FLOAT:
-                type.writeLong(builder, floatToRawIntBits(((FloatObjectInspector) inspector).get(object)));
-                return;
-            case DOUBLE:
-                type.writeDouble(builder, ((DoubleObjectInspector) inspector).get(object));
-                return;
-            case STRING:
-                type.writeSlice(builder, Slices.utf8Slice(((StringObjectInspector) inspector).getPrimitiveJavaObject(object)));
-                return;
-            case VARCHAR:
-                type.writeSlice(builder, Slices.utf8Slice(((HiveVarcharObjectInspector) inspector).getPrimitiveJavaObject(object).getValue()));
-                return;
-            case CHAR:
-                HiveChar hiveChar = ((HiveCharObjectInspector) inspector).getPrimitiveJavaObject(object);
-                type.writeSlice(builder, truncateToLengthAndTrimSpaces(Slices.utf8Slice(hiveChar.getValue()), ((CharType) type).getLength()));
-                return;
-            case DATE:
-                type.writeLong(builder, formatDateAsLong(object, (DateObjectInspector) inspector));
-                return;
-            case TIMESTAMP:
-                TimestampType timestampType = (TimestampType) type;
-                DecodedTimestamp timestamp = formatTimestamp(timestampType, object, (TimestampObjectInspector) inspector);
-                createTimestampEncoder(timestampType, DateTimeZone.UTC).write(timestamp, builder);
-                return;
-            case BINARY:
-                type.writeSlice(builder, Slices.wrappedBuffer(((BinaryObjectInspector) inspector).getPrimitiveJavaObject(object)));
-                return;
-            case DECIMAL:
-                DecimalType decimalType = (DecimalType) type;
-                HiveDecimalWritable hiveDecimal = ((HiveDecimalObjectInspector) inspector).getPrimitiveWritableObject(object);
-                if (decimalType.isShort()) {
-                    type.writeLong(builder, DecimalUtils.getShortDecimalValue(hiveDecimal, decimalType.getScale()));
-                }
-                else {
-                    type.writeObject(builder, DecimalUtils.getLongDecimalValue(hiveDecimal, decimalType.getScale()));
-                }
-                return;
-            case VOID:
-            case TIMESTAMPLOCALTZ:
-            case INTERVAL_YEAR_MONTH:
-            case INTERVAL_DAY_TIME:
-            case UNKNOWN:
-                // unsupported
-        }
-        throw new RuntimeException("Unknown primitive type: " + inspector.getPrimitiveCategory());
-    }
-
-    private static Block serializeList(Type type, BlockBuilder builder, Object object, ListObjectInspector inspector)
-    {
-        List<?> list = inspector.getList(object);
-        if (list == null) {
-            requireNonNull(builder, "builder is null").appendNull();
-            return null;
-        }
-
-        List<Type> typeParameters = type.getTypeParameters();
-        checkArgument(typeParameters.size() == 1, "list must have exactly 1 type parameter");
-        Type elementType = typeParameters.get(0);
-        ObjectInspector elementInspector = inspector.getListElementObjectInspector();
-        BlockBuilder currentBuilder;
-        if (builder != null) {
-            currentBuilder = builder.beginBlockEntry();
-        }
-        else {
-            currentBuilder = elementType.createBlockBuilder(null, list.size());
-        }
-
-        for (Object element : list) {
-            serializeObject(elementType, currentBuilder, element, elementInspector);
-        }
-
-        if (builder != null) {
-            builder.closeEntry();
-            return null;
-        }
-        Block resultBlock = currentBuilder.build();
-        return resultBlock;
-    }
-
-    private static Block serializeMap(Type type, BlockBuilder builder, Object object, MapObjectInspector inspector, boolean filterNullMapKeys)
-    {
-        Map<?, ?> map = inspector.getMap(object);
-        if (map == null) {
-            requireNonNull(builder, "builder is null").appendNull();
-            return null;
-        }
-
-        List<Type> typeParameters = type.getTypeParameters();
-        checkArgument(typeParameters.size() == 2, "map must have exactly 2 type parameter");
-        Type keyType = typeParameters.get(0);
-        Type valueType = typeParameters.get(1);
-        ObjectInspector keyInspector = inspector.getMapKeyObjectInspector();
-        ObjectInspector valueInspector = inspector.getMapValueObjectInspector();
-        BlockBuilder currentBuilder;
-
-        boolean builderSynthesized = false;
-        if (builder == null) {
-            builderSynthesized = true;
-            builder = type.createBlockBuilder(null, 1);
-        }
-        currentBuilder = builder.beginBlockEntry();
-
-        for (Map.Entry<?, ?> entry : map.entrySet()) {
-            // Hive skips map entries with null keys
-            if (!filterNullMapKeys || entry.getKey() != null) {
-                serializeObject(keyType, currentBuilder, entry.getKey(), keyInspector);
-                serializeObject(valueType, currentBuilder, entry.getValue(), valueInspector);
-            }
-        }
-
-        builder.closeEntry();
-        if (builderSynthesized) {
-            return (Block) type.getObject(builder, 0);
-        }
-        return null;
-    }
-
-    private static Block serializeStruct(Type type, BlockBuilder builder, Object object, StructObjectInspector inspector)
-    {
-        if (object == null) {
-            requireNonNull(builder, "builder is null").appendNull();
-            return null;
-        }
-
-        List<Type> typeParameters = type.getTypeParameters();
-        List<? extends StructField> allStructFieldRefs = inspector.getAllStructFieldRefs();
-        checkArgument(typeParameters.size() == allStructFieldRefs.size());
-        BlockBuilder currentBuilder;
-
-        boolean builderSynthesized = false;
-        if (builder == null) {
-            builderSynthesized = true;
-            builder = type.createBlockBuilder(null, 1);
-        }
-        currentBuilder = builder.beginBlockEntry();
-
-        for (int i = 0; i < typeParameters.size(); i++) {
-            StructField field = allStructFieldRefs.get(i);
-            serializeObject(typeParameters.get(i), currentBuilder, inspector.getStructFieldData(object, field), field.getFieldObjectInspector());
-        }
-
-        builder.closeEntry();
-        if (builderSynthesized) {
-            return (Block) type.getObject(builder, 0);
-        }
-        return null;
-    }
-
-    // Use row blocks to represent union objects when reading
-    private static Block serializeUnion(Type type, BlockBuilder builder, Object object, UnionObjectInspector inspector)
-    {
-        if (object == null) {
-            requireNonNull(builder, "builder is null").appendNull();
-            return null;
-        }
-
-        boolean builderSynthesized = false;
-        if (builder == null) {
-            builderSynthesized = true;
-            builder = type.createBlockBuilder(null, 1);
-        }
-
-        BlockBuilder currentBuilder = builder.beginBlockEntry();
-
-        byte tag = inspector.getTag(object);
-        TINYINT.writeLong(currentBuilder, tag);
-
-        List<Type> typeParameters = type.getTypeParameters();
-        for (int i = 1; i < typeParameters.size(); i++) {
-            if (i == tag + 1) {
-                serializeObject(typeParameters.get(i), currentBuilder, inspector.getField(object), inspector.getObjectInspectors().get(tag));
-            }
-            else {
-                currentBuilder.appendNull();
-            }
-        }
-
-        builder.closeEntry();
-        if (builderSynthesized) {
-            return (Block) type.getObject(builder, 0);
-        }
-        return null;
-    }
-
-    @SuppressWarnings("deprecation")
-    private static long formatDateAsLong(Object object, DateObjectInspector inspector)
-    {
-        if (object instanceof LazyDate) {
-            return ((LazyDate) object).getWritableObject().getDays();
-        }
-        if (object instanceof DateWritable) {
-            return ((DateWritable) object).getDays();
-        }
-        return inspector.getPrimitiveJavaObject(object).toEpochDay();
-    }
-
-    private static DecodedTimestamp formatTimestamp(TimestampType type, Object object, TimestampObjectInspector inspector)
-    {
-        long epochSecond;
-        int nanoOfSecond;
-
-        if (object instanceof TimestampWritable timestamp) {
-            epochSecond = timestamp.getSeconds();
-            nanoOfSecond = timestamp.getNanos();
-        }
-        else {
-            Timestamp timestamp = inspector.getPrimitiveJavaObject(object);
-            epochSecond = timestamp.toEpochSecond();
-            nanoOfSecond = timestamp.getNanos();
-        }
-
-        nanoOfSecond = (int) round(nanoOfSecond, 9 - type.getPrecision());
-        if (nanoOfSecond == NANOSECONDS_PER_SECOND) { // round nanos up to seconds
-            epochSecond += 1;
-            nanoOfSecond = 0;
-        }
-
-        return new DecodedTimestamp(epochSecond, nanoOfSecond);
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/SerdeConstants.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/SerdeConstants.java
index 5967fe0c91ae..e0d993c3cc72 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/SerdeConstants.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/SerdeConstants.java
@@ -16,16 +16,10 @@
 public final class SerdeConstants
 {
     public static final String SERIALIZATION_LIB = "serialization.lib";
-    public static final String SERIALIZATION_FORMAT = "serialization.format";
-    public static final String SERIALIZATION_DDL = "serialization.ddl";
     public static final String SERIALIZATION_NULL_FORMAT = "serialization.null.format";
-    public static final String SERIALIZATION_LAST_COLUMN_TAKES_REST = "serialization.last.column.takes.rest";
 
     public static final String FIELD_DELIM = "field.delim";
-    public static final String COLLECTION_DELIM = "collection.delim";
     public static final String LINE_DELIM = "line.delim";
-    public static final String MAPKEY_DELIM = "mapkey.delim";
-    public static final String QUOTE_CHAR = "quote.delim";
     public static final String ESCAPE_CHAR = "escape.delim";
 
     public static final String HEADER_COUNT = "skip.header.line.count";
@@ -33,8 +27,7 @@ public final class SerdeConstants
 
     public static final String LIST_COLUMNS = "columns";
     public static final String LIST_COLUMN_TYPES = "columns.types";
-
-    public static final String COLUMN_NAME_DELIMITER = "column.name.delimiter";
+    public static final String LIST_COLUMN_COMMENTS = "columns.comments";
 
     public static final String VOID_TYPE_NAME = "void";
     public static final String BOOLEAN_TYPE_NAME = "boolean";
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/Statistics.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/Statistics.java
index 396e57ceaf23..549bfe07ff8a 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/Statistics.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/Statistics.java
@@ -44,6 +44,7 @@
 import java.util.OptionalDouble;
 import java.util.OptionalLong;
 import java.util.Set;
+import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
@@ -327,7 +328,7 @@ public static Map<List<String>, ComputedStatistics> createComputedStatisticsToPa
                 .collect(toImmutableList());
 
         return computedStatistics.stream()
-                .collect(toImmutableMap(statistics -> getPartitionValues(statistics, partitionColumns, partitionColumnTypes), statistics -> statistics));
+                .collect(toImmutableMap(statistics -> getPartitionValues(statistics, partitionColumns, partitionColumnTypes), Function.identity()));
     }
 
     private static List<String> getPartitionValues(ComputedStatistics statistics, List<String> partitionColumns, List<Type> partitionColumnTypes)
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/TempFileWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/TempFileWriter.java
index 7c188dfb6480..0ed9ec7160ce 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/TempFileWriter.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/TempFileWriter.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.hive.util;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
 import io.trino.orc.OrcDataSink;
@@ -22,17 +23,21 @@
 import io.trino.orc.OrcWriterStats;
 import io.trino.orc.metadata.OrcType;
 import io.trino.spi.Page;
+import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.Type;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.IntStream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.orc.metadata.CompressionKind.LZ4;
+import static io.trino.orc.reader.ColumnReaders.ICEBERG_BINARY_TYPE;
+import static io.trino.spi.type.TimeType.TIME_MICROS;
 
 public class TempFileWriter
         implements Closeable
@@ -76,7 +81,17 @@ private static OrcWriter createOrcFileWriter(OrcDataSink sink, List<Type> types)
                 sink,
                 columnNames,
                 types,
-                OrcType.createRootOrcType(columnNames, types),
+                OrcType.createRootOrcType(columnNames, types, Optional.of(type -> {
+                    if (type.equals(TIME_MICROS)) {
+                        // Currently used by Iceberg only. Iceberg-specific attribute is required by the ORC writer.
+                        return Optional.of(new OrcType(OrcType.OrcTypeKind.LONG, ImmutableList.of(), ImmutableList.of(), Optional.empty(), Optional.empty(), Optional.empty(), ImmutableMap.of("iceberg.long-type", "TIME")));
+                    }
+                    if (type.getBaseName().equals(StandardTypes.UUID)) {
+                        // Currently used by Iceberg only. Iceberg-specific attribute is required by the ORC reader.
+                        return Optional.of(new OrcType(OrcType.OrcTypeKind.BINARY, ImmutableList.of(), ImmutableList.of(), Optional.empty(), Optional.empty(), Optional.empty(), ImmutableMap.of(ICEBERG_BINARY_TYPE, "UUID")));
+                    }
+                    return Optional.empty();
+                })),
                 LZ4,
                 new OrcWriterOptions()
                         .withMaxStringStatisticsLimit(DataSize.ofBytes(0))
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/TextHeaderWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/TextHeaderWriter.java
deleted file mode 100644
index 71db6e579e25..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/TextHeaderWriter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.util;
-
-import io.trino.plugin.hive.HiveType;
-import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.hive.serde2.SerDeException;
-import org.apache.hadoop.hive.serde2.Serializer;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
-import org.apache.hadoop.hive.serde2.objectinspector.StandardStructObjectInspector;
-import org.apache.hadoop.io.BinaryComparable;
-import org.apache.hadoop.io.Text;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.stream.IntStream;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.plugin.hive.HiveSessionProperties.getTimestampPrecision;
-
-public class TextHeaderWriter
-{
-    private final Serializer serializer;
-    private final Type headerType;
-    private final List<String> fileColumnNames;
-
-    public TextHeaderWriter(Serializer serializer, TypeManager typeManager, ConnectorSession session, List<String> fileColumnNames)
-    {
-        this.serializer = serializer;
-        this.fileColumnNames = fileColumnNames;
-        this.headerType = HiveType.valueOf("string").getType(typeManager, getTimestampPrecision(session));
-    }
-
-    public void write(OutputStream compressedOutput, int rowSeparator)
-            throws IOException
-    {
-        try {
-            ObjectInspector stringObjectInspector = HiveWriteUtils.getRowColumnInspector(headerType);
-            List<Text> headers = fileColumnNames.stream().map(Text::new).collect(toImmutableList());
-            List<ObjectInspector> inspectors = IntStream.range(0, fileColumnNames.size()).mapToObj(ignored -> stringObjectInspector).collect(toImmutableList());
-            StandardStructObjectInspector headerStructObjectInspectors = ObjectInspectorFactory.getStandardStructObjectInspector(fileColumnNames, inspectors);
-            BinaryComparable binary = (BinaryComparable) serializer.serialize(headers, headerStructObjectInspectors);
-            compressedOutput.write(binary.getBytes(), 0, binary.getLength());
-            compressedOutput.write(rowSeparator);
-        }
-        catch (SerDeException e) {
-            throw new IOException(e);
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/TextRecordWriter.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/TextRecordWriter.java
deleted file mode 100644
index f0fc2acf557d..000000000000
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/TextRecordWriter.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.util;
-
-import io.trino.plugin.hive.RecordFileWriter.ExtendedRecordWriter;
-import org.apache.hadoop.fs.FSDataOutputStream;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.BinaryComparable;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.Reporter;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Optional;
-import java.util.Properties;
-
-import static io.trino.plugin.hive.util.SerdeConstants.LINE_DELIM;
-import static java.lang.Integer.parseInt;
-import static org.apache.hadoop.hive.ql.exec.Utilities.createCompressedStream;
-
-public class TextRecordWriter
-        implements ExtendedRecordWriter
-{
-    private final FSDataOutputStream output;
-    private final OutputStream compressedOutput;
-    private final int rowSeparator;
-
-    public TextRecordWriter(Path path, JobConf jobConf, Properties properties, boolean isCompressed, Optional<TextHeaderWriter> textHeaderWriter)
-            throws IOException
-    {
-        String rowSeparatorString = properties.getProperty(LINE_DELIM, "\n");
-        // same logic as HiveIgnoreKeyTextOutputFormat
-        int rowSeparatorByte;
-        try {
-            rowSeparatorByte = Byte.parseByte(rowSeparatorString);
-        }
-        catch (NumberFormatException e) {
-            rowSeparatorByte = rowSeparatorString.charAt(0);
-        }
-        rowSeparator = rowSeparatorByte;
-        output = path.getFileSystem(jobConf).create(path, Reporter.NULL);
-        compressedOutput = createCompressedStream(jobConf, output, isCompressed);
-
-        Optional<String> skipHeaderLine = Optional.ofNullable(properties.getProperty("skip.header.line.count"));
-        if (skipHeaderLine.isPresent()) {
-            if (parseInt(skipHeaderLine.get()) == 1) {
-                textHeaderWriter
-                        .orElseThrow(() -> new IllegalArgumentException("TextHeaderWriter must not be empty when skip.header.line.count is set to 1"))
-                        .write(compressedOutput, rowSeparator);
-            }
-        }
-    }
-
-    @Override
-    public long getWrittenBytes()
-    {
-        return output.getPos();
-    }
-
-    @Override
-    public void write(Writable writable)
-            throws IOException
-    {
-        BinaryComparable binary = (BinaryComparable) writable;
-        compressedOutput.write(binary.getBytes(), 0, binary.getLength());
-        compressedOutput.write(rowSeparator);
-    }
-
-    @Override
-    public void close(boolean abort)
-            throws IOException
-    {
-        compressedOutput.close();
-    }
-}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/ThrottledAsyncQueue.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/ThrottledAsyncQueue.java
index 105e46fe8b19..d182e5ca7608 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/ThrottledAsyncQueue.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/ThrottledAsyncQueue.java
@@ -16,8 +16,7 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.RateLimiter;
-
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
 
 import java.util.List;
 import java.util.concurrent.Executor;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHive.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHive.java
index d71fd26318b9..a3e382ea2601 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHive.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHive.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 import com.google.common.net.HostAndPort;
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
@@ -24,10 +25,13 @@
 import io.airlift.stats.CounterStat;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.hdfs.HdfsConfig;
 import io.trino.hdfs.HdfsContext;
 import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.HdfsNamenodeStats;
 import io.trino.hdfs.authentication.NoHdfsAuthentication;
 import io.trino.operator.GroupByHashPageIndexerFactory;
 import io.trino.plugin.base.CatalogName;
@@ -35,6 +39,8 @@
 import io.trino.plugin.hive.LocationService.WriteInfo;
 import io.trino.plugin.hive.aws.athena.PartitionProjectionService;
 import io.trino.plugin.hive.fs.DirectoryLister;
+import io.trino.plugin.hive.fs.RemoteIterator;
+import io.trino.plugin.hive.fs.TransactionScopeCachingDirectoryListerFactory;
 import io.trino.plugin.hive.fs.TrinoFileStatus;
 import io.trino.plugin.hive.fs.TrinoFileStatusRemoteIterator;
 import io.trino.plugin.hive.line.LinePageSource;
@@ -94,8 +100,6 @@
 import io.trino.spi.connector.DiscretePredicates;
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.ProjectionApplicationResult;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.connector.RecordPageSource;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.connector.SortingProperty;
@@ -134,16 +138,17 @@
 import io.trino.testing.MaterializedRow;
 import io.trino.testing.TestingConnectorSession;
 import io.trino.testing.TestingNodeManager;
-import io.trino.type.BlockTypeOperators;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.RemoteIterator;
 import org.apache.hadoop.hive.metastore.TableType;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.joda.time.DateTime;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -218,8 +223,6 @@
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_PARTITION_SCHEMA_MISMATCH;
 import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME;
 import static io.trino.plugin.hive.HiveMetadata.PRESTO_VERSION_NAME;
-import static io.trino.plugin.hive.HiveSessionProperties.getTemporaryStagingDirectoryPath;
-import static io.trino.plugin.hive.HiveSessionProperties.isTemporaryStagingDirectoryEnabled;
 import static io.trino.plugin.hive.HiveStorageFormat.AVRO;
 import static io.trino.plugin.hive.HiveStorageFormat.CSV;
 import static io.trino.plugin.hive.HiveStorageFormat.JSON;
@@ -239,12 +242,12 @@
 import static io.trino.plugin.hive.HiveTableProperties.TRANSACTIONAL;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_CONFIGURATION;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.plugin.hive.HiveTestUtils.PAGE_SORTER;
 import static io.trino.plugin.hive.HiveTestUtils.SESSION;
 import static io.trino.plugin.hive.HiveTestUtils.arrayType;
 import static io.trino.plugin.hive.HiveTestUtils.getDefaultHiveFileWriterFactories;
 import static io.trino.plugin.hive.HiveTestUtils.getDefaultHivePageSourceFactories;
-import static io.trino.plugin.hive.HiveTestUtils.getDefaultHiveRecordCursorProviders;
 import static io.trino.plugin.hive.HiveTestUtils.getHiveSession;
 import static io.trino.plugin.hive.HiveTestUtils.getHiveSessionProperties;
 import static io.trino.plugin.hive.HiveTestUtils.getTypes;
@@ -327,6 +330,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.joda.time.DateTimeZone.UTC;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
@@ -335,7 +339,7 @@
 import static org.testng.Assert.fail;
 
 // staging directory is shared mutable state
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public abstract class AbstractTestHive
 {
     private static final Logger log = Logger.get(AbstractTestHive.class);
@@ -512,9 +516,7 @@ private static RowType toRowType(List<ColumnMetadata> columns)
             // exclude formats that change table schema with serde and read-only formats
             ImmutableSet.of(AVRO, CSV, REGEX));
 
-    private static final TypeOperators TYPE_OPERATORS = new TypeOperators();
-    private static final BlockTypeOperators BLOCK_TYPE_OPERATORS = new BlockTypeOperators(TYPE_OPERATORS);
-    private static final JoinCompiler JOIN_COMPILER = new JoinCompiler(TYPE_OPERATORS);
+    private static final JoinCompiler JOIN_COMPILER = new JoinCompiler(new TypeOperators());
 
     protected static final List<ColumnMetadata> STATISTICS_TABLE_COLUMNS = ImmutableList.<ColumnMetadata>builder()
             .add(new ColumnMetadata("t_boolean", BOOLEAN))
@@ -539,7 +541,8 @@ private static RowType toRowType(List<ColumnMetadata> columns)
             .add(new ColumnMetadata("ds", VARCHAR))
             .build();
 
-    protected static final PartitionStatistics EMPTY_TABLE_STATISTICS = new PartitionStatistics(createZeroStatistics(), ImmutableMap.of());
+    protected static final PartitionStatistics ZERO_TABLE_STATISTICS = new PartitionStatistics(createZeroStatistics(), ImmutableMap.of());
+    protected static final PartitionStatistics EMPTY_ROWCOUNT_STATISTICS = ZERO_TABLE_STATISTICS.withBasicStatistics(ZERO_TABLE_STATISTICS.getBasicStatistics().withEmptyRowCount());
     protected static final PartitionStatistics BASIC_STATISTICS_1 = new PartitionStatistics(new HiveBasicStatistics(0, 20, 3, 0), ImmutableMap.of());
     protected static final PartitionStatistics BASIC_STATISTICS_2 = new PartitionStatistics(new HiveBasicStatistics(0, 30, 2, 0), ImmutableMap.of());
 
@@ -580,7 +583,7 @@ private static RowType toRowType(List<ColumnMetadata> columns)
                             .filter(entry -> entry.getKey().hashCode() % 2 == 1)
                             .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue)));
 
-    private static final PartitionStatistics STATISTICS_2 =
+    protected static final PartitionStatistics STATISTICS_2 =
             new PartitionStatistics(
                     BASIC_STATISTICS_2.getBasicStatistics(),
                     ImmutableMap.<String, HiveColumnStatistics>builder()
@@ -601,7 +604,7 @@ private static RowType toRowType(List<ColumnMetadata> columns)
                             .put("t_long_decimal", createDecimalColumnStatistics(Optional.of(new BigDecimal("71234567890123456.123")), Optional.of(new BigDecimal("78123456789012345.123")), OptionalLong.of(2), OptionalLong.of(1)))
                             .buildOrThrow());
 
-    private static final PartitionStatistics STATISTICS_EMPTY_OPTIONAL_FIELDS =
+    protected static final PartitionStatistics STATISTICS_EMPTY_OPTIONAL_FIELDS =
             new PartitionStatistics(
                     new HiveBasicStatistics(OptionalLong.of(0), OptionalLong.of(20), OptionalLong.empty(), OptionalLong.of(0)),
                     ImmutableMap.<String, HiveColumnStatistics>builder()
@@ -669,7 +672,9 @@ private static RowType toRowType(List<ColumnMetadata> columns)
     private ScheduledExecutorService heartbeatService;
     private java.nio.file.Path temporaryStagingDirectory;
 
-    @BeforeClass(alwaysRun = true)
+    protected final Set<SchemaTableName> materializedViews = Sets.newConcurrentHashSet();
+
+    @BeforeAll
     public void setupClass()
             throws Exception
     {
@@ -679,7 +684,7 @@ public void setupClass()
         temporaryStagingDirectory = createTempDirectory("trino-staging-");
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (executor != null) {
@@ -765,7 +770,6 @@ protected void setupHive(String databaseName)
                         fileFormatColumn, Domain.create(ValueSet.ofRanges(Range.equal(createUnboundedVarcharType(), utf8Slice("textfile")), Range.equal(createUnboundedVarcharType(), utf8Slice("sequencefile")), Range.equal(createUnboundedVarcharType(), utf8Slice("rctext")), Range.equal(createUnboundedVarcharType(), utf8Slice("rcbinary"))), false),
                         dummyColumn, Domain.create(ValueSet.ofRanges(Range.equal(INTEGER, 1L), Range.equal(INTEGER, 2L), Range.equal(INTEGER, 3L), Range.equal(INTEGER, 4L)), false))),
                 Optional.empty(),
-                Optional.empty(),
                 Optional.of(new DiscretePredicates(partitionColumns, ImmutableList.of(
                         TupleDomain.withColumnDomains(ImmutableMap.of(
                                 dsColumn, Domain.create(ValueSet.ofRanges(Range.equal(createUnboundedVarcharType(), utf8Slice("2012-12-29"))), false),
@@ -808,6 +812,7 @@ protected final void setup(HostAndPort metastoreAddress, String databaseName)
                 .cacheTtl(new Duration(1, MINUTES))
                 .refreshInterval(new Duration(15, SECONDS))
                 .maximumSize(10000)
+                .cacheMissing(new CachingHiveMetastoreConfig().isCacheMissing())
                 .partitionCacheEnabled(new CachingHiveMetastoreConfig().isPartitionCacheEnabled())
                 .build();
 
@@ -821,13 +826,14 @@ protected final void setup(String databaseName, HiveConfig hiveConfig, HiveMetas
         metastoreClient = hiveMetastore;
         hdfsEnvironment = hdfsConfiguration;
         HivePartitionManager partitionManager = new HivePartitionManager(hiveConfig);
-        locationService = new HiveLocationService(hdfsEnvironment);
+        locationService = new HiveLocationService(hdfsEnvironment, hiveConfig);
         JsonCodec<PartitionUpdate> partitionUpdateCodec = JsonCodec.jsonCodec(PartitionUpdate.class);
         countingDirectoryLister = new CountingDirectoryLister();
         metadataFactory = new HiveMetadataFactory(
                 new CatalogName("hive"),
                 HiveMetastoreFactory.ofInstance(metastoreClient),
-                new HdfsFileSystemFactory(hdfsEnvironment),
+                getDefaultHiveFileWriterFactories(hiveConfig, hdfsEnvironment),
+                new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS),
                 hdfsEnvironment,
                 partitionManager,
                 10,
@@ -865,6 +871,16 @@ protected final void setup(String databaseName, HiveConfig hiveConfig, HiveMetas
                         new PropertiesSystemTableProvider()),
                 metastore -> new NoneHiveMaterializedViewMetadata()
                 {
+                    @Override
+                    public List<SchemaTableName> listMaterializedViews(ConnectorSession session, Optional<String> schemaName)
+                    {
+                        return materializedViews.stream()
+                                .filter(schemaName
+                                        .<Predicate<SchemaTableName>>map(name -> mvName -> mvName.getSchemaName().equals(name))
+                                        .orElse(mvName -> true))
+                                .collect(toImmutableList());
+                    }
+
                     @Override
                     public Optional<ConnectorMaterializedViewDefinition> getMaterializedView(ConnectorSession session, SchemaTableName viewName)
                     {
@@ -877,14 +893,16 @@ public Optional<ConnectorMaterializedViewDefinition> getMaterializedView(Connect
                                 Optional.empty(),
                                 Optional.empty(),
                                 ImmutableList.of(new ConnectorMaterializedViewDefinition.Column("abc", TypeId.of("type"))),
+                                Optional.of(java.time.Duration.ZERO),
                                 Optional.empty(),
                                 Optional.of("alice"),
+                                ImmutableList.of(),
                                 ImmutableMap.of()));
                     }
                 },
                 SqlStandardAccessControlMetadata::new,
                 countingDirectoryLister,
-                1000,
+                new TransactionScopeCachingDirectoryListerFactory(hiveConfig),
                 new PartitionProjectionService(hiveConfig, ImmutableMap.of(), new TestingTypeManager()),
                 true,
                 HiveTimestampPrecision.DEFAULT_PRECISION);
@@ -892,9 +910,8 @@ public Optional<ConnectorMaterializedViewDefinition> getMaterializedView(Connect
         splitManager = new HiveSplitManager(
                 transactionManager,
                 partitionManager,
-                new HdfsFileSystemFactory(hdfsEnvironment),
-                new NamenodeStats(),
-                hdfsEnvironment,
+                new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS),
+                new HdfsNamenodeStats(),
                 executor,
                 new CounterStat(),
                 100,
@@ -909,11 +926,10 @@ public Optional<ConnectorMaterializedViewDefinition> getMaterializedView(Connect
                 hiveConfig.getMaxPartitionsPerScan());
         pageSinkProvider = new HivePageSinkProvider(
                 getDefaultHiveFileWriterFactories(hiveConfig, hdfsEnvironment),
-                new HdfsFileSystemFactory(hdfsEnvironment),
-                hdfsEnvironment,
+                new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS),
                 PAGE_SORTER,
                 HiveMetastoreFactory.ofInstance(metastoreClient),
-                new GroupByHashPageIndexerFactory(JOIN_COMPILER, BLOCK_TYPE_OPERATORS),
+                new GroupByHashPageIndexerFactory(JOIN_COMPILER),
                 TESTING_TYPE_MANAGER,
                 getHiveConfig(),
                 getSortingFileWriterConfig(),
@@ -925,11 +941,8 @@ public Optional<ConnectorMaterializedViewDefinition> getMaterializedView(Connect
                 new HiveWriterStats());
         pageSourceProvider = new HivePageSourceProvider(
                 TESTING_TYPE_MANAGER,
-                hdfsEnvironment,
                 hiveConfig,
-                getDefaultHivePageSourceFactories(hdfsEnvironment, hiveConfig),
-                getDefaultHiveRecordCursorProviders(hiveConfig, hdfsEnvironment),
-                new GenericHiveRecordCursorProvider(hdfsEnvironment, hiveConfig));
+                getDefaultHivePageSourceFactories(hdfsEnvironment, hiveConfig));
         nodePartitioningProvider = new HiveNodePartitioningProvider(
                 new TestingNodeManager("fake-environment"),
                 TESTING_TYPE_MANAGER);
@@ -941,7 +954,7 @@ public Optional<ConnectorMaterializedViewDefinition> getMaterializedView(Connect
     protected HiveConfig getHiveConfig()
     {
         return new HiveConfig()
-                .setTemporaryStagingDirectoryPath(temporaryStagingDirectory.toAbsolutePath().toString());
+                .setTemporaryStagingDirectoryPath(temporaryStagingDirectory.resolve("temp_path_").toAbsolutePath().toString());
     }
 
     protected SortingFileWriterConfig getSortingFileWriterConfig()
@@ -1356,7 +1369,6 @@ protected void assertExpectedTableProperties(ConnectorTableProperties actualProp
             assertEquals(actual.getColumns(), expected.getColumns());
             assertEqualsIgnoreOrder(actual.getPredicates(), expected.getPredicates());
         });
-        assertEquals(actualProperties.getStreamPartitioningColumns(), expectedProperties.getStreamPartitioningColumns());
         assertEquals(actualProperties.getLocalProperties(), expectedProperties.getLocalProperties());
     }
 
@@ -1636,12 +1648,14 @@ public void testPerTransactionDirectoryListerCache()
         }
     }
 
-    @Test(expectedExceptions = TableNotFoundException.class)
+    @Test
     public void testGetPartitionSplitsBatchInvalidTable()
     {
-        try (Transaction transaction = newTransaction()) {
-            getSplits(splitManager, transaction, newSession(), invalidTableHandle);
-        }
+        assertThatThrownBy(() -> {
+            try (Transaction transaction = newTransaction()) {
+                getSplits(splitManager, transaction, newSession(), invalidTableHandle);
+            }
+        }).isInstanceOf(TableNotFoundException.class);
     }
 
     @Test
@@ -2381,21 +2395,25 @@ else if (rowNumber % 19 == 1) {
         }
     }
 
-    @Test(expectedExceptions = TrinoException.class, expectedExceptionsMessageRegExp = ".*The column 't_data' in table '.*\\.trino_test_partition_schema_change' is declared as type 'double', but partition 'ds=2012-12-29' declared column 't_data' as type 'string'.")
+    @Test
     public void testPartitionSchemaMismatch()
-            throws Exception
     {
-        try (Transaction transaction = newTransaction()) {
-            ConnectorMetadata metadata = transaction.getMetadata();
-            ConnectorTableHandle table = getTableHandle(metadata, tablePartitionSchemaChange);
-            ConnectorSession session = newSession();
-            metadata.beginQuery(session);
-            readTable(transaction, table, ImmutableList.of(dsColumn), session, TupleDomain.all(), OptionalInt.empty(), Optional.empty());
-        }
+        assertThatThrownBy(() -> {
+            try (Transaction transaction = newTransaction()) {
+                ConnectorMetadata metadata = transaction.getMetadata();
+                ConnectorTableHandle table = getTableHandle(metadata, tablePartitionSchemaChange);
+                ConnectorSession session = newSession();
+                metadata.beginQuery(session);
+                readTable(transaction, table, ImmutableList.of(dsColumn), session, TupleDomain.all(), OptionalInt.empty(), Optional.empty());
+            }
+        })
+                .isInstanceOf(TrinoException.class)
+                .hasMessageMatching(".*The column 't_data' in table '.*\\.trino_test_partition_schema_change' is declared as type 'double', but partition 'ds=2012-12-29' declared column 't_data' as type 'string'.");
     }
 
     // TODO coercion of non-canonical values should be supported
-    @Test(enabled = false)
+    @Test
+    @Disabled
     public void testPartitionSchemaNonCanonical()
             throws Exception
     {
@@ -2544,15 +2562,6 @@ private void assertEmptyFile(HiveStorageFormat format)
         }
     }
 
-    @Test
-    public void testHiveViewsHaveNoColumns()
-    {
-        try (Transaction transaction = newTransaction()) {
-            ConnectorMetadata metadata = transaction.getMetadata();
-            assertEquals(listTableColumns(metadata, newSession(), new SchemaTablePrefix(view.getSchemaName(), view.getTableName())), ImmutableMap.of());
-        }
-    }
-
     @Test
     public void testRenameTable()
     {
@@ -2667,7 +2676,7 @@ public void testTableCreationRollback()
     {
         SchemaTableName temporaryCreateRollbackTable = temporaryTable("create_rollback");
         try {
-            Path stagingPathRoot;
+            Location stagingPathRoot;
             try (Transaction transaction = newTransaction()) {
                 ConnectorSession session = newSession();
                 ConnectorMetadata metadata = transaction.getMetadata();
@@ -2716,14 +2725,14 @@ public void testTableCreationIgnoreExisting()
         String schemaName = schemaTableName.getSchemaName();
         String tableName = schemaTableName.getTableName();
         PrincipalPrivileges privileges = testingPrincipalPrivilege(session);
-        Path targetPath;
+        Location targetPath;
         try {
             try (Transaction transaction = newTransaction()) {
                 LocationService locationService = getLocationService();
                 targetPath = locationService.forNewTable(transaction.getMetastore(), session, schemaName, tableName);
                 Table table = createSimpleTable(schemaTableName, columns, session, targetPath, "q1");
                 transaction.getMetastore()
-                        .createTable(session, table, privileges, Optional.empty(), Optional.empty(), false, EMPTY_TABLE_STATISTICS, false);
+                        .createTable(session, table, privileges, Optional.empty(), Optional.empty(), false, ZERO_TABLE_STATISTICS, false);
                 Optional<Table> tableHandle = transaction.getMetastore().getTable(schemaName, tableName);
                 assertTrue(tableHandle.isPresent());
                 transaction.commit();
@@ -2731,9 +2740,9 @@ public void testTableCreationIgnoreExisting()
 
             // try creating it again from another transaction with ignoreExisting=false
             try (Transaction transaction = newTransaction()) {
-                Table table = createSimpleTable(schemaTableName, columns, session, targetPath.suffix("_2"), "q2");
+                Table table = createSimpleTable(schemaTableName, columns, session, targetPath.appendSuffix("_2"), "q2");
                 transaction.getMetastore()
-                        .createTable(session, table, privileges, Optional.empty(), Optional.empty(), false, EMPTY_TABLE_STATISTICS, false);
+                        .createTable(session, table, privileges, Optional.empty(), Optional.empty(), false, ZERO_TABLE_STATISTICS, false);
                 transaction.commit();
                 fail("Expected exception");
             }
@@ -2743,18 +2752,18 @@ public void testTableCreationIgnoreExisting()
 
             // try creating it again from another transaction with ignoreExisting=true
             try (Transaction transaction = newTransaction()) {
-                Table table = createSimpleTable(schemaTableName, columns, session, targetPath.suffix("_3"), "q3");
+                Table table = createSimpleTable(schemaTableName, columns, session, targetPath.appendSuffix("_3"), "q3");
                 transaction.getMetastore()
-                        .createTable(session, table, privileges, Optional.empty(), Optional.empty(), true, EMPTY_TABLE_STATISTICS, false);
+                        .createTable(session, table, privileges, Optional.empty(), Optional.empty(), true, ZERO_TABLE_STATISTICS, false);
                 transaction.commit();
             }
 
             // at this point the table should exist, now try creating the table again with a different table definition
             columns = ImmutableList.of(new Column("new_column", HiveType.valueOf("string"), Optional.empty()));
             try (Transaction transaction = newTransaction()) {
-                Table table = createSimpleTable(schemaTableName, columns, session, targetPath.suffix("_4"), "q4");
+                Table table = createSimpleTable(schemaTableName, columns, session, targetPath.appendSuffix("_4"), "q4");
                 transaction.getMetastore()
-                        .createTable(session, table, privileges, Optional.empty(), Optional.empty(), true, EMPTY_TABLE_STATISTICS, false);
+                        .createTable(session, table, privileges, Optional.empty(), Optional.empty(), true, ZERO_TABLE_STATISTICS, false);
                 transaction.commit();
                 fail("Expected exception");
             }
@@ -2768,7 +2777,7 @@ public void testTableCreationIgnoreExisting()
         }
     }
 
-    private static Table createSimpleTable(SchemaTableName schemaTableName, List<Column> columns, ConnectorSession session, Path targetPath, String queryId)
+    private static Table createSimpleTable(SchemaTableName schemaTableName, List<Column> columns, ConnectorSession session, Location targetPath, String queryId)
     {
         String tableOwner = session.getUser();
         String schemaName = schemaTableName.getSchemaName();
@@ -2854,16 +2863,16 @@ private void doTestBucketSortedTables(SchemaTableName table)
             }
 
             HdfsContext context = new HdfsContext(session);
+            HiveConfig config = getHiveConfig();
             // verify we have enough temporary files per bucket to require multiple passes
-            Path stagingPathRoot;
-            if (isTemporaryStagingDirectoryEnabled(session)) {
-                stagingPathRoot = new Path(getTemporaryStagingDirectoryPath(session)
+            Location stagingPathRoot;
+            if (config.isTemporaryStagingDirectoryEnabled()) {
+                stagingPathRoot = Location.of(config.getTemporaryStagingDirectoryPath()
                         .replace("${USER}", context.getIdentity().getUser()));
             }
             else {
                 stagingPathRoot = getStagingPathRoot(outputHandle);
             }
-
             assertThat(listAllDataFiles(context, stagingPathRoot))
                     .filteredOn(file -> file.contains(".tmp-sort."))
                     .size().isGreaterThan(bucketCount * getSortingFileWriterConfig().getMaxOpenSortFiles() * 2);
@@ -3072,13 +3081,16 @@ public void testCreateEmptyTableShouldNotCreateStagingDirectory()
             try {
                 List<Column> columns = ImmutableList.of(new Column("test", HIVE_STRING, Optional.empty()));
                 try (Transaction transaction = newTransaction()) {
-                    final String temporaryStagingPrefix = "hive-temporary-staging-prefix-" + UUID.randomUUID().toString().toLowerCase(ENGLISH).replace("-", "");
-                    ConnectorSession session = newSession(ImmutableMap.of("hive.temporary_staging_directory_path", temporaryStagingPrefix));
+                    String temporaryStagingPrefix = "hive-temporary-staging-prefix-" + UUID.randomUUID().toString().toLowerCase(ENGLISH).replace("-", "");
+                    ConnectorSession session = newSession();
                     String tableOwner = session.getUser();
                     String schemaName = temporaryCreateEmptyTable.getSchemaName();
                     String tableName = temporaryCreateEmptyTable.getTableName();
-                    LocationService locationService = getLocationService();
-                    Path targetPath = locationService.forNewTable(transaction.getMetastore(), session, schemaName, tableName);
+                    HiveConfig hiveConfig = getHiveConfig()
+                            .setTemporaryStagingDirectoryPath(temporaryStagingPrefix)
+                            .setTemporaryStagingDirectoryEnabled(true);
+                    LocationService locationService = new HiveLocationService(hdfsEnvironment, hiveConfig);
+                    Location targetPath = locationService.forNewTable(transaction.getMetastore(), session, schemaName, tableName);
                     Table.Builder tableBuilder = Table.builder()
                             .setDatabaseName(schemaName)
                             .setTableName(tableName)
@@ -3098,12 +3110,12 @@ public void testCreateEmptyTableShouldNotCreateStagingDirectory()
                             Optional.empty(),
                             Optional.empty(),
                             true,
-                            EMPTY_TABLE_STATISTICS,
+                            ZERO_TABLE_STATISTICS,
                             false);
                     transaction.commit();
 
                     HdfsContext context = new HdfsContext(session);
-                    Path temporaryRoot = new Path(targetPath, temporaryStagingPrefix);
+                    Path temporaryRoot = new Path(targetPath.toString(), temporaryStagingPrefix);
                     FileSystem fileSystem = hdfsEnvironment.getFileSystem(context, temporaryRoot);
                     assertFalse(fileSystem.exists(temporaryRoot), format("Temporary staging directory %s is created.", temporaryRoot));
                 }
@@ -3209,10 +3221,6 @@ public void testHideDeltaLakeTables()
                 assertThat(metadata.listTables(session, Optional.of(tableName.getSchemaName())))
                         .doesNotContain(tableName);
 
-                // list all columns
-                assertThat(listTableColumns(metadata, session, new SchemaTablePrefix()).keySet())
-                        .doesNotContain(tableName);
-
                 // list all columns in a schema
                 assertThat(listTableColumns(metadata, session, new SchemaTablePrefix(tableName.getSchemaName())).keySet())
                         .doesNotContain(tableName);
@@ -3284,7 +3292,7 @@ public void testUpdateBasicTableStatistics()
         SchemaTableName tableName = temporaryTable("update_basic_table_statistics");
         try {
             doCreateEmptyTable(tableName, ORC, STATISTICS_TABLE_COLUMNS);
-            testUpdateTableStatistics(tableName, EMPTY_TABLE_STATISTICS, BASIC_STATISTICS_1, BASIC_STATISTICS_2);
+            testUpdateTableStatistics(tableName, ZERO_TABLE_STATISTICS, BASIC_STATISTICS_1, BASIC_STATISTICS_2);
         }
         finally {
             dropTable(tableName);
@@ -3298,7 +3306,7 @@ public void testUpdateTableColumnStatistics()
         SchemaTableName tableName = temporaryTable("update_table_column_statistics");
         try {
             doCreateEmptyTable(tableName, ORC, STATISTICS_TABLE_COLUMNS);
-            testUpdateTableStatistics(tableName, EMPTY_TABLE_STATISTICS, STATISTICS_1_1, STATISTICS_1_2, STATISTICS_2);
+            testUpdateTableStatistics(tableName, ZERO_TABLE_STATISTICS, STATISTICS_1_1, STATISTICS_1_2, STATISTICS_2);
         }
         finally {
             dropTable(tableName);
@@ -3312,7 +3320,7 @@ public void testUpdateTableColumnStatisticsEmptyOptionalFields()
         SchemaTableName tableName = temporaryTable("update_table_column_statistics_empty_optional_fields");
         try {
             doCreateEmptyTable(tableName, ORC, STATISTICS_TABLE_COLUMNS);
-            testUpdateTableStatistics(tableName, EMPTY_TABLE_STATISTICS, STATISTICS_EMPTY_OPTIONAL_FIELDS);
+            testUpdateTableStatistics(tableName, ZERO_TABLE_STATISTICS, STATISTICS_EMPTY_OPTIONAL_FIELDS);
         }
         finally {
             dropTable(tableName);
@@ -3322,7 +3330,7 @@ public void testUpdateTableColumnStatisticsEmptyOptionalFields()
     protected void testUpdateTableStatistics(SchemaTableName tableName, PartitionStatistics initialStatistics, PartitionStatistics... statistics)
     {
         HiveMetastoreClosure metastoreClient = new HiveMetastoreClosure(getMetastoreClient());
-        assertThat(metastoreClient.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+        assertThat(metastoreClient.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                 .isEqualTo(initialStatistics);
 
         AtomicReference<PartitionStatistics> expectedStatistics = new AtomicReference<>(initialStatistics);
@@ -3331,12 +3339,12 @@ protected void testUpdateTableStatistics(SchemaTableName tableName, PartitionSta
                 assertThat(actualStatistics).isEqualTo(expectedStatistics.get());
                 return partitionStatistics;
             });
-            assertThat(metastoreClient.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+            assertThat(metastoreClient.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                     .isEqualTo(partitionStatistics);
             expectedStatistics.set(partitionStatistics);
         }
 
-        assertThat(metastoreClient.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+        assertThat(metastoreClient.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                 .isEqualTo(expectedStatistics.get());
 
         metastoreClient.updateTableStatistics(tableName.getSchemaName(), tableName.getTableName(), NO_ACID_TRANSACTION, actualStatistics -> {
@@ -3344,7 +3352,7 @@ protected void testUpdateTableStatistics(SchemaTableName tableName, PartitionSta
             return initialStatistics;
         });
 
-        assertThat(metastoreClient.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+        assertThat(metastoreClient.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                 .isEqualTo(initialStatistics);
     }
 
@@ -3357,7 +3365,7 @@ public void testUpdateBasicPartitionStatistics()
             createDummyPartitionedTable(tableName, STATISTICS_PARTITIONED_TABLE_COLUMNS);
             testUpdatePartitionStatistics(
                     tableName,
-                    EMPTY_TABLE_STATISTICS,
+                    ZERO_TABLE_STATISTICS,
                     ImmutableList.of(BASIC_STATISTICS_1, BASIC_STATISTICS_2),
                     ImmutableList.of(BASIC_STATISTICS_2, BASIC_STATISTICS_1));
         }
@@ -3375,7 +3383,7 @@ public void testUpdatePartitionColumnStatistics()
             createDummyPartitionedTable(tableName, STATISTICS_PARTITIONED_TABLE_COLUMNS);
             testUpdatePartitionStatistics(
                     tableName,
-                    EMPTY_TABLE_STATISTICS,
+                    ZERO_TABLE_STATISTICS,
                     ImmutableList.of(STATISTICS_1_1, STATISTICS_1_2, STATISTICS_2),
                     ImmutableList.of(STATISTICS_1_2, STATISTICS_1_1, STATISTICS_2));
         }
@@ -3393,7 +3401,7 @@ public void testUpdatePartitionColumnStatisticsEmptyOptionalFields()
             createDummyPartitionedTable(tableName, STATISTICS_PARTITIONED_TABLE_COLUMNS);
             testUpdatePartitionStatistics(
                     tableName,
-                    EMPTY_TABLE_STATISTICS,
+                    ZERO_TABLE_STATISTICS,
                     ImmutableList.of(STATISTICS_EMPTY_OPTIONAL_FIELDS),
                     ImmutableList.of(STATISTICS_EMPTY_OPTIONAL_FIELDS));
         }
@@ -3402,6 +3410,92 @@ public void testUpdatePartitionColumnStatisticsEmptyOptionalFields()
         }
     }
 
+    @Test
+    public void testDataColumnProperties()
+            throws Exception
+    {
+        SchemaTableName tableName = temporaryTable("test_column_properties");
+        HiveMetastoreClosure metastoreClient = new HiveMetastoreClosure(getMetastoreClient());
+        try {
+            doCreateEmptyTable(tableName, ORC, List.of(new ColumnMetadata("id", BIGINT), new ColumnMetadata("part_key", createVarcharType(256))));
+
+            Table table = metastoreClient.getTable(tableName.getSchemaName(), tableName.getTableName()).orElseThrow();
+            assertThat(table.getDataColumns())
+                    .singleElement()
+                    .extracting(Column::getProperties, InstanceOfAssertFactories.MAP)
+                    .isEmpty();
+            assertThat(table.getPartitionColumns())
+                    .singleElement()
+                    .extracting(Column::getProperties, InstanceOfAssertFactories.MAP)
+                    .isEmpty();
+
+            String columnPropertyValue = "data column value ,;.!??? \" ' {} [] non-printable \000 \001 spaces \n\r\t\f hiragana だ emoji 🤷‍♂️  x";
+            metastoreClient.replaceTable(
+                    tableName.getSchemaName(),
+                    tableName.getTableName(),
+                    Table.builder(table)
+                            .setDataColumns(List.of(new Column("id", HIVE_LONG, Optional.empty(), Map.of("data prop", columnPropertyValue))))
+                            .build(),
+                    NO_PRIVILEGES);
+
+            table = metastoreClient.getTable(tableName.getSchemaName(), tableName.getTableName()).orElseThrow();
+            assertThat(table.getDataColumns())
+                    .singleElement()
+                    .extracting(Column::getProperties, InstanceOfAssertFactories.MAP)
+                    .isEqualTo(Map.of("data prop", columnPropertyValue));
+            assertThat(table.getPartitionColumns())
+                    .singleElement()
+                    .extracting(Column::getProperties, InstanceOfAssertFactories.MAP)
+                    .isEmpty();
+        }
+        finally {
+            dropTable(tableName);
+        }
+    }
+
+    @Test
+    public void testPartitionColumnProperties()
+            throws Exception
+    {
+        SchemaTableName tableName = temporaryTable("test_column_properties");
+        HiveMetastoreClosure metastoreClient = new HiveMetastoreClosure(getMetastoreClient());
+        try {
+            doCreateEmptyTable(tableName, ORC, List.of(new ColumnMetadata("id", BIGINT), new ColumnMetadata("part_key", createVarcharType(256))));
+
+            Table table = metastoreClient.getTable(tableName.getSchemaName(), tableName.getTableName()).orElseThrow();
+            assertThat(table.getDataColumns())
+                    .singleElement()
+                    .extracting(Column::getProperties, InstanceOfAssertFactories.MAP)
+                    .isEmpty();
+            assertThat(table.getPartitionColumns())
+                    .singleElement()
+                    .extracting(Column::getProperties, InstanceOfAssertFactories.MAP)
+                    .isEmpty();
+
+            String columnPropertyValue = "partition column value ,;.!??? \" ' {} [] non-printable \000 \001 spaces \n\r\t\f hiragana だ emoji 🤷‍♂️  x";
+            metastoreClient.replaceTable(
+                    tableName.getSchemaName(),
+                    tableName.getTableName(),
+                    Table.builder(table)
+                            .setPartitionColumns(List.of(new Column("part_key", HiveType.valueOf("varchar(256)"), Optional.empty(), Map.of("partition prop", columnPropertyValue))))
+                            .build(),
+                    NO_PRIVILEGES);
+
+            table = metastoreClient.getTable(tableName.getSchemaName(), tableName.getTableName()).orElseThrow();
+            assertThat(table.getDataColumns())
+                    .singleElement()
+                    .extracting(Column::getProperties, InstanceOfAssertFactories.MAP)
+                    .isEmpty();
+            assertThat(table.getPartitionColumns())
+                    .singleElement()
+                    .extracting(Column::getProperties, InstanceOfAssertFactories.MAP)
+                    .isEqualTo(Map.of("partition prop", columnPropertyValue));
+        }
+        finally {
+            dropTable(tableName);
+        }
+    }
+
     @Test
     public void testInputInfoWhenTableIsPartitioned()
             throws Exception
@@ -3465,7 +3559,7 @@ public void testIllegalStorageFormatDuringTableScan()
             String tableOwner = session.getUser();
             String schemaName = schemaTableName.getSchemaName();
             String tableName = schemaTableName.getTableName();
-            Path targetPath = locationService.forNewTable(transaction.getMetastore(), session, schemaName, tableName);
+            Location targetPath = locationService.forNewTable(transaction.getMetastore(), session, schemaName, tableName);
             //create table whose storage format is null
             Table.Builder tableBuilder = Table.builder()
                     .setDatabaseName(schemaName)
@@ -3481,7 +3575,7 @@ public void testIllegalStorageFormatDuringTableScan()
                             .setStorageFormat(StorageFormat.createNullable(null, null, null))
                             .setSerdeParameters(ImmutableMap.of()));
             PrincipalPrivileges principalPrivileges = testingPrincipalPrivilege(tableOwner, session.getUser());
-            transaction.getMetastore().createTable(session, tableBuilder.build(), principalPrivileges, Optional.empty(), Optional.empty(), true, EMPTY_TABLE_STATISTICS, false);
+            transaction.getMetastore().createTable(session, tableBuilder.build(), principalPrivileges, Optional.empty(), Optional.empty(), true, ZERO_TABLE_STATISTICS, false);
             transaction.commit();
         }
 
@@ -3497,7 +3591,7 @@ public void testIllegalStorageFormatDuringTableScan()
         }
     }
 
-    private static Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorMetadata metadata, ConnectorSession session, SchemaTablePrefix prefix)
+    protected static Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorMetadata metadata, ConnectorSession session, SchemaTablePrefix prefix)
     {
         return stream(metadata.streamTableColumns(session, prefix))
                 .collect(toImmutableMap(
@@ -3545,8 +3639,8 @@ protected void createDummyPartitionedTable(SchemaTableName tableName, List<Colum
                 .map(partitionName -> new PartitionWithStatistics(createDummyPartition(table, partitionName), partitionName, PartitionStatistics.empty()))
                 .collect(toImmutableList());
         metastoreClient.addPartitions(tableName.getSchemaName(), tableName.getTableName(), partitions);
-        metastoreClient.updatePartitionStatistics(tableName.getSchemaName(), tableName.getTableName(), firstPartitionName, currentStatistics -> EMPTY_TABLE_STATISTICS);
-        metastoreClient.updatePartitionStatistics(tableName.getSchemaName(), tableName.getTableName(), secondPartitionName, currentStatistics -> EMPTY_TABLE_STATISTICS);
+        metastoreClient.updatePartitionStatistics(tableName.getSchemaName(), tableName.getTableName(), firstPartitionName, currentStatistics -> ZERO_TABLE_STATISTICS);
+        metastoreClient.updatePartitionStatistics(tableName.getSchemaName(), tableName.getTableName(), secondPartitionName, currentStatistics -> ZERO_TABLE_STATISTICS);
     }
 
     protected void testUpdatePartitionStatistics(
@@ -3602,7 +3696,7 @@ protected void testUpdatePartitionStatistics(
     public void testStorePartitionWithStatistics()
             throws Exception
     {
-        testStorePartitionWithStatistics(STATISTICS_PARTITIONED_TABLE_COLUMNS, STATISTICS_1, STATISTICS_2, STATISTICS_1_1, EMPTY_TABLE_STATISTICS);
+        testStorePartitionWithStatistics(STATISTICS_PARTITIONED_TABLE_COLUMNS, STATISTICS_1, STATISTICS_2, STATISTICS_1_1, ZERO_TABLE_STATISTICS);
     }
 
     protected void testStorePartitionWithStatistics(
@@ -3696,7 +3790,7 @@ protected String partitionTargetPath(SchemaTableName schemaTableName, String par
             LocationService locationService = getLocationService();
             Table table = metastore.getTable(schemaTableName.getSchemaName(), schemaTableName.getTableName()).get();
             LocationHandle handle = locationService.forExistingTable(metastore, session, table);
-            return locationService.getPartitionWriteInfo(handle, Optional.empty(), partitionName).getTargetPath().toString();
+            return locationService.getPartitionWriteInfo(handle, Optional.empty(), partitionName).targetPath().toString();
         }
     }
 
@@ -3960,7 +4054,7 @@ public void testParquetPageSourceMetrics()
     {
         SchemaTableName tableName = temporaryTable("parquet_page_source_metrics");
         try {
-            assertPageSourceMetrics(tableName, PARQUET, new Metrics(ImmutableMap.of(PARQUET_CODEC_METRIC_PREFIX + "SNAPPY", new LongCount(1169))));
+            assertPageSourceMetrics(tableName, PARQUET, new Metrics(ImmutableMap.of(PARQUET_CODEC_METRIC_PREFIX + "SNAPPY", new LongCount(1157))));
         }
         finally {
             dropTable(tableName);
@@ -4065,7 +4159,8 @@ private void doCreateView(SchemaTableName viewName, boolean replace)
                 ImmutableList.of(new ViewColumn("test", BIGINT.getTypeId(), Optional.empty())),
                 Optional.empty(),
                 Optional.empty(),
-                true);
+                true,
+                ImmutableList.of());
 
         try (Transaction transaction = newTransaction()) {
             transaction.getMetadata().createView(newSession(), viewName, definition, replace);
@@ -4249,7 +4344,7 @@ private void doInsert(HiveStorageFormat storageFormat, SchemaTableName tableName
 
                 // statistics
                 HiveBasicStatistics tableStatistics = getBasicStatisticsForTable(transaction, tableName);
-                assertEquals(tableStatistics.getRowCount().getAsLong(), CREATE_TABLE_DATA.getRowCount() * (i + 1));
+                assertEquals(tableStatistics.getRowCount().orElse(0), CREATE_TABLE_DATA.getRowCount() * (i + 1L));
                 assertEquals(tableStatistics.getFileCount().getAsLong(), i + 1L);
                 assertGreaterThan(tableStatistics.getInMemoryDataSizeInBytes().getAsLong(), 0L);
                 assertGreaterThan(tableStatistics.getOnDiskDataSizeInBytes().getAsLong(), 0L);
@@ -4263,7 +4358,7 @@ private void doInsert(HiveStorageFormat storageFormat, SchemaTableName tableName
             assertFalse(existingFiles.isEmpty());
         }
 
-        Path stagingPathRoot;
+        Location stagingPathRoot;
         try (Transaction transaction = newTransaction()) {
             ConnectorSession session = newSession();
             ConnectorMetadata metadata = transaction.getMetadata();
@@ -4384,7 +4479,7 @@ private void doInsertOverwriteUnpartitioned(SchemaTableName tableName)
             assertFalse(existingFiles.isEmpty());
         }
 
-        Path stagingPathRoot;
+        Location stagingPathRoot;
         try (Transaction transaction = newTransaction()) {
             ConnectorSession session = newSession(overwriteProperties);
             ConnectorMetadata metadata = transaction.getMetadata();
@@ -4453,32 +4548,31 @@ private void doInsertOverwriteUnpartitioned(SchemaTableName tableName)
         }
     }
 
-    // These are protected so extensions to the hive connector can replace the handle classes
-    protected Path getStagingPathRoot(ConnectorInsertTableHandle insertTableHandle)
+    private Location getStagingPathRoot(ConnectorInsertTableHandle insertTableHandle)
     {
         HiveInsertTableHandle handle = (HiveInsertTableHandle) insertTableHandle;
         WriteInfo writeInfo = getLocationService().getQueryWriteInfo(handle.getLocationHandle());
-        if (writeInfo.getWriteMode() != STAGE_AND_MOVE_TO_TARGET_DIRECTORY) {
+        if (writeInfo.writeMode() != STAGE_AND_MOVE_TO_TARGET_DIRECTORY) {
             throw new AssertionError("writeMode is not STAGE_AND_MOVE_TO_TARGET_DIRECTORY");
         }
-        return writeInfo.getWritePath();
+        return writeInfo.writePath();
     }
 
-    protected Path getStagingPathRoot(ConnectorOutputTableHandle outputTableHandle)
+    private Location getStagingPathRoot(ConnectorOutputTableHandle outputTableHandle)
     {
         HiveOutputTableHandle handle = (HiveOutputTableHandle) outputTableHandle;
         return getLocationService()
                 .getQueryWriteInfo(handle.getLocationHandle())
-                .getWritePath();
+                .writePath();
     }
 
-    protected Path getTargetPathRoot(ConnectorInsertTableHandle insertTableHandle)
+    private Location getTargetPathRoot(ConnectorInsertTableHandle insertTableHandle)
     {
         HiveInsertTableHandle hiveInsertTableHandle = (HiveInsertTableHandle) insertTableHandle;
 
         return getLocationService()
                 .getQueryWriteInfo(hiveInsertTableHandle.getLocationHandle())
-                .getTargetPath();
+                .targetPath();
     }
 
     protected Set<String> listAllDataFiles(Transaction transaction, String schemaName, String tableName)
@@ -4487,7 +4581,7 @@ protected Set<String> listAllDataFiles(Transaction transaction, String schemaNam
         HdfsContext hdfsContext = new HdfsContext(newSession());
         Set<String> existingFiles = new HashSet<>();
         for (String location : listAllDataPaths(transaction.getMetastore(), schemaName, tableName)) {
-            existingFiles.addAll(listAllDataFiles(hdfsContext, new Path(location)));
+            existingFiles.addAll(listAllDataFiles(hdfsContext, Location.of(location)));
         }
         return existingFiles;
     }
@@ -4515,9 +4609,10 @@ public static List<String> listAllDataPaths(SemiTransactionalHiveMetastore metas
         return locations.build();
     }
 
-    protected Set<String> listAllDataFiles(HdfsContext context, Path path)
+    protected Set<String> listAllDataFiles(HdfsContext context, Location location)
             throws IOException
     {
+        Path path = new Path(location.toString());
         Set<String> result = new HashSet<>();
         FileSystem fileSystem = hdfsEnvironment.getFileSystem(context, path);
         if (fileSystem.exists(path)) {
@@ -4529,7 +4624,7 @@ else if (fileStatus.isFile()) {
                     result.add(fileStatus.getPath().toString());
                 }
                 else if (fileStatus.isDirectory()) {
-                    result.addAll(listAllDataFiles(context, fileStatus.getPath()));
+                    result.addAll(listAllDataFiles(context, Location.of(fileStatus.getPath().toString())));
                 }
             }
         }
@@ -4590,7 +4685,7 @@ private void doInsertIntoNewPartition(HiveStorageFormat storageFormat, SchemaTab
             }
         }
 
-        Path stagingPathRoot;
+        Location stagingPathRoot;
         try (Transaction transaction = newTransaction()) {
             ConnectorSession session = newSession();
             ConnectorMetadata metadata = transaction.getMetadata();
@@ -4702,7 +4797,7 @@ private void doInsertIntoExistingPartition(HiveStorageFormat storageFormat, Sche
 
         // test rollback
         Set<String> existingFiles;
-        Path stagingPathRoot;
+        Location stagingPathRoot;
         try (Transaction transaction = newTransaction()) {
             ConnectorMetadata metadata = transaction.getMetadata();
             ConnectorSession session = newSession();
@@ -4849,8 +4944,8 @@ private String insertData(SchemaTableName tableName, MaterializedResult data)
     private String insertData(SchemaTableName tableName, MaterializedResult data, Map<String, Object> sessionProperties)
             throws Exception
     {
-        Path writePath;
-        Path targetPath;
+        Location writePath;
+        Location targetPath;
         String queryId;
         try (Transaction transaction = newTransaction()) {
             ConnectorMetadata metadata = transaction.getMetadata();
@@ -4875,8 +4970,8 @@ private String insertData(SchemaTableName tableName, MaterializedResult data, Ma
         // check that temporary files are removed
         if (!writePath.equals(targetPath)) {
             HdfsContext context = new HdfsContext(newSession());
-            FileSystem fileSystem = hdfsEnvironment.getFileSystem(context, writePath);
-            assertFalse(fileSystem.exists(writePath));
+            FileSystem fileSystem = hdfsEnvironment.getFileSystem(context, new Path(writePath.toString()));
+            assertFalse(fileSystem.exists(new Path(writePath.toString())));
         }
 
         return queryId;
@@ -5353,25 +5448,7 @@ protected String getPartitionId(Object partition)
 
     protected static void assertPageSourceType(ConnectorPageSource pageSource, HiveStorageFormat hiveStorageFormat)
     {
-        if (pageSource instanceof RecordPageSource) {
-            RecordCursor hiveRecordCursor = ((RecordPageSource) pageSource).getCursor();
-            hiveRecordCursor = ((HiveRecordCursor) hiveRecordCursor).getRegularColumnRecordCursor();
-            if (hiveRecordCursor instanceof HiveBucketValidationRecordCursor) {
-                hiveRecordCursor = ((HiveBucketValidationRecordCursor) hiveRecordCursor).delegate();
-            }
-            if (hiveRecordCursor instanceof HiveCoercionRecordCursor) {
-                hiveRecordCursor = ((HiveCoercionRecordCursor) hiveRecordCursor).getRegularColumnRecordCursor();
-            }
-            assertInstanceOf(hiveRecordCursor, recordCursorType(), hiveStorageFormat.name());
-        }
-        else {
-            assertInstanceOf(((HivePageSource) pageSource).getPageSource(), pageSourceType(hiveStorageFormat), hiveStorageFormat.name());
-        }
-    }
-
-    private static Class<? extends RecordCursor> recordCursorType()
-    {
-        return GenericHiveRecordCursor.class;
+        assertInstanceOf(((HivePageSource) pageSource).getPageSource(), pageSourceType(hiveStorageFormat), hiveStorageFormat.name());
     }
 
     private static Class<? extends ConnectorPageSource> pageSourceType(HiveStorageFormat hiveStorageFormat)
@@ -5561,7 +5638,7 @@ protected void createEmptyTable(
             String tableName = schemaTableName.getTableName();
 
             LocationService locationService = getLocationService();
-            targetPath = locationService.forNewTable(transaction.getMetastore(), session, schemaName, tableName);
+            targetPath = new Path(locationService.forNewTable(transaction.getMetastore(), session, schemaName, tableName).toString());
 
             ImmutableMap.Builder<String, String> tableParamBuilder = ImmutableMap.<String, String>builder()
                     .put(PRESTO_VERSION_NAME, TEST_SERVER_VERSION)
@@ -5585,7 +5662,7 @@ protected void createEmptyTable(
                     .setSerdeParameters(ImmutableMap.of());
 
             PrincipalPrivileges principalPrivileges = testingPrincipalPrivilege(tableOwner, session.getUser());
-            transaction.getMetastore().createTable(session, tableBuilder.build(), principalPrivileges, Optional.empty(), Optional.empty(), true, EMPTY_TABLE_STATISTICS, false);
+            transaction.getMetastore().createTable(session, tableBuilder.build(), principalPrivileges, Optional.empty(), Optional.empty(), true, ZERO_TABLE_STATISTICS, false);
 
             transaction.commit();
         }
@@ -6014,8 +6091,8 @@ private void doTestTransactionDeleteInsert(
             Optional<ConflictTrigger> conflictTrigger)
             throws Exception
     {
-        Path writePath = null;
-        Path targetPath = null;
+        Location writePath = null;
+        Location targetPath = null;
 
         try (Transaction transaction = newTransaction()) {
             try {
@@ -6079,8 +6156,8 @@ private void doTestTransactionDeleteInsert(
         // check that temporary files are removed
         if (writePath != null && !writePath.equals(targetPath)) {
             HdfsContext context = new HdfsContext(newSession());
-            FileSystem fileSystem = hdfsEnvironment.getFileSystem(context, writePath);
-            assertFalse(fileSystem.exists(writePath));
+            FileSystem fileSystem = hdfsEnvironment.getFileSystem(context, new Path(writePath.toString()));
+            assertFalse(fileSystem.exists(new Path(writePath.toString())));
         }
 
         try (Transaction transaction = newTransaction()) {
@@ -6258,15 +6335,15 @@ protected class DirectoryRenameFailure
         @Override
         public void triggerConflict(ConnectorSession session, SchemaTableName tableName, ConnectorInsertTableHandle insertTableHandle, List<PartitionUpdate> partitionUpdates)
         {
-            Path writePath = getStagingPathRoot(insertTableHandle);
-            Path targetPath = getTargetPathRoot(insertTableHandle);
+            Location writePath = getStagingPathRoot(insertTableHandle);
+            Location targetPath = getTargetPathRoot(insertTableHandle);
             if (writePath.equals(targetPath)) {
                 // This conflict does not apply. Trigger a rollback right away so that this test case passes.
                 throw new TestingRollbackException();
             }
-            path = new Path(targetPath + "/pk1=b/pk2=add2");
+            path = new Path(targetPath.appendPath("pk1=b").appendPath("pk2=add2").toString());
             context = new HdfsContext(session);
-            createDirectory(context, hdfsEnvironment, path);
+            createDirectory(context, hdfsEnvironment, new Path(path.toString()));
         }
 
         @Override
@@ -6289,8 +6366,8 @@ public void triggerConflict(ConnectorSession session, SchemaTableName tableName,
                 throws IOException
         {
             for (PartitionUpdate partitionUpdate : partitionUpdates) {
-                if ("pk2=insert2".equals(partitionUpdate.getTargetPath().getName())) {
-                    path = new Path(partitionUpdate.getTargetPath(), partitionUpdate.getFileNames().get(0));
+                if ("pk2=insert2".equals(partitionUpdate.getTargetPath().fileName())) {
+                    path = new Path(partitionUpdate.getTargetPath().toString(), partitionUpdate.getFileNames().get(0));
                     break;
                 }
             }
@@ -6317,19 +6394,11 @@ private static class CountingDirectoryLister
         private final AtomicInteger listCount = new AtomicInteger();
 
         @Override
-        public RemoteIterator<TrinoFileStatus> list(FileSystem fs, Table table, Path path)
-                throws IOException
-        {
-            listCount.incrementAndGet();
-            return new TrinoFileStatusRemoteIterator(fs.listLocatedStatus(path));
-        }
-
-        @Override
-        public RemoteIterator<TrinoFileStatus> listFilesRecursively(FileSystem fs, Table table, Path path)
+        public RemoteIterator<TrinoFileStatus> listFilesRecursively(TrinoFileSystem fs, Table table, Location location)
                 throws IOException
         {
             listCount.incrementAndGet();
-            return new TrinoFileStatusRemoteIterator(fs.listFiles(path, true));
+            return new TrinoFileStatusRemoteIterator(fs.listFiles(location));
         }
 
         public int getListCount()
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileFormats.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileFormats.java
index b147d437a126..eddb7e795a38 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileFormats.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileFormats.java
@@ -17,10 +17,10 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.metastore.StorageFormat;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorSession;
@@ -63,11 +63,9 @@
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
-import org.testng.annotations.Test;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.invoke.MethodHandle;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -83,7 +81,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.PARTITION_KEY;
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
@@ -91,7 +88,6 @@
 import static io.trino.plugin.hive.HiveColumnProjectionInfo.generatePartialName;
 import static io.trino.plugin.hive.HivePartitionKey.HIVE_DEFAULT_DYNAMIC_PARTITION;
 import static io.trino.plugin.hive.HiveTestUtils.SESSION;
-import static io.trino.plugin.hive.HiveTestUtils.isDistinctFrom;
 import static io.trino.plugin.hive.HiveTestUtils.mapType;
 import static io.trino.plugin.hive.acid.AcidTransaction.NO_ACID_TRANSACTION;
 import static io.trino.plugin.hive.util.CompressionConfigUtil.configureCompression;
@@ -113,9 +109,9 @@
 import static io.trino.testing.MaterializedResult.materializeSourceDataStream;
 import static io.trino.testing.StructuralTestUtil.arrayBlockOf;
 import static io.trino.testing.StructuralTestUtil.decimalArrayBlockOf;
-import static io.trino.testing.StructuralTestUtil.decimalMapBlockOf;
-import static io.trino.testing.StructuralTestUtil.mapBlockOf;
+import static io.trino.testing.StructuralTestUtil.decimalSqlMapOf;
 import static io.trino.testing.StructuralTestUtil.rowBlockOf;
+import static io.trino.testing.StructuralTestUtil.sqlMapOf;
 import static io.trino.type.DateTimes.MICROSECONDS_PER_MILLISECOND;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.lang.Float.intBitsToFloat;
@@ -123,7 +119,6 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.fill;
 import static java.util.Objects.requireNonNull;
-import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.toList;
 import static org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.getStandardListObjectInspector;
 import static org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.getStandardMapObjectInspector;
@@ -143,10 +138,7 @@
 import static org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory.getCharTypeInfo;
 import static org.joda.time.DateTimeZone.UTC;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
-@Test(groups = "hive")
 public abstract class AbstractTestHiveFileFormats
 {
     protected static final DateTimeZone HIVE_STORAGE_TIME_ZONE = DateTimeZone.forID("America/Bahia_Banderas");
@@ -288,77 +280,77 @@ public abstract class AbstractTestHiveFileFormats
             .add(new TestColumn("t_map_string",
                     getStandardMapObjectInspector(javaStringObjectInspector, javaStringObjectInspector),
                     ImmutableMap.of("test", "test"),
-                    mapBlockOf(createUnboundedVarcharType(), createUnboundedVarcharType(), "test", "test")))
+                    sqlMapOf(createUnboundedVarcharType(), createUnboundedVarcharType(), "test", "test")))
             .add(new TestColumn("t_map_tinyint",
                     getStandardMapObjectInspector(javaByteObjectInspector, javaByteObjectInspector),
                     ImmutableMap.of((byte) 1, (byte) 1),
-                    mapBlockOf(TINYINT, TINYINT, (byte) 1, (byte) 1)))
+                    sqlMapOf(TINYINT, TINYINT, (byte) 1, (byte) 1)))
             .add(new TestColumn("t_map_varchar",
                     getStandardMapObjectInspector(javaHiveVarcharObjectInspector, javaHiveVarcharObjectInspector),
                     ImmutableMap.of(new HiveVarchar("test", HiveVarchar.MAX_VARCHAR_LENGTH), new HiveVarchar("test", HiveVarchar.MAX_VARCHAR_LENGTH)),
-                    mapBlockOf(createVarcharType(HiveVarchar.MAX_VARCHAR_LENGTH), createVarcharType(HiveVarchar.MAX_VARCHAR_LENGTH), "test", "test")))
+                    sqlMapOf(createVarcharType(HiveVarchar.MAX_VARCHAR_LENGTH), createVarcharType(HiveVarchar.MAX_VARCHAR_LENGTH), "test", "test")))
             .add(new TestColumn("t_map_char",
                     getStandardMapObjectInspector(CHAR_INSPECTOR_LENGTH_10, CHAR_INSPECTOR_LENGTH_10),
                     ImmutableMap.of(new HiveChar("test", 10), new HiveChar("test", 10)),
-                    mapBlockOf(createCharType(10), createCharType(10), "test", "test")))
+                    sqlMapOf(createCharType(10), createCharType(10), "test", "test")))
             .add(new TestColumn("t_map_smallint",
                     getStandardMapObjectInspector(javaShortObjectInspector, javaShortObjectInspector),
                     ImmutableMap.of((short) 2, (short) 2),
-                    mapBlockOf(SMALLINT, SMALLINT, (short) 2, (short) 2)))
+                    sqlMapOf(SMALLINT, SMALLINT, (short) 2, (short) 2)))
             .add(new TestColumn("t_map_null_key",
                     getStandardMapObjectInspector(javaLongObjectInspector, javaLongObjectInspector),
                     asMap(new Long[] {null, 2L}, new Long[] {0L, 3L}),
-                    mapBlockOf(BIGINT, BIGINT, 2, 3)))
+                    sqlMapOf(BIGINT, BIGINT, 2, 3)))
             .add(new TestColumn("t_map_int",
                     getStandardMapObjectInspector(javaIntObjectInspector, javaIntObjectInspector),
                     ImmutableMap.of(3, 3),
-                    mapBlockOf(INTEGER, INTEGER, 3, 3)))
+                    sqlMapOf(INTEGER, INTEGER, 3, 3)))
             .add(new TestColumn("t_map_bigint",
                     getStandardMapObjectInspector(javaLongObjectInspector, javaLongObjectInspector),
                     ImmutableMap.of(4L, 4L),
-                    mapBlockOf(BIGINT, BIGINT, 4L, 4L)))
+                    sqlMapOf(BIGINT, BIGINT, 4L, 4L)))
             .add(new TestColumn("t_map_float",
                     getStandardMapObjectInspector(javaFloatObjectInspector, javaFloatObjectInspector),
-                    ImmutableMap.of(5.0f, 5.0f), mapBlockOf(REAL, REAL, 5.0f, 5.0f)))
+                    ImmutableMap.of(5.0f, 5.0f), sqlMapOf(REAL, REAL, 5.0f, 5.0f)))
             .add(new TestColumn("t_map_double",
                     getStandardMapObjectInspector(javaDoubleObjectInspector, javaDoubleObjectInspector),
-                    ImmutableMap.of(6.0, 6.0), mapBlockOf(DOUBLE, DOUBLE, 6.0, 6.0)))
+                    ImmutableMap.of(6.0, 6.0), sqlMapOf(DOUBLE, DOUBLE, 6.0, 6.0)))
             .add(new TestColumn("t_map_boolean",
                     getStandardMapObjectInspector(javaBooleanObjectInspector, javaBooleanObjectInspector),
                     ImmutableMap.of(true, true),
-                    mapBlockOf(BOOLEAN, BOOLEAN, true, true)))
+                    sqlMapOf(BOOLEAN, BOOLEAN, true, true)))
             .add(new TestColumn("t_map_date",
                     getStandardMapObjectInspector(javaDateObjectInspector, javaDateObjectInspector),
                     ImmutableMap.of(HIVE_DATE, HIVE_DATE),
-                    mapBlockOf(DateType.DATE, DateType.DATE, DATE_DAYS, DATE_DAYS)))
+                    sqlMapOf(DateType.DATE, DateType.DATE, DATE_DAYS, DATE_DAYS)))
             .add(new TestColumn("t_map_timestamp",
                     getStandardMapObjectInspector(javaTimestampObjectInspector, javaTimestampObjectInspector),
                     ImmutableMap.of(HIVE_TIMESTAMP, HIVE_TIMESTAMP),
-                    mapBlockOf(TimestampType.TIMESTAMP_MILLIS, TimestampType.TIMESTAMP_MILLIS, TIMESTAMP_MICROS, TIMESTAMP_MICROS)))
+                    sqlMapOf(TimestampType.TIMESTAMP_MILLIS, TimestampType.TIMESTAMP_MILLIS, TIMESTAMP_MICROS, TIMESTAMP_MICROS)))
             .add(new TestColumn("t_map_decimal_precision_2",
                     getStandardMapObjectInspector(DECIMAL_INSPECTOR_PRECISION_2, DECIMAL_INSPECTOR_PRECISION_2),
                     ImmutableMap.of(WRITE_DECIMAL_PRECISION_2, WRITE_DECIMAL_PRECISION_2),
-                    decimalMapBlockOf(DECIMAL_TYPE_PRECISION_2, EXPECTED_DECIMAL_PRECISION_2)))
+                    decimalSqlMapOf(DECIMAL_TYPE_PRECISION_2, EXPECTED_DECIMAL_PRECISION_2)))
             .add(new TestColumn("t_map_decimal_precision_4",
                     getStandardMapObjectInspector(DECIMAL_INSPECTOR_PRECISION_4, DECIMAL_INSPECTOR_PRECISION_4),
                     ImmutableMap.of(WRITE_DECIMAL_PRECISION_4, WRITE_DECIMAL_PRECISION_4),
-                    decimalMapBlockOf(DECIMAL_TYPE_PRECISION_4, EXPECTED_DECIMAL_PRECISION_4)))
+                    decimalSqlMapOf(DECIMAL_TYPE_PRECISION_4, EXPECTED_DECIMAL_PRECISION_4)))
             .add(new TestColumn("t_map_decimal_precision_8",
                     getStandardMapObjectInspector(DECIMAL_INSPECTOR_PRECISION_8, DECIMAL_INSPECTOR_PRECISION_8),
                     ImmutableMap.of(WRITE_DECIMAL_PRECISION_8, WRITE_DECIMAL_PRECISION_8),
-                    decimalMapBlockOf(DECIMAL_TYPE_PRECISION_8, EXPECTED_DECIMAL_PRECISION_8)))
+                    decimalSqlMapOf(DECIMAL_TYPE_PRECISION_8, EXPECTED_DECIMAL_PRECISION_8)))
             .add(new TestColumn("t_map_decimal_precision_17",
                     getStandardMapObjectInspector(DECIMAL_INSPECTOR_PRECISION_17, DECIMAL_INSPECTOR_PRECISION_17),
                     ImmutableMap.of(WRITE_DECIMAL_PRECISION_17, WRITE_DECIMAL_PRECISION_17),
-                    decimalMapBlockOf(DECIMAL_TYPE_PRECISION_17, EXPECTED_DECIMAL_PRECISION_17)))
+                    decimalSqlMapOf(DECIMAL_TYPE_PRECISION_17, EXPECTED_DECIMAL_PRECISION_17)))
             .add(new TestColumn("t_map_decimal_precision_18",
                     getStandardMapObjectInspector(DECIMAL_INSPECTOR_PRECISION_18, DECIMAL_INSPECTOR_PRECISION_18),
                     ImmutableMap.of(WRITE_DECIMAL_PRECISION_18, WRITE_DECIMAL_PRECISION_18),
-                    decimalMapBlockOf(DECIMAL_TYPE_PRECISION_18, EXPECTED_DECIMAL_PRECISION_18)))
+                    decimalSqlMapOf(DECIMAL_TYPE_PRECISION_18, EXPECTED_DECIMAL_PRECISION_18)))
             .add(new TestColumn("t_map_decimal_precision_38",
                     getStandardMapObjectInspector(DECIMAL_INSPECTOR_PRECISION_38, DECIMAL_INSPECTOR_PRECISION_38),
                     ImmutableMap.of(WRITE_DECIMAL_PRECISION_38, WRITE_DECIMAL_PRECISION_38),
-                    decimalMapBlockOf(DECIMAL_TYPE_PRECISION_38, EXPECTED_DECIMAL_PRECISION_38)))
+                    decimalSqlMapOf(DECIMAL_TYPE_PRECISION_38, EXPECTED_DECIMAL_PRECISION_38)))
             .add(new TestColumn("t_array_empty", getStandardListObjectInspector(javaStringObjectInspector), ImmutableList.of(), arrayBlockOf(createUnboundedVarcharType())))
             .add(new TestColumn("t_array_string", getStandardListObjectInspector(javaStringObjectInspector), ImmutableList.of("test"), arrayBlockOf(createUnboundedVarcharType(), "test")))
             .add(new TestColumn("t_array_tinyint", getStandardListObjectInspector(javaByteObjectInspector), ImmutableList.of((byte) 1), arrayBlockOf(TINYINT, (byte) 1)))
@@ -422,20 +414,20 @@ public abstract class AbstractTestHiveFileFormats
                                             ImmutableList.of("s_int"),
                                             ImmutableList.of(javaIntObjectInspector)))),
                     ImmutableMap.of("test", ImmutableList.<Object>of(new Integer[] {1})),
-                    mapBlockOf(createUnboundedVarcharType(), new ArrayType(RowType.anonymous(ImmutableList.of(INTEGER))),
+                    sqlMapOf(createUnboundedVarcharType(), new ArrayType(RowType.anonymous(ImmutableList.of(INTEGER))),
                             "test", arrayBlockOf(RowType.anonymous(ImmutableList.of(INTEGER)), rowBlockOf(ImmutableList.of(INTEGER), 1L)))))
             .add(new TestColumn("t_map_null_key_complex_value",
                     getStandardMapObjectInspector(
                             javaStringObjectInspector,
                             getStandardMapObjectInspector(javaLongObjectInspector, javaBooleanObjectInspector)),
                     asMap(new String[] {null, "k"}, new ImmutableMap[] {ImmutableMap.of(15L, true), ImmutableMap.of(16L, false)}),
-                    mapBlockOf(createUnboundedVarcharType(), mapType(BIGINT, BOOLEAN), "k", mapBlockOf(BIGINT, BOOLEAN, 16L, false))))
+                    sqlMapOf(createUnboundedVarcharType(), mapType(BIGINT, BOOLEAN), "k", sqlMapOf(BIGINT, BOOLEAN, 16L, false))))
             .add(new TestColumn("t_map_null_key_complex_key_value",
                     getStandardMapObjectInspector(
                             getStandardListObjectInspector(javaStringObjectInspector),
                             getStandardMapObjectInspector(javaLongObjectInspector, javaBooleanObjectInspector)),
                     asMap(new ImmutableList[] {null, ImmutableList.of("k", "ka")}, new ImmutableMap[] {ImmutableMap.of(15L, true), ImmutableMap.of(16L, false)}),
-                    mapBlockOf(new ArrayType(createUnboundedVarcharType()), mapType(BIGINT, BOOLEAN), arrayBlockOf(createUnboundedVarcharType(), "k", "ka"), mapBlockOf(BIGINT, BOOLEAN, 16L, false))))
+                    sqlMapOf(new ArrayType(createUnboundedVarcharType()), mapType(BIGINT, BOOLEAN), arrayBlockOf(createUnboundedVarcharType(), "k", "ka"), sqlMapOf(BIGINT, BOOLEAN, 16L, false))))
             .add(new TestColumn("t_struct_nested", getStandardStructObjectInspector(ImmutableList.of("struct_field"),
                     ImmutableList.of(getStandardListObjectInspector(javaStringObjectInspector))), ImmutableList.of(ImmutableList.of("1", "2", "3")), rowBlockOf(ImmutableList.of(new ArrayType(createUnboundedVarcharType())), arrayBlockOf(createUnboundedVarcharType(), "1", "2", "3"))))
             .add(new TestColumn("t_struct_null", getStandardStructObjectInspector(ImmutableList.of("struct_field_null", "struct_field_null2"),
@@ -461,7 +453,7 @@ public abstract class AbstractTestHiveFileFormats
             .add(new TestColumn("t_map_null_value",
                     getStandardMapObjectInspector(javaStringObjectInspector, javaStringObjectInspector),
                     asMap(new String[] {"k1", "k2", "k3"}, new String[] {"v1", null, "v3"}),
-                    mapBlockOf(createUnboundedVarcharType(), createUnboundedVarcharType(), new String[] {"k1", "k2", "k3"}, new String[] {"v1", null, "v3"})))
+                    sqlMapOf(createUnboundedVarcharType(), createUnboundedVarcharType(), new String[] {"k1", "k2", "k3"}, new String[] {"v1", null, "v3"})))
             .add(new TestColumn("t_array_string_starting_with_nulls", getStandardListObjectInspector(javaStringObjectInspector), Arrays.asList(null, "test"), arrayBlockOf(createUnboundedVarcharType(), null, "test")))
             .add(new TestColumn("t_array_string_with_nulls_in_between", getStandardListObjectInspector(javaStringObjectInspector), Arrays.asList("test-1", null, "test-2"), arrayBlockOf(createUnboundedVarcharType(), "test-1", null, "test-2")))
             .add(new TestColumn("t_array_string_ending_with_nulls", getStandardListObjectInspector(javaStringObjectInspector), Arrays.asList("test", null), arrayBlockOf(createUnboundedVarcharType(), "test", null)))
@@ -562,9 +554,6 @@ public static FileSplit createTestFileTrino(
         }
         Page page = pageBuilder.build();
 
-        JobConf jobConf = new JobConf(newEmptyConfiguration());
-        configureCompression(jobConf, compressionCodec);
-
         Properties tableProperties = new Properties();
         tableProperties.setProperty(
                 "columns",
@@ -579,13 +568,13 @@ public static FileSplit createTestFileTrino(
                         .collect(Collectors.joining(",")));
 
         Optional<FileWriter> fileWriter = fileWriterFactory.createFileWriter(
-                new Path(filePath),
+                Location.of(filePath),
                 testColumns.stream()
                         .map(TestColumn::getName)
                         .collect(toList()),
                 StorageFormat.fromHiveStorageFormat(storageFormat),
+                compressionCodec,
                 tableProperties,
-                jobConf,
                 session,
                 OptionalInt.empty(),
                 NO_ACID_TRANSACTION,
@@ -731,59 +720,6 @@ public static Object getFieldFromCursor(RecordCursor cursor, Type type, int fiel
         throw new RuntimeException("unknown type");
     }
 
-    protected void checkCursor(RecordCursor cursor, List<TestColumn> testColumns, int rowCount)
-    {
-        List<Type> types = testColumns.stream()
-                .map(column -> column.getObjectInspector().getTypeName())
-                .map(type -> HiveType.valueOf(type).getType(TESTING_TYPE_MANAGER))
-                .collect(toImmutableList());
-
-        Map<Type, MethodHandle> distinctFromOperators = types.stream().distinct()
-                .collect(toImmutableMap(identity(), HiveTestUtils::distinctFromOperator));
-
-        for (int row = 0; row < rowCount; row++) {
-            assertTrue(cursor.advanceNextPosition());
-            for (int i = 0, testColumnsSize = testColumns.size(); i < testColumnsSize; i++) {
-                TestColumn testColumn = testColumns.get(i);
-
-                Type type = types.get(i);
-                Object fieldFromCursor = getFieldFromCursor(cursor, type, i);
-                if (fieldFromCursor == null) {
-                    assertEquals(null, testColumn.getExpectedValue(), "Expected null for column " + testColumn.getName());
-                }
-                else if (type instanceof DecimalType decimalType) {
-                    fieldFromCursor = new BigDecimal((BigInteger) fieldFromCursor, decimalType.getScale());
-                    assertEquals(fieldFromCursor, testColumn.getExpectedValue(), "Wrong value for column " + testColumn.getName());
-                }
-                else if (testColumn.getObjectInspector().getTypeName().equals("float")) {
-                    assertEquals((float) fieldFromCursor, (float) testColumn.getExpectedValue(), (float) EPSILON);
-                }
-                else if (testColumn.getObjectInspector().getTypeName().equals("double")) {
-                    assertEquals((double) fieldFromCursor, (double) testColumn.getExpectedValue(), EPSILON);
-                }
-                else if (testColumn.getObjectInspector().getTypeName().equals("tinyint")) {
-                    assertEquals(((Number) fieldFromCursor).byteValue(), testColumn.getExpectedValue());
-                }
-                else if (testColumn.getObjectInspector().getTypeName().equals("smallint")) {
-                    assertEquals(((Number) fieldFromCursor).shortValue(), testColumn.getExpectedValue());
-                }
-                else if (testColumn.getObjectInspector().getTypeName().equals("int")) {
-                    assertEquals(((Number) fieldFromCursor).intValue(), testColumn.getExpectedValue());
-                }
-                else if (testColumn.getObjectInspector().getCategory() == Category.PRIMITIVE) {
-                    assertEquals(fieldFromCursor, testColumn.getExpectedValue(), "Wrong value for column " + testColumn.getName());
-                }
-                else {
-                    Block expected = (Block) testColumn.getExpectedValue();
-                    Block actual = (Block) fieldFromCursor;
-                    boolean distinct = isDistinctFrom(distinctFromOperators.get(type), expected, actual);
-                    assertFalse(distinct, "Wrong value for column: " + testColumn.getName());
-                }
-            }
-        }
-        assertFalse(cursor.advanceNextPosition());
-    }
-
     protected void checkPageSource(ConnectorPageSource pageSource, List<TestColumn> testColumns, List<Type> types, int rowCount)
             throws IOException
     {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileSystem.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileSystem.java
index e574f7da8d22..64893b857cfb 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileSystem.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveFileSystem.java
@@ -16,18 +16,21 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
+import com.google.common.collect.Streams;
 import com.google.common.net.HostAndPort;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.json.JsonCodec;
 import io.airlift.slice.Slice;
 import io.airlift.stats.CounterStat;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.hdfs.HdfsConfig;
 import io.trino.hdfs.HdfsConfiguration;
 import io.trino.hdfs.HdfsContext;
 import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.HdfsNamenodeStats;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
 import io.trino.hdfs.authentication.NoHdfsAuthentication;
 import io.trino.operator.GroupByHashPageIndexerFactory;
 import io.trino.plugin.base.CatalogName;
@@ -35,6 +38,7 @@
 import io.trino.plugin.hive.aws.athena.PartitionProjectionService;
 import io.trino.plugin.hive.fs.FileSystemDirectoryLister;
 import io.trino.plugin.hive.fs.HiveFileIterator;
+import io.trino.plugin.hive.fs.TransactionScopeCachingDirectoryListerFactory;
 import io.trino.plugin.hive.fs.TrinoFileStatus;
 import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.Database;
@@ -49,6 +53,7 @@
 import io.trino.plugin.hive.security.SqlStandardAccessControlMetadata;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
 import io.trino.spi.connector.ConnectorPageSink;
@@ -71,13 +76,13 @@
 import io.trino.sql.gen.JoinCompiler;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.TestingNodeManager;
-import io.trino.type.BlockTypeOperators;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.azurebfs.AzureBlobFileSystem;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -87,6 +92,7 @@
 import java.io.UncheckedIOException;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
@@ -102,13 +108,16 @@
 import static io.trino.plugin.hive.AbstractTestHive.filterNonHiddenColumnMetadata;
 import static io.trino.plugin.hive.AbstractTestHive.getAllSplits;
 import static io.trino.plugin.hive.AbstractTestHive.getSplits;
+import static io.trino.plugin.hive.HiveTableProperties.EXTERNAL_LOCATION_PROPERTY;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.plugin.hive.HiveTestUtils.PAGE_SORTER;
+import static io.trino.plugin.hive.HiveTestUtils.SESSION;
 import static io.trino.plugin.hive.HiveTestUtils.getDefaultHiveFileWriterFactories;
 import static io.trino.plugin.hive.HiveTestUtils.getDefaultHivePageSourceFactories;
-import static io.trino.plugin.hive.HiveTestUtils.getDefaultHiveRecordCursorProviders;
 import static io.trino.plugin.hive.HiveTestUtils.getHiveSessionProperties;
 import static io.trino.plugin.hive.HiveTestUtils.getTypes;
 import static io.trino.plugin.hive.HiveType.HIVE_LONG;
+import static io.trino.plugin.hive.HiveType.HIVE_STRING;
 import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
 import static io.trino.plugin.hive.metastore.PrincipalPrivileges.NO_PRIVILEGES;
 import static io.trino.spi.connector.MetadataProvider.NOOP_METADATA_PROVIDER;
@@ -116,6 +125,7 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.testing.MaterializedResult.materializeSourceDataStream;
 import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingPageSinkId.TESTING_PAGE_SINK_ID;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -123,10 +133,13 @@
 import static java.util.UUID.randomUUID;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public abstract class AbstractTestHiveFileSystem
 {
     protected static final HdfsContext TESTING_CONTEXT = new HdfsContext(ConnectorIdentity.ofUser("test"));
@@ -136,6 +149,7 @@ public abstract class AbstractTestHiveFileSystem
     protected SchemaTableName tableWithHeader;
     protected SchemaTableName tableWithHeaderAndFooter;
     protected SchemaTableName temporaryCreateTable;
+    protected SchemaTableName temporaryCreateTableWithExternalLocation;
 
     protected HdfsEnvironment hdfsEnvironment;
     protected LocationService locationService;
@@ -150,14 +164,14 @@ public abstract class AbstractTestHiveFileSystem
     private HiveConfig config;
     private ScheduledExecutorService heartbeatService;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         executor = newCachedThreadPool(daemonThreadsNamed("hive-%s"));
         heartbeatService = newScheduledThreadPool(1);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (executor != null) {
@@ -174,7 +188,7 @@ public void tearDown()
 
     protected void onSetupComplete() {}
 
-    protected void setup(String host, int port, String databaseName, boolean s3SelectPushdownEnabled, HdfsConfiguration hdfsConfiguration)
+    protected void setup(String host, int port, String databaseName, HdfsConfiguration hdfsConfiguration)
     {
         database = databaseName;
         table = new SchemaTableName(database, "trino_test_external_fs");
@@ -183,8 +197,10 @@ protected void setup(String host, int port, String databaseName, boolean s3Selec
 
         String random = randomUUID().toString().toLowerCase(ENGLISH).replace("-", "");
         temporaryCreateTable = new SchemaTableName(database, "tmp_trino_test_create_" + random);
+        temporaryCreateTableWithExternalLocation = new SchemaTableName(database, "tmp_trino_test_create_external" + random);
 
-        config = new HiveConfig().setS3SelectPushdownEnabled(s3SelectPushdownEnabled);
+        config = new HiveConfig()
+                .setWritesToNonManagedTablesEnabled(true);
 
         HivePartitionManager hivePartitionManager = new HivePartitionManager(config);
 
@@ -198,14 +214,15 @@ protected void setup(String host, int port, String databaseName, boolean s3Selec
                                 .build()),
                 getBasePath(),
                 hdfsEnvironment);
-        locationService = new HiveLocationService(hdfsEnvironment);
+        locationService = new HiveLocationService(hdfsEnvironment, config);
         JsonCodec<PartitionUpdate> partitionUpdateCodec = JsonCodec.jsonCodec(PartitionUpdate.class);
         metadataFactory = new HiveMetadataFactory(
                 new CatalogName("hive"),
                 config,
                 new HiveMetastoreConfig(),
                 HiveMetastoreFactory.ofInstance(metastoreClient),
-                new HdfsFileSystemFactory(hdfsEnvironment),
+                getDefaultHiveFileWriterFactories(config, hdfsEnvironment),
+                new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS),
                 hdfsEnvironment,
                 hivePartitionManager,
                 newDirectExecutorService(),
@@ -222,15 +239,15 @@ protected void setup(String host, int port, String databaseName, boolean s3Selec
                 new DefaultHiveMaterializedViewMetadataFactory(),
                 SqlStandardAccessControlMetadata::new,
                 new FileSystemDirectoryLister(),
+                new TransactionScopeCachingDirectoryListerFactory(config),
                 new PartitionProjectionService(config, ImmutableMap.of(), new TestingTypeManager()),
                 true);
         transactionManager = new HiveTransactionManager(metadataFactory);
         splitManager = new HiveSplitManager(
                 transactionManager,
                 hivePartitionManager,
-                new HdfsFileSystemFactory(hdfsEnvironment),
-                new NamenodeStats(),
-                hdfsEnvironment,
+                new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS),
+                new HdfsNamenodeStats(),
                 new BoundedExecutor(executor, config.getMaxSplitIteratorThreads()),
                 new CounterStat(),
                 config.getMaxOutstandingSplits(),
@@ -243,15 +260,12 @@ protected void setup(String host, int port, String databaseName, boolean s3Selec
                 config.getRecursiveDirWalkerEnabled(),
                 TESTING_TYPE_MANAGER,
                 config.getMaxPartitionsPerScan());
-        TypeOperators typeOperators = new TypeOperators();
-        BlockTypeOperators blockTypeOperators = new BlockTypeOperators(typeOperators);
         pageSinkProvider = new HivePageSinkProvider(
                 getDefaultHiveFileWriterFactories(config, hdfsEnvironment),
-                new HdfsFileSystemFactory(hdfsEnvironment),
-                hdfsEnvironment,
+                new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS),
                 PAGE_SORTER,
                 HiveMetastoreFactory.ofInstance(metastoreClient),
-                new GroupByHashPageIndexerFactory(new JoinCompiler(typeOperators), blockTypeOperators),
+                new GroupByHashPageIndexerFactory(new JoinCompiler(new TypeOperators())),
                 TESTING_TYPE_MANAGER,
                 config,
                 new SortingFileWriterConfig(),
@@ -263,11 +277,8 @@ protected void setup(String host, int port, String databaseName, boolean s3Selec
                 new HiveWriterStats());
         pageSourceProvider = new HivePageSourceProvider(
                 TESTING_TYPE_MANAGER,
-                hdfsEnvironment,
                 config,
-                getDefaultHivePageSourceFactories(hdfsEnvironment, config),
-                getDefaultHiveRecordCursorProviders(config, hdfsEnvironment),
-                new GenericHiveRecordCursorProvider(hdfsEnvironment, config));
+                getDefaultHivePageSourceFactories(hdfsEnvironment, config));
 
         onSetupComplete();
     }
@@ -288,12 +299,6 @@ protected MaterializedResult readTable(SchemaTableName tableName)
         return HiveFileSystemTestUtils.readTable(tableName, transactionManager, config, pageSourceProvider, splitManager);
     }
 
-    protected MaterializedResult filterTable(SchemaTableName tableName, List<ColumnHandle> projectedColumns)
-            throws IOException
-    {
-        return HiveFileSystemTestUtils.filterTable(tableName, projectedColumns, transactionManager, config, pageSourceProvider, splitManager);
-    }
-
     @Test
     public void testGetRecords()
             throws Exception
@@ -445,6 +450,7 @@ public void testFileIteratorListing()
         //      base-path-file.txt
         Path basePath = new Path(getBasePath(), "test-file-iterator-listing");
         FileSystem fs = hdfsEnvironment.getFileSystem(TESTING_CONTEXT, basePath);
+        TrinoFileSystem trinoFileSystem = new HdfsFileSystemFactory(hdfsEnvironment, new TrinoHdfsFileSystemStats()).create(SESSION);
         fs.mkdirs(basePath);
 
         // create file in hidden folder
@@ -469,30 +475,158 @@ public void testFileIteratorListing()
         // List recursively through hive file iterator
         HiveFileIterator recursiveIterator = new HiveFileIterator(
                 fakeTable,
-                basePath,
-                fs,
+                Location.of(basePath.toString()),
+                trinoFileSystem,
                 new FileSystemDirectoryLister(),
-                new NamenodeStats(),
-                HiveFileIterator.NestedDirectoryPolicy.RECURSE,
-                false); // ignoreAbsentPartitions
+                new HdfsNamenodeStats(),
+                HiveFileIterator.NestedDirectoryPolicy.RECURSE);
 
-        List<Path> recursiveListing = Lists.newArrayList(Iterators.transform(recursiveIterator, TrinoFileStatus::getPath));
+        List<Path> recursiveListing = Streams.stream(recursiveIterator)
+                .map(TrinoFileStatus::getPath)
+                .map(Path::new)
+                .toList();
         // Should not include directories, or files underneath hidden directories
         assertEqualsIgnoreOrder(recursiveListing, ImmutableList.of(nestedFile, baseFile));
 
         HiveFileIterator shallowIterator = new HiveFileIterator(
                 fakeTable,
-                basePath,
-                fs,
+                Location.of(basePath.toString()),
+                trinoFileSystem,
                 new FileSystemDirectoryLister(),
-                new NamenodeStats(),
-                HiveFileIterator.NestedDirectoryPolicy.IGNORED,
-                false); // ignoreAbsentPartitions
-        List<Path> shallowListing = Lists.newArrayList(Iterators.transform(shallowIterator, TrinoFileStatus::getPath));
+                new HdfsNamenodeStats(),
+                HiveFileIterator.NestedDirectoryPolicy.IGNORED);
+        List<Path> shallowListing = Streams.stream(shallowIterator)
+                .map(TrinoFileStatus::getPath)
+                .map(Path::new)
+                .toList();
         // Should not include any hidden files, folders, or nested files
         assertEqualsIgnoreOrder(shallowListing, ImmutableList.of(baseFile));
     }
 
+    @Test
+    public void testFileIteratorPartitionedListing()
+            throws Exception
+    {
+        Table.Builder tableBuilder = Table.builder()
+                .setDatabaseName(table.getSchemaName())
+                .setTableName(table.getTableName())
+                .setDataColumns(ImmutableList.of(new Column("data", HIVE_LONG, Optional.empty())))
+                .setPartitionColumns(ImmutableList.of(new Column("part", HIVE_STRING, Optional.empty())))
+                .setOwner(Optional.empty())
+                .setTableType("fake");
+        tableBuilder.getStorageBuilder()
+                .setStorageFormat(StorageFormat.fromHiveStorageFormat(HiveStorageFormat.CSV));
+        Table fakeTable = tableBuilder.build();
+
+        // Expected file system tree:
+        // test-file-iterator-partitioned-listing/
+        //      .hidden/
+        //          nested-file-in-hidden.txt
+        //      part=simple/
+        //          _hidden-file.txt
+        //          plain-file.txt
+        //      part=nested/
+        //          parent/
+        //             _nested-hidden-file.txt
+        //             nested-file.txt
+        //      part=plus+sign/
+        //          plus-file.txt
+        //      part=percent%sign/
+        //          percent-file.txt
+        //      part=url%20encoded/
+        //          url-encoded-file.txt
+        //      part=level1|level2/
+        //          pipe-file.txt
+        //          parent1/
+        //             parent2/
+        //                deeply-nested-file.txt
+        //      part=level1 | level2/
+        //          pipe-blanks-file.txt
+        //      empty-directory/
+        //      .hidden-in-base.txt
+        Path basePath = new Path(getBasePath(), "test-file-iterator-partitioned-listing");
+        FileSystem fs = hdfsEnvironment.getFileSystem(TESTING_CONTEXT, basePath);
+        TrinoFileSystem trinoFileSystem = new HdfsFileSystemFactory(hdfsEnvironment, new TrinoHdfsFileSystemStats()).create(SESSION);
+        fs.mkdirs(basePath);
+
+        // create file in hidden folder
+        Path fileInHiddenParent = new Path(new Path(basePath, ".hidden"), "nested-file-in-hidden.txt");
+        fs.createNewFile(fileInHiddenParent);
+        // create hidden file in non-hidden folder
+        Path hiddenFileUnderPartitionSimple = new Path(new Path(basePath, "part=simple"), "_hidden-file.txt");
+        fs.createNewFile(hiddenFileUnderPartitionSimple);
+        // create file in `part=simple` non-hidden folder
+        Path plainFilePartitionSimple = new Path(new Path(basePath, "part=simple"), "plain-file.txt");
+        fs.createNewFile(plainFilePartitionSimple);
+        Path nestedFilePartitionNested = new Path(new Path(new Path(basePath, "part=nested"), "parent"), "nested-file.txt");
+        fs.createNewFile(nestedFilePartitionNested);
+        // create hidden file in non-hidden folder
+        Path nestedHiddenFilePartitionNested = new Path(new Path(new Path(basePath, "part=nested"), "parent"), "_nested-hidden-file.txt");
+        fs.createNewFile(nestedHiddenFilePartitionNested);
+        // create file in `part=plus+sign` non-hidden folder (which contains `+` special character)
+        Path plainFilePartitionPlusSign = new Path(new Path(basePath, "part=plus+sign"), "plus-file.txt");
+        fs.createNewFile(plainFilePartitionPlusSign);
+        // create file in `part=percent%sign` non-hidden folder (which contains `%` special character)
+        Path plainFilePartitionPercentSign = new Path(new Path(basePath, "part=percent%sign"), "percent-file.txt");
+        fs.createNewFile(plainFilePartitionPercentSign);
+        // create file in `part=url%20encoded` non-hidden folder (which contains `%` special character)
+        Path plainFilePartitionUrlEncoded = new Path(new Path(basePath, "part=url%20encoded"), "url-encoded-file.txt");
+        fs.createNewFile(plainFilePartitionUrlEncoded);
+        // create file in `part=level1|level2` non-hidden folder (which contains `|` special character)
+        Path plainFilePartitionPipeSign = new Path(new Path(basePath, "part=level1|level2"), "pipe-file.txt");
+        fs.createNewFile(plainFilePartitionPipeSign);
+        Path deeplyNestedFilePartitionPipeSign = new Path(new Path(new Path(new Path(basePath, "part=level1|level2"), "parent1"), "parent2"), "deeply-nested-file.txt");
+        fs.createNewFile(deeplyNestedFilePartitionPipeSign);
+        // create file in `part=level1 | level2` non-hidden folder (which contains `|` and blank space special characters)
+        Path plainFilePartitionPipeSignBlanks = new Path(new Path(basePath, "part=level1 | level2"), "pipe-blanks-file.txt");
+        fs.createNewFile(plainFilePartitionPipeSignBlanks);
+
+        // create empty subdirectory
+        Path emptyDirectory = new Path(basePath, "empty-directory");
+        fs.mkdirs(emptyDirectory);
+        // create hidden file in base path
+        Path hiddenBase = new Path(basePath, ".hidden-in-base.txt");
+        fs.createNewFile(hiddenBase);
+
+        // List recursively through hive file iterator
+        HiveFileIterator recursiveIterator = new HiveFileIterator(
+                fakeTable,
+                Location.of(basePath.toString()),
+                trinoFileSystem,
+                new FileSystemDirectoryLister(),
+                new HdfsNamenodeStats(),
+                HiveFileIterator.NestedDirectoryPolicy.RECURSE);
+
+        List<Path> recursiveListing = Streams.stream(recursiveIterator)
+                .map(TrinoFileStatus::getPath)
+                .map(Path::new)
+                .toList();
+        // Should not include directories, or files underneath hidden directories
+        assertThat(recursiveListing).containsExactlyInAnyOrder(
+                plainFilePartitionSimple,
+                nestedFilePartitionNested,
+                plainFilePartitionPlusSign,
+                plainFilePartitionPercentSign,
+                plainFilePartitionUrlEncoded,
+                plainFilePartitionPipeSign,
+                deeplyNestedFilePartitionPipeSign,
+                plainFilePartitionPipeSignBlanks);
+
+        HiveFileIterator shallowIterator = new HiveFileIterator(
+                fakeTable,
+                Location.of(basePath.toString()),
+                trinoFileSystem,
+                new FileSystemDirectoryLister(),
+                new HdfsNamenodeStats(),
+                HiveFileIterator.NestedDirectoryPolicy.IGNORED);
+        List<Path> shallowListing = Streams.stream(shallowIterator)
+                .map(TrinoFileStatus::getPath)
+                .map(Path::new)
+                .toList();
+        // Should not include any hidden files, folders, or nested files
+        assertThat(shallowListing).isEmpty();
+    }
+
     @Test
     public void testDirectoryWithTrailingSpace()
             throws Exception
@@ -533,6 +667,24 @@ public void testTableCreation()
         }
     }
 
+    @Test
+    public void testTableCreationExternalLocation()
+            throws Exception
+    {
+        for (HiveStorageFormat storageFormat : HiveStorageFormat.values()) {
+            if (storageFormat == HiveStorageFormat.CSV) {
+                // CSV supports only unbounded VARCHAR type
+                continue;
+            }
+            if (storageFormat == HiveStorageFormat.REGEX) {
+                // REGEX format is read-only
+                continue;
+            }
+            createExternalTableOnNonExistingPath(temporaryCreateTableWithExternalLocation, storageFormat);
+            dropTable(temporaryCreateTableWithExternalLocation);
+        }
+    }
+
     private void createTable(SchemaTableName tableName, HiveStorageFormat storageFormat)
             throws Exception
     {
@@ -567,10 +719,85 @@ private void createTable(SchemaTableName tableName, HiveStorageFormat storageFor
             // table, which fails without explicit configuration for file system.
             // We work around that by using a dummy location when creating the
             // table and update it here to the correct location.
-            metastoreClient.updateTableLocation(
-                    database,
-                    tableName.getTableName(),
-                    locationService.getTableWriteInfo(((HiveOutputTableHandle) outputHandle).getLocationHandle(), false).getTargetPath().toString());
+            Location location = locationService.getTableWriteInfo(((HiveOutputTableHandle) outputHandle).getLocationHandle(), false).targetPath();
+            metastoreClient.updateTableLocation(database, tableName.getTableName(), location.toString());
+        }
+
+        try (Transaction transaction = newTransaction()) {
+            ConnectorMetadata metadata = transaction.getMetadata();
+            ConnectorSession session = newSession();
+
+            // load the new table
+            ConnectorTableHandle tableHandle = getTableHandle(metadata, tableName);
+            List<ColumnHandle> columnHandles = filterNonHiddenColumnHandles(metadata.getColumnHandles(session, tableHandle).values());
+
+            // verify the metadata
+            ConnectorTableMetadata tableMetadata = metadata.getTableMetadata(session, getTableHandle(metadata, tableName));
+            assertEquals(filterNonHiddenColumnMetadata(tableMetadata.getColumns()), columns);
+
+            // verify the data
+            metadata.beginQuery(session);
+            ConnectorSplitSource splitSource = getSplits(splitManager, transaction, session, tableHandle);
+            ConnectorSplit split = getOnlyElement(getAllSplits(splitSource));
+
+            try (ConnectorPageSource pageSource = pageSourceProvider.createPageSource(transaction.getTransactionHandle(), session, split, tableHandle, columnHandles, DynamicFilter.EMPTY)) {
+                MaterializedResult result = materializeSourceDataStream(session, pageSource, getTypes(columnHandles));
+                assertEqualsIgnoreOrder(result.getMaterializedRows(), data.getMaterializedRows());
+            }
+
+            metadata.cleanupQuery(session);
+        }
+    }
+
+    private void createExternalTableOnNonExistingPath(SchemaTableName tableName, HiveStorageFormat storageFormat)
+            throws Exception
+    {
+        List<ColumnMetadata> columns = ImmutableList.of(new ColumnMetadata("id", BIGINT));
+        String externalLocation = getBasePath() + "/external_" + randomNameSuffix();
+
+        MaterializedResult data = MaterializedResult.resultBuilder(newSession(), BIGINT)
+                .row(1L)
+                .row(3L)
+                .row(2L)
+                .build();
+
+        try (Transaction transaction = newTransaction()) {
+            ConnectorMetadata metadata = transaction.getMetadata();
+            ConnectorSession session = newSession();
+
+            Map<String, Object> tableProperties = ImmutableMap.<String, Object>builder()
+                    .putAll(createTableProperties(storageFormat))
+                    .put(EXTERNAL_LOCATION_PROPERTY, externalLocation)
+                    .buildOrThrow();
+
+            // begin creating the table
+            ConnectorTableMetadata tableMetadata = new ConnectorTableMetadata(tableName, columns, tableProperties);
+            metadata.createTable(session, tableMetadata, true);
+
+            transaction.commit();
+
+            // Hack to work around the metastore not being configured for S3 or other FS.
+            // The metastore tries to validate the location when creating the
+            // table, which fails without explicit configuration for file system.
+            // We work around that by using a dummy location when creating the
+            // table and update it here to the correct location.
+            Location location = locationService.getTableWriteInfo(new LocationHandle(externalLocation, externalLocation, LocationHandle.WriteMode.DIRECT_TO_TARGET_NEW_DIRECTORY), false).targetPath();
+            metastoreClient.updateTableLocation(database, tableName.getTableName(), location.toString());
+        }
+
+        try (Transaction transaction = newTransaction()) {
+            ConnectorMetadata metadata = transaction.getMetadata();
+            ConnectorSession session = newSession();
+
+            ConnectorTableHandle connectorTableHandle = getTableHandle(metadata, tableName);
+            ConnectorInsertTableHandle outputHandle = metadata.beginInsert(session, connectorTableHandle, ImmutableList.of(), NO_RETRIES);
+
+            ConnectorPageSink sink = pageSinkProvider.createPageSink(transaction.getTransactionHandle(), session, outputHandle, TESTING_PAGE_SINK_ID);
+            sink.appendPage(data.toPage());
+            Collection<Slice> fragments = getFutureValue(sink.finish());
+
+            metadata.finishInsert(session, outputHandle, fragments, ImmutableList.of());
+            transaction.commit();
         }
 
         try (Transaction transaction = newTransaction()) {
@@ -584,6 +811,7 @@ private void createTable(SchemaTableName tableName, HiveStorageFormat storageFor
             // verify the metadata
             ConnectorTableMetadata tableMetadata = metadata.getTableMetadata(session, getTableHandle(metadata, tableName));
             assertEquals(filterNonHiddenColumnMetadata(tableMetadata.getColumns()), columns);
+            assertEquals(tableMetadata.getProperties().get("external_location"), externalLocation);
 
             // verify the data
             metadata.beginQuery(session);
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveLocal.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveLocal.java
index 5e067194d17b..8576ef774ee4 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveLocal.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveLocal.java
@@ -18,6 +18,7 @@
 import com.google.common.io.RecursiveDeleteOption;
 import com.google.common.reflect.ClassPath;
 import io.airlift.log.Logger;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.HiveMetastore;
@@ -33,20 +34,20 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.PrincipalType;
 import io.trino.testing.MaterializedResult;
-import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.metastore.TableType;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
-import java.net.URI;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
 
@@ -54,16 +55,24 @@
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME;
 import static io.trino.plugin.hive.HiveMetadata.PRESTO_VERSION_NAME;
+import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
 import static io.trino.plugin.hive.HiveStorageFormat.ORC;
+import static io.trino.plugin.hive.HiveStorageFormat.TEXTFILE;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
 import static io.trino.plugin.hive.HiveType.HIVE_INT;
 import static io.trino.plugin.hive.HiveType.HIVE_STRING;
+import static io.trino.plugin.hive.TableType.MANAGED_TABLE;
+import static io.trino.plugin.hive.metastore.PrincipalPrivileges.NO_PRIVILEGES;
+import static io.trino.plugin.hive.metastore.StorageFormat.fromHiveStorageFormat;
 import static io.trino.plugin.hive.util.HiveBucketing.BucketingVersion.BUCKETING_V1;
 import static io.trino.plugin.hive.util.HiveUtil.SPARK_TABLE_PROVIDER_KEY;
 import static java.nio.file.Files.copy;
 import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.Assumptions.abort;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public abstract class AbstractTestHiveLocal
         extends AbstractTestHive
 {
@@ -85,7 +94,7 @@ protected AbstractTestHiveLocal(String testDbName)
 
     protected abstract HiveMetastore createMetastore(File tempDir);
 
-    @BeforeClass(alwaysRun = true)
+    @BeforeAll
     public void initialize()
             throws Exception
     {
@@ -105,14 +114,73 @@ public void initialize()
                 .setRcfileTimeZone("America/Los_Angeles");
 
         setup(testDbName, hiveConfig, metastore, HDFS_ENVIRONMENT);
+
+        createTestTables();
+    }
+
+    protected void createTestTables()
+            throws Exception
+    {
+        Location location = Location.of((metastoreClient.getDatabase(database).orElseThrow()
+                .getLocation().orElseThrow()));
+
+        createTestTable(
+                // Matches create-test.sql » trino_test_partition_format
+                Table.builder()
+                        .setDatabaseName(database)
+                        .setTableName(tablePartitionFormat.getTableName())
+                        .setTableType(MANAGED_TABLE.name())
+                        .setOwner(Optional.empty())
+                        .setDataColumns(List.of(
+                                new Column("t_string", HiveType.HIVE_STRING, Optional.empty(), Map.of()),
+                                new Column("t_tinyint", HiveType.HIVE_BYTE, Optional.empty(), Map.of()),
+                                new Column("t_smallint", HiveType.HIVE_SHORT, Optional.empty(), Map.of()),
+                                new Column("t_int", HiveType.HIVE_INT, Optional.empty(), Map.of()),
+                                new Column("t_bigint", HiveType.HIVE_LONG, Optional.empty(), Map.of()),
+                                new Column("t_float", HiveType.HIVE_FLOAT, Optional.empty(), Map.of()),
+                                new Column("t_boolean", HiveType.HIVE_BOOLEAN, Optional.empty(), Map.of())))
+                        .setPartitionColumns(List.of(
+                                new Column("ds", HiveType.HIVE_STRING, Optional.empty(), Map.of()),
+                                new Column("file_format", HiveType.HIVE_STRING, Optional.empty(), Map.of()),
+                                new Column("dummy", HiveType.HIVE_INT, Optional.empty(), Map.of())))
+                        .setParameter(TABLE_COMMENT, "Presto test data")
+                        .withStorage(storage -> storage
+                                .setStorageFormat(fromHiveStorageFormat(new HiveConfig().getHiveStorageFormat()))
+                                .setLocation(Optional.of(location.appendPath(tablePartitionFormat.getTableName()).toString())))
+                        .build());
+
+        createTestTable(
+                // Matches create-test.sql » trino_test_partition_format
+                Table.builder()
+                        .setDatabaseName(database)
+                        .setTableName(tableUnpartitioned.getTableName())
+                        .setTableType(MANAGED_TABLE.name())
+                        .setOwner(Optional.empty())
+                        .setDataColumns(List.of(
+                                new Column("t_string", HiveType.HIVE_STRING, Optional.empty(), Map.of()),
+                                new Column("t_tinyint", HiveType.HIVE_BYTE, Optional.empty(), Map.of())))
+                        .setParameter(TABLE_COMMENT, "Presto test data")
+                        .withStorage(storage -> storage
+                                .setStorageFormat(fromHiveStorageFormat(TEXTFILE))
+                                .setLocation(Optional.of(location.appendPath(tableUnpartitioned.getTableName()).toString())))
+                        .build());
+    }
+
+    protected void createTestTable(Table table)
+            throws Exception
+    {
+        metastoreClient.createTable(table, NO_PRIVILEGES);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
             throws IOException
     {
         try {
-            getMetastoreClient().dropDatabase(testDbName, true);
+            for (String tableName : metastoreClient.getAllTables(database)) {
+                metastoreClient.dropTable(database, tableName, true);
+            }
+            metastoreClient.dropDatabase(testDbName, true);
         }
         finally {
             deleteRecursively(tempDir.toPath(), ALLOW_INSECURE);
@@ -125,37 +193,35 @@ protected ConnectorTableHandle getTableHandle(ConnectorMetadata metadata, Schema
         if (tableName.getTableName().startsWith(TEMPORARY_TABLE_PREFIX)) {
             return super.getTableHandle(metadata, tableName);
         }
-        throw new SkipException("tests using existing tables are not supported");
-    }
-
-    @Override
-    public void testGetAllTableNames()
-    {
-        throw new SkipException("Test disabled for this subclass");
+        return abort("tests using existing tables are not supported");
     }
 
+    @Test
     @Override
     public void testGetAllTableColumns()
     {
-        throw new SkipException("Test disabled for this subclass");
+        abort("Test disabled for this subclass");
     }
 
+    @Test
     @Override
     public void testGetAllTableColumnsInSchema()
     {
-        throw new SkipException("Test disabled for this subclass");
+        abort("Test disabled for this subclass");
     }
 
+    @Test
     @Override
     public void testGetTableNames()
     {
-        throw new SkipException("Test disabled for this subclass");
+        abort("Test disabled for this subclass");
     }
 
+    @Test
     @Override
     public void testGetTableSchemaOffline()
     {
-        throw new SkipException("Test disabled for this subclass");
+        abort("Test disabled for this subclass");
     }
 
     @Test
@@ -174,7 +240,7 @@ public void testSparkBucketedTableValidation()
     private void doTestSparkBucketedTableValidation(SchemaTableName tableName)
             throws Exception
     {
-        java.nio.file.Path externalLocation = copyResourceDirToTemporaryDirectory("spark_bucketed_nation");
+        Path externalLocation = copyResourceDirToTemporaryDirectory("spark_bucketed_nation");
         try {
             createExternalTable(
                     tableName,
@@ -190,7 +256,7 @@ private void doTestSparkBucketedTableValidation(SchemaTableName tableName)
                             BUCKETING_V1,
                             3,
                             ImmutableList.of(new SortingColumn("name", SortingColumn.Order.ASCENDING)))),
-                    new Path(URI.create("file://" + externalLocation.toString())));
+                    Location.of(externalLocation.toUri().toString()));
 
             assertReadFailsWithMessageMatching(ORC, tableName, "Hive table is corrupt\\. File '.*/.*' is for bucket [0-2], but contains a row for bucket [0-2].");
             markTableAsCreatedBySpark(tableName, "orc");
@@ -227,7 +293,7 @@ private void markTableAsCreatedBySpark(SchemaTableName tableName, String provide
         }
     }
 
-    private void createExternalTable(SchemaTableName schemaTableName, HiveStorageFormat hiveStorageFormat, List<Column> columns, List<Column> partitionColumns, Optional<HiveBucketProperty> bucketProperty, Path externalLocation)
+    private void createExternalTable(SchemaTableName schemaTableName, HiveStorageFormat hiveStorageFormat, List<Column> columns, List<Column> partitionColumns, Optional<HiveBucketProperty> bucketProperty, Location externalLocation)
     {
         try (Transaction transaction = newTransaction()) {
             ConnectorSession session = newSession();
@@ -254,23 +320,23 @@ private void createExternalTable(SchemaTableName schemaTableName, HiveStorageFor
                     .setSerdeParameters(ImmutableMap.of());
 
             PrincipalPrivileges principalPrivileges = testingPrincipalPrivilege(tableOwner, session.getUser());
-            transaction.getMetastore().createTable(session, tableBuilder.build(), principalPrivileges, Optional.of(externalLocation), Optional.empty(), true, EMPTY_TABLE_STATISTICS, false);
+            transaction.getMetastore().createTable(session, tableBuilder.build(), principalPrivileges, Optional.of(externalLocation), Optional.empty(), true, ZERO_TABLE_STATISTICS, false);
 
             transaction.commit();
         }
     }
 
-    private java.nio.file.Path copyResourceDirToTemporaryDirectory(String resourceName)
+    private Path copyResourceDirToTemporaryDirectory(String resourceName)
             throws IOException
     {
-        java.nio.file.Path tempDir = java.nio.file.Files.createTempDirectory(getClass().getSimpleName()).normalize();
+        Path tempDir = java.nio.file.Files.createTempDirectory(getClass().getSimpleName()).normalize();
         log.info("Copying resource dir '%s' to %s", resourceName, tempDir);
         ClassPath.from(getClass().getClassLoader())
                 .getResources().stream()
                 .filter(resourceInfo -> resourceInfo.getResourceName().startsWith(resourceName))
                 .forEach(resourceInfo -> {
                     try {
-                        java.nio.file.Path target = tempDir.resolve(resourceInfo.getResourceName());
+                        Path target = tempDir.resolve(resourceInfo.getResourceName());
                         java.nio.file.Files.createDirectories(target.getParent());
                         try (InputStream inputStream = resourceInfo.asByteSource().openStream()) {
                             copy(inputStream, target);
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveRoles.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveRoles.java
index 0c850856b80b..c19e3b7fe5d6 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveRoles.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHiveRoles.java
@@ -22,8 +22,8 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.util.List;
 import java.util.Optional;
@@ -36,9 +36,10 @@
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.testing.QueryAssertions.assertContains;
 import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true)
+@Execution(SAME_THREAD)
 abstract class AbstractTestHiveRoles
         extends AbstractTestQueryFramework
 {
@@ -58,8 +59,7 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
-    @AfterMethod(alwaysRun = true)
-    public void afterMethod()
+    private void cleanup()
     {
         for (String role : listRoles()) {
             executeFromAdmin(dropRoleSql(role));
@@ -72,6 +72,7 @@ public void testCreateRole()
         executeFromAdmin(createRoleSql("role1"));
         assertEquals(listRoles(), ImmutableSet.of("role1", "admin"));
         assertEquals(listRoles(), ImmutableSet.of("role1", "admin"));
+        cleanup();
     }
 
     @Test
@@ -79,12 +80,14 @@ public void testCreateDuplicateRole()
     {
         executeFromAdmin(createRoleSql("duplicate_role"));
         assertQueryFails(createAdminSession(), createRoleSql("duplicate_role"), ".*?Role 'duplicate_role' already exists");
+        cleanup();
     }
 
     @Test
     public void testCreateRoleWithAdminOption()
     {
         assertQueryFails(createAdminSession(), "CREATE ROLE role1 WITH ADMIN admin" + optionalCatalogDeclaration(), ".*?Hive Connector does not support WITH ADMIN statement");
+        cleanup();
     }
 
     @Test
@@ -94,12 +97,14 @@ public void testCreateReservedRole()
         assertQueryFails(createAdminSession(), createRoleSql("default"), "Role name cannot be one of the reserved roles: \\[all, default, none\\]");
         assertQueryFails(createAdminSession(), createRoleSql("none"), "Role name cannot be one of the reserved roles: \\[all, default, none\\]");
         assertQueryFails(createAdminSession(), createRoleSql("None"), "Role name cannot be one of the reserved roles: \\[all, default, none\\]");
+        cleanup();
     }
 
     @Test
     public void testCreateRoleByNonAdminUser()
     {
         assertQueryFails(createUserSession("non_admin_user"), createRoleSql("role1"), "Access Denied: Cannot create role role1");
+        cleanup();
     }
 
     @Test
@@ -109,6 +114,7 @@ public void testDropRole()
         assertEquals(listRoles(), ImmutableSet.of("role1", "admin"));
         executeFromAdmin(dropRoleSql("role1"));
         assertEquals(listRoles(), ImmutableSet.of("admin"));
+        cleanup();
     }
 
     @Test
@@ -147,6 +153,7 @@ public void testGrantRoleToUser()
         executeFromAdmin(createRoleSql("role1"));
         executeFromAdmin(grantRoleToUserSql("role1", "user"));
         assertContains(listApplicableRoles("user"), applicableRoles("user", "USER", "role1", "NO"));
+        cleanup();
     }
 
     @Test
@@ -159,6 +166,7 @@ public void testGrantRoleToRole()
         assertContains(listApplicableRoles("user"), applicableRoles(
                 "user", "USER", "role1", "NO",
                 "role1", "ROLE", "role2", "NO"));
+        cleanup();
     }
 
     @Test
@@ -171,6 +179,7 @@ public void testGrantRoleWithAdminOption()
         assertContains(listApplicableRoles("user"), applicableRoles(
                 "user", "USER", "role1", "YES",
                 "role1", "ROLE", "role2", "YES"));
+        cleanup();
     }
 
     @Test
@@ -189,6 +198,7 @@ public void testGrantRoleMultipleTimes()
         assertContains(listApplicableRoles("user"), applicableRoles(
                 "user", "USER", "role1", "YES",
                 "role1", "ROLE", "role2", "YES"));
+        cleanup();
     }
 
     @Test
@@ -201,6 +211,7 @@ public void testGrantNonExistingRole()
         assertQueryFails(
                 grantRoleToRoleSql("grant_revoke_role_existing_1", "grant_revoke_role_existing_2"),
                 ".*?Role 'grant_revoke_role_existing_2' does not exist in catalog '.*'");
+        cleanup();
     }
 
     @Test
@@ -212,6 +223,7 @@ public void testRevokeRoleFromUser()
 
         executeFromAdmin(revokeRoleFromUserSql("role1", "user"));
         assertEqualsIgnoreOrder(listApplicableRoles("user"), applicableRoles("user", "USER", "public", "NO"));
+        cleanup();
     }
 
     @Test
@@ -229,6 +241,7 @@ public void testRevokeRoleFromRole()
         assertEqualsIgnoreOrder(listApplicableRoles("user"), applicableRoles(
                 "user", "USER", "public", "NO",
                 "user", "USER", "role1", "NO"));
+        cleanup();
     }
 
     @Test
@@ -240,6 +253,7 @@ public void testDropGrantedRole()
 
         executeFromAdmin(dropRoleSql("role1"));
         assertEqualsIgnoreOrder(listApplicableRoles("user"), applicableRoles("user", "USER", "public", "NO"));
+        cleanup();
     }
 
     @Test
@@ -258,6 +272,7 @@ public void testRevokeTransitiveRoleFromUser()
 
         executeFromAdmin(revokeRoleFromUserSql("role1", "user"));
         assertEqualsIgnoreOrder(listApplicableRoles("user"), applicableRoles("user", "USER", "public", "NO"));
+        cleanup();
     }
 
     @Test
@@ -278,6 +293,7 @@ public void testRevokeTransitiveRoleFromRole()
         assertEqualsIgnoreOrder(listApplicableRoles("user"), applicableRoles(
                 "user", "USER", "public", "NO",
                 "user", "USER", "role1", "NO"));
+        cleanup();
     }
 
     @Test
@@ -298,6 +314,7 @@ public void testDropTransitiveRole()
         assertEqualsIgnoreOrder(listApplicableRoles("user"), applicableRoles(
                 "user", "USER", "public", "NO",
                 "user", "USER", "role1", "NO"));
+        cleanup();
     }
 
     @Test
@@ -316,6 +333,7 @@ public void testRevokeAdminOption()
         assertContains(listApplicableRoles("user"), applicableRoles(
                 "user", "USER", "role1", "NO",
                 "role1", "ROLE", "role2", "NO"));
+        cleanup();
     }
 
     @Test
@@ -342,6 +360,7 @@ public void testRevokeRoleMultipleTimes()
         executeFromAdmin(revokeRoleFromRoleSql("role2", "role1"));
         executeFromAdmin(revokeRoleFromRoleSql("role2", "role1"));
         assertEqualsIgnoreOrder(listApplicableRoles("user"), applicableRoles("user", "USER", "public", "NO"));
+        cleanup();
     }
 
     @Test
@@ -459,6 +478,7 @@ public void testSetRole()
         executeFromAdmin(dropRoleSql("set_role_2"));
         executeFromAdmin(dropRoleSql("set_role_3"));
         executeFromAdmin(dropRoleSql("set_role_4"));
+        cleanup();
     }
 
     private Set<String> listRoles()
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestParquetPageSkipping.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestParquetPageSkipping.java
deleted file mode 100644
index db9d69d68449..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestParquetPageSkipping.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import io.trino.Session;
-import io.trino.execution.QueryStats;
-import io.trino.operator.OperatorStats;
-import io.trino.spi.QueryId;
-import io.trino.spi.metrics.Count;
-import io.trino.spi.metrics.Metric;
-import io.trino.testing.AbstractTestQueryFramework;
-import io.trino.testing.DistributedQueryRunner;
-import io.trino.testing.MaterializedResult;
-import io.trino.testing.MaterializedResultWithQueryId;
-import org.intellij.lang.annotations.Language;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import java.util.Map;
-
-import static com.google.common.collect.MoreCollectors.onlyElement;
-import static io.trino.parquet.reader.ParquetReader.COLUMN_INDEX_ROWS_FILTERED;
-import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static java.lang.String.format;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public abstract class AbstractTestParquetPageSkipping
-        extends AbstractTestQueryFramework
-{
-    private void buildSortedTables(String tableName, String sortByColumnName, String sortByColumnType)
-    {
-        String createTableTemplate =
-                "CREATE TABLE %s ( " +
-                        "   orderkey bigint, " +
-                        "   custkey bigint, " +
-                        "   orderstatus varchar(1), " +
-                        "   totalprice double, " +
-                        "   orderdate date, " +
-                        "   orderpriority varchar(15), " +
-                        "   clerk varchar(15), " +
-                        "   shippriority integer, " +
-                        "   comment varchar(79), " +
-                        "   rvalues double array " +
-                        ") " +
-                        "WITH ( " +
-                        "   format = 'PARQUET', " +
-                        "   bucketed_by = array['orderstatus'], " +
-                        "   bucket_count = 1, " +
-                        "   sorted_by = array['%s'] " +
-                        ")";
-        createTableTemplate = createTableTemplate.replaceFirst(sortByColumnName + "[ ]+([^,]*)", sortByColumnName + " " + sortByColumnType);
-
-        assertUpdate(format(
-                createTableTemplate,
-                tableName,
-                sortByColumnName));
-        String catalog = getSession().getCatalog().orElseThrow();
-        assertUpdate(
-                Session.builder(getSession())
-                        .setCatalogSessionProperty(catalog, "parquet_writer_page_size", "10000B")
-                        .setCatalogSessionProperty(catalog, "parquet_writer_block_size", "100GB")
-                        .build(),
-                format("INSERT INTO %s SELECT *, ARRAY[rand(), rand(), rand()] FROM tpch.tiny.orders", tableName),
-                15000);
-    }
-
-    @Test
-    public void testAndPredicates()
-    {
-        String tableName = "test_and_predicate_" + randomNameSuffix();
-        buildSortedTables(tableName, "totalprice", "double");
-        int rowCount = assertColumnIndexResults("SELECT * FROM " + tableName + " WHERE totalprice BETWEEN 100000 AND 131280 AND clerk = 'Clerk#000000624'");
-        assertThat(rowCount).isGreaterThan(0);
-
-        // `totalprice BETWEEN 51890 AND 51900` is chosen to lie between min/max values of row group
-        // but outside page level min/max boundaries to trigger pruning of row group using column index
-        assertRowGroupPruning("SELECT * FROM " + tableName + " WHERE totalprice BETWEEN 51890 AND 51900 AND orderkey > 0");
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
-    @Test
-    public void testPageSkippingWithNonSequentialOffsets()
-    {
-        String tableName = "test_random_" + randomNameSuffix();
-        int updateCount = 8192;
-        assertUpdate(
-                "CREATE TABLE " + tableName + " (col) WITH (format = 'PARQUET') AS " +
-                        "SELECT * FROM unnest(transform(repeat(1, 8192), x -> rand()))",
-                updateCount);
-        for (int i = 0; i < 8; i++) {
-            assertUpdate(
-                    "INSERT INTO " + tableName + " SELECT rand() FROM " + tableName,
-                    updateCount);
-            updateCount += updateCount;
-        }
-        // These queries select a subset of pages which are stored at non-sequential offsets
-        // This reproduces the issue identified in https://github.com/trinodb/trino/issues/9097
-        for (double i = 0; i < 1; i += 0.1) {
-            assertColumnIndexResults(format("SELECT * FROM %s WHERE col BETWEEN %f AND %f", tableName, i - 0.00001, i + 0.00001));
-        }
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
-    @Test
-    public void testFilteringOnColumnNameWithDot()
-    {
-        String nameInSql = "\"a.dot\"";
-        String tableName = "test_column_name_with_dot_" + randomNameSuffix();
-
-        assertUpdate("CREATE TABLE " + tableName + "(key varchar(50), " + nameInSql + " varchar(50)) WITH (format = 'PARQUET')");
-        assertUpdate("INSERT INTO " + tableName + " VALUES ('null value', NULL), ('sample value', 'abc'), ('other value', 'xyz')", 3);
-
-        assertQuery("SELECT key FROM " + tableName + " WHERE " + nameInSql + " IS NULL", "VALUES ('null value')");
-        assertQuery("SELECT key FROM " + tableName + " WHERE " + nameInSql + " = 'abc'", "VALUES ('sample value')");
-
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
-    @Test(dataProvider = "dataType")
-    public void testPageSkipping(String sortByColumn, String sortByColumnType, Object[][] valuesArray)
-    {
-        String tableName = "test_page_skipping_" + randomNameSuffix();
-        buildSortedTables(tableName, sortByColumn, sortByColumnType);
-        for (Object[] values : valuesArray) {
-            Object lowValue = values[0];
-            Object middleLowValue = values[1];
-            Object middleHighValue = values[2];
-            Object highValue = values[3];
-            assertColumnIndexResults(format("SELECT %s FROM %s WHERE %s = %s", sortByColumn, tableName, sortByColumn, middleLowValue));
-            assertThat(assertColumnIndexResults(format("SELECT %s FROM %s WHERE %s < %s", sortByColumn, tableName, sortByColumn, lowValue))).isGreaterThan(0);
-            assertThat(assertColumnIndexResults(format("SELECT %s FROM %s WHERE %s > %s", sortByColumn, tableName, sortByColumn, highValue))).isGreaterThan(0);
-            assertThat(assertColumnIndexResults(format("SELECT %s FROM %s WHERE %s BETWEEN %s AND %s", sortByColumn, tableName, sortByColumn, middleLowValue, middleHighValue))).isGreaterThan(0);
-            // Tests synchronization of reading values across columns
-            assertColumnIndexResults(format("SELECT * FROM %s WHERE %s = %s", tableName, sortByColumn, middleLowValue));
-            assertThat(assertColumnIndexResults(format("SELECT * FROM %s WHERE %s < %s", tableName, sortByColumn, lowValue))).isGreaterThan(0);
-            assertThat(assertColumnIndexResults(format("SELECT * FROM %s WHERE %s > %s", tableName, sortByColumn, highValue))).isGreaterThan(0);
-            assertThat(assertColumnIndexResults(format("SELECT * FROM %s WHERE %s BETWEEN %s AND %s", tableName, sortByColumn, middleLowValue, middleHighValue))).isGreaterThan(0);
-            // Nested data
-            assertColumnIndexResults(format("SELECT rvalues FROM %s WHERE %s IN (%s, %s, %s, %s)", tableName, sortByColumn, lowValue, middleLowValue, middleHighValue, highValue));
-            // Without nested data
-            assertColumnIndexResults(format("SELECT orderkey, orderdate FROM %s WHERE %s IN (%s, %s, %s, %s)", tableName, sortByColumn, lowValue, middleLowValue, middleHighValue, highValue));
-        }
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
-    @Test
-    public void testFilteringWithColumnIndex()
-    {
-        String tableName = "test_page_filtering_" + randomNameSuffix();
-        String catalog = getSession().getCatalog().orElseThrow();
-        assertUpdate(
-                Session.builder(getSession())
-                        .setCatalogSessionProperty(catalog, "parquet_writer_page_size", "32kB")
-                        .build(),
-                "CREATE TABLE " + tableName + " " +
-                        "WITH (format = 'PARQUET', bucket_count = 1, bucketed_by = ARRAY['suppkey'], sorted_by = ARRAY['suppkey']) AS " +
-                        "SELECT suppkey, extendedprice, shipmode, comment FROM tpch.tiny.lineitem",
-                60175);
-
-        verifyFilteringWithColumnIndex("SELECT * FROM " + tableName + " WHERE suppkey = 10");
-        verifyFilteringWithColumnIndex("SELECT * FROM " + tableName + " WHERE suppkey BETWEEN 25 AND 35");
-        verifyFilteringWithColumnIndex("SELECT * FROM " + tableName + " WHERE suppkey >= 60");
-        verifyFilteringWithColumnIndex("SELECT * FROM " + tableName + " WHERE suppkey <= 40");
-        verifyFilteringWithColumnIndex("SELECT * FROM " + tableName + " WHERE suppkey IN (25, 35, 50, 80)");
-
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
-    private void verifyFilteringWithColumnIndex(@Language("SQL") String query)
-    {
-        DistributedQueryRunner queryRunner = getDistributedQueryRunner();
-        MaterializedResultWithQueryId resultWithoutColumnIndex = queryRunner.executeWithQueryId(
-                noParquetColumnIndexFiltering(getSession()),
-                query);
-        QueryStats queryStatsWithoutColumnIndex = getQueryStats(resultWithoutColumnIndex.getQueryId());
-        assertThat(queryStatsWithoutColumnIndex.getPhysicalInputPositions()).isGreaterThan(0);
-        Map<String, Metric<?>> metricsWithoutColumnIndex = getScanOperatorStats(resultWithoutColumnIndex.getQueryId())
-                .getConnectorMetrics()
-                .getMetrics();
-        assertThat(metricsWithoutColumnIndex).doesNotContainKey(COLUMN_INDEX_ROWS_FILTERED);
-
-        MaterializedResultWithQueryId resultWithColumnIndex = queryRunner.executeWithQueryId(getSession(), query);
-        QueryStats queryStatsWithColumnIndex = getQueryStats(resultWithColumnIndex.getQueryId());
-        assertThat(queryStatsWithColumnIndex.getPhysicalInputPositions()).isGreaterThan(0);
-        assertThat(queryStatsWithColumnIndex.getPhysicalInputPositions())
-                .isLessThan(queryStatsWithoutColumnIndex.getPhysicalInputPositions());
-        Map<String, Metric<?>> metricsWithColumnIndex = getScanOperatorStats(resultWithColumnIndex.getQueryId())
-                .getConnectorMetrics()
-                .getMetrics();
-        assertThat(metricsWithColumnIndex).containsKey(COLUMN_INDEX_ROWS_FILTERED);
-        assertThat(((Count<?>) metricsWithColumnIndex.get(COLUMN_INDEX_ROWS_FILTERED)).getTotal())
-                .isGreaterThan(0);
-
-        assertEqualsIgnoreOrder(resultWithColumnIndex.getResult(), resultWithoutColumnIndex.getResult());
-    }
-
-    private int assertColumnIndexResults(String query)
-    {
-        MaterializedResult withColumnIndexing = computeActual(query);
-        MaterializedResult withoutColumnIndexing = computeActual(noParquetColumnIndexFiltering(getSession()), query);
-        assertEqualsIgnoreOrder(withColumnIndexing, withoutColumnIndexing);
-        return withoutColumnIndexing.getRowCount();
-    }
-
-    private void assertRowGroupPruning(@Language("SQL") String sql)
-    {
-        assertQueryStats(
-                noParquetColumnIndexFiltering(getSession()),
-                sql,
-                queryStats -> {
-                    assertThat(queryStats.getPhysicalInputPositions()).isGreaterThan(0);
-                    assertThat(queryStats.getProcessedInputPositions()).isEqualTo(queryStats.getPhysicalInputPositions());
-                },
-                results -> assertThat(results.getRowCount()).isEqualTo(0));
-
-        assertQueryStats(
-                getSession(),
-                sql,
-                queryStats -> {
-                    assertThat(queryStats.getPhysicalInputPositions()).isEqualTo(0);
-                    assertThat(queryStats.getProcessedInputPositions()).isEqualTo(0);
-                },
-                results -> assertThat(results.getRowCount()).isEqualTo(0));
-    }
-
-    @DataProvider
-    public Object[][] dataType()
-    {
-        return new Object[][] {
-                {"orderkey", "bigint", new Object[][] {{2, 7520, 7523, 14950}}},
-                {"totalprice", "double", new Object[][] {{974.04, 131094.34, 131279.97, 406938.36}}},
-                {"totalprice", "real", new Object[][] {{974.04, 131094.34, 131279.97, 406938.36}}},
-                {"totalprice", "decimal(12,2)", new Object[][] {
-                        {974.04, 131094.34, 131279.97, 406938.36},
-                        {973, 131095, 131280, 406950},
-                        {974.04123, 131094.34123, 131279.97012, 406938.36555}}},
-                {"totalprice", "decimal(12,0)", new Object[][] {
-                        {973, 131095, 131280, 406950}}},
-                {"totalprice", "decimal(35,2)", new Object[][] {
-                        {974.04, 131094.34, 131279.97, 406938.36},
-                        {973, 131095, 131280, 406950},
-                        {974.04123, 131094.34123, 131279.97012, 406938.36555}}},
-                {"orderdate", "date", new Object[][] {{"DATE '1992-01-05'", "DATE '1995-10-13'", "DATE '1995-10-13'", "DATE '1998-07-29'"}}},
-                {"orderdate", "timestamp", new Object[][] {{"TIMESTAMP '1992-01-05'", "TIMESTAMP '1995-10-13'", "TIMESTAMP '1995-10-14'", "TIMESTAMP '1998-07-29'"}}},
-                {"clerk", "varchar(15)", new Object[][] {{"'Clerk#000000006'", "'Clerk#000000508'", "'Clerk#000000513'", "'Clerk#000000996'"}}},
-                {"custkey", "integer", new Object[][] {{4, 634, 640, 1493}}},
-                {"custkey", "smallint", new Object[][] {{4, 634, 640, 1493}}}
-        };
-    }
-
-    private Session noParquetColumnIndexFiltering(Session session)
-    {
-        return Session.builder(session)
-                .setCatalogSessionProperty(session.getCatalog().orElseThrow(), "parquet_use_column_index", "false")
-                .build();
-    }
-
-    private QueryStats getQueryStats(QueryId queryId)
-    {
-        return getDistributedQueryRunner().getCoordinator()
-                .getQueryManager()
-                .getFullQueryInfo(queryId)
-                .getQueryStats();
-    }
-
-    private OperatorStats getScanOperatorStats(QueryId queryId)
-    {
-        return getQueryStats(queryId)
-                .getOperatorSummaries()
-                .stream()
-                .filter(summary -> summary.getOperatorType().startsWith("TableScan") || summary.getOperatorType().startsWith("Scan"))
-                .collect(onlyElement());
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveConnectorTest.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveConnectorTest.java
index 15ff121b9eff..607e67117b61 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveConnectorTest.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveConnectorTest.java
@@ -29,6 +29,13 @@
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.TableHandle;
 import io.trino.metadata.TableMetadata;
+import io.trino.plugin.hive.metastore.Column;
+import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
+import io.trino.plugin.hive.metastore.PrincipalPrivileges;
+import io.trino.plugin.hive.metastore.Storage;
+import io.trino.plugin.hive.metastore.StorageFormat;
+import io.trino.plugin.hive.metastore.Table;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
@@ -54,6 +61,7 @@
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.MaterializedResultWithQueryId;
 import io.trino.testing.MaterializedRow;
+import io.trino.testing.QueryFailedException;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
 import io.trino.testing.sql.TestTable;
@@ -82,6 +90,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.OptionalLong;
 import java.util.Set;
 import java.util.StringJoiner;
 import java.util.function.BiConsumer;
@@ -112,14 +121,15 @@
 import static io.trino.SystemSessionProperties.FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_COMPUTE_TASK_TARGET_SIZE;
 import static io.trino.SystemSessionProperties.FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_WRITE_TASK_TARGET_SIZE;
 import static io.trino.SystemSessionProperties.MAX_WRITER_TASKS_COUNT;
-import static io.trino.SystemSessionProperties.PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS;
+import static io.trino.SystemSessionProperties.QUERY_MAX_MEMORY_PER_NODE;
 import static io.trino.SystemSessionProperties.REDISTRIBUTE_WRITES;
 import static io.trino.SystemSessionProperties.SCALE_WRITERS;
+import static io.trino.SystemSessionProperties.SKEWED_PARTITION_MIN_DATA_PROCESSED_REBALANCE_THRESHOLD;
+import static io.trino.SystemSessionProperties.TASK_MAX_WRITER_COUNT;
+import static io.trino.SystemSessionProperties.TASK_MIN_WRITER_COUNT;
 import static io.trino.SystemSessionProperties.TASK_SCALE_WRITERS_ENABLED;
-import static io.trino.SystemSessionProperties.TASK_SCALE_WRITERS_MAX_WRITER_COUNT;
-import static io.trino.SystemSessionProperties.TASK_WRITER_COUNT;
 import static io.trino.SystemSessionProperties.USE_TABLE_SCAN_NODE_PARTITIONING;
-import static io.trino.SystemSessionProperties.WRITER_MIN_SIZE;
+import static io.trino.SystemSessionProperties.WRITER_SCALING_MIN_DATA_PROCESSED;
 import static io.trino.plugin.hive.HiveColumnHandle.BUCKET_COLUMN_NAME;
 import static io.trino.plugin.hive.HiveColumnHandle.FILE_MODIFIED_TIME_COLUMN_NAME;
 import static io.trino.plugin.hive.HiveColumnHandle.FILE_SIZE_COLUMN_NAME;
@@ -129,6 +139,8 @@
 import static io.trino.plugin.hive.HiveQueryRunner.HIVE_CATALOG;
 import static io.trino.plugin.hive.HiveQueryRunner.TPCH_SCHEMA;
 import static io.trino.plugin.hive.HiveQueryRunner.createBucketedSession;
+import static io.trino.plugin.hive.HiveStorageFormat.ORC;
+import static io.trino.plugin.hive.HiveStorageFormat.PARQUET;
 import static io.trino.plugin.hive.HiveStorageFormat.REGEX;
 import static io.trino.plugin.hive.HiveTableProperties.AUTO_PURGE;
 import static io.trino.plugin.hive.HiveTableProperties.BUCKETED_BY_PROPERTY;
@@ -165,6 +177,7 @@
 import static io.trino.testing.TestingAccessControlManager.privilege;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static io.trino.testing.containers.TestContainers.getPathFromClassPathResource;
 import static io.trino.transaction.TransactionBuilder.transaction;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.lang.String.format;
@@ -183,7 +196,6 @@
 import static org.assertj.core.data.Offset.offset;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
@@ -203,24 +215,28 @@ protected BaseHiveConnectorTest()
         this.bucketedSession = createBucketedSession(Optional.of(new SelectedRole(ROLE, Optional.of("admin"))));
     }
 
-    protected static QueryRunner createHiveQueryRunner(Map<String, String> extraProperties, Consumer<QueryRunner> additionalSetup)
+    protected static QueryRunner createHiveQueryRunner(HiveQueryRunner.Builder<?> builder)
             throws Exception
     {
         // Use faster compression codec in tests. TODO remove explicit config when default changes
         verify(new HiveConfig().getHiveCompressionCodec() == HiveCompressionOption.GZIP);
         String hiveCompressionCodec = HiveCompressionCodec.ZSTD.name();
 
-        DistributedQueryRunner queryRunner = HiveQueryRunner.builder()
-                .setExtraProperties(extraProperties)
-                .setAdditionalSetup(additionalSetup)
-                .setHiveProperties(ImmutableMap.of(
-                        "hive.compression-codec", hiveCompressionCodec,
-                        "hive.allow-register-partition-procedure", "true",
-                        // Reduce writer sort buffer size to ensure SortingFileWriter gets used
-                        "hive.writer-sort-buffer-size", "1MB",
-                        // Make weighted split scheduling more conservative to avoid OOMs in test
-                        "hive.minimum-assigned-split-weight", "0.5"))
-                .addExtraProperty("legacy.allow-set-view-authorization", "true")
+        DistributedQueryRunner queryRunner = builder
+                .addHiveProperty("hive.compression-codec", hiveCompressionCodec)
+                .addHiveProperty("hive.allow-register-partition-procedure", "true")
+                // Reduce writer sort buffer size to ensure SortingFileWriter gets used
+                .addHiveProperty("hive.writer-sort-buffer-size", "1MB")
+                // Make weighted split scheduling more conservative to avoid OOMs in test
+                .addHiveProperty("hive.minimum-assigned-split-weight", "0.5")
+                .addHiveProperty("hive.partition-projection-enabled", "true")
+                // This is needed for e2e scale writers test otherwise 50% threshold of
+                // bufferSize won't get exceeded for scaling to happen.
+                .addExtraProperty("task.max-local-exchange-buffer-size", "32MB")
+                // SQL functions
+                .addExtraProperty("sql.path", "hive.functions")
+                .addExtraProperty("sql.default-function-catalog", "hive")
+                .addExtraProperty("sql.default-function-schema", "functions")
                 .setInitialTables(REQUIRED_TPCH_TABLES)
                 .setTpchBucketedCatalogEnabled(true)
                 .build();
@@ -233,41 +249,39 @@ protected static QueryRunner createHiveQueryRunner(Map<String, String> extraProp
         return queryRunner;
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_VIEW:
-            case SUPPORTS_COMMENT_ON_VIEW_COLUMN:
-                return true;
-
-            case SUPPORTS_DROP_FIELD:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_CREATE_VIEW:
-                return true;
-
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return false;
-
-            case SUPPORTS_DELETE:
-            case SUPPORTS_UPDATE:
-                return true;
-
-            case SUPPORTS_MERGE:
-                // FIXME: Fails because only allowed with transactional tables
-                return false;
+        return switch (connectorBehavior) {
+            case SUPPORTS_MULTI_STATEMENT_WRITES,
+                    SUPPORTS_REPORTING_WRITTEN_BYTES -> true; // FIXME: Fails because only allowed with transactional tables
+            case SUPPORTS_ADD_FIELD,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_DROP_FIELD,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_RENAME_FIELD,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_TRUNCATE -> false;
+            case SUPPORTS_CREATE_FUNCTION -> true;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
 
-            case SUPPORTS_MULTI_STATEMENT_WRITES:
-                return true;
+    @Override
+    public void verifySupportsUpdateDeclaration()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_row_update", "AS SELECT * FROM nation")) {
+            assertQueryFails("UPDATE " + table.getName() + " SET nationkey = 100 WHERE regionkey = 2", MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE);
+        }
+    }
 
-            default:
-                return super.hasBehavior(connectorBehavior);
+    @Override
+    public void verifySupportsRowLevelUpdateDeclaration()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_supports_update", "AS SELECT * FROM nation")) {
+            assertQueryFails("UPDATE " + table.getName() + " SET nationkey = nationkey * 100 WHERE regionkey = 2", MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE);
         }
     }
 
@@ -326,6 +340,13 @@ public void testUpdate()
                 .hasMessage(MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE);
     }
 
+    @Override
+    public void testRowLevelUpdate()
+    {
+        assertThatThrownBy(super::testRowLevelUpdate)
+                .hasMessage(MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE);
+    }
+
     @Override
     public void testUpdateRowConcurrently()
             throws Exception
@@ -607,6 +628,16 @@ public void testSchemaOperations()
         assertUpdate(session, "DROP SCHEMA new_schema");
     }
 
+    @Test
+    public void testCreateSchemaWithIncorrectLocation()
+    {
+        String schemaName = "test_create_schema_with_incorrect_location_" + randomNameSuffix();
+        String schemaLocation = "s3://bucket";
+
+        assertThatThrownBy(() -> assertUpdate("CREATE SCHEMA " + schemaName + " WITH (location = '" + schemaLocation + "')"))
+                .hasMessageContaining("Invalid location URI");
+    }
+
     @Test
     public void testSchemaAuthorizationForUser()
     {
@@ -703,6 +734,15 @@ public void testSchemaAuthorizationForRole()
         assertUpdate(admin, "DROP ROLE authorized_users IN hive");
     }
 
+    @Override
+    public void testCreateSchemaWithNonLowercaseOwnerName()
+    {
+        // Override because HivePrincipal's username is case-sensitive unlike TrinoPrincipal
+        assertThatThrownBy(super::testCreateSchemaWithNonLowercaseOwnerName)
+                .hasMessageContaining("Access Denied: Cannot create schema")
+                .hasStackTraceContaining("CREATE SCHEMA");
+    }
+
     @Test
     public void testCreateSchemaWithAuthorizationForUser()
     {
@@ -810,20 +850,33 @@ public void testSchemaAuthorization()
                 .build();
 
         assertUpdate(admin, "CREATE SCHEMA test_schema_authorization");
-
+        assertAccessDenied(user, "ALTER SCHEMA test_schema_authorization SET AUTHORIZATION user2", "Cannot set authorization for schema test_schema_authorization to USER user2");
+        assertAccessDenied(user, "DROP SCHEMA test_schema_authorization", "Cannot drop schema test_schema_authorization");
         assertUpdate(admin, "ALTER SCHEMA test_schema_authorization SET AUTHORIZATION user");
-        assertUpdate(user, "ALTER SCHEMA test_schema_authorization SET AUTHORIZATION ROLE admin");
-        assertQueryFails(user, "ALTER SCHEMA test_schema_authorization SET AUTHORIZATION ROLE admin", "Access Denied: Cannot set authorization for schema test_schema_authorization to ROLE admin");
+        // only admin can change the owner
+        assertAccessDenied(user, "ALTER SCHEMA test_schema_authorization SET AUTHORIZATION user2", "Cannot set authorization for schema test_schema_authorization to USER user2");
+        assertUpdate(user, "DROP SCHEMA test_schema_authorization"); // new onwer can drop schema
 
         // switch owner back to user, and then change the owner to ROLE admin from a different catalog to verify roles are relative to the catalog of the schema
-        assertUpdate(admin, "ALTER SCHEMA test_schema_authorization SET AUTHORIZATION user");
         Session userSessionInDifferentCatalog = testSessionBuilder()
                 .setIdentity(Identity.forUser("user").withPrincipal(getSession().getIdentity().getPrincipal()).build())
                 .build();
-        assertUpdate(userSessionInDifferentCatalog, "ALTER SCHEMA hive.test_schema_authorization SET AUTHORIZATION ROLE admin");
-        assertUpdate(admin, "ALTER SCHEMA test_schema_authorization SET AUTHORIZATION user");
-
-        assertUpdate(admin, "DROP SCHEMA test_schema_authorization");
+        assertUpdate(admin, "CREATE SCHEMA test_schema_authorization");
+        assertAccessDenied(
+                userSessionInDifferentCatalog,
+                "ALTER SCHEMA hive.test_schema_authorization SET AUTHORIZATION user",
+                "Cannot set authorization for schema test_schema_authorization to USER user");
+        assertAccessDenied(
+                userSessionInDifferentCatalog,
+                "DROP SCHEMA hive.test_schema_authorization",
+                "Cannot drop schema test_schema_authorization");
+        assertUpdate(admin, "ALTER SCHEMA hive.test_schema_authorization SET AUTHORIZATION user");
+        assertAccessDenied(
+                userSessionInDifferentCatalog,
+                "ALTER SCHEMA hive.test_schema_authorization SET AUTHORIZATION user",
+                "Cannot set authorization for schema test_schema_authorization to USER user");
+        // new owner can drop schema
+        assertUpdate(userSessionInDifferentCatalog, "DROP SCHEMA hive.test_schema_authorization");
     }
 
     @Test
@@ -847,9 +900,14 @@ public void testTableAuthorization()
                 "ALTER TABLE test_table_authorization.foo SET AUTHORIZATION alice",
                 "Cannot set authorization for table test_table_authorization.foo to USER alice");
         assertUpdate(admin, "ALTER TABLE test_table_authorization.foo SET AUTHORIZATION alice");
-        assertUpdate(alice, "ALTER TABLE test_table_authorization.foo SET AUTHORIZATION admin");
+        // only admin can change the owner
+        assertAccessDenied(
+                alice,
+                "ALTER TABLE test_table_authorization.foo SET AUTHORIZATION alice",
+                "Cannot set authorization for table test_table_authorization.foo to USER alice");
+        // alice as new owner can now drop table
+        assertUpdate(alice, "DROP TABLE test_table_authorization.foo");
 
-        assertUpdate(admin, "DROP TABLE test_table_authorization.foo");
         assertUpdate(admin, "DROP SCHEMA test_table_authorization");
     }
 
@@ -874,13 +932,18 @@ public void testTableAuthorizationForRole()
                 alice,
                 "ALTER TABLE test_table_authorization_role.foo SET AUTHORIZATION ROLE admin",
                 "Cannot set authorization for table test_table_authorization_role.foo to ROLE admin");
+        assertAccessDenied(
+                alice,
+                "DROP TABLE test_table_authorization_role.foo",
+                "Cannot drop table test_table_authorization_role.foo");
         assertUpdate(admin, "ALTER TABLE test_table_authorization_role.foo SET AUTHORIZATION alice");
-        assertQueryFails(
+        // Only admin can change the owner
+        assertAccessDenied(
                 alice,
                 "ALTER TABLE test_table_authorization_role.foo SET AUTHORIZATION ROLE admin",
-                "Setting table owner type as a role is not supported");
-
-        assertUpdate(admin, "DROP TABLE test_table_authorization_role.foo");
+                "Cannot set authorization for table test_table_authorization_role.foo to ROLE admin");
+        // new owner can drop table
+        assertUpdate(alice, "DROP TABLE test_table_authorization_role.foo");
         assertUpdate(admin, "DROP SCHEMA test_table_authorization_role");
     }
 
@@ -904,10 +967,14 @@ public void testViewAuthorization()
 
         assertAccessDenied(
                 alice,
-                "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION alice",
-                "Cannot set authorization for view " + schema + ".test_view to USER alice");
+                "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION admin",
+                "Cannot set authorization for view " + schema + ".test_view to USER admin");
         assertUpdate(admin, "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION alice");
-        assertUpdate(alice, "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION admin");
+        // only admin can change the owner
+        assertAccessDenied(
+                alice,
+                "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION admin",
+                "Cannot set authorization for view " + schema + ".test_view to USER admin");
 
         assertUpdate(admin, "DROP VIEW " + schema + ".test_view");
         assertUpdate(admin, "DROP SCHEMA " + schema);
@@ -933,13 +1000,22 @@ public void testViewAuthorizationSecurityDefiner()
         assertUpdate(admin, "INSERT INTO " + schema + ".test_table VALUES (1)", 1);
         assertUpdate(admin, "CREATE VIEW " + schema + ".test_view SECURITY DEFINER AS SELECT * from " + schema + ".test_table");
         assertUpdate(admin, "GRANT SELECT ON " + schema + ".test_view TO alice");
+        assertAccessDenied(
+                alice,
+                "DROP VIEW " + schema + ".test_view",
+                "Cannot drop view " + schema + ".test_view");
 
         assertQuery(alice, "SELECT * FROM " + schema + ".test_view", "VALUES (1)");
         assertUpdate(admin, "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION alice");
         assertQueryFails(alice, "SELECT * FROM " + schema + ".test_view", "Access Denied: Cannot select from table " + schema + ".test_table");
 
-        assertUpdate(alice, "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION admin");
-        assertUpdate(admin, "DROP VIEW " + schema + ".test_view");
+        // only admin can change the owner
+        assertAccessDenied(
+                alice,
+                "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION admin",
+                "Cannot set authorization for view " + schema + ".test_view to USER admin");
+        // new owner can drop the view
+        assertUpdate(alice, "DROP VIEW " + schema + ".test_view");
         assertUpdate(admin, "DROP TABLE " + schema + ".test_table");
         assertUpdate(admin, "DROP SCHEMA " + schema);
     }
@@ -964,13 +1040,22 @@ public void testViewAuthorizationSecurityInvoker()
         assertUpdate(admin, "INSERT INTO " + schema + ".test_table VALUES (1)", 1);
         assertUpdate(admin, "CREATE VIEW " + schema + ".test_view SECURITY INVOKER AS SELECT * from " + schema + ".test_table");
         assertUpdate(admin, "GRANT SELECT ON " + schema + ".test_view TO alice");
+        assertAccessDenied(
+                alice,
+                "DROP VIEW " + schema + ".test_view",
+                "Cannot drop view " + schema + ".test_view");
 
         assertQueryFails(alice, "SELECT * FROM " + schema + ".test_view", "Access Denied: Cannot select from table " + schema + ".test_table");
         assertUpdate(admin, "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION alice");
         assertQueryFails(alice, "SELECT * FROM " + schema + ".test_view", "Access Denied: Cannot select from table " + schema + ".test_table");
 
-        assertUpdate(alice, "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION admin");
-        assertUpdate(admin, "DROP VIEW " + schema + ".test_view");
+        // only admin can change the owner
+        assertAccessDenied(
+                alice,
+                "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION admin",
+                "Cannot set authorization for view " + schema + ".test_view to USER admin");
+        // new owner can drop the view
+        assertUpdate(alice, "DROP VIEW " + schema + ".test_view");
         assertUpdate(admin, "DROP TABLE " + schema + ".test_table");
         assertUpdate(admin, "DROP SCHEMA " + schema);
     }
@@ -1000,10 +1085,11 @@ public void testViewAuthorizationForRole()
                 "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION ROLE admin",
                 "Cannot set authorization for view " + schema + ".test_view to ROLE admin");
         assertUpdate(admin, "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION alice");
-        assertQueryFails(
+        // only admin can change the owner
+        assertAccessDenied(
                 alice,
                 "ALTER VIEW " + schema + ".test_view SET AUTHORIZATION ROLE admin",
-                "Setting table owner type as a role is not supported");
+                "Cannot set authorization for view " + schema + ".test_view to ROLE admin");
 
         assertUpdate(admin, "DROP VIEW " + schema + ".test_view");
         assertUpdate(admin, "DROP TABLE " + schema + ".test_table");
@@ -1886,7 +1972,7 @@ public void testTargetMaxFileSize()
 
         // verify the default behavior is one file per node
         Session session = Session.builder(getSession())
-                .setSystemProperty("task_writer_count", "1")
+                .setSystemProperty("task_min_writer_count", "1")
                 .setSystemProperty("scale_writers", "false")
                 .setSystemProperty("redistribute_writes", "false")
                 // task scale writers should be disabled since we want to write with a single task writer
@@ -1900,7 +1986,7 @@ public void testTargetMaxFileSize()
         // Writer writes chunks of rows that are about 1MB
         DataSize maxSize = DataSize.of(1, MEGABYTE);
         session = Session.builder(getSession())
-                .setSystemProperty("task_writer_count", "1")
+                .setSystemProperty("task_min_writer_count", "1")
                 // task scale writers should be disabled since we want to write with a single task writer
                 .setSystemProperty("task_scale_writers_enabled", "false")
                 .setCatalogSessionProperty("hive", "target_max_file_size", maxSize.toString())
@@ -1929,8 +2015,8 @@ public void testTargetMaxFileSizePartitioned()
 
         // verify the default behavior is one file per node per partition
         Session session = Session.builder(getSession())
-                .setSystemProperty("task_writer_count", "1")
-                .setSystemProperty("task_partitioned_writer_count", "1")
+                .setSystemProperty("task_min_writer_count", "1")
+                .setSystemProperty("task_max_writer_count", "1")
                 // task scale writers should be disabled since we want to write a single file
                 .setSystemProperty("task_scale_writers_enabled", "false")
                 .setSystemProperty("scale_writers", "false")
@@ -1945,8 +2031,8 @@ public void testTargetMaxFileSizePartitioned()
         // Writer writes chunks of rows that are about 1MB
         DataSize maxSize = DataSize.of(1, MEGABYTE);
         session = Session.builder(getSession())
-                .setSystemProperty("task_writer_count", "1")
-                .setSystemProperty("task_partitioned_writer_count", "1")
+                .setSystemProperty("task_min_writer_count", "1")
+                .setSystemProperty("task_max_writer_count", "1")
                 // task scale writers should be disabled since we want to write with a single task writer
                 .setSystemProperty("task_scale_writers_enabled", "false")
                 .setSystemProperty("use_preferred_write_partitioning", "false")
@@ -2065,23 +2151,17 @@ public void testCreateTableNonSupportedVarcharColumn()
     @Test
     public void testEmptyBucketedTable()
     {
-        // create empty bucket files for all storage formats and compression codecs
-        for (HiveStorageFormat storageFormat : HiveStorageFormat.values()) {
-            if (storageFormat == REGEX) {
-                // REGEX format is readonly
-                continue;
-            }
-            for (HiveCompressionCodec compressionCodec : HiveCompressionCodec.values()) {
-                if ((storageFormat == HiveStorageFormat.AVRO) && (compressionCodec == HiveCompressionCodec.LZ4)) {
-                    continue;
-                }
-                testEmptyBucketedTable(storageFormat, compressionCodec, true);
-            }
-            testEmptyBucketedTable(storageFormat, HiveCompressionCodec.GZIP, false);
-        }
+        // go through all storage formats to make sure the empty buckets are correctly created
+        testWithAllStorageFormats(this::testEmptyBucketedTable);
+    }
+
+    private void testEmptyBucketedTable(Session session, HiveStorageFormat storageFormat)
+    {
+        testEmptyBucketedTable(session, storageFormat, true);
+        testEmptyBucketedTable(session, storageFormat, false);
     }
 
-    private void testEmptyBucketedTable(HiveStorageFormat storageFormat, HiveCompressionCodec compressionCodec, boolean createEmpty)
+    private void testEmptyBucketedTable(Session baseSession, HiveStorageFormat storageFormat, boolean createEmpty)
     {
         String tableName = "test_empty_bucketed_table";
 
@@ -2106,10 +2186,9 @@ private void testEmptyBucketedTable(HiveStorageFormat storageFormat, HiveCompres
         assertEquals(computeActual("SELECT * from " + tableName).getRowCount(), 0);
 
         // make sure that we will get one file per bucket regardless of writer count configured
-        Session session = Session.builder(getSession())
-                .setSystemProperty("task_writer_count", "4")
+        Session session = Session.builder(baseSession)
+                .setSystemProperty("task_min_writer_count", "4")
                 .setCatalogSessionProperty(catalog, "create_empty_bucket_files", String.valueOf(createEmpty))
-                .setCatalogSessionProperty(catalog, "compression_codec", compressionCodec.name())
                 .build();
         assertUpdate(session, "INSERT INTO " + tableName + " VALUES ('a0', 'b0', 'c0')", 1);
         assertUpdate(session, "INSERT INTO " + tableName + " VALUES ('a1', 'b1', 'c1')", 1);
@@ -2154,7 +2233,7 @@ private void testBucketedTable(Session session, HiveStorageFormat storageFormat,
                 ") t (bucket_key, col_1, col_2)";
 
         // make sure that we will get one file per bucket regardless of writer count configured
-        Session parallelWriter = Session.builder(getParallelWriteSession())
+        Session parallelWriter = Session.builder(getParallelWriteSession(session))
                 .setCatalogSessionProperty(catalog, "create_empty_bucket_files", String.valueOf(createEmpty))
                 .build();
         assertUpdate(parallelWriter, createTable, 3);
@@ -2383,7 +2462,7 @@ private void testCreatePartitionedBucketedTableAsFewRows(Session session, HiveSt
 
         assertUpdate(
                 // make sure that we will get one file per bucket regardless of writer count configured
-                Session.builder(getParallelWriteSession())
+                Session.builder(getParallelWriteSession(session))
                         .setCatalogSessionProperty(catalog, "create_empty_bucket_files", String.valueOf(createEmpty))
                         .build(),
                 createTable,
@@ -2419,7 +2498,7 @@ private void testCreatePartitionedBucketedTableAs(HiveStorageFormat storageForma
 
         assertUpdate(
                 // make sure that we will get one file per bucket regardless of writer count configured
-                getParallelWriteSession(),
+                getParallelWriteSession(getSession()),
                 createTable,
                 "SELECT count(*) FROM orders");
 
@@ -2452,7 +2531,7 @@ private void testCreatePartitionedBucketedTableWithNullsAs(HiveStorageFormat sto
                 "FROM tpch.tiny.orders";
 
         assertUpdate(
-                getParallelWriteSession(),
+                getParallelWriteSession(getSession()),
                 createTable,
                 "SELECT count(*) FROM orders");
 
@@ -2504,7 +2583,7 @@ public void testUnpartitionedInsertWithMultipleFiles()
     private Session singleWriterWithTinyTargetFileSize()
     {
         return Session.builder(getSession())
-                .setSystemProperty("task_writer_count", "1")
+                .setSystemProperty("task_min_writer_count", "1")
                 .setSystemProperty("task_scale_writers_enabled", "false")
                 .setSystemProperty("query_max_memory_per_node", "100MB")
                 .setCatalogSessionProperty(catalog, "target_max_file_size", "1B")
@@ -2544,11 +2623,12 @@ private void testInsertIntoPartitionedBucketedTableFromBucketedTable(HiveStorage
                     "SELECT custkey, comment, orderstatus " +
                     "FROM tpch.tiny.orders";
 
-            assertUpdate(getParallelWriteSession(), createSourceTable, "SELECT count(*) FROM orders");
-            assertUpdate(getParallelWriteSession(), createTargetTable, "SELECT count(*) FROM orders");
+            Session session = getParallelWriteSession(getSession());
+            assertUpdate(session, createSourceTable, "SELECT count(*) FROM orders");
+            assertUpdate(session, createTargetTable, "SELECT count(*) FROM orders");
 
-            transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getAccessControl()).execute(
-                    getParallelWriteSession(),
+            transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getMetadata(), getQueryRunner().getAccessControl()).execute(
+                    session,
                     transactionalSession -> {
                         assertUpdate(
                                 transactionalSession,
@@ -2593,7 +2673,7 @@ private void testCreatePartitionedBucketedTableAsWithUnionAll(HiveStorageFormat
 
         assertUpdate(
                 // make sure that we will get one file per bucket regardless of writer count configured
-                getParallelWriteSession(),
+                getParallelWriteSession(getSession()),
                 createTable,
                 "SELECT count(*) FROM orders");
 
@@ -2757,7 +2837,7 @@ private void testInsertPartitionedBucketedTableFewRows(Session session, HiveStor
 
         assertUpdate(
                 // make sure that we will get one file per bucket regardless of writer count configured
-                getParallelWriteSession(),
+                getParallelWriteSession(session),
                 "INSERT INTO " + tableName + " " +
                         "VALUES " +
                         "  (VARCHAR 'a', VARCHAR 'b', VARCHAR 'c'), " +
@@ -2902,29 +2982,28 @@ public void testRegisterPartitionWithNullArgument()
     @Test
     public void testCreateEmptyBucketedPartition()
     {
-        for (TestingHiveStorageFormat storageFormat : getAllTestingHiveStorageFormat()) {
-            testCreateEmptyBucketedPartition(storageFormat.getFormat());
-        }
+        testWithAllStorageFormats(this::testCreateEmptyBucketedPartition);
     }
 
-    private void testCreateEmptyBucketedPartition(HiveStorageFormat storageFormat)
+    private void testCreateEmptyBucketedPartition(Session session, HiveStorageFormat storageFormat)
     {
         String tableName = "test_insert_empty_partitioned_bucketed_table";
-        createPartitionedBucketedTable(tableName, storageFormat);
+        createPartitionedBucketedTable(session, tableName, storageFormat);
 
         List<String> orderStatusList = ImmutableList.of("F", "O", "P");
         for (int i = 0; i < orderStatusList.size(); i++) {
             String sql = format("CALL system.create_empty_partition('%s', '%s', ARRAY['orderstatus'], ARRAY['%s'])", TPCH_SCHEMA, tableName, orderStatusList.get(i));
-            assertUpdate(sql);
+            assertUpdate(session, sql);
             assertQuery(
+                    session,
                     format("SELECT count(*) FROM \"%s$partitions\"", tableName),
                     "SELECT " + (i + 1));
 
-            assertQueryFails(sql, "Partition already exists.*");
+            assertQueryFails(session, sql, "Partition already exists.*");
         }
 
-        assertUpdate("DROP TABLE " + tableName);
-        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+        assertUpdate(session, "DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(session, tableName));
     }
 
     @Test
@@ -2953,14 +3032,14 @@ public void testInsertPartitionedBucketedTable()
     private void testInsertPartitionedBucketedTable(HiveStorageFormat storageFormat)
     {
         String tableName = "test_insert_partitioned_bucketed_table";
-        createPartitionedBucketedTable(tableName, storageFormat);
+        createPartitionedBucketedTable(getSession(), tableName, storageFormat);
 
         List<String> orderStatusList = ImmutableList.of("F", "O", "P");
         for (int i = 0; i < orderStatusList.size(); i++) {
             String orderStatus = orderStatusList.get(i);
             assertUpdate(
                     // make sure that we will get one file per bucket regardless of writer count configured
-                    getParallelWriteSession(),
+                    getParallelWriteSession(getSession()),
                     format(
                             "INSERT INTO " + tableName + " " +
                                     "SELECT custkey, custkey AS custkey2, comment, orderstatus " +
@@ -2976,19 +3055,20 @@ private void testInsertPartitionedBucketedTable(HiveStorageFormat storageFormat)
         assertFalse(getQueryRunner().tableExists(getSession(), tableName));
     }
 
-    private void createPartitionedBucketedTable(String tableName, HiveStorageFormat storageFormat)
+    private void createPartitionedBucketedTable(Session session, String tableName, HiveStorageFormat storageFormat)
     {
-        assertUpdate("" +
+        assertUpdate(
+                session,
                 "CREATE TABLE " + tableName + " (" +
-                "  custkey bigint," +
-                "  custkey2 bigint," +
-                "  comment varchar," +
-                "  orderstatus varchar)" +
-                "WITH (" +
-                "format = '" + storageFormat + "', " +
-                "partitioned_by = ARRAY[ 'orderstatus' ], " +
-                "bucketed_by = ARRAY[ 'custkey', 'custkey2' ], " +
-                "bucket_count = 11)");
+                        "  custkey bigint," +
+                        "  custkey2 bigint," +
+                        "  comment varchar," +
+                        "  orderstatus varchar)" +
+                        "WITH (" +
+                        "format = '" + storageFormat + "', " +
+                        "partitioned_by = ARRAY[ 'orderstatus' ], " +
+                        "bucketed_by = ARRAY[ 'custkey', 'custkey2' ], " +
+                        "bucket_count = 11)");
     }
 
     @Test
@@ -3018,7 +3098,7 @@ private void testInsertPartitionedBucketedTableWithUnionAll(HiveStorageFormat st
             String orderStatus = orderStatusList.get(i);
             assertUpdate(
                     // make sure that we will get one file per bucket regardless of writer count configured
-                    getParallelWriteSession(),
+                    getParallelWriteSession(getSession()),
                     format(
                             "INSERT INTO " + tableName + " " +
                                     "SELECT custkey, custkey AS custkey2, comment, orderstatus " +
@@ -3042,7 +3122,7 @@ private void testInsertPartitionedBucketedTableWithUnionAll(HiveStorageFormat st
     public void testInsertTwiceToSamePartitionedBucket()
     {
         String tableName = "test_insert_twice_to_same_partitioned_bucket";
-        createPartitionedBucketedTable(tableName, HiveStorageFormat.RCBINARY);
+        createPartitionedBucketedTable(getSession(), tableName, HiveStorageFormat.RCBINARY);
 
         String insert = "INSERT INTO " + tableName +
                 " VALUES (1, 1, 'first_comment', 'F'), (2, 2, 'second_comment', 'G')";
@@ -3700,7 +3780,7 @@ private TableMetadata getTableMetadata(String catalog, String schema, String tab
         Session session = getSession();
         Metadata metadata = getDistributedQueryRunner().getCoordinator().getMetadata();
 
-        return transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getAccessControl())
+        return transaction(getQueryRunner().getTransactionManager(), metadata, getQueryRunner().getAccessControl())
                 .readOnly()
                 .execute(session, transactionSession -> {
                     Optional<TableHandle> tableHandle = metadata.getTableHandle(transactionSession, new QualifiedObjectName(catalog, schema, tableName));
@@ -3714,7 +3794,7 @@ private Object getHiveTableProperty(String tableName, Function<HiveTableHandle,
         Session session = getSession();
         Metadata metadata = getDistributedQueryRunner().getCoordinator().getMetadata();
 
-        return transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getAccessControl())
+        return transaction(getQueryRunner().getTransactionManager(), metadata, getQueryRunner().getAccessControl())
                 .readOnly()
                 .execute(session, transactionSession -> {
                     QualifiedObjectName name = new QualifiedObjectName(catalog, TPCH_SCHEMA, tableName);
@@ -3978,27 +4058,19 @@ public void testBucketedExecution()
     }
 
     @Test
-    public void testScaleWriters()
-    {
-        testWithAllStorageFormats(this::testSingleWriter);
-        testWithAllStorageFormats(this::testMultipleWriters);
-        testWithAllStorageFormats(this::testMultipleWritersWithSkewedData);
-    }
-
-    protected void testSingleWriter(Session session, HiveStorageFormat storageFormat)
+    public void testSingleWriter()
     {
         try {
-            // small table that will only have one writer
-            @Language("SQL") String createTableSql = format("" +
-                            "CREATE TABLE scale_writers_small WITH (format = '%s') AS " +
-                            "SELECT * FROM tpch.tiny.orders",
-                    storageFormat);
+            // Small table that will only have one writer
+            @Language("SQL") String createTableSql = "" +
+                            "CREATE TABLE scale_writers_small WITH (format = 'PARQUET') AS " +
+                            "SELECT * FROM tpch.tiny.orders";
             assertUpdate(
-                    Session.builder(session)
-                            .setSystemProperty("task_writer_count", "1")
+                    Session.builder(getSession())
+                            .setSystemProperty("task_min_writer_count", "1")
                             .setSystemProperty("scale_writers", "true")
                             .setSystemProperty("task_scale_writers_enabled", "false")
-                            .setSystemProperty("writer_min_size", "32MB")
+                            .setSystemProperty("writer_scaling_min_data_processed", "100MB")
                             .build(),
                     createTableSql,
                     (long) computeActual("SELECT count(*) FROM tpch.tiny.orders").getOnlyValue());
@@ -4010,24 +4082,23 @@ protected void testSingleWriter(Session session, HiveStorageFormat storageFormat
         }
     }
 
-    private void testMultipleWriters(Session session, HiveStorageFormat storageFormat)
+    @Test
+    public void testMultipleWriters()
     {
         try {
-            // large table that will scale writers to multiple machines
-            @Language("SQL") String createTableSql = format("" +
-                            "CREATE TABLE scale_writers_large WITH (format = '%s') AS " +
-                            "SELECT * FROM tpch.sf1.orders",
-                    storageFormat);
+            // We need to use large table (sf2) to see the effect. Otherwise, a single writer will write the entire
+            // data before ScaledWriterScheduler is able to scale it to multiple machines.
+            @Language("SQL") String createTableSql = "CREATE TABLE scale_writers_large WITH (format = 'PARQUET') AS " +
+                    "SELECT * FROM tpch.sf2.orders";
             assertUpdate(
-                    Session.builder(session)
-                            .setSystemProperty("task_writer_count", "1")
+                    Session.builder(getSession())
+                            .setSystemProperty("task_min_writer_count", "1")
                             .setSystemProperty("scale_writers", "true")
                             .setSystemProperty("task_scale_writers_enabled", "false")
-                            .setSystemProperty("writer_min_size", "1MB")
-                            .setCatalogSessionProperty(catalog, "parquet_writer_block_size", "4MB")
+                            .setSystemProperty("writer_scaling_min_data_processed", "1MB")
                             .build(),
                     createTableSql,
-                    (long) computeActual("SELECT count(*) FROM tpch.sf1.orders").getOnlyValue());
+                    (long) computeActual("SELECT count(*) FROM tpch.sf2.orders").getOnlyValue());
 
             long files = (long) computeScalar("SELECT count(DISTINCT \"$path\") FROM scale_writers_large");
             long workers = (long) computeScalar("SELECT count(*) FROM system.runtime.nodes");
@@ -4038,24 +4109,24 @@ private void testMultipleWriters(Session session, HiveStorageFormat storageForma
         }
     }
 
-    private void testMultipleWritersWithSkewedData(Session session, HiveStorageFormat storageFormat)
+    @Test
+    public void testMultipleWritersWithSkewedData()
     {
         try {
-            // skewed table that will scale writers to multiple machines
-            String selectSql = "SELECT t1.* FROM (SELECT *, case when orderkey >= 0 then 1 else orderkey end as join_key FROM tpch.sf1.orders) t1 " +
-                               "INNER JOIN (SELECT orderkey FROM tpch.sf1.orders) t2 " +
+            // We need to use large table (sf2) to see the effect. Otherwise, a single writer will write the entire
+            // data before ScaledWriterScheduler is able to scale it to multiple machines.
+            // Skewed table that will scale writers to multiple machines.
+            String selectSql = "SELECT t1.* FROM (SELECT *, case when orderkey >= 0 then 1 else orderkey end as join_key FROM tpch.sf2.orders) t1 " +
+                               "INNER JOIN (SELECT orderkey FROM tpch.sf2.orders) t2 " +
                                "ON t1.join_key = t2.orderkey";
-            @Language("SQL") String createTableSql = format("" +
-                            "CREATE TABLE scale_writers_skewed WITH (format = '%s') AS " + selectSql,
-                    storageFormat);
+            @Language("SQL") String createTableSql = "CREATE TABLE scale_writers_skewed WITH (format = 'PARQUET') AS " + selectSql;
             assertUpdate(
-                    Session.builder(session)
-                            .setSystemProperty("task_writer_count", "1")
+                    Session.builder(getSession())
+                            .setSystemProperty("task_min_writer_count", "1")
                             .setSystemProperty("scale_writers", "true")
                             .setSystemProperty("task_scale_writers_enabled", "false")
-                            .setSystemProperty("writer_min_size", "1MB")
+                            .setSystemProperty("writer_scaling_min_data_processed", "1MB")
                             .setSystemProperty("join_distribution_type", "PARTITIONED")
-                            .setCatalogSessionProperty(catalog, "parquet_writer_block_size", "4MB")
                             .build(),
                     createTableSql,
                     (long) computeActual("SELECT count(*) FROM (" + selectSql + ")")
@@ -4076,7 +4147,7 @@ public void testMultipleWritersWhenTaskScaleWritersIsEnabled()
     {
         long workers = (long) computeScalar("SELECT count(*) FROM system.runtime.nodes");
         int taskMaxScaleWriterCount = 4;
-        testTaskScaleWriters(getSession(), DataSize.of(200, KILOBYTE), taskMaxScaleWriterCount, false)
+        testTaskScaleWriters(getSession(), DataSize.of(200, KILOBYTE), taskMaxScaleWriterCount, false, DataSize.of(64, GIGABYTE))
                 .isBetween(workers + 1, workers * taskMaxScaleWriterCount);
     }
 
@@ -4085,7 +4156,8 @@ public void testTaskWritersDoesNotScaleWithLargeMinWriterSize()
     {
         long workers = (long) computeScalar("SELECT count(*) FROM system.runtime.nodes");
         // In the case of streaming, the number of writers is equal to the number of workers
-        testTaskScaleWriters(getSession(), DataSize.of(2, GIGABYTE), 4, false).isEqualTo(workers);
+        testTaskScaleWriters(getSession(), DataSize.of(2, GIGABYTE), 4, false, DataSize.of(64, GIGABYTE))
+                .isEqualTo(workers);
     }
 
     @Test
@@ -4096,10 +4168,20 @@ public void testWritersAcrossMultipleWorkersWhenScaleWritersIsEnabled()
         // It is only applicable for pipeline execution mode, since we are testing
         // when both "scaleWriters" and "taskScaleWriters" are enabled, the writers are
         // scaling upto multiple worker nodes.
-        testTaskScaleWriters(getSession(), DataSize.of(200, KILOBYTE), taskMaxScaleWriterCount, true)
+        testTaskScaleWriters(getSession(), DataSize.of(200, KILOBYTE), taskMaxScaleWriterCount, true, DataSize.of(64, GIGABYTE))
                 .isBetween((long) taskMaxScaleWriterCount + workers, workers * taskMaxScaleWriterCount);
     }
 
+    @Test
+    public void testMultipleWritersWhenTaskScaleWritersIsEnabledWithMemoryLimit()
+    {
+        long workers = (long) computeScalar("SELECT count(*) FROM system.runtime.nodes");
+        int taskMaxScaleWriterCount = 4;
+        testTaskScaleWriters(getSession(), DataSize.of(200, KILOBYTE), taskMaxScaleWriterCount, false, DataSize.of(256, MEGABYTE))
+                // There shouldn't be no scaling as the memory limit is too low
+                .isBetween(0L, workers);
+    }
+
     @DataProvider(name = "taskWritersLimitParams")
     public Object[][] prepareScaledWritersOption()
     {
@@ -4109,38 +4191,41 @@ public Object[][] prepareScaledWritersOption()
     @Test(dataProvider = "taskWritersLimitParams")
     public void testWriterTasksCountLimitUnpartitioned(boolean scaleWriters, boolean redistributeWrites, int expectedFilesCount)
     {
-        testLimitWriterTasks(2, expectedFilesCount, scaleWriters, redistributeWrites, false);
+        testLimitWriterTasks(2, expectedFilesCount, scaleWriters, redistributeWrites, false, DataSize.of(1, MEGABYTE));
     }
 
     @Test
     public void testWriterTasksCountLimitPartitionedScaleWritersDisabled()
     {
-        testLimitWriterTasks(2, 2, false, true, true);
+        testLimitWriterTasks(2, 2, false, true, true, DataSize.of(1, MEGABYTE));
     }
 
     @Test
     public void testWriterTasksCountLimitPartitionedScaleWritersEnabled()
     {
-        testLimitWriterTasks(2, 2, true, true, true);
+        testLimitWriterTasks(2, 4, true, true, true, DataSize.of(1, MEGABYTE));
+        // Since we track page size for scaling writer instead of actual compressed output file size, we need to have a
+        // larger threshold for writerScalingMinDataProcessed. This way we can ensure that the writer scaling is not triggered.
+        testLimitWriterTasks(2, 2, true, true, true, DataSize.of(128, MEGABYTE));
     }
 
-    private void testLimitWriterTasks(int maxWriterTasks, int expectedFilesCount, boolean scaleWritersEnabled, boolean redistributeWrites, boolean partitioned)
+    private void testLimitWriterTasks(int maxWriterTasks, int expectedFilesCount, boolean scaleWritersEnabled, boolean redistributeWrites, boolean partitioned, DataSize writerScalingMinDataProcessed)
     {
         Session session = Session.builder(getSession())
                 .setSystemProperty(SCALE_WRITERS, Boolean.toString(scaleWritersEnabled))
                 .setSystemProperty(MAX_WRITER_TASKS_COUNT, Integer.toString(maxWriterTasks))
                 .setSystemProperty(REDISTRIBUTE_WRITES, Boolean.toString(redistributeWrites))
-                .setSystemProperty(TASK_WRITER_COUNT, "1")
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
-                .setSystemProperty(WRITER_MIN_SIZE, "1MB")
+                .setSystemProperty(TASK_MIN_WRITER_COUNT, "1")
+                .setSystemProperty(WRITER_SCALING_MIN_DATA_PROCESSED, writerScalingMinDataProcessed.toString())
                 .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "false")
+                .setSystemProperty(SKEWED_PARTITION_MIN_DATA_PROCESSED_REBALANCE_THRESHOLD, "10MB")
                 .build();
         String tableName = "writing_tasks_limit_%s".formatted(randomNameSuffix());
         @Language("SQL") String createTableSql = format(
-                "CREATE TABLE %s WITH (format = 'ORC' %s) AS SELECT *, mod(orderkey, 2) as part_key FROM tpch.sf1.orders LIMIT",
+                "CREATE TABLE %s WITH (format = 'ORC' %s) AS SELECT *, mod(orderkey, 2) as part_key FROM tpch.sf2.orders LIMIT",
                 tableName, partitioned ? ", partitioned_by = ARRAY['part_key']" : "");
         try {
-            assertUpdate(session, createTableSql, (long) computeActual("SELECT count(*) FROM tpch.sf1.orders").getOnlyValue());
+            assertUpdate(session, createTableSql, (long) computeActual("SELECT count(*) FROM tpch.sf2.orders").getOnlyValue());
             long files = (long) computeScalar("SELECT count(DISTINCT \"$path\") FROM %s".formatted(tableName));
             assertEquals(files, expectedFilesCount);
         }
@@ -4151,21 +4236,23 @@ private void testLimitWriterTasks(int maxWriterTasks, int expectedFilesCount, bo
 
     protected AbstractLongAssert<?> testTaskScaleWriters(
             Session session,
-            DataSize writerMinSize,
+            DataSize writerScalingMinDataProcessed,
             int taskMaxScaleWriterCount,
-            boolean scaleWriters)
+            boolean scaleWriters,
+            DataSize queryMaxMemory)
     {
         String tableName = "task_scale_writers_" + randomNameSuffix();
         try {
             @Language("SQL") String createTableSql = format(
-                    "CREATE TABLE %s WITH (format = 'ORC') AS SELECT * FROM tpch.sf5.orders",
+                    "CREATE TABLE %s WITH (format = 'ORC') AS SELECT * FROM tpch.sf2.orders",
                     tableName);
             assertUpdate(
                     Session.builder(session)
                             .setSystemProperty(SCALE_WRITERS, String.valueOf(scaleWriters))
                             .setSystemProperty(TASK_SCALE_WRITERS_ENABLED, "true")
-                            .setSystemProperty(WRITER_MIN_SIZE, writerMinSize.toString())
-                            .setSystemProperty(TASK_SCALE_WRITERS_MAX_WRITER_COUNT, String.valueOf(taskMaxScaleWriterCount))
+                            .setSystemProperty(WRITER_SCALING_MIN_DATA_PROCESSED, writerScalingMinDataProcessed.toString())
+                            .setSystemProperty(TASK_MAX_WRITER_COUNT, String.valueOf(taskMaxScaleWriterCount))
+                            .setSystemProperty(QUERY_MAX_MEMORY_PER_NODE, queryMaxMemory.toString())
                             // Set the value higher than sf1 input data size such that fault-tolerant scheduler
                             // shouldn't add new task and scaling only happens through the local scaling exchange.
                             .setSystemProperty(FAULT_TOLERANT_EXECUTION_ARBITRARY_DISTRIBUTION_COMPUTE_TASK_TARGET_SIZE_MIN, "2GB")
@@ -4174,13 +4261,9 @@ protected AbstractLongAssert<?> testTaskScaleWriters(
                             .setSystemProperty(FAULT_TOLERANT_EXECUTION_ARBITRARY_DISTRIBUTION_WRITE_TASK_TARGET_SIZE_MAX, "2GB")
                             .setSystemProperty(FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_COMPUTE_TASK_TARGET_SIZE, "2GB")
                             .setSystemProperty(FAULT_TOLERANT_EXECUTION_HASH_DISTRIBUTION_WRITE_TASK_TARGET_SIZE, "2GB")
-                            // Set the value of orc strip size low to increase the frequency at which
-                            // physicalWrittenDataSize is updated through ConnectorPageSink#getCompletedBytes()
-                            .setCatalogSessionProperty(catalog, "orc_optimized_writer_min_stripe_size", "2MB")
-                            .setCatalogSessionProperty(catalog, "orc_optimized_writer_max_stripe_size", "2MB")
                             .build(),
                     createTableSql,
-                    (long) computeActual("SELECT count(*) FROM tpch.sf5.orders").getOnlyValue());
+                    3000000);
 
             long files = (long) computeScalar("SELECT count(DISTINCT \"$path\") FROM " + tableName);
             return assertThat(files);
@@ -4282,6 +4365,33 @@ public void testShowCreateTable()
         assertEquals(getOnlyElement(actualResult.getOnlyColumnAsSet()), createTableSql);
     }
 
+    @Test
+    public void testShowCreateTableWithColumnProperties()
+    {
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_show_create_table_with_column_properties",
+                "(a INT, b INT WITH (partition_projection_type = 'INTEGER', partition_projection_range = ARRAY['0', '10'])) " +
+                        "WITH (" +
+                        "    partition_projection_enabled = true," +
+                        "    partitioned_by = ARRAY['b']," +
+                        "    partition_projection_location_template = 's3://example/${b}')")) {
+            String result = (String) computeScalar("SHOW CREATE TABLE " + table.getName());
+            assertEquals(
+                    result,
+                    "CREATE TABLE hive.tpch." + table.getName() + " (\n" +
+                            "   a integer,\n" +
+                            "   b integer WITH ( partition_projection_range = ARRAY['0','10'], partition_projection_type = 'INTEGER' )\n" +
+                            ")\n" +
+                            "WITH (\n" +
+                            "   format = 'ORC',\n" +
+                            "   partition_projection_enabled = true,\n" +
+                            "   partition_projection_location_template = 's3://example/${b}',\n" +
+                            "   partitioned_by = ARRAY['b']\n" +
+                            ")");
+        }
+    }
+
     private void testCreateExternalTable(
             String tableName,
             String fileContents,
@@ -4883,7 +4993,7 @@ public void testDeleteAndInsert()
                 .getMaterializedRows();
 
         try {
-            transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getAccessControl())
+            transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getMetadata(), getQueryRunner().getAccessControl())
                     .execute(session, transactionSession -> {
                         assertUpdate(transactionSession, "DELETE FROM tmp_delete_insert WHERE z >= 2");
                         assertUpdate(transactionSession, "INSERT INTO tmp_delete_insert VALUES (203, 2), (204, 2), (205, 2), (301, 2), (302, 3)", 5);
@@ -4901,7 +5011,7 @@ public void testDeleteAndInsert()
         MaterializedResult actualAfterRollback = computeActual(session, "SELECT * FROM tmp_delete_insert");
         assertEqualsIgnoreOrder(actualAfterRollback, expectedBefore);
 
-        transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getAccessControl())
+        transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getMetadata(), getQueryRunner().getAccessControl())
                 .execute(session, transactionSession -> {
                     assertUpdate(transactionSession, "DELETE FROM tmp_delete_insert WHERE z >= 2");
                     assertUpdate(transactionSession, "INSERT INTO tmp_delete_insert VALUES (203, 2), (204, 2), (205, 2), (301, 2), (302, 3)", 5);
@@ -4929,7 +5039,7 @@ public void testCreateAndInsert()
                 .build()
                 .getMaterializedRows();
 
-        transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getAccessControl())
+        transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getMetadata(), getQueryRunner().getAccessControl())
                 .execute(session, transactionSession -> {
                     assertUpdate(
                             transactionSession,
@@ -5034,6 +5144,30 @@ public void testAvroTypeValidation()
         assertQueryFails("CREATE TABLE test_avro_types WITH (format = 'AVRO') AS SELECT cast(42 AS smallint) z", "Column 'z' is smallint, which is not supported by Avro. Use integer instead.");
     }
 
+    @Test
+    public void testAvroTimestampUpCasting()
+    {
+        @Language("SQL") String createTable = "CREATE TABLE test_avro_timestamp_upcasting WITH (format = 'AVRO') AS SELECT TIMESTAMP '1994-09-27 11:23:45.678' my_timestamp";
+
+        //avro only stores as millis
+        assertUpdate(createTable, 1);
+
+        // access with multiple precisions
+        assertQuery(withTimestampPrecision(getSession(), HiveTimestampPrecision.MILLISECONDS),
+                "SELECT * from test_avro_timestamp_upcasting",
+                "VALUES (TIMESTAMP '1994-09-27 11:23:45.678')");
+
+        // access with multiple precisions
+        assertQuery(withTimestampPrecision(getSession(), HiveTimestampPrecision.MICROSECONDS),
+                "SELECT * from test_avro_timestamp_upcasting",
+                "VALUES (TIMESTAMP '1994-09-27 11:23:45.678000')");
+
+        // access with multiple precisions
+        assertQuery(withTimestampPrecision(getSession(), HiveTimestampPrecision.NANOSECONDS),
+                "SELECT * from test_avro_timestamp_upcasting",
+                "VALUES (TIMESTAMP '1994-09-27 11:23:45.678000000')");
+    }
+
     @Test
     public void testOrderByChar()
     {
@@ -5153,21 +5287,7 @@ public Object[][] timestampPrecisionAndValues()
     @Test(dataProvider = "timestampPrecisionAndValues")
     public void testParquetTimestampPredicatePushdown(HiveTimestampPrecision timestampPrecision, LocalDateTime value)
     {
-        doTestParquetTimestampPredicatePushdown(getSession(), timestampPrecision, value);
-    }
-
-    @Test(dataProvider = "timestampPrecisionAndValues")
-    public void testParquetTimestampPredicatePushdownOptimizedWriter(HiveTimestampPrecision timestampPrecision, LocalDateTime value)
-    {
-        Session session = Session.builder(getSession())
-                .setCatalogSessionProperty("hive", "parquet_optimized_writer_enabled", "true")
-                .build();
-        doTestParquetTimestampPredicatePushdown(session, timestampPrecision, value);
-    }
-
-    private void doTestParquetTimestampPredicatePushdown(Session baseSession, HiveTimestampPrecision timestampPrecision, LocalDateTime value)
-    {
-        Session session = withTimestampPrecision(baseSession, timestampPrecision);
+        Session session = withTimestampPrecision(getSession(), timestampPrecision);
         String tableName = "test_parquet_timestamp_predicate_pushdown_" + randomNameSuffix();
         assertUpdate("DROP TABLE IF EXISTS " + tableName);
         assertUpdate("CREATE TABLE " + tableName + " (t TIMESTAMP) WITH (format = 'PARQUET')");
@@ -5264,63 +5384,14 @@ public void testParquetLongDecimalPredicatePushdown()
 
     @Test
     public void testParquetDictionaryPredicatePushdown()
-    {
-        testParquetDictionaryPredicatePushdown(getSession());
-    }
-
-    @Test
-    public void testParquetDictionaryPredicatePushdownWithOptimizedWriter()
-    {
-        testParquetDictionaryPredicatePushdown(
-                Session.builder(getSession())
-                        .setCatalogSessionProperty("hive", "parquet_optimized_writer_enabled", "true")
-                        .build());
-    }
-
-    private void testParquetDictionaryPredicatePushdown(Session session)
     {
         String tableName = "test_parquet_dictionary_pushdown_" + randomNameSuffix();
-        assertUpdate(session, "DROP TABLE IF EXISTS " + tableName);
-        assertUpdate(session, "CREATE TABLE " + tableName + " (n BIGINT) WITH (format = 'PARQUET')");
-        assertUpdate(session, "INSERT INTO " + tableName + " VALUES 1, 1, 2, 2, 4, 4, 5, 5", 8);
+        assertUpdate("DROP TABLE IF EXISTS " + tableName);
+        assertUpdate("CREATE TABLE " + tableName + " (n BIGINT) WITH (format = 'PARQUET')");
+        assertUpdate("INSERT INTO " + tableName + " VALUES 1, 1, 2, 2, 4, 4, 5, 5", 8);
         assertNoDataRead("SELECT * FROM " + tableName + " WHERE n = 3");
     }
 
-    @Test
-    public void testParquetOnlyNullsRowGroupPruning()
-    {
-        String tableName = "test_primitive_column_nulls_pruning_" + randomNameSuffix();
-        assertUpdate("CREATE TABLE " + tableName + " (col BIGINT) WITH (format = 'PARQUET')");
-        assertUpdate("INSERT INTO " + tableName + " SELECT * FROM unnest(repeat(NULL, 4096))", 4096);
-        assertNoDataRead("SELECT * FROM " + tableName + " WHERE col IS NOT NULL");
-
-        tableName = "test_nested_column_nulls_pruning_" + randomNameSuffix();
-        // Nested column `a` has nulls count of 4096 and contains only nulls
-        // Nested column `b` also has nulls count of 4096, but it contains non nulls as well
-        assertUpdate("CREATE TABLE " + tableName + " (col ROW(a BIGINT, b ARRAY(DOUBLE))) WITH (format = 'PARQUET')");
-        assertUpdate("INSERT INTO " + tableName + " SELECT * FROM unnest(transform(repeat(1, 4096), x -> ROW(ROW(NULL, ARRAY [NULL, rand()]))))", 4096);
-        // TODO replace with assertNoDataRead after nested column predicate pushdown
-        assertQueryStats(
-                getSession(),
-                "SELECT * FROM " + tableName + " WHERE col.a IS NOT NULL",
-                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
-                results -> assertThat(results.getRowCount()).isEqualTo(0));
-        assertQueryStats(
-                getSession(),
-                "SELECT * FROM " + tableName + " WHERE col.b IS NOT NULL",
-                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
-                results -> assertThat(results.getRowCount()).isEqualTo(4096));
-    }
-
-    private void assertNoDataRead(@Language("SQL") String sql)
-    {
-        assertQueryStats(
-                getSession(),
-                sql,
-                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isEqualTo(0),
-                results -> assertThat(results.getRowCount()).isEqualTo(0));
-    }
-
     private QueryInfo getQueryInfo(DistributedQueryRunner queryRunner, MaterializedResultWithQueryId queryResult)
     {
         return queryRunner.getCoordinator().getQueryManager().getFullQueryInfo(queryResult.getQueryId());
@@ -5473,89 +5544,180 @@ public void testBucketFilteringByInPredicate()
     }
 
     @Test
-    public void schemaMismatchesWithDereferenceProjections()
+    public void testSchemaMismatchesWithDereferenceProjections()
     {
-        for (TestingHiveStorageFormat format : getAllTestingHiveStorageFormat()) {
-            schemaMismatchesWithDereferenceProjections(format.getFormat());
-        }
+        testWithAllStorageFormats(this::testSchemaMismatchesWithDereferenceProjections);
     }
 
-    private void schemaMismatchesWithDereferenceProjections(HiveStorageFormat format)
+    private void testSchemaMismatchesWithDereferenceProjections(Session session, HiveStorageFormat format)
     {
         // Verify reordering of subfields between a partition column and a table column is not supported
         // eg. table column: a row(c varchar, b bigint), partition column: a row(b bigint, c varchar)
+        String tableName = "evolve_test_" + randomNameSuffix();
         try {
-            assertUpdate("CREATE TABLE evolve_test (dummy bigint, a row(b bigint, c varchar), d bigint) with (format = '" + format + "', partitioned_by=array['d'])");
-            assertUpdate("INSERT INTO evolve_test values (1, row(1, 'abc'), 1)", 1);
-            assertUpdate("ALTER TABLE evolve_test DROP COLUMN a");
-            assertUpdate("ALTER TABLE evolve_test ADD COLUMN a row(c varchar, b bigint)");
-            assertUpdate("INSERT INTO evolve_test values (2, row('def', 2), 2)", 1);
-            assertQueryFails("SELECT a.b FROM evolve_test where d = 1", ".*There is a mismatch between the table and partition schemas.*");
+            assertUpdate(session, "CREATE TABLE " + tableName + " (dummy bigint, a row(b bigint, c varchar), d bigint) with (format = '" + format + "', partitioned_by=array['d'])");
+            assertUpdate(session, "INSERT INTO " + tableName + " values (10, row(1, 'abc'), 1)", 1);
+            assertUpdate(session, "ALTER TABLE " + tableName + " DROP COLUMN a");
+            assertUpdate(session, "ALTER TABLE " + tableName + " ADD COLUMN a row(c varchar, b bigint)");
+            assertUpdate(session, "INSERT INTO " + tableName + " values (20, row('def', 2), 2)", 1);
+            assertQueryFails(session, "SELECT a.b FROM " + tableName + " where d = 1", ".*There is a mismatch between the table and partition schemas.*");
         }
         finally {
-            assertUpdate("DROP TABLE IF EXISTS evolve_test");
+            assertUpdate(session, "DROP TABLE IF EXISTS " + tableName);
         }
 
         // Subfield absent in partition schema is reported as null
         // i.e. "a.c" produces null for rows that were inserted before type of "a" was changed
         try {
-            assertUpdate("CREATE TABLE evolve_test (dummy bigint, a row(b bigint), d bigint) with (format = '" + format + "', partitioned_by=array['d'])");
-            assertUpdate("INSERT INTO evolve_test values (1, row(1), 1)", 1);
-            assertUpdate("ALTER TABLE evolve_test DROP COLUMN a");
-            assertUpdate("ALTER TABLE evolve_test ADD COLUMN a row(b bigint, c varchar)");
-            assertUpdate("INSERT INTO evolve_test values (2, row(2, 'def'), 2)", 1);
-            assertQuery("SELECT a.c FROM evolve_test", "SELECT 'def' UNION SELECT null");
+            assertUpdate(session, "CREATE TABLE " + tableName + " (dummy bigint, a row(b bigint), d bigint) with (format = '" + format + "', partitioned_by=array['d'])");
+            assertUpdate(session, "INSERT INTO " + tableName + " values (10, row(1), 1)", 1);
+            assertUpdate(session, "ALTER TABLE " + tableName + " DROP COLUMN a");
+            assertUpdate(session, "ALTER TABLE " + tableName + " ADD COLUMN a row(b bigint, c varchar)");
+            assertUpdate(session, "INSERT INTO " + tableName + " values (20, row(2, 'def'), 2)", 1);
+            assertQuery(session, "SELECT a.c FROM " + tableName, "SELECT 'def' UNION SELECT null");
         }
         finally {
-            assertUpdate("DROP TABLE IF EXISTS evolve_test");
+            assertUpdate(session, "DROP TABLE IF EXISTS " + tableName);
         }
 
         // Verify field access when the row evolves without changes to field type
         try {
-            assertUpdate("CREATE TABLE evolve_test (dummy bigint, a row(b bigint, c varchar), d bigint) with (format = '" + format + "', partitioned_by=array['d'])");
-            assertUpdate("INSERT INTO evolve_test values (1, row(1, 'abc'), 1)", 1);
-            assertUpdate("ALTER TABLE evolve_test DROP COLUMN a");
-            assertUpdate("ALTER TABLE evolve_test ADD COLUMN a row(b bigint, c varchar, e int)");
-            assertUpdate("INSERT INTO evolve_test values (2, row(2, 'def', 2), 2)", 1);
-            assertQuery("SELECT a.b FROM evolve_test", "VALUES 1, 2");
+            assertUpdate(session, "CREATE TABLE " + tableName + " (dummy bigint, a row(b bigint, c varchar), d bigint) with (format = '" + format + "', partitioned_by=array['d'])");
+            assertUpdate(session, "INSERT INTO " + tableName + " values (10, row(1, 'abc'), 1)", 1);
+            assertUpdate(session, "ALTER TABLE " + tableName + " DROP COLUMN a");
+            assertUpdate(session, "ALTER TABLE " + tableName + " ADD COLUMN a row(b bigint, c varchar, e int)");
+            assertUpdate(session, "INSERT INTO " + tableName + " values (20, row(2, 'def', 2), 2)", 1);
+            assertQuery(session, "SELECT a.b FROM " + tableName, "VALUES 1, 2");
         }
         finally {
-            assertUpdate("DROP TABLE IF EXISTS evolve_test");
+            assertUpdate(session, "DROP TABLE IF EXISTS " + tableName);
         }
     }
 
+    @Test
+    public void testReadWithPartitionSchemaMismatch()
+    {
+        testWithAllStorageFormats(this::testReadWithPartitionSchemaMismatch);
+
+        // test ORC in non-default configuration with by-name column mapping
+        Session orcUsingColumnNames = Session.builder(getSession())
+                .setCatalogSessionProperty(catalog, "orc_use_column_names", "true")
+                .build();
+        testWithStorageFormat(new TestingHiveStorageFormat(orcUsingColumnNames, ORC), this::testReadWithPartitionSchemaMismatchByName);
+
+        // test PARQUET in non-default configuration with by-index column mapping
+        Session parquetUsingColumnIndex = Session.builder(getSession())
+                .setCatalogSessionProperty(catalog, "parquet_use_column_names", "false")
+                .build();
+        testWithStorageFormat(new TestingHiveStorageFormat(parquetUsingColumnIndex, PARQUET), this::testReadWithPartitionSchemaMismatchByIndex);
+    }
+
+    private void testReadWithPartitionSchemaMismatch(Session session, HiveStorageFormat format)
+    {
+        if (isMappingByName(session, format)) {
+            testReadWithPartitionSchemaMismatchByName(session, format);
+        }
+        else {
+            testReadWithPartitionSchemaMismatchByIndex(session, format);
+        }
+    }
+
+    private boolean isMappingByName(Session session, HiveStorageFormat format)
+    {
+        return switch(format) {
+            case PARQUET -> true;
+            case AVRO -> true;
+            case JSON -> true;
+            case ORC -> false;
+            case RCBINARY -> false;
+            case RCTEXT -> false;
+            case SEQUENCEFILE -> false;
+            case OPENX_JSON -> false;
+            case TEXTFILE -> false;
+            case CSV -> false;
+            case REGEX -> false;
+        };
+    }
+
+    private void testReadWithPartitionSchemaMismatchByName(Session session, HiveStorageFormat format)
+    {
+        String tableName = testReadWithPartitionSchemaMismatchAddedColumns(session, format);
+
+        // with mapping by name also test behavior with dropping columns
+        // start with table with a, b, c, _part
+        // drop b
+        assertUpdate(session, "ALTER TABLE " + tableName + " DROP COLUMN b");
+        // create new partition
+        assertUpdate(session, "INSERT INTO " + tableName + " values (21, 22, 20)", 1); // a, c, _part
+        assertQuery(session, "SELECT a, c, _part FROM " + tableName, "VALUES (1, null, 0), (11, 13, 10), (21, 22, 20)");
+        assertQuery(session, "SELECT a, _part FROM " + tableName, "VALUES (1,  0), (11, 10), (21, 20)");
+        // add d
+        assertUpdate(session, "ALTER TABLE " + tableName + " ADD COLUMN d bigint");
+        // create new partition
+        assertUpdate(session, "INSERT INTO " + tableName + " values (31, 32, 33, 30)", 1); // a, c, d, _part
+        assertQuery(session, "SELECT a, c, d, _part FROM " + tableName, "VALUES (1, null, null, 0), (11, 13, null, 10), (21, 22, null, 20), (31, 32, 33, 30)");
+        assertQuery(session, "SELECT a, d, _part FROM " + tableName, "VALUES (1, null, 0), (11, null, 10), (21, null, 20), (31, 33, 30)");
+    }
+
+    private void testReadWithPartitionSchemaMismatchByIndex(Session session, HiveStorageFormat format)
+    {
+        // we are not dropping columns for format which use index based mapping as logic is confusing and not consistent between different formats
+        testReadWithPartitionSchemaMismatchAddedColumns(session, format);
+    }
+
+    private String testReadWithPartitionSchemaMismatchAddedColumns(Session session, HiveStorageFormat format)
+    {
+        String tableName = "read_with_partition_schema_mismatch_by_name_" + randomNameSuffix();
+        // create table with a, b, _part
+        assertUpdate(session, "CREATE TABLE " + tableName + " (a bigint, b bigint, _part bigint) with (format = '" + format + "', partitioned_by=array['_part'])");
+        // create new partition
+        assertUpdate(session, "INSERT INTO " + tableName + " values (1, 2, 0)", 1); // a, b, _part
+        assertQuery(session, "SELECT a, b, _part FROM " + tableName, "VALUES (1, 2, 0)");
+        assertQuery(session, "SELECT a, _part FROM " + tableName, "VALUES (1, 0)");
+        // add column c
+        assertUpdate(session, "ALTER TABLE " + tableName + " ADD COLUMN c bigint");
+        // create new partition
+        assertUpdate(session, "INSERT INTO " + tableName + " values (11, 12, 13, 10)", 1); // a, b, c, _part
+        assertQuery(session, "SELECT a, b, c, _part FROM " + tableName, "VALUES (1, 2, null, 0), (11, 12, 13, 10)");
+        assertQuery(session, "SELECT a, c, _part FROM " + tableName, "VALUES (1, null, 0), (11, 13, 10)");
+        assertQuery(session, "SELECT c, _part FROM " + tableName + " WHERE a < 7", "VALUES (null, 0)"); // common column used in WHERE but not in FROM
+        assertQuery(session, "SELECT a, _part FROM " + tableName + " WHERE c > 7", "VALUES (11, 10)"); // missing column used in WHERE but not in FROM
+        return tableName;
+    }
+
     @Test
     public void testSubfieldReordering()
     {
         // Validate for formats for which subfield access is name based
-        List<HiveStorageFormat> formats = ImmutableList.of(HiveStorageFormat.ORC, HiveStorageFormat.PARQUET);
+        List<HiveStorageFormat> formats = ImmutableList.of(HiveStorageFormat.ORC, HiveStorageFormat.PARQUET, HiveStorageFormat.AVRO);
+        String tableName = "evolve_test_" + randomNameSuffix();
 
         for (HiveStorageFormat format : formats) {
             // Subfields reordered in the file are read correctly. e.g. if partition column type is row(b bigint, c varchar) but the file
             // column type is row(c varchar, b bigint), "a.b" should read the correct field from the file.
             try {
-                assertUpdate("CREATE TABLE evolve_test (dummy bigint, a row(b bigint, c varchar)) with (format = '" + format + "')");
-                assertUpdate("INSERT INTO evolve_test values (1, row(1, 'abc'))", 1);
-                assertUpdate("ALTER TABLE evolve_test DROP COLUMN a");
-                assertUpdate("ALTER TABLE evolve_test ADD COLUMN a row(c varchar, b bigint)");
-                assertQuery("SELECT a.b FROM evolve_test", "VALUES 1");
+                assertUpdate("CREATE TABLE " + tableName + " (dummy bigint, a row(b bigint, c varchar)) with (format = '" + format + "')");
+                assertUpdate("INSERT INTO " + tableName + " values (1, row(1, 'abc'))", 1);
+                assertUpdate("ALTER TABLE " + tableName + " DROP COLUMN a");
+                assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN a row(c varchar, b bigint)");
+                assertQuery("SELECT a.b FROM " + tableName, "VALUES 1");
             }
             finally {
-                assertUpdate("DROP TABLE IF EXISTS evolve_test");
+                assertUpdate("DROP TABLE IF EXISTS " + tableName);
             }
 
             // Assert that reordered subfields are read correctly for a two-level nesting. This is useful for asserting correct adaptation
             // of residue projections in HivePageSourceProvider
             try {
-                assertUpdate("CREATE TABLE evolve_test (dummy bigint, a row(b bigint, c row(x bigint, y varchar))) with (format = '" + format + "')");
-                assertUpdate("INSERT INTO evolve_test values (1, row(1, row(3, 'abc')))", 1);
-                assertUpdate("ALTER TABLE evolve_test DROP COLUMN a");
-                assertUpdate("ALTER TABLE evolve_test ADD COLUMN a row(c row(y varchar, x bigint), b bigint)");
+                assertUpdate("CREATE TABLE " + tableName + " (dummy bigint, a row(b bigint, c row(x bigint, y varchar))) with (format = '" + format + "')");
+                assertUpdate("INSERT INTO " + tableName + " values (1, row(1, row(3, 'abc')))", 1);
+                assertUpdate("ALTER TABLE " + tableName + " DROP COLUMN a");
+                assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN a row(c row(y varchar, x bigint), b bigint)");
                 // TODO: replace the following assertion with assertQuery once h2QueryRunner starts supporting row types
-                assertQuerySucceeds("SELECT a.c.y, a.c FROM evolve_test");
+                assertQuerySucceeds("SELECT a.c.y, a.c FROM " + tableName);
             }
             finally {
-                assertUpdate("DROP TABLE IF EXISTS evolve_test");
+                assertUpdate("DROP TABLE IF EXISTS " + tableName);
             }
         }
     }
@@ -7570,7 +7732,7 @@ public void testCreateAvroTableWithSchemaUrl()
         File schemaFile = createAvroSchemaFile();
 
         String createTableSql = getAvroCreateTableSql(tableName, schemaFile.getAbsolutePath());
-        String expectedShowCreateTable = getAvroCreateTableSql(tableName, schemaFile.toURI().toString());
+        String expectedShowCreateTable = getAvroCreateTableSql(tableName, schemaFile.getPath());
 
         assertUpdate(createTableSql);
 
@@ -7584,6 +7746,67 @@ public void testCreateAvroTableWithSchemaUrl()
         }
     }
 
+    @Test
+    public void testCreateAvroTableWithCamelCaseFieldSchema()
+            throws Exception
+    {
+        String tableName = "test_create_avro_table_with_camelcase_schema_url_" + randomNameSuffix();
+        File schemaFile = createAvroCamelCaseSchemaFile();
+
+        String createTableSql = format("CREATE TABLE %s.%s.%s (\n" +
+                        "   stringCol varchar,\n" +
+                        "   a INT\n" +
+                        ")\n" +
+                        "WITH (\n" +
+                        "   avro_schema_url = '%s',\n" +
+                        "   format = 'AVRO'\n" +
+                        ")",
+                getSession().getCatalog().get(),
+                getSession().getSchema().get(),
+                tableName,
+                schemaFile);
+
+        assertUpdate(createTableSql);
+        try {
+            assertUpdate("INSERT INTO " + tableName + " VALUES ('hi', 1)", 1);
+            assertQuery("SELECT * FROM " + tableName, "SELECT 'hi', 1");
+        }
+        finally {
+            assertUpdate("DROP TABLE " + tableName);
+            verify(schemaFile.delete(), "cannot delete temporary file: %s", schemaFile);
+        }
+    }
+
+    @Test
+    public void testCreateAvroTableWithNestedCamelCaseFieldSchema()
+            throws Exception
+    {
+        String tableName = "test_create_avro_table_with_nested_camelcase_schema_url_" + randomNameSuffix();
+        File schemaFile = createAvroNestedCamelCaseSchemaFile();
+
+        String createTableSql = format("CREATE TABLE %s.%s.%s (\n" +
+                        "   nestedRow ROW(stringCol varchar, intCol int)\n" +
+                        ")\n" +
+                        "WITH (\n" +
+                        "   avro_schema_url = '%s',\n" +
+                        "   format = 'AVRO'\n" +
+                        ")",
+                getSession().getCatalog().get(),
+                getSession().getSchema().get(),
+                tableName,
+                schemaFile);
+
+        assertUpdate(createTableSql);
+        try {
+            assertUpdate("INSERT INTO " + tableName + " VALUES ROW(ROW('hi', 1))", 1);
+            assertQuery("SELECT nestedRow.stringCol FROM " + tableName, "SELECT 'hi'");
+        }
+        finally {
+            assertUpdate("DROP TABLE " + tableName);
+            verify(schemaFile.delete(), "cannot delete temporary file: %s", schemaFile);
+        }
+    }
+
     @Test
     public void testAlterAvroTableWithSchemaUrl()
             throws Exception
@@ -7647,6 +7870,50 @@ private static File createAvroSchemaFile()
         return schemaFile;
     }
 
+    private static File createAvroCamelCaseSchemaFile()
+            throws Exception
+    {
+        File schemaFile = File.createTempFile("avro_camelCamelCase_col-", ".avsc");
+        String schema = "{\n" +
+                "  \"namespace\": \"io.trino.test\",\n" +
+                "  \"name\": \"camelCase\",\n" +
+                "  \"type\": \"record\",\n" +
+                "  \"fields\": [\n" +
+                "    { \"name\":\"stringCol\", \"type\":\"string\" },\n" +
+                "    { \"name\":\"a\", \"type\":\"int\" }\n" +
+                "]}";
+        writeString(schemaFile.toPath(), schema);
+        return schemaFile;
+    }
+
+    private static File createAvroNestedCamelCaseSchemaFile()
+            throws Exception
+    {
+        File schemaFile = File.createTempFile("avro_camelCamelCase_col-", ".avsc");
+        String schema = """
+                {
+                    "namespace": "io.trino.test",
+                    "name": "camelCaseNested",
+                    "type": "record",
+                    "fields": [
+                        {
+                            "name":"nestedRow",
+                            "type": ["null", {
+                                "namespace": "io.trino.test",
+                                 "name": "nestedRecord",
+                                 "type": "record",
+                                 "fields": [
+                                    { "name":"stringCol", "type":"string"},
+                                    { "name":"intCol", "type":"int" }
+                                ]
+                            }]
+                        }
+                    ]
+                 }""";
+        writeString(schemaFile.toPath(), schema);
+        return schemaFile;
+    }
+
     @Test
     public void testCreateOrcTableWithSchemaUrl()
     {
@@ -7704,35 +7971,10 @@ public void testPrunePartitionFailure()
         assertUpdate("DROP TABLE test_prune_failure");
     }
 
-    @Test
-    public void testTemporaryStagingDirectorySessionProperties()
-    {
-        String tableName = "test_temporary_staging_directory_session_properties";
-        assertUpdate(format("CREATE TABLE %s(i int)", tableName));
-
-        Session session = Session.builder(getSession())
-                .setCatalogSessionProperty("hive", "temporary_staging_directory_enabled", "false")
-                .build();
-
-        HiveInsertTableHandle hiveInsertTableHandle = getHiveInsertTableHandle(session, tableName);
-        assertEquals(hiveInsertTableHandle.getLocationHandle().getWritePath(), hiveInsertTableHandle.getLocationHandle().getTargetPath());
-
-        session = Session.builder(getSession())
-                .setCatalogSessionProperty("hive", "temporary_staging_directory_enabled", "true")
-                .setCatalogSessionProperty("hive", "temporary_staging_directory_path", "/tmp/custom/temporary-${USER}")
-                .build();
-
-        hiveInsertTableHandle = getHiveInsertTableHandle(session, tableName);
-        assertNotEquals(hiveInsertTableHandle.getLocationHandle().getWritePath(), hiveInsertTableHandle.getLocationHandle().getTargetPath());
-        assertTrue(hiveInsertTableHandle.getLocationHandle().getWritePath().toString().startsWith("file:/tmp/custom/temporary-"));
-
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
     private HiveInsertTableHandle getHiveInsertTableHandle(Session session, String tableName)
     {
         Metadata metadata = getDistributedQueryRunner().getCoordinator().getMetadata();
-        return transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getAccessControl())
+        return transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getMetadata(), getQueryRunner().getAccessControl())
                 .execute(session, transactionSession -> {
                     QualifiedObjectName objectName = new QualifiedObjectName(catalog, TPCH_SCHEMA, tableName);
                     Optional<TableHandle> handle = metadata.getTableHandle(transactionSession, objectName);
@@ -7745,33 +7987,6 @@ private HiveInsertTableHandle getHiveInsertTableHandle(Session session, String t
                 });
     }
 
-    @Test
-    public void testSortedWritingTempStaging()
-    {
-        String tableName = "test_sorted_writing";
-        @Language("SQL") String createTableSql = format("" +
-                        "CREATE TABLE %s " +
-                        "WITH (" +
-                        "   bucket_count = 7," +
-                        "   bucketed_by = ARRAY['shipmode']," +
-                        "   sorted_by = ARRAY['shipmode']" +
-                        ") AS " +
-                        "SELECT * FROM tpch.tiny.lineitem",
-                tableName);
-
-        Session session = Session.builder(getSession())
-                .setCatalogSessionProperty("hive", "sorted_writing_enabled", "true")
-                .setCatalogSessionProperty("hive", "temporary_staging_directory_enabled", "true")
-                .setCatalogSessionProperty("hive", "temporary_staging_directory_path", "/tmp/custom/temporary-${USER}")
-                .build();
-
-        assertUpdate(session, createTableSql, 60175L);
-        MaterializedResult expected = computeActual("SELECT * FROM tpch.tiny.lineitem");
-        MaterializedResult actual = computeActual("SELECT * FROM " + tableName);
-        assertEqualsIgnoreOrder(actual.getMaterializedRows(), expected.getMaterializedRows());
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
     @Test
     public void testUseSortedProperties()
     {
@@ -7803,7 +8018,7 @@ public void testUseSortedProperties()
     public void testCreateTableWithCompressionCodec(HiveCompressionCodec compressionCodec)
     {
         testWithAllStorageFormats((session, hiveStorageFormat) -> {
-            if (isNativeParquetWriter(session, hiveStorageFormat) && compressionCodec == HiveCompressionCodec.LZ4) {
+            if (hiveStorageFormat == HiveStorageFormat.PARQUET && compressionCodec == HiveCompressionCodec.LZ4) {
                 // TODO (https://github.com/trinodb/trino/issues/9142) Support LZ4 compression with native Parquet writer
                 assertThatThrownBy(() -> testCreateTableWithCompressionCodec(session, hiveStorageFormat, compressionCodec))
                         .hasMessage("Unsupported codec: LZ4");
@@ -7896,7 +8111,7 @@ protected boolean isColumnNameRejected(Exception exception, String columnName, b
 
     private void testColumnPruning(Session session, HiveStorageFormat storageFormat)
     {
-        String tableName = "test_schema_evolution_column_pruning_" + storageFormat.name().toLowerCase(ENGLISH);
+        String tableName = "test_schema_evolution_column_pruning_" + storageFormat.name().toLowerCase(ENGLISH) + "_" + randomNameSuffix();
         String evolvedTableName = tableName + "_evolved";
 
         assertUpdate(session, "DROP TABLE IF EXISTS " + tableName);
@@ -7990,6 +8205,41 @@ public void testWriteInvalidPrecisionTimestamp()
                 "\\QIncorrect timestamp precision for timestamp(3); the configured precision is " + HiveTimestampPrecision.MICROSECONDS + "; column name: ts");
     }
 
+    @Test
+    public void testCoercingVarchar0ToVarchar1()
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_coercion_create_table_varchar",
+                "(var_column_0 varchar(0), var_column_1 varchar(1), var_column_10 varchar(10))")) {
+            assertEquals(getColumnType(testTable.getName(), "var_column_0"), "varchar(1)");
+            assertEquals(getColumnType(testTable.getName(), "var_column_1"), "varchar(1)");
+            assertEquals(getColumnType(testTable.getName(), "var_column_10"), "varchar(10)");
+        }
+    }
+
+    @Test
+    public void testCoercingVarchar0ToVarchar1WithCTAS()
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_coercion_ctas_varchar",
+                "AS SELECT '' AS var_column")) {
+            assertEquals(getColumnType(testTable.getName(), "var_column"), "varchar(1)");
+        }
+    }
+
+    @Test
+    public void testCoercingVarchar0ToVarchar1WithCTASNoData()
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_coercion_ctas_nd_varchar",
+                "AS SELECT '' AS var_column WITH NO DATA")) {
+            assertEquals(getColumnType(testTable.getName(), "var_column"), "varchar(1)");
+        }
+    }
+
     @Test
     public void testOptimize()
     {
@@ -8034,6 +8284,12 @@ public void testOptimize()
 
     @Test
     public void testOptimizeWithWriterScaling()
+    {
+        testOptimizeWithWriterScaling(true, false, DataSize.of(1, GIGABYTE));
+        testOptimizeWithWriterScaling(false, true, DataSize.of(0, MEGABYTE));
+    }
+
+    private void testOptimizeWithWriterScaling(boolean scaleWriters, boolean taskScaleWritersEnabled, DataSize writerScalingMinDataProcessed)
     {
         String tableName = "test_optimize_witer_scaling" + randomNameSuffix();
         assertUpdate("CREATE TABLE " + tableName + " AS SELECT * FROM tpch.sf1.nation WITH NO DATA", 0);
@@ -8044,12 +8300,18 @@ public void testOptimizeWithWriterScaling()
         Set<String> initialFiles = getTableFiles(tableName);
         assertThat(initialFiles).hasSize(4);
 
-        Session writerScalingSession = Session.builder(optimizeEnabledSession())
-                .setSystemProperty("scale_writers", "true")
-                .setSystemProperty("writer_min_size", "100GB")
-                .build();
+        Session.SessionBuilder writerScalingSessionBuilder = Session.builder(optimizeEnabledSession())
+                .setSystemProperty("scale_writers", String.valueOf(scaleWriters))
+                .setSystemProperty("writer_scaling_min_data_processed", writerScalingMinDataProcessed.toString())
+                // task_scale_writers_enabled shouldn't have any effect on writing data in the optimize command
+                .setSystemProperty("task_scale_writers_enabled", String.valueOf(taskScaleWritersEnabled))
+                .setSystemProperty("task_min_writer_count", "1");
 
-        assertUpdate(writerScalingSession, "ALTER TABLE " + tableName + " EXECUTE optimize(file_size_threshold => '10kB')");
+        if (!scaleWriters) {
+            writerScalingSessionBuilder.setSystemProperty("max_writer_tasks_count", "1");
+        }
+
+        assertUpdate(writerScalingSessionBuilder.build(), "ALTER TABLE " + tableName + " EXECUTE optimize(file_size_threshold => '10kB')");
         assertNationNTimes(tableName, 4);
 
         Set<String> compactedFiles = getTableFiles(tableName);
@@ -8083,7 +8345,7 @@ public void testOptimizeWithPartitioning()
         Session optimizeEnabledSession = optimizeEnabledSession();
         Session writerScalingSession = Session.builder(optimizeEnabledSession)
                 .setSystemProperty("scale_writers", "true")
-                .setSystemProperty("writer_min_size", "100GB")
+                .setSystemProperty("writer_scaling_min_data_processed", "100GB")
                 .build();
 
         // optimize with unsupported WHERE
@@ -8341,6 +8603,49 @@ public void testSelectFromPrestoViewReferencingHiveTableWithTimestamps()
         assertThat(query(nanosSessions, "SELECT ts FROM hive_timestamp_nanos.tpch." + prestoViewNameNanos)).matches("VALUES TIMESTAMP '1990-01-02 12:13:14.123000000'");
     }
 
+    @Test
+    public void testTimestampWithTimeZone()
+    {
+        String catalog = getSession().getCatalog().orElseThrow();
+
+        assertUpdate("CREATE TABLE test_timestamptz_base (t timestamp) WITH (format = 'PARQUET')");
+        assertUpdate("INSERT INTO test_timestamptz_base (t) VALUES" +
+                     "(timestamp '2022-07-26 12:13')", 1);
+
+        // Writing TIMESTAMP WITH LOCAL TIME ZONE is not supported, so we first create Parquet object by writing unzoned
+        // timestamp (which is converted to UTC using default timezone) and then creating another table that reads from the same file.
+        String tableLocation = getTableLocation("test_timestamptz_base");
+
+        // TIMESTAMP WITH LOCAL TIME ZONE is not mapped to any Trino type, so we need to create the metastore entry manually
+        HiveMetastore metastore = ((HiveConnector) getDistributedQueryRunner().getCoordinator().getConnector(catalog))
+                .getInjector().getInstance(HiveMetastoreFactory.class)
+                .createMetastore(Optional.of(getSession().getIdentity().toConnectorIdentity(catalog)));
+        metastore.createTable(
+                new Table(
+                        "tpch",
+                        "test_timestamptz",
+                        Optional.of("hive"),
+                        "EXTERNAL_TABLE",
+                        new Storage(
+                                StorageFormat.fromHiveStorageFormat(HiveStorageFormat.PARQUET),
+                                Optional.of(tableLocation),
+                                Optional.empty(),
+                                false,
+                                Collections.emptyMap()),
+                        List.of(new Column("t", HiveType.HIVE_TIMESTAMPLOCALTZ, Optional.empty())),
+                        List.of(),
+                        Collections.emptyMap(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        OptionalLong.empty()),
+                PrincipalPrivileges.fromHivePrivilegeInfos(Collections.emptySet()));
+
+        assertThat(query("SELECT * FROM test_timestamptz"))
+                .matches("VALUES TIMESTAMP '2022-07-26 17:13:00.000 UTC'");
+
+        assertUpdate("DROP TABLE test_timestamptz");
+    }
+
     @Test(dataProvider = "legalUseColumnNamesProvider")
     public void testUseColumnNames(HiveStorageFormat format, boolean formatUseColumnNames)
     {
@@ -8520,6 +8825,125 @@ public void testCreateAcidTableUnsupported()
         assertQueryFails("CREATE TABLE acid_unsupported WITH (transactional = true) AS SELECT 123 x", "FileHiveMetastore does not support ACID tables");
     }
 
+    @Test
+    public void testExtraProperties()
+    {
+        String tableName = "create_table_with_multiple_extra_properties_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE %s (c1 integer) WITH (extra_properties = MAP(ARRAY['extra.property.one', 'extra.property.two'], ARRAY['one', 'two']))".formatted(tableName));
+
+        assertQuery(
+                "SELECT \"extra.property.one\", \"extra.property.two\" FROM \"%s$properties\"".formatted(tableName),
+                "SELECT 'one', 'two'");
+        assertThat(computeActual("SHOW CREATE TABLE %s".formatted(tableName)).getOnlyValue())
+                .isEqualTo("CREATE TABLE hive.tpch.%s (\n".formatted(tableName) +
+                        "   c1 integer\n" +
+                        ")\n" +
+                        "WITH (\n" +
+                        "   format = 'ORC'\n" +
+                        ")");
+        assertUpdate("DROP TABLE %s".formatted(tableName));
+    }
+
+    @Test
+    public void testExtraPropertiesWithCtas()
+    {
+        String tableName = "create_table_ctas_with_multiple_extra_properties_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE %s (c1 integer) WITH (extra_properties = MAP(ARRAY['extra.property.one', 'extra.property.two'], ARRAY['one', 'two']))".formatted(tableName));
+
+        assertQuery(
+                "SELECT \"extra.property.one\", \"extra.property.two\" FROM \"%s$properties\"".formatted(tableName),
+                "SELECT 'one', 'two'");
+        assertThat(computeActual("SHOW CREATE TABLE %s".formatted(tableName)).getOnlyValue())
+                .isEqualTo("CREATE TABLE hive.tpch.%s (\n".formatted(tableName) +
+                        "   c1 integer\n" +
+                        ")\n" +
+                        "WITH (\n" +
+                        "   format = 'ORC'\n" +
+                        ")");
+
+        assertUpdate("DROP TABLE %s".formatted(tableName));
+    }
+
+    @Test
+    public void testShowCreateWithExtraProperties()
+    {
+        String tableName = format("%s.%s.show_create_table_with_extra_properties_%s", getSession().getCatalog().get(), getSession().getSchema().get(), randomNameSuffix());
+        assertUpdate("CREATE TABLE %s (c1 integer) WITH (extra_properties = MAP(ARRAY['extra.property.one', 'extra.property.two'], ARRAY['one', 'two']))".formatted(tableName));
+
+        assertThat(computeActual("SHOW CREATE TABLE " + tableName).getOnlyValue())
+                .isEqualTo("CREATE TABLE %s (\n".formatted(tableName) +
+                        "   c1 integer\n" +
+                        ")\n" +
+                        "WITH (\n" +
+                        "   format = 'ORC'\n" +
+                        ")");
+
+        assertUpdate("DROP TABLE %s".formatted(tableName));
+    }
+
+    @Test
+    public void testDuplicateExtraProperties()
+    {
+        assertQueryFails(
+                "CREATE TABLE create_table_with_duplicate_extra_properties (c1 integer) WITH (extra_properties = MAP(ARRAY['extra.property', 'extra.property'], ARRAY['true', 'false']))",
+                "Invalid value for catalog 'hive' table property 'extra_properties': Cannot convert.*");
+        assertQueryFails(
+                "CREATE TABLE create_table_select_as_with_duplicate_extra_properties (c1 integer) WITH (extra_properties = MAP(ARRAY['extra.property', 'extra.property'], ARRAY['true', 'false']))",
+                "Invalid value for catalog 'hive' table property 'extra_properties': Cannot convert.*");
+    }
+
+    @Test
+    public void testOverwriteExistingPropertyWithExtraProperties()
+    {
+        assertThatThrownBy(() -> assertUpdate("CREATE TABLE create_table_with_overwrite_extra_properties (c1 integer) WITH (extra_properties = MAP(ARRAY['transactional'], ARRAY['true']))"))
+                .isInstanceOf(QueryFailedException.class)
+                .hasMessage("Illegal keys in extra_properties: [transactional]");
+
+        assertThatThrownBy(() -> assertUpdate("CREATE TABLE create_table_as_select_with_extra_properties WITH (extra_properties = MAP(ARRAY['rawDataSize'], ARRAY['1'])) AS SELECT 1 as c1"))
+                .isInstanceOf(QueryFailedException.class)
+                .hasMessage("Illegal keys in extra_properties: [rawDataSize]");
+    }
+
+    @Test
+    public void testNullExtraProperty()
+    {
+        assertQueryFails(
+                "CREATE TABLE create_table_with_duplicate_extra_properties (c1 integer) WITH (extra_properties = MAP(ARRAY['null.property'], ARRAY[null]))",
+                ".*Extra table property value cannot be null '\\{null.property=null}'.*");
+        assertQueryFails(
+                "CREATE TABLE create_table_as_select_with_extra_properties WITH (extra_properties = MAP(ARRAY['null.property'], ARRAY[null])) AS SELECT 1 as c1",
+                ".*Extra table property value cannot be null '\\{null.property=null}'.*");
+    }
+
+    @Test
+    public void testCollidingMixedCaseProperty()
+    {
+        String tableName = "create_table_with_mixed_case_extra_properties" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE %s (c1 integer) WITH (extra_properties = MAP(ARRAY['one', 'ONE'], ARRAY['one', 'ONE']))".formatted(tableName));
+        // TODO: (https://github.com/trinodb/trino/issues/17) This should run successfully
+        assertThatThrownBy(() -> query("SELECT * FROM \"%s$properties\"".formatted(tableName)))
+                .isInstanceOf(QueryFailedException.class)
+                .hasMessageContaining("Multiple entries with same key: one=one and one=one");
+
+        assertUpdate("DROP TABLE %s".formatted(tableName));
+    }
+
+    @Test
+    public void testSelectWithShortZoneId()
+    {
+        String resourceLocation = getPathFromClassPathResource("with_short_zone_id/data");
+
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_select_with_short_zone_id_",
+                "(id INT, firstName VARCHAR, lastName VARCHAR) WITH (external_location = '%s')".formatted(resourceLocation))) {
+            assertThatThrownBy(() -> query("SELECT * FROM %s".formatted(testTable.getName())))
+                    .hasMessageMatching(".*Failed to read ORC file: .*")
+                    .hasStackTraceContaining("Unknown time-zone ID: EST");
+        }
+    }
+
     private static final Set<HiveStorageFormat> NAMED_COLUMN_ONLY_FORMATS = ImmutableSet.of(HiveStorageFormat.AVRO, HiveStorageFormat.JSON);
 
     @DataProvider
@@ -8539,11 +8963,11 @@ public Object[][] legalUseColumnNamesProvider()
         };
     }
 
-    private Session getParallelWriteSession()
+    private Session getParallelWriteSession(Session baseSession)
     {
-        return Session.builder(getSession())
-                .setSystemProperty("task_writer_count", "4")
-                .setSystemProperty("task_partitioned_writer_count", "4")
+        return Session.builder(baseSession)
+                .setSystemProperty("task_min_writer_count", "4")
+                .setSystemProperty("task_max_writer_count", "4")
                 .setSystemProperty("task_scale_writers_enabled", "false")
                 .build();
     }
@@ -8628,16 +9052,8 @@ private static void testWithStorageFormat(TestingHiveStorageFormat storageFormat
         }
     }
 
-    private boolean isNativeParquetWriter(Session session, HiveStorageFormat storageFormat)
-    {
-        return storageFormat == HiveStorageFormat.PARQUET &&
-                "true".equals(session.getCatalogProperties("hive").get("parquet_optimized_writer_enabled"));
-    }
-
     private List<TestingHiveStorageFormat> getAllTestingHiveStorageFormat()
     {
-        Session session = getSession();
-        String catalog = session.getCatalog().orElseThrow();
         ImmutableList.Builder<TestingHiveStorageFormat> formats = ImmutableList.builder();
         for (HiveStorageFormat hiveStorageFormat : HiveStorageFormat.values()) {
             if (hiveStorageFormat == HiveStorageFormat.CSV) {
@@ -8648,20 +9064,8 @@ private List<TestingHiveStorageFormat> getAllTestingHiveStorageFormat()
                 // REGEX format is read-only
                 continue;
             }
-            if (hiveStorageFormat == HiveStorageFormat.PARQUET) {
-                formats.add(new TestingHiveStorageFormat(
-                        Session.builder(session)
-                                .setCatalogSessionProperty(catalog, "parquet_optimized_writer_enabled", "false")
-                                .build(),
-                        hiveStorageFormat));
-                formats.add(new TestingHiveStorageFormat(
-                        Session.builder(session)
-                                .setCatalogSessionProperty(catalog, "parquet_optimized_writer_enabled", "true")
-                                .build(),
-                        hiveStorageFormat));
-                continue;
-            }
-            formats.add(new TestingHiveStorageFormat(session, hiveStorageFormat));
+
+            formats.add(new TestingHiveStorageFormat(getSession(), hiveStorageFormat));
         }
         return formats.build();
     }
@@ -8757,13 +9161,13 @@ protected void verifySchemaNameLengthFailurePermissible(Throwable e)
     protected OptionalInt maxTableNameLength()
     {
         // This value depends on metastore type
-        return OptionalInt.of(255);
+        return OptionalInt.of(128);
     }
 
     @Override
     protected void verifyTableNameLengthFailurePermissible(Throwable e)
     {
-        assertThat(e).hasMessageMatching("Failed to create directory.*|Could not rename table directory");
+        assertThat(e).hasMessageMatching("Table name must be shorter than or equal to '128' characters but got .*");
     }
 
     private Session withTimestampPrecision(Session session, HiveTimestampPrecision precision)
@@ -8778,6 +9182,23 @@ private String getTableLocation(String tableName)
         return (String) computeScalar("SELECT DISTINCT regexp_replace(\"$path\", '/[^/]*$', '') FROM " + tableName);
     }
 
+    @Override
+    protected boolean supportsPhysicalPushdown()
+    {
+        // Hive table is created using default format which is ORC. Currently ORC reader has issue
+        // pruning dereferenced struct fields https://github.com/trinodb/trino/issues/17201
+        return false;
+    }
+
+    @Override
+    protected Session withoutSmallFileThreshold(Session session)
+    {
+        return Session.builder(session)
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "parquet_small_file_threshold", "0B")
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "orc_tiny_stripe_threshold", "0B")
+                .build();
+    }
+
     private static final class BucketedFilterTestSetup
     {
         private final String typeName;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseS3AndGlueMetastoreTest.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseS3AndGlueMetastoreTest.java
new file mode 100644
index 000000000000..f43d7a7f72ca
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseS3AndGlueMetastoreTest.java
@@ -0,0 +1,356 @@
+/*
+ * Licensed 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 io.trino.plugin.hive;
+
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import com.amazonaws.services.s3.model.ListObjectsV2Request;
+import com.amazonaws.services.s3.model.S3ObjectSummary;
+import io.trino.Session;
+import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.spi.connector.SchemaNotFoundException;
+import io.trino.testing.AbstractTestQueryFramework;
+import org.intellij.lang.annotations.Language;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.Sets.union;
+import static io.trino.plugin.hive.S3Assert.s3Path;
+import static io.trino.testing.DataProviders.cartesianProduct;
+import static io.trino.testing.DataProviders.toDataProvider;
+import static io.trino.testing.DataProviders.trueFalse;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public abstract class BaseS3AndGlueMetastoreTest
+        extends AbstractTestQueryFramework
+{
+    private final String partitionByKeyword;
+    private final String locationKeyword;
+
+    protected final String bucketName;
+    protected final String schemaName = "test_glue_s3_" + randomNameSuffix();
+
+    protected HiveMetastore metastore;
+    protected AmazonS3 s3;
+
+    protected BaseS3AndGlueMetastoreTest(String partitionByKeyword, String locationKeyword, String bucketName)
+    {
+        this.partitionByKeyword = requireNonNull(partitionByKeyword, "partitionByKeyword is null");
+        this.locationKeyword = requireNonNull(locationKeyword, "locationKeyword is null");
+        this.bucketName = requireNonNull(bucketName, "bucketName is null");
+    }
+
+    @BeforeClass
+    public void setUp()
+    {
+        s3 = AmazonS3ClientBuilder.standard().build();
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void tearDown()
+    {
+        if (metastore != null) {
+            metastore.dropDatabase(schemaName, true);
+            metastore = null;
+        }
+        if (s3 != null) {
+            s3.shutdown();
+            s3 = null;
+        }
+    }
+
+    @DataProvider
+    public Object[][] locationPatternsDataProvider()
+    {
+        return cartesianProduct(trueFalse(), Stream.of(LocationPattern.values()).collect(toDataProvider()));
+    }
+
+    @Test(dataProvider = "locationPatternsDataProvider")
+    public void testBasicOperationsWithProvidedTableLocation(boolean partitioned, LocationPattern locationPattern)
+    {
+        String tableName = "test_basic_operations_" + randomNameSuffix();
+        String location = locationPattern.locationForTable(bucketName, schemaName, tableName);
+        String partitionQueryPart = (partitioned ? "," + partitionByKeyword + " = ARRAY['col_str']" : "");
+
+        String actualTableLocation;
+        assertUpdate("CREATE TABLE " + tableName + "(col_str, col_int)" +
+                "WITH (location = '" + location + "'" + partitionQueryPart + ") " +
+                "AS VALUES ('str1', 1), ('str2', 2), ('str3', 3)", 3);
+        try (UncheckedCloseable ignored = onClose("DROP TABLE " + tableName)) {
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('str2', 2), ('str3', 3)");
+            actualTableLocation = validateTableLocation(tableName, location);
+
+            assertUpdate("INSERT INTO " + tableName + " VALUES ('str4', 4)", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('str2', 2), ('str3', 3), ('str4', 4)");
+
+            assertUpdate("UPDATE " + tableName + " SET col_str = 'other' WHERE col_int = 2", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('other', 2), ('str3', 3), ('str4', 4)");
+
+            assertUpdate("DELETE FROM " + tableName + " WHERE col_int = 3", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('other', 2), ('str4', 4)");
+
+            assertThat(getTableFiles(actualTableLocation)).isNotEmpty();
+            validateDataFiles(partitioned ? "col_str" : "", tableName, actualTableLocation);
+            validateMetadataFiles(actualTableLocation);
+        }
+        validateFilesAfterDrop(actualTableLocation);
+    }
+
+    @Test(dataProvider = "locationPatternsDataProvider")
+    public void testBasicOperationsWithProvidedSchemaLocation(boolean partitioned, LocationPattern locationPattern)
+    {
+        String schemaName = "test_basic_operations_schema_" + randomNameSuffix();
+        String schemaLocation = locationPattern.locationForSchema(bucketName, schemaName);
+        String tableName = "test_basic_operations_table_" + randomNameSuffix();
+        String qualifiedTableName = schemaName + "." + tableName;
+        String partitionQueryPart = (partitioned ? "WITH (" + partitionByKeyword + " = ARRAY['col_str'])" : "");
+
+        String actualTableLocation;
+        assertUpdate("CREATE SCHEMA " + schemaName + " WITH (location = '" + schemaLocation + "')");
+        try (UncheckedCloseable ignoredDropSchema = onClose("DROP SCHEMA " + schemaName)) {
+            assertThat(getSchemaLocation(schemaName)).isEqualTo(schemaLocation);
+
+            assertUpdate("CREATE TABLE " + qualifiedTableName + "(col_int int, col_str varchar)" + partitionQueryPart);
+            try (UncheckedCloseable ignoredDropTable = onClose("DROP TABLE " + qualifiedTableName)) {
+                // in case of regular CREATE TABLE, location has generated suffix
+                String expectedTableLocationPattern = Pattern.quote(schemaLocation.endsWith("/") ? schemaLocation : schemaLocation + "/") + tableName + "-[a-z0-9]+";
+                actualTableLocation = getTableLocation(qualifiedTableName);
+                assertThat(actualTableLocation).matches(expectedTableLocationPattern);
+
+                assertUpdate("INSERT INTO " + qualifiedTableName + " (col_str, col_int) VALUES ('str1', 1), ('str2', 2), ('str3', 3)", 3);
+                assertQuery("SELECT col_str, col_int FROM " + qualifiedTableName, "VALUES ('str1', 1), ('str2', 2), ('str3', 3)");
+
+                assertUpdate("UPDATE " + qualifiedTableName + " SET col_str = 'other' WHERE col_int = 2", 1);
+                assertQuery("SELECT col_str, col_int FROM " + qualifiedTableName, "VALUES ('str1', 1), ('other', 2), ('str3', 3)");
+
+                assertUpdate("DELETE FROM " + qualifiedTableName + " WHERE col_int = 3", 1);
+                assertQuery("SELECT col_str, col_int FROM " + qualifiedTableName, "VALUES ('str1', 1), ('other', 2)");
+
+                assertThat(getTableFiles(actualTableLocation)).isNotEmpty();
+                validateDataFiles(partitioned ? "col_str" : "", qualifiedTableName, actualTableLocation);
+                validateMetadataFiles(actualTableLocation);
+            }
+            assertThat(getTableFiles(actualTableLocation)).isEmpty();
+        }
+        assertThat(getTableFiles(actualTableLocation)).isEmpty();
+    }
+
+    @Test(dataProvider = "locationPatternsDataProvider")
+    public void testMergeWithProvidedTableLocation(boolean partitioned, LocationPattern locationPattern)
+    {
+        String tableName = "test_merge_" + randomNameSuffix();
+        String location = locationPattern.locationForTable(bucketName, schemaName, tableName);
+        String partitionQueryPart = (partitioned ? "," + partitionByKeyword + " = ARRAY['col_str']" : "");
+
+        String actualTableLocation;
+        assertUpdate("CREATE TABLE " + tableName + "(col_str, col_int)" +
+                "WITH (location = '" + location + "'" + partitionQueryPart + ") " +
+                "AS VALUES ('str1', 1), ('str2', 2), ('str3', 3)", 3);
+        try (UncheckedCloseable ignored = onClose("DROP TABLE " + tableName)) {
+            actualTableLocation = validateTableLocation(tableName, location);
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('str2', 2), ('str3', 3)");
+
+            assertUpdate("MERGE INTO " + tableName + " USING (VALUES 1) t(x) ON false" +
+                    " WHEN NOT MATCHED THEN INSERT VALUES ('str4', 4)", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('str2', 2), ('str3', 3), ('str4', 4)");
+
+            assertUpdate("MERGE INTO " + tableName + " USING (VALUES 2) t(x) ON col_int = x" +
+                    " WHEN MATCHED THEN UPDATE SET col_str = 'other'", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('other', 2), ('str3', 3), ('str4', 4)");
+
+            assertUpdate("MERGE INTO " + tableName + " USING (VALUES 3) t(x) ON col_int = x" +
+                    " WHEN MATCHED THEN DELETE", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('other', 2), ('str4', 4)");
+
+            assertThat(getTableFiles(actualTableLocation)).isNotEmpty();
+            validateDataFiles(partitioned ? "col_str" : "", tableName, actualTableLocation);
+            validateMetadataFiles(actualTableLocation);
+        }
+        validateFilesAfterDrop(actualTableLocation);
+    }
+
+    @Test(dataProvider = "locationPatternsDataProvider")
+    public void testOptimizeWithProvidedTableLocation(boolean partitioned, LocationPattern locationPattern)
+    {
+        String tableName = "test_optimize_" + randomNameSuffix();
+        String location = locationPattern.locationForTable(bucketName, schemaName, tableName);
+        String partitionQueryPart = (partitioned ? "," + partitionByKeyword + " = ARRAY['value']" : "");
+        String locationQueryPart = locationKeyword + "= '" + location + "'";
+
+        assertUpdate("CREATE TABLE " + tableName + " (key integer, value varchar) " +
+                "WITH (" + locationQueryPart + partitionQueryPart + ")");
+        try (UncheckedCloseable ignored = onClose("DROP TABLE " + tableName)) {
+            // create multiple data files, INSERT with multiple values would create only one file (if not partitioned)
+            assertUpdate("INSERT INTO " + tableName + " VALUES (1, 'one')", 1);
+            assertUpdate("INSERT INTO " + tableName + " VALUES (2, 'a//double_slash')", 1);
+            assertUpdate("INSERT INTO " + tableName + " VALUES (3, 'a%percent')", 1);
+            assertUpdate("INSERT INTO " + tableName + " VALUES (4, 'a//double_slash')", 1);
+            assertUpdate("INSERT INTO " + tableName + " VALUES (5, 'a///triple_slash')", 1);
+            assertUpdate("INSERT INTO " + tableName + " VALUES (6, 'trailing_slash/')", 1);
+            assertUpdate("INSERT INTO " + tableName + " VALUES (7, 'two_trailing_slashes//')", 1);
+            assertUpdate("INSERT INTO " + tableName + " VALUES (11, 'one')", 1);
+
+            Set<String> initialFiles = getActiveFiles(tableName);
+            assertThat(initialFiles).hasSize(8);
+
+            Session session = sessionForOptimize();
+            computeActual(session, "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
+
+            assertThat(query("SELECT sum(key), listagg(value, ' ') WITHIN GROUP (ORDER BY value) FROM " + tableName))
+                    .matches("VALUES (BIGINT '39', VARCHAR 'a%percent a///triple_slash a//double_slash a//double_slash one one trailing_slash/ two_trailing_slashes//')");
+
+            Set<String> updatedFiles = getActiveFiles(tableName);
+            validateFilesAfterOptimize(getTableLocation(tableName), initialFiles, updatedFiles);
+        }
+    }
+
+    protected Session sessionForOptimize()
+    {
+        return getSession();
+    }
+
+    protected void validateFilesAfterOptimize(String location, Set<String> initialFiles, Set<String> updatedFiles)
+    {
+        assertThat(updatedFiles).hasSizeLessThan(initialFiles.size());
+        assertThat(getAllDataFilesFromTableDirectory(location)).isEqualTo(union(initialFiles, updatedFiles));
+    }
+
+    protected abstract void validateDataFiles(String partitionColumn, String tableName, String location);
+
+    protected abstract void validateMetadataFiles(String location);
+
+    protected String validateTableLocation(String tableName, String expectedLocation)
+    {
+        String actualTableLocation = getTableLocation(tableName);
+        assertThat(actualTableLocation).isEqualTo(expectedLocation);
+        return actualTableLocation;
+    }
+
+    protected void validateFilesAfterDrop(String location)
+    {
+        assertThat(getTableFiles(location)).isEmpty();
+    }
+
+    protected abstract Set<String> getAllDataFilesFromTableDirectory(String tableLocation);
+
+    protected Set<String> getActiveFiles(String tableName)
+    {
+        return computeActual("SELECT \"$path\" FROM " + tableName).getOnlyColumnAsSet().stream()
+                .map(String.class::cast)
+                .collect(Collectors.toSet());
+    }
+
+    protected String getTableLocation(String tableName)
+    {
+        return findLocationInQuery("SHOW CREATE TABLE " + tableName);
+    }
+
+    protected String getSchemaLocation(String schemaName)
+    {
+        return metastore.getDatabase(schemaName).orElseThrow(() -> new SchemaNotFoundException(schemaName))
+                .getLocation().orElseThrow(() -> new IllegalArgumentException("Location is empty"));
+    }
+
+    private String findLocationInQuery(String query)
+    {
+        Pattern locationPattern = Pattern.compile(".*location = '(.*?)'.*", Pattern.DOTALL);
+        Matcher m = locationPattern.matcher((String) computeActual(query).getOnlyValue());
+        if (m.find()) {
+            String location = m.group(1);
+            verify(!m.find(), "Unexpected second match");
+            return location;
+        }
+        throw new IllegalStateException("Location not found in" + query + " result");
+    }
+
+    protected List<String> getTableFiles(String location)
+    {
+        Matcher matcher = Pattern.compile("s3://[^/]+/(.+)").matcher(location);
+        verify(matcher.matches(), "Does not match [%s]: [%s]", matcher.pattern(), location);
+        String fileKey = matcher.group(1);
+        ListObjectsV2Request req = new ListObjectsV2Request().withBucketName(bucketName).withPrefix(fileKey);
+        return s3.listObjectsV2(req).getObjectSummaries().stream()
+                .map(S3ObjectSummary::getKey)
+                .map(key -> format("s3://%s/%s", bucketName, key))
+                .toList();
+    }
+
+    protected UncheckedCloseable onClose(@Language("SQL") String sql)
+    {
+        requireNonNull(sql, "sql is null");
+        return () -> assertUpdate(sql);
+    }
+
+    protected String schemaPath()
+    {
+        return "s3://%s/%s".formatted(bucketName, schemaName);
+    }
+
+    protected void verifyPathExist(String path)
+    {
+        assertThat(s3Path(s3, path)).exists();
+    }
+
+    protected enum LocationPattern
+    {
+        REGULAR("s3://%s/%s/regular/%s"),
+        TRAILING_SLASH("s3://%s/%s/trailing_slash/%s/"),
+        TWO_TRAILING_SLASHES("s3://%s/%s/two_trailing_slashes/%s//"),
+        DOUBLE_SLASH("s3://%s/%s//double_slash/%s"),
+        TRIPLE_SLASH("s3://%s/%s///triple_slash/%s"),
+        PERCENT("s3://%s/%s/a%%percent/%s"),
+        HASH("s3://%s/%s/a#hash/%s"),
+        QUESTION_MARK("s3://%s/%s/a?question_mark/%s"),
+        WHITESPACE("s3://%s/%s/a whitespace/%s"),
+        TRAILING_WHITESPACE("s3://%s/%s/trailing_whitespace/%s "),
+        /**/;
+
+        private final String locationPattern;
+
+        LocationPattern(String locationPattern)
+        {
+            this.locationPattern = requireNonNull(locationPattern, "locationPattern is null");
+        }
+
+        public String locationForSchema(String bucketName, String schemaName)
+        {
+            return locationPattern.formatted(bucketName, "warehouse", schemaName);
+        }
+
+        public String locationForTable(String bucketName, String schemaName, String tableName)
+        {
+            return locationPattern.formatted(bucketName, schemaName, tableName);
+        }
+    }
+
+    protected interface UncheckedCloseable
+            extends AutoCloseable
+    {
+        @Override
+        void close();
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseTestHiveOnDataLake.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseTestHiveOnDataLake.java
deleted file mode 100644
index 73a2994e04f9..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseTestHiveOnDataLake.java
+++ /dev/null
@@ -1,1850 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import io.airlift.units.DataSize;
-import io.trino.Session;
-import io.trino.plugin.hive.containers.HiveMinioDataLake;
-import io.trino.plugin.hive.metastore.HiveMetastore;
-import io.trino.plugin.hive.metastore.Partition;
-import io.trino.plugin.hive.metastore.PartitionWithStatistics;
-import io.trino.plugin.hive.metastore.Table;
-import io.trino.plugin.hive.metastore.thrift.BridgingHiveMetastore;
-import io.trino.plugin.hive.s3.S3HiveQueryRunner;
-import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.connector.TableNotFoundException;
-import io.trino.spi.predicate.NullableValue;
-import io.trino.spi.predicate.TupleDomain;
-import io.trino.testing.AbstractTestQueryFramework;
-import io.trino.testing.QueryRunner;
-import io.trino.testing.minio.MinioClient;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.temporal.TemporalUnit;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.TimeZone;
-import java.util.stream.Collectors;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.airlift.slice.Slices.utf8Slice;
-import static io.airlift.units.DataSize.Unit.MEGABYTE;
-import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.testing.MaterializedResult.resultBuilder;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static java.lang.String.format;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.time.temporal.ChronoUnit.DAYS;
-import static java.time.temporal.ChronoUnit.MINUTES;
-import static java.util.Objects.requireNonNull;
-import static java.util.regex.Pattern.quote;
-import static java.util.stream.Collectors.joining;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-public abstract class BaseTestHiveOnDataLake
-        extends AbstractTestQueryFramework
-{
-    private static final String HIVE_TEST_SCHEMA = "hive_datalake";
-    private static final DataSize HIVE_S3_STREAMING_PART_SIZE = DataSize.of(5, MEGABYTE);
-
-    private String bucketName;
-    private HiveMinioDataLake hiveMinioDataLake;
-    private HiveMetastore metastoreClient;
-
-    private final String hiveHadoopImage;
-
-    public BaseTestHiveOnDataLake(String hiveHadoopImage)
-    {
-        this.hiveHadoopImage = requireNonNull(hiveHadoopImage, "hiveHadoopImage is null");
-    }
-
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        this.bucketName = "test-hive-insert-overwrite-" + randomNameSuffix();
-        this.hiveMinioDataLake = closeAfterClass(
-                new HiveMinioDataLake(bucketName, hiveHadoopImage));
-        this.hiveMinioDataLake.start();
-        this.metastoreClient = new BridgingHiveMetastore(
-                testingThriftHiveMetastoreBuilder()
-                        .metastoreClient(this.hiveMinioDataLake.getHiveHadoop().getHiveMetastoreEndpoint())
-                        .build());
-        return S3HiveQueryRunner.builder(hiveMinioDataLake)
-                .setHiveProperties(
-                        ImmutableMap.<String, String>builder()
-                                // This is required when using MinIO which requires path style access
-                                .put("hive.insert-existing-partitions-behavior", "OVERWRITE")
-                                .put("hive.non-managed-table-writes-enabled", "true")
-                                // Below are required to enable caching on metastore
-                                .put("hive.metastore-cache-ttl", "1d")
-                                .put("hive.metastore-refresh-interval", "1d")
-                                // This is required to reduce memory pressure to test writing large files
-                                .put("hive.s3.streaming.part-size", HIVE_S3_STREAMING_PART_SIZE.toString())
-                                // This is required to enable AWS Athena partition projection
-                                .put("hive.partition-projection-enabled", "true")
-                                .buildOrThrow())
-                .build();
-    }
-
-    @BeforeClass
-    public void setUp()
-    {
-        computeActual(format(
-                "CREATE SCHEMA hive.%1$s WITH (location='s3a://%2$s/%1$s')",
-                HIVE_TEST_SCHEMA,
-                bucketName));
-    }
-
-    @Test
-    public void testInsertOverwriteInTransaction()
-    {
-        String testTable = getFullyQualifiedTestTableName();
-        computeActual(getCreateTableStatement(testTable, "partitioned_by=ARRAY['regionkey']"));
-        assertThatThrownBy(
-                () -> newTransaction()
-                        .execute(getSession(), session -> {
-                            getQueryRunner().execute(session, createInsertAsSelectFromTpchStatement(testTable));
-                        }))
-                .hasMessage("Overwriting existing partition in non auto commit context doesn't support DIRECT_TO_TARGET_EXISTING_DIRECTORY write mode");
-        computeActual(format("DROP TABLE %s", testTable));
-    }
-
-    @Test
-    public void testInsertOverwriteNonPartitionedTable()
-    {
-        String testTable = getFullyQualifiedTestTableName();
-        computeActual(getCreateTableStatement(testTable));
-        assertInsertFailure(
-                testTable,
-                "Overwriting unpartitioned table not supported when writing directly to target directory");
-        computeActual(format("DROP TABLE %s", testTable));
-    }
-
-    @Test
-    public void testInsertOverwriteNonPartitionedBucketedTable()
-    {
-        String testTable = getFullyQualifiedTestTableName();
-        computeActual(getCreateTableStatement(
-                testTable,
-                "bucketed_by = ARRAY['nationkey']",
-                "bucket_count = 3"));
-        assertInsertFailure(
-                testTable,
-                "Overwriting unpartitioned table not supported when writing directly to target directory");
-        computeActual(format("DROP TABLE %s", testTable));
-    }
-
-    @Test
-    public void testInsertOverwritePartitionedTable()
-    {
-        String testTable = getFullyQualifiedTestTableName();
-        computeActual(getCreateTableStatement(
-                testTable,
-                "partitioned_by=ARRAY['regionkey']"));
-        copyTpchNationToTable(testTable);
-        assertOverwritePartition(testTable);
-    }
-
-    @Test
-    public void testInsertOverwritePartitionedAndBucketedTable()
-    {
-        String testTable = getFullyQualifiedTestTableName();
-        computeActual(getCreateTableStatement(
-                testTable,
-                "partitioned_by=ARRAY['regionkey']",
-                "bucketed_by = ARRAY['nationkey']",
-                "bucket_count = 3"));
-        copyTpchNationToTable(testTable);
-        assertOverwritePartition(testTable);
-    }
-
-    @Test
-    public void testInsertOverwritePartitionedAndBucketedExternalTable()
-    {
-        String testTable = getFullyQualifiedTestTableName();
-        // Store table data in data lake bucket
-        computeActual(getCreateTableStatement(
-                testTable,
-                "partitioned_by=ARRAY['regionkey']",
-                "bucketed_by = ARRAY['nationkey']",
-                "bucket_count = 3"));
-        copyTpchNationToTable(testTable);
-
-        // Map this table as external table
-        String externalTableName = testTable + "_ext";
-        computeActual(getCreateTableStatement(
-                externalTableName,
-                "partitioned_by=ARRAY['regionkey']",
-                "bucketed_by = ARRAY['nationkey']",
-                "bucket_count = 3",
-                format("external_location = 's3a://%s/%s/%s/'", this.bucketName, HIVE_TEST_SCHEMA, testTable)));
-        copyTpchNationToTable(testTable);
-        assertOverwritePartition(externalTableName);
-    }
-
-    @Test
-    public void testFlushPartitionCache()
-    {
-        String tableName = "nation_" + randomNameSuffix();
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-        String partitionColumn = "regionkey";
-
-        testFlushPartitionCache(
-                tableName,
-                fullyQualifiedTestTableName,
-                partitionColumn,
-                format(
-                        "CALL system.flush_metadata_cache(schema_name => '%s', table_name => '%s', partition_columns => ARRAY['%s'], partition_values => ARRAY['0'])",
-                        HIVE_TEST_SCHEMA,
-                        tableName,
-                        partitionColumn));
-    }
-
-    @Test
-    public void testFlushPartitionCacheWithDeprecatedPartitionParams()
-    {
-        String tableName = "nation_" + randomNameSuffix();
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-        String partitionColumn = "regionkey";
-
-        testFlushPartitionCache(
-                tableName,
-                fullyQualifiedTestTableName,
-                partitionColumn,
-                format(
-                        "CALL system.flush_metadata_cache(schema_name => '%s', table_name => '%s', partition_column => ARRAY['%s'], partition_value => ARRAY['0'])",
-                        HIVE_TEST_SCHEMA,
-                        tableName,
-                        partitionColumn));
-    }
-
-    private void testFlushPartitionCache(String tableName, String fullyQualifiedTestTableName, String partitionColumn, String flushCacheProcedureSql)
-    {
-        // Create table with partition on regionkey
-        computeActual(getCreateTableStatement(
-                fullyQualifiedTestTableName,
-                format("partitioned_by=ARRAY['%s']", partitionColumn)));
-        copyTpchNationToTable(fullyQualifiedTestTableName);
-
-        String queryUsingPartitionCacheTemplate = "SELECT name FROM %s WHERE %s=%s";
-        String partitionValue1 = "0";
-        String queryUsingPartitionCacheForValue1 = format(queryUsingPartitionCacheTemplate, fullyQualifiedTestTableName, partitionColumn, partitionValue1);
-        String expectedQueryResultForValue1 = "VALUES 'ALGERIA', 'MOROCCO', 'MOZAMBIQUE', 'ETHIOPIA', 'KENYA'";
-        String partitionValue2 = "1";
-        String queryUsingPartitionCacheForValue2 = format(queryUsingPartitionCacheTemplate, fullyQualifiedTestTableName, partitionColumn, partitionValue2);
-        String expectedQueryResultForValue2 = "VALUES 'ARGENTINA', 'BRAZIL', 'CANADA', 'PERU', 'UNITED STATES'";
-
-        // Fill partition cache and check we got expected results
-        assertQuery(queryUsingPartitionCacheForValue1, expectedQueryResultForValue1);
-        assertQuery(queryUsingPartitionCacheForValue2, expectedQueryResultForValue2);
-
-        // Copy partition to new location and update metadata outside Trino
-        renamePartitionResourcesOutsideTrino(tableName, partitionColumn, partitionValue1);
-        renamePartitionResourcesOutsideTrino(tableName, partitionColumn, partitionValue2);
-
-        // Should return 0 rows as we moved partition and cache is outdated. We use nonexistent partition
-        assertQueryReturnsEmptyResult(queryUsingPartitionCacheForValue1);
-        assertQueryReturnsEmptyResult(queryUsingPartitionCacheForValue2);
-
-        // Refresh cache
-        getQueryRunner().execute(flushCacheProcedureSql);
-
-        // Should return expected rows as we refresh cache
-        assertQuery(queryUsingPartitionCacheForValue1, expectedQueryResultForValue1);
-        // Should return 0 rows as we left cache untouched
-        assertQueryReturnsEmptyResult(queryUsingPartitionCacheForValue2);
-
-        // Refresh cache for schema_name => 'dummy_schema', table_name => 'dummy_table'
-        getQueryRunner().execute(format(
-                "CALL system.flush_metadata_cache(schema_name => '%s', table_name => '%s')",
-                HIVE_TEST_SCHEMA,
-                tableName));
-
-        // Should return expected rows for all partitions
-        assertQuery(queryUsingPartitionCacheForValue1, expectedQueryResultForValue1);
-        assertQuery(queryUsingPartitionCacheForValue2, expectedQueryResultForValue2);
-
-        computeActual(format("DROP TABLE %s", fullyQualifiedTestTableName));
-    }
-
-    @Test
-    public void testWriteDifferentSizes()
-    {
-        String testTable = getFullyQualifiedTestTableName();
-        computeActual(format(
-                "CREATE TABLE %s (" +
-                        "    col1 varchar, " +
-                        "    col2 varchar, " +
-                        "    regionkey bigint) " +
-                        "    WITH (partitioned_by=ARRAY['regionkey'])",
-                testTable));
-
-        long partSizeInBytes = HIVE_S3_STREAMING_PART_SIZE.toBytes();
-
-        // Exercise different code paths of Hive S3 streaming upload, with upload part size 5MB:
-        // 1. fileSize <= 5MB (direct upload)
-        testWriteWithFileSize(testTable, 50, 0, partSizeInBytes);
-
-        // 2. 5MB < fileSize <= 10MB (upload in two parts)
-        testWriteWithFileSize(testTable, 100, partSizeInBytes + 1, partSizeInBytes * 2);
-
-        // 3. fileSize > 10MB (upload in three or more parts)
-        testWriteWithFileSize(testTable, 150, partSizeInBytes * 2 + 1, partSizeInBytes * 3);
-
-        computeActual(format("DROP TABLE %s", testTable));
-    }
-
-    @Test
-    public void testEnumPartitionProjectionOnVarcharColumnWithWhitespace()
-    {
-        String tableName = "nation_" + randomNameSuffix();
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-
-        computeActual(
-                "CREATE TABLE " + fullyQualifiedTestTableName + " (" +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  \"short name\" varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short name'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+projection\\.short name\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short name\\.values[ |]+PL1,CZ1[ |]+");
-
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL2'"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ2'"))));
-
-        assertQuery(
-                format("SELECT * FROM %s", getFullyQualifiedTestTableName("\"" + tableName + "$partitions\"")),
-                "VALUES 'PL1', 'CZ1'");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE \"short name\"='PL1'", fullyQualifiedTestTableName),
-                "VALUES 'POLAND_1'");
-
-        // No results should be returned as Partition Projection will not project partitions for this value
-        assertQueryReturnsEmptyResult(
-                format("SELECT name FROM %s WHERE \"short name\"='PL2'", fullyQualifiedTestTableName));
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE \"short name\"='PL1' OR \"short name\"='CZ1'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('CZECH_1')");
-
-        // Only POLAND_1 row will be returned as other value is outside of projection
-        assertQuery(
-                format("SELECT name FROM %s WHERE \"short name\"='PL1' OR \"short name\"='CZ2'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1')");
-
-        // All values within projection range will be returned
-        assertQuery(
-                format("SELECT name FROM %s", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('CZECH_1')");
-    }
-
-    @Test
-    public void testEnumPartitionProjectionOnVarcharColumnWithStorageLocationTemplateCreatedOnTrino()
-    {
-        // It's important to mix case here to detect if we properly handle rewriting
-        // properties between Trino and Hive (e.g for Partition Projection)
-        String schemaName = "Hive_Datalake_MixedCase";
-        String tableName = getRandomTestTableName();
-
-        // We create new schema to include mixed case location path and create such keys in Object Store
-        computeActual("CREATE SCHEMA hive.%1$s WITH (location='s3a://%2$s/%1$s')".formatted(schemaName, bucketName));
-
-        String storageFormat = format(
-                "s3a://%s/%s/%s/short_name1=${short_name1}/short_name2=${short_name2}/",
-                this.bucketName,
-                schemaName,
-                tableName);
-        computeActual(
-                "CREATE TABLE " + getFullyQualifiedTestTableName(schemaName, tableName) + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  ), " +
-                        "  short_name2 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL2', 'CZ2'] " +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true, " +
-                        "  partition_projection_location_template='" + storageFormat + "' " +
-                        ")");
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(schemaName, tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+storage\\.location\\.template[ |]+" + quote(storageFormat) + "[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.values[ |]+PL2,CZ2[ |]+");
-        testEnumPartitionProjectionOnVarcharColumnWithStorageLocationTemplate(schemaName, tableName);
-    }
-
-    @Test
-    public void testEnumPartitionProjectionOnVarcharColumnWithStorageLocationTemplateCreatedOnHive()
-    {
-        String tableName = getRandomTestTableName();
-        String storageFormat = format(
-                "'s3a://%s/%s/%s/short_name1=${short_name1}/short_name2=${short_name2}/'",
-                this.bucketName,
-                HIVE_TEST_SCHEMA,
-                tableName);
-        hiveMinioDataLake.getHiveHadoop().runOnHive(
-                "CREATE TABLE " + getHiveTestTableName(tableName) + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint " +
-                        ") PARTITIONED BY (" +
-                        "  short_name1 varchar(152), " +
-                        "  short_name2 varchar(152)" +
-                        ") " +
-                        "TBLPROPERTIES ( " +
-                        "  'projection.enabled'='true', " +
-                        "  'storage.location.template'=" + storageFormat + ", " +
-                        "  'projection.short_name1.type'='enum', " +
-                        "  'projection.short_name1.values'='PL1,CZ1', " +
-                        "  'projection.short_name2.type'='enum', " +
-                        "  'projection.short_name2.values'='PL2,CZ2' " +
-                        ")");
-        testEnumPartitionProjectionOnVarcharColumnWithStorageLocationTemplate(HIVE_TEST_SCHEMA, tableName);
-    }
-
-    private void testEnumPartitionProjectionOnVarcharColumnWithStorageLocationTemplate(String schemaName, String tableName)
-    {
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(schemaName, tableName);
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'PL2'"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'CZ2'"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'PL2'"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'CZ2'"))));
-
-        assertQuery(
-                format("SELECT * FROM %s", getFullyQualifiedTestTableName(schemaName, "\"" + tableName + "$partitions\"")),
-                "VALUES ('PL1','PL2'), ('PL1','CZ2'), ('CZ1','PL2'), ('CZ1','CZ2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='CZ2'", fullyQualifiedTestTableName),
-                "VALUES 'POLAND_2'");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-    }
-
-    @Test
-    public void testEnumPartitionProjectionOnVarcharColumn()
-    {
-        String tableName = getRandomTestTableName();
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-
-        computeActual(
-                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  ), " +
-                        "  short_name2 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL2', 'CZ2']" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.values[ |]+PL2,CZ2[ |]+");
-
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'PL2'"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'CZ2'"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'PL2'"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'CZ2'"))));
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='CZ2'", fullyQualifiedTestTableName),
-                "VALUES 'POLAND_2'");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2='CZ2' OR short_name2='PL2' )", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-    }
-
-    @Test
-    public void testIntegerPartitionProjectionOnVarcharColumnWithDigitsAlignCreatedOnTrino()
-    {
-        String tableName = getRandomTestTableName();
-        computeActual(
-                "CREATE TABLE " + getFullyQualifiedTestTableName(tableName) + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  ), " +
-                        "  short_name2 varchar(152) WITH (" +
-                        "    partition_projection_type='integer', " +
-                        "    partition_projection_range=ARRAY['1', '4'], " +
-                        "    partition_projection_digits=3" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+integer[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+1,4[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.digits[ |]+3[ |]+");
-        testIntegerPartitionProjectionOnVarcharColumnWithDigitsAlign(tableName);
-    }
-
-    @Test
-    public void testIntegerPartitionProjectionOnVarcharColumnWithDigitsAlignCreatedOnHive()
-    {
-        String tableName = "nation_" + randomNameSuffix();
-        hiveMinioDataLake.getHiveHadoop().runOnHive(
-                "CREATE TABLE " + getHiveTestTableName(tableName) + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint " +
-                        ") " +
-                        "PARTITIONED BY ( " +
-                        "  short_name1 varchar(152), " +
-                        "  short_name2 varchar(152)" +
-                        ") " +
-                        "TBLPROPERTIES " +
-                        "( " +
-                        "  'projection.enabled'='true', " +
-                        "  'projection.short_name1.type'='enum', " +
-                        "  'projection.short_name1.values'='PL1,CZ1', " +
-                        "  'projection.short_name2.type'='integer', " +
-                        "  'projection.short_name2.range'='1,4', " +
-                        "  'projection.short_name2.digits'='3'" +
-                        ")");
-        testIntegerPartitionProjectionOnVarcharColumnWithDigitsAlign(tableName);
-    }
-
-    private void testIntegerPartitionProjectionOnVarcharColumnWithDigitsAlign(String tableName)
-    {
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'001'"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'002'"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'003'"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'004'"))));
-
-        assertQuery(
-                format("SELECT * FROM %s", getFullyQualifiedTestTableName("\"" + tableName + "$partitions\"")),
-                "VALUES ('PL1','001'), ('PL1','002'), ('PL1','003'), ('PL1','004')," +
-                        "('CZ1','001'), ('CZ1','002'), ('CZ1','003'), ('CZ1','004')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='002'", fullyQualifiedTestTableName),
-                "VALUES 'POLAND_2'");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2='002' OR short_name2='001' )", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-    }
-
-    @Test
-    public void testIntegerPartitionProjectionOnIntegerColumnWithInterval()
-    {
-        String tableName = getRandomTestTableName();
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-
-        computeActual(
-                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  ), " +
-                        "  short_name2 integer WITH (" +
-                        "    partition_projection_type='integer', " +
-                        "    partition_projection_range=ARRAY['0', '10'], " +
-                        "    partition_projection_interval=3" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+integer[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+0,10[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.interval[ |]+3[ |]+");
-
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "0"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "3"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "6"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "9"))));
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2=3", fullyQualifiedTestTableName),
-                "VALUES 'POLAND_2'");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2=3 OR short_name2=0 )", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-    }
-
-    @Test
-    public void testIntegerPartitionProjectionOnIntegerColumnWithDefaults()
-    {
-        String tableName = getRandomTestTableName();
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-
-        computeActual(
-                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  ), " +
-                        "  short_name2 integer WITH (" +
-                        "    partition_projection_type='integer', " +
-                        "    partition_projection_range=ARRAY['1', '4']" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+integer[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+1,4[ |]+");
-
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "1"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "2"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "3"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "4"))));
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2=2", fullyQualifiedTestTableName),
-                "VALUES 'POLAND_2'");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2=2 OR short_name2=1 )", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-    }
-
-    @Test
-    public void testDatePartitionProjectionOnDateColumnWithDefaults()
-    {
-        String tableName = "nation_" + randomNameSuffix();
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-
-        computeActual(
-                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  ), " +
-                        "  short_name2 date WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='yyyy-MM-dd', " +
-                        "    partition_projection_range=ARRAY['2001-1-22', '2001-1-25']" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+date[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.format[ |]+yyyy-MM-dd[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+2001-1-22,2001-1-25[ |]+");
-
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "DATE '2001-1-22'"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "DATE '2001-1-23'"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "DATE '2001-1-24'"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "DATE '2001-1-25'"),
-                        ImmutableList.of("'CZECH_3'", "'Comment'", "4", "5", "'CZ1'", "DATE '2001-1-26'"))));
-
-        assertQuery(
-                format("SELECT * FROM %s", getFullyQualifiedTestTableName("\"" + tableName + "$partitions\"")),
-                "VALUES ('PL1','2001-1-22'), ('PL1','2001-1-23'), ('PL1','2001-1-24'), ('PL1','2001-1-25')," +
-                        "('CZ1','2001-1-22'), ('CZ1','2001-1-23'), ('CZ1','2001-1-24'), ('CZ1','2001-1-25')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2=(DATE '2001-1-23')", fullyQualifiedTestTableName),
-                "VALUES 'POLAND_2'");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2=(DATE '2001-1-23') OR short_name2=(DATE '2001-1-22') )", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name2 > DATE '2001-1-23'", fullyQualifiedTestTableName),
-                "VALUES ('CZECH_1'), ('CZECH_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name2 >= DATE '2001-1-23' AND short_name2 <= DATE '2001-1-25'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-    }
-
-    @Test
-    public void testDatePartitionProjectionOnTimestampColumnWithInterval()
-    {
-        String tableName = getRandomTestTableName();
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-
-        computeActual(
-                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  ), " +
-                        "  short_name2 timestamp WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='yyyy-MM-dd HH:mm:ss', " +
-                        "    partition_projection_range=ARRAY['2001-1-22 00:00:00', '2001-1-22 00:00:06'], " +
-                        "    partition_projection_interval=2, " +
-                        "    partition_projection_interval_unit='SECONDS'" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+date[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.format[ |]+yyyy-MM-dd HH:mm:ss[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+2001-1-22 00:00:00,2001-1-22 00:00:06[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.interval[ |]+2[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.interval\\.unit[ |]+seconds[ |]+");
-
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "TIMESTAMP '2001-1-22 00:00:00'"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "TIMESTAMP '2001-1-22 00:00:02'"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "TIMESTAMP '2001-1-22 00:00:04'"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "TIMESTAMP '2001-1-22 00:00:06'"),
-                        ImmutableList.of("'CZECH_3'", "'Comment'", "4", "5", "'CZ1'", "TIMESTAMP '2001-1-22 00:00:08'"))));
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2=(TIMESTAMP '2001-1-22 00:00:02')", fullyQualifiedTestTableName),
-                "VALUES 'POLAND_2'");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2=(TIMESTAMP '2001-1-22 00:00:00') OR short_name2=(TIMESTAMP '2001-1-22 00:00:02') )", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name2 > TIMESTAMP '2001-1-22 00:00:02'", fullyQualifiedTestTableName),
-                "VALUES ('CZECH_1'), ('CZECH_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name2 >= TIMESTAMP '2001-1-22 00:00:02' AND short_name2 <= TIMESTAMP '2001-1-22 00:00:06'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-    }
-
-    @Test
-    public void testDatePartitionProjectionOnTimestampColumnWithIntervalExpressionCreatedOnTrino()
-    {
-        String tableName = getRandomTestTableName();
-        String dateProjectionFormat = "yyyy-MM-dd HH:mm:ss";
-        computeActual(
-                "CREATE TABLE " + getFullyQualifiedTestTableName(tableName) + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  ), " +
-                        "  short_name2 timestamp WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='" + dateProjectionFormat + "', " +
-                        // We set range to -5 minutes to NOW in order to be sure it will grab all test dates
-                        // which range is -4 minutes till now. Also, we have to consider max no. of partitions 1k
-                        "    partition_projection_range=ARRAY['NOW-5MINUTES', 'NOW'], " +
-                        "    partition_projection_interval=1, " +
-                        "    partition_projection_interval_unit='SECONDS'" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.format[ |]+" + quote(dateProjectionFormat) + "[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+NOW-5MINUTES,NOW[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.interval[ |]+1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.interval\\.unit[ |]+seconds[ |]+");
-        testDatePartitionProjectionOnTimestampColumnWithIntervalExpression(tableName, dateProjectionFormat);
-    }
-
-    @Test
-    public void testDatePartitionProjectionOnTimestampColumnWithIntervalExpressionCreatedOnHive()
-    {
-        String tableName = getRandomTestTableName();
-        String dateProjectionFormat = "yyyy-MM-dd HH:mm:ss";
-        hiveMinioDataLake.getHiveHadoop().runOnHive(
-                "CREATE TABLE " + getHiveTestTableName(tableName) + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint " +
-                        ") " +
-                        "PARTITIONED BY (" +
-                        "  short_name1 varchar(152), " +
-                        "  short_name2 timestamp " +
-                        ") " +
-                        "TBLPROPERTIES ( " +
-                        "  'projection.enabled'='true', " +
-                        "  'projection.short_name1.type'='enum', " +
-                        "  'projection.short_name1.values'='PL1,CZ1', " +
-                        "  'projection.short_name2.type'='date', " +
-                        "  'projection.short_name2.format'='" + dateProjectionFormat + "', " +
-                        // We set range to -5 minutes to NOW in order to be sure it will grab all test dates
-                        // which range is -4 minutes till now. Also, we have to consider max no. of partitions 1k
-                        "  'projection.short_name2.range'='NOW-5MINUTES,NOW', " +
-                        "  'projection.short_name2.interval'='1', " +
-                        "  'projection.short_name2.interval.unit'='SECONDS'" +
-                        ")");
-        testDatePartitionProjectionOnTimestampColumnWithIntervalExpression(tableName, dateProjectionFormat);
-    }
-
-    private void testDatePartitionProjectionOnTimestampColumnWithIntervalExpression(String tableName, String dateProjectionFormat)
-    {
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-
-        Instant dayToday = Instant.now();
-        DateFormat dateFormat = new SimpleDateFormat(dateProjectionFormat);
-        dateFormat.setTimeZone(TimeZone.getTimeZone(ZoneId.of("UTC")));
-        String minutesNowFormatted = moveDate(dateFormat, dayToday, MINUTES, 0);
-        String minutes1AgoFormatter = moveDate(dateFormat, dayToday, MINUTES, -1);
-        String minutes2AgoFormatted = moveDate(dateFormat, dayToday, MINUTES, -2);
-        String minutes3AgoFormatted = moveDate(dateFormat, dayToday, MINUTES, -3);
-        String minutes4AgoFormatted = moveDate(dateFormat, dayToday, MINUTES, -4);
-
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "TIMESTAMP '" + minutesNowFormatted + "'"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "TIMESTAMP '" + minutes1AgoFormatter + "'"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "TIMESTAMP '" + minutes2AgoFormatted + "'"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "TIMESTAMP '" + minutes3AgoFormatted + "'"),
-                        ImmutableList.of("'CZECH_3'", "'Comment'", "4", "5", "'CZ1'", "TIMESTAMP '" + minutes4AgoFormatted + "'"))));
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name2 > ( TIMESTAMP '%s' ) AND short_name2 <= ( TIMESTAMP '%s' )", fullyQualifiedTestTableName, minutes4AgoFormatted, minutes1AgoFormatter),
-                "VALUES ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-    }
-
-    @Test
-    public void testDatePartitionProjectionOnVarcharColumnWithHoursInterval()
-    {
-        String tableName = getRandomTestTableName();
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-
-        computeActual(
-                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  ), " +
-                        "  short_name2 varchar WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='yyyy-MM-dd HH', " +
-                        "    partition_projection_range=ARRAY['2001-01-22 00', '2001-01-22 06'], " +
-                        "    partition_projection_interval=2, " +
-                        "    partition_projection_interval_unit='HOURS'" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+date[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.format[ |]+yyyy-MM-dd HH[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+2001-01-22 00,2001-01-22 06[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.interval[ |]+2[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.interval\\.unit[ |]+hours[ |]+");
-
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'2001-01-22 00'"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'2001-01-22 02'"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'2001-01-22 04'"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'2001-01-22 06'"),
-                        ImmutableList.of("'CZECH_3'", "'Comment'", "4", "5", "'CZ1'", "'2001-01-22 08'"))));
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='2001-01-22 02'", fullyQualifiedTestTableName),
-                "VALUES 'POLAND_2'");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2='2001-01-22 00' OR short_name2='2001-01-22 02' )", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name2 > '2001-01-22 02'", fullyQualifiedTestTableName),
-                "VALUES ('CZECH_1'), ('CZECH_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name2 >= '2001-01-22 02' AND short_name2 <= '2001-01-22 06'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-    }
-
-    @Test
-    public void testDatePartitionProjectionOnVarcharColumnWithDaysInterval()
-    {
-        String tableName = getRandomTestTableName();
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-
-        computeActual(
-                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  ), " +
-                        "  short_name2 varchar WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='yyyy-MM-dd', " +
-                        "    partition_projection_range=ARRAY['2001-01-01', '2001-01-07'], " +
-                        "    partition_projection_interval=2, " +
-                        "    partition_projection_interval_unit='DAYS'" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+date[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.format[ |]+yyyy-MM-dd[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+2001-01-01,2001-01-07[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.interval[ |]+2[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.interval\\.unit[ |]+days[ |]+");
-
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'2001-01-01'"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'2001-01-03'"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'2001-01-05'"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'2001-01-07'"),
-                        ImmutableList.of("'CZECH_3'", "'Comment'", "4", "5", "'CZ1'", "'2001-01-09'"))));
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='2001-01-03'", fullyQualifiedTestTableName),
-                "VALUES 'POLAND_2'");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2='2001-01-01' OR short_name2='2001-01-03' )", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name2 > '2001-01-03'", fullyQualifiedTestTableName),
-                "VALUES ('CZECH_1'), ('CZECH_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name2 >= '2001-01-03' AND short_name2 <= '2001-01-07'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-    }
-
-    @Test
-    public void testDatePartitionProjectionOnVarcharColumnWithIntervalExpression()
-    {
-        String tableName = getRandomTestTableName();
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-        String dateProjectionFormat = "yyyy-MM-dd";
-
-        computeActual(
-                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  ), " +
-                        "  short_name2 varchar WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='" + dateProjectionFormat + "', " +
-                        "    partition_projection_range=ARRAY['NOW-3DAYS', 'NOW']" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+date[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.format[ |]+" + quote(dateProjectionFormat) + "[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+NOW-3DAYS,NOW[ |]+");
-
-        Instant dayToday = Instant.now();
-        DateFormat dateFormat = new SimpleDateFormat(dateProjectionFormat);
-        dateFormat.setTimeZone(TimeZone.getTimeZone(ZoneId.of("UTC")));
-        String dayTodayFormatted = moveDate(dateFormat, dayToday, DAYS, 0);
-        String day1AgoFormatter = moveDate(dateFormat, dayToday, DAYS, -1);
-        String day2AgoFormatted = moveDate(dateFormat, dayToday, DAYS, -2);
-        String day3AgoFormatted = moveDate(dateFormat, dayToday, DAYS, -3);
-        String day4AgoFormatted = moveDate(dateFormat, dayToday, DAYS, -4);
-
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'" + dayTodayFormatted + "'"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'" + day1AgoFormatter + "'"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'" + day2AgoFormatted + "'"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'" + day3AgoFormatted + "'"),
-                        ImmutableList.of("'CZECH_3'", "'Comment'", "4", "5", "'CZ1'", "'" + day4AgoFormatted + "'"))));
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='%s'", fullyQualifiedTestTableName, day1AgoFormatter),
-                "VALUES 'POLAND_2'");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2='%s' OR short_name2='%s' )", fullyQualifiedTestTableName, dayTodayFormatted, day1AgoFormatter),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name2 > '%s'", fullyQualifiedTestTableName, day2AgoFormatted),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name2 >= '%s' AND short_name2 <= '%s'", fullyQualifiedTestTableName, day4AgoFormatted, day1AgoFormatter),
-                "VALUES ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2')");
-
-        assertQuery(
-                format("SELECT name FROM %s", fullyQualifiedTestTableName),
-                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
-    }
-
-    private String moveDate(DateFormat format, Instant today, TemporalUnit unit, int move)
-    {
-        return format.format(new Date(today.plus(move, unit).toEpochMilli()));
-    }
-
-    @Test
-    public void testDatePartitionProjectionFormatTextWillNotCauseIntervalRequirement()
-    {
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName();
-
-        computeActual(
-                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='''start''yyyy-MM-dd''end''''s''', " +
-                        "    partition_projection_range=ARRAY['start2001-01-01end''s', 'start2001-01-07end''s'] " +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-    }
-
-    @Test
-    public void testInjectedPartitionProjectionOnVarcharColumn()
-    {
-        String tableName = getRandomTestTableName();
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-
-        computeActual(
-                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
-                        "  name varchar(25), " +
-                        "  comment varchar(152), " +
-                        "  nationkey bigint, " +
-                        "  regionkey bigint, " +
-                        "  short_name1 varchar(152) WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "   ), " +
-                        "  short_name2 varchar(152) WITH (" +
-                        "    partition_projection_type='injected'" +
-                        "   ) " +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")");
-
-        assertThat(
-                hiveMinioDataLake.getHiveHadoop()
-                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
-                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
-                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
-                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+injected[ |]+");
-
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'001'"),
-                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'002'"),
-                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'003'"),
-                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'004'"))));
-
-        assertQuery(
-                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='002'", fullyQualifiedTestTableName),
-                "VALUES 'POLAND_2'");
-
-        assertThatThrownBy(
-                () -> getQueryRunner().execute(
-                        format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2='002' OR short_name2='001' )", fullyQualifiedTestTableName)))
-                .hasMessage("Column projection for column 'short_name2' failed. Injected projection requires single predicate for it's column in where clause. Currently provided can't be converted to single partition.");
-
-        assertThatThrownBy(
-                () -> getQueryRunner().execute(
-                        format("SELECT name FROM %s", fullyQualifiedTestTableName)))
-                .hasMessage("Column projection for column 'short_name2' failed. Injected projection requires single predicate for it's column in where clause");
-
-        assertThatThrownBy(
-                () -> getQueryRunner().execute(
-                        format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName)))
-                .hasMessage("Column projection for column 'short_name2' failed. Injected projection requires single predicate for it's column in where clause");
-    }
-
-    @Test
-    public void testPartitionProjectionInvalidTableProperties()
-    {
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar " +
-                        ") WITH ( " +
-                        "  partition_projection_enabled=true " +
-                        ")"))
-                .hasMessage("Partition projection can't be enabled when no partition columns are defined.");
-
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar WITH ( " +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1']" +
-                        "  ), " +
-                        "  short_name1 varchar " +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1'], " +
-                        "  partition_projection_enabled=true " +
-                        ")"))
-                .hasMessage("Partition projection can't be defined for non partition column: 'name'");
-
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar, " +
-                        "  short_name1 varchar WITH ( " +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1']" +
-                        "  ), " +
-                        "  short_name2 varchar " +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")"))
-                .hasMessage("Partition projection definition for column: 'short_name2' missing");
-
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar, " +
-                        "  short_name1 varchar WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  ), " +
-                        "  short_name2 varchar WITH (" +
-                        "    partition_projection_type='injected' " +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true, " +
-                        "  partition_projection_location_template='s3a://dummy/short_name1=${short_name1}/'" +
-                        ")"))
-                .hasMessage("Partition projection location template: s3a://dummy/short_name1=${short_name1}/ " +
-                        "is missing partition column: 'short_name2' placeholder");
-
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar, " +
-                        "  short_name1 varchar WITH (" +
-                        "    partition_projection_type='integer', " +
-                        "    partition_projection_range=ARRAY['1', '2', '3']" +
-                        "   ), " +
-                        "  short_name2 varchar WITH (" +
-                        "    partition_projection_type='enum', " +
-                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
-                        "  partition_projection_enabled=true " +
-                        ")"))
-                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_range' needs to be list of 2 integers");
-
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar, " +
-                        "  short_name1 varchar WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_values=ARRAY['2001-01-01', '2001-01-02']" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1'], " +
-                        "  partition_projection_enabled=true " +
-                        ")"))
-                .hasMessage("Column projection for column 'short_name1' failed. Missing required property: 'partition_projection_format'");
-
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar, " +
-                        "  short_name1 varchar WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='yyyy-MM-dd HH', " +
-                        "    partition_projection_range=ARRAY['2001-01-01', '2001-01-02']" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1'], " +
-                        "  partition_projection_enabled=true " +
-                        ")"))
-                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_range' needs to be a list of 2 valid dates formatted as 'yyyy-MM-dd HH' " +
-                        "or '^\\s*NOW\\s*(([+-])\\s*([0-9]+)\\s*(DAY|HOUR|MINUTE|SECOND)S?\\s*)?$' that are sequential. Unparseable date: \"2001-01-01\"");
-
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar, " +
-                        "  short_name1 varchar WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='yyyy-MM-dd', " +
-                        "    partition_projection_range=ARRAY['NOW*3DAYS', '2001-01-02']" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1'], " +
-                        "  partition_projection_enabled=true " +
-                        ")"))
-                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_range' needs to be a list of 2 valid dates formatted as 'yyyy-MM-dd' " +
-                        "or '^\\s*NOW\\s*(([+-])\\s*([0-9]+)\\s*(DAY|HOUR|MINUTE|SECOND)S?\\s*)?$' that are sequential. Unparseable date: \"NOW*3DAYS\"");
-
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar, " +
-                        "  short_name1 varchar WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='yyyy-MM-dd', " +
-                        "    partition_projection_range=ARRAY['2001-01-02', '2001-01-01']" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1'], " +
-                        "  partition_projection_enabled=true " +
-                        ")"))
-                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_range' needs to be a list of 2 valid dates formatted as 'yyyy-MM-dd' " +
-                        "or '^\\s*NOW\\s*(([+-])\\s*([0-9]+)\\s*(DAY|HOUR|MINUTE|SECOND)S?\\s*)?$' that are sequential");
-
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar, " +
-                        "  short_name1 varchar WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='yyyy-MM-dd', " +
-                        "    partition_projection_range=ARRAY['2001-01-01', '2001-01-02'], " +
-                        "    partition_projection_interval_unit='Decades'" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1'], " +
-                        "  partition_projection_enabled=true " +
-                        ")"))
-                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_interval_unit' value 'Decades' is invalid. " +
-                        "Available options: [Days, Hours, Minutes, Seconds]");
-
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar, " +
-                        "  short_name1 varchar WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='yyyy-MM-dd HH', " +
-                        "    partition_projection_range=ARRAY['2001-01-01 10', '2001-01-02 10']" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1'], " +
-                        "  partition_projection_enabled=true " +
-                        ")"))
-                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_interval_unit' " +
-                        "needs to be set when provided 'partition_projection_format' is less that single-day precision. " +
-                        "Interval defaults to 1 day or 1 month, respectively. Otherwise, interval is required");
-
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar, " +
-                        "  short_name1 varchar WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='yyyy-MM-dd', " +
-                        "    partition_projection_range=ARRAY['2001-01-01 10', '2001-01-02 10']" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1'] " +
-                        ")"))
-                .hasMessage("Columns ['short_name1'] projections are disallowed when partition projection property 'partition_projection_enabled' is missing");
-
-        // Verify that ignored flag is only interpreted for pre-existing tables where configuration is loaded from metastore.
-        // It should not allow creating corrupted config via Trino. It's a kill switch to run away when we have compatibility issues.
-        assertThatThrownBy(() -> getQueryRunner().execute(
-                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
-                        "  name varchar, " +
-                        "  short_name1 varchar WITH (" +
-                        "    partition_projection_type='date', " +
-                        "    partition_projection_format='yyyy-MM-dd HH', " +
-                        "    partition_projection_range=ARRAY['2001-01-01 10', '2001-01-02 10']" +
-                        "  )" +
-                        ") WITH ( " +
-                        "  partitioned_by=ARRAY['short_name1'], " +
-                        "  partition_projection_enabled=false, " +
-                        "  partition_projection_ignore=true " + // <-- Even if this is set we disallow creating corrupted configuration via Trino
-                        ")"))
-                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_interval_unit' " +
-                        "needs to be set when provided 'partition_projection_format' is less that single-day precision. " +
-                        "Interval defaults to 1 day or 1 month, respectively. Otherwise, interval is required");
-    }
-
-    @Test
-    public void testPartitionProjectionIgnore()
-    {
-        String tableName = "nation_" + randomNameSuffix();
-        String hiveTestTableName = getHiveTestTableName(tableName);
-        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
-
-        // Create corrupted configuration
-        hiveMinioDataLake.getHiveHadoop().runOnHive(
-                "CREATE TABLE " + hiveTestTableName + " ( " +
-                        "  name varchar(25) " +
-                        ") PARTITIONED BY (" +
-                        "  date_time varchar(152) " +
-                        ") " +
-                        "TBLPROPERTIES ( " +
-                        "  'projection.enabled'='true', " +
-                        "  'projection.date_time.type'='date', " +
-                        "  'projection.date_time.format'='yyyy-MM-dd HH', " +
-                        "  'projection.date_time.range'='2001-01-01,2001-01-02' " +
-                        ")");
-
-        // Expect invalid Partition Projection properties to fail
-        assertThatThrownBy(() -> getQueryRunner().execute("SELECT * FROM " + fullyQualifiedTestTableName))
-                .hasMessage("Column projection for column 'date_time' failed. Property: 'partition_projection_range' needs to be a list of 2 valid dates formatted as 'yyyy-MM-dd HH' " +
-                        "or '^\\s*NOW\\s*(([+-])\\s*([0-9]+)\\s*(DAY|HOUR|MINUTE|SECOND)S?\\s*)?$' that are sequential. Unparseable date: \"2001-01-01\"");
-
-        // Append kill switch table property to ignore Partition Projection properties
-        hiveMinioDataLake.getHiveHadoop().runOnHive(
-                "ALTER TABLE " + hiveTestTableName + " SET TBLPROPERTIES ( 'trino.partition_projection.ignore'='TRUE' )");
-        // Flush cache to get new definition
-        computeActual("CALL system.flush_metadata_cache()");
-
-        // Verify query execution works
-        computeActual(createInsertStatement(
-                fullyQualifiedTestTableName,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND_1'", "'2022-02-01 12'"),
-                        ImmutableList.of("'POLAND_2'", "'2022-02-01 12'"),
-                        ImmutableList.of("'CZECH_1'", "'2022-02-01 13'"),
-                        ImmutableList.of("'CZECH_2'", "'2022-02-01 13'"))));
-
-        assertQuery("SELECT * FROM " + fullyQualifiedTestTableName,
-                "VALUES ('POLAND_1', '2022-02-01 12'), " +
-                        "('POLAND_2', '2022-02-01 12'), " +
-                        "('CZECH_1', '2022-02-01 13'), " +
-                        "('CZECH_2', '2022-02-01 13')");
-        assertQuery("SELECT * FROM " + fullyQualifiedTestTableName + " WHERE date_time = '2022-02-01 12'",
-                "VALUES ('POLAND_1', '2022-02-01 12'), ('POLAND_2', '2022-02-01 12')");
-    }
-
-    @Test
-    public void testAnalyzePartitionedTableWithCanonicalization()
-    {
-        String tableName = "test_analyze_table_canonicalization_" + randomNameSuffix();
-        assertUpdate("CREATE TABLE %s (a_varchar varchar, month varchar) WITH (partitioned_by = ARRAY['month'])".formatted(getFullyQualifiedTestTableName(tableName)));
-
-        assertUpdate("INSERT INTO " + getFullyQualifiedTestTableName(tableName) + " VALUES ('A', '01'), ('B', '01'), ('C', '02'), ('D', '03')", 4);
-
-        String tableLocation = (String) computeActual("SELECT DISTINCT regexp_replace(\"$path\", '/[^/]*/[^/]*$', '') FROM " + getFullyQualifiedTestTableName(tableName)).getOnlyValue();
-
-        String externalTableName = "external_" + tableName;
-        List<String> partitionColumnNames = List.of("month");
-        assertUpdate(
-                """
-                CREATE TABLE %s(
-                  a_varchar varchar,
-                  month integer)
-                WITH (
-                   partitioned_by = ARRAY['month'],
-                   external_location='%s')
-                """.formatted(getFullyQualifiedTestTableName(externalTableName), tableLocation));
-
-        addPartitions(tableName, externalTableName, partitionColumnNames, TupleDomain.all());
-        assertQuery("SELECT * FROM " + HIVE_TEST_SCHEMA + ".\"" + externalTableName + "$partitions\"", "VALUES 1, 2, 3");
-        assertUpdate("ANALYZE " + getFullyQualifiedTestTableName(externalTableName), 4);
-        assertQuery("SHOW STATS FOR " + getFullyQualifiedTestTableName(externalTableName),
-                """
-                        VALUES
-                            ('a_varchar', 4.0, 2.0, 0.0, null, null, null),
-                            ('month', null, 3.0, 0.0, null, 1, 3),
-                            (null, null, null, null, 4.0, null, null)
-                        """);
-
-        assertUpdate("INSERT INTO " + getFullyQualifiedTestTableName(tableName) + " VALUES ('E', '04')", 1);
-        addPartitions(
-                tableName,
-                externalTableName,
-                partitionColumnNames,
-                TupleDomain.fromFixedValues(Map.of("month", new NullableValue(VARCHAR, utf8Slice("04")))));
-        assertUpdate("CALL system.flush_metadata_cache(schema_name => '" + HIVE_TEST_SCHEMA + "', table_name => '" + externalTableName + "')");
-        assertQuery("SELECT * FROM " + HIVE_TEST_SCHEMA + ".\"" + externalTableName + "$partitions\"", "VALUES 1, 2, 3, 4");
-        assertUpdate("ANALYZE " + getFullyQualifiedTestTableName(externalTableName) + " WITH (partitions = ARRAY[ARRAY['04']])", 1);
-        assertQuery("SHOW STATS FOR " + getFullyQualifiedTestTableName(externalTableName),
-                """
-                        VALUES
-                            ('a_varchar', 5.0, 2.0, 0.0, null, null, null),
-                            ('month', null, 4.0, 0.0, null, 1, 4),
-                            (null, null, null, null, 5.0, null, null)
-                        """);
-        // TODO (https://github.com/trinodb/trino/issues/15998) fix selective ANALYZE for table with non-canonical partition values
-        assertQueryFails("ANALYZE " + getFullyQualifiedTestTableName(externalTableName) + " WITH (partitions = ARRAY[ARRAY['4']])", "Partition no longer exists: month=4");
-
-        assertUpdate("DROP TABLE " + getFullyQualifiedTestTableName(externalTableName));
-        assertUpdate("DROP TABLE " + getFullyQualifiedTestTableName(tableName));
-    }
-
-    @Test
-    public void testExternalLocationWithTrailingSpace()
-    {
-        String tableName = "test_external_location_with_trailing_space_" + randomNameSuffix();
-        String tableLocationDirWithTrailingSpace = tableName + " ";
-        String tableLocation = format("s3a://%s/%s/%s", bucketName, HIVE_TEST_SCHEMA, tableLocationDirWithTrailingSpace);
-
-        byte[] contents = "hello\u0001world\nbye\u0001world".getBytes(UTF_8);
-        String targetPath = format("%s/%s/test.txt", HIVE_TEST_SCHEMA, tableLocationDirWithTrailingSpace);
-        hiveMinioDataLake.getMinioClient().putObject(bucketName, contents, targetPath);
-
-        assertUpdate(format(
-                "CREATE TABLE %s (" +
-                        "  a varchar, " +
-                        "  b varchar) " +
-                        "WITH (format='TEXTFILE', external_location='%s')",
-                tableName,
-                tableLocation));
-
-        assertQuery("SELECT a, b FROM " + tableName, "VALUES ('hello', 'world'), ('bye', 'world')");
-
-        String actualTableLocation = getTableLocation(tableName);
-        assertThat(actualTableLocation).isEqualTo(tableLocation);
-
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
-    private void renamePartitionResourcesOutsideTrino(String tableName, String partitionColumn, String regionKey)
-    {
-        String partitionName = format("%s=%s", partitionColumn, regionKey);
-        String partitionS3KeyPrefix = format("%s/%s/%s", HIVE_TEST_SCHEMA, tableName, partitionName);
-        String renamedPartitionSuffix = "CP";
-
-        // Copy whole partition to new location
-        MinioClient minioClient = hiveMinioDataLake.getMinioClient();
-        minioClient.listObjects(bucketName, "/")
-                .forEach(objectKey -> {
-                    if (objectKey.startsWith(partitionS3KeyPrefix)) {
-                        String fileName = objectKey.substring(objectKey.lastIndexOf('/'));
-                        String destinationKey = partitionS3KeyPrefix + renamedPartitionSuffix + fileName;
-                        minioClient.copyObject(bucketName, objectKey, bucketName, destinationKey);
-                    }
-                });
-
-        // Delete old partition and update metadata to point to location of new copy
-        Table hiveTable = metastoreClient.getTable(HIVE_TEST_SCHEMA, tableName).get();
-        Partition hivePartition = metastoreClient.getPartition(hiveTable, List.of(regionKey)).get();
-        Map<String, PartitionStatistics> partitionStatistics =
-                metastoreClient.getPartitionStatistics(hiveTable, List.of(hivePartition));
-
-        metastoreClient.dropPartition(HIVE_TEST_SCHEMA, tableName, List.of(regionKey), true);
-        metastoreClient.addPartitions(HIVE_TEST_SCHEMA, tableName, List.of(
-                new PartitionWithStatistics(
-                        Partition.builder(hivePartition)
-                                .withStorage(builder -> builder.setLocation(
-                                        hivePartition.getStorage().getLocation() + renamedPartitionSuffix))
-                                .build(),
-                        partitionName,
-                        partitionStatistics.get(partitionName))));
-    }
-
-    protected void assertInsertFailure(String testTable, String expectedMessageRegExp)
-    {
-        assertInsertFailure(getSession(), testTable, expectedMessageRegExp);
-    }
-
-    protected void assertInsertFailure(Session session, String testTable, String expectedMessageRegExp)
-    {
-        assertQueryFails(
-                session,
-                createInsertAsSelectFromTpchStatement(testTable),
-                expectedMessageRegExp);
-    }
-
-    private String createInsertAsSelectFromTpchStatement(String testTable)
-    {
-        return format("INSERT INTO %s " +
-                        "SELECT name, comment, nationkey, regionkey " +
-                        "FROM tpch.tiny.nation",
-                testTable);
-    }
-
-    protected String createInsertStatement(String testTable, List<List<String>> data)
-    {
-        String values = data.stream()
-                .map(row -> String.join(", ", row))
-                .collect(Collectors.joining("), ("));
-        return format("INSERT INTO %s VALUES (%s)", testTable, values);
-    }
-
-    protected void assertOverwritePartition(String testTable)
-    {
-        computeActual(createInsertStatement(
-                testTable,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND'", "'Test Data'", "25", "5"),
-                        ImmutableList.of("'CZECH'", "'Test Data'", "26", "5"))));
-        query(format("SELECT name, comment, nationkey, regionkey FROM %s WHERE regionkey = 5", testTable))
-                .assertThat()
-                .skippingTypesCheck()
-                .containsAll(resultBuilder(getSession())
-                        .row("POLAND", "Test Data", 25L, 5L)
-                        .row("CZECH", "Test Data", 26L, 5L)
-                        .build());
-
-        computeActual(createInsertStatement(
-                testTable,
-                ImmutableList.of(
-                        ImmutableList.of("'POLAND'", "'Overwrite'", "25", "5"))));
-        query(format("SELECT name, comment, nationkey, regionkey FROM %s WHERE regionkey = 5", testTable))
-                .assertThat()
-                .skippingTypesCheck()
-                .containsAll(resultBuilder(getSession())
-                        .row("POLAND", "Overwrite", 25L, 5L)
-                        .build());
-        computeActual(format("DROP TABLE %s", testTable));
-    }
-
-    protected String getRandomTestTableName()
-    {
-        return "nation_" + randomNameSuffix();
-    }
-
-    protected String getFullyQualifiedTestTableName()
-    {
-        return getFullyQualifiedTestTableName(getRandomTestTableName());
-    }
-
-    protected String getFullyQualifiedTestTableName(String tableName)
-    {
-        return getFullyQualifiedTestTableName(HIVE_TEST_SCHEMA, tableName);
-    }
-
-    protected String getFullyQualifiedTestTableName(String schemaName, String tableName)
-    {
-        return "hive.%s.%s".formatted(schemaName, tableName);
-    }
-
-    protected String getHiveTestTableName(String tableName)
-    {
-        return getHiveTestTableName(HIVE_TEST_SCHEMA, tableName);
-    }
-
-    protected String getHiveTestTableName(String schemaName, String tableName)
-    {
-        return "%s.%s".formatted(schemaName, tableName);
-    }
-
-    protected String getCreateTableStatement(String tableName, String... propertiesEntries)
-    {
-        return getCreateTableStatement(tableName, Arrays.asList(propertiesEntries));
-    }
-
-    protected String getCreateTableStatement(String tableName, List<String> propertiesEntries)
-    {
-        return format(
-                "CREATE TABLE %s (" +
-                        "    name varchar(25), " +
-                        "    comment varchar(152),  " +
-                        "    nationkey bigint, " +
-                        "    regionkey bigint) " +
-                        (propertiesEntries.size() < 1 ? "" : propertiesEntries
-                                .stream()
-                                .collect(joining(",", "WITH (", ")"))),
-                tableName);
-    }
-
-    protected void copyTpchNationToTable(String testTable)
-    {
-        computeActual(format("INSERT INTO " + testTable + " SELECT name, comment, nationkey, regionkey FROM tpch.tiny.nation"));
-    }
-
-    private void testWriteWithFileSize(String testTable, int scaleFactorInThousands, long fileSizeRangeStart, long fileSizeRangeEnd)
-    {
-        String scaledColumnExpression = format("array_join(transform(sequence(1, %d), x-> array_join(repeat(comment, 1000), '')), '')", scaleFactorInThousands);
-        computeActual(format("INSERT INTO " + testTable + " SELECT %s, %s, regionkey FROM tpch.tiny.nation WHERE nationkey = 9", scaledColumnExpression, scaledColumnExpression));
-        query(format("SELECT length(col1) FROM %s", testTable))
-                .assertThat()
-                .skippingTypesCheck()
-                .containsAll(resultBuilder(getSession())
-                        .row(114L * scaleFactorInThousands * 1000)
-                        .build());
-        query(format("SELECT \"$file_size\" BETWEEN %d AND %d FROM %s", fileSizeRangeStart, fileSizeRangeEnd, testTable))
-                .assertThat()
-                .skippingTypesCheck()
-                .containsAll(resultBuilder(getSession())
-                        .row(true)
-                        .build());
-    }
-
-    private void addPartitions(
-            String sourceTableName,
-            String destinationExternalTableName,
-            List<String> columnNames,
-            TupleDomain<String> partitionsKeyFilter)
-    {
-        Optional<List<String>> partitionNames = metastoreClient.getPartitionNamesByFilter(HIVE_TEST_SCHEMA, sourceTableName, columnNames, partitionsKeyFilter);
-        if (partitionNames.isEmpty()) {
-            // nothing to add
-            return;
-        }
-        Table table = metastoreClient.getTable(HIVE_TEST_SCHEMA, sourceTableName)
-                .orElseThrow(() -> new TableNotFoundException(new SchemaTableName(HIVE_TEST_SCHEMA, sourceTableName)));
-        Map<String, Optional<Partition>> partitionsByNames = metastoreClient.getPartitionsByNames(table, partitionNames.get());
-
-        metastoreClient.addPartitions(
-                HIVE_TEST_SCHEMA,
-                destinationExternalTableName,
-                partitionsByNames.entrySet().stream()
-                        .map(e -> new PartitionWithStatistics(
-                                e.getValue()
-                                        .map(p -> Partition.builder(p).setTableName(destinationExternalTableName).build())
-                                        .orElseThrow(),
-                                e.getKey(),
-                                PartitionStatistics.empty()))
-                        .collect(toImmutableList()));
-    }
-
-    private String getTableLocation(String tableName)
-    {
-        return (String) computeScalar("SELECT DISTINCT regexp_replace(\"$path\", '/[^/]*$', '') FROM " + tableName);
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveBenchmarkQueryRunner.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveBenchmarkQueryRunner.java
index 8b07d699cc94..d91e3629c2d0 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveBenchmarkQueryRunner.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveBenchmarkQueryRunner.java
@@ -30,7 +30,7 @@
 
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.util.Objects.requireNonNull;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveFileSystemTestUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveFileSystemTestUtils.java
index 4ae990494623..a43d782d67f9 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveFileSystemTestUtils.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveFileSystemTestUtils.java
@@ -117,80 +117,6 @@ public static Transaction newTransaction(HiveTransactionManager transactionManag
         return new HiveTransaction(transactionManager);
     }
 
-    public static MaterializedResult filterTable(SchemaTableName tableName,
-                                                 List<ColumnHandle> projectedColumns,
-                                                 HiveTransactionManager transactionManager,
-                                                 HiveConfig config,
-                                                 ConnectorPageSourceProvider pageSourceProvider,
-                                                 ConnectorSplitManager splitManager)
-            throws IOException
-    {
-        ConnectorMetadata metadata = null;
-        ConnectorSession session = null;
-        ConnectorSplitSource splitSource = null;
-
-        try (Transaction transaction = newTransaction(transactionManager)) {
-            metadata = transaction.getMetadata();
-            session = newSession(config);
-
-            ConnectorTableHandle table = getTableHandle(metadata, tableName, session);
-
-            metadata.beginQuery(session);
-            splitSource = getSplits(splitManager, transaction, session, table);
-
-            List<Type> allTypes = getTypes(projectedColumns);
-            List<Type> dataTypes = getTypes(projectedColumns.stream()
-                    .filter(columnHandle -> !((HiveColumnHandle) columnHandle).isHidden())
-                    .collect(toImmutableList()));
-            MaterializedResult.Builder result = MaterializedResult.resultBuilder(session, dataTypes);
-
-            List<ConnectorSplit> splits = getAllSplits(splitSource);
-            for (ConnectorSplit split : splits) {
-                try (ConnectorPageSource pageSource = pageSourceProvider.createPageSource(transaction.getTransactionHandle(),
-                        session, split, table, projectedColumns, DynamicFilter.EMPTY)) {
-                    MaterializedResult pageSourceResult = materializeSourceDataStream(session, pageSource, allTypes);
-                    for (MaterializedRow row : pageSourceResult.getMaterializedRows()) {
-                        Object[] dataValues = IntStream.range(0, row.getFieldCount())
-                                .filter(channel -> !((HiveColumnHandle) projectedColumns.get(channel)).isHidden())
-                                .mapToObj(row::getField)
-                                .toArray();
-                        result.row(dataValues);
-                    }
-                }
-            }
-            return result.build();
-        }
-        finally {
-            cleanUpQuery(metadata, session);
-            closeQuietly(splitSource);
-        }
-    }
-
-    public static int getSplitsCount(SchemaTableName tableName,
-                                     HiveTransactionManager transactionManager,
-                                     HiveConfig config,
-                                     ConnectorSplitManager splitManager)
-    {
-        ConnectorMetadata metadata = null;
-        ConnectorSession session = null;
-        ConnectorSplitSource splitSource = null;
-
-        try (Transaction transaction = newTransaction(transactionManager)) {
-            metadata = transaction.getMetadata();
-            session = newSession(config);
-
-            ConnectorTableHandle table = getTableHandle(metadata, tableName, session);
-
-            metadata.beginQuery(session);
-            splitSource = getSplits(splitManager, transaction, session, table);
-            return getAllSplits(splitSource).size();
-        }
-        finally {
-            cleanUpQuery(metadata, session);
-            closeQuietly(splitSource);
-        }
-    }
-
     private static void closeQuietly(Closeable closeable)
     {
         try {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java
index ce5623e413a9..19fa8bb0cd6e 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java
@@ -15,9 +15,11 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.inject.Module;
 import io.airlift.log.Logger;
 import io.airlift.log.Logging;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.Session;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.plugin.hive.fs.DirectoryLister;
@@ -48,7 +50,7 @@
 import static com.google.inject.util.Modules.EMPTY_MODULE;
 import static io.airlift.log.Level.WARN;
 import static io.airlift.units.Duration.nanosSince;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.plugin.hive.security.HiveSecurityModule.ALLOW_ALL;
 import static io.trino.plugin.hive.security.HiveSecurityModule.SQL_STANDARD;
 import static io.trino.plugin.tpch.ColumnNaming.SIMPLIFIED;
@@ -104,11 +106,11 @@ public static class Builder<SELF extends Builder<?>>
             File baseDir = queryRunner.getCoordinator().getBaseDataDir().resolve("hive_data").toFile();
             return createTestingFileHiveMetastore(baseDir);
         };
+        private Optional<OpenTelemetry> openTelemetry = Optional.empty();
         private Module module = EMPTY_MODULE;
         private Optional<DirectoryLister> directoryLister = Optional.empty();
         private boolean tpcdsCatalogEnabled;
         private boolean tpchBucketedCatalogEnabled;
-        private String security = SQL_STANDARD;
         private boolean createTpchSchemas = true;
         private ColumnNaming tpchColumnNaming = SIMPLIFIED;
         private DecimalTypeMapping tpchDecimalTypeMapping = DOUBLE;
@@ -123,12 +125,14 @@ protected Builder(Session defaultSession)
             super(defaultSession);
         }
 
+        @CanIgnoreReturnValue
         public SELF setSkipTimezoneSetup(boolean skipTimezoneSetup)
         {
             this.skipTimezoneSetup = skipTimezoneSetup;
             return self();
         }
 
+        @CanIgnoreReturnValue
         public SELF setHiveProperties(Map<String, String> hiveProperties)
         {
             this.hiveProperties = ImmutableMap.<String, String>builder()
@@ -136,78 +140,91 @@ public SELF setHiveProperties(Map<String, String> hiveProperties)
             return self();
         }
 
+        @CanIgnoreReturnValue
         public SELF addHiveProperty(String key, String value)
         {
             this.hiveProperties.put(key, value);
             return self();
         }
 
+        @CanIgnoreReturnValue
         public SELF setInitialTables(Iterable<TpchTable<?>> initialTables)
         {
             this.initialTables = ImmutableList.copyOf(requireNonNull(initialTables, "initialTables is null"));
             return self();
         }
 
+        @CanIgnoreReturnValue
         public SELF setInitialSchemasLocationBase(String initialSchemasLocationBase)
         {
             this.initialSchemasLocationBase = Optional.of(initialSchemasLocationBase);
             return self();
         }
 
+        @CanIgnoreReturnValue
         public SELF setInitialTablesSessionMutator(Function<Session, Session> initialTablesSessionMutator)
         {
             this.initialTablesSessionMutator = requireNonNull(initialTablesSessionMutator, "initialTablesSessionMutator is null");
             return self();
         }
 
+        @CanIgnoreReturnValue
         public SELF setMetastore(Function<DistributedQueryRunner, HiveMetastore> metastore)
         {
             this.metastore = requireNonNull(metastore, "metastore is null");
             return self();
         }
 
+        @CanIgnoreReturnValue
+        public SELF setOpenTelemetry(OpenTelemetry openTelemetry)
+        {
+            this.openTelemetry = Optional.of(openTelemetry);
+            return self();
+        }
+
+        @CanIgnoreReturnValue
         public SELF setModule(Module module)
         {
             this.module = requireNonNull(module, "module is null");
             return self();
         }
 
+        @CanIgnoreReturnValue
         public SELF setDirectoryLister(DirectoryLister directoryLister)
         {
             this.directoryLister = Optional.ofNullable(directoryLister);
             return self();
         }
 
+        @CanIgnoreReturnValue
         public SELF setTpcdsCatalogEnabled(boolean tpcdsCatalogEnabled)
         {
             this.tpcdsCatalogEnabled = tpcdsCatalogEnabled;
             return self();
         }
 
+        @CanIgnoreReturnValue
         public SELF setTpchBucketedCatalogEnabled(boolean tpchBucketedCatalogEnabled)
         {
             this.tpchBucketedCatalogEnabled = tpchBucketedCatalogEnabled;
             return self();
         }
 
-        public SELF setSecurity(String security)
-        {
-            this.security = requireNonNull(security, "security is null");
-            return self();
-        }
-
+        @CanIgnoreReturnValue
         public SELF setCreateTpchSchemas(boolean createTpchSchemas)
         {
             this.createTpchSchemas = createTpchSchemas;
             return self();
         }
 
+        @CanIgnoreReturnValue
         public SELF setTpchColumnNaming(ColumnNaming tpchColumnNaming)
         {
             this.tpchColumnNaming = requireNonNull(tpchColumnNaming, "tpchColumnNaming is null");
             return self();
         }
 
+        @CanIgnoreReturnValue
         public SELF setTpchDecimalTypeMapping(DecimalTypeMapping tpchDecimalTypeMapping)
         {
             this.tpchDecimalTypeMapping = requireNonNull(tpchDecimalTypeMapping, "tpchDecimalTypeMapping is null");
@@ -236,7 +253,7 @@ public DistributedQueryRunner build()
                 }
 
                 HiveMetastore metastore = this.metastore.apply(queryRunner);
-                queryRunner.installPlugin(new TestingHivePlugin(Optional.of(metastore), module, directoryLister));
+                queryRunner.installPlugin(new TestingHivePlugin(Optional.of(metastore), openTelemetry, module, directoryLister));
 
                 Map<String, String> hiveProperties = new HashMap<>();
                 if (!skipTimezoneSetup) {
@@ -246,7 +263,7 @@ public DistributedQueryRunner build()
                 }
                 hiveProperties.put("hive.max-partitions-per-scan", "1000");
                 hiveProperties.put("hive.max-partitions-for-eager-load", "1000");
-                hiveProperties.put("hive.security", security);
+                hiveProperties.put("hive.security", SQL_STANDARD);
                 hiveProperties.putAll(this.hiveProperties.buildOrThrow());
 
                 if (tpchBucketedCatalogEnabled) {
@@ -279,7 +296,7 @@ private void populateData(DistributedQueryRunner queryRunner, HiveMetastore meta
         {
             if (metastore.getDatabase(TPCH_SCHEMA).isEmpty()) {
                 metastore.createDatabase(createDatabaseMetastoreObject(TPCH_SCHEMA, initialSchemasLocationBase));
-                Session session = initialTablesSessionMutator.apply(createSession(Optional.empty()));
+                Session session = initialTablesSessionMutator.apply(queryRunner.getDefaultSession());
                 copyTpchTables(queryRunner, "tpch", TINY_SCHEMA_NAME, session, initialTables);
             }
 
@@ -401,12 +418,11 @@ public static void main(String[] args)
 
         DistributedQueryRunner queryRunner = HiveQueryRunner.builder()
                 .setExtraProperties(ImmutableMap.of("http-server.http.port", "8080"))
+                .setHiveProperties(ImmutableMap.of("hive.security", ALLOW_ALL))
                 .setSkipTimezoneSetup(true)
-                .setHiveProperties(ImmutableMap.of())
                 .setInitialTables(TpchTable.getTables())
                 .setBaseDataDir(baseDataDir)
                 .setTpcdsCatalogEnabled(true)
-                .setSecurity(ALLOW_ALL)
                 // Uncomment to enable standard column naming (column names to be prefixed with the first letter of the table name, e.g.: o_orderkey vs orderkey)
                 // and standard column types (decimals vs double for some columns). This will allow running unmodified tpch queries on the cluster.
                 //.setTpchColumnNaming(ColumnNaming.STANDARD)
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveTestUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveTestUtils.java
index fb2fd06ba2fa..3b6663db5b33 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveTestUtils.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveTestUtils.java
@@ -17,20 +17,24 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.HostAndPort;
 import io.airlift.slice.Slices;
-import io.airlift.units.DataSize;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.hdfs.DynamicHdfsConfiguration;
 import io.trino.hdfs.HdfsConfig;
 import io.trino.hdfs.HdfsConfigurationInitializer;
 import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
 import io.trino.hdfs.authentication.NoHdfsAuthentication;
+import io.trino.hdfs.azure.HiveAzureConfig;
+import io.trino.hdfs.azure.TrinoAzureConfigurationInitializer;
+import io.trino.hdfs.gcs.GoogleGcsConfigurationInitializer;
+import io.trino.hdfs.gcs.HiveGcsConfig;
+import io.trino.hdfs.s3.HiveS3Config;
+import io.trino.hdfs.s3.TrinoS3ConfigurationInitializer;
 import io.trino.operator.PagesIndex;
 import io.trino.operator.PagesIndexPageSorter;
-import io.trino.plugin.hive.azure.HiveAzureConfig;
-import io.trino.plugin.hive.azure.TrinoAzureConfigurationInitializer;
-import io.trino.plugin.hive.gcs.GoogleGcsConfigurationInitializer;
-import io.trino.plugin.hive.gcs.HiveGcsConfig;
+import io.trino.plugin.hive.avro.AvroFileWriterFactory;
+import io.trino.plugin.hive.avro.AvroPageSourceFactory;
 import io.trino.plugin.hive.line.CsvFileWriterFactory;
 import io.trino.plugin.hive.line.CsvPageSourceFactory;
 import io.trino.plugin.hive.line.JsonFileWriterFactory;
@@ -47,26 +51,19 @@
 import io.trino.plugin.hive.orc.OrcPageSourceFactory;
 import io.trino.plugin.hive.orc.OrcReaderConfig;
 import io.trino.plugin.hive.orc.OrcWriterConfig;
+import io.trino.plugin.hive.parquet.ParquetFileWriterFactory;
 import io.trino.plugin.hive.parquet.ParquetPageSourceFactory;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
 import io.trino.plugin.hive.parquet.ParquetWriterConfig;
 import io.trino.plugin.hive.rcfile.RcFilePageSourceFactory;
-import io.trino.plugin.hive.s3.HiveS3Config;
-import io.trino.plugin.hive.s3.TrinoS3ConfigurationInitializer;
-import io.trino.plugin.hive.s3select.S3SelectRecordCursorProvider;
-import io.trino.plugin.hive.s3select.TrinoS3ClientFactory;
 import io.trino.spi.PageSorter;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.BooleanType;
 import io.trino.spi.type.DateType;
-import io.trino.spi.type.Decimals;
 import io.trino.spi.type.DoubleType;
-import io.trino.spi.type.Int128;
 import io.trino.spi.type.IntegerType;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.NamedTypeSignature;
@@ -83,9 +80,8 @@
 import io.trino.testing.TestingConnectorSession;
 import org.apache.hadoop.hive.common.type.Date;
 
-import java.lang.invoke.MethodHandle;
-import java.math.BigDecimal;
 import java.nio.ByteBuffer;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -93,10 +89,9 @@
 import java.util.UUID;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.airlift.units.DataSize.Unit.MEGABYTE;
-import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NULL_FLAG;
-import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
-import static io.trino.spi.function.InvocationConvention.simpleConvention;
+import static io.trino.spi.block.ArrayValueBuilder.buildArrayValue;
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
 import static io.trino.spi.type.UuidType.javaUuidToTrinoUuid;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static io.trino.util.StructuralTestUtil.appendToBlockBuilder;
@@ -125,7 +120,8 @@ private HiveTestUtils() {}
             new HdfsConfig(),
             new NoHdfsAuthentication());
 
-    public static final HdfsFileSystemFactory HDFS_FILE_SYSTEM_FACTORY = new HdfsFileSystemFactory(HDFS_ENVIRONMENT);
+    public static final TrinoHdfsFileSystemStats HDFS_FILE_SYSTEM_STATS = new TrinoHdfsFileSystemStats();
+    public static final HdfsFileSystemFactory HDFS_FILE_SYSTEM_FACTORY = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS);
 
     public static final PageSorter PAGE_SORTER = new PagesIndexPageSorter(new PagesIndex.TestingFactory(false));
 
@@ -148,13 +144,6 @@ public static TestingConnectorSession getHiveSession(HiveConfig hiveConfig, Parq
                 .build();
     }
 
-    public static TestingConnectorSession getHiveSession(HiveConfig hiveConfig, ParquetReaderConfig parquetReaderConfig)
-    {
-        return TestingConnectorSession.builder()
-                .setPropertyMetadata(getHiveSessionProperties(hiveConfig, parquetReaderConfig).getSessionProperties())
-                .build();
-    }
-
     public static HiveSessionProperties getHiveSessionProperties(HiveConfig hiveConfig)
     {
         return getHiveSessionProperties(hiveConfig, new OrcReaderConfig());
@@ -164,7 +153,6 @@ public static HiveSessionProperties getHiveSessionProperties(HiveConfig hiveConf
     {
         return new HiveSessionProperties(
                 hiveConfig,
-                new HiveFormatsConfig(),
                 orcReaderConfig,
                 new OrcWriterConfig(),
                 new ParquetReaderConfig(),
@@ -175,7 +163,6 @@ public static HiveSessionProperties getHiveSessionProperties(HiveConfig hiveConf
     {
         return new HiveSessionProperties(
                 hiveConfig,
-                new HiveFormatsConfig(),
                 new OrcReaderConfig(),
                 new OrcWriterConfig(),
                 new ParquetReaderConfig(),
@@ -186,7 +173,6 @@ public static HiveSessionProperties getHiveSessionProperties(HiveConfig hiveConf
     {
         return new HiveSessionProperties(
                 hiveConfig,
-                new HiveFormatsConfig(),
                 new OrcReaderConfig(),
                 new OrcWriterConfig(),
                 parquetReaderConfig,
@@ -195,29 +181,25 @@ public static HiveSessionProperties getHiveSessionProperties(HiveConfig hiveConf
 
     public static Set<HivePageSourceFactory> getDefaultHivePageSourceFactories(HdfsEnvironment hdfsEnvironment, HiveConfig hiveConfig)
     {
-        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(hdfsEnvironment);
+        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS);
         FileFormatDataSourceStats stats = new FileFormatDataSourceStats();
         return ImmutableSet.<HivePageSourceFactory>builder()
-                .add(new CsvPageSourceFactory(fileSystemFactory, stats, hiveConfig))
-                .add(new JsonPageSourceFactory(fileSystemFactory, stats, hiveConfig))
-                .add(new OpenXJsonPageSourceFactory(fileSystemFactory, stats, hiveConfig))
-                .add(new RegexPageSourceFactory(fileSystemFactory, stats, hiveConfig))
-                .add(new SimpleTextFilePageSourceFactory(fileSystemFactory, stats, hiveConfig))
-                .add(new SimpleSequenceFilePageSourceFactory(fileSystemFactory, stats, hiveConfig))
-                .add(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, hdfsEnvironment, stats, hiveConfig))
+                .add(new CsvPageSourceFactory(fileSystemFactory, hiveConfig))
+                .add(new JsonPageSourceFactory(fileSystemFactory, hiveConfig))
+                .add(new OpenXJsonPageSourceFactory(fileSystemFactory, hiveConfig))
+                .add(new RegexPageSourceFactory(fileSystemFactory, hiveConfig))
+                .add(new SimpleTextFilePageSourceFactory(fileSystemFactory, hiveConfig))
+                .add(new SimpleSequenceFilePageSourceFactory(fileSystemFactory, hiveConfig))
+                .add(new AvroPageSourceFactory(fileSystemFactory))
+                .add(new RcFilePageSourceFactory(fileSystemFactory, hiveConfig))
                 .add(new OrcPageSourceFactory(new OrcReaderConfig(), fileSystemFactory, stats, hiveConfig))
                 .add(new ParquetPageSourceFactory(fileSystemFactory, stats, new ParquetReaderConfig(), hiveConfig))
                 .build();
     }
 
-    public static Set<HiveRecordCursorProvider> getDefaultHiveRecordCursorProviders(HiveConfig hiveConfig, HdfsEnvironment hdfsEnvironment)
-    {
-        return ImmutableSet.of(new S3SelectRecordCursorProvider(hdfsEnvironment, new TrinoS3ClientFactory(hiveConfig)));
-    }
-
     public static Set<HiveFileWriterFactory> getDefaultHiveFileWriterFactories(HiveConfig hiveConfig, HdfsEnvironment hdfsEnvironment)
     {
-        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(hdfsEnvironment);
+        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS);
         NodeVersion nodeVersion = new NodeVersion("test_version");
         return ImmutableSet.<HiveFileWriterFactory>builder()
                 .add(new CsvFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER))
@@ -226,21 +208,13 @@ public static Set<HiveFileWriterFactory> getDefaultHiveFileWriterFactories(HiveC
                 .add(new OpenXJsonFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER))
                 .add(new SimpleTextFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER))
                 .add(new SimpleSequenceFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER, nodeVersion))
-                .add(new RcFileFileWriterFactory(hdfsEnvironment, TESTING_TYPE_MANAGER, nodeVersion, hiveConfig))
-                .add(getDefaultOrcFileWriterFactory(hdfsEnvironment))
+                .add(new AvroFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER, nodeVersion))
+                .add(new RcFileFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER, nodeVersion, hiveConfig))
+                .add(new OrcFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER, nodeVersion, new FileFormatDataSourceStats(), new OrcWriterConfig()))
+                .add(new ParquetFileWriterFactory(fileSystemFactory, nodeVersion, TESTING_TYPE_MANAGER, hiveConfig, new FileFormatDataSourceStats()))
                 .build();
     }
 
-    private static OrcFileWriterFactory getDefaultOrcFileWriterFactory(HdfsEnvironment hdfsEnvironment)
-    {
-        return new OrcFileWriterFactory(
-                new HdfsFileSystemFactory(hdfsEnvironment),
-                TESTING_TYPE_MANAGER,
-                new NodeVersion("test_version"),
-                new FileFormatDataSourceStats(),
-                new OrcWriterConfig());
-    }
-
     public static List<Type> getTypes(List<? extends ColumnHandle> columnHandles)
     {
         ImmutableList.Builder<Type> types = ImmutableList.builder();
@@ -250,11 +224,6 @@ public static List<Type> getTypes(List<? extends ColumnHandle> columnHandles)
         return types.build();
     }
 
-    public static HiveRecordCursorProvider createGenericHiveRecordCursorProvider(HdfsEnvironment hdfsEnvironment)
-    {
-        return new GenericHiveRecordCursorProvider(hdfsEnvironment, DataSize.of(100, MEGABYTE));
-    }
-
     public static MapType mapType(Type keyType, Type valueType)
     {
         return (MapType) TESTING_TYPE_MANAGER.getParameterizedType(StandardTypes.MAP, ImmutableList.of(
@@ -278,66 +247,40 @@ public static RowType rowType(List<NamedTypeSignature> elementTypeSignatures)
                         .collect(toImmutableList()));
     }
 
-    public static Long shortDecimal(String value)
-    {
-        return new BigDecimal(value).unscaledValue().longValueExact();
-    }
-
-    public static Int128 longDecimal(String value)
-    {
-        return Decimals.valueOf(new BigDecimal(value));
-    }
-
-    public static MethodHandle distinctFromOperator(Type type)
-    {
-        return TESTING_TYPE_MANAGER.getTypeOperators().getDistinctFromOperator(type, simpleConvention(FAIL_ON_NULL, NULL_FLAG, NULL_FLAG));
-    }
-
-    public static boolean isDistinctFrom(MethodHandle handle, Block left, Block right)
-    {
-        try {
-            return (boolean) handle.invokeExact(left, left == null, right, right == null);
-        }
-        catch (Throwable t) {
-            throw new AssertionError(t);
-        }
-    }
-
     public static Object toNativeContainerValue(Type type, Object hiveValue)
     {
         if (hiveValue == null) {
             return null;
         }
 
-        if (type instanceof ArrayType) {
-            BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
-            BlockBuilder subBlockBuilder = blockBuilder.beginBlockEntry();
-            for (Object subElement : (Iterable<?>) hiveValue) {
-                appendToBlockBuilder(type.getTypeParameters().get(0), subElement, subBlockBuilder);
-            }
-            blockBuilder.closeEntry();
-            return type.getObject(blockBuilder, 0);
+        if (type instanceof ArrayType arrayType) {
+            Collection<?> hiveArray = (Collection<?>) hiveValue;
+            return buildArrayValue(arrayType, hiveArray.size(), valueBuilder -> {
+                for (Object subElement : hiveArray) {
+                    appendToBlockBuilder(type.getTypeParameters().get(0), subElement, valueBuilder);
+                }
+            });
         }
-        if (type instanceof RowType) {
-            BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
-            BlockBuilder subBlockBuilder = blockBuilder.beginBlockEntry();
-            int field = 0;
-            for (Object subElement : (Iterable<?>) hiveValue) {
-                appendToBlockBuilder(type.getTypeParameters().get(field), subElement, subBlockBuilder);
-                field++;
-            }
-            blockBuilder.closeEntry();
-            return type.getObject(blockBuilder, 0);
+        if (type instanceof RowType rowType) {
+            return buildRowValue(rowType, fields -> {
+                int fieldIndex = 0;
+                for (Object subElement : (Iterable<?>) hiveValue) {
+                    appendToBlockBuilder(type.getTypeParameters().get(fieldIndex), subElement, fields.get(fieldIndex));
+                    fieldIndex++;
+                }
+            });
         }
-        if (type instanceof MapType) {
-            BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
-            BlockBuilder subBlockBuilder = blockBuilder.beginBlockEntry();
-            for (Map.Entry<?, ?> entry : ((Map<?, ?>) hiveValue).entrySet()) {
-                appendToBlockBuilder(type.getTypeParameters().get(0), entry.getKey(), subBlockBuilder);
-                appendToBlockBuilder(type.getTypeParameters().get(1), entry.getValue(), subBlockBuilder);
-            }
-            blockBuilder.closeEntry();
-            return type.getObject(blockBuilder, 0);
+        if (type instanceof MapType mapType) {
+            Map<?, ?> hiveMap = (Map<?, ?>) hiveValue;
+            return buildMapValue(
+                    mapType,
+                    hiveMap.size(),
+                    (keyBuilder, valueBuilder) -> {
+                        hiveMap.forEach((key, value) -> {
+                            appendToBlockBuilder(mapType.getKeyType(), key, keyBuilder);
+                            appendToBlockBuilder(mapType.getValueType(), value, valueBuilder);
+                        });
+                    });
         }
         if (type instanceof BooleanType) {
             return hiveValue;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/S3Assert.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/S3Assert.java
new file mode 100644
index 000000000000..30cd040f710e
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/S3Assert.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed 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 io.trino.plugin.hive;
+
+import com.amazonaws.services.s3.AmazonS3;
+import org.assertj.core.api.AssertProvider;
+import org.assertj.core.util.CanIgnoreReturnValue;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.google.common.base.Verify.verify;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class S3Assert
+{
+    private final AmazonS3 s3;
+    private final String path;
+    private final String bucket;
+    private final String key;
+
+    public S3Assert(AmazonS3 s3, String path)
+    {
+        this(
+                s3,
+                path,
+                regexpExtract(path, "s3://([^/]+)/(.+)", 1),
+                regexpExtract(path, "s3://([^/]+)/(.+)", 2));
+    }
+
+    public S3Assert(AmazonS3 s3, String path, String bucket, String key)
+    {
+        this.s3 = requireNonNull(s3, "s3 is null");
+        this.path = requireNonNull(path, "path is null");
+        this.bucket = requireNonNull(bucket, "bucket is null");
+        this.key = requireNonNull(key, "key is null");
+    }
+
+    public static AssertProvider<S3Assert> s3Path(AmazonS3 s3, String path)
+    {
+        return () -> new S3Assert(s3, path);
+    }
+
+    private static String regexpExtract(String input, String regex, int group)
+    {
+        Matcher matcher = Pattern.compile(regex).matcher(input);
+        verify(matcher.matches(), "Does not match [%s]: [%s]", matcher.pattern(), input);
+        return matcher.group(group);
+    }
+
+    @CanIgnoreReturnValue
+    public S3Assert exists()
+    {
+        assertThat(s3.doesObjectExist(bucket, key)).as("Existence of %s", path)
+                .isTrue();
+        return this;
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestBackgroundHiveSplitLoader.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestBackgroundHiveSplitLoader.java
index 8172d161e9a6..17b31225c66e 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestBackgroundHiveSplitLoader.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestBackgroundHiveSplitLoader.java
@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.hive;
 
-import com.google.common.base.Throwables;
 import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
@@ -23,11 +22,13 @@
 import io.airlift.stats.CounterStat;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.hdfs.DynamicHdfsConfiguration;
 import io.trino.hdfs.HdfsConfig;
 import io.trino.hdfs.HdfsConfigurationInitializer;
 import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.HdfsNamenodeStats;
 import io.trino.hdfs.authentication.NoHdfsAuthentication;
 import io.trino.plugin.hive.HiveColumnHandle.ColumnType;
 import io.trino.plugin.hive.fs.CachingDirectoryLister;
@@ -37,6 +38,7 @@
 import io.trino.plugin.hive.metastore.StorageFormat;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.plugin.hive.util.HiveBucketing.HiveBucketFilter;
+import io.trino.plugin.hive.util.InternalHiveSplitFactory;
 import io.trino.plugin.hive.util.ValidWriteIdList;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
@@ -59,18 +61,11 @@
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hive.metastore.TableType;
 import org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat;
-import org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
-import org.apache.hadoop.mapred.FileInputFormat;
-import org.apache.hadoop.mapred.InputSplit;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.RecordReader;
-import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.util.Progressable;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.io.File;
 import java.io.IOException;
@@ -102,6 +97,7 @@
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.airlift.units.DataSize.Unit.GIGABYTE;
+import static io.airlift.units.DataSize.Unit.KILOBYTE;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.plugin.hive.BackgroundHiveSplitLoader.BucketSplitInfo.createBucketSplitInfo;
 import static io.trino.plugin.hive.BackgroundHiveSplitLoader.getBucketNumber;
@@ -109,11 +105,11 @@
 import static io.trino.plugin.hive.HiveColumnHandle.createBaseColumn;
 import static io.trino.plugin.hive.HiveColumnHandle.pathColumnHandle;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_BUCKET_FILES;
-import static io.trino.plugin.hive.HiveErrorCode.HIVE_UNKNOWN_ERROR;
-import static io.trino.plugin.hive.HiveSessionProperties.getMaxInitialSplitSize;
 import static io.trino.plugin.hive.HiveStorageFormat.AVRO;
 import static io.trino.plugin.hive.HiveStorageFormat.CSV;
+import static io.trino.plugin.hive.HiveStorageFormat.ORC;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.plugin.hive.HiveTestUtils.SESSION;
 import static io.trino.plugin.hive.HiveTestUtils.getHiveSession;
 import static io.trino.plugin.hive.HiveTimestampPrecision.DEFAULT_PRECISION;
@@ -134,10 +130,12 @@
 import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_LIB;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestBackgroundHiveSplitLoader
 {
     private static final int BUCKET_COUNT = 2;
@@ -168,19 +166,12 @@ public class TestBackgroundHiveSplitLoader
     private static final Table SIMPLE_TABLE = table(ImmutableList.of(), Optional.empty(), ImmutableMap.of());
     private static final Table PARTITIONED_TABLE = table(PARTITION_COLUMNS, BUCKET_PROPERTY, ImmutableMap.of());
 
-    private ExecutorService executor;
+    private final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
 
-    @BeforeClass
-    public void setUp()
-    {
-        executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
-    }
-
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
-        executor = null;
     }
 
     @Test
@@ -209,67 +200,6 @@ public void testCsv()
         assertSplitCount(CSV, ImmutableMap.of("skip.header.line.count", "1", "skip.footer.line.count", "1"), fileSize, 1);
     }
 
-    @Test
-    public void testSplittableNotCheckedOnSmallFiles()
-            throws Exception
-    {
-        DataSize initialSplitSize = getMaxInitialSplitSize(SESSION);
-
-        Table table = table(
-                ImmutableList.of(),
-                Optional.empty(),
-                ImmutableMap.of(),
-                StorageFormat.create(LazySimpleSerDe.class.getName(), TestSplittableFailureInputFormat.class.getName(), TestSplittableFailureInputFormat.class.getName()));
-
-        //  Exactly minimum split size, no isSplittable check
-        BackgroundHiveSplitLoader backgroundHiveSplitLoader = backgroundHiveSplitLoader(
-                ImmutableList.of(locatedFileStatus(new Path(SAMPLE_PATH), initialSplitSize.toBytes())),
-                TupleDomain.all(),
-                Optional.empty(),
-                table,
-                Optional.empty());
-
-        HiveSplitSource hiveSplitSource = hiveSplitSource(backgroundHiveSplitLoader);
-        backgroundHiveSplitLoader.start(hiveSplitSource);
-
-        assertEquals(drainSplits(hiveSplitSource).size(), 1);
-
-        //  Large enough for isSplittable to be called
-        backgroundHiveSplitLoader = backgroundHiveSplitLoader(
-                ImmutableList.of(locatedFileStatus(new Path(SAMPLE_PATH), initialSplitSize.toBytes() + 1)),
-                TupleDomain.all(),
-                Optional.empty(),
-                table,
-                Optional.empty());
-
-        HiveSplitSource finalHiveSplitSource = hiveSplitSource(backgroundHiveSplitLoader);
-        backgroundHiveSplitLoader.start(finalHiveSplitSource);
-        assertTrinoExceptionThrownBy(() -> drainSplits(finalHiveSplitSource))
-                .hasErrorCode(HIVE_UNKNOWN_ERROR)
-                .isInstanceOfSatisfying(TrinoException.class, e -> {
-                    Throwable cause = Throwables.getRootCause(e);
-                    assertTrue(cause instanceof IllegalStateException);
-                    assertEquals(cause.getMessage(), "isSplittable called");
-                });
-    }
-
-    public static final class TestSplittableFailureInputFormat
-            extends FileInputFormat<Void, Void>
-    {
-        @Override
-        protected boolean isSplitable(FileSystem fs, Path filename)
-        {
-            throw new IllegalStateException("isSplittable called");
-        }
-
-        @Override
-        public RecordReader<Void, Void> getRecordReader(InputSplit inputSplit, JobConf jobConf, Reporter reporter)
-                throws IOException
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-
     private void assertSplitCount(HiveStorageFormat storageFormat, Map<String, String> tableProperties, DataSize fileSize, int expectedSplitCount)
             throws Exception
     {
@@ -379,7 +309,8 @@ public void testNoHangIfPartitionIsOffline()
                 .hasMessage("OFFLINE");
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testIncompleteDynamicFilterTimeout()
             throws Exception
     {
@@ -435,7 +366,7 @@ public TupleDomain<ColumnHandle> getCurrentPredicate()
     public void testCachedDirectoryLister()
             throws Exception
     {
-        CachingDirectoryLister cachingDirectoryLister = new CachingDirectoryLister(new Duration(5, TimeUnit.MINUTES), 1000, ImmutableList.of("test_dbname.test_table"));
+        CachingDirectoryLister cachingDirectoryLister = new CachingDirectoryLister(new Duration(5, TimeUnit.MINUTES), DataSize.of(100, KILOBYTE), ImmutableList.of("test_dbname.test_table"));
         assertEquals(cachingDirectoryLister.getRequestCount(), 0);
 
         int totalCount = 100;
@@ -512,8 +443,19 @@ public void testGetAttemptId()
         assertFalse(hasAttemptId("base_00000_00"));
     }
 
-    @Test(dataProvider = "testPropagateExceptionDataProvider", timeOut = 60_000)
-    public void testPropagateException(boolean error, int threads)
+    @Test
+    @Timeout(60)
+    public void testPropagateException()
+    {
+        testPropagateException(false, 1);
+        testPropagateException(true, 1);
+        testPropagateException(false, 2);
+        testPropagateException(true, 2);
+        testPropagateException(false, 4);
+        testPropagateException(true, 4);
+    }
+
+    private void testPropagateException(boolean error, int threads)
     {
         AtomicBoolean iteratorUsedAfterException = new AtomicBoolean();
 
@@ -548,15 +490,13 @@ public HivePartitionMetadata next()
                 TESTING_TYPE_MANAGER,
                 createBucketSplitInfo(Optional.empty(), Optional.empty()),
                 SESSION,
-                new HdfsFileSystemFactory(hdfsEnvironment),
-                hdfsEnvironment,
-                new NamenodeStats(),
+                new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS),
+                new HdfsNamenodeStats(),
                 new CachingDirectoryLister(new HiveConfig()),
                 executor,
                 threads,
                 false,
                 false,
-                true,
                 Optional.empty(),
                 Optional.empty(),
                 100);
@@ -575,19 +515,6 @@ public HivePartitionMetadata next()
         }
     }
 
-    @DataProvider
-    public Object[][] testPropagateExceptionDataProvider()
-    {
-        return new Object[][] {
-                {false, 1},
-                {true, 1},
-                {false, 2},
-                {true, 2},
-                {false, 4},
-                {true, 4},
-        };
-    }
-
     @Test
     public void testMultipleSplitsPerBucket()
             throws Exception
@@ -863,37 +790,41 @@ public void testValidateFileBuckets()
 
     @Test
     public void testBuildManifestFileIterator()
-            throws Exception
     {
-        CachingDirectoryLister directoryLister = new CachingDirectoryLister(new Duration(0, TimeUnit.MINUTES), 0, ImmutableList.of());
+        CachingDirectoryLister directoryLister = new CachingDirectoryLister(new Duration(0, TimeUnit.MINUTES), DataSize.ofBytes(0), ImmutableList.of());
         Properties schema = new Properties();
         schema.setProperty(FILE_INPUT_FORMAT, SymlinkTextInputFormat.class.getName());
         schema.setProperty(SERIALIZATION_LIB, AVRO.getSerde());
 
-        Path firstFilePath = new Path("hdfs://VOL1:9000/db_name/table_name/file1");
-        Path secondFilePath = new Path("hdfs://VOL1:9000/db_name/table_name/file2");
-        List<Path> paths = ImmutableList.of(firstFilePath, secondFilePath);
-        List<LocatedFileStatus> files = paths.stream()
+        Location firstFilePath = Location.of("hdfs://VOL1:9000/db_name/table_name/file1");
+        Location secondFilePath = Location.of("hdfs://VOL1:9000/db_name/table_name/file2");
+        List<Location> locations = ImmutableList.of(firstFilePath, secondFilePath);
+        List<LocatedFileStatus> files = locations.stream()
                 .map(TestBackgroundHiveSplitLoader::locatedFileStatus)
                 .collect(toImmutableList());
 
-        BackgroundHiveSplitLoader backgroundHiveSplitLoader = backgroundHiveSplitLoader(
-                files,
-                directoryLister);
-        Optional<Iterator<InternalHiveSplit>> splitIterator = backgroundHiveSplitLoader.buildManifestFileIterator(
-                new AvroContainerInputFormat(),
+        InternalHiveSplitFactory splitFactory = new InternalHiveSplitFactory(
                 "partition",
+                AVRO,
                 schema,
                 ImmutableList.of(),
                 TupleDomain.all(),
                 () -> true,
-                false,
                 TableToPartitionMapping.empty(),
-                new Path("hdfs://VOL1:9000/db_name/table_name"),
-                paths,
+                Optional.empty(),
+                Optional.empty(),
+                DataSize.of(512, MEGABYTE),
+                false,
+                Optional.empty());
+        BackgroundHiveSplitLoader backgroundHiveSplitLoader = backgroundHiveSplitLoader(
+                files,
+                directoryLister);
+        Iterator<InternalHiveSplit> splitIterator = backgroundHiveSplitLoader.buildManifestFileIterator(
+                splitFactory,
+                Location.of("hdfs://VOL1:9000/db_name/table_name"),
+                locations,
                 true);
-        assertTrue(splitIterator.isPresent());
-        List<InternalHiveSplit> splits = ImmutableList.copyOf(splitIterator.get());
+        List<InternalHiveSplit> splits = ImmutableList.copyOf(splitIterator);
         assertEquals(splits.size(), 2);
         assertEquals(splits.get(0).getPath(), firstFilePath.toString());
         assertEquals(splits.get(1).getPath(), secondFilePath.toString());
@@ -901,43 +832,52 @@ public void testBuildManifestFileIterator()
 
     @Test
     public void testBuildManifestFileIteratorNestedDirectory()
-            throws Exception
     {
-        CachingDirectoryLister directoryLister = new CachingDirectoryLister(new Duration(5, TimeUnit.MINUTES), 1000, ImmutableList.of());
+        CachingDirectoryLister directoryLister = new CachingDirectoryLister(new Duration(5, TimeUnit.MINUTES), DataSize.of(100, KILOBYTE), ImmutableList.of());
         Properties schema = new Properties();
         schema.setProperty(FILE_INPUT_FORMAT, SymlinkTextInputFormat.class.getName());
         schema.setProperty(SERIALIZATION_LIB, AVRO.getSerde());
 
-        Path filePath = new Path("hdfs://VOL1:9000/db_name/table_name/file1");
-        Path directoryPath = new Path("hdfs://VOL1:9000/db_name/table_name/dir");
-        List<Path> paths = ImmutableList.of(filePath, directoryPath);
+        Location filePath = Location.of("hdfs://VOL1:9000/db_name/table_name/file1");
+        Location directoryPath = Location.of("hdfs://VOL1:9000/db_name/table_name/dir/file2");
+        List<Location> locations = ImmutableList.of(filePath, directoryPath);
         List<LocatedFileStatus> files = ImmutableList.of(
                 locatedFileStatus(filePath),
-                locatedDirectoryStatus(directoryPath));
+                locatedFileStatus(directoryPath));
 
-        BackgroundHiveSplitLoader backgroundHiveSplitLoader = backgroundHiveSplitLoader(
-                files,
-                directoryLister);
-        Optional<Iterator<InternalHiveSplit>> splitIterator = backgroundHiveSplitLoader.buildManifestFileIterator(
-                new AvroContainerInputFormat(),
+        InternalHiveSplitFactory splitFactory = new InternalHiveSplitFactory(
                 "partition",
+                AVRO,
                 schema,
                 ImmutableList.of(),
                 TupleDomain.all(),
                 () -> true,
-                false,
                 TableToPartitionMapping.empty(),
-                new Path("hdfs://VOL1:9000/db_name/table_name"),
-                paths,
+                Optional.empty(),
+                Optional.empty(),
+                DataSize.of(512, MEGABYTE),
+                false,
+                Optional.empty());
+
+        BackgroundHiveSplitLoader backgroundHiveSplitLoader = backgroundHiveSplitLoader(
+                files,
+                directoryLister);
+        Iterator<InternalHiveSplit> splitIterator = backgroundHiveSplitLoader.buildManifestFileIterator(
+                splitFactory,
+                Location.of("hdfs://VOL1:9000/db_name/table_name"),
+                locations,
                 false);
-        assertTrue(splitIterator.isEmpty());
+        List<InternalHiveSplit> splits = ImmutableList.copyOf(splitIterator);
+        assertEquals(splits.size(), 2);
+        assertEquals(splits.get(0).getPath(), filePath.toString());
+        assertEquals(splits.get(1).getPath(), directoryPath.toString());
     }
 
     @Test
     public void testMaxPartitions()
             throws Exception
     {
-        CachingDirectoryLister directoryLister = new CachingDirectoryLister(new Duration(0, TimeUnit.MINUTES), 0, ImmutableList.of());
+        CachingDirectoryLister directoryLister = new CachingDirectoryLister(new Duration(0, TimeUnit.MINUTES), DataSize.ofBytes(0), ImmutableList.of());
         // zero partitions
         {
             BackgroundHiveSplitLoader backgroundHiveSplitLoader = backgroundHiveSplitLoader(
@@ -1170,15 +1110,13 @@ private BackgroundHiveSplitLoader backgroundHiveSplitLoader(
                 TESTING_TYPE_MANAGER,
                 createBucketSplitInfo(bucketHandle, hiveBucketFilter),
                 SESSION,
-                new HdfsFileSystemFactory(hdfsEnvironment),
-                hdfsEnvironment,
-                new NamenodeStats(),
+                new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS),
+                new HdfsNamenodeStats(),
                 new CachingDirectoryLister(new HiveConfig()),
                 executor,
                 2,
                 false,
                 false,
-                true,
                 validWriteIds,
                 Optional.empty(),
                 100);
@@ -1215,15 +1153,13 @@ private BackgroundHiveSplitLoader backgroundHiveSplitLoader(
                 TESTING_TYPE_MANAGER,
                 Optional.empty(),
                 connectorSession,
-                new HdfsFileSystemFactory(hdfsEnvironment),
-                hdfsEnvironment,
-                new NamenodeStats(),
+                new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS),
+                new HdfsNamenodeStats(),
                 directoryLister,
                 executor,
                 2,
                 false,
                 false,
-                true,
                 Optional.empty(),
                 Optional.empty(),
                 maxPartitions);
@@ -1244,15 +1180,13 @@ private BackgroundHiveSplitLoader backgroundHiveSplitLoaderOfflinePartitions()
                 TESTING_TYPE_MANAGER,
                 createBucketSplitInfo(Optional.empty(), Optional.empty()),
                 connectorSession,
-                new HdfsFileSystemFactory(hdfsEnvironment),
-                hdfsEnvironment,
-                new NamenodeStats(),
+                new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS),
+                new HdfsNamenodeStats(),
                 new CachingDirectoryLister(new HiveConfig()),
                 executor,
                 2,
                 false,
                 false,
-                true,
                 Optional.empty(),
                 Optional.empty(),
                 100);
@@ -1310,10 +1244,7 @@ private static Table table(
         return table(partitionColumns,
                 bucketProperty,
                 tableParameters,
-                StorageFormat.create(
-                        "com.facebook.hive.orc.OrcSerde",
-                        "org.apache.hadoop.hive.ql.io.RCFileInputFormat",
-                        "org.apache.hadoop.hive.ql.io.RCFileInputFormat"));
+                StorageFormat.create(ORC.getSerde(), ORC.getInputFormat(), ORC.getOutputFormat()));
     }
 
     private static Table table(
@@ -1326,10 +1257,7 @@ private static Table table(
                 partitionColumns,
                 bucketProperty,
                 tableParameters,
-                StorageFormat.create(
-                        "com.facebook.hive.orc.OrcSerde",
-                        "org.apache.hadoop.hive.ql.io.RCFileInputFormat",
-                        "org.apache.hadoop.hive.ql.io.RCFileInputFormat"));
+                StorageFormat.create(ORC.getSerde(), ORC.getInputFormat(), ORC.getOutputFormat()));
     }
 
     private static Table table(
@@ -1363,13 +1291,18 @@ private static Table table(
                 .setDatabaseName("test_dbname")
                 .setOwner(Optional.of("testOwner"))
                 .setTableName("test_table")
-                .setTableType(TableType.MANAGED_TABLE.toString())
+                .setTableType(TableType.MANAGED_TABLE.name())
                 .setDataColumns(ImmutableList.of(new Column("col1", HIVE_STRING, Optional.empty())))
                 .setParameters(tableParameters)
                 .setPartitionColumns(partitionColumns)
                 .build();
     }
 
+    private static LocatedFileStatus locatedFileStatus(Location location)
+    {
+        return locatedFileStatus(new Path(location.toString()), 10);
+    }
+
     private static LocatedFileStatus locatedFileStatus(Path path)
     {
         return locatedFileStatus(path, 10);
@@ -1409,23 +1342,6 @@ private static LocatedFileStatus locatedFileStatusWithNoBlocks(Path path)
                 new BlockLocation[] {});
     }
 
-    private static LocatedFileStatus locatedDirectoryStatus(Path path)
-    {
-        return new LocatedFileStatus(
-                0L,
-                true,
-                0,
-                0L,
-                0L,
-                0L,
-                null,
-                null,
-                null,
-                null,
-                path,
-                new BlockLocation[] {});
-    }
-
     public static class TestingHdfsEnvironment
             extends HdfsEnvironment
     {
@@ -1480,7 +1396,18 @@ public void setWorkingDirectory(Path dir)
         @Override
         public FileStatus[] listStatus(Path f)
         {
-            throw new UnsupportedOperationException();
+            FileStatus[] fileStatuses = new FileStatus[files.size()];
+            for (int i = 0; i < files.size(); i++) {
+                LocatedFileStatus locatedFileStatus = files.get(i);
+                fileStatuses[i] = new FileStatus(
+                        locatedFileStatus.getLen(),
+                        locatedFileStatus.isDirectory(),
+                        locatedFileStatus.getReplication(),
+                        locatedFileStatus.getBlockSize(),
+                        locatedFileStatus.getModificationTime(),
+                        locatedFileStatus.getPath());
+            }
+            return fileStatuses;
         }
 
         @Override
@@ -1544,13 +1471,13 @@ public FileStatus getFileStatus(Path f)
         @Override
         public Path getWorkingDirectory()
         {
-            throw new UnsupportedOperationException();
+            return new Path(getUri());
         }
 
         @Override
         public URI getUri()
         {
-            throw new UnsupportedOperationException();
+            return URI.create("hdfs://VOL1:9000/");
         }
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestBucketedQueryWithManySplits.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestBucketedQueryWithManySplits.java
index a35060e3bf34..0c748dd4e408 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestBucketedQueryWithManySplits.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestBucketedQueryWithManySplits.java
@@ -16,7 +16,8 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import static java.lang.String.format;
 
@@ -36,7 +37,8 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
-    @Test(timeOut = 120_000)
+    @Test
+    @Timeout(120)
     public void testBucketedQueryWithManySplits()
     {
         QueryRunner queryRunner = getQueryRunner();
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHive2OnDataLake.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHive2OnDataLake.java
deleted file mode 100644
index b55338274da4..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHive2OnDataLake.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import io.trino.plugin.hive.containers.HiveHadoop;
-
-public class TestHive2OnDataLake
-        extends BaseTestHiveOnDataLake
-{
-    public TestHive2OnDataLake()
-    {
-        super(HiveHadoop.DEFAULT_IMAGE);
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHive3OnDataLake.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHive3OnDataLake.java
index e952b6146bf9..54bf554e3d7c 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHive3OnDataLake.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHive3OnDataLake.java
@@ -13,15 +13,2106 @@
  */
 package io.trino.plugin.hive;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.airlift.units.DataSize;
+import io.trino.Session;
 import io.trino.plugin.hive.containers.HiveHadoop;
-import org.testng.annotations.Test;
+import io.trino.plugin.hive.containers.HiveMinioDataLake;
+import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.hive.metastore.Partition;
+import io.trino.plugin.hive.metastore.PartitionWithStatistics;
+import io.trino.plugin.hive.metastore.Table;
+import io.trino.plugin.hive.metastore.thrift.BridgingHiveMetastore;
+import io.trino.plugin.hive.s3.S3HiveQueryRunner;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.predicate.NullableValue;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.minio.MinioClient;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.temporal.TemporalUnit;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.TimeZone;
+import java.util.stream.Collectors;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.airlift.slice.Slices.utf8Slice;
+import static io.airlift.units.DataSize.Unit.MEGABYTE;
+import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.testing.MaterializedResult.resultBuilder;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static java.lang.String.format;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.time.temporal.ChronoUnit.DAYS;
+import static java.time.temporal.ChronoUnit.MINUTES;
+import static java.util.regex.Pattern.quote;
+import static java.util.stream.Collectors.joining;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
 public class TestHive3OnDataLake
-        extends BaseTestHiveOnDataLake
+        extends AbstractTestQueryFramework
 {
-    public TestHive3OnDataLake()
+    private static final String HIVE_TEST_SCHEMA = "hive_datalake";
+    private static final DataSize HIVE_S3_STREAMING_PART_SIZE = DataSize.of(5, MEGABYTE);
+
+    private String bucketName;
+    private HiveMinioDataLake hiveMinioDataLake;
+    private HiveMetastore metastoreClient;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        this.bucketName = "test-hive-insert-overwrite-" + randomNameSuffix();
+        this.hiveMinioDataLake = closeAfterClass(
+                new HiveMinioDataLake(bucketName, HiveHadoop.HIVE3_IMAGE));
+        this.hiveMinioDataLake.start();
+        this.metastoreClient = new BridgingHiveMetastore(
+                testingThriftHiveMetastoreBuilder()
+                        .metastoreClient(this.hiveMinioDataLake.getHiveHadoop().getHiveMetastoreEndpoint())
+                        .build());
+        return S3HiveQueryRunner.builder(hiveMinioDataLake)
+                .addExtraProperty("sql.path", "hive.functions")
+                .addExtraProperty("sql.default-function-catalog", "hive")
+                .addExtraProperty("sql.default-function-schema", "functions")
+                .setHiveProperties(
+                        ImmutableMap.<String, String>builder()
+                                .put("hive.insert-existing-partitions-behavior", "OVERWRITE")
+                                .put("hive.non-managed-table-writes-enabled", "true")
+                                // Below are required to enable caching on metastore
+                                .put("hive.metastore-cache-ttl", "1d")
+                                .put("hive.metastore-refresh-interval", "1d")
+                                // This is required to reduce memory pressure to test writing large files
+                                .put("hive.s3.streaming.part-size", HIVE_S3_STREAMING_PART_SIZE.toString())
+                                // This is required to enable AWS Athena partition projection
+                                .put("hive.partition-projection-enabled", "true")
+                                .buildOrThrow())
+                .build();
+    }
+
+    @BeforeAll
+    public void setUp()
+    {
+        computeActual(format(
+                "CREATE SCHEMA hive.%1$s WITH (location='s3a://%2$s/%1$s')",
+                HIVE_TEST_SCHEMA,
+                bucketName));
+        computeActual("CREATE SCHEMA hive.functions");
+    }
+
+    @Test
+    public void testInsertOverwriteInTransaction()
+    {
+        String testTable = getFullyQualifiedTestTableName();
+        computeActual(getCreateTableStatement(testTable, "partitioned_by=ARRAY['regionkey']"));
+        assertThatThrownBy(
+                () -> newTransaction()
+                        .execute(getSession(), session -> {
+                            getQueryRunner().execute(session, createInsertAsSelectFromTpchStatement(testTable));
+                        }))
+                .hasMessage("Overwriting existing partition in non auto commit context doesn't support DIRECT_TO_TARGET_EXISTING_DIRECTORY write mode");
+        computeActual(format("DROP TABLE %s", testTable));
+    }
+
+    @Test
+    public void testInsertOverwriteNonPartitionedTable()
+    {
+        String testTable = getFullyQualifiedTestTableName();
+        computeActual(getCreateTableStatement(testTable));
+        assertInsertFailure(
+                testTable,
+                "Overwriting unpartitioned table not supported when writing directly to target directory");
+        computeActual(format("DROP TABLE %s", testTable));
+    }
+
+    @Test
+    public void testInsertOverwriteNonPartitionedBucketedTable()
+    {
+        String testTable = getFullyQualifiedTestTableName();
+        computeActual(getCreateTableStatement(
+                testTable,
+                "bucketed_by = ARRAY['nationkey']",
+                "bucket_count = 3"));
+        assertInsertFailure(
+                testTable,
+                "Overwriting unpartitioned table not supported when writing directly to target directory");
+        computeActual(format("DROP TABLE %s", testTable));
+    }
+
+    @Test
+    public void testInsertOverwritePartitionedTable()
+    {
+        String testTable = getFullyQualifiedTestTableName();
+        computeActual(getCreateTableStatement(
+                testTable,
+                "partitioned_by=ARRAY['regionkey']"));
+        copyTpchNationToTable(testTable);
+        assertOverwritePartition(testTable);
+    }
+
+    @Test
+    public void testInsertOverwritePartitionedAndBucketedTable()
+    {
+        String testTable = getFullyQualifiedTestTableName();
+        computeActual(getCreateTableStatement(
+                testTable,
+                "partitioned_by=ARRAY['regionkey']",
+                "bucketed_by = ARRAY['nationkey']",
+                "bucket_count = 3"));
+        copyTpchNationToTable(testTable);
+        assertOverwritePartition(testTable);
+    }
+
+    @Test
+    public void testInsertOverwritePartitionedAndBucketedExternalTable()
+    {
+        String testTable = getFullyQualifiedTestTableName();
+        // Store table data in data lake bucket
+        computeActual(getCreateTableStatement(
+                testTable,
+                "partitioned_by=ARRAY['regionkey']",
+                "bucketed_by = ARRAY['nationkey']",
+                "bucket_count = 3"));
+        copyTpchNationToTable(testTable);
+
+        // Map this table as external table
+        String externalTableName = testTable + "_ext";
+        computeActual(getCreateTableStatement(
+                externalTableName,
+                "partitioned_by=ARRAY['regionkey']",
+                "bucketed_by = ARRAY['nationkey']",
+                "bucket_count = 3",
+                format("external_location = 's3a://%s/%s/%s/'", this.bucketName, HIVE_TEST_SCHEMA, testTable)));
+        copyTpchNationToTable(testTable);
+        assertOverwritePartition(externalTableName);
+    }
+
+    @Test
+    public void testFlushPartitionCache()
+    {
+        String tableName = "nation_" + randomNameSuffix();
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+        String partitionColumn = "regionkey";
+
+        testFlushPartitionCache(
+                tableName,
+                fullyQualifiedTestTableName,
+                partitionColumn,
+                format(
+                        "CALL system.flush_metadata_cache(schema_name => '%s', table_name => '%s', partition_columns => ARRAY['%s'], partition_values => ARRAY['0'])",
+                        HIVE_TEST_SCHEMA,
+                        tableName,
+                        partitionColumn));
+    }
+
+    @Test
+    public void testFlushPartitionCacheWithDeprecatedPartitionParams()
+    {
+        String tableName = "nation_" + randomNameSuffix();
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+        String partitionColumn = "regionkey";
+
+        testFlushPartitionCache(
+                tableName,
+                fullyQualifiedTestTableName,
+                partitionColumn,
+                format(
+                        "CALL system.flush_metadata_cache(schema_name => '%s', table_name => '%s', partition_column => ARRAY['%s'], partition_value => ARRAY['0'])",
+                        HIVE_TEST_SCHEMA,
+                        tableName,
+                        partitionColumn));
+    }
+
+    private void testFlushPartitionCache(String tableName, String fullyQualifiedTestTableName, String partitionColumn, String flushCacheProcedureSql)
+    {
+        // Create table with partition on regionkey
+        computeActual(getCreateTableStatement(
+                fullyQualifiedTestTableName,
+                format("partitioned_by=ARRAY['%s']", partitionColumn)));
+        copyTpchNationToTable(fullyQualifiedTestTableName);
+
+        String queryUsingPartitionCacheTemplate = "SELECT name FROM %s WHERE %s=%s";
+        String partitionValue1 = "0";
+        String queryUsingPartitionCacheForValue1 = format(queryUsingPartitionCacheTemplate, fullyQualifiedTestTableName, partitionColumn, partitionValue1);
+        String expectedQueryResultForValue1 = "VALUES 'ALGERIA', 'MOROCCO', 'MOZAMBIQUE', 'ETHIOPIA', 'KENYA'";
+        String partitionValue2 = "1";
+        String queryUsingPartitionCacheForValue2 = format(queryUsingPartitionCacheTemplate, fullyQualifiedTestTableName, partitionColumn, partitionValue2);
+        String expectedQueryResultForValue2 = "VALUES 'ARGENTINA', 'BRAZIL', 'CANADA', 'PERU', 'UNITED STATES'";
+
+        // Fill partition cache and check we got expected results
+        assertQuery(queryUsingPartitionCacheForValue1, expectedQueryResultForValue1);
+        assertQuery(queryUsingPartitionCacheForValue2, expectedQueryResultForValue2);
+
+        // Copy partition to new location and update metadata outside Trino
+        renamePartitionResourcesOutsideTrino(tableName, partitionColumn, partitionValue1);
+        renamePartitionResourcesOutsideTrino(tableName, partitionColumn, partitionValue2);
+
+        // Should return 0 rows as we moved partition and cache is outdated. We use nonexistent partition
+        assertQueryReturnsEmptyResult(queryUsingPartitionCacheForValue1);
+        assertQueryReturnsEmptyResult(queryUsingPartitionCacheForValue2);
+
+        // Refresh cache
+        getQueryRunner().execute(flushCacheProcedureSql);
+
+        // Should return expected rows as we refresh cache
+        assertQuery(queryUsingPartitionCacheForValue1, expectedQueryResultForValue1);
+        // Should return 0 rows as we left cache untouched
+        assertQueryReturnsEmptyResult(queryUsingPartitionCacheForValue2);
+
+        // Refresh cache for schema_name => 'dummy_schema', table_name => 'dummy_table'
+        getQueryRunner().execute(format(
+                "CALL system.flush_metadata_cache(schema_name => '%s', table_name => '%s')",
+                HIVE_TEST_SCHEMA,
+                tableName));
+
+        // Should return expected rows for all partitions
+        assertQuery(queryUsingPartitionCacheForValue1, expectedQueryResultForValue1);
+        assertQuery(queryUsingPartitionCacheForValue2, expectedQueryResultForValue2);
+
+        computeActual(format("DROP TABLE %s", fullyQualifiedTestTableName));
+    }
+
+    @Test
+    public void testWriteDifferentSizes()
+    {
+        String testTable = getFullyQualifiedTestTableName();
+        computeActual(format(
+                "CREATE TABLE %s (" +
+                        "    col1 varchar, " +
+                        "    col2 varchar, " +
+                        "    regionkey bigint) " +
+                        "    WITH (partitioned_by=ARRAY['regionkey'])",
+                testTable));
+
+        long partSizeInBytes = HIVE_S3_STREAMING_PART_SIZE.toBytes();
+
+        // Exercise different code paths of Hive S3 streaming upload, with upload part size 5MB:
+        // 1. fileSize <= 5MB (direct upload)
+        testWriteWithFileSize(testTable, 50, 0, partSizeInBytes);
+
+        // 2. 5MB < fileSize <= 10MB (upload in two parts)
+        testWriteWithFileSize(testTable, 100, partSizeInBytes + 1, partSizeInBytes * 2);
+
+        // 3. fileSize > 10MB (upload in three or more parts)
+        testWriteWithFileSize(testTable, 150, partSizeInBytes * 2 + 1, partSizeInBytes * 3);
+
+        computeActual(format("DROP TABLE %s", testTable));
+    }
+
+    @Test
+    public void testEnumPartitionProjectionOnVarcharColumnWithWhitespace()
+    {
+        String tableName = "nation_" + randomNameSuffix();
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+
+        computeActual(
+                "CREATE TABLE " + fullyQualifiedTestTableName + " (" +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  \"short name\" varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short name'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+projection\\.short name\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short name\\.values[ |]+PL1,CZ1[ |]+");
+
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL2'"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ2'"))));
+
+        assertQuery(
+                format("SELECT * FROM %s", getFullyQualifiedTestTableName("\"" + tableName + "$partitions\"")),
+                "VALUES 'PL1', 'CZ1'");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE \"short name\"='PL1'", fullyQualifiedTestTableName),
+                "VALUES 'POLAND_1'");
+
+        // No results should be returned as Partition Projection will not project partitions for this value
+        assertQueryReturnsEmptyResult(
+                format("SELECT name FROM %s WHERE \"short name\"='PL2'", fullyQualifiedTestTableName));
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE \"short name\"='PL1' OR \"short name\"='CZ1'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('CZECH_1')");
+
+        // Only POLAND_1 row will be returned as other value is outside of projection
+        assertQuery(
+                format("SELECT name FROM %s WHERE \"short name\"='PL1' OR \"short name\"='CZ2'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1')");
+
+        // All values within projection range will be returned
+        assertQuery(
+                format("SELECT name FROM %s", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('CZECH_1')");
+    }
+
+    @Test
+    public void testEnumPartitionProjectionOnVarcharColumnWithStorageLocationTemplateCreatedOnTrino()
+    {
+        // It's important to mix case here to detect if we properly handle rewriting
+        // properties between Trino and Hive (e.g for Partition Projection)
+        String schemaName = "Hive_Datalake_MixedCase";
+        String tableName = getRandomTestTableName();
+
+        // We create new schema to include mixed case location path and create such keys in Object Store
+        computeActual("CREATE SCHEMA hive.%1$s WITH (location='s3a://%2$s/%1$s')".formatted(schemaName, bucketName));
+
+        String storageFormat = format(
+                "s3a://%s/%s/%s/short_name1=${short_name1}/short_name2=${short_name2}/",
+                this.bucketName,
+                schemaName,
+                tableName);
+        computeActual(
+                "CREATE TABLE " + getFullyQualifiedTestTableName(schemaName, tableName) + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  ), " +
+                        "  short_name2 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL2', 'CZ2'] " +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true, " +
+                        "  partition_projection_location_template='" + storageFormat + "' " +
+                        ")");
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(schemaName, tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+storage\\.location\\.template[ |]+" + quote(storageFormat) + "[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.values[ |]+PL2,CZ2[ |]+");
+        testEnumPartitionProjectionOnVarcharColumnWithStorageLocationTemplate(schemaName, tableName);
+    }
+
+    @Test
+    public void testEnumPartitionProjectionOnVarcharColumnWithStorageLocationTemplateCreatedOnHive()
+    {
+        String tableName = getRandomTestTableName();
+        String storageFormat = format(
+                "'s3a://%s/%s/%s/short_name1=${short_name1}/short_name2=${short_name2}/'",
+                this.bucketName,
+                HIVE_TEST_SCHEMA,
+                tableName);
+        hiveMinioDataLake.getHiveHadoop().runOnHive(
+                "CREATE TABLE " + getHiveTestTableName(tableName) + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint " +
+                        ") PARTITIONED BY (" +
+                        "  short_name1 varchar(152), " +
+                        "  short_name2 varchar(152)" +
+                        ") " +
+                        "TBLPROPERTIES ( " +
+                        "  'projection.enabled'='true', " +
+                        "  'storage.location.template'=" + storageFormat + ", " +
+                        "  'projection.short_name1.type'='enum', " +
+                        "  'projection.short_name1.values'='PL1,CZ1', " +
+                        "  'projection.short_name2.type'='enum', " +
+                        "  'projection.short_name2.values'='PL2,CZ2' " +
+                        ")");
+        testEnumPartitionProjectionOnVarcharColumnWithStorageLocationTemplate(HIVE_TEST_SCHEMA, tableName);
+    }
+
+    private void testEnumPartitionProjectionOnVarcharColumnWithStorageLocationTemplate(String schemaName, String tableName)
+    {
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(schemaName, tableName);
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'PL2'"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'CZ2'"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'PL2'"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'CZ2'"))));
+
+        assertQuery(
+                format("SELECT * FROM %s", getFullyQualifiedTestTableName(schemaName, "\"" + tableName + "$partitions\"")),
+                "VALUES ('PL1','PL2'), ('PL1','CZ2'), ('CZ1','PL2'), ('CZ1','CZ2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='CZ2'", fullyQualifiedTestTableName),
+                "VALUES 'POLAND_2'");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+    }
+
+    @Test
+    public void testEnumPartitionProjectionOnVarcharColumn()
+    {
+        String tableName = getRandomTestTableName();
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+
+        computeActual(
+                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  ), " +
+                        "  short_name2 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL2', 'CZ2']" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.values[ |]+PL2,CZ2[ |]+");
+
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'PL2'"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'CZ2'"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'PL2'"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'CZ2'"))));
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='CZ2'", fullyQualifiedTestTableName),
+                "VALUES 'POLAND_2'");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2='CZ2' OR short_name2='PL2' )", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+    }
+
+    @Test
+    public void testIntegerPartitionProjectionOnVarcharColumnWithDigitsAlignCreatedOnTrino()
+    {
+        String tableName = getRandomTestTableName();
+        computeActual(
+                "CREATE TABLE " + getFullyQualifiedTestTableName(tableName) + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  ), " +
+                        "  short_name2 varchar(152) WITH (" +
+                        "    partition_projection_type='integer', " +
+                        "    partition_projection_range=ARRAY['1', '4'], " +
+                        "    partition_projection_digits=3" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+integer[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+1,4[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.digits[ |]+3[ |]+");
+        testIntegerPartitionProjectionOnVarcharColumnWithDigitsAlign(tableName);
+    }
+
+    @Test
+    public void testIntegerPartitionProjectionOnVarcharColumnWithDigitsAlignCreatedOnHive()
+    {
+        String tableName = "nation_" + randomNameSuffix();
+        hiveMinioDataLake.getHiveHadoop().runOnHive(
+                "CREATE TABLE " + getHiveTestTableName(tableName) + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint " +
+                        ") " +
+                        "PARTITIONED BY ( " +
+                        "  short_name1 varchar(152), " +
+                        "  short_name2 varchar(152)" +
+                        ") " +
+                        "TBLPROPERTIES " +
+                        "( " +
+                        "  'projection.enabled'='true', " +
+                        "  'projection.short_name1.type'='enum', " +
+                        "  'projection.short_name1.values'='PL1,CZ1', " +
+                        "  'projection.short_name2.type'='integer', " +
+                        "  'projection.short_name2.range'='1,4', " +
+                        "  'projection.short_name2.digits'='3'" +
+                        ")");
+        testIntegerPartitionProjectionOnVarcharColumnWithDigitsAlign(tableName);
+    }
+
+    private void testIntegerPartitionProjectionOnVarcharColumnWithDigitsAlign(String tableName)
+    {
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'001'"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'002'"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'003'"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'004'"))));
+
+        assertQuery(
+                format("SELECT * FROM %s", getFullyQualifiedTestTableName("\"" + tableName + "$partitions\"")),
+                "VALUES ('PL1','001'), ('PL1','002'), ('PL1','003'), ('PL1','004')," +
+                        "('CZ1','001'), ('CZ1','002'), ('CZ1','003'), ('CZ1','004')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='002'", fullyQualifiedTestTableName),
+                "VALUES 'POLAND_2'");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2='002' OR short_name2='001' )", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+    }
+
+    @Test
+    public void testIntegerPartitionProjectionOnIntegerColumnWithInterval()
+    {
+        String tableName = getRandomTestTableName();
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+
+        computeActual(
+                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  ), " +
+                        "  short_name2 integer WITH (" +
+                        "    partition_projection_type='integer', " +
+                        "    partition_projection_range=ARRAY['0', '10'], " +
+                        "    partition_projection_interval=3" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+integer[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+0,10[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.interval[ |]+3[ |]+");
+
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "0"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "3"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "6"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "9"))));
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2=3", fullyQualifiedTestTableName),
+                "VALUES 'POLAND_2'");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2=3 OR short_name2=0 )", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+    }
+
+    @Test
+    public void testIntegerPartitionProjectionOnIntegerColumnWithDefaults()
+    {
+        String tableName = getRandomTestTableName();
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+
+        computeActual(
+                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  ), " +
+                        "  short_name2 integer WITH (" +
+                        "    partition_projection_type='integer', " +
+                        "    partition_projection_range=ARRAY['1', '4']" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+integer[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+1,4[ |]+");
+
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "1"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "2"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "3"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "4"))));
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2=2", fullyQualifiedTestTableName),
+                "VALUES 'POLAND_2'");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2=2 OR short_name2=1 )", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+    }
+
+    @Test
+    public void testDatePartitionProjectionOnDateColumnWithDefaults()
+    {
+        String tableName = "nation_" + randomNameSuffix();
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+
+        computeActual(
+                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  ), " +
+                        "  short_name2 date WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='yyyy-MM-dd', " +
+                        "    partition_projection_range=ARRAY['2001-1-22', '2001-1-25']" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+date[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.format[ |]+yyyy-MM-dd[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+2001-1-22,2001-1-25[ |]+");
+
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "DATE '2001-1-22'"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "DATE '2001-1-23'"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "DATE '2001-1-24'"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "DATE '2001-1-25'"),
+                        ImmutableList.of("'CZECH_3'", "'Comment'", "4", "5", "'CZ1'", "DATE '2001-1-26'"))));
+
+        assertQuery(
+                format("SELECT * FROM %s", getFullyQualifiedTestTableName("\"" + tableName + "$partitions\"")),
+                "VALUES ('PL1','2001-1-22'), ('PL1','2001-1-23'), ('PL1','2001-1-24'), ('PL1','2001-1-25')," +
+                        "('CZ1','2001-1-22'), ('CZ1','2001-1-23'), ('CZ1','2001-1-24'), ('CZ1','2001-1-25')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2=(DATE '2001-1-23')", fullyQualifiedTestTableName),
+                "VALUES 'POLAND_2'");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2=(DATE '2001-1-23') OR short_name2=(DATE '2001-1-22') )", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name2 > DATE '2001-1-23'", fullyQualifiedTestTableName),
+                "VALUES ('CZECH_1'), ('CZECH_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name2 >= DATE '2001-1-23' AND short_name2 <= DATE '2001-1-25'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+    }
+
+    @Test
+    public void testDatePartitionProjectionOnTimestampColumnWithInterval()
+    {
+        String tableName = getRandomTestTableName();
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+
+        computeActual(
+                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  ), " +
+                        "  short_name2 timestamp WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='yyyy-MM-dd HH:mm:ss', " +
+                        "    partition_projection_range=ARRAY['2001-1-22 00:00:00', '2001-1-22 00:00:06'], " +
+                        "    partition_projection_interval=2, " +
+                        "    partition_projection_interval_unit='SECONDS'" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+date[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.format[ |]+yyyy-MM-dd HH:mm:ss[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+2001-1-22 00:00:00,2001-1-22 00:00:06[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.interval[ |]+2[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.interval\\.unit[ |]+seconds[ |]+");
+
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "TIMESTAMP '2001-1-22 00:00:00'"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "TIMESTAMP '2001-1-22 00:00:02'"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "TIMESTAMP '2001-1-22 00:00:04'"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "TIMESTAMP '2001-1-22 00:00:06'"),
+                        ImmutableList.of("'CZECH_3'", "'Comment'", "4", "5", "'CZ1'", "TIMESTAMP '2001-1-22 00:00:08'"))));
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2=(TIMESTAMP '2001-1-22 00:00:02')", fullyQualifiedTestTableName),
+                "VALUES 'POLAND_2'");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2=(TIMESTAMP '2001-1-22 00:00:00') OR short_name2=(TIMESTAMP '2001-1-22 00:00:02') )", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name2 > TIMESTAMP '2001-1-22 00:00:02'", fullyQualifiedTestTableName),
+                "VALUES ('CZECH_1'), ('CZECH_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name2 >= TIMESTAMP '2001-1-22 00:00:02' AND short_name2 <= TIMESTAMP '2001-1-22 00:00:06'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+    }
+
+    @Test
+    public void testDatePartitionProjectionOnTimestampColumnWithIntervalExpressionCreatedOnTrino()
+    {
+        String tableName = getRandomTestTableName();
+        String dateProjectionFormat = "yyyy-MM-dd HH:mm:ss";
+        computeActual(
+                "CREATE TABLE " + getFullyQualifiedTestTableName(tableName) + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  ), " +
+                        "  short_name2 timestamp WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='" + dateProjectionFormat + "', " +
+                        // We set range to -5 minutes to NOW in order to be sure it will grab all test dates
+                        // which range is -4 minutes till now. Also, we have to consider max no. of partitions 1k
+                        "    partition_projection_range=ARRAY['NOW-5MINUTES', 'NOW'], " +
+                        "    partition_projection_interval=1, " +
+                        "    partition_projection_interval_unit='SECONDS'" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.format[ |]+" + quote(dateProjectionFormat) + "[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+NOW-5MINUTES,NOW[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.interval[ |]+1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.interval\\.unit[ |]+seconds[ |]+");
+        testDatePartitionProjectionOnTimestampColumnWithIntervalExpression(tableName, dateProjectionFormat);
+    }
+
+    @Test
+    public void testDatePartitionProjectionOnTimestampColumnWithIntervalExpressionCreatedOnHive()
+    {
+        String tableName = getRandomTestTableName();
+        String dateProjectionFormat = "yyyy-MM-dd HH:mm:ss";
+        hiveMinioDataLake.getHiveHadoop().runOnHive(
+                "CREATE TABLE " + getHiveTestTableName(tableName) + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint " +
+                        ") " +
+                        "PARTITIONED BY (" +
+                        "  short_name1 varchar(152), " +
+                        "  short_name2 timestamp " +
+                        ") " +
+                        "TBLPROPERTIES ( " +
+                        "  'projection.enabled'='true', " +
+                        "  'projection.short_name1.type'='enum', " +
+                        "  'projection.short_name1.values'='PL1,CZ1', " +
+                        "  'projection.short_name2.type'='date', " +
+                        "  'projection.short_name2.format'='" + dateProjectionFormat + "', " +
+                        // We set range to -5 minutes to NOW in order to be sure it will grab all test dates
+                        // which range is -4 minutes till now. Also, we have to consider max no. of partitions 1k
+                        "  'projection.short_name2.range'='NOW-5MINUTES,NOW', " +
+                        "  'projection.short_name2.interval'='1', " +
+                        "  'projection.short_name2.interval.unit'='SECONDS'" +
+                        ")");
+        testDatePartitionProjectionOnTimestampColumnWithIntervalExpression(tableName, dateProjectionFormat);
+    }
+
+    private void testDatePartitionProjectionOnTimestampColumnWithIntervalExpression(String tableName, String dateProjectionFormat)
+    {
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+
+        Instant dayToday = Instant.now();
+        DateFormat dateFormat = new SimpleDateFormat(dateProjectionFormat);
+        dateFormat.setTimeZone(TimeZone.getTimeZone(ZoneId.of("UTC")));
+        String minutesNowFormatted = moveDate(dateFormat, dayToday, MINUTES, 0);
+        String minutes1AgoFormatter = moveDate(dateFormat, dayToday, MINUTES, -1);
+        String minutes2AgoFormatted = moveDate(dateFormat, dayToday, MINUTES, -2);
+        String minutes3AgoFormatted = moveDate(dateFormat, dayToday, MINUTES, -3);
+        String minutes4AgoFormatted = moveDate(dateFormat, dayToday, MINUTES, -4);
+
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "TIMESTAMP '" + minutesNowFormatted + "'"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "TIMESTAMP '" + minutes1AgoFormatter + "'"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "TIMESTAMP '" + minutes2AgoFormatted + "'"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "TIMESTAMP '" + minutes3AgoFormatted + "'"),
+                        ImmutableList.of("'CZECH_3'", "'Comment'", "4", "5", "'CZ1'", "TIMESTAMP '" + minutes4AgoFormatted + "'"))));
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name2 > ( TIMESTAMP '%s' ) AND short_name2 <= ( TIMESTAMP '%s' )", fullyQualifiedTestTableName, minutes4AgoFormatted, minutes1AgoFormatter),
+                "VALUES ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+    }
+
+    @Test
+    public void testDatePartitionProjectionOnVarcharColumnWithHoursInterval()
+    {
+        String tableName = getRandomTestTableName();
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+
+        computeActual(
+                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  ), " +
+                        "  short_name2 varchar WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='yyyy-MM-dd HH', " +
+                        "    partition_projection_range=ARRAY['2001-01-22 00', '2001-01-22 06'], " +
+                        "    partition_projection_interval=2, " +
+                        "    partition_projection_interval_unit='HOURS'" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+date[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.format[ |]+yyyy-MM-dd HH[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+2001-01-22 00,2001-01-22 06[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.interval[ |]+2[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.interval\\.unit[ |]+hours[ |]+");
+
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'2001-01-22 00'"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'2001-01-22 02'"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'2001-01-22 04'"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'2001-01-22 06'"),
+                        ImmutableList.of("'CZECH_3'", "'Comment'", "4", "5", "'CZ1'", "'2001-01-22 08'"))));
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='2001-01-22 02'", fullyQualifiedTestTableName),
+                "VALUES 'POLAND_2'");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2='2001-01-22 00' OR short_name2='2001-01-22 02' )", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name2 > '2001-01-22 02'", fullyQualifiedTestTableName),
+                "VALUES ('CZECH_1'), ('CZECH_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name2 >= '2001-01-22 02' AND short_name2 <= '2001-01-22 06'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+    }
+
+    @Test
+    public void testDatePartitionProjectionOnVarcharColumnWithDaysInterval()
+    {
+        String tableName = getRandomTestTableName();
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+
+        computeActual(
+                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  ), " +
+                        "  short_name2 varchar WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='yyyy-MM-dd', " +
+                        "    partition_projection_range=ARRAY['2001-01-01', '2001-01-07'], " +
+                        "    partition_projection_interval=2, " +
+                        "    partition_projection_interval_unit='DAYS'" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+date[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.format[ |]+yyyy-MM-dd[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+2001-01-01,2001-01-07[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.interval[ |]+2[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.interval\\.unit[ |]+days[ |]+");
+
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'2001-01-01'"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'2001-01-03'"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'2001-01-05'"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'2001-01-07'"),
+                        ImmutableList.of("'CZECH_3'", "'Comment'", "4", "5", "'CZ1'", "'2001-01-09'"))));
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='2001-01-03'", fullyQualifiedTestTableName),
+                "VALUES 'POLAND_2'");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2='2001-01-01' OR short_name2='2001-01-03' )", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name2 > '2001-01-03'", fullyQualifiedTestTableName),
+                "VALUES ('CZECH_1'), ('CZECH_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name2 >= '2001-01-03' AND short_name2 <= '2001-01-07'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+    }
+
+    @Test
+    public void testDatePartitionProjectionOnVarcharColumnWithIntervalExpression()
+    {
+        String tableName = getRandomTestTableName();
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+        String dateProjectionFormat = "yyyy-MM-dd";
+
+        computeActual(
+                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  ), " +
+                        "  short_name2 varchar WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='" + dateProjectionFormat + "', " +
+                        "    partition_projection_range=ARRAY['NOW-3DAYS', 'NOW']" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+date[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.format[ |]+" + quote(dateProjectionFormat) + "[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.range[ |]+NOW-3DAYS,NOW[ |]+");
+
+        Instant dayToday = Instant.now();
+        DateFormat dateFormat = new SimpleDateFormat(dateProjectionFormat);
+        dateFormat.setTimeZone(TimeZone.getTimeZone(ZoneId.of("UTC")));
+        String dayTodayFormatted = moveDate(dateFormat, dayToday, DAYS, 0);
+        String day1AgoFormatter = moveDate(dateFormat, dayToday, DAYS, -1);
+        String day2AgoFormatted = moveDate(dateFormat, dayToday, DAYS, -2);
+        String day3AgoFormatted = moveDate(dateFormat, dayToday, DAYS, -3);
+        String day4AgoFormatted = moveDate(dateFormat, dayToday, DAYS, -4);
+
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'" + dayTodayFormatted + "'"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'" + day1AgoFormatter + "'"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'" + day2AgoFormatted + "'"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'" + day3AgoFormatted + "'"),
+                        ImmutableList.of("'CZECH_3'", "'Comment'", "4", "5", "'CZ1'", "'" + day4AgoFormatted + "'"))));
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='%s'", fullyQualifiedTestTableName, day1AgoFormatter),
+                "VALUES 'POLAND_2'");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2='%s' OR short_name2='%s' )", fullyQualifiedTestTableName, dayTodayFormatted, day1AgoFormatter),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name2 > '%s'", fullyQualifiedTestTableName, day2AgoFormatted),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name2 >= '%s' AND short_name2 <= '%s'", fullyQualifiedTestTableName, day4AgoFormatted, day1AgoFormatter),
+                "VALUES ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2')");
+
+        assertQuery(
+                format("SELECT name FROM %s", fullyQualifiedTestTableName),
+                "VALUES ('POLAND_1'), ('POLAND_2'), ('CZECH_1'), ('CZECH_2')");
+    }
+
+    private String moveDate(DateFormat format, Instant today, TemporalUnit unit, int move)
+    {
+        return format.format(new Date(today.plus(move, unit).toEpochMilli()));
+    }
+
+    @Test
+    public void testDatePartitionProjectionFormatTextWillNotCauseIntervalRequirement()
+    {
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName();
+
+        computeActual(
+                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='''start''yyyy-MM-dd''end''''s''', " +
+                        "    partition_projection_range=ARRAY['start2001-01-01end''s', 'start2001-01-07end''s'] " +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+    }
+
+    @Test
+    public void testInjectedPartitionProjectionOnVarcharColumn()
+    {
+        String tableName = getRandomTestTableName();
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+
+        computeActual(
+                "CREATE TABLE " + fullyQualifiedTestTableName + " ( " +
+                        "  name varchar(25), " +
+                        "  comment varchar(152), " +
+                        "  nationkey bigint, " +
+                        "  regionkey bigint, " +
+                        "  short_name1 varchar(152) WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "   ), " +
+                        "  short_name2 varchar(152) WITH (" +
+                        "    partition_projection_type='injected'" +
+                        "   ) " +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")");
+
+        assertThat(
+                hiveMinioDataLake.getHiveHadoop()
+                        .runOnHive("SHOW TBLPROPERTIES " + getHiveTestTableName(tableName)))
+                .containsPattern("[ |]+projection\\.enabled[ |]+true[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.type[ |]+enum[ |]+")
+                .containsPattern("[ |]+projection\\.short_name1\\.values[ |]+PL1,CZ1[ |]+")
+                .containsPattern("[ |]+projection\\.short_name2\\.type[ |]+injected[ |]+");
+
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'Comment'", "0", "5", "'PL1'", "'001'"),
+                        ImmutableList.of("'POLAND_2'", "'Comment'", "1", "5", "'PL1'", "'002'"),
+                        ImmutableList.of("'CZECH_1'", "'Comment'", "2", "5", "'CZ1'", "'003'"),
+                        ImmutableList.of("'CZECH_2'", "'Comment'", "3", "5", "'CZ1'", "'004'"))));
+
+        assertQuery(
+                format("SELECT name FROM %s WHERE short_name1='PL1' AND short_name2='002'", fullyQualifiedTestTableName),
+                "VALUES 'POLAND_2'");
+
+        assertThatThrownBy(
+                () -> getQueryRunner().execute(
+                        format("SELECT name FROM %s WHERE short_name1='PL1' AND ( short_name2='002' OR short_name2='001' )", fullyQualifiedTestTableName)))
+                .hasMessage("Column projection for column 'short_name2' failed. Injected projection requires single predicate for it's column in where clause. Currently provided can't be converted to single partition.");
+
+        assertThatThrownBy(
+                () -> getQueryRunner().execute(
+                        format("SELECT name FROM %s", fullyQualifiedTestTableName)))
+                .hasMessage("Column projection for column 'short_name2' failed. Injected projection requires single predicate for it's column in where clause");
+
+        assertThatThrownBy(
+                () -> getQueryRunner().execute(
+                        format("SELECT name FROM %s WHERE short_name1='PL1'", fullyQualifiedTestTableName)))
+                .hasMessage("Column projection for column 'short_name2' failed. Injected projection requires single predicate for it's column in where clause");
+    }
+
+    @Test
+    public void testPartitionProjectionInvalidTableProperties()
+    {
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar " +
+                        ") WITH ( " +
+                        "  partition_projection_enabled=true " +
+                        ")"))
+                .hasMessage("Partition projection can't be enabled when no partition columns are defined.");
+
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar WITH ( " +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1']" +
+                        "  ), " +
+                        "  short_name1 varchar " +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1'], " +
+                        "  partition_projection_enabled=true " +
+                        ")"))
+                .hasMessage("Partition projection can't be defined for non partition column: 'name'");
+
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar, " +
+                        "  short_name1 varchar WITH ( " +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1']" +
+                        "  ), " +
+                        "  short_name2 varchar " +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")"))
+                .hasMessage("Partition projection definition for column: 'short_name2' missing");
+
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar, " +
+                        "  short_name1 varchar WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  ), " +
+                        "  short_name2 varchar WITH (" +
+                        "    partition_projection_type='injected' " +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true, " +
+                        "  partition_projection_location_template='s3a://dummy/short_name1=${short_name1}/'" +
+                        ")"))
+                .hasMessage("Partition projection location template: s3a://dummy/short_name1=${short_name1}/ " +
+                        "is missing partition column: 'short_name2' placeholder");
+
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar, " +
+                        "  short_name1 varchar WITH (" +
+                        "    partition_projection_type='integer', " +
+                        "    partition_projection_range=ARRAY['1', '2', '3']" +
+                        "   ), " +
+                        "  short_name2 varchar WITH (" +
+                        "    partition_projection_type='enum', " +
+                        "    partition_projection_values=ARRAY['PL1', 'CZ1'] " +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1', 'short_name2'], " +
+                        "  partition_projection_enabled=true " +
+                        ")"))
+                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_range' needs to be list of 2 integers");
+
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar, " +
+                        "  short_name1 varchar WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_values=ARRAY['2001-01-01', '2001-01-02']" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1'], " +
+                        "  partition_projection_enabled=true " +
+                        ")"))
+                .hasMessage("Column projection for column 'short_name1' failed. Missing required property: 'partition_projection_format'");
+
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar, " +
+                        "  short_name1 varchar WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='yyyy-MM-dd HH', " +
+                        "    partition_projection_range=ARRAY['2001-01-01', '2001-01-02']" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1'], " +
+                        "  partition_projection_enabled=true " +
+                        ")"))
+                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_range' needs to be a list of 2 valid dates formatted as 'yyyy-MM-dd HH' " +
+                        "or '^\\s*NOW\\s*(([+-])\\s*([0-9]+)\\s*(DAY|HOUR|MINUTE|SECOND)S?\\s*)?$' that are sequential. Unparseable date: \"2001-01-01\"");
+
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar, " +
+                        "  short_name1 varchar WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='yyyy-MM-dd', " +
+                        "    partition_projection_range=ARRAY['NOW*3DAYS', '2001-01-02']" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1'], " +
+                        "  partition_projection_enabled=true " +
+                        ")"))
+                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_range' needs to be a list of 2 valid dates formatted as 'yyyy-MM-dd' " +
+                        "or '^\\s*NOW\\s*(([+-])\\s*([0-9]+)\\s*(DAY|HOUR|MINUTE|SECOND)S?\\s*)?$' that are sequential. Unparseable date: \"NOW*3DAYS\"");
+
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar, " +
+                        "  short_name1 varchar WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='yyyy-MM-dd', " +
+                        "    partition_projection_range=ARRAY['2001-01-02', '2001-01-01']" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1'], " +
+                        "  partition_projection_enabled=true " +
+                        ")"))
+                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_range' needs to be a list of 2 valid dates formatted as 'yyyy-MM-dd' " +
+                        "or '^\\s*NOW\\s*(([+-])\\s*([0-9]+)\\s*(DAY|HOUR|MINUTE|SECOND)S?\\s*)?$' that are sequential");
+
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar, " +
+                        "  short_name1 varchar WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='yyyy-MM-dd', " +
+                        "    partition_projection_range=ARRAY['2001-01-01', '2001-01-02'], " +
+                        "    partition_projection_interval_unit='Decades'" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1'], " +
+                        "  partition_projection_enabled=true " +
+                        ")"))
+                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_interval_unit' value 'Decades' is invalid. " +
+                        "Available options: [Days, Hours, Minutes, Seconds]");
+
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar, " +
+                        "  short_name1 varchar WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='yyyy-MM-dd HH', " +
+                        "    partition_projection_range=ARRAY['2001-01-01 10', '2001-01-02 10']" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1'], " +
+                        "  partition_projection_enabled=true " +
+                        ")"))
+                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_interval_unit' " +
+                        "needs to be set when provided 'partition_projection_format' is less that single-day precision. " +
+                        "Interval defaults to 1 day or 1 month, respectively. Otherwise, interval is required");
+
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar, " +
+                        "  short_name1 varchar WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='yyyy-MM-dd', " +
+                        "    partition_projection_range=ARRAY['2001-01-01 10', '2001-01-02 10']" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1'] " +
+                        ")"))
+                .hasMessage("Columns ['short_name1'] projections are disallowed when partition projection property 'partition_projection_enabled' is missing");
+
+        // Verify that ignored flag is only interpreted for pre-existing tables where configuration is loaded from metastore.
+        // It should not allow creating corrupted config via Trino. It's a kill switch to run away when we have compatibility issues.
+        assertThatThrownBy(() -> getQueryRunner().execute(
+                "CREATE TABLE " + getFullyQualifiedTestTableName("nation_" + randomNameSuffix()) + " ( " +
+                        "  name varchar, " +
+                        "  short_name1 varchar WITH (" +
+                        "    partition_projection_type='date', " +
+                        "    partition_projection_format='yyyy-MM-dd HH', " +
+                        "    partition_projection_range=ARRAY['2001-01-01 10', '2001-01-02 10']" +
+                        "  )" +
+                        ") WITH ( " +
+                        "  partitioned_by=ARRAY['short_name1'], " +
+                        "  partition_projection_enabled=false, " +
+                        "  partition_projection_ignore=true " + // <-- Even if this is set we disallow creating corrupted configuration via Trino
+                        ")"))
+                .hasMessage("Column projection for column 'short_name1' failed. Property: 'partition_projection_interval_unit' " +
+                        "needs to be set when provided 'partition_projection_format' is less that single-day precision. " +
+                        "Interval defaults to 1 day or 1 month, respectively. Otherwise, interval is required");
+    }
+
+    @Test
+    public void testPartitionProjectionIgnore()
+    {
+        String tableName = "nation_" + randomNameSuffix();
+        String hiveTestTableName = getHiveTestTableName(tableName);
+        String fullyQualifiedTestTableName = getFullyQualifiedTestTableName(tableName);
+
+        // Create corrupted configuration
+        hiveMinioDataLake.getHiveHadoop().runOnHive(
+                "CREATE TABLE " + hiveTestTableName + " ( " +
+                        "  name varchar(25) " +
+                        ") PARTITIONED BY (" +
+                        "  date_time varchar(152) " +
+                        ") " +
+                        "TBLPROPERTIES ( " +
+                        "  'projection.enabled'='true', " +
+                        "  'projection.date_time.type'='date', " +
+                        "  'projection.date_time.format'='yyyy-MM-dd HH', " +
+                        "  'projection.date_time.range'='2001-01-01,2001-01-02' " +
+                        ")");
+
+        // Expect invalid Partition Projection properties to fail
+        assertThatThrownBy(() -> getQueryRunner().execute("SELECT * FROM " + fullyQualifiedTestTableName))
+                .hasMessage("Column projection for column 'date_time' failed. Property: 'partition_projection_range' needs to be a list of 2 valid dates formatted as 'yyyy-MM-dd HH' " +
+                        "or '^\\s*NOW\\s*(([+-])\\s*([0-9]+)\\s*(DAY|HOUR|MINUTE|SECOND)S?\\s*)?$' that are sequential. Unparseable date: \"2001-01-01\"");
+
+        // Append kill switch table property to ignore Partition Projection properties
+        hiveMinioDataLake.getHiveHadoop().runOnHive(
+                "ALTER TABLE " + hiveTestTableName + " SET TBLPROPERTIES ( 'trino.partition_projection.ignore'='TRUE' )");
+        // Flush cache to get new definition
+        computeActual("CALL system.flush_metadata_cache()");
+
+        // Verify query execution works
+        computeActual(createInsertStatement(
+                fullyQualifiedTestTableName,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND_1'", "'2022-02-01 12'"),
+                        ImmutableList.of("'POLAND_2'", "'2022-02-01 12'"),
+                        ImmutableList.of("'CZECH_1'", "'2022-02-01 13'"),
+                        ImmutableList.of("'CZECH_2'", "'2022-02-01 13'"))));
+
+        assertQuery("SELECT * FROM " + fullyQualifiedTestTableName,
+                "VALUES ('POLAND_1', '2022-02-01 12'), " +
+                        "('POLAND_2', '2022-02-01 12'), " +
+                        "('CZECH_1', '2022-02-01 13'), " +
+                        "('CZECH_2', '2022-02-01 13')");
+        assertQuery("SELECT * FROM " + fullyQualifiedTestTableName + " WHERE date_time = '2022-02-01 12'",
+                "VALUES ('POLAND_1', '2022-02-01 12'), ('POLAND_2', '2022-02-01 12')");
+    }
+
+    @Test
+    public void testAnalyzePartitionedTableWithCanonicalization()
+    {
+        String tableName = "test_analyze_table_canonicalization_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE %s (a_varchar varchar, month varchar) WITH (partitioned_by = ARRAY['month'])".formatted(getFullyQualifiedTestTableName(tableName)));
+
+        assertUpdate("INSERT INTO " + getFullyQualifiedTestTableName(tableName) + " VALUES ('A', '01'), ('B', '01'), ('C', '02'), ('D', '03')", 4);
+
+        String tableLocation = (String) computeActual("SELECT DISTINCT regexp_replace(\"$path\", '/[^/]*/[^/]*$', '') FROM " + getFullyQualifiedTestTableName(tableName)).getOnlyValue();
+
+        String externalTableName = "external_" + tableName;
+        List<String> partitionColumnNames = List.of("month");
+        assertUpdate(
+                """
+                CREATE TABLE %s(
+                  a_varchar varchar,
+                  month integer)
+                WITH (
+                   partitioned_by = ARRAY['month'],
+                   external_location='%s')
+                """.formatted(getFullyQualifiedTestTableName(externalTableName), tableLocation));
+
+        addPartitions(tableName, externalTableName, partitionColumnNames, TupleDomain.all());
+        assertQuery("SELECT * FROM " + HIVE_TEST_SCHEMA + ".\"" + externalTableName + "$partitions\"", "VALUES 1, 2, 3");
+        assertUpdate("ANALYZE " + getFullyQualifiedTestTableName(externalTableName), 4);
+        assertQuery("SHOW STATS FOR " + getFullyQualifiedTestTableName(externalTableName),
+                """
+                        VALUES
+                            ('a_varchar', 4.0, 2.0, 0.0, null, null, null),
+                            ('month', null, 3.0, 0.0, null, 1, 3),
+                            (null, null, null, null, 4.0, null, null)
+                        """);
+
+        assertUpdate("INSERT INTO " + getFullyQualifiedTestTableName(tableName) + " VALUES ('E', '04')", 1);
+        addPartitions(
+                tableName,
+                externalTableName,
+                partitionColumnNames,
+                TupleDomain.fromFixedValues(Map.of("month", new NullableValue(VARCHAR, utf8Slice("04")))));
+        assertUpdate("CALL system.flush_metadata_cache(schema_name => '" + HIVE_TEST_SCHEMA + "', table_name => '" + externalTableName + "')");
+        assertQuery("SELECT * FROM " + HIVE_TEST_SCHEMA + ".\"" + externalTableName + "$partitions\"", "VALUES 1, 2, 3, 4");
+        assertUpdate("ANALYZE " + getFullyQualifiedTestTableName(externalTableName) + " WITH (partitions = ARRAY[ARRAY['04']])", 1);
+        assertQuery("SHOW STATS FOR " + getFullyQualifiedTestTableName(externalTableName),
+                """
+                        VALUES
+                            ('a_varchar', 5.0, 2.0, 0.0, null, null, null),
+                            ('month', null, 4.0, 0.0, null, 1, 4),
+                            (null, null, null, null, 5.0, null, null)
+                        """);
+        // TODO (https://github.com/trinodb/trino/issues/15998) fix selective ANALYZE for table with non-canonical partition values
+        assertQueryFails("ANALYZE " + getFullyQualifiedTestTableName(externalTableName) + " WITH (partitions = ARRAY[ARRAY['4']])", "Partition no longer exists: month=4");
+
+        assertUpdate("DROP TABLE " + getFullyQualifiedTestTableName(externalTableName));
+        assertUpdate("DROP TABLE " + getFullyQualifiedTestTableName(tableName));
+    }
+
+    @Test
+    public void testExternalLocationWithTrailingSpace()
+    {
+        String tableName = "test_external_location_with_trailing_space_" + randomNameSuffix();
+        String tableLocationDirWithTrailingSpace = tableName + " ";
+        String tableLocation = format("s3a://%s/%s/%s", bucketName, HIVE_TEST_SCHEMA, tableLocationDirWithTrailingSpace);
+
+        byte[] contents = "hello\u0001world\nbye\u0001world".getBytes(UTF_8);
+        String targetPath = format("%s/%s/test.txt", HIVE_TEST_SCHEMA, tableLocationDirWithTrailingSpace);
+        hiveMinioDataLake.getMinioClient().putObject(bucketName, contents, targetPath);
+
+        assertUpdate(format(
+                "CREATE TABLE %s (" +
+                        "  a varchar, " +
+                        "  b varchar) " +
+                        "WITH (format='TEXTFILE', external_location='%s')",
+                tableName,
+                tableLocation));
+
+        assertQuery("SELECT a, b FROM " + tableName, "VALUES ('hello', 'world'), ('bye', 'world')");
+
+        String actualTableLocation = getTableLocation(tableName);
+        assertThat(actualTableLocation).isEqualTo(tableLocation);
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testCreateSchemaInvalidName()
+    {
+        assertThatThrownBy(() -> assertUpdate("CREATE SCHEMA \".\""))
+                .hasMessage("Invalid object name: '.'");
+
+        assertThatThrownBy(() -> assertUpdate("CREATE SCHEMA \"..\""))
+                .hasMessage("Invalid object name: '..'");
+
+        assertThatThrownBy(() -> assertUpdate("CREATE SCHEMA \"foo/bar\""))
+                .hasMessage("Invalid object name: 'foo/bar'");
+    }
+
+    @Test
+    public void testCreateTableInvalidName()
+    {
+        assertThatThrownBy(() -> assertUpdate("CREATE TABLE " + HIVE_TEST_SCHEMA + ".\".\" (col integer)"))
+                .hasMessageContaining("Invalid table name");
+        assertThatThrownBy(() -> assertUpdate("CREATE TABLE " + HIVE_TEST_SCHEMA + ".\"..\" (col integer)"))
+                .hasMessageContaining("Invalid table name");
+        assertThatThrownBy(() -> assertUpdate("CREATE TABLE " + HIVE_TEST_SCHEMA + ".\"...\" (col integer)"))
+                .hasMessage("Invalid table name");
+
+        for (String tableName : Arrays.asList("foo/bar", "foo/./bar", "foo/../bar")) {
+            assertThatThrownBy(() -> assertUpdate("CREATE TABLE " + HIVE_TEST_SCHEMA + ".\"" + tableName + "\" (col integer)"))
+                    .hasMessage(format("Invalid object name: '%s'", tableName));
+            assertThatThrownBy(() -> assertUpdate("CREATE TABLE " + HIVE_TEST_SCHEMA + ".\"" + tableName + "\" (col) AS VALUES 1"))
+                    .hasMessage(format("Invalid object name: '%s'", tableName));
+        }
+    }
+
+    @Test
+    public void testRenameSchemaToInvalidObjectName()
+    {
+        String schemaName = "test_rename_schema_invalid_name_" + randomNameSuffix();
+        assertUpdate("CREATE SCHEMA " + schemaName);
+
+        for (String invalidSchemaName : Arrays.asList(".", "..", "foo/bar")) {
+            assertThatThrownBy(() -> assertUpdate("ALTER SCHEMA hive." + schemaName + " RENAME TO  \"" + invalidSchemaName + "\""))
+                    .hasMessage(format("Invalid object name: '%s'", invalidSchemaName));
+        }
+
+        assertUpdate("DROP SCHEMA " + schemaName);
+    }
+
+    @Test
+    public void testRenameTableToInvalidObjectName()
+    {
+        String tableName = "test_rename_table_invalid_name_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE %s (a_varchar varchar)".formatted(getFullyQualifiedTestTableName(tableName)));
+
+        for (String invalidTableName : Arrays.asList(".", "..", "foo/bar")) {
+            assertThatThrownBy(() -> assertUpdate("ALTER TABLE " + getFullyQualifiedTestTableName(tableName) + " RENAME TO  \"" + invalidTableName + "\""))
+                    .hasMessage(format("Invalid object name: '%s'", invalidTableName));
+        }
+
+        for (String invalidSchemaName : Arrays.asList(".", "..", "foo/bar")) {
+            assertThatThrownBy(() -> assertUpdate("ALTER TABLE " + getFullyQualifiedTestTableName(tableName) + " RENAME TO  \"" + invalidSchemaName + "\".validTableName"))
+                    .hasMessage(format("Invalid object name: '%s'", invalidSchemaName));
+        }
+
+        assertUpdate("DROP TABLE " + getFullyQualifiedTestTableName(tableName));
+    }
+
+    @Test
+    public void testUnpartitionedTableExternalLocationWithTrainingSlash()
+    {
+        String tableName = "test_external_location_trailing_slash_" + randomNameSuffix();
+        String tableLocationWithTrailingSlash = format("s3://%s/%s/%s/", bucketName, HIVE_TEST_SCHEMA, tableName);
+        byte[] contents = "Trino\nSQL\non\neverything".getBytes(UTF_8);
+        String dataFilePath = format("%s/%s/data.txt", HIVE_TEST_SCHEMA, tableName);
+        hiveMinioDataLake.getMinioClient().putObject(bucketName, contents, dataFilePath);
+
+        assertUpdate(format(
+                "CREATE TABLE %s (" +
+                        "  a_varchar varchar) " +
+                        "WITH (" +
+                        "   external_location='%s'," +
+                        "   format='TEXTFILE')",
+                tableName,
+                tableLocationWithTrailingSlash));
+        assertQuery("SELECT * FROM " + tableName, "VALUES 'Trino', 'SQL', 'on', 'everything'");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testUnpartitionedTableExternalLocationOnTopOfTheBucket()
+    {
+        String topBucketName = "test-hive-unpartitioned-top-of-the-bucket-" + randomNameSuffix();
+        hiveMinioDataLake.getMinio().createBucket(topBucketName);
+        String tableName = "test_external_location_top_of_the_bucket_" + randomNameSuffix();
+
+        byte[] contents = "Trino\nSQL\non\neverything".getBytes(UTF_8);
+        hiveMinioDataLake.getMinioClient().putObject(topBucketName, contents, "data.txt");
+
+        assertUpdate(format(
+                "CREATE TABLE %s (" +
+                        "  a_varchar varchar) " +
+                        "WITH (" +
+                        "   external_location='%s'," +
+                        "   format='TEXTFILE')",
+                tableName,
+                format("s3://%s/", topBucketName)));
+        assertQuery("SELECT * FROM " + tableName, "VALUES 'Trino', 'SQL', 'on', 'everything'");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testPartitionedTableExternalLocationOnTopOfTheBucket()
+    {
+        String topBucketName = "test-hive-partitioned-top-of-the-bucket-" + randomNameSuffix();
+        hiveMinioDataLake.getMinio().createBucket(topBucketName);
+        String tableName = "test_external_location_top_of_the_bucket_" + randomNameSuffix();
+
+        assertUpdate(format(
+                "CREATE TABLE %s (" +
+                        "  a_varchar varchar, " +
+                        "  pkey integer) " +
+                        "WITH (" +
+                        "   external_location='%s'," +
+                        "   partitioned_by=ARRAY['pkey'])",
+                tableName,
+                format("s3://%s/", topBucketName)));
+        assertUpdate("INSERT INTO " + tableName + " VALUES ('a', 1) , ('b', 1), ('c', 2), ('d', 2)", 4);
+        assertQuery("SELECT * FROM " + tableName, "VALUES ('a', 1), ('b',1), ('c', 2), ('d', 2)");
+        assertUpdate("DELETE FROM " + tableName + " where pkey = 2");
+        assertQuery("SELECT * FROM " + tableName, "VALUES ('a', 1), ('b',1)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testDropStatsPartitionedTable()
+    {
+        String tableName = "test_hive_drop_stats_partitioned_table_" + randomNameSuffix();
+        assertUpdate(("CREATE TABLE %s (" +
+                "  data integer," +
+                "  p_varchar varchar," +
+                "  p_integer integer" +
+                ") " +
+                "WITH (" +
+                "  partitioned_by=ARRAY['p_varchar', 'p_integer']" +
+                ")").formatted(getFullyQualifiedTestTableName(tableName)));
+
+        // Drop stats for partition which does not exist
+        assertThatThrownBy(() -> query(format("CALL system.drop_stats('%s', '%s', ARRAY[ARRAY['partnotfound', '999']])", HIVE_TEST_SCHEMA, tableName)))
+                .hasMessage("No partition found for name: p_varchar=partnotfound/p_integer=999");
+
+        assertUpdate("INSERT INTO " + getFullyQualifiedTestTableName(tableName) + " VALUES (1, 'part1', 10) , (2, 'part2', 10), (12, 'part2', 20)", 3);
+
+        // Run analyze on the entire table
+        assertUpdate("ANALYZE " + getFullyQualifiedTestTableName(tableName), 3);
+
+        assertQuery("SHOW STATS FOR " + getFullyQualifiedTestTableName(tableName),
+                """
+                        VALUES
+                            ('data', null, 1.0, 0.0, null, 1, 12),
+                            ('p_varchar', 15.0, 2.0, 0.0, null, null, null),
+                            ('p_integer', null, 2.0, 0.0, null, 10, 20),
+                            (null, null, null, null, 3.0, null, null)
+                        """);
+
+        assertUpdate(format("CALL system.drop_stats('%s', '%s', ARRAY[ARRAY['part1', '10']])", HIVE_TEST_SCHEMA, tableName));
+
+        assertQuery("SHOW STATS FOR " + getFullyQualifiedTestTableName(tableName),
+                """
+                        VALUES
+                            ('data', null, 1.0, 0.0, null, 2, 12),
+                            ('p_varchar', 15.0, 2.0, 0.0, null, null, null),
+                            ('p_integer', null, 2.0, 0.0, null, 10, 20),
+                            (null, null, null, null, 3.0, null, null)
+                        """);
+
+        assertUpdate("DELETE FROM " + getFullyQualifiedTestTableName(tableName) + " WHERE p_varchar ='part1' and p_integer = 10");
+
+        // Drop stats for partition which does not exist
+        assertThatThrownBy(() -> query(format("CALL system.drop_stats('%s', '%s', ARRAY[ARRAY['part1', '10']])", HIVE_TEST_SCHEMA, tableName)))
+                .hasMessage("No partition found for name: p_varchar=part1/p_integer=10");
+
+        assertQuery("SHOW STATS FOR " + getFullyQualifiedTestTableName(tableName),
+                """
+                        VALUES
+                            ('data', null, 1.0, 0.0, null, 2, 12),
+                            ('p_varchar', 10.0, 1.0, 0.0, null, null, null),
+                            ('p_integer', null, 2.0, 0.0, null, 10, 20),
+                            (null, null, null, null, 2.0, null, null)
+                        """);
+        assertUpdate("DROP TABLE " + getFullyQualifiedTestTableName(tableName));
+    }
+
+    @Test
+    public void testUnsupportedDropSchemaCascadeWithNonHiveTable()
+    {
+        String schemaName = "test_unsupported_drop_schema_cascade_" + randomNameSuffix();
+        String icebergTableName = "test_dummy_iceberg_table" + randomNameSuffix();
+
+        hiveMinioDataLake.getHiveHadoop().runOnHive("CREATE DATABASE %2$s LOCATION 's3a://%1$s/%2$s'".formatted(bucketName, schemaName));
+        try {
+            hiveMinioDataLake.getHiveHadoop().runOnHive("CREATE TABLE " + schemaName + "." + icebergTableName + " TBLPROPERTIES ('table_type'='iceberg') AS SELECT 1 a");
+
+            assertQueryFails("DROP SCHEMA " + schemaName + " CASCADE", "\\QCannot query Iceberg table '%s.%s'".formatted(schemaName, icebergTableName));
+
+            assertThat(computeActual("SHOW SCHEMAS").getOnlyColumnAsSet()).contains(schemaName);
+            assertThat(computeActual("SHOW TABLES FROM " + schemaName).getOnlyColumnAsSet()).contains(icebergTableName);
+            assertThat(hiveMinioDataLake.getMinioClient().listObjects(bucketName, schemaName).stream()).isNotEmpty();
+        }
+        finally {
+            hiveMinioDataLake.getHiveHadoop().runOnHive("DROP DATABASE IF EXISTS " + schemaName + " CASCADE");
+        }
+    }
+
+    @Test
+    public void testCreateFunction()
+    {
+        String name = "test_" + randomNameSuffix();
+        String name2 = "test_" + randomNameSuffix();
+
+        assertUpdate("CREATE FUNCTION " + name + "(x integer) RETURNS bigint COMMENT 't42' RETURN x * 42");
+
+        assertQuery("SELECT " + name + "(99)", "SELECT 4158");
+        assertQueryFails("SELECT " + name + "(2.9)", ".*Unexpected parameters.*");
+
+        assertUpdate("CREATE FUNCTION " + name + "(x double) RETURNS double COMMENT 't88' RETURN x * 8.8");
+
+        assertThat(query("SHOW FUNCTIONS"))
+                .skippingTypesCheck()
+                .containsAll(resultBuilder(getSession())
+                        .row(name, "bigint", "integer", "scalar", true, "t42")
+                        .row(name, "double", "double", "scalar", true, "t88")
+                        .build());
+
+        assertQuery("SELECT " + name + "(99)", "SELECT 4158");
+        assertQuery("SELECT " + name + "(2.9)", "SELECT 25.52");
+
+        assertQueryFails("CREATE FUNCTION " + name + "(x int) RETURNS bigint RETURN x", "line 1:1: Function already exists");
+
+        assertQuery("SELECT " + name + "(99)", "SELECT 4158");
+        assertQuery("SELECT " + name + "(2.9)", "SELECT 25.52");
+
+        assertUpdate("CREATE OR REPLACE FUNCTION " + name + "(x bigint) RETURNS bigint RETURN x * 23");
+        assertUpdate("CREATE FUNCTION " + name2 + "(s varchar) RETURNS varchar RETURN 'Hello ' || s");
+
+        assertThat(query("SHOW FUNCTIONS"))
+                .skippingTypesCheck()
+                .containsAll(resultBuilder(getSession())
+                        .row(name, "bigint", "integer", "scalar", true, "t42")
+                        .row(name, "bigint", "bigint", "scalar", true, "")
+                        .row(name, "double", "double", "scalar", true, "t88")
+                        .row(name2, "varchar", "varchar", "scalar", true, "")
+                        .build());
+
+        assertQuery("SELECT " + name + "(99)", "SELECT 4158");
+        assertQuery("SELECT " + name + "(cast(99 as bigint))", "SELECT 2277");
+        assertQuery("SELECT " + name + "(2.9)", "SELECT 25.52");
+        assertQuery("SELECT " + name2 + "('world')", "SELECT 'Hello world'");
+
+        assertQueryFails("DROP FUNCTION " + name + "(varchar)", "line 1:1: Function not found");
+        assertUpdate("DROP FUNCTION " + name + "(z bigint)");
+        assertUpdate("DROP FUNCTION " + name + "(double)");
+        assertUpdate("DROP FUNCTION " + name + "(int)");
+        assertQueryFails("DROP FUNCTION " + name + "(bigint)", "line 1:1: Function not found");
+        assertUpdate("DROP FUNCTION IF EXISTS " + name + "(bigint)");
+        assertUpdate("DROP FUNCTION " + name2 + "(varchar)");
+        assertQueryFails("DROP FUNCTION " + name2 + "(varchar)", "line 1:1: Function not found");
+    }
+
+    private void renamePartitionResourcesOutsideTrino(String tableName, String partitionColumn, String regionKey)
+    {
+        String partitionName = format("%s=%s", partitionColumn, regionKey);
+        String partitionS3KeyPrefix = format("%s/%s/%s", HIVE_TEST_SCHEMA, tableName, partitionName);
+        String renamedPartitionSuffix = "CP";
+
+        // Copy whole partition to new location
+        MinioClient minioClient = hiveMinioDataLake.getMinioClient();
+        minioClient.listObjects(bucketName, "/")
+                .forEach(objectKey -> {
+                    if (objectKey.startsWith(partitionS3KeyPrefix)) {
+                        String fileName = objectKey.substring(objectKey.lastIndexOf('/'));
+                        String destinationKey = partitionS3KeyPrefix + renamedPartitionSuffix + fileName;
+                        minioClient.copyObject(bucketName, objectKey, bucketName, destinationKey);
+                    }
+                });
+
+        // Delete old partition and update metadata to point to location of new copy
+        Table hiveTable = metastoreClient.getTable(HIVE_TEST_SCHEMA, tableName).get();
+        Partition hivePartition = metastoreClient.getPartition(hiveTable, List.of(regionKey)).get();
+        Map<String, PartitionStatistics> partitionStatistics =
+                metastoreClient.getPartitionStatistics(hiveTable, List.of(hivePartition));
+
+        metastoreClient.dropPartition(HIVE_TEST_SCHEMA, tableName, List.of(regionKey), true);
+        metastoreClient.addPartitions(HIVE_TEST_SCHEMA, tableName, List.of(
+                new PartitionWithStatistics(
+                        Partition.builder(hivePartition)
+                                .withStorage(builder -> builder.setLocation(
+                                        hivePartition.getStorage().getLocation() + renamedPartitionSuffix))
+                                .build(),
+                        partitionName,
+                        partitionStatistics.get(partitionName))));
+    }
+
+    protected void assertInsertFailure(String testTable, String expectedMessageRegExp)
+    {
+        assertInsertFailure(getSession(), testTable, expectedMessageRegExp);
+    }
+
+    protected void assertInsertFailure(Session session, String testTable, String expectedMessageRegExp)
+    {
+        assertQueryFails(
+                session,
+                createInsertAsSelectFromTpchStatement(testTable),
+                expectedMessageRegExp);
+    }
+
+    private String createInsertAsSelectFromTpchStatement(String testTable)
+    {
+        return format("INSERT INTO %s " +
+                        "SELECT name, comment, nationkey, regionkey " +
+                        "FROM tpch.tiny.nation",
+                testTable);
+    }
+
+    protected String createInsertStatement(String testTable, List<List<String>> data)
+    {
+        String values = data.stream()
+                .map(row -> String.join(", ", row))
+                .collect(Collectors.joining("), ("));
+        return format("INSERT INTO %s VALUES (%s)", testTable, values);
+    }
+
+    protected void assertOverwritePartition(String testTable)
+    {
+        computeActual(createInsertStatement(
+                testTable,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND'", "'Test Data'", "25", "5"),
+                        ImmutableList.of("'CZECH'", "'Test Data'", "26", "5"))));
+        query(format("SELECT name, comment, nationkey, regionkey FROM %s WHERE regionkey = 5", testTable))
+                .assertThat()
+                .skippingTypesCheck()
+                .containsAll(resultBuilder(getSession())
+                        .row("POLAND", "Test Data", 25L, 5L)
+                        .row("CZECH", "Test Data", 26L, 5L)
+                        .build());
+
+        computeActual(createInsertStatement(
+                testTable,
+                ImmutableList.of(
+                        ImmutableList.of("'POLAND'", "'Overwrite'", "25", "5"))));
+        query(format("SELECT name, comment, nationkey, regionkey FROM %s WHERE regionkey = 5", testTable))
+                .assertThat()
+                .skippingTypesCheck()
+                .containsAll(resultBuilder(getSession())
+                        .row("POLAND", "Overwrite", 25L, 5L)
+                        .build());
+        computeActual(format("DROP TABLE %s", testTable));
+    }
+
+    protected String getRandomTestTableName()
+    {
+        return "nation_" + randomNameSuffix();
+    }
+
+    protected String getFullyQualifiedTestTableName()
+    {
+        return getFullyQualifiedTestTableName(getRandomTestTableName());
+    }
+
+    protected String getFullyQualifiedTestTableName(String tableName)
+    {
+        return getFullyQualifiedTestTableName(HIVE_TEST_SCHEMA, tableName);
+    }
+
+    protected String getFullyQualifiedTestTableName(String schemaName, String tableName)
+    {
+        return "hive.%s.%s".formatted(schemaName, tableName);
+    }
+
+    protected String getHiveTestTableName(String tableName)
+    {
+        return getHiveTestTableName(HIVE_TEST_SCHEMA, tableName);
+    }
+
+    protected String getHiveTestTableName(String schemaName, String tableName)
+    {
+        return "%s.%s".formatted(schemaName, tableName);
+    }
+
+    protected String getCreateTableStatement(String tableName, String... propertiesEntries)
+    {
+        return getCreateTableStatement(tableName, Arrays.asList(propertiesEntries));
+    }
+
+    protected String getCreateTableStatement(String tableName, List<String> propertiesEntries)
+    {
+        return format(
+                "CREATE TABLE %s (" +
+                        "    name varchar(25), " +
+                        "    comment varchar(152),  " +
+                        "    nationkey bigint, " +
+                        "    regionkey bigint) " +
+                        (propertiesEntries.size() < 1 ? "" : propertiesEntries
+                                .stream()
+                                .collect(joining(",", "WITH (", ")"))),
+                tableName);
+    }
+
+    protected void copyTpchNationToTable(String testTable)
+    {
+        computeActual(format("INSERT INTO " + testTable + " SELECT name, comment, nationkey, regionkey FROM tpch.tiny.nation"));
+    }
+
+    private void testWriteWithFileSize(String testTable, int scaleFactorInThousands, long fileSizeRangeStart, long fileSizeRangeEnd)
+    {
+        String scaledColumnExpression = format("array_join(transform(sequence(1, %d), x-> array_join(repeat(comment, 1000), '')), '')", scaleFactorInThousands);
+        computeActual(format("INSERT INTO " + testTable + " SELECT %s, %s, regionkey FROM tpch.tiny.nation WHERE nationkey = 9", scaledColumnExpression, scaledColumnExpression));
+        query(format("SELECT length(col1) FROM %s", testTable))
+                .assertThat()
+                .skippingTypesCheck()
+                .containsAll(resultBuilder(getSession())
+                        .row(114L * scaleFactorInThousands * 1000)
+                        .build());
+        query(format("SELECT \"$file_size\" BETWEEN %d AND %d FROM %s", fileSizeRangeStart, fileSizeRangeEnd, testTable))
+                .assertThat()
+                .skippingTypesCheck()
+                .containsAll(resultBuilder(getSession())
+                        .row(true)
+                        .build());
+    }
+
+    private void addPartitions(
+            String sourceTableName,
+            String destinationExternalTableName,
+            List<String> columnNames,
+            TupleDomain<String> partitionsKeyFilter)
+    {
+        Optional<List<String>> partitionNames = metastoreClient.getPartitionNamesByFilter(HIVE_TEST_SCHEMA, sourceTableName, columnNames, partitionsKeyFilter);
+        if (partitionNames.isEmpty()) {
+            // nothing to add
+            return;
+        }
+        Table table = metastoreClient.getTable(HIVE_TEST_SCHEMA, sourceTableName)
+                .orElseThrow(() -> new TableNotFoundException(new SchemaTableName(HIVE_TEST_SCHEMA, sourceTableName)));
+        Map<String, Optional<Partition>> partitionsByNames = metastoreClient.getPartitionsByNames(table, partitionNames.get());
+
+        metastoreClient.addPartitions(
+                HIVE_TEST_SCHEMA,
+                destinationExternalTableName,
+                partitionsByNames.entrySet().stream()
+                        .map(e -> new PartitionWithStatistics(
+                                e.getValue()
+                                        .map(p -> Partition.builder(p).setTableName(destinationExternalTableName).build())
+                                        .orElseThrow(),
+                                e.getKey(),
+                                PartitionStatistics.empty()))
+                        .collect(toImmutableList()));
+    }
+
+    private String getTableLocation(String tableName)
     {
-        super(HiveHadoop.HIVE3_IMAGE);
+        return (String) computeScalar("SELECT DISTINCT regexp_replace(\"$path\", '/[^/]*$', '') FROM " + tableName);
     }
 
     @Test
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveAnalyzeCorruptStatistics.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveAnalyzeCorruptStatistics.java
index ff1d8992eff3..1b803b5a11e6 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveAnalyzeCorruptStatistics.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveAnalyzeCorruptStatistics.java
@@ -19,7 +19,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.util.concurrent.TimeUnit.MINUTES;
@@ -57,7 +57,7 @@ public void testAnalyzeCorruptColumnStatisticsOnEmptyTable()
 
         // ANALYZE and drop_stats are unsupported for tables having broken column statistics
         assertThatThrownBy(() -> query("ANALYZE " + tableName))
-                .hasMessage("%s: Socket is closed by peer.", hiveMinioDataLake.getHiveHadoop().getHiveMetastoreEndpoint())
+                .hasMessage("Unexpected 2 statistics for 1 columns")
                 .hasStackTraceContaining("ThriftHiveMetastore.setTableColumnStatistics");
 
         assertThatThrownBy(() -> query("CALL system.drop_stats('tpch', '" + tableName + "')"))
@@ -72,9 +72,33 @@ private void prepareBrokenColumnStatisticsTable(String tableName)
 
         // Insert duplicated row to simulate broken column statistics status https://github.com/trinodb/trino/issues/13787
         assertEquals(onMetastore("SELECT COUNT(1) FROM TAB_COL_STATS WHERE db_name = 'tpch' AND table_name = '" + tableName + "'"), "1");
-        onMetastore("INSERT INTO TAB_COL_STATS  " +
-                "SELECT cs_id + 1, db_name, table_name, column_name, column_type, tbl_id, long_low_value, long_high_value, double_high_value, double_low_value, big_decimal_low_value, big_decimal_high_value, num_nulls, num_distincts, avg_col_len, max_col_len, num_trues, num_falses, last_analyzed " +
-                "FROM TAB_COL_STATS WHERE db_name = 'tpch' AND table_name = '" + tableName + "'");
+        onMetastore("""
+                INSERT INTO TAB_COL_STATS
+                SELECT
+                  cs_id + 1,
+                  cat_name,
+                  db_name,
+                  table_name,
+                  column_name,
+                  column_type,
+                  tbl_id,
+                  long_low_value,
+                  long_high_value,
+                  double_high_value,
+                  double_low_value,
+                  big_decimal_low_value,
+                  big_decimal_high_value,
+                  num_nulls,
+                  num_distincts,
+                  bit_vector,
+                  avg_col_len,
+                  max_col_len,
+                  num_trues,
+                  num_falses,
+                  last_analyzed
+                FROM TAB_COL_STATS
+                WHERE db_name = 'tpch' AND table_name = '%s'
+                """.formatted(tableName));
         assertEquals(onMetastore("SELECT COUNT(1) FROM TAB_COL_STATS WHERE db_name = 'tpch' AND table_name = '" + tableName + "'"), "2");
     }
 
@@ -103,9 +127,34 @@ private void prepareBrokenPartitionStatisticsTable(String tableName)
 
         // Insert duplicated row to simulate broken partition statistics status https://github.com/trinodb/trino/issues/13787
         assertEquals(onMetastore("SELECT COUNT(1) FROM PART_COL_STATS WHERE db_name = 'tpch' AND table_name = '" + tableName + "'"), "1");
-        onMetastore("INSERT INTO PART_COL_STATS  " +
-                "SELECT cs_id + 1, db_name, table_name, partition_name, column_name, column_type, part_id, long_low_value, long_high_value, double_high_value, double_low_value, big_decimal_low_value, big_decimal_high_value, num_nulls, num_distincts, avg_col_len, max_col_len, num_trues, num_falses, last_analyzed " +
-                "FROM PART_COL_STATS WHERE db_name = 'tpch' AND table_name = '" + tableName + "'");
+        onMetastore("""
+                INSERT INTO PART_COL_STATS
+                SELECT
+                  cs_id + 1,
+                  cat_name,
+                  db_name,
+                  table_name,
+                  partition_name,
+                  column_name,
+                  column_type,
+                  part_id,
+                  long_low_value,
+                  long_high_value,
+                  double_high_value,
+                  double_low_value,
+                  big_decimal_low_value,
+                  big_decimal_high_value,
+                  num_nulls,
+                  num_distincts,
+                  bit_vector,
+                  avg_col_len,
+                  max_col_len,
+                  num_trues,
+                  num_falses,
+                  last_analyzed
+                FROM PART_COL_STATS
+                WHERE db_name = 'tpch' AND table_name = '%s'
+                """.formatted(tableName));
         assertEquals(onMetastore("SELECT COUNT(1) FROM PART_COL_STATS WHERE db_name = 'tpch' AND table_name = '" + tableName + "'"), "2");
     }
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveApplyProjectionUtil.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveApplyProjectionUtil.java
deleted file mode 100644
index 8cf95d7ca0b2..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveApplyProjectionUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.spi.expression.ConnectorExpression;
-import io.trino.spi.expression.Constant;
-import io.trino.spi.expression.FieldDereference;
-import io.trino.spi.expression.Variable;
-import org.testng.annotations.Test;
-
-import static io.trino.plugin.hive.HiveApplyProjectionUtil.extractSupportedProjectedColumns;
-import static io.trino.plugin.hive.HiveApplyProjectionUtil.isPushDownSupported;
-import static io.trino.spi.type.IntegerType.INTEGER;
-import static io.trino.spi.type.RowType.field;
-import static io.trino.spi.type.RowType.rowType;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-public class TestHiveApplyProjectionUtil
-{
-    private static final ConnectorExpression ROW_OF_ROW_VARIABLE = new Variable("a", rowType(field("b", rowType(field("c", INTEGER)))));
-
-    private static final ConnectorExpression ONE_LEVEL_DEREFERENCE = new FieldDereference(
-            rowType(field("c", INTEGER)),
-            ROW_OF_ROW_VARIABLE,
-            0);
-
-    private static final ConnectorExpression TWO_LEVEL_DEREFERENCE = new FieldDereference(
-            INTEGER,
-            ONE_LEVEL_DEREFERENCE,
-            0);
-
-    private static final ConnectorExpression INT_VARIABLE = new Variable("a", INTEGER);
-    private static final ConnectorExpression CONSTANT = new Constant(5, INTEGER);
-
-    @Test
-    public void testIsProjectionSupported()
-    {
-        assertTrue(isPushDownSupported(ONE_LEVEL_DEREFERENCE));
-        assertTrue(isPushDownSupported(TWO_LEVEL_DEREFERENCE));
-        assertTrue(isPushDownSupported(INT_VARIABLE));
-        assertFalse(isPushDownSupported(CONSTANT));
-    }
-
-    @Test
-    public void testExtractSupportedProjectionColumns()
-    {
-        assertEquals(extractSupportedProjectedColumns(ONE_LEVEL_DEREFERENCE), ImmutableList.of(ONE_LEVEL_DEREFERENCE));
-        assertEquals(extractSupportedProjectedColumns(TWO_LEVEL_DEREFERENCE), ImmutableList.of(TWO_LEVEL_DEREFERENCE));
-        assertEquals(extractSupportedProjectedColumns(INT_VARIABLE), ImmutableList.of(INT_VARIABLE));
-        assertEquals(extractSupportedProjectedColumns(CONSTANT), ImmutableList.of());
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveBooleanParser.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveBooleanParser.java
index a645a859acc2..53aa16a0701e 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveBooleanParser.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveBooleanParser.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.hive.HiveBooleanParser.parseHiveBoolean;
 import static java.nio.charset.StandardCharsets.US_ASCII;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveColumnHandle.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveColumnHandle.java
index 5e48e4ca271b..2c5887fcb75d 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveColumnHandle.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveColumnHandle.java
@@ -21,7 +21,7 @@
 import io.trino.plugin.base.TypeDeserializer;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConcurrentModificationGlueMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConcurrentModificationGlueMetastore.java
new file mode 100644
index 000000000000..5c5fd6a1942f
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConcurrentModificationGlueMetastore.java
@@ -0,0 +1,151 @@
+/*
+ * Licensed 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 io.trino.plugin.hive;
+
+import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
+import com.amazonaws.services.glue.AWSGlueAsync;
+import com.amazonaws.services.glue.model.ConcurrentModificationException;
+import com.google.common.collect.ImmutableSet;
+import io.trino.Session;
+import io.trino.plugin.hive.metastore.glue.DefaultGlueColumnStatisticsProviderFactory;
+import io.trino.plugin.hive.metastore.glue.GlueHiveMetastore;
+import io.trino.plugin.hive.metastore.glue.GlueHiveMetastoreConfig;
+import io.trino.plugin.hive.metastore.glue.GlueMetastoreStats;
+import io.trino.spi.TrinoException;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.google.common.io.MoreFiles.deleteRecursively;
+import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
+import static com.google.common.reflect.Reflection.newProxy;
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static com.google.inject.util.Modules.EMPTY_MODULE;
+import static io.trino.plugin.hive.HiveErrorCode.HIVE_METASTORE_ERROR;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+import static io.trino.plugin.hive.metastore.glue.GlueClientUtil.createAsyncGlueClient;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestHiveConcurrentModificationGlueMetastore
+        extends AbstractTestQueryFramework
+{
+    private static final String CATALOG_NAME = "test_hive_concurrent";
+    private static final String SCHEMA = "test_hive_glue_concurrent_" + randomNameSuffix();
+    private Path dataDirectory;
+    private GlueHiveMetastore metastore;
+    private final AtomicBoolean failNextGlueUpdateTableCall = new AtomicBoolean(false);
+    private final AtomicInteger updateTableCallsCounter = new AtomicInteger();
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        Session deltaLakeSession = testSessionBuilder()
+                .setCatalog(CATALOG_NAME)
+                .setSchema(SCHEMA)
+                .build();
+
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(deltaLakeSession).build();
+
+        dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("data_hive_concurrent");
+        GlueMetastoreStats stats = new GlueMetastoreStats();
+        GlueHiveMetastoreConfig glueConfig = new GlueHiveMetastoreConfig()
+                .setDefaultWarehouseDir(dataDirectory.toUri().toString());
+
+        AWSGlueAsync glueClient = createAsyncGlueClient(glueConfig, DefaultAWSCredentialsProviderChain.getInstance(), ImmutableSet.of(), stats.newRequestMetricsCollector());
+        AWSGlueAsync proxiedGlueClient = newProxy(AWSGlueAsync.class, (proxy, method, args) -> {
+            try {
+                if (method.getName().equals("updateTable")) {
+                    updateTableCallsCounter.incrementAndGet();
+                    if (failNextGlueUpdateTableCall.get()) {
+                        // Simulate concurrent modifications on the table that is about to be dropped
+                        failNextGlueUpdateTableCall.set(false);
+                        throw new TrinoException(HIVE_METASTORE_ERROR, new ConcurrentModificationException("Test-simulated metastore concurrent modification exception"));
+                    }
+                }
+                return method.invoke(glueClient, args);
+            }
+            catch (InvocationTargetException e) {
+                throw e.getCause();
+            }
+        });
+
+        metastore = new GlueHiveMetastore(
+                HDFS_FILE_SYSTEM_FACTORY,
+                glueConfig,
+                directExecutor(),
+                new DefaultGlueColumnStatisticsProviderFactory(directExecutor(), directExecutor()),
+                proxiedGlueClient,
+                stats,
+                table -> true);
+
+        queryRunner.installPlugin(new TestingHivePlugin(Optional.of(metastore), Optional.empty(), EMPTY_MODULE, Optional.empty()));
+        queryRunner.createCatalog(CATALOG_NAME, "hive");
+        queryRunner.execute("CREATE SCHEMA " + SCHEMA);
+        return queryRunner;
+    }
+
+    @Test
+    public void testUpdateTableStatsWithConcurrentModifications()
+    {
+        String tableName = "test_glue_table_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 1 AS data", 1);
+
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                        "   ('data',  null, 1.0, 0.0, null, 1, 1), " +
+                        "   (null, null, null, null, 1.0, null, null)");
+
+        failNextGlueUpdateTableCall.set(true);
+        resetCounters();
+        assertUpdate("INSERT INTO " + tableName + " VALUES 2", 1);
+        assertThat(updateTableCallsCounter.get()).isEqualTo(2);
+        assertQuery("SELECT * FROM " + tableName, "VALUES 1, 2");
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                "VALUES " +
+                        "   ('data',  null, 1.0, 0.0, null, 1, 2), " +
+                        "   (null, null, null, null, 2.0, null, null)");
+    }
+
+    private void resetCounters()
+    {
+        updateTableCallsCounter.set(0);
+    }
+
+    @AfterAll
+    public void cleanup()
+            throws IOException
+    {
+        if (metastore != null) {
+            metastore.dropDatabase(SCHEMA, false);
+            deleteRecursively(dataDirectory, ALLOW_INSECURE);
+        }
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConfig.java
index cbf5ec738ac9..7abc47c55b61 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConfig.java
@@ -17,7 +17,7 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.DataSize.Unit;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.TimeZone;
@@ -26,6 +26,8 @@
 import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
 import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
 import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+import static io.airlift.units.DataSize.Unit.GIGABYTE;
+import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.plugin.hive.HiveConfig.CONFIGURATION_HIVE_PARTITION_PROJECTION_ENABLED;
 import static io.trino.plugin.hive.HiveSessionProperties.InsertExistingPartitionsBehavior.APPEND;
 import static io.trino.plugin.hive.HiveSessionProperties.InsertExistingPartitionsBehavior.OVERWRITE;
@@ -41,7 +43,7 @@ public void testDefaults()
                 .setMaxSplitSize(DataSize.of(64, Unit.MEGABYTE))
                 .setMaxPartitionsPerScan(1_000_000)
                 .setMaxPartitionsForEagerLoad(100_000)
-                .setMaxOutstandingSplits(1_000)
+                .setMaxOutstandingSplits(3_000)
                 .setMaxOutstandingSplitsSize(DataSize.of(256, Unit.MEGABYTE))
                 .setMaxSplitIteratorThreads(1_000)
                 .setPerTransactionMetastoreCacheMaximumSize(1000)
@@ -51,8 +53,8 @@ public void testDefaults()
                 .setMaxInitialSplitSize(DataSize.of(32, Unit.MEGABYTE))
                 .setSplitLoaderConcurrency(64)
                 .setMaxSplitsPerSecond(null)
-                .setDomainCompactionThreshold(100)
-                .setTargetMaxFileSize(DataSize.of(1, Unit.GIGABYTE))
+                .setDomainCompactionThreshold(1000)
+                .setTargetMaxFileSize(DataSize.of(1, GIGABYTE))
                 .setForceLocalScheduling(false)
                 .setMaxConcurrentFileSystemOperations(20)
                 .setMaxConcurrentMetastoreDrops(20)
@@ -89,15 +91,13 @@ public void testDefaults()
                 .setPartitionStatisticsSampleSize(100)
                 .setIgnoreCorruptedStatistics(false)
                 .setCollectColumnStatisticsOnWrite(true)
-                .setS3SelectPushdownEnabled(false)
-                .setS3SelectPushdownMaxConnections(500)
                 .setTemporaryStagingDirectoryEnabled(true)
                 .setTemporaryStagingDirectoryPath("/tmp/presto-${USER}")
                 .setDelegateTransactionalManagedTableLocationToMetastore(false)
                 .setFileStatusCacheExpireAfterWrite(new Duration(1, TimeUnit.MINUTES))
-                .setFileStatusCacheMaxSize(1000 * 1000)
+                .setFileStatusCacheMaxRetainedSize(DataSize.of(1, GIGABYTE))
                 .setFileStatusCacheTables("")
-                .setPerTransactionFileStatusCacheMaximumSize(1000 * 1000)
+                .setPerTransactionFileStatusCacheMaxRetainedSize(DataSize.of(100, MEGABYTE))
                 .setTranslateHiveViews(false)
                 .setLegacyHiveViewTranslation(false)
                 .setHiveViewsRunAsInvoker(false)
@@ -109,7 +109,6 @@ public void testDefaults()
                 .setProjectionPushdownEnabled(true)
                 .setDynamicFilteringWaitTimeout(new Duration(0, TimeUnit.MINUTES))
                 .setTimestampPrecision(HiveTimestampPrecision.DEFAULT_PRECISION)
-                .setOptimizeSymlinkListing(true)
                 .setIcebergCatalogName(null)
                 .setSizeBasedSplitWeightsEnabled(true)
                 .setMinimumAssignedSplitWeight(0.05)
@@ -175,15 +174,13 @@ public void testExplicitPropertyMappings()
                 .put("hive.partition-statistics-sample-size", "1234")
                 .put("hive.ignore-corrupted-statistics", "true")
                 .put("hive.collect-column-statistics-on-write", "false")
-                .put("hive.s3select-pushdown.enabled", "true")
-                .put("hive.s3select-pushdown.max-connections", "1234")
                 .put("hive.temporary-staging-directory-enabled", "false")
                 .put("hive.temporary-staging-directory-path", "updated")
                 .put("hive.delegate-transactional-managed-table-location-to-metastore", "true")
                 .put("hive.file-status-cache-tables", "foo.bar1, foo.bar2")
-                .put("hive.file-status-cache-size", "1000")
+                .put("hive.file-status-cache.max-retained-size", "1000B")
                 .put("hive.file-status-cache-expire-time", "30m")
-                .put("hive.per-transaction-file-status-cache-maximum-size", "42")
+                .put("hive.per-transaction-file-status-cache.max-retained-size", "42B")
                 .put("hive.hive-views.enabled", "true")
                 .put("hive.hive-views.legacy-translation", "true")
                 .put("hive.hive-views.run-as-invoker", "true")
@@ -195,7 +192,6 @@ public void testExplicitPropertyMappings()
                 .put("hive.projection-pushdown-enabled", "false")
                 .put("hive.dynamic-filtering.wait-timeout", "10s")
                 .put("hive.timestamp-precision", "NANOSECONDS")
-                .put("hive.optimize-symlink-listing", "false")
                 .put("hive.iceberg-catalog-name", "iceberg")
                 .put("hive.size-based-split-weights-enabled", "false")
                 .put("hive.minimum-assigned-split-weight", "1.0")
@@ -258,15 +254,13 @@ public void testExplicitPropertyMappings()
                 .setPartitionStatisticsSampleSize(1234)
                 .setIgnoreCorruptedStatistics(true)
                 .setCollectColumnStatisticsOnWrite(false)
-                .setS3SelectPushdownEnabled(true)
-                .setS3SelectPushdownMaxConnections(1234)
                 .setTemporaryStagingDirectoryEnabled(false)
                 .setTemporaryStagingDirectoryPath("updated")
                 .setDelegateTransactionalManagedTableLocationToMetastore(true)
                 .setFileStatusCacheTables("foo.bar1,foo.bar2")
-                .setFileStatusCacheMaxSize(1000)
+                .setFileStatusCacheMaxRetainedSize(DataSize.ofBytes(1000))
                 .setFileStatusCacheExpireAfterWrite(new Duration(30, TimeUnit.MINUTES))
-                .setPerTransactionFileStatusCacheMaximumSize(42)
+                .setPerTransactionFileStatusCacheMaxRetainedSize(DataSize.ofBytes(42))
                 .setTranslateHiveViews(true)
                 .setLegacyHiveViewTranslation(true)
                 .setHiveViewsRunAsInvoker(true)
@@ -278,7 +272,6 @@ public void testExplicitPropertyMappings()
                 .setProjectionPushdownEnabled(false)
                 .setDynamicFilteringWaitTimeout(new Duration(10, TimeUnit.SECONDS))
                 .setTimestampPrecision(HiveTimestampPrecision.NANOSECONDS)
-                .setOptimizeSymlinkListing(false)
                 .setIcebergCatalogName("iceberg")
                 .setSizeBasedSplitWeightsEnabled(false)
                 .setMinimumAssignedSplitWeight(1.0)
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConnectorFactory.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConnectorFactory.java
index e152b617b3ef..4e0c4b71efdf 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConnectorFactory.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConnectorFactory.java
@@ -20,7 +20,7 @@
 import io.trino.spi.connector.ConnectorPageSourceProvider;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConnectorSmokeTest.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConnectorSmokeTest.java
index 82ca85c9f21b..0b3bdff59526 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConnectorSmokeTest.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConnectorSmokeTest.java
@@ -16,7 +16,7 @@
 import io.trino.testing.BaseConnectorSmokeTest;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.hive.HiveMetadata.MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,30 +36,19 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_VIEW:
-                return true;
-
-            case SUPPORTS_DELETE:
-            case SUPPORTS_UPDATE:
-            case SUPPORTS_MERGE:
-                return true;
-
-            case SUPPORTS_MULTI_STATEMENT_WRITES:
-                return true;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_MULTI_STATEMENT_WRITES -> true;
+            case SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_TRUNCATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
+    @Test
     @Override
     public void testRowLevelDelete()
     {
@@ -67,6 +56,15 @@ public void testRowLevelDelete()
                 .hasMessage(MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE);
     }
 
+    @Test
+    @Override
+    public void testRowLevelUpdate()
+    {
+        assertThatThrownBy(super::testRowLevelUpdate)
+                .hasMessage(MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE);
+    }
+
+    @Test
     @Override
     public void testUpdate()
     {
@@ -74,6 +72,7 @@ public void testUpdate()
                 .hasMessage(MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE);
     }
 
+    @Test
     @Override
     public void testMerge()
     {
@@ -96,4 +95,14 @@ public void testShowCreateTable()
                         "   format = 'ORC'\n" +
                         ")");
     }
+
+    @Test
+    @Override
+    public void testCreateSchemaWithNonLowercaseOwnerName()
+    {
+        // Override because HivePrincipal's username is case-sensitive unlike TrinoPrincipal
+        assertThatThrownBy(super::testCreateSchemaWithNonLowercaseOwnerName)
+                .hasMessageContaining("Access Denied: Cannot create schema")
+                .hasStackTraceContaining("CREATE SCHEMA");
+    }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConnectorTest.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConnectorTest.java
index 2cd38bab7748..1d8c94367020 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConnectorTest.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConnectorTest.java
@@ -13,8 +13,10 @@
  */
 package io.trino.plugin.hive;
 
-import com.google.common.collect.ImmutableMap;
 import io.trino.testing.QueryRunner;
+import org.testng.annotations.Test;
+
+import static io.trino.testing.TestingNames.randomNameSuffix;
 
 public class TestHiveConnectorTest
         extends BaseHiveConnectorTest
@@ -23,6 +25,31 @@ public class TestHiveConnectorTest
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        return BaseHiveConnectorTest.createHiveQueryRunner(ImmutableMap.of(), runner -> {});
+        return createHiveQueryRunner(HiveQueryRunner.builder());
+    }
+
+    @Test
+    public void testPredicatePushdownWithLambdaExpression()
+    {
+        String table = "test_predicate_pushdown_" + randomNameSuffix();
+
+        assertUpdate("""
+            CREATE TABLE %s (v, k)
+            WITH (partitioned_by = ARRAY['k'])
+            AS (VALUES ('value', 'key'))
+            """.formatted(table),
+                1);
+
+        try {
+            assertQuery("""
+                            SELECT *
+                            FROM %s
+                            WHERE k = 'key' AND regexp_replace(v, '(.*)', x -> x[1]) IS NOT NULL
+                            """.formatted(table),
+                    "VALUES ('value', 'key')");
+        }
+        finally {
+            assertUpdate("DROP TABLE " + table);
+        }
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveCreateExternalTable.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveCreateExternalTable.java
index 6ca1d28257b5..2ae6e3304a36 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveCreateExternalTable.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveCreateExternalTable.java
@@ -19,19 +19,22 @@
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tpch.TpchTable.CUSTOMER;
 import static io.trino.tpch.TpchTable.ORDERS;
 import static java.lang.String.format;
 import static java.nio.file.Files.createTempDirectory;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertEquals;
 
 public class TestHiveCreateExternalTable
         extends AbstractTestQueryFramework
@@ -51,13 +54,13 @@ public void testCreateExternalTableWithData()
             throws IOException
     {
         Path tempDir = createTempDirectory(null);
-        Path tableLocation = tempDir.resolve("data");
+        String tableLocation = tempDir.resolve("data").toUri().toString();
 
         @Language("SQL") String createTableSql = format("" +
                         "CREATE TABLE test_create_external " +
                         "WITH (external_location = '%s') AS " +
                         "SELECT * FROM tpch.tiny.nation",
-                tableLocation.toUri().toASCIIString());
+                tableLocation);
 
         assertUpdate(createTableSql, 25);
 
@@ -67,7 +70,7 @@ public void testCreateExternalTableWithData()
 
         MaterializedResult result = computeActual("SELECT DISTINCT regexp_replace(\"$path\", '/[^/]*$', '/') FROM test_create_external");
         String tablePath = (String) result.getOnlyValue();
-        assertThat(tablePath).startsWith(tableLocation.toFile().toURI().toString());
+        assertThat(tablePath).startsWith(tableLocation);
 
         assertUpdate("DROP TABLE test_create_external");
         deleteRecursively(tempDir, ALLOW_INSECURE);
@@ -87,4 +90,58 @@ public void testCreateExternalTableAsWithExistingDirectory()
 
         assertQueryFails(createTableSql, "Target directory for table '.*' already exists:.*");
     }
+
+    @Test
+    public void testCreateExternalTableOnNonExistingPath()
+            throws Exception
+    {
+        java.nio.file.Path tempDir = createTempDirectory(null);
+        // delete dir, trino should recreate it
+        deleteRecursively(tempDir, ALLOW_INSECURE);
+        String tableName = "test_create_external_non_exists_" + randomNameSuffix();
+
+        @Language("SQL") String createTableSql = format("" +
+                        "CREATE TABLE %s.%s.%s (\n" +
+                        "   col1 varchar,\n" +
+                        "   col2 varchar\n" +
+                        ")\n" +
+                        "WITH (\n" +
+                        "   external_location = '%s',\n" +
+                        "   format = 'TEXTFILE'\n" +
+                        ")",
+                getSession().getCatalog().get(),
+                getSession().getSchema().get(),
+                tableName,
+                tempDir.toUri().toASCIIString());
+
+        assertUpdate(createTableSql);
+        String actual = (String) computeScalar("SHOW CREATE TABLE " + tableName);
+        assertEquals(actual, createTableSql);
+        assertUpdate("DROP TABLE " + tableName);
+        deleteRecursively(tempDir, ALLOW_INSECURE);
+    }
+
+    @Test
+    public void testCreateExternalTableOnExistingPathToFile()
+            throws Exception
+    {
+        File tempFile = File.createTempFile("temp", ".tmp");
+        tempFile.deleteOnExit();
+        String tableName = "test_create_external_on_file_" + randomNameSuffix();
+
+        @Language("SQL") String createTableSql = format("""
+                        CREATE TABLE %s.%s.%s (
+                            col1 varchar,
+                            col2 varchar
+                        )WITH (
+                            external_location = '%s',
+                            format = 'TEXTFILE')
+                        """,
+                getSession().getCatalog().get(),
+                getSession().getSchema().get(),
+                tableName,
+                tempFile.toPath().toUri().toASCIIString());
+
+        assertQueryFails(createTableSql, ".*Destination exists and is not a directory.*");
+    }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveCreateExternalTableDisabled.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveCreateExternalTableDisabled.java
index cc4b9cab0bed..2ffd857052b9 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveCreateExternalTableDisabled.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveCreateExternalTableDisabled.java
@@ -18,7 +18,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveCreateSchemaInternalRetry.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveCreateSchemaInternalRetry.java
index 746be09823fd..876f729fe3e7 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveCreateSchemaInternalRetry.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveCreateSchemaInternalRetry.java
@@ -21,15 +21,18 @@
 import io.trino.plugin.hive.metastore.file.FileHiveMetastoreConfig;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 
 import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.testing.TestingNames.randomNameSuffix;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestHiveCreateSchemaInternalRetry
         extends AbstractTestQueryFramework
 {
@@ -52,7 +55,7 @@ private FileHiveMetastore createMetastore(String dataDirectory)
     {
         return new FileHiveMetastore(
                 new NodeVersion("testversion"),
-                HDFS_ENVIRONMENT,
+                HDFS_FILE_SYSTEM_FACTORY,
                 new HiveMetastoreConfig().isHideDeltaLakeTables(),
                 new FileHiveMetastoreConfig()
                         .setCatalogDirectory(dataDirectory)
@@ -76,7 +79,7 @@ public synchronized void createDatabase(Database database)
         };
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws IOException
     {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveDecimalParser.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveDecimalParser.java
index b46833319d80..36b2a1fb9cc8 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveDecimalParser.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveDecimalParser.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive;
 
 import io.trino.spi.type.DecimalType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveDistributedJoinQueries.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveDistributedJoinQueries.java
index 26fdf63afd6c..35a8da72e26c 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveDistributedJoinQueries.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveDistributedJoinQueries.java
@@ -15,16 +15,13 @@
 
 import io.trino.Session;
 import io.trino.execution.DynamicFilterConfig;
-import io.trino.metadata.QualifiedObjectName;
-import io.trino.operator.OperatorStats;
 import io.trino.testing.AbstractTestJoinQueries;
 import io.trino.testing.MaterializedResultWithQueryId;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.base.Verify.verify;
 import static io.trino.SystemSessionProperties.JOIN_DISTRIBUTION_TYPE;
-import static io.trino.plugin.hive.HiveQueryRunner.HIVE_CATALOG;
 import static io.trino.sql.planner.OptimizerConfig.JoinDistributionType.BROADCAST;
 import static org.testng.Assert.assertEquals;
 
@@ -64,12 +61,5 @@ public void testJoinWithEmptyBuildSide()
                 session,
                 "SELECT * FROM lineitem JOIN orders ON lineitem.orderkey = orders.orderkey AND orders.totalprice = 123.4567");
         assertEquals(result.getResult().getRowCount(), 0);
-
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(
-                result.getQueryId(),
-                new QualifiedObjectName(HIVE_CATALOG, "tpch", "lineitem"));
-        // Probe-side is not scanned at all, due to dynamic filtering:
-        assertEquals(probeStats.getInputPositions(), 0L);
-        assertEquals(probeStats.getDynamicFilterSplitsProcessed(), probeStats.getTotalDrivers());
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveDistributedJoinQueriesWithoutDynamicFiltering.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveDistributedJoinQueriesWithoutDynamicFiltering.java
index 773696f3d681..3a8aec3c7618 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveDistributedJoinQueriesWithoutDynamicFiltering.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveDistributedJoinQueriesWithoutDynamicFiltering.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestJoinQueries;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @see TestHiveDistributedJoinQueries for tests with dynamic filtering enabled
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileBasedSecurity.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileBasedSecurity.java
index f018fc2b0714..f1cd3e1cdf33 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileBasedSecurity.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileBasedSecurity.java
@@ -19,9 +19,10 @@
 import io.trino.Session;
 import io.trino.spi.security.Identity;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 
@@ -29,17 +30,20 @@
 import static io.trino.tpch.TpchTable.NATION;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestHiveFileBasedSecurity
 {
     private QueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
         String path = new File(Resources.getResource(getClass(), "security.json").toURI()).getPath();
         queryRunner = HiveQueryRunner.builder()
+                .amendSession(session -> session.setIdentity(Identity.ofUser("hive")))
                 .setHiveProperties(ImmutableMap.of(
                         "hive.security", "file",
                         "security.config-file", path))
@@ -47,7 +51,7 @@ public void setUp()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileFormats.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileFormats.java
index 5ffc0c9b0157..968e99671862 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileFormats.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileFormats.java
@@ -16,13 +16,14 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
-import io.airlift.compress.lzo.LzoCodec;
-import io.airlift.compress.lzo.LzopCodec;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.hive.formats.compression.CompressionKind;
 import io.trino.orc.OrcReaderOptions;
 import io.trino.orc.OrcWriterOptions;
+import io.trino.plugin.hive.avro.AvroFileWriterFactory;
+import io.trino.plugin.hive.avro.AvroPageSourceFactory;
 import io.trino.plugin.hive.line.CsvFileWriterFactory;
 import io.trino.plugin.hive.line.CsvPageSourceFactory;
 import io.trino.plugin.hive.line.JsonFileWriterFactory;
@@ -44,12 +45,9 @@
 import io.trino.plugin.hive.rcfile.RcFilePageSourceFactory;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.connector.RecordCursor;
-import io.trino.spi.connector.RecordPageSource;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
 import io.trino.testing.TestingConnectorSession;
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.common.type.HiveVarchar;
 import org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat;
 import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
@@ -82,7 +80,6 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.slice.Slices.utf8Slice;
-import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
 import static io.trino.plugin.hive.HivePageSourceProvider.ColumnMapping.buildColumnMappings;
 import static io.trino.plugin.hive.HiveStorageFormat.AVRO;
 import static io.trino.plugin.hive.HiveStorageFormat.CSV;
@@ -96,8 +93,8 @@
 import static io.trino.plugin.hive.HiveStorageFormat.TEXTFILE;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.plugin.hive.HiveTestUtils.SESSION;
-import static io.trino.plugin.hive.HiveTestUtils.createGenericHiveRecordCursorProvider;
 import static io.trino.plugin.hive.HiveTestUtils.getHiveSession;
 import static io.trino.plugin.hive.HiveTestUtils.getTypes;
 import static io.trino.plugin.hive.acid.AcidTransaction.NO_ACID_TRANSACTION;
@@ -117,6 +114,10 @@
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
+// Failing on multiple threads because of org.apache.hadoop.hive.ql.io.parquet.write.ParquetRecordWriterWrapper
+// uses a single record writer across all threads.
+// For example org.apache.parquet.column.values.factory.DefaultValuesWriterFactory#DEFAULT_V1_WRITER_FACTORY is shared mutable state.
+@Test(singleThreaded = true)
 public class TestHiveFileFormats
         extends AbstractTestHiveFileFormats
 {
@@ -124,7 +125,7 @@ public class TestHiveFileFormats
     private static final ConnectorSession PARQUET_SESSION = getHiveSession(createParquetHiveConfig(false));
     private static final ConnectorSession PARQUET_SESSION_USE_NAME = getHiveSession(createParquetHiveConfig(true));
 
-    private static final TrinoFileSystemFactory FILE_SYSTEM_FACTORY = new HdfsFileSystemFactory(HDFS_ENVIRONMENT);
+    private static final TrinoFileSystemFactory FILE_SYSTEM_FACTORY = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS);
     private static final HivePageSourceFactory PARQUET_PAGE_SOURCE_FACTORY = new ParquetPageSourceFactory(FILE_SYSTEM_FACTORY, STATS, new ParquetReaderConfig(), new HiveConfig());
 
     @DataProvider(name = "rowCount")
@@ -162,8 +163,7 @@ public void testTextFile(int rowCount, long fileSizePadding)
                 .withRowsCount(rowCount)
                 .withFileSizePadding(fileSizePadding)
                 .withFileWriterFactory(new SimpleTextFileWriterFactory(HDFS_FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT))
-                .isReadableByPageSource(new SimpleTextFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, STATS, new HiveConfig()));
+                .isReadableByPageSource(new SimpleTextFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "validRowAndFileSizePadding")
@@ -180,8 +180,7 @@ public void testSequenceFile(int rowCount, long fileSizePadding)
                 .withRowsCount(rowCount)
                 .withFileSizePadding(fileSizePadding)
                 .withFileWriterFactory(new SimpleSequenceFileWriterFactory(HDFS_FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER, new NodeVersion("test")))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT))
-                .isReadableByPageSource(new SimpleSequenceFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, STATS, new HiveConfig()));
+                .isReadableByPageSource(new SimpleSequenceFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "validRowAndFileSizePadding")
@@ -200,8 +199,7 @@ public void testCsvFile(int rowCount, long fileSizePadding)
                 .withRowsCount(rowCount)
                 .withFileSizePadding(fileSizePadding)
                 .withFileWriterFactory(new CsvFileWriterFactory(HDFS_FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT))
-                .isReadableByPageSource(new CsvPageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, STATS, new HiveConfig()));
+                .isReadableByPageSource(new CsvPageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test
@@ -214,8 +212,7 @@ public void testCsvFileWithNullAndValue()
                         new TestColumn("t_string", javaStringObjectInspector, "test", utf8Slice("test"))))
                 .withRowsCount(2)
                 .withFileWriterFactory(new CsvFileWriterFactory(HDFS_FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT))
-                .isReadableByPageSource(new CsvPageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, STATS, new HiveConfig()));
+                .isReadableByPageSource(new CsvPageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "validRowAndFileSizePadding")
@@ -245,8 +242,7 @@ public void testJson(int rowCount, long fileSizePadding)
                 .withRowsCount(rowCount)
                 .withFileSizePadding(fileSizePadding)
                 .withFileWriterFactory(new JsonFileWriterFactory(HDFS_FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT))
-                .isReadableByPageSource(new JsonPageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, STATS, new HiveConfig()));
+                .isReadableByPageSource(new JsonPageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "validRowAndFileSizePadding")
@@ -265,7 +261,7 @@ public void testOpenXJson(int rowCount, long fileSizePadding)
                 // openx serde is not available for testing
                 .withSkipGenericWriterTest()
                 .withFileWriterFactory(new OpenXJsonFileWriterFactory(HDFS_FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER))
-                .isReadableByPageSource(new OpenXJsonPageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, STATS, new HiveConfig()));
+                .isReadableByPageSource(new OpenXJsonPageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "validRowAndFileSizePadding")
@@ -276,7 +272,7 @@ public void testRcTextPageSource(int rowCount, long fileSizePadding)
                 .withColumns(TEST_COLUMNS)
                 .withRowsCount(rowCount)
                 .withFileSizePadding(fileSizePadding)
-                .isReadableByPageSource(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, HDFS_ENVIRONMENT, STATS, new HiveConfig()));
+                .isReadableByPageSource(new RcFilePageSourceFactory(FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "rowCount")
@@ -291,9 +287,8 @@ public void testRcTextOptimizedWriter(int rowCount)
         assertThatFileFormat(RCTEXT)
                 .withColumns(testColumns)
                 .withRowsCount(rowCount)
-                .withFileWriterFactory(new RcFileFileWriterFactory(HDFS_ENVIRONMENT, TESTING_TYPE_MANAGER, new NodeVersion("test"), HIVE_STORAGE_TIME_ZONE))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT))
-                .isReadableByPageSource(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, HDFS_ENVIRONMENT, STATS, new HiveConfig()));
+                .withFileWriterFactory(new RcFileFileWriterFactory(FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER, new NodeVersion("test"), HIVE_STORAGE_TIME_ZONE))
+                .isReadableByPageSource(new RcFilePageSourceFactory(FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "rowCount")
@@ -310,7 +305,7 @@ public void testRcBinaryPageSource(int rowCount)
         assertThatFileFormat(RCBINARY)
                 .withColumns(testColumns)
                 .withRowsCount(rowCount)
-                .isReadableByPageSource(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, HDFS_ENVIRONMENT, STATS, new HiveConfig()));
+                .isReadableByPageSource(new RcFilePageSourceFactory(FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "rowCount")
@@ -334,10 +329,9 @@ public void testRcBinaryOptimizedWriter(int rowCount)
                 .withRowsCount(rowCount)
                 // generic Hive writer corrupts timestamps
                 .withSkipGenericWriterTest()
-                .withFileWriterFactory(new RcFileFileWriterFactory(HDFS_ENVIRONMENT, TESTING_TYPE_MANAGER, new NodeVersion("test"), HIVE_STORAGE_TIME_ZONE))
-                .isReadableByPageSource(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, HDFS_ENVIRONMENT, STATS, new HiveConfig()))
-                .withColumns(testColumnsNoTimestamps)
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT));
+                .withFileWriterFactory(new RcFileFileWriterFactory(FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER, new NodeVersion("test"), HIVE_STORAGE_TIME_ZONE))
+                .isReadableByPageSource(new RcFilePageSourceFactory(FILE_SYSTEM_FACTORY, new HiveConfig()))
+                .withColumns(testColumnsNoTimestamps);
     }
 
     @Test(dataProvider = "validRowAndFileSizePadding")
@@ -357,7 +351,6 @@ public void testOrcOptimizedWriter(int rowCount, long fileSizePadding)
     {
         HiveSessionProperties hiveSessionProperties = new HiveSessionProperties(
                 new HiveConfig(),
-                new HiveFormatsConfig(),
                 new OrcReaderConfig(),
                 new OrcWriterConfig()
                         .setValidationPercentage(100.0),
@@ -378,7 +371,6 @@ public void testOrcOptimizedWriter(int rowCount, long fileSizePadding)
                 .withSession(session)
                 .withFileSizePadding(fileSizePadding)
                 .withFileWriterFactory(new OrcFileWriterFactory(TESTING_TYPE_MANAGER, new NodeVersion("test"), STATS, new OrcWriterOptions(), HDFS_FILE_SYSTEM_FACTORY))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT))
                 .isReadableByPageSource(new OrcPageSourceFactory(new OrcReaderOptions(), HDFS_FILE_SYSTEM_FACTORY, STATS, UTC));
     }
 
@@ -426,7 +418,8 @@ public void testAvro(int rowCount, long fileSizePadding)
                 .withColumns(getTestColumnsSupportedByAvro())
                 .withRowsCount(rowCount)
                 .withFileSizePadding(fileSizePadding)
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT));
+                .withFileWriterFactory(new AvroFileWriterFactory(FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER, new NodeVersion("test_version")))
+                .isReadableByPageSource(new AvroPageSourceFactory(FILE_SYSTEM_FACTORY));
     }
 
     @Test(dataProvider = "rowCount")
@@ -441,7 +434,7 @@ public void testAvroFileInSymlinkTable(int rowCount)
             Properties splitProperties = new Properties();
             splitProperties.setProperty(FILE_INPUT_FORMAT, SymlinkTextInputFormat.class.getName());
             splitProperties.setProperty(SERIALIZATION_LIB, AVRO.getSerde());
-            testCursorProvider(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT), split, splitProperties, getTestColumnsSupportedByAvro(), SESSION, file.length(), rowCount);
+            testPageSourceFactory(new AvroPageSourceFactory(FILE_SYSTEM_FACTORY), split, AVRO, getTestColumnsSupportedByAvro(), SESSION, file.length(), rowCount);
         }
         finally {
             //noinspection ResultOfMethodCallIgnored
@@ -487,15 +480,10 @@ public void testParquetPageSourceGzip(int rowCount, long fileSizePadding)
     }
 
     @Test(dataProvider = "rowCount")
-    public void testOptimizedParquetWriter(int rowCount)
+    public void testParquetWriter(int rowCount)
             throws Exception
     {
-        ConnectorSession session = getHiveSession(
-                new HiveConfig(),
-                new ParquetWriterConfig()
-                        .setParquetOptimizedWriterEnabled(true)
-                        .setValidationPercentage(100.0));
-        assertTrue(HiveSessionProperties.isParquetOptimizedWriterEnabled(session));
+        ConnectorSession session = getHiveSession(new HiveConfig(), new ParquetWriterConfig().setValidationPercentage(100));
 
         List<TestColumn> testColumns = getTestColumnsSupportedByParquet();
         assertThatFileFormat(PARQUET)
@@ -565,14 +553,12 @@ public void testTruncateVarcharColumn()
         assertThatFileFormat(RCTEXT)
                 .withWriteColumns(ImmutableList.of(writeColumn))
                 .withReadColumns(ImmutableList.of(readColumn))
-                .isReadableByPageSource(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, HDFS_ENVIRONMENT, STATS, new HiveConfig()))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT));
+                .isReadableByPageSource(new RcFilePageSourceFactory(FILE_SYSTEM_FACTORY, new HiveConfig()));
 
         assertThatFileFormat(RCBINARY)
                 .withWriteColumns(ImmutableList.of(writeColumn))
                 .withReadColumns(ImmutableList.of(readColumn))
-                .isReadableByPageSource(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, HDFS_ENVIRONMENT, STATS, new HiveConfig()))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT));
+                .isReadableByPageSource(new RcFilePageSourceFactory(FILE_SYSTEM_FACTORY, new HiveConfig()));
 
         assertThatFileFormat(ORC)
                 .withWriteColumns(ImmutableList.of(writeColumn))
@@ -588,21 +574,20 @@ public void testTruncateVarcharColumn()
         assertThatFileFormat(AVRO)
                 .withWriteColumns(ImmutableList.of(writeColumn))
                 .withReadColumns(ImmutableList.of(readColumn))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT));
+                .withFileWriterFactory(new AvroFileWriterFactory(FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER, new NodeVersion("test_version")))
+                .isReadableByPageSource(new AvroPageSourceFactory(FILE_SYSTEM_FACTORY));
 
         assertThatFileFormat(SEQUENCEFILE)
                 .withWriteColumns(ImmutableList.of(writeColumn))
                 .withReadColumns(ImmutableList.of(readColumn))
                 .withFileWriterFactory(new SimpleSequenceFileWriterFactory(HDFS_FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER, new NodeVersion("test")))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT))
-                .isReadableByPageSource(new SimpleSequenceFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, STATS, new HiveConfig()));
+                .isReadableByPageSource(new SimpleSequenceFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, new HiveConfig()));
 
         assertThatFileFormat(TEXTFILE)
                 .withWriteColumns(ImmutableList.of(writeColumn))
                 .withReadColumns(ImmutableList.of(readColumn))
                 .withFileWriterFactory(new SimpleTextFileWriterFactory(HDFS_FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT))
-                .isReadableByPageSource(new SimpleTextFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, STATS, new HiveConfig()));
+                .isReadableByPageSource(new SimpleTextFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "rowCount")
@@ -625,7 +610,8 @@ public void testAvroProjectedColumns(int rowCount)
                 .withWriteColumns(writeColumns)
                 .withReadColumns(readColumns)
                 .withRowsCount(rowCount)
-                .isReadableByRecordCursorPageSource(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT));
+                .withFileWriterFactory(new AvroFileWriterFactory(FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER, new NodeVersion("test_version")))
+                .isReadableByPageSource(new AvroPageSourceFactory(FILE_SYSTEM_FACTORY));
     }
 
     @Test(dataProvider = "rowCount")
@@ -714,8 +700,7 @@ public void testSequenceFileProjectedColumns(int rowCount)
                 .withReadColumns(readColumns)
                 .withRowsCount(rowCount)
                 .withFileWriterFactory(new SimpleSequenceFileWriterFactory(HDFS_FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER, new NodeVersion("test")))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT))
-                .isReadableByPageSource(new SimpleSequenceFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, STATS, new HiveConfig()));
+                .isReadableByPageSource(new SimpleSequenceFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "rowCount")
@@ -743,39 +728,7 @@ public void testTextFileProjectedColumns(int rowCount)
                 .withReadColumns(readColumns)
                 .withRowsCount(rowCount)
                 .withFileWriterFactory(new SimpleTextFileWriterFactory(HDFS_FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER))
-                .isReadableByRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT))
-                .isReadableByPageSource(new SimpleTextFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, STATS, new HiveConfig()));
-    }
-
-    @Test(dataProvider = "rowCount")
-    public void testRCTextProjectedColumns(int rowCount)
-            throws Exception
-    {
-        List<TestColumn> supportedColumns = TEST_COLUMNS.stream()
-                .filter(testColumn -> {
-                    // TODO: This is a bug in the RC text reader
-                    // RC file does not support complex type as key of a map
-                    return !testColumn.getName().equals("t_struct_null")
-                            && !testColumn.getName().equals("t_map_null_key_complex_key_value");
-                })
-                .collect(toImmutableList());
-
-        List<TestColumn> regularColumns = getRegularColumns(supportedColumns);
-        List<TestColumn> partitionColumns = getPartitionColumns(supportedColumns);
-
-        // Created projected columns for all regular supported columns
-        ImmutableList.Builder<TestColumn> writeColumnsBuilder = ImmutableList.builder();
-        ImmutableList.Builder<TestColumn> readeColumnsBuilder = ImmutableList.builder();
-        generateProjectedColumns(regularColumns, writeColumnsBuilder, readeColumnsBuilder);
-
-        List<TestColumn> writeColumns = writeColumnsBuilder.addAll(partitionColumns).build();
-        List<TestColumn> readColumns = readeColumnsBuilder.addAll(partitionColumns).build();
-
-        assertThatFileFormat(RCTEXT)
-                .withWriteColumns(writeColumns)
-                .withReadColumns(readColumns)
-                .withRowsCount(rowCount)
-                .isReadableByRecordCursorPageSource(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT));
+                .isReadableByPageSource(new SimpleTextFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "rowCount")
@@ -798,7 +751,7 @@ public void testRCTextProjectedColumnsPageSource(int rowCount)
                 .withWriteColumns(writeColumns)
                 .withReadColumns(readColumns)
                 .withRowsCount(rowCount)
-                .isReadableByPageSource(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, HDFS_ENVIRONMENT, STATS, new HiveConfig()));
+                .isReadableByPageSource(new RcFilePageSourceFactory(FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "rowCount")
@@ -830,8 +783,8 @@ public void testRCBinaryProjectedColumns(int rowCount)
                 .withRowsCount(rowCount)
                 // generic Hive writer corrupts timestamps
                 .withSkipGenericWriterTest()
-                .withFileWriterFactory(new RcFileFileWriterFactory(HDFS_ENVIRONMENT, TESTING_TYPE_MANAGER, new NodeVersion("test"), HIVE_STORAGE_TIME_ZONE))
-                .isReadableByPageSource(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, HDFS_ENVIRONMENT, STATS, new HiveConfig()));
+                .withFileWriterFactory(new RcFileFileWriterFactory(FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER, new NodeVersion("test"), HIVE_STORAGE_TIME_ZONE))
+                .isReadableByPageSource(new RcFilePageSourceFactory(FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test(dataProvider = "rowCount")
@@ -860,8 +813,8 @@ public void testRCBinaryProjectedColumnsPageSource(int rowCount)
                 .withRowsCount(rowCount)
                 // generic Hive writer corrupts timestamps
                 .withSkipGenericWriterTest()
-                .withFileWriterFactory(new RcFileFileWriterFactory(HDFS_ENVIRONMENT, TESTING_TYPE_MANAGER, new NodeVersion("test"), HIVE_STORAGE_TIME_ZONE))
-                .isReadableByPageSource(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, HDFS_ENVIRONMENT, STATS, new HiveConfig()));
+                .withFileWriterFactory(new RcFileFileWriterFactory(FILE_SYSTEM_FACTORY, TESTING_TYPE_MANAGER, new NodeVersion("test"), HIVE_STORAGE_TIME_ZONE))
+                .isReadableByPageSource(new RcFilePageSourceFactory(FILE_SYSTEM_FACTORY, new HiveConfig()));
     }
 
     @Test
@@ -878,13 +831,11 @@ public void testFailForLongVarcharPartitionColumn()
 
         assertThatFileFormat(RCTEXT)
                 .withColumns(columns)
-                .isFailingForPageSource(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, HDFS_ENVIRONMENT, STATS, new HiveConfig()), expectedErrorCode, expectedMessage)
-                .isFailingForRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT), expectedErrorCode, expectedMessage);
+                .isFailingForPageSource(new RcFilePageSourceFactory(FILE_SYSTEM_FACTORY, new HiveConfig()), expectedErrorCode, expectedMessage);
 
         assertThatFileFormat(RCBINARY)
                 .withColumns(columns)
-                .isFailingForPageSource(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, HDFS_ENVIRONMENT, STATS, new HiveConfig()), expectedErrorCode, expectedMessage)
-                .isFailingForRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT), expectedErrorCode, expectedMessage);
+                .isFailingForPageSource(new RcFilePageSourceFactory(FILE_SYSTEM_FACTORY, new HiveConfig()), expectedErrorCode, expectedMessage);
 
         assertThatFileFormat(ORC)
                 .withColumns(columns)
@@ -894,141 +845,6 @@ public void testFailForLongVarcharPartitionColumn()
                 .withColumns(columns)
                 .withSession(PARQUET_SESSION)
                 .isFailingForPageSource(PARQUET_PAGE_SOURCE_FACTORY, expectedErrorCode, expectedMessage);
-
-        assertThatFileFormat(SEQUENCEFILE)
-                .withColumns(columns)
-                .isFailingForRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT), expectedErrorCode, expectedMessage);
-
-        assertThatFileFormat(TEXTFILE)
-                .withColumns(columns)
-                .isFailingForRecordCursor(createGenericHiveRecordCursorProvider(HDFS_ENVIRONMENT), expectedErrorCode, expectedMessage);
-    }
-
-    private void testRecordPageSource(
-            HiveRecordCursorProvider cursorProvider,
-            FileSplit split,
-            HiveStorageFormat storageFormat,
-            List<TestColumn> testReadColumns,
-            ConnectorSession session,
-            long fileSize,
-            int rowCount)
-            throws Exception
-    {
-        Properties splitProperties = new Properties();
-        splitProperties.setProperty(FILE_INPUT_FORMAT, storageFormat.getInputFormat());
-        splitProperties.setProperty(SERIALIZATION_LIB, storageFormat.getSerde());
-        ConnectorPageSource pageSource = createPageSourceFromCursorProvider(cursorProvider, split, splitProperties, fileSize, testReadColumns, session);
-        checkPageSource(pageSource, testReadColumns, getTypes(getColumnHandles(testReadColumns)), rowCount);
-    }
-
-    private void testCursorProvider(
-            HiveRecordCursorProvider cursorProvider,
-            FileSplit split,
-            HiveStorageFormat storageFormat,
-            List<TestColumn> testReadColumns,
-            ConnectorSession session,
-            long fileSize,
-            int rowCount)
-    {
-        Properties splitProperties = new Properties();
-        splitProperties.setProperty(FILE_INPUT_FORMAT, storageFormat.getInputFormat());
-        splitProperties.setProperty(SERIALIZATION_LIB, storageFormat.getSerde());
-        testCursorProvider(cursorProvider, split, splitProperties, testReadColumns, session, fileSize, rowCount);
-    }
-
-    private void testCursorProvider(
-            HiveRecordCursorProvider cursorProvider,
-            FileSplit split,
-            Properties splitProperties,
-            List<TestColumn> testReadColumns,
-            ConnectorSession session,
-            long fileSize,
-            int rowCount)
-    {
-        ConnectorPageSource pageSource = createPageSourceFromCursorProvider(cursorProvider, split, splitProperties, fileSize, testReadColumns, session);
-        RecordCursor cursor = ((RecordPageSource) pageSource).getCursor();
-        checkCursor(cursor, testReadColumns, rowCount);
-    }
-
-    private ConnectorPageSource createPageSourceFromCursorProvider(
-            HiveRecordCursorProvider cursorProvider,
-            FileSplit split,
-            Properties splitProperties,
-            long fileSize,
-            List<TestColumn> testReadColumns,
-            ConnectorSession session)
-    {
-        // Use full columns in split properties
-        ImmutableList.Builder<String> splitPropertiesColumnNames = ImmutableList.builder();
-        ImmutableList.Builder<String> splitPropertiesColumnTypes = ImmutableList.builder();
-        Set<String> baseColumnNames = new HashSet<>();
-
-        for (TestColumn testReadColumn : testReadColumns) {
-            String name = testReadColumn.getBaseName();
-            if (!baseColumnNames.contains(name) && !testReadColumn.isPartitionKey()) {
-                baseColumnNames.add(name);
-                splitPropertiesColumnNames.add(name);
-                splitPropertiesColumnTypes.add(testReadColumn.getBaseObjectInspector().getTypeName());
-            }
-        }
-
-        splitProperties.setProperty(
-                "columns",
-                splitPropertiesColumnNames.build().stream()
-                        .collect(Collectors.joining(",")));
-
-        splitProperties.setProperty(
-                "columns.types",
-                splitPropertiesColumnTypes.build().stream()
-                        .collect(Collectors.joining(",")));
-
-        List<HivePartitionKey> partitionKeys = testReadColumns.stream()
-                .filter(TestColumn::isPartitionKey)
-                .map(input -> new HivePartitionKey(input.getName(), (String) input.getWriteValue()))
-                .collect(toList());
-
-        String partitionName = String.join("/", partitionKeys.stream()
-                .map(partitionKey -> format("%s=%s", partitionKey.getName(), partitionKey.getValue()))
-                .collect(toImmutableList()));
-
-        Configuration configuration = newEmptyConfiguration();
-        configuration.set("io.compression.codecs", LzoCodec.class.getName() + "," + LzopCodec.class.getName());
-
-        List<HiveColumnHandle> columnHandles = getColumnHandles(testReadColumns);
-        List<HivePageSourceProvider.ColumnMapping> columnMappings = buildColumnMappings(
-                partitionName,
-                partitionKeys,
-                columnHandles,
-                ImmutableList.of(),
-                TableToPartitionMapping.empty(),
-                split.getPath(),
-                OptionalInt.empty(),
-                fileSize,
-                Instant.now().toEpochMilli());
-
-        Optional<ConnectorPageSource> pageSource = HivePageSourceProvider.createHivePageSource(
-                ImmutableSet.of(),
-                ImmutableSet.of(cursorProvider),
-                configuration,
-                session,
-                split.getPath(),
-                OptionalInt.empty(),
-                split.getStart(),
-                split.getLength(),
-                fileSize,
-                splitProperties,
-                TupleDomain.all(),
-                columnHandles,
-                TESTING_TYPE_MANAGER,
-                Optional.empty(),
-                Optional.empty(),
-                false,
-                Optional.empty(),
-                false,
-                NO_ACID_TRANSACTION,
-                columnMappings);
-
-        return pageSource.get();
     }
 
     private void testPageSourceFactory(
@@ -1079,28 +895,24 @@ private void testPageSourceFactory(
                 columnHandles,
                 ImmutableList.of(),
                 TableToPartitionMapping.empty(),
-                split.getPath(),
+                split.getPath().toString(),
                 OptionalInt.empty(),
                 fileSize,
                 Instant.now().toEpochMilli());
 
         Optional<ConnectorPageSource> pageSource = HivePageSourceProvider.createHivePageSource(
                 ImmutableSet.of(sourceFactory),
-                ImmutableSet.of(),
-                newEmptyConfiguration(),
                 session,
-                split.getPath(),
+                Location.of(split.getPath().toString()),
                 OptionalInt.empty(),
                 split.getStart(),
                 split.getLength(),
                 fileSize,
                 splitProperties,
                 TupleDomain.all(),
-                columnHandles,
                 TESTING_TYPE_MANAGER,
                 Optional.empty(),
                 Optional.empty(),
-                false,
                 Optional.empty(),
                 false,
                 NO_ACID_TRANSACTION,
@@ -1295,39 +1107,18 @@ public FileFormatAssertion withFileSizePadding(long fileSizePadding)
         public FileFormatAssertion isReadableByPageSource(HivePageSourceFactory pageSourceFactory)
                 throws Exception
         {
-            assertRead(Optional.of(pageSourceFactory), Optional.empty(), false);
-            return this;
-        }
-
-        public FileFormatAssertion isReadableByRecordCursorPageSource(HiveRecordCursorProvider cursorProvider)
-                throws Exception
-        {
-            assertRead(Optional.empty(), Optional.of(cursorProvider), true);
-            return this;
-        }
-
-        public FileFormatAssertion isReadableByRecordCursor(HiveRecordCursorProvider cursorProvider)
-                throws Exception
-        {
-            assertRead(Optional.empty(), Optional.of(cursorProvider), false);
+            assertRead(Optional.of(pageSourceFactory));
             return this;
         }
 
         public FileFormatAssertion isFailingForPageSource(HivePageSourceFactory pageSourceFactory, HiveErrorCode expectedErrorCode, String expectedMessage)
                 throws Exception
         {
-            assertFailure(Optional.of(pageSourceFactory), Optional.empty(), expectedErrorCode, expectedMessage, false);
+            assertFailure(Optional.of(pageSourceFactory), expectedErrorCode, expectedMessage);
             return this;
         }
 
-        public FileFormatAssertion isFailingForRecordCursor(HiveRecordCursorProvider cursorProvider, HiveErrorCode expectedErrorCode, String expectedMessage)
-                throws Exception
-        {
-            assertFailure(Optional.empty(), Optional.of(cursorProvider), expectedErrorCode, expectedMessage, false);
-            return this;
-        }
-
-        private void assertRead(Optional<HivePageSourceFactory> pageSourceFactory, Optional<HiveRecordCursorProvider> cursorProvider, boolean withRecordPageSource)
+        private void assertRead(Optional<HivePageSourceFactory> pageSourceFactory)
                 throws Exception
         {
             assertNotNull(storageFormat, "storageFormat must be specified");
@@ -1362,14 +1153,6 @@ private void assertRead(Optional<HivePageSourceFactory> pageSourceFactory, Optio
                     if (pageSourceFactory.isPresent()) {
                         testPageSourceFactory(pageSourceFactory.get(), split, storageFormat, readColumns, session, fileSize, rowsCount);
                     }
-                    if (cursorProvider.isPresent()) {
-                        if (withRecordPageSource) {
-                            testRecordPageSource(cursorProvider.get(), split, storageFormat, readColumns, session, fileSize, rowsCount);
-                        }
-                        else {
-                            testCursorProvider(cursorProvider.get(), split, storageFormat, readColumns, session, fileSize, rowsCount);
-                        }
-                    }
                 }
                 finally {
                     //noinspection ResultOfMethodCallIgnored
@@ -1380,12 +1163,10 @@ private void assertRead(Optional<HivePageSourceFactory> pageSourceFactory, Optio
 
         private void assertFailure(
                 Optional<HivePageSourceFactory> pageSourceFactory,
-                Optional<HiveRecordCursorProvider> cursorProvider,
                 HiveErrorCode expectedErrorCode,
-                String expectedMessage,
-                boolean withRecordPageSource)
+                String expectedMessage)
         {
-            assertTrinoExceptionThrownBy(() -> assertRead(pageSourceFactory, cursorProvider, withRecordPageSource))
+            assertTrinoExceptionThrownBy(() -> assertRead(pageSourceFactory))
                     .hasErrorCode(expectedErrorCode)
                     .hasMessage(expectedMessage);
         }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileMetastore.java
index 67c763642c22..0616c5768d58 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileMetastore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileMetastore.java
@@ -16,15 +16,14 @@
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.file.FileHiveMetastore;
 import io.trino.plugin.hive.metastore.file.FileHiveMetastoreConfig;
-import org.testng.SkipException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 // staging directory is shared mutable state
-@Test(singleThreaded = true)
 public class TestHiveFileMetastore
         extends AbstractTestHiveLocal
 {
@@ -34,7 +33,7 @@ protected HiveMetastore createMetastore(File tempDir)
         File baseDir = new File(tempDir, "metastore");
         return new FileHiveMetastore(
                 new NodeVersion("test_version"),
-                HDFS_ENVIRONMENT,
+                HDFS_FILE_SYSTEM_FACTORY,
                 true,
                 new FileHiveMetastoreConfig()
                         .setCatalogDirectory(baseDir.toURI().toString())
@@ -49,37 +48,43 @@ public void forceTestNgToRespectSingleThreaded()
         // https://github.com/cbeust/testng/issues/2361#issuecomment-688393166 a workaround it to add a dummy test to the leaf test class.
     }
 
+    @Test
     @Override
     public void testMismatchSchemaTable()
     {
         // FileHiveMetastore only supports replaceTable() for views
     }
 
+    @Test
     @Override
     public void testPartitionSchemaMismatch()
     {
         // test expects an exception to be thrown
-        throw new SkipException("FileHiveMetastore only supports replaceTable() for views");
+        abort("FileHiveMetastore only supports replaceTable() for views");
     }
 
+    @Test
     @Override
     public void testBucketedTableEvolution()
     {
         // FileHiveMetastore only supports replaceTable() for views
     }
 
+    @Test
     @Override
     public void testBucketedTableEvolutionWithDifferentReadBucketCount()
     {
         // FileHiveMetastore has various incompatibilities
     }
 
+    @Test
     @Override
     public void testTransactionDeleteInsert()
     {
         // FileHiveMetastore has various incompatibilities
     }
 
+    @Test
     @Override
     public void testInsertOverwriteUnpartitioned()
     {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFormatsConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFormatsConfig.java
deleted file mode 100644
index d2ec74bdb540..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFormatsConfig.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
-
-import java.util.Map;
-
-import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
-import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
-import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
-
-public class TestHiveFormatsConfig
-{
-    @Test
-    public void testDefaults()
-    {
-        assertRecordedDefaults(recordDefaults(HiveFormatsConfig.class)
-                .setCsvNativeReaderEnabled(true)
-                .setCsvNativeWriterEnabled(true)
-                .setJsonNativeReaderEnabled(true)
-                .setJsonNativeWriterEnabled(true)
-                .setOpenXJsonNativeReaderEnabled(true)
-                .setOpenXJsonNativeWriterEnabled(true)
-                .setRegexNativeReaderEnabled(true)
-                .setTextFileNativeReaderEnabled(true)
-                .setTextFileNativeWriterEnabled(true)
-                .setSequenceFileNativeReaderEnabled(true)
-                .setSequenceFileNativeWriterEnabled(true));
-    }
-
-    @Test
-    public void testExplicitPropertyMappings()
-    {
-        Map<String, String> properties = ImmutableMap.<String, String>builder()
-                .put("csv.native-reader.enabled", "false")
-                .put("csv.native-writer.enabled", "false")
-                .put("json.native-reader.enabled", "false")
-                .put("json.native-writer.enabled", "false")
-                .put("openx-json.native-reader.enabled", "false")
-                .put("openx-json.native-writer.enabled", "false")
-                .put("regex.native-reader.enabled", "false")
-                .put("text-file.native-reader.enabled", "false")
-                .put("text-file.native-writer.enabled", "false")
-                .put("sequence-file.native-reader.enabled", "false")
-                .put("sequence-file.native-writer.enabled", "false")
-                .buildOrThrow();
-
-        HiveFormatsConfig expected = new HiveFormatsConfig()
-                .setCsvNativeReaderEnabled(false)
-                .setCsvNativeWriterEnabled(false)
-                .setJsonNativeReaderEnabled(false)
-                .setJsonNativeWriterEnabled(false)
-                .setOpenXJsonNativeReaderEnabled(false)
-                .setOpenXJsonNativeWriterEnabled(false)
-                .setRegexNativeReaderEnabled(false)
-                .setTextFileNativeReaderEnabled(false)
-                .setTextFileNativeWriterEnabled(false)
-                .setSequenceFileNativeReaderEnabled(false)
-                .setSequenceFileNativeWriterEnabled(false);
-
-        assertFullMapping(properties, expected);
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveInMemoryMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveInMemoryMetastore.java
index 44667f59d5c4..4513dd2ba7f6 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveInMemoryMetastore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveInMemoryMetastore.java
@@ -14,16 +14,20 @@
 package io.trino.plugin.hive;
 
 import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.hive.metastore.Table;
 import io.trino.plugin.hive.metastore.thrift.BridgingHiveMetastore;
 import io.trino.plugin.hive.metastore.thrift.InMemoryThriftMetastore;
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreConfig;
-import org.testng.SkipException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
+import java.net.URI;
+
+import static java.nio.file.Files.createDirectories;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 // staging directory is shared mutable state
-@Test(singleThreaded = true)
 public class TestHiveInMemoryMetastore
         extends AbstractTestHiveLocal
 {
@@ -36,6 +40,14 @@ protected HiveMetastore createMetastore(File tempDir)
         return new BridgingHiveMetastore(hiveMetastore);
     }
 
+    @Override
+    protected void createTestTable(Table table)
+            throws Exception
+    {
+        createDirectories(new File(URI.create(table.getStorage().getLocation())).toPath());
+        super.createTestTable(table);
+    }
+
     @Test
     public void forceTestNgToRespectSingleThreaded()
     {
@@ -44,27 +56,58 @@ public void forceTestNgToRespectSingleThreaded()
         // https://github.com/cbeust/testng/issues/2361#issuecomment-688393166 a workaround it to add a dummy test to the leaf test class.
     }
 
+    @Test
     @Override
     public void testMetadataDelete()
     {
         // InMemoryHiveMetastore ignores "removeData" flag in dropPartition
     }
 
+    @Test
     @Override
     public void testTransactionDeleteInsert()
     {
         // InMemoryHiveMetastore does not check whether partition exist in createPartition and dropPartition
     }
 
+    @Test
     @Override
     public void testHideDeltaLakeTables()
     {
-        throw new SkipException("not supported");
+        abort("not supported");
     }
 
+    @Test
     @Override
     public void testDisallowQueryingOfIcebergTables()
     {
-        throw new SkipException("not supported");
+        abort("not supported");
+    }
+
+    @Test
+    @Override
+    public void testDataColumnProperties()
+    {
+        // Column properties are currently not supported in ThriftHiveMetastore
+        assertThatThrownBy(super::testDataColumnProperties)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Persisting column properties is not supported: Column{name=id, type=bigint}");
+    }
+
+    @Test
+    @Override
+    public void testPartitionColumnProperties()
+    {
+        // Column properties are currently not supported in ThriftHiveMetastore
+        assertThatThrownBy(super::testPartitionColumnProperties)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Persisting column properties is not supported: Column{name=part_key, type=varchar(256)}");
+    }
+
+    @Test
+    @Override
+    public void testPartitionSchemaMismatch()
+    {
+        abort("not supported");
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveLocationService.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveLocationService.java
index 9802db9e0150..b7b16e199821 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveLocationService.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveLocationService.java
@@ -14,16 +14,16 @@
 package io.trino.plugin.hive;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.filesystem.Location;
 import io.trino.hdfs.HdfsEnvironment;
 import io.trino.plugin.hive.LocationService.WriteInfo;
 import io.trino.plugin.hive.TestBackgroundHiveSplitLoader.TestingHdfsEnvironment;
-import io.trino.spi.TrinoException;
-import org.apache.hadoop.fs.Path;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.hive.LocationHandle.WriteMode.DIRECT_TO_TARGET_EXISTING_DIRECTORY;
 import static io.trino.plugin.hive.LocationHandle.WriteMode.DIRECT_TO_TARGET_NEW_DIRECTORY;
 import static io.trino.plugin.hive.LocationHandle.WriteMode.STAGE_AND_MOVE_TO_TARGET_DIRECTORY;
+import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestHiveLocationService
@@ -32,21 +32,21 @@ public class TestHiveLocationService
     public void testGetTableWriteInfoAppend()
     {
         assertThat(locationHandle(STAGE_AND_MOVE_TO_TARGET_DIRECTORY), false)
-                .producesWriteInfo(new WriteInfo(
-                        new Path("/target"),
-                        new Path("/write"),
+                .producesWriteInfo(writeInfo(
+                        "/target",
+                        "/write",
                         STAGE_AND_MOVE_TO_TARGET_DIRECTORY));
 
         assertThat(locationHandle(DIRECT_TO_TARGET_EXISTING_DIRECTORY, "/target", "/target"), false)
-                .producesWriteInfo(new WriteInfo(
-                        new Path("/target"),
-                        new Path("/target"),
+                .producesWriteInfo(writeInfo(
+                        "/target",
+                        "/target",
                         DIRECT_TO_TARGET_EXISTING_DIRECTORY));
 
         assertThat(locationHandle(DIRECT_TO_TARGET_NEW_DIRECTORY, "/target", "/target"), false)
-                .producesWriteInfo(new WriteInfo(
-                        new Path("/target"),
-                        new Path("/target"),
+                .producesWriteInfo(writeInfo(
+                        "/target",
+                        "/target",
                         DIRECT_TO_TARGET_NEW_DIRECTORY));
     }
 
@@ -54,22 +54,21 @@ public void testGetTableWriteInfoAppend()
     public void testGetTableWriteInfoOverwriteSuccess()
     {
         assertThat(locationHandle(STAGE_AND_MOVE_TO_TARGET_DIRECTORY), true)
-                .producesWriteInfo(new WriteInfo(
-                        new Path("/target"),
-                        new Path("/write"),
-                        STAGE_AND_MOVE_TO_TARGET_DIRECTORY));
+                .producesWriteInfo(writeInfo("/target", "/write", STAGE_AND_MOVE_TO_TARGET_DIRECTORY));
     }
 
-    @Test(expectedExceptions = TrinoException.class, expectedExceptionsMessageRegExp = "Overwriting unpartitioned table not supported when writing directly to target directory")
+    @Test
     public void testGetTableWriteInfoOverwriteFailDirectNew()
     {
-        assertThat(locationHandle(DIRECT_TO_TARGET_NEW_DIRECTORY, "/target", "/target"), true);
+        assertTrinoExceptionThrownBy(() -> assertThat(locationHandle(DIRECT_TO_TARGET_NEW_DIRECTORY, "/target", "/target"), true))
+                .hasMessage("Overwriting unpartitioned table not supported when writing directly to target directory");
     }
 
-    @Test(expectedExceptions = TrinoException.class, expectedExceptionsMessageRegExp = "Overwriting unpartitioned table not supported when writing directly to target directory")
+    @Test
     public void testGetTableWriteInfoOverwriteFailDirectExisting()
     {
-        assertThat(locationHandle(DIRECT_TO_TARGET_EXISTING_DIRECTORY, "/target", "/target"), true);
+        assertTrinoExceptionThrownBy(() -> assertThat(locationHandle(DIRECT_TO_TARGET_EXISTING_DIRECTORY, "/target", "/target"), true))
+                .hasMessage("Overwriting unpartitioned table not supported when writing directly to target directory");
     }
 
     private static Assertion assertThat(LocationHandle locationHandle, boolean overwrite)
@@ -84,15 +83,15 @@ public static class Assertion
         public Assertion(LocationHandle locationHandle, boolean overwrite)
         {
             HdfsEnvironment hdfsEnvironment = new TestingHdfsEnvironment(ImmutableList.of());
-            LocationService service = new HiveLocationService(hdfsEnvironment);
+            LocationService service = new HiveLocationService(hdfsEnvironment, new HiveConfig());
             this.actual = service.getTableWriteInfo(locationHandle, overwrite);
         }
 
         public void producesWriteInfo(WriteInfo expected)
         {
-            assertEquals(actual.getWritePath(), expected.getWritePath());
-            assertEquals(actual.getTargetPath(), expected.getTargetPath());
-            assertEquals(actual.getWriteMode(), expected.getWriteMode());
+            assertEquals(actual.writePath(), expected.writePath());
+            assertEquals(actual.targetPath(), expected.targetPath());
+            assertEquals(actual.writeMode(), expected.writeMode());
         }
     }
 
@@ -103,6 +102,11 @@ private static LocationHandle locationHandle(LocationHandle.WriteMode writeMode)
 
     private static LocationHandle locationHandle(LocationHandle.WriteMode writeMode, String targetPath, String writePath)
     {
-        return new LocationHandle(new Path(targetPath), new Path(writePath), writeMode);
+        return new LocationHandle(Location.of(targetPath), Location.of(writePath), writeMode);
+    }
+
+    private static WriteInfo writeInfo(String targetPath, String writePath, LocationHandle.WriteMode writeMode)
+    {
+        return new WriteInfo(Location.of(targetPath), Location.of(writePath), writeMode);
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveMetadata.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveMetadata.java
index e298fcddbdda..5fa38f5d0bef 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveMetadata.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveMetadata.java
@@ -19,7 +19,8 @@
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.ValueSet;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.Optional;
 import java.util.stream.IntStream;
@@ -51,7 +52,8 @@ public class TestHiveMetadata
             HiveColumnHandle.ColumnType.PARTITION_KEY,
             Optional.empty());
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testCreatePredicate()
     {
         ImmutableList.Builder<HivePartition> partitions = ImmutableList.builder();
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHivePageSink.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHivePageSink.java
index b548670a7901..7374d7a93439 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHivePageSink.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHivePageSink.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.json.JsonCodec;
 import io.airlift.slice.Slices;
+import io.trino.filesystem.Location;
 import io.trino.operator.GroupByHashPageIndexerFactory;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
@@ -42,9 +43,7 @@
 import io.trino.tpch.LineItemGenerator;
 import io.trino.tpch.TpchColumnType;
 import io.trino.tpch.TpchColumnTypes;
-import io.trino.type.BlockTypeOperators;
-import org.apache.hadoop.fs.Path;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -70,7 +69,6 @@
 import static io.trino.plugin.hive.HiveTestUtils.PAGE_SORTER;
 import static io.trino.plugin.hive.HiveTestUtils.getDefaultHiveFileWriterFactories;
 import static io.trino.plugin.hive.HiveTestUtils.getDefaultHivePageSourceFactories;
-import static io.trino.plugin.hive.HiveTestUtils.getDefaultHiveRecordCursorProviders;
 import static io.trino.plugin.hive.HiveTestUtils.getHiveSession;
 import static io.trino.plugin.hive.HiveTestUtils.getHiveSessionProperties;
 import static io.trino.plugin.hive.HiveType.HIVE_DATE;
@@ -80,7 +78,7 @@
 import static io.trino.plugin.hive.HiveType.HIVE_STRING;
 import static io.trino.plugin.hive.LocationHandle.WriteMode.DIRECT_TO_TARGET_NEW_DIRECTORY;
 import static io.trino.plugin.hive.acid.AcidTransaction.NO_ACID_TRANSACTION;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DateType.DATE;
 import static io.trino.spi.type.DoubleType.DOUBLE;
@@ -131,6 +129,10 @@ public void testAllFormats()
                     if (codec == NONE) {
                         continue;
                     }
+                    if ((format == HiveStorageFormat.PARQUET) && (codec == LZ4)) {
+                        // TODO (https://github.com/trinodb/trino/issues/9142) LZ4 is not supported with native Parquet writer
+                        continue;
+                    }
                     config.setHiveCompressionCodec(codec);
 
                     if (!isSupportedCodec(format, codec)) {
@@ -166,7 +168,7 @@ private static long writeTestFile(HiveConfig config, SortingFileWriterConfig sor
     {
         HiveTransactionHandle transaction = new HiveTransactionHandle(false);
         HiveWriterStats stats = new HiveWriterStats();
-        ConnectorPageSink pageSink = createPageSink(transaction, config, sortingFileWriterConfig, metastore, new Path("file:///" + outputPath), stats);
+        ConnectorPageSink pageSink = createPageSink(transaction, config, sortingFileWriterConfig, metastore, Location.of("file:///" + outputPath), stats);
         List<LineItemColumn> columns = getTestColumns();
         List<Type> columnTypes = columns.stream()
                 .map(LineItemColumn::getType)
@@ -249,8 +251,6 @@ private static ConnectorPageSource createPageSource(HiveTransactionHandle transa
         splitProperties.setProperty("columns", Joiner.on(',').join(getColumnHandles().stream().map(HiveColumnHandle::getName).collect(toImmutableList())));
         splitProperties.setProperty("columns.types", Joiner.on(',').join(getColumnHandles().stream().map(HiveColumnHandle::getHiveType).map(hiveType -> hiveType.getHiveTypeName().toString()).collect(toImmutableList())));
         HiveSplit split = new HiveSplit(
-                SCHEMA_NAME,
-                TABLE_NAME,
                 "",
                 "file:///" + outputFile.getAbsolutePath(),
                 0,
@@ -262,27 +262,21 @@ private static ConnectorPageSource createPageSource(HiveTransactionHandle transa
                 ImmutableList.of(),
                 OptionalInt.empty(),
                 OptionalInt.empty(),
-                0,
                 false,
                 TableToPartitionMapping.empty(),
                 Optional.empty(),
                 Optional.empty(),
-                false,
                 Optional.empty(),
-                0,
                 SplitWeight.standard());
         ConnectorTableHandle table = new HiveTableHandle(SCHEMA_NAME, TABLE_NAME, ImmutableMap.of(), ImmutableList.of(), ImmutableList.of(), Optional.empty());
         HivePageSourceProvider provider = new HivePageSourceProvider(
                 TESTING_TYPE_MANAGER,
-                HDFS_ENVIRONMENT,
                 config,
-                getDefaultHivePageSourceFactories(HDFS_ENVIRONMENT, config),
-                getDefaultHiveRecordCursorProviders(config, HDFS_ENVIRONMENT),
-                new GenericHiveRecordCursorProvider(HDFS_ENVIRONMENT, config));
+                getDefaultHivePageSourceFactories(HDFS_ENVIRONMENT, config));
         return provider.createPageSource(transaction, getHiveSession(config), split, table, ImmutableList.copyOf(getColumnHandles()), DynamicFilter.EMPTY);
     }
 
-    private static ConnectorPageSink createPageSink(HiveTransactionHandle transaction, HiveConfig config, SortingFileWriterConfig sortingFileWriterConfig, HiveMetastore metastore, Path outputPath, HiveWriterStats stats)
+    private static ConnectorPageSink createPageSink(HiveTransactionHandle transaction, HiveConfig config, SortingFileWriterConfig sortingFileWriterConfig, HiveMetastore metastore, Location outputPath, HiveWriterStats stats)
     {
         LocationHandle locationHandle = new LocationHandle(outputPath, outputPath, DIRECT_TO_TARGET_NEW_DIRECTORY);
         HiveOutputTableHandle handle = new HiveOutputTableHandle(
@@ -301,19 +295,16 @@ private static ConnectorPageSink createPageSink(HiveTransactionHandle transactio
                 false,
                 false);
         JsonCodec<PartitionUpdate> partitionUpdateCodec = JsonCodec.jsonCodec(PartitionUpdate.class);
-        TypeOperators typeOperators = new TypeOperators();
-        BlockTypeOperators blockTypeOperators = new BlockTypeOperators(typeOperators);
         HivePageSinkProvider provider = new HivePageSinkProvider(
                 getDefaultHiveFileWriterFactories(config, HDFS_ENVIRONMENT),
                 HDFS_FILE_SYSTEM_FACTORY,
-                HDFS_ENVIRONMENT,
                 PAGE_SORTER,
                 HiveMetastoreFactory.ofInstance(metastore),
-                new GroupByHashPageIndexerFactory(new JoinCompiler(typeOperators), blockTypeOperators),
+                new GroupByHashPageIndexerFactory(new JoinCompiler(new TypeOperators())),
                 TESTING_TYPE_MANAGER,
                 config,
                 sortingFileWriterConfig,
-                new HiveLocationService(HDFS_ENVIRONMENT),
+                new HiveLocationService(HDFS_ENVIRONMENT, config),
                 partitionUpdateCodec,
                 new TestingNodeManager("fake-environment"),
                 new HiveEventClient(),
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHivePartitionedBucketFunction.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHivePartitionedBucketFunction.java
index 425021644b53..1b904d69de25 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHivePartitionedBucketFunction.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHivePartitionedBucketFunction.java
@@ -138,10 +138,10 @@ public void testConsecutiveBucketsWithinPartition(BucketingVersion hiveBucketing
         BlockBuilder bucketColumn = BIGINT.createFixedSizeBlockBuilder(10);
         BlockBuilder partitionColumn = BIGINT.createFixedSizeBlockBuilder(10);
         for (int i = 0; i < 100; ++i) {
-            bucketColumn.writeLong(i);
-            partitionColumn.writeLong(42);
+            BIGINT.writeLong(bucketColumn, i);
+            BIGINT.writeLong(partitionColumn, 42);
         }
-        Page page = new Page(bucketColumn, partitionColumn);
+        Page page = new Page(bucketColumn.build(), partitionColumn.build());
 
         BucketFunction hivePartitionedBucketFunction = partitionedBucketFunction(hiveBucketingVersion, 10, ImmutableList.of(HIVE_LONG), ImmutableList.of(BIGINT), 4000);
         List<Integer> positions = new ArrayList<>();
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveQlTranslation.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveQlTranslation.java
index 59ad2dc05ee0..63d126a4f417 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveQlTranslation.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveQlTranslation.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Streams;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -264,7 +263,7 @@ private void assertTranslation(String hiveSql, String expectedTrinoSql)
 
     private void assertTrinoSqlIsParsable(String actualTrinoSql)
     {
-        parser.createStatement(actualTrinoSql, new ParsingOptions());
+        parser.createStatement(actualTrinoSql);
     }
 
     private void assertViewTranslationError(String badHiveQl, String expectMessage)
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveRoles.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveRoles.java
index cedbdccdec17..c24d3425b969 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveRoles.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveRoles.java
@@ -13,9 +13,6 @@
  */
 package io.trino.plugin.hive;
 
-import org.testng.annotations.Test;
-
-@Test(singleThreaded = true)
 public class TestHiveRoles
         extends AbstractTestHiveRoles
 {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveS3AndGlueMetastoreTest.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveS3AndGlueMetastoreTest.java
new file mode 100644
index 000000000000..9180b709ecaf
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveS3AndGlueMetastoreTest.java
@@ -0,0 +1,354 @@
+/*
+ * Licensed 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 io.trino.plugin.hive;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.Session;
+import io.trino.spi.security.Identity;
+import io.trino.spi.security.SelectedRole;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+import org.testng.annotations.Test;
+
+import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import static io.trino.plugin.hive.BaseS3AndGlueMetastoreTest.LocationPattern.DOUBLE_SLASH;
+import static io.trino.plugin.hive.BaseS3AndGlueMetastoreTest.LocationPattern.TRIPLE_SLASH;
+import static io.trino.plugin.hive.BaseS3AndGlueMetastoreTest.LocationPattern.TWO_TRAILING_SLASHES;
+import static io.trino.plugin.hive.metastore.glue.GlueHiveMetastore.createTestingGlueHiveMetastore;
+import static io.trino.spi.security.SelectedRole.Type.ROLE;
+import static io.trino.testing.MaterializedResult.resultBuilder;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestHiveS3AndGlueMetastoreTest
+        extends BaseS3AndGlueMetastoreTest
+{
+    public TestHiveS3AndGlueMetastoreTest()
+    {
+        super("partitioned_by", "external_location", requireNonNull(System.getenv("S3_BUCKET"), "Environment S3_BUCKET was not set"));
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        metastore = createTestingGlueHiveMetastore(Path.of(schemaPath()));
+
+        Session session = createSession(Optional.of(new SelectedRole(ROLE, Optional.of("admin"))));
+        DistributedQueryRunner queryRunner = HiveQueryRunner.builder(session)
+                .addExtraProperty("sql.path", "hive.functions")
+                .addExtraProperty("sql.default-function-catalog", "hive")
+                .addExtraProperty("sql.default-function-schema", "functions")
+                .setCreateTpchSchemas(false)
+                .addHiveProperty("hive.security", "allow-all")
+                .addHiveProperty("hive.non-managed-table-writes-enabled", "true")
+                .setMetastore(runner -> metastore)
+                .build();
+        queryRunner.execute("CREATE SCHEMA " + schemaName + " WITH (location = '" + schemaPath() + "')");
+        queryRunner.execute("CREATE SCHEMA IF NOT EXISTS functions");
+        return queryRunner;
+    }
+
+    private Session createSession(Optional<SelectedRole> role)
+    {
+        return testSessionBuilder()
+                .setIdentity(Identity.forUser("hive")
+                        .withConnectorRoles(role.map(selectedRole -> ImmutableMap.of("hive", selectedRole))
+                                .orElse(ImmutableMap.of()))
+                        .build())
+                .setCatalog("hive")
+                .setSchema(schemaName)
+                .build();
+    }
+
+    @Override
+    protected Session sessionForOptimize()
+    {
+        return Session.builder(getSession())
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "non_transactional_optimize_enabled", "true")
+                .build();
+    }
+
+    @Override
+    protected void validateDataFiles(String partitionColumn, String tableName, String location)
+    {
+        getActiveFiles(tableName).forEach(dataFile ->
+        {
+            String locationDirectory = location.endsWith("/") ? location : location + "/";
+            String partitionPart = partitionColumn.isEmpty() ? "" : partitionColumn + "=[a-z0-9]+/";
+            assertThat(dataFile).matches("^" + Pattern.quote(locationDirectory) + partitionPart + "[a-zA-Z0-9_-]+$");
+            verifyPathExist(dataFile);
+        });
+    }
+
+    @Override
+    protected void validateMetadataFiles(String location)
+    {
+        // No metadata files for Hive
+    }
+
+    @Override
+    protected Set<String> getAllDataFilesFromTableDirectory(String tableLocation)
+    {
+        return new HashSet<>(getTableFiles(tableLocation));
+    }
+
+    @Override
+    protected void validateFilesAfterOptimize(String location, Set<String> initialFiles, Set<String> updatedFiles)
+    {
+        assertThat(updatedFiles).hasSizeLessThan(initialFiles.size());
+        assertThat(getAllDataFilesFromTableDirectory(location)).isEqualTo(updatedFiles);
+    }
+
+    @Override // Row-level modifications are not supported for Hive tables
+    @Test(dataProvider = "locationPatternsDataProvider")
+    public void testBasicOperationsWithProvidedTableLocation(boolean partitioned, LocationPattern locationPattern)
+    {
+        String tableName = "test_basic_operations_" + randomNameSuffix();
+        String location = locationPattern.locationForTable(bucketName, schemaName, tableName);
+        String partitionQueryPart = (partitioned ? ",partitioned_by = ARRAY['col_int']" : "");
+
+        String create = "CREATE TABLE " + tableName + "(col_str, col_int)" +
+                "WITH (external_location = '" + location + "'" + partitionQueryPart + ") " +
+                "AS VALUES ('str1', 1), ('str2', 2), ('str3', 3)";
+        if (locationPattern == DOUBLE_SLASH || locationPattern == TRIPLE_SLASH || locationPattern == TWO_TRAILING_SLASHES) {
+            assertQueryFails(create, "\\QUnsupported location that cannot be internally represented: " + location);
+            return;
+        }
+        assertUpdate(create, 3);
+        try (UncheckedCloseable ignored = onClose("DROP TABLE " + tableName)) {
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('str2', 2), ('str3', 3)");
+
+            String actualTableLocation = getTableLocation(tableName);
+            assertThat(actualTableLocation).isEqualTo(location);
+
+            assertUpdate("INSERT INTO " + tableName + " VALUES ('str4', 4)", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('str2', 2), ('str3', 3), ('str4', 4)");
+
+            assertThat(getTableFiles(actualTableLocation)).isNotEmpty();
+            validateDataFiles(partitioned ? "col_int" : "", tableName, actualTableLocation);
+        }
+    }
+
+    @Test(dataProvider = "locationPatternsDataProvider")
+    public void testBasicOperationsWithProvidedTableLocationNonCTAS(boolean partitioned, LocationPattern locationPattern)
+    {
+        // this test needed, because execution path for CTAS and simple create is different
+        String tableName = "test_basic_operations_" + randomNameSuffix();
+        String location = locationPattern.locationForTable(bucketName, schemaName, tableName);
+        String partitionQueryPart = (partitioned ? ",partitioned_by = ARRAY['col_int']" : "");
+
+        String create = "CREATE TABLE " + tableName + "(col_str varchar, col_int integer) WITH (external_location = '" + location + "' " + partitionQueryPart + ")";
+        if (locationPattern == DOUBLE_SLASH || locationPattern == TRIPLE_SLASH || locationPattern == TWO_TRAILING_SLASHES) {
+            assertQueryFails(create, "\\QUnsupported location that cannot be internally represented: " + location);
+            return;
+        }
+        assertUpdate(create);
+        try (UncheckedCloseable ignored = onClose("DROP TABLE " + tableName)) {
+            String actualTableLocation = getTableLocation(tableName);
+            assertThat(actualTableLocation).isEqualTo(location);
+
+            assertUpdate("INSERT INTO " + tableName + " VALUES ('str1', 1), ('str2', 2), ('str3', 3), ('str4', 4)", 4);
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('str2', 2), ('str3', 3), ('str4', 4)");
+
+            assertThat(getTableFiles(actualTableLocation)).isNotEmpty();
+            validateDataFiles(partitioned ? "col_int" : "", tableName, actualTableLocation);
+        }
+    }
+
+    @Override // Row-level modifications are not supported for Hive tables
+    @Test(dataProvider = "locationPatternsDataProvider")
+    public void testBasicOperationsWithProvidedSchemaLocation(boolean partitioned, LocationPattern locationPattern)
+    {
+        String schemaName = "test_basic_operations_schema_" + randomNameSuffix();
+        String schemaLocation = locationPattern.locationForSchema(bucketName, schemaName);
+        String tableName = "test_basic_operations_table_" + randomNameSuffix();
+        String qualifiedTableName = schemaName + "." + tableName;
+        String partitionQueryPart = (partitioned ? " WITH (partitioned_by = ARRAY['col_int'])" : "");
+
+        String actualTableLocation;
+        assertUpdate("CREATE SCHEMA " + schemaName + " WITH (location = '" + schemaLocation + "')");
+        try (UncheckedCloseable ignoredDropSchema = onClose("DROP SCHEMA " + schemaName)) {
+            assertThat(getSchemaLocation(schemaName)).isEqualTo(schemaLocation);
+
+            assertUpdate("CREATE TABLE " + qualifiedTableName + "(col_str varchar, col_int int)" + partitionQueryPart);
+            try (UncheckedCloseable ignoredDropTable = onClose("DROP TABLE " + qualifiedTableName)) {
+                String expectedTableLocation = Pattern.quote((schemaLocation.endsWith("/") ? schemaLocation : schemaLocation + "/") + tableName)
+                        // Hive normalizes repeated slashes
+                        .replaceAll("(?<!(s3:))/+", "/");
+
+                actualTableLocation = metastore.getTable(schemaName, tableName).orElseThrow().getStorage().getLocation();
+                assertThat(actualTableLocation).matches(expectedTableLocation);
+
+                assertUpdate("INSERT INTO " + qualifiedTableName + "  VALUES ('str1', 1), ('str2', 2), ('str3', 3)", 3);
+                assertQuery("SELECT * FROM " + qualifiedTableName, "VALUES ('str1', 1), ('str2', 2), ('str3', 3)");
+
+                assertThat(getTableFiles(actualTableLocation)).isNotEmpty();
+                validateDataFiles(partitioned ? "col_int" : "", qualifiedTableName, actualTableLocation);
+            }
+            assertThat(getTableFiles(actualTableLocation)).isEmpty();
+        }
+        validateFilesAfterDrop(actualTableLocation);
+    }
+
+    @Override
+    @Test(dataProvider = "locationPatternsDataProvider")
+    public void testMergeWithProvidedTableLocation(boolean partitioned, LocationPattern locationPattern)
+    {
+        // Row-level modifications are not supported for Hive tables
+    }
+
+    @Override
+    public void testOptimizeWithProvidedTableLocation(boolean partitioned, LocationPattern locationPattern)
+    {
+        if (locationPattern == DOUBLE_SLASH || locationPattern == TRIPLE_SLASH || locationPattern == TWO_TRAILING_SLASHES) {
+            assertThatThrownBy(() -> super.testOptimizeWithProvidedTableLocation(partitioned, locationPattern))
+                    .hasMessageStartingWith("Unsupported location that cannot be internally represented: ")
+                    .hasStackTraceContaining("SQL: CREATE TABLE test_optimize_");
+            return;
+        }
+        super.testOptimizeWithProvidedTableLocation(partitioned, locationPattern);
+    }
+
+    @Test(dataProvider = "locationPatternsDataProvider")
+    public void testAnalyzeWithProvidedTableLocation(boolean partitioned, LocationPattern locationPattern)
+    {
+        String tableName = "test_analyze_" + randomNameSuffix();
+        String location = locationPattern.locationForTable(bucketName, schemaName, tableName);
+        String partitionQueryPart = (partitioned ? ",partitioned_by = ARRAY['col_int']" : "");
+
+        String create = "CREATE TABLE " + tableName + "(col_str, col_int)" +
+                "WITH (external_location = '" + location + "'" + partitionQueryPart + ") " +
+                "AS VALUES ('str1', 1), ('str2', 2), ('str3', 3)";
+        if (locationPattern == DOUBLE_SLASH || locationPattern == TRIPLE_SLASH || locationPattern == TWO_TRAILING_SLASHES) {
+            assertQueryFails(create, "\\QUnsupported location that cannot be internally represented: " + location);
+            return;
+        }
+        assertUpdate(create, 3);
+        try (UncheckedCloseable ignored = onClose("DROP TABLE " + tableName)) {
+            assertUpdate("INSERT INTO " + tableName + " VALUES ('str4', 4)", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('str2', 2), ('str3', 3), ('str4', 4)");
+
+            // Check statistics collection on write
+            if (partitioned) {
+                assertQuery("SHOW STATS FOR " + tableName, """
+                        VALUES
+                        ('col_str', 0.0, 1.0, 0.0, null, null, null),
+                        ('col_int', null, 4.0, 0.0, null, 1, 4),
+                        (null, null, null, null, 4.0, null, null)""");
+            }
+            else {
+                assertQuery("SHOW STATS FOR " + tableName, """
+                        VALUES
+                        ('col_str', 16.0, 3.0, 0.0, null, null, null),
+                        ('col_int', null, 3.0, 0.0, null, 1, 4),
+                        (null, null, null, null, 4.0, null, null)""");
+            }
+
+            // Check statistics collection explicitly
+            assertUpdate("ANALYZE " + tableName, 4);
+
+            if (partitioned) {
+                assertQuery("SHOW STATS FOR " + tableName, """
+                        VALUES
+                        ('col_str', 16.0, 1.0, 0.0, null, null, null),
+                        ('col_int', null, 4.0, 0.0, null, 1, 4),
+                        (null, null, null, null, 4.0, null, null)""");
+            }
+            else {
+                assertQuery("SHOW STATS FOR " + tableName, """
+                        VALUES
+                        ('col_str', 16.0, 4.0, 0.0, null, null, null),
+                        ('col_int', null, 4.0, 0.0, null, 1, 4),
+                        (null, null, null, null, 4.0, null, null)""");
+            }
+        }
+    }
+
+    @Test
+    public void testSchemaNameEscape()
+    {
+        String schemaNameSuffix = randomNameSuffix();
+        String schemaName = "../test_create_schema_escaped_" + schemaNameSuffix;
+        String tableName = "test_table_schema_escaped_" + randomNameSuffix();
+
+        assertUpdate("CREATE SCHEMA \"%2$s\" WITH (location = 's3://%1$s/%2$s')".formatted(bucketName, schemaName));
+        try (UncheckedCloseable ignored = onClose("DROP SCHEMA \"" + schemaName + "\"")) {
+            assertQueryFails("CREATE TABLE \"" + schemaName + "\"." + tableName + " (col) AS VALUES 1", "Failed checking path: .*");
+        }
+    }
+
+    @Test
+    public void testCreateFunction()
+    {
+        String name = "test_" + randomNameSuffix();
+        String name2 = "test_" + randomNameSuffix();
+
+        assertUpdate("CREATE FUNCTION " + name + "(x integer) RETURNS bigint COMMENT 't42' RETURN x * 42");
+
+        assertQuery("SELECT " + name + "(99)", "SELECT 4158");
+        assertQueryFails("SELECT " + name + "(2.9)", ".*Unexpected parameters.*");
+
+        assertUpdate("CREATE FUNCTION " + name + "(x double) RETURNS double COMMENT 't88' RETURN x * 8.8");
+
+        assertThat(query("SHOW FUNCTIONS"))
+                .skippingTypesCheck()
+                .containsAll(resultBuilder(getSession())
+                        .row(name, "bigint", "integer", "scalar", true, "t42")
+                        .row(name, "double", "double", "scalar", true, "t88")
+                        .build());
+
+        assertQuery("SELECT " + name + "(99)", "SELECT 4158");
+        assertQuery("SELECT " + name + "(2.9)", "SELECT 25.52");
+
+        assertQueryFails("CREATE FUNCTION " + name + "(x int) RETURNS bigint RETURN x", "line 1:1: Function already exists");
+
+        assertQuery("SELECT " + name + "(99)", "SELECT 4158");
+        assertQuery("SELECT " + name + "(2.9)", "SELECT 25.52");
+
+        assertUpdate("CREATE OR REPLACE FUNCTION " + name + "(x bigint) RETURNS bigint RETURN x * 23");
+        assertUpdate("CREATE FUNCTION " + name2 + "(s varchar) RETURNS varchar RETURN 'Hello ' || s");
+
+        assertThat(query("SHOW FUNCTIONS"))
+                .skippingTypesCheck()
+                .containsAll(resultBuilder(getSession())
+                        .row(name, "bigint", "integer", "scalar", true, "t42")
+                        .row(name, "bigint", "bigint", "scalar", true, "")
+                        .row(name, "double", "double", "scalar", true, "t88")
+                        .row(name2, "varchar", "varchar", "scalar", true, "")
+                        .build());
+
+        assertQuery("SELECT " + name + "(99)", "SELECT 4158");
+        assertQuery("SELECT " + name + "(cast(99 as bigint))", "SELECT 2277");
+        assertQuery("SELECT " + name + "(2.9)", "SELECT 25.52");
+        assertQuery("SELECT " + name2 + "('world')", "SELECT 'Hello world'");
+
+        assertQueryFails("DROP FUNCTION " + name + "(varchar)", "line 1:1: Function not found");
+        assertUpdate("DROP FUNCTION " + name + "(z bigint)");
+        assertUpdate("DROP FUNCTION " + name + "(double)");
+        assertUpdate("DROP FUNCTION " + name + "(int)");
+        assertQueryFails("DROP FUNCTION " + name + "(bigint)", "line 1:1: Function not found");
+        assertUpdate("DROP FUNCTION IF EXISTS " + name + "(bigint)");
+        assertUpdate("DROP FUNCTION " + name2 + "(varchar)");
+        assertQueryFails("DROP FUNCTION " + name2 + "(varchar)", "line 1:1: Function not found");
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveSplit.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveSplit.java
index 161e4874383a..b8a264a76a38 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveSplit.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveSplit.java
@@ -18,14 +18,14 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
 import io.airlift.json.ObjectMapperProvider;
+import io.trino.filesystem.Location;
 import io.trino.plugin.base.TypeDeserializer;
 import io.trino.plugin.hive.HiveColumnHandle.ColumnType;
 import io.trino.spi.HostAddress;
 import io.trino.spi.SplitWeight;
 import io.trino.spi.type.TestingTypeManager;
 import io.trino.spi.type.Type;
-import org.apache.hadoop.fs.Path;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.util.Optional;
@@ -54,14 +54,12 @@ public void testJsonRoundTrip()
         ImmutableList<HivePartitionKey> partitionKeys = ImmutableList.of(new HivePartitionKey("a", "apple"), new HivePartitionKey("b", "42"));
         ImmutableList<HostAddress> addresses = ImmutableList.of(HostAddress.fromParts("127.0.0.1", 44), HostAddress.fromParts("127.0.0.1", 45));
 
-        AcidInfo.Builder acidInfoBuilder = AcidInfo.builder(new Path("file:///data/fullacid"));
-        acidInfoBuilder.addDeleteDelta(new Path("file:///data/fullacid/delete_delta_0000004_0000004_0000"));
-        acidInfoBuilder.addDeleteDelta(new Path("file:///data/fullacid/delete_delta_0000007_0000007_0000"));
+        AcidInfo.Builder acidInfoBuilder = AcidInfo.builder(Location.of("file:///data/fullacid"));
+        acidInfoBuilder.addDeleteDelta(Location.of("file:///data/fullacid/delete_delta_0000004_0000004_0000"));
+        acidInfoBuilder.addDeleteDelta(Location.of("file:///data/fullacid/delete_delta_0000007_0000007_0000"));
         AcidInfo acidInfo = acidInfoBuilder.build().get();
 
         HiveSplit expected = new HiveSplit(
-                "db",
-                "table",
                 "partitionId",
                 "path",
                 42,
@@ -73,7 +71,6 @@ public void testJsonRoundTrip()
                 addresses,
                 OptionalInt.empty(),
                 OptionalInt.empty(),
-                0,
                 true,
                 TableToPartitionMapping.mapColumnsByIndex(ImmutableMap.of(1, new HiveTypeName("string"))),
                 Optional.of(new HiveSplit.BucketConversion(
@@ -82,16 +79,12 @@ public void testJsonRoundTrip()
                         16,
                         ImmutableList.of(createBaseColumn("col", 5, HIVE_LONG, BIGINT, ColumnType.REGULAR, Optional.of("comment"))))),
                 Optional.empty(),
-                false,
                 Optional.of(acidInfo),
-                555534,
                 SplitWeight.fromProportion(2.0)); // some non-standard value
 
         String json = codec.toJson(expected);
         HiveSplit actual = codec.fromJson(json);
 
-        assertEquals(actual.getDatabase(), expected.getDatabase());
-        assertEquals(actual.getTable(), expected.getTable());
         assertEquals(actual.getPartitionName(), expected.getPartitionName());
         assertEquals(actual.getPath(), expected.getPath());
         assertEquals(actual.getStart(), expected.getStart());
@@ -99,14 +92,11 @@ public void testJsonRoundTrip()
         assertEquals(actual.getEstimatedFileSize(), expected.getEstimatedFileSize());
         assertEquals(actual.getSchema(), expected.getSchema());
         assertEquals(actual.getPartitionKeys(), expected.getPartitionKeys());
-        assertEquals(actual.getAddresses(), expected.getAddresses());
         assertEquals(actual.getTableToPartitionMapping().getPartitionColumnCoercions(), expected.getTableToPartitionMapping().getPartitionColumnCoercions());
         assertEquals(actual.getTableToPartitionMapping().getTableToPartitionColumns(), expected.getTableToPartitionMapping().getTableToPartitionColumns());
         assertEquals(actual.getBucketConversion(), expected.getBucketConversion());
         assertEquals(actual.isForceLocalScheduling(), expected.isForceLocalScheduling());
-        assertEquals(actual.isS3SelectPushdownEnabled(), expected.isS3SelectPushdownEnabled());
         assertEquals(actual.getAcidInfo().get(), expected.getAcidInfo().get());
-        assertEquals(actual.getSplitNumber(), expected.getSplitNumber());
         assertEquals(actual.getSplitWeight(), expected.getSplitWeight());
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveSplitSource.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveSplitSource.java
index 5b97b55c177e..9325a2729633 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveSplitSource.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveSplitSource.java
@@ -19,7 +19,7 @@
 import io.airlift.units.DataSize;
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.connector.ConnectorSplitSource;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.util.List;
@@ -105,34 +105,6 @@ public void testDynamicPartitionPruning()
         assertEquals(hiveSplitSource.getBufferedInternalSplitCount(), 0);
     }
 
-    @Test
-    public void testCorrectlyGeneratingInitialRowId()
-    {
-        HiveSplitSource hiveSplitSource = HiveSplitSource.allAtOnce(
-                SESSION,
-                "database",
-                "table",
-                10,
-                10,
-                DataSize.of(1, MEGABYTE),
-                Integer.MAX_VALUE,
-                new TestingHiveSplitLoader(),
-                Executors.newFixedThreadPool(5),
-                new CounterStat(),
-                false);
-
-        // add 10 splits
-        for (int i = 0; i < 10; i++) {
-            hiveSplitSource.addToQueue(new TestSplit(i));
-            assertEquals(hiveSplitSource.getBufferedInternalSplitCount(), i + 1);
-        }
-
-        List<ConnectorSplit> splits = getSplits(hiveSplitSource, 10);
-        assertEquals(((HiveSplit) splits.get(0)).getSplitNumber(), 0);
-        assertEquals(((HiveSplit) splits.get(5)).getSplitNumber(), 5);
-        assertEquals(hiveSplitSource.getBufferedInternalSplitCount(), 0);
-    }
-
     @Test
     public void testEvenlySizedSplitRemainder()
     {
@@ -358,13 +330,11 @@ private TestSplit(int id, OptionalInt bucketNumber, DataSize fileSize, BooleanSu
                     ImmutableList.of(new InternalHiveBlock(0, fileSize.toBytes(), ImmutableList.of())),
                     bucketNumber,
                     bucketNumber,
-                    () -> 0,
                     true,
                     false,
                     TableToPartitionMapping.empty(),
                     Optional.empty(),
                     Optional.empty(),
-                    false,
                     Optional.empty(),
                     partitionMatchSupplier);
         }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveSystemSecurity.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveSystemSecurity.java
index dc69b915e38b..227ade615959 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveSystemSecurity.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveSystemSecurity.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveTableHandle.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveTableHandle.java
index f31eb71c4ff3..42a1164a08fc 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveTableHandle.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveTableHandle.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.json.JsonCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveWriterFactory.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveWriterFactory.java
index ed13328cb5f6..17c9bf10c245 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveWriterFactory.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveWriterFactory.java
@@ -13,8 +13,9 @@
  */
 package io.trino.plugin.hive;
 
+import io.trino.filesystem.Location;
 import org.apache.hadoop.fs.Path;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 
@@ -43,31 +44,38 @@ public void testComputeBucketedFileName()
     public void testSetsSchemeToFile()
     {
         String pathWithoutScheme = "/simple/file/path";
-        String result = setSchemeToFileIfAbsent(pathWithoutScheme);
-        assertThat(result).isEqualTo("file:////simple/file/path");
+        String result = setSchemeToFileIfAbsent(Location.of(pathWithoutScheme)).toString();
+        assertThat(result).isEqualTo("file:///simple/file/path");
         URI resultUri = new Path(result).toUri();
         assertThat(resultUri.getScheme()).isEqualTo("file");
         assertThat(resultUri.getPath()).isEqualTo("/simple/file/path");
 
         String pathWithScheme = "s3://simple/file/path";
-        result = setSchemeToFileIfAbsent(pathWithScheme);
+        result = setSchemeToFileIfAbsent(Location.of(pathWithScheme)).toString();
         assertThat(result).isEqualTo(pathWithScheme);
         resultUri = new Path(result).toUri();
         assertThat(resultUri.getScheme()).isEqualTo("s3");
         assertThat(resultUri.getPath()).isEqualTo("/file/path");
 
         String pathWithEmptySpaces = "/simple/file 1/path";
-        result = setSchemeToFileIfAbsent(pathWithEmptySpaces);
-        assertThat(result).isEqualTo("file:////simple/file 1/path");
+        result = setSchemeToFileIfAbsent(Location.of(pathWithEmptySpaces)).toString();
+        assertThat(result).isEqualTo("file:///simple/file 1/path");
         resultUri = new Path(result).toUri();
         assertThat(resultUri.getScheme()).isEqualTo("file");
         assertThat(resultUri.getPath()).isEqualTo("/simple/file 1/path");
 
         String pathWithEmptySpacesAndScheme = "s3://simple/file 1/path";
-        result = setSchemeToFileIfAbsent(pathWithEmptySpacesAndScheme);
+        result = setSchemeToFileIfAbsent(Location.of(pathWithEmptySpacesAndScheme)).toString();
         assertThat(result).isEqualTo(pathWithEmptySpacesAndScheme);
         resultUri = new Path(result).toUri();
         assertThat(resultUri.getScheme()).isEqualTo("s3");
         assertThat(resultUri.getPath()).isEqualTo("/file 1/path");
+
+        String pathWithAtSign = "/tmp/user@example.com";
+        result = setSchemeToFileIfAbsent(Location.of(pathWithAtSign)).toString();
+        assertThat(result).isEqualTo("file:///tmp/user@example.com");
+        resultUri = new Path(result).toUri();
+        assertThat(resultUri.getScheme()).isEqualTo("file");
+        assertThat(resultUri.getPath()).isEqualTo("/tmp/user@example.com");
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestIssue14317.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestIssue14317.java
index e02584191cbe..3fbd7031cc02 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestIssue14317.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestIssue14317.java
@@ -15,7 +15,7 @@
 
 import io.trino.sql.query.QueryAssertions;
 import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestLegacyHiveRoles.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestLegacyHiveRoles.java
index c1a1e265c154..13c1678e367b 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestLegacyHiveRoles.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestLegacyHiveRoles.java
@@ -13,9 +13,6 @@
  */
 package io.trino.plugin.hive;
 
-import org.testng.annotations.Test;
-
-@Test(singleThreaded = true)
 public class TestLegacyHiveRoles
         extends AbstractTestHiveRoles
 {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestNodeLocalDynamicSplitPruning.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestNodeLocalDynamicSplitPruning.java
index f68682340a26..854c395bd787 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestNodeLocalDynamicSplitPruning.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestNodeLocalDynamicSplitPruning.java
@@ -31,7 +31,7 @@
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.testing.TestingConnectorSession;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -46,7 +46,6 @@
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
 import static io.trino.plugin.hive.HiveTestUtils.getDefaultHivePageSourceFactories;
-import static io.trino.plugin.hive.HiveTestUtils.getDefaultHiveRecordCursorProviders;
 import static io.trino.plugin.hive.HiveType.HIVE_INT;
 import static io.trino.plugin.hive.util.HiveBucketing.BucketingVersion.BUCKETING_V1;
 import static io.trino.spi.type.IntegerType.INTEGER;
@@ -87,11 +86,13 @@ public void testDynamicBucketPruning()
         HiveConfig config = new HiveConfig();
         HiveTransactionHandle transaction = new HiveTransactionHandle(false);
         try (TempFile tempFile = new TempFile()) {
-            ConnectorPageSource emptyPageSource = createTestingPageSource(transaction, config, tempFile.file(), getDynamicFilter(getTupleDomainForBucketSplitPruning()));
-            assertEquals(emptyPageSource.getClass(), EmptyPageSource.class);
+            try (ConnectorPageSource emptyPageSource = createTestingPageSource(transaction, config, tempFile.file(), getDynamicFilter(getTupleDomainForBucketSplitPruning()))) {
+                assertEquals(emptyPageSource.getClass(), EmptyPageSource.class);
+            }
 
-            ConnectorPageSource nonEmptyPageSource = createTestingPageSource(transaction, config, tempFile.file(), getDynamicFilter(getNonSelectiveBucketTupleDomain()));
-            assertEquals(nonEmptyPageSource.getClass(), HivePageSource.class);
+            try (ConnectorPageSource nonEmptyPageSource = createTestingPageSource(transaction, config, tempFile.file(), getDynamicFilter(getNonSelectiveBucketTupleDomain()))) {
+                assertEquals(nonEmptyPageSource.getClass(), HivePageSource.class);
+            }
         }
     }
 
@@ -102,11 +103,13 @@ public void testDynamicPartitionPruning()
         HiveConfig config = new HiveConfig();
         HiveTransactionHandle transaction = new HiveTransactionHandle(false);
         try (TempFile tempFile = new TempFile()) {
-            ConnectorPageSource emptyPageSource = createTestingPageSource(transaction, config, tempFile.file(), getDynamicFilter(getTupleDomainForPartitionSplitPruning()));
-            assertEquals(emptyPageSource.getClass(), EmptyPageSource.class);
+            try (ConnectorPageSource emptyPageSource = createTestingPageSource(transaction, config, tempFile.file(), getDynamicFilter(getTupleDomainForPartitionSplitPruning()))) {
+                assertEquals(emptyPageSource.getClass(), EmptyPageSource.class);
+            }
 
-            ConnectorPageSource nonEmptyPageSource = createTestingPageSource(transaction, config, tempFile.file(), getDynamicFilter(getNonSelectivePartitionTupleDomain()));
-            assertEquals(nonEmptyPageSource.getClass(), HivePageSource.class);
+            try (ConnectorPageSource nonEmptyPageSource = createTestingPageSource(transaction, config, tempFile.file(), getDynamicFilter(getNonSelectivePartitionTupleDomain()))) {
+                assertEquals(nonEmptyPageSource.getClass(), HivePageSource.class);
+            }
         }
     }
 
@@ -116,8 +119,6 @@ private static ConnectorPageSource createTestingPageSource(HiveTransactionHandle
         splitProperties.setProperty(FILE_INPUT_FORMAT, hiveConfig.getHiveStorageFormat().getInputFormat());
         splitProperties.setProperty(SERIALIZATION_LIB, hiveConfig.getHiveStorageFormat().getSerde());
         HiveSplit split = new HiveSplit(
-                SCHEMA_NAME,
-                TABLE_NAME,
                 "",
                 "file:///" + outputFile.getAbsolutePath(),
                 0,
@@ -129,14 +130,11 @@ private static ConnectorPageSource createTestingPageSource(HiveTransactionHandle
                 ImmutableList.of(),
                 OptionalInt.of(1),
                 OptionalInt.of(1),
-                0,
                 false,
                 TableToPartitionMapping.empty(),
                 Optional.empty(),
                 Optional.empty(),
-                false,
                 Optional.empty(),
-                0,
                 SplitWeight.standard());
 
         TableHandle tableHandle = new TableHandle(
@@ -157,11 +155,8 @@ private static ConnectorPageSource createTestingPageSource(HiveTransactionHandle
 
         HivePageSourceProvider provider = new HivePageSourceProvider(
                 TESTING_TYPE_MANAGER,
-                HDFS_ENVIRONMENT,
                 hiveConfig,
-                getDefaultHivePageSourceFactories(HDFS_ENVIRONMENT, hiveConfig),
-                getDefaultHiveRecordCursorProviders(hiveConfig, HDFS_ENVIRONMENT),
-                new GenericHiveRecordCursorProvider(HDFS_ENVIRONMENT, hiveConfig));
+                getDefaultHivePageSourceFactories(HDFS_ENVIRONMENT, hiveConfig));
 
         return provider.createPageSource(
                 transaction,
@@ -209,7 +204,6 @@ private static TestingConnectorSession getSession(HiveConfig config)
         return TestingConnectorSession.builder()
                 .setPropertyMetadata(new HiveSessionProperties(
                         config,
-                        new HiveFormatsConfig(),
                         new OrcReaderConfig(),
                         new OrcWriterConfig(),
                         new ParquetReaderConfig(),
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestOrcPageSourceMemoryTracking.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestOrcPageSourceMemoryTracking.java
index 6a2873a39a33..54e956e311db 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestOrcPageSourceMemoryTracking.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestOrcPageSourceMemoryTracking.java
@@ -18,6 +18,7 @@
 import io.airlift.slice.Slice;
 import io.airlift.stats.Distribution;
 import io.airlift.units.DataSize;
+import io.trino.filesystem.Location;
 import io.trino.hive.orc.NullMemoryManager;
 import io.trino.hive.orc.impl.WriterImpl;
 import io.trino.metadata.FunctionManager;
@@ -70,10 +71,10 @@
 import org.apache.hadoop.io.compress.CompressionCodecFactory;
 import org.apache.hadoop.mapred.FileSplit;
 import org.apache.hadoop.mapred.JobConf;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.lang.reflect.Constructor;
@@ -125,12 +126,14 @@
 import static org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.COMPRESS_CODEC;
 import static org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.COMPRESS_TYPE;
 import static org.joda.time.DateTimeZone.UTC;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestOrcPageSourceMemoryTracking
 {
     private static final String ORC_RECORD_WRITER = OrcOutputFormat.class.getName() + "$OrcRecordWriter";
@@ -152,13 +155,7 @@ public class TestOrcPageSourceMemoryTracking
     private File tempFile;
     private TestPreparer testPreparer;
 
-    @DataProvider(name = "rowCount")
-    public static Object[][] rowCount()
-    {
-        return new Object[][] {{50_000}, {10_000}, {5_000}};
-    }
-
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -167,7 +164,7 @@ public void setUp()
         testPreparer = new TestPreparer(tempFile.getAbsolutePath());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         tempFile.delete();
@@ -317,14 +314,21 @@ private void testPageSource(boolean useCache)
         pageSource.close();
     }
 
-    @Test(dataProvider = "rowCount")
-    public void testMaxReadBytes(int rowCount)
+    @Test
+    public void testMaxReadBytes()
+            throws Exception
+    {
+        testMaxReadBytes(50_000);
+        testMaxReadBytes(10_000);
+        testMaxReadBytes(5_000);
+    }
+
+    private void testMaxReadBytes(int rowCount)
             throws Exception
     {
         int maxReadBytes = 1_000;
         HiveSessionProperties hiveSessionProperties = new HiveSessionProperties(
                 new HiveConfig(),
-                new HiveFormatsConfig(),
                 new OrcReaderConfig()
                         .setMaxBlockSize(DataSize.ofBytes(maxReadBytes)),
                 new OrcWriterConfig(),
@@ -367,7 +371,7 @@ public void testMaxReadBytes(int rowCount)
                 if (positionCount > MAX_BATCH_SIZE) {
                     // either the block is bounded by maxReadBytes or we just load one single large block
                     // an error margin MAX_BATCH_SIZE / step is needed given the block sizes are increasing
-                    assertTrue(page.getSizeInBytes() < maxReadBytes * (MAX_BATCH_SIZE / step) || 1 == page.getPositionCount());
+                    assertTrue(page.getSizeInBytes() < (long) maxReadBytes * (MAX_BATCH_SIZE / step) || 1 == page.getPositionCount());
                 }
             }
 
@@ -560,32 +564,29 @@ public ConnectorPageSource newPageSource(FileFormatDataSourceStats stats, Connec
                     columns,
                     ImmutableList.of(),
                     TableToPartitionMapping.empty(),
-                    fileSplit.getPath(),
+                    fileSplit.getPath().toString(),
                     OptionalInt.empty(),
                     fileSplit.getLength(),
                     Instant.now().toEpochMilli());
 
-            return HivePageSourceProvider.createHivePageSource(
+            ConnectorPageSource connectorPageSource = HivePageSourceProvider.createHivePageSource(
                     ImmutableSet.of(orcPageSourceFactory),
-                    ImmutableSet.of(),
-                    newEmptyConfiguration(),
                     session,
-                    fileSplit.getPath(),
+                    Location.of(fileSplit.getPath().toString()),
                     OptionalInt.empty(),
                     fileSplit.getStart(),
                     fileSplit.getLength(),
                     fileSplit.getLength(),
                     schema,
                     TupleDomain.all(),
-                    columns,
                     TESTING_TYPE_MANAGER,
                     Optional.empty(),
                     Optional.empty(),
-                    false,
                     Optional.empty(),
                     false,
                     NO_ACID_TRANSACTION,
                     columnMappings).orElseThrow();
+            return connectorPageSource;
         }
 
         public SourceOperator newTableScanOperator(DriverContext driverContext)
@@ -594,6 +595,7 @@ public SourceOperator newTableScanOperator(DriverContext driverContext)
             SourceOperatorFactory sourceOperatorFactory = new TableScanOperatorFactory(
                     0,
                     new PlanNodeId("0"),
+                    new PlanNodeId("0"),
                     (session, split, table, columnHandles, dynamicFilter) -> pageSource,
                     TEST_TABLE_HANDLE,
                     columns.stream().map(ColumnHandle.class::cast).collect(toImmutableList()),
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestOrcWriterConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestOrcWriterConfig.java
index 9677c6772cb5..50f851faee2d 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestOrcWriterConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestOrcWriterConfig.java
@@ -18,7 +18,7 @@
 import io.trino.orc.OrcWriteValidation.OrcWriteValidationMode;
 import io.trino.orc.OrcWriterOptions.WriterIdentification;
 import io.trino.plugin.hive.orc.OrcWriterConfig;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestOriginalFilesUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestOriginalFilesUtils.java
index 278711998c1d..8e10003d0e33 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestOriginalFilesUtils.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestOriginalFilesUtils.java
@@ -13,17 +13,15 @@
  */
 package io.trino.plugin.hive;
 
-import com.google.common.io.Resources;
+import io.trino.filesystem.Location;
 import io.trino.orc.OrcReaderOptions;
 import io.trino.plugin.hive.orc.OriginalFilesUtils;
-import org.apache.hadoop.fs.Path;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.google.common.io.Resources.getResource;
 import static io.trino.plugin.hive.AcidInfo.OriginalFileInfo;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.testing.TestingConnectorSession.SESSION;
@@ -31,13 +29,11 @@
 
 public class TestOriginalFilesUtils
 {
-    private String tablePath;
+    private final Location tablePath;
 
-    @BeforeClass
-    public void setup()
-            throws Exception
+    public TestOriginalFilesUtils()
     {
-        tablePath = new File(Resources.getResource(("dummy_id_data_orc")).toURI()).getPath();
+        tablePath = Location.of(getResource("dummy_id_data_orc").toString());
     }
 
     @Test
@@ -48,7 +44,7 @@ public void testGetPrecedingRowCountSingleFile()
 
         long rowCountResult = OriginalFilesUtils.getPrecedingRowCount(
                 originalFileInfoList,
-                new Path(tablePath + "/000001_0"),
+                tablePath.appendPath("000001_0"),
                 HDFS_FILE_SYSTEM_FACTORY,
                 SESSION.getIdentity(),
                 new OrcReaderOptions(),
@@ -67,7 +63,7 @@ public void testGetPrecedingRowCount()
 
         long rowCountResult = OriginalFilesUtils.getPrecedingRowCount(
                 originalFileInfos,
-                new Path(tablePath + "/000002_0_copy_2"),
+                tablePath.appendPath("000002_0_copy_2"),
                 HDFS_FILE_SYSTEM_FACTORY,
                 SESSION.getIdentity(),
                 new OrcReaderOptions(),
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestParquetPageSkipping.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestParquetPageSkipping.java
index 255a89365d78..0ffa7cd64f7f 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestParquetPageSkipping.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestParquetPageSkipping.java
@@ -14,10 +14,34 @@
 package io.trino.plugin.hive;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Resources;
+import io.trino.Session;
+import io.trino.execution.QueryStats;
+import io.trino.operator.OperatorStats;
+import io.trino.spi.QueryId;
+import io.trino.spi.metrics.Count;
+import io.trino.spi.metrics.Metric;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.MaterializedResult;
+import io.trino.testing.MaterializedResultWithQueryId;
 import io.trino.testing.QueryRunner;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import static com.google.common.collect.MoreCollectors.onlyElement;
+import static io.trino.parquet.reader.ParquetReader.COLUMN_INDEX_ROWS_FILTERED;
+import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestParquetPageSkipping
-        extends AbstractTestParquetPageSkipping
+        extends AbstractTestQueryFramework
 {
     @Override
     protected QueryRunner createQueryRunner()
@@ -27,8 +51,266 @@ protected QueryRunner createQueryRunner()
                 .setHiveProperties(
                         ImmutableMap.of(
                                 "parquet.use-column-index", "true",
-                                "parquet.max-buffer-size", "1MB",
-                                "parquet.optimized-reader.enabled", "false"))
+                                "parquet.max-buffer-size", "1MB"))
+                .build();
+    }
+
+    @Test
+    public void testRowGroupPruningFromPageIndexes()
+            throws Exception
+    {
+        String tableName = "test_row_group_pruning_" + randomNameSuffix();
+        File parquetFile = new File(Resources.getResource("parquet_page_skipping/orders_sorted_by_totalprice").toURI());
+        assertUpdate(
+                """
+                        CREATE TABLE %s (
+                           orderkey bigint,
+                           custkey bigint,
+                           orderstatus varchar(1),
+                           totalprice double,
+                           orderdate date,
+                           orderpriority varchar(15),
+                           clerk varchar(15),
+                           shippriority integer,
+                           comment varchar(79),
+                           rvalues double array)
+                        WITH (
+                           format = 'PARQUET',
+                           external_location = '%s')
+                        """.formatted(tableName, parquetFile.getAbsolutePath()));
+
+        int rowCount = assertColumnIndexResults("SELECT * FROM " + tableName + " WHERE totalprice BETWEEN 100000 AND 131280 AND clerk = 'Clerk#000000624'");
+        assertThat(rowCount).isGreaterThan(0);
+
+        // `totalprice BETWEEN 51890 AND 51900` is chosen to lie between min/max values of row group
+        // but outside page level min/max boundaries to trigger pruning of row group using column index
+        assertRowGroupPruning("SELECT * FROM " + tableName + " WHERE totalprice BETWEEN 51890 AND 51900 AND orderkey > 0");
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testPageSkippingWithNonSequentialOffsets()
+            throws URISyntaxException
+    {
+        String tableName = "test_random_" + randomNameSuffix();
+        File parquetFile = new File(Resources.getResource("parquet_page_skipping/random").toURI());
+        assertUpdate(format(
+                "CREATE TABLE %s (col double) WITH (format = 'PARQUET', external_location = '%s')",
+                tableName,
+                parquetFile.getAbsolutePath()));
+        // These queries select a subset of pages which are stored at non-sequential offsets
+        // This reproduces the issue identified in https://github.com/trinodb/trino/issues/9097
+        for (double i = 0; i < 1; i += 0.1) {
+            assertColumnIndexResults(format("SELECT * FROM %s WHERE col BETWEEN %f AND %f", tableName, i - 0.00001, i + 0.00001));
+        }
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testFilteringOnColumnNameWithDot()
+            throws URISyntaxException
+    {
+        String nameInSql = "\"a.dot\"";
+        String tableName = "test_column_name_with_dot_" + randomNameSuffix();
+
+        File parquetFile = new File(Resources.getResource("parquet_page_skipping/column_name_with_dot").toURI());
+        assertUpdate(format(
+                "CREATE TABLE %s (key varchar(50), %s varchar(50)) WITH (format = 'PARQUET', external_location = '%s')",
+                tableName,
+                nameInSql,
+                parquetFile.getAbsolutePath()));
+
+        assertQuery("SELECT key FROM " + tableName + " WHERE " + nameInSql + " IS NULL", "VALUES ('null value')");
+        assertQuery("SELECT key FROM " + tableName + " WHERE " + nameInSql + " = 'abc'", "VALUES ('sample value')");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testPageSkipping()
+    {
+        testPageSkipping("orderkey", "bigint", new Object[][] {{2, 7520, 7523, 14950}});
+        testPageSkipping("totalprice", "double", new Object[][] {{974.04, 131094.34, 131279.97, 406938.36}});
+        testPageSkipping("totalprice", "real", new Object[][] {{974.04, 131094.34, 131279.97, 406938.36}});
+        testPageSkipping("totalprice", "decimal(12,2)", new Object[][] {
+                {974.04, 131094.34, 131279.97, 406938.36},
+                {973, 131095, 131280, 406950},
+                {974.04123, 131094.34123, 131279.97012, 406938.36555}});
+        testPageSkipping("totalprice", "decimal(12,0)", new Object[][] {
+                {973, 131095, 131280, 406950}});
+        testPageSkipping("totalprice", "decimal(35,2)", new Object[][] {
+                {974.04, 131094.34, 131279.97, 406938.36},
+                {973, 131095, 131280, 406950},
+                {974.04123, 131094.34123, 131279.97012, 406938.36555}});
+        testPageSkipping("orderdate", "date", new Object[][] {{"DATE '1992-01-05'", "DATE '1995-10-13'", "DATE '1995-10-13'", "DATE '1998-07-29'"}});
+        testPageSkipping("orderdate", "timestamp", new Object[][] {{"TIMESTAMP '1992-01-05'", "TIMESTAMP '1995-10-13'", "TIMESTAMP '1995-10-14'", "TIMESTAMP '1998-07-29'"}});
+        testPageSkipping("clerk", "varchar(15)", new Object[][] {{"'Clerk#000000006'", "'Clerk#000000508'", "'Clerk#000000513'", "'Clerk#000000996'"}});
+        testPageSkipping("custkey", "integer", new Object[][] {{4, 634, 640, 1493}});
+        testPageSkipping("custkey", "smallint", new Object[][] {{4, 634, 640, 1493}});
+    }
+
+    private void testPageSkipping(String sortByColumn, String sortByColumnType, Object[][] valuesArray)
+    {
+        String tableName = "test_page_skipping_" + randomNameSuffix();
+        buildSortedTables(tableName, sortByColumn, sortByColumnType);
+        for (Object[] values : valuesArray) {
+            Object lowValue = values[0];
+            Object middleLowValue = values[1];
+            Object middleHighValue = values[2];
+            Object highValue = values[3];
+            assertColumnIndexResults(format("SELECT %s FROM %s WHERE %s = %s", sortByColumn, tableName, sortByColumn, middleLowValue));
+            assertThat(assertColumnIndexResults(format("SELECT %s FROM %s WHERE %s < %s", sortByColumn, tableName, sortByColumn, lowValue))).isGreaterThan(0);
+            assertThat(assertColumnIndexResults(format("SELECT %s FROM %s WHERE %s > %s", sortByColumn, tableName, sortByColumn, highValue))).isGreaterThan(0);
+            assertThat(assertColumnIndexResults(format("SELECT %s FROM %s WHERE %s BETWEEN %s AND %s", sortByColumn, tableName, sortByColumn, middleLowValue, middleHighValue))).isGreaterThan(0);
+            // Tests synchronization of reading values across columns
+            assertColumnIndexResults(format("SELECT * FROM %s WHERE %s = %s", tableName, sortByColumn, middleLowValue));
+            assertThat(assertColumnIndexResults(format("SELECT * FROM %s WHERE %s < %s", tableName, sortByColumn, lowValue))).isGreaterThan(0);
+            assertThat(assertColumnIndexResults(format("SELECT * FROM %s WHERE %s > %s", tableName, sortByColumn, highValue))).isGreaterThan(0);
+            assertThat(assertColumnIndexResults(format("SELECT * FROM %s WHERE %s BETWEEN %s AND %s", tableName, sortByColumn, middleLowValue, middleHighValue))).isGreaterThan(0);
+            // Nested data
+            assertColumnIndexResults(format("SELECT rvalues FROM %s WHERE %s IN (%s, %s, %s, %s)", tableName, sortByColumn, lowValue, middleLowValue, middleHighValue, highValue));
+            // Without nested data
+            assertColumnIndexResults(format("SELECT orderkey, orderdate FROM %s WHERE %s IN (%s, %s, %s, %s)", tableName, sortByColumn, lowValue, middleLowValue, middleHighValue, highValue));
+        }
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testFilteringWithColumnIndex()
+            throws URISyntaxException
+    {
+        String tableName = "test_page_filtering_" + randomNameSuffix();
+        File parquetFile = new File(Resources.getResource("parquet_page_skipping/lineitem_sorted_by_suppkey").toURI());
+        assertUpdate(format(
+                "CREATE TABLE %s (suppkey bigint, extendedprice decimal(12, 2), shipmode varchar(10), comment varchar(44)) " +
+                        "WITH (format = 'PARQUET', external_location = '%s')",
+                tableName,
+                parquetFile.getAbsolutePath()));
+
+        verifyFilteringWithColumnIndex("SELECT * FROM " + tableName + " WHERE suppkey = 10");
+        verifyFilteringWithColumnIndex("SELECT * FROM " + tableName + " WHERE suppkey BETWEEN 25 AND 35");
+        verifyFilteringWithColumnIndex("SELECT * FROM " + tableName + " WHERE suppkey >= 60");
+        verifyFilteringWithColumnIndex("SELECT * FROM " + tableName + " WHERE suppkey <= 40");
+        verifyFilteringWithColumnIndex("SELECT * FROM " + tableName + " WHERE suppkey IN (25, 35, 50, 80)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    private void verifyFilteringWithColumnIndex(@Language("SQL") String query)
+    {
+        DistributedQueryRunner queryRunner = getDistributedQueryRunner();
+        MaterializedResultWithQueryId resultWithoutColumnIndex = queryRunner.executeWithQueryId(
+                noParquetColumnIndexFiltering(getSession()),
+                query);
+        QueryStats queryStatsWithoutColumnIndex = getQueryStats(resultWithoutColumnIndex.getQueryId());
+        assertThat(queryStatsWithoutColumnIndex.getPhysicalInputPositions()).isGreaterThan(0);
+        Map<String, Metric<?>> metricsWithoutColumnIndex = getScanOperatorStats(resultWithoutColumnIndex.getQueryId())
+                .getConnectorMetrics()
+                .getMetrics();
+        assertThat(metricsWithoutColumnIndex).doesNotContainKey(COLUMN_INDEX_ROWS_FILTERED);
+
+        MaterializedResultWithQueryId resultWithColumnIndex = queryRunner.executeWithQueryId(getSession(), query);
+        QueryStats queryStatsWithColumnIndex = getQueryStats(resultWithColumnIndex.getQueryId());
+        assertThat(queryStatsWithColumnIndex.getPhysicalInputPositions()).isGreaterThan(0);
+        assertThat(queryStatsWithColumnIndex.getPhysicalInputPositions())
+                .isLessThan(queryStatsWithoutColumnIndex.getPhysicalInputPositions());
+        Map<String, Metric<?>> metricsWithColumnIndex = getScanOperatorStats(resultWithColumnIndex.getQueryId())
+                .getConnectorMetrics()
+                .getMetrics();
+        assertThat(metricsWithColumnIndex).containsKey(COLUMN_INDEX_ROWS_FILTERED);
+        assertThat(((Count<?>) metricsWithColumnIndex.get(COLUMN_INDEX_ROWS_FILTERED)).getTotal())
+                .isGreaterThan(0);
+
+        assertEqualsIgnoreOrder(resultWithColumnIndex.getResult(), resultWithoutColumnIndex.getResult());
+    }
+
+    private int assertColumnIndexResults(String query)
+    {
+        MaterializedResult withColumnIndexing = computeActual(query);
+        MaterializedResult withoutColumnIndexing = computeActual(noParquetColumnIndexFiltering(getSession()), query);
+        assertEqualsIgnoreOrder(withColumnIndexing, withoutColumnIndexing);
+        return withoutColumnIndexing.getRowCount();
+    }
+
+    private void assertRowGroupPruning(@Language("SQL") String sql)
+    {
+        assertQueryStats(
+                noParquetColumnIndexFiltering(getSession()),
+                sql,
+                queryStats -> {
+                    assertThat(queryStats.getPhysicalInputPositions()).isGreaterThan(0);
+                    assertThat(queryStats.getProcessedInputPositions()).isEqualTo(queryStats.getPhysicalInputPositions());
+                },
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+
+        assertQueryStats(
+                getSession(),
+                sql,
+                queryStats -> {
+                    assertThat(queryStats.getPhysicalInputPositions()).isEqualTo(0);
+                    assertThat(queryStats.getProcessedInputPositions()).isEqualTo(0);
+                },
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+    }
+
+    private Session noParquetColumnIndexFiltering(Session session)
+    {
+        return Session.builder(session)
+                .setCatalogSessionProperty(session.getCatalog().orElseThrow(), "parquet_use_column_index", "false")
                 .build();
     }
+
+    private QueryStats getQueryStats(QueryId queryId)
+    {
+        return getDistributedQueryRunner().getCoordinator()
+                .getQueryManager()
+                .getFullQueryInfo(queryId)
+                .getQueryStats();
+    }
+
+    private OperatorStats getScanOperatorStats(QueryId queryId)
+    {
+        return getQueryStats(queryId)
+                .getOperatorSummaries()
+                .stream()
+                .filter(summary -> summary.getOperatorType().startsWith("TableScan") || summary.getOperatorType().startsWith("Scan"))
+                .collect(onlyElement());
+    }
+
+    private void buildSortedTables(String tableName, String sortByColumnName, String sortByColumnType)
+    {
+        String createTableTemplate =
+                "CREATE TABLE %s ( " +
+                        "   orderkey bigint, " +
+                        "   custkey bigint, " +
+                        "   orderstatus varchar(1), " +
+                        "   totalprice double, " +
+                        "   orderdate date, " +
+                        "   orderpriority varchar(15), " +
+                        "   clerk varchar(15), " +
+                        "   shippriority integer, " +
+                        "   comment varchar(79), " +
+                        "   rvalues double array " +
+                        ") " +
+                        "WITH ( " +
+                        "   format = 'PARQUET', " +
+                        "   bucketed_by = array['orderstatus'], " +
+                        "   bucket_count = 1, " +
+                        "   sorted_by = array['%s'] " +
+                        ")";
+        createTableTemplate = createTableTemplate.replaceFirst(sortByColumnName + "[ ]+([^,]*)", sortByColumnName + " " + sortByColumnType);
+
+        assertUpdate(format(
+                createTableTemplate,
+                tableName,
+                sortByColumnName));
+        String catalog = getSession().getCatalog().orElseThrow();
+        assertUpdate(
+                Session.builder(getSession())
+                        .setCatalogSessionProperty(catalog, "parquet_writer_page_size", "10000B")
+                        .setCatalogSessionProperty(catalog, "parquet_writer_block_size", "2GB")
+                        .build(),
+                format("INSERT INTO %s SELECT *, ARRAY[rand(), rand(), rand()] FROM tpch.tiny.orders", tableName),
+                15000);
+    }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestParquetPageSkippingWithOptimizedReader.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestParquetPageSkippingWithOptimizedReader.java
deleted file mode 100644
index f68b673d9137..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestParquetPageSkippingWithOptimizedReader.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive;
-
-import com.google.common.collect.ImmutableMap;
-import io.trino.testing.QueryRunner;
-
-public class TestParquetPageSkippingWithOptimizedReader
-        extends AbstractTestParquetPageSkipping
-{
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        return HiveQueryRunner.builder()
-                .setHiveProperties(
-                        ImmutableMap.of(
-                                "parquet.use-column-index", "true",
-                                "parquet.max-buffer-size", "1MB",
-                                "parquet.optimized-reader.enabled", "true"))
-                .build();
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestPartitionDrops.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestPartitionDrops.java
index e62e96ff37d4..1ccd6f047f1a 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestPartitionDrops.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestPartitionDrops.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.tpch.TpchTable.NATION;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestPartitionOfflineException.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestPartitionOfflineException.java
index d2aed3e3d31a..e55c26560d12 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestPartitionOfflineException.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestPartitionOfflineException.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive;
 
 import io.trino.spi.connector.SchemaTableName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestPartitionUpdate.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestPartitionUpdate.java
index 69031a976ad0..9fd6aaf0bba1 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestPartitionUpdate.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestPartitionUpdate.java
@@ -15,9 +15,9 @@
 
 import com.google.common.collect.ImmutableList;
 import io.airlift.json.JsonCodec;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.PartitionUpdate.UpdateMode;
-import org.apache.hadoop.fs.Path;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.json.JsonCodec.jsonCodec;
 import static org.testng.Assert.assertEquals;
@@ -43,8 +43,8 @@ public void testRoundTrip()
 
         assertEquals(actual.getName(), "test");
         assertEquals(actual.getUpdateMode(), UpdateMode.APPEND);
-        assertEquals(actual.getWritePath(), new Path("/writePath"));
-        assertEquals(actual.getTargetPath(), new Path("/targetPath"));
+        assertEquals(actual.getWritePath(), Location.of("/writePath"));
+        assertEquals(actual.getTargetPath(), Location.of("/targetPath"));
         assertEquals(actual.getFileNames(), ImmutableList.of("file1", "file3"));
         assertEquals(actual.getRowCount(), 123);
         assertEquals(actual.getInMemoryDataSizeInBytes(), 456);
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestReaderColumns.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestReaderColumns.java
index 2c4f5c3bc12a..2422cbc92a95 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestReaderColumns.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestReaderColumns.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestReaderProjectionsAdapter.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestReaderProjectionsAdapter.java
index b39e347310c1..a80a3acdcb06 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestReaderProjectionsAdapter.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestReaderProjectionsAdapter.java
@@ -18,13 +18,13 @@
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.ColumnarRow;
 import io.trino.spi.block.LazyBlock;
 import io.trino.spi.block.RowBlock;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -40,10 +40,9 @@
 import static io.trino.plugin.hive.TestHiveReaderProjectionsUtil.createProjectedColumnHandle;
 import static io.trino.plugin.hive.TestHiveReaderProjectionsUtil.createTestFullColumns;
 import static io.trino.plugin.hive.TestReaderProjectionsAdapter.RowData.rowData;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
-import static io.trino.spi.block.RowBlock.fromFieldBlocks;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
@@ -110,18 +109,16 @@ public void testLazyDereferenceProjectionLoading()
         assertFalse(rowBlockLevel1.isLoaded());
 
         // Assertion for "col.f_row_0" and col.f_bigint_0"
-        ColumnarRow columnarRowLevel1 = toColumnarRow(rowBlockLevel1);
-        assertFalse(columnarRowLevel1.getField(0).isLoaded());
-        assertFalse(columnarRowLevel1.getField(1).isLoaded());
+        assertFalse(rowBlockLevel1.getFieldBlock(0).isLoaded());
+        assertFalse(rowBlockLevel1.getFieldBlock(1).isLoaded());
 
-        Block lazyBlockLevel2 = columnarRowLevel1.getField(0);
+        Block lazyBlockLevel2 = rowBlockLevel1.getFieldBlock(0);
         assertTrue(lazyBlockLevel2 instanceof LazyBlock);
         RowBlock rowBlockLevel2 = ((RowBlock) (((LazyBlock) lazyBlockLevel2).getBlock()));
         assertFalse(rowBlockLevel2.isLoaded());
-        ColumnarRow columnarRowLevel2 = toColumnarRow(rowBlockLevel2);
         // Assertion for "col.f_row_0.f_bigint_0" and "col.f_row_0.f_bigint_1"
-        assertTrue(columnarRowLevel2.getField(0).isLoaded());
-        assertFalse(columnarRowLevel2.getField(1).isLoaded());
+        assertTrue(rowBlockLevel2.getFieldBlock(0).isLoaded());
+        assertFalse(rowBlockLevel2.getFieldBlock(1).isLoaded());
     }
 
     private void verifyPageAdaptation(ReaderProjectionsAdapter adapter, List<List<Object>> inputPageData)
@@ -186,6 +183,9 @@ private static Block createRowBlockWithLazyNestedBlocks(List<Object> data, RowTy
             RowData row = (RowData) data.get(position);
             if (row == null) {
                 isNull[position] = true;
+                for (int field = 0; field < fieldCount; field++) {
+                    fieldsData.get(field).add(null);
+                }
             }
             else {
                 for (int field = 0; field < fieldCount; field++) {
@@ -199,7 +199,7 @@ private static Block createRowBlockWithLazyNestedBlocks(List<Object> data, RowTy
             fieldBlocks[field] = createInputBlock(fieldsData.get(field), rowType.getFields().get(field).getType());
         }
 
-        return fromFieldBlocks(positionCount, Optional.of(isNull), fieldBlocks);
+        return RowBlock.fromNotNullSuppressedFieldBlocks(positionCount, Optional.of(isNull), fieldBlocks);
     }
 
     private static Block createLongArrayBlock(List<Object> data)
@@ -211,7 +211,7 @@ private static Block createLongArrayBlock(List<Object> data)
                 builder.appendNull();
             }
             else {
-                builder.writeLong(value);
+                BIGINT.writeLong(builder, value);
             }
         }
         return builder.build();
@@ -219,11 +219,12 @@ private static Block createLongArrayBlock(List<Object> data)
 
     private static void verifyBlock(Block actualBlock, Type outputType, Block input, Type inputType, List<Integer> dereferences)
     {
-        Block expectedOutputBlock = createProjectedColumnBlock(input, outputType, inputType, dereferences);
+        assertThat(inputType).isInstanceOf(RowType.class);
+        Block expectedOutputBlock = createProjectedColumnBlock(input, outputType, (RowType) inputType, dereferences);
         assertBlockEquals(outputType, actualBlock, expectedOutputBlock);
     }
 
-    private static Block createProjectedColumnBlock(Block data, Type finalType, Type blockType, List<Integer> dereferences)
+    private static Block createProjectedColumnBlock(Block data, Type finalType, RowType blockType, List<Integer> dereferences)
     {
         if (dereferences.size() == 0) {
             return data;
@@ -232,14 +233,14 @@ private static Block createProjectedColumnBlock(Block data, Type finalType, Type
         BlockBuilder builder = finalType.createBlockBuilder(null, data.getPositionCount());
 
         for (int i = 0; i < data.getPositionCount(); i++) {
-            Type sourceType = blockType;
+            RowType sourceType = blockType;
 
-            Block currentData = null;
+            SqlRow currentData = null;
             boolean isNull = data.isNull(i);
 
             if (!isNull) {
-                // Get SingleRowBlock corresponding to element at position i
-                currentData = data.getObject(i, Block.class);
+                // Get SqlRow corresponding to element at position i
+                currentData = sourceType.getObject(data, i);
             }
 
             // Apply all dereferences except for the last one, because the type can be different
@@ -249,13 +250,17 @@ private static Block createProjectedColumnBlock(Block data, Type finalType, Type
                     break;
                 }
 
-                checkArgument(sourceType instanceof RowType);
-                if (currentData.isNull(dereferences.get(j))) {
+                int fieldIndex = dereferences.get(j);
+                Block fieldBlock = currentData.getRawFieldBlock(fieldIndex);
+
+                RowType rowType = sourceType;
+                int rawIndex = currentData.getRawIndex();
+                if (fieldBlock.isNull(rawIndex)) {
                     currentData = null;
                 }
                 else {
-                    sourceType = ((RowType) sourceType).getFields().get(dereferences.get(j)).getType();
-                    currentData = currentData.getObject(dereferences.get(j), Block.class);
+                    sourceType = (RowType) rowType.getFields().get(fieldIndex).getType();
+                    currentData = sourceType.getObject(fieldBlock, rawIndex);
                 }
 
                 isNull = isNull || (currentData == null);
@@ -268,7 +273,7 @@ private static Block createProjectedColumnBlock(Block data, Type finalType, Type
             else {
                 int lastDereference = dereferences.get(dereferences.size() - 1);
 
-                finalType.appendTo(currentData, lastDereference, builder);
+                finalType.appendTo(currentData.getRawFieldBlock(lastDereference), currentData.getRawIndex(), builder);
             }
         }
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestRecordingMetastoreConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestRecordingMetastoreConfig.java
index ce599444bfdb..54cb9e492827 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestRecordingMetastoreConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestRecordingMetastoreConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestRegexTable.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestRegexTable.java
index d7bd4d5a9d9a..8895127f71a1 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestRegexTable.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestRegexTable.java
@@ -18,7 +18,7 @@
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Path;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestShowStats.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestShowStats.java
index 82dc149bc21e..4ed0fd12490b 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestShowStats.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestShowStats.java
@@ -17,14 +17,17 @@
 import io.trino.Session;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.SystemSessionProperties.PREFER_PARTIAL_AGGREGATION;
 import static io.trino.SystemSessionProperties.USE_PARTIAL_DISTINCT_LIMIT;
 import static io.trino.SystemSessionProperties.USE_PARTIAL_TOPN;
 import static io.trino.tpch.TpchTable.NATION;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestShowStats
         extends AbstractTestQueryFramework
 {
@@ -39,7 +42,7 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         assertUpdate("CREATE TABLE nation_partitioned(nationkey BIGINT, name VARCHAR, comment VARCHAR, regionkey BIGINT) WITH (partitioned_by = ARRAY['regionkey'])");
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestSortingFileWriterConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestSortingFileWriterConfig.java
index 09aa6ae02e85..ddce757f1a48 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestSortingFileWriterConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestSortingFileWriterConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestTableOfflineException.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestTableOfflineException.java
index d7c7f91d2a5c..7eea0e2ad384 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestTableOfflineException.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestTableOfflineException.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive;
 
 import io.trino.spi.connector.SchemaTableName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestTableToPartitionMapping.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestTableToPartitionMapping.java
index e0e240ee919f..edf2ed2be7c0 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestTableToPartitionMapping.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestTableToPartitionMapping.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.hive.TableToPartitionMapping.isIdentityMapping;
 import static org.testng.Assert.assertFalse;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestingHiveConnectorFactory.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestingHiveConnectorFactory.java
index 9974fd40b682..086472941d78 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestingHiveConnectorFactory.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestingHiveConnectorFactory.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive;
 
 import com.google.inject.Module;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.hive.fs.DirectoryLister;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.spi.connector.Connector;
@@ -31,17 +32,23 @@ public class TestingHiveConnectorFactory
         implements ConnectorFactory
 {
     private final Optional<HiveMetastore> metastore;
+    private final Optional<OpenTelemetry> openTelemetry;
     private final Module module;
     private final Optional<DirectoryLister> directoryLister;
 
     public TestingHiveConnectorFactory(HiveMetastore metastore)
     {
-        this(Optional.of(metastore), EMPTY_MODULE, Optional.empty());
+        this(Optional.of(metastore), Optional.empty(), EMPTY_MODULE, Optional.empty());
     }
 
-    public TestingHiveConnectorFactory(Optional<HiveMetastore> metastore, Module module, Optional<DirectoryLister> directoryLister)
+    public TestingHiveConnectorFactory(
+            Optional<HiveMetastore> metastore,
+            Optional<OpenTelemetry> openTelemetry,
+            Module module,
+            Optional<DirectoryLister> directoryLister)
     {
         this.metastore = requireNonNull(metastore, "metastore is null");
+        this.openTelemetry = requireNonNull(openTelemetry, "openTelemetry is null");
         this.module = requireNonNull(module, "module is null");
         this.directoryLister = requireNonNull(directoryLister, "directoryLister is null");
     }
@@ -55,6 +62,6 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
-        return createConnector(catalogName, config, context, module, metastore, directoryLister);
+        return createConnector(catalogName, config, context, module, metastore, Optional.empty(), openTelemetry, directoryLister);
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestingHivePlugin.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestingHivePlugin.java
index adc6ad833f5e..13975b1995b3 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestingHivePlugin.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestingHivePlugin.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Module;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.hive.fs.DirectoryLister;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.spi.Plugin;
@@ -29,22 +30,24 @@ public class TestingHivePlugin
         implements Plugin
 {
     private final Optional<HiveMetastore> metastore;
+    private final Optional<OpenTelemetry> openTelemetry;
     private final Module module;
     private final Optional<DirectoryLister> directoryLister;
 
     public TestingHivePlugin()
     {
-        this(Optional.empty(), EMPTY_MODULE, Optional.empty());
+        this(Optional.empty(), Optional.empty(), EMPTY_MODULE, Optional.empty());
     }
 
     public TestingHivePlugin(HiveMetastore metastore)
     {
-        this(Optional.of(metastore), EMPTY_MODULE, Optional.empty());
+        this(Optional.of(metastore), Optional.empty(), EMPTY_MODULE, Optional.empty());
     }
 
-    public TestingHivePlugin(Optional<HiveMetastore> metastore, Module module, Optional<DirectoryLister> directoryLister)
+    public TestingHivePlugin(Optional<HiveMetastore> metastore, Optional<OpenTelemetry> openTelemetry, Module module, Optional<DirectoryLister> directoryLister)
     {
         this.metastore = requireNonNull(metastore, "metastore is null");
+        this.openTelemetry = requireNonNull(openTelemetry, "openTelemetry is null");
         this.module = requireNonNull(module, "module is null");
         this.directoryLister = requireNonNull(directoryLister, "directoryLister is null");
     }
@@ -52,6 +55,6 @@ public TestingHivePlugin(Optional<HiveMetastore> metastore, Module module, Optio
     @Override
     public Iterable<ConnectorFactory> getConnectorFactories()
     {
-        return ImmutableList.of(new TestingHiveConnectorFactory(metastore, module, directoryLister));
+        return ImmutableList.of(new TestingHiveConnectorFactory(metastore, openTelemetry, module, directoryLister));
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestingThriftHiveMetastoreBuilder.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestingThriftHiveMetastoreBuilder.java
index 247bf8eb76cd..8f37c63020c7 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestingThriftHiveMetastoreBuilder.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestingThriftHiveMetastoreBuilder.java
@@ -13,18 +13,10 @@
  */
 package io.trino.plugin.hive;
 
-import com.google.common.collect.ImmutableSet;
 import com.google.common.net.HostAndPort;
 import io.airlift.units.Duration;
-import io.trino.hdfs.DynamicHdfsConfiguration;
-import io.trino.hdfs.HdfsConfig;
-import io.trino.hdfs.HdfsConfigurationInitializer;
+import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.hdfs.HdfsEnvironment;
-import io.trino.hdfs.authentication.NoHdfsAuthentication;
-import io.trino.plugin.hive.azure.HiveAzureConfig;
-import io.trino.plugin.hive.azure.TrinoAzureConfigurationInitializer;
-import io.trino.plugin.hive.gcs.GoogleGcsConfigurationInitializer;
-import io.trino.plugin.hive.gcs.HiveGcsConfig;
 import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
 import io.trino.plugin.hive.metastore.thrift.TestingTokenAwareMetastoreClientFactory;
 import io.trino.plugin.hive.metastore.thrift.ThriftHiveMetastoreFactory;
@@ -33,31 +25,18 @@
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreConfig;
 import io.trino.plugin.hive.metastore.thrift.TokenAwareMetastoreClientFactory;
 import io.trino.plugin.hive.metastore.thrift.UgiBasedMetastoreClientFactory;
-import io.trino.plugin.hive.s3.HiveS3Config;
-import io.trino.plugin.hive.s3.TrinoS3ConfigurationInitializer;
 
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.plugin.base.security.UserNameProvider.SIMPLE_USER_NAME_PROVIDER;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.Executors.newFixedThreadPool;
 
 public final class TestingThriftHiveMetastoreBuilder
 {
-    private static final HdfsEnvironment HDFS_ENVIRONMENT = new HdfsEnvironment(
-            new DynamicHdfsConfiguration(
-                    new HdfsConfigurationInitializer(
-                            new HdfsConfig()
-                                    .setSocksProxy(HiveTestUtils.SOCKS_PROXY.orElse(null)),
-                            ImmutableSet.of(
-                                    new TrinoS3ConfigurationInitializer(new HiveS3Config()),
-                                    new GoogleGcsConfigurationInitializer(new HiveGcsConfig()),
-                                    new TrinoAzureConfigurationInitializer(new HiveAzureConfig()))),
-                    ImmutableSet.of()),
-            new HdfsConfig(),
-            new NoHdfsAuthentication());
-
     private TokenAwareMetastoreClientFactory tokenAwareMetastoreClientFactory;
     private HiveConfig hiveConfig = new HiveConfig();
     private ThriftMetastoreConfig thriftMetastoreConfig = new ThriftMetastoreConfig();
@@ -121,7 +100,7 @@ public ThriftMetastore build()
                 new HiveMetastoreConfig().isHideDeltaLakeTables(),
                 hiveConfig.isTranslateHiveViews(),
                 thriftMetastoreConfig,
-                hdfsEnvironment,
+                new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS),
                 newFixedThreadPool(thriftMetastoreConfig.getWriteStatisticsThreads()));
         return metastoreFactory.createMetastore(Optional.empty());
     }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/avro/TestAvroSchemaGeneration.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/avro/TestAvroSchemaGeneration.java
new file mode 100644
index 000000000000..484709c64ccb
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/avro/TestAvroSchemaGeneration.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.avro;
+
+import io.trino.filesystem.local.LocalFileSystem;
+import io.trino.hadoop.ConfigurationInstantiator;
+import io.trino.plugin.hive.HiveType;
+import io.trino.plugin.hive.type.TypeInfo;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.VarcharType;
+import org.apache.avro.Schema;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Properties;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static io.trino.plugin.hive.avro.AvroHiveConstants.TABLE_NAME;
+import static io.trino.plugin.hive.util.SerdeConstants.LIST_COLUMNS;
+import static io.trino.plugin.hive.util.SerdeConstants.LIST_COLUMN_TYPES;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestAvroSchemaGeneration
+{
+    @Test
+    public void testOldVsNewSchemaGeneration()
+            throws IOException
+    {
+        Properties properties = new Properties();
+        properties.setProperty(TABLE_NAME, "testingTable");
+        properties.setProperty(LIST_COLUMNS, "a,b");
+        properties.setProperty(LIST_COLUMN_TYPES, Stream.of(HiveType.HIVE_INT, HiveType.HIVE_STRING).map(HiveType::getTypeInfo).map(TypeInfo::toString).collect(Collectors.joining(",")));
+        Schema actual = AvroHiveFileUtils.determineSchemaOrThrowException(new LocalFileSystem(Path.of("/")), properties);
+        Schema expected = new TrinoAvroSerDe().determineSchemaOrReturnErrorSchema(ConfigurationInstantiator.newEmptyConfiguration(), properties);
+        assertThat(actual).isEqualTo(expected);
+    }
+
+    @Test
+    public void testOldVsNewSchemaGenerationWithNested()
+            throws IOException
+    {
+        Properties properties = new Properties();
+        properties.setProperty(TABLE_NAME, "testingTable");
+        properties.setProperty(LIST_COLUMNS, "a,b");
+        properties.setProperty(LIST_COLUMN_TYPES, Stream.of(HiveType.toHiveType(RowType.rowType(RowType.field("a", VarcharType.VARCHAR))), HiveType.HIVE_STRING).map(HiveType::getTypeInfo).map(TypeInfo::toString).collect(Collectors.joining(",")));
+        Schema actual = AvroHiveFileUtils.determineSchemaOrThrowException(new LocalFileSystem(Path.of("/")), properties);
+        Schema expected = new TrinoAvroSerDe().determineSchemaOrReturnErrorSchema(ConfigurationInstantiator.newEmptyConfiguration(), properties);
+        assertThat(actual).isEqualTo(expected);
+    }
+}
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/TrinoAvroSerDe.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/avro/TrinoAvroSerDe.java
similarity index 100%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/avro/TrinoAvroSerDe.java
rename to plugin/trino-hive/src/test/java/io/trino/plugin/hive/avro/TrinoAvroSerDe.java
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/AbstractFileFormat.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/AbstractFileFormat.java
index dfec148ef1d7..77143b82792a 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/AbstractFileFormat.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/AbstractFileFormat.java
@@ -16,14 +16,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import io.trino.filesystem.Location;
 import io.trino.hdfs.HdfsEnvironment;
-import io.trino.plugin.hive.GenericHiveRecordCursorProvider;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.HivePageSourceFactory;
 import io.trino.plugin.hive.HivePageSourceProvider;
-import io.trino.plugin.hive.HiveRecordCursorProvider;
-import io.trino.plugin.hive.HiveRecordCursorProvider.ReaderRecordCursorWithProjections;
 import io.trino.plugin.hive.HiveSplit;
 import io.trino.plugin.hive.HiveStorageFormat;
 import io.trino.plugin.hive.HiveTableHandle;
@@ -36,11 +34,9 @@
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.DynamicFilter;
-import io.trino.spi.connector.RecordPageSource;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.TestingConnectorTransactionHandle;
-import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.JobConf;
 
 import java.io.File;
@@ -82,18 +78,6 @@ public boolean supportsDate()
         return true;
     }
 
-    @Override
-    public Optional<HivePageSourceFactory> getHivePageSourceFactory(HdfsEnvironment environment)
-    {
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<HiveRecordCursorProvider> getHiveRecordCursorProvider(HdfsEnvironment environment)
-    {
-        return Optional.empty();
-    }
-
     @Override
     public ConnectorPageSource createFileFormatReader(
             ConnectorSession session,
@@ -102,16 +86,7 @@ public ConnectorPageSource createFileFormatReader(
             List<String> columnNames,
             List<Type> columnTypes)
     {
-        Optional<HivePageSourceFactory> pageSourceFactory = getHivePageSourceFactory(hdfsEnvironment);
-        Optional<HiveRecordCursorProvider> recordCursorProvider = getHiveRecordCursorProvider(hdfsEnvironment);
-
-        checkArgument(pageSourceFactory.isPresent() ^ recordCursorProvider.isPresent());
-
-        if (pageSourceFactory.isPresent()) {
-            return createPageSource(pageSourceFactory.get(), session, targetFile, columnNames, columnTypes, getFormat());
-        }
-
-        return createPageSource(recordCursorProvider.get(), session, targetFile, columnNames, columnTypes, getFormat());
+        return createPageSource(getHivePageSourceFactory(hdfsEnvironment), session, targetFile, columnNames, columnTypes, getFormat());
     }
 
     @Override
@@ -125,17 +100,12 @@ public ConnectorPageSource createGenericReader(
     {
         HivePageSourceProvider factory = new HivePageSourceProvider(
                 TESTING_TYPE_MANAGER,
-                hdfsEnvironment,
                 new HiveConfig(),
-                getHivePageSourceFactory(hdfsEnvironment).map(ImmutableSet::of).orElse(ImmutableSet.of()),
-                getHiveRecordCursorProvider(hdfsEnvironment).map(ImmutableSet::of).orElse(ImmutableSet.of()),
-                new GenericHiveRecordCursorProvider(hdfsEnvironment, new HiveConfig()));
+                ImmutableSet.of(getHivePageSourceFactory(hdfsEnvironment)));
 
         Properties schema = createSchema(getFormat(), schemaColumnNames, schemaColumnTypes);
 
         HiveSplit split = new HiveSplit(
-                "schema_name",
-                "table_name",
                 "",
                 targetFile.getPath(),
                 0,
@@ -147,14 +117,11 @@ public ConnectorPageSource createGenericReader(
                 ImmutableList.of(),
                 OptionalInt.empty(),
                 OptionalInt.empty(),
-                0,
                 false,
                 TableToPartitionMapping.empty(),
                 Optional.empty(),
                 Optional.empty(),
-                false,
                 Optional.empty(),
-                0,
                 SplitWeight.standard());
 
         return factory.createPageSource(
@@ -171,36 +138,6 @@ public boolean supports(TestData testData)
         return true;
     }
 
-    static ConnectorPageSource createPageSource(
-            HiveRecordCursorProvider cursorProvider,
-            ConnectorSession session,
-            File targetFile,
-            List<String> columnNames,
-            List<Type> columnTypes,
-            HiveStorageFormat format)
-    {
-        checkArgument(columnNames.size() == columnTypes.size(), "columnNames and columnTypes should have the same size");
-
-        List<HiveColumnHandle> readColumns = getBaseColumns(columnNames, columnTypes);
-
-        Optional<ReaderRecordCursorWithProjections> recordCursorWithProjections = cursorProvider.createRecordCursor(
-                conf,
-                session,
-                new Path(targetFile.getAbsolutePath()),
-                0,
-                targetFile.length(),
-                targetFile.length(),
-                createSchema(format, columnNames, columnTypes),
-                readColumns,
-                TupleDomain.all(),
-                TESTING_TYPE_MANAGER,
-                false);
-
-        checkState(recordCursorWithProjections.isPresent(), "readerPageSourceWithProjections is not present");
-        checkState(recordCursorWithProjections.get().getProjectedReaderColumns().isEmpty(), "projection should not be required");
-        return new RecordPageSource(columnTypes, recordCursorWithProjections.get().getRecordCursor());
-    }
-
     static ConnectorPageSource createPageSource(
             HivePageSourceFactory pageSourceFactory,
             ConnectorSession session,
@@ -216,9 +153,8 @@ static ConnectorPageSource createPageSource(
         Properties schema = createSchema(format, columnNames, columnTypes);
         Optional<ReaderPageSource> readerPageSourceWithProjections = pageSourceFactory
                 .createPageSource(
-                        conf,
                         session,
-                        new Path(targetFile.getAbsolutePath()),
+                        Location.of(targetFile.getAbsolutePath()),
                         0,
                         targetFile.length(),
                         targetFile.length(),
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkFileFormat.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkFileFormat.java
index c6aae2fae722..6dd6bb4f4554 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkFileFormat.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkFileFormat.java
@@ -22,11 +22,6 @@ public enum BenchmarkFileFormat
     TRINO_RCTEXT(StandardFileFormats.TRINO_RCTEXT),
     TRINO_ORC(StandardFileFormats.TRINO_ORC),
     TRINO_PARQUET(StandardFileFormats.TRINO_PARQUET),
-    TRINO_OPTIMIZED_PARQUET(StandardFileFormats.TRINO_PARQUET),
-    HIVE_RCBINARY(StandardFileFormats.HIVE_RCBINARY),
-    HIVE_RCTEXT(StandardFileFormats.HIVE_RCTEXT),
-    HIVE_ORC(StandardFileFormats.HIVE_ORC),
-    HIVE_PARQUET(StandardFileFormats.HIVE_PARQUET),
     /**/;
 
     private final FileFormat format;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkFileFormatsUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkFileFormatsUtils.java
index 7ffad65b8a73..903866cd0762 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkFileFormatsUtils.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkFileFormatsUtils.java
@@ -19,6 +19,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Type;
 import io.trino.tpch.TpchColumn;
 import io.trino.tpch.TpchEntity;
@@ -36,7 +37,6 @@
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DateType.DATE;
-import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static java.lang.String.format;
@@ -73,28 +73,18 @@ public static <E extends TpchEntity> TestData createTpchDataSet(FileFormat forma
                 TpchColumn<E> column = columns.get(i);
                 BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(i);
                 switch (column.getType().getBase()) {
-                    case IDENTIFIER:
-                        BIGINT.writeLong(blockBuilder, column.getIdentifier(row));
-                        break;
-                    case INTEGER:
-                        INTEGER.writeLong(blockBuilder, column.getInteger(row));
-                        break;
-                    case DATE:
+                    case IDENTIFIER -> BIGINT.writeLong(blockBuilder, column.getIdentifier(row));
+                    case INTEGER -> INTEGER.writeLong(blockBuilder, column.getInteger(row));
+                    case DATE -> {
                         if (format.supportsDate()) {
                             DATE.writeLong(blockBuilder, column.getDate(row));
                         }
                         else {
-                            createUnboundedVarcharType().writeString(blockBuilder, column.getString(row));
+                            createUnboundedVarcharType().writeSlice(blockBuilder, Slices.utf8Slice(column.getString(row)));
                         }
-                        break;
-                    case DOUBLE:
-                        DOUBLE.writeDouble(blockBuilder, column.getDouble(row));
-                        break;
-                    case VARCHAR:
-                        createUnboundedVarcharType().writeSlice(blockBuilder, Slices.utf8Slice(column.getString(row)));
-                        break;
-                    default:
-                        throw new IllegalArgumentException("Unsupported type " + column.getType());
+                    }
+                    case DOUBLE -> DecimalType.createDecimalType(12, 2).writeLong(blockBuilder, column.getIdentifier(row));
+                    case VARCHAR -> createUnboundedVarcharType().writeSlice(blockBuilder, Slices.utf8Slice(column.getString(row)));
                 }
             }
             if (pageBuilder.isFull()) {
@@ -124,7 +114,7 @@ public static Type getColumnType(TpchColumn<?> input)
             case DATE:
                 return DATE;
             case DOUBLE:
-                return DOUBLE;
+                return DecimalType.createDecimalType(12, 2);
             case VARCHAR:
                 return createUnboundedVarcharType();
         }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkHiveFileFormat.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkHiveFileFormat.java
index cf9ae2b6d8ef..6740ceb873a4 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkHiveFileFormat.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkHiveFileFormat.java
@@ -18,13 +18,15 @@
 import io.trino.hadoop.HadoopNative;
 import io.trino.plugin.hive.HiveCompressionCodec;
 import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.parquet.ParquetReaderConfig;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.MapType;
 import io.trino.spi.type.Type;
 import io.trino.tpch.OrderColumn;
 import it.unimi.dsi.fastutil.ints.IntArrays;
@@ -55,8 +57,6 @@
 import static io.trino.jmh.Benchmarks.benchmark;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
 import static io.trino.plugin.hive.HiveTestUtils.getHiveSession;
-import static io.trino.plugin.hive.HiveTestUtils.mapType;
-import static io.trino.plugin.hive.benchmark.BenchmarkFileFormat.TRINO_OPTIMIZED_PARQUET;
 import static io.trino.plugin.hive.benchmark.BenchmarkFileFormatsUtils.MIN_DATA_SIZE;
 import static io.trino.plugin.hive.benchmark.BenchmarkFileFormatsUtils.createTempDir;
 import static io.trino.plugin.hive.benchmark.BenchmarkFileFormatsUtils.createTpchDataSet;
@@ -64,9 +64,11 @@
 import static io.trino.plugin.hive.benchmark.BenchmarkFileFormatsUtils.printResults;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.tpch.TpchTable.LINE_ITEM;
 import static io.trino.tpch.TpchTable.ORDERS;
+import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 
 @State(Scope.Thread)
 @OutputTimeUnit(TimeUnit.SECONDS)
@@ -76,11 +78,7 @@
 @SuppressWarnings({"UseOfSystemOutOrSystemErr", "ResultOfMethodCallIgnored"})
 public class BenchmarkHiveFileFormat
 {
-    private static final ConnectorSession SESSION = getHiveSession(
-            new HiveConfig(), new ParquetReaderConfig().setOptimizedReaderEnabled(false));
-
-    private static final ConnectorSession SESSION_OPTIMIZED_PARQUET_READER = getHiveSession(
-            new HiveConfig(), new ParquetReaderConfig().setOptimizedReaderEnabled(true));
+    private static final ConnectorSession SESSION = getHiveSession(new HiveConfig());
 
     static {
         HadoopNative.requireHadoopNative();
@@ -110,12 +108,7 @@ public class BenchmarkHiveFileFormat
             "TRINO_RCBINARY",
             "TRINO_RCTEXT",
             "TRINO_ORC",
-            "TRINO_PARQUET",
-            "TRINO_OPTIMIZED_PARQUET",
-            "HIVE_RCBINARY",
-            "HIVE_RCTEXT",
-            "HIVE_ORC",
-            "HIVE_PARQUET"})
+            "TRINO_PARQUET"})
     private BenchmarkFileFormat benchmarkFileFormat;
 
     private FileFormat fileFormat;
@@ -172,7 +165,7 @@ public List<Page> read(CompressionCounter counter)
         }
         List<Page> pages = new ArrayList<>(100);
         try (ConnectorPageSource pageSource = fileFormat.createFileFormatReader(
-                TRINO_OPTIMIZED_PARQUET.equals(benchmarkFileFormat) ? SESSION_OPTIMIZED_PARQUET_READER : SESSION,
+                SESSION,
                 HDFS_ENVIRONMENT,
                 dataFile,
                 data.getColumnNames(),
@@ -267,7 +260,7 @@ public TestData createTestData(FileFormat format)
             @Override
             public TestData createTestData(FileFormat format)
             {
-                Type type = mapType(createUnboundedVarcharType(), DOUBLE);
+                MapType type = new MapType(VARCHAR, DOUBLE, TESTING_TYPE_MANAGER.getTypeOperators());
                 Random random = new Random(1234);
 
                 PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(type));
@@ -279,15 +272,15 @@ public TestData createTestData(FileFormat format)
                 while (dataSize < MIN_DATA_SIZE) {
                     pageBuilder.declarePosition();
 
-                    BlockBuilder builder = pageBuilder.getBlockBuilder(0);
-                    BlockBuilder mapBuilder = builder.beginBlockEntry();
-                    int entries = nextRandomBetween(random, MIN_ENTRIES, MAX_ENTRIES);
-                    IntArrays.shuffle(keys, random);
-                    for (int entryId = 0; entryId < entries; entryId++) {
-                        createUnboundedVarcharType().writeSlice(mapBuilder, Slices.utf8Slice("key" + keys[entryId]));
-                        DOUBLE.writeDouble(mapBuilder, random.nextDouble());
-                    }
-                    builder.closeEntry();
+                    MapBlockBuilder builder = (MapBlockBuilder) pageBuilder.getBlockBuilder(0);
+                    builder.buildEntry((keyBuilder, valueBuilder) -> {
+                        int entries = nextRandomBetween(random, MIN_ENTRIES, MAX_ENTRIES);
+                        IntArrays.shuffle(keys, random);
+                        for (int entryId = 0; entryId < entries; entryId++) {
+                            VARCHAR.writeSlice(keyBuilder, Slices.utf8Slice("key" + keys[entryId]));
+                            DOUBLE.writeDouble(valueBuilder, random.nextDouble());
+                        }
+                    });
 
                     if (pageBuilder.isFull()) {
                         Page page = pageBuilder.build();
@@ -306,7 +299,7 @@ public TestData createTestData(FileFormat format)
             @Override
             public TestData createTestData(FileFormat format)
             {
-                Type type = mapType(createUnboundedVarcharType(), DOUBLE);
+                MapType type = new MapType(VARCHAR, DOUBLE, TESTING_TYPE_MANAGER.getTypeOperators());
                 Random random = new Random(1234);
 
                 PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(type));
@@ -315,14 +308,14 @@ public TestData createTestData(FileFormat format)
                 while (dataSize < MIN_DATA_SIZE) {
                     pageBuilder.declarePosition();
 
-                    BlockBuilder builder = pageBuilder.getBlockBuilder(0);
-                    BlockBuilder mapBuilder = builder.beginBlockEntry();
-                    int entries = nextRandomBetween(random, MIN_ENTRIES, MAX_ENTRIES);
-                    for (int entryId = 0; entryId < entries; entryId++) {
-                        createUnboundedVarcharType().writeSlice(mapBuilder, Slices.utf8Slice("key" + random.nextInt(10_000_000)));
-                        DOUBLE.writeDouble(mapBuilder, random.nextDouble());
-                    }
-                    builder.closeEntry();
+                    MapBlockBuilder builder = (MapBlockBuilder) pageBuilder.getBlockBuilder(0);
+                    builder.buildEntry((keyBuilder, valueBuilder) -> {
+                        int entries = nextRandomBetween(random, MIN_ENTRIES, MAX_ENTRIES);
+                        for (int entryId = 0; entryId < entries; entryId++) {
+                            VARCHAR.writeSlice(keyBuilder, Slices.utf8Slice("key" + random.nextInt(10_000_000)));
+                            DOUBLE.writeDouble(valueBuilder, random.nextDouble());
+                        }
+                    });
 
                     if (pageBuilder.isFull()) {
                         Page page = pageBuilder.build();
@@ -341,7 +334,7 @@ public TestData createTestData(FileFormat format)
             @Override
             public TestData createTestData(FileFormat format)
             {
-                Type type = mapType(INTEGER, DOUBLE);
+                MapType type = new MapType(INTEGER, DOUBLE, TESTING_TYPE_MANAGER.getTypeOperators());
                 Random random = new Random(1234);
 
                 PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(type));
@@ -353,15 +346,15 @@ public TestData createTestData(FileFormat format)
                 while (dataSize < MIN_DATA_SIZE) {
                     pageBuilder.declarePosition();
 
-                    BlockBuilder builder = pageBuilder.getBlockBuilder(0);
-                    BlockBuilder mapBuilder = builder.beginBlockEntry();
-                    int entries = nextRandomBetween(random, MIN_ENTRIES, MAX_ENTRIES);
-                    IntArrays.shuffle(keys, random);
-                    for (int entryId = 0; entryId < entries; entryId++) {
-                        INTEGER.writeLong(mapBuilder, keys[entryId]);
-                        DOUBLE.writeDouble(mapBuilder, random.nextDouble());
-                    }
-                    builder.closeEntry();
+                    MapBlockBuilder builder = (MapBlockBuilder) pageBuilder.getBlockBuilder(0);
+                    builder.buildEntry((keyBuilder, valueBuilder) -> {
+                        int entries = nextRandomBetween(random, MIN_ENTRIES, MAX_ENTRIES);
+                        IntArrays.shuffle(keys, random);
+                        for (int entryId = 0; entryId < entries; entryId++) {
+                            INTEGER.writeLong(keyBuilder, keys[entryId]);
+                            DOUBLE.writeDouble(valueBuilder, random.nextDouble());
+                        }
+                    });
 
                     if (pageBuilder.isFull()) {
                         Page page = pageBuilder.build();
@@ -380,7 +373,7 @@ public TestData createTestData(FileFormat format)
             @Override
             public TestData createTestData(FileFormat format)
             {
-                Type type = mapType(INTEGER, DOUBLE);
+                MapType type = new MapType(INTEGER, DOUBLE, TESTING_TYPE_MANAGER.getTypeOperators());
                 Random random = new Random(1234);
 
                 PageBuilder pageBuilder = new PageBuilder(ImmutableList.of(type));
@@ -389,14 +382,14 @@ public TestData createTestData(FileFormat format)
                 while (dataSize < MIN_DATA_SIZE) {
                     pageBuilder.declarePosition();
 
-                    BlockBuilder builder = pageBuilder.getBlockBuilder(0);
-                    BlockBuilder mapBuilder = builder.beginBlockEntry();
-                    int entries = nextRandomBetween(random, MIN_ENTRIES, MAX_ENTRIES);
-                    for (int entryId = 0; entryId < entries; entryId++) {
-                        INTEGER.writeLong(mapBuilder, random.nextInt(10_000_000));
-                        DOUBLE.writeDouble(mapBuilder, random.nextDouble());
-                    }
-                    builder.closeEntry();
+                    MapBlockBuilder builder = (MapBlockBuilder) pageBuilder.getBlockBuilder(0);
+                    builder.buildEntry((keyBuilder, valueBuilder) -> {
+                        int entries = nextRandomBetween(random, MIN_ENTRIES, MAX_ENTRIES);
+                        for (int entryId = 0; entryId < entries; entryId++) {
+                            INTEGER.writeLong(keyBuilder, random.nextInt(10_000_000));
+                            DOUBLE.writeDouble(valueBuilder, random.nextDouble());
+                        }
+                    });
 
                     if (pageBuilder.isFull()) {
                         Page page = pageBuilder.build();
@@ -425,12 +418,12 @@ public TestData createTestData(FileFormat format)
                     pageBuilder.declarePosition();
 
                     BlockBuilder builder = pageBuilder.getBlockBuilder(0);
-                    BlockBuilder mapBuilder = builder.beginBlockEntry();
-                    int entries = nextRandomBetween(random, MIN_ENTRIES, MAX_ENTRIES);
-                    for (int entryId = 0; entryId < entries; entryId++) {
-                        createUnboundedVarcharType().writeSlice(mapBuilder, Slices.utf8Slice("key" + random.nextInt(10_000_000)));
-                    }
-                    builder.closeEntry();
+                    ((ArrayBlockBuilder) builder).buildEntry(elementBuilder -> {
+                        int entries = nextRandomBetween(random, MIN_ENTRIES, MAX_ENTRIES);
+                        for (int entryId = 0; entryId < entries; entryId++) {
+                            createUnboundedVarcharType().writeSlice(elementBuilder, Slices.utf8Slice("key" + random.nextInt(10_000_000)));
+                        }
+                    });
 
                     if (pageBuilder.isFull()) {
                         Page page = pageBuilder.build();
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkProjectionPushdownHive.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkProjectionPushdownHive.java
index ae6d4c7b4977..c116971d3345 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkProjectionPushdownHive.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/BenchmarkProjectionPushdownHive.java
@@ -28,6 +28,7 @@
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
@@ -38,7 +39,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
-import org.testng.annotations.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -272,7 +272,7 @@ private Block createBlock(Type type, int rowCount)
                     fieldBlocks[field] = createBlock(parameters.get(field), rowCount);
                 }
 
-                return RowBlock.fromFieldBlocks(rowCount, Optional.empty(), fieldBlocks);
+                return RowBlock.fromFieldBlocks(rowCount, fieldBlocks);
             }
             if (type instanceof VarcharType) {
                 BlockBuilder builder = VARCHAR.createBlockBuilder(null, rowCount);
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/FileFormat.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/FileFormat.java
index 81e4a9dcde93..4f4f301789bd 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/FileFormat.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/FileFormat.java
@@ -16,7 +16,6 @@
 import io.trino.hdfs.HdfsEnvironment;
 import io.trino.plugin.hive.HiveCompressionCodec;
 import io.trino.plugin.hive.HivePageSourceFactory;
-import io.trino.plugin.hive.HiveRecordCursorProvider;
 import io.trino.plugin.hive.HiveStorageFormat;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorPageSource;
@@ -26,7 +25,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import java.util.Optional;
 
 public interface FileFormat
 {
@@ -42,9 +40,7 @@ FormatWriter createFileFormatWriter(
 
     boolean supportsDate();
 
-    Optional<HivePageSourceFactory> getHivePageSourceFactory(HdfsEnvironment environment);
-
-    Optional<HiveRecordCursorProvider> getHiveRecordCursorProvider(HdfsEnvironment environment);
+    HivePageSourceFactory getHivePageSourceFactory(HdfsEnvironment environment);
 
     ConnectorPageSource createFileFormatReader(
             ConnectorSession session,
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/StandardFileFormats.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/StandardFileFormats.java
index adc6a8de93ca..6ab34775965d 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/StandardFileFormats.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/StandardFileFormats.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.filesystem.local.LocalOutputFile;
 import io.trino.hdfs.HdfsEnvironment;
 import io.trino.hive.formats.encodings.ColumnEncodingFactory;
 import io.trino.hive.formats.encodings.binary.BinaryColumnEncodingFactory;
@@ -33,9 +34,7 @@
 import io.trino.plugin.hive.HiveCompressionCodec;
 import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.HivePageSourceFactory;
-import io.trino.plugin.hive.HiveRecordCursorProvider;
 import io.trino.plugin.hive.HiveStorageFormat;
-import io.trino.plugin.hive.RecordFileWriter;
 import io.trino.plugin.hive.orc.OrcPageSourceFactory;
 import io.trino.plugin.hive.parquet.ParquetPageSourceFactory;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
@@ -43,8 +42,6 @@
 import io.trino.spi.Page;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobConf;
 import org.joda.time.DateTimeZone;
 
 import java.io.File;
@@ -57,12 +54,7 @@
 import static io.trino.parquet.writer.ParquetSchemaConverter.HIVE_PARQUET_USE_INT96_TIMESTAMP_ENCODING;
 import static io.trino.parquet.writer.ParquetSchemaConverter.HIVE_PARQUET_USE_LEGACY_DECIMAL_ENCODING;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
-import static io.trino.plugin.hive.HiveTestUtils.SESSION;
-import static io.trino.plugin.hive.HiveTestUtils.createGenericHiveRecordCursorProvider;
-import static io.trino.plugin.hive.benchmark.AbstractFileFormat.createSchema;
-import static io.trino.plugin.hive.metastore.StorageFormat.fromHiveStorageFormat;
-import static io.trino.plugin.hive.util.CompressionConfigUtil.configureCompression;
-import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static org.joda.time.DateTimeZone.UTC;
 
 public final class StandardFileFormats
@@ -78,9 +70,9 @@ public HiveStorageFormat getFormat()
         }
 
         @Override
-        public Optional<HivePageSourceFactory> getHivePageSourceFactory(HdfsEnvironment hdfsEnvironment)
+        public HivePageSourceFactory getHivePageSourceFactory(HdfsEnvironment hdfsEnvironment)
         {
-            return Optional.of(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, hdfsEnvironment, new FileFormatDataSourceStats(), new HiveConfig().setRcfileTimeZone("UTC")));
+            return new RcFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, new HiveConfig().setRcfileTimeZone("UTC"));
         }
 
         @Override
@@ -109,9 +101,9 @@ public HiveStorageFormat getFormat()
         }
 
         @Override
-        public Optional<HivePageSourceFactory> getHivePageSourceFactory(HdfsEnvironment hdfsEnvironment)
+        public HivePageSourceFactory getHivePageSourceFactory(HdfsEnvironment hdfsEnvironment)
         {
-            return Optional.of(new RcFilePageSourceFactory(TESTING_TYPE_MANAGER, hdfsEnvironment, new FileFormatDataSourceStats(), new HiveConfig().setRcfileTimeZone("UTC")));
+            return new RcFilePageSourceFactory(HDFS_FILE_SYSTEM_FACTORY, new HiveConfig().setRcfileTimeZone("UTC"));
         }
 
         @Override
@@ -140,9 +132,9 @@ public HiveStorageFormat getFormat()
         }
 
         @Override
-        public Optional<HivePageSourceFactory> getHivePageSourceFactory(HdfsEnvironment hdfsEnvironment)
+        public HivePageSourceFactory getHivePageSourceFactory(HdfsEnvironment hdfsEnvironment)
         {
-            return Optional.of(new OrcPageSourceFactory(new OrcReaderOptions(), HDFS_FILE_SYSTEM_FACTORY, new FileFormatDataSourceStats(), UTC));
+            return new OrcPageSourceFactory(new OrcReaderOptions(), HDFS_FILE_SYSTEM_FACTORY, new FileFormatDataSourceStats(), UTC);
         }
 
         @Override
@@ -171,13 +163,13 @@ public HiveStorageFormat getFormat()
         }
 
         @Override
-        public Optional<HivePageSourceFactory> getHivePageSourceFactory(HdfsEnvironment hdfsEnvironment)
+        public HivePageSourceFactory getHivePageSourceFactory(HdfsEnvironment hdfsEnvironment)
         {
-            return Optional.of(new ParquetPageSourceFactory(
-                    new HdfsFileSystemFactory(hdfsEnvironment),
+            return new ParquetPageSourceFactory(
+                    new HdfsFileSystemFactory(hdfsEnvironment, HDFS_FILE_SYSTEM_STATS),
                     new FileFormatDataSourceStats(),
                     new ParquetReaderConfig(),
-                    new HiveConfig()));
+                    new HiveConfig());
         }
 
         @Override
@@ -193,110 +185,6 @@ public FormatWriter createFileFormatWriter(
         }
     };
 
-    public static final FileFormat HIVE_RCBINARY = new AbstractFileFormat()
-    {
-        @Override
-        public HiveStorageFormat getFormat()
-        {
-            return HiveStorageFormat.RCBINARY;
-        }
-
-        @Override
-        public Optional<HiveRecordCursorProvider> getHiveRecordCursorProvider(HdfsEnvironment hdfsEnvironment)
-        {
-            return Optional.of(createGenericHiveRecordCursorProvider(hdfsEnvironment));
-        }
-
-        @Override
-        public FormatWriter createFileFormatWriter(
-                ConnectorSession session,
-                File targetFile,
-                List<String> columnNames,
-                List<Type> columnTypes,
-                HiveCompressionCodec compressionCodec)
-        {
-            return new RecordFormatWriter(targetFile, columnNames, columnTypes, compressionCodec, HiveStorageFormat.RCBINARY, session);
-        }
-    };
-
-    public static final FileFormat HIVE_RCTEXT = new AbstractFileFormat()
-    {
-        @Override
-        public HiveStorageFormat getFormat()
-        {
-            return HiveStorageFormat.RCTEXT;
-        }
-
-        @Override
-        public Optional<HiveRecordCursorProvider> getHiveRecordCursorProvider(HdfsEnvironment hdfsEnvironment)
-        {
-            return Optional.of(createGenericHiveRecordCursorProvider(hdfsEnvironment));
-        }
-
-        @Override
-        public FormatWriter createFileFormatWriter(
-                ConnectorSession session,
-                File targetFile,
-                List<String> columnNames,
-                List<Type> columnTypes,
-                HiveCompressionCodec compressionCodec)
-        {
-            return new RecordFormatWriter(targetFile, columnNames, columnTypes, compressionCodec, HiveStorageFormat.RCTEXT, session);
-        }
-    };
-
-    public static final FileFormat HIVE_ORC = new AbstractFileFormat()
-    {
-        @Override
-        public HiveStorageFormat getFormat()
-        {
-            return HiveStorageFormat.ORC;
-        }
-
-        @Override
-        public Optional<HiveRecordCursorProvider> getHiveRecordCursorProvider(HdfsEnvironment hdfsEnvironment)
-        {
-            return Optional.of(createGenericHiveRecordCursorProvider(hdfsEnvironment));
-        }
-
-        @Override
-        public FormatWriter createFileFormatWriter(
-                ConnectorSession session,
-                File targetFile,
-                List<String> columnNames,
-                List<Type> columnTypes,
-                HiveCompressionCodec compressionCodec)
-        {
-            return new RecordFormatWriter(targetFile, columnNames, columnTypes, compressionCodec, HiveStorageFormat.ORC, session);
-        }
-    };
-
-    public static final FileFormat HIVE_PARQUET = new AbstractFileFormat()
-    {
-        @Override
-        public HiveStorageFormat getFormat()
-        {
-            return HiveStorageFormat.PARQUET;
-        }
-
-        @Override
-        public Optional<HiveRecordCursorProvider> getHiveRecordCursorProvider(HdfsEnvironment hdfsEnvironment)
-        {
-            return Optional.of(createGenericHiveRecordCursorProvider(hdfsEnvironment));
-        }
-
-        @Override
-        public FormatWriter createFileFormatWriter(
-                ConnectorSession session,
-                File targetFile,
-                List<String> columnNames,
-                List<Type> columnTypes,
-                HiveCompressionCodec compressionCodec)
-        {
-            return new RecordFormatWriter(targetFile, columnNames, columnTypes, compressionCodec, HiveStorageFormat.PARQUET, session);
-        }
-    };
-
     private static class PrestoParquetFormatWriter
             implements FormatWriter
     {
@@ -318,7 +206,6 @@ public PrestoParquetFormatWriter(File targetFile, List<String> columnNames, List
                     ParquetWriterOptions.builder().build(),
                     compressionCodec.getParquetCompressionCodec(),
                     "test-version",
-                    false,
                     Optional.of(DateTimeZone.getDefault()),
                     Optional.empty());
         }
@@ -347,7 +234,7 @@ public PrestoOrcFormatWriter(File targetFile, List<String> columnNames, List<Typ
                 throws IOException
         {
             writer = new OrcWriter(
-                    OutputStreamOrcDataSink.create(HDFS_FILE_SYSTEM_FACTORY.create(SESSION).newOutputFile(targetFile.getAbsolutePath())),
+                    OutputStreamOrcDataSink.create(new LocalOutputFile(targetFile)),
                     columnNames,
                     types,
                     OrcType.createRootOrcType(columnNames, types),
@@ -405,47 +292,4 @@ public void close()
             writer.close();
         }
     }
-
-    private static class RecordFormatWriter
-            implements FormatWriter
-    {
-        private final RecordFileWriter recordWriter;
-
-        public RecordFormatWriter(
-                File targetFile,
-                List<String> columnNames,
-                List<Type> columnTypes,
-                HiveCompressionCodec compressionCodec,
-                HiveStorageFormat format,
-                ConnectorSession session)
-        {
-            JobConf config = new JobConf(AbstractFileFormat.conf);
-            configureCompression(config, compressionCodec);
-
-            recordWriter = new RecordFileWriter(
-                    new Path(targetFile.toURI()),
-                    columnNames,
-                    fromHiveStorageFormat(format),
-                    createSchema(format, columnNames, columnTypes),
-                    format.getEstimatedWriterMemoryUsage(),
-                    config,
-                    TESTING_TYPE_MANAGER,
-                    UTC,
-                    session);
-        }
-
-        @Override
-        public void writePage(Page page)
-        {
-            for (int position = 0; position < page.getPositionCount(); position++) {
-                recordWriter.appendRow(page, position);
-            }
-        }
-
-        @Override
-        public void close()
-        {
-            recordWriter.commit();
-        }
-    }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/TestHiveFileFormatBenchmark.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/TestHiveFileFormatBenchmark.java
index 71d383d94794..82f1292ff4cf 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/TestHiveFileFormatBenchmark.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/benchmark/TestHiveFileFormatBenchmark.java
@@ -16,14 +16,13 @@
 import io.trino.plugin.hive.HiveCompressionCodec;
 import io.trino.plugin.hive.benchmark.BenchmarkHiveFileFormat.CompressionCounter;
 import io.trino.plugin.hive.benchmark.BenchmarkHiveFileFormat.DataSet;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
 import static io.trino.plugin.hive.HiveCompressionCodec.SNAPPY;
-import static io.trino.plugin.hive.benchmark.BenchmarkFileFormat.HIVE_RCBINARY;
-import static io.trino.plugin.hive.benchmark.BenchmarkFileFormat.TRINO_OPTIMIZED_PARQUET;
 import static io.trino.plugin.hive.benchmark.BenchmarkFileFormat.TRINO_ORC;
+import static io.trino.plugin.hive.benchmark.BenchmarkFileFormat.TRINO_PARQUET;
 import static io.trino.plugin.hive.benchmark.BenchmarkFileFormat.TRINO_RCBINARY;
 import static io.trino.plugin.hive.benchmark.BenchmarkHiveFileFormat.DataSet.LARGE_MAP_VARCHAR_DOUBLE;
 import static io.trino.plugin.hive.benchmark.BenchmarkHiveFileFormat.DataSet.LINEITEM;
@@ -37,14 +36,11 @@ public void testSomeFormats()
     {
         executeBenchmark(LINEITEM, SNAPPY, TRINO_RCBINARY);
         executeBenchmark(LINEITEM, SNAPPY, TRINO_ORC);
-        executeBenchmark(LINEITEM, SNAPPY, HIVE_RCBINARY);
-        executeBenchmark(LINEITEM, SNAPPY, TRINO_OPTIMIZED_PARQUET);
+        executeBenchmark(LINEITEM, SNAPPY, TRINO_PARQUET);
         executeBenchmark(MAP_VARCHAR_DOUBLE, SNAPPY, TRINO_RCBINARY);
         executeBenchmark(MAP_VARCHAR_DOUBLE, SNAPPY, TRINO_ORC);
-        executeBenchmark(MAP_VARCHAR_DOUBLE, SNAPPY, HIVE_RCBINARY);
         executeBenchmark(LARGE_MAP_VARCHAR_DOUBLE, SNAPPY, TRINO_RCBINARY);
         executeBenchmark(LARGE_MAP_VARCHAR_DOUBLE, SNAPPY, TRINO_ORC);
-        executeBenchmark(LARGE_MAP_VARCHAR_DOUBLE, SNAPPY, HIVE_RCBINARY);
     }
 
     @Test
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/coercions/TestDateCoercer.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/coercions/TestDateCoercer.java
new file mode 100644
index 000000000000..dc791aa9f047
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/coercions/TestDateCoercer.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.coercions;
+
+import io.trino.plugin.hive.coercions.CoercionUtils.CoercionContext;
+import io.trino.spi.block.Block;
+import io.trino.spi.type.DateType;
+import io.trino.spi.type.Type;
+import org.testng.annotations.Test;
+
+import java.time.LocalDate;
+
+import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.plugin.hive.HiveTimestampPrecision.NANOSECONDS;
+import static io.trino.plugin.hive.HiveType.toHiveType;
+import static io.trino.plugin.hive.coercions.CoercionUtils.createCoercer;
+import static io.trino.spi.predicate.Utils.blockToNativeValue;
+import static io.trino.spi.predicate.Utils.nativeValueToBlock;
+import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestDateCoercer
+{
+    @Test
+    public void testValidVarcharToDate()
+    {
+        assertVarcharToDateCoercion(createUnboundedVarcharType(), "+10000-04-13");
+        assertVarcharToDateCoercion(createUnboundedVarcharType(), "1900-01-01");
+        assertVarcharToDateCoercion(createUnboundedVarcharType(), "2000-01-01");
+        assertVarcharToDateCoercion(createUnboundedVarcharType(), "2023-03-12");
+    }
+
+    @Test
+    public void testThrowsExceptionWhenStringIsNotAValidDate()
+    {
+        // hive would return 2023-02-09
+        assertThatThrownBy(() -> assertVarcharToDateCoercion(createUnboundedVarcharType(), "2023-01-40", null))
+                .hasMessageMatching(".*Invalid date value.*is not a valid date.*");
+
+        // hive would return 2024-03-13
+        assertThatThrownBy(() -> assertVarcharToDateCoercion(createUnboundedVarcharType(), "2023-15-13", null))
+                .hasMessageMatching(".*Invalid date value.*is not a valid date.*");
+
+        // hive would return null
+        assertThatThrownBy(() -> assertVarcharToDateCoercion(createUnboundedVarcharType(), "invalidDate", null))
+                .hasMessageMatching(".*Invalid date value.*is not a valid date.*");
+    }
+
+    @Test
+    public void testThrowsExceptionWhenDateIsTooOld()
+    {
+        assertThatThrownBy(() -> assertVarcharToDateCoercion(createUnboundedVarcharType(), "1899-12-31", null))
+                .hasMessageMatching(".*Coercion on historical dates is not supported.*");
+    }
+
+    private void assertVarcharToDateCoercion(Type fromType, String date)
+    {
+        assertVarcharToDateCoercion(fromType, date, fromDateToEpochDate(date));
+    }
+
+    private void assertVarcharToDateCoercion(Type fromType, String date, Long expected)
+    {
+        Block coercedValue = createCoercer(TESTING_TYPE_MANAGER, toHiveType(fromType), toHiveType(DateType.DATE), new CoercionContext(NANOSECONDS, false)).orElseThrow()
+                .apply(nativeValueToBlock(fromType, utf8Slice(date)));
+        assertThat(blockToNativeValue(DateType.DATE, coercedValue))
+                .isEqualTo(expected);
+    }
+
+    private long fromDateToEpochDate(String dateString)
+    {
+        LocalDate date = LocalDate.parse(dateString);
+        return date.toEpochDay();
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/coercions/TestDecimalCoercers.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/coercions/TestDecimalCoercers.java
new file mode 100644
index 000000000000..dbd7b87cb697
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/coercions/TestDecimalCoercers.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.coercions;
+
+import io.trino.spi.block.Block;
+import io.trino.spi.type.DecimalParseResult;
+import io.trino.spi.type.Decimals;
+import io.trino.spi.type.Type;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static io.trino.plugin.hive.HiveTimestampPrecision.NANOSECONDS;
+import static io.trino.plugin.hive.HiveType.toHiveType;
+import static io.trino.plugin.hive.coercions.CoercionUtils.createCoercer;
+import static io.trino.spi.predicate.Utils.blockToNativeValue;
+import static io.trino.spi.predicate.Utils.nativeValueToBlock;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TinyintType.TINYINT;
+import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDecimalCoercers
+{
+    @Test(dataProvider = "dataProvider")
+    public void testDecimalToIntCoercion(String decimalString, Type coercedType, Object expectedValue)
+    {
+        DecimalParseResult parseResult = Decimals.parse(decimalString);
+
+        if (decimalString.length() > 19) {
+            assertThat(parseResult.getType().isShort()).isFalse();
+        }
+        else {
+            assertThat(parseResult.getType().isShort()).isTrue();
+        }
+        assertDecimalToIntCoercion(parseResult.getType(), parseResult.getObject(), coercedType, expectedValue);
+    }
+
+    @DataProvider
+    public static Object[][] dataProvider()
+    {
+        return new Object[][] {
+                {"12.120000000000000000", TINYINT, 12L},
+                {"-12.120000000000000000", TINYINT, -12L},
+                {"12.120", TINYINT, 12L},
+                {"-12.120", TINYINT, -12L},
+                {"141.120000000000000000", TINYINT, null},
+                {"-141.120", TINYINT, null},
+                {"130.120000000000000000", SMALLINT, 130L},
+                {"-130.120000000000000000", SMALLINT, -130L},
+                {"130.120", SMALLINT, 130L},
+                {"-130.120", SMALLINT, -130L},
+                {"66000.30120000000000000", SMALLINT, null},
+                {"-66000.120", SMALLINT, null},
+                {"33000.12000000000000000", INTEGER, 33000L},
+                {"-33000.12000000000000000", INTEGER, -33000L},
+                {"33000.120", INTEGER, 33000L},
+                {"-33000.120", INTEGER, -33000L},
+                {"3300000000.1200000000000", INTEGER, null},
+                {"3300000000.120", INTEGER, null},
+                {"3300000000.1200000000000", BIGINT, 3300000000L},
+                {"-3300000000.120000000000", BIGINT, -3300000000L},
+                {"3300000000.12", BIGINT, 3300000000L},
+                {"-3300000000.12", BIGINT, -3300000000L},
+                {"330000000000000000000.12000000000", BIGINT, null},
+                {"-330000000000000000000.12000000000", BIGINT, null},
+                {"3300000", INTEGER, 3300000L},
+        };
+    }
+
+    private void assertDecimalToIntCoercion(Type fromType, Object valueToBeCoerced, Type toType, Object expectedValue)
+    {
+        Block coercedValue = createCoercer(TESTING_TYPE_MANAGER, toHiveType(fromType), toHiveType(toType), new CoercionUtils.CoercionContext(NANOSECONDS, false)).orElseThrow()
+                .apply(nativeValueToBlock(fromType, valueToBeCoerced));
+        assertThat(blockToNativeValue(toType, coercedValue))
+                .isEqualTo(expectedValue);
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/coercions/TestDoubleToVarcharCoercions.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/coercions/TestDoubleToVarcharCoercions.java
new file mode 100644
index 000000000000..526c085e463e
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/coercions/TestDoubleToVarcharCoercions.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.coercions;
+
+import io.airlift.slice.Slices;
+import io.trino.plugin.hive.coercions.CoercionUtils.CoercionContext;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.type.Type;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.stream.Stream;
+
+import static io.trino.plugin.hive.HiveTimestampPrecision.DEFAULT_PRECISION;
+import static io.trino.plugin.hive.HiveType.toHiveType;
+import static io.trino.plugin.hive.coercions.CoercionUtils.createCoercer;
+import static io.trino.spi.predicate.Utils.blockToNativeValue;
+import static io.trino.spi.predicate.Utils.nativeValueToBlock;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.createVarcharType;
+import static io.trino.testing.DataProviders.cartesianProduct;
+import static io.trino.testing.DataProviders.toDataProvider;
+import static io.trino.testing.DataProviders.trueFalse;
+import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestDoubleToVarcharCoercions
+{
+    @Test(dataProvider = "doubleValues")
+    public void testDoubleToVarcharCoercions(Double doubleValue, boolean treatNaNAsNull)
+    {
+        assertCoercions(DOUBLE, doubleValue, createUnboundedVarcharType(), Slices.utf8Slice(doubleValue.toString()), treatNaNAsNull);
+    }
+
+    @Test(dataProvider = "doubleValues")
+    public void testDoubleSmallerVarcharCoercions(Double doubleValue, boolean treatNaNAsNull)
+    {
+        assertThatThrownBy(() -> assertCoercions(DOUBLE, doubleValue, createVarcharType(1), doubleValue.toString(), treatNaNAsNull))
+                .isInstanceOf(TrinoException.class)
+                .hasMessageContaining("Varchar representation of %s exceeds varchar(1) bounds", doubleValue);
+    }
+
+    @Test
+    public void testNaNToVarcharCoercions()
+    {
+        assertCoercions(DOUBLE, Double.NaN, createUnboundedVarcharType(), null, true);
+
+        assertCoercions(DOUBLE, Double.NaN, createUnboundedVarcharType(), Slices.utf8Slice("NaN"), false);
+        assertThatThrownBy(() -> assertCoercions(DOUBLE, Double.NaN, createVarcharType(1), "NaN", false))
+                .isInstanceOf(TrinoException.class)
+                .hasMessageContaining("Varchar representation of NaN exceeds varchar(1) bounds");
+    }
+
+    @DataProvider
+    public Object[][] doubleValues()
+    {
+        return cartesianProduct(
+                Stream.of(
+                        Double.NEGATIVE_INFINITY,
+                        Double.MIN_VALUE,
+                        Double.MAX_VALUE,
+                        Double.POSITIVE_INFINITY,
+                        Double.parseDouble("123456789.12345678"))
+                        .collect(toDataProvider()),
+                trueFalse());
+    }
+
+    public static void assertCoercions(Type fromType, Object valueToBeCoerced, Type toType, Object expectedValue, boolean treatNaNAsNull)
+    {
+        Block coercedValue = createCoercer(TESTING_TYPE_MANAGER, toHiveType(fromType), toHiveType(toType), new CoercionContext(DEFAULT_PRECISION, treatNaNAsNull)).orElseThrow()
+                .apply(nativeValueToBlock(fromType, valueToBeCoerced));
+        assertThat(blockToNativeValue(toType, coercedValue))
+                .isEqualTo(expectedValue);
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/coercions/TestTimestampCoercer.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/coercions/TestTimestampCoercer.java
new file mode 100644
index 000000000000..cb1872cc79e8
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/coercions/TestTimestampCoercer.java
@@ -0,0 +1,230 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.coercions;
+
+import io.trino.plugin.hive.HiveTimestampPrecision;
+import io.trino.plugin.hive.coercions.CoercionUtils.CoercionContext;
+import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.type.LongTimestamp;
+import io.trino.spi.type.SqlTimestamp;
+import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.VarcharType;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.time.LocalDateTime;
+
+import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.plugin.hive.HiveTimestampPrecision.MICROSECONDS;
+import static io.trino.plugin.hive.HiveTimestampPrecision.NANOSECONDS;
+import static io.trino.plugin.hive.HiveType.toHiveType;
+import static io.trino.plugin.hive.coercions.CoercionUtils.createCoercer;
+import static io.trino.spi.predicate.Utils.blockToNativeValue;
+import static io.trino.spi.predicate.Utils.nativeValueToBlock;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_PICOS;
+import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.createVarcharType;
+import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
+import static java.time.ZoneOffset.UTC;
+import static java.time.temporal.ChronoField.NANO_OF_SECOND;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestTimestampCoercer
+{
+    @Test(dataProvider = "timestampValuesProvider")
+    public void testTimestampToVarchar(String timestampValue, String hiveTimestampValue)
+    {
+        LocalDateTime localDateTime = LocalDateTime.parse(timestampValue);
+        SqlTimestamp timestamp = SqlTimestamp.fromSeconds(TIMESTAMP_PICOS.getPrecision(), localDateTime.toEpochSecond(UTC), localDateTime.get(NANO_OF_SECOND));
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, new LongTimestamp(timestamp.getEpochMicros(), timestamp.getPicosOfMicros()), createUnboundedVarcharType(), hiveTimestampValue);
+    }
+
+    @Test(dataProvider = "timestampValuesProvider")
+    public void testVarcharToShortTimestamp(String timestampValue, String hiveTimestampValue)
+    {
+        LocalDateTime localDateTime = LocalDateTime.parse(timestampValue);
+        SqlTimestamp timestamp = SqlTimestamp.fromSeconds(TIMESTAMP_MICROS.getPrecision(), localDateTime.toEpochSecond(UTC), localDateTime.get(NANO_OF_SECOND));
+        assertVarcharToShortTimestampCoercions(createUnboundedVarcharType(), utf8Slice(hiveTimestampValue), TIMESTAMP_MICROS, timestamp.getEpochMicros());
+    }
+
+    @Test(dataProvider = "timestampValuesProvider")
+    public void testVarcharToLongTimestamp(String timestampValue, String hiveTimestampValue)
+    {
+        LocalDateTime localDateTime = LocalDateTime.parse(timestampValue);
+        SqlTimestamp timestamp = SqlTimestamp.fromSeconds(TIMESTAMP_PICOS.getPrecision(), localDateTime.toEpochSecond(UTC), localDateTime.get(NANO_OF_SECOND));
+        assertVarcharToLongTimestampCoercions(createUnboundedVarcharType(), utf8Slice(hiveTimestampValue), TIMESTAMP_PICOS, new LongTimestamp(timestamp.getEpochMicros(), timestamp.getPicosOfMicros()));
+    }
+
+    @Test
+    public void testTimestampToSmallerVarchar()
+    {
+        LocalDateTime localDateTime = LocalDateTime.parse("2023-04-11T05:16:12.345678876");
+        SqlTimestamp timestamp = SqlTimestamp.fromSeconds(TIMESTAMP_PICOS.getPrecision(), localDateTime.toEpochSecond(UTC), localDateTime.get(NANO_OF_SECOND));
+        LongTimestamp longTimestamp = new LongTimestamp(timestamp.getEpochMicros(), timestamp.getPicosOfMicros());
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(1), "2");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(2), "20");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(3), "202");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(4), "2023");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(5), "2023-");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(6), "2023-0");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(7), "2023-04");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(8), "2023-04-");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(9), "2023-04-1");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(10), "2023-04-11");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(11), "2023-04-11 ");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(12), "2023-04-11 0");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(13), "2023-04-11 05");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(14), "2023-04-11 05:");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(15), "2023-04-11 05:1");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(16), "2023-04-11 05:16");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(17), "2023-04-11 05:16:");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(18), "2023-04-11 05:16:1");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(19), "2023-04-11 05:16:12");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(20), "2023-04-11 05:16:12.");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(21), "2023-04-11 05:16:12.3");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(22), "2023-04-11 05:16:12.34");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(23), "2023-04-11 05:16:12.345");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(24), "2023-04-11 05:16:12.3456");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(25), "2023-04-11 05:16:12.34567");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(26), "2023-04-11 05:16:12.345678");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(27), "2023-04-11 05:16:12.3456788");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(28), "2023-04-11 05:16:12.34567887");
+        assertLongTimestampToVarcharCoercions(TIMESTAMP_PICOS, longTimestamp, createVarcharType(29), "2023-04-11 05:16:12.345678876");
+    }
+
+    @Test
+    public void testHistoricalLongTimestampToVarchar()
+    {
+        LocalDateTime localDateTime = LocalDateTime.parse("1899-12-31T23:59:59.999999999");
+        SqlTimestamp timestamp = SqlTimestamp.fromSeconds(TIMESTAMP_PICOS.getPrecision(), localDateTime.toEpochSecond(UTC), localDateTime.get(NANO_OF_SECOND));
+        assertThatThrownBy(() ->
+                assertLongTimestampToVarcharCoercions(
+                        TIMESTAMP_PICOS,
+                        new LongTimestamp(timestamp.getEpochMicros(), timestamp.getPicosOfMicros()),
+                        createUnboundedVarcharType(),
+                        "1899-12-31 23:59:59.999999999"))
+                .isInstanceOf(TrinoException.class)
+                .hasMessageContaining("Coercion on historical dates is not supported");
+    }
+
+    @Test(dataProvider = "invalidValue")
+    public void testInvalidVarcharToShortTimestamp(String invalidValue)
+    {
+        assertVarcharToShortTimestampCoercions(createUnboundedVarcharType(), utf8Slice(invalidValue), TIMESTAMP_MICROS, null);
+    }
+
+    @Test(dataProvider = "invalidValue")
+    public void testInvalidVarcharLongTimestamp(String invalidValue)
+    {
+        assertVarcharToLongTimestampCoercions(createUnboundedVarcharType(), utf8Slice(invalidValue), TIMESTAMP_MICROS, null);
+    }
+
+    @Test
+    public void testHistoricalVarcharToShortTimestamp()
+    {
+        LocalDateTime localDateTime = LocalDateTime.parse("1899-12-31T23:59:59.999999");
+        SqlTimestamp timestamp = SqlTimestamp.fromSeconds(TIMESTAMP_MICROS.getPrecision(), localDateTime.toEpochSecond(UTC), localDateTime.get(NANO_OF_SECOND));
+        assertThatThrownBy(() ->
+                assertVarcharToShortTimestampCoercions(
+                        createUnboundedVarcharType(),
+                        utf8Slice("1899-12-31 23:59:59.999999"),
+                        TIMESTAMP_MICROS,
+                        timestamp.getEpochMicros()))
+                .isInstanceOf(TrinoException.class)
+                .hasMessageContaining("Coercion on historical dates is not supported");
+    }
+
+    @Test
+    public void testHistoricalVarcharToLongTimestamp()
+    {
+        LocalDateTime localDateTime = LocalDateTime.parse("1899-12-31T23:59:59.999999");
+        SqlTimestamp timestamp = SqlTimestamp.fromSeconds(TIMESTAMP_PICOS.getPrecision(), localDateTime.toEpochSecond(UTC), localDateTime.get(NANO_OF_SECOND));
+        assertThatThrownBy(() -> assertVarcharToShortTimestampCoercions(
+                createUnboundedVarcharType(),
+                utf8Slice("1899-12-31 23:59:59.999999"),
+                TIMESTAMP_PICOS,
+                timestamp.getEpochMicros()))
+                .isInstanceOf(TrinoException.class)
+                .hasMessageContaining("Coercion on historical dates is not supported");
+    }
+
+    @DataProvider
+    public Object[][] timestampValuesProvider()
+    {
+        return new Object[][] {
+                // before epoch
+                {"1900-01-01T00:00:00.000", "1900-01-01 00:00:00"},
+                {"1958-01-01T13:18:03.123", "1958-01-01 13:18:03.123"},
+                // after epoch
+                {"2019-03-18T10:01:17.987", "2019-03-18 10:01:17.987"},
+                // time doubled in JVM zone
+                {"2018-10-28T01:33:17.456", "2018-10-28 01:33:17.456"},
+                // time doubled in JVM zone
+                {"2018-10-28T03:33:33.333", "2018-10-28 03:33:33.333"},
+                // epoch
+                {"1970-01-01T00:00:00.000", "1970-01-01 00:00:00"},
+                // time gap in JVM zone
+                {"1970-01-01T00:13:42.000", "1970-01-01 00:13:42"},
+                {"2018-04-01T02:13:55.123", "2018-04-01 02:13:55.123"},
+                // time gap in Vilnius
+                {"2018-03-25T03:17:17.000", "2018-03-25 03:17:17"},
+                // time gap in Kathmandu
+                {"1986-01-01T00:13:07.000", "1986-01-01 00:13:07"},
+                // before epoch with second fraction
+                {"1969-12-31T23:59:59.123456", "1969-12-31 23:59:59.123456"}
+        };
+    }
+
+    @DataProvider
+    public Object[][] invalidValue()
+    {
+        return new Object[][] {
+                {"Invalid timestamp"}, // Invalid string
+                {"2022"}, // Partial timestamp value
+                {"2001-04-01T00:13:42.000"}, // ISOFormat date
+                {"2001-14-01 00:13:42.000"}, // Invalid month
+                {"2001-01-32 00:13:42.000"}, // Invalid day
+                {"2001-04-01 23:59:60.000"}, // Invalid second
+                {"2001-04-01 23:60:01.000"}, // Invalid minute
+                {"2001-04-01 27:01:01.000"}, // Invalid hour
+        };
+    }
+
+    public static void assertLongTimestampToVarcharCoercions(TimestampType fromType, LongTimestamp valueToBeCoerced, VarcharType toType, String expectedValue)
+    {
+        assertCoercions(fromType, valueToBeCoerced, toType, utf8Slice(expectedValue), NANOSECONDS);
+    }
+
+    public static void assertVarcharToShortTimestampCoercions(Type fromType, Object valueToBeCoerced, Type toType, Object expectedValue)
+    {
+        assertCoercions(fromType, valueToBeCoerced, toType, expectedValue, MICROSECONDS);
+    }
+
+    public static void assertVarcharToLongTimestampCoercions(Type fromType, Object valueToBeCoerced, Type toType, Object expectedValue)
+    {
+        assertCoercions(fromType, valueToBeCoerced, toType, expectedValue, NANOSECONDS);
+    }
+
+    public static void assertCoercions(Type fromType, Object valueToBeCoerced, Type toType, Object expectedValue, HiveTimestampPrecision timestampPrecision)
+    {
+        Block coercedValue = createCoercer(TESTING_TYPE_MANAGER, toHiveType(fromType), toHiveType(toType), new CoercionContext(timestampPrecision, false)).orElseThrow()
+                .apply(nativeValueToBlock(fromType, valueToBeCoerced));
+        assertThat(blockToNativeValue(toType, coercedValue))
+                .isEqualTo(expectedValue);
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveHadoop.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveHadoop.java
index 6682ba610d68..7959030b8661 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveHadoop.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveHadoop.java
@@ -19,6 +19,7 @@
 import io.airlift.log.Logger;
 import io.trino.testing.TestingProperties;
 import io.trino.testing.containers.BaseTestContainer;
+import io.trino.testing.containers.PrintingLogConsumer;
 import org.testcontainers.containers.Network;
 
 import java.util.Map;
@@ -32,7 +33,6 @@ public class HiveHadoop
 {
     private static final Logger log = Logger.get(HiveHadoop.class);
 
-    public static final String DEFAULT_IMAGE = "ghcr.io/trinodb/testing/hdp2.6-hive:" + TestingProperties.getDockerImagesVersion();
     public static final String HIVE3_IMAGE = "ghcr.io/trinodb/testing/hdp3.1-hive:" + TestingProperties.getDockerImagesVersion();
 
     public static final String HOST_NAME = "hadoop-master";
@@ -103,7 +103,7 @@ public static class Builder
     {
         private Builder()
         {
-            this.image = DEFAULT_IMAGE;
+            this.image = HIVE3_IMAGE;
             this.hostName = HOST_NAME;
             this.exposePorts = ImmutableSet.of(HIVE_METASTORE_PORT);
         }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveMinioDataLake.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveMinioDataLake.java
index 15e7f0178450..2e8bba014380 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveMinioDataLake.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveMinioDataLake.java
@@ -51,7 +51,7 @@ public class HiveMinioDataLake
 
     public HiveMinioDataLake(String bucketName)
     {
-        this(bucketName, HiveHadoop.DEFAULT_IMAGE);
+        this(bucketName, HiveHadoop.HIVE3_IMAGE);
     }
 
     public HiveMinioDataLake(String bucketName, String hiveHadoopImage)
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/BaseCachingDirectoryListerTest.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/BaseCachingDirectoryListerTest.java
index 7e8a56710072..ee26f071ecc7 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/BaseCachingDirectoryListerTest.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/BaseCachingDirectoryListerTest.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.HiveQueryRunner;
 import io.trino.plugin.hive.metastore.PrincipalPrivileges;
 import io.trino.plugin.hive.metastore.Table;
@@ -33,7 +34,7 @@
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.trino.plugin.hive.HiveQueryRunner.TPCH_SCHEMA;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static java.lang.String.format;
 import static java.nio.file.Files.createTempDirectory;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -66,7 +67,7 @@ protected QueryRunner createQueryRunner(Map<String, String> properties)
 
     protected abstract C createDirectoryLister();
 
-    protected abstract boolean isCached(C directoryLister, org.apache.hadoop.fs.Path path);
+    protected abstract boolean isCached(C directoryLister, Location location);
 
     @Test
     public void testCacheInvalidationIsAppliedSpecificallyOnTheNonPartitionedTableBeingChanged()
@@ -75,14 +76,14 @@ public void testCacheInvalidationIsAppliedSpecificallyOnTheNonPartitionedTableBe
         assertUpdate("INSERT INTO partial_cache_invalidation_table1 VALUES (1), (2), (3)", 3);
         // The listing for the invalidate_non_partitioned_table1 should be in the directory cache after this call
         assertQuery("SELECT sum(col1) FROM partial_cache_invalidation_table1", "VALUES (6)");
-        org.apache.hadoop.fs.Path cachedTable1Location = getTableLocation(TPCH_SCHEMA, "partial_cache_invalidation_table1");
+        String cachedTable1Location = getTableLocation(TPCH_SCHEMA, "partial_cache_invalidation_table1");
         assertThat(isCached(cachedTable1Location)).isTrue();
 
         assertUpdate("CREATE TABLE partial_cache_invalidation_table2 (col1 int) WITH (format = 'ORC')");
         assertUpdate("INSERT INTO partial_cache_invalidation_table2 VALUES (11), (12)", 2);
         // The listing for the invalidate_non_partitioned_table2 should be in the directory cache after this call
         assertQuery("SELECT sum(col1) FROM partial_cache_invalidation_table2", "VALUES (23)");
-        org.apache.hadoop.fs.Path cachedTable2Location = getTableLocation(TPCH_SCHEMA, "partial_cache_invalidation_table2");
+        String cachedTable2Location = getTableLocation(TPCH_SCHEMA, "partial_cache_invalidation_table2");
         assertThat(isCached(cachedTable2Location)).isTrue();
 
         assertUpdate("INSERT INTO partial_cache_invalidation_table1 VALUES (4), (5)", 2);
@@ -104,14 +105,14 @@ public void testCacheInvalidationIsAppliedOnTheEntireCacheOnPartitionedTableDrop
         assertUpdate("INSERT INTO full_cache_invalidation_non_partitioned_table VALUES (1), (2), (3)", 3);
         // The listing for the invalidate_non_partitioned_table1 should be in the directory cache after this call
         assertQuery("SELECT sum(col1) FROM full_cache_invalidation_non_partitioned_table", "VALUES (6)");
-        org.apache.hadoop.fs.Path nonPartitionedTableLocation = getTableLocation(TPCH_SCHEMA, "full_cache_invalidation_non_partitioned_table");
+        String nonPartitionedTableLocation = getTableLocation(TPCH_SCHEMA, "full_cache_invalidation_non_partitioned_table");
         assertThat(isCached(nonPartitionedTableLocation)).isTrue();
 
         assertUpdate("CREATE TABLE full_cache_invalidation_partitioned_table (col1 int, col2 varchar) WITH (format = 'ORC', partitioned_by = ARRAY['col2'])");
         assertUpdate("INSERT INTO full_cache_invalidation_partitioned_table VALUES (1, 'group1'), (2, 'group1'), (3, 'group2'), (4, 'group2')", 4);
         assertQuery("SELECT col2, sum(col1) FROM full_cache_invalidation_partitioned_table GROUP BY col2", "VALUES ('group1', 3), ('group2', 7)");
-        org.apache.hadoop.fs.Path partitionedTableGroup1PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "full_cache_invalidation_partitioned_table", ImmutableList.of("group1"));
-        org.apache.hadoop.fs.Path partitionedTableGroup2PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "full_cache_invalidation_partitioned_table", ImmutableList.of("group2"));
+        String partitionedTableGroup1PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "full_cache_invalidation_partitioned_table", ImmutableList.of("group1"));
+        String partitionedTableGroup2PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "full_cache_invalidation_partitioned_table", ImmutableList.of("group2"));
         assertThat(isCached(partitionedTableGroup1PartitionLocation)).isTrue();
         assertThat(isCached(partitionedTableGroup2PartitionLocation)).isTrue();
 
@@ -139,14 +140,14 @@ public void testCacheInvalidationIsAppliedSpecificallyOnPartitionDropped()
         assertUpdate("INSERT INTO partition_path_cache_invalidation_non_partitioned_table VALUES (1), (2), (3)", 3);
         // The listing for the invalidate_non_partitioned_table1 should be in the directory cache after this call
         assertQuery("SELECT sum(col1) FROM partition_path_cache_invalidation_non_partitioned_table", "VALUES (6)");
-        org.apache.hadoop.fs.Path nonPartitionedTableLocation = getTableLocation(TPCH_SCHEMA, "partition_path_cache_invalidation_non_partitioned_table");
+        String nonPartitionedTableLocation = getTableLocation(TPCH_SCHEMA, "partition_path_cache_invalidation_non_partitioned_table");
         assertThat(isCached(nonPartitionedTableLocation)).isTrue();
 
         assertUpdate("CREATE TABLE partition_path_cache_invalidation_partitioned_table (col1 int, col2 varchar) WITH (format = 'ORC', partitioned_by = ARRAY['col2'])");
         assertUpdate("INSERT INTO partition_path_cache_invalidation_partitioned_table VALUES (1, 'group1'), (2, 'group1'), (3, 'group2'), (4, 'group2')", 4);
         assertQuery("SELECT col2, sum(col1) FROM partition_path_cache_invalidation_partitioned_table GROUP BY col2", "VALUES ('group1', 3), ('group2', 7)");
-        org.apache.hadoop.fs.Path partitionedTableGroup1PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "partition_path_cache_invalidation_partitioned_table", ImmutableList.of("group1"));
-        org.apache.hadoop.fs.Path partitionedTableGroup2PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "partition_path_cache_invalidation_partitioned_table", ImmutableList.of("group2"));
+        String partitionedTableGroup1PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "partition_path_cache_invalidation_partitioned_table", ImmutableList.of("group1"));
+        String partitionedTableGroup2PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "partition_path_cache_invalidation_partitioned_table", ImmutableList.of("group2"));
         assertThat(isCached(partitionedTableGroup1PartitionLocation)).isTrue();
         assertThat(isCached(partitionedTableGroup2PartitionLocation)).isTrue();
 
@@ -186,8 +187,8 @@ public void testInsertIntoPartitionedTable()
         assertUpdate("INSERT INTO insert_into_partitioned_table VALUES (1, 'group1'), (2, 'group1'), (3, 'group2'), (4, 'group2')", 4);
         // The listing for the table partitions should be in the directory cache after this call
         assertQuery("SELECT col2, sum(col1) FROM insert_into_partitioned_table GROUP BY col2", "VALUES ('group1', 3), ('group2', 7)");
-        org.apache.hadoop.fs.Path tableGroup1PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "insert_into_partitioned_table", ImmutableList.of("group1"));
-        org.apache.hadoop.fs.Path tableGroup2PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "insert_into_partitioned_table", ImmutableList.of("group2"));
+        String tableGroup1PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "insert_into_partitioned_table", ImmutableList.of("group1"));
+        String tableGroup2PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "insert_into_partitioned_table", ImmutableList.of("group2"));
         assertThat(isCached(tableGroup1PartitionLocation)).isTrue();
         assertThat(isCached(tableGroup2PartitionLocation)).isTrue();
 
@@ -207,9 +208,9 @@ public void testDropPartition()
         assertUpdate("INSERT INTO delete_from_partitioned_table VALUES (1, 'group1'), (2, 'group1'), (3, 'group2'), (4, 'group2'), (5, 'group3')", 5);
         // The listing for the table partitions should be in the directory cache after this call
         assertQuery("SELECT col2, sum(col1) FROM delete_from_partitioned_table GROUP BY col2", "VALUES ('group1', 3), ('group2', 7), ('group3', 5)");
-        org.apache.hadoop.fs.Path tableGroup1PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("group1"));
-        org.apache.hadoop.fs.Path tableGroup2PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("group2"));
-        org.apache.hadoop.fs.Path tableGroup3PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("group3"));
+        String tableGroup1PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("group1"));
+        String tableGroup2PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("group2"));
+        String tableGroup3PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("group3"));
         assertThat(isCached(tableGroup1PartitionLocation)).isTrue();
         assertThat(isCached(tableGroup2PartitionLocation)).isTrue();
         assertUpdate("DELETE FROM delete_from_partitioned_table WHERE col2 = 'group1' OR col2 = 'group2'");
@@ -229,10 +230,10 @@ public void testDropMultiLevelPartition()
         assertUpdate("INSERT INTO delete_from_partitioned_table VALUES (1000, DATE '2022-02-01', 'US'), (2000, DATE '2022-02-01', 'US'), (4000, DATE '2022-02-02', 'US'), (1500, DATE '2022-02-01', 'AT'), (2500, DATE '2022-02-02', 'AT')", 5);
         // The listing for the table partitions should be in the directory cache after this call
         assertQuery("SELECT day, country, sum(clicks) FROM delete_from_partitioned_table GROUP BY day, country", "VALUES (DATE '2022-02-01', 'US', 3000), (DATE '2022-02-02', 'US', 4000), (DATE '2022-02-01', 'AT', 1500), (DATE '2022-02-02', 'AT', 2500)");
-        org.apache.hadoop.fs.Path table20220201UsPartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("2022-02-01", "US"));
-        org.apache.hadoop.fs.Path table20220202UsPartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("2022-02-02", "US"));
-        org.apache.hadoop.fs.Path table20220201AtPartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("2022-02-01", "AT"));
-        org.apache.hadoop.fs.Path table20220202AtPartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("2022-02-02", "AT"));
+        String table20220201UsPartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("2022-02-01", "US"));
+        String table20220202UsPartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("2022-02-02", "US"));
+        String table20220201AtPartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("2022-02-01", "AT"));
+        String table20220202AtPartitionLocation = getPartitionLocation(TPCH_SCHEMA, "delete_from_partitioned_table", ImmutableList.of("2022-02-02", "AT"));
         assertThat(isCached(table20220201UsPartitionLocation)).isTrue();
         assertThat(isCached(table20220202UsPartitionLocation)).isTrue();
         assertThat(isCached(table20220201AtPartitionLocation)).isTrue();
@@ -258,13 +259,13 @@ public void testUnregisterRegisterPartition()
         assertUpdate("INSERT INTO register_unregister_partition_table VALUES (1, 'group1'), (2, 'group1'), (3, 'group2'), (4, 'group2')", 4);
         // The listing for the table partitions should be in the directory cache after this call
         assertQuery("SELECT col2, sum(col1) FROM register_unregister_partition_table GROUP BY col2", "VALUES ('group1', 3), ('group2', 7)");
-        org.apache.hadoop.fs.Path tableGroup1PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "register_unregister_partition_table", ImmutableList.of("group1"));
-        org.apache.hadoop.fs.Path tableGroup2PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "register_unregister_partition_table", ImmutableList.of("group2"));
+        String tableGroup1PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "register_unregister_partition_table", ImmutableList.of("group1"));
+        String tableGroup2PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "register_unregister_partition_table", ImmutableList.of("group2"));
         assertThat(isCached(tableGroup1PartitionLocation)).isTrue();
         assertThat(isCached(tableGroup2PartitionLocation)).isTrue();
 
         List<MaterializedRow> paths = getQueryRunner().execute(getSession(), "SELECT \"$path\" FROM register_unregister_partition_table WHERE col2 = 'group1' LIMIT 1").toTestTypes().getMaterializedRows();
-        String group1PartitionPath = new org.apache.hadoop.fs.Path((String) paths.get(0).getField(0)).getParent().toString();
+        String group1PartitionPath = Location.of((String) paths.get(0).getField(0)).parentDirectory().toString();
 
         assertUpdate(format("CALL system.unregister_partition('%s', '%s', ARRAY['col2'], ARRAY['group1'])", TPCH_SCHEMA, "register_unregister_partition_table"));
         // Unregistering the partition in the table should invalidate the cached listing of all the partitions belonging to the table.
@@ -290,7 +291,7 @@ public void testRenameTable()
         assertUpdate("INSERT INTO table_to_be_renamed VALUES (1), (2), (3)", 3);
         // The listing for the table should be in the directory cache after this call
         assertQuery("SELECT sum(col1) FROM table_to_be_renamed", "VALUES (6)");
-        org.apache.hadoop.fs.Path tableLocation = getTableLocation(TPCH_SCHEMA, "table_to_be_renamed");
+        String tableLocation = getTableLocation(TPCH_SCHEMA, "table_to_be_renamed");
         assertThat(isCached(tableLocation)).isTrue();
         assertUpdate("ALTER TABLE table_to_be_renamed RENAME TO table_renamed");
         // Altering the table should invalidate the cached listing of the files belonging to the table.
@@ -306,7 +307,7 @@ public void testDropTable()
         assertUpdate("INSERT INTO table_to_be_dropped VALUES (1), (2), (3)", 3);
         // The listing for the table should be in the directory cache after this call
         assertQuery("SELECT sum(col1) FROM table_to_be_dropped", "VALUES (6)");
-        org.apache.hadoop.fs.Path tableLocation = getTableLocation(TPCH_SCHEMA, "table_to_be_dropped");
+        String tableLocation = getTableLocation(TPCH_SCHEMA, "table_to_be_dropped");
         assertThat(isCached(tableLocation)).isTrue();
         assertUpdate("DROP TABLE table_to_be_dropped");
         // Dropping the table should invalidate the cached listing of the files belonging to the table.
@@ -320,9 +321,9 @@ public void testDropPartitionedTable()
         assertUpdate("INSERT INTO drop_partitioned_table VALUES (1, 'group1'), (2, 'group1'), (3, 'group2'), (4, 'group2'), (5, 'group3')", 5);
         // The listing for the table partitions should be in the directory cache after this call
         assertQuery("SELECT col2, sum(col1) FROM drop_partitioned_table GROUP BY col2", "VALUES ('group1', 3), ('group2', 7), ('group3', 5)");
-        org.apache.hadoop.fs.Path tableGroup1PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "drop_partitioned_table", ImmutableList.of("group1"));
-        org.apache.hadoop.fs.Path tableGroup2PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "drop_partitioned_table", ImmutableList.of("group2"));
-        org.apache.hadoop.fs.Path tableGroup3PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "drop_partitioned_table", ImmutableList.of("group3"));
+        String tableGroup1PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "drop_partitioned_table", ImmutableList.of("group1"));
+        String tableGroup2PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "drop_partitioned_table", ImmutableList.of("group2"));
+        String tableGroup3PartitionLocation = getPartitionLocation(TPCH_SCHEMA, "drop_partitioned_table", ImmutableList.of("group3"));
         assertThat(isCached(tableGroup1PartitionLocation)).isTrue();
         assertThat(isCached(tableGroup2PartitionLocation)).isTrue();
         assertThat(isCached(tableGroup3PartitionLocation)).isTrue();
@@ -347,27 +348,25 @@ protected void dropTable(String schemaName, String tableName, boolean deleteData
         fileHiveMetastore.dropTable(schemaName, tableName, deleteData);
     }
 
-    protected org.apache.hadoop.fs.Path getTableLocation(String schemaName, String tableName)
+    protected String getTableLocation(String schemaName, String tableName)
     {
         return getTable(schemaName, tableName)
                 .map(table -> table.getStorage().getLocation())
-                .map(tableLocation -> new org.apache.hadoop.fs.Path(tableLocation))
                 .orElseThrow(() -> new NoSuchElementException(format("The table %s.%s could not be found", schemaName, tableName)));
     }
 
-    protected org.apache.hadoop.fs.Path getPartitionLocation(String schemaName, String tableName, List<String> partitionValues)
+    protected String getPartitionLocation(String schemaName, String tableName, List<String> partitionValues)
     {
         Table table = getTable(schemaName, tableName)
                 .orElseThrow(() -> new NoSuchElementException(format("The table %s.%s could not be found", schemaName, tableName)));
 
         return fileHiveMetastore.getPartition(table, partitionValues)
                 .map(partition -> partition.getStorage().getLocation())
-                .map(partitionLocation -> new org.apache.hadoop.fs.Path(partitionLocation))
                 .orElseThrow(() -> new NoSuchElementException(format("The partition %s from the table %s.%s could not be found", partitionValues, schemaName, tableName)));
     }
 
-    protected boolean isCached(org.apache.hadoop.fs.Path path)
+    protected boolean isCached(String path)
     {
-        return isCached(directoryLister, path);
+        return isCached(directoryLister, Location.of(path));
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/FileSystemDirectoryLister.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/FileSystemDirectoryLister.java
index 1eeca57becb5..b89bf75fe7ab 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/FileSystemDirectoryLister.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/FileSystemDirectoryLister.java
@@ -13,11 +13,10 @@
  */
 package io.trino.plugin.hive.fs;
 
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.hive.metastore.Partition;
 import io.trino.plugin.hive.metastore.Table;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.RemoteIterator;
 
 import java.io.IOException;
 
@@ -25,17 +24,10 @@ public class FileSystemDirectoryLister
         implements DirectoryLister
 {
     @Override
-    public RemoteIterator<TrinoFileStatus> list(FileSystem fs, Table table, Path path)
+    public RemoteIterator<TrinoFileStatus> listFilesRecursively(TrinoFileSystem fs, Table table, Location location)
             throws IOException
     {
-        return new TrinoFileStatusRemoteIterator(fs.listLocatedStatus(path));
-    }
-
-    @Override
-    public RemoteIterator<TrinoFileStatus> listFilesRecursively(FileSystem fs, Table table, Path path)
-            throws IOException
-    {
-        return new TrinoFileStatusRemoteIterator(fs.listFiles(path, true));
+        return new TrinoFileStatusRemoteIterator(fs.listFiles(location));
     }
 
     @Override
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestCachingDirectoryLister.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestCachingDirectoryLister.java
index 7e54d253a06a..3d37a7e05fe5 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestCachingDirectoryLister.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestCachingDirectoryLister.java
@@ -13,12 +13,15 @@
  */
 package io.trino.plugin.hive.fs;
 
+import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
-import org.apache.hadoop.fs.Path;
+import io.trino.filesystem.Location;
 import org.testng.annotations.Test;
 
 import java.util.List;
 
+import static io.airlift.units.DataSize.Unit.MEGABYTE;
+
 // some tests may invalidate the whole cache affecting therefore other concurrent tests
 @Test(singleThreaded = true)
 public class TestCachingDirectoryLister
@@ -27,13 +30,13 @@ public class TestCachingDirectoryLister
     @Override
     protected CachingDirectoryLister createDirectoryLister()
     {
-        return new CachingDirectoryLister(Duration.valueOf("5m"), 1_000_000L, List.of("tpch.*"));
+        return new CachingDirectoryLister(Duration.valueOf("5m"), DataSize.of(1, MEGABYTE), List.of("tpch.*"));
     }
 
     @Override
-    protected boolean isCached(CachingDirectoryLister directoryLister, Path path)
+    protected boolean isCached(CachingDirectoryLister directoryLister, Location location)
     {
-        return directoryLister.isCached(path);
+        return directoryLister.isCached(location);
     }
 
     @Test
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestCachingDirectoryListerRecursiveFilesOnly.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestCachingDirectoryListerRecursiveFilesOnly.java
index 916de0b844ed..010b8330145c 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestCachingDirectoryListerRecursiveFilesOnly.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestCachingDirectoryListerRecursiveFilesOnly.java
@@ -15,16 +15,18 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.metastore.MetastoreUtil;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.testing.QueryRunner;
-import org.apache.hadoop.fs.Path;
 import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.plugin.hive.HiveQueryRunner.TPCH_SCHEMA;
 import static io.trino.plugin.hive.metastore.PrincipalPrivileges.NO_PRIVILEGES;
 import static java.lang.String.format;
@@ -39,7 +41,7 @@ public class TestCachingDirectoryListerRecursiveFilesOnly
     @Override
     protected CachingDirectoryLister createDirectoryLister()
     {
-        return new CachingDirectoryLister(Duration.valueOf("5m"), 1_000_000L, List.of("tpch.*"));
+        return new CachingDirectoryLister(Duration.valueOf("5m"), DataSize.of(1, MEGABYTE), List.of("tpch.*"));
     }
 
     @Override
@@ -52,9 +54,9 @@ protected QueryRunner createQueryRunner()
     }
 
     @Override
-    protected boolean isCached(CachingDirectoryLister directoryLister, Path path)
+    protected boolean isCached(CachingDirectoryLister directoryLister, Location location)
     {
-        return directoryLister.isCached(new DirectoryListingCacheKey(path, true));
+        return directoryLister.isCached(location);
     }
 
     @Test
@@ -78,7 +80,7 @@ public void testRecursiveDirectories()
         // Execute a query on the new table to pull the listing into the cache
         assertQuery("SELECT sum(clicks) FROM recursive_directories", "VALUES (11000)");
 
-        Path tableLocation = getTableLocation(TPCH_SCHEMA, "recursive_directories");
+        String tableLocation = getTableLocation(TPCH_SCHEMA, "recursive_directories");
         assertTrue(isCached(tableLocation));
 
         // Insert should invalidate cache, even at the root directory path
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestHiveFileIterator.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestHiveFileIterator.java
index 79d2dc9a65c2..d160c843b8c6 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestHiveFileIterator.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestHiveFileIterator.java
@@ -13,8 +13,8 @@
  */
 package io.trino.plugin.hive.fs;
 
-import org.apache.hadoop.fs.Path;
-import org.testng.annotations.Test;
+import io.trino.filesystem.Location;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.hive.fs.HiveFileIterator.containsHiddenPathPartAfterIndex;
 import static io.trino.plugin.hive.fs.HiveFileIterator.isHiddenFileOrDirectory;
@@ -27,20 +27,28 @@ public class TestHiveFileIterator
     @Test
     public void testRelativeHiddenPathDetection()
     {
-        String root = new Path("file:///root-path").toUri().getPath();
-        assertTrue(isHiddenOrWithinHiddenParentDirectory(new Path(root, ".hidden/child"), root));
-        assertTrue(isHiddenOrWithinHiddenParentDirectory(new Path(root, "_hidden.txt"), root));
-        String rootWithinHidden = new Path("file:///root/.hidden/listing-root").toUri().getPath();
-        assertFalse(isHiddenOrWithinHiddenParentDirectory(new Path(rootWithinHidden, "file.txt"), rootWithinHidden));
-        String rootHiddenEnding = new Path("file:///root/hidden-ending_").toUri().getPath();
-        assertFalse(isHiddenOrWithinHiddenParentDirectory(new Path(rootHiddenEnding, "file.txt"), rootHiddenEnding));
+        assertTrue(isHiddenOrWithinHiddenParentDirectory(Location.of("file:///root-path/.hidden/child"), Location.of("file:///root-path")));
+        assertTrue(isHiddenOrWithinHiddenParentDirectory(Location.of("file:///root-path/_hidden.txt"), Location.of("file:///root-path")));
+
+        // root path with trailing slash
+        assertTrue(isHiddenOrWithinHiddenParentDirectory(Location.of("file:///root-path/.hidden/child"), Location.of("file:///root-path/")));
+        assertTrue(isHiddenOrWithinHiddenParentDirectory(Location.of("file:///root-path/_hidden.txt"), Location.of("file:///root-path/")));
+
+        // root path containing .hidden
+        assertFalse(isHiddenOrWithinHiddenParentDirectory(Location.of("file:///root/.hidden/listing-root/file.txt"), Location.of("file:///root/.hidden/listing-root")));
+
+        // root path ending with an underscore
+        assertFalse(isHiddenOrWithinHiddenParentDirectory(Location.of("file:///root/hidden-ending_/file.txt"), Location.of("file:///root/hidden-ending_")));
+
+        // root path containing "arbitrary" characters
+        assertFalse(isHiddenOrWithinHiddenParentDirectory(Location.of("file:///root/With spaces and | pipes/.hidden/file.txt"), Location.of("file:///root/With spaces and | pipes/.hidden")));
     }
 
     @Test
     public void testHiddenFileNameDetection()
     {
-        assertFalse(isHiddenFileOrDirectory(new Path("file:///parent/.hidden/ignore-parent-directories.txt")));
-        assertTrue(isHiddenFileOrDirectory(new Path("file:///parent/visible/_hidden-file.txt")));
+        assertFalse(isHiddenFileOrDirectory(Location.of("file:///parent/.hidden/ignore-parent-directories.txt")));
+        assertTrue(isHiddenFileOrDirectory(Location.of("file:///parent/visible/_hidden-file.txt")));
     }
 
     @Test
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestTransactionScopeCachingDirectoryLister.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestTransactionScopeCachingDirectoryLister.java
index c7bc749e599f..a67bb89bf514 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestTransactionScopeCachingDirectoryLister.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/fs/TestTransactionScopeCachingDirectoryLister.java
@@ -15,6 +15,9 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.airlift.units.DataSize;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.hive.HiveBucketProperty;
 import io.trino.plugin.hive.HiveType;
 import io.trino.plugin.hive.metastore.Column;
@@ -23,9 +26,6 @@
 import io.trino.plugin.hive.metastore.Storage;
 import io.trino.plugin.hive.metastore.StorageFormat;
 import io.trino.plugin.hive.metastore.Table;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.RemoteIterator;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
@@ -35,6 +35,7 @@
 import java.util.Optional;
 import java.util.OptionalLong;
 
+import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.plugin.hive.util.HiveBucketing.BucketingVersion.BUCKETING_V1;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -71,44 +72,46 @@ public class TestTransactionScopeCachingDirectoryLister
     @Override
     protected TransactionScopeCachingDirectoryLister createDirectoryLister()
     {
-        return new TransactionScopeCachingDirectoryLister(new FileSystemDirectoryLister(), 1_000_000L);
+        return (TransactionScopeCachingDirectoryLister) new TransactionScopeCachingDirectoryListerFactory(DataSize.of(1, MEGABYTE), Optional.empty()).get(new FileSystemDirectoryLister());
     }
 
     @Override
-    protected boolean isCached(TransactionScopeCachingDirectoryLister directoryLister, Path path)
+    protected boolean isCached(TransactionScopeCachingDirectoryLister directoryLister, Location location)
     {
-        return directoryLister.isCached(path);
+        return directoryLister.isCached(location);
     }
 
     @Test
     public void testConcurrentDirectoryListing()
             throws IOException
     {
-        TrinoFileStatus firstFile = new TrinoFileStatus(ImmutableList.of(), new org.apache.hadoop.fs.Path("x"), false, 1, 1);
-        TrinoFileStatus secondFile = new TrinoFileStatus(ImmutableList.of(), new org.apache.hadoop.fs.Path("y"), false, 1, 1);
-        TrinoFileStatus thirdFile = new TrinoFileStatus(ImmutableList.of(), new org.apache.hadoop.fs.Path("z"), false, 1, 1);
+        TrinoFileStatus firstFile = new TrinoFileStatus(ImmutableList.of(), "file:/x/x", false, 1, 1);
+        TrinoFileStatus secondFile = new TrinoFileStatus(ImmutableList.of(), "file:/x/y", false, 1, 1);
+        TrinoFileStatus thirdFile = new TrinoFileStatus(ImmutableList.of(), "file:/y/z", false, 1, 1);
 
-        org.apache.hadoop.fs.Path path1 = new org.apache.hadoop.fs.Path("x");
-        org.apache.hadoop.fs.Path path2 = new org.apache.hadoop.fs.Path("y");
+        Location path1 = Location.of("file:/x");
+        Location path2 = Location.of("file:/y");
 
         CountingDirectoryLister countingLister = new CountingDirectoryLister(
                 ImmutableMap.of(
                         path1, ImmutableList.of(firstFile, secondFile),
                         path2, ImmutableList.of(thirdFile)));
 
-        TransactionScopeCachingDirectoryLister cachingLister = new TransactionScopeCachingDirectoryLister(countingLister, 2);
+        // Set concurrencyLevel to 1 as EvictableCache with higher concurrencyLimit is not deterministic
+        // due to Token being a key in segmented cache.
+        TransactionScopeCachingDirectoryLister cachingLister = (TransactionScopeCachingDirectoryLister) new TransactionScopeCachingDirectoryListerFactory(DataSize.ofBytes(500), Optional.of(1)).get(countingLister);
 
-        assertFiles(cachingLister.list(null, TABLE, path2), ImmutableList.of(thirdFile));
+        assertFiles(new DirectoryListingFilter(path2, (cachingLister.listFilesRecursively(null, TABLE, path2)), true), ImmutableList.of(thirdFile));
         assertThat(countingLister.getListCount()).isEqualTo(1);
 
         // listing path2 again shouldn't increase listing count
         assertThat(cachingLister.isCached(path2)).isTrue();
-        assertFiles(cachingLister.list(null, TABLE, path2), ImmutableList.of(thirdFile));
+        assertFiles(new DirectoryListingFilter(path2, cachingLister.listFilesRecursively(null, TABLE, path2), true), ImmutableList.of(thirdFile));
         assertThat(countingLister.getListCount()).isEqualTo(1);
 
         // start listing path1 concurrently
-        RemoteIterator<TrinoFileStatus> path1FilesA = cachingLister.list(null, TABLE, path1);
-        RemoteIterator<TrinoFileStatus> path1FilesB = cachingLister.list(null, TABLE, path1);
+        RemoteIterator<TrinoFileStatus> path1FilesA = new DirectoryListingFilter(path1, cachingLister.listFilesRecursively(null, TABLE, path1), true);
+        RemoteIterator<TrinoFileStatus> path1FilesB = new DirectoryListingFilter(path1, cachingLister.listFilesRecursively(null, TABLE, path1), true);
         assertThat(countingLister.getListCount()).isEqualTo(2);
 
         // list path1 files using both iterators concurrently
@@ -122,7 +125,7 @@ public void testConcurrentDirectoryListing()
 
         // listing path2 again should increase listing count because 2 files were cached for path1
         assertThat(cachingLister.isCached(path2)).isFalse();
-        assertFiles(cachingLister.list(null, TABLE, path2), ImmutableList.of(thirdFile));
+        assertFiles(new DirectoryListingFilter(path2, cachingLister.listFilesRecursively(null, TABLE, path2), true), ImmutableList.of(thirdFile));
         assertThat(countingLister.getListCount()).isEqualTo(3);
     }
 
@@ -130,16 +133,16 @@ public void testConcurrentDirectoryListing()
     public void testConcurrentDirectoryListingException()
             throws IOException
     {
-        TrinoFileStatus file = new TrinoFileStatus(ImmutableList.of(), new org.apache.hadoop.fs.Path("x"), false, 1, 1);
-        org.apache.hadoop.fs.Path path = new org.apache.hadoop.fs.Path("x");
+        TrinoFileStatus file = new TrinoFileStatus(ImmutableList.of(), "file:/x/x", false, 1, 1);
+        Location path = Location.of("file:/x");
 
         CountingDirectoryLister countingLister = new CountingDirectoryLister(ImmutableMap.of(path, ImmutableList.of(file)));
-        DirectoryLister cachingLister = new TransactionScopeCachingDirectoryLister(countingLister, 1);
+        DirectoryLister cachingLister = new TransactionScopeCachingDirectoryListerFactory(DataSize.ofBytes(600), Optional.empty()).get(countingLister);
 
         // start listing path concurrently
         countingLister.setThrowException(true);
-        RemoteIterator<TrinoFileStatus> filesA = cachingLister.list(null, TABLE, path);
-        RemoteIterator<TrinoFileStatus> filesB = cachingLister.list(null, TABLE, path);
+        RemoteIterator<TrinoFileStatus> filesA = cachingLister.listFilesRecursively(null, TABLE, path);
+        RemoteIterator<TrinoFileStatus> filesB = cachingLister.listFilesRecursively(null, TABLE, path);
         assertThat(countingLister.getListCount()).isEqualTo(1);
 
         // listing should throw an exception
@@ -147,7 +150,7 @@ public void testConcurrentDirectoryListingException()
 
         // listing again should succeed
         countingLister.setThrowException(false);
-        assertFiles(cachingLister.list(null, TABLE, path), ImmutableList.of(file));
+        assertFiles(new DirectoryListingFilter(path, cachingLister.listFilesRecursively(null, TABLE, path), true), ImmutableList.of(file));
         assertThat(countingLister.getListCount()).isEqualTo(2);
 
         // listing using second concurrently initialized DirectoryLister should fail
@@ -167,29 +170,21 @@ private void assertFiles(RemoteIterator<TrinoFileStatus> iterator, List<TrinoFil
     private static class CountingDirectoryLister
             implements DirectoryLister
     {
-        private final Map<org.apache.hadoop.fs.Path, List<TrinoFileStatus>> fileStatuses;
+        private final Map<Location, List<TrinoFileStatus>> fileStatuses;
         private int listCount;
         private boolean throwException;
 
-        public CountingDirectoryLister(Map<org.apache.hadoop.fs.Path, List<TrinoFileStatus>> fileStatuses)
+        public CountingDirectoryLister(Map<Location, List<TrinoFileStatus>> fileStatuses)
         {
             this.fileStatuses = requireNonNull(fileStatuses, "fileStatuses is null");
         }
 
         @Override
-        public RemoteIterator<TrinoFileStatus> list(FileSystem fs, Table table, org.apache.hadoop.fs.Path path)
-                throws IOException
-        {
-            listCount++;
-            return throwingRemoteIterator(requireNonNull(fileStatuses.get(path)), throwException);
-        }
-
-        @Override
-        public RemoteIterator<TrinoFileStatus> listFilesRecursively(FileSystem fs, Table table, Path path)
-                throws IOException
+        public RemoteIterator<TrinoFileStatus> listFilesRecursively(TrinoFileSystem fs, Table table, Location location)
         {
             // No specific recursive files-only listing implementation
-            return list(fs, table, path);
+            listCount++;
+            return throwingRemoteIterator(requireNonNull(fileStatuses.get(location)), throwException);
         }
 
         public void setThrowException(boolean throwException)
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/gcs/TestHiveGcsConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/gcs/TestHiveGcsConfig.java
deleted file mode 100644
index 2f6cdad578dd..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/gcs/TestHiveGcsConfig.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.gcs;
-
-import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Map;
-
-import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
-import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
-import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
-
-public class TestHiveGcsConfig
-{
-    @Test
-    public void testDefaults()
-    {
-        assertRecordedDefaults(recordDefaults(HiveGcsConfig.class)
-                .setJsonKeyFilePath(null)
-                .setUseGcsAccessToken(false));
-    }
-
-    @Test
-    public void testExplicitPropertyMappings()
-            throws IOException
-    {
-        Path jsonKeyFile = Files.createTempFile(null, null);
-
-        Map<String, String> properties = ImmutableMap.<String, String>builder()
-                .put("hive.gcs.json-key-file-path", jsonKeyFile.toString())
-                .put("hive.gcs.use-access-token", "true")
-                .buildOrThrow();
-
-        HiveGcsConfig expected = new HiveGcsConfig()
-                .setJsonKeyFilePath(jsonKeyFile.toString())
-                .setUseGcsAccessToken(true);
-
-        assertFullMapping(properties, expected);
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/CountingAccessHiveMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/CountingAccessHiveMetastore.java
index 11d36053b434..b04b821270d3 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/CountingAccessHiveMetastore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/CountingAccessHiveMetastore.java
@@ -16,49 +16,66 @@
 import com.google.common.collect.ConcurrentHashMultiset;
 import com.google.common.collect.ImmutableMultiset;
 import com.google.common.collect.Multiset;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.plugin.hive.HiveColumnStatisticType;
 import io.trino.plugin.hive.HiveType;
 import io.trino.plugin.hive.PartitionStatistics;
 import io.trino.plugin.hive.acid.AcidTransaction;
 import io.trino.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
 
-import javax.annotation.concurrent.ThreadSafe;
-
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_ALL_TABLES;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_ALL_VIEWS;
+
 @ThreadSafe
 public class CountingAccessHiveMetastore
         implements HiveMetastore
 {
-    public enum Methods
+    public enum Method
     {
         CREATE_DATABASE,
+        DROP_DATABASE,
         CREATE_TABLE,
         GET_ALL_DATABASES,
         GET_DATABASE,
         GET_TABLE,
-        GET_TABLE_WITH_PARAMETER,
+        GET_ALL_TABLES,
+        GET_ALL_TABLES_FROM_DATABASE,
+        GET_TABLES_WITH_PARAMETER,
         GET_TABLE_STATISTICS,
+        GET_ALL_VIEWS,
+        GET_ALL_VIEWS_FROM_DATABASE,
+        UPDATE_TABLE_STATISTICS,
+        ADD_PARTITIONS,
+        GET_PARTITION_NAMES_BY_FILTER,
+        GET_PARTITIONS_BY_NAMES,
+        GET_PARTITION,
+        GET_PARTITION_STATISTICS,
+        UPDATE_PARTITION_STATISTICS,
         REPLACE_TABLE,
         DROP_TABLE,
     }
 
     private final HiveMetastore delegate;
-    private final ConcurrentHashMultiset<Methods> methodInvocations = ConcurrentHashMultiset.create();
+    private final ConcurrentHashMultiset<Method> methodInvocations = ConcurrentHashMultiset.create();
 
     public CountingAccessHiveMetastore(HiveMetastore delegate)
     {
         this.delegate = delegate;
     }
 
-    public Multiset<Methods> getMethodInvocations()
+    public Multiset<Method> getMethodInvocations()
     {
         return ImmutableMultiset.copyOf(methodInvocations);
     }
@@ -71,54 +88,67 @@ public void resetCounters()
     @Override
     public Optional<Table> getTable(String databaseName, String tableName)
     {
-        methodInvocations.add(Methods.GET_TABLE);
+        methodInvocations.add(Method.GET_TABLE);
         return delegate.getTable(databaseName, tableName);
     }
 
     @Override
     public Set<HiveColumnStatisticType> getSupportedColumnStatistics(Type type)
     {
-        throw new UnsupportedOperationException();
+        // No need to count that, since it's a pure local operation.
+        return delegate.getSupportedColumnStatistics(type);
     }
 
     @Override
     public List<String> getAllDatabases()
     {
-        methodInvocations.add(Methods.GET_ALL_DATABASES);
+        methodInvocations.add(Method.GET_ALL_DATABASES);
         return delegate.getAllDatabases();
     }
 
     @Override
     public Optional<Database> getDatabase(String databaseName)
     {
-        methodInvocations.add(Methods.GET_DATABASE);
+        methodInvocations.add(Method.GET_DATABASE);
         return delegate.getDatabase(databaseName);
     }
 
     @Override
     public List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue)
     {
-        methodInvocations.add(Methods.GET_TABLE_WITH_PARAMETER);
+        methodInvocations.add(Method.GET_TABLES_WITH_PARAMETER);
         return delegate.getTablesWithParameter(databaseName, parameterKey, parameterValue);
     }
 
     @Override
     public List<String> getAllViews(String databaseName)
     {
-        throw new UnsupportedOperationException();
+        methodInvocations.add(Method.GET_ALL_VIEWS_FROM_DATABASE);
+        return delegate.getAllViews(databaseName);
+    }
+
+    @Override
+    public Optional<List<SchemaTableName>> getAllViews()
+    {
+        Optional<List<SchemaTableName>> allViews = delegate.getAllViews();
+        if (allViews.isPresent()) {
+            methodInvocations.add(GET_ALL_VIEWS);
+        }
+        return allViews;
     }
 
     @Override
     public void createDatabase(Database database)
     {
-        methodInvocations.add(Methods.CREATE_DATABASE);
+        methodInvocations.add(Method.CREATE_DATABASE);
         delegate.createDatabase(database);
     }
 
     @Override
     public void dropDatabase(String databaseName, boolean deleteData)
     {
-        throw new UnsupportedOperationException();
+        methodInvocations.add(Method.DROP_DATABASE);
+        delegate.dropDatabase(databaseName, deleteData);
     }
 
     @Override
@@ -136,21 +166,21 @@ public void setDatabaseOwner(String databaseName, HivePrincipal principal)
     @Override
     public void createTable(Table table, PrincipalPrivileges principalPrivileges)
     {
-        methodInvocations.add(Methods.CREATE_TABLE);
+        methodInvocations.add(Method.CREATE_TABLE);
         delegate.createTable(table, principalPrivileges);
     }
 
     @Override
     public void dropTable(String databaseName, String tableName, boolean deleteData)
     {
-        methodInvocations.add(Methods.DROP_TABLE);
+        methodInvocations.add(Method.DROP_TABLE);
         delegate.dropTable(databaseName, tableName, deleteData);
     }
 
     @Override
     public void replaceTable(String databaseName, String tableName, Table newTable, PrincipalPrivileges principalPrivileges)
     {
-        methodInvocations.add(Methods.REPLACE_TABLE);
+        methodInvocations.add(Method.REPLACE_TABLE);
         delegate.replaceTable(databaseName, tableName, newTable, principalPrivileges);
     }
 
@@ -199,7 +229,8 @@ public void dropColumn(String databaseName, String tableName, String columnName)
     @Override
     public Optional<Partition> getPartition(Table table, List<String> partitionValues)
     {
-        throw new UnsupportedOperationException();
+        methodInvocations.add(Method.GET_PARTITION);
+        return delegate.getPartition(table, partitionValues);
     }
 
     @Override
@@ -208,19 +239,22 @@ public Optional<List<String>> getPartitionNamesByFilter(String databaseName,
             List<String> columnNames,
             TupleDomain<String> partitionKeysFilter)
     {
-        throw new UnsupportedOperationException();
+        methodInvocations.add(Method.GET_PARTITION_NAMES_BY_FILTER);
+        return delegate.getPartitionNamesByFilter(databaseName, tableName, columnNames, partitionKeysFilter);
     }
 
     @Override
     public Map<String, Optional<Partition>> getPartitionsByNames(Table table, List<String> partitionNames)
     {
-        throw new UnsupportedOperationException();
+        methodInvocations.add(Method.GET_PARTITIONS_BY_NAMES);
+        return delegate.getPartitionsByNames(table, partitionNames);
     }
 
     @Override
     public void addPartitions(String databaseName, String tableName, List<PartitionWithStatistics> partitions)
     {
-        throw new UnsupportedOperationException();
+        methodInvocations.add(Method.ADD_PARTITIONS);
+        delegate.addPartitions(databaseName, tableName, partitions);
     }
 
     @Override
@@ -298,14 +332,15 @@ public Set<HivePrivilegeInfo> listTablePrivileges(String databaseName, String ta
     @Override
     public PartitionStatistics getTableStatistics(Table table)
     {
-        methodInvocations.add(Methods.GET_TABLE_STATISTICS);
+        methodInvocations.add(Method.GET_TABLE_STATISTICS);
         return delegate.getTableStatistics(table);
     }
 
     @Override
     public Map<String, PartitionStatistics> getPartitionStatistics(Table table, List<Partition> partitions)
     {
-        throw new UnsupportedOperationException();
+        methodInvocations.add(Method.GET_PARTITION_STATISTICS);
+        return delegate.getPartitionStatistics(table, partitions);
     }
 
     @Override
@@ -314,17 +349,66 @@ public void updateTableStatistics(String databaseName,
             AcidTransaction transaction,
             Function<PartitionStatistics, PartitionStatistics> update)
     {
-        throw new UnsupportedOperationException();
+        methodInvocations.add(Method.UPDATE_TABLE_STATISTICS);
+        delegate.updateTableStatistics(databaseName, tableName, transaction, update);
     }
 
     @Override
     public void updatePartitionStatistics(Table table, Map<String, Function<PartitionStatistics, PartitionStatistics>> updates)
     {
-        throw new UnsupportedOperationException();
+        methodInvocations.add(Method.UPDATE_PARTITION_STATISTICS);
+        delegate.updatePartitionStatistics(table, updates);
     }
 
     @Override
     public List<String> getAllTables(String databaseName)
+    {
+        methodInvocations.add(Method.GET_ALL_TABLES_FROM_DATABASE);
+        return delegate.getAllTables(databaseName);
+    }
+
+    @Override
+    public Optional<List<SchemaTableName>> getAllTables()
+    {
+        Optional<List<SchemaTableName>> allTables = delegate.getAllTables();
+        if (allTables.isPresent()) {
+            methodInvocations.add(GET_ALL_TABLES);
+        }
+        return allTables;
+    }
+
+    @Override
+    public boolean functionExists(String databaseName, String functionName, String signatureToken)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName, String functionName)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void createFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void replaceFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void dropFunction(String databaseName, String functionName, String signatureToken)
     {
         throw new UnsupportedOperationException();
     }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/CountingAccessHiveMetastoreUtil.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/CountingAccessHiveMetastoreUtil.java
index c689bd17c545..46a8a8a969f6 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/CountingAccessHiveMetastoreUtil.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/CountingAccessHiveMetastoreUtil.java
@@ -14,18 +14,11 @@
 package io.trino.plugin.hive.metastore;
 
 import com.google.common.collect.Multiset;
-import com.google.common.collect.Sets;
 import io.trino.Session;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
 
-import java.util.List;
-import java.util.stream.Stream;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static java.lang.String.format;
-import static java.lang.String.join;
-import static org.testng.Assert.fail;
+import static io.trino.testing.MultisetAssertions.assertMultisetsEqual;
 
 public final class CountingAccessHiveMetastoreUtil
 {
@@ -40,27 +33,6 @@ public static void assertMetastoreInvocations(
     {
         metastore.resetCounters();
         queryRunner.execute(session, query);
-        Multiset<CountingAccessHiveMetastore.Methods> actualInvocations = metastore.getMethodInvocations();
-
-        if (expectedInvocations.equals(actualInvocations)) {
-            return;
-        }
-
-        List<String> mismatchReport = Sets.union(expectedInvocations.elementSet(), actualInvocations.elementSet()).stream()
-                .filter(key -> expectedInvocations.count(key) != actualInvocations.count(key))
-                .flatMap(key -> {
-                    int expectedCount = expectedInvocations.count(key);
-                    int actualCount = actualInvocations.count(key);
-                    if (actualCount < expectedCount) {
-                        return Stream.of(format("%s more occurrences of %s", expectedCount - actualCount, key));
-                    }
-                    if (actualCount > expectedCount) {
-                        return Stream.of(format("%s fewer occurrences of %s", actualCount - expectedCount, key));
-                    }
-                    return Stream.of();
-                })
-                .collect(toImmutableList());
-
-        fail("Expected: \n\t\t" + join(",\n\t\t", mismatchReport));
+        assertMultisetsEqual(metastore.getMethodInvocations(), expectedInvocations);
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestHiveMetastoreConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestHiveMetastoreConfig.java
index 8b0e9273c7f9..b987a50be317 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestHiveMetastoreConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestHiveMetastoreConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive.metastore;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestMetastoreTypeConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestMetastoreTypeConfig.java
index b37e62b63c24..5ab316fe7153 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestMetastoreTypeConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestMetastoreTypeConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive.metastore;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestMetastoreUtil.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestMetastoreUtil.java
index 6fa47eb8d48a..9b030dc31c02 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestMetastoreUtil.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestMetastoreUtil.java
@@ -27,7 +27,7 @@
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.predicate.ValueSet;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -152,7 +152,6 @@ public class TestMetastoreUtil
             .put("partition_columns.types", "string:string")
             .put("sdk1", "sdv1")
             .put("sdk2", "sdv2")
-            .put("serialization.ddl", "struct table_name { i64 col1, binary col2, string col3}")
             .put("serialization.lib", "com.facebook.hive.orc.OrcSerde")
             .buildOrThrow();
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestPrincipalPrivileges.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestPrincipalPrivileges.java
index 75598ba06c30..4ffacdc6efe1 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestPrincipalPrivileges.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestPrincipalPrivileges.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import io.trino.spi.security.PrincipalType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege.SELECT;
 import static org.testng.Assert.assertEquals;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestSemiTransactionalHiveMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestSemiTransactionalHiveMetastore.java
index df0a3f1b1a3b..63f1346c9726 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestSemiTransactionalHiveMetastore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestSemiTransactionalHiveMetastore.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.HiveBucketProperty;
 import io.trino.plugin.hive.HiveMetastoreClosure;
 import io.trino.plugin.hive.HiveType;
 import io.trino.plugin.hive.PartitionStatistics;
 import io.trino.plugin.hive.acid.AcidTransaction;
 import io.trino.plugin.hive.fs.FileSystemDirectoryLister;
-import org.apache.hadoop.fs.Path;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -35,7 +35,7 @@
 
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static io.trino.plugin.hive.HiveBasicStatistics.createEmptyStatistics;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.plugin.hive.acid.AcidOperation.INSERT;
 import static io.trino.plugin.hive.util.HiveBucketing.BucketingVersion.BUCKETING_V1;
 import static io.trino.testing.TestingConnectorSession.SESSION;
@@ -44,7 +44,6 @@
 import static org.testng.Assert.assertTrue;
 
 // countDownLatch field is shared between tests
-@Test(singleThreaded = true)
 public class TestSemiTransactionalHiveMetastore
 {
     private static final Column TABLE_COLUMN = new Column(
@@ -53,7 +52,7 @@ public class TestSemiTransactionalHiveMetastore
             Optional.of("comment"));
     private static final Storage TABLE_STORAGE = new Storage(
             StorageFormat.create("serde", "input", "output"),
-            Optional.of("location"),
+            Optional.of("/test"),
             Optional.of(new HiveBucketProperty(ImmutableList.of("column"), BUCKETING_V1, 10, ImmutableList.of(new SortingColumn("column", SortingColumn.Order.ASCENDING)))),
             true,
             ImmutableMap.of("param", "value2"));
@@ -79,7 +78,8 @@ public void testParallelPartitionDrops()
 
     private SemiTransactionalHiveMetastore getSemiTransactionalHiveMetastoreWithDropExecutor(Executor dropExecutor)
     {
-        return new SemiTransactionalHiveMetastore(HDFS_ENVIRONMENT,
+        return new SemiTransactionalHiveMetastore(
+                HDFS_FILE_SYSTEM_FACTORY,
                 new HiveMetastoreClosure(new TestingHiveMetastore()),
                 directExecutor(),
                 dropExecutor,
@@ -109,7 +109,7 @@ public void testParallelUpdateStatisticsOperations()
             IntStream.range(0, tablesToUpdate).forEach(i -> semiTransactionalHiveMetastore.finishChangingExistingTable(INSERT, SESSION,
                     "database",
                     "table_" + i,
-                    new Path("location"),
+                    Location.of(TABLE_STORAGE.getLocation()),
                     ImmutableList.of(),
                     PartitionStatistics.empty(),
                     false));
@@ -119,7 +119,8 @@ public void testParallelUpdateStatisticsOperations()
 
     private SemiTransactionalHiveMetastore getSemiTransactionalHiveMetastoreWithUpdateExecutor(Executor updateExecutor)
     {
-        return new SemiTransactionalHiveMetastore(HDFS_ENVIRONMENT,
+        return new SemiTransactionalHiveMetastore(
+                HDFS_FILE_SYSTEM_FACTORY,
                 new HiveMetastoreClosure(new TestingHiveMetastore()),
                 directExecutor(),
                 directExecutor(),
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestStorage.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestStorage.java
index 20b256113831..e5d2446d6721 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestStorage.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestStorage.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive.metastore;
 
 import io.airlift.json.JsonCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.json.JsonCodec.jsonCodec;
 import static org.testng.Assert.assertEquals;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/UnimplementedHiveMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/UnimplementedHiveMetastore.java
index af8d8288a357..fec6e2277a1a 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/UnimplementedHiveMetastore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/UnimplementedHiveMetastore.java
@@ -18,10 +18,13 @@
 import io.trino.plugin.hive.PartitionStatistics;
 import io.trino.plugin.hive.acid.AcidTransaction;
 import io.trino.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.LanguageFunction;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.type.Type;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -88,6 +91,12 @@ public List<String> getAllTables(String databaseName)
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllTables()
+    {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue)
     {
@@ -100,6 +109,12 @@ public List<String> getAllViews(String databaseName)
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllViews()
+    {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void createDatabase(Database database)
     {
@@ -282,4 +297,40 @@ public Set<RoleGrant> listRoleGrants(HivePrincipal principal)
     {
         throw new UnsupportedOperationException();
     }
+
+    @Override
+    public boolean functionExists(String databaseName, String functionName, String signatureToken)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Collection<LanguageFunction> getFunctions(String databaseName, String functionName)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void createFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void replaceFunction(String databaseName, String functionName, LanguageFunction function)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void dropFunction(String databaseName, String functionName, String signatureToken)
+    {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/alluxio/TestAlluxioHiveMetastoreConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/alluxio/TestAlluxioHiveMetastoreConfig.java
deleted file mode 100644
index 8b7c19ce79ea..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/alluxio/TestAlluxioHiveMetastoreConfig.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.metastore.alluxio;
-
-import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
-
-import java.util.Map;
-
-import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
-import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
-import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
-
-public class TestAlluxioHiveMetastoreConfig
-{
-    @Test
-    public void testDefaults()
-    {
-        assertRecordedDefaults(recordDefaults(AlluxioHiveMetastoreConfig.class)
-                .setMasterAddress(null));
-    }
-
-    @Test
-    public void testExplicitPropertyMapping()
-    {
-        Map<String, String> properties = ImmutableMap.of("hive.metastore.alluxio.master.address", "localhost:19998");
-
-        AlluxioHiveMetastoreConfig expected = new AlluxioHiveMetastoreConfig()
-                .setMasterAddress("localhost:19998");
-
-        assertFullMapping(properties, expected);
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/alluxio/TestProtoUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/alluxio/TestProtoUtils.java
deleted file mode 100644
index 4e0f842030bc..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/alluxio/TestProtoUtils.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.metastore.alluxio;
-
-import alluxio.grpc.table.Layout;
-import alluxio.shaded.client.com.google.protobuf.ByteString;
-import io.trino.plugin.hive.HiveBucketProperty;
-import io.trino.plugin.hive.HiveType;
-import io.trino.plugin.hive.metastore.Column;
-import io.trino.plugin.hive.metastore.Database;
-import io.trino.plugin.hive.metastore.Partition;
-import io.trino.plugin.hive.metastore.SortingColumn;
-import io.trino.plugin.hive.metastore.Storage;
-import io.trino.plugin.hive.metastore.StorageFormat;
-import io.trino.plugin.hive.metastore.Table;
-import io.trino.plugin.hive.util.HiveBucketing;
-import io.trino.spi.TrinoException;
-import org.testng.annotations.Test;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-public class TestProtoUtils
-{
-    @Test
-    public void testDatabaseNameLocation()
-    {
-        Database db = ProtoUtils.fromProto(TestingAlluxioMetastoreObjects.getTestingDatabase().build());
-        assertEquals(TestingAlluxioMetastoreObjects.DATABASE_NAME, db.getDatabaseName());
-        assertEquals("alluxio:///", db.getLocation().get());
-        // Intentionally leave location unset
-        alluxio.grpc.table.Database.Builder alluxioDb = TestingAlluxioMetastoreObjects.getTestingDatabase()
-                .clearLocation();
-        assertEquals(Optional.empty(), ProtoUtils.fromProto(alluxioDb.build()).getLocation());
-    }
-
-    @Test(expectedExceptions = TrinoException.class)
-    public void testTableMissingLayout()
-    {
-        ProtoUtils.fromProto(TestingAlluxioMetastoreObjects.getTestingTableInfo().clearLayout().build());
-    }
-
-    @Test(expectedExceptions = TrinoException.class)
-    public void testTableNonHiveLayout()
-    {
-        alluxio.grpc.table.TableInfo.Builder alluxioTable = alluxio.grpc.table.TableInfo.newBuilder()
-                .setLayout(TestingAlluxioMetastoreObjects.getTestingNonHiveLayout());
-        ProtoUtils.fromProto(alluxioTable.build());
-    }
-
-    @Test(expectedExceptions = IllegalArgumentException.class)
-    public void testTableBadLayoutBytes()
-    {
-        Layout.Builder alluxioLayout = TestingAlluxioMetastoreObjects.getTestingHiveLayout()
-                .setLayoutData(ByteString.copyFrom(new byte[] {'z', 'z', 'z'}));
-        alluxio.grpc.table.TableInfo.Builder alluxioTable = TestingAlluxioMetastoreObjects.getTestingTableInfo()
-                .setLayout(alluxioLayout);
-        ProtoUtils.fromProto(alluxioTable.build());
-    }
-
-    @Test
-    public void testTable()
-    {
-        alluxio.grpc.table.TableInfo.Builder table = TestingAlluxioMetastoreObjects.getTestingTableInfo();
-        alluxio.grpc.table.FieldSchema fieldSchema = TestingAlluxioMetastoreObjects.getTestingFieldSchema().build();
-        Table t = ProtoUtils.fromProto(table.build());
-        Column c = t.getColumn(TestingAlluxioMetastoreObjects.COLUMN_NAME).get();
-        assertEquals(table.getDbName(), t.getDatabaseName());
-        assertEquals(table.getTableName(), t.getTableName());
-        assertEquals(table.getOwner(), t.getOwner().orElse(null));
-        assertEquals(table.getType().toString(), t.getTableType());
-        assertEquals(0, t.getDataColumns().size());
-        assertEquals(1, t.getPartitionColumns().size());
-        assertEquals(table.getParametersMap(), t.getParameters());
-        assertEquals(Optional.empty(), t.getViewOriginalText());
-        assertEquals(Optional.empty(), t.getViewExpandedText());
-        assertEquals(fieldSchema.getName(), c.getName());
-        assertEquals(fieldSchema.getComment(), c.getComment().get());
-        assertEquals(fieldSchema.getType(), c.getType().toString());
-        Storage s = t.getStorage();
-        alluxio.grpc.table.layout.hive.Storage storage = TestingAlluxioMetastoreObjects.getTestingPartitionInfo().getStorage();
-        assertEquals(storage.getSkewed(), s.isSkewed());
-        assertEquals(ProtoUtils.fromProto(storage.getStorageFormat()), s.getStorageFormat());
-        assertEquals(storage.getLocation(), s.getLocation());
-        assertEquals(ProtoUtils.fromProto(table.getParametersMap(), storage.getBucketProperty()), s.getBucketProperty());
-        assertEquals(storage.getStorageFormat().getSerdelibParametersMap(), s.getSerdeParameters());
-    }
-
-    @Test
-    public void testSortingColumn()
-    {
-        alluxio.grpc.table.layout.hive.SortingColumn.Builder column = TestingAlluxioMetastoreObjects.getTestingSortingColumn();
-        SortingColumn c = ProtoUtils.fromProto(column.build());
-        assertEquals(column.getColumnName(), c.getColumnName());
-        assertEquals(SortingColumn.Order.valueOf(column.getOrder().toString()), c.getOrder());
-    }
-
-    @Test
-    public void testBucketProperty()
-    {
-        alluxio.grpc.table.layout.hive.HiveBucketProperty.Builder bucketProperty = TestingAlluxioMetastoreObjects.getTestingHiveBucketProperty();
-        Optional<HiveBucketProperty> bp = ProtoUtils.fromProto(TestingAlluxioMetastoreObjects.getTestingTableInfo().getParametersMap(), bucketProperty.build());
-        assertTrue(bp.isPresent());
-        assertEquals(Collections.singletonList(ProtoUtils.fromProto(TestingAlluxioMetastoreObjects.getTestingSortingColumn().build())),
-                bp.get().getSortedBy());
-        assertEquals(1, bp.get().getSortedBy().size());
-        assertEquals(bucketProperty.getBucketedByCount(), bp.get().getBucketCount());
-        assertEquals(HiveBucketing.BucketingVersion.BUCKETING_V1, bp.get().getBucketingVersion());
-    }
-
-    @Test
-    public void testBucketPropertyNoBuckets()
-    {
-        alluxio.grpc.table.layout.hive.HiveBucketProperty.Builder bucketProperty = TestingAlluxioMetastoreObjects.getTestingHiveBucketProperty();
-        bucketProperty.clearBucketCount();
-        Map<String, String> tableParameters = TestingAlluxioMetastoreObjects.getTestingTableInfo().getParametersMap();
-        Optional<HiveBucketProperty> bp = ProtoUtils.fromProto(tableParameters, bucketProperty.build());
-        assertFalse(bp.isPresent());
-
-        bucketProperty = TestingAlluxioMetastoreObjects.getTestingHiveBucketProperty();
-        bucketProperty.setBucketCount(0);
-        bp = ProtoUtils.fromProto(tableParameters, bucketProperty.build());
-        assertFalse(bp.isPresent());
-    }
-
-    @Test
-    public void testStorageFormat()
-    {
-        alluxio.grpc.table.layout.hive.StorageFormat.Builder storageFormat = TestingAlluxioMetastoreObjects.getTestingStorageFormat();
-        StorageFormat fmt = ProtoUtils.fromProto(storageFormat.build());
-        assertEquals(storageFormat.getSerde(), fmt.getSerde());
-        assertEquals(storageFormat.getInputFormat(), fmt.getInputFormat());
-        assertEquals(storageFormat.getOutputFormat(), fmt.getOutputFormat());
-    }
-
-    @Test
-    public void testColumn()
-    {
-        alluxio.grpc.table.FieldSchema.Builder fieldSchema = TestingAlluxioMetastoreObjects.getTestingFieldSchema();
-        Column column = ProtoUtils.fromProto(fieldSchema.build());
-        assertTrue(column.getComment().isPresent());
-        assertEquals(fieldSchema.getComment(), column.getComment().get());
-        assertEquals(fieldSchema.getName(), column.getName());
-        assertEquals(HiveType.valueOf(fieldSchema.getType()), column.getType());
-    }
-
-    @Test
-    public void testColumnNoComment()
-    {
-        alluxio.grpc.table.FieldSchema.Builder fieldSchema = TestingAlluxioMetastoreObjects.getTestingFieldSchema();
-        fieldSchema.clearComment();
-        Column column = ProtoUtils.fromProto(fieldSchema.build());
-        assertFalse(column.getComment().isPresent());
-        assertEquals(fieldSchema.getName(), column.getName());
-        assertEquals(HiveType.valueOf(fieldSchema.getType()), column.getType());
-    }
-
-    @Test
-    public void testPartition()
-    {
-        alluxio.grpc.table.layout.hive.PartitionInfo.Builder partitionInfo = TestingAlluxioMetastoreObjects.getTestingPartitionInfo();
-        Partition partition = ProtoUtils.fromProto(partitionInfo.build());
-        assertEquals(
-                partitionInfo.getDataColsList().stream().map(ProtoUtils::fromProto).collect(Collectors.toList()),
-                partition.getColumns());
-        assertEquals(partitionInfo.getDbName(), partition.getDatabaseName());
-        assertEquals(partitionInfo.getParametersMap(), partition.getParameters());
-        assertEquals(partitionInfo.getValuesList(), partition.getValues());
-        assertEquals(partitionInfo.getTableName(), partition.getTableName());
-
-        Storage s = partition.getStorage();
-        alluxio.grpc.table.layout.hive.Storage storage =
-                TestingAlluxioMetastoreObjects.getTestingPartitionInfo().getStorage();
-        assertEquals(storage.getSkewed(), s.isSkewed());
-        assertEquals(ProtoUtils.fromProto(storage.getStorageFormat()), s.getStorageFormat());
-        assertEquals(storage.getLocation(), s.getLocation());
-        assertEquals(ProtoUtils.fromProto(partitionInfo.getParametersMap(), storage.getBucketProperty()), s.getBucketProperty());
-        assertEquals(storage.getStorageFormat().getSerdelibParametersMap(), s.getSerdeParameters());
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/alluxio/TestingAlluxioMetastoreObjects.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/alluxio/TestingAlluxioMetastoreObjects.java
deleted file mode 100644
index 522bd16e7eee..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/alluxio/TestingAlluxioMetastoreObjects.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.metastore.alluxio;
-
-import alluxio.grpc.table.Database;
-import alluxio.grpc.table.FieldSchema;
-import alluxio.grpc.table.Layout;
-import alluxio.grpc.table.LayoutSpec;
-import alluxio.grpc.table.Partition;
-import alluxio.grpc.table.PartitionSpec;
-import alluxio.grpc.table.Schema;
-import alluxio.grpc.table.TableInfo;
-import alluxio.grpc.table.layout.hive.HiveBucketProperty;
-import alluxio.grpc.table.layout.hive.PartitionInfo;
-import alluxio.grpc.table.layout.hive.SortingColumn;
-import alluxio.grpc.table.layout.hive.Storage;
-import alluxio.grpc.table.layout.hive.StorageFormat;
-import alluxio.shaded.client.com.google.protobuf.ByteString;
-
-import static java.lang.String.format;
-
-public final class TestingAlluxioMetastoreObjects
-{
-    private TestingAlluxioMetastoreObjects() {}
-
-    public static final String DATABASE_NAME = "test_db";
-    public static final String OWNER_NAME = "test_owner";
-    public static final String COLUMN_NAME = "test_owner";
-    public static final String TABLE_NAME = "test_table";
-    public static final String LOCATION = "alluxio:///";
-    public static final String SPEC_NAME = "spec";
-
-    public static Database.Builder getTestingDatabase()
-    {
-        return alluxio.grpc.table.Database.newBuilder()
-                .setDbName(DATABASE_NAME)
-                .setDescription("test")
-                .setLocation(LOCATION);
-    }
-
-    public static FieldSchema.Builder getTestingFieldSchema()
-    {
-        return FieldSchema.newBuilder()
-                .setId(0)
-                .setName(COLUMN_NAME)
-                .setType("int")
-                .setComment("");
-    }
-
-    public static PartitionInfo.Builder getTestingPartitionInfo()
-    {
-        return PartitionInfo.newBuilder()
-                .setDbName(DATABASE_NAME)
-                .setTableName(TABLE_NAME)
-                .addValues("1")
-                .setPartitionName(format("%s=1", COLUMN_NAME))
-                .setStorage(getTestingStorage())
-                .addDataCols(getTestingFieldSchema());
-    }
-
-    public static Layout.Builder getTestingHiveLayout()
-    {
-        return Layout.newBuilder()
-                .setLayoutSpec(LayoutSpec.newBuilder().setSpec(SPEC_NAME).build())
-                .setLayoutData(getTestingPartitionInfo().build().toByteString())
-                .setLayoutType("hive");
-    }
-
-    public static Layout.Builder getTestingNonHiveLayout()
-    {
-        return Layout.newBuilder()
-                .setLayoutData(ByteString.EMPTY)
-                .setLayoutSpec(LayoutSpec.newBuilder().setSpec(SPEC_NAME).build())
-                .setLayoutType("not-hive");
-    }
-
-    public static TableInfo.Builder getTestingTableInfo()
-    {
-        return TableInfo.newBuilder()
-                .setLayout(getTestingHiveLayout())
-                .setTableName(TABLE_NAME)
-                .setOwner(OWNER_NAME)
-                .setType(TableInfo.TableType.IMPORTED)
-                // Single column partition, no data columns
-                .addPartitionCols(getTestingFieldSchema())
-                .setSchema(getTestingSchema())
-                .putParameters("table", "parameter");
-    }
-
-    public static Schema.Builder getTestingSchema()
-    {
-        return Schema.newBuilder()
-                .addCols(getTestingFieldSchema());
-    }
-
-    public static Storage.Builder getTestingStorage()
-    {
-        return Storage.newBuilder()
-                .setStorageFormat(getTestingStorageFormat())
-                .setLocation(LOCATION)
-                .setBucketProperty(getTestingHiveBucketProperty())
-                .setSkewed(false)
-                .putSerdeParameters("serde_param_key", "serde_param_value");
-    }
-
-    public static StorageFormat.Builder getTestingStorageFormat()
-    {
-        return StorageFormat.newBuilder()
-                .setSerde("serde")
-                .setInputFormat("TextFile")
-                .setOutputFormat("TextFile")
-                .putSerdelibParameters("serdelib_key", "serdelib_value");
-    }
-
-    public static HiveBucketProperty.Builder getTestingHiveBucketProperty()
-    {
-        return HiveBucketProperty.newBuilder()
-                .addBucketedBy(COLUMN_NAME)
-                .setBucketCount(1)
-                .addSortedBy(getTestingSortingColumn());
-    }
-
-    public static SortingColumn.Builder getTestingSortingColumn()
-    {
-        return SortingColumn.newBuilder()
-                .setColumnName(COLUMN_NAME)
-                .setOrder(SortingColumn.SortingOrder.ASCENDING);
-    }
-
-    public static Partition.Builder getTestingPartition()
-    {
-        return Partition.newBuilder()
-                .setBaseLayout(getTestingHiveLayout())
-                .setPartitionSpec(getTestingPartitionSpec());
-    }
-
-    public static PartitionSpec.Builder getTestingPartitionSpec()
-    {
-        return PartitionSpec.newBuilder()
-                .setSpec(SPEC_NAME);
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastore.java
index f78d0aba4b4a..f8486585c11c 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastore.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -23,22 +24,27 @@
 import io.trino.hive.thrift.metastore.ColumnStatisticsData;
 import io.trino.hive.thrift.metastore.ColumnStatisticsObj;
 import io.trino.hive.thrift.metastore.LongColumnStatsData;
+import io.trino.plugin.hive.HiveBasicStatistics;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.HiveMetastoreClosure;
 import io.trino.plugin.hive.PartitionStatistics;
 import io.trino.plugin.hive.metastore.Column;
+import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.HiveColumnStatistics;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.HivePrincipal;
 import io.trino.plugin.hive.metastore.Partition;
+import io.trino.plugin.hive.metastore.PrincipalPrivileges;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.plugin.hive.metastore.UnimplementedHiveMetastore;
+import io.trino.plugin.hive.metastore.cache.CachingHiveMetastore.CachingHiveMetastoreBuilder;
 import io.trino.plugin.hive.metastore.thrift.BridgingHiveMetastore;
 import io.trino.plugin.hive.metastore.thrift.MockThriftMetastoreClient;
 import io.trino.plugin.hive.metastore.thrift.ThriftHiveMetastore;
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastore;
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreClient;
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreStats;
+import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.TupleDomain;
@@ -77,10 +83,12 @@
 import static io.trino.plugin.hive.HiveType.HIVE_LONG;
 import static io.trino.plugin.hive.HiveType.HIVE_STRING;
 import static io.trino.plugin.hive.HiveType.toHiveType;
+import static io.trino.plugin.hive.TableType.VIRTUAL_VIEW;
 import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
 import static io.trino.plugin.hive.metastore.HiveColumnStatistics.createIntegerColumnStatistics;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.computePartitionKeyFilter;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.makePartitionName;
+import static io.trino.plugin.hive.metastore.StorageFormat.VIEW_STORAGE_FORMAT;
 import static io.trino.plugin.hive.metastore.StorageFormat.fromHiveStorageFormat;
 import static io.trino.plugin.hive.metastore.cache.CachingHiveMetastore.memoizeMetastore;
 import static io.trino.plugin.hive.metastore.cache.TestCachingHiveMetastore.PartitionCachingAssertions.assertThatCachingWithDisabledPartitionCache;
@@ -118,13 +126,16 @@ public class TestCachingHiveMetastore
     private static final Logger log = Logger.get(TestCachingHiveMetastore.class);
 
     private static final PartitionStatistics TEST_STATS = PartitionStatistics.builder()
+            .setBasicStatistics(new HiveBasicStatistics(OptionalLong.empty(), OptionalLong.of(2398040535435L), OptionalLong.empty(), OptionalLong.empty()))
             .setColumnStatistics(ImmutableMap.of(TEST_COLUMN, createIntegerColumnStatistics(OptionalLong.empty(), OptionalLong.empty(), OptionalLong.empty(), OptionalLong.empty())))
             .build();
+    private static final SchemaTableName TEST_SCHEMA_TABLE = new SchemaTableName(TEST_DATABASE, TEST_TABLE);
 
     private MockThriftMetastoreClient mockClient;
     private ListeningExecutorService executor;
+    private CachingHiveMetastoreBuilder metastoreBuilder;
     private CachingHiveMetastore metastore;
-    private CachingHiveMetastore statsCacheMetastore;
+    private CachingHiveMetastore statsOnlyCacheMetastore;
     private ThriftMetastoreStats stats;
 
     @BeforeMethod
@@ -133,7 +144,8 @@ public void setUp()
         mockClient = new MockThriftMetastoreClient();
         ThriftMetastore thriftHiveMetastore = createThriftHiveMetastore();
         executor = listeningDecorator(newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s")));
-        metastore = CachingHiveMetastore.builder()
+
+        metastoreBuilder = CachingHiveMetastore.builder()
                 .delegate(new BridgingHiveMetastore(thriftHiveMetastore))
                 .executor(executor)
                 .metadataCacheEnabled(true)
@@ -141,18 +153,15 @@ public void setUp()
                 .cacheTtl(new Duration(5, TimeUnit.MINUTES))
                 .refreshInterval(new Duration(1, TimeUnit.MINUTES))
                 .maximumSize(1000)
-                .partitionCacheEnabled(true)
-                .build();
-        statsCacheMetastore = CachingHiveMetastore.builder()
-                .delegate(new BridgingHiveMetastore(thriftHiveMetastore))
-                .executor(executor)
+                .cacheMissing(new CachingHiveMetastoreConfig().isCacheMissing())
+                .partitionCacheEnabled(true);
+
+        metastore = metastoreBuilder.build();
+        statsOnlyCacheMetastore = CachingHiveMetastore.builder(metastoreBuilder)
                 .metadataCacheEnabled(false)
                 .statsCacheEnabled(true) // only cache stats
-                .cacheTtl(new Duration(5, TimeUnit.MINUTES))
-                .refreshInterval(new Duration(1, TimeUnit.MINUTES))
-                .maximumSize(1000)
-                .partitionCacheEnabled(true)
                 .build();
+
         stats = ((ThriftHiveMetastore) thriftHiveMetastore).getStats();
     }
 
@@ -248,6 +257,27 @@ public void testGetAllTable()
         assertEquals(metastore.getTableNamesStats().getHitRate(), 1.0 / 3);
     }
 
+    @Test
+    public void testBatchGetAllTable()
+    {
+        assertEquals(mockClient.getAccessCount(), 0);
+        assertEquals(metastore.getAllTables(), Optional.of(ImmutableList.of(TEST_SCHEMA_TABLE)));
+        assertEquals(mockClient.getAccessCount(), 1);
+        assertEquals(metastore.getAllTables(), Optional.of(ImmutableList.of(TEST_SCHEMA_TABLE)));
+        assertEquals(mockClient.getAccessCount(), 1);
+        assertEquals(metastore.getAllTables(TEST_DATABASE), ImmutableList.of(TEST_TABLE));
+        assertEquals(mockClient.getAccessCount(), 2);
+        assertEquals(metastore.getAllTableNamesStats().getRequestCount(), 2);
+        assertEquals(metastore.getAllTableNamesStats().getHitRate(), .5);
+
+        metastore.flushCache();
+
+        assertEquals(metastore.getAllTables(), Optional.of(ImmutableList.of(TEST_SCHEMA_TABLE)));
+        assertEquals(mockClient.getAccessCount(), 3);
+        assertEquals(metastore.getAllTableNamesStats().getRequestCount(), 3);
+        assertEquals(metastore.getAllTableNamesStats().getHitRate(), 1. / 3);
+    }
+
     @Test
     public void testInvalidDbGetAllTAbles()
     {
@@ -545,6 +575,22 @@ public void testGetTableStatistics()
         assertThat(metastore.getTableStatistics(tableCol23).getColumnStatistics())
                 .containsEntry("col2", intColumnStats(2))
                 .containsEntry("col3", intColumnStats(3));
+
+        metastore.getTableStatistics(table); // ensure cached
+        assertEquals(mockClient.getAccessCount(), 5);
+        ColumnStatisticsData newStats = new ColumnStatisticsData();
+        newStats.setLongStats(new LongColumnStatsData(327843, 4324));
+        mockClient.mockColumnStats(TEST_DATABASE, TEST_TABLE, ImmutableMap.of(TEST_COLUMN, newStats));
+        metastore.invalidateTable(TEST_DATABASE, TEST_TABLE);
+        assertEquals(metastore.getTableStatistics(table), PartitionStatistics.builder()
+                .setBasicStatistics(TEST_STATS.getBasicStatistics())
+                .setColumnStatistics(ImmutableMap.of(TEST_COLUMN, createIntegerColumnStatistics(
+                        OptionalLong.empty(),
+                        OptionalLong.empty(),
+                        OptionalLong.of(newStats.getLongStats().getNumNulls()),
+                        OptionalLong.of(newStats.getLongStats().getNumDVs() - 1))))
+                .build());
+        assertEquals(mockClient.getAccessCount(), 6);
     }
 
     @Test
@@ -552,20 +598,20 @@ public void testGetTableStatisticsWithoutMetadataCache()
     {
         assertEquals(mockClient.getAccessCount(), 0);
 
-        Table table = statsCacheMetastore.getTable(TEST_DATABASE, TEST_TABLE).orElseThrow();
+        Table table = statsOnlyCacheMetastore.getTable(TEST_DATABASE, TEST_TABLE).orElseThrow();
         assertEquals(mockClient.getAccessCount(), 1);
 
-        assertEquals(statsCacheMetastore.getTableStatistics(table), TEST_STATS);
+        assertEquals(statsOnlyCacheMetastore.getTableStatistics(table), TEST_STATS);
         assertEquals(mockClient.getAccessCount(), 2);
 
-        assertEquals(statsCacheMetastore.getTableStatistics(table), TEST_STATS);
+        assertEquals(statsOnlyCacheMetastore.getTableStatistics(table), TEST_STATS);
         assertEquals(mockClient.getAccessCount(), 2);
 
-        assertEquals(statsCacheMetastore.getTableStatisticsStats().getRequestCount(), 2);
-        assertEquals(statsCacheMetastore.getTableStatisticsStats().getHitRate(), 0.5);
+        assertEquals(statsOnlyCacheMetastore.getTableStatisticsStats().getRequestCount(), 2);
+        assertEquals(statsOnlyCacheMetastore.getTableStatisticsStats().getHitRate(), 0.5);
 
-        assertEquals(statsCacheMetastore.getTableStats().getRequestCount(), 0);
-        assertEquals(statsCacheMetastore.getTableStats().getHitRate(), 1.0);
+        assertEquals(statsOnlyCacheMetastore.getTableStats().getRequestCount(), 0);
+        assertEquals(statsOnlyCacheMetastore.getTableStats().getHitRate(), 1.0);
     }
 
     @Test
@@ -720,26 +766,26 @@ public void testGetPartitionStatisticsWithoutMetadataCache()
     {
         assertEquals(mockClient.getAccessCount(), 0);
 
-        Table table = statsCacheMetastore.getTable(TEST_DATABASE, TEST_TABLE).orElseThrow();
+        Table table = statsOnlyCacheMetastore.getTable(TEST_DATABASE, TEST_TABLE).orElseThrow();
         assertEquals(mockClient.getAccessCount(), 1);
 
-        Partition partition = statsCacheMetastore.getPartition(table, TEST_PARTITION_VALUES1).orElseThrow();
+        Partition partition = statsOnlyCacheMetastore.getPartition(table, TEST_PARTITION_VALUES1).orElseThrow();
         assertEquals(mockClient.getAccessCount(), 2);
 
-        assertEquals(statsCacheMetastore.getPartitionStatistics(table, ImmutableList.of(partition)), ImmutableMap.of(TEST_PARTITION1, TEST_STATS));
+        assertEquals(statsOnlyCacheMetastore.getPartitionStatistics(table, ImmutableList.of(partition)), ImmutableMap.of(TEST_PARTITION1, TEST_STATS));
         assertEquals(mockClient.getAccessCount(), 3);
 
-        assertEquals(statsCacheMetastore.getPartitionStatistics(table, ImmutableList.of(partition)), ImmutableMap.of(TEST_PARTITION1, TEST_STATS));
+        assertEquals(statsOnlyCacheMetastore.getPartitionStatistics(table, ImmutableList.of(partition)), ImmutableMap.of(TEST_PARTITION1, TEST_STATS));
         assertEquals(mockClient.getAccessCount(), 3);
 
-        assertEquals(statsCacheMetastore.getPartitionStatisticsStats().getRequestCount(), 2);
-        assertEquals(statsCacheMetastore.getPartitionStatisticsStats().getHitRate(), 1.0 / 2);
+        assertEquals(statsOnlyCacheMetastore.getPartitionStatisticsStats().getRequestCount(), 2);
+        assertEquals(statsOnlyCacheMetastore.getPartitionStatisticsStats().getHitRate(), 1.0 / 2);
 
-        assertEquals(statsCacheMetastore.getTableStats().getRequestCount(), 0);
-        assertEquals(statsCacheMetastore.getTableStats().getHitRate(), 1.0);
+        assertEquals(statsOnlyCacheMetastore.getTableStats().getRequestCount(), 0);
+        assertEquals(statsOnlyCacheMetastore.getTableStats().getHitRate(), 1.0);
 
-        assertEquals(statsCacheMetastore.getPartitionStats().getRequestCount(), 0);
-        assertEquals(statsCacheMetastore.getPartitionStats().getHitRate(), 1.0);
+        assertEquals(statsOnlyCacheMetastore.getPartitionStats().getRequestCount(), 0);
+        assertEquals(statsOnlyCacheMetastore.getPartitionStats().getHitRate(), 1.0);
     }
 
     @Test
@@ -812,6 +858,7 @@ private CachingHiveMetastore createMetastore(MockThriftMetastoreClient mockClien
                 .cacheTtl(new Duration(5, TimeUnit.MINUTES))
                 .refreshInterval(new Duration(1, TimeUnit.MINUTES))
                 .maximumSize(1000)
+                .cacheMissing(new CachingHiveMetastoreConfig().isCacheMissing())
                 .partitionCacheEnabled(true)
                 .build();
     }
@@ -861,6 +908,45 @@ public void testNoCacheExceptions()
         assertEquals(mockClient.getAccessCount(), 2);
     }
 
+    @Test
+    public void testNoCacheMissing()
+    {
+        CachingHiveMetastore metastore = CachingHiveMetastore.builder(metastoreBuilder)
+                .cacheMissing(false)
+                .build();
+
+        mockClient.setReturnTable(false);
+        assertEquals(mockClient.getAccessCount(), 0);
+
+        // First access
+        assertThat(metastore.getTable(TEST_DATABASE, TEST_TABLE)).isEmpty();
+        assertEquals(mockClient.getAccessCount(), 1);
+
+        // Second access, second load
+        assertThat(metastore.getTable(TEST_DATABASE, TEST_TABLE)).isEmpty();
+        assertEquals(mockClient.getAccessCount(), 2);
+
+        // Table get be accessed once it exists
+        mockClient.setReturnTable(true);
+        assertThat(metastore.getTable(TEST_DATABASE, TEST_TABLE)).isPresent();
+        assertEquals(mockClient.getAccessCount(), 3);
+
+        // Table existence is cached
+        mockClient.setReturnTable(true);
+        assertThat(metastore.getTable(TEST_DATABASE, TEST_TABLE)).isPresent();
+        assertEquals(mockClient.getAccessCount(), 3);
+
+        // Table is returned even if no longer exists
+        mockClient.setReturnTable(false);
+        assertThat(metastore.getTable(TEST_DATABASE, TEST_TABLE)).isPresent();
+        assertEquals(mockClient.getAccessCount(), 3);
+
+        // After cache invalidation, table absence is apparent
+        metastore.invalidateTable(TEST_DATABASE, TEST_TABLE);
+        assertThat(metastore.getTable(TEST_DATABASE, TEST_TABLE)).isEmpty();
+        assertEquals(mockClient.getAccessCount(), 4);
+    }
+
     @Test
     public void testCachingHiveMetastoreCreationWithTtlOnly()
     {
@@ -975,6 +1061,7 @@ public Map<String, Optional<Partition>> getPartitionsByNames(Table table, List<S
                 .cacheTtl(new Duration(5, TimeUnit.MINUTES))
                 .refreshInterval(new Duration(1, TimeUnit.MINUTES))
                 .maximumSize(1000)
+                .cacheMissing(new CachingHiveMetastoreConfig().isCacheMissing())
                 .partitionCacheEnabled(true)
                 .build();
 
@@ -1046,7 +1133,7 @@ public Map<String, Optional<Partition>> getPartitionsByNames(Table table, List<S
             getPartitionsByNamesFinishedLatch.countDown();
 
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
         }
     }
 
@@ -1076,6 +1163,70 @@ public void testDropTable()
         assertEquals(mockClient.getAccessCount(), 5);
     }
 
+    @Test
+    public void testAllDatabases()
+    {
+        assertThat(mockClient.getAccessCount()).isEqualTo(0);
+
+        assertThat(metastore.getAllDatabases()).containsExactly(TEST_DATABASE);
+        assertThat(mockClient.getAccessCount()).isEqualTo(1);
+        assertThat(metastore.getAllDatabases()).containsExactly(TEST_DATABASE);
+        assertThat(mockClient.getAccessCount()).isEqualTo(1); // should read it from cache
+
+        metastore.dropDatabase(TEST_DATABASE, false);
+
+        assertThat(metastore.getAllDatabases()).containsExactly(TEST_DATABASE);
+        assertThat(mockClient.getAccessCount()).isEqualTo(2);
+        assertThat(metastore.getAllDatabases()).containsExactly(TEST_DATABASE);
+        assertThat(mockClient.getAccessCount()).isEqualTo(2); // should read it from cache
+
+        metastore.createDatabase(
+                Database.builder()
+                        .setDatabaseName(TEST_DATABASE)
+                        .setOwnerName(Optional.empty())
+                        .setOwnerType(Optional.empty())
+                        .build());
+
+        assertThat(metastore.getAllDatabases()).containsExactly(TEST_DATABASE);
+        assertThat(mockClient.getAccessCount()).isEqualTo(3);
+        assertThat(metastore.getAllDatabases()).containsExactly(TEST_DATABASE);
+        assertThat(mockClient.getAccessCount()).isEqualTo(3); // should read it from cache
+    }
+
+    @Test
+    public void testAllTables()
+    {
+        assertThat(mockClient.getAccessCount()).isEqualTo(0);
+
+        assertThat(metastore.getAllTables()).contains(ImmutableList.of(TEST_SCHEMA_TABLE));
+        assertThat(mockClient.getAccessCount()).isEqualTo(1);
+        assertThat(metastore.getAllTables()).contains(ImmutableList.of(TEST_SCHEMA_TABLE));
+        assertThat(mockClient.getAccessCount()).isEqualTo(1); // should read it from cache
+
+        metastore.dropTable(TEST_DATABASE, TEST_TABLE, false);
+        assertThat(mockClient.getAccessCount()).isEqualTo(2); // dropTable check if the table exists
+
+        assertThat(metastore.getAllTables()).contains(ImmutableList.of(TEST_SCHEMA_TABLE));
+        assertThat(mockClient.getAccessCount()).isEqualTo(3);
+        assertThat(metastore.getAllTables()).contains(ImmutableList.of(TEST_SCHEMA_TABLE));
+        assertThat(mockClient.getAccessCount()).isEqualTo(3); // should read it from cache
+
+        metastore.createTable(
+                Table.builder()
+                        .setDatabaseName(TEST_DATABASE)
+                        .setTableName(TEST_TABLE)
+                        .setOwner(Optional.empty())
+                        .setTableType(VIRTUAL_VIEW.name())
+                        .withStorage(storage -> storage.setStorageFormat(VIEW_STORAGE_FORMAT))
+                        .build(),
+                new PrincipalPrivileges(ImmutableMultimap.of(), ImmutableMultimap.of()));
+
+        assertThat(metastore.getAllTables()).contains(ImmutableList.of(TEST_SCHEMA_TABLE));
+        assertThat(mockClient.getAccessCount()).isEqualTo(4);
+        assertThat(metastore.getAllTables()).contains(ImmutableList.of(TEST_SCHEMA_TABLE));
+        assertThat(mockClient.getAccessCount()).isEqualTo(4); // should read it from cache
+    }
+
     private static HiveColumnStatistics intColumnStats(int nullsCount)
     {
         return createIntegerColumnStatistics(OptionalLong.empty(), OptionalLong.empty(), OptionalLong.of(nullsCount), OptionalLong.empty());
@@ -1115,6 +1266,7 @@ private PartitionCachingAssertions()
                     .cacheTtl(new Duration(5, TimeUnit.MINUTES))
                     .refreshInterval(new Duration(1, TimeUnit.MINUTES))
                     .maximumSize(1000)
+                    .cacheMissing(true)
                     .partitionCacheEnabled(false)
                     .build();
         }
@@ -1167,6 +1319,7 @@ private CachingHiveMetastore createMetastoreWithDirectExecutor(CachingHiveMetast
                 .cacheTtl(config.getMetastoreCacheTtl())
                 .refreshInterval(config.getMetastoreRefreshInterval())
                 .maximumSize(config.getMetastoreCacheMaximumSize())
+                .cacheMissing(config.isCacheMissing())
                 .partitionCacheEnabled(config.isPartitionCacheEnabled())
                 .build();
     }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastoreConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastoreConfig.java
index f511866fc75d..05df0080aca3 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastoreConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastoreConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -35,6 +35,7 @@ public void testDefaults()
                 .setMetastoreRefreshInterval(null)
                 .setMetastoreCacheMaximumSize(10000)
                 .setMaxMetastoreRefreshThreads(10)
+                .setCacheMissing(true)
                 .setPartitionCacheEnabled(true));
     }
 
@@ -48,6 +49,7 @@ public void testExplicitPropertyMappings()
                 .put("hive.metastore-cache-maximum-size", "5000")
                 .put("hive.metastore-refresh-max-threads", "2500")
                 .put("hive.metastore-cache.cache-partitions", "false")
+                .put("hive.metastore-cache.cache-missing", "false")
                 .buildOrThrow();
 
         CachingHiveMetastoreConfig expected = new CachingHiveMetastoreConfig()
@@ -56,6 +58,7 @@ public void testExplicitPropertyMappings()
                 .setMetastoreRefreshInterval(new Duration(30, TimeUnit.MINUTES))
                 .setMetastoreCacheMaximumSize(5000)
                 .setMaxMetastoreRefreshThreads(2500)
+                .setCacheMissing(false)
                 .setPartitionCacheEnabled(false);
 
         assertFullMapping(properties, expected);
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastoreWithQueryRunner.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastoreWithQueryRunner.java
index 87fb02ac7462..a5d520820803 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastoreWithQueryRunner.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastoreWithQueryRunner.java
@@ -35,7 +35,7 @@
 import static com.google.common.collect.Lists.cartesianProduct;
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.spi.security.SelectedRole.Type.ROLE;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.nio.file.Files.createTempDirectory;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestImpersonationCachingConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestImpersonationCachingConfig.java
index 3180a1a474c3..63edc9a23e1e 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestImpersonationCachingConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestImpersonationCachingConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestReentrantBoundedExecutor.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestReentrantBoundedExecutor.java
index 0aa76b6782c4..02a7d61b1824 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestReentrantBoundedExecutor.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestReentrantBoundedExecutor.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive.metastore.cache;
 
 import com.google.common.util.concurrent.SettableFuture;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/file/TestFileHiveMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/file/TestFileHiveMetastore.java
new file mode 100644
index 000000000000..5d3062eca37c
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/file/TestFileHiveMetastore.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.metastore.file;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.hive.NodeVersion;
+import io.trino.plugin.hive.metastore.Column;
+import io.trino.plugin.hive.metastore.Database;
+import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
+import io.trino.plugin.hive.metastore.StorageFormat;
+import io.trino.plugin.hive.metastore.Table;
+import org.apache.hadoop.hive.metastore.TableType;
+import org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat;
+import org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import static com.google.common.io.MoreFiles.deleteRecursively;
+import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+import static io.trino.plugin.hive.HiveType.HIVE_INT;
+import static io.trino.plugin.hive.metastore.PrincipalPrivileges.NO_PRIVILEGES;
+import static io.trino.plugin.hive.util.HiveClassNames.HUDI_PARQUET_INPUT_FORMAT;
+import static io.trino.spi.security.PrincipalType.USER;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static java.nio.file.Files.createTempDirectory;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestFileHiveMetastore
+{
+    private Path tmpDir;
+    private FileHiveMetastore metastore;
+
+    @BeforeAll
+    public void setUp()
+            throws IOException
+    {
+        tmpDir = createTempDirectory(getClass().getSimpleName());
+
+        metastore = new FileHiveMetastore(
+                new NodeVersion("testversion"),
+                HDFS_FILE_SYSTEM_FACTORY,
+                new HiveMetastoreConfig().isHideDeltaLakeTables(),
+                new FileHiveMetastoreConfig()
+                        .setCatalogDirectory(tmpDir.toString())
+                        .setDisableLocationChecks(true)
+                /*.setMetastoreUser("test")*/);
+
+        metastore.createDatabase(Database.builder()
+                .setDatabaseName("default")
+                .setOwnerName(Optional.of("test"))
+                .setOwnerType(Optional.of(USER))
+                .build());
+    }
+
+    @AfterAll
+    public void tearDown()
+            throws IOException
+    {
+        deleteRecursively(tmpDir, ALLOW_INSECURE);
+        metastore = null;
+        tmpDir = null;
+    }
+
+    @Test
+    public void testPreserveHudiInputFormat()
+    {
+        StorageFormat storageFormat = StorageFormat.create(
+                ParquetHiveSerDe.class.getName(),
+                HUDI_PARQUET_INPUT_FORMAT,
+                MapredParquetOutputFormat.class.getName());
+
+        Table table = Table.builder()
+                .setDatabaseName("default")
+                .setTableName("some_table_name" + randomNameSuffix())
+                .setTableType(TableType.EXTERNAL_TABLE.name())
+                .setOwner(Optional.of("public"))
+                .addDataColumn(new Column("foo", HIVE_INT, Optional.empty()))
+                .setParameters(ImmutableMap.of("serialization.format", "1", "EXTERNAL", "TRUE"))
+                .withStorage(storageBuilder -> storageBuilder
+                        .setStorageFormat(storageFormat)
+                        .setLocation("file:///dev/null"))
+                .build();
+
+        metastore.createTable(table, NO_PRIVILEGES);
+
+        Table saved = metastore.getTable(table.getDatabaseName(), table.getTableName()).orElseThrow();
+
+        assertThat(saved.getStorage())
+                .isEqualTo(table.getStorage());
+
+        metastore.dropTable(table.getDatabaseName(), table.getTableName(), false);
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/file/TestFileHiveMetastoreConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/file/TestFileHiveMetastoreConfig.java
index 0846fc0e7b93..388aff29a391 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/file/TestFileHiveMetastoreConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/file/TestFileHiveMetastoreConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive.metastore.file;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -32,6 +32,7 @@ public void testDefaults()
         assertRecordedDefaults(recordDefaults(FileHiveMetastoreConfig.class)
                 .setCatalogDirectory(null)
                 .setVersionCompatibility(NOT_SUPPORTED)
+                .setDisableLocationChecks(false)
                 .setMetastoreUser("presto"));
     }
 
@@ -41,12 +42,14 @@ public void testExplicitPropertyMapping()
         Map<String, String> properties = ImmutableMap.<String, String>builder()
                 .put("hive.metastore.catalog.dir", "some path")
                 .put("hive.metastore.version-compatibility", "UNSAFE_ASSUME_COMPATIBILITY")
+                .put("hive.metastore.disable-location-checks", "true")
                 .put("hive.metastore.user", "some user")
                 .buildOrThrow();
 
         FileHiveMetastoreConfig expected = new FileHiveMetastoreConfig()
                 .setCatalogDirectory("some path")
                 .setVersionCompatibility(UNSAFE_ASSUME_COMPATIBILITY)
+                .setDisableLocationChecks(true)
                 .setMetastoreUser("some user");
 
         assertFullMapping(properties, expected);
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/file/TestingFileHiveMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/file/TestingFileHiveMetastore.java
new file mode 100644
index 000000000000..140e1adf9c1e
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/file/TestingFileHiveMetastore.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.metastore.file;
+
+import io.trino.plugin.hive.NodeVersion;
+import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
+
+import java.io.File;
+
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+
+public final class TestingFileHiveMetastore
+{
+    private TestingFileHiveMetastore() {}
+
+    public static FileHiveMetastore createTestingFileHiveMetastore(File catalogDirectory)
+    {
+        return new FileHiveMetastore(
+                new NodeVersion("testversion"),
+                HDFS_FILE_SYSTEM_FACTORY,
+                new HiveMetastoreConfig().isHideDeltaLakeTables(),
+                new FileHiveMetastoreConfig()
+                        .setCatalogDirectory(catalogDirectory.toURI().toString())
+                        .setMetastoreUser("test"));
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueExpressionUtil.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueExpressionUtil.java
index 70e7e9e1718b..375401e71c24 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueExpressionUtil.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueExpressionUtil.java
@@ -20,7 +20,7 @@
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.VarcharType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueHiveMetastoreConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueHiveMetastoreConfig.java
index a5c6a4472fa8..62dcdfd25dfe 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueHiveMetastoreConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueHiveMetastoreConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive.metastore.glue;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueInputConverter.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueInputConverter.java
index 9b812db8b8cc..ffe163f866b6 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueInputConverter.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueInputConverter.java
@@ -17,7 +17,10 @@
 import com.amazonaws.services.glue.model.PartitionInput;
 import com.amazonaws.services.glue.model.StorageDescriptor;
 import com.amazonaws.services.glue.model.TableInput;
+import com.amazonaws.services.glue.model.UserDefinedFunction;
+import com.amazonaws.services.glue.model.UserDefinedFunctionInput;
 import com.google.common.collect.ImmutableList;
+import io.airlift.slice.Slices;
 import io.trino.plugin.hive.HiveBucketProperty;
 import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.Database;
@@ -25,9 +28,14 @@
 import io.trino.plugin.hive.metastore.Storage;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.plugin.hive.metastore.glue.converter.GlueInputConverter;
-import org.testng.annotations.Test;
+import io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter;
+import io.trino.spi.function.LanguageFunction;
+import org.junit.jupiter.api.Test;
 
+import java.util.HexFormat;
 import java.util.List;
+import java.util.Optional;
+import java.util.Random;
 
 import static io.trino.plugin.hive.metastore.glue.TestingMetastoreObjects.getPrestoTestDatabase;
 import static io.trino.plugin.hive.metastore.glue.TestingMetastoreObjects.getPrestoTestPartition;
@@ -78,6 +86,30 @@ public void testConvertPartition()
         assertEquals(partitionInput.getValues(), testPartition.getValues());
     }
 
+    @Test
+    public void testConvertFunction()
+    {
+        // random data to avoid compression, but deterministic for size assertion
+        String sql = HexFormat.of().formatHex(Slices.random(2000, new Random(0)).getBytes());
+        LanguageFunction expected = new LanguageFunction("(integer,bigint,varchar)", sql, List.of(), Optional.of("owner"));
+
+        UserDefinedFunctionInput input = GlueInputConverter.convertFunction("test_name", expected);
+        assertEquals(input.getOwnerName(), expected.owner().orElseThrow());
+
+        UserDefinedFunction function = new UserDefinedFunction()
+                .withOwnerName(input.getOwnerName())
+                .withResourceUris(input.getResourceUris());
+        LanguageFunction actual = GlueToTrinoConverter.convertFunction(function);
+
+        assertEquals(input.getResourceUris().size(), 4);
+        assertEquals(actual, expected);
+
+        // verify that the owner comes from the metastore
+        function.setOwnerName("other");
+        actual = GlueToTrinoConverter.convertFunction(function);
+        assertEquals(actual.owner(), Optional.of("other"));
+    }
+
     private static void assertColumnList(List<com.amazonaws.services.glue.model.Column> actual, List<Column> expected)
     {
         if (expected == null) {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueToTrinoConverter.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueToTrinoConverter.java
index 93f2ac929eaf..a46a9568cdb6 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueToTrinoConverter.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueToTrinoConverter.java
@@ -25,8 +25,9 @@
 import io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter;
 import io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.GluePartitionConverter;
 import io.trino.spi.security.PrincipalType;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -41,12 +42,16 @@
 import static io.trino.plugin.hive.metastore.glue.TestingMetastoreObjects.getGlueTestPartition;
 import static io.trino.plugin.hive.metastore.glue.TestingMetastoreObjects.getGlueTestStorageDescriptor;
 import static io.trino.plugin.hive.metastore.glue.TestingMetastoreObjects.getGlueTestTable;
+import static io.trino.plugin.hive.metastore.glue.TestingMetastoreObjects.getGlueTestTrinoMaterializedView;
+import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getPartitionParameters;
+import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableParameters;
 import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableTypeNullable;
 import static io.trino.plugin.hive.util.HiveUtil.DELTA_LAKE_PROVIDER;
 import static io.trino.plugin.hive.util.HiveUtil.ICEBERG_TABLE_TYPE_NAME;
 import static io.trino.plugin.hive.util.HiveUtil.ICEBERG_TABLE_TYPE_VALUE;
 import static io.trino.plugin.hive.util.HiveUtil.SPARK_TABLE_PROVIDER_KEY;
 import static org.apache.hadoop.hive.metastore.TableType.EXTERNAL_TABLE;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNotSame;
@@ -54,7 +59,7 @@
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestGlueToTrinoConverter
 {
     private static final String PUBLIC_OWNER = "PUBLIC";
@@ -63,7 +68,7 @@ public class TestGlueToTrinoConverter
     private Table testTable;
     private Partition testPartition;
 
-    @BeforeMethod
+    @BeforeEach
     public void setup()
     {
         testDatabase = getGlueTestDatabase();
@@ -96,7 +101,7 @@ public void testConvertTable()
         assertEquals(trinoTable.getDatabaseName(), testDatabase.getName());
         assertEquals(trinoTable.getTableType(), getTableTypeNullable(testTable));
         assertEquals(trinoTable.getOwner().orElse(null), testTable.getOwner());
-        assertEquals(trinoTable.getParameters(), testTable.getParameters());
+        assertEquals(trinoTable.getParameters(), getTableParameters(testTable));
         assertColumnList(trinoTable.getDataColumns(), testTable.getStorageDescriptor().getColumns());
         assertColumnList(trinoTable.getPartitionColumns(), testTable.getPartitionKeys());
         assertStorage(trinoTable.getStorage(), testTable.getStorageDescriptor());
@@ -117,7 +122,7 @@ public void testConvertTableWithOpenCSVSerDe()
         assertEquals(trinoTable.getDatabaseName(), testDatabase.getName());
         assertEquals(trinoTable.getTableType(), getTableTypeNullable(glueTable));
         assertEquals(trinoTable.getOwner().orElse(null), glueTable.getOwner());
-        assertEquals(trinoTable.getParameters(), glueTable.getParameters());
+        assertEquals(trinoTable.getParameters(), getTableParameters(glueTable));
         assertEquals(trinoTable.getDataColumns().size(), 1);
         assertEquals(trinoTable.getDataColumns().get(0).getType(), HIVE_STRING);
 
@@ -162,7 +167,7 @@ public void testConvertPartition()
         assertColumnList(trinoPartition.getColumns(), testPartition.getStorageDescriptor().getColumns());
         assertEquals(trinoPartition.getValues(), testPartition.getValues());
         assertStorage(trinoPartition.getStorage(), testPartition.getStorageDescriptor());
-        assertEquals(trinoPartition.getParameters(), testPartition.getParameters());
+        assertEquals(trinoPartition.getParameters(), getPartitionParameters(testPartition));
     }
 
     @Test
@@ -259,6 +264,15 @@ public void testDeltaTableNonNullStorageDescriptor()
                         .collect(toImmutableSet()));
     }
 
+    @Test
+    public void testIcebergMaterializedViewNullStorageDescriptor()
+    {
+        Table testMaterializedView = getGlueTestTrinoMaterializedView(testDatabase.getName());
+        assertNull(testMaterializedView.getStorageDescriptor());
+        io.trino.plugin.hive.metastore.Table trinoTable = GlueToTrinoConverter.convertTable(testMaterializedView, testDatabase.getName());
+        assertEquals(trinoTable.getDataColumns().size(), 1);
+    }
+
     @Test
     public void testPartitionNullParameters()
     {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestHiveGlueMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestHiveGlueMetastore.java
index 9a05b1db007f..ad6cdd28cca5 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestHiveGlueMetastore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestHiveGlueMetastore.java
@@ -27,6 +27,7 @@
 import com.amazonaws.services.glue.model.UpdateTableRequest;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
@@ -42,6 +43,7 @@
 import io.trino.plugin.hive.metastore.glue.converter.GlueInputConverter;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
@@ -62,12 +64,10 @@
 import io.trino.spi.type.SmallintType;
 import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.TinyintType;
-import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -80,6 +80,7 @@
 import java.util.OptionalLong;
 import java.util.Set;
 import java.util.concurrent.Executor;
+import java.util.function.Supplier;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
@@ -89,9 +90,13 @@
 import static io.trino.plugin.hive.HiveColumnStatisticType.MIN_VALUE;
 import static io.trino.plugin.hive.HiveColumnStatisticType.NUMBER_OF_DISTINCT_VALUES;
 import static io.trino.plugin.hive.HiveColumnStatisticType.NUMBER_OF_NON_NULL_VALUES;
+import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
 import static io.trino.plugin.hive.HiveStorageFormat.ORC;
 import static io.trino.plugin.hive.HiveStorageFormat.TEXTFILE;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+import static io.trino.plugin.hive.ViewReaderUtil.ICEBERG_MATERIALIZED_VIEW_COMMENT;
+import static io.trino.plugin.hive.ViewReaderUtil.PRESTO_VIEW_FLAG;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoMaterializedView;
 import static io.trino.plugin.hive.acid.AcidTransaction.NO_ACID_TRANSACTION;
 import static io.trino.plugin.hive.metastore.HiveColumnStatistics.createIntegerColumnStatistics;
 import static io.trino.plugin.hive.metastore.glue.AwsSdkUtil.getPaginatedResults;
@@ -118,8 +123,10 @@
 import static java.util.concurrent.TimeUnit.DAYS;
 import static org.apache.hadoop.hive.common.FileUtils.makePartName;
 import static org.apache.hadoop.hive.metastore.TableType.EXTERNAL_TABLE;
+import static org.apache.hadoop.hive.metastore.TableType.VIRTUAL_VIEW;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.abort;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
@@ -128,7 +135,6 @@
  * See https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html#credentials-default
  * on ways to set your AWS credentials which will be needed to run this test.
  */
-@Test(singleThreaded = true)
 public class TestHiveGlueMetastore
         extends AbstractTestHiveLocal
 {
@@ -198,7 +204,7 @@ protected AWSGlueAsync getGlueClient()
         return glueClient;
     }
 
-    @BeforeClass(alwaysRun = true)
+    @BeforeAll
     @Override
     public void initialize()
             throws Exception
@@ -207,11 +213,7 @@ public void initialize()
         // uncomment to get extra AWS debug information
 //        Logging logging = Logging.initialize();
 //        logging.setLevel("com.amazonaws.request", Level.DEBUG);
-    }
 
-    @BeforeClass
-    public void setup()
-    {
         metastore = new HiveMetastoreClosure(metastoreClient);
         glueClient = AWSGlueAsyncClientBuilder.defaultClient();
     }
@@ -226,11 +228,11 @@ protected HiveMetastore createMetastore(File tempDir)
         Executor executor = new BoundedExecutor(this.executor, 10);
         GlueMetastoreStats stats = new GlueMetastoreStats();
         return new GlueHiveMetastore(
-                HDFS_ENVIRONMENT,
+                HDFS_FILE_SYSTEM_FACTORY,
                 glueConfig,
                 executor,
                 new DefaultGlueColumnStatisticsProviderFactory(executor, executor),
-                createAsyncGlueClient(glueConfig, DefaultAWSCredentialsProviderChain.getInstance(), Optional.empty(), stats.newRequestMetricsCollector()),
+                createAsyncGlueClient(glueConfig, DefaultAWSCredentialsProviderChain.getInstance(), ImmutableSet.of(), stats.newRequestMetricsCollector()),
                 stats,
                 new DefaultGlueMetastoreTableFilterProvider(true).get());
     }
@@ -269,12 +271,14 @@ public void cleanupOrphanedDatabases()
         });
     }
 
+    @Test
     @Override
     public void testRenameTable()
     {
         // rename table is not yet supported by Glue
     }
 
+    @Test
     @Override
     public void testUpdateTableColumnStatisticsEmptyOptionalFields()
     {
@@ -283,6 +287,7 @@ public void testUpdateTableColumnStatisticsEmptyOptionalFields()
         // in order to avoid incorrect data we skip writes for statistics with min/max = null
     }
 
+    @Test
     @Override
     public void testUpdatePartitionColumnStatisticsEmptyOptionalFields()
     {
@@ -291,13 +296,59 @@ public void testUpdatePartitionColumnStatisticsEmptyOptionalFields()
         // in order to avoid incorrect data we skip writes for statistics with min/max = null
     }
 
+    @Test
+    @Override
+    public void testUpdateBasicPartitionStatistics()
+            throws Exception
+    {
+        SchemaTableName tableName = temporaryTable("update_basic_partition_statistics");
+        try {
+            createDummyPartitionedTable(tableName, STATISTICS_PARTITIONED_TABLE_COLUMNS);
+            testUpdatePartitionStatistics(
+                    tableName,
+                    EMPTY_ROWCOUNT_STATISTICS,
+                    ImmutableList.of(BASIC_STATISTICS_1, BASIC_STATISTICS_2),
+                    ImmutableList.of(BASIC_STATISTICS_2, BASIC_STATISTICS_1));
+        }
+        finally {
+            dropTable(tableName);
+        }
+    }
+
+    @Test
+    @Override
+    public void testUpdatePartitionColumnStatistics()
+            throws Exception
+    {
+        SchemaTableName tableName = temporaryTable("update_partition_column_statistics");
+        try {
+            createDummyPartitionedTable(tableName, STATISTICS_PARTITIONED_TABLE_COLUMNS);
+            // When the table has partitions, but row count statistics are set to zero, we treat this case as empty
+            // statistics to avoid underestimation in the CBO. This scenario may be caused when other engines are
+            // used to ingest data into partitioned hive tables.
+            testUpdatePartitionStatistics(
+                    tableName,
+                    EMPTY_ROWCOUNT_STATISTICS,
+                    ImmutableList.of(STATISTICS_1_1, STATISTICS_1_2, STATISTICS_2),
+                    ImmutableList.of(STATISTICS_1_2, STATISTICS_1_1, STATISTICS_2));
+        }
+        finally {
+            dropTable(tableName);
+        }
+    }
+
+    @Test
     @Override
     public void testStorePartitionWithStatistics()
             throws Exception
     {
-        testStorePartitionWithStatistics(STATISTICS_PARTITIONED_TABLE_COLUMNS, BASIC_STATISTICS_1, BASIC_STATISTICS_2, BASIC_STATISTICS_1, EMPTY_TABLE_STATISTICS);
+        // When the table has partitions, but row count statistics are set to zero, we treat this case as empty
+        // statistics to avoid underestimation in the CBO. This scenario may be caused when other engines are
+        // used to ingest data into partitioned hive tables.
+        testStorePartitionWithStatistics(STATISTICS_PARTITIONED_TABLE_COLUMNS, BASIC_STATISTICS_1, BASIC_STATISTICS_2, BASIC_STATISTICS_1, EMPTY_ROWCOUNT_STATISTICS);
     }
 
+    @Test
     @Override
     public void testGetPartitions()
             throws Exception
@@ -347,8 +398,8 @@ public void testGetPartitionsWithFilterUsingReservedKeywordsAsColumnName()
                     .map(partitionName -> new PartitionWithStatistics(createDummyPartition(table, partitionName), partitionName, PartitionStatistics.empty()))
                     .collect(toImmutableList());
             metastoreClient.addPartitions(tableName.getSchemaName(), tableName.getTableName(), partitions);
-            metastoreClient.updatePartitionStatistics(tableName.getSchemaName(), tableName.getTableName(), partitionName1, currentStatistics -> EMPTY_TABLE_STATISTICS);
-            metastoreClient.updatePartitionStatistics(tableName.getSchemaName(), tableName.getTableName(), partitionName2, currentStatistics -> EMPTY_TABLE_STATISTICS);
+            metastoreClient.updatePartitionStatistics(tableName.getSchemaName(), tableName.getTableName(), partitionName1, currentStatistics -> ZERO_TABLE_STATISTICS);
+            metastoreClient.updatePartitionStatistics(tableName.getSchemaName(), tableName.getTableName(), partitionName2, currentStatistics -> ZERO_TABLE_STATISTICS);
 
             Optional<List<String>> partitionNames = metastoreClient.getPartitionNamesByFilter(
                     tableName.getSchemaName(),
@@ -899,33 +950,43 @@ public void testGetPartitionsFilterIsNotNull()
                 ImmutableList.of(ImmutableList.of("100")));
     }
 
-    @Test(dataProvider = "unsupportedNullPushdownTypes")
-    public void testGetPartitionsFilterUnsupportedIsNull(List<ColumnMetadata> columnMetadata, Type type, String partitionValue)
+    @Test
+    public void testGetPartitionsFilterUnsupported()
             throws Exception
     {
-        TupleDomain<String> isNullFilter = new PartitionFilterBuilder()
-                .addDomain(PARTITION_KEY, Domain.onlyNull(type))
-                .build();
-        List<String> partitionList = new ArrayList<>();
-        partitionList.add(partitionValue);
-        partitionList.add(null);
+        // Numeric types are unsupported for IS (NOT) NULL predicate pushdown
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_TINYINT, Domain.onlyNull(TinyintType.TINYINT), "127");
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_SMALLINT, Domain.onlyNull(SmallintType.SMALLINT), "32767");
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_INTEGER, Domain.onlyNull(IntegerType.INTEGER), "2147483647");
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_BIGINT, Domain.onlyNull(BigintType.BIGINT), "9223372036854775807");
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_DECIMAL, Domain.onlyNull(DECIMAL_TYPE), "12345.12345");
+
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_TINYINT, Domain.notNull(TinyintType.TINYINT), "127");
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_SMALLINT, Domain.notNull(SmallintType.SMALLINT), "32767");
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_INTEGER, Domain.notNull(IntegerType.INTEGER), "2147483647");
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_BIGINT, Domain.notNull(BigintType.BIGINT), "9223372036854775807");
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_DECIMAL, Domain.notNull(DECIMAL_TYPE), "12345.12345");
+
+        // Date and timestamp aren't numeric types, but the pushdown is unsupported because of GlueExpressionUtil.canConvertSqlTypeToStringForGlue
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_DATE, Domain.onlyNull(DateType.DATE), "2022-07-11");
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_TIMESTAMP, Domain.onlyNull(TimestampType.TIMESTAMP_MILLIS), "2022-07-11 01:02:03.123");
+
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_DATE, Domain.notNull(DateType.DATE), "2022-07-11");
+        testGetPartitionsFilterUnsupported(CREATE_TABLE_COLUMNS_PARTITIONED_TIMESTAMP, Domain.notNull(TimestampType.TIMESTAMP_MILLIS), "2022-07-11 01:02:03.123");
+    }
 
-        doGetPartitionsFilterTest(
-                columnMetadata,
-                PARTITION_KEY,
-                partitionList,
-                ImmutableList.of(isNullFilter),
-                // Currently, we get NULL partition from Glue and filter it in our side because
-                // (column = '__HIVE_DEFAULT_PARTITION__') on numeric types causes exception on Glue. e.g. 'input string: "__HIVE_D" is not an integer'
-                ImmutableList.of(ImmutableList.of(partitionValue, GlueExpressionUtil.NULL_STRING)));
+    @Test
+    @Override
+    public void testPartitionSchemaMismatch()
+    {
+        abort("tests using existing tables are not supported");
     }
 
-    @Test(dataProvider = "unsupportedNullPushdownTypes")
-    public void testGetPartitionsFilterUnsupportedIsNotNull(List<ColumnMetadata> columnMetadata, Type type, String partitionValue)
+    private void testGetPartitionsFilterUnsupported(List<ColumnMetadata> columnMetadata, Domain domain, String partitionValue)
             throws Exception
     {
-        TupleDomain<String> isNotNullFilter = new PartitionFilterBuilder()
-                .addDomain(PARTITION_KEY, Domain.notNull(type))
+        TupleDomain<String> isNullFilter = new PartitionFilterBuilder()
+                .addDomain(PARTITION_KEY, domain)
                 .build();
         List<String> partitionList = new ArrayList<>();
         partitionList.add(partitionValue);
@@ -935,28 +996,12 @@ public void testGetPartitionsFilterUnsupportedIsNotNull(List<ColumnMetadata> col
                 columnMetadata,
                 PARTITION_KEY,
                 partitionList,
-                ImmutableList.of(isNotNullFilter),
+                ImmutableList.of(isNullFilter),
                 // Currently, we get NULL partition from Glue and filter it in our side because
-                // (column <> '__HIVE_DEFAULT_PARTITION__') on numeric types causes exception on Glue. e.g. 'input string: "__HIVE_D" is not an integer'
+                // (column <op> '__HIVE_DEFAULT_PARTITION__') on numeric types causes exception on Glue. e.g. 'input string: "__HIVE_D" is not an integer'
                 ImmutableList.of(ImmutableList.of(partitionValue, GlueExpressionUtil.NULL_STRING)));
     }
 
-    @DataProvider
-    public Object[][] unsupportedNullPushdownTypes()
-    {
-        return new Object[][] {
-                // Numeric types are unsupported for IS (NOT) NULL predicate pushdown
-                {CREATE_TABLE_COLUMNS_PARTITIONED_TINYINT, TinyintType.TINYINT, "127"},
-                {CREATE_TABLE_COLUMNS_PARTITIONED_SMALLINT, SmallintType.SMALLINT, "32767"},
-                {CREATE_TABLE_COLUMNS_PARTITIONED_INTEGER, IntegerType.INTEGER, "2147483647"},
-                {CREATE_TABLE_COLUMNS_PARTITIONED_BIGINT, BigintType.BIGINT, "9223372036854775807"},
-                {CREATE_TABLE_COLUMNS_PARTITIONED_DECIMAL, DECIMAL_TYPE, "12345.12345"},
-                // Date and timestamp aren't numeric types, but the pushdown is unsupported because of GlueExpressionUtil.canConvertSqlTypeToStringForGlue
-                {CREATE_TABLE_COLUMNS_PARTITIONED_DATE, DateType.DATE, "2022-07-11"},
-                {CREATE_TABLE_COLUMNS_PARTITIONED_TIMESTAMP, TimestampType.TIMESTAMP_MILLIS, "2022-07-11 01:02:03.123"},
-        };
-    }
-
     @Test
     public void testGetPartitionsFilterEqualsAndIsNotNull()
             throws Exception
@@ -1089,7 +1134,7 @@ public void testStatisticsLargeNumberOfColumns()
                                 OptionalLong.of(-1000 - i),
                                 OptionalLong.of(1000 + i),
                                 OptionalLong.of(i),
-                                OptionalLong.of(2 * i)));
+                                OptionalLong.of(2L * i)));
             }
 
             PartitionStatistics partitionStatistics = PartitionStatistics.builder()
@@ -1097,7 +1142,7 @@ public void testStatisticsLargeNumberOfColumns()
                     .setColumnStatistics(columnStatistics.buildOrThrow()).build();
 
             doCreateEmptyTable(tableName, ORC, columns.build());
-            testUpdateTableStatistics(tableName, EMPTY_TABLE_STATISTICS, partitionStatistics);
+            testUpdateTableStatistics(tableName, ZERO_TABLE_STATISTICS, partitionStatistics);
         }
         finally {
             dropTable(tableName);
@@ -1129,9 +1174,9 @@ public void testStatisticsLongColumnNames()
 
             doCreateEmptyTable(tableName, ORC, columns);
 
-            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
-                    .isEqualTo(EMPTY_TABLE_STATISTICS);
-            testUpdateTableStatistics(tableName, EMPTY_TABLE_STATISTICS, partitionStatistics);
+            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
+                    .isEqualTo(ZERO_TABLE_STATISTICS);
+            testUpdateTableStatistics(tableName, ZERO_TABLE_STATISTICS, partitionStatistics);
         }
         finally {
             dropTable(tableName);
@@ -1164,30 +1209,30 @@ public void testStatisticsColumnModification()
                     tableName.getTableName(),
                     NO_ACID_TRANSACTION,
                     actualStatistics -> {
-                        assertThat(actualStatistics).isEqualTo(EMPTY_TABLE_STATISTICS);
+                        assertThat(actualStatistics).isEqualTo(ZERO_TABLE_STATISTICS);
                         return partitionStatistics;
                     });
 
-            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                     .isEqualTo(partitionStatistics);
 
             metastore.renameColumn(tableName.getSchemaName(), tableName.getTableName(), "column1", "column4");
-            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                     .isEqualTo(new PartitionStatistics(
                             HIVE_BASIC_STATISTICS,
                             Map.of("column2", INTEGER_COLUMN_STATISTICS)));
 
             metastore.dropColumn(tableName.getSchemaName(), tableName.getTableName(), "column2");
-            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                     .isEqualTo(new PartitionStatistics(HIVE_BASIC_STATISTICS, Map.of()));
 
             metastore.addColumn(tableName.getSchemaName(), tableName.getTableName(), "column5", HiveType.HIVE_INT, "comment");
-            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                     .isEqualTo(new PartitionStatistics(HIVE_BASIC_STATISTICS, Map.of()));
 
             // TODO: column1 stats should be removed on column delete. However this is tricky since stats can be stored in multiple partitions.
             metastore.renameColumn(tableName.getSchemaName(), tableName.getTableName(), "column4", "column1");
-            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                     .isEqualTo(new PartitionStatistics(
                             HIVE_BASIC_STATISTICS,
                             Map.of("column1", INTEGER_COLUMN_STATISTICS)));
@@ -1223,21 +1268,21 @@ public void testStatisticsPartitionedTableColumnModification()
 
             assertThat(metastoreClient.getStats().getBatchUpdatePartition().getTime().getAllTime().getCount()).isEqualTo(countBefore + 1);
             PartitionStatistics tableStatistics = new PartitionStatistics(createEmptyStatistics(), Map.of());
-            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                     .isEqualTo(tableStatistics);
             assertThat(metastore.getPartitionStatistics(tableName.getSchemaName(), tableName.getTableName(), Set.of("ds=2016-01-01")))
                     .isEqualTo(Map.of("ds=2016-01-01", partitionStatistics));
 
             // renaming table column does not rename partition columns
             metastore.renameColumn(tableName.getSchemaName(), tableName.getTableName(), "column1", "column4");
-            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                     .isEqualTo(tableStatistics);
             assertThat(metastore.getPartitionStatistics(tableName.getSchemaName(), tableName.getTableName(), Set.of("ds=2016-01-01")))
                     .isEqualTo(Map.of("ds=2016-01-01", partitionStatistics));
 
             // dropping table column does not drop partition columns
             metastore.dropColumn(tableName.getSchemaName(), tableName.getTableName(), "column2");
-            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                     .isEqualTo(tableStatistics);
             assertThat(metastore.getPartitionStatistics(tableName.getSchemaName(), tableName.getTableName(), Set.of("ds=2016-01-01")))
                     .isEqualTo(Map.of("ds=2016-01-01", partitionStatistics));
@@ -1270,7 +1315,7 @@ public void testInvalidColumnStatisticsMetadata()
                     tableName.getTableName(),
                     NO_ACID_TRANSACTION,
                     actualStatistics -> {
-                        assertThat(actualStatistics).isEqualTo(EMPTY_TABLE_STATISTICS);
+                        assertThat(actualStatistics).isEqualTo(ZERO_TABLE_STATISTICS);
                         return partitionStatistics;
                     });
 
@@ -1284,7 +1329,7 @@ public void testInvalidColumnStatisticsMetadata()
                     .withDatabaseName(tableName.getSchemaName())
                     .withTableInput(tableInput));
 
-            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName()))
+            assertThat(metastore.getTableStatistics(tableName.getSchemaName(), tableName.getTableName(), Optional.empty()))
                     .isEqualTo(partitionStatistics);
         }
         finally {
@@ -1293,17 +1338,31 @@ public void testInvalidColumnStatisticsMetadata()
     }
 
     @Test
-    public void testTableWithoutStorageDescriptor()
+    @Override
+    public void testPartitionColumnProperties()
+    {
+        // Glue currently does not support parameters on the partitioning columns
+        assertThatThrownBy(super::testPartitionColumnProperties)
+                .isInstanceOf(TrinoException.class)
+                .hasMessageStartingWith("Parameters not supported for partition columns (Service: AWSGlue; Status Code: 400; Error Code: InvalidInputException;");
+    }
+
+    @Test
+    public void testGlueObjectsWithoutStorageDescriptor()
     {
-        // StorageDescriptor is an Optional field for Glue tables. Iceberg and Delta Lake tables may not have it set.
+        // StorageDescriptor is an Optional field for Glue tables.
         SchemaTableName table = temporaryTable("test_missing_storage_descriptor");
         DeleteTableRequest deleteTableRequest = new DeleteTableRequest()
                 .withDatabaseName(table.getSchemaName())
                 .withName(table.getTableName());
+
         try {
-            TableInput tableInput = new TableInput()
+            Supplier<TableInput> resetTableInput = () -> new TableInput()
+                    .withStorageDescriptor(null)
                     .withName(table.getTableName())
                     .withTableType(EXTERNAL_TABLE.name());
+
+            TableInput tableInput = resetTableInput.get();
             glueClient.createTable(new CreateTableRequest()
                     .withDatabaseName(database)
                     .withTableInput(tableInput));
@@ -1313,7 +1372,7 @@ public void testTableWithoutStorageDescriptor()
             glueClient.deleteTable(deleteTableRequest);
 
             // Iceberg table
-            tableInput = tableInput.withParameters(ImmutableMap.of(ICEBERG_TABLE_TYPE_NAME, ICEBERG_TABLE_TYPE_VALUE));
+            tableInput = resetTableInput.get().withParameters(ImmutableMap.of(ICEBERG_TABLE_TYPE_NAME, ICEBERG_TABLE_TYPE_VALUE));
             glueClient.createTable(new CreateTableRequest()
                     .withDatabaseName(database)
                     .withTableInput(tableInput));
@@ -1321,11 +1380,38 @@ public void testTableWithoutStorageDescriptor()
             glueClient.deleteTable(deleteTableRequest);
 
             // Delta Lake table
-            tableInput = tableInput.withParameters(ImmutableMap.of(SPARK_TABLE_PROVIDER_KEY, DELTA_LAKE_PROVIDER));
+            tableInput = resetTableInput.get().withParameters(ImmutableMap.of(SPARK_TABLE_PROVIDER_KEY, DELTA_LAKE_PROVIDER));
             glueClient.createTable(new CreateTableRequest()
                     .withDatabaseName(database)
                     .withTableInput(tableInput));
             assertTrue(isDeltaLakeTable(metastore.getTable(table.getSchemaName(), table.getTableName()).orElseThrow()));
+            glueClient.deleteTable(deleteTableRequest);
+
+            // Iceberg materialized view
+            tableInput = resetTableInput.get().withTableType(VIRTUAL_VIEW.name())
+                    .withViewOriginalText("/* Presto Materialized View: eyJvcmlnaW5hbFNxbCI6IlNFTEVDVCAxIiwiY29sdW1ucyI6W3sibmFtZSI6ImEiLCJ0eXBlIjoiaW50ZWdlciJ9XX0= */")
+                    .withViewExpandedText(ICEBERG_MATERIALIZED_VIEW_COMMENT)
+                    .withParameters(ImmutableMap.of(
+                            PRESTO_VIEW_FLAG, "true",
+                            TABLE_COMMENT, ICEBERG_MATERIALIZED_VIEW_COMMENT));
+            glueClient.createTable(new CreateTableRequest()
+                    .withDatabaseName(database)
+                    .withTableInput(tableInput));
+            assertTrue(isTrinoMaterializedView(metastore.getTable(table.getSchemaName(), table.getTableName()).orElseThrow()));
+            materializedViews.add(table);
+            try (Transaction transaction = newTransaction()) {
+                ConnectorSession session = newSession();
+                ConnectorMetadata metadata = transaction.getMetadata();
+                // Not a view
+                assertThat(metadata.listViews(session, Optional.empty()))
+                        .doesNotContain(table);
+                assertThat(metadata.listViews(session, Optional.of(table.getSchemaName())))
+                        .doesNotContain(table);
+                assertThat(metadata.getView(session, table)).isEmpty();
+            }
+            finally {
+                materializedViews.remove(table);
+            }
         }
         finally {
             // Table cannot be dropped through HiveMetastore since a TableHandle cannot be created
@@ -1335,9 +1421,43 @@ public void testTableWithoutStorageDescriptor()
         }
     }
 
+    @Test
+    public void testAlterColumnComment()
+            throws Exception
+    {
+        SchemaTableName tableName = temporaryTable("test_alter_column_comment");
+        List<ColumnMetadata> columns = ImmutableList.of(
+                new ColumnMetadata("first_column", BIGINT),
+                new ColumnMetadata("second_column", VARCHAR),
+                new ColumnMetadata("partition_column", BIGINT));
+        createDummyPartitionedTable(tableName, columns, ImmutableList.of("partition_column"), ImmutableList.of());
+        try {
+            metastore.commentColumn(tableName.getSchemaName(), tableName.getTableName(), "second_column", Optional.of("second column comment"));
+            metastore.commentColumn(tableName.getSchemaName(), tableName.getTableName(), "partition_column", Optional.of("partition column comment"));
+
+            Table withComment = metastore.getTable(tableName.getSchemaName(), tableName.getTableName()).orElseThrow();
+            assertThat(withComment.getColumn("first_column").orElseThrow().getComment()).isEmpty();
+            assertThat(withComment.getColumn("second_column").orElseThrow().getComment()).isEqualTo(Optional.of("second column comment"));
+            assertThat(withComment.getColumn("partition_column").orElseThrow().getComment()).isEqualTo(Optional.of("partition column comment"));
+
+            metastore.commentColumn(tableName.getSchemaName(), tableName.getTableName(), "second_column", Optional.empty());
+            withComment = metastore.getTable(tableName.getSchemaName(), tableName.getTableName()).orElseThrow();
+            assertThat(withComment.getColumn("first_column").orElseThrow().getComment()).isEmpty();
+            assertThat(withComment.getColumn("second_column").orElseThrow().getComment()).isEmpty();
+            assertThat(withComment.getColumn("partition_column").orElseThrow().getComment()).isEqualTo(Optional.of("partition column comment"));
+        }
+        finally {
+            glueClient.deleteTable(new DeleteTableRequest()
+                    .withDatabaseName(tableName.getSchemaName())
+                    .withName(tableName.getTableName()));
+        }
+    }
+
     private Block singleValueBlock(long value)
     {
-        return BigintType.BIGINT.createBlockBuilder(null, 1).writeLong(value).build();
+        BlockBuilder blockBuilder = BIGINT.createBlockBuilder(null, 1);
+        BIGINT.writeLong(blockBuilder, value);
+        return blockBuilder.build();
     }
 
     private void doGetPartitionsFilterTest(
@@ -1416,7 +1536,7 @@ private void createDummyPartitionedTable(SchemaTableName tableName, List<ColumnM
         metastoreClient.addPartitions(tableName.getSchemaName(), tableName.getTableName(), partitions);
         partitionNames.forEach(
                 partitionName -> metastoreClient.updatePartitionStatistics(
-                        tableName.getSchemaName(), tableName.getTableName(), partitionName, currentStatistics -> EMPTY_TABLE_STATISTICS));
+                        tableName.getSchemaName(), tableName.getTableName(), partitionName, currentStatistics -> ZERO_TABLE_STATISTICS));
     }
 
     private class CloseableSchamaTableName
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestingMetastoreObjects.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestingMetastoreObjects.java
index aa18a77e816b..0594cbf8814b 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestingMetastoreObjects.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestingMetastoreObjects.java
@@ -32,6 +32,9 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Consumer;
 
+import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
+import static io.trino.plugin.hive.ViewReaderUtil.ICEBERG_MATERIALIZED_VIEW_COMMENT;
+import static io.trino.plugin.hive.ViewReaderUtil.PRESTO_VIEW_FLAG;
 import static java.lang.String.format;
 
 public final class TestingMetastoreObjects
@@ -63,6 +66,20 @@ public static Table getGlueTestTable(String dbName)
                 .withViewExpandedText("expandedText");
     }
 
+    public static Table getGlueTestTrinoMaterializedView(String dbName)
+    {
+        return new Table()
+                .withDatabaseName(dbName)
+                .withName("test-mv" + generateRandom())
+                .withOwner("owner")
+                .withParameters(ImmutableMap.of(PRESTO_VIEW_FLAG, "true", TABLE_COMMENT, ICEBERG_MATERIALIZED_VIEW_COMMENT))
+                .withPartitionKeys()
+                .withStorageDescriptor(null)
+                .withTableType(TableType.VIRTUAL_VIEW.name())
+                .withViewOriginalText("/* %s: base64encodedquery */".formatted(ICEBERG_MATERIALIZED_VIEW_COMMENT))
+                .withViewExpandedText(ICEBERG_MATERIALIZED_VIEW_COMMENT);
+    }
+
     public static Column getGlueTestColumn()
     {
         return getGlueTestColumn("string");
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/recording/TestRecordingHiveMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/recording/TestRecordingHiveMetastore.java
index 798087d841f4..7100028294e3 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/recording/TestRecordingHiveMetastore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/recording/TestRecordingHiveMetastore.java
@@ -51,7 +51,7 @@
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.type.TestingTypeManager;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/InMemoryThriftMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/InMemoryThriftMetastore.java
index 8c04657b9830..370b0a5413de 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/InMemoryThriftMetastore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/InMemoryThriftMetastore.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.hive.thrift.metastore.Database;
 import io.trino.hive.thrift.metastore.FieldSchema;
 import io.trino.hive.thrift.metastore.Partition;
@@ -41,12 +42,11 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.metastore.TableType;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
+import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
@@ -185,7 +185,7 @@ public synchronized void createTable(Table table)
         }
         else {
             File directory = new File(new Path(table.getSd().getLocation()).toUri());
-            checkArgument(directory.exists(), "Table directory does not exist");
+            checkArgument(directory.exists(), "Table directory [%s] does not exist", directory);
             if (tableType == MANAGED_TABLE) {
                 checkArgument(isParentDir(directory, baseDirectory), "Table directory must be inside of the metastore base directory");
             }
@@ -203,7 +203,7 @@ public synchronized void createTable(Table table)
         }
 
         PrincipalPrivilegeSet privileges = table.getPrivileges();
-        if (privileges != null) {
+        if (privileges != null && (!privileges.getUserPrivileges().isEmpty() || !privileges.getGroupPrivileges().isEmpty() || !privileges.getRolePrivileges().isEmpty())) {
             throw new UnsupportedOperationException();
         }
     }
@@ -326,6 +326,18 @@ public synchronized List<String> getAllViews(String databaseName)
         return tables.build();
     }
 
+    @Override
+    public synchronized Optional<List<SchemaTableName>> getAllTables()
+    {
+        return Optional.of(ImmutableList.copyOf(relations.keySet()));
+    }
+
+    @Override
+    public synchronized Optional<List<SchemaTableName>> getAllViews()
+    {
+        return Optional.of(ImmutableList.copyOf(views.keySet()));
+    }
+
     @Override
     public synchronized Optional<Database> getDatabase(String databaseName)
     {
@@ -552,6 +564,36 @@ public void revokeTablePrivileges(String databaseName, String tableName, String
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public Optional<io.trino.hive.thrift.metastore.Function> getFunction(String databaseName, String functionName)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Collection<String> getFunctions(String databaseName, String functionName)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void createFunction(io.trino.hive.thrift.metastore.Function function)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void alterFunction(io.trino.hive.thrift.metastore.Function function)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void dropFunction(String databaseName, String functionName)
+    {
+        throw new UnsupportedOperationException();
+    }
+
     private static boolean isParentDir(File directory, File baseDirectory)
     {
         for (File parent = directory.getParentFile(); parent != null; parent = parent.getParentFile()) {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/MockThriftMetastoreClient.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/MockThriftMetastoreClient.java
index fda6a528d35d..02523ad93253 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/MockThriftMetastoreClient.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/MockThriftMetastoreClient.java
@@ -22,6 +22,7 @@
 import io.trino.hive.thrift.metastore.Database;
 import io.trino.hive.thrift.metastore.EnvironmentContext;
 import io.trino.hive.thrift.metastore.FieldSchema;
+import io.trino.hive.thrift.metastore.Function;
 import io.trino.hive.thrift.metastore.HiveObjectPrivilege;
 import io.trino.hive.thrift.metastore.HiveObjectRef;
 import io.trino.hive.thrift.metastore.LockRequest;
@@ -44,9 +45,11 @@
 import org.apache.hadoop.hive.metastore.api.MetaException;
 import org.apache.thrift.TException;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -83,6 +86,7 @@ public class MockThriftMetastoreClient
     private final Map<SchemaTableName, Map<String, Map<String, ColumnStatisticsObj>>> databaseTablePartitionColumnStatistics = new HashMap<>();
 
     private boolean throwException;
+    private boolean returnTable = true;
 
     public MockThriftMetastoreClient()
     {
@@ -130,19 +134,14 @@ private static ColumnStatisticsData createLongColumnStats()
         return data;
     }
 
-    private static ColumnStatisticsObj createTestStats()
+    public void setThrowException(boolean throwException)
     {
-        ColumnStatisticsObj stats = new ColumnStatisticsObj();
-        ColumnStatisticsData data = new ColumnStatisticsData();
-        data.setLongStats(new LongColumnStatsData());
-        stats.setStatsData(data);
-        stats.setColName(TEST_COLUMN);
-        return stats;
+        this.throwException = throwException;
     }
 
-    public void setThrowException(boolean throwException)
+    public void setReturnTable(boolean returnTable)
     {
-        this.throwException = throwException;
+        this.returnTable = returnTable;
     }
 
     public int getAccessCount()
@@ -173,12 +172,30 @@ public List<String> getAllTables(String dbName)
         return ImmutableList.of(TEST_TABLE);
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllTables()
+            throws TException
+    {
+        accessCount.incrementAndGet();
+        if (throwException) {
+            throw new RuntimeException();
+        }
+        return Optional.of(ImmutableList.of(new SchemaTableName(TEST_DATABASE, TEST_TABLE)));
+    }
+
     @Override
     public List<String> getAllViews(String databaseName)
     {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public Optional<List<SchemaTableName>> getAllViews()
+            throws TException
+    {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public List<String> getTablesWithParameter(String databaseName, String parameterKey, String parameterValue)
     {
@@ -207,7 +224,7 @@ public Table getTable(String dbName, String tableName)
         if (throwException) {
             throw new RuntimeException();
         }
-        if (!dbName.equals(TEST_DATABASE) || !tableName.equals(TEST_TABLE)) {
+        if (!returnTable || !dbName.equals(TEST_DATABASE) || !tableName.equals(TEST_TABLE)) {
             throw new NoSuchObjectException();
         }
         return new Table(
@@ -219,7 +236,7 @@ public Table getTable(String dbName, String tableName)
                 0,
                 DEFAULT_STORAGE_DESCRIPTOR,
                 ImmutableList.of(new FieldSchema("key", "string", null)),
-                ImmutableMap.of(),
+                ImmutableMap.of("numRows", "2398040535435"),
                 "",
                 "",
                 TableType.MANAGED_TABLE.name());
@@ -339,7 +356,7 @@ public Partition getPartition(String dbName, String tableName, List<String> part
                 !ImmutableSet.of(TEST_PARTITION_VALUES1, TEST_PARTITION_VALUES2, TEST_PARTITION_VALUES3).contains(partitionValues)) {
             throw new NoSuchObjectException();
         }
-        return new Partition(partitionValues, TEST_DATABASE, TEST_TABLE, 0, 0, DEFAULT_STORAGE_DESCRIPTOR, ImmutableMap.of());
+        return new Partition(partitionValues, TEST_DATABASE, TEST_TABLE, 0, 0, DEFAULT_STORAGE_DESCRIPTOR, ImmutableMap.of("numRows", "2398040535435"));
     }
 
     @Override
@@ -378,13 +395,13 @@ private static Partition getPartitionsByNamesUnchecked(String name)
     @Override
     public void createDatabase(Database database)
     {
-        throw new UnsupportedOperationException();
+        // No-op, make sure the cache invalidation logic in CachingHiveMetastore will be passed through
     }
 
     @Override
     public void dropDatabase(String databaseName, boolean deleteData, boolean cascade)
     {
-        throw new UnsupportedOperationException();
+        // No-op, make sure the cache invalidation logic in CachingHiveMetastore will be passed through
     }
 
     @Override
@@ -396,7 +413,7 @@ public void alterDatabase(String databaseName, Database database)
     @Override
     public void createTable(Table table)
     {
-        throw new UnsupportedOperationException();
+        // No-op, make sure the cache invalidation logic in CachingHiveMetastore will be passed through
     }
 
     @Override
@@ -587,4 +604,34 @@ public String getDelegationToken(String userName)
     {
         throw new UnsupportedOperationException();
     }
+
+    @Override
+    public Function getFunction(String databaseName, String functionName)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Collection<String> getFunctions(String databaseName, String functionNamePattern)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void createFunction(Function function)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void alterFunction(Function function)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void dropFunction(String databaseName, String functionName)
+    {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestCoalescingCounter.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestCoalescingCounter.java
index 55a55e360eec..b2c2257fa425 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestCoalescingCounter.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestCoalescingCounter.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive.metastore.thrift;
 
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.Clock;
 import java.time.Instant;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestFailureAwareThriftMetastoreClient.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestFailureAwareThriftMetastoreClient.java
index 81f95823f966..1e5cf9b2b0d0 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestFailureAwareThriftMetastoreClient.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestFailureAwareThriftMetastoreClient.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive.metastore.thrift;
 
 import org.apache.thrift.TException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 import static io.trino.spi.testing.InterfaceTestUtils.assertProperForwardingMethodsAreCalled;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestHiveMetastoreAccessOperations.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestHiveMetastoreAccessOperations.java
new file mode 100644
index 000000000000..94a24e37a90d
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestHiveMetastoreAccessOperations.java
@@ -0,0 +1,327 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.metastore.thrift;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultiset;
+import com.google.common.collect.Multiset;
+import io.trino.Session;
+import io.trino.plugin.hive.TestingHivePlugin;
+import io.trino.plugin.hive.metastore.CountingAccessHiveMetastore;
+import io.trino.plugin.hive.metastore.CountingAccessHiveMetastoreUtil;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.CREATE_TABLE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_DATABASE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_PARTITIONS_BY_NAMES;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_PARTITION_NAMES_BY_FILTER;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_PARTITION_STATISTICS;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_TABLE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_TABLE_STATISTICS;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.UPDATE_PARTITION_STATISTICS;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.UPDATE_TABLE_STATISTICS;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+
+// metastore invocation counters shares mutable state so can't be run from many threads simultaneously
+public class TestHiveMetastoreAccessOperations
+        extends AbstractTestQueryFramework
+{
+    private static final Session TEST_SESSION = testSessionBuilder()
+            .setCatalog("hive")
+            .setSchema("test_schema")
+            .build();
+
+    private CountingAccessHiveMetastore metastore;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(TEST_SESSION).build();
+
+        File baseDir = queryRunner.getCoordinator().getBaseDataDir().resolve("hive").toFile();
+        metastore = new CountingAccessHiveMetastore(createTestingFileHiveMetastore(baseDir));
+
+        queryRunner.installPlugin(new TestingHivePlugin(metastore));
+        queryRunner.createCatalog("hive", "hive", ImmutableMap.of());
+
+        queryRunner.execute("CREATE SCHEMA test_schema");
+        return queryRunner;
+    }
+
+    @Test
+    public void testUse()
+    {
+        assertMetastoreInvocations("USE " + getSession().getSchema().orElseThrow(),
+                ImmutableMultiset.builder()
+                        .add(GET_DATABASE)
+                        .build());
+    }
+
+    @Test
+    public void testCreateTable()
+    {
+        assertMetastoreInvocations("CREATE TABLE test_create(id VARCHAR, age INT)",
+                ImmutableMultiset.builder()
+                        .add(CREATE_TABLE)
+                        .add(GET_DATABASE)
+                        .add(GET_TABLE)
+                        .add(UPDATE_TABLE_STATISTICS)
+                        .build());
+    }
+
+    @Test
+    public void testCreateTableAsSelect()
+    {
+        assertMetastoreInvocations("CREATE TABLE test_ctas AS SELECT 1 AS age",
+                ImmutableMultiset.builder()
+                        .add(GET_DATABASE)
+                        .add(CREATE_TABLE)
+                        .add(GET_TABLE)
+                        .add(UPDATE_TABLE_STATISTICS)
+                        .build());
+    }
+
+    @Test
+    public void testSelect()
+    {
+        assertUpdate("CREATE TABLE test_select_from(id VARCHAR, age INT)");
+
+        assertMetastoreInvocations("SELECT * FROM test_select_from",
+                ImmutableMultiset.builder()
+                        .add(GET_TABLE)
+                        .build());
+    }
+
+    @Test
+    public void testSelectPartitionedTable()
+    {
+        assertUpdate("CREATE TABLE test_select_partition WITH (partitioned_by = ARRAY['part']) AS SELECT 1 AS data, 10 AS part", 1);
+
+        assertMetastoreInvocations("SELECT * FROM test_select_partition",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 2)
+                        .add(GET_PARTITION_NAMES_BY_FILTER)
+                        .add(GET_PARTITIONS_BY_NAMES)
+                        .build());
+
+        assertUpdate("INSERT INTO test_select_partition SELECT 2 AS data, 20 AS part", 1);
+        assertMetastoreInvocations("SELECT * FROM test_select_partition",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 2)
+                        .add(GET_PARTITION_NAMES_BY_FILTER)
+                        .add(GET_PARTITIONS_BY_NAMES)
+                        .build());
+
+        // Specify a specific partition
+        assertMetastoreInvocations("SELECT * FROM test_select_partition WHERE part = 10",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 2)
+                        .add(GET_PARTITION_NAMES_BY_FILTER)
+                        .add(GET_PARTITIONS_BY_NAMES)
+                        .build());
+    }
+
+    @Test
+    public void testSelectWithFilter()
+    {
+        assertUpdate("CREATE TABLE test_select_from_where AS SELECT 2 AS age", 1);
+
+        assertMetastoreInvocations("SELECT * FROM test_select_from_where WHERE age = 2",
+                ImmutableMultiset.builder()
+                        .add(GET_TABLE)
+                        .build());
+    }
+
+    @Test
+    public void testSelectFromView()
+    {
+        assertUpdate("CREATE TABLE test_select_view_table(id VARCHAR, age INT)");
+        assertUpdate("CREATE VIEW test_select_view_view AS SELECT id, age FROM test_select_view_table");
+
+        assertMetastoreInvocations("SELECT * FROM test_select_view_view",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 2)
+                        .build());
+    }
+
+    @Test
+    public void testSelectFromViewWithFilter()
+    {
+        assertUpdate("CREATE TABLE test_select_view_where_table AS SELECT 2 AS age", 1);
+        assertUpdate("CREATE VIEW test_select_view_where_view AS SELECT age FROM test_select_view_where_table");
+
+        assertMetastoreInvocations("SELECT * FROM test_select_view_where_view WHERE age = 2",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 2)
+                        .build());
+    }
+
+    @Test
+    public void testJoin()
+    {
+        assertUpdate("CREATE TABLE test_join_t1 AS SELECT 2 AS age, 'id1' AS id", 1);
+        assertUpdate("CREATE TABLE test_join_t2 AS SELECT 'name1' AS name, 'id1' AS id", 1);
+
+        assertMetastoreInvocations("SELECT name, age FROM test_join_t1 JOIN test_join_t2 ON test_join_t2.id = test_join_t1.id",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 2)
+                        .addCopies(GET_TABLE_STATISTICS, 2)
+                        .build());
+    }
+
+    @Test
+    public void testSelfJoin()
+    {
+        assertUpdate("CREATE TABLE test_self_join_table AS SELECT 2 AS age, 0 parent, 3 AS id", 1);
+
+        assertMetastoreInvocations("SELECT child.age, parent.age FROM test_self_join_table child JOIN test_self_join_table parent ON child.parent = parent.id",
+                ImmutableMultiset.builder()
+                        .add(GET_TABLE)
+                        .add(GET_TABLE_STATISTICS)
+                        .build());
+    }
+
+    @Test
+    public void testExplainSelect()
+    {
+        assertUpdate("CREATE TABLE test_explain AS SELECT 2 AS age", 1);
+
+        assertMetastoreInvocations("EXPLAIN SELECT * FROM test_explain",
+                ImmutableMultiset.builder()
+                        .add(GET_TABLE)
+                        .add(GET_TABLE_STATISTICS)
+                        .build());
+    }
+
+    @Test
+    public void testDescribe()
+    {
+        assertUpdate("CREATE TABLE test_describe(id VARCHAR, age INT)");
+
+        assertMetastoreInvocations("DESCRIBE test_describe",
+                ImmutableMultiset.builder()
+                        .add(GET_DATABASE)
+                        .add(GET_TABLE)
+                        .build());
+    }
+
+    @Test
+    public void testShowStatsForTable()
+    {
+        assertUpdate("CREATE TABLE test_show_stats AS SELECT 2 AS age", 1);
+
+        assertMetastoreInvocations("SHOW STATS FOR test_show_stats",
+                ImmutableMultiset.builder()
+                        .add(GET_TABLE)
+                        .add(GET_TABLE_STATISTICS)
+                        .build());
+    }
+
+    @Test
+    public void testShowStatsForTableWithFilter()
+    {
+        assertUpdate("CREATE TABLE test_show_stats_with_filter AS SELECT 2 AS age", 1);
+
+        assertMetastoreInvocations("SHOW STATS FOR (SELECT * FROM test_show_stats_with_filter where age >= 2)",
+                ImmutableMultiset.builder()
+                        .add(GET_TABLE)
+                        .add(GET_TABLE_STATISTICS)
+                        .build());
+    }
+
+    @Test
+    public void testAnalyze()
+    {
+        assertUpdate("CREATE TABLE test_analyze AS SELECT 2 AS age", 1);
+
+        assertMetastoreInvocations("ANALYZE test_analyze",
+                ImmutableMultiset.builder()
+                        .add(GET_TABLE)
+                        .add(UPDATE_TABLE_STATISTICS)
+                        .build());
+    }
+
+    @Test
+    public void testAnalyzePartitionedTable()
+    {
+        assertUpdate("CREATE TABLE test_analyze_partition WITH (partitioned_by = ARRAY['part']) AS SELECT 1 AS data, 10 AS part", 1);
+
+        assertMetastoreInvocations("ANALYZE test_analyze_partition",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 2)
+                        .add(GET_PARTITION_NAMES_BY_FILTER)
+                        .add(GET_PARTITIONS_BY_NAMES)
+                        .add(GET_PARTITION_STATISTICS)
+                        .add(UPDATE_PARTITION_STATISTICS)
+                        .build());
+
+        assertUpdate("INSERT INTO test_analyze_partition SELECT 2 AS data, 20 AS part", 1);
+
+        assertMetastoreInvocations("ANALYZE test_analyze_partition",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 2)
+                        .add(GET_PARTITION_NAMES_BY_FILTER)
+                        .add(GET_PARTITIONS_BY_NAMES)
+                        .add(GET_PARTITION_STATISTICS)
+                        .add(UPDATE_PARTITION_STATISTICS)
+                        .build());
+    }
+
+    @Test
+    public void testDropStats()
+    {
+        assertUpdate("CREATE TABLE drop_stats AS SELECT 2 AS age", 1);
+
+        assertMetastoreInvocations("CALL system.drop_stats('test_schema', 'drop_stats')",
+                ImmutableMultiset.builder()
+                        .add(GET_TABLE)
+                        .add(UPDATE_TABLE_STATISTICS)
+                        .build());
+    }
+
+    @Test
+    public void testDropStatsPartitionedTable()
+    {
+        assertUpdate("CREATE TABLE drop_stats_partition WITH (partitioned_by = ARRAY['part']) AS SELECT 1 AS data, 10 AS part", 1);
+
+        assertMetastoreInvocations("CALL system.drop_stats('test_schema', 'drop_stats_partition')",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 2)
+                        .add(GET_PARTITION_NAMES_BY_FILTER)
+                        .add(UPDATE_PARTITION_STATISTICS)
+                        .build());
+
+        assertUpdate("INSERT INTO drop_stats_partition SELECT 2 AS data, 20 AS part", 1);
+
+        assertMetastoreInvocations("CALL system.drop_stats('test_schema', 'drop_stats_partition')",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 2)
+                        .add(GET_PARTITION_NAMES_BY_FILTER)
+                        .addCopies(UPDATE_PARTITION_STATISTICS, 2)
+                        .build());
+    }
+
+    private void assertMetastoreInvocations(@Language("SQL") String query, Multiset<?> expectedInvocations)
+    {
+        CountingAccessHiveMetastoreUtil.assertMetastoreInvocations(metastore, getQueryRunner(), getQueryRunner().getDefaultSession(), query, expectedInvocations);
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestHiveMetastoreMetadataQueriesAccessOperations.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestHiveMetastoreMetadataQueriesAccessOperations.java
new file mode 100644
index 000000000000..4bbae5d0f9d4
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestHiveMetastoreMetadataQueriesAccessOperations.java
@@ -0,0 +1,808 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.metastore.thrift;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultiset;
+import com.google.common.collect.Multiset;
+import io.trino.plugin.hive.HiveType;
+import io.trino.plugin.hive.TestingHivePlugin;
+import io.trino.plugin.hive.metastore.Column;
+import io.trino.plugin.hive.metastore.CountingAccessHiveMetastore;
+import io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method;
+import io.trino.plugin.hive.metastore.CountingAccessHiveMetastoreUtil;
+import io.trino.plugin.hive.metastore.Table;
+import io.trino.plugin.hive.metastore.UnimplementedHiveMetastore;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.IntStream;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.plugin.hive.HiveStorageFormat.ORC;
+import static io.trino.plugin.hive.TableType.MANAGED_TABLE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_ALL_DATABASES;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_ALL_TABLES;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_ALL_TABLES_FROM_DATABASE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_ALL_VIEWS;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_ALL_VIEWS_FROM_DATABASE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_TABLE;
+import static io.trino.plugin.hive.metastore.StorageFormat.fromHiveStorageFormat;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
+
+@Execution(SAME_THREAD)
+public class TestHiveMetastoreMetadataQueriesAccessOperations
+        extends AbstractTestQueryFramework
+{
+    private static final int MAX_PREFIXES_COUNT = 20;
+    private static final int TEST_SCHEMAS_COUNT = MAX_PREFIXES_COUNT + 1;
+    private static final int TEST_TABLES_IN_SCHEMA_COUNT = MAX_PREFIXES_COUNT + 3;
+    private static final int TEST_ALL_TABLES_COUNT = TEST_SCHEMAS_COUNT * TEST_TABLES_IN_SCHEMA_COUNT;
+
+    private MockHiveMetastore mockMetastore;
+    private CountingAccessHiveMetastore metastore;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(
+                        testSessionBuilder()
+                                .setCatalog("hive")
+                                .setSchema(Optional.empty())
+                                .build())
+                // metadata queries do not use workers
+                .setNodeCount(1)
+                .addCoordinatorProperty("optimizer.experimental-max-prefetched-information-schema-prefixes", Integer.toString(MAX_PREFIXES_COUNT))
+                .build();
+
+        mockMetastore = new MockHiveMetastore();
+        metastore = new CountingAccessHiveMetastore(mockMetastore);
+        queryRunner.installPlugin(new TestingHivePlugin(metastore));
+        queryRunner.createCatalog("hive", "hive", ImmutableMap.of());
+        return queryRunner;
+    }
+
+    private void resetMetastoreSetup()
+    {
+        mockMetastore.setAllTablesViewsImplemented(false);
+    }
+
+    @Test
+    public void testSelectSchemasWithoutPredicate()
+    {
+        resetMetastoreSetup();
+
+        assertMetastoreInvocations("SELECT * FROM information_schema.schemata", ImmutableMultiset.of(GET_ALL_DATABASES));
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.schemas", ImmutableMultiset.of(GET_ALL_DATABASES));
+    }
+
+    @Test
+    public void testSelectSchemasWithFilterByInformationSchema()
+    {
+        resetMetastoreSetup();
+
+        assertMetastoreInvocations("SELECT * FROM information_schema.schemata WHERE schema_name = 'information_schema'", ImmutableMultiset.of(GET_ALL_DATABASES));
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.schemas WHERE table_schem = 'information_schema'", ImmutableMultiset.of(GET_ALL_DATABASES));
+    }
+
+    @Test
+    public void testSelectSchemasWithLikeOverSchemaName()
+    {
+        resetMetastoreSetup();
+
+        assertMetastoreInvocations("SELECT * FROM information_schema.schemata WHERE schema_name LIKE 'test%'", ImmutableMultiset.of(GET_ALL_DATABASES));
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.schemas WHERE table_schem LIKE 'test%'", ImmutableMultiset.of(GET_ALL_DATABASES));
+    }
+
+    @Test
+    public void testSelectTablesWithoutPredicate()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        Multiset<Method> tables = ImmutableMultiset.<Method>builder()
+                .add(GET_ALL_TABLES)
+                .add(GET_ALL_VIEWS)
+                .build();
+        assertMetastoreInvocations("SELECT * FROM information_schema.tables", tables);
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables", tables);
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        tables = ImmutableMultiset.<Method>builder()
+                .add(GET_ALL_DATABASES)
+                .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                .build();
+        assertMetastoreInvocations("SELECT * FROM information_schema.tables", tables);
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables", tables);
+    }
+
+    @Test
+    public void testSelectTablesWithFilterByInformationSchema()
+    {
+        resetMetastoreSetup();
+
+        assertMetastoreInvocations("SELECT * FROM information_schema.tables WHERE table_schema = 'information_schema'", ImmutableMultiset.of());
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables WHERE table_schem = 'information_schema'", ImmutableMultiset.of());
+    }
+
+    @Test
+    public void testSelectTablesWithFilterBySchema()
+    {
+        resetMetastoreSetup();
+
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.tables WHERE table_schema = 'test_schema_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES_FROM_DATABASE)
+                        .add(GET_ALL_VIEWS_FROM_DATABASE)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.tables WHERE table_schem = 'test_schema_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES_FROM_DATABASE)
+                        .add(GET_ALL_VIEWS_FROM_DATABASE)
+                        .build());
+    }
+
+    @Test
+    public void testSelectTablesWithLikeOverSchema()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.tables WHERE table_schema LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.tables WHERE table_schem LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .build());
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        Multiset<Method> tables = ImmutableMultiset.<Method>builder()
+                .add(GET_ALL_DATABASES)
+                .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                .build();
+        assertMetastoreInvocations("SELECT * FROM information_schema.tables WHERE table_schema LIKE 'test%'", tables);
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables WHERE table_schem LIKE 'test%'", tables);
+    }
+
+    @Test
+    public void testSelectTablesWithFilterByTableName()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.tables WHERE table_name = 'test_table_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .build());
+
+        Multiset<Method> tables = ImmutableMultiset.<Method>builder()
+                .add(GET_ALL_TABLES)
+                .add(GET_ALL_VIEWS)
+                .build();
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables WHERE table_name = 'test_table_0'", tables);
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables WHERE table_name LIKE 'test\\_table\\_0' ESCAPE '\\'", tables);
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables WHERE table_name LIKE 'test_table_0' ESCAPE '\\'", tables);
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        tables = ImmutableMultiset.<Method>builder()
+                .add(GET_ALL_DATABASES)
+                .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                .build();
+        assertMetastoreInvocations("SELECT * FROM information_schema.tables WHERE table_name = 'test_table_0'", tables);
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables WHERE table_name = 'test_table_0'", tables);
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables WHERE table_name LIKE 'test\\_table\\_0' ESCAPE '\\'", tables);
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables WHERE table_name LIKE 'test_table_0' ESCAPE '\\'", tables);
+    }
+
+    @Test
+    public void testSelectTablesWithLikeOverTableName()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.tables WHERE table_name LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.tables WHERE table_name LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .build());
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        Multiset<Method> tables = ImmutableMultiset.<Method>builder()
+                .add(GET_ALL_DATABASES)
+                .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                .build();
+        assertMetastoreInvocations("SELECT * FROM information_schema.tables WHERE table_name LIKE 'test%'", tables);
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables WHERE table_name LIKE 'test%'", tables);
+    }
+
+    @Test
+    public void testSelectViewsWithoutPredicate()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        assertMetastoreInvocations("SELECT * FROM information_schema.views", ImmutableMultiset.of(GET_ALL_VIEWS));
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.tables WHERE table_type = 'VIEW'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .build());
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.views",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.tables WHERE table_type = 'VIEW'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .build());
+    }
+
+    @Test
+    public void testSelectViewsWithFilterByInformationSchema()
+    {
+        resetMetastoreSetup();
+
+        assertMetastoreInvocations("SELECT * FROM information_schema.views WHERE table_schema = 'information_schema'", ImmutableMultiset.of());
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables WHERE table_type = 'VIEW' AND table_schem = 'information_schema'", ImmutableMultiset.of());
+    }
+
+    @Test
+    public void testSelectViewsWithFilterBySchema()
+    {
+        resetMetastoreSetup();
+
+        assertMetastoreInvocations("SELECT * FROM information_schema.views WHERE table_schema = 'test_schema_0'", ImmutableMultiset.of(GET_ALL_VIEWS_FROM_DATABASE));
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.tables WHERE table_type = 'VIEW' AND table_schem = 'test_schema_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES_FROM_DATABASE)
+                        .add(GET_ALL_VIEWS_FROM_DATABASE)
+                        .build());
+    }
+
+    @Test
+    public void testSelectViewsWithLikeOverSchema()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.views WHERE table_schema LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_VIEWS)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.tables WHERE table_type = 'VIEW' AND table_schem LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .build());
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.views WHERE table_schema LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.tables WHERE table_type = 'VIEW' AND table_schem LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .build());
+    }
+
+    @Test
+    public void testSelectViewsWithFilterByTableName()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.views WHERE table_name = 'test_table_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_VIEWS)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.tables WHERE table_type = 'VIEW' AND table_name = 'test_table_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .build());
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.views WHERE table_name = 'test_table_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.tables WHERE table_type = 'VIEW' AND table_name = 'test_table_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .build());
+    }
+
+    @Test
+    public void testSelectViewsWithLikeOverTableName()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.views WHERE table_name LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_VIEWS)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.tables WHERE table_type = 'VIEW' AND table_name LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .build());
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.views WHERE table_name LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.tables WHERE table_type = 'VIEW' AND table_name LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .build());
+    }
+
+    @Test
+    public void testSelectColumnsWithoutPredicate()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        ImmutableMultiset<Method> tables = ImmutableMultiset.<Method>builder()
+                .add(GET_ALL_TABLES)
+                .add(GET_ALL_VIEWS)
+                .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                .build();
+        assertMetastoreInvocations("SELECT * FROM information_schema.columns", tables);
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.columns", tables);
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        tables = ImmutableMultiset.<Method>builder()
+                .add(GET_ALL_DATABASES)
+                .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                .build();
+        assertMetastoreInvocations("SELECT * FROM information_schema.columns", tables);
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.columns", tables);
+    }
+
+    @Test
+    public void testSelectColumnsFilterByInformationSchema()
+    {
+        resetMetastoreSetup();
+
+        assertMetastoreInvocations("SELECT * FROM information_schema.columns WHERE table_schema = 'information_schema'", ImmutableMultiset.of());
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.columns WHERE table_schem = 'information_schema'", ImmutableMultiset.of());
+    }
+
+    @Test
+    public void testSelectColumnsFilterBySchema()
+    {
+        resetMetastoreSetup();
+
+        assertMetastoreInvocations("SELECT * FROM information_schema.columns WHERE table_schema = 'test_schema_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES_FROM_DATABASE)
+                        .add(GET_ALL_VIEWS_FROM_DATABASE)
+                        .addCopies(GET_TABLE, TEST_TABLES_IN_SCHEMA_COUNT)
+                        .build());
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.columns WHERE table_schem = 'test_schema_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES_FROM_DATABASE)
+                        .add(GET_ALL_VIEWS_FROM_DATABASE)
+                        .addCopies(GET_TABLE, TEST_TABLES_IN_SCHEMA_COUNT)
+                        .build());
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.columns WHERE table_schem LIKE 'test\\_schema\\_0' ESCAPE '\\'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES_FROM_DATABASE)
+                        .add(GET_ALL_VIEWS_FROM_DATABASE)
+                        .addCopies(GET_TABLE, TEST_TABLES_IN_SCHEMA_COUNT)
+                        .build());
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.columns WHERE table_schem LIKE 'test_schema_0' ESCAPE '\\'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_TABLES_FROM_DATABASE)
+                        .add(GET_ALL_VIEWS_FROM_DATABASE)
+                        .addCopies(GET_TABLE, TEST_TABLES_IN_SCHEMA_COUNT)
+                        .build());
+    }
+
+    @Test
+    public void testSelectColumnsWithLikeOverSchema()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.columns WHERE table_schema LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE table_schem LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.columns WHERE table_schema LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE table_schem LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+    }
+
+    @Test
+    public void testSelectColumnsFilterByTableName()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.columns WHERE table_name = 'test_table_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        // TODO When there are many schemas, there are no "prefixes" and we end up calling ConnectorMetadata without any filter whatsoever.
+                        //  If such queries are common enough, we could iterate over schemas and for each schema try getting a table by given name.
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE table_name = 'test_table_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_TABLE, TEST_SCHEMAS_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE table_name LIKE 'test\\_table\\_0' ESCAPE '\\'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_TABLE, TEST_SCHEMAS_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE table_name LIKE 'test_table_0' ESCAPE '\\'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_TABLE, TEST_SCHEMAS_COUNT)
+                        .build());
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.columns WHERE table_name = 'test_table_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        // TODO When there are many schemas, there are no "prefixes" and we end up calling ConnectorMetadata without any filter whatsoever.
+                        //  If such queries are common enough, we could iterate over schemas and for each schema try getting a table by given name.
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE table_name = 'test_table_0'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_TABLE, TEST_SCHEMAS_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE table_name LIKE 'test\\_table\\_0' ESCAPE '\\'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_TABLE, TEST_SCHEMAS_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE table_name LIKE 'test_table_0' ESCAPE '\\'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_TABLE, TEST_SCHEMAS_COUNT)
+                        .build());
+    }
+
+    @Test
+    public void testSelectColumnsWithLikeOverTableName()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        assertMetastoreInvocations("SELECT * FROM information_schema.columns WHERE table_name LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.columns WHERE table_name LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.columns WHERE table_name LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE table_name LIKE 'test%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+    }
+
+    @Test
+    public void testSelectColumnsFilterByColumn()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.columns WHERE column_name = 'name'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE column_name = 'name'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.columns WHERE column_name = 'name'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE column_name = 'name'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+    }
+
+    @Test
+    public void testSelectColumnsWithLikeOverColumn()
+    {
+        resetMetastoreSetup();
+
+        mockMetastore.setAllTablesViewsImplemented(true);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.columns WHERE column_name LIKE 'n%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE column_name LIKE 'n%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES)
+                        .add(GET_ALL_VIEWS)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+
+        mockMetastore.setAllTablesViewsImplemented(false);
+        assertMetastoreInvocations(
+                "SELECT * FROM information_schema.columns WHERE column_name LIKE 'n%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+        assertMetastoreInvocations(
+                "SELECT * FROM system.jdbc.columns WHERE column_name LIKE 'n%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_ALL_VIEWS_FROM_DATABASE, TEST_SCHEMAS_COUNT)
+                        .addCopies(GET_TABLE, TEST_ALL_TABLES_COUNT)
+                        .build());
+    }
+
+    @Test
+    public void testSelectColumnsFilterByTableAndSchema()
+    {
+        resetMetastoreSetup();
+
+        assertMetastoreInvocations("SELECT * FROM information_schema.columns WHERE table_schema = 'test_schema_0' AND table_name = 'test_table_0'", ImmutableMultiset.of(GET_TABLE));
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.columns WHERE table_schem = 'test_schema_0' AND table_name = 'test_table_0'", ImmutableMultiset.of(GET_TABLE));
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.columns WHERE table_schem LIKE 'test\\_schema\\_0' ESCAPE '\\' AND table_name LIKE 'test\\_table\\_0' ESCAPE '\\'", ImmutableMultiset.of(GET_TABLE));
+        assertMetastoreInvocations("SELECT * FROM system.jdbc.columns WHERE table_schem LIKE 'test_schema_0' ESCAPE '\\' AND table_name LIKE 'test_table_0' ESCAPE '\\'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_DATABASES)
+                        .add(GET_ALL_TABLES_FROM_DATABASE)
+                        .add(GET_TABLE)
+                        .build());
+    }
+
+    private void assertMetastoreInvocations(@Language("SQL") String query, Multiset<?> expectedInvocations)
+    {
+        CountingAccessHiveMetastoreUtil.assertMetastoreInvocations(metastore, getQueryRunner(), getQueryRunner().getDefaultSession(), query, expectedInvocations);
+    }
+
+    private static class MockHiveMetastore
+            extends UnimplementedHiveMetastore
+    {
+        private static final List<String> SCHEMAS = IntStream.range(0, TEST_SCHEMAS_COUNT)
+                .mapToObj("test_schema_%d"::formatted)
+                .collect(toImmutableList());
+        private static final List<String> TABLES_PER_SCHEMA = IntStream.range(0, TEST_TABLES_IN_SCHEMA_COUNT)
+                .mapToObj("test_table_%d"::formatted)
+                .collect(toImmutableList());
+        private static final ImmutableList<SchemaTableName> ALL_TABLES = SCHEMAS.stream()
+                .flatMap(schema -> TABLES_PER_SCHEMA.stream()
+                        .map(table -> new SchemaTableName(schema, table)))
+                .collect(toImmutableList());
+
+        private boolean allTablesViewsImplemented;
+
+        @Override
+        public List<String> getAllDatabases()
+        {
+            return SCHEMAS;
+        }
+
+        @Override
+        public List<String> getAllTables(String databaseName)
+        {
+            return TABLES_PER_SCHEMA;
+        }
+
+        @Override
+        public Optional<List<SchemaTableName>> getAllTables()
+        {
+            if (allTablesViewsImplemented) {
+                return Optional.of(ALL_TABLES);
+            }
+            return Optional.empty();
+        }
+
+        @Override
+        public List<String> getAllViews(String databaseName)
+        {
+            return ImmutableList.of();
+        }
+
+        @Override
+        public Optional<List<SchemaTableName>> getAllViews()
+        {
+            if (allTablesViewsImplemented) {
+                return Optional.of(ImmutableList.of());
+            }
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<Table> getTable(String databaseName, String tableName)
+        {
+            return Optional.of(Table.builder()
+                    .setDatabaseName(databaseName)
+                    .setTableName(tableName)
+                    .setDataColumns(ImmutableList.of(
+                            new Column("id", HiveType.HIVE_INT, Optional.empty()),
+                            new Column("name", HiveType.HIVE_STRING, Optional.empty())))
+                    .setOwner(Optional.empty())
+                    .setTableType(MANAGED_TABLE.name())
+                    .withStorage(storage ->
+                            storage.setStorageFormat(fromHiveStorageFormat(ORC))
+                                    .setLocation(Optional.empty()))
+                    .build());
+        }
+
+        public void setAllTablesViewsImplemented(boolean allTablesViewsImplemented)
+        {
+            this.allTablesViewsImplemented = allTablesViewsImplemented;
+        }
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestHiveWithDisabledBatchFetch.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestHiveWithDisabledBatchFetch.java
new file mode 100644
index 000000000000..89f304fa2bf3
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestHiveWithDisabledBatchFetch.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.metastore.thrift;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.plugin.hive.HiveConfig;
+import io.trino.spi.connector.SchemaTableName;
+import org.apache.thrift.transport.TTransportException;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Optional;
+
+import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestHiveWithDisabledBatchFetch
+{
+    @Test
+    public void testBatchEnabled()
+    {
+        ThriftMetastore thriftMetastore = prepareThriftMetastore(true);
+        assertThat(thriftMetastore.getAllTables()).isPresent();
+        assertThat(thriftMetastore.getAllViews()).isPresent();
+    }
+
+    @Test
+    public void testBatchDisabled()
+    {
+        ThriftMetastore thriftMetastore = prepareThriftMetastore(false);
+        assertThat(thriftMetastore.getAllTables()).isEmpty();
+        assertThat(thriftMetastore.getAllViews()).isEmpty();
+    }
+
+    @Test
+    public void testFallbackInCaseOfMetastoreFailure()
+    {
+        ThriftMetastore thriftMetastore = testingThriftHiveMetastoreBuilder()
+                .thriftMetastoreConfig(new ThriftMetastoreConfig().setBatchMetadataFetchEnabled(true))
+                .metastoreClient(createFailingMetastoreClient())
+                .hiveConfig(new HiveConfig().setTranslateHiveViews(true))
+                .build();
+
+        assertThat(thriftMetastore.getAllTables()).isEmpty();
+        assertThat(thriftMetastore.getAllViews()).isEmpty();
+    }
+
+    private static ThriftMetastore prepareThriftMetastore(boolean enabled)
+    {
+        return testingThriftHiveMetastoreBuilder()
+                .thriftMetastoreConfig(new ThriftMetastoreConfig().setBatchMetadataFetchEnabled(enabled))
+                .metastoreClient(createFakeMetastoreClient())
+                .hiveConfig(new HiveConfig().setTranslateHiveViews(true))
+                .build();
+    }
+
+    private static ThriftMetastoreClient createFakeMetastoreClient()
+    {
+        return new MockThriftMetastoreClient()
+        {
+            @Override
+            public Optional<List<SchemaTableName>> getAllTables()
+            {
+                return Optional.of(ImmutableList.of(new SchemaTableName("test_schema", "test_table")));
+            }
+
+            @Override
+            public Optional<List<SchemaTableName>> getAllViews()
+            {
+                return Optional.of(ImmutableList.of(new SchemaTableName("test_schema", "test_view")));
+            }
+        };
+    }
+
+    private static ThriftMetastoreClient createFailingMetastoreClient()
+    {
+        return new MockThriftMetastoreClient()
+        {
+            @Override
+            public Optional<List<SchemaTableName>> getAllTables()
+                    throws TTransportException
+            {
+                throw new TTransportException();
+            }
+
+            @Override
+            public Optional<List<SchemaTableName>> getAllViews()
+                    throws TTransportException
+            {
+                throw new TTransportException();
+            }
+        };
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestMetastoreKerberosConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestMetastoreKerberosConfig.java
index e4ecb48cfd4c..79665d31b774 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestMetastoreKerberosConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestMetastoreKerberosConfig.java
@@ -15,9 +15,8 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.configuration.ConfigurationFactory;
-import org.testng.annotations.Test;
-
-import javax.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.AssertTrue;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestStaticMetastoreConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestStaticMetastoreConfig.java
index d94c46512982..96587454dc64 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestStaticMetastoreConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestStaticMetastoreConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.util.Map;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestStaticTokenAwareMetastoreClientFactory.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestStaticTokenAwareMetastoreClientFactory.java
index 51901c7711ce..f586c71945b6 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestStaticTokenAwareMetastoreClientFactory.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestStaticTokenAwareMetastoreClientFactory.java
@@ -19,7 +19,7 @@
 import io.airlift.testing.TestingTicker;
 import io.trino.hive.thrift.metastore.Table;
 import org.apache.thrift.TException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.SocketTimeoutException;
 import java.util.Map;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestTFilterTransport.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestTFilterTransport.java
index 2c78ba31b6ad..93772d27a4ee 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestTFilterTransport.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestTFilterTransport.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive.metastore.thrift;
 
 import org.apache.thrift.transport.TTransport;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftHiveMetastoreClient.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftHiveMetastoreClient.java
index 56dfcc9058a6..d89bad6ed705 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftHiveMetastoreClient.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftHiveMetastoreClient.java
@@ -17,7 +17,7 @@
 import org.apache.thrift.TConfiguration;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransport;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -49,6 +49,8 @@ public void testAlternativeCall()
                 new AtomicInteger(),
                 new AtomicInteger(),
                 new AtomicInteger(),
+                new AtomicInteger(),
+                new AtomicInteger(),
                 new AtomicInteger());
         assertThat(connectionCount.get()).isEqualTo(1);
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftMetastoreAuthenticationConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftMetastoreAuthenticationConfig.java
index 1aff03400fe8..4623fc067ca1 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftMetastoreAuthenticationConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftMetastoreAuthenticationConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreAuthenticationConfig.ThriftMetastoreAuthenticationType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftMetastoreConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftMetastoreConfig.java
index da3fa3277a96..a1ff862f78f7 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftMetastoreConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftMetastoreConfig.java
@@ -16,13 +16,14 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.HostAndPort;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
 
+import static io.airlift.configuration.testing.ConfigAssertions.assertDeprecatedEquivalence;
 import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
 import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
 import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
@@ -37,7 +38,8 @@ public class TestThriftMetastoreConfig
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(ThriftMetastoreConfig.class)
-                .setMetastoreTimeout(new Duration(10, SECONDS))
+                .setConnectTimeout(new Duration(10, SECONDS))
+                .setReadTimeout(new Duration(10, SECONDS))
                 .setSocksProxy(null)
                 .setMaxRetries(9)
                 .setBackoffScaleFactor(2.0)
@@ -56,7 +58,8 @@ public void testDefaults()
                 .setDeleteFilesOnDrop(false)
                 .setMaxWaitForTransactionLock(new Duration(10, MINUTES))
                 .setAssumeCanonicalPartitionKeys(false)
-                .setWriteStatisticsThreads(20));
+                .setWriteStatisticsThreads(20)
+                .setBatchMetadataFetchEnabled(true));
     }
 
     @Test
@@ -67,7 +70,8 @@ public void testExplicitPropertyMappings()
         Path truststoreFile = Files.createTempFile(null, null);
 
         Map<String, String> properties = ImmutableMap.<String, String>builder()
-                .put("hive.metastore-timeout", "20s")
+                .put("hive.metastore.thrift.client.connect-timeout", "22s")
+                .put("hive.metastore.thrift.client.read-timeout", "44s")
                 .put("hive.metastore.thrift.client.socks-proxy", "localhost:1234")
                 .put("hive.metastore.thrift.client.max-retries", "15")
                 .put("hive.metastore.thrift.client.backoff-scale-factor", "3.0")
@@ -87,10 +91,12 @@ public void testExplicitPropertyMappings()
                 .put("hive.metastore.thrift.write-statistics-threads", "10")
                 .put("hive.metastore.thrift.assume-canonical-partition-keys", "true")
                 .put("hive.metastore.thrift.use-spark-table-statistics-fallback", "false")
+                .put("hive.metastore.thrift.batch-fetch.enabled", "false")
                 .buildOrThrow();
 
         ThriftMetastoreConfig expected = new ThriftMetastoreConfig()
-                .setMetastoreTimeout(new Duration(20, SECONDS))
+                .setConnectTimeout(new Duration(22, SECONDS))
+                .setReadTimeout(new Duration(44, SECONDS))
                 .setSocksProxy(HostAndPort.fromParts("localhost", 1234))
                 .setMaxRetries(15)
                 .setBackoffScaleFactor(3.0)
@@ -109,8 +115,23 @@ public void testExplicitPropertyMappings()
                 .setMaxWaitForTransactionLock(new Duration(5, MINUTES))
                 .setAssumeCanonicalPartitionKeys(true)
                 .setWriteStatisticsThreads(10)
-                .setUseSparkTableStatisticsFallback(false);
+                .setUseSparkTableStatisticsFallback(false)
+                .setBatchMetadataFetchEnabled(false);
 
         assertFullMapping(properties, expected);
     }
+
+    @Test
+    public void testLegacyPropertyMappings()
+    {
+        assertDeprecatedEquivalence(
+                ThriftMetastoreConfig.class,
+                Map.of(
+                        "hive.metastore.thrift.client.connect-timeout", "42s",
+                        "hive.metastore.thrift.client.read-timeout", "42s",
+                        "hive.metastore.thrift.impersonation.enabled", "true"),
+                Map.of(
+                        "hive.metastore-timeout", "42s",
+                        "hive.metastore.impersonation-enabled", "true"));
+    }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftMetastoreUtil.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftMetastoreUtil.java
index 4e13a7599394..376fd82bb171 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftMetastoreUtil.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftMetastoreUtil.java
@@ -35,7 +35,7 @@
 import io.trino.plugin.hive.metastore.IntegerStatistics;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.security.TrinoPrincipal;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftSparkMetastoreUtil.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftSparkMetastoreUtil.java
index 171856d550dc..468fff71e728 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftSparkMetastoreUtil.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestThriftSparkMetastoreUtil.java
@@ -20,7 +20,7 @@
 import io.trino.plugin.hive.metastore.DoubleStatistics;
 import io.trino.plugin.hive.metastore.HiveColumnStatistics;
 import io.trino.plugin.hive.metastore.IntegerStatistics;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestTxnUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestTxnUtils.java
index 85d2ea3fb547..2ea00d3a6a4f 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestTxnUtils.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestTxnUtils.java
@@ -15,7 +15,7 @@
 
 import io.trino.hive.thrift.metastore.GetOpenTxnsResponse;
 import io.trino.hive.thrift.metastore.TableValidWriteIds;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.ByteBuffer;
 import java.util.BitSet;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestingTokenAwareMetastoreClientFactory.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestingTokenAwareMetastoreClientFactory.java
index 4f65cb429a6c..0fa8a586d8dc 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestingTokenAwareMetastoreClientFactory.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestingTokenAwareMetastoreClientFactory.java
@@ -38,7 +38,7 @@ public TestingTokenAwareMetastoreClientFactory(Optional<HostAndPort> socksProxy,
 
     public TestingTokenAwareMetastoreClientFactory(Optional<HostAndPort> socksProxy, HostAndPort address, Duration timeout)
     {
-        this.factory = new DefaultThriftMetastoreClientFactory(Optional.empty(), socksProxy, timeout, AUTHENTICATION, "localhost");
+        this.factory = new DefaultThriftMetastoreClientFactory(Optional.empty(), socksProxy, timeout, timeout, AUTHENTICATION, "localhost");
         this.address = requireNonNull(address, "address is null");
     }
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/optimizer/TestConnectorPushdownRulesWithHive.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/optimizer/TestConnectorPushdownRulesWithHive.java
index 18864c494069..f58af7606135 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/optimizer/TestConnectorPushdownRulesWithHive.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/optimizer/TestConnectorPushdownRulesWithHive.java
@@ -46,8 +46,8 @@
 import io.trino.sql.tree.SubscriptExpression;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -61,7 +61,7 @@
 import static io.trino.plugin.hive.HiveColumnHandle.createBaseColumn;
 import static io.trino.plugin.hive.HiveType.HIVE_INT;
 import static io.trino.plugin.hive.HiveType.toHiveType;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RowType.field;
@@ -355,7 +355,7 @@ public void testPushdownWithDuplicateExpressions()
         metastore.dropTable(SCHEMA_NAME, tableName, true);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
             throws IOException
     {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/optimizer/TestHivePlans.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/optimizer/TestHivePlans.java
index ca4bd44b5726..54c72c6597fb 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/optimizer/TestHivePlans.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/optimizer/TestHivePlans.java
@@ -23,9 +23,9 @@
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,12 +38,11 @@
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.trino.SystemSessionProperties.JOIN_DISTRIBUTION_TYPE;
 import static io.trino.SystemSessionProperties.JOIN_REORDERING_STRATEGY;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.exchange;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.join;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.output;
-import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.LOCAL;
 import static io.trino.sql.planner.plan.ExchangeNode.Scope.REMOTE;
@@ -93,7 +92,7 @@ protected LocalQueryRunner createQueryRunner(Session session, HiveMetastore meta
         return queryRunner;
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         QueryRunner queryRunner = getQueryRunner();
@@ -114,7 +113,7 @@ public void setUp()
         queryRunner.execute("CREATE TABLE table_unpartitioned AS SELECT str_col, int_col FROM (" + values + ") t(str_col, int_col)");
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
             throws Exception
     {
@@ -150,14 +149,12 @@ public void testPrunePartitionLikeFilter()
                                 .equiCriteria("L_STR_PART", "R_STR_COL")
                                 .left(
                                         exchange(REMOTE, REPARTITION,
-                                                project(
-                                                        filter("\"$like\"(L_STR_PART, \"$literal$\"(from_base64('DgAAAFZBUklBQkxFX1dJRFRIAQAAAAEAAAAHAAAAAAcAAAACAAAAdCUA')))",
-                                                                tableScan("table_str_partitioned", Map.of("L_INT_COL", "int_col", "L_STR_PART", "str_part"))))))
+                                                filter("\"$like\"(L_STR_PART, \"$literal$\"(from_base64('DgAAAFZBUklBQkxFX1dJRFRIAQAAAAEAAAAHAAAAAAcAAAACAAAAdCUA')))",
+                                                        tableScan("table_str_partitioned", Map.of("L_INT_COL", "int_col", "L_STR_PART", "str_part")))))
                                 .right(exchange(LOCAL,
                                         exchange(REMOTE, REPARTITION,
-                                                project(
-                                                        filter("R_STR_COL IN ('three', CAST('two' AS varchar(5))) AND \"$like\"(R_STR_COL, \"$literal$\"(from_base64('DgAAAFZBUklBQkxFX1dJRFRIAQAAAAEAAAAHAAAAAAcAAAACAAAAdCUA')))",
-                                                                tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col"))))))))));
+                                                filter("R_STR_COL IN ('three', CAST('two' AS varchar(5))) AND \"$like\"(R_STR_COL, \"$literal$\"(from_base64('DgAAAFZBUklBQkxFX1dJRFRIAQAAAAEAAAAHAAAAAAcAAAACAAAAdCUA')))",
+                                                        tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col")))))))));
     }
 
     @Test
@@ -174,15 +171,13 @@ public void testSubsumePartitionFilter()
                                 .equiCriteria("L_INT_PART", "R_INT_COL")
                                 .left(
                                         exchange(REMOTE, REPARTITION,
-                                                project(
-                                                        filter("true", // dynamic filter
-                                                                tableScan("table_int_partitioned", Map.of("L_INT_PART", "int_part", "L_STR_COL", "str_col"))))))
+                                                filter("true", // dynamic filter
+                                                        tableScan("table_int_partitioned", Map.of("L_INT_PART", "int_part", "L_STR_COL", "str_col")))))
                                 .right(
                                         exchange(LOCAL,
                                                 exchange(REMOTE, REPARTITION,
-                                                        project(
-                                                                filter("R_INT_COL IN (2, 3, 4)",
-                                                                        tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col"))))))))));
+                                                        filter("R_INT_COL IN (2, 3, 4)",
+                                                                tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col")))))))));
     }
 
     @Test
@@ -200,15 +195,13 @@ public void testSubsumePartitionPartOfAFilter()
                                 .equiCriteria("L_INT_PART", "R_INT_COL")
                                 .left(
                                         exchange(REMOTE, REPARTITION,
-                                                project(
-                                                        filter("L_STR_COL != 'three'",
-                                                                tableScan("table_int_partitioned", Map.of("L_INT_PART", "int_part", "L_STR_COL", "str_col"))))))
+                                                filter("L_STR_COL != 'three'",
+                                                        tableScan("table_int_partitioned", Map.of("L_INT_PART", "int_part", "L_STR_COL", "str_col")))))
                                 .right(
                                         exchange(LOCAL,
                                                 exchange(REMOTE, REPARTITION,
-                                                        project(
-                                                                filter("R_INT_COL IN (2, 3, 4) AND R_INT_COL BETWEEN 2 AND 4", // TODO: R_INT_COL BETWEEN 2 AND 4 is redundant
-                                                                        tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col"))))))))));
+                                                        filter("R_INT_COL IN (2, 3, 4) AND R_INT_COL BETWEEN 2 AND 4", // TODO: R_INT_COL BETWEEN 2 AND 4 is redundant
+                                                                tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col")))))))));
     }
 
     @Test
@@ -226,15 +219,13 @@ public void testSubsumePartitionPartWhenOtherFilterNotConvertibleToTupleDomain()
                                 .equiCriteria("L_INT_PART", "R_INT_COL")
                                 .left(
                                         exchange(REMOTE, REPARTITION,
-                                                project(
-                                                        filter("substring(L_STR_COL, BIGINT '2') != CAST('hree' AS varchar(5))",
-                                                                tableScan("table_int_partitioned", Map.of("L_INT_PART", "int_part", "L_STR_COL", "str_col"))))))
+                                                filter("substring(L_STR_COL, BIGINT '2') != CAST('hree' AS varchar(5))",
+                                                        tableScan("table_int_partitioned", Map.of("L_INT_PART", "int_part", "L_STR_COL", "str_col")))))
                                 .right(
                                         exchange(LOCAL,
                                                 exchange(REMOTE, REPARTITION,
-                                                        project(
-                                                                filter("R_INT_COL IN (2, 3, 4) AND R_INT_COL BETWEEN 2 AND 4", // TODO: R_INT_COL BETWEEN 2 AND 4 is redundant
-                                                                        tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col"))))))))));
+                                                        filter("R_INT_COL IN (2, 3, 4) AND R_INT_COL BETWEEN 2 AND 4", // TODO: R_INT_COL BETWEEN 2 AND 4 is redundant
+                                                                tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col")))))))));
     }
 
     @Test
@@ -252,15 +243,13 @@ public void testSubsumePartitionFilterNotConvertibleToTupleDomain()
                                 .equiCriteria("L_INT_PART", "R_INT_COL")
                                 .left(
                                         exchange(REMOTE, REPARTITION,
-                                                project(
-                                                        filter("L_INT_PART % 2 = 0",
-                                                                tableScan("table_int_partitioned", Map.of("L_INT_PART", "int_part", "L_STR_COL", "str_col"))))))
+                                                filter("L_INT_PART % 2 = 0",
+                                                        tableScan("table_int_partitioned", Map.of("L_INT_PART", "int_part", "L_STR_COL", "str_col")))))
                                 .right(
                                         exchange(LOCAL,
                                                 exchange(REMOTE, REPARTITION,
-                                                        project(
-                                                                filter("R_INT_COL IN (2, 4) AND R_INT_COL % 2 = 0",
-                                                                        tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col"))))))))));
+                                                        filter("R_INT_COL IN (2, 4) AND R_INT_COL % 2 = 0",
+                                                                tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col")))))))));
     }
 
     @Test
@@ -275,15 +264,13 @@ public void testFilterDerivedFromTableProperties()
                                 .equiCriteria("L_INT_PART", "R_INT_COL")
                                 .left(
                                         exchange(REMOTE, REPARTITION,
-                                                project(
-                                                        filter("true", //dynamic filter
-                                                                tableScan("table_int_partitioned", Map.of("L_INT_PART", "int_part", "L_STR_COL", "str_col"))))))
+                                                filter("true", //dynamic filter
+                                                        tableScan("table_int_partitioned", Map.of("L_INT_PART", "int_part", "L_STR_COL", "str_col")))))
                                 .right(
                                         exchange(LOCAL,
                                                 exchange(REMOTE, REPARTITION,
-                                                        project(
-                                                                filter("R_INT_COL IN (1, 2, 3, 4, 5)",
-                                                                        tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col"))))))))));
+                                                        filter("R_INT_COL IN (1, 2, 3, 4, 5)",
+                                                                tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col")))))))));
     }
 
     @Test
@@ -296,14 +283,12 @@ public void testQueryScanningForTooManyPartitions()
                         join(INNER, builder -> builder
                                 .equiCriteria("L_INT_PART", "R_INT_COL")
                                 .left(
-                                        project(
-                                                filter("true", //dynamic filter
-                                                        tableScan("table_int_with_too_many_partitions", Map.of("L_INT_PART", "int_part", "L_STR_COL", "str_col")))))
+                                        filter("true", //dynamic filter
+                                                tableScan("table_int_with_too_many_partitions", Map.of("L_INT_PART", "int_part", "L_STR_COL", "str_col"))))
                                 .right(
                                         exchange(LOCAL,
                                                 exchange(REMOTE, REPLICATE,
-                                                        project(
-                                                                tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col")))))))));
+                                                        tableScan("table_unpartitioned", Map.of("R_STR_COL", "str_col", "R_INT_COL", "int_col"))))))));
     }
 
     // Disable join ordering so that expected plans are well defined.
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/optimizer/TestHiveProjectionPushdownIntoTableScan.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/optimizer/TestHiveProjectionPushdownIntoTableScan.java
index f3847b765566..679bce14b825 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/optimizer/TestHiveProjectionPushdownIntoTableScan.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/optimizer/TestHiveProjectionPushdownIntoTableScan.java
@@ -30,8 +30,8 @@
 import io.trino.spi.security.PrincipalType;
 import io.trino.sql.planner.assertions.BasePushdownPlanTest;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,7 +43,7 @@
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.trino.plugin.hive.TestHiveReaderProjectionsUtil.createProjectedColumnHandle;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.any;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
@@ -213,7 +213,7 @@ public void testDereferencePushdown()
                                                                 ImmutableMap.of("s_expr_1", column1Handle::equals))))))));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
             throws Exception
     {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestHiveOrcWithShortZoneId.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestHiveOrcWithShortZoneId.java
new file mode 100644
index 000000000000..0e07eb2ecc2d
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestHiveOrcWithShortZoneId.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.orc;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.plugin.hive.HiveQueryRunner;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.sql.TestTable;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.testing.containers.TestContainers.getPathFromClassPathResource;
+
+public class TestHiveOrcWithShortZoneId
+        extends AbstractTestQueryFramework
+{
+    private String resourceLocation;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        // See README.md to know how resource is generated
+        resourceLocation = getPathFromClassPathResource("with_short_zone_id/data");
+        return HiveQueryRunner.builder()
+                .addHiveProperty("hive.orc.read-legacy-short-zone-id", "true")
+                .build();
+    }
+
+    @Test
+    public void testSelectWithShortZoneId()
+    {
+        // When table is created using ORC file that contains short zone id in stripe footer
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_select_with_short_zone_id_",
+                "(id INT, firstName VARCHAR, lastName VARCHAR) WITH (external_location = '%s')".formatted(resourceLocation))) {
+            assertQuery("SELECT * FROM " + testTable.getName(), "VALUES (1, 'John', 'Doe')");
+        }
+    }
+
+    @Test
+    public void testSelectWithoutShortZoneId()
+    {
+        // When table is created by trino
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_select_without_short_zone_id_",
+                "(id INT, firstName VARCHAR, lastName VARCHAR)",
+                ImmutableList.of("2, 'Alice', 'Doe'"))) {
+            assertQuery("SELECT * FROM " + testTable.getName(), "VALUES (2, 'Alice', 'Doe')");
+        }
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcDeleteDeltaPageSource.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcDeleteDeltaPageSource.java
index d321ef3a6a8d..218ecea7684d 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcDeleteDeltaPageSource.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcDeleteDeltaPageSource.java
@@ -16,20 +16,19 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Resources;
 import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.local.LocalInputFile;
 import io.trino.orc.OrcReaderOptions;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.spi.connector.ConnectorPageSource;
-import io.trino.spi.security.ConnectorIdentity;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.MaterializedRow;
 import org.apache.hadoop.hive.ql.io.AcidOutputFormat;
 import org.apache.hadoop.hive.ql.io.BucketCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
 import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.plugin.hive.HiveTestUtils.SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
@@ -42,7 +41,7 @@ public void testReadingDeletedRows()
             throws Exception
     {
         File deleteDeltaFile = new File(Resources.getResource("fullacid_delete_delta_test/delete_delta_0000004_0000004_0000/bucket_00000").toURI());
-        TrinoInputFile inputFile = HDFS_FILE_SYSTEM_FACTORY.create(ConnectorIdentity.ofUser("test")).newInputFile(deleteDeltaFile.toURI().toString());
+        TrinoInputFile inputFile = new LocalInputFile(deleteDeltaFile);
         OrcDeleteDeltaPageSourceFactory pageSourceFactory = new OrcDeleteDeltaPageSourceFactory(
                 new OrcReaderOptions(),
                 new FileFormatDataSourceStats());
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcDeletedRows.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcDeletedRows.java
index ea221ecd5c85..75da49ea9444 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcDeletedRows.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcDeletedRows.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive.orc;
 
 import com.google.common.collect.ImmutableSet;
+import io.trino.filesystem.Location;
 import io.trino.orc.OrcReaderOptions;
 import io.trino.plugin.hive.AcidInfo;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
@@ -22,15 +23,14 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.security.ConnectorIdentity;
-import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.ql.io.AcidUtils;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Set;
 
+import static com.google.common.io.Resources.getResource;
 import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.plugin.hive.HiveTestUtils.SESSION;
@@ -41,20 +41,21 @@
 
 public class TestOrcDeletedRows
 {
-    private Path partitionDirectory;
-    private Block rowIdBlock;
-    private Block bucketBlock;
+    private final Location partitionDirectory;
+    private final Block rowIdBlock;
+    private final Block bucketBlock;
 
-    @BeforeClass
-    public void setUp()
+    public TestOrcDeletedRows()
     {
-        partitionDirectory = new Path(TestOrcDeletedRows.class.getClassLoader().getResource("fullacid_delete_delta_test") + "/");
-        rowIdBlock = BIGINT.createFixedSizeBlockBuilder(1)
-                .writeLong(0)
-                .build();
-        bucketBlock = INTEGER.createFixedSizeBlockBuilder(1)
-                .writeInt(536870912)
-                .build();
+        partitionDirectory = Location.of(getResource("fullacid_delete_delta_test").toString());
+
+        BlockBuilder rowIdBlockBuilder = BIGINT.createFixedSizeBlockBuilder(1);
+        BIGINT.writeLong(rowIdBlockBuilder, 0);
+        rowIdBlock = rowIdBlockBuilder.build();
+
+        BlockBuilder bucketBlockBuilder = INTEGER.createFixedSizeBlockBuilder(1);
+        INTEGER.writeInt(bucketBlockBuilder, 536870912);
+        bucketBlock = bucketBlockBuilder.build();
     }
 
     @Test
@@ -86,12 +87,12 @@ public void testDeleteLocations()
     @Test
     public void testDeletedLocationsOriginalFiles()
     {
-        Path path = new Path(TestOrcDeletedRows.class.getClassLoader().getResource("dummy_id_data_orc") + "/");
+        Location path = Location.of(getResource("dummy_id_data_orc").toString());
         AcidInfo.Builder acidInfoBuilder = AcidInfo.builder(path);
         addDeleteDelta(acidInfoBuilder, 10000001L, 10000001L, OptionalInt.of(0), path);
 
-        acidInfoBuilder.addOriginalFile(new Path(path, "000000_0"), 743, 0);
-        acidInfoBuilder.addOriginalFile(new Path(path, "000001_0"), 730, 0);
+        acidInfoBuilder.addOriginalFile(path.appendPath("000000_0"), 743, 0);
+        acidInfoBuilder.addOriginalFile(path.appendPath("000001_0"), 730, 0);
 
         OrcDeletedRows deletedRows = createOrcDeletedRows(acidInfoBuilder.buildWithRequiredOriginalFiles(0), "000000_0");
 
@@ -137,16 +138,13 @@ public void testDeletedLocationsAfterMinorCompaction()
         assertEquals(block.getPositionCount(), 10);
     }
 
-    private void addDeleteDelta(AcidInfo.Builder acidInfoBuilder, long minWriteId, long maxWriteId, OptionalInt statementId, Path path)
+    private static void addDeleteDelta(AcidInfo.Builder acidInfoBuilder, long minWriteId, long maxWriteId, OptionalInt statementId, Location path)
     {
-        Path deleteDeltaPath;
-        if (statementId.isPresent()) {
-            deleteDeltaPath = new Path(path, AcidUtils.deleteDeltaSubdir(minWriteId, maxWriteId, statementId.getAsInt()));
-        }
-        else {
-            deleteDeltaPath = new Path(path, AcidUtils.deleteDeltaSubdir(minWriteId, maxWriteId));
-        }
-        acidInfoBuilder.addDeleteDelta(deleteDeltaPath);
+        String subdir = statementId.stream()
+                .mapToObj(id -> AcidUtils.deleteDeltaSubdir(minWriteId, maxWriteId, id))
+                .findFirst()
+                .orElseGet(() -> AcidUtils.deleteDeltaSubdir(minWriteId, maxWriteId));
+        acidInfoBuilder.addDeleteDelta(path.appendPath(subdir));
     }
 
     private static OrcDeletedRows createOrcDeletedRows(AcidInfo acidInfo, String sourceFileName)
@@ -177,7 +175,7 @@ private Page createTestPage(int originalTransactionStart, int originalTransactio
         int size = originalTransactionEnd - originalTransactionStart;
         BlockBuilder originalTransaction = BIGINT.createFixedSizeBlockBuilder(size);
         for (long i = originalTransactionStart; i < originalTransactionEnd; i++) {
-            originalTransaction.writeLong(i);
+            BIGINT.writeLong(originalTransaction, i);
         }
 
         return new Page(
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcPageSourceFactory.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcPageSourceFactory.java
index eaef3e403ad0..bfacda276d03 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcPageSourceFactory.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcPageSourceFactory.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.plugin.hive.AcidInfo;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
@@ -30,10 +31,7 @@
 import io.trino.tpch.Nation;
 import io.trino.tpch.NationColumn;
 import io.trino.tpch.NationGenerator;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobConf;
-import org.assertj.core.api.Assertions;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.net.URISyntaxException;
@@ -50,11 +48,11 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.io.Resources.getResource;
-import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
 import static io.trino.plugin.hive.HiveColumnHandle.createBaseColumn;
 import static io.trino.plugin.hive.HiveStorageFormat.ORC;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.plugin.hive.HiveTestUtils.SESSION;
 import static io.trino.plugin.hive.HiveType.toHiveType;
 import static io.trino.plugin.hive.acid.AcidTransaction.NO_ACID_TRANSACTION;
@@ -70,6 +68,7 @@
 import static org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.TABLE_IS_TRANSACTIONAL;
 import static org.apache.hadoop.hive.ql.io.AcidUtils.deleteDeltaSubdir;
 import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_LIB;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 
@@ -78,7 +77,7 @@ public class TestOrcPageSourceFactory
     private static final Map<NationColumn, Integer> ALL_COLUMNS = ImmutableMap.of(NATION_KEY, 0, NAME, 1, REGION_KEY, 2, COMMENT, 3);
     private static final HivePageSourceFactory PAGE_SOURCE_FACTORY = new OrcPageSourceFactory(
             new OrcReaderConfig(),
-            new HdfsFileSystemFactory(HDFS_ENVIRONMENT),
+            new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS),
             new FileFormatDataSourceStats(),
             new HiveConfig());
 
@@ -115,10 +114,10 @@ public void testSomeStripesAndRowGroupRead()
     @Test
     public void testDeletedRows()
     {
-        Path partitionLocation = new Path(getClass().getClassLoader().getResource("nation_delete_deltas") + "/");
+        Location partitionLocation = Location.of(getResource("nation_delete_deltas").toString());
         Optional<AcidInfo> acidInfo = AcidInfo.builder(partitionLocation)
-                .addDeleteDelta(new Path(partitionLocation, deleteDeltaSubdir(3L, 3L, 0)))
-                .addDeleteDelta(new Path(partitionLocation, deleteDeltaSubdir(4L, 4L, 0)))
+                .addDeleteDelta(partitionLocation.appendPath(deleteDeltaSubdir(3L, 3L, 0)))
+                .addDeleteDelta(partitionLocation.appendPath(deleteDeltaSubdir(4L, 4L, 0)))
                 .build();
 
         assertRead(ALL_COLUMNS, OptionalLong.empty(), acidInfo, nationKey -> nationKey == 5 || nationKey == 19);
@@ -129,9 +128,9 @@ public void testReadWithAcidVersionValidationHive3()
             throws Exception
     {
         File tableFile = new File(getResource("acid_version_validation/acid_version_hive_3/00000_0").toURI());
-        String tablePath = tableFile.getParent();
+        Location tablePath = Location.of(tableFile.getParentFile().toURI().toString());
 
-        Optional<AcidInfo> acidInfo = AcidInfo.builder(new Path(tablePath))
+        Optional<AcidInfo> acidInfo = AcidInfo.builder(tablePath)
                 .setOrcAcidVersionValidated(false)
                 .build();
 
@@ -144,13 +143,13 @@ public void testReadWithAcidVersionValidationNoVersionInMetadata()
             throws Exception
     {
         File tableFile = new File(getResource("acid_version_validation/no_orc_acid_version_in_metadata/00000_0").toURI());
-        String tablePath = tableFile.getParent();
+        Location tablePath = Location.of(tableFile.getParentFile().toURI().toString());
 
-        Optional<AcidInfo> acidInfo = AcidInfo.builder(new Path(tablePath))
+        Optional<AcidInfo> acidInfo = AcidInfo.builder(tablePath)
                 .setOrcAcidVersionValidated(false)
                 .build();
 
-        Assertions.assertThatThrownBy(() -> readFile(Map.of(), OptionalLong.empty(), acidInfo, tableFile.getPath(), 730))
+        assertThatThrownBy(() -> readFile(Map.of(), OptionalLong.empty(), acidInfo, tableFile.getPath(), 730))
                 .hasMessageMatching("Hive transactional tables are supported since Hive 3.0. Expected `hive.acid.version` in ORC metadata" +
                         " in .*/acid_version_validation/no_orc_acid_version_in_metadata/00000_0 to be >=2 but was <empty>." +
                         " If you have upgraded from an older version of Hive, make sure a major compaction has been run at least once after the upgrade.");
@@ -161,11 +160,11 @@ public void testFullFileReadOriginalFilesTable()
             throws Exception
     {
         File tableFile = new File(getResource("fullacidNationTableWithOriginalFiles/000000_0").toURI());
-        String tablePath = tableFile.getParent();
+        Location tablePath = Location.of(tableFile.toURI().toString()).parentDirectory();
 
-        AcidInfo acidInfo = AcidInfo.builder(new Path(tablePath))
-                .addDeleteDelta(new Path(tablePath, deleteDeltaSubdir(10000001, 10000001, 0)))
-                .addOriginalFile(new Path(tablePath, "000000_0"), 1780, 0)
+        AcidInfo acidInfo = AcidInfo.builder(tablePath)
+                .addDeleteDelta(tablePath.appendPath(deleteDeltaSubdir(10000001, 10000001, 0)))
+                .addOriginalFile(tablePath.appendPath("000000_0"), 1780, 0)
                 .setOrcAcidVersionValidated(true)
                 .buildWithRequiredOriginalFiles(0);
 
@@ -231,9 +230,8 @@ private static List<Nation> readFile(Map<NationColumn, Integer> columns, Optiona
                 .collect(toImmutableList());
 
         Optional<ReaderPageSource> pageSourceWithProjections = PAGE_SOURCE_FACTORY.createPageSource(
-                new JobConf(newEmptyConfiguration()),
                 SESSION,
-                new Path(filePath),
+                Location.of(filePath),
                 0,
                 fileSize,
                 fileSize,
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcPredicates.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcPredicates.java
index ee9c89db5d3d..83d3e8521153 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcPredicates.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcPredicates.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import io.trino.filesystem.Location;
 import io.trino.orc.OrcReaderOptions;
 import io.trino.orc.OrcWriterOptions;
 import io.trino.plugin.hive.AbstractTestHiveFileFormats;
@@ -33,7 +34,7 @@
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
 import org.apache.hadoop.mapred.FileSplit;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.time.Instant;
@@ -47,7 +48,6 @@
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
 import static io.trino.plugin.hive.HivePageSourceProvider.ColumnMapping.buildColumnMappings;
 import static io.trino.plugin.hive.HiveStorageFormat.ORC;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
@@ -211,28 +211,24 @@ private ConnectorPageSource createPageSource(
                 columnHandles,
                 ImmutableList.of(),
                 TableToPartitionMapping.empty(),
-                split.getPath(),
+                split.getPath().toString(),
                 OptionalInt.empty(),
                 split.getLength(),
                 Instant.now().toEpochMilli());
 
         Optional<ConnectorPageSource> pageSource = HivePageSourceProvider.createHivePageSource(
                 ImmutableSet.of(readerFactory),
-                ImmutableSet.of(),
-                newEmptyConfiguration(),
                 session,
-                split.getPath(),
+                Location.of(split.getPath().toString()),
                 OptionalInt.empty(),
                 split.getStart(),
                 split.getLength(),
                 split.getLength(),
                 splitProperties,
                 predicate,
-                columnHandles,
                 TESTING_TYPE_MANAGER,
                 Optional.empty(),
                 Optional.empty(),
-                false,
                 Optional.empty(),
                 false,
                 NO_ACID_TRANSACTION,
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcReaderConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcReaderConfig.java
index fea3f4ba09af..c71eb8d04bea 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcReaderConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcReaderConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
 import io.airlift.units.DataSize.Unit;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -38,7 +38,8 @@ public void testDefaults()
                 .setTinyStripeThreshold(DataSize.of(8, Unit.MEGABYTE))
                 .setMaxBlockSize(DataSize.of(16, Unit.MEGABYTE))
                 .setLazyReadSmallRanges(true)
-                .setNestedLazy(true));
+                .setNestedLazy(true)
+                .setReadLegacyShortZoneId(false));
     }
 
     @Test
@@ -54,6 +55,7 @@ public void testExplicitPropertyMappings()
                 .put("hive.orc.max-read-block-size", "66kB")
                 .put("hive.orc.lazy-read-small-ranges", "false")
                 .put("hive.orc.nested-lazy", "false")
+                .put("hive.orc.read-legacy-short-zone-id", "true")
                 .buildOrThrow();
 
         OrcReaderConfig expected = new OrcReaderConfig()
@@ -65,7 +67,8 @@ public void testExplicitPropertyMappings()
                 .setTinyStripeThreshold(DataSize.of(61, Unit.KILOBYTE))
                 .setMaxBlockSize(DataSize.of(66, Unit.KILOBYTE))
                 .setLazyReadSmallRanges(false)
-                .setNestedLazy(false);
+                .setNestedLazy(false)
+                .setReadLegacyShortZoneId(true);
 
         assertFullMapping(properties, expected);
     }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcWriterOptions.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcWriterOptions.java
index a6b71af7b07a..b986a86ac67d 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcWriterOptions.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/orc/TestOrcWriterOptions.java
@@ -27,8 +27,8 @@
 import static io.trino.plugin.hive.HiveMetadata.ORC_BLOOM_FILTER_COLUMNS_KEY;
 import static io.trino.plugin.hive.HiveMetadata.ORC_BLOOM_FILTER_FPP_KEY;
 import static io.trino.plugin.hive.util.HiveUtil.getOrcWriterOptions;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestOrcWriterOptions
 {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/AbstractTestParquetReader.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/AbstractTestParquetReader.java
index fb35fc78f389..c8da88c636c1 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/AbstractTestParquetReader.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/AbstractTestParquetReader.java
@@ -1192,6 +1192,49 @@ public void testParquetShortDecimalWriteToTrinoTinyBlockWithNonZeroScale()
                 .isInstanceOf(TrinoException.class);
     }
 
+    @Test
+    public void testReadParquetInt32AsTrinoShortDecimal()
+            throws Exception
+    {
+        Iterable<Integer> writeValues = intsBetween(0, 31_234);
+        Optional<MessageType> parquetSchema = Optional.of(parseMessageType("message hive_decimal { optional INT32 test; }"));
+        // Read INT32 as a short decimal of precision >= 10 with zero scale
+        tester.testRoundTrip(
+                javaIntObjectInspector,
+                writeValues,
+                transform(writeValues, value -> new SqlDecimal(BigInteger.valueOf(value), 10, 0)),
+                createDecimalType(10),
+                parquetSchema);
+
+        // Read INT32 as a short decimal of precision >= 10 with non-zero scale
+        tester.testRoundTrip(
+                javaIntObjectInspector,
+                ImmutableList.of(Integer.MAX_VALUE),
+                ImmutableList.of(new SqlDecimal(BigInteger.valueOf(Integer.MAX_VALUE), 10, 1)),
+                createDecimalType(10, 1),
+                parquetSchema);
+
+        // Read INT32 as a short decimal if value is within supported precision
+        tester.testRoundTrip(
+                javaIntObjectInspector,
+                ImmutableList.of(9999),
+                ImmutableList.of(new SqlDecimal(BigInteger.valueOf(9999), 4, 0)),
+                createDecimalType(4, 0),
+                parquetSchema);
+
+        // Cannot read INT32 as a short decimal if value exceeds supported precision
+        assertThatThrownBy(() -> tester.assertRoundTripWithHiveWriter(
+                List.of(javaIntObjectInspector),
+                new Iterable[] {ImmutableList.of(Integer.MAX_VALUE)},
+                new Iterable[] {ImmutableList.of(new SqlDecimal(BigInteger.valueOf(Integer.MAX_VALUE), 9, 0))},
+                List.of("test"),
+                List.of(createDecimalType(9, 0)),
+                parquetSchema,
+                ParquetSchemaOptions.defaultOptions()))
+                .hasMessage("Cannot read parquet INT32 value '2147483647' as DECIMAL(9, 0)")
+                .isInstanceOf(TrinoException.class);
+    }
+
     @Test(dataProvider = "timestampPrecision")
     public void testTimestamp(HiveTimestampPrecision precision)
             throws Exception
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/ParquetTester.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/ParquetTester.java
index e98e82ebe996..201828ba45ba 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/ParquetTester.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/ParquetTester.java
@@ -22,15 +22,13 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
-import io.trino.filesystem.TrinoFileSystem;
-import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.local.LocalInputFile;
 import io.trino.parquet.ParquetReaderOptions;
 import io.trino.parquet.writer.ParquetSchemaConverter;
 import io.trino.parquet.writer.ParquetWriter;
 import io.trino.parquet.writer.ParquetWriterOptions;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.HiveFormatsConfig;
 import io.trino.plugin.hive.HiveSessionProperties;
 import io.trino.plugin.hive.HiveStorageFormat;
 import io.trino.plugin.hive.benchmark.FileFormat;
@@ -44,8 +42,12 @@
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.RecordCursor;
@@ -114,7 +116,6 @@
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_WRITE_VALIDATION_FAILED;
 import static io.trino.plugin.hive.HiveSessionProperties.getParquetMaxReadBlockSize;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.plugin.hive.HiveTestUtils.getHiveSession;
 import static io.trino.plugin.hive.util.HiveUtil.isStructuralType;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -156,11 +157,7 @@ public class ParquetTester
 {
     private static final int MAX_PRECISION_INT64 = toIntExact(maxPrecision(8));
 
-    private static final ConnectorSession SESSION = getHiveSession(
-            createHiveConfig(false), new ParquetReaderConfig().setOptimizedReaderEnabled(false));
-
-    private static final ConnectorSession SESSION_OPTIMIZED_READER = getHiveSession(
-            createHiveConfig(false), new ParquetReaderConfig().setOptimizedReaderEnabled(true));
+    private static final ConnectorSession SESSION = getHiveSession(createHiveConfig(false));
 
     private static final ConnectorSession SESSION_USE_NAME = getHiveSession(createHiveConfig(true));
 
@@ -186,23 +183,13 @@ public static ParquetTester quickParquetTester()
                 StandardFileFormats.TRINO_PARQUET);
     }
 
-    public static ParquetTester quickOptimizedParquetTester()
-    {
-        return new ParquetTester(
-                ImmutableSet.of(GZIP),
-                ImmutableSet.of(GZIP),
-                ImmutableSet.of(PARQUET_1_0),
-                ImmutableSet.of(SESSION_OPTIMIZED_READER),
-                StandardFileFormats.TRINO_PARQUET);
-    }
-
     public static ParquetTester fullParquetTester()
     {
         return new ParquetTester(
                 ImmutableSet.of(GZIP, UNCOMPRESSED, SNAPPY, LZO, LZ4, ZSTD),
                 ImmutableSet.of(GZIP, UNCOMPRESSED, SNAPPY, ZSTD),
                 ImmutableSet.copyOf(WriterVersion.values()),
-                ImmutableSet.of(SESSION, SESSION_USE_NAME, SESSION_OPTIMIZED_READER),
+                ImmutableSet.of(SESSION, SESSION_USE_NAME),
                 StandardFileFormats.TRINO_PARQUET);
     }
 
@@ -356,6 +343,41 @@ void assertRoundTrip(
             Optional<MessageType> parquetSchema,
             ParquetSchemaOptions schemaOptions)
             throws Exception
+    {
+        assertRoundTripWithHiveWriter(objectInspectors, writeValues, readValues, columnNames, columnTypes, parquetSchema, schemaOptions);
+
+        // write Trino parquet
+        for (CompressionCodec compressionCodec : writerCompressions) {
+            for (ConnectorSession session : sessions) {
+                try (TempFile tempFile = new TempFile("test", "parquet")) {
+                    OptionalInt min = stream(writeValues).mapToInt(Iterables::size).min();
+                    checkState(min.isPresent());
+                    writeParquetColumnTrino(tempFile.getFile(), columnTypes, columnNames, getIterators(readValues), min.getAsInt(), compressionCodec, schemaOptions);
+                    assertFileContents(
+                            session,
+                            tempFile.getFile(),
+                            getIterators(readValues),
+                            columnNames,
+                            columnTypes);
+                }
+            }
+        }
+    }
+
+    // Certain tests need the ability to specify a parquet schema which the writer wouldn't choose by itself based on the engine type.
+    // Explicitly provided parquetSchema is supported only by the hive writer.
+    // This method should be used when we need to assert that an exception should be thrown when reading from a file written with the specified
+    // parquetSchema to avoid getting misled due to an exception thrown when from reading the file produced by trino parquet writer which may not
+    // be following the specified parquetSchema.
+    void assertRoundTripWithHiveWriter(
+            List<ObjectInspector> objectInspectors,
+            Iterable<?>[] writeValues,
+            Iterable<?>[] readValues,
+            List<String> columnNames,
+            List<Type> columnTypes,
+            Optional<MessageType> parquetSchema,
+            ParquetSchemaOptions schemaOptions)
+            throws Exception
     {
         for (WriterVersion version : versions) {
             for (CompressionCodec compressionCodec : compressions) {
@@ -385,23 +407,6 @@ void assertRoundTrip(
                 }
             }
         }
-
-        // write Trino parquet
-        for (CompressionCodec compressionCodec : writerCompressions) {
-            for (ConnectorSession session : sessions) {
-                try (TempFile tempFile = new TempFile("test", "parquet")) {
-                    OptionalInt min = stream(writeValues).mapToInt(Iterables::size).min();
-                    checkState(min.isPresent());
-                    writeParquetColumnTrino(tempFile.getFile(), columnTypes, columnNames, getIterators(readValues), min.getAsInt(), compressionCodec, schemaOptions);
-                    assertFileContents(
-                            session,
-                            tempFile.getFile(),
-                            getIterators(readValues),
-                            columnNames,
-                            columnTypes);
-                }
-            }
-        }
     }
 
     void testMaxReadBytes(ObjectInspector objectInspector, Iterable<?> writeValues, Iterable<?> readValues, Type type, DataSize maxReadBlockSize)
@@ -428,52 +433,48 @@ void assertMaxReadBytes(
             throws Exception
     {
         CompressionCodec compressionCodec = UNCOMPRESSED;
-        for (boolean optimizedReaderEnabled : ImmutableList.of(true, false)) {
-            HiveSessionProperties hiveSessionProperties = new HiveSessionProperties(
-                    new HiveConfig()
-                            .setHiveStorageFormat(HiveStorageFormat.PARQUET)
-                            .setUseParquetColumnNames(false),
-                    new HiveFormatsConfig(),
-                    new OrcReaderConfig(),
-                    new OrcWriterConfig(),
-                    new ParquetReaderConfig()
-                            .setMaxReadBlockSize(maxReadBlockSize)
-                            .setOptimizedReaderEnabled(optimizedReaderEnabled),
-                    new ParquetWriterConfig());
-            ConnectorSession session = TestingConnectorSession.builder()
-                    .setPropertyMetadata(hiveSessionProperties.getSessionProperties())
-                    .build();
-
-            try (TempFile tempFile = new TempFile("test", "parquet")) {
-                JobConf jobConf = new JobConf(newEmptyConfiguration());
-                jobConf.setEnum(COMPRESSION, compressionCodec);
-                jobConf.setBoolean(ENABLE_DICTIONARY, true);
-                jobConf.setEnum(WRITER_VERSION, PARQUET_1_0);
-                writeParquetColumn(
-                        jobConf,
-                        tempFile.getFile(),
-                        compressionCodec,
-                        createTableProperties(columnNames, objectInspectors),
-                        getStandardStructObjectInspector(columnNames, objectInspectors),
-                        getIterators(writeValues),
-                        parquetSchema,
-                        false,
-                        DateTimeZone.getDefault());
-
-                Iterator<?>[] expectedValues = getIterators(readValues);
-                try (ConnectorPageSource pageSource = fileFormat.createFileFormatReader(
-                        session,
-                        HDFS_ENVIRONMENT,
-                        tempFile.getFile(),
-                        columnNames,
-                        columnTypes)) {
-                    assertPageSource(
-                            columnTypes,
-                            expectedValues,
-                            pageSource,
-                            Optional.of(getParquetMaxReadBlockSize(session).toBytes()));
-                    assertFalse(stream(expectedValues).allMatch(Iterator::hasNext));
-                }
+        HiveSessionProperties hiveSessionProperties = new HiveSessionProperties(
+                new HiveConfig()
+                        .setHiveStorageFormat(HiveStorageFormat.PARQUET)
+                        .setUseParquetColumnNames(false),
+                new OrcReaderConfig(),
+                new OrcWriterConfig(),
+                new ParquetReaderConfig()
+                        .setMaxReadBlockSize(maxReadBlockSize),
+                new ParquetWriterConfig());
+        ConnectorSession session = TestingConnectorSession.builder()
+                .setPropertyMetadata(hiveSessionProperties.getSessionProperties())
+                .build();
+
+        try (TempFile tempFile = new TempFile("test", "parquet")) {
+            JobConf jobConf = new JobConf(newEmptyConfiguration());
+            jobConf.setEnum(COMPRESSION, compressionCodec);
+            jobConf.setBoolean(ENABLE_DICTIONARY, true);
+            jobConf.setEnum(WRITER_VERSION, PARQUET_1_0);
+            writeParquetColumn(
+                    jobConf,
+                    tempFile.getFile(),
+                    compressionCodec,
+                    createTableProperties(columnNames, objectInspectors),
+                    getStandardStructObjectInspector(columnNames, objectInspectors),
+                    getIterators(writeValues),
+                    parquetSchema,
+                    false,
+                    DateTimeZone.getDefault());
+
+            Iterator<?>[] expectedValues = getIterators(readValues);
+            try (ConnectorPageSource pageSource = fileFormat.createFileFormatReader(
+                    session,
+                    HDFS_ENVIRONMENT,
+                    tempFile.getFile(),
+                    columnNames,
+                    columnTypes)) {
+                assertPageSource(
+                        columnTypes,
+                        expectedValues,
+                        pageSource,
+                        Optional.of(getParquetMaxReadBlockSize(session).toBytes()));
+                assertFalse(stream(expectedValues).allMatch(Iterator::hasNext));
             }
         }
     }
@@ -549,15 +550,14 @@ private static Object getActualCursorValue(RecordCursor cursor, Type type, int f
             return null;
         }
         if (isStructuralType(type)) {
-            Block block = (Block) fieldFromCursor;
             if (type instanceof ArrayType arrayType) {
-                return toArrayValue(block, arrayType.getElementType());
+                return toArrayValue((Block) fieldFromCursor, arrayType.getElementType());
             }
             if (type instanceof MapType mapType) {
-                return toMapValue(block, mapType.getKeyType(), mapType.getValueType());
+                return toMapValue((SqlMap) fieldFromCursor, mapType.getKeyType(), mapType.getValueType());
             }
             if (type instanceof RowType) {
-                return toRowValue(block, type.getTypeParameters());
+                return toRowValue((Block) fieldFromCursor, type.getTypeParameters());
             }
         }
         if (type instanceof DecimalType decimalType) {
@@ -578,11 +578,15 @@ private static Object getActualCursorValue(RecordCursor cursor, Type type, int f
         return fieldFromCursor;
     }
 
-    private static Map<?, ?> toMapValue(Block mapBlock, Type keyType, Type valueType)
+    private static Map<?, ?> toMapValue(SqlMap sqlMap, Type keyType, Type valueType)
     {
-        Map<Object, Object> map = new HashMap<>(mapBlock.getPositionCount() * 2);
-        for (int i = 0; i < mapBlock.getPositionCount(); i += 2) {
-            map.put(keyType.getObjectValue(SESSION, mapBlock, i), valueType.getObjectValue(SESSION, mapBlock, i + 1));
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
+        Map<Object, Object> map = new HashMap<>(sqlMap.getSize());
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            map.put(keyType.getObjectValue(SESSION, rawKeyBlock, rawOffset + i), valueType.getObjectValue(SESSION, rawValueBlock, rawOffset + i));
         }
         return Collections.unmodifiableMap(map);
     }
@@ -774,7 +778,6 @@ private static void writeParquetColumnTrino(
                         .build(),
                 compressionCodec,
                 "test-version",
-                false,
                 Optional.of(DateTimeZone.getDefault()),
                 Optional.of(new ParquetWriteValidationBuilder(types, columnNames)));
 
@@ -793,10 +796,8 @@ private static void writeParquetColumnTrino(
         pageBuilder.declarePositions(size);
         writer.write(pageBuilder.build());
         writer.close();
-        TrinoFileSystem fileSystem = HDFS_FILE_SYSTEM_FACTORY.create(SESSION);
         try {
-            TrinoInputFile inputFile = fileSystem.newInputFile(outputFile.getPath());
-            writer.validate(new TrinoParquetDataSource(inputFile, new ParquetReaderOptions(), new FileFormatDataSourceStats()));
+            writer.validate(new TrinoParquetDataSource(new LocalInputFile(outputFile), new ParquetReaderOptions(), new FileFormatDataSourceStats()));
         }
         catch (IOException e) {
             throw new TrinoException(HIVE_WRITE_VALIDATION_FAILED, e);
@@ -858,32 +859,32 @@ else if (TIMESTAMP_NANOS.equals(type)) {
                 if (type instanceof ArrayType) {
                     List<?> array = (List<?>) value;
                     Type elementType = type.getTypeParameters().get(0);
-                    BlockBuilder arrayBlockBuilder = blockBuilder.beginBlockEntry();
-                    for (Object elementValue : array) {
-                        writeValue(elementType, arrayBlockBuilder, elementValue);
-                    }
-                    blockBuilder.closeEntry();
+                    ((ArrayBlockBuilder) blockBuilder).buildEntry(elementBuilder -> {
+                        for (Object elementValue : array) {
+                            writeValue(elementType, elementBuilder, elementValue);
+                        }
+                    });
                 }
                 else if (type instanceof MapType) {
                     Map<?, ?> map = (Map<?, ?>) value;
                     Type keyType = type.getTypeParameters().get(0);
                     Type valueType = type.getTypeParameters().get(1);
-                    BlockBuilder mapBlockBuilder = blockBuilder.beginBlockEntry();
-                    for (Map.Entry<?, ?> entry : map.entrySet()) {
-                        writeValue(keyType, mapBlockBuilder, entry.getKey());
-                        writeValue(valueType, mapBlockBuilder, entry.getValue());
-                    }
-                    blockBuilder.closeEntry();
+                    ((MapBlockBuilder) blockBuilder).buildEntry((keyBuilder, valueBuilder) -> {
+                        for (Map.Entry<?, ?> entry : map.entrySet()) {
+                            writeValue(keyType, keyBuilder, entry.getKey());
+                            writeValue(valueType, valueBuilder, entry.getValue());
+                        }
+                    });
                 }
                 else if (type instanceof RowType) {
                     List<?> array = (List<?>) value;
                     List<Type> fieldTypes = type.getTypeParameters();
-                    BlockBuilder rowBlockBuilder = blockBuilder.beginBlockEntry();
-                    for (int fieldId = 0; fieldId < fieldTypes.size(); fieldId++) {
-                        Type fieldType = fieldTypes.get(fieldId);
-                        writeValue(fieldType, rowBlockBuilder, array.get(fieldId));
-                    }
-                    blockBuilder.closeEntry();
+                    ((RowBlockBuilder) blockBuilder).buildEntry(fieldBuilders -> {
+                        for (int fieldId = 0; fieldId < fieldTypes.size(); fieldId++) {
+                            Type fieldType = fieldTypes.get(fieldId);
+                            writeValue(fieldType, fieldBuilders.get(fieldId), array.get(fieldId));
+                        }
+                    });
                 }
                 else {
                     throw new IllegalArgumentException("Unsupported type " + type);
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestBloomFilterStore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestBloomFilterStore.java
index 59c218a24a27..0e3816d7ca35 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestBloomFilterStore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestBloomFilterStore.java
@@ -14,17 +14,13 @@
 package io.trino.plugin.hive.parquet;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.filesystem.TrinoFileSystem;
-import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.filesystem.local.LocalInputFile;
 import io.trino.parquet.BloomFilterStore;
 import io.trino.parquet.ParquetReaderOptions;
 import io.trino.parquet.predicate.TupleDomainParquetPredicate;
 import io.trino.parquet.reader.MetadataReader;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
-import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.HiveStorageFormat;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.SortedRangeSet;
@@ -57,8 +53,6 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
-import static io.trino.plugin.hive.HiveTestUtils.getHiveSession;
 import static io.trino.plugin.hive.HiveTestUtils.toNativeContainerValue;
 import static io.trino.spi.predicate.Domain.multipleValues;
 import static io.trino.spi.predicate.TupleDomain.withColumnDomains;
@@ -313,9 +307,7 @@ private static BloomFilterStore generateBloomFilterStore(ParquetTester.TempFile
                 false,
                 DateTimeZone.getDefault());
 
-        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(HDFS_ENVIRONMENT);
-        TrinoFileSystem fileSystem = fileSystemFactory.create(getHiveSession(new HiveConfig().setHiveStorageFormat(HiveStorageFormat.PARQUET)));
-        TrinoInputFile inputFile = fileSystem.newInputFile(tempFile.getFile().getPath());
+        TrinoInputFile inputFile = new LocalInputFile(tempFile.getFile());
         TrinoParquetDataSource dataSource = new TrinoParquetDataSource(inputFile, new ParquetReaderOptions(), new FileFormatDataSourceStats());
 
         ParquetMetadata parquetMetadata = MetadataReader.readFooter(dataSource, Optional.empty());
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestFullParquetReader.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestFullParquetReader.java
index 576ab4cb4529..13ba2b6d57dd 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestFullParquetReader.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestFullParquetReader.java
@@ -17,6 +17,7 @@
 
 // Failing on multiple threads because of org.apache.hadoop.hive.ql.io.parquet.write.ParquetRecordWriterWrapper
 // uses a single record writer across all threads.
+// For example org.apache.parquet.column.values.factory.DefaultValuesWriterFactory#DEFAULT_V1_WRITER_FACTORY is shared mutable state.
 @Test(singleThreaded = true)
 public class TestFullParquetReader
         extends AbstractTestParquetReader
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestHiveParquetComplexTypePredicatePushDown.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestHiveParquetComplexTypePredicatePushDown.java
new file mode 100644
index 000000000000..5f0df158a571
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestHiveParquetComplexTypePredicatePushDown.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.parquet;
+
+import io.trino.plugin.hive.HiveQueryRunner;
+import io.trino.testing.BaseComplexTypesPredicatePushDownTest;
+import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestHiveParquetComplexTypePredicatePushDown
+        extends BaseComplexTypesPredicatePushDownTest
+{
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        return HiveQueryRunner.builder()
+                .addHiveProperty("hive.storage-format", "PARQUET")
+                .build();
+    }
+
+    @Test
+    public void ensureFormatParquet()
+    {
+        String tableName = "test_table_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (colTest BIGINT)");
+        assertThat(((String) computeScalar("SHOW CREATE TABLE " + tableName))).contains("PARQUET");
+        assertUpdate("DROP TABLE " + tableName);
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestHiveParquetWithBloomFilters.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestHiveParquetWithBloomFilters.java
index 27043c39c00e..b06884f79682 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestHiveParquetWithBloomFilters.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestHiveParquetWithBloomFilters.java
@@ -14,24 +14,22 @@
 package io.trino.plugin.hive.parquet;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.Session;
 import io.trino.plugin.hive.HiveQueryRunner;
-import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.testing.BaseTestParquetWithBloomFilters;
+import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.mapred.JobConf;
 import org.joda.time.DateTimeZone;
-import org.testng.annotations.Test;
 
 import java.io.File;
-import java.nio.file.Files;
-import java.util.Arrays;
+import java.nio.file.Path;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 
-import static com.google.common.io.MoreFiles.deleteRecursively;
-import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
@@ -42,96 +40,36 @@
 import static org.apache.parquet.format.CompressionCodec.SNAPPY;
 import static org.apache.parquet.hadoop.ParquetOutputFormat.BLOOM_FILTER_ENABLED;
 import static org.apache.parquet.hadoop.ParquetOutputFormat.WRITER_VERSION;
-import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveParquetWithBloomFilters
-        extends AbstractTestQueryFramework
+        extends BaseTestParquetWithBloomFilters
 {
-    private static final String COLUMN_NAME = "dataColumn";
-    // containing extreme values, so the row group cannot be eliminated by the column chunk's min/max statistics
-    private static final List<Integer> TEST_VALUES = Arrays.asList(Integer.MIN_VALUE, Integer.MAX_VALUE, 1, 3, 7, 10, 15);
-    private static final int MISSING_VALUE = 0;
-
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        return HiveQueryRunner.builder().build();
+        DistributedQueryRunner queryRunner = HiveQueryRunner.builder().build();
+        dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("hive_data");
+        return queryRunner;
     }
 
-    @Test
-    public void verifyBloomFilterEnabled()
-    {
-        assertThat(query(format("SHOW SESSION LIKE '%s.parquet_use_bloom_filter'", getSession().getCatalog().orElseThrow())))
-                .skippingTypesCheck()
-                .matches(result -> result.getRowCount() == 1)
-                .matches(result -> {
-                    String value = (String) result.getMaterializedRows().get(0).getField(1);
-                    return value.equals("true");
-                });
-    }
-
-    @Test
-    public void testBloomFilterRowGroupPruning()
-            throws Exception
+    @Override
+    protected CatalogSchemaTableName createParquetTableWithBloomFilter(String columnName, List<Integer> testValues)
     {
-        File tmpDir = Files.createTempDirectory("testBloomFilterRowGroupPruning").toFile();
-        try {
-            File parquetFile = new File(tmpDir, randomNameSuffix());
-
-            String tableName = "parquet_with_bloom_filters_" + randomNameSuffix();
-            createParquetBloomFilterSource(parquetFile, COLUMN_NAME, TEST_VALUES);
-            assertUpdate(
-                    format(
-                            "CREATE TABLE %s (%s INT) WITH (format = 'PARQUET', external_location = '%s')",
-                            tableName,
-                            COLUMN_NAME,
-                            tmpDir.getAbsolutePath()));
-
-            // When reading bloom filter is enabled, row groups are pruned when searching for a missing value
-            assertQueryStats(
-                    getSession(),
-                    "SELECT * FROM " + tableName + " WHERE " + COLUMN_NAME + " = " + MISSING_VALUE,
-                    queryStats -> {
-                        assertThat(queryStats.getPhysicalInputPositions()).isEqualTo(0);
-                        assertThat(queryStats.getProcessedInputPositions()).isEqualTo(0);
-                    },
-                    results -> assertThat(results.getRowCount()).isEqualTo(0));
+        // create the managed table
+        String tableName = "parquet_with_bloom_filters_" + randomNameSuffix();
+        CatalogSchemaTableName catalogSchemaTableName = new CatalogSchemaTableName("hive", new SchemaTableName("tpch", tableName));
+        assertUpdate(format("CREATE TABLE %s (%s INT) WITH (format = 'PARQUET')", catalogSchemaTableName, columnName));
 
-            // When reading bloom filter is enabled, row groups are not pruned when searching for a value present in the file
-            assertQueryStats(
-                    getSession(),
-                    "SELECT * FROM " + tableName + " WHERE " + COLUMN_NAME + " = " + TEST_VALUES.get(0),
-                    queryStats -> {
-                        assertThat(queryStats.getPhysicalInputPositions()).isGreaterThan(0);
-                        assertThat(queryStats.getProcessedInputPositions()).isEqualTo(queryStats.getPhysicalInputPositions());
-                    },
-                    results -> assertThat(results.getRowCount()).isEqualTo(1));
+        // directly write data to the managed table
+        Path tableLocation = Path.of("%s/tpch/%s".formatted(dataDirectory, tableName));
+        Path fileLocation = tableLocation.resolve("bloomFilterFile.parquet");
+        writeParquetFileWithBloomFilter(fileLocation.toFile(), columnName, testValues);
 
-            // When reading bloom filter is disabled, row groups are not pruned when searching for a missing value
-            assertQueryStats(
-                    bloomFiltersDisabled(getSession()),
-                    "SELECT * FROM " + tableName + " WHERE " + COLUMN_NAME + " = " + MISSING_VALUE,
-                    queryStats -> {
-                        assertThat(queryStats.getPhysicalInputPositions()).isGreaterThan(0);
-                        assertThat(queryStats.getProcessedInputPositions()).isEqualTo(queryStats.getPhysicalInputPositions());
-                    },
-                    results -> assertThat(results.getRowCount()).isEqualTo(0));
-        }
-        finally {
-            deleteRecursively(tmpDir.toPath(), ALLOW_INSECURE);
-        }
+        return catalogSchemaTableName;
     }
 
-    private static Session bloomFiltersDisabled(Session session)
-    {
-        return Session.builder(session)
-                .setCatalogSessionProperty(session.getCatalog().orElseThrow(), "parquet_use_bloom_filter", "false")
-                .build();
-    }
-
-    private static void createParquetBloomFilterSource(File tempFile, String columnName, List<Integer> testValues)
-            throws Exception
+    public static void writeParquetFileWithBloomFilter(File tempFile, String columnName, List<Integer> testValues)
     {
         List<ObjectInspector> objectInspectors = singletonList(javaIntObjectInspector);
         List<String> columnNames = ImmutableList.of(columnName);
@@ -140,15 +78,20 @@ private static void createParquetBloomFilterSource(File tempFile, String columnN
         jobConf.setEnum(WRITER_VERSION, PARQUET_1_0);
         jobConf.setBoolean(BLOOM_FILTER_ENABLED, true);
 
-        ParquetTester.writeParquetColumn(
-                jobConf,
-                tempFile,
-                SNAPPY,
-                ParquetTester.createTableProperties(columnNames, objectInspectors),
-                getStandardStructObjectInspector(columnNames, objectInspectors),
-                new Iterator<?>[] {testValues.iterator()},
-                Optional.empty(),
-                false,
-                DateTimeZone.getDefault());
+        try {
+            ParquetTester.writeParquetColumn(
+                    jobConf,
+                    tempFile,
+                    SNAPPY,
+                    ParquetTester.createTableProperties(columnNames, objectInspectors),
+                    getStandardStructObjectInspector(columnNames, objectInspectors),
+                    new Iterator<?>[] {testValues.iterator()},
+                    Optional.empty(),
+                    false,
+                    DateTimeZone.getDefault());
+        }
+        catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestOnlyNulls.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestOnlyNulls.java
index e5c3a19cbe67..c13ababd159a 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestOnlyNulls.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestOnlyNulls.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive.parquet;
 
 import com.google.common.io.Resources;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.HivePageSourceFactory;
@@ -27,8 +28,7 @@
 import io.trino.spi.type.Type;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.MaterializedRow;
-import org.apache.hadoop.fs.Path;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.List;
@@ -37,7 +37,6 @@
 import java.util.OptionalInt;
 import java.util.Properties;
 
-import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
 import static io.trino.plugin.hive.HiveColumnHandle.createBaseColumn;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
@@ -82,15 +81,14 @@ public void testOnlyNulls()
 
     private static ConnectorPageSource createPageSource(File parquetFile, HiveColumnHandle column, TupleDomain<HiveColumnHandle> domain)
     {
-        HivePageSourceFactory pageSourceFactory = StandardFileFormats.TRINO_PARQUET.getHivePageSourceFactory(HDFS_ENVIRONMENT).orElseThrow();
+        HivePageSourceFactory pageSourceFactory = StandardFileFormats.TRINO_PARQUET.getHivePageSourceFactory(HDFS_ENVIRONMENT);
 
         Properties schema = new Properties();
         schema.setProperty(SERIALIZATION_LIB, HiveStorageFormat.PARQUET.getSerde());
 
         return pageSourceFactory.createPageSource(
-                        newEmptyConfiguration(),
                         getHiveSession(new HiveConfig()),
-                        new Path(parquetFile.toURI()),
+                        Location.of(parquetFile.getPath()),
                         0,
                         parquetFile.length(),
                         parquetFile.length(),
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestOptimizedParquetReader.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestOptimizedParquetReader.java
deleted file mode 100644
index 115952eacfc7..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestOptimizedParquetReader.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.parquet;
-
-import org.testng.annotations.Test;
-
-// Failing on multiple threads because of org.apache.hadoop.hive.ql.io.parquet.write.ParquetRecordWriterWrapper
-// uses a single record writer across all threads.
-@Test(singleThreaded = true)
-public class TestOptimizedParquetReader
-        extends AbstractTestParquetReader
-{
-    public TestOptimizedParquetReader()
-    {
-        super(ParquetTester.quickOptimizedParquetTester());
-    }
-
-    @Test
-    public void forceTestNgToRespectSingleThreaded()
-    {
-        // TODO: Remove after updating TestNG to 7.4.0+ (https://github.com/trinodb/trino/issues/8571)
-        // TestNG doesn't enforce @Test(singleThreaded = true) when tests are defined in base class. According to
-        // https://github.com/cbeust/testng/issues/2361#issuecomment-688393166 a workaround it to add a dummy test to the leaf test class.
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetDecimalScaling.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetDecimalScaling.java
index 982e4a8b8154..56aa96534f7a 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetDecimalScaling.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetDecimalScaling.java
@@ -15,7 +15,6 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import io.trino.Session;
 import io.trino.plugin.hive.HiveQueryRunner;
 import io.trino.plugin.hive.parquet.write.TestingMapredParquetOutputFormat;
 import io.trino.testing.AbstractTestQueryFramework;
@@ -305,8 +304,7 @@ public void testReadingNonRescalableDecimals(
         @Language("SQL") String query = format("SELECT * FROM tpch.%s", tableName);
         @Language("RegExp") String expectedMessage = format("Cannot cast DECIMAL\\(%d, %d\\) '.*' to DECIMAL\\(%d, %d\\)", precision, scale, schemaPrecision, schemaScale);
 
-        assertQueryFails(optimizedParquetReaderEnabled(false), query, expectedMessage);
-        assertQueryFails(optimizedParquetReaderEnabled(true), query, expectedMessage);
+        assertQueryFails(query, expectedMessage);
 
         dropTable(tableName);
     }
@@ -360,8 +358,7 @@ public void testParquetLongFixedLenByteArrayWithTrinoShortDecimal(
                     "Could not read unscaled value %s into a short decimal from column .*",
                     new BigDecimal(writeValue).unscaledValue());
 
-            assertQueryFails(optimizedParquetReaderEnabled(false), query, expectedMessage);
-            assertQueryFails(optimizedParquetReaderEnabled(true), query, expectedMessage);
+            assertQueryFails(query, expectedMessage);
         }
         else {
             assertValues(tableName, schemaScale, ImmutableList.of(writeValue));
@@ -398,13 +395,7 @@ protected void dropTable(String tableName)
 
     private void assertValues(String tableName, int scale, List<String> expected)
     {
-        assertValues(optimizedParquetReaderEnabled(false), tableName, scale, expected);
-        assertValues(optimizedParquetReaderEnabled(true), tableName, scale, expected);
-    }
-
-    private void assertValues(Session session, String tableName, int scale, List<String> expected)
-    {
-        MaterializedResult materializedRows = computeActual(session, format("SELECT value FROM tpch.%s", tableName));
+        MaterializedResult materializedRows = computeActual(format("SELECT value FROM tpch.%s", tableName));
 
         List<BigDecimal> actualValues = materializedRows.getMaterializedRows().stream()
                 .map(row -> row.getField(0))
@@ -420,13 +411,7 @@ private void assertValues(Session session, String tableName, int scale, List<Str
 
     private void assertRoundedValues(String tableName, int scale, List<String> expected)
     {
-        assertRoundedValues(optimizedParquetReaderEnabled(false), tableName, scale, expected);
-        assertRoundedValues(optimizedParquetReaderEnabled(true), tableName, scale, expected);
-    }
-
-    private void assertRoundedValues(Session session, String tableName, int scale, List<String> expected)
-    {
-        MaterializedResult materializedRows = computeActual(session, format("SELECT value FROM tpch.%s", tableName));
+        MaterializedResult materializedRows = computeActual(format("SELECT value FROM tpch.%s", tableName));
 
         List<BigDecimal> actualValues = materializedRows.getMaterializedRows().stream()
                 .map(row -> row.getField(0))
@@ -539,14 +524,6 @@ private static Object[][] withWriterVersion(Object[][] args)
         return cartesianProduct(args, versions);
     }
 
-    private Session optimizedParquetReaderEnabled(boolean enabled)
-    {
-        Session session = getSession();
-        return Session.builder(session)
-                .setCatalogSessionProperty(session.getCatalog().orElseThrow(), "parquet_optimized_reader_enabled", Boolean.toString(enabled))
-                .build();
-    }
-
     protected static class ParquetDecimalInsert
     {
         private final String columnName;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetReader.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetReader.java
index c422d7fb80b4..b8b43f2f9877 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetReader.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetReader.java
@@ -17,6 +17,7 @@
 
 // Failing on multiple threads because of org.apache.hadoop.hive.ql.io.parquet.write.ParquetRecordWriterWrapper
 // uses a single record writer across all threads.
+// For example org.apache.parquet.column.values.factory.DefaultValuesWriterFactory#DEFAULT_V1_WRITER_FACTORY is shared mutable state.
 @Test(singleThreaded = true)
 public class TestParquetReader
         extends AbstractTestParquetReader
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetReaderConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetReaderConfig.java
index afa1f038ffb1..bbbf23becea5 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetReaderConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetReaderConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -37,9 +37,8 @@ public void testDefaults()
                 .setMaxMergeDistance(DataSize.of(1, MEGABYTE))
                 .setMaxBufferSize(DataSize.of(8, MEGABYTE))
                 .setUseColumnIndex(true)
-                .setOptimizedReaderEnabled(true)
-                .setOptimizedNestedReaderEnabled(true)
-                .setUseBloomFilter(true));
+                .setUseBloomFilter(true)
+                .setSmallFileThreshold(DataSize.of(3, MEGABYTE)));
     }
 
     @Test
@@ -52,9 +51,8 @@ public void testExplicitPropertyMappings()
                 .put("parquet.max-buffer-size", "1431kB")
                 .put("parquet.max-merge-distance", "342kB")
                 .put("parquet.use-column-index", "false")
-                .put("parquet.optimized-reader.enabled", "false")
-                .put("parquet.optimized-nested-reader.enabled", "false")
                 .put("parquet.use-bloom-filter", "false")
+                .put("parquet.small-file-threshold", "1kB")
                 .buildOrThrow();
 
         ParquetReaderConfig expected = new ParquetReaderConfig()
@@ -64,9 +62,8 @@ public void testExplicitPropertyMappings()
                 .setMaxBufferSize(DataSize.of(1431, KILOBYTE))
                 .setMaxMergeDistance(DataSize.of(342, KILOBYTE))
                 .setUseColumnIndex(false)
-                .setOptimizedReaderEnabled(false)
-                .setOptimizedNestedReaderEnabled(false)
-                .setUseBloomFilter(false);
+                .setUseBloomFilter(false)
+                .setSmallFileThreshold(DataSize.of(1, KILOBYTE));
 
         assertFullMapping(properties, expected);
     }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetWriterConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetWriterConfig.java
index 3f94e09be0c6..aff3e4a67603 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetWriterConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestParquetWriterConfig.java
@@ -16,7 +16,7 @@
 import io.airlift.units.DataSize;
 import io.trino.parquet.writer.ParquetWriterOptions;
 import org.apache.parquet.hadoop.ParquetWriter;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -32,7 +32,6 @@ public class TestParquetWriterConfig
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(ParquetWriterConfig.class)
-                .setParquetOptimizedWriterEnabled(false)
                 .setBlockSize(DataSize.ofBytes(ParquetWriter.DEFAULT_BLOCK_SIZE))
                 .setPageSize(DataSize.ofBytes(ParquetWriter.DEFAULT_PAGE_SIZE))
                 .setBatchSize(ParquetWriterOptions.DEFAULT_BATCH_SIZE)
@@ -45,33 +44,27 @@ public void testLegacyProperties()
         assertDeprecatedEquivalence(
                 ParquetWriterConfig.class,
                 Map.of(
-                        "parquet.optimized-writer.enabled", "true",
-                        "parquet.writer.block-size", "2PB",
-                        "parquet.writer.page-size", "3PB"),
+                        "parquet.writer.validation-percentage", "42",
+                        "parquet.writer.block-size", "33MB",
+                        "parquet.writer.page-size", "7MB"),
                 Map.of(
-                        "parquet.experimental-optimized-writer.enabled", "true",
-                        "hive.parquet.writer.block-size", "2PB",
-                        "hive.parquet.writer.page-size", "3PB"),
-                Map.of(
-                        "hive.parquet.optimized-writer.enabled", "true",
-                        "hive.parquet.writer.block-size", "2PB",
-                        "hive.parquet.writer.page-size", "3PB"));
+                        "parquet.optimized-writer.validation-percentage", "42",
+                        "hive.parquet.writer.block-size", "33MB",
+                        "hive.parquet.writer.page-size", "7MB"));
     }
 
     @Test
     public void testExplicitPropertyMappings()
     {
         Map<String, String> properties = Map.of(
-                "parquet.optimized-writer.enabled", "true",
                 "parquet.writer.block-size", "234MB",
-                "parquet.writer.page-size", "11MB",
+                "parquet.writer.page-size", "6MB",
                 "parquet.writer.batch-size", "100",
-                "parquet.optimized-writer.validation-percentage", "10");
+                "parquet.writer.validation-percentage", "10");
 
         ParquetWriterConfig expected = new ParquetWriterConfig()
-                .setParquetOptimizedWriterEnabled(true)
                 .setBlockSize(DataSize.of(234, MEGABYTE))
-                .setPageSize(DataSize.of(11, MEGABYTE))
+                .setPageSize(DataSize.of(6, MEGABYTE))
                 .setBatchSize(100)
                 .setValidationPercentage(10);
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestReadingTimeLogicalAnnotation.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestReadingTimeLogicalAnnotation.java
index dd1500a3b8ea..b229f111478d 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestReadingTimeLogicalAnnotation.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestReadingTimeLogicalAnnotation.java
@@ -17,7 +17,7 @@
 import io.trino.plugin.hive.HiveQueryRunner;
 import io.trino.sql.query.QueryAssertions;
 import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestTimestamp.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestTimestamp.java
index 93e96e0027a7..2d7cd1f5ca2c 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestTimestamp.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestTimestamp.java
@@ -128,11 +128,7 @@ private static void testRoundTrip(MessageType parquetSchema, Iterable<Long> writ
                     false,
                     DateTimeZone.getDefault());
 
-            ConnectorSession session = getHiveSession(new HiveConfig(), new ParquetReaderConfig().setOptimizedReaderEnabled(false));
-            testReadingAs(createTimestampType(timestamp.getPrecision()), session, tempFile, columnNames, timestampReadValues);
-            testReadingAs(BIGINT, session, tempFile, columnNames, writeValues);
-
-            session = getHiveSession(new HiveConfig(), new ParquetReaderConfig().setOptimizedReaderEnabled(true));
+            ConnectorSession session = getHiveSession(new HiveConfig());
             testReadingAs(createTimestampType(timestamp.getPrecision()), session, tempFile, columnNames, timestampReadValues);
             testReadingAs(BIGINT, session, tempFile, columnNames, writeValues);
         }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestTimestampMicros.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestTimestampMicros.java
index f41f3ed4b7f8..40cc8ee68bb6 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestTimestampMicros.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/TestTimestampMicros.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive.parquet;
 
 import com.google.common.io.Resources;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.HivePageSourceFactory;
 import io.trino.plugin.hive.HiveStorageFormat;
@@ -28,7 +29,6 @@
 import io.trino.spi.type.Type;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.MaterializedRow;
-import org.apache.hadoop.fs.Path;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -40,7 +40,6 @@
 import java.util.OptionalInt;
 import java.util.Properties;
 
-import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
 import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
 import static io.trino.plugin.hive.HiveColumnHandle.createBaseColumn;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
@@ -48,7 +47,6 @@
 import static io.trino.plugin.hive.HiveType.HIVE_TIMESTAMP;
 import static io.trino.spi.type.TimestampType.createTimestampType;
 import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
-import static io.trino.testing.DataProviders.cartesianProduct;
 import static io.trino.testing.MaterializedResult.materializeSourceDataStream;
 import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_LIB;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -56,12 +54,10 @@
 public class TestTimestampMicros
 {
     @Test(dataProvider = "testTimestampMicrosDataProvider")
-    public void testTimestampMicros(HiveTimestampPrecision timestampPrecision, LocalDateTime expected, boolean useOptimizedParquetReader)
+    public void testTimestampMicros(HiveTimestampPrecision timestampPrecision, LocalDateTime expected)
             throws Exception
     {
-        ConnectorSession session = getHiveSession(
-                new HiveConfig().setTimestampPrecision(timestampPrecision),
-                new ParquetReaderConfig().setOptimizedReaderEnabled(useOptimizedParquetReader));
+        ConnectorSession session = getHiveSession(new HiveConfig().setTimestampPrecision(timestampPrecision));
 
         File parquetFile = new File(Resources.getResource("issue-5483.parquet").toURI());
         Type columnType = createTimestampType(timestampPrecision.getPrecision());
@@ -74,12 +70,10 @@ public void testTimestampMicros(HiveTimestampPrecision timestampPrecision, Local
     }
 
     @Test(dataProvider = "testTimestampMicrosDataProvider")
-    public void testTimestampMicrosAsTimestampWithTimeZone(HiveTimestampPrecision timestampPrecision, LocalDateTime expected, boolean useOptimizedParquetReader)
+    public void testTimestampMicrosAsTimestampWithTimeZone(HiveTimestampPrecision timestampPrecision, LocalDateTime expected)
             throws Exception
     {
-        ConnectorSession session = getHiveSession(
-                new HiveConfig().setTimestampPrecision(timestampPrecision),
-                new ParquetReaderConfig().setOptimizedReaderEnabled(useOptimizedParquetReader));
+        ConnectorSession session = getHiveSession(new HiveConfig().setTimestampPrecision(timestampPrecision));
 
         File parquetFile = new File(Resources.getResource("issue-5483.parquet").toURI());
         Type columnType = createTimestampWithTimeZoneType(timestampPrecision.getPrecision());
@@ -94,13 +88,10 @@ public void testTimestampMicrosAsTimestampWithTimeZone(HiveTimestampPrecision ti
     @DataProvider
     public static Object[][] testTimestampMicrosDataProvider()
     {
-        return cartesianProduct(
-                new Object[][] {
-                        {HiveTimestampPrecision.MILLISECONDS, LocalDateTime.parse("2020-10-12T16:26:02.907")},
-                        {HiveTimestampPrecision.MICROSECONDS, LocalDateTime.parse("2020-10-12T16:26:02.906668")},
-                        {HiveTimestampPrecision.NANOSECONDS, LocalDateTime.parse("2020-10-12T16:26:02.906668")},
-                },
-                new Object[][] {{true}, {false}});
+        return new Object[][] {
+                {HiveTimestampPrecision.MILLISECONDS, LocalDateTime.parse("2020-10-12T16:26:02.907")},
+                {HiveTimestampPrecision.MICROSECONDS, LocalDateTime.parse("2020-10-12T16:26:02.906668")},
+                {HiveTimestampPrecision.NANOSECONDS, LocalDateTime.parse("2020-10-12T16:26:02.906668")}};
     }
 
     private ConnectorPageSource createPageSource(ConnectorSession session, File parquetFile, String columnName, HiveType columnHiveType, Type columnType)
@@ -108,15 +99,14 @@ private ConnectorPageSource createPageSource(ConnectorSession session, File parq
         // TODO after https://github.com/trinodb/trino/pull/5283, replace the method with
         //  return FileFormat.PRESTO_PARQUET.createFileFormatReader(session, HDFS_ENVIRONMENT, parquetFile, columnNames, columnTypes);
 
-        HivePageSourceFactory pageSourceFactory = StandardFileFormats.TRINO_PARQUET.getHivePageSourceFactory(HDFS_ENVIRONMENT).orElseThrow();
+        HivePageSourceFactory pageSourceFactory = StandardFileFormats.TRINO_PARQUET.getHivePageSourceFactory(HDFS_ENVIRONMENT);
 
         Properties schema = new Properties();
         schema.setProperty(SERIALIZATION_LIB, HiveStorageFormat.PARQUET.getSerde());
 
         ReaderPageSource pageSourceWithProjections = pageSourceFactory.createPageSource(
-                        newEmptyConfiguration(),
                         session,
-                        new Path(parquetFile.toURI()),
+                        Location.of(parquetFile.getPath()),
                         0,
                         parquetFile.length(),
                         parquetFile.length(),
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/predicate/TestParquetPredicateUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/predicate/TestParquetPredicateUtils.java
index ba10daa102c1..05806e27aa3b 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/predicate/TestParquetPredicateUtils.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/predicate/TestParquetPredicateUtils.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import io.trino.plugin.hive.HiveColumnHandle;
+import io.trino.plugin.hive.HiveColumnProjectionInfo;
 import io.trino.plugin.hive.HiveType;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
@@ -122,12 +123,129 @@ public void testParquetTupleDomainStruct(boolean useColumnNames)
         MessageType fileSchema = new MessageType("hive_schema",
                 new GroupType(OPTIONAL, "my_struct",
                         new PrimitiveType(OPTIONAL, INT32, "a"),
-                        new PrimitiveType(OPTIONAL, INT32, "b")));
+                        new PrimitiveType(OPTIONAL, INT32, "b"),
+                        new PrimitiveType(OPTIONAL, INT32, "c")));
         Map<List<String>, ColumnDescriptor> descriptorsByPath = getDescriptors(fileSchema, fileSchema);
         TupleDomain<ColumnDescriptor> tupleDomain = getParquetTupleDomain(descriptorsByPath, domain, fileSchema, useColumnNames);
         assertTrue(tupleDomain.isAll());
     }
 
+    @Test(dataProvider = "useColumnNames")
+    public void testParquetTupleDomainStructWithPrimitiveColumnPredicate(boolean useColumNames)
+    {
+        RowType baseType = rowType(
+                RowType.field("a", INTEGER),
+                RowType.field("b", INTEGER),
+                RowType.field("c", INTEGER));
+
+        HiveColumnProjectionInfo columnProjectionInfo = new HiveColumnProjectionInfo(
+                ImmutableList.of(1),
+                ImmutableList.of("b"),
+                HiveType.HIVE_INT,
+                INTEGER);
+
+        HiveColumnHandle projectedColumn = new HiveColumnHandle(
+                "row_field",
+                0,
+                HiveType.toHiveType(baseType),
+                baseType,
+                Optional.of(columnProjectionInfo),
+                REGULAR,
+                Optional.empty());
+
+        Domain predicateDomain = Domain.singleValue(INTEGER, 123L);
+        TupleDomain<HiveColumnHandle> tupleDomain = withColumnDomains(ImmutableMap.of(projectedColumn, predicateDomain));
+
+        MessageType fileSchema = new MessageType("hive_schema",
+                new GroupType(OPTIONAL, "row_field",
+                        new PrimitiveType(OPTIONAL, INT32, "a"),
+                        new PrimitiveType(OPTIONAL, INT32, "b"),
+                        new PrimitiveType(OPTIONAL, INT32, "c")));
+        Map<List<String>, ColumnDescriptor> descriptorsByPath = getDescriptors(fileSchema, fileSchema);
+        TupleDomain<ColumnDescriptor> calculatedTupleDomain = getParquetTupleDomain(descriptorsByPath, tupleDomain, fileSchema, useColumNames);
+        assertEquals(calculatedTupleDomain.getDomains().get().size(), 1);
+        ColumnDescriptor selectedColumnDescriptor = descriptorsByPath.get(ImmutableList.of("row_field", "b"));
+        assertEquals(calculatedTupleDomain.getDomains().get().get(selectedColumnDescriptor), predicateDomain);
+    }
+
+    @Test(dataProvider = "useColumnNames")
+    public void testParquetTupleDomainStructWithComplexColumnPredicate(boolean useColumNames)
+    {
+        RowType c1Type = rowType(
+                RowType.field("c1", INTEGER),
+                RowType.field("c2", INTEGER));
+        RowType baseType = rowType(
+                RowType.field("a", INTEGER),
+                RowType.field("b", INTEGER),
+                RowType.field("c", c1Type));
+
+        HiveColumnProjectionInfo columnProjectionInfo = new HiveColumnProjectionInfo(
+                ImmutableList.of(2),
+                ImmutableList.of("C"),
+                HiveType.toHiveType(c1Type),
+                c1Type);
+
+        HiveColumnHandle projectedColumn = new HiveColumnHandle(
+                "row_field",
+                0,
+                HiveType.toHiveType(baseType),
+                baseType,
+                Optional.of(columnProjectionInfo),
+                REGULAR,
+                Optional.empty());
+
+        Domain predicateDomain = Domain.onlyNull(c1Type);
+        TupleDomain<HiveColumnHandle> tupleDomain = withColumnDomains(ImmutableMap.of(projectedColumn, predicateDomain));
+
+        MessageType fileSchema = new MessageType("hive_schema",
+                new GroupType(OPTIONAL, "row_field",
+                        new PrimitiveType(OPTIONAL, INT32, "a"),
+                        new PrimitiveType(OPTIONAL, INT32, "b"),
+                        new GroupType(OPTIONAL,
+                                "c",
+                                new PrimitiveType(OPTIONAL, INT32, "c1"),
+                                new PrimitiveType(OPTIONAL, INT32, "c2"))));
+        Map<List<String>, ColumnDescriptor> descriptorsByPath = getDescriptors(fileSchema, fileSchema);
+        // skip looking up predicates for complex types as Parquet only stores stats for primitives
+        TupleDomain<ColumnDescriptor> calculatedTupleDomain = getParquetTupleDomain(descriptorsByPath, tupleDomain, fileSchema, useColumNames);
+        assertTrue(calculatedTupleDomain.isAll());
+    }
+
+    @Test(dataProvider = "useColumnNames")
+    public void testParquetTupleDomainStructWithMissingPrimitiveColumn(boolean useColumnNames)
+    {
+        RowType baseType = rowType(
+                RowType.field("a", INTEGER),
+                RowType.field("b", INTEGER),
+                RowType.field("non_exist", INTEGER));
+
+        HiveColumnProjectionInfo columnProjectionInfo = new HiveColumnProjectionInfo(
+                ImmutableList.of(2),
+                ImmutableList.of("non_exist"),
+                HiveType.HIVE_INT,
+                INTEGER);
+
+        HiveColumnHandle projectedColumn = new HiveColumnHandle(
+                "row_field",
+                0,
+                HiveType.toHiveType(baseType),
+                baseType,
+                Optional.of(columnProjectionInfo),
+                REGULAR,
+                Optional.empty());
+
+        Domain predicateDomain = Domain.singleValue(INTEGER, 123L);
+        TupleDomain<HiveColumnHandle> tupleDomain = withColumnDomains(ImmutableMap.of(projectedColumn, predicateDomain));
+
+        MessageType fileSchema = new MessageType("hive_schema",
+                new GroupType(OPTIONAL, "row_field",
+                        new PrimitiveType(OPTIONAL, INT32, "a"),
+                        new PrimitiveType(OPTIONAL, INT32, "b")));
+        Map<List<String>, ColumnDescriptor> descriptorsByPath = getDescriptors(fileSchema, fileSchema);
+        TupleDomain<ColumnDescriptor> calculatedTupleDomain = getParquetTupleDomain(descriptorsByPath, tupleDomain, fileSchema, useColumnNames);
+        assertTrue(calculatedTupleDomain.isAll());
+    }
+
     @Test(dataProvider = "useColumnNames")
     public void testParquetTupleDomainMap(boolean useColumnNames)
     {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/write/TestingMapredParquetOutputFormat.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/write/TestingMapredParquetOutputFormat.java
index 5e4bcbd95f48..c49f03c81035 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/write/TestingMapredParquetOutputFormat.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/parquet/write/TestingMapredParquetOutputFormat.java
@@ -20,15 +20,16 @@
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.util.Progressable;
+import org.apache.parquet.hadoop.DisabledMemoryManager;
 import org.apache.parquet.hadoop.ParquetOutputFormat;
 import org.apache.parquet.schema.MessageType;
 import org.joda.time.DateTimeZone;
 
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.util.Optional;
 import java.util.Properties;
 
-import static io.trino.plugin.hive.parquet.ParquetRecordWriter.replaceHadoopParquetMemoryManager;
 import static java.util.Objects.requireNonNull;
 
 /*
@@ -42,8 +43,6 @@ public class TestingMapredParquetOutputFormat
         extends MapredParquetOutputFormat
 {
     static {
-        //  The tests using this class don't use io.trino.plugin.hive.parquet.ParquetRecordWriter for writing parquet files with old writer.
-        //  Therefore, we need to replace the hadoop parquet memory manager here explicitly.
         replaceHadoopParquetMemoryManager();
     }
 
@@ -71,4 +70,16 @@ public FileSinkOperator.RecordWriter getHiveRecordWriter(
         }
         return super.getHiveRecordWriter(jobConf, finalOutPath, valueClass, isCompressed, tableProperties, progress);
     }
+
+    private static void replaceHadoopParquetMemoryManager()
+    {
+        try {
+            Field memoryManager = ParquetOutputFormat.class.getDeclaredField("memoryManager");
+            memoryManager.setAccessible(true);
+            memoryManager.set(null, new DisabledMemoryManager());
+        }
+        catch (ReflectiveOperationException e) {
+            throw new AssertionError(e);
+        }
+    }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/BaseTestTrinoS3FileSystemObjectStorage.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/BaseTestTrinoS3FileSystemObjectStorage.java
index 21292859df49..caf22c0c1788 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/BaseTestTrinoS3FileSystemObjectStorage.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/BaseTestTrinoS3FileSystemObjectStorage.java
@@ -20,6 +20,7 @@
 import com.amazonaws.services.s3.model.PutObjectRequest;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import com.google.common.net.MediaType;
+import io.trino.hdfs.s3.TrinoS3FileSystem;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.testng.annotations.Test;
@@ -313,6 +314,34 @@ public void testDeleteRecursivelyPrefixContainingMultipleObjectsPlain()
         }
     }
 
+    @Test
+    public void testDeleteRecursivelyPrefixWithSpecialCharacters()
+            throws Exception
+    {
+        String prefix = "test-delete-recursively-path-with-special characters |" + randomNameSuffix();
+        String prefixPath = "s3://%s/%s".formatted(getBucketName(), prefix);
+
+        try (TrinoS3FileSystem fs = createFileSystem()) {
+            try {
+                String filename1 = "file1.txt";
+                String filename2 = "file2.txt";
+                fs.createNewFile(new Path(prefixPath, filename1));
+                fs.createNewFile(new Path(prefixPath, filename2));
+                List<String> paths = listPaths(fs.getS3Client(), getBucketName(), prefix, true);
+                assertThat(paths).containsOnly(
+                        "%s/%s".formatted(prefix, filename1),
+                        "%s/%s".formatted(prefix, filename2));
+
+                assertTrue(fs.delete(new Path(prefixPath), true));
+
+                assertThat(listPaths(fs.getS3Client(), getBucketName(), prefix, true)).isEmpty();
+            }
+            finally {
+                fs.delete(new Path(prefixPath), true);
+            }
+        }
+    }
+
     @Test
     public void testDeleteRecursivelyDirectoryWithDeepHierarchy()
             throws Exception
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/S3HiveQueryRunner.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/S3HiveQueryRunner.java
index b0f60b308a25..05a332b5335c 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/S3HiveQueryRunner.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/S3HiveQueryRunner.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.HostAndPort;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.plugin.hive.HiveQueryRunner;
@@ -94,42 +95,49 @@ public static class Builder
         private String s3SecretKey;
         private String bucketName;
 
+        @CanIgnoreReturnValue
         public Builder setHiveMetastoreEndpoint(HostAndPort hiveMetastoreEndpoint)
         {
             this.hiveMetastoreEndpoint = requireNonNull(hiveMetastoreEndpoint, "hiveMetastoreEndpoint is null");
             return this;
         }
 
+        @CanIgnoreReturnValue
         public Builder setThriftMetastoreTimeout(Duration thriftMetastoreTimeout)
         {
             this.thriftMetastoreTimeout = requireNonNull(thriftMetastoreTimeout, "thriftMetastoreTimeout is null");
             return this;
         }
 
+        @CanIgnoreReturnValue
         public Builder setThriftMetastoreConfig(ThriftMetastoreConfig thriftMetastoreConfig)
         {
             this.thriftMetastoreConfig = requireNonNull(thriftMetastoreConfig, "thriftMetastoreConfig is null");
             return this;
         }
 
+        @CanIgnoreReturnValue
         public Builder setS3Endpoint(String s3Endpoint)
         {
             this.s3Endpoint = requireNonNull(s3Endpoint, "s3Endpoint is null");
             return this;
         }
 
+        @CanIgnoreReturnValue
         public Builder setS3AccessKey(String s3AccessKey)
         {
             this.s3AccessKey = requireNonNull(s3AccessKey, "s3AccessKey is null");
             return this;
         }
 
+        @CanIgnoreReturnValue
         public Builder setS3SecretKey(String s3SecretKey)
         {
             this.s3SecretKey = requireNonNull(s3SecretKey, "s3SecretKey is null");
             return this;
         }
 
+        @CanIgnoreReturnValue
         public Builder setBucketName(String bucketName)
         {
             this.bucketName = requireNonNull(bucketName, "bucketName is null");
@@ -170,9 +178,9 @@ public static void main(String[] args)
 
         DistributedQueryRunner queryRunner = S3HiveQueryRunner.builder(hiveMinioDataLake)
                 .setExtraProperties(ImmutableMap.of("http-server.http.port", "8080"))
+                .setHiveProperties(ImmutableMap.of("hive.security", ALLOW_ALL))
                 .setSkipTimezoneSetup(true)
                 .setInitialTables(TpchTable.getTables())
-                .setSecurity(ALLOW_ALL)
                 .build();
         Logger log = Logger.get(S3HiveQueryRunner.class);
         log.info("======== SERVER STARTED ========");
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestHiveS3MinioQueries.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestHiveS3MinioQueries.java
new file mode 100644
index 000000000000..10b57a440e97
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestHiveS3MinioQueries.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.s3;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.hive.HiveQueryRunner;
+import io.trino.plugin.hive.NodeVersion;
+import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
+import io.trino.plugin.hive.metastore.file.FileHiveMetastore;
+import io.trino.plugin.hive.metastore.file.FileHiveMetastoreConfig;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DataProviders;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.containers.Minio;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.google.common.base.Verify.verify;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
+import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestHiveS3MinioQueries
+        extends AbstractTestQueryFramework
+{
+    private Minio minio;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        minio = closeAfterClass(Minio.builder().build());
+        minio.start();
+
+        return HiveQueryRunner.builder()
+                .setMetastore(queryRunner -> {
+                    File baseDir = queryRunner.getCoordinator().getBaseDataDir().resolve("hive_data").toFile();
+                    return new FileHiveMetastore(
+                            new NodeVersion("testversion"),
+                            HDFS_FILE_SYSTEM_FACTORY,
+                            new HiveMetastoreConfig().isHideDeltaLakeTables(),
+                            new FileHiveMetastoreConfig()
+                                    .setCatalogDirectory(baseDir.toURI().toString())
+                                    .setDisableLocationChecks(true) // matches Glue behavior
+                                    .setMetastoreUser("test"));
+                })
+                .setHiveProperties(ImmutableMap.<String, String>builder()
+                        .put("hive.s3.aws-access-key", MINIO_ACCESS_KEY)
+                        .put("hive.s3.aws-secret-key", MINIO_SECRET_KEY)
+                        .put("hive.s3.endpoint", minio.getMinioAddress())
+                        .put("hive.s3.path-style-access", "true")
+                        .put("hive.non-managed-table-writes-enabled", "true")
+                        .buildOrThrow())
+                .build();
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void cleanUp()
+    {
+        minio = null; // closed by closeAfterClass
+    }
+
+    @Test(dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
+    public void testTableLocationTopOfTheBucket(boolean locationWithTrailingSlash)
+    {
+        String bucketName = "test-bucket-" + randomNameSuffix();
+        minio.createBucket(bucketName);
+        minio.writeFile("We are\nawesome at\nmultiple slashes.".getBytes(UTF_8), bucketName, "a_file");
+
+        String location = "s3://%s%s".formatted(bucketName, locationWithTrailingSlash ? "/" : "");
+        String tableName = "test_table_top_of_bucket_%s_%s".formatted(locationWithTrailingSlash, randomNameSuffix());
+        String create = "CREATE TABLE %s (a varchar) WITH (format='TEXTFILE', external_location='%s')".formatted(tableName, location);
+        if (!locationWithTrailingSlash) {
+            assertQueryFails(create, "External location is not a valid file system URI: " + location);
+            return;
+        }
+        assertUpdate(create);
+
+        // Verify location was not normalized along the way. Glue would not do that.
+        assertThat(getDeclaredTableLocation(tableName))
+                .isEqualTo(location);
+
+        assertThat(query("TABLE " + tableName))
+                .matches("VALUES VARCHAR 'We are', 'awesome at', 'multiple slashes.'");
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES 'Aren''t we?'", 1);
+
+        assertThat(query("TABLE " + tableName))
+                .matches("VALUES VARCHAR 'We are', 'awesome at', 'multiple slashes.', 'Aren''t we?'");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    private String getDeclaredTableLocation(String tableName)
+    {
+        Pattern locationPattern = Pattern.compile(".*external_location = '(.*?)'.*", Pattern.DOTALL);
+        Object result = computeScalar("SHOW CREATE TABLE " + tableName);
+        Matcher matcher = locationPattern.matcher((String) result);
+        if (matcher.find()) {
+            String location = matcher.group(1);
+            verify(!matcher.find(), "Unexpected second match");
+            return location;
+        }
+        throw new IllegalStateException("Location not found in: " + result);
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestS3WrongRegionPicked.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestS3WrongRegionPicked.java
deleted file mode 100644
index 390fee01923b..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestS3WrongRegionPicked.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3;
-
-import com.google.common.collect.ImmutableMap;
-import io.trino.plugin.hive.containers.HiveMinioDataLake;
-import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
-
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-public class TestS3WrongRegionPicked
-{
-    @Test
-    public void testS3WrongRegionSelection()
-            throws Exception
-    {
-        // Bucket names are global so a unique one needs to be used.
-        String bucketName = "test-bucket" + randomNameSuffix();
-
-        try (HiveMinioDataLake dataLake = new HiveMinioDataLake(bucketName)) {
-            dataLake.start();
-            try (QueryRunner queryRunner = S3HiveQueryRunner.builder(dataLake)
-                    .setHiveProperties(ImmutableMap.of("hive.s3.region", "eu-central-1")) // Different than the default one
-                    .build()) {
-                String tableName = "s3_region_test_" + randomNameSuffix();
-                queryRunner.execute("CREATE TABLE default." + tableName + " (a int) WITH (external_location = 's3://" + bucketName + "/" + tableName + "')");
-                assertThatThrownBy(() -> queryRunner.execute("SELECT * FROM default." + tableName))
-                        .rootCause()
-                        .hasMessageContaining("Status Code: 400")
-                        .hasMessageContaining("Error Code: AuthorizationHeaderMalformed"); // That is how Minio reacts to bad region
-            }
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestTrinoS3FileSystemAccessOperations.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestTrinoS3FileSystemAccessOperations.java
new file mode 100644
index 000000000000..e094ef14ea7b
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestTrinoS3FileSystemAccessOperations.java
@@ -0,0 +1,228 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.s3;
+
+import com.google.common.collect.HashMultiset;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultiset;
+import com.google.common.collect.Multiset;
+import io.airlift.units.DataSize;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.sdk.trace.data.SpanData;
+import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
+import io.trino.Session;
+import io.trino.plugin.hive.HiveQueryRunner;
+import io.trino.plugin.hive.NodeVersion;
+import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
+import io.trino.plugin.hive.metastore.file.FileHiveMetastore;
+import io.trino.plugin.hive.metastore.file.FileHiveMetastoreConfig;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.containers.Minio;
+import org.intellij.lang.annotations.Language;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.util.Arrays;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.plugin.hive.HiveQueryRunner.TPCH_SCHEMA;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
+import static io.trino.testing.DataProviders.toDataProvider;
+import static io.trino.testing.MultisetAssertions.assertMultisetsEqual;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
+import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
+import static java.util.stream.Collectors.toCollection;
+
+@Test(singleThreaded = true) // S3 request counters shares mutable state so can't be run from many threads simultaneously
+public class TestTrinoS3FileSystemAccessOperations
+        extends AbstractTestQueryFramework
+{
+    private static final String BUCKET = "test-bucket";
+
+    private Minio minio;
+    private InMemorySpanExporter spanExporter;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        minio = closeAfterClass(Minio.builder().build());
+        minio.start();
+        minio.createBucket(BUCKET);
+
+        spanExporter = closeAfterClass(InMemorySpanExporter.create());
+
+        SdkTracerProvider tracerProvider = SdkTracerProvider.builder()
+                .addSpanProcessor(SimpleSpanProcessor.create(spanExporter))
+                .build();
+
+        OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()
+                .setTracerProvider(tracerProvider)
+                .build();
+
+        return HiveQueryRunner.builder()
+                .setMetastore(distributedQueryRunner -> {
+                    File baseDir = distributedQueryRunner.getCoordinator().getBaseDataDir().resolve("hive_data").toFile();
+                    return new FileHiveMetastore(
+                            new NodeVersion("testversion"),
+                            HDFS_FILE_SYSTEM_FACTORY,
+                            new HiveMetastoreConfig().isHideDeltaLakeTables(),
+                            new FileHiveMetastoreConfig()
+                                    .setCatalogDirectory(baseDir.toURI().toString())
+                                    .setDisableLocationChecks(true) // matches Glue behavior
+                                    .setMetastoreUser("test"));
+                })
+                .setHiveProperties(ImmutableMap.<String, String>builder()
+                        .put("hive.s3.aws-access-key", MINIO_ACCESS_KEY)
+                        .put("hive.s3.aws-secret-key", MINIO_SECRET_KEY)
+                        .put("hive.s3.endpoint", minio.getMinioAddress())
+                        .put("hive.s3.path-style-access", "true")
+                        .put("hive.non-managed-table-writes-enabled", "true")
+                        .buildOrThrow())
+                .setOpenTelemetry(openTelemetry)
+                .setInitialSchemasLocationBase("s3://" + BUCKET)
+                .build();
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void tearDown()
+    {
+        // closed by closeAfterClass
+        spanExporter = null;
+        minio = null;
+    }
+
+    @Test(dataProvider = "storageFormats")
+    public void testSelectWithFilter(StorageFormat format)
+    {
+        assertUpdate("DROP TABLE IF EXISTS test_select_from_where");
+        String tableLocation = randomTableLocation("test_select_from_where");
+
+        assertUpdate("CREATE TABLE test_select_from_where WITH (format = '" + format + "', external_location = '" + tableLocation + "') AS SELECT 2 AS age", 1);
+
+        assertFileSystemAccesses(
+                withSmallFileThreshold(getSession(), DataSize.valueOf("1MB")), // large enough threshold for single request of small file
+                "SELECT * FROM test_select_from_where WHERE age = 2",
+                ImmutableMultiset.<String>builder()
+                        .add("S3.GetObject")
+                        .add("S3.ListObjectsV2")
+                        .build());
+
+        assertFileSystemAccesses(
+                withSmallFileThreshold(getSession(), DataSize.valueOf("10B")), // disables single request for small file
+                "SELECT * FROM test_select_from_where WHERE age = 2",
+                ImmutableMultiset.<String>builder()
+                        .addCopies("S3.GetObject", occurrences(format, 3, 2))
+                        .add("S3.ListObjectsV2")
+                        .build());
+
+        assertUpdate("DROP TABLE test_select_from_where");
+    }
+
+    @Test(dataProvider = "storageFormats")
+    public void testSelectPartitionTable(StorageFormat format)
+    {
+        assertUpdate("DROP TABLE IF EXISTS test_select_from_partition");
+        String tableLocation = randomTableLocation("test_select_from_partition");
+
+        assertUpdate("CREATE TABLE test_select_from_partition (data int, key varchar)" +
+                "WITH (partitioned_by = ARRAY['key'], format = '" + format + "', external_location = '" + tableLocation + "')");
+        assertUpdate("INSERT INTO test_select_from_partition VALUES (1, 'part1'), (2, 'part2')", 2);
+
+        assertFileSystemAccesses("SELECT * FROM test_select_from_partition",
+                ImmutableMultiset.<String>builder()
+                        .addCopies("S3.GetObject", 2)
+                        .addCopies("S3.ListObjectsV2", 2)
+                        .build());
+
+        assertFileSystemAccesses("SELECT * FROM test_select_from_partition WHERE key = 'part1'",
+                ImmutableMultiset.<String>builder()
+                        .add("S3.GetObject")
+                        .add("S3.ListObjectsV2")
+                        .build());
+
+        assertUpdate("INSERT INTO test_select_from_partition VALUES (11, 'part1')", 1);
+        assertFileSystemAccesses("SELECT * FROM test_select_from_partition WHERE key = 'part1'",
+                ImmutableMultiset.<String>builder()
+                        .addCopies("S3.GetObject", 2)
+                        .addCopies("S3.ListObjectsV2", 1)
+                        .build());
+
+        assertUpdate("DROP TABLE test_select_from_partition");
+    }
+
+    private static String randomTableLocation(String tableName)
+    {
+        return "s3://%s/%s/%s-%s".formatted(BUCKET, TPCH_SCHEMA, tableName, randomNameSuffix());
+    }
+
+    private void assertFileSystemAccesses(@Language("SQL") String query, Multiset<String> expectedAccesses)
+    {
+        assertFileSystemAccesses(getDistributedQueryRunner().getDefaultSession(), query, expectedAccesses);
+    }
+
+    private void assertFileSystemAccesses(Session session, @Language("SQL") String query, Multiset<String> expectedAccesses)
+    {
+        DistributedQueryRunner queryRunner = getDistributedQueryRunner();
+        spanExporter.reset();
+        queryRunner.executeWithQueryId(session, query);
+        assertMultisetsEqual(getOperations(), expectedAccesses);
+    }
+
+    private Multiset<String> getOperations()
+    {
+        return spanExporter.getFinishedSpanItems().stream()
+                .map(SpanData::getName)
+                .collect(toCollection(HashMultiset::create));
+    }
+
+    @DataProvider
+    public static Object[][] storageFormats()
+    {
+        return Arrays.stream(StorageFormat.values())
+                .collect(toDataProvider());
+    }
+
+    private static int occurrences(StorageFormat tableType, int orcValue, int parquetValue)
+    {
+        checkArgument(!(orcValue == parquetValue), "No need to use Occurrences when ORC and Parquet");
+        return switch (tableType) {
+            case ORC -> orcValue;
+            case PARQUET -> parquetValue;
+        };
+    }
+
+    private static Session withSmallFileThreshold(Session session, DataSize sizeThreshold)
+    {
+        String catalog = session.getCatalog().orElseThrow();
+        return Session.builder(session)
+                .setCatalogSessionProperty(catalog, "parquet_small_file_threshold", sizeThreshold.toString())
+                .setCatalogSessionProperty(catalog, "orc_tiny_stripe_threshold", sizeThreshold.toString())
+                .build();
+    }
+
+    enum StorageFormat
+    {
+        ORC,
+        PARQUET,
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestTrinoS3FileSystemMinio.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestTrinoS3FileSystemMinio.java
index 1ceca3816f06..c400cd82c7ef 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestTrinoS3FileSystemMinio.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestTrinoS3FileSystemMinio.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hive.s3;
 
 import com.amazonaws.services.s3.AmazonS3;
+import io.trino.hdfs.s3.TrinoS3FileSystem;
 import io.trino.testing.containers.Minio;
 import io.trino.testing.minio.MinioClient;
 import io.trino.util.AutoCloseableCloser;
@@ -36,7 +37,7 @@
 public class TestTrinoS3FileSystemMinio
         extends BaseTestTrinoS3FileSystemObjectStorage
 {
-    private final String bucketName = "trino-ci-test";
+    private final String bucketName = "test-bucket-" + randomNameSuffix();
 
     private Minio minio;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestIonSqlQueryBuilder.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestIonSqlQueryBuilder.java
deleted file mode 100644
index 243a26470e1c..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestIonSqlQueryBuilder.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import io.trino.plugin.hive.HiveColumnHandle;
-import io.trino.plugin.hive.HiveType;
-import io.trino.spi.predicate.Domain;
-import io.trino.spi.predicate.Range;
-import io.trino.spi.predicate.SortedRangeSet;
-import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.TypeManager;
-import io.trino.util.DateTimeUtils;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import java.util.Optional;
-
-import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
-import static io.trino.plugin.hive.HiveColumnHandle.createBaseColumn;
-import static io.trino.plugin.hive.HiveTestUtils.longDecimal;
-import static io.trino.plugin.hive.HiveTestUtils.shortDecimal;
-import static io.trino.plugin.hive.HiveType.HIVE_DATE;
-import static io.trino.plugin.hive.HiveType.HIVE_DOUBLE;
-import static io.trino.plugin.hive.HiveType.HIVE_INT;
-import static io.trino.plugin.hive.HiveType.HIVE_STRING;
-import static io.trino.plugin.hive.HiveType.HIVE_TIMESTAMP;
-import static io.trino.spi.predicate.TupleDomain.withColumnDomains;
-import static io.trino.spi.predicate.ValueSet.ofRanges;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.DateType.DATE;
-import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.IntegerType.INTEGER;
-import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
-import static org.testng.Assert.assertEquals;
-
-public class TestIonSqlQueryBuilder
-{
-    @Test
-    public void testBuildSQL()
-    {
-        List<HiveColumnHandle> columns = ImmutableList.of(
-                createBaseColumn("n_nationkey", 0, HIVE_INT, INTEGER, REGULAR, Optional.empty()),
-                createBaseColumn("n_name", 1, HIVE_STRING, VARCHAR, REGULAR, Optional.empty()),
-                createBaseColumn("n_regionkey", 2, HIVE_INT, INTEGER, REGULAR, Optional.empty()));
-
-        // CSV
-        IonSqlQueryBuilder queryBuilder = new IonSqlQueryBuilder(TESTING_TYPE_MANAGER, S3SelectDataType.CSV);
-        assertEquals(queryBuilder.buildSql(columns, TupleDomain.all()),
-                "SELECT s._1, s._2, s._3 FROM S3Object s");
-
-        TupleDomain<HiveColumnHandle> tupleDomain = withColumnDomains(ImmutableMap.of(
-                columns.get(2), Domain.create(SortedRangeSet.copyOf(BIGINT, ImmutableList.of(Range.equal(BIGINT, 3L))), false)));
-        assertEquals(queryBuilder.buildSql(columns, tupleDomain),
-                "SELECT s._1, s._2, s._3 FROM S3Object s WHERE (case s._3 when '' then null else CAST(s._3 AS INT) end = 3)");
-
-        // JSON
-        queryBuilder = new IonSqlQueryBuilder(TESTING_TYPE_MANAGER, S3SelectDataType.JSON);
-        assertEquals(queryBuilder.buildSql(columns, TupleDomain.all()),
-                "SELECT s.n_nationkey, s.n_name, s.n_regionkey FROM S3Object s");
-        assertEquals(queryBuilder.buildSql(columns, tupleDomain),
-                "SELECT s.n_nationkey, s.n_name, s.n_regionkey FROM S3Object s " +
-                "WHERE (case s.n_regionkey when '' then null else CAST(s.n_regionkey AS INT) end = 3)");
-    }
-
-    @Test
-    public void testEmptyColumns()
-    {
-        // CSV
-        IonSqlQueryBuilder queryBuilder = new IonSqlQueryBuilder(TESTING_TYPE_MANAGER, S3SelectDataType.CSV);
-        assertEquals(queryBuilder.buildSql(ImmutableList.of(), TupleDomain.all()), "SELECT ' ' FROM S3Object s");
-
-        // JSON
-        queryBuilder = new IonSqlQueryBuilder(TESTING_TYPE_MANAGER, S3SelectDataType.JSON);
-        assertEquals(queryBuilder.buildSql(ImmutableList.of(), TupleDomain.all()), "SELECT ' ' FROM S3Object s");
-    }
-
-    @Test
-    public void testDecimalColumns()
-    {
-        TypeManager typeManager = TESTING_TYPE_MANAGER;
-        List<HiveColumnHandle> columns = ImmutableList.of(
-                createBaseColumn("quantity", 0, HiveType.valueOf("decimal(20,0)"), DecimalType.createDecimalType(), REGULAR, Optional.empty()),
-                createBaseColumn("extendedprice", 1, HiveType.valueOf("decimal(20,2)"), DecimalType.createDecimalType(), REGULAR, Optional.empty()),
-                createBaseColumn("discount", 2, HiveType.valueOf("decimal(10,2)"), DecimalType.createDecimalType(), REGULAR, Optional.empty()));
-        DecimalType decimalType = DecimalType.createDecimalType(10, 2);
-        TupleDomain<HiveColumnHandle> tupleDomain = withColumnDomains(
-                ImmutableMap.of(
-                        columns.get(0), Domain.create(ofRanges(Range.lessThan(DecimalType.createDecimalType(20, 0), longDecimal("50"))), false),
-                        columns.get(1), Domain.create(ofRanges(Range.equal(HiveType.valueOf("decimal(20,2)").getType(typeManager), longDecimal("0.05"))), false),
-                        columns.get(2), Domain.create(ofRanges(Range.range(decimalType, shortDecimal("0.0"), true, shortDecimal("0.02"), true)), false)));
-
-        // CSV
-        IonSqlQueryBuilder queryBuilder = new IonSqlQueryBuilder(typeManager, S3SelectDataType.CSV);
-        assertEquals(queryBuilder.buildSql(columns, tupleDomain),
-                "SELECT s._1, s._2, s._3 FROM S3Object s WHERE ((case s._1 when '' then null else CAST(s._1 AS DECIMAL(20,0)) end < 50)) AND " +
-                "(case s._2 when '' then null else CAST(s._2 AS DECIMAL(20,2)) end = 0.05) AND ((case s._3 when '' then null else CAST(s._3 AS DECIMAL(10,2)) " +
-                "end >= 0.00 AND case s._3 when '' then null else CAST(s._3 AS DECIMAL(10,2)) end <= 0.02))");
-
-        // JSON
-        queryBuilder = new IonSqlQueryBuilder(typeManager, S3SelectDataType.JSON);
-        assertEquals(queryBuilder.buildSql(columns, tupleDomain),
-                "SELECT s.quantity, s.extendedprice, s.discount FROM S3Object s WHERE ((case s.quantity when '' then null else CAST(s.quantity AS DECIMAL(20,0)) end < 50)) AND " +
-                "(case s.extendedprice when '' then null else CAST(s.extendedprice AS DECIMAL(20,2)) end = 0.05) AND ((case s.discount when '' then null else CAST(s.discount AS DECIMAL(10,2)) " +
-                "end >= 0.00 AND case s.discount when '' then null else CAST(s.discount AS DECIMAL(10,2)) end <= 0.02))");
-    }
-
-    @Test
-    public void testDateColumn()
-    {
-        List<HiveColumnHandle> columns = ImmutableList.of(
-                createBaseColumn("t1", 0, HIVE_TIMESTAMP, TIMESTAMP_MILLIS, REGULAR, Optional.empty()),
-                createBaseColumn("t2", 1, HIVE_DATE, DATE, REGULAR, Optional.empty()));
-        TupleDomain<HiveColumnHandle> tupleDomain = withColumnDomains(ImmutableMap.of(
-                columns.get(1), Domain.create(SortedRangeSet.copyOf(DATE, ImmutableList.of(Range.equal(DATE, (long) DateTimeUtils.parseDate("2001-08-22")))), false)));
-
-        // CSV
-        IonSqlQueryBuilder queryBuilder = new IonSqlQueryBuilder(TESTING_TYPE_MANAGER, S3SelectDataType.CSV);
-        assertEquals(queryBuilder.buildSql(columns, tupleDomain), "SELECT s._1, s._2 FROM S3Object s WHERE (case s._2 when '' then null else CAST(s._2 AS TIMESTAMP) end = `2001-08-22`)");
-
-        // JSON
-        queryBuilder = new IonSqlQueryBuilder(TESTING_TYPE_MANAGER, S3SelectDataType.JSON);
-        assertEquals(queryBuilder.buildSql(columns, tupleDomain), "SELECT s.t1, s.t2 FROM S3Object s WHERE (case s.t2 when '' then null else CAST(s.t2 AS TIMESTAMP) end = `2001-08-22`)");
-    }
-
-    @Test
-    public void testNotPushDoublePredicates()
-    {
-        List<HiveColumnHandle> columns = ImmutableList.of(
-                createBaseColumn("quantity", 0, HIVE_INT, INTEGER, REGULAR, Optional.empty()),
-                createBaseColumn("extendedprice", 1, HIVE_DOUBLE, DOUBLE, REGULAR, Optional.empty()),
-                createBaseColumn("discount", 2, HIVE_DOUBLE, DOUBLE, REGULAR, Optional.empty()));
-        TupleDomain<HiveColumnHandle> tupleDomain = withColumnDomains(
-                ImmutableMap.of(
-                        columns.get(0), Domain.create(ofRanges(Range.lessThan(BIGINT, 50L)), false),
-                        columns.get(1), Domain.create(ofRanges(Range.equal(DOUBLE, 0.05)), false),
-                        columns.get(2), Domain.create(ofRanges(Range.range(DOUBLE, 0.0, true, 0.02, true)), false)));
-
-        // CSV
-        IonSqlQueryBuilder queryBuilder = new IonSqlQueryBuilder(TESTING_TYPE_MANAGER, S3SelectDataType.CSV);
-        assertEquals(queryBuilder.buildSql(columns, tupleDomain), "SELECT s._1, s._2, s._3 FROM S3Object s WHERE ((case s._1 when '' then null else CAST(s._1 AS INT) end < 50))");
-
-        // JSON
-        queryBuilder = new IonSqlQueryBuilder(TESTING_TYPE_MANAGER, S3SelectDataType.JSON);
-        assertEquals(queryBuilder.buildSql(columns, tupleDomain), "SELECT s.quantity, s.extendedprice, s.discount FROM S3Object s WHERE ((case s.quantity when '' then null else CAST(s.quantity AS INT) end < 50))");
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestS3SelectPushdown.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestS3SelectPushdown.java
deleted file mode 100644
index b52308342500..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestS3SelectPushdown.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import io.trino.plugin.hive.metastore.Column;
-import io.trino.plugin.hive.metastore.Partition;
-import io.trino.plugin.hive.metastore.Storage;
-import io.trino.plugin.hive.metastore.StorageFormat;
-import io.trino.plugin.hive.metastore.Table;
-import io.trino.spi.connector.ConnectorSession;
-import io.trino.testing.TestingConnectorSession;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.TextInputFormat;
-import org.apache.hive.hcatalog.data.JsonSerDe;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.OptionalLong;
-import java.util.Properties;
-
-import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
-import static io.trino.plugin.hive.HiveMetadata.SKIP_FOOTER_COUNT_KEY;
-import static io.trino.plugin.hive.HiveMetadata.SKIP_HEADER_COUNT_KEY;
-import static io.trino.plugin.hive.HiveStorageFormat.ORC;
-import static io.trino.plugin.hive.HiveStorageFormat.TEXTFILE;
-import static io.trino.plugin.hive.HiveType.HIVE_BINARY;
-import static io.trino.plugin.hive.HiveType.HIVE_BOOLEAN;
-import static io.trino.plugin.hive.metastore.StorageFormat.fromHiveStorageFormat;
-import static io.trino.plugin.hive.s3select.S3SelectPushdown.isCompressionCodecSupported;
-import static io.trino.plugin.hive.s3select.S3SelectPushdown.isSplittable;
-import static io.trino.plugin.hive.s3select.S3SelectPushdown.shouldEnablePushdownForTable;
-import static io.trino.spi.session.PropertyMetadata.booleanProperty;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonList;
-import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_LIB;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-public class TestS3SelectPushdown
-{
-    private static final String S3_SELECT_PUSHDOWN_ENABLED = "s3_select_pushdown_enabled";
-
-    private TextInputFormat inputFormat;
-    private ConnectorSession session;
-    private Table table;
-    private Partition partition;
-    private Storage storage;
-    private Column column;
-    private Properties schema;
-
-    @BeforeClass
-    public void setUp()
-    {
-        inputFormat = new TextInputFormat();
-        inputFormat.configure(new JobConf(newEmptyConfiguration()));
-
-        session = TestingConnectorSession.builder()
-                .setPropertyMetadata(List.of(booleanProperty(
-                        S3_SELECT_PUSHDOWN_ENABLED,
-                        "S3 Select pushdown enabled",
-                        true,
-                        false)))
-                .setPropertyValues(Map.of(S3_SELECT_PUSHDOWN_ENABLED, true))
-                .build();
-
-        column = new Column("column", HIVE_BOOLEAN, Optional.empty());
-
-        storage = Storage.builder()
-                .setStorageFormat(fromHiveStorageFormat(TEXTFILE))
-                .setLocation("location")
-                .build();
-
-        partition = new Partition(
-                "db",
-                "table",
-                emptyList(),
-                storage,
-                singletonList(column),
-                emptyMap());
-
-        table = new Table(
-                "db",
-                "table",
-                Optional.of("owner"),
-                "type",
-                storage,
-                singletonList(column),
-                emptyList(),
-                emptyMap(),
-                Optional.empty(),
-                Optional.empty(),
-                OptionalLong.empty());
-
-        schema = new Properties();
-        schema.setProperty(SERIALIZATION_LIB, LazySimpleSerDe.class.getName());
-    }
-
-    @Test
-    public void testIsCompressionCodecSupported()
-    {
-        assertTrue(isCompressionCodecSupported(inputFormat, new Path("s3://fakeBucket/fakeObject.gz")));
-        assertTrue(isCompressionCodecSupported(inputFormat, new Path("s3://fakeBucket/fakeObject")));
-        assertFalse(isCompressionCodecSupported(inputFormat, new Path("s3://fakeBucket/fakeObject.lz4")));
-        assertFalse(isCompressionCodecSupported(inputFormat, new Path("s3://fakeBucket/fakeObject.snappy")));
-        assertTrue(isCompressionCodecSupported(inputFormat, new Path("s3://fakeBucket/fakeObject.bz2")));
-    }
-
-    @Test
-    public void testShouldEnableSelectPushdown()
-    {
-        assertTrue(shouldEnablePushdownForTable(session, table, "s3://fakeBucket/fakeObject", Optional.empty()));
-        assertTrue(shouldEnablePushdownForTable(session, table, "s3://fakeBucket/fakeObject", Optional.of(partition)));
-    }
-
-    @Test
-    public void testShouldNotEnableSelectPushdownWhenDisabledOnSession()
-    {
-        ConnectorSession testSession = TestingConnectorSession.builder()
-                .setPropertyMetadata(List.of(booleanProperty(
-                        S3_SELECT_PUSHDOWN_ENABLED,
-                        "S3 Select pushdown enabled",
-                        false,
-                        false)))
-                .setPropertyValues(Map.of(S3_SELECT_PUSHDOWN_ENABLED, false))
-                .build();
-        assertFalse(shouldEnablePushdownForTable(testSession, table, "", Optional.empty()));
-    }
-
-    @Test
-    public void testShouldNotEnableSelectPushdownWhenIsNotS3StoragePath()
-    {
-        assertFalse(shouldEnablePushdownForTable(session, table, null, Optional.empty()));
-        assertFalse(shouldEnablePushdownForTable(session, table, "", Optional.empty()));
-        assertFalse(shouldEnablePushdownForTable(session, table, "s3:/invalid", Optional.empty()));
-        assertFalse(shouldEnablePushdownForTable(session, table, "s3:/invalid", Optional.of(partition)));
-    }
-
-    @Test
-    public void testShouldNotEnableSelectPushdownWhenIsNotSupportedSerde()
-    {
-        Storage newStorage = Storage.builder()
-                .setStorageFormat(fromHiveStorageFormat(ORC))
-                .setLocation("location")
-                .build();
-        Table newTable = new Table(
-                "db",
-                "table",
-                Optional.of("owner"),
-                "type",
-                newStorage,
-                singletonList(column),
-                emptyList(),
-                emptyMap(),
-                Optional.empty(),
-                Optional.empty(),
-                OptionalLong.empty());
-
-        assertFalse(shouldEnablePushdownForTable(session, newTable, "s3://fakeBucket/fakeObject", Optional.empty()));
-
-        Partition newPartition = new Partition("db",
-                "table",
-                emptyList(),
-                newStorage,
-                singletonList(column),
-                emptyMap());
-        assertFalse(shouldEnablePushdownForTable(session, newTable, "s3://fakeBucket/fakeObject", Optional.of(newPartition)));
-    }
-
-    @Test
-    public void testShouldNotEnableSelectPushdownWhenIsNotSupportedInputFormat()
-    {
-        Storage newStorage = Storage.builder()
-                .setStorageFormat(StorageFormat.create(LazySimpleSerDe.class.getName(), "inputFormat", "outputFormat"))
-                .setLocation("location")
-                .build();
-        Table newTable = new Table("db",
-                "table",
-                Optional.of("owner"),
-                "type",
-                newStorage,
-                singletonList(column),
-                emptyList(),
-                emptyMap(),
-                Optional.empty(),
-                Optional.empty(),
-                OptionalLong.empty());
-        assertFalse(shouldEnablePushdownForTable(session, newTable, "s3://fakeBucket/fakeObject", Optional.empty()));
-
-        Partition newPartition = new Partition("db",
-                "table",
-                emptyList(),
-                newStorage,
-                singletonList(column),
-                emptyMap());
-        assertFalse(shouldEnablePushdownForTable(session, newTable, "s3://fakeBucket/fakeObject", Optional.of(newPartition)));
-
-        newStorage = Storage.builder()
-                .setStorageFormat(StorageFormat.create(LazySimpleSerDe.class.getName(), TextInputFormat.class.getName(), "outputFormat"))
-                .setLocation("location")
-                .build();
-        newTable = new Table("db",
-                "table",
-                Optional.of("owner"),
-                "type",
-                newStorage,
-                singletonList(column),
-                emptyList(),
-                Map.of(SKIP_HEADER_COUNT_KEY, "1"),
-                Optional.empty(),
-                Optional.empty(),
-                OptionalLong.empty());
-        assertFalse(shouldEnablePushdownForTable(session, newTable, "s3://fakeBucket/fakeObject", Optional.empty()));
-
-        newTable = new Table("db",
-                "table",
-                Optional.of("owner"),
-                "type",
-                newStorage,
-                singletonList(column),
-                emptyList(),
-                Map.of(SKIP_FOOTER_COUNT_KEY, "1"),
-                Optional.empty(),
-                Optional.empty(),
-                OptionalLong.empty());
-        assertFalse(shouldEnablePushdownForTable(session, newTable, "s3://fakeBucket/fakeObject", Optional.empty()));
-    }
-
-    @Test
-    public void testShouldNotEnableSelectPushdownWhenColumnTypesAreNotSupported()
-    {
-        Column newColumn = new Column("column", HIVE_BINARY, Optional.empty());
-        Table newTable = new Table("db",
-                "table",
-                Optional.of("owner"),
-                "type",
-                storage,
-                singletonList(newColumn),
-                emptyList(),
-                emptyMap(),
-                Optional.empty(),
-                Optional.empty(),
-                OptionalLong.empty());
-        assertFalse(shouldEnablePushdownForTable(session, newTable, "s3://fakeBucket/fakeObject", Optional.empty()));
-
-        Partition newPartition = new Partition("db",
-                "table",
-                emptyList(),
-                storage,
-                singletonList(newColumn),
-                emptyMap());
-        assertFalse(shouldEnablePushdownForTable(session, newTable, "s3://fakeBucket/fakeObject", Optional.of(newPartition)));
-    }
-
-    @Test
-    public void testShouldEnableSplits()
-    {
-        // Uncompressed CSV
-        assertTrue(isSplittable(true, schema, inputFormat, new Path("s3://fakeBucket/fakeObject.csv")));
-        // Pushdown disabled
-        assertTrue(isSplittable(false, schema, inputFormat, new Path("s3://fakeBucket/fakeObject.csv")));
-        // JSON
-        Properties jsonSchema = new Properties();
-        jsonSchema.setProperty(SERIALIZATION_LIB, JsonSerDe.class.getName());
-        assertTrue(isSplittable(true, jsonSchema, inputFormat, new Path("s3://fakeBucket/fakeObject.json")));
-    }
-
-    @Test
-    public void testShouldNotEnableSplits()
-    {
-        // Compressed file
-        assertFalse(isSplittable(true, schema, inputFormat, new Path("s3://fakeBucket/fakeObject.gz")));
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-    {
-        inputFormat = null;
-        session = null;
-        table = null;
-        partition = null;
-        storage = null;
-        column = null;
-        schema = null;
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestS3SelectRecordCursor.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestS3SelectRecordCursor.java
deleted file mode 100644
index 622ba5a13c7e..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestS3SelectRecordCursor.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.plugin.hive.HiveColumnHandle;
-import io.trino.plugin.hive.HiveType;
-import io.trino.plugin.hive.type.TypeInfo;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
-import org.testng.annotations.Test;
-
-import java.util.Optional;
-import java.util.Properties;
-import java.util.stream.Stream;
-
-import static io.trino.plugin.hive.HiveColumnHandle.ColumnType.REGULAR;
-import static io.trino.plugin.hive.HiveColumnHandle.createBaseColumn;
-import static io.trino.plugin.hive.HiveType.HIVE_INT;
-import static io.trino.plugin.hive.HiveType.HIVE_STRING;
-import static io.trino.plugin.hive.s3select.S3SelectRecordCursor.updateSplitSchema;
-import static io.trino.spi.type.DateType.DATE;
-import static io.trino.spi.type.IntegerType.INTEGER;
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static java.util.Arrays.asList;
-import static java.util.stream.Collectors.joining;
-import static org.apache.hadoop.hive.serde.serdeConstants.LIST_COLUMNS;
-import static org.apache.hadoop.hive.serde.serdeConstants.LIST_COLUMN_TYPES;
-import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_DDL;
-import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_LIB;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-
-public class TestS3SelectRecordCursor
-{
-    private static final String LAZY_SERDE_CLASS_NAME = LazySimpleSerDe.class.getName();
-
-    protected static final HiveColumnHandle ARTICLE_COLUMN = createBaseColumn("article", 1, HIVE_STRING, VARCHAR, REGULAR, Optional.empty());
-    protected static final HiveColumnHandle AUTHOR_COLUMN = createBaseColumn("author", 1, HIVE_STRING, VARCHAR, REGULAR, Optional.empty());
-    protected static final HiveColumnHandle DATE_ARTICLE_COLUMN = createBaseColumn("date_pub", 1, HIVE_INT, DATE, REGULAR, Optional.empty());
-    protected static final HiveColumnHandle QUANTITY_COLUMN = createBaseColumn("quantity", 1, HIVE_INT, INTEGER, REGULAR, Optional.empty());
-    private static final HiveColumnHandle[] DEFAULT_TEST_COLUMNS = {ARTICLE_COLUMN, AUTHOR_COLUMN, DATE_ARTICLE_COLUMN, QUANTITY_COLUMN};
-
-    @Test
-    public void shouldThrowIllegalArgumentExceptionWhenSerialDDLHasNoColumns()
-    {
-        String ddlSerializationValue = "struct article { }";
-        assertThatThrownBy(() -> buildSplitSchema(ddlSerializationValue, DEFAULT_TEST_COLUMNS))
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessageMatching("Invalid Thrift DDL struct article \\{ \\}");
-    }
-
-    @Test
-    public void shouldThrowIllegalArgumentExceptionWhenSerialDDLNotStartingWithStruct()
-    {
-        String ddlSerializationValue = "foo article { varchar article varchar }";
-        assertThatThrownBy(() -> buildSplitSchema(ddlSerializationValue, DEFAULT_TEST_COLUMNS))
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessage("Thrift DDL should start with struct");
-    }
-
-    @Test
-    public void shouldThrowIllegalArgumentExceptionWhenSerialDDLNotStartingWithStruct2()
-    {
-        String ddlSerializationValue = "struct article {varchar article}";
-        assertThatThrownBy(() -> buildSplitSchema(ddlSerializationValue, DEFAULT_TEST_COLUMNS))
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessageMatching("Invalid Thrift DDL struct article \\{varchar article\\}");
-    }
-
-    @Test
-    public void shouldThrowIllegalArgumentExceptionWhenMissingOpenStartStruct()
-    {
-        String ddlSerializationValue = "struct article varchar article varchar }";
-        assertThatThrownBy(() -> buildSplitSchema(ddlSerializationValue, DEFAULT_TEST_COLUMNS))
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessageMatching("Invalid Thrift DDL struct article varchar article varchar \\}");
-    }
-
-    @Test
-    public void shouldThrowIllegalArgumentExceptionWhenDDlFormatNotCorrect()
-    {
-        String ddlSerializationValue = "struct article{varchar article varchar author date date_pub int quantity";
-        assertThatThrownBy(() -> buildSplitSchema(ddlSerializationValue, DEFAULT_TEST_COLUMNS))
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessageMatching("Invalid Thrift DDL struct article\\{varchar article varchar author date date_pub int quantity");
-    }
-
-    @Test
-    public void shouldThrowIllegalArgumentExceptionWhenEndOfStructNotFound()
-    {
-        String ddlSerializationValue = "struct article { varchar article varchar author date date_pub int quantity ";
-        assertThatThrownBy(() -> buildSplitSchema(ddlSerializationValue, DEFAULT_TEST_COLUMNS))
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessageMatching("Invalid Thrift DDL struct article \\{ varchar article varchar author date date_pub int quantity ");
-    }
-
-    @Test
-    public void shouldFilterColumnsWhichDoesNotMatchInTheHiveTable()
-    {
-        String ddlSerializationValue = "struct article { varchar address varchar company date date_pub int quantity}";
-        String expectedDDLSerialization = "struct article { date date_pub, int quantity}";
-        assertEquals(buildSplitSchema(ddlSerializationValue, DEFAULT_TEST_COLUMNS),
-                buildExpectedProperties(expectedDDLSerialization, DEFAULT_TEST_COLUMNS));
-    }
-
-    @Test
-    public void shouldReturnOnlyQuantityColumnInTheDDl()
-    {
-        String ddlSerializationValue = "struct article { varchar address varchar company date date_pub int quantity}";
-        String expectedDDLSerialization = "struct article { int quantity}";
-        assertEquals(buildSplitSchema(ddlSerializationValue, ARTICLE_COLUMN, QUANTITY_COLUMN),
-                buildExpectedProperties(expectedDDLSerialization, ARTICLE_COLUMN, QUANTITY_COLUMN));
-    }
-
-    @Test
-    public void shouldReturnProperties()
-    {
-        String ddlSerializationValue = "struct article { varchar article varchar author date date_pub int quantity}";
-        String expectedDDLSerialization = "struct article { varchar article, varchar author, date date_pub, int quantity}";
-        assertEquals(buildSplitSchema(ddlSerializationValue, DEFAULT_TEST_COLUMNS),
-                buildExpectedProperties(expectedDDLSerialization, DEFAULT_TEST_COLUMNS));
-    }
-
-    @Test
-    public void shouldReturnPropertiesWithoutDoubleCommaInColumnsNameLastColumnNameWithEndStruct()
-    {
-        String ddlSerializationValue = "struct article { varchar article, varchar author, date date_pub, int quantity}";
-        String expectedDDLSerialization = "struct article { varchar article, varchar author, date date_pub, int quantity}";
-        assertEquals(buildSplitSchema(ddlSerializationValue, DEFAULT_TEST_COLUMNS),
-                buildExpectedProperties(expectedDDLSerialization, DEFAULT_TEST_COLUMNS));
-    }
-
-    @Test
-    public void shouldReturnPropertiesWithoutDoubleCommaInColumnsNameLastColumnNameWithoutEndStruct()
-    {
-        String ddlSerializationValue = "struct article { varchar article, varchar author, date date_pub, int quantity }";
-        String expectedDDLSerialization = "struct article { varchar article, varchar author, date date_pub, int quantity}";
-        assertEquals(buildSplitSchema(ddlSerializationValue, DEFAULT_TEST_COLUMNS),
-                buildExpectedProperties(expectedDDLSerialization, DEFAULT_TEST_COLUMNS));
-    }
-
-    @Test
-    public void shouldOnlyGetColumnTypeFromHiveObjectAndNotFromDDLSerialLastColumnNameWithEndStruct()
-    {
-        String ddlSerializationValue = "struct article { int article, double author, xxxx date_pub, int quantity}";
-        String expectedDDLSerialization = "struct article { int article, double author, xxxx date_pub, int quantity}";
-        assertEquals(buildSplitSchema(ddlSerializationValue, DEFAULT_TEST_COLUMNS),
-                buildExpectedProperties(expectedDDLSerialization, DEFAULT_TEST_COLUMNS));
-    }
-
-    @Test
-    public void shouldOnlyGetColumnTypeFromHiveObjectAndNotFromDDLSerialLastColumnNameWithoutEndStruct()
-    {
-        String ddlSerializationValue = "struct article { int article, double author, xxxx date_pub, int quantity }";
-        String expectedDDLSerialization = "struct article { int article, double author, xxxx date_pub, int quantity}";
-        assertEquals(buildSplitSchema(ddlSerializationValue, DEFAULT_TEST_COLUMNS),
-                buildExpectedProperties(expectedDDLSerialization, DEFAULT_TEST_COLUMNS));
-    }
-
-    @Test(expectedExceptions = NullPointerException.class)
-    public void shouldThrowNullPointerExceptionWhenColumnsIsNull()
-    {
-        updateSplitSchema(new Properties(), null);
-    }
-
-    @Test(expectedExceptions = NullPointerException.class)
-    public void shouldThrowNullPointerExceptionWhenSchemaIsNull()
-    {
-        updateSplitSchema(null, ImmutableList.of());
-    }
-
-    private Properties buildSplitSchema(String ddlSerializationValue, HiveColumnHandle... columns)
-    {
-        Properties properties = new Properties();
-        properties.setProperty(SERIALIZATION_LIB, LAZY_SERDE_CLASS_NAME);
-        properties.setProperty(SERIALIZATION_DDL, ddlSerializationValue);
-        return updateSplitSchema(properties, asList(columns));
-    }
-
-    private Properties buildExpectedProperties(String expectedDDLSerialization, HiveColumnHandle... expectedColumns)
-    {
-        String expectedColumnsType = getTypes(expectedColumns);
-        String expectedColumnsName = getName(expectedColumns);
-        Properties propExpected = new Properties();
-        propExpected.setProperty(LIST_COLUMNS, expectedColumnsName);
-        propExpected.setProperty(SERIALIZATION_LIB, LAZY_SERDE_CLASS_NAME);
-        propExpected.setProperty(SERIALIZATION_DDL, expectedDDLSerialization);
-        propExpected.setProperty(LIST_COLUMN_TYPES, expectedColumnsType);
-        return propExpected;
-    }
-
-    private String getName(HiveColumnHandle[] expectedColumns)
-    {
-        return Stream.of(expectedColumns)
-                .map(HiveColumnHandle::getName)
-                .collect(joining(","));
-    }
-
-    private String getTypes(HiveColumnHandle[] expectedColumns)
-    {
-        return Stream.of(expectedColumns)
-                .map(HiveColumnHandle::getHiveType)
-                .map(HiveType::getTypeInfo)
-                .map(TypeInfo::getTypeName)
-                .collect(joining(","));
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestS3SelectRecordCursorProvider.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestS3SelectRecordCursorProvider.java
deleted file mode 100644
index b676e405297c..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestS3SelectRecordCursorProvider.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import io.trino.hadoop.ConfigurationInstantiator;
-import io.trino.plugin.hive.HiveColumnHandle;
-import io.trino.plugin.hive.HiveConfig;
-import io.trino.plugin.hive.HiveRecordCursorProvider.ReaderRecordCursorWithProjections;
-import io.trino.plugin.hive.TestBackgroundHiveSplitLoader.TestingHdfsEnvironment;
-import io.trino.spi.predicate.Domain;
-import io.trino.spi.predicate.Range;
-import io.trino.spi.predicate.SortedRangeSet;
-import io.trino.spi.predicate.TupleDomain;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
-import org.testng.annotations.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static io.trino.plugin.hive.HiveTestUtils.SESSION;
-import static io.trino.plugin.hive.s3select.TestS3SelectRecordCursor.ARTICLE_COLUMN;
-import static io.trino.plugin.hive.s3select.TestS3SelectRecordCursor.AUTHOR_COLUMN;
-import static io.trino.plugin.hive.s3select.TestS3SelectRecordCursor.DATE_ARTICLE_COLUMN;
-import static io.trino.plugin.hive.s3select.TestS3SelectRecordCursor.QUANTITY_COLUMN;
-import static io.trino.spi.predicate.TupleDomain.withColumnDomains;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
-import static org.apache.hadoop.hive.serde.serdeConstants.LIST_COLUMNS;
-import static org.apache.hadoop.hive.serde.serdeConstants.LIST_COLUMN_TYPES;
-import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_LIB;
-import static org.testng.Assert.assertTrue;
-
-public class TestS3SelectRecordCursorProvider
-{
-    @Test
-    public void shouldReturnSelectRecordCursor()
-    {
-        List<HiveColumnHandle> readerColumns = new ArrayList<>();
-        TupleDomain<HiveColumnHandle> effectivePredicate = TupleDomain.all();
-        Optional<ReaderRecordCursorWithProjections> recordCursor =
-                getRecordCursor(effectivePredicate, readerColumns, true);
-        assertTrue(recordCursor.isPresent());
-    }
-
-    @Test
-    public void shouldReturnSelectRecordCursorWhenEffectivePredicateExists()
-    {
-        TupleDomain<HiveColumnHandle> effectivePredicate = withColumnDomains(ImmutableMap.of(QUANTITY_COLUMN,
-                Domain.create(SortedRangeSet.copyOf(BIGINT, ImmutableList.of(Range.equal(BIGINT, 3L))), false)));
-        Optional<ReaderRecordCursorWithProjections> recordCursor =
-                getRecordCursor(effectivePredicate, getAllColumns(), true);
-        assertTrue(recordCursor.isPresent());
-    }
-
-    @Test
-    public void shouldReturnSelectRecordCursorWhenProjectionExists()
-    {
-        TupleDomain<HiveColumnHandle> effectivePredicate = TupleDomain.all();
-        List<HiveColumnHandle> readerColumns = ImmutableList.of(QUANTITY_COLUMN, AUTHOR_COLUMN, ARTICLE_COLUMN);
-        Optional<ReaderRecordCursorWithProjections> recordCursor =
-                getRecordCursor(effectivePredicate, readerColumns, true);
-        assertTrue(recordCursor.isPresent());
-    }
-
-    @Test
-    public void shouldNotReturnSelectRecordCursorWhenPushdownIsDisabled()
-    {
-        List<HiveColumnHandle> readerColumns = new ArrayList<>();
-        TupleDomain<HiveColumnHandle> effectivePredicate = TupleDomain.all();
-        Optional<ReaderRecordCursorWithProjections> recordCursor =
-                getRecordCursor(effectivePredicate, readerColumns, false);
-        assertTrue(recordCursor.isEmpty());
-    }
-
-    @Test
-    public void shouldNotReturnSelectRecordCursorWhenQueryIsNotFiltering()
-    {
-        TupleDomain<HiveColumnHandle> effectivePredicate = TupleDomain.all();
-        Optional<ReaderRecordCursorWithProjections> recordCursor =
-                getRecordCursor(effectivePredicate, getAllColumns(), true);
-        assertTrue(recordCursor.isEmpty());
-    }
-
-    @Test
-    public void shouldNotReturnSelectRecordCursorWhenProjectionOrderIsDifferent()
-    {
-        TupleDomain<HiveColumnHandle> effectivePredicate = TupleDomain.all();
-        List<HiveColumnHandle> readerColumns = ImmutableList.of(DATE_ARTICLE_COLUMN, QUANTITY_COLUMN, ARTICLE_COLUMN, AUTHOR_COLUMN);
-        Optional<ReaderRecordCursorWithProjections> recordCursor =
-                getRecordCursor(effectivePredicate, readerColumns, true);
-        assertTrue(recordCursor.isEmpty());
-    }
-
-    private static Optional<ReaderRecordCursorWithProjections> getRecordCursor(TupleDomain<HiveColumnHandle> effectivePredicate,
-                                                                               List<HiveColumnHandle> readerColumns,
-                                                                               boolean s3SelectPushdownEnabled)
-    {
-        S3SelectRecordCursorProvider s3SelectRecordCursorProvider = new S3SelectRecordCursorProvider(
-                new TestingHdfsEnvironment(new ArrayList<>()),
-                new TrinoS3ClientFactory(new HiveConfig()));
-
-        return s3SelectRecordCursorProvider.createRecordCursor(
-                ConfigurationInstantiator.newEmptyConfiguration(),
-                SESSION,
-                new Path("s3://fakeBucket/fakeObject.gz"),
-                0,
-                10,
-                10,
-                createTestingSchema(),
-                readerColumns,
-                effectivePredicate,
-                TESTING_TYPE_MANAGER,
-                s3SelectPushdownEnabled);
-    }
-
-    private static Properties createTestingSchema()
-    {
-        List<HiveColumnHandle> schemaColumns = getAllColumns();
-        Properties schema = new Properties();
-        String columnNames = buildPropertyFromColumns(schemaColumns, HiveColumnHandle::getName);
-        String columnTypeNames = buildPropertyFromColumns(schemaColumns, column -> column.getHiveType().getTypeInfo().getTypeName());
-        schema.setProperty(LIST_COLUMNS, columnNames);
-        schema.setProperty(LIST_COLUMN_TYPES, columnTypeNames);
-        String deserializerClassName = LazySimpleSerDe.class.getName();
-        schema.setProperty(SERIALIZATION_LIB, deserializerClassName);
-        return schema;
-    }
-
-    private static String buildPropertyFromColumns(List<HiveColumnHandle> columns, Function<HiveColumnHandle, String> mapper)
-    {
-        if (columns.isEmpty()) {
-            return "";
-        }
-        return columns.stream()
-                .map(mapper)
-                .collect(Collectors.joining(","));
-    }
-
-    private static List<HiveColumnHandle> getAllColumns()
-    {
-        return ImmutableList.of(ARTICLE_COLUMN, AUTHOR_COLUMN, DATE_ARTICLE_COLUMN, QUANTITY_COLUMN);
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestUnrecoverableS3OperationException.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestUnrecoverableS3OperationException.java
deleted file mode 100644
index 8bc3abadbea5..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3select/TestUnrecoverableS3OperationException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.s3select;
-
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-
-import static io.trino.plugin.hive.s3select.S3SelectLineRecordReader.UnrecoverableS3OperationException;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TestUnrecoverableS3OperationException
-{
-    @Test
-    public void testMessage()
-    {
-        assertThat(new UnrecoverableS3OperationException("test-bucket", "test-key", new IOException("test io exception")))
-                .hasMessage("java.io.IOException: test io exception (Bucket: test-bucket, Key: test-key)");
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/security/TestLegacyAccessControl.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/security/TestLegacyAccessControl.java
index ece785051db0..3a7afcdda660 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/security/TestLegacyAccessControl.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/security/TestLegacyAccessControl.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive.security;
 
 import io.trino.spi.connector.ConnectorAccessControl;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/security/TestLegacySecurityConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/security/TestLegacySecurityConfig.java
index ec955643ef53..c8a835b79d04 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/security/TestLegacySecurityConfig.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/security/TestLegacySecurityConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive.security;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/security/TestSqlStandardAccessControl.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/security/TestSqlStandardAccessControl.java
index 89c36c22e38a..57e87b012950 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/security/TestSqlStandardAccessControl.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/security/TestSqlStandardAccessControl.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive.security;
 
 import io.trino.spi.connector.ConnectorAccessControl;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/statistics/TestMetastoreHiveStatisticsProvider.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/statistics/TestMetastoreHiveStatisticsProvider.java
index 1f84659b386e..521ba7c5eed9 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/statistics/TestMetastoreHiveStatisticsProvider.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/statistics/TestMetastoreHiveStatisticsProvider.java
@@ -34,7 +34,7 @@
 import io.trino.spi.statistics.TableStatistics;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -847,7 +847,7 @@ private static String invalidColumnStatistics(String message)
 
     private static HivePartition partition(String name)
     {
-        return parsePartition(TABLE, name, ImmutableList.of(PARTITION_COLUMN_1, PARTITION_COLUMN_2), ImmutableList.of(VARCHAR, BIGINT));
+        return parsePartition(TABLE, name, ImmutableList.of(PARTITION_COLUMN_1, PARTITION_COLUMN_2));
     }
 
     private static PartitionStatistics rowsCount(long rowsCount)
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/type/TestTypeInfoUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/type/TestTypeInfoUtils.java
index bda0416e271c..e756d073e95d 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/type/TestTypeInfoUtils.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/type/TestTypeInfoUtils.java
@@ -15,7 +15,7 @@
 
 import org.apache.hadoop.hive.serde2.typeinfo.TimestampLocalTZTypeInfo;
 import org.assertj.core.api.ObjectAssert;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/CompressionConfigUtil.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/CompressionConfigUtil.java
similarity index 78%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/CompressionConfigUtil.java
rename to plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/CompressionConfigUtil.java
index 525edff6c559..368796d108f3 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/CompressionConfigUtil.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/CompressionConfigUtil.java
@@ -15,19 +15,15 @@
 
 import io.trino.hive.orc.OrcConf;
 import io.trino.plugin.hive.HiveCompressionCodec;
-import org.apache.avro.mapred.AvroJob;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
 import org.apache.parquet.hadoop.ParquetOutputFormat;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.COMPRESSRESULT;
 import static org.apache.hadoop.io.SequenceFile.CompressionType.BLOCK;
 
 public final class CompressionConfigUtil
 {
-    private static final String COMPRESSION_CONFIGURED_MARKER = "trino.compression.configured";
-
     private CompressionConfigUtil() {}
 
     public static void configureCompression(Configuration config, HiveCompressionCodec compressionCodec)
@@ -54,17 +50,9 @@ public static void configureCompression(Configuration config, HiveCompressionCod
         config.set(ParquetOutputFormat.COMPRESSION, compressionCodec.getParquetCompressionCodec().name());
 
         // For Avro
-        compressionCodec.getAvroCompressionCodec().ifPresent(codec -> config.set(AvroJob.OUTPUT_CODEC, codec));
+        compressionCodec.getAvroCompressionKind().ifPresent(kind -> config.set("avro.output.codec", kind.toString()));
 
         // For SequenceFile
         config.set(FileOutputFormat.COMPRESS_TYPE, BLOCK.toString());
-
-        config.set(COMPRESSION_CONFIGURED_MARKER, "true");
-    }
-
-    public static void assertCompressionConfigured(Configuration config)
-    {
-        String markerValue = config.get(COMPRESSION_CONFIGURED_MARKER);
-        checkArgument("true".equals(markerValue), "Compression should have been configured");
     }
 }
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/DecimalUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/DecimalUtils.java
similarity index 100%
rename from plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/DecimalUtils.java
rename to plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/DecimalUtils.java
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/FileSystemTesting.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/FileSystemTesting.java
index aed9419e1729..7c6cad0ea33f 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/FileSystemTesting.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/FileSystemTesting.java
@@ -30,7 +30,6 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -285,12 +284,7 @@ public MockFileSystem(Configuration conf, MockFile... files)
         @Override
         public URI getUri()
         {
-            try {
-                return new URI("mock:///");
-            }
-            catch (URISyntaxException err) {
-                throw new IllegalArgumentException("huh?", err);
-            }
+            return URI.create("mock:///");
         }
 
         @Override
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/SerDeUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/SerDeUtils.java
new file mode 100644
index 000000000000..ee154e624238
--- /dev/null
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/SerDeUtils.java
@@ -0,0 +1,321 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.util;
+
+import com.google.common.annotations.VisibleForTesting;
+import io.airlift.slice.Slices;
+import io.trino.plugin.base.type.DecodedTimestamp;
+import io.trino.spi.block.ArrayBlockBuilder;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.CharType;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.Type;
+import org.apache.hadoop.hive.common.type.HiveChar;
+import org.apache.hadoop.hive.common.type.Timestamp;
+import org.apache.hadoop.hive.serde2.io.DateWritable;
+import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
+import org.apache.hadoop.hive.serde2.io.TimestampWritable;
+import org.apache.hadoop.hive.serde2.lazy.LazyDate;
+import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.StructField;
+import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.UnionObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.BinaryObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.BooleanObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.ByteObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.DateObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.FloatObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveCharObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveDecimalObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveVarcharObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.IntObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.LongObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.ShortObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.TimestampObjectInspector;
+import org.joda.time.DateTimeZone;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.plugin.base.type.TrinoTimestampEncoderFactory.createTimestampEncoder;
+import static io.trino.spi.block.ArrayValueBuilder.buildArrayValue;
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
+import static io.trino.spi.type.Chars.truncateToLengthAndTrimSpaces;
+import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_SECOND;
+import static io.trino.spi.type.Timestamps.round;
+import static io.trino.spi.type.TinyintType.TINYINT;
+import static java.lang.Float.floatToRawIntBits;
+import static java.util.Objects.requireNonNull;
+
+public final class SerDeUtils
+{
+    private SerDeUtils() {}
+
+    public static Object getBlockObject(Type type, Object object, ObjectInspector inspector)
+    {
+        requireNonNull(object, "object is null");
+        if (inspector instanceof ListObjectInspector listObjectInspector) {
+            List<?> list = listObjectInspector.getList(object);
+            ArrayType arrayType = (ArrayType) type;
+            ObjectInspector elementInspector = listObjectInspector.getListElementObjectInspector();
+            return buildArrayValue(arrayType, list.size(), valuesBuilder -> buildList(list, arrayType.getElementType(), elementInspector, valuesBuilder));
+        }
+        if (inspector instanceof MapObjectInspector mapObjectInspector) {
+            Map<?, ?> map = mapObjectInspector.getMap(object);
+            MapType mapType = (MapType) type;
+            return buildMapValue(mapType, map.size(), (keyBuilder, valueBuilder) -> buildMap(mapType, keyBuilder, valueBuilder, map, mapObjectInspector, true));
+        }
+        if (inspector instanceof StructObjectInspector structObjectInspector) {
+            RowType rowType = (RowType) type;
+            return buildRowValue(rowType, fieldBuilders -> buildStruct(rowType, object, structObjectInspector, fieldBuilders));
+        }
+        if (inspector instanceof UnionObjectInspector unionObjectInspector) {
+            RowType rowType = (RowType) type;
+            return buildRowValue(rowType, fieldBuilders -> buildUnion(rowType, object, unionObjectInspector, fieldBuilders));
+        }
+        throw new RuntimeException("Unknown object inspector category: " + inspector.getCategory());
+    }
+
+    public static void serializeObject(Type type, BlockBuilder builder, Object object, ObjectInspector inspector)
+    {
+        requireNonNull(builder, "builder is null");
+        serializeObject(type, builder, object, inspector, true);
+    }
+
+    // This version supports optionally disabling the filtering of null map key, which should only be used for building test data sets
+    // that contain null map keys.  For production, null map keys are not allowed.
+    @VisibleForTesting
+    public static void serializeObject(Type type, BlockBuilder builder, Object object, ObjectInspector inspector, boolean filterNullMapKeys)
+    {
+        requireNonNull(builder, "builder is null");
+
+        if (object == null) {
+            builder.appendNull();
+            return;
+        }
+
+        if (inspector instanceof PrimitiveObjectInspector primitiveObjectInspector) {
+            serializePrimitive(type, builder, object, primitiveObjectInspector);
+        }
+        else if (inspector instanceof ListObjectInspector listObjectInspector) {
+            serializeList(type, builder, object, listObjectInspector);
+        }
+        else if (inspector instanceof MapObjectInspector mapObjectInspector) {
+            serializeMap((MapType) type, (MapBlockBuilder) builder, object, mapObjectInspector, filterNullMapKeys);
+        }
+        else if (inspector instanceof StructObjectInspector structObjectInspector) {
+            serializeStruct(type, builder, object, structObjectInspector);
+        }
+        else if (inspector instanceof UnionObjectInspector unionObjectInspector) {
+            serializeUnion(type, builder, object, unionObjectInspector);
+        }
+        else {
+            throw new RuntimeException("Unknown object inspector category: " + inspector.getCategory());
+        }
+    }
+
+    private static void serializePrimitive(Type type, BlockBuilder builder, Object object, PrimitiveObjectInspector inspector)
+    {
+        requireNonNull(builder, "builder is null");
+
+        switch (inspector.getPrimitiveCategory()) {
+            case BOOLEAN:
+                type.writeBoolean(builder, ((BooleanObjectInspector) inspector).get(object));
+                return;
+            case BYTE:
+                type.writeLong(builder, ((ByteObjectInspector) inspector).get(object));
+                return;
+            case SHORT:
+                type.writeLong(builder, ((ShortObjectInspector) inspector).get(object));
+                return;
+            case INT:
+                type.writeLong(builder, ((IntObjectInspector) inspector).get(object));
+                return;
+            case LONG:
+                type.writeLong(builder, ((LongObjectInspector) inspector).get(object));
+                return;
+            case FLOAT:
+                type.writeLong(builder, floatToRawIntBits(((FloatObjectInspector) inspector).get(object)));
+                return;
+            case DOUBLE:
+                type.writeDouble(builder, ((DoubleObjectInspector) inspector).get(object));
+                return;
+            case STRING:
+                type.writeSlice(builder, Slices.utf8Slice(((StringObjectInspector) inspector).getPrimitiveJavaObject(object)));
+                return;
+            case VARCHAR:
+                type.writeSlice(builder, Slices.utf8Slice(((HiveVarcharObjectInspector) inspector).getPrimitiveJavaObject(object).getValue()));
+                return;
+            case CHAR:
+                HiveChar hiveChar = ((HiveCharObjectInspector) inspector).getPrimitiveJavaObject(object);
+                type.writeSlice(builder, truncateToLengthAndTrimSpaces(Slices.utf8Slice(hiveChar.getValue()), ((CharType) type).getLength()));
+                return;
+            case DATE:
+                type.writeLong(builder, formatDateAsLong(object, (DateObjectInspector) inspector));
+                return;
+            case TIMESTAMP:
+                TimestampType timestampType = (TimestampType) type;
+                DecodedTimestamp timestamp = formatTimestamp(timestampType, object, (TimestampObjectInspector) inspector);
+                createTimestampEncoder(timestampType, DateTimeZone.UTC).write(timestamp, builder);
+                return;
+            case BINARY:
+                type.writeSlice(builder, Slices.wrappedBuffer(((BinaryObjectInspector) inspector).getPrimitiveJavaObject(object)));
+                return;
+            case DECIMAL:
+                DecimalType decimalType = (DecimalType) type;
+                HiveDecimalWritable hiveDecimal = ((HiveDecimalObjectInspector) inspector).getPrimitiveWritableObject(object);
+                if (decimalType.isShort()) {
+                    type.writeLong(builder, DecimalUtils.getShortDecimalValue(hiveDecimal, decimalType.getScale()));
+                }
+                else {
+                    type.writeObject(builder, DecimalUtils.getLongDecimalValue(hiveDecimal, decimalType.getScale()));
+                }
+                return;
+            case VOID:
+            case TIMESTAMPLOCALTZ:
+            case INTERVAL_YEAR_MONTH:
+            case INTERVAL_DAY_TIME:
+            case UNKNOWN:
+                // unsupported
+        }
+        throw new RuntimeException("Unknown primitive type: " + inspector.getPrimitiveCategory());
+    }
+
+    private static void serializeList(Type type, BlockBuilder builder, Object object, ListObjectInspector inspector)
+    {
+        List<?> list = inspector.getList(object);
+        ArrayType arrayType = (ArrayType) type;
+        ObjectInspector elementInspector = inspector.getListElementObjectInspector();
+        ((ArrayBlockBuilder) builder).buildEntry(elementBuilder -> buildList(list, arrayType.getElementType(), elementInspector, elementBuilder));
+    }
+
+    private static void buildList(List<?> list, Type elementType, ObjectInspector elementInspector, BlockBuilder valueBuilder)
+    {
+        for (Object element : list) {
+            serializeObject(elementType, valueBuilder, element, elementInspector);
+        }
+    }
+
+    private static void serializeMap(MapType mapType, MapBlockBuilder builder, Object object, MapObjectInspector inspector, boolean filterNullMapKeys)
+    {
+        Map<?, ?> map = inspector.getMap(object);
+        builder.buildEntry((keyBuilder, valueBuilder) -> buildMap(mapType, keyBuilder, valueBuilder, map, inspector, filterNullMapKeys));
+    }
+
+    private static void buildMap(MapType mapType, BlockBuilder keyBuilder, BlockBuilder valueBuilder, Map<?, ?> map, MapObjectInspector inspector, boolean filterNullMapKeys)
+    {
+        Type keyType = mapType.getKeyType();
+        Type valueType = mapType.getValueType();
+        ObjectInspector keyInspector = inspector.getMapKeyObjectInspector();
+        ObjectInspector valueInspector = inspector.getMapValueObjectInspector();
+
+        for (Entry<?, ?> entry : map.entrySet()) {
+            // Hive skips map entries with null keys
+            if (!filterNullMapKeys || entry.getKey() != null) {
+                serializeObject(keyType, keyBuilder, entry.getKey(), keyInspector);
+                serializeObject(valueType, valueBuilder, entry.getValue(), valueInspector);
+            }
+        }
+    }
+
+    private static void serializeStruct(Type type, BlockBuilder builder, Object object, StructObjectInspector inspector)
+    {
+        RowType rowType = (RowType) type;
+        ((RowBlockBuilder) builder).buildEntry(fieldBuilders -> buildStruct(rowType, object, inspector, fieldBuilders));
+    }
+
+    private static void buildStruct(RowType type, Object object, StructObjectInspector inspector, List<BlockBuilder> fieldBuilders)
+    {
+        List<Type> typeParameters = type.getTypeParameters();
+        List<? extends StructField> allStructFieldRefs = inspector.getAllStructFieldRefs();
+        checkArgument(typeParameters.size() == allStructFieldRefs.size());
+        for (int i = 0; i < typeParameters.size(); i++) {
+            StructField field = allStructFieldRefs.get(i);
+            serializeObject(typeParameters.get(i), fieldBuilders.get(i), inspector.getStructFieldData(object, field), field.getFieldObjectInspector());
+        }
+    }
+
+    // Use row blocks to represent union objects when reading
+    private static void serializeUnion(Type type, BlockBuilder builder, Object object, UnionObjectInspector inspector)
+    {
+        RowType rowType = (RowType) type;
+        ((RowBlockBuilder) builder).buildEntry(fieldBuilders -> buildUnion(rowType, object, inspector, fieldBuilders));
+    }
+
+    private static void buildUnion(RowType rowType, Object object, UnionObjectInspector inspector, List<BlockBuilder> fieldBuilders)
+    {
+        byte tag = inspector.getTag(object);
+        TINYINT.writeLong(fieldBuilders.get(0), tag);
+
+        List<Type> typeParameters = rowType.getTypeParameters();
+        for (int i = 1; i < typeParameters.size(); i++) {
+            if (i == tag + 1) {
+                serializeObject(typeParameters.get(i), fieldBuilders.get(i), inspector.getField(object), inspector.getObjectInspectors().get(tag));
+            }
+            else {
+                fieldBuilders.get(i).appendNull();
+            }
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    private static long formatDateAsLong(Object object, DateObjectInspector inspector)
+    {
+        if (object instanceof LazyDate) {
+            return ((LazyDate) object).getWritableObject().getDays();
+        }
+        if (object instanceof DateWritable) {
+            return ((DateWritable) object).getDays();
+        }
+        return inspector.getPrimitiveJavaObject(object).toEpochDay();
+    }
+
+    private static DecodedTimestamp formatTimestamp(TimestampType type, Object object, TimestampObjectInspector inspector)
+    {
+        long epochSecond;
+        int nanoOfSecond;
+
+        if (object instanceof TimestampWritable timestamp) {
+            epochSecond = timestamp.getSeconds();
+            nanoOfSecond = timestamp.getNanos();
+        }
+        else {
+            Timestamp timestamp = inspector.getPrimitiveJavaObject(object);
+            epochSecond = timestamp.toEpochSecond();
+            nanoOfSecond = timestamp.getNanos();
+        }
+
+        nanoOfSecond = (int) round(nanoOfSecond, 9 - type.getPrecision());
+        if (nanoOfSecond == NANOSECONDS_PER_SECOND) { // round nanos up to seconds
+            epochSecond += 1;
+            nanoOfSecond = 0;
+        }
+
+        return new DecodedTimestamp(epochSecond, nanoOfSecond);
+    }
+}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAcidBucketCodec.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAcidBucketCodec.java
index 5629f99ea751..ffa16413ecd5 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAcidBucketCodec.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAcidBucketCodec.java
@@ -13,9 +13,9 @@
  */
 package io.trino.plugin.hive.util;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestAcidBucketCodec
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAcidTables.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAcidTables.java
index 7efee32be0c7..d7e6926a3b8d 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAcidTables.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAcidTables.java
@@ -14,23 +14,24 @@
 package io.trino.plugin.hive.util;
 
 import io.trino.filesystem.FileEntry;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.hdfs.HdfsConfig;
 import io.trino.hdfs.HdfsConfiguration;
 import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
 import io.trino.hdfs.authentication.NoHdfsAuthentication;
 import io.trino.plugin.hive.util.AcidTables.AcidState;
 import io.trino.plugin.hive.util.AcidTables.ParsedBase;
 import io.trino.plugin.hive.util.AcidTables.ParsedDelta;
 import io.trino.plugin.hive.util.FileSystemTesting.MockFile;
 import io.trino.plugin.hive.util.FileSystemTesting.MockFileSystem;
-import io.trino.plugin.hive.util.FileSystemTesting.MockPath;
 import io.trino.spi.security.ConnectorIdentity;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -122,7 +123,7 @@ public void testOriginal()
                 new MockFile("mock:/tbl/part1/subdir/000000_0", 0, FAKE_DATA));
         AcidState state = getAcidState(
                 testingTrinoFileSystem(fs),
-                new MockPath(fs, "mock:/tbl/part1").toString(),
+                Location.of("mock:///tbl/part1"),
                 new ValidWriteIdList("tbl:100:%d:".formatted(Long.MAX_VALUE)));
 
         assertThat(state.baseDirectory()).isEmpty();
@@ -130,13 +131,13 @@ public void testOriginal()
 
         List<FileEntry> files = state.originalFiles();
         assertEquals(files.size(), 7);
-        assertEquals(files.get(0).location(), "mock:/tbl/part1/000000_0");
-        assertEquals(files.get(1).location(), "mock:/tbl/part1/000000_0_copy_1");
-        assertEquals(files.get(2).location(), "mock:/tbl/part1/000000_0_copy_2");
-        assertEquals(files.get(3).location(), "mock:/tbl/part1/000001_1");
-        assertEquals(files.get(4).location(), "mock:/tbl/part1/000002_0");
-        assertEquals(files.get(5).location(), "mock:/tbl/part1/random");
-        assertEquals(files.get(6).location(), "mock:/tbl/part1/subdir/000000_0");
+        assertEquals(files.get(0).location(), Location.of("mock:///tbl/part1/000000_0"));
+        assertEquals(files.get(1).location(), Location.of("mock:///tbl/part1/000000_0_copy_1"));
+        assertEquals(files.get(2).location(), Location.of("mock:///tbl/part1/000000_0_copy_2"));
+        assertEquals(files.get(3).location(), Location.of("mock:///tbl/part1/000001_1"));
+        assertEquals(files.get(4).location(), Location.of("mock:///tbl/part1/000002_0"));
+        assertEquals(files.get(5).location(), Location.of("mock:///tbl/part1/random"));
+        assertEquals(files.get(6).location(), Location.of("mock:///tbl/part1/subdir/000000_0"));
     }
 
     @Test
@@ -159,27 +160,27 @@ public void testOriginalDeltas()
                 new MockFile("mock:/tbl/part1/delta_101_101/bucket_0", 0, FAKE_DATA));
         AcidState state = getAcidState(
                 testingTrinoFileSystem(fs),
-                new MockPath(fs, "mock:/tbl/part1").toString(),
+                Location.of("mock:///tbl/part1"),
                 new ValidWriteIdList("tbl:100:%d:".formatted(Long.MAX_VALUE)));
 
         assertThat(state.baseDirectory()).isEmpty();
 
         List<FileEntry> files = state.originalFiles();
         assertEquals(files.size(), 5);
-        assertEquals(files.get(0).location(), "mock:/tbl/part1/000000_0");
-        assertEquals(files.get(1).location(), "mock:/tbl/part1/000001_1");
-        assertEquals(files.get(2).location(), "mock:/tbl/part1/000002_0");
-        assertEquals(files.get(3).location(), "mock:/tbl/part1/random");
-        assertEquals(files.get(4).location(), "mock:/tbl/part1/subdir/000000_0");
+        assertEquals(files.get(0).location(), Location.of("mock:///tbl/part1/000000_0"));
+        assertEquals(files.get(1).location(), Location.of("mock:///tbl/part1/000001_1"));
+        assertEquals(files.get(2).location(), Location.of("mock:///tbl/part1/000002_0"));
+        assertEquals(files.get(3).location(), Location.of("mock:///tbl/part1/random"));
+        assertEquals(files.get(4).location(), Location.of("mock:///tbl/part1/subdir/000000_0"));
 
         List<ParsedDelta> deltas = state.deltas();
         assertEquals(deltas.size(), 2);
         ParsedDelta delta = deltas.get(0);
-        assertEquals(delta.path(), "mock:/tbl/part1/delta_025_030");
+        assertEquals(delta.path(), "mock:///tbl/part1/delta_025_030");
         assertEquals(delta.min(), 25);
         assertEquals(delta.max(), 30);
         delta = deltas.get(1);
-        assertEquals(delta.path(), "mock:/tbl/part1/delta_050_100");
+        assertEquals(delta.path(), "mock:///tbl/part1/delta_050_100");
         assertEquals(delta.min(), 50);
         assertEquals(delta.max(), 100);
     }
@@ -201,16 +202,16 @@ public void testBaseDeltas()
                 new MockFile("mock:/tbl/part1/delta_90_120/bucket_0", 0, FAKE_DATA));
         AcidState dir = getAcidState(
                 testingTrinoFileSystem(fs),
-                new MockPath(fs, "mock:/tbl/part1").toString(),
+                Location.of("mock:///tbl/part1"),
                 new ValidWriteIdList("tbl:100:%d:".formatted(Long.MAX_VALUE)));
 
-        assertThat(dir.baseDirectory()).contains("mock:/tbl/part1/base_49");
+        assertThat(dir.baseDirectory()).contains(Location.of("mock:///tbl/part1/base_49"));
         assertEquals(dir.originalFiles().size(), 0);
 
         List<ParsedDelta> deltas = dir.deltas();
         assertEquals(deltas.size(), 1);
         ParsedDelta delta = deltas.get(0);
-        assertEquals(delta.path(), "mock:/tbl/part1/delta_050_105");
+        assertEquals(delta.path(), "mock:///tbl/part1/delta_050_105");
         assertEquals(delta.min(), 50);
         assertEquals(delta.max(), 105);
     }
@@ -226,10 +227,10 @@ public void testObsoleteOriginals()
                 new MockFile("mock:/tbl/part1/000001_1", 500, FAKE_DATA));
         AcidState state = getAcidState(
                 testingTrinoFileSystem(fs),
-                new MockPath(fs, "mock:/tbl/part1").toString(),
+                Location.of("mock:///tbl/part1"),
                 new ValidWriteIdList("tbl:150:%d:".formatted(Long.MAX_VALUE)));
 
-        assertThat(state.baseDirectory()).contains("mock:/tbl/part1/base_10");
+        assertThat(state.baseDirectory()).contains(Location.of("mock:///tbl/part1/base_10"));
     }
 
     @Test
@@ -246,17 +247,17 @@ public void testOverlapingDelta()
                 new MockFile("mock:/tbl/part1/base_50/bucket_0", 500, FAKE_DATA));
         AcidState state = getAcidState(
                 testingTrinoFileSystem(fs),
-                new MockPath(fs, "mock:/tbl/part1").toString(),
+                Location.of("mock:///tbl/part1"),
                 new ValidWriteIdList("tbl:100:%d:".formatted(Long.MAX_VALUE)));
 
-        assertThat(state.baseDirectory()).contains("mock:/tbl/part1/base_50");
+        assertThat(state.baseDirectory()).contains(Location.of("mock:///tbl/part1/base_50"));
 
         List<ParsedDelta> deltas = state.deltas();
         assertEquals(deltas.size(), 4);
-        assertEquals(deltas.get(0).path(), "mock:/tbl/part1/delta_40_60");
-        assertEquals(deltas.get(1).path(), "mock:/tbl/part1/delta_00061_61");
-        assertEquals(deltas.get(2).path(), "mock:/tbl/part1/delta_000062_62");
-        assertEquals(deltas.get(3).path(), "mock:/tbl/part1/delta_0000063_63");
+        assertEquals(deltas.get(0).path(), "mock:///tbl/part1/delta_40_60");
+        assertEquals(deltas.get(1).path(), "mock:///tbl/part1/delta_00061_61");
+        assertEquals(deltas.get(2).path(), "mock:///tbl/part1/delta_000062_62");
+        assertEquals(deltas.get(3).path(), "mock:///tbl/part1/delta_0000063_63");
     }
 
     @Test
@@ -277,18 +278,18 @@ public void testOverlapingDelta2()
                 new MockFile("mock:/tbl/part1/base_50/bucket_0", 500, FAKE_DATA));
         AcidState state = getAcidState(
                 testingTrinoFileSystem(fs),
-                new MockPath(fs, "mock:/tbl/part1").toString(),
+                Location.of("mock:///tbl/part1"),
                 new ValidWriteIdList("tbl:100:%d:".formatted(Long.MAX_VALUE)));
 
-        assertThat(state.baseDirectory()).contains("mock:/tbl/part1/base_50");
+        assertThat(state.baseDirectory()).contains(Location.of("mock:///tbl/part1/base_50"));
 
         List<ParsedDelta> deltas = state.deltas();
         assertEquals(deltas.size(), 5);
-        assertEquals(deltas.get(0).path(), "mock:/tbl/part1/delta_40_60");
-        assertEquals(deltas.get(1).path(), "mock:/tbl/part1/delta_00061_61_0");
-        assertEquals(deltas.get(2).path(), "mock:/tbl/part1/delta_000062_62_0");
-        assertEquals(deltas.get(3).path(), "mock:/tbl/part1/delta_000062_62_3");
-        assertEquals(deltas.get(4).path(), "mock:/tbl/part1/delta_0000063_63_0");
+        assertEquals(deltas.get(0).path(), "mock:///tbl/part1/delta_40_60");
+        assertEquals(deltas.get(1).path(), "mock:///tbl/part1/delta_00061_61_0");
+        assertEquals(deltas.get(2).path(), "mock:///tbl/part1/delta_000062_62_0");
+        assertEquals(deltas.get(3).path(), "mock:///tbl/part1/delta_000062_62_3");
+        assertEquals(deltas.get(4).path(), "mock:///tbl/part1/delta_0000063_63_0");
     }
 
     @Test
@@ -300,13 +301,13 @@ public void deltasWithOpenTxnInRead()
                 new MockFile("mock:/tbl/part1/delta_2_5/bucket_0", 500, FAKE_DATA));
         AcidState state = getAcidState(
                 testingTrinoFileSystem(fs),
-                new MockPath(fs, "mock:/tbl/part1").toString(),
+                Location.of("mock:///tbl/part1"),
                 new ValidWriteIdList("tbl:100:4:4"));
 
         List<ParsedDelta> deltas = state.deltas();
         assertEquals(deltas.size(), 2);
-        assertEquals(deltas.get(0).path(), "mock:/tbl/part1/delta_1_1");
-        assertEquals(deltas.get(1).path(), "mock:/tbl/part1/delta_2_5");
+        assertEquals(deltas.get(0).path(), "mock:///tbl/part1/delta_1_1");
+        assertEquals(deltas.get(1).path(), "mock:///tbl/part1/delta_2_5");
     }
 
     @Test
@@ -321,13 +322,13 @@ public void deltasWithOpenTxnInRead2()
                 new MockFile("mock:/tbl/part1/delta_101_101_1/bucket_0", 500, FAKE_DATA));
         AcidState state = getAcidState(
                 testingTrinoFileSystem(fs),
-                new MockPath(fs, "mock:/tbl/part1").toString(),
+                Location.of("mock:///tbl/part1"),
                 new ValidWriteIdList("tbl:100:4:4"));
 
         List<ParsedDelta> deltas = state.deltas();
         assertEquals(deltas.size(), 2);
-        assertEquals(deltas.get(0).path(), "mock:/tbl/part1/delta_1_1");
-        assertEquals(deltas.get(1).path(), "mock:/tbl/part1/delta_2_5");
+        assertEquals(deltas.get(0).path(), "mock:///tbl/part1/delta_1_1");
+        assertEquals(deltas.get(1).path(), "mock:///tbl/part1/delta_2_5");
     }
 
     @Test
@@ -348,16 +349,16 @@ public void testBaseWithDeleteDeltas()
                 new MockFile("mock:/tbl/part1/delete_delta_110_110/bucket_0", 0, FAKE_DATA));
         AcidState state = getAcidState(
                 testingTrinoFileSystem(fs),
-                new MockPath(fs, "mock:/tbl/part1").toString(),
+                Location.of("mock:///tbl/part1"),
                 new ValidWriteIdList("tbl:100:%d:".formatted(Long.MAX_VALUE)));
 
-        assertThat(state.baseDirectory()).contains("mock:/tbl/part1/base_49");
+        assertThat(state.baseDirectory()).contains(Location.of("mock:///tbl/part1/base_49"));
         assertThat(state.originalFiles()).isEmpty();
 
         List<ParsedDelta> deltas = state.deltas();
         assertEquals(deltas.size(), 2);
-        assertEquals(deltas.get(0).path(), "mock:/tbl/part1/delete_delta_050_105");
-        assertEquals(deltas.get(1).path(), "mock:/tbl/part1/delta_050_105");
+        assertEquals(deltas.get(0).path(), "mock:///tbl/part1/delete_delta_050_105");
+        assertEquals(deltas.get(1).path(), "mock:///tbl/part1/delta_050_105");
         // The delete_delta_110_110 should not be read because it is greater than the high watermark.
     }
 
@@ -378,19 +379,19 @@ public void testOverlapingDeltaAndDeleteDelta()
                 new MockFile("mock:/tbl/part1/base_50/bucket_0", 500, FAKE_DATA));
         AcidState state = getAcidState(
                 testingTrinoFileSystem(fs),
-                new MockPath(fs, "mock:/tbl/part1").toString(),
+                Location.of("mock:///tbl/part1"),
                 new ValidWriteIdList("tbl:100:%d:".formatted(Long.MAX_VALUE)));
 
-        assertThat(state.baseDirectory()).contains("mock:/tbl/part1/base_50");
+        assertThat(state.baseDirectory()).contains(Location.of("mock:///tbl/part1/base_50"));
 
         List<ParsedDelta> deltas = state.deltas();
         assertEquals(deltas.size(), 6);
-        assertEquals(deltas.get(0).path(), "mock:/tbl/part1/delete_delta_40_60");
-        assertEquals(deltas.get(1).path(), "mock:/tbl/part1/delta_40_60");
-        assertEquals(deltas.get(2).path(), "mock:/tbl/part1/delta_00061_61");
-        assertEquals(deltas.get(3).path(), "mock:/tbl/part1/delta_000062_62");
-        assertEquals(deltas.get(4).path(), "mock:/tbl/part1/delta_0000063_63");
-        assertEquals(deltas.get(5).path(), "mock:/tbl/part1/delete_delta_00064_64");
+        assertEquals(deltas.get(0).path(), "mock:///tbl/part1/delete_delta_40_60");
+        assertEquals(deltas.get(1).path(), "mock:///tbl/part1/delta_40_60");
+        assertEquals(deltas.get(2).path(), "mock:///tbl/part1/delta_00061_61");
+        assertEquals(deltas.get(3).path(), "mock:///tbl/part1/delta_000062_62");
+        assertEquals(deltas.get(4).path(), "mock:///tbl/part1/delta_0000063_63");
+        assertEquals(deltas.get(5).path(), "mock:///tbl/part1/delete_delta_00064_64");
     }
 
     @Test
@@ -404,12 +405,12 @@ public void testMinorCompactedDeltaMakesInBetweenDelteDeltaObsolete()
                 new MockFile("mock:/tbl/part1/delete_delta_50_50/bucket_0", 500, FAKE_DATA));
         AcidState state = getAcidState(
                 testingTrinoFileSystem(fs),
-                new MockPath(fs, "mock:/tbl/part1").toString(),
+                Location.of("mock:///tbl/part1"),
                 new ValidWriteIdList("tbl:100:%d:".formatted(Long.MAX_VALUE)));
 
         List<ParsedDelta> deltas = state.deltas();
         assertEquals(deltas.size(), 1);
-        assertEquals(deltas.get(0).path(), "mock:/tbl/part1/delta_40_60");
+        assertEquals(deltas.get(0).path(), "mock:///tbl/part1/delta_40_60");
     }
 
     @Test
@@ -426,14 +427,14 @@ public void deleteDeltasWithOpenTxnInRead()
                 new MockFile("mock:/tbl/part1/delta_101_101_1/bucket_0", 500, FAKE_DATA));
         AcidState state = getAcidState(
                 testingTrinoFileSystem(fs),
-                new MockPath(fs, "mock:/tbl/part1").toString(),
+                Location.of("mock:///tbl/part1"),
                 new ValidWriteIdList("tbl:100:4:4"));
 
         List<ParsedDelta> deltas = state.deltas();
         assertEquals(deltas.size(), 3);
-        assertEquals(deltas.get(0).path(), "mock:/tbl/part1/delta_1_1");
-        assertEquals(deltas.get(1).path(), "mock:/tbl/part1/delete_delta_2_5");
-        assertEquals(deltas.get(2).path(), "mock:/tbl/part1/delta_2_5");
+        assertEquals(deltas.get(0).path(), "mock:///tbl/part1/delta_1_1");
+        assertEquals(deltas.get(1).path(), "mock:///tbl/part1/delete_delta_2_5");
+        assertEquals(deltas.get(2).path(), "mock:///tbl/part1/delta_2_5");
         // Note that delete_delta_3_3 should not be read, when a minor compacted
         // [delete_]delta_2_5 is present.
     }
@@ -459,6 +460,6 @@ public FileSystem getFileSystem(ConnectorIdentity identity, Path path, Configura
         };
 
         ConnectorIdentity identity = ConnectorIdentity.forUser("test").build();
-        return new HdfsFileSystemFactory(environment).create(identity);
+        return new HdfsFileSystemFactory(environment, new TrinoHdfsFileSystemStats()).create(identity);
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAsyncQueue.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAsyncQueue.java
index c3c64bd61379..11ad5a99fd01 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAsyncQueue.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestAsyncQueue.java
@@ -18,9 +18,11 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import io.airlift.concurrent.Threads;
 import io.trino.plugin.hive.util.AsyncQueue.BorrowResult;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,27 +34,30 @@
 
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestAsyncQueue
 {
     private ExecutorService executor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUpClass()
     {
         executor = Executors.newFixedThreadPool(8, Threads.daemonThreadsNamed("test-async-queue-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDownClass()
     {
         executor.shutdownNow();
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testGetPartial()
             throws Exception
     {
@@ -67,7 +72,8 @@ public void testGetPartial()
         assertTrue(queue.isFinished());
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testFullQueue()
             throws Exception
     {
@@ -98,7 +104,8 @@ public void testFullQueue()
         assertTrue(queue.isFinished());
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testEmptyQueue()
             throws Exception
     {
@@ -122,7 +129,8 @@ public void testEmptyQueue()
         assertTrue(queue.isFinished());
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testOfferAfterFinish()
             throws Exception
     {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestCompressionConfigUtil.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestCompressionConfigUtil.java
deleted file mode 100644
index 7cea7e77f378..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestCompressionConfigUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.util;
-
-import io.trino.plugin.hive.HiveCompressionCodec;
-import org.apache.hadoop.conf.Configuration;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import java.util.Arrays;
-
-import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
-import static io.trino.plugin.hive.util.CompressionConfigUtil.assertCompressionConfigured;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-public class TestCompressionConfigUtil
-{
-    @Test(dataProvider = "compressionCodes")
-    public void testAssertCompressionConfigured(HiveCompressionCodec compressionCodec)
-    {
-        Configuration config = newEmptyConfiguration();
-        assertThatThrownBy(() -> assertCompressionConfigured(config))
-                .hasMessage("Compression should have been configured");
-
-        CompressionConfigUtil.configureCompression(config, compressionCodec);
-        assertCompressionConfigured(config); // ok now
-    }
-
-    @DataProvider
-    public Object[][] compressionCodes()
-    {
-        return Arrays.stream(HiveCompressionCodec.values())
-                .map(codec -> new Object[] {codec})
-                .toArray(Object[][]::new);
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestForwardingRecordCursor.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestForwardingRecordCursor.java
deleted file mode 100644
index 019ea8528bfd..000000000000
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestForwardingRecordCursor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hive.util;
-
-import io.trino.spi.connector.RecordCursor;
-import org.testng.annotations.Test;
-
-import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
-
-public class TestForwardingRecordCursor
-{
-    @Test
-    public void testAllMethodsOverridden()
-    {
-        assertAllMethodsOverridden(RecordCursor.class, ForwardingRecordCursor.class);
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveAcidUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveAcidUtils.java
index 1e7ae4b749b7..c6efa161009c 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveAcidUtils.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveAcidUtils.java
@@ -24,7 +24,7 @@
 import org.apache.hadoop.hive.ql.exec.Utilities;
 import org.apache.hadoop.hive.ql.io.AcidUtils;
 import org.apache.hadoop.hive.shims.HadoopShims.HdfsFileStatusWithId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveBucketing.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveBucketing.java
index 1123e5a818b1..086a939315c8 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveBucketing.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveBucketing.java
@@ -31,7 +31,7 @@
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils;
 import org.apache.hadoop.hive.serde2.objectinspector.primitive.JavaHiveVarcharObjectInspector;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -54,7 +54,7 @@
 import static java.util.Map.Entry;
 import static org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils.getStandardJavaObjectInspectorFromTypeInfo;
 import static org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils.getTypeInfoFromTypeString;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestHiveBucketing
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveClassNames.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveClassNames.java
index ebe958be34a8..2ac3184f0e58 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveClassNames.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveClassNames.java
@@ -27,6 +27,7 @@
 import org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat;
 import org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe;
 import org.apache.hadoop.hive.serde2.OpenCSVSerde;
+import org.apache.hadoop.hive.serde2.RegexSerDe;
 import org.apache.hadoop.hive.serde2.avro.AvroSerDe;
 import org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe;
 import org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe;
@@ -36,7 +37,7 @@
 import org.apache.hadoop.mapred.SequenceFileInputFormat;
 import org.apache.hadoop.mapred.TextInputFormat;
 import org.apache.hive.hcatalog.data.JsonSerDe;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.hive.util.HiveClassNames.AVRO_CONTAINER_INPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.AVRO_CONTAINER_OUTPUT_FORMAT_CLASS;
@@ -58,6 +59,7 @@
 import static io.trino.plugin.hive.util.HiveClassNames.PARQUET_HIVE_SERDE_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.RCFILE_INPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.RCFILE_OUTPUT_FORMAT_CLASS;
+import static io.trino.plugin.hive.util.HiveClassNames.REGEX_SERDE_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.SEQUENCEFILE_INPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.SYMLINK_TEXT_INPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.TEXT_INPUT_FORMAT_CLASS;
@@ -88,6 +90,7 @@ public void testClassNames()
         assertClassName(PARQUET_HIVE_SERDE_CLASS, ParquetHiveSerDe.class);
         assertClassName(RCFILE_INPUT_FORMAT_CLASS, RCFileInputFormat.class);
         assertClassName(RCFILE_OUTPUT_FORMAT_CLASS, RCFileOutputFormat.class);
+        assertClassName(REGEX_SERDE_CLASS, RegexSerDe.class);
         assertClassName(SEQUENCEFILE_INPUT_FORMAT_CLASS, SequenceFileInputFormat.class);
         assertClassName(SYMLINK_TEXT_INPUT_FORMAT_CLASS, SymlinkTextInputFormat.class);
         assertClassName(TEXT_INPUT_FORMAT_CLASS, TextInputFormat.class);
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveTypeTranslator.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveTypeTranslator.java
index 9a0f02a0f8e8..98be6d3c0cd0 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveTypeTranslator.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveTypeTranslator.java
@@ -21,7 +21,7 @@
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveUtil.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveUtil.java
index 9f2792dc312d..a91240b269e5 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveUtil.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveUtil.java
@@ -13,42 +13,25 @@
  */
 package io.trino.plugin.hive.util;
 
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.common.FileUtils;
 import org.apache.hadoop.hive.metastore.Warehouse;
 import org.apache.hadoop.hive.metastore.api.MetaException;
-import org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat;
-import org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat;
-import org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat;
-import org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer;
-import org.apache.hadoop.hive.serde2.thrift.test.IntString;
-import org.apache.hadoop.mapred.TextInputFormat;
-import org.apache.thrift.protocol.TBinaryProtocol;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Properties;
-
-import static io.airlift.testing.Assertions.assertInstanceOf;
-import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
-import static io.trino.plugin.hive.HiveStorageFormat.AVRO;
-import static io.trino.plugin.hive.HiveStorageFormat.PARQUET;
-import static io.trino.plugin.hive.HiveStorageFormat.SEQUENCEFILE;
-import static io.trino.plugin.hive.util.HiveUtil.getDeserializer;
-import static io.trino.plugin.hive.util.HiveUtil.getInputFormat;
+
+import static io.trino.plugin.hive.util.HiveUtil.escapeSchemaName;
+import static io.trino.plugin.hive.util.HiveUtil.escapeTableName;
 import static io.trino.plugin.hive.util.HiveUtil.parseHiveTimestamp;
 import static io.trino.plugin.hive.util.HiveUtil.toPartitionValues;
 import static io.trino.type.DateTimes.MICROSECONDS_PER_MILLISECOND;
-import static org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.FILE_INPUT_FORMAT;
-import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_CLASS;
-import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_FORMAT;
-import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_LIB;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestHiveUtil
@@ -64,17 +47,6 @@ public void testParseHiveTimestamp()
         assertEquals(parse(time, "yyyy-MM-dd HH:mm:ss.SSSSSSSSS"), unixTime(time, 7));
     }
 
-    @Test
-    public void testGetThriftDeserializer()
-    {
-        Properties schema = new Properties();
-        schema.setProperty(SERIALIZATION_LIB, ThriftDeserializer.class.getName());
-        schema.setProperty(SERIALIZATION_CLASS, IntString.class.getName());
-        schema.setProperty(SERIALIZATION_FORMAT, TBinaryProtocol.class.getName());
-
-        assertInstanceOf(getDeserializer(newEmptyConfiguration(), schema), ThriftDeserializer.class);
-    }
-
     @Test
     public void testToPartitionValues()
             throws MetaException
@@ -87,42 +59,6 @@ public void testToPartitionValues()
         assertToPartitionValues("pk=__HIVE_DEFAULT_PARTITION__");
     }
 
-    @Test
-    public void testGetInputFormat()
-    {
-        Configuration configuration = newEmptyConfiguration();
-
-        // LazySimpleSerDe is used by TEXTFILE and SEQUENCEFILE. getInputFormat should default to TEXTFILE
-        // per Hive spec.
-        Properties sequenceFileSchema = new Properties();
-        sequenceFileSchema.setProperty(FILE_INPUT_FORMAT, SymlinkTextInputFormat.class.getName());
-        sequenceFileSchema.setProperty(SERIALIZATION_LIB, SEQUENCEFILE.getSerde());
-        assertInstanceOf(getInputFormat(configuration, sequenceFileSchema, false), SymlinkTextInputFormat.class);
-        assertInstanceOf(getInputFormat(configuration, sequenceFileSchema, true), TextInputFormat.class);
-
-        Properties avroSymlinkSchema = new Properties();
-        avroSymlinkSchema.setProperty(FILE_INPUT_FORMAT, SymlinkTextInputFormat.class.getName());
-        avroSymlinkSchema.setProperty(SERIALIZATION_LIB, AVRO.getSerde());
-        assertInstanceOf(getInputFormat(configuration, avroSymlinkSchema, false), SymlinkTextInputFormat.class);
-        assertInstanceOf(getInputFormat(configuration, avroSymlinkSchema, true), AvroContainerInputFormat.class);
-
-        Properties parquetSymlinkSchema = new Properties();
-        parquetSymlinkSchema.setProperty(FILE_INPUT_FORMAT, SymlinkTextInputFormat.class.getName());
-        parquetSymlinkSchema.setProperty(SERIALIZATION_LIB, PARQUET.getSerde());
-        assertInstanceOf(getInputFormat(configuration, parquetSymlinkSchema, false), SymlinkTextInputFormat.class);
-        assertInstanceOf(getInputFormat(configuration, parquetSymlinkSchema, true), MapredParquetInputFormat.class);
-
-        Properties parquetSchema = new Properties();
-        parquetSchema.setProperty(FILE_INPUT_FORMAT, PARQUET.getInputFormat());
-        assertInstanceOf(getInputFormat(configuration, parquetSchema, false), MapredParquetInputFormat.class);
-        assertInstanceOf(getInputFormat(configuration, parquetSchema, true), MapredParquetInputFormat.class);
-
-        Properties legacyParquetSchema = new Properties();
-        legacyParquetSchema.setProperty(FILE_INPUT_FORMAT, "parquet.hive.MapredParquetInputFormat");
-        assertInstanceOf(getInputFormat(configuration, legacyParquetSchema, false), MapredParquetInputFormat.class);
-        assertInstanceOf(getInputFormat(configuration, legacyParquetSchema, true), MapredParquetInputFormat.class);
-    }
-
     @Test
     public void testUnescapePathName()
     {
@@ -148,6 +84,30 @@ private static void assertUnescapePathName(String value, String expected)
         assertThat(HiveUtil.unescapePathName(value)).isEqualTo(expected);
     }
 
+    @Test
+    public void testEscapeDatabaseName()
+    {
+        assertThat(escapeSchemaName("schema1")).isEqualTo("schema1");
+        assertThatThrownBy(() -> escapeSchemaName(null))
+                .hasMessage("The provided schemaName cannot be null or empty");
+        assertThatThrownBy(() -> escapeSchemaName(""))
+                .hasMessage("The provided schemaName cannot be null or empty");
+        assertThat(escapeSchemaName("../schema1")).isEqualTo("..%2Fschema1");
+        assertThat(escapeSchemaName("../../schema1")).isEqualTo("..%2F..%2Fschema1");
+    }
+
+    @Test
+    public void testEscapeTableName()
+    {
+        assertThat(escapeTableName("table1")).isEqualTo("table1");
+        assertThatThrownBy(() -> escapeTableName(null))
+                .hasMessage("The provided tableName cannot be null or empty");
+        assertThatThrownBy(() -> escapeTableName(""))
+                .hasMessage("The provided tableName cannot be null or empty");
+        assertThat(escapeTableName("../table1")).isEqualTo("..%2Ftable1");
+        assertThat(escapeTableName("../../table1")).isEqualTo("..%2F..%2Ftable1");
+    }
+
     @Test
     public void testEscapePathName()
     {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveWriteUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveWriteUtils.java
index 0d33079c758b..a0f05cfa6718 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveWriteUtils.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestHiveWriteUtils.java
@@ -14,37 +14,99 @@
 package io.trino.plugin.hive.util;
 
 import io.trino.hdfs.HdfsContext;
+import io.trino.spi.Page;
+import io.trino.spi.PageBuilder;
+import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.SqlDecimal;
+import io.trino.spi.type.Type;
 import org.apache.hadoop.fs.Path;
-import org.testng.annotations.Test;
+import org.apache.hadoop.hive.common.type.HiveDecimal;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
 
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.util.HiveWriteUtils.createPartitionValues;
 import static io.trino.plugin.hive.util.HiveWriteUtils.isS3FileSystem;
 import static io.trino.plugin.hive.util.HiveWriteUtils.isViewFileSystem;
+import static io.trino.spi.type.DecimalType.createDecimalType;
+import static io.trino.spi.type.Decimals.writeBigDecimal;
+import static io.trino.spi.type.Decimals.writeShortDecimal;
+import static io.trino.spi.type.SqlDecimal.decimal;
 import static io.trino.testing.TestingConnectorSession.SESSION;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 public class TestHiveWriteUtils
 {
     private static final HdfsContext CONTEXT = new HdfsContext(SESSION);
+    private static final String RANDOM_SUFFIX = randomNameSuffix();
 
     @Test
     public void testIsS3FileSystem()
     {
-        assertTrue(isS3FileSystem(CONTEXT, HDFS_ENVIRONMENT, new Path("s3://test-bucket/test-folder")));
-        assertFalse(isS3FileSystem(CONTEXT, HDFS_ENVIRONMENT, new Path("/test-dir/test-folder")));
+        assertTrue(isS3FileSystem(CONTEXT, HDFS_ENVIRONMENT, new Path("s3://test-bucket-%s/test-folder".formatted(RANDOM_SUFFIX))));
+        assertFalse(isS3FileSystem(CONTEXT, HDFS_ENVIRONMENT, new Path("/test-dir-%s/test-folder".formatted(RANDOM_SUFFIX))));
     }
 
     @Test
     public void testIsViewFileSystem()
     {
-        Path viewfsPath = new Path("viewfs://ns-default/test-folder");
+        Path viewfsPath = new Path("viewfs://ns-default-%s/test-folder".formatted(RANDOM_SUFFIX));
         Path nonViewfsPath = new Path("hdfs://localhost/test-dir/test-folder");
 
         // ViewFS check requires the mount point config
-        HDFS_ENVIRONMENT.getConfiguration(CONTEXT, viewfsPath).set("fs.viewfs.mounttable.ns-default.link./test-folder", "hdfs://localhost/app");
+        HDFS_ENVIRONMENT.getConfiguration(CONTEXT, viewfsPath).set("fs.viewfs.mounttable.ns-default-%s.link./test-folder".formatted(RANDOM_SUFFIX), "hdfs://localhost/app");
 
         assertTrue(isViewFileSystem(CONTEXT, HDFS_ENVIRONMENT, viewfsPath));
         assertFalse(isViewFileSystem(CONTEXT, HDFS_ENVIRONMENT, nonViewfsPath));
     }
+
+    @Test
+    public void testCreatePartitionValuesDecimal()
+    {
+        assertCreatePartitionValuesDecimal(10, 0, "12345", "12345");
+        assertCreatePartitionValuesDecimal(10, 2, "123.45", "123.45");
+        assertCreatePartitionValuesDecimal(10, 2, "12345.00", "12345");
+        assertCreatePartitionValuesDecimal(5, 0, "12345", "12345");
+        assertCreatePartitionValuesDecimal(38, 2, "12345.00", "12345");
+        assertCreatePartitionValuesDecimal(38, 20, "12345.00000000000000000000", "12345");
+        assertCreatePartitionValuesDecimal(38, 20, "12345.67898000000000000000", "12345.67898");
+    }
+
+    private static void assertCreatePartitionValuesDecimal(int precision, int scale, String decimalValue, String expectedValue)
+    {
+        DecimalType decimalType = createDecimalType(precision, scale);
+        List<Type> types = List.of(decimalType);
+        SqlDecimal decimal = decimal(decimalValue, decimalType);
+
+        // verify the test values are as expected
+        assertThat(decimal.toString()).isEqualTo(decimalValue);
+        assertThat(decimal.toBigDecimal().toString()).isEqualTo(decimalValue);
+
+        PageBuilder pageBuilder = new PageBuilder(types);
+        pageBuilder.declarePosition();
+        writeDecimal(decimalType, decimal, pageBuilder.getBlockBuilder(0));
+        Page page = pageBuilder.build();
+
+        // verify the expected value against HiveDecimal
+        assertThat(HiveDecimal.create(decimal.toBigDecimal()).toString())
+                .isEqualTo(expectedValue);
+
+        assertThat(createPartitionValues(types, page, 0))
+                .isEqualTo(List.of(expectedValue));
+    }
+
+    private static void writeDecimal(DecimalType decimalType, SqlDecimal decimal, BlockBuilder blockBuilder)
+    {
+        if (decimalType.isShort()) {
+            writeShortDecimal(blockBuilder, decimal.toBigDecimal().unscaledValue().longValue());
+        }
+        else {
+            writeBigDecimal(decimalType, blockBuilder, decimal.toBigDecimal());
+        }
+    }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestLazyMap.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestLazyMap.java
index c5c9f2bb18a7..6fbe9fffc81e 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestLazyMap.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestLazyMap.java
@@ -19,7 +19,7 @@
 import org.apache.hadoop.hive.serde2.lazy.LazyString;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyStringObjectInspector;
 import org.apache.hadoop.io.Text;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestLoggingInvocationHandlerWithHiveMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestLoggingInvocationHandlerWithHiveMetastore.java
index 928096dc9865..207f78c27ef7 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestLoggingInvocationHandlerWithHiveMetastore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestLoggingInvocationHandlerWithHiveMetastore.java
@@ -16,7 +16,7 @@
 import io.trino.hive.thrift.metastore.ThriftHiveMetastore;
 import io.trino.plugin.base.util.LoggingInvocationHandler;
 import org.assertj.core.api.InstanceOfAssertFactories;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestMergingPageIterator.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestMergingPageIterator.java
index f1747d725b27..8582dd6fcbee 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestMergingPageIterator.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestMergingPageIterator.java
@@ -19,7 +19,7 @@
 import io.trino.spi.connector.SortOrder;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -80,7 +80,7 @@ public void testMerging()
                 .collect(toList());
         Iterator<Page> iterator = new MergingPageIterator(pages, types, sortIndexes, sortOrders, new TypeOperators());
 
-        List<Long> values = new ArrayList<>();
+        List<Integer> values = new ArrayList<>();
         while (iterator.hasNext()) {
             Page page = iterator.next();
             for (int i = 0; i < page.getPositionCount(); i++) {
@@ -89,8 +89,8 @@ public void testMerging()
                     values.add(null);
                 }
                 else {
-                    long x = INTEGER.getLong(page.getBlock(0), i);
-                    long y = INTEGER.getLong(page.getBlock(1), i);
+                    int x = INTEGER.getInt(page.getBlock(0), i);
+                    int y = INTEGER.getInt(page.getBlock(1), i);
                     assertEquals(y, x * 22);
                     values.add(x);
                 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestSerDeUtils.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestSerDeUtils.java
index d31c937e7703..8bedfa7ce274 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestSerDeUtils.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestSerDeUtils.java
@@ -21,19 +21,22 @@
 import io.airlift.slice.SliceOutput;
 import io.airlift.slice.Slices;
 import io.trino.block.BlockSerdeUtil;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.BlockEncodingSerde;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.block.TestingBlockEncodingSerde;
 import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
 import org.apache.hadoop.hive.common.type.Date;
 import org.apache.hadoop.hive.common.type.Timestamp;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
 import org.apache.hadoop.io.BytesWritable;
 import org.joda.time.DateTime;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Type;
 import java.time.LocalDate;
@@ -41,10 +44,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.function.Consumer;
 
-import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.plugin.hive.HiveTestUtils.mapType;
-import static io.trino.plugin.hive.util.SerDeUtils.getBlockObject;
 import static io.trino.plugin.hive.util.SerDeUtils.serializeObject;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -57,13 +59,7 @@
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
-import static io.trino.testing.StructuralTestUtil.arrayBlockOf;
-import static io.trino.testing.StructuralTestUtil.mapBlockOf;
 import static io.trino.testing.StructuralTestUtil.rowBlockOf;
-import static io.trino.type.DateTimes.MICROSECONDS_PER_MILLISECOND;
-import static java.lang.Double.doubleToLongBits;
-import static java.lang.Float.floatToRawIntBits;
 import static java.lang.Math.toIntExact;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.ObjectInspectorOptions;
@@ -126,64 +122,71 @@ private static synchronized ObjectInspector getInspector(Type type)
     public void testPrimitiveSlice()
     {
         // boolean
-        Block expectedBoolean = VARBINARY.createBlockBuilder(null, 1).writeByte(1).closeEntry().build();
-        Block actualBoolean = toBinaryBlock(BOOLEAN, true, getInspector(Boolean.class));
+        Block expectedBoolean = createSingleValue(BOOLEAN, blockBuilder -> BOOLEAN.writeBoolean(blockBuilder, true));
+        Block actualBoolean = toSingleValueBlock(BOOLEAN, true, getInspector(Boolean.class));
         assertBlockEquals(actualBoolean, expectedBoolean);
 
         // byte
-        Block expectedByte = VARBINARY.createBlockBuilder(null, 1).writeByte(5).closeEntry().build();
-        Block actualByte = toBinaryBlock(TINYINT, (byte) 5, getInspector(Byte.class));
+        Block expectedByte = createSingleValue(TINYINT, blockBuilder -> TINYINT.writeLong(blockBuilder, 5));
+        Block actualByte = toSingleValueBlock(TINYINT, (byte) 5, getInspector(Byte.class));
         assertBlockEquals(actualByte, expectedByte);
 
         // short
-        Block expectedShort = VARBINARY.createBlockBuilder(null, 1).writeShort(2).closeEntry().build();
-        Block actualShort = toBinaryBlock(SMALLINT, (short) 2, getInspector(Short.class));
+        Block expectedShort = createSingleValue(SMALLINT, blockBuilder -> SMALLINT.writeLong(blockBuilder, 2));
+        Block actualShort = toSingleValueBlock(SMALLINT, (short) 2, getInspector(Short.class));
         assertBlockEquals(actualShort, expectedShort);
 
         // int
-        Block expectedInt = VARBINARY.createBlockBuilder(null, 1).writeInt(1).closeEntry().build();
-        Block actualInt = toBinaryBlock(INTEGER, 1, getInspector(Integer.class));
+        Block expectedInt = createSingleValue(INTEGER, blockBuilder -> INTEGER.writeLong(blockBuilder, 1));
+        Block actualInt = toSingleValueBlock(INTEGER, 1, getInspector(Integer.class));
         assertBlockEquals(actualInt, expectedInt);
 
         // long
-        Block expectedLong = VARBINARY.createBlockBuilder(null, 1).writeLong(10).closeEntry().build();
-        Block actualLong = toBinaryBlock(BIGINT, 10L, getInspector(Long.class));
+        Block expectedLong = createSingleValue(BIGINT, blockBuilder -> BIGINT.writeLong(blockBuilder, 10));
+        Block actualLong = toSingleValueBlock(BIGINT, 10L, getInspector(Long.class));
         assertBlockEquals(actualLong, expectedLong);
 
         // float
-        Block expectedFloat = VARBINARY.createBlockBuilder(null, 1).writeInt(floatToRawIntBits(20.0f)).closeEntry().build();
-        Block actualFloat = toBinaryBlock(REAL, 20.0f, getInspector(Float.class));
+        Block expectedFloat = createSingleValue(REAL, blockBuilder -> REAL.writeLong(blockBuilder, Float.floatToIntBits(20.0f)));
+        Block actualFloat = toSingleValueBlock(REAL, 20.0f, getInspector(Float.class));
         assertBlockEquals(actualFloat, expectedFloat);
 
         // double
-        Block expectedDouble = VARBINARY.createBlockBuilder(null, 1).writeLong(doubleToLongBits(30.12)).closeEntry().build();
-        Block actualDouble = toBinaryBlock(DOUBLE, 30.12d, getInspector(Double.class));
+        Block expectedDouble = createSingleValue(DOUBLE, blockBuilder -> DOUBLE.writeDouble(blockBuilder, 30.12d));
+        Block actualDouble = toSingleValueBlock(DOUBLE, 30.12d, getInspector(Double.class));
         assertBlockEquals(actualDouble, expectedDouble);
 
         // string
-        Block expectedString = VARBINARY.createBlockBuilder(null, 1).writeBytes(utf8Slice("abdd"), 0, 4).closeEntry().build();
-        Block actualString = toBinaryBlock(createUnboundedVarcharType(), "abdd", getInspector(String.class));
+        Block expectedString = createSingleValue(VARCHAR, blockBuilder -> VARCHAR.writeString(blockBuilder, "value"));
+        Block actualString = toSingleValueBlock(VARCHAR, "value", getInspector(String.class));
         assertBlockEquals(actualString, expectedString);
 
         // date
         int date = toIntExact(LocalDate.of(2008, 10, 28).toEpochDay());
-        Block expectedDate = VARBINARY.createBlockBuilder(null, 1).writeInt(date).closeEntry().build();
-        Block actualDate = toBinaryBlock(DATE, Date.ofEpochDay(date), getInspector(Date.class));
+        Block expectedDate = createSingleValue(DATE, blockBuilder -> DATE.writeLong(blockBuilder, date));
+        Block actualDate = toSingleValueBlock(DATE, Date.ofEpochDay(date), getInspector(Date.class));
         assertBlockEquals(actualDate, expectedDate);
 
         // timestamp
         DateTime dateTime = new DateTime(2008, 10, 28, 16, 7, 15, 123);
-        Block expectedTimestamp = VARBINARY.createBlockBuilder(null, 1).writeLong(dateTime.getMillis() * MICROSECONDS_PER_MILLISECOND).closeEntry().build();
-        Block actualTimestamp = toBinaryBlock(TIMESTAMP_MILLIS, Timestamp.ofEpochMilli(dateTime.getMillis()), getInspector(Timestamp.class));
+        Block expectedTimestamp = createSingleValue(TIMESTAMP_MILLIS, blockBuilder -> TIMESTAMP_MILLIS.writeLong(blockBuilder, dateTime.getMillis() * 1000));
+        Block actualTimestamp = toSingleValueBlock(TIMESTAMP_MILLIS, Timestamp.ofEpochMilli(dateTime.getMillis()), getInspector(Timestamp.class));
         assertBlockEquals(actualTimestamp, expectedTimestamp);
 
         // binary
         byte[] byteArray = {81, 82, 84, 85};
-        Block expectedBinary = VARBINARY.createBlockBuilder(null, 1).writeBytes(Slices.wrappedBuffer(byteArray), 0, 4).closeEntry().build();
-        Block actualBinary = toBinaryBlock(VARBINARY, byteArray, getInspector(byte[].class));
+        Block expectedBinary = createSingleValue(VARBINARY, blockBuilder -> VARBINARY.writeSlice(blockBuilder, Slices.wrappedBuffer(byteArray)));
+        Block actualBinary = toSingleValueBlock(VARBINARY, byteArray, getInspector(byte[].class));
         assertBlockEquals(actualBinary, expectedBinary);
     }
 
+    private static Block createSingleValue(io.trino.spi.type.Type type, Consumer<BlockBuilder> outputConsumer)
+    {
+        BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
+        outputConsumer.accept(blockBuilder);
+        return blockBuilder.build();
+    }
+
     @Test
     public void testListBlock()
     {
@@ -193,13 +196,20 @@ public void testListBlock()
         ListHolder listHolder = new ListHolder();
         listHolder.array = array;
 
-        io.trino.spi.type.Type rowType = RowType.anonymous(ImmutableList.of(INTEGER, BIGINT));
-        io.trino.spi.type.Type arrayOfRowType = RowType.anonymous(ImmutableList.of(new ArrayType(rowType)));
-        Block actual = toBinaryBlock(arrayOfRowType, listHolder, getInspector(ListHolder.class));
-        BlockBuilder blockBuilder = rowType.createBlockBuilder(null, 1024);
-        rowType.writeObject(blockBuilder, rowBlockOf(ImmutableList.of(INTEGER, BIGINT), 8, 9L));
-        rowType.writeObject(blockBuilder, rowBlockOf(ImmutableList.of(INTEGER, BIGINT), 10, 11L));
-        Block expected = rowBlockOf(ImmutableList.of(new ArrayType(rowType)), blockBuilder.build());
+        RowType arrayValueType = RowType.anonymous(ImmutableList.of(INTEGER, BIGINT));
+        ArrayType arrayType = new ArrayType(arrayValueType);
+        RowType rowWithArrayField = RowType.anonymousRow(arrayType);
+
+        Block actual = toSingleValueBlock(rowWithArrayField, listHolder, getInspector(ListHolder.class));
+
+        RowBlockBuilder rowBlockBuilder = rowWithArrayField.createBlockBuilder(null, 1);
+        rowBlockBuilder.buildEntry(fieldBuilders -> {
+            ((ArrayBlockBuilder) fieldBuilders.get(0)).buildEntry(elementBuilder -> {
+                arrayValueType.writeObject(elementBuilder, rowBlockOf(ImmutableList.of(INTEGER, BIGINT), 8, 9L));
+                arrayValueType.writeObject(elementBuilder, rowBlockOf(ImmutableList.of(INTEGER, BIGINT), 10, 11L));
+            });
+        });
+        Block expected = rowBlockBuilder.build();
 
         assertBlockEquals(actual, expected);
     }
@@ -217,16 +227,22 @@ public void testMapBlock()
         holder.map.put("twelve", new InnerStruct(13, 14L));
         holder.map.put("fifteen", new InnerStruct(16, 17L));
 
-        RowType rowType = RowType.anonymous(ImmutableList.of(INTEGER, BIGINT));
-        RowType rowOfMapOfVarcharRowType = RowType.anonymous(ImmutableList.of(mapType(VARCHAR, rowType)));
-        Block actual = toBinaryBlock(rowOfMapOfVarcharRowType, holder, getInspector(MapHolder.class));
+        RowType mapValueType = RowType.anonymous(ImmutableList.of(INTEGER, BIGINT));
+        MapType mapType = mapType(VARCHAR, mapValueType);
+        RowType rowOfMapOfVarcharRowType = RowType.anonymousRow(mapType);
 
-        Block mapBlock = mapBlockOf(
-                VARCHAR,
-                rowType,
-                new Object[] {utf8Slice("fifteen"), utf8Slice("twelve")},
-                new Object[] {rowBlockOf(rowType.getTypeParameters(), 16, 17L), rowBlockOf(rowType.getTypeParameters(), 13, 14L)});
-        Block expected = rowBlockOf(ImmutableList.of(mapType(VARCHAR, rowType)), mapBlock);
+        Block actual = toSingleValueBlock(rowOfMapOfVarcharRowType, holder, getInspector(MapHolder.class));
+
+        RowBlockBuilder rowBlockBuilder = rowOfMapOfVarcharRowType.createBlockBuilder(null, 1);
+        rowBlockBuilder.buildEntry(fieldBuilders -> {
+            ((MapBlockBuilder) fieldBuilders.get(0)).buildEntry((keyBuilder, valueBuilder) -> {
+                VARCHAR.writeString(keyBuilder, "fifteen");
+                mapValueType.writeObject(valueBuilder, rowBlockOf(mapValueType.getTypeParameters(), 16, 17L));
+                VARCHAR.writeString(keyBuilder, "twelve");
+                mapValueType.writeObject(valueBuilder, rowBlockOf(mapValueType.getTypeParameters(), 13, 14L));
+            });
+        });
+        Block expected = rowBlockBuilder.build();
 
         assertBlockEquals(actual, expected);
     }
@@ -237,10 +253,15 @@ public void testStructBlock()
         // test simple structs
         InnerStruct innerStruct = new InnerStruct(13, 14L);
 
-        io.trino.spi.type.Type rowType = RowType.anonymous(ImmutableList.of(INTEGER, BIGINT));
-        Block actual = toBinaryBlock(rowType, innerStruct, getInspector(InnerStruct.class));
+        RowType rowType = RowType.anonymousRow(INTEGER, BIGINT);
+        Block actual = toSingleValueBlock(rowType, innerStruct, getInspector(InnerStruct.class));
 
-        Block expected = rowBlockOf(ImmutableList.of(INTEGER, BIGINT), 13, 14L);
+        RowBlockBuilder rowBlockBuilder = rowType.createBlockBuilder(null, 1);
+        rowBlockBuilder.buildEntry(fieldBuilders -> {
+            INTEGER.writeLong(fieldBuilders.get(0), 13);
+            BIGINT.writeLong(fieldBuilders.get(1), 14L);
+        });
+        Block expected = rowBlockBuilder.build();
         assertBlockEquals(actual, expected);
 
         // test complex structs
@@ -263,32 +284,49 @@ public void testStructBlock()
         outerStruct.map.put("fifteen", new InnerStruct(-5, -10L));
         outerStruct.innerStruct = new InnerStruct(18, 19L);
 
-        io.trino.spi.type.Type innerRowType = RowType.anonymous(ImmutableList.of(INTEGER, BIGINT));
-        io.trino.spi.type.Type arrayOfInnerRowType = new ArrayType(innerRowType);
-        io.trino.spi.type.Type mapOfInnerRowType = mapType(createUnboundedVarcharType(), innerRowType);
-        List<io.trino.spi.type.Type> outerRowParameterTypes = ImmutableList.of(TINYINT, SMALLINT, INTEGER, BIGINT, REAL, DOUBLE, createUnboundedVarcharType(), createUnboundedVarcharType(), arrayOfInnerRowType, mapOfInnerRowType, innerRowType);
-        io.trino.spi.type.Type outerRowType = RowType.anonymous(outerRowParameterTypes);
-
-        actual = toBinaryBlock(outerRowType, outerStruct, getInspector(OuterStruct.class));
-
-        ImmutableList.Builder<Object> outerRowValues = ImmutableList.builder();
-        outerRowValues.add((byte) 1);
-        outerRowValues.add((short) 2);
-        outerRowValues.add(3);
-        outerRowValues.add(4L);
-        outerRowValues.add(5.01f);
-        outerRowValues.add(6.001d);
-        outerRowValues.add("seven");
-        outerRowValues.add(new byte[] {'2'});
-        outerRowValues.add(arrayBlockOf(innerRowType, rowBlockOf(innerRowType.getTypeParameters(), 2, -5L), rowBlockOf(ImmutableList.of(INTEGER, BIGINT), -10, 0L)));
-        outerRowValues.add(mapBlockOf(
+        RowType innerRowType = RowType.anonymousRow(INTEGER, BIGINT);
+        ArrayType arrayOfInnerRowType = new ArrayType(innerRowType);
+        MapType mapOfInnerRowType = mapType(VARCHAR, innerRowType);
+        RowType outerRowType = RowType.anonymousRow(
+                TINYINT,
+                SMALLINT,
+                INTEGER,
+                BIGINT,
+                REAL,
+                DOUBLE,
                 VARCHAR,
-                innerRowType,
-                new Object[] {utf8Slice("fifteen"), utf8Slice("twelve")},
-                new Object[] {rowBlockOf(innerRowType.getTypeParameters(), -5, -10L), rowBlockOf(innerRowType.getTypeParameters(), 0, 5L)}));
-        outerRowValues.add(rowBlockOf(ImmutableList.of(INTEGER, BIGINT), 18, 19L));
+                VARCHAR,
+                arrayOfInnerRowType,
+                mapOfInnerRowType,
+                innerRowType);
+
+        actual = toSingleValueBlock(outerRowType, outerStruct, getInspector(OuterStruct.class));
+
+        rowBlockBuilder = outerRowType.createBlockBuilder(null, 1);
+        rowBlockBuilder.buildEntry(fieldBuilders -> {
+            TINYINT.writeLong(fieldBuilders.get(0), (byte) 1);
+            SMALLINT.writeLong(fieldBuilders.get(1), (short) 2);
+            INTEGER.writeLong(fieldBuilders.get(2), 3);
+            BIGINT.writeLong(fieldBuilders.get(3), 4L);
+            REAL.writeLong(fieldBuilders.get(4), Float.floatToIntBits(5.01f));
+            DOUBLE.writeDouble(fieldBuilders.get(5), 6.001d);
+            VARCHAR.writeString(fieldBuilders.get(6), "seven");
+            VARCHAR.writeString(fieldBuilders.get(7), "2");
+            ((ArrayBlockBuilder) fieldBuilders.get(8)).buildEntry(elementBuilder -> {
+                innerRowType.writeObject(elementBuilder, rowBlockOf(innerRowType.getTypeParameters(), 2, -5L));
+                innerRowType.writeObject(elementBuilder, rowBlockOf(innerRowType.getTypeParameters(), -10, 0L));
+            });
+            ((MapBlockBuilder) fieldBuilders.get(9)).buildEntry((keyBuilder, valueBuilder) -> {
+                VARCHAR.writeString(keyBuilder, "fifteen");
+                innerRowType.writeObject(valueBuilder, rowBlockOf(innerRowType.getTypeParameters(), -5, -10L));
+                VARCHAR.writeString(keyBuilder, "twelve");
+                innerRowType.writeObject(valueBuilder, rowBlockOf(innerRowType.getTypeParameters(), 0, 5L));
+            });
+            innerRowType.writeObject(fieldBuilders.get(10), rowBlockOf(innerRowType.getTypeParameters(), 18, 19L));
+        });
+        expected = rowBlockBuilder.build();
 
-        assertBlockEquals(actual, rowBlockOf(outerRowParameterTypes, outerRowValues.build().toArray()));
+        assertBlockEquals(actual, expected);
     }
 
     @Test
@@ -305,8 +343,15 @@ public void testReuse()
         Type type = new TypeToken<Map<BytesWritable, Long>>() {}.getType();
         ObjectInspector inspector = getInspector(type);
 
-        Block actual = getBlockObject(mapType(createUnboundedVarcharType(), BIGINT), ImmutableMap.of(value, 0L), inspector);
-        Block expected = mapBlockOf(createUnboundedVarcharType(), BIGINT, "bye", 0L);
+        MapType mapType = mapType(VARCHAR, BIGINT);
+        Block actual = toSingleValueBlock(mapType, ImmutableMap.of(value, 0L), inspector);
+
+        MapBlockBuilder blockBuilder = mapType.createBlockBuilder(null, 1);
+        blockBuilder.buildEntry((keyBuilder, valueBuilder) -> {
+            VARCHAR.writeString(keyBuilder, "bye");
+            BIGINT.writeLong(valueBuilder, 0L);
+        });
+        Block expected = blockBuilder.build();
 
         assertBlockEquals(actual, expected);
     }
@@ -324,17 +369,9 @@ private Slice blockToSlice(Block block)
         return sliceOutput.slice();
     }
 
-    private static Block toBinaryBlock(io.trino.spi.type.Type type, Object object, ObjectInspector inspector)
-    {
-        if (inspector.getCategory() == Category.PRIMITIVE) {
-            return getPrimitiveBlock(type, object, inspector);
-        }
-        return getBlockObject(type, object, inspector);
-    }
-
-    private static Block getPrimitiveBlock(io.trino.spi.type.Type type, Object object, ObjectInspector inspector)
+    private static Block toSingleValueBlock(io.trino.spi.type.Type type, Object object, ObjectInspector inspector)
     {
-        BlockBuilder builder = VARBINARY.createBlockBuilder(null, 1);
+        BlockBuilder builder = type.createBlockBuilder(null, 1);
         serializeObject(type, builder, object, inspector);
         return builder.build();
     }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestSizeBasedSplitWeightProvider.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestSizeBasedSplitWeightProvider.java
index 29acc684a226..63ad5b2ec746 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestSizeBasedSplitWeightProvider.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestSizeBasedSplitWeightProvider.java
@@ -15,9 +15,10 @@
 
 import io.airlift.units.DataSize;
 import io.trino.spi.SplitWeight;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestSizeBasedSplitWeightProvider
@@ -43,15 +44,19 @@ public void testMinimumAndMaximumSplitWeightHandling()
         assertEquals(provider.weightForSplitSizeInBytes(largerThanTarget.toBytes()), SplitWeight.standard());
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "^minimumWeight must be > 0 and <= 1, found: 1\\.01$")
+    @Test
     public void testInvalidMinimumWeight()
     {
-        new SizeBasedSplitWeightProvider(1.01, DataSize.of(64, MEGABYTE));
+        assertThatThrownBy(() -> new SizeBasedSplitWeightProvider(1.01, DataSize.of(64, MEGABYTE)))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageMatching("^minimumWeight must be > 0 and <= 1, found: 1\\.01$");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "^targetSplitSize must be > 0, found:.*$")
+    @Test
     public void testInvalidTargetSplitSize()
     {
-        new SizeBasedSplitWeightProvider(0.01, DataSize.ofBytes(0));
+        assertThatThrownBy(() -> new SizeBasedSplitWeightProvider(0.01, DataSize.ofBytes(0)))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageMatching("^targetSplitSize must be > 0, found:.*$");
     }
 }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestStatistics.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestStatistics.java
index 6c8527c90bc8..d47f123f9e1d 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestStatistics.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestStatistics.java
@@ -26,9 +26,8 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.statistics.ComputedStatistics;
 import io.trino.spi.statistics.TableStatisticType;
-import io.trino.spi.type.BigintType;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -36,7 +35,6 @@
 import java.util.Optional;
 import java.util.OptionalDouble;
 import java.util.OptionalLong;
-import java.util.function.Function;
 
 import static io.trino.plugin.hive.HiveBasicStatistics.createEmptyStatistics;
 import static io.trino.plugin.hive.HiveBasicStatistics.createZeroStatistics;
@@ -53,9 +51,11 @@
 import static io.trino.plugin.hive.util.Statistics.merge;
 import static io.trino.plugin.hive.util.Statistics.reduce;
 import static io.trino.spi.predicate.Utils.nativeValueToBlock;
+import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.TypeUtils.writeNativeValue;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.Float.floatToIntBits;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -317,16 +317,13 @@ public void testMergeHiveColumnStatisticsMap()
     @Test
     public void testFromComputedStatistics()
     {
-        Function<Integer, Block> singleIntegerValueBlock = value ->
-                BigintType.BIGINT.createBlockBuilder(null, 1).writeLong(value).build();
-
         ComputedStatistics statistics = ComputedStatistics.builder(ImmutableList.of(), ImmutableList.of())
-                .addTableStatistic(TableStatisticType.ROW_COUNT, singleIntegerValueBlock.apply(5))
-                .addColumnStatistic(MIN_VALUE.createColumnStatisticMetadata("a_column"), singleIntegerValueBlock.apply(1))
-                .addColumnStatistic(MAX_VALUE.createColumnStatisticMetadata("a_column"), singleIntegerValueBlock.apply(5))
-                .addColumnStatistic(NUMBER_OF_DISTINCT_VALUES.createColumnStatisticMetadata("a_column"), singleIntegerValueBlock.apply(5))
-                .addColumnStatistic(NUMBER_OF_NON_NULL_VALUES.createColumnStatisticMetadata("a_column"), singleIntegerValueBlock.apply(5))
-                .addColumnStatistic(NUMBER_OF_NON_NULL_VALUES.createColumnStatisticMetadata("b_column"), singleIntegerValueBlock.apply(4))
+                .addTableStatistic(TableStatisticType.ROW_COUNT, writeNativeValue(BIGINT, 5L))
+                .addColumnStatistic(MIN_VALUE.createColumnStatisticMetadata("a_column"), writeNativeValue(INTEGER, 1L))
+                .addColumnStatistic(MAX_VALUE.createColumnStatisticMetadata("a_column"), writeNativeValue(INTEGER, 5L))
+                .addColumnStatistic(NUMBER_OF_DISTINCT_VALUES.createColumnStatisticMetadata("a_column"), writeNativeValue(BIGINT, 5L))
+                .addColumnStatistic(NUMBER_OF_NON_NULL_VALUES.createColumnStatisticMetadata("a_column"), writeNativeValue(BIGINT, 5L))
+                .addColumnStatistic(NUMBER_OF_NON_NULL_VALUES.createColumnStatisticMetadata("b_column"), writeNativeValue(BIGINT, 4L))
                 .build();
 
         Map<String, Type> columnTypes = ImmutableMap.of("a_column", INTEGER, "b_column", VARCHAR);
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestThrottledAsyncQueue.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestThrottledAsyncQueue.java
index 36154f8c0acf..9378cad1eca2 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestThrottledAsyncQueue.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/util/TestThrottledAsyncQueue.java
@@ -16,9 +16,11 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -28,28 +30,31 @@
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestThrottledAsyncQueue
 {
     private ExecutorService executor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUpClass()
     {
         executor = newCachedThreadPool(daemonThreadsNamed("TestThrottledAsyncQueue-%s"));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDownClass()
     {
         executor.shutdownNow();
         executor = null;
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testThrottle()
     {
         // Make sure that the dequeuing is throttled even if we have enough elements in the queue
@@ -82,7 +87,8 @@ public void testThrottle()
         assertTrue(queue.isFinished());
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testThrottleEmptyQueue()
             throws Exception
     {
@@ -116,7 +122,8 @@ public void testThrottleEmptyQueue()
         assertTrue(queue.isFinished());
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testBorrowThrows()
             throws Exception
     {
@@ -163,7 +170,8 @@ public void testBorrowThrows()
         assertTrue(queue.isFinished());
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testGetPartial()
             throws Exception
     {
@@ -178,7 +186,8 @@ public void testGetPartial()
         assertTrue(queue.isFinished());
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testFullQueue()
             throws Exception
     {
@@ -209,7 +218,8 @@ public void testFullQueue()
         assertTrue(queue.isFinished());
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testEmptyQueue()
             throws Exception
     {
@@ -233,7 +243,8 @@ public void testEmptyQueue()
         assertTrue(queue.isFinished());
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testOfferAfterFinish()
             throws Exception
     {
diff --git a/plugin/trino-hive/src/main/java/org/apache/parquet/hadoop/DisabledMemoryManager.java b/plugin/trino-hive/src/test/java/org/apache/parquet/hadoop/DisabledMemoryManager.java
similarity index 100%
rename from plugin/trino-hive/src/main/java/org/apache/parquet/hadoop/DisabledMemoryManager.java
rename to plugin/trino-hive/src/test/java/org/apache/parquet/hadoop/DisabledMemoryManager.java
diff --git a/plugin/trino-hive/src/test/resources/parquet_page_skipping/column_name_with_dot/20230725_101306_00056_6ramm_28cb680f-d745-40c6-98ad-b56c8ee94ac6 b/plugin/trino-hive/src/test/resources/parquet_page_skipping/column_name_with_dot/20230725_101306_00056_6ramm_28cb680f-d745-40c6-98ad-b56c8ee94ac6
new file mode 100644
index 000000000000..a086d155dffa
Binary files /dev/null and b/plugin/trino-hive/src/test/resources/parquet_page_skipping/column_name_with_dot/20230725_101306_00056_6ramm_28cb680f-d745-40c6-98ad-b56c8ee94ac6 differ
diff --git a/plugin/trino-hive/src/test/resources/parquet_page_skipping/lineitem_sorted_by_suppkey/000000_0_a94130b9-2234-4000-9162-4114aefcd919_20230725_103128_00063_6ramm b/plugin/trino-hive/src/test/resources/parquet_page_skipping/lineitem_sorted_by_suppkey/000000_0_a94130b9-2234-4000-9162-4114aefcd919_20230725_103128_00063_6ramm
new file mode 100644
index 000000000000..076faaa38b5e
Binary files /dev/null and b/plugin/trino-hive/src/test/resources/parquet_page_skipping/lineitem_sorted_by_suppkey/000000_0_a94130b9-2234-4000-9162-4114aefcd919_20230725_103128_00063_6ramm differ
diff --git a/plugin/trino-hive/src/test/resources/parquet_page_skipping/orders_sorted_by_totalprice/000000_0_ca5374d9-007e-4bbd-8717-bac6677b6ee7_20230725_074756_00016_6ramm b/plugin/trino-hive/src/test/resources/parquet_page_skipping/orders_sorted_by_totalprice/000000_0_ca5374d9-007e-4bbd-8717-bac6677b6ee7_20230725_074756_00016_6ramm
new file mode 100644
index 000000000000..82fd24bf7c66
Binary files /dev/null and b/plugin/trino-hive/src/test/resources/parquet_page_skipping/orders_sorted_by_totalprice/000000_0_ca5374d9-007e-4bbd-8717-bac6677b6ee7_20230725_074756_00016_6ramm differ
diff --git a/plugin/trino-hive/src/test/resources/parquet_page_skipping/random/20230725_092119_00042_6ramm_25f11bb4-b7f7-4d05-afff-ba6b72bfb531 b/plugin/trino-hive/src/test/resources/parquet_page_skipping/random/20230725_092119_00042_6ramm_25f11bb4-b7f7-4d05-afff-ba6b72bfb531
new file mode 100644
index 000000000000..dc1be1bbf044
Binary files /dev/null and b/plugin/trino-hive/src/test/resources/parquet_page_skipping/random/20230725_092119_00042_6ramm_25f11bb4-b7f7-4d05-afff-ba6b72bfb531 differ
diff --git a/plugin/trino-hive/src/test/resources/with_short_zone_id/README.md b/plugin/trino-hive/src/test/resources/with_short_zone_id/README.md
new file mode 100644
index 000000000000..ef2e6873df13
--- /dev/null
+++ b/plugin/trino-hive/src/test/resources/with_short_zone_id/README.md
@@ -0,0 +1,37 @@
+The ORC file is generated using Apache Spark 2.3.0 libraries.
+
+```java
+import org.apache.spark.sql.SparkSession;
+
+import java.util.TimeZone;
+
+import static java.lang.String.format;
+
+public class Main
+{
+    public static void main(String[] args)
+    {
+        // Make sure to set default timezone using short timezone id
+        TimeZone.setDefault(TimeZone.getTimeZone("EST"));
+
+        String tableName = "with_short_zone_id";
+        String warehouseDirectory = "/Users/vikashkumar/spark/hive_warehouse";
+
+        SparkSession spark = SparkSession.builder()
+                .master("local[*]")
+                .appName("shortZoneId")
+                .config("spark.sql.warehouse.dir", warehouseDirectory)
+                .enableHiveSupport()
+                .getOrCreate();
+
+        spark.sql("DROP TABLE IF EXISTS " + tableName);
+        spark.sql(format("CREATE TABLE %s (id INT, firstName STRING, lastName STRING) STORED AS ORC LOCATION '%s/%1$s/data'", tableName, warehouseDirectory));
+        spark.sql(format("INSERT INTO %s VALUES (1, 'John', 'Doe')", tableName));
+
+        spark.sql("SELECT * FROM " + tableName)
+                .show(false);
+
+        spark.stop();
+    }
+}
+```
\ No newline at end of file
diff --git a/plugin/trino-hive/src/test/resources/with_short_zone_id/data/part-00000-cab83205-643e-4b22-9846-54395fde4199-c000 b/plugin/trino-hive/src/test/resources/with_short_zone_id/data/part-00000-cab83205-643e-4b22-9846-54395fde4199-c000
new file mode 100755
index 000000000000..d59fd2486871
Binary files /dev/null and b/plugin/trino-hive/src/test/resources/with_short_zone_id/data/part-00000-cab83205-643e-4b22-9846-54395fde4199-c000 differ
diff --git a/plugin/trino-http-event-listener/pom.xml b/plugin/trino-http-event-listener/pom.xml
index 8bdbdb66584b..f04806ab18ae 100644
--- a/plugin/trino-http-event-listener/pom.xml
+++ b/plugin/trino-http-event-listener/pom.xml
@@ -5,19 +5,29 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-http-event-listener</artifactId>
-    <description>Trino - Http Query Listener</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Http Query Listener</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>bootstrap</artifactId>
@@ -59,23 +69,32 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -90,47 +109,39 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
+            <groupId>com.squareup.okio</groupId>
+            <artifactId>okio-jvm</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okio</groupId>
-            <artifactId>okio-jvm</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -141,8 +152,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-http-event-listener/src/main/java/io/trino/plugin/httpquery/ForHttpEventListener.java b/plugin/trino-http-event-listener/src/main/java/io/trino/plugin/httpquery/ForHttpEventListener.java
index a21fcd133ffb..94896bdd1328 100644
--- a/plugin/trino-http-event-listener/src/main/java/io/trino/plugin/httpquery/ForHttpEventListener.java
+++ b/plugin/trino-http-event-listener/src/main/java/io/trino/plugin/httpquery/ForHttpEventListener.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.httpquery;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForHttpEventListener
 {
 }
diff --git a/plugin/trino-http-event-listener/src/main/java/io/trino/plugin/httpquery/HttpEventListenerConfig.java b/plugin/trino-http-event-listener/src/main/java/io/trino/plugin/httpquery/HttpEventListenerConfig.java
index aceffb70740f..2e50778a28e5 100644
--- a/plugin/trino-http-event-listener/src/main/java/io/trino/plugin/httpquery/HttpEventListenerConfig.java
+++ b/plugin/trino-http-event-listener/src/main/java/io/trino/plugin/httpquery/HttpEventListenerConfig.java
@@ -17,11 +17,9 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
-import java.net.URISyntaxException;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
@@ -91,7 +89,6 @@ public String getIngestUri()
     @ConfigDescription("URL of receiving server. Explicitly set the scheme https:// to use symmetric encryption")
     @Config("http-event-listener.connect-ingest-uri")
     public HttpEventListenerConfig setIngestUri(String ingestUri)
-            throws URISyntaxException
     {
         this.ingestUri = ingestUri;
         return this;
diff --git a/plugin/trino-http-event-listener/src/test/java/io/trino/plugin/httpquery/TestHttpEventListener.java b/plugin/trino-http-event-listener/src/test/java/io/trino/plugin/httpquery/TestHttpEventListener.java
index 05bbbdd5bd02..9e99370f754d 100644
--- a/plugin/trino-http-event-listener/src/test/java/io/trino/plugin/httpquery/TestHttpEventListener.java
+++ b/plugin/trino-http-event-listener/src/test/java/io/trino/plugin/httpquery/TestHttpEventListener.java
@@ -35,10 +35,10 @@
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 import okhttp3.mockwebserver.SocketPolicy;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
@@ -67,16 +67,13 @@
 
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static io.airlift.json.JsonCodec.jsonCodec;
+import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static java.lang.String.format;
 import static java.time.Duration.ofMillis;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestHttpEventListener
 {
     private MockWebServer server;
@@ -105,7 +102,9 @@ public class TestHttpEventListener
 
         queryContext = new QueryContext(
                 "user",
+                "originalUser",
                 Optional.of("principal"),
+                Set.of(), // enabledRoles
                 Set.of(), // groups
                 Optional.empty(), // traceToken
                 Optional.empty(), // remoteClientAddress
@@ -114,6 +113,7 @@ public class TestHttpEventListener
                 new HashSet<>(), // clientTags
                 new HashSet<>(), // clientCapabilities
                 Optional.of("source"),
+                UTC_KEY.getId(),
                 Optional.of("catalog"),
                 Optional.of("schema"),
                 Optional.of(new ResourceGroupId("name")),
@@ -163,6 +163,7 @@ public class TestHttpEventListener
                 Optional.empty(),
                 Optional.empty(),
                 Optional.empty(),
+                Optional.empty(),
                 0L,
                 0L,
                 0L,
@@ -223,7 +224,7 @@ public class TestHttpEventListener
         splitCompleteEventJson = splitCompleteEventJsonCodec.toJson(splitCompleteEvent);
     }
 
-    @BeforeMethod
+    @BeforeEach
     public void setup()
             throws IOException
     {
@@ -231,7 +232,7 @@ public void setup()
         server.start();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void teardown()
     {
         try {
@@ -260,7 +261,7 @@ public void testAllLoggingDisabledShouldTimeout()
         eventListener.queryCompleted(null);
         eventListener.splitCompleted(null);
 
-        assertNull(server.takeRequest(5, TimeUnit.SECONDS));
+        assertThat(server.takeRequest(5, TimeUnit.SECONDS)).isNull();
     }
 
     @Test
@@ -299,7 +300,7 @@ public void testContentTypeDefaultHeaderShouldAlwaysBeSet()
 
         eventListener.queryCompleted(queryCompleteEvent);
 
-        assertEquals(server.takeRequest(5, TimeUnit.SECONDS).getHeader("Content-Type"), "application/json; charset=utf-8");
+        assertThat(server.takeRequest(5, TimeUnit.SECONDS).getHeader("Content-Type")).isEqualTo("application/json; charset=utf-8");
     }
 
     @Test
@@ -336,8 +337,10 @@ public void testHttpsEnabledShouldUseTLSv13()
 
         RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
 
-        assertNotNull(recordedRequest, "Handshake probably failed");
-        assertEquals(recordedRequest.getTlsVersion().javaName(), "TLSv1.3");
+        assertThat(recordedRequest)
+                .describedAs("Handshake probably failed")
+                .isNotNull();
+        assertThat(recordedRequest.getTlsVersion().javaName()).isEqualTo("TLSv1.3");
 
         checkRequest(recordedRequest, queryCompleteEventJson);
     }
@@ -358,7 +361,9 @@ public void testDifferentCertificatesShouldNotSendRequest()
 
         RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
 
-        assertNull(recordedRequest, "Handshake should have failed");
+        assertThat(recordedRequest)
+                .describedAs("Handshake should have failed")
+                .isNull();
     }
 
     @Test
@@ -376,17 +381,22 @@ public void testNoServerCertificateShouldNotSendRequest()
 
         RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
 
-        assertNull(recordedRequest, "Handshake should have failed");
+        assertThat(recordedRequest)
+                .describedAs("Handshake should have failed")
+                .isNull();
     }
 
-    @DataProvider(name = "retryStatusCodes")
-    public static Object[][] retryStatusCodes()
+    @Test
+    public void testServerShoudRetry()
+            throws Exception
     {
-        return new Object[][] {{503}, {500}, {429}, {408}};
+        testServerShouldRetry(503);
+        testServerShouldRetry(500);
+        testServerShouldRetry(429);
+        testServerShouldRetry(408);
     }
 
-    @Test(dataProvider = "retryStatusCodes")
-    public void testServerShouldRetry(int responseCode)
+    private void testServerShouldRetry(int responseCode)
             throws Exception
     {
         EventListener eventListener = factory.create(Map.of(
@@ -399,7 +409,7 @@ public void testServerShouldRetry(int responseCode)
 
         eventListener.queryCompleted(queryCompleteEvent);
 
-        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS));
+        assertThat(server.takeRequest(5, TimeUnit.SECONDS)).isNotNull();
         checkRequest(server.takeRequest(5, TimeUnit.SECONDS), queryCompleteEventJson);
     }
 
@@ -419,7 +429,7 @@ public void testServerDisconnectShouldRetry()
 
         eventListener.queryCompleted(queryCompleteEvent);
 
-        assertNotNull(server.takeRequest(5, TimeUnit.SECONDS)); // First request, causes exception
+        assertThat(server.takeRequest(5, TimeUnit.SECONDS)).isNotNull(); // First request, causes exception
         checkRequest(server.takeRequest(5, TimeUnit.SECONDS), queryCompleteEventJson);
     }
 
@@ -437,8 +447,9 @@ public void testServerDelayDoesNotBlock()
         eventListener.queryCompleted(queryCompleteEvent);
         long endTime = System.nanoTime();
 
-        assertTrue(Duration.of(endTime - startTime, ChronoUnit.NANOS).compareTo(Duration.of(1, ChronoUnit.SECONDS)) < 0,
-                "Server delay is blocking main thread");
+        assertThat(Duration.of(endTime - startTime, ChronoUnit.NANOS).compareTo(Duration.of(1, ChronoUnit.SECONDS)) < 0)
+                .describedAs("Server delay is blocking main thread")
+                .isTrue();
 
         checkRequest(server.takeRequest(5, TimeUnit.SECONDS), queryCompleteEventJson);
     }
@@ -452,14 +463,21 @@ private void checkRequest(RecordedRequest recordedRequest, String eventJson)
     private void checkRequest(RecordedRequest recordedRequest, Map<String, String> customHeaders, String eventJson)
             throws JsonProcessingException
     {
-        assertNotNull(recordedRequest, "No request sent when logging is enabled");
+        assertThat(recordedRequest)
+                .describedAs("No request sent when logging is enabled")
+                .isNotNull();
         for (String key : customHeaders.keySet()) {
-            assertNotNull(recordedRequest.getHeader(key), format("Custom header %s not present in request", key));
-            assertEquals(recordedRequest.getHeader(key), customHeaders.get(key),
-                    format("Expected value %s for header %s but got %s", customHeaders.get(key), key, recordedRequest.getHeader(key)));
+            assertThat(recordedRequest.getHeader(key))
+                    .describedAs(format("Custom header %s not present in request", key))
+                    .isNotNull();
+            assertThat(recordedRequest.getHeader(key))
+                    .describedAs(format("Expected value %s for header %s but got %s", customHeaders.get(key), key, recordedRequest.getHeader(key)))
+                    .isEqualTo(customHeaders.get(key));
         }
         String body = recordedRequest.getBody().readUtf8();
-        assertFalse(body.isEmpty(), "Body is empty");
+        assertThat(body.isEmpty())
+                .describedAs("Body is empty")
+                .isFalse();
 
         ObjectMapper objectMapper = new ObjectMapper();
         assertThat(objectMapper.readTree(body))
diff --git a/plugin/trino-http-event-listener/src/test/java/io/trino/plugin/httpquery/TestHttpEventListenerConfig.java b/plugin/trino-http-event-listener/src/test/java/io/trino/plugin/httpquery/TestHttpEventListenerConfig.java
index 20560320d83b..57be29ec1291 100644
--- a/plugin/trino-http-event-listener/src/test/java/io/trino/plugin/httpquery/TestHttpEventListenerConfig.java
+++ b/plugin/trino-http-event-listener/src/test/java/io/trino/plugin/httpquery/TestHttpEventListenerConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.httpquery;
 
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-hudi/pom.xml b/plugin/trino-hudi/pom.xml
index 25b29022ac86..7f67e64a9912 100644
--- a/plugin/trino-hudi/pom.xml
+++ b/plugin/trino-hudi/pom.xml
@@ -3,60 +3,41 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>trino-root</artifactId>
         <groupId>io.trino</groupId>
-        <version>413-SNAPSHOT</version>
+        <artifactId>trino-root</artifactId>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-hudi</artifactId>
-    <description>Trino - Hudi Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Hudi Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <dep.hudi.version>0.12.2</dep.hudi.version>
+        <dep.hudi.version>0.12.3</dep.hudi.version>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-filesystem</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hdfs</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hive</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-memory-context</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-parquet</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hadoop</groupId>
-            <artifactId>hadoop-apache</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hive</groupId>
-            <artifactId>hive-apache</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -95,34 +76,48 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem-manager</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hdfs</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hive</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-memory-context</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-parquet</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -131,91 +126,18 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hudi</groupId>
-            <artifactId>hudi-common</artifactId>
-            <version>${dep.hudi.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-server</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.orc</groupId>
-                    <artifactId>orc-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpclient</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>fluent-hc</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.rocksdb</groupId>
-                    <artifactId>rocksdbjni</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.esotericsoftware</groupId>
-                    <artifactId>kryo-shaded</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-hdfs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpcore</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hive</groupId>
-                    <artifactId>hive-exec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hive</groupId>
-                    <artifactId>hive-jdbc</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.github.ben-manes.caffeine</groupId>
-                    <artifactId>caffeine</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.lz4</groupId>
-                    <artifactId>lz4-java</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hudi</groupId>
-            <artifactId>hudi-hadoop-mr</artifactId>
-            <version>${dep.hudi.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-column</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-hadoop</artifactId>
         </dependency>
 
         <dependency>
@@ -223,35 +145,33 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hadoop-toolkit</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -261,17 +181,40 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-hive</artifactId>
-            <type>test-jar</type>
+            <artifactId>trino-hadoop-toolkit</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino.hadoop</groupId>
+            <artifactId>hadoop-apache</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-hive-hadoop2</artifactId>
+            <artifactId>trino-hive</artifactId>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
@@ -331,12 +274,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.hudi</groupId>
             <artifactId>hudi-client-common</artifactId>
@@ -344,63 +281,20 @@
             <scope>test</scope>
             <exclusions>
                 <exclusion>
-                    <groupId>com.beust</groupId>
-                    <artifactId>jcommander</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.dropwizard.metrics</groupId>
-                    <artifactId>metrics-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hudi</groupId>
-                    <artifactId>hudi-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hudi</groupId>
-                    <artifactId>hudi-hive-sync</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hudi</groupId>
-                    <artifactId>hudi-timeline-service</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hive</groupId>
-                    <artifactId>hive-service</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.parquet</groupId>
-                    <artifactId>parquet-avro</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.github.davidmoten</groupId>
-                    <artifactId>hilbert-curve</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.prometheus</groupId>
+                    <groupId>*</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hudi</groupId>
+            <artifactId>hudi-common</artifactId>
+            <version>${dep.hudi.version}</version>
+            <scope>test</scope>
+            <exclusions>
                 <exclusion>
-                    <groupId>io.dropwizard.metrics</groupId>
+                    <groupId>*</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
@@ -416,13 +310,15 @@
                     <groupId>org.apache.hudi</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.apache.parquet</groupId>
-                    <artifactId>parquet-avro</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-avro</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -435,6 +331,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -444,26 +346,39 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.basepom.maven</groupId>
                 <artifactId>duplicate-finder-maven-plugin</artifactId>
                 <configuration>
                     <ignoredResourcePatterns>
-                        <!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
-                        <ignoredResourcePattern>mime.types</ignoredResourcePattern>
-                        <ignoredResourcePattern>about.html</ignoredResourcePattern>
                         <!-- org.apache.hudi:hudi-client-common and org.apache.hudi:hudi-java-client log4j.properties duplicates -->
                         <ignoredResourcePattern>log4j.properties</ignoredResourcePattern>
                         <ignoredResourcePattern>log4j-surefire.properties</ignoredResourcePattern>
                     </ignoredResourcePatterns>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/ForHudiSplitManager.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/ForHudiSplitManager.java
index 648f7f31fc7c..0f1987594a1a 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/ForHudiSplitManager.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/ForHudiSplitManager.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hudi;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,5 +25,5 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForHudiSplitManager {}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/ForHudiSplitSource.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/ForHudiSplitSource.java
new file mode 100644
index 000000000000..801b1e030940
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/ForHudiSplitSource.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi;
+
+import com.google.inject.BindingAnnotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+@Target({FIELD, PARAMETER, METHOD})
+@BindingAnnotation
+public @interface ForHudiSplitSource {}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiConfig.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiConfig.java
index ea323818bdf6..c7fd2f84e4bb 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiConfig.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiConfig.java
@@ -17,13 +17,12 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
+import io.airlift.configuration.DefunctConfig;
 import io.airlift.units.DataSize;
-
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
@@ -32,20 +31,25 @@
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static java.util.Locale.ENGLISH;
 
+@DefunctConfig({
+        "hudi.min-partition-batch-size",
+        "hudi.max-partition-batch-size",
+        "hudi.metadata-enabled",
+})
 public class HudiConfig
 {
     private static final Splitter COMMA_SPLITTER = Splitter.on(",").omitEmptyStrings().trimResults();
 
     private List<String> columnsToHide = ImmutableList.of();
-    private boolean metadataEnabled;
     private boolean shouldUseParquetColumnNames = true;
-    private int minPartitionBatchSize = 10;
-    private int maxPartitionBatchSize = 100;
     private boolean sizeBasedSplitWeightsEnabled = true;
     private DataSize standardSplitWeightSize = DataSize.of(128, MEGABYTE);
     private double minimumAssignedSplitWeight = 0.05;
     private int maxSplitsPerSecond = Integer.MAX_VALUE;
     private int maxOutstandingSplits = 1000;
+    private int splitLoaderParallelism = 4;
+    private int splitGeneratorParallelism = 4;
+    private long perTransactionMetastoreCacheMaximumSize = 2000;
 
     public List<String> getColumnsToHide()
     {
@@ -63,19 +67,6 @@ public HudiConfig setColumnsToHide(String columnsToHide)
         return this;
     }
 
-    @Config("hudi.metadata-enabled")
-    @ConfigDescription("Fetch the list of file names and sizes from metadata rather than storage.")
-    public HudiConfig setMetadataEnabled(boolean metadataEnabled)
-    {
-        this.metadataEnabled = metadataEnabled;
-        return this;
-    }
-
-    public boolean isMetadataEnabled()
-    {
-        return this.metadataEnabled;
-    }
-
     @Config("hudi.parquet.use-column-names")
     @ConfigDescription("Access Parquet columns using names from the file. If disabled, then columns are accessed using index."
             + "Only applicable to Parquet file format.")
@@ -90,36 +81,6 @@ public boolean getUseParquetColumnNames()
         return this.shouldUseParquetColumnNames;
     }
 
-    @Config("hudi.min-partition-batch-size")
-    @ConfigDescription("Minimum number of partitions returned in a single batch.")
-    public HudiConfig setMinPartitionBatchSize(int minPartitionBatchSize)
-    {
-        this.minPartitionBatchSize = minPartitionBatchSize;
-        return this;
-    }
-
-    @Min(1)
-    @Max(100)
-    public int getMinPartitionBatchSize()
-    {
-        return minPartitionBatchSize;
-    }
-
-    @Config("hudi.max-partition-batch-size")
-    @ConfigDescription("Maximum number of partitions returned in a single batch.")
-    public HudiConfig setMaxPartitionBatchSize(int maxPartitionBatchSize)
-    {
-        this.maxPartitionBatchSize = maxPartitionBatchSize;
-        return this;
-    }
-
-    @Min(1)
-    @Max(1000)
-    public int getMaxPartitionBatchSize()
-    {
-        return maxPartitionBatchSize;
-    }
-
     @Config("hudi.size-based-split-weights-enabled")
     @ConfigDescription("Unlike uniform splitting, size-based splitting ensures that each batch of splits has enough data to process. " +
             "By default, it is enabled to improve performance.")
@@ -191,4 +152,45 @@ public HudiConfig setMaxOutstandingSplits(int maxOutstandingSplits)
         this.maxOutstandingSplits = maxOutstandingSplits;
         return this;
     }
+
+    @Min(1)
+    public int getSplitGeneratorParallelism()
+    {
+        return splitGeneratorParallelism;
+    }
+
+    @Config("hudi.split-generator-parallelism")
+    @ConfigDescription("Number of threads to generate splits from partitions.")
+    public HudiConfig setSplitGeneratorParallelism(int splitGeneratorParallelism)
+    {
+        this.splitGeneratorParallelism = splitGeneratorParallelism;
+        return this;
+    }
+
+    @Min(1)
+    public int getSplitLoaderParallelism()
+    {
+        return splitLoaderParallelism;
+    }
+
+    @Config("hudi.split-loader-parallelism")
+    @ConfigDescription("Number of threads to run background split loader. A single background split loader is needed per query.")
+    public HudiConfig setSplitLoaderParallelism(int splitLoaderParallelism)
+    {
+        this.splitLoaderParallelism = splitLoaderParallelism;
+        return this;
+    }
+
+    @Min(1)
+    public long getPerTransactionMetastoreCacheMaximumSize()
+    {
+        return perTransactionMetastoreCacheMaximumSize;
+    }
+
+    @Config("hudi.per-transaction-metastore-cache-maximum-size")
+    public HudiConfig setPerTransactionMetastoreCacheMaximumSize(long perTransactionMetastoreCacheMaximumSize)
+    {
+        this.perTransactionMetastoreCacheMaximumSize = perTransactionMetastoreCacheMaximumSize;
+        return this;
+    }
 }
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiConnectorFactory.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiConnectorFactory.java
index 71133de3f492..98d1a49cc3e2 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiConnectorFactory.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiConnectorFactory.java
@@ -22,7 +22,7 @@
 import java.util.Optional;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 
 public class HudiConnectorFactory
         implements ConnectorFactory
@@ -39,13 +39,13 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         ClassLoader classLoader = context.duplicatePluginClassLoader();
         try {
             return (Connector) classLoader.loadClass(InternalHudiConnectorFactory.class.getName())
-                    .getMethod("createConnector", String.class, Map.class, ConnectorContext.class, Optional.class)
-                    .invoke(null, catalogName, config, context, Optional.empty());
+                    .getMethod("createConnector", String.class, Map.class, ConnectorContext.class, Optional.class, Optional.class)
+                    .invoke(null, catalogName, config, context, Optional.empty(), Optional.empty());
         }
         catch (InvocationTargetException e) {
             Throwable targetException = e.getTargetException();
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiErrorCode.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiErrorCode.java
index 5a746fded030..405017236503 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiErrorCode.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiErrorCode.java
@@ -22,13 +22,18 @@
 public enum HudiErrorCode
         implements ErrorCodeSupplier
 {
-    HUDI_UNKNOWN_TABLE_TYPE(0, EXTERNAL),
+    // HUDI_UNKNOWN_TABLE_TYPE(0, EXTERNAL),
     HUDI_INVALID_PARTITION_VALUE(1, EXTERNAL),
     HUDI_BAD_DATA(2, EXTERNAL),
     // HUDI_MISSING_DATA(3, EXTERNAL) is deprecated
     HUDI_CANNOT_OPEN_SPLIT(4, EXTERNAL),
     HUDI_UNSUPPORTED_FILE_FORMAT(5, EXTERNAL),
-    HUDI_CURSOR_ERROR(6, EXTERNAL);
+    HUDI_CURSOR_ERROR(6, EXTERNAL),
+    HUDI_FILESYSTEM_ERROR(7, EXTERNAL),
+    HUDI_PARTITION_NOT_FOUND(8, EXTERNAL),
+    // HUDI_UNSUPPORTED_TABLE_TYPE(9, EXTERNAL), // Unused. Could be mistaken with HUDI_UNKNOWN_TABLE_TYPE.
+
+    /**/;
 
     private final ErrorCode errorCode;
 
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiFileStatus.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiFileStatus.java
new file mode 100644
index 000000000000..56d585db8772
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiFileStatus.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi;
+
+import io.trino.filesystem.Location;
+
+import static java.util.Objects.requireNonNull;
+
+public record HudiFileStatus(Location location, boolean isDirectory, long length, long modificationTime, long blockSize)
+{
+    public HudiFileStatus
+    {
+        requireNonNull(location, "location is null");
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadata.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadata.java
index fec75c1dff0c..709e7439862c 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadata.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadata.java
@@ -15,9 +15,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import io.airlift.log.Logger;
-import io.trino.hdfs.HdfsContext;
-import io.trino.hdfs.HdfsEnvironment;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.classloader.ClassLoaderSafeSystemTable;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.metastore.Column;
@@ -39,9 +38,6 @@
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.TypeManager;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hudi.common.model.HoodieTableType;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -51,6 +47,7 @@
 import java.util.Optional;
 import java.util.function.Function;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
@@ -58,33 +55,31 @@
 import static io.trino.plugin.hive.util.HiveUtil.columnMetadataGetter;
 import static io.trino.plugin.hive.util.HiveUtil.hiveColumnHandles;
 import static io.trino.plugin.hive.util.HiveUtil.isHiveSystemSchema;
-import static io.trino.plugin.hudi.HudiErrorCode.HUDI_UNKNOWN_TABLE_TYPE;
+import static io.trino.plugin.hive.util.HiveUtil.isHudiTable;
+import static io.trino.plugin.hudi.HudiErrorCode.HUDI_BAD_DATA;
 import static io.trino.plugin.hudi.HudiSessionProperties.getColumnsToHide;
 import static io.trino.plugin.hudi.HudiTableProperties.LOCATION_PROPERTY;
 import static io.trino.plugin.hudi.HudiTableProperties.PARTITIONED_BY_PROPERTY;
+import static io.trino.plugin.hudi.HudiUtil.hudiMetadataExists;
+import static io.trino.plugin.hudi.model.HudiTableType.COPY_ON_WRITE;
+import static io.trino.spi.StandardErrorCode.UNSUPPORTED_TABLE_TYPE;
 import static io.trino.spi.connector.SchemaTableName.schemaTableName;
 import static java.lang.String.format;
 import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
 import static java.util.function.Function.identity;
-import static org.apache.hudi.common.fs.FSUtils.getFs;
-import static org.apache.hudi.common.table.HoodieTableMetaClient.METAFOLDER_NAME;
-import static org.apache.hudi.common.util.StringUtils.isNullOrEmpty;
-import static org.apache.hudi.exception.TableNotFoundException.checkTableValidity;
 
 public class HudiMetadata
         implements ConnectorMetadata
 {
-    public static final Logger log = Logger.get(HudiMetadata.class);
-
     private final HiveMetastore metastore;
-    private final HdfsEnvironment hdfsEnvironment;
+    private final TrinoFileSystemFactory fileSystemFactory;
     private final TypeManager typeManager;
 
-    public HudiMetadata(HiveMetastore metastore, HdfsEnvironment hdfsEnvironment, TypeManager typeManager)
+    public HudiMetadata(HiveMetastore metastore, TrinoFileSystemFactory fileSystemFactory, TypeManager typeManager)
     {
         this.metastore = requireNonNull(metastore, "metastore is null");
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
     }
 
@@ -106,14 +101,19 @@ public HudiTableHandle getTableHandle(ConnectorSession session, SchemaTableName
         if (table.isEmpty()) {
             return null;
         }
-        if (!isHudiTable(session, table.get())) {
-            throw new TrinoException(HUDI_UNKNOWN_TABLE_TYPE, format("Not a Hudi table: %s", tableName));
+        if (!isHudiTable(table.get())) {
+            throw new TrinoException(UNSUPPORTED_TABLE_TYPE, format("Not a Hudi table: %s", tableName));
+        }
+        Location location = Location.of(table.get().getStorage().getLocation());
+        if (!hudiMetadataExists(fileSystemFactory.create(session), location)) {
+            throw new TrinoException(HUDI_BAD_DATA, "Location of table %s does not contain Hudi table metadata: %s".formatted(tableName, location));
         }
+
         return new HudiTableHandle(
                 tableName.getSchemaName(),
                 tableName.getTableName(),
                 table.get().getStorage().getLocation(),
-                HoodieTableType.COPY_ON_WRITE,
+                COPY_ON_WRITE,
                 TupleDomain.all(),
                 TupleDomain.all());
     }
@@ -121,11 +121,11 @@ public HudiTableHandle getTableHandle(ConnectorSession session, SchemaTableName
     @Override
     public Optional<SystemTable> getSystemTable(ConnectorSession session, SchemaTableName tableName)
     {
-        return getRawSystemTable(session, tableName)
+        return getRawSystemTable(tableName, session)
                 .map(systemTable -> new ClassLoaderSafeSystemTable(systemTable, getClass().getClassLoader()));
     }
 
-    private Optional<SystemTable> getRawSystemTable(ConnectorSession session, SchemaTableName tableName)
+    private Optional<SystemTable> getRawSystemTable(SchemaTableName tableName, ConnectorSession session)
     {
         HudiTableName name = HudiTableName.from(tableName.getTableName());
         if (name.getTableType() == TableType.DATA) {
@@ -136,15 +136,18 @@ private Optional<SystemTable> getRawSystemTable(ConnectorSession session, Schema
         if (tableOptional.isEmpty()) {
             return Optional.empty();
         }
-        switch (name.getTableType()) {
-            case DATA:
-                break;
-            case TIMELINE:
-                SchemaTableName systemTableName = new SchemaTableName(tableName.getSchemaName(), name.getTableNameWithType());
-                Configuration configuration = hdfsEnvironment.getConfiguration(new HdfsContext(session), new Path(tableOptional.get().getStorage().getLocation()));
-                return Optional.of(new TimelineTable(configuration, systemTableName, tableOptional.get()));
+        if (!isHudiTable(tableOptional.get())) {
+            return Optional.empty();
         }
-        return Optional.empty();
+        return switch (name.getTableType()) {
+            case DATA ->
+                // TODO (https://github.com/trinodb/trino/issues/17973) remove DATA table type
+                    Optional.empty();
+            case TIMELINE -> {
+                SchemaTableName systemTableName = new SchemaTableName(tableName.getSchemaName(), name.getTableNameWithType());
+                yield Optional.of(new TimelineTable(fileSystemFactory.create(session), systemTableName, tableOptional.get()));
+            }
+        };
     }
 
     @Override
@@ -225,20 +228,6 @@ HiveMetastore getMetastore()
         return metastore;
     }
 
-    private boolean isHudiTable(ConnectorSession session, Table table)
-    {
-        String basePath = table.getStorage().getLocation();
-        Configuration configuration = hdfsEnvironment.getConfiguration(new HdfsContext(session), new Path(basePath));
-        try {
-            checkTableValidity(getFs(basePath, configuration), new Path(basePath), new Path(basePath, METAFOLDER_NAME));
-        }
-        catch (org.apache.hudi.exception.TableNotFoundException e) {
-            log.warn("Could not find Hudi table at path '%s'", basePath);
-            return false;
-        }
-        return true;
-    }
-
     private Optional<TableColumnsMetadata> getTableColumnMetadata(ConnectorSession session, SchemaTableName table)
     {
         try {
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadataFactory.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadataFactory.java
index bb1a4832bc9e..103dfda0b619 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadataFactory.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadataFactory.java
@@ -13,35 +13,40 @@
  */
 package io.trino.plugin.hudi;
 
-import io.trino.hdfs.HdfsEnvironment;
-import io.trino.plugin.hive.metastore.HiveMetastore;
+import com.google.inject.Inject;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
+import io.trino.plugin.hive.metastore.cache.CachingHiveMetastore;
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
+import static io.trino.plugin.hive.metastore.cache.CachingHiveMetastore.memoizeMetastore;
 import static java.util.Objects.requireNonNull;
 
 public class HudiMetadataFactory
 {
     private final HiveMetastoreFactory metastoreFactory;
-    private final HdfsEnvironment hdfsEnvironment;
+    private final TrinoFileSystemFactory fileSystemFactory;
     private final TypeManager typeManager;
+    private final long perTransactionMetastoreCacheMaximumSize;
 
     @Inject
-    public HudiMetadataFactory(HiveMetastoreFactory metastoreFactory, HdfsEnvironment hdfsEnvironment, TypeManager typeManager)
+    public HudiMetadataFactory(HiveMetastoreFactory metastoreFactory, TrinoFileSystemFactory fileSystemFactory, TypeManager typeManager, HudiConfig hudiConfig)
     {
         this.metastoreFactory = requireNonNull(metastoreFactory, "metastore is null");
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.perTransactionMetastoreCacheMaximumSize = hudiConfig.getPerTransactionMetastoreCacheMaximumSize();
     }
 
     public HudiMetadata create(ConnectorIdentity identity)
     {
-        HiveMetastore metastore = metastoreFactory.createMetastore(Optional.of(identity));
-        return new HudiMetadata(metastore, hdfsEnvironment, typeManager);
+        // create per-transaction cache over hive metastore interface
+        CachingHiveMetastore cachingHiveMetastore = memoizeMetastore(
+                metastoreFactory.createMetastore(Optional.of(identity)),
+                perTransactionMetastoreCacheMaximumSize);
+        return new HudiMetadata(cachingHiveMetastore, fileSystemFactory, typeManager);
     }
 }
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiModule.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiModule.java
index 52bd1f7028c2..279e395a986c 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiModule.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiModule.java
@@ -18,6 +18,7 @@
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.HiveNodePartitioningProvider;
@@ -32,15 +33,15 @@
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.security.ConnectorIdentity;
 
-import javax.inject.Singleton;
-
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.BiFunction;
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static java.util.concurrent.Executors.newCachedThreadPool;
+import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static org.weakref.jmx.guice.ExportBinder.newExporter;
 
 public class HudiModule
@@ -65,22 +66,33 @@ public void configure(Binder binder)
         configBinder(binder).bindConfig(ParquetReaderConfig.class);
         configBinder(binder).bindConfig(ParquetWriterConfig.class);
 
+        binder.bind(HudiPartitionManager.class).in(Scopes.SINGLETON);
         binder.bind(HudiMetadataFactory.class).in(Scopes.SINGLETON);
 
         binder.bind(FileFormatDataSourceStats.class).in(Scopes.SINGLETON);
         newExporter(binder).export(FileFormatDataSourceStats.class).withGeneratedName();
     }
 
-    @ForHudiSplitManager
-    @Singleton
     @Provides
+    @Singleton
+    @ForHudiSplitManager
     public ExecutorService createExecutorService()
     {
-        return newCachedThreadPool(daemonThreadsNamed("hudi-split-manager-%d"));
+        return newCachedThreadPool(daemonThreadsNamed("hudi-split-manager-%s"));
     }
 
+    @Provides
     @Singleton
+    @ForHudiSplitSource
+    public ScheduledExecutorService createSplitLoaderExecutor(HudiConfig hudiConfig)
+    {
+        return newScheduledThreadPool(
+                hudiConfig.getSplitLoaderParallelism(),
+                daemonThreadsNamed("hudi-split-loader-%s"));
+    }
+
     @Provides
+    @Singleton
     public BiFunction<ConnectorIdentity, HiveTransactionHandle, HiveMetastore> createHiveMetastoreGetter(HudiTransactionManager transactionManager)
     {
         return (identity, transactionHandle) ->
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPageSource.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPageSource.java
index 45db0165c471..9c2edec73309 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPageSource.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPageSource.java
@@ -18,7 +18,6 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.connector.ConnectorPageSource;
-import org.apache.hadoop.fs.Path;
 
 import java.io.IOException;
 import java.util.List;
@@ -51,7 +50,7 @@ public HudiPageSource(
             List<HiveColumnHandle> columnHandles,
             Map<String, Block> partitionBlocks,
             ConnectorPageSource dataPageSource,
-            Path path,
+            String path,
             long fileSize,
             long fileModifiedTime)
     {
@@ -76,7 +75,7 @@ else if (column.getName().equals(PARTITION_COLUMN_NAME)) {
                 delegateIndexes[outputIndex] = -1;
             }
             else if (column.getName().equals(PATH_COLUMN_NAME)) {
-                prefilledBlocks[outputIndex] = nativeValueToBlock(PATH_TYPE, utf8Slice(path.toString()));
+                prefilledBlocks[outputIndex] = nativeValueToBlock(PATH_TYPE, utf8Slice(path));
                 delegateIndexes[outputIndex] = -1;
             }
             else if (column.getName().equals(FILE_SIZE_COLUMN_NAME)) {
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPageSourceProvider.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPageSourceProvider.java
index a1dcf5ebddaf..93b0e3c5af02 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPageSourceProvider.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPageSourceProvider.java
@@ -14,9 +14,12 @@
 package io.trino.plugin.hudi;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
+import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.parquet.ParquetCorruptionException;
 import io.trino.parquet.ParquetDataSource;
 import io.trino.parquet.ParquetDataSourceId;
@@ -29,7 +32,7 @@
 import io.trino.plugin.hive.HivePartitionKey;
 import io.trino.plugin.hive.ReaderColumns;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
-import io.trino.plugin.hive.parquet.TrinoParquetDataSource;
+import io.trino.plugin.hudi.model.HudiFileFormat;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.connector.ColumnHandle;
@@ -43,8 +46,6 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Decimals;
 import io.trino.spi.type.TypeSignature;
-import org.apache.hadoop.fs.Path;
-import org.apache.hudi.common.model.HoodieFileFormat;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.hadoop.metadata.BlockMetaData;
 import org.apache.parquet.hadoop.metadata.FileMetaData;
@@ -54,8 +55,6 @@
 import org.apache.parquet.schema.MessageType;
 import org.joda.time.DateTimeZone;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.time.LocalDate;
@@ -65,6 +64,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.TimeZone;
 import java.util.stream.Collectors;
 
@@ -77,6 +77,7 @@
 import static io.trino.parquet.predicate.PredicateUtils.predicateMatches;
 import static io.trino.plugin.hive.HivePageSourceProvider.projectBaseColumns;
 import static io.trino.plugin.hive.parquet.ParquetPageSourceFactory.ParquetReaderProvider;
+import static io.trino.plugin.hive.parquet.ParquetPageSourceFactory.createDataSource;
 import static io.trino.plugin.hive.parquet.ParquetPageSourceFactory.createParquetPageSource;
 import static io.trino.plugin.hive.parquet.ParquetPageSourceFactory.getColumnIndexStore;
 import static io.trino.plugin.hive.parquet.ParquetPageSourceFactory.getParquetMessageType;
@@ -87,8 +88,7 @@
 import static io.trino.plugin.hudi.HudiErrorCode.HUDI_CURSOR_ERROR;
 import static io.trino.plugin.hudi.HudiErrorCode.HUDI_INVALID_PARTITION_VALUE;
 import static io.trino.plugin.hudi.HudiErrorCode.HUDI_UNSUPPORTED_FILE_FORMAT;
-import static io.trino.plugin.hudi.HudiSessionProperties.isParquetOptimizedNestedReaderEnabled;
-import static io.trino.plugin.hudi.HudiSessionProperties.isParquetOptimizedReaderEnabled;
+import static io.trino.plugin.hudi.HudiSessionProperties.getParquetSmallFileThreshold;
 import static io.trino.plugin.hudi.HudiSessionProperties.shouldUseParquetColumnNames;
 import static io.trino.plugin.hudi.HudiUtil.getHudiFileFormat;
 import static io.trino.spi.predicate.Utils.nativeValueToBlock;
@@ -146,9 +146,9 @@ public ConnectorPageSource createPageSource(
             DynamicFilter dynamicFilter)
     {
         HudiSplit split = (HudiSplit) connectorSplit;
-        Path path = new Path(split.getPath());
-        HoodieFileFormat hudiFileFormat = getHudiFileFormat(path.toString());
-        if (!HoodieFileFormat.PARQUET.equals(hudiFileFormat)) {
+        String path = split.getLocation();
+        HudiFileFormat hudiFileFormat = getHudiFileFormat(path);
+        if (!HudiFileFormat.PARQUET.equals(hudiFileFormat)) {
             throw new TrinoException(HUDI_UNSUPPORTED_FILE_FORMAT, format("File format %s not supported", hudiFileFormat));
         }
 
@@ -161,8 +161,15 @@ public ConnectorPageSource createPageSource(
                 .filter(columnHandle -> !columnHandle.isPartitionKey() && !columnHandle.isHidden())
                 .collect(Collectors.toList());
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-        TrinoInputFile inputFile = fileSystem.newInputFile(path.toString(), split.getFileSize());
-        ConnectorPageSource dataPageSource = createPageSource(session, regularColumns, split, inputFile, dataSourceStats, options, timeZone);
+        TrinoInputFile inputFile = fileSystem.newInputFile(Location.of(path), split.getFileSize());
+        ConnectorPageSource dataPageSource = createPageSource(
+                session,
+                regularColumns,
+                split,
+                inputFile,
+                dataSourceStats,
+                options.withSmallFileThreshold(getParquetSmallFileThreshold(session)),
+                timeZone);
 
         return new HudiPageSource(
                 toPartitionName(split.getPartitionKeys()),
@@ -185,11 +192,12 @@ private static ConnectorPageSource createPageSource(
     {
         ParquetDataSource dataSource = null;
         boolean useColumnNames = shouldUseParquetColumnNames(session);
-        Path path = new Path(hudiSplit.getPath());
+        String path = hudiSplit.getLocation();
         long start = hudiSplit.getStart();
         long length = hudiSplit.getLength();
         try {
-            dataSource = new TrinoParquetDataSource(inputFile, options, dataSourceStats);
+            AggregatedMemoryContext memoryContext = newSimpleAggregatedMemoryContext();
+            dataSource = createDataSource(inputFile, OptionalLong.of(hudiSplit.getFileSize()), options, memoryContext, dataSourceStats);
             ParquetMetadata parquetMetadata = MetadataReader.readFooter(dataSource, Optional.empty());
             FileMetaData fileMetaData = parquetMetadata.getFileMetaData();
             MessageType fileSchema = fileMetaData.getSchema();
@@ -237,9 +245,8 @@ && predicateMatches(parquetPredicate, block, dataSource, descriptorsByPath, parq
                     blockStarts.build(),
                     finalDataSource,
                     timeZone,
-                    newSimpleAggregatedMemoryContext(),
-                    options.withBatchColumnReaders(isParquetOptimizedReaderEnabled(session))
-                            .withBatchNestedColumnReaders(isParquetOptimizedNestedReaderEnabled(session)),
+                    memoryContext,
+                    options,
                     exception -> handleException(dataSourceId, exception),
                     Optional.of(parquetPredicate),
                     columnIndexes.build(),
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPartitionManager.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPartitionManager.java
new file mode 100644
index 000000000000..089de797a342
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPartitionManager.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import io.trino.plugin.hive.HiveColumnHandle;
+import io.trino.plugin.hive.metastore.Column;
+import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.hive.metastore.Table;
+import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.type.TypeManager;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static io.trino.plugin.hive.metastore.MetastoreUtil.computePartitionKeyFilter;
+import static io.trino.plugin.hive.util.HiveUtil.getPartitionKeyColumnHandles;
+import static java.util.Objects.requireNonNull;
+
+public class HudiPartitionManager
+{
+    private final TypeManager typeManager;
+
+    @Inject
+    public HudiPartitionManager(TypeManager typeManager)
+    {
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+    }
+
+    public List<String> getEffectivePartitions(HudiTableHandle tableHandle, HiveMetastore metastore)
+    {
+        Table table = metastore.getTable(tableHandle.getSchemaName(), tableHandle.getTableName())
+                .orElseThrow(() -> new TableNotFoundException(tableHandle.getSchemaTableName()));
+        List<Column> partitionColumns = table.getPartitionColumns();
+        if (partitionColumns.isEmpty()) {
+            return ImmutableList.of("");
+        }
+
+        List<HiveColumnHandle> partitionColumnHandles = getPartitionKeyColumnHandles(table, typeManager);
+
+        return metastore.getPartitionNamesByFilter(
+                        tableHandle.getSchemaName(),
+                        tableHandle.getTableName(),
+                        partitionColumns.stream().map(Column::getName).collect(Collectors.toList()),
+                        computePartitionKeyFilter(partitionColumnHandles, tableHandle.getPartitionPredicates()))
+                .orElseThrow(() -> new TableNotFoundException(tableHandle.getSchemaTableName()));
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSessionProperties.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSessionProperties.java
index fc67ef24bb84..ede43ec3386b 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSessionProperties.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSessionProperties.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hudi;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
@@ -22,13 +23,13 @@
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.plugin.base.session.PropertyMetadataUtil.dataSizeProperty;
+import static io.trino.plugin.base.session.PropertyMetadataUtil.validateMaxDataSize;
+import static io.trino.plugin.hive.parquet.ParquetReaderConfig.PARQUET_READER_MAX_SMALL_FILE_THRESHOLD;
 import static io.trino.spi.StandardErrorCode.INVALID_SESSION_PROPERTY;
 import static io.trino.spi.session.PropertyMetadata.booleanProperty;
 import static io.trino.spi.session.PropertyMetadata.doubleProperty;
@@ -41,15 +42,14 @@ public class HudiSessionProperties
         implements SessionPropertiesProvider
 {
     private static final String COLUMNS_TO_HIDE = "columns_to_hide";
-    private static final String METADATA_ENABLED = "metadata_enabled";
     private static final String USE_PARQUET_COLUMN_NAMES = "use_parquet_column_names";
-    private static final String PARQUET_OPTIMIZED_READER_ENABLED = "parquet_optimized_reader_enabled";
-    private static final String PARQUET_OPTIMIZED_NESTED_READER_ENABLED = "parquet_optimized_nested_reader_enabled";
-    private static final String MIN_PARTITION_BATCH_SIZE = "min_partition_batch_size";
-    private static final String MAX_PARTITION_BATCH_SIZE = "max_partition_batch_size";
+    private static final String PARQUET_SMALL_FILE_THRESHOLD = "parquet_small_file_threshold";
     private static final String SIZE_BASED_SPLIT_WEIGHTS_ENABLED = "size_based_split_weights_enabled";
     private static final String STANDARD_SPLIT_WEIGHT_SIZE = "standard_split_weight_size";
     private static final String MINIMUM_ASSIGNED_SPLIT_WEIGHT = "minimum_assigned_split_weight";
+    private static final String MAX_SPLITS_PER_SECOND = "max_splits_per_second";
+    private static final String MAX_OUTSTANDING_SPLITS = "max_outstanding_splits";
+    private static final String SPLIT_GENERATOR_PARALLELISM = "split_generator_parallelism";
 
     private final List<PropertyMetadata<?>> sessionProperties;
 
@@ -68,35 +68,16 @@ public HudiSessionProperties(HudiConfig hudiConfig, ParquetReaderConfig parquetR
                                 .map(name -> ((String) name).toLowerCase(ENGLISH))
                                 .collect(toImmutableList()),
                         value -> value),
-                booleanProperty(
-                        METADATA_ENABLED,
-                        "For Hudi tables prefer to fetch the list of files from its metadata",
-                        hudiConfig.isMetadataEnabled(),
-                        false),
                 booleanProperty(
                         USE_PARQUET_COLUMN_NAMES,
                         "Access parquet columns using names from the file. If disabled, then columns are accessed using index.",
                         hudiConfig.getUseParquetColumnNames(),
                         false),
-                booleanProperty(
-                        PARQUET_OPTIMIZED_READER_ENABLED,
-                        "Use optimized Parquet reader",
-                        parquetReaderConfig.isOptimizedReaderEnabled(),
-                        false),
-                booleanProperty(
-                        PARQUET_OPTIMIZED_NESTED_READER_ENABLED,
-                        "Use optimized Parquet reader for nested columns",
-                        parquetReaderConfig.isOptimizedNestedReaderEnabled(),
-                        false),
-                integerProperty(
-                        MIN_PARTITION_BATCH_SIZE,
-                        "Minimum number of partitions returned in a single batch.",
-                        hudiConfig.getMinPartitionBatchSize(),
-                        false),
-                integerProperty(
-                        MAX_PARTITION_BATCH_SIZE,
-                        "Maximum number of partitions returned in a single batch.",
-                        hudiConfig.getMaxPartitionBatchSize(),
+                dataSizeProperty(
+                        PARQUET_SMALL_FILE_THRESHOLD,
+                        "Parquet: Size below which a parquet file will be read entirely",
+                        parquetReaderConfig.getSmallFileThreshold(),
+                        value -> validateMaxDataSize(PARQUET_SMALL_FILE_THRESHOLD, value, DataSize.valueOf(PARQUET_READER_MAX_SMALL_FILE_THRESHOLD)),
                         false),
                 booleanProperty(
                         SIZE_BASED_SPLIT_WEIGHTS_ENABLED,
@@ -117,6 +98,21 @@ public HudiSessionProperties(HudiConfig hudiConfig, ParquetReaderConfig parquetR
                                 throw new TrinoException(INVALID_SESSION_PROPERTY, format("%s must be > 0 and <= 1.0: %s", MINIMUM_ASSIGNED_SPLIT_WEIGHT, value));
                             }
                         },
+                        false),
+                integerProperty(
+                        MAX_SPLITS_PER_SECOND,
+                        "Rate at which splits are enqueued for processing. The queue will throttle if this rate limit is breached.",
+                        hudiConfig.getMaxSplitsPerSecond(),
+                        false),
+                integerProperty(
+                        MAX_OUTSTANDING_SPLITS,
+                        "Maximum outstanding splits in a batch enqueued for processing",
+                        hudiConfig.getMaxOutstandingSplits(),
+                        false),
+                integerProperty(
+                        SPLIT_GENERATOR_PARALLELISM,
+                        "Number of threads to generate splits from partitions",
+                        hudiConfig.getSplitGeneratorParallelism(),
                         false));
     }
 
@@ -132,48 +128,43 @@ public static List<String> getColumnsToHide(ConnectorSession session)
         return (List<String>) session.getProperty(COLUMNS_TO_HIDE, List.class);
     }
 
-    public static boolean isHudiMetadataEnabled(ConnectorSession session)
-    {
-        return session.getProperty(METADATA_ENABLED, Boolean.class);
-    }
-
     public static boolean shouldUseParquetColumnNames(ConnectorSession session)
     {
         return session.getProperty(USE_PARQUET_COLUMN_NAMES, Boolean.class);
     }
 
-    public static boolean isParquetOptimizedReaderEnabled(ConnectorSession session)
+    public static DataSize getParquetSmallFileThreshold(ConnectorSession session)
     {
-        return session.getProperty(PARQUET_OPTIMIZED_READER_ENABLED, Boolean.class);
+        return session.getProperty(PARQUET_SMALL_FILE_THRESHOLD, DataSize.class);
     }
 
-    public static boolean isParquetOptimizedNestedReaderEnabled(ConnectorSession session)
+    public static boolean isSizeBasedSplitWeightsEnabled(ConnectorSession session)
     {
-        return session.getProperty(PARQUET_OPTIMIZED_NESTED_READER_ENABLED, Boolean.class);
+        return session.getProperty(SIZE_BASED_SPLIT_WEIGHTS_ENABLED, Boolean.class);
     }
 
-    public static int getMinPartitionBatchSize(ConnectorSession session)
+    public static DataSize getStandardSplitWeightSize(ConnectorSession session)
     {
-        return session.getProperty(MIN_PARTITION_BATCH_SIZE, Integer.class);
+        return session.getProperty(STANDARD_SPLIT_WEIGHT_SIZE, DataSize.class);
     }
 
-    public static int getMaxPartitionBatchSize(ConnectorSession session)
+    public static double getMinimumAssignedSplitWeight(ConnectorSession session)
     {
-        return session.getProperty(MAX_PARTITION_BATCH_SIZE, Integer.class);
+        return session.getProperty(MINIMUM_ASSIGNED_SPLIT_WEIGHT, Double.class);
     }
 
-    public static boolean isSizeBasedSplitWeightsEnabled(ConnectorSession session)
+    public static int getMaxSplitsPerSecond(ConnectorSession session)
     {
-        return session.getProperty(SIZE_BASED_SPLIT_WEIGHTS_ENABLED, Boolean.class);
+        return session.getProperty(MAX_SPLITS_PER_SECOND, Integer.class);
     }
 
-    public static DataSize getStandardSplitWeightSize(ConnectorSession session)
+    public static int getMaxOutstandingSplits(ConnectorSession session)
     {
-        return session.getProperty(STANDARD_SPLIT_WEIGHT_SIZE, DataSize.class);
+        return session.getProperty(MAX_OUTSTANDING_SPLITS, Integer.class);
     }
 
-    public static double getMinimumAssignedSplitWeight(ConnectorSession session)
+    public static int getSplitGeneratorParallelism(ConnectorSession session)
     {
-        return session.getProperty(MINIMUM_ASSIGNED_SPLIT_WEIGHT, Double.class);
+        return session.getProperty(SPLIT_GENERATOR_PARALLELISM, Integer.class);
     }
 }
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSplit.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSplit.java
index 0081e35fa7d1..834515df1c7c 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSplit.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSplit.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.hudi;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -28,29 +29,32 @@
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.airlift.slice.SizeOf.estimatedSizeOf;
+import static io.airlift.slice.SizeOf.instanceSize;
+import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
 public class HudiSplit
         implements ConnectorSplit
 {
-    private final String path;
+    private static final int INSTANCE_SIZE = toIntExact(instanceSize(HudiSplit.class));
+
+    private final String location;
     private final long start;
     private final long length;
     private final long fileSize;
     private final long fileModifiedTime;
-    private final List<HostAddress> addresses;
     private final TupleDomain<HiveColumnHandle> predicate;
     private final List<HivePartitionKey> partitionKeys;
     private final SplitWeight splitWeight;
 
     @JsonCreator
     public HudiSplit(
-            @JsonProperty("path") String path,
+            @JsonProperty("location") String location,
             @JsonProperty("start") long start,
             @JsonProperty("length") long length,
             @JsonProperty("fileSize") long fileSize,
             @JsonProperty("fileModifiedTime") long fileModifiedTime,
-            @JsonProperty("addresses") List<HostAddress> addresses,
             @JsonProperty("predicate") TupleDomain<HiveColumnHandle> predicate,
             @JsonProperty("partitionKeys") List<HivePartitionKey> partitionKeys,
             @JsonProperty("splitWeight") SplitWeight splitWeight)
@@ -59,12 +63,11 @@ public HudiSplit(
         checkArgument(length >= 0, "length must be positive");
         checkArgument(start + length <= fileSize, "fileSize must be at least start + length");
 
-        this.path = requireNonNull(path, "path is null");
+        this.location = requireNonNull(location, "location is null");
         this.start = start;
         this.length = length;
         this.fileSize = fileSize;
         this.fileModifiedTime = fileModifiedTime;
-        this.addresses = ImmutableList.copyOf(requireNonNull(addresses, "addresses is null"));
         this.predicate = requireNonNull(predicate, "predicate is null");
         this.partitionKeys = ImmutableList.copyOf(requireNonNull(partitionKeys, "partitionKeys is null"));
         this.splitWeight = requireNonNull(splitWeight, "splitWeight is null");
@@ -76,18 +79,18 @@ public boolean isRemotelyAccessible()
         return true;
     }
 
-    @JsonProperty
+    @JsonIgnore
     @Override
     public List<HostAddress> getAddresses()
     {
-        return addresses;
+        return ImmutableList.of();
     }
 
     @Override
     public Object getInfo()
     {
         return ImmutableMap.builder()
-                .put("path", path)
+                .put("location", location)
                 .put("start", start)
                 .put("length", length)
                 .put("fileSize", fileSize)
@@ -103,9 +106,9 @@ public SplitWeight getSplitWeight()
     }
 
     @JsonProperty
-    public String getPath()
+    public String getLocation()
     {
-        return path;
+        return location;
     }
 
     @JsonProperty
@@ -144,11 +147,21 @@ public List<HivePartitionKey> getPartitionKeys()
         return partitionKeys;
     }
 
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE
+                + estimatedSizeOf(location)
+                + splitWeight.getRetainedSizeInBytes()
+                + predicate.getRetainedSizeInBytes(HiveColumnHandle::getRetainedSizeInBytes)
+                + estimatedSizeOf(partitionKeys, HivePartitionKey::getEstimatedSizeInBytes);
+    }
+
     @Override
     public String toString()
     {
         return toStringHelper(this)
-                .addValue(path)
+                .addValue(location)
                 .addValue(start)
                 .addValue(length)
                 .addValue(fileSize)
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSplitManager.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSplitManager.java
index 34afd7e042f3..8b87e0245037 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSplitManager.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSplitManager.java
@@ -13,8 +13,8 @@
  */
 package io.trino.plugin.hudi;
 
-import io.trino.hdfs.HdfsContext;
-import io.trino.hdfs.HdfsEnvironment;
+import com.google.inject.Inject;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorSplitSource;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.HiveTransactionHandle;
@@ -29,16 +29,17 @@
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.security.ConnectorIdentity;
-import org.apache.hadoop.fs.Path;
-
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
 
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.BiFunction;
 
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static io.trino.plugin.hudi.HudiSessionProperties.getMaxOutstandingSplits;
+import static io.trino.plugin.hudi.HudiSessionProperties.getMaxSplitsPerSecond;
 import static io.trino.spi.connector.SchemaTableName.schemaTableName;
 import static java.util.Objects.requireNonNull;
 import static java.util.function.Function.identity;
@@ -47,26 +48,27 @@ public class HudiSplitManager
         implements ConnectorSplitManager
 {
     private final HudiTransactionManager transactionManager;
+    private final HudiPartitionManager partitionManager;
     private final BiFunction<ConnectorIdentity, HiveTransactionHandle, HiveMetastore> metastoreProvider;
-    private final HdfsEnvironment hdfsEnvironment;
+    private final TrinoFileSystemFactory fileSystemFactory;
     private final ExecutorService executor;
-    private final int maxSplitsPerSecond;
-    private final int maxOutstandingSplits;
+    private final ScheduledExecutorService splitLoaderExecutorService;
 
     @Inject
     public HudiSplitManager(
             HudiTransactionManager transactionManager,
+            HudiPartitionManager partitionManager,
             BiFunction<ConnectorIdentity, HiveTransactionHandle, HiveMetastore> metastoreProvider,
-            HdfsEnvironment hdfsEnvironment,
             @ForHudiSplitManager ExecutorService executor,
-            HudiConfig hudiConfig)
+            TrinoFileSystemFactory fileSystemFactory,
+            @ForHudiSplitSource ScheduledExecutorService splitLoaderExecutorService)
     {
         this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
+        this.partitionManager = requireNonNull(partitionManager, "partitionManager is null");
         this.metastoreProvider = requireNonNull(metastoreProvider, "metastoreProvider is null");
-        this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null");
         this.executor = requireNonNull(executor, "executor is null");
-        this.maxSplitsPerSecond = requireNonNull(hudiConfig, "hudiConfig is null").getMaxSplitsPerSecond();
-        this.maxOutstandingSplits = hudiConfig.getMaxOutstandingSplits();
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
+        this.splitLoaderExecutorService = requireNonNull(splitLoaderExecutorService, "splitLoaderExecutorService is null");
     }
 
     @PreDestroy
@@ -92,16 +94,20 @@ public ConnectorSplitSource getSplits(
         HiveMetastore metastore = metastoreProvider.apply(session.getIdentity(), (HiveTransactionHandle) transaction);
         Table table = metastore.getTable(hudiTableHandle.getSchemaName(), hudiTableHandle.getTableName())
                 .orElseThrow(() -> new TableNotFoundException(schemaTableName(hudiTableHandle.getSchemaName(), hudiTableHandle.getTableName())));
+        List<String> partitions = partitionManager.getEffectivePartitions(hudiTableHandle, metastore);
+
         HudiSplitSource splitSource = new HudiSplitSource(
                 session,
                 metastore,
                 table,
                 hudiTableHandle,
-                hdfsEnvironment.getConfiguration(new HdfsContext(session), new Path(table.getStorage().getLocation())),
+                fileSystemFactory,
                 partitionColumnHandles,
                 executor,
-                maxSplitsPerSecond,
-                maxOutstandingSplits);
+                splitLoaderExecutorService,
+                getMaxSplitsPerSecond(session),
+                getMaxOutstandingSplits(session),
+                partitions);
         return new ClassLoaderSafeConnectorSplitSource(splitSource, HudiSplitManager.class.getClassLoader());
     }
 }
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSplitSource.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSplitSource.java
index c2666a9287cd..ad3aae7e6717 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSplitSource.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSplitSource.java
@@ -14,7 +14,9 @@
 package io.trino.plugin.hudi;
 
 import com.google.common.util.concurrent.Futures;
+import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.units.DataSize;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.Table;
@@ -25,36 +27,35 @@
 import io.trino.plugin.hudi.split.HudiBackgroundSplitLoader;
 import io.trino.plugin.hudi.split.HudiSplitWeightProvider;
 import io.trino.plugin.hudi.split.SizeBasedSplitWeightProvider;
+import io.trino.plugin.hudi.table.HudiTableMetaClient;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.connector.ConnectorSplitSource;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hudi.common.config.HoodieMetadataConfig;
-import org.apache.hudi.common.engine.HoodieEngineContext;
-import org.apache.hudi.common.engine.HoodieLocalEngineContext;
-import org.apache.hudi.common.table.HoodieTableMetaClient;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static io.airlift.concurrent.MoreFutures.toCompletableFuture;
 import static io.trino.plugin.hudi.HudiSessionProperties.getMinimumAssignedSplitWeight;
+import static io.trino.plugin.hudi.HudiSessionProperties.getSplitGeneratorParallelism;
 import static io.trino.plugin.hudi.HudiSessionProperties.getStandardSplitWeightSize;
-import static io.trino.plugin.hudi.HudiSessionProperties.isHudiMetadataEnabled;
 import static io.trino.plugin.hudi.HudiSessionProperties.isSizeBasedSplitWeightsEnabled;
 import static io.trino.plugin.hudi.HudiUtil.buildTableMetaClient;
-import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static java.util.stream.Collectors.toList;
 
 public class HudiSplitSource
         implements ConnectorSplitSource
 {
     private final AsyncQueue<ConnectorSplit> queue;
+    private final ScheduledFuture splitLoaderFuture;
     private final AtomicReference<TrinoException> trinoException = new AtomicReference<>();
 
     public HudiSplitSource(
@@ -62,29 +63,25 @@ public HudiSplitSource(
             HiveMetastore metastore,
             Table table,
             HudiTableHandle tableHandle,
-            Configuration configuration,
+            TrinoFileSystemFactory fileSystemFactory,
             Map<String, HiveColumnHandle> partitionColumnHandleMap,
             ExecutorService executor,
+            ScheduledExecutorService splitLoaderExecutorService,
             int maxSplitsPerSecond,
-            int maxOutstandingSplits)
+            int maxOutstandingSplits,
+            List<String> partitions)
     {
-        boolean metadataEnabled = isHudiMetadataEnabled(session);
-        HoodieTableMetaClient metaClient = buildTableMetaClient(configuration, tableHandle.getBasePath());
-        HoodieEngineContext engineContext = new HoodieLocalEngineContext(configuration);
-        HoodieMetadataConfig metadataConfig = HoodieMetadataConfig.newBuilder()
-                .enable(metadataEnabled)
-                .build();
+        HudiTableMetaClient metaClient = buildTableMetaClient(fileSystemFactory.create(session), tableHandle.getBasePath());
         List<HiveColumnHandle> partitionColumnHandles = table.getPartitionColumns().stream()
                 .map(column -> partitionColumnHandleMap.get(column.getName())).collect(toList());
 
         HudiDirectoryLister hudiDirectoryLister = new HudiReadOptimizedDirectoryLister(
-                metadataConfig,
-                engineContext,
                 tableHandle,
                 metaClient,
                 metastore,
                 table,
-                partitionColumnHandles);
+                partitionColumnHandles,
+                partitions);
 
         this.queue = new ThrottledAsyncQueue<>(maxSplitsPerSecond, maxOutstandingSplits, executor);
         HudiBackgroundSplitLoader splitLoader = new HudiBackgroundSplitLoader(
@@ -92,14 +89,10 @@ public HudiSplitSource(
                 tableHandle,
                 hudiDirectoryLister,
                 queue,
-                executor,
+                new BoundedExecutor(executor, getSplitGeneratorParallelism(session)),
                 createSplitWeightProvider(session),
-                throwable -> {
-                    trinoException.compareAndSet(null, new TrinoException(GENERIC_INTERNAL_ERROR,
-                            "Failed to generate splits for " + table.getTableName(), throwable));
-                    queue.finish();
-                });
-        splitLoader.start();
+                partitions);
+        this.splitLoaderFuture = splitLoaderExecutorService.schedule(splitLoader, 0, TimeUnit.MILLISECONDS);
     }
 
     @Override
@@ -126,7 +119,7 @@ public void close()
     @Override
     public boolean isFinished()
     {
-        return queue.isFinished();
+        return splitLoaderFuture.isDone() && queue.isFinished();
     }
 
     private static HudiSplitWeightProvider createSplitWeightProvider(ConnectorSession session)
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiTableHandle.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiTableHandle.java
index 7b092288fc68..0da9f2d897a7 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiTableHandle.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiTableHandle.java
@@ -16,10 +16,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.plugin.hive.HiveColumnHandle;
+import io.trino.plugin.hudi.model.HudiTableType;
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.TupleDomain;
-import org.apache.hudi.common.model.HoodieTableType;
 
 import static io.trino.spi.connector.SchemaTableName.schemaTableName;
 import static java.util.Objects.requireNonNull;
@@ -30,7 +30,7 @@ public class HudiTableHandle
     private final String schemaName;
     private final String tableName;
     private final String basePath;
-    private final HoodieTableType tableType;
+    private final HudiTableType tableType;
     private final TupleDomain<HiveColumnHandle> partitionPredicates;
     private final TupleDomain<HiveColumnHandle> regularPredicates;
 
@@ -39,7 +39,7 @@ public HudiTableHandle(
             @JsonProperty("schemaName") String schemaName,
             @JsonProperty("tableName") String tableName,
             @JsonProperty("basePath") String basePath,
-            @JsonProperty("tableType") HoodieTableType tableType,
+            @JsonProperty("tableType") HudiTableType tableType,
             @JsonProperty("partitionPredicates") TupleDomain<HiveColumnHandle> partitionPredicates,
             @JsonProperty("regularPredicates") TupleDomain<HiveColumnHandle> regularPredicates)
     {
@@ -70,7 +70,7 @@ public String getBasePath()
     }
 
     @JsonProperty
-    public HoodieTableType getTableType()
+    public HudiTableType getTableType()
     {
         return tableType;
     }
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiTableProperties.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiTableProperties.java
index 1eb014b20399..ddb2c01e8bc2 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiTableProperties.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiTableProperties.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.hudi;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiTransactionManager.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiTransactionManager.java
index 6bd2b9257e1e..5a66a91951b8 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiTransactionManager.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiTransactionManager.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.hudi;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.security.ConnectorIdentity;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiUtil.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiUtil.java
index 4976e7e3e539..b337fd1e4e7b 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiUtil.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiUtil.java
@@ -15,27 +15,21 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.HivePartition;
 import io.trino.plugin.hive.HivePartitionKey;
 import io.trino.plugin.hive.HivePartitionManager;
 import io.trino.plugin.hive.metastore.Column;
+import io.trino.plugin.hudi.model.HudiFileFormat;
+import io.trino.plugin.hudi.table.HudiTableMetaClient;
 import io.trino.spi.TrinoException;
-import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.type.Type;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.mapred.InputFormat;
-import org.apache.hudi.common.fs.FSUtils;
-import org.apache.hudi.common.model.HoodieBaseFile;
-import org.apache.hudi.common.model.HoodieFileFormat;
-import org.apache.hudi.common.table.HoodieTableMetaClient;
-import org.apache.hudi.hadoop.HoodieParquetInputFormat;
-import org.apache.hudi.hadoop.utils.HoodieInputFormatUtils;
 
 import java.io.IOException;
 import java.util.List;
@@ -43,87 +37,64 @@
 
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_METADATA;
 import static io.trino.plugin.hive.util.HiveUtil.checkCondition;
-import static io.trino.plugin.hive.util.HiveUtil.parsePartitionValue;
-import static io.trino.plugin.hudi.HudiErrorCode.HUDI_CANNOT_OPEN_SPLIT;
+import static io.trino.plugin.hudi.HudiErrorCode.HUDI_FILESYSTEM_ERROR;
 import static io.trino.plugin.hudi.HudiErrorCode.HUDI_UNSUPPORTED_FILE_FORMAT;
-import static java.util.stream.Collectors.toList;
+import static io.trino.plugin.hudi.table.HudiTableMetaClient.METAFOLDER_NAME;
 
 public final class HudiUtil
 {
     private HudiUtil() {}
 
-    public static boolean isHudiParquetInputFormat(InputFormat<?, ?> inputFormat)
+    public static HudiFileFormat getHudiFileFormat(String path)
     {
-        return inputFormat instanceof HoodieParquetInputFormat;
-    }
-
-    public static HoodieFileFormat getHudiFileFormat(String path)
-    {
-        final String extension = FSUtils.getFileExtension(path);
-        if (extension.equals(HoodieFileFormat.PARQUET.getFileExtension())) {
-            return HoodieFileFormat.PARQUET;
+        String extension = getFileExtension(path);
+        if (extension.equals(HudiFileFormat.PARQUET.getFileExtension())) {
+            return HudiFileFormat.PARQUET;
         }
-        if (extension.equals(HoodieFileFormat.HOODIE_LOG.getFileExtension())) {
-            return HoodieFileFormat.HOODIE_LOG;
+        if (extension.equals(HudiFileFormat.HOODIE_LOG.getFileExtension())) {
+            return HudiFileFormat.HOODIE_LOG;
         }
-        if (extension.equals(HoodieFileFormat.ORC.getFileExtension())) {
-            return HoodieFileFormat.ORC;
+        if (extension.equals(HudiFileFormat.ORC.getFileExtension())) {
+            return HudiFileFormat.ORC;
         }
-        if (extension.equals(HoodieFileFormat.HFILE.getFileExtension())) {
-            return HoodieFileFormat.HFILE;
+        if (extension.equals(HudiFileFormat.HFILE.getFileExtension())) {
+            return HudiFileFormat.HFILE;
         }
         throw new TrinoException(HUDI_UNSUPPORTED_FILE_FORMAT, "Hoodie InputFormat not implemented for base file of type " + extension);
     }
 
-    public static boolean partitionMatchesPredicates(
-            SchemaTableName tableName,
-            String hivePartitionName,
-            List<HiveColumnHandle> partitionColumnHandles,
-            TupleDomain<HiveColumnHandle> constraintSummary)
+    private static String getFileExtension(String fullName)
     {
-        List<Type> partitionColumnTypes = partitionColumnHandles.stream()
-                .map(HiveColumnHandle::getType)
-                .collect(toList());
-        HivePartition partition = HivePartitionManager.parsePartition(
-                tableName, hivePartitionName, partitionColumnHandles, partitionColumnTypes);
+        String fileName = Location.of(fullName).fileName();
+        int dotIndex = fileName.lastIndexOf('.');
+        return dotIndex == -1 ? "" : fileName.substring(dotIndex);
+    }
 
-        return partitionMatches(partitionColumnHandles, constraintSummary, partition);
+    public static boolean hudiMetadataExists(TrinoFileSystem trinoFileSystem, Location baseLocation)
+    {
+        try {
+            Location metaLocation = baseLocation.appendPath(METAFOLDER_NAME);
+            FileIterator iterator = trinoFileSystem.listFiles(metaLocation);
+            // If there is at least one file in the .hoodie directory, it's a valid Hudi table
+            return iterator.hasNext();
+        }
+        catch (IOException e) {
+            throw new TrinoException(HUDI_FILESYSTEM_ERROR, "Failed to check for Hudi table at location: " + baseLocation, e);
+        }
     }
 
     public static boolean partitionMatchesPredicates(
             SchemaTableName tableName,
-            String relativePartitionPath,
-            List<String> partitionValues,
+            String hivePartitionName,
             List<HiveColumnHandle> partitionColumnHandles,
             TupleDomain<HiveColumnHandle> constraintSummary)
     {
-        List<Type> partitionColumnTypes = partitionColumnHandles.stream()
-                .map(HiveColumnHandle::getType)
-                .collect(toList());
-        HivePartition partition = parsePartition(
-                tableName, relativePartitionPath, partitionValues, partitionColumnHandles, partitionColumnTypes);
+        HivePartition partition = HivePartitionManager.parsePartition(
+                tableName, hivePartitionName, partitionColumnHandles);
 
         return partitionMatches(partitionColumnHandles, constraintSummary, partition);
     }
 
-    private static HivePartition parsePartition(
-            SchemaTableName tableName,
-            String partitionName,
-            List<String> partitionValues,
-            List<HiveColumnHandle> partitionColumns,
-            List<Type> partitionColumnTypes)
-    {
-        ImmutableMap.Builder<ColumnHandle, NullableValue> builder = ImmutableMap.builder();
-        for (int i = 0; i < partitionColumns.size(); i++) {
-            HiveColumnHandle column = partitionColumns.get(i);
-            NullableValue parsedValue = parsePartitionValue(
-                    partitionName, partitionValues.get(i), partitionColumnTypes.get(i));
-            builder.put(column, parsedValue);
-        }
-        Map<ColumnHandle, NullableValue> values = builder.buildOrThrow();
-        return new HivePartition(tableName, partitionName, values);
-    }
-
     public static boolean partitionMatches(List<HiveColumnHandle> partitionColumns, TupleDomain<HiveColumnHandle> constraintSummary, HivePartition partition)
     {
         if (constraintSummary.isNone()) {
@@ -154,21 +125,13 @@ public static List<HivePartitionKey> buildPartitionKeys(List<Column> keys, List<
         return partitionKeys.build();
     }
 
-    public static HoodieTableMetaClient buildTableMetaClient(Configuration configuration, String basePath)
+    public static HudiTableMetaClient buildTableMetaClient(
+            TrinoFileSystem fileSystem,
+            String basePath)
     {
-        HoodieTableMetaClient client = HoodieTableMetaClient.builder().setConf(configuration).setBasePath(basePath).build();
-        // Do not load the bootstrap index, will not read bootstrap base data or a mapping index defined
-        client.getTableConfig().setValue("hoodie.bootstrap.index.enable", "false");
-        return client;
-    }
-
-    public static FileStatus getFileStatus(HoodieBaseFile baseFile)
-    {
-        try {
-            return HoodieInputFormatUtils.getFileStatus(baseFile);
-        }
-        catch (IOException e) {
-            throw new TrinoException(HUDI_CANNOT_OPEN_SPLIT, "Error getting file status of " + baseFile.getPath(), e);
-        }
+        return HudiTableMetaClient.builder()
+                .setTrinoFileSystem(fileSystem)
+                .setBasePath(Location.of(basePath))
+                .build();
     }
 }
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/InternalHudiConnectorFactory.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/InternalHudiConnectorFactory.java
index 304e4b54b2c3..b5bd60ceb6f8 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/InternalHudiConnectorFactory.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/InternalHudiConnectorFactory.java
@@ -16,25 +16,28 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Injector;
 import com.google.inject.Key;
+import com.google.inject.Module;
 import com.google.inject.TypeLiteral;
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.event.client.EventModule;
 import io.airlift.json.JsonModule;
-import io.trino.filesystem.hdfs.HdfsFileSystemModule;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.manager.FileSystemModule;
 import io.trino.hdfs.HdfsModule;
 import io.trino.hdfs.authentication.HdfsAuthenticationModule;
+import io.trino.hdfs.gcs.HiveGcsModule;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorPageSourceProvider;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorSplitManager;
 import io.trino.plugin.base.classloader.ClassLoaderSafeNodePartitioningProvider;
 import io.trino.plugin.base.jmx.MBeanServerModule;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
-import io.trino.plugin.hive.azure.HiveAzureModule;
-import io.trino.plugin.hive.gcs.HiveGcsModule;
+import io.trino.plugin.hive.NodeVersion;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastoreModule;
-import io.trino.plugin.hive.s3.HiveS3Module;
 import io.trino.spi.NodeManager;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.Connector;
@@ -49,7 +52,7 @@
 import java.util.Optional;
 import java.util.Set;
 
-public class InternalHudiConnectorFactory
+public final class InternalHudiConnectorFactory
 {
     private InternalHudiConnectorFactory() {}
 
@@ -57,7 +60,8 @@ public static Connector createConnector(
             String catalogName,
             Map<String, String> config,
             ConnectorContext context,
-            Optional<HiveMetastore> metastore)
+            Optional<HiveMetastore> metastore,
+            Optional<TrinoFileSystemFactory> fileSystemFactory)
     {
         ClassLoader classLoader = InternalHudiConnectorFactory.class.getClassLoader();
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
@@ -68,13 +72,16 @@ public static Connector createConnector(
                     new HudiModule(),
                     new HiveMetastoreModule(metastore),
                     new HdfsModule(),
-                    new HiveS3Module(),
                     new HiveGcsModule(),
-                    new HiveAzureModule(),
                     new HdfsAuthenticationModule(),
-                    new HdfsFileSystemModule(),
+                    fileSystemFactory
+                            .map(factory -> (Module) binder -> binder.bind(TrinoFileSystemFactory.class).toInstance(factory))
+                            .orElseGet(FileSystemModule::new),
                     new MBeanServerModule(),
                     binder -> {
+                        binder.bind(OpenTelemetry.class).toInstance(context.getOpenTelemetry());
+                        binder.bind(Tracer.class).toInstance(context.getTracer());
+                        binder.bind(NodeVersion.class).toInstance(new NodeVersion(context.getNodeManager().getCurrentNode().getVersion()));
                         binder.bind(NodeManager.class).toInstance(context.getNodeManager());
                         binder.bind(TypeManager.class).toInstance(context.getTypeManager());
                         binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName));
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/TimelineTable.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/TimelineTable.java
index 5d819c32bdbe..da6a56e1ff0b 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/TimelineTable.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/TimelineTable.java
@@ -14,7 +14,10 @@
 package io.trino.plugin.hudi;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.hive.metastore.Table;
+import io.trino.plugin.hudi.model.HudiInstant;
+import io.trino.plugin.hudi.table.HudiTableMetaClient;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableMetadata;
@@ -25,9 +28,6 @@
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hudi.common.table.HoodieTableMetaClient;
-import org.apache.hudi.common.table.timeline.HoodieInstant;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,10 +43,10 @@ public class TimelineTable
 {
     private final ConnectorTableMetadata tableMetadata;
     private final List<Type> types;
-    private final Configuration configuration;
+    private final TrinoFileSystem fileSystem;
     private final String location;
 
-    public TimelineTable(Configuration configuration, SchemaTableName tableName, Table hudiTable)
+    public TimelineTable(TrinoFileSystem fileSystem, SchemaTableName tableName, Table hudiTable)
     {
         this.tableMetadata = new ConnectorTableMetadata(requireNonNull(tableName, "tableName is null"),
                 ImmutableList.<ColumnMetadata>builder()
@@ -55,7 +55,7 @@ public TimelineTable(Configuration configuration, SchemaTableName tableName, Tab
                         .add(new ColumnMetadata("state", VARCHAR))
                         .build());
         this.types = tableMetadata.getColumns().stream().map(ColumnMetadata::getType).collect(toImmutableList());
-        this.configuration = requireNonNull(configuration, "configuration is null");
+        this.fileSystem = requireNonNull(fileSystem, "fileSystem is null");
         this.location = requireNonNull(hudiTable.getStorage().getLocation(), "location is null");
     }
 
@@ -74,12 +74,12 @@ public ConnectorTableMetadata getTableMetadata()
     @Override
     public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, ConnectorSession session, TupleDomain<Integer> constraint)
     {
-        HoodieTableMetaClient metaClient = buildTableMetaClient(configuration, location);
+        HudiTableMetaClient metaClient = buildTableMetaClient(fileSystem, location);
         Iterable<List<Object>> records = () -> metaClient.getCommitsTimeline().getInstants().map(this::getRecord).iterator();
         return new InMemoryRecordSet(types, records).cursor();
     }
 
-    private List<Object> getRecord(HoodieInstant hudiInstant)
+    private List<Object> getRecord(HudiInstant hudiInstant)
     {
         List<Object> columns = new ArrayList<>();
         columns.add(hudiInstant.getTimestamp());
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/CompactionOperation.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/CompactionOperation.java
new file mode 100644
index 000000000000..c73511f5063f
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/CompactionOperation.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.compaction;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.Location;
+import io.trino.plugin.hudi.files.HudiFileGroupId;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static io.trino.plugin.hudi.files.FSUtils.getCommitTime;
+import static java.util.Objects.requireNonNull;
+
+public class CompactionOperation
+{
+    private String baseInstantTime;
+    private Optional<String> dataFileCommitTime;
+    private List<String> deltaFileNames;
+    private Optional<String> dataFileName;
+    private HudiFileGroupId id;
+    private Map<String, Double> metrics;
+    private Optional<String> bootstrapFilePath;
+
+    public CompactionOperation(
+            String baseInstantTime,
+            Optional<String> dataFileCommitTime,
+            List<String> deltaFileNames,
+            Optional<String> dataFileName,
+            HudiFileGroupId id,
+            Map<String, Double> metrics,
+            Optional<String> bootstrapFilePath)
+    {
+        this.baseInstantTime = requireNonNull(baseInstantTime, "baseInstantTime is null");
+        this.dataFileCommitTime = requireNonNull(dataFileCommitTime, "dataFileCommitTime is null");
+        this.deltaFileNames = requireNonNull(deltaFileNames, "deltaFileNames is null");
+        this.dataFileName = requireNonNull(dataFileName, "dataFileName is null");
+        this.id = requireNonNull(id, "id is null");
+        this.metrics = requireNonNull(metrics, "metrics is null");
+        this.bootstrapFilePath = requireNonNull(bootstrapFilePath, "bootstrapFilePath is null");
+    }
+
+    public String getFileId()
+    {
+        return id.getFileId();
+    }
+
+    public String getPartitionPath()
+    {
+        return id.getPartitionPath();
+    }
+
+    public HudiFileGroupId getFileGroupId()
+    {
+        return id;
+    }
+
+    public static CompactionOperation convertFromAvroRecordInstance(HudiCompactionOperation operation)
+    {
+        Optional<String> dataFileName = Optional.ofNullable(operation.getDataFilePath());
+        return new CompactionOperation(
+                operation.getBaseInstantTime(),
+                dataFileName.map(path -> getCommitTime(Location.of(path).fileName())),
+                ImmutableList.copyOf(operation.getDeltaFilePaths()),
+                dataFileName,
+                new HudiFileGroupId(operation.getPartitionPath(), operation.getFileId()),
+                operation.getMetrics() == null ? ImmutableMap.of() : ImmutableMap.copyOf(operation.getMetrics()),
+                Optional.ofNullable(operation.getBootstrapFilePath()));
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("baseInstantTime", baseInstantTime)
+                .add("dataFileCommitTime", dataFileCommitTime)
+                .add("deltaFileNames", deltaFileNames)
+                .add("dataFileName", dataFileName)
+                .add("id", id)
+                .add("metrics", metrics)
+                .add("bootstrapFilePath", bootstrapFilePath)
+                .toString();
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/HudiCompactionOperation.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/HudiCompactionOperation.java
new file mode 100644
index 000000000000..8b760e89348b
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/HudiCompactionOperation.java
@@ -0,0 +1,234 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.compaction;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import org.apache.avro.Schema;
+import org.apache.avro.Schema.Parser;
+import org.apache.avro.specific.SpecificData;
+import org.apache.avro.specific.SpecificRecord;
+import org.apache.avro.specific.SpecificRecordBase;
+
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Objects.requireNonNull;
+
+public class HudiCompactionOperation
+        extends SpecificRecordBase
+        implements SpecificRecord
+{
+    private static final Schema SCHEMA = new Parser().parse("{\"type\":\"record\",\"name\":\"HoodieCompactionOperation\",\"namespace\":\"org.apache.hudi.avro.model\",\"fields\":[{\"name\":\"baseInstantTime\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}]},{\"name\":\"deltaFilePaths\",\"type\":[\"null\",{\"type\":\"array\",\"items\":{\"type\":\"string\",\"avro.java.string\":\"String\"}}],\"default\":null},{\"name\":\"dataFilePath\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"default\":null},{\"name\":\"fileId\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}]},{\"name\":\"partitionPath\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"default\":null},{\"name\":\"metrics\",\"type\":[\"null\",{\"type\":\"map\",\"values\":\"double\",\"avro.java.string\":\"String\"}],\"default\":null},{\"name\":\"bootstrapFilePath\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"default\":null}]}");
+    private static final SpecificData MODEL = new SpecificData();
+
+    private String baseInstantTime;
+    private List<String> deltaFilePaths;
+    private String dataFilePath;
+    private String fileId;
+    private String partitionPath;
+    private Map<String, Double> metrics;
+    private String bootstrapFilePath;
+
+    public HudiCompactionOperation() {}
+
+    public HudiCompactionOperation(
+            String baseInstantTime,
+            List<String> deltaFilePaths,
+            String dataFilePath,
+            String fileId,
+            String partitionPath,
+            Map<String, Double> metrics,
+            String bootstrapFilePath)
+    {
+        this.baseInstantTime = requireNonNull(baseInstantTime, "baseInstantTime is null");
+        this.deltaFilePaths = requireNonNull(deltaFilePaths, "deltaFilePaths is null");
+        this.dataFilePath = requireNonNull(dataFilePath, "dataFilePath is null");
+        this.fileId = requireNonNull(fileId, "fileId is null");
+        this.partitionPath = requireNonNull(partitionPath, "partitionPath is null");
+        this.metrics = requireNonNull(metrics, "metrics is null");
+        this.bootstrapFilePath = requireNonNull(bootstrapFilePath, "bootstrapFilePath is null");
+    }
+
+    @Override
+    public SpecificData getSpecificData()
+    {
+        return MODEL;
+    }
+
+    @Override
+    public Schema getSchema()
+    {
+        return SCHEMA;
+    }
+
+    // Used by DatumWriter.  Applications should not call.
+    @Override
+    public Object get(int field)
+    {
+        return switch (field) {
+            case 0:
+                yield baseInstantTime;
+            case 1:
+                yield deltaFilePaths;
+            case 2:
+                yield dataFilePath;
+            case 3:
+                yield fileId;
+            case 4:
+                yield partitionPath;
+            case 5:
+                yield metrics;
+            case 6:
+                yield bootstrapFilePath;
+            default:
+                throw new IndexOutOfBoundsException("Invalid index: " + field);
+        };
+    }
+
+    // Used by DatumReader.  Applications should not call.
+    @Override
+    @SuppressWarnings(value = "unchecked")
+    public void put(int field, Object value)
+    {
+        switch (field) {
+            case 0:
+                baseInstantTime = value != null ? value.toString() : null;
+                break;
+            case 1:
+                deltaFilePaths = (List<String>) value;
+                break;
+            case 2:
+                dataFilePath = value != null ? value.toString() : null;
+                break;
+            case 3:
+                fileId = value != null ? value.toString() : null;
+                break;
+            case 4:
+                partitionPath = value != null ? value.toString() : null;
+                break;
+            case 5:
+                metrics = (Map<String, Double>) value;
+                break;
+            case 6:
+                bootstrapFilePath = value != null ? value.toString() : null;
+                break;
+            default:
+                throw new IndexOutOfBoundsException("Invalid index: " + field);
+        }
+    }
+
+    public String getBaseInstantTime()
+    {
+        return baseInstantTime;
+    }
+
+    public List<String> getDeltaFilePaths()
+    {
+        return deltaFilePaths;
+    }
+
+    public String getDataFilePath()
+    {
+        return dataFilePath;
+    }
+
+    public String getFileId()
+    {
+        return fileId;
+    }
+
+    public String getPartitionPath()
+    {
+        return partitionPath;
+    }
+
+    public Map<String, Double> getMetrics()
+    {
+        return metrics;
+    }
+
+    public String getBootstrapFilePath()
+    {
+        return bootstrapFilePath;
+    }
+
+    public static HudiCompactionOperation.Builder newBuilder()
+    {
+        return new HudiCompactionOperation.Builder();
+    }
+
+    public static class Builder
+    {
+        private String baseInstantTime;
+        private List<String> deltaFilePaths;
+        private String dataFilePath;
+        private String fileId;
+        private String partitionPath;
+        private Map<String, Double> metrics;
+        private String bootstrapFilePath;
+
+        private Builder()
+        {
+        }
+
+        public HudiCompactionOperation.Builder setBaseInstantTime(String baseInstantTime)
+        {
+            this.baseInstantTime = baseInstantTime;
+            return this;
+        }
+
+        public HudiCompactionOperation.Builder setDeltaFilePaths(List<String> deltaFilePaths)
+        {
+            this.deltaFilePaths = ImmutableList.copyOf(deltaFilePaths);
+            return this;
+        }
+
+        public HudiCompactionOperation.Builder setDataFilePath(String dataFilePath)
+        {
+            this.dataFilePath = dataFilePath;
+            return this;
+        }
+
+        public HudiCompactionOperation.Builder setFileId(String fileId)
+        {
+            this.fileId = fileId;
+            return this;
+        }
+
+        public HudiCompactionOperation.Builder setPartitionPath(String partitionPath)
+        {
+            this.partitionPath = partitionPath;
+            return this;
+        }
+
+        public HudiCompactionOperation.Builder setMetrics(Map<String, Double> metrics)
+        {
+            this.metrics = ImmutableMap.copyOf(metrics);
+            return this;
+        }
+
+        public HudiCompactionOperation build()
+        {
+            return new HudiCompactionOperation(
+                    baseInstantTime,
+                    deltaFilePaths,
+                    dataFilePath,
+                    fileId,
+                    partitionPath,
+                    metrics,
+                    bootstrapFilePath);
+        }
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/HudiCompactionPlan.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/HudiCompactionPlan.java
new file mode 100644
index 000000000000..3d39a2210ea8
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/HudiCompactionPlan.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.compaction;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import org.apache.avro.Schema;
+import org.apache.avro.specific.SpecificData;
+import org.apache.avro.specific.SpecificRecord;
+import org.apache.avro.specific.SpecificRecordBase;
+
+import java.util.List;
+import java.util.Map;
+
+public class HudiCompactionPlan
+        extends SpecificRecordBase
+        implements SpecificRecord
+{
+    private static final Schema SCHEMA = new Schema.Parser().parse("{\"type\":\"record\",\"name\":\"HoodieCompactionPlan\",\"namespace\":\"org.apache.hudi.avro.model\",\"fields\":[{\"name\":\"operations\",\"type\":[\"null\",{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"HoodieCompactionOperation\",\"fields\":[{\"name\":\"baseInstantTime\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}]},{\"name\":\"deltaFilePaths\",\"type\":[\"null\",{\"type\":\"array\",\"items\":{\"type\":\"string\",\"avro.java.string\":\"String\"}}],\"default\":null},{\"name\":\"dataFilePath\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"default\":null},{\"name\":\"fileId\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}]},{\"name\":\"partitionPath\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"default\":null},{\"name\":\"metrics\",\"type\":[\"null\",{\"type\":\"map\",\"values\":\"double\",\"avro.java.string\":\"String\"}],\"default\":null},{\"name\":\"bootstrapFilePath\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"default\":null}]}}],\"default\":null},{\"name\":\"extraMetadata\",\"type\":[\"null\",{\"type\":\"map\",\"values\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"avro.java.string\":\"String\"}],\"default\":null},{\"name\":\"version\",\"type\":[\"int\",\"null\"],\"default\":1}]}");
+
+    private static final SpecificData MODEL = new SpecificData();
+
+    private List<HudiCompactionOperation> operations;
+    private Map<String, String> extraMetadata;
+    private Integer version;
+
+    public HudiCompactionPlan() {}
+
+    public HudiCompactionPlan(List<HudiCompactionOperation> operations, Map<String, String> extraMetadata, Integer version)
+    {
+        this.operations = ImmutableList.copyOf(operations);
+        this.extraMetadata = ImmutableMap.copyOf(extraMetadata);
+        this.version = version;
+    }
+
+    @Override
+    public SpecificData getSpecificData()
+    {
+        return MODEL;
+    }
+
+    @Override
+    public Schema getSchema()
+    {
+        return SCHEMA;
+    }
+
+    public List<HudiCompactionOperation> getOperations()
+    {
+        return operations;
+    }
+
+    public Map<String, String> getExtraMetadata()
+    {
+        return extraMetadata;
+    }
+
+    public Integer getVersion()
+    {
+        return version;
+    }
+
+    // Used by DatumWriter.  Applications should not call.
+    @Override
+    public Object get(int field)
+    {
+        return switch (field) {
+            case 0:
+                yield operations;
+            case 1:
+                yield extraMetadata;
+            case 2:
+                yield version;
+            default:
+                throw new IndexOutOfBoundsException("Invalid index: " + field);
+        };
+    }
+
+    // Used by DatumReader.  Applications should not call.
+    @Override
+    @SuppressWarnings(value = "unchecked")
+    public void put(int field, Object value)
+    {
+        switch (field) {
+            case 0:
+                operations = ImmutableList.copyOf((List<HudiCompactionOperation>) value);
+                break;
+            case 1:
+                extraMetadata = ImmutableMap.copyOf((Map<String, String>) value);
+                break;
+            case 2:
+                version = (Integer) value;
+                break;
+            default:
+                throw new IndexOutOfBoundsException("Invalid index: " + field);
+        }
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/config/HudiTableConfig.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/config/HudiTableConfig.java
new file mode 100644
index 000000000000..7cbafae2c449
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/config/HudiTableConfig.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.config;
+
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.TrinoInputFile;
+import io.trino.filesystem.TrinoInputStream;
+import io.trino.plugin.hudi.model.HudiFileFormat;
+import io.trino.plugin.hudi.model.HudiTableType;
+import io.trino.plugin.hudi.timeline.TimelineLayoutVersion;
+import io.trino.spi.TrinoException;
+
+import java.io.IOException;
+import java.util.Optional;
+import java.util.Properties;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.plugin.hudi.HudiErrorCode.HUDI_FILESYSTEM_ERROR;
+import static java.lang.String.format;
+
+public class HudiTableConfig
+{
+    public static final String HOODIE_PROPERTIES_FILE = "hoodie.properties";
+    public static final String HOODIE_PROPERTIES_FILE_BACKUP = "hoodie.properties.backup";
+    public static final String HOODIE_TABLE_NAME_KEY = "hoodie.table.name";
+    public static final String HOODIE_TABLE_TYPE_KEY = "hoodie.table.type";
+    public static final String HOODIE_TABLE_BASE_FILE_FORMAT = "hoodie.table.base.file.format";
+    public static final String HOODIE_TIMELINE_LAYOUT_VERSION_KEY = "hoodie.timeline.layout.version";
+    private final Properties properties;
+
+    public HudiTableConfig(TrinoFileSystem fs, Location metaPath)
+    {
+        this.properties = new Properties();
+        Location propertyPath = metaPath.appendPath(HOODIE_PROPERTIES_FILE);
+        try {
+            TrinoInputFile inputFile = fs.newInputFile(propertyPath);
+            try (TrinoInputStream inputStream = inputFile.newStream()) {
+                properties.load(inputStream);
+            }
+        }
+        catch (IOException e) {
+            if (!tryLoadingBackupPropertyFile(fs, metaPath)) {
+                throw new TrinoException(HUDI_FILESYSTEM_ERROR, format("Could not load Hoodie properties from %s", propertyPath));
+            }
+        }
+        checkArgument(properties.containsKey(HOODIE_TABLE_NAME_KEY) && properties.containsKey(HOODIE_TABLE_TYPE_KEY),
+                "hoodie.properties file seems invalid. Please check for left over `.updated` files if any, " +
+                        "manually copy it to hoodie.properties and retry");
+    }
+
+    private boolean tryLoadingBackupPropertyFile(TrinoFileSystem fs, Location metaPath)
+    {
+        Location backupPath = metaPath.appendPath(HOODIE_PROPERTIES_FILE_BACKUP);
+        try {
+            FileIterator fileIterator = fs.listFiles(metaPath);
+            while (fileIterator.hasNext()) {
+                if (fileIterator.next().location().equals(backupPath)) {
+                    // try the backup. this way no query ever fails if update fails midway.
+                    TrinoInputFile inputFile = fs.newInputFile(backupPath);
+                    try (TrinoInputStream inputStream = inputFile.newStream()) {
+                        properties.load(inputStream);
+                    }
+                    return true;
+                }
+            }
+        }
+        catch (IOException e) {
+            throw new TrinoException(HUDI_FILESYSTEM_ERROR, "Failed to load Hudi properties from file: " + backupPath, e);
+        }
+        return false;
+    }
+
+    public HudiTableType getTableType()
+    {
+        return HudiTableType.valueOf(properties.getProperty(HOODIE_TABLE_TYPE_KEY));
+    }
+
+    public HudiFileFormat getBaseFileFormat()
+    {
+        if (properties.containsKey(HOODIE_TABLE_BASE_FILE_FORMAT)) {
+            return HudiFileFormat.valueOf(properties.getProperty(HOODIE_TABLE_BASE_FILE_FORMAT));
+        }
+        return HudiFileFormat.PARQUET;
+    }
+
+    public Optional<TimelineLayoutVersion> getTimelineLayoutVersion()
+    {
+        return Optional.ofNullable(properties.getProperty(HOODIE_TIMELINE_LAYOUT_VERSION_KEY))
+                .map(Integer::parseInt)
+                .map(TimelineLayoutVersion::new);
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/FSUtils.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/FSUtils.java
new file mode 100644
index 000000000000..6d6422a86da7
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/FSUtils.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.files;
+
+import io.trino.filesystem.Location;
+import io.trino.spi.TrinoException;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static io.trino.plugin.hudi.HudiErrorCode.HUDI_BAD_DATA;
+import static io.trino.plugin.hudi.model.HudiFileFormat.HOODIE_LOG;
+
+public final class FSUtils
+{
+    private FSUtils()
+    {
+    }
+
+    public static final Pattern LOG_FILE_PATTERN =
+            Pattern.compile("\\.(.*)_(.*)\\.(.*)\\.([0-9]*)(_(([0-9]*)-([0-9]*)-([0-9]*)))?");
+
+    public static String getFileIdFromLogPath(Location location)
+    {
+        Matcher matcher = LOG_FILE_PATTERN.matcher(location.fileName());
+        if (!matcher.find()) {
+            throw new TrinoException(HUDI_BAD_DATA, "Invalid LogFile " + location);
+        }
+        return matcher.group(1);
+    }
+
+    public static String getBaseCommitTimeFromLogPath(Location location)
+    {
+        Matcher matcher = LOG_FILE_PATTERN.matcher(location.fileName());
+        if (!matcher.find()) {
+            throw new TrinoException(HUDI_BAD_DATA, "Invalid LogFile " + location);
+        }
+        return matcher.group(2);
+    }
+
+    public static boolean isLogFile(String fileName)
+    {
+        Matcher matcher = LOG_FILE_PATTERN.matcher(fileName);
+        return matcher.find() && fileName.contains(HOODIE_LOG.getFileExtension());
+    }
+
+    public static int getFileVersionFromLog(Location logLocation)
+    {
+        Matcher matcher = LOG_FILE_PATTERN.matcher(logLocation.fileName());
+        if (!matcher.find()) {
+            throw new TrinoException(HUDI_BAD_DATA, "Invalid location " + logLocation);
+        }
+        return Integer.parseInt(matcher.group(4));
+    }
+
+    public static String getWriteTokenFromLogPath(Location location)
+    {
+        Matcher matcher = LOG_FILE_PATTERN.matcher(location.fileName());
+        if (!matcher.find()) {
+            throw new TrinoException(HUDI_BAD_DATA, "Invalid location " + location);
+        }
+        return matcher.group(6);
+    }
+
+    public static String getCommitTime(String fullFileName)
+    {
+        Matcher matcher = LOG_FILE_PATTERN.matcher(fullFileName);
+        if (matcher.find() && fullFileName.contains(HOODIE_LOG.getFileExtension())) {
+            return fullFileName.split("_")[1].split("\\.")[0];
+        }
+        return fullFileName.split("_")[2].split("\\.")[0];
+    }
+
+    public static Location getPartitionLocation(Location baseLocation, String partitionPath)
+    {
+        return isNullOrEmpty(partitionPath) ? baseLocation : baseLocation.appendPath(partitionPath);
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/FileSlice.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/FileSlice.java
new file mode 100644
index 000000000000..a9d93624465d
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/FileSlice.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.files;
+
+import java.util.Optional;
+import java.util.TreeSet;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public class FileSlice
+{
+    private final String baseInstantTime;
+
+    private Optional<HudiBaseFile> baseFile;
+
+    private final TreeSet<HudiLogFile> logFiles;
+
+    public FileSlice(String baseInstantTime)
+    {
+        this.baseInstantTime = requireNonNull(baseInstantTime, "baseInstantTime is null");
+        this.baseFile = Optional.empty();
+        this.logFiles = new TreeSet<>(HudiLogFile.getReverseLogFileComparator());
+    }
+
+    public void setBaseFile(HudiBaseFile baseFile)
+    {
+        this.baseFile = Optional.ofNullable(baseFile);
+    }
+
+    public void addLogFile(HudiLogFile logFile)
+    {
+        this.logFiles.add(logFile);
+    }
+
+    public String getBaseInstantTime()
+    {
+        return baseInstantTime;
+    }
+
+    public Optional<HudiBaseFile> getBaseFile()
+    {
+        return baseFile;
+    }
+
+    public boolean isEmpty()
+    {
+        return (baseFile == null) && (logFiles.isEmpty());
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("baseInstantTime", baseInstantTime)
+                .add("baseFile", baseFile)
+                .add("logFiles", logFiles)
+                .toString();
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/HudiBaseFile.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/HudiBaseFile.java
new file mode 100644
index 000000000000..c9c651d2a5b6
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/HudiBaseFile.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.files;
+
+import io.trino.filesystem.FileEntry;
+import io.trino.filesystem.Location;
+
+import java.util.Objects;
+
+import static io.trino.plugin.hudi.files.FSUtils.isLogFile;
+import static java.util.Objects.requireNonNull;
+
+public class HudiBaseFile
+{
+    private transient FileEntry fileEntry;
+    private final String fullPath;
+    private final String fileName;
+    private long fileLen;
+
+    public HudiBaseFile(FileEntry fileEntry)
+    {
+        this(fileEntry,
+                fileEntry.location().path(),
+                fileEntry.location().fileName(),
+                fileEntry.length());
+    }
+
+    private HudiBaseFile(FileEntry fileEntry, String fullPath, String fileName, long fileLen)
+    {
+        this.fileEntry = requireNonNull(fileEntry, "fileEntry is null");
+        this.fullPath = requireNonNull(fullPath, "fullPath is null");
+        this.fileLen = fileLen;
+        this.fileName = requireNonNull(fileName, "fileName is null");
+    }
+
+    public String getPath()
+    {
+        return fullPath;
+    }
+
+    public Location getFullPath()
+    {
+        if (fileEntry != null) {
+            return fileEntry.location();
+        }
+
+        return Location.of(fullPath);
+    }
+
+    public String getFileName()
+    {
+        return fileName;
+    }
+
+    public FileEntry getFileEntry()
+    {
+        return fileEntry;
+    }
+
+    public String getFileId()
+    {
+        return getFileName().split("_")[0];
+    }
+
+    public String getCommitTime()
+    {
+        String fileName = getFileName();
+        if (isLogFile(fileName)) {
+            return fileName.split("_")[1].split("\\.")[0];
+        }
+        return fileName.split("_")[2].split("\\.")[0];
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        HudiBaseFile dataFile = (HudiBaseFile) o;
+        return Objects.equals(fullPath, dataFile.fullPath);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(fullPath);
+    }
+
+    @Override
+    public String toString()
+    {
+        return "BaseFile{fullPath=" + fullPath + ", fileLen=" + fileLen + '}';
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/HudiFileGroup.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/HudiFileGroup.java
new file mode 100644
index 000000000000..23d4eb2e3ac4
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/HudiFileGroup.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.files;
+
+import io.trino.plugin.hudi.model.HudiInstant;
+import io.trino.plugin.hudi.timeline.HudiTimeline;
+
+import java.util.Comparator;
+import java.util.Optional;
+import java.util.TreeMap;
+import java.util.stream.Stream;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static io.trino.plugin.hudi.timeline.HudiTimeline.LESSER_THAN_OR_EQUALS;
+import static io.trino.plugin.hudi.timeline.HudiTimeline.compareTimestamps;
+import static java.util.Objects.requireNonNull;
+
+public class HudiFileGroup
+{
+    public static Comparator<String> getReverseCommitTimeComparator()
+    {
+        return Comparator.reverseOrder();
+    }
+
+    private final HudiFileGroupId fileGroupId;
+
+    private final TreeMap<String, FileSlice> fileSlices;
+
+    private final HudiTimeline timeline;
+
+    private final Optional<HudiInstant> lastInstant;
+
+    public HudiFileGroup(String partitionPath, String id, HudiTimeline timeline)
+    {
+        this(new HudiFileGroupId(partitionPath, id), timeline);
+    }
+
+    public HudiFileGroup(HudiFileGroupId fileGroupId, HudiTimeline timeline)
+    {
+        this.fileGroupId = requireNonNull(fileGroupId, "fileGroupId is null");
+        this.fileSlices = new TreeMap<>(HudiFileGroup.getReverseCommitTimeComparator());
+        this.lastInstant = timeline.lastInstant();
+        this.timeline = timeline;
+    }
+
+    public void addNewFileSliceAtInstant(String baseInstantTime)
+    {
+        if (!fileSlices.containsKey(baseInstantTime)) {
+            fileSlices.put(baseInstantTime, new FileSlice(baseInstantTime));
+        }
+    }
+
+    public void addBaseFile(HudiBaseFile dataFile)
+    {
+        if (!fileSlices.containsKey(dataFile.getCommitTime())) {
+            fileSlices.put(dataFile.getCommitTime(), new FileSlice(dataFile.getCommitTime()));
+        }
+        fileSlices.get(dataFile.getCommitTime()).setBaseFile(dataFile);
+    }
+
+    public void addLogFile(HudiLogFile logFile)
+    {
+        if (!fileSlices.containsKey(logFile.getBaseCommitTime())) {
+            fileSlices.put(logFile.getBaseCommitTime(), new FileSlice(logFile.getBaseCommitTime()));
+        }
+        fileSlices.get(logFile.getBaseCommitTime()).addLogFile(logFile);
+    }
+
+    public String getPartitionPath()
+    {
+        return fileGroupId.getPartitionPath();
+    }
+
+    public HudiFileGroupId getFileGroupId()
+    {
+        return fileGroupId;
+    }
+
+    private boolean isFileSliceCommitted(FileSlice slice)
+    {
+        if (!compareTimestamps(slice.getBaseInstantTime(), LESSER_THAN_OR_EQUALS, lastInstant.get().getTimestamp())) {
+            return false;
+        }
+
+        return timeline.containsOrBeforeTimelineStarts(slice.getBaseInstantTime());
+    }
+
+    public Stream<FileSlice> getAllFileSlices()
+    {
+        if (!timeline.empty()) {
+            return fileSlices.values().stream().filter(this::isFileSliceCommitted);
+        }
+        return Stream.empty();
+    }
+
+    public Stream<HudiBaseFile> getAllBaseFiles()
+    {
+        return getAllFileSlices().filter(slice -> slice.getBaseFile().isPresent()).map(slice -> slice.getBaseFile().get());
+    }
+
+    public Stream<FileSlice> getAllFileSlicesBeforeOn(String maxInstantTime)
+    {
+        return fileSlices.values().stream().filter(slice -> compareTimestamps(slice.getBaseInstantTime(), LESSER_THAN_OR_EQUALS, maxInstantTime));
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("fileGroupId", fileGroupId)
+                .add("fileSlices", fileSlices)
+                .add("timeline", timeline)
+                .add("lastInstant", lastInstant)
+                .toString();
+    }
+
+    public HudiTimeline getTimeline()
+    {
+        return timeline;
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/HudiFileGroupId.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/HudiFileGroupId.java
new file mode 100644
index 000000000000..2470b3093fd3
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/HudiFileGroupId.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.files;
+
+import java.util.Objects;
+
+import static java.util.Objects.requireNonNull;
+
+public class HudiFileGroupId
+        implements Comparable<HudiFileGroupId>
+{
+    private final String partitionPath;
+
+    private final String fileId;
+
+    public HudiFileGroupId(String partitionPath, String fileId)
+    {
+        this.partitionPath = requireNonNull(partitionPath, "partitionPath is null");
+        this.fileId = requireNonNull(fileId, "partitionPath is null");
+    }
+
+    public String getPartitionPath()
+    {
+        return partitionPath;
+    }
+
+    public String getFileId()
+    {
+        return fileId;
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        HudiFileGroupId that = (HudiFileGroupId) o;
+        return Objects.equals(partitionPath, that.partitionPath) && Objects.equals(fileId, that.fileId);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(partitionPath, fileId);
+    }
+
+    @Override
+    public String toString()
+    {
+        return "HoodieFileGroupId{partitionPath='" + partitionPath + '\'' + ", fileId='" + fileId + '\'' + '}';
+    }
+
+    @Override
+    public int compareTo(HudiFileGroupId o)
+    {
+        int ret = partitionPath.compareTo(o.partitionPath);
+        if (ret == 0) {
+            ret = fileId.compareTo(o.fileId);
+        }
+        return ret;
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/HudiLogFile.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/HudiLogFile.java
new file mode 100644
index 000000000000..dde08427b23b
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/files/HudiLogFile.java
@@ -0,0 +1,129 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.files;
+
+import io.trino.filesystem.FileEntry;
+import io.trino.filesystem.Location;
+
+import java.util.Comparator;
+import java.util.Objects;
+
+import static io.trino.plugin.hudi.files.FSUtils.getBaseCommitTimeFromLogPath;
+import static io.trino.plugin.hudi.files.FSUtils.getFileIdFromLogPath;
+import static io.trino.plugin.hudi.files.FSUtils.getFileVersionFromLog;
+import static io.trino.plugin.hudi.files.FSUtils.getWriteTokenFromLogPath;
+
+public class HudiLogFile
+{
+    private static final Comparator<HudiLogFile> LOG_FILE_COMPARATOR_REVERSED = new HudiLogFile.LogFileComparator().reversed();
+
+    private final String pathStr;
+    private final long fileLen;
+
+    public HudiLogFile(FileEntry fileStatus)
+    {
+        this.pathStr = fileStatus.location().toString();
+        this.fileLen = fileStatus.length();
+    }
+
+    public String getFileId()
+    {
+        return getFileIdFromLogPath(getPath());
+    }
+
+    public String getBaseCommitTime()
+    {
+        return getBaseCommitTimeFromLogPath(getPath());
+    }
+
+    public int getLogVersion()
+    {
+        return getFileVersionFromLog(getPath());
+    }
+
+    public String getLogWriteToken()
+    {
+        return getWriteTokenFromLogPath(getPath());
+    }
+
+    public Location getPath()
+    {
+        return Location.of(pathStr);
+    }
+
+    public static Comparator<HudiLogFile> getReverseLogFileComparator()
+    {
+        return LOG_FILE_COMPARATOR_REVERSED;
+    }
+
+    public static class LogFileComparator
+            implements Comparator<HudiLogFile>
+    {
+        private transient Comparator<String> writeTokenComparator;
+
+        private Comparator<String> getWriteTokenComparator()
+        {
+            if (null == writeTokenComparator) {
+                // writeTokenComparator is not serializable. Hence, lazy loading
+                writeTokenComparator = Comparator.nullsFirst(Comparator.naturalOrder());
+            }
+            return writeTokenComparator;
+        }
+
+        @Override
+        public int compare(HudiLogFile o1, HudiLogFile o2)
+        {
+            String baseInstantTime1 = o1.getBaseCommitTime();
+            String baseInstantTime2 = o2.getBaseCommitTime();
+
+            if (baseInstantTime1.equals(baseInstantTime2)) {
+                if (o1.getLogVersion() == o2.getLogVersion()) {
+                    // Compare by write token when base-commit and log-version is same
+                    return getWriteTokenComparator().compare(o1.getLogWriteToken(), o2.getLogWriteToken());
+                }
+
+                // compare by log-version when base-commit is same
+                return Integer.compare(o1.getLogVersion(), o2.getLogVersion());
+            }
+
+            // compare by base-commits
+            return baseInstantTime1.compareTo(baseInstantTime2);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        HudiLogFile that = (HudiLogFile) o;
+        return Objects.equals(pathStr, that.pathStr);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(pathStr);
+    }
+
+    @Override
+    public String toString()
+    {
+        return "HoodieLogFile{pathStr='" + pathStr + '\'' + ", fileLen=" + fileLen + '}';
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/model/HudiFileFormat.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/model/HudiFileFormat.java
new file mode 100644
index 000000000000..02bed7c56ef8
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/model/HudiFileFormat.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.model;
+
+import static java.util.Objects.requireNonNull;
+
+public enum HudiFileFormat
+{
+    PARQUET(".parquet"),
+    HOODIE_LOG(".log"),
+    HFILE(".hfile"),
+    ORC(".orc");
+
+    private final String extension;
+
+    HudiFileFormat(String extension)
+    {
+        this.extension = requireNonNull(extension, "extension is null");
+    }
+
+    public String getFileExtension()
+    {
+        return extension;
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/model/HudiInstant.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/model/HudiInstant.java
new file mode 100644
index 000000000000..5def3a0f9482
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/model/HudiInstant.java
@@ -0,0 +1,223 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.model;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.FileEntry;
+import io.trino.plugin.hudi.timeline.HudiTimeline;
+
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Objects;
+
+import static io.trino.plugin.hudi.timeline.HudiTimeline.INFLIGHT_EXTENSION;
+import static io.trino.plugin.hudi.timeline.HudiTimeline.REQUESTED_EXTENSION;
+import static java.util.Objects.requireNonNull;
+
+public class HudiInstant
+        implements Comparable<HudiInstant>
+{
+    public enum State
+    {
+        // Requested State (valid state for Compaction)
+        REQUESTED,
+        // Inflight instant
+        INFLIGHT,
+        // Committed instant
+        COMPLETED,
+        // Invalid instant
+        NIL
+    }
+
+    private static final Map<String, String> COMPARABLE_ACTIONS =
+            ImmutableMap.of(HudiTimeline.COMPACTION_ACTION, HudiTimeline.COMMIT_ACTION);
+
+    private static final Comparator<HudiInstant> ACTION_COMPARATOR =
+            Comparator.comparing(instant -> getComparableAction(instant.getAction()));
+
+    private static final Comparator<HudiInstant> COMPARATOR = Comparator.comparing(HudiInstant::getTimestamp)
+            .thenComparing(ACTION_COMPARATOR).thenComparing(HudiInstant::getState);
+
+    public static String getComparableAction(String action)
+    {
+        return COMPARABLE_ACTIONS.getOrDefault(action, action);
+    }
+
+    public static String getTimelineFileExtension(String fileName)
+    {
+        requireNonNull(fileName);
+        int dotIndex = fileName.indexOf('.');
+        return dotIndex == -1 ? "" : fileName.substring(dotIndex);
+    }
+
+    private HudiInstant.State state = HudiInstant.State.COMPLETED;
+    private String action;
+    private String timestamp;
+
+    /**
+     * Load the instant from the meta FileStatus.
+     */
+    public HudiInstant(FileEntry fileEntry)
+    {
+        // First read the instant timestamp. [==>20170101193025<==].commit
+        String fileName = fileEntry.location().fileName();
+        String fileExtension = getTimelineFileExtension(fileName);
+        timestamp = fileName.replace(fileExtension, "");
+
+        // Next read the action for this marker
+        action = fileExtension.replaceFirst(".", "");
+        if (action.equals("inflight")) {
+            // This is to support backwards compatibility on how in-flight commit files were written
+            // General rule is inflight extension is .<action>.inflight, but for commit it is .inflight
+            action = "commit";
+            state = HudiInstant.State.INFLIGHT;
+        }
+        else if (action.contains(INFLIGHT_EXTENSION)) {
+            state = HudiInstant.State.INFLIGHT;
+            action = action.replace(INFLIGHT_EXTENSION, "");
+        }
+        else if (action.contains(REQUESTED_EXTENSION)) {
+            state = HudiInstant.State.REQUESTED;
+            action = action.replace(REQUESTED_EXTENSION, "");
+        }
+    }
+
+    public HudiInstant(HudiInstant.State state, String action, String timestamp)
+    {
+        this.state = state;
+        this.action = action;
+        this.timestamp = timestamp;
+    }
+
+    public boolean isCompleted()
+    {
+        return state == HudiInstant.State.COMPLETED;
+    }
+
+    public boolean isInflight()
+    {
+        return state == HudiInstant.State.INFLIGHT;
+    }
+
+    public boolean isRequested()
+    {
+        return state == HudiInstant.State.REQUESTED;
+    }
+
+    public String getAction()
+    {
+        return action;
+    }
+
+    public String getTimestamp()
+    {
+        return timestamp;
+    }
+
+    public String getFileName()
+    {
+        if (HudiTimeline.COMMIT_ACTION.equals(action)) {
+            return isInflight() ? HudiTimeline.makeInflightCommitFileName(timestamp)
+                    : isRequested() ? HudiTimeline.makeRequestedCommitFileName(timestamp)
+                    : HudiTimeline.makeCommitFileName(timestamp);
+        }
+        else if (HudiTimeline.CLEAN_ACTION.equals(action)) {
+            return isInflight() ? HudiTimeline.makeInflightCleanerFileName(timestamp)
+                    : isRequested() ? HudiTimeline.makeRequestedCleanerFileName(timestamp)
+                    : HudiTimeline.makeCleanerFileName(timestamp);
+        }
+        else if (HudiTimeline.ROLLBACK_ACTION.equals(action)) {
+            return isInflight() ? HudiTimeline.makeInflightRollbackFileName(timestamp)
+                    : isRequested() ? HudiTimeline.makeRequestedRollbackFileName(timestamp)
+                    : HudiTimeline.makeRollbackFileName(timestamp);
+        }
+        else if (HudiTimeline.SAVEPOINT_ACTION.equals(action)) {
+            return isInflight() ? HudiTimeline.makeInflightSavePointFileName(timestamp)
+                    : HudiTimeline.makeSavePointFileName(timestamp);
+        }
+        else if (HudiTimeline.DELTA_COMMIT_ACTION.equals(action)) {
+            return isInflight() ? HudiTimeline.makeInflightDeltaFileName(timestamp)
+                    : isRequested() ? HudiTimeline.makeRequestedDeltaFileName(timestamp)
+                    : HudiTimeline.makeDeltaFileName(timestamp);
+        }
+        else if (HudiTimeline.COMPACTION_ACTION.equals(action)) {
+            if (isInflight()) {
+                return HudiTimeline.makeInflightCompactionFileName(timestamp);
+            }
+            else if (isRequested()) {
+                return HudiTimeline.makeRequestedCompactionFileName(timestamp);
+            }
+            else {
+                return HudiTimeline.makeCommitFileName(timestamp);
+            }
+        }
+        else if (HudiTimeline.RESTORE_ACTION.equals(action)) {
+            return isInflight() ? HudiTimeline.makeInflightRestoreFileName(timestamp)
+                    : isRequested() ? HudiTimeline.makeRequestedRestoreFileName(timestamp)
+                    : HudiTimeline.makeRestoreFileName(timestamp);
+        }
+        else if (HudiTimeline.REPLACE_COMMIT_ACTION.equals(action)) {
+            return isInflight() ? HudiTimeline.makeInflightReplaceFileName(timestamp)
+                    : isRequested() ? HudiTimeline.makeRequestedReplaceFileName(timestamp)
+                    : HudiTimeline.makeReplaceFileName(timestamp);
+        }
+        else if (HudiTimeline.INDEXING_ACTION.equals(action)) {
+            return isInflight() ? HudiTimeline.makeInflightIndexFileName(timestamp)
+                    : isRequested() ? HudiTimeline.makeRequestedIndexFileName(timestamp)
+                    : HudiTimeline.makeIndexCommitFileName(timestamp);
+        }
+        else if (HudiTimeline.SCHEMA_COMMIT_ACTION.equals(action)) {
+            return isInflight() ? HudiTimeline.makeInflightSchemaFileName(timestamp)
+                    : isRequested() ? HudiTimeline.makeRequestSchemaFileName(timestamp)
+                    : HudiTimeline.makeSchemaFileName(timestamp);
+        }
+        throw new IllegalArgumentException("Cannot get file name for unknown action " + action);
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        HudiInstant that = (HudiInstant) o;
+        return state == that.state && Objects.equals(action, that.action) && Objects.equals(timestamp, that.timestamp);
+    }
+
+    public HudiInstant.State getState()
+    {
+        return state;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(state, action, timestamp);
+    }
+
+    @Override
+    public int compareTo(HudiInstant o)
+    {
+        return COMPARATOR.compare(this, o);
+    }
+
+    @Override
+    public String toString()
+    {
+        return "[" + ((isInflight() || isRequested()) ? "==>" : "") + timestamp + "__" + action + "__" + state + "]";
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/model/HudiReplaceCommitMetadata.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/model/HudiReplaceCommitMetadata.java
new file mode 100644
index 000000000000..fc1f574ccc76
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/model/HudiReplaceCommitMetadata.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableMap;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class HudiReplaceCommitMetadata
+{
+    private final Map<String, List<String>> partitionToReplaceFileIds;
+    private final boolean compacted;
+
+    @JsonCreator
+    public HudiReplaceCommitMetadata(
+            @JsonProperty("partitionToReplaceFileIds") Map<String, List<String>> partitionToReplaceFileIds,
+            @JsonProperty("compacted") boolean compacted)
+    {
+        this.partitionToReplaceFileIds = ImmutableMap.copyOf(requireNonNull(partitionToReplaceFileIds, "partitionToReplaceFileIds is null"));
+        this.compacted = compacted;
+    }
+
+    public Map<String, List<String>> getPartitionToReplaceFileIds()
+    {
+        return partitionToReplaceFileIds;
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        HudiReplaceCommitMetadata that = (HudiReplaceCommitMetadata) o;
+
+        return partitionToReplaceFileIds.equals(that.partitionToReplaceFileIds) &&
+               compacted == that.compacted;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(partitionToReplaceFileIds, compacted);
+    }
+
+    public static <T> T fromBytes(byte[] bytes, ObjectMapper objectMapper, Class<T> clazz)
+            throws IOException
+    {
+        try {
+            String jsonStr = new String(bytes, StandardCharsets.UTF_8);
+            if (jsonStr == null || jsonStr.isEmpty()) {
+                return clazz.getConstructor().newInstance();
+            }
+            return objectMapper.readValue(jsonStr, clazz);
+        }
+        catch (Exception e) {
+            throw new IOException("unable to read commit metadata", e);
+        }
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("partitionToReplaceFileIds", partitionToReplaceFileIds)
+                .add("compacted", compacted)
+                .toString();
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/model/HudiTableType.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/model/HudiTableType.java
new file mode 100644
index 000000000000..da93f80d95b0
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/model/HudiTableType.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.model;
+
+/**
+ * Type of the Hoodie Table.
+ * <p>
+ * Currently, 2 types are supported.
+ * <ul>
+ * <li> COPY_ON_WRITE - Performs upserts by versioning entire files, with later versions containing newer value of a record.
+ * <li> MERGE_ON_READ - Speeds up upserts, by delaying merge until enough work piles up.
+ * </ul>
+ */
+public enum HudiTableType
+{
+    COPY_ON_WRITE,
+    MERGE_ON_READ
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/partition/HiveHudiPartitionInfo.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/partition/HiveHudiPartitionInfo.java
index ef410530af03..b351d0096b36 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/partition/HiveHudiPartitionInfo.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/partition/HiveHudiPartitionInfo.java
@@ -13,6 +13,8 @@
  */
 package io.trino.plugin.hudi.partition;
 
+import com.google.common.collect.ImmutableList;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.HivePartitionKey;
 import io.trino.plugin.hive.metastore.Column;
@@ -20,16 +22,15 @@
 import io.trino.plugin.hive.metastore.Partition;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.plugin.hive.util.HiveUtil;
+import io.trino.spi.TrinoException;
 import io.trino.spi.predicate.TupleDomain;
-import org.apache.hadoop.fs.Path;
-import org.apache.hudi.common.fs.FSUtils;
-import org.apache.hudi.exception.HoodieIOException;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
+import static io.trino.plugin.hudi.HudiErrorCode.HUDI_PARTITION_NOT_FOUND;
 import static io.trino.plugin.hudi.HudiUtil.buildPartitionKeys;
 import static io.trino.plugin.hudi.HudiUtil.partitionMatchesPredicates;
 import static java.lang.String.format;
@@ -75,12 +76,6 @@ public String getRelativePartitionPath()
         return relativePartitionPath;
     }
 
-    @Override
-    public String getHivePartitionName()
-    {
-        return hivePartitionName;
-    }
-
     @Override
     public List<HivePartitionKey> getHivePartitionKeys()
     {
@@ -93,27 +88,44 @@ public List<HivePartitionKey> getHivePartitionKeys()
     @Override
     public boolean doesMatchPredicates()
     {
+        if (hivePartitionName.equals("")) {
+            hivePartitionKeys = ImmutableList.of();
+            return true;
+        }
         return partitionMatchesPredicates(table.getSchemaTableName(), hivePartitionName, partitionColumnHandles, constraintSummary);
     }
 
-    @Override
-    public String getComparingKey()
-    {
-        return hivePartitionName;
-    }
-
     @Override
     public void loadPartitionInfo(Optional<Partition> partition)
     {
         if (partition.isEmpty()) {
-            throw new HoodieIOException(format("Cannot find partition in Hive Metastore: %s", hivePartitionName));
+            throw new TrinoException(HUDI_PARTITION_NOT_FOUND, format("Cannot find partition in Hive Metastore: %s", hivePartitionName));
         }
-        this.relativePartitionPath = FSUtils.getRelativePartitionPath(
-                new Path(table.getStorage().getLocation()),
-                new Path(partition.get().getStorage().getLocation()));
+        this.relativePartitionPath = getRelativePartitionPath(
+                Location.of(table.getStorage().getLocation()),
+                Location.of(partition.get().getStorage().getLocation()));
         this.hivePartitionKeys = buildPartitionKeys(partitionColumns, partition.get().getValues());
     }
 
+    private static String getRelativePartitionPath(Location baseLocation, Location fullPartitionLocation)
+    {
+        String basePath = baseLocation.path();
+        String fullPartitionPath = fullPartitionLocation.path();
+
+        if (!fullPartitionPath.startsWith(basePath)) {
+            throw new IllegalArgumentException("Partition location does not belong to base-location");
+        }
+
+        String baseLocationParent = baseLocation.parentDirectory().path();
+        String baseLocationName = baseLocation.fileName();
+        int partitionStartIndex = fullPartitionPath.indexOf(
+                baseLocationName,
+                baseLocationParent == null ? 0 : baseLocationParent.length());
+        // Partition-Path could be empty for non-partitioned tables
+        boolean isNonPartitionedTable = partitionStartIndex + baseLocationName.length() == fullPartitionPath.length();
+        return isNonPartitionedTable ? "" : fullPartitionPath.substring(partitionStartIndex + baseLocationName.length() + 1);
+    }
+
     @Override
     public String toString()
     {
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/partition/HudiPartitionInfo.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/partition/HudiPartitionInfo.java
index cad434ea6670..3fceb4ef07c6 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/partition/HudiPartitionInfo.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/partition/HudiPartitionInfo.java
@@ -23,13 +23,9 @@ public interface HudiPartitionInfo
 {
     String getRelativePartitionPath();
 
-    String getHivePartitionName();
-
     List<HivePartitionKey> getHivePartitionKeys();
 
     boolean doesMatchPredicates();
 
-    String getComparingKey();
-
     void loadPartitionInfo(Optional<Partition> partition);
 }
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/partition/HudiPartitionInfoLoader.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/partition/HudiPartitionInfoLoader.java
index bf501a777d3d..82a0b4216101 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/partition/HudiPartitionInfoLoader.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/partition/HudiPartitionInfoLoader.java
@@ -13,110 +13,70 @@
  */
 package io.trino.plugin.hudi.partition;
 
-import io.trino.plugin.hive.metastore.Partition;
+import io.airlift.concurrent.MoreFutures;
+import io.trino.plugin.hive.HivePartitionKey;
+import io.trino.plugin.hive.util.AsyncQueue;
+import io.trino.plugin.hudi.HudiFileStatus;
 import io.trino.plugin.hudi.query.HudiDirectoryLister;
-import io.trino.spi.connector.ConnectorSession;
-import org.apache.hudi.exception.HoodieIOException;
+import io.trino.plugin.hudi.split.HudiSplitFactory;
+import io.trino.spi.connector.ConnectorSplit;
 
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Deque;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.stream.Collectors;
-
-import static io.trino.plugin.hudi.HudiSessionProperties.getMaxPartitionBatchSize;
-import static io.trino.plugin.hudi.HudiSessionProperties.getMinPartitionBatchSize;
 
 public class HudiPartitionInfoLoader
         implements Runnable
 {
     private final HudiDirectoryLister hudiDirectoryLister;
-    private final int minPartitionBatchSize;
-    private final int maxPartitionBatchSize;
-    private final Deque<HudiPartitionInfo> partitionQueue;
-    private int currentBatchSize;
+    private final HudiSplitFactory hudiSplitFactory;
+    private final AsyncQueue<ConnectorSplit> asyncQueue;
+    private final Deque<String> partitionQueue;
+
+    private boolean isRunning;
 
     public HudiPartitionInfoLoader(
-            ConnectorSession session,
-            HudiDirectoryLister hudiDirectoryLister)
+            HudiDirectoryLister hudiDirectoryLister,
+            HudiSplitFactory hudiSplitFactory,
+            AsyncQueue<ConnectorSplit> asyncQueue,
+            Deque<String> partitionQueue)
     {
         this.hudiDirectoryLister = hudiDirectoryLister;
-        this.partitionQueue = new ConcurrentLinkedDeque<>();
-        this.minPartitionBatchSize = getMinPartitionBatchSize(session);
-        this.maxPartitionBatchSize = getMaxPartitionBatchSize(session);
-        this.currentBatchSize = -1;
+        this.hudiSplitFactory = hudiSplitFactory;
+        this.asyncQueue = asyncQueue;
+        this.partitionQueue = partitionQueue;
+        this.isRunning = true;
     }
 
     @Override
     public void run()
     {
-        List<HudiPartitionInfo> hudiPartitionInfoList = hudiDirectoryLister.getPartitionsToScan().stream()
-                .sorted(Comparator.comparing(HudiPartitionInfo::getComparingKey))
-                .collect(Collectors.toList());
-
-        // empty partitioned table
-        if (hudiPartitionInfoList.isEmpty()) {
-            return;
-        }
-
-        // non-partitioned table
-        if (hudiPartitionInfoList.size() == 1 && hudiPartitionInfoList.get(0).getHivePartitionName().isEmpty()) {
-            partitionQueue.addAll(hudiPartitionInfoList);
-            return;
-        }
+        while (isRunning || !partitionQueue.isEmpty()) {
+            String partitionName = partitionQueue.poll();
 
-        boolean shouldUseHiveMetastore = hudiPartitionInfoList.get(0) instanceof HiveHudiPartitionInfo;
-        Iterator<HudiPartitionInfo> iterator = hudiPartitionInfoList.iterator();
-        while (iterator.hasNext()) {
-            int batchSize = updateBatchSize();
-            List<HudiPartitionInfo> partitionInfoBatch = new ArrayList<>();
-            while (iterator.hasNext() && batchSize > 0) {
-                partitionInfoBatch.add(iterator.next());
-                batchSize--;
-            }
-
-            if (!partitionInfoBatch.isEmpty()) {
-                if (shouldUseHiveMetastore) {
-                    Map<String, Optional<Partition>> partitions = hudiDirectoryLister.getPartitions(partitionInfoBatch.stream()
-                            .map(HudiPartitionInfo::getHivePartitionName)
-                            .collect(Collectors.toList()));
-                    for (HudiPartitionInfo partitionInfo : partitionInfoBatch) {
-                        String hivePartitionName = partitionInfo.getHivePartitionName();
-                        if (!partitions.containsKey(hivePartitionName)) {
-                            throw new HoodieIOException("Partition does not exist: " + hivePartitionName);
-                        }
-                        partitionInfo.loadPartitionInfo(partitions.get(hivePartitionName));
-                        partitionQueue.add(partitionInfo);
-                    }
-                }
-                else {
-                    for (HudiPartitionInfo partitionInfo : partitionInfoBatch) {
-                        partitionInfo.getHivePartitionKeys();
-                        partitionQueue.add(partitionInfo);
-                    }
-                }
+            if (partitionName != null) {
+                generateSplitsFromPartition(partitionName);
             }
         }
     }
 
-    public Deque<HudiPartitionInfo> getPartitionQueue()
+    private void generateSplitsFromPartition(String partitionName)
     {
-        return partitionQueue;
+        Optional<HudiPartitionInfo> partitionInfo = hudiDirectoryLister.getPartitionInfo(partitionName);
+        partitionInfo.ifPresent(hudiPartitionInfo -> {
+            if (hudiPartitionInfo.doesMatchPredicates() || partitionName.equals("")) {
+                List<HivePartitionKey> partitionKeys = hudiPartitionInfo.getHivePartitionKeys();
+                List<HudiFileStatus> partitionFiles = hudiDirectoryLister.listStatus(hudiPartitionInfo);
+                partitionFiles.stream()
+                        .flatMap(fileStatus -> hudiSplitFactory.createSplits(partitionKeys, fileStatus).stream())
+                        .map(asyncQueue::offer)
+                        .forEachOrdered(MoreFutures::getFutureValue);
+            }
+        });
     }
 
-    private int updateBatchSize()
+    public void stopRunning()
     {
-        if (currentBatchSize <= 0) {
-            currentBatchSize = minPartitionBatchSize;
-        }
-        else {
-            currentBatchSize *= 2;
-            currentBatchSize = Math.min(currentBatchSize, maxPartitionBatchSize);
-        }
-        return currentBatchSize;
+        this.isRunning = false;
     }
 }
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/query/HudiDirectoryLister.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/query/HudiDirectoryLister.java
index 401e0f35e844..710dfc44916c 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/query/HudiDirectoryLister.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/query/HudiDirectoryLister.java
@@ -13,21 +13,17 @@
  */
 package io.trino.plugin.hudi.query;
 
-import io.trino.plugin.hive.metastore.Partition;
+import io.trino.plugin.hudi.HudiFileStatus;
 import io.trino.plugin.hudi.partition.HudiPartitionInfo;
-import org.apache.hadoop.fs.FileStatus;
 
 import java.io.Closeable;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 
 public interface HudiDirectoryLister
         extends Closeable
 {
-    List<HudiPartitionInfo> getPartitionsToScan();
+    List<HudiFileStatus> listStatus(HudiPartitionInfo partitionInfo);
 
-    List<FileStatus> listStatus(HudiPartitionInfo partitionInfo);
-
-    Map<String, Optional<Partition>> getPartitions(List<String> partitionNames);
+    Optional<HudiPartitionInfo> getPartitionInfo(String partition);
 }
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/query/HudiReadOptimizedDirectoryLister.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/query/HudiReadOptimizedDirectoryLister.java
index 92aad499ce63..869806461c77 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/query/HudiReadOptimizedDirectoryLister.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/query/HudiReadOptimizedDirectoryLister.java
@@ -16,109 +16,70 @@
 import io.trino.plugin.hive.HiveColumnHandle;
 import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.HiveMetastore;
-import io.trino.plugin.hive.metastore.MetastoreUtil;
-import io.trino.plugin.hive.metastore.Partition;
 import io.trino.plugin.hive.metastore.Table;
+import io.trino.plugin.hudi.HudiFileStatus;
 import io.trino.plugin.hudi.HudiTableHandle;
+import io.trino.plugin.hudi.files.HudiBaseFile;
 import io.trino.plugin.hudi.partition.HiveHudiPartitionInfo;
 import io.trino.plugin.hudi.partition.HudiPartitionInfo;
-import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.connector.TableNotFoundException;
-import io.trino.spi.predicate.TupleDomain;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hudi.common.config.HoodieMetadataConfig;
-import org.apache.hudi.common.engine.HoodieEngineContext;
-import org.apache.hudi.common.table.HoodieTableMetaClient;
-import org.apache.hudi.common.table.view.FileSystemViewManager;
-import org.apache.hudi.common.table.view.HoodieTableFileSystemView;
+import io.trino.plugin.hudi.table.HudiTableFileSystemView;
+import io.trino.plugin.hudi.table.HudiTableMetaClient;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.plugin.hudi.HudiUtil.getFileStatus;
 
 public class HudiReadOptimizedDirectoryLister
         implements HudiDirectoryLister
 {
-    private final HudiTableHandle tableHandle;
-    private final HiveMetastore hiveMetastore;
-    private final Table hiveTable;
-    private final SchemaTableName tableName;
-    private final List<HiveColumnHandle> partitionColumnHandles;
-    private final HoodieTableFileSystemView fileSystemView;
-    private final TupleDomain<String> partitionKeysFilter;
+    private final HudiTableFileSystemView fileSystemView;
     private final List<Column> partitionColumns;
-
-    private List<String> hivePartitionNames;
+    private final Map<String, HudiPartitionInfo> allPartitionInfoMap;
 
     public HudiReadOptimizedDirectoryLister(
-            HoodieMetadataConfig metadataConfig,
-            HoodieEngineContext engineContext,
             HudiTableHandle tableHandle,
-            HoodieTableMetaClient metaClient,
+            HudiTableMetaClient metaClient,
             HiveMetastore hiveMetastore,
             Table hiveTable,
-            List<HiveColumnHandle> partitionColumnHandles)
+            List<HiveColumnHandle> partitionColumnHandles,
+            List<String> hivePartitionNames)
     {
-        this.tableHandle = tableHandle;
-        this.tableName = tableHandle.getSchemaTableName();
-        this.hiveMetastore = hiveMetastore;
-        this.hiveTable = hiveTable;
-        this.partitionColumnHandles = partitionColumnHandles;
-        this.fileSystemView = FileSystemViewManager.createInMemoryFileSystemView(engineContext, metaClient, metadataConfig);
-        this.partitionKeysFilter = MetastoreUtil.computePartitionKeyFilter(partitionColumnHandles, tableHandle.getPartitionPredicates());
+        this.fileSystemView = new HudiTableFileSystemView(metaClient, metaClient.getActiveTimeline().getCommitsTimeline().filterCompletedInstants());
         this.partitionColumns = hiveTable.getPartitionColumns();
+        this.allPartitionInfoMap = hivePartitionNames.stream()
+                .collect(Collectors.toMap(
+                        Function.identity(),
+                        hivePartitionName -> new HiveHudiPartitionInfo(
+                                hivePartitionName,
+                                partitionColumns,
+                                partitionColumnHandles,
+                                tableHandle.getPartitionPredicates(),
+                                hiveTable,
+                                hiveMetastore)));
     }
 
     @Override
-    public List<HudiPartitionInfo> getPartitionsToScan()
-    {
-        if (hivePartitionNames == null) {
-            hivePartitionNames = partitionColumns.isEmpty()
-                    ? Collections.singletonList("")
-                    : getPartitionNamesFromHiveMetastore(partitionKeysFilter);
-        }
-
-        List<HudiPartitionInfo> allPartitionInfoList = hivePartitionNames.stream()
-                .map(hivePartitionName -> new HiveHudiPartitionInfo(
-                        hivePartitionName,
-                        partitionColumns,
-                        partitionColumnHandles,
-                        tableHandle.getPartitionPredicates(),
-                        hiveTable,
-                        hiveMetastore))
-                .collect(Collectors.toList());
-
-        return allPartitionInfoList.stream()
-                .filter(partitionInfo -> partitionInfo.getHivePartitionKeys().isEmpty() || partitionInfo.doesMatchPredicates())
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public List<FileStatus> listStatus(HudiPartitionInfo partitionInfo)
+    public List<HudiFileStatus> listStatus(HudiPartitionInfo partitionInfo)
     {
         return fileSystemView.getLatestBaseFiles(partitionInfo.getRelativePartitionPath())
-                .map(baseFile -> getFileStatus(baseFile))
+                .map(HudiBaseFile::getFileEntry)
+                .map(fileEntry -> new HudiFileStatus(
+                        fileEntry.location(),
+                        false,
+                        fileEntry.length(),
+                        fileEntry.lastModified().toEpochMilli(),
+                        fileEntry.blocks().map(listOfBlocks -> (!listOfBlocks.isEmpty()) ? listOfBlocks.get(0).length() : 0).orElse(0L)))
                 .collect(toImmutableList());
     }
 
-    private List<String> getPartitionNamesFromHiveMetastore(TupleDomain<String> partitionKeysFilter)
-    {
-        return hiveMetastore.getPartitionNamesByFilter(
-                tableName.getSchemaName(),
-                tableName.getTableName(),
-                partitionColumns.stream().map(Column::getName).collect(Collectors.toList()),
-                partitionKeysFilter).orElseThrow(() -> new TableNotFoundException(tableHandle.getSchemaTableName()));
-    }
-
     @Override
-    public Map<String, Optional<Partition>> getPartitions(List<String> partitionNames)
+    public Optional<HudiPartitionInfo> getPartitionInfo(String partition)
     {
-        return hiveMetastore.getPartitionsByNames(hiveTable, partitionNames);
+        return Optional.ofNullable(allPartitionInfoMap.get(partition));
     }
 
     @Override
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/split/HudiBackgroundSplitLoader.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/split/HudiBackgroundSplitLoader.java
index b9ca3cbe60d2..31447f74d086 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/split/HudiBackgroundSplitLoader.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/split/HudiBackgroundSplitLoader.java
@@ -13,103 +13,82 @@
  */
 package io.trino.plugin.hudi.split;
 
-import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import io.airlift.concurrent.MoreFutures;
-import io.trino.plugin.hive.HivePartitionKey;
 import io.trino.plugin.hive.util.AsyncQueue;
 import io.trino.plugin.hudi.HudiTableHandle;
-import io.trino.plugin.hudi.partition.HudiPartitionInfo;
 import io.trino.plugin.hudi.partition.HudiPartitionInfoLoader;
 import io.trino.plugin.hudi.query.HudiDirectoryLister;
+import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplit;
-import org.apache.hadoop.fs.FileStatus;
 
-import java.util.Collection;
+import java.util.ArrayList;
+import java.util.Deque;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
 
-import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static io.trino.plugin.hudi.HudiErrorCode.HUDI_CANNOT_OPEN_SPLIT;
+import static io.trino.plugin.hudi.HudiSessionProperties.getSplitGeneratorParallelism;
 import static java.util.Objects.requireNonNull;
 
 public class HudiBackgroundSplitLoader
+        implements Runnable
 {
-    private final ConnectorSession session;
     private final HudiDirectoryLister hudiDirectoryLister;
     private final AsyncQueue<ConnectorSplit> asyncQueue;
-    private final ExecutorService executor;
-    private final Consumer<Throwable> errorListener;
+    private final Executor splitGeneratorExecutor;
+    private final int splitGeneratorNumThreads;
     private final HudiSplitFactory hudiSplitFactory;
+    private final List<String> partitions;
 
     public HudiBackgroundSplitLoader(
             ConnectorSession session,
             HudiTableHandle tableHandle,
             HudiDirectoryLister hudiDirectoryLister,
             AsyncQueue<ConnectorSplit> asyncQueue,
-            ExecutorService executor,
+            Executor splitGeneratorExecutor,
             HudiSplitWeightProvider hudiSplitWeightProvider,
-            Consumer<Throwable> errorListener)
+            List<String> partitions)
     {
-        this.session = requireNonNull(session, "session is null");
         this.hudiDirectoryLister = requireNonNull(hudiDirectoryLister, "hudiDirectoryLister is null");
         this.asyncQueue = requireNonNull(asyncQueue, "asyncQueue is null");
-        this.executor = requireNonNull(executor, "executor is null");
-        this.errorListener = requireNonNull(errorListener, "errorListener is null");
+        this.splitGeneratorExecutor = requireNonNull(splitGeneratorExecutor, "splitGeneratorExecutorService is null");
+        this.splitGeneratorNumThreads = getSplitGeneratorParallelism(session);
         this.hudiSplitFactory = new HudiSplitFactory(tableHandle, hudiSplitWeightProvider);
+        this.partitions = requireNonNull(partitions, "partitions is null");
     }
 
-    public void start()
+    @Override
+    public void run()
     {
-        ListenableFuture<Collection<HudiPartitionInfo>> partitionsFuture = Futures.submit(this::loadPartitions, executor);
-        hookErrorListener(partitionsFuture);
+        Deque<String> partitionQueue = new ConcurrentLinkedDeque<>(partitions);
+        List<HudiPartitionInfoLoader> splitGeneratorList = new ArrayList<>();
+        List<Future> splitGeneratorFutures = new ArrayList<>();
 
-        ListenableFuture<Void> splitFutures = Futures.transform(
-                partitionsFuture,
-                partitions -> {
-                    List<ListenableFuture<Void>> futures = partitions.stream()
-                            .map(partition -> Futures.submit(() -> loadSplits(partition), executor))
-                            .peek(this::hookErrorListener)
-                            .collect(Collectors.toList());
-                    Futures.whenAllComplete(futures).run(asyncQueue::finish, directExecutor());
-                    return null;
-                },
-                directExecutor());
-        hookErrorListener(splitFutures);
-    }
+        // Start a number of partition split generators to generate the splits in parallel
+        for (int i = 0; i < splitGeneratorNumThreads; i++) {
+            HudiPartitionInfoLoader generator = new HudiPartitionInfoLoader(hudiDirectoryLister, hudiSplitFactory, asyncQueue, partitionQueue);
+            splitGeneratorList.add(generator);
+            splitGeneratorFutures.add(Futures.submit(generator, splitGeneratorExecutor));
+        }
 
-    private Collection<HudiPartitionInfo> loadPartitions()
-    {
-        HudiPartitionInfoLoader partitionInfoLoader = new HudiPartitionInfoLoader(session, hudiDirectoryLister);
-        partitionInfoLoader.run();
-        return partitionInfoLoader.getPartitionQueue();
-    }
+        for (HudiPartitionInfoLoader generator : splitGeneratorList) {
+            // Let the split generator stop once the partition queue is empty
+            generator.stopRunning();
+        }
 
-    private void loadSplits(HudiPartitionInfo partition)
-    {
-        List<HivePartitionKey> partitionKeys = partition.getHivePartitionKeys();
-        List<FileStatus> partitionFiles = hudiDirectoryLister.listStatus(partition);
-        partitionFiles.stream()
-                .flatMap(fileStatus -> hudiSplitFactory.createSplits(partitionKeys, fileStatus))
-                .map(asyncQueue::offer)
-                .forEachOrdered(MoreFutures::getFutureValue);
-    }
-
-    private <T> void hookErrorListener(ListenableFuture<T> future)
-    {
-        Futures.addCallback(future, new FutureCallback<T>()
-        {
-            @Override
-            public void onSuccess(T result) {}
-
-            @Override
-            public void onFailure(Throwable t)
-            {
-                errorListener.accept(t);
+        // Wait for all split generators to finish
+        for (Future future : splitGeneratorFutures) {
+            try {
+                future.get();
+            }
+            catch (InterruptedException | ExecutionException e) {
+                throw new TrinoException(HUDI_CANNOT_OPEN_SPLIT, "Error generating Hudi split", e);
             }
-        }, directExecutor());
+        }
+        asyncQueue.finish();
     }
 }
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/split/HudiSplitFactory.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/split/HudiSplitFactory.java
index 97412e2a4648..ccae0b5a38f8 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/split/HudiSplitFactory.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/split/HudiSplitFactory.java
@@ -15,19 +15,15 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.plugin.hive.HivePartitionKey;
+import io.trino.plugin.hudi.HudiFileStatus;
 import io.trino.plugin.hudi.HudiSplit;
 import io.trino.plugin.hudi.HudiTableHandle;
 import io.trino.spi.TrinoException;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.FileSplit;
-import org.apache.hudi.hadoop.PathWithBootstrapFileStatus;
 
-import java.io.IOException;
 import java.util.List;
-import java.util.stream.Stream;
 
-import static io.trino.plugin.hudi.HudiErrorCode.HUDI_CANNOT_OPEN_SPLIT;
+import static io.trino.plugin.hudi.HudiErrorCode.HUDI_FILESYSTEM_ERROR;
+import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class HudiSplitFactory
@@ -45,63 +41,53 @@ public HudiSplitFactory(
         this.hudiSplitWeightProvider = requireNonNull(hudiSplitWeightProvider, "hudiSplitWeightProvider is null");
     }
 
-    public Stream<HudiSplit> createSplits(List<HivePartitionKey> partitionKeys, FileStatus fileStatus)
-    {
-        List<FileSplit> splits;
-        try {
-            splits = createSplits(fileStatus);
-        }
-        catch (IOException e) {
-            throw new TrinoException(HUDI_CANNOT_OPEN_SPLIT, e);
-        }
-
-        return splits.stream()
-                .map(fileSplit -> new HudiSplit(
-                        fileSplit.getPath().toString(),
-                        fileSplit.getStart(),
-                        fileSplit.getLength(),
-                        fileStatus.getLen(),
-                        fileStatus.getModificationTime(),
-                        ImmutableList.of(),
-                        hudiTableHandle.getRegularPredicates(),
-                        partitionKeys,
-                        hudiSplitWeightProvider.calculateSplitWeight(fileSplit.getLength())));
-    }
-
-    private List<FileSplit> createSplits(FileStatus fileStatus)
-            throws IOException
+    public List<HudiSplit> createSplits(List<HivePartitionKey> partitionKeys, HudiFileStatus fileStatus)
     {
         if (fileStatus.isDirectory()) {
-            throw new IOException("Not a file: " + fileStatus.getPath());
+            throw new TrinoException(HUDI_FILESYSTEM_ERROR, format("Not a valid location: %s", fileStatus.location()));
         }
 
-        Path path = fileStatus.getPath();
-        long length = fileStatus.getLen();
+        long fileSize = fileStatus.length();
 
-        if (length == 0) {
-            return ImmutableList.of(new FileSplit(path, 0, 0, new String[0]));
+        if (fileSize == 0) {
+            return ImmutableList.of(new HudiSplit(
+                    fileStatus.location().toString(),
+                    0,
+                    fileSize,
+                    fileSize,
+                    fileStatus.modificationTime(),
+                    hudiTableHandle.getRegularPredicates(),
+                    partitionKeys,
+                    hudiSplitWeightProvider.calculateSplitWeight(fileSize)));
         }
 
-        if (!isSplitable(path)) {
-            return ImmutableList.of(new FileSplit(path, 0, length, (String[]) null));
-        }
-
-        ImmutableList.Builder<FileSplit> splits = ImmutableList.builder();
-        long splitSize = fileStatus.getBlockSize();
+        ImmutableList.Builder<HudiSplit> splits = ImmutableList.builder();
+        long splitSize = fileStatus.blockSize();
 
-        long bytesRemaining = length;
+        long bytesRemaining = fileSize;
         while (((double) bytesRemaining) / splitSize > SPLIT_SLOP) {
-            splits.add(new FileSplit(path, length - bytesRemaining, splitSize, (String[]) null));
+            splits.add(new HudiSplit(
+                    fileStatus.location().toString(),
+                    fileSize - bytesRemaining,
+                    splitSize,
+                    fileSize,
+                    fileStatus.modificationTime(),
+                    hudiTableHandle.getRegularPredicates(),
+                    partitionKeys,
+                    hudiSplitWeightProvider.calculateSplitWeight(splitSize)));
             bytesRemaining -= splitSize;
         }
-        if (bytesRemaining != 0) {
-            splits.add(new FileSplit(path, length - bytesRemaining, bytesRemaining, (String[]) null));
+        if (bytesRemaining > 0) {
+            splits.add(new HudiSplit(
+                    fileStatus.location().toString(),
+                    fileSize - bytesRemaining,
+                    bytesRemaining,
+                    fileSize,
+                    fileStatus.modificationTime(),
+                    hudiTableHandle.getRegularPredicates(),
+                    partitionKeys,
+                    hudiSplitWeightProvider.calculateSplitWeight(bytesRemaining)));
         }
         return splits.build();
     }
-
-    private static boolean isSplitable(Path filename)
-    {
-        return !(filename instanceof PathWithBootstrapFileStatus);
-    }
 }
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/table/HudiTableFileSystemView.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/table/HudiTableFileSystemView.java
new file mode 100644
index 000000000000..6840be3b3b36
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/table/HudiTableFileSystemView.java
@@ -0,0 +1,482 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.table;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableList;
+import io.airlift.json.ObjectMapperProvider;
+import io.airlift.log.Logger;
+import io.trino.filesystem.FileEntry;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.plugin.hudi.compaction.CompactionOperation;
+import io.trino.plugin.hudi.compaction.HudiCompactionOperation;
+import io.trino.plugin.hudi.compaction.HudiCompactionPlan;
+import io.trino.plugin.hudi.files.HudiBaseFile;
+import io.trino.plugin.hudi.files.HudiFileGroup;
+import io.trino.plugin.hudi.files.HudiFileGroupId;
+import io.trino.plugin.hudi.files.HudiLogFile;
+import io.trino.plugin.hudi.model.HudiFileFormat;
+import io.trino.plugin.hudi.model.HudiInstant;
+import io.trino.plugin.hudi.model.HudiReplaceCommitMetadata;
+import io.trino.plugin.hudi.timeline.HudiTimeline;
+import io.trino.spi.TrinoException;
+import org.apache.avro.file.DataFileReader;
+import org.apache.avro.file.FileReader;
+import org.apache.avro.file.SeekableByteArrayInput;
+import org.apache.avro.io.DatumReader;
+import org.apache.avro.specific.SpecificDatumReader;
+import org.apache.avro.specific.SpecificRecordBase;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Stream;
+
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static io.trino.plugin.hudi.HudiErrorCode.HUDI_BAD_DATA;
+import static io.trino.plugin.hudi.files.FSUtils.LOG_FILE_PATTERN;
+import static io.trino.plugin.hudi.files.FSUtils.getPartitionLocation;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.groupingBy;
+
+public class HudiTableFileSystemView
+{
+    private static final Logger LOG = Logger.get(HudiTableFileSystemView.class);
+    private static final Integer VERSION_2 = 2;
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapperProvider().get();
+    // Locks to control concurrency. Sync operations use write-lock blocking all fetch operations.
+    // For the common-case, we allow concurrent read of single or multiple partitions
+    private final ReentrantReadWriteLock globalLock = new ReentrantReadWriteLock();
+    private final ReentrantReadWriteLock.ReadLock readLock = globalLock.readLock();
+    // Used to concurrently load and populate partition views
+    private final ConcurrentHashMap<String, Boolean> addedPartitions = new ConcurrentHashMap<>(4096);
+
+    private boolean closed;
+
+    private Map<String, List<HudiFileGroup>> partitionToFileGroupsMap;
+    private HudiTableMetaClient metaClient;
+
+    private Map<HudiFileGroupId, Entry<String, CompactionOperation>> fgIdToPendingCompaction;
+
+    private HudiTimeline visibleCommitsAndCompactionTimeline;
+
+    private Map<HudiFileGroupId, HudiInstant> fgIdToReplaceInstants;
+
+    public HudiTableFileSystemView(HudiTableMetaClient metaClient, HudiTimeline visibleActiveTimeline)
+    {
+        partitionToFileGroupsMap = new ConcurrentHashMap<>();
+        this.metaClient = metaClient;
+        this.visibleCommitsAndCompactionTimeline = visibleActiveTimeline.getWriteTimeline();
+        resetFileGroupsReplaced(visibleCommitsAndCompactionTimeline);
+        resetPendingCompactionOperations(getAllPendingCompactionOperations(metaClient)
+                .values().stream()
+                .map(pair -> Map.entry(pair.getKey(), CompactionOperation.convertFromAvroRecordInstance(pair.getValue()))));
+    }
+
+    private static Map<HudiFileGroupId, Entry<String, HudiCompactionOperation>> getAllPendingCompactionOperations(
+            HudiTableMetaClient metaClient)
+    {
+        List<Entry<HudiInstant, HudiCompactionPlan>> pendingCompactionPlanWithInstants =
+                getAllPendingCompactionPlans(metaClient);
+
+        Map<HudiFileGroupId, Entry<String, HudiCompactionOperation>> fgIdToPendingCompactionWithInstantMap = new HashMap<>();
+        pendingCompactionPlanWithInstants.stream()
+                .flatMap(instantPlanPair -> getPendingCompactionOperations(instantPlanPair.getKey(), instantPlanPair.getValue()))
+                .forEach(pair -> {
+                    if (fgIdToPendingCompactionWithInstantMap.containsKey(pair.getKey())) {
+                        HudiCompactionOperation operation = pair.getValue().getValue();
+                        HudiCompactionOperation anotherOperation = fgIdToPendingCompactionWithInstantMap.get(pair.getKey()).getValue();
+
+                        if (!operation.equals(anotherOperation)) {
+                            String msg = "Hudi File Id (" + pair.getKey() + ") has more than 1 pending compactions. Instants: "
+                                    + pair.getValue() + ", " + fgIdToPendingCompactionWithInstantMap.get(pair.getKey());
+                            throw new IllegalStateException(msg);
+                        }
+                    }
+                    fgIdToPendingCompactionWithInstantMap.put(pair.getKey(), pair.getValue());
+                });
+        return fgIdToPendingCompactionWithInstantMap;
+    }
+
+    private static List<Entry<HudiInstant, HudiCompactionPlan>> getAllPendingCompactionPlans(
+            HudiTableMetaClient metaClient)
+    {
+        List<HudiInstant> pendingCompactionInstants =
+                metaClient.getActiveTimeline()
+                        .filterPendingCompactionTimeline()
+                        .getInstants()
+                        .collect(toImmutableList());
+        return pendingCompactionInstants.stream()
+                .map(instant -> {
+                    try {
+                        return Map.entry(instant, getCompactionPlan(metaClient, instant.getTimestamp()));
+                    }
+                    catch (IOException e) {
+                        throw new TrinoException(HUDI_BAD_DATA, e);
+                    }
+                })
+                .collect(toImmutableList());
+    }
+
+    private static HudiCompactionPlan getCompactionPlan(HudiTableMetaClient metaClient, String compactionInstant)
+            throws IOException
+    {
+        HudiCompactionPlan compactionPlan = deserializeAvroMetadata(
+                metaClient
+                        .getActiveTimeline()
+                        .readCompactionPlanAsBytes(HudiTimeline.getCompactionRequestedInstant(compactionInstant)).get(),
+                HudiCompactionPlan.class);
+        return upgradeToLatest(compactionPlan, compactionPlan.getVersion());
+    }
+
+    private static HudiCompactionPlan upgradeToLatest(HudiCompactionPlan metadata, int metadataVersion)
+    {
+        if (metadataVersion == VERSION_2) {
+            return metadata;
+        }
+        checkState(metadataVersion == 1, "Lowest supported metadata version is 1");
+        List<HudiCompactionOperation> v2CompactionOperationList = new ArrayList<>();
+        if (null != metadata.getOperations()) {
+            v2CompactionOperationList = metadata.getOperations().stream()
+                    .map(compactionOperation ->
+                            HudiCompactionOperation.newBuilder()
+                                    .setBaseInstantTime(compactionOperation.getBaseInstantTime())
+                                    .setFileId(compactionOperation.getFileId())
+                                    .setPartitionPath(compactionOperation.getPartitionPath())
+                                    .setMetrics(compactionOperation.getMetrics())
+                                    .setDataFilePath(compactionOperation.getDataFilePath() == null ? null : Location.of(compactionOperation.getDataFilePath()).fileName())
+                                    .setDeltaFilePaths(compactionOperation.getDeltaFilePaths().stream().map(filePath -> Location.of(filePath).fileName()).collect(toImmutableList()))
+                                    .build())
+                    .collect(toImmutableList());
+        }
+        return new HudiCompactionPlan(v2CompactionOperationList, metadata.getExtraMetadata(), VERSION_2);
+    }
+
+    private static <T extends SpecificRecordBase> T deserializeAvroMetadata(byte[] bytes, Class<T> clazz)
+            throws IOException
+    {
+        DatumReader<T> reader = new SpecificDatumReader<>(clazz);
+        FileReader<T> fileReader = DataFileReader.openReader(new SeekableByteArrayInput(bytes), reader);
+        checkState(fileReader.hasNext(), "Could not deserialize metadata of type " + clazz);
+        return fileReader.next();
+    }
+
+    private static Stream<Entry<HudiFileGroupId, Entry<String, HudiCompactionOperation>>> getPendingCompactionOperations(
+            HudiInstant instant, HudiCompactionPlan compactionPlan)
+    {
+        List<HudiCompactionOperation> ops = compactionPlan.getOperations();
+        if (null != ops) {
+            return ops.stream().map(op -> Map.entry(
+                    new HudiFileGroupId(op.getPartitionPath(), op.getFileId()),
+                    Map.entry(instant.getTimestamp(), op)));
+        }
+        return Stream.empty();
+    }
+
+    private void resetPendingCompactionOperations(Stream<Entry<String, CompactionOperation>> operations)
+    {
+        this.fgIdToPendingCompaction = operations.collect(toImmutableMap(
+                entry -> entry.getValue().getFileGroupId(),
+                identity()));
+    }
+
+    private void resetFileGroupsReplaced(HudiTimeline timeline)
+    {
+        // for each REPLACE instant, get map of (partitionPath -> deleteFileGroup)
+        HudiTimeline replacedTimeline = timeline.getCompletedReplaceTimeline();
+        Map<HudiFileGroupId, HudiInstant> replacedFileGroups = replacedTimeline.getInstants()
+                .flatMap(instant -> {
+                    try {
+                        HudiReplaceCommitMetadata replaceMetadata = HudiReplaceCommitMetadata.fromBytes(
+                                metaClient.getActiveTimeline().getInstantDetails(instant).get(),
+                                OBJECT_MAPPER,
+                                HudiReplaceCommitMetadata.class);
+
+                        // get replace instant mapping for each partition, fileId
+                        return replaceMetadata.getPartitionToReplaceFileIds().entrySet().stream()
+                                .flatMap(entry -> entry.getValue().stream().map(fileId ->
+                                        Map.entry(new HudiFileGroupId(entry.getKey(), fileId), instant)));
+                    }
+                    catch (IOException e) {
+                        throw new TrinoException(HUDI_BAD_DATA, "error reading commit metadata for " + instant, e);
+                    }
+                })
+                .collect(toImmutableMap(Entry::getKey, Entry::getValue));
+        fgIdToReplaceInstants = new ConcurrentHashMap<>(replacedFileGroups);
+    }
+
+    public final Stream<HudiBaseFile> getLatestBaseFiles(String partitionStr)
+    {
+        try {
+            readLock.lock();
+            String partitionPath = formatPartitionKey(partitionStr);
+            ensurePartitionLoadedCorrectly(partitionPath);
+            return fetchLatestBaseFiles(partitionPath)
+                    .filter(hudiBaseFile -> !isFileGroupReplaced(partitionPath, hudiBaseFile.getFileId()));
+        }
+        finally {
+            readLock.unlock();
+        }
+    }
+
+    private boolean isFileGroupReplaced(String partitionPath, String fileId)
+    {
+        return isFileGroupReplaced(new HudiFileGroupId(partitionPath, fileId));
+    }
+
+    private String formatPartitionKey(String partitionStr)
+    {
+        return partitionStr.endsWith("/") ? partitionStr.substring(0, partitionStr.length() - 1) : partitionStr;
+    }
+
+    private void ensurePartitionLoadedCorrectly(String partition)
+    {
+        checkState(!isClosed(), "View is already closed");
+
+        addedPartitions.computeIfAbsent(partition, (partitionPathStr) -> {
+            long beginTs = System.currentTimeMillis();
+            if (!isPartitionAvailableInStore(partitionPathStr)) {
+                // Not loaded yet
+                try {
+                    LOG.info("Building file system view for partition (" + partitionPathStr + ")");
+
+                    Location partitionLocation = getPartitionLocation(metaClient.getBasePath(), partitionPathStr);
+                    FileIterator partitionFiles = listPartition(partitionLocation);
+                    List<HudiFileGroup> groups = addFilesToView(partitionFiles);
+
+                    if (groups.isEmpty()) {
+                        storePartitionView(partitionPathStr, new ArrayList<>());
+                    }
+                }
+                catch (IOException e) {
+                    throw new TrinoException(HUDI_BAD_DATA, "Failed to list base files in partition " + partitionPathStr, e);
+                }
+            }
+            else {
+                LOG.debug("View already built for Partition :" + partitionPathStr + ", FOUND is ");
+            }
+            long endTs = System.currentTimeMillis();
+            LOG.debug("Time to load partition (" + partitionPathStr + ") =" + (endTs - beginTs));
+            return true;
+        });
+    }
+
+    protected boolean isPartitionAvailableInStore(String partitionPath)
+    {
+        return partitionToFileGroupsMap.containsKey(partitionPath);
+    }
+
+    private FileIterator listPartition(Location partitionLocation)
+            throws IOException
+    {
+        FileIterator fileIterator = metaClient.getFileSystem().listFiles(partitionLocation);
+        if (fileIterator.hasNext()) {
+            return fileIterator;
+        }
+        try (OutputStream ignored = metaClient.getFileSystem().newOutputFile(partitionLocation).create()) {
+            return FileIterator.empty();
+        }
+    }
+
+    public List<HudiFileGroup> addFilesToView(FileIterator partitionFiles)
+            throws IOException
+    {
+        List<HudiFileGroup> fileGroups = buildFileGroups(partitionFiles, visibleCommitsAndCompactionTimeline, true);
+        // Group by partition for efficient updates for both InMemory and DiskBased structures.
+        fileGroups.stream()
+                .collect(groupingBy(HudiFileGroup::getPartitionPath))
+                .forEach((partition, value) -> {
+                    if (!isPartitionAvailableInStore(partition)) {
+                        storePartitionView(partition, value);
+                    }
+                });
+        return fileGroups;
+    }
+
+    private List<HudiFileGroup> buildFileGroups(
+            FileIterator partitionFiles,
+            HudiTimeline timeline,
+            boolean addPendingCompactionFileSlice)
+            throws IOException
+    {
+        List<HudiBaseFile> hoodieBaseFiles = new ArrayList<>();
+        List<HudiLogFile> hudiLogFiles = new ArrayList<>();
+        String baseHoodieFileExtension = metaClient.getTableConfig().getBaseFileFormat().getFileExtension();
+        while (partitionFiles.hasNext()) {
+            FileEntry fileEntry = partitionFiles.next();
+            if (fileEntry.location().path().contains(baseHoodieFileExtension)) {
+                hoodieBaseFiles.add(new HudiBaseFile(fileEntry));
+            }
+            String fileName = fileEntry.location().fileName();
+            if (LOG_FILE_PATTERN.matcher(fileName).matches() && fileName.contains(HudiFileFormat.HOODIE_LOG.getFileExtension())) {
+                hudiLogFiles.add(new HudiLogFile(fileEntry));
+            }
+        }
+        return buildFileGroups(hoodieBaseFiles.stream(), hudiLogFiles.stream(), timeline, addPendingCompactionFileSlice);
+    }
+
+    private List<HudiFileGroup> buildFileGroups(
+            Stream<HudiBaseFile> baseFileStream,
+            Stream<HudiLogFile> logFileStream,
+            HudiTimeline timeline,
+            boolean addPendingCompactionFileSlice)
+    {
+        Map<Entry<String, String>, List<HudiBaseFile>> baseFiles = baseFileStream
+                .collect(groupingBy(baseFile -> {
+                    String partitionPathStr = getPartitionPathFor(baseFile);
+                    return Map.entry(partitionPathStr, baseFile.getFileId());
+                }));
+
+        Map<Entry<String, String>, List<HudiLogFile>> logFiles = logFileStream
+                .collect(groupingBy((logFile) -> {
+                    String partitionPathStr = getRelativePartitionPath(metaClient.getBasePath(), logFile.getPath().parentDirectory());
+                    return Map.entry(partitionPathStr, logFile.getFileId());
+                }));
+
+        Set<Entry<String, String>> fileIdSet = new HashSet<>(baseFiles.keySet());
+        fileIdSet.addAll(logFiles.keySet());
+
+        List<HudiFileGroup> fileGroups = new ArrayList<>();
+        fileIdSet.forEach(pair -> {
+            String fileId = pair.getValue();
+            String partitionPath = pair.getKey();
+            HudiFileGroup group = new HudiFileGroup(partitionPath, fileId, timeline);
+            if (baseFiles.containsKey(pair)) {
+                baseFiles.get(pair).forEach(group::addBaseFile);
+            }
+            if (logFiles.containsKey(pair)) {
+                logFiles.get(pair).forEach(group::addLogFile);
+            }
+
+            if (addPendingCompactionFileSlice) {
+                Optional<Entry<String, CompactionOperation>> pendingCompaction =
+                        getPendingCompactionOperationWithInstant(group.getFileGroupId());
+                // If there is no delta-commit after compaction request, this step would ensure a new file-slice appears
+                // so that any new ingestion uses the correct base-instant
+                pendingCompaction.ifPresent(entry ->
+                        group.addNewFileSliceAtInstant(entry.getKey()));
+            }
+            fileGroups.add(group);
+        });
+
+        return fileGroups;
+    }
+
+    private String getPartitionPathFor(HudiBaseFile baseFile)
+    {
+        return getRelativePartitionPath(metaClient.getBasePath(), baseFile.getFullPath().parentDirectory());
+    }
+
+    private String getRelativePartitionPath(Location basePath, Location fullPartitionPath)
+    {
+        String fullPartitionPathStr = fullPartitionPath.path();
+
+        if (!fullPartitionPathStr.startsWith(basePath.path())) {
+            throw new IllegalArgumentException("Partition location does not belong to base-location");
+        }
+
+        int partitionStartIndex = fullPartitionPath.path().indexOf(basePath.fileName(), basePath.parentDirectory().path().length());
+        // Partition-Path could be empty for non-partitioned tables
+        if (partitionStartIndex + basePath.fileName().length() == fullPartitionPathStr.length()) {
+            return "";
+        }
+        return fullPartitionPathStr.substring(partitionStartIndex + basePath.fileName().length() + 1);
+    }
+
+    protected Optional<Entry<String, CompactionOperation>> getPendingCompactionOperationWithInstant(HudiFileGroupId fgId)
+    {
+        return Optional.ofNullable(fgIdToPendingCompaction.get(fgId));
+    }
+
+    private void storePartitionView(String partitionPath, List<HudiFileGroup> fileGroups)
+    {
+        LOG.debug("Adding file-groups for partition :" + partitionPath + ", #FileGroups=" + fileGroups.size());
+        List<HudiFileGroup> newList = ImmutableList.copyOf(fileGroups);
+        partitionToFileGroupsMap.put(partitionPath, newList);
+    }
+
+    private Stream<HudiBaseFile> fetchLatestBaseFiles(final String partitionPath)
+    {
+        return fetchAllStoredFileGroups(partitionPath)
+                .filter(filGroup -> !isFileGroupReplaced(filGroup.getFileGroupId()))
+                .map(filGroup -> Map.entry(filGroup.getFileGroupId(), getLatestBaseFile(filGroup)))
+                .filter(pair -> pair.getValue().isPresent())
+                .map(pair -> pair.getValue().get());
+    }
+
+    private Stream<HudiFileGroup> fetchAllStoredFileGroups(String partition)
+    {
+        final List<HudiFileGroup> fileGroups = ImmutableList.copyOf(partitionToFileGroupsMap.get(partition));
+        return fileGroups.stream();
+    }
+
+    private boolean isFileGroupReplaced(HudiFileGroupId fileGroup)
+    {
+        return Optional.ofNullable(fgIdToReplaceInstants.get(fileGroup)).isPresent();
+    }
+
+    protected Optional<HudiBaseFile> getLatestBaseFile(HudiFileGroup fileGroup)
+    {
+        return fileGroup.getAllBaseFiles()
+                .filter(hudiBaseFile -> !isBaseFileDueToPendingCompaction(hudiBaseFile) && !isBaseFileDueToPendingClustering(hudiBaseFile))
+                .findFirst();
+    }
+
+    private boolean isBaseFileDueToPendingCompaction(HudiBaseFile baseFile)
+    {
+        final String partitionPath = getPartitionPathFor(baseFile);
+
+        Optional<Entry<String, CompactionOperation>> compactionWithInstantTime =
+                getPendingCompactionOperationWithInstant(new HudiFileGroupId(partitionPath, baseFile.getFileId()));
+        return (compactionWithInstantTime.isPresent()) && (null != compactionWithInstantTime.get().getKey())
+                && baseFile.getCommitTime().equals(compactionWithInstantTime.get().getKey());
+    }
+
+    private boolean isBaseFileDueToPendingClustering(HudiBaseFile baseFile)
+    {
+        List<String> pendingReplaceInstants = metaClient.getActiveTimeline()
+                .filterPendingReplaceTimeline()
+                .getInstants()
+                .map(HudiInstant::getTimestamp)
+                .collect(toImmutableList());
+
+        return !pendingReplaceInstants.isEmpty() && pendingReplaceInstants.contains(baseFile.getCommitTime());
+    }
+
+    public boolean isClosed()
+    {
+        return closed;
+    }
+
+    public void close()
+    {
+        this.fgIdToPendingCompaction = null;
+        this.partitionToFileGroupsMap = null;
+        this.fgIdToReplaceInstants = null;
+        closed = true;
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/table/HudiTableMetaClient.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/table/HudiTableMetaClient.java
new file mode 100644
index 000000000000..7f20c63fd115
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/table/HudiTableMetaClient.java
@@ -0,0 +1,204 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.table;
+
+import io.trino.filesystem.FileEntry;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.plugin.hudi.config.HudiTableConfig;
+import io.trino.plugin.hudi.model.HudiInstant;
+import io.trino.plugin.hudi.model.HudiTableType;
+import io.trino.plugin.hudi.timeline.HudiActiveTimeline;
+import io.trino.plugin.hudi.timeline.HudiTimeline;
+import io.trino.plugin.hudi.timeline.TimelineLayout;
+import io.trino.plugin.hudi.timeline.TimelineLayoutVersion;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.plugin.hudi.HudiUtil.hudiMetadataExists;
+import static java.util.Objects.requireNonNull;
+
+public class HudiTableMetaClient
+{
+    public static final String METAFOLDER_NAME = ".hoodie";
+    public static final String SEPARATOR = "/";
+    public static final String AUXILIARYFOLDER_NAME = METAFOLDER_NAME + SEPARATOR + ".aux";
+    public static final String SCHEMA_FOLDER_NAME = ".schema";
+
+    private final Location metaPath;
+    private final Location basePath;
+    private final HudiTableType tableType;
+    private final TimelineLayoutVersion timelineLayoutVersion;
+    private final HudiTableConfig tableConfig;
+    private final TrinoFileSystem fileSystem;
+
+    private HudiActiveTimeline activeTimeline;
+
+    protected HudiTableMetaClient(
+            TrinoFileSystem fileSystem,
+            Location basePath,
+            Optional<TimelineLayoutVersion> layoutVersion)
+    {
+        this.metaPath = requireNonNull(basePath, "basePath is null").appendPath(METAFOLDER_NAME);
+        this.fileSystem = requireNonNull(fileSystem, "fileSystem is null");
+        checkArgument(hudiMetadataExists(fileSystem, basePath), "Could not check if %s is a valid table", basePath);
+        this.basePath = basePath;
+
+        this.tableConfig = new HudiTableConfig(fileSystem, metaPath);
+        this.tableType = tableConfig.getTableType();
+        // TODO: Migrate Timeline objects
+        Optional<TimelineLayoutVersion> tableConfigVersion = tableConfig.getTimelineLayoutVersion();
+        if (layoutVersion.isPresent() && tableConfigVersion.isPresent()) {
+            // Ensure layout version passed in config is not lower than the one seen in hoodie.properties
+            checkArgument(layoutVersion.get().compareTo(tableConfigVersion.get()) >= 0,
+                    "Layout Version defined in hoodie properties has higher version (%s) than the one passed in config (%s)",
+                    tableConfigVersion.get(),
+                    layoutVersion.get());
+        }
+        this.timelineLayoutVersion = layoutVersion.orElseGet(() -> tableConfig.getTimelineLayoutVersion().orElseThrow());
+    }
+
+    public HudiTableConfig getTableConfig()
+    {
+        return tableConfig;
+    }
+
+    public HudiTableType getTableType()
+    {
+        return tableType;
+    }
+
+    public HudiTimeline getCommitsTimeline()
+    {
+        return switch (this.getTableType()) {
+            case COPY_ON_WRITE -> getActiveTimeline().getCommitTimeline();
+            case MERGE_ON_READ ->
+                // We need to include the parquet files written out in delta commits
+                // Include commit action to be able to start doing a MOR over a COW table - no
+                // migration required
+                    getActiveTimeline().getCommitsTimeline();
+        };
+    }
+
+    public synchronized HudiActiveTimeline getActiveTimeline()
+    {
+        if (activeTimeline == null) {
+            activeTimeline = new HudiActiveTimeline(this);
+        }
+        return activeTimeline;
+    }
+
+    public TimelineLayoutVersion getTimelineLayoutVersion()
+    {
+        return timelineLayoutVersion;
+    }
+
+    public Location getBasePath()
+    {
+        return basePath;
+    }
+
+    public Location getMetaPath()
+    {
+        return metaPath;
+    }
+
+    public TrinoFileSystem getFileSystem()
+    {
+        return fileSystem;
+    }
+
+    public String getMetaAuxiliaryPath()
+    {
+        return basePath + SEPARATOR + AUXILIARYFOLDER_NAME;
+    }
+
+    public String getSchemaFolderName()
+    {
+        return metaPath.appendPath(SCHEMA_FOLDER_NAME).path();
+    }
+
+    private static HudiTableMetaClient newMetaClient(
+            TrinoFileSystem fileSystem,
+            Location basePath)
+    {
+        return new HudiTableMetaClient(fileSystem, basePath, Optional.of(TimelineLayoutVersion.CURRENT_LAYOUT_VERSION));
+    }
+
+    public List<HudiInstant> scanHoodieInstantsFromFileSystem(Set<String> includedExtensions,
+            boolean applyLayoutVersionFilters)
+            throws IOException
+    {
+        Stream<HudiInstant> instantStream = scanFiles(location -> {
+            String extension = HudiInstant.getTimelineFileExtension(location.fileName());
+            return includedExtensions.contains(extension);
+        }).stream().map(HudiInstant::new);
+
+        if (applyLayoutVersionFilters) {
+            instantStream = TimelineLayout.getLayout(getTimelineLayoutVersion()).filterHoodieInstants(instantStream);
+        }
+        return instantStream.sorted().collect(Collectors.toList());
+    }
+
+    private List<FileEntry> scanFiles(Predicate<Location> pathPredicate)
+            throws IOException
+    {
+        FileIterator fileIterator = fileSystem.listFiles(metaPath);
+        List<FileEntry> result = new ArrayList<>();
+        while (fileIterator.hasNext()) {
+            FileEntry fileEntry = fileIterator.next();
+            if (pathPredicate.test(fileEntry.location())) {
+                result.add(fileEntry);
+            }
+        }
+        return result;
+    }
+
+    public static Builder builder()
+    {
+        return new Builder();
+    }
+
+    public static class Builder
+    {
+        private TrinoFileSystem fileSystem;
+        private Location basePath;
+
+        public Builder setTrinoFileSystem(TrinoFileSystem fileSystem)
+        {
+            this.fileSystem = fileSystem;
+            return this;
+        }
+
+        public Builder setBasePath(Location basePath)
+        {
+            this.basePath = basePath;
+            return this;
+        }
+
+        public HudiTableMetaClient build()
+        {
+            return newMetaClient(fileSystem, basePath);
+        }
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/HudiActiveTimeline.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/HudiActiveTimeline.java
new file mode 100644
index 000000000000..215bfe1a0253
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/HudiActiveTimeline.java
@@ -0,0 +1,122 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.timeline;
+
+import com.google.common.collect.ImmutableSet;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoInputStream;
+import io.trino.plugin.hudi.model.HudiInstant;
+import io.trino.plugin.hudi.table.HudiTableMetaClient;
+import io.trino.spi.TrinoException;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Optional;
+import java.util.Set;
+
+import static io.trino.plugin.hudi.HudiErrorCode.HUDI_BAD_DATA;
+
+public class HudiActiveTimeline
+        extends HudiDefaultTimeline
+{
+    private static final Set<String> VALID_EXTENSIONS_IN_ACTIVE_TIMELINE = ImmutableSet.of(
+            COMMIT_EXTENSION, INFLIGHT_COMMIT_EXTENSION, REQUESTED_COMMIT_EXTENSION,
+            DELTA_COMMIT_EXTENSION, INFLIGHT_DELTA_COMMIT_EXTENSION, REQUESTED_DELTA_COMMIT_EXTENSION,
+            SAVEPOINT_EXTENSION, INFLIGHT_SAVEPOINT_EXTENSION,
+            CLEAN_EXTENSION, REQUESTED_CLEAN_EXTENSION, INFLIGHT_CLEAN_EXTENSION,
+            INFLIGHT_COMPACTION_EXTENSION, REQUESTED_COMPACTION_EXTENSION,
+            REQUESTED_RESTORE_EXTENSION, INFLIGHT_RESTORE_EXTENSION, RESTORE_EXTENSION,
+            ROLLBACK_EXTENSION, REQUESTED_ROLLBACK_EXTENSION, INFLIGHT_ROLLBACK_EXTENSION,
+            REQUESTED_REPLACE_COMMIT_EXTENSION, INFLIGHT_REPLACE_COMMIT_EXTENSION, REPLACE_COMMIT_EXTENSION,
+            REQUESTED_INDEX_COMMIT_EXTENSION, INFLIGHT_INDEX_COMMIT_EXTENSION, INDEX_COMMIT_EXTENSION,
+            REQUESTED_SAVE_SCHEMA_ACTION_EXTENSION, INFLIGHT_SAVE_SCHEMA_ACTION_EXTENSION, SAVE_SCHEMA_ACTION_EXTENSION);
+
+    private HudiTableMetaClient metaClient;
+
+    public HudiActiveTimeline(HudiTableMetaClient metaClient)
+    {
+        // Filter all the filter in the metapath and include only the extensions passed and
+        // convert them into HoodieInstant
+        try {
+            this.setInstants(metaClient.scanHoodieInstantsFromFileSystem(VALID_EXTENSIONS_IN_ACTIVE_TIMELINE, true));
+        }
+        catch (IOException e) {
+            throw new TrinoException(HUDI_BAD_DATA, "Failed to scan metadata", e);
+        }
+        this.metaClient = metaClient;
+        this.details = this::getInstantDetails;
+    }
+
+    @Deprecated
+    public HudiActiveTimeline()
+    {
+    }
+
+    @Override
+    public Optional<byte[]> getInstantDetails(HudiInstant instant)
+    {
+        Location detailLocation = getInstantFileNamePath(instant.getFileName());
+        return readDataFromPath(detailLocation);
+    }
+
+    //-----------------------------------------------------------------
+    //      BEGIN - COMPACTION RELATED META-DATA MANAGEMENT.
+    //-----------------------------------------------------------------
+
+    public Optional<byte[]> readCompactionPlanAsBytes(HudiInstant instant)
+    {
+        // Reading from auxiliary location first. In future release, we will cleanup compaction management
+        // to only write to timeline and skip auxiliary and this code will be able to handle it.
+        return readDataFromPath(Location.of(metaClient.getMetaAuxiliaryPath()).appendPath(instant.getFileName()));
+    }
+
+    private Location getInstantFileNamePath(String fileName)
+    {
+        Location metaPath = metaClient.getMetaPath();
+        if (fileName.contains(SCHEMA_COMMIT_ACTION)) {
+            return metaPath.appendPath(HudiTableMetaClient.SCHEMA_FOLDER_NAME).appendPath(fileName);
+        }
+        return metaPath.appendPath(fileName);
+    }
+
+    private Optional<byte[]> readDataFromPath(Location detailPath)
+    {
+        try (TrinoInputStream inputStream = metaClient.getFileSystem().newInputFile(detailPath).newStream()) {
+            return Optional.of(readAsByteArray(inputStream));
+        }
+        catch (IOException e) {
+            throw new TrinoException(HUDI_BAD_DATA, "Could not read commit details from " + detailPath, e);
+        }
+    }
+
+    private static byte[] readAsByteArray(InputStream input)
+            throws IOException
+    {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream(128);
+        copy(input, bos);
+        return bos.toByteArray();
+    }
+
+    private static void copy(InputStream inputStream, OutputStream outputStream)
+            throws IOException
+    {
+        byte[] buffer = new byte[1024];
+        int len;
+        while ((len = inputStream.read(buffer)) != -1) {
+            outputStream.write(buffer, 0, len);
+        }
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/HudiDefaultTimeline.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/HudiDefaultTimeline.java
new file mode 100644
index 000000000000..09381a8a7f79
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/HudiDefaultTimeline.java
@@ -0,0 +1,192 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.timeline;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import io.trino.plugin.hudi.model.HudiInstant;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.plugin.hudi.timeline.HudiTimeline.compareTimestamps;
+
+public class HudiDefaultTimeline
+        implements HudiTimeline
+{
+    private List<HudiInstant> instants;
+    protected transient Function<HudiInstant, Optional<byte[]>> details;
+
+    public HudiDefaultTimeline(Stream<HudiInstant> instants, Function<HudiInstant, Optional<byte[]>> details)
+    {
+        this.details = details;
+        setInstants(instants.collect(Collectors.toList()));
+    }
+
+    public void setInstants(List<HudiInstant> instants)
+    {
+        this.instants = ImmutableList.copyOf(instants);
+    }
+
+    public HudiDefaultTimeline()
+    {
+    }
+
+    @Override
+    public HudiTimeline filterCompletedInstants()
+    {
+        return new HudiDefaultTimeline(instants.stream().filter(HudiInstant::isCompleted), details);
+    }
+
+    @Override
+    public HudiDefaultTimeline getWriteTimeline()
+    {
+        Set<String> validActions = ImmutableSet.of(COMMIT_ACTION, DELTA_COMMIT_ACTION, COMPACTION_ACTION, REPLACE_COMMIT_ACTION);
+        return new HudiDefaultTimeline(
+                instants.stream().filter(s -> validActions.contains(s.getAction())),
+                details);
+    }
+
+    @Override
+    public HudiTimeline getCompletedReplaceTimeline()
+    {
+        return new HudiDefaultTimeline(
+                instants.stream()
+                        .filter(s -> s.getAction().equals(REPLACE_COMMIT_ACTION))
+                        .filter(HudiInstant::isCompleted),
+                details);
+    }
+
+    @Override
+    public HudiTimeline filterPendingReplaceTimeline()
+    {
+        return new HudiDefaultTimeline(
+                instants.stream().filter(s -> s.getAction().equals(HudiTimeline.REPLACE_COMMIT_ACTION) && !s.isCompleted()),
+                details);
+    }
+
+    @Override
+    public HudiTimeline filterPendingCompactionTimeline()
+    {
+        return new HudiDefaultTimeline(
+                instants.stream().filter(s -> s.getAction().equals(HudiTimeline.COMPACTION_ACTION) && !s.isCompleted()),
+                details);
+    }
+
+    public HudiTimeline getCommitsTimeline()
+    {
+        return getTimelineOfActions(ImmutableSet.of(COMMIT_ACTION, DELTA_COMMIT_ACTION, REPLACE_COMMIT_ACTION));
+    }
+
+    public HudiTimeline getCommitTimeline()
+    {
+        return getTimelineOfActions(ImmutableSet.of(COMMIT_ACTION, REPLACE_COMMIT_ACTION));
+    }
+
+    public HudiTimeline getTimelineOfActions(Set<String> actions)
+    {
+        return new HudiDefaultTimeline(
+                getInstants().filter(s -> actions.contains(s.getAction())),
+                this::getInstantDetails);
+    }
+
+    @Override
+    public boolean empty()
+    {
+        return instants.stream().findFirst().isEmpty();
+    }
+
+    @Override
+    public int countInstants()
+    {
+        return instants.size();
+    }
+
+    @Override
+    public Optional<HudiInstant> firstInstant()
+    {
+        return instants.stream().findFirst();
+    }
+
+    @Override
+    public Optional<HudiInstant> nthInstant(int n)
+    {
+        if (empty() || n >= countInstants()) {
+            return Optional.empty();
+        }
+        return Optional.of(instants.get(n));
+    }
+
+    @Override
+    public Optional<HudiInstant> lastInstant()
+    {
+        return empty() ? Optional.empty() : nthInstant(countInstants() - 1);
+    }
+
+    @Override
+    public boolean containsOrBeforeTimelineStarts(String instant)
+    {
+        return instants.stream().anyMatch(s -> s.getTimestamp().equals(instant)) || isBeforeTimelineStarts(instant);
+    }
+
+    @Override
+    public Stream<HudiInstant> getInstants()
+    {
+        return instants.stream();
+    }
+
+    @Override
+    public boolean isBeforeTimelineStarts(String instant)
+    {
+        Optional<HudiInstant> firstNonSavepointCommit = getFirstNonSavepointCommit();
+        return firstNonSavepointCommit.isPresent()
+                && compareTimestamps(instant, LESSER_THAN, firstNonSavepointCommit.get().getTimestamp());
+    }
+
+    @Override
+    public Optional<HudiInstant> getFirstNonSavepointCommit()
+    {
+        Optional<HudiInstant> firstCommit = firstInstant();
+        Set<String> savepointTimestamps = instants.stream()
+                .filter(entry -> entry.getAction().equals(SAVEPOINT_ACTION))
+                .map(HudiInstant::getTimestamp)
+                .collect(toImmutableSet());
+        Optional<HudiInstant> firstNonSavepointCommit = firstCommit;
+        if (!savepointTimestamps.isEmpty()) {
+            // There are chances that there could be holes in the timeline due to archival and savepoint interplay.
+            // So, the first non-savepoint commit is considered as beginning of the active timeline.
+            firstNonSavepointCommit = instants.stream()
+                    .filter(entry -> !savepointTimestamps.contains(entry.getTimestamp()))
+                    .findFirst();
+        }
+        return firstNonSavepointCommit;
+    }
+
+    @Override
+    public Optional<byte[]> getInstantDetails(HudiInstant instant)
+    {
+        return details.apply(instant);
+    }
+
+    @Override
+    public String toString()
+    {
+        return this.getClass().getName() + ": " + instants.stream().map(Object::toString).collect(Collectors.joining(","));
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/HudiTimeline.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/HudiTimeline.java
new file mode 100644
index 000000000000..153ba99f03e1
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/HudiTimeline.java
@@ -0,0 +1,255 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.timeline;
+
+import io.trino.plugin.hudi.model.HudiInstant;
+import io.trino.plugin.hudi.model.HudiInstant.State;
+
+import java.util.Optional;
+import java.util.function.BiPredicate;
+import java.util.stream.Stream;
+
+import static java.lang.String.join;
+
+public interface HudiTimeline
+{
+    String COMMIT_ACTION = "commit";
+    String DELTA_COMMIT_ACTION = "deltacommit";
+    String CLEAN_ACTION = "clean";
+    String ROLLBACK_ACTION = "rollback";
+    String SAVEPOINT_ACTION = "savepoint";
+    String REPLACE_COMMIT_ACTION = "replacecommit";
+    String INFLIGHT_EXTENSION = ".inflight";
+    // With Async Compaction, compaction instant can be in 3 states :
+    // (compaction-requested), (compaction-inflight), (completed)
+    String COMPACTION_ACTION = "compaction";
+    String REQUESTED_EXTENSION = ".requested";
+    String RESTORE_ACTION = "restore";
+    String INDEXING_ACTION = "indexing";
+    // only for schema save
+    String SCHEMA_COMMIT_ACTION = "schemacommit";
+    String COMMIT_EXTENSION = "." + COMMIT_ACTION;
+    String DELTA_COMMIT_EXTENSION = "." + DELTA_COMMIT_ACTION;
+    String CLEAN_EXTENSION = "." + CLEAN_ACTION;
+    String ROLLBACK_EXTENSION = "." + ROLLBACK_ACTION;
+    String SAVEPOINT_EXTENSION = "." + SAVEPOINT_ACTION;
+    // this is to preserve backwards compatibility on commit in-flight filenames
+    String INFLIGHT_COMMIT_EXTENSION = INFLIGHT_EXTENSION;
+    String REQUESTED_COMMIT_EXTENSION = "." + COMMIT_ACTION + REQUESTED_EXTENSION;
+    String REQUESTED_DELTA_COMMIT_EXTENSION = "." + DELTA_COMMIT_ACTION + REQUESTED_EXTENSION;
+    String INFLIGHT_DELTA_COMMIT_EXTENSION = "." + DELTA_COMMIT_ACTION + INFLIGHT_EXTENSION;
+    String INFLIGHT_CLEAN_EXTENSION = "." + CLEAN_ACTION + INFLIGHT_EXTENSION;
+    String REQUESTED_CLEAN_EXTENSION = "." + CLEAN_ACTION + REQUESTED_EXTENSION;
+    String INFLIGHT_ROLLBACK_EXTENSION = "." + ROLLBACK_ACTION + INFLIGHT_EXTENSION;
+    String REQUESTED_ROLLBACK_EXTENSION = "." + ROLLBACK_ACTION + REQUESTED_EXTENSION;
+    String INFLIGHT_SAVEPOINT_EXTENSION = "." + SAVEPOINT_ACTION + INFLIGHT_EXTENSION;
+    String REQUESTED_COMPACTION_SUFFIX = join("", COMPACTION_ACTION, REQUESTED_EXTENSION);
+    String REQUESTED_COMPACTION_EXTENSION = join(".", REQUESTED_COMPACTION_SUFFIX);
+    String INFLIGHT_COMPACTION_EXTENSION = join(".", COMPACTION_ACTION, INFLIGHT_EXTENSION);
+    String REQUESTED_RESTORE_EXTENSION = "." + RESTORE_ACTION + REQUESTED_EXTENSION;
+    String INFLIGHT_RESTORE_EXTENSION = "." + RESTORE_ACTION + INFLIGHT_EXTENSION;
+    String RESTORE_EXTENSION = "." + RESTORE_ACTION;
+    String INFLIGHT_REPLACE_COMMIT_EXTENSION = "." + REPLACE_COMMIT_ACTION + INFLIGHT_EXTENSION;
+    String REQUESTED_REPLACE_COMMIT_EXTENSION = "." + REPLACE_COMMIT_ACTION + REQUESTED_EXTENSION;
+    String REPLACE_COMMIT_EXTENSION = "." + REPLACE_COMMIT_ACTION;
+    String INFLIGHT_INDEX_COMMIT_EXTENSION = "." + INDEXING_ACTION + INFLIGHT_EXTENSION;
+    String REQUESTED_INDEX_COMMIT_EXTENSION = "." + INDEXING_ACTION + REQUESTED_EXTENSION;
+    String INDEX_COMMIT_EXTENSION = "." + INDEXING_ACTION;
+    String SAVE_SCHEMA_ACTION_EXTENSION = "." + SCHEMA_COMMIT_ACTION;
+    String INFLIGHT_SAVE_SCHEMA_ACTION_EXTENSION = "." + SCHEMA_COMMIT_ACTION + INFLIGHT_EXTENSION;
+    String REQUESTED_SAVE_SCHEMA_ACTION_EXTENSION = "." + SCHEMA_COMMIT_ACTION + REQUESTED_EXTENSION;
+
+    HudiTimeline filterCompletedInstants();
+
+    HudiTimeline getWriteTimeline();
+
+    HudiTimeline getCompletedReplaceTimeline();
+
+    HudiTimeline filterPendingCompactionTimeline();
+
+    HudiTimeline filterPendingReplaceTimeline();
+
+    boolean empty();
+
+    int countInstants();
+
+    Optional<HudiInstant> firstInstant();
+
+    Optional<HudiInstant> nthInstant(int n);
+
+    Optional<HudiInstant> lastInstant();
+
+    boolean containsOrBeforeTimelineStarts(String ts);
+
+    Stream<HudiInstant> getInstants();
+
+    boolean isBeforeTimelineStarts(String ts);
+
+    Optional<HudiInstant> getFirstNonSavepointCommit();
+
+    Optional<byte[]> getInstantDetails(HudiInstant instant);
+
+    BiPredicate<String, String> LESSER_THAN_OR_EQUALS = (commit1, commit2) -> commit1.compareTo(commit2) <= 0;
+    BiPredicate<String, String> LESSER_THAN = (commit1, commit2) -> commit1.compareTo(commit2) < 0;
+
+    static boolean compareTimestamps(String commit1, BiPredicate<String, String> predicateToApply, String commit2)
+    {
+        return predicateToApply.test(commit1, commit2);
+    }
+
+    static HudiInstant getCompactionRequestedInstant(final String timestamp)
+    {
+        return new HudiInstant(State.REQUESTED, COMPACTION_ACTION, timestamp);
+    }
+
+    static String makeCommitFileName(String instantTime)
+    {
+        return join("", instantTime, HudiTimeline.COMMIT_EXTENSION);
+    }
+
+    static String makeInflightCommitFileName(String instantTime)
+    {
+        return join("", instantTime, HudiTimeline.INFLIGHT_COMMIT_EXTENSION);
+    }
+
+    static String makeRequestedCommitFileName(String instantTime)
+    {
+        return join("", instantTime, HudiTimeline.REQUESTED_COMMIT_EXTENSION);
+    }
+
+    static String makeCleanerFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.CLEAN_EXTENSION);
+    }
+
+    static String makeRequestedCleanerFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.REQUESTED_CLEAN_EXTENSION);
+    }
+
+    static String makeInflightCleanerFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.INFLIGHT_CLEAN_EXTENSION);
+    }
+
+    static String makeRollbackFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.ROLLBACK_EXTENSION);
+    }
+
+    static String makeRequestedRollbackFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.REQUESTED_ROLLBACK_EXTENSION);
+    }
+
+    static String makeRequestedRestoreFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.REQUESTED_RESTORE_EXTENSION);
+    }
+
+    static String makeInflightRollbackFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.INFLIGHT_ROLLBACK_EXTENSION);
+    }
+
+    static String makeInflightSavePointFileName(String instantTime)
+    {
+        return join("", instantTime, HudiTimeline.INFLIGHT_SAVEPOINT_EXTENSION);
+    }
+
+    static String makeSavePointFileName(String instantTime)
+    {
+        return join("", instantTime, HudiTimeline.SAVEPOINT_EXTENSION);
+    }
+
+    static String makeInflightDeltaFileName(String instantTime)
+    {
+        return join("", instantTime, HudiTimeline.INFLIGHT_DELTA_COMMIT_EXTENSION);
+    }
+
+    static String makeRequestedDeltaFileName(String instantTime)
+    {
+        return join("", instantTime, HudiTimeline.REQUESTED_DELTA_COMMIT_EXTENSION);
+    }
+
+    static String makeInflightCompactionFileName(String instantTime)
+    {
+        return join("", instantTime, HudiTimeline.INFLIGHT_COMPACTION_EXTENSION);
+    }
+
+    static String makeRequestedCompactionFileName(String instantTime)
+    {
+        return join("", instantTime, HudiTimeline.REQUESTED_COMPACTION_EXTENSION);
+    }
+
+    static String makeRestoreFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.RESTORE_EXTENSION);
+    }
+
+    static String makeInflightRestoreFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.INFLIGHT_RESTORE_EXTENSION);
+    }
+
+    static String makeReplaceFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.REPLACE_COMMIT_EXTENSION);
+    }
+
+    static String makeInflightReplaceFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.INFLIGHT_REPLACE_COMMIT_EXTENSION);
+    }
+
+    static String makeRequestedReplaceFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.REQUESTED_REPLACE_COMMIT_EXTENSION);
+    }
+
+    static String makeDeltaFileName(String instantTime)
+    {
+        return instantTime + HudiTimeline.DELTA_COMMIT_EXTENSION;
+    }
+
+    static String makeIndexCommitFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.INDEX_COMMIT_EXTENSION);
+    }
+
+    static String makeInflightIndexFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.INFLIGHT_INDEX_COMMIT_EXTENSION);
+    }
+
+    static String makeRequestedIndexFileName(String instant)
+    {
+        return join("", instant, HudiTimeline.REQUESTED_INDEX_COMMIT_EXTENSION);
+    }
+
+    static String makeSchemaFileName(String instantTime)
+    {
+        return join("", instantTime, HudiTimeline.SAVE_SCHEMA_ACTION_EXTENSION);
+    }
+
+    static String makeInflightSchemaFileName(String instantTime)
+    {
+        return join("", instantTime, HudiTimeline.INFLIGHT_SAVE_SCHEMA_ACTION_EXTENSION);
+    }
+
+    static String makeRequestSchemaFileName(String instantTime)
+    {
+        return join("", instantTime, HudiTimeline.REQUESTED_SAVE_SCHEMA_ACTION_EXTENSION);
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/TimelineLayout.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/TimelineLayout.java
new file mode 100644
index 000000000000..2591a051e4b7
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/TimelineLayout.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.timeline;
+
+import io.trino.plugin.hudi.model.HudiInstant;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public abstract class TimelineLayout
+{
+    private static final Map<TimelineLayoutVersion, TimelineLayout> LAYOUT_MAP = new HashMap<>();
+
+    static {
+        LAYOUT_MAP.put(new TimelineLayoutVersion(TimelineLayoutVersion.VERSION_0), new TimelineLayout.TimelineLayoutV0());
+        LAYOUT_MAP.put(new TimelineLayoutVersion(TimelineLayoutVersion.VERSION_1), new TimelineLayout.TimelineLayoutV1());
+    }
+
+    public static TimelineLayout getLayout(TimelineLayoutVersion version)
+    {
+        return LAYOUT_MAP.get(version);
+    }
+
+    public abstract Stream<HudiInstant> filterHoodieInstants(Stream<HudiInstant> instantStream);
+
+    private static class TimelineLayoutV0
+            extends TimelineLayout
+    {
+        @Override
+        public Stream<HudiInstant> filterHoodieInstants(Stream<HudiInstant> instantStream)
+        {
+            return instantStream;
+        }
+    }
+
+    private static class TimelineLayoutV1
+            extends TimelineLayout
+    {
+        @Override
+        public Stream<HudiInstant> filterHoodieInstants(Stream<HudiInstant> instantStream)
+        {
+            return instantStream.collect(Collectors.groupingBy(instant -> Map.entry(instant.getTimestamp(),
+                            HudiInstant.getComparableAction(instant.getAction()))))
+                    .values()
+                    .stream()
+                    .map(hoodieInstants ->
+                            hoodieInstants.stream().reduce((x, y) -> {
+                                // Pick the one with the highest state
+                                if (x.getState().compareTo(y.getState()) >= 0) {
+                                    return x;
+                                }
+                                return y;
+                            }).get());
+        }
+    }
+}
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/TimelineLayoutVersion.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/TimelineLayoutVersion.java
new file mode 100644
index 000000000000..a6e95dd87c49
--- /dev/null
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/timeline/TimelineLayoutVersion.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.timeline;
+
+import java.util.Objects;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+public class TimelineLayoutVersion
+        implements Comparable<TimelineLayoutVersion>
+{
+    public static final Integer VERSION_0 = 0; // pre 0.5.1  version format
+    public static final Integer VERSION_1 = 1; // current version with no renames
+
+    private static final Integer CURRENT_VERSION = VERSION_1;
+    public static final TimelineLayoutVersion CURRENT_LAYOUT_VERSION = new TimelineLayoutVersion(CURRENT_VERSION);
+
+    private final Integer version;
+
+    public TimelineLayoutVersion(Integer version)
+    {
+        checkArgument(version <= CURRENT_VERSION);
+        checkArgument(version >= VERSION_0);
+        this.version = version;
+    }
+
+    public Integer getVersion()
+    {
+        return version;
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TimelineLayoutVersion that = (TimelineLayoutVersion) o;
+        return Objects.equals(version, that.version);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(version);
+    }
+
+    @Override
+    public int compareTo(TimelineLayoutVersion o)
+    {
+        return Integer.compare(version, o.version);
+    }
+
+    @Override
+    public String toString()
+    {
+        return String.valueOf(version);
+    }
+}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/BaseHudiConnectorSmokeTest.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/BaseHudiConnectorSmokeTest.java
new file mode 100644
index 000000000000..4ea065e010c9
--- /dev/null
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/BaseHudiConnectorSmokeTest.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi;
+
+import io.trino.testing.BaseConnectorSmokeTest;
+import io.trino.testing.TestingConnectorBehavior;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public abstract class BaseHudiConnectorSmokeTest
+        extends BaseConnectorSmokeTest
+{
+    @Override
+    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
+    {
+        return switch (connectorBehavior) {
+            case SUPPORTS_INSERT,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_UPDATE,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_COMMENT_ON_COLUMN -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
+
+    @Test
+    @Override
+    public void testShowCreateTable()
+    {
+        // Override because Hudi connector contains 'location' table property
+        String schema = getSession().getSchema().orElseThrow();
+        assertThat((String) computeScalar("SHOW CREATE TABLE region"))
+                .matches("\\QCREATE TABLE hudi." + schema + ".region (\n" +
+                        "   regionkey bigint,\n" +
+                        "   name varchar(25),\n" +
+                        "   comment varchar(152)\n" +
+                        ")\n" +
+                        "WITH (\n" +
+                        "   location = \\E'.*/region'\n\\Q" +
+                        ")");
+    }
+}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/BaseHudiConnectorTest.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/BaseHudiConnectorTest.java
deleted file mode 100644
index 82d1a10bb6e3..000000000000
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/BaseHudiConnectorTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hudi;
-
-import io.trino.plugin.hudi.testing.TpchHudiTablesInitializer;
-import io.trino.testing.BaseConnectorTest;
-import io.trino.testing.TestingConnectorBehavior;
-import org.testng.annotations.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.apache.hudi.common.model.HoodieRecord.HOODIE_META_COLUMNS;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public abstract class BaseHudiConnectorTest
-        extends BaseConnectorTest
-{
-    @SuppressWarnings("DuplicateBranchesInSwitch")
-    @Override
-    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
-    {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE:
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN:
-            case SUPPORTS_RENAME_COLUMN:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_INSERT:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
-    }
-
-    @Test
-    @Override
-    public void testShowCreateTable()
-    {
-        String schema = getSession().getSchema().orElseThrow();
-        assertThat((String) computeScalar("SHOW CREATE TABLE orders"))
-                .matches("\\QCREATE TABLE hudi." + schema + ".orders (\n" +
-                        "   orderkey bigint,\n" +
-                        "   custkey bigint,\n" +
-                        "   orderstatus varchar(1),\n" +
-                        "   totalprice double,\n" +
-                        "   orderdate date,\n" +
-                        "   orderpriority varchar(15),\n" +
-                        "   clerk varchar(15),\n" +
-                        "   shippriority integer,\n" +
-                        "   comment varchar(79)\n" +
-                        ")\n" +
-                        "WITH (\n" +
-                        "   location = \\E'.*/orders'\n\\Q" +
-                        ")");
-    }
-
-    @Test
-    public void testHideHiveSysSchema()
-    {
-        assertThat(computeActual("SHOW SCHEMAS").getOnlyColumnAsSet()).doesNotContain("sys");
-        assertQueryFails("SHOW TABLES IN hudi.sys", ".*Schema 'sys' does not exist");
-    }
-
-    protected static String columnsToHide()
-    {
-        List<String> columns = new ArrayList<>(HOODIE_META_COLUMNS.size() + 1);
-        columns.addAll(HOODIE_META_COLUMNS);
-        columns.add(TpchHudiTablesInitializer.FIELD_UUID);
-        return String.join(",", columns);
-    }
-}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/BaseHudiMinioConnectorTest.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/BaseHudiMinioConnectorTest.java
deleted file mode 100644
index eb37b2ccb2bf..000000000000
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/BaseHudiMinioConnectorTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hudi;
-
-import io.trino.plugin.hive.containers.HiveMinioDataLake;
-
-public abstract class BaseHudiMinioConnectorTest
-        extends BaseHudiConnectorTest
-{
-    protected HiveMinioDataLake hiveMinioDataLake;
-}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/HudiQueryRunner.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/HudiQueryRunner.java
index 4efc5bdfe7fd..ffeb365de864 100644
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/HudiQueryRunner.java
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/HudiQueryRunner.java
@@ -30,8 +30,8 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 
 public final class HudiQueryRunner
@@ -72,7 +72,7 @@ public static DistributedQueryRunner createHudiQueryRunner(
         queryRunner.createCatalog("hudi", "hudi", connectorProperties);
 
         String dataDir = coordinatorBaseDir.resolve("data").toString();
-        dataLoader.initializeTables(queryRunner, metastore, SCHEMA_NAME, dataDir, newEmptyConfiguration());
+        dataLoader.initializeTables(queryRunner, metastore, SCHEMA_NAME, dataDir, HDFS_ENVIRONMENT);
         return queryRunner;
     }
 
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/S3HudiQueryRunner.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/S3HudiQueryRunner.java
index f9cb8d117318..8f29552f6c80 100644
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/S3HudiQueryRunner.java
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/S3HudiQueryRunner.java
@@ -21,30 +21,26 @@
 import io.trino.hdfs.DynamicHdfsConfiguration;
 import io.trino.hdfs.HdfsConfig;
 import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.hdfs.HdfsContext;
 import io.trino.hdfs.HdfsEnvironment;
 import io.trino.hdfs.authentication.NoHdfsAuthentication;
+import io.trino.hdfs.s3.HiveS3Config;
+import io.trino.hdfs.s3.TrinoS3ConfigurationInitializer;
 import io.trino.plugin.hive.SchemaAlreadyExistsException;
 import io.trino.plugin.hive.containers.HiveMinioDataLake;
 import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.thrift.BridgingHiveMetastore;
-import io.trino.plugin.hive.s3.HiveS3Config;
-import io.trino.plugin.hive.s3.TrinoS3ConfigurationInitializer;
 import io.trino.plugin.hudi.testing.HudiTablesInitializer;
 import io.trino.plugin.hudi.testing.TpchHudiTablesInitializer;
 import io.trino.spi.security.PrincipalType;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.tpch.TpchTable;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
 
 import java.util.Map;
 import java.util.Optional;
 
 import static io.trino.plugin.hive.HiveTestUtils.SOCKS_PROXY;
 import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
-import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
 import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
@@ -53,7 +49,6 @@
 public final class S3HudiQueryRunner
 {
     private static final String TPCH_SCHEMA = "tpch";
-    private static final HdfsContext CONTEXT = new HdfsContext(SESSION);
 
     private S3HudiQueryRunner() {}
 
@@ -66,7 +61,6 @@ public static DistributedQueryRunner create(
     {
         String basePath = "s3a://" + hiveMinioDataLake.getBucketName() + "/" + TPCH_SCHEMA;
         HdfsEnvironment hdfsEnvironment = getHdfsEnvironment(hiveMinioDataLake);
-        Configuration configuration = hdfsEnvironment.getConfiguration(CONTEXT, new Path(basePath));
 
         HiveMetastore metastore = new BridgingHiveMetastore(
                 testingThriftHiveMetastoreBuilder()
@@ -100,7 +94,7 @@ public static DistributedQueryRunner create(
                         .putAll(connectorProperties)
                         .buildOrThrow());
 
-        dataLoader.initializeTables(queryRunner, metastore, TPCH_SCHEMA, basePath, configuration);
+        dataLoader.initializeTables(queryRunner, metastore, TPCH_SCHEMA, basePath, hdfsEnvironment);
         return queryRunner;
     }
 
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConfig.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConfig.java
index e4e9f8ba237c..2aaed93bcad8 100644
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConfig.java
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -31,15 +31,15 @@ public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(HudiConfig.class)
                 .setColumnsToHide(null)
-                .setMetadataEnabled(false)
                 .setUseParquetColumnNames(true)
-                .setMinPartitionBatchSize(10)
-                .setMaxPartitionBatchSize(100)
                 .setSizeBasedSplitWeightsEnabled(true)
                 .setStandardSplitWeightSize(DataSize.of(128, MEGABYTE))
                 .setMinimumAssignedSplitWeight(0.05)
                 .setMaxSplitsPerSecond(Integer.MAX_VALUE)
-                .setMaxOutstandingSplits(1000));
+                .setMaxOutstandingSplits(1000)
+                .setSplitLoaderParallelism(4)
+                .setSplitGeneratorParallelism(4)
+                .setPerTransactionMetastoreCacheMaximumSize(2000));
     }
 
     @Test
@@ -47,28 +47,28 @@ public void testExplicitPropertyMappings()
     {
         Map<String, String> properties = ImmutableMap.<String, String>builder()
                 .put("hudi.columns-to-hide", "_hoodie_record_key")
-                .put("hudi.metadata-enabled", "true")
                 .put("hudi.parquet.use-column-names", "false")
-                .put("hudi.min-partition-batch-size", "5")
-                .put("hudi.max-partition-batch-size", "50")
                 .put("hudi.size-based-split-weights-enabled", "false")
                 .put("hudi.standard-split-weight-size", "64MB")
                 .put("hudi.minimum-assigned-split-weight", "0.1")
                 .put("hudi.max-splits-per-second", "100")
                 .put("hudi.max-outstanding-splits", "100")
+                .put("hudi.split-loader-parallelism", "16")
+                .put("hudi.split-generator-parallelism", "32")
+                .put("hudi.per-transaction-metastore-cache-maximum-size", "1000")
                 .buildOrThrow();
 
         HudiConfig expected = new HudiConfig()
                 .setColumnsToHide("_hoodie_record_key")
-                .setMetadataEnabled(true)
                 .setUseParquetColumnNames(false)
-                .setMinPartitionBatchSize(5)
-                .setMaxPartitionBatchSize(50)
                 .setSizeBasedSplitWeightsEnabled(false)
                 .setStandardSplitWeightSize(DataSize.of(64, MEGABYTE))
                 .setMinimumAssignedSplitWeight(0.1)
                 .setMaxSplitsPerSecond(100)
-                .setMaxOutstandingSplits(100);
+                .setMaxOutstandingSplits(100)
+                .setSplitLoaderParallelism(16)
+                .setSplitGeneratorParallelism(32)
+                .setPerTransactionMetastoreCacheMaximumSize(1000);
 
         assertFullMapping(properties, expected);
     }
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConnectorFactory.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConnectorFactory.java
index 2210fa2b5023..923256be5c37 100644
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConnectorFactory.java
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConnectorFactory.java
@@ -21,7 +21,7 @@
 import io.trino.spi.connector.ConnectorPageSourceProvider;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConnectorMetadataTest.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConnectorMetadataTest.java
deleted file mode 100644
index e5ae56bae2bb..000000000000
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConnectorMetadataTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hudi;
-
-import com.google.common.collect.ImmutableMap;
-import io.trino.plugin.hudi.testing.ResourceHudiTablesInitializer;
-import io.trino.testing.QueryRunner;
-
-import static io.trino.plugin.hudi.HudiQueryRunner.createHudiQueryRunner;
-
-public class TestHudiConnectorMetadataTest
-        extends TestHudiSmokeTest
-{
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        return createHudiQueryRunner(ImmutableMap.of(), ImmutableMap.of("hudi.metadata-enabled", "true"), new ResourceHudiTablesInitializer());
-    }
-}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConnectorTest.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConnectorTest.java
new file mode 100644
index 000000000000..d877e0194e1f
--- /dev/null
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiConnectorTest.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.hudi.testing.TpchHudiTablesInitializer;
+import io.trino.testing.BaseConnectorTest;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.TestingConnectorBehavior;
+import org.testng.annotations.Test;
+
+import static io.trino.plugin.hudi.HudiQueryRunner.createHudiQueryRunner;
+import static io.trino.plugin.hudi.testing.HudiTestUtils.COLUMNS_TO_HIDE;
+import static org.apache.hudi.common.model.HoodieTableType.COPY_ON_WRITE;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestHudiConnectorTest
+        extends BaseConnectorTest
+{
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        return createHudiQueryRunner(
+                ImmutableMap.of(),
+                ImmutableMap.of("hudi.columns-to-hide", COLUMNS_TO_HIDE),
+                new TpchHudiTablesInitializer(COPY_ON_WRITE, REQUIRED_TPCH_TABLES));
+    }
+
+    @Override
+    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
+    {
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_DEREFERENCE_PUSHDOWN,
+                    SUPPORTS_INSERT,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_RENAME_COLUMN,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
+
+    @Test
+    @Override
+    public void testShowCreateTable()
+    {
+        String schema = getSession().getSchema().orElseThrow();
+        assertThat((String) computeScalar("SHOW CREATE TABLE orders"))
+                .matches("\\QCREATE TABLE hudi." + schema + ".orders (\n" +
+                        "   orderkey bigint,\n" +
+                        "   custkey bigint,\n" +
+                        "   orderstatus varchar(1),\n" +
+                        "   totalprice double,\n" +
+                        "   orderdate date,\n" +
+                        "   orderpriority varchar(15),\n" +
+                        "   clerk varchar(15),\n" +
+                        "   shippriority integer,\n" +
+                        "   comment varchar(79)\n" +
+                        ")\n" +
+                        "WITH (\n" +
+                        "   location = \\E'.*/orders'\n\\Q" +
+                        ")");
+    }
+
+    @Test
+    public void testHideHiveSysSchema()
+    {
+        assertThat(computeActual("SHOW SCHEMAS").getOnlyColumnAsSet()).doesNotContain("sys");
+        assertQueryFails("SHOW TABLES IN hudi.sys", ".*Schema 'sys' does not exist");
+    }
+}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiCopyOnWriteConnectorTest.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiCopyOnWriteConnectorTest.java
deleted file mode 100644
index 409a1550853e..000000000000
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiCopyOnWriteConnectorTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hudi;
-
-import com.google.common.collect.ImmutableMap;
-import io.trino.plugin.hudi.testing.TpchHudiTablesInitializer;
-import io.trino.testing.QueryRunner;
-
-import static io.trino.plugin.hudi.HudiQueryRunner.createHudiQueryRunner;
-import static org.apache.hudi.common.model.HoodieTableType.COPY_ON_WRITE;
-
-public class TestHudiCopyOnWriteConnectorTest
-        extends BaseHudiConnectorTest
-{
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        return createHudiQueryRunner(
-                ImmutableMap.of(),
-                ImmutableMap.of("hudi.columns-to-hide", columnsToHide()),
-                new TpchHudiTablesInitializer(COPY_ON_WRITE, REQUIRED_TPCH_TABLES));
-    }
-}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiCopyOnWriteMinioConnectorSmokeTest.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiCopyOnWriteMinioConnectorSmokeTest.java
new file mode 100644
index 000000000000..f79750ebc40b
--- /dev/null
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiCopyOnWriteMinioConnectorSmokeTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.hive.containers.HiveMinioDataLake;
+import io.trino.plugin.hudi.testing.TpchHudiTablesInitializer;
+import io.trino.testing.QueryRunner;
+
+import static io.trino.plugin.hive.containers.HiveHadoop.HIVE3_IMAGE;
+import static io.trino.plugin.hudi.testing.HudiTestUtils.COLUMNS_TO_HIDE;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static org.apache.hudi.common.model.HoodieTableType.COPY_ON_WRITE;
+
+public class TestHudiCopyOnWriteMinioConnectorSmokeTest
+        extends BaseHudiConnectorSmokeTest
+{
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        String bucketName = "test-hudi-connector-" + randomNameSuffix();
+        HiveMinioDataLake hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName, HIVE3_IMAGE));
+        hiveMinioDataLake.start();
+        hiveMinioDataLake.getMinioClient().ensureBucketExists(bucketName);
+
+        return S3HudiQueryRunner.create(
+                ImmutableMap.of(),
+                ImmutableMap.of("hudi.columns-to-hide", COLUMNS_TO_HIDE),
+                new TpchHudiTablesInitializer(COPY_ON_WRITE, REQUIRED_TPCH_TABLES),
+                hiveMinioDataLake);
+    }
+}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiCopyOnWriteMinioConnectorTest.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiCopyOnWriteMinioConnectorTest.java
deleted file mode 100644
index 83695cc00bb3..000000000000
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiCopyOnWriteMinioConnectorTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hudi;
-
-import com.google.common.collect.ImmutableMap;
-import io.trino.plugin.hive.containers.HiveMinioDataLake;
-import io.trino.plugin.hudi.testing.TpchHudiTablesInitializer;
-import io.trino.testing.QueryRunner;
-
-import static io.trino.plugin.hive.containers.HiveHadoop.HIVE3_IMAGE;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static org.apache.hudi.common.model.HoodieTableType.COPY_ON_WRITE;
-
-public class TestHudiCopyOnWriteMinioConnectorTest
-        extends BaseHudiMinioConnectorTest
-{
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        String bucketName = "test-hudi-connector-" + randomNameSuffix();
-        hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName, HIVE3_IMAGE));
-        hiveMinioDataLake.start();
-        hiveMinioDataLake.getMinioClient().ensureBucketExists(bucketName);
-
-        return S3HudiQueryRunner.create(
-                ImmutableMap.of(),
-                ImmutableMap.of("hudi.columns-to-hide", columnsToHide()),
-                new TpchHudiTablesInitializer(COPY_ON_WRITE, REQUIRED_TPCH_TABLES),
-                hiveMinioDataLake);
-    }
-}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiMergeOnReadConnectorTest.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiMergeOnReadConnectorTest.java
deleted file mode 100644
index 84d814e97dd7..000000000000
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiMergeOnReadConnectorTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hudi;
-
-import com.google.common.collect.ImmutableMap;
-import io.trino.plugin.hudi.testing.TpchHudiTablesInitializer;
-import io.trino.testing.QueryRunner;
-
-import static io.trino.plugin.hudi.HudiQueryRunner.createHudiQueryRunner;
-import static org.apache.hudi.common.model.HoodieTableType.MERGE_ON_READ;
-
-public class TestHudiMergeOnReadConnectorTest
-        extends BaseHudiConnectorTest
-{
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        return createHudiQueryRunner(
-                ImmutableMap.of(),
-                ImmutableMap.of("hudi.columns-to-hide", columnsToHide()),
-                new TpchHudiTablesInitializer(MERGE_ON_READ, REQUIRED_TPCH_TABLES));
-    }
-}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiMergeOnReadMinioConnectorSmokeTest.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiMergeOnReadMinioConnectorSmokeTest.java
new file mode 100644
index 000000000000..1fc5378fa201
--- /dev/null
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiMergeOnReadMinioConnectorSmokeTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.hive.containers.HiveMinioDataLake;
+import io.trino.plugin.hudi.testing.TpchHudiTablesInitializer;
+import io.trino.testing.QueryRunner;
+
+import static io.trino.plugin.hive.containers.HiveHadoop.HIVE3_IMAGE;
+import static io.trino.plugin.hudi.testing.HudiTestUtils.COLUMNS_TO_HIDE;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static org.apache.hudi.common.model.HoodieTableType.MERGE_ON_READ;
+
+public class TestHudiMergeOnReadMinioConnectorSmokeTest
+        extends BaseHudiConnectorSmokeTest
+{
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        String bucketName = "test-hudi-connector-" + randomNameSuffix();
+        HiveMinioDataLake hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName, HIVE3_IMAGE));
+        hiveMinioDataLake.start();
+        hiveMinioDataLake.getMinioClient().ensureBucketExists(bucketName);
+
+        return S3HudiQueryRunner.create(
+                ImmutableMap.of(),
+                ImmutableMap.of("hudi.columns-to-hide", COLUMNS_TO_HIDE),
+                new TpchHudiTablesInitializer(MERGE_ON_READ, REQUIRED_TPCH_TABLES),
+                hiveMinioDataLake);
+    }
+}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiMergeOnReadMinioConnectorTest.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiMergeOnReadMinioConnectorTest.java
deleted file mode 100644
index a63cbfb15949..000000000000
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiMergeOnReadMinioConnectorTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hudi;
-
-import com.google.common.collect.ImmutableMap;
-import io.trino.plugin.hive.containers.HiveMinioDataLake;
-import io.trino.plugin.hudi.testing.TpchHudiTablesInitializer;
-import io.trino.testing.QueryRunner;
-
-import static io.trino.plugin.hive.containers.HiveHadoop.HIVE3_IMAGE;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static org.apache.hudi.common.model.HoodieTableType.MERGE_ON_READ;
-
-public class TestHudiMergeOnReadMinioConnectorTest
-        extends BaseHudiMinioConnectorTest
-{
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        String bucketName = "test-hudi-connector-" + randomNameSuffix();
-        hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName, HIVE3_IMAGE));
-        hiveMinioDataLake.start();
-        hiveMinioDataLake.getMinioClient().ensureBucketExists(bucketName);
-
-        return S3HudiQueryRunner.create(
-                ImmutableMap.of(),
-                ImmutableMap.of("hudi.columns-to-hide", columnsToHide()),
-                new TpchHudiTablesInitializer(MERGE_ON_READ, REQUIRED_TPCH_TABLES),
-                hiveMinioDataLake);
-    }
-}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiPartitionManager.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiPartitionManager.java
new file mode 100644
index 000000000000..a998d8a311b5
--- /dev/null
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiPartitionManager.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.hive.HiveBucketProperty;
+import io.trino.plugin.hive.metastore.Column;
+import io.trino.plugin.hive.metastore.Storage;
+import io.trino.plugin.hive.metastore.Table;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.type.TestingTypeManager;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.OptionalLong;
+
+import static io.trino.plugin.hive.HiveStorageFormat.PARQUET;
+import static io.trino.plugin.hive.HiveType.HIVE_INT;
+import static io.trino.plugin.hive.HiveType.HIVE_STRING;
+import static io.trino.plugin.hive.TableType.MANAGED_TABLE;
+import static io.trino.plugin.hive.metastore.StorageFormat.fromHiveStorageFormat;
+import static io.trino.plugin.hive.util.HiveBucketing.BucketingVersion.BUCKETING_V1;
+import static io.trino.plugin.hudi.model.HudiTableType.COPY_ON_WRITE;
+import static org.testng.Assert.assertEquals;
+
+public class TestHudiPartitionManager
+{
+    private static final String SCHEMA_NAME = "schema";
+    private static final String TABLE_NAME = "table";
+    private static final String USER_NAME = "user";
+    private static final String LOCATION = "somewhere/over/the/rainbow";
+    private static final Column PARTITION_COLUMN = new Column("ds", HIVE_STRING, Optional.empty());
+    private static final Column BUCKET_COLUMN = new Column("c1", HIVE_INT, Optional.empty());
+    private static final Table TABLE = new Table(
+            SCHEMA_NAME,
+            TABLE_NAME,
+            Optional.of(USER_NAME),
+            MANAGED_TABLE.name(),
+            new Storage(
+                    fromHiveStorageFormat(PARQUET),
+                    Optional.of(LOCATION),
+                    Optional.of(new HiveBucketProperty(
+                            ImmutableList.of(BUCKET_COLUMN.getName()),
+                            BUCKETING_V1,
+                            2,
+                            ImmutableList.of())),
+                    false,
+                    ImmutableMap.of()),
+            ImmutableList.of(BUCKET_COLUMN),
+            ImmutableList.of(PARTITION_COLUMN),
+            ImmutableMap.of(),
+            Optional.empty(),
+            Optional.empty(),
+            OptionalLong.empty());
+    private static final List<String> PARTITIONS = ImmutableList.of("ds=2019-07-23", "ds=2019-08-23");
+    private final HudiPartitionManager hudiPartitionManager = new HudiPartitionManager(new TestingTypeManager());
+    private final TestingExtendedHiveMetastore metastore = new TestingExtendedHiveMetastore(TABLE, PARTITIONS);
+
+    @Test
+    public void testParseValuesAndFilterPartition()
+    {
+        HudiTableHandle tableHandle = new HudiTableHandle(
+                SCHEMA_NAME,
+                TABLE_NAME,
+                TABLE.getStorage().getLocation(),
+                COPY_ON_WRITE,
+                TupleDomain.all(),
+                TupleDomain.all());
+        List<String> actualPartitions = hudiPartitionManager.getEffectivePartitions(
+                tableHandle,
+                metastore);
+        assertEquals(actualPartitions, PARTITIONS);
+    }
+}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiPlugin.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiPlugin.java
new file mode 100644
index 000000000000..a6cbe73b4c33
--- /dev/null
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiPlugin.java
@@ -0,0 +1,114 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi;
+
+import com.google.common.collect.ImmutableMap;
+import io.airlift.bootstrap.ApplicationConfigurationException;
+import io.trino.plugin.hive.HiveConfig;
+import io.trino.spi.Plugin;
+import io.trino.spi.connector.ConnectorFactory;
+import io.trino.testing.TestingConnectorContext;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestHudiPlugin
+{
+    @Test
+    public void testCreateConnector()
+    {
+        ConnectorFactory factory = getConnectorFactory();
+        factory.create("test", Map.of("hive.metastore.uri", "thrift://foo:1234"), new TestingConnectorContext())
+                .shutdown();
+    }
+
+    @Test
+    public void testCreateTestingConnector()
+    {
+        Plugin plugin = new TestingHudiPlugin(Optional.empty());
+        ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
+        factory.create("test", Map.of("hive.metastore.uri", "thrift://foo:1234"), new TestingConnectorContext())
+                .shutdown();
+    }
+
+    @Test
+    public void testTestingFileMetastore()
+    {
+        ConnectorFactory factory = getConnectorFactory();
+        factory.create(
+                        "test",
+                        ImmutableMap.of(
+                                "hive.metastore", "file",
+                                "hive.metastore.catalog.dir", "/tmp"),
+                        new TestingConnectorContext())
+                .shutdown();
+    }
+
+    @Test
+    public void testThriftMetastore()
+    {
+        ConnectorFactory factory = getConnectorFactory();
+        factory.create(
+                        "test",
+                        Map.of(
+                                "hive.metastore", "thrift",
+                                "hive.metastore.uri", "thrift://foo:1234"),
+                        new TestingConnectorContext())
+                .shutdown();
+    }
+
+    @Test
+    public void testGlueMetastore()
+    {
+        ConnectorFactory factory = getConnectorFactory();
+        factory.create(
+                        "test",
+                        Map.of(
+                                "hive.metastore", "glue",
+                                "hive.metastore.glue.region", "us-east-2"),
+                        new TestingConnectorContext())
+                .shutdown();
+
+        assertThatThrownBy(() -> factory.create(
+                "test",
+                Map.of(
+                        "hive.metastore", "glue",
+                        "hive.metastore.uri", "thrift://foo:1234"),
+                new TestingConnectorContext()))
+                .isInstanceOf(ApplicationConfigurationException.class)
+                .hasMessageContaining("Error: Configuration property 'hive.metastore.uri' was not used");
+    }
+
+    @Test
+    public void testHiveConfigIsNotBound()
+    {
+        ConnectorFactory factory = getConnectorFactory();
+        assertThatThrownBy(() -> factory.create("test",
+                Map.of(
+                        "hive.metastore.uri", "thrift://foo:1234",
+                        // Try setting any property provided by HiveConfig class
+                        HiveConfig.CONFIGURATION_HIVE_PARTITION_PROJECTION_ENABLED, "true"),
+                new TestingConnectorContext()))
+                .hasMessageContaining("Error: Configuration property 'hive.partition-projection-enabled' was not used");
+    }
+
+    private static ConnectorFactory getConnectorFactory()
+    {
+        return getOnlyElement(new HudiPlugin().getConnectorFactories());
+    }
+}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSessionProperties.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSessionProperties.java
index 3cde567ca44b..62d039c763e7 100644
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSessionProperties.java
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSessionProperties.java
@@ -17,7 +17,7 @@
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.testing.TestingConnectorSession;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSmokeTest.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSmokeTest.java
index f00491943ffe..37c53555268d 100644
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSmokeTest.java
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSmokeTest.java
@@ -17,7 +17,7 @@
 import io.trino.plugin.hudi.testing.ResourceHudiTablesInitializer;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -167,7 +167,7 @@ public void testPartitionColumn()
 
     private static Path toPath(String path)
     {
-        // Remove leading 'file:' because $path column returns 'file:/path-to-file' in case of local file system
+        // Remove leading 'file:' because path column returns 'file:/path-to-file' in case of local file system
         return Path.of(path.replaceFirst("^file:", ""));
     }
 }
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSystemTables.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSystemTables.java
index b74a5e330430..80be28fea6b3 100644
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSystemTables.java
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSystemTables.java
@@ -17,7 +17,7 @@
 import io.trino.plugin.hudi.testing.ResourceHudiTablesInitializer;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.hudi.HudiQueryRunner.createHudiQueryRunner;
 
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiUtil.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiUtil.java
deleted file mode 100644
index 226ca77afb60..000000000000
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiUtil.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.hudi;
-
-import com.google.common.collect.ImmutableList;
-import org.apache.hudi.hadoop.HoodieParquetInputFormat;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import java.util.Properties;
-
-import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
-import static io.trino.plugin.hive.HiveStorageFormat.PARQUET;
-import static io.trino.plugin.hive.util.HiveUtil.getInputFormat;
-import static io.trino.plugin.hudi.HudiUtil.isHudiParquetInputFormat;
-import static org.apache.hadoop.hive.common.FileUtils.unescapePathName;
-import static org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.FILE_INPUT_FORMAT;
-import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_LIB;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-public class TestHudiUtil
-{
-    @Test
-    public void testIsHudiParquetInputFormat()
-    {
-        Properties schema = new Properties();
-        schema.setProperty(FILE_INPUT_FORMAT, HoodieParquetInputFormat.class.getName());
-        schema.setProperty(SERIALIZATION_LIB, PARQUET.getSerde());
-
-        assertTrue(isHudiParquetInputFormat(getInputFormat(newEmptyConfiguration(), schema, false)));
-    }
-
-    @Test
-    public void testBuildPartitionValues()
-    {
-        assertToPartitionValues("partitionColumn1=01/01/2020", ImmutableList.of("01/01/2020"));
-        assertToPartitionValues("partitionColumn1=01/01/2020/partitioncolumn2=abc", ImmutableList.of("01/01/2020", "abc"));
-        assertToPartitionValues("ds=2015-12-30/event_type=QueryCompletion", ImmutableList.of("2015-12-30", "QueryCompletion"));
-        assertToPartitionValues("ds=2015-12-30", ImmutableList.of("2015-12-30"));
-        assertToPartitionValues("a=1", ImmutableList.of("1"));
-        assertToPartitionValues("a=1/b=2/c=3", ImmutableList.of("1", "2", "3"));
-        assertToPartitionValues("pk=!@%23$%25%5E&%2A()%2F%3D", ImmutableList.of("!@#$%^&*()/="));
-        assertToPartitionValues("pk=__HIVE_DEFAULT_PARTITION__", ImmutableList.of("__HIVE_DEFAULT_PARTITION__"));
-    }
-
-    private static void assertToPartitionValues(String partitionName, List<String> expected)
-    {
-        List<String> actual = buildPartitionValues(partitionName);
-        assertEquals(actual, expected);
-    }
-
-    private static List<String> buildPartitionValues(String partitionNames)
-    {
-        ImmutableList.Builder<String> values = ImmutableList.builder();
-        String[] parts = partitionNames.split("=");
-        if (parts.length == 1) {
-            values.add(unescapePathName(partitionNames));
-            return values.build();
-        }
-        if (parts.length == 2) {
-            values.add(unescapePathName(parts[1]));
-            return values.build();
-        }
-        for (int i = 1; i < parts.length; i++) {
-            String val = parts[i];
-            int j = val.lastIndexOf('/');
-            if (j == -1) {
-                values.add(unescapePathName(val));
-            }
-            else {
-                values.add(unescapePathName(val.substring(0, j)));
-            }
-        }
-        return values.build();
-    }
-}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestingExtendedHiveMetastore.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestingExtendedHiveMetastore.java
new file mode 100644
index 000000000000..fbe97020b0fe
--- /dev/null
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestingExtendedHiveMetastore.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi;
+
+import io.trino.plugin.hive.metastore.Table;
+import io.trino.plugin.hive.metastore.UnimplementedHiveMetastore;
+import io.trino.spi.predicate.TupleDomain;
+
+import java.util.List;
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public class TestingExtendedHiveMetastore
+        extends UnimplementedHiveMetastore
+{
+    private final Table table;
+    private final List<String> partitions;
+
+    public TestingExtendedHiveMetastore(Table table, List<String> partitions)
+    {
+        this.table = requireNonNull(table, "table is null");
+        this.partitions = requireNonNull(partitions, "partitions is null");
+    }
+
+    @Override
+    public Optional<Table> getTable(String databaseName, String tableName)
+    {
+        return Optional.of(table);
+    }
+
+    @Override
+    public Optional<List<String>> getPartitionNamesByFilter(String databaseName, String tableName, List<String> columnNames, TupleDomain<String> partitionKeysFilter)
+    {
+        return Optional.of(partitions);
+    }
+}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestingHudiConnectorFactory.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestingHudiConnectorFactory.java
index 6009f199ad03..d221ada7e851 100644
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestingHudiConnectorFactory.java
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestingHudiConnectorFactory.java
@@ -43,6 +43,6 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
-        return createConnector(catalogName, config, context, metastore);
+        return createConnector(catalogName, config, context, metastore, Optional.empty());
     }
 }
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/HudiTablesInitializer.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/HudiTablesInitializer.java
index 2dfac921ecf7..770ed52f0406 100644
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/HudiTablesInitializer.java
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/HudiTablesInitializer.java
@@ -13,9 +13,9 @@
  */
 package io.trino.plugin.hudi.testing;
 
+import io.trino.hdfs.HdfsEnvironment;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.testing.QueryRunner;
-import org.apache.hadoop.conf.Configuration;
 
 public interface HudiTablesInitializer
 {
@@ -24,6 +24,6 @@ void initializeTables(
             HiveMetastore metastore,
             String schemaName,
             String dataDir,
-            Configuration conf)
+            HdfsEnvironment hdfsEnvironment)
             throws Exception;
 }
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/HudiTestUtils.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/HudiTestUtils.java
new file mode 100644
index 000000000000..26d8d663237d
--- /dev/null
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/HudiTestUtils.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed 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 io.trino.plugin.hudi.testing;
+
+import com.google.common.collect.ImmutableList;
+
+import static io.trino.plugin.hudi.testing.TpchHudiTablesInitializer.FIELD_UUID;
+import static org.apache.hudi.common.model.HoodieRecord.HOODIE_META_COLUMNS;
+
+public final class HudiTestUtils
+{
+    private HudiTestUtils() {}
+
+    public static final String COLUMNS_TO_HIDE = String.join(",", ImmutableList.<String>builder()
+            .addAll(HOODIE_META_COLUMNS)
+            .add(FIELD_UUID)
+            .build());
+}
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/ResourceHudiTablesInitializer.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/ResourceHudiTablesInitializer.java
index 8d1cda74e287..2e996d626b3e 100644
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/ResourceHudiTablesInitializer.java
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/ResourceHudiTablesInitializer.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.log.Logger;
-import io.trino.plugin.hive.HiveStorageFormat;
+import io.trino.hdfs.HdfsEnvironment;
 import io.trino.plugin.hive.HiveType;
 import io.trino.plugin.hive.PartitionStatistics;
 import io.trino.plugin.hive.metastore.Column;
@@ -27,9 +27,6 @@
 import io.trino.plugin.hive.metastore.StorageFormat;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.testing.QueryRunner;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.metastore.TableType;
-import org.apache.hudi.common.model.HoodieTableType;
 
 import java.io.File;
 import java.io.IOException;
@@ -51,8 +48,10 @@
 import static io.trino.plugin.hive.HiveType.HIVE_INT;
 import static io.trino.plugin.hive.HiveType.HIVE_LONG;
 import static io.trino.plugin.hive.HiveType.HIVE_STRING;
-import static org.apache.hudi.common.model.HoodieTableType.COPY_ON_WRITE;
-import static org.apache.hudi.common.model.HoodieTableType.MERGE_ON_READ;
+import static io.trino.plugin.hive.TableType.EXTERNAL_TABLE;
+import static io.trino.plugin.hive.util.HiveClassNames.HUDI_PARQUET_INPUT_FORMAT;
+import static io.trino.plugin.hive.util.HiveClassNames.MAPRED_PARQUET_OUTPUT_FORMAT_CLASS;
+import static io.trino.plugin.hive.util.HiveClassNames.PARQUET_HIVE_SERDE_CLASS;
 
 public class ResourceHudiTablesInitializer
         implements HudiTablesInitializer
@@ -65,7 +64,7 @@ public void initializeTables(
             HiveMetastore metastore,
             String schemaName,
             String dataDir,
-            Configuration conf)
+            HdfsEnvironment environment)
             throws Exception
     {
         Path basePath = Path.of(dataDir);
@@ -94,12 +93,15 @@ private void createTable(
             List<Column> partitionColumns,
             Map<String, String> partitions)
     {
-        StorageFormat storageFormat = StorageFormat.fromHiveStorageFormat(HiveStorageFormat.PARQUET);
+        StorageFormat storageFormat = StorageFormat.create(
+                PARQUET_HIVE_SERDE_CLASS,
+                HUDI_PARQUET_INPUT_FORMAT,
+                MAPRED_PARQUET_OUTPUT_FORMAT_CLASS);
 
         Table table = Table.builder()
                 .setDatabaseName(schemaName)
                 .setTableName(tableName)
-                .setTableType(TableType.EXTERNAL_TABLE.name())
+                .setTableType(EXTERNAL_TABLE.name())
                 .setOwner(Optional.of("public"))
                 .setDataColumns(dataColumns)
                 .setPartitionColumns(partitionColumns)
@@ -152,10 +154,10 @@ private static void copyDir(Path srcDir, Path dstDir)
 
     public enum TestingTable
     {
-        HUDI_NON_PART_COW(COPY_ON_WRITE, nonPartitionRegularColumns()),
-        HUDI_COW_PT_TBL(COPY_ON_WRITE, multiPartitionRegularColumns(), multiPartitionColumns(), multiPartitions()),
-        STOCK_TICKS_COW(COPY_ON_WRITE, stockTicksRegularColumns(), stockTicksPartitionColumns(), stockTicksPartitions()),
-        STOCK_TICKS_MOR(MERGE_ON_READ, stockTicksRegularColumns(), stockTicksPartitionColumns(), stockTicksPartitions()),
+        HUDI_NON_PART_COW(nonPartitionRegularColumns()),
+        HUDI_COW_PT_TBL(multiPartitionRegularColumns(), multiPartitionColumns(), multiPartitions()),
+        STOCK_TICKS_COW(stockTicksRegularColumns(), stockTicksPartitionColumns(), stockTicksPartitions()),
+        STOCK_TICKS_MOR(stockTicksRegularColumns(), stockTicksPartitionColumns(), stockTicksPartitions()),
         /**/;
 
         private static final List<Column> HUDI_META_COLUMNS = ImmutableList.of(
@@ -165,26 +167,23 @@ public enum TestingTable
                 new Column("_hoodie_partition_path", HIVE_STRING, Optional.empty()),
                 new Column("_hoodie_file_name", HIVE_STRING, Optional.empty()));
 
-        private final HoodieTableType tableType;
         private final List<Column> regularColumns;
         private final List<Column> partitionColumns;
         private final Map<String, String> partitions;
 
         TestingTable(
-                HoodieTableType tableType,
                 List<Column> regularColumns,
                 List<Column> partitionColumns,
                 Map<String, String> partitions)
         {
-            this.tableType = tableType;
             this.regularColumns = regularColumns;
             this.partitionColumns = partitionColumns;
             this.partitions = partitions;
         }
 
-        TestingTable(HoodieTableType tableType, List<Column> regularColumns)
+        TestingTable(List<Column> regularColumns)
         {
-            this(tableType, regularColumns, ImmutableList.of(), ImmutableMap.of());
+            this(regularColumns, ImmutableList.of(), ImmutableMap.of());
         }
 
         public String getTableName()
@@ -192,11 +191,6 @@ public String getTableName()
             return name().toLowerCase(Locale.ROOT);
         }
 
-        public HoodieTableType getTableType()
-        {
-            return tableType;
-        }
-
         public List<Column> getDataColumns()
         {
             return Stream.of(HUDI_META_COLUMNS, regularColumns)
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/TpchHudiTablesInitializer.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/TpchHudiTablesInitializer.java
index 2a6c5f44b224..785ae2a32e96 100644
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/TpchHudiTablesInitializer.java
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/TpchHudiTablesInitializer.java
@@ -16,7 +16,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.log.Logger;
-import io.trino.plugin.hive.HiveStorageFormat;
+import io.trino.hdfs.HdfsContext;
+import io.trino.hdfs.HdfsEnvironment;
 import io.trino.plugin.hive.HiveType;
 import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.HiveMetastore;
@@ -35,6 +36,7 @@
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
 import org.apache.hudi.client.HoodieJavaWriteClient;
 import org.apache.hudi.client.common.HoodieJavaEngineContext;
 import org.apache.hudi.common.bootstrap.index.NoOpBootstrapIndex;
@@ -71,12 +73,16 @@
 import static io.trino.plugin.hive.HiveType.HIVE_INT;
 import static io.trino.plugin.hive.HiveType.HIVE_LONG;
 import static io.trino.plugin.hive.HiveType.HIVE_STRING;
+import static io.trino.plugin.hive.TableType.EXTERNAL_TABLE;
 import static io.trino.plugin.hive.metastore.PrincipalPrivileges.NO_PRIVILEGES;
+import static io.trino.plugin.hive.util.HiveClassNames.HUDI_PARQUET_INPUT_FORMAT;
+import static io.trino.plugin.hive.util.HiveClassNames.MAPRED_PARQUET_OUTPUT_FORMAT_CLASS;
+import static io.trino.plugin.hive.util.HiveClassNames.PARQUET_HIVE_SERDE_CLASS;
+import static io.trino.testing.TestingConnectorSession.SESSION;
 import static java.lang.String.format;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toUnmodifiableList;
-import static org.apache.hadoop.hive.metastore.TableType.EXTERNAL_TABLE;
 
 public class TpchHudiTablesInitializer
         implements HudiTablesInitializer
@@ -91,6 +97,7 @@ public class TpchHudiTablesInitializer
             new Column("_hoodie_record_key", HIVE_STRING, Optional.empty()),
             new Column("_hoodie_partition_path", HIVE_STRING, Optional.empty()),
             new Column("_hoodie_file_name", HIVE_STRING, Optional.empty()));
+    private static final HdfsContext CONTEXT = new HdfsContext(SESSION);
 
     private final HoodieTableType tableType;
     private final List<TpchTable<?>> tpchTables;
@@ -107,12 +114,12 @@ public void initializeTables(
             HiveMetastore metastore,
             String schemaName,
             String dataDir,
-            Configuration conf)
+            HdfsEnvironment hdfsEnvironment)
     {
         queryRunner.installPlugin(new TpchPlugin());
         queryRunner.createCatalog(TPCH_TINY.getCatalogName(), "tpch", ImmutableMap.of());
         for (TpchTable<?> table : tpchTables) {
-            load(table, queryRunner, metastore, schemaName, dataDir, conf);
+            load(table, queryRunner, metastore, schemaName, dataDir, hdfsEnvironment);
         }
     }
 
@@ -122,9 +129,9 @@ private void load(
             HiveMetastore metastore,
             String schemaName,
             String basePath,
-            Configuration conf)
+            HdfsEnvironment hdfsEnvironment)
     {
-        try (HoodieJavaWriteClient<HoodieAvroPayload> writeClient = createWriteClient(tpchTables, basePath, conf)) {
+        try (HoodieJavaWriteClient<HoodieAvroPayload> writeClient = createWriteClient(tpchTables, basePath, hdfsEnvironment)) {
             RecordConverter recordConverter = createRecordConverter(tpchTables);
 
             @Language("SQL") String sql = generateScanSql(TPCH_TINY, tpchTables);
@@ -164,8 +171,10 @@ private Table createMetastoreTable(String schemaName, TpchTable<?> table, String
         List<Column> columns = Stream.of(HUDI_META_COLUMNS, createMetastoreColumns(table))
                 .flatMap(Collection::stream)
                 .collect(toUnmodifiableList());
-        // TODO: create right format
-        StorageFormat storageFormat = StorageFormat.fromHiveStorageFormat(HiveStorageFormat.PARQUET);
+        StorageFormat storageFormat = StorageFormat.create(
+                PARQUET_HIVE_SERDE_CLASS,
+                HUDI_PARQUET_INPUT_FORMAT,
+                MAPRED_PARQUET_OUTPUT_FORMAT_CLASS);
 
         return Table.builder()
                 .setDatabaseName(schemaName)
@@ -180,11 +189,12 @@ private Table createMetastoreTable(String schemaName, TpchTable<?> table, String
                 .build();
     }
 
-    private HoodieJavaWriteClient<HoodieAvroPayload> createWriteClient(TpchTable<?> table, String basePath, Configuration conf)
+    private HoodieJavaWriteClient<HoodieAvroPayload> createWriteClient(TpchTable<?> table, String basePath, HdfsEnvironment hdfsEnvironment)
     {
         String tableName = table.getTableName();
         String tablePath = getTablePath(table, basePath);
         Schema schema = createAvroSchema(table);
+        Configuration conf = hdfsEnvironment.getConfiguration(CONTEXT, new Path(tablePath));
 
         try {
             HoodieTableMetaClient.withPropertyBuilder()
diff --git a/plugin/trino-iceberg/pom.xml b/plugin/trino-iceberg/pom.xml
index f98f23ffc7a2..76ed1523dc9f 100644
--- a/plugin/trino-iceberg/pom.xml
+++ b/plugin/trino-iceberg/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-iceberg</artifactId>
-    <description>Trino - Iceberg Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Iceberg Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -24,69 +24,50 @@
           TODO (https://github.com/trinodb/trino/issues/11294) remove when we upgrade to surefire with https://issues.apache.org/jira/browse/SUREFIRE-1967
           -->
         <air.test.parallel>instances</air.test.parallel>
+        <!-- Nessie version (matching to Iceberg release) must be bumped along with Iceberg version bump to avoid compatibility issues -->
+        <dep.nessie.version>0.71.0</dep.nessie.version>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-filesystem</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hdfs</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hive</artifactId>
-            <exclusions>
-                <exclusion>
-                    <!-- calcite-core and Iceberg have conflicting versions of org.apache.commons:commons-lang3 -->
-                    <groupId>com.linkedin.calcite</groupId>
-                    <artifactId>calcite-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.airlift</groupId>
-                    <artifactId>http-client</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-memory-context</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-glue</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-orc</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-parquet</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
-        <!-- TODO: move to runtime scope and remove dependency plugin exclusion below -->
         <dependency>
-            <groupId>io.trino.hadoop</groupId>
-            <artifactId>hadoop-apache</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hive</groupId>
-            <artifactId>hive-apache</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hive</groupId>
-            <artifactId>hive-thrift</artifactId>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
         </dependency>
 
         <dependency>
@@ -120,69 +101,84 @@
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-core</artifactId>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-glue</artifactId>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem-manager</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hdfs</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hive</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.airlift</groupId>
+                    <artifactId>http-client</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-memory-context</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-impl</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-orc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-jackson</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-parquet</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.trino.hive</groupId>
+            <artifactId>hive-thrift</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -190,16 +186,21 @@
             <artifactId>joda-time</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.datasketches</groupId>
             <artifactId>datasketches-java</artifactId>
-            <version>3.3.0</version>
+            <version>4.2.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.datasketches</groupId>
             <artifactId>datasketches-memory</artifactId>
-            <version>2.1.0</version>
+            <version>2.2.0</version>
         </dependency>
 
         <dependency>
@@ -212,6 +213,12 @@
             <artifactId>iceberg-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.iceberg</groupId>
+            <artifactId>iceberg-nessie</artifactId>
+            <version>${dep.iceberg.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.iceberg</groupId>
             <artifactId>iceberg-orc</artifactId>
@@ -222,11 +229,43 @@
             <artifactId>iceberg-parquet</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-column</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-format-structures</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-hadoop</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.jdbi</groupId>
             <artifactId>jdbi3-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectnessie.nessie</groupId>
+            <artifactId>nessie-client</artifactId>
+            <version>${dep.nessie.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectnessie.nessie</groupId>
+            <artifactId>nessie-model</artifactId>
+            <version>${dep.nessie.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.roaringbitmap</groupId>
             <artifactId>RoaringBitmap</artifactId>
@@ -237,10 +276,45 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-hadoop-toolkit</artifactId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-s3</artifactId>
             <scope>runtime</scope>
         </dependency>
 
@@ -256,7 +330,6 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>node</artifactId>
@@ -270,22 +343,34 @@
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-s3</artifactId>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-aws-sdk-1.11</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hadoop-toolkit</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino.hadoop</groupId>
+            <artifactId>hadoop-apache</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.1</version>
+            <version>5.2.1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.httpcomponents.core5</groupId>
             <artifactId>httpcore5</artifactId>
-            <version>5.1.1</version>
+            <version>5.2.1</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -308,32 +393,64 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>http-server</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.spotbugs</groupId>
+                    <artifactId>spotbugs-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.jcip</groupId>
+                    <artifactId>jcip-annotations</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk-trace</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-blackhole</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-exchange-filesystem</artifactId>
@@ -359,12 +476,6 @@
             <artifactId>trino-hive</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.linkedin.calcite</groupId>
-                    <artifactId>calcite-core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -417,6 +528,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino.hive</groupId>
+            <artifactId>hive-apache</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino.tpch</groupId>
             <artifactId>tpch</artifactId>
@@ -424,49 +541,39 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>http-server</artifactId>
+            <groupId>org.apache.iceberg</groupId>
+            <artifactId>iceberg-core</artifactId>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
+            <groupId>org.eclipse.jetty.toolchain</groupId>
+            <artifactId>jetty-jakarta-servlet-api</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.github.spotbugs</groupId>
-                    <artifactId>spotbugs-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>net.jcip</groupId>
-                    <artifactId>jcip-annotations</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.iceberg</groupId>
-            <artifactId>iceberg-core</artifactId>
-            <classifier>tests</classifier>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-servlet-api</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -491,61 +598,57 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.36.0.3</version>
+            <version>3.43.0.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <configuration>
+                        <ignoredNonTestScopedDependencies>
+                            <ignoredNonTestScopedDependency>org.apache.parquet:parquet-common</ignoredNonTestScopedDependency>
+                        </ignoredNonTestScopedDependencies>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <configuration>
-                    <rules>
-                        <requireUpperBoundDeps>
-                            <excludes combine.children="append">
-                                <exclude>com.google.guava:guava</exclude>
-                            </excludes>
-                        </requireUpperBoundDeps>
-                        <RestrictImports>
-                            <includeTestCode>false</includeTestCode>
-                            <bannedImport>org.apache.hadoop.**</bannedImport>
-                        </RestrictImports>
-                    </rules>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <configuration>
-                    <ignoredNonTestScopedDependencies>
-                        <ignoredDependency>io.trino.hadoop:hadoop-apache</ignoredDependency>
-                    </ignoredNonTestScopedDependencies>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.basepom.maven</groupId>
                 <artifactId>duplicate-finder-maven-plugin</artifactId>
                 <configuration>
                     <ignoredResourcePatterns>
-                        <!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
-                        <ignoredResourcePattern>mime.types</ignoredResourcePattern>
-                        <ignoredResourcePattern>about.html</ignoredResourcePattern>
                         <ignoredResourcePattern>iceberg-build.properties</ignoredResourcePattern>
                         <ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
-                        <!-- TODO: To be removed https://github.com/trinodb/trino/issues/15371 -->
-                        <ignoredResourcePattern>google/protobuf/.*\.proto$</ignoredResourcePattern>
                     </ignoredResourcePatterns>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
     </build>
 
@@ -562,6 +665,8 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <excludes>
+                                <exclude>**/Test*Avro*.java</exclude>
+                                <exclude>**/Test*Minio*.java</exclude>
                                 <exclude>**/TestIcebergGlueCatalogConnectorSmokeTest.java</exclude>
                                 <exclude>**/TestTrinoGlueCatalog.java</exclude>
                                 <exclude>**/TestSharedGlueMetastore.java</exclude>
@@ -570,6 +675,7 @@
                                 <exclude>**/TestIcebergGlueCreateTableFailure.java</exclude>
                                 <exclude>**/TestIcebergGlueTableOperationsInsertFailure.java</exclude>
                                 <exclude>**/TestIcebergGlueCatalogSkipArchive.java</exclude>
+                                <exclude>**/TestIcebergS3AndGlueMetastoreTest.java</exclude>
                                 <exclude>**/TestIcebergGcsConnectorSmokeTest.java</exclude>
                                 <exclude>**/TestIcebergAbfsConnectorSmokeTest.java</exclude>
                                 <exclude>**/Test*FailureRecoveryTest.java</exclude>
@@ -597,6 +703,24 @@
             </build>
         </profile>
 
+        <profile>
+            <id>minio-and-avro</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <includes>
+                                <include>**/Test*Avro*.java</include>
+                                <include>**/Test*Minio*.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>cloud-tests</id>
             <build>
@@ -614,6 +738,7 @@
                                 <include>**/TestIcebergGlueCreateTableFailure.java</include>
                                 <include>**/TestIcebergGlueTableOperationsInsertFailure.java</include>
                                 <include>**/TestIcebergGlueCatalogSkipArchive.java</include>
+                                <include>**/TestIcebergS3AndGlueMetastoreTest.java</include>
                                 <include>**/TestIcebergGcsConnectorSmokeTest.java</include>
                                 <include>**/TestIcebergAbfsConnectorSmokeTest.java</include>
                             </includes>
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/AsyncIcebergSplitProducer.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/AsyncIcebergSplitProducer.java
new file mode 100644
index 000000000000..678ad872d8fd
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/AsyncIcebergSplitProducer.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg;
+
+import com.google.inject.BindingAnnotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+@Target(PARAMETER)
+@BindingAnnotation
+public @interface AsyncIcebergSplitProducer {}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CatalogType.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CatalogType.java
index ed2ffb761051..857aa1a8e6c7 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CatalogType.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CatalogType.java
@@ -20,5 +20,6 @@ public enum CatalogType
     GLUE,
     REST,
     JDBC,
+    NESSIE,
     /**/;
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CommitTaskData.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CommitTaskData.java
index f1585499e67d..9870f0b03502 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CommitTaskData.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CommitTaskData.java
@@ -19,7 +19,6 @@
 
 import java.util.Optional;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 public class CommitTaskData
@@ -32,8 +31,6 @@ public class CommitTaskData
     private final Optional<String> partitionDataJson;
     private final FileContent content;
     private final Optional<String> referencedDataFile;
-    private final Optional<Long> fileRecordCount;
-    private final Optional<Long> deletedRowCount;
 
     @JsonCreator
     public CommitTaskData(
@@ -44,9 +41,7 @@ public CommitTaskData(
             @JsonProperty("partitionSpecJson") String partitionSpecJson,
             @JsonProperty("partitionDataJson") Optional<String> partitionDataJson,
             @JsonProperty("content") FileContent content,
-            @JsonProperty("referencedDataFile") Optional<String> referencedDataFile,
-            @JsonProperty("fileRecordCount") Optional<Long> fileRecordCount,
-            @JsonProperty("deletedRowCount") Optional<Long> deletedRowCount)
+            @JsonProperty("referencedDataFile") Optional<String> referencedDataFile)
     {
         this.path = requireNonNull(path, "path is null");
         this.fileFormat = requireNonNull(fileFormat, "fileFormat is null");
@@ -56,12 +51,6 @@ public CommitTaskData(
         this.partitionDataJson = requireNonNull(partitionDataJson, "partitionDataJson is null");
         this.content = requireNonNull(content, "content is null");
         this.referencedDataFile = requireNonNull(referencedDataFile, "referencedDataFile is null");
-        this.fileRecordCount = requireNonNull(fileRecordCount, "fileRecordCount is null");
-        fileRecordCount.ifPresent(rowCount -> checkArgument(rowCount >= 0, "fileRecordCount cannot be negative"));
-        this.deletedRowCount = requireNonNull(deletedRowCount, "deletedRowCount is null");
-        deletedRowCount.ifPresent(rowCount -> checkArgument(rowCount >= 0, "deletedRowCount cannot be negative"));
-        checkArgument(fileRecordCount.isPresent() == deletedRowCount.isPresent(), "fileRecordCount and deletedRowCount must be specified together");
-        checkArgument(fileSizeInBytes >= 0, "fileSizeInBytes is negative");
     }
 
     @JsonProperty
@@ -111,16 +100,4 @@ public Optional<String> getReferencedDataFile()
     {
         return referencedDataFile;
     }
-
-    @JsonProperty
-    public Optional<Long> getFileRecordCount()
-    {
-        return fileRecordCount;
-    }
-
-    @JsonProperty
-    public Optional<Long> getDeletedRowCount()
-    {
-        return deletedRowCount;
-    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CorruptedIcebergTableHandle.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CorruptedIcebergTableHandle.java
new file mode 100644
index 000000000000..c8eb9cb9c767
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CorruptedIcebergTableHandle.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg;
+
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorTableHandle;
+import io.trino.spi.connector.SchemaTableName;
+
+import static java.util.Objects.requireNonNull;
+
+public record CorruptedIcebergTableHandle(SchemaTableName schemaTableName, TrinoException originalException)
+        implements ConnectorTableHandle
+{
+    public CorruptedIcebergTableHandle
+    {
+        requireNonNull(schemaTableName, "schemaTableName is null");
+        requireNonNull(originalException, "originalException is null");
+    }
+
+    public TrinoException createException()
+    {
+        // Original exception originates from a different place. Create a new exception not to confuse reader with a stacktrace not matching call site.
+        return new TrinoException(originalException.getErrorCode(), originalException.getMessage(), originalException);
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/ExpressionConverter.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/ExpressionConverter.java
index 41af9d8bbd15..ceeeeb7b8e03 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/ExpressionConverter.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/ExpressionConverter.java
@@ -55,7 +55,7 @@ public static Expression toIcebergExpression(TupleDomain<IcebergColumnHandle> tu
         if (tupleDomain.isAll()) {
             return alwaysTrue();
         }
-        if (tupleDomain.getDomains().isEmpty()) {
+        if (tupleDomain.isNone()) {
             return alwaysFalse();
         }
         Map<IcebergColumnHandle, Domain> domainMap = tupleDomain.getDomains().get();
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/FilesTable.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/FilesTable.java
index c361972707e5..b983d85a97f6 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/FilesTable.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/FilesTable.java
@@ -19,6 +19,7 @@
 import io.airlift.slice.Slices;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableMetadata;
@@ -29,7 +30,9 @@
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.MapType;
 import io.trino.spi.type.TypeManager;
+import jakarta.annotation.Nullable;
 import org.apache.iceberg.DataFile;
 import org.apache.iceberg.FileScanTask;
 import org.apache.iceberg.Schema;
@@ -43,8 +46,6 @@
 import org.apache.iceberg.types.Type;
 import org.apache.iceberg.types.Types;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.ByteBuffer;
@@ -56,6 +57,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.TypeSignature.mapType;
@@ -135,16 +137,16 @@ private static class PlanFilesIterable
         private final Map<Integer, Type> idToTypeMapping;
         private final List<io.trino.spi.type.Type> types;
         private boolean closed;
-        private final io.trino.spi.type.Type integerToBigintMapType;
-        private final io.trino.spi.type.Type integerToVarcharMapType;
+        private final MapType integerToBigintMapType;
+        private final MapType integerToVarcharMapType;
 
         public PlanFilesIterable(CloseableIterable<FileScanTask> planFiles, Map<Integer, Type> idToTypeMapping, List<io.trino.spi.type.Type> types, TypeManager typeManager)
         {
             this.planFiles = requireNonNull(planFiles, "planFiles is null");
             this.idToTypeMapping = ImmutableMap.copyOf(requireNonNull(idToTypeMapping, "idToTypeMapping is null"));
             this.types = ImmutableList.copyOf(requireNonNull(types, "types is null"));
-            this.integerToBigintMapType = typeManager.getType(mapType(INTEGER.getTypeSignature(), BIGINT.getTypeSignature()));
-            this.integerToVarcharMapType = typeManager.getType(mapType(INTEGER.getTypeSignature(), VARCHAR.getTypeSignature()));
+            this.integerToBigintMapType = new MapType(INTEGER, BIGINT, typeManager.getTypeOperators());
+            this.integerToVarcharMapType = new MapType(INTEGER, VARCHAR, typeManager.getTypeOperators());
             addCloseable(planFiles);
         }
 
@@ -202,12 +204,12 @@ private List<Object> getRecord(DataFile dataFile)
             columns.add(dataFile.format().name());
             columns.add(dataFile.recordCount());
             columns.add(dataFile.fileSizeInBytes());
-            columns.add(getIntegerBigintMapBlock(dataFile.columnSizes()));
-            columns.add(getIntegerBigintMapBlock(dataFile.valueCounts()));
-            columns.add(getIntegerBigintMapBlock(dataFile.nullValueCounts()));
-            columns.add(getIntegerBigintMapBlock(dataFile.nanValueCounts()));
-            columns.add(getIntegerVarcharMapBlock(dataFile.lowerBounds()));
-            columns.add(getIntegerVarcharMapBlock(dataFile.upperBounds()));
+            columns.add(getIntegerBigintSqlMap(dataFile.columnSizes()));
+            columns.add(getIntegerBigintSqlMap(dataFile.valueCounts()));
+            columns.add(getIntegerBigintSqlMap(dataFile.nullValueCounts()));
+            columns.add(getIntegerBigintSqlMap(dataFile.nanValueCounts()));
+            columns.add(getIntegerVarcharSqlMap(dataFile.lowerBounds()));
+            columns.add(getIntegerVarcharSqlMap(dataFile.upperBounds()));
             columns.add(toVarbinarySlice(dataFile.keyMetadata()));
             columns.add(toBigintArrayBlock(dataFile.splitOffsets()));
             columns.add(toIntegerArrayBlock(dataFile.equalityFieldIds()));
@@ -215,20 +217,20 @@ private List<Object> getRecord(DataFile dataFile)
             return columns;
         }
 
-        private Object getIntegerBigintMapBlock(Map<Integer, Long> value)
+        private SqlMap getIntegerBigintSqlMap(Map<Integer, Long> value)
         {
             if (value == null) {
                 return null;
             }
-            return toIntegerBigintMapBlock(value);
+            return toIntegerBigintSqlMap(value);
         }
 
-        private Object getIntegerVarcharMapBlock(Map<Integer, ByteBuffer> value)
+        private SqlMap getIntegerVarcharSqlMap(Map<Integer, ByteBuffer> value)
         {
             if (value == null) {
                 return null;
             }
-            return toIntegerVarcharMapBlock(
+            return toIntegerVarcharSqlMap(
                     value.entrySet().stream()
                             .filter(entry -> idToTypeMapping.containsKey(entry.getKey()))
                             .collect(toImmutableMap(
@@ -237,28 +239,26 @@ private Object getIntegerVarcharMapBlock(Map<Integer, ByteBuffer> value)
                                             idToTypeMapping.get(entry.getKey()), Conversions.fromByteBuffer(idToTypeMapping.get(entry.getKey()), entry.getValue())))));
         }
 
-        private Object toIntegerBigintMapBlock(Map<Integer, Long> values)
+        private SqlMap toIntegerBigintSqlMap(Map<Integer, Long> values)
         {
-            BlockBuilder blockBuilder = integerToBigintMapType.createBlockBuilder(null, 1);
-            BlockBuilder singleMapBlockBuilder = blockBuilder.beginBlockEntry();
-            values.forEach((key, value) -> {
-                INTEGER.writeLong(singleMapBlockBuilder, key);
-                BIGINT.writeLong(singleMapBlockBuilder, value);
-            });
-            blockBuilder.closeEntry();
-            return integerToBigintMapType.getObject(blockBuilder, 0);
+            return buildMapValue(
+                    integerToBigintMapType,
+                    values.size(),
+                    (keyBuilder, valueBuilder) -> values.forEach((key, value) -> {
+                        INTEGER.writeLong(keyBuilder, key);
+                        BIGINT.writeLong(valueBuilder, value);
+                    }));
         }
 
-        private Object toIntegerVarcharMapBlock(Map<Integer, String> values)
+        private SqlMap toIntegerVarcharSqlMap(Map<Integer, String> values)
         {
-            BlockBuilder blockBuilder = integerToVarcharMapType.createBlockBuilder(null, 1);
-            BlockBuilder singleMapBlockBuilder = blockBuilder.beginBlockEntry();
-            values.forEach((key, value) -> {
-                INTEGER.writeLong(singleMapBlockBuilder, key);
-                VARCHAR.writeString(singleMapBlockBuilder, value);
-            });
-            blockBuilder.closeEntry();
-            return integerToVarcharMapType.getObject(blockBuilder, 0);
+            return buildMapValue(
+                    integerToVarcharMapType,
+                    values.size(),
+                    (keyBuilder, valueBuilder) -> values.forEach((key, value) -> {
+                        INTEGER.writeLong(keyBuilder, key);
+                        VARCHAR.writeString(valueBuilder, value);
+                    }));
         }
 
         @Nullable
@@ -289,7 +289,7 @@ private static Slice toVarbinarySlice(ByteBuffer value)
             if (value == null) {
                 return null;
             }
-            return Slices.wrappedBuffer(value);
+            return Slices.wrappedHeapBuffer(value);
         }
     }
 
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/HistoryTable.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/HistoryTable.java
index 25cb9a81588b..90b0a9c6913f 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/HistoryTable.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/HistoryTable.java
@@ -25,7 +25,6 @@
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.TimeZoneKey;
-import org.apache.iceberg.HistoryEntry;
 import org.apache.iceberg.Snapshot;
 import org.apache.iceberg.Table;
 import org.apache.iceberg.util.SnapshotUtil;
@@ -77,14 +76,13 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
 
         Set<Long> ancestorIds = ImmutableSet.copyOf(SnapshotUtil.currentAncestorIds(icebergTable));
         TimeZoneKey timeZoneKey = session.getTimeZoneKey();
-        for (HistoryEntry historyEntry : icebergTable.history()) {
-            long snapshotId = historyEntry.snapshotId();
-            Snapshot snapshot = icebergTable.snapshot(snapshotId);
+        for (Snapshot snapshot : icebergTable.snapshots()) {
+            long snapshotId = snapshot.snapshotId();
 
             table.addRow(
-                    packDateTimeWithZone(historyEntry.timestampMillis(), timeZoneKey),
+                    packDateTimeWithZone(snapshot.timestampMillis(), timeZoneKey),
                     snapshotId,
-                    snapshot != null ? snapshot.parentId() : null,
+                    snapshot.parentId(),
                     ancestorIds.contains(snapshotId));
         }
 
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAnalyzeProperties.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAnalyzeProperties.java
index 0dadbe5207d3..d5410d5f54a1 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAnalyzeProperties.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAnalyzeProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.TrinoException;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAvroDataConversion.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAvroDataConversion.java
index 42a5231a934a..83fc9e7fa5ad 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAvroDataConversion.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAvroDataConversion.java
@@ -17,8 +17,13 @@
 import io.airlift.slice.Slices;
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Decimals;
@@ -28,13 +33,12 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
+import jakarta.annotation.Nullable;
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.data.GenericRecord;
 import org.apache.iceberg.data.Record;
 import org.apache.iceberg.types.Types;
 
-import javax.annotation.Nullable;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
@@ -74,8 +78,6 @@
 import static io.trino.spi.type.UuidType.trinoUuidToJavaUuid;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static java.lang.Float.floatToRawIntBits;
-import static java.lang.Float.intBitsToFloat;
-import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 import static org.apache.iceberg.types.Type.TypeID.FIXED;
 import static org.apache.iceberg.util.DateTimeUtil.microsFromTimestamp;
@@ -145,42 +147,42 @@ public static Object toIcebergAvroObject(Type type, org.apache.iceberg.types.Typ
             return null;
         }
         if (type.equals(BOOLEAN)) {
-            return type.getBoolean(block, position);
+            return BOOLEAN.getBoolean(block, position);
         }
         if (type.equals(INTEGER)) {
-            return toIntExact(type.getLong(block, position));
+            return INTEGER.getInt(block, position);
         }
         if (type.equals(BIGINT)) {
-            return type.getLong(block, position);
+            return BIGINT.getLong(block, position);
         }
         if (type.equals(REAL)) {
-            return intBitsToFloat((int) type.getLong(block, position));
+            return REAL.getFloat(block, position);
         }
         if (type.equals(DOUBLE)) {
-            return type.getDouble(block, position);
+            return DOUBLE.getDouble(block, position);
         }
         if (type instanceof DecimalType decimalType) {
             return Decimals.readBigDecimal(decimalType, block, position);
         }
-        if (type instanceof VarcharType) {
-            return type.getSlice(block, position).toStringUtf8();
+        if (type instanceof VarcharType varcharType) {
+            return varcharType.getSlice(block, position).toStringUtf8();
         }
-        if (type instanceof VarbinaryType) {
+        if (type instanceof VarbinaryType varbinaryType) {
             if (icebergType.typeId().equals(FIXED)) {
-                return type.getSlice(block, position).getBytes();
+                return varbinaryType.getSlice(block, position).getBytes();
             }
-            return ByteBuffer.wrap(type.getSlice(block, position).getBytes());
+            return ByteBuffer.wrap(varbinaryType.getSlice(block, position).getBytes());
         }
         if (type.equals(DATE)) {
-            long epochDays = type.getLong(block, position);
+            int epochDays = DATE.getInt(block, position);
             return LocalDate.ofEpochDay(epochDays);
         }
         if (type.equals(TIME_MICROS)) {
-            long microsOfDay = type.getLong(block, position) / PICOSECONDS_PER_MICROSECOND;
+            long microsOfDay = TIME_MICROS.getLong(block, position) / PICOSECONDS_PER_MICROSECOND;
             return timeFromMicros(microsOfDay);
         }
         if (type.equals(TIMESTAMP_MICROS)) {
-            long epochMicros = type.getLong(block, position);
+            long epochMicros = TIMESTAMP_MICROS.getLong(block, position);
             return timestampFromMicros(epochMicros);
         }
         if (type.equals(TIMESTAMP_TZ_MICROS)) {
@@ -188,13 +190,13 @@ public static Object toIcebergAvroObject(Type type, org.apache.iceberg.types.Typ
             return timestamptzFromMicros(epochUtcMicros);
         }
         if (type.equals(UUID)) {
-            return trinoUuidToJavaUuid(type.getSlice(block, position));
+            return trinoUuidToJavaUuid(UUID.getSlice(block, position));
         }
-        if (type instanceof ArrayType) {
-            Type elementType = type.getTypeParameters().get(0);
+        if (type instanceof ArrayType arrayType) {
+            Type elementType = arrayType.getElementType();
             org.apache.iceberg.types.Type elementIcebergType = icebergType.asListType().elementType();
 
-            Block arrayBlock = block.getObject(position, Block.class);
+            Block arrayBlock = arrayType.getObject(block, position);
 
             List<Object> list = new ArrayList<>(arrayBlock.getPositionCount());
             for (int i = 0; i < arrayBlock.getPositionCount(); i++) {
@@ -204,32 +206,37 @@ public static Object toIcebergAvroObject(Type type, org.apache.iceberg.types.Typ
 
             return Collections.unmodifiableList(list);
         }
-        if (type instanceof MapType) {
-            Type keyType = type.getTypeParameters().get(0);
-            Type valueType = type.getTypeParameters().get(1);
+        if (type instanceof MapType mapType) {
+            Type keyType = mapType.getKeyType();
+            Type valueType = mapType.getValueType();
             org.apache.iceberg.types.Type keyIcebergType = icebergType.asMapType().keyType();
             org.apache.iceberg.types.Type valueIcebergType = icebergType.asMapType().valueType();
 
-            Block mapBlock = block.getObject(position, Block.class);
+            SqlMap sqlMap = mapType.getObject(block, position);
+            int rawOffset = sqlMap.getRawOffset();
+            Block rawKeyBlock = sqlMap.getRawKeyBlock();
+            Block rawValueBlock = sqlMap.getRawValueBlock();
+
             Map<Object, Object> map = new HashMap<>();
-            for (int i = 0; i < mapBlock.getPositionCount(); i += 2) {
-                Object key = toIcebergAvroObject(keyType, keyIcebergType, mapBlock, i);
-                Object value = toIcebergAvroObject(valueType, valueIcebergType, mapBlock, i + 1);
+            for (int i = 0; i < sqlMap.getSize(); i++) {
+                Object key = toIcebergAvroObject(keyType, keyIcebergType, rawKeyBlock, rawOffset + i);
+                Object value = toIcebergAvroObject(valueType, valueIcebergType, rawValueBlock, rawOffset + i);
                 map.put(key, value);
             }
 
             return Collections.unmodifiableMap(map);
         }
-        if (type instanceof RowType) {
-            Block rowBlock = block.getObject(position, Block.class);
+        if (type instanceof RowType rowType) {
+            SqlRow sqlRow = rowType.getObject(block, position);
 
-            List<Type> fieldTypes = type.getTypeParameters();
-            checkArgument(fieldTypes.size() == rowBlock.getPositionCount(), "Expected row value field count does not match type field count");
+            List<Type> fieldTypes = rowType.getTypeParameters();
+            checkArgument(fieldTypes.size() == sqlRow.getFieldCount(), "Expected row value field count does not match type field count");
             List<Types.NestedField> icebergFields = icebergType.asStructType().fields();
 
+            int rawIndex = sqlRow.getRawIndex();
             Record record = GenericRecord.create(icebergType.asStructType());
-            for (int i = 0; i < rowBlock.getPositionCount(); i++) {
-                Object element = toIcebergAvroObject(fieldTypes.get(i), icebergFields.get(i).type(), rowBlock, i);
+            for (int i = 0; i < sqlRow.getFieldCount(); i++) {
+                Object element = toIcebergAvroObject(fieldTypes.get(i), icebergFields.get(i).type(), sqlRow.getRawFieldBlock(i), rawIndex);
                 record.set(i, element);
             }
 
@@ -283,7 +290,7 @@ public static void serializeToTrinoBlock(Type type, org.apache.iceberg.types.Typ
             if (icebergType.typeId().equals(FIXED)) {
                 VARBINARY.writeSlice(builder, Slices.wrappedBuffer((byte[]) object));
             }
-            VARBINARY.writeSlice(builder, Slices.wrappedBuffer((ByteBuffer) object));
+            VARBINARY.writeSlice(builder, Slices.wrappedHeapBuffer((ByteBuffer) object));
             return;
         }
         if (type.equals(DATE)) {
@@ -312,11 +319,11 @@ public static void serializeToTrinoBlock(Type type, org.apache.iceberg.types.Typ
             Collection<?> array = (Collection<?>) object;
             Type elementType = ((ArrayType) type).getElementType();
             org.apache.iceberg.types.Type elementIcebergType = icebergType.asListType().elementType();
-            BlockBuilder currentBuilder = builder.beginBlockEntry();
-            for (Object element : array) {
-                serializeToTrinoBlock(elementType, elementIcebergType, currentBuilder, element);
-            }
-            builder.closeEntry();
+            ((ArrayBlockBuilder) builder).buildEntry(elementBuilder -> {
+                for (Object element : array) {
+                    serializeToTrinoBlock(elementType, elementIcebergType, elementBuilder, element);
+                }
+            });
             return;
         }
         if (type instanceof MapType) {
@@ -325,23 +332,23 @@ public static void serializeToTrinoBlock(Type type, org.apache.iceberg.types.Typ
             Type valueType = ((MapType) type).getValueType();
             org.apache.iceberg.types.Type keyIcebergType = icebergType.asMapType().keyType();
             org.apache.iceberg.types.Type valueIcebergType = icebergType.asMapType().valueType();
-            BlockBuilder currentBuilder = builder.beginBlockEntry();
-            for (Map.Entry<?, ?> entry : map.entrySet()) {
-                serializeToTrinoBlock(keyType, keyIcebergType, currentBuilder, entry.getKey());
-                serializeToTrinoBlock(valueType, valueIcebergType, currentBuilder, entry.getValue());
-            }
-            builder.closeEntry();
+            ((MapBlockBuilder) builder).buildEntry((keyBuilder, valueBuilder) -> {
+                for (Map.Entry<?, ?> entry : map.entrySet()) {
+                    serializeToTrinoBlock(keyType, keyIcebergType, keyBuilder, entry.getKey());
+                    serializeToTrinoBlock(valueType, valueIcebergType, valueBuilder, entry.getValue());
+                }
+            });
             return;
         }
         if (type instanceof RowType) {
             Record record = (Record) object;
             List<Type> typeParameters = type.getTypeParameters();
             List<Types.NestedField> icebergFields = icebergType.asStructType().fields();
-            BlockBuilder currentBuilder = builder.beginBlockEntry();
-            for (int i = 0; i < typeParameters.size(); i++) {
-                serializeToTrinoBlock(typeParameters.get(i), icebergFields.get(i).type(), currentBuilder, record.get(i));
-            }
-            builder.closeEntry();
+            ((RowBlockBuilder) builder).buildEntry(fieldBuilders -> {
+                for (int i = 0; i < typeParameters.size(); i++) {
+                    serializeToTrinoBlock(typeParameters.get(i), icebergFields.get(i).type(), fieldBuilders.get(i), record.get(i));
+                }
+            });
             return;
         }
         throw new TrinoException(NOT_SUPPORTED, "unsupported type: " + type);
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAvroPageSource.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAvroPageSource.java
index 32f721035158..65fbad86c794 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAvroPageSource.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAvroPageSource.java
@@ -38,6 +38,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.trino.plugin.iceberg.IcebergAvroDataConversion.serializeToTrinoBlock;
+import static io.trino.spi.type.BigintType.BIGINT;
 import static java.util.Objects.requireNonNull;
 
 public class IcebergAvroPageSource
@@ -91,8 +92,6 @@ public IcebergAvroPageSource(
                 .collect(toImmutableMap(Types.NestedField::name, Types.NestedField::type));
         pageBuilder = new PageBuilder(columnTypes);
         recordIterator = avroReader.iterator();
-        // TODO: Remove when NPE check has been released: https://github.com/trinodb/trino/issues/15372
-        isFinished();
     }
 
     private boolean isIndexColumn(int column)
@@ -133,7 +132,7 @@ public Page getNextPage()
             Record record = recordIterator.next();
             for (int channel = 0; channel < columnTypes.size(); channel++) {
                 if (isIndexColumn(channel)) {
-                    pageBuilder.getBlockBuilder(channel).writeLong(rowId);
+                    BIGINT.writeLong(pageBuilder.getBlockBuilder(channel), rowId);
                 }
                 else {
                     String name = columnNames.get(channel);
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergColumnHandle.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergColumnHandle.java
index 07b803c8c7cb..e079fd550a5b 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergColumnHandle.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergColumnHandle.java
@@ -40,9 +40,17 @@ public class IcebergColumnHandle
     public static final int TRINO_MERGE_ROW_ID = Integer.MIN_VALUE + 1;
     public static final String TRINO_ROW_ID_NAME = "$row_id";
 
-    public static final int TRINO_MERGE_FILE_RECORD_COUNT = Integer.MIN_VALUE + 2;
-    public static final int TRINO_MERGE_PARTITION_SPEC_ID = Integer.MIN_VALUE + 3;
-    public static final int TRINO_MERGE_PARTITION_DATA = Integer.MIN_VALUE + 4;
+    public static final int TRINO_MERGE_PARTITION_SPEC_ID = Integer.MIN_VALUE + 2;
+    public static final int TRINO_MERGE_PARTITION_DATA = Integer.MIN_VALUE + 3;
+
+    public static final String DATA_CHANGE_TYPE_NAME = "_change_type";
+    public static final int DATA_CHANGE_TYPE_ID = Integer.MIN_VALUE + 5;
+    public static final String DATA_CHANGE_VERSION_NAME = "_change_version_id";
+    public static final int DATA_CHANGE_VERSION_ID = Integer.MIN_VALUE + 6;
+    public static final String DATA_CHANGE_TIMESTAMP_NAME = "_change_timestamp";
+    public static final int DATA_CHANGE_TIMESTAMP_ID = Integer.MIN_VALUE + 7;
+    public static final String DATA_CHANGE_ORDINAL_NAME = "_change_ordinal";
+    public static final int DATA_CHANGE_ORDINAL_ID = Integer.MIN_VALUE + 8;
 
     private final ColumnIdentity baseColumnIdentity;
     private final Type baseType;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergConfig.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergConfig.java
index f2d6dde2ac75..5dce684f6b50 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergConfig.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergConfig.java
@@ -20,19 +20,18 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.plugin.hive.HiveCompressionCodec;
-
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
 import static io.airlift.units.DataSize.Unit.GIGABYTE;
 import static io.trino.plugin.hive.HiveCompressionCodec.ZSTD;
 import static io.trino.plugin.iceberg.CatalogType.HIVE_METASTORE;
-import static io.trino.plugin.iceberg.IcebergFileFormat.ORC;
+import static io.trino.plugin.iceberg.IcebergFileFormat.PARQUET;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
@@ -50,7 +49,7 @@ public class IcebergConfig
     public static final String EXPIRE_SNAPSHOTS_MIN_RETENTION = "iceberg.expire_snapshots.min-retention";
     public static final String REMOVE_ORPHAN_FILES_MIN_RETENTION = "iceberg.remove_orphan_files.min-retention";
 
-    private IcebergFileFormat fileFormat = ORC;
+    private IcebergFileFormat fileFormat = PARQUET;
     private HiveCompressionCodec compressionCodec = ZSTD;
     private boolean useFileSizeFromMetadata = true;
     private int maxPartitionsPerWriter = 100;
@@ -74,6 +73,7 @@ public class IcebergConfig
     private double minimumAssignedSplitWeight = 0.05;
     private Optional<String> materializedViewsStorageSchema = Optional.empty();
     private boolean sortedWritingEnabled = true;
+    private boolean queryPartitionFilterRequired;
 
     public CatalogType getCatalogType()
     {
@@ -223,7 +223,7 @@ public boolean isProjectionPushdownEnabled()
     }
 
     @Config("iceberg.projection-pushdown-enabled")
-    @ConfigDescription("Read only required fields from a struct")
+    @ConfigDescription("Read only required fields from a row type")
     public IcebergConfig setProjectionPushdownEnabled(boolean projectionPushdownEnabled)
     {
         this.projectionPushdownEnabled = projectionPushdownEnabled;
@@ -368,4 +368,17 @@ public IcebergConfig setSortedWritingEnabled(boolean sortedWritingEnabled)
         this.sortedWritingEnabled = sortedWritingEnabled;
         return this;
     }
+
+    @Config("iceberg.query-partition-filter-required")
+    @ConfigDescription("Require a filter on at least one partition column")
+    public IcebergConfig setQueryPartitionFilterRequired(boolean queryPartitionFilterRequired)
+    {
+        this.queryPartitionFilterRequired = queryPartitionFilterRequired;
+        return this;
+    }
+
+    public boolean isQueryPartitionFilterRequired()
+    {
+        return queryPartitionFilterRequired;
+    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergConnector.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergConnector.java
index 44912976f8eb..5e9e02d45a81 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergConnector.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergConnector.java
@@ -13,8 +13,10 @@
  */
 package io.trino.plugin.iceberg;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Injector;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorMetadata;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
@@ -30,6 +32,8 @@
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.TableProcedureMetadata;
+import io.trino.spi.function.FunctionProvider;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.procedure.Procedure;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
@@ -49,6 +53,7 @@
 public class IcebergConnector
         implements Connector
 {
+    private final Injector injector;
     private final LifeCycleManager lifeCycleManager;
     private final IcebergTransactionManager transactionManager;
     private final ConnectorSplitManager splitManager;
@@ -63,8 +68,11 @@ public class IcebergConnector
     private final Optional<ConnectorAccessControl> accessControl;
     private final Set<Procedure> procedures;
     private final Set<TableProcedureMetadata> tableProcedures;
+    private final Set<ConnectorTableFunction> tableFunctions;
+    private final FunctionProvider functionProvider;
 
     public IcebergConnector(
+            Injector injector,
             LifeCycleManager lifeCycleManager,
             IcebergTransactionManager transactionManager,
             ConnectorSplitManager splitManager,
@@ -78,8 +86,11 @@ public IcebergConnector(
             List<PropertyMetadata<?>> analyzeProperties,
             Optional<ConnectorAccessControl> accessControl,
             Set<Procedure> procedures,
-            Set<TableProcedureMetadata> tableProcedures)
+            Set<TableProcedureMetadata> tableProcedures,
+            Set<ConnectorTableFunction> tableFunctions,
+            FunctionProvider functionProvider)
     {
+        this.injector = requireNonNull(injector, "injector is null");
         this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null");
         this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
         this.splitManager = requireNonNull(splitManager, "splitManager is null");
@@ -96,6 +107,8 @@ public IcebergConnector(
         this.accessControl = requireNonNull(accessControl, "accessControl is null");
         this.procedures = ImmutableSet.copyOf(requireNonNull(procedures, "procedures is null"));
         this.tableProcedures = ImmutableSet.copyOf(requireNonNull(tableProcedures, "tableProcedures is null"));
+        this.tableFunctions = ImmutableSet.copyOf(requireNonNull(tableFunctions, "tableFunctions is null"));
+        this.functionProvider = requireNonNull(functionProvider, "functionProvider is null");
     }
 
     @Override
@@ -149,6 +162,18 @@ public Set<TableProcedureMetadata> getTableProcedures()
         return tableProcedures;
     }
 
+    @Override
+    public Set<ConnectorTableFunction> getTableFunctions()
+    {
+        return tableFunctions;
+    }
+
+    @Override
+    public Optional<FunctionProvider> getFunctionProvider()
+    {
+        return Optional.of(functionProvider);
+    }
+
     @Override
     public List<PropertyMetadata<?>> getSessionProperties()
     {
@@ -211,4 +236,10 @@ public final void shutdown()
     {
         lifeCycleManager.stop();
     }
+
+    @VisibleForTesting
+    public Injector getInjector()
+    {
+        return injector;
+    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergConnectorFactory.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergConnectorFactory.java
index a2b8b6f2cfe5..39e2c9e52617 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergConnectorFactory.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergConnectorFactory.java
@@ -24,7 +24,7 @@
 import java.util.Optional;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class IcebergConnectorFactory
@@ -51,7 +51,7 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         ClassLoader classLoader = context.duplicatePluginClassLoader();
         try {
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergErrorCode.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergErrorCode.java
index 51e955458e18..0ce831abb7e7 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergErrorCode.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergErrorCode.java
@@ -39,6 +39,7 @@ public enum IcebergErrorCode
     ICEBERG_COMMIT_ERROR(12, EXTERNAL),
     ICEBERG_CATALOG_ERROR(13, EXTERNAL),
     ICEBERG_WRITER_CLOSE_ERROR(14, EXTERNAL),
+    ICEBERG_MISSING_METADATA(15, EXTERNAL),
     /**/;
 
     private final ErrorCode errorCode;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergFileWriterFactory.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergFileWriterFactory.java
index 416121fabafc..9d405b4683aa 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergFileWriterFactory.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergFileWriterFactory.java
@@ -16,7 +16,9 @@
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.filesystem.TrinoOutputFile;
@@ -30,19 +32,16 @@
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.NodeVersion;
 import io.trino.plugin.hive.orc.OrcWriterConfig;
-import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
+import io.trino.plugin.iceberg.fileio.ForwardingOutputFile;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
 import org.apache.iceberg.MetricsConfig;
 import org.apache.iceberg.Schema;
-import org.apache.iceberg.io.FileIO;
 import org.apache.iceberg.types.Types;
 import org.weakref.jmx.Managed;
 
-import javax.inject.Inject;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.List;
@@ -117,7 +116,7 @@ public OrcWriterStats getOrcWriterStats()
 
     public IcebergFileWriter createDataFileWriter(
             TrinoFileSystem fileSystem,
-            String outputPath,
+            Location outputPath,
             Schema icebergSchema,
             ConnectorSession session,
             IcebergFileFormat fileFormat,
@@ -131,7 +130,7 @@ public IcebergFileWriter createDataFileWriter(
             case ORC:
                 return createOrcWriter(metricsConfig, fileSystem, outputPath, icebergSchema, session, storageProperties, getOrcStringStatisticsLimit(session));
             case AVRO:
-                return createAvroWriter(new ForwardingFileIo(fileSystem), outputPath, icebergSchema, session);
+                return createAvroWriter(fileSystem, outputPath, icebergSchema, session);
             default:
                 throw new TrinoException(NOT_SUPPORTED, "File format not supported: " + fileFormat);
         }
@@ -139,7 +138,7 @@ public IcebergFileWriter createDataFileWriter(
 
     public IcebergFileWriter createPositionDeleteWriter(
             TrinoFileSystem fileSystem,
-            String outputPath,
+            Location outputPath,
             ConnectorSession session,
             IcebergFileFormat fileFormat,
             Map<String, String> storageProperties)
@@ -150,7 +149,7 @@ public IcebergFileWriter createPositionDeleteWriter(
             case ORC:
                 return createOrcWriter(FULL_METRICS_CONFIG, fileSystem, outputPath, POSITION_DELETE_SCHEMA, session, storageProperties, DataSize.ofBytes(Integer.MAX_VALUE));
             case AVRO:
-                return createAvroWriter(new ForwardingFileIo(fileSystem), outputPath, POSITION_DELETE_SCHEMA, session);
+                return createAvroWriter(fileSystem, outputPath, POSITION_DELETE_SCHEMA, session);
             default:
                 throw new TrinoException(NOT_SUPPORTED, "File format not supported: " + fileFormat);
         }
@@ -159,7 +158,7 @@ public IcebergFileWriter createPositionDeleteWriter(
     private IcebergFileWriter createParquetWriter(
             MetricsConfig metricsConfig,
             TrinoFileSystem fileSystem,
-            String outputPath,
+            Location outputPath,
             Schema icebergSchema,
             ConnectorSession session)
     {
@@ -192,9 +191,7 @@ private IcebergFileWriter createParquetWriter(
                     parquetWriterOptions,
                     IntStream.range(0, fileColumnNames.size()).toArray(),
                     getCompressionCodec(session).getParquetCompressionCodec(),
-                    nodeVersion.toString(),
-                    outputPath,
-                    fileSystem);
+                    nodeVersion.toString());
         }
         catch (IOException e) {
             throw new TrinoException(ICEBERG_WRITER_OPEN_ERROR, "Error creating Parquet file", e);
@@ -204,7 +201,7 @@ private IcebergFileWriter createParquetWriter(
     private IcebergFileWriter createOrcWriter(
             MetricsConfig metricsConfig,
             TrinoFileSystem fileSystem,
-            String outputPath,
+            Location outputPath,
             Schema icebergSchema,
             ConnectorSession session,
             Map<String, String> storageProperties,
@@ -287,19 +284,19 @@ public static OrcWriterOptions withBloomFilterOptions(OrcWriterOptions orcWriter
     }
 
     private IcebergFileWriter createAvroWriter(
-            FileIO fileIo,
-            String outputPath,
+            TrinoFileSystem fileSystem,
+            Location outputPath,
             Schema icebergSchema,
             ConnectorSession session)
     {
-        Closeable rollbackAction = () -> fileIo.deleteFile(outputPath);
+        Closeable rollbackAction = () -> fileSystem.deleteFile(outputPath);
 
         List<Type> columnTypes = icebergSchema.columns().stream()
                 .map(column -> toTrinoType(column.type(), typeManager))
                 .collect(toImmutableList());
 
         return new IcebergAvroFileWriter(
-                fileIo.newOutputFile(outputPath),
+                new ForwardingOutputFile(fileSystem, outputPath.toString()),
                 rollbackAction,
                 icebergSchema,
                 columnTypes,
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMaterializedViewAdditionalProperties.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMaterializedViewAdditionalProperties.java
index 9fe17c0a67b0..37bc14a1e1c3 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMaterializedViewAdditionalProperties.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMaterializedViewAdditionalProperties.java
@@ -14,10 +14,9 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMaterializedViewDefinition.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMaterializedViewDefinition.java
index a337c5b4b54f..a92ad1394d30 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMaterializedViewDefinition.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMaterializedViewDefinition.java
@@ -15,9 +15,11 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableList;
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
 import io.airlift.json.ObjectMapperProvider;
+import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.ConnectorMaterializedViewDefinition;
 import io.trino.spi.type.TypeId;
 
@@ -26,6 +28,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.StringJoiner;
+import java.util.stream.Collectors;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -50,6 +53,7 @@ public class IcebergMaterializedViewDefinition
     private final List<Column> columns;
     private final Optional<Duration> gracePeriod;
     private final Optional<String> comment;
+    private final List<CatalogSchemaName> path;
 
     public static String encodeMaterializedViewData(IcebergMaterializedViewDefinition definition)
     {
@@ -75,10 +79,11 @@ public static IcebergMaterializedViewDefinition fromConnectorMaterializedViewDef
                 definition.getCatalog(),
                 definition.getSchema(),
                 definition.getColumns().stream()
-                        .map(column -> new Column(column.getName(), column.getType()))
+                        .map(column -> new Column(column.getName(), column.getType(), column.getComment()))
                         .collect(toImmutableList()),
                 definition.getGracePeriod(),
-                definition.getComment());
+                definition.getComment(),
+                definition.getPath());
     }
 
     @JsonCreator
@@ -88,7 +93,8 @@ public IcebergMaterializedViewDefinition(
             @JsonProperty("schema") Optional<String> schema,
             @JsonProperty("columns") List<Column> columns,
             @JsonProperty("gracePeriod") Optional<Duration> gracePeriod,
-            @JsonProperty("comment") Optional<String> comment)
+            @JsonProperty("comment") Optional<String> comment,
+            @JsonProperty("path") List<CatalogSchemaName> path)
     {
         this.originalSql = requireNonNull(originalSql, "originalSql is null");
         this.catalog = requireNonNull(catalog, "catalog is null");
@@ -97,6 +103,7 @@ public IcebergMaterializedViewDefinition(
         checkArgument(gracePeriod.isEmpty() || !gracePeriod.get().isNegative(), "gracePeriod cannot be negative: %s", gracePeriod);
         this.gracePeriod = gracePeriod;
         this.comment = requireNonNull(comment, "comment is null");
+        this.path = path == null ? ImmutableList.of() : ImmutableList.copyOf(path);
 
         if (catalog.isEmpty() && schema.isPresent()) {
             throw new IllegalArgumentException("catalog must be present if schema is present");
@@ -142,6 +149,12 @@ public Optional<String> getComment()
         return comment;
     }
 
+    @JsonProperty
+    public List<CatalogSchemaName> getPath()
+    {
+        return path;
+    }
+
     @Override
     public String toString()
     {
@@ -152,6 +165,7 @@ public String toString()
         joiner.add("columns=" + columns);
         gracePeriod.ifPresent(value -> joiner.add("gracePeriod≥=" + value));
         comment.ifPresent(value -> joiner.add("comment=" + value));
+        joiner.add(path.stream().map(CatalogSchemaName::toString).collect(Collectors.joining(", ", "path=(", ")")));
         return getClass().getSimpleName() + joiner;
     }
 
@@ -159,14 +173,17 @@ public static final class Column
     {
         private final String name;
         private final TypeId type;
+        private final Optional<String> comment;
 
         @JsonCreator
         public Column(
                 @JsonProperty("name") String name,
-                @JsonProperty("type") TypeId type)
+                @JsonProperty("type") TypeId type,
+                @JsonProperty("comment") Optional<String> comment)
         {
             this.name = requireNonNull(name, "name is null");
             this.type = requireNonNull(type, "type is null");
+            this.comment = requireNonNull(comment, "comment is null");
         }
 
         @JsonProperty
@@ -181,6 +198,12 @@ public TypeId getType()
             return type;
         }
 
+        @JsonProperty
+        public Optional<String> getComment()
+        {
+            return comment;
+        }
+
         @Override
         public String toString()
         {
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMergeSink.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMergeSink.java
index 511c032fe15b..56b3046509d4 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMergeSink.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMergeSink.java
@@ -21,7 +21,8 @@
 import io.trino.plugin.iceberg.delete.IcebergPositionDeletePageSink;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
-import io.trino.spi.block.ColumnarRow;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.RowBlock;
 import io.trino.spi.connector.ConnectorMergeSink;
 import io.trino.spi.connector.ConnectorPageSink;
 import io.trino.spi.connector.ConnectorSession;
@@ -44,11 +45,9 @@
 import java.util.concurrent.CompletableFuture;
 
 import static io.trino.plugin.base.util.Closables.closeAllSuppress;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
 import static io.trino.spi.connector.MergePage.createDeleteAndInsertPages;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
-import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 
@@ -102,18 +101,20 @@ public void storeMergedRows(Page page)
         mergePage.getInsertionsPage().ifPresent(insertPageSink::appendPage);
 
         mergePage.getDeletionsPage().ifPresent(deletions -> {
-            ColumnarRow rowIdRow = toColumnarRow(deletions.getBlock(deletions.getChannelCount() - 1));
-
-            for (int position = 0; position < rowIdRow.getPositionCount(); position++) {
-                Slice filePath = VarcharType.VARCHAR.getSlice(rowIdRow.getField(0), position);
-                long rowPosition = BIGINT.getLong(rowIdRow.getField(1), position);
+            List<Block> fields = RowBlock.getRowFieldsFromBlock(deletions.getBlock(deletions.getChannelCount() - 1));
+            Block fieldPathBlock = fields.get(0);
+            Block rowPositionBlock = fields.get(1);
+            Block partitionSpecIdBlock = fields.get(2);
+            Block partitionDataBlock = fields.get(3);
+            for (int position = 0; position < fieldPathBlock.getPositionCount(); position++) {
+                Slice filePath = VarcharType.VARCHAR.getSlice(fieldPathBlock, position);
+                long rowPosition = BIGINT.getLong(rowPositionBlock, position);
 
                 int index = position;
                 FileDeletion deletion = fileDeletions.computeIfAbsent(filePath, ignored -> {
-                    long fileRecordCount = BIGINT.getLong(rowIdRow.getField(2), index);
-                    int partitionSpecId = toIntExact(INTEGER.getLong(rowIdRow.getField(3), index));
-                    String partitionData = VarcharType.VARCHAR.getSlice(rowIdRow.getField(4), index).toStringUtf8();
-                    return new FileDeletion(partitionSpecId, partitionData, fileRecordCount);
+                    int partitionSpecId = INTEGER.getInt(partitionSpecIdBlock, index);
+                    String partitionData = VarcharType.VARCHAR.getSlice(partitionDataBlock, index).toStringUtf8();
+                    return new FileDeletion(partitionSpecId, partitionData);
                 });
 
                 deletion.rowsToDelete().addLong(rowPosition);
@@ -130,8 +131,7 @@ public CompletableFuture<Collection<Slice>> finish()
             ConnectorPageSink sink = createPositionDeletePageSink(
                     dataFilePath.toStringUtf8(),
                     partitionsSpecs.get(deletion.partitionSpecId()),
-                    deletion.partitionDataJson(),
-                    deletion.fileRecordCount());
+                    deletion.partitionDataJson());
 
             fragments.addAll(writePositionDeletes(sink, deletion.rowsToDelete()));
         });
@@ -145,7 +145,7 @@ public void abort()
         insertPageSink.abort();
     }
 
-    private ConnectorPageSink createPositionDeletePageSink(String dataFilePath, PartitionSpec partitionSpec, String partitionDataJson, long fileRecordCount)
+    private ConnectorPageSink createPositionDeletePageSink(String dataFilePath, PartitionSpec partitionSpec, String partitionDataJson)
     {
         Optional<PartitionData> partitionData = Optional.empty();
         if (partitionSpec.isPartitioned()) {
@@ -165,8 +165,7 @@ private ConnectorPageSink createPositionDeletePageSink(String dataFilePath, Part
                 jsonCodec,
                 session,
                 fileFormat,
-                storageProperties,
-                fileRecordCount);
+                storageProperties);
     }
 
     private static Collection<Slice> writePositionDeletes(ConnectorPageSink sink, ImmutableLongBitmapDataProvider rowsToDelete)
@@ -204,14 +203,12 @@ private static class FileDeletion
     {
         private final int partitionSpecId;
         private final String partitionDataJson;
-        private final long fileRecordCount;
         private final LongBitmapDataProvider rowsToDelete = new Roaring64Bitmap();
 
-        public FileDeletion(int partitionSpecId, String partitionDataJson, long fileRecordCount)
+        public FileDeletion(int partitionSpecId, String partitionDataJson)
         {
             this.partitionSpecId = partitionSpecId;
             this.partitionDataJson = requireNonNull(partitionDataJson, "partitionDataJson is null");
-            this.fileRecordCount = fileRecordCount;
         }
 
         public int partitionSpecId()
@@ -224,11 +221,6 @@ public String partitionDataJson()
             return partitionDataJson;
         }
 
-        public long fileRecordCount()
-        {
-            return fileRecordCount;
-        }
-
         public LongBitmapDataProvider rowsToDelete()
         {
             return rowsToDelete;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
index 73915aa952bf..52a3f67e5030 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
@@ -20,6 +20,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Streams;
 import io.airlift.json.JsonCodec;
@@ -29,11 +30,12 @@
 import io.airlift.units.Duration;
 import io.trino.filesystem.FileEntry;
 import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.classloader.ClassLoaderSafeSystemTable;
-import io.trino.plugin.hive.HiveApplyProjectionUtil;
-import io.trino.plugin.hive.HiveApplyProjectionUtil.ProjectedColumnRepresentation;
+import io.trino.plugin.base.projection.ApplyProjectionUtil;
+import io.trino.plugin.base.projection.ApplyProjectionUtil.ProjectedColumnRepresentation;
 import io.trino.plugin.hive.HiveWrittenPartitions;
 import io.trino.plugin.iceberg.aggregation.DataSketchStateSerializer;
 import io.trino.plugin.iceberg.aggregation.IcebergThetaSketchForStats;
@@ -45,11 +47,12 @@
 import io.trino.plugin.iceberg.procedure.IcebergTableExecuteHandle;
 import io.trino.plugin.iceberg.procedure.IcebergTableProcedureId;
 import io.trino.plugin.iceberg.util.DataFileWithDeleteFiles;
+import io.trino.spi.ErrorCode;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.connector.Assignment;
 import io.trino.spi.connector.BeginTableExecuteResult;
-import io.trino.spi.connector.CatalogSchemaName;
+import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
@@ -72,16 +75,21 @@
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.ConstraintApplicationResult;
 import io.trino.spi.connector.DiscretePredicates;
+import io.trino.spi.connector.LimitApplicationResult;
 import io.trino.spi.connector.MaterializedViewFreshness;
 import io.trino.spi.connector.ProjectionApplicationResult;
+import io.trino.spi.connector.RelationColumnsMetadata;
+import io.trino.spi.connector.RelationCommentMetadata;
 import io.trino.spi.connector.RetryMode;
 import io.trino.spi.connector.RowChangeParadigm;
+import io.trino.spi.connector.SaveMode;
 import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.connector.TableColumnsMetadata;
 import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.connector.WriterScalingOptions;
 import io.trino.spi.expression.ConnectorExpression;
 import io.trino.spi.expression.FunctionName;
 import io.trino.spi.expression.Variable;
@@ -93,9 +101,13 @@
 import io.trino.spi.statistics.ComputedStatistics;
 import io.trino.spi.statistics.TableStatistics;
 import io.trino.spi.statistics.TableStatisticsMetadata;
+import io.trino.spi.type.LongTimestamp;
 import io.trino.spi.type.LongTimestampWithTimeZone;
+import io.trino.spi.type.TimeType;
+import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.TimestampWithTimeZoneType;
 import io.trino.spi.type.TypeManager;
+import io.trino.spi.type.VarcharType;
 import org.apache.datasketches.theta.CompactSketch;
 import org.apache.iceberg.AppendFiles;
 import org.apache.iceberg.BaseTable;
@@ -104,7 +116,6 @@
 import org.apache.iceberg.DataFiles;
 import org.apache.iceberg.DeleteFile;
 import org.apache.iceberg.DeleteFiles;
-import org.apache.iceberg.FileContent;
 import org.apache.iceberg.FileMetadata;
 import org.apache.iceberg.FileScanTask;
 import org.apache.iceberg.IsolationLevel;
@@ -121,6 +132,7 @@
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.SchemaParser;
 import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.SnapshotRef;
 import org.apache.iceberg.SortField;
 import org.apache.iceberg.SortOrder;
 import org.apache.iceberg.StatisticsFile;
@@ -139,7 +151,6 @@
 import org.apache.iceberg.types.Type;
 import org.apache.iceberg.types.Types;
 import org.apache.iceberg.types.Types.IntegerType;
-import org.apache.iceberg.types.Types.LongType;
 import org.apache.iceberg.types.Types.NestedField;
 import org.apache.iceberg.types.Types.StringType;
 import org.apache.iceberg.types.Types.StructType;
@@ -147,9 +158,13 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Deque;
 import java.util.HashMap;
@@ -166,48 +181,48 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Stream;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.base.Verify.verifyNotNull;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.collect.Iterables.getLast;
 import static com.google.common.collect.Maps.transformValues;
 import static com.google.common.collect.Sets.difference;
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.extractSupportedProjectedColumns;
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.replaceWithNewVariables;
 import static io.trino.plugin.base.util.Procedures.checkProcedureArgument;
-import static io.trino.plugin.hive.HiveApplyProjectionUtil.extractSupportedProjectedColumns;
-import static io.trino.plugin.hive.HiveApplyProjectionUtil.replaceWithNewVariables;
 import static io.trino.plugin.hive.util.HiveUtil.isStructuralType;
 import static io.trino.plugin.iceberg.ConstraintExtractor.extractTupleDomain;
 import static io.trino.plugin.iceberg.ExpressionConverter.toIcebergExpression;
 import static io.trino.plugin.iceberg.IcebergAnalyzeProperties.getColumnNames;
-import static io.trino.plugin.iceberg.IcebergColumnHandle.TRINO_MERGE_FILE_RECORD_COUNT;
 import static io.trino.plugin.iceberg.IcebergColumnHandle.TRINO_MERGE_PARTITION_DATA;
 import static io.trino.plugin.iceberg.IcebergColumnHandle.TRINO_MERGE_PARTITION_SPEC_ID;
 import static io.trino.plugin.iceberg.IcebergColumnHandle.TRINO_MERGE_ROW_ID;
 import static io.trino.plugin.iceberg.IcebergColumnHandle.TRINO_ROW_ID_NAME;
 import static io.trino.plugin.iceberg.IcebergColumnHandle.fileModifiedTimeColumnHandle;
-import static io.trino.plugin.iceberg.IcebergColumnHandle.fileModifiedTimeColumnMetadata;
 import static io.trino.plugin.iceberg.IcebergColumnHandle.pathColumnHandle;
-import static io.trino.plugin.iceberg.IcebergColumnHandle.pathColumnMetadata;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_COMMIT_ERROR;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_FILESYSTEM_ERROR;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_METADATA;
+import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_MISSING_METADATA;
 import static io.trino.plugin.iceberg.IcebergMetadataColumn.FILE_MODIFIED_TIME;
 import static io.trino.plugin.iceberg.IcebergMetadataColumn.FILE_PATH;
 import static io.trino.plugin.iceberg.IcebergMetadataColumn.isMetadataColumnId;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.getExpireSnapshotMinRetention;
+import static io.trino.plugin.iceberg.IcebergSessionProperties.getHiveCatalogName;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.getRemoveOrphanFilesMinRetention;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.isCollectExtendedStatisticsOnWrite;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.isExtendedStatisticsEnabled;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.isMergeManifestsOnWrite;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.isProjectionPushdownEnabled;
+import static io.trino.plugin.iceberg.IcebergSessionProperties.isQueryPartitionFilterRequired;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.isStatisticsEnabled;
 import static io.trino.plugin.iceberg.IcebergTableProperties.FILE_FORMAT_PROPERTY;
 import static io.trino.plugin.iceberg.IcebergTableProperties.FORMAT_VERSION_PROPERTY;
@@ -221,6 +236,7 @@
 import static io.trino.plugin.iceberg.IcebergUtil.firstSnapshot;
 import static io.trino.plugin.iceberg.IcebergUtil.firstSnapshotAfter;
 import static io.trino.plugin.iceberg.IcebergUtil.getColumnHandle;
+import static io.trino.plugin.iceberg.IcebergUtil.getColumnMetadatas;
 import static io.trino.plugin.iceberg.IcebergUtil.getColumns;
 import static io.trino.plugin.iceberg.IcebergUtil.getFileFormat;
 import static io.trino.plugin.iceberg.IcebergUtil.getIcebergTableProperties;
@@ -238,16 +254,17 @@
 import static io.trino.plugin.iceberg.TableStatisticsWriter.StatsUpdateMode.REPLACE;
 import static io.trino.plugin.iceberg.TableType.DATA;
 import static io.trino.plugin.iceberg.TypeConverter.toIcebergTypeForNewColumn;
-import static io.trino.plugin.iceberg.TypeConverter.toTrinoType;
 import static io.trino.plugin.iceberg.catalog.hms.TrinoHiveCatalog.DEPENDS_ON_TABLES;
 import static io.trino.plugin.iceberg.catalog.hms.TrinoHiveCatalog.TRINO_QUERY_START_TIME;
 import static io.trino.plugin.iceberg.procedure.IcebergTableProcedureId.DROP_EXTENDED_STATS;
 import static io.trino.plugin.iceberg.procedure.IcebergTableProcedureId.EXPIRE_SNAPSHOTS;
 import static io.trino.plugin.iceberg.procedure.IcebergTableProcedureId.OPTIMIZE;
 import static io.trino.plugin.iceberg.procedure.IcebergTableProcedureId.REMOVE_ORPHAN_FILES;
+import static io.trino.spi.StandardErrorCode.COLUMN_ALREADY_EXISTS;
 import static io.trino.spi.StandardErrorCode.INVALID_ANALYZE_PROPERTY;
 import static io.trino.spi.StandardErrorCode.INVALID_ARGUMENTS;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.StandardErrorCode.QUERY_REJECTED;
 import static io.trino.spi.connector.MaterializedViewFreshness.Freshness.FRESH;
 import static io.trino.spi.connector.MaterializedViewFreshness.Freshness.STALE;
 import static io.trino.spi.connector.MaterializedViewFreshness.Freshness.UNKNOWN;
@@ -255,14 +272,18 @@
 import static io.trino.spi.connector.RowChangeParadigm.DELETE_ROW_AND_INSERT_ROW;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
+import static io.trino.spi.type.DateType.DATE;
+import static io.trino.spi.type.TimeType.TIME_MICROS;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
+import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MICROS;
+import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
 import static io.trino.spi.type.UuidType.UUID;
+import static java.lang.Math.floorDiv;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.joining;
-import static org.apache.iceberg.FileContent.POSITION_DELETES;
 import static org.apache.iceberg.ReachableFileUtil.metadataFileLocations;
 import static org.apache.iceberg.ReachableFileUtil.versionHintLocation;
 import static org.apache.iceberg.SnapshotSummary.DELETED_RECORDS_PROP;
@@ -293,8 +314,10 @@ public class IcebergMetadata
     private static final FunctionName NUMBER_OF_DISTINCT_VALUES_FUNCTION = new FunctionName(IcebergThetaSketchForStats.NAME);
 
     private static final Integer DELETE_BATCH_SIZE = 1000;
+    public static final int GET_METADATA_BATCH_SIZE = 1000;
 
     private final TypeManager typeManager;
+    private final CatalogHandle trinoCatalogHandle;
     private final JsonCodec<CommitTaskData> commitTaskCodec;
     private final TrinoCatalog catalog;
     private final TrinoFileSystemFactory fileSystemFactory;
@@ -306,12 +329,14 @@ public class IcebergMetadata
 
     public IcebergMetadata(
             TypeManager typeManager,
+            CatalogHandle trinoCatalogHandle,
             JsonCodec<CommitTaskData> commitTaskCodec,
             TrinoCatalog catalog,
             TrinoFileSystemFactory fileSystemFactory,
             TableStatisticsWriter tableStatisticsWriter)
     {
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.trinoCatalogHandle = requireNonNull(trinoCatalogHandle, "trinoCatalogHandle is null");
         this.commitTaskCodec = requireNonNull(commitTaskCodec, "commitTaskCodec is null");
         this.catalog = requireNonNull(catalog, "catalog is null");
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
@@ -331,15 +356,15 @@ public List<String> listSchemaNames(ConnectorSession session)
     }
 
     @Override
-    public Map<String, Object> getSchemaProperties(ConnectorSession session, CatalogSchemaName schemaName)
+    public Map<String, Object> getSchemaProperties(ConnectorSession session, String schemaName)
     {
-        return catalog.loadNamespaceMetadata(session, schemaName.getSchemaName());
+        return catalog.loadNamespaceMetadata(session, schemaName);
     }
 
     @Override
-    public Optional<TrinoPrincipal> getSchemaOwner(ConnectorSession session, CatalogSchemaName schemaName)
+    public Optional<TrinoPrincipal> getSchemaOwner(ConnectorSession session, String schemaName)
     {
-        return catalog.getNamespacePrincipal(session, schemaName.getSchemaName());
+        return catalog.getNamespacePrincipal(session, schemaName);
     }
 
     @Override
@@ -349,7 +374,7 @@ public IcebergTableHandle getTableHandle(ConnectorSession session, SchemaTableNa
     }
 
     @Override
-    public IcebergTableHandle getTableHandle(
+    public ConnectorTableHandle getTableHandle(
             ConnectorSession session,
             SchemaTableName tableName,
             Optional<ConnectorTableVersion> startVersion,
@@ -371,12 +396,20 @@ public IcebergTableHandle getTableHandle(
         catch (TableNotFoundException e) {
             return null;
         }
+        catch (TrinoException e) {
+            ErrorCode errorCode = e.getErrorCode();
+            if (errorCode.equals(ICEBERG_MISSING_METADATA.toErrorCode())
+                    || errorCode.equals(ICEBERG_INVALID_METADATA.toErrorCode())) {
+                return new CorruptedIcebergTableHandle(tableName, e);
+            }
+            throw e;
+        }
 
         Optional<Long> tableSnapshotId;
         Schema tableSchema;
         Optional<PartitionSpec> partitionSpec;
         if (endVersion.isPresent()) {
-            long snapshotId = getSnapshotIdFromVersion(table, endVersion.get());
+            long snapshotId = getSnapshotIdFromVersion(session, table, endVersion.get());
             tableSnapshotId = Optional.of(snapshotId);
             tableSchema = schemaFor(table, snapshotId);
             partitionSpec = Optional.empty();
@@ -390,50 +423,82 @@ public IcebergTableHandle getTableHandle(
         Map<String, String> tableProperties = table.properties();
         String nameMappingJson = tableProperties.get(TableProperties.DEFAULT_NAME_MAPPING);
         return new IcebergTableHandle(
+                trinoCatalogHandle,
                 tableName.getSchemaName(),
                 tableName.getTableName(),
                 DATA,
                 tableSnapshotId,
                 SchemaParser.toJson(tableSchema),
-                table.sortOrder().fields().stream()
-                        .map(TrinoSortField::fromIceberg)
-                        .collect(toImmutableList()),
                 partitionSpec.map(PartitionSpecParser::toJson),
                 table.operations().current().formatVersion(),
                 TupleDomain.all(),
                 TupleDomain.all(),
+                OptionalLong.empty(),
                 ImmutableSet.of(),
                 Optional.ofNullable(nameMappingJson),
                 table.location(),
                 table.properties(),
-                NO_RETRIES,
                 false,
+                Optional.empty(),
+                ImmutableSet.of(),
                 Optional.empty());
     }
 
-    private static long getSnapshotIdFromVersion(Table table, ConnectorTableVersion version)
+    private static long getSnapshotIdFromVersion(ConnectorSession session, Table table, ConnectorTableVersion version)
     {
         io.trino.spi.type.Type versionType = version.getVersionType();
         return switch (version.getPointerType()) {
-            case TEMPORAL -> getTemporalSnapshotIdFromVersion(table, version, versionType);
+            case TEMPORAL -> getTemporalSnapshotIdFromVersion(session, table, version, versionType);
             case TARGET_ID -> getTargetSnapshotIdFromVersion(table, version, versionType);
         };
     }
 
     private static long getTargetSnapshotIdFromVersion(Table table, ConnectorTableVersion version, io.trino.spi.type.Type versionType)
     {
-        if (versionType != BIGINT) {
+        long snapshotId;
+        if (versionType == BIGINT) {
+            snapshotId = (long) version.getVersion();
+        }
+        else if (versionType instanceof VarcharType) {
+            String refName = ((Slice) version.getVersion()).toStringUtf8();
+            SnapshotRef ref = table.refs().get(refName);
+            if (ref == null) {
+                throw new TrinoException(INVALID_ARGUMENTS, "Cannot find snapshot with reference name: " + refName);
+            }
+            snapshotId = ref.snapshotId();
+        }
+        else {
             throw new TrinoException(NOT_SUPPORTED, "Unsupported type for table version: " + versionType.getDisplayName());
         }
-        long snapshotId = (long) version.getVersion();
+
         if (table.snapshot(snapshotId) == null) {
             throw new TrinoException(INVALID_ARGUMENTS, "Iceberg snapshot ID does not exists: " + snapshotId);
         }
         return snapshotId;
     }
 
-    private static long getTemporalSnapshotIdFromVersion(Table table, ConnectorTableVersion version, io.trino.spi.type.Type versionType)
+    private static long getTemporalSnapshotIdFromVersion(ConnectorSession session, Table table, ConnectorTableVersion version, io.trino.spi.type.Type versionType)
     {
+        if (versionType.equals(DATE)) {
+            // Retrieve the latest snapshot made before or at the beginning of the day of the specified date in the session's time zone
+            long epochMillis = LocalDate.ofEpochDay((Long) version.getVersion())
+                    .atStartOfDay()
+                    .atZone(session.getTimeZoneKey().getZoneId())
+                    .toInstant()
+                    .toEpochMilli();
+            return getSnapshotIdAsOfTime(table, epochMillis);
+        }
+        if (versionType instanceof TimestampType timestampVersionType) {
+            long epochMicrosUtc = timestampVersionType.isShort()
+                    ? (long) version.getVersion()
+                    : ((LongTimestamp) version.getVersion()).getEpochMicros();
+            long epochMillisUtc = floorDiv(epochMicrosUtc, MICROSECONDS_PER_MILLISECOND);
+            long epochMillis = LocalDateTime.ofInstant(Instant.ofEpochMilli(epochMillisUtc), ZoneOffset.UTC)
+                    .atZone(session.getTimeZoneKey().getZoneId())
+                    .toInstant()
+                    .toEpochMilli();
+            return getSnapshotIdAsOfTime(table, epochMillis);
+        }
         if (versionType instanceof TimestampWithTimeZoneType timeZonedVersionType) {
             long epochMillis = timeZonedVersionType.isShort()
                     ? unpackMillisUtc((long) version.getVersion())
@@ -495,7 +560,7 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
         if (table.getSnapshotId().isEmpty()) {
             // A table with missing snapshot id produces no splits, so we optimize here by returning
             // TupleDomain.none() as the predicate
-            return new ConnectorTableProperties(TupleDomain.none(), Optional.empty(), Optional.empty(), Optional.empty(), ImmutableList.of());
+            return new ConnectorTableProperties(TupleDomain.none(), Optional.empty(), Optional.empty(), ImmutableList.of());
         }
 
         Table icebergTable = catalog.loadTable(session, table.getSchemaTableName());
@@ -562,17 +627,27 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
                 enforcedPredicate.transformKeys(ColumnHandle.class::cast),
                 // TODO: implement table partitioning
                 Optional.empty(),
-                Optional.empty(),
                 Optional.ofNullable(discretePredicates),
                 ImmutableList.of());
     }
 
+    @Override
+    public SchemaTableName getTableName(ConnectorSession session, ConnectorTableHandle table)
+    {
+        if (table instanceof CorruptedIcebergTableHandle corruptedTableHandle) {
+            return corruptedTableHandle.schemaTableName();
+        }
+        return ((IcebergTableHandle) table).getSchemaTableName();
+    }
+
     @Override
     public ConnectorTableMetadata getTableMetadata(ConnectorSession session, ConnectorTableHandle table)
     {
-        IcebergTableHandle tableHandle = (IcebergTableHandle) table;
+        IcebergTableHandle tableHandle = checkValidTableHandle(table);
+        // This method does not calculate column metadata for the projected columns
+        checkArgument(tableHandle.getProjectedColumns().isEmpty(), "Unexpected projected columns");
         Table icebergTable = catalog.loadTable(session, tableHandle.getSchemaTableName());
-        List<ColumnMetadata> columns = getColumnMetadatas(SchemaParser.fromJson(tableHandle.getTableSchemaJson()));
+        List<ColumnMetadata> columns = getColumnMetadatas(SchemaParser.fromJson(tableHandle.getTableSchemaJson()), typeManager);
         return new ConnectorTableMetadata(tableHandle.getSchemaTableName(), columns, getIcebergTableProperties(icebergTable), getTableComment(icebergTable));
     }
 
@@ -585,7 +660,7 @@ public List<SchemaTableName> listTables(ConnectorSession session, Optional<Strin
     @Override
     public Map<String, ColumnHandle> getColumnHandles(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
-        IcebergTableHandle table = (IcebergTableHandle) tableHandle;
+        IcebergTableHandle table = checkValidTableHandle(tableHandle);
         ImmutableMap.Builder<String, ColumnHandle> columnHandles = ImmutableMap.builder();
         for (IcebergColumnHandle columnHandle : getColumns(SchemaParser.fromJson(table.getTableSchemaJson()), typeManager)) {
             columnHandles.put(columnHandle.getName(), columnHandle);
@@ -606,6 +681,41 @@ public ColumnMetadata getColumnMetadata(ConnectorSession session, ConnectorTable
                 .build();
     }
 
+    @Override
+    public void validateScan(ConnectorSession session, ConnectorTableHandle handle)
+    {
+        IcebergTableHandle table = (IcebergTableHandle) handle;
+        if (isQueryPartitionFilterRequired(session) && table.getEnforcedPredicate().isAll() && table.getAnalyzeColumns().isEmpty()) {
+            Schema schema = SchemaParser.fromJson(table.getTableSchemaJson());
+            Optional<PartitionSpec> partitionSpec = table.getPartitionSpecJson()
+                    .map(partitionSpecJson -> PartitionSpecParser.fromJson(schema, partitionSpecJson));
+            if (partitionSpec.isEmpty() || partitionSpec.get().isUnpartitioned()) {
+                return;
+            }
+            Set<Integer> columnsWithPredicates = new HashSet<>();
+            table.getConstraintColumns().stream()
+                    .map(IcebergColumnHandle::getId)
+                    .forEach(columnsWithPredicates::add);
+            table.getUnenforcedPredicate().getDomains().ifPresent(domain -> domain.keySet().stream()
+                    .map(IcebergColumnHandle::getId)
+                    .forEach(columnsWithPredicates::add));
+            Set<Integer> partitionColumns = partitionSpec.get().fields().stream()
+                    .filter(field -> !field.transform().isVoid())
+                    .map(PartitionField::sourceId)
+                    .collect(toImmutableSet());
+            if (Collections.disjoint(columnsWithPredicates, partitionColumns)) {
+                String partitionColumnNames = partitionSpec.get().fields().stream()
+                        .filter(field -> !field.transform().isVoid())
+                        .map(PartitionField::sourceId)
+                        .map(id -> schema.idToName().get(id))
+                        .collect(joining(", "));
+                throw new TrinoException(
+                        QUERY_REJECTED,
+                        format("Filter required for %s on at least one of the partition columns: %s", table.getSchemaTableName(), partitionColumnNames));
+            }
+        }
+    }
+
     @Override
     public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
     {
@@ -623,34 +733,72 @@ public Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession sessio
         else {
             schemaTableNames = ImmutableList.of(prefix.toSchemaTableName());
         }
-        return schemaTableNames.stream()
-                .flatMap(tableName -> {
-                    try {
+
+        return Lists.partition(schemaTableNames, GET_METADATA_BATCH_SIZE).stream()
+                .map(tableBatch -> {
+                    ImmutableList.Builder<TableColumnsMetadata> tableMetadatas = ImmutableList.builderWithExpectedSize(tableBatch.size());
+                    Set<SchemaTableName> remainingTables = new HashSet<>(tableBatch.size());
+                    for (SchemaTableName tableName : tableBatch) {
                         if (redirectTable(session, tableName).isPresent()) {
-                            return Stream.of(TableColumnsMetadata.forRedirectedTable(tableName));
+                            tableMetadatas.add(TableColumnsMetadata.forRedirectedTable(tableName));
+                        }
+                        else {
+                            remainingTables.add(tableName);
                         }
-
-                        Table icebergTable = catalog.loadTable(session, tableName);
-                        List<ColumnMetadata> columns = getColumnMetadatas(icebergTable.schema());
-                        return Stream.of(TableColumnsMetadata.forTable(tableName, columns));
-                    }
-                    catch (TableNotFoundException e) {
-                        // Table disappeared during listing operation
-                        return Stream.empty();
-                    }
-                    catch (UnknownTableTypeException e) {
-                        // Skip unsupported table type in case that the table redirects are not enabled
-                        return Stream.empty();
                     }
-                    catch (RuntimeException e) {
-                        // Table can be being removed and this may cause all sorts of exceptions. Log, because we're catching broadly.
-                        log.warn(e, "Failed to access metadata of table %s during streaming table columns for %s", tableName, prefix);
-                        return Stream.empty();
+
+                    Map<SchemaTableName, List<ColumnMetadata>> loaded = catalog.tryGetColumnMetadata(session, ImmutableList.copyOf(remainingTables));
+                    loaded.forEach((tableName, columns) -> {
+                        remainingTables.remove(tableName);
+                        tableMetadatas.add(TableColumnsMetadata.forTable(tableName, columns));
+                    });
+
+                    for (SchemaTableName tableName : remainingTables) {
+                        try {
+                            Table icebergTable = catalog.loadTable(session, tableName);
+                            List<ColumnMetadata> columns = getColumnMetadatas(icebergTable.schema(), typeManager);
+                            tableMetadatas.add(TableColumnsMetadata.forTable(tableName, columns));
+                        }
+                        catch (TableNotFoundException e) {
+                            // Table disappeared during listing operation
+                            continue;
+                        }
+                        catch (UnknownTableTypeException e) {
+                            // Skip unsupported table type in case that the table redirects are not enabled
+                            continue;
+                        }
+                        catch (RuntimeException e) {
+                            // Table can be being removed and this may cause all sorts of exceptions. Log, because we're catching broadly.
+                            log.warn(e, "Failed to access metadata of table %s during streaming table columns for %s", tableName, prefix);
+                            continue;
+                        }
                     }
+                    return tableMetadatas.build();
                 })
+                .flatMap(List::stream)
                 .iterator();
     }
 
+    @Override
+    public Iterator<RelationColumnsMetadata> streamRelationColumns(ConnectorSession session, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        return catalog.streamRelationColumns(session, schemaName, relationFilter, tableName -> redirectTable(session, tableName).isPresent())
+                .orElseGet(() -> {
+                    // Catalog does not support streamRelationColumns
+                    return ConnectorMetadata.super.streamRelationColumns(session, schemaName, relationFilter);
+                });
+    }
+
+    @Override
+    public Iterator<RelationCommentMetadata> streamRelationComments(ConnectorSession session, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        return catalog.streamRelationComments(session, schemaName, relationFilter, tableName -> redirectTable(session, tableName).isPresent())
+                .orElseGet(() -> {
+                    // Catalog does not support streamRelationComments
+                    return ConnectorMetadata.super.streamRelationComments(session, schemaName, relationFilter);
+                });
+    }
+
     @Override
     public void createSchema(ConnectorSession session, String schemaName, Map<String, Object> properties, TrinoPrincipal owner)
     {
@@ -658,8 +806,19 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
+        if (cascade) {
+            for (SchemaTableName materializedView : listMaterializedViews(session, Optional.of(schemaName))) {
+                dropMaterializedView(session, materializedView);
+            }
+            for (SchemaTableName viewName : listViews(session, Optional.of(schemaName))) {
+                dropView(session, viewName);
+            }
+            for (SchemaTableName tableName : listTables(session, Optional.of(schemaName))) {
+                dropTable(session, getTableHandle(session, tableName, Optional.empty(), Optional.empty()));
+            }
+        }
         catalog.dropNamespace(session, schemaName);
     }
 
@@ -676,16 +835,17 @@ public void setSchemaAuthorization(ConnectorSession session, String schemaName,
     }
 
     @Override
-    public void createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, boolean ignoreExisting)
+    public void createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, SaveMode saveMode)
     {
         Optional<ConnectorTableLayout> layout = getNewTableLayout(session, tableMetadata);
-        finishCreateTable(session, beginCreateTable(session, tableMetadata, layout, NO_RETRIES), ImmutableList.of(), ImmutableList.of());
+        finishCreateTable(session, beginCreateTable(session, tableMetadata, layout, NO_RETRIES, saveMode == SaveMode.REPLACE), ImmutableList.of(), ImmutableList.of());
     }
 
     @Override
     public void setTableComment(ConnectorSession session, ConnectorTableHandle tableHandle, Optional<String> comment)
     {
-        catalog.updateTableComment(session, ((IcebergTableHandle) tableHandle).getSchemaTableName(), comment);
+        IcebergTableHandle handle = checkValidTableHandle(tableHandle);
+        catalog.updateTableComment(session, handle.getSchemaTableName(), comment);
     }
 
     @Override
@@ -700,6 +860,12 @@ public void setViewColumnComment(ConnectorSession session, SchemaTableName viewN
         catalog.updateViewColumnComment(session, viewName, columnName, comment);
     }
 
+    @Override
+    public void setMaterializedViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
+    {
+        catalog.updateMaterializedViewColumnComment(session, viewName, columnName, comment);
+    }
+
     @Override
     public Optional<ConnectorTableLayout> getNewTableLayout(ConnectorSession session, ConnectorTableMetadata tableMetadata)
     {
@@ -709,18 +875,41 @@ public Optional<ConnectorTableLayout> getNewTableLayout(ConnectorSession session
     }
 
     @Override
-    public ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, Optional<ConnectorTableLayout> layout, RetryMode retryMode)
+    public Optional<io.trino.spi.type.Type> getSupportedType(ConnectorSession session, Map<String, Object> tableProperties, io.trino.spi.type.Type type)
+    {
+        if (type instanceof TimestampWithTimeZoneType) {
+            return Optional.of(TIMESTAMP_TZ_MICROS);
+        }
+        if (type instanceof TimestampType) {
+            return Optional.of(TIMESTAMP_MICROS);
+        }
+        if (type instanceof TimeType) {
+            return Optional.of(TIME_MICROS);
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    public ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, Optional<ConnectorTableLayout> layout, RetryMode retryMode, boolean replace)
     {
         verify(transaction == null, "transaction already set");
         String schemaName = tableMetadata.getTable().getSchemaName();
         if (!schemaExists(session, schemaName)) {
             throw new SchemaNotFoundException(schemaName);
         }
-        transaction = newCreateTableTransaction(catalog, tableMetadata, session);
-        String location = transaction.table().location();
+        if (replace) {
+            IcebergTableHandle table = (IcebergTableHandle) getTableHandle(session, tableMetadata.getTableSchema().getTable(), Optional.empty(), Optional.empty());
+            if (table != null) {
+                verifyTableVersionForUpdate(table);
+                Table icebergTable = catalog.loadTable(session, table.getSchemaTableName());
+                validateNotModifyingOldSnapshot(table, icebergTable);
+            }
+        }
+        transaction = newCreateTableTransaction(catalog, tableMetadata, session, replace);
+        Location location = Location.of(transaction.table().location());
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
         try {
-            if (fileSystem.listFiles(location).hasNext()) {
+            if (!replace && fileSystem.listFiles(location).hasNext()) {
                 throw new TrinoException(ICEBERG_FILESYSTEM_ERROR, format("" +
                         "Cannot create a table on a non-empty location: %s, set 'iceberg.unique-table-location=true' in your Iceberg catalog properties " +
                         "to use unique table locations for every table.", location));
@@ -929,11 +1118,11 @@ private void cleanExtraOutputFiles(ConnectorSession session, Set<String> written
         Set<String> locations = getOutputFilesLocations(writtenFiles);
         Set<String> fileNames = getOutputFilesFileNames(writtenFiles);
         for (String location : locations) {
-            cleanExtraOutputFiles(fileSystem, session.getQueryId(), location, fileNames);
+            cleanExtraOutputFiles(fileSystem, session.getQueryId(), Location.of(location), fileNames);
         }
     }
 
-    private static void cleanExtraOutputFiles(TrinoFileSystem fileSystem, String queryId, String location, Set<String> fileNamesToKeep)
+    private static void cleanExtraOutputFiles(TrinoFileSystem fileSystem, String queryId, Location location, Set<String> fileNamesToKeep)
     {
         checkArgument(!queryId.contains("-"), "query ID should not contain hyphens: %s", queryId);
 
@@ -944,7 +1133,7 @@ private static void cleanExtraOutputFiles(TrinoFileSystem fileSystem, String que
             FileIterator iterator = fileSystem.listFiles(location);
             while (iterator.hasNext()) {
                 FileEntry entry = iterator.next();
-                String name = fileName(entry.location());
+                String name = entry.location().fileName();
                 if (name.startsWith(queryId + "-") && !fileNamesToKeep.contains(name)) {
                     filesToDelete.add(name);
                 }
@@ -956,14 +1145,11 @@ private static void cleanExtraOutputFiles(TrinoFileSystem fileSystem, String que
 
             log.info("Found %s files to delete and %s to retain in location %s for query %s", filesToDelete.size(), fileNamesToKeep.size(), location, queryId);
             ImmutableList.Builder<String> deletedFilesBuilder = ImmutableList.builder();
-            Iterator<String> filesToDeleteIterator = filesToDelete.iterator();
-            List<String> deleteBatch = new ArrayList<>();
-            while (filesToDeleteIterator.hasNext()) {
-                String fileName = filesToDeleteIterator.next();
+            List<Location> deleteBatch = new ArrayList<>();
+            for (String fileName : filesToDelete) {
                 deletedFilesBuilder.add(fileName);
-                filesToDeleteIterator.remove();
 
-                deleteBatch.add(location + "/" + fileName);
+                deleteBatch.add(location.appendPath(fileName));
                 if (deleteBatch.size() >= DELETE_BATCH_SIZE) {
                     log.debug("Deleting failed attempt files %s for query %s", deleteBatch, queryId);
                     fileSystem.deleteFiles(deleteBatch);
@@ -1032,14 +1218,18 @@ public Optional<ConnectorTableExecuteHandle> getTableHandleForExecute(
         }
 
         return switch (procedureId) {
-            case OPTIMIZE -> getTableHandleForOptimize(tableHandle, executeProperties, retryMode);
+            case OPTIMIZE -> getTableHandleForOptimize(tableHandle, icebergTable, executeProperties, retryMode);
             case DROP_EXTENDED_STATS -> getTableHandleForDropExtendedStats(session, tableHandle);
             case EXPIRE_SNAPSHOTS -> getTableHandleForExpireSnapshots(session, tableHandle, executeProperties);
             case REMOVE_ORPHAN_FILES -> getTableHandleForRemoveOrphanFiles(session, tableHandle, executeProperties);
         };
     }
 
-    private Optional<ConnectorTableExecuteHandle> getTableHandleForOptimize(IcebergTableHandle tableHandle, Map<String, Object> executeProperties, RetryMode retryMode)
+    private Optional<ConnectorTableExecuteHandle> getTableHandleForOptimize(
+            IcebergTableHandle tableHandle,
+            Table icebergTable,
+            Map<String, Object> executeProperties,
+            RetryMode retryMode)
     {
         DataSize maxScannedFileSize = (DataSize) executeProperties.get("file_size_threshold");
 
@@ -1051,7 +1241,9 @@ private Optional<ConnectorTableExecuteHandle> getTableHandleForOptimize(IcebergT
                         tableHandle.getTableSchemaJson(),
                         tableHandle.getPartitionSpecJson().orElseThrow(() -> new VerifyException("Partition spec missing in the table handle")),
                         getColumns(SchemaParser.fromJson(tableHandle.getTableSchemaJson()), typeManager),
-                        tableHandle.getSortOrder(),
+                        icebergTable.sortOrder().fields().stream()
+                                .map(TrinoSortField::fromIceberg)
+                                .collect(toImmutableList()),
                         getFileFormat(tableHandle.getStorageProperties()),
                         tableHandle.getStorageProperties(),
                         maxScannedFileSize,
@@ -1305,10 +1497,10 @@ private void executeExpireSnapshots(ConnectorSession session, IcebergTableExecut
 
         long expireTimestampMillis = session.getStart().toEpochMilli() - retention.toMillis();
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-        List<String> pathsToDelete = new ArrayList<>();
+        List<Location> pathsToDelete = new ArrayList<>();
         // deleteFunction is not accessed from multiple threads unless .executeDeleteWith() is used
         Consumer<String> deleteFunction = path -> {
-            pathsToDelete.add(path);
+            pathsToDelete.add(Location.of(path));
             if (pathsToDelete.size() == DELETE_BATCH_SIZE) {
                 try {
                     fileSystem.deleteFiles(pathsToDelete);
@@ -1445,12 +1637,12 @@ private static ManifestReader<? extends ContentFile<?>> readerForManifest(Table
     private void scanAndDeleteInvalidFiles(Table table, ConnectorSession session, SchemaTableName schemaTableName, Instant expiration, Set<String> validFiles, String subfolder)
     {
         try {
-            List<String> filesToDelete = new ArrayList<>();
+            List<Location> filesToDelete = new ArrayList<>();
             TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-            FileIterator allFiles = fileSystem.listFiles(table.location() + "/" + subfolder);
+            FileIterator allFiles = fileSystem.listFiles(Location.of(table.location()).appendPath(subfolder));
             while (allFiles.hasNext()) {
                 FileEntry entry = allFiles.next();
-                if (entry.lastModified().isBefore(expiration) && !validFiles.contains(fileName(entry.location()))) {
+                if (entry.lastModified().isBefore(expiration) && !validFiles.contains(entry.location().fileName())) {
                     filesToDelete.add(entry.location());
                     if (filesToDelete.size() >= DELETE_BATCH_SIZE) {
                         log.debug("Deleting files while removing orphan files for table %s [%s]", schemaTableName, filesToDelete);
@@ -1488,19 +1680,25 @@ public Optional<Object> getInfo(ConnectorTableHandle tableHandle)
     @Override
     public void dropTable(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
-        catalog.dropTable(session, ((IcebergTableHandle) tableHandle).getSchemaTableName());
+        if (tableHandle instanceof CorruptedIcebergTableHandle corruptedTableHandle) {
+            catalog.dropCorruptedTable(session, corruptedTableHandle.schemaTableName());
+        }
+        else {
+            catalog.dropTable(session, ((IcebergTableHandle) tableHandle).getSchemaTableName());
+        }
     }
 
     @Override
     public void renameTable(ConnectorSession session, ConnectorTableHandle tableHandle, SchemaTableName newTable)
     {
-        catalog.renameTable(session, ((IcebergTableHandle) tableHandle).getSchemaTableName(), newTable);
+        IcebergTableHandle handle = checkValidTableHandle(tableHandle);
+        catalog.renameTable(session, handle.getSchemaTableName(), newTable);
     }
 
     @Override
     public void setTableProperties(ConnectorSession session, ConnectorTableHandle tableHandle, Map<String, Optional<Object>> properties)
     {
-        IcebergTableHandle table = (IcebergTableHandle) tableHandle;
+        IcebergTableHandle table = checkValidTableHandle(tableHandle);
         Table icebergTable = catalog.loadTable(session, table.getSchemaTableName());
 
         Set<String> unsupportedProperties = difference(properties.keySet(), UPDATABLE_TABLE_PROPERTIES);
@@ -1619,6 +1817,34 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
         }
     }
 
+    @Override
+    public void addField(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> parentPath, String fieldName, io.trino.spi.type.Type type, boolean ignoreExisting)
+    {
+        // Iceberg disallows ambiguous field names in a table. e.g. (a row(b int), "a.b" int)
+        String parentName = String.join(".", parentPath);
+
+        Table icebergTable = catalog.loadTable(session, ((IcebergTableHandle) tableHandle).getSchemaTableName());
+        NestedField parent = icebergTable.schema().caseInsensitiveFindField(parentName);
+
+        String caseSensitiveParentName = icebergTable.schema().findColumnName(parent.fieldId());
+        NestedField field = parent.type().asStructType().caseInsensitiveField(fieldName);
+        if (field != null) {
+            if (ignoreExisting) {
+                return;
+            }
+            throw new TrinoException(COLUMN_ALREADY_EXISTS, "Field '%s' already exists".formatted(fieldName));
+        }
+
+        try {
+            icebergTable.updateSchema()
+                    .addColumn(caseSensitiveParentName, fieldName, toIcebergTypeForNewColumn(type, new AtomicInteger())) // Iceberg library assigns fresh id internally
+                    .commit();
+        }
+        catch (RuntimeException e) {
+            throw new TrinoException(ICEBERG_COMMIT_ERROR, "Failed to add field: " + firstNonNull(e.getMessage(), e), e);
+        }
+    }
+
     @Override
     public void dropColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column)
     {
@@ -1679,6 +1905,27 @@ public void renameColumn(ConnectorSession session, ConnectorTableHandle tableHan
         }
     }
 
+    @Override
+    public void renameField(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> fieldPath, String target)
+    {
+        Table icebergTable = catalog.loadTable(session, ((IcebergTableHandle) tableHandle).getSchemaTableName());
+        String parentPath = String.join(".", fieldPath.subList(0, fieldPath.size() - 1));
+        NestedField parent = icebergTable.schema().caseInsensitiveFindField(parentPath);
+
+        String caseSensitiveParentName = icebergTable.schema().findColumnName(parent.fieldId());
+        NestedField source = parent.type().asStructType().caseInsensitiveField(getLast(fieldPath));
+
+        String sourcePath = caseSensitiveParentName + "." + source.name();
+        try {
+            icebergTable.updateSchema()
+                    .renameColumn(sourcePath, target)
+                    .commit();
+        }
+        catch (RuntimeException e) {
+            throw new TrinoException(ICEBERG_COMMIT_ERROR, "Failed to rename field: " + firstNonNull(e.getMessage(), e), e);
+        }
+    }
+
     @Override
     public void setColumnType(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle columnHandle, io.trino.spi.type.Type type)
     {
@@ -1754,23 +2001,34 @@ private static boolean fieldExists(StructType structType, String fieldName)
         return false;
     }
 
-    private List<ColumnMetadata> getColumnMetadatas(Schema schema)
+    @Override
+    public void setFieldType(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> fieldPath, io.trino.spi.type.Type type)
     {
-        ImmutableList.Builder<ColumnMetadata> columns = ImmutableList.builder();
+        Table icebergTable = catalog.loadTable(session, ((IcebergTableHandle) tableHandle).getSchemaTableName());
+        String parentPath = String.join(".", fieldPath.subList(0, fieldPath.size() - 1));
+        NestedField parent = icebergTable.schema().caseInsensitiveFindField(parentPath);
 
-        List<ColumnMetadata> schemaColumns = schema.columns().stream()
-                .map(column ->
-                        ColumnMetadata.builder()
-                                .setName(column.name())
-                                .setType(toTrinoType(column.type(), typeManager))
-                                .setNullable(column.isOptional())
-                                .setComment(Optional.ofNullable(column.doc()))
-                                .build())
-                .collect(toImmutableList());
-        columns.addAll(schemaColumns);
-        columns.add(pathColumnMetadata());
-        columns.add(fileModifiedTimeColumnMetadata());
-        return columns.build();
+        String caseSensitiveParentName = icebergTable.schema().findColumnName(parent.fieldId());
+        NestedField field = parent.type().asStructType().caseInsensitiveField(getLast(fieldPath));
+        // TODO: Add support for changing non-primitive field type
+        if (!field.type().isPrimitiveType()) {
+            throw new TrinoException(NOT_SUPPORTED, "Iceberg doesn't support changing field type from non-primitive types");
+        }
+
+        String name = caseSensitiveParentName + "." + field.name();
+        // Pass dummy AtomicInteger. The field id will be discarded because the subsequent logic disallows non-primitive types.
+        Type icebergType = toIcebergTypeForNewColumn(type, new AtomicInteger());
+        if (!icebergType.isPrimitiveType()) {
+            throw new TrinoException(NOT_SUPPORTED, "Iceberg doesn't support changing field type to non-primitive types");
+        }
+        try {
+            icebergTable.updateSchema()
+                    .updateColumn(name, icebergType.asPrimitiveType())
+                    .commit();
+        }
+        catch (RuntimeException e) {
+            throw new TrinoException(ICEBERG_COMMIT_ERROR, "Failed to set field type: " + firstNonNull(e.getMessage(), e), e);
+        }
     }
 
     @Override
@@ -1780,12 +2038,12 @@ public TableStatisticsMetadata getStatisticsCollectionMetadataForWrite(Connector
             return TableStatisticsMetadata.empty();
         }
 
-        IcebergTableHandle tableHandle = getTableHandle(session, tableMetadata.getTable(), Optional.empty(), Optional.empty());
+        ConnectorTableHandle tableHandle = getTableHandle(session, tableMetadata.getTable(), Optional.empty(), Optional.empty());
         if (tableHandle == null) {
             // Assume new table (CTAS), collect all stats possible
             return getStatisticsCollectionMetadata(tableMetadata, Optional.empty(), availableColumnNames -> {});
         }
-        TableStatistics tableStatistics = getTableStatistics(session, tableHandle);
+        TableStatistics tableStatistics = getTableStatistics(session, checkValidTableHandle(tableHandle));
         if (tableStatistics.getRowCount().getValue() == 0.0) {
             // Table has no data (empty, or wiped out). Collect all stats possible
             return getStatisticsCollectionMetadata(tableMetadata, Optional.empty(), availableColumnNames -> {});
@@ -1800,13 +2058,13 @@ public TableStatisticsMetadata getStatisticsCollectionMetadataForWrite(Connector
     @Override
     public ConnectorAnalyzeMetadata getStatisticsCollectionMetadata(ConnectorSession session, ConnectorTableHandle tableHandle, Map<String, Object> analyzeProperties)
     {
+        IcebergTableHandle handle = checkValidTableHandle(tableHandle);
         if (!isExtendedStatisticsEnabled(session)) {
             throw new TrinoException(NOT_SUPPORTED, "Analyze is not enabled. You can enable analyze using %s config or %s catalog session property".formatted(
                     IcebergConfig.EXTENDED_STATISTICS_CONFIG,
                     IcebergSessionProperties.EXTENDED_STATISTICS_ENABLED));
         }
 
-        IcebergTableHandle handle = (IcebergTableHandle) tableHandle;
         checkArgument(handle.getTableType() == DATA, "Cannot analyze non-DATA table: %s", handle.getTableType());
 
         if (handle.getSnapshotId().isEmpty()) {
@@ -1825,7 +2083,7 @@ public ConnectorAnalyzeMetadata getStatisticsCollectionMetadata(ConnectorSession
                 });
 
         return new ConnectorAnalyzeMetadata(
-                tableHandle,
+                handle.withAnalyzeColumns(analyzeColumnNames.or(() -> Optional.of(ImmutableSet.of()))),
                 getStatisticsCollectionMetadata(
                         tableMetadata,
                         analyzeColumnNames,
@@ -1958,7 +2216,6 @@ public ColumnHandle getMergeRowIdColumnHandle(ConnectorSession session, Connecto
         StructType type = StructType.of(ImmutableList.<NestedField>builder()
                 .add(MetadataColumns.FILE_PATH)
                 .add(MetadataColumns.ROW_POSITION)
-                .add(NestedField.required(TRINO_MERGE_FILE_RECORD_COUNT, "file_record_count", LongType.get()))
                 .add(NestedField.required(TRINO_MERGE_PARTITION_SPEC_ID, "partition_spec_id", IntegerType.get()))
                 .add(NestedField.required(TRINO_MERGE_PARTITION_DATA, "partition_data", StringType.get()))
                 .build());
@@ -1985,17 +2242,17 @@ public ConnectorMergeTableHandle beginMerge(ConnectorSession session, ConnectorT
 
         beginTransaction(icebergTable);
 
-        IcebergTableHandle newTableHandle = table.withRetryMode(retryMode);
         IcebergWritableTableHandle insertHandle = newWritableTableHandle(table.getSchemaTableName(), icebergTable, retryMode);
-
-        return new IcebergMergeTableHandle(newTableHandle, insertHandle);
+        return new IcebergMergeTableHandle(table, insertHandle);
     }
 
     @Override
-    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle mergeTableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
     {
-        IcebergTableHandle handle = ((IcebergMergeTableHandle) tableHandle).getTableHandle();
-        finishWrite(session, handle, fragments, true);
+        IcebergMergeTableHandle mergeHandle = (IcebergMergeTableHandle) mergeTableHandle;
+        IcebergTableHandle handle = mergeHandle.getTableHandle();
+        RetryMode retryMode = mergeHandle.getInsertTableHandle().getRetryMode();
+        finishWrite(session, handle, fragments, retryMode);
     }
 
     private static void verifyTableVersionForUpdate(IcebergTableHandle table)
@@ -2022,7 +2279,7 @@ public static void validateNotPartitionedByNestedField(Schema schema, PartitionS
         }
     }
 
-    private void finishWrite(ConnectorSession session, IcebergTableHandle table, Collection<Slice> fragments, boolean runUpdateValidations)
+    private void finishWrite(ConnectorSession session, IcebergTableHandle table, Collection<Slice> fragments, RetryMode retryMode)
     {
         Table icebergTable = transaction.table();
 
@@ -2038,138 +2295,76 @@ private void finishWrite(ConnectorSession session, IcebergTableHandle table, Col
 
         Schema schema = SchemaParser.fromJson(table.getTableSchemaJson());
 
-        Map<String, List<CommitTaskData>> deletesByFilePath = commitTasks.stream()
-                .filter(task -> task.getContent() == POSITION_DELETES)
-                .collect(groupingBy(task -> task.getReferencedDataFile().orElseThrow()));
-        Map<String, List<CommitTaskData>> fullyDeletedFiles = deletesByFilePath
-                .entrySet().stream()
-                .filter(entry -> fileIsFullyDeleted(entry.getValue()))
-                .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
-
-        if (!deletesByFilePath.keySet().equals(fullyDeletedFiles.keySet()) || commitTasks.stream().anyMatch(task -> task.getContent() == FileContent.DATA)) {
-            RowDelta rowDelta = transaction.newRowDelta();
-            table.getSnapshotId().map(icebergTable::snapshot).ifPresent(s -> rowDelta.validateFromSnapshot(s.snapshotId()));
-            TupleDomain<IcebergColumnHandle> dataColumnPredicate = table.getEnforcedPredicate().filter((column, domain) -> !isMetadataColumnId(column.getId()));
-            if (!dataColumnPredicate.isAll()) {
-                rowDelta.conflictDetectionFilter(toIcebergExpression(dataColumnPredicate));
-            }
-            IsolationLevel isolationLevel = IsolationLevel.fromName(icebergTable.properties().getOrDefault(DELETE_ISOLATION_LEVEL, DELETE_ISOLATION_LEVEL_DEFAULT));
-            if (isolationLevel == IsolationLevel.SERIALIZABLE) {
-                rowDelta.validateNoConflictingDataFiles();
-            }
-
-            if (runUpdateValidations) {
-                // Ensure a row that is updated by this commit was not deleted by a separate commit
-                rowDelta.validateDeletedFiles();
-                rowDelta.validateNoConflictingDeleteFiles();
-            }
-
-            ImmutableSet.Builder<String> writtenFiles = ImmutableSet.builder();
-            ImmutableSet.Builder<String> referencedDataFiles = ImmutableSet.builder();
-            for (CommitTaskData task : commitTasks) {
-                PartitionSpec partitionSpec = PartitionSpecParser.fromJson(schema, task.getPartitionSpecJson());
-                Type[] partitionColumnTypes = partitionSpec.fields().stream()
-                        .map(field -> field.transform().getResultType(schema.findType(field.sourceId())))
-                        .toArray(Type[]::new);
-                switch (task.getContent()) {
-                    case POSITION_DELETES:
-                        if (fullyDeletedFiles.containsKey(task.getReferencedDataFile().orElseThrow())) {
-                            continue;
-                        }
+        RowDelta rowDelta = transaction.newRowDelta();
+        table.getSnapshotId().map(icebergTable::snapshot).ifPresent(s -> rowDelta.validateFromSnapshot(s.snapshotId()));
+        TupleDomain<IcebergColumnHandle> dataColumnPredicate = table.getEnforcedPredicate().filter((column, domain) -> !isMetadataColumnId(column.getId()));
+        if (!dataColumnPredicate.isAll()) {
+            rowDelta.conflictDetectionFilter(toIcebergExpression(dataColumnPredicate));
+        }
+        IsolationLevel isolationLevel = IsolationLevel.fromName(icebergTable.properties().getOrDefault(DELETE_ISOLATION_LEVEL, DELETE_ISOLATION_LEVEL_DEFAULT));
+        if (isolationLevel == IsolationLevel.SERIALIZABLE) {
+            rowDelta.validateNoConflictingDataFiles();
+        }
 
-                        FileMetadata.Builder deleteBuilder = FileMetadata.deleteFileBuilder(partitionSpec)
-                                .withPath(task.getPath())
-                                .withFormat(task.getFileFormat().toIceberg())
-                                .ofPositionDeletes()
-                                .withFileSizeInBytes(task.getFileSizeInBytes())
-                                .withMetrics(task.getMetrics().metrics());
-
-                        if (!partitionSpec.fields().isEmpty()) {
-                            String partitionDataJson = task.getPartitionDataJson()
-                                    .orElseThrow(() -> new VerifyException("No partition data for partitioned table"));
-                            deleteBuilder.withPartition(PartitionData.fromJson(partitionDataJson, partitionColumnTypes));
-                        }
+        // Ensure a row that is updated by this commit was not deleted by a separate commit
+        rowDelta.validateDeletedFiles();
+        rowDelta.validateNoConflictingDeleteFiles();
 
-                        rowDelta.addDeletes(deleteBuilder.build());
-                        writtenFiles.add(task.getPath());
-                        task.getReferencedDataFile().ifPresent(referencedDataFiles::add);
-                        break;
-                    case DATA:
-                        DataFiles.Builder builder = DataFiles.builder(partitionSpec)
-                                .withPath(task.getPath())
-                                .withFormat(task.getFileFormat().toIceberg())
-                                .withFileSizeInBytes(task.getFileSizeInBytes())
-                                .withMetrics(task.getMetrics().metrics());
-
-                        if (!icebergTable.spec().fields().isEmpty()) {
-                            String partitionDataJson = task.getPartitionDataJson()
-                                    .orElseThrow(() -> new VerifyException("No partition data for partitioned table"));
-                            builder.withPartition(PartitionData.fromJson(partitionDataJson, partitionColumnTypes));
-                        }
-                        rowDelta.addRows(builder.build());
-                        writtenFiles.add(task.getPath());
-                        break;
-                    default:
-                        throw new UnsupportedOperationException("Unsupported task content: " + task.getContent());
+        ImmutableSet.Builder<String> writtenFiles = ImmutableSet.builder();
+        ImmutableSet.Builder<String> referencedDataFiles = ImmutableSet.builder();
+        for (CommitTaskData task : commitTasks) {
+            PartitionSpec partitionSpec = PartitionSpecParser.fromJson(schema, task.getPartitionSpecJson());
+            Type[] partitionColumnTypes = partitionSpec.fields().stream()
+                    .map(field -> field.transform().getResultType(schema.findType(field.sourceId())))
+                    .toArray(Type[]::new);
+            switch (task.getContent()) {
+                case POSITION_DELETES -> {
+                    FileMetadata.Builder deleteBuilder = FileMetadata.deleteFileBuilder(partitionSpec)
+                            .withPath(task.getPath())
+                            .withFormat(task.getFileFormat().toIceberg())
+                            .ofPositionDeletes()
+                            .withFileSizeInBytes(task.getFileSizeInBytes())
+                            .withMetrics(task.getMetrics().metrics());
+                    if (!partitionSpec.fields().isEmpty()) {
+                        String partitionDataJson = task.getPartitionDataJson()
+                                .orElseThrow(() -> new VerifyException("No partition data for partitioned table"));
+                        deleteBuilder.withPartition(PartitionData.fromJson(partitionDataJson, partitionColumnTypes));
+                    }
+                    rowDelta.addDeletes(deleteBuilder.build());
+                    writtenFiles.add(task.getPath());
+                    task.getReferencedDataFile().ifPresent(referencedDataFiles::add);
                 }
-            }
-
-            // try to leave as little garbage as possible behind
-            if (table.getRetryMode() != NO_RETRIES) {
-                cleanExtraOutputFiles(session, writtenFiles.build());
-            }
-
-            rowDelta.validateDataFilesExist(referencedDataFiles.build());
-            try {
-                commit(rowDelta, session);
-            }
-            catch (ValidationException e) {
-                throw new TrinoException(ICEBERG_COMMIT_ERROR, "Failed to commit Iceberg update to table: " + table.getSchemaTableName(), e);
+                case DATA -> {
+                    DataFiles.Builder builder = DataFiles.builder(partitionSpec)
+                            .withPath(task.getPath())
+                            .withFormat(task.getFileFormat().toIceberg())
+                            .withFileSizeInBytes(task.getFileSizeInBytes())
+                            .withMetrics(task.getMetrics().metrics());
+                    if (!icebergTable.spec().fields().isEmpty()) {
+                        String partitionDataJson = task.getPartitionDataJson()
+                                .orElseThrow(() -> new VerifyException("No partition data for partitioned table"));
+                        builder.withPartition(PartitionData.fromJson(partitionDataJson, partitionColumnTypes));
+                    }
+                    rowDelta.addRows(builder.build());
+                    writtenFiles.add(task.getPath());
+                }
+                default -> throw new UnsupportedOperationException("Unsupported task content: " + task.getContent());
             }
         }
 
-        if (!fullyDeletedFiles.isEmpty()) {
-            try {
-                TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-                fileSystem.deleteFiles(fullyDeletedFiles.values().stream()
-                        .flatMap(Collection::stream)
-                        .map(CommitTaskData::getPath)
-                        .collect(toImmutableSet()));
-            }
-            catch (IOException e) {
-                log.warn(e, "Failed to clean up uncommitted position delete files");
-            }
+        // try to leave as little garbage as possible behind
+        if (retryMode != NO_RETRIES) {
+            cleanExtraOutputFiles(session, writtenFiles.build());
         }
 
+        rowDelta.validateDataFilesExist(referencedDataFiles.build());
         try {
-            if (!fullyDeletedFiles.isEmpty()) {
-                DeleteFiles deleteFiles = transaction.newDelete();
-                fullyDeletedFiles.keySet().forEach(deleteFiles::deleteFile);
-                commit(deleteFiles, session);
-            }
+            commit(rowDelta, session);
             transaction.commitTransaction();
         }
         catch (ValidationException e) {
             throw new TrinoException(ICEBERG_COMMIT_ERROR, "Failed to commit Iceberg update to table: " + table.getSchemaTableName(), e);
         }
-        transaction = null;
-    }
-
-    private static boolean fileIsFullyDeleted(List<CommitTaskData> positionDeletes)
-    {
-        checkArgument(!positionDeletes.isEmpty(), "Cannot call fileIsFullyDeletes with an empty list");
-        String referencedDataFile = positionDeletes.get(0).getReferencedDataFile().orElseThrow();
-        long fileRecordCount = positionDeletes.get(0).getFileRecordCount().orElseThrow();
-        checkArgument(positionDeletes.stream().allMatch(positionDelete ->
-                        positionDelete.getReferencedDataFile().orElseThrow().equals(referencedDataFile) &&
-                                positionDelete.getFileRecordCount().orElseThrow() == fileRecordCount),
-                "All position deletes must be for the same file and have the same fileRecordCount");
-        long deletedRowCount = positionDeletes.stream()
-                .map(CommitTaskData::getDeletedRowCount)
-                .mapToLong(Optional::orElseThrow)
-                .sum();
-        checkState(deletedRowCount <= fileRecordCount, "Found more deleted rows than exist in the file");
-        return fileRecordCount == deletedRowCount;
     }
 
     @Override
@@ -2242,13 +2437,54 @@ public void rollback()
         // TODO: cleanup open transaction
     }
 
+    @Override
+    public Optional<LimitApplicationResult<ConnectorTableHandle>> applyLimit(ConnectorSession session, ConnectorTableHandle handle, long limit)
+    {
+        IcebergTableHandle table = (IcebergTableHandle) handle;
+
+        if (table.getLimit().isPresent() && table.getLimit().getAsLong() <= limit) {
+            return Optional.empty();
+        }
+        if (!table.getUnenforcedPredicate().isAll()) {
+            return Optional.empty();
+        }
+
+        table = new IcebergTableHandle(
+                table.getCatalog(),
+                table.getSchemaName(),
+                table.getTableName(),
+                table.getTableType(),
+                table.getSnapshotId(),
+                table.getTableSchemaJson(),
+                table.getPartitionSpecJson(),
+                table.getFormatVersion(),
+                table.getUnenforcedPredicate(), // known to be ALL
+                table.getEnforcedPredicate(),
+                OptionalLong.of(limit),
+                table.getProjectedColumns(),
+                table.getNameMappingJson(),
+                table.getTableLocation(),
+                table.getStorageProperties(),
+                table.isRecordScannedFiles(),
+                table.getMaxScannedFileSize(),
+                table.getConstraintColumns(),
+                table.getAnalyzeColumns());
+
+        return Optional.of(new LimitApplicationResult<>(table, false, false));
+    }
+
     @Override
     public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(ConnectorSession session, ConnectorTableHandle handle, Constraint constraint)
     {
         IcebergTableHandle table = (IcebergTableHandle) handle;
         ConstraintExtractor.ExtractionResult extractionResult = extractTupleDomain(constraint);
         TupleDomain<IcebergColumnHandle> predicate = extractionResult.tupleDomain();
-        if (predicate.isAll()) {
+        if (predicate.isAll() && constraint.getPredicateColumns().isEmpty()) {
+            return Optional.empty();
+        }
+        if (table.getLimit().isPresent()) {
+            // TODO we probably can allow predicate pushdown after we accepted limit. Currently, this is theoretical because we don't enforce limit, so
+            //  LimitNode remains above TableScan, and there is no "push filter through limit" optimization.
             return Optional.empty();
         }
 
@@ -2303,30 +2539,40 @@ else if (isMetadataColumnId(columnHandle.getId())) {
             remainingConstraint = TupleDomain.withColumnDomains(newUnenforced).intersect(TupleDomain.withColumnDomains(unsupported));
         }
 
+        Set<IcebergColumnHandle> newConstraintColumns = constraint.getPredicateColumns()
+                .map(columnHandles -> columnHandles.stream()
+                        .map(columnHandle -> (IcebergColumnHandle) columnHandle)
+                        .collect(toImmutableSet()))
+                .orElse(ImmutableSet.of());
+
         if (newEnforcedConstraint.equals(table.getEnforcedPredicate())
-                && newUnenforcedConstraint.equals(table.getUnenforcedPredicate())) {
+                && newUnenforcedConstraint.equals(table.getUnenforcedPredicate())
+                && newConstraintColumns.equals(table.getConstraintColumns())
+                && constraint.getPredicateColumns().isEmpty()) {
             return Optional.empty();
         }
 
         return Optional.of(new ConstraintApplicationResult<>(
                 new IcebergTableHandle(
+                        table.getCatalog(),
                         table.getSchemaName(),
                         table.getTableName(),
                         table.getTableType(),
                         table.getSnapshotId(),
                         table.getTableSchemaJson(),
-                        table.getSortOrder(),
                         table.getPartitionSpecJson(),
                         table.getFormatVersion(),
                         newUnenforcedConstraint,
                         newEnforcedConstraint,
+                        table.getLimit(),
                         table.getProjectedColumns(),
                         table.getNameMappingJson(),
                         table.getTableLocation(),
                         table.getStorageProperties(),
-                        table.getRetryMode(),
                         table.isRecordScannedFiles(),
-                        table.getMaxScannedFileSize()),
+                        table.getMaxScannedFileSize(),
+                        Sets.union(table.getConstraintColumns(), newConstraintColumns),
+                        table.getAnalyzeColumns()),
                 remainingConstraint.transformKeys(ColumnHandle.class::cast),
                 extractionResult.remainingExpression(),
                 false));
@@ -2360,7 +2606,7 @@ public Optional<ProjectionApplicationResult<ConnectorTableHandle>> applyProjecti
                 .collect(toImmutableSet());
 
         Map<ConnectorExpression, ProjectedColumnRepresentation> columnProjections = projectedExpressions.stream()
-                .collect(toImmutableMap(identity(), HiveApplyProjectionUtil::createProjectedColumnRepresentation));
+                .collect(toImmutableMap(identity(), ApplyProjectionUtil::createProjectedColumnRepresentation));
 
         IcebergTableHandle icebergTableHandle = (IcebergTableHandle) handle;
 
@@ -2458,23 +2704,25 @@ public TableStatistics getTableStatistics(ConnectorSession session, ConnectorTab
 
         return tableStatisticsCache.computeIfAbsent(
                 new IcebergTableHandle(
+                        originalHandle.getCatalog(),
                         originalHandle.getSchemaName(),
                         originalHandle.getTableName(),
                         originalHandle.getTableType(),
                         originalHandle.getSnapshotId(),
                         originalHandle.getTableSchemaJson(),
-                        originalHandle.getSortOrder(),
                         originalHandle.getPartitionSpecJson(),
                         originalHandle.getFormatVersion(),
                         originalHandle.getUnenforcedPredicate(),
                         originalHandle.getEnforcedPredicate(),
+                        OptionalLong.empty(), // limit is currently not included in stats and is not enforced by the connector
                         ImmutableSet.of(), // projectedColumns don't affect stats
                         originalHandle.getNameMappingJson(),
                         originalHandle.getTableLocation(),
                         originalHandle.getStorageProperties(),
-                        NO_RETRIES, // retry mode doesn't affect stats
                         originalHandle.isRecordScannedFiles(),
-                        originalHandle.getMaxScannedFileSize()),
+                        originalHandle.getMaxScannedFileSize(),
+                        originalHandle.getConstraintColumns(),
+                        originalHandle.getAnalyzeColumns()),
                 handle -> {
                     Table icebergTable = catalog.loadTable(session, handle.getSchemaTableName());
                     return TableStatisticsReader.getTableStatistics(typeManager, session, handle, icebergTable);
@@ -2575,6 +2823,11 @@ public Optional<ConnectorOutputMetadata> finishRefreshMaterializedView(
                     if (!(handle instanceof IcebergTableHandle icebergHandle)) {
                         return UNKNOWN_SNAPSHOT_TOKEN;
                     }
+                    // Currently the catalogs are isolated in separate classloaders, and the above instanceof check is sufficient to know "our" handles.
+                    // This isolation will be removed after we remove Hadoop dependencies, so check that this is "our" handle explicitly.
+                    if (!trinoCatalogHandle.equals(icebergHandle.getCatalog())) {
+                        return UNKNOWN_SNAPSHOT_TOKEN;
+                    }
                     return icebergHandle.getSchemaTableName() + "=" + icebergHandle.getSnapshotId().map(Object.class::cast).orElse("");
                 })
                 .distinct()
@@ -2685,10 +2938,10 @@ else if (strings.size() != 2) {
             String schema = strings.get(0);
             String name = strings.get(1);
             SchemaTableName schemaTableName = new SchemaTableName(schema, name);
-            IcebergTableHandle tableHandle = getTableHandle(session, schemaTableName, Optional.empty(), Optional.empty());
+            ConnectorTableHandle tableHandle = getTableHandle(session, schemaTableName, Optional.empty(), Optional.empty());
 
-            if (tableHandle == null) {
-                // Base table is gone
+            if (tableHandle == null || tableHandle instanceof CorruptedIcebergTableHandle) {
+                // Base table is gone or table is corrupted
                 return new MaterializedViewFreshness(STALE, Optional.empty());
             }
             Optional<Long> snapshotAtRefresh;
@@ -2698,7 +2951,7 @@ else if (strings.size() != 2) {
             else {
                 snapshotAtRefresh = Optional.of(Long.parseLong(value));
             }
-            TableChangeInfo tableChangeInfo = getTableChangeInfo(session, tableHandle, snapshotAtRefresh);
+            TableChangeInfo tableChangeInfo = getTableChangeInfo(session, (IcebergTableHandle) tableHandle, snapshotAtRefresh);
             if (tableChangeInfo instanceof NoTableChange) {
                 // Fresh
             }
@@ -2752,27 +3005,31 @@ private TableChangeInfo getTableChangeInfo(ConnectorSession session, IcebergTabl
     }
 
     @Override
-    public boolean supportsReportingWrittenBytes(ConnectorSession session, ConnectorTableHandle connectorTableHandle)
+    public void setColumnComment(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column, Optional<String> comment)
     {
-        return true;
+        catalog.updateColumnComment(session, ((IcebergTableHandle) tableHandle).getSchemaTableName(), ((IcebergColumnHandle) column).getColumnIdentity(), comment);
     }
 
     @Override
-    public boolean supportsReportingWrittenBytes(ConnectorSession session, SchemaTableName fullTableName, Map<String, Object> tableProperties)
+    public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName)
     {
-        return true;
+        Optional<String> targetCatalogName = getHiveCatalogName(session);
+        if (targetCatalogName.isEmpty()) {
+            return Optional.empty();
+        }
+        return catalog.redirectTable(session, tableName, targetCatalogName.get());
     }
 
     @Override
-    public void setColumnComment(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column, Optional<String> comment)
+    public WriterScalingOptions getNewTableWriterScalingOptions(ConnectorSession session, SchemaTableName tableName, Map<String, Object> tableProperties)
     {
-        catalog.updateColumnComment(session, ((IcebergTableHandle) tableHandle).getSchemaTableName(), ((IcebergColumnHandle) column).getColumnIdentity(), comment);
+        return WriterScalingOptions.ENABLED;
     }
 
     @Override
-    public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName)
+    public WriterScalingOptions getInsertWriterScalingOptions(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
-        return catalog.redirectTable(session, tableName);
+        return WriterScalingOptions.ENABLED;
     }
 
     private static CollectedStatistics processComputedTableStatistics(Table table, Collection<ComputedStatistics> computedStatistics)
@@ -2809,6 +3066,15 @@ private void beginTransaction(Table icebergTable)
         transaction = icebergTable.newTransaction();
     }
 
+    private static IcebergTableHandle checkValidTableHandle(ConnectorTableHandle tableHandle)
+    {
+        requireNonNull(tableHandle, "tableHandle is null");
+        if (tableHandle instanceof CorruptedIcebergTableHandle corruptedTableHandle) {
+            throw corruptedTableHandle.createException();
+        }
+        return ((IcebergTableHandle) tableHandle);
+    }
+
     private sealed interface TableChangeInfo
             permits NoTableChange, FirstChangeSnapshot, UnknownTableChange {}
 
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadataFactory.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadataFactory.java
index ffb6dc461ef2..36163eadc864 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadataFactory.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadataFactory.java
@@ -13,19 +13,20 @@
  */
 package io.trino.plugin.iceberg;
 
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.iceberg.catalog.TrinoCatalogFactory;
+import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 public class IcebergMetadataFactory
 {
     private final TypeManager typeManager;
+    private final CatalogHandle trinoCatalogHandle;
     private final JsonCodec<CommitTaskData> commitTaskCodec;
     private final TrinoCatalogFactory catalogFactory;
     private final TrinoFileSystemFactory fileSystemFactory;
@@ -34,12 +35,14 @@ public class IcebergMetadataFactory
     @Inject
     public IcebergMetadataFactory(
             TypeManager typeManager,
+            CatalogHandle trinoCatalogHandle,
             JsonCodec<CommitTaskData> commitTaskCodec,
             TrinoCatalogFactory catalogFactory,
             TrinoFileSystemFactory fileSystemFactory,
             TableStatisticsWriter tableStatisticsWriter)
     {
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.trinoCatalogHandle = requireNonNull(trinoCatalogHandle, "trinoCatalogHandle is null");
         this.commitTaskCodec = requireNonNull(commitTaskCodec, "commitTaskCodec is null");
         this.catalogFactory = requireNonNull(catalogFactory, "catalogFactory is null");
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
@@ -50,6 +53,7 @@ public IcebergMetadata create(ConnectorIdentity identity)
     {
         return new IcebergMetadata(
                 typeManager,
+                trinoCatalogHandle,
                 commitTaskCodec,
                 catalogFactory.create(identity),
                 fileSystemFactory,
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergModule.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergModule.java
index 8b9a48f6a721..e94f0f9f4ea6 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergModule.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergModule.java
@@ -26,6 +26,9 @@
 import io.trino.plugin.hive.orc.OrcWriterConfig;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
 import io.trino.plugin.hive.parquet.ParquetWriterConfig;
+import io.trino.plugin.iceberg.functions.IcebergFunctionProvider;
+import io.trino.plugin.iceberg.functions.tablechanges.TableChangesFunctionProcessorProvider;
+import io.trino.plugin.iceberg.functions.tablechanges.TableChangesFunctionProvider;
 import io.trino.plugin.iceberg.procedure.DropExtendedStatsTableProcedure;
 import io.trino.plugin.iceberg.procedure.ExpireSnapshotsTableProcedure;
 import io.trino.plugin.iceberg.procedure.OptimizeTableProcedure;
@@ -37,6 +40,8 @@
 import io.trino.spi.connector.ConnectorPageSourceProvider;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.TableProcedureMetadata;
+import io.trino.spi.function.FunctionProvider;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.procedure.Procedure;
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
@@ -61,8 +66,11 @@ public void configure(Binder binder)
         binder.bind(IcebergMaterializedViewAdditionalProperties.class).in(Scopes.SINGLETON);
         binder.bind(IcebergAnalyzeProperties.class).in(Scopes.SINGLETON);
 
+        newOptionalBinder(binder, Key.get(boolean.class, AsyncIcebergSplitProducer.class))
+                .setDefault().toInstance(true);
         binder.bind(ConnectorSplitManager.class).to(IcebergSplitManager.class).in(Scopes.SINGLETON);
         newOptionalBinder(binder, ConnectorPageSourceProvider.class).setDefault().to(IcebergPageSourceProvider.class).in(Scopes.SINGLETON);
+        binder.bind(IcebergPageSourceProvider.class).in(Scopes.SINGLETON);
         binder.bind(ConnectorPageSinkProvider.class).to(IcebergPageSinkProvider.class).in(Scopes.SINGLETON);
         binder.bind(ConnectorNodePartitioningProvider.class).to(IcebergNodePartitioningProvider.class).in(Scopes.SINGLETON);
 
@@ -93,5 +101,9 @@ public void configure(Binder binder)
         tableProcedures.addBinding().toProvider(DropExtendedStatsTableProcedure.class).in(Scopes.SINGLETON);
         tableProcedures.addBinding().toProvider(ExpireSnapshotsTableProcedure.class).in(Scopes.SINGLETON);
         tableProcedures.addBinding().toProvider(RemoveOrphanFilesTableProcedure.class).in(Scopes.SINGLETON);
+
+        newSetBinder(binder, ConnectorTableFunction.class).addBinding().toProvider(TableChangesFunctionProvider.class).in(Scopes.SINGLETON);
+        binder.bind(FunctionProvider.class).to(IcebergFunctionProvider.class).in(Scopes.SINGLETON);
+        binder.bind(TableChangesFunctionProcessorProvider.class).in(Scopes.SINGLETON);
     }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergNodePartitioningProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergNodePartitioningProvider.java
index 689542cbcd6e..2ad39c2f426c 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergNodePartitioningProvider.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergNodePartitioningProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.iceberg;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.BucketFunction;
 import io.trino.spi.connector.ConnectorNodePartitioningProvider;
 import io.trino.spi.connector.ConnectorPartitioningHandle;
@@ -23,8 +24,6 @@
 import io.trino.spi.type.TypeOperators;
 import org.apache.iceberg.Schema;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.plugin.iceberg.IcebergUtil.schemaFromHandles;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSink.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSink.java
index 7a838dfdbc24..b54d8f25fa9b 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSink.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSink.java
@@ -18,6 +18,7 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.slice.Slice;
 import io.airlift.units.DataSize;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.iceberg.PartitionTransforms.ColumnTransform;
 import io.trino.spi.Page;
@@ -29,18 +30,9 @@
 import io.trino.spi.connector.ConnectorPageSink;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.SortOrder;
-import io.trino.spi.type.BigintType;
-import io.trino.spi.type.BooleanType;
-import io.trino.spi.type.DateType;
 import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.DoubleType;
-import io.trino.spi.type.IntegerType;
-import io.trino.spi.type.RealType;
-import io.trino.spi.type.SmallintType;
-import io.trino.spi.type.TinyintType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
-import io.trino.spi.type.UuidType;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
 import org.apache.iceberg.MetricsConfig;
@@ -67,7 +59,6 @@
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.slice.Slices.wrappedBuffer;
-import static io.trino.filesystem.Locations.appendPath;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_METADATA;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_TOO_MANY_OPEN_PARTITIONS;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.isSortedWritingEnabled;
@@ -75,14 +66,22 @@
 import static io.trino.plugin.iceberg.PartitionTransforms.getColumnTransform;
 import static io.trino.plugin.iceberg.util.Timestamps.getTimestampTz;
 import static io.trino.plugin.iceberg.util.Timestamps.timestampTzToMicros;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.DateType.DATE;
 import static io.trino.spi.type.Decimals.readBigDecimal;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TimeType.TIME_MICROS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
 import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MICROS;
 import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MICROSECOND;
+import static io.trino.spi.type.TinyintType.TINYINT;
+import static io.trino.spi.type.UuidType.UUID;
 import static io.trino.spi.type.UuidType.trinoUuidToJavaUuid;
-import static java.lang.Float.intBitsToFloat;
-import static java.lang.Math.toIntExact;
+import static java.lang.Math.min;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.UUID.randomUUID;
@@ -111,7 +110,7 @@ public class IcebergPageSink
     private final boolean sortedWritingEnabled;
     private final DataSize sortingFileWriterBufferSize;
     private final Integer sortingFileWriterMaxOpenFiles;
-    private final String tempDirectory;
+    private final Location tempDirectory;
     private final TypeManager typeManager;
     private final PageSorter pageSorter;
     private final List<Type> columnTypes;
@@ -163,7 +162,7 @@ public IcebergPageSink(
         this.sortedWritingEnabled = isSortedWritingEnabled(session);
         this.sortingFileWriterBufferSize = requireNonNull(sortingFileWriterBufferSize, "sortingFileWriterBufferSize is null");
         this.sortingFileWriterMaxOpenFiles = sortingFileWriterMaxOpenFiles;
-        this.tempDirectory = locationProvider.newDataLocation("trino-tmp-files");
+        this.tempDirectory = Location.of(locationProvider.newDataLocation("trino-tmp-files"));
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         this.pageSorter = requireNonNull(pageSorter, "pageSorter is null");
         this.columnTypes = getColumns(outputSchema, typeManager).stream()
@@ -254,13 +253,12 @@ public void abort()
 
     private void doAppend(Page page)
     {
-        while (page.getPositionCount() > MAX_PAGE_POSITIONS) {
-            Page chunk = page.getRegion(0, MAX_PAGE_POSITIONS);
-            page = page.getRegion(MAX_PAGE_POSITIONS, page.getPositionCount() - MAX_PAGE_POSITIONS);
+        int writeOffset = 0;
+        while (writeOffset < page.getPositionCount()) {
+            Page chunk = page.getRegion(writeOffset, min(page.getPositionCount() - writeOffset, MAX_PAGE_POSITIONS));
+            writeOffset += chunk.getPositionCount();
             writePage(chunk);
         }
-
-        writePage(page);
     }
 
     private void writePage(Page page)
@@ -348,7 +346,7 @@ private int[] getWriterIndexes(Page page)
 
             if (!sortOrder.isEmpty() && sortedWritingEnabled) {
                 String tempName = "sorting-file-writer-%s-%s".formatted(session.getQueryId(), randomUUID());
-                String tempFilePrefix = appendPath(tempDirectory, tempName);
+                Location tempFilePrefix = tempDirectory.appendPath(tempName);
                 WriteContext writerContext = createWriter(outputPath, partitionData);
                 IcebergFileWriter sortedFileWriter = new IcebergSortingFileWriter(
                         fileSystem,
@@ -400,8 +398,6 @@ private void closeWriter(int writerIndex)
                 PartitionSpecParser.toJson(partitionSpec),
                 writeContext.getPartitionData().map(PartitionData::toJson),
                 DATA,
-                Optional.empty(),
-                Optional.empty(),
                 Optional.empty());
 
         commitTasks.add(wrappedBuffer(jsonCodec.toJsonBytes(task)));
@@ -411,7 +407,7 @@ private WriteContext createWriter(String outputPath, Optional<PartitionData> par
     {
         IcebergFileWriter writer = fileWriterFactory.createDataFileWriter(
                 fileSystem,
-                outputPath,
+                Location.of(outputPath),
                 outputSchema,
                 session,
                 fileFormat,
@@ -450,41 +446,50 @@ public static Object getIcebergValue(Block block, int position, Type type)
         if (block.isNull(position)) {
             return null;
         }
-        if (type instanceof BigintType) {
-            return type.getLong(block, position);
+        if (type.equals(BIGINT)) {
+            return BIGINT.getLong(block, position);
+        }
+        if (type.equals(TINYINT)) {
+            return (int) TINYINT.getByte(block, position);
+        }
+        if (type.equals(SMALLINT)) {
+            return (int) SMALLINT.getShort(block, position);
+        }
+        if (type.equals(INTEGER)) {
+            return INTEGER.getInt(block, position);
         }
-        if (type instanceof IntegerType || type instanceof SmallintType || type instanceof TinyintType || type instanceof DateType) {
-            return toIntExact(type.getLong(block, position));
+        if (type.equals(DATE)) {
+            return DATE.getInt(block, position);
         }
-        if (type instanceof BooleanType) {
-            return type.getBoolean(block, position);
+        if (type.equals(BOOLEAN)) {
+            return BOOLEAN.getBoolean(block, position);
         }
-        if (type instanceof DecimalType) {
-            return readBigDecimal((DecimalType) type, block, position);
+        if (type instanceof DecimalType decimalType) {
+            return readBigDecimal(decimalType, block, position);
         }
-        if (type instanceof RealType) {
-            return intBitsToFloat(toIntExact(type.getLong(block, position)));
+        if (type.equals(REAL)) {
+            return REAL.getFloat(block, position);
         }
-        if (type instanceof DoubleType) {
-            return type.getDouble(block, position);
+        if (type.equals(DOUBLE)) {
+            return DOUBLE.getDouble(block, position);
         }
         if (type.equals(TIME_MICROS)) {
-            return type.getLong(block, position) / PICOSECONDS_PER_MICROSECOND;
+            return TIME_MICROS.getLong(block, position) / PICOSECONDS_PER_MICROSECOND;
         }
         if (type.equals(TIMESTAMP_MICROS)) {
-            return type.getLong(block, position);
+            return TIMESTAMP_MICROS.getLong(block, position);
         }
         if (type.equals(TIMESTAMP_TZ_MICROS)) {
             return timestampTzToMicros(getTimestampTz(block, position));
         }
-        if (type instanceof VarbinaryType) {
-            return type.getSlice(block, position).getBytes();
+        if (type instanceof VarbinaryType varbinaryType) {
+            return varbinaryType.getSlice(block, position).getBytes();
         }
-        if (type instanceof VarcharType) {
-            return type.getSlice(block, position).toStringUtf8();
+        if (type instanceof VarcharType varcharType) {
+            return varcharType.getSlice(block, position).toStringUtf8();
         }
-        if (type instanceof UuidType) {
-            return trinoUuidToJavaUuid(type.getSlice(block, position));
+        if (type.equals(UUID)) {
+            return trinoUuidToJavaUuid(UUID.getSlice(block, position));
         }
         throw new UnsupportedOperationException("Type not supported as partition column: " + type.getDisplayName());
     }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSinkProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSinkProvider.java
index 9e16385d5465..1242c9dd4c19 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSinkProvider.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSinkProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.iceberg;
 
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.units.DataSize;
 import io.trino.filesystem.TrinoFileSystemFactory;
@@ -38,8 +39,6 @@
 import org.apache.iceberg.SchemaParser;
 import org.apache.iceberg.io.LocationProvider;
 
-import javax.inject.Inject;
-
 import java.util.Map;
 
 import static com.google.common.collect.Maps.transformValues;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSource.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSource.java
index 092428eac85e..32342239c5f5 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSource.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSource.java
@@ -164,7 +164,7 @@ private Page withRowIdBlock(Page page)
         Block[] fullPage = new Block[page.getChannelCount()];
         for (int channel = 0; channel < page.getChannelCount(); channel++) {
             if (channel == rowIdColumnIndex) {
-                fullPage[channel] = RowBlock.fromFieldBlocks(page.getPositionCount(), Optional.empty(), rowIdFields);
+                fullPage[channel] = RowBlock.fromFieldBlocks(page.getPositionCount(), rowIdFields);
                 continue;
             }
 
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSourceProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSourceProvider.java
index 6d46b71f22c8..beac48fc875a 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSourceProvider.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSourceProvider.java
@@ -15,11 +15,17 @@
 
 import com.google.common.base.Suppliers;
 import com.google.common.base.VerifyException;
+import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.graph.Traverser;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
+import io.trino.annotation.NotThreadSafe;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
@@ -34,6 +40,7 @@
 import io.trino.orc.TupleDomainOrcPredicate;
 import io.trino.orc.TupleDomainOrcPredicate.TupleDomainOrcPredicateBuilder;
 import io.trino.orc.metadata.OrcType;
+import io.trino.parquet.BloomFilterStore;
 import io.trino.parquet.Field;
 import io.trino.parquet.ParquetCorruptionException;
 import io.trino.parquet.ParquetDataSource;
@@ -51,14 +58,17 @@
 import io.trino.plugin.hive.orc.OrcReaderConfig;
 import io.trino.plugin.hive.parquet.ParquetPageSource;
 import io.trino.plugin.hive.parquet.ParquetReaderConfig;
-import io.trino.plugin.hive.parquet.TrinoParquetDataSource;
 import io.trino.plugin.iceberg.IcebergParquetColumnIOConverter.FieldContext;
 import io.trino.plugin.iceberg.delete.DeleteFile;
 import io.trino.plugin.iceberg.delete.DeleteFilter;
+import io.trino.plugin.iceberg.delete.EqualityDeleteFilter;
 import io.trino.plugin.iceberg.delete.PositionDeleteFilter;
 import io.trino.plugin.iceberg.delete.RowPredicate;
-import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
+import io.trino.plugin.iceberg.fileio.ForwardingInputFile;
+import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorPageSourceProvider;
@@ -68,6 +78,7 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.EmptyPageSource;
+import io.trino.spi.connector.FixedPageSource;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.Range;
@@ -86,6 +97,7 @@
 import org.apache.iceberg.PartitionSpecParser;
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.SchemaParser;
+import org.apache.iceberg.StructLike;
 import org.apache.iceberg.avro.AvroSchemaUtil;
 import org.apache.iceberg.io.InputFile;
 import org.apache.iceberg.mapping.MappedField;
@@ -94,18 +106,21 @@
 import org.apache.iceberg.mapping.NameMappingParser;
 import org.apache.iceberg.parquet.ParquetSchemaUtil;
 import org.apache.iceberg.types.Conversions;
+import org.apache.iceberg.types.TypeUtil;
+import org.apache.iceberg.util.StructLikeSet;
+import org.apache.iceberg.util.StructProjection;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.hadoop.metadata.BlockMetaData;
 import org.apache.parquet.hadoop.metadata.FileMetaData;
 import org.apache.parquet.hadoop.metadata.ParquetMetadata;
 import org.apache.parquet.io.ColumnIO;
 import org.apache.parquet.io.MessageColumnIO;
+import org.apache.parquet.schema.GroupType;
 import org.apache.parquet.schema.MessageType;
+import org.apache.parquet.schema.PrimitiveType;
 import org.roaringbitmap.longlong.LongBitmapDataProvider;
 import org.roaringbitmap.longlong.Roaring64Bitmap;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.ByteBuffer;
@@ -117,7 +132,6 @@
 import java.util.Optional;
 import java.util.OptionalLong;
 import java.util.Set;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 import static com.google.common.base.Preconditions.checkState;
@@ -126,16 +140,18 @@
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Maps.uniqueIndex;
+import static io.airlift.slice.SizeOf.SIZE_OF_LONG;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
 import static io.trino.orc.OrcReader.INITIAL_BATCH_SIZE;
 import static io.trino.orc.OrcReader.ProjectedLayout;
 import static io.trino.orc.OrcReader.fullyProjectedLayout;
+import static io.trino.parquet.BloomFilterStore.getBloomFilterStore;
 import static io.trino.parquet.ParquetTypeUtils.getColumnIO;
 import static io.trino.parquet.ParquetTypeUtils.getDescriptors;
 import static io.trino.parquet.predicate.PredicateUtils.buildPredicate;
 import static io.trino.parquet.predicate.PredicateUtils.predicateMatches;
-import static io.trino.plugin.iceberg.IcebergColumnHandle.TRINO_MERGE_FILE_RECORD_COUNT;
+import static io.trino.plugin.hive.parquet.ParquetPageSourceFactory.createDataSource;
 import static io.trino.plugin.iceberg.IcebergColumnHandle.TRINO_MERGE_PARTITION_DATA;
 import static io.trino.plugin.iceberg.IcebergColumnHandle.TRINO_MERGE_PARTITION_SPEC_ID;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_BAD_DATA;
@@ -151,11 +167,11 @@
 import static io.trino.plugin.iceberg.IcebergSessionProperties.getOrcTinyStripeThreshold;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.getParquetMaxReadBlockRowCount;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.getParquetMaxReadBlockSize;
+import static io.trino.plugin.iceberg.IcebergSessionProperties.getParquetSmallFileThreshold;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.isOrcBloomFiltersEnabled;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.isOrcNestedLazy;
-import static io.trino.plugin.iceberg.IcebergSessionProperties.isParquetOptimizedNestedReaderEnabled;
-import static io.trino.plugin.iceberg.IcebergSessionProperties.isParquetOptimizedReaderEnabled;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.isUseFileSizeFromMetadata;
+import static io.trino.plugin.iceberg.IcebergSessionProperties.useParquetBloomFilter;
 import static io.trino.plugin.iceberg.IcebergSplitManager.ICEBERG_DOMAIN_COMPACTION_THRESHOLD;
 import static io.trino.plugin.iceberg.IcebergUtil.deserializePartitionValue;
 import static io.trino.plugin.iceberg.IcebergUtil.getColumnHandle;
@@ -166,6 +182,7 @@
 import static io.trino.plugin.iceberg.delete.EqualityDeleteFilter.readEqualityDeletes;
 import static io.trino.plugin.iceberg.delete.PositionDeleteFilter.readPositionDeletes;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
 import static io.trino.spi.predicate.Utils.nativeValueToBlock;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -174,6 +191,8 @@
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static io.trino.spi.type.UuidType.UUID;
 import static io.trino.spi.type.VarcharType.VARCHAR;
+import static java.lang.Math.min;
+import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
@@ -194,6 +213,12 @@ public class IcebergPageSourceProvider
 {
     private static final String AVRO_FIELD_ID = "field-id";
 
+    // This is used whenever a query doesn't reference any data columns.
+    // We need to limit the number of rows per page in case there are projections
+    // in the query that can cause page sizes to explode. For example: SELECT rand() FROM some_table
+    // TODO (https://github.com/trinodb/trino/issues/16824) allow connector to return pages of arbitrary row count and handle this gracefully in engine
+    private static final int MAX_RLE_PAGE_SIZE = DEFAULT_MAX_PAGE_SIZE_IN_BYTES / SIZE_OF_LONG;
+
     private final TrinoFileSystemFactory fileSystemFactory;
     private final FileFormatDataSourceStats fileFormatDataSourceStats;
     private final OrcReaderOptions orcReaderOptions;
@@ -225,21 +250,54 @@ public ConnectorPageSource createPageSource(
             DynamicFilter dynamicFilter)
     {
         IcebergSplit split = (IcebergSplit) connectorSplit;
-        IcebergTableHandle table = (IcebergTableHandle) connectorTable;
-
         List<IcebergColumnHandle> icebergColumns = columns.stream()
                 .map(IcebergColumnHandle.class::cast)
                 .collect(toImmutableList());
-
-        Schema tableSchema = SchemaParser.fromJson(table.getTableSchemaJson());
-
-        Set<IcebergColumnHandle> deleteFilterRequiredColumns = requiredColumnsForDeletes(tableSchema, split.getDeletes());
-
-        PartitionSpec partitionSpec = PartitionSpecParser.fromJson(tableSchema, split.getPartitionSpecJson());
+        IcebergTableHandle tableHandle = (IcebergTableHandle) connectorTable;
+        Schema schema = SchemaParser.fromJson(tableHandle.getTableSchemaJson());
+        PartitionSpec partitionSpec = PartitionSpecParser.fromJson(schema, split.getPartitionSpecJson());
         org.apache.iceberg.types.Type[] partitionColumnTypes = partitionSpec.fields().stream()
-                .map(field -> field.transform().getResultType(tableSchema.findType(field.sourceId())))
+                .map(field -> field.transform().getResultType(schema.findType(field.sourceId())))
                 .toArray(org.apache.iceberg.types.Type[]::new);
-        PartitionData partitionData = PartitionData.fromJson(split.getPartitionDataJson(), partitionColumnTypes);
+
+        return createPageSource(
+                session,
+                icebergColumns,
+                schema,
+                partitionSpec,
+                PartitionData.fromJson(split.getPartitionDataJson(), partitionColumnTypes),
+                split.getDeletes(),
+                dynamicFilter,
+                tableHandle.getUnenforcedPredicate(),
+                split.getPath(),
+                split.getStart(),
+                split.getLength(),
+                split.getFileSize(),
+                split.getFileRecordCount(),
+                split.getPartitionDataJson(),
+                split.getFileFormat(),
+                tableHandle.getNameMappingJson().map(NameMappingParser::fromJson));
+    }
+
+    public ConnectorPageSource createPageSource(
+            ConnectorSession session,
+            List<IcebergColumnHandle> icebergColumns,
+            Schema tableSchema,
+            PartitionSpec partitionSpec,
+            PartitionData partitionData,
+            List<DeleteFile> deletes,
+            DynamicFilter dynamicFilter,
+            TupleDomain<IcebergColumnHandle> unenforcedPredicate,
+            String path,
+            long start,
+            long length,
+            long fileSize,
+            long fileRecordCount,
+            String partitionDataJson,
+            IcebergFileFormat fileFormat,
+            Optional<NameMapping> nameMapping)
+    {
+        Set<IcebergColumnHandle> deleteFilterRequiredColumns = requiredColumnsForDeletes(tableSchema, deletes);
         Map<Integer, Optional<String>> partitionKeys = getPartitionKeys(partitionData, partitionSpec);
 
         List<IcebergColumnHandle> requiredColumns = new ArrayList<>(icebergColumns);
@@ -264,9 +322,6 @@ else if (identity.getId() == MetadataColumns.FILE_PATH.fieldId()) {
                         else if (identity.getId() == ROW_POSITION.fieldId()) {
                             requiredColumns.add(new IcebergColumnHandle(identity, BIGINT, ImmutableList.of(), BIGINT, Optional.empty()));
                         }
-                        else if (identity.getId() == TRINO_MERGE_FILE_RECORD_COUNT) {
-                            requiredColumns.add(new IcebergColumnHandle(identity, BIGINT, ImmutableList.of(), BIGINT, Optional.empty()));
-                        }
                         else if (identity.getId() == TRINO_MERGE_PARTITION_SPEC_ID) {
                             requiredColumns.add(new IcebergColumnHandle(identity, INTEGER, ImmutableList.of(), INTEGER, Optional.empty()));
                         }
@@ -279,7 +334,7 @@ else if (identity.getId() == TRINO_MERGE_PARTITION_DATA) {
                     }
                 });
 
-        TupleDomain<IcebergColumnHandle> effectivePredicate = table.getUnenforcedPredicate()
+        TupleDomain<IcebergColumnHandle> effectivePredicate = unenforcedPredicate
                 .intersect(dynamicFilter.getCurrentPredicate().transformKeys(IcebergColumnHandle.class::cast))
                 .simplify(ICEBERG_DOMAIN_COMPACTION_THRESHOLD);
         if (effectivePredicate.isNone()) {
@@ -288,23 +343,37 @@ else if (identity.getId() == TRINO_MERGE_PARTITION_DATA) {
 
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
         TrinoInputFile inputfile = isUseFileSizeFromMetadata(session)
-                ? fileSystem.newInputFile(split.getPath(), split.getFileSize())
-                : fileSystem.newInputFile(split.getPath());
+                ? fileSystem.newInputFile(Location.of(path), fileSize)
+                : fileSystem.newInputFile(Location.of(path));
+
+        try {
+            if (effectivePredicate.isAll() &&
+                    start == 0 && length == inputfile.length() &&
+                    deletes.isEmpty() &&
+                    icebergColumns.stream().allMatch(column -> partitionKeys.containsKey(column.getId()))) {
+                return generatePages(
+                        fileRecordCount,
+                        icebergColumns,
+                        partitionKeys);
+            }
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
 
         ReaderPageSourceWithRowPositions readerPageSourceWithRowPositions = createDataPageSource(
                 session,
-                fileSystem,
                 inputfile,
-                split.getStart(),
-                split.getLength(),
-                split.getFileRecordCount(),
+                start,
+                length,
+                fileSize,
                 partitionSpec.specId(),
-                split.getPartitionDataJson(),
-                split.getFileFormat(),
-                SchemaParser.fromJson(table.getTableSchemaJson()),
+                partitionDataJson,
+                fileFormat,
+                tableSchema,
                 requiredColumns,
                 effectivePredicate,
-                table.getNameMappingJson().map(NameMappingParser::fromJson),
+                nameMapping,
                 partitionKeys);
         ReaderPageSource dataPageSource = readerPageSourceWithRowPositions.getReaderPageSource();
 
@@ -323,8 +392,9 @@ else if (identity.getId() == TRINO_MERGE_PARTITION_DATA) {
             List<DeleteFilter> deleteFilters = readDeletes(
                     session,
                     tableSchema,
-                    split.getPath(),
-                    split.getDeletes(),
+                    readColumns,
+                    path,
+                    deletes,
                     readerPageSourceWithRowPositions.getStartRowPosition(),
                     readerPageSourceWithRowPositions.getEndRowPosition());
             return deleteFilters.stream()
@@ -360,6 +430,7 @@ else if (deleteFile.content() == EQUALITY_DELETES) {
     private List<DeleteFilter> readDeletes(
             ConnectorSession session,
             Schema schema,
+            List<IcebergColumnHandle> readColumns,
             String dataFilePath,
             List<DeleteFile> deleteFiles,
             Optional<Long> startRowPosition,
@@ -370,6 +441,7 @@ private List<DeleteFilter> readDeletes(
         Slice targetPath = utf8Slice(dataFilePath);
         List<DeleteFilter> filters = new ArrayList<>();
         LongBitmapDataProvider deletedRows = new Roaring64Bitmap();
+        Map<Set<Integer>, EqualityDeleteSet> deletesSetByFieldIds = new HashMap<>();
 
         IcebergColumnHandle deleteFilePath = getColumnHandle(DELETE_FILE_PATH, typeManager);
         IcebergColumnHandle deleteFilePos = getColumnHandle(DELETE_FILE_POS, typeManager);
@@ -406,14 +478,17 @@ private List<DeleteFilter> readDeletes(
                 }
             }
             else if (delete.content() == EQUALITY_DELETES) {
-                List<Integer> fieldIds = delete.equalityFieldIds();
+                Set<Integer> fieldIds = ImmutableSet.copyOf(delete.equalityFieldIds());
                 verify(!fieldIds.isEmpty(), "equality field IDs are missing");
-                List<IcebergColumnHandle> columns = fieldIds.stream()
-                        .map(id -> getColumnHandle(schema.findField(id), typeManager))
+                Schema deleteSchema = TypeUtil.select(schema, fieldIds);
+                List<IcebergColumnHandle> columns = deleteSchema.columns().stream()
+                        .map(column -> getColumnHandle(column, typeManager))
                         .collect(toImmutableList());
 
+                EqualityDeleteSet equalityDeleteSet = deletesSetByFieldIds.computeIfAbsent(fieldIds, key -> new EqualityDeleteSet(deleteSchema, schemaFromHandles(readColumns)));
+
                 try (ConnectorPageSource pageSource = openDeletes(session, delete, columns, TupleDomain.all())) {
-                    filters.add(readEqualityDeletes(pageSource, columns, schema));
+                    readEqualityDeletes(pageSource, columns, equalityDeleteSet::add);
                 }
                 catch (IOException e) {
                     throw new UncheckedIOException(e);
@@ -428,6 +503,10 @@ else if (delete.content() == EQUALITY_DELETES) {
             filters.add(new PositionDeleteFilter(deletedRows));
         }
 
+        for (EqualityDeleteSet equalityDeleteSet : deletesSetByFieldIds.values()) {
+            filters.add(new EqualityDeleteFilter(equalityDeleteSet::contains));
+        }
+
         return filters;
     }
 
@@ -440,11 +519,10 @@ private ConnectorPageSource openDeletes(
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
         return createDataPageSource(
                 session,
-                fileSystem,
-                fileSystem.newInputFile(delete.path(), delete.fileSizeInBytes()),
+                fileSystem.newInputFile(Location.of(delete.path()), delete.fileSizeInBytes()),
                 0,
                 delete.fileSizeInBytes(),
-                delete.recordCount(),
+                delete.fileSizeInBytes(),
                 0,
                 "",
                 IcebergFileFormat.fromIceberg(delete.format()),
@@ -459,11 +537,10 @@ private ConnectorPageSource openDeletes(
 
     public ReaderPageSourceWithRowPositions createDataPageSource(
             ConnectorSession session,
-            TrinoFileSystem fileSystem,
             TrinoInputFile inputFile,
             long start,
             long length,
-            long fileRecordCount,
+            long fileSize,
             int partitionSpecId,
             String partitionData,
             IcebergFileFormat fileFormat,
@@ -479,7 +556,6 @@ public ReaderPageSourceWithRowPositions createDataPageSource(
                         inputFile,
                         start,
                         length,
-                        fileRecordCount,
                         partitionSpecId,
                         partitionData,
                         dataColumns,
@@ -502,26 +578,24 @@ public ReaderPageSourceWithRowPositions createDataPageSource(
                         inputFile,
                         start,
                         length,
-                        fileRecordCount,
+                        fileSize,
                         partitionSpecId,
                         partitionData,
                         dataColumns,
                         parquetReaderOptions
                                 .withMaxReadBlockSize(getParquetMaxReadBlockSize(session))
                                 .withMaxReadBlockRowCount(getParquetMaxReadBlockRowCount(session))
-                                .withBatchColumnReaders(isParquetOptimizedReaderEnabled(session))
-                                .withBatchNestedColumnReaders(isParquetOptimizedNestedReaderEnabled(session)),
+                                .withSmallFileThreshold(getParquetSmallFileThreshold(session))
+                                .withBloomFilter(useParquetBloomFilter(session)),
                         predicate,
                         fileFormatDataSourceStats,
                         nameMapping,
                         partitionKeys);
             case AVRO:
                 return createAvroPageSource(
-                        fileSystem,
                         inputFile,
                         start,
                         length,
-                        fileRecordCount,
                         partitionSpecId,
                         partitionData,
                         fileSchema,
@@ -532,11 +606,45 @@ public ReaderPageSourceWithRowPositions createDataPageSource(
         }
     }
 
+    private static ConnectorPageSource generatePages(
+            long totalRowCount,
+            List<IcebergColumnHandle> icebergColumns,
+            Map<Integer, Optional<String>> partitionKeys)
+    {
+        int maxPageSize = MAX_RLE_PAGE_SIZE;
+        Block[] pageBlocks = new Block[icebergColumns.size()];
+        for (int i = 0; i < icebergColumns.size(); i++) {
+            IcebergColumnHandle column = icebergColumns.get(i);
+            Type trinoType = column.getType();
+            Object partitionValue = deserializePartitionValue(trinoType, partitionKeys.get(column.getId()).orElse(null), column.getName());
+            pageBlocks[i] = RunLengthEncodedBlock.create(nativeValueToBlock(trinoType, partitionValue), maxPageSize);
+        }
+        Page maxPage = new Page(maxPageSize, pageBlocks);
+
+        return new FixedPageSource(
+                new AbstractIterator<>()
+                {
+                    private long rowIndex;
+
+                    @Override
+                    protected Page computeNext()
+                    {
+                        if (rowIndex == totalRowCount) {
+                            return endOfData();
+                        }
+                        int pageSize = toIntExact(min(maxPageSize, totalRowCount - rowIndex));
+                        Page page = maxPage.getRegion(0, pageSize);
+                        rowIndex += pageSize;
+                        return page;
+                    }
+                },
+                maxPage.getRetainedSizeInBytes());
+    }
+
     private static ReaderPageSourceWithRowPositions createOrcPageSource(
             TrinoInputFile inputFile,
             long start,
             long length,
-            long fileRecordCount,
             int partitionSpecId,
             String partitionData,
             List<IcebergColumnHandle> columns,
@@ -568,21 +676,21 @@ private static ReaderPageSourceWithRowPositions createOrcPageSource(
             Map<IcebergColumnHandle, Domain> effectivePredicateDomains = effectivePredicate.getDomains()
                     .orElseThrow(() -> new IllegalArgumentException("Effective predicate is none"));
 
-            Optional<ReaderColumns> columnProjections = projectColumns(columns);
+            Optional<ReaderColumns> baseColumnProjections = projectBaseColumns(columns);
             Map<Integer, List<List<Integer>>> projectionsByFieldId = columns.stream()
                     .collect(groupingBy(
                             column -> column.getBaseColumnIdentity().getId(),
                             mapping(IcebergColumnHandle::getPath, toUnmodifiableList())));
 
-            List<IcebergColumnHandle> readColumns = columnProjections
+            List<IcebergColumnHandle> readBaseColumns = baseColumnProjections
                     .map(readerColumns -> (List<IcebergColumnHandle>) readerColumns.get().stream().map(IcebergColumnHandle.class::cast).collect(toImmutableList()))
                     .orElse(columns);
-            List<OrcColumn> fileReadColumns = new ArrayList<>(readColumns.size());
-            List<Type> fileReadTypes = new ArrayList<>(readColumns.size());
-            List<ProjectedLayout> projectedLayouts = new ArrayList<>(readColumns.size());
-            List<ColumnAdaptation> columnAdaptations = new ArrayList<>(readColumns.size());
+            List<OrcColumn> fileReadColumns = new ArrayList<>(readBaseColumns.size());
+            List<Type> fileReadTypes = new ArrayList<>(readBaseColumns.size());
+            List<ProjectedLayout> projectedLayouts = new ArrayList<>(readBaseColumns.size());
+            List<ColumnAdaptation> columnAdaptations = new ArrayList<>(readBaseColumns.size());
 
-            for (IcebergColumnHandle column : readColumns) {
+            for (IcebergColumnHandle column : readBaseColumns) {
                 verify(column.isBaseColumn(), "Column projections must be based from a root column");
                 OrcColumn orcColumn = fileColumnsByIcebergId.get(column.getId());
 
@@ -596,7 +704,7 @@ else if (partitionKeys.containsKey(column.getId())) {
                             deserializePartitionValue(trinoType, partitionKeys.get(column.getId()).orElse(null), column.getName()))));
                 }
                 else if (column.isPathColumn()) {
-                    columnAdaptations.add(ColumnAdaptation.constantColumn(nativeValueToBlock(FILE_PATH.getType(), utf8Slice(inputFile.location()))));
+                    columnAdaptations.add(ColumnAdaptation.constantColumn(nativeValueToBlock(FILE_PATH.getType(), utf8Slice(inputFile.location().toString()))));
                 }
                 else if (column.isFileModifiedTimeColumn()) {
                     columnAdaptations.add(ColumnAdaptation.constantColumn(nativeValueToBlock(FILE_MODIFIED_TIME.getType(), packDateTimeWithZone(inputFile.lastModified().toEpochMilli(), UTC_KEY))));
@@ -608,9 +716,6 @@ else if (column.isUpdateRowIdColumn() || column.isMergeRowIdColumn()) {
                 else if (column.isRowPositionColumn()) {
                     columnAdaptations.add(ColumnAdaptation.positionColumn());
                 }
-                else if (column.getId() == TRINO_MERGE_FILE_RECORD_COUNT) {
-                    columnAdaptations.add(ColumnAdaptation.constantColumn(nativeValueToBlock(column.getType(), fileRecordCount)));
-                }
                 else if (column.getId() == TRINO_MERGE_PARTITION_SPEC_ID) {
                     columnAdaptations.add(ColumnAdaptation.constantColumn(nativeValueToBlock(column.getType(), (long) partitionSpecId)));
                 }
@@ -659,7 +764,7 @@ else if (orcColumn != null) {
                     memoryUsage,
                     INITIAL_BATCH_SIZE,
                     exception -> handleException(orcDataSourceId, exception),
-                    new IdBasedFieldMapperFactory(readColumns));
+                    new IdBasedFieldMapperFactory(readBaseColumns));
 
             return new ReaderPageSourceWithRowPositions(
                     new ReaderPageSource(
@@ -672,7 +777,7 @@ else if (orcColumn != null) {
                                     memoryUsage,
                                     stats,
                                     reader.getCompressionKind()),
-                            columnProjections),
+                            baseColumnProjections),
                     recordReader.getStartRowPosition(),
                     recordReader.getEndRowPosition());
         }
@@ -878,7 +983,7 @@ private static ReaderPageSourceWithRowPositions createParquetPageSource(
             TrinoInputFile inputFile,
             long start,
             long length,
-            long fileRecordCount,
+            long fileSize,
             int partitionSpecId,
             String partitionData,
             List<IcebergColumnHandle> regularColumns,
@@ -892,7 +997,7 @@ private static ReaderPageSourceWithRowPositions createParquetPageSource(
 
         ParquetDataSource dataSource = null;
         try {
-            dataSource = new TrinoParquetDataSource(inputFile, options, fileFormatDataSourceStats);
+            dataSource = createDataSource(inputFile, OptionalLong.of(fileSize), options, memoryContext, fileFormatDataSourceStats);
             ParquetMetadata parquetMetadata = MetadataReader.readFooter(dataSource, Optional.empty());
             FileMetaData fileMetaData = parquetMetadata.getFileMetaData();
             MessageType fileSchema = fileMetaData.getSchema();
@@ -902,20 +1007,18 @@ private static ReaderPageSourceWithRowPositions createParquetPageSource(
             }
 
             // Mapping from Iceberg field ID to Parquet fields.
-            Map<Integer, org.apache.parquet.schema.Type> parquetIdToField = fileSchema.getFields().stream()
-                    .filter(field -> field.getId() != null)
-                    .collect(toImmutableMap(field -> field.getId().intValue(), Function.identity()));
+            Map<Integer, org.apache.parquet.schema.Type> parquetIdToField = createParquetIdToFieldMapping(fileSchema);
 
-            Optional<ReaderColumns> columnProjections = projectColumns(regularColumns);
-            List<IcebergColumnHandle> readColumns = columnProjections
+            Optional<ReaderColumns> baseColumnProjections = projectBaseColumns(regularColumns);
+            List<IcebergColumnHandle> readBaseColumns = baseColumnProjections
                     .map(readerColumns -> (List<IcebergColumnHandle>) readerColumns.get().stream().map(IcebergColumnHandle.class::cast).collect(toImmutableList()))
                     .orElse(regularColumns);
 
-            List<org.apache.parquet.schema.Type> parquetFields = readColumns.stream()
+            List<org.apache.parquet.schema.Type> parquetFields = readBaseColumns.stream()
                     .map(column -> parquetIdToField.get(column.getId()))
                     .collect(toList());
 
-            MessageType requestedSchema = new MessageType(fileSchema.getName(), parquetFields.stream().filter(Objects::nonNull).collect(toImmutableList()));
+            MessageType requestedSchema = getMessageType(regularColumns, fileSchema.getName(), parquetIdToField);
             Map<List<String>, ColumnDescriptor> descriptorsByPath = getDescriptors(fileSchema, requestedSchema);
             TupleDomain<ColumnDescriptor> parquetTupleDomain = getParquetTupleDomain(descriptorsByPath, effectivePredicate);
             TupleDomainParquetPredicate parquetPredicate = buildPredicate(requestedSchema, parquetTupleDomain, descriptorsByPath, UTC);
@@ -927,8 +1030,10 @@ private static ReaderPageSourceWithRowPositions createParquetPageSource(
             List<BlockMetaData> blocks = new ArrayList<>();
             for (BlockMetaData block : parquetMetadata.getBlocks()) {
                 long firstDataPage = block.getColumns().get(0).getFirstDataPageOffset();
+                Optional<BloomFilterStore> bloomFilterStore = getBloomFilterStore(dataSource, block, parquetTupleDomain, options);
+
                 if (start <= firstDataPage && firstDataPage < start + length &&
-                        predicateMatches(parquetPredicate, block, dataSource, descriptorsByPath, parquetTupleDomain, Optional.empty(), Optional.empty(), UTC, ICEBERG_DOMAIN_COMPACTION_THRESHOLD)) {
+                        predicateMatches(parquetPredicate, block, dataSource, descriptorsByPath, parquetTupleDomain, Optional.empty(), bloomFilterStore, UTC, ICEBERG_DOMAIN_COMPACTION_THRESHOLD)) {
                     blocks.add(block);
                     blockStarts.add(nextStart);
                     if (startRowPosition.isEmpty()) {
@@ -945,8 +1050,8 @@ private static ReaderPageSourceWithRowPositions createParquetPageSource(
             int parquetSourceChannel = 0;
 
             ImmutableList.Builder<Field> parquetColumnFieldsBuilder = ImmutableList.builder();
-            for (int columnIndex = 0; columnIndex < readColumns.size(); columnIndex++) {
-                IcebergColumnHandle column = readColumns.get(columnIndex);
+            for (int columnIndex = 0; columnIndex < readBaseColumns.size(); columnIndex++) {
+                IcebergColumnHandle column = readBaseColumns.get(columnIndex);
                 if (column.isIsDeletedColumn()) {
                     pageSourceBuilder.addConstantColumn(nativeValueToBlock(BOOLEAN, false));
                 }
@@ -957,7 +1062,7 @@ else if (partitionKeys.containsKey(column.getId())) {
                             deserializePartitionValue(trinoType, partitionKeys.get(column.getId()).orElse(null), column.getName())));
                 }
                 else if (column.isPathColumn()) {
-                    pageSourceBuilder.addConstantColumn(nativeValueToBlock(FILE_PATH.getType(), utf8Slice(inputFile.location())));
+                    pageSourceBuilder.addConstantColumn(nativeValueToBlock(FILE_PATH.getType(), utf8Slice(inputFile.location().toString())));
                 }
                 else if (column.isFileModifiedTimeColumn()) {
                     pageSourceBuilder.addConstantColumn(nativeValueToBlock(FILE_MODIFIED_TIME.getType(), packDateTimeWithZone(inputFile.lastModified().toEpochMilli(), UTC_KEY)));
@@ -969,9 +1074,6 @@ else if (column.isUpdateRowIdColumn() || column.isMergeRowIdColumn()) {
                 else if (column.isRowPositionColumn()) {
                     pageSourceBuilder.addRowIndexColumn();
                 }
-                else if (column.getId() == TRINO_MERGE_FILE_RECORD_COUNT) {
-                    pageSourceBuilder.addConstantColumn(nativeValueToBlock(column.getType(), fileRecordCount));
-                }
                 else if (column.getId() == TRINO_MERGE_PARTITION_SPEC_ID) {
                     pageSourceBuilder.addConstantColumn(nativeValueToBlock(column.getType(), (long) partitionSpecId));
                 }
@@ -1012,7 +1114,7 @@ else if (column.getId() == TRINO_MERGE_PARTITION_DATA) {
             return new ReaderPageSourceWithRowPositions(
                     new ReaderPageSource(
                             pageSourceBuilder.build(parquetReader),
-                            columnProjections),
+                            baseColumnProjections),
                     startRowPosition,
                     endRowPosition);
         }
@@ -1038,12 +1140,49 @@ else if (column.getId() == TRINO_MERGE_PARTITION_DATA) {
         }
     }
 
+    private static Map<Integer, org.apache.parquet.schema.Type> createParquetIdToFieldMapping(MessageType fileSchema)
+    {
+        ImmutableMap.Builder<Integer, org.apache.parquet.schema.Type> builder = ImmutableMap.builder();
+        addParquetIdToFieldMapping(fileSchema, builder);
+        return builder.buildOrThrow();
+    }
+
+    private static void addParquetIdToFieldMapping(org.apache.parquet.schema.Type type, ImmutableMap.Builder<Integer, org.apache.parquet.schema.Type> builder)
+    {
+        if (type.getId() != null) {
+            builder.put(type.getId().intValue(), type);
+        }
+        if (type instanceof PrimitiveType) {
+            // Nothing else to do
+        }
+        else if (type instanceof GroupType groupType) {
+            for (org.apache.parquet.schema.Type field : groupType.getFields()) {
+                addParquetIdToFieldMapping(field, builder);
+            }
+        }
+        else {
+            throw new IllegalStateException("Unsupported field type: " + type);
+        }
+    }
+
+    private static MessageType getMessageType(List<IcebergColumnHandle> regularColumns, String fileSchemaName, Map<Integer, org.apache.parquet.schema.Type> parquetIdToField)
+    {
+        return projectSufficientColumns(regularColumns)
+                .map(readerColumns -> readerColumns.get().stream().map(IcebergColumnHandle.class::cast).collect(toUnmodifiableList()))
+                .orElse(regularColumns)
+                .stream()
+                .map(column -> getColumnType(column, parquetIdToField))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .map(type -> new MessageType(fileSchemaName, type))
+                .reduce(MessageType::union)
+                .orElse(new MessageType(fileSchemaName, ImmutableList.of()));
+    }
+
     private static ReaderPageSourceWithRowPositions createAvroPageSource(
-            TrinoFileSystem fileSystem,
             TrinoInputFile inputFile,
             long start,
             long length,
-            long fileRecordCount,
             int partitionSpecId,
             String partitionData,
             Schema fileSchema,
@@ -1053,17 +1192,16 @@ private static ReaderPageSourceWithRowPositions createAvroPageSource(
         ConstantPopulatingPageSource.Builder constantPopulatingPageSourceBuilder = ConstantPopulatingPageSource.builder();
         int avroSourceChannel = 0;
 
-        Optional<ReaderColumns> columnProjections = projectColumns(columns);
+        Optional<ReaderColumns> baseColumnProjections = projectBaseColumns(columns);
 
-        List<IcebergColumnHandle> readColumns = columnProjections
+        List<IcebergColumnHandle> readBaseColumns = baseColumnProjections
                 .map(readerColumns -> (List<IcebergColumnHandle>) readerColumns.get().stream().map(IcebergColumnHandle.class::cast).collect(toImmutableList()))
                 .orElse(columns);
 
-        InputFile file;
+        InputFile file = new ForwardingInputFile(inputFile);
         OptionalLong fileModifiedTime = OptionalLong.empty();
         try {
-            file = new ForwardingFileIo(fileSystem).newInputFile(inputFile.location(), inputFile.length());
-            if (readColumns.stream().anyMatch(IcebergColumnHandle::isFileModifiedTimeColumn)) {
+            if (readBaseColumns.stream().anyMatch(IcebergColumnHandle::isFileModifiedTimeColumn)) {
                 fileModifiedTime = OptionalLong.of(inputFile.lastModified().toEpochMilli());
             }
         }
@@ -1087,7 +1225,7 @@ private static ReaderPageSourceWithRowPositions createAvroPageSource(
             ImmutableList.Builder<Type> columnTypes = ImmutableList.builder();
             ImmutableList.Builder<Boolean> rowIndexChannels = ImmutableList.builder();
 
-            for (IcebergColumnHandle column : readColumns) {
+            for (IcebergColumnHandle column : readBaseColumns) {
                 verify(column.isBaseColumn(), "Column projections must be based from a root column");
                 org.apache.avro.Schema.Field field = fileColumnsByIcebergId.get(column.getId());
 
@@ -1105,9 +1243,6 @@ else if (column.isRowPositionColumn()) {
                     constantPopulatingPageSourceBuilder.addDelegateColumn(avroSourceChannel);
                     avroSourceChannel++;
                 }
-                else if (column.getId() == TRINO_MERGE_FILE_RECORD_COUNT) {
-                    constantPopulatingPageSourceBuilder.addConstantColumn(nativeValueToBlock(column.getType(), fileRecordCount));
-                }
                 else if (column.getId() == TRINO_MERGE_PARTITION_SPEC_ID) {
                     constantPopulatingPageSourceBuilder.addConstantColumn(nativeValueToBlock(column.getType(), (long) partitionSpecId));
                 }
@@ -1138,7 +1273,7 @@ else if (field == null) {
                                     columnTypes.build(),
                                     rowIndexChannels.build(),
                                     newSimpleAggregatedMemoryContext())),
-                            columnProjections),
+                            baseColumnProjections),
                     Optional.empty(),
                     Optional.empty());
         }
@@ -1246,7 +1381,7 @@ public ProjectedLayout getFieldLayout(OrcColumn orcColumn)
     /**
      * Creates a mapping between the input {@code columns} and base columns if required.
      */
-    public static Optional<ReaderColumns> projectColumns(List<IcebergColumnHandle> columns)
+    public static Optional<ReaderColumns> projectBaseColumns(List<IcebergColumnHandle> columns)
     {
         requireNonNull(columns, "columns is null");
 
@@ -1278,6 +1413,93 @@ public static Optional<ReaderColumns> projectColumns(List<IcebergColumnHandle> c
         return Optional.of(new ReaderColumns(projectedColumns.build(), outputColumnMapping.build()));
     }
 
+    /**
+     * Creates a set of sufficient columns for the input projected columns and prepares a mapping between the two.
+     * For example, if input {@param columns} include columns "a.b" and "a.b.c", then they will be projected
+     * from a single column "a.b".
+     */
+    private static Optional<ReaderColumns> projectSufficientColumns(List<IcebergColumnHandle> columns)
+    {
+        requireNonNull(columns, "columns is null");
+
+        if (columns.stream().allMatch(IcebergColumnHandle::isBaseColumn)) {
+            return Optional.empty();
+        }
+
+        ImmutableBiMap.Builder<DereferenceChain, IcebergColumnHandle> dereferenceChainsBuilder = ImmutableBiMap.builder();
+
+        for (IcebergColumnHandle column : columns) {
+            DereferenceChain dereferenceChain = new DereferenceChain(column.getBaseColumnIdentity(), column.getPath());
+            dereferenceChainsBuilder.put(dereferenceChain, column);
+        }
+
+        BiMap<DereferenceChain, IcebergColumnHandle> dereferenceChains = dereferenceChainsBuilder.build();
+
+        List<ColumnHandle> sufficientColumns = new ArrayList<>();
+        ImmutableList.Builder<Integer> outputColumnMapping = ImmutableList.builder();
+
+        Map<DereferenceChain, Integer> pickedColumns = new HashMap<>();
+
+        // Pick a covering column for every column
+        for (IcebergColumnHandle columnHandle : columns) {
+            DereferenceChain dereferenceChain = dereferenceChains.inverse().get(columnHandle);
+            DereferenceChain chosenColumn = null;
+
+            // Shortest existing prefix is chosen as the input.
+            for (DereferenceChain prefix : dereferenceChain.orderedPrefixes()) {
+                if (dereferenceChains.containsKey(prefix)) {
+                    chosenColumn = prefix;
+                    break;
+                }
+            }
+
+            checkState(chosenColumn != null, "chosenColumn is null");
+            int inputBlockIndex;
+
+            if (pickedColumns.containsKey(chosenColumn)) {
+                // Use already picked column
+                inputBlockIndex = pickedColumns.get(chosenColumn);
+            }
+            else {
+                // Add a new column for the reader
+                sufficientColumns.add(dereferenceChains.get(chosenColumn));
+                pickedColumns.put(chosenColumn, sufficientColumns.size() - 1);
+                inputBlockIndex = sufficientColumns.size() - 1;
+            }
+
+            outputColumnMapping.add(inputBlockIndex);
+        }
+
+        return Optional.of(new ReaderColumns(sufficientColumns, outputColumnMapping.build()));
+    }
+
+    private static Optional<org.apache.parquet.schema.Type> getColumnType(IcebergColumnHandle column, Map<Integer, org.apache.parquet.schema.Type> parquetIdToField)
+    {
+        Optional<org.apache.parquet.schema.Type> baseColumnType = Optional.ofNullable(parquetIdToField.get(column.getBaseColumn().getId()));
+        if (baseColumnType.isEmpty() || column.getPath().isEmpty()) {
+            return baseColumnType;
+        }
+        GroupType baseType = baseColumnType.get().asGroupType();
+
+        List<org.apache.parquet.schema.Type> subfieldTypes = column.getPath().stream()
+                .filter(parquetIdToField::containsKey)
+                .map(parquetIdToField::get)
+                .collect(toImmutableList());
+
+        // if there is a mismatch between parquet schema and the Iceberg schema the column cannot be dereferenced
+        if (subfieldTypes.isEmpty()) {
+            return Optional.empty();
+        }
+
+        // Construct a stripped version of the original column type containing only the selected field and the hierarchy of its parents
+        org.apache.parquet.schema.Type type = subfieldTypes.get(subfieldTypes.size() - 1);
+        for (int i = subfieldTypes.size() - 2; i >= 0; --i) {
+            GroupType groupType = subfieldTypes.get(i).asGroupType();
+            type = new GroupType(groupType.getRepetition(), groupType.getName(), ImmutableList.of(type));
+        }
+        return Optional.of(new GroupType(baseType.getRepetition(), baseType.getName(), ImmutableList.of(type)));
+    }
+
     private static TupleDomain<ColumnDescriptor> getParquetTupleDomain(Map<List<String>, ColumnDescriptor> descriptorsByPath, TupleDomain<IcebergColumnHandle> effectivePredicate)
     {
         if (effectivePredicate.isNone()) {
@@ -1351,4 +1573,80 @@ public Optional<Long> getEndRowPosition()
             return endRowPosition;
         }
     }
+
+    private static class DereferenceChain
+    {
+        private final ColumnIdentity baseColumnIdentity;
+        private final List<Integer> path;
+
+        public DereferenceChain(ColumnIdentity baseColumnIdentity, List<Integer> path)
+        {
+            this.baseColumnIdentity = requireNonNull(baseColumnIdentity, "baseColumnIdentity is null");
+            this.path = ImmutableList.copyOf(requireNonNull(path, "path is null"));
+        }
+
+        /**
+         * Get prefixes of this Dereference chain in increasing order of lengths.
+         */
+        public Iterable<DereferenceChain> orderedPrefixes()
+        {
+            return () -> new AbstractIterator<>()
+            {
+                private int prefixLength;
+
+                @Override
+                public DereferenceChain computeNext()
+                {
+                    if (prefixLength > path.size()) {
+                        return endOfData();
+                    }
+                    return new DereferenceChain(baseColumnIdentity, path.subList(0, prefixLength++));
+                }
+            };
+        }
+
+        @Override
+        public boolean equals(Object o)
+        {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            DereferenceChain that = (DereferenceChain) o;
+            return Objects.equals(baseColumnIdentity, that.baseColumnIdentity) &&
+                    Objects.equals(path, that.path);
+        }
+
+        @Override
+        public int hashCode()
+        {
+            return Objects.hash(baseColumnIdentity, path);
+        }
+    }
+
+    @NotThreadSafe
+    private static class EqualityDeleteSet
+    {
+        private final StructLikeSet deleteSet;
+        private final StructProjection projection;
+
+        public EqualityDeleteSet(Schema deleteSchema, Schema dataSchema)
+        {
+            this.deleteSet = StructLikeSet.create(deleteSchema.asStruct());
+            this.projection = StructProjection.create(dataSchema, deleteSchema);
+        }
+
+        public void add(StructLike row)
+        {
+            deleteSet.add(row);
+        }
+
+        public boolean contains(StructLike row)
+        {
+            return deleteSet.contains(projection.wrap(row));
+        }
+    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergParquetColumnIOConverter.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergParquetColumnIOConverter.java
index fb73dbbd5590..e4b8356a5dfb 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergParquetColumnIOConverter.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergParquetColumnIOConverter.java
@@ -35,8 +35,6 @@
 import static io.trino.parquet.ParquetTypeUtils.getMapKeyValueColumn;
 import static io.trino.parquet.ParquetTypeUtils.lookupColumnById;
 import static java.util.Objects.requireNonNull;
-import static org.apache.parquet.io.ColumnIOUtil.columnDefinitionLevel;
-import static org.apache.parquet.io.ColumnIOUtil.columnRepetitionLevel;
 import static org.apache.parquet.schema.Type.Repetition.OPTIONAL;
 
 public final class IcebergParquetColumnIOConverter
@@ -50,8 +48,8 @@ public static Optional<Field> constructField(FieldContext context, ColumnIO colu
             return Optional.empty();
         }
         boolean required = columnIO.getType().getRepetition() != OPTIONAL;
-        int repetitionLevel = columnRepetitionLevel(columnIO);
-        int definitionLevel = columnDefinitionLevel(columnIO);
+        int repetitionLevel = columnIO.getRepetitionLevel();
+        int definitionLevel = columnIO.getDefinitionLevel();
         Type type = context.getType();
         if (type instanceof RowType rowType) {
             List<ColumnIdentity> subColumns = context.getColumnIdentity().getChildren();
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergParquetFileWriter.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergParquetFileWriter.java
index 7dea195a20d6..4530ed950dc0 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergParquetFileWriter.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergParquetFileWriter.java
@@ -13,16 +13,18 @@
  */
 package io.trino.plugin.iceberg;
 
-import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoOutputFile;
 import io.trino.parquet.writer.ParquetWriterOptions;
 import io.trino.plugin.hive.parquet.ParquetFileWriter;
-import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
+import io.trino.spi.Page;
+import io.trino.spi.TrinoException;
 import io.trino.spi.type.Type;
 import org.apache.iceberg.Metrics;
 import org.apache.iceberg.MetricsConfig;
-import org.apache.iceberg.io.InputFile;
 import org.apache.parquet.format.CompressionCodec;
+import org.apache.parquet.format.converter.ParquetMetadataConverter;
+import org.apache.parquet.hadoop.metadata.ParquetMetadata;
 import org.apache.parquet.schema.MessageType;
 
 import java.io.Closeable;
@@ -30,17 +32,19 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Stream;
 
+import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static org.apache.iceberg.parquet.ParquetUtil.fileMetrics;
+import static org.apache.iceberg.parquet.ParquetUtil.footerMetrics;
 
-public class IcebergParquetFileWriter
-        extends ParquetFileWriter
+public final class IcebergParquetFileWriter
         implements IcebergFileWriter
 {
     private final MetricsConfig metricsConfig;
-    private final String outputPath;
-    private final TrinoFileSystem fileSystem;
+    private final ParquetFileWriter parquetFileWriter;
+    private final Location location;
 
     public IcebergParquetFileWriter(
             MetricsConfig metricsConfig,
@@ -53,12 +57,11 @@ public IcebergParquetFileWriter(
             ParquetWriterOptions parquetWriterOptions,
             int[] fileInputColumnIndexes,
             CompressionCodec compressionCodec,
-            String trinoVersion,
-            String outputPath,
-            TrinoFileSystem fileSystem)
+            String trinoVersion)
             throws IOException
     {
-        super(outputFile,
+        this.parquetFileWriter = new ParquetFileWriter(
+                outputFile,
                 rollbackAction,
                 fileColumnTypes,
                 fileColumnNames,
@@ -68,18 +71,58 @@ public IcebergParquetFileWriter(
                 fileInputColumnIndexes,
                 compressionCodec,
                 trinoVersion,
-                false,
                 Optional.empty(),
                 Optional.empty());
+        this.location = outputFile.location();
         this.metricsConfig = requireNonNull(metricsConfig, "metricsConfig is null");
-        this.outputPath = requireNonNull(outputPath, "outputPath is null");
-        this.fileSystem = requireNonNull(fileSystem, "fileSystem is null");
     }
 
     @Override
     public Metrics getMetrics()
     {
-        InputFile inputFile = new ForwardingFileIo(fileSystem).newInputFile(outputPath);
-        return fileMetrics(inputFile, metricsConfig);
+        ParquetMetadata parquetMetadata;
+        try {
+            parquetMetadata = new ParquetMetadataConverter().fromParquetMetadata(parquetFileWriter.getFileMetadata());
+        }
+        catch (IOException e) {
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Error creating metadata for Parquet file %s", location), e);
+        }
+        return footerMetrics(parquetMetadata, Stream.empty(), metricsConfig);
+    }
+
+    @Override
+    public long getWrittenBytes()
+    {
+        return parquetFileWriter.getWrittenBytes();
+    }
+
+    @Override
+    public long getMemoryUsage()
+    {
+        return parquetFileWriter.getMemoryUsage();
+    }
+
+    @Override
+    public void appendRows(Page dataPage)
+    {
+        parquetFileWriter.appendRows(dataPage);
+    }
+
+    @Override
+    public Closeable commit()
+    {
+        return parquetFileWriter.commit();
+    }
+
+    @Override
+    public void rollback()
+    {
+        parquetFileWriter.rollback();
+    }
+
+    @Override
+    public long getValidationCpuNanos()
+    {
+        return parquetFileWriter.getValidationCpuNanos();
     }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSecurityConfig.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSecurityConfig.java
index a327a25b9826..a8cab0c847b2 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSecurityConfig.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSecurityConfig.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.iceberg;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class IcebergSecurityConfig
 {
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSessionProperties.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSessionProperties.java
index 498acb0c9afc..b79dbd43596f 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSessionProperties.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSessionProperties.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.orc.OrcWriteValidation.OrcWriteValidationMode;
@@ -27,8 +28,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ThreadLocalRandom;
@@ -36,6 +35,12 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.plugin.base.session.PropertyMetadataUtil.dataSizeProperty;
 import static io.trino.plugin.base.session.PropertyMetadataUtil.durationProperty;
+import static io.trino.plugin.base.session.PropertyMetadataUtil.validateMaxDataSize;
+import static io.trino.plugin.base.session.PropertyMetadataUtil.validateMinDataSize;
+import static io.trino.plugin.hive.parquet.ParquetReaderConfig.PARQUET_READER_MAX_SMALL_FILE_THRESHOLD;
+import static io.trino.plugin.hive.parquet.ParquetWriterConfig.PARQUET_WRITER_MAX_BLOCK_SIZE;
+import static io.trino.plugin.hive.parquet.ParquetWriterConfig.PARQUET_WRITER_MAX_PAGE_SIZE;
+import static io.trino.plugin.hive.parquet.ParquetWriterConfig.PARQUET_WRITER_MIN_PAGE_SIZE;
 import static io.trino.plugin.iceberg.IcebergConfig.COLLECT_EXTENDED_STATISTICS_ON_WRITE_DESCRIPTION;
 import static io.trino.plugin.iceberg.IcebergConfig.EXTENDED_STATISTICS_DESCRIPTION;
 import static io.trino.spi.StandardErrorCode.INVALID_SESSION_PROPERTY;
@@ -49,6 +54,7 @@
 public final class IcebergSessionProperties
         implements SessionPropertiesProvider
 {
+    public static final String SPLIT_SIZE = "experimental_split_size";
     private static final String COMPRESSION_CODEC = "compression_codec";
     private static final String USE_FILE_SIZE_FROM_METADATA = "use_file_size_from_metadata";
     private static final String ORC_BLOOM_FILTERS_ENABLED = "orc_bloom_filters_enabled";
@@ -67,9 +73,9 @@ public final class IcebergSessionProperties
     private static final String ORC_WRITER_MAX_STRIPE_ROWS = "orc_writer_max_stripe_rows";
     private static final String ORC_WRITER_MAX_DICTIONARY_MEMORY = "orc_writer_max_dictionary_memory";
     private static final String PARQUET_MAX_READ_BLOCK_SIZE = "parquet_max_read_block_size";
+    private static final String PARQUET_USE_BLOOM_FILTER = "parquet_use_bloom_filter";
     private static final String PARQUET_MAX_READ_BLOCK_ROW_COUNT = "parquet_max_read_block_row_count";
-    private static final String PARQUET_OPTIMIZED_READER_ENABLED = "parquet_optimized_reader_enabled";
-    private static final String PARQUET_OPTIMIZED_NESTED_READER_ENABLED = "parquet_optimized_nested_reader_enabled";
+    private static final String PARQUET_SMALL_FILE_THRESHOLD = "parquet_small_file_threshold";
     private static final String PARQUET_WRITER_BLOCK_SIZE = "parquet_writer_block_size";
     private static final String PARQUET_WRITER_PAGE_SIZE = "parquet_writer_page_size";
     private static final String PARQUET_WRITER_BATCH_SIZE = "parquet_writer_batch_size";
@@ -85,6 +91,7 @@ public final class IcebergSessionProperties
     public static final String REMOVE_ORPHAN_FILES_MIN_RETENTION = "remove_orphan_files_min_retention";
     private static final String MERGE_MANIFESTS_ON_WRITE = "merge_manifests_on_write";
     private static final String SORTED_WRITING_ENABLED = "sorted_writing_enabled";
+    private static final String QUERY_PARTITION_FILTER_REQUIRED = "query_partition_filter_required";
 
     private final List<PropertyMetadata<?>> sessionProperties;
 
@@ -97,6 +104,13 @@ public IcebergSessionProperties(
             ParquetWriterConfig parquetWriterConfig)
     {
         sessionProperties = ImmutableList.<PropertyMetadata<?>>builder()
+                .add(dataSizeProperty(
+                        SPLIT_SIZE,
+                        "Target split size",
+                        // Note: this is null by default & hidden, currently mainly for tests.
+                        // See https://github.com/trinodb/trino/issues/9018#issuecomment-1752929193 for further discussion.
+                        null,
+                        true))
                 .add(enumProperty(
                         COMPRESSION_CODEC,
                         "Compression codec to use when writing files",
@@ -197,6 +211,11 @@ public IcebergSessionProperties(
                         "Parquet: Maximum size of a block to read",
                         parquetReaderConfig.getMaxReadBlockSize(),
                         false))
+                .add(booleanProperty(
+                        PARQUET_USE_BLOOM_FILTER,
+                        "Use Parquet Bloom filters",
+                        parquetReaderConfig.isUseBloomFilter(),
+                        false))
                 .add(integerProperty(
                         PARQUET_MAX_READ_BLOCK_ROW_COUNT,
                         "Parquet: Maximum number of rows read in a batch",
@@ -209,25 +228,26 @@ public IcebergSessionProperties(
                             }
                         },
                         false))
-                .add(booleanProperty(
-                        PARQUET_OPTIMIZED_READER_ENABLED,
-                        "Use optimized Parquet reader",
-                        parquetReaderConfig.isOptimizedReaderEnabled(),
-                        false))
-                .add(booleanProperty(
-                        PARQUET_OPTIMIZED_NESTED_READER_ENABLED,
-                        "Use optimized Parquet reader for nested columns",
-                        parquetReaderConfig.isOptimizedNestedReaderEnabled(),
+                .add(dataSizeProperty(
+                        PARQUET_SMALL_FILE_THRESHOLD,
+                        "Parquet: Size below which a parquet file will be read entirely",
+                        parquetReaderConfig.getSmallFileThreshold(),
+                        value -> validateMaxDataSize(PARQUET_SMALL_FILE_THRESHOLD, value, DataSize.valueOf(PARQUET_READER_MAX_SMALL_FILE_THRESHOLD)),
                         false))
                 .add(dataSizeProperty(
                         PARQUET_WRITER_BLOCK_SIZE,
                         "Parquet: Writer block size",
                         parquetWriterConfig.getBlockSize(),
+                        value -> validateMaxDataSize(PARQUET_WRITER_BLOCK_SIZE, value, DataSize.valueOf(PARQUET_WRITER_MAX_BLOCK_SIZE)),
                         false))
                 .add(dataSizeProperty(
                         PARQUET_WRITER_PAGE_SIZE,
                         "Parquet: Writer page size",
                         parquetWriterConfig.getPageSize(),
+                        value -> {
+                            validateMinDataSize(PARQUET_WRITER_PAGE_SIZE, value, DataSize.valueOf(PARQUET_WRITER_MIN_PAGE_SIZE));
+                            validateMaxDataSize(PARQUET_WRITER_PAGE_SIZE, value, DataSize.valueOf(PARQUET_WRITER_MAX_PAGE_SIZE));
+                        },
                         false))
                 .add(integerProperty(
                         PARQUET_WRITER_BATCH_SIZE,
@@ -251,7 +271,7 @@ public IcebergSessionProperties(
                         false))
                 .add(booleanProperty(
                         PROJECTION_PUSHDOWN_ENABLED,
-                        "Read only required fields from a struct",
+                        "Read only required fields from a row type",
                         icebergConfig.isProjectionPushdownEnabled(),
                         false))
                 .add(dataSizeProperty(
@@ -296,6 +316,11 @@ public IcebergSessionProperties(
                         "Enable sorted writing to tables with a specified sort order",
                         icebergConfig.isSortedWritingEnabled(),
                         false))
+                .add(booleanProperty(
+                        QUERY_PARTITION_FILTER_REQUIRED,
+                        "Require filter on partition column",
+                        icebergConfig.isQueryPartitionFilterRequired(),
+                        false))
                 .build();
     }
 
@@ -387,6 +412,11 @@ public static DataSize getOrcWriterMaxDictionaryMemory(ConnectorSession session)
         return session.getProperty(ORC_WRITER_MAX_DICTIONARY_MEMORY, DataSize.class);
     }
 
+    public static Optional<DataSize> getSplitSize(ConnectorSession session)
+    {
+        return Optional.ofNullable(session.getProperty(SPLIT_SIZE, DataSize.class));
+    }
+
     public static HiveCompressionCodec getCompressionCodec(ConnectorSession session)
     {
         return session.getProperty(COMPRESSION_CODEC, HiveCompressionCodec.class);
@@ -407,14 +437,9 @@ public static int getParquetMaxReadBlockRowCount(ConnectorSession session)
         return session.getProperty(PARQUET_MAX_READ_BLOCK_ROW_COUNT, Integer.class);
     }
 
-    public static boolean isParquetOptimizedReaderEnabled(ConnectorSession session)
-    {
-        return session.getProperty(PARQUET_OPTIMIZED_READER_ENABLED, Boolean.class);
-    }
-
-    public static boolean isParquetOptimizedNestedReaderEnabled(ConnectorSession session)
+    public static DataSize getParquetSmallFileThreshold(ConnectorSession session)
     {
-        return session.getProperty(PARQUET_OPTIMIZED_NESTED_READER_ENABLED, Boolean.class);
+        return session.getProperty(PARQUET_SMALL_FILE_THRESHOLD, DataSize.class);
     }
 
     public static DataSize getParquetWriterPageSize(ConnectorSession session)
@@ -432,6 +457,11 @@ public static int getParquetWriterBatchSize(ConnectorSession session)
         return session.getProperty(PARQUET_WRITER_BATCH_SIZE, Integer.class);
     }
 
+    public static boolean useParquetBloomFilter(ConnectorSession session)
+    {
+        return session.getProperty(PARQUET_USE_BLOOM_FILTER, Boolean.class);
+    }
+
     public static Duration getDynamicFilteringWaitTimeout(ConnectorSession session)
     {
         return session.getProperty(DYNAMIC_FILTERING_WAIT_TIMEOUT, Duration.class);
@@ -491,4 +521,9 @@ public static boolean isSortedWritingEnabled(ConnectorSession session)
     {
         return session.getProperty(SORTED_WRITING_ENABLED, Boolean.class);
     }
+
+    public static boolean isQueryPartitionFilterRequired(ConnectorSession session)
+    {
+        return session.getProperty(QUERY_PARTITION_FILTER_REQUIRED, Boolean.class);
+    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSortingFileWriter.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSortingFileWriter.java
index 246234927bd1..99bc122095f0 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSortingFileWriter.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSortingFileWriter.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.iceberg;
 
 import io.airlift.units.DataSize;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.hive.SortingFileWriter;
 import io.trino.plugin.hive.orc.OrcFileWriterFactory;
@@ -26,7 +27,6 @@
 
 import java.io.Closeable;
 import java.util.List;
-import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
@@ -38,7 +38,7 @@ public class IcebergSortingFileWriter
 
     public IcebergSortingFileWriter(
             TrinoFileSystem fileSystem,
-            String tempFilePrefix,
+            Location tempFilePrefix,
             IcebergFileWriter outputWriter,
             DataSize maxMemory,
             int maxOpenTempFiles,
@@ -104,10 +104,4 @@ public long getValidationCpuNanos()
     {
         return sortingFileWriter.getValidationCpuNanos();
     }
-
-    @Override
-    public Optional<Runnable> getVerificationTask()
-    {
-        return sortingFileWriter.getVerificationTask();
-    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplit.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplit.java
index b0fde4a62aae..3bc609c03bce 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplit.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplit.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.iceberg;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.ImmutableList;
@@ -41,7 +42,6 @@ public class IcebergSplit
     private final long fileSize;
     private final long fileRecordCount;
     private final IcebergFileFormat fileFormat;
-    private final List<HostAddress> addresses;
     private final String partitionSpecJson;
     private final String partitionDataJson;
     private final List<DeleteFile> deletes;
@@ -55,7 +55,6 @@ public IcebergSplit(
             @JsonProperty("fileSize") long fileSize,
             @JsonProperty("fileRecordCount") long fileRecordCount,
             @JsonProperty("fileFormat") IcebergFileFormat fileFormat,
-            @JsonProperty("addresses") List<HostAddress> addresses,
             @JsonProperty("partitionSpecJson") String partitionSpecJson,
             @JsonProperty("partitionDataJson") String partitionDataJson,
             @JsonProperty("deletes") List<DeleteFile> deletes,
@@ -67,7 +66,6 @@ public IcebergSplit(
         this.fileSize = fileSize;
         this.fileRecordCount = fileRecordCount;
         this.fileFormat = requireNonNull(fileFormat, "fileFormat is null");
-        this.addresses = ImmutableList.copyOf(requireNonNull(addresses, "addresses is null"));
         this.partitionSpecJson = requireNonNull(partitionSpecJson, "partitionSpecJson is null");
         this.partitionDataJson = requireNonNull(partitionDataJson, "partitionDataJson is null");
         this.deletes = ImmutableList.copyOf(requireNonNull(deletes, "deletes is null"));
@@ -80,11 +78,11 @@ public boolean isRemotelyAccessible()
         return true;
     }
 
-    @JsonProperty
+    @JsonIgnore
     @Override
     public List<HostAddress> getAddresses()
     {
-        return addresses;
+        return ImmutableList.of();
     }
 
     @JsonProperty
@@ -163,7 +161,6 @@ public long getRetainedSizeInBytes()
     {
         return INSTANCE_SIZE
                 + estimatedSizeOf(path)
-                + estimatedSizeOf(addresses, HostAddress::getRetainedSizeInBytes)
                 + estimatedSizeOf(partitionSpecJson)
                 + estimatedSizeOf(partitionDataJson)
                 + estimatedSizeOf(deletes, DeleteFile::getRetainedSizeInBytes)
@@ -176,8 +173,7 @@ public String toString()
         ToStringHelper helper = toStringHelper(this)
                 .addValue(path)
                 .add("start", start)
-                .add("length", length)
-                .add("records", fileRecordCount);
+                .add("length", length);
         if (!deletes.isEmpty()) {
             helper.add("deleteFiles", deletes.size());
             helper.add("deleteRecords", deletes.stream()
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplitManager.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplitManager.java
index c39ac69a3f0c..5d7404644fcb 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplitManager.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplitManager.java
@@ -14,9 +14,12 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorSplitSource;
+import io.trino.plugin.iceberg.functions.tablechanges.TableChangesFunctionHandle;
+import io.trino.plugin.iceberg.functions.tablechanges.TableChangesSplitSource;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorSplitSource;
@@ -25,12 +28,12 @@
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.FixedSplitSource;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.type.TypeManager;
 import org.apache.iceberg.Table;
 import org.apache.iceberg.TableScan;
 
-import javax.inject.Inject;
-
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.getDynamicFilteringWaitTimeout;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.getMinimumAssignedSplitWeight;
 import static io.trino.spi.connector.FixedSplitSource.emptySplitSource;
@@ -44,13 +47,19 @@ public class IcebergSplitManager
     private final IcebergTransactionManager transactionManager;
     private final TypeManager typeManager;
     private final TrinoFileSystemFactory fileSystemFactory;
+    private final boolean asyncIcebergSplitProducer;
 
     @Inject
-    public IcebergSplitManager(IcebergTransactionManager transactionManager, TypeManager typeManager, TrinoFileSystemFactory fileSystemFactory)
+    public IcebergSplitManager(
+            IcebergTransactionManager transactionManager,
+            TypeManager typeManager,
+            TrinoFileSystemFactory fileSystemFactory,
+            @AsyncIcebergSplitProducer boolean asyncIcebergSplitProducer)
     {
         this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
+        this.asyncIcebergSplitProducer = asyncIcebergSplitProducer;
     }
 
     @Override
@@ -75,6 +84,9 @@ public ConnectorSplitSource getSplits(
 
         TableScan tableScan = icebergTable.newScan()
                 .useSnapshot(table.getSnapshotId().get());
+        if (!asyncIcebergSplitProducer) {
+            tableScan = tableScan.planWith(newDirectExecutorService());
+        }
         IcebergSplitSource splitSource = new IcebergSplitSource(
                 fileSystemFactory,
                 session,
@@ -90,4 +102,24 @@ public ConnectorSplitSource getSplits(
 
         return new ClassLoaderSafeConnectorSplitSource(splitSource, IcebergSplitManager.class.getClassLoader());
     }
+
+    @Override
+    public ConnectorSplitSource getSplits(
+            ConnectorTransactionHandle transaction,
+            ConnectorSession session,
+            ConnectorTableFunctionHandle function)
+    {
+        if (function instanceof TableChangesFunctionHandle functionHandle) {
+            Table icebergTable = transactionManager.get(transaction, session.getIdentity()).getIcebergTable(session, functionHandle.schemaTableName());
+
+            TableChangesSplitSource tableChangesSplitSource = new TableChangesSplitSource(
+                    icebergTable,
+                    icebergTable.newIncrementalChangelogScan()
+                            .fromSnapshotExclusive(functionHandle.startSnapshotId())
+                            .toSnapshot(functionHandle.endSnapshotId()));
+            return new ClassLoaderSafeConnectorSplitSource(tableChangesSplitSource, IcebergSplitManager.class.getClassLoader());
+        }
+
+        throw new IllegalStateException("Unknown table function: " + function);
+    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplitSource.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplitSource.java
index f80c0192d8ba..8d65fa52748e 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplitSource.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplitSource.java
@@ -17,10 +17,10 @@
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterators;
 import com.google.common.io.Closer;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.plugin.iceberg.delete.DeleteFile;
@@ -39,7 +39,9 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.predicate.ValueSet;
 import io.trino.spi.type.TypeManager;
+import jakarta.annotation.Nullable;
 import org.apache.iceberg.FileScanTask;
+import org.apache.iceberg.PartitionField;
 import org.apache.iceberg.PartitionSpecParser;
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.TableScan;
@@ -47,43 +49,45 @@
 import org.apache.iceberg.io.CloseableIterable;
 import org.apache.iceberg.io.CloseableIterator;
 import org.apache.iceberg.types.Type;
-import org.apache.iceberg.util.TableScanUtil;
-
-import javax.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.ByteBuffer;
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Suppliers.memoize;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Sets.intersection;
+import static com.google.common.math.LongMath.saturatedAdd;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.plugin.iceberg.ExpressionConverter.toIcebergExpression;
 import static io.trino.plugin.iceberg.IcebergColumnHandle.fileModifiedTimeColumnHandle;
 import static io.trino.plugin.iceberg.IcebergColumnHandle.pathColumnHandle;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_FILESYSTEM_ERROR;
 import static io.trino.plugin.iceberg.IcebergMetadataColumn.isMetadataColumnId;
+import static io.trino.plugin.iceberg.IcebergSessionProperties.getSplitSize;
 import static io.trino.plugin.iceberg.IcebergSplitManager.ICEBERG_DOMAIN_COMPACTION_THRESHOLD;
 import static io.trino.plugin.iceberg.IcebergTypes.convertIcebergValueToTrino;
-import static io.trino.plugin.iceberg.IcebergUtil.deserializePartitionValue;
 import static io.trino.plugin.iceberg.IcebergUtil.getColumnHandle;
 import static io.trino.plugin.iceberg.IcebergUtil.getPartitionKeys;
+import static io.trino.plugin.iceberg.IcebergUtil.getPartitionValues;
 import static io.trino.plugin.iceberg.IcebergUtil.primitiveFieldTypes;
 import static io.trino.plugin.iceberg.TypeConverter.toIcebergType;
 import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
+import static java.util.Collections.emptyIterator;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -108,16 +112,22 @@ public class IcebergSplitSource
     private final TypeManager typeManager;
     private final Closer closer = Closer.create();
     private final double minimumAssignedSplitWeight;
+    private final Set<Integer> projectedBaseColumns;
     private final TupleDomain<IcebergColumnHandle> dataColumnPredicate;
     private final Domain pathDomain;
     private final Domain fileModifiedTimeDomain;
+    private final OptionalLong limit;
 
-    private CloseableIterable<FileScanTask> fileScanTaskIterable;
-    private CloseableIterator<FileScanTask> fileScanTaskIterator;
     private TupleDomain<IcebergColumnHandle> pushedDownDynamicFilterPredicate;
+    private CloseableIterable<FileScanTask> fileScanIterable;
+    private long targetSplitSize;
+    private CloseableIterator<FileScanTask> fileScanIterator;
+    private Iterator<FileScanTask> fileTasksIterator = emptyIterator();
+    private boolean fileHasAnyDeletions;
 
     private final boolean recordScannedFiles;
     private final ImmutableSet.Builder<DataFileWithDeleteFiles> scannedFiles = ImmutableSet.builder();
+    private long outputRowsLowerBound;
 
     public IcebergSplitSource(
             TrinoFileSystemFactory fileSystemFactory,
@@ -145,8 +155,17 @@ public IcebergSplitSource(
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         this.recordScannedFiles = recordScannedFiles;
         this.minimumAssignedSplitWeight = minimumAssignedSplitWeight;
+        this.projectedBaseColumns = tableHandle.getProjectedColumns().stream()
+                .map(column -> column.getBaseColumnIdentity().getId())
+                .collect(toImmutableSet());
         this.dataColumnPredicate = tableHandle.getEnforcedPredicate().filter((column, domain) -> !isMetadataColumnId(column.getId()));
         this.pathDomain = getPathDomain(tableHandle.getEnforcedPredicate());
+        checkArgument(
+                tableHandle.getUnenforcedPredicate().isAll() || tableHandle.getLimit().isEmpty(),
+                "Cannot enforce LIMIT %s with unenforced predicate %s present",
+                tableHandle.getLimit(),
+                tableHandle.getUnenforcedPredicate());
+        this.limit = tableHandle.getLimit();
         this.fileModifiedTimeDomain = getFileModifiedTimePathDomain(tableHandle.getEnforcedPredicate());
     }
 
@@ -160,7 +179,7 @@ public CompletableFuture<ConnectorSplitBatch> getNextBatch(int maxSize)
                     .completeOnTimeout(EMPTY_BATCH, timeLeft, MILLISECONDS);
         }
 
-        if (fileScanTaskIterable == null) {
+        if (fileScanIterable == null) {
             // Used to avoid duplicating work if the Dynamic Filter was already pushed down to the Iceberg API
             boolean dynamicFilterIsComplete = dynamicFilter.isComplete();
             this.pushedDownDynamicFilterPredicate = dynamicFilter.getCurrentPredicate().transformKeys(IcebergColumnHandle.class::cast);
@@ -189,12 +208,12 @@ public CompletableFuture<ConnectorSplitBatch> getNextBatch(int maxSize)
             if (requiresColumnStats) {
                 scan = scan.includeColumnStats();
             }
-            this.fileScanTaskIterable = TableScanUtil.splitFiles(scan.planFiles(), tableScan.targetSplitSize());
-            closer.register(fileScanTaskIterable);
-            this.fileScanTaskIterator = fileScanTaskIterable.iterator();
-            closer.register(fileScanTaskIterator);
-            // TODO: Remove when NPE check has been released: https://github.com/trinodb/trino/issues/15372
-            isFinished();
+            this.fileScanIterable = closer.register(scan.planFiles());
+            this.targetSplitSize = getSplitSize(session)
+                    .map(DataSize::toBytes)
+                    .orElseGet(tableScan::targetSplitSize);
+            this.fileScanIterator = closer.register(fileScanIterable.iterator());
+            this.fileTasksIterator = emptyIterator();
         }
 
         TupleDomain<IcebergColumnHandle> dynamicFilterPredicate = dynamicFilter.getCurrentPredicate()
@@ -204,10 +223,22 @@ public CompletableFuture<ConnectorSplitBatch> getNextBatch(int maxSize)
             return completedFuture(NO_MORE_SPLITS_BATCH);
         }
 
-        Iterator<FileScanTask> fileScanTasks = Iterators.limit(fileScanTaskIterator, maxSize);
-        ImmutableList.Builder<ConnectorSplit> splits = ImmutableList.builder();
-        while (fileScanTasks.hasNext()) {
-            FileScanTask scanTask = fileScanTasks.next();
+        List<ConnectorSplit> splits = new ArrayList<>(maxSize);
+        while (splits.size() < maxSize && (fileTasksIterator.hasNext() || fileScanIterator.hasNext())) {
+            if (!fileTasksIterator.hasNext()) {
+                FileScanTask wholeFileTask = fileScanIterator.next();
+                if (wholeFileTask.deletes().isEmpty() && noDataColumnsProjected(wholeFileTask)) {
+                    fileTasksIterator = List.of(wholeFileTask).iterator();
+                }
+                else {
+                    fileTasksIterator = wholeFileTask.split(targetSplitSize).iterator();
+                }
+                fileHasAnyDeletions = false;
+                // In theory, .split() could produce empty iterator, so let's evaluate the outer loop condition again.
+                continue;
+            }
+            FileScanTask scanTask = fileTasksIterator.next();
+            fileHasAnyDeletions = fileHasAnyDeletions || !scanTask.deletes().isEmpty();
             if (scanTask.deletes().isEmpty() &&
                     maxScannedFileSizeInBytes.isPresent() &&
                     scanTask.file().fileSizeInBytes() > maxScannedFileSizeInBytes.get()) {
@@ -232,18 +263,7 @@ public CompletableFuture<ConnectorSplitBatch> getNextBatch(int maxSize)
                     .map(fieldId -> getColumnHandle(fileSchema.findField(fieldId), typeManager))
                     .collect(toImmutableSet());
 
-            Supplier<Map<ColumnHandle, NullableValue>> partitionValues = memoize(() -> {
-                Map<ColumnHandle, NullableValue> bindings = new HashMap<>();
-                for (IcebergColumnHandle partitionColumn : identityPartitionColumns) {
-                    Object partitionValue = deserializePartitionValue(
-                            partitionColumn.getType(),
-                            partitionKeys.get(partitionColumn.getId()).orElse(null),
-                            partitionColumn.getName());
-                    NullableValue bindingValue = new NullableValue(partitionColumn.getType(), partitionValue);
-                    bindings.put(partitionColumn, bindingValue);
-                }
-                return bindings;
-            });
+            Supplier<Map<ColumnHandle, NullableValue>> partitionValues = memoize(() -> getPartitionValues(identityPartitionColumns, partitionKeys));
 
             if (!dynamicFilterPredicate.isAll() && !dynamicFilterPredicate.equals(pushedDownDynamicFilterPredicate)) {
                 if (!partitionMatchesPredicate(
@@ -270,15 +290,34 @@ public CompletableFuture<ConnectorSplitBatch> getNextBatch(int maxSize)
                 List<org.apache.iceberg.DeleteFile> fullyAppliedDeletes = tableHandle.getEnforcedPredicate().isAll() ? scanTask.deletes() : ImmutableList.of();
                 scannedFiles.add(new DataFileWithDeleteFiles(scanTask.file(), fullyAppliedDeletes));
             }
+            if (!fileTasksIterator.hasNext()) {
+                // This is the last task for this file
+                if (!fileHasAnyDeletions) {
+                    // There were no deletions, so we produced splits covering the whole file
+                    outputRowsLowerBound = saturatedAdd(outputRowsLowerBound, scanTask.file().recordCount());
+                    if (limit.isPresent() && limit.getAsLong() <= outputRowsLowerBound) {
+                        finish();
+                    }
+                }
+            }
             splits.add(icebergSplit);
         }
-        return completedFuture(new ConnectorSplitBatch(splits.build(), isFinished()));
+        return completedFuture(new ConnectorSplitBatch(splits, isFinished()));
+    }
+
+    private boolean noDataColumnsProjected(FileScanTask fileScanTask)
+    {
+        return fileScanTask.spec().fields().stream()
+                .filter(partitionField -> partitionField.transform().isIdentity())
+                .map(PartitionField::sourceId)
+                .collect(toImmutableSet())
+                .containsAll(projectedBaseColumns);
     }
 
     private long getModificationTime(String path)
     {
         try {
-            TrinoInputFile inputFile = fileSystemFactory.create(session).newInputFile(path);
+            TrinoInputFile inputFile = fileSystemFactory.create(session).newInputFile(Location.of(path));
             return inputFile.lastModified().toEpochMilli();
         }
         catch (IOException e) {
@@ -289,14 +328,15 @@ private long getModificationTime(String path)
     private void finish()
     {
         close();
-        this.fileScanTaskIterable = CloseableIterable.empty();
-        this.fileScanTaskIterator = CloseableIterator.empty();
+        this.fileScanIterable = CloseableIterable.empty();
+        this.fileScanIterator = CloseableIterator.empty();
+        this.fileTasksIterator = emptyIterator();
     }
 
     @Override
     public boolean isFinished()
     {
-        return fileScanTaskIterator != null && !fileScanTaskIterator.hasNext();
+        return fileScanIterator != null && !fileScanIterator.hasNext() && !fileTasksIterator.hasNext();
     }
 
     @Override
@@ -435,7 +475,6 @@ private IcebergSplit toIcebergSplit(FileScanTask task)
                 task.file().fileSizeInBytes(),
                 task.file().recordCount(),
                 IcebergFileFormat.fromIceberg(task.file().format()),
-                ImmutableList.of(),
                 PartitionSpecParser.toJson(task.spec()),
                 PartitionData.toJson(task.file().partition()),
                 task.deletes().stream()
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergStatistics.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergStatistics.java
index 235ab8490101..8b3c80053da5 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergStatistics.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergStatistics.java
@@ -15,17 +15,16 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.TypeManager;
+import jakarta.annotation.Nullable;
 import org.apache.iceberg.DataFile;
 import org.apache.iceberg.PartitionField;
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.types.Conversions;
 import org.apache.iceberg.types.Types;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import java.lang.invoke.MethodHandle;
 import java.util.HashMap;
 import java.util.List;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergTableHandle.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergTableHandle.java
index 055dc7943fe5..b71cd5913da9 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergTableHandle.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergTableHandle.java
@@ -16,20 +16,19 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.units.DataSize;
+import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorTableHandle;
-import io.trino.spi.connector.RetryMode;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.TupleDomain;
 
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.Set;
 
 import static java.util.Objects.requireNonNull;
@@ -38,18 +37,17 @@
 public class IcebergTableHandle
         implements ConnectorTableHandle
 {
+    private final CatalogHandle catalog;
     private final String schemaName;
     private final String tableName;
     private final TableType tableType;
     private final Optional<Long> snapshotId;
     private final String tableSchemaJson;
-    private final List<TrinoSortField> sortOrder;
     // Empty means the partitioning spec is not known (can be the case for certain time travel queries).
     private final Optional<String> partitionSpecJson;
     private final int formatVersion;
     private final String tableLocation;
     private final Map<String, String> storageProperties;
-    private final RetryMode retryMode;
 
     // Filter used during split generation and table scan, but not required to be strictly enforced by Iceberg Connector
     private final TupleDomain<IcebergColumnHandle> unenforcedPredicate;
@@ -57,6 +55,12 @@ public class IcebergTableHandle
     // Filter guaranteed to be enforced by Iceberg connector
     private final TupleDomain<IcebergColumnHandle> enforcedPredicate;
 
+    // Columns that are present in {@link Constraint#predicate()} applied on the table scan
+    private final Set<IcebergColumnHandle> constraintColumns;
+
+    // semantically limit is applied after enforcedPredicate
+    private final OptionalLong limit;
+
     private final Set<IcebergColumnHandle> projectedColumns;
     private final Optional<String> nameMappingJson;
 
@@ -64,80 +68,95 @@ public class IcebergTableHandle
     private final boolean recordScannedFiles;
     private final Optional<DataSize> maxScannedFileSize;
 
+    // ANALYZE only
+    private final Optional<Set<String>> analyzeColumns;
+
     @JsonCreator
     public static IcebergTableHandle fromJsonForDeserializationOnly(
+            @JsonProperty("catalog") CatalogHandle catalog,
             @JsonProperty("schemaName") String schemaName,
             @JsonProperty("tableName") String tableName,
             @JsonProperty("tableType") TableType tableType,
             @JsonProperty("snapshotId") Optional<Long> snapshotId,
             @JsonProperty("tableSchemaJson") String tableSchemaJson,
-            @JsonProperty("sortOrder") List<TrinoSortField> sortOrder,
             @JsonProperty("partitionSpecJson") Optional<String> partitionSpecJson,
             @JsonProperty("formatVersion") int formatVersion,
             @JsonProperty("unenforcedPredicate") TupleDomain<IcebergColumnHandle> unenforcedPredicate,
             @JsonProperty("enforcedPredicate") TupleDomain<IcebergColumnHandle> enforcedPredicate,
+            @JsonProperty("limit") OptionalLong limit,
             @JsonProperty("projectedColumns") Set<IcebergColumnHandle> projectedColumns,
             @JsonProperty("nameMappingJson") Optional<String> nameMappingJson,
             @JsonProperty("tableLocation") String tableLocation,
-            @JsonProperty("storageProperties") Map<String, String> storageProperties,
-            @JsonProperty("retryMode") RetryMode retryMode)
+            @JsonProperty("storageProperties") Map<String, String> storageProperties)
     {
         return new IcebergTableHandle(
+                catalog,
                 schemaName,
                 tableName,
                 tableType,
                 snapshotId,
                 tableSchemaJson,
-                sortOrder,
                 partitionSpecJson,
                 formatVersion,
                 unenforcedPredicate,
                 enforcedPredicate,
+                limit,
                 projectedColumns,
                 nameMappingJson,
                 tableLocation,
                 storageProperties,
-                retryMode,
                 false,
+                Optional.empty(),
+                ImmutableSet.of(),
                 Optional.empty());
     }
 
     public IcebergTableHandle(
+            CatalogHandle catalog,
             String schemaName,
             String tableName,
             TableType tableType,
             Optional<Long> snapshotId,
             String tableSchemaJson,
-            List<TrinoSortField> sortOrder,
             Optional<String> partitionSpecJson,
             int formatVersion,
             TupleDomain<IcebergColumnHandle> unenforcedPredicate,
             TupleDomain<IcebergColumnHandle> enforcedPredicate,
+            OptionalLong limit,
             Set<IcebergColumnHandle> projectedColumns,
             Optional<String> nameMappingJson,
             String tableLocation,
             Map<String, String> storageProperties,
-            RetryMode retryMode,
             boolean recordScannedFiles,
-            Optional<DataSize> maxScannedFileSize)
+            Optional<DataSize> maxScannedFileSize,
+            Set<IcebergColumnHandle> constraintColumns,
+            Optional<Set<String>> analyzeColumns)
     {
+        this.catalog = requireNonNull(catalog, "catalog is null");
         this.schemaName = requireNonNull(schemaName, "schemaName is null");
         this.tableName = requireNonNull(tableName, "tableName is null");
         this.tableType = requireNonNull(tableType, "tableType is null");
         this.snapshotId = requireNonNull(snapshotId, "snapshotId is null");
         this.tableSchemaJson = requireNonNull(tableSchemaJson, "schemaJson is null");
-        this.sortOrder = ImmutableList.copyOf(requireNonNull(sortOrder, "sortOrder is null"));
         this.partitionSpecJson = requireNonNull(partitionSpecJson, "partitionSpecJson is null");
         this.formatVersion = formatVersion;
         this.unenforcedPredicate = requireNonNull(unenforcedPredicate, "unenforcedPredicate is null");
         this.enforcedPredicate = requireNonNull(enforcedPredicate, "enforcedPredicate is null");
+        this.limit = requireNonNull(limit, "limit is null");
         this.projectedColumns = ImmutableSet.copyOf(requireNonNull(projectedColumns, "projectedColumns is null"));
         this.nameMappingJson = requireNonNull(nameMappingJson, "nameMappingJson is null");
         this.tableLocation = requireNonNull(tableLocation, "tableLocation is null");
         this.storageProperties = ImmutableMap.copyOf(requireNonNull(storageProperties, "storageProperties is null"));
-        this.retryMode = requireNonNull(retryMode, "retryMode is null");
         this.recordScannedFiles = recordScannedFiles;
         this.maxScannedFileSize = requireNonNull(maxScannedFileSize, "maxScannedFileSize is null");
+        this.constraintColumns = ImmutableSet.copyOf(requireNonNull(constraintColumns, "constraintColumns is null"));
+        this.analyzeColumns = requireNonNull(analyzeColumns, "analyzeColumns is null");
+    }
+
+    @JsonProperty
+    public CatalogHandle getCatalog()
+    {
+        return catalog;
     }
 
     @JsonProperty
@@ -171,12 +190,6 @@ public String getTableSchemaJson()
         return tableSchemaJson;
     }
 
-    @JsonProperty
-    public List<TrinoSortField> getSortOrder()
-    {
-        return sortOrder;
-    }
-
     @JsonProperty
     public Optional<String> getPartitionSpecJson()
     {
@@ -201,6 +214,12 @@ public TupleDomain<IcebergColumnHandle> getEnforcedPredicate()
         return enforcedPredicate;
     }
 
+    @JsonProperty
+    public OptionalLong getLimit()
+    {
+        return limit;
+    }
+
     @JsonProperty
     public Set<IcebergColumnHandle> getProjectedColumns()
     {
@@ -225,12 +244,6 @@ public Map<String, String> getStorageProperties()
         return storageProperties;
     }
 
-    @JsonProperty
-    public RetryMode getRetryMode()
-    {
-        return retryMode;
-    }
-
     @JsonIgnore
     public boolean isRecordScannedFiles()
     {
@@ -243,6 +256,18 @@ public Optional<DataSize> getMaxScannedFileSize()
         return maxScannedFileSize;
     }
 
+    @JsonIgnore
+    public Set<IcebergColumnHandle> getConstraintColumns()
+    {
+        return constraintColumns;
+    }
+
+    @JsonIgnore
+    public Optional<Set<String>> getAnalyzeColumns()
+    {
+        return analyzeColumns;
+    }
+
     public SchemaTableName getSchemaTableName()
     {
         return new SchemaTableName(schemaName, tableName);
@@ -256,67 +281,73 @@ public SchemaTableName getSchemaTableNameWithType()
     public IcebergTableHandle withProjectedColumns(Set<IcebergColumnHandle> projectedColumns)
     {
         return new IcebergTableHandle(
+                catalog,
                 schemaName,
                 tableName,
                 tableType,
                 snapshotId,
                 tableSchemaJson,
-                sortOrder,
                 partitionSpecJson,
                 formatVersion,
                 unenforcedPredicate,
                 enforcedPredicate,
+                limit,
                 projectedColumns,
                 nameMappingJson,
                 tableLocation,
                 storageProperties,
-                retryMode,
                 recordScannedFiles,
-                maxScannedFileSize);
+                maxScannedFileSize,
+                constraintColumns,
+                analyzeColumns);
     }
 
-    public IcebergTableHandle withRetryMode(RetryMode retryMode)
+    public IcebergTableHandle withAnalyzeColumns(Optional<Set<String>> analyzeColumns)
     {
         return new IcebergTableHandle(
+                catalog,
                 schemaName,
                 tableName,
                 tableType,
                 snapshotId,
                 tableSchemaJson,
-                sortOrder,
                 partitionSpecJson,
                 formatVersion,
                 unenforcedPredicate,
                 enforcedPredicate,
+                limit,
                 projectedColumns,
                 nameMappingJson,
                 tableLocation,
                 storageProperties,
-                retryMode,
                 recordScannedFiles,
-                maxScannedFileSize);
+                maxScannedFileSize,
+                constraintColumns,
+                analyzeColumns);
     }
 
     public IcebergTableHandle forOptimize(boolean recordScannedFiles, DataSize maxScannedFileSize)
     {
         return new IcebergTableHandle(
+                catalog,
                 schemaName,
                 tableName,
                 tableType,
                 snapshotId,
                 tableSchemaJson,
-                sortOrder,
                 partitionSpecJson,
                 formatVersion,
                 unenforcedPredicate,
                 enforcedPredicate,
+                limit,
                 projectedColumns,
                 nameMappingJson,
                 tableLocation,
                 storageProperties,
-                retryMode,
                 recordScannedFiles,
-                Optional.of(maxScannedFileSize));
+                Optional.of(maxScannedFileSize),
+                constraintColumns,
+                analyzeColumns);
     }
 
     @Override
@@ -331,45 +362,49 @@ public boolean equals(Object o)
 
         IcebergTableHandle that = (IcebergTableHandle) o;
         return recordScannedFiles == that.recordScannedFiles &&
+                Objects.equals(catalog, that.catalog) &&
                 Objects.equals(schemaName, that.schemaName) &&
                 Objects.equals(tableName, that.tableName) &&
                 tableType == that.tableType &&
                 Objects.equals(snapshotId, that.snapshotId) &&
                 Objects.equals(tableSchemaJson, that.tableSchemaJson) &&
-                Objects.equals(sortOrder, that.sortOrder) &&
                 Objects.equals(partitionSpecJson, that.partitionSpecJson) &&
                 formatVersion == that.formatVersion &&
                 Objects.equals(unenforcedPredicate, that.unenforcedPredicate) &&
                 Objects.equals(enforcedPredicate, that.enforcedPredicate) &&
+                Objects.equals(limit, that.limit) &&
                 Objects.equals(projectedColumns, that.projectedColumns) &&
                 Objects.equals(nameMappingJson, that.nameMappingJson) &&
                 Objects.equals(tableLocation, that.tableLocation) &&
-                Objects.equals(retryMode, that.retryMode) &&
                 Objects.equals(storageProperties, that.storageProperties) &&
-                Objects.equals(maxScannedFileSize, that.maxScannedFileSize);
+                Objects.equals(maxScannedFileSize, that.maxScannedFileSize) &&
+                Objects.equals(constraintColumns, that.constraintColumns) &&
+                Objects.equals(analyzeColumns, that.analyzeColumns);
     }
 
     @Override
     public int hashCode()
     {
         return Objects.hash(
+                catalog,
                 schemaName,
                 tableName,
                 tableType,
                 snapshotId,
                 tableSchemaJson,
-                sortOrder,
                 partitionSpecJson,
                 formatVersion,
                 unenforcedPredicate,
                 enforcedPredicate,
+                limit,
                 projectedColumns,
                 nameMappingJson,
                 tableLocation,
                 storageProperties,
-                retryMode,
                 recordScannedFiles,
-                maxScannedFileSize);
+                maxScannedFileSize,
+                constraintColumns,
+                analyzeColumns);
     }
 
     @Override
@@ -386,6 +421,7 @@ else if (!enforcedPredicate.isAll()) {
                     .map(IcebergColumnHandle::getQualifiedName)
                     .collect(joining(", ", "[", "]")));
         }
+        limit.ifPresent(limit -> builder.append(" LIMIT ").append(limit));
         return builder.toString();
     }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergTableProperties.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergTableProperties.java
index 1c525cc841b2..9de78f2280e1 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergTableProperties.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergTableProperties.java
@@ -14,13 +14,12 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.hive.orc.OrcWriterConfig;
 import io.trino.spi.TrinoException;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergTransactionManager.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergTransactionManager.java
index 4b04993c9491..ead052e18865 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergTransactionManager.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergTransactionManager.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.iceberg;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.security.ConnectorIdentity;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergUpdateBucketFunction.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergUpdateBucketFunction.java
index 8a72729cc3e2..c53426507d22 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergUpdateBucketFunction.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergUpdateBucketFunction.java
@@ -15,7 +15,7 @@
 
 import io.airlift.slice.Slice;
 import io.trino.spi.Page;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.BucketFunction;
 
 import static io.trino.spi.type.VarcharType.VARCHAR;
@@ -33,8 +33,8 @@ public IcebergUpdateBucketFunction(int bucketCount)
     @Override
     public int getBucket(Page page, int position)
     {
-        Block row = page.getBlock(0).getObject(position, Block.class);
-        Slice value = VARCHAR.getSlice(row, 0); // file path field of row ID
+        SqlRow row = page.getBlock(0).getObject(position, SqlRow.class);
+        Slice value = VARCHAR.getSlice(row.getRawFieldBlock(0), row.getRawIndex()); // file path field of row ID
         return (value.hashCode() & Integer.MAX_VALUE) % bucketCount;
     }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergUtil.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergUtil.java
index 8d1595643fc3..c13276cb22b1 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergUtil.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergUtil.java
@@ -19,7 +19,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
-import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceUtf8;
 import io.airlift.slice.Slices;
@@ -28,12 +27,14 @@
 import io.trino.plugin.iceberg.catalog.IcebergTableOperationsProvider;
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
 import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.function.InvocationConvention;
 import io.trino.spi.predicate.Domain;
+import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.ValueSet;
 import io.trino.spi.type.DecimalType;
@@ -48,6 +49,7 @@
 import org.apache.iceberg.FileFormat;
 import org.apache.iceberg.FileScanTask;
 import org.apache.iceberg.HistoryEntry;
+import org.apache.iceberg.MetadataTableType;
 import org.apache.iceberg.PartitionField;
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.Schema;
@@ -58,6 +60,7 @@
 import org.apache.iceberg.Table;
 import org.apache.iceberg.TableMetadata;
 import org.apache.iceberg.TableOperations;
+import org.apache.iceberg.TableScan;
 import org.apache.iceberg.Transaction;
 import org.apache.iceberg.io.LocationProvider;
 import org.apache.iceberg.types.Type.PrimitiveType;
@@ -76,7 +79,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.OptionalInt;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -89,10 +91,14 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.collect.Maps.immutableEntry;
+import static com.google.common.collect.Streams.mapWithIndex;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.plugin.base.io.ByteBuffers.getWrappedBytes;
 import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
 import static io.trino.plugin.iceberg.ColumnIdentity.createColumnIdentity;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.fileModifiedTimeColumnMetadata;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.pathColumnMetadata;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_BAD_DATA;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_PARTITION_VALUE;
 import static io.trino.plugin.iceberg.IcebergMetadata.ORC_BLOOM_FILTER_COLUMNS_KEY;
@@ -145,9 +151,8 @@
 import static java.math.RoundingMode.UNNECESSARY;
 import static java.util.Comparator.comparing;
 import static java.util.Objects.requireNonNull;
-import static org.apache.iceberg.BaseMetastoreTableOperations.ICEBERG_TABLE_TYPE_VALUE;
-import static org.apache.iceberg.BaseMetastoreTableOperations.TABLE_TYPE_PROP;
 import static org.apache.iceberg.LocationProviders.locationsFor;
+import static org.apache.iceberg.MetadataTableUtils.createMetadataTableInstance;
 import static org.apache.iceberg.TableProperties.DEFAULT_FILE_FORMAT;
 import static org.apache.iceberg.TableProperties.DEFAULT_FILE_FORMAT_DEFAULT;
 import static org.apache.iceberg.TableProperties.FORMAT_VERSION;
@@ -160,20 +165,27 @@
 
 public final class IcebergUtil
 {
-    private static final Logger log = Logger.get(IcebergUtil.class);
+    public static final String TRINO_TABLE_METADATA_INFO_VALID_FOR = "trino_table_metadata_info_valid_for";
+    public static final String COLUMN_TRINO_NOT_NULL_PROPERTY = "trino_not_null";
+    public static final String COLUMN_TRINO_TYPE_ID_PROPERTY = "trino_type_id";
 
     public static final String METADATA_FOLDER_NAME = "metadata";
     public static final String METADATA_FILE_EXTENSION = ".metadata.json";
     private static final Pattern SIMPLE_NAME = Pattern.compile("[a-z][a-z0-9]*");
     static final String TRINO_QUERY_ID_NAME = "trino_query_id";
+    // Metadata file name examples
+    //  - 00001-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json
+    //  - 00001-409702ba-4735-4645-8f14-09537cc0b2c8.gz.metadata.json (https://github.com/apache/iceberg/blob/ab398a0d5ff195f763f8c7a4358ac98fa38a8de7/core/src/main/java/org/apache/iceberg/TableMetadataParser.java#L141)
+    //  - 00001-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json.gz (https://github.com/apache/iceberg/blob/ab398a0d5ff195f763f8c7a4358ac98fa38a8de7/core/src/main/java/org/apache/iceberg/TableMetadataParser.java#L146)
+    private static final Pattern METADATA_FILE_NAME_PATTERN = Pattern.compile("(?<version>\\d+)-(?<uuid>[-a-fA-F0-9]*)(?<compression>\\.[a-zA-Z0-9]+)?" + Pattern.quote(METADATA_FILE_EXTENSION) + "(?<compression2>\\.[a-zA-Z0-9]+)?");
+    // Hadoop Generated Metadata file name examples
+    //  - v0.metadata.json
+    //  - v0.gz.metadata.json
+    //  - v0.metadata.json.gz
+    private static final Pattern HADOOP_GENERATED_METADATA_FILE_NAME_PATTERN = Pattern.compile("v(?<version>\\d+)(?<compression>\\.[a-zA-Z0-9]+)?" + Pattern.quote(METADATA_FILE_EXTENSION) + "(?<compression2>\\.[a-zA-Z0-9]+)?");
 
     private IcebergUtil() {}
 
-    public static boolean isIcebergTable(io.trino.plugin.hive.metastore.Table table)
-    {
-        return ICEBERG_TABLE_TYPE_VALUE.equalsIgnoreCase(table.getParameters().get(TABLE_TYPE_PROP));
-    }
-
     public static Table loadIcebergTable(TrinoCatalog catalog, IcebergTableOperationsProvider tableOperationsProvider, ConnectorSession session, SchemaTableName table)
     {
         TableOperations operations = tableOperationsProvider.createTableOperations(
@@ -246,6 +258,25 @@ public static List<IcebergColumnHandle> getColumns(Schema schema, TypeManager ty
                 .collect(toImmutableList());
     }
 
+    public static List<ColumnMetadata> getColumnMetadatas(Schema schema, TypeManager typeManager)
+    {
+        List<NestedField> icebergColumns = schema.columns();
+        ImmutableList.Builder<ColumnMetadata> columns = ImmutableList.builderWithExpectedSize(icebergColumns.size() + 2);
+
+        icebergColumns.stream()
+                .map(column ->
+                        ColumnMetadata.builder()
+                                .setName(column.name())
+                                .setType(toTrinoType(column.type(), typeManager))
+                                .setNullable(column.isOptional())
+                                .setComment(Optional.ofNullable(column.doc()))
+                                .build())
+                .forEach(columns::add);
+        columns.add(pathColumnMetadata());
+        columns.add(fileModifiedTimeColumnMetadata());
+        return columns.build();
+    }
+
     public static IcebergColumnHandle getColumnHandle(NestedField column, TypeManager typeManager)
     {
         Type type = toTrinoType(column.type(), typeManager);
@@ -358,7 +389,7 @@ private static boolean canEnforceConstraintWithinPartitioningSpec(TypeOperators
 
     private static boolean canEnforceConstraintWithPartitionField(TypeOperators typeOperators, PartitionField field, IcebergColumnHandle column, Domain domain)
     {
-        if (field.transform().toString().equals("void")) {
+        if (field.transform().isVoid()) {
             // Useless for filtering.
             return false;
         }
@@ -514,7 +545,7 @@ public static Object deserializePartitionValue(Type type, String valueString, St
                     name));
         }
         // Iceberg tables don't partition by non-primitive-type columns.
-        throw new TrinoException(GENERIC_INTERNAL_ERROR, "Invalid partition type " + type.toString());
+        throw new TrinoException(GENERIC_INTERNAL_ERROR, "Invalid partition type " + type);
     }
 
     /**
@@ -556,6 +587,22 @@ public static Map<Integer, Optional<String>> getPartitionKeys(StructLike partiti
         return partitionKeys.buildOrThrow();
     }
 
+    public static Map<ColumnHandle, NullableValue> getPartitionValues(
+            Set<IcebergColumnHandle> identityPartitionColumns,
+            Map<Integer, Optional<String>> partitionKeys)
+    {
+        ImmutableMap.Builder<ColumnHandle, NullableValue> bindings = ImmutableMap.builder();
+        for (IcebergColumnHandle partitionColumn : identityPartitionColumns) {
+            Object partitionValue = deserializePartitionValue(
+                    partitionColumn.getType(),
+                    partitionKeys.get(partitionColumn.getId()).orElse(null),
+                    partitionColumn.getName());
+            NullableValue bindingValue = new NullableValue(partitionColumn.getType(), partitionValue);
+            bindings.put(partitionColumn, bindingValue);
+        }
+        return bindings.buildOrThrow();
+    }
+
     public static LocationProvider getLocationProvider(SchemaTableName schemaTableName, String tableLocation, Map<String, String> storageProperties)
     {
         if (storageProperties.containsKey(WRITE_LOCATION_PROVIDER_IMPL)) {
@@ -582,7 +629,7 @@ public static Schema schemaFromMetadata(List<ColumnMetadata> columns)
         return new Schema(icebergSchema.asStructType().fields());
     }
 
-    public static Transaction newCreateTableTransaction(TrinoCatalog catalog, ConnectorTableMetadata tableMetadata, ConnectorSession session)
+    public static Transaction newCreateTableTransaction(TrinoCatalog catalog, ConnectorTableMetadata tableMetadata, ConnectorSession session, boolean replace)
     {
         SchemaTableName schemaTableName = tableMetadata.getTable();
         Schema schema = schemaFromMetadata(tableMetadata.getColumns());
@@ -591,6 +638,14 @@ public static Transaction newCreateTableTransaction(TrinoCatalog catalog, Connec
         String targetPath = getTableLocation(tableMetadata.getProperties())
                 .orElseGet(() -> catalog.defaultTableLocation(session, schemaTableName));
 
+        if (replace) {
+            return catalog.newCreateOrReplaceTableTransaction(session, schemaTableName, schema, partitionSpec, sortOrder, targetPath, createTableProperties(tableMetadata));
+        }
+        return catalog.newCreateTableTransaction(session, schemaTableName, schema, partitionSpec, sortOrder, targetPath, createTableProperties(tableMetadata));
+    }
+
+    private static Map<String, String> createTableProperties(ConnectorTableMetadata tableMetadata)
+    {
         ImmutableMap.Builder<String, String> propertiesBuilder = ImmutableMap.builder();
         IcebergFileFormat fileFormat = IcebergTableProperties.getFileFormat(tableMetadata.getProperties());
         propertiesBuilder.put(DEFAULT_FILE_FORMAT, fileFormat.toIceberg().toString());
@@ -608,8 +663,7 @@ public static Transaction newCreateTableTransaction(TrinoCatalog catalog, Connec
         if (tableMetadata.getComment().isPresent()) {
             propertiesBuilder.put(TABLE_COMMENT, tableMetadata.getComment().get());
         }
-
-        return catalog.newCreateTableTransaction(session, schemaTableName, schema, partitionSpec, sortOrder, targetPath, propertiesBuilder.buildOrThrow());
+        return propertiesBuilder.buildOrThrow();
     }
 
     /**
@@ -652,7 +706,11 @@ public static Optional<Snapshot> firstSnapshotAfter(Table table, long baseSnapsh
         checkArgument(current.snapshotId() != baseSnapshotId, "No snapshot after %s in %s, current snapshot is %s", baseSnapshotId, table, current);
 
         while (true) {
-            checkArgument(current.parentId() != null, "Snapshot id %s is not valid in table %s, snapshot %s has no parent", baseSnapshotId, table, current);
+            if (current.parentId() == null) {
+                // Current is the first snapshot in the table, which means we reached end of table history not finding baseSnapshotId. This is possible
+                // when table was rolled back and baseSnapshotId is no longer referenced.
+                return Optional.empty();
+            }
             if (current.parentId() == baseSnapshotId) {
                 return Optional.of(current);
             }
@@ -702,21 +760,19 @@ private static void validateOrcBloomFilterColumns(ConnectorTableMetadata tableMe
         }
     }
 
-    public static OptionalInt parseVersion(String metadataLocation)
+    public static int parseVersion(String metadataFileName)
             throws TrinoException
     {
-        int versionStart = metadataLocation.lastIndexOf('/') + 1; // if '/' isn't found, this will be 0
-        int versionEnd = metadataLocation.indexOf('-', versionStart);
-        if (versionStart == 0 || versionEnd == -1) {
-            throw new TrinoException(ICEBERG_BAD_DATA, "Invalid metadata location: " + metadataLocation);
-        }
-        try {
-            return OptionalInt.of(parseInt(metadataLocation.substring(versionStart, versionEnd)));
+        checkArgument(!metadataFileName.contains("/"), "Not a file name: %s", metadataFileName);
+        Matcher matcher = METADATA_FILE_NAME_PATTERN.matcher(metadataFileName);
+        if (matcher.matches()) {
+            return parseInt(matcher.group("version"));
         }
-        catch (NumberFormatException e) {
-            log.warn(e, "Unable to parse version from metadata location: %s", metadataLocation);
-            return OptionalInt.empty();
+        matcher = HADOOP_GENERATED_METADATA_FILE_NAME_PATTERN.matcher(metadataFileName);
+        if (matcher.matches()) {
+            return parseInt(matcher.group("version"));
         }
+        throw new TrinoException(ICEBERG_BAD_DATA, "Invalid metadata file name: " + metadataFileName);
     }
 
     public static String fixBrokenMetadataLocation(String location)
@@ -745,4 +801,16 @@ public static void commit(SnapshotUpdate<?> update, ConnectorSession session)
         update.set(TRINO_QUERY_ID_NAME, session.getQueryId());
         update.commit();
     }
+
+    public static TableScan buildTableScan(Table icebergTable, MetadataTableType metadataTableType)
+    {
+        return createMetadataTableInstance(icebergTable, metadataTableType).newScan();
+    }
+
+    public static Map<String, Integer> columnNameToPositionInSchema(Schema schema)
+    {
+        return mapWithIndex(schema.columns().stream(),
+                (column, position) -> immutableEntry(column.name(), Long.valueOf(position).intValue()))
+                .collect(toImmutableMap(Entry::getKey, Entry::getValue));
+    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/InternalIcebergConnectorFactory.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/InternalIcebergConnectorFactory.java
index 8de2fee63e44..ab1e2445d6f7 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/InternalIcebergConnectorFactory.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/InternalIcebergConnectorFactory.java
@@ -21,10 +21,13 @@
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.event.client.EventModule;
 import io.airlift.json.JsonModule;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.filesystem.hdfs.HdfsFileSystemModule;
+import io.trino.filesystem.manager.FileSystemModule;
 import io.trino.hdfs.HdfsModule;
 import io.trino.hdfs.authentication.HdfsAuthenticationModule;
+import io.trino.hdfs.gcs.HiveGcsModule;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorPageSinkProvider;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorPageSourceProvider;
@@ -34,14 +37,12 @@
 import io.trino.plugin.base.jmx.MBeanServerModule;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.plugin.hive.NodeVersion;
-import io.trino.plugin.hive.azure.HiveAzureModule;
-import io.trino.plugin.hive.gcs.HiveGcsModule;
-import io.trino.plugin.hive.s3.HiveS3Module;
 import io.trino.plugin.iceberg.catalog.IcebergCatalogModule;
 import io.trino.spi.NodeManager;
 import io.trino.spi.PageIndexerFactory;
 import io.trino.spi.PageSorter;
 import io.trino.spi.classloader.ThreadContextClassLoader;
+import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorContext;
@@ -50,6 +51,8 @@
 import io.trino.spi.connector.ConnectorPageSourceProvider;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.TableProcedureMetadata;
+import io.trino.spi.function.FunctionProvider;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.procedure.Procedure;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.TypeManager;
@@ -87,21 +90,22 @@ public static Connector createConnector(
                     new IcebergSecurityModule(),
                     icebergCatalogModule.orElse(new IcebergCatalogModule()),
                     new HdfsModule(),
-                    new HiveS3Module(),
                     new HiveGcsModule(),
-                    new HiveAzureModule(),
                     new HdfsAuthenticationModule(),
                     new MBeanServerModule(),
+                    fileSystemFactory
+                            .map(factory -> (Module) binder -> binder.bind(TrinoFileSystemFactory.class).toInstance(factory))
+                            .orElseGet(FileSystemModule::new),
                     binder -> {
+                        binder.bind(OpenTelemetry.class).toInstance(context.getOpenTelemetry());
+                        binder.bind(Tracer.class).toInstance(context.getTracer());
                         binder.bind(NodeVersion.class).toInstance(new NodeVersion(context.getNodeManager().getCurrentNode().getVersion()));
                         binder.bind(NodeManager.class).toInstance(context.getNodeManager());
                         binder.bind(TypeManager.class).toInstance(context.getTypeManager());
                         binder.bind(PageIndexerFactory.class).toInstance(context.getPageIndexerFactory());
+                        binder.bind(CatalogHandle.class).toInstance(context.getCatalogHandle());
                         binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName));
                         binder.bind(PageSorter.class).toInstance(context.getPageSorter());
-                        fileSystemFactory.ifPresentOrElse(
-                                factory -> binder.bind(TrinoFileSystemFactory.class).toInstance(factory),
-                                () -> binder.install(new HdfsFileSystemModule()));
                     },
                     module);
 
@@ -122,6 +126,8 @@ public static Connector createConnector(
             IcebergAnalyzeProperties icebergAnalyzeProperties = injector.getInstance(IcebergAnalyzeProperties.class);
             Set<Procedure> procedures = injector.getInstance(Key.get(new TypeLiteral<Set<Procedure>>() {}));
             Set<TableProcedureMetadata> tableProcedures = injector.getInstance(Key.get(new TypeLiteral<Set<TableProcedureMetadata>>() {}));
+            Set<ConnectorTableFunction> tableFunctions = injector.getInstance(Key.get(new TypeLiteral<Set<ConnectorTableFunction>>() {}));
+            FunctionProvider functionProvider = injector.getInstance(FunctionProvider.class);
             Optional<ConnectorAccessControl> accessControl = injector.getInstance(Key.get(new TypeLiteral<Optional<ConnectorAccessControl>>() {}));
             // Materialized view should allow configuring all the supported iceberg table properties for the storage table
             List<PropertyMetadata<?>> materializedViewProperties = Stream.of(icebergTableProperties.getTableProperties(), materializedViewAdditionalProperties.getMaterializedViewProperties())
@@ -129,6 +135,7 @@ public static Connector createConnector(
                     .collect(toImmutableList());
 
             return new IcebergConnector(
+                    injector,
                     lifeCycleManager,
                     transactionManager,
                     new ClassLoaderSafeConnectorSplitManager(splitManager, classLoader),
@@ -142,7 +149,9 @@ public static Connector createConnector(
                     icebergAnalyzeProperties.getAnalyzeProperties(),
                     accessControl,
                     procedures,
-                    tableProcedures);
+                    tableProcedures,
+                    tableFunctions,
+                    functionProvider);
         }
     }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/ManifestsTable.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/ManifestsTable.java
index 58beeb6a005b..7b8da9a4baf6 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/ManifestsTable.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/ManifestsTable.java
@@ -17,7 +17,9 @@
 import io.trino.plugin.iceberg.util.PageListBuilder;
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorSession;
@@ -135,27 +137,27 @@ private static List<Page> buildPages(ConnectorTableMetadata tableMetadata, Table
 
     private static void writePartitionSummaries(BlockBuilder arrayBlockBuilder, List<PartitionFieldSummary> summaries, PartitionSpec partitionSpec)
     {
-        BlockBuilder singleArrayWriter = arrayBlockBuilder.beginBlockEntry();
-        for (int i = 0; i < summaries.size(); i++) {
-            PartitionFieldSummary summary = summaries.get(i);
-            PartitionField field = partitionSpec.fields().get(i);
-            Type nestedType = partitionSpec.partitionType().fields().get(i).type();
-
-            BlockBuilder rowBuilder = singleArrayWriter.beginBlockEntry();
-            BOOLEAN.writeBoolean(rowBuilder, summary.containsNull());
-            Boolean containsNan = summary.containsNaN();
-            if (containsNan == null) {
-                rowBuilder.appendNull();
+        ((ArrayBlockBuilder) arrayBlockBuilder).buildEntry(elementBuilder -> {
+            for (int i = 0; i < summaries.size(); i++) {
+                PartitionFieldSummary summary = summaries.get(i);
+                PartitionField field = partitionSpec.fields().get(i);
+                Type nestedType = partitionSpec.partitionType().fields().get(i).type();
+
+                ((RowBlockBuilder) elementBuilder).buildEntry(fieldBuilders -> {
+                    BOOLEAN.writeBoolean(fieldBuilders.get(0), summary.containsNull());
+                    Boolean containsNan = summary.containsNaN();
+                    if (containsNan == null) {
+                        fieldBuilders.get(1).appendNull();
+                    }
+                    else {
+                        BOOLEAN.writeBoolean(fieldBuilders.get(1), containsNan);
+                    }
+                    VARCHAR.writeString(fieldBuilders.get(2), field.transform().toHumanString(
+                            nestedType, Conversions.fromByteBuffer(nestedType, summary.lowerBound())));
+                    VARCHAR.writeString(fieldBuilders.get(3), field.transform().toHumanString(
+                            nestedType, Conversions.fromByteBuffer(nestedType, summary.upperBound())));
+                });
             }
-            else {
-                BOOLEAN.writeBoolean(rowBuilder, containsNan);
-            }
-            VARCHAR.writeString(rowBuilder, field.transform().toHumanString(
-                    nestedType, Conversions.fromByteBuffer(nestedType, summary.lowerBound())));
-            VARCHAR.writeString(rowBuilder, field.transform().toHumanString(
-                    nestedType, Conversions.fromByteBuffer(nestedType, summary.upperBound())));
-            singleArrayWriter.closeEntry();
-        }
-        arrayBlockBuilder.closeEntry();
+        });
     }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionData.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionData.java
index b4e3b315ed84..b1e1fbbb818f 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionData.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionData.java
@@ -28,6 +28,7 @@
 import java.nio.ByteBuffer;
 import java.util.UUID;
 
+import static io.trino.plugin.base.util.JsonUtils.jsonFactory;
 import static io.trino.spi.type.DecimalType.createDecimalType;
 import static io.trino.spi.type.Decimals.rescale;
 import static java.lang.String.format;
@@ -37,7 +38,7 @@ public class PartitionData
         implements StructLike
 {
     private static final String PARTITION_VALUES_FIELD = "partitionValues";
-    private static final JsonFactory FACTORY = new JsonFactory();
+    private static final JsonFactory FACTORY = jsonFactory();
     private static final ObjectMapper MAPPER = new ObjectMapper(FACTORY)
             .configure(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS, true);
 
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionFields.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionFields.java
index 8c7a2bf64fac..dc5aa1df3719 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionFields.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionFields.java
@@ -72,17 +72,14 @@ public static PartitionSpec parsePartitionFields(Schema schema, List<String> fie
 
     public static void parsePartitionField(PartitionSpec.Builder builder, String field)
     {
-        @SuppressWarnings("PointlessBooleanExpression")
-        boolean matched = false ||
-                tryMatch(field, IDENTITY_PATTERN, match -> builder.identity(fromIdentifierToColumn(match.group()))) ||
+        boolean matched = tryMatch(field, IDENTITY_PATTERN, match -> builder.identity(fromIdentifierToColumn(match.group()))) ||
                 tryMatch(field, YEAR_PATTERN, match -> builder.year(fromIdentifierToColumn(match.group(1)))) ||
                 tryMatch(field, MONTH_PATTERN, match -> builder.month(fromIdentifierToColumn(match.group(1)))) ||
                 tryMatch(field, DAY_PATTERN, match -> builder.day(fromIdentifierToColumn(match.group(1)))) ||
                 tryMatch(field, HOUR_PATTERN, match -> builder.hour(fromIdentifierToColumn(match.group(1)))) ||
                 tryMatch(field, BUCKET_PATTERN, match -> builder.bucket(fromIdentifierToColumn(match.group(1)), parseInt(match.group(2)))) ||
                 tryMatch(field, TRUNCATE_PATTERN, match -> builder.truncate(fromIdentifierToColumn(match.group(1)), parseInt(match.group(2)))) ||
-                tryMatch(field, VOID_PATTERN, match -> builder.alwaysNull(fromIdentifierToColumn(match.group(1)))) ||
-                false;
+                tryMatch(field, VOID_PATTERN, match -> builder.alwaysNull(fromIdentifierToColumn(match.group(1))));
         if (!matched) {
             throw new IllegalArgumentException("Invalid partition field declaration: " + field);
         }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionTable.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionTable.java
index 226d942add0b..51ec92c47ea5 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionTable.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionTable.java
@@ -16,8 +16,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableMetadata;
@@ -61,6 +60,7 @@
 import static io.trino.plugin.iceberg.IcebergUtil.getIdentityPartitions;
 import static io.trino.plugin.iceberg.IcebergUtil.primitiveFieldTypes;
 import static io.trino.plugin.iceberg.TypeConverter.toTrinoType;
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.TypeUtils.writeNativeValue;
 import static java.util.Objects.requireNonNull;
@@ -257,24 +257,22 @@ private RecordCursor buildRecordCursor(Map<StructLikeWrapperWithFieldIdToIndex,
 
             // add data for partition columns
             partitionColumnType.ifPresent(partitionColumnType -> {
-                BlockBuilder partitionRowBlockBuilder = partitionColumnType.rowType.createBlockBuilder(null, 1);
-                BlockBuilder partitionBlockBuilder = partitionRowBlockBuilder.beginBlockEntry();
-                List<io.trino.spi.type.Type> partitionColumnTypes = partitionColumnType.rowType.getFields().stream()
-                        .map(RowType.Field::getType)
-                        .collect(toImmutableList());
-                for (int i = 0; i < partitionColumnTypes.size(); i++) {
-                    io.trino.spi.type.Type trinoType = partitionColumnType.rowType.getFields().get(i).getType();
-                    Object value = null;
-                    Integer fieldId = partitionColumnType.fieldIds.get(i);
-                    if (partitionStruct.fieldIdToIndex.containsKey(fieldId)) {
-                        value = convertIcebergValueToTrino(
-                                partitionTypes.get(i),
-                                partitionStruct.structLikeWrapper.get().get(partitionStruct.fieldIdToIndex.get(fieldId), partitionColumnClass.get(i)));
+                row.add(buildRowValue(partitionColumnType.rowType, fields -> {
+                    List<io.trino.spi.type.Type> partitionColumnTypes = partitionColumnType.rowType.getFields().stream()
+                            .map(RowType.Field::getType)
+                            .collect(toImmutableList());
+                    for (int i = 0; i < partitionColumnTypes.size(); i++) {
+                        io.trino.spi.type.Type trinoType = partitionColumnType.rowType.getFields().get(i).getType();
+                        Object value = null;
+                        Integer fieldId = partitionColumnType.fieldIds.get(i);
+                        if (partitionStruct.fieldIdToIndex.containsKey(fieldId)) {
+                            value = convertIcebergValueToTrino(
+                                    partitionTypes.get(i),
+                                    partitionStruct.structLikeWrapper.get().get(partitionStruct.fieldIdToIndex.get(fieldId), partitionColumnClass.get(i)));
+                        }
+                        writeNativeValue(trinoType, fields.get(i), value);
                     }
-                    writeNativeValue(trinoType, partitionBlockBuilder, value);
-                }
-                partitionRowBlockBuilder.closeEntry();
-                row.add(partitionColumnType.rowType.getObject(partitionRowBlockBuilder, 0));
+                }));
             });
 
             // add the top level metrics.
@@ -284,25 +282,26 @@ private RecordCursor buildRecordCursor(Map<StructLikeWrapperWithFieldIdToIndex,
 
             // add column level metrics
             dataColumnType.ifPresent(dataColumnType -> {
-                BlockBuilder dataRowBlockBuilder = dataColumnType.createBlockBuilder(null, 1);
-                BlockBuilder dataBlockBuilder = dataRowBlockBuilder.beginBlockEntry();
-
-                for (int i = 0; i < columnMetricTypes.size(); i++) {
-                    Integer fieldId = nonPartitionPrimitiveColumns.get(i).fieldId();
-                    Object min = icebergStatistics.getMinValues().get(fieldId);
-                    Object max = icebergStatistics.getMaxValues().get(fieldId);
-                    Long nullCount = icebergStatistics.getNullCounts().get(fieldId);
-                    Long nanCount = icebergStatistics.getNanCounts().get(fieldId);
-                    if (min == null && max == null && nullCount == null) {
-                        row.add(null);
-                        return;
-                    }
-
-                    RowType columnMetricType = columnMetricTypes.get(i);
-                    columnMetricType.writeObject(dataBlockBuilder, getColumnMetricBlock(columnMetricType, min, max, nullCount, nanCount));
+                try {
+                    row.add(buildRowValue(dataColumnType, fields -> {
+                        for (int i = 0; i < columnMetricTypes.size(); i++) {
+                            Integer fieldId = nonPartitionPrimitiveColumns.get(i).fieldId();
+                            Object min = icebergStatistics.getMinValues().get(fieldId);
+                            Object max = icebergStatistics.getMaxValues().get(fieldId);
+                            Long nullCount = icebergStatistics.getNullCounts().get(fieldId);
+                            Long nanCount = icebergStatistics.getNanCounts().get(fieldId);
+                            if (min == null && max == null && nullCount == null) {
+                                throw new MissingColumnMetricsException();
+                            }
+
+                            RowType columnMetricType = columnMetricTypes.get(i);
+                            columnMetricType.writeObject(fields.get(i), getColumnMetricBlock(columnMetricType, min, max, nullCount, nanCount));
+                        }
+                    }));
+                }
+                catch (MissingColumnMetricsException ignored) {
+                    row.add(null);
                 }
-                dataRowBlockBuilder.closeEntry();
-                row.add(dataColumnType.getObject(dataRowBlockBuilder, 0));
             });
 
             records.add(row);
@@ -311,6 +310,10 @@ private RecordCursor buildRecordCursor(Map<StructLikeWrapperWithFieldIdToIndex,
         return new InMemoryRecordSet(resultTypes, records.build()).cursor();
     }
 
+    private static class MissingColumnMetricsException
+            extends Exception
+    {}
+
     private List<Type> partitionTypes()
     {
         ImmutableList.Builder<Type> partitionTypeBuilder = ImmutableList.builder();
@@ -322,18 +325,15 @@ private List<Type> partitionTypes()
         return partitionTypeBuilder.build();
     }
 
-    private static Block getColumnMetricBlock(RowType columnMetricType, Object min, Object max, Long nullCount, Long nanCount)
+    private static SqlRow getColumnMetricBlock(RowType columnMetricType, Object min, Object max, Long nullCount, Long nanCount)
     {
-        BlockBuilder rowBlockBuilder = columnMetricType.createBlockBuilder(null, 1);
-        BlockBuilder builder = rowBlockBuilder.beginBlockEntry();
-        List<RowType.Field> fields = columnMetricType.getFields();
-        writeNativeValue(fields.get(0).getType(), builder, min);
-        writeNativeValue(fields.get(1).getType(), builder, max);
-        writeNativeValue(fields.get(2).getType(), builder, nullCount);
-        writeNativeValue(fields.get(3).getType(), builder, nanCount);
-
-        rowBlockBuilder.closeEntry();
-        return columnMetricType.getObject(rowBlockBuilder, 0);
+        return buildRowValue(columnMetricType, fieldBuilders -> {
+            List<RowType.Field> fields = columnMetricType.getFields();
+            writeNativeValue(fields.get(0).getType(), fieldBuilders.get(0), min);
+            writeNativeValue(fields.get(1).getType(), fieldBuilders.get(1), max);
+            writeNativeValue(fields.get(2).getType(), fieldBuilders.get(2), nullCount);
+            writeNativeValue(fields.get(3).getType(), fieldBuilders.get(3), nanCount);
+        });
     }
 
     @VisibleForTesting
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionTransforms.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionTransforms.java
index 6a4597901e82..f22c64aebe2d 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionTransforms.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/PartitionTransforms.java
@@ -26,12 +26,11 @@
 import io.trino.spi.type.LongTimestampWithTimeZone;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
+import jakarta.annotation.Nullable;
 import org.apache.iceberg.PartitionField;
 import org.joda.time.DateTimeField;
 import org.joda.time.chrono.ISOChronology;
 
-import javax.annotation.Nullable;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.function.Function;
@@ -372,7 +371,7 @@ private static Block extractTimestampWithTimeZone(Block block, ToLongFunction<Lo
 
     private static int hashInteger(Block block, int position)
     {
-        return bucketHash(INTEGER.getLong(block, position));
+        return bucketHash(INTEGER.getInt(block, position));
     }
 
     private static int hashBigint(Block block, int position)
@@ -400,7 +399,7 @@ private static Hasher hashLongDecimal(DecimalType decimal)
 
     private static int hashDate(Block block, int position)
     {
-        return bucketHash(DATE.getLong(block, position));
+        return bucketHash(DATE.getInt(block, position));
     }
 
     private static int hashTime(Block block, int position)
@@ -490,7 +489,7 @@ private static Block truncateInteger(Block block, int width)
 
     private static long truncateInteger(Block block, int position, int width)
     {
-        long value = INTEGER.getLong(block, position);
+        long value = INTEGER.getInt(block, position);
         return value - ((value % width) + width) % width;
     }
 
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/RollbackToSnapshotProcedure.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/RollbackToSnapshotProcedure.java
index 588be5299d78..7a64bd520ffb 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/RollbackToSnapshotProcedure.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/RollbackToSnapshotProcedure.java
@@ -14,6 +14,8 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.trino.plugin.iceberg.catalog.TrinoCatalogFactory;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.ConnectorSession;
@@ -21,9 +23,6 @@
 import io.trino.spi.procedure.Procedure;
 import org.apache.iceberg.Table;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.lang.invoke.MethodHandle;
 
 import static io.trino.plugin.base.util.Procedures.checkProcedureArgument;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/SnapshotsTable.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/SnapshotsTable.java
index bafcc19cfc64..81f9b60699dc 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/SnapshotsTable.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/SnapshotsTable.java
@@ -28,20 +28,38 @@
 import io.trino.spi.type.TimeZoneKey;
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeSignature;
+import org.apache.iceberg.DataTask;
+import org.apache.iceberg.FileScanTask;
+import org.apache.iceberg.StructLike;
 import org.apache.iceberg.Table;
+import org.apache.iceberg.TableScan;
+import org.apache.iceberg.io.CloseableIterable;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.List;
+import java.util.Map;
 
+import static io.trino.plugin.iceberg.IcebergUtil.buildTableScan;
+import static io.trino.plugin.iceberg.IcebergUtil.columnNameToPositionInSchema;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
+import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
+import static org.apache.iceberg.MetadataTableType.SNAPSHOTS;
 
 public class SnapshotsTable
         implements SystemTable
 {
     private final ConnectorTableMetadata tableMetadata;
     private final Table icebergTable;
+    private static final String COMMITTED_AT_COLUMN_NAME = "committed_at";
+    private static final String SNAPSHOT_ID_COLUMN_NAME = "snapshot_id";
+    private static final String PARENT_ID_COLUMN_NAME = "parent_id";
+    private static final String OPERATION_COLUMN_NAME = "operation";
+    private static final String MANIFEST_LIST_COLUMN_NAME = "manifest_list";
+    private static final String SUMMARY_COLUMN_NAME = "summary";
 
     public SnapshotsTable(SchemaTableName tableName, TypeManager typeManager, Table icebergTable)
     {
@@ -50,12 +68,12 @@ public SnapshotsTable(SchemaTableName tableName, TypeManager typeManager, Table
         this.icebergTable = requireNonNull(icebergTable, "icebergTable is null");
         tableMetadata = new ConnectorTableMetadata(requireNonNull(tableName, "tableName is null"),
                 ImmutableList.<ColumnMetadata>builder()
-                        .add(new ColumnMetadata("committed_at", TIMESTAMP_TZ_MILLIS))
-                        .add(new ColumnMetadata("snapshot_id", BIGINT))
-                        .add(new ColumnMetadata("parent_id", BIGINT))
-                        .add(new ColumnMetadata("operation", VARCHAR))
-                        .add(new ColumnMetadata("manifest_list", VARCHAR))
-                        .add(new ColumnMetadata("summary", typeManager.getType(TypeSignature.mapType(VARCHAR.getTypeSignature(), VARCHAR.getTypeSignature()))))
+                        .add(new ColumnMetadata(COMMITTED_AT_COLUMN_NAME, TIMESTAMP_TZ_MILLIS))
+                        .add(new ColumnMetadata(SNAPSHOT_ID_COLUMN_NAME, BIGINT))
+                        .add(new ColumnMetadata(PARENT_ID_COLUMN_NAME, BIGINT))
+                        .add(new ColumnMetadata(OPERATION_COLUMN_NAME, VARCHAR))
+                        .add(new ColumnMetadata(MANIFEST_LIST_COLUMN_NAME, VARCHAR))
+                        .add(new ColumnMetadata(SUMMARY_COLUMN_NAME, typeManager.getType(TypeSignature.mapType(VARCHAR.getTypeSignature(), VARCHAR.getTypeSignature()))))
                         .build());
     }
 
@@ -81,18 +99,46 @@ private static List<Page> buildPages(ConnectorTableMetadata tableMetadata, Conne
     {
         PageListBuilder pagesBuilder = PageListBuilder.forTable(tableMetadata);
 
+        TableScan tableScan = buildTableScan(icebergTable, SNAPSHOTS);
         TimeZoneKey timeZoneKey = session.getTimeZoneKey();
-        icebergTable.snapshots().forEach(snapshot -> {
-            pagesBuilder.beginRow();
-            pagesBuilder.appendTimestampTzMillis(snapshot.timestampMillis(), timeZoneKey);
-            pagesBuilder.appendBigint(snapshot.snapshotId());
-            pagesBuilder.appendBigint(snapshot.parentId());
-            pagesBuilder.appendVarchar(snapshot.operation());
-            pagesBuilder.appendVarchar(snapshot.manifestListLocation());
-            pagesBuilder.appendVarcharVarcharMap(snapshot.summary());
-            pagesBuilder.endRow();
-        });
+
+        Map<String, Integer> columnNameToPosition = columnNameToPositionInSchema(tableScan.schema());
+
+        try (CloseableIterable<FileScanTask> fileScanTasks = tableScan.planFiles()) {
+            fileScanTasks.forEach(fileScanTask -> addRows((DataTask) fileScanTask, pagesBuilder, timeZoneKey, columnNameToPosition));
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
 
         return pagesBuilder.build();
     }
+
+    private static void addRows(DataTask dataTask, PageListBuilder pagesBuilder, TimeZoneKey timeZoneKey, Map<String, Integer> columnNameToPositionInSchema)
+    {
+        try (CloseableIterable<StructLike> dataRows = dataTask.rows()) {
+            dataRows.forEach(dataTaskRow -> addRow(pagesBuilder, dataTaskRow, timeZoneKey, columnNameToPositionInSchema));
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    private static void addRow(PageListBuilder pagesBuilder, StructLike structLike, TimeZoneKey timeZoneKey, Map<String, Integer> columnNameToPositionInSchema)
+    {
+        pagesBuilder.beginRow();
+
+        pagesBuilder.appendTimestampTzMillis(
+                structLike.get(columnNameToPositionInSchema.get(COMMITTED_AT_COLUMN_NAME), Long.class) / MICROSECONDS_PER_MILLISECOND,
+                timeZoneKey);
+        pagesBuilder.appendBigint(structLike.get(columnNameToPositionInSchema.get(SNAPSHOT_ID_COLUMN_NAME), Long.class));
+
+        Long parentId = structLike.get(columnNameToPositionInSchema.get(PARENT_ID_COLUMN_NAME), Long.class);
+        pagesBuilder.appendBigint(parentId != null ? parentId.longValue() : null);
+
+        pagesBuilder.appendVarchar(structLike.get(columnNameToPositionInSchema.get(OPERATION_COLUMN_NAME), String.class));
+        pagesBuilder.appendVarchar(structLike.get(columnNameToPositionInSchema.get(MANIFEST_LIST_COLUMN_NAME), String.class));
+        pagesBuilder.appendVarcharVarcharMap(structLike.get(columnNameToPositionInSchema.get(SUMMARY_COLUMN_NAME), Map.class));
+        pagesBuilder.endRow();
+    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TableStatisticsReader.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TableStatisticsReader.java
index 7c4195da2fb5..8e00d7e0c3da 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TableStatisticsReader.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TableStatisticsReader.java
@@ -14,11 +14,11 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.AbstractSequentialIterator;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import io.airlift.log.Logger;
+import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.predicate.TupleDomain;
@@ -28,9 +28,11 @@
 import io.trino.spi.statistics.TableStatistics;
 import io.trino.spi.type.FixedWidthType;
 import io.trino.spi.type.TypeManager;
+import jakarta.annotation.Nullable;
 import org.apache.iceberg.BlobMetadata;
 import org.apache.iceberg.FileScanTask;
 import org.apache.iceberg.Schema;
+import org.apache.iceberg.Snapshot;
 import org.apache.iceberg.StatisticsFile;
 import org.apache.iceberg.Table;
 import org.apache.iceberg.TableScan;
@@ -39,24 +41,26 @@
 import org.apache.iceberg.types.Type;
 import org.apache.iceberg.types.Types;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.google.common.base.Verify.verifyNotNull;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.Iterables.getOnlyElement;
+import static com.google.common.collect.Streams.stream;
 import static io.trino.plugin.iceberg.ExpressionConverter.toIcebergExpression;
+import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_METADATA;
+import static io.trino.plugin.iceberg.IcebergMetadataColumn.isMetadataColumnId;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.isExtendedStatisticsEnabled;
 import static io.trino.plugin.iceberg.IcebergUtil.getColumns;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
@@ -137,7 +141,8 @@ public static TableStatistics makeTableStatistics(
                 .collect(toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
 
         TableScan tableScan = icebergTable.newScan()
-                .filter(toIcebergExpression(effectivePredicate))
+                // Table enforced constraint may include eg $path column predicate which is not handled by Iceberg library TODO apply $path and $file_modified_time filters here
+                .filter(toIcebergExpression(effectivePredicate.filter((column, domain) -> !isMetadataColumnId(column.getId()))))
                 .useSnapshot(snapshotId)
                 .includeColumnStats();
 
@@ -228,10 +233,7 @@ private static Map<Integer, Long> readNdvs(Table icebergTable, long snapshotId,
         ImmutableMap.Builder<Integer, Long> ndvByColumnId = ImmutableMap.builder();
         Set<Integer> remainingColumnIds = new HashSet<>(columnIds);
 
-        Iterator<StatisticsFile> statisticsFiles = walkStatisticsFiles(icebergTable, snapshotId);
-        while (!remainingColumnIds.isEmpty() && statisticsFiles.hasNext()) {
-            StatisticsFile statisticsFile = statisticsFiles.next();
-
+        getLatestStatisticsFile(icebergTable, snapshotId).ifPresent(statisticsFile -> {
             Map<Integer, BlobMetadata> thetaBlobsByFieldId = statisticsFile.blobMetadata().stream()
                     .filter(blobMetadata -> blobMetadata.type().equals(StandardBlobTypes.APACHE_DATASKETCHES_THETA_V1))
                     .filter(blobMetadata -> blobMetadata.fields().size() == 1)
@@ -252,7 +254,7 @@ private static Map<Integer, Long> readNdvs(Table icebergTable, long snapshotId,
                     ndvByColumnId.put(fieldId, parseLong(ndv));
                 }
             }
-        }
+        });
 
         // TODO (https://github.com/trinodb/trino/issues/15397): remove support for Trino-specific statistics properties
         Iterator<Entry<String, String>> properties = icebergTable.properties().entrySet().iterator();
@@ -276,41 +278,29 @@ private static Map<Integer, Long> readNdvs(Table icebergTable, long snapshotId,
     }
 
     /**
-     * Iterates over existing statistics files present for parent snapshot chain,  starting at {@code startingSnapshotId} (inclusive).
+     * Returns most recent statistics file for the given {@code snapshotId}
      */
-    public static Iterator<StatisticsFile> walkStatisticsFiles(Table icebergTable, long startingSnapshotId)
+    public static Optional<StatisticsFile> getLatestStatisticsFile(Table icebergTable, long snapshotId)
     {
-        return new AbstractIterator<>()
-        {
-            private final Map<Long, StatisticsFile> statsFileBySnapshot = icebergTable.statisticsFiles().stream()
-                    .collect(toMap(
-                            StatisticsFile::snapshotId,
-                            identity(),
-                            (a, b) -> {
-                                throw new IllegalStateException("Unexpected duplicate statistics files %s, %s".formatted(a, b));
-                            },
-                            HashMap::new));
+        if (icebergTable.statisticsFiles().isEmpty()) {
+            return Optional.empty();
+        }
 
-            private final Iterator<Long> snapshots = walkSnapshots(icebergTable, startingSnapshotId);
+        Map<Long, StatisticsFile> statsFileBySnapshot = icebergTable.statisticsFiles().stream()
+                .collect(toMap(
+                        StatisticsFile::snapshotId,
+                        identity(),
+                        (file1, file2) -> {
+                            throw new TrinoException(
+                                    ICEBERG_INVALID_METADATA,
+                                    "Table '%s' has duplicate statistics files '%s' and '%s' for snapshot ID %s"
+                                            .formatted(icebergTable, file1.path(), file2.path(), file1.snapshotId()));
+                        }));
 
-            @Override
-            protected StatisticsFile computeNext()
-            {
-                if (statsFileBySnapshot.isEmpty()) {
-                    // Already found all statistics files
-                    return endOfData();
-                }
-
-                while (snapshots.hasNext()) {
-                    long snapshotId = snapshots.next();
-                    StatisticsFile statisticsFile = statsFileBySnapshot.remove(snapshotId);
-                    if (statisticsFile != null) {
-                        return statisticsFile;
-                    }
-                }
-                return endOfData();
-            }
-        };
+        return stream(walkSnapshots(icebergTable, snapshotId))
+                .map(statsFileBySnapshot::get)
+                .filter(Objects::nonNull)
+                .findFirst();
     }
 
     /**
@@ -325,8 +315,16 @@ protected Long computeNext(Long previous)
             {
                 requireNonNull(previous, "previous is null");
                 @Nullable
-                Long parentId = icebergTable.snapshot(previous).parentId();
-                return parentId;
+                Snapshot snapshot = icebergTable.snapshot(previous);
+                if (snapshot == null) {
+                    // Snapshot referenced by `previous` is expired from table history
+                    return null;
+                }
+                if (snapshot.parentId() == null) {
+                    // Snapshot referenced by `previous` had no parent.
+                    return null;
+                }
+                return verifyNotNull(snapshot.parentId(), "snapshot.parentId()");
             }
         };
     }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TableStatisticsWriter.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TableStatisticsWriter.java
index 9b9303b65445..473df30b3316 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TableStatisticsWriter.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TableStatisticsWriter.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.graph.Traverser;
+import com.google.inject.Inject;
 import io.trino.plugin.base.io.ByteBuffers;
 import io.trino.plugin.hive.NodeVersion;
 import io.trino.spi.connector.ConnectorSession;
@@ -45,13 +46,9 @@
 import org.apache.iceberg.types.Types;
 import org.apache.iceberg.util.Pair;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.ByteBuffer;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,11 +58,10 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.google.common.collect.MoreCollectors.toOptional;
 import static com.google.common.collect.Streams.stream;
 import static io.trino.plugin.base.util.Closables.closeAllSuppress;
 import static io.trino.plugin.iceberg.TableStatisticsReader.APACHE_DATASKETCHES_THETA_V1_NDV_PROPERTY;
-import static io.trino.plugin.iceberg.TableStatisticsReader.walkStatisticsFiles;
+import static io.trino.plugin.iceberg.TableStatisticsReader.getLatestStatisticsFile;
 import static io.trino.plugin.iceberg.TableStatisticsWriter.StatsUpdateMode.INCREMENTAL_UPDATE;
 import static io.trino.plugin.iceberg.TableStatisticsWriter.StatsUpdateMode.REPLACE;
 import static java.lang.String.format;
@@ -137,9 +133,7 @@ public StatisticsFile writeStatisticsFile(
             try (PuffinWriter writer = Puffin.write(outputFile)
                     .createdBy("Trino version " + trinoVersion)
                     .build()) {
-                table.statisticsFiles().stream()
-                        .filter(statisticsFile -> statisticsFile.snapshotId() == snapshotId)
-                        .collect(toOptional())
+                getLatestStatisticsFile(table, snapshotId)
                         .ifPresent(previousStatisticsFile -> copyRetainedStatistics(fileIO, previousStatisticsFile, validFieldIds, ndvSketches.keySet(), writer));
 
                 ndvSketches.entrySet().stream()
@@ -198,18 +192,16 @@ private CollectedStatistics mergeStatisticsIfNecessary(
         return switch (updateMode) {
             case REPLACE -> collectedStatistics;
             case INCREMENTAL_UPDATE -> {
-                Map<Integer, CompactSketch> collectedNdvSketches = collectedStatistics.ndvSketches();
+                Optional<StatisticsFile> latestStatisticsFile = getLatestStatisticsFile(table, snapshotId);
                 ImmutableMap.Builder<Integer, CompactSketch> ndvSketches = ImmutableMap.builder();
-
-                Set<Integer> pendingPreviousNdvSketches = new HashSet<>(collectedNdvSketches.keySet());
-                Iterator<StatisticsFile> statisticsFiles = walkStatisticsFiles(table, snapshotId);
-                while (!pendingPreviousNdvSketches.isEmpty() && statisticsFiles.hasNext()) {
-                    StatisticsFile statisticsFile = statisticsFiles.next();
-
+                if (latestStatisticsFile.isPresent()) {
+                    Map<Integer, CompactSketch> collectedNdvSketches = collectedStatistics.ndvSketches();
+                    Set<Integer> columnsWithRecentlyComputedStats = collectedNdvSketches.keySet();
+                    StatisticsFile statisticsFile = latestStatisticsFile.get();
                     boolean hasUsefulData = statisticsFile.blobMetadata().stream()
                             .filter(blobMetadata -> blobMetadata.type().equals(StandardBlobTypes.APACHE_DATASKETCHES_THETA_V1))
                             .filter(blobMetadata -> blobMetadata.fields().size() == 1)
-                            .anyMatch(blobMetadata -> pendingPreviousNdvSketches.contains(getOnlyElement(blobMetadata.fields())));
+                            .anyMatch(blobMetadata -> columnsWithRecentlyComputedStats.contains(getOnlyElement(blobMetadata.fields())));
 
                     if (hasUsefulData) {
                         try (PuffinReader reader = Puffin.read(fileIO.newInputFile(statisticsFile.path()))
@@ -219,11 +211,10 @@ private CollectedStatistics mergeStatisticsIfNecessary(
                             List<BlobMetadata> toRead = reader.fileMetadata().blobs().stream()
                                     .filter(blobMetadata -> blobMetadata.type().equals(APACHE_DATASKETCHES_THETA_V1))
                                     .filter(blobMetadata -> blobMetadata.inputFields().size() == 1)
-                                    .filter(blobMetadata -> pendingPreviousNdvSketches.contains(getOnlyElement(blobMetadata.inputFields())))
+                                    .filter(blobMetadata -> columnsWithRecentlyComputedStats.contains(getOnlyElement(blobMetadata.inputFields())))
                                     .collect(toImmutableList());
                             for (Pair<BlobMetadata, ByteBuffer> read : reader.readAll(toRead)) {
                                 Integer fieldId = getOnlyElement(read.first().inputFields());
-                                checkState(pendingPreviousNdvSketches.remove(fieldId), "Unwanted read of stats for field %s", fieldId);
                                 Memory memory = Memory.wrap(ByteBuffers.getBytes(read.second())); // Memory.wrap(ByteBuffer) results in a different deserialized state
                                 CompactSketch previousSketch = CompactSketch.wrap(memory);
                                 CompactSketch newSketch = requireNonNull(collectedNdvSketches.get(fieldId), "ndvSketches.get(fieldId) is null");
@@ -235,7 +226,6 @@ private CollectedStatistics mergeStatisticsIfNecessary(
                         }
                     }
                 }
-
                 yield new CollectedStatistics(ndvSketches.buildOrThrow());
             }
         };
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TrinoOrcDataSource.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TrinoOrcDataSource.java
index ce49c2cb7b5c..0dca29a6561d 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TrinoOrcDataSource.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TrinoOrcDataSource.java
@@ -34,7 +34,7 @@ public class TrinoOrcDataSource
     public TrinoOrcDataSource(TrinoInputFile file, OrcReaderOptions options, FileFormatDataSourceStats stats)
             throws IOException
     {
-        super(new OrcDataSourceId(file.location()), file.length(), options);
+        super(new OrcDataSourceId(file.location().toString()), file.length(), options);
         this.stats = requireNonNull(stats, "stats is null");
         this.input = file.newInput();
     }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/aggregation/IcebergThetaSketchForStats.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/aggregation/IcebergThetaSketchForStats.java
index e7d4bf6b39f9..36dc301f6b40 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/aggregation/IcebergThetaSketchForStats.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/aggregation/IcebergThetaSketchForStats.java
@@ -13,8 +13,8 @@
  */
 package io.trino.plugin.iceberg.aggregation;
 
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ValueBlock;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.BlockIndex;
@@ -26,15 +26,14 @@
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.Type;
-import org.apache.datasketches.Family;
+import jakarta.annotation.Nullable;
+import org.apache.datasketches.common.Family;
 import org.apache.datasketches.theta.SetOperation;
 import org.apache.datasketches.theta.Sketch;
 import org.apache.datasketches.theta.Union;
 import org.apache.datasketches.theta.UpdateSketch;
 import org.apache.iceberg.types.Conversions;
 
-import javax.annotation.Nullable;
-
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -54,7 +53,7 @@ private IcebergThetaSketchForStats() {}
 
     @InputFunction
     @TypeParameter("T")
-    public static void input(@TypeParameter("T") Type type, @AggregationState DataSketchState state, @BlockPosition @SqlType("T") Block block, @BlockIndex int index)
+    public static void input(@TypeParameter("T") Type type, @AggregationState DataSketchState state, @BlockPosition @SqlType("T") ValueBlock block, @BlockIndex int index)
     {
         verify(!block.isNull(index), "Input function is not expected to be called on a NULL input");
 
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractIcebergTableOperations.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractIcebergTableOperations.java
index b35b623318ef..855f66de3f35 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractIcebergTableOperations.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractIcebergTableOperations.java
@@ -15,22 +15,25 @@
 
 import dev.failsafe.Failsafe;
 import dev.failsafe.RetryPolicy;
+import io.trino.annotation.NotThreadSafe;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.StorageFormat;
 import io.trino.plugin.iceberg.util.HiveSchemaUtil;
+import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.SchemaTableName;
+import jakarta.annotation.Nullable;
 import org.apache.iceberg.TableMetadata;
 import org.apache.iceberg.TableMetadataParser;
 import org.apache.iceberg.exceptions.CommitFailedException;
+import org.apache.iceberg.exceptions.ValidationException;
 import org.apache.iceberg.io.FileIO;
 import org.apache.iceberg.io.LocationProvider;
 import org.apache.iceberg.io.OutputFile;
 import org.apache.iceberg.types.Types.NestedField;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.NotThreadSafe;
-
+import java.io.FileNotFoundException;
 import java.time.Duration;
 import java.util.List;
 import java.util.Objects;
@@ -43,6 +46,8 @@
 import static io.trino.plugin.hive.util.HiveClassNames.FILE_INPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.FILE_OUTPUT_FORMAT_CLASS;
 import static io.trino.plugin.hive.util.HiveClassNames.LAZY_SIMPLE_SERDE_CLASS;
+import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_METADATA;
+import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_MISSING_METADATA;
 import static io.trino.plugin.iceberg.IcebergUtil.METADATA_FOLDER_NAME;
 import static io.trino.plugin.iceberg.IcebergUtil.fixBrokenMetadataLocation;
 import static io.trino.plugin.iceberg.IcebergUtil.getLocationProvider;
@@ -104,7 +109,7 @@ public void initializeFromMetadata(TableMetadata tableMetadata)
         currentMetadata = tableMetadata;
         currentMetadataLocation = tableMetadata.metadataFileLocation();
         shouldRefresh = false;
-        version = parseVersion(currentMetadataLocation);
+        version = OptionalInt.of(parseVersion(Location.of(currentMetadataLocation).fileName()));
     }
 
     @Override
@@ -226,13 +231,31 @@ protected void refreshFromMetadataLocation(String newLocation)
             return;
         }
 
-        TableMetadata newMetadata = Failsafe.with(RetryPolicy.builder()
-                        .withMaxRetries(20)
-                        .withBackoff(100, 5000, MILLIS, 4.0)
-                        .withMaxDuration(Duration.ofMinutes(10))
-                        .abortOn(org.apache.iceberg.exceptions.NotFoundException.class)
-                        .build()) // qualified name, as this is NOT the io.trino.spi.connector.NotFoundException
-                .get(() -> TableMetadataParser.read(fileIo, io().newInputFile(newLocation)));
+        // a table that is replaced doesn't need its metadata reloaded
+        if (newLocation == null) {
+            shouldRefresh = false;
+            return;
+        }
+
+        TableMetadata newMetadata;
+        try {
+            newMetadata = Failsafe.with(RetryPolicy.builder()
+                            .withMaxRetries(20)
+                            .withBackoff(100, 5000, MILLIS, 4.0)
+                            .withMaxDuration(Duration.ofMinutes(10))
+                            .abortOn(failure -> failure instanceof ValidationException || isNotFoundException(failure))
+                            .build())
+                    .get(() -> TableMetadataParser.read(fileIo, io().newInputFile(newLocation)));
+        }
+        catch (Throwable failure) {
+            if (isNotFoundException(failure)) {
+                throw new TrinoException(ICEBERG_MISSING_METADATA, "Metadata not found in metadata location for table " + getSchemaTableName(), failure);
+            }
+            if (failure instanceof ValidationException) {
+                throw new TrinoException(ICEBERG_INVALID_METADATA, "Invalid metadata file for table " + getSchemaTableName(), failure);
+            }
+            throw failure;
+        }
 
         String newUUID = newMetadata.uuid();
         if (currentMetadata != null) {
@@ -242,10 +265,18 @@ protected void refreshFromMetadataLocation(String newLocation)
 
         currentMetadata = newMetadata;
         currentMetadataLocation = newLocation;
-        version = parseVersion(newLocation);
+        version = OptionalInt.of(parseVersion(Location.of(newLocation).fileName()));
         shouldRefresh = false;
     }
 
+    private static boolean isNotFoundException(Throwable failure)
+    {
+        // qualified name, as this is NOT the io.trino.spi.connector.NotFoundException
+        return failure instanceof org.apache.iceberg.exceptions.NotFoundException ||
+                // This is used in context where the code cannot throw a checked exception, so FileNotFoundException would need to be wrapped
+                failure.getCause() instanceof FileNotFoundException;
+    }
+
     protected static String newTableMetadataFilePath(TableMetadata meta, int newVersion)
     {
         String codec = meta.property(METADATA_COMPRESSION, METADATA_COMPRESSION_DEFAULT);
@@ -261,7 +292,7 @@ protected static String metadataFileLocation(TableMetadata metadata, String file
         return format("%s/%s/%s", stripTrailingSlash(metadata.location()), METADATA_FOLDER_NAME, filename);
     }
 
-    protected static List<Column> toHiveColumns(List<NestedField> columns)
+    public static List<Column> toHiveColumns(List<NestedField> columns)
     {
         return columns.stream()
                 .map(column -> new Column(
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractTrinoCatalog.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractTrinoCatalog.java
index 852f4561c4a3..a6f3fcbad350 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractTrinoCatalog.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractTrinoCatalog.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import dev.failsafe.Failsafe;
 import dev.failsafe.RetryPolicy;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.HiveMetadata;
@@ -31,6 +32,7 @@
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.ConnectorViewDefinition;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.MapType;
@@ -42,6 +44,7 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
 import org.apache.iceberg.AppendFiles;
+import org.apache.iceberg.BaseTable;
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.SortOrder;
@@ -69,6 +72,7 @@
 import static io.trino.plugin.hive.ViewReaderUtil.ICEBERG_MATERIALIZED_VIEW_COMMENT;
 import static io.trino.plugin.hive.ViewReaderUtil.PRESTO_VIEW_FLAG;
 import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.mappedCopy;
+import static io.trino.plugin.hive.util.HiveUtil.escapeTableName;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_FILESYSTEM_ERROR;
 import static io.trino.plugin.iceberg.IcebergMaterializedViewAdditionalProperties.STORAGE_SCHEMA;
 import static io.trino.plugin.iceberg.IcebergMaterializedViewAdditionalProperties.getStorageSchema;
@@ -94,6 +98,7 @@
 import static java.util.UUID.randomUUID;
 import static org.apache.iceberg.TableMetadata.newTableMetadata;
 import static org.apache.iceberg.TableProperties.DEFAULT_FILE_FORMAT_DEFAULT;
+import static org.apache.iceberg.Transactions.createOrReplaceTableTransaction;
 import static org.apache.iceberg.Transactions.createTableTransaction;
 
 public abstract class AbstractTrinoCatalog
@@ -200,19 +205,59 @@ protected Transaction newCreateTableTransaction(
         return createTableTransaction(schemaTableName.toString(), ops, metadata);
     }
 
+    protected Transaction newCreateOrReplaceTableTransaction(
+            ConnectorSession session,
+            SchemaTableName schemaTableName,
+            Schema schema,
+            PartitionSpec partitionSpec,
+            SortOrder sortOrder,
+            String location,
+            Map<String, String> properties,
+            Optional<String> owner)
+    {
+        BaseTable table;
+        Optional<TableMetadata> metadata = Optional.empty();
+        try {
+            table = (BaseTable) loadTable(session, new SchemaTableName(schemaTableName.getSchemaName(), schemaTableName.getTableName()));
+            metadata = Optional.of(table.operations().current());
+        }
+        catch (TableNotFoundException ignored) {
+            // ignored
+        }
+        IcebergTableOperations operations = tableOperationsProvider.createTableOperations(
+                this,
+                session,
+                schemaTableName.getSchemaName(),
+                schemaTableName.getTableName(),
+                owner,
+                Optional.of(location));
+        TableMetadata newMetaData;
+        if (metadata.isPresent()) {
+            operations.initializeFromMetadata(metadata.get());
+            newMetaData = operations.current()
+                    // don't inherit table properties from earlier snapshots
+                    .replaceProperties(properties)
+                    .buildReplacement(schema, partitionSpec, sortOrder, location, properties);
+        }
+        else {
+            newMetaData = newTableMetadata(schema, partitionSpec, sortOrder, location, properties);
+        }
+        return createOrReplaceTableTransaction(schemaTableName.toString(), operations, newMetaData);
+    }
+
     protected String createNewTableName(String baseTableName)
     {
-        String tableName = baseTableName;
+        String tableNameLocationComponent = escapeTableName(baseTableName);
         if (useUniqueTableLocation) {
-            tableName += "-" + randomUUID().toString().replace("-", "");
+            tableNameLocationComponent += "-" + randomUUID().toString().replace("-", "");
         }
-        return tableName;
+        return tableNameLocationComponent;
     }
 
     protected void deleteTableDirectory(TrinoFileSystem fileSystem, SchemaTableName schemaTableName, String tableLocation)
     {
         try {
-            fileSystem.deleteDirectory(tableLocation);
+            fileSystem.deleteDirectory(Location.of(tableLocation));
         }
         catch (IOException e) {
             throw new TrinoException(ICEBERG_FILESYSTEM_ERROR, format("Failed to delete directory %s of the table %s", tableLocation, schemaTableName), e);
@@ -271,7 +316,7 @@ protected SchemaTableName createMaterializedViewStorageTable(ConnectorSession se
                 });
 
         ConnectorTableMetadata tableMetadata = new ConnectorTableMetadata(storageTable, columns, storageTableProperties, Optional.empty());
-        Transaction transaction = IcebergUtil.newCreateTableTransaction(this, tableMetadata, session);
+        Transaction transaction = IcebergUtil.newCreateTableTransaction(this, tableMetadata, session, false);
         AppendFiles appendFiles = transaction.newAppend();
         commit(appendFiles, session);
         transaction.commitTransaction();
@@ -343,18 +388,24 @@ protected ConnectorMaterializedViewDefinition getMaterializedViewDefinition(
                 Optional.of(new CatalogSchemaTableName(catalogName.toString(), storageTableName)),
                 definition.getCatalog(),
                 definition.getSchema(),
-                definition.getColumns().stream()
-                        .map(column -> new ConnectorMaterializedViewDefinition.Column(column.getName(), column.getType()))
-                        .collect(toImmutableList()),
+                toSpiMaterializedViewColumns(definition.getColumns()),
                 definition.getGracePeriod(),
                 definition.getComment(),
                 owner,
+                definition.getPath(),
                 ImmutableMap.<String, Object>builder()
                         .putAll(getIcebergTableProperties(icebergTable))
                         .put(STORAGE_SCHEMA, storageTableName.getSchemaName())
                         .buildOrThrow());
     }
 
+    protected List<ConnectorMaterializedViewDefinition.Column> toSpiMaterializedViewColumns(List<IcebergMaterializedViewDefinition.Column> columns)
+    {
+        return columns.stream()
+                .map(column -> new ConnectorMaterializedViewDefinition.Column(column.getName(), column.getType(), column.getComment()))
+                .collect(toImmutableList());
+    }
+
     protected Map<String, String> createMaterializedViewProperties(ConnectorSession session, SchemaTableName storageTableName)
     {
         return ImmutableMap.<String, String>builder()
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/IcebergCatalogModule.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/IcebergCatalogModule.java
index a2cf660043fc..e9440c4bebdd 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/IcebergCatalogModule.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/IcebergCatalogModule.java
@@ -22,12 +22,14 @@
 import io.trino.plugin.iceberg.catalog.glue.IcebergGlueCatalogModule;
 import io.trino.plugin.iceberg.catalog.hms.IcebergHiveMetastoreCatalogModule;
 import io.trino.plugin.iceberg.catalog.jdbc.IcebergJdbcCatalogModule;
+import io.trino.plugin.iceberg.catalog.nessie.IcebergNessieCatalogModule;
 import io.trino.plugin.iceberg.catalog.rest.IcebergRestCatalogModule;
 
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.trino.plugin.iceberg.CatalogType.GLUE;
 import static io.trino.plugin.iceberg.CatalogType.HIVE_METASTORE;
 import static io.trino.plugin.iceberg.CatalogType.JDBC;
+import static io.trino.plugin.iceberg.CatalogType.NESSIE;
 import static io.trino.plugin.iceberg.CatalogType.REST;
 import static io.trino.plugin.iceberg.CatalogType.TESTING_FILE_METASTORE;
 
@@ -42,6 +44,7 @@ protected void setup(Binder binder)
         bindCatalogModule(GLUE, new IcebergGlueCatalogModule());
         bindCatalogModule(REST, new IcebergRestCatalogModule());
         bindCatalogModule(JDBC, new IcebergJdbcCatalogModule());
+        bindCatalogModule(NESSIE, new IcebergNessieCatalogModule());
     }
 
     private void bindCatalogModule(CatalogType catalogType, Module module)
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/TrinoCatalog.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/TrinoCatalog.java
index 0e9333802b42..03ba84d0f533 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/TrinoCatalog.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/TrinoCatalog.java
@@ -16,20 +16,28 @@
 import io.trino.plugin.iceberg.ColumnIdentity;
 import io.trino.plugin.iceberg.UnknownTableTypeException;
 import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorMaterializedViewDefinition;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorViewDefinition;
+import io.trino.spi.connector.RelationColumnsMetadata;
+import io.trino.spi.connector.RelationCommentMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.security.TrinoPrincipal;
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.SortOrder;
 import org.apache.iceberg.Table;
+import org.apache.iceberg.TableMetadata;
 import org.apache.iceberg.Transaction;
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
 
 /**
  * An interface to allow different Iceberg catalog implementations in IcebergMetadata.
@@ -66,6 +74,18 @@ public interface TrinoCatalog
 
     List<SchemaTableName> listTables(ConnectorSession session, Optional<String> namespace);
 
+    Optional<Iterator<RelationColumnsMetadata>> streamRelationColumns(
+            ConnectorSession session,
+            Optional<String> namespace,
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Predicate<SchemaTableName> isRedirected);
+
+    Optional<Iterator<RelationCommentMetadata>> streamRelationComments(
+            ConnectorSession session,
+            Optional<String> namespace,
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Predicate<SchemaTableName> isRedirected);
+
     Transaction newCreateTableTransaction(
             ConnectorSession session,
             SchemaTableName schemaTableName,
@@ -75,12 +95,23 @@ Transaction newCreateTableTransaction(
             String location,
             Map<String, String> properties);
 
-    void registerTable(ConnectorSession session, SchemaTableName tableName, String tableLocation, String metadataLocation);
+    Transaction newCreateOrReplaceTableTransaction(
+            ConnectorSession session,
+            SchemaTableName schemaTableName,
+            Schema schema,
+            PartitionSpec partitionSpec,
+            SortOrder sortOrder,
+            String location,
+            Map<String, String> properties);
+
+    void registerTable(ConnectorSession session, SchemaTableName tableName, TableMetadata tableMetadata);
 
     void unregisterTable(ConnectorSession session, SchemaTableName tableName);
 
     void dropTable(ConnectorSession session, SchemaTableName schemaTableName);
 
+    void dropCorruptedTable(ConnectorSession session, SchemaTableName schemaTableName);
+
     void renameTable(ConnectorSession session, SchemaTableName from, SchemaTableName to);
 
     /**
@@ -93,6 +124,11 @@ Transaction newCreateTableTransaction(
      */
     Table loadTable(ConnectorSession session, SchemaTableName schemaTableName);
 
+    /**
+     * Bulk load column metadata. The returned map may contain fewer entries then asked for.
+     */
+    Map<SchemaTableName, List<ColumnMetadata>> tryGetColumnMetadata(ConnectorSession session, List<SchemaTableName> tables);
+
     void updateTableComment(ConnectorSession session, SchemaTableName schemaTableName, Optional<String> comment);
 
     void updateViewComment(ConnectorSession session, SchemaTableName schemaViewName, Optional<String> comment);
@@ -126,6 +162,8 @@ void createMaterializedView(
             boolean replace,
             boolean ignoreExisting);
 
+    void updateMaterializedViewColumnComment(ConnectorSession session, SchemaTableName schemaViewName, String columnName, Optional<String> comment);
+
     void dropMaterializedView(ConnectorSession session, SchemaTableName viewName);
 
     Optional<ConnectorMaterializedViewDefinition> getMaterializedView(ConnectorSession session, SchemaTableName viewName);
@@ -134,5 +172,5 @@ void createMaterializedView(
 
     void updateColumnComment(ConnectorSession session, SchemaTableName schemaTableName, ColumnIdentity columnIdentity, Optional<String> comment);
 
-    Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName);
+    Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName, String hiveCatalogName);
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperations.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperations.java
index da07f2c513a9..e25fac198f77 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperations.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperations.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.iceberg.catalog.file;
 
+import io.trino.annotation.NotThreadSafe;
 import io.trino.plugin.hive.metastore.MetastoreUtil;
 import io.trino.plugin.hive.metastore.PrincipalPrivileges;
 import io.trino.plugin.hive.metastore.Table;
@@ -25,15 +26,12 @@
 import org.apache.iceberg.exceptions.CommitStateUnknownException;
 import org.apache.iceberg.io.FileIO;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_CONCURRENT_MODIFICATION_DETECTED;
 import static io.trino.plugin.hive.metastore.PrincipalPrivileges.NO_PRIVILEGES;
 import static org.apache.iceberg.BaseMetastoreTableOperations.METADATA_LOCATION_PROP;
-import static org.apache.iceberg.BaseMetastoreTableOperations.PREVIOUS_METADATA_LOCATION_PROP;
 
 @NotThreadSafe
 public class FileMetastoreTableOperations
@@ -66,10 +64,7 @@ protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
         String newMetadataLocation = writeNewMetadata(metadata, version.orElseThrow() + 1);
 
         Table table = Table.builder(currentTable)
-                .setDataColumns(toHiveColumns(metadata.schema().columns()))
-                .withStorage(storage -> storage.setLocation(metadata.location()))
-                .setParameter(METADATA_LOCATION_PROP, newMetadataLocation)
-                .setParameter(PREVIOUS_METADATA_LOCATION_PROP, currentMetadataLocation)
+                .apply(builder -> updateMetastoreTable(builder, metadata, newMetadataLocation, Optional.of(currentMetadataLocation)))
                 .build();
 
         // todo privileges should not be replaced for an alter
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperationsProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperationsProvider.java
index 6873999d81bb..b14f952b0e94 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperationsProvider.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperationsProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.iceberg.catalog.file;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.iceberg.catalog.IcebergTableOperations;
 import io.trino.plugin.iceberg.catalog.IcebergTableOperationsProvider;
@@ -21,8 +22,6 @@
 import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergTableOperations.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergTableOperations.java
index 3201a9963c87..50e19f2c43fa 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergTableOperations.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergTableOperations.java
@@ -18,7 +18,6 @@
 import com.amazonaws.services.glue.model.ConcurrentModificationException;
 import com.amazonaws.services.glue.model.CreateTableRequest;
 import com.amazonaws.services.glue.model.EntityNotFoundException;
-import com.amazonaws.services.glue.model.GetTableRequest;
 import com.amazonaws.services.glue.model.InvalidInputException;
 import com.amazonaws.services.glue.model.ResourceNumberLimitExceededException;
 import com.amazonaws.services.glue.model.Table;
@@ -30,21 +29,22 @@
 import io.trino.plugin.iceberg.catalog.AbstractIcebergTableOperations;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.type.TypeManager;
+import jakarta.annotation.Nullable;
 import org.apache.iceberg.TableMetadata;
 import org.apache.iceberg.exceptions.CommitFailedException;
 import org.apache.iceberg.exceptions.CommitStateUnknownException;
 import org.apache.iceberg.io.FileIO;
 
-import javax.annotation.Nullable;
-
 import java.util.Map;
 import java.util.Optional;
 
-import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Verify.verify;
-import static io.trino.plugin.hive.ViewReaderUtil.isHiveOrPrestoView;
-import static io.trino.plugin.hive.ViewReaderUtil.isPrestoView;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoMaterializedView;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoView;
+import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableParameters;
 import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableType;
 import static io.trino.plugin.hive.util.HiveUtil.isIcebergTable;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_METADATA;
@@ -57,15 +57,21 @@
 public class GlueIcebergTableOperations
         extends AbstractIcebergTableOperations
 {
+    private final TypeManager typeManager;
+    private final boolean cacheTableMetadata;
     private final AWSGlueAsync glueClient;
     private final GlueMetastoreStats stats;
+    private final GetGlueTable getGlueTable;
 
     @Nullable
     private String glueVersionId;
 
     protected GlueIcebergTableOperations(
+            TypeManager typeManager,
+            boolean cacheTableMetadata,
             AWSGlueAsync glueClient,
             GlueMetastoreStats stats,
+            GetGlueTable getGlueTable,
             FileIO fileIo,
             ConnectorSession session,
             String database,
@@ -74,19 +80,24 @@ protected GlueIcebergTableOperations(
             Optional<String> location)
     {
         super(fileIo, session, database, table, owner, location);
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.cacheTableMetadata = cacheTableMetadata;
         this.glueClient = requireNonNull(glueClient, "glueClient is null");
         this.stats = requireNonNull(stats, "stats is null");
+        this.getGlueTable = requireNonNull(getGlueTable, "getGlueTable is null");
     }
 
     @Override
     protected String getRefreshedLocation(boolean invalidateCaches)
     {
-        Table table = getTable();
+        Table table = getTable(invalidateCaches);
         glueVersionId = table.getVersionId();
 
-        Map<String, String> parameters = firstNonNull(table.getParameters(), ImmutableMap.of());
-        if (isPrestoView(parameters) && isHiveOrPrestoView(getTableType(table))) {
-            // this is a Presto Hive view, hence not a table
+        String tableType = getTableType(table);
+        Map<String, String> parameters = getTableParameters(table);
+        if (isTrinoView(tableType, parameters) || isTrinoMaterializedView(tableType, parameters)) {
+            // this is a Hive view or Trino/Presto view, or Trino materialized view, hence not a table
+            // TODO table operations should not be constructed for views (remove exception-driven code path)
             throw new TableNotFoundException(getSchemaTableName());
         }
         if (!isIcebergTable(parameters)) {
@@ -105,7 +116,7 @@ protected void commitNewTable(TableMetadata metadata)
     {
         verify(version.isEmpty(), "commitNewTable called on a table which already exists");
         String newMetadataLocation = writeNewMetadata(metadata, 0);
-        TableInput tableInput = getTableInput(tableName, owner, ImmutableMap.of(METADATA_LOCATION_PROP, newMetadataLocation));
+        TableInput tableInput = getTableInput(typeManager, tableName, owner, metadata, newMetadataLocation, ImmutableMap.of(), cacheTableMetadata);
 
         CreateTableRequest createTableRequest = new CreateTableRequest()
                 .withDatabaseName(database)
@@ -129,11 +140,13 @@ protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
     {
         String newMetadataLocation = writeNewMetadata(metadata, version.orElseThrow() + 1);
         TableInput tableInput = getTableInput(
+                typeManager,
                 tableName,
                 owner,
-                ImmutableMap.of(
-                        METADATA_LOCATION_PROP, newMetadataLocation,
-                        PREVIOUS_METADATA_LOCATION_PROP, currentMetadataLocation));
+                metadata,
+                newMetadataLocation,
+                ImmutableMap.of(PREVIOUS_METADATA_LOCATION_PROP, currentMetadataLocation),
+                cacheTableMetadata);
 
         UpdateTableRequest updateTableRequest = new UpdateTableRequest()
                 .withDatabaseName(database)
@@ -158,16 +171,13 @@ protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
         shouldRefresh = true;
     }
 
-    private Table getTable()
+    private Table getTable(boolean invalidateCaches)
     {
-        try {
-            GetTableRequest getTableRequest = new GetTableRequest()
-                    .withDatabaseName(database)
-                    .withName(tableName);
-            return stats.getGetTable().call(() -> glueClient.getTable(getTableRequest).getTable());
-        }
-        catch (EntityNotFoundException e) {
-            throw new TableNotFoundException(getSchemaTableName(), e);
-        }
+        return getGlueTable.get(new SchemaTableName(database, tableName), invalidateCaches);
+    }
+
+    public interface GetGlueTable
+    {
+        Table get(SchemaTableName tableName, boolean invalidateCaches);
     }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergTableOperationsProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergTableOperationsProvider.java
index 8b60aa3854b5..4b54259edf7a 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergTableOperationsProvider.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergTableOperationsProvider.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.iceberg.catalog.glue;
 
 import com.amazonaws.services.glue.AWSGlueAsync;
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.hive.metastore.glue.GlueMetastoreStats;
 import io.trino.plugin.iceberg.catalog.IcebergTableOperations;
@@ -21,8 +22,7 @@
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
 import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
 import io.trino.spi.connector.ConnectorSession;
-
-import javax.inject.Inject;
+import io.trino.spi.type.TypeManager;
 
 import java.util.Optional;
 
@@ -31,16 +31,22 @@
 public class GlueIcebergTableOperationsProvider
         implements IcebergTableOperationsProvider
 {
+    private final TypeManager typeManager;
+    private final boolean cacheTableMetadata;
     private final TrinoFileSystemFactory fileSystemFactory;
     private final AWSGlueAsync glueClient;
     private final GlueMetastoreStats stats;
 
     @Inject
     public GlueIcebergTableOperationsProvider(
+            TypeManager typeManager,
+            IcebergGlueCatalogConfig catalogConfig,
             TrinoFileSystemFactory fileSystemFactory,
             GlueMetastoreStats stats,
             AWSGlueAsync glueClient)
     {
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.cacheTableMetadata = catalogConfig.isCacheTableMetadata();
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.stats = requireNonNull(stats, "stats is null");
         this.glueClient = requireNonNull(glueClient, "glueClient is null");
@@ -56,8 +62,13 @@ public IcebergTableOperations createTableOperations(
             Optional<String> location)
     {
         return new GlueIcebergTableOperations(
+                typeManager,
+                cacheTableMetadata,
                 glueClient,
                 stats,
+                // Share Glue Table cache between Catalog and TableOperations so that, when doing metadata queries (e.g. information_schema.columns)
+                // the GetTableRequest is issued once per table.
+                ((TrinoGlueCatalog) catalog)::getTable,
                 new ForwardingFileIo(fileSystemFactory.create(session)),
                 session,
                 database,
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergUtil.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergUtil.java
index bd2b047c90ee..b8988d3112d2 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergUtil.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergUtil.java
@@ -13,37 +13,187 @@
  */
 package io.trino.plugin.iceberg.catalog.glue;
 
+import com.amazonaws.services.glue.model.Column;
+import com.amazonaws.services.glue.model.StorageDescriptor;
 import com.amazonaws.services.glue.model.TableInput;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.iceberg.TypeConverter;
+import io.trino.spi.type.TypeManager;
+import jakarta.annotation.Nullable;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
 
-import javax.annotation.Nullable;
-
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.collect.ImmutableList.builderWithExpectedSize;
 import static io.trino.plugin.hive.HiveMetadata.PRESTO_VIEW_EXPANDED_TEXT_MARKER;
+import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
 import static io.trino.plugin.hive.TableType.EXTERNAL_TABLE;
 import static io.trino.plugin.hive.TableType.VIRTUAL_VIEW;
 import static io.trino.plugin.hive.ViewReaderUtil.ICEBERG_MATERIALIZED_VIEW_COMMENT;
+import static io.trino.plugin.iceberg.IcebergUtil.COLUMN_TRINO_NOT_NULL_PROPERTY;
+import static io.trino.plugin.iceberg.IcebergUtil.COLUMN_TRINO_TYPE_ID_PROPERTY;
+import static io.trino.plugin.iceberg.IcebergUtil.TRINO_TABLE_METADATA_INFO_VALID_FOR;
 import static java.util.Locale.ENGLISH;
 import static org.apache.iceberg.BaseMetastoreTableOperations.ICEBERG_TABLE_TYPE_VALUE;
+import static org.apache.iceberg.BaseMetastoreTableOperations.METADATA_LOCATION_PROP;
 import static org.apache.iceberg.BaseMetastoreTableOperations.TABLE_TYPE_PROP;
 
 public final class GlueIcebergUtil
 {
     private GlueIcebergUtil() {}
 
-    public static TableInput getTableInput(String tableName, Optional<String> owner, Map<String, String> parameters)
+    // Limit per Glue API docs (https://docs.aws.amazon.com/glue/latest/webapi/API_TableInput.html#Glue-Type-TableInput-Parameters as of this writing)
+    private static final int GLUE_TABLE_PARAMETER_LENGTH_LIMIT = 512000;
+    // Limit per Glue API docs (https://docs.aws.amazon.com/glue/latest/webapi/API_Column.html as of this writing)
+    private static final int GLUE_COLUMN_NAME_LENGTH_LIMIT = 255;
+    // Limit per Glue API docs (https://docs.aws.amazon.com/glue/latest/webapi/API_Column.html as of this writing)
+    private static final int GLUE_COLUMN_TYPE_LENGTH_LIMIT = 131072;
+    // Limit per Glue API docs (https://docs.aws.amazon.com/glue/latest/webapi/API_Column.html as of this writing)
+    private static final int GLUE_COLUMN_COMMENT_LENGTH_LIMIT = 255;
+    // Limit per Glue API docs (https://docs.aws.amazon.com/glue/latest/webapi/API_Column.html as of this writing)
+    private static final int GLUE_COLUMN_PARAMETER_LENGTH_LIMIT = 512000;
+
+    public static TableInput getTableInput(
+            TypeManager typeManager,
+            String tableName,
+            Optional<String> owner,
+            TableMetadata metadata,
+            String newMetadataLocation,
+            Map<String, String> parameters,
+            boolean cacheTableMetadata)
     {
-        return new TableInput()
+        parameters = new HashMap<>(parameters);
+        parameters.putIfAbsent(TABLE_TYPE_PROP, ICEBERG_TABLE_TYPE_VALUE.toUpperCase(ENGLISH));
+        parameters.put(METADATA_LOCATION_PROP, newMetadataLocation);
+        parameters.remove(TRINO_TABLE_METADATA_INFO_VALID_FOR); // no longer valid
+
+        TableInput tableInput = new TableInput()
                 .withName(tableName)
                 .withOwner(owner.orElse(null))
-                .withParameters(ImmutableMap.<String, String>builder()
-                        .putAll(parameters)
-                        .put(TABLE_TYPE_PROP, ICEBERG_TABLE_TYPE_VALUE.toUpperCase(ENGLISH))
-                        .buildKeepingLast())
                 // Iceberg does not distinguish managed and external tables, all tables are treated the same and marked as EXTERNAL
                 .withTableType(EXTERNAL_TABLE.name());
+
+        if (cacheTableMetadata) {
+            // Store table metadata sufficient to answer information_schema.columns and system.metadata.table_comments queries, which are often queried in bulk by e.g. BI tools
+            String comment = metadata.properties().get(TABLE_COMMENT);
+            Optional<List<Column>> glueColumns = glueColumns(typeManager, metadata);
+
+            boolean canPersistComment = (comment == null || comment.length() <= GLUE_TABLE_PARAMETER_LENGTH_LIMIT);
+            boolean canPersistColumnInfo = glueColumns.isPresent();
+            boolean canPersistMetadata = canPersistComment && canPersistColumnInfo;
+
+            if (canPersistMetadata) {
+                tableInput.withStorageDescriptor(new StorageDescriptor()
+                        .withColumns(glueColumns.get()));
+
+                if (comment != null) {
+                    parameters.put(TABLE_COMMENT, comment);
+                }
+                else {
+                    parameters.remove(TABLE_COMMENT);
+                }
+                parameters.put(TRINO_TABLE_METADATA_INFO_VALID_FOR, newMetadataLocation);
+            }
+        }
+
+        tableInput.withParameters(parameters);
+
+        return tableInput;
+    }
+
+    private static Optional<List<Column>> glueColumns(TypeManager typeManager, TableMetadata metadata)
+    {
+        List<Types.NestedField> icebergColumns = metadata.schema().columns();
+        ImmutableList.Builder<Column> glueColumns = builderWithExpectedSize(icebergColumns.size());
+
+        boolean firstColumn = true;
+        for (Types.NestedField icebergColumn : icebergColumns) {
+            String glueTypeString = toGlueTypeStringLossy(icebergColumn.type());
+            if (icebergColumn.name().length() > GLUE_COLUMN_NAME_LENGTH_LIMIT ||
+                    firstNonNull(icebergColumn.doc(), "").length() > GLUE_COLUMN_COMMENT_LENGTH_LIMIT ||
+                    glueTypeString.length() > GLUE_COLUMN_TYPE_LENGTH_LIMIT) {
+                return Optional.empty();
+            }
+            String trinoTypeId = TypeConverter.toTrinoType(icebergColumn.type(), typeManager).getTypeId().getId();
+            Column column = new Column()
+                    .withName(icebergColumn.name())
+                    .withType(glueTypeString)
+                    .withComment(icebergColumn.doc());
+
+            ImmutableMap.Builder<String, String> parameters = ImmutableMap.builder();
+            if (icebergColumn.isRequired()) {
+                parameters.put(COLUMN_TRINO_NOT_NULL_PROPERTY, "true");
+            }
+            if (firstColumn || !glueTypeString.equals(trinoTypeId)) {
+                if (trinoTypeId.length() > GLUE_COLUMN_PARAMETER_LENGTH_LIMIT) {
+                    return Optional.empty();
+                }
+                // Store type parameter for some (first) column so that we can later detect whether column parameters weren't erased by something.
+                parameters.put(COLUMN_TRINO_TYPE_ID_PROPERTY, trinoTypeId);
+            }
+            column.setParameters(parameters.buildOrThrow());
+            glueColumns.add(column);
+
+            firstColumn = false;
+        }
+
+        return Optional.of(glueColumns.build());
+    }
+
+    // Copied from org.apache.iceberg.aws.glue.IcebergToGlueConverter#toTypeString
+    private static String toGlueTypeStringLossy(Type type)
+    {
+        switch (type.typeId()) {
+            case BOOLEAN:
+                return "boolean";
+            case INTEGER:
+                return "int";
+            case LONG:
+                return "bigint";
+            case FLOAT:
+                return "float";
+            case DOUBLE:
+                return "double";
+            case DATE:
+                return "date";
+            case TIME:
+            case STRING:
+            case UUID:
+                return "string";
+            case TIMESTAMP:
+                return "timestamp";
+            case FIXED:
+            case BINARY:
+                return "binary";
+            case DECIMAL:
+                final Types.DecimalType decimalType = (Types.DecimalType) type;
+                return String.format("decimal(%s,%s)", decimalType.precision(), decimalType.scale());
+            case STRUCT:
+                final Types.StructType structType = type.asStructType();
+                final String nameToType =
+                        structType.fields().stream()
+                                .map(f -> String.format("%s:%s", f.name(), toGlueTypeStringLossy(f.type())))
+                                .collect(Collectors.joining(","));
+                return String.format("struct<%s>", nameToType);
+            case LIST:
+                final Types.ListType listType = type.asListType();
+                return String.format("array<%s>", toGlueTypeStringLossy(listType.elementType()));
+            case MAP:
+                final Types.MapType mapType = type.asMapType();
+                return String.format(
+                        "map<%s,%s>", toGlueTypeStringLossy(mapType.keyType()), toGlueTypeStringLossy(mapType.valueType()));
+            default:
+                return type.typeId().name().toLowerCase(Locale.ENGLISH);
+        }
     }
 
     public static TableInput getViewTableInput(String viewName, String viewOriginalText, @Nullable String owner, Map<String, String> parameters)
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/IcebergGlueCatalogConfig.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/IcebergGlueCatalogConfig.java
index e9e0ffffd5c2..1f8ba21a56c3 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/IcebergGlueCatalogConfig.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/IcebergGlueCatalogConfig.java
@@ -18,8 +18,21 @@
 
 public class IcebergGlueCatalogConfig
 {
+    private boolean cacheTableMetadata = true;
     private boolean skipArchive;
 
+    public boolean isCacheTableMetadata()
+    {
+        return cacheTableMetadata;
+    }
+
+    @Config("iceberg.glue.cache-table-metadata")
+    public IcebergGlueCatalogConfig setCacheTableMetadata(boolean cacheTableMetadata)
+    {
+        this.cacheTableMetadata = cacheTableMetadata;
+        return this;
+    }
+
     public boolean isSkipArchive()
     {
         return skipArchive;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/IcebergGlueCatalogModule.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/IcebergGlueCatalogModule.java
index 1df3e42ca5cd..32f3811d0b48 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/IcebergGlueCatalogModule.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/IcebergGlueCatalogModule.java
@@ -18,9 +18,7 @@
 import com.amazonaws.services.glue.model.Table;
 import com.google.inject.Binder;
 import com.google.inject.Key;
-import com.google.inject.Provides;
 import com.google.inject.Scopes;
-import com.google.inject.Singleton;
 import com.google.inject.TypeLiteral;
 import com.google.inject.multibindings.Multibinder;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
@@ -39,6 +37,7 @@
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
+import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static org.weakref.jmx.guice.ExportBinder.newExporter;
 
@@ -57,6 +56,11 @@ protected void setup(Binder binder)
         binder.bind(TrinoCatalogFactory.class).to(TrinoGlueCatalogFactory.class).in(Scopes.SINGLETON);
         newExporter(binder).export(TrinoCatalogFactory.class).withGeneratedName();
 
+        install(conditionalModule(
+                IcebergGlueCatalogConfig.class,
+                IcebergGlueCatalogConfig::isSkipArchive,
+                internalBinder -> newSetBinder(internalBinder, RequestHandler2.class, ForGlueHiveMetastore.class).addBinding().toInstance(new SkipArchiveRequestHandler())));
+
         // Required to inject HiveMetastoreFactory for migrate procedure
         binder.bind(Key.get(boolean.class, HideDeltaLakeTables.class)).toInstance(false);
         newOptionalBinder(binder, Key.get(new TypeLiteral<Predicate<Table>>() {}, ForGlueHiveMetastore.class))
@@ -65,12 +69,4 @@ protected void setup(Binder binder)
         Multibinder<Procedure> procedures = newSetBinder(binder, Procedure.class);
         procedures.addBinding().toProvider(MigrateProcedure.class).in(Scopes.SINGLETON);
     }
-
-    @Provides
-    @Singleton
-    @ForGlueHiveMetastore
-    public static RequestHandler2 createRequestHandler(IcebergGlueCatalogConfig config)
-    {
-        return new SkipArchiveRequestHandler(config.isSkipArchive());
-    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/SkipArchiveRequestHandler.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/SkipArchiveRequestHandler.java
index 8fa3796fe45f..5d04d7059b01 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/SkipArchiveRequestHandler.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/SkipArchiveRequestHandler.java
@@ -28,18 +28,11 @@
 public class SkipArchiveRequestHandler
         extends RequestHandler2
 {
-    private final boolean skipArchive;
-
-    public SkipArchiveRequestHandler(boolean skipArchive)
-    {
-        this.skipArchive = skipArchive;
-    }
-
     @Override
     public AmazonWebServiceRequest beforeExecution(AmazonWebServiceRequest request)
     {
         if (request instanceof UpdateTableRequest updateTableRequest) {
-            return updateTableRequest.withSkipArchive(skipArchive);
+            return updateTableRequest.withSkipArchive(true);
         }
         if (request instanceof CreateDatabaseRequest ||
                 request instanceof DeleteDatabaseRequest ||
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalog.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalog.java
index dee3ce1cdcba..2c069ae085a9 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalog.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalog.java
@@ -17,6 +17,7 @@
 import com.amazonaws.services.glue.AWSGlueAsync;
 import com.amazonaws.services.glue.model.AccessDeniedException;
 import com.amazonaws.services.glue.model.AlreadyExistsException;
+import com.amazonaws.services.glue.model.Column;
 import com.amazonaws.services.glue.model.CreateDatabaseRequest;
 import com.amazonaws.services.glue.model.CreateTableRequest;
 import com.amazonaws.services.glue.model.Database;
@@ -32,32 +33,43 @@
 import com.amazonaws.services.glue.model.GetTablesResult;
 import com.amazonaws.services.glue.model.TableInput;
 import com.amazonaws.services.glue.model.UpdateTableRequest;
+import com.google.common.cache.Cache;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.UncheckedExecutionException;
 import dev.failsafe.Failsafe;
 import dev.failsafe.RetryPolicy;
 import io.airlift.log.Logger;
+import io.trino.cache.EvictableCacheBuilder;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.SchemaAlreadyExistsException;
 import io.trino.plugin.hive.TrinoViewUtil;
 import io.trino.plugin.hive.ViewAlreadyExistsException;
+import io.trino.plugin.hive.ViewReaderUtil;
 import io.trino.plugin.hive.metastore.glue.GlueMetastoreStats;
+import io.trino.plugin.iceberg.IcebergMaterializedViewDefinition;
+import io.trino.plugin.iceberg.IcebergMetadata;
 import io.trino.plugin.iceberg.UnknownTableTypeException;
 import io.trino.plugin.iceberg.catalog.AbstractTrinoCatalog;
 import io.trino.plugin.iceberg.catalog.IcebergTableOperationsProvider;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorMaterializedViewDefinition;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorViewDefinition;
 import io.trino.spi.connector.MaterializedViewNotFoundException;
+import io.trino.spi.connector.RelationColumnsMetadata;
+import io.trino.spi.connector.RelationCommentMetadata;
 import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.connector.ViewNotFoundException;
 import io.trino.spi.security.PrincipalType;
 import io.trino.spi.security.TrinoPrincipal;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeId;
 import io.trino.spi.type.TypeManager;
 import org.apache.iceberg.BaseTable;
 import org.apache.iceberg.PartitionSpec;
@@ -71,38 +83,57 @@
 import org.apache.iceberg.io.FileIO;
 
 import java.time.Duration;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
+import java.util.stream.Stream;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
 import static io.trino.filesystem.Locations.appendPath;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_DATABASE_LOCATION_ERROR;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_METASTORE_ERROR;
 import static io.trino.plugin.hive.HiveMetadata.STORAGE_TABLE;
+import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
 import static io.trino.plugin.hive.TableType.VIRTUAL_VIEW;
 import static io.trino.plugin.hive.TrinoViewUtil.createViewProperties;
 import static io.trino.plugin.hive.ViewReaderUtil.encodeViewData;
-import static io.trino.plugin.hive.ViewReaderUtil.isPrestoView;
 import static io.trino.plugin.hive.ViewReaderUtil.isTrinoMaterializedView;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoView;
 import static io.trino.plugin.hive.metastore.glue.AwsSdkUtil.getPaginatedResults;
+import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getColumnParameters;
+import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableParameters;
 import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableType;
 import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableTypeNullable;
 import static io.trino.plugin.hive.util.HiveUtil.isHiveSystemSchema;
 import static io.trino.plugin.hive.util.HiveUtil.isIcebergTable;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_BAD_DATA;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_CATALOG_ERROR;
+import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_METADATA;
 import static io.trino.plugin.iceberg.IcebergMaterializedViewAdditionalProperties.STORAGE_SCHEMA;
+import static io.trino.plugin.iceberg.IcebergMaterializedViewDefinition.decodeMaterializedViewData;
 import static io.trino.plugin.iceberg.IcebergMaterializedViewDefinition.encodeMaterializedViewData;
 import static io.trino.plugin.iceberg.IcebergMaterializedViewDefinition.fromConnectorMaterializedViewDefinition;
 import static io.trino.plugin.iceberg.IcebergSchemaProperties.LOCATION_PROPERTY;
-import static io.trino.plugin.iceberg.IcebergSessionProperties.getHiveCatalogName;
+import static io.trino.plugin.iceberg.IcebergUtil.COLUMN_TRINO_NOT_NULL_PROPERTY;
+import static io.trino.plugin.iceberg.IcebergUtil.COLUMN_TRINO_TYPE_ID_PROPERTY;
+import static io.trino.plugin.iceberg.IcebergUtil.TRINO_TABLE_METADATA_INFO_VALID_FOR;
+import static io.trino.plugin.iceberg.IcebergUtil.getColumnMetadatas;
 import static io.trino.plugin.iceberg.IcebergUtil.getIcebergTableWithMetadata;
+import static io.trino.plugin.iceberg.IcebergUtil.getTableComment;
 import static io.trino.plugin.iceberg.IcebergUtil.quotedTableName;
 import static io.trino.plugin.iceberg.IcebergUtil.validateTableCanBeDropped;
 import static io.trino.plugin.iceberg.TrinoMetricsReporter.TRINO_METRICS_REPORTER;
@@ -114,6 +145,7 @@
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.UNSUPPORTED_TABLE_TYPE;
 import static io.trino.spi.connector.SchemaTableName.schemaTableName;
+import static java.lang.Boolean.parseBoolean;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
@@ -125,12 +157,20 @@ public class TrinoGlueCatalog
 {
     private static final Logger LOG = Logger.get(TrinoGlueCatalog.class);
 
+    private static final int PER_QUERY_CACHE_SIZE = 1000;
+
     private final String trinoVersion;
+    private final TypeManager typeManager;
+    private final boolean cacheTableMetadata;
     private final TrinoFileSystemFactory fileSystemFactory;
     private final Optional<String> defaultSchemaLocation;
     private final AWSGlueAsync glueClient;
     private final GlueMetastoreStats stats;
 
+    private final Cache<SchemaTableName, com.amazonaws.services.glue.model.Table> glueTableCache = EvictableCacheBuilder.newBuilder()
+            // Even though this is query-scoped, this still needs to be bounded. information_schema queries can access large number of tables.
+            .maximumSize(Math.max(PER_QUERY_CACHE_SIZE, IcebergMetadata.GET_METADATA_BATCH_SIZE))
+            .build();
     private final Map<SchemaTableName, TableMetadata> tableMetadataCache = new ConcurrentHashMap<>();
     private final Map<SchemaTableName, ConnectorViewDefinition> viewCache = new ConcurrentHashMap<>();
     private final Map<SchemaTableName, ConnectorMaterializedViewDefinition> materializedViewCache = new ConcurrentHashMap<>();
@@ -139,6 +179,7 @@ public TrinoGlueCatalog(
             CatalogName catalogName,
             TrinoFileSystemFactory fileSystemFactory,
             TypeManager typeManager,
+            boolean cacheTableMetadata,
             IcebergTableOperationsProvider tableOperationsProvider,
             String trinoVersion,
             AWSGlueAsync glueClient,
@@ -148,6 +189,8 @@ public TrinoGlueCatalog(
     {
         super(catalogName, typeManager, tableOperationsProvider, useUniqueTableLocation);
         this.trinoVersion = requireNonNull(trinoVersion, "trinoVersion is null");
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.cacheTableMetadata = cacheTableMetadata;
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.glueClient = requireNonNull(glueClient, "glueClient is null");
         this.stats = requireNonNull(stats, "stats is null");
@@ -208,6 +251,7 @@ private List<String> listNamespaces(ConnectorSession session, Optional<String> n
     public void dropNamespace(ConnectorSession session, String namespace)
     {
         try {
+            glueTableCache.invalidateAll();
             stats.getDeleteDatabase().call(() ->
                     glueClient.deleteDatabase(new DeleteDatabaseRequest().withName(namespace)));
         }
@@ -253,7 +297,7 @@ public Optional<TrinoPrincipal> getNamespacePrincipal(ConnectorSession session,
     public void createNamespace(ConnectorSession session, String namespace, Map<String, Object> properties, TrinoPrincipal owner)
     {
         checkArgument(owner.getType() == PrincipalType.USER, "Owner type must be USER");
-        checkArgument(owner.getName().equals(session.getUser()), "Explicit schema owner is not supported");
+        checkArgument(owner.getName().equals(session.getUser().toLowerCase(ENGLISH)), "Explicit schema owner is not supported");
 
         try {
             stats.getCreateDatabase().call(() ->
@@ -302,17 +346,9 @@ public List<SchemaTableName> listTables(ConnectorSession session, Optional<Strin
             for (String glueNamespace : namespaces) {
                 try {
                     // Add all tables from a namespace together, in case it is removed while fetching paginated results
-                    tables.addAll(
-                            getPaginatedResults(
-                                    glueClient::getTables,
-                                    new GetTablesRequest().withDatabaseName(glueNamespace),
-                                    GetTablesRequest::setNextToken,
-                                    GetTablesResult::getNextToken,
-                                    stats.getGetTables())
-                                    .map(GetTablesResult::getTableList)
-                                    .flatMap(List::stream)
-                                    .map(table -> new SchemaTableName(glueNamespace, table.getName()))
-                                    .collect(toImmutableList()));
+                    tables.addAll(getGlueTables(glueNamespace)
+                            .map(table -> new SchemaTableName(glueNamespace, table.getName()))
+                            .collect(toImmutableList()));
                 }
                 catch (EntityNotFoundException | AccessDeniedException e) {
                     // Namespace may have been deleted or permission denied
@@ -325,6 +361,189 @@ public List<SchemaTableName> listTables(ConnectorSession session, Optional<Strin
         return tables.build();
     }
 
+    @Override
+    public Optional<Iterator<RelationColumnsMetadata>> streamRelationColumns(
+            ConnectorSession session,
+            Optional<String> namespace,
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Predicate<SchemaTableName> isRedirected)
+    {
+        ImmutableList.Builder<RelationColumnsMetadata> unfilteredResult = ImmutableList.builder();
+        ImmutableList.Builder<RelationColumnsMetadata> filteredResult = ImmutableList.builder();
+        Map<SchemaTableName, com.amazonaws.services.glue.model.Table> unprocessed = new HashMap<>();
+
+        listNamespaces(session, namespace).stream()
+                .flatMap(glueNamespace -> getGlueTables(glueNamespace)
+                        .map(table -> Map.entry(new SchemaTableName(glueNamespace, table.getName()), table)))
+                .forEach(entry -> {
+                    SchemaTableName name = entry.getKey();
+                    com.amazonaws.services.glue.model.Table table = entry.getValue();
+                    String tableType = getTableType(table);
+                    Map<String, String> tableParameters = getTableParameters(table);
+                    if (isTrinoMaterializedView(tableType, tableParameters)) {
+                        IcebergMaterializedViewDefinition definition = decodeMaterializedViewData(table.getViewOriginalText());
+                        unfilteredResult.add(RelationColumnsMetadata.forMaterializedView(name, toSpiMaterializedViewColumns(definition.getColumns())));
+                    }
+                    else if (isTrinoView(tableType, tableParameters)) {
+                        ConnectorViewDefinition definition = ViewReaderUtil.PrestoViewReader.decodeViewData(table.getViewOriginalText());
+                        unfilteredResult.add(RelationColumnsMetadata.forView(name, definition.getColumns()));
+                    }
+                    else if (isRedirected.test(name)) {
+                        unfilteredResult.add(RelationColumnsMetadata.forRedirectedTable(name));
+                    }
+                    else if (!isIcebergTable(tableParameters)) {
+                        // This can be e.g. Hive, Delta table, a Hive view, etc. Skip for columns listing
+                    }
+                    else {
+                        Optional<List<ColumnMetadata>> columnMetadata = getCachedColumnMetadata(table);
+                        if (columnMetadata.isPresent()) {
+                            unfilteredResult.add(RelationColumnsMetadata.forTable(name, columnMetadata.get()));
+                        }
+                        else {
+                            unprocessed.put(name, table);
+                            if (unprocessed.size() >= PER_QUERY_CACHE_SIZE) {
+                                getColumnsFromIcebergMetadata(session, unprocessed, relationFilter, filteredResult::add);
+                                unprocessed.clear();
+                            }
+                        }
+                    }
+                });
+
+        if (!unprocessed.isEmpty()) {
+            getColumnsFromIcebergMetadata(session, unprocessed, relationFilter, filteredResult::add);
+        }
+
+        List<RelationColumnsMetadata> unfilteredResultList = unfilteredResult.build();
+        Set<SchemaTableName> availableNames = relationFilter.apply(unfilteredResultList.stream()
+                .map(RelationColumnsMetadata::name)
+                .collect(toImmutableSet()));
+
+        return Optional.of(Stream.concat(
+                        unfilteredResultList.stream()
+                                .filter(commentMetadata -> availableNames.contains(commentMetadata.name())),
+                        filteredResult.build().stream())
+                .iterator());
+    }
+
+    private void getColumnsFromIcebergMetadata(
+            ConnectorSession session,
+            Map<SchemaTableName, com.amazonaws.services.glue.model.Table> glueTables, // only Iceberg tables
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Consumer<RelationColumnsMetadata> resultsCollector)
+    {
+        for (SchemaTableName tableName : relationFilter.apply(glueTables.keySet())) {
+            com.amazonaws.services.glue.model.Table table = glueTables.get(tableName);
+            // potentially racy with invalidation, but TrinoGlueCatalog is session-scoped
+            uncheckedCacheGet(glueTableCache, tableName, () -> table);
+            List<ColumnMetadata> columns;
+            try {
+                columns = getColumnMetadatas(loadTable(session, tableName).schema(), typeManager);
+            }
+            catch (RuntimeException e) {
+                // Table may be concurrently deleted
+                // TODO detect file not found failure when reading metadata file and silently skip table in such case. Avoid logging warnings for legitimate situations.
+                LOG.warn(e, "Failed to get metadata for table: %s", tableName);
+                return;
+            }
+            resultsCollector.accept(RelationColumnsMetadata.forTable(tableName, columns));
+        }
+    }
+
+    @Override
+    public Optional<Iterator<RelationCommentMetadata>> streamRelationComments(
+            ConnectorSession session,
+            Optional<String> namespace,
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Predicate<SchemaTableName> isRedirected)
+    {
+        if (!cacheTableMetadata) {
+            return Optional.empty();
+        }
+
+        ImmutableList.Builder<RelationCommentMetadata> unfilteredResult = ImmutableList.builder();
+        ImmutableList.Builder<RelationCommentMetadata> filteredResult = ImmutableList.builder();
+        Map<SchemaTableName, com.amazonaws.services.glue.model.Table> unprocessed = new HashMap<>();
+
+        listNamespaces(session, namespace).stream()
+                .flatMap(glueNamespace -> getGlueTables(glueNamespace)
+                        .map(table -> Map.entry(new SchemaTableName(glueNamespace, table.getName()), table)))
+                .forEach(entry -> {
+                    SchemaTableName name = entry.getKey();
+                    com.amazonaws.services.glue.model.Table table = entry.getValue();
+                    String tableType = getTableType(table);
+                    Map<String, String> tableParameters = getTableParameters(table);
+                    if (isTrinoMaterializedView(tableType, tableParameters)) {
+                        Optional<String> comment = decodeMaterializedViewData(table.getViewOriginalText()).getComment();
+                        unfilteredResult.add(RelationCommentMetadata.forRelation(name, comment));
+                    }
+                    else if (isTrinoView(tableType, tableParameters)) {
+                        Optional<String> comment = ViewReaderUtil.PrestoViewReader.decodeViewData(table.getViewOriginalText()).getComment();
+                        unfilteredResult.add(RelationCommentMetadata.forRelation(name, comment));
+                    }
+                    else if (isRedirected.test(name)) {
+                        unfilteredResult.add(RelationCommentMetadata.forRedirectedTable(name));
+                    }
+                    else if (!isIcebergTable(tableParameters)) {
+                        // This can be e.g. Hive, Delta table, a Hive view, etc. Would be returned by listTables, so do not skip it
+                        unfilteredResult.add(RelationCommentMetadata.forRelation(name, Optional.empty()));
+                    }
+                    else {
+                        String metadataLocation = tableParameters.get(METADATA_LOCATION_PROP);
+                        String metadataValidForMetadata = tableParameters.get(TRINO_TABLE_METADATA_INFO_VALID_FOR);
+                        if (metadataValidForMetadata != null && metadataValidForMetadata.equals(metadataLocation)) {
+                            Optional<String> comment = Optional.ofNullable(tableParameters.get(TABLE_COMMENT));
+                            unfilteredResult.add(RelationCommentMetadata.forRelation(name, comment));
+                        }
+                        else {
+                            unprocessed.put(name, table);
+                            if (unprocessed.size() >= PER_QUERY_CACHE_SIZE) {
+                                getCommentsFromIcebergMetadata(session, unprocessed, relationFilter, filteredResult::add);
+                                unprocessed.clear();
+                            }
+                        }
+                    }
+                });
+
+        if (!unprocessed.isEmpty()) {
+            getCommentsFromIcebergMetadata(session, unprocessed, relationFilter, filteredResult::add);
+        }
+
+        List<RelationCommentMetadata> unfilteredResultList = unfilteredResult.build();
+        Set<SchemaTableName> availableNames = relationFilter.apply(unfilteredResultList.stream()
+                .map(RelationCommentMetadata::name)
+                .collect(toImmutableSet()));
+
+        return Optional.of(Stream.concat(
+                        unfilteredResultList.stream()
+                                .filter(commentMetadata -> availableNames.contains(commentMetadata.name())),
+                        filteredResult.build().stream())
+                .iterator());
+    }
+
+    private void getCommentsFromIcebergMetadata(
+            ConnectorSession session,
+            Map<SchemaTableName, com.amazonaws.services.glue.model.Table> glueTables, // only Iceberg tables
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Consumer<RelationCommentMetadata> resultsCollector)
+    {
+        for (SchemaTableName tableName : relationFilter.apply(glueTables.keySet())) {
+            com.amazonaws.services.glue.model.Table table = glueTables.get(tableName);
+            // potentially racy with invalidation, but TrinoGlueCatalog is session-scoped
+            uncheckedCacheGet(glueTableCache, tableName, () -> table);
+            Optional<String> comment;
+            try {
+                comment = getTableComment(loadTable(session, tableName));
+            }
+            catch (RuntimeException e) {
+                // Table may be concurrently deleted
+                // TODO detect file not found failure when reading metadata file and silently skip table in such case. Avoid logging warnings for legitimate situations.
+                LOG.warn(e, "Failed to get metadata for table: %s", tableName);
+                return;
+            }
+            resultsCollector.accept(RelationCommentMetadata.forRelation(tableName, comment));
+        }
+    }
+
     @Override
     public Table loadTable(ConnectorSession session, SchemaTableName table)
     {
@@ -353,6 +572,80 @@ public Table loadTable(ConnectorSession session, SchemaTableName table)
                 metadata);
     }
 
+    @Override
+    public Map<SchemaTableName, List<ColumnMetadata>> tryGetColumnMetadata(ConnectorSession session, List<SchemaTableName> tables)
+    {
+        if (!cacheTableMetadata) {
+            return ImmutableMap.of();
+        }
+
+        ImmutableMap.Builder<SchemaTableName, List<ColumnMetadata>> metadatas = ImmutableMap.builder();
+        for (SchemaTableName tableName : tables) {
+            Optional<List<ColumnMetadata>> columnMetadata;
+            try {
+                columnMetadata = getCachedColumnMetadata(tableName);
+            }
+            catch (TableNotFoundException ignore) {
+                // Table disappeared during listing.
+                continue;
+            }
+            catch (RuntimeException e) {
+                // Handle exceptions gracefully during metadata listing. Log, because we're catching broadly.
+                LOG.warn(e, "Failed to access get metadata of table %s during bulk retrieval of table columns", tableName);
+                continue;
+            }
+            columnMetadata.ifPresent(columns -> metadatas.put(tableName, columns));
+        }
+        return metadatas.buildOrThrow();
+    }
+
+    private Optional<List<ColumnMetadata>> getCachedColumnMetadata(SchemaTableName tableName)
+    {
+        if (!cacheTableMetadata || viewCache.containsKey(tableName) || materializedViewCache.containsKey(tableName)) {
+            return Optional.empty();
+        }
+
+        com.amazonaws.services.glue.model.Table glueTable = getTable(tableName, false);
+        return getCachedColumnMetadata(glueTable);
+    }
+
+    private Optional<List<ColumnMetadata>> getCachedColumnMetadata(com.amazonaws.services.glue.model.Table glueTable)
+    {
+        if (!cacheTableMetadata) {
+            return Optional.empty();
+        }
+
+        Map<String, String> tableParameters = getTableParameters(glueTable);
+        String metadataLocation = tableParameters.get(METADATA_LOCATION_PROP);
+        String metadataValidForMetadata = tableParameters.get(TRINO_TABLE_METADATA_INFO_VALID_FOR);
+        if (metadataLocation == null || !metadataLocation.equals(metadataValidForMetadata) ||
+                glueTable.getStorageDescriptor() == null ||
+                glueTable.getStorageDescriptor().getColumns() == null) {
+            return Optional.empty();
+        }
+
+        List<Column> glueColumns = glueTable.getStorageDescriptor().getColumns();
+        if (glueColumns.stream().noneMatch(column -> getColumnParameters(column).containsKey(COLUMN_TRINO_TYPE_ID_PROPERTY))) {
+            // No column has type parameter, maybe the parameters were erased
+            return Optional.empty();
+        }
+
+        ImmutableList.Builder<ColumnMetadata> columns = ImmutableList.builderWithExpectedSize(glueColumns.size());
+        for (Column glueColumn : glueColumns) {
+            Map<String, String> columnParameters = getColumnParameters(glueColumn);
+            String trinoTypeId = columnParameters.getOrDefault(COLUMN_TRINO_TYPE_ID_PROPERTY, glueColumn.getType());
+            boolean notNull = parseBoolean(columnParameters.getOrDefault(COLUMN_TRINO_NOT_NULL_PROPERTY, "false"));
+            Type type = typeManager.getType(TypeId.of(trinoTypeId));
+            columns.add(ColumnMetadata.builder()
+                    .setName(glueColumn.getName())
+                    .setType(type)
+                    .setComment(Optional.ofNullable(glueColumn.getComment()))
+                    .setNullable(!notNull)
+                    .build());
+        }
+        return Optional.of(columns.build());
+    }
+
     @Override
     public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
     {
@@ -364,10 +657,29 @@ public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
         catch (AmazonServiceException e) {
             throw new TrinoException(HIVE_METASTORE_ERROR, e);
         }
-        dropTableData(table.io(), table.operations().current());
+        try {
+            dropTableData(table.io(), table.operations().current());
+        }
+        catch (RuntimeException e) {
+            // If the snapshot file is not found, an exception will be thrown by the dropTableData function.
+            // So log the exception and continue with deleting the table location
+            LOG.warn(e, "Failed to delete table data referenced by metadata");
+        }
         deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, table.location());
     }
 
+    @Override
+    public void dropCorruptedTable(ConnectorSession session, SchemaTableName schemaTableName)
+    {
+        com.amazonaws.services.glue.model.Table table = dropTableFromMetastore(session, schemaTableName);
+        String metadataLocation = getTableParameters(table).get(METADATA_LOCATION_PROP);
+        if (metadataLocation == null) {
+            throw new TrinoException(ICEBERG_INVALID_METADATA, format("Table %s is missing [%s] property", schemaTableName, METADATA_LOCATION_PROP));
+        }
+        String tableLocation = metadataLocation.replaceFirst("/metadata/[^/]*$", "");
+        deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, tableLocation);
+    }
+
     @Override
     public Transaction newCreateTableTransaction(
             ConnectorSession session,
@@ -390,19 +702,52 @@ public Transaction newCreateTableTransaction(
     }
 
     @Override
-    public void registerTable(ConnectorSession session, SchemaTableName schemaTableName, String tableLocation, String metadataLocation)
+    public Transaction newCreateOrReplaceTableTransaction(
+            ConnectorSession session,
+            SchemaTableName schemaTableName,
+            Schema schema,
+            PartitionSpec partitionSpec,
+            SortOrder sortOrder,
+            String location,
+            Map<String, String> properties)
+    {
+        return newCreateOrReplaceTableTransaction(
+                session,
+                schemaTableName,
+                schema,
+                partitionSpec,
+                sortOrder,
+                location,
+                properties,
+                Optional.of(session.getUser()));
+    }
+
+    @Override
+    public void registerTable(ConnectorSession session, SchemaTableName schemaTableName, TableMetadata tableMetadata)
             throws TrinoException
     {
-        TableInput tableInput = getTableInput(schemaTableName.getTableName(), Optional.of(session.getUser()), ImmutableMap.of(METADATA_LOCATION_PROP, metadataLocation));
+        TableInput tableInput = getTableInput(
+                typeManager,
+                schemaTableName.getTableName(),
+                Optional.of(session.getUser()),
+                tableMetadata,
+                tableMetadata.metadataFileLocation(),
+                ImmutableMap.of(),
+                cacheTableMetadata);
         createTable(schemaTableName.getSchemaName(), tableInput);
     }
 
     @Override
     public void unregisterTable(ConnectorSession session, SchemaTableName schemaTableName)
     {
-        com.amazonaws.services.glue.model.Table table = getTable(session, schemaTableName)
+        dropTableFromMetastore(session, schemaTableName);
+    }
+
+    private com.amazonaws.services.glue.model.Table dropTableFromMetastore(ConnectorSession session, SchemaTableName schemaTableName)
+    {
+        com.amazonaws.services.glue.model.Table table = getTableAndCacheMetadata(session, schemaTableName)
                 .orElseThrow(() -> new TableNotFoundException(schemaTableName));
-        if (!isIcebergTable(firstNonNull(table.getParameters(), ImmutableMap.of()))) {
+        if (!isIcebergTable(getTableParameters(table))) {
             throw new UnknownTableTypeException(schemaTableName);
         }
 
@@ -412,6 +757,7 @@ public void unregisterTable(ConnectorSession session, SchemaTableName schemaTabl
         catch (AmazonServiceException e) {
             throw new TrinoException(HIVE_METASTORE_ERROR, e);
         }
+        return table;
     }
 
     @Override
@@ -419,13 +765,24 @@ public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTa
     {
         boolean newTableCreated = false;
         try {
-            com.amazonaws.services.glue.model.Table table = getTable(session, from)
+            com.amazonaws.services.glue.model.Table table = getTableAndCacheMetadata(session, from)
                     .orElseThrow(() -> new TableNotFoundException(from));
-            TableInput tableInput = getTableInput(to.getTableName(), Optional.ofNullable(table.getOwner()), table.getParameters());
-            CreateTableRequest createTableRequest = new CreateTableRequest()
-                    .withDatabaseName(to.getSchemaName())
-                    .withTableInput(tableInput);
-            stats.getCreateTable().call(() -> glueClient.createTable(createTableRequest));
+            Map<String, String> tableParameters = new HashMap<>(getTableParameters(table));
+            FileIO io = loadTable(session, from).io();
+            String metadataLocation = tableParameters.remove(METADATA_LOCATION_PROP);
+            if (metadataLocation == null) {
+                throw new TrinoException(ICEBERG_INVALID_METADATA, format("Table %s is missing [%s] property", from, METADATA_LOCATION_PROP));
+            }
+            TableMetadata metadata = TableMetadataParser.read(io, io.newInputFile(metadataLocation));
+            TableInput tableInput = getTableInput(
+                    typeManager,
+                    to.getTableName(),
+                    Optional.ofNullable(table.getOwner()),
+                    metadata,
+                    metadataLocation,
+                    tableParameters,
+                    cacheTableMetadata);
+            createTable(to.getSchemaName(), tableInput);
             newTableCreated = true;
             deleteTable(from.getSchemaName(), from.getTableName());
         }
@@ -444,90 +801,72 @@ public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTa
         }
     }
 
-    private Optional<com.amazonaws.services.glue.model.Table> getTable(ConnectorSession session, SchemaTableName schemaTableName)
+    private Optional<com.amazonaws.services.glue.model.Table> getTableAndCacheMetadata(ConnectorSession session, SchemaTableName schemaTableName)
     {
+        com.amazonaws.services.glue.model.Table table;
         try {
-            com.amazonaws.services.glue.model.Table table = stats.getGetTable().call(() ->
-                    glueClient.getTable(new GetTableRequest()
-                                    .withDatabaseName(schemaTableName.getSchemaName())
-                                    .withName(schemaTableName.getTableName()))
-                            .getTable());
-
-            Map<String, String> parameters = firstNonNull(table.getParameters(), ImmutableMap.of());
-            if (isIcebergTable(parameters) && !tableMetadataCache.containsKey(schemaTableName)) {
-                if (viewCache.containsKey(schemaTableName) || materializedViewCache.containsKey(schemaTableName)) {
-                    throw new TrinoException(GENERIC_INTERNAL_ERROR, "Glue table cache inconsistency. Table cannot also be a view/materialized view");
-                }
+            table = getTable(schemaTableName, false);
+        }
+        catch (TableNotFoundException e) {
+            return Optional.empty();
+        }
 
-                String metadataLocation = parameters.get(METADATA_LOCATION_PROP);
-                try {
-                    // Cache the TableMetadata while we have the Table retrieved anyway
-                    TableOperations operations = tableOperationsProvider.createTableOperations(
-                            this,
-                            session,
-                            schemaTableName.getSchemaName(),
-                            schemaTableName.getTableName(),
-                            Optional.empty(),
-                            Optional.empty());
-                    FileIO io = operations.io();
-                    tableMetadataCache.put(schemaTableName, TableMetadataParser.read(io, io.newInputFile(metadataLocation)));
-                }
-                catch (RuntimeException e) {
-                    LOG.warn(e, "Failed to cache table metadata from table at %s", metadataLocation);
-                }
+        String tableType = getTableType(table);
+        Map<String, String> parameters = getTableParameters(table);
+        if (isIcebergTable(parameters) && !tableMetadataCache.containsKey(schemaTableName)) {
+            if (viewCache.containsKey(schemaTableName) || materializedViewCache.containsKey(schemaTableName)) {
+                throw new TrinoException(GENERIC_INTERNAL_ERROR, "Glue table cache inconsistency. Table cannot also be a view/materialized view");
             }
-            else if (isTrinoMaterializedView(getTableType(table), parameters)) {
-                if (viewCache.containsKey(schemaTableName) || tableMetadataCache.containsKey(schemaTableName)) {
-                    throw new TrinoException(GENERIC_INTERNAL_ERROR, "Glue table cache inconsistency. Materialized View cannot also be a table or view");
-                }
 
-                try {
-                    createMaterializedViewDefinition(session, schemaTableName, table)
-                            .ifPresent(materializedView -> materializedViewCache.put(schemaTableName, materializedView));
-                }
-                catch (RuntimeException e) {
-                    LOG.warn(e, "Failed to cache materialized view from %s", schemaTableName);
-                }
+            String metadataLocation = parameters.get(METADATA_LOCATION_PROP);
+            try {
+                // Cache the TableMetadata while we have the Table retrieved anyway
+                TableOperations operations = tableOperationsProvider.createTableOperations(
+                        this,
+                        session,
+                        schemaTableName.getSchemaName(),
+                        schemaTableName.getTableName(),
+                        Optional.empty(),
+                        Optional.empty());
+                FileIO io = operations.io();
+                tableMetadataCache.put(schemaTableName, TableMetadataParser.read(io, io.newInputFile(metadataLocation)));
             }
-            else if (isPrestoView(parameters) && !viewCache.containsKey(schemaTableName)) {
-                if (materializedViewCache.containsKey(schemaTableName) || tableMetadataCache.containsKey(schemaTableName)) {
-                    throw new TrinoException(GENERIC_INTERNAL_ERROR, "Glue table cache inconsistency. View cannot also be a materialized view or table");
-                }
-
-                try {
-                    TrinoViewUtil.getView(schemaTableName,
-                            Optional.ofNullable(table.getViewOriginalText()),
-                            getTableType(table),
-                            parameters,
-                            Optional.ofNullable(table.getOwner()))
-                            .ifPresent(viewDefinition -> viewCache.put(schemaTableName, viewDefinition));
-                }
-                catch (RuntimeException e) {
-                    LOG.warn(e, "Failed to cache view from %s", schemaTableName);
-                }
+            catch (RuntimeException e) {
+                LOG.warn(e, "Failed to cache table metadata from table at %s", metadataLocation);
             }
-
-            return Optional.of(table);
         }
-        catch (EntityNotFoundException e) {
-            return Optional.empty();
+        else if (isTrinoMaterializedView(tableType, parameters)) {
+            if (viewCache.containsKey(schemaTableName) || tableMetadataCache.containsKey(schemaTableName)) {
+                throw new TrinoException(GENERIC_INTERNAL_ERROR, "Glue table cache inconsistency. Materialized View cannot also be a table or view");
+            }
+
+            try {
+                createMaterializedViewDefinition(session, schemaTableName, table)
+                        .ifPresent(materializedView -> materializedViewCache.put(schemaTableName, materializedView));
+            }
+            catch (RuntimeException e) {
+                LOG.warn(e, "Failed to cache materialized view from %s", schemaTableName);
+            }
         }
-    }
+        else if (isTrinoView(tableType, parameters) && !viewCache.containsKey(schemaTableName)) {
+            if (materializedViewCache.containsKey(schemaTableName) || tableMetadataCache.containsKey(schemaTableName)) {
+                throw new TrinoException(GENERIC_INTERNAL_ERROR, "Glue table cache inconsistency. View cannot also be a materialized view or table");
+            }
 
-    private void createTable(String schemaName, TableInput tableInput)
-    {
-        stats.getCreateTable().call(() ->
-                glueClient.createTable(new CreateTableRequest()
-                        .withDatabaseName(schemaName)
-                        .withTableInput(tableInput)));
-    }
+            try {
+                TrinoViewUtil.getView(
+                                Optional.ofNullable(table.getViewOriginalText()),
+                                tableType,
+                                parameters,
+                                Optional.ofNullable(table.getOwner()))
+                        .ifPresent(viewDefinition -> viewCache.put(schemaTableName, viewDefinition));
+            }
+            catch (RuntimeException e) {
+                LOG.warn(e, "Failed to cache view from %s", schemaTableName);
+            }
+        }
 
-    private void deleteTable(String schema, String table)
-    {
-        stats.getDeleteTable().call(() ->
-                glueClient.deleteTable(new DeleteTableRequest()
-                        .withDatabaseName(schema)
-                        .withName(table)));
+        return Optional.of(table);
     }
 
     @Override
@@ -574,34 +913,28 @@ public void createView(ConnectorSession session, SchemaTableName schemaViewName,
                 session.getUser(),
                 createViewProperties(session, trinoVersion, TRINO_CREATED_BY_VALUE));
         Failsafe.with(RetryPolicy.builder()
-                .withMaxRetries(3)
-                .withDelay(Duration.ofMillis(100))
-                .abortIf(throwable -> !replace || throwable instanceof ViewAlreadyExistsException)
-                .build())
+                        .withMaxRetries(3)
+                        .withDelay(Duration.ofMillis(100))
+                        .abortIf(throwable -> !replace || throwable instanceof ViewAlreadyExistsException)
+                        .build())
                 .run(() -> doCreateView(session, schemaViewName, viewTableInput, replace));
     }
 
     private void doCreateView(ConnectorSession session, SchemaTableName schemaViewName, TableInput viewTableInput, boolean replace)
     {
-        Optional<com.amazonaws.services.glue.model.Table> existing = getTable(session, schemaViewName);
+        Optional<com.amazonaws.services.glue.model.Table> existing = getTableAndCacheMetadata(session, schemaViewName);
         if (existing.isPresent()) {
-            if (!replace || !isPrestoView(firstNonNull(existing.get().getParameters(), ImmutableMap.of()))) {
+            if (!replace || !isTrinoView(getTableType(existing.get()), getTableParameters(existing.get()))) {
                 // TODO: ViewAlreadyExists is misleading if the name is used by a table https://github.com/trinodb/trino/issues/10037
                 throw new ViewAlreadyExistsException(schemaViewName);
             }
 
-            stats.getUpdateTable().call(() ->
-                    glueClient.updateTable(new UpdateTableRequest()
-                            .withDatabaseName(schemaViewName.getSchemaName())
-                            .withTableInput(viewTableInput)));
+            updateTable(schemaViewName.getSchemaName(), viewTableInput);
             return;
         }
 
         try {
-            stats.getCreateTable().call(() ->
-                    glueClient.createTable(new CreateTableRequest()
-                            .withDatabaseName(schemaViewName.getSchemaName())
-                            .withTableInput(viewTableInput)));
+            createTable(schemaViewName.getSchemaName(), viewTableInput);
         }
         catch (AlreadyExistsException e) {
             throw new ViewAlreadyExistsException(schemaViewName);
@@ -613,7 +946,7 @@ public void renameView(ConnectorSession session, SchemaTableName source, SchemaT
     {
         boolean newTableCreated = false;
         try {
-            com.amazonaws.services.glue.model.Table existingView = getTable(session, source)
+            com.amazonaws.services.glue.model.Table existingView = getTableAndCacheMetadata(session, source)
                     .orElseThrow(() -> new TableNotFoundException(source));
             viewCache.remove(source);
             TableInput viewTableInput = getViewTableInput(
@@ -621,10 +954,7 @@ public void renameView(ConnectorSession session, SchemaTableName source, SchemaT
                     existingView.getViewOriginalText(),
                     existingView.getOwner(),
                     createViewProperties(session, trinoVersion, TRINO_CREATED_BY_VALUE));
-            CreateTableRequest createTableRequest = new CreateTableRequest()
-                    .withDatabaseName(target.getSchemaName())
-                    .withTableInput(viewTableInput);
-            stats.getCreateTable().call(() -> glueClient.createTable(createTableRequest));
+            createTable(target.getSchemaName(), viewTableInput);
             newTableCreated = true;
             deleteTable(source.getSchemaName(), source.getTableName());
         }
@@ -673,15 +1003,8 @@ public List<SchemaTableName> listViews(ConnectorSession session, Optional<String
             List<String> namespaces = listNamespaces(session, namespace);
             for (String glueNamespace : namespaces) {
                 try {
-                    views.addAll(getPaginatedResults(
-                            glueClient::getTables,
-                            new GetTablesRequest().withDatabaseName(glueNamespace),
-                            GetTablesRequest::setNextToken,
-                            GetTablesResult::getNextToken,
-                            stats.getGetTables())
-                            .map(GetTablesResult::getTableList)
-                            .flatMap(List::stream)
-                            .filter(table -> isPrestoView(firstNonNull(table.getParameters(), ImmutableMap.of())))
+                    views.addAll(getGlueTables(glueNamespace)
+                            .filter(table -> isTrinoView(getTableType(table), getTableParameters(table)))
                             .map(table -> new SchemaTableName(glueNamespace, table.getName()))
                             .collect(toImmutableList()));
                 }
@@ -709,16 +1032,15 @@ public Optional<ConnectorViewDefinition> getView(ConnectorSession session, Schem
             return Optional.empty();
         }
 
-        Optional<com.amazonaws.services.glue.model.Table> table = getTable(session, viewName);
+        Optional<com.amazonaws.services.glue.model.Table> table = getTableAndCacheMetadata(session, viewName);
         if (table.isEmpty()) {
             return Optional.empty();
         }
         com.amazonaws.services.glue.model.Table viewDefinition = table.get();
         return TrinoViewUtil.getView(
-                viewName,
                 Optional.ofNullable(viewDefinition.getViewOriginalText()),
                 getTableType(viewDefinition),
-                firstNonNull(viewDefinition.getParameters(), ImmutableMap.of()),
+                getTableParameters(viewDefinition),
                 Optional.ofNullable(viewDefinition.getOwner()));
     }
 
@@ -734,7 +1056,8 @@ public void updateViewComment(ConnectorSession session, SchemaTableName viewName
                 definition.getColumns(),
                 comment,
                 definition.getOwner(),
-                definition.isRunAsInvoker());
+                definition.isRunAsInvoker(),
+                definition.getPath());
 
         updateView(session, viewName, newDefinition);
     }
@@ -753,7 +1076,8 @@ public void updateViewColumnComment(ConnectorSession session, SchemaTableName vi
                         .collect(toImmutableList()),
                 definition.getComment(),
                 definition.getOwner(),
-                definition.isRunAsInvoker());
+                definition.isRunAsInvoker(),
+                definition.getPath());
 
         updateView(session, viewName, newDefinition);
     }
@@ -767,10 +1091,7 @@ private void updateView(ConnectorSession session, SchemaTableName viewName, Conn
                 createViewProperties(session, trinoVersion, TRINO_CREATED_BY_VALUE));
 
         try {
-            stats.getUpdateTable().call(() ->
-                    glueClient.updateTable(new UpdateTableRequest()
-                            .withDatabaseName(viewName.getSchemaName())
-                            .withTableInput(viewTableInput)));
+            updateTable(viewName.getSchemaName(), viewTableInput);
         }
         catch (AmazonServiceException e) {
             throw new TrinoException(ICEBERG_CATALOG_ERROR, e);
@@ -785,15 +1106,8 @@ public List<SchemaTableName> listMaterializedViews(ConnectorSession session, Opt
             List<String> namespaces = listNamespaces(session, namespace);
             for (String glueNamespace : namespaces) {
                 try {
-                    materializedViews.addAll(getPaginatedResults(
-                            glueClient::getTables,
-                            new GetTablesRequest().withDatabaseName(glueNamespace),
-                            GetTablesRequest::setNextToken,
-                            GetTablesResult::getNextToken,
-                            stats.getGetTables())
-                            .map(GetTablesResult::getTableList)
-                            .flatMap(List::stream)
-                            .filter(table -> isTrinoMaterializedView(getTableType(table), firstNonNull(table.getParameters(), ImmutableMap.of())))
+                    materializedViews.addAll(getGlueTables(glueNamespace)
+                            .filter(table -> isTrinoMaterializedView(getTableType(table), getTableParameters(table)))
                             .map(table -> new SchemaTableName(glueNamespace, table.getName()))
                             .collect(toImmutableList()));
                 }
@@ -816,10 +1130,10 @@ public void createMaterializedView(
             boolean replace,
             boolean ignoreExisting)
     {
-        Optional<com.amazonaws.services.glue.model.Table> existing = getTable(session, viewName);
+        Optional<com.amazonaws.services.glue.model.Table> existing = getTableAndCacheMetadata(session, viewName);
 
         if (existing.isPresent()) {
-            if (!isTrinoMaterializedView(getTableType(existing.get()), firstNonNull(existing.get().getParameters(), ImmutableMap.of()))) {
+            if (!isTrinoMaterializedView(getTableType(existing.get()), getTableParameters(existing.get()))) {
                 throw new TrinoException(UNSUPPORTED_TABLE_TYPE, "Existing table is not a Materialized View: " + viewName);
             }
             if (!replace) {
@@ -841,10 +1155,7 @@ public void createMaterializedView(
 
         if (existing.isPresent()) {
             try {
-                stats.getUpdateTable().call(() ->
-                        glueClient.updateTable(new UpdateTableRequest()
-                                .withDatabaseName(viewName.getSchemaName())
-                                .withTableInput(materializedViewTableInput)));
+                updateTable(viewName.getSchemaName(), materializedViewTableInput);
             }
             catch (RuntimeException e) {
                 try {
@@ -865,13 +1176,51 @@ public void createMaterializedView(
         }
     }
 
+    @Override
+    public void updateMaterializedViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
+    {
+        ConnectorMaterializedViewDefinition definition = doGetMaterializedView(session, viewName)
+                .orElseThrow(() -> new ViewNotFoundException(viewName));
+        ConnectorMaterializedViewDefinition newDefinition = new ConnectorMaterializedViewDefinition(
+                definition.getOriginalSql(),
+                definition.getStorageTable(),
+                definition.getCatalog(),
+                definition.getSchema(),
+                definition.getColumns().stream()
+                        .map(currentViewColumn -> Objects.equals(columnName, currentViewColumn.getName()) ? new ConnectorMaterializedViewDefinition.Column(currentViewColumn.getName(), currentViewColumn.getType(), comment) : currentViewColumn)
+                        .collect(toImmutableList()),
+                definition.getGracePeriod(),
+                definition.getComment(),
+                definition.getOwner(),
+                definition.getPath(),
+                definition.getProperties());
+
+        updateMaterializedView(session, viewName, newDefinition);
+    }
+
+    private void updateMaterializedView(ConnectorSession session, SchemaTableName viewName, ConnectorMaterializedViewDefinition newDefinition)
+    {
+        TableInput materializedViewTableInput = getMaterializedViewTableInput(
+                viewName.getTableName(),
+                encodeMaterializedViewData(fromConnectorMaterializedViewDefinition(newDefinition)),
+                session.getUser(),
+                createMaterializedViewProperties(session, newDefinition.getStorageTable().orElseThrow().getSchemaTableName()));
+
+        try {
+            updateTable(viewName.getSchemaName(), materializedViewTableInput);
+        }
+        catch (AmazonServiceException e) {
+            throw new TrinoException(ICEBERG_CATALOG_ERROR, e);
+        }
+    }
+
     @Override
     public void dropMaterializedView(ConnectorSession session, SchemaTableName viewName)
     {
-        com.amazonaws.services.glue.model.Table view = getTable(session, viewName)
+        com.amazonaws.services.glue.model.Table view = getTableAndCacheMetadata(session, viewName)
                 .orElseThrow(() -> new MaterializedViewNotFoundException(viewName));
 
-        if (!isTrinoMaterializedView(getTableType(view), firstNonNull(view.getParameters(), ImmutableMap.of()))) {
+        if (!isTrinoMaterializedView(getTableType(view), getTableParameters(view))) {
             throw new TrinoException(UNSUPPORTED_TABLE_TYPE, "Not a Materialized View: " + view.getDatabaseName() + "." + view.getName());
         }
         materializedViewCache.remove(viewName);
@@ -881,7 +1230,7 @@ public void dropMaterializedView(ConnectorSession session, SchemaTableName viewN
 
     private void dropStorageTable(ConnectorSession session, com.amazonaws.services.glue.model.Table view)
     {
-        Map<String, String> parameters = firstNonNull(view.getParameters(), ImmutableMap.of());
+        Map<String, String> parameters = getTableParameters(view);
         String storageTableName = parameters.get(STORAGE_TABLE);
         if (storageTableName != null) {
             String storageSchema = Optional.ofNullable(parameters.get(STORAGE_SCHEMA))
@@ -908,13 +1257,13 @@ protected Optional<ConnectorMaterializedViewDefinition> doGetMaterializedView(Co
             return Optional.empty();
         }
 
-        Optional<com.amazonaws.services.glue.model.Table> maybeTable = getTable(session, viewName);
+        Optional<com.amazonaws.services.glue.model.Table> maybeTable = getTableAndCacheMetadata(session, viewName);
         if (maybeTable.isEmpty()) {
             return Optional.empty();
         }
 
         com.amazonaws.services.glue.model.Table table = maybeTable.get();
-        if (!isTrinoMaterializedView(getTableType(table), firstNonNull(table.getParameters(), ImmutableMap.of()))) {
+        if (!isTrinoMaterializedView(getTableType(table), getTableParameters(table))) {
             return Optional.empty();
         }
 
@@ -926,7 +1275,7 @@ private Optional<ConnectorMaterializedViewDefinition> createMaterializedViewDefi
             SchemaTableName viewName,
             com.amazonaws.services.glue.model.Table table)
     {
-        Map<String, String> materializedViewParameters = firstNonNull(table.getParameters(), ImmutableMap.of());
+        Map<String, String> materializedViewParameters = getTableParameters(table);
         String storageTable = materializedViewParameters.get(STORAGE_TABLE);
         checkState(storageTable != null, "Storage table missing in definition of materialized view " + viewName);
         String storageSchema = Optional.ofNullable(materializedViewParameters.get(STORAGE_SCHEMA))
@@ -962,17 +1311,15 @@ public void renameMaterializedView(ConnectorSession session, SchemaTableName sou
     {
         boolean newTableCreated = false;
         try {
-            com.amazonaws.services.glue.model.Table glueTable = getTable(session, source)
+            com.amazonaws.services.glue.model.Table glueTable = getTableAndCacheMetadata(session, source)
                     .orElseThrow(() -> new TableNotFoundException(source));
             materializedViewCache.remove(source);
-            if (!isTrinoMaterializedView(getTableType(glueTable), firstNonNull(glueTable.getParameters(), ImmutableMap.of()))) {
+            Map<String, String> tableParameters = getTableParameters(glueTable);
+            if (!isTrinoMaterializedView(getTableType(glueTable), tableParameters)) {
                 throw new TrinoException(UNSUPPORTED_TABLE_TYPE, "Not a Materialized View: " + source);
             }
-            TableInput tableInput = getMaterializedViewTableInput(target.getTableName(), glueTable.getViewOriginalText(), glueTable.getOwner(), glueTable.getParameters());
-            CreateTableRequest createTableRequest = new CreateTableRequest()
-                    .withDatabaseName(target.getSchemaName())
-                    .withTableInput(tableInput);
-            stats.getCreateTable().call(() -> glueClient.createTable(createTableRequest));
+            TableInput tableInput = getMaterializedViewTableInput(target.getTableName(), glueTable.getViewOriginalText(), glueTable.getOwner(), tableParameters);
+            createTable(target.getSchemaName(), tableInput);
             newTableCreated = true;
             deleteTable(source.getSchemaName(), source.getTableName());
         }
@@ -992,14 +1339,12 @@ public void renameMaterializedView(ConnectorSession session, SchemaTableName sou
     }
 
     @Override
-    public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName)
+    public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName, String hiveCatalogName)
     {
         requireNonNull(session, "session is null");
         requireNonNull(tableName, "tableName is null");
-        Optional<String> targetCatalogName = getHiveCatalogName(session);
-        if (targetCatalogName.isEmpty()) {
-            return Optional.empty();
-        }
+        requireNonNull(hiveCatalogName, "hiveCatalogName is null");
+
         if (isHiveSystemSchema(tableName.getSchemaName())) {
             return Optional.empty();
         }
@@ -1010,15 +1355,79 @@ public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session,
                 tableName.getSchemaName(),
                 tableName.getTableName().substring(0, metadataMarkerIndex));
 
-        Optional<com.amazonaws.services.glue.model.Table> table = getTable(session, new SchemaTableName(tableNameBase.getSchemaName(), tableNameBase.getTableName()));
+        Optional<com.amazonaws.services.glue.model.Table> table = getTableAndCacheMetadata(session, new SchemaTableName(tableNameBase.getSchemaName(), tableNameBase.getTableName()));
 
         if (table.isEmpty() || VIRTUAL_VIEW.name().equals(getTableTypeNullable(table.get()))) {
             return Optional.empty();
         }
-        if (!isIcebergTable(firstNonNull(table.get().getParameters(), ImmutableMap.of()))) {
+        if (!isIcebergTable(getTableParameters(table.get()))) {
             // After redirecting, use the original table name, with "$partitions" and similar suffixes
-            return targetCatalogName.map(catalog -> new CatalogSchemaTableName(catalog, tableName));
+            return Optional.of(new CatalogSchemaTableName(hiveCatalogName, tableName));
         }
         return Optional.empty();
     }
+
+    com.amazonaws.services.glue.model.Table getTable(SchemaTableName tableName, boolean invalidateCaches)
+    {
+        if (invalidateCaches) {
+            glueTableCache.invalidate(tableName);
+        }
+
+        try {
+            return uncheckedCacheGet(glueTableCache, tableName, () -> {
+                try {
+                    GetTableRequest getTableRequest = new GetTableRequest()
+                            .withDatabaseName(tableName.getSchemaName())
+                            .withName(tableName.getTableName());
+                    return stats.getGetTable().call(() -> glueClient.getTable(getTableRequest).getTable());
+                }
+                catch (EntityNotFoundException e) {
+                    throw new TableNotFoundException(tableName, e);
+                }
+            });
+        }
+        catch (UncheckedExecutionException e) {
+            throwIfInstanceOf(e.getCause(), TrinoException.class);
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Get table request failed: " + firstNonNull(e.getMessage(), e), e.getCause());
+        }
+    }
+
+    private Stream<com.amazonaws.services.glue.model.Table> getGlueTables(String glueNamespace)
+    {
+        return getPaginatedResults(
+                glueClient::getTables,
+                new GetTablesRequest().withDatabaseName(glueNamespace),
+                GetTablesRequest::setNextToken,
+                GetTablesResult::getNextToken,
+                stats.getGetTables())
+                .map(GetTablesResult::getTableList)
+                .flatMap(List::stream);
+    }
+
+    private void createTable(String schemaName, TableInput tableInput)
+    {
+        glueTableCache.invalidateAll();
+        stats.getCreateTable().call(() ->
+                glueClient.createTable(new CreateTableRequest()
+                        .withDatabaseName(schemaName)
+                        .withTableInput(tableInput)));
+    }
+
+    private void updateTable(String schemaName, TableInput tableInput)
+    {
+        glueTableCache.invalidateAll();
+        stats.getUpdateTable().call(() ->
+                glueClient.updateTable(new UpdateTableRequest()
+                        .withDatabaseName(schemaName)
+                        .withTableInput(tableInput)));
+    }
+
+    private void deleteTable(String schema, String table)
+    {
+        glueTableCache.invalidateAll();
+        stats.getDeleteTable().call(() ->
+                glueClient.deleteTable(new DeleteTableRequest()
+                        .withDatabaseName(schema)
+                        .withName(table)));
+    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalogFactory.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalogFactory.java
index efb891ed8cb1..054c1bbc1c79 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalogFactory.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalogFactory.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.iceberg.catalog.glue;
 
 import com.amazonaws.services.glue.AWSGlueAsync;
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.NodeVersion;
@@ -28,8 +29,6 @@
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
@@ -40,6 +39,7 @@ public class TrinoGlueCatalogFactory
     private final CatalogName catalogName;
     private final TrinoFileSystemFactory fileSystemFactory;
     private final TypeManager typeManager;
+    private final boolean cacheTableMetadata;
     private final IcebergTableOperationsProvider tableOperationsProvider;
     private final String trinoVersion;
     private final Optional<String> defaultSchemaLocation;
@@ -56,12 +56,14 @@ public TrinoGlueCatalogFactory(
             NodeVersion nodeVersion,
             GlueHiveMetastoreConfig glueConfig,
             IcebergConfig icebergConfig,
+            IcebergGlueCatalogConfig catalogConfig,
             GlueMetastoreStats stats,
             AWSGlueAsync glueClient)
     {
         this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.cacheTableMetadata = catalogConfig.isCacheTableMetadata();
         this.tableOperationsProvider = requireNonNull(tableOperationsProvider, "tableOperationsProvider is null");
         this.trinoVersion = nodeVersion.toString();
         this.defaultSchemaLocation = glueConfig.getDefaultWarehouseDir();
@@ -84,6 +86,7 @@ public TrinoCatalog create(ConnectorIdentity identity)
                 catalogName,
                 fileSystemFactory,
                 typeManager,
+                cacheTableMetadata,
                 tableOperationsProvider,
                 trinoVersion,
                 glueClient,
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/AbstractMetastoreTableOperations.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/AbstractMetastoreTableOperations.java
index beb99d74a821..39b1f8bf23dc 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/AbstractMetastoreTableOperations.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/AbstractMetastoreTableOperations.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.iceberg.catalog.hms;
 
+import io.trino.annotation.NotThreadSafe;
 import io.trino.plugin.hive.TableAlreadyExistsException;
 import io.trino.plugin.hive.metastore.MetastoreUtil;
 import io.trino.plugin.hive.metastore.PrincipalPrivileges;
@@ -27,23 +28,22 @@
 import org.apache.iceberg.TableMetadata;
 import org.apache.iceberg.io.FileIO;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.Optional;
 
 import static com.google.common.base.Verify.verify;
 import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
 import static io.trino.plugin.hive.TableType.EXTERNAL_TABLE;
-import static io.trino.plugin.hive.ViewReaderUtil.isHiveOrPrestoView;
-import static io.trino.plugin.hive.ViewReaderUtil.isPrestoView;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoMaterializedView;
+import static io.trino.plugin.hive.ViewReaderUtil.isTrinoView;
 import static io.trino.plugin.hive.metastore.PrincipalPrivileges.NO_PRIVILEGES;
+import static io.trino.plugin.hive.util.HiveUtil.isIcebergTable;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_METADATA;
-import static io.trino.plugin.iceberg.IcebergUtil.isIcebergTable;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static org.apache.iceberg.BaseMetastoreTableOperations.ICEBERG_TABLE_TYPE_VALUE;
 import static org.apache.iceberg.BaseMetastoreTableOperations.METADATA_LOCATION_PROP;
+import static org.apache.iceberg.BaseMetastoreTableOperations.PREVIOUS_METADATA_LOCATION_PROP;
 import static org.apache.iceberg.BaseMetastoreTableOperations.TABLE_TYPE_PROP;
 
 @NotThreadSafe
@@ -73,8 +73,9 @@ protected final String getRefreshedLocation(boolean invalidateCaches)
         }
         Table table = getTable();
 
-        if (isPrestoView(table) && isHiveOrPrestoView(table)) {
-            // this is a Hive view, hence not a table
+        if (isTrinoView(table) || isTrinoMaterializedView(table)) {
+            // this is a Hive view or Trino/Presto view, or Trino materialized view, hence not a table
+            // TODO table operations should not be constructed for views (remove exception-driven code path)
             throw new TableNotFoundException(getSchemaTableName());
         }
         if (!isIcebergTable(table)) {
@@ -95,24 +96,18 @@ protected final void commitNewTable(TableMetadata metadata)
         verify(version.isEmpty(), "commitNewTable called on a table which already exists");
         String newMetadataLocation = writeNewMetadata(metadata, 0);
 
-        Table.Builder builder = Table.builder()
+        Table table = Table.builder()
                 .setDatabaseName(database)
                 .setTableName(tableName)
                 .setOwner(owner)
                 // Table needs to be EXTERNAL, otherwise table rename in HMS would rename table directory and break table contents.
                 .setTableType(EXTERNAL_TABLE.name())
-                .setDataColumns(toHiveColumns(metadata.schema().columns()))
-                .withStorage(storage -> storage.setLocation(metadata.location()))
                 .withStorage(storage -> storage.setStorageFormat(ICEBERG_METASTORE_STORAGE_FORMAT))
                 // This is a must-have property for the EXTERNAL_TABLE table type
                 .setParameter("EXTERNAL", "TRUE")
                 .setParameter(TABLE_TYPE_PROP, ICEBERG_TABLE_TYPE_VALUE.toUpperCase(ENGLISH))
-                .setParameter(METADATA_LOCATION_PROP, newMetadataLocation);
-        String tableComment = metadata.properties().get(TABLE_COMMENT);
-        if (tableComment != null) {
-            builder.setParameter(TABLE_COMMENT, tableComment);
-        }
-        Table table = builder.build();
+                .apply(builder -> updateMetastoreTable(builder, metadata, newMetadataLocation, Optional.empty()))
+                .build();
 
         PrincipalPrivileges privileges = owner.map(MetastoreUtil::buildInitialPrivilegeSet).orElse(NO_PRIVILEGES);
         try {
@@ -126,6 +121,16 @@ protected final void commitNewTable(TableMetadata metadata)
         }
     }
 
+    protected Table.Builder updateMetastoreTable(Table.Builder builder, TableMetadata metadata, String metadataLocation, Optional<String> previousMetadataLocation)
+    {
+        return builder
+                .setDataColumns(toHiveColumns(metadata.schema().columns()))
+                .withStorage(storage -> storage.setLocation(metadata.location()))
+                .setParameter(METADATA_LOCATION_PROP, metadataLocation)
+                .setParameter(PREVIOUS_METADATA_LOCATION_PROP, previousMetadataLocation)
+                .setParameter(TABLE_COMMENT, Optional.ofNullable(metadata.properties().get(TABLE_COMMENT)));
+    }
+
     protected Table getTable()
     {
         return metastore.getTable(database, tableName)
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperations.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperations.java
index 50c2d3f593c8..5a5d4dead2b1 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperations.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperations.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.iceberg.catalog.hms;
 
 import io.airlift.log.Logger;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.plugin.hive.metastore.AcidTransactionOwner;
 import io.trino.plugin.hive.metastore.MetastoreUtil;
 import io.trino.plugin.hive.metastore.PrincipalPrivileges;
@@ -27,8 +28,6 @@
 import org.apache.iceberg.exceptions.CommitStateUnknownException;
 import org.apache.iceberg.io.FileIO;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkState;
@@ -37,7 +36,6 @@
 import static io.trino.plugin.iceberg.IcebergUtil.fixBrokenMetadataLocation;
 import static java.util.Objects.requireNonNull;
 import static org.apache.iceberg.BaseMetastoreTableOperations.METADATA_LOCATION_PROP;
-import static org.apache.iceberg.BaseMetastoreTableOperations.PREVIOUS_METADATA_LOCATION_PROP;
 
 @NotThreadSafe
 public class HiveMetastoreTableOperations
@@ -82,10 +80,7 @@ protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
             }
 
             Table table = Table.builder(currentTable)
-                    .setDataColumns(toHiveColumns(metadata.schema().columns()))
-                    .withStorage(storage -> storage.setLocation(metadata.location()))
-                    .setParameter(METADATA_LOCATION_PROP, newMetadataLocation)
-                    .setParameter(PREVIOUS_METADATA_LOCATION_PROP, currentMetadataLocation)
+                    .apply(builder -> updateMetastoreTable(builder, metadata, newMetadataLocation, Optional.of(currentMetadataLocation)))
                     .build();
 
             // todo privileges should not be replaced for an alter
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperationsProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperationsProvider.java
index 039fd24231ff..b7a31bdbe817 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperationsProvider.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperationsProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.iceberg.catalog.hms;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreFactory;
 import io.trino.plugin.iceberg.catalog.IcebergTableOperations;
@@ -21,8 +22,6 @@
 import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalog.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalog.java
index c43f7874a0ba..e010255898c9 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalog.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalog.java
@@ -14,13 +14,14 @@
 package io.trino.plugin.iceberg.catalog.hms;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.log.Logger;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.HiveSchemaProperties;
 import io.trino.plugin.hive.TrinoViewHiveMetastore;
-import io.trino.plugin.hive.TrinoViewUtil;
 import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.HivePrincipal;
@@ -33,10 +34,13 @@
 import io.trino.plugin.iceberg.catalog.IcebergTableOperationsProvider;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorMaterializedViewDefinition;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorViewDefinition;
 import io.trino.spi.connector.MaterializedViewNotFoundException;
+import io.trino.spi.connector.RelationColumnsMetadata;
+import io.trino.spi.connector.RelationCommentMetadata;
 import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
@@ -52,15 +56,20 @@
 import org.apache.iceberg.Transaction;
 
 import java.io.IOException;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.filesystem.Locations.appendPath;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_DATABASE_LOCATION_ERROR;
 import static io.trino.plugin.hive.HiveErrorCode.HIVE_INVALID_METADATA;
 import static io.trino.plugin.hive.HiveMetadata.STORAGE_TABLE;
@@ -70,22 +79,22 @@
 import static io.trino.plugin.hive.TableType.VIRTUAL_VIEW;
 import static io.trino.plugin.hive.ViewReaderUtil.ICEBERG_MATERIALIZED_VIEW_COMMENT;
 import static io.trino.plugin.hive.ViewReaderUtil.encodeViewData;
-import static io.trino.plugin.hive.ViewReaderUtil.isHiveOrPrestoView;
+import static io.trino.plugin.hive.ViewReaderUtil.isSomeKindOfAView;
 import static io.trino.plugin.hive.ViewReaderUtil.isTrinoMaterializedView;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.buildInitialPrivilegeSet;
 import static io.trino.plugin.hive.metastore.PrincipalPrivileges.NO_PRIVILEGES;
 import static io.trino.plugin.hive.metastore.StorageFormat.VIEW_STORAGE_FORMAT;
 import static io.trino.plugin.hive.util.HiveUtil.isHiveSystemSchema;
+import static io.trino.plugin.hive.util.HiveUtil.isIcebergTable;
 import static io.trino.plugin.iceberg.IcebergMaterializedViewAdditionalProperties.STORAGE_SCHEMA;
 import static io.trino.plugin.iceberg.IcebergMaterializedViewDefinition.encodeMaterializedViewData;
 import static io.trino.plugin.iceberg.IcebergMaterializedViewDefinition.fromConnectorMaterializedViewDefinition;
 import static io.trino.plugin.iceberg.IcebergSchemaProperties.LOCATION_PROPERTY;
-import static io.trino.plugin.iceberg.IcebergSessionProperties.getHiveCatalogName;
 import static io.trino.plugin.iceberg.IcebergUtil.getIcebergTableWithMetadata;
-import static io.trino.plugin.iceberg.IcebergUtil.isIcebergTable;
 import static io.trino.plugin.iceberg.IcebergUtil.loadIcebergTable;
 import static io.trino.plugin.iceberg.IcebergUtil.validateTableCanBeDropped;
 import static io.trino.plugin.iceberg.catalog.AbstractIcebergTableOperations.ICEBERG_METASTORE_STORAGE_FORMAT;
+import static io.trino.plugin.iceberg.catalog.AbstractIcebergTableOperations.toHiveColumns;
 import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
 import static io.trino.spi.StandardErrorCode.INVALID_SCHEMA_PROPERTY;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
@@ -93,7 +102,6 @@
 import static io.trino.spi.StandardErrorCode.UNSUPPORTED_TABLE_TYPE;
 import static io.trino.spi.connector.SchemaTableName.schemaTableName;
 import static java.lang.String.format;
-import static java.lang.String.join;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static org.apache.iceberg.BaseMetastoreTableOperations.ICEBERG_TABLE_TYPE_VALUE;
@@ -197,9 +205,9 @@ public void createNamespace(ConnectorSession session, String namespace, Map<Stri
                 case LOCATION_PROPERTY -> {
                     String location = (String) value;
                     try {
-                        fileSystemFactory.create(session).newInputFile(location).exists();
+                        fileSystemFactory.create(session).directoryExists(Location.of(location));
                     }
-                    catch (IOException e) {
+                    catch (IOException | IllegalArgumentException e) {
                         throw new TrinoException(INVALID_SCHEMA_PROPERTY, "Invalid location URI: " + location, e);
                     }
                     database.setLocation(Optional.of(location));
@@ -228,7 +236,7 @@ public void dropNamespace(ConnectorSession session, String namespace)
         // If we fail to check the schema location, behave according to fallback.
         boolean deleteData = location.map(path -> {
             try {
-                return !fileSystemFactory.create(session).listFiles(path).hasNext();
+                return !fileSystemFactory.create(session).listFiles(Location.of(path)).hasNext();
             }
             catch (IOException | RuntimeException e) {
                 log.warn(e, "Could not check schema directory '%s'", path);
@@ -273,7 +281,27 @@ public Transaction newCreateTableTransaction(
     }
 
     @Override
-    public void registerTable(ConnectorSession session, SchemaTableName schemaTableName, String tableLocation, String metadataLocation)
+    public Transaction newCreateOrReplaceTableTransaction(
+            ConnectorSession session,
+            SchemaTableName schemaTableName,
+            Schema schema, PartitionSpec partitionSpec,
+            SortOrder sortOrder,
+            String location,
+            Map<String, String> properties)
+    {
+        return newCreateOrReplaceTableTransaction(
+                session,
+                schemaTableName,
+                schema,
+                partitionSpec,
+                sortOrder,
+                location,
+                properties,
+                isUsingSystemSecurity ? Optional.empty() : Optional.of(session.getUser()));
+    }
+
+    @Override
+    public void registerTable(ConnectorSession session, SchemaTableName schemaTableName, TableMetadata tableMetadata)
             throws TrinoException
     {
         Optional<String> owner = isUsingSystemSecurity ? Optional.empty() : Optional.of(session.getUser());
@@ -282,14 +310,15 @@ public void registerTable(ConnectorSession session, SchemaTableName schemaTableN
                 .setDatabaseName(schemaTableName.getSchemaName())
                 .setTableName(schemaTableName.getTableName())
                 .setOwner(owner)
+                .setDataColumns(toHiveColumns(tableMetadata.schema().columns()))
                 // Table needs to be EXTERNAL, otherwise table rename in HMS would rename table directory and break table contents.
                 .setTableType(EXTERNAL_TABLE.name())
-                .withStorage(storage -> storage.setLocation(tableLocation))
+                .withStorage(storage -> storage.setLocation(tableMetadata.location()))
                 .withStorage(storage -> storage.setStorageFormat(ICEBERG_METASTORE_STORAGE_FORMAT))
                 // This is a must-have property for the EXTERNAL_TABLE table type
                 .setParameter("EXTERNAL", "TRUE")
                 .setParameter(TABLE_TYPE_PROP, ICEBERG_TABLE_TYPE_VALUE.toUpperCase(ENGLISH))
-                .setParameter(METADATA_LOCATION_PROP, metadataLocation);
+                .setParameter(METADATA_LOCATION_PROP, tableMetadata.metadataFileLocation());
 
         PrincipalPrivileges privileges = owner.map(MetastoreUtil::buildInitialPrivilegeSet).orElse(NO_PRIVILEGES);
         metastore.createTable(builder.build(), privileges);
@@ -298,16 +327,7 @@ public void registerTable(ConnectorSession session, SchemaTableName schemaTableN
     @Override
     public void unregisterTable(ConnectorSession session, SchemaTableName schemaTableName)
     {
-        io.trino.plugin.hive.metastore.Table table = metastore.getTable(schemaTableName.getSchemaName(), schemaTableName.getTableName())
-                .orElseThrow(() -> new TableNotFoundException(schemaTableName));
-        if (!isIcebergTable(table)) {
-            throw new UnknownTableTypeException(schemaTableName);
-        }
-
-        metastore.dropTable(
-                schemaTableName.getSchemaName(),
-                schemaTableName.getTableName(),
-                false /* do not delete data */);
+        dropTableFromMetastore(schemaTableName);
     }
 
     @Override
@@ -320,6 +340,26 @@ public List<SchemaTableName> listTables(ConnectorSession session, Optional<Strin
         return tablesListBuilder.build().asList();
     }
 
+    @Override
+    public Optional<Iterator<RelationColumnsMetadata>> streamRelationColumns(
+            ConnectorSession session,
+            Optional<String> namespace,
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Predicate<SchemaTableName> isRedirected)
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<Iterator<RelationCommentMetadata>> streamRelationComments(
+            ConnectorSession session,
+            Optional<String> namespace,
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Predicate<SchemaTableName> isRedirected)
+    {
+        return Optional.empty();
+    }
+
     @Override
     public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
     {
@@ -333,12 +373,41 @@ public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
                 schemaTableName.getSchemaName(),
                 schemaTableName.getTableName(),
                 false /* do not delete data */);
-        // Use the Iceberg routine for dropping the table data because the data files
-        // of the Iceberg table may be located in different locations
-        dropTableData(table.io(), metadata);
+        try {
+            // Use the Iceberg routine for dropping the table data because the data files
+            // of the Iceberg table may be located in different locations
+            dropTableData(table.io(), metadata);
+        }
+        catch (RuntimeException e) {
+            // If the snapshot file is not found, an exception will be thrown by the dropTableData function.
+            // So log the exception and continue with deleting the table location
+            log.warn(e, "Failed to delete table data referenced by metadata");
+        }
         deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, metastoreTable.getStorage().getLocation());
     }
 
+    @Override
+    public void dropCorruptedTable(ConnectorSession session, SchemaTableName schemaTableName)
+    {
+        io.trino.plugin.hive.metastore.Table table = dropTableFromMetastore(schemaTableName);
+        deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, table.getStorage().getLocation());
+    }
+
+    private io.trino.plugin.hive.metastore.Table dropTableFromMetastore(SchemaTableName schemaTableName)
+    {
+        io.trino.plugin.hive.metastore.Table table = metastore.getTable(schemaTableName.getSchemaName(), schemaTableName.getTableName())
+                .orElseThrow(() -> new TableNotFoundException(schemaTableName));
+        if (!isIcebergTable(table)) {
+            throw new UnknownTableTypeException(schemaTableName);
+        }
+
+        metastore.dropTable(
+                schemaTableName.getSchemaName(),
+                schemaTableName.getTableName(),
+                false /* do not delete data */);
+        return table;
+    }
+
     @Override
     public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTableName to)
     {
@@ -356,45 +425,21 @@ public Table loadTable(ConnectorSession session, SchemaTableName schemaTableName
     }
 
     @Override
-    public void updateViewComment(ConnectorSession session, SchemaTableName viewName, Optional<String> comment)
+    public Map<SchemaTableName, List<ColumnMetadata>> tryGetColumnMetadata(ConnectorSession session, List<SchemaTableName> tables)
     {
-        io.trino.plugin.hive.metastore.Table view = metastore.getTable(viewName.getSchemaName(), viewName.getTableName())
-                .orElseThrow(() -> new ViewNotFoundException(viewName));
-
-        ConnectorViewDefinition definition = TrinoViewUtil.getView(viewName, view.getViewOriginalText(), view.getTableType(), view.getParameters(), view.getOwner())
-                .orElseThrow(() -> new ViewNotFoundException(viewName));
-        ConnectorViewDefinition newDefinition = new ConnectorViewDefinition(
-                definition.getOriginalSql(),
-                definition.getCatalog(),
-                definition.getSchema(),
-                definition.getColumns(),
-                comment,
-                definition.getOwner(),
-                definition.isRunAsInvoker());
+        return ImmutableMap.of();
+    }
 
-        replaceView(session, viewName, view, newDefinition);
+    @Override
+    public void updateViewComment(ConnectorSession session, SchemaTableName viewName, Optional<String> comment)
+    {
+        trinoViewHiveMetastore.updateViewComment(session, viewName, comment);
     }
 
     @Override
     public void updateViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
     {
-        io.trino.plugin.hive.metastore.Table view = metastore.getTable(viewName.getSchemaName(), viewName.getTableName())
-                .orElseThrow(() -> new ViewNotFoundException(viewName));
-
-        ConnectorViewDefinition definition = TrinoViewUtil.getView(viewName, view.getViewOriginalText(), view.getTableType(), view.getParameters(), view.getOwner())
-                .orElseThrow(() -> new ViewNotFoundException(viewName));
-        ConnectorViewDefinition newDefinition = new ConnectorViewDefinition(
-                definition.getOriginalSql(),
-                definition.getCatalog(),
-                definition.getSchema(),
-                definition.getColumns().stream()
-                        .map(currentViewColumn -> Objects.equals(columnName, currentViewColumn.getName()) ? new ConnectorViewDefinition.ViewColumn(currentViewColumn.getName(), currentViewColumn.getType(), comment) : currentViewColumn)
-                        .collect(toImmutableList()),
-                definition.getComment(),
-                definition.getOwner(),
-                definition.isRunAsInvoker());
-
-        replaceView(session, viewName, view, newDefinition);
+        trinoViewHiveMetastore.updateViewColumnComment(session, viewName, columnName, comment);
     }
 
     private void replaceView(ConnectorSession session, SchemaTableName viewName, io.trino.plugin.hive.metastore.Table view, ConnectorViewDefinition newDefinition)
@@ -415,7 +460,7 @@ public String defaultTableLocation(ConnectorSession session, SchemaTableName sch
         String tableNameForLocation = createNewTableName(schemaTableName.getTableName());
         String location = database.getLocation().orElseThrow(() ->
                 new TrinoException(HIVE_DATABASE_LOCATION_ERROR, format("Database '%s' location is not set", schemaTableName.getSchemaName())));
-        return join("/", location, tableNameForLocation);
+        return appendPath(location, tableNameForLocation);
     }
 
     @Override
@@ -531,6 +576,48 @@ public void createMaterializedView(
         metastore.createTable(table, principalPrivileges);
     }
 
+    @Override
+    public void updateMaterializedViewColumnComment(ConnectorSession session, SchemaTableName viewName, String columnName, Optional<String> comment)
+    {
+        io.trino.plugin.hive.metastore.Table existing = metastore.getTable(viewName.getSchemaName(), viewName.getTableName())
+                .orElseThrow(() -> new ViewNotFoundException(viewName));
+
+        if (!isTrinoMaterializedView(existing.getTableType(), existing.getParameters())) {
+            throw new TrinoException(UNSUPPORTED_TABLE_TYPE, "Existing table is not a Materialized View: " + viewName);
+        }
+        ConnectorMaterializedViewDefinition definition = doGetMaterializedView(session, viewName)
+                .orElseThrow(() -> new ViewNotFoundException(viewName));
+
+        ConnectorMaterializedViewDefinition newDefinition = new ConnectorMaterializedViewDefinition(
+                definition.getOriginalSql(),
+                definition.getStorageTable(),
+                definition.getCatalog(),
+                definition.getSchema(),
+                definition.getColumns().stream()
+                        .map(currentViewColumn -> Objects.equals(columnName, currentViewColumn.getName())
+                                ? new ConnectorMaterializedViewDefinition.Column(currentViewColumn.getName(), currentViewColumn.getType(), comment)
+                                : currentViewColumn)
+                        .collect(toImmutableList()),
+                definition.getGracePeriod(),
+                definition.getComment(),
+                definition.getOwner(),
+                definition.getPath(),
+                definition.getProperties());
+
+        replaceMaterializedView(session, viewName, existing, newDefinition);
+    }
+
+    private void replaceMaterializedView(ConnectorSession session, SchemaTableName viewName, io.trino.plugin.hive.metastore.Table view, ConnectorMaterializedViewDefinition newDefinition)
+    {
+        io.trino.plugin.hive.metastore.Table.Builder viewBuilder = io.trino.plugin.hive.metastore.Table.builder(view)
+                .setViewOriginalText(Optional.of(
+                        encodeMaterializedViewData(fromConnectorMaterializedViewDefinition(newDefinition))));
+
+        PrincipalPrivileges principalPrivileges = isUsingSystemSecurity ? NO_PRIVILEGES : buildInitialPrivilegeSet(session.getUser());
+
+        metastore.replaceTable(viewName.getSchemaName(), viewName.getTableName(), viewBuilder.build(), principalPrivileges);
+    }
+
     @Override
     public void dropMaterializedView(ConnectorSession session, SchemaTableName viewName)
     {
@@ -615,14 +702,12 @@ private List<String> listNamespaces(ConnectorSession session, Optional<String> n
     }
 
     @Override
-    public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName)
+    public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName, String hiveCatalogName)
     {
         requireNonNull(session, "session is null");
         requireNonNull(tableName, "tableName is null");
-        Optional<String> targetCatalogName = getHiveCatalogName(session);
-        if (targetCatalogName.isEmpty()) {
-            return Optional.empty();
-        }
+        requireNonNull(hiveCatalogName, "hiveCatalogName is null");
+
         if (isHiveSystemSchema(tableName.getSchemaName())) {
             return Optional.empty();
         }
@@ -635,12 +720,12 @@ public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session,
 
         Optional<io.trino.plugin.hive.metastore.Table> table = metastore.getTable(tableNameBase.getSchemaName(), tableNameBase.getTableName());
 
-        if (table.isEmpty() || isHiveOrPrestoView(table.get().getTableType())) {
+        if (table.isEmpty() || isSomeKindOfAView(table.get())) {
             return Optional.empty();
         }
         if (!isIcebergTable(table.get())) {
             // After redirecting, use the original table name, with "$partitions" and similar suffixes
-            return targetCatalogName.map(catalog -> new CatalogSchemaTableName(catalog, tableName));
+            return Optional.of(new CatalogSchemaTableName(hiveCatalogName, tableName));
         }
         return Optional.empty();
     }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalogFactory.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalogFactory.java
index c86f633f6704..cc3d405a65cd 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalogFactory.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalogFactory.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.iceberg.catalog.hms;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.NodeVersion;
@@ -27,8 +28,6 @@
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static io.trino.plugin.hive.metastore.cache.CachingHiveMetastore.memoizeMetastore;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/IcebergJdbcCatalogConfig.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/IcebergJdbcCatalogConfig.java
index 52d4934d018b..24d36063917a 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/IcebergJdbcCatalogConfig.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/IcebergJdbcCatalogConfig.java
@@ -16,9 +16,8 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/IcebergJdbcTableOperationsProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/IcebergJdbcTableOperationsProvider.java
index e7629985dab3..ad8c861afc08 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/IcebergJdbcTableOperationsProvider.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/IcebergJdbcTableOperationsProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.iceberg.catalog.jdbc;
 
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.iceberg.catalog.IcebergTableOperations;
 import io.trino.plugin.iceberg.catalog.IcebergTableOperationsProvider;
@@ -20,8 +21,6 @@
 import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/TrinoJdbcCatalog.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/TrinoJdbcCatalog.java
index 60fe51b6d492..5d04d469baba 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/TrinoJdbcCatalog.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/TrinoJdbcCatalog.java
@@ -16,16 +16,19 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import io.airlift.log.Logger;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.iceberg.catalog.AbstractTrinoCatalog;
 import io.trino.plugin.iceberg.catalog.IcebergTableOperationsProvider;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorMaterializedViewDefinition;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorViewDefinition;
-import io.trino.spi.connector.SchemaNotFoundException;
+import io.trino.spi.connector.RelationColumnsMetadata;
+import io.trino.spi.connector.RelationCommentMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.security.TrinoPrincipal;
@@ -42,21 +45,27 @@
 import org.apache.iceberg.exceptions.NoSuchNamespaceException;
 import org.apache.iceberg.jdbc.JdbcCatalog;
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.Maps.transformValues;
 import static io.trino.filesystem.Locations.appendPath;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_CATALOG_ERROR;
+import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_METADATA;
 import static io.trino.plugin.iceberg.IcebergSchemaProperties.LOCATION_PROPERTY;
 import static io.trino.plugin.iceberg.IcebergUtil.getIcebergTableWithMetadata;
 import static io.trino.plugin.iceberg.IcebergUtil.loadIcebergTable;
 import static io.trino.plugin.iceberg.IcebergUtil.validateTableCanBeDropped;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static org.apache.iceberg.CatalogUtil.dropTableData;
@@ -64,6 +73,8 @@
 public class TrinoJdbcCatalog
         extends AbstractTrinoCatalog
 {
+    private static final Logger LOG = Logger.get(TrinoJdbcCatalog.class);
+
     private final JdbcCatalog jdbcCatalog;
     private final IcebergJdbcClient jdbcClient;
     private final TrinoFileSystemFactory fileSystemFactory;
@@ -160,6 +171,26 @@ public List<SchemaTableName> listTables(ConnectorSession session, Optional<Strin
         return tablesListBuilder.build().asList();
     }
 
+    @Override
+    public Optional<Iterator<RelationColumnsMetadata>> streamRelationColumns(
+            ConnectorSession session,
+            Optional<String> namespace,
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Predicate<SchemaTableName> isRedirected)
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<Iterator<RelationCommentMetadata>> streamRelationComments(
+            ConnectorSession session,
+            Optional<String> namespace,
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Predicate<SchemaTableName> isRedirected)
+    {
+        return Optional.empty();
+    }
+
     private List<String> listNamespaces(ConnectorSession session, Optional<String> namespace)
     {
         if (namespace.isPresent() && namespaceExists(session, namespace.get())) {
@@ -178,9 +209,6 @@ public Transaction newCreateTableTransaction(
             String location,
             Map<String, String> properties)
     {
-        if (!listNamespaces(session, Optional.of(schemaTableName.getSchemaName())).contains(schemaTableName.getSchemaName())) {
-            throw new SchemaNotFoundException(schemaTableName.getSchemaName());
-        }
         return newCreateTableTransaction(
                 session,
                 schemaTableName,
@@ -193,11 +221,32 @@ public Transaction newCreateTableTransaction(
     }
 
     @Override
-    public void registerTable(ConnectorSession session, SchemaTableName tableName, String tableLocation, String metadataLocation)
+    public Transaction newCreateOrReplaceTableTransaction(
+            ConnectorSession session,
+            SchemaTableName schemaTableName,
+            Schema schema,
+            PartitionSpec partitionSpec,
+            SortOrder sortOrder,
+            String location,
+            Map<String, String> properties)
+    {
+        return newCreateOrReplaceTableTransaction(
+                session,
+                schemaTableName,
+                schema,
+                partitionSpec,
+                sortOrder,
+                location,
+                properties,
+                Optional.of(session.getUser()));
+    }
+
+    @Override
+    public void registerTable(ConnectorSession session, SchemaTableName tableName, TableMetadata tableMetadata)
     {
         // Using IcebergJdbcClient because JdbcCatalog.registerTable causes the below error.
         // "Cannot invoke "org.apache.iceberg.util.SerializableSupplier.get()" because "this.hadoopConf" is null"
-        jdbcClient.createTable(tableName.getSchemaName(), tableName.getTableName(), metadataLocation);
+        jdbcClient.createTable(tableName.getSchemaName(), tableName.getTableName(), tableMetadata.metadataFileLocation());
     }
 
     @Override
@@ -215,10 +264,31 @@ public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
         validateTableCanBeDropped(table);
 
         jdbcCatalog.dropTable(toIdentifier(schemaTableName), false);
-        dropTableData(table.io(), table.operations().current());
+        try {
+            dropTableData(table.io(), table.operations().current());
+        }
+        catch (RuntimeException e) {
+            // If the snapshot file is not found, an exception will be thrown by the dropTableData function.
+            // So log the exception and continue with deleting the table location
+            LOG.warn(e, "Failed to delete table data referenced by metadata");
+        }
         deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, table.location());
     }
 
+    @Override
+    public void dropCorruptedTable(ConnectorSession session, SchemaTableName schemaTableName)
+    {
+        Optional<String> metadataLocation = jdbcClient.getMetadataLocation(schemaTableName.getSchemaName(), schemaTableName.getTableName());
+        if (!jdbcCatalog.dropTable(toIdentifier(schemaTableName), false)) {
+            throw new TableNotFoundException(schemaTableName);
+        }
+        if (metadataLocation.isEmpty()) {
+            throw new TrinoException(ICEBERG_INVALID_METADATA, format("Could not find metadata_location for table %s", schemaTableName));
+        }
+        String tableLocation = metadataLocation.get().replaceFirst("/metadata/[^/]*$", "");
+        deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, tableLocation);
+    }
+
     @Override
     public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTableName to)
     {
@@ -240,6 +310,12 @@ public Table loadTable(ConnectorSession session, SchemaTableName schemaTableName
         return getIcebergTableWithMetadata(this, tableOperationsProvider, session, schemaTableName, metadata);
     }
 
+    @Override
+    public Map<SchemaTableName, List<ColumnMetadata>> tryGetColumnMetadata(ConnectorSession session, List<SchemaTableName> tables)
+    {
+        return ImmutableMap.of();
+    }
+
     @Override
     public void updateViewComment(ConnectorSession session, SchemaTableName schemaViewName, Optional<String> comment)
     {
@@ -335,6 +411,12 @@ public void createMaterializedView(ConnectorSession session, SchemaTableName sch
         throw new TrinoException(NOT_SUPPORTED, "createMaterializedView is not supported for Iceberg JDBC catalogs");
     }
 
+    @Override
+    public void updateMaterializedViewColumnComment(ConnectorSession session, SchemaTableName schemaViewName, String columnName, Optional<String> comment)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "updateMaterializedViewColumnComment is not supported for Iceberg JDBC catalogs");
+    }
+
     @Override
     public void dropMaterializedView(ConnectorSession session, SchemaTableName schemaViewName)
     {
@@ -354,7 +436,7 @@ public void renameMaterializedView(ConnectorSession session, SchemaTableName sou
     }
 
     @Override
-    public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName)
+    public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName, String hiveCatalogName)
     {
         return Optional.empty();
     }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/TrinoJdbcCatalogFactory.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/TrinoJdbcCatalogFactory.java
index 4a2023dee212..5c887f50e48c 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/TrinoJdbcCatalogFactory.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/TrinoJdbcCatalogFactory.java
@@ -14,20 +14,21 @@
 package io.trino.plugin.iceberg.catalog.jdbc;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.iceberg.IcebergConfig;
 import io.trino.plugin.iceberg.catalog.IcebergTableOperationsProvider;
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
 import io.trino.plugin.iceberg.catalog.TrinoCatalogFactory;
+import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.type.TypeManager;
+import jakarta.annotation.PreDestroy;
 import org.apache.iceberg.jdbc.JdbcCatalog;
+import org.apache.iceberg.jdbc.JdbcClientPool;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
-import java.util.Optional;
+import java.util.Map;
 
 import static java.util.Objects.requireNonNull;
 import static org.apache.iceberg.CatalogProperties.URI;
@@ -43,14 +44,10 @@ public class TrinoJdbcCatalogFactory
     private final TrinoFileSystemFactory fileSystemFactory;
     private final IcebergJdbcClient jdbcClient;
     private final String jdbcCatalogName;
-    private final String connectionUrl;
-    private final Optional<String> connectionUser;
-    private final Optional<String> connectionPassword;
     private final String defaultWarehouseDir;
     private final boolean isUniqueTableLocation;
-
-    @GuardedBy("this")
-    private JdbcCatalog icebergCatalog;
+    private final Map<String, String> catalogProperties;
+    private final JdbcClientPool clientPool;
 
     @Inject
     public TrinoJdbcCatalogFactory(
@@ -69,39 +66,42 @@ public TrinoJdbcCatalogFactory(
         this.isUniqueTableLocation = requireNonNull(icebergConfig, "icebergConfig is null").isUniqueTableLocation();
         this.jdbcClient = requireNonNull(jdbcClient, "jdbcClient is null");
         this.jdbcCatalogName = jdbcConfig.getCatalogName();
-        this.connectionUrl = jdbcConfig.getConnectionUrl();
-        this.connectionUser = jdbcConfig.getConnectionUser();
-        this.connectionPassword = jdbcConfig.getConnectionPassword();
         this.defaultWarehouseDir = jdbcConfig.getDefaultWarehouseDir();
+
+        ImmutableMap.Builder<String, String> properties = ImmutableMap.builder();
+        properties.put(URI, jdbcConfig.getConnectionUrl());
+        properties.put(WAREHOUSE_LOCATION, defaultWarehouseDir);
+        jdbcConfig.getConnectionUser().ifPresent(user -> properties.put(PROPERTY_PREFIX + "user", user));
+        jdbcConfig.getConnectionPassword().ifPresent(password -> properties.put(PROPERTY_PREFIX + "password", password));
+        this.catalogProperties = properties.buildOrThrow();
+
+        this.clientPool = new JdbcClientPool(jdbcConfig.getConnectionUrl(), catalogProperties);
+    }
+
+    @PreDestroy
+    public void shutdown()
+    {
+        clientPool.close();
     }
 
     @Override
-    public synchronized TrinoCatalog create(ConnectorIdentity identity)
+    public TrinoCatalog create(ConnectorIdentity identity)
     {
-        // Reuse JdbcCatalog instance to avoid JDBC connection leaks
-        if (icebergCatalog == null) {
-            icebergCatalog = createJdbcCatalog();
-        }
+        JdbcCatalog jdbcCatalog = new JdbcCatalog(
+                config -> new ForwardingFileIo(fileSystemFactory.create(identity)),
+                config -> clientPool,
+                false);
+
+        jdbcCatalog.initialize(jdbcCatalogName, catalogProperties);
+
         return new TrinoJdbcCatalog(
                 catalogName,
                 typeManager,
                 tableOperationsProvider,
-                icebergCatalog,
+                jdbcCatalog,
                 jdbcClient,
                 fileSystemFactory,
                 isUniqueTableLocation,
                 defaultWarehouseDir);
     }
-
-    private JdbcCatalog createJdbcCatalog()
-    {
-        JdbcCatalog jdbcCatalog = new JdbcCatalog();
-        ImmutableMap.Builder<String, String> properties = ImmutableMap.builder();
-        properties.put(URI, connectionUrl);
-        properties.put(WAREHOUSE_LOCATION, defaultWarehouseDir);
-        connectionUser.ifPresent(user -> properties.put(PROPERTY_PREFIX + "user", user));
-        connectionPassword.ifPresent(password -> properties.put(PROPERTY_PREFIX + "password", password));
-        jdbcCatalog.initialize(jdbcCatalogName, properties.buildOrThrow());
-        return jdbcCatalog;
-    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieCatalogConfig.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieCatalogConfig.java
new file mode 100644
index 000000000000..492d0b3fa289
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieCatalogConfig.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.catalog.nessie;
+
+import io.airlift.configuration.Config;
+import io.airlift.configuration.ConfigDescription;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import java.net.URI;
+
+public class IcebergNessieCatalogConfig
+{
+    private String defaultReferenceName = "main";
+    private String defaultWarehouseDir;
+    private URI serverUri;
+
+    @NotNull
+    public String getDefaultReferenceName()
+    {
+        return defaultReferenceName;
+    }
+
+    @Config("iceberg.nessie-catalog.ref")
+    @ConfigDescription("The default Nessie reference to work on")
+    public IcebergNessieCatalogConfig setDefaultReferenceName(String defaultReferenceName)
+    {
+        this.defaultReferenceName = defaultReferenceName;
+        return this;
+    }
+
+    @NotNull
+    public URI getServerUri()
+    {
+        return serverUri;
+    }
+
+    @Config("iceberg.nessie-catalog.uri")
+    @ConfigDescription("The URI to connect to the Nessie server")
+    public IcebergNessieCatalogConfig setServerUri(URI serverUri)
+    {
+        this.serverUri = serverUri;
+        return this;
+    }
+
+    @NotEmpty
+    public String getDefaultWarehouseDir()
+    {
+        return defaultWarehouseDir;
+    }
+
+    @Config("iceberg.nessie-catalog.default-warehouse-dir")
+    @ConfigDescription("The default warehouse to use for Nessie")
+    public IcebergNessieCatalogConfig setDefaultWarehouseDir(String defaultWarehouseDir)
+    {
+        this.defaultWarehouseDir = defaultWarehouseDir;
+        return this;
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieCatalogModule.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieCatalogModule.java
new file mode 100644
index 000000000000..f0e5de3ec30a
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieCatalogModule.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.catalog.nessie;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.Binder;
+import com.google.inject.Provides;
+import com.google.inject.Scopes;
+import com.google.inject.Singleton;
+import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.trino.plugin.iceberg.catalog.IcebergTableOperationsProvider;
+import io.trino.plugin.iceberg.catalog.TrinoCatalogFactory;
+import org.apache.iceberg.nessie.NessieIcebergClient;
+import org.projectnessie.client.api.NessieApiV1;
+import org.projectnessie.client.http.HttpClientBuilder;
+
+import static io.airlift.configuration.ConfigBinder.configBinder;
+import static org.weakref.jmx.guice.ExportBinder.newExporter;
+
+public class IcebergNessieCatalogModule
+        extends AbstractConfigurationAwareModule
+{
+    @Override
+    protected void setup(Binder binder)
+    {
+        configBinder(binder).bindConfig(IcebergNessieCatalogConfig.class);
+        binder.bind(IcebergTableOperationsProvider.class).to(IcebergNessieTableOperationsProvider.class).in(Scopes.SINGLETON);
+        newExporter(binder).export(IcebergTableOperationsProvider.class).withGeneratedName();
+        binder.bind(TrinoCatalogFactory.class).to(TrinoNessieCatalogFactory.class).in(Scopes.SINGLETON);
+        newExporter(binder).export(TrinoCatalogFactory.class).withGeneratedName();
+    }
+
+    @Provides
+    @Singleton
+    public static NessieIcebergClient createNessieIcebergClient(IcebergNessieCatalogConfig icebergNessieCatalogConfig)
+    {
+        return new NessieIcebergClient(
+                HttpClientBuilder.builder()
+                        .withUri(icebergNessieCatalogConfig.getServerUri())
+                        .build(NessieApiV1.class),
+                icebergNessieCatalogConfig.getDefaultReferenceName(),
+                null,
+                ImmutableMap.of());
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieTableOperations.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieTableOperations.java
new file mode 100644
index 000000000000..75be83f8293d
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieTableOperations.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.catalog.nessie;
+
+import io.trino.plugin.iceberg.catalog.AbstractIcebergTableOperations;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.TableNotFoundException;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.exceptions.CommitFailedException;
+import org.apache.iceberg.io.FileIO;
+import org.apache.iceberg.nessie.NessieIcebergClient;
+import org.projectnessie.error.NessieConflictException;
+import org.projectnessie.error.NessieNotFoundException;
+import org.projectnessie.model.ContentKey;
+import org.projectnessie.model.IcebergTable;
+import org.projectnessie.model.Namespace;
+
+import java.util.Optional;
+
+import static com.google.common.base.Verify.verify;
+import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_CATALOG_ERROR;
+import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_COMMIT_ERROR;
+import static io.trino.plugin.iceberg.catalog.nessie.IcebergNessieUtil.toIdentifier;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+public class IcebergNessieTableOperations
+        extends AbstractIcebergTableOperations
+{
+    private final NessieIcebergClient nessieClient;
+    private IcebergTable table;
+
+    protected IcebergNessieTableOperations(
+            NessieIcebergClient nessieClient,
+            FileIO fileIo,
+            ConnectorSession session,
+            String database,
+            String table,
+            Optional<String> owner,
+            Optional<String> location)
+    {
+        super(fileIo, session, database, table, owner, location);
+        this.nessieClient = requireNonNull(nessieClient, "nessieClient is null");
+    }
+
+    @Override
+    public TableMetadata refresh()
+    {
+        refreshNessieClient();
+        return super.refresh();
+    }
+
+    private void refreshNessieClient()
+    {
+        try {
+            nessieClient.refresh();
+        }
+        catch (NessieNotFoundException e) {
+            throw new TrinoException(ICEBERG_CATALOG_ERROR, format("Failed to refresh as ref '%s' is no longer valid.", nessieClient.refName()), e);
+        }
+    }
+
+    @Override
+    public TableMetadata refresh(boolean invalidateCaches)
+    {
+        refreshNessieClient();
+        return super.refresh(invalidateCaches);
+    }
+
+    @Override
+    protected String getRefreshedLocation(boolean invalidateCaches)
+    {
+        table = nessieClient.table(toIdentifier(new SchemaTableName(database, tableName)));
+
+        if (table == null) {
+            throw new TableNotFoundException(getSchemaTableName());
+        }
+
+        return table.getMetadataLocation();
+    }
+
+    @Override
+    protected void commitNewTable(TableMetadata metadata)
+    {
+        verify(version.isEmpty(), "commitNewTable called on a table which already exists");
+        try {
+            nessieClient.commitTable(null, metadata, writeNewMetadata(metadata, 0), table, toKey(new SchemaTableName(database, this.tableName)));
+        }
+        catch (NessieNotFoundException e) {
+            throw new TrinoException(ICEBERG_COMMIT_ERROR, format("Cannot commit: ref '%s' no longer exists", nessieClient.refName()), e);
+        }
+        catch (NessieConflictException e) {
+            // CommitFailedException is handled as a special case in the Iceberg library. This commit will automatically retry
+            throw new CommitFailedException(e, "Cannot commit: ref hash is out of date. Update the ref '%s' and try again", nessieClient.refName());
+        }
+        shouldRefresh = true;
+    }
+
+    @Override
+    protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
+    {
+        verify(version.orElseThrow() >= 0, "commitToExistingTable called on a new table");
+        try {
+            nessieClient.commitTable(base, metadata, writeNewMetadata(metadata, version.getAsInt() + 1), table, toKey(new SchemaTableName(database, this.tableName)));
+        }
+        catch (NessieNotFoundException e) {
+            throw new TrinoException(ICEBERG_COMMIT_ERROR, format("Cannot commit: ref '%s' no longer exists", nessieClient.refName()), e);
+        }
+        catch (NessieConflictException e) {
+            // CommitFailedException is handled as a special case in the Iceberg library. This commit will automatically retry
+            throw new CommitFailedException(e, "Cannot commit: ref hash is out of date. Update the ref '%s' and try again", nessieClient.refName());
+        }
+        shouldRefresh = true;
+    }
+
+    private static ContentKey toKey(SchemaTableName tableName)
+    {
+        return ContentKey.of(Namespace.parse(tableName.getSchemaName()), tableName.getTableName());
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieTableOperationsProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieTableOperationsProvider.java
new file mode 100644
index 000000000000..0be1d7df9c68
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieTableOperationsProvider.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.catalog.nessie;
+
+import com.google.inject.Inject;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.plugin.iceberg.catalog.IcebergTableOperations;
+import io.trino.plugin.iceberg.catalog.IcebergTableOperationsProvider;
+import io.trino.plugin.iceberg.catalog.TrinoCatalog;
+import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
+import io.trino.spi.connector.ConnectorSession;
+import org.apache.iceberg.nessie.NessieIcebergClient;
+
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public class IcebergNessieTableOperationsProvider
+        implements IcebergTableOperationsProvider
+{
+    private final TrinoFileSystemFactory fileSystemFactory;
+    private final NessieIcebergClient nessieClient;
+
+    @Inject
+    public IcebergNessieTableOperationsProvider(TrinoFileSystemFactory fileSystemFactory, NessieIcebergClient nessieClient)
+    {
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
+        this.nessieClient = requireNonNull(nessieClient, "nessieClient is null");
+    }
+
+    @Override
+    public IcebergTableOperations createTableOperations(
+            TrinoCatalog catalog,
+            ConnectorSession session,
+            String database,
+            String table,
+            Optional<String> owner,
+            Optional<String> location)
+    {
+        return new IcebergNessieTableOperations(
+                nessieClient,
+                new ForwardingFileIo(fileSystemFactory.create(session)),
+                session,
+                database,
+                table,
+                owner,
+                location);
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieUtil.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieUtil.java
new file mode 100644
index 000000000000..c39f5de74fde
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieUtil.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.catalog.nessie;
+
+import io.trino.spi.connector.SchemaTableName;
+import org.apache.iceberg.catalog.TableIdentifier;
+
+final class IcebergNessieUtil
+{
+    private IcebergNessieUtil() {}
+
+    static TableIdentifier toIdentifier(SchemaTableName schemaTableName)
+    {
+        return TableIdentifier.of(schemaTableName.getSchemaName(), schemaTableName.getTableName());
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/TrinoNessieCatalog.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/TrinoNessieCatalog.java
new file mode 100644
index 000000000000..7de7de1c58d1
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/TrinoNessieCatalog.java
@@ -0,0 +1,416 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.catalog.nessie;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.plugin.base.CatalogName;
+import io.trino.plugin.iceberg.catalog.AbstractTrinoCatalog;
+import io.trino.plugin.iceberg.catalog.IcebergTableOperationsProvider;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.ConnectorMaterializedViewDefinition;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorViewDefinition;
+import io.trino.spi.connector.RelationColumnsMetadata;
+import io.trino.spi.connector.RelationCommentMetadata;
+import io.trino.spi.connector.SchemaNotFoundException;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.security.TrinoPrincipal;
+import io.trino.spi.type.TypeManager;
+import org.apache.iceberg.BaseTable;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.SortOrder;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.TableOperations;
+import org.apache.iceberg.Transaction;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.exceptions.NoSuchNamespaceException;
+import org.apache.iceberg.nessie.NessieIcebergClient;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.filesystem.Locations.appendPath;
+import static io.trino.plugin.iceberg.IcebergSchemaProperties.LOCATION_PROPERTY;
+import static io.trino.plugin.iceberg.IcebergUtil.getIcebergTableWithMetadata;
+import static io.trino.plugin.iceberg.IcebergUtil.quotedTableName;
+import static io.trino.plugin.iceberg.IcebergUtil.validateTableCanBeDropped;
+import static io.trino.plugin.iceberg.catalog.nessie.IcebergNessieUtil.toIdentifier;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.connector.SchemaTableName.schemaTableName;
+import static java.util.Objects.requireNonNull;
+
+public class TrinoNessieCatalog
+        extends AbstractTrinoCatalog
+{
+    private final String warehouseLocation;
+    private final NessieIcebergClient nessieClient;
+    private final Map<SchemaTableName, TableMetadata> tableMetadataCache = new ConcurrentHashMap<>();
+    private final TrinoFileSystemFactory fileSystemFactory;
+
+    public TrinoNessieCatalog(
+            CatalogName catalogName,
+            TypeManager typeManager,
+            TrinoFileSystemFactory fileSystemFactory,
+            IcebergTableOperationsProvider tableOperationsProvider,
+            NessieIcebergClient nessieClient,
+            String warehouseLocation,
+            boolean useUniqueTableLocation)
+    {
+        super(catalogName, typeManager, tableOperationsProvider, useUniqueTableLocation);
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
+        this.warehouseLocation = requireNonNull(warehouseLocation, "warehouseLocation is null");
+        this.nessieClient = requireNonNull(nessieClient, "nessieClient is null");
+    }
+
+    @Override
+    public boolean namespaceExists(ConnectorSession session, String namespace)
+    {
+        try {
+            return nessieClient.loadNamespaceMetadata(Namespace.of(namespace)) != null;
+        }
+        catch (Exception e) {
+            return false;
+        }
+    }
+
+    @Override
+    public List<String> listNamespaces(ConnectorSession session)
+    {
+        return nessieClient.listNamespaces(Namespace.empty()).stream()
+                .map(Namespace::toString)
+                .collect(toImmutableList());
+    }
+
+    @Override
+    public void dropNamespace(ConnectorSession session, String namespace)
+    {
+        nessieClient.dropNamespace(Namespace.of(namespace));
+    }
+
+    @Override
+    public Map<String, Object> loadNamespaceMetadata(ConnectorSession session, String namespace)
+    {
+        try {
+            return ImmutableMap.copyOf(nessieClient.loadNamespaceMetadata(Namespace.of(namespace)));
+        }
+        catch (NoSuchNamespaceException e) {
+            throw new SchemaNotFoundException(namespace);
+        }
+    }
+
+    @Override
+    public Optional<TrinoPrincipal> getNamespacePrincipal(ConnectorSession session, String namespace)
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    public void createNamespace(ConnectorSession session, String namespace, Map<String, Object> properties, TrinoPrincipal owner)
+    {
+        nessieClient.createNamespace(Namespace.of(namespace), Maps.transformValues(properties, property -> {
+            if (property instanceof String stringProperty) {
+                return stringProperty;
+            }
+            throw new TrinoException(NOT_SUPPORTED, "Non-string properties are not support for Iceberg Nessie catalogs");
+        }));
+    }
+
+    @Override
+    public void setNamespacePrincipal(ConnectorSession session, String namespace, TrinoPrincipal principal)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "setNamespacePrincipal is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public void renameNamespace(ConnectorSession session, String source, String target)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "renameNamespace is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public List<SchemaTableName> listTables(ConnectorSession session, Optional<String> namespace)
+    {
+        return nessieClient.listTables(namespace.isEmpty() ? Namespace.empty() : Namespace.of(namespace.get()))
+                .stream()
+                .map(id -> schemaTableName(id.namespace().toString(), id.name()))
+                .collect(toImmutableList());
+    }
+
+    @Override
+    public Optional<Iterator<RelationColumnsMetadata>> streamRelationColumns(
+            ConnectorSession session,
+            Optional<String> namespace,
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Predicate<SchemaTableName> isRedirected)
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<Iterator<RelationCommentMetadata>> streamRelationComments(
+            ConnectorSession session,
+            Optional<String> namespace,
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Predicate<SchemaTableName> isRedirected)
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    public Table loadTable(ConnectorSession session, SchemaTableName table)
+    {
+        TableMetadata metadata = tableMetadataCache.computeIfAbsent(
+                table,
+                ignore -> {
+                    TableOperations operations = tableOperationsProvider.createTableOperations(
+                            this,
+                            session,
+                            table.getSchemaName(),
+                            table.getTableName(),
+                            Optional.empty(),
+                            Optional.empty());
+                    return new BaseTable(operations, quotedTableName(table)).operations().current();
+                });
+
+        return getIcebergTableWithMetadata(
+                this,
+                tableOperationsProvider,
+                session,
+                table,
+                metadata);
+    }
+
+    @Override
+    public Map<SchemaTableName, List<ColumnMetadata>> tryGetColumnMetadata(ConnectorSession session, List<SchemaTableName> tables)
+    {
+        return ImmutableMap.of();
+    }
+
+    @Override
+    public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
+    {
+        BaseTable table = (BaseTable) loadTable(session, schemaTableName);
+        validateTableCanBeDropped(table);
+        nessieClient.dropTable(toIdentifier(schemaTableName), true);
+        deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, table.location());
+    }
+
+    @Override
+    public void dropCorruptedTable(ConnectorSession session, SchemaTableName schemaTableName)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "Cannot drop corrupted table %s from Iceberg Nessie catalog".formatted(schemaTableName));
+    }
+
+    @Override
+    public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTableName to)
+    {
+        nessieClient.renameTable(toIdentifier(from), toIdentifier(to));
+    }
+
+    @Override
+    public Transaction newCreateTableTransaction(
+            ConnectorSession session,
+            SchemaTableName schemaTableName,
+            Schema schema,
+            PartitionSpec partitionSpec,
+            SortOrder sortOrder,
+            String location,
+            Map<String, String> properties)
+    {
+        return newCreateTableTransaction(
+                session,
+                schemaTableName,
+                schema,
+                partitionSpec,
+                sortOrder,
+                location,
+                properties,
+                Optional.of(session.getUser()));
+    }
+
+    @Override
+    public Transaction newCreateOrReplaceTableTransaction(
+            ConnectorSession session,
+            SchemaTableName schemaTableName,
+            Schema schema,
+            PartitionSpec partitionSpec,
+            SortOrder sortOrder,
+            String location,
+            Map<String, String> properties)
+    {
+        return newCreateOrReplaceTableTransaction(
+                session,
+                schemaTableName,
+                schema,
+                partitionSpec,
+                sortOrder,
+                location,
+                properties,
+                Optional.of(session.getUser()));
+    }
+
+    @Override
+    public void registerTable(ConnectorSession session, SchemaTableName tableName, TableMetadata tableMetadata)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "registerTable is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public void unregisterTable(ConnectorSession session, SchemaTableName tableName)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "unregisterTable is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public String defaultTableLocation(ConnectorSession session, SchemaTableName schemaTableName)
+    {
+        Optional<String> databaseLocation = Optional.empty();
+        if (namespaceExists(session, schemaTableName.getSchemaName())) {
+            databaseLocation = Optional.ofNullable((String) loadNamespaceMetadata(session, schemaTableName.getSchemaName()).get(LOCATION_PROPERTY));
+        }
+
+        String schemaLocation = databaseLocation.orElseGet(() ->
+                appendPath(warehouseLocation, schemaTableName.getSchemaName()));
+
+        return appendPath(schemaLocation, createNewTableName(schemaTableName.getTableName()));
+    }
+
+    @Override
+    public void setTablePrincipal(ConnectorSession session, SchemaTableName schemaTableName, TrinoPrincipal principal)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "setTablePrincipal is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public void createView(ConnectorSession session, SchemaTableName schemaViewName, ConnectorViewDefinition definition, boolean replace)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "createView is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public void renameView(ConnectorSession session, SchemaTableName source, SchemaTableName target)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "renameView is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public void updateViewComment(ConnectorSession session, SchemaTableName schemaViewName,
+            Optional<String> comment)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "updateViewComment is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public void updateViewColumnComment(ConnectorSession session, SchemaTableName schemaViewName, String columnName, Optional<String> comment)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "updateViewColumnComment is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public void setViewPrincipal(ConnectorSession session, SchemaTableName schemaViewName, TrinoPrincipal principal)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "setViewPrincipal is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public void dropView(ConnectorSession session, SchemaTableName schemaViewName)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "dropView is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public List<SchemaTableName> listViews(ConnectorSession session, Optional<String> namespace)
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public Map<SchemaTableName, ConnectorViewDefinition> getViews(ConnectorSession session, Optional<String> namespace)
+    {
+        return ImmutableMap.of();
+    }
+
+    @Override
+    public Optional<ConnectorViewDefinition> getView(ConnectorSession session, SchemaTableName viewIdentifier)
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    public List<SchemaTableName> listMaterializedViews(ConnectorSession session, Optional<String> namespace)
+    {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public void createMaterializedView(
+            ConnectorSession session,
+            SchemaTableName schemaViewName,
+            ConnectorMaterializedViewDefinition definition,
+            boolean replace,
+            boolean ignoreExisting)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "createMaterializedView is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public void updateMaterializedViewColumnComment(ConnectorSession session, SchemaTableName schemaViewName, String columnName, Optional<String> comment)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "updateMaterializedViewColumnComment is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public void dropMaterializedView(ConnectorSession session, SchemaTableName schemaViewName)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "dropMaterializedView is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public Optional<ConnectorMaterializedViewDefinition> getMaterializedView(ConnectorSession session, SchemaTableName schemaViewName)
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    protected Optional<ConnectorMaterializedViewDefinition> doGetMaterializedView(ConnectorSession session, SchemaTableName schemaViewName)
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    public void renameMaterializedView(ConnectorSession session, SchemaTableName source, SchemaTableName target)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "renameMaterializedView is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Override
+    public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName, String hiveCatalogName)
+    {
+        return Optional.empty();
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/TrinoNessieCatalogFactory.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/TrinoNessieCatalogFactory.java
new file mode 100644
index 000000000000..645728644e16
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/TrinoNessieCatalogFactory.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.catalog.nessie;
+
+import com.google.inject.Inject;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.plugin.base.CatalogName;
+import io.trino.plugin.iceberg.IcebergConfig;
+import io.trino.plugin.iceberg.catalog.IcebergTableOperationsProvider;
+import io.trino.plugin.iceberg.catalog.TrinoCatalog;
+import io.trino.plugin.iceberg.catalog.TrinoCatalogFactory;
+import io.trino.spi.security.ConnectorIdentity;
+import io.trino.spi.type.TypeManager;
+import org.apache.iceberg.nessie.NessieIcebergClient;
+
+import static java.util.Objects.requireNonNull;
+
+public class TrinoNessieCatalogFactory
+        implements TrinoCatalogFactory
+{
+    private final IcebergTableOperationsProvider tableOperationsProvider;
+    private final String warehouseLocation;
+    private final NessieIcebergClient nessieClient;
+    private final boolean isUniqueTableLocation;
+    private final CatalogName catalogName;
+    private final TypeManager typeManager;
+    private final TrinoFileSystemFactory fileSystemFactory;
+
+    @Inject
+    public TrinoNessieCatalogFactory(
+            CatalogName catalogName,
+            TypeManager typeManager,
+            TrinoFileSystemFactory fileSystemFactory,
+            IcebergTableOperationsProvider tableOperationsProvider,
+            NessieIcebergClient nessieClient,
+            IcebergNessieCatalogConfig icebergNessieCatalogConfig,
+            IcebergConfig icebergConfig)
+    {
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.tableOperationsProvider = requireNonNull(tableOperationsProvider, "tableOperationsProvider is null");
+        this.nessieClient = requireNonNull(nessieClient, "nessieClient is null");
+        this.warehouseLocation = icebergNessieCatalogConfig.getDefaultWarehouseDir();
+        this.isUniqueTableLocation = icebergConfig.isUniqueTableLocation();
+    }
+
+    @Override
+    public TrinoCatalog create(ConnectorIdentity identity)
+    {
+        return new TrinoNessieCatalog(catalogName, typeManager, fileSystemFactory, tableOperationsProvider, nessieClient, warehouseLocation, isUniqueTableLocation);
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/IcebergRestCatalogConfig.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/IcebergRestCatalogConfig.java
index 0ba540c1c242..af8e3a5fe0b4 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/IcebergRestCatalogConfig.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/IcebergRestCatalogConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.net.URI;
 import java.util.Optional;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/OAuth2SecurityConfig.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/OAuth2SecurityConfig.java
index e585fdeefd67..20a9920430a4 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/OAuth2SecurityConfig.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/OAuth2SecurityConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
-
-import javax.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.AssertTrue;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/OAuth2SecurityProperties.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/OAuth2SecurityProperties.java
index 531b6df99fe5..6a85cb3f80ac 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/OAuth2SecurityProperties.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/OAuth2SecurityProperties.java
@@ -14,10 +14,9 @@
 package io.trino.plugin.iceberg.catalog.rest;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import org.apache.iceberg.rest.auth.OAuth2Properties;
 
-import javax.inject.Inject;
-
 import java.util.Map;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/TrinoIcebergRestCatalogFactory.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/TrinoIcebergRestCatalogFactory.java
index 0a6b9e54f533..e883cc3beb4b 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/TrinoIcebergRestCatalogFactory.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/TrinoIcebergRestCatalogFactory.java
@@ -14,20 +14,21 @@
 package io.trino.plugin.iceberg.catalog.rest;
 
 import com.google.common.collect.ImmutableMap;
-import io.trino.hdfs.ConfigurationUtils;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.NodeVersion;
 import io.trino.plugin.iceberg.IcebergConfig;
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
 import io.trino.plugin.iceberg.catalog.TrinoCatalogFactory;
 import io.trino.plugin.iceberg.catalog.rest.IcebergRestCatalogConfig.SessionType;
+import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
 import io.trino.spi.security.ConnectorIdentity;
 import org.apache.iceberg.CatalogProperties;
+import org.apache.iceberg.rest.HTTPClient;
 import org.apache.iceberg.rest.RESTSessionCatalog;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.net.URI;
 import java.util.Optional;
 
@@ -36,6 +37,7 @@
 public class TrinoIcebergRestCatalogFactory
         implements TrinoCatalogFactory
 {
+    private final TrinoFileSystemFactory fileSystemFactory;
     private final CatalogName catalogName;
     private final String trinoVersion;
     private final URI serverUri;
@@ -49,12 +51,14 @@ public class TrinoIcebergRestCatalogFactory
 
     @Inject
     public TrinoIcebergRestCatalogFactory(
+            TrinoFileSystemFactory fileSystemFactory,
             CatalogName catalogName,
             IcebergRestCatalogConfig restConfig,
             SecurityProperties securityProperties,
             IcebergConfig icebergConfig,
             NodeVersion nodeVersion)
     {
+        this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.trinoVersion = requireNonNull(nodeVersion, "nodeVersion is null").toString();
         requireNonNull(restConfig, "restConfig is null");
@@ -77,8 +81,14 @@ public synchronized TrinoCatalog create(ConnectorIdentity identity)
             warehouse.ifPresent(location -> properties.put(CatalogProperties.WAREHOUSE_LOCATION, location));
             properties.put("trino-version", trinoVersion);
             properties.putAll(securityProperties.get());
-            RESTSessionCatalog icebergCatalogInstance = new RESTSessionCatalog();
-            icebergCatalogInstance.setConf(ConfigurationUtils.getInitialConfiguration());
+            RESTSessionCatalog icebergCatalogInstance = new RESTSessionCatalog(
+                    config -> HTTPClient.builder(config).uri(config.get(CatalogProperties.URI)).build(),
+                    (context, config) -> {
+                        ConnectorIdentity currentIdentity = (context.wrappedIdentity() != null)
+                                ? ((ConnectorIdentity) context.wrappedIdentity())
+                                : ConnectorIdentity.ofUser("fake");
+                        return new ForwardingFileIo(fileSystemFactory.create(currentIdentity));
+                    });
             icebergCatalogInstance.initialize(catalogName.toString(), properties.buildOrThrow());
 
             icebergCatalog = icebergCatalogInstance;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/TrinoRestCatalog.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/TrinoRestCatalog.java
index 3e56fe326d03..527a7d6603b5 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/TrinoRestCatalog.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/TrinoRestCatalog.java
@@ -25,9 +25,12 @@
 import io.trino.plugin.iceberg.catalog.rest.IcebergRestCatalogConfig.SessionType;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorMaterializedViewDefinition;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorViewDefinition;
+import io.trino.spi.connector.RelationColumnsMetadata;
+import io.trino.spi.connector.RelationCommentMetadata;
 import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
@@ -37,6 +40,7 @@
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.SortOrder;
 import org.apache.iceberg.Table;
+import org.apache.iceberg.TableMetadata;
 import org.apache.iceberg.Transaction;
 import org.apache.iceberg.catalog.Namespace;
 import org.apache.iceberg.catalog.SessionCatalog;
@@ -49,19 +53,23 @@
 import org.apache.iceberg.rest.auth.OAuth2Properties;
 
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.filesystem.Locations.appendPath;
 import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_CATALOG_ERROR;
 import static io.trino.plugin.iceberg.IcebergUtil.quotedTableName;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static java.lang.String.format;
-import static java.lang.String.join;
 import static java.util.Objects.requireNonNull;
 import static java.util.UUID.randomUUID;
 
@@ -190,6 +198,26 @@ public List<SchemaTableName> listTables(ConnectorSession session, Optional<Strin
         return tables.build();
     }
 
+    @Override
+    public Optional<Iterator<RelationColumnsMetadata>> streamRelationColumns(
+            ConnectorSession session,
+            Optional<String> namespace,
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Predicate<SchemaTableName> isRedirected)
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<Iterator<RelationCommentMetadata>> streamRelationComments(
+            ConnectorSession session,
+            Optional<String> namespace,
+            UnaryOperator<Set<SchemaTableName>> relationFilter,
+            Predicate<SchemaTableName> isRedirected)
+    {
+        return Optional.empty();
+    }
+
     @Override
     public Transaction newCreateTableTransaction(
             ConnectorSession session,
@@ -209,7 +237,25 @@ public Transaction newCreateTableTransaction(
     }
 
     @Override
-    public void registerTable(ConnectorSession session, SchemaTableName tableName, String tableLocation, String metadataLocation)
+    public Transaction newCreateOrReplaceTableTransaction(
+            ConnectorSession session,
+            SchemaTableName schemaTableName,
+            Schema schema,
+            PartitionSpec partitionSpec,
+            SortOrder sortOrder,
+            String location,
+            Map<String, String> properties)
+    {
+        return restSessionCatalog.buildTable(convert(session), toIdentifier(schemaTableName), schema)
+                .withPartitionSpec(partitionSpec)
+                .withSortOrder(sortOrder)
+                .withLocation(location)
+                .withProperties(properties)
+                .createOrReplaceTransaction();
+    }
+
+    @Override
+    public void registerTable(ConnectorSession session, SchemaTableName tableName, TableMetadata tableMetadata)
     {
         throw new TrinoException(NOT_SUPPORTED, "registerTable is not supported for Iceberg REST catalog");
     }
@@ -228,6 +274,14 @@ public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
         }
     }
 
+    @Override
+    public void dropCorruptedTable(ConnectorSession session, SchemaTableName schemaTableName)
+    {
+        // Since it is currently not possible to obtain the table location, even if we drop the table from the metastore,
+        // it is still impossible to delete the table location.
+        throw new TrinoException(NOT_SUPPORTED, "Cannot drop corrupted table %s from Iceberg REST catalog".formatted(schemaTableName));
+    }
+
     @Override
     public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTableName to)
     {
@@ -259,6 +313,12 @@ public Table loadTable(ConnectorSession session, SchemaTableName schemaTableName
         }
     }
 
+    @Override
+    public Map<SchemaTableName, List<ColumnMetadata>> tryGetColumnMetadata(ConnectorSession session, List<SchemaTableName> tables)
+    {
+        return ImmutableMap.of();
+    }
+
     @Override
     public void updateTableComment(ConnectorSession session, SchemaTableName schemaTableName, Optional<String> comment)
     {
@@ -283,7 +343,7 @@ public String defaultTableLocation(ConnectorSession session, SchemaTableName sch
         if (databaseLocation.endsWith("/")) {
             return databaseLocation + tableName;
         }
-        return join("/", databaseLocation, tableName);
+        return appendPath(databaseLocation, tableName);
     }
 
     private String createLocationForTable(String baseTableName)
@@ -355,6 +415,12 @@ public void createMaterializedView(ConnectorSession session, SchemaTableName vie
         throw new TrinoException(NOT_SUPPORTED, "createMaterializedView is not supported for Iceberg REST catalog");
     }
 
+    @Override
+    public void updateMaterializedViewColumnComment(ConnectorSession session, SchemaTableName schemaViewName, String columnName, Optional<String> comment)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "updateMaterializedViewColumnComment is not supported for Iceberg REST catalog");
+    }
+
     @Override
     public void dropMaterializedView(ConnectorSession session, SchemaTableName viewName)
     {
@@ -382,7 +448,7 @@ public void updateColumnComment(ConnectorSession session, SchemaTableName schema
     }
 
     @Override
-    public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName)
+    public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session, SchemaTableName tableName, String hiveCatalogName)
     {
         return Optional.empty();
     }
@@ -402,7 +468,7 @@ public void updateViewColumnComment(ConnectorSession session, SchemaTableName sc
     private SessionCatalog.SessionContext convert(ConnectorSession session)
     {
         return switch (sessionType) {
-            case NONE -> SessionCatalog.SessionContext.createEmpty();
+            case NONE -> new SessionContext(randomUUID().toString(), null, null, ImmutableMap.of(), session.getIdentity());
             case USER -> {
                 String sessionId = format("%s-%s", session.getUser(), session.getSource().orElse("default"));
 
@@ -429,7 +495,7 @@ private SessionCatalog.SessionContext convert(ConnectorSession session)
                         .put(OAuth2Properties.JWT_TOKEN_TYPE, subjectJwt)
                         .buildOrThrow();
 
-                yield new SessionCatalog.SessionContext(sessionId, session.getUser(), credentials, properties);
+                yield new SessionCatalog.SessionContext(sessionId, session.getUser(), credentials, properties, session.getIdentity());
             }
         };
     }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/delete/EqualityDeleteFilter.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/delete/EqualityDeleteFilter.java
index a41fbc679479..fbf5334de2b1 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/delete/EqualityDeleteFilter.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/delete/EqualityDeleteFilter.java
@@ -17,26 +17,22 @@
 import io.trino.spi.Page;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.type.Type;
-import org.apache.iceberg.Schema;
 import org.apache.iceberg.StructLike;
-import org.apache.iceberg.util.StructLikeSet;
-import org.apache.iceberg.util.StructProjection;
 
 import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
 
-import static io.trino.plugin.iceberg.IcebergUtil.schemaFromHandles;
 import static java.util.Objects.requireNonNull;
 
 public final class EqualityDeleteFilter
         implements DeleteFilter
 {
-    private final Schema schema;
-    private final StructLikeSet deleteSet;
+    private final Predicate<StructLike> deletedRows;
 
-    private EqualityDeleteFilter(Schema schema, StructLikeSet deleteSet)
+    public EqualityDeleteFilter(Predicate<StructLike> deletedRows)
     {
-        this.schema = requireNonNull(schema, "schema is null");
-        this.deleteSet = requireNonNull(deleteSet, "deleteSet is null");
+        this.deletedRows = requireNonNull(deletedRows, "deletedRows is null");
     }
 
     @Override
@@ -46,24 +42,18 @@ public RowPredicate createPredicate(List<IcebergColumnHandle> columns)
                 .map(IcebergColumnHandle::getType)
                 .toArray(Type[]::new);
 
-        Schema fileSchema = schemaFromHandles(columns);
-        StructProjection projection = StructProjection.create(fileSchema, schema);
-
         return (page, position) -> {
             StructLike row = new LazyTrinoRow(types, page, position);
-            return !deleteSet.contains(projection.wrap(row));
+            return !deletedRows.test(row);
         };
     }
 
-    public static DeleteFilter readEqualityDeletes(ConnectorPageSource pageSource, List<IcebergColumnHandle> columns, Schema tableSchema)
+    public static void readEqualityDeletes(ConnectorPageSource pageSource, List<IcebergColumnHandle> columns, Consumer<StructLike> deletedRows)
     {
         Type[] types = columns.stream()
                 .map(IcebergColumnHandle::getType)
                 .toArray(Type[]::new);
 
-        Schema deleteSchema = schemaFromHandles(columns);
-        StructLikeSet deleteSet = StructLikeSet.create(deleteSchema.asStruct());
-
         while (!pageSource.isFinished()) {
             Page page = pageSource.getNextPage();
             if (page == null) {
@@ -71,10 +61,8 @@ public static DeleteFilter readEqualityDeletes(ConnectorPageSource pageSource, L
             }
 
             for (int position = 0; position < page.getPositionCount(); position++) {
-                deleteSet.add(new TrinoRow(types, page, position));
+                deletedRows.accept(new TrinoRow(types, page, position));
             }
         }
-
-        return new EqualityDeleteFilter(deleteSchema, deleteSet);
     }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/delete/IcebergPositionDeletePageSink.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/delete/IcebergPositionDeletePageSink.java
index b9a16d602218..0eb7b80318f5 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/delete/IcebergPositionDeletePageSink.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/delete/IcebergPositionDeletePageSink.java
@@ -15,6 +15,7 @@
 
 import io.airlift.json.JsonCodec;
 import io.airlift.slice.Slice;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.iceberg.CommitTaskData;
 import io.trino.plugin.iceberg.IcebergFileFormat;
@@ -57,11 +58,9 @@ public class IcebergPositionDeletePageSink
     private final JsonCodec<CommitTaskData> jsonCodec;
     private final IcebergFileWriter writer;
     private final IcebergFileFormat fileFormat;
-    private final long fileRecordCount;
 
     private long validationCpuNanos;
     private boolean writtenData;
-    private long deletedRowCount;
 
     public IcebergPositionDeletePageSink(
             String dataFilePath,
@@ -73,22 +72,20 @@ public IcebergPositionDeletePageSink(
             JsonCodec<CommitTaskData> jsonCodec,
             ConnectorSession session,
             IcebergFileFormat fileFormat,
-            Map<String, String> storageProperties,
-            long fileRecordCount)
+            Map<String, String> storageProperties)
     {
         this.dataFilePath = requireNonNull(dataFilePath, "dataFilePath is null");
         this.jsonCodec = requireNonNull(jsonCodec, "jsonCodec is null");
         this.partitionSpec = requireNonNull(partitionSpec, "partitionSpec is null");
         this.partition = requireNonNull(partition, "partition is null");
         this.fileFormat = requireNonNull(fileFormat, "fileFormat is null");
-        this.fileRecordCount = fileRecordCount;
         // prepend query id to a file name so we can determine which files were written by which query. This is needed for opportunistic cleanup of extra files
         // which may be present for successfully completing query in presence of failure recovery mechanisms.
         String fileName = fileFormat.toIceberg().addExtension(session.getQueryId() + "-" + randomUUID());
         this.outputPath = partition
                 .map(partitionData -> locationProvider.newDataLocation(partitionSpec, partitionData, fileName))
                 .orElseGet(() -> locationProvider.newDataLocation(fileName));
-        this.writer = fileWriterFactory.createPositionDeleteWriter(fileSystem, outputPath, session, fileFormat, storageProperties);
+        this.writer = fileWriterFactory.createPositionDeleteWriter(fileSystem, Location.of(outputPath), session, fileFormat, storageProperties);
     }
 
     @Override
@@ -120,7 +117,6 @@ public CompletableFuture<?> appendPage(Page page)
         writer.appendRows(new Page(blocks));
 
         writtenData = true;
-        deletedRowCount += page.getPositionCount();
         return NOT_BLOCKED;
     }
 
@@ -138,9 +134,7 @@ public CompletableFuture<Collection<Slice>> finish()
                     PartitionSpecParser.toJson(partitionSpec),
                     partition.map(PartitionData::toJson),
                     FileContent.POSITION_DELETES,
-                    Optional.of(dataFilePath),
-                    Optional.of(fileRecordCount),
-                    Optional.of(deletedRowCount));
+                    Optional.of(dataFilePath));
             Long recordCount = task.getMetrics().recordCount();
             if (recordCount != null && recordCount > 0) {
                 commitTasks.add(wrappedBuffer(jsonCodec.toJsonBytes(task)));
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/fileio/ForwardingFileIo.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/fileio/ForwardingFileIo.java
index 620ec646ac2d..03dcb9d109d9 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/fileio/ForwardingFileIo.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/fileio/ForwardingFileIo.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.iceberg.fileio;
 
 import com.google.common.collect.Iterables;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import org.apache.iceberg.io.BulkDeletionFailureException;
 import org.apache.iceberg.io.InputFile;
@@ -44,13 +45,13 @@ public ForwardingFileIo(TrinoFileSystem fileSystem)
     @Override
     public InputFile newInputFile(String path)
     {
-        return new ForwardingInputFile(fileSystem.newInputFile(path));
+        return new ForwardingInputFile(fileSystem.newInputFile(Location.of(path)));
     }
 
     @Override
     public InputFile newInputFile(String path, long length)
     {
-        return new ForwardingInputFile(fileSystem.newInputFile(path, length));
+        return new ForwardingInputFile(fileSystem.newInputFile(Location.of(path), length));
     }
 
     @Override
@@ -63,7 +64,7 @@ public OutputFile newOutputFile(String path)
     public void deleteFile(String path)
     {
         try {
-            fileSystem.deleteFile(path);
+            fileSystem.deleteFile(Location.of(path));
         }
         catch (IOException e) {
             throw new UncheckedIOException("Failed to delete file: " + path, e);
@@ -81,7 +82,7 @@ public void deleteFiles(Iterable<String> pathsToDelete)
     private void deleteBatch(List<String> filesToDelete)
     {
         try {
-            fileSystem.deleteFiles(filesToDelete);
+            fileSystem.deleteFiles(filesToDelete.stream().map(Location::of).toList());
         }
         catch (IOException e) {
             throw new UncheckedIOException(
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/fileio/ForwardingInputFile.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/fileio/ForwardingInputFile.java
index 0ae98332f5da..3715f23adb56 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/fileio/ForwardingInputFile.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/fileio/ForwardingInputFile.java
@@ -62,7 +62,7 @@ public SeekableInputStream newStream()
     @Override
     public String location()
     {
-        return inputFile.location();
+        return inputFile.location().toString();
     }
 
     @Override
@@ -75,4 +75,10 @@ public boolean exists()
             throw new UncheckedIOException("Failed to check existence for file: " + location(), e);
         }
     }
+
+    @Override
+    public String toString()
+    {
+        return inputFile.toString();
+    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/fileio/ForwardingOutputFile.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/fileio/ForwardingOutputFile.java
index 9f0ae7d255d6..40a65d5b7a36 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/fileio/ForwardingOutputFile.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/fileio/ForwardingOutputFile.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.iceberg.fileio;
 
 import com.google.common.io.CountingOutputStream;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoOutputFile;
 import org.apache.iceberg.io.InputFile;
@@ -35,7 +36,7 @@ public class ForwardingOutputFile
     public ForwardingOutputFile(TrinoFileSystem fileSystem, String path)
     {
         this.fileSystem = requireNonNull(fileSystem, "fileSystem is null");
-        this.outputFile = fileSystem.newOutputFile(path);
+        this.outputFile = fileSystem.newOutputFile(Location.of(path));
     }
 
     @Override
@@ -65,7 +66,7 @@ public PositionOutputStream createOrOverwrite()
     @Override
     public String location()
     {
-        return outputFile.location();
+        return outputFile.location().toString();
     }
 
     @Override
@@ -74,6 +75,12 @@ public InputFile toInputFile()
         return new ForwardingInputFile(fileSystem.newInputFile(outputFile.location()));
     }
 
+    @Override
+    public String toString()
+    {
+        return outputFile.toString();
+    }
+
     private static class CountingPositionOutputStream
             extends PositionOutputStream
     {
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/IcebergFunctionProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/IcebergFunctionProvider.java
new file mode 100644
index 000000000000..57bbea9479df
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/IcebergFunctionProvider.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.functions;
+
+import com.google.inject.Inject;
+import io.trino.plugin.iceberg.functions.tablechanges.TableChangesFunctionHandle;
+import io.trino.plugin.iceberg.functions.tablechanges.TableChangesFunctionProcessorProvider;
+import io.trino.spi.function.FunctionProvider;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
+
+import static java.util.Objects.requireNonNull;
+
+public class IcebergFunctionProvider
+        implements FunctionProvider
+{
+    private final TableChangesFunctionProcessorProvider tableChangesFunctionProcessorProvider;
+
+    @Inject
+    public IcebergFunctionProvider(TableChangesFunctionProcessorProvider tableChangesFunctionProcessorProvider)
+    {
+        this.tableChangesFunctionProcessorProvider = requireNonNull(tableChangesFunctionProcessorProvider, "tableChangesFunctionProcessorProvider is null");
+    }
+
+    @Override
+    public TableFunctionProcessorProvider getTableFunctionProcessorProvider(ConnectorTableFunctionHandle functionHandle)
+    {
+        if (functionHandle instanceof TableChangesFunctionHandle) {
+            return tableChangesFunctionProcessorProvider;
+        }
+
+        throw new UnsupportedOperationException("Unsupported function: " + functionHandle);
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunction.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunction.java
new file mode 100644
index 000000000000..8ee30ec06104
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunction.java
@@ -0,0 +1,188 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.functions.tablechanges;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import io.airlift.slice.Slice;
+import io.trino.plugin.iceberg.ColumnIdentity;
+import io.trino.plugin.iceberg.IcebergColumnHandle;
+import io.trino.plugin.iceberg.IcebergUtil;
+import io.trino.plugin.iceberg.catalog.TrinoCatalogFactory;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorAccessControl;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorTransactionHandle;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.table.AbstractConnectorTableFunction;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.ScalarArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
+import io.trino.spi.type.TypeManager;
+import io.trino.spi.type.VarcharType;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.SchemaParser;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.TableProperties;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.plugin.iceberg.ColumnIdentity.TypeCategory.PRIMITIVE;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.DATA_CHANGE_ORDINAL_ID;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.DATA_CHANGE_ORDINAL_NAME;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.DATA_CHANGE_TIMESTAMP_ID;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.DATA_CHANGE_TIMESTAMP_NAME;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.DATA_CHANGE_TYPE_ID;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.DATA_CHANGE_TYPE_NAME;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.DATA_CHANGE_VERSION_ID;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.DATA_CHANGE_VERSION_NAME;
+import static io.trino.plugin.iceberg.TypeConverter.toTrinoType;
+import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
+import static io.trino.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
+import static java.util.Objects.requireNonNull;
+
+public class TableChangesFunction
+        extends AbstractConnectorTableFunction
+{
+    private static final String FUNCTION_NAME = "table_changes";
+    private static final String SCHEMA_VAR_NAME = "SCHEMA";
+    private static final String TABLE_VAR_NAME = "TABLE";
+    private static final String START_SNAPSHOT_VAR_NAME = "START_SNAPSHOT_ID";
+    private static final String END_SNAPSHOT_VAR_NAME = "END_SNAPSHOT_ID";
+
+    private final TrinoCatalogFactory trinoCatalogFactory;
+    private final TypeManager typeManager;
+
+    @Inject
+    public TableChangesFunction(TrinoCatalogFactory trinoCatalogFactory, TypeManager typeManager)
+    {
+        super(
+                "system",
+                FUNCTION_NAME,
+                ImmutableList.of(
+                        ScalarArgumentSpecification.builder()
+                                .name(SCHEMA_VAR_NAME)
+                                .type(VarcharType.createUnboundedVarcharType())
+                                .build(),
+                        ScalarArgumentSpecification.builder()
+                                .name(TABLE_VAR_NAME)
+                                .type(VarcharType.createUnboundedVarcharType())
+                                .build(),
+                        ScalarArgumentSpecification.builder()
+                                .name(START_SNAPSHOT_VAR_NAME)
+                                .type(BIGINT)
+                                .build(),
+                        ScalarArgumentSpecification.builder()
+                                .name(END_SNAPSHOT_VAR_NAME)
+                                .type(BIGINT)
+                                .build()),
+                GENERIC_TABLE);
+
+        this.trinoCatalogFactory = requireNonNull(trinoCatalogFactory, "trinoCatalogFactory is null");
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+    }
+
+    @Override
+    public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments, ConnectorAccessControl accessControl)
+    {
+        String schema = ((Slice) checkNonNull(((ScalarArgument) arguments.get(SCHEMA_VAR_NAME)).getValue())).toStringUtf8();
+        String table = ((Slice) checkNonNull(((ScalarArgument) arguments.get(TABLE_VAR_NAME)).getValue())).toStringUtf8();
+        long startSnapshotId = (long) checkNonNull(((ScalarArgument) arguments.get(START_SNAPSHOT_VAR_NAME)).getValue());
+        long endSnapshotId = (long) checkNonNull(((ScalarArgument) arguments.get(END_SNAPSHOT_VAR_NAME)).getValue());
+
+        SchemaTableName schemaTableName = new SchemaTableName(schema, table);
+        Table icebergTable = trinoCatalogFactory.create(session.getIdentity())
+                .loadTable(session, schemaTableName);
+
+        checkSnapshotExists(icebergTable, startSnapshotId);
+        checkSnapshotExists(icebergTable, endSnapshotId);
+
+        ImmutableList.Builder<Descriptor.Field> columns = ImmutableList.builder();
+        Schema tableSchema = icebergTable.schemas().get(icebergTable.snapshot(endSnapshotId).schemaId());
+        tableSchema.columns().stream()
+                .map(column -> new Descriptor.Field(column.name(), Optional.of(toTrinoType(column.type(), typeManager))))
+                .forEach(columns::add);
+
+        columns.add(new Descriptor.Field(DATA_CHANGE_TYPE_NAME, Optional.of(VarcharType.createUnboundedVarcharType())));
+        columns.add(new Descriptor.Field(DATA_CHANGE_VERSION_NAME, Optional.of(BIGINT)));
+        columns.add(new Descriptor.Field(DATA_CHANGE_TIMESTAMP_NAME, Optional.of(TIMESTAMP_TZ_MILLIS)));
+        columns.add(new Descriptor.Field(DATA_CHANGE_ORDINAL_NAME, Optional.of(INTEGER)));
+
+        ImmutableList.Builder<IcebergColumnHandle> columnHandlesBuilder = ImmutableList.builder();
+        IcebergUtil.getColumns(tableSchema, typeManager).forEach(columnHandlesBuilder::add);
+        columnHandlesBuilder.add(new IcebergColumnHandle(
+                new ColumnIdentity(DATA_CHANGE_TYPE_ID, DATA_CHANGE_TYPE_NAME, PRIMITIVE, ImmutableList.of()),
+                VarcharType.createUnboundedVarcharType(),
+                ImmutableList.of(),
+                VarcharType.createUnboundedVarcharType(),
+                Optional.empty()));
+        columnHandlesBuilder.add(new IcebergColumnHandle(
+                new ColumnIdentity(DATA_CHANGE_VERSION_ID, DATA_CHANGE_VERSION_NAME, PRIMITIVE, ImmutableList.of()),
+                BIGINT,
+                ImmutableList.of(),
+                BIGINT,
+                Optional.empty()));
+        columnHandlesBuilder.add(new IcebergColumnHandle(
+                new ColumnIdentity(DATA_CHANGE_TIMESTAMP_ID, DATA_CHANGE_TIMESTAMP_NAME, PRIMITIVE, ImmutableList.of()),
+                TIMESTAMP_TZ_MILLIS,
+                ImmutableList.of(),
+                TIMESTAMP_TZ_MILLIS,
+                Optional.empty()));
+        columnHandlesBuilder.add(new IcebergColumnHandle(
+                new ColumnIdentity(DATA_CHANGE_ORDINAL_ID, DATA_CHANGE_ORDINAL_NAME, PRIMITIVE, ImmutableList.of()),
+                INTEGER,
+                ImmutableList.of(),
+                INTEGER,
+                Optional.empty()));
+        List<IcebergColumnHandle> columnHandles = columnHandlesBuilder.build();
+
+        accessControl.checkCanSelectFromColumns(null, schemaTableName, columnHandles.stream()
+                .map(IcebergColumnHandle::getName)
+                .collect(toImmutableSet()));
+
+        return TableFunctionAnalysis.builder()
+                .returnedType(new Descriptor(columns.build()))
+                .handle(new TableChangesFunctionHandle(
+                        schemaTableName,
+                        SchemaParser.toJson(tableSchema),
+                        columnHandles,
+                        Optional.ofNullable(icebergTable.properties().get(TableProperties.DEFAULT_NAME_MAPPING)),
+                        startSnapshotId,
+                        endSnapshotId))
+                .build();
+    }
+
+    private static Object checkNonNull(Object argumentValue)
+    {
+        if (argumentValue == null) {
+            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, FUNCTION_NAME + " arguments may not be null");
+        }
+        return argumentValue;
+    }
+
+    private static void checkSnapshotExists(Table icebergTable, long snapshotId)
+    {
+        if (icebergTable.snapshot(snapshotId) == null) {
+            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Snapshot not found in Iceberg table history: " + snapshotId);
+        }
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunctionHandle.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunctionHandle.java
new file mode 100644
index 000000000000..97354093476c
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunctionHandle.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.functions.tablechanges;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.plugin.iceberg.IcebergColumnHandle;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+
+import java.util.List;
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public record TableChangesFunctionHandle(
+        SchemaTableName schemaTableName,
+        String tableSchemaJson,
+        List<IcebergColumnHandle> columns,
+        Optional<String> nameMappingJson,
+        long startSnapshotId,
+        long endSnapshotId) implements ConnectorTableFunctionHandle
+{
+    public TableChangesFunctionHandle
+    {
+        requireNonNull(schemaTableName, "schemaTableName is null");
+        requireNonNull(tableSchemaJson, "tableSchemaJson is null");
+        columns = ImmutableList.copyOf(requireNonNull(columns, "columns is null"));
+        requireNonNull(nameMappingJson, "nameMappingJson is null");
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunctionProcessor.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunctionProcessor.java
new file mode 100644
index 000000000000..7271a025ace5
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunctionProcessor.java
@@ -0,0 +1,177 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.functions.tablechanges;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.plugin.iceberg.IcebergColumnHandle;
+import io.trino.plugin.iceberg.IcebergPageSourceProvider;
+import io.trino.plugin.iceberg.PartitionData;
+import io.trino.spi.Page;
+import io.trino.spi.block.Block;
+import io.trino.spi.block.RunLengthEncodedBlock;
+import io.trino.spi.connector.ConnectorPageSource;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.DynamicFilter;
+import io.trino.spi.function.table.TableFunctionProcessorState;
+import io.trino.spi.function.table.TableFunctionSplitProcessor;
+import io.trino.spi.predicate.TupleDomain;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.PartitionSpecParser;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.SchemaParser;
+import org.apache.iceberg.mapping.NameMappingParser;
+
+import java.util.Optional;
+
+import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.DATA_CHANGE_ORDINAL_ID;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.DATA_CHANGE_TIMESTAMP_ID;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.DATA_CHANGE_TYPE_ID;
+import static io.trino.plugin.iceberg.IcebergColumnHandle.DATA_CHANGE_VERSION_ID;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Finished.FINISHED;
+import static io.trino.spi.function.table.TableFunctionProcessorState.Processed.produced;
+import static io.trino.spi.predicate.Utils.nativeValueToBlock;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
+import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static java.util.Objects.requireNonNull;
+
+public class TableChangesFunctionProcessor
+        implements TableFunctionSplitProcessor
+{
+    private static final Page EMPTY_PAGE = new Page(0);
+
+    private final ConnectorPageSource pageSource;
+    private final int[] delegateColumnMap;
+    private final Optional<Integer> changeTypeIndex;
+    private final Block changeTypeValue;
+    private final Optional<Integer> changeVersionIndex;
+    private final Block changeVersionValue;
+    private final Optional<Integer> changeTimestampIndex;
+    private final Block changeTimestampValue;
+    private final Optional<Integer> changeOrdinalIndex;
+    private final Block changeOrdinalValue;
+
+    public TableChangesFunctionProcessor(
+            ConnectorSession session,
+            TableChangesFunctionHandle functionHandle,
+            TableChangesSplit split,
+            IcebergPageSourceProvider icebergPageSourceProvider)
+    {
+        requireNonNull(session, "session is null");
+        requireNonNull(functionHandle, "functionHandle is null");
+        requireNonNull(split, "split is null");
+        requireNonNull(icebergPageSourceProvider, "icebergPageSourceProvider is null");
+
+        Schema tableSchema = SchemaParser.fromJson(functionHandle.tableSchemaJson());
+        PartitionSpec partitionSpec = PartitionSpecParser.fromJson(tableSchema, split.partitionSpecJson());
+        org.apache.iceberg.types.Type[] partitionColumnTypes = partitionSpec.fields().stream()
+                .map(field -> field.transform().getResultType(tableSchema.findType(field.sourceId())))
+                .toArray(org.apache.iceberg.types.Type[]::new);
+
+        int delegateColumnIndex = 0;
+        int[] delegateColumnMap = new int[functionHandle.columns().size()];
+        Optional<Integer> changeTypeIndex = Optional.empty();
+        Optional<Integer> changeVersionIndex = Optional.empty();
+        Optional<Integer> changeTimestampIndex = Optional.empty();
+        Optional<Integer> changeOrdinalIndex = Optional.empty();
+        for (int columnIndex = 0; columnIndex < functionHandle.columns().size(); columnIndex++) {
+            IcebergColumnHandle column = functionHandle.columns().get(columnIndex);
+            if (column.getId() == DATA_CHANGE_TYPE_ID) {
+                changeTypeIndex = Optional.of(columnIndex);
+                delegateColumnMap[columnIndex] = -1;
+            }
+            else if (column.getId() == DATA_CHANGE_VERSION_ID) {
+                changeVersionIndex = Optional.of(columnIndex);
+                delegateColumnMap[columnIndex] = -1;
+            }
+            else if (column.getId() == DATA_CHANGE_TIMESTAMP_ID) {
+                changeTimestampIndex = Optional.of(columnIndex);
+                delegateColumnMap[columnIndex] = -1;
+            }
+            else if (column.getId() == DATA_CHANGE_ORDINAL_ID) {
+                changeOrdinalIndex = Optional.of(columnIndex);
+                delegateColumnMap[columnIndex] = -1;
+            }
+            else {
+                delegateColumnMap[columnIndex] = delegateColumnIndex;
+                delegateColumnIndex++;
+            }
+        }
+
+        this.pageSource = icebergPageSourceProvider.createPageSource(
+                session,
+                functionHandle.columns(),
+                tableSchema,
+                partitionSpec,
+                PartitionData.fromJson(split.partitionDataJson(), partitionColumnTypes),
+                ImmutableList.of(),
+                DynamicFilter.EMPTY,
+                TupleDomain.all(),
+                split.path(),
+                split.start(),
+                split.length(),
+                split.fileSize(),
+                split.fileRecordCount(),
+                split.partitionDataJson(),
+                split.fileFormat(),
+                functionHandle.nameMappingJson().map(NameMappingParser::fromJson));
+        this.delegateColumnMap = delegateColumnMap;
+
+        this.changeTypeIndex = changeTypeIndex;
+        this.changeTypeValue = nativeValueToBlock(createUnboundedVarcharType(), utf8Slice(split.changeType().getTableValue()));
+
+        this.changeVersionIndex = changeVersionIndex;
+        this.changeVersionValue = nativeValueToBlock(BIGINT, split.snapshotId());
+
+        this.changeTimestampIndex = changeTimestampIndex;
+        this.changeTimestampValue = nativeValueToBlock(TIMESTAMP_TZ_MILLIS, split.snapshotTimestamp());
+
+        this.changeOrdinalIndex = changeOrdinalIndex;
+        this.changeOrdinalValue = nativeValueToBlock(INTEGER, (long) split.changeOrdinal());
+    }
+
+    @Override
+    public TableFunctionProcessorState process()
+    {
+        if (pageSource.isFinished()) {
+            return FINISHED;
+        }
+
+        Page dataPage = pageSource.getNextPage();
+        if (dataPage == null) {
+            return TableFunctionProcessorState.Processed.produced(EMPTY_PAGE);
+        }
+
+        Block[] blocks = new Block[delegateColumnMap.length];
+        for (int targetChannel = 0; targetChannel < delegateColumnMap.length; targetChannel++) {
+            int delegateIndex = delegateColumnMap[targetChannel];
+            if (delegateIndex != -1) {
+                blocks[targetChannel] = dataPage.getBlock(delegateIndex);
+            }
+        }
+
+        changeTypeIndex.ifPresent(columnChannel ->
+                blocks[columnChannel] = RunLengthEncodedBlock.create(changeTypeValue, dataPage.getPositionCount()));
+        changeVersionIndex.ifPresent(columnChannel ->
+                blocks[columnChannel] = RunLengthEncodedBlock.create(changeVersionValue, dataPage.getPositionCount()));
+        changeTimestampIndex.ifPresent(columnChannel ->
+                blocks[columnChannel] = RunLengthEncodedBlock.create(changeTimestampValue, dataPage.getPositionCount()));
+        changeOrdinalIndex.ifPresent(columnChannel ->
+                blocks[columnChannel] = RunLengthEncodedBlock.create(changeOrdinalValue, dataPage.getPositionCount()));
+
+        return produced(new Page(dataPage.getPositionCount(), blocks));
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunctionProcessorProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunctionProcessorProvider.java
new file mode 100644
index 000000000000..b052b722b44d
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunctionProcessorProvider.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.functions.tablechanges;
+
+import com.google.inject.Inject;
+import io.trino.plugin.iceberg.IcebergPageSourceProvider;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorSplit;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
+import io.trino.spi.function.table.TableFunctionSplitProcessor;
+
+import static java.util.Objects.requireNonNull;
+
+public class TableChangesFunctionProcessorProvider
+        implements TableFunctionProcessorProvider
+{
+    private final IcebergPageSourceProvider icebergPageSourceProvider;
+
+    @Inject
+    public TableChangesFunctionProcessorProvider(IcebergPageSourceProvider icebergPageSourceProvider)
+    {
+        this.icebergPageSourceProvider = requireNonNull(icebergPageSourceProvider, "icebergPageSourceProvider is null");
+    }
+
+    @Override
+    public TableFunctionSplitProcessor getSplitProcessor(
+            ConnectorSession session,
+            ConnectorTableFunctionHandle handle,
+            ConnectorSplit split)
+    {
+        return new TableChangesFunctionProcessor(
+                session,
+                (TableChangesFunctionHandle) handle,
+                (TableChangesSplit) split,
+                icebergPageSourceProvider);
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunctionProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunctionProvider.java
new file mode 100644
index 000000000000..18d0d4a748f3
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesFunctionProvider.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.functions.tablechanges;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorTableFunction;
+import io.trino.plugin.iceberg.catalog.TrinoCatalogFactory;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.type.TypeManager;
+
+import static java.util.Objects.requireNonNull;
+
+public class TableChangesFunctionProvider
+        implements Provider<ConnectorTableFunction>
+{
+    private final TrinoCatalogFactory trinoCatalogFactory;
+    private final TypeManager typeManager;
+
+    @Inject
+    public TableChangesFunctionProvider(TrinoCatalogFactory trinoCatalogFactory, TypeManager typeManager)
+    {
+        this.trinoCatalogFactory = requireNonNull(trinoCatalogFactory, "trinoCatalogFactory is null");
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+    }
+
+    @Override
+    public ConnectorTableFunction get()
+    {
+        return new ClassLoaderSafeConnectorTableFunction(
+                new TableChangesFunction(trinoCatalogFactory, typeManager),
+                getClass().getClassLoader());
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesSplit.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesSplit.java
new file mode 100644
index 000000000000..ec95b956e7dc
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesSplit.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.functions.tablechanges;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.airlift.slice.SizeOf;
+import io.trino.plugin.iceberg.IcebergFileFormat;
+import io.trino.spi.HostAddress;
+import io.trino.spi.SplitWeight;
+import io.trino.spi.connector.ConnectorSplit;
+
+import java.util.List;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static io.airlift.slice.SizeOf.estimatedSizeOf;
+import static java.util.Objects.requireNonNull;
+
+public record TableChangesSplit(
+        ChangeType changeType,
+        long snapshotId,
+        long snapshotTimestamp,
+        int changeOrdinal,
+        String path,
+        long start,
+        long length,
+        long fileSize,
+        long fileRecordCount,
+        IcebergFileFormat fileFormat,
+        List<HostAddress> addresses,
+        String partitionSpecJson,
+        String partitionDataJson,
+        SplitWeight splitWeight) implements ConnectorSplit
+{
+    private static final int INSTANCE_SIZE = SizeOf.instanceSize(TableChangesSplit.class);
+
+    public TableChangesSplit
+    {
+        requireNonNull(changeType, "changeType is null");
+        requireNonNull(path, "path is null");
+        requireNonNull(fileFormat, "fileFormat is null");
+        addresses = ImmutableList.copyOf(requireNonNull(addresses, "addresses is null"));
+        requireNonNull(partitionSpecJson, "partitionSpecJson is null");
+        requireNonNull(partitionDataJson, "partitionDataJson is null");
+        requireNonNull(splitWeight, "splitWeight is null");
+    }
+
+    @Override
+    public boolean isRemotelyAccessible()
+    {
+        return true;
+    }
+
+    @Override
+    public List<HostAddress> getAddresses()
+    {
+        return addresses;
+    }
+
+    @Override
+    public SplitWeight getSplitWeight()
+    {
+        return splitWeight;
+    }
+
+    @Override
+    public Object getInfo()
+    {
+        return ImmutableMap.builder()
+                .put("path", path)
+                .put("start", start)
+                .put("length", length)
+                .buildOrThrow();
+    }
+
+    @Override
+    public long getRetainedSizeInBytes()
+    {
+        return INSTANCE_SIZE
+                + estimatedSizeOf(path)
+                + estimatedSizeOf(addresses, HostAddress::getRetainedSizeInBytes)
+                + estimatedSizeOf(partitionSpecJson)
+                + estimatedSizeOf(partitionDataJson)
+                + splitWeight.getRetainedSizeInBytes();
+    }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .addValue(path)
+                .add("start", start)
+                .add("length", length)
+                .add("records", fileRecordCount)
+                .toString();
+    }
+
+    public enum ChangeType {
+        ADDED_FILE("insert"),
+        DELETED_FILE("delete"),
+        POSITIONAL_DELETE("delete");
+
+        private final String tableValue;
+
+        ChangeType(String tableValue)
+        {
+            this.tableValue = tableValue;
+        }
+
+        public String getTableValue()
+        {
+            return tableValue;
+        }
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesSplitSource.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesSplitSource.java
new file mode 100644
index 000000000000..5f3525058e30
--- /dev/null
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesSplitSource.java
@@ -0,0 +1,179 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.functions.tablechanges;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.io.Closer;
+import io.trino.plugin.iceberg.IcebergFileFormat;
+import io.trino.plugin.iceberg.PartitionData;
+import io.trino.spi.SplitWeight;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorSplit;
+import io.trino.spi.connector.ConnectorSplitSource;
+import io.trino.spi.type.DateTimeEncoding;
+import org.apache.iceberg.AddedRowsScanTask;
+import org.apache.iceberg.ChangelogScanTask;
+import org.apache.iceberg.DeletedDataFileScanTask;
+import org.apache.iceberg.IncrementalChangelogScan;
+import org.apache.iceberg.PartitionSpecParser;
+import org.apache.iceberg.SplittableScanTask;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.io.CloseableIterable;
+import org.apache.iceberg.io.CloseableIterator;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+import static com.google.common.collect.Iterators.singletonIterator;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
+import static java.util.Collections.emptyIterator;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.CompletableFuture.completedFuture;
+
+public class TableChangesSplitSource
+        implements ConnectorSplitSource
+{
+    private final Table icebergTable;
+    private final IncrementalChangelogScan tableScan;
+    private final long targetSplitSize;
+    private final Closer closer = Closer.create();
+
+    private CloseableIterable<ChangelogScanTask> changelogScanIterable;
+    private CloseableIterator<ChangelogScanTask> changelogScanIterator;
+    private Iterator<? extends ChangelogScanTask> fileTasksIterator = emptyIterator();
+
+    public TableChangesSplitSource(
+            Table icebergTable,
+            IncrementalChangelogScan tableScan)
+    {
+        this.icebergTable = requireNonNull(icebergTable, "table is null");
+        this.tableScan = requireNonNull(tableScan, "tableScan is null");
+        this.targetSplitSize = tableScan.targetSplitSize();
+    }
+
+    @Override
+    public CompletableFuture<ConnectorSplitBatch> getNextBatch(int maxSize)
+    {
+        if (changelogScanIterable == null) {
+            try {
+                this.changelogScanIterable = closer.register(tableScan.planFiles());
+                this.changelogScanIterator = closer.register(changelogScanIterable.iterator());
+            }
+            catch (UnsupportedOperationException e) {
+                throw new TrinoException(NOT_SUPPORTED, "Table uses features which are not yet supported by the table_changes function", e);
+            }
+        }
+
+        List<ConnectorSplit> splits = new ArrayList<>(maxSize);
+        while (splits.size() < maxSize && (fileTasksIterator.hasNext() || changelogScanIterator.hasNext())) {
+            if (!fileTasksIterator.hasNext()) {
+                ChangelogScanTask wholeFileTask = changelogScanIterator.next();
+                fileTasksIterator = splitIfPossible(wholeFileTask, targetSplitSize);
+                continue;
+            }
+
+            ChangelogScanTask next = fileTasksIterator.next();
+            splits.add(toIcebergSplit(next));
+        }
+        return completedFuture(new ConnectorSplitBatch(splits, isFinished()));
+    }
+
+    @Override
+    public boolean isFinished()
+    {
+        return changelogScanIterator != null && !changelogScanIterator.hasNext();
+    }
+
+    @Override
+    public void close()
+    {
+        try {
+            closer.close();
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Iterator<? extends ChangelogScanTask> splitIfPossible(ChangelogScanTask wholeFileScan, long targetSplitSize)
+    {
+        if (wholeFileScan instanceof AddedRowsScanTask) {
+            return ((SplittableScanTask<AddedRowsScanTask>) wholeFileScan).split(targetSplitSize).iterator();
+        }
+
+        if (wholeFileScan instanceof DeletedDataFileScanTask) {
+            return ((SplittableScanTask<DeletedDataFileScanTask>) wholeFileScan).split(targetSplitSize).iterator();
+        }
+
+        return singletonIterator(wholeFileScan);
+    }
+
+    private ConnectorSplit toIcebergSplit(ChangelogScanTask task)
+    {
+        // TODO: Support DeletedRowsScanTask (requires https://github.com/apache/iceberg/pull/6182)
+        if (task instanceof AddedRowsScanTask) {
+            return toSplit((AddedRowsScanTask) task);
+        }
+        else if (task instanceof DeletedDataFileScanTask) {
+            return toSplit((DeletedDataFileScanTask) task);
+        }
+        else {
+            throw new TrinoException(NOT_SUPPORTED, "ChangelogScanTask type is not supported:" + task);
+        }
+    }
+
+    private TableChangesSplit toSplit(AddedRowsScanTask task)
+    {
+        return new TableChangesSplit(
+                TableChangesSplit.ChangeType.ADDED_FILE,
+                task.commitSnapshotId(),
+                DateTimeEncoding.packDateTimeWithZone(icebergTable.snapshot(task.commitSnapshotId()).timestampMillis(), UTC_KEY),
+                task.changeOrdinal(),
+                task.file().path().toString(),
+                task.start(),
+                task.length(),
+                task.file().fileSizeInBytes(),
+                task.file().recordCount(),
+                IcebergFileFormat.fromIceberg(task.file().format()),
+                ImmutableList.of(),
+                PartitionSpecParser.toJson(task.spec()),
+                PartitionData.toJson(task.file().partition()),
+                SplitWeight.standard());
+    }
+
+    private TableChangesSplit toSplit(DeletedDataFileScanTask task)
+    {
+        return new TableChangesSplit(
+                TableChangesSplit.ChangeType.DELETED_FILE,
+                task.commitSnapshotId(),
+                DateTimeEncoding.packDateTimeWithZone(icebergTable.snapshot(task.commitSnapshotId()).timestampMillis(), UTC_KEY),
+                task.changeOrdinal(),
+                task.file().path().toString(),
+                task.start(),
+                task.length(),
+                task.file().fileSizeInBytes(),
+                task.file().recordCount(),
+                IcebergFileFormat.fromIceberg(task.file().format()),
+                ImmutableList.of(),
+                PartitionSpecParser.toJson(task.spec()),
+                PartitionData.toJson(task.file().partition()),
+                SplitWeight.standard());
+    }
+}
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/DropExtendedStatsTableProcedure.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/DropExtendedStatsTableProcedure.java
index aa892a7c42c0..c216663d16fc 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/DropExtendedStatsTableProcedure.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/DropExtendedStatsTableProcedure.java
@@ -14,10 +14,9 @@
 package io.trino.plugin.iceberg.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Provider;
 import io.trino.spi.connector.TableProcedureMetadata;
 
-import javax.inject.Provider;
-
 import static io.trino.plugin.iceberg.procedure.IcebergTableProcedureId.DROP_EXTENDED_STATS;
 import static io.trino.spi.connector.TableProcedureExecutionMode.coordinatorOnly;
 
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/ExpireSnapshotsTableProcedure.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/ExpireSnapshotsTableProcedure.java
index 525f7e1a7a71..1aa84ea92887 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/ExpireSnapshotsTableProcedure.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/ExpireSnapshotsTableProcedure.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.iceberg.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Provider;
 import io.airlift.units.Duration;
 import io.trino.spi.connector.TableProcedureMetadata;
 
-import javax.inject.Provider;
-
 import static io.trino.plugin.base.session.PropertyMetadataUtil.durationProperty;
 import static io.trino.plugin.iceberg.procedure.IcebergTableProcedureId.EXPIRE_SNAPSHOTS;
 import static io.trino.spi.connector.TableProcedureExecutionMode.coordinatorOnly;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/MigrateProcedure.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/MigrateProcedure.java
index 1a7f9a577d0e..6c57853c9e4b 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/MigrateProcedure.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/MigrateProcedure.java
@@ -16,11 +16,15 @@
 import com.google.common.base.Enums;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.airlift.log.Logger;
 import io.trino.filesystem.FileEntry;
 import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.TrinoInputFile;
 import io.trino.plugin.hive.HiveStorageFormat;
 import io.trino.plugin.hive.metastore.Column;
 import io.trino.plugin.hive.metastore.HiveMetastore;
@@ -30,6 +34,7 @@
 import io.trino.plugin.hive.metastore.RawHiveMetastoreFactory;
 import io.trino.plugin.hive.metastore.Storage;
 import io.trino.plugin.iceberg.IcebergConfig;
+import io.trino.plugin.iceberg.IcebergFileFormat;
 import io.trino.plugin.iceberg.IcebergSecurityConfig;
 import io.trino.plugin.iceberg.PartitionData;
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
@@ -42,6 +47,10 @@
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.procedure.Procedure;
+import io.trino.spi.type.ArrayType;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
 import org.apache.iceberg.AppendFiles;
 import org.apache.iceberg.DataFile;
@@ -62,9 +71,6 @@
 import org.apache.iceberg.types.TypeUtil;
 import org.apache.iceberg.types.Types;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 import java.util.ArrayList;
@@ -84,13 +90,15 @@
 import static io.trino.plugin.hive.metastore.PrincipalPrivileges.NO_PRIVILEGES;
 import static io.trino.plugin.hive.util.HiveUtil.isDeltaLakeTable;
 import static io.trino.plugin.hive.util.HiveUtil.isHudiTable;
+import static io.trino.plugin.hive.util.HiveUtil.isIcebergTable;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_COMMIT_ERROR;
 import static io.trino.plugin.iceberg.IcebergSecurityConfig.IcebergSecurity.SYSTEM;
-import static io.trino.plugin.iceberg.IcebergUtil.isIcebergTable;
 import static io.trino.plugin.iceberg.PartitionFields.parsePartitionFields;
 import static io.trino.plugin.iceberg.TypeConverter.toIcebergTypeForNewColumn;
 import static io.trino.spi.StandardErrorCode.INVALID_PROCEDURE_ARGUMENT;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.Boolean.parseBoolean;
 import static java.lang.invoke.MethodHandles.lookup;
@@ -100,6 +108,7 @@
 import static org.apache.iceberg.BaseMetastoreTableOperations.METADATA_LOCATION_PROP;
 import static org.apache.iceberg.BaseMetastoreTableOperations.TABLE_TYPE_PROP;
 import static org.apache.iceberg.SortOrder.unsorted;
+import static org.apache.iceberg.TableProperties.DEFAULT_FILE_FORMAT;
 import static org.apache.iceberg.TableProperties.DEFAULT_NAME_MAPPING;
 import static org.apache.iceberg.TableProperties.FORMAT_VERSION;
 import static org.apache.iceberg.mapping.NameMappingParser.toJson;
@@ -192,8 +201,8 @@ public void doMigrate(ConnectorSession session, String schemaName, String tableN
         if (parseBoolean(transactionalProperty)) {
             throw new TrinoException(NOT_SUPPORTED, "Migrating transactional tables is unsupported");
         }
-        if (!"MANAGED_TABLE".equalsIgnoreCase(hiveTable.getTableType())) {
-            throw new TrinoException(NOT_SUPPORTED, "The procedure supports migrating only managed tables: " + hiveTable.getTableType());
+        if (!"MANAGED_TABLE".equalsIgnoreCase(hiveTable.getTableType()) && !"EXTERNAL_TABLE".equalsIgnoreCase(hiveTable.getTableType())) {
+            throw new TrinoException(NOT_SUPPORTED, "The procedure doesn't support migrating %s table type".formatted(hiveTable.getTableType()));
         }
         if (isDeltaLakeTable(hiveTable)) {
             throw new TrinoException(NOT_SUPPORTED, "The procedure doesn't support migrating Delta Lake tables");
@@ -210,7 +219,7 @@ public void doMigrate(ConnectorSession session, String schemaName, String tableN
         HiveStorageFormat storageFormat = extractHiveStorageFormat(hiveTable.getStorage().getStorageFormat());
         String location = hiveTable.getStorage().getLocation();
 
-        Map<String, String> properties = icebergTableProperties(location, hiveTable.getParameters(), nameMapping);
+        Map<String, String> properties = icebergTableProperties(location, hiveTable.getParameters(), nameMapping, toIcebergFileFormat(storageFormat));
         PartitionSpec partitionSpec = parsePartitionFields(schema, getPartitionColumnNames(hiveTable));
         try {
             ImmutableList.Builder<DataFile> dataFilesBuilder = ImmutableList.builder();
@@ -263,7 +272,7 @@ public void doMigrate(ConnectorSession session, String schemaName, String tableN
         }
     }
 
-    private Map<String, String> icebergTableProperties(String location, Map<String, String> hiveTableProperties, NameMapping nameMapping)
+    private Map<String, String> icebergTableProperties(String location, Map<String, String> hiveTableProperties, NameMapping nameMapping, IcebergFileFormat fileFormat)
     {
         Map<String, String> icebergTableProperties = new HashMap<>();
 
@@ -278,6 +287,7 @@ private Map<String, String> icebergTableProperties(String location, Map<String,
         icebergTableProperties.put(PROVIDER_PROPERTY_KEY, PROVIDER_PROPERTY_VALUE);
         icebergTableProperties.put(METADATA_LOCATION_PROP, location);
         icebergTableProperties.put(DEFAULT_NAME_MAPPING, toJson(nameMapping));
+        icebergTableProperties.put(DEFAULT_FILE_FORMAT, fileFormat.name());
         icebergTableProperties.put(FORMAT_VERSION, String.valueOf(formatVersion));
 
         return ImmutableMap.copyOf(icebergTableProperties);
@@ -289,7 +299,7 @@ private Schema toIcebergSchema(List<Column> columns)
         List<Types.NestedField> icebergColumns = new ArrayList<>();
         for (Column column : columns) {
             int index = icebergColumns.size();
-            org.apache.iceberg.types.Type type = toIcebergTypeForNewColumn(typeManager.getType(column.getType().getTypeSignature()), nextFieldId);
+            org.apache.iceberg.types.Type type = toIcebergType(typeManager.getType(column.getType().getTypeSignature()), nextFieldId);
             Types.NestedField field = Types.NestedField.of(index, false, column.getName(), type, column.getComment().orElse(null));
             icebergColumns.add(field);
         }
@@ -298,6 +308,18 @@ private Schema toIcebergSchema(List<Column> columns)
         return new Schema(icebergSchema.asStructType().fields());
     }
 
+    private static org.apache.iceberg.types.Type toIcebergType(Type type, AtomicInteger nextFieldId)
+    {
+        if (type instanceof ArrayType || type instanceof MapType || type instanceof RowType) {
+            // TODO https://github.com/trinodb/trino/issues/17583 Add support for these complex types
+            throw new TrinoException(NOT_SUPPORTED, "Migrating %s type is not supported".formatted(type));
+        }
+        if (type.equals(TINYINT) || type.equals(SMALLINT)) {
+            return Types.IntegerType.get();
+        }
+        return toIcebergTypeForNewColumn(type, nextFieldId);
+    }
+
     public Map<String, Optional<Partition>> listAllPartitions(HiveMetastore metastore, io.trino.plugin.hive.metastore.Table table)
     {
         List<String> partitionNames = table.getPartitionColumns().stream().map(Column::getName).collect(toImmutableList());
@@ -313,22 +335,23 @@ private List<DataFile> buildDataFiles(ConnectorSession session, RecursiveDirecto
     {
         // TODO: Introduce parallelism
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-        FileIterator files = fileSystem.listFiles(location);
+        FileIterator files = fileSystem.listFiles(Location.of(location));
         ImmutableList.Builder<DataFile> dataFilesBuilder = ImmutableList.builder();
         while (files.hasNext()) {
             FileEntry file = files.next();
-            String relativePath = file.location().substring(location.length());
+            String fileLocation = file.location().toString();
+            String relativePath = fileLocation.substring(location.length());
             if (relativePath.contains("/_") || relativePath.contains("/.")) {
                 continue;
             }
-            if (recursive == RecursiveDirectory.FALSE && isRecursive(location, file.location())) {
+            if (recursive == RecursiveDirectory.FALSE && isRecursive(location, fileLocation)) {
                 continue;
             }
-            else if (recursive == RecursiveDirectory.FAIL && isRecursive(location, file.location())) {
+            if (recursive == RecursiveDirectory.FAIL && isRecursive(location, fileLocation)) {
                 throw new TrinoException(NOT_SUPPORTED, "Recursive directory must not exist when recursive_directory argument is 'fail': " + file.location());
             }
 
-            Metrics metrics = loadMetrics(fileSystem, format, file.location(), nameMapping);
+            Metrics metrics = loadMetrics(fileSystem.newInputFile(file.location()), format, nameMapping);
             DataFile dataFile = buildDataFile(file, partition, partitionSpec, format.name(), metrics);
             dataFilesBuilder.add(dataFile);
         }
@@ -344,9 +367,19 @@ private static boolean isRecursive(String baseLocation, String location)
         return suffix.contains("/");
     }
 
-    private Metrics loadMetrics(TrinoFileSystem fileSystem, HiveStorageFormat storageFormat, String path, NameMapping nameMapping)
+    private static IcebergFileFormat toIcebergFileFormat(HiveStorageFormat storageFormat)
+    {
+        return switch (storageFormat) {
+            case ORC -> IcebergFileFormat.ORC;
+            case PARQUET -> IcebergFileFormat.PARQUET;
+            case AVRO -> IcebergFileFormat.AVRO;
+            default -> throw new TrinoException(NOT_SUPPORTED, "Unsupported storage format: " + storageFormat);
+        };
+    }
+
+    private static Metrics loadMetrics(TrinoInputFile file, HiveStorageFormat storageFormat, NameMapping nameMapping)
     {
-        InputFile inputFile = new ForwardingInputFile(fileSystem.newInputFile(path));
+        InputFile inputFile = new ForwardingInputFile(file);
         return switch (storageFormat) {
             case ORC -> OrcMetrics.fromInputFile(inputFile, METRICS_CONFIG, nameMapping);
             case PARQUET -> ParquetUtil.fileMetrics(inputFile, METRICS_CONFIG, nameMapping);
@@ -359,10 +392,6 @@ private static List<String> toPartitionFields(io.trino.plugin.hive.metastore.Tab
     {
         ImmutableList.Builder<String> fields = ImmutableList.builder();
         fields.addAll(getPartitionColumnNames(table));
-        table.getStorage().getBucketProperty()
-                .ifPresent(bucket -> {
-                    throw new TrinoException(NOT_SUPPORTED, "Cannot migrate bucketed table: " + bucket.getBucketedBy());
-                });
         return fields.build();
     }
 
@@ -376,7 +405,7 @@ private static List<String> getPartitionColumnNames(io.trino.plugin.hive.metasto
     private static DataFile buildDataFile(FileEntry file, StructLike partition, PartitionSpec spec, String format, Metrics metrics)
     {
         return DataFiles.builder(spec)
-                .withPath(file.location())
+                .withPath(file.location().toString())
                 .withFormat(format)
                 .withFileSizeInBytes(file.length())
                 .withMetrics(metrics)
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/OptimizeTableProcedure.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/OptimizeTableProcedure.java
index 4550f01e3302..530a586697de 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/OptimizeTableProcedure.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/OptimizeTableProcedure.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.iceberg.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Provider;
 import io.airlift.units.DataSize;
 import io.trino.spi.connector.TableProcedureMetadata;
 
-import javax.inject.Provider;
-
 import static io.trino.plugin.base.session.PropertyMetadataUtil.dataSizeProperty;
 import static io.trino.plugin.iceberg.procedure.IcebergTableProcedureId.OPTIMIZE;
 import static io.trino.spi.connector.TableProcedureExecutionMode.distributedWithFilteringAndRepartitioning;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/RegisterTableProcedure.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/RegisterTableProcedure.java
index c274de1bd89c..a3b3efb385fb 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/RegisterTableProcedure.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/RegisterTableProcedure.java
@@ -14,8 +14,11 @@
 package io.trino.plugin.iceberg.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.trino.filesystem.FileEntry;
 import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.iceberg.IcebergConfig;
@@ -27,17 +30,14 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.procedure.Procedure;
+import org.apache.iceberg.TableMetadata;
 import org.apache.iceberg.TableMetadataParser;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.OptionalInt;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.plugin.base.util.Procedures.checkProcedureArgument;
@@ -46,7 +46,7 @@
 import static io.trino.plugin.iceberg.IcebergUtil.METADATA_FILE_EXTENSION;
 import static io.trino.plugin.iceberg.IcebergUtil.METADATA_FOLDER_NAME;
 import static io.trino.plugin.iceberg.IcebergUtil.parseVersion;
-import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
+import static io.trino.spi.StandardErrorCode.INVALID_PROCEDURE_ARGUMENT;
 import static io.trino.spi.StandardErrorCode.PERMISSION_DENIED;
 import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_FOUND;
 import static io.trino.spi.type.VarcharType.VARCHAR;
@@ -143,16 +143,23 @@ private void doRegisterTable(
 
         TrinoFileSystem fileSystem = fileSystemFactory.create(clientSession);
         String metadataLocation = getMetadataLocation(fileSystem, tableLocation, metadataFileName);
-        validateLocation(fileSystem, metadataLocation);
+        validateMetadataLocation(fileSystem, Location.of(metadataLocation));
+        TableMetadata tableMetadata;
         try {
             // Try to read the metadata file. Invalid metadata file will throw the exception.
-            TableMetadataParser.read(new ForwardingFileIo(fileSystem), metadataLocation);
+            tableMetadata = TableMetadataParser.read(new ForwardingFileIo(fileSystem), metadataLocation);
         }
         catch (RuntimeException e) {
-            throw new TrinoException(ICEBERG_INVALID_METADATA, metadataLocation + " is not a valid metadata file", e);
+            throw new TrinoException(ICEBERG_INVALID_METADATA, "Invalid metadata file: " + metadataLocation, e);
+        }
+
+        if (!locationEquivalent(tableLocation, tableMetadata.location())) {
+            throw new TrinoException(ICEBERG_INVALID_METADATA, """
+                    Table metadata file [%s] declares table location as [%s] which is differs from location provided [%s]. \
+                    Iceberg table can only be registered with the same location it was created with.""".formatted(metadataLocation, tableMetadata.location(), tableLocation));
         }
 
-        catalog.registerTable(clientSession, schemaTableName, tableLocation, metadataLocation);
+        catalog.registerTable(clientSession, schemaTableName, tableMetadata);
     }
 
     private static void validateMetadataFileName(String fileName)
@@ -175,25 +182,24 @@ private static String getMetadataLocation(TrinoFileSystem fileSystem, String loc
 
     public static String getLatestMetadataLocation(TrinoFileSystem fileSystem, String location)
     {
-        List<String> latestMetadataLocations = new ArrayList<>();
+        List<Location> latestMetadataLocations = new ArrayList<>();
         String metadataDirectoryLocation = format("%s/%s", stripTrailingSlash(location), METADATA_FOLDER_NAME);
         try {
             int latestMetadataVersion = -1;
-            FileIterator fileIterator = fileSystem.listFiles(metadataDirectoryLocation);
+            FileIterator fileIterator = fileSystem.listFiles(Location.of(metadataDirectoryLocation));
             while (fileIterator.hasNext()) {
                 FileEntry fileEntry = fileIterator.next();
-                if (fileEntry.location().contains(METADATA_FILE_EXTENSION)) {
-                    OptionalInt version = parseVersion(fileEntry.location());
-                    if (version.isPresent()) {
-                        int versionNumber = version.getAsInt();
-                        if (versionNumber > latestMetadataVersion) {
-                            latestMetadataVersion = versionNumber;
-                            latestMetadataLocations.clear();
-                            latestMetadataLocations.add(fileEntry.location());
-                        }
-                        else if (versionNumber == latestMetadataVersion) {
-                            latestMetadataLocations.add(fileEntry.location());
-                        }
+                Location fileLocation = fileEntry.location();
+                String fileName = fileLocation.fileName();
+                if (fileName.endsWith(METADATA_FILE_EXTENSION)) {
+                    int versionNumber = parseVersion(fileName);
+                    if (versionNumber > latestMetadataVersion) {
+                        latestMetadataVersion = versionNumber;
+                        latestMetadataLocations.clear();
+                        latestMetadataLocations.add(fileLocation);
+                    }
+                    else if (versionNumber == latestMetadataVersion) {
+                        latestMetadataLocations.add(fileLocation);
                     }
                 }
             }
@@ -208,20 +214,32 @@ else if (versionNumber == latestMetadataVersion) {
             }
         }
         catch (IOException e) {
-            throw new TrinoException(ICEBERG_FILESYSTEM_ERROR, "Failed checking table's location: " + location, e);
+            throw new TrinoException(ICEBERG_FILESYSTEM_ERROR, "Failed checking table location: " + location, e);
         }
-        return getOnlyElement(latestMetadataLocations);
+        return getOnlyElement(latestMetadataLocations).toString();
     }
 
-    private static void validateLocation(TrinoFileSystem fileSystem, String location)
+    private static void validateMetadataLocation(TrinoFileSystem fileSystem, Location location)
     {
         try {
             if (!fileSystem.newInputFile(location).exists()) {
-                throw new TrinoException(GENERIC_USER_ERROR, format("Location %s does not exist", location));
+                throw new TrinoException(INVALID_PROCEDURE_ARGUMENT, "Metadata file does not exist: " + location);
             }
         }
         catch (IOException e) {
-            throw new TrinoException(ICEBERG_FILESYSTEM_ERROR, format("Invalid location: %s", location), e);
+            throw new TrinoException(ICEBERG_FILESYSTEM_ERROR, "Invalid metadata file location: " + location, e);
         }
     }
+
+    private static boolean locationEquivalent(String a, String b)
+    {
+        return normalizeS3Uri(a).equals(normalizeS3Uri(b));
+    }
+
+    private static String normalizeS3Uri(String tableLocation)
+    {
+        // Normalize e.g. s3a to s3, so that table can be registed using s3:// location
+        // even if internally it uses s3a:// paths.
+        return tableLocation.replaceFirst("^s3[an]://", "s3://");
+    }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/RemoveOrphanFilesTableProcedure.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/RemoveOrphanFilesTableProcedure.java
index 7c02298abac9..5db2ef95d4e7 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/RemoveOrphanFilesTableProcedure.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/RemoveOrphanFilesTableProcedure.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.iceberg.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Provider;
 import io.airlift.units.Duration;
 import io.trino.spi.connector.TableProcedureMetadata;
 
-import javax.inject.Provider;
-
 import static io.trino.plugin.base.session.PropertyMetadataUtil.durationProperty;
 import static io.trino.plugin.iceberg.procedure.IcebergTableProcedureId.REMOVE_ORPHAN_FILES;
 import static io.trino.spi.connector.TableProcedureExecutionMode.coordinatorOnly;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/UnregisterTableProcedure.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/UnregisterTableProcedure.java
index 3feb97706abf..f12ad559fcb5 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/UnregisterTableProcedure.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/UnregisterTableProcedure.java
@@ -14,6 +14,8 @@
 package io.trino.plugin.iceberg.procedure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
 import io.trino.plugin.iceberg.catalog.TrinoCatalogFactory;
 import io.trino.spi.classloader.ThreadContextClassLoader;
@@ -23,9 +25,6 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.procedure.Procedure;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.lang.invoke.MethodHandle;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/util/PageListBuilder.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/util/PageListBuilder.java
index 90ec89715c8a..515186ca8d47 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/util/PageListBuilder.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/util/PageListBuilder.java
@@ -17,7 +17,9 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.type.TimeZoneKey;
@@ -130,65 +132,59 @@ public void appendVarbinary(Slice value)
 
     public void appendIntegerArray(Iterable<Integer> values)
     {
-        BlockBuilder column = nextColumn();
-        BlockBuilder array = column.beginBlockEntry();
-        for (Integer value : values) {
-            INTEGER.writeLong(array, value);
-        }
-        column.closeEntry();
+        ArrayBlockBuilder column = (ArrayBlockBuilder) nextColumn();
+        column.buildEntry(elementBuilder -> {
+            for (Integer value : values) {
+                INTEGER.writeLong(elementBuilder, value);
+            }
+        });
     }
 
     public void appendBigintArray(Iterable<Long> values)
     {
-        BlockBuilder column = nextColumn();
-        BlockBuilder array = column.beginBlockEntry();
-        for (Long value : values) {
-            BIGINT.writeLong(array, value);
-        }
-        column.closeEntry();
+        ArrayBlockBuilder column = (ArrayBlockBuilder) nextColumn();
+        column.buildEntry(elementBuilder -> {
+            for (Long value : values) {
+                BIGINT.writeLong(elementBuilder, value);
+            }
+        });
     }
 
     public void appendVarcharArray(Iterable<String> values)
     {
-        BlockBuilder column = nextColumn();
-        BlockBuilder array = column.beginBlockEntry();
-        for (String value : values) {
-            VARCHAR.writeString(array, value);
-        }
-        column.closeEntry();
+        ArrayBlockBuilder column = (ArrayBlockBuilder) nextColumn();
+        column.buildEntry(elementBuilder -> {
+            for (String value : values) {
+                VARCHAR.writeString(elementBuilder, value);
+            }
+        });
     }
 
     public void appendVarcharVarcharMap(Map<String, String> values)
     {
-        BlockBuilder column = nextColumn();
-        BlockBuilder map = column.beginBlockEntry();
-        values.forEach((key, value) -> {
-            VARCHAR.writeString(map, key);
-            VARCHAR.writeString(map, value);
-        });
-        column.closeEntry();
+        MapBlockBuilder column = (MapBlockBuilder) nextColumn();
+        column.buildEntry((keyBuilder, valueBuilder) -> values.forEach((key, value) -> {
+            VARCHAR.writeString(keyBuilder, key);
+            VARCHAR.writeString(valueBuilder, value);
+        }));
     }
 
     public void appendIntegerBigintMap(Map<Integer, Long> values)
     {
-        BlockBuilder column = nextColumn();
-        BlockBuilder map = column.beginBlockEntry();
-        values.forEach((key, value) -> {
-            INTEGER.writeLong(map, key);
-            BIGINT.writeLong(map, value);
-        });
-        column.closeEntry();
+        MapBlockBuilder column = (MapBlockBuilder) nextColumn();
+        column.buildEntry((keyBuilder, valueBuilder) -> values.forEach((key, value) -> {
+            INTEGER.writeLong(keyBuilder, key);
+            BIGINT.writeLong(valueBuilder, value);
+        }));
     }
 
     public void appendIntegerVarcharMap(Map<Integer, String> values)
     {
-        BlockBuilder column = nextColumn();
-        BlockBuilder map = column.beginBlockEntry();
-        values.forEach((key, value) -> {
-            INTEGER.writeLong(map, key);
-            VARCHAR.writeString(map, value);
-        });
-        column.closeEntry();
+        MapBlockBuilder column = (MapBlockBuilder) nextColumn();
+        column.buildEntry((keyBuilder, valueBuilder) -> values.forEach((key, value) -> {
+            INTEGER.writeLong(keyBuilder, key);
+            VARCHAR.writeString(valueBuilder, value);
+        }));
     }
 
     public BlockBuilder nextColumn()
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorSmokeTest.java
index 584d2d42b645..16605509d5f3 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorSmokeTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorSmokeTest.java
@@ -14,64 +14,80 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Streams;
 import io.trino.Session;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
+import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
 import io.trino.testing.BaseConnectorSmokeTest;
 import io.trino.testing.TestingConnectorBehavior;
 import io.trino.testing.sql.TestTable;
 import org.apache.iceberg.FileFormat;
-import org.testng.annotations.Test;
-
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.TableMetadataParser;
+import org.apache.iceberg.io.FileIO;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
+
+import java.time.ZonedDateTime;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.airlift.concurrent.MoreFutures.getFutureValue;
+import static io.airlift.concurrent.MoreFutures.tryGetFutureValue;
+import static io.trino.plugin.iceberg.IcebergTestUtils.getFileSystemFactory;
 import static io.trino.plugin.iceberg.IcebergTestUtils.withSmallRowGroups;
 import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.DROP_TABLE;
 import static io.trino.testing.TestingAccessControlManager.privilege;
+import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
+import static java.time.format.DateTimeFormatter.ISO_INSTANT;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.Executors.newFixedThreadPool;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public abstract class BaseIcebergConnectorSmokeTest
         extends BaseConnectorSmokeTest
 {
     protected final FileFormat format;
+    protected TrinoFileSystem fileSystem;
 
     public BaseIcebergConnectorSmokeTest(FileFormat format)
     {
         this.format = requireNonNull(format, "format is null");
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
+    @BeforeAll
+    public void initFileSystem()
+    {
+        fileSystem = getFileSystemFactory(getDistributedQueryRunner()).create(SESSION);
+    }
+
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_VIEW:
-                return true;
-
-            case SUPPORTS_CREATE_MATERIALIZED_VIEW:
-                return true;
-
-            case SUPPORTS_DELETE:
-            case SUPPORTS_UPDATE:
-            case SUPPORTS_MERGE:
-                return true;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_TRUNCATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Test
@@ -107,47 +123,97 @@ public void testHiddenPathColumn()
     }
 
     // Repeat test with invocationCount for better test coverage, since the tested aspect is inherently non-deterministic.
-    @Test(timeOut = 120_000, invocationCount = 4)
+    @RepeatedTest(4)
+    @Timeout(120)
     public void testDeleteRowsConcurrently()
             throws Exception
     {
         int threads = 4;
         CyclicBarrier barrier = new CyclicBarrier(threads);
         ExecutorService executor = newFixedThreadPool(threads);
+        List<String> rows = ImmutableList.of("(1, 0, 0, 0)", "(0, 1, 0, 0)", "(0, 0, 1, 0)", "(0, 0, 0, 1)");
+
+        String[] expectedErrors = new String[]{"Failed to commit Iceberg update to table:", "Failed to replace table due to concurrent updates:"};
         try (TestTable table = new TestTable(
                 getQueryRunner()::execute,
                 "test_concurrent_delete",
                 "(col0 INTEGER, col1 INTEGER, col2 INTEGER, col3 INTEGER)")) {
             String tableName = table.getName();
-            assertUpdate("INSERT INTO " + tableName + " VALUES (0, 0, 0, 0)", 1);
-            assertUpdate("INSERT INTO " + tableName + " VALUES (1, 0, 0, 0)", 1);
-            assertUpdate("INSERT INTO " + tableName + " VALUES (0, 1, 0, 0)", 1);
-            assertUpdate("INSERT INTO " + tableName + " VALUES (0, 0, 1, 0)", 1);
-            assertUpdate("INSERT INTO " + tableName + " VALUES (0, 0, 0, 1)", 1);
+            assertUpdate("INSERT INTO " + tableName + " VALUES " + String.join(", ", rows), 4);
 
             List<Future<Boolean>> futures = IntStream.range(0, threads)
                     .mapToObj(threadNumber -> executor.submit(() -> {
                         barrier.await(10, SECONDS);
+                        String columnName = "col" + threadNumber;
                         try {
-                            String columnName = "col" + threadNumber;
                             getQueryRunner().execute(format("DELETE FROM %s WHERE %s = 1", tableName, columnName));
                             return true;
                         }
                         catch (Exception e) {
+                            assertThat(e.getMessage()).containsAnyOf(expectedErrors);
                             return false;
                         }
                     }))
                     .collect(toImmutableList());
 
-            futures.forEach(future -> assertTrue(getFutureValue(future)));
-            assertThat(query("SELECT max(col0), max(col1), max(col2), max(col3) FROM " + tableName)).matches("VALUES (0, 0, 0, 0)");
+            Stream<Optional<String>> expectedRows = Streams.mapWithIndex(futures.stream(), (future, index) -> {
+                boolean deleteSuccessful = tryGetFutureValue(future, 10, SECONDS).orElseThrow();
+                return deleteSuccessful ? Optional.empty() : Optional.of(rows.get((int) index));
+            });
+            List<String> expectedValues = expectedRows.filter(Optional::isPresent).map(Optional::get).collect(toImmutableList());
+            assertThat(expectedValues).as("Expected at least one delete operation to pass").hasSizeLessThan(rows.size());
+            assertThat(query("SELECT * FROM " + tableName)).matches("VALUES " + String.join(", ", expectedValues));
         }
         finally {
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
+        }
+    }
+
+    @Test
+    public void testCreateOrReplaceTable()
+    {
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_create_or_replace",
+                " AS SELECT BIGINT '42' a, DOUBLE '-38.5' b")) {
+            assertThat(query("SELECT a, b FROM " + table.getName()))
+                    .matches("VALUES (BIGINT '42', -385e-1)");
+
+            long v1SnapshotId = getMostRecentSnapshotId(table.getName());
+
+            assertUpdate("CREATE OR REPLACE TABLE " + table.getName() + " AS SELECT BIGINT '-42' a, DOUBLE '38.5' b", 1);
+            assertThat(query("SELECT a, b FROM " + table.getName()))
+                    .matches("VALUES (BIGINT '-42', 385e-1)");
+
+            assertThat(query("SELECT COUNT(snapshot_id) FROM \"" + table.getName() + "$history\""))
+                    .matches("VALUES BIGINT '2'");
+
+            assertThat(query("SELECT a, b  FROM " + table.getName() + " FOR VERSION AS OF " + v1SnapshotId))
+                    .matches("VALUES (BIGINT '42', -385e-1)");
         }
     }
 
+    @Test
+    public void testCreateOrReplaceTableChangeColumnNamesAndTypes()
+    {
+        String tableName = "test_create_or_replace_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT BIGINT '42' a, DOUBLE '-38.5' b", 1);
+        assertThat(query("SELECT CAST(a AS bigint), b FROM " + tableName))
+                .matches("VALUES (BIGINT '42', -385e-1)");
+
+        long v1SnapshotId = getMostRecentSnapshotId(tableName);
+
+        assertUpdate("CREATE OR REPLACE TABLE " + tableName + " AS SELECT VARCHAR 'test' c, VARCHAR 'test2' d", 1);
+        assertThat(query("SELECT c, d FROM " + tableName))
+                .matches("VALUES (VARCHAR 'test', VARCHAR 'test2')");
+
+        assertThat(query("SELECT a, b  FROM " + tableName + " FOR VERSION AS OF " + v1SnapshotId))
+                .matches("VALUES (BIGINT '42', -385e-1)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
     @Test
     public void testRegisterTableWithTableLocation()
     {
@@ -458,7 +524,7 @@ public void testSortedNationTable()
                 "WITH (sorted_by = ARRAY['comment'], format = '" + format.name() + "') AS SELECT * FROM nation WITH NO DATA")) {
             assertUpdate(withSmallRowGroups, "INSERT INTO " + table.getName() + " SELECT * FROM nation", 25);
             for (Object filePath : computeActual("SELECT file_path from \"" + table.getName() + "$files\"").getOnlyColumnAsSet()) {
-                assertTrue(isFileSorted((String) filePath, "comment"));
+                assertTrue(isFileSorted(Location.of((String) filePath), "comment"));
             }
             assertQuery("SELECT * FROM " + table.getName(), "SELECT * FROM nation");
         }
@@ -478,27 +544,238 @@ public void testFileSortingWithLargerTable()
                     "INSERT INTO " + table.getName() + " TABLE tpch.tiny.lineitem",
                     "VALUES 60175");
             for (Object filePath : computeActual("SELECT file_path from \"" + table.getName() + "$files\"").getOnlyColumnAsSet()) {
-                assertTrue(isFileSorted((String) filePath, "comment"));
+                assertTrue(isFileSorted(Location.of((String) filePath), "comment"));
             }
             assertQuery("SELECT * FROM " + table.getName(), "SELECT * FROM lineitem");
         }
     }
 
-    protected abstract boolean isFileSorted(String path, String sortColumnName);
+    @Test
+    public void testDropTableWithMissingMetadataFile()
+            throws Exception
+    {
+        String tableName = "test_drop_table_with_missing_metadata_file_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 1 x, 'INDIA' y", 1);
 
-    private String getTableLocation(String tableName)
+        Location metadataLocation = Location.of(getMetadataLocation(tableName));
+        Location tableLocation = Location.of(getTableLocation(tableName));
+
+        // Delete current metadata file
+        fileSystem.deleteFile(metadataLocation);
+        assertFalse(fileSystem.newInputFile(metadataLocation).exists(), "Current metadata file should not exist");
+
+        // try to drop table
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+        assertFalse(fileSystem.listFiles(tableLocation).hasNext(), "Table location should not exist");
+    }
+
+    @Test
+    public void testDropTableWithMissingSnapshotFile()
+            throws Exception
     {
-        return (String) computeScalar("SELECT DISTINCT regexp_replace(\"$path\", '/[^/]*/[^/]*$', '') FROM " + tableName);
+        String tableName = "test_drop_table_with_missing_snapshot_file_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 1 x, 'INDIA' y", 1);
+
+        String metadataLocation = getMetadataLocation(tableName);
+        TableMetadata tableMetadata = TableMetadataParser.read(new ForwardingFileIo(fileSystem), metadataLocation);
+        Location tableLocation = Location.of(tableMetadata.location());
+        Location currentSnapshotFile = Location.of(tableMetadata.currentSnapshot().manifestListLocation());
+
+        // Delete current snapshot file
+        fileSystem.deleteFile(currentSnapshotFile);
+        assertFalse(fileSystem.newInputFile(currentSnapshotFile).exists(), "Current snapshot file should not exist");
+
+        // try to drop table
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+        assertFalse(fileSystem.listFiles(tableLocation).hasNext(), "Table location should not exist");
     }
 
-    protected String getTableComment(String tableName)
+    @Test
+    public void testDropTableWithMissingManifestListFile()
+            throws Exception
     {
-        return (String) computeScalar("SELECT comment FROM system.metadata.table_comments WHERE catalog_name = 'iceberg' AND schema_name = '" + getSession().getSchema().orElseThrow() + "' AND table_name = '" + tableName + "'");
+        String tableName = "test_drop_table_with_missing_manifest_list_file_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 1 x, 'INDIA' y", 1);
+
+        String metadataLocation = getMetadataLocation(tableName);
+        FileIO fileIo = new ForwardingFileIo(fileSystem);
+        TableMetadata tableMetadata = TableMetadataParser.read(fileIo, metadataLocation);
+        Location tableLocation = Location.of(tableMetadata.location());
+        Location manifestListFile = Location.of(tableMetadata.currentSnapshot().allManifests(fileIo).get(0).path());
+
+        // Delete Manifest List file
+        fileSystem.deleteFile(manifestListFile);
+        assertFalse(fileSystem.newInputFile(manifestListFile).exists(), "Manifest list file should not exist");
+
+        // try to drop table
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+        assertFalse(fileSystem.listFiles(tableLocation).hasNext(), "Table location should not exist");
     }
 
-    protected String getColumnComment(String tableName, String columnName)
+    @Test
+    public void testDropTableWithMissingDataFile()
+            throws Exception
     {
-        return (String) computeScalar("SELECT comment FROM information_schema.columns WHERE table_schema = '" + getSession().getSchema().orElseThrow() + "' AND table_name = '" + tableName + "' AND column_name = '" + columnName + "'");
+        String tableName = "test_drop_table_with_missing_data_file_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 1 x, 'INDIA' y", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (2, 'POLAND')", 1);
+
+        Location tableLocation = Location.of(getTableLocation(tableName));
+        Location tableDataPath = tableLocation.appendPath("data");
+        FileIterator fileIterator = fileSystem.listFiles(tableDataPath);
+        assertTrue(fileIterator.hasNext());
+        Location dataFile = fileIterator.next().location();
+
+        // Delete data file
+        fileSystem.deleteFile(dataFile);
+        assertFalse(fileSystem.newInputFile(dataFile).exists(), "Data file should not exist");
+
+        // try to drop table
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+        assertFalse(fileSystem.listFiles(tableLocation).hasNext(), "Table location should not exist");
+    }
+
+    @Test
+    public void testDropTableWithNonExistentTableLocation()
+            throws Exception
+    {
+        String tableName = "test_drop_table_with_non_existent_table_location_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 1 x, 'INDIA' y", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (2, 'POLAND')", 1);
+
+        Location tableLocation = Location.of(getTableLocation(tableName));
+
+        // Delete table location
+        fileSystem.deleteDirectory(tableLocation);
+        assertFalse(fileSystem.listFiles(tableLocation).hasNext(), "Table location should not exist");
+
+        // try to drop table
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+    }
+
+    // Verify the accuracy of Trino metadata tables while retrieving Iceberg table metadata from the underlying `TrinoCatalog` implementation
+    @Test
+    public void testMetadataTables()
+    {
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_metadata_tables",
+                "(id int, part varchar) WITH (partitioning = ARRAY['part'])")) {
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (1, 'p1')", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (2, 'p1')", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (3, 'p2')", 1);
+
+            List<Long> snapshotIds = computeActual("SELECT snapshot_id FROM \"" + table.getName() + "$snapshots\" ORDER BY committed_at DESC")
+                    .getOnlyColumn()
+                    .map(Long.class::cast)
+                    .collect(toImmutableList());
+            List<Long> historySnapshotIds = computeActual("SELECT snapshot_id FROM \"" + table.getName() + "$history\" ORDER BY made_current_at DESC")
+                    .getOnlyColumn()
+                    .map(Long.class::cast)
+                    .collect(toImmutableList());
+            long filesCount = (long) computeScalar("SELECT count(*) FROM \"" + table.getName() + "$files\"");
+            long partitionsCount = (long) computeScalar("SELECT count(*) FROM \"" + table.getName() + "$partitions\"");
+
+            assertThat(snapshotIds).hasSize(4);
+            assertThat(snapshotIds).hasSameElementsAs(historySnapshotIds);
+            assertThat(filesCount).isEqualTo(3L);
+            assertThat(partitionsCount).isEqualTo(2L);
+        }
+    }
+
+    @Test
+    public void testPartitionFilterRequired()
+    {
+        String tableName = "test_partition_" + randomNameSuffix();
+
+        Session session = Session.builder(getSession())
+                .setCatalogSessionProperty("iceberg", "query_partition_filter_required", "true")
+                .build();
+
+        assertUpdate(session, "CREATE TABLE " + tableName + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName + " (id, a, ds) VALUES (1, 'a', 'a')", 1);
+        String query = "SELECT id FROM " + tableName + " WHERE a = 'a'";
+        @Language("RegExp") String failureMessage = "Filter required for .*" + tableName + " on at least one of the partition columns: ds";
+        assertQueryFails(session, query, failureMessage);
+        assertQueryFails(session, "EXPLAIN " + query, failureMessage);
+        assertUpdate(session, "DROP TABLE " + tableName);
+    }
+
+    protected abstract boolean isFileSorted(Location path, String sortColumnName);
+
+    @Test
+    public void testTableChangesFunction()
+    {
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_table_changes_function_",
+                "AS SELECT nationkey, name FROM tpch.tiny.nation WITH NO DATA")) {
+            long initialSnapshot = getMostRecentSnapshotId(table.getName());
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT nationkey, name FROM nation", 25);
+            long snapshotAfterInsert = getMostRecentSnapshotId(table.getName());
+            String snapshotAfterInsertTime = getSnapshotTime(table.getName(), snapshotAfterInsert).format(ISO_INSTANT);
+
+            assertQuery(
+                    "SELECT nationkey, name, _change_type, _change_version_id, to_iso8601(_change_timestamp), _change_ordinal " +
+                            "FROM TABLE(system.table_changes(CURRENT_SCHEMA, '%s', %s, %s))".formatted(table.getName(), initialSnapshot, snapshotAfterInsert),
+                    "SELECT nationkey, name, 'insert', %s, '%s', 0 FROM nation".formatted(snapshotAfterInsert, snapshotAfterInsertTime));
+
+            assertUpdate("DELETE FROM " + table.getName(), 25);
+            long snapshotAfterDelete = getMostRecentSnapshotId(table.getName());
+            String snapshotAfterDeleteTime = getSnapshotTime(table.getName(), snapshotAfterDelete).format(ISO_INSTANT);
+
+            assertQuery(
+                    "SELECT nationkey, name, _change_type, _change_version_id, to_iso8601(_change_timestamp), _change_ordinal " +
+                            "FROM TABLE(system.table_changes(CURRENT_SCHEMA, '%s', %s, %s))".formatted(table.getName(), snapshotAfterInsert, snapshotAfterDelete),
+                    "SELECT nationkey, name, 'delete', %s, '%s', 0 FROM nation".formatted(snapshotAfterDelete, snapshotAfterDeleteTime));
+
+            assertQuery(
+                    "SELECT nationkey, name, _change_type, _change_version_id, to_iso8601(_change_timestamp), _change_ordinal " +
+                            "FROM TABLE(system.table_changes(CURRENT_SCHEMA, '%s', %s, %s))".formatted(table.getName(), initialSnapshot, snapshotAfterDelete),
+                    "SELECT nationkey, name, 'insert', %s, '%s', 0 FROM nation UNION SELECT nationkey, name, 'delete', %s, '%s', 1 FROM nation".formatted(
+                            snapshotAfterInsert, snapshotAfterInsertTime, snapshotAfterDelete, snapshotAfterDeleteTime));
+        }
+    }
+
+    @Test
+    public void testRowLevelDeletesWithTableChangesFunction()
+    {
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_row_level_deletes_with_table_changes_function_",
+                "AS SELECT nationkey, regionkey, name FROM tpch.tiny.nation WITH NO DATA")) {
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT nationkey, regionkey, name FROM nation", 25);
+            long snapshotAfterInsert = getMostRecentSnapshotId(table.getName());
+
+            assertUpdate("DELETE FROM " + table.getName() + " WHERE regionkey = 2", 5);
+            long snapshotAfterDelete = getMostRecentSnapshotId(table.getName());
+
+            assertQueryFails(
+                    "SELECT * FROM TABLE(system.table_changes(CURRENT_SCHEMA, '%s', %s, %s))".formatted(table.getName(), snapshotAfterInsert, snapshotAfterDelete),
+                    "Table uses features which are not yet supported by the table_changes function");
+        }
+    }
+
+    private long getMostRecentSnapshotId(String tableName)
+    {
+        return (long) Iterables.getOnlyElement(getQueryRunner().execute(format("SELECT snapshot_id FROM \"%s$snapshots\" ORDER BY committed_at DESC LIMIT 1", tableName))
+                .getOnlyColumnAsSet());
+    }
+
+    private ZonedDateTime getSnapshotTime(String tableName, long snapshotId)
+    {
+        return (ZonedDateTime) Iterables.getOnlyElement(getQueryRunner().execute(format("SELECT committed_at FROM \"%s$snapshots\" WHERE snapshot_id = %s", tableName, snapshotId))
+                .getOnlyColumnAsSet());
+    }
+
+    private String getTableLocation(String tableName)
+    {
+        return (String) computeScalar("SELECT DISTINCT regexp_replace(\"$path\", '/[^/]*/[^/]*$', '') FROM " + tableName);
     }
 
     protected abstract void dropTableFromMetastore(String tableName);
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java
index 9729a0ab889f..90d403d2b9bc 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java
@@ -13,21 +13,29 @@
  */
 package io.trino.plugin.iceberg;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.Session;
-import io.trino.hdfs.HdfsContext;
+import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
+import io.trino.filesystem.TrinoFileSystem;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.TableHandle;
 import io.trino.operator.OperatorStats;
+import io.trino.plugin.hive.TestingHivePlugin;
+import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
 import io.trino.spi.QueryId;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.ConstraintApplicationResult;
+import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.TableNotFoundException;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
@@ -36,6 +44,7 @@
 import io.trino.sql.planner.plan.ValuesNode;
 import io.trino.testing.BaseConnectorTest;
 import io.trino.testing.DataProviders;
+import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.MaterializedResultWithQueryId;
 import io.trino.testing.MaterializedRow;
@@ -48,19 +57,23 @@
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.generic.GenericDatumWriter;
-import org.apache.hadoop.fs.FileSystem;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.TableMetadataParser;
+import org.apache.iceberg.io.FileIO;
+import org.apache.iceberg.util.JsonUtil;
 import org.intellij.lang.annotations.Language;
 import org.testng.SkipException;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -73,6 +86,7 @@
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -88,19 +102,22 @@
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
-import static io.trino.SystemSessionProperties.PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS;
 import static io.trino.SystemSessionProperties.SCALE_WRITERS;
-import static io.trino.SystemSessionProperties.TASK_PARTITIONED_WRITER_COUNT;
-import static io.trino.SystemSessionProperties.TASK_WRITER_COUNT;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.SystemSessionProperties.TASK_MAX_WRITER_COUNT;
+import static io.trino.SystemSessionProperties.TASK_MIN_WRITER_COUNT;
+import static io.trino.SystemSessionProperties.USE_PREFERRED_WRITE_PARTITIONING;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.plugin.iceberg.IcebergFileFormat.AVRO;
 import static io.trino.plugin.iceberg.IcebergFileFormat.ORC;
 import static io.trino.plugin.iceberg.IcebergFileFormat.PARQUET;
 import static io.trino.plugin.iceberg.IcebergQueryRunner.ICEBERG_CATALOG;
+import static io.trino.plugin.iceberg.IcebergSessionProperties.COLLECT_EXTENDED_STATISTICS_ON_WRITE;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.EXTENDED_STATISTICS_ENABLED;
 import static io.trino.plugin.iceberg.IcebergSplitManager.ICEBERG_DOMAIN_COMPACTION_THRESHOLD;
+import static io.trino.plugin.iceberg.IcebergTestUtils.getFileSystemFactory;
 import static io.trino.plugin.iceberg.IcebergTestUtils.withSmallRowGroups;
 import static io.trino.plugin.iceberg.IcebergUtil.TRINO_QUERY_ID_NAME;
+import static io.trino.plugin.iceberg.procedure.RegisterTableProcedure.getLatestMetadataLocation;
 import static io.trino.spi.predicate.Domain.multipleValues;
 import static io.trino.spi.predicate.Domain.singleValue;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -111,23 +128,27 @@
 import static io.trino.spi.type.TimeZoneKey.getTimeZoneKey;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
+import static io.trino.testing.DataProviders.toDataProvider;
 import static io.trino.testing.MaterializedResult.resultBuilder;
 import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
+import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.testing.assertions.Assert.assertEventually;
 import static io.trino.transaction.TransactionBuilder.transaction;
 import static java.lang.String.format;
 import static java.lang.String.join;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.time.ZoneOffset.UTC;
 import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;
 import static java.util.Collections.nCopies;
 import static java.util.Objects.requireNonNull;
+import static java.util.UUID.randomUUID;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toUnmodifiableList;
 import static java.util.stream.IntStream.range;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -144,6 +165,9 @@ public abstract class BaseIcebergConnectorTest
 
     protected final IcebergFileFormat format;
 
+    protected TrinoFileSystem fileSystem;
+    protected TimeUnit storageTimePrecision;
+
     protected BaseIcebergConnectorTest(IcebergFileFormat format)
     {
         this.format = requireNonNull(format, "format is null");
@@ -168,33 +192,54 @@ protected IcebergQueryRunner.Builder createQueryRunnerBuilder()
                 .setInitialTables(REQUIRED_TPCH_TABLES);
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
-    @Override
-    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
+    @BeforeClass
+    public void initFileSystem()
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
+        fileSystem = getFileSystemFactory(getDistributedQueryRunner()).create(SESSION);
+    }
+
+    @BeforeClass
+    public void initStorageTimePrecision()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "inspect_storage_precision", "(i int)")) {
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (1)", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (2)", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (3)", 1);
 
-            case SUPPORTS_COMMENT_ON_VIEW:
-            case SUPPORTS_COMMENT_ON_VIEW_COLUMN:
-                return true;
+            long countWithSecondFraction = (Long) computeScalar("SELECT count(*) FILTER (WHERE \"$file_modified_time\" != date_trunc('second', \"$file_modified_time\")) FROM " + table.getName());
+            // In the unlikely case where all files just happen to end up having no second fraction while storage actually supports millisecond precision,
+            // we will run the test with reduced precision.
+            storageTimePrecision = countWithSecondFraction == 0 ? SECONDS : MILLISECONDS;
+        }
+    }
 
-            case SUPPORTS_CREATE_VIEW:
-                return true;
+    @Override
+    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
+    {
+        return switch (connectorBehavior) {
+            case SUPPORTS_CREATE_OR_REPLACE_TABLE,
+                    SUPPORTS_REPORTING_WRITTEN_BYTES -> true;
+            case SUPPORTS_ADD_COLUMN_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_RENAME_MATERIALIZED_VIEW_ACROSS_SCHEMAS,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_TRUNCATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
 
-            case SUPPORTS_CREATE_MATERIALIZED_VIEW:
-                return true;
-            case SUPPORTS_RENAME_MATERIALIZED_VIEW_ACROSS_SCHEMAS:
-                return false;
+    @Test
+    public void testAddRowFieldCaseInsensitivity()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute,
+                "test_add_row_field_case_insensitivity_",
+                "AS SELECT CAST(row(row(2)) AS row(\"CHILD\" row(grandchild_1 integer))) AS col")) {
+            assertEquals(getColumnType(table.getName(), "col"), "row(CHILD row(grandchild_1 integer))");
 
-            case SUPPORTS_DELETE:
-            case SUPPORTS_UPDATE:
-            case SUPPORTS_MERGE:
-                return true;
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN col.child.grandchild_2 integer");
+            assertEquals(getColumnType(table.getName(), "col"), "row(CHILD row(grandchild_1 integer, grandchild_2 integer))");
 
-            default:
-                return super.hasBehavior(connectorBehavior);
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN col.CHILD.grandchild_3 integer");
+            assertEquals(getColumnType(table.getName(), "col"), "row(CHILD row(grandchild_1 integer, grandchild_2 integer, grandchild_3 integer))");
         }
     }
 
@@ -217,7 +262,8 @@ protected void verifyVersionedQueryFailurePermissible(Exception e)
                         "Unsupported type for temporal table version: .*|" +
                         "Unsupported type for table version: .*|" +
                         "No version history table tpch.nation at or before .*|" +
-                        "Iceberg snapshot ID does not exists: .*");
+                        "Iceberg snapshot ID does not exists: .*|" +
+                        "Cannot find snapshot with reference name: .*");
     }
 
     @Override
@@ -282,7 +328,6 @@ protected MaterializedResult getDescribeOrdersResult()
     @Test
     public void testShowCreateTable()
     {
-        File tempDir = getDistributedQueryRunner().getCoordinator().getBaseDataDir().toFile();
         assertThat((String) computeActual("SHOW CREATE TABLE orders").getOnlyValue())
                 .matches("\\QCREATE TABLE iceberg.tpch.orders (\n" +
                         "   orderkey bigint,\n" +
@@ -298,18 +343,10 @@ public void testShowCreateTable()
                         "WITH (\n" +
                         "   format = '" + format.name() + "',\n" +
                         "   format_version = 2,\n" +
-                        "   location = '" + tempDir + "/iceberg_data/tpch/orders-\\E.*\\Q'\n" +
+                        "   location = '\\E.*/iceberg_data/tpch/orders-.*\\Q'\n" +
                         ")\\E");
     }
 
-    @Override
-    protected void checkInformationSchemaViewsForMaterializedView(String schemaName, String viewName)
-    {
-        // TODO should probably return materialized view, as it's also a view -- to be double checked
-        assertThatThrownBy(() -> super.checkInformationSchemaViewsForMaterializedView(schemaName, viewName))
-                .hasMessageFindingMatch("(?s)Expecting.*to contain:.*\\Q[(" + viewName + ")]");
-    }
-
     @Test
     public void testPartitionedByRealWithNaN()
     {
@@ -727,7 +764,7 @@ public void testCreatePartitionedTable()
                 "  a_timestamp timestamp(6), " +
                 "  a_timestamptz timestamp(6) with time zone, " +
                 "  a_uuid uuid, " +
-                "  a_row row(id integer , vc varchar), " +
+                "  a_row row(id integer, vc varchar), " +
                 "  an_array array(varchar), " +
                 "  a_map map(integer, varchar), " +
                 "  \"a quoted, field\" varchar" +
@@ -1104,7 +1141,7 @@ public void testSortByAllTypes()
                 "  a_timestamp timestamp(6), " +
                 "  a_timestamptz timestamp(6) with time zone, " +
                 "  a_uuid uuid, " +
-                "  a_row row(id integer , vc varchar), " +
+                "  a_row row(id integer, vc varchar, t time(6), ts timestamp(6), tstz timestamp(6) with time zone), " + // not sorted on, but still written to sort temp file, if any
                 "  an_array array(varchar), " +
                 "  a_map map(integer, varchar) " +
                 ") " +
@@ -1133,17 +1170,17 @@ public void testSortByAllTypes()
                 "REAL '3.0', " +
                 "DOUBLE '4.0', " +
                 "DECIMAL '5.00', " +
-                "DECIMAL '6.00', " +
-                "'seven', " +
+                "CAST(DECIMAL '6.00' AS decimal(38,20)), " +
+                "VARCHAR 'seven', " +
                 "X'88888888', " +
                 "DATE '2022-09-09', " +
                 "TIME '10:10:10.000000', " +
                 "TIMESTAMP '2022-11-11 11:11:11.000000', " +
                 "TIMESTAMP '2022-11-11 11:11:11.000000 UTC', " +
                 "UUID '12121212-1212-1212-1212-121212121212', " +
-                "ROW(13, 'thirteen'), " +
-                "ARRAY['four', 'teen'], " +
-                "MAP(ARRAY[15], ARRAY['fifteen']))";
+                "CAST(ROW(13, 'thirteen', TIME '10:10:10.000000', TIMESTAMP '2022-11-11 11:11:11.000000', TIMESTAMP '2022-11-11 11:11:11.000000 UTC') AS row(id integer, vc varchar, t time(6), ts timestamp(6), tstz timestamp(6) with time zone)), " +
+                "ARRAY[VARCHAR 'four', 'teen'], " +
+                "MAP(ARRAY[15], ARRAY[VARCHAR 'fifteen']))";
         String highValues = "(" +
                 "true, " +
                 "999999999, " +
@@ -1159,7 +1196,7 @@ public void testSortByAllTypes()
                 "TIMESTAMP '2099-12-31 23:59:59.000000', " +
                 "TIMESTAMP '2099-12-31 23:59:59.000000 UTC', " +
                 "UUID 'FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF', " +
-                "ROW(999, 'zzzzzzzz'), " +
+                "CAST(ROW(999, 'zzzzzzzz', TIME '23:59:59.999999', TIMESTAMP '2099-12-31 23:59:59.000000', TIMESTAMP '2099-12-31 23:59:59.000000 UTC') AS row(id integer, vc varchar, t time(6), ts timestamp(6), tstz timestamp(6) with time zone)), " +
                 "ARRAY['zzzz', 'zzzz'], " +
                 "MAP(ARRAY[999], ARRAY['zzzz']))";
         String lowValues = "(" +
@@ -1177,11 +1214,22 @@ public void testSortByAllTypes()
                 "TIMESTAMP '2000-01-01 00:00:00.000000', " +
                 "TIMESTAMP '2000-01-01 00:00:00.000000 UTC', " +
                 "UUID '00000000-0000-0000-0000-000000000000', " +
-                "ROW(0, ''), " +
+                "CAST(ROW(0, '', TIME '00:00:00.000000', TIMESTAMP '2000-01-01 00:00:00.000000', TIMESTAMP '2000-01-01 00:00:00.000000 UTC') AS row(id integer, vc varchar, t time(6), ts timestamp(6), tstz timestamp(6) with time zone)), " +
                 "ARRAY['', ''], " +
                 "MAP(ARRAY[0], ARRAY['']))";
 
         assertUpdate("INSERT INTO " + tableName + " VALUES " + values + ", " + highValues + ", " + lowValues, 3);
+        assertThat(query("TABLE " + tableName))
+                .matches("VALUES " + values + ", " + highValues + ", " + lowValues);
+
+        // Insert "large" number of rows, supposedly topping over iceberg.writer-sort-buffer-size so that temporary files are utilized by the sorting writer.
+        assertUpdate("""
+                INSERT INTO %s
+                SELECT v.*
+                FROM (VALUES %s, %s, %s) v
+                CROSS JOIN UNNEST (sequence(1, 10_000)) a(i)
+                """.formatted(tableName, values, highValues, lowValues), 30000);
+
         dropTable(tableName);
     }
 
@@ -1299,7 +1347,8 @@ public void testOptimizeWithSortOrder()
             assertUpdate("INSERT INTO " + table.getName() + " SELECT * FROM nation WHERE nationkey >= 10 AND nationkey < 20", 10);
             assertUpdate("INSERT INTO " + table.getName() + " SELECT * FROM nation WHERE nationkey >= 20", 5);
             assertUpdate("ALTER TABLE " + table.getName() + " SET PROPERTIES sorted_by = ARRAY['comment']");
-            assertUpdate(withSmallRowGroups, "ALTER TABLE " + table.getName() + " EXECUTE optimize");
+            // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
+            assertUpdate(withSingleWriterPerTask(withSmallRowGroups), "ALTER TABLE " + table.getName() + " EXECUTE optimize");
 
             for (Object filePath : computeActual("SELECT file_path from \"" + table.getName() + "$files\"").getOnlyColumnAsSet()) {
                 assertTrue(isFileSorted((String) filePath, "comment"));
@@ -1317,6 +1366,7 @@ public void testUpdateWithSortOrder()
                 "test_sorted_update",
                 "WITH (sorted_by = ARRAY['comment']) AS TABLE tpch.tiny.lineitem WITH NO DATA")) {
             assertUpdate(
+                    withSmallRowGroups,
                     "INSERT INTO " + table.getName() + " TABLE tpch.tiny.lineitem",
                     "VALUES 60175");
             assertUpdate(withSmallRowGroups, "UPDATE " + table.getName() + " SET comment = substring(comment, 2)", 60175);
@@ -1444,19 +1494,6 @@ protected String errorMessageForInsertIntoNotNullColumn(String columnName)
         return "NULL value not allowed for NOT NULL column: " + columnName;
     }
 
-    @Override
-    public void testAddNotNullColumnToNonEmptyTable()
-    {
-        // Override because the connector supports both ADD COLUMN and NOT NULL constraint, but it doesn't support adding NOT NULL columns
-        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_notnull_col", "(a_varchar varchar)")) {
-            String tableName = table.getName();
-
-            assertQueryFails(
-                    "ALTER TABLE " + tableName + " ADD COLUMN b_varchar varchar NOT NULL",
-                    "This connector does not support adding not null columns");
-        }
-    }
-
     @Test
     public void testSchemaEvolution()
     {
@@ -1923,8 +1960,8 @@ public void testPartitionPredicatePushdownWithHistoricalPartitionSpecs()
 
         @Language("SQL") String initialValues =
                 "(TIMESTAMP '1969-12-31 22:22:22.222222', 8)," +
-                "(TIMESTAMP '1969-12-31 23:33:11.456789', 9)," +
-                "(TIMESTAMP '1969-12-31 23:44:55.567890', 10)";
+                        "(TIMESTAMP '1969-12-31 23:33:11.456789', 9)," +
+                        "(TIMESTAMP '1969-12-31 23:44:55.567890', 10)";
         assertUpdate("INSERT INTO " + tableName + " VALUES " + initialValues, 3);
         assertThat(query(selectQuery))
                 .containsAll("VALUES 8, 9, 10")
@@ -1932,8 +1969,8 @@ public void testPartitionPredicatePushdownWithHistoricalPartitionSpecs()
 
         @Language("SQL") String hourTransformValues =
                 "(TIMESTAMP '2015-01-01 10:01:23.123456', 1)," +
-                "(TIMESTAMP '2015-01-02 10:10:02.987654', 2)," +
-                "(TIMESTAMP '2015-01-03 10:55:00.456789', 3)";
+                        "(TIMESTAMP '2015-01-02 10:10:02.987654', 2)," +
+                        "(TIMESTAMP '2015-01-03 10:55:00.456789', 3)";
         // While the bucket transform is still used the hour transform still cannot be used for pushdown
         assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES partitioning = ARRAY['hour(d)']");
         assertUpdate("INSERT INTO " + tableName + " VALUES " + hourTransformValues, 3);
@@ -1943,6 +1980,7 @@ public void testPartitionPredicatePushdownWithHistoricalPartitionSpecs()
 
         // The old partition scheme is no longer used so pushdown using the hour transform is allowed
         assertUpdate("DELETE FROM " + tableName + " WHERE year(d) = 1969", 3);
+        assertUpdate("ALTER TABLE " + tableName + " EXECUTE optimize");
         assertUpdate("INSERT INTO " + tableName + " VALUES " + initialValues, 3);
         assertThat(query(selectQuery))
                 .containsAll("VALUES 1, 8, 9, 10")
@@ -3140,7 +3178,7 @@ public void testTruncateDecimalTransform()
         assertQuery("SELECT b FROM test_truncate_decimal_transform WHERE d = -0.05", "VALUES 5");
         assertQuery(
                 select + " WHERE partition.d_trunc = -0.10",
-                 format == AVRO ? "VALUES (-0.10, 1, NULL, NULL, NULL, NULL)" : "VALUES (-0.10, 1, -0.05, -0.05, 5, 5)");
+                format == AVRO ? "VALUES (-0.10, 1, NULL, NULL, NULL, NULL)" : "VALUES (-0.10, 1, -0.05, -0.05, 5, 5)");
 
         // Exercise IcebergMetadata.applyFilter with non-empty Constraint.predicate, via non-pushdownable predicates
         assertQuery(
@@ -3911,7 +3949,7 @@ public void testCreateNestedPartitionedTable()
                 ", vb VARBINARY" +
                 ", ts TIMESTAMP(6)" +
                 ", tstz TIMESTAMP(6) WITH TIME ZONE" +
-                ", str ROW(id INTEGER , vc VARCHAR)" +
+                ", str ROW(id INTEGER, vc VARCHAR)" +
                 ", dt DATE)" +
                 " WITH (partitioning = ARRAY['int'])");
 
@@ -4055,7 +4093,7 @@ public void testSerializableReadIsolation()
 
     private void withTransaction(Consumer<Session> consumer)
     {
-        transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getAccessControl())
+        transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getMetadata(), getQueryRunner().getAccessControl())
                 .readCommitted()
                 .execute(getSession(), consumer);
     }
@@ -4117,7 +4155,7 @@ public void testFileSizeInManifest()
             Long fileSizeInBytes = (Long) row.getField(2);
 
             totalRecordCount += recordCount;
-            assertThat(fileSizeInBytes).isEqualTo(Files.size(Paths.get(path)));
+            assertThat(fileSizeInBytes).isEqualTo(fileSize(path));
         }
         // Verify sum(record_count) to make sure we have all the files.
         assertThat(totalRecordCount).isEqualTo(2);
@@ -4139,7 +4177,7 @@ public void testIncorrectIcebergFileSizes()
         // Read manifest file
         Schema schema;
         GenericData.Record entry = null;
-        try (DataFileReader<GenericData.Record> dataFileReader = new DataFileReader<>(new File(manifestFile), new GenericDatumReader<>())) {
+        try (DataFileReader<GenericData.Record> dataFileReader = readManifestFile(manifestFile)) {
             schema = dataFileReader.getSchema();
             int recordCount = 0;
             while (dataFileReader.hasNext()) {
@@ -4155,13 +4193,8 @@ public void testIncorrectIcebergFileSizes()
         assertNotEquals(dataFile.get("file_size_in_bytes"), alteredValue);
         dataFile.put("file_size_in_bytes", alteredValue);
 
-        // Replace the file through HDFS client. This is required for correct checksums.
-        HdfsContext context = new HdfsContext(getSession().toConnectorSession());
-        org.apache.hadoop.fs.Path manifestFilePath = new org.apache.hadoop.fs.Path(manifestFile);
-        FileSystem fs = HDFS_ENVIRONMENT.getFileSystem(context, manifestFilePath);
-
         // Write altered metadata
-        try (OutputStream out = fs.create(manifestFilePath);
+        try (OutputStream out = fileSystem.newOutputFile(Location.of(manifestFile)).createOrOverwrite();
                 DataFileWriter<GenericData.Record> dataFileWriter = new DataFileWriter<>(new GenericDatumWriter<>(schema))) {
             dataFileWriter.create(schema, out);
             dataFileWriter.append(entry);
@@ -4174,11 +4207,23 @@ public void testIncorrectIcebergFileSizes()
         assertQuery(session, "SELECT * FROM test_iceberg_file_size", "VALUES (123), (456), (758)");
 
         // Using Iceberg provided file size fails the query
-        assertQueryFails("SELECT * FROM test_iceberg_file_size", ".*Error opening Iceberg split.*\\QIncorrect file size (%d) for file (end of stream not reached)\\E.*".formatted(alteredValue));
+        assertQueryFails(
+                "SELECT * FROM test_iceberg_file_size",
+                "(Malformed ORC file\\. Invalid file metadata.*)|(.*Error opening Iceberg split.* Incorrect file size \\(%s\\) for file .*)".formatted(alteredValue));
 
         dropTable("test_iceberg_file_size");
     }
 
+    protected DataFileReader<GenericData.Record> readManifestFile(String location)
+            throws IOException
+    {
+        Path tempFile = getDistributedQueryRunner().getCoordinator().getBaseDataDir().resolve(randomUUID() + "-manifest-copy");
+        try (InputStream inputStream = fileSystem.newInputFile(Location.of(location)).newStream()) {
+            Files.copy(inputStream, tempFile);
+        }
+        return new DataFileReader<>(tempFile.toFile(), new GenericDatumReader<>());
+    }
+
     @Test
     public void testSplitPruningForFilterOnPartitionColumn()
     {
@@ -4224,7 +4269,7 @@ public void testAllAvailableTypes()
                 "  a_timestamp timestamp(6), " +
                 "  a_timestamptz timestamp(6) with time zone, " +
                 "  a_uuid uuid, " +
-                "  a_row row(id integer , vc varchar), " +
+                "  a_row row(id integer, vc varchar), " +
                 "  an_array array(varchar), " +
                 "  a_map map(integer, varchar) " +
                 ")");
@@ -4516,16 +4561,10 @@ public void testRepartitionDataOnInsert(Session session, String partitioning, in
     public Object[][] repartitioningDataProvider()
     {
         Session defaultSession = getSession();
-        // For identity-only partitioning, Iceberg connector returns ConnectorTableLayout with partitionColumns set, but without partitioning.
-        // This is treated by engine as "preferred", but not mandatory partitioning, and gets ignored if stats suggest number of partitions
-        // written is low. Without partitioning, number of files created is nondeterministic, as a writer (worker node) may or may not receive data.
-        Session obeyConnectorPartitioning = Session.builder(defaultSession)
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "1")
-                .build();
 
         return new Object[][] {
                 // identity partitioning column
-                {obeyConnectorPartitioning, "'orderstatus'", 3},
+                {defaultSession, "'orderstatus'", 3},
                 // bucketing
                 {defaultSession, "'bucket(custkey, 13)'", 13},
                 // varchar-based
@@ -4551,31 +4590,38 @@ public void testStatsBasedRepartitionDataOnInsert()
 
     private void testStatsBasedRepartitionData(boolean ctas)
     {
-        Session sessionRepartitionSmall = Session.builder(getSession())
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "2")
-                .build();
-        Session sessionRepartitionMany = Session.builder(getSession())
-                .setSystemProperty(PREFERRED_WRITE_PARTITIONING_MIN_NUMBER_OF_PARTITIONS, "5")
-                .setSystemProperty(SCALE_WRITERS, "false")
-                .build();
-        // Use DISTINCT to add data redistribution between source table and the writer. This makes it more likely that all writers get some data.
-        String sourceRelation = "(SELECT DISTINCT orderkey, custkey, orderstatus FROM tpch.tiny.orders)";
-        testRepartitionData(
-                sessionRepartitionSmall,
-                sourceRelation,
-                ctas,
-                "'orderstatus'",
-                3);
-        // Test uses relatively small table (60K rows). When engine doesn't redistribute data for writes,
-        // occasionally a worker node doesn't get any data and fewer files get created.
-        assertEventually(new Duration(3, MINUTES), () -> {
+        String catalog = getSession().getCatalog().orElseThrow();
+        try (TestTable sourceTable = new TestTable(
+                sql -> assertQuerySucceeds(
+                        Session.builder(getSession())
+                                .setCatalogSessionProperty(catalog, COLLECT_EXTENDED_STATISTICS_ON_WRITE, "true")
+                                .build(),
+                        sql),
+                "temp_table_analyzed",
+                "AS SELECT orderkey, custkey, orderstatus FROM tpch.\"sf0.03\".orders")) {
+            Session sessionRepartitionMany = Session.builder(getSession())
+                    .setSystemProperty(SCALE_WRITERS, "false")
+                    .setSystemProperty(USE_PREFERRED_WRITE_PARTITIONING, "false")
+                    .build();
+            // Use DISTINCT to add data redistribution between source table and the writer. This makes it more likely that all writers get some data.
+            String sourceRelation = "(SELECT DISTINCT orderkey, custkey, orderstatus FROM " + sourceTable.getName() + ")";
             testRepartitionData(
-                    sessionRepartitionMany,
+                    getSession(),
                     sourceRelation,
                     ctas,
                     "'orderstatus'",
-                    9);
-        });
+                    3);
+            // Test uses relatively small table (45K rows). When engine doesn't redistribute data for writes,
+            // occasionally a worker node doesn't get any data and fewer files get created.
+            assertEventually(new Duration(3, MINUTES), () -> {
+                testRepartitionData(
+                        sessionRepartitionMany,
+                        sourceRelation,
+                        ctas,
+                        "'orderstatus'",
+                        9);
+            });
+        }
     }
 
     private void testRepartitionData(Session session, String sourceRelation, boolean ctas, String partitioning, int expectedFiles)
@@ -4642,7 +4688,7 @@ public void testSplitPruningForFilterOnNonPartitionColumn(DataMappingTestSetup t
             verifySplitCount("SELECT row_id FROM " + tableName + " WHERE col > " + sampleValue,
                     (format == ORC && testSetup.getTrinoTypeName().contains("timestamp") ? 2 : expectedSplitCount));
             verifySplitCount("SELECT row_id FROM " + tableName + " WHERE col < " + highValue,
-                    (format == ORC && testSetup.getTrinoTypeName().contains("timestamp") ? 2 : expectedSplitCount));
+                    (format == ORC && testSetup.getTrinoTypeName().contains("timestamp(6)") ? 2 : expectedSplitCount));
         }
     }
 
@@ -4659,7 +4705,7 @@ protected void verifyIcebergTableProperties(MaterializedResult actual)
         assertThat(actual).isNotNull();
         MaterializedResult expected = resultBuilder(getSession())
                 .row("write.format.default", format.name())
-                .build();
+                .row("write.parquet.compression-codec", "zstd").build();
         assertEqualsIgnoreOrder(actual.getMaterializedRows(), expected.getMaterializedRows());
     }
 
@@ -4773,14 +4819,6 @@ protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMapp
             // These types are not supported by Iceberg
             return Optional.of(dataMappingTestSetup.asUnsupported());
         }
-
-        // According to Iceberg specification all time and timestamp values are stored with microsecond precision.
-        if (typeName.equals("time") ||
-                typeName.equals("timestamp") ||
-                typeName.equals("timestamp(3) with time zone")) {
-            return Optional.of(dataMappingTestSetup.asUnsupported());
-        }
-
         return Optional.of(dataMappingTestSetup);
     }
 
@@ -4815,51 +4853,23 @@ public void testAmbiguousColumnsWithDots()
     public void testSchemaEvolutionWithDereferenceProjections()
     {
         // Fields are identified uniquely based on unique id's. If a column is dropped and recreated with the same name it should not return dropped data.
-        assertUpdate("CREATE TABLE evolve_test (dummy BIGINT, a row(b BIGINT, c VARCHAR))");
-        assertUpdate("INSERT INTO evolve_test VALUES (1, ROW(1, 'abc'))", 1);
-        assertUpdate("ALTER TABLE evolve_test DROP COLUMN a");
-        assertUpdate("ALTER TABLE evolve_test ADD COLUMN a ROW(b VARCHAR, c BIGINT)");
-        assertQuery("SELECT a.b FROM evolve_test", "VALUES NULL");
-        assertUpdate("DROP TABLE evolve_test");
+        String tableName = "evolve_test_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (dummy BIGINT, a row(b BIGINT, c VARCHAR))");
+        assertUpdate("INSERT INTO " + tableName + " VALUES (1, ROW(1, 'abc'))", 1);
+        assertUpdate("ALTER TABLE " + tableName + " DROP COLUMN a");
+        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN a ROW(b VARCHAR, c BIGINT)");
+        assertQuery("SELECT a.b FROM " + tableName, "VALUES NULL");
+        assertUpdate("DROP TABLE " + tableName);
 
         // Very changing subfield ordering does not revive dropped data
-        assertUpdate("CREATE TABLE evolve_test (dummy BIGINT, a ROW(b BIGINT, c VARCHAR), d BIGINT) with (partitioning = ARRAY['d'])");
-        assertUpdate("INSERT INTO evolve_test VALUES (1, ROW(2, 'abc'), 3)", 1);
-        assertUpdate("ALTER TABLE evolve_test DROP COLUMN a");
-        assertUpdate("ALTER TABLE evolve_test ADD COLUMN a ROW(c VARCHAR, b BIGINT)");
-        assertUpdate("INSERT INTO evolve_test VALUES (4, 5, ROW('def', 6))", 1);
-        assertQuery("SELECT a.b FROM evolve_test WHERE d = 3", "VALUES NULL");
-        assertQuery("SELECT a.b FROM evolve_test WHERE d = 5", "VALUES 6");
-        assertUpdate("DROP TABLE evolve_test");
-    }
-
-    @Test
-    public void testHighlyNestedData()
-    {
-        assertUpdate("CREATE TABLE nested_data (id INT, row_t ROW(f1 INT, f2 INT, row_t ROW (f1 INT, f2 INT, row_t ROW(f1 INT, f2 INT))))");
-        assertUpdate("INSERT INTO nested_data VALUES (1, ROW(2, 3, ROW(4, 5, ROW(6, 7)))), (11, ROW(12, 13, ROW(14, 15, ROW(16, 17))))", 2);
-        assertUpdate("INSERT INTO nested_data VALUES (21, ROW(22, 23, ROW(24, 25, ROW(26, 27))))", 1);
-
-        // Test select projected columns, with and without their parent column
-        assertQuery("SELECT id, row_t.row_t.row_t.f2 FROM nested_data", "VALUES (1, 7), (11, 17), (21, 27)");
-        assertQuery("SELECT id, row_t.row_t.row_t.f2, CAST(row_t AS JSON) FROM nested_data",
-                "VALUES (1, 7, '{\"f1\":2,\"f2\":3,\"row_t\":{\"f1\":4,\"f2\":5,\"row_t\":{\"f1\":6,\"f2\":7}}}'), " +
-                        "(11, 17, '{\"f1\":12,\"f2\":13,\"row_t\":{\"f1\":14,\"f2\":15,\"row_t\":{\"f1\":16,\"f2\":17}}}'), " +
-                        "(21, 27, '{\"f1\":22,\"f2\":23,\"row_t\":{\"f1\":24,\"f2\":25,\"row_t\":{\"f1\":26,\"f2\":27}}}')");
-
-        // Test predicates on immediate child column and deeper nested column
-        assertQuery("SELECT id, CAST(row_t.row_t.row_t AS JSON) FROM nested_data WHERE row_t.row_t.row_t.f2 = 27", "VALUES (21, '{\"f1\":26,\"f2\":27}')");
-        assertQuery("SELECT id, CAST(row_t.row_t.row_t AS JSON) FROM nested_data WHERE row_t.row_t.row_t.f2 > 20", "VALUES (21, '{\"f1\":26,\"f2\":27}')");
-        assertQuery("SELECT id, CAST(row_t AS JSON) FROM nested_data WHERE row_t.row_t.row_t.f2 = 27",
-                "VALUES (21, '{\"f1\":22,\"f2\":23,\"row_t\":{\"f1\":24,\"f2\":25,\"row_t\":{\"f1\":26,\"f2\":27}}}')");
-        assertQuery("SELECT id, CAST(row_t AS JSON) FROM nested_data WHERE row_t.row_t.row_t.f2 > 20",
-                "VALUES (21, '{\"f1\":22,\"f2\":23,\"row_t\":{\"f1\":24,\"f2\":25,\"row_t\":{\"f1\":26,\"f2\":27}}}')");
-
-        // Test predicates on parent columns
-        assertQuery("SELECT id, row_t.row_t.row_t.f1 FROM nested_data WHERE row_t.row_t.row_t = ROW(16, 17)", "VALUES (11, 16)");
-        assertQuery("SELECT id, row_t.row_t.row_t.f1 FROM nested_data WHERE row_t = ROW(22, 23, ROW(24, 25, ROW(26, 27)))", "VALUES (21, 26)");
-
-        assertUpdate("DROP TABLE IF EXISTS nested_data");
+        assertUpdate("CREATE TABLE " + tableName + " (dummy BIGINT, a ROW(b BIGINT, c VARCHAR), d BIGINT) with (partitioning = ARRAY['d'])");
+        assertUpdate("INSERT INTO " + tableName + " VALUES (1, ROW(2, 'abc'), 3)", 1);
+        assertUpdate("ALTER TABLE " + tableName + " DROP COLUMN a");
+        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN a ROW(c VARCHAR, b BIGINT)");
+        assertUpdate("INSERT INTO " + tableName + " VALUES (4, 5, ROW('def', 6))", 1);
+        assertQuery("SELECT a.b FROM " + tableName + " WHERE d = 3", "VALUES NULL");
+        assertQuery("SELECT a.b FROM " + tableName + " WHERE d = 5", "VALUES 6");
+        assertUpdate("DROP TABLE " + tableName);
     }
 
     @Test
@@ -4877,51 +4887,6 @@ public void testProjectionPushdownAfterRename()
         assertUpdate("DROP TABLE IF EXISTS projection_pushdown_after_rename");
     }
 
-    @Test
-    public void testProjectionWithCaseSensitiveField()
-    {
-        assertUpdate("CREATE TABLE projection_with_case_sensitive_field (id INT, a ROW(\"UPPER_CASE\" INT, \"lower_case\" INT, \"MiXeD_cAsE\" INT))");
-        assertUpdate("INSERT INTO projection_with_case_sensitive_field VALUES (1, ROW(2, 3, 4)), (5, ROW(6, 7, 8))", 2);
-
-        String expected = "VALUES (2, 3, 4), (6, 7, 8)";
-        assertQuery("SELECT a.UPPER_CASE, a.lower_case, a.MiXeD_cAsE FROM projection_with_case_sensitive_field", expected);
-        assertQuery("SELECT a.upper_case, a.lower_case, a.mixed_case FROM projection_with_case_sensitive_field", expected);
-        assertQuery("SELECT a.UPPER_CASE, a.LOWER_CASE, a.MIXED_CASE FROM projection_with_case_sensitive_field", expected);
-
-        assertUpdate("DROP TABLE IF EXISTS projection_with_case_sensitive_field");
-    }
-
-    @Test
-    public void testProjectionPushdownReadsLessData()
-    {
-        String largeVarchar = "ZZZ".repeat(1000);
-        assertUpdate("CREATE TABLE projection_pushdown_reads_less_data (id INT, a ROW(b VARCHAR, c INT))");
-        assertUpdate(
-                format("INSERT INTO projection_pushdown_reads_less_data VALUES (1, ROW('%s', 3)), (11, ROW('%1$s', 13)), (21, ROW('%1$s', 23)), (31, ROW('%1$s', 33))", largeVarchar),
-                4);
-
-        String selectQuery = "SELECT a.c FROM projection_pushdown_reads_less_data";
-        Set<Integer> expected = ImmutableSet.of(3, 13, 23, 33);
-        Session sessionWithoutPushdown = Session.builder(getSession())
-                .setCatalogSessionProperty(ICEBERG_CATALOG, "projection_pushdown_enabled", "false")
-                .build();
-
-        assertQueryStats(
-                getSession(),
-                selectQuery,
-                statsWithPushdown -> {
-                    DataSize processedDataSizeWithPushdown = statsWithPushdown.getProcessedInputDataSize();
-                    assertQueryStats(
-                            sessionWithoutPushdown,
-                            selectQuery,
-                            statsWithoutPushdown -> assertThat(statsWithoutPushdown.getProcessedInputDataSize()).isGreaterThan(processedDataSizeWithPushdown),
-                            results -> assertEquals(results.getOnlyColumnAsSet(), expected));
-                },
-                results -> assertEquals(results.getOnlyColumnAsSet(), expected));
-
-        assertUpdate("DROP TABLE IF EXISTS projection_pushdown_reads_less_data");
-    }
-
     @Test
     public void testProjectionPushdownOnPartitionedTables()
     {
@@ -4964,7 +4929,7 @@ public void testOptimize(int formatVersion)
         int workerCount = getQueryRunner().getNodeCount();
 
         // optimize an empty table
-        assertQuerySucceeds("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
+        assertQuerySucceeds(withSingleWriterPerTask(getSession()), "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
         assertThat(getActiveFiles(tableName)).isEmpty();
 
         assertUpdate("INSERT INTO " + tableName + " VALUES (11, 'eleven')", 1);
@@ -4979,7 +4944,8 @@ public void testOptimize(int formatVersion)
                 // Verify we have sufficiently many test rows with respect to worker count.
                 .hasSizeGreaterThan(workerCount);
 
-        computeActual("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
+        // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
+        computeActual(withSingleWriterPerTask(getSession()), "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
         assertThat(query("SELECT sum(key), listagg(value, ' ') WITHIN GROUP (ORDER BY key) FROM " + tableName))
                 .matches("VALUES (BIGINT '65', VARCHAR 'eleven zwölf trzynaście quatorze пʼятнадцять')");
         List<String> updatedFiles = getActiveFiles(tableName);
@@ -4991,7 +4957,8 @@ public void testOptimize(int formatVersion)
                 .containsExactlyInAnyOrderElementsOf(concat(initialFiles, updatedFiles));
 
         // optimize with low retention threshold, nothing should change
-        computeActual("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE (file_size_threshold => '33B')");
+        // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
+        computeActual(withSingleWriterPerTask(getSession()), "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE (file_size_threshold => '33B')");
         assertThat(query("SELECT sum(key), listagg(value, ' ') WITHIN GROUP (ORDER BY key) FROM " + tableName))
                 .matches("VALUES (BIGINT '65', VARCHAR 'eleven zwölf trzynaście quatorze пʼятнадцять')");
         assertThat(getActiveFiles(tableName)).isEqualTo(updatedFiles);
@@ -5017,12 +4984,11 @@ public void testOptimizeForPartitionedTable(int formatVersion)
                 .setCatalog(getQueryRunner().getDefaultSession().getCatalog())
                 .setSchema(getQueryRunner().getDefaultSession().getSchema())
                 .setSystemProperty("use_preferred_write_partitioning", "true")
-                .setSystemProperty("preferred_write_partitioning_min_number_of_partitions", "100")
                 .build();
         String tableName = "test_repartitiong_during_optimize_" + randomNameSuffix();
         assertUpdate(session, "CREATE TABLE " + tableName + " (key varchar, value integer) WITH (format_version = " + formatVersion + ", partitioning = ARRAY['key'])");
         // optimize an empty table
-        assertQuerySucceeds(session, "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
+        assertQuerySucceeds(withSingleWriterPerTask(session), "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
 
         assertUpdate(session, "INSERT INTO " + tableName + " VALUES ('one', 1)", 1);
         assertUpdate(session, "INSERT INTO " + tableName + " VALUES ('one', 2)", 1);
@@ -5038,7 +5004,8 @@ public void testOptimizeForPartitionedTable(int formatVersion)
         List<String> initialFiles = getActiveFiles(tableName);
         assertThat(initialFiles).hasSize(10);
 
-        computeActual(session, "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
+        // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
+        computeActual(withSingleWriterPerTask(session), "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
 
         assertThat(query(session, "SELECT sum(value), listagg(key, ' ') WITHIN GROUP (ORDER BY key) FROM " + tableName))
                 .matches("VALUES (BIGINT '55', VARCHAR 'one one one one one one one three two two')");
@@ -5097,10 +5064,11 @@ public void testOptimizeTimePartitionedTable(String dataType, String partitionin
                 .isGreaterThanOrEqualTo(5);
 
         assertUpdate(
+                // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
                 // Use UTC zone so that DATE and TIMESTAMP WITH TIME ZONE comparisons align with partition boundaries.
-                Session.builder(getSession())
+                withSingleWriterPerTask(Session.builder(getSession())
                         .setTimeZoneKey(UTC_KEY)
-                        .build(),
+                        .build()),
                 "ALTER TABLE " + tableName + " EXECUTE optimize WHERE p >= " + optimizeDate);
 
         assertThat((long) computeScalar("SELECT count(DISTINCT \"$path\") FROM " + tableName + " WHERE p < " + optimizeDate))
@@ -5112,9 +5080,10 @@ public void testOptimizeTimePartitionedTable(String dataType, String partitionin
 
         // Verify that WHERE CAST(p AS date) ... form works in non-UTC zone
         assertUpdate(
-                Session.builder(getSession())
+                // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
+                withSingleWriterPerTask(Session.builder(getSession())
                         .setTimeZoneKey(getTimeZoneKey("Asia/Kathmandu"))
-                        .build(),
+                        .build()),
                 "ALTER TABLE " + tableName + " EXECUTE optimize WHERE CAST(p AS date) >= " + optimizeDate);
 
         // Table state shouldn't change substantially (but files may be rewritten)
@@ -5157,7 +5126,8 @@ public void testOptimizeTableAfterDeleteWithFormatVersion2()
                 "SELECT summary['total-delete-files'] FROM \"" + tableName + "$snapshots\" WHERE snapshot_id = " + getCurrentSnapshotId(tableName),
                 "VALUES '1'");
 
-        computeActual("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
+        // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
+        computeActual(withSingleWriterPerTask(getSession()), "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
 
         List<String> updatedFiles = getActiveFiles(tableName);
         assertThat(updatedFiles)
@@ -5190,7 +5160,8 @@ public void testOptimizeCleansUpDeleteFiles()
         List<String> allDataFilesAfterDelete = getAllDataFilesFromTableDirectory(tableName);
         assertThat(allDataFilesAfterDelete).hasSize(6);
 
-        computeActual("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE WHERE regionkey = 4");
+        // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
+        computeActual(withSingleWriterPerTask(getSession()), "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE WHERE regionkey = 4");
         computeActual(sessionWithShortRetentionUnlocked, "ALTER TABLE " + tableName + " EXECUTE EXPIRE_SNAPSHOTS (retention_threshold => '0s')");
         computeActual(sessionWithShortRetentionUnlocked, "ALTER TABLE " + tableName + " EXECUTE REMOVE_ORPHAN_FILES (retention_threshold => '0s')");
 
@@ -5206,7 +5177,8 @@ public void testOptimizeCleansUpDeleteFiles()
         assertThat(query("SELECT * FROM " + tableName))
                 .matches("SELECT * FROM nation WHERE nationkey != 7");
 
-        computeActual("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
+        // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
+        computeActual(withSingleWriterPerTask(getSession()), "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
         computeActual(sessionWithShortRetentionUnlocked, "ALTER TABLE " + tableName + " EXECUTE EXPIRE_SNAPSHOTS (retention_threshold => '0s')");
         computeActual(sessionWithShortRetentionUnlocked, "ALTER TABLE " + tableName + " EXECUTE REMOVE_ORPHAN_FILES (retention_threshold => '0s')");
 
@@ -5268,17 +5240,10 @@ protected String getTableLocation(String tableName)
         throw new IllegalStateException("Location not found in SHOW CREATE TABLE result");
     }
 
-    private List<String> getAllDataFilesFromTableDirectory(String tableName)
+    protected List<String> getAllDataFilesFromTableDirectory(String tableName)
             throws IOException
     {
-        Path tableDataDir = getIcebergTableDataPath(getTableLocation(tableName));
-        try (Stream<Path> walk = Files.walk(tableDataDir)) {
-            return walk
-                    .filter(Files::isRegularFile)
-                    .filter(path -> !path.getFileName().toString().matches("\\..*\\.crc"))
-                    .map(Path::toString)
-                    .collect(toImmutableList());
-        }
+        return listFiles(getIcebergTableDataPath(getTableLocation(tableName)));
     }
 
     @Test
@@ -5302,7 +5267,7 @@ public void testTargetMaxFileSize()
         @Language("SQL") String createTableSql = format("CREATE TABLE %s AS SELECT * FROM tpch.sf1.lineitem LIMIT 100000", tableName);
 
         Session session = Session.builder(getSession())
-                .setSystemProperty("task_writer_count", "1")
+                .setSystemProperty("task_min_writer_count", "1")
                 // task scale writers should be disabled since we want to write with a single task writer
                 .setSystemProperty("task_scale_writers_enabled", "false")
                 .build();
@@ -5313,7 +5278,7 @@ public void testTargetMaxFileSize()
 
         DataSize maxSize = DataSize.of(40, DataSize.Unit.KILOBYTE);
         session = Session.builder(getSession())
-                .setSystemProperty("task_writer_count", "1")
+                .setSystemProperty("task_min_writer_count", "1")
                 // task scale writers should be disabled since we want to write with a single task writer
                 .setSystemProperty("task_scale_writers_enabled", "false")
                 .setCatalogSessionProperty("iceberg", "target_max_file_size", maxSize.toString())
@@ -5331,6 +5296,42 @@ public void testTargetMaxFileSize()
                 .forEach(row -> assertThat((Long) row.getField(0)).isBetween(1L, maxSize.toBytes() * 6));
     }
 
+    @Test
+    public void testTargetMaxFileSizeOnSortedTable()
+    {
+        String tableName = "test_default_max_file_size_sorted_" + randomNameSuffix();
+        @Language("SQL") String createTableSql = format("CREATE TABLE %s WITH (sorted_by = ARRAY['shipdate']) AS SELECT * FROM tpch.sf1.lineitem LIMIT 100000", tableName);
+
+        Session session = Session.builder(getSession())
+                .setSystemProperty("task_min_writer_count", "1")
+                // task scale writers should be disabled since we want to write with a single task writer
+                .setSystemProperty("task_scale_writers_enabled", "false")
+                .build();
+        assertUpdate(session, createTableSql, 100000);
+        List<String> initialFiles = getActiveFiles(tableName);
+        assertThat(initialFiles.size()).isLessThanOrEqualTo(3);
+        assertUpdate(format("DROP TABLE %s", tableName));
+
+        DataSize maxSize = DataSize.of(40, DataSize.Unit.KILOBYTE);
+        session = Session.builder(getSession())
+                .setSystemProperty("task_min_writer_count", "1")
+                // task scale writers should be disabled since we want to write with a single task writer
+                .setSystemProperty("task_scale_writers_enabled", "false")
+                .setCatalogSessionProperty("iceberg", "target_max_file_size", maxSize.toString())
+                .build();
+
+        assertUpdate(session, createTableSql, 100000);
+        assertThat(query(format("SELECT count(*) FROM %s", tableName))).matches("VALUES BIGINT '100000'");
+        List<String> updatedFiles = getActiveFiles(tableName);
+        assertThat(updatedFiles.size()).isGreaterThan(5);
+
+        computeActual(format("SELECT file_size_in_bytes FROM \"%s$files\"", tableName))
+                .getMaterializedRows()
+                // as target_max_file_size is set to quite low value it can happen that created files are bigger,
+                // so just to be safe we check if it is not much bigger
+                .forEach(row -> assertThat((Long) row.getField(0)).isBetween(1L, maxSize.toBytes() * 20));
+    }
+
     @Test
     public void testDroppingIcebergAndCreatingANewTableWithTheSameNameShouldBePossible()
     {
@@ -5400,6 +5401,10 @@ public void testPathHiddenColumn()
                 .returnsEmptyResult()
                 .isFullyPushedDown();
 
+        assertQuerySucceeds("SHOW STATS FOR (SELECT userid FROM " + tableName + " WHERE \"$path\" = '" + somePath + "')");
+        // EXPLAIN triggers stats calculation and also rendering
+        assertQuerySucceeds("EXPLAIN SELECT userid FROM " + tableName + " WHERE \"$path\" = '" + somePath + "'");
+
         assertUpdate("DROP TABLE " + tableName);
     }
 
@@ -5417,13 +5422,14 @@ public void testOptimizeWithPathColumn()
         String firstPath = (String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 1");
         String secondPath = (String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 2");
         String thirdPath = (String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 3");
-        String forthPath = (String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 4");
+        String fourthPath = (String) computeScalar("SELECT \"$path\" FROM " + tableName + " WHERE id = 4");
 
         List<String> initialFiles = getActiveFiles(tableName);
         assertThat(initialFiles).hasSize(4);
 
-        assertQuerySucceeds("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE WHERE \"$path\" = '" + firstPath + "' OR \"$path\" = '" + secondPath + "'");
-        assertQuerySucceeds("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE WHERE \"$path\" = '" + thirdPath + "' OR \"$path\" = '" + forthPath + "'");
+        // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
+        assertQuerySucceeds(withSingleWriterPerTask(getSession()), "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE WHERE \"$path\" = '" + firstPath + "' OR \"$path\" = '" + secondPath + "'");
+        assertQuerySucceeds(withSingleWriterPerTask(getSession()), "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE WHERE \"$path\" = '" + thirdPath + "' OR \"$path\" = '" + fourthPath + "'");
 
         List<String> updatedFiles = getActiveFiles(tableName);
         assertThat(updatedFiles)
@@ -5452,6 +5458,9 @@ public void testFileModifiedTimeHiddenColumn()
             throws Exception
     {
         ZonedDateTime beforeTime = (ZonedDateTime) computeScalar("SELECT current_timestamp(3)");
+        if (storageTimePrecision.toMillis(1) > 1) {
+            storageTimePrecision.sleep(1);
+        }
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_file_modified_time_", "(col) AS VALUES (1)")) {
             // Describe output should not have the $file_modified_time hidden column
             assertThat(query("DESCRIBE " + table.getName()))
@@ -5462,7 +5471,7 @@ public void testFileModifiedTimeHiddenColumn()
             ZonedDateTime afterTime = (ZonedDateTime) computeScalar("SELECT current_timestamp(3)");
             assertThat(fileModifiedTime).isBetween(beforeTime, afterTime);
 
-            Thread.sleep(1);
+            storageTimePrecision.sleep(1);
             assertUpdate("INSERT INTO " + table.getName() + " VALUES (2)", 1);
             ZonedDateTime anotherFileModifiedTime = (ZonedDateTime) computeScalar("SELECT max(\"$file_modified_time\") FROM " + table.getName());
             assertNotEquals(fileModifiedTime, anotherFileModifiedTime);
@@ -5483,6 +5492,10 @@ public void testFileModifiedTimeHiddenColumn()
             assertThat(query("SELECT col FROM " + table.getName() + " WHERE \"$file_modified_time\" IS NULL"))
                     .returnsEmptyResult()
                     .isFullyPushedDown();
+
+            assertQuerySucceeds("SHOW STATS FOR (SELECT col FROM " + table.getName() + " WHERE \"$file_modified_time\" = from_iso8601_timestamp('" + fileModifiedTime.format(ISO_OFFSET_DATE_TIME) + "'))");
+            // EXPLAIN triggers stats calculation and also rendering
+            assertQuerySucceeds("EXPLAIN SELECT col FROM " + table.getName() + " WHERE \"$file_modified_time\" = from_iso8601_timestamp('" + fileModifiedTime.format(ISO_OFFSET_DATE_TIME) + "')");
         }
     }
 
@@ -5494,27 +5507,32 @@ public void testOptimizeWithFileModifiedTimeColumn()
         assertUpdate("CREATE TABLE " + tableName + " (id integer)");
 
         assertUpdate("INSERT INTO " + tableName + " VALUES (1)", 1);
-        Thread.sleep(1);
+        storageTimePrecision.sleep(1);
         assertUpdate("INSERT INTO " + tableName + " VALUES (2)", 1);
-        Thread.sleep(1);
+        storageTimePrecision.sleep(1);
         assertUpdate("INSERT INTO " + tableName + " VALUES (3)", 1);
-        Thread.sleep(1);
+        storageTimePrecision.sleep(1);
         assertUpdate("INSERT INTO " + tableName + " VALUES (4)", 1);
 
         ZonedDateTime firstFileModifiedTime = (ZonedDateTime) computeScalar("SELECT \"$file_modified_time\" FROM " + tableName + " WHERE id = 1");
         ZonedDateTime secondFileModifiedTime = (ZonedDateTime) computeScalar("SELECT \"$file_modified_time\" FROM " + tableName + " WHERE id = 2");
         ZonedDateTime thirdFileModifiedTime = (ZonedDateTime) computeScalar("SELECT \"$file_modified_time\" FROM " + tableName + " WHERE id = 3");
-        ZonedDateTime forthFileModifiedTime = (ZonedDateTime) computeScalar("SELECT \"$file_modified_time\" FROM " + tableName + " WHERE id = 4");
+        ZonedDateTime fourthFileModifiedTime = (ZonedDateTime) computeScalar("SELECT \"$file_modified_time\" FROM " + tableName + " WHERE id = 4");
+        // Sanity check
+        assertThat(List.of(firstFileModifiedTime, secondFileModifiedTime, thirdFileModifiedTime, fourthFileModifiedTime))
+                .doesNotHaveDuplicates();
 
         List<String> initialFiles = getActiveFiles(tableName);
         assertThat(initialFiles).hasSize(4);
 
-        assertQuerySucceeds("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE WHERE " +
+        storageTimePrecision.sleep(1);
+        // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
+        assertQuerySucceeds(withSingleWriterPerTask(getSession()), "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE WHERE " +
                 "\"$file_modified_time\" = from_iso8601_timestamp('" + firstFileModifiedTime.format(ISO_OFFSET_DATE_TIME) + "') OR " +
                 "\"$file_modified_time\" = from_iso8601_timestamp('" + secondFileModifiedTime.format(ISO_OFFSET_DATE_TIME) + "')");
-        assertQuerySucceeds("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE WHERE " +
+        assertQuerySucceeds(withSingleWriterPerTask(getSession()), "ALTER TABLE " + tableName + " EXECUTE OPTIMIZE WHERE " +
                 "\"$file_modified_time\" = from_iso8601_timestamp('" + thirdFileModifiedTime.format(ISO_OFFSET_DATE_TIME) + "') OR " +
-                "\"$file_modified_time\" = from_iso8601_timestamp('" + forthFileModifiedTime.format(ISO_OFFSET_DATE_TIME) + "')");
+                "\"$file_modified_time\" = from_iso8601_timestamp('" + fourthFileModifiedTime.format(ISO_OFFSET_DATE_TIME) + "')");
 
         List<String> updatedFiles = getActiveFiles(tableName);
         assertThat(updatedFiles)
@@ -5526,10 +5544,11 @@ public void testOptimizeWithFileModifiedTimeColumn()
 
     @Test
     public void testDeleteWithFileModifiedTimeColumn()
+            throws Exception
     {
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_delete_with_file_modified_time_", "(key int)")) {
             assertUpdate("INSERT INTO " + table.getName() + " VALUES (1)", 1);
-            sleepUninterruptibly(1, MILLISECONDS);
+            storageTimePrecision.sleep(1);
             assertUpdate("INSERT INTO " + table.getName() + " VALUES (2)", 1);
 
             ZonedDateTime oldModifiedTime = (ZonedDateTime) computeScalar("SELECT \"$file_modified_time\" FROM " + table.getName() + " WHERE key = 1");
@@ -5559,7 +5578,7 @@ public void testExpireSnapshots()
                 .matches("VALUES (BIGINT '3', VARCHAR 'one two')");
         List<String> updatedFiles = getAllMetadataFilesFromTableDirectory(tableLocation);
         List<Long> updatedSnapshots = getSnapshotIds(tableName);
-        assertThat(updatedFiles.size()).isEqualTo(initialFiles.size() - 1);
+        assertThat(updatedFiles.size()).isEqualTo(initialFiles.size() - 2);
         assertThat(updatedSnapshots.size()).isLessThan(initialSnapshots.size());
         assertThat(updatedSnapshots.size()).isEqualTo(1);
         assertThat(initialSnapshots).containsAll(updatedSnapshots);
@@ -5653,15 +5672,17 @@ public void testRemoveOrphanFiles()
         assertUpdate("INSERT INTO " + tableName + " VALUES ('two', 2), ('three', 3)", 2);
         assertUpdate("DELETE FROM " + tableName + " WHERE key = 'two'", 1);
         String location = getTableLocation(tableName);
-        Path orphanFile = Files.createFile(Path.of(getIcebergTableDataPath(location).toString(), "invalidData." + format));
+        String orphanFile = getIcebergTableDataPath(location) + "/invalidData." + format;
+        createFile(orphanFile);
         List<String> initialDataFiles = getAllDataFilesFromTableDirectory(tableName);
+        assertThat(initialDataFiles).contains(orphanFile);
 
         assertQuerySucceeds(sessionWithShortRetentionUnlocked, "ALTER TABLE " + tableName + " EXECUTE REMOVE_ORPHAN_FILES (retention_threshold => '0s')");
         assertQuery("SELECT * FROM " + tableName, "VALUES ('one', 1), ('three', 3)");
 
         List<String> updatedDataFiles = getAllDataFilesFromTableDirectory(tableName);
         assertThat(updatedDataFiles.size()).isLessThan(initialDataFiles.size());
-        assertThat(updatedDataFiles).doesNotContain(orphanFile.toString());
+        assertThat(updatedDataFiles).doesNotContain(orphanFile);
     }
 
     @Test
@@ -5674,14 +5695,16 @@ public void testIfRemoveOrphanFilesCleansUnnecessaryDataFilesInPartitionedTable(
         assertUpdate("INSERT INTO " + tableName + " VALUES ('one', 1)", 1);
         assertUpdate("INSERT INTO " + tableName + " VALUES ('two', 2)", 1);
         String tableLocation = getTableLocation(tableName);
-        Path orphanFile = Files.createFile(Path.of(getIcebergTableDataPath(tableLocation) + "/key=one/", "invalidData." + format));
+        String orphanFile = getIcebergTableDataPath(tableLocation) + "/key=one/invalidData." + format;
+        createFile(orphanFile);
         List<String> initialDataFiles = getAllDataFilesFromTableDirectory(tableName);
+        assertThat(initialDataFiles).contains(orphanFile);
 
         assertQuerySucceeds(sessionWithShortRetentionUnlocked, "ALTER TABLE " + tableName + " EXECUTE REMOVE_ORPHAN_FILES (retention_threshold => '0s')");
 
         List<String> updatedDataFiles = getAllDataFilesFromTableDirectory(tableName);
         assertThat(updatedDataFiles.size()).isLessThan(initialDataFiles.size());
-        assertThat(updatedDataFiles).doesNotContain(orphanFile.toString());
+        assertThat(updatedDataFiles).doesNotContain(orphanFile);
     }
 
     @Test
@@ -5694,14 +5717,16 @@ public void testIfRemoveOrphanFilesCleansUnnecessaryMetadataFilesInPartitionedTa
         assertUpdate("INSERT INTO " + tableName + " VALUES ('one', 1)", 1);
         assertUpdate("INSERT INTO " + tableName + " VALUES ('two', 2)", 1);
         String tableLocation = getTableLocation(tableName);
-        Path orphanMetadataFile = Files.createFile(Path.of(getIcebergTableMetadataPath(tableLocation).toString(), "invalidData." + format));
+        String orphanMetadataFile = getIcebergTableMetadataPath(tableLocation) + "/invalidData." + format;
+        createFile(orphanMetadataFile);
         List<String> initialMetadataFiles = getAllMetadataFilesFromTableDirectory(tableLocation);
+        assertThat(initialMetadataFiles).contains(orphanMetadataFile);
 
         assertQuerySucceeds(sessionWithShortRetentionUnlocked, "ALTER TABLE " + tableName + " EXECUTE REMOVE_ORPHAN_FILES (retention_threshold => '0s')");
 
         List<String> updatedMetadataFiles = getAllMetadataFilesFromTableDirectory(tableLocation);
         assertThat(updatedMetadataFiles.size()).isLessThan(initialMetadataFiles.size());
-        assertThat(updatedMetadataFiles).doesNotContain(orphanMetadataFile.toString());
+        assertThat(updatedMetadataFiles).doesNotContain(orphanMetadataFile);
     }
 
     @Test
@@ -6038,8 +6063,8 @@ public void testInsertIntoBucketedColumnTaskWriterCount()
         int taskWriterCount = 4;
         assertThat(taskWriterCount).isGreaterThan(getQueryRunner().getNodeCount());
         Session session = Session.builder(getSession())
-                .setSystemProperty(TASK_WRITER_COUNT, String.valueOf(taskWriterCount))
-                .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, String.valueOf(taskWriterCount))
+                .setSystemProperty(TASK_MIN_WRITER_COUNT, String.valueOf(taskWriterCount))
+                .setSystemProperty(TASK_MAX_WRITER_COUNT, String.valueOf(taskWriterCount))
                 .build();
 
         String tableName = "test_inserting_into_bucketed_column_task_writer_count_" + randomNameSuffix();
@@ -6111,7 +6136,7 @@ public void testReadFromVersionedTableWithSchemaEvolutionDropColumn()
                 .hasOutputTypes(ImmutableList.of(VARCHAR, INTEGER, BOOLEAN))
                 .returnsEmptyResult();
 
-        assertUpdate("INSERT INTO " + tableName + " VALUES ('a', 1 , true)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES ('a', 1, true)", 1);
         long v2SnapshotId = getCurrentSnapshotId(tableName);
         assertThat(query("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v2SnapshotId))
                 .hasOutputTypes(ImmutableList.of(VARCHAR, INTEGER, BOOLEAN))
@@ -6243,6 +6268,109 @@ public void testDeleteRetainsTableHistory()
         assertUpdate("DROP TABLE " + tableName);
     }
 
+    @Test
+    public void testCreateOrReplaceTableSnapshots()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_create_or_replace_", " AS SELECT BIGINT '42' a, DOUBLE '-38.5' b")) {
+            long v1SnapshotId = getCurrentSnapshotId(table.getName());
+
+            assertUpdate("CREATE OR REPLACE TABLE " + table.getName() + " AS SELECT BIGINT '-42' a, DOUBLE '38.5' b", 1);
+            assertThat(query("SELECT CAST(a AS bigint), b FROM " + table.getName()))
+                    .matches("VALUES (BIGINT '-42', 385e-1)");
+
+            assertThat(query("SELECT a, b  FROM " + table.getName() + " FOR VERSION AS OF " + v1SnapshotId))
+                    .matches("VALUES (BIGINT '42', -385e-1)");
+        }
+    }
+
+    @Test
+    public void testCreateOrReplaceTableChangeColumnNamesAndTypes()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_create_or_replace_", " AS SELECT BIGINT '42' a, DOUBLE '-38.5' b")) {
+            long v1SnapshotId = getCurrentSnapshotId(table.getName());
+
+            assertUpdate("CREATE OR REPLACE TABLE " + table.getName() + " AS SELECT CAST(ARRAY[ROW('test')] AS ARRAY(ROW(field VARCHAR))) a, VARCHAR 'test2' b", 1);
+            assertThat(query("SELECT * FROM " + table.getName()))
+                    .matches("VALUES (CAST(ARRAY[ROW('test')] AS ARRAY(ROW(field VARCHAR))), VARCHAR 'test2')");
+
+            assertThat(query("SELECT * FROM " + table.getName() + " FOR VERSION AS OF " + v1SnapshotId))
+                    .matches("VALUES (BIGINT '42', -385e-1)");
+        }
+    }
+
+    @Test
+    public void testCreateOrReplaceTableChangePartitionedTableIntoUnpartitioned()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_create_or_replace_", " WITH (partitioning=ARRAY['a']) AS SELECT BIGINT '42' a, 'some data' b UNION ALL SELECT BIGINT '43' a, 'another data' b")) {
+            long v1SnapshotId = getCurrentSnapshotId(table.getName());
+
+            assertUpdate("CREATE OR REPLACE TABLE " + table.getName() + " WITH (sorted_by=ARRAY['a']) AS SELECT BIGINT '22' a, 'new data' b", 1);
+            assertThat(query("SELECT * FROM " + table.getName()))
+                    .matches("VALUES (BIGINT '22', CAST('new data' AS VARCHAR))");
+
+            assertThat(query("SELECT partition FROM \"" + table.getName() + "$partitions\""))
+                    .matches("VALUES (ROW(CAST (ROW(NULL) AS ROW(a BIGINT))))");
+
+            assertThat(query("SELECT * FROM " + table.getName() + " FOR VERSION AS OF " + v1SnapshotId))
+                    .matches("VALUES (BIGINT '42', CAST('some data' AS VARCHAR)), (BIGINT '43', CAST('another data' AS VARCHAR))");
+
+            assertThat((String) computeScalar("SHOW CREATE TABLE " + table.getName()))
+                    .contains("sorted_by = ARRAY['a ASC NULLS FIRST']");
+            assertThat((String) computeScalar("SHOW CREATE TABLE " + table.getName()))
+                    .doesNotContain("partitioning = ARRAY['a']");
+        }
+    }
+
+    @Test
+    public void testCreateOrReplaceTableChangeUnpartitionedTableIntoPartitioned()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_create_or_replace_", " WITH (sorted_by=ARRAY['a']) AS SELECT BIGINT '22' a, CAST('some data' AS VARCHAR) b")) {
+            long v1SnapshotId = getCurrentSnapshotId(table.getName());
+
+            assertUpdate("CREATE OR REPLACE TABLE " + table.getName() + " WITH (partitioning=ARRAY['a']) AS SELECT BIGINT '42' a, 'some data' b UNION ALL SELECT BIGINT '43' a, 'another data' b", 2);
+            assertThat(query("SELECT * FROM " + table.getName()))
+                    .matches("VALUES (BIGINT '42', CAST('some data' AS VARCHAR)), (BIGINT '43', CAST('another data' AS VARCHAR))");
+
+            assertThat(query("SELECT partition FROM \"" + table.getName() + "$partitions\""))
+                    .matches("VALUES (ROW(CAST (ROW(BIGINT '42') AS ROW(a BIGINT)))), (ROW(CAST (ROW(BIGINT '43') AS ROW(a BIGINT))))");
+
+            assertThat(query("SELECT * FROM " + table.getName() + " FOR VERSION AS OF " + v1SnapshotId))
+                    .matches("VALUES (BIGINT '22', CAST('some data' AS VARCHAR))");
+
+            assertThat((String) computeScalar("SHOW CREATE TABLE " + table.getName()))
+                    .contains("partitioning = ARRAY['a']");
+            assertThat((String) computeScalar("SHOW CREATE TABLE " + table.getName()))
+                    .doesNotContain("sorted_by = ARRAY['a ASC NULLS FIRST']");
+        }
+    }
+
+    @Test
+    public void testCreateOrReplaceTableWithComments()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_create_or_replace_", " (a BIGINT COMMENT 'This is a column') COMMENT 'This is a table'")) {
+            long v1SnapshotId = getCurrentSnapshotId(table.getName());
+
+            assertUpdate("CREATE OR REPLACE TABLE " + table.getName() + " AS SELECT 1 a", 1);
+            assertThat(query("SELECT * FROM " + table.getName()))
+                    .matches("VALUES 1");
+
+            assertThat(query("SELECT * FROM " + table.getName() + " FOR VERSION AS OF " + v1SnapshotId))
+                    .returnsEmptyResult();
+
+            assertThat(getTableComment(getSession().getCatalog().orElseThrow(), getSession().getSchema().orElseThrow(), table.getName()))
+                    .isNull();
+            assertThat(getColumnComment(table.getName(), "a"))
+                    .isNull();
+
+            assertUpdate("CREATE OR REPLACE TABLE " + table.getName() + " (a BIGINT COMMENT 'This is a column') COMMENT 'This is a table'");
+
+            assertThat(getTableComment(getSession().getCatalog().orElseThrow(), getSession().getSchema().orElseThrow(), table.getName()))
+                    .isEqualTo("This is a table");
+            assertThat(getColumnComment(table.getName(), "a"))
+                    .isEqualTo("This is a column");
+        }
+    }
+
     @Test
     public void testMergeSimpleSelectPartitioned()
     {
@@ -6273,7 +6401,7 @@ public void testMergeSimpleSelectPartitioned()
     public void testMergeUpdateWithVariousLayouts(int writers, String partitioning)
     {
         Session session = Session.builder(getSession())
-                .setSystemProperty(TASK_WRITER_COUNT, String.valueOf(writers))
+                .setSystemProperty(TASK_MIN_WRITER_COUNT, String.valueOf(writers))
                 .build();
 
         String targetTable = "merge_formats_target_" + randomNameSuffix();
@@ -6324,8 +6452,8 @@ public Object[][] partitionedAndBucketedProvider()
     public void testMergeMultipleOperations(int writers, String partitioning)
     {
         Session session = Session.builder(getSession())
-                .setSystemProperty(TASK_WRITER_COUNT, String.valueOf(writers))
-                .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, String.valueOf(writers))
+                .setSystemProperty(TASK_MIN_WRITER_COUNT, String.valueOf(writers))
+                .setSystemProperty(TASK_MAX_WRITER_COUNT, String.valueOf(writers))
                 .build();
 
         int targetCustomerCount = 32;
@@ -6430,7 +6558,7 @@ public void testMergeMultipleRowsMatchFails(String createTableSql)
                 .hasMessage("One MERGE target table row matched more than one source row");
 
         assertUpdate(format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) +
-                "    WHEN MATCHED AND s.address = 'Adelphi' THEN UPDATE SET address = s.address",
+                        "    WHEN MATCHED AND s.address = 'Adelphi' THEN UPDATE SET address = s.address",
                 1);
         assertQuery("SELECT customer, purchases, address FROM " + targetTable, "VALUES ('Aaron', 5, 'Adelphi'), ('Bill', 7, 'Antioch')");
         assertUpdate("DROP TABLE " + sourceTable);
@@ -6601,16 +6729,14 @@ public void testMaterializedViewSnapshotSummariesHaveTrinoQueryId()
     protected OptionalInt maxTableNameLength()
     {
         // This value depends on metastore type
-        // The connector appends uuids to the end of all table names
-        // 33 is the length of random suffix. e.g. {table name}-142763c594d54e4b9329a98f90528caf
-        return OptionalInt.of(255 - 33);
+        return OptionalInt.of(128);
     }
 
     @Override
     protected OptionalInt maxTableRenameLength()
     {
         // This value depends on metastore type
-        return OptionalInt.of(255);
+        return OptionalInt.of(128);
     }
 
     @Test
@@ -6658,15 +6784,674 @@ public void testAlterTableWithUnsupportedProperties()
         assertUpdate("DROP TABLE " + tableName);
     }
 
+    @Test
+    public void testDropTableWithMissingMetadataFile()
+            throws Exception
+    {
+        String tableName = "test_drop_table_with_missing_metadata_file_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 1 x, 'INDIA' y", 1);
+
+        String tableLocation = getTableLocation(tableName);
+        Location metadataLocation = Location.of(getLatestMetadataLocation(fileSystem, tableLocation));
+
+        // Delete current metadata file
+        fileSystem.deleteFile(metadataLocation);
+        assertFalse(fileSystem.newInputFile(metadataLocation).exists(), "Current metadata file should not exist");
+
+        // try to drop table
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+        assertFalse(fileSystem.listFiles(Location.of(tableLocation)).hasNext(), "Table location should not exist");
+    }
+
+    @Test
+    public void testDropTableWithMissingSnapshotFile()
+            throws Exception
+    {
+        String tableName = "test_drop_table_with_missing_snapshot_file_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 1 x, 'INDIA' y", 1);
+
+        String tableLocation = getTableLocation(tableName);
+        String metadataLocation = getLatestMetadataLocation(fileSystem, tableLocation);
+        TableMetadata tableMetadata = TableMetadataParser.read(new ForwardingFileIo(fileSystem), metadataLocation);
+        Location currentSnapshotFile = Location.of(tableMetadata.currentSnapshot().manifestListLocation());
+
+        // Delete current snapshot file
+        fileSystem.deleteFile(currentSnapshotFile);
+        assertFalse(fileSystem.newInputFile(currentSnapshotFile).exists(), "Current snapshot file should not exist");
+
+        // try to drop table
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+        assertFalse(fileSystem.listFiles(Location.of(tableLocation)).hasNext(), "Table location should not exist");
+    }
+
+    @Test
+    public void testDropTableWithMissingManifestListFile()
+            throws Exception
+    {
+        String tableName = "test_drop_table_with_missing_manifest_list_file_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 1 x, 'INDIA' y", 1);
+
+        String tableLocation = getTableLocation(tableName);
+        String metadataLocation = getLatestMetadataLocation(fileSystem, tableLocation);
+        FileIO fileIo = new ForwardingFileIo(fileSystem);
+        TableMetadata tableMetadata = TableMetadataParser.read(fileIo, metadataLocation);
+        Location manifestListFile = Location.of(tableMetadata.currentSnapshot().allManifests(fileIo).get(0).path());
+
+        // Delete Manifest List file
+        fileSystem.deleteFile(manifestListFile);
+        assertFalse(fileSystem.newInputFile(manifestListFile).exists(), "Manifest list file should not exist");
+
+        // try to drop table
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+        assertFalse(fileSystem.listFiles(Location.of(tableLocation)).hasNext(), "Table location should not exist");
+    }
+
+    @Test
+    public void testDropTableWithMissingDataFile()
+            throws Exception
+    {
+        String tableName = "test_drop_table_with_missing_data_file_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 1 x, 'INDIA' y", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (2, 'POLAND')", 1);
+
+        Location tableLocation = Location.of(getTableLocation(tableName));
+        Location tableDataPath = tableLocation.appendPath("data");
+        FileIterator fileIterator = fileSystem.listFiles(tableDataPath);
+        assertTrue(fileIterator.hasNext());
+        Location dataFile = fileIterator.next().location();
+
+        // Delete data file
+        fileSystem.deleteFile(dataFile);
+        assertFalse(fileSystem.newInputFile(dataFile).exists(), "Data file should not exist");
+
+        // try to drop table
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+        assertFalse(fileSystem.listFiles(tableLocation).hasNext(), "Table location should not exist");
+    }
+
+    @Test
+    public void testDropTableWithNonExistentTableLocation()
+            throws Exception
+    {
+        String tableName = "test_drop_table_with_non_existent_table_location_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 1 x, 'INDIA' y", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (2, 'POLAND')", 1);
+
+        Location tableLocation = Location.of(getTableLocation(tableName));
+
+        // Delete table location
+        fileSystem.deleteDirectory(tableLocation);
+        assertFalse(fileSystem.listFiles(tableLocation).hasNext(), "Table location should not exist");
+
+        // try to drop table
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+    }
+
+    @Test
+    public void testCorruptedTableLocation()
+            throws Exception
+    {
+        String tableName = "test_corrupted_table_location_" + randomNameSuffix();
+        SchemaTableName schemaTableName = SchemaTableName.schemaTableName(getSession().getSchema().orElseThrow(), tableName);
+        assertUpdate("CREATE TABLE " + tableName + " (id INT, country VARCHAR, independence ROW(month VARCHAR, year INT))");
+        assertUpdate("INSERT INTO " + tableName + " VALUES (1, 'INDIA', ROW ('Aug', 1947)), (2, 'POLAND', ROW ('Nov', 1918)), (3, 'USA', ROW ('Jul', 1776))", 3);
+
+        Location tableLocation = Location.of(getTableLocation(tableName));
+        Location metadataLocation = tableLocation.appendPath("metadata");
+
+        // break the table by deleting all metadata files
+        fileSystem.deleteDirectory(metadataLocation);
+        assertFalse(fileSystem.listFiles(metadataLocation).hasNext(), "Metadata location should not exist");
+
+        // Assert queries fail cleanly
+        assertQueryFails("TABLE " + tableName, "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("SELECT * FROM " + tableName + " WHERE false", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("SELECT 1 FROM " + tableName + " WHERE false", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("SHOW CREATE TABLE " + tableName, "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("CREATE TABLE a_new_table (LIKE " + tableName + " EXCLUDING PROPERTIES)", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("DESCRIBE " + tableName, "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("SHOW COLUMNS FROM " + tableName, "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("SHOW STATS FOR " + tableName, "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("ANALYZE " + tableName, "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("ALTER TABLE " + tableName + " EXECUTE optimize", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("ALTER TABLE " + tableName + " EXECUTE vacuum", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("ALTER TABLE " + tableName + " RENAME TO bad_person_some_new_name", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("ALTER TABLE " + tableName + " ADD COLUMN foo int", "Metadata not found in metadata location for table " + schemaTableName);
+        // TODO (https://github.com/trinodb/trino/issues/16248) ADD field
+        assertQueryFails("ALTER TABLE " + tableName + " DROP COLUMN country", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("ALTER TABLE " + tableName + " DROP COLUMN independence.month", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("ALTER TABLE " + tableName + " SET PROPERTIES format = 'PARQUET'", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("INSERT INTO " + tableName + " VALUES (NULL, NULL, ROW(NULL, NULL))", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("UPDATE " + tableName + " SET country = 'AUSTRIA'", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("DELETE FROM " + tableName, "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("MERGE INTO  " + tableName + " USING (SELECT 1 a) input ON true WHEN MATCHED THEN DELETE", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("TRUNCATE TABLE " + tableName, "This connector does not support truncating tables");
+        assertQueryFails("COMMENT ON TABLE " + tableName + " IS NULL", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("COMMENT ON COLUMN " + tableName + ".foo IS NULL", "Metadata not found in metadata location for table " + schemaTableName);
+        assertQueryFails("CALL iceberg.system.rollback_to_snapshot(CURRENT_SCHEMA, '" + tableName + "', 8954597067493422955)", "Metadata not found in metadata location for table " + schemaTableName);
+
+        // Avoid failing metadata queries
+        assertQuery("SHOW TABLES LIKE 'test_corrupted_table_location_%' ESCAPE '\\'", "VALUES '" + tableName + "'");
+        assertQueryReturnsEmptyResult("SELECT column_name, data_type FROM information_schema.columns " +
+                "WHERE table_schema = CURRENT_SCHEMA AND table_name LIKE 'test_corrupted_table_location_%' ESCAPE '\\'");
+        assertQueryReturnsEmptyResult("SELECT column_name, data_type FROM system.jdbc.columns " +
+                "WHERE table_cat = CURRENT_CATALOG AND table_schem = CURRENT_SCHEMA AND table_name LIKE 'test_corrupted_table_location_%' ESCAPE '\\'");
+
+        // DROP TABLE should succeed so that users can remove their corrupted table
+        assertQuerySucceeds("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+        assertFalse(fileSystem.listFiles(tableLocation).hasNext(), "Table location should not exist");
+    }
+
+    @Test
+    public void testDropCorruptedTableWithHiveRedirection()
+            throws Exception
+    {
+        String hiveRedirectionCatalog = "hive_with_redirections";
+        String icebergCatalog = "iceberg_test";
+        String schema = "default";
+        String tableName = "test_drop_corrupted_table_with_hive_redirection_" + randomNameSuffix();
+        String hiveTableName = "%s.%s.%s".formatted(hiveRedirectionCatalog, schema, tableName);
+        String icebergTableName = "%s.%s.%s".formatted(icebergCatalog, schema, tableName);
+
+        File dataDirectory = Files.createTempDirectory("test_corrupted_iceberg_table").toFile();
+        dataDirectory.deleteOnExit();
+
+        Session icebergSession = testSessionBuilder()
+                .setCatalog(icebergCatalog)
+                .setSchema(schema)
+                .build();
+
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(icebergSession)
+                .build();
+        queryRunner.installPlugin(new IcebergPlugin());
+        queryRunner.createCatalog(
+                icebergCatalog,
+                "iceberg",
+                ImmutableMap.of(
+                        "iceberg.catalog.type", "TESTING_FILE_METASTORE",
+                        "hive.metastore.catalog.dir", dataDirectory.getPath()));
+
+        queryRunner.installPlugin(new TestingHivePlugin(createTestingFileHiveMetastore(dataDirectory)));
+        queryRunner.createCatalog(
+                hiveRedirectionCatalog,
+                "hive",
+                ImmutableMap.of("hive.iceberg-catalog-name", icebergCatalog));
+
+        queryRunner.execute("CREATE SCHEMA " + schema);
+        queryRunner.execute("CREATE TABLE " + icebergTableName + " (id INT, country VARCHAR, independence ROW(month VARCHAR, year INT))");
+        queryRunner.execute("INSERT INTO " + icebergTableName + " VALUES (1, 'INDIA', ROW ('Aug', 1947)), (2, 'POLAND', ROW ('Nov', 1918)), (3, 'USA', ROW ('Jul', 1776))");
+
+        assertThat(queryRunner.execute("TABLE " + hiveTableName))
+                .containsAll(queryRunner.execute("TABLE " + icebergTableName));
+
+        Location tableLocation = Location.of((String) queryRunner.execute("SELECT DISTINCT regexp_replace(\"$path\", '/[^/]*/[^/]*$', '') FROM " + tableName).getOnlyValue());
+        Location metadataLocation = tableLocation.appendPath("metadata");
+
+        // break the table by deleting all metadata files
+        fileSystem.deleteDirectory(metadataLocation);
+        assertFalse(fileSystem.listFiles(metadataLocation).hasNext(), "Metadata location should not exist");
+
+        // DROP TABLE should succeed using hive redirection
+        queryRunner.execute("DROP TABLE " + hiveTableName);
+        assertFalse(queryRunner.tableExists(getSession(), icebergTableName));
+        assertFalse(fileSystem.listFiles(tableLocation).hasNext(), "Table location should not exist");
+    }
+
+    @Test(timeOut = 10_000)
+    public void testNoRetryWhenMetadataFileInvalid()
+            throws Exception
+    {
+        String tableName = "test_no_retry_when_metadata_file_invalid_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 1 id", 1);
+
+        String tableLocation = getTableLocation(tableName);
+        String metadataFileLocation = getLatestMetadataLocation(fileSystem, tableLocation);
+
+        ObjectMapper mapper = JsonUtil.mapper();
+        JsonNode jsonNode = mapper.readValue(fileSystem.newInputFile(Location.of(metadataFileLocation)).newStream(), JsonNode.class);
+        ArrayNode fieldsNode = (ArrayNode) jsonNode.get("schemas").get(0).get("fields");
+        ObjectNode newFieldNode = fieldsNode.get(0).deepCopy();
+        // Add duplicate field to produce validation error while reading the metadata file
+        fieldsNode.add(newFieldNode);
+
+        String modifiedJson = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonNode);
+        try (OutputStream outputStream = fileSystem.newOutputFile(Location.of(metadataFileLocation)).createOrOverwrite()) {
+            // Corrupt metadata file by overwriting the invalid metadata content
+            outputStream.write(modifiedJson.getBytes(UTF_8));
+        }
+        assertThatThrownBy(() -> query("SELECT * FROM " + tableName))
+                .hasMessage("Invalid metadata file for table tpch.%s".formatted(tableName));
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testTableChangesFunctionAfterSchemaChange()
+    {
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_table_changes_function_",
+                "AS SELECT nationkey, name FROM tpch.tiny.nation WITH NO DATA")) {
+            long initialSnapshot = getCurrentSnapshotId(table.getName());
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT nationkey, name FROM nation WHERE nationkey < 5", 5);
+            long snapshotAfterInsert = getCurrentSnapshotId(table.getName());
+
+            assertUpdate("ALTER TABLE " + table.getName() + " DROP COLUMN name");
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT nationkey FROM nation WHERE nationkey >= 5 AND nationkey < 10", 5);
+            long snapshotAfterDropColumn = getCurrentSnapshotId(table.getName());
+
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN comment VARCHAR");
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT nationkey, comment FROM nation WHERE nationkey >= 10 AND nationkey < 15", 5);
+            long snapshotAfterAddColumn = getCurrentSnapshotId(table.getName());
+
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN name VARCHAR");
+            assertUpdate("INSERT INTO " + table.getName() + " SELECT nationkey, comment, name FROM nation WHERE nationkey >= 15", 10);
+            long snapshotAfterReaddingNameColumn = getCurrentSnapshotId(table.getName());
+
+            assertQuery(
+                    "SELECT nationkey, name, _change_type, _change_version_id, _change_ordinal " +
+                            "FROM TABLE(system.table_changes('tpch', '%s', %s, %s))".formatted(table.getName(), initialSnapshot, snapshotAfterInsert),
+                    "SELECT nationkey, name, 'insert', %s, 0 FROM nation WHERE nationkey < 5".formatted(snapshotAfterInsert));
+
+            assertQuery(
+                    "SELECT nationkey, _change_type, _change_version_id, _change_ordinal " +
+                            "FROM TABLE(system.table_changes('tpch', '%s', %s, %s))".formatted(table.getName(), initialSnapshot, snapshotAfterDropColumn),
+                    "SELECT nationkey, 'insert', %s, 0 FROM nation WHERE nationkey < 5 UNION SELECT nationkey, 'insert', %s, 1 FROM nation WHERE nationkey >= 5 AND nationkey < 10 ".formatted(snapshotAfterInsert, snapshotAfterDropColumn));
+
+            assertQuery(
+                    "SELECT nationkey, comment, _change_type, _change_version_id, _change_ordinal " +
+                            "FROM TABLE(system.table_changes('tpch', '%s', %s, %s))".formatted(table.getName(), initialSnapshot, snapshotAfterAddColumn),
+                    ("SELECT nationkey, NULL, 'insert', %s, 0 FROM nation WHERE nationkey < 5 " +
+                            "UNION SELECT nationkey, NULL, 'insert', %s, 1 FROM nation WHERE nationkey >= 5 AND nationkey < 10 " +
+                            "UNION SELECT nationkey, comment, 'insert', %s, 2 FROM nation WHERE nationkey >= 10 AND nationkey < 15").formatted(snapshotAfterInsert, snapshotAfterDropColumn, snapshotAfterAddColumn));
+
+            assertQuery(
+                    "SELECT nationkey, comment, name, _change_type, _change_version_id, _change_ordinal " +
+                            "FROM TABLE(system.table_changes('tpch', '%s', %s, %s))".formatted(table.getName(), initialSnapshot, snapshotAfterReaddingNameColumn),
+                    ("SELECT nationkey, NULL, NULL, 'insert', %s, 0 FROM nation WHERE nationkey < 5 " +
+                            "UNION SELECT nationkey, NULL, NULL, 'insert', %s, 1 FROM nation WHERE nationkey >= 5 AND nationkey < 10 " +
+                            "UNION SELECT nationkey, comment, NULL, 'insert', %s, 2 FROM nation WHERE nationkey >= 10 AND nationkey < 15" +
+                            "UNION SELECT nationkey, comment, name, 'insert', %s, 3 FROM nation WHERE nationkey >= 15").formatted(snapshotAfterInsert, snapshotAfterDropColumn, snapshotAfterAddColumn, snapshotAfterReaddingNameColumn));
+        }
+    }
+
+    @Test
+    public void testIdentityPartitionFilterMissing()
+    {
+        String tableName = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName + " (id, a, ds) VALUES (1, 'a', 'a')", 1);
+        assertQueryFails(session, "SELECT id FROM " + tableName + " WHERE ds IS NOT null OR true", "Filter required for tpch\\." + tableName + " on at least one of the partition columns: ds");
+        assertUpdate(session, "DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testBucketPartitionFilterMissing()
+    {
+        String tableName = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['bucket(ds, 16)'])");
+        assertUpdate(session, "INSERT INTO " + tableName + " (id, a, ds) VALUES (1, 'a', 'a')", 1);
+        assertQueryFails(session, "SELECT id FROM " + tableName + " WHERE ds IS NOT null OR true", "Filter required for tpch\\." + tableName + " on at least one of the partition columns: ds");
+        assertUpdate(session, "DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testIdentityPartitionFilterIncluded()
+    {
+        String tableName = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName + " (id, a, ds) VALUES (1, 'a', 'a')", 1);
+        String query = "SELECT id FROM " + tableName + " WHERE ds = 'a'";
+        assertQuery(session, query, "VALUES 1");
+        assertUpdate(session, "DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testBucketPartitionFilterIncluded()
+    {
+        String tableName = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['bucket(ds, 16)'])");
+        assertUpdate(session, "INSERT INTO " + tableName + " (id, a, ds) VALUES (1, 'a', 'a'), (2, 'b', 'b')", 2);
+        String query = "SELECT id FROM " + tableName + " WHERE ds = 'a'";
+        assertQuery(session, query, "VALUES 1");
+        assertUpdate(session, "DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testMultiPartitionedTableFilterIncluded()
+    {
+        String tableName = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['id', 'bucket(ds, 16)'])");
+        assertUpdate(session, "INSERT INTO " + tableName + " (id, a, ds) VALUES (1, 'a', 'a'), (2, 'b', 'b')", 2);
+        // include predicate only on 'id', not on 'ds'
+        String query = "SELECT id, ds FROM " + tableName + " WHERE id = 2";
+        assertQuery(session, query, "VALUES (2, 'b')");
+        assertUpdate(session, "DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testIdentityPartitionIsNotNullFilter()
+    {
+        String tableName = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName + " (id, a, ds) VALUES (1, 'a', 'a')", 1);
+        assertQuery(session, "SELECT id FROM " + tableName + " WHERE ds IS NOT null", "VALUES 1");
+        assertUpdate(session, "DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testJoinPartitionFilterIncluded()
+    {
+        String tableName1 = "test_partition_" + randomNameSuffix();
+        String tableName2 = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName1 + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName1 + " (id, a, ds) VALUES (1, 'a', 'a')", 1);
+        assertUpdate(session, "CREATE TABLE " + tableName2 + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName2 + " (id, a, ds) VALUES (1, 'a', 'a')", 1);
+        assertQuery(session, "SELECT a.id, b.id FROM " + tableName1 + " a JOIN " + tableName2 + " b ON (a.ds = b.ds) WHERE a.ds = 'a'", "VALUES (1, 1)");
+        assertUpdate(session, "DROP TABLE " + tableName1);
+        assertUpdate(session, "DROP TABLE " + tableName2);
+    }
+
+    @Test
+    public void testJoinWithMissingPartitionFilter()
+    {
+        String tableName1 = "test_partition_" + randomNameSuffix();
+        String tableName2 = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName1 + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName1 + " (id, a, ds) VALUES (1, 'a', 'a')", 1);
+        assertUpdate(session, "CREATE TABLE " + tableName2 + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName2 + " (id, a, ds) VALUES (1, 'a', 'a')", 1);
+        assertQueryFails(session, "SELECT a.id, b.id FROM " + tableName1 + " a JOIN " + tableName2 + " b ON (a.id = b.id) WHERE a.ds = 'a'", "Filter required for tpch\\." + tableName2 + " on at least one of the partition columns: ds");
+        assertUpdate(session, "DROP TABLE " + tableName1);
+        assertUpdate(session, "DROP TABLE " + tableName2);
+    }
+
+    @Test
+    public void testJoinWithPartitionFilterOnPartitionedTable()
+    {
+        String tableName1 = "test_partition_" + randomNameSuffix();
+        String tableName2 = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName1 + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName1 + " (id, a, ds) VALUES (1, 'a', 'a')", 1);
+        assertUpdate(session, "CREATE TABLE " + tableName2 + " (id integer, a varchar, b varchar, ds varchar)");
+        assertUpdate(session, "INSERT INTO " + tableName2 + " (id, a, ds) VALUES (1, 'a', 'a')", 1);
+        assertQuery(session, "SELECT a.id, b.id FROM " + tableName1 + " a JOIN " + tableName2 + " b ON (a.id = b.id) WHERE a.ds = 'a'", "VALUES (1, 1)");
+        assertUpdate(session, "DROP TABLE " + tableName1);
+        assertUpdate(session, "DROP TABLE " + tableName2);
+    }
+
+    @Test
+    public void testPartitionPredicateWithCasting()
+    {
+        String tableName = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName + " (id, a, ds) VALUES (1, '1', '1')", 1);
+        String query = "SELECT id FROM " + tableName + " WHERE cast(ds as integer) = 1";
+        assertQuery(session, query, "VALUES 1");
+        assertUpdate(session, "DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testNestedQueryWithInnerPartitionPredicate()
+    {
+        String tableName = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName + " (id, a, ds) VALUES (1, '1', '1')", 1);
+        String query = "SELECT id FROM (SELECT * FROM " + tableName + " WHERE cast(ds as integer) = 1) WHERE cast(a as integer) = 1";
+        assertQuery(session, query, "VALUES 1");
+        assertUpdate(session, "DROP TABLE " + tableName + "");
+    }
+
+    @Test
+    public void testPredicateOnNonPartitionColumn()
+    {
+        String tableName = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName + " (id, a, ds) VALUES (1, '1', '1')", 1);
+        String query = "SELECT id FROM " + tableName + " WHERE cast(b as integer) = 1";
+        assertQueryFails(session, query, "Filter required for tpch\\." + tableName + " on at least one of the partition columns: ds");
+        assertUpdate(session, "DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testNonSelectStatementsWithPartitionFilterRequired()
+    {
+        String tableName1 = "test_partition_" + randomNameSuffix();
+        String tableName2 = "test_partition_" + randomNameSuffix();
+
+        Session session = withPartitionFilterRequired(getSession());
+
+        assertUpdate(session, "CREATE TABLE " + tableName1 + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "CREATE TABLE " + tableName2 + " (id integer, a varchar, b varchar, ds varchar) WITH (partitioning = ARRAY['ds'])");
+        assertUpdate(session, "INSERT INTO " + tableName1 + " (id, a, ds) VALUES (1, '1', '1'), (2, '2', '2')", 2);
+        assertUpdate(session, "INSERT INTO " + tableName2 + " (id, a, ds) VALUES (1, '1', '1'), (3, '3', '3')", 2);
+
+        // These non-SELECT statements fail without a partition filter
+        String errorMessage = "Filter required for tpch\\." + tableName1 + " on at least one of the partition columns: ds";
+        assertQueryFails(session, "ALTER TABLE " + tableName1 + " EXECUTE optimize", errorMessage);
+        assertQueryFails(session, "UPDATE " + tableName1 + " SET a = 'New'", errorMessage);
+        assertQueryFails(session, "MERGE INTO " + tableName1 + " AS a USING " + tableName2 + " AS b ON (a.ds = b.ds) WHEN MATCHED THEN UPDATE SET a = 'New'", errorMessage);
+        assertQueryFails(session, "DELETE FROM " + tableName1 + " WHERE a = '1'", errorMessage);
+
+        // Adding partition filters to each solves the problem
+        assertQuerySucceeds(session, "ALTER TABLE " + tableName1 + " EXECUTE optimize WHERE ds in ('2', '4')");
+        assertQuerySucceeds(session, "UPDATE " + tableName1 + " SET a = 'New' WHERE ds = '2'");
+        assertQuerySucceeds(session, "MERGE INTO " + tableName1 + " AS a USING (SELECT * FROM " + tableName2 + " WHERE ds = '1') AS b ON (a.ds = b.ds) WHEN MATCHED THEN UPDATE SET a = 'New'");
+        assertQuerySucceeds(session, "DELETE FROM " + tableName1 + " WHERE ds = '1'");
+
+        // Analyze should always succeed, since currently it cannot take a partition argument like Hive
+        assertQuerySucceeds(session, "ANALYZE " + tableName1);
+        assertQuerySucceeds(session, "ANALYZE " + tableName2 + " WITH (columns = ARRAY['id', 'a'])");
+
+        assertUpdate(session, "DROP TABLE " + tableName1);
+        assertUpdate(session, "DROP TABLE " + tableName2);
+    }
+
+    private static Session withPartitionFilterRequired(Session session)
+    {
+        return Session.builder(session)
+                .setCatalogSessionProperty("iceberg", "query_partition_filter_required", "true")
+                .build();
+    }
+
     @Override
     protected void verifyTableNameLengthFailurePermissible(Throwable e)
     {
-        assertThat(e).hasMessageMatching("Failed to create file.*|Could not create new table directory");
+        assertThat(e).hasMessageMatching("Table name must be shorter than or equal to '128' characters but got .*");
+    }
+
+    @Test(dataProvider = "testTimestampPrecisionOnCreateTableAsSelect")
+    public void testTimestampPrecisionOnCreateTableAsSelect(TimestampPrecisionTestSetup setup)
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_coercion_show_create_table",
+                format("AS SELECT %s a", setup.sourceValueLiteral))) {
+            assertEquals(getColumnType(testTable.getName(), "a"), setup.newColumnType);
+            assertQuery(
+                    format("SELECT * FROM %s", testTable.getName()),
+                    format("VALUES (%s)", setup.newValueLiteral));
+        }
+    }
+
+    @Test(dataProvider = "testTimestampPrecisionOnCreateTableAsSelect")
+    public void testTimestampPrecisionOnCreateTableAsSelectWithNoData(TimestampPrecisionTestSetup setup)
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_coercion_show_create_table",
+                format("AS SELECT %s a WITH NO DATA", setup.sourceValueLiteral))) {
+            assertEquals(getColumnType(testTable.getName(), "a"), setup.newColumnType);
+        }
+    }
+
+    @DataProvider(name = "testTimestampPrecisionOnCreateTableAsSelect")
+    public Object[][] timestampPrecisionOnCreateTableAsSelectProvider()
+    {
+        return timestampPrecisionOnCreateTableAsSelectData().stream()
+                .map(this::filterTimestampPrecisionOnCreateTableAsSelectProvider)
+                .flatMap(Optional::stream)
+                .collect(toDataProvider());
+    }
+
+    protected Optional<TimestampPrecisionTestSetup> filterTimestampPrecisionOnCreateTableAsSelectProvider(TimestampPrecisionTestSetup setup)
+    {
+        return Optional.of(setup);
+    }
+
+    private List<TimestampPrecisionTestSetup> timestampPrecisionOnCreateTableAsSelectData()
+    {
+        return ImmutableList.<TimestampPrecisionTestSetup>builder()
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.000000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.9'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.900000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.56'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.560000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.123'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.4896'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.489600'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.89356'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.893560'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.123000'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.999'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.999000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.123456'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123456'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '2020-09-27 12:34:56.1'", "timestamp(6)", "TIMESTAMP '2020-09-27 12:34:56.100000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '2020-09-27 12:34:56.9'", "timestamp(6)", "TIMESTAMP '2020-09-27 12:34:56.900000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '2020-09-27 12:34:56.123'", "timestamp(6)", "TIMESTAMP '2020-09-27 12:34:56.123000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '2020-09-27 12:34:56.123000'", "timestamp(6)", "TIMESTAMP '2020-09-27 12:34:56.123000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '2020-09-27 12:34:56.999'", "timestamp(6)", "TIMESTAMP '2020-09-27 12:34:56.999000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '2020-09-27 12:34:56.123456'", "timestamp(6)", "TIMESTAMP '2020-09-27 12:34:56.123456'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.1234561'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123456'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.123456499'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123456'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.123456499999'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123456'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.1234565'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123457'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.111222333444'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.111222'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 00:00:00.9999995'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:01.000000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1970-01-01 23:59:59.9999995'", "timestamp(6)", "TIMESTAMP '1970-01-02 00:00:00.000000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1969-12-31 23:59:59.9999995'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.000000'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1969-12-31 23:59:59.999999499999'", "timestamp(6)", "TIMESTAMP '1969-12-31 23:59:59.999999'"))
+                .add(new TimestampPrecisionTestSetup("TIMESTAMP '1969-12-31 23:59:59.9999994'", "timestamp(6)", "TIMESTAMP '1969-12-31 23:59:59.999999'"))
+                .build();
+    }
+
+    public record TimestampPrecisionTestSetup(String sourceValueLiteral, String newColumnType, String newValueLiteral)
+    {
+        public TimestampPrecisionTestSetup
+        {
+            requireNonNull(sourceValueLiteral, "sourceValueLiteral is null");
+            requireNonNull(newColumnType, "newColumnType is null");
+            requireNonNull(newValueLiteral, "newValueLiteral is null");
+        }
+
+        public TimestampPrecisionTestSetup withNewValueLiteral(String newValueLiteral)
+        {
+            return new TimestampPrecisionTestSetup(sourceValueLiteral, newColumnType, newValueLiteral);
+        }
+    }
+
+    @Test(dataProvider = "testTimePrecisionOnCreateTableAsSelect")
+    public void testTimePrecisionOnCreateTableAsSelect(String inputType, String tableType, String tableValue)
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_coercion_show_create_table",
+                format("AS SELECT %s a", inputType))) {
+            assertEquals(getColumnType(testTable.getName(), "a"), tableType);
+            assertQuery(
+                    format("SELECT * FROM %s", testTable.getName()),
+                    format("VALUES (%s)", tableValue));
+        }
+    }
+
+    @Test(dataProvider = "testTimePrecisionOnCreateTableAsSelect")
+    public void testTimePrecisionOnCreateTableAsSelectWithNoData(String inputType, String tableType, String ignored)
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_coercion_show_create_table",
+                format("AS SELECT %s a WITH NO DATA", inputType))) {
+            assertEquals(getColumnType(testTable.getName(), "a"), tableType);
+        }
+    }
+
+    @DataProvider(name = "testTimePrecisionOnCreateTableAsSelect")
+    public static Object[][] timePrecisionOnCreateTableAsSelectProvider()
+    {
+        return new Object[][] {
+                {"TIME '00:00:00'", "time(6)", "TIME '00:00:00.000000'"},
+                {"TIME '00:00:00.9'", "time(6)", "TIME '00:00:00.900000'"},
+                {"TIME '00:00:00.56'", "time(6)", "TIME '00:00:00.560000'"},
+                {"TIME '00:00:00.123'", "time(6)", "TIME '00:00:00.123000'"},
+                {"TIME '00:00:00.4896'", "time(6)", "TIME '00:00:00.489600'"},
+                {"TIME '00:00:00.89356'", "time(6)", "TIME '00:00:00.893560'"},
+                {"TIME '00:00:00.123000'", "time(6)", "TIME '00:00:00.123000'"},
+                {"TIME '00:00:00.999'", "time(6)", "TIME '00:00:00.999000'"},
+                {"TIME '00:00:00.123456'", "time(6)", "TIME '00:00:00.123456'"},
+                {"TIME '12:34:56.1'", "time(6)", "TIME '12:34:56.100000'"},
+                {"TIME '12:34:56.9'", "time(6)", "TIME '12:34:56.900000'"},
+                {"TIME '12:34:56.123'", "time(6)", "TIME '12:34:56.123000'"},
+                {"TIME '12:34:56.123000'", "time(6)", "TIME '12:34:56.123000'"},
+                {"TIME '12:34:56.999'", "time(6)", "TIME '12:34:56.999000'"},
+                {"TIME '12:34:56.123456'", "time(6)", "TIME '12:34:56.123456'"},
+                {"TIME '00:00:00.1234561'", "time(6)", "TIME '00:00:00.123456'"},
+                {"TIME '00:00:00.123456499'", "time(6)", "TIME '00:00:00.123456'"},
+                {"TIME '00:00:00.123456499999'", "time(6)", "TIME '00:00:00.123456'"},
+                {"TIME '00:00:00.1234565'", "time(6)", "TIME '00:00:00.123457'"},
+                {"TIME '00:00:00.111222333444'", "time(6)", "TIME '00:00:00.111222'"},
+                {"TIME '00:00:00.9999995'", "time(6)", "TIME '00:00:01.000000'"},
+                {"TIME '23:59:59.9999995'", "time(6)", "TIME '00:00:00.000000'"},
+                {"TIME '23:59:59.9999995'", "time(6)", "TIME '00:00:00.000000'"},
+                {"TIME '23:59:59.999999499999'", "time(6)", "TIME '23:59:59.999999'"},
+                {"TIME '23:59:59.9999994'", "time(6)", "TIME '23:59:59.999999'"}};
     }
 
     @Override
     protected Optional<SetColumnTypeSetup> filterSetColumnTypesDataProvider(SetColumnTypeSetup setup)
     {
+        if (setup.sourceColumnType().equals("timestamp(3) with time zone")) {
+            // The connector returns UTC instead of the given time zone
+            return Optional.of(setup.withNewValueLiteral("TIMESTAMP '2020-02-12 14:03:00.123000 +00:00'"));
+        }
         switch ("%s -> %s".formatted(setup.sourceColumnType(), setup.newColumnType())) {
             case "bigint -> integer":
             case "decimal(5,3) -> decimal(5,2)":
@@ -6696,6 +7481,64 @@ protected void verifySetColumnTypeFailurePermissible(Throwable e)
                 "|Type not supported for Iceberg: char\\(20\\)).*");
     }
 
+    @Override
+    protected Optional<SetColumnTypeSetup> filterSetFieldTypesDataProvider(SetColumnTypeSetup setup)
+    {
+        switch ("%s -> %s".formatted(setup.sourceColumnType(), setup.newColumnType())) {
+            case "bigint -> integer":
+            case "decimal(5,3) -> decimal(5,2)":
+            case "varchar -> char(20)":
+            case "time(6) -> time(3)":
+            case "timestamp(6) -> timestamp(3)":
+            case "array(integer) -> array(bigint)":
+            case "row(x integer) -> row(x bigint)":
+            case "row(x integer) -> row(y integer)":
+            case "row(x integer, y integer) -> row(x integer, z integer)":
+            case "row(x integer) -> row(x integer, y integer)":
+            case "row(x integer, y integer) -> row(x integer)":
+            case "row(x integer, y integer) -> row(y integer, x integer)":
+            case "row(x integer, y integer) -> row(z integer, y integer, x integer)":
+            case "row(x row(nested integer)) -> row(x row(nested bigint))":
+            case "row(x row(a integer, b integer)) -> row(x row(b integer, a integer))":
+                // Iceberg allows updating column types if the update is safe. Safe updates are:
+                // - int to bigint
+                // - float to double
+                // - decimal(P,S) to decimal(P2,S) when P2 > P (scale cannot change)
+                // https://iceberg.apache.org/docs/latest/spark-ddl/#alter-table--alter-column
+                return Optional.of(setup.asUnsupported());
+
+            case "varchar(100) -> varchar(50)":
+                // Iceberg connector ignores the varchar length
+                return Optional.empty();
+        }
+        return Optional.of(setup);
+    }
+
+    @Override
+    protected void verifySetFieldTypeFailurePermissible(Throwable e)
+    {
+        assertThat(e).hasMessageMatching(".*(Failed to set field type: Cannot change (column type:|type from .* to )" +
+                "|Time(stamp)? precision \\(3\\) not supported for Iceberg. Use \"time(stamp)?\\(6\\)\" instead" +
+                "|Type not supported for Iceberg: char\\(20\\)" +
+                "|Iceberg doesn't support changing field type (from|to) non-primitive types).*");
+    }
+
+    @Override
+    protected Session withoutSmallFileThreshold(Session session)
+    {
+        return Session.builder(session)
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "parquet_small_file_threshold", "0B")
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "orc_tiny_stripe_threshold", "0B")
+                .build();
+    }
+
+    private Session withSingleWriterPerTask(Session session)
+    {
+        return Session.builder(session)
+                .setSystemProperty("task_min_writer_count", "1")
+                .build();
+    }
+
     private Session prepareCleanUpSession()
     {
         return Session.builder(getSession())
@@ -6707,19 +7550,34 @@ private Session prepareCleanUpSession()
     private List<String> getAllMetadataFilesFromTableDirectory(String tableLocation)
             throws IOException
     {
-        return listAllTableFilesInDirectory(getIcebergTableMetadataPath(tableLocation));
+        return listFiles(getIcebergTableMetadataPath(tableLocation));
     }
 
-    private List<String> listAllTableFilesInDirectory(Path tableDataPath)
+    protected List<String> listFiles(String directory)
             throws IOException
     {
-        try (Stream<Path> walk = Files.walk(tableDataPath)) {
-            return walk
-                    .filter(Files::isRegularFile)
-                    .filter(path -> !path.getFileName().toString().matches("\\..*\\.crc"))
-                    .map(Path::toString)
-                    .collect(toImmutableList());
+        ImmutableList.Builder<String> files = ImmutableList.builder();
+        FileIterator listing = fileSystem.listFiles(Location.of(directory));
+        while (listing.hasNext()) {
+            String location = listing.next().location().toString();
+            if (location.matches(".*/\\..*\\.crc")) {
+                continue;
+            }
+            files.add(location);
         }
+        return files.build();
+    }
+
+    protected long fileSize(String location)
+            throws IOException
+    {
+        return fileSystem.newInputFile(Location.of(location)).length();
+    }
+
+    protected void createFile(String location)
+            throws IOException
+    {
+        fileSystem.newOutputFile(Location.of(location)).create().close();
     }
 
     private List<Long> getSnapshotIds(String tableName)
@@ -6727,7 +7585,7 @@ private List<Long> getSnapshotIds(String tableName)
         return getQueryRunner().execute(format("SELECT snapshot_id FROM \"%s$snapshots\"", tableName))
                 .getOnlyColumn()
                 .map(Long.class::cast)
-                .collect(toUnmodifiableList());
+                .collect(toImmutableList());
     }
 
     private List<Long> getTableHistory(String tableName)
@@ -6743,14 +7601,14 @@ private long getCurrentSnapshotId(String tableName)
         return (long) computeScalar("SELECT snapshot_id FROM \"" + tableName + "$snapshots\" ORDER BY committed_at DESC FETCH FIRST 1 ROW WITH TIES");
     }
 
-    private Path getIcebergTableDataPath(String tableLocation)
+    private String getIcebergTableDataPath(String tableLocation)
     {
-        return Path.of(tableLocation, "data");
+        return tableLocation + "/data";
     }
 
-    private Path getIcebergTableMetadataPath(String tableLocation)
+    private String getIcebergTableMetadataPath(String tableLocation)
     {
-        return Path.of(tableLocation, "metadata");
+        return tableLocation + "/metadata";
     }
 
     private long getCommittedAtInEpochMilliseconds(String tableName, long snapshotId)
@@ -6769,7 +7627,7 @@ private List<Long> getSnapshotsIdsByCreationOrder(String tableName)
     {
         int idField = 0;
         return getQueryRunner().execute(
-                format("SELECT snapshot_id FROM \"%s$snapshots\" ORDER BY committed_at", tableName))
+                        format("SELECT snapshot_id FROM \"%s$snapshots\" ORDER BY committed_at", tableName))
                 .getMaterializedRows().stream()
                 .map(row -> (Long) row.getField(idField))
                 .collect(toList());
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergMaterializedViewTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergMaterializedViewTest.java
index 865c1d03690b..73eaa253a4ac 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergMaterializedViewTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergMaterializedViewTest.java
@@ -62,11 +62,9 @@ public void setUp()
         assertUpdate("CREATE TABLE base_table1(_bigint BIGINT, _date DATE) WITH (partitioning = ARRAY['_date'])");
         assertUpdate("INSERT INTO base_table1 VALUES (0, DATE '2019-09-08'), (1, DATE '2019-09-09'), (2, DATE '2019-09-09')", 3);
         assertUpdate("INSERT INTO base_table1 VALUES (3, DATE '2019-09-09'), (4, DATE '2019-09-10'), (5, DATE '2019-09-10')", 3);
-        assertQuery("SELECT count(*) FROM base_table1", "VALUES 6");
 
         assertUpdate("CREATE TABLE base_table2 (_varchar VARCHAR, _bigint BIGINT, _date DATE) WITH (partitioning = ARRAY['_bigint', '_date'])");
         assertUpdate("INSERT INTO base_table2 VALUES ('a', 0, DATE '2019-09-08'), ('a', 1, DATE '2019-09-08'), ('a', 0, DATE '2019-09-09')", 3);
-        assertQuery("SELECT count(*) FROM base_table2", "VALUES 3");
 
         assertUpdate("CREATE SCHEMA " + storageSchemaName);
     }
@@ -87,6 +85,18 @@ public void testShowTables()
         assertUpdate("DROP MATERIALIZED VIEW materialized_view_show_tables_test");
     }
 
+    @Test
+    public void testCommentColumnMaterializedView()
+    {
+        String viewColumnName = "_bigint";
+        String materializedViewName = "test_materialized_view_" + randomNameSuffix();
+        assertUpdate(format("CREATE MATERIALIZED VIEW %s AS SELECT * FROM base_table1", materializedViewName));
+        assertUpdate(format("COMMENT ON COLUMN %s.%s IS 'new comment'", materializedViewName, viewColumnName));
+        assertThat(getColumnComment(materializedViewName, viewColumnName)).isEqualTo("new comment");
+        assertQuery(format("SELECT count(*) FROM %s", materializedViewName), "VALUES 6");
+        assertUpdate(format("DROP MATERIALIZED VIEW %s", materializedViewName));
+    }
+
     @Test
     public void testMaterializedViewsMetadata()
     {
@@ -160,6 +170,7 @@ public void testShowCreate()
         assertUpdate("CREATE MATERIALIZED VIEW test_mv_show_create " +
                 "WITH (\n" +
                 "   partitioning = ARRAY['_date'],\n" +
+                "   format = 'ORC',\n" +
                 "   orc_bloom_filter_columns = ARRAY['_date'],\n" +
                 "   orc_bloom_filter_fpp = 0.1) AS " +
                 "SELECT _bigint, _date FROM base_table1");
@@ -403,13 +414,82 @@ public void testDetectStaleness()
         assertThat(getExplainPlan("SELECT * FROM materialized_view_join_part_stale", ExplainType.Type.IO))
                 .doesNotContain("base_table3", "base_table4");
 
-        assertUpdate("DROP TABLE IF EXISTS base_table3");
-        assertUpdate("DROP TABLE IF EXISTS base_table4");
+        assertUpdate("DROP TABLE base_table3");
+        assertUpdate("DROP TABLE base_table4");
         assertUpdate("DROP MATERIALIZED VIEW materialized_view_part_stale");
         assertUpdate("DROP MATERIALIZED VIEW materialized_view_join_stale");
         assertUpdate("DROP MATERIALIZED VIEW materialized_view_join_part_stale");
     }
 
+    @Test
+    public void testMaterializedViewOnExpiredTable()
+    {
+        Session sessionWithShortRetentionUnlocked = Session.builder(getSession())
+                .setCatalogSessionProperty("iceberg", "expire_snapshots_min_retention", "0s")
+                .build();
+
+        assertUpdate("CREATE TABLE mv_on_expired_base_table AS SELECT 10 a", 1);
+        assertUpdate("""
+                CREATE MATERIALIZED VIEW mv_on_expired_the_mv
+                GRACE PERIOD INTERVAL '0' SECOND
+                AS SELECT sum(a) s FROM mv_on_expired_base_table""");
+
+        assertUpdate("REFRESH MATERIALIZED VIEW mv_on_expired_the_mv", 1);
+        // View is fresh
+        assertThat(query("TABLE mv_on_expired_the_mv"))
+                .matches("VALUES BIGINT '10'");
+
+        // Create two new snapshots
+        assertUpdate("INSERT INTO mv_on_expired_base_table VALUES 7", 1);
+        assertUpdate("INSERT INTO mv_on_expired_base_table VALUES 5", 1);
+
+        // Expire snapshots, so that the original one is not live and not parent of any live
+        computeActual(sessionWithShortRetentionUnlocked, "ALTER TABLE mv_on_expired_base_table EXECUTE EXPIRE_SNAPSHOTS (retention_threshold => '0s')");
+
+        // View still can be queried
+        assertThat(query("TABLE mv_on_expired_the_mv"))
+                .matches("VALUES BIGINT '22'");
+
+        // View can also be refreshed
+        assertUpdate("REFRESH MATERIALIZED VIEW mv_on_expired_the_mv", 1);
+        assertThat(query("TABLE mv_on_expired_the_mv"))
+                .matches("VALUES BIGINT '22'");
+
+        assertUpdate("DROP TABLE mv_on_expired_base_table");
+        assertUpdate("DROP MATERIALIZED VIEW mv_on_expired_the_mv");
+    }
+
+    @Test
+    public void testMaterializedViewOnTableRolledBack()
+    {
+        assertUpdate("CREATE TABLE mv_on_rolled_back_base_table(a integer)");
+        assertUpdate("""
+                CREATE MATERIALIZED VIEW mv_on_rolled_back_the_mv
+                GRACE PERIOD INTERVAL '0' SECOND
+                AS SELECT sum(a) s FROM mv_on_rolled_back_base_table""");
+
+        // Create some snapshots
+        assertUpdate("INSERT INTO mv_on_rolled_back_base_table VALUES 4", 1);
+        long firstSnapshot = getLatestSnapshotId("mv_on_rolled_back_base_table");
+        assertUpdate("INSERT INTO mv_on_rolled_back_base_table VALUES 8", 1);
+
+        // Base MV on a snapshot "in the future"
+        assertUpdate("REFRESH MATERIALIZED VIEW mv_on_rolled_back_the_mv", 1);
+        assertUpdate(format("CALL system.rollback_to_snapshot(CURRENT_SCHEMA, 'mv_on_rolled_back_base_table', %s)", firstSnapshot));
+
+        // View still can be queried
+        assertThat(query("TABLE mv_on_rolled_back_the_mv"))
+                .matches("VALUES BIGINT '4'");
+
+        // View can also be refreshed
+        assertUpdate("REFRESH MATERIALIZED VIEW mv_on_rolled_back_the_mv", 1);
+        assertThat(query("TABLE mv_on_rolled_back_the_mv"))
+                .matches("VALUES BIGINT '4'");
+
+        assertUpdate("DROP TABLE mv_on_rolled_back_base_table");
+        assertUpdate("DROP MATERIALIZED VIEW mv_on_rolled_back_the_mv");
+    }
+
     @Test
     public void testSqlFeatures()
     {
@@ -442,7 +522,7 @@ public void testSqlFeatures()
         assertThat((String) computeScalar("SHOW CREATE MATERIALIZED VIEW materialized_view_window"))
                 .matches("\\QCREATE MATERIALIZED VIEW " + qualifiedMaterializedViewName + "\n" +
                         "WITH (\n" +
-                        "   format = 'ORC',\n" +
+                        "   format = 'PARQUET',\n" +
                         "   format_version = 2,\n" +
                         "   location = '" + getSchemaDirectory() + "/st_\\E[0-9a-f]+-[0-9a-f]+\\Q',\n" +
                         "   partitioning = ARRAY['_date'],\n" +
@@ -547,7 +627,7 @@ public void testNestedMaterializedViews()
         assertThat(getExplainPlan("SELECT * FROM materialized_view_level1", ExplainType.Type.IO))
                 .contains("base_table5");
 
-        assertUpdate("DROP TABLE IF EXISTS base_table5");
+        assertUpdate("DROP TABLE base_table5");
         assertUpdate("DROP MATERIALIZED VIEW materialized_view_level1");
         assertUpdate("DROP MATERIALIZED VIEW materialized_view_level2");
     }
@@ -709,6 +789,11 @@ public Object[][] testTemporalPartitioningDataProvider()
         };
     }
 
+    protected String getColumnComment(String tableName, String columnName)
+    {
+        return (String) computeScalar("SELECT comment FROM information_schema.columns WHERE table_schema = '" + getSession().getSchema().orElseThrow() + "' AND table_name = '" + tableName + "' AND column_name = '" + columnName + "'");
+    }
+
     private SchemaTableName getStorageTable(String materializedViewName)
     {
         return getStorageTable(getSession().getCatalog().orElseThrow(), getSession().getSchema().orElseThrow(), materializedViewName);
@@ -724,4 +809,9 @@ private SchemaTableName getStorageTable(String catalogName, String schemaName, S
         assertThat(materializedView).isPresent();
         return materializedView.get().getStorageTable().get().getSchemaTableName();
     }
+
+    private long getLatestSnapshotId(String tableName)
+    {
+        return (long) computeScalar(format("SELECT snapshot_id FROM \"%s$snapshots\" ORDER BY committed_at DESC FETCH FIRST 1 ROW WITH TIES", tableName));
+    }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergMinioConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergMinioConnectorSmokeTest.java
index 450083e11e0e..c814d974e882 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergMinioConnectorSmokeTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergMinioConnectorSmokeTest.java
@@ -14,28 +14,16 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import io.minio.messages.Event;
 import io.trino.Session;
-import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
-import io.trino.hdfs.ConfigurationInitializer;
-import io.trino.hdfs.DynamicHdfsConfiguration;
-import io.trino.hdfs.HdfsConfig;
-import io.trino.hdfs.HdfsConfiguration;
-import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.hdfs.HdfsEnvironment;
-import io.trino.hdfs.authentication.NoHdfsAuthentication;
 import io.trino.plugin.hive.containers.HiveMinioDataLake;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.thrift.BridgingHiveMetastore;
-import io.trino.plugin.hive.s3.HiveS3Config;
-import io.trino.plugin.hive.s3.TrinoS3ConfigurationInitializer;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.minio.MinioClient;
 import org.apache.iceberg.FileFormat;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -47,6 +35,7 @@
 import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
+import static io.trino.testing.containers.Minio.MINIO_REGION;
 import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
@@ -55,25 +44,16 @@
 public abstract class BaseIcebergMinioConnectorSmokeTest
         extends BaseIcebergConnectorSmokeTest
 {
-    protected final TrinoFileSystemFactory fileSystemFactory;
-
     private final String schemaName;
     private final String bucketName;
 
     private HiveMinioDataLake hiveMinioDataLake;
 
-    public BaseIcebergMinioConnectorSmokeTest(FileFormat format)
+    protected BaseIcebergMinioConnectorSmokeTest(FileFormat format)
     {
         super(format);
         this.schemaName = "tpch_" + format.name().toLowerCase(ENGLISH);
         this.bucketName = "test-iceberg-minio-smoke-test-" + randomNameSuffix();
-
-        ConfigurationInitializer s3Config = new TrinoS3ConfigurationInitializer(new HiveS3Config()
-                .setS3AwsAccessKey(MINIO_ACCESS_KEY)
-                .setS3AwsSecretKey(MINIO_SECRET_KEY));
-        HdfsConfigurationInitializer initializer = new HdfsConfigurationInitializer(new HdfsConfig(), ImmutableSet.of(s3Config));
-        HdfsConfiguration hdfsConfiguration = new DynamicHdfsConfiguration(initializer, ImmutableSet.of());
-        this.fileSystemFactory = new HdfsFileSystemFactory(new HdfsEnvironment(hdfsConfiguration, new HdfsConfig(), new NoHdfsAuthentication()));
     }
 
     @Override
@@ -89,12 +69,16 @@ protected QueryRunner createQueryRunner()
                                 .put("iceberg.file-format", format.name())
                                 .put("iceberg.catalog.type", "HIVE_METASTORE")
                                 .put("hive.metastore.uri", "thrift://" + hiveMinioDataLake.getHiveHadoop().getHiveMetastoreEndpoint())
-                                .put("hive.metastore-timeout", "1m") // read timed out sometimes happens with the default timeout
-                                .put("hive.s3.aws-access-key", MINIO_ACCESS_KEY)
-                                .put("hive.s3.aws-secret-key", MINIO_SECRET_KEY)
-                                .put("hive.s3.endpoint", "http://" + hiveMinioDataLake.getMinio().getMinioApiEndpoint())
-                                .put("hive.s3.path-style-access", "true")
-                                .put("hive.s3.streaming.part-size", "5MB")
+                                .put("hive.metastore.thrift.client.read-timeout", "1m") // read timed out sometimes happens with the default timeout
+                                .put("fs.hadoop.enabled", "false")
+                                .put("fs.native-s3.enabled", "true")
+                                .put("s3.aws-access-key", MINIO_ACCESS_KEY)
+                                .put("s3.aws-secret-key", MINIO_SECRET_KEY)
+                                .put("s3.region", MINIO_REGION)
+                                .put("s3.endpoint", hiveMinioDataLake.getMinio().getMinioAddress())
+                                .put("s3.path-style-access", "true")
+                                .put("s3.streaming.part-size", "5MB") // minimize memory usage
+                                .put("s3.max-connections", "2") // verify no leaks
                                 .put("iceberg.register-table-procedure.enabled", "true")
                                 .put("iceberg.writer-sort-buffer-size", "1MB")
                                 .buildOrThrow())
@@ -205,7 +189,7 @@ public void testExpireSnapshotsBatchDeletes()
 
         assertThat(query("SELECT * FROM " + tableName))
                 .matches("VALUES (VARCHAR 'one', 1), (VARCHAR 'two', 2)");
-        assertThat(events).hasSize(2);
+        assertThat(events).hasSize(3);
         // if files were deleted in batch there should be only one request id because there was one request only
         assertThat(events.stream()
                 .map(event -> event.responseElements().get("x-amz-request-id"))
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergSystemTables.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergSystemTables.java
new file mode 100644
index 000000000000..32697ad6090e
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergSystemTables.java
@@ -0,0 +1,290 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.MaterializedResult;
+import io.trino.testing.MaterializedRow;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.time.LocalDate;
+import java.util.Map;
+import java.util.function.Function;
+
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static io.trino.plugin.iceberg.IcebergFileFormat.PARQUET;
+import static io.trino.testing.MaterializedResult.DEFAULT_PRECISION;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertEquals;
+
+public abstract class BaseIcebergSystemTables
+        extends AbstractTestQueryFramework
+{
+    private final IcebergFileFormat format;
+
+    protected BaseIcebergSystemTables(IcebergFileFormat format)
+    {
+        this.format = requireNonNull(format, "format is null");
+    }
+
+    @Override
+    protected DistributedQueryRunner createQueryRunner()
+            throws Exception
+    {
+        return IcebergQueryRunner.builder()
+                .setIcebergProperties(ImmutableMap.of("iceberg.file-format", format.name()))
+                .build();
+    }
+
+    @BeforeClass
+    public void setUp()
+    {
+        assertUpdate("CREATE SCHEMA test_schema");
+        assertUpdate("CREATE TABLE test_schema.test_table (_bigint BIGINT, _date DATE) WITH (partitioning = ARRAY['_date'])");
+        assertUpdate("INSERT INTO test_schema.test_table VALUES (0, CAST('2019-09-08' AS DATE)), (1, CAST('2019-09-09' AS DATE)), (2, CAST('2019-09-09' AS DATE))", 3);
+        assertUpdate("INSERT INTO test_schema.test_table VALUES (3, CAST('2019-09-09' AS DATE)), (4, CAST('2019-09-10' AS DATE)), (5, CAST('2019-09-10' AS DATE))", 3);
+        assertQuery("SELECT count(*) FROM test_schema.test_table", "VALUES 6");
+
+        assertUpdate("CREATE TABLE test_schema.test_table_multilevel_partitions (_varchar VARCHAR, _bigint BIGINT, _date DATE) WITH (partitioning = ARRAY['_bigint', '_date'])");
+        assertUpdate("INSERT INTO test_schema.test_table_multilevel_partitions VALUES ('a', 0, CAST('2019-09-08' AS DATE)), ('a', 1, CAST('2019-09-08' AS DATE)), ('a', 0, CAST('2019-09-09' AS DATE))", 3);
+        assertQuery("SELECT count(*) FROM test_schema.test_table_multilevel_partitions", "VALUES 3");
+
+        assertUpdate("CREATE TABLE test_schema.test_table_drop_column (_varchar VARCHAR, _bigint BIGINT, _date DATE) WITH (partitioning = ARRAY['_date'])");
+        assertUpdate("INSERT INTO test_schema.test_table_drop_column VALUES ('a', 0, CAST('2019-09-08' AS DATE)), ('a', 1, CAST('2019-09-09' AS DATE)), ('b', 2, CAST('2019-09-09' AS DATE))", 3);
+        assertUpdate("INSERT INTO test_schema.test_table_drop_column VALUES ('c', 3, CAST('2019-09-09' AS DATE)), ('a', 4, CAST('2019-09-10' AS DATE)), ('b', 5, CAST('2019-09-10' AS DATE))", 3);
+        assertQuery("SELECT count(*) FROM test_schema.test_table_drop_column", "VALUES 6");
+        assertUpdate("ALTER TABLE test_schema.test_table_drop_column DROP COLUMN _varchar");
+
+        assertUpdate("CREATE TABLE test_schema.test_table_nan (_bigint BIGINT, _double DOUBLE, _real REAL, _date DATE) WITH (partitioning = ARRAY['_date'])");
+        assertUpdate("INSERT INTO test_schema.test_table_nan VALUES (1, 1.1, 1.2, CAST('2022-01-01' AS DATE)), (2, nan(), 2.2, CAST('2022-01-02' AS DATE)), (3, 3.3, nan(), CAST('2022-01-03' AS DATE))", 3);
+        assertUpdate("INSERT INTO test_schema.test_table_nan VALUES (4, nan(), 4.1, CAST('2022-01-04' AS DATE)), (5, 4.2, nan(), CAST('2022-01-04' AS DATE)), (6, nan(), nan(), CAST('2022-01-04' AS DATE))", 3);
+        assertQuery("SELECT count(*) FROM test_schema.test_table_nan", "VALUES 6");
+
+        assertUpdate("CREATE TABLE test_schema.test_table_with_dml (_varchar VARCHAR, _date DATE) WITH (partitioning = ARRAY['_date'])");
+        assertUpdate(
+                "INSERT INTO test_schema.test_table_with_dml " +
+                        "VALUES " +
+                        "('a1', DATE '2022-01-01'), ('a2', DATE '2022-01-01'), " +
+                        "('b1', DATE '2022-02-02'), ('b2', DATE '2022-02-02'), " +
+                        "('c1', DATE '2022-03-03'), ('c2', DATE '2022-03-03')",
+                6);
+        assertUpdate("UPDATE test_schema.test_table_with_dml SET _varchar = 'a1.updated' WHERE _date = DATE '2022-01-01' AND _varchar = 'a1'", 1);
+        assertUpdate("DELETE FROM test_schema.test_table_with_dml WHERE _date = DATE '2022-02-02' AND _varchar = 'b2'", 1);
+        assertUpdate("INSERT INTO test_schema.test_table_with_dml VALUES ('c3', DATE '2022-03-03'), ('d1', DATE '2022-04-04')", 2);
+        assertQuery("SELECT count(*) FROM test_schema.test_table_with_dml", "VALUES 7");
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void tearDown()
+    {
+        assertUpdate("DROP TABLE IF EXISTS test_schema.test_table");
+        assertUpdate("DROP TABLE IF EXISTS test_schema.test_table_multilevel_partitions");
+        assertUpdate("DROP TABLE IF EXISTS test_schema.test_table_drop_column");
+        assertUpdate("DROP TABLE IF EXISTS test_schema.test_table_nan");
+        assertUpdate("DROP TABLE IF EXISTS test_schema.test_table_with_dml");
+        assertUpdate("DROP SCHEMA IF EXISTS test_schema");
+    }
+
+    @Test
+    public void testPartitionTable()
+    {
+        assertQuery("SELECT count(*) FROM test_schema.test_table", "VALUES 6");
+        assertQuery("SHOW COLUMNS FROM test_schema.\"test_table$partitions\"",
+                "VALUES ('partition', 'row(_date date)', '', '')," +
+                        "('record_count', 'bigint', '', '')," +
+                        "('file_count', 'bigint', '', '')," +
+                        "('total_size', 'bigint', '', '')," +
+                        "('data', 'row(_bigint row(min bigint, max bigint, null_count bigint, nan_count bigint))', '', '')");
+
+        MaterializedResult result = computeActual("SELECT * from test_schema.\"test_table$partitions\"");
+        assertEquals(result.getRowCount(), 3);
+
+        Map<LocalDate, MaterializedRow> rowsByPartition = result.getMaterializedRows().stream()
+                .collect(toImmutableMap(row -> ((LocalDate) ((MaterializedRow) row.getField(0)).getField(0)), Function.identity()));
+
+        // Test if row counts are computed correctly
+        assertEquals(rowsByPartition.get(LocalDate.parse("2019-09-08")).getField(1), 1L);
+        assertEquals(rowsByPartition.get(LocalDate.parse("2019-09-09")).getField(1), 3L);
+        assertEquals(rowsByPartition.get(LocalDate.parse("2019-09-10")).getField(1), 2L);
+
+        // Test if min/max values, null value count and nan value count are computed correctly.
+        assertEquals(rowsByPartition.get(LocalDate.parse("2019-09-08")).getField(4), new MaterializedRow(DEFAULT_PRECISION, new MaterializedRow(DEFAULT_PRECISION, 0L, 0L, 0L, null)));
+        assertEquals(rowsByPartition.get(LocalDate.parse("2019-09-09")).getField(4), new MaterializedRow(DEFAULT_PRECISION, new MaterializedRow(DEFAULT_PRECISION, 1L, 3L, 0L, null)));
+        assertEquals(rowsByPartition.get(LocalDate.parse("2019-09-10")).getField(4), new MaterializedRow(DEFAULT_PRECISION, new MaterializedRow(DEFAULT_PRECISION, 4L, 5L, 0L, null)));
+    }
+
+    @Test
+    public void testPartitionTableWithNan()
+    {
+        assertQuery("SELECT count(*) FROM test_schema.test_table_nan", "VALUES 6");
+
+        MaterializedResult result = computeActual("SELECT * from test_schema.\"test_table_nan$partitions\"");
+        assertEquals(result.getRowCount(), 4);
+
+        Map<LocalDate, MaterializedRow> rowsByPartition = result.getMaterializedRows().stream()
+                .collect(toImmutableMap(row -> ((LocalDate) ((MaterializedRow) row.getField(0)).getField(0)), Function.identity()));
+
+        // Test if row counts are computed correctly
+        assertEquals(rowsByPartition.get(LocalDate.parse("2022-01-01")).getField(1), 1L);
+        assertEquals(rowsByPartition.get(LocalDate.parse("2022-01-02")).getField(1), 1L);
+        assertEquals(rowsByPartition.get(LocalDate.parse("2022-01-03")).getField(1), 1L);
+        assertEquals(rowsByPartition.get(LocalDate.parse("2022-01-04")).getField(1), 3L);
+
+        // Test if min/max values, null value count and nan value count are computed correctly.
+        assertEquals(
+                rowsByPartition.get(LocalDate.parse("2022-01-01")).getField(4),
+                new MaterializedRow(DEFAULT_PRECISION,
+                        new MaterializedRow(DEFAULT_PRECISION, 1L, 1L, 0L, null),
+                        new MaterializedRow(DEFAULT_PRECISION, 1.1d, 1.1d, 0L, null),
+                        new MaterializedRow(DEFAULT_PRECISION, 1.2f, 1.2f, 0L, null)));
+        assertEquals(
+                rowsByPartition.get(LocalDate.parse("2022-01-02")).getField(4),
+                new MaterializedRow(DEFAULT_PRECISION,
+                        new MaterializedRow(DEFAULT_PRECISION, 2L, 2L, 0L, null),
+                        new MaterializedRow(DEFAULT_PRECISION, null, null, 0L, nanCount(1L)),
+                        new MaterializedRow(DEFAULT_PRECISION, 2.2f, 2.2f, 0L, null)));
+        assertEquals(
+                rowsByPartition.get(LocalDate.parse("2022-01-03")).getField(4),
+                new MaterializedRow(DEFAULT_PRECISION,
+                        new MaterializedRow(DEFAULT_PRECISION, 3L, 3L, 0L, null),
+                        new MaterializedRow(DEFAULT_PRECISION, 3.3, 3.3d, 0L, null),
+                        new MaterializedRow(DEFAULT_PRECISION, null, null, 0L, nanCount(1L))));
+        assertEquals(
+                rowsByPartition.get(LocalDate.parse("2022-01-04")).getField(4),
+                new MaterializedRow(DEFAULT_PRECISION,
+                        new MaterializedRow(DEFAULT_PRECISION, 4L, 6L, 0L, null),
+                        new MaterializedRow(DEFAULT_PRECISION, null, null, 0L, nanCount(2L)),
+                        new MaterializedRow(DEFAULT_PRECISION, null, null, 0L, nanCount(2L))));
+    }
+
+    @Test
+    public void testPartitionTableOnDropColumn()
+    {
+        MaterializedResult resultAfterDrop = computeActual("SELECT * from test_schema.\"test_table_drop_column$partitions\"");
+        assertEquals(resultAfterDrop.getRowCount(), 3);
+        Map<LocalDate, MaterializedRow> rowsByPartitionAfterDrop = resultAfterDrop.getMaterializedRows().stream()
+                .collect(toImmutableMap(row -> ((LocalDate) ((MaterializedRow) row.getField(0)).getField(0)), Function.identity()));
+        assertEquals(rowsByPartitionAfterDrop.get(LocalDate.parse("2019-09-08")).getField(4), new MaterializedRow(DEFAULT_PRECISION,
+                new MaterializedRow(DEFAULT_PRECISION, 0L, 0L, 0L, null)));
+    }
+
+    @Test
+    public void testFilesTableOnDropColumn()
+    {
+        assertQuery("SELECT sum(record_count) FROM test_schema.\"test_table_drop_column$files\"", "VALUES 6");
+    }
+
+    @Test
+    public void testHistoryTable()
+    {
+        assertQuery("SHOW COLUMNS FROM test_schema.\"test_table$history\"",
+                "VALUES ('made_current_at', 'timestamp(3) with time zone', '', '')," +
+                        "('snapshot_id', 'bigint', '', '')," +
+                        "('parent_id', 'bigint', '', '')," +
+                        "('is_current_ancestor', 'boolean', '', '')");
+
+        // Test the number of history entries
+        assertQuery("SELECT count(*) FROM test_schema.\"test_table$history\"", "VALUES 3");
+    }
+
+    @Test
+    public void testSnapshotsTable()
+    {
+        assertQuery("SHOW COLUMNS FROM test_schema.\"test_table$snapshots\"",
+                "VALUES ('committed_at', 'timestamp(3) with time zone', '', '')," +
+                        "('snapshot_id', 'bigint', '', '')," +
+                        "('parent_id', 'bigint', '', '')," +
+                        "('operation', 'varchar', '', '')," +
+                        "('manifest_list', 'varchar', '', '')," +
+                        "('summary', 'map(varchar, varchar)', '', '')");
+
+        assertQuery("SELECT operation FROM test_schema.\"test_table$snapshots\"", "VALUES 'append', 'append', 'append'");
+        assertQuery("SELECT summary['total-records'] FROM test_schema.\"test_table$snapshots\"", "VALUES '0', '3', '6'");
+    }
+
+    @Test
+    public void testManifestsTable()
+    {
+        assertQuery("SHOW COLUMNS FROM test_schema.\"test_table$manifests\"",
+                "VALUES ('path', 'varchar', '', '')," +
+                        "('length', 'bigint', '', '')," +
+                        "('partition_spec_id', 'integer', '', '')," +
+                        "('added_snapshot_id', 'bigint', '', '')," +
+                        "('added_data_files_count', 'integer', '', '')," +
+                        "('added_rows_count', 'bigint', '', '')," +
+                        "('existing_data_files_count', 'integer', '', '')," +
+                        "('existing_rows_count', 'bigint', '', '')," +
+                        "('deleted_data_files_count', 'integer', '', '')," +
+                        "('deleted_rows_count', 'bigint', '', '')," +
+                        "('partitions', 'array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar))', '', '')");
+        assertQuerySucceeds("SELECT * FROM test_schema.\"test_table$manifests\"");
+        assertThat(query("SELECT added_data_files_count, existing_rows_count, added_rows_count, deleted_data_files_count, deleted_rows_count, partitions FROM test_schema.\"test_table$manifests\""))
+                .matches(
+                        "VALUES " +
+                                "    (2, BIGINT '0', BIGINT '3', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2019-09-08', '2019-09-09')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar)))) , " +
+                                "    (2, BIGINT '0', BIGINT '3', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2019-09-09', '2019-09-10')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar))))");
+
+        assertQuerySucceeds("SELECT * FROM test_schema.\"test_table_multilevel_partitions$manifests\"");
+        assertThat(query("SELECT added_data_files_count, existing_rows_count, added_rows_count, deleted_data_files_count, deleted_rows_count, partitions FROM test_schema.\"test_table_multilevel_partitions$manifests\""))
+                .matches(
+                        "VALUES " +
+                                "(3, BIGINT '0', BIGINT '3', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '0', '1'), ROW(false, false, '2019-09-08', '2019-09-09')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar))))");
+
+        assertQuerySucceeds("SELECT * FROM test_schema.\"test_table_with_dml$manifests\"");
+        assertThat(query("SELECT added_data_files_count, existing_rows_count, added_rows_count, deleted_data_files_count, deleted_rows_count, partitions FROM test_schema.\"test_table_with_dml$manifests\""))
+                .matches(
+                        "VALUES " +
+                                // INSERT on '2022-01-01', '2022-02-02', '2022-03-03' partitions
+                                "(3, BIGINT '0', BIGINT '6', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2022-01-01', '2022-03-03')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar)))), " +
+                                // UPDATE on '2022-01-01' partition
+                                "(1, BIGINT '0', BIGINT '1', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2022-01-01', '2022-01-01')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar)))), " +
+                                "(1, BIGINT '0', BIGINT '1', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2022-01-01', '2022-01-01')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar)))), " +
+                                // DELETE from '2022-02-02' partition
+                                "(1, BIGINT '0', BIGINT '1', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2022-02-02', '2022-02-02')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar)))), " +
+                                // INSERT on '2022-03-03', '2022-04-04' partitions
+                                "(2, BIGINT '0', BIGINT '2', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2022-03-03', '2022-04-04')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar))))");
+    }
+
+    @Test
+    public void testFilesTable()
+    {
+        assertQuery("SHOW COLUMNS FROM test_schema.\"test_table$files\"",
+                "VALUES ('content', 'integer', '', '')," +
+                        "('file_path', 'varchar', '', '')," +
+                        "('file_format', 'varchar', '', '')," +
+                        "('record_count', 'bigint', '', '')," +
+                        "('file_size_in_bytes', 'bigint', '', '')," +
+                        "('column_sizes', 'map(integer, bigint)', '', '')," +
+                        "('value_counts', 'map(integer, bigint)', '', '')," +
+                        "('null_value_counts', 'map(integer, bigint)', '', '')," +
+                        "('nan_value_counts', 'map(integer, bigint)', '', '')," +
+                        "('lower_bounds', 'map(integer, varchar)', '', '')," +
+                        "('upper_bounds', 'map(integer, varchar)', '', '')," +
+                        "('key_metadata', 'varbinary', '', '')," +
+                        "('split_offsets', 'array(bigint)', '', '')," +
+                        "('equality_ids', 'array(integer)', '', '')");
+        assertQuerySucceeds("SELECT * FROM test_schema.\"test_table$files\"");
+    }
+
+    private Long nanCount(long value)
+    {
+        // Parquet does not have nan count metrics
+        return format == PARQUET ? null : value;
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/DataFileRecord.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/DataFileRecord.java
index 9c1db9802d0e..249f5e740dba 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/DataFileRecord.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/DataFileRecord.java
@@ -34,6 +34,7 @@ public class DataFileRecord
     private final Map<Integer, String> lowerBounds;
     private final Map<Integer, String> upperBounds;
 
+    @SuppressWarnings("unchecked")
     public static DataFileRecord toDataFileRecord(MaterializedRow row)
     {
         assertEquals(row.getFieldCount(), 14);
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java
index c1b1551f5d52..b75c67b9ed10 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java
@@ -18,11 +18,13 @@
 import com.google.common.io.Resources;
 import io.airlift.http.server.testing.TestingHttpServer;
 import io.airlift.log.Logger;
+import io.airlift.log.Logging;
 import io.trino.plugin.hive.containers.HiveHadoop;
 import io.trino.plugin.hive.containers.HiveMinioDataLake;
 import io.trino.plugin.iceberg.catalog.jdbc.TestingIcebergJdbcServer;
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.containers.Minio;
 import io.trino.tpch.TpchTable;
 import org.apache.iceberg.catalog.Catalog;
 import org.apache.iceberg.rest.DelegatingRestSessionCatalog;
@@ -170,6 +172,7 @@ public static void main(String[] args)
             TestingHttpServer testServer = delegatingCatalog.testServer();
             testServer.start();
 
+            @SuppressWarnings("resource")
             DistributedQueryRunner queryRunner = IcebergQueryRunner.builder()
                     .setExtraProperties(ImmutableMap.of("http-server.http.port", "8080"))
                     .setBaseDataDir(Optional.of(warehouseLocation.toPath()))
@@ -194,6 +197,7 @@ public static void main(String[] args)
         {
             // Requires AWS credentials, which can be provided any way supported by the DefaultProviderChain
             // See https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html#credentials-default
+            @SuppressWarnings("resource")
             DistributedQueryRunner queryRunner = IcebergQueryRunner.builder()
                     .setExtraProperties(ImmutableMap.of("http-server.http.port", "8080"))
                     .setIcebergProperties(ImmutableMap.of("iceberg.catalog.type", "glue"))
@@ -205,9 +209,9 @@ public static void main(String[] args)
         }
     }
 
-    public static final class IcebergMinIoHiveMetastoreQueryRunnerMain
+    public static final class IcebergMinioHiveMetastoreQueryRunnerMain
     {
-        private IcebergMinIoHiveMetastoreQueryRunnerMain() {}
+        private IcebergMinioHiveMetastoreQueryRunnerMain() {}
 
         public static void main(String[] args)
                 throws Exception
@@ -217,6 +221,7 @@ public static void main(String[] args)
             HiveMinioDataLake hiveMinioDataLake = new HiveMinioDataLake(bucketName);
             hiveMinioDataLake.start();
 
+            @SuppressWarnings("resource")
             DistributedQueryRunner queryRunner = IcebergQueryRunner.builder()
                     .setCoordinatorProperties(Map.of(
                             "http-server.http.port", "8080"))
@@ -225,7 +230,7 @@ public static void main(String[] args)
                             "hive.metastore.uri", "thrift://" + hiveMinioDataLake.getHiveHadoop().getHiveMetastoreEndpoint(),
                             "hive.s3.aws-access-key", MINIO_ACCESS_KEY,
                             "hive.s3.aws-secret-key", MINIO_SECRET_KEY,
-                            "hive.s3.endpoint", "http://" + hiveMinioDataLake.getMinio().getMinioApiEndpoint(),
+                            "hive.s3.endpoint", hiveMinioDataLake.getMinio().getMinioAddress(),
                             "hive.s3.path-style-access", "true",
                             "hive.s3.streaming.part-size", "5MB"))
                     .setSchemaInitializer(
@@ -236,8 +241,47 @@ public static void main(String[] args)
                                     .build())
                     .build();
 
-            Thread.sleep(10);
-            Logger log = Logger.get(IcebergMinIoHiveMetastoreQueryRunnerMain.class);
+            Logger log = Logger.get(IcebergMinioHiveMetastoreQueryRunnerMain.class);
+            log.info("======== SERVER STARTED ========");
+            log.info("\n====\n%s\n====", queryRunner.getCoordinator().getBaseUrl());
+        }
+    }
+
+    public static final class IcebergMinioQueryRunnerMain
+    {
+        private IcebergMinioQueryRunnerMain() {}
+
+        public static void main(String[] args)
+                throws Exception
+        {
+            Logging.initialize();
+
+            String bucketName = "test-bucket";
+            @SuppressWarnings("resource")
+            Minio minio = Minio.builder().build();
+            minio.start();
+            minio.createBucket(bucketName);
+
+            @SuppressWarnings("resource")
+            DistributedQueryRunner queryRunner = IcebergQueryRunner.builder()
+                    .setCoordinatorProperties(Map.of(
+                            "http-server.http.port", "8080"))
+                    .setIcebergProperties(Map.of(
+                            "iceberg.catalog.type", "TESTING_FILE_METASTORE",
+                            "hive.metastore.catalog.dir", "s3://%s/".formatted(bucketName),
+                            "hive.s3.aws-access-key", MINIO_ACCESS_KEY,
+                            "hive.s3.aws-secret-key", MINIO_SECRET_KEY,
+                            "hive.s3.endpoint", "http://" + minio.getMinioApiEndpoint(),
+                            "hive.s3.path-style-access", "true",
+                            "hive.s3.streaming.part-size", "5MB"))
+                    .setSchemaInitializer(
+                            SchemaInitializer.builder()
+                                    .withSchemaName("tpch")
+                                    .withClonedTpchTables(TpchTable.getTables())
+                                    .build())
+                    .build();
+
+            Logger log = Logger.get(IcebergMinioQueryRunnerMain.class);
             log.info("======== SERVER STARTED ========");
             log.info("\n====\n%s\n====", queryRunner.getCoordinator().getBaseUrl());
         }
@@ -276,6 +320,7 @@ public static void main(String[] args)
                     .build();
             hiveHadoop.start();
 
+            @SuppressWarnings("resource")
             DistributedQueryRunner queryRunner = IcebergQueryRunner.builder()
                     .setCoordinatorProperties(Map.of(
                             "http-server.http.port", "8080"))
@@ -292,7 +337,6 @@ public static void main(String[] args)
                                     .build())
                     .build();
 
-            Thread.sleep(10);
             Logger log = Logger.get(IcebergAzureQueryRunnerMain.class);
             log.info("======== SERVER STARTED ========");
             log.info("\n====\n%s\n====", queryRunner.getCoordinator().getBaseUrl());
@@ -311,6 +355,7 @@ public static void main(String[] args)
 
             TestingIcebergJdbcServer server = new TestingIcebergJdbcServer();
 
+            @SuppressWarnings("resource")
             DistributedQueryRunner queryRunner = IcebergQueryRunner.builder()
                     .setExtraProperties(ImmutableMap.of("http-server.http.port", "8080"))
                     .setIcebergProperties(ImmutableMap.<String, String>builder()
@@ -339,18 +384,11 @@ public static void main(String[] args)
                 throws Exception
         {
             Logger log = Logger.get(DefaultIcebergQueryRunnerMain.class);
-            DistributedQueryRunner queryRunner = null;
-            try {
-                queryRunner = IcebergQueryRunner.builder()
-                        .setExtraProperties(ImmutableMap.of("http-server.http.port", "8080"))
-                        .setInitialTables(TpchTable.getTables())
-                        .build();
-            }
-            catch (Throwable t) {
-                log.error(t);
-                System.exit(1);
-            }
-            Thread.sleep(10);
+            @SuppressWarnings("resource")
+            DistributedQueryRunner queryRunner = IcebergQueryRunner.builder()
+                    .setExtraProperties(ImmutableMap.of("http-server.http.port", "8080"))
+                    .setInitialTables(TpchTable.getTables())
+                    .build();
             log.info("======== SERVER STARTED ========");
             log.info("\n====\n%s\n====", queryRunner.getCoordinator().getBaseUrl());
         }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergTestUtils.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergTestUtils.java
index c23260ccc02d..39199092f2c3 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergTestUtils.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergTestUtils.java
@@ -15,11 +15,11 @@
 
 import io.airlift.slice.Slice;
 import io.trino.Session;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.filesystem.local.LocalInputFile;
-import io.trino.orc.FileOrcDataSource;
 import io.trino.orc.OrcDataSource;
 import io.trino.orc.OrcReader;
 import io.trino.orc.OrcReaderOptions;
@@ -30,12 +30,12 @@
 import io.trino.parquet.reader.MetadataReader;
 import io.trino.plugin.hive.FileFormatDataSourceStats;
 import io.trino.plugin.hive.parquet.TrinoParquetDataSource;
+import io.trino.testing.DistributedQueryRunner;
 import org.apache.parquet.hadoop.metadata.BlockMetaData;
 import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData;
 import org.apache.parquet.hadoop.metadata.ParquetMetadata;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.List;
@@ -46,7 +46,7 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterators.getOnlyElement;
 import static com.google.common.collect.MoreCollectors.onlyElement;
-import static io.trino.testing.TestingConnectorSession.SESSION;
+import static io.trino.plugin.iceberg.IcebergQueryRunner.ICEBERG_CATALOG;
 
 public final class IcebergTestUtils
 {
@@ -57,29 +57,15 @@ public static Session withSmallRowGroups(Session session)
     {
         return Session.builder(session)
                 .setCatalogSessionProperty("iceberg", "orc_writer_max_stripe_rows", "10")
-                .setCatalogSessionProperty("iceberg", "parquet_writer_page_size", "100B")
-                .setCatalogSessionProperty("iceberg", "parquet_writer_block_size", "100B")
+                .setCatalogSessionProperty("iceberg", "parquet_writer_block_size", "1kB")
                 .setCatalogSessionProperty("iceberg", "parquet_writer_batch_size", "10")
                 .build();
     }
 
-    public static boolean checkOrcFileSorting(String path, String sortColumnName)
+    public static boolean checkOrcFileSorting(TrinoFileSystem fileSystem, Location path, String sortColumnName)
     {
         return checkOrcFileSorting(() -> {
             try {
-                return new FileOrcDataSource(new File(path), new OrcReaderOptions());
-            }
-            catch (FileNotFoundException e) {
-                throw new UncheckedIOException(e);
-            }
-        }, sortColumnName);
-    }
-
-    public static boolean checkOrcFileSorting(TrinoFileSystemFactory fileSystemFactory, String path, String sortColumnName)
-    {
-        return checkOrcFileSorting(() -> {
-            try {
-                TrinoFileSystem fileSystem = fileSystemFactory.create(SESSION);
                 return new TrinoOrcDataSource(fileSystem.newInputFile(path), new OrcReaderOptions(), new FileFormatDataSourceStats());
             }
             catch (IOException e) {
@@ -160,4 +146,10 @@ public static boolean checkParquetFileSorting(TrinoInputFile inputFile, String s
         }
         return true;
     }
+
+    public static TrinoFileSystemFactory getFileSystemFactory(DistributedQueryRunner queryRunner)
+    {
+        return ((IcebergConnector) queryRunner.getCoordinator().getConnector(ICEBERG_CATALOG))
+                .getInjector().getInstance(TrinoFileSystemFactory.class);
+    }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestConstraintExtractor.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestConstraintExtractor.java
index e781df3e2236..0d2bc2cedef3 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestConstraintExtractor.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestConstraintExtractor.java
@@ -40,11 +40,10 @@
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FunctionCall;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.transaction.NoOpTransactionManager;
 import io.trino.transaction.TransactionId;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -65,7 +64,9 @@
 import static io.trino.spi.type.Timestamps.MILLISECONDS_PER_DAY;
 import static io.trino.spi.type.Timestamps.MILLISECONDS_PER_SECOND;
 import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_MICROSECOND;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createVarcharType;
+import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.analyzer.TypeSignatureTranslator.toSqlType;
 import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
@@ -117,7 +118,7 @@ public void testExtractTimestampTzDateComparison()
         Cast castOfColumn = new Cast(new SymbolReference(timestampTzColumnSymbol), toSqlType(DATE));
 
         LocalDate someDate = LocalDate.of(2005, 9, 10);
-        Expression someDateExpression = LITERAL_ENCODER.toExpression(TEST_SESSION, someDate.toEpochDay(), DATE);
+        Expression someDateExpression = LITERAL_ENCODER.toExpression(someDate.toEpochDay(), DATE);
 
         long startOfDateUtcEpochMillis = someDate.atStartOfDay().toEpochSecond(UTC) * MILLISECONDS_PER_SECOND;
         LongTimestampWithTimeZone startOfDateUtc = timestampTzFromEpochMillis(startOfDateUtcEpochMillis);
@@ -184,18 +185,16 @@ public void testExtractDateTruncTimestampTzComparison()
     {
         String timestampTzColumnSymbol = "timestamp_tz_symbol";
         FunctionCall truncateToDay = new FunctionCall(
-                QualifiedName.of("date_trunc"),
+                PLANNER_CONTEXT.getMetadata().resolveBuiltinFunction("date_trunc", fromTypes(VARCHAR, TIMESTAMP_TZ_MICROS)).toQualifiedName(),
                 List.of(
-                        LITERAL_ENCODER.toExpression(TEST_SESSION, utf8Slice("day"), createVarcharType(17)),
+                        LITERAL_ENCODER.toExpression(utf8Slice("day"), createVarcharType(17)),
                         new SymbolReference(timestampTzColumnSymbol)));
 
         LocalDate someDate = LocalDate.of(2005, 9, 10);
         Expression someMidnightExpression = LITERAL_ENCODER.toExpression(
-                TEST_SESSION,
                 LongTimestampWithTimeZone.fromEpochMillisAndFraction(someDate.toEpochDay() * MILLISECONDS_PER_DAY, 0, UTC_KEY),
                 TIMESTAMP_TZ_MICROS);
         Expression someMiddayExpression = LITERAL_ENCODER.toExpression(
-                TEST_SESSION,
                 LongTimestampWithTimeZone.fromEpochMillisAndFraction(someDate.toEpochDay() * MILLISECONDS_PER_DAY, PICOSECONDS_PER_MICROSECOND, UTC_KEY),
                 TIMESTAMP_TZ_MICROS);
 
@@ -270,14 +269,11 @@ public void testExtractYearTimestampTzComparison()
     {
         String timestampTzColumnSymbol = "timestamp_tz_symbol";
         FunctionCall extractYear = new FunctionCall(
-                QualifiedName.of("year"),
+                PLANNER_CONTEXT.getMetadata().resolveBuiltinFunction("year", fromTypes(TIMESTAMP_TZ_MICROS)).toQualifiedName(),
                 List.of(new SymbolReference(timestampTzColumnSymbol)));
 
         LocalDate someDate = LocalDate.of(2005, 9, 10);
-        Expression yearExpression = LITERAL_ENCODER.toExpression(
-                TEST_SESSION,
-                2005L,
-                BIGINT);
+        Expression yearExpression = LITERAL_ENCODER.toExpression(2005L, BIGINT);
 
         long startOfYearUtcEpochMillis = someDate.withDayOfYear(1).atStartOfDay().toEpochSecond(UTC) * MILLISECONDS_PER_SECOND;
         LongTimestampWithTimeZone startOfYearUtc = timestampTzFromEpochMillis(startOfYearUtcEpochMillis);
@@ -339,7 +335,7 @@ public void testIntersectSummaryAndExpressionExtraction()
         Cast castOfColumn = new Cast(new SymbolReference(timestampTzColumnSymbol), toSqlType(DATE));
 
         LocalDate someDate = LocalDate.of(2005, 9, 10);
-        Expression someDateExpression = LITERAL_ENCODER.toExpression(TEST_SESSION, someDate.toEpochDay(), DATE);
+        Expression someDateExpression = LITERAL_ENCODER.toExpression(someDate.toEpochDay(), DATE);
 
         long startOfDateUtcEpochMillis = someDate.atStartOfDay().toEpochSecond(UTC) * MILLISECONDS_PER_SECOND;
         LongTimestampWithTimeZone startOfDateUtc = timestampTzFromEpochMillis(startOfDateUtcEpochMillis);
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergAbfsConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergAbfsConnectorSmokeTest.java
index 037613a3cb36..0e7db64508b8 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergAbfsConnectorSmokeTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergAbfsConnectorSmokeTest.java
@@ -14,25 +14,13 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Resources;
-import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
-import io.trino.hdfs.ConfigurationInitializer;
-import io.trino.hdfs.DynamicHdfsConfiguration;
-import io.trino.hdfs.HdfsConfig;
-import io.trino.hdfs.HdfsConfiguration;
-import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.hdfs.HdfsEnvironment;
-import io.trino.hdfs.authentication.NoHdfsAuthentication;
-import io.trino.plugin.hive.azure.HiveAzureConfig;
-import io.trino.plugin.hive.azure.TrinoAzureConfigurationInitializer;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.containers.HiveHadoop;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.thrift.BridgingHiveMetastore;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
 import java.nio.file.attribute.FileAttribute;
@@ -61,18 +49,13 @@ public class TestIcebergAbfsConnectorSmokeTest
     private final String bucketName;
 
     private HiveHadoop hiveHadoop;
-    private TrinoFileSystemFactory fileSystemFactory;
 
-    @Parameters({
-            "hive.hadoop2.azure-abfs-container",
-            "hive.hadoop2.azure-abfs-account",
-            "hive.hadoop2.azure-abfs-access-key"})
-    public TestIcebergAbfsConnectorSmokeTest(String container, String account, String accessKey)
+    public TestIcebergAbfsConnectorSmokeTest()
     {
         super(ORC);
-        this.container = requireNonNull(container, "container is null");
-        this.account = requireNonNull(account, "account is null");
-        this.accessKey = requireNonNull(accessKey, "accessKey is null");
+        this.container = requireNonNull(System.getProperty("hive.hadoop2.azure-abfs-container"), "container is null");
+        this.account = requireNonNull(System.getProperty("hive.hadoop2.azure-abfs-account"), "account is null");
+        this.accessKey = requireNonNull(System.getProperty("hive.hadoop2.azure-abfs-access-key"), "accessKey is null");
         this.schemaName = "tpch_" + format.name().toLowerCase(ENGLISH);
         this.bucketName = "test-iceberg-smoke-test-" + randomNameSuffix();
     }
@@ -96,21 +79,13 @@ protected QueryRunner createQueryRunner()
                 .build());
         this.hiveHadoop.start();
 
-        HiveAzureConfig azureConfig = new HiveAzureConfig()
-                .setAbfsStorageAccount(account)
-                .setAbfsAccessKey(accessKey);
-        ConfigurationInitializer azureConfigurationInitializer = new TrinoAzureConfigurationInitializer(azureConfig);
-        HdfsConfigurationInitializer initializer = new HdfsConfigurationInitializer(new HdfsConfig(), ImmutableSet.of(azureConfigurationInitializer));
-        HdfsConfiguration hdfsConfiguration = new DynamicHdfsConfiguration(initializer, ImmutableSet.of());
-        this.fileSystemFactory = new HdfsFileSystemFactory(new HdfsEnvironment(hdfsConfiguration, new HdfsConfig(), new NoHdfsAuthentication()));
-
         return IcebergQueryRunner.builder()
                 .setIcebergProperties(
                         ImmutableMap.<String, String>builder()
                                 .put("iceberg.file-format", format.name())
                                 .put("iceberg.catalog.type", "HIVE_METASTORE")
                                 .put("hive.metastore.uri", "thrift://" + hiveHadoop.getHiveMetastoreEndpoint())
-                                .put("hive.metastore-timeout", "1m") // read timed out sometimes happens with the default timeout
+                                .put("hive.metastore.thrift.client.read-timeout", "1m") // read timed out sometimes happens with the default timeout
                                 .put("hive.azure.abfs-storage-account", account)
                                 .put("hive.azure.abfs-access-key", accessKey)
                                 .put("iceberg.register-table-procedure.enabled", "true")
@@ -182,9 +157,9 @@ protected void deleteDirectory(String location)
     }
 
     @Override
-    protected boolean isFileSorted(String path, String sortColumnName)
+    protected boolean isFileSorted(Location path, String sortColumnName)
     {
-        return checkOrcFileSorting(fileSystemFactory, path, sortColumnName);
+        return checkOrcFileSorting(fileSystem, path, sortColumnName);
     }
 
     private static String formatAbfsUrl(String container, String account, String bucketName)
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergAvroConnectorTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergAvroConnectorTest.java
index 1c9d7538b960..ff0fa9b71fa9 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergAvroConnectorTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergAvroConnectorTest.java
@@ -48,4 +48,10 @@ protected boolean isFileSorted(String path, String sortColumnName)
     {
         throw new SkipException("Unimplemented");
     }
+
+    @Override
+    protected boolean supportsPhysicalPushdown()
+    {
+        return false;
+    }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergBucketing.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergBucketing.java
index b9902e821509..fc51c86be43a 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergBucketing.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergBucketing.java
@@ -30,8 +30,9 @@
 import org.apache.iceberg.types.Types.DecimalType;
 import org.apache.iceberg.types.Types.DoubleType;
 import org.apache.iceberg.types.Types.FloatType;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
@@ -69,7 +70,7 @@
 import static java.lang.String.format;
 import static java.time.ZoneOffset.UTC;
 import static org.apache.iceberg.types.Type.TypeID.DECIMAL;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestIcebergBucketing
@@ -187,7 +188,8 @@ public void testBucketingSpecValues()
         assertBucketAndHashEquals("binary", ByteBuffer.wrap(new byte[] {0x00, 0x01, 0x02, 0x03}), -188683207 & Integer.MAX_VALUE);
     }
 
-    @Test(dataProvider = "unsupportedBucketingTypes")
+    @ParameterizedTest
+    @MethodSource("unsupportedBucketingTypes")
     public void testUnsupportedTypes(Type type)
     {
         assertThatThrownBy(() -> computeIcebergBucket(type, null, 1))
@@ -197,8 +199,7 @@ public void testUnsupportedTypes(Type type)
                 .hasMessage("Unsupported type for 'bucket': %s", toTrinoType(type, TYPE_MANAGER));
     }
 
-    @DataProvider
-    public Object[][] unsupportedBucketingTypes()
+    public static Object[][] unsupportedBucketingTypes()
     {
         return new Object[][] {
                 {BooleanType.get()},
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergColumnHandle.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergColumnHandle.java
index 01088be73cba..b5a49bb851b2 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergColumnHandle.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergColumnHandle.java
@@ -22,7 +22,7 @@
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.type.TypeDeserializer;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergConfig.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergConfig.java
index 822337eb3892..5cfcb285f73a 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergConfig.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergConfig.java
@@ -17,7 +17,7 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.plugin.hive.HiveCompressionCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -41,7 +41,7 @@ public class TestIcebergConfig
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(IcebergConfig.class)
-                .setFileFormat(ORC)
+                .setFileFormat(PARQUET)
                 .setCompressionCodec(ZSTD)
                 .setUseFileSizeFromMetadata(true)
                 .setMaxPartitionsPerWriter(100)
@@ -61,14 +61,15 @@ public void testDefaults()
                 .setMinimumAssignedSplitWeight(0.05)
                 .setMaterializedViewsStorageSchema(null)
                 .setRegisterTableProcedureEnabled(false)
-                .setSortedWritingEnabled(true));
+                .setSortedWritingEnabled(true)
+                .setQueryPartitionFilterRequired(false));
     }
 
     @Test
     public void testExplicitPropertyMappings()
     {
         Map<String, String> properties = ImmutableMap.<String, String>builder()
-                .put("iceberg.file-format", "Parquet")
+                .put("iceberg.file-format", "ORC")
                 .put("iceberg.compression-codec", "NONE")
                 .put("iceberg.use-file-size-from-metadata", "false")
                 .put("iceberg.max-partitions-per-writer", "222")
@@ -89,10 +90,11 @@ public void testExplicitPropertyMappings()
                 .put("iceberg.materialized-views.storage-schema", "mv_storage_schema")
                 .put("iceberg.register-table-procedure.enabled", "true")
                 .put("iceberg.sorted-writing-enabled", "false")
+                .put("iceberg.query-partition-filter-required", "true")
                 .buildOrThrow();
 
         IcebergConfig expected = new IcebergConfig()
-                .setFileFormat(PARQUET)
+                .setFileFormat(ORC)
                 .setCompressionCodec(HiveCompressionCodec.NONE)
                 .setUseFileSizeFromMetadata(false)
                 .setMaxPartitionsPerWriter(222)
@@ -112,7 +114,8 @@ public void testExplicitPropertyMappings()
                 .setMinimumAssignedSplitWeight(0.01)
                 .setMaterializedViewsStorageSchema("mv_storage_schema")
                 .setRegisterTableProcedureEnabled(true)
-                .setSortedWritingEnabled(false);
+                .setSortedWritingEnabled(false)
+                .setQueryPartitionFilterRequired(true);
 
         assertFullMapping(properties, expected);
     }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergConnectorFactory.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergConnectorFactory.java
index 21efb5afb94d..dc0b740b30a9 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergConnectorFactory.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergConnectorFactory.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergConnectorSmokeTest.java
index 61314d9027e6..a397934fee86 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergConnectorSmokeTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergConnectorSmokeTest.java
@@ -14,9 +14,11 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,14 +28,16 @@
 
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.plugin.iceberg.IcebergTestUtils.checkOrcFileSorting;
 import static java.lang.String.format;
 import static org.apache.iceberg.FileFormat.ORC;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 // Redundant over TestIcebergOrcConnectorTest, but exists to exercise BaseConnectorSmokeTest
 // Some features like materialized views may be supported by Iceberg only.
+@TestInstance(PER_CLASS)
 public class TestIcebergConnectorSmokeTest
         extends BaseIcebergConnectorSmokeTest
 {
@@ -56,12 +60,13 @@ protected QueryRunner createQueryRunner()
                 .setInitialTables(REQUIRED_TPCH_TABLES)
                 .setMetastoreDirectory(metastoreDir)
                 .setIcebergProperties(ImmutableMap.of(
+                        "iceberg.file-format", format.name(),
                         "iceberg.register-table-procedure.enabled", "true",
                         "iceberg.writer-sort-buffer-size", "1MB"))
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws IOException
     {
@@ -107,8 +112,8 @@ protected void deleteDirectory(String location)
     }
 
     @Override
-    protected boolean isFileSorted(String path, String sortColumnName)
+    protected boolean isFileSorted(Location path, String sortColumnName)
     {
-        return checkOrcFileSorting(path, sortColumnName);
+        return checkOrcFileSorting(fileSystem, path, sortColumnName);
     }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergDisabledRegisterTableProcedure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergDisabledRegisterTableProcedure.java
index ecdc95bdc158..502a248d612a 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergDisabledRegisterTableProcedure.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergDisabledRegisterTableProcedure.java
@@ -15,7 +15,7 @@
 
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestIcebergDisabledRegisterTableProcedure
         extends AbstractTestQueryFramework
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergDynamicPartitionPruningTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergDynamicPartitionPruningTest.java
index 7d7b7f05f9ca..dc43ba7d0f0c 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergDynamicPartitionPruningTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergDynamicPartitionPruningTest.java
@@ -13,10 +13,10 @@
  */
 package io.trino.plugin.iceberg;
 
+import com.google.common.collect.ImmutableList;
 import io.trino.testing.BaseDynamicPartitionPruningTest;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.SkipException;
 
 import java.util.List;
 import java.util.Map;
@@ -38,12 +38,6 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
-    @Override
-    public void testJoinDynamicFilteringMultiJoinOnBucketedTables()
-    {
-        throw new SkipException("Iceberg does not support bucketing");
-    }
-
     @Override
     protected void createLineitemTable(String tableName, List<String> columns, List<String> partitionColumns)
     {
@@ -69,6 +63,15 @@ protected void createPartitionedTable(String tableName, List<String> columns, Li
     @Override
     protected void createPartitionedAndBucketedTable(String tableName, List<String> columns, List<String> partitionColumns, List<String> bucketColumns)
     {
-        throw new UnsupportedOperationException();
+        ImmutableList.Builder<String> partitioning = ImmutableList.builder();
+        partitionColumns.forEach(partitioning::add);
+        bucketColumns.forEach(column -> partitioning.add("bucket(%s,10)".formatted(column)));
+
+        String sql = format(
+                "CREATE TABLE %s (%s) WITH (partitioning=ARRAY[%s])",
+                tableName,
+                String.join(",", columns),
+                String.join(",", partitioning.build().stream().map("'%s'"::formatted).toList()));
+        getQueryRunner().execute(sql);
     }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergFileOperations.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergFileOperations.java
new file mode 100644
index 000000000000..8b2b79cc6de2
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergFileOperations.java
@@ -0,0 +1,912 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg;
+
+import com.google.common.collect.HashMultiset;
+import com.google.common.collect.ImmutableMultiset;
+import com.google.common.collect.Multiset;
+import com.google.inject.Key;
+import io.trino.Session;
+import io.trino.SystemSessionProperties;
+import io.trino.filesystem.TrackingFileSystemFactory;
+import io.trino.filesystem.TrackingFileSystemFactory.OperationType;
+import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.iceberg.catalog.file.TestingIcebergFileMetastoreCatalogModule;
+import io.trino.plugin.tpch.TpchPlugin;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import org.apache.iceberg.util.ThreadPools;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.File;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import static com.google.common.collect.ImmutableMultiset.toImmutableMultiset;
+import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
+import static io.trino.SystemSessionProperties.MIN_INPUT_SIZE_PER_TASK;
+import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_GET_LENGTH;
+import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_LAST_MODIFIED;
+import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_NEW_STREAM;
+import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.OUTPUT_FILE_CREATE;
+import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.OUTPUT_FILE_CREATE_OR_OVERWRITE;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.iceberg.IcebergQueryRunner.ICEBERG_CATALOG;
+import static io.trino.plugin.iceberg.IcebergSessionProperties.COLLECT_EXTENDED_STATISTICS_ON_WRITE;
+import static io.trino.plugin.iceberg.TestIcebergFileOperations.FileType.DATA;
+import static io.trino.plugin.iceberg.TestIcebergFileOperations.FileType.MANIFEST;
+import static io.trino.plugin.iceberg.TestIcebergFileOperations.FileType.METADATA_JSON;
+import static io.trino.plugin.iceberg.TestIcebergFileOperations.FileType.SNAPSHOT;
+import static io.trino.plugin.iceberg.TestIcebergFileOperations.FileType.STATS;
+import static io.trino.plugin.iceberg.TestIcebergFileOperations.FileType.fromFilePath;
+import static io.trino.plugin.iceberg.TestIcebergFileOperations.Scope.ALL_FILES;
+import static io.trino.plugin.iceberg.TestIcebergFileOperations.Scope.METADATA_FILES;
+import static io.trino.testing.MultisetAssertions.assertMultisetsEqual;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static java.lang.Math.min;
+import static java.lang.String.format;
+import static java.util.Collections.nCopies;
+import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toCollection;
+
+@Execution(ExecutionMode.SAME_THREAD) // e.g. trackingFileSystemFactory is shared mutable state
+public class TestIcebergFileOperations
+        extends AbstractTestQueryFramework
+{
+    private static final int MAX_PREFIXES_COUNT = 10;
+
+    private TrackingFileSystemFactory trackingFileSystemFactory;
+
+    @Override
+    protected DistributedQueryRunner createQueryRunner()
+            throws Exception
+    {
+        Session session = testSessionBuilder()
+                .setCatalog("iceberg")
+                .setSchema("test_schema")
+                // It is essential to disable DeterminePartitionCount rule since all queries in this test scans small
+                // amount of data which makes them run with single hash partition count. However, this test requires them
+                // to run over multiple nodes.
+                .setSystemProperty(MIN_INPUT_SIZE_PER_TASK, "0MB")
+                .build();
+
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session)
+                // Tests that inspect MBean attributes need to run with just one node, otherwise
+                // the attributes may come from the bound class instance in non-coordinator node
+                .setNodeCount(1)
+                .addCoordinatorProperty("optimizer.experimental-max-prefetched-information-schema-prefixes", Integer.toString(MAX_PREFIXES_COUNT))
+                .build();
+
+        File baseDir = queryRunner.getCoordinator().getBaseDataDir().resolve("iceberg_data").toFile();
+        HiveMetastore metastore = createTestingFileHiveMetastore(baseDir);
+
+        trackingFileSystemFactory = new TrackingFileSystemFactory(new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS));
+        queryRunner.installPlugin(new TestingIcebergPlugin(
+                Optional.of(new TestingIcebergFileMetastoreCatalogModule(metastore)),
+                Optional.of(trackingFileSystemFactory),
+                binder -> {
+                    newOptionalBinder(binder, Key.get(boolean.class, AsyncIcebergSplitProducer.class))
+                            .setBinding().toInstance(false);
+                }));
+        queryRunner.createCatalog(ICEBERG_CATALOG, "iceberg");
+        queryRunner.installPlugin(new TpchPlugin());
+        queryRunner.createCatalog("tpch", "tpch");
+
+        queryRunner.execute("CREATE SCHEMA test_schema");
+
+        return queryRunner;
+    }
+
+    @Test
+    public void testCreateTable()
+    {
+        assertFileSystemAccesses("CREATE TABLE test_create (id VARCHAR, age INT)",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, OUTPUT_FILE_CREATE))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .build());
+    }
+
+    @Test
+    public void testCreateOrReplaceTable()
+    {
+        assertFileSystemAccesses("CREATE OR REPLACE TABLE test_create_or_replace (id VARCHAR, age INT)",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, OUTPUT_FILE_CREATE))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .build());
+        assertFileSystemAccesses("CREATE OR REPLACE TABLE test_create_or_replace (id VARCHAR, age INT)",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, OUTPUT_FILE_CREATE))
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .build());
+    }
+
+    @Test
+    public void testCreateTableAsSelect()
+    {
+        assertFileSystemAccesses(
+                withStatsOnWrite(getSession(), false),
+                "CREATE TABLE test_create_as_select AS SELECT 1 col_name",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, OUTPUT_FILE_CREATE))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .add(new FileOperation(MANIFEST, OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .build());
+
+        assertFileSystemAccesses(
+                withStatsOnWrite(getSession(), true),
+                "CREATE TABLE test_create_as_select_with_stats AS SELECT 1 col_name",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(METADATA_JSON, OUTPUT_FILE_CREATE), 2) // TODO (https://github.com/trinodb/trino/issues/15439): it would be good to publish data and stats in one commit
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .add(new FileOperation(MANIFEST, OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .add(new FileOperation(STATS, OUTPUT_FILE_CREATE))
+                        .build());
+    }
+
+    @Test
+    public void testCreateOrReplaceTableAsSelect()
+    {
+        assertFileSystemAccesses(
+                "CREATE OR REPLACE TABLE test_create_or_replace_as_select AS SELECT 1 col_name",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(METADATA_JSON, OUTPUT_FILE_CREATE), 2)
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .add(new FileOperation(MANIFEST, OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .add(new FileOperation(STATS, OUTPUT_FILE_CREATE))
+                        .build());
+
+        assertFileSystemAccesses(
+                "CREATE OR REPLACE TABLE test_create_or_replace_as_select AS SELECT 1 col_name",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(METADATA_JSON, OUTPUT_FILE_CREATE), 2)
+                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 2)
+                        .add(new FileOperation(SNAPSHOT, OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .add(new FileOperation(MANIFEST, OUTPUT_FILE_CREATE_OR_OVERWRITE))
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(STATS, OUTPUT_FILE_CREATE))
+                        .build());
+    }
+
+    @Test
+    public void testSelect()
+    {
+        assertUpdate("CREATE TABLE test_select AS SELECT 1 col_name", 1);
+        assertFileSystemAccesses("SELECT * FROM test_select",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM))
+                        .build());
+    }
+
+    @ParameterizedTest
+    @MethodSource("testSelectWithLimitDataProvider")
+    public void testSelectWithLimit(int numberOfFiles)
+    {
+        assertUpdate("DROP TABLE IF EXISTS test_select_with_limit"); // test is parameterized
+
+        // Create table with multiple files
+        assertUpdate("CREATE TABLE test_select_with_limit(k varchar, v integer) WITH (partitioning=ARRAY['truncate(k, 1)'])");
+        // 2 files per partition, numberOfFiles files in total, in numberOfFiles separate manifests (due to fastAppend)
+        for (int i = 0; i < numberOfFiles; i++) {
+            String k = Integer.toString(10 + i * 5);
+            assertUpdate("INSERT INTO test_select_with_limit VALUES ('" + k + "', " + i + ")", 1);
+        }
+
+        // org.apache.iceberg.util.ParallelIterable, even if used with a direct executor, schedules 2 * ThreadPools.WORKER_THREAD_POOL_SIZE upfront
+        int icebergManifestPrefetching = 2 * ThreadPools.WORKER_THREAD_POOL_SIZE;
+
+        assertFileSystemAccesses("SELECT * FROM test_select_with_limit LIMIT 3",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), min(icebergManifestPrefetching, numberOfFiles))
+                        .build());
+
+        assertFileSystemAccesses("EXPLAIN SELECT * FROM test_select_with_limit LIMIT 3",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), numberOfFiles)
+                        .build());
+
+        assertFileSystemAccesses("EXPLAIN ANALYZE SELECT * FROM test_select_with_limit LIMIT 3",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), numberOfFiles + min(icebergManifestPrefetching, numberOfFiles))
+                        .build());
+
+        assertUpdate("DROP TABLE test_select_with_limit");
+    }
+
+    public Object[][] testSelectWithLimitDataProvider()
+    {
+        return new Object[][] {
+                {10},
+                {50},
+                // 2 * ThreadPools.WORKER_THREAD_POOL_SIZE manifest is always read, so include one more data point to show this is a constant number
+                {2 * 2 * ThreadPools.WORKER_THREAD_POOL_SIZE + 6},
+        };
+    }
+
+    @Test
+    public void testReadWholePartition()
+    {
+        assertUpdate("DROP TABLE IF EXISTS test_read_part_key");
+
+        assertUpdate("CREATE TABLE test_read_part_key(key varchar, data varchar) WITH (partitioning=ARRAY['key'])");
+
+        // Create multiple files per partition
+        assertUpdate("INSERT INTO test_read_part_key(key, data) VALUES ('p1', '1-abc'), ('p1', '1-def'), ('p2', '2-abc'), ('p2', '2-def')", 4);
+        assertUpdate("INSERT INTO test_read_part_key(key, data) VALUES ('p1', '1-baz'), ('p2', '2-baz')", 2);
+
+        // Read partition and data columns
+        assertFileSystemAccesses(
+                "SELECT key, max(data) FROM test_read_part_key GROUP BY key",
+                ALL_FILES,
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(DATA, INPUT_FILE_NEW_STREAM), 4)
+                        .build());
+
+        // Read partition column only
+        assertFileSystemAccesses(
+                "SELECT key, count(*) FROM test_read_part_key GROUP BY key",
+                ALL_FILES,
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        // Read partition column only, one partition only
+        assertFileSystemAccesses(
+                "SELECT count(*) FROM test_read_part_key WHERE key = 'p1'",
+                ALL_FILES,
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        // Read partition and synthetic columns
+        assertFileSystemAccesses(
+                "SELECT count(*), array_agg(\"$path\"), max(\"$file_modified_time\") FROM test_read_part_key GROUP BY key",
+                ALL_FILES,
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        // TODO return synthetic columns without opening the data files
+                        .addCopies(new FileOperation(DATA, INPUT_FILE_NEW_STREAM), 4)
+                        .addCopies(new FileOperation(DATA, INPUT_FILE_LAST_MODIFIED), 4)
+                        .build());
+
+        // Read only row count
+        assertFileSystemAccesses(
+                "SELECT count(*) FROM test_read_part_key",
+                ALL_FILES,
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        assertUpdate("DROP TABLE test_read_part_key");
+    }
+
+    @Test
+    public void testReadWholePartitionSplittableFile()
+    {
+        String catalog = getSession().getCatalog().orElseThrow();
+
+        assertUpdate("DROP TABLE IF EXISTS test_read_whole_splittable_file");
+        assertUpdate("CREATE TABLE test_read_whole_splittable_file(key varchar, data varchar) WITH (partitioning=ARRAY['key'])");
+
+        assertUpdate(
+                Session.builder(getSession())
+                        .setSystemProperty(SystemSessionProperties.WRITER_SCALING_MIN_DATA_PROCESSED, "1PB")
+                        .setCatalogSessionProperty(catalog, "parquet_writer_block_size", "1kB")
+                        .setCatalogSessionProperty(catalog, "orc_writer_max_stripe_size", "1kB")
+                        .setCatalogSessionProperty(catalog, "orc_writer_max_stripe_rows", "1000")
+                        .build(),
+                "INSERT INTO test_read_whole_splittable_file SELECT 'single partition', comment FROM tpch.tiny.orders", 15000);
+
+        Session session = Session.builder(getSession())
+                .setCatalogSessionProperty(catalog, IcebergSessionProperties.SPLIT_SIZE, "1kB")
+                .build();
+
+        // Read partition column only
+        assertFileSystemAccesses(
+                session,
+                "SELECT key, count(*) FROM test_read_whole_splittable_file GROUP BY key",
+                ALL_FILES,
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        // Read only row count
+        assertFileSystemAccesses(
+                session,
+                "SELECT count(*) FROM test_read_whole_splittable_file",
+                ALL_FILES,
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        assertUpdate("DROP TABLE test_read_whole_splittable_file");
+    }
+
+    @Test
+    public void testSelectFromVersionedTable()
+    {
+        String tableName = "test_select_from_versioned_table";
+        assertUpdate("CREATE TABLE " + tableName + " (id int, age int)");
+        long v1SnapshotId = getLatestSnapshotId(tableName);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (2, 20)", 1);
+        long v2SnapshotId = getLatestSnapshotId(tableName);
+        assertUpdate("INSERT INTO " + tableName + "  VALUES (3, 30)", 1);
+        long v3SnapshotId = getLatestSnapshotId(tableName);
+        assertFileSystemAccesses("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v1SnapshotId,
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .build());
+        assertFileSystemAccesses("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v2SnapshotId,
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM))
+                        .build());
+        assertFileSystemAccesses("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v3SnapshotId,
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
+                        .build());
+        assertFileSystemAccesses("SELECT * FROM " + tableName,
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
+                        .build());
+    }
+
+    @Test
+    public void testSelectFromVersionedTableWithSchemaEvolution()
+    {
+        String tableName = "test_select_from_versioned_table_with_schema_evolution";
+        assertUpdate("CREATE TABLE " + tableName + " (id int, age int)");
+        long v1SnapshotId = getLatestSnapshotId(tableName);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (2, 20)", 1);
+        long v2SnapshotId = getLatestSnapshotId(tableName);
+        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN address varchar");
+        assertUpdate("INSERT INTO " + tableName + "  VALUES (3, 30, 'London')", 1);
+        long v3SnapshotId = getLatestSnapshotId(tableName);
+        assertFileSystemAccesses("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v1SnapshotId,
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .build());
+        assertFileSystemAccesses("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v2SnapshotId,
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM))
+                        .build());
+        assertFileSystemAccesses("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v3SnapshotId,
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
+                        .build());
+        assertFileSystemAccesses("SELECT * FROM " + tableName,
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
+                        .build());
+    }
+
+    @Test
+    public void testSelectWithFilter()
+    {
+        assertUpdate("CREATE TABLE test_select_with_filter AS SELECT 1 col_name", 1);
+        assertFileSystemAccesses("SELECT * FROM test_select_with_filter WHERE col_name = 1",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM))
+                        .build());
+    }
+
+    @Test
+    public void testJoin()
+    {
+        assertUpdate("CREATE TABLE test_join_t1 AS SELECT 2 AS age, 'id1' AS id", 1);
+        assertUpdate("CREATE TABLE test_join_t2 AS SELECT 'name1' AS name, 'id1' AS id", 1);
+
+        assertFileSystemAccesses("SELECT name, age FROM test_join_t1 JOIN test_join_t2 ON test_join_t2.id = test_join_t1.id",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 2)
+                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 4)
+                        .build());
+    }
+
+    @Test
+    public void testJoinWithPartitionedTable()
+    {
+        assertUpdate("CREATE TABLE test_join_partitioned_t1 (a BIGINT, b TIMESTAMP(6) with time zone) WITH (partitioning = ARRAY['a', 'day(b)'])");
+        assertUpdate("CREATE TABLE test_join_partitioned_t2 (foo BIGINT)");
+        assertUpdate("INSERT INTO test_join_partitioned_t2 VALUES(123)", 1);
+        assertUpdate("INSERT INTO test_join_partitioned_t1 VALUES(123, current_date)", 1);
+
+        assertFileSystemAccesses("SELECT count(*) FROM test_join_partitioned_t1 t1 join test_join_partitioned_t2 t2 on t1.a = t2.foo",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 2)
+                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 2)
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 4)
+                        .build());
+    }
+
+    @Test
+    public void testExplainSelect()
+    {
+        assertUpdate("CREATE TABLE test_explain AS SELECT 2 AS age", 1);
+
+        assertFileSystemAccesses("EXPLAIN SELECT * FROM test_explain",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM))
+                        .build());
+    }
+
+    @Test
+    public void testShowStatsForTable()
+    {
+        assertUpdate("CREATE TABLE test_show_stats AS SELECT 2 AS age", 1);
+
+        assertFileSystemAccesses("SHOW STATS FOR test_show_stats",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM))
+                        .build());
+    }
+
+    @Test
+    public void testShowStatsForPartitionedTable()
+    {
+        assertUpdate("CREATE TABLE test_show_stats_partitioned " +
+                "WITH (partitioning = ARRAY['regionkey']) " +
+                "AS SELECT * FROM tpch.tiny.nation", 25);
+
+        assertFileSystemAccesses("SHOW STATS FOR test_show_stats_partitioned",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM))
+                        .build());
+    }
+
+    @Test
+    public void testShowStatsForTableWithFilter()
+    {
+        assertUpdate("CREATE TABLE test_show_stats_with_filter AS SELECT 2 AS age", 1);
+
+        assertFileSystemAccesses("SHOW STATS FOR (SELECT * FROM test_show_stats_with_filter WHERE age >= 2)",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM))
+                        .build());
+    }
+
+    @Test
+    public void testPredicateWithVarcharCastToDate()
+    {
+        assertUpdate("CREATE TABLE test_varchar_as_date_predicate(a varchar) WITH (partitioning=ARRAY['truncate(a, 4)'])");
+        assertUpdate("INSERT INTO test_varchar_as_date_predicate VALUES '2001-01-31'", 1);
+        assertUpdate("INSERT INTO test_varchar_as_date_predicate VALUES '2005-09-10'", 1);
+
+        assertFileSystemAccesses("SELECT * FROM test_varchar_as_date_predicate",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
+                        .build());
+
+        // CAST to date and comparison
+        assertFileSystemAccesses("SELECT * FROM test_varchar_as_date_predicate WHERE CAST(a AS date) >= DATE '2005-01-01'",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM)) // fewer than without filter
+                        .build());
+
+        // CAST to date and BETWEEN
+        assertFileSystemAccesses("SELECT * FROM test_varchar_as_date_predicate WHERE CAST(a AS date) BETWEEN DATE '2005-01-01' AND DATE '2005-12-31'",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM)) // fewer than without filter
+                        .build());
+
+        // conversion to date as a date function
+        assertFileSystemAccesses("SELECT * FROM test_varchar_as_date_predicate WHERE date(a) >= DATE '2005-01-01'",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH))
+                        .add(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM))
+                        .add(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM)) // fewer than without filter
+                        .build());
+
+        assertUpdate("DROP TABLE test_varchar_as_date_predicate");
+    }
+
+    @Test
+    public void testRemoveOrphanFiles()
+    {
+        String tableName = "test_remove_orphan_files_" + randomNameSuffix();
+        Session sessionWithShortRetentionUnlocked = Session.builder(getSession())
+                .setCatalogSessionProperty("iceberg", "remove_orphan_files_min_retention", "0s")
+                .build();
+        assertUpdate("CREATE TABLE " + tableName + " (key varchar, value integer)");
+        assertUpdate("INSERT INTO " + tableName + " VALUES ('one', 1)", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES ('two', 2), ('three', 3)", 2);
+        assertUpdate("DELETE FROM " + tableName + " WHERE key = 'two'", 1);
+
+        assertFileSystemAccesses(
+                sessionWithShortRetentionUnlocked,
+                "ALTER TABLE " + tableName + " EXECUTE REMOVE_ORPHAN_FILES (retention_threshold => '0s')",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 4)
+                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 4)
+                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 5)
+                        .build());
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @ParameterizedTest
+    @MethodSource("metadataQueriesTestTableCountDataProvider")
+    public void testInformationSchemaColumns(int tables)
+    {
+        String schemaName = "test_i_s_columns_schema" + randomNameSuffix();
+        assertUpdate("CREATE SCHEMA " + schemaName);
+        Session session = Session.builder(getSession())
+                .setSchema(schemaName)
+                .build();
+
+        for (int i = 0; i < tables; i++) {
+            assertUpdate(session, "CREATE TABLE test_select_i_s_columns" + i + "(id varchar, age integer)");
+            // Produce multiple snapshots and metadata files
+            assertUpdate(session, "INSERT INTO test_select_i_s_columns" + i + " VALUES ('abc', 11)", 1);
+            assertUpdate(session, "INSERT INTO test_select_i_s_columns" + i + " VALUES ('xyz', 12)", 1);
+
+            assertUpdate(session, "CREATE TABLE test_other_select_i_s_columns" + i + "(id varchar, age integer)"); // won't match the filter
+        }
+
+        // Bulk retrieval
+        assertFileSystemAccesses(session, "SELECT * FROM information_schema.columns WHERE table_schema = CURRENT_SCHEMA AND table_name LIKE 'test_select_i_s_columns%'",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), tables * 2)
+                        .build());
+
+        // Pointed lookup
+        assertFileSystemAccesses(session, "SELECT * FROM information_schema.columns WHERE table_schema = CURRENT_SCHEMA AND table_name = 'test_select_i_s_columns0'",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(FileType.METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        // Pointed lookup via DESCRIBE (which does some additional things before delegating to information_schema.columns)
+        assertFileSystemAccesses(session, "DESCRIBE test_select_i_s_columns0",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(FileType.METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        for (int i = 0; i < tables; i++) {
+            assertUpdate(session, "DROP TABLE test_select_i_s_columns" + i);
+            assertUpdate(session, "DROP TABLE test_other_select_i_s_columns" + i);
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("metadataQueriesTestTableCountDataProvider")
+    public void testSystemMetadataTableComments(int tables)
+    {
+        String schemaName = "test_s_m_table_comments" + randomNameSuffix();
+        assertUpdate("CREATE SCHEMA " + schemaName);
+        Session session = Session.builder(getSession())
+                .setSchema(schemaName)
+                .build();
+
+        for (int i = 0; i < tables; i++) {
+            assertUpdate(session, "CREATE TABLE test_select_s_m_t_comments" + i + "(id varchar, age integer)");
+            // Produce multiple snapshots and metadata files
+            assertUpdate(session, "INSERT INTO test_select_s_m_t_comments" + i + " VALUES ('abc', 11)", 1);
+            assertUpdate(session, "INSERT INTO test_select_s_m_t_comments" + i + " VALUES ('xyz', 12)", 1);
+
+            assertUpdate(session, "CREATE TABLE test_other_select_s_m_t_comments" + i + "(id varchar, age integer)"); // won't match the filter
+        }
+
+        // Bulk retrieval
+        assertFileSystemAccesses(session, "SELECT * FROM system.metadata.table_comments WHERE schema_name = CURRENT_SCHEMA AND table_name LIKE 'test_select_s_m_t_comments%'",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), tables * 2)
+                        .build());
+
+        // Bulk retrieval for two schemas
+        assertFileSystemAccesses(session, "SELECT * FROM system.metadata.table_comments WHERE schema_name IN (CURRENT_SCHEMA, 'non_existent') AND table_name LIKE 'test_select_s_m_t_comments%'",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), tables * 2)
+                        .build());
+
+        // Pointed lookup
+        assertFileSystemAccesses(session, "SELECT * FROM system.metadata.table_comments WHERE schema_name = CURRENT_SCHEMA AND table_name = 'test_select_s_m_t_comments0'",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        for (int i = 0; i < tables; i++) {
+            assertUpdate(session, "DROP TABLE test_select_s_m_t_comments" + i);
+            assertUpdate(session, "DROP TABLE test_other_select_s_m_t_comments" + i);
+        }
+    }
+
+    public Object[][] metadataQueriesTestTableCountDataProvider()
+    {
+        return new Object[][] {
+                {3},
+                {MAX_PREFIXES_COUNT},
+                {MAX_PREFIXES_COUNT + 3},
+        };
+    }
+
+    @Test
+    public void testSystemMetadataMaterializedViews()
+    {
+        String schemaName = "test_materialized_views_" + randomNameSuffix();
+        assertUpdate("CREATE SCHEMA " + schemaName);
+        Session session = Session.builder(getSession())
+                .setSchema(schemaName)
+                .build();
+
+        assertUpdate(session, "CREATE TABLE test_table1 AS SELECT 1 a", 1);
+        assertUpdate(session, "CREATE TABLE test_table2 AS SELECT 1 a", 1);
+
+        assertUpdate(session, "CREATE MATERIALIZED VIEW mv1 AS SELECT * FROM test_table1 JOIN test_table2 USING (a)");
+        assertUpdate(session, "REFRESH MATERIALIZED VIEW mv1", 1);
+
+        assertUpdate(session, "CREATE MATERIALIZED VIEW mv2 AS SELECT count(*) c FROM test_table1 JOIN test_table2 USING (a)");
+        assertUpdate(session, "REFRESH MATERIALIZED VIEW mv2", 1);
+
+        // Bulk retrieval
+        assertFileSystemAccesses(session, "SELECT * FROM system.metadata.materialized_views WHERE schema_name = CURRENT_SCHEMA",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 4)
+                        .build());
+
+        // Bulk retrieval without selecting freshness
+        assertFileSystemAccesses(session, "SELECT schema_name, name FROM system.metadata.materialized_views WHERE schema_name = CURRENT_SCHEMA",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 2)
+                        .build());
+
+        // Bulk retrieval for two schemas
+        assertFileSystemAccesses(session, "SELECT * FROM system.metadata.materialized_views WHERE schema_name IN (CURRENT_SCHEMA, 'non_existent')",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 4)
+                        .build());
+
+        // Pointed lookup
+        assertFileSystemAccesses(session, "SELECT * FROM system.metadata.materialized_views WHERE schema_name = CURRENT_SCHEMA AND name = 'mv1'",
+                ImmutableMultiset.<FileOperation>builder()
+                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 3)
+                        .build());
+
+        // Pointed lookup without selecting freshness
+        assertFileSystemAccesses(session, "SELECT schema_name, name FROM system.metadata.materialized_views WHERE schema_name = CURRENT_SCHEMA AND name = 'mv1'",
+                ImmutableMultiset.<FileOperation>builder()
+                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                        .build());
+
+        assertUpdate("DROP SCHEMA " + schemaName + " CASCADE");
+    }
+
+    @Test
+    public void testShowTables()
+    {
+        assertFileSystemAccesses("SHOW TABLES", ImmutableMultiset.of());
+    }
+
+    private void assertFileSystemAccesses(@Language("SQL") String query, Multiset<FileOperation> expectedAccesses)
+    {
+        assertFileSystemAccesses(query, METADATA_FILES, expectedAccesses);
+    }
+
+    private void assertFileSystemAccesses(@Language("SQL") String query, Scope scope, Multiset<FileOperation> expectedAccesses)
+    {
+        assertFileSystemAccesses(getSession(), query, scope, expectedAccesses);
+    }
+
+    private void assertFileSystemAccesses(Session session, @Language("SQL") String query, Multiset<FileOperation> expectedAccesses)
+    {
+        assertFileSystemAccesses(session, query, METADATA_FILES, expectedAccesses);
+    }
+
+    private void assertFileSystemAccesses(Session session, @Language("SQL") String query, Scope scope, Multiset<FileOperation> expectedAccesses)
+    {
+        resetCounts();
+        getDistributedQueryRunner().executeWithQueryId(session, query);
+        assertMultisetsEqual(
+                getOperations().stream()
+                        .filter(scope)
+                        .collect(toImmutableMultiset()),
+                expectedAccesses);
+    }
+
+    private void resetCounts()
+    {
+        trackingFileSystemFactory.reset();
+    }
+
+    private Multiset<FileOperation> getOperations()
+    {
+        return trackingFileSystemFactory.getOperationCounts()
+                .entrySet().stream()
+                .flatMap(entry -> nCopies(entry.getValue(), new FileOperation(
+                        fromFilePath(entry.getKey().location().toString()),
+                        entry.getKey().operationType())).stream())
+                .collect(toCollection(HashMultiset::create));
+    }
+
+    private long getLatestSnapshotId(String tableName)
+    {
+        return (long) computeScalar(format("SELECT snapshot_id FROM \"%s$snapshots\" ORDER BY committed_at DESC FETCH FIRST 1 ROW WITH TIES", tableName));
+    }
+
+    private static Session withStatsOnWrite(Session session, boolean enabled)
+    {
+        String catalog = session.getCatalog().orElseThrow();
+        return Session.builder(session)
+                .setCatalogSessionProperty(catalog, COLLECT_EXTENDED_STATISTICS_ON_WRITE, Boolean.toString(enabled))
+                .build();
+    }
+
+    private record FileOperation(FileType fileType, OperationType operationType)
+    {
+        public FileOperation
+        {
+            requireNonNull(fileType, "fileType is null");
+            requireNonNull(operationType, "operationType is null");
+        }
+    }
+
+    enum Scope
+            implements Predicate<FileOperation>
+    {
+        METADATA_FILES {
+            @Override
+            public boolean test(FileOperation fileOperation)
+            {
+                return fileOperation.fileType() != DATA;
+            }
+        },
+        ALL_FILES {
+            @Override
+            public boolean test(FileOperation fileOperation)
+            {
+                return true;
+            }
+        },
+    }
+
+    enum FileType
+    {
+        METADATA_JSON,
+        SNAPSHOT,
+        MANIFEST,
+        STATS,
+        DATA,
+        /**/;
+
+        public static FileType fromFilePath(String path)
+        {
+            if (path.endsWith("metadata.json")) {
+                return METADATA_JSON;
+            }
+            if (path.contains("/snap-")) {
+                return SNAPSHOT;
+            }
+            if (path.endsWith("-m0.avro")) {
+                return MANIFEST;
+            }
+            if (path.endsWith(".stats")) {
+                return STATS;
+            }
+            if (path.contains("/data/") && (path.endsWith(".orc") || path.endsWith(".parquet"))) {
+                return DATA;
+            }
+            throw new IllegalArgumentException("File not recognized: " + path);
+        }
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergGcsConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergGcsConnectorSmokeTest.java
index b9e904352ca6..34248811d9fb 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergGcsConnectorSmokeTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergGcsConnectorSmokeTest.java
@@ -14,33 +14,19 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Resources;
 import io.airlift.log.Logger;
-import io.trino.filesystem.TrinoFileSystem;
-import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
-import io.trino.hdfs.ConfigurationInitializer;
-import io.trino.hdfs.DynamicHdfsConfiguration;
-import io.trino.hdfs.HdfsConfig;
-import io.trino.hdfs.HdfsConfiguration;
-import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.hdfs.HdfsEnvironment;
-import io.trino.hdfs.authentication.NoHdfsAuthentication;
+import io.trino.filesystem.Location;
 import io.trino.plugin.hive.containers.HiveHadoop;
-import io.trino.plugin.hive.gcs.GoogleGcsConfigurationInitializer;
-import io.trino.plugin.hive.gcs.HiveGcsConfig;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.thrift.BridgingHiveMetastore;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -51,14 +37,15 @@
 import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
 import static io.trino.plugin.hive.containers.HiveHadoop.HIVE3_IMAGE;
 import static io.trino.plugin.iceberg.IcebergTestUtils.checkOrcFileSorting;
-import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
 import static org.apache.iceberg.FileFormat.ORC;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestIcebergGcsConnectorSmokeTest
         extends BaseIcebergConnectorSmokeTest
 {
@@ -70,14 +57,12 @@ public class TestIcebergGcsConnectorSmokeTest
     private final String schema;
 
     private HiveHadoop hiveHadoop;
-    private TrinoFileSystemFactory fileSystemFactory;
 
-    @Parameters({"testing.gcp-storage-bucket", "testing.gcp-credentials-key"})
-    public TestIcebergGcsConnectorSmokeTest(String gcpStorageBucket, String gcpCredentialKey)
+    public TestIcebergGcsConnectorSmokeTest()
     {
         super(ORC);
-        this.gcpStorageBucket = requireNonNull(gcpStorageBucket, "gcpStorageBucket is null");
-        this.gcpCredentialKey = requireNonNull(gcpCredentialKey, "gcpCredentialKey is null");
+        this.gcpStorageBucket = requireNonNull(System.getProperty("testing.gcp-storage-bucket"), "gcpStorageBucket is null");
+        this.gcpCredentialKey = requireNonNull(System.getProperty("testing.gcp-credentials-key"), "gcpCredentialKey is null");
         this.schema = "test_iceberg_gcs_connector_smoke_test_" + randomNameSuffix();
     }
 
@@ -85,11 +70,11 @@ public TestIcebergGcsConnectorSmokeTest(String gcpStorageBucket, String gcpCrede
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        InputStream jsonKey = new ByteArrayInputStream(Base64.getDecoder().decode(gcpCredentialKey));
-        Path gcpCredentialsFile;
-        gcpCredentialsFile = Files.createTempFile("gcp-credentials", ".json", READ_ONLY_PERMISSIONS);
+        byte[] jsonKeyBytes = Base64.getDecoder().decode(gcpCredentialKey);
+        Path gcpCredentialsFile = Files.createTempFile("gcp-credentials", ".json", READ_ONLY_PERMISSIONS);
         gcpCredentialsFile.toFile().deleteOnExit();
-        Files.write(gcpCredentialsFile, jsonKey.readAllBytes());
+        Files.write(gcpCredentialsFile, jsonKeyBytes);
+        String gcpCredentials = new String(jsonKeyBytes, UTF_8);
 
         String gcpSpecificCoreSiteXmlContent = Resources.toString(Resources.getResource("hdp3.1-core-site.xml.gcs-template"), UTF_8)
                 .replace("%GCP_CREDENTIALS_FILE_PATH%", "/etc/hadoop/conf/gcp-credentials.json");
@@ -106,16 +91,10 @@ protected QueryRunner createQueryRunner()
                 .build());
         this.hiveHadoop.start();
 
-        HiveGcsConfig gcsConfig = new HiveGcsConfig().setJsonKeyFilePath(gcpCredentialsFile.toAbsolutePath().toString());
-        ConfigurationInitializer configurationInitializer = new GoogleGcsConfigurationInitializer(gcsConfig);
-        HdfsConfigurationInitializer initializer = new HdfsConfigurationInitializer(new HdfsConfig(), ImmutableSet.of(configurationInitializer));
-        HdfsConfiguration hdfsConfiguration = new DynamicHdfsConfiguration(initializer, ImmutableSet.of());
-        this.fileSystemFactory = new HdfsFileSystemFactory(new HdfsEnvironment(hdfsConfiguration, new HdfsConfig(), new NoHdfsAuthentication()));
-
         return IcebergQueryRunner.builder()
                 .setIcebergProperties(ImmutableMap.<String, String>builder()
                         .put("iceberg.catalog.type", "hive_metastore")
-                        .put("hive.gcs.json-key-file-path", gcpCredentialsFile.toAbsolutePath().toString())
+                        .put("hive.gcs.json-key", gcpCredentials)
                         .put("hive.metastore.uri", "thrift://" + hiveHadoop.getHiveMetastoreEndpoint())
                         .put("iceberg.file-format", format.name())
                         .put("iceberg.register-table-procedure.enabled", "true")
@@ -130,12 +109,11 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void removeTestData()
     {
         try {
-            TrinoFileSystem fileSystem = fileSystemFactory.create(SESSION);
-            fileSystem.deleteDirectory(schemaPath());
+            fileSystem.deleteDirectory(Location.of(schemaPath()));
         }
         catch (IOException e) {
             // The GCS bucket should be configured to expire objects automatically. Clean up issues do not need to fail the test.
@@ -172,8 +150,7 @@ protected String schemaPath()
     protected boolean locationExists(String location)
     {
         try {
-            TrinoFileSystem fileSystem = fileSystemFactory.create(SESSION);
-            return fileSystem.newInputFile(location).exists();
+            return fileSystem.newInputFile(Location.of(location)).exists();
         }
         catch (IOException e) {
             throw new UncheckedIOException(e);
@@ -217,8 +194,7 @@ protected String getMetadataLocation(String tableName)
     protected void deleteDirectory(String location)
     {
         try {
-            TrinoFileSystem fileSystem = fileSystemFactory.create(SESSION);
-            fileSystem.deleteDirectory(location);
+            fileSystem.deleteDirectory(Location.of(location));
         }
         catch (IOException e) {
             throw new UncheckedIOException(e);
@@ -226,8 +202,8 @@ protected void deleteDirectory(String location)
     }
 
     @Override
-    protected boolean isFileSorted(String path, String sortColumnName)
+    protected boolean isFileSorted(Location path, String sortColumnName)
     {
-        return checkOrcFileSorting(fileSystemFactory, path, sortColumnName);
+        return checkOrcFileSorting(fileSystem, path, sortColumnName);
     }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergGetTableStatisticsOperations.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergGetTableStatisticsOperations.java
index 8498700d4272..4564006eca7d 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergGetTableStatisticsOperations.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergGetTableStatisticsOperations.java
@@ -14,11 +14,11 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMultiset;
-import io.trino.execution.warnings.WarningCollector;
-import io.trino.metadata.CountingAccessMetadata;
+import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.sdk.trace.data.SpanData;
+import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
 import io.trino.metadata.InternalFunctionBundle;
-import io.trino.metadata.MetadataManager;
 import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.iceberg.catalog.file.TestingIcebergFileMetastoreCatalogModule;
@@ -27,6 +27,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.QueryRunner;
+import io.trino.tracing.TracingMetadata;
 import org.intellij.lang.annotations.Language;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeMethod;
@@ -41,10 +42,10 @@
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static com.google.inject.util.Modules.EMPTY_MODULE;
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.execution.warnings.WarningCollector.NOOP;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED;
 import static io.trino.testing.TestingSession.testSessionBuilder;
-import static io.trino.transaction.TransactionBuilder.transaction;
 import static org.assertj.core.api.Assertions.assertThat;
 
 // Cost-based optimizers' behaviors are affected by the statistics returned by the Connectors. Here is to count the getTableStatistics calls
@@ -54,18 +55,22 @@ public class TestIcebergGetTableStatisticsOperations
         extends AbstractTestQueryFramework
 {
     private LocalQueryRunner localQueryRunner;
-    private CountingAccessMetadata metadata;
+    private InMemorySpanExporter spanExporter;
     private File metastoreDir;
 
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
+        spanExporter = closeAfterClass(InMemorySpanExporter.create());
+
+        SdkTracerProvider tracerProvider = SdkTracerProvider.builder()
+                .addSpanProcessor(SimpleSpanProcessor.create(spanExporter))
+                .build();
+
         localQueryRunner = LocalQueryRunner.builder(testSessionBuilder().build())
-                .withMetadataProvider((systemSecurityMetadata, transactionManager, globalFunctionCatalog, typeManager)
-                        -> new CountingAccessMetadata(new MetadataManager(systemSecurityMetadata, transactionManager, globalFunctionCatalog, typeManager)))
+                .withMetadataDecorator(metadata -> new TracingMetadata(tracerProvider.get("test"), metadata))
                 .build();
-        metadata = (CountingAccessMetadata) localQueryRunner.getMetadata();
         localQueryRunner.installPlugin(new TpchPlugin());
         localQueryRunner.createCatalog("tpch", "tpch", ImmutableMap.of());
 
@@ -100,13 +105,13 @@ public void tearDown()
         deleteRecursively(metastoreDir.toPath(), ALLOW_INSECURE);
         localQueryRunner.close();
         localQueryRunner = null;
-        metadata = null;
+        spanExporter = null;
     }
 
     @BeforeMethod
     public void resetCounters()
     {
-        metadata.resetCounters();
+        spanExporter.reset();
     }
 
     @Test
@@ -115,10 +120,7 @@ public void testTwoWayJoin()
         planDistributedQuery("SELECT * " +
                 "FROM iceberg.tiny.orders o, iceberg.tiny.lineitem l " +
                 "WHERE o.orderkey = l.orderkey");
-        assertThat(metadata.getMethodInvocations()).containsExactlyInAnyOrderElementsOf(
-                ImmutableMultiset.<CountingAccessMetadata.Methods>builder()
-                        .addCopies(CountingAccessMetadata.Methods.GET_TABLE_STATISTICS, 2)
-                        .build());
+        assertThat(getTableStatisticsMethodInvocations()).isEqualTo(2);
     }
 
     @Test
@@ -127,17 +129,25 @@ public void testThreeWayJoin()
         planDistributedQuery("SELECT * " +
                 "FROM iceberg.tiny.customer c, iceberg.tiny.orders o, iceberg.tiny.lineitem l " +
                 "WHERE o.orderkey = l.orderkey AND c.custkey = o.custkey");
-        assertThat(metadata.getMethodInvocations()).containsExactlyInAnyOrderElementsOf(
-                ImmutableMultiset.<CountingAccessMetadata.Methods>builder()
-                        .addCopies(CountingAccessMetadata.Methods.GET_TABLE_STATISTICS, 3)
-                        .build());
+        assertThat(getTableStatisticsMethodInvocations()).isEqualTo(3);
     }
 
     private void planDistributedQuery(@Language("SQL") String sql)
     {
-        transaction(localQueryRunner.getTransactionManager(), localQueryRunner.getAccessControl())
-                .execute(localQueryRunner.getDefaultSession(), session -> {
-                    localQueryRunner.createPlan(session, sql, OPTIMIZED_AND_VALIDATED, false, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
-                });
+        localQueryRunner.inTransaction(transactionSession -> localQueryRunner.createPlan(
+                transactionSession,
+                sql,
+                localQueryRunner.getPlanOptimizers(false),
+                OPTIMIZED_AND_VALIDATED,
+                NOOP,
+                createPlanOptimizersStatsCollector()));
+    }
+
+    private long getTableStatisticsMethodInvocations()
+    {
+        return spanExporter.getFinishedSpanItems().stream()
+                .map(SpanData::getName)
+                .filter(name -> name.equals("Metadata.getTableStatistics"))
+                .count();
     }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergInputInfo.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergInputInfo.java
index 8bbee0157e3d..4a8b42fac983 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergInputInfo.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergInputInfo.java
@@ -20,7 +20,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -45,7 +45,7 @@ public void testInputWithPartitioning()
     {
         String tableName = "test_input_info_with_part_" + randomNameSuffix();
         assertUpdate("CREATE TABLE " + tableName + " WITH (partitioning = ARRAY['regionkey', 'truncate(name, 1)']) AS SELECT * FROM nation WHERE nationkey < 10", 10);
-        assertInputInfo(tableName, true, "ORC");
+        assertInputInfo(tableName, true, "PARQUET");
         assertUpdate("DROP TABLE " + tableName);
     }
 
@@ -54,16 +54,16 @@ public void testInputWithoutPartitioning()
     {
         String tableName = "test_input_info_without_part_" + randomNameSuffix();
         assertUpdate("CREATE TABLE " + tableName + " AS SELECT * FROM nation WHERE nationkey < 10", 10);
-        assertInputInfo(tableName, false, "ORC");
+        assertInputInfo(tableName, false, "PARQUET");
         assertUpdate("DROP TABLE " + tableName);
     }
 
     @Test
-    public void testInputWithParquetFileFormat()
+    public void testInputWithOrcFileFormat()
     {
-        String tableName = "test_input_info_with_parquet_file_format_" + randomNameSuffix();
-        assertUpdate("CREATE TABLE " + tableName + " WITH (format = 'PARQUET') AS SELECT * FROM nation WHERE nationkey < 10", 10);
-        assertInputInfo(tableName, false, "PARQUET");
+        String tableName = "test_input_info_with_orc_file_format_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " WITH (format = 'ORC') AS SELECT * FROM nation WHERE nationkey < 10", 10);
+        assertInputInfo(tableName, false, "ORC");
         assertUpdate("DROP TABLE " + tableName);
     }
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMaterializedView.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMaterializedView.java
index e39e4a881029..59ba415c1dab 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMaterializedView.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMaterializedView.java
@@ -13,18 +13,44 @@
  */
 package io.trino.plugin.iceberg;
 
+import io.trino.Session;
+import io.trino.sql.tree.ExplainType;
 import io.trino.testing.DistributedQueryRunner;
+import org.testng.annotations.Test;
 
+import java.util.Map;
+
+import static io.trino.plugin.base.util.Closables.closeAllSuppress;
 import static io.trino.plugin.iceberg.IcebergQueryRunner.createIcebergQueryRunner;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIcebergMaterializedView
         extends BaseIcebergMaterializedViewTest
 {
+    private Session secondIceberg;
+
     @Override
     protected DistributedQueryRunner createQueryRunner()
             throws Exception
     {
-        return createIcebergQueryRunner();
+        DistributedQueryRunner queryRunner = createIcebergQueryRunner();
+        try {
+            queryRunner.createCatalog("iceberg2", "iceberg", Map.of(
+                    "iceberg.catalog.type", "TESTING_FILE_METASTORE",
+                    "hive.metastore.catalog.dir", queryRunner.getCoordinator().getBaseDataDir().resolve("iceberg2-catalog").toString(),
+                    "iceberg.hive-catalog-name", "hive"));
+
+            secondIceberg = Session.builder(queryRunner.getDefaultSession())
+                    .setCatalog("iceberg2")
+                    .build();
+
+            queryRunner.execute(secondIceberg, "CREATE SCHEMA " + secondIceberg.getSchema().orElseThrow());
+        }
+        catch (Throwable e) {
+            closeAllSuppress(e, queryRunner);
+            throw e;
+        }
+        return queryRunner;
     }
 
     @Override
@@ -32,4 +58,54 @@ protected String getSchemaDirectory()
     {
         return getDistributedQueryRunner().getCoordinator().getBaseDataDir().resolve("iceberg_data/tpch").toString();
     }
+
+    @Test
+    public void testTwoIcebergCatalogs()
+    {
+        Session defaultIceberg = getSession();
+
+        // Base table for staleness check
+        String createTable = "CREATE TABLE common_base_table AS SELECT 10 value";
+        assertUpdate(secondIceberg, createTable, 1); // this one will be used by MV
+        assertUpdate(defaultIceberg, createTable, 1); // this one exists so that it can be mistakenly treated as the base table
+
+        assertUpdate(defaultIceberg, """
+                            CREATE MATERIALIZED VIEW iceberg.tpch.mv_on_iceberg2
+                            AS SELECT sum(value) AS s FROM iceberg2.tpch.common_base_table
+                """);
+
+        // The MV is initially stale
+        assertThat(getExplainPlan("TABLE mv_on_iceberg2", ExplainType.Type.IO))
+                .contains("\"table\" : \"common_base_table\"");
+        assertThat(query("TABLE mv_on_iceberg2"))
+                .matches("VALUES BIGINT '10'");
+
+        // After REFRESH, the MV is fresh
+        assertUpdate(defaultIceberg, "REFRESH MATERIALIZED VIEW mv_on_iceberg2", 1);
+        assertThat(getExplainPlan("TABLE mv_on_iceberg2", ExplainType.Type.IO))
+                .contains("\"table\" : \"st_")
+                .doesNotContain("common_base_table");
+        assertThat(query("TABLE mv_on_iceberg2"))
+                .matches("VALUES BIGINT '10'");
+
+        // After INSERT to the base table, the MV is still fresh, because it currently does not detect changes to tables in other catalog.
+        assertUpdate(secondIceberg, "INSERT INTO common_base_table VALUES 7", 1);
+        assertThat(getExplainPlan("TABLE mv_on_iceberg2", ExplainType.Type.IO))
+                .contains("\"table\" : \"st_")
+                .doesNotContain("common_base_table");
+        assertThat(query("TABLE mv_on_iceberg2"))
+                .matches("VALUES BIGINT '10'");
+
+        // After REFRESH, the MV is fresh again
+        assertUpdate(defaultIceberg, "REFRESH MATERIALIZED VIEW mv_on_iceberg2", 1);
+        assertThat(getExplainPlan("TABLE mv_on_iceberg2", ExplainType.Type.IO))
+                .contains("\"table\" : \"st_")
+                .doesNotContain("common_base_table");
+        assertThat(query("TABLE mv_on_iceberg2"))
+                .matches("VALUES BIGINT '17'");
+
+        assertUpdate(secondIceberg, "DROP TABLE common_base_table");
+        assertUpdate(defaultIceberg, "DROP TABLE common_base_table");
+        assertUpdate("DROP MATERIALIZED VIEW mv_on_iceberg2");
+    }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMergeAppend.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMergeAppend.java
index 6228db16d6b8..507889779a5e 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMergeAppend.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMergeAppend.java
@@ -14,7 +14,6 @@
 package io.trino.plugin.iceberg;
 
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.TrinoViewHiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastore;
@@ -31,13 +30,13 @@
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorSession;
 import org.apache.iceberg.Table;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
 import static io.trino.plugin.hive.metastore.cache.CachingHiveMetastore.memoizeMetastore;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.iceberg.IcebergTestUtils.getFileSystemFactory;
 import static org.testng.Assert.assertEquals;
 
 public class TestIcebergMergeAppend
@@ -47,12 +46,13 @@ public class TestIcebergMergeAppend
     private IcebergTableOperationsProvider tableOperationsProvider;
 
     @Override
-    protected QueryRunner createQueryRunner() throws Exception
+    protected QueryRunner createQueryRunner()
+            throws Exception
     {
         DistributedQueryRunner queryRunner = IcebergQueryRunner.createIcebergQueryRunner();
         File baseDir = queryRunner.getCoordinator().getBaseDataDir().resolve("iceberg_data").toFile();
         HiveMetastore metastore = createTestingFileHiveMetastore(baseDir);
-        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(HDFS_ENVIRONMENT);
+        TrinoFileSystemFactory fileSystemFactory = getFileSystemFactory(queryRunner);
         tableOperationsProvider = new FileMetastoreTableOperationsProvider(fileSystemFactory);
         CachingHiveMetastore cachingHiveMetastore = memoizeMetastore(metastore, 1000);
         trinoCatalog = new TrinoHiveCatalog(
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMetadataFileOperations.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMetadataFileOperations.java
deleted file mode 100644
index 057cab8c10e4..000000000000
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMetadataFileOperations.java
+++ /dev/null
@@ -1,518 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.iceberg;
-
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.ImmutableMultiset;
-import com.google.common.collect.Multiset;
-import io.trino.Session;
-import io.trino.filesystem.TrackingFileSystemFactory;
-import io.trino.filesystem.TrackingFileSystemFactory.OperationType;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
-import io.trino.plugin.hive.metastore.HiveMetastore;
-import io.trino.plugin.iceberg.catalog.file.TestingIcebergFileMetastoreCatalogModule;
-import io.trino.plugin.tpch.TpchPlugin;
-import io.trino.testing.AbstractTestQueryFramework;
-import io.trino.testing.DistributedQueryRunner;
-import io.trino.tpch.TpchTable;
-import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.util.Optional;
-
-import static com.google.inject.util.Modules.EMPTY_MODULE;
-import static io.trino.SystemSessionProperties.MIN_INPUT_SIZE_PER_TASK;
-import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_GET_LENGTH;
-import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_NEW_STREAM;
-import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.OUTPUT_FILE_CREATE;
-import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.OUTPUT_FILE_CREATE_OR_OVERWRITE;
-import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.OUTPUT_FILE_LOCATION;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
-import static io.trino.plugin.iceberg.IcebergSessionProperties.COLLECT_EXTENDED_STATISTICS_ON_WRITE;
-import static io.trino.plugin.iceberg.TestIcebergMetadataFileOperations.FileType.DATA;
-import static io.trino.plugin.iceberg.TestIcebergMetadataFileOperations.FileType.MANIFEST;
-import static io.trino.plugin.iceberg.TestIcebergMetadataFileOperations.FileType.METADATA_JSON;
-import static io.trino.plugin.iceberg.TestIcebergMetadataFileOperations.FileType.SNAPSHOT;
-import static io.trino.plugin.iceberg.TestIcebergMetadataFileOperations.FileType.STATS;
-import static io.trino.plugin.iceberg.TestIcebergMetadataFileOperations.FileType.fromFilePath;
-import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
-import static io.trino.testing.QueryAssertions.copyTpchTables;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.testing.TestingSession.testSessionBuilder;
-import static java.lang.String.format;
-import static java.util.Collections.nCopies;
-import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toCollection;
-import static org.assertj.core.api.Assertions.assertThat;
-
-@Test(singleThreaded = true) // e.g. trackingFileSystemFactory is shared mutable state
-public class TestIcebergMetadataFileOperations
-        extends AbstractTestQueryFramework
-{
-    private static final Session TEST_SESSION = testSessionBuilder()
-            .setCatalog("iceberg")
-            .setSchema("test_schema")
-            // It is essential to disable DeterminePartitionCount rule since all queries in this test scans small
-            // amount of data which makes them run with single hash partition count. However, this test requires them
-            // to run over multiple nodes.
-            .setSystemProperty(MIN_INPUT_SIZE_PER_TASK, "0MB")
-            .build();
-
-    private TrackingFileSystemFactory trackingFileSystemFactory;
-
-    @Override
-    protected DistributedQueryRunner createQueryRunner()
-            throws Exception
-    {
-        Session session = testSessionBuilder()
-                .setCatalog("iceberg")
-                .setSchema("test_schema")
-                .build();
-
-        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session)
-                // Tests that inspect MBean attributes need to run with just one node, otherwise
-                // the attributes may come from the bound class instance in non-coordinator node
-                .setNodeCount(1)
-                .build();
-
-        File baseDir = queryRunner.getCoordinator().getBaseDataDir().resolve("iceberg_data").toFile();
-        HiveMetastore metastore = createTestingFileHiveMetastore(baseDir);
-
-        trackingFileSystemFactory = new TrackingFileSystemFactory(new HdfsFileSystemFactory(HDFS_ENVIRONMENT));
-        queryRunner.installPlugin(new TestingIcebergPlugin(Optional.of(new TestingIcebergFileMetastoreCatalogModule(metastore)), Optional.of(trackingFileSystemFactory), EMPTY_MODULE));
-        queryRunner.createCatalog("iceberg", "iceberg");
-        queryRunner.installPlugin(new TpchPlugin());
-        queryRunner.createCatalog("tpch", "tpch");
-
-        queryRunner.execute("CREATE SCHEMA test_schema");
-
-        copyTpchTables(queryRunner, "tpch", TINY_SCHEMA_NAME, session, TpchTable.getTables());
-        return queryRunner;
-    }
-
-    @Test
-    public void testCreateTable()
-    {
-        assertFileSystemAccesses("CREATE TABLE test_create (id VARCHAR, age INT)",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(METADATA_JSON, OUTPUT_FILE_CREATE), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, OUTPUT_FILE_LOCATION), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, OUTPUT_FILE_CREATE_OR_OVERWRITE), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, OUTPUT_FILE_LOCATION), 2)
-                        .build());
-    }
-
-    @Test
-    public void testCreateTableAsSelect()
-    {
-        assertFileSystemAccesses(
-                withStatsOnWrite(getSession(), false),
-                "CREATE TABLE test_create_as_select AS SELECT 1 col_name",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, OUTPUT_FILE_CREATE_OR_OVERWRITE), 1)
-                        .addCopies(new FileOperation(MANIFEST, OUTPUT_FILE_LOCATION), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, OUTPUT_FILE_CREATE), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, OUTPUT_FILE_LOCATION), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, OUTPUT_FILE_CREATE_OR_OVERWRITE), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, OUTPUT_FILE_LOCATION), 2)
-                        .build());
-
-        assertFileSystemAccesses(
-                withStatsOnWrite(getSession(), true),
-                "CREATE TABLE test_create_as_select_with_stats AS SELECT 1 col_name",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, OUTPUT_FILE_CREATE_OR_OVERWRITE), 1)
-                        .addCopies(new FileOperation(MANIFEST, OUTPUT_FILE_LOCATION), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 2)
-                        .addCopies(new FileOperation(METADATA_JSON, OUTPUT_FILE_CREATE), 2) // TODO (https://github.com/trinodb/trino/issues/15439): it would be good to publish data and stats in one commit
-                        .addCopies(new FileOperation(METADATA_JSON, OUTPUT_FILE_LOCATION), 2)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 2)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 2)
-                        .addCopies(new FileOperation(SNAPSHOT, OUTPUT_FILE_CREATE_OR_OVERWRITE), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, OUTPUT_FILE_LOCATION), 2)
-                        .addCopies(new FileOperation(STATS, OUTPUT_FILE_CREATE), 1)
-                        .build());
-    }
-
-    @Test
-    public void testSelect()
-    {
-        assertUpdate("CREATE TABLE test_select AS SELECT 1 col_name", 1);
-        assertFileSystemAccesses("SELECT * FROM test_select",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-    }
-
-    @Test
-    public void testSelectFromVersionedTable()
-    {
-        String tableName = "test_select_from_versioned_table";
-        assertUpdate("CREATE TABLE " + tableName + " (id int, age int)");
-        long v1SnapshotId = getLatestSnapshotId(tableName);
-        assertUpdate("INSERT INTO " + tableName + " VALUES (2, 20)", 1);
-        long v2SnapshotId = getLatestSnapshotId(tableName);
-        assertUpdate("INSERT INTO " + tableName + "  VALUES (3, 30)", 1);
-        long v3SnapshotId = getLatestSnapshotId(tableName);
-        assertFileSystemAccesses("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v1SnapshotId,
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-        assertFileSystemAccesses("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v2SnapshotId,
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-        assertFileSystemAccesses("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v3SnapshotId,
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 2)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
-                        .build());
-        assertFileSystemAccesses("SELECT * FROM " + tableName,
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 2)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
-                        .build());
-    }
-
-    @Test
-    public void testSelectFromVersionedTableWithSchemaEvolution()
-    {
-        String tableName = "test_select_from_versioned_table_with_schema_evolution";
-        assertUpdate("CREATE TABLE " + tableName + " (id int, age int)");
-        long v1SnapshotId = getLatestSnapshotId(tableName);
-        assertUpdate("INSERT INTO " + tableName + " VALUES (2, 20)", 1);
-        long v2SnapshotId = getLatestSnapshotId(tableName);
-        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN address varchar");
-        assertUpdate("INSERT INTO " + tableName + "  VALUES (3, 30, 'London')", 1);
-        long v3SnapshotId = getLatestSnapshotId(tableName);
-        assertFileSystemAccesses("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v1SnapshotId,
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-        assertFileSystemAccesses("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v2SnapshotId,
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-        assertFileSystemAccesses("SELECT * FROM " + tableName + " FOR VERSION AS OF " + v3SnapshotId,
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 2)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
-                        .build());
-        assertFileSystemAccesses("SELECT * FROM " + tableName,
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 2)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
-                        .build());
-    }
-
-    @Test
-    public void testSelectWithFilter()
-    {
-        assertUpdate("CREATE TABLE test_select_with_filter AS SELECT 1 col_name", 1);
-        assertFileSystemAccesses("SELECT * FROM test_select_with_filter WHERE col_name = 1",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-    }
-
-    @Test
-    public void testJoin()
-    {
-        assertUpdate("CREATE TABLE test_join_t1 AS SELECT 2 AS age, 'id1' AS id", 1);
-        assertUpdate("CREATE TABLE test_join_t2 AS SELECT 'name1' AS name, 'id1' AS id", 1);
-
-        assertFileSystemAccesses("SELECT name, age FROM test_join_t1 JOIN test_join_t2 ON test_join_t2.id = test_join_t1.id",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 4)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 4)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 2)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 2)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 2)
-                        .build());
-    }
-
-    @Test
-    public void testJoinWithPartitionedTable()
-    {
-        assertUpdate("CREATE TABLE test_join_partitioned_t1 (a BIGINT, b TIMESTAMP(6) with time zone) WITH (partitioning = ARRAY['a', 'day(b)'])");
-        assertUpdate("CREATE TABLE test_join_partitioned_t2 (foo BIGINT)");
-        assertUpdate("INSERT INTO test_join_partitioned_t2 VALUES(123)", 1);
-        assertUpdate("INSERT INTO test_join_partitioned_t1 VALUES(123, current_date)", 1);
-
-        assertFileSystemAccesses("SELECT count(*) FROM test_join_partitioned_t1 t1 join test_join_partitioned_t2 t2 on t1.a = t2.foo",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 4)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 4)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 2)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 2)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 2)
-                        .build());
-    }
-
-    @Test
-    public void testExplainSelect()
-    {
-        assertUpdate("CREATE TABLE test_explain AS SELECT 2 AS age", 1);
-
-        assertFileSystemAccesses("EXPLAIN SELECT * FROM test_explain",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-    }
-
-    @Test
-    public void testShowStatsForTable()
-    {
-        assertUpdate("CREATE TABLE test_show_stats AS SELECT 2 AS age", 1);
-
-        assertFileSystemAccesses("SHOW STATS FOR test_show_stats",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-    }
-
-    @Test
-    public void testShowStatsForPartitionedTable()
-    {
-        assertUpdate("CREATE TABLE test_show_stats_partitioned " +
-                "WITH (partitioning = ARRAY['regionkey']) " +
-                "AS SELECT * FROM tpch.tiny.nation", 25);
-
-        assertFileSystemAccesses("SHOW STATS FOR test_show_stats_partitioned",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-    }
-
-    @Test
-    public void testShowStatsForTableWithFilter()
-    {
-        assertUpdate("CREATE TABLE test_show_stats_with_filter AS SELECT 2 AS age", 1);
-
-        assertFileSystemAccesses("SHOW STATS FOR (SELECT * FROM test_show_stats_with_filter WHERE age >= 2)",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-    }
-
-    @Test
-    public void testPredicateWithVarcharCastToDate()
-    {
-        assertUpdate("CREATE TABLE test_varchar_as_date_predicate(a varchar) WITH (partitioning=ARRAY['truncate(a, 4)'])");
-        assertUpdate("INSERT INTO test_varchar_as_date_predicate VALUES '2001-01-31'", 1);
-        assertUpdate("INSERT INTO test_varchar_as_date_predicate VALUES '2005-09-10'", 1);
-
-        assertFileSystemAccesses("SELECT * FROM test_varchar_as_date_predicate",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 2)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 2)
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-
-        // CAST to date and comparison
-        assertFileSystemAccesses("SELECT * FROM test_varchar_as_date_predicate WHERE CAST(a AS date) >= DATE '2005-01-01'",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 1) // fewer than without filter
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 1) // fewer than without filter
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-
-        // CAST to date and BETWEEN
-        assertFileSystemAccesses("SELECT * FROM test_varchar_as_date_predicate WHERE CAST(a AS date) BETWEEN DATE '2005-01-01' AND DATE '2005-12-31'",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 1) // fewer than without filter
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 1) // fewer than without filter
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-
-        // conversion to date as a date function
-        assertFileSystemAccesses("SELECT * FROM test_varchar_as_date_predicate WHERE date(a) >= DATE '2005-01-01'",
-                ImmutableMultiset.<FileOperation>builder()
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 1) // fewer than without filter
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 1) // fewer than without filter
-                        .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 1)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 1)
-                        .build());
-
-        assertUpdate("DROP TABLE test_varchar_as_date_predicate");
-    }
-
-    @Test
-    public void testRemoveOrphanFiles()
-    {
-        String tableName = "test_remove_orphan_files_" + randomNameSuffix();
-        Session sessionWithShortRetentionUnlocked = Session.builder(getSession())
-                .setCatalogSessionProperty("iceberg", "remove_orphan_files_min_retention", "0s")
-                .build();
-        assertUpdate("CREATE TABLE " + tableName + " (key varchar, value integer)");
-        assertUpdate("INSERT INTO " + tableName + " VALUES ('one', 1)", 1);
-        assertUpdate("INSERT INTO " + tableName + " VALUES ('two', 2), ('three', 3)", 2);
-        assertUpdate("DELETE FROM " + tableName + " WHERE key = 'two'", 1);
-
-        assertFileSystemAccesses(
-                sessionWithShortRetentionUnlocked,
-                "ALTER TABLE " + tableName + " EXECUTE REMOVE_ORPHAN_FILES (retention_threshold => '0s')",
-                ImmutableMultiset.<FileOperation>builder()
-                        .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_GET_LENGTH), 4)
-                        .addCopies(new FileOperation(SNAPSHOT, INPUT_FILE_NEW_STREAM), 4)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_GET_LENGTH), 5)
-                        .addCopies(new FileOperation(MANIFEST, INPUT_FILE_NEW_STREAM), 5)
-                        .build());
-
-        assertUpdate("DROP TABLE " + tableName);
-    }
-
-    private void assertFileSystemAccesses(@Language("SQL") String query, Multiset<FileOperation> expectedAccesses)
-    {
-        assertFileSystemAccesses(TEST_SESSION, query, expectedAccesses);
-    }
-
-    private void assertFileSystemAccesses(Session session, @Language("SQL") String query, Multiset<FileOperation> expectedAccesses)
-    {
-        resetCounts();
-        getDistributedQueryRunner().executeWithQueryId(session, query);
-        assertThat(getOperations())
-                .filteredOn(operation -> operation.fileType() != DATA)
-                .containsExactlyInAnyOrderElementsOf(expectedAccesses);
-    }
-
-    private void resetCounts()
-    {
-        trackingFileSystemFactory.reset();
-    }
-
-    private Multiset<FileOperation> getOperations()
-    {
-        return trackingFileSystemFactory.getOperationCounts()
-                .entrySet().stream()
-                .flatMap(entry -> nCopies(entry.getValue(), new FileOperation(
-                        fromFilePath(entry.getKey().getFilePath()),
-                        entry.getKey().getOperationType())).stream())
-                .collect(toCollection(HashMultiset::create));
-    }
-
-    private long getLatestSnapshotId(String tableName)
-    {
-        return (long) computeScalar(format("SELECT snapshot_id FROM \"%s$snapshots\" ORDER BY committed_at DESC FETCH FIRST 1 ROW WITH TIES", tableName));
-    }
-
-    private static Session withStatsOnWrite(Session session, boolean enabled)
-    {
-        String catalog = session.getCatalog().orElseThrow();
-        return Session.builder(session)
-                .setCatalogSessionProperty(catalog, COLLECT_EXTENDED_STATISTICS_ON_WRITE, Boolean.toString(enabled))
-                .build();
-    }
-
-    private record FileOperation(FileType fileType, OperationType operationType)
-    {
-        public FileOperation
-        {
-            requireNonNull(fileType, "fileType is null");
-            requireNonNull(operationType, "operationType is null");
-        }
-    }
-
-    enum FileType
-    {
-        METADATA_JSON,
-        MANIFEST,
-        SNAPSHOT,
-        STATS,
-        DATA,
-        /**/;
-
-        public static FileType fromFilePath(String path)
-        {
-            if (path.endsWith("metadata.json")) {
-                return METADATA_JSON;
-            }
-            if (path.contains("/snap-")) {
-                return SNAPSHOT;
-            }
-            if (path.endsWith("-m0.avro")) {
-                return MANIFEST;
-            }
-            if (path.endsWith(".stats")) {
-                return STATS;
-            }
-            if (path.contains("/data/") && path.endsWith(".orc")) {
-                return DATA;
-            }
-            throw new IllegalArgumentException("File not recognized: " + path);
-        }
-    }
-}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMetadataListing.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMetadataListing.java
index 179669094572..7ec95cbdd7af 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMetadataListing.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMetadataListing.java
@@ -27,19 +27,22 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.util.Optional;
 
 import static com.google.inject.util.Modules.EMPTY_MODULE;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.spi.security.SelectedRole.Type.ROLE;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestIcebergMetadataListing
         extends AbstractTestQueryFramework
 {
@@ -69,7 +72,7 @@ protected DistributedQueryRunner createQueryRunner()
         return queryRunner;
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         assertQuerySucceeds("CREATE SCHEMA hive.test_schema");
@@ -84,7 +87,7 @@ public void setUp()
         assertQuerySucceeds("CREATE VIEW hive.test_schema.hive_view AS SELECT * FROM hive.test_schema.hive_table");
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         assertQuerySucceeds("DROP TABLE IF EXISTS hive.test_schema.hive_table");
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMetastoreAccessOperations.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMetastoreAccessOperations.java
index eb392bdd2891..2d46297e5b2b 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMetastoreAccessOperations.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMetastoreAccessOperations.java
@@ -22,18 +22,24 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.File;
 import java.util.Optional;
 
 import static com.google.inject.util.Modules.EMPTY_MODULE;
-import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Methods.CREATE_TABLE;
-import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Methods.DROP_TABLE;
-import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Methods.GET_DATABASE;
-import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Methods.GET_TABLE;
-import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Methods.REPLACE_TABLE;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.CREATE_TABLE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.DROP_TABLE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_ALL_TABLES_FROM_DATABASE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_DATABASE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_TABLE;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.GET_TABLES_WITH_PARAMETER;
+import static io.trino.plugin.hive.metastore.CountingAccessHiveMetastore.Method.REPLACE_TABLE;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.COLLECT_EXTENDED_STATISTICS_ON_WRITE;
 import static io.trino.plugin.iceberg.TableType.DATA;
 import static io.trino.plugin.iceberg.TableType.FILES;
@@ -43,13 +49,15 @@
 import static io.trino.plugin.iceberg.TableType.PROPERTIES;
 import static io.trino.plugin.iceberg.TableType.REFS;
 import static io.trino.plugin.iceberg.TableType.SNAPSHOTS;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true) // metastore invocation counters shares mutable state so can't be run from many threads simultaneously
+@Execution(ExecutionMode.SAME_THREAD) // metastore invocation counters shares mutable state so can't be run from many threads simultaneously
 public class TestIcebergMetastoreAccessOperations
         extends AbstractTestQueryFramework
 {
+    private static final int MAX_PREFIXES_COUNT = 10;
     private static final Session TEST_SESSION = testSessionBuilder()
             .setCatalog("iceberg")
             .setSchema("test_schema")
@@ -61,7 +69,9 @@ public class TestIcebergMetastoreAccessOperations
     protected DistributedQueryRunner createQueryRunner()
             throws Exception
     {
-        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(TEST_SESSION).build();
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(TEST_SESSION)
+                .addCoordinatorProperty("optimizer.experimental-max-prefetched-information-schema-prefixes", Integer.toString(MAX_PREFIXES_COUNT))
+                .build();
 
         File baseDir = queryRunner.getCoordinator().getBaseDataDir().resolve("iceberg_data").toFile();
         metastore = new CountingAccessHiveMetastore(createTestingFileHiveMetastore(baseDir));
@@ -98,6 +108,23 @@ public void testCreateTable()
                         .build());
     }
 
+    @Test
+    public void testCreateOrReplaceTable()
+    {
+        assertMetastoreInvocations("CREATE OR REPLACE TABLE test_create_or_replace (id VARCHAR, age INT)",
+                ImmutableMultiset.builder()
+                        .add(CREATE_TABLE)
+                        .add(GET_DATABASE)
+                        .add(GET_TABLE)
+                        .build());
+        assertMetastoreInvocations("CREATE OR REPLACE TABLE test_create_or_replace (id VARCHAR, age INT)",
+                ImmutableMultiset.builder()
+                        .add(GET_DATABASE)
+                        .add(REPLACE_TABLE)
+                        .add(GET_TABLE)
+                        .build());
+    }
+
     @Test
     public void testCreateTableAsSelect()
     {
@@ -116,11 +143,32 @@ public void testCreateTableAsSelect()
                 ImmutableMultiset.builder()
                         .add(GET_DATABASE)
                         .add(CREATE_TABLE)
-                        .addCopies(GET_TABLE, 5)
+                        .addCopies(GET_TABLE, 4)
                         .add(REPLACE_TABLE)
                         .build());
     }
 
+    @Test
+    public void testCreateOrReplaceTableAsSelect()
+    {
+        assertMetastoreInvocations(
+                "CREATE OR REPLACE TABLE test_cortas AS SELECT 1 AS age",
+                ImmutableMultiset.builder()
+                        .add(GET_DATABASE)
+                        .add(CREATE_TABLE)
+                        .addCopies(GET_TABLE, 4)
+                        .add(REPLACE_TABLE)
+                        .build());
+
+        assertMetastoreInvocations(
+                "CREATE OR REPLACE TABLE test_cortas AS SELECT 1 AS age",
+                ImmutableMultiset.builder()
+                        .add(GET_DATABASE)
+                        .addCopies(GET_TABLE, 3)
+                        .addCopies(REPLACE_TABLE, 2)
+                        .build());
+    }
+
     @Test
     public void testSelect()
     {
@@ -319,6 +367,172 @@ public void testUnregisterTable()
                         .build());
     }
 
+    @ParameterizedTest
+    @MethodSource("metadataQueriesTestTableCountDataProvider")
+    public void testInformationSchemaColumns(int tables)
+    {
+        String schemaName = "test_i_s_columns_schema" + randomNameSuffix();
+        assertUpdate("CREATE SCHEMA " + schemaName);
+        Session session = Session.builder(getSession())
+                .setSchema(schemaName)
+                .build();
+
+        for (int i = 0; i < tables; i++) {
+            assertUpdate(session, "CREATE TABLE test_select_i_s_columns" + i + "(id varchar, age integer)");
+            // Produce multiple snapshots and metadata files
+            assertUpdate(session, "INSERT INTO test_select_i_s_columns" + i + " VALUES ('abc', 11)", 1);
+            assertUpdate(session, "INSERT INTO test_select_i_s_columns" + i + " VALUES ('xyz', 12)", 1);
+
+            assertUpdate(session, "CREATE TABLE test_other_select_i_s_columns" + i + "(id varchar, age integer)"); // won't match the filter
+        }
+
+        // Bulk retrieval
+        assertMetastoreInvocations(session, "SELECT * FROM information_schema.columns WHERE table_schema = CURRENT_SCHEMA AND table_name LIKE 'test_select_i_s_columns%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES_FROM_DATABASE)
+                        .addCopies(GET_TABLE, tables * 2)
+                        .addCopies(GET_TABLES_WITH_PARAMETER, 2)
+                        .build());
+
+        // Pointed lookup
+        assertMetastoreInvocations(session, "SELECT * FROM information_schema.columns WHERE table_schema = CURRENT_SCHEMA AND table_name = 'test_select_i_s_columns0'",
+                ImmutableMultiset.builder()
+                        .add(GET_TABLE)
+                        .build());
+
+        // Pointed lookup via DESCRIBE (which does some additional things before delegating to information_schema.columns)
+        assertMetastoreInvocations(session, "DESCRIBE test_select_i_s_columns0",
+                ImmutableMultiset.builder()
+                        .add(GET_DATABASE)
+                        .add(GET_TABLE)
+                        .build());
+
+        for (int i = 0; i < tables; i++) {
+            assertUpdate(session, "DROP TABLE test_select_i_s_columns" + i);
+            assertUpdate(session, "DROP TABLE test_other_select_i_s_columns" + i);
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("metadataQueriesTestTableCountDataProvider")
+    public void testSystemMetadataTableComments(int tables)
+    {
+        String schemaName = "test_s_m_table_comments" + randomNameSuffix();
+        assertUpdate("CREATE SCHEMA " + schemaName);
+        Session session = Session.builder(getSession())
+                .setSchema(schemaName)
+                .build();
+
+        for (int i = 0; i < tables; i++) {
+            assertUpdate(session, "CREATE TABLE test_select_s_m_t_comments" + i + "(id varchar, age integer)");
+            // Produce multiple snapshots and metadata files
+            assertUpdate(session, "INSERT INTO test_select_s_m_t_comments" + i + " VALUES ('abc', 11)", 1);
+            assertUpdate(session, "INSERT INTO test_select_s_m_t_comments" + i + " VALUES ('xyz', 12)", 1);
+
+            assertUpdate(session, "CREATE TABLE test_other_select_s_m_t_comments" + i + "(id varchar, age integer)"); // won't match the filter
+        }
+
+        // Bulk retrieval
+        assertMetastoreInvocations(session, "SELECT * FROM system.metadata.table_comments WHERE schema_name = CURRENT_SCHEMA AND table_name LIKE 'test_select_s_m_t_comments%'",
+                ImmutableMultiset.builder()
+                        .add(GET_ALL_TABLES_FROM_DATABASE)
+                        .addCopies(GET_TABLE, tables * 2)
+                        .addCopies(GET_TABLES_WITH_PARAMETER, 2)
+                        .build());
+
+        // Bulk retrieval for two schemas
+        assertMetastoreInvocations(session, "SELECT * FROM system.metadata.table_comments WHERE schema_name IN (CURRENT_SCHEMA, 'non_existent') AND table_name LIKE 'test_select_s_m_t_comments%'",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_ALL_TABLES_FROM_DATABASE, 2)
+                        .addCopies(GET_TABLES_WITH_PARAMETER, 4)
+                        .addCopies(GET_TABLE, tables * 2)
+                        .build());
+
+        // Pointed lookup
+        assertMetastoreInvocations(session, "SELECT * FROM system.metadata.table_comments WHERE schema_name = CURRENT_SCHEMA AND table_name = 'test_select_s_m_t_comments0'",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 1)
+                        .build());
+
+        for (int i = 0; i < tables; i++) {
+            assertUpdate(session, "DROP TABLE test_select_s_m_t_comments" + i);
+            assertUpdate(session, "DROP TABLE test_other_select_s_m_t_comments" + i);
+        }
+    }
+
+    public Object[][] metadataQueriesTestTableCountDataProvider()
+    {
+        return new Object[][] {
+                {3},
+                {MAX_PREFIXES_COUNT},
+                {MAX_PREFIXES_COUNT + 3},
+        };
+    }
+
+    @Test
+    public void testSystemMetadataMaterializedViews()
+    {
+        String schemaName = "test_materialized_views_" + randomNameSuffix();
+        assertUpdate("CREATE SCHEMA " + schemaName);
+        Session session = Session.builder(getSession())
+                .setSchema(schemaName)
+                .build();
+
+        assertUpdate(session, "CREATE TABLE test_table1 AS SELECT 1 a", 1);
+        assertUpdate(session, "CREATE TABLE test_table2 AS SELECT 1 a", 1);
+
+        assertUpdate(session, "CREATE MATERIALIZED VIEW mv1 AS SELECT * FROM test_table1 JOIN test_table2 USING (a)");
+        assertUpdate(session, "REFRESH MATERIALIZED VIEW mv1", 1);
+
+        assertUpdate(session, "CREATE MATERIALIZED VIEW mv2 AS SELECT count(*) c FROM test_table1 JOIN test_table2 USING (a)");
+        assertUpdate(session, "REFRESH MATERIALIZED VIEW mv2", 1);
+
+        // Bulk retrieval
+        assertMetastoreInvocations(session, "SELECT * FROM system.metadata.materialized_views WHERE schema_name = CURRENT_SCHEMA",
+                ImmutableMultiset.builder()
+                        .add(GET_TABLES_WITH_PARAMETER)
+                        .addCopies(GET_TABLE, 6)
+                        .build());
+
+        // Bulk retrieval without selecting freshness
+        assertMetastoreInvocations(session, "SELECT schema_name, name FROM system.metadata.materialized_views WHERE schema_name = CURRENT_SCHEMA",
+                ImmutableMultiset.builder()
+                        .add(GET_TABLES_WITH_PARAMETER)
+                        .addCopies(GET_TABLE, 4)
+                        .build());
+
+        // Bulk retrieval for two schemas
+        assertMetastoreInvocations(session, "SELECT * FROM system.metadata.materialized_views WHERE schema_name IN (CURRENT_SCHEMA, 'non_existent')",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLES_WITH_PARAMETER, 2)
+                        .addCopies(GET_TABLE, 6)
+                        .build());
+
+        // Pointed lookup
+        assertMetastoreInvocations(session, "SELECT * FROM system.metadata.materialized_views WHERE schema_name = CURRENT_SCHEMA AND name = 'mv1'",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 4)
+                        .build());
+
+        // Pointed lookup without selecting freshness
+        assertMetastoreInvocations(session, "SELECT schema_name, name FROM system.metadata.materialized_views WHERE schema_name = CURRENT_SCHEMA AND name = 'mv1'",
+                ImmutableMultiset.builder()
+                        .addCopies(GET_TABLE, 2)
+                        .build());
+
+        assertUpdate("DROP SCHEMA " + schemaName + " CASCADE");
+    }
+
+    @Test
+    public void testShowTables()
+    {
+        assertMetastoreInvocations("SHOW TABLES",
+                ImmutableMultiset.builder()
+                        .add(GET_DATABASE)
+                        .add(GET_ALL_TABLES_FROM_DATABASE)
+                        .build());
+    }
+
     private void assertMetastoreInvocations(@Language("SQL") String query, Multiset<?> expectedInvocations)
     {
         assertMetastoreInvocations(getSession(), query, expectedInvocations);
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMigrateProcedure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMigrateProcedure.java
index abbef53111f5..10dcb3c5193c 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMigrateProcedure.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMigrateProcedure.java
@@ -19,15 +19,18 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.stream.Stream;
 
 import static com.google.common.collect.MoreCollectors.onlyElement;
+import static io.trino.plugin.iceberg.IcebergFileFormat.AVRO;
 import static io.trino.testing.TestingNames.randomNameSuffix;
+import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
@@ -45,14 +48,15 @@ protected QueryRunner createQueryRunner()
         DistributedQueryRunner queryRunner = IcebergQueryRunner.builder().setMetastoreDirectory(dataDirectory.toFile()).build();
         queryRunner.installPlugin(new TestingHivePlugin());
         queryRunner.createCatalog("hive", "hive", ImmutableMap.<String, String>builder()
-                        .put("hive.metastore", "file")
-                        .put("hive.metastore.catalog.dir", dataDirectory.toString())
-                        .put("hive.security", "allow-all")
+                .put("hive.metastore", "file")
+                .put("hive.metastore.catalog.dir", dataDirectory.toString())
+                .put("hive.security", "allow-all")
                 .buildOrThrow());
         return queryRunner;
     }
 
-    @Test(dataProvider = "fileFormats")
+    @ParameterizedTest
+    @MethodSource("fileFormats")
     public void testMigrateTable(IcebergFileFormat fileFormat)
     {
         String tableName = "test_migrate_" + randomNameSuffix();
@@ -64,6 +68,9 @@ public void testMigrateTable(IcebergFileFormat fileFormat)
 
         assertUpdate("CALL iceberg.system.migrate('tpch', '" + tableName + "')");
 
+        assertThat((String) computeScalar("SHOW CREATE TABLE " + icebergTableName))
+                .contains("format = '%s'".formatted(fileFormat));
+
         assertQuery("SELECT * FROM " + icebergTableName, "VALUES 1");
         assertQuery("SELECT count(*) FROM " + icebergTableName, "VALUES 1");
 
@@ -73,7 +80,62 @@ public void testMigrateTable(IcebergFileFormat fileFormat)
         assertUpdate("DROP TABLE " + tableName);
     }
 
-    @DataProvider
+    @ParameterizedTest
+    @MethodSource("fileFormats")
+    public void testMigrateTableWithTinyintType(IcebergFileFormat fileFormat)
+    {
+        String tableName = "test_migrate_tinyint" + randomNameSuffix();
+        String hiveTableName = "hive.tpch." + tableName;
+        String icebergTableName = "iceberg.tpch." + tableName;
+
+        String createTable = "CREATE TABLE " + hiveTableName + "(col TINYINT) WITH (format = '" + fileFormat + "')";
+        if (fileFormat == AVRO) {
+            assertQueryFails(createTable, "Column 'col' is tinyint, which is not supported by Avro. Use integer instead.");
+            return;
+        }
+
+        assertUpdate(createTable);
+        assertUpdate("INSERT INTO " + hiveTableName + " VALUES NULL, -128, 127", 3);
+
+        assertUpdate("CALL iceberg.system.migrate('tpch', '" + tableName + "')");
+
+        assertThat(getColumnType(tableName, "col")).isEqualTo("integer");
+        assertQuery("SELECT * FROM " + icebergTableName, "VALUES (NULL), (-128), (127)");
+
+        assertUpdate("INSERT INTO " + icebergTableName + " VALUES -2147483648, 2147483647", 2);
+        assertQuery("SELECT * FROM " + icebergTableName, "VALUES (NULL), (-2147483648), (-128), (127), (2147483647)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @ParameterizedTest
+    @MethodSource("fileFormats")
+    public void testMigrateTableWithSmallintType(IcebergFileFormat fileFormat)
+    {
+        String tableName = "test_migrate_smallint" + randomNameSuffix();
+        String hiveTableName = "hive.tpch." + tableName;
+        String icebergTableName = "iceberg.tpch." + tableName;
+
+        String createTable = "CREATE TABLE " + hiveTableName + "(col SMALLINT) WITH (format = '" + fileFormat + "')";
+        if (fileFormat == AVRO) {
+            assertQueryFails(createTable, "Column 'col' is smallint, which is not supported by Avro. Use integer instead.");
+            return;
+        }
+
+        assertUpdate(createTable);
+        assertUpdate("INSERT INTO " + hiveTableName + " VALUES NULL, -32768, 32767", 3);
+
+        assertUpdate("CALL iceberg.system.migrate('tpch', '" + tableName + "')");
+
+        assertThat(getColumnType(tableName, "col")).isEqualTo("integer");
+        assertQuery("SELECT * FROM " + icebergTableName, "VALUES (NULL), (-32768), (32767)");
+
+        assertUpdate("INSERT INTO " + icebergTableName + " VALUES -2147483648, 2147483647", 2);
+        assertQuery("SELECT * FROM " + icebergTableName, "VALUES (NULL), (-2147483648), (-32768), (32767), (2147483647)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
     public static Object[][] fileFormats()
     {
         return Stream.of(IcebergFileFormat.values())
@@ -106,6 +168,30 @@ public void testMigratePartitionedTable()
         assertUpdate("DROP TABLE " + tableName);
     }
 
+    @Test
+    public void testMigrateBucketedTable()
+    {
+        String tableName = "test_migrate_bucketed_table_" + randomNameSuffix();
+        String hiveTableName = "hive.tpch." + tableName;
+        String icebergTableName = "iceberg.tpch." + tableName;
+
+        assertUpdate("CREATE TABLE " + hiveTableName + " WITH (partitioned_by = ARRAY['part'], bucketed_by = ARRAY['bucket'], bucket_count = 10) AS SELECT 1 bucket, 'part1' part", 1);
+
+        assertUpdate("CALL iceberg.system.migrate('tpch', '" + tableName + "')");
+
+        // Make sure partition column is preserved, but it's migrated as a non-bucketed table
+        assertThat(query("SELECT partition FROM iceberg.tpch.\"" + tableName + "$partitions\""))
+                .skippingTypesCheck()
+                .matches("SELECT CAST(row('part1') AS row(part_col varchar))");
+        assertThat((String) computeScalar("SHOW CREATE TABLE " + icebergTableName))
+                .contains("partitioning = ARRAY['part']");
+
+        assertUpdate("INSERT INTO " + icebergTableName + " VALUES (2, 'part2')", 1);
+        assertQuery("SELECT * FROM " + icebergTableName, "VALUES (1, 'part1'), (2, 'part2')");
+
+        assertUpdate("DROP TABLE " + icebergTableName);
+    }
+
     @Test
     public void testMigrateTableWithRecursiveDirectory()
             throws Exception
@@ -236,36 +322,38 @@ public void testMigrateUnsupportedColumnType()
     }
 
     @Test
-    public void testMigrateUnsupportedTableFormat()
+    public void testMigrateUnsupportedComplexColumnType()
     {
-        String tableName = "test_migrate_unsupported_table_format_" + randomNameSuffix();
+        // TODO https://github.com/trinodb/trino/issues/17583 Add support for these complex types
+        String tableName = "test_migrate_unsupported_complex_column_type_" + randomNameSuffix();
         String hiveTableName = "hive.tpch." + tableName;
-        String icebergTableName = "iceberg.tpch." + tableName;
 
-        assertUpdate("CREATE TABLE " + hiveTableName + " WITH (format = 'RCBINARY') AS SELECT 1 x", 1);
-
-        assertThatThrownBy(() -> query("CALL iceberg.system.migrate('tpch', '" + tableName + "')"))
-                .hasStackTraceContaining("Unsupported storage format: RCBINARY");
+        assertUpdate("CREATE TABLE " + hiveTableName + " AS SELECT array[1] x", 1);
+        assertQueryFails("CALL iceberg.system.migrate('tpch', '" + tableName + "')", "\\QMigrating array(integer) type is not supported");
+        assertUpdate("DROP TABLE " + hiveTableName);
 
-        assertQuery("SELECT * FROM " + hiveTableName, "VALUES 1");
-        assertQueryFails("SELECT * FROM " + icebergTableName, "Not an Iceberg table: .*");
+        assertUpdate("CREATE TABLE " + hiveTableName + " AS SELECT map(array['key'], array[2]) x", 1);
+        assertQueryFails("CALL iceberg.system.migrate('tpch', '" + tableName + "')", "\\QMigrating map(varchar(3), integer) type is not supported");
+        assertUpdate("DROP TABLE " + hiveTableName);
 
+        assertUpdate("CREATE TABLE " + hiveTableName + " AS SELECT CAST(row(1) AS row(y integer)) x", 1);
+        assertQueryFails("CALL iceberg.system.migrate('tpch', '" + tableName + "')", "\\QMigrating row(y integer) type is not supported");
         assertUpdate("DROP TABLE " + hiveTableName);
     }
 
     @Test
-    public void testMigrateUnsupportedBucketedTable()
+    public void testMigrateUnsupportedTableFormat()
     {
-        String tableName = "test_migrate_unsupported_bucketed_table_" + randomNameSuffix();
+        String tableName = "test_migrate_unsupported_table_format_" + randomNameSuffix();
         String hiveTableName = "hive.tpch." + tableName;
         String icebergTableName = "iceberg.tpch." + tableName;
 
-        assertUpdate("CREATE TABLE " + hiveTableName + " WITH (partitioned_by = ARRAY['part'], bucketed_by = ARRAY['bucket'], bucket_count = 10) AS SELECT 1 bucket, 'test' part", 1);
+        assertUpdate("CREATE TABLE " + hiveTableName + " WITH (format = 'RCBINARY') AS SELECT 1 x", 1);
 
         assertThatThrownBy(() -> query("CALL iceberg.system.migrate('tpch', '" + tableName + "')"))
-                .hasStackTraceContaining("Cannot migrate bucketed table: [bucket]");
+                .hasStackTraceContaining("Unsupported storage format: RCBINARY");
 
-        assertQuery("SELECT * FROM " + hiveTableName, "VALUES (1, 'test')");
+        assertQuery("SELECT * FROM " + hiveTableName, "VALUES 1");
         assertQueryFails("SELECT * FROM " + icebergTableName, "Not an Iceberg table: .*");
 
         assertUpdate("DROP TABLE " + hiveTableName);
@@ -282,7 +370,7 @@ public void testMigrateUnsupportedTableType()
 
         assertQueryFails(
                 "CALL iceberg.system.migrate('tpch', '" + viewName + "')",
-                "The procedure supports migrating only managed tables: .*");
+                "The procedure doesn't support migrating VIRTUAL_VIEW table type");
 
         assertQuery("SELECT * FROM " + trinoViewInHive, "VALUES 1");
         assertQuery("SELECT * FROM " + trinoViewInIceberg, "VALUES 1");
@@ -306,4 +394,11 @@ public void testMigrateEmptyTable()
 
         assertUpdate("DROP TABLE " + tableName);
     }
+
+    private String getColumnType(String tableName, String columnName)
+    {
+        return (String) computeScalar(format("SELECT data_type FROM information_schema.columns WHERE table_schema = CURRENT_SCHEMA AND table_name = '%s' AND column_name = '%s'",
+                tableName,
+                columnName));
+    }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioAvroConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioAvroConnectorSmokeTest.java
index 1c6ec8dd3fa1..98fb44016c7f 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioAvroConnectorSmokeTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioAvroConnectorSmokeTest.java
@@ -13,9 +13,11 @@
  */
 package io.trino.plugin.iceberg;
 
-import org.testng.SkipException;
+import io.trino.filesystem.Location;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.iceberg.FileFormat.AVRO;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 public class TestIcebergMinioAvroConnectorSmokeTest
         extends BaseIcebergMinioConnectorSmokeTest
@@ -25,20 +27,22 @@ public TestIcebergMinioAvroConnectorSmokeTest()
         super(AVRO);
     }
 
+    @Test
     @Override
     public void testSortedNationTable()
     {
-        throw new SkipException("Avro does not support file sorting");
+        abort("Avro does not support file sorting");
     }
 
+    @Test
     @Override
     public void testFileSortingWithLargerTable()
     {
-        throw new SkipException("Avro does not support file sorting");
+        abort("Avro does not support file sorting");
     }
 
     @Override
-    protected boolean isFileSorted(String path, String sortColumnName)
+    protected boolean isFileSorted(Location path, String sortColumnName)
     {
         throw new IllegalStateException("File sorting tests should be skipped for Avro");
     }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioOrcConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioOrcConnectorSmokeTest.java
deleted file mode 100644
index 51fb1daf3298..000000000000
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioOrcConnectorSmokeTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.iceberg;
-
-import static io.trino.plugin.iceberg.IcebergTestUtils.checkOrcFileSorting;
-import static org.apache.iceberg.FileFormat.ORC;
-
-public class TestIcebergMinioOrcConnectorSmokeTest
-        extends BaseIcebergMinioConnectorSmokeTest
-{
-    public TestIcebergMinioOrcConnectorSmokeTest()
-    {
-        super(ORC);
-    }
-
-    @Override
-    protected boolean isFileSorted(String path, String sortColumnName)
-    {
-        return checkOrcFileSorting(fileSystemFactory, path, sortColumnName);
-    }
-}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioOrcConnectorTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioOrcConnectorTest.java
new file mode 100644
index 000000000000..0c08d0c6a8c6
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioOrcConnectorTest.java
@@ -0,0 +1,186 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.Session;
+import io.trino.filesystem.Location;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.containers.Minio;
+import io.trino.testing.sql.TestTable;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.io.Resources.getResource;
+import static io.trino.plugin.iceberg.IcebergFileFormat.ORC;
+import static io.trino.plugin.iceberg.IcebergTestUtils.checkOrcFileSorting;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
+import static io.trino.testing.containers.Minio.MINIO_REGION;
+import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+/**
+ * Iceberg connector test ORC and with S3-compatible storage (but without real metastore).
+ */
+public class TestIcebergMinioOrcConnectorTest
+        extends BaseIcebergConnectorTest
+{
+    private final String bucketName = "test-iceberg-orc-" + randomNameSuffix();
+
+    public TestIcebergMinioOrcConnectorTest()
+    {
+        super(ORC);
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        Minio minio = closeAfterClass(Minio.builder().build());
+        minio.start();
+        minio.createBucket(bucketName);
+
+        return IcebergQueryRunner.builder()
+                .setIcebergProperties(
+                        ImmutableMap.<String, String>builder()
+                                .put("iceberg.file-format", format.name())
+                                .put("fs.native-s3.enabled", "true")
+                                .put("s3.aws-access-key", MINIO_ACCESS_KEY)
+                                .put("s3.aws-secret-key", MINIO_SECRET_KEY)
+                                .put("s3.region", MINIO_REGION)
+                                .put("s3.endpoint", minio.getMinioAddress())
+                                .put("s3.path-style-access", "true")
+                                .put("s3.streaming.part-size", "5MB") // minimize memory usage
+                                .put("s3.max-connections", "2") // verify no leaks
+                                .put("iceberg.register-table-procedure.enabled", "true")
+                                // Allows testing the sorting writer flushing to the file system with smaller tables
+                                .put("iceberg.writer-sort-buffer-size", "1MB")
+                                .buildOrThrow())
+                .setSchemaInitializer(
+                        SchemaInitializer.builder()
+                                .withSchemaName("tpch")
+                                .withClonedTpchTables(REQUIRED_TPCH_TABLES)
+                                .withSchemaProperties(Map.of("location", "'s3://" + bucketName + "/iceberg_data/tpch'"))
+                                .build())
+                .build();
+    }
+
+    @Override
+    protected boolean supportsIcebergFileStatistics(String typeName)
+    {
+        return !typeName.equalsIgnoreCase("varbinary") &&
+                !typeName.equalsIgnoreCase("uuid");
+    }
+
+    @Override
+    protected boolean supportsRowGroupStatistics(String typeName)
+    {
+        return !typeName.equalsIgnoreCase("varbinary");
+    }
+
+    @Override
+    protected boolean isFileSorted(String path, String sortColumnName)
+    {
+        return checkOrcFileSorting(fileSystem, Location.of(path), sortColumnName);
+    }
+
+    @Override
+    protected boolean supportsPhysicalPushdown()
+    {
+        // TODO https://github.com/trinodb/trino/issues/17156
+        return false;
+    }
+
+    @Test
+    public void testTinyintType()
+            throws Exception
+    {
+        testReadSingleIntegerColumnOrcFile("single-tinyint-column.orc", 127);
+    }
+
+    @Test
+    public void testSmallintType()
+            throws Exception
+    {
+        testReadSingleIntegerColumnOrcFile("single-smallint-column.orc", 32767);
+    }
+
+    private void testReadSingleIntegerColumnOrcFile(String orcFileResourceName, int expectedValue)
+            throws Exception
+    {
+        checkArgument(expectedValue != 0);
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_read_as_integer", "(\"_col0\") AS VALUES 0, NULL")) {
+            String orcFilePath = (String) computeScalar(format("SELECT DISTINCT file_path FROM \"%s$files\"", table.getName()));
+            try (OutputStream outputStream = fileSystem.newOutputFile(Location.of(orcFilePath)).createOrOverwrite()) {
+                Files.copy(new File(getResource(orcFileResourceName).toURI()).toPath(), outputStream);
+            }
+            fileSystem.deleteFiles(List.of(Location.of(orcFilePath.replaceAll("/([^/]*)$", ".$1.crc"))));
+
+            Session ignoreFileSizeFromMetadata = Session.builder(getSession())
+                    // The replaced and replacing file sizes may be different
+                    .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "use_file_size_from_metadata", "false")
+                    .build();
+            assertThat(query(ignoreFileSizeFromMetadata, "TABLE " + table.getName()))
+                    .matches("VALUES NULL, " + expectedValue);
+        }
+    }
+
+    @Test
+    public void testTimeType()
+    {
+        // Regression test for https://github.com/trinodb/trino/issues/15603
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_time", "(col time(6))")) {
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (TIME '13:30:00'), (TIME '14:30:00'), (NULL)", 3);
+            assertQuery("SELECT * FROM " + table.getName(), "VALUES '13:30:00', '14:30:00', NULL");
+            assertQuery(
+                    "SHOW STATS FOR " + table.getName(),
+                    """
+                            VALUES
+                            ('col', null, 2.0, 0.33333333333, null, null, null),
+                            (null, null, null, null, 3, null, null)
+                            """);
+        }
+    }
+
+    @Override
+    public void testDropAmbiguousRowFieldCaseSensitivity()
+    {
+        // TODO https://github.com/trinodb/trino/issues/16273 The connector can't read row types having ambiguous field names in ORC files. e.g. row(X int, x int)
+        assertThatThrownBy(super::testDropAmbiguousRowFieldCaseSensitivity)
+                .hasMessageContaining("Error opening Iceberg split")
+                .hasStackTraceContaining("Multiple entries with same key");
+    }
+
+    @Override
+    protected Optional<TimestampPrecisionTestSetup> filterTimestampPrecisionOnCreateTableAsSelectProvider(TimestampPrecisionTestSetup setup)
+    {
+        if (setup.sourceValueLiteral().equals("TIMESTAMP '1969-12-31 23:59:59.999999499999'")) {
+            return Optional.of(setup.withNewValueLiteral("TIMESTAMP '1970-01-01 00:00:00.999999'"));
+        }
+        if (setup.sourceValueLiteral().equals("TIMESTAMP '1969-12-31 23:59:59.9999994'")) {
+            return Optional.of(setup.withNewValueLiteral("TIMESTAMP '1970-01-01 00:00:00.999999'"));
+        }
+        return Optional.of(setup);
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioParquetConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioParquetConnectorSmokeTest.java
index 200c5aa67d16..06073417e602 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioParquetConnectorSmokeTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMinioParquetConnectorSmokeTest.java
@@ -13,10 +13,9 @@
  */
 package io.trino.plugin.iceberg;
 
-import io.trino.filesystem.TrinoFileSystem;
+import io.trino.filesystem.Location;
 
 import static io.trino.plugin.iceberg.IcebergTestUtils.checkParquetFileSorting;
-import static io.trino.testing.TestingConnectorSession.SESSION;
 import static org.apache.iceberg.FileFormat.PARQUET;
 
 public class TestIcebergMinioParquetConnectorSmokeTest
@@ -28,9 +27,8 @@ public TestIcebergMinioParquetConnectorSmokeTest()
     }
 
     @Override
-    protected boolean isFileSorted(String path, String sortColumnName)
+    protected boolean isFileSorted(Location path, String sortColumnName)
     {
-        TrinoFileSystem fileSystem = fileSystemFactory.create(SESSION);
         return checkParquetFileSorting(fileSystem.newInputFile(path), sortColumnName);
     }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergNodeLocalDynamicSplitPruning.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergNodeLocalDynamicSplitPruning.java
index c325944dd0bd..4e44345bf34e 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergNodeLocalDynamicSplitPruning.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergNodeLocalDynamicSplitPruning.java
@@ -16,10 +16,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import io.trino.filesystem.TrinoFileSystem;
+import io.airlift.testing.TempFile;
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.filesystem.TrinoOutputFile;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.filesystem.local.LocalInputFile;
+import io.trino.filesystem.local.LocalOutputFile;
 import io.trino.metadata.TableHandle;
 import io.trino.orc.OrcWriteValidation;
 import io.trino.orc.OrcWriter;
@@ -36,10 +38,10 @@
 import io.trino.spi.Page;
 import io.trino.spi.SplitWeight;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.DynamicFilter;
-import io.trino.spi.connector.RetryMode;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
@@ -49,21 +51,20 @@
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.SchemaParser;
 import org.apache.iceberg.types.Types;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.Set;
-import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
 import static io.trino.orc.metadata.CompressionKind.NONE;
 import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
-import static io.trino.plugin.hive.HiveTestUtils.SESSION;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.plugin.hive.HiveType.HIVE_INT;
 import static io.trino.plugin.hive.HiveType.HIVE_STRING;
 import static io.trino.plugin.iceberg.ColumnIdentity.TypeCategory.PRIMITIVE;
@@ -104,11 +105,11 @@ public void testDynamicSplitPruning()
     {
         IcebergConfig icebergConfig = new IcebergConfig();
         HiveTransactionHandle transaction = new HiveTransactionHandle(false);
-        String path = "/tmp/" + UUID.randomUUID() + ".tmp";
-        try {
-            TrinoFileSystem fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT).create(SESSION);
-            TrinoOutputFile outputFile = fileSystem.newOutputFile(path);
-            TrinoInputFile inputFile = fileSystem.newInputFile(path);
+        try (TempFile file = new TempFile()) {
+            Files.delete(file.path());
+
+            TrinoOutputFile outputFile = new LocalOutputFile(file.file());
+            TrinoInputFile inputFile = new LocalInputFile(file.file());
             writeOrcContent(outputFile);
 
             try (ConnectorPageSource emptyPageSource = createTestingPageSource(transaction, icebergConfig, inputFile, getDynamicFilter(getTupleDomainForSplitPruning()))) {
@@ -124,9 +125,6 @@ public void testDynamicSplitPruning()
                 assertEquals(page.getBlock(1).getSlice(0, 0, page.getBlock(1).getSliceLength(0)).toStringUtf8(), DATA_COLUMN_VALUE);
             }
         }
-        finally {
-            Files.deleteIfExists(Path.of(path));
-        }
     }
 
     private static void writeOrcContent(TrinoOutputFile outputFile)
@@ -158,45 +156,45 @@ private static ConnectorPageSource createTestingPageSource(HiveTransactionHandle
             throws IOException
     {
         IcebergSplit split = new IcebergSplit(
-                "file:///" + inputFile.location(),
+                inputFile.toString(),
                 0,
                 inputFile.length(),
                 inputFile.length(),
-                0, // This is incorrect, but the value is only used for delete operations
+                -1, // invalid; normally known
                 ORC,
-                ImmutableList.of(),
                 PartitionSpecParser.toJson(PartitionSpec.unpartitioned()),
                 PartitionData.toJson(new PartitionData(new Object[] {})),
                 ImmutableList.of(),
                 SplitWeight.standard());
 
-        String filePath = inputFile.location();
-        String tablePath = filePath.substring(0, filePath.lastIndexOf("/"));
+        String tablePath = inputFile.location().fileName();
         TableHandle tableHandle = new TableHandle(
                 TEST_CATALOG_HANDLE,
                 new IcebergTableHandle(
+                        CatalogHandle.fromId("iceberg:NORMAL:v12345"),
                         SCHEMA_NAME,
                         TABLE_NAME,
                         TableType.DATA,
                         Optional.empty(),
                         SchemaParser.toJson(TABLE_SCHEMA),
-                        ImmutableList.of(),
                         Optional.of(PartitionSpecParser.toJson(PartitionSpec.unpartitioned())),
                         2,
                         TupleDomain.withColumnDomains(ImmutableMap.of(KEY_ICEBERG_COLUMN_HANDLE, Domain.singleValue(INTEGER, (long) KEY_COLUMN_VALUE))),
                         TupleDomain.all(),
+                        OptionalLong.empty(),
                         ImmutableSet.of(KEY_ICEBERG_COLUMN_HANDLE),
                         Optional.empty(),
                         tablePath,
                         ImmutableMap.of(),
-                        RetryMode.NO_RETRIES,
                         false,
+                        Optional.empty(),
+                        ImmutableSet.of(),
                         Optional.empty()),
                 transaction);
 
         FileFormatDataSourceStats stats = new FileFormatDataSourceStats();
         IcebergPageSourceProvider provider = new IcebergPageSourceProvider(
-                new HdfsFileSystemFactory(HDFS_ENVIRONMENT),
+                new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS),
                 stats,
                 ORC_READER_CONFIG,
                 PARQUET_READER_CONFIG,
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcConnectorTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcConnectorTest.java
deleted file mode 100644
index ad2594271902..000000000000
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcConnectorTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.iceberg;
-
-import io.trino.testing.sql.TestTable;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import static com.google.common.io.Resources.getResource;
-import static io.trino.plugin.iceberg.IcebergFileFormat.ORC;
-import static io.trino.plugin.iceberg.IcebergTestUtils.checkOrcFileSorting;
-import static java.lang.String.format;
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-public class TestIcebergOrcConnectorTest
-        extends BaseIcebergConnectorTest
-{
-    public TestIcebergOrcConnectorTest()
-    {
-        super(ORC);
-    }
-
-    @Override
-    protected boolean supportsIcebergFileStatistics(String typeName)
-    {
-        return !typeName.equalsIgnoreCase("varbinary") &&
-                !typeName.equalsIgnoreCase("uuid");
-    }
-
-    @Override
-    protected boolean supportsRowGroupStatistics(String typeName)
-    {
-        return !typeName.equalsIgnoreCase("varbinary");
-    }
-
-    @Override
-    protected boolean isFileSorted(String path, String sortColumnName)
-    {
-        return checkOrcFileSorting(path, sortColumnName);
-    }
-
-    @Test
-    public void testTinyintType()
-            throws Exception
-    {
-        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_tinyint", "(\"_col0\") AS VALUES (127), (NULL)")) {
-            Path orcFilePath = Path.of((String) computeScalar(format("SELECT DISTINCT file_path FROM \"%s$files\"", table.getName())));
-            Files.copy(new File(getResource("single-tinyint-column.orc").toURI()).toPath(), orcFilePath, REPLACE_EXISTING);
-            Files.delete(orcFilePath.resolveSibling(format(".%s.crc", orcFilePath.getFileName())));
-
-            assertThat(query("DESCRIBE " + table.getName()))
-                    .projected("Type")
-                    .matches("VALUES varchar 'integer'");
-            assertQuery("SELECT * FROM " + table.getName(), "VALUES 127, NULL");
-        }
-    }
-
-    @Test
-    public void testSmallintType()
-            throws Exception
-    {
-        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_smallint", "(\"_col0\") AS VALUES (32767), (NULL)")) {
-            Path orcFilePath = Path.of((String) computeScalar(format("SELECT DISTINCT file_path FROM \"%s$files\"", table.getName())));
-            Files.copy(new File(getResource("single-smallint-column.orc").toURI()).toPath(), orcFilePath, REPLACE_EXISTING);
-            Files.delete(orcFilePath.resolveSibling(format(".%s.crc", orcFilePath.getFileName())));
-
-            assertThat(query("DESCRIBE " + table.getName()))
-                    .projected("Type")
-                    .matches("VALUES varchar 'integer'");
-            assertQuery("SELECT * FROM " + table.getName(), "VALUES 32767, NULL");
-        }
-    }
-
-    @Override
-    public void testDropAmbiguousRowFieldCaseSensitivity()
-    {
-        // TODO https://github.com/trinodb/trino/issues/16273 The connector can't read row types having ambiguous field names in ORC files. e.g. row(X int, x int)
-        assertThatThrownBy(super::testDropAmbiguousRowFieldCaseSensitivity)
-                .hasMessageContaining("Error opening Iceberg split")
-                .hasStackTraceContaining("Multiple entries with same key");
-    }
-}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcMetricsCollection.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcMetricsCollection.java
index b8541cba0e1a..d35c1265dcc8 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcMetricsCollection.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcMetricsCollection.java
@@ -13,9 +13,9 @@
  */
 package io.trino.plugin.iceberg;
 
+import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.TrinoViewHiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastore;
@@ -36,7 +36,7 @@
 import io.trino.testing.TestingConnectorSession;
 import org.apache.iceberg.FileContent;
 import org.apache.iceberg.Table;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.List;
@@ -46,12 +46,13 @@
 import static com.google.inject.util.Modules.EMPTY_MODULE;
 import static io.trino.SystemSessionProperties.MAX_DRIVERS_PER_TASK;
 import static io.trino.SystemSessionProperties.TASK_CONCURRENCY;
-import static io.trino.SystemSessionProperties.TASK_PARTITIONED_WRITER_COUNT;
-import static io.trino.SystemSessionProperties.TASK_WRITER_COUNT;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.SystemSessionProperties.TASK_MAX_WRITER_COUNT;
+import static io.trino.SystemSessionProperties.TASK_MIN_WRITER_COUNT;
 import static io.trino.plugin.hive.metastore.cache.CachingHiveMetastore.memoizeMetastore;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.plugin.iceberg.DataFileRecord.toDataFileRecord;
+import static io.trino.plugin.iceberg.IcebergQueryRunner.ICEBERG_CATALOG;
+import static io.trino.plugin.iceberg.IcebergTestUtils.getFileSystemFactory;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
@@ -70,8 +71,8 @@ protected QueryRunner createQueryRunner()
                 .setCatalog("iceberg")
                 .setSchema("test_schema")
                 .setSystemProperty(TASK_CONCURRENCY, "1")
-                .setSystemProperty(TASK_WRITER_COUNT, "1")
-                .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, "1")
+                .setSystemProperty(TASK_MIN_WRITER_COUNT, "1")
+                .setSystemProperty(TASK_MAX_WRITER_COUNT, "1")
                 .setSystemProperty(MAX_DRIVERS_PER_TASK, "1")
                 .setCatalogSessionProperty("iceberg", "orc_string_statistics_limit", Integer.MAX_VALUE + "B")
                 .build();
@@ -80,9 +81,12 @@ protected QueryRunner createQueryRunner()
                 .build();
 
         File baseDir = queryRunner.getCoordinator().getBaseDataDir().resolve("iceberg_data").toFile();
-
         HiveMetastore metastore = createTestingFileHiveMetastore(baseDir);
-        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(HDFS_ENVIRONMENT);
+
+        queryRunner.installPlugin(new TestingIcebergPlugin(Optional.of(new TestingIcebergFileMetastoreCatalogModule(metastore)), Optional.empty(), EMPTY_MODULE));
+        queryRunner.createCatalog(ICEBERG_CATALOG, "iceberg", ImmutableMap.of("iceberg.file-format", "ORC"));
+
+        TrinoFileSystemFactory fileSystemFactory = getFileSystemFactory(queryRunner);
         tableOperationsProvider = new FileMetastoreTableOperationsProvider(fileSystemFactory);
         CachingHiveMetastore cachingHiveMetastore = memoizeMetastore(metastore, 1000);
         trinoCatalog = new TrinoHiveCatalog(
@@ -96,9 +100,6 @@ protected QueryRunner createQueryRunner()
                 false,
                 false);
 
-        queryRunner.installPlugin(new TestingIcebergPlugin(Optional.of(new TestingIcebergFileMetastoreCatalogModule(metastore)), Optional.empty(), EMPTY_MODULE));
-        queryRunner.createCatalog("iceberg", "iceberg");
-
         queryRunner.installPlugin(new TpchPlugin());
         queryRunner.createCatalog("tpch", "tpch");
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcSystemTables.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcSystemTables.java
new file mode 100644
index 000000000000..e632a669b045
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcSystemTables.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg;
+
+import static io.trino.plugin.iceberg.IcebergFileFormat.ORC;
+
+public class TestIcebergOrcSystemTables
+        extends BaseIcebergSystemTables
+{
+    public TestIcebergOrcSystemTables()
+    {
+        super(ORC);
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcWithBloomFilters.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcWithBloomFilters.java
index ed3ea30af5f2..38d3652852ef 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcWithBloomFilters.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcWithBloomFilters.java
@@ -35,7 +35,7 @@ protected QueryRunner createQueryRunner()
     protected String getTableProperties(String bloomFilterColumnName, String bucketingColumnName)
     {
         return format(
-                "orc_bloom_filter_columns = ARRAY['%s'], partitioning = ARRAY['bucket(%s, 1)']",
+                "format = 'ORC', orc_bloom_filter_columns = ARRAY['%s'], partitioning = ARRAY['bucket(%s, 1)']",
                 bloomFilterColumnName,
                 bucketingColumnName);
     }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergParquetConnectorTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergParquetConnectorTest.java
index 7764143f5c7d..e05324d2fb89 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergParquetConnectorTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergParquetConnectorTest.java
@@ -45,7 +45,9 @@ protected boolean supportsIcebergFileStatistics(String typeName)
     protected boolean supportsRowGroupStatistics(String typeName)
     {
         return !(typeName.equalsIgnoreCase("varbinary") ||
+                typeName.equalsIgnoreCase("time") ||
                 typeName.equalsIgnoreCase("time(6)") ||
+                typeName.equalsIgnoreCase("timestamp(3) with time zone") ||
                 typeName.equalsIgnoreCase("timestamp(6) with time zone"));
     }
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergParquetSystemTables.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergParquetSystemTables.java
new file mode 100644
index 000000000000..bb8dae68eaca
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergParquetSystemTables.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg;
+
+import static io.trino.plugin.iceberg.IcebergFileFormat.PARQUET;
+
+public class TestIcebergParquetSystemTables
+        extends BaseIcebergSystemTables
+{
+    public TestIcebergParquetSystemTables()
+    {
+        super(PARQUET);
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergParquetWithBloomFilters.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergParquetWithBloomFilters.java
new file mode 100644
index 000000000000..54b3c936b1d1
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergParquetWithBloomFilters.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.hive.TestingHivePlugin;
+import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.testing.BaseTestParquetWithBloomFilters;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+
+import java.nio.file.Path;
+import java.util.List;
+
+import static io.trino.plugin.hive.parquet.TestHiveParquetWithBloomFilters.writeParquetFileWithBloomFilter;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static java.lang.String.format;
+
+public class TestIcebergParquetWithBloomFilters
+        extends BaseTestParquetWithBloomFilters
+{
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        DistributedQueryRunner queryRunner = IcebergQueryRunner.builder().build();
+        dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("iceberg_data");
+
+        // create hive catalog
+        queryRunner.installPlugin(new TestingHivePlugin());
+        queryRunner.createCatalog("hive", "hive", ImmutableMap.<String, String>builder()
+                .put("hive.metastore", "file")
+                .put("hive.metastore.catalog.dir", dataDirectory.toString())
+                .put("hive.security", "allow-all")
+                .buildOrThrow());
+
+        return queryRunner;
+    }
+
+    @Override
+    protected CatalogSchemaTableName createParquetTableWithBloomFilter(String columnName, List<Integer> testValues)
+    {
+        // create the managed table
+        String tableName = "parquet_with_bloom_filters_" + randomNameSuffix();
+        CatalogSchemaTableName hiveCatalogSchemaTableName = new CatalogSchemaTableName("hive", new SchemaTableName("tpch", tableName));
+        CatalogSchemaTableName icebergCatalogSchemaTableName = new CatalogSchemaTableName("iceberg", new SchemaTableName("tpch", tableName));
+        assertUpdate(format("CREATE TABLE %s (%s INT) WITH (format = 'PARQUET')", hiveCatalogSchemaTableName, columnName));
+
+        // directly write data to the managed table
+        Path tableLocation = Path.of("%s/tpch/%s".formatted(dataDirectory, tableName));
+        Path fileLocation = tableLocation.resolve("bloomFilterFile.parquet");
+        writeParquetFileWithBloomFilter(fileLocation.toFile(), columnName, testValues);
+
+        // migrate the hive table to the iceberg table
+        assertUpdate("CALL iceberg.system.migrate('tpch', '" + tableName + "', 'false')");
+
+        return icebergCatalogSchemaTableName;
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPartitionEvolution.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPartitionEvolution.java
index cef36f670cf0..1659ea0c1afd 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPartitionEvolution.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPartitionEvolution.java
@@ -18,7 +18,7 @@
 import io.trino.testing.MaterializedRow;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPlugin.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPlugin.java
index a249f2a72770..a57c3de254f9 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPlugin.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPlugin.java
@@ -18,7 +18,7 @@
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -38,17 +38,30 @@ public void testCreateConnector()
         factory.create("test", Map.of("hive.metastore.uri", "thrift://foo:1234"), new TestingConnectorContext()).shutdown();
     }
 
+    @Test
+    public void testTestingFileMetastore()
+    {
+        ConnectorFactory factory = getConnectorFactory();
+        factory.create(
+                        "test",
+                        Map.of(
+                                "iceberg.catalog.type", "TESTING_FILE_METASTORE",
+                                "hive.metastore.catalog.dir", "/tmp"),
+                        new TestingConnectorContext())
+                .shutdown();
+    }
+
     @Test
     public void testThriftMetastore()
     {
         ConnectorFactory factory = getConnectorFactory();
 
         factory.create(
-                "test",
-                Map.of(
-                        "iceberg.catalog.type", "HIVE_METASTORE",
-                        "hive.metastore.uri", "thrift://foo:1234"),
-                new TestingConnectorContext())
+                        "test",
+                        Map.of(
+                                "iceberg.catalog.type", "HIVE_METASTORE",
+                                "hive.metastore.uri", "thrift://foo:1234"),
+                        new TestingConnectorContext())
                 .shutdown();
 
         // Ensure Glue configuration isn't bound when Glue not in use
@@ -81,11 +94,11 @@ public void testGlueMetastore()
         ConnectorFactory factory = getConnectorFactory();
 
         factory.create(
-                "test",
-                Map.of(
-                        "iceberg.catalog.type", "glue",
-                        "hive.metastore.glue.region", "us-east-1"),
-                new TestingConnectorContext())
+                        "test",
+                        Map.of(
+                                "iceberg.catalog.type", "glue",
+                                "hive.metastore.glue.region", "us-east-1"),
+                        new TestingConnectorContext())
                 .shutdown();
 
         assertThatThrownBy(() -> factory.create(
@@ -97,12 +110,12 @@ public void testGlueMetastore()
                 .hasMessageContaining("Error: Configuration property 'hive.metastore.uri' was not used");
 
         factory.create(
-                "test",
-                Map.of(
-                        "iceberg.catalog.type", "glue",
-                        "hive.metastore.glue.catalogid", "123",
-                        "hive.metastore.glue.region", "us-east-1"),
-                new TestingConnectorContext())
+                        "test",
+                        Map.of(
+                                "iceberg.catalog.type", "glue",
+                                "hive.metastore.glue.catalogid", "123",
+                                "hive.metastore.glue.region", "us-east-1"),
+                        new TestingConnectorContext())
                 .shutdown();
     }
 
@@ -113,12 +126,12 @@ public void testRecordingMetastore()
 
         // recording with thrift
         factory.create(
-                "test",
-                Map.of(
-                        "iceberg.catalog.type", "HIVE_METASTORE",
-                        "hive.metastore.uri", "thrift://foo:1234",
-                        "hive.metastore-recording-path", "/tmp"),
-                new TestingConnectorContext())
+                        "test",
+                        Map.of(
+                                "iceberg.catalog.type", "HIVE_METASTORE",
+                                "hive.metastore.uri", "thrift://foo:1234",
+                                "hive.metastore-recording-path", "/tmp"),
+                        new TestingConnectorContext())
                 .shutdown();
 
         // recording with glue
@@ -130,6 +143,16 @@ public void testRecordingMetastore()
                         "hive.metastore-recording-path", "/tmp"),
                 new TestingConnectorContext()))
                 .hasMessageContaining("Configuration property 'hive.metastore-recording-path' was not used");
+
+        // recording with nessie
+        assertThatThrownBy(() -> factory.create(
+                "test",
+                Map.of(
+                        "iceberg.catalog.type", "nessie",
+                        "hive.metastore.nessie.region", "us-east-2",
+                        "hive.metastore-recording-path", "/tmp"),
+                new TestingConnectorContext()))
+                .hasMessageContaining("Configuration property 'hive.metastore-recording-path' was not used");
     }
 
     @Test
@@ -138,13 +161,13 @@ public void testAllowAllAccessControl()
         ConnectorFactory connectorFactory = getConnectorFactory();
 
         connectorFactory.create(
-                "test",
-                ImmutableMap.<String, String>builder()
-                        .put("iceberg.catalog.type", "HIVE_METASTORE")
-                        .put("hive.metastore.uri", "thrift://foo:1234")
-                        .put("iceberg.security", "allow-all")
-                        .buildOrThrow(),
-                new TestingConnectorContext())
+                        "test",
+                        ImmutableMap.<String, String>builder()
+                                .put("iceberg.catalog.type", "HIVE_METASTORE")
+                                .put("hive.metastore.uri", "thrift://foo:1234")
+                                .put("iceberg.security", "allow-all")
+                                .buildOrThrow(),
+                        new TestingConnectorContext())
                 .shutdown();
     }
 
@@ -154,13 +177,13 @@ public void testReadOnlyAllAccessControl()
         ConnectorFactory connectorFactory = getConnectorFactory();
 
         connectorFactory.create(
-                "test",
-                ImmutableMap.<String, String>builder()
-                        .put("iceberg.catalog.type", "HIVE_METASTORE")
-                        .put("hive.metastore.uri", "thrift://foo:1234")
-                        .put("iceberg.security", "read-only")
-                        .buildOrThrow(),
-                new TestingConnectorContext())
+                        "test",
+                        ImmutableMap.<String, String>builder()
+                                .put("iceberg.catalog.type", "HIVE_METASTORE")
+                                .put("hive.metastore.uri", "thrift://foo:1234")
+                                .put("iceberg.security", "read-only")
+                                .buildOrThrow(),
+                        new TestingConnectorContext())
                 .shutdown();
     }
 
@@ -191,14 +214,14 @@ public void testFileBasedAccessControl()
         Files.writeString(tempFile.toPath(), "{}");
 
         connectorFactory.create(
-                "test",
-                ImmutableMap.<String, String>builder()
-                        .put("iceberg.catalog.type", "HIVE_METASTORE")
-                        .put("hive.metastore.uri", "thrift://foo:1234")
-                        .put("iceberg.security", "file")
-                        .put("security.config-file", tempFile.getAbsolutePath())
-                        .buildOrThrow(),
-                new TestingConnectorContext())
+                        "test",
+                        ImmutableMap.<String, String>builder()
+                                .put("iceberg.catalog.type", "HIVE_METASTORE")
+                                .put("hive.metastore.uri", "thrift://foo:1234")
+                                .put("iceberg.security", "file")
+                                .put("security.config-file", tempFile.getAbsolutePath())
+                                .buildOrThrow(),
+                        new TestingConnectorContext())
                 .shutdown();
     }
 
@@ -208,12 +231,12 @@ public void testIcebergPluginFailsWhenIncorrectPropertyProvided()
         ConnectorFactory factory = getConnectorFactory();
 
         assertThatThrownBy(() -> factory.create(
-                "test",
-                Map.of(
-                        "iceberg.catalog.type", "HIVE_METASTORE",
-                        HIVE_VIEWS_ENABLED, "true",
-                        "hive.metastore.uri", "thrift://foo:1234"),
-                new TestingConnectorContext())
+                        "test",
+                        Map.of(
+                                "iceberg.catalog.type", "HIVE_METASTORE",
+                                HIVE_VIEWS_ENABLED, "true",
+                                "hive.metastore.uri", "thrift://foo:1234"),
+                        new TestingConnectorContext())
                 .shutdown())
                 .isInstanceOf(ApplicationConfigurationException.class)
                 .hasMessageContaining("Configuration property 'hive.hive-views.enabled' was not used");
@@ -250,6 +273,21 @@ public void testJdbcCatalog()
                 .shutdown();
     }
 
+    @Test
+    public void testNessieCatalog()
+    {
+        ConnectorFactory factory = getConnectorFactory();
+
+        factory.create(
+                        "test",
+                        Map.of(
+                                "iceberg.catalog.type", "nessie",
+                                "iceberg.nessie-catalog.default-warehouse-dir", "/tmp",
+                                "iceberg.nessie-catalog.uri", "http://foo:1234"),
+                        new TestingConnectorContext())
+                .shutdown();
+    }
+
     private static ConnectorFactory getConnectorFactory()
     {
         return getOnlyElement(new IcebergPlugin().getConnectorFactories());
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergProjectionPushdownPlans.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergProjectionPushdownPlans.java
index a488779f52d7..6ab65da9f99f 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergProjectionPushdownPlans.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergProjectionPushdownPlans.java
@@ -29,8 +29,8 @@
 import io.trino.spi.security.PrincipalType;
 import io.trino.sql.planner.assertions.BasePushdownPlanTest;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -44,7 +44,7 @@
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static com.google.inject.util.Modules.EMPTY_MODULE;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.any;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
@@ -102,7 +102,7 @@ protected LocalQueryRunner createLocalQueryRunner()
         return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
             throws Exception
     {
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergReadVersionedTable.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergReadVersionedTable.java
index b06c4d03c4a3..92374ea8742a 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergReadVersionedTable.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergReadVersionedTable.java
@@ -15,8 +15,9 @@
 
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.time.Instant;
 import java.time.ZonedDateTime;
@@ -25,7 +26,9 @@
 import static io.trino.plugin.iceberg.IcebergQueryRunner.createIcebergQueryRunner;
 import static java.lang.String.format;
 import static java.time.ZoneOffset.UTC;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestIcebergReadVersionedTable
         extends AbstractTestQueryFramework
 {
@@ -42,7 +45,7 @@ protected DistributedQueryRunner createQueryRunner()
         return createIcebergQueryRunner();
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws InterruptedException
     {
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergReadVersionedTableByTemporal.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergReadVersionedTableByTemporal.java
new file mode 100644
index 000000000000..f03fb453f92a
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergReadVersionedTableByTemporal.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.Session;
+import io.trino.spi.type.TimeZoneKey;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.containers.Minio;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import static io.trino.plugin.iceberg.IcebergQueryRunner.ICEBERG_CATALOG;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
+import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestIcebergReadVersionedTableByTemporal
+        extends AbstractTestQueryFramework
+{
+    private static final String BUCKET_NAME = "test-bucket-time-travel";
+
+    private Minio minio;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        minio = closeAfterClass(Minio.builder().build());
+        minio.start();
+        minio.createBucket(BUCKET_NAME);
+
+        QueryRunner queryRunner = IcebergQueryRunner.builder()
+                .setIcebergProperties(
+                        ImmutableMap.<String, String>builder()
+                                .put("hive.s3.aws-access-key", MINIO_ACCESS_KEY)
+                                .put("hive.s3.aws-secret-key", MINIO_SECRET_KEY)
+                                .put("hive.s3.endpoint", minio.getMinioAddress())
+                                .put("hive.s3.path-style-access", "true")
+                                .put("iceberg.register-table-procedure.enabled", "true")
+                                .buildOrThrow())
+                .build();
+
+        queryRunner.execute("CREATE SCHEMA IF NOT EXISTS " + ICEBERG_CATALOG + ".tpch");
+        return queryRunner;
+    }
+
+    @AfterAll
+    public void destroy()
+            throws Exception
+    {
+        minio = null; // closed by closeAfterClass
+    }
+
+    @Test
+    public void testSelectTableWithEndVersionAsTemporal()
+    {
+        String tableName = "test_iceberg_read_versioned_table_" + randomNameSuffix();
+
+        minio.copyResources("iceberg/timetravel", BUCKET_NAME, "timetravel");
+        assertUpdate(format(
+                "CALL system.register_table('%s', '%s', '%s')",
+                getSession().getSchema().orElseThrow(),
+                tableName,
+                format("s3://%s/timetravel", BUCKET_NAME)));
+
+        assertThat(query("SELECT * FROM " + tableName))
+                .matches("VALUES 1, 2, 3");
+
+        Session utcSession = Session.builder(getSession()).setTimeZoneKey(TimeZoneKey.UTC_KEY).build();
+        assertThat(query(utcSession, "SELECT made_current_at FROM \"" + tableName + "$history\""))
+                .matches("VALUES" +
+                        "   TIMESTAMP '2023-06-30 05:01:46.265 UTC'," + // CREATE TABLE timetravel(data integer)
+                        "   TIMESTAMP '2023-07-01 05:02:43.954 UTC'," + // INSERT INTO timetravel VALUES 1
+                        "   TIMESTAMP '2023-07-02 05:03:39.586 UTC'," + // INSERT INTO timetravel VALUES 2
+                        "   TIMESTAMP '2023-07-03 05:03:42.434 UTC'");  // INSERT INTO timetravel VALUES 3
+
+        assertUpdate("INSERT INTO " + tableName + " VALUES 4", 1);
+
+        assertThat(query("SELECT * FROM " + tableName)).matches("VALUES 1, 2, 3, 4");
+        Session viennaSession = Session.builder(getSession()).setTimeZoneKey(TimeZoneKey.getTimeZoneKey("Europe/Vienna")).build();
+        Session losAngelesSession = Session.builder(getSession()).setTimeZoneKey(TimeZoneKey.getTimeZoneKey("America/Los_Angeles")).build();
+
+        // version as date
+        assertThat(query(viennaSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF DATE '2023-07-01'"))
+                .returnsEmptyResult();
+        assertThat(query(losAngelesSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF DATE '2023-07-01'"))
+                .matches("VALUES 1");
+        assertThat(query(viennaSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF DATE '2023-07-02'"))
+                .matches("VALUES 1");
+        assertThat(query(losAngelesSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF DATE '2023-07-02'"))
+                .matches("VALUES 1, 2");
+        assertThat(query(viennaSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF DATE '2023-07-03'"))
+                .matches("VALUES 1, 2");
+        assertThat(query(losAngelesSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF DATE '2023-07-03'"))
+                .matches("VALUES 1, 2, 3");
+        assertThat(query(viennaSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF DATE '2023-07-04'"))
+                .matches("VALUES 1, 2, 3");
+        assertThat(query(losAngelesSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF DATE '2023-07-04'"))
+                .matches("VALUES 1, 2, 3");
+
+        // version as timestamp
+        assertThat(query(viennaSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF TIMESTAMP '2023-07-01 00:00:00'"))
+                .returnsEmptyResult();
+        assertThat(query(utcSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF TIMESTAMP '2023-07-01 05:02:43.953'"))
+                .returnsEmptyResult();
+        assertThat(query(utcSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF TIMESTAMP '2023-07-01 05:02:43.954'"))
+                .matches("VALUES 1");
+        assertThat(query(viennaSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF TIMESTAMP '2023-07-01 07:02:43.954'"))
+                .matches("VALUES 1");
+        assertThat(query(losAngelesSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF TIMESTAMP '2023-07-01 00:00:00.1'"))
+                .matches("VALUES 1");
+        assertThat(query(viennaSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF TIMESTAMP '2023-07-02 01:00:00.12'"))
+                .matches("VALUES 1");
+        assertThat(query(losAngelesSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF TIMESTAMP '2023-07-02 01:00:00.123'"))
+                .matches("VALUES 1, 2");
+        assertThat(query(viennaSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF TIMESTAMP '2023-07-03 02:00:00.123'"))
+                .matches("VALUES 1, 2");
+        assertThat(query(losAngelesSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF TIMESTAMP '2023-07-03 02:00:00.123456'"))
+                .matches("VALUES 1, 2, 3");
+        assertThat(query(viennaSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF TIMESTAMP '2023-07-04 03:00:00.123456789'"))
+                .matches("VALUES 1, 2, 3");
+        assertThat(query(losAngelesSession, "SELECT * FROM " + tableName + " FOR TIMESTAMP AS OF TIMESTAMP '2023-07-04 03:00:00.123456789012'"))
+                .matches("VALUES 1, 2, 3");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergRegisterTableProcedure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergRegisterTableProcedure.java
index 841050742272..e739d576b140 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergRegisterTableProcedure.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergRegisterTableProcedure.java
@@ -13,19 +13,30 @@
  */
 package io.trino.plugin.iceberg;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.trino.filesystem.FileEntry;
 import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
-import io.trino.testing.TestingConnectorSession;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.apache.iceberg.DataFile;
+import org.apache.iceberg.DataFiles;
+import org.apache.iceberg.FileFormat;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.SortOrder;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.hadoop.HadoopTables;
+import org.apache.iceberg.types.Types;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,18 +44,20 @@
 import java.nio.file.Path;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Stream;
 
 import static com.google.common.base.Verify.verify;
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.hadoop.ConfigurationInstantiator.newEmptyConfiguration;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.iceberg.IcebergTestUtils.getFileSystemFactory;
 import static io.trino.plugin.iceberg.IcebergUtil.METADATA_FOLDER_NAME;
 import static io.trino.plugin.iceberg.procedure.RegisterTableProcedure.getLatestMetadataLocation;
+import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
+import static org.apache.iceberg.Files.localInput;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIcebergRegisterTableProcedure
@@ -61,29 +74,27 @@ protected QueryRunner createQueryRunner()
         metastoreDir = Files.createTempDirectory("test_iceberg_register_table").toFile();
         metastoreDir.deleteOnExit();
         metastore = createTestingFileHiveMetastore(metastoreDir);
-        fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT).create(TestingConnectorSession.SESSION);
         return IcebergQueryRunner.builder()
                 .setMetastoreDirectory(metastoreDir)
                 .setIcebergProperties(ImmutableMap.of("iceberg.register-table-procedure.enabled", "true"))
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-            throws IOException
+    @BeforeAll
+    public void initFileSystem()
     {
-        deleteRecursively(metastoreDir.toPath(), ALLOW_INSECURE);
+        fileSystem = getFileSystemFactory(getDistributedQueryRunner()).create(SESSION);
     }
 
-    @DataProvider
-    public static Object[][] fileFormats()
+    @AfterAll
+    public void tearDown()
+            throws IOException
     {
-        return Stream.of(IcebergFileFormat.values())
-                .map(icebergFileFormat -> new Object[] {icebergFileFormat})
-                .toArray(Object[][]::new);
+        deleteRecursively(metastoreDir.toPath(), ALLOW_INSECURE);
     }
 
-    @Test(dataProvider = "fileFormats")
+    @ParameterizedTest
+    @EnumSource(IcebergFileFormat.class)
     public void testRegisterTableWithTableLocation(IcebergFileFormat icebergFileFormat)
     {
         String tableName = "test_register_table_with_table_location_" + icebergFileFormat.name().toLowerCase(ENGLISH) + "_" + randomNameSuffix();
@@ -105,7 +116,8 @@ public void testRegisterTableWithTableLocation(IcebergFileFormat icebergFileForm
         assertUpdate(format("DROP TABLE %s", tableName));
     }
 
-    @Test(dataProvider = "fileFormats")
+    @ParameterizedTest
+    @EnumSource(IcebergFileFormat.class)
     public void testRegisterPartitionedTable(IcebergFileFormat icebergFileFormat)
     {
         String tableName = "test_register_partitioned_table_" + icebergFileFormat.name().toLowerCase(ENGLISH) + "_" + randomNameSuffix();
@@ -127,7 +139,8 @@ public void testRegisterPartitionedTable(IcebergFileFormat icebergFileFormat)
         assertUpdate("DROP TABLE " + tableName);
     }
 
-    @Test(dataProvider = "fileFormats")
+    @ParameterizedTest
+    @EnumSource(IcebergFileFormat.class)
     public void testRegisterTableWithComments(IcebergFileFormat icebergFileFormat)
     {
         String tableName = "test_register_table_with_comments_" + icebergFileFormat.name().toLowerCase(ENGLISH) + "_" + randomNameSuffix();
@@ -153,7 +166,8 @@ public void testRegisterTableWithComments(IcebergFileFormat icebergFileFormat)
         assertUpdate(format("DROP TABLE %s", tableName));
     }
 
-    @Test(dataProvider = "fileFormats")
+    @ParameterizedTest
+    @EnumSource(IcebergFileFormat.class)
     public void testRegisterTableWithShowCreateTable(IcebergFileFormat icebergFileFormat)
     {
         String tableName = "test_register_table_with_show_create_table_" + icebergFileFormat.name().toLowerCase(ENGLISH) + "_" + randomNameSuffix();
@@ -173,7 +187,8 @@ public void testRegisterTableWithShowCreateTable(IcebergFileFormat icebergFileFo
         assertUpdate(format("DROP TABLE %s", tableName));
     }
 
-    @Test(dataProvider = "fileFormats")
+    @ParameterizedTest
+    @EnumSource(IcebergFileFormat.class)
     public void testRegisterTableWithReInsert(IcebergFileFormat icebergFileFormat)
     {
         String tableName = "test_register_table_with_re_insert_" + icebergFileFormat.name().toLowerCase(ENGLISH) + "_" + randomNameSuffix();
@@ -197,7 +212,8 @@ public void testRegisterTableWithReInsert(IcebergFileFormat icebergFileFormat)
         assertUpdate(format("DROP TABLE %s", tableName));
     }
 
-    @Test(dataProvider = "fileFormats")
+    @ParameterizedTest
+    @EnumSource(IcebergFileFormat.class)
     public void testRegisterTableWithDroppedTable(IcebergFileFormat icebergFileFormat)
     {
         String tableName = "test_register_table_with_dropped_table_" + icebergFileFormat.name().toLowerCase(ENGLISH) + "_" + randomNameSuffix();
@@ -215,7 +231,8 @@ public void testRegisterTableWithDroppedTable(IcebergFileFormat icebergFileForma
                 ".*No versioned metadata file exists at location.*");
     }
 
-    @Test(dataProvider = "fileFormats")
+    @ParameterizedTest
+    @EnumSource(IcebergFileFormat.class)
     public void testRegisterTableWithDifferentTableName(IcebergFileFormat icebergFileFormat)
     {
         String tableName = "test_register_table_with_different_table_name_old_" + icebergFileFormat.name().toLowerCase(ENGLISH) + "_" + randomNameSuffix();
@@ -240,7 +257,8 @@ public void testRegisterTableWithDifferentTableName(IcebergFileFormat icebergFil
         assertUpdate(format("DROP TABLE %s", tableNameNew));
     }
 
-    @Test(dataProvider = "fileFormats")
+    @ParameterizedTest
+    @EnumSource(IcebergFileFormat.class)
     public void testRegisterTableWithMetadataFile(IcebergFileFormat icebergFileFormat)
     {
         String tableName = "test_register_table_with_metadata_file_" + icebergFileFormat.name().toLowerCase(ENGLISH) + "_" + randomNameSuffix();
@@ -298,23 +316,22 @@ public void testRegisterTableWithInvalidMetadataFile()
         assertUpdate(format("INSERT INTO %s values(1, 'INDIA', true)", tableName), 1);
         assertUpdate(format("INSERT INTO %s values(2, 'USA', false)", tableName), 1);
 
-        String tableLocation = getTableLocation(tableName);
+        Location tableLocation = Location.of(getTableLocation(tableName));
         String tableNameNew = tableName + "_new";
-        String metadataDirectoryLocation = format("%s/%s", tableLocation, METADATA_FOLDER_NAME);
+        Location metadataDirectoryLocation = tableLocation.appendPath(METADATA_FOLDER_NAME);
         FileIterator fileIterator = fileSystem.listFiles(metadataDirectoryLocation);
         // Find one invalid metadata file inside metadata folder
         String invalidMetadataFileName = "invalid-default.avro";
         while (fileIterator.hasNext()) {
             FileEntry fileEntry = fileIterator.next();
-            if (fileEntry.location().endsWith(".avro")) {
-                String file = fileEntry.location();
-                invalidMetadataFileName = file.substring(file.lastIndexOf("/") + 1);
+            if (fileEntry.location().fileName().endsWith(".avro")) {
+                invalidMetadataFileName = fileEntry.location().fileName();
                 break;
             }
         }
 
         assertQueryFails("CALL iceberg.system.register_table (CURRENT_SCHEMA, '" + tableNameNew + "', '" + tableLocation + "', '" + invalidMetadataFileName + "')",
-                ".*is not a valid metadata file.*");
+                "Invalid metadata file: .*");
         assertUpdate(format("DROP TABLE %s", tableName));
     }
 
@@ -334,7 +351,7 @@ public void testRegisterTableWithNonExistingMetadataFile()
         String nonExistingMetadataFileName = "00003-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json";
         String tableLocation = "/test/iceberg/hive/warehouse/orders_5-581fad8517934af6be1857a903559d44";
         assertQueryFails("CALL iceberg.system.register_table (CURRENT_SCHEMA, '" + tableName + "', '" + tableLocation + "', '" + nonExistingMetadataFileName + "')",
-                ".*Location (.*) does not exist.*");
+                "Metadata file does not exist: .*");
     }
 
     @Test
@@ -366,9 +383,9 @@ public void testRegisterTableWithInvalidURIScheme()
         String nonExistedMetadataFileName = "00003-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json";
         String tableLocation = "invalid://hadoop-master:9000/test/iceberg/hive/orders_5-581fad8517934af6be1857a903559d44";
         assertQueryFails("CALL iceberg.system.register_table (CURRENT_SCHEMA, '" + tableName + "', '" + tableLocation + "', '" + nonExistedMetadataFileName + "')",
-                ".*Invalid location:.*");
+                ".*Invalid metadata file location: .*");
         assertQueryFails("CALL iceberg.system.register_table (CURRENT_SCHEMA, '" + tableName + "', '" + tableLocation + "')",
-                ".*Failed checking table's location:.*");
+                ".*Failed checking table location: .*");
     }
 
     @Test
@@ -420,6 +437,62 @@ public void testRegisterTableWithInvalidMetadataFileName()
         }
     }
 
+    @Test
+    public void testRegisterHadoopTableAndRead()
+    {
+        // create a temporary table to generate data file
+        String tempTableName = "temp_table_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tempTableName + " (id INT, name VARCHAR) WITH (format = 'ORC')");
+        assertUpdate("INSERT INTO " + tempTableName + " values(1, 'INDIA')", 1);
+        String dataFilePath = (String) computeScalar("SELECT \"$path\" FROM " + tempTableName);
+
+        // create hadoop table
+        String hadoopTableName = "hadoop_table_" + randomNameSuffix();
+        String hadoopTableLocation = metastoreDir.getPath() + "/" + hadoopTableName;
+        HadoopTables hadoopTables = new HadoopTables(newEmptyConfiguration());
+        Schema schema = new Schema(ImmutableList.of(
+                Types.NestedField.optional(1, "id", Types.IntegerType.get()),
+                Types.NestedField.optional(2, "name", Types.StringType.get())));
+        Table table = hadoopTables.create(
+                schema,
+                PartitionSpec.unpartitioned(),
+                SortOrder.unsorted(),
+                ImmutableMap.of("write.format.default", "ORC"),
+                hadoopTableLocation);
+
+        // append data file to hadoop table
+        DataFile dataFile =
+                DataFiles.builder(PartitionSpec.unpartitioned())
+                        .withFormat(FileFormat.ORC)
+                        .withInputFile(localInput(new File(dataFilePath)))
+                        .withPath(dataFilePath)
+                        .withRecordCount(1)
+                        .build();
+        table.newFastAppend()
+                .appendFile(dataFile)
+                .commit();
+
+        // Hadoop style version number
+        assertThat(Location.of(getLatestMetadataLocation(fileSystem, hadoopTableLocation)).fileName())
+                .isEqualTo("v2.metadata.json");
+
+        // Try registering hadoop table in Trino and read it
+        String registeredTableName = "registered_table_" + randomNameSuffix();
+        assertUpdate("CALL system.register_table(CURRENT_SCHEMA, '%s', '%s')".formatted(registeredTableName, hadoopTableLocation));
+        assertQuery("SELECT * FROM " + registeredTableName, "VALUES (1, 'INDIA')");
+
+        // Verify the table can be written to despite using non-standard metadata file name
+        assertUpdate("INSERT INTO " + registeredTableName + " VALUES (2, 'POLAND')", 1);
+        assertQuery("SELECT * FROM " + registeredTableName, "VALUES (1, 'INDIA'), (2, 'POLAND')");
+
+        // New metadata file is written using standard file name convention
+        assertThat(Location.of(getLatestMetadataLocation(fileSystem, hadoopTableLocation)).fileName())
+                .matches("00003-.*\\.metadata\\.json");
+
+        assertUpdate("DROP TABLE " + registeredTableName);
+        assertUpdate("DROP TABLE " + tempTableName);
+    }
+
     private String getTableLocation(String tableName)
     {
         Pattern locationPattern = Pattern.compile(".*location = '(.*?)'.*", Pattern.DOTALL);
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergSecurityConfig.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergSecurityConfig.java
index 7fdf9f6dcde0..7638da2037df 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergSecurityConfig.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergSecurityConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.iceberg;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergSplitSource.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergSplitSource.java
index 889b193d5e60..fee9595614f9 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergSplitSource.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergSplitSource.java
@@ -17,14 +17,21 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.units.Duration;
+import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.TrinoViewHiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.cache.CachingHiveMetastore;
+import io.trino.plugin.hive.orc.OrcReaderConfig;
+import io.trino.plugin.hive.orc.OrcWriterConfig;
+import io.trino.plugin.hive.parquet.ParquetReaderConfig;
+import io.trino.plugin.hive.parquet.ParquetWriterConfig;
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
 import io.trino.plugin.iceberg.catalog.file.FileMetastoreTableOperationsProvider;
 import io.trino.plugin.iceberg.catalog.hms.TrinoHiveCatalog;
+import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.Domain;
@@ -34,15 +41,19 @@
 import io.trino.spi.predicate.ValueSet;
 import io.trino.spi.type.TestingTypeManager;
 import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
+import io.trino.testing.TestingConnectorSession;
 import org.apache.iceberg.PartitionSpecParser;
 import org.apache.iceberg.SchemaParser;
 import org.apache.iceberg.Table;
 import org.apache.iceberg.types.Conversions;
 import org.apache.iceberg.types.Type;
 import org.apache.iceberg.types.Types;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.io.File;
 import java.io.IOException;
@@ -50,29 +61,41 @@
 import java.nio.file.Files;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.plugin.hive.metastore.cache.CachingHiveMetastore.memoizeMetastore;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.iceberg.IcebergTestUtils.getFileSystemFactory;
 import static io.trino.spi.connector.Constraint.alwaysTrue;
-import static io.trino.spi.connector.RetryMode.NO_RETRIES;
 import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.tpch.TpchTable.NATION;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestIcebergSplitSource
         extends AbstractTestQueryFramework
 {
+    private static final ConnectorSession SESSION = TestingConnectorSession.builder()
+            .setPropertyMetadata(new IcebergSessionProperties(
+                    new IcebergConfig(),
+                    new OrcReaderConfig(),
+                    new OrcWriterConfig(),
+                    new ParquetReaderConfig(),
+                    new ParquetWriterConfig())
+                    .getSessionProperties())
+            .build();
+
     private File metastoreDir;
+    private TrinoFileSystemFactory fileSystemFactory;
     private TrinoCatalog catalog;
 
     @Override
@@ -82,32 +105,37 @@ protected QueryRunner createQueryRunner()
         File tempDir = Files.createTempDirectory("test_iceberg_split_source").toFile();
         this.metastoreDir = new File(tempDir, "iceberg_data");
         HiveMetastore metastore = createTestingFileHiveMetastore(metastoreDir);
+
+        DistributedQueryRunner queryRunner = IcebergQueryRunner.builder()
+                .setInitialTables(NATION)
+                .setMetastoreDirectory(metastoreDir)
+                .build();
+
+        this.fileSystemFactory = getFileSystemFactory(queryRunner);
         CachingHiveMetastore cachingHiveMetastore = memoizeMetastore(metastore, 1000);
         this.catalog = new TrinoHiveCatalog(
                 new CatalogName("hive"),
                 cachingHiveMetastore,
                 new TrinoViewHiveMetastore(cachingHiveMetastore, false, "trino-version", "test"),
-                HDFS_FILE_SYSTEM_FACTORY,
+                fileSystemFactory,
                 new TestingTypeManager(),
-                new FileMetastoreTableOperationsProvider(HDFS_FILE_SYSTEM_FACTORY),
+                new FileMetastoreTableOperationsProvider(fileSystemFactory),
                 false,
                 false,
                 false);
 
-        return IcebergQueryRunner.builder()
-                .setInitialTables(NATION)
-                .setMetastoreDirectory(metastoreDir)
-                .build();
+        return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws IOException
     {
         deleteRecursively(metastoreDir.getParentFile().toPath(), ALLOW_INSECURE);
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testIncompleteDynamicFilterTimeout()
             throws Exception
     {
@@ -115,26 +143,28 @@ public void testIncompleteDynamicFilterTimeout()
         SchemaTableName schemaTableName = new SchemaTableName("tpch", "nation");
         Table nationTable = catalog.loadTable(SESSION, schemaTableName);
         IcebergTableHandle tableHandle = new IcebergTableHandle(
+                CatalogHandle.fromId("iceberg:NORMAL:v12345"),
                 schemaTableName.getSchemaName(),
                 schemaTableName.getTableName(),
                 TableType.DATA,
                 Optional.empty(),
                 SchemaParser.toJson(nationTable.schema()),
-                ImmutableList.of(),
                 Optional.of(PartitionSpecParser.toJson(nationTable.spec())),
                 1,
                 TupleDomain.all(),
                 TupleDomain.all(),
+                OptionalLong.empty(),
                 ImmutableSet.of(),
                 Optional.empty(),
                 nationTable.location(),
                 nationTable.properties(),
-                NO_RETRIES,
                 false,
+                Optional.empty(),
+                ImmutableSet.of(),
                 Optional.empty());
 
         try (IcebergSplitSource splitSource = new IcebergSplitSource(
-                HDFS_FILE_SYSTEM_FACTORY,
+                fileSystemFactory,
                 SESSION,
                 tableHandle,
                 nationTable.newScan(),
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergStatistics.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergStatistics.java
index 0a30bb9582cb..b3b96f258f89 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergStatistics.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergStatistics.java
@@ -13,14 +13,21 @@
  */
 package io.trino.plugin.iceberg;
 
+import com.google.common.collect.Lists;
+import com.google.common.math.IntMath;
 import io.trino.Session;
 import io.trino.testing.AbstractTestQueryFramework;
-import io.trino.testing.DataProviders;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
+import java.util.List;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.COLLECT_EXTENDED_STATISTICS_ON_WRITE;
+import static io.trino.plugin.iceberg.IcebergSessionProperties.EXPIRE_SNAPSHOTS_MIN_RETENTION;
 import static io.trino.testing.DataProviders.cartesianProduct;
 import static io.trino.testing.DataProviders.trueFalse;
 import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.EXECUTE_TABLE_PROCEDURE;
@@ -28,6 +35,8 @@
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tpch.TpchTable.NATION;
 import static java.lang.String.format;
+import static java.math.RoundingMode.UP;
+import static java.util.stream.Collectors.joining;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
@@ -45,7 +54,8 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
-    @Test(dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
     public void testAnalyze(boolean collectOnStatsOnWrites)
     {
         Session writeSession = withStatsOnWrite(getSession(), collectOnStatsOnWrites);
@@ -56,8 +66,8 @@ public void testAnalyze(boolean collectOnStatsOnWrites)
                 VALUES
                   ('nationkey', null, 25, 0, null, '0', '24'),
                   ('regionkey', null, 5, 0, null, '0', '4'),
-                  ('comment', null, 25, 0, null, null, null),
-                  ('name', null, 25, 0, null, null, null),
+                  ('comment', 2178.0, 25, 0, null, null, null),
+                  ('name', 594.0, 25, 0, null, null, null),
                   (null, null, null, null, 25, null, null)""";
 
         if (collectOnStatsOnWrites) {
@@ -70,8 +80,8 @@ public void testAnalyze(boolean collectOnStatsOnWrites)
                             VALUES
                               ('nationkey', null, null, 0, null, '0', '24'),
                               ('regionkey', null, null, 0, null, '0', '4'),
-                              ('comment', null, null, 0, null, null, null),
-                              ('name', null, null, 0, null, null, null),
+                              ('comment', 2178.0, null, 0, null, null, null),
+                              ('name', 594.0, null, 0, null, null, null),
                               (null, null, null, null, 25, null, null)""");
         }
 
@@ -88,8 +98,8 @@ public void testAnalyze(boolean collectOnStatsOnWrites)
                 VALUES
                   ('nationkey', null, 25, 0, null, '0', '24'),
                   ('regionkey', null, 5, 0, null, '0', '4'),
-                  ('comment', null, 25, 0, null, null, null),
-                  ('name', null, 25, 0, null, null, null),
+                  ('comment', 4357.0, 25, 0, null, null, null),
+                  ('name', 1188.0, 25, 0, null, null, null),
                   (null, null, null, null, 50, null, null)""";
         assertUpdate("ANALYZE " + tableName);
         assertQuery("SHOW STATS FOR " + tableName, goodStatsAfterFirstInsert);
@@ -100,8 +110,8 @@ public void testAnalyze(boolean collectOnStatsOnWrites)
                 VALUES
                   ('nationkey', null, 50, 0, null, '0', '49'),
                   ('regionkey', null, 10, 0, null, '0', '9'),
-                  ('comment', null, 50, 0, null, null, null),
-                  ('name', null, 50, 0, null, null, null),
+                  ('comment', 6517.0, 50, 0, null, null, null),
+                  ('name', 1800.0, 50, 0, null, null, null),
                   (null, null, null, null, 75, null, null)""";
 
         if (collectOnStatsOnWrites) {
@@ -115,8 +125,8 @@ public void testAnalyze(boolean collectOnStatsOnWrites)
                             VALUES
                               ('nationkey', null, 25, 0, null, '0', '49'),
                               ('regionkey', null, 5, 0, null, '0', '9'),
-                              ('comment', null, 25, 0, null, null, null),
-                              ('name', null, 25, 0, null, null, null),
+                              ('comment', 6517.0, 25, 0, null, null, null),
+                              ('name', 1800.0, 25, 0, null, null, null),
                               (null, null, null, null, 75, null, null)""");
         }
 
@@ -146,9 +156,9 @@ public void testAnalyzeWithSchemaEvolution()
                         VALUES
                           ('nationkey', null, 25, 0, null, '0', '24'),
                           ('regionkey', null, 5, 0, null, '0', '4'),
-                          ('name', null, 25, 0, null, null, null),
-                          ('info', null, null, 0, null, null, null),
-                          (null, null, null, null, 25, null, null)""");
+                          ('name', 1908.0, 25, 0, null, null, null),
+                          ('info', null, null, null, null, null, null),
+                          (null, null, null, null, 50, null, null)""");
 
         assertUpdate("ANALYZE " + tableName);
         assertQuery(
@@ -157,14 +167,15 @@ public void testAnalyzeWithSchemaEvolution()
                         VALUES
                           ('nationkey', null, 25, 0, null, '0', '24'),
                           ('regionkey', null, 5, 0, null, '0', '4'),
-                          ('name', null, 25, 0, null, null, null),
-                          ('info', null, 25, 0, null, null, null),
-                          (null, null, null, null, 25, null, null)""");
+                          ('name', 1908.0, 25, 0, null, null, null),
+                          ('info', 4417.0, 25, 0.1, null, null, null),
+                          (null, null, null, null, 50, null, null)"""); // Row count statistics do not yet account for position deletes
 
         assertUpdate("DROP TABLE " + tableName);
     }
 
-    @Test(dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
     public void testAnalyzePartitioned(boolean collectOnStatsOnWrites)
     {
         Session writeSession = withStatsOnWrite(getSession(), collectOnStatsOnWrites);
@@ -174,8 +185,8 @@ public void testAnalyzePartitioned(boolean collectOnStatsOnWrites)
                 VALUES
                   ('nationkey', null, 25, 0, null, '0', '24'),
                   ('regionkey', null, 5, 0, null, '0', '4'),
-                  ('comment', null, 25, 0, null, null, null),
-                  ('name', null, 25, 0, null, null, null),
+                  ('comment', 3558.0, 25, 0, null, null, null),
+                  ('name', 1231.0, 25, 0, null, null, null),
                   (null, null, null, null, 25, null, null)""";
 
         if (collectOnStatsOnWrites) {
@@ -188,8 +199,8 @@ public void testAnalyzePartitioned(boolean collectOnStatsOnWrites)
                             VALUES
                               ('nationkey', null, null, 0, null, '0', '24'),
                               ('regionkey', null, null, 0, null, '0', '4'),
-                              ('comment', null, null, 0, null, null, null),
-                              ('name', null, null, 0, null, null, null),
+                              ('comment', 3558.0, null, 0, null, null, null),
+                              ('name', 1231.0, null, 0, null, null, null),
                               (null, null, null, null, 25, null, null)""");
         }
 
@@ -206,8 +217,8 @@ public void testAnalyzePartitioned(boolean collectOnStatsOnWrites)
                         VALUES
                           ('nationkey', null, 25, 0, null, '0', '24'),
                           ('regionkey', null, 5, 0, null, '0', '4'),
-                          ('comment', null, 25, 0, null, null, null),
-                          ('name', null, 25, 0, null, null, null),
+                          ('comment', 7117.0, 25, 0, null, null, null),
+                          ('name', 2462.0, 25, 0, null, null, null),
                           (null, null, null, null, 50, null, null)""");
 
         // insert modified rows
@@ -216,8 +227,8 @@ public void testAnalyzePartitioned(boolean collectOnStatsOnWrites)
                 VALUES
                   ('nationkey', null, 50, 0, null, '0', '49'),
                   ('regionkey', null, 10, 0, null, '0', '9'),
-                  ('comment', null, 50, 0, null, null, null),
-                  ('name', null, 50, 0, null, null, null),
+                  ('comment', 10659.0, 50, 0, null, null, null),
+                  ('name', 3715.0, 50, 0, null, null, null),
                   (null, null, null, null, 75, null, null)""";
 
         if (collectOnStatsOnWrites) {
@@ -231,8 +242,8 @@ public void testAnalyzePartitioned(boolean collectOnStatsOnWrites)
                             VALUES
                               ('nationkey', null, 25, 0, null, '0', '49'),
                               ('regionkey', null, 5, 0, null, '0', '9'),
-                              ('comment', null, 25, 0, null, null, null),
-                              ('name', null, 25, 0, null, null, null),
+                              ('comment', 10659.0, 25, 0, null, null, null),
+                              ('name', 3715.0, 25, 0, null, null, null),
                               (null, null, null, null, 75, null, null)""");
         }
 
@@ -283,14 +294,71 @@ public void testAnalyzeEmpty()
                         VALUES
                           ('nationkey', null, 25, 0, null, '0', '24'),
                           ('regionkey', null, 5, 0, null, '0', '4'),
-                          ('comment', null, 25, 0, null, null, null),
-                          ('name', null, 25, 0, null, null, null),
+                          ('comment', 2178.0, 25, 0, null, null, null),
+                          ('name', 594.0, 25, 0, null, null, null),
                           (null, null, null, null, 25, null, null)""");
 
         assertUpdate("DROP TABLE " + tableName);
     }
 
-    @Test(dataProvider = "testCollectStatisticsOnWriteDataProvider")
+    @ParameterizedTest
+    @MethodSource("testCollectStatisticsOnWriteDataProvider")
+    public void testCollectStatisticsOnWrite(boolean collectOnStatsOnCreateTable, boolean partitioned)
+    {
+        String tableName = "test_collect_stats_insert_" + collectOnStatsOnCreateTable + partitioned;
+
+        assertUpdate(
+                withStatsOnWrite(getSession(), collectOnStatsOnCreateTable),
+                "CREATE TABLE " + tableName + " " +
+                        (partitioned ? "WITH (partitioning=ARRAY['regionkey']) " : "") +
+                        "AS SELECT * FROM tpch.sf1.nation WHERE nationkey < 12 AND regionkey < 3",
+                7);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                collectOnStatsOnCreateTable
+                        ? """
+                        VALUES
+                          ('nationkey', null, 7, 0, null, '0', '9'),
+                          ('regionkey', null, 3, 0, null, '0', '2'),
+                          ('comment', %s, 7, 0, null, null, null),
+                          ('name', %s, 7, 0, null, null, null),
+                          (null, null, null, null, 7, null, null)"""
+                        .formatted(partitioned ? "1328.0" : "954.9999999999999", partitioned ? "501.99999999999994" : "280.0")
+                        : """
+                        VALUES
+                          ('nationkey', null, null, 0, null, '0', '9'),
+                          ('regionkey', null, null, 0, null, '0', '2'),
+                          ('comment', %s, null, 0, null, null, null),
+                          ('name', %s, null, 0, null, null, null),
+                          (null, null, null, null, 7, null, null)"""
+                        .formatted(partitioned ? "1328.0" : "954.9999999999999", partitioned ? "501.99999999999994" : "280.0"));
+
+        assertUpdate(withStatsOnWrite(getSession(), true), "INSERT INTO " + tableName + " SELECT * FROM tpch.sf1.nation WHERE nationkey >= 12 OR regionkey >= 3", 18);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                collectOnStatsOnCreateTable
+                        ? """
+                        VALUES
+                          ('nationkey', null, 25, 0, null, '0', '24'),
+                          ('regionkey', null, 5, 0, null, '0', '4'),
+                          ('comment', %s, 25, 0, null, null, null),
+                          ('name', %s, 25, 0, null, null, null),
+                          (null, null, null, null, 25, null, null)"""
+                        .formatted(partitioned ? "4141.0" : "2659.0", partitioned ? "1533.0" : "745.0")
+                        : """
+                        VALUES
+                          ('nationkey', null, null, 0, null, '0', '24'),
+                          ('regionkey', null, null, 0, null, '0', '4'),
+                          ('comment', %s, null, 0, null, null, null),
+                          ('name', %s, null, 0, null, null, null),
+                          (null, null, null, null, 25, null, null)"""
+                        .formatted(partitioned ? "4141.0" : "2659.0", partitioned ? "1533.0" : "745.0"));
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @ParameterizedTest
+    @MethodSource("testCollectStatisticsOnWriteDataProvider")
     public void testCollectStatisticsOnWriteToEmptyTable(boolean collectOnStatsOnCreateTable, boolean partitioned)
     {
         String tableName = "test_collect_stats_insert_into_empty_" + collectOnStatsOnCreateTable + partitioned;
@@ -318,19 +386,103 @@ public void testCollectStatisticsOnWriteToEmptyTable(boolean collectOnStatsOnCre
                         VALUES
                           ('nationkey', null, 25, 0, null, '0', '24'),
                           ('regionkey', null, 5, 0, null, '0', '4'),
-                          ('comment', null, 25, 0, null, null, null),
-                          ('name', null, 25, 0, null, null, null),
-                          (null, null, null, null, 25, null, null)""");
+                          ('comment', %f, 25, 0, null, null, null),
+                          ('name', %f, 25, 0, null, null, null),
+                          (null, null, null, null, 25, null, null)"""
+                        .formatted(partitioned ? 3558.0 : 2178.0, partitioned ? 1231.0 : 594.0));
 
         assertUpdate("DROP TABLE " + tableName);
     }
 
-    @DataProvider
     public Object[][] testCollectStatisticsOnWriteDataProvider()
     {
         return cartesianProduct(trueFalse(), trueFalse());
     }
 
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void testAnalyzeAfterStatsDrift(boolean withOptimize)
+    {
+        String tableName = "test_analyze_stats_drift_" + withOptimize;
+        Session session = withStatsOnWrite(getSession(), true);
+
+        assertUpdate(session, "CREATE TABLE " + tableName + " AS SELECT nationkey, regionkey FROM tpch.sf1.nation", 25);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                          ('nationkey', null, 25, 0, null, '0', '24'),
+                          ('regionkey', null, 5, 0, null, '0', '4'),
+                          (null, null, null, null, 25, null, null)""");
+
+        // remove two regions in multiple queries
+        List<String> idsToRemove = computeActual("SELECT nationkey FROM tpch.sf1.nation WHERE regionkey IN (2, 4)").getOnlyColumn()
+                .map(value -> Long.toString((Long) value))
+                .collect(toImmutableList());
+        for (List<String> ids : Lists.partition(idsToRemove, IntMath.divide(idsToRemove.size(), 2, UP))) {
+            String idsLiteral = ids.stream().collect(joining(", ", "(", ")"));
+            assertUpdate("DELETE FROM " + tableName + " WHERE nationkey IN " + idsLiteral, ids.size());
+        }
+
+        // Stats not updated during deletes
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                """
+                        VALUES
+                          ('nationkey', null, 25, 0, null, '0', '24'),
+                          ('regionkey', null, 5, 0, null, '0', '4'),
+                          (null, null, null, null, 25, null, null)""");
+
+        if (withOptimize) {
+            assertUpdate("ALTER TABLE " + tableName + " EXECUTE optimize");
+            assertQuery(
+                    "SHOW STATS FOR " + tableName,
+                    """
+                            VALUES
+                              ('nationkey', null, 15, 0, null, '0', '24'),
+                              ('regionkey', null, 4, 0, null, '0', '3'),
+                              (null, null, null, null, 15, null, null)""");
+        }
+
+        // ANALYZE can be used to update stats and prevent them from drifting over time
+        assertUpdate("ANALYZE " + tableName + " WITH(columns=ARRAY['nationkey'])");
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                withOptimize
+                        ? """
+                        VALUES
+                          ('nationkey', null, 15, 0, null, '0', '24'),
+                          ('regionkey', null, 4, 0, null, '0', '3'), -- not updated yet
+                          (null, null, null, null, 15, null, null)"""
+                        :
+                        // TODO row count and min/max values are incorrect as they are taken from manifest file list
+                        """
+                                VALUES
+                                  ('nationkey', null, 15, 0, null, '0', '24'),
+                                  ('regionkey', null, 5, 0, null, '0', '4'), -- not updated yet
+                                  (null, null, null, null, 25, null, null)""");
+
+        // ANALYZE all columns
+        assertUpdate("ANALYZE " + tableName);
+        assertQuery(
+                "SHOW STATS FOR " + tableName,
+                withOptimize
+                        ? """
+                        VALUES
+                          ('nationkey', null, 15, 0, null, '0', '24'),
+                          ('regionkey', null, 3, 0, null, '0', '3'),
+                          (null, null, null, null, 15, null, null)"""
+                        :
+                        // TODO row count and min/max values are incorrect as they are taken from manifest file list
+                        """
+                                VALUES
+                                  ('nationkey', null, 15, 0, null, '0', '24'),
+                                  ('regionkey', null, 3, 0, null, '0', '4'),
+                                  (null, null, null, null, 25, null, null)""");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
     @Test
     public void testAnalyzeSomeColumns()
     {
@@ -363,8 +515,8 @@ public void testAnalyzeSomeColumns()
                         VALUES
                           ('nationkey', null, 25, 0, null, '0', '24'),
                           ('regionkey', null, 5, 0, null, '0', '4'),
-                          ('comment', null, null, 0, null, null, null),
-                          ('name', null, null, 0, null, null, null),
+                          ('comment', 2178.0, null, 0, null, null, null),
+                          ('name', 594.0, null, 0, null, null, null),
                           (null, null, null, null, 25, null, null)""");
 
         // insert modified rows
@@ -378,8 +530,8 @@ public void testAnalyzeSomeColumns()
                         VALUES
                           ('nationkey', null, 50, 0, null, '0', '49'),
                           ('regionkey', null, 10, 0, null, '0', '9'),
-                          ('comment', null, null, 0, null, null, null),
-                          ('name', null, null, 0, null, null, null),
+                          ('comment', 4471.0, null, 0, null, null, null),
+                          ('name', 1215.0, null, 0, null, null, null),
                           (null, null, null, null, 50, null, null)""");
 
         // drop stats
@@ -393,8 +545,8 @@ public void testAnalyzeSomeColumns()
                         VALUES
                           ('nationkey', null, 50, 0, null, '0', '49'),
                           ('regionkey', null, 10, 0, null, '0', '9'),
-                          ('comment', null, 50, 0, null, null, null),
-                          ('name', null, 50, 0, null, null, null),
+                          ('comment', 4471.0, 50, 0, null, null, null),
+                          ('name', 1215.0, 50, 0, null, null, null),
                           (null, null, null, null, 50, null, null)""");
 
         // insert modified rows
@@ -407,8 +559,8 @@ public void testAnalyzeSomeColumns()
                         VALUES
                           ('nationkey', null, 50, 0, null, '0', '74'),
                           ('regionkey', null, 10, 0, null, '0', '14'),
-                          ('comment', null, 50, 0, null, null, null),
-                          ('name', null, 50, 0, null, null, null),
+                          ('comment', 6746.999999999999, 50, 0, null, null, null),
+                          ('name', 1836.0, 50, 0, null, null, null),
                           (null, null, null, null, 75, null, null)""");
 
         // reanalyze with a subset of columns
@@ -419,8 +571,8 @@ public void testAnalyzeSomeColumns()
                         VALUES
                           ('nationkey', null, 75, 0, null, '0', '74'),
                           ('regionkey', null, 15, 0, null, '0', '14'),
-                          ('comment', null, 50, 0, null, null, null), -- result of previous analyze
-                          ('name', null, 50, 0, null, null, null), -- result of previous analyze
+                          ('comment', 6746.999999999999, 50, 0, null, null, null), -- result of previous analyze
+                          ('name', 1836.0, 50, 0, null, null, null), -- result of previous analyze
                           (null, null, null, null, 75, null, null)""");
 
         // analyze all columns
@@ -431,8 +583,8 @@ public void testAnalyzeSomeColumns()
                         VALUES
                           ('nationkey', null, 75, 0, null, '0', '74'),
                           ('regionkey', null, 15, 0, null, '0', '14'),
-                          ('comment', null, 75, 0, null, null, null),
-                          ('name', null, 75, 0, null, null, null),
+                          ('comment', 6746.999999999999, 75, 0, null, null, null),
+                          ('name', 1836.0, 75, 0, null, null, null),
                           (null, null, null, null, 75, null, null)""");
 
         assertUpdate("DROP TABLE " + tableName);
@@ -475,15 +627,15 @@ public void testDropExtendedStats()
                 VALUES
                   ('nationkey', null, null, 0, null, '0', '24'),
                   ('regionkey', null, null, 0, null, '0', '4'),
-                  ('comment', null, null, 0, null, null, null),
-                  ('name',  null, null, 0, null, null, null),
+                  ('comment', 2178.0, null, 0, null, null, null),
+                  ('name',  594.0, null, 0, null, null, null),
                   (null,  null, null, null, 25, null, null)""";
         String extendedStats = """
                 VALUES
                   ('nationkey', null, 25, 0, null, '0', '24'),
                   ('regionkey', null, 5, 0, null, '0', '4'),
-                  ('comment', null, 25, 0, null, null, null),
-                  ('name',  null, 25, 0, null, null, null),
+                  ('comment', 2178.0, 25, 0, null, null, null),
+                  ('name',  594.0, 25, 0, null, null, null),
                   (null,  null, null, null, 25, null, null)""";
 
         assertQuery("SHOW STATS FOR " + tableName, extendedStats);
@@ -513,8 +665,8 @@ public void testDropMissingStats()
                         VALUES
                           ('nationkey', null, null, 0, null, '0', '24'),
                           ('regionkey', null, null, 0, null, '0', '4'),
-                          ('comment', null, null, 0, null, null, null),
-                          ('name',  null, null, 0, null, null, null),
+                          ('comment', 2178.0, null, 0, null, null, null),
+                          ('name',  594.0, null, 0, null, null, null),
                           (null,  null, null, null, 25, null, null)""");
 
         assertUpdate("DROP TABLE " + tableName);
@@ -582,8 +734,8 @@ public void testAnalyzeAndRollbackToSnapshot()
                         VALUES
                           ('nationkey', null, 25, 0, null, '0', '24'),
                           ('regionkey', null, 5, 0, null, '0', '4'),
-                          ('comment', null, 25, 0, null, null, null),
-                          ('name',  null, 25, 0, null, null, null),
+                          ('comment', 2475.0, 25, 0, null, null, null),
+                          ('name',  726.0, 25, 0, null, null, null),
                           (null,  null, null, null, 26, null, null)""");
 
         assertUpdate(format("CALL system.rollback_to_snapshot('%s', '%s', %s)", schema, tableName, createSnapshot));
@@ -594,8 +746,8 @@ public void testAnalyzeAndRollbackToSnapshot()
                         VALUES
                           ('nationkey', null, 25, 0, null, '0', '24'),
                           ('regionkey', null, 5, 0, null, '0', '4'),
-                          ('comment', null, 25, 0, null, null, null),
-                          ('name',  null, 25, 0, null, null, null),
+                          ('comment', 2178.0, 25, 0, null, null, null),
+                          ('name',  594.0, 25, 0, null, null, null),
                           (null,  null, null, null, 25, null, null)""");
 
         assertUpdate("DROP TABLE " + tableName);
@@ -620,8 +772,8 @@ public void testAnalyzeAndDeleteOrphanFiles()
                         VALUES
                           ('nationkey', null, 25, 0, null, '0', '24'),
                           ('regionkey', null, 5, 0, null, '0', '4'),
-                          ('comment', null, 25, 0, null, null, null),
-                          ('name',  null, 25, 0, null, null, null),
+                          ('comment', 2178.0, 25, 0, null, null, null),
+                          ('name',  594.0, 25, 0, null, null, null),
                           (null,  null, null, null, 25, null, null)""");
 
         assertUpdate("DROP TABLE " + tableName);
@@ -665,8 +817,8 @@ public void testEmptyNoScalarColumns()
                 "SHOW STATS FOR " + tableName,
                 """
                         VALUES
-                          ('a', null, null, 0, null, null, null),
-                          ('b', null, null, 0, null, null, null),
+                          ('a', null, null, null, null, null, null),
+                          ('b', null, null, null, null, null, null),
                           (null,  null, null, null, 2, null, null)""");
 
         assertUpdate("DROP TABLE " + tableName);
@@ -687,8 +839,8 @@ public void testNoScalarColumns()
                 "SHOW STATS FOR " + tableName,
                 """
                         VALUES
-                          ('a', null, null, 0, null, null, null),
-                          ('b', null, null, 0, null, null, null),
+                          ('a', null, null, null, null, null, null),
+                          ('b', null, null, null, null, null, null),
                           (null,  null, null, null, 2, null, null)""");
 
         // On non-empty table
@@ -701,8 +853,8 @@ public void testNoScalarColumns()
                 "SHOW STATS FOR " + tableName,
                 """
                         VALUES
-                          ('a', null, null, 0, null, null, null),
-                          ('b', null, null, 0, null, null, null),
+                          ('a', null, null, null, null, null, null),
+                          ('b', null, null, null, null, null, null),
                           (null,  null, null, null, 2, null, null)""");
 
         // write with stats collection
@@ -714,13 +866,151 @@ public void testNoScalarColumns()
                 "SHOW STATS FOR " + tableName,
                 """
                         VALUES
-                          ('a', null, null, 0, null, null, null),
-                          ('b', null, null, 0, null, null, null),
+                          ('a', null, null, null, null, null, null),
+                          ('b', null, null, null, null, null, null),
                           (null,  null, null, null, 4, null, null)""");
 
         assertUpdate("DROP TABLE " + tableName);
     }
 
+    @Test
+    public void testShowStatsAsOf()
+    {
+        Session writeSession = withStatsOnWrite(getSession(), false);
+        assertUpdate(writeSession, "CREATE TABLE show_stats_as_of(key integer)");
+
+        assertUpdate(writeSession, "INSERT INTO show_stats_as_of VALUES 3", 1);
+        long beforeAnalyzedSnapshot = getCurrentSnapshotId("show_stats_as_of");
+
+        assertUpdate(writeSession, "INSERT INTO show_stats_as_of VALUES 4", 1);
+        assertUpdate("ANALYZE show_stats_as_of");
+        long analyzedSnapshot = getCurrentSnapshotId("show_stats_as_of");
+
+        assertUpdate(writeSession, "INSERT INTO show_stats_as_of VALUES 5", 1);
+        long laterSnapshot = getCurrentSnapshotId("show_stats_as_of");
+
+        assertQuery(
+                "SHOW STATS FOR (SELECT * FROM show_stats_as_of FOR VERSION AS OF " + beforeAnalyzedSnapshot + ")",
+                """
+                        VALUES
+                          ('key', null, null, 0, null, '3', '3'), -- NDV not present, as ANALYZE was run on a later snapshot
+                          (null,  null, null, null, 1, null, null)""");
+
+        assertQuery(
+                "SHOW STATS FOR (SELECT * FROM show_stats_as_of FOR VERSION AS OF " + analyzedSnapshot + ")",
+                """
+                        VALUES
+                          ('key', null, 2, 0, null, '3', '4'), -- NDV present, this is the snapshot ANALYZE was run for
+                          (null,  null, null, null, 2, null, null)""");
+
+        assertQuery(
+                "SHOW STATS FOR (SELECT * FROM show_stats_as_of FOR VERSION AS OF " + laterSnapshot + ")",
+                """
+                        VALUES
+                          ('key', null, 2, 0, null, '3', '5'), -- NDV present, stats "inherited" from previous snapshot
+                          (null,  null, null, null, 3, null, null)""");
+
+        assertUpdate("DROP TABLE show_stats_as_of");
+    }
+
+    @Test
+    public void testShowStatsAfterExpiration()
+    {
+        String catalog = getSession().getCatalog().orElseThrow();
+        Session writeSession = withStatsOnWrite(getSession(), false);
+
+        assertUpdate(writeSession, "CREATE TABLE show_stats_after_expiration(key integer)");
+        // create several snapshots
+        assertUpdate(writeSession, "INSERT INTO show_stats_after_expiration VALUES 1", 1);
+        assertUpdate(writeSession, "INSERT INTO show_stats_after_expiration VALUES 2", 1);
+        assertUpdate(writeSession, "INSERT INTO show_stats_after_expiration VALUES 3", 1);
+
+        long beforeAnalyzedSnapshot = getCurrentSnapshotId("show_stats_after_expiration");
+
+        assertUpdate(
+                Session.builder(getSession())
+                        .setCatalogSessionProperty(catalog, EXPIRE_SNAPSHOTS_MIN_RETENTION, "0s")
+                        .build(),
+                "ALTER TABLE show_stats_after_expiration EXECUTE expire_snapshots(retention_threshold => '0d')");
+        assertThat(query("SELECT count(*) FROM \"show_stats_after_expiration$snapshots\""))
+                .matches("VALUES BIGINT '1'");
+
+        assertUpdate(writeSession, "INSERT INTO show_stats_after_expiration VALUES 4", 1);
+        assertUpdate("ANALYZE show_stats_after_expiration");
+        long analyzedSnapshot = getCurrentSnapshotId("show_stats_after_expiration");
+
+        assertUpdate(writeSession, "INSERT INTO show_stats_after_expiration VALUES 5", 1);
+        long laterSnapshot = getCurrentSnapshotId("show_stats_after_expiration");
+
+        assertQuery(
+                "SHOW STATS FOR (SELECT * FROM show_stats_after_expiration FOR VERSION AS OF " + beforeAnalyzedSnapshot + ")",
+                """
+                        VALUES
+                          ('key', null, null, 0, null, '1', '3'), -- NDV not present, as ANALYZE was run on a later snapshot
+                          (null,  null, null, null, 3, null, null)""");
+
+        assertQuery(
+                "SHOW STATS FOR (SELECT * FROM show_stats_after_expiration FOR VERSION AS OF " + analyzedSnapshot + ")",
+                """
+                        VALUES
+                          ('key', null, 4, 0, null, '1', '4'), -- NDV present, this is the snapshot ANALYZE was run for
+                          (null,  null, null, null, 4, null, null)""");
+
+        assertQuery(
+                "SHOW STATS FOR (SELECT * FROM show_stats_after_expiration FOR VERSION AS OF " + laterSnapshot + ")",
+                """
+                        VALUES
+                          ('key', null, 4, 0, null, '1', '5'), -- NDV present, stats "inherited" from previous snapshot
+                          (null,  null, null, null, 5, null, null)""");
+
+        // Same as laterSnapshot but implicitly
+        assertQuery(
+                "SHOW STATS FOR show_stats_after_expiration",
+                """
+                        VALUES
+                          ('key', null, 4, 0, null, '1', '5'), -- NDV present, stats "inherited" from previous snapshot
+                          (null,  null, null, null, 5, null, null)""");
+
+        // Re-analyzing after snapshot expired
+        assertUpdate("ANALYZE show_stats_after_expiration");
+
+        assertQuery(
+                "SHOW STATS FOR show_stats_after_expiration",
+                """
+                        VALUES
+                          ('key', null, 5, 0, null, '1', '5'), -- NDV present, stats "inherited" from previous snapshot
+                          (null,  null, null, null, 5, null, null)""");
+
+        assertUpdate("DROP TABLE show_stats_after_expiration");
+    }
+
+    @Test
+    public void testStatsAfterDeletingAllRows()
+    {
+        String tableName = "test_stats_after_deleting_all_rows_";
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT * FROM tpch.sf1.nation", 25);
+
+        assertThat(query("SHOW STATS FOR " + tableName))
+                .projected("column_name", "distinct_values_count", "row_count")
+                .skippingTypesCheck()
+                .containsAll("VALUES " +
+                        "('nationkey', DOUBLE '25', null), " +
+                        "('name', DOUBLE '25', null), " +
+                        "('regionkey', DOUBLE '5', null), " +
+                        "('comment', DOUBLE '25', null), " +
+                        "(null, null, DOUBLE '25')");
+        assertUpdate("DELETE FROM " + tableName + " WHERE nationkey < 50", 25);
+        assertThat(query("SHOW STATS FOR " + tableName))
+                .projected("column_name", "distinct_values_count", "row_count")
+                .skippingTypesCheck()
+                .containsAll("VALUES " +
+                        "('nationkey', DOUBLE '25', null), " +
+                        "('name', DOUBLE '25', null), " +
+                        "('regionkey', DOUBLE '5', null), " +
+                        "('comment', DOUBLE '25', null), " +
+                        "(null, null, DOUBLE '25')");
+    }
+
     private long getCurrentSnapshotId(String tableName)
     {
         return (long) computeActual(format("SELECT snapshot_id FROM \"%s$snapshots\" ORDER BY committed_at DESC FETCH FIRST 1 ROW WITH TIES", tableName))
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergSystemTables.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergSystemTables.java
deleted file mode 100644
index 17767bd160ee..000000000000
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergSystemTables.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.iceberg;
-
-import io.trino.testing.AbstractTestQueryFramework;
-import io.trino.testing.DistributedQueryRunner;
-import io.trino.testing.MaterializedResult;
-import io.trino.testing.MaterializedRow;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.time.LocalDate;
-import java.util.Map;
-import java.util.function.Function;
-
-import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static io.trino.plugin.iceberg.IcebergQueryRunner.createIcebergQueryRunner;
-import static io.trino.testing.MaterializedResult.DEFAULT_PRECISION;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
-
-public class TestIcebergSystemTables
-        extends AbstractTestQueryFramework
-{
-    @Override
-    protected DistributedQueryRunner createQueryRunner()
-            throws Exception
-    {
-        return createIcebergQueryRunner();
-    }
-
-    @BeforeClass
-    public void setUp()
-    {
-        assertUpdate("CREATE SCHEMA test_schema");
-        assertUpdate("CREATE TABLE test_schema.test_table (_bigint BIGINT, _date DATE) WITH (partitioning = ARRAY['_date'])");
-        assertUpdate("INSERT INTO test_schema.test_table VALUES (0, CAST('2019-09-08' AS DATE)), (1, CAST('2019-09-09' AS DATE)), (2, CAST('2019-09-09' AS DATE))", 3);
-        assertUpdate("INSERT INTO test_schema.test_table VALUES (3, CAST('2019-09-09' AS DATE)), (4, CAST('2019-09-10' AS DATE)), (5, CAST('2019-09-10' AS DATE))", 3);
-        assertQuery("SELECT count(*) FROM test_schema.test_table", "VALUES 6");
-
-        assertUpdate("CREATE TABLE test_schema.test_table_multilevel_partitions (_varchar VARCHAR, _bigint BIGINT, _date DATE) WITH (partitioning = ARRAY['_bigint', '_date'])");
-        assertUpdate("INSERT INTO test_schema.test_table_multilevel_partitions VALUES ('a', 0, CAST('2019-09-08' AS DATE)), ('a', 1, CAST('2019-09-08' AS DATE)), ('a', 0, CAST('2019-09-09' AS DATE))", 3);
-        assertQuery("SELECT count(*) FROM test_schema.test_table_multilevel_partitions", "VALUES 3");
-
-        assertUpdate("CREATE TABLE test_schema.test_table_drop_column (_varchar VARCHAR, _bigint BIGINT, _date DATE) WITH (partitioning = ARRAY['_date'])");
-        assertUpdate("INSERT INTO test_schema.test_table_drop_column VALUES ('a', 0, CAST('2019-09-08' AS DATE)), ('a', 1, CAST('2019-09-09' AS DATE)), ('b', 2, CAST('2019-09-09' AS DATE))", 3);
-        assertUpdate("INSERT INTO test_schema.test_table_drop_column VALUES ('c', 3, CAST('2019-09-09' AS DATE)), ('a', 4, CAST('2019-09-10' AS DATE)), ('b', 5, CAST('2019-09-10' AS DATE))", 3);
-        assertQuery("SELECT count(*) FROM test_schema.test_table_drop_column", "VALUES 6");
-        assertUpdate("ALTER TABLE test_schema.test_table_drop_column DROP COLUMN _varchar");
-
-        assertUpdate("CREATE TABLE test_schema.test_table_nan (_bigint BIGINT, _double DOUBLE, _real REAL, _date DATE) WITH (partitioning = ARRAY['_date'])");
-        assertUpdate("INSERT INTO test_schema.test_table_nan VALUES (1, 1.1, 1.2, CAST('2022-01-01' AS DATE)), (2, nan(), 2.2, CAST('2022-01-02' AS DATE)), (3, 3.3, nan(), CAST('2022-01-03' AS DATE))", 3);
-        assertUpdate("INSERT INTO test_schema.test_table_nan VALUES (4, nan(), 4.1, CAST('2022-01-04' AS DATE)), (5, 4.2, nan(), CAST('2022-01-04' AS DATE)), (6, nan(), nan(), CAST('2022-01-04' AS DATE))", 3);
-        assertQuery("SELECT count(*) FROM test_schema.test_table_nan", "VALUES 6");
-
-        assertUpdate("CREATE TABLE test_schema.test_table_with_dml (_varchar VARCHAR, _date DATE) WITH (partitioning = ARRAY['_date'])");
-        assertUpdate(
-                "INSERT INTO test_schema.test_table_with_dml " +
-                        "VALUES " +
-                        "('a1', DATE '2022-01-01'), ('a2', DATE '2022-01-01'), " +
-                        "('b1', DATE '2022-02-02'), ('b2', DATE '2022-02-02'), " +
-                        "('c1', DATE '2022-03-03'), ('c2', DATE '2022-03-03')",
-                6);
-        assertUpdate("UPDATE test_schema.test_table_with_dml SET _varchar = 'a1.updated' WHERE _date = DATE '2022-01-01' AND _varchar = 'a1'", 1);
-        assertUpdate("DELETE FROM test_schema.test_table_with_dml WHERE _date = DATE '2022-02-02' AND _varchar = 'b2'", 1);
-        assertUpdate("INSERT INTO test_schema.test_table_with_dml VALUES ('c3', DATE '2022-03-03'), ('d1', DATE '2022-04-04')", 2);
-        assertQuery("SELECT count(*) FROM test_schema.test_table_with_dml", "VALUES 7");
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-    {
-        assertUpdate("DROP TABLE IF EXISTS test_schema.test_table");
-        assertUpdate("DROP TABLE IF EXISTS test_schema.test_table_multilevel_partitions");
-        assertUpdate("DROP TABLE IF EXISTS test_schema.test_table_drop_column");
-        assertUpdate("DROP TABLE IF EXISTS test_schema.test_table_nan");
-        assertUpdate("DROP TABLE IF EXISTS test_schema.test_table_with_dml");
-        assertUpdate("DROP SCHEMA IF EXISTS test_schema");
-    }
-
-    @Test
-    public void testPartitionTable()
-    {
-        assertQuery("SELECT count(*) FROM test_schema.test_table", "VALUES 6");
-        assertQuery("SHOW COLUMNS FROM test_schema.\"test_table$partitions\"",
-                "VALUES ('partition', 'row(_date date)', '', '')," +
-                        "('record_count', 'bigint', '', '')," +
-                        "('file_count', 'bigint', '', '')," +
-                        "('total_size', 'bigint', '', '')," +
-                        "('data', 'row(_bigint row(min bigint, max bigint, null_count bigint, nan_count bigint))', '', '')");
-
-        MaterializedResult result = computeActual("SELECT * from test_schema.\"test_table$partitions\"");
-        assertEquals(result.getRowCount(), 3);
-
-        Map<LocalDate, MaterializedRow> rowsByPartition = result.getMaterializedRows().stream()
-                .collect(toImmutableMap(row -> ((LocalDate) ((MaterializedRow) row.getField(0)).getField(0)), Function.identity()));
-
-        // Test if row counts are computed correctly
-        assertEquals(rowsByPartition.get(LocalDate.parse("2019-09-08")).getField(1), 1L);
-        assertEquals(rowsByPartition.get(LocalDate.parse("2019-09-09")).getField(1), 3L);
-        assertEquals(rowsByPartition.get(LocalDate.parse("2019-09-10")).getField(1), 2L);
-
-        // Test if min/max values, null value count and nan value count are computed correctly.
-        assertEquals(rowsByPartition.get(LocalDate.parse("2019-09-08")).getField(4), new MaterializedRow(DEFAULT_PRECISION, new MaterializedRow(DEFAULT_PRECISION, 0L, 0L, 0L, null)));
-        assertEquals(rowsByPartition.get(LocalDate.parse("2019-09-09")).getField(4), new MaterializedRow(DEFAULT_PRECISION, new MaterializedRow(DEFAULT_PRECISION, 1L, 3L, 0L, null)));
-        assertEquals(rowsByPartition.get(LocalDate.parse("2019-09-10")).getField(4), new MaterializedRow(DEFAULT_PRECISION, new MaterializedRow(DEFAULT_PRECISION, 4L, 5L, 0L, null)));
-    }
-
-    @Test
-    public void testPartitionTableWithNan()
-    {
-        assertQuery("SELECT count(*) FROM test_schema.test_table_nan", "VALUES 6");
-
-        MaterializedResult result = computeActual("SELECT * from test_schema.\"test_table_nan$partitions\"");
-        assertEquals(result.getRowCount(), 4);
-
-        Map<LocalDate, MaterializedRow> rowsByPartition = result.getMaterializedRows().stream()
-                .collect(toImmutableMap(row -> ((LocalDate) ((MaterializedRow) row.getField(0)).getField(0)), Function.identity()));
-
-        // Test if row counts are computed correctly
-        assertEquals(rowsByPartition.get(LocalDate.parse("2022-01-01")).getField(1), 1L);
-        assertEquals(rowsByPartition.get(LocalDate.parse("2022-01-02")).getField(1), 1L);
-        assertEquals(rowsByPartition.get(LocalDate.parse("2022-01-03")).getField(1), 1L);
-        assertEquals(rowsByPartition.get(LocalDate.parse("2022-01-04")).getField(1), 3L);
-
-        // Test if min/max values, null value count and nan value count are computed correctly.
-        assertEquals(
-                rowsByPartition.get(LocalDate.parse("2022-01-01")).getField(4),
-                new MaterializedRow(DEFAULT_PRECISION,
-                        new MaterializedRow(DEFAULT_PRECISION, 1L, 1L, 0L, null),
-                        new MaterializedRow(DEFAULT_PRECISION, 1.1d, 1.1d, 0L, null),
-                        new MaterializedRow(DEFAULT_PRECISION, 1.2f, 1.2f, 0L, null)));
-        assertEquals(
-                rowsByPartition.get(LocalDate.parse("2022-01-02")).getField(4),
-                new MaterializedRow(DEFAULT_PRECISION,
-                        new MaterializedRow(DEFAULT_PRECISION, 2L, 2L, 0L, null),
-                        new MaterializedRow(DEFAULT_PRECISION, null, null, 0L, 1L),
-                        new MaterializedRow(DEFAULT_PRECISION, 2.2f, 2.2f, 0L, null)));
-        assertEquals(
-                rowsByPartition.get(LocalDate.parse("2022-01-03")).getField(4),
-                new MaterializedRow(DEFAULT_PRECISION,
-                        new MaterializedRow(DEFAULT_PRECISION, 3L, 3L, 0L, null),
-                        new MaterializedRow(DEFAULT_PRECISION, 3.3, 3.3d, 0L, null),
-                        new MaterializedRow(DEFAULT_PRECISION, null, null, 0L, 1L)));
-        assertEquals(
-                rowsByPartition.get(LocalDate.parse("2022-01-04")).getField(4),
-                new MaterializedRow(DEFAULT_PRECISION,
-                        new MaterializedRow(DEFAULT_PRECISION, 4L, 6L, 0L, null),
-                        new MaterializedRow(DEFAULT_PRECISION, null, null, 0L, 2L),
-                        new MaterializedRow(DEFAULT_PRECISION, null, null, 0L, 2L)));
-    }
-
-    @Test
-    public void testPartitionTableOnDropColumn()
-    {
-        MaterializedResult resultAfterDrop = computeActual("SELECT * from test_schema.\"test_table_drop_column$partitions\"");
-        assertEquals(resultAfterDrop.getRowCount(), 3);
-        Map<LocalDate, MaterializedRow> rowsByPartitionAfterDrop = resultAfterDrop.getMaterializedRows().stream()
-                .collect(toImmutableMap(row -> ((LocalDate) ((MaterializedRow) row.getField(0)).getField(0)), Function.identity()));
-        assertEquals(rowsByPartitionAfterDrop.get(LocalDate.parse("2019-09-08")).getField(4), new MaterializedRow(DEFAULT_PRECISION,
-                new MaterializedRow(DEFAULT_PRECISION, 0L, 0L, 0L, null)));
-    }
-
-    @Test
-    public void testFilesTableOnDropColumn()
-    {
-        assertQuery("SELECT sum(record_count) FROM test_schema.\"test_table_drop_column$files\"", "VALUES 6");
-    }
-
-    @Test
-    public void testHistoryTable()
-    {
-        assertQuery("SHOW COLUMNS FROM test_schema.\"test_table$history\"",
-                "VALUES ('made_current_at', 'timestamp(3) with time zone', '', '')," +
-                        "('snapshot_id', 'bigint', '', '')," +
-                        "('parent_id', 'bigint', '', '')," +
-                        "('is_current_ancestor', 'boolean', '', '')");
-
-        // Test the number of history entries
-        assertQuery("SELECT count(*) FROM test_schema.\"test_table$history\"", "VALUES 3");
-    }
-
-    @Test
-    public void testSnapshotsTable()
-    {
-        assertQuery("SHOW COLUMNS FROM test_schema.\"test_table$snapshots\"",
-                "VALUES ('committed_at', 'timestamp(3) with time zone', '', '')," +
-                        "('snapshot_id', 'bigint', '', '')," +
-                        "('parent_id', 'bigint', '', '')," +
-                        "('operation', 'varchar', '', '')," +
-                        "('manifest_list', 'varchar', '', '')," +
-                        "('summary', 'map(varchar, varchar)', '', '')");
-
-        assertQuery("SELECT operation FROM test_schema.\"test_table$snapshots\"", "VALUES 'append', 'append', 'append'");
-        assertQuery("SELECT summary['total-records'] FROM test_schema.\"test_table$snapshots\"", "VALUES '0', '3', '6'");
-    }
-
-    @Test
-    public void testManifestsTable()
-    {
-        assertQuery("SHOW COLUMNS FROM test_schema.\"test_table$manifests\"",
-                "VALUES ('path', 'varchar', '', '')," +
-                        "('length', 'bigint', '', '')," +
-                        "('partition_spec_id', 'integer', '', '')," +
-                        "('added_snapshot_id', 'bigint', '', '')," +
-                        "('added_data_files_count', 'integer', '', '')," +
-                        "('added_rows_count', 'bigint', '', '')," +
-                        "('existing_data_files_count', 'integer', '', '')," +
-                        "('existing_rows_count', 'bigint', '', '')," +
-                        "('deleted_data_files_count', 'integer', '', '')," +
-                        "('deleted_rows_count', 'bigint', '', '')," +
-                        "('partitions', 'array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar))', '', '')");
-        assertQuerySucceeds("SELECT * FROM test_schema.\"test_table$manifests\"");
-        assertThat(query("SELECT added_data_files_count, existing_rows_count, added_rows_count, deleted_data_files_count, deleted_rows_count, partitions FROM test_schema.\"test_table$manifests\""))
-                .matches(
-                        "VALUES " +
-                                "    (2, BIGINT '0', BIGINT '3', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2019-09-08', '2019-09-09')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar)))) , " +
-                                "    (2, BIGINT '0', BIGINT '3', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2019-09-09', '2019-09-10')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar))))");
-
-        assertQuerySucceeds("SELECT * FROM test_schema.\"test_table_multilevel_partitions$manifests\"");
-        assertThat(query("SELECT added_data_files_count, existing_rows_count, added_rows_count, deleted_data_files_count, deleted_rows_count, partitions FROM test_schema.\"test_table_multilevel_partitions$manifests\""))
-                .matches(
-                        "VALUES " +
-                                "(3, BIGINT '0', BIGINT '3', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '0', '1'), ROW(false, false, '2019-09-08', '2019-09-09')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar))))");
-
-        assertQuerySucceeds("SELECT * FROM test_schema.\"test_table_with_dml$manifests\"");
-        assertThat(query("SELECT added_data_files_count, existing_rows_count, added_rows_count, deleted_data_files_count, deleted_rows_count, partitions FROM test_schema.\"test_table_with_dml$manifests\""))
-                .matches(
-                        "VALUES " +
-                                // INSERT on '2022-01-01', '2022-02-02', '2022-03-03' partitions
-                                "(3, BIGINT '0', BIGINT '6', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2022-01-01', '2022-03-03')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar)))), " +
-                                // UPDATE on '2022-01-01' partition
-                                "(1, BIGINT '0', BIGINT '1', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2022-01-01', '2022-01-01')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar)))), " +
-                                "(1, BIGINT '0', BIGINT '1', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2022-01-01', '2022-01-01')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar)))), " +
-                                // DELETE from '2022-02-02' partition
-                                "(1, BIGINT '0', BIGINT '1', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2022-02-02', '2022-02-02')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar)))), " +
-                                // INSERT on '2022-03-03', '2022-04-04' partitions
-                                "(2, BIGINT '0', BIGINT '2', 0, BIGINT '0', CAST(ARRAY[ROW(false, false, '2022-03-03', '2022-04-04')] AS array(row(contains_null boolean, contains_nan boolean, lower_bound varchar, upper_bound varchar))))");
-    }
-
-    @Test
-    public void testFilesTable()
-    {
-        assertQuery("SHOW COLUMNS FROM test_schema.\"test_table$files\"",
-                "VALUES ('content', 'integer', '', '')," +
-                        "('file_path', 'varchar', '', '')," +
-                        "('file_format', 'varchar', '', '')," +
-                        "('record_count', 'bigint', '', '')," +
-                        "('file_size_in_bytes', 'bigint', '', '')," +
-                        "('column_sizes', 'map(integer, bigint)', '', '')," +
-                        "('value_counts', 'map(integer, bigint)', '', '')," +
-                        "('null_value_counts', 'map(integer, bigint)', '', '')," +
-                        "('nan_value_counts', 'map(integer, bigint)', '', '')," +
-                        "('lower_bounds', 'map(integer, varchar)', '', '')," +
-                        "('upper_bounds', 'map(integer, varchar)', '', '')," +
-                        "('key_metadata', 'varbinary', '', '')," +
-                        "('split_offsets', 'array(bigint)', '', '')," +
-                        "('equality_ids', 'array(integer)', '', '')");
-        assertQuerySucceeds("SELECT * FROM test_schema.\"test_table$files\"");
-    }
-}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTableName.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTableName.java
index 54293b89ea14..b741444730e5 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTableName.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTableName.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.iceberg;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTableWithCustomLocation.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTableWithCustomLocation.java
index ced2618850fd..6f6df2a679b2 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTableWithCustomLocation.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTableWithCustomLocation.java
@@ -13,16 +13,16 @@
  */
 package io.trino.plugin.iceberg;
 
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.plugin.hive.metastore.file.FileHiveMetastore;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.MaterializedResult;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.metastore.TableType;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,10 +32,11 @@
 
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
-import static io.trino.plugin.hive.HiveTestUtils.SESSION;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.TableType.EXTERNAL_TABLE;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.plugin.iceberg.DataFileRecord.toDataFileRecord;
+import static io.trino.plugin.iceberg.IcebergTestUtils.getFileSystemFactory;
+import static io.trino.testing.TestingConnectorSession.SESSION;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
@@ -48,6 +49,7 @@ public class TestIcebergTableWithCustomLocation
 {
     private FileHiveMetastore metastore;
     private File metastoreDir;
+    private TrinoFileSystem fileSystem;
 
     @Override
     protected DistributedQueryRunner createQueryRunner()
@@ -62,7 +64,13 @@ protected DistributedQueryRunner createQueryRunner()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @BeforeAll
+    public void initFileSystem()
+    {
+        fileSystem = getFileSystemFactory(getDistributedQueryRunner()).create(SESSION);
+    }
+
+    @AfterAll
     public void tearDown()
             throws IOException
     {
@@ -87,19 +95,21 @@ public void testCreateAndDrop()
         String tableName = "test_create_and_drop";
         assertQuerySucceeds(format("CREATE TABLE %s as select 1 as val", tableName));
         Table table = metastore.getTable("tpch", tableName).orElseThrow();
-        assertThat(table.getTableType()).isEqualTo(TableType.EXTERNAL_TABLE.name());
+        assertThat(table.getTableType()).isEqualTo(EXTERNAL_TABLE.name());
+
+        Location tableLocation = Location.of(table.getStorage().getLocation());
+        assertTrue(fileSystem.newInputFile(tableLocation).exists(), "The directory corresponding to the table storage location should exist");
 
-        Path tableLocation = new Path(table.getStorage().getLocation());
-        TrinoFileSystem fileSystem = HDFS_FILE_SYSTEM_FACTORY.create(SESSION);
-        assertTrue(fileSystem.newInputFile(tableLocation.toString()).exists(), "The directory corresponding to the table storage location should exist");
         MaterializedResult materializedResult = computeActual("SELECT * FROM \"test_create_and_drop$files\"");
         assertEquals(materializedResult.getRowCount(), 1);
         DataFileRecord dataFile = toDataFileRecord(materializedResult.getMaterializedRows().get(0));
-        assertTrue(fileSystem.newInputFile(new Path(dataFile.getFilePath()).toString()).exists(), "The data file should exist");
+        Location dataFileLocation = Location.of(dataFile.getFilePath());
+        assertTrue(fileSystem.newInputFile(dataFileLocation).exists(), "The data file should exist");
+
         assertQuerySucceeds(format("DROP TABLE %s", tableName));
         assertFalse(metastore.getTable("tpch", tableName).isPresent(), "Table should be dropped");
-        assertFalse(fileSystem.newInputFile(new Path(dataFile.getFilePath()).toString()).exists(), "The data file should have been removed");
-        assertFalse(fileSystem.newInputFile(tableLocation.toString()).exists(), "The directory corresponding to the dropped Iceberg table should not be removed because it may be shared with other tables");
+        assertFalse(fileSystem.newInputFile(dataFileLocation).exists(), "The data file should have been removed");
+        assertFalse(fileSystem.newInputFile(tableLocation).exists(), "The directory corresponding to the dropped Iceberg table should not be removed because it may be shared with other tables");
     }
 
     @Test
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTableWithExternalLocation.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTableWithExternalLocation.java
index df21119e58b1..85f480efb0c0 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTableWithExternalLocation.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTableWithExternalLocation.java
@@ -13,16 +13,17 @@
  */
 package io.trino.plugin.iceberg;
 
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.plugin.hive.metastore.Table;
 import io.trino.plugin.hive.metastore.file.FileHiveMetastore;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.MaterializedResult;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.metastore.TableType;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,22 +31,26 @@
 
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.TableType.EXTERNAL_TABLE;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.plugin.iceberg.DataFileRecord.toDataFileRecord;
+import static io.trino.plugin.iceberg.IcebergTestUtils.getFileSystemFactory;
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestIcebergTableWithExternalLocation
         extends AbstractTestQueryFramework
 {
     private FileHiveMetastore metastore;
     private File metastoreDir;
+    private TrinoFileSystem fileSystem;
 
     @Override
     protected DistributedQueryRunner createQueryRunner()
@@ -59,7 +64,13 @@ protected DistributedQueryRunner createQueryRunner()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @BeforeAll
+    public void initFileSystem()
+    {
+        fileSystem = getFileSystemFactory(getDistributedQueryRunner()).create(SESSION);
+    }
+
+    @AfterAll
     public void tearDown()
             throws IOException
     {
@@ -77,18 +88,18 @@ public void testCreateAndDrop()
         assertQuerySucceeds(format("INSERT INTO %s VALUES (1), (2), (3)", tableName));
 
         Table table = metastore.getTable("tpch", tableName).orElseThrow();
-        assertThat(table.getTableType()).isEqualTo(TableType.EXTERNAL_TABLE.name());
-        Path tableLocation = new Path(table.getStorage().getLocation());
-        TrinoFileSystem fileSystem = HDFS_FILE_SYSTEM_FACTORY.create(SESSION);
-        assertTrue(fileSystem.newInputFile(tableLocation.toString()).exists(), "The directory corresponding to the table storage location should exist");
+        assertThat(table.getTableType()).isEqualTo(EXTERNAL_TABLE.name());
+        Location tableLocation = Location.of(table.getStorage().getLocation());
+        assertTrue(fileSystem.newInputFile(tableLocation).exists(), "The directory corresponding to the table storage location should exist");
         MaterializedResult materializedResult = computeActual("SELECT * FROM \"test_table_external_create_and_drop$files\"");
         assertEquals(materializedResult.getRowCount(), 1);
         DataFileRecord dataFile = toDataFileRecord(materializedResult.getMaterializedRows().get(0));
-        assertTrue(fileSystem.newInputFile(new Path(dataFile.getFilePath()).toString()).exists(), "The data file should exist");
+        Location dataFileLocation = Location.of(dataFile.getFilePath());
+        assertTrue(fileSystem.newInputFile(dataFileLocation).exists(), "The data file should exist");
 
         assertQuerySucceeds(format("DROP TABLE %s", tableName));
         assertThat(metastore.getTable("tpch", tableName)).as("Table should be dropped").isEmpty();
-        assertFalse(fileSystem.newInputFile(new Path(dataFile.getFilePath()).toString()).exists(), "The data file should have been removed");
-        assertFalse(fileSystem.newInputFile(tableLocation.toString()).exists(), "The directory corresponding to the dropped Iceberg table should be removed as we don't allow shared locations.");
+        assertFalse(fileSystem.newInputFile(dataFileLocation).exists(), "The data file should have been removed");
+        assertFalse(fileSystem.newInputFile(tableLocation).exists(), "The directory corresponding to the dropped Iceberg table should be removed as we don't allow shared locations.");
     }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergUtil.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergUtil.java
index 88a601d75192..d9078a581c42 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergUtil.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergUtil.java
@@ -13,9 +13,7 @@
  */
 package io.trino.plugin.iceberg;
 
-import org.testng.annotations.Test;
-
-import java.util.OptionalInt;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.iceberg.IcebergUtil.parseVersion;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -26,22 +24,36 @@ public class TestIcebergUtil
     @Test
     public void testParseVersion()
     {
-        assertEquals(parseVersion("hdfs://hadoop-master:9000/user/hive/warehouse/orders_5-581fad8517934af6be1857a903559d44/metadata/00000-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"), OptionalInt.of(0));
-        assertEquals(parseVersion("hdfs://hadoop-master:9000/user/hive/warehouse/orders_5-581fad8517934af6be1857a903559d44/metadata/99999-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"), OptionalInt.of(99999));
-        assertEquals(parseVersion("s3://krvikash-test/test_icerberg_util/orders_93p93eniuw-30fa27a68c734c2bafac881e905351a9/metadata/00010-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"), OptionalInt.of(10));
-        assertEquals(parseVersion("/var/test/test_icerberg_util/orders_93p93eniuw-30fa27a68c734c2bafac881e905351a9/metadata/00011-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"), OptionalInt.of(11));
+        assertEquals(parseVersion("00000-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"), 0);
+        assertEquals(parseVersion("99999-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"), 99999);
+        assertEquals(parseVersion("00010-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"), 10);
+        assertEquals(parseVersion("00011-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"), 11);
+        assertEquals(parseVersion("v0.metadata.json"), 0);
+        assertEquals(parseVersion("v10.metadata.json"), 10);
+        assertEquals(parseVersion("v99999.metadata.json"), 99999);
+        assertEquals(parseVersion("v0.gz.metadata.json"), 0);
+        assertEquals(parseVersion("v0.metadata.json.gz"), 0);
 
-        assertThatThrownBy(() -> parseVersion("00010-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"))
-                .hasMessageMatching(".*Invalid metadata location: .*");
-        assertThatThrownBy(() -> parseVersion("hdfs://hadoop-master:9000/user/hive/warehouse/orders_5_581fad8517934af6be1857a903559d44"))
-                .hasMessageMatching(".*Invalid metadata location: .*");
-        assertThatThrownBy(() -> parseVersion("hdfs://hadoop-master:9000/user/hive/warehouse/orders_5-581fad8517934af6be1857a903559d44/metadata"))
-                .hasMessageMatching(".*Invalid metadata location:.*");
-        assertThatThrownBy(() -> parseVersion("s3://krvikash-test/test_icerberg_util/orders_93p93eniuw-30fa27a68c734c2bafac881e905351a9/metadata/00010_409702ba_4735_4645_8f14_09537cc0b2c8.metadata.json"))
-                .hasMessageMatching(".*Invalid metadata location:.*");
-        assertThatThrownBy(() -> parseVersion("orders_5_581fad8517934af6be1857a903559d44")).hasMessageMatching(".*Invalid metadata location:.*");
+        assertThatThrownBy(() -> parseVersion("hdfs://hadoop-master:9000/user/hive/warehouse/orders_5-581fad8517934af6be1857a903559d44/metadata/00000-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"))
+                .hasMessageMatching("Not a file name: .*");
+        assertThatThrownBy(() -> parseVersion("orders_5_581fad8517934af6be1857a903559d44"))
+                .hasMessageMatching("Invalid metadata file name: .*");
+        assertThatThrownBy(() -> parseVersion("metadata"))
+                .hasMessageMatching("Invalid metadata file name:.*");
+        assertThatThrownBy(() -> parseVersion("00010_409702ba_4735_4645_8f14_09537cc0b2c8.metadata.json"))
+                .hasMessageMatching("Invalid metadata file name:.*");
+        assertThatThrownBy(() -> parseVersion("v10_metadata_json"))
+                .hasMessageMatching("Invalid metadata file name:.*");
+        assertThatThrownBy(() -> parseVersion("v1..gz.metadata.json"))
+                .hasMessageMatching("Invalid metadata file name:.*");
+        assertThatThrownBy(() -> parseVersion("v1.metadata.json.gz."))
+                .hasMessageMatching("Invalid metadata file name:.*");
 
-        assertEquals(parseVersion("hdfs://hadoop-master:9000/user/hive/warehouse/orders_5-581fad8517934af6be1857a903559d44/metadata/00003_409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"), OptionalInt.empty());
-        assertEquals(parseVersion("/var/test/test_icerberg_util/orders_93p93eniuw-30fa27a68c734c2bafac881e905351a9/metadata/-00010-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"), OptionalInt.empty());
+        assertThatThrownBy(() -> parseVersion("00003_409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"))
+                .hasMessageMatching("Invalid metadata file name:.*");
+        assertThatThrownBy(() -> parseVersion("-00010-409702ba-4735-4645-8f14-09537cc0b2c8.metadata.json"))
+                .hasMessageMatching("Invalid metadata file name:.*");
+        assertThatThrownBy(() -> parseVersion("v-10.metadata.json"))
+                .hasMessageMatching("Invalid metadata file name:.*");
     }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergV2.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergV2.java
index 8616b6356c50..a1f032aa82d3 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergV2.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergV2.java
@@ -16,10 +16,10 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
-import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
+import io.trino.plugin.base.util.Closables;
+import io.trino.plugin.blackhole.BlackHolePlugin;
 import io.trino.plugin.hive.TrinoViewHiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.cache.CachingHiveMetastore;
@@ -37,6 +37,7 @@
 import io.trino.spi.type.TestingTypeManager;
 import io.trino.spi.type.TypeManager;
 import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.TestTable;
 import org.apache.hadoop.fs.Path;
@@ -58,29 +59,38 @@
 import org.apache.iceberg.deletes.EqualityDeleteWriter;
 import org.apache.iceberg.deletes.PositionDelete;
 import org.apache.iceberg.deletes.PositionDeleteWriter;
+import org.apache.iceberg.io.FileIO;
 import org.apache.iceberg.parquet.Parquet;
-import org.assertj.core.api.Assertions;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.apache.iceberg.types.Types;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.file.Files;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
+import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.plugin.hive.metastore.cache.CachingHiveMetastore.memoizeMetastore;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.iceberg.IcebergTestUtils.getFileSystemFactory;
 import static io.trino.plugin.iceberg.IcebergUtil.loadIcebergTable;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.testing.TestingConnectorSession.SESSION;
@@ -89,19 +99,24 @@
 import static java.lang.String.format;
 import static java.nio.ByteOrder.LITTLE_ENDIAN;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.concurrent.Executors.newFixedThreadPool;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.iceberg.FileFormat.ORC;
 import static org.apache.iceberg.TableProperties.SPLIT_SIZE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestIcebergV2
         extends AbstractTestQueryFramework
 {
     private HiveMetastore metastore;
     private java.nio.file.Path tempDir;
     private File metastoreDir;
+    private TrinoFileSystemFactory fileSystemFactory;
 
     @Override
     protected QueryRunner createQueryRunner()
@@ -111,13 +126,30 @@ protected QueryRunner createQueryRunner()
         metastoreDir = tempDir.resolve("iceberg_data").toFile();
         metastore = createTestingFileHiveMetastore(metastoreDir);
 
-        return IcebergQueryRunner.builder()
+        DistributedQueryRunner queryRunner = IcebergQueryRunner.builder()
                 .setInitialTables(NATION)
                 .setMetastoreDirectory(metastoreDir)
                 .build();
+
+        try {
+            queryRunner.installPlugin(new BlackHolePlugin());
+            queryRunner.createCatalog("blackhole", "blackhole");
+        }
+        catch (RuntimeException e) {
+            Closables.closeAllSuppress(e, queryRunner);
+            throw e;
+        }
+
+        return queryRunner;
+    }
+
+    @BeforeAll
+    public void initFileSystemFactory()
+    {
+        fileSystemFactory = getFileSystemFactory(getDistributedQueryRunner());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws IOException
     {
@@ -150,7 +182,7 @@ public void testDefaultFormatVersion()
     public void testV2TableRead()
     {
         String tableName = "test_v2_table_read" + randomNameSuffix();
-        assertUpdate("CREATE TABLE " + tableName + " AS SELECT * FROM tpch.tiny.nation", 25);
+        assertUpdate("CREATE TABLE " + tableName + " WITH (format_version = 1) AS SELECT * FROM tpch.tiny.nation", 25);
         updateTableToV2(tableName);
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation");
     }
@@ -161,16 +193,16 @@ public void testV2TableWithPositionDelete()
     {
         String tableName = "test_v2_row_delete" + randomNameSuffix();
         assertUpdate("CREATE TABLE " + tableName + " AS SELECT * FROM tpch.tiny.nation", 25);
-        Table icebergTable = updateTableToV2(tableName);
+        Table icebergTable = loadTable(tableName);
 
         String dataFilePath = (String) computeActual("SELECT file_path FROM \"" + tableName + "$files\" LIMIT 1").getOnlyValue();
 
         Path metadataDir = new Path(metastoreDir.toURI());
         String deleteFileName = "delete_file_" + UUID.randomUUID();
-        TrinoFileSystem fs = HDFS_FILE_SYSTEM_FACTORY.create(SESSION);
+        FileIO fileIo = new ForwardingFileIo(fileSystemFactory.create(SESSION));
 
         Path path = new Path(metadataDir, deleteFileName);
-        PositionDeleteWriter<Record> writer = Parquet.writeDeletes(new ForwardingFileIo(fs).newOutputFile(path.toString()))
+        PositionDeleteWriter<Record> writer = Parquet.writeDeletes(fileIo.newOutputFile(path.toString()))
                 .createWriterFunc(GenericParquetWriter::buildWriter)
                 .forTable(icebergTable)
                 .overwrite()
@@ -194,7 +226,7 @@ public void testV2TableWithEqualityDelete()
     {
         String tableName = "test_v2_equality_delete" + randomNameSuffix();
         assertUpdate("CREATE TABLE " + tableName + " AS SELECT * FROM tpch.tiny.nation", 25);
-        Table icebergTable = updateTableToV2(tableName);
+        Table icebergTable = loadTable(tableName);
         writeEqualityDeleteToNationTable(icebergTable, Optional.of(icebergTable.spec()), Optional.of(new PartitionData(new Long[]{1L})));
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE regionkey != 1");
         // nationkey is before the equality delete column in the table schema, comment is after
@@ -208,7 +240,7 @@ public void testV2TableWithEqualityDeleteDifferentColumnOrder()
         // Specify equality delete filter with different column order from table definition
         String tableName = "test_v2_equality_delete_different_order" + randomNameSuffix();
         assertUpdate("CREATE TABLE " + tableName + " AS SELECT * FROM tpch.tiny.nation", 25);
-        Table icebergTable = updateTableToV2(tableName);
+        Table icebergTable = loadTable(tableName);
         writeEqualityDeleteToNationTable(icebergTable, Optional.of(icebergTable.spec()), Optional.empty(), ImmutableMap.of("regionkey", 1L, "name", "ARGENTINA"));
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE name != 'ARGENTINA'");
         // nationkey is before the equality delete column in the table schema, comment is after
@@ -223,7 +255,7 @@ public void testV2TableWithEqualityDeleteWhenColumnIsNested()
         assertUpdate("CREATE TABLE " + tableName + " AS " +
                 "SELECT regionkey, ARRAY[1,2] array_column, MAP(ARRAY[1], ARRAY[2]) map_column, " +
                 "CAST(ROW(1, 2e0) AS ROW(x BIGINT, y DOUBLE)) row_column FROM tpch.tiny.nation", 25);
-        Table icebergTable = updateTableToV2(tableName);
+        Table icebergTable = loadTable(tableName);
         writeEqualityDeleteToNationTable(icebergTable, Optional.of(icebergTable.spec()), Optional.of(new PartitionData(new Long[]{1L})));
         assertQuery("SELECT array_column[1], map_column[1], row_column.x FROM " + tableName, "SELECT 1, 2, 1 FROM nation WHERE regionkey != 1");
     }
@@ -234,17 +266,17 @@ public void testOptimizingV2TableRemovesEqualityDeletesWhenWholeTableIsScanned()
     {
         String tableName = "test_optimize_table_cleans_equality_delete_file_when_whole_table_is_scanned" + randomNameSuffix();
         assertUpdate("CREATE TABLE " + tableName + " WITH (partitioning = ARRAY['regionkey']) AS SELECT * FROM tpch.tiny.nation", 25);
-        Table icebergTable = updateTableToV2(tableName);
-        Assertions.assertThat(icebergTable.currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
+        Table icebergTable = loadTable(tableName);
+        assertThat(icebergTable.currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
         writeEqualityDeleteToNationTable(icebergTable, Optional.of(icebergTable.spec()), Optional.of(new PartitionData(new Long[]{1L})));
         List<String> initialActiveFiles = getActiveFiles(tableName);
         query("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE regionkey != 1");
         // nationkey is before the equality delete column in the table schema, comment is after
         assertQuery("SELECT nationkey, comment FROM " + tableName, "SELECT nationkey, comment FROM nation WHERE regionkey != 1");
-        Assertions.assertThat(loadTable(tableName).currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
+        assertThat(loadTable(tableName).currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
         List<String> updatedFiles = getActiveFiles(tableName);
-        Assertions.assertThat(updatedFiles).doesNotContain(initialActiveFiles.toArray(new String[0]));
+        assertThat(updatedFiles).doesNotContain(initialActiveFiles.toArray(new String[0]));
     }
 
     @Test
@@ -253,17 +285,17 @@ public void testOptimizingV2TableDoesntRemoveEqualityDeletesWhenOnlyPartOfTheTab
     {
         String tableName = "test_optimize_table_with_equality_delete_file_for_different_partition_" + randomNameSuffix();
         assertUpdate("CREATE TABLE " + tableName + " WITH (partitioning = ARRAY['regionkey']) AS SELECT * FROM tpch.tiny.nation", 25);
-        Table icebergTable = updateTableToV2(tableName);
-        Assertions.assertThat(icebergTable.currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
+        Table icebergTable = loadTable(tableName);
+        assertThat(icebergTable.currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
         List<String> initialActiveFiles = getActiveFiles(tableName);
         writeEqualityDeleteToNationTable(icebergTable, Optional.of(icebergTable.spec()), Optional.of(new PartitionData(new Long[]{1L})));
         query("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE WHERE regionkey != 1");
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE regionkey != 1");
         // nationkey is before the equality delete column in the table schema, comment is after
         assertQuery("SELECT nationkey, comment FROM " + tableName, "SELECT nationkey, comment FROM nation WHERE regionkey != 1");
-        Assertions.assertThat(loadTable(tableName).currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("1");
+        assertThat(loadTable(tableName).currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("1");
         List<String> updatedFiles = getActiveFiles(tableName);
-        Assertions.assertThat(updatedFiles).doesNotContain(initialActiveFiles.stream().filter(path -> !path.contains("regionkey=1")).toArray(String[]::new));
+        assertThat(updatedFiles).doesNotContain(initialActiveFiles.stream().filter(path -> !path.contains("regionkey=1")).toArray(String[]::new));
     }
 
     @Test
@@ -276,7 +308,130 @@ public void testSelectivelyOptimizingLeavesEqualityDeletes()
         writeEqualityDeleteToNationTable(icebergTable, Optional.of(icebergTable.spec()), Optional.of(new PartitionData(new Long[]{1L})));
         query("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE WHERE nationkey < 5");
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE regionkey != 1 OR nationkey != 1");
-        Assertions.assertThat(loadTable(tableName).currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("1");
+        assertThat(loadTable(tableName).currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("1");
+    }
+
+    @Test
+    public void testMultipleEqualityDeletes()
+            throws Exception
+    {
+        String tableName = "test_multiple_equality_deletes_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT * FROM tpch.tiny.nation", 25);
+        Table icebergTable = loadTable(tableName);
+        assertThat(icebergTable.currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
+
+        for (int i = 1; i < 3; i++) {
+            writeEqualityDeleteToNationTable(
+                    icebergTable,
+                    Optional.empty(),
+                    Optional.empty(),
+                    ImmutableMap.of("regionkey", Integer.toUnsignedLong(i)));
+        }
+
+        assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE  (regionkey != 1L AND regionkey != 2L)");
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testMultipleEqualityDeletesWithEquivalentSchemas()
+            throws Exception
+    {
+        String tableName = "test_multiple_equality_deletes_equivalent_schemas_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT * FROM tpch.tiny.nation", 25);
+        Table icebergTable = loadTable(tableName);
+        assertThat(icebergTable.currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
+        Schema deleteRowSchema = new Schema(ImmutableList.of("regionkey", "name").stream()
+                .map(name -> icebergTable.schema().findField(name))
+                .collect(toImmutableList()));
+        List<Integer> equalityFieldIds = ImmutableList.of("regionkey", "name").stream()
+                .map(name -> deleteRowSchema.findField(name).fieldId())
+                .collect(toImmutableList());
+        writeEqualityDeleteToNationTableWithDeleteColumns(
+                icebergTable,
+                Optional.empty(),
+                Optional.empty(),
+                ImmutableMap.of("regionkey", 1L, "name", "BRAZIL"),
+                deleteRowSchema,
+                equalityFieldIds);
+        Schema equivalentDeleteRowSchema = new Schema(ImmutableList.of("name", "regionkey").stream()
+                .map(name -> icebergTable.schema().findField(name))
+                .collect(toImmutableList()));
+        writeEqualityDeleteToNationTableWithDeleteColumns(
+                icebergTable,
+                Optional.empty(),
+                Optional.empty(),
+                ImmutableMap.of("name", "INDIA", "regionkey", 2L),
+                equivalentDeleteRowSchema,
+                equalityFieldIds);
+
+        assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE NOT ((regionkey = 1 AND name = 'BRAZIL') OR (regionkey = 2 AND name = 'INDIA'))");
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testMultipleEqualityDeletesWithDifferentSchemas()
+            throws Exception
+    {
+        String tableName = "test_multiple_equality_deletes_different_schemas_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT * FROM tpch.tiny.nation", 25);
+        Table icebergTable = loadTable(tableName);
+        assertThat(icebergTable.currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
+        writeEqualityDeleteToNationTableWithDeleteColumns(
+                icebergTable,
+                Optional.empty(),
+                Optional.empty(),
+                ImmutableMap.of("regionkey", 1L, "name", "BRAZIL"),
+                Optional.of(ImmutableList.of("regionkey", "name")));
+        writeEqualityDeleteToNationTableWithDeleteColumns(
+                icebergTable,
+                Optional.empty(),
+                Optional.empty(),
+                ImmutableMap.of("name", "ALGERIA"),
+                Optional.of(ImmutableList.of("name")));
+        writeEqualityDeleteToNationTableWithDeleteColumns(
+                icebergTable,
+                Optional.empty(),
+                Optional.empty(),
+                ImmutableMap.of("regionkey", 2L),
+                Optional.of(ImmutableList.of("regionkey")));
+
+        assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE NOT ((regionkey = 1 AND name = 'BRAZIL') OR regionkey = 2 OR name = 'ALGERIA')");
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testMultipleEqualityDeletesWithNestedFields()
+            throws Exception
+    {
+        String tableName = "test_multiple_equality_deletes_nested_fields_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " ( id BIGINT, root ROW(nested BIGINT, nested_other BIGINT))");
+        assertUpdate("INSERT INTO " + tableName + " VALUES (1, row(10, 100))", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (2, row(20, 200))", 1);
+        assertUpdate("INSERT INTO " + tableName + " VALUES (2, row(20, 200))", 1);
+        Table icebergTable = loadTable(tableName);
+        assertThat(icebergTable.currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
+
+        List<String> deleteFileColumns = ImmutableList.of("root.nested");
+        Schema deleteRowSchema = icebergTable.schema().select(deleteFileColumns);
+        List<Integer> equalityFieldIds = ImmutableList.of("root.nested").stream()
+                .map(name -> deleteRowSchema.findField(name).fieldId())
+                .collect(toImmutableList());
+        Types.StructType nestedStructType = (Types.StructType) deleteRowSchema.findField("root").type();
+        Record nestedStruct = GenericRecord.create(nestedStructType);
+        nestedStruct.setField("nested", 20L);
+        for (int i = 1; i < 3; i++) {
+            writeEqualityDeleteToNationTableWithDeleteColumns(
+                    icebergTable,
+                    Optional.empty(),
+                    Optional.empty(),
+                    ImmutableMap.of("root", nestedStruct),
+                    deleteRowSchema,
+                    equalityFieldIds);
+        }
+
+        // TODO: support read equality deletes with nested fields(https://github.com/trinodb/trino/issues/18625)
+        assertThatThrownBy(() -> query("SELECT * FROM " + tableName)).hasMessageContaining("Multiple entries with same key");
+        assertUpdate("DROP TABLE " + tableName);
     }
 
     @Test
@@ -289,7 +444,7 @@ public void testOptimizingWholeTableRemovesEqualityDeletes()
         writeEqualityDeleteToNationTable(icebergTable, Optional.of(icebergTable.spec()), Optional.of(new PartitionData(new Long[]{1L})));
         query("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE regionkey != 1 OR nationkey != 1");
-        Assertions.assertThat(loadTable(tableName).currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
+        assertThat(loadTable(tableName).currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
     }
 
     @Test
@@ -298,17 +453,17 @@ public void testOptimizingV2TableWithEmptyPartitionSpec()
     {
         String tableName = "test_optimize_table_with_global_equality_delete_file_" + randomNameSuffix();
         assertUpdate("CREATE TABLE " + tableName + " AS SELECT * FROM tpch.tiny.nation", 25);
-        Table icebergTable = updateTableToV2(tableName);
-        Assertions.assertThat(icebergTable.currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
+        Table icebergTable = loadTable(tableName);
+        assertThat(icebergTable.currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
         writeEqualityDeleteToNationTable(icebergTable);
         List<String> initialActiveFiles = getActiveFiles(tableName);
         query("ALTER TABLE " + tableName + " EXECUTE OPTIMIZE");
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE regionkey != 1");
         // nationkey is before the equality delete column in the table schema, comment is after
         assertQuery("SELECT nationkey, comment FROM " + tableName, "SELECT nationkey, comment FROM nation WHERE regionkey != 1");
-        Assertions.assertThat(loadTable(tableName).currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
+        assertThat(loadTable(tableName).currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
         List<String> updatedFiles = getActiveFiles(tableName);
-        Assertions.assertThat(updatedFiles).doesNotContain(initialActiveFiles.toArray(new String[0]));
+        assertThat(updatedFiles).doesNotContain(initialActiveFiles.toArray(new String[0]));
     }
 
     @Test
@@ -317,8 +472,8 @@ public void testOptimizingPartitionsOfV2TableWithGlobalEqualityDeleteFile()
     {
         String tableName = "test_optimize_partitioned_table_with_global_equality_delete_file_" + randomNameSuffix();
         assertUpdate("CREATE TABLE " + tableName + " WITH (partitioning = ARRAY['regionkey']) AS SELECT * FROM tpch.tiny.nation", 25);
-        Table icebergTable = updateTableToV2(tableName);
-        Assertions.assertThat(icebergTable.currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
+        Table icebergTable = loadTable(tableName);
+        assertThat(icebergTable.currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("0");
         writeEqualityDeleteToNationTable(icebergTable, Optional.of(icebergTable.spec()), Optional.of(new PartitionData(new Long[]{1L})));
         List<String> initialActiveFiles = getActiveFiles(tableName);
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE regionkey != 1");
@@ -326,14 +481,106 @@ public void testOptimizingPartitionsOfV2TableWithGlobalEqualityDeleteFile()
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE regionkey != 1");
         // nationkey is before the equality delete column in the table schema, comment is after
         assertQuery("SELECT nationkey, comment FROM " + tableName, "SELECT nationkey, comment FROM nation WHERE regionkey != 1");
-        Assertions.assertThat(loadTable(tableName).currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("1");
+        assertThat(loadTable(tableName).currentSnapshot().summary().get("total-equality-deletes")).isEqualTo("1");
         List<String> updatedFiles = getActiveFiles(tableName);
-        Assertions.assertThat(updatedFiles)
+        assertThat(updatedFiles)
                 .doesNotContain(initialActiveFiles.stream()
                                 .filter(path -> !path.contains("regionkey=1"))
                                 .toArray(String[]::new));
     }
 
+    @Test
+    public void testOptimizeDuringWriteOperations()
+            throws Exception
+    {
+        runOptimizeDuringWriteOperations(true);
+        runOptimizeDuringWriteOperations(false);
+    }
+
+    private void runOptimizeDuringWriteOperations(boolean useSmallFiles)
+            throws Exception
+    {
+        int threads = 5;
+        int deletionThreads = threads - 1;
+        int rows = 12;
+        int rowsPerThread = rows / deletionThreads;
+
+        CyclicBarrier barrier = new CyclicBarrier(threads);
+        ExecutorService executor = newFixedThreadPool(threads);
+
+        // Slow down the delete operations so optimize is more likely to complete
+        String blackholeTable = "blackhole_table_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE blackhole.default.%s (a INT, b INT) WITH (split_count = 1, pages_per_split = 1, rows_per_page = 1, page_processing_delay = '3s')".formatted(blackholeTable));
+
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_optimize_during_write_operations",
+                "(int_col INT)")) {
+            String tableName = table.getName();
+
+            // Testing both situations where a file is fully removed by the delete operation and when a row level delete is required.
+            if (useSmallFiles) {
+                for (int i = 0; i < rows; i++) {
+                    assertUpdate(format("INSERT INTO %s VALUES %s", tableName, i), 1);
+                }
+            }
+            else {
+                String values = IntStream.range(0, rows).mapToObj(String::valueOf).collect(Collectors.joining(", "));
+                assertUpdate(format("INSERT INTO %s VALUES %s", tableName, values), rows);
+            }
+
+            List<Future<List<Boolean>>> deletionFutures = IntStream.range(0, deletionThreads)
+                    .mapToObj(threadNumber -> executor.submit(() -> {
+                        barrier.await(10, SECONDS);
+                        List<Boolean> successfulDeletes = new ArrayList<>();
+                        for (int i = 0; i < rowsPerThread; i++) {
+                            try {
+                                int rowNumber = threadNumber * rowsPerThread + i;
+                                getQueryRunner().execute(format("DELETE FROM %s WHERE int_col = %s OR ((SELECT count(*) FROM blackhole.default.%s) > 42)", tableName, rowNumber, blackholeTable));
+                                successfulDeletes.add(true);
+                            }
+                            catch (RuntimeException e) {
+                                successfulDeletes.add(false);
+                            }
+                        }
+                        return successfulDeletes;
+                    }))
+                    .collect(toImmutableList());
+
+            Future<?> optimizeFuture = executor.submit(() -> {
+                try {
+                    barrier.await(10, SECONDS);
+                    // Allow for some deletes to start before running optimize
+                    Thread.sleep(50);
+                    assertUpdate("ALTER TABLE %s EXECUTE optimize".formatted(tableName));
+                }
+                catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
+
+            List<String> expectedValues = new ArrayList<>();
+            for (int threadNumber = 0; threadNumber < deletionThreads; threadNumber++) {
+                List<Boolean> deleteOutcomes = deletionFutures.get(threadNumber).get();
+                verify(deleteOutcomes.size() == rowsPerThread);
+                for (int rowNumber = 0; rowNumber < rowsPerThread; rowNumber++) {
+                    boolean successfulDelete = deleteOutcomes.get(rowNumber);
+                    if (!successfulDelete) {
+                        expectedValues.add(String.valueOf(threadNumber * rowsPerThread + rowNumber));
+                    }
+                }
+            }
+
+            optimizeFuture.get();
+            assertThat(expectedValues.size()).isGreaterThan(0).isLessThan(rows);
+            assertQuery("SELECT * FROM " + tableName, "VALUES " + String.join(", ", expectedValues));
+        }
+        finally {
+            executor.shutdownNow();
+            executor.awaitTermination(10, SECONDS);
+        }
+    }
+
     @Test
     public void testUpgradeTableToV2FromTrino()
     {
@@ -411,7 +658,7 @@ public void testUnsettingAllTableProperties()
         assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES format_version = DEFAULT, format = DEFAULT, partitioning = DEFAULT, sorted_by = DEFAULT");
         table = loadTable(tableName);
         assertEquals(table.operations().current().formatVersion(), 2);
-        assertTrue(table.properties().get(TableProperties.DEFAULT_FILE_FORMAT).equalsIgnoreCase("ORC"));
+        assertTrue(table.properties().get(TableProperties.DEFAULT_FILE_FORMAT).equalsIgnoreCase("PARQUET"));
         assertTrue(table.spec().isUnpartitioned());
         assertTrue(table.sortOrder().isUnsorted());
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation");
@@ -428,7 +675,7 @@ public void testDeletingEntireFile()
         assertThat(this.loadTable(tableName).newScan().planFiles()).hasSize(2);
         assertUpdate("DELETE FROM " + tableName + " WHERE regionkey <= 2", "SELECT count(*) FROM nation WHERE regionkey <= 2");
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE regionkey > 2");
-        assertThat(this.loadTable(tableName).newScan().planFiles()).hasSize(1);
+        assertThat(this.loadTable(tableName).newScan().planFiles()).hasSize(2);
     }
 
     @Test
@@ -442,7 +689,7 @@ public void testDeletingEntireFileFromPartitionedTable()
         assertThat(this.loadTable(tableName).newScan().planFiles()).hasSize(4);
         assertUpdate("DELETE FROM " + tableName + " WHERE b % 2 = 0", 6);
         assertQuery("SELECT * FROM " + tableName, "VALUES (1, 1), (1, 3), (1, 5), (2, 1), (2, 3), (2, 5)");
-        assertThat(this.loadTable(tableName).newScan().planFiles()).hasSize(2);
+        assertThat(this.loadTable(tableName).newScan().planFiles()).hasSize(4);
     }
 
     @Test
@@ -456,7 +703,7 @@ public void testDeletingEntireFileWithNonTupleDomainConstraint()
         assertThat(this.loadTable(tableName).newScan().planFiles()).hasSize(2);
         assertUpdate("DELETE FROM " + tableName + " WHERE regionkey % 2 = 1", "SELECT count(*) FROM nation WHERE regionkey % 2 = 1");
         assertQuery("SELECT * FROM " + tableName, "SELECT * FROM nation WHERE regionkey % 2 = 0");
-        assertThat(this.loadTable(tableName).newScan().planFiles()).hasSize(1);
+        assertThat(this.loadTable(tableName).newScan().planFiles()).hasSize(2);
     }
 
     @Test
@@ -476,7 +723,7 @@ public void testDeletingEntireFileWithMultipleSplits()
         long parentSnapshotId = (long) computeScalar("SELECT parent_id FROM \"" + tableName + "$snapshots\" ORDER BY committed_at DESC FETCH FIRST 1 ROW WITH TIES");
         assertEquals(initialSnapshotId, parentSnapshotId);
         assertThat(query("SELECT * FROM " + tableName)).returnsEmptyResult();
-        assertThat(this.loadTable(tableName).newScan().planFiles()).hasSize(0);
+        assertThat(this.loadTable(tableName).newScan().planFiles()).hasSize(1);
     }
 
     @Test
@@ -558,12 +805,12 @@ public void testFilesTable()
                 """
                                VALUES
                                        (0,
-                                        'ORC',
+                                        'PARQUET',
                                         25L,
-                                        null,
+                                        JSON '{"1":141,"2":220,"3":99,"4":807}',
                                         JSON '{"1":25,"2":25,"3":25,"4":25}',
-                                        JSON '{"1":0,"2":0,"3":0,"4":0}',
-                                        null,
+                                        jSON '{"1":0,"2":0,"3":0,"4":0}',
+                                        jSON '{}',
                                         JSON '{"1":"0","2":"ALGERIA","3":"0","4":" haggle. careful"}',
                                         JSON '{"1":"24","2":"VIETNAM","3":"4","4":"y final packaget"}',
                                         null,
@@ -664,6 +911,36 @@ public void testSnapshotReferenceSystemTable()
                         "('main', 'BRANCH', " + snapshotId3 + ", null, null, null)");
     }
 
+    @Test
+    public void testReadingSnapshotReference()
+    {
+        String tableName = "test_reading_snapshot_reference" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " WITH (partitioning = ARRAY['regionkey']) AS SELECT * FROM tpch.tiny.nation", 25);
+        Table icebergTable = loadTable(tableName);
+        long refSnapshotId = icebergTable.currentSnapshot().snapshotId();
+        icebergTable.manageSnapshots()
+                .createTag("test-tag", refSnapshotId)
+                .createBranch("test-branch", refSnapshotId)
+                .commit();
+        assertQuery("SELECT * FROM \"" + tableName + "$refs\"",
+                "VALUES ('test-tag', 'TAG', " + refSnapshotId + ", null, null, null)," +
+                        "('test-branch', 'BRANCH', " + refSnapshotId + ", null, null, null)," +
+                        "('main', 'BRANCH', " + refSnapshotId + ", null, null, null)");
+
+        assertUpdate("INSERT INTO " + tableName + " SELECT * FROM tpch.tiny.nation LIMIT 5", 5);
+        assertQuery("SELECT * FROM " + tableName + " FOR VERSION AS OF " + refSnapshotId,
+                "SELECT * FROM nation");
+        assertQuery("SELECT * FROM " + tableName + " FOR VERSION AS OF 'test-tag'",
+                "SELECT * FROM nation");
+        assertQuery("SELECT * FROM " + tableName + " FOR VERSION AS OF 'test-branch'",
+                "SELECT * FROM nation");
+
+        assertQueryFails("SELECT * FROM " + tableName + " FOR VERSION AS OF 'test-wrong-ref'",
+                ".*?Cannot find snapshot with reference name: test-wrong-ref");
+        assertQueryFails("SELECT * FROM " + tableName + " FOR VERSION AS OF 'TEST-TAG'",
+                ".*?Cannot find snapshot with reference name: TEST-TAG");
+    }
+
     private void writeEqualityDeleteToNationTable(Table icebergTable)
             throws Exception
     {
@@ -676,22 +953,50 @@ private void writeEqualityDeleteToNationTable(Table icebergTable, Optional<Parti
         writeEqualityDeleteToNationTable(icebergTable, partitionSpec, partitionData, ImmutableMap.of("regionkey", 1L));
     }
 
-    private void writeEqualityDeleteToNationTable(Table icebergTable, Optional<PartitionSpec> partitionSpec, Optional<PartitionData> partitionData, Map<String, Object> overwriteValues)
+    private void writeEqualityDeleteToNationTable(
+            Table icebergTable,
+            Optional<PartitionSpec> partitionSpec,
+            Optional<PartitionData> partitionData,
+            Map<String, Object> overwriteValues)
             throws Exception
     {
-        Path metadataDir = new Path(metastoreDir.toURI());
-        String deleteFileName = "delete_file_" + UUID.randomUUID();
-        TrinoFileSystem fs = HDFS_FILE_SYSTEM_FACTORY.create(SESSION);
+        writeEqualityDeleteToNationTableWithDeleteColumns(icebergTable, partitionSpec, partitionData, overwriteValues, Optional.empty());
+    }
 
-        Schema deleteRowSchema = icebergTable.schema().select(overwriteValues.keySet());
-        List<Integer> equalityFieldIds = overwriteValues.keySet().stream()
+    private void writeEqualityDeleteToNationTableWithDeleteColumns(
+            Table icebergTable,
+            Optional<PartitionSpec> partitionSpec,
+            Optional<PartitionData> partitionData,
+            Map<String, Object> overwriteValues,
+            Optional<List<String>> deleteFileColumns)
+            throws Exception
+    {
+        List<String> deleteColumns = deleteFileColumns.orElse(new ArrayList<>(overwriteValues.keySet()));
+        Schema deleteRowSchema = icebergTable.schema().select(deleteColumns);
+        List<Integer> equalityDeleteFieldIds = deleteColumns.stream()
                 .map(name -> deleteRowSchema.findField(name).fieldId())
                 .collect(toImmutableList());
-        Parquet.DeleteWriteBuilder writerBuilder = Parquet.writeDeletes(new ForwardingFileIo(fs).newOutputFile(new Path(metadataDir, deleteFileName).toString()))
+       writeEqualityDeleteToNationTableWithDeleteColumns(icebergTable, partitionSpec, partitionData, overwriteValues, deleteRowSchema, equalityDeleteFieldIds);
+    }
+
+    private void writeEqualityDeleteToNationTableWithDeleteColumns(
+            Table icebergTable,
+            Optional<PartitionSpec> partitionSpec,
+            Optional<PartitionData> partitionData,
+            Map<String, Object> overwriteValues,
+            Schema deleteRowSchema,
+            List<Integer> equalityDeleteFieldIds)
+            throws Exception
+    {
+        Path metadataDir = new Path(metastoreDir.toURI());
+        String deleteFileName = "delete_file_" + UUID.randomUUID();
+        FileIO fileIo = new ForwardingFileIo(fileSystemFactory.create(SESSION));
+
+        Parquet.DeleteWriteBuilder writerBuilder = Parquet.writeDeletes(fileIo.newOutputFile(new Path(metadataDir, deleteFileName).toString()))
                 .forTable(icebergTable)
                 .rowSchema(deleteRowSchema)
                 .createWriterFunc(GenericParquetWriter::buildWriter)
-                .equalityFieldIds(equalityFieldIds)
+                .equalityFieldIds(equalityDeleteFieldIds)
                 .overwrite();
         if (partitionSpec.isPresent() && partitionData.isPresent()) {
             writerBuilder = writerBuilder
@@ -720,7 +1025,6 @@ private Table updateTableToV2(String tableName)
 
     private BaseTable loadTable(String tableName)
     {
-        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(HDFS_ENVIRONMENT);
         IcebergTableOperationsProvider tableOperationsProvider = new FileMetastoreTableOperationsProvider(fileSystemFactory);
         CachingHiveMetastore cachingHiveMetastore = memoizeMetastore(metastore, 1000);
         TrinoCatalog catalog = new TrinoHiveCatalog(
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestMetadataQueryOptimization.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestMetadataQueryOptimization.java
index b74e0cfad23a..6f1365a36790 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestMetadataQueryOptimization.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestMetadataQueryOptimization.java
@@ -24,8 +24,8 @@
 import io.trino.sql.planner.assertions.BasePushdownPlanTest;
 import io.trino.sql.tree.LongLiteral;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,8 +36,8 @@
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static com.google.inject.util.Modules.EMPTY_MODULE;
-import static io.trino.SystemSessionProperties.TASK_PARTITIONED_WRITER_COUNT;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.SystemSessionProperties.TASK_MAX_WRITER_COUNT;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
 import static io.trino.sql.planner.assertions.PlanMatchPattern.values;
 import static io.trino.testing.TestingSession.testSessionBuilder;
@@ -57,7 +57,7 @@ protected LocalQueryRunner createLocalQueryRunner()
                 .setCatalog(ICEBERG_CATALOG)
                 .setSchema(SCHEMA_NAME)
                 // optimize_metadata_queries doesn't work when files are written by different writers
-                .setSystemProperty(TASK_PARTITIONED_WRITER_COUNT, "1")
+                .setSystemProperty(TASK_MAX_WRITER_COUNT, "1")
                 .build();
 
         try {
@@ -124,7 +124,7 @@ public void testOptimization()
                         values(ImmutableList.of("b", "c"), ImmutableList.of())));
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
             throws Exception
     {
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestMetricsWrapper.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestMetricsWrapper.java
index f37e86c95c9a..198d9674a40c 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestMetricsWrapper.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestMetricsWrapper.java
@@ -19,7 +19,7 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.json.ObjectMapperProvider;
 import org.apache.iceberg.Metrics;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestPartitionFields.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestPartitionFields.java
index 4deb541c1259..3cd07dd337da 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestPartitionFields.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestPartitionFields.java
@@ -22,14 +22,14 @@
 import org.apache.iceberg.types.Types.NestedField;
 import org.apache.iceberg.types.Types.StringType;
 import org.apache.iceberg.types.Types.TimestampType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Consumer;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.plugin.iceberg.PartitionFields.parsePartitionField;
 import static io.trino.plugin.iceberg.PartitionFields.toPartitionFields;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestPartitionFields
@@ -71,10 +71,10 @@ public void testParse()
         assertInvalid("bucket()", "Invalid partition field declaration: bucket()");
         assertInvalid("abc", "Cannot find source column: abc");
         assertInvalid("notes", "Cannot partition by non-primitive source field: list<string>");
-        assertInvalid("bucket(price, 42)", "Cannot bucket by type: double");
-        assertInvalid("bucket(notes, 88)", "Cannot bucket by type: list<string>");
-        assertInvalid("truncate(ts, 13)", "Cannot truncate type: timestamp");
-        assertInvalid("year(order_key)", "Cannot partition type long by year");
+        assertInvalid("bucket(price, 42)", "Invalid source type double for transform: bucket[42]");
+        assertInvalid("bucket(notes, 88)", "Cannot partition by non-primitive source field: list<string>");
+        assertInvalid("truncate(ts, 13)", "Invalid source type timestamp for transform: truncate[13]");
+        assertInvalid("year(order_key)", "Invalid source type long for transform: year");
         assertInvalid("\"test\"", "Cannot find source column: test");
         assertInvalid("\"test with space\"", "Cannot find source column: test with space");
         assertInvalid("\"test \"with space\"", "Invalid partition field declaration: \"test \"with space\"");
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestPartitionTransforms.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestPartitionTransforms.java
index 9648e7b82c6b..6006f370cb1b 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestPartitionTransforms.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestPartitionTransforms.java
@@ -17,7 +17,7 @@
 import org.apache.iceberg.types.Types.DateType;
 import org.apache.iceberg.types.Types.StringType;
 import org.apache.iceberg.types.Types.TimestampType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestSharedHiveMetastore.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestSharedHiveMetastore.java
index ac345d6cee00..c3a3240fd2d1 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestSharedHiveMetastore.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestSharedHiveMetastore.java
@@ -25,7 +25,7 @@
 
 import java.nio.file.Path;
 
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.plugin.iceberg.IcebergQueryRunner.ICEBERG_CATALOG;
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
 import static io.trino.testing.QueryAssertions.copyTpchTables;
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestSortFieldUtils.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestSortFieldUtils.java
index 42e5c524f380..c57f7e1a8aeb 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestSortFieldUtils.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestSortFieldUtils.java
@@ -19,7 +19,7 @@
 import org.apache.iceberg.SortOrder;
 import org.apache.iceberg.types.Types;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Consumer;
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestStructLikeWrapperWithFieldIdToIndex.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestStructLikeWrapperWithFieldIdToIndex.java
index 09ad20afc743..d0d5b48afaae 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestStructLikeWrapperWithFieldIdToIndex.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestStructLikeWrapperWithFieldIdToIndex.java
@@ -19,7 +19,7 @@
 import org.apache.iceberg.types.Types.StringType;
 import org.apache.iceberg.types.Types.StructType;
 import org.apache.iceberg.util.StructLikeWrapper;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestTableStatisticsWriter.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestTableStatisticsWriter.java
index a81677f5b428..3ad580669fbe 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestTableStatisticsWriter.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestTableStatisticsWriter.java
@@ -15,7 +15,7 @@
 package io.trino.plugin.iceberg;
 
 import org.apache.iceberg.puffin.PuffinCompressionCodec;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/BaseTrinoCatalogTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/BaseTrinoCatalogTest.java
index 1ba4aac580de..01a9dfae53ef 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/BaseTrinoCatalogTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/BaseTrinoCatalogTest.java
@@ -21,6 +21,7 @@
 import io.trino.plugin.iceberg.IcebergMetadata;
 import io.trino.plugin.iceberg.TableStatisticsWriter;
 import io.trino.spi.TrinoException;
+import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorViewDefinition;
@@ -35,7 +36,7 @@
 import org.apache.iceberg.Table;
 import org.apache.iceberg.expressions.Expressions;
 import org.apache.iceberg.types.Types;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -108,6 +109,7 @@ public void testNonLowercaseNamespace()
             // Test with IcebergMetadata, should the ConnectorMetadata implementation behavior depend on that class
             ConnectorMetadata icebergMetadata = new IcebergMetadata(
                     PLANNER_CONTEXT.getTypeManager(),
+                    CatalogHandle.fromId("iceberg:NORMAL:v12345"),
                     jsonCodec(CommitTaskData.class),
                     catalog,
                     connectorIdentity -> {
@@ -353,7 +355,8 @@ public void testView()
                         new ConnectorViewDefinition.ViewColumn("name", VarcharType.createVarcharType(25).getTypeId(), Optional.empty())),
                 Optional.empty(),
                 Optional.of(SESSION.getUser()),
-                false);
+                false,
+                ImmutableList.of());
 
         try {
             catalog.createNamespace(SESSION, namespace, ImmutableMap.of(), new TrinoPrincipal(PrincipalType.USER, SESSION.getUser()));
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/file/TestIcebergFileMetastoreCreateTableFailure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/file/TestIcebergFileMetastoreCreateTableFailure.java
index a4e0927cebc3..47761caea762 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/file/TestIcebergFileMetastoreCreateTableFailure.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/file/TestIcebergFileMetastoreCreateTableFailure.java
@@ -25,8 +25,9 @@
 import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -36,19 +37,22 @@
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static com.google.inject.util.Modules.EMPTY_MODULE;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true) // testException is a shared mutable state
+@TestInstance(PER_CLASS)
 public class TestIcebergFileMetastoreCreateTableFailure
         extends AbstractTestQueryFramework
 {
     private static final String ICEBERG_CATALOG = "iceberg";
     private static final String SCHEMA_NAME = "test_schema";
 
+    private static final String METADATA_GLOB = "glob:**.metadata.json";
+
     private Path dataDirectory;
     private HiveMetastore metastore;
     private final AtomicReference<RuntimeException> testException = new AtomicReference<>();
@@ -61,7 +65,7 @@ protected DistributedQueryRunner createQueryRunner()
         // Using FileHiveMetastore as approximation of HMS
         this.metastore = new FileHiveMetastore(
                 new NodeVersion("testversion"),
-                HDFS_ENVIRONMENT,
+                HDFS_FILE_SYSTEM_FACTORY,
                 new HiveMetastoreConfig().isHideDeltaLakeTables(),
                 new FileHiveMetastoreConfig()
                         .setCatalogDirectory(dataDirectory.toString()))
@@ -86,7 +90,7 @@ public synchronized void createTable(Table table, PrincipalPrivileges principalP
         return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
             throws Exception
     {
@@ -123,10 +127,11 @@ protected void testCreateTableFailure(String expectedExceptionMessage, boolean s
 
         Path metadataDirectory = Path.of(tableLocation, "metadata");
         if (shouldMetadataFileExist) {
-            assertThat(metadataDirectory).as("Metadata file should exist").isDirectoryContaining("glob:**.metadata.json");
+            assertThat(metadataDirectory).as("Metadata file should exist").isDirectoryContaining(METADATA_GLOB);
         }
         else {
-            assertThat(metadataDirectory).as("Metadata file should not exist").isEmptyDirectory();
+            // file cleanup is more conservative since https://github.com/apache/iceberg/pull/8599
+            assertThat(metadataDirectory).as("Metadata file should not exist").isDirectoryNotContaining(METADATA_GLOB);
         }
     }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/file/TestIcebergFileMetastoreTableOperationsInsertFailure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/file/TestIcebergFileMetastoreTableOperationsInsertFailure.java
index 5da898650dba..8bd537a466e9 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/file/TestIcebergFileMetastoreTableOperationsInsertFailure.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/file/TestIcebergFileMetastoreTableOperationsInsertFailure.java
@@ -30,8 +30,9 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.LocalQueryRunner;
 import org.apache.iceberg.exceptions.CommitStateUnknownException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -40,12 +41,13 @@
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static com.google.inject.util.Modules.EMPTY_MODULE;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestIcebergFileMetastoreTableOperationsInsertFailure
         extends AbstractTestQueryFramework
 {
@@ -66,7 +68,7 @@ protected LocalQueryRunner createQueryRunner()
 
         HiveMetastore metastore = new FileHiveMetastore(
                 new NodeVersion("testversion"),
-                HDFS_ENVIRONMENT,
+                HDFS_FILE_SYSTEM_FACTORY,
                 new HiveMetastoreConfig().isHideDeltaLakeTables(),
                 new FileHiveMetastoreConfig()
                         .setCatalogDirectory(baseDir.toURI().toString())
@@ -100,7 +102,7 @@ public synchronized void replaceTable(String databaseName, String tableName, Tab
         return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
             throws Exception
     {
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/file/TestTrinoHiveCatalogWithFileMetastore.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/file/TestTrinoHiveCatalogWithFileMetastore.java
index 42e5ca9b4dcd..a2c0f4603d0f 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/file/TestTrinoHiveCatalogWithFileMetastore.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/file/TestTrinoHiveCatalogWithFileMetastore.java
@@ -14,7 +14,6 @@
 package io.trino.plugin.iceberg.catalog.file;
 
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.TrinoViewHiveMetastore;
 import io.trino.plugin.hive.metastore.HiveMetastore;
@@ -23,28 +22,30 @@
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
 import io.trino.plugin.iceberg.catalog.hms.TrinoHiveCatalog;
 import io.trino.spi.type.TestingTypeManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.plugin.hive.metastore.cache.CachingHiveMetastore.memoizeMetastore;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestTrinoHiveCatalogWithFileMetastore
         extends BaseTrinoCatalogTest
 {
     private HiveMetastore metastore;
-    private java.nio.file.Path tempDir;
+    private Path tempDir;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -53,7 +54,7 @@ public void setUp()
         metastore = createTestingFileHiveMetastore(metastoreDir);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws IOException
     {
@@ -63,7 +64,7 @@ public void tearDown()
     @Override
     protected TrinoCatalog createTrinoCatalog(boolean useUniqueTableLocations)
     {
-        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(HDFS_ENVIRONMENT);
+        TrinoFileSystemFactory fileSystemFactory = HDFS_FILE_SYSTEM_FACTORY;
         CachingHiveMetastore cachingHiveMetastore = memoizeMetastore(metastore, 1000);
         return new TrinoHiveCatalog(
                 new CatalogName("catalog"),
@@ -76,20 +77,4 @@ protected TrinoCatalog createTrinoCatalog(boolean useUniqueTableLocations)
                 false,
                 false);
     }
-
-    @Override
-    @Test
-    public void testCreateNamespaceWithLocation()
-    {
-        assertThatThrownBy(super::testCreateNamespaceWithLocation)
-                .hasMessageContaining("Database cannot be created with a location set");
-    }
-
-    @Override
-    @Test
-    public void testUseUniqueTableLocations()
-    {
-        assertThatThrownBy(super::testCreateNamespaceWithLocation)
-                .hasMessageContaining("Database cannot be created with a location set");
-    }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogAccessOperations.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogAccessOperations.java
index ebcc2cc46ff5..b65004be19fa 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogAccessOperations.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogAccessOperations.java
@@ -13,45 +13,40 @@
  */
 package io.trino.plugin.iceberg.catalog.glue;
 
+import com.google.common.collect.HashMultiset;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultiset;
 import com.google.common.collect.Multiset;
-import com.google.common.collect.Sets;
-import com.google.inject.Binder;
-import com.google.inject.Inject;
-import com.google.inject.Module;
-import com.google.inject.TypeLiteral;
+import io.airlift.log.Logger;
 import io.trino.Session;
+import io.trino.filesystem.TrackingFileSystemFactory;
+import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.plugin.hive.metastore.glue.GlueMetastoreStats;
+import io.trino.plugin.iceberg.IcebergConnector;
 import io.trino.plugin.iceberg.TableType;
 import io.trino.plugin.iceberg.TestingIcebergPlugin;
-import io.trino.plugin.iceberg.catalog.TrinoCatalogFactory;
-import io.trino.spi.NodeManager;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-import javax.inject.Qualifier;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
 import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-import static com.google.common.base.Verify.verifyNotNull;
-import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static com.google.common.collect.ImmutableMultiset.toImmutableMultiset;
+import static com.google.inject.util.Modules.EMPTY_MODULE;
+import static io.trino.filesystem.TrackingFileSystemFactory.OperationType.INPUT_FILE_NEW_STREAM;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.COLLECT_EXTENDED_STATISTICS_ON_WRITE;
 import static io.trino.plugin.iceberg.TableType.DATA;
 import static io.trino.plugin.iceberg.TableType.FILES;
@@ -64,28 +59,29 @@
 import static io.trino.plugin.iceberg.catalog.glue.GlueMetastoreMethod.CREATE_TABLE;
 import static io.trino.plugin.iceberg.catalog.glue.GlueMetastoreMethod.GET_DATABASE;
 import static io.trino.plugin.iceberg.catalog.glue.GlueMetastoreMethod.GET_TABLE;
+import static io.trino.plugin.iceberg.catalog.glue.GlueMetastoreMethod.GET_TABLES;
 import static io.trino.plugin.iceberg.catalog.glue.GlueMetastoreMethod.UPDATE_TABLE;
+import static io.trino.plugin.iceberg.catalog.glue.TestIcebergGlueCatalogAccessOperations.FileType.METADATA_JSON;
+import static io.trino.plugin.iceberg.catalog.glue.TestIcebergGlueCatalogAccessOperations.FileType.fromFilePath;
+import static io.trino.testing.MultisetAssertions.assertMultisetsEqual;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
-import static java.lang.String.format;
-import static java.lang.String.join;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.util.Collections.nCopies;
 import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toCollection;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.fail;
 
 /*
  * The test currently uses AWS Default Credential Provider Chain,
  * See https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html#credentials-default
  * on ways to set your AWS credentials which will be needed to run this test.
  */
-@Test(singleThreaded = true) // metastore invocation counters shares mutable state so can't be run from many threads simultaneously
 public class TestIcebergGlueCatalogAccessOperations
         extends AbstractTestQueryFramework
 {
+    private static final Logger log = Logger.get(TestIcebergGlueCatalogAccessOperations.class);
+
+    private static final int MAX_PREFIXES_COUNT = 5;
     private final String testSchema = "test_schema_" + randomNameSuffix();
     private final Session testSession = testSessionBuilder()
             .setCatalog("iceberg")
@@ -93,19 +89,23 @@ public class TestIcebergGlueCatalogAccessOperations
             .build();
 
     private GlueMetastoreStats glueStats;
+    private TrackingFileSystemFactory trackingFileSystemFactory;
 
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
         File tmp = Files.createTempDirectory("test_iceberg").toFile();
-        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(testSession).build();
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(testSession)
+                .addCoordinatorProperty("optimizer.experimental-max-prefetched-information-schema-prefixes", Integer.toString(MAX_PREFIXES_COUNT))
+                .build();
+
+        trackingFileSystemFactory = new TrackingFileSystemFactory(new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS));
 
-        AtomicReference<GlueMetastoreStats> glueStatsReference = new AtomicReference<>();
         queryRunner.installPlugin(new TestingIcebergPlugin(
                 Optional.empty(),
-                Optional.empty(),
-                new StealStatsModule(glueStatsReference)));
+                Optional.of(trackingFileSystemFactory),
+                EMPTY_MODULE));
         queryRunner.createCatalog("iceberg", "iceberg",
                 ImmutableMap.of(
                         "iceberg.catalog.type", "glue",
@@ -113,11 +113,12 @@ protected QueryRunner createQueryRunner()
 
         queryRunner.execute("CREATE SCHEMA " + testSchema);
 
-        glueStats = verifyNotNull(glueStatsReference.get(), "glueStatsReference not set");
+        glueStats = ((IcebergConnector) queryRunner.getCoordinator().getConnector("iceberg")).getInjector().getInstance(GlueMetastoreStats.class);
+
         return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanUpSchema()
     {
         getQueryRunner().execute("DROP SCHEMA " + testSchema);
@@ -145,8 +146,7 @@ public void testCreateTable()
             assertGlueMetastoreApiInvocations("CREATE TABLE test_create (id VARCHAR, age INT)",
                     ImmutableMultiset.builder()
                             .add(CREATE_TABLE)
-                            .add(GET_DATABASE)
-                            .add(GET_DATABASE)
+                            .addCopies(GET_DATABASE, 2)
                             .add(GET_TABLE)
                             .build());
         }
@@ -163,8 +163,7 @@ public void testCreateTableAsSelect()
                     withStatsOnWrite(getSession(), false),
                     "CREATE TABLE test_ctas AS SELECT 1 AS age",
                     ImmutableMultiset.builder()
-                            .add(GET_DATABASE)
-                            .add(GET_DATABASE)
+                            .addCopies(GET_DATABASE, 2)
                             .add(CREATE_TABLE)
                             .add(GET_TABLE)
                             .build());
@@ -178,10 +177,9 @@ public void testCreateTableAsSelect()
                     withStatsOnWrite(getSession(), true),
                     "CREATE TABLE test_ctas_with_stats AS SELECT 1 AS age",
                     ImmutableMultiset.builder()
-                            .add(GET_DATABASE)
-                            .add(GET_DATABASE)
+                            .addCopies(GET_DATABASE, 2)
                             .add(CREATE_TABLE)
-                            .addCopies(GET_TABLE, 6)
+                            .addCopies(GET_TABLE, 5)
                             .add(UPDATE_TABLE)
                             .build());
         }
@@ -303,7 +301,7 @@ public void testRefreshMaterializedView()
 
             assertGlueMetastoreApiInvocations("REFRESH MATERIALIZED VIEW test_refresh_mview_view",
                     ImmutableMultiset.builder()
-                            .addCopies(GET_TABLE, 6)
+                            .addCopies(GET_TABLE, 5)
                             .addCopies(UPDATE_TABLE, 1)
                             .build());
         }
@@ -452,46 +450,202 @@ public void testSelectSystemTable()
         }
     }
 
+    @Test
+    public void testInformationSchemaColumns()
+    {
+        String schemaName = "test_i_s_columns_schema" + randomNameSuffix();
+        assertUpdate("CREATE SCHEMA " + schemaName);
+        try {
+            Session session = Session.builder(getSession())
+                    .setSchema(schemaName)
+                    .build();
+            int tablesCreated = 0;
+            try {
+                // Do not use @DataProvider to save test setup time which may be considerable
+                for (int tables : List.of(2, MAX_PREFIXES_COUNT, MAX_PREFIXES_COUNT + 2)) {
+                    log.info("testInformationSchemaColumns: Testing with %s tables", tables);
+                    checkState(tablesCreated < tables);
+
+                    for (int i = tablesCreated; i < tables; i++) {
+                        tablesCreated++;
+                        assertUpdate(session, "CREATE TABLE test_select_i_s_columns" + i + "(id varchar, age integer)");
+                        // Produce multiple snapshots and metadata files
+                        assertUpdate(session, "INSERT INTO test_select_i_s_columns" + i + " VALUES ('abc', 11)", 1);
+                        assertUpdate(session, "INSERT INTO test_select_i_s_columns" + i + " VALUES ('xyz', 12)", 1);
+
+                        assertUpdate(session, "CREATE TABLE test_other_select_i_s_columns" + i + "(id varchar, age integer)"); // won't match the filter
+                    }
+
+                    // Bulk retrieval
+                    assertInvocations(
+                            session,
+                            "SELECT * FROM information_schema.columns WHERE table_schema = CURRENT_SCHEMA AND table_name LIKE 'test_select_i_s_columns%'",
+                            ImmutableMultiset.<GlueMetastoreMethod>builder()
+                                    .add(GET_TABLES)
+                                    .build(),
+                            ImmutableMultiset.of());
+                }
+
+                // Pointed lookup
+                assertInvocations(
+                        session,
+                        "SELECT * FROM information_schema.columns WHERE table_schema = CURRENT_SCHEMA AND table_name = 'test_select_i_s_columns0'",
+                        ImmutableMultiset.<GlueMetastoreMethod>builder()
+                                .add(GET_TABLE)
+                                .build(),
+                        ImmutableMultiset.<FileOperation>builder()
+                                .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                                .build());
+
+                // Pointed lookup via DESCRIBE (which does some additional things before delegating to information_schema.columns)
+                assertInvocations(
+                        session,
+                        "DESCRIBE test_select_i_s_columns0",
+                        ImmutableMultiset.<GlueMetastoreMethod>builder()
+                                .add(GET_DATABASE)
+                                .add(GET_TABLE)
+                                .build(),
+                        ImmutableMultiset.<FileOperation>builder()
+                                .add(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM))
+                                .build());
+            }
+            finally {
+                for (int i = 0; i < tablesCreated; i++) {
+                    assertUpdate(session, "DROP TABLE IF EXISTS test_select_i_s_columns" + i);
+                    assertUpdate(session, "DROP TABLE IF EXISTS test_other_select_i_s_columns" + i);
+                }
+            }
+        }
+        finally {
+            assertUpdate("DROP SCHEMA " + schemaName);
+        }
+    }
+
+    @Test
+    public void testSystemMetadataTableComments()
+    {
+        String schemaName = "test_s_m_table_comments" + randomNameSuffix();
+        assertUpdate("CREATE SCHEMA " + schemaName);
+        try {
+            Session session = Session.builder(getSession())
+                    .setSchema(schemaName)
+                    .build();
+            int tablesCreated = 0;
+            try {
+                // Do not use @DataProvider to save test setup time which may be considerable
+                for (int tables : List.of(2, MAX_PREFIXES_COUNT, MAX_PREFIXES_COUNT + 2)) {
+                    log.info("testSystemMetadataTableComments: Testing with %s tables", tables);
+                    checkState(tablesCreated < tables);
+
+                    for (int i = tablesCreated; i < tables; i++) {
+                        tablesCreated++;
+                        assertUpdate(session, "CREATE TABLE test_select_s_m_t_comments" + i + "(id varchar, age integer)");
+                        // Produce multiple snapshots and metadata files
+                        assertUpdate(session, "INSERT INTO test_select_s_m_t_comments" + i + " VALUES ('abc', 11)", 1);
+                        assertUpdate(session, "INSERT INTO test_select_s_m_t_comments" + i + " VALUES ('xyz', 12)", 1);
+
+                        assertUpdate(session, "CREATE TABLE test_other_select_s_m_t_comments" + i + "(id varchar, age integer)"); // won't match the filter
+                    }
+
+                    // Bulk retrieval
+                    assertInvocations(
+                            session,
+                            "SELECT * FROM system.metadata.table_comments WHERE schema_name = CURRENT_SCHEMA AND table_name LIKE 'test_select_s_m_t_comments%'",
+                            ImmutableMultiset.<GlueMetastoreMethod>builder()
+                                    .addCopies(GET_TABLES, 1)
+                                    .build(),
+                            ImmutableMultiset.of());
+                }
+
+                // Pointed lookup
+                assertInvocations(
+                        session,
+                        "SELECT * FROM system.metadata.table_comments WHERE schema_name = CURRENT_SCHEMA AND table_name = 'test_select_s_m_t_comments0'",
+                        ImmutableMultiset.<GlueMetastoreMethod>builder()
+                                .addCopies(GET_TABLE, 1)
+                                .build(),
+                        ImmutableMultiset.<FileOperation>builder()
+                                .addCopies(new FileOperation(METADATA_JSON, INPUT_FILE_NEW_STREAM), 1)
+                                .build());
+            }
+            finally {
+                for (int i = 0; i < tablesCreated; i++) {
+                    assertUpdate(session, "DROP TABLE IF EXISTS test_select_s_m_t_comments" + i);
+                    assertUpdate(session, "DROP TABLE IF EXISTS test_other_select_s_m_t_comments" + i);
+                }
+            }
+        }
+        finally {
+            assertUpdate("DROP SCHEMA " + schemaName);
+        }
+    }
+
+    @Test
+    public void testShowTables()
+    {
+        assertGlueMetastoreApiInvocations("SHOW TABLES",
+                ImmutableMultiset.builder()
+                        .add(GET_DATABASE)
+                        .add(GET_TABLES)
+                        .build());
+    }
+
     private void assertGlueMetastoreApiInvocations(@Language("SQL") String query, Multiset<?> expectedInvocations)
     {
         assertGlueMetastoreApiInvocations(getSession(), query, expectedInvocations);
     }
 
     private void assertGlueMetastoreApiInvocations(Session session, @Language("SQL") String query, Multiset<?> expectedInvocations)
+    {
+        assertInvocations(
+                session,
+                query,
+                expectedInvocations.stream()
+                        .map(GlueMetastoreMethod.class::cast)
+                        .collect(toImmutableMultiset()),
+                Optional.empty());
+    }
+
+    private void assertInvocations(
+            Session session,
+            @Language("SQL") String query,
+            Multiset<GlueMetastoreMethod> expectedGlueInvocations,
+            Multiset<FileOperation> expectedFileOperations)
+    {
+        assertInvocations(session, query, expectedGlueInvocations, Optional.of(expectedFileOperations));
+    }
+
+    private void assertInvocations(
+            Session session,
+            @Language("SQL") String query,
+            Multiset<GlueMetastoreMethod> expectedGlueInvocations,
+            Optional<Multiset<FileOperation>> expectedFileOperations)
     {
         Map<GlueMetastoreMethod, Integer> countsBefore = Arrays.stream(GlueMetastoreMethod.values())
                 .collect(toImmutableMap(Function.identity(), method -> method.getInvocationCount(glueStats)));
+        trackingFileSystemFactory.reset();
 
         getQueryRunner().execute(session, query);
+
         Map<GlueMetastoreMethod, Integer> countsAfter = Arrays.stream(GlueMetastoreMethod.values())
                 .collect(toImmutableMap(Function.identity(), method -> method.getInvocationCount(glueStats)));
+        Multiset<FileOperation> fileOperations = getFileOperations();
 
-        Map<GlueMetastoreMethod, Integer> deltas = Arrays.stream(GlueMetastoreMethod.values())
-                .collect(Collectors.toMap(Function.identity(), method -> countsAfter.get(method) - countsBefore.get(method)));
-        ImmutableMultiset.Builder<GlueMetastoreMethod> builder = ImmutableMultiset.builder();
-        deltas.entrySet().stream().filter(entry -> entry.getValue() > 0).forEach(entry -> builder.setCount(entry.getKey(), entry.getValue()));
-        Multiset<GlueMetastoreMethod> actualInvocations = builder.build();
-
-        if (expectedInvocations.equals(actualInvocations)) {
-            return;
-        }
+        Multiset<GlueMetastoreMethod> actualGlueInvocations = Arrays.stream(GlueMetastoreMethod.values())
+                .collect(toImmutableMultiset(Function.identity(), method -> requireNonNull(countsAfter.get(method)) - requireNonNull(countsBefore.get(method))));
 
-        List<String> mismatchReport = Sets.union(expectedInvocations.elementSet(), actualInvocations.elementSet()).stream()
-                .filter(key -> expectedInvocations.count(key) != actualInvocations.count(key))
-                .flatMap(key -> {
-                    int expectedCount = expectedInvocations.count(key);
-                    int actualCount = actualInvocations.count(key);
-                    if (actualCount < expectedCount) {
-                        return Stream.of(format("%s more occurrences of %s", expectedCount - actualCount, key));
-                    }
-                    if (actualCount > expectedCount) {
-                        return Stream.of(format("%s fewer occurrences of %s", actualCount - expectedCount, key));
-                    }
-                    return Stream.of();
-                })
-                .collect(toImmutableList());
+        assertMultisetsEqual(actualGlueInvocations, expectedGlueInvocations);
+        expectedFileOperations.ifPresent(expected -> assertMultisetsEqual(fileOperations, expected));
+    }
 
-        fail("Expected: \n\t\t" + join(",\n\t\t", mismatchReport));
+    private Multiset<FileOperation> getFileOperations()
+    {
+        return trackingFileSystemFactory.getOperationCounts()
+                .entrySet().stream()
+                .flatMap(entry -> nCopies(entry.getValue(), new FileOperation(
+                        fromFilePath(entry.getKey().location().toString()),
+                        entry.getKey().operationType())).stream())
+                .collect(toCollection(HashMultiset::create));
     }
 
     private static Session withStatsOnWrite(Session session, boolean enabled)
@@ -502,47 +656,42 @@ private static Session withStatsOnWrite(Session session, boolean enabled)
                 .build();
     }
 
-    @Retention(RUNTIME)
-    @Target({FIELD, PARAMETER, METHOD})
-    @Qualifier
-    public @interface GlueStatsReference {}
-
-    static class StealStatsModule
-            implements Module
+    private record FileOperation(FileType fileType, TrackingFileSystemFactory.OperationType operationType)
     {
-        private final AtomicReference<GlueMetastoreStats> glueStatsReference;
-
-        public StealStatsModule(AtomicReference<GlueMetastoreStats> glueStatsReference)
+        public FileOperation
         {
-            this.glueStatsReference = requireNonNull(glueStatsReference, "glueStatsReference is null");
-        }
-
-        @Override
-        public void configure(Binder binder)
-        {
-            binder.bind(new TypeLiteral<AtomicReference<GlueMetastoreStats>>() {}).annotatedWith(GlueStatsReference.class).toInstance(glueStatsReference);
-
-            // Eager singleton to make singleton immediately as a dummy object to trigger code that will extract the stats out of the catalog factory
-            binder.bind(StealStats.class).asEagerSingleton();
+            requireNonNull(fileType, "fileType is null");
+            requireNonNull(operationType, "operationType is null");
         }
     }
 
-    static class StealStats
+    enum FileType
     {
-        @Inject
-        StealStats(
-                NodeManager nodeManager,
-                @GlueStatsReference AtomicReference<GlueMetastoreStats> glueStatsReference,
-                TrinoCatalogFactory factory)
+        METADATA_JSON,
+        SNAPSHOT,
+        MANIFEST,
+        STATS,
+        DATA,
+        /**/;
+
+        public static FileType fromFilePath(String path)
         {
-            if (!nodeManager.getCurrentNode().isCoordinator()) {
-                // The test covers stats on the coordinator only.
-                return;
+            if (path.endsWith("metadata.json")) {
+                return METADATA_JSON;
             }
-
-            if (!glueStatsReference.compareAndSet(null, ((TrinoGlueCatalogFactory) factory).getStats())) {
-                throw new RuntimeException("glueStatsReference already set");
+            if (path.contains("/snap-")) {
+                return SNAPSHOT;
+            }
+            if (path.endsWith("-m0.avro")) {
+                return MANIFEST;
+            }
+            if (path.endsWith(".stats")) {
+                return STATS;
+            }
+            if (path.contains("/data/") && (path.endsWith(".orc") || path.endsWith(".parquet"))) {
+                return DATA;
             }
+            throw new IllegalArgumentException("File not recognized: " + path);
         }
     }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogConfig.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogConfig.java
index e02ea7d69a0c..3c21ffb69592 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogConfig.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.iceberg.catalog.glue;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -28,15 +28,20 @@ public class TestIcebergGlueCatalogConfig
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(IcebergGlueCatalogConfig.class)
+                .setCacheTableMetadata(true)
                 .setSkipArchive(false));
     }
 
     @Test
     public void testExplicitPropertyMapping()
     {
-        Map<String, String> properties = ImmutableMap.of("iceberg.glue.skip-archive", "true");
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("iceberg.glue.cache-table-metadata", "false")
+                .put("iceberg.glue.skip-archive", "true")
+                .buildOrThrow();
 
         IcebergGlueCatalogConfig expected = new IcebergGlueCatalogConfig()
+                .setCacheTableMetadata(false)
                 .setSkipArchive(true);
 
         assertFullMapping(properties, expected);
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogConnectorSmokeTest.java
index 8668c118c1ec..a00fa9a368c4 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogConnectorSmokeTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogConnectorSmokeTest.java
@@ -16,6 +16,7 @@
 import com.amazonaws.services.glue.AWSGlueAsync;
 import com.amazonaws.services.glue.AWSGlueAsyncClientBuilder;
 import com.amazonaws.services.glue.model.DeleteTableRequest;
+import com.amazonaws.services.glue.model.EntityNotFoundException;
 import com.amazonaws.services.glue.model.GetTableRequest;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
@@ -25,6 +26,7 @@
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
@@ -33,22 +35,23 @@
 import io.trino.hdfs.HdfsConfiguration;
 import io.trino.hdfs.HdfsConfigurationInitializer;
 import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
 import io.trino.hdfs.authentication.NoHdfsAuthentication;
 import io.trino.plugin.hive.aws.AwsApiCallStats;
 import io.trino.plugin.iceberg.BaseIcebergConnectorSmokeTest;
 import io.trino.plugin.iceberg.IcebergQueryRunner;
 import io.trino.plugin.iceberg.SchemaInitializer;
 import io.trino.testing.QueryRunner;
-import io.trino.testing.sql.TestView;
 import org.apache.iceberg.FileFormat;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.plugin.hive.metastore.glue.AwsSdkUtil.getPaginatedResults;
+import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableParameters;
 import static io.trino.plugin.iceberg.IcebergTestUtils.checkParquetFileSorting;
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.TestingNames.randomNameSuffix;
@@ -56,12 +59,14 @@
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 /*
  * TestIcebergGlueCatalogConnectorSmokeTest currently uses AWS Default Credential Provider Chain,
  * See https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html#credentials-default
  * on ways to set your AWS credentials which will be needed to run this test.
  */
+@TestInstance(PER_CLASS)
 public class TestIcebergGlueCatalogConnectorSmokeTest
         extends BaseIcebergConnectorSmokeTest
 {
@@ -70,17 +75,16 @@ public class TestIcebergGlueCatalogConnectorSmokeTest
     private final AWSGlueAsync glueClient;
     private final TrinoFileSystemFactory fileSystemFactory;
 
-    @Parameters("s3.bucket")
-    public TestIcebergGlueCatalogConnectorSmokeTest(String bucketName)
+    public TestIcebergGlueCatalogConnectorSmokeTest()
     {
         super(FileFormat.PARQUET);
-        this.bucketName = requireNonNull(bucketName, "bucketName is null");
+        this.bucketName = requireNonNull(System.getenv("S3_BUCKET"), "Environment S3_BUCKET was not set");
         this.schemaName = "test_iceberg_smoke_" + randomNameSuffix();
         glueClient = AWSGlueAsyncClientBuilder.defaultClient();
 
         HdfsConfigurationInitializer initializer = new HdfsConfigurationInitializer(new HdfsConfig(), ImmutableSet.of());
         HdfsConfiguration hdfsConfiguration = new DynamicHdfsConfiguration(initializer, ImmutableSet.of());
-        this.fileSystemFactory = new HdfsFileSystemFactory(new HdfsEnvironment(hdfsConfiguration, new HdfsConfig(), new NoHdfsAuthentication()));
+        this.fileSystemFactory = new HdfsFileSystemFactory(new HdfsEnvironment(hdfsConfiguration, new HdfsConfig(), new NoHdfsAuthentication()), new TrinoHdfsFileSystemStats());
     }
 
     @Override
@@ -90,6 +94,7 @@ protected QueryRunner createQueryRunner()
         return IcebergQueryRunner.builder()
                 .setIcebergProperties(
                         ImmutableMap.of(
+                                "iceberg.file-format", format.name(),
                                 "iceberg.catalog.type", "glue",
                                 "hive.metastore.glue.default-warehouse-dir", schemaPath(),
                                 "iceberg.register-table-procedure.enabled", "true",
@@ -102,7 +107,7 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
     {
         computeActual("SHOW TABLES").getMaterializedRows()
@@ -125,7 +130,7 @@ public void testShowCreateTable()
                                 "   comment varchar\n" +
                                 ")\n" +
                                 "WITH (\n" +
-                                "   format = 'ORC',\n" +
+                                "   format = 'PARQUET',\n" +
                                 "   format_version = 2,\n" +
                                 "   location = '%2$s/%1$s.db/region-\\E.*\\Q'\n" +
                                 ")\\E",
@@ -141,56 +146,6 @@ public void testRenameSchema()
                 .hasStackTraceContaining("renameNamespace is not supported for Iceberg Glue catalogs");
     }
 
-    @Test
-    public void testCommentView()
-    {
-        // TODO: Consider moving to BaseConnectorSmokeTest
-        try (TestView view = new TestView(getQueryRunner()::execute, "test_comment_view", "SELECT * FROM region")) {
-            // comment set
-            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS 'new comment'");
-            assertThat((String) computeScalar("SHOW CREATE VIEW " + view.getName())).contains("COMMENT 'new comment'");
-            assertThat(getTableComment(view.getName())).isEqualTo("new comment");
-
-            // comment updated
-            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS 'updated comment'");
-            assertThat(getTableComment(view.getName())).isEqualTo("updated comment");
-
-            // comment set to empty
-            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS ''");
-            assertThat(getTableComment(view.getName())).isEmpty();
-
-            // comment deleted
-            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS 'a comment'");
-            assertThat(getTableComment(view.getName())).isEqualTo("a comment");
-            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS NULL");
-            assertThat(getTableComment(view.getName())).isNull();
-        }
-    }
-
-    @Test
-    public void testCommentViewColumn()
-    {
-        // TODO: Consider moving to BaseConnectorSmokeTest
-        String viewColumnName = "regionkey";
-        try (TestView view = new TestView(getQueryRunner()::execute, "test_comment_view", "SELECT * FROM region")) {
-            // comment set
-            assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS 'new region key comment'");
-            assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo("new region key comment");
-
-            // comment updated
-            assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS 'updated region key comment'");
-            assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo("updated region key comment");
-
-            // comment set to empty
-            assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS ''");
-            assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo("");
-
-            // comment deleted
-            assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS NULL");
-            assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo(null);
-        }
-    }
-
     @Override
     protected void dropTableFromMetastore(String tableName)
     {
@@ -202,8 +157,7 @@ protected void dropTableFromMetastore(String tableName)
                 .withDatabaseName(schemaName)
                 .withName(tableName);
         assertThatThrownBy(() -> glueClient.getTable(getTableRequest))
-                .as("Table in metastore should not exist")
-                .hasMessageMatching(".*Table (.*) not found.*");
+                .isInstanceOf(EntityNotFoundException.class);
     }
 
     @Override
@@ -212,9 +166,8 @@ protected String getMetadataLocation(String tableName)
         GetTableRequest getTableRequest = new GetTableRequest()
                 .withDatabaseName(schemaName)
                 .withName(tableName);
-        return glueClient.getTable(getTableRequest)
-                .getTable()
-                .getParameters().get("metadata_location");
+        return getTableParameters(glueClient.getTable(getTableRequest).getTable())
+                .get("metadata_location");
     }
 
     @Override
@@ -243,7 +196,7 @@ protected void deleteDirectory(String location)
     }
 
     @Override
-    protected boolean isFileSorted(String path, String sortColumnName)
+    protected boolean isFileSorted(Location path, String sortColumnName)
     {
         TrinoFileSystem fileSystem = fileSystemFactory.create(SESSION);
         return checkParquetFileSorting(fileSystem.newInputFile(path), sortColumnName);
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogSkipArchive.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogSkipArchive.java
index 1bd91d68e448..36638fbb28ce 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogSkipArchive.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogSkipArchive.java
@@ -26,30 +26,44 @@
 import io.trino.plugin.hive.aws.AwsApiCallStats;
 import io.trino.plugin.iceberg.IcebergQueryRunner;
 import io.trino.plugin.iceberg.SchemaInitializer;
+import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.TestTable;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.TableMetadataParser;
+import org.apache.iceberg.io.FileIO;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.nio.file.Files;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.plugin.hive.metastore.glue.AwsSdkUtil.getPaginatedResults;
+import static io.trino.plugin.hive.metastore.glue.converter.GlueToTrinoConverter.getTableParameters;
+import static io.trino.plugin.iceberg.IcebergTestUtils.getFileSystemFactory;
 import static io.trino.plugin.iceberg.catalog.glue.GlueIcebergUtil.getTableInput;
+import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
+import static org.apache.iceberg.BaseMetastoreTableOperations.METADATA_LOCATION_PROP;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 /*
  * The test currently uses AWS Default Credential Provider Chain,
  * See https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html#credentials-default
  * on ways to set your AWS credentials which will be needed to run this test.
  */
+@TestInstance(PER_CLASS)
 public class TestIcebergGlueCatalogSkipArchive
         extends AbstractTestQueryFramework
 {
@@ -78,7 +92,7 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
     {
         assertUpdate("DROP SCHEMA IF EXISTS " + schemaName);
@@ -112,7 +126,12 @@ public void testNotRemoveExistingArchive()
 
             // Add a new archive using Glue client
             Table glueTable = glueClient.getTable(new GetTableRequest().withDatabaseName(schemaName).withName(table.getName())).getTable();
-            TableInput tableInput = getTableInput(table.getName(), Optional.empty(), glueTable.getParameters());
+            Map<String, String> tableParameters = new HashMap<>(getTableParameters(glueTable));
+            String metadataLocation = tableParameters.remove(METADATA_LOCATION_PROP);
+            FileIO io = new ForwardingFileIo(getFileSystemFactory(getDistributedQueryRunner()).create(SESSION));
+            TableMetadata metadata = TableMetadataParser.read(io, io.newInputFile(metadataLocation));
+            boolean cacheTableMetadata = new IcebergGlueCatalogConfig().isCacheTableMetadata();
+            TableInput tableInput = getTableInput(TESTING_TYPE_MANAGER, table.getName(), Optional.empty(), metadata, metadataLocation, tableParameters, cacheTableMetadata);
             glueClient.updateTable(new UpdateTableRequest().withDatabaseName(schemaName).withTableInput(tableInput));
             assertThat(getTableVersions(schemaName, table.getName())).hasSize(2);
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCreateTableFailure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCreateTableFailure.java
index 3d6ef0600eb8..3212dbeee3f8 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCreateTableFailure.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCreateTableFailure.java
@@ -21,8 +21,8 @@
 import io.trino.Session;
 import io.trino.filesystem.FileEntry;
 import io.trino.filesystem.FileIterator;
+import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.metadata.InternalFunctionBundle;
 import io.trino.plugin.hive.metastore.Database;
 import io.trino.plugin.hive.metastore.glue.GlueHiveMetastore;
@@ -31,9 +31,9 @@
 import io.trino.spi.security.PrincipalType;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.LocalQueryRunner;
-import io.trino.testing.TestingConnectorSession;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
@@ -45,19 +45,21 @@
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static com.google.common.reflect.Reflection.newProxy;
 import static com.google.inject.util.Modules.EMPTY_MODULE;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.plugin.hive.metastore.glue.GlueHiveMetastore.createTestingGlueHiveMetastore;
+import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 /*
  * The test currently uses AWS Default Credential Provider Chain,
  * See https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html#credentials-default
  * on ways to set your AWS credentials which will be needed to run this test.
  */
-@Test(singleThreaded = true) // testException is a shared mutable state
+@TestInstance(PER_CLASS)
 public class TestIcebergGlueCreateTableFailure
         extends AbstractTestQueryFramework
 {
@@ -109,7 +111,7 @@ protected LocalQueryRunner createQueryRunner()
         dataDirectory.toFile().deleteOnExit();
 
         glueHiveMetastore = createTestingGlueHiveMetastore(dataDirectory);
-        fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT).create(TestingConnectorSession.SESSION);
+        fileSystem = HDFS_FILE_SYSTEM_FACTORY.create(SESSION);
 
         Database database = Database.builder()
                 .setDatabaseName(schemaName)
@@ -122,7 +124,7 @@ protected LocalQueryRunner createQueryRunner()
         return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
     {
         try {
@@ -169,12 +171,12 @@ private void testCreateTableFailure(String expectedExceptionMessage, boolean sho
     protected void assertMetadataLocation(String tableName, boolean shouldMetadataFileExist)
             throws Exception
     {
-        FileIterator fileIterator = fileSystem.listFiles(dataDirectory.toString());
+        FileIterator fileIterator = fileSystem.listFiles(Location.of(dataDirectory.toString()));
         String tableLocationPrefix = Path.of(dataDirectory.toString(), tableName).toString();
         boolean metadataFileFound = false;
         while (fileIterator.hasNext()) {
             FileEntry fileEntry = fileIterator.next();
-            String location = fileEntry.location();
+            String location = fileEntry.location().toString();
             if (location.startsWith(tableLocationPrefix) && location.endsWith(".metadata.json")) {
                 metadataFileFound = true;
                 break;
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java
index 27e320f1bbb8..fe255c79597c 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java
@@ -26,8 +26,9 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.LocalQueryRunner;
 import org.apache.iceberg.exceptions.CommitStateUnknownException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
@@ -41,12 +42,14 @@
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 /*
  * The test currently uses AWS Default Credential Provider Chain,
  * See https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html#credentials-default
  * on ways to set your AWS credentials which will be needed to run this test.
  */
+@TestInstance(PER_CLASS)
 public class TestIcebergGlueTableOperationsInsertFailure
         extends AbstractTestQueryFramework
 {
@@ -107,7 +110,7 @@ protected LocalQueryRunner createQueryRunner()
         return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
     {
         try {
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergS3AndGlueMetastoreTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergS3AndGlueMetastoreTest.java
new file mode 100644
index 000000000000..65a03a866ed6
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergS3AndGlueMetastoreTest.java
@@ -0,0 +1,137 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.catalog.glue;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.hive.BaseS3AndGlueMetastoreTest;
+import io.trino.plugin.iceberg.IcebergQueryRunner;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+import org.testng.annotations.Test;
+
+import java.nio.file.Path;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static io.trino.plugin.hive.metastore.glue.GlueHiveMetastore.createTestingGlueHiveMetastore;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestIcebergS3AndGlueMetastoreTest
+        extends BaseS3AndGlueMetastoreTest
+{
+    public TestIcebergS3AndGlueMetastoreTest()
+    {
+        super("partitioning", "location", requireNonNull(System.getenv("S3_BUCKET"), "Environment S3_BUCKET was not set"));
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        metastore = createTestingGlueHiveMetastore(Path.of(schemaPath()));
+        DistributedQueryRunner queryRunner = IcebergQueryRunner.builder()
+                .setIcebergProperties(ImmutableMap.<String, String>builder()
+                        .put("iceberg.catalog.type", "glue")
+                        .put("hive.metastore.glue.default-warehouse-dir", schemaPath())
+                        .buildOrThrow())
+                .build();
+        queryRunner.execute("CREATE SCHEMA " + schemaName + " WITH (location = '" + schemaPath() + "')");
+        return queryRunner;
+    }
+
+    @Override
+    protected void validateDataFiles(String partitionColumn, String tableName, String location)
+    {
+        getActiveFiles(tableName).forEach(dataFile ->
+        {
+            String locationDirectory = location.endsWith("/") ? location : location + "/";
+            String partitionPart = partitionColumn.isEmpty() ? "" : partitionColumn + "=[a-z0-9]+/";
+            assertThat(dataFile).matches("^" + Pattern.quote(locationDirectory) + "data/" + partitionPart + "[a-zA-Z0-9_-]+.(orc|parquet)$");
+            verifyPathExist(dataFile);
+        });
+    }
+
+    @Override
+    protected void validateMetadataFiles(String location)
+    {
+        getAllMetadataDataFilesFromTableDirectory(location).forEach(metadataFile ->
+        {
+            String locationDirectory = location.endsWith("/") ? location : location + "/";
+            assertThat(metadataFile).matches("^" + Pattern.quote(locationDirectory) + "metadata/[a-zA-Z0-9_-]+.(avro|metadata.json|stats)$");
+            verifyPathExist(metadataFile);
+        });
+    }
+
+    @Override
+    protected String validateTableLocation(String tableName, String expectedLocation)
+    {
+        // Iceberg removes trailing slashes from location, and it's expected.
+        if (expectedLocation.endsWith("/")) {
+            expectedLocation = expectedLocation.replaceFirst("/+$", "");
+        }
+        String actualTableLocation = getTableLocation(tableName);
+        assertThat(actualTableLocation).isEqualTo(expectedLocation);
+        return actualTableLocation;
+    }
+
+    private Set<String> getAllMetadataDataFilesFromTableDirectory(String tableLocation)
+    {
+        return getTableFiles(tableLocation).stream()
+                .filter(path -> path.contains("/metadata"))
+                .collect(Collectors.toUnmodifiableSet());
+    }
+
+    @Override
+    protected Set<String> getAllDataFilesFromTableDirectory(String tableLocation)
+    {
+        return getTableFiles(tableLocation).stream()
+                .filter(path -> path.contains("/data"))
+                .collect(Collectors.toUnmodifiableSet());
+    }
+
+    @Test(dataProvider = "locationPatternsDataProvider")
+    public void testAnalyzeWithProvidedTableLocation(boolean partitioned, LocationPattern locationPattern)
+    {
+        String tableName = "test_analyze_" + randomNameSuffix();
+        String location = locationPattern.locationForTable(bucketName, schemaName, tableName);
+        String partitionQueryPart = (partitioned ? ",partitioning = ARRAY['col_str']" : "");
+
+        assertUpdate("CREATE TABLE " + tableName + "(col_str, col_int)" +
+                "WITH (location = '" + location + "'" + partitionQueryPart + ") " +
+                "AS VALUES ('str1', 1), ('str2', 2), ('str3', 3)", 3);
+        try (UncheckedCloseable ignored = onClose("DROP TABLE " + tableName)) {
+            assertUpdate("INSERT INTO " + tableName + " VALUES ('str4', 4)", 1);
+            assertQuery("SELECT * FROM " + tableName, "VALUES ('str1', 1), ('str2', 2), ('str3', 3), ('str4', 4)");
+
+            String expectedStatistics = """
+                    VALUES
+                    ('col_str', %s, 4.0, 0.0, null, null, null),
+                    ('col_int', null, 4.0, 0.0, null, 1, 4),
+                    (null, null, null, null, 4.0, null, null)"""
+                    .formatted(partitioned ? "475.0" : "264.0");
+
+            // Check extended statistics collection on write
+            assertQuery("SHOW STATS FOR " + tableName, expectedStatistics);
+
+            // drop stats
+            assertUpdate("ALTER TABLE " + tableName + " EXECUTE DROP_EXTENDED_STATS");
+            // Check extended statistics collection explicitly
+            assertUpdate("ANALYZE " + tableName);
+            assertQuery("SHOW STATS FOR " + tableName, expectedStatistics);
+        }
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestTrinoGlueCatalog.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestTrinoGlueCatalog.java
index 02ed726b260f..f69cef509c6b 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestTrinoGlueCatalog.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestTrinoGlueCatalog.java
@@ -21,7 +21,6 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.log.Logger;
 import io.trino.filesystem.TrinoFileSystemFactory;
-import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.NodeVersion;
 import io.trino.plugin.hive.metastore.glue.GlueMetastoreStats;
@@ -30,12 +29,13 @@
 import io.trino.plugin.iceberg.TableStatisticsWriter;
 import io.trino.plugin.iceberg.catalog.BaseTrinoCatalogTest;
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
+import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.security.PrincipalType;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.type.TestingTypeManager;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -44,10 +44,11 @@
 import java.util.Optional;
 
 import static io.airlift.json.JsonCodec.jsonCodec;
-import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY;
 import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.util.Locale.ENGLISH;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
@@ -60,13 +61,17 @@ public class TestTrinoGlueCatalog
     @Override
     protected TrinoCatalog createTrinoCatalog(boolean useUniqueTableLocations)
     {
-        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(HDFS_ENVIRONMENT);
+        TrinoFileSystemFactory fileSystemFactory = HDFS_FILE_SYSTEM_FACTORY;
         AWSGlueAsync glueClient = AWSGlueAsyncClientBuilder.defaultClient();
+        IcebergGlueCatalogConfig catalogConfig = new IcebergGlueCatalogConfig();
         return new TrinoGlueCatalog(
                 new CatalogName("catalog_name"),
                 fileSystemFactory,
                 new TestingTypeManager(),
+                catalogConfig.isCacheTableMetadata(),
                 new GlueIcebergTableOperationsProvider(
+                        TESTING_TYPE_MANAGER,
+                        catalogConfig,
                         fileSystemFactory,
                         new GlueMetastoreStats(),
                         glueClient),
@@ -106,6 +111,7 @@ public void testNonLowercaseGlueDatabase()
             // Test with IcebergMetadata, should the ConnectorMetadata implementation behavior depend on that class
             ConnectorMetadata icebergMetadata = new IcebergMetadata(
                     PLANNER_CONTEXT.getTypeManager(),
+                    CatalogHandle.fromId("iceberg:NORMAL:v12345"),
                     jsonCodec(CommitTaskData.class),
                     catalog,
                     connectorIdentity -> {
@@ -133,13 +139,17 @@ public void testDefaultLocation()
         Path tmpDirectory = Files.createTempDirectory("test_glue_catalog_default_location_");
         tmpDirectory.toFile().deleteOnExit();
 
-        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(HDFS_ENVIRONMENT);
+        TrinoFileSystemFactory fileSystemFactory = HDFS_FILE_SYSTEM_FACTORY;
         AWSGlueAsync glueClient = AWSGlueAsyncClientBuilder.defaultClient();
+        IcebergGlueCatalogConfig catalogConfig = new IcebergGlueCatalogConfig();
         TrinoCatalog catalogWithDefaultLocation = new TrinoGlueCatalog(
                 new CatalogName("catalog_name"),
                 fileSystemFactory,
                 new TestingTypeManager(),
+                catalogConfig.isCacheTableMetadata(),
                 new GlueIcebergTableOperationsProvider(
+                        TESTING_TYPE_MANAGER,
+                        catalogConfig,
                         fileSystemFactory,
                         new GlueMetastoreStats(),
                         glueClient),
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestingGlueIcebergTableOperationsProvider.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestingGlueIcebergTableOperationsProvider.java
index 190195889f46..84c9b6390dd3 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestingGlueIcebergTableOperationsProvider.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestingGlueIcebergTableOperationsProvider.java
@@ -15,6 +15,8 @@
 
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.services.glue.AWSGlueAsync;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.plugin.hive.metastore.glue.GlueHiveMetastoreConfig;
 import io.trino.plugin.hive.metastore.glue.GlueMetastoreStats;
@@ -23,8 +25,7 @@
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
 import io.trino.plugin.iceberg.fileio.ForwardingFileIo;
 import io.trino.spi.connector.ConnectorSession;
-
-import javax.inject.Inject;
+import io.trino.spi.type.TypeManager;
 
 import java.util.Optional;
 
@@ -34,25 +35,31 @@
 public class TestingGlueIcebergTableOperationsProvider
         implements IcebergTableOperationsProvider
 {
+    private final TypeManager typeManager;
+    private final boolean cacheTableMetadata;
     private final TrinoFileSystemFactory fileSystemFactory;
     private final AWSGlueAsync glueClient;
     private final GlueMetastoreStats stats;
 
     @Inject
     public TestingGlueIcebergTableOperationsProvider(
+            TypeManager typeManager,
+            IcebergGlueCatalogConfig catalogConfig,
             TrinoFileSystemFactory fileSystemFactory,
             GlueMetastoreStats stats,
             GlueHiveMetastoreConfig glueConfig,
             AWSCredentialsProvider credentialsProvider,
             AWSGlueAsyncAdapterProvider awsGlueAsyncAdapterProvider)
     {
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.cacheTableMetadata = catalogConfig.isCacheTableMetadata();
         this.fileSystemFactory = requireNonNull(fileSystemFactory, "fileSystemFactory is null");
         this.stats = requireNonNull(stats, "stats is null");
         requireNonNull(glueConfig, "glueConfig is null");
         requireNonNull(credentialsProvider, "credentialsProvider is null");
         requireNonNull(awsGlueAsyncAdapterProvider, "awsGlueAsyncAdapterProvider is null");
         this.glueClient = awsGlueAsyncAdapterProvider.createAWSGlueAsyncAdapter(
-                createAsyncGlueClient(glueConfig, credentialsProvider, Optional.empty(), stats.newRequestMetricsCollector()));
+                createAsyncGlueClient(glueConfig, credentialsProvider, ImmutableSet.of(), stats.newRequestMetricsCollector()));
     }
 
     @Override
@@ -65,8 +72,11 @@ public IcebergTableOperations createTableOperations(
             Optional<String> location)
     {
         return new GlueIcebergTableOperations(
+                typeManager,
+                cacheTableMetadata,
                 glueClient,
                 stats,
+                ((TrinoGlueCatalog) catalog)::getTable,
                 new ForwardingFileIo(fileSystemFactory.create(session)),
                 session,
                 database,
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestingIcebergGlueCatalogModule.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestingIcebergGlueCatalogModule.java
index 8a49035e683b..46493fea3191 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestingIcebergGlueCatalogModule.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestingIcebergGlueCatalogModule.java
@@ -18,9 +18,7 @@
 import com.amazonaws.services.glue.model.Table;
 import com.google.inject.Binder;
 import com.google.inject.Key;
-import com.google.inject.Provides;
 import com.google.inject.Scopes;
-import com.google.inject.Singleton;
 import com.google.inject.TypeLiteral;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.plugin.hive.HideDeltaLakeTables;
@@ -34,7 +32,9 @@
 
 import java.util.function.Predicate;
 
+import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
+import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static java.util.Objects.requireNonNull;
 import static org.weakref.jmx.guice.ExportBinder.newExporter;
@@ -62,18 +62,15 @@ protected void setup(Binder binder)
         newExporter(binder).export(TrinoCatalogFactory.class).withGeneratedName();
         binder.bind(AWSGlueAsyncAdapterProvider.class).toInstance(awsGlueAsyncAdapterProvider);
 
+        install(conditionalModule(
+                IcebergGlueCatalogConfig.class,
+                IcebergGlueCatalogConfig::isSkipArchive,
+                internalBinder -> newSetBinder(internalBinder, RequestHandler2.class, ForGlueHiveMetastore.class).addBinding().toInstance(new SkipArchiveRequestHandler())));
+
         // Required to inject HiveMetastoreFactory for migrate procedure
         binder.bind(Key.get(boolean.class, HideDeltaLakeTables.class)).toInstance(false);
         newOptionalBinder(binder, Key.get(new TypeLiteral<Predicate<Table>>() {}, ForGlueHiveMetastore.class))
                 .setBinding().toInstance(table -> true);
         install(new GlueMetastoreModule());
     }
-
-    @Provides
-    @Singleton
-    @ForGlueHiveMetastore
-    public static RequestHandler2 createRequestHandler(IcebergGlueCatalogConfig config)
-    {
-        return new SkipArchiveRequestHandler(config.isSkipArchive());
-    }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/hms/TestIcebergHiveMetastoreTableOperationsReleaseLockFailure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/hms/TestIcebergHiveMetastoreTableOperationsReleaseLockFailure.java
index 456815db1754..0ee57e0c3f1f 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/hms/TestIcebergHiveMetastoreTableOperationsReleaseLockFailure.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/hms/TestIcebergHiveMetastoreTableOperationsReleaseLockFailure.java
@@ -31,7 +31,7 @@
 import io.trino.spi.security.PrincipalType;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -49,7 +49,8 @@ public class TestIcebergHiveMetastoreTableOperationsReleaseLockFailure
     private File baseDir;
 
     @Override
-    protected LocalQueryRunner createQueryRunner() throws Exception
+    protected LocalQueryRunner createQueryRunner()
+            throws Exception
     {
         Session session = testSessionBuilder()
                 .setCatalog(ICEBERG_CATALOG)
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/hms/TestTrinoHiveCatalogWithHiveMetastore.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/hms/TestTrinoHiveCatalogWithHiveMetastore.java
index 465fd994b778..51a139524bff 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/hms/TestTrinoHiveCatalogWithHiveMetastore.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/hms/TestTrinoHiveCatalogWithHiveMetastore.java
@@ -21,7 +21,10 @@
 import io.trino.hdfs.HdfsConfig;
 import io.trino.hdfs.HdfsConfigurationInitializer;
 import io.trino.hdfs.HdfsEnvironment;
+import io.trino.hdfs.TrinoHdfsFileSystemStats;
 import io.trino.hdfs.authentication.NoHdfsAuthentication;
+import io.trino.hdfs.s3.HiveS3Config;
+import io.trino.hdfs.s3.TrinoS3ConfigurationInitializer;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.hive.TrinoViewHiveMetastore;
 import io.trino.plugin.hive.containers.HiveMinioDataLake;
@@ -30,15 +33,14 @@
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastore;
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreConfig;
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreFactory;
-import io.trino.plugin.hive.s3.HiveS3Config;
-import io.trino.plugin.hive.s3.TrinoS3ConfigurationInitializer;
 import io.trino.plugin.iceberg.IcebergSchemaProperties;
 import io.trino.plugin.iceberg.catalog.BaseTrinoCatalogTest;
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.type.TestingTypeManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Map;
 import java.util.Optional;
@@ -52,7 +54,9 @@
 import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
 import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
 import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestTrinoHiveCatalogWithHiveMetastore
         extends BaseTrinoCatalogTest
 {
@@ -61,14 +65,14 @@ public class TestTrinoHiveCatalogWithHiveMetastore
     // Use MinIO for storage, since HDFS is hard to get working in a unit test
     private HiveMinioDataLake dataLake;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         dataLake = new HiveMinioDataLake(bucketName, HIVE3_IMAGE);
         dataLake.start();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -93,11 +97,12 @@ protected TrinoCatalog createTrinoCatalog(boolean useUniqueTableLocations)
                                         .setS3PathStyleAccess(true)))),
                         ImmutableSet.of()),
                 new HdfsConfig(),
-                new NoHdfsAuthentication()));
+                new NoHdfsAuthentication()),
+                new TrinoHdfsFileSystemStats());
         ThriftMetastore thriftMetastore = testingThriftHiveMetastoreBuilder()
                 .thriftMetastoreConfig(new ThriftMetastoreConfig()
                         // Read timed out sometimes happens with the default timeout
-                        .setMetastoreTimeout(new Duration(1, MINUTES)))
+                        .setReadTimeout(new Duration(1, MINUTES)))
                 .metastoreClient(dataLake.getHiveHadoop().getHiveMetastoreEndpoint())
                 .build();
         CachingHiveMetastore metastore = memoizeMetastore(new BridgingHiveMetastore(thriftMetastore), 1000);
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/jdbc/TestIcebergJdbcCatalogConfig.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/jdbc/TestIcebergJdbcCatalogConfig.java
index 5777f9225310..317bd9f94b5e 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/jdbc/TestIcebergJdbcCatalogConfig.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/jdbc/TestIcebergJdbcCatalogConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.iceberg.catalog.jdbc;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/jdbc/TestIcebergJdbcCatalogConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/jdbc/TestIcebergJdbcCatalogConnectorSmokeTest.java
index 59d05e3488f6..12f5e9d098f7 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/jdbc/TestIcebergJdbcCatalogConnectorSmokeTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/jdbc/TestIcebergJdbcCatalogConnectorSmokeTest.java
@@ -14,16 +14,20 @@
 package io.trino.plugin.iceberg.catalog.jdbc;
 
 import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.Location;
 import io.trino.hadoop.ConfigurationInstantiator;
 import io.trino.plugin.iceberg.BaseIcebergConnectorSmokeTest;
 import io.trino.plugin.iceberg.IcebergConfig;
 import io.trino.plugin.iceberg.IcebergQueryRunner;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
+import io.trino.testng.services.ManageTestResources;
 import org.apache.iceberg.BaseTable;
 import org.apache.iceberg.catalog.TableIdentifier;
 import org.apache.iceberg.jdbc.JdbcCatalog;
-import org.testng.annotations.AfterClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,6 +38,7 @@
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.trino.plugin.iceberg.IcebergTestUtils.checkOrcFileSorting;
+import static io.trino.plugin.iceberg.IcebergTestUtils.checkParquetFileSorting;
 import static io.trino.plugin.iceberg.catalog.jdbc.TestingIcebergJdbcServer.PASSWORD;
 import static io.trino.plugin.iceberg.catalog.jdbc.TestingIcebergJdbcServer.USER;
 import static java.lang.String.format;
@@ -41,12 +46,16 @@
 import static org.apache.iceberg.CatalogProperties.URI;
 import static org.apache.iceberg.CatalogProperties.WAREHOUSE_LOCATION;
 import static org.apache.iceberg.CatalogUtil.buildIcebergCatalog;
+import static org.apache.iceberg.FileFormat.PARQUET;
 import static org.apache.iceberg.jdbc.JdbcCatalog.PROPERTY_PREFIX;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestIcebergJdbcCatalogConnectorSmokeTest
         extends BaseIcebergConnectorSmokeTest
 {
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
     private JdbcCatalog jdbcCatalog;
     private File warehouseLocation;
 
@@ -55,14 +64,16 @@ public TestIcebergJdbcCatalogConnectorSmokeTest()
         super(new IcebergConfig().getFileFormat().toIceberg());
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
         return switch (connectorBehavior) {
-            case SUPPORTS_RENAME_SCHEMA -> false;
-            case SUPPORTS_CREATE_VIEW, SUPPORTS_COMMENT_ON_VIEW, SUPPORTS_COMMENT_ON_VIEW_COLUMN -> false;
-            case SUPPORTS_CREATE_MATERIALIZED_VIEW, SUPPORTS_RENAME_MATERIALIZED_VIEW -> false;
+            case SUPPORTS_COMMENT_ON_VIEW,
+                    SUPPORTS_COMMENT_ON_VIEW_COLUMN,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_RENAME_MATERIALIZED_VIEW,
+                    SUPPORTS_RENAME_SCHEMA -> false;
             default -> super.hasBehavior(connectorBehavior);
         };
     }
@@ -100,13 +111,14 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public final void destroy()
     {
         jdbcCatalog.close();
         jdbcCatalog = null;
     }
 
+    @Test
     @Override
     public void testView()
     {
@@ -114,6 +126,7 @@ public void testView()
                 .hasMessageContaining("createView is not supported for Iceberg JDBC catalogs");
     }
 
+    @Test
     @Override
     public void testMaterializedView()
     {
@@ -121,6 +134,7 @@ public void testMaterializedView()
                 .hasMessageContaining("createMaterializedView is not supported for Iceberg JDBC catalogs");
     }
 
+    @Test
     @Override
     public void testRenameSchema()
     {
@@ -170,8 +184,11 @@ protected void deleteDirectory(String location)
     }
 
     @Override
-    protected boolean isFileSorted(String path, String sortColumnName)
+    protected boolean isFileSorted(Location path, String sortColumnName)
     {
-        return checkOrcFileSorting(path, sortColumnName);
+        if (format == PARQUET) {
+            return checkParquetFileSorting(fileSystem.newInputFile(path), sortColumnName);
+        }
+        return checkOrcFileSorting(fileSystem, path, sortColumnName);
     }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/nessie/TestIcebergNessieCatalogConfig.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/nessie/TestIcebergNessieCatalogConfig.java
new file mode 100644
index 000000000000..805b66dea860
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/nessie/TestIcebergNessieCatalogConfig.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.catalog.nessie;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.jupiter.api.Test;
+
+import java.net.URI;
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+
+public class TestIcebergNessieCatalogConfig
+{
+    @Test
+    public void testDefaults()
+    {
+        assertRecordedDefaults(recordDefaults(IcebergNessieCatalogConfig.class)
+                .setDefaultWarehouseDir(null)
+                .setServerUri(null)
+                .setDefaultReferenceName("main"));
+    }
+
+    @Test
+    public void testExplicitPropertyMapping()
+    {
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("iceberg.nessie-catalog.default-warehouse-dir", "/tmp")
+                .put("iceberg.nessie-catalog.uri", "http://localhost:xxx/api/v1")
+                .put("iceberg.nessie-catalog.ref", "someRef")
+                .buildOrThrow();
+
+        IcebergNessieCatalogConfig expected = new IcebergNessieCatalogConfig()
+                .setDefaultWarehouseDir("/tmp")
+                .setServerUri(URI.create("http://localhost:xxx/api/v1"))
+                .setDefaultReferenceName("someRef");
+
+        assertFullMapping(properties, expected);
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/nessie/TestIcebergNessieCatalogConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/nessie/TestIcebergNessieCatalogConnectorSmokeTest.java
new file mode 100644
index 000000000000..d29eb5d0474d
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/nessie/TestIcebergNessieCatalogConnectorSmokeTest.java
@@ -0,0 +1,298 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.catalog.nessie;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.Location;
+import io.trino.plugin.iceberg.BaseIcebergConnectorSmokeTest;
+import io.trino.plugin.iceberg.IcebergConfig;
+import io.trino.plugin.iceberg.IcebergQueryRunner;
+import io.trino.plugin.iceberg.SchemaInitializer;
+import io.trino.plugin.iceberg.containers.NessieContainer;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.TestingConnectorBehavior;
+import io.trino.tpch.TpchTable;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import static com.google.common.io.MoreFiles.deleteRecursively;
+import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
+import static io.trino.plugin.iceberg.IcebergTestUtils.checkOrcFileSorting;
+import static io.trino.plugin.iceberg.IcebergTestUtils.checkParquetFileSorting;
+import static java.lang.String.format;
+import static org.apache.iceberg.FileFormat.PARQUET;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.abort;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestIcebergNessieCatalogConnectorSmokeTest
+        extends BaseIcebergConnectorSmokeTest
+{
+    private Path tempDir;
+
+    public TestIcebergNessieCatalogConnectorSmokeTest()
+    {
+        super(new IcebergConfig().getFileFormat().toIceberg());
+    }
+
+    @AfterAll
+    public void teardown()
+            throws IOException
+    {
+        deleteRecursively(tempDir, ALLOW_INSECURE);
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        NessieContainer nessieContainer = closeAfterClass(NessieContainer.builder().build());
+        nessieContainer.start();
+
+        tempDir = Files.createTempDirectory("test_trino_nessie_catalog");
+
+        return IcebergQueryRunner.builder()
+                .setBaseDataDir(Optional.of(tempDir))
+                .setIcebergProperties(
+                        ImmutableMap.of(
+                                "iceberg.file-format", format.name(),
+                                "iceberg.catalog.type", "nessie",
+                                "iceberg.nessie-catalog.uri", nessieContainer.getRestApiUri(),
+                                "iceberg.nessie-catalog.default-warehouse-dir", tempDir.toString(),
+                                "iceberg.writer-sort-buffer-size", "1MB"))
+                .setSchemaInitializer(
+                        SchemaInitializer.builder()
+                                .withClonedTpchTables(ImmutableList.<TpchTable<?>>builder()
+                                        .addAll(REQUIRED_TPCH_TABLES)
+                                        .build())
+                                .build())
+                .build();
+    }
+
+    @Override
+    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
+    {
+        return switch (connectorBehavior) {
+            case SUPPORTS_CREATE_VIEW, SUPPORTS_CREATE_MATERIALIZED_VIEW, SUPPORTS_RENAME_SCHEMA -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
+
+    @Test
+    @Override
+    public void testView()
+    {
+        assertThatThrownBy(super::testView)
+                .hasStackTraceContaining("createView is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Test
+    @Override
+    public void testMaterializedView()
+    {
+        assertThatThrownBy(super::testMaterializedView)
+                .hasStackTraceContaining("createMaterializedView is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Test
+    @Override
+    public void testRenameSchema()
+    {
+        assertThatThrownBy(super::testRenameSchema)
+                .hasStackTraceContaining("renameNamespace is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Test
+    @Override
+    public void testDeleteRowsConcurrently()
+    {
+        abort("skipped for now due to flakiness");
+    }
+
+    @Override
+    protected void dropTableFromMetastore(String tableName)
+    {
+        // used when registering a table, which is not supported by the Nessie catalog
+    }
+
+    @Override
+    protected String getMetadataLocation(String tableName)
+    {
+        // used when registering a table, which is not supported by the Nessie catalog
+        throw new UnsupportedOperationException("metadata location for register_table is not supported");
+    }
+
+    @Test
+    @Override
+    public void testRegisterTableWithTableLocation()
+    {
+        assertThatThrownBy(super::testRegisterTableWithTableLocation)
+                .hasMessageContaining("register_table procedure is disabled");
+    }
+
+    @Test
+    @Override
+    public void testRegisterTableWithComments()
+    {
+        assertThatThrownBy(super::testRegisterTableWithComments)
+                .hasMessageContaining("register_table procedure is disabled");
+    }
+
+    @Test
+    @Override
+    public void testRegisterTableWithShowCreateTable()
+    {
+        assertThatThrownBy(super::testRegisterTableWithShowCreateTable)
+                .hasMessageContaining("register_table procedure is disabled");
+    }
+
+    @Test
+    @Override
+    public void testRegisterTableWithReInsert()
+    {
+        assertThatThrownBy(super::testRegisterTableWithReInsert)
+                .hasMessageContaining("register_table procedure is disabled");
+    }
+
+    @Test
+    @Override
+    public void testRegisterTableWithDroppedTable()
+    {
+        assertThatThrownBy(super::testRegisterTableWithDroppedTable)
+                .hasMessageContaining("register_table procedure is disabled");
+    }
+
+    @Test
+    @Override
+    public void testRegisterTableWithDifferentTableName()
+    {
+        assertThatThrownBy(super::testRegisterTableWithDifferentTableName)
+                .hasMessageContaining("register_table procedure is disabled");
+    }
+
+    @Test
+    @Override
+    public void testRegisterTableWithMetadataFile()
+    {
+        assertThatThrownBy(super::testRegisterTableWithMetadataFile)
+                .hasMessageContaining("metadata location for register_table is not supported");
+    }
+
+    @Test
+    @Override
+    public void testRegisterTableWithTrailingSpaceInLocation()
+    {
+        assertThatThrownBy(super::testRegisterTableWithTrailingSpaceInLocation)
+                .hasMessageContaining("register_table procedure is disabled");
+    }
+
+    @Test
+    @Override
+    public void testUnregisterTable()
+    {
+        assertThatThrownBy(super::testUnregisterTable)
+                .hasStackTraceContaining("unregisterTable is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Test
+    @Override
+    public void testUnregisterBrokenTable()
+    {
+        assertThatThrownBy(super::testUnregisterBrokenTable)
+                .hasStackTraceContaining("unregisterTable is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Test
+    @Override
+    public void testUnregisterTableNotExistingTable()
+    {
+        assertThatThrownBy(super::testUnregisterTableNotExistingTable)
+                .hasStackTraceContaining("unregisterTable is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Test
+    @Override
+    public void testRepeatUnregisterTable()
+    {
+        assertThatThrownBy(super::testRepeatUnregisterTable)
+                .hasStackTraceContaining("unregisterTable is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Test
+    @Override
+    public void testDropTableWithMissingMetadataFile()
+    {
+        assertThatThrownBy(super::testDropTableWithMissingMetadataFile)
+                .hasMessageMatching("metadata location for register_table is not supported");
+    }
+
+    @Test
+    @Override
+    public void testDropTableWithMissingSnapshotFile()
+    {
+        assertThatThrownBy(super::testDropTableWithMissingSnapshotFile)
+                .hasMessageMatching("metadata location for register_table is not supported");
+    }
+
+    @Test
+    @Override
+    public void testDropTableWithMissingManifestListFile()
+    {
+        assertThatThrownBy(super::testDropTableWithMissingManifestListFile)
+                .hasMessageContaining("metadata location for register_table is not supported");
+    }
+
+    @Test
+    @Override
+    public void testDropTableWithNonExistentTableLocation()
+    {
+        assertThatThrownBy(super::testDropTableWithNonExistentTableLocation)
+                .hasMessageMatching("Cannot drop corrupted table (.*)");
+    }
+
+    @Override
+    protected boolean isFileSorted(Location path, String sortColumnName)
+    {
+        if (format == PARQUET) {
+            return checkParquetFileSorting(fileSystem.newInputFile(path), sortColumnName);
+        }
+        return checkOrcFileSorting(fileSystem, path, sortColumnName);
+    }
+
+    @Override
+    protected void deleteDirectory(String location)
+    {
+        // used when unregistering a table, which is not supported by the Nessie catalog
+    }
+
+    @Override
+    protected String schemaPath()
+    {
+        return format("%s/%s", tempDir, getSession().getSchema().orElseThrow());
+    }
+
+    @Override
+    protected boolean locationExists(String location)
+    {
+        return Files.exists(Path.of(location));
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/nessie/TestTrinoNessieCatalog.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/nessie/TestTrinoNessieCatalog.java
new file mode 100644
index 000000000000..0e6c3ffbb29b
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/nessie/TestTrinoNessieCatalog.java
@@ -0,0 +1,198 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.catalog.nessie;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.filesystem.TrinoFileSystemFactory;
+import io.trino.filesystem.hdfs.HdfsFileSystemFactory;
+import io.trino.plugin.base.CatalogName;
+import io.trino.plugin.hive.NodeVersion;
+import io.trino.plugin.iceberg.CommitTaskData;
+import io.trino.plugin.iceberg.IcebergMetadata;
+import io.trino.plugin.iceberg.TableStatisticsWriter;
+import io.trino.plugin.iceberg.catalog.BaseTrinoCatalogTest;
+import io.trino.plugin.iceberg.catalog.TrinoCatalog;
+import io.trino.plugin.iceberg.containers.NessieContainer;
+import io.trino.spi.connector.CatalogHandle;
+import io.trino.spi.connector.ConnectorMetadata;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.security.PrincipalType;
+import io.trino.spi.security.TrinoPrincipal;
+import io.trino.spi.type.TestingTypeManager;
+import org.apache.iceberg.nessie.NessieIcebergClient;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.projectnessie.client.api.NessieApiV1;
+import org.projectnessie.client.http.HttpClientBuilder;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Path;
+import java.util.Map;
+
+import static io.airlift.json.JsonCodec.jsonCodec;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;
+import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_STATS;
+import static io.trino.sql.planner.TestingPlannerContext.PLANNER_CONTEXT;
+import static io.trino.testing.TestingConnectorSession.SESSION;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static java.nio.file.Files.createTempDirectory;
+import static java.util.Locale.ENGLISH;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.fail;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestTrinoNessieCatalog
+        extends BaseTrinoCatalogTest
+{
+    private NessieContainer nessieContainer;
+
+    @BeforeAll
+    public void setupServer()
+    {
+        nessieContainer = NessieContainer.builder().build();
+        nessieContainer.start();
+    }
+
+    @AfterAll
+    public void teardownServer()
+    {
+        if (nessieContainer != null) {
+            nessieContainer.close();
+        }
+    }
+
+    @Override
+    protected TrinoCatalog createTrinoCatalog(boolean useUniqueTableLocations)
+    {
+        Path tmpDirectory = null;
+        try {
+            tmpDirectory = createTempDirectory("test_nessie_catalog_warehouse_dir_");
+        }
+        catch (IOException e) {
+            fail(e.getMessage());
+        }
+        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS);
+        IcebergNessieCatalogConfig icebergNessieCatalogConfig = new IcebergNessieCatalogConfig()
+                .setServerUri(URI.create(nessieContainer.getRestApiUri()));
+        NessieApiV1 nessieApi = HttpClientBuilder.builder()
+                .withUri(nessieContainer.getRestApiUri())
+                .build(NessieApiV1.class);
+        NessieIcebergClient nessieClient = new NessieIcebergClient(nessieApi, icebergNessieCatalogConfig.getDefaultReferenceName(), null, ImmutableMap.of());
+        return new TrinoNessieCatalog(
+                new CatalogName("catalog_name"),
+                new TestingTypeManager(),
+                fileSystemFactory,
+                new IcebergNessieTableOperationsProvider(fileSystemFactory, nessieClient),
+                nessieClient,
+                tmpDirectory.toAbsolutePath().toString(),
+                useUniqueTableLocations);
+    }
+
+    @Test
+    public void testDefaultLocation()
+            throws IOException
+    {
+        Path tmpDirectory = createTempDirectory("test_nessie_catalog_default_location_");
+        tmpDirectory.toFile().deleteOnExit();
+        TrinoFileSystemFactory fileSystemFactory = new HdfsFileSystemFactory(HDFS_ENVIRONMENT, HDFS_FILE_SYSTEM_STATS);
+        IcebergNessieCatalogConfig icebergNessieCatalogConfig = new IcebergNessieCatalogConfig()
+                .setDefaultWarehouseDir(tmpDirectory.toAbsolutePath().toString())
+                .setServerUri(URI.create(nessieContainer.getRestApiUri()));
+        NessieApiV1 nessieApi = HttpClientBuilder.builder()
+                .withUri(nessieContainer.getRestApiUri())
+                .build(NessieApiV1.class);
+        NessieIcebergClient nessieClient = new NessieIcebergClient(nessieApi, icebergNessieCatalogConfig.getDefaultReferenceName(), null, ImmutableMap.of());
+        TrinoCatalog catalogWithDefaultLocation = new TrinoNessieCatalog(
+                new CatalogName("catalog_name"),
+                new TestingTypeManager(),
+                fileSystemFactory,
+                new IcebergNessieTableOperationsProvider(fileSystemFactory, nessieClient),
+                nessieClient,
+                icebergNessieCatalogConfig.getDefaultWarehouseDir(),
+                false);
+
+        String namespace = "test_default_location_" + randomNameSuffix();
+        String table = "tableName";
+        SchemaTableName schemaTableName = new SchemaTableName(namespace, table);
+        catalogWithDefaultLocation.createNamespace(SESSION, namespace, ImmutableMap.of(),
+                new TrinoPrincipal(PrincipalType.USER, SESSION.getUser()));
+        try {
+            File expectedSchemaDirectory = new File(tmpDirectory.toFile(), namespace);
+            File expectedTableDirectory = new File(expectedSchemaDirectory, schemaTableName.getTableName());
+            assertThat(catalogWithDefaultLocation.defaultTableLocation(SESSION, schemaTableName))
+                    .isEqualTo(expectedTableDirectory.toPath().toAbsolutePath().toString());
+        }
+        finally {
+            catalogWithDefaultLocation.dropNamespace(SESSION, namespace);
+        }
+    }
+
+    @Test
+    @Override
+    public void testView()
+    {
+        assertThatThrownBy(super::testView)
+                .hasMessageContaining("createView is not supported for Iceberg Nessie catalogs");
+    }
+
+    @Test
+    @Override
+    public void testNonLowercaseNamespace()
+    {
+        TrinoCatalog catalog = createTrinoCatalog(false);
+
+        String namespace = "testNonLowercaseNamespace" + randomNameSuffix();
+        String schema = namespace.toLowerCase(ENGLISH);
+
+        // Currently this is actually stored in lowercase by all Catalogs
+        catalog.createNamespace(SESSION, namespace, Map.of(), new TrinoPrincipal(PrincipalType.USER, SESSION.getUser()));
+        try {
+            assertThat(catalog.namespaceExists(SESSION, namespace)).as("catalog.namespaceExists(namespace)")
+                    .isTrue();
+            assertThat(catalog.namespaceExists(SESSION, schema)).as("catalog.namespaceExists(schema)")
+                    .isFalse();
+            assertThat(catalog.listNamespaces(SESSION)).as("catalog.listNamespaces")
+                    // Catalog listNamespaces may be used as a default implementation for ConnectorMetadata.schemaExists
+                    .doesNotContain(schema)
+                    .contains(namespace);
+
+            // Test with IcebergMetadata, should the ConnectorMetadata implementation behavior depend on that class
+            ConnectorMetadata icebergMetadata = new IcebergMetadata(
+                    PLANNER_CONTEXT.getTypeManager(),
+                    CatalogHandle.fromId("iceberg:NORMAL:v12345"),
+                    jsonCodec(CommitTaskData.class),
+                    catalog,
+                    connectorIdentity -> {
+                        throw new UnsupportedOperationException();
+                    },
+                    new TableStatisticsWriter(new NodeVersion("test-version")));
+            assertThat(icebergMetadata.schemaExists(SESSION, namespace)).as("icebergMetadata.schemaExists(namespace)")
+                    .isTrue();
+            assertThat(icebergMetadata.schemaExists(SESSION, schema)).as("icebergMetadata.schemaExists(schema)")
+                    .isFalse();
+            assertThat(icebergMetadata.listSchemaNames(SESSION)).as("icebergMetadata.listSchemaNames")
+                    .doesNotContain(schema)
+                    .contains(namespace);
+        }
+        finally {
+            catalog.dropNamespace(SESSION, namespace);
+        }
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergRestCatalogConfig.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergRestCatalogConfig.java
index 5e411999f304..d544286fcd2a 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergRestCatalogConfig.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergRestCatalogConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.iceberg.catalog.rest;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergTrinoRestCatalogConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergTrinoRestCatalogConnectorSmokeTest.java
index adc285b34e12..83531c14ae12 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergTrinoRestCatalogConnectorSmokeTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergTrinoRestCatalogConnectorSmokeTest.java
@@ -15,14 +15,22 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.http.server.testing.TestingHttpServer;
+import io.trino.filesystem.Location;
 import io.trino.plugin.iceberg.BaseIcebergConnectorSmokeTest;
 import io.trino.plugin.iceberg.IcebergConfig;
 import io.trino.plugin.iceberg.IcebergQueryRunner;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
+import io.trino.testng.services.ManageTestResources;
+import org.apache.iceberg.BaseTable;
 import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.jdbc.JdbcCatalog;
 import org.apache.iceberg.rest.DelegatingRestSessionCatalog;
 import org.assertj.core.util.Files;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -31,28 +39,37 @@
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static io.trino.plugin.iceberg.IcebergTestUtils.checkOrcFileSorting;
+import static io.trino.plugin.iceberg.IcebergTestUtils.checkParquetFileSorting;
 import static io.trino.plugin.iceberg.catalog.rest.RestCatalogTestUtils.backendCatalog;
 import static java.lang.String.format;
+import static org.apache.iceberg.FileFormat.PARQUET;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestIcebergTrinoRestCatalogConnectorSmokeTest
         extends BaseIcebergConnectorSmokeTest
 {
     private File warehouseLocation;
 
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
+    private Catalog backend;
+
     public TestIcebergTrinoRestCatalogConnectorSmokeTest()
     {
         super(new IcebergConfig().getFileFormat().toIceberg());
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
         return switch (connectorBehavior) {
-            case SUPPORTS_RENAME_SCHEMA -> false;
-            case SUPPORTS_CREATE_VIEW, SUPPORTS_COMMENT_ON_VIEW, SUPPORTS_COMMENT_ON_VIEW_COLUMN -> false;
-            case SUPPORTS_CREATE_MATERIALIZED_VIEW, SUPPORTS_RENAME_MATERIALIZED_VIEW -> false;
+            case SUPPORTS_COMMENT_ON_VIEW,
+                    SUPPORTS_COMMENT_ON_VIEW_COLUMN,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_RENAME_MATERIALIZED_VIEW,
+                    SUPPORTS_RENAME_SCHEMA -> false;
             default -> super.hasBehavior(connectorBehavior);
         };
     }
@@ -64,7 +81,7 @@ protected QueryRunner createQueryRunner()
         warehouseLocation = Files.newTemporaryFolder();
         closeAfterClass(() -> deleteRecursively(warehouseLocation.toPath(), ALLOW_INSECURE));
 
-        Catalog backend = backendCatalog(warehouseLocation);
+        backend = closeAfterClass((JdbcCatalog) backendCatalog(warehouseLocation));
 
         DelegatingRestSessionCatalog delegatingCatalog = DelegatingRestSessionCatalog.builder()
                 .delegate(backend)
@@ -88,6 +105,13 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
+    @AfterAll
+    public void teardown()
+    {
+        backend = null; // closed by closeAfterClass
+    }
+
+    @Test
     @Override
     public void testView()
     {
@@ -95,6 +119,7 @@ public void testView()
                 .hasMessageContaining("createView is not supported for Iceberg REST catalog");
     }
 
+    @Test
     @Override
     public void testMaterializedView()
     {
@@ -102,6 +127,7 @@ public void testMaterializedView()
                 .hasMessageContaining("createMaterializedView is not supported for Iceberg REST catalog");
     }
 
+    @Test
     @Override
     public void testRenameSchema()
     {
@@ -118,8 +144,8 @@ protected void dropTableFromMetastore(String tableName)
     @Override
     protected String getMetadataLocation(String tableName)
     {
-        // used when registering a table, which is not supported by the REST catalog
-        throw new UnsupportedOperationException("metadata location for register_table is not supported");
+        BaseTable table = (BaseTable) backend.loadTable(toIdentifier(tableName));
+        return table.operations().current().metadataFileLocation();
     }
 
     @Override
@@ -134,6 +160,7 @@ protected boolean locationExists(String location)
         return java.nio.file.Files.exists(Path.of(location));
     }
 
+    @Test
     @Override
     public void testRegisterTableWithTableLocation()
     {
@@ -141,6 +168,7 @@ public void testRegisterTableWithTableLocation()
                 .hasMessageContaining("registerTable is not supported for Iceberg REST catalog");
     }
 
+    @Test
     @Override
     public void testRegisterTableWithComments()
     {
@@ -148,6 +176,7 @@ public void testRegisterTableWithComments()
                 .hasMessageContaining("registerTable is not supported for Iceberg REST catalog");
     }
 
+    @Test
     @Override
     public void testRegisterTableWithShowCreateTable()
     {
@@ -155,6 +184,7 @@ public void testRegisterTableWithShowCreateTable()
                 .hasMessageContaining("registerTable is not supported for Iceberg REST catalog");
     }
 
+    @Test
     @Override
     public void testRegisterTableWithReInsert()
     {
@@ -162,6 +192,7 @@ public void testRegisterTableWithReInsert()
                 .hasMessageContaining("registerTable is not supported for Iceberg REST catalog");
     }
 
+    @Test
     @Override
     public void testRegisterTableWithDifferentTableName()
     {
@@ -169,13 +200,15 @@ public void testRegisterTableWithDifferentTableName()
                 .hasMessageContaining("registerTable is not supported for Iceberg REST catalog");
     }
 
+    @Test
     @Override
     public void testRegisterTableWithMetadataFile()
     {
         assertThatThrownBy(super::testRegisterTableWithMetadataFile)
-                .hasMessageContaining("metadata location for register_table is not supported");
+                .hasMessageContaining("registerTable is not supported for Iceberg REST catalog");
     }
 
+    @Test
     @Override
     public void testRegisterTableWithTrailingSpaceInLocation()
     {
@@ -183,6 +216,7 @@ public void testRegisterTableWithTrailingSpaceInLocation()
                 .hasMessageContaining("registerTable is not supported for Iceberg REST catalog");
     }
 
+    @Test
     @Override
     public void testUnregisterTable()
     {
@@ -190,6 +224,7 @@ public void testUnregisterTable()
                 .hasMessageContaining("unregisterTable is not supported for Iceberg REST catalogs");
     }
 
+    @Test
     @Override
     public void testUnregisterBrokenTable()
     {
@@ -197,6 +232,7 @@ public void testUnregisterBrokenTable()
                 .hasMessageContaining("unregisterTable is not supported for Iceberg REST catalogs");
     }
 
+    @Test
     @Override
     public void testUnregisterTableNotExistingTable()
     {
@@ -204,6 +240,7 @@ public void testUnregisterTableNotExistingTable()
                 .hasMessageContaining("unregisterTable is not supported for Iceberg REST catalogs");
     }
 
+    @Test
     @Override
     public void testRepeatUnregisterTable()
     {
@@ -211,10 +248,53 @@ public void testRepeatUnregisterTable()
                 .hasMessageContaining("unregisterTable is not supported for Iceberg REST catalogs");
     }
 
+    @Test
     @Override
-    protected boolean isFileSorted(String path, String sortColumnName)
+    public void testDropTableWithMissingMetadataFile()
     {
-        return checkOrcFileSorting(path, sortColumnName);
+        assertThatThrownBy(super::testDropTableWithMissingMetadataFile)
+                .hasMessageMatching("Failed to load table: (.*)");
+    }
+
+    @Test
+    @Override
+    public void testDropTableWithMissingSnapshotFile()
+    {
+        assertThatThrownBy(super::testDropTableWithMissingSnapshotFile)
+                .hasMessageMatching("Server error: NotFoundException: Failed to open input stream for file: (.*)");
+    }
+
+    @Test
+    @Override
+    public void testDropTableWithMissingManifestListFile()
+    {
+        assertThatThrownBy(super::testDropTableWithMissingManifestListFile)
+                .hasMessageContaining("Table location should not exist expected [false] but found [true]");
+    }
+
+    @Test
+    @Override
+    public void testDropTableWithMissingDataFile()
+    {
+        assertThatThrownBy(super::testDropTableWithMissingDataFile)
+                .hasMessageContaining("Table location should not exist expected [false] but found [true]");
+    }
+
+    @Test
+    @Override
+    public void testDropTableWithNonExistentTableLocation()
+    {
+        assertThatThrownBy(super::testDropTableWithNonExistentTableLocation)
+                .hasMessageMatching("Failed to load table: (.*)");
+    }
+
+    @Override
+    protected boolean isFileSorted(Location path, String sortColumnName)
+    {
+        if (format == PARQUET) {
+            return checkParquetFileSorting(fileSystem.newInputFile(path), sortColumnName);
+        }
+        return checkOrcFileSorting(fileSystem, path, sortColumnName);
     }
 
     @Override
@@ -222,4 +302,9 @@ protected void deleteDirectory(String location)
     {
         // used when unregistering a table, which is not supported by the REST catalog
     }
+
+    private TableIdentifier toIdentifier(String tableName)
+    {
+        return TableIdentifier.of(getSession().getSchema().orElseThrow(), tableName);
+    }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestOAuth2SecurityConfig.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestOAuth2SecurityConfig.java
index 39c54c7defaa..368f74920f2f 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestOAuth2SecurityConfig.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestOAuth2SecurityConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.iceberg.catalog.rest;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestTrinoRestCatalog.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestTrinoRestCatalog.java
index a8a5250b64bc..e1aff1ff371f 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestTrinoRestCatalog.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestTrinoRestCatalog.java
@@ -21,12 +21,14 @@
 import io.trino.plugin.iceberg.TableStatisticsWriter;
 import io.trino.plugin.iceberg.catalog.BaseTrinoCatalogTest;
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
+import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.security.PrincipalType;
 import io.trino.spi.security.TrinoPrincipal;
 import org.apache.iceberg.rest.DelegatingRestSessionCatalog;
 import org.apache.iceberg.rest.RESTSessionCatalog;
 import org.assertj.core.util.Files;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
@@ -60,6 +62,7 @@ protected TrinoCatalog createTrinoCatalog(boolean useUniqueTableLocations)
         return new TrinoRestCatalog(restSessionCatalog, new CatalogName(catalogName), NONE, "test", useUniqueTableLocations);
     }
 
+    @Test
     @Override
     public void testView()
     {
@@ -67,6 +70,7 @@ public void testView()
                 .hasMessageContaining("createView is not supported for Iceberg REST catalog");
     }
 
+    @Test
     @Override
     public void testNonLowercaseNamespace()
     {
@@ -89,6 +93,7 @@ public void testNonLowercaseNamespace()
             // Test with IcebergMetadata, should the ConnectorMetadata implementation behavior depend on that class
             ConnectorMetadata icebergMetadata = new IcebergMetadata(
                     PLANNER_CONTEXT.getTypeManager(),
+                    CatalogHandle.fromId("iceberg:NORMAL:v12345"),
                     jsonCodec(CommitTaskData.class),
                     catalog,
                     connectorIdentity -> {
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/containers/NessieContainer.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/containers/NessieContainer.java
new file mode 100644
index 000000000000..d5f27d8f0ff9
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/containers/NessieContainer.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed 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 io.trino.plugin.iceberg.containers;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import io.airlift.log.Logger;
+import io.trino.testing.containers.BaseTestContainer;
+import org.testcontainers.containers.Network;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+public class NessieContainer
+        extends BaseTestContainer
+{
+    private static final Logger log = Logger.get(NessieContainer.class);
+
+    public static final String DEFAULT_IMAGE = "projectnessie/nessie:0.71.0";
+    public static final String DEFAULT_HOST_NAME = "nessie";
+    public static final String VERSION_STORE_TYPE = "INMEMORY";
+
+    public static final int PORT = 19121;
+
+    public static Builder builder()
+    {
+        return new Builder();
+    }
+
+    private NessieContainer(String image, String hostName, Set<Integer> exposePorts, Map<String, String> filesToMount, Map<String, String> envVars, Optional<Network> network, int retryLimit)
+    {
+        super(image, hostName, exposePorts, filesToMount, envVars, network, retryLimit);
+    }
+
+    @Override
+    public void start()
+    {
+        super.start();
+        log.info("Nessie server container started with address for REST API: %s", getRestApiUri());
+    }
+
+    public String getRestApiUri()
+    {
+        return "http://" + getMappedHostAndPortForExposedPort(PORT) + "/api/v1";
+    }
+
+    public static class Builder
+            extends BaseTestContainer.Builder<NessieContainer.Builder, NessieContainer>
+    {
+        private Builder()
+        {
+            this.image = DEFAULT_IMAGE;
+            this.hostName = DEFAULT_HOST_NAME;
+            this.exposePorts = ImmutableSet.of(PORT);
+            this.envVars = ImmutableMap.of("QUARKUS_HTTP_PORT", String.valueOf(PORT), "NESSIE_VERSION_STORE_TYPE", VERSION_STORE_TYPE);
+        }
+
+        @Override
+        public NessieContainer build()
+        {
+            return new NessieContainer(image, hostName, exposePorts, filesToMount, envVars, network, startupRetryLimit);
+        }
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/optimizer/TestConnectorPushdownRulesWithIceberg.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/optimizer/TestConnectorPushdownRulesWithIceberg.java
index c50a6bb24db2..519b80444b39 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/optimizer/TestConnectorPushdownRulesWithIceberg.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/optimizer/TestConnectorPushdownRulesWithIceberg.java
@@ -49,23 +49,23 @@
 import io.trino.sql.tree.SubscriptExpression;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.util.Optional;
+import java.util.OptionalLong;
 
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
 import static com.google.inject.util.Modules.EMPTY_MODULE;
-import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore;
+import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
 import static io.trino.plugin.iceberg.ColumnIdentity.TypeCategory.STRUCT;
 import static io.trino.plugin.iceberg.ColumnIdentity.primitiveColumnIdentity;
 import static io.trino.plugin.iceberg.TableType.DATA;
-import static io.trino.spi.connector.RetryMode.NO_RETRIES;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RowType.field;
@@ -154,22 +154,24 @@ public void testProjectionPushdown()
                 Optional.empty());
 
         IcebergTableHandle icebergTable = new IcebergTableHandle(
+                CatalogHandle.fromId("iceberg:NORMAL:v12345"),
                 SCHEMA_NAME,
                 tableName,
                 DATA,
                 Optional.of(1L),
                 "",
-                ImmutableList.of(),
                 Optional.of(""),
                 1,
                 TupleDomain.all(),
                 TupleDomain.all(),
+                OptionalLong.empty(),
                 ImmutableSet.of(),
                 Optional.empty(),
                 "",
                 ImmutableMap.of(),
-                NO_RETRIES,
                 false,
+                Optional.empty(),
+                ImmutableSet.of(),
                 Optional.empty());
         TableHandle table = new TableHandle(catalogHandle, icebergTable, new HiveTransactionHandle(false));
 
@@ -236,22 +238,24 @@ public void testPredicatePushdown()
         PushPredicateIntoTableScan pushPredicateIntoTableScan = new PushPredicateIntoTableScan(tester().getPlannerContext(), tester().getTypeAnalyzer(), false);
 
         IcebergTableHandle icebergTable = new IcebergTableHandle(
+                CatalogHandle.fromId("iceberg:NORMAL:v12345"),
                 SCHEMA_NAME,
                 tableName,
                 DATA,
                 Optional.of(snapshotId),
                 "",
-                ImmutableList.of(),
                 Optional.of(""),
                 1,
                 TupleDomain.all(),
                 TupleDomain.all(),
+                OptionalLong.empty(),
                 ImmutableSet.of(),
                 Optional.empty(),
                 "",
                 ImmutableMap.of(),
-                NO_RETRIES,
                 false,
+                Optional.empty(),
+                ImmutableSet.of(),
                 Optional.empty());
         TableHandle table = new TableHandle(catalogHandle, icebergTable, new HiveTransactionHandle(false));
 
@@ -285,22 +289,24 @@ public void testColumnPruningProjectionPushdown()
         PruneTableScanColumns pruneTableScanColumns = new PruneTableScanColumns(tester().getMetadata());
 
         IcebergTableHandle icebergTable = new IcebergTableHandle(
+                CatalogHandle.fromId("iceberg:NORMAL:v12345"),
                 SCHEMA_NAME,
                 tableName,
                 DATA,
                 Optional.empty(),
                 "",
-                ImmutableList.of(),
                 Optional.of(""),
                 1,
                 TupleDomain.all(),
                 TupleDomain.all(),
+                OptionalLong.empty(),
                 ImmutableSet.of(),
                 Optional.empty(),
                 "",
                 ImmutableMap.of(),
-                NO_RETRIES,
                 false,
+                Optional.empty(),
+                ImmutableSet.of(),
                 Optional.empty());
         TableHandle table = new TableHandle(catalogHandle, icebergTable, new HiveTransactionHandle(false));
 
@@ -345,22 +351,24 @@ public void testPushdownWithDuplicateExpressions()
                 new ScalarStatsCalculator(tester().getPlannerContext(), tester().getTypeAnalyzer()));
 
         IcebergTableHandle icebergTable = new IcebergTableHandle(
+                CatalogHandle.fromId("iceberg:NORMAL:v12345"),
                 SCHEMA_NAME,
                 tableName,
                 DATA,
                 Optional.of(1L),
                 "",
-                ImmutableList.of(),
                 Optional.of(""),
                 1,
                 TupleDomain.all(),
                 TupleDomain.all(),
+                OptionalLong.empty(),
                 ImmutableSet.of(),
                 Optional.empty(),
                 "",
                 ImmutableMap.of(),
-                NO_RETRIES,
                 false,
+                Optional.empty(),
+                ImmutableSet.of(),
                 Optional.empty());
         TableHandle table = new TableHandle(catalogHandle, icebergTable, new HiveTransactionHandle(false));
 
@@ -423,7 +431,7 @@ public void testPushdownWithDuplicateExpressions()
         metastore.dropTable(SCHEMA_NAME, tableName, true);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
             throws IOException
     {
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/util/TestPrimitiveTypeMapBuilder.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/util/TestPrimitiveTypeMapBuilder.java
index e4a2f3bfde0a..7945c20a166d 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/util/TestPrimitiveTypeMapBuilder.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/util/TestPrimitiveTypeMapBuilder.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-iceberg/src/test/java/org/apache/iceberg/rest/DelegatingRestSessionCatalog.java b/plugin/trino-iceberg/src/test/java/org/apache/iceberg/rest/DelegatingRestSessionCatalog.java
index b56069650e10..97c335ed0ae3 100644
--- a/plugin/trino-iceberg/src/test/java/org/apache/iceberg/rest/DelegatingRestSessionCatalog.java
+++ b/plugin/trino-iceberg/src/test/java/org/apache/iceberg/rest/DelegatingRestSessionCatalog.java
@@ -36,7 +36,7 @@ private DelegatingRestSessionCatalog() {}
 
     DelegatingRestSessionCatalog(RESTCatalogAdapter adapter, Catalog delegate)
     {
-        super(properties -> adapter);
+        super(properties -> adapter, null);
         this.adapter = requireNonNull(adapter, "adapter is null");
         this.delegate = requireNonNull(delegate, "delegate catalog is null");
     }
@@ -65,7 +65,7 @@ public TestingHttpServer testServer()
                 .setHttpAcceptQueueSize(10)
                 .setHttpEnabled(true);
         HttpServerInfo httpServerInfo = new HttpServerInfo(config, nodeInfo);
-        RESTCatalogServlet servlet = new RESTCatalogServlet(adapter);
+        RestCatalogServlet servlet = new RestCatalogServlet(adapter);
 
         return new TestingHttpServer(httpServerInfo, nodeInfo, config, servlet, ImmutableMap.of());
     }
diff --git a/plugin/trino-iceberg/src/test/java/org/apache/iceberg/rest/RestCatalogServlet.java b/plugin/trino-iceberg/src/test/java/org/apache/iceberg/rest/RestCatalogServlet.java
new file mode 100644
index 000000000000..0ccb550e88b2
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/java/org/apache/iceberg/rest/RestCatalogServlet.java
@@ -0,0 +1,233 @@
+/*
+ * Licensed 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.iceberg.rest;
+
+import io.airlift.log.Logger;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.iceberg.exceptions.RESTException;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
+import org.apache.iceberg.relocated.com.google.common.io.CharStreams;
+import org.apache.iceberg.rest.RESTCatalogAdapter.HTTPMethod;
+import org.apache.iceberg.rest.RESTCatalogAdapter.Route;
+import org.apache.iceberg.rest.responses.ErrorResponse;
+import org.apache.iceberg.util.Pair;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.UncheckedIOException;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static java.lang.String.format;
+
+/**
+ * The RESTCatalogServlet provides a servlet implementation used in combination with a
+ * RESTCatalogAdaptor to proxy the REST Spec to any Catalog implementation.
+ */
+// forked from org.apache.iceberg.rest.RESTCatalogServlet
+public class RestCatalogServlet
+        extends HttpServlet
+{
+    private static final Logger LOG = Logger.get(RestCatalogServlet.class);
+
+    private final RESTCatalogAdapter restCatalogAdapter;
+    private final Map<String, String> responseHeaders = ImmutableMap.of(
+            HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.getMimeType());
+
+    public RestCatalogServlet(RESTCatalogAdapter restCatalogAdapter)
+    {
+        this.restCatalogAdapter = restCatalogAdapter;
+    }
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws IOException
+    {
+        execute(ServletRequestContext.from(request), response);
+    }
+
+    @Override
+    protected void doHead(HttpServletRequest request, HttpServletResponse response)
+            throws IOException
+    {
+        execute(ServletRequestContext.from(request), response);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws IOException
+    {
+        execute(ServletRequestContext.from(request), response);
+    }
+
+    @Override
+    protected void doDelete(HttpServletRequest request, HttpServletResponse response)
+            throws IOException
+    {
+        execute(ServletRequestContext.from(request), response);
+    }
+
+    protected void execute(ServletRequestContext context, HttpServletResponse response)
+            throws IOException
+    {
+        response.setStatus(HttpServletResponse.SC_OK);
+        responseHeaders.forEach(response::setHeader);
+
+        if (context.error().isPresent()) {
+            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+            RESTObjectMapper.mapper().writeValue(response.getWriter(), context.error().get());
+            return;
+        }
+
+        try {
+            Object responseBody = restCatalogAdapter.execute(
+                    context.method(),
+                    context.path(),
+                    context.queryParams(),
+                    context.body(),
+                    context.route().responseClass(),
+                    context.headers(),
+                    handle(response));
+
+            if (responseBody != null) {
+                RESTObjectMapper.mapper().writeValue(response.getWriter(), responseBody);
+            }
+        }
+        catch (RESTException e) {
+            LOG.error(e, "Error processing REST request");
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        }
+        catch (Exception e) {
+            LOG.error(e, "Unexpected exception when processing REST request");
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    protected Consumer<ErrorResponse> handle(HttpServletResponse response)
+    {
+        return (errorResponse) -> {
+            response.setStatus(errorResponse.code());
+            try {
+                RESTObjectMapper.mapper().writeValue(response.getWriter(), errorResponse);
+            }
+            catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        };
+    }
+
+    public static class ServletRequestContext
+    {
+        private HTTPMethod method;
+        private Route route;
+        private String path;
+        private Map<String, String> headers;
+        private Map<String, String> queryParams;
+        private Object body;
+
+        private ErrorResponse errorResponse;
+
+        private ServletRequestContext(ErrorResponse errorResponse)
+        {
+            this.errorResponse = errorResponse;
+        }
+
+        private ServletRequestContext(HTTPMethod method, Route route, String path, Map<String, String> headers, Map<String, String> queryParams, Object body)
+        {
+            this.method = method;
+            this.route = route;
+            this.path = path;
+            this.headers = headers;
+            this.queryParams = queryParams;
+            this.body = body;
+        }
+
+        static ServletRequestContext from(HttpServletRequest request)
+                throws IOException
+        {
+            HTTPMethod method = HTTPMethod.valueOf(request.getMethod());
+            String path = request.getRequestURI().substring(1);
+            Pair<Route, Map<String, String>> routeContext = Route.from(method, path);
+
+            if (routeContext == null) {
+                return new ServletRequestContext(ErrorResponse.builder()
+                        .responseCode(400)
+                        .withType("BadRequestException")
+                        .withMessage(format("No route for request: %s %s", method, path))
+                        .build());
+            }
+
+            Route route = routeContext.first();
+            Object requestBody = null;
+            if (route.requestClass() != null) {
+                requestBody = RESTObjectMapper.mapper().readValue(request.getReader(), route.requestClass());
+            }
+            else if (route == Route.TOKENS) {
+                try (Reader reader = request.getReader()) {
+                    requestBody = RESTUtil.decodeFormData(CharStreams.toString(reader));
+                }
+            }
+
+            Map<String, String> queryParams = request.getParameterMap().entrySet().stream()
+                    .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue()[0]));
+            Map<String, String> headers = Collections.list(request.getHeaderNames()).stream()
+                    .collect(Collectors.toMap(Function.identity(), request::getHeader));
+
+            return new ServletRequestContext(method, route, path, headers, queryParams, requestBody);
+        }
+
+        public HTTPMethod method()
+        {
+            return method;
+        }
+
+        public Route route()
+        {
+            return route;
+        }
+
+        public String path()
+        {
+            return path;
+        }
+
+        public Map<String, String> headers()
+        {
+            return headers;
+        }
+
+        public Map<String, String> queryParams()
+        {
+            return queryParams;
+        }
+
+        public Object body()
+        {
+            return body;
+        }
+
+        public Optional<ErrorResponse> error()
+        {
+            return Optional.ofNullable(errorResponse);
+        }
+    }
+}
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/README.md b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/README.md
new file mode 100644
index 000000000000..561f589c40ab
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/README.md
@@ -0,0 +1,20 @@
+Data generated by actively changing the date/time settings of the host.
+
+In `iceberg.properties` add the following properties:
+
+```
+iceberg.unique-table-location=false
+iceberg.table-statistics-enabled=false
+```
+
+Use `trino` to create the table content
+
+```sql
+CREATE TABLE iceberg.tiny.timetravel(data integer);
+-- increase the date on the host
+INSERT INTO iceberg.tiny.timetravel VALUES 1;
+-- increase the date on the host
+INSERT INTO iceberg.tiny.timetravel VALUES 2;
+-- increase the date on the host
+INSERT INTO iceberg.tiny.timetravel VALUES 3;
+```
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/data/20230701_050241_00000_yfcmj-a9a22770-6b17-458d-995f-b15e5cce5d67.parquet b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/data/20230701_050241_00000_yfcmj-a9a22770-6b17-458d-995f-b15e5cce5d67.parquet
new file mode 100644
index 000000000000..eb306ae3fbc0
Binary files /dev/null and b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/data/20230701_050241_00000_yfcmj-a9a22770-6b17-458d-995f-b15e5cce5d67.parquet differ
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/data/20230702_050337_00000_6kfs7-2ec0f5f9-d16d-4147-8810-e9e2ae44d5a4.parquet b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/data/20230702_050337_00000_6kfs7-2ec0f5f9-d16d-4147-8810-e9e2ae44d5a4.parquet
new file mode 100644
index 000000000000..183c992ba81e
Binary files /dev/null and b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/data/20230702_050337_00000_6kfs7-2ec0f5f9-d16d-4147-8810-e9e2ae44d5a4.parquet differ
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/data/20230703_050340_00000_tides-1a95a95b-9dd7-4604-8d65-6d1448179007.parquet b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/data/20230703_050340_00000_tides-1a95a95b-9dd7-4604-8d65-6d1448179007.parquet
new file mode 100644
index 000000000000..de64d3e1ff79
Binary files /dev/null and b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/data/20230703_050340_00000_tides-1a95a95b-9dd7-4604-8d65-6d1448179007.parquet differ
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/00000-e57ff5b7-992d-4030-a592-0cac0f224830.metadata.json b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/00000-e57ff5b7-992d-4030-a592-0cac0f224830.metadata.json
new file mode 100644
index 000000000000..b8f3a1fd7d3a
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/00000-e57ff5b7-992d-4030-a592-0cac0f224830.metadata.json
@@ -0,0 +1,64 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "bed033c8-301a-4f2b-b18a-dbe85348dc67",
+  "location" : "s3://test-bucket-time-travel/timetravel",
+  "last-sequence-number" : 1,
+  "last-updated-ms" : 1688101306265,
+  "last-column-id" : 1,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "data",
+      "required" : false,
+      "type" : "int"
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "write.format.default" : "PARQUET"
+  },
+  "current-snapshot-id" : 3669526782178248824,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 3669526782178248824,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 3669526782178248824,
+    "timestamp-ms" : 1688101306265,
+    "summary" : {
+      "operation" : "append",
+      "trino_query_id" : "20230630_050145_00001_9ikf4",
+      "changed-partition-count" : "0",
+      "total-records" : "0",
+      "total-files-size" : "0",
+      "total-data-files" : "0",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://test-bucket-time-travel/timetravel/metadata/snap-3669526782178248824-1-cde47a04-b45e-4057-b872-aca0841fe99c.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1688101306265,
+    "snapshot-id" : 3669526782178248824
+  } ],
+  "metadata-log" : [ ]
+}
\ No newline at end of file
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/00001-c95e08ca-c369-43d0-9f52-dd2b76f131c3.metadata.json b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/00001-c95e08ca-c369-43d0-9f52-dd2b76f131c3.metadata.json
new file mode 100644
index 000000000000..39a8bc10b145
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/00001-c95e08ca-c369-43d0-9f52-dd2b76f131c3.metadata.json
@@ -0,0 +1,91 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "bed033c8-301a-4f2b-b18a-dbe85348dc67",
+  "location" : "s3://test-bucket-time-travel/timetravel",
+  "last-sequence-number" : 2,
+  "last-updated-ms" : 1688187763954,
+  "last-column-id" : 1,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "data",
+      "required" : false,
+      "type" : "int"
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "write.format.default" : "PARQUET"
+  },
+  "current-snapshot-id" : 583816926071139654,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 583816926071139654,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 3669526782178248824,
+    "timestamp-ms" : 1688101306265,
+    "summary" : {
+      "operation" : "append",
+      "trino_query_id" : "20230630_050145_00001_9ikf4",
+      "changed-partition-count" : "0",
+      "total-records" : "0",
+      "total-files-size" : "0",
+      "total-data-files" : "0",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://test-bucket-time-travel/timetravel/metadata/snap-3669526782178248824-1-cde47a04-b45e-4057-b872-aca0841fe99c.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 2,
+    "snapshot-id" : 583816926071139654,
+    "parent-snapshot-id" : 3669526782178248824,
+    "timestamp-ms" : 1688187763954,
+    "summary" : {
+      "operation" : "append",
+      "trino_query_id" : "20230701_050241_00000_yfcmj",
+      "added-data-files" : "1",
+      "added-records" : "1",
+      "added-files-size" : "201",
+      "changed-partition-count" : "1",
+      "total-records" : "1",
+      "total-files-size" : "201",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://test-bucket-time-travel/timetravel/metadata/snap-583816926071139654-1-45793deb-f275-4821-8a19-70d710cc6982.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1688101306265,
+    "snapshot-id" : 3669526782178248824
+  }, {
+    "timestamp-ms" : 1688187763954,
+    "snapshot-id" : 583816926071139654
+  } ],
+  "metadata-log" : [ {
+    "timestamp-ms" : 1688101306265,
+    "metadata-file" : "s3://test-bucket-time-travel/timetravel/metadata/00000-e57ff5b7-992d-4030-a592-0cac0f224830.metadata.json"
+  } ]
+}
\ No newline at end of file
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/00002-0cdac1f8-55a5-4dc1-bd1d-c3f6bde749c8.metadata.json b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/00002-0cdac1f8-55a5-4dc1-bd1d-c3f6bde749c8.metadata.json
new file mode 100644
index 000000000000..51d553977645
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/00002-0cdac1f8-55a5-4dc1-bd1d-c3f6bde749c8.metadata.json
@@ -0,0 +1,118 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "bed033c8-301a-4f2b-b18a-dbe85348dc67",
+  "location" : "s3://test-bucket-time-travel/timetravel",
+  "last-sequence-number" : 3,
+  "last-updated-ms" : 1688274219586,
+  "last-column-id" : 1,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "data",
+      "required" : false,
+      "type" : "int"
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "write.format.default" : "PARQUET"
+  },
+  "current-snapshot-id" : 6153714018221937993,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 6153714018221937993,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 3669526782178248824,
+    "timestamp-ms" : 1688101306265,
+    "summary" : {
+      "operation" : "append",
+      "trino_query_id" : "20230630_050145_00001_9ikf4",
+      "changed-partition-count" : "0",
+      "total-records" : "0",
+      "total-files-size" : "0",
+      "total-data-files" : "0",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://test-bucket-time-travel/timetravel/metadata/snap-3669526782178248824-1-cde47a04-b45e-4057-b872-aca0841fe99c.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 2,
+    "snapshot-id" : 583816926071139654,
+    "parent-snapshot-id" : 3669526782178248824,
+    "timestamp-ms" : 1688187763954,
+    "summary" : {
+      "operation" : "append",
+      "trino_query_id" : "20230701_050241_00000_yfcmj",
+      "added-data-files" : "1",
+      "added-records" : "1",
+      "added-files-size" : "201",
+      "changed-partition-count" : "1",
+      "total-records" : "1",
+      "total-files-size" : "201",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://test-bucket-time-travel/timetravel/metadata/snap-583816926071139654-1-45793deb-f275-4821-8a19-70d710cc6982.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 3,
+    "snapshot-id" : 6153714018221937993,
+    "parent-snapshot-id" : 583816926071139654,
+    "timestamp-ms" : 1688274219586,
+    "summary" : {
+      "operation" : "append",
+      "trino_query_id" : "20230702_050337_00000_6kfs7",
+      "added-data-files" : "1",
+      "added-records" : "1",
+      "added-files-size" : "201",
+      "changed-partition-count" : "1",
+      "total-records" : "2",
+      "total-files-size" : "402",
+      "total-data-files" : "2",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://test-bucket-time-travel/timetravel/metadata/snap-6153714018221937993-1-9652064e-0fca-47ae-b0a6-5e1a0beea45a.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1688101306265,
+    "snapshot-id" : 3669526782178248824
+  }, {
+    "timestamp-ms" : 1688187763954,
+    "snapshot-id" : 583816926071139654
+  }, {
+    "timestamp-ms" : 1688274219586,
+    "snapshot-id" : 6153714018221937993
+  } ],
+  "metadata-log" : [ {
+    "timestamp-ms" : 1688101306265,
+    "metadata-file" : "s3://test-bucket-time-travel/timetravel/metadata/00000-e57ff5b7-992d-4030-a592-0cac0f224830.metadata.json"
+  }, {
+    "timestamp-ms" : 1688187763954,
+    "metadata-file" : "s3://test-bucket-time-travel/timetravel/metadata/00001-c95e08ca-c369-43d0-9f52-dd2b76f131c3.metadata.json"
+  } ]
+}
\ No newline at end of file
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/00003-7a5fe997-d8a4-4446-98e1-f6c8128d5c53.metadata.json b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/00003-7a5fe997-d8a4-4446-98e1-f6c8128d5c53.metadata.json
new file mode 100644
index 000000000000..c6a1da3601cf
--- /dev/null
+++ b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/00003-7a5fe997-d8a4-4446-98e1-f6c8128d5c53.metadata.json
@@ -0,0 +1,145 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "bed033c8-301a-4f2b-b18a-dbe85348dc67",
+  "location" : "s3://test-bucket-time-travel/timetravel",
+  "last-sequence-number" : 4,
+  "last-updated-ms" : 1688360622434,
+  "last-column-id" : 1,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "data",
+      "required" : false,
+      "type" : "int"
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "write.format.default" : "PARQUET"
+  },
+  "current-snapshot-id" : 8471224892810331394,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 8471224892810331394,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 3669526782178248824,
+    "timestamp-ms" : 1688101306265,
+    "summary" : {
+      "operation" : "append",
+      "trino_query_id" : "20230630_050145_00001_9ikf4",
+      "changed-partition-count" : "0",
+      "total-records" : "0",
+      "total-files-size" : "0",
+      "total-data-files" : "0",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://test-bucket-time-travel/timetravel/metadata/snap-3669526782178248824-1-cde47a04-b45e-4057-b872-aca0841fe99c.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 2,
+    "snapshot-id" : 583816926071139654,
+    "parent-snapshot-id" : 3669526782178248824,
+    "timestamp-ms" : 1688187763954,
+    "summary" : {
+      "operation" : "append",
+      "trino_query_id" : "20230701_050241_00000_yfcmj",
+      "added-data-files" : "1",
+      "added-records" : "1",
+      "added-files-size" : "201",
+      "changed-partition-count" : "1",
+      "total-records" : "1",
+      "total-files-size" : "201",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://test-bucket-time-travel/timetravel/metadata/snap-583816926071139654-1-45793deb-f275-4821-8a19-70d710cc6982.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 3,
+    "snapshot-id" : 6153714018221937993,
+    "parent-snapshot-id" : 583816926071139654,
+    "timestamp-ms" : 1688274219586,
+    "summary" : {
+      "operation" : "append",
+      "trino_query_id" : "20230702_050337_00000_6kfs7",
+      "added-data-files" : "1",
+      "added-records" : "1",
+      "added-files-size" : "201",
+      "changed-partition-count" : "1",
+      "total-records" : "2",
+      "total-files-size" : "402",
+      "total-data-files" : "2",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://test-bucket-time-travel/timetravel/metadata/snap-6153714018221937993-1-9652064e-0fca-47ae-b0a6-5e1a0beea45a.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 4,
+    "snapshot-id" : 8471224892810331394,
+    "parent-snapshot-id" : 6153714018221937993,
+    "timestamp-ms" : 1688360622434,
+    "summary" : {
+      "operation" : "append",
+      "trino_query_id" : "20230703_050340_00000_tides",
+      "added-data-files" : "1",
+      "added-records" : "1",
+      "added-files-size" : "201",
+      "changed-partition-count" : "1",
+      "total-records" : "3",
+      "total-files-size" : "603",
+      "total-data-files" : "3",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://test-bucket-time-travel/timetravel/metadata/snap-8471224892810331394-1-a0d84333-b282-4e0e-b0ee-817cc56d98dc.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1688101306265,
+    "snapshot-id" : 3669526782178248824
+  }, {
+    "timestamp-ms" : 1688187763954,
+    "snapshot-id" : 583816926071139654
+  }, {
+    "timestamp-ms" : 1688274219586,
+    "snapshot-id" : 6153714018221937993
+  }, {
+    "timestamp-ms" : 1688360622434,
+    "snapshot-id" : 8471224892810331394
+  } ],
+  "metadata-log" : [ {
+    "timestamp-ms" : 1688101306265,
+    "metadata-file" : "s3://test-bucket-time-travel/timetravel/metadata/00000-e57ff5b7-992d-4030-a592-0cac0f224830.metadata.json"
+  }, {
+    "timestamp-ms" : 1688187763954,
+    "metadata-file" : "s3://test-bucket-time-travel/timetravel/metadata/00001-c95e08ca-c369-43d0-9f52-dd2b76f131c3.metadata.json"
+  }, {
+    "timestamp-ms" : 1688274219586,
+    "metadata-file" : "s3://test-bucket-time-travel/timetravel/metadata/00002-0cdac1f8-55a5-4dc1-bd1d-c3f6bde749c8.metadata.json"
+  } ]
+}
\ No newline at end of file
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/45793deb-f275-4821-8a19-70d710cc6982-m0.avro b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/45793deb-f275-4821-8a19-70d710cc6982-m0.avro
new file mode 100644
index 000000000000..a2182ca4139e
Binary files /dev/null and b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/45793deb-f275-4821-8a19-70d710cc6982-m0.avro differ
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/9652064e-0fca-47ae-b0a6-5e1a0beea45a-m0.avro b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/9652064e-0fca-47ae-b0a6-5e1a0beea45a-m0.avro
new file mode 100644
index 000000000000..bd7d41acfa6c
Binary files /dev/null and b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/9652064e-0fca-47ae-b0a6-5e1a0beea45a-m0.avro differ
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/a0d84333-b282-4e0e-b0ee-817cc56d98dc-m0.avro b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/a0d84333-b282-4e0e-b0ee-817cc56d98dc-m0.avro
new file mode 100644
index 000000000000..c57c87b3bc58
Binary files /dev/null and b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/a0d84333-b282-4e0e-b0ee-817cc56d98dc-m0.avro differ
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/snap-3669526782178248824-1-cde47a04-b45e-4057-b872-aca0841fe99c.avro b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/snap-3669526782178248824-1-cde47a04-b45e-4057-b872-aca0841fe99c.avro
new file mode 100644
index 000000000000..99fbc84fac4c
Binary files /dev/null and b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/snap-3669526782178248824-1-cde47a04-b45e-4057-b872-aca0841fe99c.avro differ
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/snap-583816926071139654-1-45793deb-f275-4821-8a19-70d710cc6982.avro b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/snap-583816926071139654-1-45793deb-f275-4821-8a19-70d710cc6982.avro
new file mode 100644
index 000000000000..8ad7b7c91bad
Binary files /dev/null and b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/snap-583816926071139654-1-45793deb-f275-4821-8a19-70d710cc6982.avro differ
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/snap-6153714018221937993-1-9652064e-0fca-47ae-b0a6-5e1a0beea45a.avro b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/snap-6153714018221937993-1-9652064e-0fca-47ae-b0a6-5e1a0beea45a.avro
new file mode 100644
index 000000000000..c375e8277ef9
Binary files /dev/null and b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/snap-6153714018221937993-1-9652064e-0fca-47ae-b0a6-5e1a0beea45a.avro differ
diff --git a/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/snap-8471224892810331394-1-a0d84333-b282-4e0e-b0ee-817cc56d98dc.avro b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/snap-8471224892810331394-1-a0d84333-b282-4e0e-b0ee-817cc56d98dc.avro
new file mode 100644
index 000000000000..a825e553cd38
Binary files /dev/null and b/plugin/trino-iceberg/src/test/resources/iceberg/timetravel/metadata/snap-8471224892810331394-1-a0d84333-b282-4e0e-b0ee-817cc56d98dc.avro differ
diff --git a/plugin/trino-ignite/pom.xml b/plugin/trino-ignite/pom.xml
index 7cd95f49a22e..2c2e76ac7935 100644
--- a/plugin/trino-ignite/pom.xml
+++ b/plugin/trino-ignite/pom.xml
@@ -1,31 +1,56 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-ignite</artifactId>
-    <description>Trino - Ignite Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Ignite Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <air.test.jvm.additional-arguments>
-            --add-opens=java.base/java.nio=ALL-UNNAMED
-        </air.test.jvm.additional-arguments>
+        <air.test.jvm.additional-arguments>--add-opens=java.base/java.nio=ALL-UNNAMED</air.test.jvm.additional-arguments>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
         </dependency>
 
+        <!-- TODO Use org.apache.ignite:ignite-core:2.15.0 instead when new Ignite is released -->
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-ignite-patched</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.ignite</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-matching</artifactId>
@@ -37,46 +62,57 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-core</artifactId>
-            <version>2.14.0</version>
-            <exclusions>
-                <!--       Change the scope to test         -->
-                <exclusion>
-                    <groupId>org.jetbrains</groupId>
-                    <artifactId>annotations</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -97,32 +133,24 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -143,6 +171,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
@@ -167,12 +202,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -180,8 +209,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -202,6 +231,57 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!--
+      TODO convert this back into normal dependency
+      The Ignite code actually comes from trino-ignite-patched dependency, but IntelliJ does not support multi-module
+      projects with module using shading (as trino-ignite-patched does). See e.g. https://youtrack.jetbrains.com/issue/IDEA-266746
+      This dependency is here only to fool IntelliJ into compiling the project. -->
+    <profiles>
+        <profile>
+            <id>lib/tools.jar</id>
+            <activation>
+                <property>
+                    <name>idea.maven.embedder.version</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.ignite</groupId>
+                    <artifactId>ignite-core</artifactId>
+                    <version>2.15.0</version>
+                    <scope>provided</scope>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>
diff --git a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteClient.java b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteClient.java
index 4ff71d88e5c4..ea579992270b 100644
--- a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteClient.java
+++ b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteClient.java
@@ -17,9 +17,11 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.plugin.base.aggregation.AggregateFunctionRewriter;
 import io.trino.plugin.base.aggregation.AggregateFunctionRule;
 import io.trino.plugin.base.expression.ConnectorExpressionRewriter;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcClient;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ColumnMapping;
@@ -46,7 +48,6 @@
 import io.trino.plugin.jdbc.expression.JdbcConnectorExpressionRewriterBuilder;
 import io.trino.plugin.jdbc.expression.ParameterizedExpression;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
@@ -65,9 +66,7 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
+import jakarta.annotation.Nullable;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -165,7 +164,6 @@ public IgniteClient(
         this.connectorExpressionRewriter = JdbcConnectorExpressionRewriterBuilder.newBuilder()
                 .addStandardRules(this::quoted)
                 .map("$like(value: varchar, pattern: varchar): boolean").to("value LIKE pattern")
-                .map("$like(value: varchar, pattern: varchar, escape: varchar(1)): boolean").to("value LIKE pattern ESCAPE escape")
                 .build();
         this.aggregateFunctionRewriter = new AggregateFunctionRewriter<>(
                 connectorExpressionRewriter,
@@ -506,7 +504,7 @@ public Map<String, Object> getTableProperties(Connection connection, JdbcTableHa
         String schemaName = requireNonNull(schemaTableName.getSchemaName(), "Ignite schema name can not be null").toUpperCase(ENGLISH);
         String tableName = requireNonNull(schemaTableName.getTableName(), "Ignite table name can not be null").toUpperCase(ENGLISH);
         // Get primary keys from 'sys.indexes' because DatabaseMetaData.getPrimaryKeys doesn't work well while table being concurrent modified
-        String sql = "SELECT COLUMNS FROM sys.indexes WHERE SCHEMA_NAME = ? AND TABLE_NAME = ? AND INDEX_NAME = '_key_PK' LIMIT 1";
+        String sql = "SELECT COLUMNS FROM sys.indexes WHERE SCHEMA_NAME = ? AND TABLE_NAME = ? AND IS_PK LIMIT 1";
 
         try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
             preparedStatement.setString(1, schemaName);
@@ -597,7 +595,7 @@ public void createSchema(ConnectorSession session, String schemaName)
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support dropping schemas");
     }
diff --git a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteClientModule.java b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteClientModule.java
index 81db0757b63e..3526f634be26 100644
--- a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteClientModule.java
+++ b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteClientModule.java
@@ -18,6 +18,7 @@
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DecimalModule;
@@ -28,6 +29,8 @@
 import io.trino.plugin.jdbc.credential.CredentialProvider;
 import org.apache.ignite.IgniteJdbcThinDriver;
 
+import java.util.Properties;
+
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static io.trino.plugin.jdbc.JdbcModule.bindTablePropertiesProvider;
@@ -48,11 +51,13 @@ public void configure(Binder binder)
     @Provides
     @Singleton
     @ForBaseJdbc
-    public static ConnectionFactory createConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider)
+    public static ConnectionFactory createConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider, OpenTelemetry openTelemetry)
     {
         return new DriverConnectionFactory(
                 new IgniteJdbcThinDriver(),
-                config,
-                credentialProvider);
+                config.getConnectionUrl(),
+                new Properties(),
+                credentialProvider,
+                openTelemetry);
     }
 }
diff --git a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteJdbcConfig.java b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteJdbcConfig.java
index 927197a42594..774036f349a4 100644
--- a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteJdbcConfig.java
+++ b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteJdbcConfig.java
@@ -14,13 +14,12 @@
 package io.trino.plugin.ignite;
 
 import io.trino.plugin.jdbc.BaseJdbcConfig;
+import jakarta.validation.constraints.AssertTrue;
 import org.apache.ignite.IgniteJdbcThinDriver;
 
-import javax.validation.constraints.AssertTrue;
-
 import java.sql.SQLException;
 
-import static org.apache.ignite.IgniteJdbcDriver.URL_PREFIX;
+import static org.apache.ignite.internal.jdbc.thin.JdbcThinUtils.URL_PREFIX;
 
 public class IgniteJdbcConfig
         extends BaseJdbcConfig
diff --git a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteJdbcMetadataFactory.java b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteJdbcMetadataFactory.java
index f278082a0b9c..db1963f9d8b7 100644
--- a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteJdbcMetadataFactory.java
+++ b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteJdbcMetadataFactory.java
@@ -14,13 +14,12 @@
 package io.trino.plugin.ignite;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.plugin.jdbc.DefaultJdbcMetadataFactory;
 import io.trino.plugin.jdbc.JdbcClient;
 import io.trino.plugin.jdbc.JdbcMetadata;
 import io.trino.plugin.jdbc.JdbcQueryEventListener;
 
-import javax.inject.Inject;
-
 import java.util.Set;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteMetadata.java b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteMetadata.java
index a8bc0a65d561..3ce1a2b1f378 100644
--- a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteMetadata.java
+++ b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteMetadata.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.ignite;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.plugin.jdbc.DefaultJdbcMetadata;
 import io.trino.plugin.jdbc.JdbcClient;
@@ -39,8 +40,6 @@
 import io.trino.spi.statistics.ComputedStatistics;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -120,7 +119,7 @@ public ConnectorTableMetadata getTableMetadata(ConnectorSession session, Connect
     {
         JdbcTableHandle handle = (JdbcTableHandle) table;
         return new ConnectorTableMetadata(
-                getSchemaTableName(handle),
+                handle.getRequiredNamedRelation().getSchemaTableName(),
                 getColumnMetadata(session, handle),
                 igniteClient.getTableProperties(session, handle));
     }
@@ -138,7 +137,7 @@ public ConnectorTableSchema getTableSchema(ConnectorSession session, ConnectorTa
     {
         JdbcTableHandle handle = (JdbcTableHandle) table;
         return new ConnectorTableSchema(
-                getSchemaTableName(handle),
+                handle.getRequiredNamedRelation().getSchemaTableName(),
                 getColumnMetadata(session, handle).stream()
                         .map(ColumnMetadata::getColumnSchema)
                         .collect(toImmutableList()));
diff --git a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteOutputTableHandle.java b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteOutputTableHandle.java
index 285e2faa05e3..185231c1351d 100644
--- a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteOutputTableHandle.java
+++ b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteOutputTableHandle.java
@@ -18,8 +18,7 @@
 import io.trino.plugin.jdbc.JdbcOutputTableHandle;
 import io.trino.plugin.jdbc.JdbcTypeHandle;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteTableProperties.java b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteTableProperties.java
index db8695f7c60e..8738cc886c67 100644
--- a/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteTableProperties.java
+++ b/plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteTableProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.ignite;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.jdbc.TablePropertiesProvider;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 
diff --git a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteCaseInsensitiveMapping.java b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteCaseInsensitiveMapping.java
index 6151090acef0..e0cd4da7fff4 100644
--- a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteCaseInsensitiveMapping.java
+++ b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteCaseInsensitiveMapping.java
@@ -20,25 +20,24 @@
 import io.trino.testing.MaterializedRow;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.SqlExecutor;
-import org.testng.SkipException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Stream;
 
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
 import static io.trino.plugin.ignite.IgniteQueryRunner.createIgniteQueryRunner;
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assumptions.abort;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 // With case-insensitive-name-matching enabled colliding schema/table names are considered as errors.
 // Some tests here create colliding names which can cause any other concurrent test to fail.
-@Test(singleThreaded = true)
 public class TestIgniteCaseInsensitiveMapping
         extends BaseCaseInsensitiveMappingTest
 {
@@ -76,6 +75,7 @@ protected String quoted(String name)
         return identifierQuote + name + identifierQuote;
     }
 
+    @Test
     @Override
     public void testNonLowerCaseSchemaName()
             throws Exception
@@ -101,6 +101,7 @@ public void testNonLowerCaseSchemaName()
         }
     }
 
+    @Test
     @Override
     public void testNonLowerCaseTableName()
             throws Exception
@@ -144,6 +145,7 @@ public void testNonLowerCaseTableName()
         }
     }
 
+    @Test
     @Override
     public void testSchemaNameClash()
             throws Exception
@@ -167,6 +169,7 @@ public void testSchemaNameClash()
         }
     }
 
+    @Test
     @Override
     public void testTableNameClash()
             throws Exception
@@ -193,34 +196,39 @@ public void testTableNameClash()
         }
     }
 
+    @Test
     @Override
     public void testTableNameClashWithRuleMapping()
     {
-        throw new SkipException("Not support creating Ignite custom schema");
+        abort("Not support creating Ignite custom schema");
     }
 
+    @Test
     @Override
     public void testSchemaNameClashWithRuleMapping()
     {
-        throw new SkipException("Not support creating Ignite custom schema");
+        abort("Not support creating Ignite custom schema");
     }
 
+    @Test
     @Override
     public void testSchemaAndTableNameRuleMapping()
     {
-        throw new SkipException("Not support creating Ignite custom schema");
+        abort("Not support creating Ignite custom schema");
     }
 
+    @Test
     @Override
     public void testSchemaNameRuleMapping()
     {
-        throw new SkipException("Not support creating Ignite custom schema");
+        abort("Not support creating Ignite custom schema");
     }
 
+    @Test
     @Override
     public void testTableNameRuleMapping()
     {
-        throw new SkipException("Not support creating Ignite custom schema");
+        abort("Not support creating Ignite custom schema");
     }
 
     @Override
diff --git a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteClient.java b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteClient.java
index 0b872b95ef5f..bad8cc3a0900 100644
--- a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteClient.java
+++ b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteClient.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.ignite;
 
+import io.trino.plugin.base.mapping.DefaultIdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ColumnMapping;
 import io.trino.plugin.jdbc.DefaultQueryBuilder;
@@ -21,7 +22,6 @@
 import io.trino.plugin.jdbc.JdbcExpression;
 import io.trino.plugin.jdbc.JdbcTypeHandle;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.DefaultIdentifierMapping;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.expression.ConnectorExpression;
diff --git a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteConnectorTest.java b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteConnectorTest.java
index 2316b6148405..94ef4dd034b0 100644
--- a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteConnectorTest.java
+++ b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteConnectorTest.java
@@ -15,12 +15,15 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import io.trino.Session;
 import io.trino.plugin.jdbc.BaseJdbcConnectorTest;
+import io.trino.sql.planner.plan.FilterNode;
+import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
 import io.trino.testing.sql.SqlExecutor;
 import io.trino.testing.sql.TestTable;
+import io.trino.testng.services.Flaky;
+import org.intellij.lang.annotations.Language;
 import org.testng.SkipException;
 import org.testng.annotations.Test;
 
@@ -30,15 +33,19 @@
 
 import static com.google.common.base.Strings.nullToEmpty;
 import static io.trino.plugin.ignite.IgniteQueryRunner.createIgniteQueryRunner;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertFalse;
 
 public class TestIgniteConnectorTest
         extends BaseJdbcConnectorTest
 {
+    private static final String SCHEMA_CHANGE_OPERATION_FAIL_ISSUE = "https://github.com/trinodb/trino/issues/14391";
+    @Language("RegExp")
+    private static final String SCHEMA_CHANGE_OPERATION_FAIL_MATCH = "Schema change operation failed: Thread got interrupted while trying to acquire table lock.";
+
     private TestingIgniteServer igniteServer;
 
     @Override
@@ -59,48 +66,64 @@ protected SqlExecutor onRemoteDatabase()
         return igniteServer::execute;
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TRUNCATE:
-                return false;
-
-            case SUPPORTS_CREATE_SCHEMA:
-            case SUPPORTS_RENAME_TABLE:
-            case SUPPORTS_RENAME_COLUMN:
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-            case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN:
-            case SUPPORTS_DROP_COLUMN:
-                return true;
-
-            case SUPPORTS_ADD_COLUMN_WITH_COMMENT:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-            case SUPPORTS_NEGATIVE_DATE:
-                return false;
-
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN:
-                return false;
-
-            case SUPPORTS_JOIN_PUSHDOWN:
-            case SUPPORTS_PREDICATE_EXPRESSION_PUSHDOWN_WITH_LIKE:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT:
-            case SUPPORTS_TOPN_PUSHDOWN_WITH_VARCHAR:
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return true;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
+        return switch (connectorBehavior) {
+            case SUPPORTS_AGGREGATION_PUSHDOWN,
+                    SUPPORTS_JOIN_PUSHDOWN,
+                    SUPPORTS_PREDICATE_EXPRESSION_PUSHDOWN_WITH_LIKE,
+                    SUPPORTS_TOPN_PUSHDOWN_WITH_VARCHAR -> true;
+            case SUPPORTS_ADD_COLUMN_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_ADD_COLUMN_WITH_COMMENT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_CORRELATION,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_COVARIANCE,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_REGRESSION,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_STDDEV,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_VARIANCE,
+                    SUPPORTS_ARRAY,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN,
+                    SUPPORTS_NATIVE_QUERY,
+                    SUPPORTS_NEGATIVE_DATE,
+                    SUPPORTS_RENAME_COLUMN,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TRUNCATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
+
+    @Test
+    public void testLikeWithEscape()
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_like_with_escape",
+                "(id int, a varchar(4))",
+                List.of(
+                        "1, 'abce'",
+                        "2, 'abcd'",
+                        "3, 'a%de'"))) {
+            String tableName = testTable.getName();
+
+            assertThat(query("SELECT * FROM " + tableName + " WHERE a LIKE 'a%'"))
+                    .isFullyPushedDown();
+            assertThat(query("SELECT * FROM " + tableName + " WHERE a LIKE '%c%' ESCAPE '\\'"))
+                    .matches("VALUES (1, 'abce'), (2, 'abcd')")
+                    .isNotFullyPushedDown(node(FilterNode.class, node(TableScanNode.class)));
+
+            assertThat(query("SELECT * FROM " + tableName + " WHERE a LIKE 'a\\%d%' ESCAPE '\\'"))
+                    .matches("VALUES (3, 'a%de')")
+                    .isNotFullyPushedDown(node(FilterNode.class, node(TableScanNode.class)));
+
+            assertThatThrownBy(() -> onRemoteDatabase().execute("SELECT * FROM " + tableName + " WHERE a LIKE 'a%' ESCAPE '\\'"))
+                    .hasMessageContaining("Failed to execute statement");
         }
     }
 
@@ -307,17 +330,14 @@ protected boolean isColumnNameRejected(Exception exception, String columnName, b
     }
 
     @Override
-    public void testAddNotNullColumnToNonEmptyTable()
+    protected void verifyConcurrentAddColumnFailurePermissible(Exception e)
     {
-        // Override because the connector supports both ADD COLUMN and NOT NULL constraint, but it doesn't support adding NOT NULL columns
-        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_notnull_col", "(a_varchar varchar)")) {
-            assertQueryFails(
-                    "ALTER TABLE " + table.getName() + " ADD COLUMN b_varchar varchar NOT NULL",
-                    "This connector does not support adding not null columns");
-        }
+        assertThat(e).hasMessage("Schema change operation failed: Thread got interrupted while trying to acquire table lock.");
     }
 
+    @Test
     @Override
+    @Flaky(issue = SCHEMA_CHANGE_OPERATION_FAIL_ISSUE, match = SCHEMA_CHANGE_OPERATION_FAIL_MATCH)
     public void testDropAndAddColumnWithSameName()
     {
         // Override because Ignite can access old data after dropping and adding a column with same name
@@ -330,105 +350,36 @@ public void testDropAndAddColumnWithSameName()
         }
     }
 
+    @Test
     @Override
-    public void testNativeQuerySimple()
-    {
-        // table function disabled for Ignite, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertQueryFails("SELECT * FROM TABLE(system.query(query => 'SELECT 1'))", "line 1:21: Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQueryParameters()
-    {
-        // table function disabled for Ignite, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        Session session = Session.builder(getSession())
-                .addPreparedStatement("my_query_simple", "SELECT * FROM TABLE(system.query(query => ?))")
-                .addPreparedStatement("my_query", "SELECT * FROM TABLE(system.query(query => format('SELECT %s FROM %s', ?, ?)))")
-                .build();
-        assertQueryFails(session, "EXECUTE my_query_simple USING 'SELECT 1 a'", "line 1:21: Table function system.query not registered");
-        assertQueryFails(session, "EXECUTE my_query USING 'a', '(SELECT 2 a) t'", "line 1:21: Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQuerySelectFromNation()
-    {
-        // table function disabled for Ignite, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertQueryFails(
-                format("SELECT * FROM TABLE(system.query(query => 'SELECT name FROM %s.nation WHERE nationkey = 0'))", getSession().getSchema().orElseThrow()),
-                "line 1:21: Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQuerySelectFromTestTable()
-    {
-        // table function disabled for Ignite, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        try (TestTable testTable = simpleTable()) {
-            assertQueryFails(
-                    format("SELECT * FROM TABLE(system.query(query => 'SELECT * FROM %s'))", testTable.getName()),
-                    "line 1:21: Table function system.query not registered");
-        }
-    }
-
-    @Override
-    public void testNativeQueryColumnAlias()
-    {
-        // table function disabled for Ignite, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertQueryFails(
-                "SELECT * FROM TABLE(system.query(query => 'SELECT name AS region_name FROM public.region WHERE regionkey = 0'))",
-                ".* Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQueryColumnAliasNotFound()
-    {
-        // table function disabled for Ignite, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertQueryFails(
-                "SELECT name FROM TABLE(system.query(query => 'SELECT name AS region_name FROM public.region'))",
-                ".* Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQuerySelectUnsupportedType()
+    @Flaky(issue = SCHEMA_CHANGE_OPERATION_FAIL_ISSUE, match = SCHEMA_CHANGE_OPERATION_FAIL_MATCH)
+    public void testAddColumn()
     {
-        // table function disabled for Ignite, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        try (TestTable testTable = createTableWithUnsupportedColumn()) {
-            String unqualifiedTableName = testTable.getName().replaceAll("^\\w+\\.", "");
-            // Check that column 'two' is not supported.
-            assertQuery("SELECT column_name FROM information_schema.columns WHERE table_name = '" + unqualifiedTableName + "'", "VALUES 'one', 'three'");
-            assertUpdate("INSERT INTO " + testTable.getName() + " (one, three) VALUES (123, 'test')", 1);
-            assertThatThrownBy(() -> query(format("SELECT * FROM TABLE(system.query(query => 'SELECT * FROM %s'))", testTable.getName())))
-                    .hasMessage("line 1:21: Table function system.query not registered");
-        }
+        super.testAddColumn();
     }
 
+    @Test
     @Override
-    public void testNativeQueryCreateStatement()
+    @Flaky(issue = SCHEMA_CHANGE_OPERATION_FAIL_ISSUE, match = SCHEMA_CHANGE_OPERATION_FAIL_MATCH)
+    public void testDropColumn()
     {
-        // table function disabled for Ignite, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertFalse(getQueryRunner().tableExists(getSession(), "numbers"));
-        assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'CREATE TABLE numbers(n INTEGER)'))"))
-                .hasMessage("line 1:21: Table function system.query not registered");
-        assertFalse(getQueryRunner().tableExists(getSession(), "numbers"));
+        super.testDropColumn();
     }
 
+    @Test
     @Override
-    public void testNativeQueryInsertStatementTableDoesNotExist()
+    @Flaky(issue = SCHEMA_CHANGE_OPERATION_FAIL_ISSUE, match = SCHEMA_CHANGE_OPERATION_FAIL_MATCH)
+    public void testAlterTableAddLongColumnName()
     {
-        // table function disabled for Ignite, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertFalse(getQueryRunner().tableExists(getSession(), "non_existent_table"));
-        assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'INSERT INTO non_existent_table VALUES (1)'))"))
-                .hasMessage("line 1:21: Table function system.query not registered");
+        super.testAlterTableAddLongColumnName();
     }
 
+    @Test(dataProvider = "testColumnNameDataProvider")
     @Override
-    public void testNativeQueryInsertStatementTableExists()
+    @Flaky(issue = SCHEMA_CHANGE_OPERATION_FAIL_ISSUE, match = SCHEMA_CHANGE_OPERATION_FAIL_MATCH)
+    public void testAddAndDropColumnName(String columnName)
     {
-        // table function disabled for Ignite, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        try (TestTable testTable = simpleTable()) {
-            assertThatThrownBy(() -> query(format("SELECT * FROM TABLE(system.query(query => 'INSERT INTO %s VALUES (3, 4)'))", testTable.getName())))
-                    .hasMessage("line 1:21: Table function system.query not registered");
-            assertQuery("SELECT * FROM " + testTable.getName(), "VALUES (1, 1), (2, 2)");
-        }
+        super.testAddAndDropColumnName(columnName);
     }
 
     @Override
@@ -437,14 +388,6 @@ protected TestTable simpleTable()
         return new TestTable(onRemoteDatabase(), format("%s.simple_table", getSession().getSchema().orElseThrow()), "(col BIGINT, id bigint primary key)", ImmutableList.of("1, 1", "2, 2"));
     }
 
-    @Override
-    public void testNativeQueryIncorrectSyntax()
-    {
-        // table function disabled for Ignite, because it doesn't provide ResultSetMetaData, so the result relation type cannot be determined
-        assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'some wrong syntax'))"))
-                .hasMessage("line 1:21: Table function system.query not registered");
-    }
-
     @Override
     public void testCharVarcharComparison()
     {
@@ -494,22 +437,22 @@ public void testDateYearOfEraPredicate()
         assertQuery("SELECT orderdate FROM orders WHERE orderdate = DATE '1997-09-14'", "VALUES DATE '1997-09-14'");
         assertQueryFails(
                 "SELECT * FROM orders WHERE orderdate = DATE '-1996-09-14'",
-                errorMessageForDateOutOrRange("-1996-09-14"));
+                errorMessageForDateOutOfRange("-1996-09-14"));
     }
 
     @Override
     protected String errorMessageForInsertNegativeDate(String date)
     {
-        return errorMessageForDateOutOrRange(date);
+        return errorMessageForDateOutOfRange(date);
     }
 
     @Override
     protected String errorMessageForCreateTableAsSelectNegativeDate(String date)
     {
-        return errorMessageForDateOutOrRange(date);
+        return errorMessageForDateOutOfRange(date);
     }
 
-    private String errorMessageForDateOutOrRange(String date)
+    private String errorMessageForDateOutOfRange(String date)
     {
         return "Date must be between 1970-01-01 and 9999-12-31 in Ignite: " + date;
     }
diff --git a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteJdbcConfig.java b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteJdbcConfig.java
index de7e5d5deb23..ffdc95dd1559 100644
--- a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteJdbcConfig.java
+++ b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteJdbcConfig.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.ignite;
 
+import jakarta.validation.constraints.AssertTrue;
 import org.testng.annotations.Test;
 
-import javax.validation.constraints.AssertTrue;
-
 import static io.airlift.testing.ValidationAssertions.assertFailsValidation;
 import static io.airlift.testing.ValidationAssertions.assertValidates;
-import static org.apache.ignite.IgniteJdbcDriver.URL_PREFIX;
+import static org.apache.ignite.internal.jdbc.thin.JdbcThinUtils.URL_PREFIX;
 
 public class TestIgniteJdbcConfig
 {
diff --git a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteContainer.java b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteContainer.java
index 8c2690cfd369..56a99c84395b 100644
--- a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteContainer.java
+++ b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteContainer.java
@@ -28,7 +28,7 @@ public class TestingIgniteContainer
 
     public TestingIgniteContainer()
     {
-        super(DockerImageName.parse("apacheignite/ignite:2.8.0"));
+        super(DockerImageName.parse("apacheignite/ignite:2.9.0"));
         this.withExposedPorts(10800);
         this.withEnv("IGNITE_SQL_MERGE_TABLE_MAX_SIZE", IGNITE_SQL_MERGE_TABLE_MAX_SIZE).withStartupAttempts(10);
         this.waitingFor((new HttpWaitStrategy()).forStatusCode(200).forResponsePredicate("Ok."::equals).withStartupTimeout(Duration.ofMinutes(1L)));
diff --git a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteServer.java b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteServer.java
index 66581b7ca81b..14e5fca0cb48 100644
--- a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteServer.java
+++ b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteServer.java
@@ -13,11 +13,10 @@
  */
 package io.trino.plugin.ignite;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.testing.ResourcePresence;
 import io.trino.testing.SharedResource;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.Statement;
diff --git a/plugin/trino-jmx/pom.xml b/plugin/trino-jmx/pom.xml
index 9ef961eb7e93..b805878bcc31 100644
--- a/plugin/trino-jmx/pom.xml
+++ b/plugin/trino-jmx/pom.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-jmx</artifactId>
-    <description>Trino - JMX Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - JMX Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,8 +18,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -48,44 +53,44 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-spi</artifactId>
@@ -93,24 +98,35 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <artifactId>jackson-databind</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-client</artifactId>
@@ -123,6 +139,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
@@ -130,14 +153,14 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxConnector.java b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxConnector.java
index 73617e2e8679..fedcc91ad7f0 100644
--- a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxConnector.java
+++ b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxConnector.java
@@ -13,14 +13,13 @@
  */
 package io.trino.plugin.jmx;
 
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import static io.trino.spi.transaction.IsolationLevel.READ_COMMITTED;
 import static io.trino.spi.transaction.IsolationLevel.checkConnectorSupports;
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxConnectorConfig.java b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxConnectorConfig.java
index c33bf50584dc..d26fb3bcf921 100644
--- a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxConnectorConfig.java
+++ b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxConnectorConfig.java
@@ -19,9 +19,8 @@
 import io.airlift.configuration.Config;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Set;
 import java.util.regex.Pattern;
diff --git a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxConnectorFactory.java b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxConnectorFactory.java
index 389a0d55192a..28109f01c2ba 100644
--- a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxConnectorFactory.java
+++ b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxConnectorFactory.java
@@ -25,7 +25,7 @@
 import java.util.Map;
 
 import static io.airlift.configuration.ConfigBinder.configBinder;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 
 public class JmxConnectorFactory
         implements ConnectorFactory
@@ -39,7 +39,7 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 new MBeanServerModule(),
diff --git a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxHistoricalData.java b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxHistoricalData.java
index 20f6d55a122c..b4304495e962 100644
--- a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxHistoricalData.java
+++ b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxHistoricalData.java
@@ -15,8 +15,8 @@
 
 import com.google.common.collect.EvictingQueue;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 
-import javax.inject.Inject;
 import javax.management.MBeanServer;
 
 import java.util.ArrayList;
diff --git a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxMetadata.java b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxMetadata.java
index bda7e43b3549..43efd522e81d 100644
--- a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxMetadata.java
+++ b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxMetadata.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Streams;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
@@ -36,7 +37,6 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
 import javax.management.JMException;
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanInfo;
diff --git a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxPeriodicSampler.java b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxPeriodicSampler.java
index 2d8e6b7a599f..4a80b1589f4b 100644
--- a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxPeriodicSampler.java
+++ b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxPeriodicSampler.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.jmx;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.spi.connector.SchemaTableName;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
 
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
diff --git a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxRecordSetProvider.java b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxRecordSetProvider.java
index 875e3327a313..14189fd42f35 100644
--- a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxRecordSetProvider.java
+++ b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxRecordSetProvider.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.spi.NodeManager;
 import io.trino.spi.connector.ColumnHandle;
@@ -27,7 +28,6 @@
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
 import javax.management.Attribute;
 import javax.management.JMException;
 import javax.management.MBeanServer;
diff --git a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxSplitManager.java b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxSplitManager.java
index 61b93deb96ea..d1a5c10e952d 100644
--- a/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxSplitManager.java
+++ b/plugin/trino-jmx/src/main/java/io/trino/plugin/jmx/JmxSplitManager.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.spi.NodeManager;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorSession;
@@ -29,8 +30,6 @@
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxColumnHandle.java b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxColumnHandle.java
index 8423d52c27c0..87ae64da3e39 100644
--- a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxColumnHandle.java
+++ b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxColumnHandle.java
@@ -14,12 +14,12 @@
 package io.trino.plugin.jmx;
 
 import io.airlift.testing.EquivalenceTester;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.jmx.MetadataUtil.COLUMN_CODEC;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJmxColumnHandle
 {
@@ -29,7 +29,7 @@ public void testJsonRoundTrip()
         JmxColumnHandle handle = new JmxColumnHandle("columnName", createUnboundedVarcharType());
         String json = COLUMN_CODEC.toJson(handle);
         JmxColumnHandle copy = COLUMN_CODEC.fromJson(json);
-        assertEquals(copy, handle);
+        assertThat(copy).isEqualTo(handle);
     }
 
     @Test
diff --git a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxConnectorConfig.java b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxConnectorConfig.java
index 31915e3f9cf3..57cd12a3d066 100644
--- a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxConnectorConfig.java
+++ b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxConnectorConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
diff --git a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxHistoricalData.java b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxHistoricalData.java
index 82db45525ebe..1696862c17ac 100644
--- a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxHistoricalData.java
+++ b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxHistoricalData.java
@@ -15,13 +15,13 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 import static java.lang.management.ManagementFactory.getPlatformMBeanServer;
 import static java.util.Locale.ENGLISH;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJmxHistoricalData
 {
@@ -37,16 +37,16 @@ public void testAddingRows()
         List<Integer> bothColumns = ImmutableList.of(0, 1);
         List<Integer> secondColumn = ImmutableList.of(1);
 
-        assertEquals(jmxHistoricalData.getRows(TABLE_NAME, bothColumns), ImmutableList.of());
+        assertThat(jmxHistoricalData.getRows(TABLE_NAME, bothColumns)).isEmpty();
         jmxHistoricalData.addRow(TABLE_NAME, ImmutableList.of(42, "ala"));
-        assertEquals(jmxHistoricalData.getRows(TABLE_NAME, bothColumns), ImmutableList.of(ImmutableList.<Object>of(42, "ala")));
-        assertEquals(jmxHistoricalData.getRows(TABLE_NAME, secondColumn), ImmutableList.of(ImmutableList.<Object>of("ala")));
-        assertEquals(jmxHistoricalData.getRows(NOT_EXISTING_TABLE_NAME, bothColumns), ImmutableList.of());
+        assertThat(jmxHistoricalData.getRows(TABLE_NAME, bothColumns)).isEqualTo(ImmutableList.of(ImmutableList.<Object>of(42, "ala")));
+        assertThat(jmxHistoricalData.getRows(TABLE_NAME, secondColumn)).isEqualTo(ImmutableList.of(ImmutableList.<Object>of("ala")));
+        assertThat(jmxHistoricalData.getRows(NOT_EXISTING_TABLE_NAME, bothColumns)).isEmpty();
 
         jmxHistoricalData.addRow(TABLE_NAME, ImmutableList.of(42, "ala"));
         jmxHistoricalData.addRow(TABLE_NAME, ImmutableList.of(42, "ala"));
         jmxHistoricalData.addRow(TABLE_NAME, ImmutableList.of(42, "ala"));
-        assertEquals(jmxHistoricalData.getRows(TABLE_NAME, bothColumns).size(), MAX_ENTRIES);
+        assertThat(jmxHistoricalData.getRows(TABLE_NAME, bothColumns)).hasSize(MAX_ENTRIES);
     }
 
     @Test
@@ -55,16 +55,16 @@ public void testCaseInsensitive()
         JmxHistoricalData jmxHistoricalData = new JmxHistoricalData(MAX_ENTRIES, ImmutableSet.of(TABLE_NAME.toUpperCase(ENGLISH)), getPlatformMBeanServer());
 
         List<Integer> columns = ImmutableList.of(0);
-        assertEquals(jmxHistoricalData.getRows(TABLE_NAME, columns), ImmutableList.of());
-        assertEquals(jmxHistoricalData.getRows(TABLE_NAME.toUpperCase(ENGLISH), columns), ImmutableList.of());
+        assertThat(jmxHistoricalData.getRows(TABLE_NAME, columns)).isEmpty();
+        assertThat(jmxHistoricalData.getRows(TABLE_NAME.toUpperCase(ENGLISH), columns)).isEmpty();
 
         jmxHistoricalData.addRow(TABLE_NAME, ImmutableList.of(42));
         jmxHistoricalData.addRow(TABLE_NAME.toUpperCase(ENGLISH), ImmutableList.of(44));
 
-        assertEquals(jmxHistoricalData.getRows(TABLE_NAME, columns), ImmutableList.of(
-                ImmutableList.<Object>of(42), ImmutableList.<Object>of(44)));
-        assertEquals(jmxHistoricalData.getRows(TABLE_NAME.toUpperCase(ENGLISH), columns), ImmutableList.of(
-                ImmutableList.<Object>of(42), ImmutableList.<Object>of(44)));
+        assertThat(jmxHistoricalData.getRows(TABLE_NAME, columns))
+                .isEqualTo(ImmutableList.of(ImmutableList.<Object>of(42), ImmutableList.<Object>of(44)));
+        assertThat(jmxHistoricalData.getRows(TABLE_NAME.toUpperCase(ENGLISH), columns))
+                .isEqualTo(ImmutableList.of(ImmutableList.<Object>of(42), ImmutableList.<Object>of(44)));
     }
 
     @Test
@@ -72,6 +72,6 @@ public void testWildCardPatterns()
     {
         JmxHistoricalData jmxHistoricalData = new JmxHistoricalData(MAX_ENTRIES, ImmutableSet.of("java.lang:type=c*"), getPlatformMBeanServer());
 
-        assertEquals(jmxHistoricalData.getTables(), ImmutableSet.of("java.lang:type=classloading", "java.lang:type=compilation"));
+        assertThat(jmxHistoricalData.getTables()).isEqualTo(ImmutableSet.of("java.lang:type=classloading", "java.lang:type=compilation"));
     }
 }
diff --git a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxMetadata.java b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxMetadata.java
index bc1954fc40ae..a62d993a5378 100644
--- a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxMetadata.java
+++ b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxMetadata.java
@@ -26,7 +26,7 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.TupleDomain;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.util.List;
@@ -42,9 +42,7 @@
 import static java.lang.String.format;
 import static java.lang.management.ManagementFactory.getPlatformMBeanServer;
 import static java.util.Locale.ENGLISH;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJmxMetadata
 {
@@ -59,78 +57,78 @@ public class TestJmxMetadata
     @Test
     public void testListSchemas()
     {
-        assertEquals(metadata.listSchemaNames(SESSION), ImmutableList.of(JMX_SCHEMA_NAME, HISTORY_SCHEMA_NAME));
+        assertThat(metadata.listSchemaNames(SESSION)).isEqualTo(ImmutableList.of(JMX_SCHEMA_NAME, HISTORY_SCHEMA_NAME));
     }
 
     @Test
     public void testListTables()
     {
-        assertTrue(metadata.listTables(SESSION, Optional.of(JMX_SCHEMA_NAME)).contains(RUNTIME_TABLE));
-        assertTrue(metadata.listTables(SESSION, Optional.of(HISTORY_SCHEMA_NAME)).contains(RUNTIME_HISTORY_TABLE));
+        assertThat(metadata.listTables(SESSION, Optional.of(JMX_SCHEMA_NAME))).contains(RUNTIME_TABLE);
+        assertThat(metadata.listTables(SESSION, Optional.of(HISTORY_SCHEMA_NAME))).contains(RUNTIME_HISTORY_TABLE);
     }
 
     @Test
     public void testGetTableHandle()
     {
         JmxTableHandle handle = metadata.getTableHandle(SESSION, RUNTIME_TABLE);
-        assertEquals(handle.getObjectNames(), ImmutableList.of(RUNTIME_OBJECT));
+        assertThat(handle.getObjectNames()).isEqualTo(ImmutableList.of(RUNTIME_OBJECT));
 
         List<JmxColumnHandle> columns = handle.getColumnHandles();
-        assertTrue(columns.contains(new JmxColumnHandle("node", createUnboundedVarcharType())));
-        assertTrue(columns.contains(new JmxColumnHandle("Name", createUnboundedVarcharType())));
-        assertTrue(columns.contains(new JmxColumnHandle("StartTime", BIGINT)));
+        assertThat(columns).contains(new JmxColumnHandle("node", createUnboundedVarcharType()));
+        assertThat(columns).contains(new JmxColumnHandle("Name", createUnboundedVarcharType()));
+        assertThat(columns).contains(new JmxColumnHandle("StartTime", BIGINT));
     }
 
     @Test
     public void testGetTimeTableHandle()
     {
         JmxTableHandle handle = metadata.getTableHandle(SESSION, RUNTIME_HISTORY_TABLE);
-        assertEquals(handle.getObjectNames(), ImmutableList.of(RUNTIME_OBJECT));
+        assertThat(handle.getObjectNames()).isEqualTo(ImmutableList.of(RUNTIME_OBJECT));
 
         List<JmxColumnHandle> columns = handle.getColumnHandles();
-        assertTrue(columns.contains(new JmxColumnHandle("timestamp", createTimestampWithTimeZoneType(3))));
-        assertTrue(columns.contains(new JmxColumnHandle("node", createUnboundedVarcharType())));
-        assertTrue(columns.contains(new JmxColumnHandle("Name", createUnboundedVarcharType())));
-        assertTrue(columns.contains(new JmxColumnHandle("StartTime", BIGINT)));
+        assertThat(columns).contains(new JmxColumnHandle("timestamp", createTimestampWithTimeZoneType(3)));
+        assertThat(columns).contains(new JmxColumnHandle("node", createUnboundedVarcharType()));
+        assertThat(columns).contains(new JmxColumnHandle("Name", createUnboundedVarcharType()));
+        assertThat(columns).contains(new JmxColumnHandle("StartTime", BIGINT));
     }
 
     @Test
     public void testGetCumulativeTableHandle()
     {
         JmxTableHandle handle = metadata.getTableHandle(SESSION, new SchemaTableName(JMX_SCHEMA_NAME, "java.lang:*"));
-        assertTrue(handle.getObjectNames().contains(RUNTIME_OBJECT));
-        assertTrue(handle.getObjectNames().size() > 1);
+        assertThat(handle.getObjectNames()).contains(RUNTIME_OBJECT);
+        assertThat(handle.getObjectNames()).hasSizeGreaterThan(1);
 
         List<JmxColumnHandle> columns = handle.getColumnHandles();
-        assertTrue(columns.contains(new JmxColumnHandle("node", createUnboundedVarcharType())));
-        assertTrue(columns.contains(new JmxColumnHandle("object_name", createUnboundedVarcharType())));
-        assertTrue(columns.contains(new JmxColumnHandle("Name", createUnboundedVarcharType())));
-        assertTrue(columns.contains(new JmxColumnHandle("StartTime", BIGINT)));
-
-        assertTrue(metadata.getTableHandle(SESSION, new SchemaTableName(JMX_SCHEMA_NAME, "*java.lang:type=Runtime*")).getObjectNames().contains(RUNTIME_OBJECT));
-        assertTrue(metadata.getTableHandle(SESSION, new SchemaTableName(JMX_SCHEMA_NAME, "java.lang:*=Runtime")).getObjectNames().contains(RUNTIME_OBJECT));
-        assertTrue(metadata.getTableHandle(SESSION, new SchemaTableName(JMX_SCHEMA_NAME, "*")).getObjectNames().contains(RUNTIME_OBJECT));
-        assertTrue(metadata.getTableHandle(SESSION, new SchemaTableName(JMX_SCHEMA_NAME, "*:*")).getObjectNames().contains(RUNTIME_OBJECT));
+        assertThat(columns).contains(new JmxColumnHandle("node", createUnboundedVarcharType()));
+        assertThat(columns).contains(new JmxColumnHandle("object_name", createUnboundedVarcharType()));
+        assertThat(columns).contains(new JmxColumnHandle("Name", createUnboundedVarcharType()));
+        assertThat(columns).contains(new JmxColumnHandle("StartTime", BIGINT));
+
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName(JMX_SCHEMA_NAME, "*java.lang:type=Runtime*")).getObjectNames()).contains(RUNTIME_OBJECT);
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName(JMX_SCHEMA_NAME, "java.lang:*=Runtime")).getObjectNames()).contains(RUNTIME_OBJECT);
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName(JMX_SCHEMA_NAME, "*")).getObjectNames()).contains(RUNTIME_OBJECT);
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName(JMX_SCHEMA_NAME, "*:*")).getObjectNames()).contains(RUNTIME_OBJECT);
     }
 
     @Test
     public void testGetCumulativeTableHandleForHistorySchema()
     {
         JmxTableHandle handle = metadata.getTableHandle(SESSION, new SchemaTableName(HISTORY_SCHEMA_NAME, PATTERN));
-        assertTrue(handle.getObjectNames().contains(RUNTIME_OBJECT));
-        assertTrue(handle.getObjectNames().size() > 1);
+        assertThat(handle.getObjectNames()).contains(RUNTIME_OBJECT);
+        assertThat(handle.getObjectNames()).hasSizeGreaterThan(1);
 
         List<JmxColumnHandle> columns = handle.getColumnHandles();
-        assertTrue(columns.contains(new JmxColumnHandle("timestamp", createTimestampWithTimeZoneType(3))));
-        assertTrue(columns.contains(new JmxColumnHandle("node", createUnboundedVarcharType())));
-        assertTrue(columns.contains(new JmxColumnHandle("object_name", createUnboundedVarcharType())));
-        assertTrue(columns.contains(new JmxColumnHandle("Name", createUnboundedVarcharType())));
-        assertTrue(columns.contains(new JmxColumnHandle("StartTime", BIGINT)));
-
-        assertTrue(metadata.getTableHandle(SESSION, new SchemaTableName(HISTORY_SCHEMA_NAME, "*java.lang:type=Runtime*")).getObjectNames().contains(RUNTIME_OBJECT));
-        assertTrue(metadata.getTableHandle(SESSION, new SchemaTableName(HISTORY_SCHEMA_NAME, "java.lang:*=Runtime")).getObjectNames().contains(RUNTIME_OBJECT));
-        assertTrue(metadata.getTableHandle(SESSION, new SchemaTableName(HISTORY_SCHEMA_NAME, "*")).getObjectNames().contains(RUNTIME_OBJECT));
-        assertTrue(metadata.getTableHandle(SESSION, new SchemaTableName(HISTORY_SCHEMA_NAME, "*:*")).getObjectNames().contains(RUNTIME_OBJECT));
+        assertThat(columns).contains(new JmxColumnHandle("timestamp", createTimestampWithTimeZoneType(3)));
+        assertThat(columns).contains(new JmxColumnHandle("node", createUnboundedVarcharType()));
+        assertThat(columns).contains(new JmxColumnHandle("object_name", createUnboundedVarcharType()));
+        assertThat(columns).contains(new JmxColumnHandle("Name", createUnboundedVarcharType()));
+        assertThat(columns).contains(new JmxColumnHandle("StartTime", BIGINT));
+
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName(HISTORY_SCHEMA_NAME, "*java.lang:type=Runtime*")).getObjectNames()).contains(RUNTIME_OBJECT);
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName(HISTORY_SCHEMA_NAME, "java.lang:*=Runtime")).getObjectNames()).contains(RUNTIME_OBJECT);
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName(HISTORY_SCHEMA_NAME, "*")).getObjectNames()).contains(RUNTIME_OBJECT);
+        assertThat(metadata.getTableHandle(SESSION, new SchemaTableName(HISTORY_SCHEMA_NAME, "*:*")).getObjectNames()).contains(RUNTIME_OBJECT);
     }
 
     @Test
@@ -139,7 +137,7 @@ public void testApplyFilterWithoutConstraint()
         JmxTableHandle handle = metadata.getTableHandle(SESSION, new SchemaTableName(JMX_SCHEMA_NAME, "java.lang:*"));
         Optional<ConstraintApplicationResult<ConnectorTableHandle>> result = metadata.applyFilter(SESSION, handle, new Constraint(TupleDomain.all()));
 
-        assertFalse(result.isPresent());
+        assertThat(result).isNotPresent();
     }
 
     @Test
@@ -157,9 +155,11 @@ public void testApplyFilterWithConstraint()
 
         Optional<ConstraintApplicationResult<ConnectorTableHandle>> result = metadata.applyFilter(SESSION, handle, new Constraint(tupleDomain));
 
-        assertTrue(result.isPresent());
-        assertEquals(result.get().getRemainingFilter(), TupleDomain.fromFixedValues(ImmutableMap.of(objectNameColumnHandle, objectNameColumnValue)));
-        assertEquals(((JmxTableHandle) result.get().getHandle()).getNodeFilter(), TupleDomain.fromFixedValues(ImmutableMap.of(nodeColumnHandle, nodeColumnValue)));
+        assertThat(result).isPresent();
+        assertThat(result.get().getRemainingFilter())
+                .isEqualTo(TupleDomain.fromFixedValues(ImmutableMap.of(objectNameColumnHandle, objectNameColumnValue)));
+        assertThat(((JmxTableHandle) result.get().getHandle()).getNodeFilter())
+                .isEqualTo(TupleDomain.fromFixedValues(ImmutableMap.of(nodeColumnHandle, nodeColumnValue)));
     }
 
     @Test
@@ -173,7 +173,7 @@ public void testApplyFilterWithSameConstraint()
         JmxTableHandle newTableHandle = new JmxTableHandle(handle.getTableName(), handle.getObjectNames(), handle.getColumnHandles(), handle.isLiveData(), nodeTupleDomain);
 
         Optional<ConstraintApplicationResult<ConnectorTableHandle>> result = metadata.applyFilter(SESSION, newTableHandle, new Constraint(nodeTupleDomain));
-        assertFalse(result.isPresent());
+        assertThat(result).isNotPresent();
     }
 
     private static Node createTestingNode(String hostname)
diff --git a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxQueries.java b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxQueries.java
index e873c221f6bc..9ea235463362 100644
--- a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxQueries.java
+++ b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxQueries.java
@@ -14,10 +14,11 @@
 package io.trino.plugin.jmx;
 
 import com.google.common.collect.ImmutableSet;
-import io.trino.testing.AbstractTestQueryFramework;
-import io.trino.testing.MaterializedResult;
-import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import io.trino.sql.query.QueryAssertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Locale;
 import java.util.Set;
@@ -26,14 +27,28 @@
 import static io.trino.connector.informationschema.InformationSchemaTable.INFORMATION_SCHEMA;
 import static io.trino.plugin.jmx.JmxMetadata.HISTORY_SCHEMA_NAME;
 import static io.trino.plugin.jmx.JmxMetadata.JMX_SCHEMA_NAME;
-import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
-import static java.lang.String.format;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestJmxQueries
-        extends AbstractTestQueryFramework
 {
+    private QueryAssertions assertions;
+
+    @BeforeAll
+    public void init()
+            throws Exception
+    {
+        assertions = new QueryAssertions(JmxQueryRunner.createJmxQueryRunner());
+    }
+
+    @AfterAll
+    public void teardown()
+    {
+        assertions.close();
+        assertions = null;
+    }
+
     private static final Set<String> STANDARD_NAMES = ImmutableSet.<String>builder()
             .add("java.lang:type=ClassLoading")
             .add("java.lang:type=Memory")
@@ -43,18 +58,11 @@ public class TestJmxQueries
             .add("java.util.logging:type=Logging")
             .build();
 
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        return JmxQueryRunner.createJmxQueryRunner();
-    }
-
     @Test
     public void testShowSchemas()
     {
-        MaterializedResult result = computeActual("SHOW SCHEMAS");
-        assertEquals(result.getOnlyColumnAsSet(), ImmutableSet.of(INFORMATION_SCHEMA, JMX_SCHEMA_NAME, HISTORY_SCHEMA_NAME));
+        assertThat(assertions.query("SHOW SCHEMAS"))
+                .matches(result -> result.getOnlyColumnAsSet().equals(ImmutableSet.of(INFORMATION_SCHEMA, JMX_SCHEMA_NAME, HISTORY_SCHEMA_NAME)));
     }
 
     @Test
@@ -63,41 +71,47 @@ public void testShowTables()
         Set<String> standardNamesLower = STANDARD_NAMES.stream()
                 .map(name -> name.toLowerCase(Locale.ENGLISH))
                 .collect(toImmutableSet());
-        MaterializedResult result = computeActual("SHOW TABLES");
-        assertTrue(result.getOnlyColumnAsSet().containsAll(standardNamesLower));
+
+        assertThat(assertions.query("SHOW TABLES"))
+                .matches(result -> result.getOnlyColumnAsSet().containsAll(standardNamesLower));
     }
 
     @Test
     public void testQuery()
     {
         for (String name : STANDARD_NAMES) {
-            computeActual(format("SELECT * FROM \"%s\"", name));
+            assertThat(assertions.query("SELECT * FROM \"%s\"".formatted(name)))
+                    .succeeds();
         }
     }
 
     @Test
     public void testNodeCount()
     {
-        String name = STANDARD_NAMES.iterator().next();
-        MaterializedResult actual = computeActual("SELECT node_id FROM system.runtime.nodes");
-        MaterializedResult expected = computeActual(format("SELECT DISTINCT node FROM \"%s\"", name));
-        assertEqualsIgnoreOrder(actual, expected);
+        assertThat(assertions.query("SELECT DISTINCT node FROM \"%s\"".formatted(STANDARD_NAMES.iterator().next())))
+                .matches("SELECT node_id FROM system.runtime.nodes");
     }
 
     @Test
     public void testOrderOfParametersIsIgnored()
     {
-        assertEqualsIgnoreOrder(
-                computeActual("SELECT node FROM \"java.nio:type=bufferpool,name=direct\""),
-                computeActual("SELECT node FROM \"java.nio:name=direct,type=bufferpool\""));
+        assertThat(assertions.query("SELECT node FROM \"java.nio:type=bufferpool,name=direct\""))
+                .matches("SELECT node FROM \"java.nio:name=direct,type=bufferpool\"");
     }
 
     @Test
     public void testQueryCumulativeTable()
     {
-        computeActual("SELECT * FROM \"*:*\"");
-        computeActual("SELECT * FROM \"java.util.logging:*\"");
-        assertTrue(computeActual("SELECT * FROM \"java.lang:*\"").getRowCount() > 1);
-        assertTrue(computeActual("SELECT * FROM \"jAVA.LANg:*\"").getRowCount() > 1);
+        assertThat(assertions.query("SELECT * FROM \"*:*\""))
+                .succeeds();
+
+        assertThat(assertions.query("SELECT * FROM \"java.util.logging:*\""))
+                .succeeds();
+
+        assertThat(assertions.query("SELECT * FROM \"java.lang:*\""))
+                .matches(result -> result.getRowCount() > 1);
+
+        assertThat(assertions.query("SELECT * FROM \"jAVA.LANg:*\""))
+                .matches(result -> result.getRowCount() > 1);
     }
 }
diff --git a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxSplit.java b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxSplit.java
index 459debe8d4ed..98322bd2dd16 100644
--- a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxSplit.java
+++ b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxSplit.java
@@ -15,11 +15,10 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.HostAddress;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.jmx.MetadataUtil.SPLIT_CODEC;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJmxSplit
 {
@@ -29,9 +28,9 @@ public class TestJmxSplit
     @Test
     public void testSplit()
     {
-        assertEquals(SPLIT.getAddresses(), ADDRESSES);
-        assertSame(SPLIT.getInfo(), SPLIT);
-        assertEquals(SPLIT.isRemotelyAccessible(), false);
+        assertThat(SPLIT.getAddresses()).isEqualTo(ADDRESSES);
+        assertThat(SPLIT.getInfo()).isSameAs(SPLIT);
+        assertThat(SPLIT.isRemotelyAccessible()).isFalse();
     }
 
     @Test
@@ -40,8 +39,8 @@ public void testJsonRoundTrip()
         String json = SPLIT_CODEC.toJson(SPLIT);
         JmxSplit copy = SPLIT_CODEC.fromJson(json);
 
-        assertEquals(copy.getAddresses(), SPLIT.getAddresses());
-        assertSame(copy.getInfo(), copy);
-        assertEquals(copy.isRemotelyAccessible(), false);
+        assertThat(copy.getAddresses()).isEqualTo(SPLIT.getAddresses());
+        assertThat(copy.getInfo()).isSameAs(copy);
+        assertThat(copy.isRemotelyAccessible()).isFalse();
     }
 }
diff --git a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxSplitManager.java b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxSplitManager.java
index 369de4b8b404..46685b3c8224 100644
--- a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxSplitManager.java
+++ b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxSplitManager.java
@@ -35,8 +35,9 @@
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.testing.TestingNodeManager;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.net.URI;
 import java.util.HashSet;
@@ -52,15 +53,17 @@
 import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.testing.TestingConnectorSession.SESSION;
+import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.util.stream.Collectors.toSet;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestJmxSplitManager
 {
     private static final Duration JMX_STATS_DUMP = new Duration(100, TimeUnit.MILLISECONDS);
-    private static final long SLEEP_TIME = JMX_STATS_DUMP.toMillis() / 5;
+    private static final int SLEEP_TIME = toIntExact(JMX_STATS_DUMP.toMillis() / 5);
     private static final long TIMEOUT_TIME = JMX_STATS_DUMP.toMillis() * 40;
     private static final String TEST_BEANS = "java.lang:type=Runtime";
     private static final String CONNECTOR_ID = "test-id";
@@ -89,7 +92,7 @@ public NodeManager getNodeManager()
     private final JmxMetadata metadata = jmxConnector.getMetadata(SESSION, new ConnectorTransactionHandle() {});
     private final JmxRecordSetProvider recordSetProvider = jmxConnector.getRecordSetProvider();
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         jmxConnector.shutdown();
@@ -107,9 +110,10 @@ public void testPredicatePushdown()
             ConnectorSplitSource splitSource = splitManager.getSplits(JmxTransactionHandle.INSTANCE, SESSION, tableHandle, DynamicFilter.EMPTY, Constraint.alwaysTrue());
             List<ConnectorSplit> allSplits = getAllSplits(splitSource);
 
-            assertEquals(allSplits.size(), 1);
-            assertEquals(allSplits.get(0).getAddresses().size(), 1);
-            assertEquals(allSplits.get(0).getAddresses().get(0).getHostText(), nodeIdentifier);
+            assertThat(allSplits).hasSize(1);
+            assertThat(allSplits.get(0).getAddresses()).hasSize(1);
+            assertThat(allSplits.get(0).getAddresses().get(0).getHostText())
+                    .isEqualTo(nodeIdentifier);
         }
     }
 
@@ -120,16 +124,16 @@ public void testNoPredicate()
         JmxTableHandle tableHandle = new JmxTableHandle(new SchemaTableName("schema", "tableName"), ImmutableList.of("objectName"), ImmutableList.of(columnHandle), true, TupleDomain.all());
         ConnectorSplitSource splitSource = splitManager.getSplits(JmxTransactionHandle.INSTANCE, SESSION, tableHandle, DynamicFilter.EMPTY, Constraint.alwaysTrue());
         List<ConnectorSplit> allSplits = getAllSplits(splitSource);
-        assertEquals(allSplits.size(), nodes.size());
+        assertThat(allSplits).hasSize(nodes.size());
 
         Set<String> actualNodes = nodes.stream().map(Node::getNodeIdentifier).collect(toSet());
         Set<String> expectedNodes = new HashSet<>();
         for (ConnectorSplit split : allSplits) {
             List<HostAddress> addresses = split.getAddresses();
-            assertEquals(addresses.size(), 1);
+            assertThat(addresses).hasSize(1);
             expectedNodes.add(addresses.get(0).getHostText());
         }
-        assertEquals(actualNodes, expectedNodes);
+        assertThat(actualNodes).isEqualTo(expectedNodes);
     }
 
     @Test
@@ -163,10 +167,10 @@ public void testHistoryRecordSetProvider()
                 }
                 Thread.sleep(SLEEP_TIME);
             }
-            assertTrue(timeStamps.size() >= 2);
+            assertThat(timeStamps).matches(value -> value.size() >= 2);
 
             // we don't have equality check here because JmxHistoryDumper scheduling can lag
-            assertTrue(timeStamps.get(1) - timeStamps.get(0) >= JMX_STATS_DUMP.toMillis());
+            assertThat(timeStamps.get(1) - timeStamps.get(0)).matches(delta -> delta >= JMX_STATS_DUMP.toMillis());
         }
     }
 
@@ -181,7 +185,7 @@ private List<Long> readTimeStampsFrom(RecordSet recordSet)
                 if (cursor.isNull(0)) {
                     return result.build();
                 }
-                assertEquals(recordSet.getColumnTypes().get(0), createTimestampWithTimeZoneType(3));
+                assertThat(recordSet.getColumnTypes().get(0)).isEqualTo(createTimestampWithTimeZoneType(3));
                 result.add(cursor.getLong(0));
             }
         }
@@ -196,7 +200,7 @@ private RecordSet getRecordSet(SchemaTableName schemaTableName)
 
         ConnectorSplitSource splitSource = splitManager.getSplits(JmxTransactionHandle.INSTANCE, SESSION, tableHandle, DynamicFilter.EMPTY, Constraint.alwaysTrue());
         List<ConnectorSplit> allSplits = getAllSplits(splitSource);
-        assertEquals(allSplits.size(), nodes.size());
+        assertThat(allSplits).hasSize(nodes.size());
         ConnectorSplit split = allSplits.get(0);
 
         return recordSetProvider.getRecordSet(JmxTransactionHandle.INSTANCE, SESSION, split, tableHandle, columnHandles);
diff --git a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxTableHandle.java b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxTableHandle.java
index f4bf73e5756a..9ad8e06256e0 100644
--- a/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxTableHandle.java
+++ b/plugin/trino-jmx/src/test/java/io/trino/plugin/jmx/TestJmxTableHandle.java
@@ -20,7 +20,7 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.predicate.TupleDomain;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -28,7 +28,7 @@
 import static io.trino.plugin.jmx.MetadataUtil.TABLE_CODEC;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJmxTableHandle
 {
@@ -47,7 +47,7 @@ public void testJsonRoundTrip()
 
         String json = TABLE_CODEC.toJson(table);
         JmxTableHandle copy = TABLE_CODEC.fromJson(json);
-        assertEquals(copy, table);
+        assertThat(copy).isEqualTo(table);
     }
 
     @Test
diff --git a/plugin/trino-kafka/pom.xml b/plugin/trino-kafka/pom.xml
index 623f8842c450..672b210f7cae 100644
--- a/plugin/trino-kafka/pom.xml
+++ b/plugin/trino-kafka/pom.xml
@@ -5,42 +5,47 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-kafka</artifactId>
-    <description>Trino - Kafka Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Kafka Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>confluent</id>
-            <url>https://packages.confluent.io/maven/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-record-decoder</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java-util</artifactId>
         </dependency>
 
         <dependency>
@@ -69,80 +74,96 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-schema-registry-client</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-record-decoder</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java-util</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>kafka-schema-registry-client</artifactId>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>net.sf.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>net.sf.opencsv</groupId>
-            <artifactId>opencsv</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.avro</groupId>
-            <artifactId>avro</artifactId>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-protobuf-provider</artifactId>
+            <!-- This is under Confluent Community License and it should not be used with compile scope -->
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- used by kafka-protobuf-provider -->
@@ -154,8 +175,14 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>runtime</scope>
         </dependency>
 
@@ -171,39 +198,63 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.confluent</groupId>
-            <artifactId>kafka-protobuf-provider</artifactId>
+            <artifactId>kafka-avro-serializer</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-json-schema-serializer</artifactId>
             <!-- This is under Confluent Community License and it should not be used with compile scope -->
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-protobuf-serializer</artifactId>
+            <!-- This is under Confluent Community License and it should not be used with compile scope -->
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.kafka</groupId>
+                    <artifactId>kafka-clients</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-protobuf-types</artifactId>
+            <!-- This is under Confluent Community License and it should not be used with compile scope -->
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-schema-serializer</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-client</artifactId>
@@ -268,59 +319,14 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>kafka-avro-serializer</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>kafka-json-schema-serializer</artifactId>
-            <!-- This is under Confluent Community License and it should not be used with compile scope -->
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>kafka-protobuf-serializer</artifactId>
-            <!-- This is under Confluent Community License and it should not be used with compile scope -->
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.kafka</groupId>
-                    <artifactId>kafka-clients</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>kafka-protobuf-types</artifactId>
-            <!-- This is under Confluent Community License and it should not be used with compile scope -->
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>kafka-schema-serializer</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -331,8 +337,40 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>confluent</id>
+            <url>https://packages.confluent.io/maven/</url>
+        </repository>
+    </repositories>
+
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>io.trino</groupId>
                 <artifactId>trino-maven-plugin</artifactId>
@@ -362,10 +400,10 @@
                 <executions>
                     <execution>
                         <id>generate-test-sources</id>
-                        <phase>generate-test-sources</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
+                        <phase>generate-test-sources</phase>
                         <configuration>
                             <protocVersion>${dep.protobuf.version}</protocVersion>
                             <addSources>none</addSources>
@@ -383,10 +421,10 @@
                 <executions>
                     <execution>
                         <id>add-test-sources</id>
-                        <phase>generate-test-sources</phase>
                         <goals>
                             <goal>add-test-source</goal>
                         </goals>
+                        <phase>generate-test-sources</phase>
                         <configuration>
                             <sources>
                                 <source>${basedir}/target/generated-test-sources</source>
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/DefaultKafkaAdminFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/DefaultKafkaAdminFactory.java
index b193cf5deb64..8247c0052b38 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/DefaultKafkaAdminFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/DefaultKafkaAdminFactory.java
@@ -14,11 +14,10 @@
 
 package io.trino.plugin.kafka;
 
+import com.google.inject.Inject;
 import io.trino.spi.HostAddress;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/DefaultKafkaConsumerFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/DefaultKafkaConsumerFactory.java
index 9ece54293666..361f234015b3 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/DefaultKafkaConsumerFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/DefaultKafkaConsumerFactory.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.kafka;
 
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 import io.trino.spi.HostAddress;
 import io.trino.spi.connector.ConnectorSession;
 import org.apache.kafka.common.serialization.ByteArrayDeserializer;
 
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/DefaultKafkaProducerFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/DefaultKafkaProducerFactory.java
index 91882954f71b..275869b8cfd8 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/DefaultKafkaProducerFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/DefaultKafkaProducerFactory.java
@@ -13,12 +13,11 @@
  */
 package io.trino.plugin.kafka;
 
+import com.google.inject.Inject;
 import io.trino.spi.HostAddress;
 import io.trino.spi.connector.ConnectorSession;
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConfig.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConfig.java
index a1292f4c8055..d75cd380b86c 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConfig.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConfig.java
@@ -24,11 +24,10 @@
 import io.airlift.units.DataSize.Unit;
 import io.trino.plugin.kafka.schema.file.FileTableDescriptionSupplier;
 import io.trino.spi.HostAddress;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 import java.io.File;
 import java.util.List;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConnector.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConnector.java
index 40d9ca280678..9d6af29673e5 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConnector.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConnector.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.kafka;
 
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.connector.Connector;
@@ -25,8 +26,6 @@
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Set;
 
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConnectorFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConnectorFactory.java
index ad5039e35a78..e9a33f54de47 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConnectorFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConnectorFactory.java
@@ -27,7 +27,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class KafkaConnectorFactory
@@ -51,13 +51,13 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
     {
         requireNonNull(catalogName, "catalogName is null");
         requireNonNull(config, "config is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 new CatalogNameModule(catalogName),
                 new JsonModule(),
                 new TypeDeserializerModule(context.getTypeManager()),
-                new KafkaConnectorModule(),
+                new KafkaConnectorModule(context.getTypeManager()),
                 extension,
                 binder -> {
                     binder.bind(ClassLoader.class).toInstance(KafkaConnectorFactory.class.getClassLoader());
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConnectorModule.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConnectorModule.java
index 680b5716c703..57961b02c91f 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConnectorModule.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaConnectorModule.java
@@ -31,15 +31,24 @@
 import io.trino.spi.connector.ConnectorPageSinkProvider;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
 import io.trino.spi.connector.ConnectorSplitManager;
+import io.trino.spi.type.TypeManager;
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static io.airlift.json.JsonCodecBinder.jsonCodecBinder;
+import static java.util.Objects.requireNonNull;
 
 public class KafkaConnectorModule
         extends AbstractConfigurationAwareModule
 {
+    private final TypeManager typeManager;
+
+    public KafkaConnectorModule(TypeManager typeManager)
+    {
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+    }
+
     @Override
     public void setup(Binder binder)
     {
@@ -58,7 +67,7 @@ public void setup(Binder binder)
 
         configBinder(binder).bindConfig(KafkaConfig.class);
         bindTopicSchemaProviderModule(FileTableDescriptionSupplier.NAME, new FileTableDescriptionSupplierModule());
-        bindTopicSchemaProviderModule(ConfluentSchemaRegistryTableDescriptionSupplier.NAME, new ConfluentModule());
+        bindTopicSchemaProviderModule(ConfluentSchemaRegistryTableDescriptionSupplier.NAME, new ConfluentModule(typeManager));
         newSetBinder(binder, SessionPropertiesProvider.class).addBinding().to(KafkaSessionProperties.class).in(Scopes.SINGLETON);
         jsonCodecBinder(binder).bindJsonCodec(KafkaTopicDescription.class);
     }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaFilterManager.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaFilterManager.java
index dd1bc19c6bad..55670157dfc5 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaFilterManager.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaFilterManager.java
@@ -15,6 +15,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.plugin.kafka.KafkaInternalFieldManager.InternalFieldId;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
@@ -35,8 +36,6 @@
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.config.ConfigResource;
 
-import javax.inject.Inject;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaMetadata.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaMetadata.java
index dc2a5834c02d..aa7af3535170 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaMetadata.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaMetadata.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.decoder.dummy.DummyRowDecoder;
 import io.trino.plugin.kafka.schema.TableDescriptionSupplier;
@@ -36,8 +37,6 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.statistics.ComputedStatistics;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaPageSinkProvider.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaPageSinkProvider.java
index 375b7a98f5b6..bf0aa5d16d37 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaPageSinkProvider.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaPageSinkProvider.java
@@ -14,9 +14,12 @@
 package io.trino.plugin.kafka;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.kafka.encoder.DispatchingRowEncoderFactory;
 import io.trino.plugin.kafka.encoder.EncoderColumnHandle;
+import io.trino.plugin.kafka.encoder.KafkaFieldType;
 import io.trino.plugin.kafka.encoder.RowEncoder;
+import io.trino.plugin.kafka.encoder.RowEncoderSpec;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
@@ -26,14 +29,15 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.List;
 import java.util.Optional;
 
 import static io.trino.plugin.kafka.KafkaErrorCode.KAFKA_SCHEMA_ERROR;
+import static io.trino.plugin.kafka.encoder.KafkaFieldType.KEY;
+import static io.trino.plugin.kafka.encoder.KafkaFieldType.MESSAGE;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
@@ -78,15 +82,11 @@ public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHa
 
         RowEncoder keyEncoder = encoderFactory.create(
                 session,
-                handle.getKeyDataFormat(),
-                getDataSchema(handle.getKeyDataSchemaLocation()),
-                keyColumns.build());
+                toRowEncoderSpec(handle, keyColumns.build(), KEY));
 
         RowEncoder messageEncoder = encoderFactory.create(
                 session,
-                handle.getMessageDataFormat(),
-                getDataSchema(handle.getMessageDataSchemaLocation()),
-                messageColumns.build());
+                toRowEncoderSpec(handle, messageColumns.build(), MESSAGE));
 
         return new KafkaPageSink(
                 handle.getTopicName(),
@@ -97,6 +97,14 @@ public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHa
                 session);
     }
 
+    private static RowEncoderSpec toRowEncoderSpec(KafkaTableHandle handle, List<EncoderColumnHandle> columns, KafkaFieldType kafkaFieldType)
+    {
+        return switch (kafkaFieldType) {
+            case KEY -> new RowEncoderSpec(handle.getKeyDataFormat(), getDataSchema(handle.getKeyDataSchemaLocation()), columns, handle.getTopicName(), kafkaFieldType);
+            case MESSAGE -> new RowEncoderSpec(handle.getMessageDataFormat(), getDataSchema(handle.getMessageDataSchemaLocation()), columns, handle.getTopicName(), kafkaFieldType);
+        };
+    }
+
     private static Optional<String> getDataSchema(Optional<String> dataSchemaLocation)
     {
         return dataSchemaLocation.map(location -> {
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaRecordSet.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaRecordSet.java
index f74948922ce7..e46223cf0fc1 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaRecordSet.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaRecordSet.java
@@ -20,8 +20,8 @@
 import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.FieldValueProvider;
 import io.trino.decoder.RowDecoder;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.ArrayBlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.RecordCursor;
@@ -45,6 +45,7 @@
 import static io.trino.decoder.FieldValueProviders.booleanValueProvider;
 import static io.trino.decoder.FieldValueProviders.bytesValueProvider;
 import static io.trino.decoder.FieldValueProviders.longValueProvider;
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
 import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
 import static io.trino.spi.type.TypeUtils.writeNativeValue;
 import static java.lang.Math.max;
@@ -171,7 +172,8 @@ private boolean nextRow(ConsumerRecord<byte[], byte[]> message)
             long timeStamp = message.timestamp() * MICROSECONDS_PER_MILLISECOND;
 
             Optional<Map<DecoderColumnHandle, FieldValueProvider>> decodedKey = keyDecoder.decodeRow(keyData);
-            Optional<Map<DecoderColumnHandle, FieldValueProvider>> decodedValue = messageDecoder.decodeRow(messageData);
+            // tombstone message has null value body
+            Optional<Map<DecoderColumnHandle, FieldValueProvider>> decodedValue = message.value() == null ? Optional.empty() : messageDecoder.decodeRow(messageData);
 
             Map<ColumnHandle, FieldValueProvider> currentRowValuesMap = columnHandles.stream()
                     .filter(KafkaColumnHandle::isInternal)
@@ -231,7 +233,7 @@ public Slice getSlice(int field)
         @Override
         public Object getObject(int field)
         {
-            return getFieldValueProvider(field, Block.class).getBlock();
+            return getFieldValueProvider(field, Object.class).getObject();
         }
 
         @Override
@@ -251,7 +253,7 @@ private FieldValueProvider getFieldValueProvider(int field, Class<?> expectedTyp
         private void checkFieldType(int field, Class<?> expected)
         {
             Class<?> actual = getType(field).getJavaType();
-            checkArgument(actual == expected, "Expected field %s to be type %s but is %s", field, expected, actual);
+            checkArgument(expected.isAssignableFrom(actual), "Expected field %s to be type %s but is %s", field, expected, actual);
         }
 
         @Override
@@ -267,25 +269,25 @@ public static FieldValueProvider headerMapValueProvider(MapType varcharMapType,
         Type valueArrayType = varcharMapType.getTypeParameters().get(1);
         Type valueType = valueArrayType.getTypeParameters().get(0);
 
-        BlockBuilder mapBlockBuilder = varcharMapType.createBlockBuilder(null, 1);
-        BlockBuilder builder = mapBlockBuilder.beginBlockEntry();
-
         // Group by keys and collect values as array.
         Multimap<String, byte[]> headerMap = ArrayListMultimap.create();
         for (Header header : headers) {
             headerMap.put(header.key(), header.value());
         }
 
-        for (String headerKey : headerMap.keySet()) {
-            writeNativeValue(keyType, builder, headerKey);
-            BlockBuilder arrayBuilder = builder.beginBlockEntry();
-            for (byte[] value : headerMap.get(headerKey)) {
-                writeNativeValue(valueType, arrayBuilder, value);
-            }
-            builder.closeEntry();
-        }
-
-        mapBlockBuilder.closeEntry();
+        SqlMap map = buildMapValue(
+                varcharMapType,
+                headerMap.size(),
+                (keyBuilder, valueBuilder) -> {
+                    for (String headerKey : headerMap.keySet()) {
+                        writeNativeValue(keyType, keyBuilder, headerKey);
+                        ((ArrayBlockBuilder) valueBuilder).buildEntry(elementBuilder -> {
+                            for (byte[] value : headerMap.get(headerKey)) {
+                                writeNativeValue(valueType, elementBuilder, value);
+                            }
+                        });
+                    }
+                });
 
         return new FieldValueProvider()
         {
@@ -296,9 +298,9 @@ public boolean isNull()
             }
 
             @Override
-            public Block getBlock()
+            public SqlMap getObject()
             {
-                return varcharMapType.getObject(mapBlockBuilder, 0);
+                return map;
             }
         };
     }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaRecordSetProvider.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaRecordSetProvider.java
index a12970fd1142..b0e65e96b4fd 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaRecordSetProvider.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaRecordSetProvider.java
@@ -14,8 +14,10 @@
 package io.trino.plugin.kafka;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.decoder.DispatchingRowDecoderFactory;
 import io.trino.decoder.RowDecoder;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
 import io.trino.spi.connector.ConnectorSession;
@@ -24,14 +26,13 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.RecordSet;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.decoder.avro.AvroRowDecoderFactory.DATA_SCHEMA;
 import static java.util.Objects.requireNonNull;
 
 public class KafkaRecordSetProvider
@@ -59,20 +60,24 @@ public RecordSet getRecordSet(ConnectorTransactionHandle transaction, ConnectorS
                 .collect(toImmutableList());
 
         RowDecoder keyDecoder = decoderFactory.create(
-                kafkaSplit.getKeyDataFormat(),
-                getDecoderParameters(kafkaSplit.getKeyDataSchemaContents()),
-                kafkaColumns.stream()
-                        .filter(col -> !col.isInternal())
-                        .filter(KafkaColumnHandle::isKeyCodec)
-                        .collect(toImmutableSet()));
+                session,
+                new RowDecoderSpec(
+                        kafkaSplit.getKeyDataFormat(),
+                        getDecoderParameters(kafkaSplit.getKeyDataSchemaContents()),
+                        kafkaColumns.stream()
+                                .filter(col -> !col.isInternal())
+                                .filter(KafkaColumnHandle::isKeyCodec)
+                                .collect(toImmutableSet())));
 
         RowDecoder messageDecoder = decoderFactory.create(
-                kafkaSplit.getMessageDataFormat(),
-                getDecoderParameters(kafkaSplit.getMessageDataSchemaContents()),
-                kafkaColumns.stream()
-                        .filter(col -> !col.isInternal())
-                        .filter(col -> !col.isKeyCodec())
-                        .collect(toImmutableSet()));
+                session,
+                new RowDecoderSpec(
+                        kafkaSplit.getMessageDataFormat(),
+                        getDecoderParameters(kafkaSplit.getMessageDataSchemaContents()),
+                        kafkaColumns.stream()
+                                .filter(col -> !col.isInternal())
+                                .filter(col -> !col.isKeyCodec())
+                                .collect(toImmutableSet())));
 
         return new KafkaRecordSet(kafkaSplit, consumerFactory, session, kafkaColumns, keyDecoder, messageDecoder, kafkaInternalFieldManager);
     }
@@ -80,7 +85,7 @@ public RecordSet getRecordSet(ConnectorTransactionHandle transaction, ConnectorS
     private static Map<String, String> getDecoderParameters(Optional<String> dataSchema)
     {
         ImmutableMap.Builder<String, String> parameters = ImmutableMap.builder();
-        dataSchema.ifPresent(schema -> parameters.put("dataSchema", schema));
+        dataSchema.ifPresent(schema -> parameters.put(DATA_SCHEMA, schema));
         return parameters.buildOrThrow();
     }
 }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSecurityConfig.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSecurityConfig.java
index f739f0f5f43c..892dbc7ec475 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSecurityConfig.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSecurityConfig.java
@@ -15,10 +15,9 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
+import jakarta.annotation.PostConstruct;
 import org.apache.kafka.common.security.auth.SecurityProtocol;
 
-import javax.annotation.PostConstruct;
-
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkState;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSessionProperties.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSessionProperties.java
index e3246c6534fd..7a1e1d635573 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSessionProperties.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSessionProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.kafka;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 public final class KafkaSessionProperties
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSplit.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSplit.java
index ecddd5fb1870..54b1bae38037 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSplit.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSplit.java
@@ -57,8 +57,8 @@ public KafkaSplit(
         this.topicName = requireNonNull(topicName, "topicName is null");
         this.keyDataFormat = requireNonNull(keyDataFormat, "keyDataFormat is null");
         this.messageDataFormat = requireNonNull(messageDataFormat, "messageDataFormat is null");
-        this.keyDataSchemaContents = keyDataSchemaContents;
-        this.messageDataSchemaContents = messageDataSchemaContents;
+        this.keyDataSchemaContents = requireNonNull(keyDataSchemaContents, "keyDataSchemaContents is null");
+        this.messageDataSchemaContents = requireNonNull(messageDataSchemaContents, "messageDataSchemaContents is null");
         this.partitionId = partitionId;
         this.messagesRange = requireNonNull(messagesRange, "messagesRange is null");
         this.leader = requireNonNull(leader, "leader is null");
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSplitManager.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSplitManager.java
index 213647147dda..25c38c586c5b 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSplitManager.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaSplitManager.java
@@ -14,7 +14,8 @@
 package io.trino.plugin.kafka;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.plugin.kafka.schema.ContentSchemaReader;
+import com.google.inject.Inject;
+import io.trino.plugin.kafka.schema.ContentSchemaProvider;
 import io.trino.spi.HostAddress;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
@@ -29,8 +30,6 @@
 import org.apache.kafka.common.PartitionInfo;
 import org.apache.kafka.common.TopicPartition;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -45,16 +44,16 @@ public class KafkaSplitManager
 {
     private final KafkaConsumerFactory consumerFactory;
     private final KafkaFilterManager kafkaFilterManager;
-    private final ContentSchemaReader contentSchemaReader;
+    private final ContentSchemaProvider contentSchemaProvider;
     private final int messagesPerSplit;
 
     @Inject
-    public KafkaSplitManager(KafkaConsumerFactory consumerFactory, KafkaConfig kafkaConfig, KafkaFilterManager kafkaFilterManager, ContentSchemaReader contentSchemaReader)
+    public KafkaSplitManager(KafkaConsumerFactory consumerFactory, KafkaConfig kafkaConfig, KafkaFilterManager kafkaFilterManager, ContentSchemaProvider contentSchemaProvider)
     {
         this.consumerFactory = requireNonNull(consumerFactory, "consumerFactory is null");
         this.messagesPerSplit = kafkaConfig.getMessagesPerSplit();
         this.kafkaFilterManager = requireNonNull(kafkaFilterManager, "kafkaFilterManager is null");
-        this.contentSchemaReader = requireNonNull(contentSchemaReader, "contentSchemaReader is null");
+        this.contentSchemaProvider = requireNonNull(contentSchemaProvider, "contentSchemaProvider is null");
     }
 
     @Override
@@ -82,8 +81,8 @@ public ConnectorSplitSource getSplits(
             partitionEndOffsets = kafkaFilteringResult.getPartitionEndOffsets();
 
             ImmutableList.Builder<KafkaSplit> splits = ImmutableList.builder();
-            Optional<String> keyDataSchemaContents = contentSchemaReader.readKeyContentSchema(kafkaTableHandle);
-            Optional<String> messageDataSchemaContents = contentSchemaReader.readValueContentSchema(kafkaTableHandle);
+            Optional<String> keyDataSchemaContents = contentSchemaProvider.getKey(kafkaTableHandle);
+            Optional<String> messageDataSchemaContents = contentSchemaProvider.getMessage(kafkaTableHandle);
 
             for (PartitionInfo partitionInfo : partitionInfos) {
                 TopicPartition topicPartition = toTopicPartition(partitionInfo);
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/SslKafkaAdminFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/SslKafkaAdminFactory.java
index 8947a19fcf88..90847fc1661c 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/SslKafkaAdminFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/SslKafkaAdminFactory.java
@@ -15,12 +15,11 @@
 package io.trino.plugin.kafka;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.plugin.kafka.security.ForKafkaSsl;
 import io.trino.plugin.kafka.security.KafkaSslConfig;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import java.util.Properties;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/SslKafkaConsumerFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/SslKafkaConsumerFactory.java
index 6d2a4edf3bab..0802bdbc273a 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/SslKafkaConsumerFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/SslKafkaConsumerFactory.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.kafka;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.plugin.kafka.security.ForKafkaSsl;
 import io.trino.plugin.kafka.security.KafkaSslConfig;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import java.util.Properties;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/SslKafkaProducerFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/SslKafkaProducerFactory.java
index 4772db5ff481..b70e76b56b17 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/SslKafkaProducerFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/SslKafkaProducerFactory.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.kafka;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.plugin.kafka.security.ForKafkaSsl;
 import io.trino.plugin.kafka.security.KafkaSslConfig;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
 import java.util.Properties;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/AbstractRowEncoder.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/AbstractRowEncoder.java
index 6153a485e224..1f2421dc7cd6 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/AbstractRowEncoder.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/AbstractRowEncoder.java
@@ -14,8 +14,6 @@
 package io.trino.plugin.kafka.encoder;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.primitives.Shorts;
-import com.google.common.primitives.SignedBytes;
 import io.trino.spi.block.Block;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.ArrayType;
@@ -47,8 +45,6 @@
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TinyintType.TINYINT;
-import static java.lang.Float.intBitsToFloat;
-import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
@@ -81,34 +77,34 @@ public void appendColumnValue(Block block, int position)
             appendNullValue();
         }
         else if (type == BOOLEAN) {
-            appendBoolean(type.getBoolean(block, position));
+            appendBoolean(BOOLEAN.getBoolean(block, position));
         }
         else if (type == BIGINT) {
-            appendLong(type.getLong(block, position));
+            appendLong(BIGINT.getLong(block, position));
         }
         else if (type == INTEGER) {
-            appendInt(toIntExact(type.getLong(block, position)));
+            appendInt(INTEGER.getInt(block, position));
         }
         else if (type == SMALLINT) {
-            appendShort(Shorts.checkedCast(type.getLong(block, position)));
+            appendShort(SMALLINT.getShort(block, position));
         }
         else if (type == TINYINT) {
-            appendByte(SignedBytes.checkedCast(type.getLong(block, position)));
+            appendByte(TINYINT.getByte(block, position));
         }
         else if (type == DOUBLE) {
-            appendDouble(type.getDouble(block, position));
+            appendDouble(DOUBLE.getDouble(block, position));
         }
         else if (type == REAL) {
-            appendFloat(intBitsToFloat(toIntExact(type.getLong(block, position))));
+            appendFloat(REAL.getFloat(block, position));
         }
-        else if (type instanceof VarcharType) {
-            appendString(type.getSlice(block, position).toStringUtf8());
+        else if (type instanceof VarcharType varcharType) {
+            appendString(varcharType.getSlice(block, position).toStringUtf8());
         }
-        else if (type instanceof VarbinaryType) {
-            appendByteBuffer(type.getSlice(block, position).toByteBuffer());
+        else if (type instanceof VarbinaryType varbinaryType) {
+            appendByteBuffer(varbinaryType.getSlice(block, position).toByteBuffer());
         }
         else if (type == DATE) {
-            appendSqlDate((SqlDate) type.getObjectValue(session, block, position));
+            appendSqlDate((SqlDate) DATE.getObjectValue(session, block, position));
         }
         else if (type instanceof TimeType) {
             appendSqlTime((SqlTime) type.getObjectValue(session, block, position));
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/DispatchingRowEncoderFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/DispatchingRowEncoderFactory.java
index 6822596ede1d..b194b426bad1 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/DispatchingRowEncoderFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/DispatchingRowEncoderFactory.java
@@ -14,13 +14,10 @@
 package io.trino.plugin.kafka.encoder;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
-import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
@@ -35,9 +32,9 @@ public DispatchingRowEncoderFactory(Map<String, RowEncoderFactory> factories)
         this.factories = ImmutableMap.copyOf(requireNonNull(factories, "factories is null"));
     }
 
-    public RowEncoder create(ConnectorSession session, String dataFormat, Optional<String> dataSchema, List<EncoderColumnHandle> columnHandles)
+    public RowEncoder create(ConnectorSession session, RowEncoderSpec rowEncoderSpec)
     {
-        checkArgument(factories.containsKey(dataFormat), "unknown data format '%s'", dataFormat);
-        return factories.get(dataFormat).create(session, dataSchema, columnHandles);
+        checkArgument(factories.containsKey(rowEncoderSpec.dataFormat()), "unknown data format '%s'", rowEncoderSpec.dataFormat());
+        return factories.get(rowEncoderSpec.dataFormat()).create(session, rowEncoderSpec);
     }
 }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/KafkaFieldType.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/KafkaFieldType.java
new file mode 100644
index 000000000000..566008e8a369
--- /dev/null
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/KafkaFieldType.java
@@ -0,0 +1,20 @@
+/*
+ * Licensed 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 io.trino.plugin.kafka.encoder;
+
+public enum KafkaFieldType
+{
+    KEY,
+    MESSAGE,
+}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/RowEncoderFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/RowEncoderFactory.java
index 8b1245c0732e..855398715d58 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/RowEncoderFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/RowEncoderFactory.java
@@ -15,10 +15,7 @@
 
 import io.trino.spi.connector.ConnectorSession;
 
-import java.util.List;
-import java.util.Optional;
-
 public interface RowEncoderFactory
 {
-    RowEncoder create(ConnectorSession session, Optional<String> dataSchema, List<EncoderColumnHandle> columnHandles);
+    RowEncoder create(ConnectorSession session, RowEncoderSpec rowEncoderSpec);
 }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/RowEncoderSpec.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/RowEncoderSpec.java
new file mode 100644
index 000000000000..d0b1a3b26b8e
--- /dev/null
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/RowEncoderSpec.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed 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 io.trino.plugin.kafka.encoder;
+
+import java.util.List;
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public record RowEncoderSpec(String dataFormat, Optional<String> dataSchema, List<EncoderColumnHandle> columnHandles, String topic, KafkaFieldType kafkaFieldType)
+{
+    public RowEncoderSpec
+    {
+        requireNonNull(dataFormat, "dataFormat is null");
+        requireNonNull(dataSchema, "dataSchema is null");
+        requireNonNull(columnHandles, "columnHandles is null");
+        requireNonNull(topic, "topic is null");
+        requireNonNull(kafkaFieldType, "kafkaFieldType is null");
+    }
+}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/avro/AvroRowEncoderFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/avro/AvroRowEncoderFactory.java
index 9f6d809c1bbb..0b42ddc44d0f 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/avro/AvroRowEncoderFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/avro/AvroRowEncoderFactory.java
@@ -13,25 +13,22 @@
  */
 package io.trino.plugin.kafka.encoder.avro;
 
-import io.trino.plugin.kafka.encoder.EncoderColumnHandle;
 import io.trino.plugin.kafka.encoder.RowEncoder;
 import io.trino.plugin.kafka.encoder.RowEncoderFactory;
+import io.trino.plugin.kafka.encoder.RowEncoderSpec;
 import io.trino.spi.connector.ConnectorSession;
 import org.apache.avro.Schema;
 
-import java.util.List;
-import java.util.Optional;
-
 import static com.google.common.base.Preconditions.checkArgument;
 
 public class AvroRowEncoderFactory
         implements RowEncoderFactory
 {
     @Override
-    public RowEncoder create(ConnectorSession session, Optional<String> dataSchema, List<EncoderColumnHandle> columnHandles)
+    public RowEncoder create(ConnectorSession session, RowEncoderSpec rowEncoderSpec)
     {
-        checkArgument(dataSchema.isPresent(), "dataSchema for Avro format is not present");
-        Schema parsedSchema = new Schema.Parser().parse(dataSchema.get());
-        return new AvroRowEncoder(session, columnHandles, parsedSchema);
+        checkArgument(rowEncoderSpec.dataSchema().isPresent(), "dataSchema for Avro format is not present");
+        Schema parsedSchema = new Schema.Parser().parse(rowEncoderSpec.dataSchema().get());
+        return new AvroRowEncoder(session, rowEncoderSpec.columnHandles(), parsedSchema);
     }
 }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/csv/CsvRowEncoderFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/csv/CsvRowEncoderFactory.java
index aa4ee0cb28d0..66869b3a14c7 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/csv/CsvRowEncoderFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/csv/CsvRowEncoderFactory.java
@@ -13,20 +13,17 @@
  */
 package io.trino.plugin.kafka.encoder.csv;
 
-import io.trino.plugin.kafka.encoder.EncoderColumnHandle;
 import io.trino.plugin.kafka.encoder.RowEncoder;
 import io.trino.plugin.kafka.encoder.RowEncoderFactory;
+import io.trino.plugin.kafka.encoder.RowEncoderSpec;
 import io.trino.spi.connector.ConnectorSession;
 
-import java.util.List;
-import java.util.Optional;
-
 public class CsvRowEncoderFactory
         implements RowEncoderFactory
 {
     @Override
-    public RowEncoder create(ConnectorSession session, Optional<String> dataSchema, List<EncoderColumnHandle> columnHandles)
+    public RowEncoder create(ConnectorSession session, RowEncoderSpec rowEncoderSpec)
     {
-        return new CsvRowEncoder(session, columnHandles);
+        return new CsvRowEncoder(session, rowEncoderSpec.columnHandles());
     }
 }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/json/JsonRowEncoderFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/json/JsonRowEncoderFactory.java
index b59889530d2f..29f67627d93e 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/json/JsonRowEncoderFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/json/JsonRowEncoderFactory.java
@@ -14,16 +14,12 @@
 package io.trino.plugin.kafka.encoder.json;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.trino.plugin.kafka.encoder.EncoderColumnHandle;
+import com.google.inject.Inject;
 import io.trino.plugin.kafka.encoder.RowEncoder;
 import io.trino.plugin.kafka.encoder.RowEncoderFactory;
+import io.trino.plugin.kafka.encoder.RowEncoderSpec;
 import io.trino.spi.connector.ConnectorSession;
 
-import javax.inject.Inject;
-
-import java.util.List;
-import java.util.Optional;
-
 import static java.util.Objects.requireNonNull;
 
 public class JsonRowEncoderFactory
@@ -38,8 +34,8 @@ public JsonRowEncoderFactory(ObjectMapper objectMapper)
     }
 
     @Override
-    public RowEncoder create(ConnectorSession session, Optional<String> dataSchema, List<EncoderColumnHandle> columnHandles)
+    public RowEncoder create(ConnectorSession session, RowEncoderSpec rowEncoderSpec)
     {
-        return new JsonRowEncoder(session, columnHandles, objectMapper);
+        return new JsonRowEncoder(session, rowEncoderSpec.columnHandles(), objectMapper);
     }
 }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/json/format/CustomDateTimeFormatter.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/json/format/CustomDateTimeFormatter.java
index 8e76b8639f59..1da80a4ca8c1 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/json/format/CustomDateTimeFormatter.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/json/format/CustomDateTimeFormatter.java
@@ -84,7 +84,7 @@ public String formatTimeWithZone(SqlTimeWithTimeZone value)
     {
         int offsetMinutes = value.getOffsetMinutes();
         DateTimeZone dateTimeZone = DateTimeZone.forOffsetHoursMinutes(offsetMinutes / 60, offsetMinutes % 60);
-        long picos = value.getPicos() - (offsetMinutes * 60 * PICOSECONDS_PER_SECOND);
+        long picos = value.getPicos() - (offsetMinutes * 60L * PICOSECONDS_PER_SECOND);
         return formatter.withZone(dateTimeZone).print(new DateTime(scalePicosToMillis(picos), dateTimeZone));
     }
 
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/protobuf/ProtobufRowEncoderFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/protobuf/ProtobufRowEncoderFactory.java
index 894b510ecfe8..340e32b229c7 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/protobuf/ProtobufRowEncoderFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/protobuf/ProtobufRowEncoderFactory.java
@@ -15,15 +15,12 @@
 
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.DescriptorValidationException;
-import io.trino.plugin.kafka.encoder.EncoderColumnHandle;
 import io.trino.plugin.kafka.encoder.RowEncoder;
 import io.trino.plugin.kafka.encoder.RowEncoderFactory;
+import io.trino.plugin.kafka.encoder.RowEncoderSpec;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
 
-import java.util.List;
-import java.util.Optional;
-
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.decoder.protobuf.ProtobufErrorCode.INVALID_PROTO_FILE;
 import static io.trino.decoder.protobuf.ProtobufErrorCode.MESSAGE_NOT_FOUND;
@@ -35,14 +32,14 @@ public class ProtobufRowEncoderFactory
         implements RowEncoderFactory
 {
     @Override
-    public RowEncoder create(ConnectorSession session, Optional<String> dataSchema, List<EncoderColumnHandle> columnHandles)
+    public RowEncoder create(ConnectorSession session, RowEncoderSpec rowEncoderSpec)
     {
-        checkArgument(dataSchema.isPresent(), "dataSchema for Protobuf format is not present");
+        checkArgument(rowEncoderSpec.dataSchema().isPresent(), "dataSchema for Protobuf format is not present");
 
         try {
-            Descriptor descriptor = getFileDescriptor(dataSchema.get()).findMessageTypeByName(DEFAULT_MESSAGE);
+            Descriptor descriptor = getFileDescriptor(rowEncoderSpec.dataSchema().get()).findMessageTypeByName(DEFAULT_MESSAGE);
             if (descriptor != null) {
-                return new ProtobufRowEncoder(descriptor, session, columnHandles);
+                return new ProtobufRowEncoder(descriptor, session, rowEncoderSpec.columnHandles());
             }
         }
         catch (DescriptorValidationException descriptorValidationException) {
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/protobuf/ProtobufSchemaParser.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/protobuf/ProtobufSchemaParser.java
index 6360f82b1a94..e228515a57c1 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/protobuf/ProtobufSchemaParser.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/protobuf/ProtobufSchemaParser.java
@@ -15,6 +15,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Streams;
+import com.google.inject.Inject;
+import com.google.protobuf.Descriptors;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import io.confluent.kafka.schemaregistry.ParsedSchema;
@@ -22,6 +24,7 @@
 import io.trino.decoder.protobuf.ProtobufRowDecoder;
 import io.trino.plugin.kafka.KafkaTopicFieldDescription;
 import io.trino.plugin.kafka.KafkaTopicFieldGroup;
+import io.trino.plugin.kafka.schema.ProtobufAnySupportConfig;
 import io.trino.plugin.kafka.schema.confluent.SchemaParser;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
@@ -30,8 +33,7 @@
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
-
-import javax.inject.Inject;
+import io.trino.spi.type.TypeSignature;
 
 import java.util.List;
 import java.util.Optional;
@@ -46,6 +48,7 @@
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.StandardTypes.JSON;
 import static io.trino.spi.type.TimestampType.createTimestampType;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
@@ -55,13 +58,16 @@
 public class ProtobufSchemaParser
         implements SchemaParser
 {
+    private static final String ANY_TYPE_NAME = "google.protobuf.Any";
     private static final String TIMESTAMP_TYPE_NAME = "google.protobuf.Timestamp";
     private final TypeManager typeManager;
+    private final boolean isProtobufAnySupportEnabled;
 
     @Inject
-    public ProtobufSchemaParser(TypeManager typeManager)
+    public ProtobufSchemaParser(TypeManager typeManager, ProtobufAnySupportConfig config)
     {
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
+        this.isProtobufAnySupportEnabled = requireNonNull(config, "config is null").isProtobufAnySupportEnabled();
     }
 
     @Override
@@ -72,16 +78,47 @@ public KafkaTopicFieldGroup parse(ConnectorSession session, String subject, Pars
                 ProtobufRowDecoder.NAME,
                 Optional.empty(),
                 Optional.of(subject),
-                protobufSchema.toDescriptor().getFields().stream()
-                        .map(field -> new KafkaTopicFieldDescription(
-                                field.getName(),
-                                getType(field, ImmutableList.of()),
-                                field.getName(),
+                Streams.concat(getFields(protobufSchema.toDescriptor()),
+                                getOneofs(protobufSchema.toDescriptor()))
+                        .collect(toImmutableList()));
+    }
+
+    private Stream<KafkaTopicFieldDescription> getFields(Descriptor descriptor)
+    {
+        // Determine oneof fields from the descriptor
+        Set<String> oneofFieldNames = descriptor.getOneofs().stream()
+                .map(Descriptors.OneofDescriptor::getFields)
+                .flatMap(List::stream)
+                .map(FieldDescriptor::getName)
+                .collect(toImmutableSet());
+
+        // Remove all fields that are defined in the oneof definition
+        return descriptor.getFields().stream()
+                .filter(field -> !oneofFieldNames.contains(field.getName()))
+                .map(field -> new KafkaTopicFieldDescription(
+                        field.getName(),
+                        getType(field, ImmutableList.of()),
+                        field.getName(),
+                        null,
+                        null,
+                        null,
+                        false));
+    }
+
+    private Stream<KafkaTopicFieldDescription> getOneofs(Descriptor descriptor)
+    {
+        return descriptor
+                .getOneofs()
+                .stream()
+                .map(oneofDescriptor ->
+                        new KafkaTopicFieldDescription(
+                                oneofDescriptor.getName(),
+                                typeManager.getType(new TypeSignature(JSON)),
+                                oneofDescriptor.getName(),
                                 null,
                                 null,
                                 null,
-                                false))
-                        .collect(toImmutableList()));
+                                false));
     }
 
     private Type getType(FieldDescriptor fieldDescriptor, List<FieldAndType> processedMessages)
@@ -110,6 +147,9 @@ private Type getTypeForMessage(FieldDescriptor fieldDescriptor, List<FieldAndTyp
         if (descriptor.getFullName().equals(TIMESTAMP_TYPE_NAME)) {
             return createTimestampType(6);
         }
+        else if (isProtobufAnySupportEnabled && descriptor.getFullName().equals(ANY_TYPE_NAME)) {
+            return typeManager.getType(new TypeSignature(JSON));
+        }
 
         // We MUST check just the type names since same type can be present with different field names which is also recursive
         Set<String> processedMessagesFullTypeNames = processedMessages.stream()
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/raw/RawRowEncoderFactory.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/raw/RawRowEncoderFactory.java
index 07a5675eb928..3eaafa6f560c 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/raw/RawRowEncoderFactory.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/encoder/raw/RawRowEncoderFactory.java
@@ -13,20 +13,17 @@
  */
 package io.trino.plugin.kafka.encoder.raw;
 
-import io.trino.plugin.kafka.encoder.EncoderColumnHandle;
 import io.trino.plugin.kafka.encoder.RowEncoder;
 import io.trino.plugin.kafka.encoder.RowEncoderFactory;
+import io.trino.plugin.kafka.encoder.RowEncoderSpec;
 import io.trino.spi.connector.ConnectorSession;
 
-import java.util.List;
-import java.util.Optional;
-
 public class RawRowEncoderFactory
         implements RowEncoderFactory
 {
     @Override
-    public RowEncoder create(ConnectorSession session, Optional<String> dataSchema, List<EncoderColumnHandle> columnHandles)
+    public RowEncoder create(ConnectorSession session, RowEncoderSpec rowEncoderSpec)
     {
-        return new RawRowEncoder(session, columnHandles);
+        return new RawRowEncoder(session, rowEncoderSpec.columnHandles());
     }
 }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/AbstractContentSchemaProvider.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/AbstractContentSchemaProvider.java
new file mode 100644
index 000000000000..b7cb6b0697d2
--- /dev/null
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/AbstractContentSchemaProvider.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed 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 io.trino.plugin.kafka.schema;
+
+import io.trino.plugin.kafka.KafkaTableHandle;
+
+import java.util.Optional;
+
+public abstract class AbstractContentSchemaProvider
+        implements ContentSchemaProvider
+{
+    @Override
+    public final Optional<String> getKey(KafkaTableHandle tableHandle)
+    {
+        return readSchema(tableHandle.getKeyDataSchemaLocation(), tableHandle.getKeySubject());
+    }
+
+    @Override
+    public final Optional<String> getMessage(KafkaTableHandle tableHandle)
+    {
+        return readSchema(tableHandle.getMessageDataSchemaLocation(), tableHandle.getMessageSubject());
+    }
+
+    protected abstract Optional<String> readSchema(Optional<String> dataSchemaLocation, Optional<String> subject);
+}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/AbstractContentSchemaReader.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/AbstractContentSchemaReader.java
deleted file mode 100644
index 23cdbaedf8b2..000000000000
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/AbstractContentSchemaReader.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.kafka.schema;
-
-import io.trino.plugin.kafka.KafkaTableHandle;
-
-import java.util.Optional;
-
-public abstract class AbstractContentSchemaReader
-        implements ContentSchemaReader
-{
-    @Override
-    public final Optional<String> readKeyContentSchema(KafkaTableHandle tableHandle)
-    {
-        return readSchema(tableHandle.getKeyDataSchemaLocation(), tableHandle.getKeySubject());
-    }
-
-    @Override
-    public final Optional<String> readValueContentSchema(KafkaTableHandle tableHandle)
-    {
-        return readSchema(tableHandle.getMessageDataSchemaLocation(), tableHandle.getMessageSubject());
-    }
-
-    protected abstract Optional<String> readSchema(Optional<String> dataSchemaLocation, Optional<String> subject);
-}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/ContentSchemaProvider.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/ContentSchemaProvider.java
new file mode 100644
index 000000000000..b698c9d47f75
--- /dev/null
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/ContentSchemaProvider.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.kafka.schema;
+
+import io.trino.plugin.kafka.KafkaTableHandle;
+
+import java.util.Optional;
+
+public interface ContentSchemaProvider
+{
+    Optional<String> getKey(KafkaTableHandle tableHandle);
+
+    Optional<String> getMessage(KafkaTableHandle tableHandle);
+}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/ContentSchemaReader.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/ContentSchemaReader.java
deleted file mode 100644
index 20457c4ef21a..000000000000
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/ContentSchemaReader.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.kafka.schema;
-
-import io.trino.plugin.kafka.KafkaTableHandle;
-
-import java.util.Optional;
-
-public interface ContentSchemaReader
-{
-    Optional<String> readKeyContentSchema(KafkaTableHandle tableHandle);
-
-    Optional<String> readValueContentSchema(KafkaTableHandle tableHandle);
-}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/ProtobufAnySupportConfig.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/ProtobufAnySupportConfig.java
new file mode 100644
index 000000000000..659bf995c24b
--- /dev/null
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/ProtobufAnySupportConfig.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed 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 io.trino.plugin.kafka.schema;
+
+import io.airlift.configuration.Config;
+import io.airlift.configuration.ConfigDescription;
+
+public class ProtobufAnySupportConfig
+{
+    private boolean protobufAnySupportEnabled;
+
+    public boolean isProtobufAnySupportEnabled()
+    {
+        return protobufAnySupportEnabled;
+    }
+
+    @Config("kafka.protobuf-any-support-enabled")
+    @ConfigDescription("True to enable supporting encoding google.protobuf.Any types as JSON")
+    public ProtobufAnySupportConfig setProtobufAnySupportEnabled(boolean protobufAnySupportEnabled)
+    {
+        this.protobufAnySupportEnabled = protobufAnySupportEnabled;
+        return this;
+    }
+}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroConfluentContentSchemaProvider.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroConfluentContentSchemaProvider.java
new file mode 100644
index 000000000000..17bb1c6344af
--- /dev/null
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroConfluentContentSchemaProvider.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed 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 io.trino.plugin.kafka.schema.confluent;
+
+import com.google.inject.Inject;
+import io.confluent.kafka.schemaregistry.ParsedSchema;
+import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
+import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
+import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
+import io.trino.plugin.kafka.schema.AbstractContentSchemaProvider;
+import io.trino.spi.TrinoException;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkState;
+import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+public class AvroConfluentContentSchemaProvider
+        extends AbstractContentSchemaProvider
+{
+    private final SchemaRegistryClient schemaRegistryClient;
+
+    @Inject
+    public AvroConfluentContentSchemaProvider(SchemaRegistryClient schemaRegistryClient)
+    {
+        this.schemaRegistryClient = requireNonNull(schemaRegistryClient, "schemaRegistryClient is null");
+    }
+
+    @Override
+    protected Optional<String> readSchema(Optional<String> dataSchemaLocation, Optional<String> subject)
+    {
+        if (subject.isEmpty()) {
+            return Optional.empty();
+        }
+        checkState(dataSchemaLocation.isEmpty(), "Unexpected parameter: dataSchemaLocation");
+        try {
+            SchemaMetadata schemaMetadata = schemaRegistryClient.getLatestSchemaMetadata(subject.get());
+            ParsedSchema schema = schemaRegistryClient.getSchemaBySubjectAndId(subject.get(), schemaMetadata.getId());
+            return Optional.ofNullable(schema.rawSchema())
+                    .map(Object::toString);
+        }
+        catch (IOException | RestClientException e) {
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Could not resolve schema for the '%s' subject", subject.get()), e);
+        }
+    }
+}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroConfluentContentSchemaReader.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroConfluentContentSchemaReader.java
deleted file mode 100644
index 49ca9a8a5415..000000000000
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroConfluentContentSchemaReader.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.kafka.schema.confluent;
-
-import io.confluent.kafka.schemaregistry.ParsedSchema;
-import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
-import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
-import io.trino.plugin.kafka.schema.AbstractContentSchemaReader;
-import io.trino.spi.TrinoException;
-
-import javax.inject.Inject;
-
-import java.io.IOException;
-import java.util.Optional;
-
-import static com.google.common.base.Preconditions.checkState;
-import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
-
-public class AvroConfluentContentSchemaReader
-        extends AbstractContentSchemaReader
-{
-    private final SchemaRegistryClient schemaRegistryClient;
-
-    @Inject
-    public AvroConfluentContentSchemaReader(SchemaRegistryClient schemaRegistryClient)
-    {
-        this.schemaRegistryClient = requireNonNull(schemaRegistryClient, "schemaRegistryClient is null");
-    }
-
-    @Override
-    protected Optional<String> readSchema(Optional<String> dataSchemaLocation, Optional<String> subject)
-    {
-        if (subject.isEmpty()) {
-            return Optional.empty();
-        }
-        checkState(dataSchemaLocation.isEmpty(), "Unexpected parameter: dataSchemaLocation");
-        try {
-            SchemaMetadata schemaMetadata = schemaRegistryClient.getLatestSchemaMetadata(subject.get());
-            ParsedSchema schema = schemaRegistryClient.getSchemaBySubjectAndId(subject.get(), schemaMetadata.getId());
-            return Optional.ofNullable(schema.rawSchema())
-                    .map(Object::toString);
-        }
-        catch (IOException | RestClientException e) {
-            throw new TrinoException(GENERIC_INTERNAL_ERROR, format("Could not resolve schema for the '%s' subject", subject.get()), e);
-        }
-    }
-}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroSchemaConverter.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroSchemaConverter.java
index 9752939fea91..ad12abe67146 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroSchemaConverter.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroSchemaConverter.java
@@ -58,12 +58,14 @@
 
 public class AvroSchemaConverter
 {
-    public static final String DUMMY_FIELD_NAME = "dummy";
+    public static final String DUMMY_FIELD_NAME = "$empty_field_marker";
+
+    public static final RowType DUMMY_ROW_TYPE = RowType.from(ImmutableList.of(new RowType.Field(Optional.of(DUMMY_FIELD_NAME), BooleanType.BOOLEAN)));
 
     public enum EmptyFieldStrategy
     {
         IGNORE,
-        ADD_DUMMY,
+        MARK,
         FAIL,
     }
 
@@ -207,8 +209,8 @@ private Optional<Type> convertRecord(Schema schema)
             switch (emptyFieldStrategy) {
                 case IGNORE:
                     return Optional.empty();
-                case ADD_DUMMY:
-                    return Optional.of(RowType.from(ImmutableList.of(new RowType.Field(Optional.of(DUMMY_FIELD_NAME), BooleanType.BOOLEAN))));
+                case MARK:
+                    return Optional.of(DUMMY_ROW_TYPE);
                 case FAIL:
                     throw new IllegalStateException(format("Struct type has no valid fields for schema: '%s'", schema));
             }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroSchemaParser.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroSchemaParser.java
index 3560f4e90cf5..953274bad858 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroSchemaParser.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/AvroSchemaParser.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.kafka.schema.confluent;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.confluent.kafka.schemaregistry.ParsedSchema;
 import io.confluent.kafka.schemaregistry.avro.AvroSchema;
 import io.trino.decoder.avro.AvroRowDecoderFactory;
@@ -24,8 +25,6 @@
 import io.trino.spi.type.TypeManager;
 import org.apache.avro.Schema;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ClassLoaderSafeSchemaRegistryClient.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ClassLoaderSafeSchemaRegistryClient.java
index 66ebf7f015d1..b564a62a08c5 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ClassLoaderSafeSchemaRegistryClient.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ClassLoaderSafeSchemaRegistryClient.java
@@ -13,11 +13,16 @@
  */
 package io.trino.plugin.kafka.schema.confluent;
 
+import com.google.common.base.Ticker;
 import io.confluent.kafka.schemaregistry.ParsedSchema;
 import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
+import io.confluent.kafka.schemaregistry.client.rest.entities.Config;
+import io.confluent.kafka.schemaregistry.client.rest.entities.Metadata;
+import io.confluent.kafka.schemaregistry.client.rest.entities.RuleSet;
 import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaReference;
 import io.confluent.kafka.schemaregistry.client.rest.entities.SubjectVersion;
+import io.confluent.kafka.schemaregistry.client.rest.entities.requests.RegisterSchemaResponse;
 import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import org.apache.avro.Schema;
@@ -496,4 +501,91 @@ public void reset()
             delegate.reset();
         }
     }
+
+    @Override
+    public String tenant()
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.tenant();
+        }
+    }
+
+    @Override
+    public Ticker ticker()
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.ticker();
+        }
+    }
+
+    @Override
+    public Optional<ParsedSchema> parseSchema(String schemaType, String schemaString, List<SchemaReference> references, Metadata metadata, RuleSet ruleSet)
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.parseSchema(schemaType, schemaString, references, metadata, ruleSet);
+        }
+    }
+
+    @Override
+    public RegisterSchemaResponse registerWithResponse(String subject, ParsedSchema schema, boolean normalize)
+            throws RestClientException, IOException
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.registerWithResponse(subject, schema, normalize);
+        }
+    }
+
+    @Override
+    public SchemaMetadata getLatestWithMetadata(String subject, Map<String, String> metadata, boolean lookupDeletedSchema)
+            throws RestClientException, IOException
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.getLatestWithMetadata(subject, metadata, lookupDeletedSchema);
+        }
+    }
+
+    @Override
+    public List<String> testCompatibilityVerbose(String subject, ParsedSchema schema, boolean normalize)
+            throws RestClientException, IOException
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.testCompatibilityVerbose(subject, schema, normalize);
+        }
+    }
+
+    @Override
+    public Config updateConfig(String subject, Config config)
+            throws RestClientException, IOException
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.updateConfig(subject, config);
+        }
+    }
+
+    @Override
+    public Config getConfig(String subject)
+            throws IOException, RestClientException
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.getConfig(subject);
+        }
+    }
+
+    @Override
+    public void deleteConfig(String subject)
+            throws IOException, RestClientException
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            delegate.deleteConfig(subject);
+        }
+    }
+
+    @Override
+    public String setMode(String mode, String subject, boolean force)
+            throws IOException, RestClientException
+    {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
+            return delegate.setMode(mode, subject, force);
+        }
+    }
 }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentAvroReaderSupplier.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentAvroReaderSupplier.java
index d9b1a20a148a..03493ec4c0b0 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentAvroReaderSupplier.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentAvroReaderSupplier.java
@@ -15,22 +15,21 @@
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
+import com.google.inject.Inject;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
 import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.decoder.avro.AvroReaderSupplier;
 import io.trino.spi.TrinoException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.io.DatumReader;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
 import static com.google.common.base.Preconditions.checkState;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentDescriptorProvider.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentDescriptorProvider.java
new file mode 100644
index 000000000000..501ac73cd613
--- /dev/null
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentDescriptorProvider.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed 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 io.trino.plugin.kafka.schema.confluent;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.protobuf.Descriptors.Descriptor;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaProvider;
+import io.trino.decoder.protobuf.DescriptorProvider;
+import io.trino.spi.TrinoException;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
+import static java.util.Objects.requireNonNull;
+
+public class ConfluentDescriptorProvider
+        implements DescriptorProvider
+{
+    private final LoadingCache<String, Descriptor> protobufTypeUrlCache;
+
+    public ConfluentDescriptorProvider()
+    {
+        protobufTypeUrlCache = buildNonEvictableCache(
+                CacheBuilder.newBuilder().maximumSize(1000),
+                CacheLoader.from(this::loadDescriptorFromType));
+    }
+
+    @Override
+    public Optional<Descriptor> getDescriptorFromTypeUrl(String url)
+    {
+        try {
+            requireNonNull(url, "url is null");
+            return Optional.of(protobufTypeUrlCache.get(url));
+        }
+        catch (ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Descriptor loadDescriptorFromType(String url)
+    {
+        try {
+            return ((ProtobufSchema) new ProtobufSchemaProvider()
+                    .parseSchema(getContents(url), List.of(), true)
+                    .orElseThrow())
+                    .toDescriptor();
+        }
+        catch (NoSuchElementException e) {
+            throw new TrinoException(GENERIC_USER_ERROR, "Failed to parse protobuf schema");
+        }
+    }
+}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentModule.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentModule.java
index 953790590501..e66d0752d1df 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentModule.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentModule.java
@@ -17,9 +17,11 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import com.google.inject.multibindings.MapBinder;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.confluent.kafka.schemaregistry.ParsedSchema;
@@ -38,6 +40,8 @@
 import io.trino.decoder.avro.AvroRowDecoderFactory;
 import io.trino.decoder.dummy.DummyRowDecoder;
 import io.trino.decoder.dummy.DummyRowDecoderFactory;
+import io.trino.decoder.protobuf.DescriptorProvider;
+import io.trino.decoder.protobuf.DummyDescriptorProvider;
 import io.trino.decoder.protobuf.DynamicMessageProvider;
 import io.trino.decoder.protobuf.ProtobufRowDecoder;
 import io.trino.decoder.protobuf.ProtobufRowDecoderFactory;
@@ -47,12 +51,12 @@
 import io.trino.plugin.kafka.encoder.avro.AvroRowEncoder;
 import io.trino.plugin.kafka.encoder.protobuf.ProtobufRowEncoder;
 import io.trino.plugin.kafka.encoder.protobuf.ProtobufSchemaParser;
-import io.trino.plugin.kafka.schema.ContentSchemaReader;
+import io.trino.plugin.kafka.schema.ContentSchemaProvider;
+import io.trino.plugin.kafka.schema.ProtobufAnySupportConfig;
 import io.trino.plugin.kafka.schema.TableDescriptionSupplier;
 import io.trino.spi.HostAddress;
 import io.trino.spi.TrinoException;
-
-import javax.inject.Singleton;
+import io.trino.spi.type.TypeManager;
 
 import java.util.List;
 import java.util.Map;
@@ -67,6 +71,7 @@
 import static com.google.inject.Scopes.SINGLETON;
 import static com.google.inject.multibindings.MapBinder.newMapBinder;
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
+import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static io.trino.plugin.kafka.encoder.EncoderModule.encoderFactory;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
@@ -75,13 +80,22 @@
 public class ConfluentModule
         extends AbstractConfigurationAwareModule
 {
+    private final TypeManager typeManager;
+
+    public ConfluentModule(TypeManager typeManager)
+    {
+        this.typeManager = requireNonNull(typeManager, "typeManager is null");
+    }
+
     @Override
     protected void setup(Binder binder)
     {
+        binder.bind(TypeManager.class).toInstance(typeManager);
+
         configBinder(binder).bindConfig(ConfluentSchemaRegistryConfig.class);
         install(new ConfluentDecoderModule());
         install(new ConfluentEncoderModule());
-        binder.bind(ContentSchemaReader.class).to(AvroConfluentContentSchemaReader.class).in(Scopes.SINGLETON);
+        binder.bind(ContentSchemaProvider.class).to(AvroConfluentContentSchemaProvider.class).in(Scopes.SINGLETON);
         newSetBinder(binder, SchemaRegistryClientPropertiesProvider.class);
         newSetBinder(binder, SchemaProvider.class).addBinding().to(AvroSchemaProvider.class).in(Scopes.SINGLETON);
         // Each SchemaRegistry object should have a new instance of SchemaProvider
@@ -90,7 +104,7 @@ protected void setup(Binder binder)
         newSetBinder(binder, SessionPropertiesProvider.class).addBinding().to(ConfluentSessionProperties.class).in(Scopes.SINGLETON);
         binder.bind(TableDescriptionSupplier.class).toProvider(ConfluentSchemaRegistryTableDescriptionSupplier.Factory.class).in(Scopes.SINGLETON);
         newMapBinder(binder, String.class, SchemaParser.class).addBinding("AVRO").to(AvroSchemaParser.class).in(Scopes.SINGLETON);
-        newMapBinder(binder, String.class, SchemaParser.class).addBinding("PROTOBUF").to(ProtobufSchemaParser.class).in(Scopes.SINGLETON);
+        newMapBinder(binder, String.class, SchemaParser.class).addBinding("PROTOBUF").to(LazyLoadedProtobufSchemaParser.class).in(Scopes.SINGLETON);
     }
 
     @Provides
@@ -122,7 +136,7 @@ public static SchemaRegistryClient createSchemaRegistryClient(
                 classLoader);
     }
 
-    private static class ConfluentDecoderModule
+    private class ConfluentDecoderModule
             implements Module
     {
         @Override
@@ -134,6 +148,12 @@ public void configure(Binder binder)
             newMapBinder(binder, String.class, RowDecoderFactory.class).addBinding(ProtobufRowDecoder.NAME).to(ProtobufRowDecoderFactory.class).in(Scopes.SINGLETON);
             newMapBinder(binder, String.class, RowDecoderFactory.class).addBinding(DummyRowDecoder.NAME).to(DummyRowDecoderFactory.class).in(SINGLETON);
             binder.bind(DispatchingRowDecoderFactory.class).in(SINGLETON);
+
+            configBinder(binder).bindConfig(ProtobufAnySupportConfig.class);
+            install(conditionalModule(ProtobufAnySupportConfig.class,
+                    ProtobufAnySupportConfig::isProtobufAnySupportEnabled,
+                    new ConfluentDesciptorProviderModule(),
+                    new DummyDescriptorProviderModule()));
         }
     }
 
@@ -144,10 +164,10 @@ private static class ConfluentEncoderModule
         public void configure(Binder binder)
         {
             MapBinder<String, RowEncoderFactory> encoderFactoriesByName = encoderFactory(binder);
-            encoderFactoriesByName.addBinding(AvroRowEncoder.NAME).toInstance((session, dataSchema, columnHandles) -> {
+            encoderFactoriesByName.addBinding(AvroRowEncoder.NAME).toInstance((session, rowEncoderSpec) -> {
                 throw new TrinoException(NOT_SUPPORTED, "Insert not supported");
             });
-            encoderFactoriesByName.addBinding(ProtobufRowEncoder.NAME).toInstance((session, dataSchema, columnHandles) -> {
+            encoderFactoriesByName.addBinding(ProtobufRowEncoder.NAME).toInstance((session, rowEncoderSpec) -> {
                 throw new TrinoException(NOT_SUPPORTED, "Insert is not supported for schema registry based tables");
             });
             binder.bind(DispatchingRowEncoderFactory.class).in(SINGLETON);
@@ -158,7 +178,7 @@ private static class LazyLoadedProtobufSchemaProvider
             implements SchemaProvider
     {
         // Make JVM to load lazily ProtobufSchemaProvider, so Kafka connector can be used
-        // with protobuf dependency for non protobuf based topics
+        // without protobuf dependency for non protobuf based topics
         private final Supplier<SchemaProvider> delegate = Suppliers.memoize(this::create);
         private final AtomicReference<Map<String, ?>> configuration = new AtomicReference<>();
 
@@ -168,6 +188,18 @@ public String schemaType()
             return "PROTOBUF";
         }
 
+        @Override
+        public Optional<ParsedSchema> parseSchema(Schema schema, boolean isNew)
+        {
+            return SchemaProvider.super.parseSchema(schema, isNew);
+        }
+
+        @Override
+        public Optional<ParsedSchema> parseSchema(Schema schema, boolean isNew, boolean normalize)
+        {
+            return SchemaProvider.super.parseSchema(schema, isNew, normalize);
+        }
+
         @Override
         public void configure(Map<String, ?> configuration)
         {
@@ -182,9 +214,21 @@ public Optional<ParsedSchema> parseSchema(String schema, List<SchemaReference> r
         }
 
         @Override
-        public ParsedSchema parseSchemaOrElseThrow(Schema schema, boolean isNew)
+        public Optional<ParsedSchema> parseSchema(String schemaString, List<SchemaReference> references, boolean isNew, boolean normalize)
+        {
+            return SchemaProvider.super.parseSchema(schemaString, references, isNew, normalize);
+        }
+
+        @Override
+        public Optional<ParsedSchema> parseSchema(String schemaString, List<SchemaReference> references)
         {
-            return delegate.get().parseSchemaOrElseThrow(schema, isNew);
+            return SchemaProvider.super.parseSchema(schemaString, references);
+        }
+
+        @Override
+        public ParsedSchema parseSchemaOrElseThrow(Schema schema, boolean isNew, boolean normalize)
+        {
+            return delegate.get().parseSchemaOrElseThrow(schema, isNew, normalize);
         }
 
         private SchemaProvider create()
@@ -196,4 +240,44 @@ private SchemaProvider create()
             return schemaProvider;
         }
     }
+
+    public static class LazyLoadedProtobufSchemaParser
+            extends ForwardingSchemaParser
+    {
+        // Make JVM to load lazily ProtobufSchemaParser, so Kafka connector can be used
+        // without protobuf dependency for non protobuf based topics
+        private final Supplier<SchemaParser> delegate;
+
+        @Inject
+        public LazyLoadedProtobufSchemaParser(TypeManager typeManager, ProtobufAnySupportConfig config)
+        {
+            this.delegate = Suppliers.memoize(() -> new ProtobufSchemaParser(requireNonNull(typeManager, "typeManager is null"), config));
+        }
+
+        @Override
+        protected SchemaParser delegate()
+        {
+            return delegate.get();
+        }
+    }
+
+    private static class ConfluentDesciptorProviderModule
+            implements Module
+    {
+        @Override
+        public void configure(Binder binder)
+        {
+            binder.bind(DescriptorProvider.class).to(ConfluentDescriptorProvider.class).in(SINGLETON);
+        }
+    }
+
+    private static class DummyDescriptorProviderModule
+            implements Module
+    {
+        @Override
+        public void configure(Binder binder)
+        {
+            binder.bind(DescriptorProvider.class).to(DummyDescriptorProvider.class).in(SINGLETON);
+        }
+    }
 }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSchemaRegistryConfig.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSchemaRegistryConfig.java
index dbaa26ab3a19..a484d7fd8c50 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSchemaRegistryConfig.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSchemaRegistryConfig.java
@@ -22,10 +22,9 @@
 import io.airlift.units.MinDuration;
 import io.trino.plugin.kafka.schema.confluent.AvroSchemaConverter.EmptyFieldStrategy;
 import io.trino.spi.HostAddress;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
 
 import java.util.Set;
 
@@ -76,7 +75,7 @@ public EmptyFieldStrategy getEmptyFieldStrategy()
     }
 
     @Config("kafka.empty-field-strategy")
-    @ConfigDescription("How to handle struct types with no fields: ignore, add a boolean field named 'dummy' or fail the query")
+    @ConfigDescription("How to handle struct types with no fields: ignore, add a marker field named '$empty_field_marker' or fail the query")
     public ConfluentSchemaRegistryConfig setEmptyFieldStrategy(EmptyFieldStrategy emptyFieldStrategy)
     {
         this.emptyFieldStrategy = emptyFieldStrategy;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSchemaRegistryDynamicMessageProvider.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSchemaRegistryDynamicMessageProvider.java
index 116417de80a1..a2d2f4f3b684 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSchemaRegistryDynamicMessageProvider.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSchemaRegistryDynamicMessageProvider.java
@@ -15,6 +15,7 @@
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
+import com.google.inject.Inject;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.DynamicMessage;
 import io.confluent.kafka.schemaregistry.ParsedSchema;
@@ -22,19 +23,17 @@
 import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
 import io.confluent.kafka.schemaregistry.protobuf.MessageIndexes;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.decoder.protobuf.DynamicMessageProvider;
 import io.trino.spi.TrinoException;
 
-import javax.inject.Inject;
-
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.airlift.slice.Slices.wrappedBuffer;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.decoder.protobuf.ProtobufErrorCode.INVALID_PROTOBUF_MESSAGE;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static java.lang.String.format;
@@ -63,10 +62,11 @@ public DynamicMessage parseDynamicMessage(byte[] data)
         checkArgument(magicByte == MAGIC_BYTE, "Invalid MagicByte");
         int schemaId = buffer.getInt();
         MessageIndexes.readFrom(buffer);
+        ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(buffer.array(), buffer.arrayOffset() + buffer.position(), buffer.remaining());
         try {
             return DynamicMessage.parseFrom(
                     descriptorCache.getUnchecked(schemaId),
-                    wrappedBuffer(buffer).getInput());
+                    byteArrayInputStream);
         }
         catch (IOException e) {
             throw new TrinoException(INVALID_PROTOBUF_MESSAGE, "Decoding Protobuf record failed.", e);
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSchemaRegistryTableDescriptionSupplier.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSchemaRegistryTableDescriptionSupplier.java
index 39cdb0c8a599..b18236eb0655 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSchemaRegistryTableDescriptionSupplier.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSchemaRegistryTableDescriptionSupplier.java
@@ -17,6 +17,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.SetMultimap;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.airlift.units.Duration;
 import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
@@ -29,9 +31,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.SchemaTableName;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSessionProperties.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSessionProperties.java
index 1c2d015ec262..0f20920887dd 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSessionProperties.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ConfluentSessionProperties.java
@@ -14,13 +14,12 @@
 package io.trino.plugin.kafka.schema.confluent;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.plugin.kafka.schema.confluent.AvroSchemaConverter.EmptyFieldStrategy;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.spi.session.PropertyMetadata.enumProperty;
@@ -38,7 +37,7 @@ public ConfluentSessionProperties(ConfluentSchemaRegistryConfig config)
         sessionProperties = ImmutableList.<PropertyMetadata<?>>builder()
                 .add(enumProperty(
                         EMPTY_FIELD_STRATEGY,
-                        "Strategy for handling struct types with no fields: IGNORE (default), FAIL, and ADD_DUMMY to add a boolean field named 'dummy'",
+                        "Strategy for handling struct types with no fields: IGNORE (default), FAIL, and MARK to add a boolean field named '$empty_field_marker'",
                         EmptyFieldStrategy.class,
                         config.getEmptyFieldStrategy(),
                         false))
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ForwardingSchemaParser.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ForwardingSchemaParser.java
new file mode 100644
index 000000000000..e297cf496891
--- /dev/null
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/confluent/ForwardingSchemaParser.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed 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 io.trino.plugin.kafka.schema.confluent;
+
+import io.confluent.kafka.schemaregistry.ParsedSchema;
+import io.trino.plugin.kafka.KafkaTopicFieldGroup;
+import io.trino.spi.connector.ConnectorSession;
+
+public abstract class ForwardingSchemaParser
+        implements SchemaParser
+{
+    protected abstract SchemaParser delegate();
+
+    @Override
+    public KafkaTopicFieldGroup parse(ConnectorSession session, String subject, ParsedSchema parsedSchema)
+    {
+        return delegate().parse(session, subject, parsedSchema);
+    }
+}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileContentSchemaReader.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileContentSchemaReader.java
deleted file mode 100644
index b879cac552c1..000000000000
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileContentSchemaReader.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.kafka.schema.file;
-
-import com.google.common.io.CharStreams;
-import io.trino.plugin.kafka.schema.AbstractContentSchemaReader;
-import io.trino.spi.TrinoException;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Optional;
-
-import static com.google.common.base.Preconditions.checkState;
-import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Locale.ENGLISH;
-
-public class FileContentSchemaReader
-        extends AbstractContentSchemaReader
-{
-    @Override
-    protected Optional<String> readSchema(Optional<String> dataSchemaLocation, Optional<String> subject)
-    {
-        if (dataSchemaLocation.isEmpty()) {
-            return Optional.empty();
-        }
-        checkState(subject.isEmpty(), "Unexpected parameter: subject");
-        try (InputStream inputStream = openSchemaLocation(dataSchemaLocation.get())) {
-            return Optional.of(CharStreams.toString(new InputStreamReader(inputStream, UTF_8)));
-        }
-        catch (IOException e) {
-            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Could not parse the Avro schema at: " + dataSchemaLocation, e);
-        }
-    }
-
-    private static InputStream openSchemaLocation(String dataSchemaLocation)
-            throws IOException
-    {
-        if (isURI(dataSchemaLocation.trim().toLowerCase(ENGLISH))) {
-            try {
-                return new URL(dataSchemaLocation).openStream();
-            }
-            catch (MalformedURLException ignore) {
-                // TODO probably should not be ignored
-            }
-        }
-
-        return new FileInputStream(dataSchemaLocation);
-    }
-
-    private static boolean isURI(String location)
-    {
-        try {
-            //noinspection ResultOfMethodCallIgnored
-            URI.create(location);
-        }
-        catch (Exception e) {
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileReadContentSchemaProvider.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileReadContentSchemaProvider.java
new file mode 100644
index 000000000000..16ca7ee0359b
--- /dev/null
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileReadContentSchemaProvider.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed 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 io.trino.plugin.kafka.schema.file;
+
+import com.google.common.io.CharStreams;
+import io.trino.plugin.kafka.schema.AbstractContentSchemaProvider;
+import io.trino.spi.TrinoException;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkState;
+import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Locale.ENGLISH;
+
+public class FileReadContentSchemaProvider
+        extends AbstractContentSchemaProvider
+{
+    @Override
+    protected Optional<String> readSchema(Optional<String> dataSchemaLocation, Optional<String> subject)
+    {
+        if (dataSchemaLocation.isEmpty()) {
+            return Optional.empty();
+        }
+        checkState(subject.isEmpty(), "Unexpected parameter: subject");
+        try (InputStream inputStream = openSchemaLocation(dataSchemaLocation.get())) {
+            return Optional.of(CharStreams.toString(new InputStreamReader(inputStream, UTF_8)));
+        }
+        catch (IOException e) {
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Could not parse the Avro schema at: " + dataSchemaLocation, e);
+        }
+    }
+
+    private static InputStream openSchemaLocation(String dataSchemaLocation)
+            throws IOException
+    {
+        if (isURI(dataSchemaLocation.trim().toLowerCase(ENGLISH))) {
+            try {
+                return new URL(dataSchemaLocation).openStream();
+            }
+            catch (MalformedURLException ignore) {
+                // TODO probably should not be ignored
+            }
+        }
+
+        return new FileInputStream(dataSchemaLocation);
+    }
+
+    private static boolean isURI(String location)
+    {
+        try {
+            //noinspection ResultOfMethodCallIgnored
+            URI.create(location);
+        }
+        catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileTableDescriptionSupplier.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileTableDescriptionSupplier.java
index 21810adbe46e..93909c5b061e 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileTableDescriptionSupplier.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileTableDescriptionSupplier.java
@@ -17,6 +17,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
 import io.trino.decoder.dummy.DummyRowDecoder;
@@ -27,9 +29,6 @@
 import io.trino.plugin.kafka.schema.TableDescriptionSupplier;
 import io.trino.spi.connector.SchemaTableName;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileTableDescriptionSupplierConfig.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileTableDescriptionSupplierConfig.java
index df6b37e107ab..4f1b68bd23ce 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileTableDescriptionSupplierConfig.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileTableDescriptionSupplierConfig.java
@@ -17,8 +17,7 @@
 import com.google.common.collect.ImmutableSet;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.Set;
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileTableDescriptionSupplierModule.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileTableDescriptionSupplierModule.java
index cd34f9843856..8cb087bcc10c 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileTableDescriptionSupplierModule.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/schema/file/FileTableDescriptionSupplierModule.java
@@ -14,13 +14,19 @@
 package io.trino.plugin.kafka.schema.file;
 
 import com.google.inject.Binder;
+import com.google.inject.Module;
 import com.google.inject.Scopes;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.decoder.DecoderModule;
+import io.trino.decoder.protobuf.DescriptorProvider;
+import io.trino.decoder.protobuf.FileDescriptorProvider;
 import io.trino.plugin.kafka.encoder.EncoderModule;
-import io.trino.plugin.kafka.schema.ContentSchemaReader;
+import io.trino.plugin.kafka.schema.ContentSchemaProvider;
+import io.trino.plugin.kafka.schema.ProtobufAnySupportConfig;
 import io.trino.plugin.kafka.schema.TableDescriptionSupplier;
 
+import static com.google.inject.Scopes.SINGLETON;
+import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.airlift.configuration.ConfigBinder.configBinder;
 
 public class FileTableDescriptionSupplierModule
@@ -33,6 +39,21 @@ protected void setup(Binder binder)
         binder.bind(TableDescriptionSupplier.class).toProvider(FileTableDescriptionSupplier.class).in(Scopes.SINGLETON);
         install(new DecoderModule());
         install(new EncoderModule());
-        binder.bind(ContentSchemaReader.class).to(FileContentSchemaReader.class).in(Scopes.SINGLETON);
+        binder.bind(ContentSchemaProvider.class).to(FileReadContentSchemaProvider.class).in(Scopes.SINGLETON);
+
+        configBinder(binder).bindConfig(ProtobufAnySupportConfig.class);
+        install(conditionalModule(ProtobufAnySupportConfig.class,
+                ProtobufAnySupportConfig::isProtobufAnySupportEnabled,
+                new FileDescriptorProviderModule()));
+    }
+
+    private static class FileDescriptorProviderModule
+            implements Module
+    {
+        @Override
+        public void configure(Binder binder)
+        {
+            binder.bind(DescriptorProvider.class).to(FileDescriptorProvider.class).in(SINGLETON);
+        }
     }
 }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/security/ForKafkaSsl.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/security/ForKafkaSsl.java
index 4f4b95414e8b..381a54335f53 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/security/ForKafkaSsl.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/security/ForKafkaSsl.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.kafka.security;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForKafkaSsl
 {
 }
diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/security/KafkaSslConfig.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/security/KafkaSslConfig.java
index 2124806c71b3..1fbe11c052ab 100644
--- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/security/KafkaSslConfig.java
+++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/security/KafkaSslConfig.java
@@ -21,8 +21,7 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/KafkaQueryRunner.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/KafkaQueryRunner.java
index ad5667ca0031..eabb93d5cfc1 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/KafkaQueryRunner.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/KafkaQueryRunner.java
@@ -22,10 +22,10 @@
 import io.airlift.log.Logging;
 import io.trino.decoder.DecoderModule;
 import io.trino.plugin.kafka.encoder.EncoderModule;
-import io.trino.plugin.kafka.schema.ContentSchemaReader;
+import io.trino.plugin.kafka.schema.ContentSchemaProvider;
 import io.trino.plugin.kafka.schema.MapBasedTableDescriptionSupplier;
 import io.trino.plugin.kafka.schema.TableDescriptionSupplier;
-import io.trino.plugin.kafka.schema.file.FileContentSchemaReader;
+import io.trino.plugin.kafka.schema.file.FileReadContentSchemaProvider;
 import io.trino.plugin.kafka.util.CodecSupplier;
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.spi.connector.SchemaTableName;
@@ -71,7 +71,12 @@ public static class Builder
 
         protected Builder(TestingKafka testingKafka)
         {
-            super(testingKafka, TPCH_SCHEMA);
+            super(testingKafka, "kafka", TPCH_SCHEMA);
+        }
+
+        protected Builder(TestingKafka testingKafka, String catalogName)
+        {
+            super(testingKafka, catalogName, TPCH_SCHEMA);
         }
 
         public Builder setTables(Iterable<TpchTable<?>> tables)
@@ -127,7 +132,7 @@ public void preInit(DistributedQueryRunner queryRunner)
                             kafkaConfig -> kafkaConfig.getTableDescriptionSupplier().equalsIgnoreCase(TEST),
                             binder -> binder.bind(TableDescriptionSupplier.class)
                                     .toInstance(new MapBasedTableDescriptionSupplier(topicDescriptions))),
-                    binder -> binder.bind(ContentSchemaReader.class).to(FileContentSchemaReader.class).in(Scopes.SINGLETON),
+                    binder -> binder.bind(ContentSchemaProvider.class).to(FileReadContentSchemaProvider.class).in(Scopes.SINGLETON),
                     new DecoderModule(),
                     new EncoderModule()));
             Map<String, String> properties = new HashMap<>(extraKafkaProperties);
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/KafkaQueryRunnerBuilder.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/KafkaQueryRunnerBuilder.java
index 2230b026ee28..ead9d8bfe4c5 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/KafkaQueryRunnerBuilder.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/KafkaQueryRunnerBuilder.java
@@ -34,14 +34,21 @@ public abstract class KafkaQueryRunnerBuilder
     protected final TestingKafka testingKafka;
     protected Map<String, String> extraKafkaProperties = ImmutableMap.of();
     protected Module extension = DEFAULT_EXTENSION;
+    private final String catalogName;
 
-    public KafkaQueryRunnerBuilder(TestingKafka testingKafka, String defaultSessionSchema)
+    public KafkaQueryRunnerBuilder(TestingKafka testingKafka, String defaultSessionName)
+    {
+        this(testingKafka, "kafka", defaultSessionName);
+    }
+
+    public KafkaQueryRunnerBuilder(TestingKafka testingKafka, String catalogName, String defaultSessionSchema)
     {
         super(testSessionBuilder()
-                .setCatalog("kafka")
+                .setCatalog(catalogName)
                 .setSchema(defaultSessionSchema)
                 .build());
         this.testingKafka = requireNonNull(testingKafka, "testingKafka is null");
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
     }
 
     public KafkaQueryRunnerBuilder setExtraKafkaProperties(Map<String, String> extraKafkaProperties)
@@ -72,7 +79,7 @@ public final DistributedQueryRunner build()
             Map<String, String> kafkaProperties = new HashMap<>(ImmutableMap.copyOf(extraKafkaProperties));
             kafkaProperties.putIfAbsent("kafka.nodes", testingKafka.getConnectString());
             kafkaProperties.putIfAbsent("kafka.messages-per-split", "1000");
-            queryRunner.createCatalog("kafka", "kafka", kafkaProperties);
+            queryRunner.createCatalog(catalogName, "kafka", kafkaProperties);
             postInit(queryRunner);
             return queryRunner;
         }
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/TestKafkaConnectorTest.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/TestKafkaConnectorTest.java
index 9f65d53aefc5..f687fcde1ccd 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/TestKafkaConnectorTest.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/TestKafkaConnectorTest.java
@@ -163,33 +163,27 @@ protected QueryRunner createQueryRunner()
         return queryRunner;
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE:
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN:
-            case SUPPORTS_RENAME_COLUMN:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_DEREFERENCE_PUSHDOWN,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_RENAME_COLUMN,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Test
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/TestKafkaLatestConnectorSmokeTest.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/TestKafkaLatestConnectorSmokeTest.java
index f07cb8634c4c..627869f487cd 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/TestKafkaLatestConnectorSmokeTest.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/TestKafkaLatestConnectorSmokeTest.java
@@ -17,7 +17,8 @@
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
 import io.trino.testing.kafka.TestingKafka;
-import org.testng.SkipException;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -34,29 +35,29 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE:
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
+    @Test
     public void testInsert()
     {
         assertThatThrownBy(super::testInsert)
                 .hasMessage("Cannot test INSERT without CREATE TABLE, the test needs to be implemented in a connector-specific way");
         // TODO implement the test for Kafka
-        throw new SkipException("TODO");
+        Assumptions.abort();
     }
 }
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/encoder/json/TestJsonEncoder.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/encoder/json/TestJsonEncoder.java
index 3ab85f54a25c..21f6d790ff90 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/encoder/json/TestJsonEncoder.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/encoder/json/TestJsonEncoder.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import io.trino.plugin.kafka.KafkaColumnHandle;
+import io.trino.plugin.kafka.encoder.RowEncoderSpec;
 import io.trino.plugin.kafka.encoder.json.format.DateTimeFormat;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
@@ -25,6 +26,7 @@
 
 import java.util.Optional;
 
+import static io.trino.plugin.kafka.encoder.KafkaFieldType.MESSAGE;
 import static io.trino.plugin.kafka.encoder.json.format.DateTimeFormat.CUSTOM_DATE_TIME;
 import static io.trino.plugin.kafka.encoder.json.format.DateTimeFormat.ISO8601;
 import static io.trino.plugin.kafka.encoder.json.format.DateTimeFormat.MILLISECONDS_SINCE_EPOCH;
@@ -53,6 +55,7 @@ public class TestJsonEncoder
 {
     private static final ConnectorSession SESSION = TestingConnectorSession.builder().build();
     private static final JsonRowEncoderFactory ENCODER_FACTORY = new JsonRowEncoderFactory(new ObjectMapper());
+    private static final String TOPIC = "topic";
 
     private static void assertUnsupportedColumnTypeException(ThrowableAssert.ThrowingCallable callable)
     {
@@ -81,17 +84,17 @@ private static void assertSupportedDataType(EmptyFunctionalInterface functionalI
 
     private static void singleColumnEncoder(Type type)
     {
-        ENCODER_FACTORY.create(SESSION, Optional.empty(), ImmutableList.of(new KafkaColumnHandle("default", type, "default", null, null, false, false, false)));
+        ENCODER_FACTORY.create(SESSION, new RowEncoderSpec(JsonRowEncoder.NAME, Optional.empty(), ImmutableList.of(new KafkaColumnHandle("default", type, "default", null, null, false, false, false)), TOPIC, MESSAGE));
     }
 
     private static void singleColumnEncoder(Type type, DateTimeFormat dataFormat, String formatHint)
     {
         requireNonNull(dataFormat, "dataFormat is null");
         if (dataFormat.equals(CUSTOM_DATE_TIME)) {
-            ENCODER_FACTORY.create(SESSION, Optional.empty(), ImmutableList.of(new KafkaColumnHandle("default", type, "default", dataFormat.toString(), formatHint, false, false, false)));
+            ENCODER_FACTORY.create(SESSION, new RowEncoderSpec(JsonRowEncoder.NAME, Optional.empty(), ImmutableList.of(new KafkaColumnHandle("default", type, "default", dataFormat.toString(), formatHint, false, false, false)), TOPIC, MESSAGE));
         }
         else {
-            ENCODER_FACTORY.create(SESSION, Optional.empty(), ImmutableList.of(new KafkaColumnHandle("default", type, "default", dataFormat.toString(), null, false, false, false)));
+            ENCODER_FACTORY.create(SESSION, new RowEncoderSpec(JsonRowEncoder.NAME, Optional.empty(), ImmutableList.of(new KafkaColumnHandle("default", type, "default", dataFormat.toString(), null, false, false, false)), TOPIC, MESSAGE));
         }
     }
 
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/encoder/raw/TestRawEncoderMapping.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/encoder/raw/TestRawEncoderMapping.java
index c8a4c8f11136..c5f5a532ce5d 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/encoder/raw/TestRawEncoderMapping.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/encoder/raw/TestRawEncoderMapping.java
@@ -18,6 +18,7 @@
 import io.trino.plugin.kafka.KafkaColumnHandle;
 import io.trino.plugin.kafka.encoder.EncoderColumnHandle;
 import io.trino.plugin.kafka.encoder.RowEncoder;
+import io.trino.plugin.kafka.encoder.RowEncoderSpec;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.LongArrayBlockBuilder;
 import io.trino.spi.block.VariableWidthBlockBuilder;
@@ -28,6 +29,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 
+import static io.trino.plugin.kafka.encoder.KafkaFieldType.MESSAGE;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.spi.type.VarcharType.createVarcharType;
@@ -36,6 +38,7 @@
 public class TestRawEncoderMapping
 {
     private static final RawRowEncoderFactory ENCODER_FACTORY = new RawRowEncoderFactory();
+    private static final String TOPIC = "topic";
 
     @Test
     public void testMapping()
@@ -48,7 +51,7 @@ public void testMapping()
         EncoderColumnHandle col6 = new KafkaColumnHandle("test6", createVarcharType(6), "36:42", "BYTE", null, false, false, false);
         EncoderColumnHandle col7 = new KafkaColumnHandle("test7", createVarcharType(6), "42:48", "BYTE", null, false, false, false);
 
-        RowEncoder rowEncoder = ENCODER_FACTORY.create(TestingConnectorSession.SESSION, Optional.empty(), ImmutableList.of(col1, col2, col3, col4, col5, col6, col7));
+        RowEncoder rowEncoder = ENCODER_FACTORY.create(TestingConnectorSession.SESSION, new RowEncoderSpec(RawRowEncoder.NAME, Optional.empty(), ImmutableList.of(col1, col2, col3, col4, col5, col6, col7), TOPIC, MESSAGE));
 
         ByteBuffer buf = ByteBuffer.allocate(48);
         buf.putLong(123456789); // 0-8
@@ -59,10 +62,13 @@ public void testMapping()
         buf.put("abcdef".getBytes(StandardCharsets.UTF_8)); // 36-42
         buf.put("abcdef".getBytes(StandardCharsets.UTF_8)); // 42-48
 
-        Block longArrayBlock = new LongArrayBlockBuilder(null, 1).writeLong(123456789).closeEntry().build();
+        LongArrayBlockBuilder longArrayBlockBuilder = new LongArrayBlockBuilder(null, 1);
+        BIGINT.writeLong(longArrayBlockBuilder, 123456789);
+        Block longArrayBlock = longArrayBlockBuilder.build();
+
         Block varArrayBlock = new VariableWidthBlockBuilder(null, 1, 6)
-                .writeBytes(Slices.wrappedBuffer("abcdef".getBytes(StandardCharsets.UTF_8)), 0, 6)
-                .closeEntry().build();
+                .writeEntry(Slices.wrappedBuffer("abcdef".getBytes(StandardCharsets.UTF_8)), 0, 6)
+                .build();
 
         rowEncoder.appendColumnValue(longArrayBlock, 0);
         rowEncoder.appendColumnValue(varArrayBlock, 0);
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/protobuf/TestKafkaProtobufWithSchemaRegistryMinimalFunctionality.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/protobuf/TestKafkaProtobufWithSchemaRegistryMinimalFunctionality.java
index c23b34942aa9..6b9f6d8d1024 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/protobuf/TestKafkaProtobufWithSchemaRegistryMinimalFunctionality.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/protobuf/TestKafkaProtobufWithSchemaRegistryMinimalFunctionality.java
@@ -15,12 +15,16 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Resources;
+import com.google.protobuf.Any;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.Timestamp;
 import dev.failsafe.Failsafe;
 import dev.failsafe.RetryPolicy;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaProvider;
 import io.confluent.kafka.serializers.protobuf.KafkaProtobufSerializer;
 import io.confluent.kafka.serializers.subject.RecordNameStrategy;
 import io.confluent.kafka.serializers.subject.TopicRecordNameStrategy;
@@ -32,11 +36,14 @@
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.net.URI;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
+import static com.google.common.io.Resources.getResource;
 import static com.google.protobuf.Descriptors.FieldDescriptor.JavaType.ENUM;
 import static com.google.protobuf.Descriptors.FieldDescriptor.JavaType.STRING;
 import static io.confluent.kafka.serializers.AbstractKafkaAvroSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG;
@@ -217,20 +224,102 @@ public void testSchemaWithImportDataTypes()
 
         assertThat(query(format("SELECT list, map, row FROM %s", toDoubleQuoted(topic))))
                 .matches("""
-                            VALUES (
-                                ARRAY[CAST('Search' AS VARCHAR)],
-                                MAP(CAST(ARRAY['Key1'] AS ARRAY(VARCHAR)), CAST(ARRAY['Value1'] AS ARRAY(VARCHAR))),
-                                CAST(ROW('Trino', 1, 493857959588286460, 3.14159265358979323846, 3.14, True, 'ONE', TIMESTAMP '2020-12-12 15:35:45.923', to_utf8('Trino'))
-                                    AS ROW(
-                                        string_column VARCHAR,
-                                        integer_column INTEGER,
-                                        long_column BIGINT,
-                                        double_column DOUBLE,
-                                        float_column REAL,
-                                        boolean_column BOOLEAN,
-                                        number_column VARCHAR,
-                                        timestamp_column TIMESTAMP(6),
-                                        bytes_column VARBINARY)))""");
+                        VALUES (
+                            ARRAY[CAST('Search' AS VARCHAR)],
+                            MAP(CAST(ARRAY['Key1'] AS ARRAY(VARCHAR)), CAST(ARRAY['Value1'] AS ARRAY(VARCHAR))),
+                            CAST(ROW('Trino', 1, 493857959588286460, 3.14159265358979323846, 3.14, True, 'ONE', TIMESTAMP '2020-12-12 15:35:45.923', to_utf8('Trino'))
+                                AS ROW(
+                                    string_column VARCHAR,
+                                    integer_column INTEGER,
+                                    long_column BIGINT,
+                                    double_column DOUBLE,
+                                    float_column REAL,
+                                    boolean_column BOOLEAN,
+                                    number_column VARCHAR,
+                                    timestamp_column TIMESTAMP(6),
+                                    bytes_column VARBINARY)))""");
+    }
+
+    @Test
+    public void testOneof()
+            throws Exception
+    {
+        String topic = "topic-schema-with-oneof";
+        assertNotExists(topic);
+
+        String stringData = "stringColumnValue1";
+
+        ProtobufSchema schema = (ProtobufSchema) new ProtobufSchemaProvider().parseSchema(Resources.toString(getResource("protobuf/test_oneof.proto"), UTF_8), List.of(), true).get();
+
+        Descriptor descriptor = schema.toDescriptor();
+        DynamicMessage message = DynamicMessage.newBuilder(descriptor)
+                .setField(descriptor.findFieldByName("stringColumn"), stringData)
+                .build();
+
+        ImmutableList.Builder<ProducerRecord<DynamicMessage, DynamicMessage>> producerRecordBuilder = ImmutableList.builder();
+        producerRecordBuilder.add(new ProducerRecord<>(topic, createKeySchema(0, getKeySchema()), message));
+        List<ProducerRecord<DynamicMessage, DynamicMessage>> messages = producerRecordBuilder.build();
+        testingKafka.sendMessages(messages.stream(), producerProperties());
+        waitUntilTableExists(topic);
+
+        assertThat(query(format("SELECT testOneOfColumn FROM %s", toDoubleQuoted(topic))))
+                .matches("""
+                        VALUES (JSON '{"stringColumn":"%s"}')
+                        """.formatted(stringData));
+    }
+
+    @Test
+    public void testAny()
+            throws Exception
+    {
+        String topic = "topic-schema-with-any";
+        assertNotExists(topic);
+
+        Descriptor structuralDataTypesDescriptor = getDescriptor("structural_datatypes.proto");
+
+        Timestamp timestamp = getTimestamp(sqlTimestampOf(3, LocalDateTime.parse("2020-12-12T15:35:45.923")));
+        DynamicMessage structuralDataTypeMessage = buildDynamicMessage(
+                structuralDataTypesDescriptor,
+                ImmutableMap.<String, Object>builder()
+                        .put("list", ImmutableList.of("Search"))
+                        .put("map", ImmutableList.of(buildDynamicMessage(
+                                structuralDataTypesDescriptor.findFieldByName("map").getMessageType(),
+                                ImmutableMap.of("key", "Key1", "value", "Value1"))))
+                        .put("row", ImmutableMap.<String, Object>builder()
+                                .put("string_column", "Trino")
+                                .put("integer_column", 1)
+                                .put("long_column", 493857959588286460L)
+                                .put("double_column", 3.14159265358979323846)
+                                .put("float_column", 3.14f)
+                                .put("boolean_column", true)
+                                .put("number_column", structuralDataTypesDescriptor.findEnumTypeByName("Number").findValueByName("ONE"))
+                                .put("timestamp_column", timestamp)
+                                .put("bytes_column", "Trino".getBytes(UTF_8))
+                                .buildOrThrow())
+                        .buildOrThrow());
+
+        ProtobufSchema schema = (ProtobufSchema) new ProtobufSchemaProvider().parseSchema(Resources.toString(getResource("protobuf/test_any.proto"), UTF_8), List.of(), true).get();
+
+        // Get URI of parent directory of the descriptor file
+        // Any.pack concatenates the message type's full name to the given prefix
+        URI anySchemaTypeUrl = new File(Resources.getResource("protobuf/any/structural_datatypes/schema").getFile()).getParentFile().toURI();
+        Descriptor descriptor = schema.toDescriptor();
+        DynamicMessage message = DynamicMessage.newBuilder(descriptor)
+                .setField(descriptor.findFieldByName("id"), 1)
+                .setField(descriptor.findFieldByName("anyMessage"), Any.pack(structuralDataTypeMessage, anySchemaTypeUrl.toString()))
+                .build();
+
+        ImmutableList.Builder<ProducerRecord<DynamicMessage, DynamicMessage>> producerRecordBuilder = ImmutableList.builder();
+        producerRecordBuilder.add(new ProducerRecord<>(topic, createKeySchema(0, getKeySchema()), message));
+        List<ProducerRecord<DynamicMessage, DynamicMessage>> messages = producerRecordBuilder.build();
+        testingKafka.sendMessages(messages.stream(), producerProperties());
+        waitUntilTableExists(topic);
+
+        URI anySchemaFile = new File(Resources.getResource("protobuf/any/structural_datatypes/schema").getFile()).toURI();
+        assertThat(query(format("SELECT id, anyMessage FROM %s", toDoubleQuoted(topic))))
+                .matches("""
+                        VALUES (1, JSON '{"@type":"%s","list":["Search"],"map":{"Key1":"Value1"},"row":{"booleanColumn":true,"bytesColumn":"VHJpbm8=","doubleColumn":3.141592653589793,"floatColumn":3.14,"integerColumn":1,"longColumn":"493857959588286460","numberColumn":"ONE","stringColumn":"Trino","timestampColumn":"2020-12-12T15:35:45.923Z"}}')
+                        """.formatted(anySchemaFile));
     }
 
     private DynamicMessage buildDynamicMessage(Descriptor descriptor, Map<String, Object> data)
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/protobuf/TestProtobufEncoder.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/protobuf/TestProtobufEncoder.java
index 4ff338361d66..715ae7213ff5 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/protobuf/TestProtobufEncoder.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/protobuf/TestProtobufEncoder.java
@@ -22,9 +22,14 @@
 import io.trino.plugin.kafka.KafkaColumnHandle;
 import io.trino.plugin.kafka.encoder.EncoderColumnHandle;
 import io.trino.plugin.kafka.encoder.RowEncoder;
+import io.trino.plugin.kafka.encoder.RowEncoderSpec;
+import io.trino.plugin.kafka.encoder.protobuf.ProtobufRowEncoder;
 import io.trino.plugin.kafka.encoder.protobuf.ProtobufRowEncoderFactory;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.RowType;
@@ -41,6 +46,7 @@
 import static io.trino.decoder.protobuf.ProtobufRowDecoderFactory.DEFAULT_MESSAGE;
 import static io.trino.decoder.protobuf.ProtobufUtils.getFileDescriptor;
 import static io.trino.decoder.protobuf.ProtobufUtils.getProtoFile;
+import static io.trino.plugin.kafka.encoder.KafkaFieldType.MESSAGE;
 import static io.trino.spi.block.ArrayBlock.fromElementBlock;
 import static io.trino.spi.block.RowBlock.fromFieldBlocks;
 import static io.trino.spi.predicate.Utils.nativeValueToBlock;
@@ -157,35 +163,32 @@ public void testStructuralDataTypes(String stringData, Integer integerData, Long
 
         RowEncoder rowEncoder = createRowEncoder("structural_datatypes.proto", columnHandles.subList(0, 3));
 
-        BlockBuilder arrayBlockBuilder = columnHandles.get(0).getType()
+        ArrayBlockBuilder arrayBlockBuilder = (ArrayBlockBuilder) columnHandles.get(0).getType()
                 .createBlockBuilder(null, 1);
-        BlockBuilder singleArrayBlockWriter = arrayBlockBuilder.beginBlockEntry();
-        writeNativeValue(createVarcharType(5), singleArrayBlockWriter, utf8Slice(stringData));
-        arrayBlockBuilder.closeEntry();
+        arrayBlockBuilder.buildEntry(elementBuilder -> writeNativeValue(createVarcharType(5), elementBuilder, utf8Slice(stringData)));
         rowEncoder.appendColumnValue(arrayBlockBuilder.build(), 0);
 
-        BlockBuilder mapBlockBuilder = columnHandles.get(1).getType()
+        MapBlockBuilder mapBlockBuilder = (MapBlockBuilder) columnHandles.get(1).getType()
                 .createBlockBuilder(null, 1);
-        BlockBuilder singleMapBlockWriter = mapBlockBuilder.beginBlockEntry();
-        writeNativeValue(VARCHAR, singleMapBlockWriter, utf8Slice("Key"));
-        writeNativeValue(VARCHAR, singleMapBlockWriter, utf8Slice("Value"));
-        mapBlockBuilder.closeEntry();
+        mapBlockBuilder.buildEntry((keyBuilder, valueBuilder) -> {
+            writeNativeValue(VARCHAR, keyBuilder, utf8Slice("Key"));
+            writeNativeValue(VARCHAR, valueBuilder, utf8Slice("Value"));
+        });
         rowEncoder.appendColumnValue(mapBlockBuilder.build(), 0);
 
-        BlockBuilder rowBlockBuilder = columnHandles.get(2).getType()
+        RowBlockBuilder rowBlockBuilder = (RowBlockBuilder) columnHandles.get(2).getType()
                 .createBlockBuilder(null, 1);
-        BlockBuilder singleRowBlockWriter = rowBlockBuilder.beginBlockEntry();
-        writeNativeValue(VARCHAR, singleRowBlockWriter, Slices.utf8Slice(stringData));
-        writeNativeValue(INTEGER, singleRowBlockWriter, integerData.longValue());
-        writeNativeValue(BIGINT, singleRowBlockWriter, longData);
-        writeNativeValue(DOUBLE, singleRowBlockWriter, doubleData);
-        writeNativeValue(REAL, singleRowBlockWriter, (long) floatToIntBits(floatData));
-        writeNativeValue(BOOLEAN, singleRowBlockWriter, booleanData);
-        writeNativeValue(VARCHAR, singleRowBlockWriter, enumData);
-        writeNativeValue(createTimestampType(6), singleRowBlockWriter, sqlTimestamp.getEpochMicros());
-        writeNativeValue(VARBINARY, singleRowBlockWriter, bytesData);
-
-        rowBlockBuilder.closeEntry();
+        rowBlockBuilder.buildEntry(fieldBuilders -> {
+            writeNativeValue(VARCHAR, fieldBuilders.get(0), utf8Slice(stringData));
+            writeNativeValue(INTEGER, fieldBuilders.get(1), integerData.longValue());
+            writeNativeValue(BIGINT, fieldBuilders.get(2), longData);
+            writeNativeValue(DOUBLE, fieldBuilders.get(3), doubleData);
+            writeNativeValue(REAL, fieldBuilders.get(4), (long) floatToIntBits(floatData));
+            writeNativeValue(BOOLEAN, fieldBuilders.get(5), booleanData);
+            writeNativeValue(VARCHAR, fieldBuilders.get(6), enumData);
+            writeNativeValue(createTimestampType(6), fieldBuilders.get(7), sqlTimestamp.getEpochMicros());
+            writeNativeValue(VARBINARY, fieldBuilders.get(8), bytesData);
+        });
         rowEncoder.appendColumnValue(rowBlockBuilder.build(), 0);
 
         assertEquals(messageBuilder.build().toByteArray(), rowEncoder.toByteArray());
@@ -246,19 +249,18 @@ public void testNestedStructuralDataTypes(String stringData, Integer integerData
 
         RowEncoder rowEncoder = createRowEncoder("structural_datatypes.proto", columnHandles);
 
-        BlockBuilder rowBlockBuilder = rowType
-                .createBlockBuilder(null, 1);
-        BlockBuilder singleRowBlockWriter = rowBlockBuilder.beginBlockEntry();
-        writeNativeValue(VARCHAR, singleRowBlockWriter, Slices.utf8Slice(stringData));
-        writeNativeValue(INTEGER, singleRowBlockWriter, integerData.longValue());
-        writeNativeValue(BIGINT, singleRowBlockWriter, longData);
-        writeNativeValue(DOUBLE, singleRowBlockWriter, doubleData);
-        writeNativeValue(REAL, singleRowBlockWriter, (long) floatToIntBits(floatData));
-        writeNativeValue(BOOLEAN, singleRowBlockWriter, booleanData);
-        writeNativeValue(VARCHAR, singleRowBlockWriter, enumData);
-        writeNativeValue(createTimestampType(6), singleRowBlockWriter, sqlTimestamp.getEpochMicros());
-        writeNativeValue(VARBINARY, singleRowBlockWriter, bytesData);
-        rowBlockBuilder.closeEntry();
+        RowBlockBuilder rowBlockBuilder = rowType.createBlockBuilder(null, 1);
+        rowBlockBuilder.buildEntry(fieldBuilders -> {
+            writeNativeValue(VARCHAR, fieldBuilders.get(0), Slices.utf8Slice(stringData));
+            writeNativeValue(INTEGER, fieldBuilders.get(1), integerData.longValue());
+            writeNativeValue(BIGINT, fieldBuilders.get(2), longData);
+            writeNativeValue(DOUBLE, fieldBuilders.get(3), doubleData);
+            writeNativeValue(REAL, fieldBuilders.get(4), (long) floatToIntBits(floatData));
+            writeNativeValue(BOOLEAN, fieldBuilders.get(5), booleanData);
+            writeNativeValue(VARCHAR, fieldBuilders.get(6), enumData);
+            writeNativeValue(createTimestampType(6), fieldBuilders.get(7), sqlTimestamp.getEpochMicros());
+            writeNativeValue(VARBINARY, fieldBuilders.get(8), bytesData);
+        });
 
         RowType nestedRowType = (RowType) columnHandles.get(0).getType();
 
@@ -284,13 +286,10 @@ public void testNestedStructuralDataTypes(String stringData, Integer integerData
         listType.appendTo(arrayBlock, 0, listBlockBuilder);
 
         BlockBuilder nestedBlockBuilder = nestedRowType.createBlockBuilder(null, 1);
-        Block rowBlock = fromFieldBlocks(
-                1,
-                Optional.empty(),
-                new Block[]{listBlockBuilder.build(), mapBlockBuilder.build(), rowBlockBuilder.build()});
+        Block rowBlock = fromFieldBlocks(1, new Block[]{listBlockBuilder.build(), mapBlockBuilder.build(), rowBlockBuilder.build()});
         nestedRowType.appendTo(rowBlock, 0, nestedBlockBuilder);
 
-        rowEncoder.appendColumnValue(nestedBlockBuilder, 0);
+        rowEncoder.appendColumnValue(nestedBlockBuilder.build(), 0);
 
         assertEquals(messageBuilder.build().toByteArray(), rowEncoder.toByteArray());
     }
@@ -352,7 +351,7 @@ private Timestamp getTimestamp(SqlTimestamp sqlTimestamp)
     private RowEncoder createRowEncoder(String fileName, List<EncoderColumnHandle> columns)
             throws Exception
     {
-        return ENCODER_FACTORY.create(TestingConnectorSession.SESSION, Optional.of(getProtoFile("decoder/protobuf/" + fileName)), columns);
+        return ENCODER_FACTORY.create(TestingConnectorSession.SESSION, new RowEncoderSpec(ProtobufRowEncoder.NAME, Optional.of(getProtoFile("decoder/protobuf/" + fileName)), columns, "ignored", MESSAGE));
     }
 
     private Descriptor getDescriptor(String fileName)
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/KafkaWithConfluentSchemaRegistryQueryRunner.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/KafkaWithConfluentSchemaRegistryQueryRunner.java
index 5225bde3a538..629510a3254e 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/KafkaWithConfluentSchemaRegistryQueryRunner.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/KafkaWithConfluentSchemaRegistryQueryRunner.java
@@ -47,6 +47,7 @@ public void preInit(DistributedQueryRunner queryRunner)
             Map<String, String> properties = new HashMap<>(extraKafkaProperties);
             properties.putIfAbsent("kafka.table-description-supplier", "confluent");
             properties.putIfAbsent("kafka.confluent-schema-registry-url", testingKafka.getSchemaRegistryConnectString());
+            properties.putIfAbsent("kafka.protobuf-any-support-enabled", "true");
             setExtraKafkaProperties(properties);
         }
     }
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroConfluentContentSchemaProvider.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroConfluentContentSchemaProvider.java
new file mode 100644
index 000000000000..086c8ef46dac
--- /dev/null
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroConfluentContentSchemaProvider.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed 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 io.trino.plugin.kafka.schema.confluent;
+
+import com.google.common.collect.ImmutableList;
+import io.confluent.kafka.schemaregistry.ParsedSchema;
+import io.confluent.kafka.schemaregistry.avro.AvroSchema;
+import io.confluent.kafka.schemaregistry.client.MockSchemaRegistryClient;
+import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaReference;
+import io.trino.decoder.avro.AvroRowDecoderFactory;
+import io.trino.plugin.kafka.KafkaTableHandle;
+import io.trino.spi.TrinoException;
+import io.trino.spi.predicate.TupleDomain;
+import org.apache.avro.Schema;
+import org.apache.avro.Schema.Parser;
+import org.apache.avro.SchemaBuilder;
+import org.testng.annotations.Test;
+
+import java.util.Optional;
+
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testng.Assert.assertEquals;
+
+public class TestAvroConfluentContentSchemaProvider
+{
+    private static final String TOPIC = "test";
+    private static final String SUBJECT_NAME = format("%s-value", TOPIC);
+
+    @Test
+    public void testAvroConfluentSchemaProvider()
+            throws Exception
+    {
+        MockSchemaRegistryClient mockSchemaRegistryClient = new MockSchemaRegistryClient();
+        Schema schema = getAvroSchema();
+        mockSchemaRegistryClient.register(SUBJECT_NAME, schema);
+        AvroConfluentContentSchemaProvider avroConfluentSchemaProvider = new AvroConfluentContentSchemaProvider(mockSchemaRegistryClient);
+        KafkaTableHandle tableHandle = new KafkaTableHandle("default", TOPIC, TOPIC, AvroRowDecoderFactory.NAME, AvroRowDecoderFactory.NAME, Optional.empty(), Optional.empty(), Optional.empty(), Optional.of(SUBJECT_NAME), ImmutableList.of(), TupleDomain.all());
+        assertEquals(avroConfluentSchemaProvider.getMessage(tableHandle), Optional.of(schema).map(Schema::toString));
+        assertEquals(avroConfluentSchemaProvider.getKey(tableHandle), Optional.empty());
+        KafkaTableHandle invalidTableHandle = new KafkaTableHandle("default", TOPIC, TOPIC, AvroRowDecoderFactory.NAME, AvroRowDecoderFactory.NAME, Optional.empty(), Optional.empty(), Optional.empty(), Optional.of("another-schema"), ImmutableList.of(), TupleDomain.all());
+        assertThatThrownBy(() -> avroConfluentSchemaProvider.getMessage(invalidTableHandle))
+                .isInstanceOf(TrinoException.class)
+                .hasMessage("Could not resolve schema for the 'another-schema' subject");
+    }
+
+    @Test
+    public void testAvroSchemaWithReferences()
+            throws Exception
+    {
+        MockSchemaRegistryClient mockSchemaRegistryClient = new MockSchemaRegistryClient();
+        int schemaId = mockSchemaRegistryClient.register("base_schema-value", new AvroSchema(getAvroSchema()));
+        ParsedSchema schemaWithReference = mockSchemaRegistryClient.parseSchema(null, getAvroSchemaWithReference(), ImmutableList.of(new SchemaReference(TOPIC, "base_schema-value", schemaId)))
+                .orElseThrow();
+        mockSchemaRegistryClient.register(SUBJECT_NAME, schemaWithReference);
+
+        AvroConfluentContentSchemaProvider avroConfluentSchemaProvider = new AvroConfluentContentSchemaProvider(mockSchemaRegistryClient);
+        assertThat(avroConfluentSchemaProvider.readSchema(Optional.empty(), Optional.of(SUBJECT_NAME)).map(schema -> new Parser().parse(schema))).isPresent();
+    }
+
+    private static String getAvroSchemaWithReference()
+    {
+        return "{\n" +
+                "    \"type\":\"record\",\n" +
+                "    \"name\":\"Schema2\",\n" +
+                "    \"fields\":[\n" +
+                "        {\"name\":\"referred\",\"type\": \"test\"},\n" +
+                "        {\"name\":\"col3\",\"type\": \"string\"}\n" +
+                "    ]\n" +
+                "}";
+    }
+
+    private static Schema getAvroSchema()
+    {
+        return SchemaBuilder.record(TOPIC)
+                .fields()
+                .name("col1").type().intType().noDefault()
+                .name("col2").type().stringType().noDefault()
+                .endRecord();
+    }
+}
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroConfluentContentSchemaReader.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroConfluentContentSchemaReader.java
deleted file mode 100644
index f4c8bea73964..000000000000
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroConfluentContentSchemaReader.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.kafka.schema.confluent;
-
-import com.google.common.collect.ImmutableList;
-import io.confluent.kafka.schemaregistry.ParsedSchema;
-import io.confluent.kafka.schemaregistry.avro.AvroSchema;
-import io.confluent.kafka.schemaregistry.client.MockSchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaReference;
-import io.trino.decoder.avro.AvroRowDecoderFactory;
-import io.trino.plugin.kafka.KafkaTableHandle;
-import io.trino.spi.TrinoException;
-import io.trino.spi.predicate.TupleDomain;
-import org.apache.avro.Schema;
-import org.apache.avro.Schema.Parser;
-import org.apache.avro.SchemaBuilder;
-import org.testng.annotations.Test;
-
-import java.util.Optional;
-
-import static java.lang.String.format;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-
-public class TestAvroConfluentContentSchemaReader
-{
-    private static final String TOPIC = "test";
-    private static final String SUBJECT_NAME = format("%s-value", TOPIC);
-
-    @Test
-    public void testAvroConfluentSchemaReader()
-            throws Exception
-    {
-        MockSchemaRegistryClient mockSchemaRegistryClient = new MockSchemaRegistryClient();
-        Schema schema = getAvroSchema();
-        mockSchemaRegistryClient.register(SUBJECT_NAME, schema);
-        AvroConfluentContentSchemaReader avroConfluentSchemaReader = new AvroConfluentContentSchemaReader(mockSchemaRegistryClient);
-        KafkaTableHandle tableHandle = new KafkaTableHandle("default", TOPIC, TOPIC, AvroRowDecoderFactory.NAME, AvroRowDecoderFactory.NAME, Optional.empty(), Optional.empty(), Optional.empty(), Optional.of(SUBJECT_NAME), ImmutableList.of(), TupleDomain.all());
-        assertEquals(avroConfluentSchemaReader.readValueContentSchema(tableHandle), Optional.of(schema).map(Schema::toString));
-        assertEquals(avroConfluentSchemaReader.readKeyContentSchema(tableHandle), Optional.empty());
-        KafkaTableHandle invalidTableHandle = new KafkaTableHandle("default", TOPIC, TOPIC, AvroRowDecoderFactory.NAME, AvroRowDecoderFactory.NAME, Optional.empty(), Optional.empty(), Optional.empty(), Optional.of("another-schema"), ImmutableList.of(), TupleDomain.all());
-        assertThatThrownBy(() -> avroConfluentSchemaReader.readValueContentSchema(invalidTableHandle))
-                .isInstanceOf(TrinoException.class)
-                .hasMessage("Could not resolve schema for the 'another-schema' subject");
-    }
-
-    @Test
-    public void testAvroSchemaWithReferences()
-            throws Exception
-    {
-        MockSchemaRegistryClient mockSchemaRegistryClient = new MockSchemaRegistryClient();
-        int schemaId = mockSchemaRegistryClient.register("base_schema-value", new AvroSchema(getAvroSchema()));
-        ParsedSchema schemaWithReference = mockSchemaRegistryClient.parseSchema(null, getAvroSchemaWithReference(), ImmutableList.of(new SchemaReference(TOPIC, "base_schema-value", schemaId)))
-                .orElseThrow();
-        mockSchemaRegistryClient.register(SUBJECT_NAME, schemaWithReference);
-
-        AvroConfluentContentSchemaReader avroConfluentSchemaReader = new AvroConfluentContentSchemaReader(mockSchemaRegistryClient);
-        assertThat(avroConfluentSchemaReader.readSchema(Optional.empty(), Optional.of(SUBJECT_NAME)).map(schema -> new Parser().parse(schema))).isPresent();
-    }
-
-    private static String getAvroSchemaWithReference()
-    {
-        return "{\n" +
-                "    \"type\":\"record\",\n" +
-                "    \"name\":\"Schema2\",\n" +
-                "    \"fields\":[\n" +
-                "        {\"name\":\"referred\",\"type\": \"test\"},\n" +
-                "        {\"name\":\"col3\",\"type\": \"string\"}\n" +
-                "    ]\n" +
-                "}";
-    }
-
-    private static Schema getAvroSchema()
-    {
-        return SchemaBuilder.record(TOPIC)
-                .fields()
-                .name("col1").type().intType().noDefault()
-                .name("col2").type().stringType().noDefault()
-                .endRecord();
-    }
-}
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroConfluentRowDecoder.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroConfluentRowDecoder.java
index d19ebd467268..998569999cb3 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroConfluentRowDecoder.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroConfluentRowDecoder.java
@@ -20,6 +20,7 @@
 import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.FieldValueProvider;
 import io.trino.decoder.RowDecoder;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.decoder.avro.AvroBytesDeserializer;
 import io.trino.decoder.avro.AvroRowDecoderFactory;
 import io.trino.plugin.kafka.KafkaColumnHandle;
@@ -46,6 +47,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.decoder.avro.AvroRowDecoderFactory.DATA_SCHEMA;
+import static io.trino.decoder.util.DecoderTestUtil.TESTING_SESSION;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
@@ -154,7 +156,7 @@ private static byte[] serializeRecord(Object record, Schema schema, int schemaId
     private static RowDecoder getRowDecoder(SchemaRegistryClient schemaRegistryClient, Set<DecoderColumnHandle> columnHandles, Schema schema)
     {
         ImmutableMap<String, String> decoderParams = ImmutableMap.of(DATA_SCHEMA, schema.toString());
-        return getAvroRowDecoderyFactory(schemaRegistryClient).create(decoderParams, columnHandles);
+        return getAvroRowDecoderyFactory(schemaRegistryClient).create(TESTING_SESSION, new RowDecoderSpec(AvroRowDecoderFactory.NAME, decoderParams, columnHandles));
     }
 
     public static AvroRowDecoderFactory getAvroRowDecoderyFactory(SchemaRegistryClient schemaRegistryClient)
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroSchemaConverter.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroSchemaConverter.java
index c4c804671cef..28373e3f2580 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroSchemaConverter.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestAvroSchemaConverter.java
@@ -32,9 +32,9 @@
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.plugin.kafka.schema.confluent.AvroSchemaConverter.DUMMY_FIELD_NAME;
-import static io.trino.plugin.kafka.schema.confluent.AvroSchemaConverter.EmptyFieldStrategy.ADD_DUMMY;
 import static io.trino.plugin.kafka.schema.confluent.AvroSchemaConverter.EmptyFieldStrategy.FAIL;
 import static io.trino.plugin.kafka.schema.confluent.AvroSchemaConverter.EmptyFieldStrategy.IGNORE;
+import static io.trino.plugin.kafka.schema.confluent.AvroSchemaConverter.EmptyFieldStrategy.MARK;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DoubleType.DOUBLE;
@@ -293,7 +293,7 @@ public void testEmptyFieldStrategy()
                 .add(createType(RowType.from(ImmutableList.of(new RowType.Field(Optional.of(DUMMY_FIELD_NAME), BOOLEAN)))))
                 .build();
 
-        assertEquals(new AvroSchemaConverter(new TestingTypeManager(), ADD_DUMMY).convertAvroSchema(schema), typesForAddDummyStrategy);
+        assertEquals(new AvroSchemaConverter(new TestingTypeManager(), MARK).convertAvroSchema(schema), typesForAddDummyStrategy);
     }
 
     @Test
@@ -323,7 +323,7 @@ public void testEmptyFieldStrategyForEmptySchema()
                 .add(createType(RowType.from(ImmutableList.of(new RowType.Field(Optional.of(DUMMY_FIELD_NAME), BOOLEAN)))))
                 .build();
 
-        assertEquals(new AvroSchemaConverter(new TestingTypeManager(), ADD_DUMMY).convertAvroSchema(schema), typesForAddDummyStrategy);
+        assertEquals(new AvroSchemaConverter(new TestingTypeManager(), MARK).convertAvroSchema(schema), typesForAddDummyStrategy);
     }
 
     private static Type createType(Type valueType)
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestConfluentSchemaRegistryConfig.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestConfluentSchemaRegistryConfig.java
index fae19b6beb15..f29acf0dd0c8 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestConfluentSchemaRegistryConfig.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestConfluentSchemaRegistryConfig.java
@@ -22,8 +22,8 @@
 import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
 import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
 import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
-import static io.trino.plugin.kafka.schema.confluent.AvroSchemaConverter.EmptyFieldStrategy.ADD_DUMMY;
 import static io.trino.plugin.kafka.schema.confluent.AvroSchemaConverter.EmptyFieldStrategy.IGNORE;
+import static io.trino.plugin.kafka.schema.confluent.AvroSchemaConverter.EmptyFieldStrategy.MARK;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 public class TestConfluentSchemaRegistryConfig
@@ -44,14 +44,14 @@ public void testExplicitPropertyMappings()
         Map<String, String> properties = ImmutableMap.<String, String>builder()
                 .put("kafka.confluent-schema-registry-url", "http://schema-registry-a:8081, http://schema-registry-b:8081")
                 .put("kafka.confluent-schema-registry-client-cache-size", "1500")
-                .put("kafka.empty-field-strategy", "ADD_DUMMY")
+                .put("kafka.empty-field-strategy", "MARK")
                 .put("kafka.confluent-subjects-cache-refresh-interval", "2s")
                 .buildOrThrow();
 
         ConfluentSchemaRegistryConfig expected = new ConfluentSchemaRegistryConfig()
                 .setConfluentSchemaRegistryUrls("http://schema-registry-a:8081, http://schema-registry-b:8081")
                 .setConfluentSchemaRegistryClientCacheSize(1500)
-                .setEmptyFieldStrategy(ADD_DUMMY)
+                .setEmptyFieldStrategy(MARK)
                 .setConfluentSubjectsCacheRefreshInterval(new Duration(2, SECONDS));
 
         assertFullMapping(properties, expected);
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestForwardingSchemaParser.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestForwardingSchemaParser.java
new file mode 100644
index 000000000000..806f81848726
--- /dev/null
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestForwardingSchemaParser.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed 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 io.trino.plugin.kafka.schema.confluent;
+
+import org.testng.annotations.Test;
+
+import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
+
+public class TestForwardingSchemaParser
+{
+    @Test
+    public void testAllMethodsOverridden()
+    {
+        assertAllMethodsOverridden(SchemaParser.class, ForwardingSchemaParser.class);
+    }
+}
diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestKafkaWithConfluentSchemaRegistryMinimalFunctionality.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestKafkaWithConfluentSchemaRegistryMinimalFunctionality.java
index 71d1db23e709..a8df72849ec1 100644
--- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestKafkaWithConfluentSchemaRegistryMinimalFunctionality.java
+++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/schema/confluent/TestKafkaWithConfluentSchemaRegistryMinimalFunctionality.java
@@ -40,6 +40,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.IntStream;
+import java.util.stream.LongStream;
 
 import static io.confluent.kafka.serializers.AbstractKafkaAvroSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG;
 import static io.confluent.kafka.serializers.AbstractKafkaAvroSerDeConfig.VALUE_SUBJECT_NAME_STRATEGY;
@@ -62,13 +63,13 @@ public class TestKafkaWithConfluentSchemaRegistryMinimalFunctionality
     private static final int MESSAGE_COUNT = 100;
     private static final Schema INITIAL_SCHEMA = SchemaBuilder.record(RECORD_NAME)
             .fields()
-            .name("col_1").type().longType().noDefault()
-            .name("col_2").type().stringType().noDefault()
+            .name("col_1").type().nullable().longType().noDefault()
+            .name("col_2").type().nullable().stringType().noDefault()
             .endRecord();
     private static final Schema EVOLVED_SCHEMA = SchemaBuilder.record(RECORD_NAME)
             .fields()
-            .name("col_1").type().longType().noDefault()
-            .name("col_2").type().stringType().noDefault()
+            .name("col_1").type().nullable().longType().noDefault()
+            .name("col_2").type().nullable().stringType().noDefault()
             .name("col_3").type().optional().doubleType()
             .endRecord();
 
@@ -114,6 +115,65 @@ public void testTopicWithKeySubject()
                         .buildOrThrow());
     }
 
+    @Test
+    public void testTopicWithTombstone()
+    {
+        String topicName = "topic-tombstone-" + randomNameSuffix();
+
+        assertNotExists(topicName);
+
+        Map<String, String> producerConfig = schemaRegistryAwareProducer(testingKafka)
+                .put(KEY_SERIALIZER_CLASS_CONFIG, KafkaAvroSerializer.class.getName())
+                .put(VALUE_SERIALIZER_CLASS_CONFIG, KafkaAvroSerializer.class.getName())
+                .buildOrThrow();
+
+        List<ProducerRecord<Long, GenericRecord>> messages = createMessages(topicName, 2, true);
+        testingKafka.sendMessages(messages.stream(), producerConfig);
+
+        // sending tombstone message (null value) for existing key,
+        // to be differentiated from simple null value message by message corrupted field
+        testingKafka.sendMessages(LongStream.of(1).mapToObj(id -> new ProducerRecord<>(topicName, id, null)), producerConfig);
+
+        waitUntilTableExists(topicName);
+
+        // tombstone message should have message corrupt field - true
+        QueryAssertions queryAssertions = new QueryAssertions(getQueryRunner());
+        queryAssertions.query(format("SELECT \"%s-key\", col_1, col_2, _message_corrupt FROM %s", topicName, toDoubleQuoted(topicName)))
+                .assertThat()
+                .containsAll("VALUES (CAST(0 as bigint), CAST(0 as bigint), VARCHAR 'string-0', false), (CAST(1 as bigint), CAST(100 as bigint), VARCHAR 'string-1', false), (CAST(1 as bigint), null, null, true)");
+    }
+
+    @Test
+    public void testTopicWithAllNullValues()
+    {
+        String topicName = "topic-tombstone-" + randomNameSuffix();
+
+        assertNotExists(topicName);
+
+        Map<String, String> producerConfig = schemaRegistryAwareProducer(testingKafka)
+                .put(KEY_SERIALIZER_CLASS_CONFIG, KafkaAvroSerializer.class.getName())
+                .put(VALUE_SERIALIZER_CLASS_CONFIG, KafkaAvroSerializer.class.getName())
+                .buildOrThrow();
+
+        List<ProducerRecord<Long, GenericRecord>> messages = createMessages(topicName, 2, true);
+        testingKafka.sendMessages(messages.stream(), producerConfig);
+
+        // sending all null values for existing key,
+        // to be differentiated from tombstone by message corrupted field
+        testingKafka.sendMessages(LongStream.of(1).mapToObj(id -> new ProducerRecord<>(topicName, id, new GenericRecordBuilder(INITIAL_SCHEMA)
+                .set("col_1", null)
+                .set("col_2", null)
+                .build())), producerConfig);
+
+        waitUntilTableExists(topicName);
+
+        // simple all null values message should have message corrupt field - false
+        QueryAssertions queryAssertions = new QueryAssertions(getQueryRunner());
+        queryAssertions.query(format("SELECT \"%s-key\", col_1, col_2, _message_corrupt FROM %s", topicName, toDoubleQuoted(topicName)))
+                .assertThat()
+                .containsAll("VALUES (CAST(0 as bigint), CAST(0 as bigint), VARCHAR 'string-0', false), (CAST(1 as bigint), CAST(100 as bigint), VARCHAR 'string-1', false), (CAST(1 as bigint), null, null, false)");
+    }
+
     @Test
     public void testTopicWithRecordNameStrategy()
     {
@@ -264,10 +324,12 @@ private static void addExpectedColumns(Schema schema, GenericRecord record, Immu
                     throw new IllegalArgumentException("Unsupported field: " + field);
                 }
             }
-            else if (field.schema().getType().equals(Schema.Type.STRING)) {
+            else if (field.schema().getType().equals(Schema.Type.STRING)
+                    || (field.schema().getType().equals(Schema.Type.UNION) && field.schema().getTypes().contains(Schema.create(Schema.Type.STRING)))) {
                 columnsBuilder.add(format("VARCHAR '%s'", value));
             }
-            else if (field.schema().getType().equals(Schema.Type.LONG)) {
+            else if (field.schema().getType().equals(Schema.Type.LONG)
+                    || (field.schema().getType().equals(Schema.Type.UNION) && field.schema().getTypes().contains(Schema.create(Schema.Type.LONG)))) {
                 columnsBuilder.add(format("CAST(%s AS bigint)", value));
             }
             else {
diff --git a/plugin/trino-kafka/src/test/resources/protobuf/any/structural_datatypes/schema b/plugin/trino-kafka/src/test/resources/protobuf/any/structural_datatypes/schema
new file mode 100644
index 000000000000..854bd674dec5
--- /dev/null
+++ b/plugin/trino-kafka/src/test/resources/protobuf/any/structural_datatypes/schema
@@ -0,0 +1,31 @@
+syntax = "proto3";
+
+import "google/protobuf/timestamp.proto";
+
+message schema {
+    repeated string list = 1;
+    map<string, string> map = 2;
+    enum Number {
+        ZERO = 0;
+        ONE = 1;
+        TWO = 2;
+    };
+    message Row {
+        string string_column = 1;
+        uint32 integer_column = 2;
+        uint64 long_column = 3;
+        double double_column = 4;
+        float float_column = 5;
+        bool boolean_column = 6;
+        Number number_column = 7;
+        google.protobuf.Timestamp timestamp_column = 8;
+        bytes bytes_column = 9;
+    };
+    Row row = 3;
+    message NestedRow {
+        repeated Row nested_list = 1;
+        map<string, Row> nested_map = 2;
+        Row row = 3;
+    };
+    NestedRow nested_row = 4;
+}
diff --git a/plugin/trino-kafka/src/test/resources/protobuf/test_any.proto b/plugin/trino-kafka/src/test/resources/protobuf/test_any.proto
new file mode 100644
index 000000000000..748764be4f43
--- /dev/null
+++ b/plugin/trino-kafka/src/test/resources/protobuf/test_any.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+import "google/protobuf/any.proto";
+
+message schema {
+    int32 id = 1;
+    google.protobuf.Any anyMessage = 2;
+}
diff --git a/plugin/trino-kafka/src/test/resources/protobuf/test_oneof.proto b/plugin/trino-kafka/src/test/resources/protobuf/test_oneof.proto
new file mode 100644
index 000000000000..7bc6a96f94c9
--- /dev/null
+++ b/plugin/trino-kafka/src/test/resources/protobuf/test_oneof.proto
@@ -0,0 +1,40 @@
+syntax = "proto3";
+
+import "google/protobuf/timestamp.proto";
+
+message schema {
+    enum Number {
+        ZERO = 0;
+        ONE = 1;
+        TWO = 2;
+    };
+    message Row {
+        string string_column = 1;
+        uint32 integer_column = 2;
+        uint64 long_column = 3;
+        double double_column = 4;
+        float float_column = 5;
+        bool boolean_column = 6;
+        Number number_column = 7;
+        google.protobuf.Timestamp timestamp_column = 8;
+        bytes bytes_column = 9;
+    };
+    message NestedRow {
+        repeated Row nested_list = 1;
+        map<string, Row> nested_map = 2;
+        Row row = 3;
+    };
+    oneof testOneofColumn {
+        string stringColumn = 1;
+        uint32 integerColumn = 2;
+        uint64 longColumn = 3;
+        double doubleColumn = 4;
+        float floatColumn = 5;
+        bool booleanColumn = 6;
+        Number numberColumn = 7;
+        google.protobuf.Timestamp timestampColumn = 8;
+        bytes bytesColumn = 9;
+        Row rowColumn = 10;
+        NestedRow nestedRowColumn = 11;
+    }
+}
diff --git a/plugin/trino-kinesis/pom.xml b/plugin/trino-kinesis/pom.xml
index 8c12353ed0d9..9e54bb42275c 100644
--- a/plugin/trino-kinesis/pom.xml
+++ b/plugin/trino-kinesis/pom.xml
@@ -4,54 +4,19 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-kinesis</artifactId>
-    <description>Trino - Kinesis Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Kinesis Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-record-decoder</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>amazon-kinesis-client</artifactId>
@@ -61,14 +26,14 @@
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-core</artifactId>
             <exclusions>
-                <exclusion>
-                    <groupId>joda-time</groupId>
-                    <artifactId>joda-time</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>joda-time</groupId>
+                    <artifactId>joda-time</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -87,22 +52,17 @@
             <artifactId>aws-java-sdk-s3</artifactId>
             <version>${dep.aws-sdk.version}</version>
             <exclusions>
-                <exclusion>
-                    <groupId>joda-time</groupId>
-                    <artifactId>joda-time</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>joda-time</groupId>
+                    <artifactId>joda-time</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -114,19 +74,53 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>bootstrap</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-record-decoder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -137,8 +131,20 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -148,7 +154,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -198,6 +203,24 @@
                         <kinesis.test-table-description-location>s3://S3-LOC</kinesis.test-table-description-location>
                     </systemPropertyVariables>
                 </configuration>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.basepom.maven</groupId>
diff --git a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisColumnHandle.java b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisColumnHandle.java
index 34a541cf7eb4..7080a9081e1f 100644
--- a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisColumnHandle.java
+++ b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisColumnHandle.java
@@ -18,8 +18,7 @@
 import io.trino.decoder.DecoderColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConfig.java b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConfig.java
index 36aed9e4def4..9d0da37e7c14 100644
--- a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConfig.java
+++ b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConfig.java
@@ -15,13 +15,13 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
+import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.configuration.DefunctConfig;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.concurrent.TimeUnit;
 
@@ -124,6 +124,7 @@ public String getSecretKey()
 
     @Config("kinesis.secret-key")
     @ConfigDescription("S3 Secret Key to access s3 locations")
+    @ConfigSecuritySensitive
     public KinesisConfig setSecretKey(String secretKey)
     {
         this.secretKey = secretKey;
diff --git a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnector.java b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnector.java
index 77d49e7105a2..336c122669de 100644
--- a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnector.java
+++ b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnector.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Inject;
+import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
@@ -33,6 +34,7 @@
 public class KinesisConnector
         implements Connector
 {
+    private final LifeCycleManager lifeCycleManager;
     private final KinesisMetadata metadata;
     private final KinesisSplitManager splitManager;
     private final KinesisRecordSetProvider recordSetProvider;
@@ -41,11 +43,13 @@ public class KinesisConnector
 
     @Inject
     public KinesisConnector(
+            LifeCycleManager lifeCycleManager,
             KinesisMetadata metadata,
             KinesisSplitManager splitManager,
             KinesisRecordSetProvider recordSetProvider,
             KinesisSessionProperties properties)
     {
+        this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null");
         this.metadata = requireNonNull(metadata, "metadata is null");
         this.splitManager = requireNonNull(splitManager, "splitManager is null");
         this.recordSetProvider = requireNonNull(recordSetProvider, "recordSetProvider is null");
@@ -82,4 +86,10 @@ public List<PropertyMetadata<?>> getSessionProperties()
     {
         return propertyList;
     }
+
+    @Override
+    public void shutdown()
+    {
+        lifeCycleManager.stop();
+    }
 }
diff --git a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnectorFactory.java b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnectorFactory.java
index 2be24b0f82d1..1f0b4f230da7 100644
--- a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnectorFactory.java
+++ b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnectorFactory.java
@@ -29,7 +29,7 @@
 import java.util.function.Supplier;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class KinesisConnectorFactory
@@ -46,7 +46,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
     {
         requireNonNull(catalogName, "catalogName is null");
         requireNonNull(config, "config is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         try {
             Bootstrap app = new Bootstrap(
diff --git a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisRecordSet.java b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisRecordSet.java
index c566e1632d0e..6275929e65c7 100644
--- a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisRecordSet.java
+++ b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisRecordSet.java
@@ -28,7 +28,6 @@
 import io.trino.decoder.FieldValueProvider;
 import io.trino.decoder.RowDecoder;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.RecordCursor;
@@ -440,7 +439,7 @@ public Slice getSlice(int field)
         @Override
         public Object getObject(int field)
         {
-            return getFieldValueProvider(field, Block.class).getBlock();
+            return getFieldValueProvider(field, Object.class).getObject();
         }
 
         @Override
diff --git a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisRecordSetProvider.java b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisRecordSetProvider.java
index a0c921c0fd7c..2758c9065843 100644
--- a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisRecordSetProvider.java
+++ b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisRecordSetProvider.java
@@ -18,6 +18,7 @@
 import io.airlift.units.Duration;
 import io.trino.decoder.DispatchingRowDecoderFactory;
 import io.trino.decoder.RowDecoder;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
 import io.trino.spi.connector.ConnectorSession;
@@ -26,11 +27,11 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.RecordSet;
 
-import java.util.HashMap;
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static java.util.Collections.emptyMap;
 import static java.util.Objects.requireNonNull;
 
 public class KinesisRecordSetProvider
@@ -76,11 +77,13 @@ public RecordSet getRecordSet(
         ImmutableList.Builder<KinesisColumnHandle> handleBuilder = ImmutableList.builder();
 
         RowDecoder messageDecoder = decoderFactory.create(
-                kinesisSplit.getMessageDataFormat(),
-                new HashMap<>(),
-                kinesisColumns.stream()
-                        .filter(column -> !column.isInternal())
-                        .collect(toImmutableSet()));
+                session,
+                new RowDecoderSpec(
+                        kinesisSplit.getMessageDataFormat(),
+                        emptyMap(),
+                        kinesisColumns.stream()
+                                .filter(column -> !column.isInternal())
+                                .collect(toImmutableSet())));
 
         for (ColumnHandle handle : columns) {
             KinesisColumnHandle columnHandle = (KinesisColumnHandle) handle;
diff --git a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisTableDescriptionSupplier.java b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisTableDescriptionSupplier.java
index e3ae7566f9bf..3618b4875f18 100644
--- a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisTableDescriptionSupplier.java
+++ b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisTableDescriptionSupplier.java
@@ -21,8 +21,7 @@
 import io.trino.plugin.kinesis.s3config.S3TableConfigClient;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.SchemaTableName;
-
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import java.io.IOException;
 import java.nio.file.DirectoryIteratorException;
diff --git a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/s3config/S3TableConfigClient.java b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/s3config/S3TableConfigClient.java
index 864e88a9f32f..6806bd63a65f 100644
--- a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/s3config/S3TableConfigClient.java
+++ b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/s3config/S3TableConfigClient.java
@@ -31,8 +31,7 @@
 import io.trino.plugin.kinesis.KinesisConfig;
 import io.trino.plugin.kinesis.KinesisStreamDescription;
 import io.trino.spi.connector.SchemaTableName;
-
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestMinimalFunctionality.java b/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestMinimalFunctionality.java
index 584950e46d6f..554c0aa842f8 100644
--- a/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestMinimalFunctionality.java
+++ b/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestMinimalFunctionality.java
@@ -142,7 +142,7 @@ public void testStreamExists()
     {
         QualifiedObjectName name = new QualifiedObjectName("kinesis", "default", streamName);
 
-        transaction(queryRunner.getTransactionManager(), new AllowAllAccessControl())
+        transaction(queryRunner.getTransactionManager(), queryRunner.getMetadata(), new AllowAllAccessControl())
                 .singleStatement()
                 .execute(SESSION, session -> {
                     Optional<TableHandle> handle = queryRunner.getServer().getMetadata().getTableHandle(session, name);
diff --git a/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestRecordAccess.java b/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestRecordAccess.java
index 420615d2acd3..2eadc67aa8f0 100644
--- a/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestRecordAccess.java
+++ b/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestRecordAccess.java
@@ -151,7 +151,7 @@ public void testStreamExists()
     {
         QualifiedObjectName name = new QualifiedObjectName("kinesis", "default", dummyStreamName);
 
-        transaction(queryRunner.getTransactionManager(), new AllowAllAccessControl())
+        transaction(queryRunner.getTransactionManager(), queryRunner.getMetadata(), new AllowAllAccessControl())
                 .singleStatement()
                 .execute(SESSION, session -> {
                     Optional<TableHandle> handle = queryRunner.getServer().getMetadata().getTableHandle(session, name);
diff --git a/plugin/trino-kudu/pom.xml b/plugin/trino-kudu/pom.xml
index 710078c12668..005be69afc4a 100644
--- a/plugin/trino-kudu/pom.xml
+++ b/plugin/trino-kudu/pom.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-kudu</artifactId>
-    <description>Trino - Kudu Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Kudu Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,68 +19,63 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
+            <artifactId>bootstrap</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <artifactId>configuration</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -100,29 +95,33 @@
             </exclusions>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -132,7 +131,24 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -177,12 +193,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -195,6 +205,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
@@ -233,5 +249,29 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduClientConfig.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduClientConfig.java
index 1f8254cf77c4..6d02132f0e7c 100755
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduClientConfig.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduClientConfig.java
@@ -21,9 +21,8 @@
 import io.airlift.units.Duration;
 import io.airlift.units.MaxDuration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -45,6 +44,7 @@ public class KuduClientConfig
     private boolean schemaEmulationEnabled;
     private String schemaEmulationPrefix = "presto::";
     private Duration dynamicFilteringWaitTimeout = new Duration(0, MINUTES);
+    private boolean allowLocalScheduling;
 
     @NotNull
     @Size(min = 1)
@@ -144,4 +144,17 @@ public KuduClientConfig setDynamicFilteringWaitTimeout(Duration dynamicFiltering
         this.dynamicFilteringWaitTimeout = dynamicFilteringWaitTimeout;
         return this;
     }
+
+    public boolean isAllowLocalScheduling()
+    {
+        return allowLocalScheduling;
+    }
+
+    @Config("kudu.allow-local-scheduling")
+    @ConfigDescription("Assign Kudu splits to replica host if worker and kudu share the same cluster")
+    public KuduClientConfig setAllowLocalScheduling(boolean allowLocalScheduling)
+    {
+        this.allowLocalScheduling = allowLocalScheduling;
+        return this;
+    }
 }
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduClientSession.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduClientSession.java
index eb10c8373a2c..452afc08e631 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduClientSession.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduClientSession.java
@@ -22,6 +22,7 @@
 import io.trino.plugin.kudu.properties.RangePartition;
 import io.trino.plugin.kudu.properties.RangePartitionDefinition;
 import io.trino.plugin.kudu.schema.SchemaEmulation;
+import io.trino.spi.HostAddress;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
@@ -39,6 +40,7 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.predicate.ValueSet;
 import io.trino.spi.type.DecimalType;
+import jakarta.annotation.PreDestroy;
 import org.apache.kudu.ColumnSchema;
 import org.apache.kudu.ColumnTypeAttributes;
 import org.apache.kudu.Schema;
@@ -51,11 +53,10 @@
 import org.apache.kudu.client.KuduScanner;
 import org.apache.kudu.client.KuduSession;
 import org.apache.kudu.client.KuduTable;
+import org.apache.kudu.client.LocatedTablet.Replica;
 import org.apache.kudu.client.PartialRow;
 import org.apache.kudu.client.PartitionSchema.HashBucketSchema;
 
-import javax.annotation.PreDestroy;
-
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -68,8 +69,10 @@
 import static com.google.common.base.Strings.nullToEmpty;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.spi.HostAddress.fromParts;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.StandardErrorCode.QUERY_REJECTED;
+import static java.util.Locale.ENGLISH;
 import static java.util.stream.Collectors.toList;
 import static org.apache.kudu.ColumnSchema.ColumnSchemaBuilder;
 import static org.apache.kudu.ColumnSchema.CompressionAlgorithm;
@@ -85,11 +88,13 @@ public class KuduClientSession
     public static final String DEFAULT_SCHEMA = "default";
     private final KuduClientWrapper client;
     private final SchemaEmulation schemaEmulation;
+    private final boolean allowLocalScheduling;
 
-    public KuduClientSession(KuduClientWrapper client, SchemaEmulation schemaEmulation)
+    public KuduClientSession(KuduClientWrapper client, SchemaEmulation schemaEmulation, boolean allowLocalScheduling)
     {
         this.client = client;
         this.schemaEmulation = schemaEmulation;
+        this.allowLocalScheduling = allowLocalScheduling;
     }
 
     public List<String> listSchemaNames()
@@ -256,9 +261,9 @@ public void createSchema(String schemaName)
         schemaEmulation.createSchema(client, schemaName);
     }
 
-    public void dropSchema(String schemaName)
+    public void dropSchema(String schemaName, boolean cascade)
     {
-        schemaEmulation.dropSchema(client, schemaName);
+        schemaEmulation.dropSchema(client, schemaName, cascade);
     }
 
     public void dropTable(SchemaTableName schemaTableName)
@@ -305,6 +310,7 @@ public KuduTable createTable(ConnectorTableMetadata tableMetadata, boolean ignor
 
             Schema schema = buildSchema(columns);
             CreateTableOptions options = buildCreateTableOptions(schema, properties);
+            tableMetadata.getComment().ifPresent(options::setComment);
             return client.createTable(rawName, schema, options);
         }
         catch (KuduException e) {
@@ -614,7 +620,19 @@ private KuduSplit toKuduSplit(KuduTableHandle tableHandle, KuduScanToken token,
     {
         try {
             byte[] serializedScanToken = token.serialize();
-            return new KuduSplit(tableHandle.getSchemaTableName(), primaryKeyColumnCount, serializedScanToken, bucketNumber);
+            List<HostAddress> addresses = ImmutableList.of();
+            if (allowLocalScheduling) {
+                List<Replica> replicas = token.getTablet().getReplicas();
+                // KuduScanTokenBuilder uses ReplicaSelection.LEADER_ONLY by default, see org.apache.kudu.client.AbstractKuduScannerBuilder,
+                // because use ReplicaSelection.CLOSEST_REPLICA may cause slow queries when tablet followers' data lag behind tablet leaders',
+                // in this condition followers will wait until its data is synchronized with leaders' before returning
+                addresses = replicas.stream()
+                        .filter(replica -> replica.getRole().toLowerCase(ENGLISH).equals("leader"))
+                        .map(replica -> fromParts(replica.getRpcHost(), replica.getRpcPort()))
+                        .collect(toImmutableList());
+            }
+
+            return new KuduSplit(tableHandle.getSchemaTableName(), primaryKeyColumnCount, serializedScanToken, bucketNumber, addresses);
         }
         catch (IOException e) {
             throw new TrinoException(GENERIC_INTERNAL_ERROR, e);
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduClientWrapper.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduClientWrapper.java
index 1fd8ebe171f9..2d2540286513 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduClientWrapper.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduClientWrapper.java
@@ -30,19 +30,26 @@
 public interface KuduClientWrapper
         extends AutoCloseable
 {
-    KuduTable createTable(String name, Schema schema, CreateTableOptions builder) throws KuduException;
+    KuduTable createTable(String name, Schema schema, CreateTableOptions builder)
+            throws KuduException;
 
-    DeleteTableResponse deleteTable(String name) throws KuduException;
+    DeleteTableResponse deleteTable(String name)
+            throws KuduException;
 
-    AlterTableResponse alterTable(String name, AlterTableOptions ato) throws KuduException;
+    AlterTableResponse alterTable(String name, AlterTableOptions ato)
+            throws KuduException;
 
-    ListTablesResponse getTablesList() throws KuduException;
+    ListTablesResponse getTablesList()
+            throws KuduException;
 
-    ListTablesResponse getTablesList(String nameFilter) throws KuduException;
+    ListTablesResponse getTablesList(String nameFilter)
+            throws KuduException;
 
-    boolean tableExists(String name) throws KuduException;
+    boolean tableExists(String name)
+            throws KuduException;
 
-    KuduTable openTable(String name) throws KuduException;
+    KuduTable openTable(String name)
+            throws KuduException;
 
     KuduScanner.KuduScannerBuilder newScannerBuilder(KuduTable table);
 
@@ -50,8 +57,10 @@ public interface KuduClientWrapper
 
     KuduSession newSession();
 
-    KuduScanner deserializeIntoScanner(byte[] serializedScanToken) throws IOException;
+    KuduScanner deserializeIntoScanner(byte[] serializedScanToken)
+            throws IOException;
 
     @Override
-    void close() throws KuduException;
+    void close()
+            throws KuduException;
 }
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduConnector.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduConnector.java
index 75b5fb010773..062533db4502 100755
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduConnector.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduConnector.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.kudu;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.plugin.kudu.properties.KuduTableProperties;
 import io.trino.spi.connector.Connector;
@@ -28,8 +29,6 @@
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Set;
 
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduConnectorFactory.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduConnectorFactory.java
index 224c8660a36f..cde54af3b6e6 100755
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduConnectorFactory.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduConnectorFactory.java
@@ -22,7 +22,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class KuduConnectorFactory
@@ -42,7 +42,7 @@ public String getName()
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
         requireNonNull(config, "config is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 new JsonModule(),
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduKerberosConfig.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduKerberosConfig.java
index 150ddeccefa1..2c35dbfa9792 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduKerberosConfig.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduKerberosConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.Optional;
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduMetadata.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduMetadata.java
index d387b2cd9977..e8ac4922ebe0 100755
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduMetadata.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduMetadata.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.plugin.kudu.properties.KuduTableProperties;
 import io.trino.plugin.kudu.properties.PartitionDesign;
@@ -55,8 +56,6 @@
 import org.apache.kudu.client.KuduTable;
 import org.apache.kudu.client.PartitionSchema.HashBucketSchema;
 
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -66,9 +65,9 @@
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.OptionalLong;
-import java.util.Set;
 import java.util.function.Consumer;
 
+import static com.google.common.base.Strings.emptyToNull;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.plugin.kudu.KuduColumnHandle.ROW_ID;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
@@ -163,6 +162,8 @@ private ConnectorTableMetadata getTableMetadata(KuduTableHandle tableHandle)
     {
         KuduTable table = tableHandle.getTable(clientSession);
         Schema schema = table.getSchema();
+        // Kudu returns empty string as a table comment by default
+        Optional<String> tableComment = Optional.ofNullable(emptyToNull(table.getComment()));
 
         List<ColumnMetadata> columnsMetaList = schema.getColumns().stream()
                 .filter(column -> !column.isKey() || !column.getName().equals(ROW_ID))
@@ -170,7 +171,7 @@ private ConnectorTableMetadata getTableMetadata(KuduTableHandle tableHandle)
                 .collect(toImmutableList());
 
         Map<String, Object> properties = clientSession.getTableProperties(tableHandle);
-        return new ConnectorTableMetadata(tableHandle.getSchemaTableName(), columnsMetaList, properties);
+        return new ConnectorTableMetadata(tableHandle.getSchemaTableName(), columnsMetaList, properties, tableComment);
     }
 
     @Override
@@ -241,17 +242,14 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
-        clientSession.dropSchema(schemaName);
+        clientSession.dropSchema(schemaName, cascade);
     }
 
     @Override
     public void createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, boolean ignoreExisting)
     {
-        if (tableMetadata.getComment().isPresent()) {
-            throw new TrinoException(NOT_SUPPORTED, "This connector does not support creating tables with table comment");
-        }
         if (tableMetadata.getColumns().stream().anyMatch(column -> column.getComment() != null)) {
             throw new TrinoException(NOT_SUPPORTED, "This connector does not support creating tables with column comment");
         }
@@ -339,9 +337,6 @@ public ConnectorOutputTableHandle beginCreateTable(
         if (retryMode != NO_RETRIES) {
             throw new TrinoException(NOT_SUPPORTED, "This connector does not support query retries");
         }
-        if (tableMetadata.getComment().isPresent()) {
-            throw new TrinoException(NOT_SUPPORTED, "This connector does not support creating tables with table comment");
-        }
         PartitionDesign design = KuduTableProperties.getPartitionDesign(tableMetadata.getProperties());
         boolean generateUUID = !design.hasPartitions();
         ConnectorTableMetadata finalTableMetadata = tableMetadata;
@@ -427,7 +422,7 @@ public ConnectorMergeTableHandle beginMerge(ConnectorSession session, ConnectorT
     }
 
     @Override
-    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle mergeTableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
     {
         // For Kudu, nothing needs to be done finish the merge.
     }
@@ -438,13 +433,11 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
         KuduTableHandle handle = (KuduTableHandle) table;
 
         Optional<ConnectorTablePartitioning> tablePartitioning = Optional.empty();
-        Optional<Set<ColumnHandle>> partitioningColumns = Optional.empty();
         List<LocalProperty<ColumnHandle>> localProperties = ImmutableList.of();
 
         return new ConnectorTableProperties(
                 handle.getConstraint(),
                 tablePartitioning,
-                partitioningColumns,
                 Optional.empty(),
                 localProperties);
     }
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduNodePartitioningProvider.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduNodePartitioningProvider.java
index 1839ac9f16a7..90d9830e0ee4 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduNodePartitioningProvider.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduNodePartitioningProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.kudu;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.BucketFunction;
 import io.trino.spi.connector.ConnectorBucketNodeMap;
 import io.trino.spi.connector.ConnectorNodePartitioningProvider;
@@ -23,8 +24,6 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.function.ToIntFunction;
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduPageSink.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduPageSink.java
index c21e8a685e21..29dc98d338af 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduPageSink.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduPageSink.java
@@ -14,8 +14,6 @@
 package io.trino.plugin.kudu;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.primitives.Shorts;
-import com.google.common.primitives.SignedBytes;
 import io.airlift.slice.Slice;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
@@ -60,8 +58,6 @@
 import static io.trino.spi.type.Timestamps.truncateEpochMicrosToMillis;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
-import static java.lang.Float.intBitsToFloat;
-import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.CompletableFuture.completedFuture;
@@ -155,30 +151,30 @@ private void appendColumn(PartialRow row, Page page, int position, int channel,
             row.setNull(destChannel);
         }
         else if (TIMESTAMP_MILLIS.equals(type)) {
-            row.addLong(destChannel, truncateEpochMicrosToMillis(type.getLong(block, position)));
+            row.addLong(destChannel, truncateEpochMicrosToMillis(TIMESTAMP_MILLIS.getLong(block, position)));
         }
         else if (REAL.equals(type)) {
-            row.addFloat(destChannel, intBitsToFloat(toIntExact(type.getLong(block, position))));
+            row.addFloat(destChannel, REAL.getFloat(block, position));
         }
         else if (BIGINT.equals(type)) {
-            row.addLong(destChannel, type.getLong(block, position));
+            row.addLong(destChannel, BIGINT.getLong(block, position));
         }
         else if (INTEGER.equals(type)) {
-            row.addInt(destChannel, toIntExact(type.getLong(block, position)));
+            row.addInt(destChannel, INTEGER.getInt(block, position));
         }
         else if (SMALLINT.equals(type)) {
-            row.addShort(destChannel, Shorts.checkedCast(type.getLong(block, position)));
+            row.addShort(destChannel, SMALLINT.getShort(block, position));
         }
         else if (TINYINT.equals(type)) {
-            row.addByte(destChannel, SignedBytes.checkedCast(type.getLong(block, position)));
+            row.addByte(destChannel, TINYINT.getByte(block, position));
         }
         else if (BOOLEAN.equals(type)) {
-            row.addBoolean(destChannel, type.getBoolean(block, position));
+            row.addBoolean(destChannel, BOOLEAN.getBoolean(block, position));
         }
         else if (DOUBLE.equals(type)) {
-            row.addDouble(destChannel, type.getDouble(block, position));
+            row.addDouble(destChannel, DOUBLE.getDouble(block, position));
         }
-        else if (type instanceof VarcharType) {
+        else if (type instanceof VarcharType varcharType) {
             Type originalType = originalColumnTypes.get(destChannel);
             if (DATE.equals(originalType)) {
                 SqlDate date = (SqlDate) originalType.getObjectValue(connectorSession, block, position);
@@ -187,14 +183,14 @@ else if (type instanceof VarcharType) {
                 row.addStringUtf8(destChannel, bytes);
             }
             else {
-                row.addString(destChannel, type.getSlice(block, position).toStringUtf8());
+                row.addString(destChannel, varcharType.getSlice(block, position).toStringUtf8());
             }
         }
         else if (VARBINARY.equals(type)) {
-            row.addBinary(destChannel, type.getSlice(block, position).toByteBuffer());
+            row.addBinary(destChannel, VARBINARY.getSlice(block, position).toByteBuffer());
         }
-        else if (type instanceof DecimalType) {
-            SqlDecimal sqlDecimal = (SqlDecimal) type.getObjectValue(connectorSession, block, position);
+        else if (type instanceof DecimalType decimalType) {
+            SqlDecimal sqlDecimal = (SqlDecimal) decimalType.getObjectValue(connectorSession, block, position);
             row.addDecimal(destChannel, sqlDecimal.toBigDecimal());
         }
         else {
@@ -206,7 +202,7 @@ else if (type instanceof DecimalType) {
     public void storeMergedRows(Page page)
     {
         // The last channel in the page is the rowId block, the next-to-last is the operation block
-        int columnCount = columnTypes.size();
+        int columnCount = originalColumnTypes.size();
         checkArgument(page.getChannelCount() == 2 + columnCount, "The page size should be 2 + columnCount (%s), but is %s", columnCount, page.getChannelCount());
         Block operationBlock = page.getBlock(columnCount);
         Block rowIds = page.getBlock(columnCount + 1);
@@ -214,7 +210,7 @@ public void storeMergedRows(Page page)
         Schema schema = table.getSchema();
         try (KuduOperationApplier operationApplier = KuduOperationApplier.fromKuduClientSession(session)) {
             for (int position = 0; position < page.getPositionCount(); position++) {
-                long operation = TINYINT.getLong(operationBlock, position);
+                byte operation = TINYINT.getByte(operationBlock, position);
 
                 checkState(operation == UPDATE_OPERATION_NUMBER ||
                                 operation == INSERT_OPERATION_NUMBER ||
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduPageSinkProvider.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduPageSinkProvider.java
index 3035c8a5b08e..ea6a8f7fd638 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduPageSinkProvider.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduPageSinkProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.kudu;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorMergeSink;
 import io.trino.spi.connector.ConnectorMergeTableHandle;
@@ -23,8 +24,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
-import javax.inject.Inject;
-
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduRecordCursor.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduRecordCursor.java
index 74acb814240d..67a064a4133b 100755
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduRecordCursor.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduRecordCursor.java
@@ -45,6 +45,8 @@ public class KuduRecordCursor
 
     private long totalBytes;
 
+    private volatile boolean closed;
+
     public KuduRecordCursor(KuduScanner scanner, KuduTable table, List<Type> columnTypes, Map<Integer, Integer> fieldMapping)
     {
         this.scanner = requireNonNull(scanner, "scanner is null");
@@ -84,6 +86,7 @@ private int mapping(int field)
     public boolean advanceNextPosition()
     {
         if (!kuduScannerIterator.hasNext()) {
+            closed = scanner.isClosed();
             return false;
         }
 
@@ -153,12 +156,17 @@ private PartialRow buildPrimaryKey()
     @Override
     public void close()
     {
-        try {
-            scanner.close();
-        }
-        catch (KuduException e) {
-            throw new RuntimeException(e);
+        if (!closed) {
+            try {
+                scanner.close();
+            }
+            catch (KuduException e) {
+                throw new RuntimeException(e);
+            }
+            finally {
+                currentRow = null;
+                closed = true;
+            }
         }
-        currentRow = null;
     }
 }
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduRecordSetProvider.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduRecordSetProvider.java
index 27e545e76e69..bae219904c7e 100755
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduRecordSetProvider.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduRecordSetProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.kudu;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
 import io.trino.spi.connector.ConnectorSession;
@@ -21,8 +22,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.RecordSet;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSecurityModule.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSecurityModule.java
index 28627539fcb8..1d875eec5c20 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSecurityModule.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSecurityModule.java
@@ -15,6 +15,7 @@
 
 import com.google.inject.Binder;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.plugin.base.authentication.CachingKerberosAuthentication;
 import io.trino.plugin.base.authentication.KerberosAuthentication;
@@ -24,8 +25,6 @@
 import io.trino.plugin.kudu.schema.SchemaEmulationByTableNameConvention;
 import org.apache.kudu.client.KuduClient;
 
-import javax.inject.Singleton;
-
 import java.util.function.Function;
 
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
@@ -116,6 +115,6 @@ private static KuduClientSession createKuduClientSession(KuduClientConfig config
         else {
             strategy = new NoSchemaEmulation();
         }
-        return new KuduClientSession(client, strategy);
+        return new KuduClientSession(client, strategy, config.isAllowLocalScheduling());
     }
 }
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSessionProperties.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSessionProperties.java
index 9c600ab01330..81deaf8644e5 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSessionProperties.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSessionProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.kudu;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.plugin.base.session.PropertyMetadataUtil.durationProperty;
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSplit.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSplit.java
index 8514db0005d6..a606514ed5ad 100755
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSplit.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSplit.java
@@ -36,19 +36,22 @@ public class KuduSplit
     private final int primaryKeyColumnCount;
     private final byte[] serializedScanToken;
     private final int bucketNumber;
+    private final List<HostAddress> addresses;
 
     @JsonCreator
     public KuduSplit(
             @JsonProperty("schemaTableName") SchemaTableName schemaTableName,
             @JsonProperty("primaryKeyColumnCount") int primaryKeyColumnCount,
             @JsonProperty("serializedScanToken") byte[] serializedScanToken,
-            @JsonProperty("bucketNumber") int bucketNumber)
+            @JsonProperty("bucketNumber") int bucketNumber,
+            @JsonProperty("addresses") List<HostAddress> addresses)
     {
         this.schemaTableName = requireNonNull(schemaTableName, "schemaTableName is null");
         this.primaryKeyColumnCount = primaryKeyColumnCount;
         this.serializedScanToken = requireNonNull(serializedScanToken, "serializedScanToken is null");
         checkArgument(bucketNumber >= 0, "bucketNumber is negative");
         this.bucketNumber = bucketNumber;
+        this.addresses = ImmutableList.copyOf(requireNonNull(addresses, "addresses is null"));
     }
 
     @JsonProperty
@@ -81,10 +84,11 @@ public boolean isRemotelyAccessible()
         return true;
     }
 
+    @JsonProperty
     @Override
     public List<HostAddress> getAddresses()
     {
-        return ImmutableList.of();
+        return addresses;
     }
 
     @Override
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSplitManager.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSplitManager.java
index fbcc87a01ad0..52be6748547d 100755
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSplitManager.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/KuduSplitManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.kudu;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorSplitSource;
@@ -22,8 +23,6 @@
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.FixedSplitSource;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/TypeHelper.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/TypeHelper.java
index b98ca2307558..5fdd31d30ab6 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/TypeHelper.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/TypeHelper.java
@@ -206,7 +206,7 @@ public static Object getObject(Type type, RowResult row, int field)
             return row.getBoolean(field);
         }
         if (type instanceof VarbinaryType) {
-            return Slices.wrappedBuffer(row.getBinary(field));
+            return Slices.wrappedHeapBuffer(row.getBinary(field));
         }
         if (type instanceof DecimalType) {
             return Decimals.encodeScaledValue(row.getDecimal(field), ((DecimalType) type).getScale());
@@ -265,7 +265,7 @@ public static Slice getSlice(Type type, RowResult row, int field)
             return Slices.utf8Slice(row.getString(field));
         }
         if (type instanceof VarbinaryType) {
-            return Slices.wrappedBuffer(row.getBinary(field));
+            return Slices.wrappedHeapBuffer(row.getBinary(field));
         }
         throw new IllegalStateException("getSlice not implemented for " + type);
     }
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/procedures/RangePartitionProcedures.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/procedures/RangePartitionProcedures.java
index 4a2fb40b0e83..14e15ce5bae2 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/procedures/RangePartitionProcedures.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/procedures/RangePartitionProcedures.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.kudu.procedures;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.kudu.KuduClientSession;
 import io.trino.plugin.kudu.properties.KuduTableProperties;
 import io.trino.plugin.kudu.properties.RangePartition;
@@ -21,8 +22,6 @@
 import io.trino.spi.procedure.Procedure;
 import io.trino.spi.procedure.Procedure.Argument;
 
-import javax.inject.Inject;
-
 import java.lang.invoke.MethodHandle;
 
 import static io.trino.spi.type.VarcharType.VARCHAR;
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/properties/KuduTableProperties.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/properties/KuduTableProperties.java
index 8b5575fa5399..48c3bead6632 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/properties/KuduTableProperties.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/properties/KuduTableProperties.java
@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.TrinoException;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.ArrayType;
@@ -29,8 +30,6 @@
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.ISODateTimeFormat;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/schema/NoSchemaEmulation.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/schema/NoSchemaEmulation.java
index b3e4b44f8b0d..ad3c828445d3 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/schema/NoSchemaEmulation.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/schema/NoSchemaEmulation.java
@@ -37,7 +37,7 @@ public void createSchema(KuduClientWrapper client, String schemaName)
     }
 
     @Override
-    public void dropSchema(KuduClientWrapper client, String schemaName)
+    public void dropSchema(KuduClientWrapper client, String schemaName, boolean cascade)
     {
         if (DEFAULT_SCHEMA.equals(schemaName)) {
             throw new TrinoException(GENERIC_USER_ERROR, "Deleting default schema not allowed.");
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/schema/SchemaEmulation.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/schema/SchemaEmulation.java
index ff983718fa5f..56ebfc743a2a 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/schema/SchemaEmulation.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/schema/SchemaEmulation.java
@@ -22,7 +22,7 @@ public interface SchemaEmulation
 {
     void createSchema(KuduClientWrapper client, String schemaName);
 
-    void dropSchema(KuduClientWrapper client, String schemaName);
+    void dropSchema(KuduClientWrapper client, String schemaName, boolean cascade);
 
     boolean existsSchema(KuduClientWrapper client, String schemaName);
 
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/schema/SchemaEmulationByTableNameConvention.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/schema/SchemaEmulationByTableNameConvention.java
index 496e2a86205d..076001d11ee1 100644
--- a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/schema/SchemaEmulationByTableNameConvention.java
+++ b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/schema/SchemaEmulationByTableNameConvention.java
@@ -39,6 +39,7 @@
 import static io.trino.plugin.kudu.KuduClientSession.DEFAULT_SCHEMA;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
+import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_EMPTY;
 
 public class SchemaEmulationByTableNameConvention
         implements SchemaEmulation
@@ -81,14 +82,18 @@ public boolean existsSchema(KuduClientWrapper client, String schemaName)
     }
 
     @Override
-    public void dropSchema(KuduClientWrapper client, String schemaName)
+    public void dropSchema(KuduClientWrapper client, String schemaName, boolean cascade)
     {
         if (DEFAULT_SCHEMA.equals(schemaName)) {
             throw new TrinoException(GENERIC_USER_ERROR, "Deleting default schema not allowed.");
         }
         try (KuduOperationApplier operationApplier = KuduOperationApplier.fromKuduClientWrapper(client)) {
             String prefix = getPrefixForTablesOfSchema(schemaName);
-            for (String name : client.getTablesList(prefix).getTablesList()) {
+            List<String> tables = client.getTablesList(prefix).getTablesList();
+            if (!cascade && !tables.isEmpty()) {
+                throw new TrinoException(SCHEMA_NOT_EMPTY, "Cannot drop non-empty schema '%s'".formatted(schemaName));
+            }
+            for (String name : tables) {
                 client.deleteTable(name);
             }
 
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduConnectorSmokeTest.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduConnectorSmokeTest.java
index 264b98df6046..847a818e3ca7 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduConnectorSmokeTest.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduConnectorSmokeTest.java
@@ -16,22 +16,22 @@
 import io.trino.testing.BaseConnectorSmokeTest;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
 import static io.trino.plugin.kudu.KuduQueryRunnerFactory.createKuduQueryRunnerTpch;
 import static io.trino.plugin.kudu.TestKuduConnectorTest.REGION_COLUMNS;
 import static io.trino.plugin.kudu.TestKuduConnectorTest.createKuduTableForWrites;
+import static io.trino.plugin.kudu.TestingKuduServer.EARLIEST_TAG;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 public abstract class BaseKuduConnectorSmokeTest
         extends BaseConnectorSmokeTest
 {
-    private TestingKuduServer kuduServer;
-
     protected abstract String getKuduServerVersion();
 
     protected abstract Optional<String> getKuduSchemaEmulationPrefix();
@@ -40,50 +40,28 @@ public abstract class BaseKuduConnectorSmokeTest
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        kuduServer = new TestingKuduServer(getKuduServerVersion());
-        return createKuduQueryRunnerTpch(kuduServer, getKuduSchemaEmulationPrefix(), REQUIRED_TPCH_TABLES);
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-    {
-        kuduServer.close();
-        kuduServer = null;
+        return createKuduQueryRunnerTpch(
+                closeAfterClass(new TestingKuduServer(getKuduServerVersion())),
+                getKuduSchemaEmulationPrefix(), REQUIRED_TPCH_TABLES);
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return false;
-
-            case SUPPORTS_DELETE:
-            case SUPPORTS_MERGE:
-                return true;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-            case SUPPORTS_NEGATIVE_DATE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ARRAY,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_NEGATIVE_DATE,
+                    SUPPORTS_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_TRUNCATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -93,6 +71,7 @@ protected String getCreateTableDefaultDefinition()
                 "WITH (partition_by_hash_columns = ARRAY['a'], partition_by_hash_buckets = 2)";
     }
 
+    @Test
     @Override
     public void testShowCreateTable()
     {
@@ -103,7 +82,7 @@ public void testShowCreateTable()
                         "   comment varchar COMMENT '' WITH ( nullable = true )\n" +
                         ")\n" +
                         "WITH (\n" +
-                        "   number_of_replicas = 3,\n" +
+                        "   number_of_replicas = 1,\n" +
                         "   partition_by_hash_buckets = 2,\n" +
                         "   partition_by_hash_columns = ARRAY['row_uuid'],\n" +
                         "   partition_by_range_columns = ARRAY['row_uuid'],\n" +
@@ -143,7 +122,7 @@ public void testRowLevelDelete()
 
     @Test
     @Override
-    public void testUpdate()
+    public void testRowLevelUpdate()
     {
         String tableName = "test_update_" + randomNameSuffix();
         assertUpdate("CREATE TABLE %s %s".formatted(tableName, getCreateTableDefaultDefinition()));
@@ -156,4 +135,59 @@ public void testUpdate()
                 .matches(expectedValues("(0, 1.2), (1, 2.5), (2, 6.2), (3, 7.5), (4, 11.2)"));
         assertUpdate("DROP TABLE " + tableName);
     }
+
+    @Override
+    @Test
+    public void testUpdate()
+    {
+        String tableName = "test_update_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE %s %s".formatted(tableName, getCreateTableDefaultDefinition()));
+        assertUpdate("INSERT INTO " + tableName + " (a, b) SELECT regionkey, regionkey * 2.5 FROM region", "SELECT count(*) FROM region");
+        assertThat(query("SELECT a, b FROM " + tableName))
+                .matches(expectedValues("(0, 0.0), (1, 2.5), (2, 5.0), (3, 7.5), (4, 10.0)"));
+
+        assertUpdate("UPDATE " + tableName + " SET b = 1.2 WHERE a = 0", 1);
+        assertThat(query("SELECT a, b FROM " + tableName))
+                .matches(expectedValues("(0, 1.2), (1, 2.5), (2, 5.0), (3, 7.5), (4, 10.0)"));
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testCreateTableWithTableComment()
+    {
+        String tableName = "test_create_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE " + tableName + " (a bigint WITH (primary_key=true)) COMMENT 'test comment' WITH (partition_by_hash_columns = ARRAY['a'], partition_by_hash_buckets = 2)");
+
+        // Kudu versions < 1.15.0 ignore a table comment
+        String expected = getKuduServerVersion().equals(EARLIEST_TAG) ? null : "test comment";
+        assertThat(getTableComment(tableName)).isEqualTo(expected);
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testDropSchemaCascade()
+    {
+        String schemaName = "test_drop_schema_cascade_" + randomNameSuffix();
+        String tableName = "test_table" + randomNameSuffix();
+        try {
+            if (getKuduSchemaEmulationPrefix().isEmpty()) {
+                assertThatThrownBy(() -> assertUpdate("CREATE SCHEMA " + schemaName))
+                        .hasMessageContaining("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
+                abort("Cannot test when schema emulation is disabled");
+            }
+            assertUpdate("CREATE SCHEMA " + schemaName);
+            assertUpdate("CREATE TABLE " + schemaName + "." + tableName + " AS SELECT 1 a", 1);
+
+            assertThat(computeActual("SHOW SCHEMAS").getOnlyColumnAsSet()).contains(schemaName);
+
+            assertUpdate("DROP SCHEMA " + schemaName + " CASCADE");
+            assertThat(computeActual("SHOW SCHEMAS").getOnlyColumnAsSet()).doesNotContain(schemaName);
+        }
+        finally {
+            assertUpdate("DROP TABLE IF EXISTS " + schemaName + "." + tableName);
+            assertUpdate("DROP SCHEMA IF EXISTS " + schemaName);
+        }
+    }
 }
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithDisabledInferSchemaConnectorSmokeTest.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithDisabledInferSchemaConnectorSmokeTest.java
index 2b314b473352..a91c737b0748 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithDisabledInferSchemaConnectorSmokeTest.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithDisabledInferSchemaConnectorSmokeTest.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.kudu;
 
 import io.trino.tpch.TpchTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -57,6 +57,14 @@ public void testCreateSchema()
                 .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
     }
 
+    @Test
+    @Override
+    public void testCreateSchemaWithNonLowercaseOwnerName()
+    {
+        assertThatThrownBy(super::testCreateSchemaWithNonLowercaseOwnerName)
+                .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
+    }
+
     @Test
     @Override
     public void testRenameTableAcrossSchemas()
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithEmptyInferSchemaConnectorSmokeTest.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithEmptyInferSchemaConnectorSmokeTest.java
index 975c479bcb16..d093eacb4c38 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithEmptyInferSchemaConnectorSmokeTest.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithEmptyInferSchemaConnectorSmokeTest.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.kudu;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithStandardInferSchemaConnectorSmokeTest.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithStandardInferSchemaConnectorSmokeTest.java
index a3ef1bf015ae..bf1e61458d13 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithStandardInferSchemaConnectorSmokeTest.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithStandardInferSchemaConnectorSmokeTest.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.kudu;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestForwardingKuduClient.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestForwardingKuduClient.java
index 0e833e3682d1..2520c14c5f32 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestForwardingKuduClient.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestForwardingKuduClient.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.kudu;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduAuthenticationConfig.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduAuthenticationConfig.java
index 5cc0b91bffaf..96c4ef69f244 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduAuthenticationConfig.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduAuthenticationConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.kudu;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduClientConfig.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduClientConfig.java
index 4e57ba7df21c..78580ad2e1d9 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduClientConfig.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduClientConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -37,7 +37,8 @@ public void testDefaults()
                 .setDisableStatistics(false)
                 .setSchemaEmulationEnabled(false)
                 .setSchemaEmulationPrefix("presto::")
-                .setDynamicFilteringWaitTimeout(new Duration(0, MINUTES)));
+                .setDynamicFilteringWaitTimeout(new Duration(0, MINUTES))
+                .setAllowLocalScheduling(false));
     }
 
     @Test
@@ -51,6 +52,7 @@ public void testExplicitPropertyMappingsWithCredentialsKey()
                 .put("kudu.schema-emulation.enabled", "true")
                 .put("kudu.schema-emulation.prefix", "trino::")
                 .put("kudu.dynamic-filtering.wait-timeout", "30m")
+                .put("kudu.allow-local-scheduling", "true")
                 .buildOrThrow();
 
         KuduClientConfig expected = new KuduClientConfig()
@@ -60,7 +62,8 @@ public void testExplicitPropertyMappingsWithCredentialsKey()
                 .setDisableStatistics(true)
                 .setSchemaEmulationEnabled(true)
                 .setSchemaEmulationPrefix("trino::")
-                .setDynamicFilteringWaitTimeout(new Duration(30, MINUTES));
+                .setDynamicFilteringWaitTimeout(new Duration(30, MINUTES))
+                .setAllowLocalScheduling(true);
 
         assertFullMapping(properties, expected);
     }
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduConnectorTest.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduConnectorTest.java
index 68870bb00bc5..e0deac697850 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduConnectorTest.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduConnectorTest.java
@@ -20,9 +20,8 @@
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
 import io.trino.testing.sql.TestTable;
+import org.junit.jupiter.api.Test;
 import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
 
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -31,12 +30,8 @@
 import java.util.regex.Pattern;
 
 import static io.trino.plugin.kudu.KuduQueryRunnerFactory.createKuduQueryRunnerTpch;
-import static io.trino.spi.connector.ConnectorMetadata.MODIFYING_ROWS_MESSAGE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.testing.MaterializedResult.resultBuilder;
-import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_TABLE;
-import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_DELETE;
-import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ROW_LEVEL_DELETE;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
@@ -55,63 +50,35 @@ public class TestKuduConnectorTest
     protected static final String ORDER_COLUMNS = "(orderkey bigint, custkey bigint, orderstatus varchar(1), totalprice double, orderdate date, orderpriority varchar(15), clerk varchar(15), shippriority integer, comment varchar(79))";
     public static final String REGION_COLUMNS = "(regionkey bigint, name varchar(25), comment varchar(152))";
 
-    private TestingKuduServer kuduServer;
-
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        kuduServer = new TestingKuduServer();
-        return createKuduQueryRunnerTpch(kuduServer, Optional.empty(), REQUIRED_TPCH_TABLES);
-    }
-
-    @AfterClass(alwaysRun = true)
-    public final void destroy()
-    {
-        if (kuduServer != null) {
-            kuduServer.close();
-            kuduServer = null;
-        }
+        return createKuduQueryRunnerTpch(
+                closeAfterClass(new TestingKuduServer()),
+                Optional.empty(),
+                REQUIRED_TPCH_TABLES);
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return false;
-
-            case SUPPORTS_DELETE:
-            case SUPPORTS_UPDATE:
-            case SUPPORTS_MERGE:
-                return true;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-            case SUPPORTS_NEGATIVE_DATE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ARRAY,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_NEGATIVE_DATE,
+                    SUPPORTS_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_TRUNCATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -139,6 +106,15 @@ public void testCreateSchema()
                 .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
     }
 
+    @Test
+    @Override
+    public void testCreateSchemaWithNonLowercaseOwnerName()
+    {
+        assertThatThrownBy(super::testCreateSchemaWithNonLowercaseOwnerName)
+                .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
+    }
+
+    @Test
     @Override
     public void testCreateSchemaWithLongName()
     {
@@ -155,6 +131,14 @@ public void testDropNonEmptySchemaWithTable()
                 .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
     }
 
+    @Test
+    @Override
+    public void testDropSchemaCascade()
+    {
+        assertThatThrownBy(super::testDropSchemaCascade)
+                .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
+    }
+
     @Test
     @Override
     public void testRenameTableAcrossSchema()
@@ -230,7 +214,7 @@ public void testShowCreateTable()
                         "   comment varchar COMMENT '' WITH ( nullable = true )\n" +
                         ")\n" +
                         "WITH (\n" +
-                        "   number_of_replicas = 3,\n" +
+                        "   number_of_replicas = 1,\n" +
                         "   partition_by_hash_buckets = 2,\n" +
                         "   partition_by_hash_columns = ARRAY['row_uuid'],\n" +
                         "   partition_by_range_columns = ARRAY['row_uuid'],\n" +
@@ -322,6 +306,15 @@ protected void testColumnName(String columnName, boolean delimited)
         }
     }
 
+    @Override
+    public void testAddNotNullColumnToEmptyTable()
+    {
+        // TODO: Enable this test
+        assertThatThrownBy(super::testAddNotNullColumnToEmptyTable)
+                .hasMessage("Table partitioning must be specified using setRangePartitionColumns or addHashPartitions");
+        throw new SkipException("TODO");
+    }
+
     @Test
     public void testProjection()
     {
@@ -389,9 +382,9 @@ public void testCreateTable()
 
         assertUpdate(
                 "CREATE TABLE IF NOT EXISTS " + tableName + " (" +
-                    "id INT WITH (primary_key=true)," +
-                    "d bigint, e varchar(50))" +
-                    "WITH (partition_by_hash_columns = ARRAY['id'], partition_by_hash_buckets = 2)");
+                        "id INT WITH (primary_key=true)," +
+                        "d bigint, e varchar(50))" +
+                        "WITH (partition_by_hash_columns = ARRAY['id'], partition_by_hash_buckets = 2)");
         assertTrue(getQueryRunner().tableExists(getSession(), tableName));
         assertTableColumnNames(tableName, "id", "a", "b", "c");
 
@@ -414,8 +407,8 @@ public void testCreateTable()
         final String finalTableName = tableName;
         assertThatThrownBy(() -> assertUpdate(
                 "CREATE TABLE " + tableNameLike + " (LIKE " + finalTableName + ", " +
-                    "d bigint, e varchar(50))" +
-                    "WITH (partition_by_hash_columns = ARRAY['id'], partition_by_hash_buckets = 2)"))
+                        "d bigint, e varchar(50))" +
+                        "WITH (partition_by_hash_columns = ARRAY['id'], partition_by_hash_buckets = 2)"))
                 .hasMessageContaining("This connector does not support creating tables with column comment");
         //assertTrue(getQueryRunner().tableExists(getSession(), tableNameLike));
         //assertTableColumnNames(tableNameLike, "a", "b", "c", "d", "e");
@@ -499,9 +492,9 @@ public void testDropTable()
         String tableName = "test_drop_table_" + randomNameSuffix();
         assertUpdate(
                 "CREATE TABLE " + tableName + "(" +
-                    "id INT WITH (primary_key=true)," +
-                    "col bigint)" +
-                    "WITH (partition_by_hash_columns = ARRAY['id'], partition_by_hash_buckets = 2)");
+                        "id INT WITH (primary_key=true)," +
+                        "col bigint)" +
+                        "WITH (partition_by_hash_columns = ARRAY['id'], partition_by_hash_buckets = 2)");
         assertTrue(getQueryRunner().tableExists(getSession(), tableName));
 
         assertUpdate("DROP TABLE " + tableName);
@@ -690,14 +683,14 @@ protected TestTable createTableWithOneIntegerColumn(String namePrefix)
         // TODO Remove this overriding method once kudu connector can create tables with default partitions
         return new TestTable(getQueryRunner()::execute, namePrefix,
                 "(col integer WITH (primary_key=true)) " +
-                "WITH (partition_by_hash_columns = ARRAY['col'], partition_by_hash_buckets = 2)");
+                        "WITH (partition_by_hash_columns = ARRAY['col'], partition_by_hash_buckets = 2)");
     }
 
     /**
      * This test fails intermittently because Kudu doesn't have strong enough
      * semantics to support writing from multiple threads.
      */
-    @Test(enabled = false)
+    @org.testng.annotations.Test(enabled = false)
     @Override
     public void testUpdateWithPredicates()
     {
@@ -719,7 +712,6 @@ public void testUpdateWithPredicates()
      * This test fails intermittently because Kudu doesn't have strong enough
      * semantics to support writing from multiple threads.
      */
-    @Test(enabled = false)
     @Override
     public void testUpdateAllValues()
     {
@@ -731,12 +723,10 @@ public void testUpdateAllValues()
         });
     }
 
-    @Test
     @Override
     public void testWrittenStats()
     {
         // TODO Kudu connector supports CTAS and inserts, but the test would fail
-        throw new SkipException("TODO");
     }
 
     @Override
@@ -796,7 +786,6 @@ public void testVarcharCastToDateInPredicate()
         throw new SkipException("TODO: implement the test for Kudu");
     }
 
-    @Test
     @Override
     public void testCharVarcharComparison()
     {
@@ -819,9 +808,6 @@ public void testLimitPushdown()
     @Override
     public void testDeleteWithComplexPredicate()
     {
-        skipTestUnless(hasBehavior(SUPPORTS_DELETE));
-
-        // TODO (https://github.com/trinodb/trino/issues/5901) Use longer table name once Oracle version is updated
         withTableName("test_delete_complex", tableName -> {
             assertUpdate(createTableForWrites("CREATE TABLE %s %s".formatted(tableName, ORDER_COLUMNS)));
             assertUpdate("INSERT INTO " + tableName + " SELECT * FROM orders", 15000);
@@ -840,9 +826,6 @@ public void testDeleteWithComplexPredicate()
     public void testDeleteWithSubquery()
     {
         // TODO (https://github.com/trinodb/trino/issues/13210) Migrate these tests to AbstractTestEngineOnlyQueries
-        skipTestUnless(hasBehavior(SUPPORTS_DELETE));
-
-        // TODO (https://github.com/trinodb/trino/issues/5901) Use longer table name once Oracle version is updated
         withTableName("test_delete_subquery", tableName -> {
             assertUpdate(createTableForWrites("CREATE TABLE %s %s".formatted(tableName, NATION_COLUMNS)));
             assertUpdate("INSERT INTO " + tableName + " SELECT * FROM nation", 25);
@@ -852,7 +835,6 @@ public void testDeleteWithSubquery()
                     "SELECT * FROM nation WHERE regionkey IN (SELECT regionkey FROM region WHERE name NOT LIKE 'A%')");
         });
 
-        // TODO (https://github.com/trinodb/trino/issues/5901) Use longer table name once Oracle version is updated
         withTableName("test_delete_subquery", tableName -> {
             assertUpdate(createTableForWrites("CREATE TABLE %s %s".formatted(tableName, ORDER_COLUMNS)));
             assertUpdate("INSERT INTO " + tableName + " SELECT * FROM orders", 15000);
@@ -890,9 +872,6 @@ public void testDeleteWithSubquery()
     @Override
     public void testDeleteWithSemiJoin()
     {
-        skipTestUnless(hasBehavior(SUPPORTS_DELETE));
-
-        // TODO (https://github.com/trinodb/trino/issues/5901) Use longer table name once Oracle version is updated
         withTableName("test_delete_semijoin", tableName -> {
             assertUpdate(createTableForWrites("CREATE TABLE %s %s".formatted(tableName, NATION_COLUMNS)));
             assertUpdate("INSERT INTO " + tableName + " SELECT * FROM nation", 25);
@@ -909,7 +888,6 @@ public void testDeleteWithSemiJoin()
                             "  OR regionkey IN (SELECT regionkey FROM region WHERE length(comment) >= 50)");
         });
 
-        // TODO (https://github.com/trinodb/trino/issues/5901) Use longer table name once Oracle version is updated
         withTableName("test_delete_semijoin", tableName -> {
             assertUpdate(createTableForWrites("CREATE TABLE %s %s".formatted(tableName, ORDER_COLUMNS)));
             assertUpdate("INSERT INTO " + tableName + " SELECT * FROM orders", 15000);
@@ -931,8 +909,6 @@ public void testDeleteWithSemiJoin()
     @Override
     public void testDeleteWithVarcharPredicate()
     {
-        skipTestUnless(hasBehavior(SUPPORTS_DELETE));
-
         withTableName("test_delete_varchar", tableName -> {
             assertUpdate(createTableForWrites("CREATE TABLE %s %s".formatted(tableName, ORDER_COLUMNS)));
             assertUpdate("INSERT INTO " + tableName + " SELECT * FROM orders", 15000);
@@ -941,29 +917,10 @@ public void testDeleteWithVarcharPredicate()
         });
     }
 
-    @Test
-    @Override
-    public void verifySupportsDeleteDeclaration()
-    {
-        if (hasBehavior(SUPPORTS_DELETE)) {
-            // Covered by testDeleteAllDataFromTable
-            return;
-        }
-
-        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE));
-        withTableName("test_supports_delete", tableName -> {
-            assertUpdate(createTableForWrites("CREATE TABLE %s %s".formatted(tableName, REGION_COLUMNS)));
-            assertUpdate("INSERT INTO " + tableName + " SELECT * FROM region", 5);
-            assertQueryFails("DELETE FROM " + tableName, MODIFYING_ROWS_MESSAGE);
-        });
-    }
-
     @Test
     @Override
     public void testDeleteAllDataFromTable()
     {
-        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_DELETE));
-
         withTableName("test_delete_all_data", tableName -> {
             assertUpdate(createTableForWrites("CREATE TABLE %s %s".formatted(tableName, REGION_COLUMNS)));
             assertUpdate("INSERT INTO " + tableName + " SELECT * FROM region", 5);
@@ -978,8 +935,6 @@ public void testDeleteAllDataFromTable()
     @Override
     public void testRowLevelDelete()
     {
-        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_ROW_LEVEL_DELETE));
-        // TODO (https://github.com/trinodb/trino/issues/5901) Use longer table name once Oracle version is updated
         withTableName("test_row_delete", tableName -> {
             assertUpdate(createTableForWrites("CREATE TABLE %s %s".formatted(tableName, REGION_COLUMNS)));
             assertUpdate("INSERT INTO " + tableName + " SELECT * FROM region", 5);
@@ -992,9 +947,25 @@ public void testRowLevelDelete()
      * This test fails intermittently because Kudu doesn't have strong enough
      * semantics to support writing from multiple threads.
      */
-    @Test(enabled = false)
+    @org.testng.annotations.Test(enabled = false)
     @Override
     public void testUpdate()
+    {
+        withTableName("test_update", tableName -> {
+            assertUpdate(createTableForWrites("CREATE TABLE %s %s".formatted(tableName, NATION_COLUMNS)));
+            assertUpdate("INSERT INTO " + tableName + " SELECT * FROM nation", 25);
+            assertUpdate("UPDATE " + tableName + " SET nationkey = 100 WHERE regionkey = 2", 5);
+            assertQuery("SELECT count(*) FROM " + tableName + " WHERE nationkey = 100", "VALUES 5");
+        });
+    }
+
+    /**
+     * This test fails intermittently because Kudu doesn't have strong enough
+     * semantics to support writing from multiple threads.
+     */
+    @org.testng.annotations.Test(enabled = false)
+    @Override
+    public void testRowLevelUpdate()
     {
         withTableName("test_update", tableName -> {
             assertUpdate(createTableForWrites("CREATE TABLE %s %s".formatted(tableName, NATION_COLUMNS)));
@@ -1020,6 +991,32 @@ public void testUpdateRowConcurrently()
         throw new SkipException("Kudu doesn't support concurrent update of different columns in a row");
     }
 
+    @Test
+    @Override
+    public void testCreateTableWithTableComment()
+    {
+        // TODO Remove this overriding test once kudu connector can create tables with default partitions
+        String tableName = "test_create_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE " + tableName + " (a bigint WITH (primary_key=true)) COMMENT 'test comment' " +
+                "WITH (partition_by_hash_columns = ARRAY['a'], partition_by_hash_buckets = 2)");
+        assertEquals(getTableComment("kudu", "default", tableName), "test comment");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Override
+    public void testCreateTableWithTableCommentSpecialCharacter(String comment)
+    {
+        // TODO Remove this overriding test once kudu connector can create tables with default partitions
+        try (TestTable table = new TestTable(getQueryRunner()::execute,
+                "test_create_",
+                "(a bigint WITH (primary_key=true)) COMMENT " + varcharLiteral(comment) +
+                        "WITH (partition_by_hash_columns = ARRAY['a'], partition_by_hash_buckets = 2)")) {
+            assertEquals(getTableComment("kudu", "default", table.getName()), comment);
+        }
+    }
+
     @Override
     protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMappingTestSetup dataMappingTestSetup)
     {
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDecimalColumns.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDecimalColumns.java
index d56e55a7f30b..cfa2593177c7 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDecimalColumns.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDecimalColumns.java
@@ -18,14 +18,17 @@
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.TestTable;
 import io.trino.testing.sql.TrinoSqlExecutor;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.plugin.kudu.KuduQueryRunnerFactory.createKuduQueryRunner;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public class TestKuduIntegrationDecimalColumns
         extends AbstractTestQueryFramework
 {
@@ -46,11 +49,10 @@ public class TestKuduIntegrationDecimalColumns
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        kuduServer = new TestingKuduServer();
-        return createKuduQueryRunner(kuduServer, "decimal");
+        return createKuduQueryRunner(closeAfterClass(new TestingKuduServer()), "decimal");
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public final void destroy()
     {
         if (kuduServer != null) {
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDynamicFilter.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDynamicFilter.java
index 31ce6614458d..553fbc81a203 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDynamicFilter.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDynamicFilter.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.primitives.Ints;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.execution.QueryStats;
 import io.trino.metadata.QualifiedObjectName;
@@ -36,8 +37,8 @@
 import io.trino.transaction.TransactionId;
 import io.trino.transaction.TransactionManager;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,33 +61,22 @@
 public class TestKuduIntegrationDynamicFilter
         extends AbstractTestQueryFramework
 {
-    private TestingKuduServer kuduServer;
-
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        kuduServer = new TestingKuduServer();
         return createKuduQueryRunnerTpch(
-                kuduServer,
+                closeAfterClass(new TestingKuduServer()),
                 Optional.of(""),
                 ImmutableMap.of("dynamic_filtering_wait_timeout", "1h"),
                 ImmutableMap.of(
-                        "dynamic-filtering.small-broadcast.max-distinct-values-per-driver", "100",
-                        "dynamic-filtering.small-broadcast.range-row-limit-per-driver", "100"),
+                        "dynamic-filtering.small.max-distinct-values-per-driver", "100",
+                        "dynamic-filtering.small.range-row-limit-per-driver", "100"),
                 TpchTable.getTables());
     }
 
-    @AfterClass(alwaysRun = true)
-    public final void destroy()
-    {
-        if (kuduServer != null) {
-            kuduServer.close();
-            kuduServer = null;
-        }
-    }
-
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testIncompleteDynamicFilterTimeout()
             throws Exception
     {
@@ -101,7 +91,7 @@ public void testIncompleteDynamicFilterTimeout()
         Optional<TableHandle> tableHandle = runner.getMetadata().getTableHandle(session, tableName);
         assertTrue(tableHandle.isPresent());
         SplitSource splitSource = runner.getSplitManager()
-                .getSplits(session, tableHandle.get(), new IncompleteDynamicFilter(), alwaysTrue());
+                .getSplits(session, Span.getInvalid(), tableHandle.get(), new IncompleteDynamicFilter(), alwaysTrue());
         List<Split> splits = new ArrayList<>();
         while (!splitSource.isFinished()) {
             splits.addAll(splitSource.getNextBatch(1000).get().getSplits());
@@ -159,7 +149,7 @@ public void testJoinDynamicFilteringSingleValue()
                 "SELECT * FROM lineitem JOIN orders ON lineitem.orderkey = orders.orderkey AND orders.comment = 'nstructions sleep furiously among '",
                 withBroadcastJoin(),
                 6,
-                6, 1);
+                1);
     }
 
     @Test
@@ -173,7 +163,7 @@ public void testJoinDynamicFilteringBlockProbeSide()
                         " AND p.partkey = l.partkey AND p.comment = 'onic deposits'",
                 withBroadcastJoinNonReordering(),
                 1,
-                1, 1, 1);
+                1, 1);
     }
 
     private void assertDynamicFiltering(@Language("SQL") String selectQuery, Session session, int expectedRowCount, int... expectedOperatorRowsRead)
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationHashPartitioning.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationHashPartitioning.java
index 7b7ebecaa4bd..09db254e5513 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationHashPartitioning.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationHashPartitioning.java
@@ -17,8 +17,7 @@
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.kudu.KuduQueryRunnerFactory.createKuduQueryRunner;
 import static org.testng.Assert.assertEquals;
@@ -26,23 +25,11 @@
 public class TestKuduIntegrationHashPartitioning
         extends AbstractTestQueryFramework
 {
-    private TestingKuduServer kuduServer;
-
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        kuduServer = new TestingKuduServer();
-        return createKuduQueryRunner(kuduServer, "hash");
-    }
-
-    @AfterClass(alwaysRun = true)
-    public final void destroy()
-    {
-        if (kuduServer != null) {
-            kuduServer.close();
-            kuduServer = null;
-        }
+        return createKuduQueryRunner(closeAfterClass(new TestingKuduServer()), "hash");
     }
 
     @Test
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationIntegerColumns.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationIntegerColumns.java
index 25d2daca09b7..b44f0c130951 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationIntegerColumns.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationIntegerColumns.java
@@ -16,8 +16,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.kudu.KuduQueryRunnerFactory.createKuduQueryRunner;
 import static org.testng.Assert.assertEquals;
@@ -34,23 +33,11 @@ public class TestKuduIntegrationIntegerColumns
             new TestInt("BIGINT", 64),
     };
 
-    private TestingKuduServer kuduServer;
-
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        kuduServer = new TestingKuduServer();
-        return createKuduQueryRunner(kuduServer, "test_integer");
-    }
-
-    @AfterClass(alwaysRun = true)
-    public final void destroy()
-    {
-        if (kuduServer != null) {
-            kuduServer.close();
-            kuduServer = null;
-        }
+        return createKuduQueryRunner(closeAfterClass(new TestingKuduServer()), "test_integer");
     }
 
     @Test
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationRangePartitioning.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationRangePartitioning.java
index e08050cc5af2..4dc7ec1fd34d 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationRangePartitioning.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationRangePartitioning.java
@@ -16,8 +16,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.kudu.KuduQueryRunnerFactory.createKuduQueryRunner;
 import static java.lang.String.join;
@@ -82,23 +81,11 @@ public class TestKuduIntegrationRangePartitioning
                     "{\"lower\": [2, \"Z\"], \"upper\": null}"),
     };
 
-    private TestingKuduServer kuduServer;
-
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        kuduServer = new TestingKuduServer();
-        return createKuduQueryRunner(kuduServer, "range_partitioning");
-    }
-
-    @AfterClass(alwaysRun = true)
-    public final void destroy()
-    {
-        if (kuduServer != null) {
-            kuduServer.close();
-            kuduServer = null;
-        }
+        return createKuduQueryRunner(closeAfterClass(new TestingKuduServer()), "range_partitioning");
     }
 
     @Test
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduKerberosConfig.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduKerberosConfig.java
index 9f34d4e2a1f1..57283ba401d4 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduKerberosConfig.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduKerberosConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.ConfigurationException;
 import io.airlift.configuration.ConfigurationFactory;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -26,7 +26,7 @@
 import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
 import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
 import static java.nio.file.Files.createTempFile;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestKuduKerberosConfig
 {
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduPlugin.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduPlugin.java
index 387b29b1c216..e1163a4ac682 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduPlugin.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduPlugin.java
@@ -17,7 +17,7 @@
 import io.trino.spi.Plugin;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java
index 235c4062d1e7..0cee1c087bf3 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java
@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.kudu;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.io.Closer;
 import com.google.common.net.HostAndPort;
 import io.trino.testing.ResourcePresence;
@@ -23,12 +22,8 @@
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.net.Inet4Address;
-import java.net.InterfaceAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Enumeration;
-import java.util.List;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 import static java.lang.String.format;
 
@@ -41,7 +36,6 @@ public class TestingKuduServer
 
     private static final Integer KUDU_MASTER_PORT = 7051;
     private static final Integer KUDU_TSERVER_PORT = 7050;
-    private static final Integer NUMBER_OF_REPLICA = 3;
 
     private static final String TOXIPROXY_IMAGE = "ghcr.io/shopify/toxiproxy:2.4.0";
     private static final String TOXIPROXY_NETWORK_ALIAS = "toxiproxy";
@@ -49,7 +43,7 @@ public class TestingKuduServer
     private final Network network;
     private final ToxiproxyContainer toxiProxy;
     private final GenericContainer<?> master;
-    private final List<GenericContainer<?>> tServers;
+    private final GenericContainer<?> tabletServer;
 
     private boolean stopped;
 
@@ -67,7 +61,6 @@ public TestingKuduServer()
     public TestingKuduServer(String kuduVersion)
     {
         network = Network.newNetwork();
-        ImmutableList.Builder<GenericContainer<?>> tServersBuilder = ImmutableList.builder();
 
         String hostIP = getHostIPAddress();
 
@@ -75,6 +68,7 @@ public TestingKuduServer(String kuduVersion)
         this.master = new GenericContainer<>(format("%s:%s", KUDU_IMAGE, kuduVersion))
                 .withExposedPorts(KUDU_MASTER_PORT)
                 .withCommand("master")
+                .withEnv("MASTER_ARGS", "--default_num_replicas=1")
                 .withNetwork(network)
                 .withNetworkAliases(masterContainerAlias);
 
@@ -83,24 +77,19 @@ public TestingKuduServer(String kuduVersion)
                 .withNetworkAliases(TOXIPROXY_NETWORK_ALIAS);
         toxiProxy.start();
 
-        for (int instance = 0; instance < NUMBER_OF_REPLICA; instance++) {
-            String instanceName = "kudu-tserver-" + instance;
-            ToxiproxyContainer.ContainerProxy proxy = toxiProxy.getProxy(instanceName, KUDU_TSERVER_PORT);
-            GenericContainer<?> tableServer = new GenericContainer<>(format("%s:%s", KUDU_IMAGE, kuduVersion))
-                    .withExposedPorts(KUDU_TSERVER_PORT)
-                    .withCommand("tserver")
-                    .withEnv("KUDU_MASTERS", format("%s:%s", masterContainerAlias, KUDU_MASTER_PORT))
-                    .withEnv("TSERVER_ARGS", format("--fs_wal_dir=/var/lib/kudu/tserver --logtostderr --use_hybrid_clock=false --rpc_bind_addresses=%s:%s --rpc_advertised_addresses=%s:%s", instanceName, KUDU_TSERVER_PORT, hostIP, proxy.getProxyPort()))
-                    .withNetwork(network)
-                    .withNetworkAliases(instanceName)
-                    .dependsOn(master);
-
-            tServersBuilder.add(tableServer);
-        }
-        this.tServers = tServersBuilder.build();
-        master.start();
+        String instanceName = "kudu-tserver";
+        ToxiproxyContainer.ContainerProxy proxy = toxiProxy.getProxy(instanceName, KUDU_TSERVER_PORT);
+        tabletServer = new GenericContainer<>(format("%s:%s", KUDU_IMAGE, kuduVersion))
+                .withExposedPorts(KUDU_TSERVER_PORT)
+                .withCommand("tserver")
+                .withEnv("KUDU_MASTERS", format("%s:%s", masterContainerAlias, KUDU_MASTER_PORT))
+                .withEnv("TSERVER_ARGS", format("--fs_wal_dir=/var/lib/kudu/tserver --logtostderr --use_hybrid_clock=false --rpc_bind_addresses=%s:%s --rpc_advertised_addresses=%s:%s", instanceName, KUDU_TSERVER_PORT, hostIP, proxy.getProxyPort()))
+                .withNetwork(network)
+                .withNetworkAliases(instanceName)
+                .dependsOn(master);
 
-        tServers.forEach(GenericContainer::start);
+        master.start();
+        tabletServer.start();
     }
 
     public HostAndPort getMasterAddress()
@@ -116,7 +105,7 @@ public void close()
     {
         try (Closer closer = Closer.create()) {
             closer.register(master::stop);
-            tServers.forEach(tabletServer -> closer.register(tabletServer::stop));
+            closer.register(tabletServer::stop);
             closer.register(toxiProxy::stop);
             closer.register(network::close);
         }
@@ -134,22 +123,11 @@ public boolean isNotStopped()
 
     private static String getHostIPAddress()
     {
-        // Binding kudu's `rpc_advertised_addresses` to 127.0.0.1 inside the container will not bind to the host's loopback address
-        // As a workaround, use a site local ipv4 address from the host
-        // This is roughly equivalent to setting the KUDU_QUICKSTART_IP defined here: https://kudu.apache.org/docs/quickstart.html#_set_kudu_quickstart_ip
         try {
-            Enumeration<NetworkInterface> networkInterfaceEnumeration = NetworkInterface.getNetworkInterfaces();
-            while (networkInterfaceEnumeration.hasMoreElements()) {
-                for (InterfaceAddress interfaceAddress : networkInterfaceEnumeration.nextElement().getInterfaceAddresses()) {
-                    if (interfaceAddress.getAddress().isSiteLocalAddress() && interfaceAddress.getAddress() instanceof Inet4Address) {
-                        return interfaceAddress.getAddress().getHostAddress();
-                    }
-                }
-            }
+            return InetAddress.getLocalHost().getHostAddress();
         }
-        catch (SocketException e) {
+        catch (UnknownHostException e) {
             throw new RuntimeException(e);
         }
-        throw new IllegalStateException("Could not find site local ipv4 address, failed to launch kudu");
     }
 }
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/properties/TestRangePartitionSerialization.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/properties/TestRangePartitionSerialization.java
index 6cf9eaeb4dde..e61eeead07d7 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/properties/TestRangePartitionSerialization.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/properties/TestRangePartitionSerialization.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.kudu.properties;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/schema/TestSchemaEmulation.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/schema/TestSchemaEmulation.java
index 612d267e2bdf..96f5f07a8db3 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/schema/TestSchemaEmulation.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/schema/TestSchemaEmulation.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.kudu.schema;
 
 import io.trino.spi.connector.SchemaTableName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 
diff --git a/plugin/trino-local-file/pom.xml b/plugin/trino-local-file/pom.xml
index 4b54bd803935..6df9d6b9e00d 100644
--- a/plugin/trino-local-file/pom.xml
+++ b/plugin/trino-local-file/pom.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-local-file</artifactId>
-    <description>Trino - Local File Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Local File Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,13 +19,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -39,34 +39,39 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-spi</artifactId>
@@ -74,27 +79,26 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <artifactId>jackson-databind</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -105,8 +109,20 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileConnector.java b/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileConnector.java
index 15aa05b2d121..b0001a86fc4d 100644
--- a/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileConnector.java
+++ b/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileConnector.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.localfile;
 
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -22,8 +23,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import static io.trino.spi.transaction.IsolationLevel.READ_COMMITTED;
 import static io.trino.spi.transaction.IsolationLevel.checkConnectorSupports;
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileConnectorFactory.java b/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileConnectorFactory.java
index b3f66ba56d86..8a9d73938765 100644
--- a/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileConnectorFactory.java
+++ b/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileConnectorFactory.java
@@ -22,7 +22,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class LocalFileConnectorFactory
@@ -38,7 +38,7 @@ public String getName()
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
         requireNonNull(config, "config is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 binder -> binder.bind(NodeManager.class).toInstance(context.getNodeManager()),
diff --git a/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileMetadata.java b/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileMetadata.java
index 032fbeae7621..44eac2de4e5b 100644
--- a/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileMetadata.java
+++ b/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileMetadata.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -27,8 +28,6 @@
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileRecordSetProvider.java b/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileRecordSetProvider.java
index 85b644f19ba6..eee19c4282cd 100644
--- a/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileRecordSetProvider.java
+++ b/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileRecordSetProvider.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.localfile;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
 import io.trino.spi.connector.ConnectorSession;
@@ -22,8 +23,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.RecordSet;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileSplitManager.java b/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileSplitManager.java
index e40a6efb698c..0e4c7f95d76b 100644
--- a/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileSplitManager.java
+++ b/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileSplitManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.localfile;
 
+import com.google.inject.Inject;
 import io.trino.spi.NodeManager;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplit;
@@ -24,8 +25,6 @@
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.FixedSplitSource;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileTables.java b/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileTables.java
index 7bd48c98d596..1d6a4cd72500 100644
--- a/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileTables.java
+++ b/plugin/trino-local-file/src/main/java/io/trino/plugin/localfile/LocalFileTables.java
@@ -18,13 +18,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.UncheckedExecutionException;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import com.google.inject.Inject;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.SchemaTableName;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.util.List;
 import java.util.Map;
@@ -33,7 +32,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Throwables.throwIfInstanceOf;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.plugin.localfile.LocalFileMetadata.PRESTO_LOGS_SCHEMA;
 import static io.trino.plugin.localfile.LocalFileMetadata.SERVER_ADDRESS_COLUMN;
 import static io.trino.plugin.localfile.LocalFileTables.HttpRequestLogTable.getSchemaTableName;
diff --git a/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileColumnHandle.java b/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileColumnHandle.java
index 70a7a65e8d08..2de5831afa8b 100644
--- a/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileColumnHandle.java
+++ b/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileColumnHandle.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.localfile;
 
 import com.google.common.collect.ImmutableList;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -25,7 +25,7 @@
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestLocalFileColumnHandle
 {
@@ -43,7 +43,7 @@ public void testJsonRoundTrip()
         for (LocalFileColumnHandle handle : columnHandle) {
             String json = COLUMN_CODEC.toJson(handle);
             LocalFileColumnHandle copy = COLUMN_CODEC.fromJson(json);
-            assertEquals(copy, handle);
+            assertThat(copy).isEqualTo(handle);
         }
     }
 }
diff --git a/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileConfig.java b/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileConfig.java
index 93eefbe207d7..792dffabbd67 100644
--- a/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileConfig.java
+++ b/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.localfile;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileRecordSet.java b/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileRecordSet.java
index 9cf5e8342d4e..58ff93bbd586 100644
--- a/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileRecordSet.java
+++ b/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileRecordSet.java
@@ -16,7 +16,7 @@
 import io.trino.spi.HostAddress;
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.RecordSet;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.OptionalInt;
@@ -24,8 +24,7 @@
 
 import static io.trino.plugin.localfile.LocalFileTables.HttpRequestLogTable.getSchemaTableName;
 import static io.trino.testing.TestingConnectorSession.SESSION;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestLocalFileRecordSet
 {
@@ -63,35 +62,35 @@ private static void assertData(LocalFileTables localFileTables, LocalFileMetadat
         RecordCursor cursor = recordSet.cursor();
 
         for (int i = 0; i < columnHandles.size(); i++) {
-            assertEquals(cursor.getType(i), columnHandles.get(i).getColumnType());
+            assertThat(cursor.getType(i)).isEqualTo(columnHandles.get(i).getColumnType());
         }
 
         // test one row
-        assertTrue(cursor.advanceNextPosition());
-        assertEquals(cursor.getSlice(0).toStringUtf8(), address.toString());
-        assertEquals(cursor.getSlice(2).toStringUtf8(), "127.0.0.1");
-        assertEquals(cursor.getSlice(3).toStringUtf8(), "POST");
-        assertEquals(cursor.getSlice(4).toStringUtf8(), "/v1/memory");
-        assertTrue(cursor.isNull(5));
-        assertTrue(cursor.isNull(6));
-        assertEquals(cursor.getLong(7), 200);
-        assertEquals(cursor.getLong(8), 0);
-        assertEquals(cursor.getLong(9), 1000);
-        assertEquals(cursor.getLong(10), 10);
-        assertTrue(cursor.isNull(11));
+        assertThat(cursor.advanceNextPosition()).isTrue();
+        assertThat(cursor.getSlice(0).toStringUtf8()).isEqualTo(address.toString());
+        assertThat(cursor.getSlice(2).toStringUtf8()).isEqualTo("127.0.0.1");
+        assertThat(cursor.getSlice(3).toStringUtf8()).isEqualTo("POST");
+        assertThat(cursor.getSlice(4).toStringUtf8()).isEqualTo("/v1/memory");
+        assertThat(cursor.isNull(5)).isTrue();
+        assertThat(cursor.isNull(6)).isTrue();
+        assertThat(cursor.getLong(7)).isEqualTo(200);
+        assertThat(cursor.getLong(8)).isEqualTo(0);
+        assertThat(cursor.getLong(9)).isEqualTo(1000);
+        assertThat(cursor.getLong(10)).isEqualTo(10);
+        assertThat(cursor.isNull(11)).isTrue();
 
-        assertTrue(cursor.advanceNextPosition());
-        assertEquals(cursor.getSlice(0).toStringUtf8(), address.toString());
-        assertEquals(cursor.getSlice(2).toStringUtf8(), "127.0.0.1");
-        assertEquals(cursor.getSlice(3).toStringUtf8(), "GET");
-        assertEquals(cursor.getSlice(4).toStringUtf8(), "/v1/service/presto/general");
-        assertEquals(cursor.getSlice(5).toStringUtf8(), "foo");
-        assertEquals(cursor.getSlice(6).toStringUtf8(), "ffffffff-ffff-ffff-ffff-ffffffffffff");
-        assertEquals(cursor.getLong(7), 200);
-        assertEquals(cursor.getLong(8), 0);
-        assertEquals(cursor.getLong(9), 37);
-        assertEquals(cursor.getLong(10), 1094);
-        assertEquals(cursor.getSlice(11).toStringUtf8(), "a7229d56-5cbd-4e23-81ff-312ba6be0f12");
+        assertThat(cursor.advanceNextPosition()).isTrue();
+        assertThat(cursor.getSlice(0).toStringUtf8()).isEqualTo(address.toString());
+        assertThat(cursor.getSlice(2).toStringUtf8()).isEqualTo("127.0.0.1");
+        assertThat(cursor.getSlice(3).toStringUtf8()).isEqualTo("GET");
+        assertThat(cursor.getSlice(4).toStringUtf8()).isEqualTo("/v1/service/presto/general");
+        assertThat(cursor.getSlice(5).toStringUtf8()).isEqualTo("foo");
+        assertThat(cursor.getSlice(6).toStringUtf8()).isEqualTo("ffffffff-ffff-ffff-ffff-ffffffffffff");
+        assertThat(cursor.getLong(7)).isEqualTo(200);
+        assertThat(cursor.getLong(8)).isEqualTo(0);
+        assertThat(cursor.getLong(9)).isEqualTo(37);
+        assertThat(cursor.getLong(10)).isEqualTo(1094);
+        assertThat(cursor.getSlice(11).toStringUtf8()).isEqualTo("a7229d56-5cbd-4e23-81ff-312ba6be0f12");
     }
 
     private String getResourceFilePath(String fileName)
diff --git a/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileSplit.java b/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileSplit.java
index 47d1129e2ab0..246b6e778b58 100644
--- a/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileSplit.java
+++ b/plugin/trino-local-file/src/test/java/io/trino/plugin/localfile/TestLocalFileSplit.java
@@ -16,10 +16,10 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.json.JsonCodec;
 import io.trino.spi.HostAddress;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.json.JsonCodec.jsonCodec;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestLocalFileSplit
 {
@@ -33,9 +33,9 @@ public void testJsonRoundTrip()
         String json = codec.toJson(split);
         LocalFileSplit copy = codec.fromJson(json);
 
-        assertEquals(copy.getAddress(), split.getAddress());
+        assertThat(copy.getAddress()).isEqualTo(split.getAddress());
 
-        assertEquals(copy.getAddresses(), ImmutableList.of(address));
-        assertEquals(copy.isRemotelyAccessible(), false);
+        assertThat(copy.getAddresses()).isEqualTo(ImmutableList.of(address));
+        assertThat(copy.isRemotelyAccessible()).isEqualTo(false);
     }
 }
diff --git a/plugin/trino-mariadb/pom.xml b/plugin/trino-mariadb/pom.xml
index 24560d512809..bc4c7da00cae 100644
--- a/plugin/trino-mariadb/pom.xml
+++ b/plugin/trino-mariadb/pom.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-mariadb</artifactId>
-    <description>Trino - MariaDB Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - MariaDB Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,13 +19,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-base-jdbc</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -34,23 +34,28 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-base-jdbc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>org.jdbi</groupId>
+            <artifactId>jdbi3-core</artifactId>
         </dependency>
 
         <dependency>
@@ -58,35 +63,33 @@
             <artifactId>mariadb-java-client</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -96,7 +99,24 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -117,6 +137,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
@@ -141,12 +168,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -159,6 +180,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>mariadb</artifactId>
@@ -177,4 +204,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClient.java b/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClient.java
index 305014759caf..23dbb45e3310 100644
--- a/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClient.java
+++ b/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClient.java
@@ -13,10 +13,14 @@
  */
 package io.trino.plugin.mariadb;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import io.airlift.log.Logger;
 import io.trino.plugin.base.aggregation.AggregateFunctionRewriter;
 import io.trino.plugin.base.aggregation.AggregateFunctionRule;
 import io.trino.plugin.base.expression.ConnectorExpressionRewriter;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcClient;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ColumnMapping;
@@ -25,6 +29,7 @@
 import io.trino.plugin.jdbc.JdbcExpression;
 import io.trino.plugin.jdbc.JdbcJoinCondition;
 import io.trino.plugin.jdbc.JdbcSortItem;
+import io.trino.plugin.jdbc.JdbcStatisticsConfig;
 import io.trino.plugin.jdbc.JdbcTableHandle;
 import io.trino.plugin.jdbc.JdbcTypeHandle;
 import io.trino.plugin.jdbc.LongWriteFunction;
@@ -45,7 +50,6 @@
 import io.trino.plugin.jdbc.expression.JdbcConnectorExpressionRewriterBuilder;
 import io.trino.plugin.jdbc.expression.ParameterizedExpression;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
@@ -55,6 +59,9 @@
 import io.trino.spi.connector.JoinStatistics;
 import io.trino.spi.connector.JoinType;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.statistics.ColumnStatistics;
+import io.trino.spi.statistics.Estimate;
+import io.trino.spi.statistics.TableStatistics;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Decimals;
@@ -62,8 +69,8 @@
 import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
-
-import javax.inject.Inject;
+import org.jdbi.v3.core.Handle;
+import org.jdbi.v3.core.Jdbi;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -76,13 +83,18 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.stream.Stream;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.emptyToNull;
+import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static io.trino.plugin.jdbc.DecimalConfig.DecimalMapping.ALLOW_OVERFLOW;
 import static io.trino.plugin.jdbc.DecimalSessionSessionProperties.getDecimalDefaultScale;
 import static io.trino.plugin.jdbc.DecimalSessionSessionProperties.getDecimalRounding;
@@ -120,6 +132,7 @@
 import static io.trino.plugin.jdbc.TypeHandlingJdbcSessionProperties.getUnsupportedTypeHandling;
 import static io.trino.plugin.jdbc.UnsupportedTypeHandling.CONVERT_TO_VARCHAR;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_EMPTY;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DateType.DATE;
@@ -137,12 +150,15 @@
 import static java.lang.Math.min;
 import static java.lang.String.format;
 import static java.lang.String.join;
+import static java.util.Map.entry;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
 
 public class MariaDbClient
         extends BaseJdbcClient
 {
+    private static final Logger log = Logger.get(MariaDbClient.class);
+
     private static final int MAX_SUPPORTED_DATE_TIME_PRECISION = 6;
     // MariaDB driver returns width of time types instead of precision.
     private static final int ZERO_PRECISION_TIME_COLUMN_SIZE = 10;
@@ -156,10 +172,17 @@ public class MariaDbClient
     // MariaDB Error Codes https://mariadb.com/kb/en/mariadb-error-codes/
     private static final int PARSE_ERROR = 1064;
 
+    private final boolean statisticsEnabled;
     private final AggregateFunctionRewriter<JdbcExpression, ?> aggregateFunctionRewriter;
 
     @Inject
-    public MariaDbClient(BaseJdbcConfig config, ConnectionFactory connectionFactory, QueryBuilder queryBuilder, IdentifierMapping identifierMapping, RemoteQueryModifier queryModifier)
+    public MariaDbClient(
+            BaseJdbcConfig config,
+            JdbcStatisticsConfig statisticsConfig,
+            ConnectionFactory connectionFactory,
+            QueryBuilder queryBuilder,
+            IdentifierMapping identifierMapping,
+            RemoteQueryModifier queryModifier)
     {
         super("`", connectionFactory, queryBuilder, config.getJdbcTypesMappedToVarchar(), identifierMapping, queryModifier, false);
 
@@ -167,6 +190,7 @@ public MariaDbClient(BaseJdbcConfig config, ConnectionFactory connectionFactory,
         ConnectorExpressionRewriter<ParameterizedExpression> connectorExpressionRewriter = JdbcConnectorExpressionRewriterBuilder.newBuilder()
                 .addStandardRules(this::quoted)
                 .build();
+        this.statisticsEnabled = statisticsConfig.isEnabled();
         this.aggregateFunctionRewriter = new AggregateFunctionRewriter<>(
                 connectorExpressionRewriter,
                 ImmutableSet.<AggregateFunctionRule<JdbcExpression, ParameterizedExpression>>builder()
@@ -239,6 +263,21 @@ public void renameSchema(ConnectorSession session, String schemaName, String new
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support renaming schemas");
     }
 
+    @Override
+    protected void dropSchema(ConnectorSession session, Connection connection, String remoteSchemaName, boolean cascade)
+            throws SQLException
+    {
+        // MariaDB always deletes all tables inside the database https://mariadb.com/kb/en/drop-database/
+        if (!cascade) {
+            try (ResultSet tables = getTables(connection, Optional.of(remoteSchemaName), Optional.empty())) {
+                if (tables.next()) {
+                    throw new TrinoException(SCHEMA_NOT_EMPTY, "Cannot drop non-empty schema '%s'".formatted(remoteSchemaName));
+                }
+            }
+        }
+        execute(session, connection, "DROP SCHEMA " + quoted(remoteSchemaName));
+    }
+
     @Override
     public ResultSet getTables(Connection connection, Optional<String> schemaName, Optional<String> tableName)
             throws SQLException
@@ -608,6 +647,102 @@ protected boolean isSupportedJoinCondition(ConnectorSession session, JdbcJoinCon
                 .noneMatch(type -> type instanceof CharType || type instanceof VarcharType);
     }
 
+    @Override
+    public TableStatistics getTableStatistics(ConnectorSession session, JdbcTableHandle handle)
+    {
+        if (!statisticsEnabled) {
+            return TableStatistics.empty();
+        }
+        if (!handle.isNamedRelation()) {
+            return TableStatistics.empty();
+        }
+        try {
+            return readTableStatistics(session, handle);
+        }
+        catch (SQLException | RuntimeException e) {
+            throwIfInstanceOf(e, TrinoException.class);
+            throw new TrinoException(JDBC_ERROR, "Failed fetching statistics for table: " + handle, e);
+        }
+    }
+
+    private TableStatistics readTableStatistics(ConnectorSession session, JdbcTableHandle table)
+            throws SQLException
+    {
+        checkArgument(table.isNamedRelation(), "Relation is not a table: %s", table);
+
+        log.debug("Reading statistics for %s", table);
+        try (Connection connection = connectionFactory.openConnection(session);
+                Handle handle = Jdbi.open(connection)) {
+            StatisticsDao statisticsDao = new StatisticsDao(handle);
+
+            Long rowCount = statisticsDao.getTableRowCount(table);
+            Long indexMaxCardinality = statisticsDao.getTableMaxColumnIndexCardinality(table);
+            log.debug("Estimated row count of table %s is %s, and max index cardinality is %s", table, rowCount, indexMaxCardinality);
+
+            if (rowCount != null && rowCount == 0) {
+                // MariaDB may report 0 row count until a table is analyzed for the first time.
+                rowCount = null;
+            }
+
+            if (rowCount == null && indexMaxCardinality == null) {
+                // Table not found, or is a view, or has no usable statistics
+                return TableStatistics.empty();
+            }
+            rowCount = max(firstNonNull(rowCount, 0L), firstNonNull(indexMaxCardinality, 0L));
+
+            TableStatistics.Builder tableStatistics = TableStatistics.builder();
+            tableStatistics.setRowCount(Estimate.of(rowCount));
+
+            // TODO statistics from ANALYZE TABLE (https://mariadb.com/kb/en/engine-independent-table-statistics/)
+            // Map<String, AnalyzeColumnStatistics> columnStatistics = statisticsDao.getColumnStatistics(table);
+            Map<String, AnalyzeColumnStatistics> columnStatistics = ImmutableMap.of();
+
+            // TODO add support for histograms https://mariadb.com/kb/en/histogram-based-statistics/
+
+            // statistics based on existing indexes
+            Map<String, ColumnIndexStatistics> columnStatisticsFromIndexes = statisticsDao.getColumnIndexStatistics(table);
+
+            if (columnStatistics.isEmpty() && columnStatisticsFromIndexes.isEmpty()) {
+                log.debug("No column and index statistics read");
+                // No more information to work on
+                return tableStatistics.build();
+            }
+
+            for (JdbcColumnHandle column : getColumns(session, table)) {
+                ColumnStatistics.Builder columnStatisticsBuilder = ColumnStatistics.builder();
+
+                String columnName = column.getColumnName();
+                AnalyzeColumnStatistics analyzeColumnStatistics = columnStatistics.get(columnName);
+                if (analyzeColumnStatistics != null) {
+                    log.debug("Reading column statistics for %s, %s from analayze's column statistics: %s", table, columnName, analyzeColumnStatistics);
+                    columnStatisticsBuilder.setNullsFraction(Estimate.of(analyzeColumnStatistics.nullsRatio()));
+                }
+
+                ColumnIndexStatistics columnIndexStatistics = columnStatisticsFromIndexes.get(columnName);
+                if (columnIndexStatistics != null) {
+                    log.debug("Reading column statistics for %s, %s from index statistics: %s", table, columnName, columnIndexStatistics);
+                    columnStatisticsBuilder.setDistinctValuesCount(Estimate.of(columnIndexStatistics.cardinality()));
+
+                    if (!columnIndexStatistics.nullable()) {
+                        double knownNullFraction = columnStatisticsBuilder.build().getNullsFraction().getValue();
+                        if (knownNullFraction > 0) {
+                            log.warn("Inconsistent statistics, null fraction for a column %s, %s, that is not nullable according to index statistics: %s", table, columnName, knownNullFraction);
+                        }
+                        columnStatisticsBuilder.setNullsFraction(Estimate.zero());
+                    }
+
+                    // row count from INFORMATION_SCHEMA.TABLES may be very inaccurate
+                    rowCount = max(rowCount, columnIndexStatistics.cardinality());
+                }
+
+                tableStatistics.setColumnStatistics(column, columnStatisticsBuilder.build());
+            }
+
+            tableStatistics.setRowCount(Estimate.of(rowCount));
+            return tableStatistics.build();
+        }
+    }
+
     private static LongWriteFunction dateWriteFunction()
     {
         return (statement, index, day) -> statement.setString(index, DATE_FORMATTER.format(LocalDate.ofEpochDay(day)));
@@ -635,4 +770,101 @@ private static Optional<ColumnMapping> getUnsignedMapping(JdbcTypeHandle typeHan
 
         return Optional.empty();
     }
+
+    private static class StatisticsDao
+    {
+        private final Handle handle;
+
+        public StatisticsDao(Handle handle)
+        {
+            this.handle = requireNonNull(handle, "handle is null");
+        }
+
+        Long getTableRowCount(JdbcTableHandle table)
+        {
+            RemoteTableName remoteTableName = table.getRequiredNamedRelation().getRemoteTableName();
+            return handle.createQuery("""
+                        SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES
+                        WHERE TABLE_SCHEMA = :schema AND TABLE_NAME = :table_name
+                        AND TABLE_TYPE = 'BASE TABLE'
+                        """)
+                    .bind("schema", remoteTableName.getCatalogName().orElse(null))
+                    .bind("table_name", remoteTableName.getTableName())
+                    .mapTo(Long.class)
+                    .findOne()
+                    .orElse(null);
+        }
+
+        Long getTableMaxColumnIndexCardinality(JdbcTableHandle table)
+        {
+            RemoteTableName remoteTableName = table.getRequiredNamedRelation().getRemoteTableName();
+            return handle.createQuery("""
+                        SELECT max(CARDINALITY) AS row_count FROM INFORMATION_SCHEMA.STATISTICS
+                        WHERE TABLE_SCHEMA = :schema AND TABLE_NAME = :table_name
+                        """)
+                    .bind("schema", remoteTableName.getCatalogName().orElse(null))
+                    .bind("table_name", remoteTableName.getTableName())
+                    .mapTo(Long.class)
+                    .findOne()
+                    .orElse(null);
+        }
+
+        Map<String, AnalyzeColumnStatistics> getColumnStatistics(JdbcTableHandle table)
+        {
+            RemoteTableName remoteTableName = table.getRequiredNamedRelation().getRemoteTableName();
+            return handle.createQuery("""
+                                SELECT
+                                    column_name,
+                                    -- TODO min_value, max_value,
+                                    nulls_ratio
+                                FROM mysql.column_stats
+                                WHERE db_name = :database AND TABLE_NAME = :table_name
+                                AND nulls_ratio IS NOT NULL
+                            """)
+                    .bind("database", remoteTableName.getCatalogName().orElse(null))
+                    .bind("table_name", remoteTableName.getTableName())
+                    .map((rs, ctx) -> {
+                        String columnName = rs.getString("column_name");
+                        double nullsRatio = rs.getDouble("nulls_ratio");
+                        return entry(columnName, new AnalyzeColumnStatistics(nullsRatio));
+                    })
+                    .collect(toImmutableMap(Entry::getKey, Entry::getValue));
+        }
+
+        Map<String, ColumnIndexStatistics> getColumnIndexStatistics(JdbcTableHandle table)
+        {
+            RemoteTableName remoteTableName = table.getRequiredNamedRelation().getRemoteTableName();
+            return handle.createQuery("""
+                                SELECT
+                                    COLUMN_NAME,
+                                    MAX(NULLABLE) AS NULLABLE,
+                                    MAX(CARDINALITY) AS CARDINALITY
+                                FROM INFORMATION_SCHEMA.STATISTICS
+                                WHERE TABLE_SCHEMA = :schema AND TABLE_NAME = :table_name
+                                AND SEQ_IN_INDEX = 1 -- first column in the index
+                                AND SUB_PART IS NULL -- ignore cases where only a column prefix is indexed
+                                AND CARDINALITY IS NOT NULL -- CARDINALITY might be null (https://stackoverflow.com/a/42242729/65458)
+                                AND CARDINALITY != 0 -- CARDINALITY is initially 0 until analyzed
+                                GROUP BY COLUMN_NAME -- there might be multiple indexes on a column
+                            """)
+                    .bind("schema", remoteTableName.getCatalogName().orElse(null))
+                    .bind("table_name", remoteTableName.getTableName())
+                    .map((rs, ctx) -> {
+                        String columnName = rs.getString("COLUMN_NAME");
+
+                        boolean nullable = rs.getString("NULLABLE").equalsIgnoreCase("YES");
+                        checkState(!rs.wasNull(), "NULLABLE is null");
+
+                        long cardinality = rs.getLong("CARDINALITY");
+                        checkState(!rs.wasNull(), "CARDINALITY is null");
+
+                        return entry(columnName, new ColumnIndexStatistics(nullable, cardinality));
+                    })
+                    .collect(toImmutableMap(Entry::getKey, Entry::getValue));
+        }
+    }
+
+    private record AnalyzeColumnStatistics(double nullsRatio) {}
+
+    private record ColumnIndexStatistics(boolean nullable, long cardinality) {}
 }
diff --git a/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClientModule.java b/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClientModule.java
index 4f0df3e3cd63..e06913b26e39 100644
--- a/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClientModule.java
+++ b/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClientModule.java
@@ -18,15 +18,17 @@
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DecimalModule;
 import io.trino.plugin.jdbc.DriverConnectionFactory;
 import io.trino.plugin.jdbc.ForBaseJdbc;
 import io.trino.plugin.jdbc.JdbcClient;
+import io.trino.plugin.jdbc.JdbcStatisticsConfig;
 import io.trino.plugin.jdbc.credential.CredentialProvider;
 import io.trino.plugin.jdbc.ptf.Query;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import org.mariadb.jdbc.Driver;
 
 import java.util.Properties;
@@ -42,6 +44,7 @@ public void configure(Binder binder)
     {
         binder.bind(JdbcClient.class).annotatedWith(ForBaseJdbc.class).to(MariaDbClient.class).in(Scopes.SINGLETON);
         configBinder(binder).bindConfig(MariaDbJdbcConfig.class);
+        configBinder(binder).bindConfig(JdbcStatisticsConfig.class);
         binder.install(new DecimalModule());
         newSetBinder(binder, ConnectorTableFunction.class).addBinding().toProvider(Query.class).in(Scopes.SINGLETON);
     }
@@ -49,9 +52,9 @@ public void configure(Binder binder)
     @Provides
     @Singleton
     @ForBaseJdbc
-    public static ConnectionFactory createConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider)
+    public static ConnectionFactory createConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider, OpenTelemetry openTelemetry)
     {
-        return new DriverConnectionFactory(new Driver(), config.getConnectionUrl(), getConnectionProperties(), credentialProvider);
+        return new DriverConnectionFactory(new Driver(), config.getConnectionUrl(), getConnectionProperties(), credentialProvider, openTelemetry);
     }
 
     private static Properties getConnectionProperties()
diff --git a/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbJdbcConfig.java b/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbJdbcConfig.java
index 42dba88495f2..0ab5b4956ef3 100644
--- a/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbJdbcConfig.java
+++ b/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbJdbcConfig.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.mariadb;
 
 import io.trino.plugin.jdbc.BaseJdbcConfig;
+import jakarta.validation.constraints.AssertTrue;
 import org.mariadb.jdbc.Configuration;
 import org.mariadb.jdbc.Driver;
 
-import javax.validation.constraints.AssertTrue;
-
 import java.sql.SQLException;
 
 public class MariaDbJdbcConfig
diff --git a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbConnectorTest.java b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbConnectorTest.java
index 2d2b6d4996b0..d2ed5a68ed43 100644
--- a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbConnectorTest.java
+++ b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbConnectorTest.java
@@ -37,46 +37,29 @@ public abstract class BaseMariaDbConnectorTest
 {
     protected TestingMariaDbServer server;
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY:
-            case SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY:
-                return false;
-
-            case SUPPORTS_AGGREGATION_PUSHDOWN_STDDEV:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_VARIANCE:
-                return true;
-
-            case SUPPORTS_JOIN_PUSHDOWN:
-                return true;
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN:
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM:
-                return false;
-
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN_WITH_COMMENT:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-            case SUPPORTS_NEGATIVE_DATE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_JOIN_PUSHDOWN -> true;
+            case SUPPORTS_ADD_COLUMN_WITH_COMMENT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_CORRELATION,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_COVARIANCE,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_REGRESSION,
+                    SUPPORTS_ARRAY,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN,
+                    SUPPORTS_NEGATIVE_DATE,
+                    SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY,
+                    SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -101,7 +84,7 @@ protected TestTable createTableWithUnsupportedColumn()
                 "(one bigint, two decimal(50,0), three varchar(10))");
     }
 
-    @Test
+    @org.junit.jupiter.api.Test
     @Override
     public void testShowColumns()
     {
@@ -198,6 +181,25 @@ public void testColumnComment()
         assertUpdate("DROP TABLE test_column_comment");
     }
 
+    @Override
+    public void testAddNotNullColumn()
+    {
+        assertThatThrownBy(super::testAddNotNullColumn)
+                .isInstanceOf(AssertionError.class)
+                .hasMessage("Should fail to add not null column without a default value to a non-empty table");
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_nn_col", "(a_varchar varchar)")) {
+            String tableName = table.getName();
+
+            assertUpdate("INSERT INTO " + tableName + " VALUES ('a')", 1);
+            assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN b_varchar varchar NOT NULL");
+            assertThat(query("TABLE " + tableName))
+                    .skippingTypesCheck()
+                    // MariaDB adds implicit default value of '' for b_varchar
+                    .matches("VALUES ('a', '')");
+        }
+    }
+
     @Test
     public void testPredicatePushdown()
     {
@@ -313,19 +315,19 @@ public void testNativeQueryInsertStatementTableExists()
     @Override
     protected String errorMessageForCreateTableAsSelectNegativeDate(String date)
     {
-        return format("Failed to insert data: .* \\(conn=.*\\) Incorrect date value: '%s'.*", date);
+        return format("Failed to insert data: \\(conn=.*\\) Incorrect date value: '%s'.*", date);
     }
 
     @Override
     protected String errorMessageForInsertNegativeDate(String date)
     {
-        return format("Failed to insert data: .* \\(conn=.*\\) Incorrect date value: '%s'.*", date);
+        return format("Failed to insert data: \\(conn=.*\\) Incorrect date value: '%s'.*", date);
     }
 
     @Override
     protected String errorMessageForInsertIntoNotNullColumn(String columnName)
     {
-        return format("Failed to insert data: .* \\(conn=.*\\) Field '%s' doesn't have a default value", columnName);
+        return format("Failed to insert data: \\(conn=.*\\) Field '%s' doesn't have a default value", columnName);
     }
 
     @Override
diff --git a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbTableIndexStatisticsTest.java b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbTableIndexStatisticsTest.java
new file mode 100644
index 000000000000..044fa3e281e3
--- /dev/null
+++ b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbTableIndexStatisticsTest.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed 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 io.trino.plugin.mariadb;
+
+import io.trino.testing.MaterializedRow;
+import org.junit.jupiter.api.Test;
+
+import static java.lang.String.format;
+import static org.junit.jupiter.api.Assumptions.abort;
+
+public abstract class BaseMariaDbTableIndexStatisticsTest
+        extends BaseMariaDbTableStatisticsTest
+{
+    protected BaseMariaDbTableIndexStatisticsTest(String dockerImageName)
+    {
+        super(
+                dockerImageName,
+                nullFraction -> 0.1, // Without mysql.column_stats we have no way of knowing real null fraction, 10% is just a "wild guess"
+                varcharNdv -> null); // Without mysql.column_stats we don't know cardinality for varchar columns
+    }
+
+    @Override
+    protected void gatherStats(String tableName)
+    {
+        for (MaterializedRow row : computeActual("SHOW COLUMNS FROM " + tableName)) {
+            String columnName = (String) row.getField(0);
+            String columnType = (String) row.getField(1);
+            if (columnType.startsWith("varchar")) {
+                continue;
+            }
+            executeInMariaDb(format("CREATE INDEX %2$s ON %1$s (%2$s)", tableName, columnName).replace("\"", "`"));
+        }
+        executeInMariaDb("ANALYZE TABLE " + tableName.replace("\"", "`"));
+    }
+
+    @Test
+    @Override
+    public void testStatsWithPredicatePushdownWithStatsPrecalculationDisabled()
+    {
+        // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MariaDB, with permissive approximate assertions
+        abort("Test to be implemented");
+    }
+
+    @Test
+    @Override
+    public void testStatsWithPredicatePushdown()
+    {
+        // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MariaDB, with permissive approximate assertions
+        abort("Test to be implemented");
+    }
+
+    @Test
+    @Override
+    public void testStatsWithVarcharPredicatePushdown()
+    {
+        // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MariaDB, with permissive approximate assertions
+        abort("Test to be implemented");
+    }
+
+    @Test
+    @Override
+    public void testStatsWithLimitPushdown()
+    {
+        // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MariaDB, with permissive approximate assertions
+        abort("Test to be implemented");
+    }
+
+    @Test
+    @Override
+    public void testStatsWithTopNPushdown()
+    {
+        // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MariaDB, with permissive approximate assertions
+        abort("Test to be implemented");
+    }
+
+    @Test
+    @Override
+    public void testStatsWithDistinctPushdown()
+    {
+        // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MariaDB, with permissive approximate assertions
+        abort("Test to be implemented");
+    }
+
+    @Test
+    @Override
+    public void testStatsWithDistinctLimitPushdown()
+    {
+        // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MariaDB, with permissive approximate assertions
+        abort("Test to be implemented");
+    }
+
+    @Test
+    @Override
+    public void testStatsWithAggregationPushdown()
+    {
+        // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MariaDB, with permissive approximate assertions
+        abort("Test to be implemented");
+    }
+
+    @Test
+    @Override
+    public void testStatsWithSimpleJoinPushdown()
+    {
+        // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MariaDB, with permissive approximate assertions
+        abort("Test to be implemented");
+    }
+
+    @Test
+    @Override
+    public void testStatsWithJoinPushdown()
+    {
+        // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MariaDB, with permissive approximate assertions
+        abort("Test to be implemented");
+    }
+}
diff --git a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbTableStatisticsTest.java b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbTableStatisticsTest.java
new file mode 100644
index 000000000000..5078044ce4fb
--- /dev/null
+++ b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbTableStatisticsTest.java
@@ -0,0 +1,442 @@
+/*
+ * Licensed 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 io.trino.plugin.mariadb;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.jdbc.BaseJdbcTableStatisticsTest;
+import io.trino.testing.MaterializedResult;
+import io.trino.testing.MaterializedRow;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.sql.TestTable;
+import org.assertj.core.api.AbstractDoubleAssert;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verify;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Streams.stream;
+import static io.trino.plugin.mariadb.MariaDbQueryRunner.createMariaDbQueryRunner;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.sql.TestTable.fromColumns;
+import static io.trino.tpch.TpchTable.ORDERS;
+import static java.lang.Math.min;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.withinPercentage;
+import static org.junit.jupiter.api.Assumptions.abort;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+
+public abstract class BaseMariaDbTableStatisticsTest
+        extends BaseJdbcTableStatisticsTest
+{
+    protected final String dockerImageName;
+    protected final Function<Double, Double> nullFractionToExpected;
+    protected final Function<Integer, Integer> varcharNdvToExpected;
+    protected TestingMariaDbServer mariaDbServer;
+
+    protected BaseMariaDbTableStatisticsTest(
+            String dockerImageName,
+            Function<Double, Double> nullFractionToExpected,
+            Function<Integer, Integer> varcharNdvToExpected)
+    {
+        this.dockerImageName = requireNonNull(dockerImageName, "dockerImageName is null");
+        this.nullFractionToExpected = requireNonNull(nullFractionToExpected, "nullFractionToExpected is null");
+        this.varcharNdvToExpected = requireNonNull(varcharNdvToExpected, "varcharNdvToExpected is null");
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        mariaDbServer = closeAfterClass(new TestingMariaDbServer(dockerImageName));
+
+        return createMariaDbQueryRunner(
+                mariaDbServer,
+                Map.of(),
+                Map.of("case-insensitive-name-matching", "true"),
+                List.of(ORDERS));
+    }
+
+    @Test
+    @Override
+    public void testNotAnalyzed()
+    {
+        String tableName = "test_not_analyzed_" + randomNameSuffix();
+        computeActual(format("CREATE TABLE %s AS SELECT * FROM tpch.tiny.orders", tableName));
+        try {
+            MaterializedResult statsResult = computeActual("SHOW STATS FOR " + tableName);
+            Double cardinality = getTableCardinalityFromStats(statsResult);
+
+            if (cardinality != null) {
+                // TABLE_ROWS in INFORMATION_SCHEMA.TABLES can be estimated as a very small number
+                assertThat(cardinality).isBetween(1d, 15000 * 1.5);
+            }
+
+            assertColumnStats(statsResult, new MapBuilder<String, Integer>()
+                    .put("orderkey", null)
+                    .put("custkey", null)
+                    .put("orderstatus", null)
+                    .put("totalprice", null)
+                    .put("orderdate", null)
+                    .put("orderpriority", null)
+                    .put("clerk", null)
+                    .put("shippriority", null)
+                    .put("comment", null)
+                    .build());
+        }
+        finally {
+            assertUpdate("DROP TABLE " + tableName);
+        }
+    }
+
+    @Test
+    @Override
+    public void testBasic()
+    {
+        String tableName = "test_stats_orders_" + randomNameSuffix();
+        computeActual(format("CREATE TABLE %s AS SELECT * FROM tpch.tiny.orders", tableName));
+        try {
+            gatherStats(tableName);
+            MaterializedResult statsResult = computeActual("SHOW STATS FOR " + tableName);
+            assertColumnStats(statsResult, new MapBuilder<String, Integer>()
+                    .put("orderkey", 15000)
+                    .put("custkey", 1000)
+                    .put("orderstatus", varcharNdvToExpected.apply(3))
+                    .put("totalprice", 14996)
+                    .put("orderdate", 2401)
+                    .put("orderpriority", varcharNdvToExpected.apply(5))
+                    .put("clerk", varcharNdvToExpected.apply(1000))
+                    .put("shippriority", 1)
+                    .put("comment", varcharNdvToExpected.apply(14995))
+                    .build());
+            assertThat(getTableCardinalityFromStats(statsResult)).isCloseTo(15000, withinPercentage(20));
+        }
+        finally {
+            assertUpdate("DROP TABLE " + tableName);
+        }
+    }
+
+    @Test
+    @Override
+    public void testAllNulls()
+    {
+        String tableName = "test_stats_table_all_nulls_" + randomNameSuffix();
+        computeActual(format("CREATE TABLE %s AS SELECT orderkey, custkey, orderpriority, comment FROM tpch.tiny.orders WHERE false", tableName));
+        try {
+            computeActual(format("INSERT INTO %s (orderkey) VALUES NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL", tableName));
+            gatherStats(tableName);
+            MaterializedResult statsResult = computeActual("SHOW STATS FOR " + tableName);
+            for (MaterializedRow row : statsResult) {
+                String columnName = (String) row.getField(0);
+                if (columnName == null) {
+                    // table summary row
+                    return;
+                }
+                assertThat(columnName).isIn("orderkey", "custkey", "orderpriority", "comment");
+
+                Double dataSize = (Double) row.getField(1);
+                if (dataSize != null) {
+                    assertThat(dataSize).as("Data size for " + columnName)
+                            .isEqualTo(0);
+                }
+
+                if ((columnName.equals("orderpriority") || columnName.equals("comment")) && varcharNdvToExpected.apply(2) == null) {
+                    assertNull(row.getField(2), "NDV for " + columnName);
+                    assertNull(row.getField(3), "null fraction for " + columnName);
+                }
+                else {
+                    assertNotNull(row.getField(2), "NDV for " + columnName);
+                    assertThat((Double) row.getField(2)).as("NDV for " + columnName).isBetween(0.0, 2.0);
+                    assertEquals(row.getField(3), nullFractionToExpected.apply(1.0), "null fraction for " + columnName);
+                }
+
+                assertNull(row.getField(4), "min");
+                assertNull(row.getField(5), "max");
+            }
+            double cardinality = getTableCardinalityFromStats(statsResult);
+            if (cardinality != 15.0) {
+                // sometimes all-NULLs tables are reported as containing 0-2 rows
+                assertThat(cardinality).isBetween(0.0, 2.0);
+            }
+        }
+        finally {
+            assertUpdate("DROP TABLE " + tableName);
+        }
+    }
+
+    @Test
+    @Override
+    public void testNullsFraction()
+    {
+        String tableName = "test_stats_table_with_nulls_" + randomNameSuffix();
+        assertUpdate("" +
+                        "CREATE TABLE " + tableName + " AS " +
+                        "SELECT " +
+                        "    orderkey, " +
+                        "    if(orderkey % 3 = 0, NULL, custkey) custkey, " +
+                        "    if(orderkey % 5 = 0, NULL, orderpriority) orderpriority " +
+                        "FROM tpch.tiny.orders",
+                15000);
+        try {
+            gatherStats(tableName);
+            MaterializedResult statsResult = computeActual("SHOW STATS FOR " + tableName);
+            assertColumnStats(
+                    statsResult,
+                    new MapBuilder<String, Integer>()
+                            .put("orderkey", 15000)
+                            .put("custkey", 1000)
+                            .put("orderpriority", varcharNdvToExpected.apply(5))
+                            .build(),
+                    new MapBuilder<String, Double>()
+                            .put("orderkey", nullFractionToExpected.apply(0.0))
+                            .put("custkey", nullFractionToExpected.apply(1.0 / 3))
+                            .put("orderpriority", nullFractionToExpected.apply(1.0 / 5))
+                            .build());
+            assertThat(getTableCardinalityFromStats(statsResult)).isCloseTo(15000, withinPercentage(20));
+        }
+        finally {
+            assertUpdate("DROP TABLE " + tableName);
+        }
+    }
+
+    @Test
+    @Override
+    public void testAverageColumnLength()
+    {
+        abort("MariaDB connector does not report average column length");
+    }
+
+    @Test
+    @Override
+    public void testPartitionedTable()
+    {
+        abort("Not implemented"); // TODO
+    }
+
+    @Test
+    @Override
+    public void testView()
+    {
+        String tableName = "test_stats_view_" + randomNameSuffix();
+        executeInMariaDb("CREATE OR REPLACE VIEW " + tableName + " AS SELECT orderkey, custkey, orderpriority, comment FROM orders");
+        try {
+            assertQuery(
+                    "SHOW STATS FOR " + tableName,
+                    "VALUES " +
+                            "('orderkey', null, null, null, null, null, null)," +
+                            "('custkey', null, null, null, null, null, null)," +
+                            "('orderpriority', null, null, null, null, null, null)," +
+                            "('comment', null, null, null, null, null, null)," +
+                            "(null, null, null, null, null, null, null)");
+            // It's not possible to ANALYZE a VIEW in MariaDB
+        }
+        finally {
+            executeInMariaDb("DROP VIEW " + tableName);
+        }
+    }
+
+    @Test
+    @Override
+    public void testMaterializedView()
+    {
+        abort(""); // TODO is there a concept like materialized view in MariaDB?
+    }
+
+    @Override
+    protected void testCaseColumnNames(String tableName)
+    {
+        executeInMariaDb(("" +
+                "CREATE TABLE " + tableName + " " +
+                "AS SELECT " +
+                "  orderkey AS CASE_UNQUOTED_UPPER, " +
+                "  custkey AS case_unquoted_lower, " +
+                "  orderstatus AS cASe_uNQuoTeD_miXED, " +
+                "  totalprice AS \"CASE_QUOTED_UPPER\", " +
+                "  orderdate AS \"case_quoted_lower\"," +
+                "  orderpriority AS \"CasE_QuoTeD_miXED\" " +
+                "FROM orders")
+                .replace("\"", "`"));
+        try {
+            gatherStats(tableName);
+            MaterializedResult statsResult = computeActual("SHOW STATS FOR " + tableName);
+            assertColumnStats(statsResult, new MapBuilder<String, Integer>()
+                    .put("case_unquoted_upper", 15000)
+                    .put("case_unquoted_lower", 1000)
+                    .put("case_unquoted_mixed", varcharNdvToExpected.apply(3))
+                    .put("case_quoted_upper", 14996)
+                    .put("case_quoted_lower", 2401)
+                    .put("case_quoted_mixed", varcharNdvToExpected.apply(5))
+                    .build());
+            assertThat(getTableCardinalityFromStats(statsResult)).isCloseTo(15000, withinPercentage(20));
+        }
+        finally {
+            executeInMariaDb("DROP TABLE " + tableName.replace("\"", "`"));
+        }
+    }
+
+    @Test
+    @Override
+    public void testNumericCornerCases()
+    {
+        try (TestTable table = fromColumns(
+                getQueryRunner()::execute,
+                "test_numeric_corner_cases_",
+                ImmutableMap.<String, List<String>>builder()
+                        // TODO Infinity and NaNs not supported by MySQL. Are they not supported in MariaDB as well?
+//                        .put("only_negative_infinity double", List.of("-infinity()", "-infinity()", "-infinity()", "-infinity()"))
+//                        .put("only_positive_infinity double", List.of("infinity()", "infinity()", "infinity()", "infinity()"))
+//                        .put("mixed_infinities double", List.of("-infinity()", "infinity()", "-infinity()", "infinity()"))
+//                        .put("mixed_infinities_and_numbers double", List.of("-infinity()", "infinity()", "-5.0", "7.0"))
+//                        .put("nans_only double", List.of("nan()", "nan()"))
+//                        .put("nans_and_numbers double", List.of("nan()", "nan()", "-5.0", "7.0"))
+                        .put("large_doubles double", List.of("CAST(-50371909150609548946090.0 AS DOUBLE)", "CAST(50371909150609548946090.0 AS DOUBLE)")) // 2^77 DIV 3
+                        .put("short_decimals_big_fraction decimal(16,15)", List.of("-1.234567890123456", "1.234567890123456"))
+                        .put("short_decimals_big_integral decimal(16,1)", List.of("-123456789012345.6", "123456789012345.6"))
+                        // DECIMALS up to precision 30 are supported
+                        .put("long_decimals_big_fraction decimal(30,29)", List.of("-1.23456789012345678901234567890", "1.23456789012345678901234567890"))
+                        .put("long_decimals_middle decimal(30,16)", List.of("-12345678901234.5678901234567890", "12345678901234.5678901234567890"))
+                        .put("long_decimals_big_integral decimal(30,1)", List.of("-12345678901234567890123456789.0", "12345678901234567890123456789.0"))
+                        .buildOrThrow(),
+                "null")) {
+            gatherStats(table.getName());
+            assertQuery(
+                    "SHOW STATS FOR " + table.getName(),
+                    "VALUES " +
+                            // TODO Infinity and NaNs not supported by MySQL. Are they not supported in MariaDB as well?
+//                            "('only_negative_infinity', null, 1, 0, null, null, null)," +
+//                            "('only_positive_infinity', null, 1, 0, null, null, null)," +
+//                            "('mixed_infinities', null, 2, 0, null, null, null)," +
+//                            "('mixed_infinities_and_numbers', null, 4.0, 0.0, null, null, null)," +
+//                            "('nans_only', null, 1.0, 0.5, null, null, null)," +
+//                            "('nans_and_numbers', null, 3.0, 0.0, null, null, null)," +
+                            "('large_doubles', null, 2.0, 0.0, null, null, null)," +
+                            "('short_decimals_big_fraction', null, 2.0, 0.0, null, null, null)," +
+                            "('short_decimals_big_integral', null, 2.0, 0.0, null, null, null)," +
+                            "('long_decimals_big_fraction', null, 2.0, 0.0, null, null, null)," +
+                            "('long_decimals_middle', null, 2.0, 0.0, null, null, null)," +
+                            "('long_decimals_big_integral', null, 2.0, 0.0, null, null, null)," +
+                            "(null, null, null, null, 2, null, null)");
+        }
+    }
+
+    protected void executeInMariaDb(String sql)
+    {
+        mariaDbServer.execute(sql);
+    }
+
+    protected void assertColumnStats(MaterializedResult statsResult, Map<String, Integer> columnNdvs)
+    {
+        assertColumnStats(statsResult, columnNdvs, nullFractionToExpected.apply(0.0));
+    }
+
+    protected void assertColumnStats(MaterializedResult statsResult, Map<String, Integer> columnNdvs, double nullFraction)
+    {
+        Map<String, Double> columnNullFractions = new HashMap<>();
+        columnNdvs.forEach((columnName, ndv) -> columnNullFractions.put(columnName, ndv == null ? null : nullFraction));
+
+        assertColumnStats(statsResult, columnNdvs, columnNullFractions);
+    }
+
+    protected void assertColumnStats(MaterializedResult statsResult, Map<String, Integer> columnNdvs, Map<String, Double> columnNullFractions)
+    {
+        assertEquals(columnNdvs.keySet(), columnNullFractions.keySet());
+        List<String> reportedColumns = stream(statsResult)
+                .map(row -> row.getField(0)) // column name
+                .filter(Objects::nonNull)
+                .map(String.class::cast)
+                .collect(toImmutableList());
+        assertThat(reportedColumns)
+                .containsOnlyOnce(columnNdvs.keySet().toArray(new String[0]));
+
+        Double tableCardinality = getTableCardinalityFromStats(statsResult);
+        for (MaterializedRow row : statsResult) {
+            if (row.getField(0) == null) {
+                continue;
+            }
+            String columnName = (String) row.getField(0);
+            verify(columnNdvs.containsKey(columnName));
+            Integer expectedNdv = columnNdvs.get(columnName);
+            verify(columnNullFractions.containsKey(columnName));
+            Double expectedNullFraction = columnNullFractions.get(columnName);
+
+            Double dataSize = (Double) row.getField(1);
+            if (dataSize != null) {
+                assertThat(dataSize).as("Data size for " + columnName)
+                        .isEqualTo(0);
+            }
+
+            Double distinctCount = (Double) row.getField(2);
+            Double nullsFraction = (Double) row.getField(3);
+            AbstractDoubleAssert<?> ndvAssertion = assertThat(distinctCount).as("NDV for " + columnName);
+            if (expectedNdv == null) {
+                ndvAssertion.isNull();
+                assertNull(nullsFraction, "null fraction for " + columnName);
+            }
+            else {
+                ndvAssertion.isBetween(expectedNdv * 0.5, min(expectedNdv * 4.0, tableCardinality)); // [-50%, +300%] but no more than row count
+                AbstractDoubleAssert<?> nullsAssertion = assertThat(nullsFraction).as("Null fraction for " + columnName);
+                if (distinctCount.compareTo(tableCardinality) >= 0) {
+                    nullsAssertion.isEqualTo(0);
+                }
+                else {
+                    double maxNullsFraction = (tableCardinality - distinctCount) / tableCardinality;
+                    expectedNullFraction = Math.min(expectedNullFraction, maxNullsFraction);
+                    nullsAssertion.isBetween(expectedNullFraction * 0.4, expectedNullFraction * 1.1);
+                }
+            }
+
+            assertNull(row.getField(4), "min");
+            assertNull(row.getField(5), "max");
+        }
+    }
+
+    protected static Double getTableCardinalityFromStats(MaterializedResult statsResult)
+    {
+        MaterializedRow lastRow = statsResult.getMaterializedRows().get(statsResult.getRowCount() - 1);
+        assertNull(lastRow.getField(0));
+        assertNull(lastRow.getField(1));
+        assertNull(lastRow.getField(2));
+        assertNull(lastRow.getField(3));
+        assertNull(lastRow.getField(5));
+        assertNull(lastRow.getField(6));
+        assertEquals(lastRow.getFieldCount(), 7);
+        return ((Double) lastRow.getField(4));
+    }
+
+    protected static class MapBuilder<K, V>
+    {
+        private final Map<K, V> map = new HashMap<>();
+
+        public MapBuilder<K, V> put(K key, V value)
+        {
+            checkArgument(!map.containsKey(key), "Key already present: %s", key);
+            map.put(requireNonNull(key, "key is null"), value);
+            return this;
+        }
+
+        public Map<K, V> build()
+        {
+            return new HashMap<>(map);
+        }
+    }
+}
diff --git a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbCaseInsensitiveMapping.java b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbCaseInsensitiveMapping.java
index ffa702d41c81..b8a9241c7a0a 100644
--- a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbCaseInsensitiveMapping.java
+++ b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbCaseInsensitiveMapping.java
@@ -18,17 +18,16 @@
 import io.trino.plugin.jdbc.BaseCaseInsensitiveMappingTest;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.SqlExecutor;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
 
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
 import static io.trino.plugin.mariadb.MariaDbQueryRunner.createMariaDbQueryRunner;
 import static java.util.Objects.requireNonNull;
 
 // With case-insensitive-name-matching enabled colliding schema/table names are considered as errors.
 // Some tests here create colliding names which can cause any other concurrent test to fail.
-@Test(singleThreaded = true)
 public class TestMariaDbCaseInsensitiveMapping
         extends BaseCaseInsensitiveMappingTest
 {
diff --git a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbClient.java b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbClient.java
index b6d967b94e75..b184d7a8008b 100644
--- a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbClient.java
+++ b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbClient.java
@@ -13,15 +13,16 @@
  */
 package io.trino.plugin.mariadb;
 
+import io.trino.plugin.base.mapping.DefaultIdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ColumnMapping;
 import io.trino.plugin.jdbc.DefaultQueryBuilder;
 import io.trino.plugin.jdbc.JdbcClient;
 import io.trino.plugin.jdbc.JdbcColumnHandle;
 import io.trino.plugin.jdbc.JdbcExpression;
+import io.trino.plugin.jdbc.JdbcStatisticsConfig;
 import io.trino.plugin.jdbc.JdbcTypeHandle;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.DefaultIdentifierMapping;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.expression.ConnectorExpression;
@@ -59,6 +60,7 @@ public class TestMariaDbClient
 
     private static final JdbcClient JDBC_CLIENT = new MariaDbClient(
             new BaseJdbcConfig(),
+            new JdbcStatisticsConfig(),
             session -> {
                 throw new UnsupportedOperationException();
             },
diff --git a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbTableIndexStatistics.java b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbTableIndexStatistics.java
new file mode 100644
index 000000000000..d61c36705f5c
--- /dev/null
+++ b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbTableIndexStatistics.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed 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 io.trino.plugin.mariadb;
+
+public class TestMariaDbTableIndexStatistics
+        extends BaseMariaDbTableIndexStatisticsTest
+{
+    public TestMariaDbTableIndexStatistics()
+    {
+        super(TestingMariaDbServer.DEFAULT_VERSION);
+    }
+}
diff --git a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbTableIndexStatisticsLatest.java b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbTableIndexStatisticsLatest.java
new file mode 100644
index 000000000000..3ebd8caff96e
--- /dev/null
+++ b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbTableIndexStatisticsLatest.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed 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 io.trino.plugin.mariadb;
+
+public class TestMariaDbTableIndexStatisticsLatest
+        extends BaseMariaDbTableIndexStatisticsTest
+{
+    public TestMariaDbTableIndexStatisticsLatest()
+    {
+        super(TestingMariaDbServer.LATEST_VERSION);
+    }
+}
diff --git a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestingMariaDbServer.java b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestingMariaDbServer.java
index 7c6c80cf80a5..c9796befa167 100644
--- a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestingMariaDbServer.java
+++ b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestingMariaDbServer.java
@@ -46,17 +46,19 @@ public TestingMariaDbServer(String tag)
         // explicit-defaults-for-timestamp: 1 is ON, the default set is 0 (OFF)
         container.withCommand("--character-set-server", "utf8mb4", "--explicit-defaults-for-timestamp=1");
         container.start();
-        execute(format("GRANT ALL PRIVILEGES ON *.* TO '%s'", container.getUsername()), "root", container.getPassword());
-    }
 
-    public void execute(String sql)
-    {
-        execute(sql, getUsername(), getPassword());
+        try (Connection connection = DriverManager.getConnection(getJdbcUrl(), "root", container.getPassword());
+                Statement statement = connection.createStatement()) {
+            statement.execute(format("GRANT ALL PRIVILEGES ON *.* TO '%s'", container.getUsername()));
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    private void execute(String sql, String user, String password)
+    public void execute(String sql)
     {
-        try (Connection connection = DriverManager.getConnection(getJdbcUrl(), user, password);
+        try (Connection connection = container.createConnection("");
                 Statement statement = connection.createStatement()) {
             statement.execute(sql);
         }
diff --git a/plugin/trino-memory/pom.xml b/plugin/trino-memory/pom.xml
index e933f180050f..962440c07c39 100644
--- a/plugin/trino-memory/pom.xml
+++ b/plugin/trino-memory/pom.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-memory</artifactId>
-    <description>Trino - Memory Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Memory Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,8 +19,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -44,71 +55,75 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <artifactId>log</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-exchange-filesystem</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -146,12 +161,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -170,4 +179,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConfig.java b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConfig.java
index cf8158f3b9ef..3251809fb2c6 100644
--- a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConfig.java
+++ b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.units.DataSize;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class MemoryConfig
 {
diff --git a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConnector.java b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConnector.java
index 9d16a455bdb3..44e3638abb00 100644
--- a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConnector.java
+++ b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConnector.java
@@ -13,6 +13,8 @@
  */
 package io.trino.plugin.memory;
 
+import com.google.inject.Inject;
+import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorPageSinkProvider;
@@ -22,11 +24,12 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
+import static java.util.Objects.requireNonNull;
 
 public class MemoryConnector
         implements Connector
 {
+    private final LifeCycleManager lifeCycleManager;
     private final MemoryMetadata metadata;
     private final MemorySplitManager splitManager;
     private final MemoryPageSourceProvider pageSourceProvider;
@@ -34,11 +37,13 @@ public class MemoryConnector
 
     @Inject
     public MemoryConnector(
+            LifeCycleManager lifeCycleManager,
             MemoryMetadata metadata,
             MemorySplitManager splitManager,
             MemoryPageSourceProvider pageSourceProvider,
             MemoryPageSinkProvider pageSinkProvider)
     {
+        this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null");
         this.metadata = metadata;
         this.splitManager = splitManager;
         this.pageSourceProvider = pageSourceProvider;
@@ -74,4 +79,10 @@ public ConnectorPageSinkProvider getPageSinkProvider()
     {
         return pageSinkProvider;
     }
+
+    @Override
+    public void shutdown()
+    {
+        lifeCycleManager.stop();
+    }
 }
diff --git a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConnectorFactory.java b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConnectorFactory.java
index 900f142c108f..3c1586e041c1 100644
--- a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConnectorFactory.java
+++ b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConnectorFactory.java
@@ -22,7 +22,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class MemoryConnectorFactory
@@ -38,7 +38,7 @@ public String getName()
     public Connector create(String catalogName, Map<String, String> requiredConfig, ConnectorContext context)
     {
         requireNonNull(requiredConfig, "requiredConfig is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         // A plugin is not required to use Guice; it is just very convenient
         Bootstrap app = new Bootstrap(
diff --git a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryMetadata.java b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryMetadata.java
index 2a2a1e91ad10..ddedc79ddf0b 100644
--- a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryMetadata.java
+++ b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryMetadata.java
@@ -17,6 +17,10 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Streams;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.spi.HostAddress;
 import io.trino.spi.Node;
@@ -32,8 +36,11 @@
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.ConnectorTableLayout;
 import io.trino.spi.connector.ConnectorTableMetadata;
+import io.trino.spi.connector.ConnectorTableVersion;
 import io.trino.spi.connector.ConnectorViewDefinition;
 import io.trino.spi.connector.LimitApplicationResult;
+import io.trino.spi.connector.RelationColumnsMetadata;
+import io.trino.spi.connector.RelationCommentMetadata;
 import io.trino.spi.connector.RetryMode;
 import io.trino.spi.connector.SampleApplicationResult;
 import io.trino.spi.connector.SampleType;
@@ -42,14 +49,13 @@
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.connector.TableColumnsMetadata;
 import io.trino.spi.connector.ViewNotFoundException;
+import io.trino.spi.function.LanguageFunction;
+import io.trino.spi.function.SchemaFunctionName;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.statistics.ComputedStatistics;
 import io.trino.spi.statistics.Estimate;
 import io.trino.spi.statistics.TableStatistics;
 
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -62,19 +68,23 @@
 import java.util.OptionalLong;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.UnaryOperator;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
 import static io.trino.spi.StandardErrorCode.NOT_FOUND;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_EMPTY;
 import static io.trino.spi.connector.RetryMode.NO_RETRIES;
 import static io.trino.spi.connector.SampleType.SYSTEM;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
+import static java.util.function.Function.identity;
 
 @ThreadSafe
 public class MemoryMetadata
@@ -83,11 +93,16 @@ public class MemoryMetadata
     public static final String SCHEMA_NAME = "default";
 
     private final NodeManager nodeManager;
+    @GuardedBy("this")
     private final List<String> schemas = new ArrayList<>();
     private final AtomicLong nextTableId = new AtomicLong();
+    @GuardedBy("this")
     private final Map<SchemaTableName, Long> tableIds = new HashMap<>();
+    @GuardedBy("this")
     private final Map<Long, TableInfo> tables = new HashMap<>();
+    @GuardedBy("this")
     private final Map<SchemaTableName, ConnectorViewDefinition> views = new HashMap<>();
+    private final Map<SchemaFunctionName, Map<String, LanguageFunction>> functions = new HashMap<>();
 
     @Inject
     public MemoryMetadata(NodeManager nodeManager)
@@ -112,12 +127,24 @@ public synchronized void createSchema(ConnectorSession session, String schemaNam
     }
 
     @Override
-    public synchronized void dropSchema(ConnectorSession session, String schemaName)
+    public synchronized void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
         if (!schemas.contains(schemaName)) {
             throw new TrinoException(NOT_FOUND, format("Schema [%s] does not exist", schemaName));
         }
 
+        if (cascade) {
+            Set<SchemaTableName> viewNames = views.keySet().stream()
+                    .filter(view -> view.getSchemaName().equals(schemaName))
+                    .collect(toImmutableSet());
+            viewNames.forEach(viewName -> dropView(session, viewName));
+
+            Set<SchemaTableName> tableNames = tables.values().stream()
+                    .filter(table -> table.getSchemaName().equals(schemaName))
+                    .map(TableInfo::getSchemaTableName)
+                    .collect(toImmutableSet());
+            tableNames.forEach(tableName -> dropTable(session, getTableHandle(session, tableName, Optional.empty(), Optional.empty())));
+        }
         // DropSchemaTask has the same logic, but needs to check in connector side considering concurrent operations
         if (!isSchemaEmpty(schemaName)) {
             throw new TrinoException(SCHEMA_NOT_EMPTY, "Schema not empty: " + schemaName);
@@ -126,29 +153,31 @@ public synchronized void dropSchema(ConnectorSession session, String schemaName)
         verify(schemas.remove(schemaName));
     }
 
+    @GuardedBy("this")
     private boolean isSchemaEmpty(String schemaName)
     {
-        if (tables.values().stream()
-                .anyMatch(table -> table.getSchemaName().equals(schemaName))) {
-            return false;
-        }
-
-        if (views.keySet().stream()
-                .anyMatch(view -> view.getSchemaName().equals(schemaName))) {
-            return false;
-        }
+        return tables.values().stream().noneMatch(table -> table.getSchemaName().equals(schemaName)) &&
+                views.keySet().stream().noneMatch(view -> view.getSchemaName().equals(schemaName));
+    }
 
-        return true;
+    @Override
+    public ConnectorTableHandle getTableHandle(ConnectorSession session, SchemaTableName schemaTableName)
+    {
+        throw new UnsupportedOperationException("This method is not supported because getTableHandle with versions is implemented instead");
     }
 
     @Override
-    public synchronized ConnectorTableHandle getTableHandle(ConnectorSession session, SchemaTableName schemaTableName)
+    public synchronized ConnectorTableHandle getTableHandle(ConnectorSession session, SchemaTableName schemaTableName, Optional<ConnectorTableVersion> startVersion, Optional<ConnectorTableVersion> endVersion)
     {
         Long id = tableIds.get(schemaTableName);
         if (id == null) {
             return null;
         }
 
+        if (startVersion.isPresent() || endVersion.isPresent()) {
+            throw new TrinoException(NOT_SUPPORTED, "This connector does not support versioned tables");
+        }
+
         return new MemoryTableHandle(id);
     }
 
@@ -201,15 +230,37 @@ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSess
     }
 
     @Override
-    public synchronized Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
+    public Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
     {
-        // This list must be materialized before returning, otherwise the iterator could throw a ConcurrentModificationException
-        // if another thread modifies the tables map before the iterator is fully consumed
-        List<TableColumnsMetadata> columnsMetadata = tables.values().stream()
-                .filter(table -> prefix.matches(table.getSchemaTableName()))
-                .map(tableInfo -> TableColumnsMetadata.forTable(tableInfo.getSchemaTableName(), tableInfo.getMetadata().getColumns()))
-                .collect(toImmutableList());
-        return columnsMetadata.iterator();
+        throw new UnsupportedOperationException("The deprecated streamTableColumns is not supported because streamRelationColumns is implemented instead");
+    }
+
+    @Override
+    public synchronized Iterator<RelationColumnsMetadata> streamRelationColumns(ConnectorSession session, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        Map<SchemaTableName, RelationColumnsMetadata> relationsColumns = Streams.concat(
+                        tables.values().stream()
+                                .map(tableInfo -> RelationColumnsMetadata.forTable(tableInfo.getSchemaTableName(), tableInfo.getMetadata().getColumns())),
+                        views.entrySet().stream()
+                                .map(entry -> RelationColumnsMetadata.forView(entry.getKey(), entry.getValue().getColumns())))
+                .collect(toImmutableMap(RelationColumnsMetadata::name, identity()));
+        return relationFilter.apply(relationsColumns.keySet()).stream()
+                .map(relationsColumns::get)
+                .iterator();
+    }
+
+    @Override
+    public synchronized Iterator<RelationCommentMetadata> streamRelationComments(ConnectorSession session, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
+    {
+        Map<SchemaTableName, RelationCommentMetadata> relationsColumns = Streams.concat(
+                        tables.values().stream()
+                                .map(tableInfo -> RelationCommentMetadata.forRelation(tableInfo.getSchemaTableName(), tableInfo.getMetadata().getComment())),
+                        views.entrySet().stream()
+                                .map(entry -> RelationCommentMetadata.forRelation(entry.getKey(), entry.getValue().getComment())))
+                .collect(toImmutableMap(RelationCommentMetadata::name, identity()));
+        return relationFilter.apply(relationsColumns.keySet()).stream()
+                .map(relationsColumns::get)
+                .iterator();
     }
 
     @Override
@@ -272,6 +323,7 @@ public synchronized MemoryOutputTableHandle beginCreateTable(ConnectorSession se
         return new MemoryOutputTableHandle(tableId, ImmutableSet.copyOf(tableIds.values()));
     }
 
+    @GuardedBy("this")
     private void checkSchemaExists(String schemaName)
     {
         if (!schemas.contains(schemaName)) {
@@ -279,6 +331,7 @@ private void checkSchemaExists(String schemaName)
         }
     }
 
+    @GuardedBy("this")
     private void checkTableNotExists(SchemaTableName tableName)
     {
         if (tableIds.containsKey(tableName)) {
@@ -344,7 +397,8 @@ public synchronized void setViewComment(ConnectorSession session, SchemaTableNam
                 view.getColumns(),
                 comment,
                 view.getOwner(),
-                view.isRunAsInvoker()));
+                view.isRunAsInvoker(),
+                view.getPath()));
     }
 
     @Override
@@ -360,7 +414,8 @@ public synchronized void setViewColumnComment(ConnectorSession session, SchemaTa
                         .collect(toImmutableList()),
                 view.getComment(),
                 view.getOwner(),
-                view.isRunAsInvoker()));
+                view.isRunAsInvoker(),
+                view.getPath()));
     }
 
     @Override
@@ -414,14 +469,11 @@ public synchronized Optional<ConnectorViewDefinition> getView(ConnectorSession s
         return Optional.ofNullable(views.get(viewName));
     }
 
+    @GuardedBy("this")
     private void updateRowsOnHosts(long tableId, Collection<Slice> fragments)
     {
         TableInfo info = tables.get(tableId);
-        checkState(
-                info != null,
-                "Uninitialized tableId [%s.%s]",
-                info.getSchemaName(),
-                info.getTableName());
+        checkState(info != null, "Uninitialized tableId %s", tableId);
 
         Map<HostAddress, MemoryDataFragment> dataFragments = new HashMap<>(info.getDataFragments());
         for (Slice fragment : fragments) {
@@ -432,7 +484,7 @@ private void updateRowsOnHosts(long tableId, Collection<Slice> fragments)
         tables.put(tableId, new TableInfo(tableId, info.getSchemaName(), info.getTableName(), info.getColumns(), dataFragments, info.getComment()));
     }
 
-    public List<MemoryDataFragment> getDataFragments(long tableId)
+    public synchronized List<MemoryDataFragment> getDataFragments(long tableId)
     {
         return ImmutableList.copyOf(tables.get(tableId).getDataFragments().values());
     }
@@ -505,4 +557,48 @@ public synchronized void setColumnComment(ConnectorSession session, ConnectorTab
                         info.getDataFragments(),
                         info.getComment()));
     }
+
+    @Override
+    public synchronized Collection<LanguageFunction> listLanguageFunctions(ConnectorSession session, String schemaName)
+    {
+        return functions.entrySet().stream()
+                .filter(entry -> entry.getKey().getSchemaName().equals(schemaName))
+                .flatMap(entry -> entry.getValue().values().stream())
+                .toList();
+    }
+
+    @Override
+    public synchronized Collection<LanguageFunction> getLanguageFunctions(ConnectorSession session, SchemaFunctionName name)
+    {
+        return functions.getOrDefault(name, Map.of()).values();
+    }
+
+    @Override
+    public synchronized boolean languageFunctionExists(ConnectorSession session, SchemaFunctionName name, String signatureToken)
+    {
+        return functions.getOrDefault(name, Map.of()).containsKey(signatureToken);
+    }
+
+    @Override
+    public synchronized void createLanguageFunction(ConnectorSession session, SchemaFunctionName name, LanguageFunction function, boolean replace)
+    {
+        Map<String, LanguageFunction> map = functions.computeIfAbsent(name, ignored -> new HashMap<>());
+        if (!replace && map.containsKey(function.signatureToken())) {
+            throw new TrinoException(ALREADY_EXISTS, "Function already exists");
+        }
+        map.put(function.signatureToken(), function);
+    }
+
+    @Override
+    public synchronized void dropLanguageFunction(ConnectorSession session, SchemaFunctionName name, String signatureToken)
+    {
+        Map<String, LanguageFunction> map = functions.get(name);
+        if ((map == null) || !map.containsKey(signatureToken)) {
+            throw new TrinoException(NOT_FOUND, "Function not found");
+        }
+        map.remove(signatureToken);
+        if (map.isEmpty()) {
+            functions.remove(name);
+        }
+    }
 }
diff --git a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryPageSinkProvider.java b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryPageSinkProvider.java
index 0ab7949f6c9f..8b925ec85f01 100644
--- a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryPageSinkProvider.java
+++ b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryPageSinkProvider.java
@@ -15,6 +15,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.spi.HostAddress;
 import io.trino.spi.NodeManager;
@@ -27,8 +28,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryPageSourceProvider.java b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryPageSourceProvider.java
index e22af7c5b39f..e98890425345 100644
--- a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryPageSourceProvider.java
+++ b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryPageSourceProvider.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.memory;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.plugin.base.metrics.LongCount;
 import io.trino.spi.Page;
 import io.trino.spi.connector.ColumnHandle;
@@ -30,8 +31,6 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.TypeUtils;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.OptionalDouble;
@@ -39,7 +38,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toList;
 
 public final class MemoryPageSourceProvider
         implements ConnectorPageSourceProvider
@@ -71,9 +69,10 @@ public ConnectorPageSource createPageSource(
         MemoryTableHandle memoryTable = (MemoryTableHandle) table;
         OptionalDouble sampleRatio = memoryTable.getSampleRatio();
 
-        List<Integer> columnIndexes = columns.stream()
+        int[] columnIndexes = columns.stream()
                 .map(MemoryColumnHandle.class::cast)
-                .map(MemoryColumnHandle::getColumnIndex).collect(toList());
+                .mapToInt(MemoryColumnHandle::getColumnIndex)
+                .toArray();
         List<Page> pages = pagesStore.getPages(
                 tableId,
                 partNumber,
diff --git a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryPagesStore.java b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryPagesStore.java
index 5a62b5349ced..eb5c62c9a369 100644
--- a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryPagesStore.java
+++ b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryPagesStore.java
@@ -14,13 +14,11 @@
 package io.trino.plugin.memory;
 
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
-import io.trino.spi.block.Block;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -82,7 +80,7 @@ public synchronized List<Page> getPages(
             Long tableId,
             int partNumber,
             int totalParts,
-            List<Integer> columnIndexes,
+            int[] columnIndexes,
             long expectedRows,
             OptionalLong limit,
             OptionalDouble sampleRatio)
@@ -111,7 +109,7 @@ public synchronized List<Page> getPages(
                 page = page.getRegion(0, (int) (page.getPositionCount() - (totalRows - limit.getAsLong())));
                 done = true;
             }
-            partitionedPages.add(getColumns(page, columnIndexes));
+            partitionedPages.add(page.getColumns(columnIndexes));
         }
 
         return partitionedPages.build();
@@ -150,17 +148,6 @@ public synchronized void cleanUp(Set<Long> activeTableIds)
         }
     }
 
-    private static Page getColumns(Page page, List<Integer> columnIndexes)
-    {
-        Block[] outputBlocks = new Block[columnIndexes.size()];
-
-        for (int i = 0; i < columnIndexes.size(); i++) {
-            outputBlocks[i] = page.getBlock(columnIndexes.get(i));
-        }
-
-        return new Page(page.getPositionCount(), outputBlocks);
-    }
-
     private static final class TableData
     {
         private final List<Page> pages = new ArrayList<>();
diff --git a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemorySplitManager.java b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemorySplitManager.java
index a5c510cde4fe..6fcb1fc512b6 100644
--- a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemorySplitManager.java
+++ b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemorySplitManager.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.memory;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.connector.ConnectorSplitManager;
@@ -24,8 +25,6 @@
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.FixedSplitSource;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.OptionalLong;
 import java.util.concurrent.CompletableFuture;
@@ -60,7 +59,7 @@ public ConnectorSplitSource getSplits(
 
         List<MemoryDataFragment> dataFragments = metadata.getDataFragments(table.getId());
 
-        int totalRows = 0;
+        long totalRows = 0;
 
         ImmutableList.Builder<ConnectorSplit> splits = ImmutableList.builder();
 
diff --git a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/MemoryQueryRunner.java b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/MemoryQueryRunner.java
index ac4c0f750e7a..c07932879fce 100644
--- a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/MemoryQueryRunner.java
+++ b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/MemoryQueryRunner.java
@@ -17,10 +17,12 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.log.Logger;
 import io.trino.Session;
+import io.trino.plugin.exchange.filesystem.FileSystemExchangePlugin;
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.tpch.TpchTable;
 
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 
@@ -28,6 +30,7 @@
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
 import static io.trino.testing.QueryAssertions.copyTpchTables;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static java.nio.file.Files.createTempDirectory;
 import static java.util.Objects.requireNonNull;
 
 public final class MemoryQueryRunner
@@ -41,6 +44,13 @@ public static DistributedQueryRunner createMemoryQueryRunner(
             Iterable<TpchTable<?>> tables)
             throws Exception
     {
+        extraProperties = ImmutableMap.<String, String>builder()
+                .putAll(extraProperties)
+                .put("sql.path", CATALOG + ".functions")
+                .put("sql.default-function-catalog", CATALOG)
+                .put("sql.default-function-schema", "functions")
+                .buildOrThrow();
+
         return builder()
                 .setExtraProperties(extraProperties)
                 .setInitialTables(tables)
@@ -125,4 +135,35 @@ public static void main(String[] args)
         log.info("======== SERVER STARTED ========");
         log.info("\n====\n%s\n====", queryRunner.getCoordinator().getBaseUrl());
     }
+
+    public static final class MemoryQueryRunnerWithTaskRetries
+    {
+        private MemoryQueryRunnerWithTaskRetries() {}
+
+        public static void main(String[] args)
+                throws Exception
+        {
+            Path exchangeManagerDirectory = createTempDirectory(null);
+            ImmutableMap<String, String> exchangeManagerProperties = ImmutableMap.<String, String>builder()
+                    .put("exchange.base-directories", exchangeManagerDirectory.toAbsolutePath().toString())
+                    .buildOrThrow();
+
+            DistributedQueryRunner queryRunner = MemoryQueryRunner.builder()
+                    .setExtraProperties(ImmutableMap.<String, String>builder()
+                            .put("http-server.http.port", "8080")
+                            .put("retry-policy", "TASK")
+                            .put("fault-tolerant-execution-task-memory", "1GB")
+                            .buildOrThrow())
+                    .setAdditionalSetup(runner -> {
+                        runner.installPlugin(new FileSystemExchangePlugin());
+                        runner.loadExchangeManager("filesystem", exchangeManagerProperties);
+                    })
+                    .setInitialTables(TpchTable.getTables())
+                    .build();
+            Thread.sleep(10);
+            Logger log = Logger.get(MemoryQueryRunner.class);
+            log.info("======== SERVER STARTED ========");
+            log.info("\n====\n%s\n====", queryRunner.getCoordinator().getBaseUrl());
+        }
+    }
 }
diff --git a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryConnectorTest.java b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryConnectorTest.java
index 5b54629509df..45fd3e285161 100644
--- a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryConnectorTest.java
+++ b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryConnectorTest.java
@@ -63,10 +63,12 @@ protected QueryRunner createQueryRunner()
         return createMemoryQueryRunner(
                 // Adjust DF limits to test edge cases
                 ImmutableMap.<String, String>builder()
-                        .put("dynamic-filtering.small-broadcast.max-distinct-values-per-driver", "100")
-                        .put("dynamic-filtering.small-broadcast.range-row-limit-per-driver", "100")
-                        .put("dynamic-filtering.large-broadcast.max-distinct-values-per-driver", "100")
-                        .put("dynamic-filtering.large-broadcast.range-row-limit-per-driver", "100000")
+                        .put("dynamic-filtering.small.max-distinct-values-per-driver", "100")
+                        .put("dynamic-filtering.small.range-row-limit-per-driver", "100")
+                        .put("dynamic-filtering.large.max-distinct-values-per-driver", "100")
+                        .put("dynamic-filtering.large.range-row-limit-per-driver", "100000")
+                        .put("dynamic-filtering.small-partitioned.max-distinct-values-per-driver", "100")
+                        .put("dynamic-filtering.small-partitioned.range-row-limit-per-driver", "200")
                         .put("dynamic-filtering.large-partitioned.max-distinct-values-per-driver", "100")
                         .put("dynamic-filtering.large-partitioned.range-row-limit-per-driver", "100000")
                         // disable semi join to inner join rewrite to test semi join operators explicitly
@@ -79,38 +81,27 @@ protected QueryRunner createQueryRunner()
                         .build());
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_PREDICATE_PUSHDOWN:
-            case SUPPORTS_LIMIT_PUSHDOWN:
-            case SUPPORTS_TOPN_PUSHDOWN:
-            case SUPPORTS_AGGREGATION_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN:
-            case SUPPORTS_RENAME_COLUMN:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_VIEW:
-            case SUPPORTS_COMMENT_ON_VIEW_COLUMN:
-                return true;
-
-            case SUPPORTS_CREATE_VIEW:
-                return true;
-
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN,
+                    SUPPORTS_AGGREGATION_PUSHDOWN,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_DEREFERENCE_PUSHDOWN,
+                    SUPPORTS_LIMIT_PUSHDOWN,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_PREDICATE_PUSHDOWN,
+                    SUPPORTS_RENAME_COLUMN,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            case SUPPORTS_CREATE_FUNCTION -> true;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
diff --git a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryMetadata.java b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryMetadata.java
index 8da0ac175d82..aaf9d15ccd1b 100644
--- a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryMetadata.java
+++ b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryMetadata.java
@@ -26,7 +26,6 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.testing.TestingNodeManager;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import java.util.List;
@@ -50,21 +49,13 @@
 import static org.testng.Assert.expectThrows;
 import static org.testng.Assert.fail;
 
-@Test(singleThreaded = true)
 public class TestMemoryMetadata
 {
-    private MemoryMetadata metadata;
-
-    @BeforeMethod
-    public void setUp()
-    {
-        metadata = new MemoryMetadata(new TestingNodeManager());
-    }
-
     @Test
     public void tableIsCreatedAfterCommits()
     {
-        assertNoTables();
+        MemoryMetadata metadata = createMetadata();
+        assertNoTables(metadata);
 
         SchemaTableName schemaTableName = new SchemaTableName("default", "temp_table");
 
@@ -84,7 +75,8 @@ public void tableIsCreatedAfterCommits()
     @Test
     public void tableAlreadyExists()
     {
-        assertNoTables();
+        MemoryMetadata metadata = createMetadata();
+        assertNoTables(metadata);
 
         SchemaTableName test1Table = new SchemaTableName("default", "test1");
         SchemaTableName test2Table = new SchemaTableName("default", "test2");
@@ -94,7 +86,7 @@ public void tableAlreadyExists()
                 .hasErrorCode(ALREADY_EXISTS)
                 .hasMessage("Table [default.test1] already exists");
 
-        ConnectorTableHandle test1TableHandle = metadata.getTableHandle(SESSION, test1Table);
+        ConnectorTableHandle test1TableHandle = metadata.getTableHandle(SESSION, test1Table, Optional.empty(), Optional.empty());
         metadata.createTable(SESSION, new ConnectorTableMetadata(test2Table, ImmutableList.of()), false);
 
         assertTrinoExceptionThrownBy(() -> metadata.renameTable(SESSION, test1TableHandle, test2Table))
@@ -105,12 +97,13 @@ public void tableAlreadyExists()
     @Test
     public void testActiveTableIds()
     {
-        assertNoTables();
+        MemoryMetadata metadata = createMetadata();
+        assertNoTables(metadata);
 
         SchemaTableName firstTableName = new SchemaTableName("default", "first_table");
         metadata.createTable(SESSION, new ConnectorTableMetadata(firstTableName, ImmutableList.of(), ImmutableMap.of()), false);
 
-        MemoryTableHandle firstTableHandle = (MemoryTableHandle) metadata.getTableHandle(SESSION, firstTableName);
+        MemoryTableHandle firstTableHandle = (MemoryTableHandle) metadata.getTableHandle(SESSION, firstTableName, Optional.empty(), Optional.empty());
         long firstTableId = firstTableHandle.getId();
 
         assertTrue(metadata.beginInsert(SESSION, firstTableHandle, ImmutableList.of(), NO_RETRIES).getActiveTableIds().contains(firstTableId));
@@ -118,7 +111,7 @@ public void testActiveTableIds()
         SchemaTableName secondTableName = new SchemaTableName("default", "second_table");
         metadata.createTable(SESSION, new ConnectorTableMetadata(secondTableName, ImmutableList.of(), ImmutableMap.of()), false);
 
-        MemoryTableHandle secondTableHandle = (MemoryTableHandle) metadata.getTableHandle(SESSION, secondTableName);
+        MemoryTableHandle secondTableHandle = (MemoryTableHandle) metadata.getTableHandle(SESSION, secondTableName, Optional.empty(), Optional.empty());
         long secondTableId = secondTableHandle.getId();
 
         assertNotEquals(firstTableId, secondTableId);
@@ -129,7 +122,8 @@ public void testActiveTableIds()
     @Test
     public void testReadTableBeforeCreationCompleted()
     {
-        assertNoTables();
+        MemoryMetadata metadata = createMetadata();
+        assertNoTables(metadata);
 
         SchemaTableName tableName = new SchemaTableName("default", "temp_table");
 
@@ -148,6 +142,7 @@ public void testReadTableBeforeCreationCompleted()
     @Test
     public void testCreateSchema()
     {
+        MemoryMetadata metadata = createMetadata();
         assertEquals(metadata.listSchemaNames(SESSION), ImmutableList.of("default"));
         metadata.createSchema(SESSION, "test", ImmutableMap.of(), new TrinoPrincipal(USER, SESSION.getUser()));
         assertEquals(metadata.listSchemaNames(SESSION), ImmutableList.of("default", "test"));
@@ -171,6 +166,7 @@ public void testCreateSchema()
     public void testCreateViewWithoutReplace()
     {
         SchemaTableName test = new SchemaTableName("test", "test_view");
+        MemoryMetadata metadata = createMetadata();
         metadata.createSchema(SESSION, "test", ImmutableMap.of(), new TrinoPrincipal(USER, SESSION.getUser()));
         try {
             metadata.createView(SESSION, test, testingViewDefinition("test"), false);
@@ -188,6 +184,7 @@ public void testCreateViewWithReplace()
     {
         SchemaTableName test = new SchemaTableName("test", "test_view");
 
+        MemoryMetadata metadata = createMetadata();
         metadata.createSchema(SESSION, "test", ImmutableMap.of(), new TrinoPrincipal(USER, SESSION.getUser()));
         metadata.createView(SESSION, test, testingViewDefinition("aaa"), true);
         metadata.createView(SESSION, test, testingViewDefinition("bbb"), true);
@@ -203,6 +200,7 @@ public void testCreatedViewShouldBeListedAsTable()
         String schemaName = "test";
         SchemaTableName viewName = new SchemaTableName(schemaName, "test_view");
 
+        MemoryMetadata metadata = createMetadata();
         metadata.createSchema(SESSION, schemaName, ImmutableMap.of(), new TrinoPrincipal(USER, SESSION.getUser()));
         metadata.createView(SESSION, viewName, testingViewDefinition("aaa"), true);
 
@@ -213,6 +211,7 @@ public void testCreatedViewShouldBeListedAsTable()
     @Test
     public void testViews()
     {
+        MemoryMetadata metadata = createMetadata();
         SchemaTableName test1 = new SchemaTableName("test", "test_view1");
         SchemaTableName test2 = new SchemaTableName("test", "test_view2");
         SchemaTableName test3 = new SchemaTableName("test", "test_view3");
@@ -277,6 +276,7 @@ public void testViews()
     @Test
     public void testCreateTableAndViewInNotExistSchema()
     {
+        MemoryMetadata metadata = createMetadata();
         assertEquals(metadata.listSchemaNames(SESSION), ImmutableList.of("default"));
 
         SchemaTableName table1 = new SchemaTableName("test1", "test_schema_table1");
@@ -287,19 +287,19 @@ public void testCreateTableAndViewInNotExistSchema()
                 NO_RETRIES))
                 .hasErrorCode(NOT_FOUND)
                 .hasMessage("Schema test1 not found");
-        assertNull(metadata.getTableHandle(SESSION, table1));
+        assertNull(metadata.getTableHandle(SESSION, table1, Optional.empty(), Optional.empty()));
 
         SchemaTableName view2 = new SchemaTableName("test2", "test_schema_view2");
         assertTrinoExceptionThrownBy(() -> metadata.createView(SESSION, view2, testingViewDefinition("aaa"), false))
                 .hasErrorCode(NOT_FOUND)
                 .hasMessage("Schema test2 not found");
-        assertNull(metadata.getTableHandle(SESSION, view2));
+        assertNull(metadata.getTableHandle(SESSION, view2, Optional.empty(), Optional.empty()));
 
         SchemaTableName view3 = new SchemaTableName("test3", "test_schema_view3");
         assertTrinoExceptionThrownBy(() -> metadata.createView(SESSION, view3, testingViewDefinition("bbb"), true))
                 .hasErrorCode(NOT_FOUND)
                 .hasMessage("Schema test3 not found");
-        assertNull(metadata.getTableHandle(SESSION, view3));
+        assertNull(metadata.getTableHandle(SESSION, view3, Optional.empty(), Optional.empty()));
 
         assertEquals(metadata.listSchemaNames(SESSION), ImmutableList.of("default"));
     }
@@ -308,6 +308,7 @@ public void testCreateTableAndViewInNotExistSchema()
     public void testRenameTable()
     {
         SchemaTableName tableName = new SchemaTableName("test_schema", "test_table_to_be_renamed");
+        MemoryMetadata metadata = createMetadata();
         metadata.createSchema(SESSION, "test_schema", ImmutableMap.of(), new TrinoPrincipal(USER, SESSION.getUser()));
         ConnectorOutputTableHandle table = metadata.beginCreateTable(
                 SESSION,
@@ -318,24 +319,24 @@ public void testRenameTable()
 
         // rename table to schema which does not exist
         SchemaTableName invalidSchemaTableName = new SchemaTableName("test_schema_not_exist", "test_table_renamed");
-        ConnectorTableHandle tableHandle = metadata.getTableHandle(SESSION, tableName);
+        ConnectorTableHandle tableHandle = metadata.getTableHandle(SESSION, tableName, Optional.empty(), Optional.empty());
         Throwable throwable = expectThrows(SchemaNotFoundException.class, () -> metadata.renameTable(SESSION, tableHandle, invalidSchemaTableName));
         assertEquals(throwable.getMessage(), "Schema test_schema_not_exist not found");
 
         // rename table to same schema
         SchemaTableName sameSchemaTableName = new SchemaTableName("test_schema", "test_renamed");
-        metadata.renameTable(SESSION, metadata.getTableHandle(SESSION, tableName), sameSchemaTableName);
+        metadata.renameTable(SESSION, metadata.getTableHandle(SESSION, tableName, Optional.empty(), Optional.empty()), sameSchemaTableName);
         assertEquals(metadata.listTables(SESSION, Optional.of("test_schema")), ImmutableList.of(sameSchemaTableName));
 
         // rename table to different schema
         metadata.createSchema(SESSION, "test_different_schema", ImmutableMap.of(), new TrinoPrincipal(USER, SESSION.getUser()));
         SchemaTableName differentSchemaTableName = new SchemaTableName("test_different_schema", "test_renamed");
-        metadata.renameTable(SESSION, metadata.getTableHandle(SESSION, sameSchemaTableName), differentSchemaTableName);
+        metadata.renameTable(SESSION, metadata.getTableHandle(SESSION, sameSchemaTableName, Optional.empty(), Optional.empty()), differentSchemaTableName);
         assertEquals(metadata.listTables(SESSION, Optional.of("test_schema")), ImmutableList.of());
         assertEquals(metadata.listTables(SESSION, Optional.of("test_different_schema")), ImmutableList.of(differentSchemaTableName));
     }
 
-    private void assertNoTables()
+    private static void assertNoTables(MemoryMetadata metadata)
     {
         assertEquals(metadata.listTables(SESSION, Optional.empty()), ImmutableList.of(), "No table was expected");
     }
@@ -349,6 +350,12 @@ private static ConnectorViewDefinition testingViewDefinition(String sql)
                 ImmutableList.of(new ViewColumn("test", BIGINT.getTypeId(), Optional.empty())),
                 Optional.empty(),
                 Optional.empty(),
-                true);
+                true,
+                ImmutableList.of());
+    }
+
+    private static MemoryMetadata createMetadata()
+    {
+        return new MemoryMetadata(new TestingNodeManager());
     }
 }
diff --git a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryPagesStore.java b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryPagesStore.java
index fad201c48cc8..5f3baeb98605 100644
--- a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryPagesStore.java
+++ b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryPagesStore.java
@@ -56,7 +56,7 @@ public void setUp()
     public void testCreateEmptyTable()
     {
         createTable(0L, 0L);
-        assertEquals(pagesStore.getPages(0L, 0, 1, ImmutableList.of(0), 0, OptionalLong.empty(), OptionalDouble.empty()), ImmutableList.of());
+        assertEquals(pagesStore.getPages(0L, 0, 1, new int[] {0}, 0, OptionalLong.empty(), OptionalDouble.empty()), ImmutableList.of());
     }
 
     @Test
@@ -64,28 +64,28 @@ public void testInsertPage()
     {
         createTable(0L, 0L);
         insertToTable(0L, 0L);
-        assertEquals(pagesStore.getPages(0L, 0, 1, ImmutableList.of(0), POSITIONS_PER_PAGE, OptionalLong.empty(), OptionalDouble.empty()).size(), 1);
+        assertEquals(pagesStore.getPages(0L, 0, 1, new int[] {0}, POSITIONS_PER_PAGE, OptionalLong.empty(), OptionalDouble.empty()).size(), 1);
     }
 
     @Test
     public void testInsertPageWithoutCreate()
     {
         insertToTable(0L, 0L);
-        assertEquals(pagesStore.getPages(0L, 0, 1, ImmutableList.of(0), POSITIONS_PER_PAGE, OptionalLong.empty(), OptionalDouble.empty()).size(), 1);
+        assertEquals(pagesStore.getPages(0L, 0, 1, new int[] {0}, POSITIONS_PER_PAGE, OptionalLong.empty(), OptionalDouble.empty()).size(), 1);
     }
 
     @Test(expectedExceptions = TrinoException.class)
     public void testReadFromUnknownTable()
     {
-        pagesStore.getPages(0L, 0, 1, ImmutableList.of(0), 0, OptionalLong.empty(), OptionalDouble.empty());
+        pagesStore.getPages(0L, 0, 1, new int[] {0}, 0, OptionalLong.empty(), OptionalDouble.empty());
     }
 
     @Test
     public void testTryToReadFromEmptyTable()
     {
         createTable(0L, 0L);
-        assertEquals(pagesStore.getPages(0L, 0, 1, ImmutableList.of(0), 0, OptionalLong.empty(), OptionalDouble.empty()), ImmutableList.of());
-        assertThatThrownBy(() -> pagesStore.getPages(0L, 0, 1, ImmutableList.of(0), 42, OptionalLong.empty(), OptionalDouble.empty()))
+        assertEquals(pagesStore.getPages(0L, 0, 1, new int[] {0}, 0, OptionalLong.empty(), OptionalDouble.empty()), ImmutableList.of());
+        assertThatThrownBy(() -> pagesStore.getPages(0L, 0, 1, new int[] {0}, 42, OptionalLong.empty(), OptionalDouble.empty()))
                 .isInstanceOf(TrinoException.class)
                 .hasMessageMatching("Expected to find.*");
     }
diff --git a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryWorkerCrash.java b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryWorkerCrash.java
deleted file mode 100644
index 478b415a1ac9..000000000000
--- a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryWorkerCrash.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.memory;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import io.airlift.units.Duration;
-import io.trino.server.testing.TestingTrinoServer;
-import io.trino.testing.AbstractTestQueryFramework;
-import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
-
-import static io.airlift.testing.Assertions.assertLessThan;
-import static io.airlift.units.Duration.nanosSince;
-import static io.trino.plugin.memory.MemoryQueryRunner.createMemoryQueryRunner;
-import static io.trino.tpch.TpchTable.NATION;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-@Test(singleThreaded = true)
-public class TestMemoryWorkerCrash
-        extends AbstractTestQueryFramework
-{
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        return createMemoryQueryRunner(
-                ImmutableMap.of(),
-                ImmutableList.of(NATION));
-    }
-
-    @Test
-    public void tableAccessAfterWorkerCrash()
-            throws Exception
-    {
-        getQueryRunner().execute("CREATE TABLE test_nation as SELECT * FROM nation");
-        assertQuery("SELECT * FROM test_nation ORDER BY nationkey", "SELECT * FROM nation ORDER BY nationkey");
-        closeWorker();
-        assertQueryFails("SELECT * FROM test_nation ORDER BY nationkey", "No nodes available to run query");
-        getQueryRunner().execute("INSERT INTO test_nation SELECT * FROM tpch.tiny.nation");
-
-        assertQueryFails("SELECT * FROM test_nation ORDER BY nationkey", "No nodes available to run query");
-
-        getQueryRunner().execute("CREATE TABLE test_region as SELECT * FROM tpch.tiny.region");
-        assertQuery("SELECT * FROM test_region ORDER BY regionkey", "SELECT * FROM region ORDER BY regionkey");
-    }
-
-    private void closeWorker()
-            throws Exception
-    {
-        int nodeCount = getNodeCount();
-        TestingTrinoServer worker = getDistributedQueryRunner().getServers().stream()
-                .filter(server -> !server.isCoordinator())
-                .findAny()
-                .orElseThrow(() -> new IllegalStateException("No worker nodes"));
-        worker.close();
-        waitForNodes(nodeCount - 1);
-    }
-
-    private void waitForNodes(int numberOfNodes)
-            throws InterruptedException
-    {
-        long start = System.nanoTime();
-        while (getDistributedQueryRunner().getCoordinator().refreshNodes().getActiveNodes().size() < numberOfNodes) {
-            assertLessThan(nanosSince(start), new Duration(10, SECONDS));
-            MILLISECONDS.sleep(10);
-        }
-    }
-}
diff --git a/plugin/trino-ml/pom.xml b/plugin/trino-ml/pom.xml
index a029ee64a5a7..77dcd4a8b532 100644
--- a/plugin/trino-ml/pom.xml
+++ b/plugin/trino-ml/pom.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-ml</artifactId>
-    <description>Trino - Machine Learning Plugin</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Machine Learning Plugin</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,43 +18,43 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-array</artifactId>
+            <groupId>com.facebook.thirdparty</groupId>
+            <artifactId>libsvm</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.facebook.thirdparty</groupId>
-            <artifactId>libsvm</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>concurrent</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-array</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
@@ -62,10 +62,9 @@
             <artifactId>fastutil</artifactId>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -76,8 +75,14 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -87,7 +92,12 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-client</artifactId>
@@ -126,8 +136,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnClassifierAggregation.java b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnClassifierAggregation.java
index 01bb4be92052..c90a64e24ff0 100644
--- a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnClassifierAggregation.java
+++ b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnClassifierAggregation.java
@@ -14,8 +14,8 @@
 package io.trino.plugin.ml;
 
 import io.airlift.slice.Slices;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.InputFunction;
@@ -34,7 +34,7 @@ private LearnClassifierAggregation() {}
     public static void input(
             @AggregationState LearnState state,
             @SqlType(BIGINT) long label,
-            @SqlType("map(bigint,double)") Block features)
+            @SqlType("map(bigint,double)") SqlMap features)
     {
         input(state, (double) label, features);
     }
@@ -43,7 +43,7 @@ public static void input(
     public static void input(
             @AggregationState LearnState state,
             @SqlType(DOUBLE) double label,
-            @SqlType("map(bigint,double)") Block features)
+            @SqlType("map(bigint,double)") SqlMap features)
     {
         LearnLibSvmClassifierAggregation.input(state, label, features, Slices.utf8Slice(""));
     }
diff --git a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnLibSvmClassifierAggregation.java b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnLibSvmClassifierAggregation.java
index a1543f313125..e20445c8e511 100644
--- a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnLibSvmClassifierAggregation.java
+++ b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnLibSvmClassifierAggregation.java
@@ -15,8 +15,8 @@
 
 import io.airlift.slice.Slice;
 import io.trino.plugin.ml.type.ClassifierType;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.InputFunction;
@@ -38,7 +38,7 @@ private LearnLibSvmClassifierAggregation() {}
     public static void input(
             @AggregationState LearnState state,
             @SqlType(BIGINT) long label,
-            @SqlType("map(bigint,double)") Block features,
+            @SqlType("map(bigint,double)") SqlMap features,
             @SqlType("varchar(x)") Slice parameters)
     {
         input(state, (double) label, features, parameters);
@@ -48,7 +48,7 @@ public static void input(
     public static void input(
             @AggregationState LearnState state,
             @SqlType(DOUBLE) double label,
-            @SqlType("map(bigint,double)") Block features,
+            @SqlType("map(bigint,double)") SqlMap features,
             @SqlType(VARCHAR) Slice parameters)
     {
         state.getLabels().add(label);
diff --git a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnLibSvmRegressorAggregation.java b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnLibSvmRegressorAggregation.java
index 5eb6e7015766..f54d270a01d6 100644
--- a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnLibSvmRegressorAggregation.java
+++ b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnLibSvmRegressorAggregation.java
@@ -15,8 +15,8 @@
 
 import io.airlift.slice.Slice;
 import io.trino.plugin.ml.type.RegressorType;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.InputFunction;
@@ -36,7 +36,7 @@ private LearnLibSvmRegressorAggregation() {}
     public static void input(
             @AggregationState LearnState state,
             @SqlType(BIGINT) long label,
-            @SqlType("map(bigint,double)") Block features,
+            @SqlType("map(bigint,double)") SqlMap features,
             @SqlType(VARCHAR) Slice parameters)
     {
         input(state, (double) label, features, parameters);
@@ -46,7 +46,7 @@ public static void input(
     public static void input(
             @AggregationState LearnState state,
             @SqlType(DOUBLE) double label,
-            @SqlType("map(bigint,double)") Block features,
+            @SqlType("map(bigint,double)") SqlMap features,
             @SqlType(VARCHAR) Slice parameters)
     {
         state.getLabels().add(label);
diff --git a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnLibSvmVarcharClassifierAggregation.java b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnLibSvmVarcharClassifierAggregation.java
index 8801e0ebf1c5..2e07234dc8d1 100644
--- a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnLibSvmVarcharClassifierAggregation.java
+++ b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnLibSvmVarcharClassifierAggregation.java
@@ -14,8 +14,8 @@
 package io.trino.plugin.ml;
 
 import io.airlift.slice.Slice;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.InputFunction;
@@ -34,7 +34,7 @@ private LearnLibSvmVarcharClassifierAggregation() {}
     public static void input(
             @AggregationState LearnState state,
             @SqlType(VARCHAR) Slice label,
-            @SqlType("map(bigint,double)") Block features,
+            @SqlType("map(bigint,double)") SqlMap features,
             @SqlType(VARCHAR) Slice parameters)
     {
         state.getLabels().add((double) state.enumerateLabel(label.toStringUtf8()));
diff --git a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnRegressorAggregation.java b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnRegressorAggregation.java
index 7b80d761c694..f443a989d89b 100644
--- a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnRegressorAggregation.java
+++ b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnRegressorAggregation.java
@@ -15,8 +15,8 @@
 
 import io.airlift.slice.Slices;
 import io.trino.plugin.ml.type.RegressorType;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.InputFunction;
@@ -35,7 +35,7 @@ private LearnRegressorAggregation() {}
     public static void input(
             @AggregationState LearnState state,
             @SqlType(BIGINT) long label,
-            @SqlType("map(bigint,double)") Block features)
+            @SqlType("map(bigint,double)") SqlMap features)
     {
         input(state, (double) label, features);
     }
@@ -44,7 +44,7 @@ public static void input(
     public static void input(
             @AggregationState LearnState state,
             @SqlType(DOUBLE) double label,
-            @SqlType("map(bigint,double)") Block features)
+            @SqlType("map(bigint,double)") SqlMap features)
     {
         LearnLibSvmRegressorAggregation.input(state, label, features, Slices.utf8Slice(""));
     }
diff --git a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnVarcharClassifierAggregation.java b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnVarcharClassifierAggregation.java
index 72bb95b7ef54..d9968f8bc55e 100644
--- a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnVarcharClassifierAggregation.java
+++ b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/LearnVarcharClassifierAggregation.java
@@ -15,8 +15,8 @@
 
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.AggregationFunction;
 import io.trino.spi.function.AggregationState;
 import io.trino.spi.function.InputFunction;
@@ -34,7 +34,7 @@ private LearnVarcharClassifierAggregation() {}
     public static void input(
             @AggregationState LearnState state,
             @SqlType(VARCHAR) Slice label,
-            @SqlType("map(bigint,double)") Block features)
+            @SqlType("map(bigint,double)") SqlMap features)
     {
         LearnLibSvmVarcharClassifierAggregation.input(state, label, features, Slices.utf8Slice(""));
     }
diff --git a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/MLFeaturesFunctions.java b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/MLFeaturesFunctions.java
index f4ebb38d0e8b..a42305cc7c5f 100644
--- a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/MLFeaturesFunctions.java
+++ b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/MLFeaturesFunctions.java
@@ -14,14 +14,14 @@
 package io.trino.plugin.ml;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.spi.PageBuilder;
-import io.trino.spi.block.Block;
-import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.BufferedMapValueBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.function.TypeParameter;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.DoubleType;
+import io.trino.spi.type.MapType;
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.Type;
 
@@ -38,189 +38,180 @@ private MLFeaturesFunctions() {}
     @ScalarFunction("features")
     public static class Features1
     {
-        private final PageBuilder pageBuilder;
+        private final BufferedMapValueBuilder mapValueBuilder;
 
         public Features1(@TypeParameter(MAP_BIGINT_DOUBLE) Type mapType)
         {
-            pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+            mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
         }
 
         @SqlType(MAP_BIGINT_DOUBLE)
-        public Block features(@SqlType(StandardTypes.DOUBLE) double f1)
+        public SqlMap features(@SqlType(StandardTypes.DOUBLE) double f1)
         {
-            return featuresHelper(pageBuilder, f1);
+            return featuresHelper(mapValueBuilder, f1);
         }
     }
 
     @ScalarFunction("features")
     public static class Features2
     {
-        private final PageBuilder pageBuilder;
+        private final BufferedMapValueBuilder mapValueBuilder;
 
         public Features2(@TypeParameter(MAP_BIGINT_DOUBLE) Type mapType)
         {
-            pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+            mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
         }
 
         @SqlType(MAP_BIGINT_DOUBLE)
-        public Block features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2)
+        public SqlMap features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2)
         {
-            return featuresHelper(pageBuilder, f1, f2);
+            return featuresHelper(mapValueBuilder, f1, f2);
         }
     }
 
     @ScalarFunction("features")
     public static class Features3
     {
-        private final PageBuilder pageBuilder;
+        private final BufferedMapValueBuilder mapValueBuilder;
 
         public Features3(@TypeParameter(MAP_BIGINT_DOUBLE) Type mapType)
         {
-            pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+            mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
         }
 
         @SqlType(MAP_BIGINT_DOUBLE)
-        public Block features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3)
+        public SqlMap features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3)
         {
-            return featuresHelper(pageBuilder, f1, f2, f3);
+            return featuresHelper(mapValueBuilder, f1, f2, f3);
         }
     }
 
     @ScalarFunction("features")
     public static class Features4
     {
-        private final PageBuilder pageBuilder;
+        private final BufferedMapValueBuilder mapValueBuilder;
 
         public Features4(@TypeParameter(MAP_BIGINT_DOUBLE) Type mapType)
         {
-            pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+            mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
         }
 
         @SqlType(MAP_BIGINT_DOUBLE)
-        public Block features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4)
+        public SqlMap features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4)
         {
-            return featuresHelper(pageBuilder, f1, f2, f3, f4);
+            return featuresHelper(mapValueBuilder, f1, f2, f3, f4);
         }
     }
 
     @ScalarFunction("features")
     public static class Features5
     {
-        private final PageBuilder pageBuilder;
+        private final BufferedMapValueBuilder mapValueBuilder;
 
         public Features5(@TypeParameter(MAP_BIGINT_DOUBLE) Type mapType)
         {
-            pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+            mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
         }
 
         @SqlType(MAP_BIGINT_DOUBLE)
-        public Block features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4, @SqlType(StandardTypes.DOUBLE) double f5)
+        public SqlMap features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4, @SqlType(StandardTypes.DOUBLE) double f5)
         {
-            return featuresHelper(pageBuilder, f1, f2, f3, f4, f5);
+            return featuresHelper(mapValueBuilder, f1, f2, f3, f4, f5);
         }
     }
 
     @ScalarFunction("features")
     public static class Features6
     {
-        private final PageBuilder pageBuilder;
+        private final BufferedMapValueBuilder mapValueBuilder;
 
         public Features6(@TypeParameter(MAP_BIGINT_DOUBLE) Type mapType)
         {
-            pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+            mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
         }
 
         @SqlType(MAP_BIGINT_DOUBLE)
-        public Block features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4, @SqlType(StandardTypes.DOUBLE) double f5, @SqlType(StandardTypes.DOUBLE) double f6)
+        public SqlMap features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4, @SqlType(StandardTypes.DOUBLE) double f5, @SqlType(StandardTypes.DOUBLE) double f6)
         {
-            return featuresHelper(pageBuilder, f1, f2, f3, f4, f5, f6);
+            return featuresHelper(mapValueBuilder, f1, f2, f3, f4, f5, f6);
         }
     }
 
     @ScalarFunction("features")
     public static class Features7
     {
-        private final PageBuilder pageBuilder;
+        private final BufferedMapValueBuilder mapValueBuilder;
 
         public Features7(@TypeParameter(MAP_BIGINT_DOUBLE) Type mapType)
         {
-            pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+            mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
         }
 
         @SqlType(MAP_BIGINT_DOUBLE)
-        public Block features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4, @SqlType(StandardTypes.DOUBLE) double f5, @SqlType(StandardTypes.DOUBLE) double f6, @SqlType(StandardTypes.DOUBLE) double f7)
+        public SqlMap features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4, @SqlType(StandardTypes.DOUBLE) double f5, @SqlType(StandardTypes.DOUBLE) double f6, @SqlType(StandardTypes.DOUBLE) double f7)
         {
-            return featuresHelper(pageBuilder, f1, f2, f3, f4, f5, f6, f7);
+            return featuresHelper(mapValueBuilder, f1, f2, f3, f4, f5, f6, f7);
         }
     }
 
     @ScalarFunction("features")
     public static class Features8
     {
-        private final PageBuilder pageBuilder;
+        private final BufferedMapValueBuilder mapValueBuilder;
 
         public Features8(@TypeParameter(MAP_BIGINT_DOUBLE) Type mapType)
         {
-            pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+            mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
         }
 
         @SqlType(MAP_BIGINT_DOUBLE)
-        public Block features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4, @SqlType(StandardTypes.DOUBLE) double f5, @SqlType(StandardTypes.DOUBLE) double f6, @SqlType(StandardTypes.DOUBLE) double f7, @SqlType(StandardTypes.DOUBLE) double f8)
+        public SqlMap features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4, @SqlType(StandardTypes.DOUBLE) double f5, @SqlType(StandardTypes.DOUBLE) double f6, @SqlType(StandardTypes.DOUBLE) double f7, @SqlType(StandardTypes.DOUBLE) double f8)
         {
-            return featuresHelper(pageBuilder, f1, f2, f3, f4, f5, f6, f7, f8);
+            return featuresHelper(mapValueBuilder, f1, f2, f3, f4, f5, f6, f7, f8);
         }
     }
 
     @ScalarFunction("features")
     public static class Features9
     {
-        private final PageBuilder pageBuilder;
+        private final BufferedMapValueBuilder mapValueBuilder;
 
         public Features9(@TypeParameter(MAP_BIGINT_DOUBLE) Type mapType)
         {
-            pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+            mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
         }
 
         @SqlType(MAP_BIGINT_DOUBLE)
-        public Block features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4, @SqlType(StandardTypes.DOUBLE) double f5, @SqlType(StandardTypes.DOUBLE) double f6, @SqlType(StandardTypes.DOUBLE) double f7, @SqlType(StandardTypes.DOUBLE) double f8, @SqlType(StandardTypes.DOUBLE) double f9)
+        public SqlMap features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4, @SqlType(StandardTypes.DOUBLE) double f5, @SqlType(StandardTypes.DOUBLE) double f6, @SqlType(StandardTypes.DOUBLE) double f7, @SqlType(StandardTypes.DOUBLE) double f8, @SqlType(StandardTypes.DOUBLE) double f9)
         {
-            return featuresHelper(pageBuilder, f1, f2, f3, f4, f5, f6, f7, f8, f9);
+            return featuresHelper(mapValueBuilder, f1, f2, f3, f4, f5, f6, f7, f8, f9);
         }
     }
 
     @ScalarFunction("features")
     public static class Features10
     {
-        private final PageBuilder pageBuilder;
+        private final BufferedMapValueBuilder mapValueBuilder;
 
         public Features10(@TypeParameter(MAP_BIGINT_DOUBLE) Type mapType)
         {
-            pageBuilder = new PageBuilder(ImmutableList.of(mapType));
+            mapValueBuilder = BufferedMapValueBuilder.createBuffered((MapType) mapType);
         }
 
         @SqlType(MAP_BIGINT_DOUBLE)
-        public Block features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4, @SqlType(StandardTypes.DOUBLE) double f5, @SqlType(StandardTypes.DOUBLE) double f6, @SqlType(StandardTypes.DOUBLE) double f7, @SqlType(StandardTypes.DOUBLE) double f8, @SqlType(StandardTypes.DOUBLE) double f9, @SqlType(StandardTypes.DOUBLE) double f10)
+        public SqlMap features(@SqlType(StandardTypes.DOUBLE) double f1, @SqlType(StandardTypes.DOUBLE) double f2, @SqlType(StandardTypes.DOUBLE) double f3, @SqlType(StandardTypes.DOUBLE) double f4, @SqlType(StandardTypes.DOUBLE) double f5, @SqlType(StandardTypes.DOUBLE) double f6, @SqlType(StandardTypes.DOUBLE) double f7, @SqlType(StandardTypes.DOUBLE) double f8, @SqlType(StandardTypes.DOUBLE) double f9, @SqlType(StandardTypes.DOUBLE) double f10)
         {
-            return featuresHelper(pageBuilder, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10);
+            return featuresHelper(mapValueBuilder, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10);
         }
     }
 
-    private static Block featuresHelper(PageBuilder pageBuilder, double... features)
+    private static SqlMap featuresHelper(BufferedMapValueBuilder mapValueBuilder, double... features)
     {
-        if (pageBuilder.isFull()) {
-            pageBuilder.reset();
-        }
-
-        BlockBuilder mapBlockBuilder = pageBuilder.getBlockBuilder(0);
-        BlockBuilder blockBuilder = mapBlockBuilder.beginBlockEntry();
-
-        for (int i = 0; i < features.length; i++) {
-            BigintType.BIGINT.writeLong(blockBuilder, i);
-            DoubleType.DOUBLE.writeDouble(blockBuilder, features[i]);
-        }
-
-        mapBlockBuilder.closeEntry();
-        pageBuilder.declarePosition();
-        return mapBlockBuilder.getObject(mapBlockBuilder.getPositionCount() - 1, Block.class);
+        return mapValueBuilder.build(features.length, (keyBuilder, valueBuilder) -> {
+            for (int i = 0; i < features.length; i++) {
+                BigintType.BIGINT.writeLong(keyBuilder, i);
+                DoubleType.DOUBLE.writeDouble(valueBuilder, features[i]);
+            }
+        });
     }
 }
diff --git a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/MLFunctions.java b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/MLFunctions.java
index 50d205f5c184..b1e1a1fedcdb 100644
--- a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/MLFunctions.java
+++ b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/MLFunctions.java
@@ -17,16 +17,16 @@
 import com.google.common.hash.HashCode;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 import io.trino.plugin.ml.type.RegressorType;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.function.ScalarFunction;
 import io.trino.spi.function.SqlType;
 import io.trino.spi.type.StandardTypes;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.collect.cache.CacheUtils.uncheckedCacheGet;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.CacheUtils.uncheckedCacheGet;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.plugin.ml.type.ClassifierType.BIGINT_CLASSIFIER;
 import static io.trino.plugin.ml.type.ClassifierType.VARCHAR_CLASSIFIER;
 import static io.trino.plugin.ml.type.RegressorType.REGRESSOR;
@@ -42,7 +42,7 @@ private MLFunctions()
 
     @ScalarFunction("classify")
     @SqlType(StandardTypes.VARCHAR)
-    public static Slice varcharClassify(@SqlType(MAP_BIGINT_DOUBLE) Block featuresMap, @SqlType("Classifier(varchar)") Slice modelSlice)
+    public static Slice varcharClassify(@SqlType(MAP_BIGINT_DOUBLE) SqlMap featuresMap, @SqlType("Classifier(varchar)") Slice modelSlice)
     {
         FeatureVector features = ModelUtils.toFeatures(featuresMap);
         Model model = getOrLoadModel(modelSlice);
@@ -53,7 +53,7 @@ public static Slice varcharClassify(@SqlType(MAP_BIGINT_DOUBLE) Block featuresMa
 
     @ScalarFunction
     @SqlType(StandardTypes.BIGINT)
-    public static long classify(@SqlType(MAP_BIGINT_DOUBLE) Block featuresMap, @SqlType("Classifier(bigint)") Slice modelSlice)
+    public static long classify(@SqlType(MAP_BIGINT_DOUBLE) SqlMap featuresMap, @SqlType("Classifier(bigint)") Slice modelSlice)
     {
         FeatureVector features = ModelUtils.toFeatures(featuresMap);
         Model model = getOrLoadModel(modelSlice);
@@ -64,7 +64,7 @@ public static long classify(@SqlType(MAP_BIGINT_DOUBLE) Block featuresMap, @SqlT
 
     @ScalarFunction
     @SqlType(StandardTypes.DOUBLE)
-    public static double regress(@SqlType(MAP_BIGINT_DOUBLE) Block featuresMap, @SqlType(RegressorType.NAME) Slice modelSlice)
+    public static double regress(@SqlType(MAP_BIGINT_DOUBLE) SqlMap featuresMap, @SqlType(RegressorType.NAME) Slice modelSlice)
     {
         FeatureVector features = ModelUtils.toFeatures(featuresMap);
         Model model = getOrLoadModel(modelSlice);
diff --git a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/ModelUtils.java b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/ModelUtils.java
index 04ad212984e9..197975fb3545 100644
--- a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/ModelUtils.java
+++ b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/ModelUtils.java
@@ -22,6 +22,7 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -198,13 +199,17 @@ public static List<Model> deserializeModels(byte[] bytes)
     }
 
     //TODO: instead of having this function, we should add feature extractors that extend Model and extract features from Strings
-    public static FeatureVector toFeatures(Block map)
+    public static FeatureVector toFeatures(SqlMap sqlMap)
     {
         Map<Integer, Double> features = new HashMap<>();
 
-        if (map != null) {
-            for (int position = 0; position < map.getPositionCount(); position += 2) {
-                features.put((int) BIGINT.getLong(map, position), DOUBLE.getDouble(map, position + 1));
+        if (sqlMap != null) {
+            int rawOffset = sqlMap.getRawOffset();
+            Block rawKeyBlock = sqlMap.getRawKeyBlock();
+            Block rawValueBlock = sqlMap.getRawValueBlock();
+
+            for (int i = 0; i < sqlMap.getSize(); i++) {
+                features.put((int) BIGINT.getLong(rawKeyBlock, rawOffset + i), DOUBLE.getDouble(rawValueBlock, rawOffset + i));
             }
         }
         return new FeatureVector(features);
diff --git a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/type/ModelType.java b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/type/ModelType.java
index c84168005ce0..a8d023df4621 100644
--- a/plugin/trino-ml/src/main/java/io/trino/plugin/ml/type/ModelType.java
+++ b/plugin/trino-ml/src/main/java/io/trino/plugin/ml/type/ModelType.java
@@ -16,6 +16,8 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.TypeSignature;
@@ -41,22 +43,12 @@ protected ModelType(TypeSignature signature)
         super(signature, Slice.class);
     }
 
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
-    }
-
     @Override
     public Slice getSlice(Block block, int position)
     {
-        return block.getSlice(position, 0, block.getSliceLength(position));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return valueBlock.getSlice(valuePosition);
     }
 
     @Override
@@ -68,7 +60,7 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value)
     @Override
     public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int length)
     {
-        blockBuilder.writeBytes(value, offset, length).closeEntry();
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(value, offset, length);
     }
 
     @Override
diff --git a/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestEvaluateClassifierPredictions.java b/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestEvaluateClassifierPredictions.java
index 73a9f4bb9bd1..bb58185011d3 100644
--- a/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestEvaluateClassifierPredictions.java
+++ b/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestEvaluateClassifierPredictions.java
@@ -22,8 +22,7 @@
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.sql.tree.QualifiedName;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.OptionalInt;
@@ -33,7 +32,7 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.planner.plan.AggregationNode.Step.SINGLE;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestEvaluateClassifierPredictions
 {
@@ -41,9 +40,7 @@ public class TestEvaluateClassifierPredictions
     public void testEvaluateClassifierPredictions()
     {
         TestingFunctionResolution functionResolution = new TestingFunctionResolution(extractFunctions(new MLPlugin().getFunctions()));
-        TestingAggregationFunction aggregation = functionResolution.getAggregateFunction(
-                QualifiedName.of("evaluate_classifier_predictions"),
-                fromTypes(BIGINT, BIGINT));
+        TestingAggregationFunction aggregation = functionResolution.getAggregateFunction("evaluate_classifier_predictions", fromTypes(BIGINT, BIGINT));
         Aggregator aggregator = aggregation.createAggregatorFactory(SINGLE, ImmutableList.of(0, 1), OptionalInt.empty()).createAggregator();
         aggregator.processPage(getPage());
         BlockBuilder finalOut = VARCHAR.createBlockBuilder(null, 1);
@@ -52,8 +49,10 @@ public void testEvaluateClassifierPredictions()
 
         String output = VARCHAR.getSlice(block, 0).toStringUtf8();
         List<String> parts = ImmutableList.copyOf(Splitter.on('\n').omitEmptyStrings().split(output));
-        assertEquals(parts.size(), 7, output);
-        assertEquals(parts.get(0), "Accuracy: 1/2 (50.00%)");
+        assertThat(parts.size())
+                .describedAs(output)
+                .isEqualTo(7);
+        assertThat(parts.get(0)).isEqualTo("Accuracy: 1/2 (50.00%)");
     }
 
     private static Page getPage()
diff --git a/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestFeatureTransformations.java b/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestFeatureTransformations.java
index 47c8c8627b20..3356b5b41856 100644
--- a/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestFeatureTransformations.java
+++ b/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestFeatureTransformations.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -23,8 +23,7 @@
 import java.util.Set;
 
 import static io.trino.plugin.ml.TestUtils.getDataset;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestFeatureTransformations
 {
@@ -43,11 +42,11 @@ public void testUnitNormalizer()
             }
         }
         // Make sure there is a feature that needs to be normalized
-        assertTrue(valueGreaterThanOne);
+        assertThat(valueGreaterThanOne).isTrue();
         transformation.train(dataset);
         for (FeatureVector vector : transformation.transform(dataset).getDatapoints()) {
             for (double value : vector.getFeatures().values()) {
-                assertTrue(value <= 1);
+                assertThat(value <= 1).isTrue();
             }
         }
     }
@@ -69,6 +68,6 @@ public void testUnitNormalizerSimple()
         for (FeatureVector vector : transformation.transform(dataset).getDatapoints()) {
             featureValues.addAll(vector.getFeatures().values());
         }
-        assertEquals(featureValues, ImmutableSet.of(0.0, 0.5, 1.0));
+        assertThat(featureValues).isEqualTo(ImmutableSet.of(0.0, 0.5, 1.0));
     }
 }
diff --git a/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestLearnAggregations.java b/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestLearnAggregations.java
index 400a2cb12d3c..7707328c68f9 100644
--- a/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestLearnAggregations.java
+++ b/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestLearnAggregations.java
@@ -27,9 +27,8 @@
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.Type;
 import io.trino.sql.PlannerContext;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.transaction.TransactionManager;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.OptionalInt;
 import java.util.Random;
@@ -43,11 +42,10 @@
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypeSignatures;
 import static io.trino.sql.planner.TestingPlannerContext.plannerContextBuilder;
 import static io.trino.sql.planner.plan.AggregationNode.Step.SINGLE;
-import static io.trino.testing.StructuralTestUtil.mapBlockOf;
+import static io.trino.testing.StructuralTestUtil.sqlMapOf;
 import static io.trino.transaction.InMemoryTransactionManager.createTestTransactionManager;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestLearnAggregations
 {
@@ -69,7 +67,7 @@ public class TestLearnAggregations
     public void testLearn()
     {
         TestingAggregationFunction aggregationFunction = FUNCTION_RESOLUTION.getAggregateFunction(
-                QualifiedName.of("learn_classifier"),
+                "learn_classifier",
                 fromTypeSignatures(BIGINT.getTypeSignature(), mapType(BIGINT.getTypeSignature(), DOUBLE.getTypeSignature())));
         assertLearnClassifier(aggregationFunction.createAggregatorFactory(SINGLE, ImmutableList.of(0, 1), OptionalInt.empty()).createAggregator());
     }
@@ -78,7 +76,7 @@ public void testLearn()
     public void testLearnLibSvm()
     {
         TestingAggregationFunction aggregationFunction = FUNCTION_RESOLUTION.getAggregateFunction(
-                QualifiedName.of("learn_libsvm_classifier"),
+                "learn_libsvm_classifier",
                 fromTypeSignatures(BIGINT.getTypeSignature(), mapType(BIGINT.getTypeSignature(), DOUBLE.getTypeSignature()), VARCHAR.getTypeSignature()));
         assertLearnClassifier(aggregationFunction.createAggregatorFactory(SINGLE, ImmutableList.of(0, 1, 2), OptionalInt.empty()).createAggregator());
     }
@@ -91,8 +89,11 @@ private static void assertLearnClassifier(Aggregator aggregator)
         Block block = finalOut.build();
         Slice slice = aggregator.getType().getSlice(block, 0);
         Model deserialized = ModelUtils.deserialize(slice);
-        assertNotNull(deserialized, "deserialization failed");
-        assertTrue(deserialized instanceof Classifier, "deserialized model is not a classifier");
+        assertThat(deserialized)
+                .describedAs("deserialization failed")
+                .isNotNull();
+
+        assertThat(deserialized).isInstanceOf(Classifier.class);
     }
 
     private static Page getPage()
@@ -103,7 +104,7 @@ private static Page getPage()
         Random rand = new Random(0);
         for (int i = 0; i < datapoints; i++) {
             long label = rand.nextDouble() < 0.5 ? 0 : 1;
-            builder.row(label, mapBlockOf(BIGINT, DOUBLE, 0L, label + rand.nextGaussian()), "C=1");
+            builder.row(label, sqlMapOf(BIGINT, DOUBLE, 0L, label + rand.nextGaussian()), "C=1");
         }
 
         return builder.build();
diff --git a/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestMLQueries.java b/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestMLQueries.java
index 76e935e54db0..86560c37ad25 100644
--- a/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestMLQueries.java
+++ b/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestMLQueries.java
@@ -19,7 +19,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
diff --git a/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestModelSerialization.java b/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestModelSerialization.java
index 4242eda8b2b3..6ab4b39f84cc 100644
--- a/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestModelSerialization.java
+++ b/plugin/trino-ml/src/test/java/io/trino/plugin/ml/TestModelSerialization.java
@@ -14,12 +14,10 @@
 package io.trino.plugin.ml;
 
 import io.airlift.slice.Slice;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.ml.TestUtils.getDataset;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestModelSerialization
 {
@@ -30,8 +28,12 @@ public void testSvmClassifier()
         model.train(getDataset());
         Slice serialized = ModelUtils.serialize(model);
         Model deserialized = ModelUtils.deserialize(serialized);
-        assertNotNull(deserialized, "deserialization failed");
-        assertTrue(deserialized instanceof SvmClassifier, "deserialized model is not a svm");
+        assertThat(deserialized)
+                .describedAs("deserialization failed")
+                .isNotNull();
+        assertThat(deserialized)
+                .describedAs("deserialized model is not a svm")
+                .isInstanceOf(SvmClassifier.class);
     }
 
     @Test
@@ -41,8 +43,12 @@ public void testSvmRegressor()
         model.train(getDataset());
         Slice serialized = ModelUtils.serialize(model);
         Model deserialized = ModelUtils.deserialize(serialized);
-        assertNotNull(deserialized, "deserialization failed");
-        assertTrue(deserialized instanceof SvmRegressor, "deserialized model is not a svm");
+        assertThat(deserialized)
+                .describedAs("deserialization failed")
+                .isNotNull();
+        assertThat(deserialized)
+                .describedAs("deserialized model is not a svm")
+                .isInstanceOf(SvmRegressor.class);
     }
 
     @Test
@@ -52,8 +58,12 @@ public void testRegressorFeatureTransformer()
         model.train(getDataset());
         Slice serialized = ModelUtils.serialize(model);
         Model deserialized = ModelUtils.deserialize(serialized);
-        assertNotNull(deserialized, "deserialization failed");
-        assertTrue(deserialized instanceof RegressorFeatureTransformer, "deserialized model is not a regressor feature transformer");
+        assertThat(deserialized)
+                .describedAs("deserialization failed")
+                .isNotNull();
+        assertThat(deserialized)
+                .describedAs("deserialized model is not a regressor feature transformer")
+                .isInstanceOf(RegressorFeatureTransformer.class);
     }
 
     @Test
@@ -63,8 +73,12 @@ public void testClassifierFeatureTransformer()
         model.train(getDataset());
         Slice serialized = ModelUtils.serialize(model);
         Model deserialized = ModelUtils.deserialize(serialized);
-        assertNotNull(deserialized, "deserialization failed");
-        assertTrue(deserialized instanceof ClassifierFeatureTransformer, "deserialized model is not a classifier feature transformer");
+        assertThat(deserialized)
+                .describedAs("deserialization failed")
+                .isNotNull();
+        assertThat(deserialized)
+                .describedAs("deserialized model is not a classifier feature transformer")
+                .isInstanceOf(ClassifierFeatureTransformer.class);
     }
 
     @Test
@@ -74,19 +88,23 @@ public void testVarcharClassifierAdapter()
         model.train(getDataset());
         Slice serialized = ModelUtils.serialize(model);
         Model deserialized = ModelUtils.deserialize(serialized);
-        assertNotNull(deserialized, "deserialization failed");
-        assertTrue(deserialized instanceof StringClassifierAdapter, "deserialized model is not a varchar classifier adapter");
+        assertThat(deserialized)
+                .describedAs("deserialization failed")
+                .isNotNull();
+        assertThat(deserialized)
+                .describedAs("deserialized model is not a varchar classifier adapter")
+                .isInstanceOf(StringClassifierAdapter.class);
     }
 
     @Test
     public void testSerializationIds()
     {
-        assertEquals((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(SvmClassifier.class), 1);
-        assertEquals((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(SvmRegressor.class), 2);
-        assertEquals((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(FeatureVectorUnitNormalizer.class), 3);
-        assertEquals((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(ClassifierFeatureTransformer.class), 4);
-        assertEquals((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(RegressorFeatureTransformer.class), 5);
-        assertEquals((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(FeatureUnitNormalizer.class), 6);
-        assertEquals((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(StringClassifierAdapter.class), 7);
+        assertThat((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(SvmClassifier.class)).isEqualTo(1);
+        assertThat((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(SvmRegressor.class)).isEqualTo(2);
+        assertThat((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(FeatureVectorUnitNormalizer.class)).isEqualTo(3);
+        assertThat((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(ClassifierFeatureTransformer.class)).isEqualTo(4);
+        assertThat((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(RegressorFeatureTransformer.class)).isEqualTo(5);
+        assertThat((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(FeatureUnitNormalizer.class)).isEqualTo(6);
+        assertThat((int) ModelUtils.MODEL_SERIALIZATION_IDS.get(StringClassifierAdapter.class)).isEqualTo(7);
     }
 }
diff --git a/plugin/trino-mongodb/pom.xml b/plugin/trino-mongodb/pom.xml
index d30b4fa78f6d..922b912d5597 100644
--- a/plugin/trino-mongodb/pom.xml
+++ b/plugin/trino-mongodb/pom.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-mongodb</artifactId>
-    <description>Trino - mongodb Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - mongodb Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <mongo-java.version>4.4.0</mongo-java.version>
+        <mongo-java.version>4.11.0</mongo-java.version>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -49,33 +49,23 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-mongo-3.1</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -101,29 +91,33 @@
             <version>${mongo-java.version}</version>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -133,7 +127,30 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-exchange-filesystem</artifactId>
@@ -184,18 +201,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -261,43 +266,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/Test*FailureRecoveryTest.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>fte-tests</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/Test*FailureRecoveryTest.java</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/DefaultMongoMetadataFactory.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/DefaultMongoMetadataFactory.java
new file mode 100644
index 000000000000..8f9d12690b3c
--- /dev/null
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/DefaultMongoMetadataFactory.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed 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 io.trino.plugin.mongodb;
+
+import com.google.inject.Inject;
+
+import static java.util.Objects.requireNonNull;
+
+public class DefaultMongoMetadataFactory
+        implements MongoMetadataFactory
+{
+    private final MongoSession mongoSession;
+
+    @Inject
+    public DefaultMongoMetadataFactory(MongoSession mongoSession)
+    {
+        this.mongoSession = requireNonNull(mongoSession, "mongoSession is null");
+    }
+
+    @Override
+    public MongoMetadata create()
+    {
+        return new MongoMetadata(mongoSession);
+    }
+}
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoClientConfig.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoClientConfig.java
index 6ad3fdd3ec88..fa1e82640a52 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoClientConfig.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoClientConfig.java
@@ -14,18 +14,13 @@
 package io.trino.plugin.mongodb;
 
 import io.airlift.configuration.Config;
+import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.configuration.DefunctConfig;
 import io.airlift.configuration.LegacyConfig;
-import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-
-import java.io.File;
-import java.util.Optional;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 @DefunctConfig({"mongodb.connection-per-host", "mongodb.socket-keep-alive", "mongodb.seeds", "mongodb.credentials"})
 public class MongoClientConfig
@@ -41,10 +36,6 @@ public class MongoClientConfig
     private int socketTimeout;
     private int maxConnectionIdleTime;
     private boolean tlsEnabled;
-    private File keystorePath;
-    private String keystorePassword;
-    private File truststorePath;
-    private String truststorePassword;
 
     // query configurations
     private int cursorBatchSize; // use driver default
@@ -53,15 +44,7 @@ public class MongoClientConfig
     private WriteConcernType writeConcern = WriteConcernType.ACKNOWLEDGED;
     private String requiredReplicaSetName;
     private String implicitRowFieldPrefix = "_pos";
-
-    @AssertTrue(message = "'mongodb.tls.keystore-path', 'mongodb.tls.keystore-password', 'mongodb.tls.truststore-path' and 'mongodb.tls.truststore-password' must be empty when TLS is disabled")
-    public boolean isValidTlsConfig()
-    {
-        if (!tlsEnabled) {
-            return keystorePath == null && keystorePassword == null && truststorePath == null && truststorePassword == null;
-        }
-        return true;
-    }
+    private boolean projectionPushDownEnabled = true;
 
     @NotNull
     public String getSchemaCollection()
@@ -243,66 +226,29 @@ public MongoClientConfig setTlsEnabled(boolean tlsEnabled)
         return this;
     }
 
-    public Optional<@FileExists File> getKeystorePath()
-    {
-        return Optional.ofNullable(keystorePath);
-    }
-
-    @Config("mongodb.tls.keystore-path")
-    public MongoClientConfig setKeystorePath(File keystorePath)
-    {
-        this.keystorePath = keystorePath;
-        return this;
-    }
-
-    public Optional<String> getKeystorePassword()
-    {
-        return Optional.ofNullable(keystorePassword);
-    }
-
-    @Config("mongodb.tls.keystore-password")
-    @ConfigSecuritySensitive
-    public MongoClientConfig setKeystorePassword(String keystorePassword)
-    {
-        this.keystorePassword = keystorePassword;
-        return this;
-    }
-
-    public Optional<@FileExists File> getTruststorePath()
-    {
-        return Optional.ofNullable(truststorePath);
-    }
-
-    @Config("mongodb.tls.truststore-path")
-    public MongoClientConfig setTruststorePath(File truststorePath)
-    {
-        this.truststorePath = truststorePath;
-        return this;
-    }
-
-    public Optional<String> getTruststorePassword()
+    @Min(0)
+    public int getMaxConnectionIdleTime()
     {
-        return Optional.ofNullable(truststorePassword);
+        return maxConnectionIdleTime;
     }
 
-    @Config("mongodb.tls.truststore-password")
-    @ConfigSecuritySensitive
-    public MongoClientConfig setTruststorePassword(String truststorePassword)
+    @Config("mongodb.max-connection-idle-time")
+    public MongoClientConfig setMaxConnectionIdleTime(int maxConnectionIdleTime)
     {
-        this.truststorePassword = truststorePassword;
+        this.maxConnectionIdleTime = maxConnectionIdleTime;
         return this;
     }
 
-    @Min(0)
-    public int getMaxConnectionIdleTime()
+    public boolean isProjectionPushdownEnabled()
     {
-        return maxConnectionIdleTime;
+        return projectionPushDownEnabled;
     }
 
-    @Config("mongodb.max-connection-idle-time")
-    public MongoClientConfig setMaxConnectionIdleTime(int maxConnectionIdleTime)
+    @Config("mongodb.projection-pushdown-enabled")
+    @ConfigDescription("Read only required fields from a row type")
+    public MongoClientConfig setProjectionPushdownEnabled(boolean projectionPushDownEnabled)
     {
-        this.maxConnectionIdleTime = maxConnectionIdleTime;
+        this.projectionPushDownEnabled = projectionPushDownEnabled;
         return this;
     }
 }
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoClientModule.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoClientModule.java
index f9175eb4da8b..f856c7d21f1a 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoClientModule.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoClientModule.java
@@ -14,76 +14,61 @@
 package io.trino.plugin.mongodb;
 
 import com.google.inject.Binder;
-import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
+import com.google.inject.multibindings.ProvidesIntoSet;
 import com.mongodb.ConnectionString;
 import com.mongodb.MongoClientSettings;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
+import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.mongo.v3_1.MongoTelemetry;
+import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.plugin.mongodb.ptf.Query;
-import io.trino.spi.TrinoException;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Singleton;
-import javax.net.ssl.SSLContext;
-
-import java.io.File;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.util.Optional;
+import java.util.Set;
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
+import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
+import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.airlift.configuration.ConfigBinder.configBinder;
-import static io.trino.plugin.base.ssl.SslUtils.createSSLContext;
-import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 public class MongoClientModule
-        implements Module
+        extends AbstractConfigurationAwareModule
 {
     @Override
-    public void configure(Binder binder)
+    public void setup(Binder binder)
     {
         binder.bind(MongoConnector.class).in(Scopes.SINGLETON);
         binder.bind(MongoSplitManager.class).in(Scopes.SINGLETON);
         binder.bind(MongoPageSourceProvider.class).in(Scopes.SINGLETON);
         binder.bind(MongoPageSinkProvider.class).in(Scopes.SINGLETON);
+        newSetBinder(binder, SessionPropertiesProvider.class).addBinding().to(MongoSessionProperties.class).in(Scopes.SINGLETON);
+        newOptionalBinder(binder, MongoMetadataFactory.class).setDefault().to(DefaultMongoMetadataFactory.class).in(Scopes.SINGLETON);
 
         configBinder(binder).bindConfig(MongoClientConfig.class);
+        newSetBinder(binder, MongoClientSettingConfigurator.class);
+
+        install(conditionalModule(
+                MongoClientConfig.class,
+                MongoClientConfig::getTlsEnabled,
+                new MongoSslModule()));
+
         newSetBinder(binder, ConnectorTableFunction.class).addBinding().toProvider(Query.class).in(Scopes.SINGLETON);
     }
 
     @Singleton
     @Provides
-    public static MongoSession createMongoSession(TypeManager typeManager, MongoClientConfig config)
+    public static MongoSession createMongoSession(TypeManager typeManager, MongoClientConfig config, Set<MongoClientSettingConfigurator> configurators, OpenTelemetry openTelemetry)
     {
         MongoClientSettings.Builder options = MongoClientSettings.builder();
-        options.writeConcern(config.getWriteConcern().getWriteConcern())
-                .readPreference(config.getReadPreference().getReadPreference())
-                .applyToConnectionPoolSettings(builder -> builder
-                        .maxConnectionIdleTime(config.getMaxConnectionIdleTime(), MILLISECONDS)
-                        .maxWaitTime(config.getMaxWaitTime(), MILLISECONDS)
-                        .minSize(config.getMinConnectionsPerHost())
-                        .maxSize(config.getConnectionsPerHost()))
-                .applyToSocketSettings(builder -> builder
-                        .connectTimeout(config.getConnectionTimeout(), MILLISECONDS)
-                        .readTimeout(config.getSocketTimeout(), MILLISECONDS));
-
-        if (config.getRequiredReplicaSetName() != null) {
-            options.applyToClusterSettings(builder -> builder.requiredReplicaSetName(config.getRequiredReplicaSetName()));
-        }
-        if (config.getTlsEnabled()) {
-            options.applyToSslSettings(builder -> {
-                builder.enabled(true);
-                buildSslContext(config.getKeystorePath(), config.getKeystorePassword(), config.getTruststorePath(), config.getTruststorePassword())
-                        .ifPresent(builder::context);
-            });
-        }
-
-        options.applyConnectionString(new ConnectionString(config.getConnectionUrl()));
-
+        configurators.forEach(configurator -> configurator.configure(options));
+        options.addCommandListener(MongoTelemetry.builder(openTelemetry).build().newCommandListener());
         MongoClient client = MongoClients.create(options.build());
 
         return new MongoSession(
@@ -92,22 +77,26 @@ public static MongoSession createMongoSession(TypeManager typeManager, MongoClie
                 config);
     }
 
-    // TODO https://github.com/trinodb/trino/issues/15247 Add test for x.509 certificates
-    private static Optional<SSLContext> buildSslContext(
-            Optional<File> keystorePath,
-            Optional<String> keystorePassword,
-            Optional<File> truststorePath,
-            Optional<String> truststorePassword)
+    @ProvidesIntoSet
+    @Singleton
+    public MongoClientSettingConfigurator defaultConfigurator(MongoClientConfig config)
     {
-        if (keystorePath.isEmpty() && truststorePath.isEmpty()) {
-            return Optional.empty();
-        }
+        return options -> {
+            options.writeConcern(config.getWriteConcern().getWriteConcern())
+                    .readPreference(config.getReadPreference().getReadPreference())
+                    .applyToConnectionPoolSettings(builder -> builder
+                            .maxConnectionIdleTime(config.getMaxConnectionIdleTime(), MILLISECONDS)
+                            .maxWaitTime(config.getMaxWaitTime(), MILLISECONDS)
+                            .minSize(config.getMinConnectionsPerHost())
+                            .maxSize(config.getConnectionsPerHost()))
+                    .applyToSocketSettings(builder -> builder
+                            .connectTimeout(config.getConnectionTimeout(), MILLISECONDS)
+                            .readTimeout(config.getSocketTimeout(), MILLISECONDS));
 
-        try {
-            return Optional.of(createSSLContext(keystorePath, keystorePassword, truststorePath, truststorePassword));
-        }
-        catch (GeneralSecurityException | IOException e) {
-            throw new TrinoException(GENERIC_INTERNAL_ERROR, e);
-        }
+            if (config.getRequiredReplicaSetName() != null) {
+                options.applyToClusterSettings(builder -> builder.requiredReplicaSetName(config.getRequiredReplicaSetName()));
+            }
+            options.applyConnectionString(new ConnectionString(config.getConnectionUrl()));
+        };
     }
 }
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoClientSettingConfigurator.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoClientSettingConfigurator.java
new file mode 100644
index 000000000000..738af5dbd3ef
--- /dev/null
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoClientSettingConfigurator.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed 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 io.trino.plugin.mongodb;
+
+import com.mongodb.MongoClientSettings;
+
+public interface MongoClientSettingConfigurator
+{
+    void configure(MongoClientSettings.Builder builder);
+}
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoColumnHandle.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoColumnHandle.java
index 71b62bfcc84b..2692d2d48cd9 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoColumnHandle.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoColumnHandle.java
@@ -14,12 +14,16 @@
 package io.trino.plugin.mongodb;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.type.Type;
 import org.bson.Document;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -28,28 +32,41 @@
 public class MongoColumnHandle
         implements ColumnHandle
 {
-    private final String name;
+    private final String baseName;
+    private final List<String> dereferenceNames;
     private final Type type;
     private final boolean hidden;
+    // Represent if the field is inside a DBRef type
+    private final boolean dbRefField;
     private final Optional<String> comment;
 
     @JsonCreator
     public MongoColumnHandle(
-            @JsonProperty("name") String name,
+            @JsonProperty("baseName") String baseName,
+            @JsonProperty("dereferenceNames") List<String> dereferenceNames,
             @JsonProperty("columnType") Type type,
             @JsonProperty("hidden") boolean hidden,
+            @JsonProperty("dbRefField") boolean dbRefField,
             @JsonProperty("comment") Optional<String> comment)
     {
-        this.name = requireNonNull(name, "name is null");
+        this.baseName = requireNonNull(baseName, "baseName is null");
+        this.dereferenceNames = ImmutableList.copyOf(requireNonNull(dereferenceNames, "dereferenceNames is null"));
         this.type = requireNonNull(type, "type is null");
         this.hidden = hidden;
+        this.dbRefField = dbRefField;
         this.comment = requireNonNull(comment, "comment is null");
     }
 
     @JsonProperty
-    public String getName()
+    public String getBaseName()
     {
-        return name;
+        return baseName;
+    }
+
+    @JsonProperty
+    public List<String> getDereferenceNames()
+    {
+        return dereferenceNames;
     }
 
     @JsonProperty("columnType")
@@ -64,6 +81,15 @@ public boolean isHidden()
         return hidden;
     }
 
+    /**
+     * This method may return a wrong value when row type use the same field names and types as dbref.
+     */
+    @JsonProperty
+    public boolean isDbRefField()
+    {
+        return dbRefField;
+    }
+
     @JsonProperty
     public Optional<String> getComment()
     {
@@ -73,25 +99,42 @@ public Optional<String> getComment()
     public ColumnMetadata toColumnMetadata()
     {
         return ColumnMetadata.builder()
-                .setName(name)
+                .setName(getQualifiedName())
                 .setType(type)
                 .setHidden(hidden)
                 .setComment(comment)
                 .build();
     }
 
+    @JsonIgnore
+    public String getQualifiedName()
+    {
+        return Joiner.on('.')
+                .join(ImmutableList.<String>builder()
+                        .add(baseName)
+                        .addAll(dereferenceNames)
+                        .build());
+    }
+
+    @JsonIgnore
+    public boolean isBaseColumn()
+    {
+        return dereferenceNames.isEmpty();
+    }
+
     public Document getDocument()
     {
-        return new Document().append("name", name)
+        return new Document().append("name", getQualifiedName())
                 .append("type", type.getTypeSignature().toString())
                 .append("hidden", hidden)
+                .append("dbRefField", dbRefField)
                 .append("comment", comment.orElse(null));
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(name, type, hidden, comment);
+        return Objects.hash(baseName, dereferenceNames, type, hidden, dbRefField, comment);
     }
 
     @Override
@@ -104,15 +147,17 @@ public boolean equals(Object obj)
             return false;
         }
         MongoColumnHandle other = (MongoColumnHandle) obj;
-        return Objects.equals(name, other.name) &&
+        return Objects.equals(baseName, other.baseName) &&
+                Objects.equals(dereferenceNames, other.dereferenceNames) &&
                 Objects.equals(type, other.type) &&
                 Objects.equals(hidden, other.hidden) &&
+                Objects.equals(dbRefField, other.dbRefField) &&
                 Objects.equals(comment, other.comment);
     }
 
     @Override
     public String toString()
     {
-        return name + ":" + type;
+        return getQualifiedName() + ":" + type;
     }
 }
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoConnector.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoConnector.java
index 8e5f6f61807f..03e16a0554e4 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoConnector.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoConnector.java
@@ -14,6 +14,8 @@
 package io.trino.plugin.mongodb;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorPageSinkProvider;
@@ -21,16 +23,17 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.spi.transaction.IsolationLevel.READ_UNCOMMITTED;
 import static io.trino.spi.transaction.IsolationLevel.checkConnectorSupports;
 import static java.util.Objects.requireNonNull;
@@ -42,7 +45,9 @@ public class MongoConnector
     private final MongoSplitManager splitManager;
     private final MongoPageSourceProvider pageSourceProvider;
     private final MongoPageSinkProvider pageSinkProvider;
+    private final MongoMetadataFactory mongoMetadataFactory;
     private final Set<ConnectorTableFunction> connectorTableFunctions;
+    private final List<PropertyMetadata<?>> sessionProperties;
 
     private final ConcurrentMap<ConnectorTransactionHandle, MongoMetadata> transactions = new ConcurrentHashMap<>();
 
@@ -52,13 +57,19 @@ public MongoConnector(
             MongoSplitManager splitManager,
             MongoPageSourceProvider pageSourceProvider,
             MongoPageSinkProvider pageSinkProvider,
-            Set<ConnectorTableFunction> connectorTableFunctions)
+            MongoMetadataFactory mongoMetadataFactory,
+            Set<ConnectorTableFunction> connectorTableFunctions,
+            Set<SessionPropertiesProvider> sessionPropertiesProviders)
     {
         this.mongoSession = mongoSession;
         this.splitManager = requireNonNull(splitManager, "splitManager is null");
         this.pageSourceProvider = requireNonNull(pageSourceProvider, "pageSourceProvider is null");
         this.pageSinkProvider = requireNonNull(pageSinkProvider, "pageSinkProvider is null");
+        this.mongoMetadataFactory = requireNonNull(mongoMetadataFactory, "mongoMetadataFactory is null");
         this.connectorTableFunctions = ImmutableSet.copyOf(requireNonNull(connectorTableFunctions, "connectorTableFunctions is null"));
+        this.sessionProperties = sessionPropertiesProviders.stream()
+                .flatMap(sessionPropertiesProvider -> sessionPropertiesProvider.getSessionProperties().stream())
+                .collect(toImmutableList());
     }
 
     @Override
@@ -66,7 +77,7 @@ public ConnectorTransactionHandle beginTransaction(IsolationLevel isolationLevel
     {
         checkConnectorSupports(READ_UNCOMMITTED, isolationLevel);
         MongoTransactionHandle transaction = new MongoTransactionHandle();
-        transactions.put(transaction, new MongoMetadata(mongoSession));
+        transactions.put(transaction, mongoMetadataFactory.create());
         return transaction;
     }
 
@@ -116,6 +127,12 @@ public Set<ConnectorTableFunction> getTableFunctions()
         return connectorTableFunctions;
     }
 
+    @Override
+    public List<PropertyMetadata<?>> getSessionProperties()
+    {
+        return sessionProperties;
+    }
+
     @Override
     public void shutdown()
     {
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoConnectorFactory.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoConnectorFactory.java
index 35e523f77893..4d61c6340bca 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoConnectorFactory.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoConnectorFactory.java
@@ -16,6 +16,7 @@
 import com.google.inject.Injector;
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.json.JsonModule;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.ConnectorFactory;
@@ -25,7 +26,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class MongoConnectorFactory
@@ -49,12 +50,13 @@ public String getName()
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
         requireNonNull(config, "config is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 new JsonModule(),
                 new MongoClientModule(),
-                binder -> binder.bind(TypeManager.class).toInstance(context.getTypeManager()));
+                binder -> binder.bind(TypeManager.class).toInstance(context.getTypeManager()),
+                binder -> binder.bind(OpenTelemetry.class).toInstance(context.getOpenTelemetry()));
 
         Injector injector = app.doNotInitializeLogging()
                 .setRequiredConfigurationProperties(config)
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoIndex.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoIndex.java
index b357bff4a75b..1f7bd5626a52 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoIndex.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoIndex.java
@@ -26,9 +26,7 @@
 
 public class MongoIndex
 {
-    private final String name;
     private final List<MongodbIndexKey> keys;
-    private final boolean unique;
 
     public static List<MongoIndex> parse(ListIndexesIterable<Document> indexes)
     {
@@ -36,13 +34,11 @@ public static List<MongoIndex> parse(ListIndexesIterable<Document> indexes)
         for (Document index : indexes) {
             // TODO: v, ns, sparse fields
             Document key = (Document) index.get("key");
-            String name = index.getString("name");
-            boolean unique = index.getBoolean("unique", false);
 
             if (key.containsKey("_fts")) { // Full Text Search
                 continue;
             }
-            builder.add(new MongoIndex(name, parseKey(key), unique));
+            builder.add(new MongoIndex(parseKey(key)));
         }
 
         return builder.build();
@@ -70,16 +66,9 @@ else if (value instanceof String) {
         return builder.build();
     }
 
-    public MongoIndex(String name, List<MongodbIndexKey> keys, boolean unique)
+    public MongoIndex(List<MongodbIndexKey> keys)
     {
-        this.name = name;
         this.keys = keys;
-        this.unique = unique;
-    }
-
-    public String getName()
-    {
-        return name;
     }
 
     public List<MongodbIndexKey> getKeys()
@@ -87,11 +76,6 @@ public List<MongodbIndexKey> getKeys()
         return keys;
     }
 
-    public boolean isUnique()
-    {
-        return unique;
-    }
-
     public static class MongodbIndexKey
     {
         private final String name;
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoMetadata.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoMetadata.java
index 97ee4c002da4..37ca08535c28 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoMetadata.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoMetadata.java
@@ -15,17 +15,19 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
 import com.google.common.io.Closer;
 import com.mongodb.client.MongoCollection;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
+import io.trino.plugin.base.projection.ApplyProjectionUtil;
 import io.trino.plugin.mongodb.MongoIndex.MongodbIndexKey;
 import io.trino.plugin.mongodb.ptf.Query.QueryFunctionHandle;
 import io.trino.spi.TrinoException;
+import io.trino.spi.connector.Assignment;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
-import io.trino.spi.connector.ColumnSchema;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorOutputMetadata;
@@ -35,21 +37,24 @@
 import io.trino.spi.connector.ConnectorTableLayout;
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.ConnectorTableProperties;
-import io.trino.spi.connector.ConnectorTableSchema;
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.ConstraintApplicationResult;
 import io.trino.spi.connector.LimitApplicationResult;
 import io.trino.spi.connector.LocalProperty;
 import io.trino.spi.connector.NotFoundException;
+import io.trino.spi.connector.ProjectionApplicationResult;
 import io.trino.spi.connector.RetryMode;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.connector.SortingProperty;
 import io.trino.spi.connector.TableFunctionApplicationResult;
 import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.FieldDereference;
+import io.trino.spi.expression.Variable;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.statistics.ComputedStatistics;
 import io.trino.spi.type.ArrayType;
@@ -76,6 +81,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.mongodb.client.model.Aggregates.lookup;
@@ -85,6 +91,13 @@
 import static com.mongodb.client.model.Filters.ne;
 import static com.mongodb.client.model.Projections.exclude;
 import static io.trino.plugin.base.TemporaryTables.generateTemporaryTableName;
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.ProjectedColumnRepresentation;
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.extractSupportedProjectedColumns;
+import static io.trino.plugin.base.projection.ApplyProjectionUtil.replaceWithNewVariables;
+import static io.trino.plugin.mongodb.MongoSession.COLLECTION_NAME;
+import static io.trino.plugin.mongodb.MongoSession.DATABASE_NAME;
+import static io.trino.plugin.mongodb.MongoSession.ID;
+import static io.trino.plugin.mongodb.MongoSessionProperties.isProjectionPushdownEnabled;
 import static io.trino.plugin.mongodb.TypeUtils.isPushdownSupportedType;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
@@ -94,11 +107,13 @@
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TinyintType.TINYINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
+import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.toList;
 
 public class MongoMetadata
@@ -132,9 +147,9 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
-        mongoSession.dropSchema(schemaName);
+        mongoSession.dropSchema(schemaName, cascade);
     }
 
     @Override
@@ -180,7 +195,7 @@ public Map<String, ColumnHandle> getColumnHandles(ConnectorSession session, Conn
 
         ImmutableMap.Builder<String, ColumnHandle> columnHandles = ImmutableMap.builder();
         for (MongoColumnHandle columnHandle : columns) {
-            columnHandles.put(columnHandle.getName().toLowerCase(ENGLISH), columnHandle);
+            columnHandles.put(columnHandle.getBaseName().toLowerCase(ENGLISH), columnHandle);
         }
         return columnHandles.buildOrThrow();
     }
@@ -242,7 +257,7 @@ public void setColumnComment(ConnectorSession session, ConnectorTableHandle tabl
     {
         MongoTableHandle table = (MongoTableHandle) tableHandle;
         MongoColumnHandle column = (MongoColumnHandle) columnHandle;
-        mongoSession.setColumnComment(table, column.getName(), comment);
+        mongoSession.setColumnComment(table, column.getBaseName(), comment);
     }
 
     @Override
@@ -261,10 +276,16 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
         mongoSession.addColumn(((MongoTableHandle) tableHandle), column);
     }
 
+    @Override
+    public void renameColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle source, String target)
+    {
+        mongoSession.renameColumn(((MongoTableHandle) tableHandle), ((MongoColumnHandle) source).getBaseName(), target);
+    }
+
     @Override
     public void dropColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column)
     {
-        mongoSession.dropColumn(((MongoTableHandle) tableHandle), ((MongoColumnHandle) column).getName());
+        mongoSession.dropColumn(((MongoTableHandle) tableHandle), ((MongoColumnHandle) column).getBaseName());
     }
 
     @Override
@@ -275,7 +296,7 @@ public void setColumnType(ConnectorSession session, ConnectorTableHandle tableHa
         if (!canChangeColumnType(column.getType(), type)) {
             throw new TrinoException(NOT_SUPPORTED, "Cannot change type from %s to %s".formatted(column.getType(), type));
         }
-        mongoSession.setColumnType(table, column.getName(), type);
+        mongoSession.setColumnType(table, column.getBaseName(), type);
     }
 
     private static boolean canChangeColumnType(Type sourceType, Type newType)
@@ -371,7 +392,7 @@ public ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, Con
                     Optional.empty());
         }
 
-        MongoColumnHandle pageSinkIdColumn = buildPageSinkIdColumn(columns.stream().map(MongoColumnHandle::getName).collect(toImmutableSet()));
+        MongoColumnHandle pageSinkIdColumn = buildPageSinkIdColumn(columns.stream().map(MongoColumnHandle::getBaseName).collect(toImmutableSet()));
         List<MongoColumnHandle> allTemporaryTableColumns = ImmutableList.<MongoColumnHandle>builderWithExpectedSize(columns.size() + 1)
                 .addAll(columns)
                 .add(pageSinkIdColumn)
@@ -384,7 +405,7 @@ public ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, Con
                 remoteTableName,
                 handleColumns,
                 Optional.of(temporaryTable.getCollectionName()),
-                Optional.of(pageSinkIdColumn.getName()));
+                Optional.of(pageSinkIdColumn.getBaseName()));
     }
 
     @Override
@@ -406,7 +427,7 @@ public ConnectorInsertTableHandle beginInsert(ConnectorSession session, Connecto
         List<MongoColumnHandle> columns = table.getColumns();
         List<MongoColumnHandle> handleColumns = columns.stream()
                 .filter(column -> !column.isHidden())
-                .peek(column -> validateColumnNameForInsert(column.getName()))
+                .peek(column -> validateColumnNameForInsert(column.getBaseName()))
                 .collect(toImmutableList());
 
         if (retryMode == RetryMode.NO_RETRIES) {
@@ -416,7 +437,7 @@ public ConnectorInsertTableHandle beginInsert(ConnectorSession session, Connecto
                     Optional.empty(),
                     Optional.empty());
         }
-        MongoColumnHandle pageSinkIdColumn = buildPageSinkIdColumn(columns.stream().map(MongoColumnHandle::getName).collect(toImmutableSet()));
+        MongoColumnHandle pageSinkIdColumn = buildPageSinkIdColumn(columns.stream().map(MongoColumnHandle::getBaseName).collect(toImmutableSet()));
         List<MongoColumnHandle> allColumns = ImmutableList.<MongoColumnHandle>builderWithExpectedSize(columns.size() + 1)
                 .addAll(columns)
                 .add(pageSinkIdColumn)
@@ -431,7 +452,7 @@ public ConnectorInsertTableHandle beginInsert(ConnectorSession session, Connecto
                 handle.getRemoteTableName(),
                 handleColumns,
                 Optional.of(temporaryTable.getCollectionName()),
-                Optional.of(pageSinkIdColumn.getName()));
+                Optional.of(pageSinkIdColumn.getBaseName()));
     }
 
     @Override
@@ -458,7 +479,7 @@ private void finishInsert(
         try {
             // Create the temporary page sink ID table
             RemoteTableName pageSinkIdsTable = new RemoteTableName(temporaryTable.getDatabaseName(), generateTemporaryTableName(session));
-            MongoColumnHandle pageSinkIdColumn = new MongoColumnHandle(pageSinkIdColumnName, TRINO_PAGE_SINK_ID_COLUMN_TYPE, false, Optional.empty());
+            MongoColumnHandle pageSinkIdColumn = new MongoColumnHandle(pageSinkIdColumnName, ImmutableList.of(), TRINO_PAGE_SINK_ID_COLUMN_TYPE, false, false, Optional.empty());
             mongoSession.createTable(pageSinkIdsTable, ImmutableList.of(pageSinkIdColumn), Optional.empty());
             closer.register(() -> mongoSession.dropTable(pageSinkIdsTable));
 
@@ -490,7 +511,7 @@ private void finishInsert(
     @Override
     public ColumnHandle getMergeRowIdColumnHandle(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
-        return new MongoColumnHandle("$merge_row_id", BIGINT, true, Optional.empty());
+        return new MongoColumnHandle("$merge_row_id", ImmutableList.of(), BIGINT, true, false, Optional.empty());
     }
 
     @Override
@@ -511,7 +532,6 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
     {
         MongoTableHandle tableHandle = (MongoTableHandle) table;
 
-        Optional<Set<ColumnHandle>> partitioningColumns = Optional.empty(); //TODO: sharding key
         ImmutableList.Builder<LocalProperty<ColumnHandle>> localProperties = ImmutableList.builder();
 
         MongoTable tableInfo = mongoSession.getTable(tableHandle.getSchemaTableName());
@@ -531,7 +551,6 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
         return new ConnectorTableProperties(
                 TupleDomain.all(),
                 Optional.empty(),
-                partitioningColumns,
                 Optional.empty(),
                 localProperties.build());
     }
@@ -556,7 +575,13 @@ public Optional<LimitApplicationResult<ConnectorTableHandle>> applyLimit(Connect
         }
 
         return Optional.of(new LimitApplicationResult<>(
-                new MongoTableHandle(handle.getSchemaTableName(), handle.getRemoteTableName(), handle.getFilter(), handle.getConstraint(), OptionalInt.of(toIntExact(limit))),
+                new MongoTableHandle(
+                        handle.getSchemaTableName(),
+                        handle.getRemoteTableName(),
+                        handle.getFilter(),
+                        handle.getConstraint(),
+                        handle.getProjectedColumns(),
+                        OptionalInt.of(toIntExact(limit))),
                 true,
                 false));
     }
@@ -603,11 +628,162 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
                 handle.getRemoteTableName(),
                 handle.getFilter(),
                 newDomain,
+                handle.getProjectedColumns(),
                 handle.getLimit());
 
         return Optional.of(new ConstraintApplicationResult<>(handle, remainingFilter, false));
     }
 
+    @Override
+    public Optional<ProjectionApplicationResult<ConnectorTableHandle>> applyProjection(
+            ConnectorSession session,
+            ConnectorTableHandle handle,
+            List<ConnectorExpression> projections,
+            Map<String, ColumnHandle> assignments)
+    {
+        if (!isProjectionPushdownEnabled(session)) {
+            return Optional.empty();
+        }
+        // Create projected column representations for supported sub expressions. Simple column references and chain of
+        // dereferences on a variable are supported right now.
+        Set<ConnectorExpression> projectedExpressions = projections.stream()
+                .flatMap(expression -> extractSupportedProjectedColumns(expression, MongoMetadata::isSupportedForPushdown).stream())
+                .collect(toImmutableSet());
+
+        Map<ConnectorExpression, ProjectedColumnRepresentation> columnProjections = projectedExpressions.stream()
+                .collect(toImmutableMap(identity(), ApplyProjectionUtil::createProjectedColumnRepresentation));
+
+        MongoTableHandle mongoTableHandle = (MongoTableHandle) handle;
+
+        // all references are simple variables
+        if (columnProjections.values().stream().allMatch(ProjectedColumnRepresentation::isVariable)) {
+            Set<MongoColumnHandle> projectedColumns = assignments.values().stream()
+                    .map(MongoColumnHandle.class::cast)
+                    .collect(toImmutableSet());
+            if (mongoTableHandle.getProjectedColumns().equals(projectedColumns)) {
+                return Optional.empty();
+            }
+            List<Assignment> assignmentsList = assignments.entrySet().stream()
+                    .map(assignment -> new Assignment(
+                            assignment.getKey(),
+                            assignment.getValue(),
+                            ((MongoColumnHandle) assignment.getValue()).getType()))
+                    .collect(toImmutableList());
+
+            return Optional.of(new ProjectionApplicationResult<>(
+                    mongoTableHandle.withProjectedColumns(projectedColumns),
+                    projections,
+                    assignmentsList,
+                    false));
+        }
+
+        Map<String, Assignment> newAssignments = new HashMap<>();
+        ImmutableMap.Builder<ConnectorExpression, Variable> newVariablesBuilder = ImmutableMap.builder();
+        ImmutableSet.Builder<MongoColumnHandle> projectedColumnsBuilder = ImmutableSet.builder();
+
+        for (Map.Entry<ConnectorExpression, ProjectedColumnRepresentation> entry : columnProjections.entrySet()) {
+            ConnectorExpression expression = entry.getKey();
+            ProjectedColumnRepresentation projectedColumn = entry.getValue();
+
+            MongoColumnHandle baseColumnHandle = (MongoColumnHandle) assignments.get(projectedColumn.getVariable().getName());
+            MongoColumnHandle projectedColumnHandle = projectColumn(baseColumnHandle, projectedColumn.getDereferenceIndices(), expression.getType());
+            String projectedColumnName = projectedColumnHandle.getQualifiedName();
+
+            Variable projectedColumnVariable = new Variable(projectedColumnName, expression.getType());
+            Assignment newAssignment = new Assignment(projectedColumnName, projectedColumnHandle, expression.getType());
+            newAssignments.putIfAbsent(projectedColumnName, newAssignment);
+
+            newVariablesBuilder.put(expression, projectedColumnVariable);
+            projectedColumnsBuilder.add(projectedColumnHandle);
+        }
+
+        // Modify projections to refer to new variables
+        Map<ConnectorExpression, Variable> newVariables = newVariablesBuilder.buildOrThrow();
+        List<ConnectorExpression> newProjections = projections.stream()
+                .map(expression -> replaceWithNewVariables(expression, newVariables))
+                .collect(toImmutableList());
+
+        List<Assignment> outputAssignments = newAssignments.values().stream().collect(toImmutableList());
+        return Optional.of(new ProjectionApplicationResult<>(
+                mongoTableHandle.withProjectedColumns(projectedColumnsBuilder.build()),
+                newProjections,
+                outputAssignments,
+                false));
+    }
+
+    private static boolean isSupportedForPushdown(ConnectorExpression connectorExpression)
+    {
+        if (connectorExpression instanceof Variable) {
+            return true;
+        }
+        if (connectorExpression instanceof FieldDereference fieldDereference) {
+            RowType rowType = (RowType) fieldDereference.getTarget().getType();
+            if (isDBRefField(rowType)) {
+                return false;
+            }
+            Field field = rowType.getFields().get(fieldDereference.getField());
+            if (field.getName().isEmpty()) {
+                return false;
+            }
+            String fieldName = field.getName().get();
+            if (fieldName.contains(".") || fieldName.contains("$")) {
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    private static MongoColumnHandle projectColumn(MongoColumnHandle baseColumn, List<Integer> indices, Type projectedColumnType)
+    {
+        if (indices.isEmpty()) {
+            return baseColumn;
+        }
+        ImmutableList.Builder<String> dereferenceNamesBuilder = ImmutableList.builder();
+        dereferenceNamesBuilder.addAll(baseColumn.getDereferenceNames());
+
+        Type type = baseColumn.getType();
+        RowType parentType = null;
+        for (int index : indices) {
+            checkArgument(type instanceof RowType, "type should be Row type");
+            RowType rowType = (RowType) type;
+            Field field = rowType.getFields().get(index);
+            dereferenceNamesBuilder.add(field.getName()
+                    .orElseThrow(() -> new TrinoException(NOT_SUPPORTED, "ROW type does not have field names declared: " + rowType)));
+            parentType = rowType;
+            type = field.getType();
+        }
+        return new MongoColumnHandle(
+                baseColumn.getBaseName(),
+                dereferenceNamesBuilder.build(),
+                projectedColumnType,
+                baseColumn.isHidden(),
+                isDBRefField(parentType),
+                baseColumn.getComment());
+    }
+
+    /**
+     * This method may return a wrong flag when row type use the same field names and types as dbref.
+     */
+    private static boolean isDBRefField(Type type)
+    {
+        if (!(type instanceof RowType rowType)) {
+            return false;
+        }
+        requireNonNull(type, "type is null");
+        // When projected field is inside DBRef type field
+        List<RowType.Field> fields = rowType.getFields();
+        if (fields.size() != 3) {
+            return false;
+        }
+        return fields.get(0).getName().orElseThrow().equals(DATABASE_NAME)
+                && fields.get(0).getType().equals(VARCHAR)
+                && fields.get(1).getName().orElseThrow().equals(COLLECTION_NAME)
+                && fields.get(1).getType().equals(VARCHAR)
+                && fields.get(2).getName().orElseThrow().equals(ID);
+               // Id type can be of any type
+    }
+
     @Override
     public Optional<TableFunctionApplicationResult<ConnectorTableHandle>> applyTableFunction(ConnectorSession session, ConnectorTableFunctionHandle handle)
     {
@@ -616,14 +792,9 @@ public Optional<TableFunctionApplicationResult<ConnectorTableHandle>> applyTable
         }
 
         ConnectorTableHandle tableHandle = ((QueryFunctionHandle) handle).getTableHandle();
-        ConnectorTableSchema tableSchema = getTableSchema(session, tableHandle);
-        Map<String, ColumnHandle> columnHandlesByName = getColumnHandles(session, tableHandle);
-        List<ColumnHandle> columnHandles = tableSchema.getColumns().stream()
-                .filter(column -> !column.isHidden())
-                .map(ColumnSchema::getName)
-                .map(columnHandlesByName::get)
+        List<ColumnHandle> columnHandles = getColumnHandles(session, tableHandle).values().stream()
+                .filter(column -> !((MongoColumnHandle) column).isHidden())
                 .collect(toImmutableList());
-
         return Optional.of(new TableFunctionApplicationResult<>(tableHandle, columnHandles));
     }
 
@@ -661,7 +832,7 @@ private ConnectorTableMetadata getTableMetadata(SchemaTableName tableName)
     private static List<MongoColumnHandle> buildColumnHandles(ConnectorTableMetadata tableMetadata)
     {
         return tableMetadata.getColumns().stream()
-                .map(m -> new MongoColumnHandle(m.getName(), m.getType(), m.isHidden(), Optional.ofNullable(m.getComment())))
+                .map(m -> new MongoColumnHandle(m.getName(), ImmutableList.of(), m.getType(), m.isHidden(), false, Optional.ofNullable(m.getComment())))
                 .collect(toList());
     }
 
@@ -683,6 +854,6 @@ private static MongoColumnHandle buildPageSinkIdColumn(Set<String> otherColumnNa
             columnName = baseColumnName + "_" + suffix;
             suffix++;
         }
-        return new MongoColumnHandle(columnName, TRINO_PAGE_SINK_ID_COLUMN_TYPE, false, Optional.empty());
+        return new MongoColumnHandle(columnName, ImmutableList.of(), TRINO_PAGE_SINK_ID_COLUMN_TYPE, false, false, Optional.empty());
     }
 }
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoMetadataFactory.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoMetadataFactory.java
new file mode 100644
index 000000000000..676e3803fd4e
--- /dev/null
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoMetadataFactory.java
@@ -0,0 +1,19 @@
+/*
+ * Licensed 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 io.trino.plugin.mongodb;
+
+public interface MongoMetadataFactory
+{
+    MongoMetadata create();
+}
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSink.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSink.java
index 74ae7879d0ed..9639d4546d57 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSink.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSink.java
@@ -14,8 +14,6 @@
 package io.trino.plugin.mongodb;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.primitives.Shorts;
-import com.google.common.primitives.SignedBytes;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.InsertManyOptions;
 import io.airlift.slice.Slice;
@@ -24,24 +22,18 @@
 import io.trino.spi.StandardErrorCode;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ConnectorPageSink;
 import io.trino.spi.connector.ConnectorPageSinkId;
-import io.trino.spi.type.BigintType;
-import io.trino.spi.type.BooleanType;
+import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
-import io.trino.spi.type.DateType;
 import io.trino.spi.type.DecimalType;
-import io.trino.spi.type.DoubleType;
-import io.trino.spi.type.IntegerType;
+import io.trino.spi.type.MapType;
 import io.trino.spi.type.NamedTypeSignature;
-import io.trino.spi.type.RealType;
-import io.trino.spi.type.SmallintType;
-import io.trino.spi.type.TimeType;
-import io.trino.spi.type.TimestampWithTimeZoneType;
-import io.trino.spi.type.TinyintType;
+import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignatureParameter;
-import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
 import org.bson.BsonInvalidOperationException;
 import org.bson.Document;
@@ -61,21 +53,27 @@
 import java.util.concurrent.CompletableFuture;
 
 import static io.trino.plugin.mongodb.ObjectIdType.OBJECT_ID;
-import static io.trino.plugin.mongodb.TypeUtils.isArrayType;
 import static io.trino.plugin.mongodb.TypeUtils.isJsonType;
-import static io.trino.plugin.mongodb.TypeUtils.isMapType;
-import static io.trino.plugin.mongodb.TypeUtils.isRowType;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.Chars.padSpaces;
 import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
+import static io.trino.spi.type.DateType.DATE;
 import static io.trino.spi.type.Decimals.readBigDecimal;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
+import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TimeType.TIME_MILLIS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
+import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
 import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
 import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_NANOSECOND;
 import static io.trino.spi.type.Timestamps.roundDiv;
-import static java.lang.Float.intBitsToFloat;
+import static io.trino.spi.type.TinyintType.TINYINT;
+import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static java.lang.Math.floorDiv;
-import static java.lang.Math.toIntExact;
 import static java.time.ZoneOffset.UTC;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Collections.unmodifiableMap;
@@ -120,7 +118,7 @@ public CompletableFuture<?> appendPage(Page page)
 
             for (int channel = 0; channel < page.getChannelCount(); channel++) {
                 MongoColumnHandle column = columns.get(channel);
-                doc.append(column.getName(), getObjectValue(columns.get(channel).getType(), page.getBlock(channel), position));
+                doc.append(column.getBaseName(), getObjectValue(columns.get(channel).getType(), page.getBlock(channel), position));
             }
             batch.add(doc);
         }
@@ -141,56 +139,56 @@ private Object getObjectValue(Type type, Block block, int position)
         if (type.equals(OBJECT_ID)) {
             return new ObjectId(block.getSlice(position, 0, block.getSliceLength(position)).getBytes());
         }
-        if (type.equals(BooleanType.BOOLEAN)) {
-            return type.getBoolean(block, position);
+        if (type.equals(BOOLEAN)) {
+            return BOOLEAN.getBoolean(block, position);
         }
-        if (type.equals(BigintType.BIGINT)) {
-            return type.getLong(block, position);
+        if (type.equals(BIGINT)) {
+            return BIGINT.getLong(block, position);
         }
-        if (type.equals(IntegerType.INTEGER)) {
-            return toIntExact(type.getLong(block, position));
+        if (type.equals(INTEGER)) {
+            return INTEGER.getInt(block, position);
         }
-        if (type.equals(SmallintType.SMALLINT)) {
-            return Shorts.checkedCast(type.getLong(block, position));
+        if (type.equals(SMALLINT)) {
+            return SMALLINT.getShort(block, position);
         }
-        if (type.equals(TinyintType.TINYINT)) {
-            return SignedBytes.checkedCast(type.getLong(block, position));
+        if (type.equals(TINYINT)) {
+            return TINYINT.getByte(block, position);
         }
-        if (type.equals(RealType.REAL)) {
-            return intBitsToFloat(toIntExact(type.getLong(block, position)));
+        if (type.equals(REAL)) {
+            return REAL.getFloat(block, position);
         }
-        if (type.equals(DoubleType.DOUBLE)) {
-            return type.getDouble(block, position);
+        if (type.equals(DOUBLE)) {
+            return DOUBLE.getDouble(block, position);
         }
-        if (type instanceof VarcharType) {
-            return type.getSlice(block, position).toStringUtf8();
+        if (type instanceof VarcharType varcharType) {
+            return varcharType.getSlice(block, position).toStringUtf8();
         }
-        if (type instanceof CharType) {
-            return padSpaces(type.getSlice(block, position), ((CharType) type)).toStringUtf8();
+        if (type instanceof CharType charType) {
+            return padSpaces(charType.getSlice(block, position), charType).toStringUtf8();
         }
-        if (type.equals(VarbinaryType.VARBINARY)) {
-            return new Binary(type.getSlice(block, position).getBytes());
+        if (type.equals(VARBINARY)) {
+            return new Binary(VARBINARY.getSlice(block, position).getBytes());
         }
-        if (type.equals(DateType.DATE)) {
-            long days = type.getLong(block, position);
+        if (type.equals(DATE)) {
+            int days = DATE.getInt(block, position);
             return LocalDate.ofEpochDay(days);
         }
-        if (type.equals(TimeType.TIME_MILLIS)) {
-            long picos = type.getLong(block, position);
+        if (type.equals(TIME_MILLIS)) {
+            long picos = TIME_MILLIS.getLong(block, position);
             return LocalTime.ofNanoOfDay(roundDiv(picos, PICOSECONDS_PER_NANOSECOND));
         }
         if (type.equals(TIMESTAMP_MILLIS)) {
-            long millisUtc = floorDiv(type.getLong(block, position), MICROSECONDS_PER_MILLISECOND);
+            long millisUtc = floorDiv(TIMESTAMP_MILLIS.getLong(block, position), MICROSECONDS_PER_MILLISECOND);
             Instant instant = Instant.ofEpochMilli(millisUtc);
             return LocalDateTime.ofInstant(instant, UTC);
         }
-        if (type.equals(TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS)) {
-            long millisUtc = unpackMillisUtc(type.getLong(block, position));
+        if (type.equals(TIMESTAMP_TZ_MILLIS)) {
+            long millisUtc = unpackMillisUtc(TIMESTAMP_TZ_MILLIS.getLong(block, position));
             Instant instant = Instant.ofEpochMilli(millisUtc);
             return LocalDateTime.ofInstant(instant, UTC);
         }
-        if (type instanceof DecimalType) {
-            return readBigDecimal((DecimalType) type, block, position);
+        if (type instanceof DecimalType decimalType) {
+            return readBigDecimal(decimalType, block, position);
         }
         if (isJsonType(type)) {
             String json = type.getSlice(block, position).toStringUtf8();
@@ -201,10 +199,10 @@ private Object getObjectValue(Type type, Block block, int position)
                 throw new TrinoException(NOT_SUPPORTED, "Can't convert json to MongoDB Document: " + json, e);
             }
         }
-        if (isArrayType(type)) {
-            Type elementType = type.getTypeParameters().get(0);
+        if (type instanceof ArrayType arrayType) {
+            Type elementType = arrayType.getElementType();
 
-            Block arrayBlock = block.getObject(position, Block.class);
+            Block arrayBlock = arrayType.getObject(block, position);
 
             List<Object> list = new ArrayList<>(arrayBlock.getPositionCount());
             for (int i = 0; i < arrayBlock.getPositionCount(); i++) {
@@ -214,45 +212,50 @@ private Object getObjectValue(Type type, Block block, int position)
 
             return unmodifiableList(list);
         }
-        if (isMapType(type)) {
-            Type keyType = type.getTypeParameters().get(0);
-            Type valueType = type.getTypeParameters().get(1);
+        if (type instanceof MapType mapType) {
+            Type keyType = mapType.getKeyType();
+            Type valueType = mapType.getValueType();
 
-            Block mapBlock = block.getObject(position, Block.class);
+            SqlMap sqlMap = mapType.getObject(block, position);
+            int size = sqlMap.getSize();
+            int rawOffset = sqlMap.getRawOffset();
+            Block rawKeyBlock = sqlMap.getRawKeyBlock();
+            Block rawValueBlock = sqlMap.getRawValueBlock();
 
             // map type is converted into list of fixed keys document
-            List<Object> values = new ArrayList<>(mapBlock.getPositionCount() / 2);
-            for (int i = 0; i < mapBlock.getPositionCount(); i += 2) {
+            List<Object> values = new ArrayList<>(size);
+            for (int i = 0; i < size; i++) {
                 Map<String, Object> mapValue = new HashMap<>();
-                mapValue.put("key", getObjectValue(keyType, mapBlock, i));
-                mapValue.put("value", getObjectValue(valueType, mapBlock, i + 1));
+                mapValue.put("key", getObjectValue(keyType, rawKeyBlock, rawOffset + i));
+                mapValue.put("value", getObjectValue(valueType, rawValueBlock, rawOffset + i));
                 values.add(mapValue);
             }
 
             return unmodifiableList(values);
         }
-        if (isRowType(type)) {
-            Block rowBlock = block.getObject(position, Block.class);
+        if (type instanceof RowType rowType) {
+            SqlRow sqlRow = rowType.getObject(block, position);
+            int rawIndex = sqlRow.getRawIndex();
 
-            List<Type> fieldTypes = type.getTypeParameters();
-            if (fieldTypes.size() != rowBlock.getPositionCount()) {
+            List<Type> fieldTypes = rowType.getTypeParameters();
+            if (fieldTypes.size() != sqlRow.getFieldCount()) {
                 throw new TrinoException(StandardErrorCode.GENERIC_INTERNAL_ERROR, "Expected row value field count does not match type field count");
             }
 
-            if (isImplicitRowType(type)) {
+            if (isImplicitRowType(rowType)) {
                 List<Object> rowValue = new ArrayList<>();
-                for (int i = 0; i < rowBlock.getPositionCount(); i++) {
-                    Object element = getObjectValue(fieldTypes.get(i), rowBlock, i);
+                for (int i = 0; i < sqlRow.getFieldCount(); i++) {
+                    Object element = getObjectValue(fieldTypes.get(i), sqlRow.getRawFieldBlock(i), rawIndex);
                     rowValue.add(element);
                 }
                 return unmodifiableList(rowValue);
             }
 
             Map<String, Object> rowValue = new HashMap<>();
-            for (int i = 0; i < rowBlock.getPositionCount(); i++) {
+            for (int i = 0; i < sqlRow.getFieldCount(); i++) {
                 rowValue.put(
-                        type.getTypeSignature().getParameters().get(i).getNamedTypeSignature().getName().orElse("field" + i),
-                        getObjectValue(fieldTypes.get(i), rowBlock, i));
+                        rowType.getTypeSignature().getParameters().get(i).getNamedTypeSignature().getName().orElse("field" + i),
+                        getObjectValue(fieldTypes.get(i), sqlRow.getRawFieldBlock(i), rawIndex));
             }
             return unmodifiableMap(rowValue);
         }
@@ -274,7 +277,9 @@ private boolean isImplicitRowType(Type type)
     @Override
     public CompletableFuture<Collection<Slice>> finish()
     {
-        return completedFuture(ImmutableList.of(Slices.wrappedLongArray(pageSinkId.getId())));
+        Slice value = Slices.allocate(Long.BYTES);
+        value.setLong(0, pageSinkId.getId());
+        return completedFuture(ImmutableList.of(value));
     }
 
     @Override
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSinkProvider.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSinkProvider.java
index 83ab04577de3..bc81f8248723 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSinkProvider.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSinkProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.mongodb;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
 import io.trino.spi.connector.ConnectorPageSink;
@@ -21,8 +22,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
-import javax.inject.Inject;
-
 public class MongoPageSinkProvider
         implements ConnectorPageSinkProvider
 {
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSource.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSource.java
index 8d621cdcd9b3..130f4d344ca8 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSource.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSource.java
@@ -13,26 +13,32 @@
  */
 package io.trino.plugin.mongodb;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
+import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Shorts;
 import com.google.common.primitives.SignedBytes;
 import com.mongodb.DBRef;
 import com.mongodb.client.MongoCursor;
 import io.airlift.slice.Slice;
-import io.airlift.slice.SliceOutput;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.RowBlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.ConnectorPageSource;
+import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Decimals;
 import io.trino.spi.type.Int128;
+import io.trino.spi.type.MapType;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.RowType.Field;
 import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeSignatureParameter;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
 import org.bson.Document;
@@ -41,26 +47,24 @@
 import org.bson.types.ObjectId;
 import org.joda.time.chrono.ISOChronology;
 
-import java.io.IOException;
-import java.io.OutputStream;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.airlift.slice.Slices.wrappedBuffer;
 import static io.trino.plugin.base.util.JsonTypeUtil.jsonParse;
+import static io.trino.plugin.mongodb.MongoSession.COLLECTION_NAME;
+import static io.trino.plugin.mongodb.MongoSession.DATABASE_NAME;
+import static io.trino.plugin.mongodb.MongoSession.ID;
 import static io.trino.plugin.mongodb.ObjectIdType.OBJECT_ID;
-import static io.trino.plugin.mongodb.TypeUtils.isArrayType;
 import static io.trino.plugin.mongodb.TypeUtils.isJsonType;
-import static io.trino.plugin.mongodb.TypeUtils.isMapType;
-import static io.trino.plugin.mongodb.TypeUtils.isRowType;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.Chars.truncateToLengthAndTrimSpaces;
@@ -81,6 +85,7 @@
 import static java.lang.Float.floatToIntBits;
 import static java.lang.Math.multiplyExact;
 import static java.lang.String.join;
+import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
 
 public class MongoPageSource
@@ -90,7 +95,7 @@ public class MongoPageSource
     private static final int ROWS_PER_REQUEST = 1024;
 
     private final MongoCursor<Document> cursor;
-    private final List<String> columnNames;
+    private final List<MongoColumnHandle> columns;
     private final List<Type> columnTypes;
     private Document currentDoc;
     private boolean finished;
@@ -102,7 +107,7 @@ public MongoPageSource(
             MongoTableHandle tableHandle,
             List<MongoColumnHandle> columns)
     {
-        this.columnNames = columns.stream().map(MongoColumnHandle::getName).collect(toList());
+        this.columns = ImmutableList.copyOf(requireNonNull(columns, "columns is null"));
         this.columnTypes = columns.stream().map(MongoColumnHandle::getType).collect(toList());
         this.cursor = mongoSession.execute(tableHandle, columns);
         currentDoc = null;
@@ -148,7 +153,8 @@ public Page getNextPage()
             pageBuilder.declarePosition();
             for (int column = 0; column < columnTypes.size(); column++) {
                 BlockBuilder output = pageBuilder.getBlockBuilder(column);
-                appendTo(columnTypes.get(column), currentDoc.get(columnNames.get(column)), output);
+                MongoColumnHandle columnHandle = columns.get(column);
+                appendTo(columnTypes.get(column), getColumnValue(currentDoc, columnHandle), output);
             }
         }
 
@@ -187,7 +193,13 @@ else if (type.equals(REAL)) {
                     type.writeLong(output, floatToIntBits(((float) ((Number) value).doubleValue())));
                 }
                 else if (type instanceof DecimalType) {
-                    type.writeLong(output, encodeShortScaledValue(((Decimal128) value).bigDecimalValue(), ((DecimalType) type).getScale()));
+                    Decimal128 decimal = (Decimal128) value;
+                    if (decimal.compareTo(Decimal128.NEGATIVE_ZERO) == 0) {
+                        type.writeLong(output, encodeShortScaledValue(BigDecimal.ZERO, ((DecimalType) type).getScale()));
+                    }
+                    else {
+                        type.writeLong(output, encodeShortScaledValue(decimal.bigDecimalValue(), ((DecimalType) type).getScale()));
+                    }
                 }
                 else if (type.equals(DATE)) {
                     long utcMillis = ((Date) value).getTime();
@@ -214,13 +226,19 @@ else if (javaType == double.class) {
             else if (javaType == Int128.class) {
                 DecimalType decimalType = (DecimalType) type;
                 verify(!decimalType.isShort(), "The type should be long decimal");
-                BigDecimal decimal = ((Decimal128) value).bigDecimalValue();
-                type.writeObject(output, Decimals.encodeScaledValue(decimal, decimalType.getScale()));
+                Decimal128 decimal = (Decimal128) value;
+                if (decimal.compareTo(Decimal128.NEGATIVE_ZERO) == 0) {
+                    type.writeObject(output, Decimals.encodeScaledValue(BigDecimal.ZERO, decimalType.getScale()));
+                }
+                else {
+                    BigDecimal result = decimal.bigDecimalValue();
+                    type.writeObject(output, Decimals.encodeScaledValue(result, decimalType.getScale()));
+                }
             }
             else if (javaType == Slice.class) {
                 writeSlice(output, type, value);
             }
-            else if (javaType == Block.class) {
+            else if (javaType == Block.class || javaType == SqlMap.class || javaType == SqlRow.class) {
                 writeBlock(output, type, value);
             }
             else {
@@ -275,90 +293,81 @@ else if (isJsonType(type)) {
         }
     }
 
-    public static JsonGenerator createJsonGenerator(JsonFactory factory, SliceOutput output)
-            throws IOException
-    {
-        return factory.createGenerator((OutputStream) output);
-    }
-
     private void writeBlock(BlockBuilder output, Type type, Object value)
     {
-        if (isArrayType(type)) {
-            if (value instanceof List<?>) {
-                BlockBuilder builder = output.beginBlockEntry();
-
-                ((List<?>) value).forEach(element ->
-                        appendTo(type.getTypeParameters().get(0), element, builder));
-
-                output.closeEntry();
+        if (type instanceof ArrayType arrayType) {
+            if (value instanceof List<?> list) {
+                ((ArrayBlockBuilder) output).buildEntry(elementBuilder -> list.forEach(element -> appendTo(arrayType.getElementType(), element, elementBuilder)));
                 return;
             }
         }
-        else if (isMapType(type)) {
+        else if (type instanceof MapType mapType) {
             if (value instanceof List<?>) {
-                BlockBuilder builder = output.beginBlockEntry();
-                for (Object element : (List<?>) value) {
-                    if (!(element instanceof Map<?, ?> document)) {
-                        continue;
-                    }
+                ((MapBlockBuilder) output).buildEntry((keyBuilder, valueBuilder) -> {
+                    for (Object element : (List<?>) value) {
+                        if (!(element instanceof Map<?, ?> document)) {
+                            continue;
+                        }
 
-                    if (document.containsKey("key") && document.containsKey("value")) {
-                        appendTo(type.getTypeParameters().get(0), document.get("key"), builder);
-                        appendTo(type.getTypeParameters().get(1), document.get("value"), builder);
+                        if (document.containsKey("key") && document.containsKey("value")) {
+                            appendTo(mapType.getKeyType(), document.get("key"), keyBuilder);
+                            appendTo(mapType.getValueType(), document.get("value"), valueBuilder);
+                        }
                     }
-                }
-
-                output.closeEntry();
+                });
                 return;
             }
             if (value instanceof Map<?, ?> document) {
-                BlockBuilder builder = output.beginBlockEntry();
-                for (Map.Entry<?, ?> entry : document.entrySet()) {
-                    appendTo(type.getTypeParameters().get(0), entry.getKey(), builder);
-                    appendTo(type.getTypeParameters().get(1), entry.getValue(), builder);
-                }
-                output.closeEntry();
+                ((MapBlockBuilder) output).buildEntry((keyBuilder, valueBuilder) -> {
+                    for (Map.Entry<?, ?> entry : document.entrySet()) {
+                        appendTo(mapType.getKeyType(), entry.getKey(), keyBuilder);
+                        appendTo(mapType.getValueType(), entry.getValue(), valueBuilder);
+                    }
+                });
                 return;
             }
         }
-        else if (isRowType(type)) {
+        else if (type instanceof RowType rowType) {
+            List<Field> fields = rowType.getFields();
             if (value instanceof Map<?, ?> mapValue) {
-                BlockBuilder builder = output.beginBlockEntry();
-
-                List<String> fieldNames = new ArrayList<>();
-                for (int i = 0; i < type.getTypeSignature().getParameters().size(); i++) {
-                    TypeSignatureParameter parameter = type.getTypeSignature().getParameters().get(i);
-                    fieldNames.add(parameter.getNamedTypeSignature().getName().orElse("field" + i));
-                }
-                checkState(fieldNames.size() == type.getTypeParameters().size(), "fieldName doesn't match with type size : %s", type);
-                for (int index = 0; index < type.getTypeParameters().size(); index++) {
-                    appendTo(type.getTypeParameters().get(index), mapValue.get(fieldNames.get(index)), builder);
-                }
-                output.closeEntry();
+                ((RowBlockBuilder) output).buildEntry(fieldBuilders -> {
+                    for (int i = 0; i < fields.size(); i++) {
+                        Field field = fields.get(i);
+                        String fieldName = field.getName().orElse("field" + i);
+                        appendTo(field.getType(), mapValue.get(fieldName), fieldBuilders.get(i));
+                    }
+                });
                 return;
             }
             if (value instanceof DBRef dbRefValue) {
-                BlockBuilder builder = output.beginBlockEntry();
-
-                checkState(type.getTypeParameters().size() == 3, "DBRef should have 3 fields : %s", type);
-                appendTo(type.getTypeParameters().get(0), dbRefValue.getDatabaseName(), builder);
-                appendTo(type.getTypeParameters().get(1), dbRefValue.getCollectionName(), builder);
-                appendTo(type.getTypeParameters().get(2), dbRefValue.getId(), builder);
-
-                output.closeEntry();
+                checkState(fields.size() == 3, "DBRef should have 3 fields : %s", type);
+                ((RowBlockBuilder) output).buildEntry(fieldBuilders -> {
+                    for (int i = 0; i < fields.size(); i++) {
+                        Field field = fields.get(i);
+                        Type fieldType = field.getType();
+                        String fieldName = field.getName().orElseThrow();
+                        BlockBuilder builder = fieldBuilders.get(i);
+                        switch (fieldName) {
+                            case DATABASE_NAME -> appendTo(fieldType, dbRefValue.getDatabaseName(), builder);
+                            case COLLECTION_NAME -> appendTo(fieldType, dbRefValue.getCollectionName(), builder);
+                            case ID -> appendTo(fieldType, dbRefValue.getId(), builder);
+                            default -> throw new TrinoException(GENERIC_INTERNAL_ERROR, "Unexpected field name for DBRef: " + fieldName);
+                        }
+                    }
+                });
                 return;
             }
             if (value instanceof List<?> listValue) {
-                BlockBuilder builder = output.beginBlockEntry();
-                for (int index = 0; index < type.getTypeParameters().size(); index++) {
-                    if (index < listValue.size()) {
-                        appendTo(type.getTypeParameters().get(index), listValue.get(index), builder);
-                    }
-                    else {
-                        builder.appendNull();
+                ((RowBlockBuilder) output).buildEntry(fieldBuilders -> {
+                    for (int index = 0; index < fields.size(); index++) {
+                        if (index < listValue.size()) {
+                            appendTo(fields.get(index).getType(), listValue.get(index), fieldBuilders.get(index));
+                        }
+                        else {
+                            fieldBuilders.get(index).appendNull();
+                        }
                     }
-                }
-                output.closeEntry();
+                });
                 return;
             }
         }
@@ -370,6 +379,50 @@ else if (isRowType(type)) {
         output.appendNull();
     }
 
+    private static Object getColumnValue(Document document, MongoColumnHandle mongoColumnHandle)
+    {
+        Object value = document.get(mongoColumnHandle.getBaseName());
+        if (mongoColumnHandle.isBaseColumn()) {
+            return value;
+        }
+        if (value instanceof DBRef dbRefValue) {
+            return getDbRefValue(dbRefValue, mongoColumnHandle);
+        }
+        Document documentValue = (Document) value;
+        for (String dereferenceName : mongoColumnHandle.getDereferenceNames()) {
+            // When parent field itself is null
+            if (documentValue == null) {
+                return null;
+            }
+            value = documentValue.get(dereferenceName);
+            if (value instanceof Document nestedDocument) {
+                documentValue = nestedDocument;
+            }
+            else if (value instanceof DBRef dbRefValue) {
+                // Assuming DBRefField is the leaf field
+                return getDbRefValue(dbRefValue, mongoColumnHandle);
+            }
+        }
+        return value;
+    }
+
+    private static Object getDbRefValue(DBRef dbRefValue, MongoColumnHandle columnHandle)
+    {
+        if (columnHandle.getType() instanceof RowType) {
+            return dbRefValue;
+        }
+        checkArgument(columnHandle.isDbRefField(), "columnHandle is not a dbRef field: " + columnHandle);
+        List<String> dereferenceNames = columnHandle.getDereferenceNames();
+        checkState(!dereferenceNames.isEmpty(), "dereferenceNames is empty");
+        String leafColumnName = dereferenceNames.get(dereferenceNames.size() - 1);
+        return switch (leafColumnName) {
+            case DATABASE_NAME -> dbRefValue.getDatabaseName();
+            case COLLECTION_NAME -> dbRefValue.getCollectionName();
+            case ID -> dbRefValue.getId();
+            default -> throw new IllegalStateException("Unsupported DBRef column name: " + leafColumnName);
+        };
+    }
+
     @Override
     public void close()
     {
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSourceProvider.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSourceProvider.java
index eaa603043e37..79d0b691200a 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSourceProvider.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPageSourceProvider.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.mongodb;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorPageSourceProvider;
@@ -23,8 +24,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.DynamicFilter;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSession.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSession.java
index 77d9a3967d20..0840b87c1a51 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSession.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSession.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Ordering;
 import com.google.common.collect.Streams;
 import com.google.common.primitives.Primitives;
 import com.google.common.primitives.Shorts;
@@ -38,7 +39,7 @@
 import com.mongodb.client.result.DeleteResult;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
-import io.trino.collect.cache.EvictableCacheBuilder;
+import io.trino.cache.EvictableCacheBuilder;
 import io.trino.spi.HostAddress;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
@@ -49,6 +50,10 @@
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.type.CharType;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.Decimals;
+import io.trino.spi.type.Int128;
 import io.trino.spi.type.IntegerType;
 import io.trino.spi.type.NamedTypeSignature;
 import io.trino.spi.type.RowFieldName;
@@ -60,14 +65,17 @@
 import io.trino.spi.type.VarcharType;
 import org.bson.Document;
 import org.bson.types.Binary;
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
+import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -86,11 +94,15 @@
 import static io.trino.plugin.mongodb.ObjectIdType.OBJECT_ID;
 import static io.trino.plugin.mongodb.ptf.Query.parseFilter;
 import static io.trino.spi.HostAddress.fromParts;
+import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_EMPTY;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.Chars.padSpaces;
 import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
 import static io.trino.spi.type.DateType.DATE;
+import static io.trino.spi.type.DecimalType.createDecimalType;
 import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TimeType.TIME_MILLIS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
@@ -103,6 +115,7 @@
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static java.lang.Float.intBitsToFloat;
 import static java.lang.Math.floorDiv;
 import static java.lang.Math.floorMod;
 import static java.lang.Math.toIntExact;
@@ -127,6 +140,8 @@ public class MongoSession
     private static final String FIELDS_TYPE_KEY = "type";
     private static final String FIELDS_HIDDEN_KEY = "hidden";
 
+    private static final Document EMPTY_DOCUMENT = new Document();
+
     private static final String AND_OP = "$and";
     private static final String OR_OP = "$or";
 
@@ -138,9 +153,9 @@ public class MongoSession
     private static final String LTE_OP = "$lte";
     private static final String IN_OP = "$in";
 
-    private static final String DATABASE_NAME = "databaseName";
-    private static final String COLLECTION_NAME = "collectionName";
-    private static final String ID = "id";
+    public static final String DATABASE_NAME = "databaseName";
+    public static final String COLLECTION_NAME = "collectionName";
+    public static final String ID = "id";
 
     // The 'simple' locale is the default collection in MongoDB. The locale doesn't allow specifying other fields (e.g. numericOrdering)
     // https://www.mongodb.com/docs/manual/reference/collation/
@@ -151,6 +166,9 @@ public class MongoSession
             .put("authorizedCollections", true)
             .buildOrThrow();
 
+    private static final Ordering<MongoColumnHandle> COLUMN_HANDLE_ORDERING = Ordering
+            .from(Comparator.comparingInt(columnHandle -> columnHandle.getDereferenceNames().size()));
+
     private final TypeManager typeManager;
     private final MongoClient client;
 
@@ -201,9 +219,20 @@ public void createSchema(String schemaName)
         client.getDatabase(schemaName).createCollection(schemaCollection);
     }
 
-    public void dropSchema(String schemaName)
+    public void dropSchema(String schemaName, boolean cascade)
     {
-        client.getDatabase(toRemoteSchemaName(schemaName)).drop();
+        MongoDatabase database = client.getDatabase(toRemoteSchemaName(schemaName));
+        if (!cascade) {
+            try (MongoCursor<String> collections = database.listCollectionNames().cursor()) {
+                while (collections.hasNext()) {
+                    if (collections.next().equals(schemaCollection)) {
+                        continue;
+                    }
+                    throw new TrinoException(SCHEMA_NOT_EMPTY, "Cannot drop non-empty schema '%s'".formatted(schemaName));
+                }
+            }
+        }
+        database.drop();
     }
 
     public Set<String> getAllTables(String schema)
@@ -216,7 +245,7 @@ public Set<String> getAllTables(String schema)
                 .filter(name -> !name.equals(schemaCollection))
                 .filter(name -> !SYSTEM_TABLES.contains(name))
                 .collect(toSet()));
-        builder.addAll(getTableMetadataNames(schema));
+        builder.addAll(getTableMetadataNames(schemaName));
 
         return builder.build();
     }
@@ -335,6 +364,34 @@ public void addColumn(MongoTableHandle table, ColumnMetadata columnMetadata)
         tableCache.invalidate(table.getSchemaTableName());
     }
 
+    public void renameColumn(MongoTableHandle table, String source, String target)
+    {
+        String remoteSchemaName = table.getRemoteTableName().getDatabaseName();
+        String remoteTableName = table.getRemoteTableName().getCollectionName();
+
+        Document metadata = getTableMetadata(remoteSchemaName, remoteTableName);
+
+        List<Document> columns = getColumnMetadata(metadata).stream()
+                .map(document -> {
+                    if (document.getString(FIELDS_NAME_KEY).equals(source)) {
+                        document.put(FIELDS_NAME_KEY, target);
+                    }
+                    return document;
+                })
+                .collect(toImmutableList());
+
+        metadata.append(FIELDS_KEY, columns);
+
+        MongoDatabase database = client.getDatabase(remoteSchemaName);
+        MongoCollection<Document> schema = database.getCollection(schemaCollection);
+        schema.findOneAndReplace(new Document(TABLE_NAME_KEY, remoteTableName), metadata);
+
+        database.getCollection(remoteTableName)
+                .updateMany(Filters.empty(), Updates.rename(source, target));
+
+        tableCache.invalidate(table.getSchemaTableName());
+    }
+
     public void dropColumn(MongoTableHandle table, String columnName)
     {
         String remoteSchemaName = table.getRemoteTableName().getDatabaseName();
@@ -412,7 +469,7 @@ private MongoColumnHandle buildColumnHandle(Document columnMeta)
 
         Type type = typeManager.fromSqlType(typeString);
 
-        return new MongoColumnHandle(name, type, hidden, Optional.ofNullable(comment));
+        return new MongoColumnHandle(name, ImmutableList.of(), type, hidden, false, Optional.ofNullable(comment));
     }
 
     private List<Document> getColumnMetadata(Document doc)
@@ -454,15 +511,16 @@ public long deleteDocuments(RemoteTableName remoteTableName, TupleDomain<ColumnH
 
     public MongoCursor<Document> execute(MongoTableHandle tableHandle, List<MongoColumnHandle> columns)
     {
-        Document output = new Document();
-        for (MongoColumnHandle column : columns) {
-            output.append(column.getName(), 1);
-        }
+        Set<MongoColumnHandle> projectedColumns = tableHandle.getProjectedColumns();
+        checkArgument(projectedColumns.isEmpty() || projectedColumns.containsAll(columns), "projectedColumns must be empty or equal to columns");
+
+        Document projection = buildProjection(columns);
+
         MongoCollection<Document> collection = getCollection(tableHandle.getRemoteTableName());
         Document filter = buildFilter(tableHandle);
-        FindIterable<Document> iterable = collection.find(filter).projection(output).collation(SIMPLE_COLLATION);
+        FindIterable<Document> iterable = collection.find(filter).projection(projection).collation(SIMPLE_COLLATION);
         tableHandle.getLimit().ifPresent(iterable::limit);
-        log.debug("Find documents: collection: %s, filter: %s, projection: %s", tableHandle.getSchemaTableName(), filter, output);
+        log.debug("Find documents: collection: %s, filter: %s, projection: %s", tableHandle.getSchemaTableName(), filter, projection);
 
         if (cursorBatchSize != 0) {
             iterable.batchSize(cursorBatchSize);
@@ -471,6 +529,56 @@ public MongoCursor<Document> execute(MongoTableHandle tableHandle, List<MongoCol
         return iterable.iterator();
     }
 
+    @VisibleForTesting
+    static Document buildProjection(List<MongoColumnHandle> columns)
+    {
+        Document output = new Document();
+
+        // _id is always projected by mongodb unless its explicitly excluded.
+        // We exclude it explicitly at the start and later include it if its present within columns list.
+        // https://www.mongodb.com/docs/drivers/java/sync/current/fundamentals/builders/projections/#exclusion-of-_id
+        output.append("_id", 0);
+
+        // Starting in MongoDB 4.4, it is illegal to project an embedded document with any of the embedded document's fields
+        // (https://www.mongodb.com/docs/manual/reference/limits/#mongodb-limit-Projection-Restrictions). So, Project only sufficient columns.
+        for (MongoColumnHandle column : projectSufficientColumns(columns)) {
+            output.append(column.getQualifiedName(), 1);
+        }
+
+        return output;
+    }
+
+    /**
+     * Creates a set of sufficient columns for the input projected columns. For example,
+     * if input {@param columns} include columns "a.b" and "a.b.c", then they will be projected from a single column "a.b".
+     */
+    public static List<MongoColumnHandle> projectSufficientColumns(List<MongoColumnHandle> columnHandles)
+    {
+        List<MongoColumnHandle> sortedColumnHandles = COLUMN_HANDLE_ORDERING.sortedCopy(columnHandles);
+        List<MongoColumnHandle> sufficientColumns = new ArrayList<>();
+        for (MongoColumnHandle column : sortedColumnHandles) {
+            if (!parentColumnExists(sufficientColumns, column)) {
+                sufficientColumns.add(column);
+            }
+        }
+        return sufficientColumns;
+    }
+
+    private static boolean parentColumnExists(List<MongoColumnHandle> existingColumns, MongoColumnHandle column)
+    {
+        for (MongoColumnHandle existingColumn : existingColumns) {
+            List<String> existingColumnDereferenceNames = existingColumn.getDereferenceNames();
+            verify(
+                    column.getDereferenceNames().size() >= existingColumnDereferenceNames.size(),
+                    "Selected column's dereference size must be greater than or equal to the existing column's dereference size");
+            if (existingColumn.getBaseName().equals(column.getBaseName())
+                    && column.getDereferenceNames().subList(0, existingColumnDereferenceNames.size()).equals(existingColumnDereferenceNames)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     static Document buildFilter(MongoTableHandle table)
     {
         // Use $and operator because Document.putAll method overwrites existing entries where the key already exists
@@ -483,21 +591,22 @@ static Document buildFilter(MongoTableHandle table)
     @VisibleForTesting
     static Document buildQuery(TupleDomain<ColumnHandle> tupleDomain)
     {
-        Document query = new Document();
+        ImmutableList.Builder<Document> queryBuilder = ImmutableList.builder();
         if (tupleDomain.getDomains().isPresent()) {
             for (Map.Entry<ColumnHandle, Domain> entry : tupleDomain.getDomains().get().entrySet()) {
                 MongoColumnHandle column = (MongoColumnHandle) entry.getKey();
                 Optional<Document> predicate = buildPredicate(column, entry.getValue());
-                predicate.ifPresent(query::putAll);
+                predicate.ifPresent(queryBuilder::add);
             }
         }
 
-        return query;
+        List<Document> query = queryBuilder.build();
+        return query.isEmpty() ? EMPTY_DOCUMENT : andPredicate(query);
     }
 
     private static Optional<Document> buildPredicate(MongoColumnHandle column, Domain domain)
     {
-        String name = column.getName();
+        String name = column.getQualifiedName();
         Type type = column.getType();
         if (domain.getValues().isNone() && domain.isNullAllowed()) {
             return Optional.of(documentOf(name, isNullPredicate()));
@@ -581,10 +690,30 @@ private static Optional<Object> translateValue(Object trinoNativeValue, Type typ
             return Optional.of(trinoNativeValue);
         }
 
+        if (type == REAL) {
+            return Optional.of(intBitsToFloat(toIntExact((long) trinoNativeValue)));
+        }
+
+        if (type == DOUBLE) {
+            return Optional.of(trinoNativeValue);
+        }
+
+        if (type instanceof DecimalType decimalType) {
+            if (decimalType.isShort()) {
+                return Optional.of(Decimal128.parse(Decimals.toString((long) trinoNativeValue, decimalType.getScale())));
+            }
+            return Optional.of(Decimal128.parse(Decimals.toString((Int128) trinoNativeValue, decimalType.getScale())));
+        }
+
         if (type instanceof ObjectIdType) {
             return Optional.of(new ObjectId(((Slice) trinoNativeValue).getBytes()));
         }
 
+        if (type instanceof CharType charType) {
+            Slice slice = padSpaces(((Slice) trinoNativeValue), charType);
+            return Optional.of(slice.toStringUtf8());
+        }
+
         if (type instanceof VarcharType) {
             return Optional.of(((Slice) trinoNativeValue).toStringUtf8());
         }
@@ -712,8 +841,8 @@ private void createTableMetadata(RemoteTableName remoteSchemaTableName, List<Mon
         Document metadata = new Document(TABLE_NAME_KEY, remoteTableName);
 
         ArrayList<Document> fields = new ArrayList<>();
-        if (!columns.stream().anyMatch(c -> c.getName().equals("_id"))) {
-            fields.add(new MongoColumnHandle("_id", OBJECT_ID, true, Optional.empty()).getDocument());
+        if (!columns.stream().anyMatch(c -> c.getBaseName().equals("_id"))) {
+            fields.add(new MongoColumnHandle("_id", ImmutableList.of(), OBJECT_ID, true, false, Optional.empty()).getDocument());
         }
 
         fields.addAll(columns.stream()
@@ -798,6 +927,19 @@ else if (value instanceof Boolean) {
         else if (value instanceof Float || value instanceof Double) {
             typeSignature = DOUBLE.getTypeSignature();
         }
+        else if (value instanceof Decimal128 decimal128) {
+            BigDecimal decimal;
+            try {
+                decimal = decimal128.bigDecimalValue();
+            }
+            catch (ArithmeticException e) {
+                return Optional.empty();
+            }
+            // Java's BigDecimal.precision() returns precision for the unscaled value, so it skips leading zeros for values lower than 1.
+            // Trino's (SQL) decimal precision must include leading zeros in values less than 1, and can never be lower than scale.
+            int precision = Math.max(decimal.precision(), decimal.scale());
+            typeSignature = createDecimalType(precision, decimal.scale()).getTypeSignature();
+        }
         else if (value instanceof Date) {
             typeSignature = TIMESTAMP_MILLIS.getTypeSignature();
         }
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSessionProperties.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSessionProperties.java
new file mode 100644
index 000000000000..1a6036da1ecc
--- /dev/null
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSessionProperties.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed 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 io.trino.plugin.mongodb;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import io.trino.plugin.base.session.SessionPropertiesProvider;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.session.PropertyMetadata;
+
+import java.util.List;
+
+import static io.trino.spi.session.PropertyMetadata.booleanProperty;
+
+public final class MongoSessionProperties
+        implements SessionPropertiesProvider
+{
+    private static final String PROJECTION_PUSHDOWN_ENABLED = "projection_pushdown_enabled";
+
+    private final List<PropertyMetadata<?>> sessionProperties;
+
+    @Inject
+    public MongoSessionProperties(MongoClientConfig mongoConfig)
+    {
+        sessionProperties = ImmutableList.<PropertyMetadata<?>>builder()
+                .add(booleanProperty(
+                        PROJECTION_PUSHDOWN_ENABLED,
+                        "Read only required fields from a row type",
+                        mongoConfig.isProjectionPushdownEnabled(),
+                        false))
+                .build();
+    }
+
+    @Override
+    public List<PropertyMetadata<?>> getSessionProperties()
+    {
+        return sessionProperties;
+    }
+
+    public static boolean isProjectionPushdownEnabled(ConnectorSession session)
+    {
+        return session.getProperty(PROJECTION_PUSHDOWN_ENABLED, Boolean.class);
+    }
+}
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSplitManager.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSplitManager.java
index 78a94cca007e..2695498cde0d 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSplitManager.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSplitManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.mongodb;
 
+import com.google.inject.Inject;
 import io.trino.spi.HostAddress;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
@@ -23,8 +24,6 @@
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.FixedSplitSource;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 public class MongoSplitManager
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSslConfig.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSslConfig.java
new file mode 100644
index 000000000000..fef08cf8cbbf
--- /dev/null
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSslConfig.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed 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 io.trino.plugin.mongodb;
+
+import io.airlift.configuration.Config;
+import io.airlift.configuration.ConfigSecuritySensitive;
+import io.airlift.configuration.validation.FileExists;
+
+import java.io.File;
+import java.util.Optional;
+
+public class MongoSslConfig
+{
+    private File keystorePath;
+    private String keystorePassword;
+    private File truststorePath;
+    private String truststorePassword;
+
+    public Optional<@FileExists File> getKeystorePath()
+    {
+        return Optional.ofNullable(keystorePath);
+    }
+
+    @Config("mongodb.tls.keystore-path")
+    public MongoSslConfig setKeystorePath(File keystorePath)
+    {
+        this.keystorePath = keystorePath;
+        return this;
+    }
+
+    public Optional<String> getKeystorePassword()
+    {
+        return Optional.ofNullable(keystorePassword);
+    }
+
+    @Config("mongodb.tls.keystore-password")
+    @ConfigSecuritySensitive
+    public MongoSslConfig setKeystorePassword(String keystorePassword)
+    {
+        this.keystorePassword = keystorePassword;
+        return this;
+    }
+
+    public Optional<@FileExists File> getTruststorePath()
+    {
+        return Optional.ofNullable(truststorePath);
+    }
+
+    @Config("mongodb.tls.truststore-path")
+    public MongoSslConfig setTruststorePath(File truststorePath)
+    {
+        this.truststorePath = truststorePath;
+        return this;
+    }
+
+    public Optional<String> getTruststorePassword()
+    {
+        return Optional.ofNullable(truststorePassword);
+    }
+
+    @Config("mongodb.tls.truststore-password")
+    @ConfigSecuritySensitive
+    public MongoSslConfig setTruststorePassword(String truststorePassword)
+    {
+        this.truststorePassword = truststorePassword;
+        return this;
+    }
+}
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSslModule.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSslModule.java
new file mode 100644
index 000000000000..51572a2d8246
--- /dev/null
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoSslModule.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed 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 io.trino.plugin.mongodb;
+
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import com.google.inject.Singleton;
+import com.google.inject.multibindings.ProvidesIntoSet;
+import io.trino.spi.TrinoException;
+
+import javax.net.ssl.SSLContext;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.Optional;
+
+import static io.airlift.configuration.ConfigBinder.configBinder;
+import static io.trino.plugin.base.ssl.SslUtils.createSSLContext;
+import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+
+public class MongoSslModule
+        implements Module
+{
+    @Override
+    public void configure(Binder binder)
+    {
+        configBinder(binder).bindConfig(MongoSslConfig.class);
+    }
+
+    @ProvidesIntoSet
+    @Singleton
+    public MongoClientSettingConfigurator sslSpecificConfigurator(MongoSslConfig config)
+    {
+        return options -> options.applyToSslSettings(
+                builder -> {
+                    builder.enabled(true);
+                    buildSslContext(config.getKeystorePath(), config.getKeystorePassword(), config.getTruststorePath(), config.getTruststorePassword())
+                            .ifPresent(builder::context);
+                });
+    }
+
+    // TODO https://github.com/trinodb/trino/issues/15247 Add test for x.509 certificates
+    private static Optional<SSLContext> buildSslContext(
+            Optional<File> keystorePath,
+            Optional<String> keystorePassword,
+            Optional<File> truststorePath,
+            Optional<String> truststorePassword)
+    {
+        if (keystorePath.isEmpty() && truststorePath.isEmpty()) {
+            return Optional.empty();
+        }
+
+        try {
+            return Optional.of(createSSLContext(keystorePath, keystorePassword, truststorePath, truststorePassword));
+        }
+        catch (GeneralSecurityException | IOException e) {
+            throw new TrinoException(GENERIC_INTERNAL_ERROR, e);
+        }
+    }
+}
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoTableHandle.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoTableHandle.java
index c19e9bdaa4df..e52b35337748 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoTableHandle.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoTableHandle.java
@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableSet;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.SchemaTableName;
@@ -23,6 +24,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.Set;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static java.util.Objects.requireNonNull;
@@ -32,13 +34,14 @@ public class MongoTableHandle
 {
     private final SchemaTableName schemaTableName;
     private final RemoteTableName remoteTableName;
-    private final TupleDomain<ColumnHandle> constraint;
     private final Optional<String> filter;
+    private final TupleDomain<ColumnHandle> constraint;
+    private final Set<MongoColumnHandle> projectedColumns;
     private final OptionalInt limit;
 
     public MongoTableHandle(SchemaTableName schemaTableName, RemoteTableName remoteTableName, Optional<String> filter)
     {
-        this(schemaTableName, remoteTableName, filter, TupleDomain.all(), OptionalInt.empty());
+        this(schemaTableName, remoteTableName, filter, TupleDomain.all(), ImmutableSet.of(), OptionalInt.empty());
     }
 
     @JsonCreator
@@ -47,12 +50,14 @@ public MongoTableHandle(
             @JsonProperty("remoteTableName") RemoteTableName remoteTableName,
             @JsonProperty("filter") Optional<String> filter,
             @JsonProperty("constraint") TupleDomain<ColumnHandle> constraint,
+            @JsonProperty("projectedColumns") Set<MongoColumnHandle> projectedColumns,
             @JsonProperty("limit") OptionalInt limit)
     {
         this.schemaTableName = requireNonNull(schemaTableName, "schemaTableName is null");
         this.remoteTableName = requireNonNull(remoteTableName, "remoteTableName is null");
         this.filter = requireNonNull(filter, "filter is null");
         this.constraint = requireNonNull(constraint, "constraint is null");
+        this.projectedColumns = ImmutableSet.copyOf(requireNonNull(projectedColumns, "projectedColumns is null"));
         this.limit = requireNonNull(limit, "limit is null");
     }
 
@@ -80,16 +85,33 @@ public TupleDomain<ColumnHandle> getConstraint()
         return constraint;
     }
 
+    @JsonProperty
+    public Set<MongoColumnHandle> getProjectedColumns()
+    {
+        return projectedColumns;
+    }
+
     @JsonProperty
     public OptionalInt getLimit()
     {
         return limit;
     }
 
+    public MongoTableHandle withProjectedColumns(Set<MongoColumnHandle> projectedColumns)
+    {
+        return new MongoTableHandle(
+                schemaTableName,
+                remoteTableName,
+                filter,
+                constraint,
+                projectedColumns,
+                limit);
+    }
+
     @Override
     public int hashCode()
     {
-        return Objects.hash(schemaTableName, filter, constraint, limit);
+        return Objects.hash(schemaTableName, filter, constraint, projectedColumns, limit);
     }
 
     @Override
@@ -106,6 +128,7 @@ public boolean equals(Object obj)
                 Objects.equals(this.remoteTableName, other.remoteTableName) &&
                 Objects.equals(this.filter, other.filter) &&
                 Objects.equals(this.constraint, other.constraint) &&
+                Objects.equals(this.projectedColumns, other.projectedColumns) &&
                 Objects.equals(this.limit, other.limit);
     }
 
@@ -116,8 +139,9 @@ public String toString()
                 .add("schemaTableName", schemaTableName)
                 .add("remoteTableName", remoteTableName)
                 .add("filter", filter)
-                .add("limit", limit)
                 .add("constraint", constraint)
+                .add("projectedColumns", projectedColumns)
+                .add("limit", limit)
                 .toString();
     }
 }
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/ObjectIdType.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/ObjectIdType.java
index eba68e379d6c..d9dcf28a849c 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/ObjectIdType.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/ObjectIdType.java
@@ -14,36 +14,26 @@
 package io.trino.plugin.mongodb;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
 import io.airlift.slice.Slice;
-import io.airlift.slice.XxHash64;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlock;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.spi.connector.ConnectorSession;
-import io.trino.spi.function.BlockIndex;
-import io.trino.spi.function.BlockPosition;
-import io.trino.spi.function.ScalarOperator;
 import io.trino.spi.type.AbstractVariableWidthType;
 import io.trino.spi.type.SqlVarbinary;
 import io.trino.spi.type.TypeOperatorDeclaration;
 import io.trino.spi.type.TypeOperators;
 import io.trino.spi.type.TypeSignature;
-import org.bson.types.ObjectId;
-
-import java.io.IOException;
-
-import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
-import static io.trino.spi.function.OperatorType.EQUAL;
-import static io.trino.spi.function.OperatorType.XX_HASH_64;
-import static io.trino.spi.type.TypeOperatorDeclaration.extractOperatorDeclaration;
-import static java.lang.invoke.MethodHandles.lookup;
 
 public class ObjectIdType
         extends AbstractVariableWidthType
 {
-    private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = extractOperatorDeclaration(ObjectIdType.class, lookup(), Slice.class);
+    private static final TypeOperatorDeclaration TYPE_OPERATOR_DECLARATION = TypeOperatorDeclaration.builder(Slice.class)
+            .addOperators(DEFAULT_READ_OPERATORS)
+            .addOperators(DEFAULT_COMPARABLE_OPERATORS)
+            .addOperators(DEFAULT_ORDERING_OPERATORS)
+            .build();
 
     public static final ObjectIdType OBJECT_ID = new ObjectIdType();
 
@@ -79,25 +69,15 @@ public Object getObjectValue(ConnectorSession session, Block block, int position
         }
 
         // TODO: There's no way to represent string value of a custom type
-        return new SqlVarbinary(block.getSlice(position, 0, block.getSliceLength(position)).getBytes());
-    }
-
-    @Override
-    public void appendTo(Block block, int position, BlockBuilder blockBuilder)
-    {
-        if (block.isNull(position)) {
-            blockBuilder.appendNull();
-        }
-        else {
-            block.writeBytesTo(position, 0, block.getSliceLength(position), blockBuilder);
-            blockBuilder.closeEntry();
-        }
+        return new SqlVarbinary(getSlice(block, position).getBytes());
     }
 
     @Override
     public Slice getSlice(Block block, int position)
     {
-        return block.getSlice(position, 0, block.getSliceLength(position));
+        VariableWidthBlock valueBlock = (VariableWidthBlock) block.getUnderlyingValueBlock();
+        int valuePosition = block.getUnderlyingValuePosition(position);
+        return valueBlock.getSlice(valuePosition);
     }
 
     @Override
@@ -109,60 +89,6 @@ public void writeSlice(BlockBuilder blockBuilder, Slice value)
     @Override
     public void writeSlice(BlockBuilder blockBuilder, Slice value, int offset, int length)
     {
-        blockBuilder.writeBytes(value, offset, length).closeEntry();
-    }
-
-    @ScalarOperator(EQUAL)
-    private static boolean equalOperator(Slice left, Slice right)
-    {
-        return left.equals(right);
-    }
-
-    @ScalarOperator(EQUAL)
-    private static boolean equalOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
-    {
-        int leftLength = leftBlock.getSliceLength(leftPosition);
-        int rightLength = rightBlock.getSliceLength(rightPosition);
-        if (leftLength != rightLength) {
-            return false;
-        }
-        return leftBlock.equals(leftPosition, 0, rightBlock, rightPosition, 0, leftLength);
-    }
-
-    @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(Slice value)
-    {
-        return XxHash64.hash(value);
-    }
-
-    @ScalarOperator(XX_HASH_64)
-    private static long xxHash64Operator(@BlockPosition Block block, @BlockIndex int position)
-    {
-        return block.hash(position, 0, block.getSliceLength(position));
-    }
-
-    @ScalarOperator(COMPARISON_UNORDERED_LAST)
-    private static long comparisonOperator(Slice left, Slice right)
-    {
-        return left.compareTo(right);
-    }
-
-    @ScalarOperator(COMPARISON_UNORDERED_LAST)
-    private static long comparisonOperator(@BlockPosition Block leftBlock, @BlockIndex int leftPosition, @BlockPosition Block rightBlock, @BlockIndex int rightPosition)
-    {
-        int leftLength = leftBlock.getSliceLength(leftPosition);
-        int rightLength = rightBlock.getSliceLength(rightPosition);
-        return leftBlock.compareTo(leftPosition, 0, leftLength, rightBlock, rightPosition, 0, rightLength);
-    }
-
-    public static class ObjectIdSerializer
-            extends JsonSerializer<ObjectId>
-    {
-        @Override
-        public void serialize(ObjectId objectId, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
-                throws IOException
-        {
-            jsonGenerator.writeString(objectId.toString());
-        }
+        ((VariableWidthBlockBuilder) blockBuilder).writeEntry(value, offset, length);
     }
 }
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/TypeUtils.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/TypeUtils.java
index 0d4001392d3b..c5d52d4236d3 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/TypeUtils.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/TypeUtils.java
@@ -14,9 +14,8 @@
 package io.trino.plugin.mongodb;
 
 import com.google.common.collect.ImmutableSet;
-import io.trino.spi.type.ArrayType;
-import io.trino.spi.type.MapType;
-import io.trino.spi.type.RowType;
+import io.trino.spi.type.CharType;
+import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
 
@@ -25,7 +24,9 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DateType.DATE;
+import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.StandardTypes.JSON;
 import static io.trino.spi.type.TimeType.TIME_MILLIS;
@@ -41,6 +42,8 @@ public final class TypeUtils
             SMALLINT,
             INTEGER,
             BIGINT,
+            REAL,
+            DOUBLE,
             DATE,
             TIME_MILLIS,
             TIMESTAMP_MILLIS,
@@ -53,23 +56,12 @@ public static boolean isJsonType(Type type)
         return type.getBaseName().equals(JSON);
     }
 
-    public static boolean isArrayType(Type type)
-    {
-        return type instanceof ArrayType;
-    }
-
-    public static boolean isMapType(Type type)
-    {
-        return type instanceof MapType;
-    }
-
-    public static boolean isRowType(Type type)
-    {
-        return type instanceof RowType;
-    }
-
     public static boolean isPushdownSupportedType(Type type)
     {
-        return type instanceof VarcharType || type instanceof ObjectIdType || PUSHDOWN_SUPPORTED_PRIMITIVE_TYPES.contains(type);
+        return type instanceof CharType
+                || type instanceof VarcharType
+                || type instanceof DecimalType
+                || type instanceof ObjectIdType
+                || PUSHDOWN_SUPPORTED_PRIMITIVE_TYPES.contains(type);
     }
 }
diff --git a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/ptf/Query.java b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/ptf/Query.java
index 28d2737ec95c..413faba8d065 100644
--- a/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/ptf/Query.java
+++ b/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/ptf/Query.java
@@ -16,41 +16,42 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.airlift.slice.Slice;
 import io.trino.plugin.mongodb.MongoColumnHandle;
 import io.trino.plugin.mongodb.MongoMetadata;
+import io.trino.plugin.mongodb.MongoMetadataFactory;
 import io.trino.plugin.mongodb.MongoSession;
 import io.trino.plugin.mongodb.MongoTableHandle;
 import io.trino.plugin.mongodb.RemoteTableName;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnSchema;
+import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.ConnectorTableSchema;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.ptf.AbstractConnectorTableFunction;
-import io.trino.spi.ptf.Argument;
-import io.trino.spi.ptf.ConnectorTableFunction;
-import io.trino.spi.ptf.ConnectorTableFunctionHandle;
-import io.trino.spi.ptf.Descriptor;
-import io.trino.spi.ptf.ScalarArgument;
-import io.trino.spi.ptf.ScalarArgumentSpecification;
-import io.trino.spi.ptf.TableFunctionAnalysis;
+import io.trino.spi.function.table.AbstractConnectorTableFunction;
+import io.trino.spi.function.table.Argument;
+import io.trino.spi.function.table.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.Descriptor;
+import io.trino.spi.function.table.ScalarArgument;
+import io.trino.spi.function.table.ScalarArgumentSpecification;
+import io.trino.spi.function.table.TableFunctionAnalysis;
 import org.bson.Document;
 import org.bson.json.JsonParseException;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
-import static io.trino.spi.ptf.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
+import static io.trino.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
@@ -65,10 +66,10 @@ public class Query
     private final MongoSession session;
 
     @Inject
-    public Query(MongoSession session)
+    public Query(MongoMetadataFactory mongoMetadataFactory, MongoSession session)
     {
         requireNonNull(session, "session is null");
-        this.metadata = new MongoMetadata(session);
+        this.metadata = mongoMetadataFactory.create();
         this.session = session;
     }
 
@@ -108,7 +109,11 @@ public QueryFunction(MongoMetadata metadata, MongoSession mongoSession)
         }
 
         @Override
-        public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransactionHandle transaction, Map<String, Argument> arguments)
+        public TableFunctionAnalysis analyze(
+                ConnectorSession session,
+                ConnectorTransactionHandle transaction,
+                Map<String, Argument> arguments,
+                ConnectorAccessControl accessControl)
         {
             String database = ((Slice) ((ScalarArgument) arguments.get("DATABASE")).getValue()).toStringUtf8();
             String collection = ((Slice) ((ScalarArgument) arguments.get("COLLECTION")).getValue()).toStringUtf8();
@@ -134,7 +139,7 @@ public TableFunctionAnalysis analyze(ConnectorSession session, ConnectorTransact
 
             Descriptor returnedType = new Descriptor(columns.stream()
                     .map(MongoColumnHandle.class::cast)
-                    .map(column -> new Descriptor.Field(column.getName(), Optional.of(column.getType())))
+                    .map(column -> new Descriptor.Field(column.getBaseName(), Optional.of(column.getType())))
                     .collect(toImmutableList()));
 
             QueryFunctionHandle handle = new QueryFunctionHandle(tableHandle);
@@ -152,7 +157,7 @@ public static Document parseFilter(String filter)
             return Document.parse(filter);
         }
         catch (JsonParseException e) {
-            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Can't parse 'filter' argument as json");
+            throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "Can't parse 'filter' argument as json", e);
         }
     }
 
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/AuthenticatedMongoServer.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/AuthenticatedMongoServer.java
index fa12de058609..f9a7ada04090 100644
--- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/AuthenticatedMongoServer.java
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/AuthenticatedMongoServer.java
@@ -21,6 +21,7 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 
 import java.io.Closeable;
+import java.util.List;
 
 import static java.util.Objects.requireNonNull;
 
@@ -30,11 +31,6 @@ public class AuthenticatedMongoServer
     private static final int MONGODB_INTERNAL_PORT = 27017;
     private static final String ROOT_USER = "root";
     private static final String ROOT_PASSWORD = "password";
-    private static final String TEST_USER = "testUser";
-    private static final String TEST_PASSWORD = "pass";
-    private static final String TEST_ROLE = "testRole";
-    public static final String TEST_DATABASE = "test";
-    public static final String TEST_COLLECTION = "testCollection";
     private final GenericContainer<?> dockerContainer;
 
     public AuthenticatedMongoServer(String mongoVersion)
@@ -59,51 +55,51 @@ public ConnectionString rootUserConnectionString()
                 dockerContainer.getMappedPort(MONGODB_INTERNAL_PORT)));
     }
 
-    public ConnectionString testUserConnectionString()
+    public ConnectionString testUserConnectionString(String database, String user, String password)
     {
         return new ConnectionString("mongodb://%s:%s@%s:%d/%s".formatted(
-                TEST_USER,
-                TEST_PASSWORD,
+                user,
+                password,
                 dockerContainer.getHost(),
                 dockerContainer.getMappedPort(MONGODB_INTERNAL_PORT),
-                TEST_DATABASE));
+                database));
     }
 
-    public static Document createTestRole()
+    public static Document createRole(String role, ImmutableList<Document> privileges, ImmutableList<Object> roles)
     {
         return new Document(ImmutableMap.of(
-                "createRole", TEST_ROLE,
-                "privileges", ImmutableList.of(privilege("_schema"), privilege(TEST_COLLECTION)),
-                "roles", ImmutableList.of()));
+                "createRole", role,
+                "privileges", privileges,
+                "roles", roles));
     }
 
-    private static Document privilege(String collectionName)
+    public static Document privilege(Document resource, List<String> actions)
     {
         return new Document(ImmutableMap.of(
-                "resource", resource(collectionName),
-                "actions", ImmutableList.of("find")));
+                "resource", resource,
+                "actions", actions));
     }
 
-    private static Document resource(String collectionName)
+    public static Document resource(String database, String collectionName)
     {
         return new Document(ImmutableMap.of(
-                "db", TEST_DATABASE,
+                "db", database,
                 "collection", collectionName));
     }
 
-    public static Document createTestUser()
+    public static Document createUser(String user, String password, ImmutableList<Document> roles)
     {
         return new Document(ImmutableMap.of(
-                "createUser", TEST_USER,
-                "pwd", TEST_PASSWORD,
-                "roles", ImmutableList.of(role())));
+                "createUser", user,
+                "pwd", password,
+                "roles", roles));
     }
 
-    private static Document role()
+    public static Document role(String database, String role)
     {
         return new Document(ImmutableMap.of(
-                "role", TEST_ROLE,
-                "db", TEST_DATABASE));
+                "role", role,
+                "db", database));
     }
 
     @Override
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/BaseMongoConnectorSmokeTest.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/BaseMongoConnectorSmokeTest.java
index 66112bc65b18..f5a7c6dcf7b3 100644
--- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/BaseMongoConnectorSmokeTest.java
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/BaseMongoConnectorSmokeTest.java
@@ -13,28 +13,110 @@
  */
 package io.trino.plugin.mongodb;
 
+import com.google.common.collect.ImmutableList;
 import io.trino.testing.BaseConnectorSmokeTest;
 import io.trino.testing.TestingConnectorBehavior;
+import io.trino.testing.sql.TestTable;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class BaseMongoConnectorSmokeTest
         extends BaseConnectorSmokeTest
 {
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
+        return switch (connectorBehavior) {
+            case SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_TRUNCATE,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
 
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return false;
+    @Test
+    public void testProjectionPushdown()
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_projection_pushdown_multiple_rows_",
+                "(id INT, nested1 ROW(child1 INT, child2 VARCHAR))",
+                ImmutableList.of(
+                        "(1, ROW(10, 'a'))",
+                        "(2, ROW(NULL, 'b'))",
+                        "(3, ROW(30, 'c'))",
+                        "(4, NULL)"))) {
+            assertThat(query("SELECT id, nested1.child1 FROM " + testTable.getName() + " WHERE nested1.child2 = 'c'"))
+                    .matches("VALUES (3, 30)")
+                    .isFullyPushedDown();
+        }
+    }
+
+    @Test
+    public void testReadDottedField()
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_read_dotted_field_",
+                "(root ROW(\"dotted.field\" VARCHAR, field VARCHAR))",
+                ImmutableList.of("ROW(ROW('foo', 'bar'))"))) {
+            assertThat(query("SELECT root.\"dotted.field\" FROM " + testTable.getName()))
+                    .matches("SELECT varchar 'foo'");
+
+            assertThat(query("SELECT root.\"dotted.field\", root.field FROM " + testTable.getName()))
+                    .matches("SELECT varchar 'foo', varchar 'bar'");
+        }
+    }
+
+    @Test
+    public void testReadDollarPrefixedField()
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_read_dotted_field_",
+                "(root ROW(\"$field1\" VARCHAR, field2 VARCHAR))",
+                ImmutableList.of("ROW(ROW('foo', 'bar'))"))) {
+            assertThat(query("SELECT root.\"$field1\" FROM " + testTable.getName()))
+                    .matches("SELECT varchar 'foo'");
+
+            assertThat(query("SELECT root.\"$field1\", root.field2 FROM " + testTable.getName()))
+                    .matches("SELECT varchar 'foo', varchar 'bar'");
+        }
+    }
+
+    @Test
+    public void testProjectionPushdownWithHighlyNestedData()
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_projection_pushdown_highly_nested_data_",
+                "(id INT, row1_t ROW(f1 INT, f2 INT, row2_t ROW (f1 INT, f2 INT, row3_t ROW(f1 INT, f2 INT))))",
+                ImmutableList.of("(1, ROW(2, 3, ROW(4, 5, ROW(6, 7))))",
+                        "(11, ROW(12, 13, ROW(14, 15, ROW(16, 17))))",
+                        "(21, ROW(22, 23, ROW(24, 25, ROW(26, 27))))"))) {
+            // Test select projected columns, with and without their parent column
+            assertQuery("SELECT id, row1_t.row2_t.row3_t.f2 FROM " + testTable.getName(), "VALUES (1, 7), (11, 17), (21, 27)");
+            assertQuery("SELECT id, row1_t.row2_t.row3_t.f2, CAST(row1_t AS JSON) FROM " + testTable.getName(),
+                    "VALUES (1, 7, '{\"f1\":2,\"f2\":3,\"row2_t\":{\"f1\":4,\"f2\":5,\"row3_t\":{\"f1\":6,\"f2\":7}}}'), " +
+                            "(11, 17, '{\"f1\":12,\"f2\":13,\"row2_t\":{\"f1\":14,\"f2\":15,\"row3_t\":{\"f1\":16,\"f2\":17}}}'), " +
+                            "(21, 27, '{\"f1\":22,\"f2\":23,\"row2_t\":{\"f1\":24,\"f2\":25,\"row3_t\":{\"f1\":26,\"f2\":27}}}')");
 
-            case SUPPORTS_DELETE:
-                return true;
+            // Test predicates on immediate child column and deeper nested column
+            assertQuery("SELECT id, CAST(row1_t.row2_t.row3_t AS JSON) FROM " + testTable.getName() + " WHERE row1_t.row2_t.row3_t.f2 = 27", "VALUES (21, '{\"f1\":26,\"f2\":27}')");
+            assertQuery("SELECT id, CAST(row1_t.row2_t.row3_t AS JSON) FROM " + testTable.getName() + " WHERE row1_t.row2_t.row3_t.f2 > 20", "VALUES (21, '{\"f1\":26,\"f2\":27}')");
+            assertQuery("SELECT id, CAST(row1_t AS JSON) FROM " + testTable.getName() + " WHERE row1_t.row2_t.row3_t.f2 = 27",
+                    "VALUES (21, '{\"f1\":22,\"f2\":23,\"row2_t\":{\"f1\":24,\"f2\":25,\"row3_t\":{\"f1\":26,\"f2\":27}}}')");
+            assertQuery("SELECT id, CAST(row1_t AS JSON) FROM " + testTable.getName() + " WHERE row1_t.row2_t.row3_t.f2 > 20",
+                    "VALUES (21, '{\"f1\":22,\"f2\":23,\"row2_t\":{\"f1\":24,\"f2\":25,\"row3_t\":{\"f1\":26,\"f2\":27}}}')");
 
-            default:
-                return super.hasBehavior(connectorBehavior);
+            // Test predicates on parent columns
+            assertQuery("SELECT id, row1_t.row2_t.row3_t.f1 FROM " + testTable.getName() + " WHERE row1_t.row2_t.row3_t = ROW(16, 17)", "VALUES (11, 16)");
+            assertQuery("SELECT id, row1_t.row2_t.row3_t.f1 FROM " + testTable.getName() + " WHERE row1_t = ROW(22, 23, ROW(24, 25, ROW(26, 27)))", "VALUES (21, 26)");
         }
     }
 }
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoCreateAndInsertDataSetup.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoCreateAndInsertDataSetup.java
index 12587632e08c..2d675a528d9d 100644
--- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoCreateAndInsertDataSetup.java
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoCreateAndInsertDataSetup.java
@@ -17,7 +17,6 @@
 import io.trino.testing.datatype.ColumnSetup;
 import io.trino.testing.datatype.DataSetup;
 import io.trino.testing.sql.TemporaryRelation;
-import io.trino.testing.sql.TestTable;
 import io.trino.testing.sql.TrinoSqlExecutor;
 import org.bson.Document;
 
@@ -46,7 +45,7 @@ public MongoCreateAndInsertDataSetup(TrinoSqlExecutor trinoSqlExecutor, MongoCli
     @Override
     public TemporaryRelation setupTemporaryRelation(List<ColumnSetup> inputs)
     {
-        TestTable testTable = new MongoTestTable(trinoSqlExecutor, tableNamePrefix);
+        MongoTestTable testTable = new MongoTestTable(trinoSqlExecutor, tableNamePrefix);
         try {
             insertRows(testTable, inputs);
         }
@@ -57,7 +56,7 @@ public TemporaryRelation setupTemporaryRelation(List<ColumnSetup> inputs)
         return testTable;
     }
 
-    private void insertRows(TestTable testTable, List<ColumnSetup> inputs)
+    private void insertRows(MongoTestTable testTable, List<ColumnSetup> inputs)
     {
         int i = 0;
         StringBuilder json = new StringBuilder("{");
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoQueryRunner.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoQueryRunner.java
index f9653289d7c4..846ba23bf818 100644
--- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoQueryRunner.java
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoQueryRunner.java
@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.mongodb;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
@@ -39,12 +38,6 @@ public final class MongoQueryRunner
 
     private MongoQueryRunner() {}
 
-    public static DistributedQueryRunner createMongoQueryRunner(MongoServer server, TpchTable<?>... tables)
-            throws Exception
-    {
-        return createMongoQueryRunner(server, ImmutableMap.of(), ImmutableList.copyOf(tables));
-    }
-
     public static DistributedQueryRunner createMongoQueryRunner(MongoServer server, Map<String, String> extraProperties, Iterable<TpchTable<?>> tables)
             throws Exception
     {
@@ -71,7 +64,7 @@ public static DistributedQueryRunner createMongoQueryRunner(
             queryRunner.installPlugin(new TpchPlugin());
             queryRunner.createCatalog("tpch", "tpch");
 
-            connectorProperties = new HashMap(ImmutableMap.copyOf(connectorProperties));
+            connectorProperties = new HashMap<>(ImmutableMap.copyOf(connectorProperties));
             connectorProperties.putIfAbsent("mongodb.connection-url", server.getConnectionString().toString());
 
             queryRunner.installPlugin(new MongoPlugin());
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoTestTable.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoTestTable.java
index c326fc795b33..e490865a20cb 100644
--- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoTestTable.java
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoTestTable.java
@@ -14,23 +14,32 @@
 package io.trino.plugin.mongodb;
 
 import io.trino.testing.sql.SqlExecutor;
-import io.trino.testing.sql.TestTable;
+import io.trino.testing.sql.TemporaryRelation;
 
-import java.util.List;
-
-import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static java.util.Objects.requireNonNull;
 
 public class MongoTestTable
-        extends TestTable
+        implements TemporaryRelation
 {
+    private final SqlExecutor sqlExecutor;
+    private final String name;
+
     public MongoTestTable(SqlExecutor sqlExecutor, String namePrefix)
     {
-        super(sqlExecutor, namePrefix, null);
+        this.sqlExecutor = requireNonNull(sqlExecutor, "sqlExecutor is null");
+        this.name = requireNonNull(namePrefix, "namePrefix is null") + randomNameSuffix();
+    }
+
+    @Override
+    public String getName()
+    {
+        return name;
     }
 
     @Override
-    public void createAndInsert(List<String> rowsToInsert)
+    public void close()
     {
-        checkArgument(rowsToInsert.isEmpty(), "rowsToInsert must be empty");
+        sqlExecutor.execute("DROP TABLE " + name);
     }
 }
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoClientConfig.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoClientConfig.java
index 11973b5cc5f2..9576fd534ddb 100644
--- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoClientConfig.java
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoClientConfig.java
@@ -14,19 +14,13 @@
 package io.trino.plugin.mongodb;
 
 import com.google.common.collect.ImmutableMap;
-import io.airlift.configuration.ConfigurationFactory;
 import org.testng.annotations.Test;
 
-import javax.validation.constraints.AssertTrue;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.Map;
 
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
 import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
 import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
-import static io.airlift.testing.ValidationAssertions.assertFailsValidation;
-import static org.testng.Assert.assertEquals;
 
 public class TestMongoClientConfig
 {
@@ -43,25 +37,19 @@ public void testDefaults()
                 .setConnectionTimeout(10_000)
                 .setSocketTimeout(0)
                 .setTlsEnabled(false)
-                .setKeystorePath(null)
-                .setKeystorePassword(null)
-                .setTruststorePath(null)
-                .setTruststorePassword(null)
                 .setMaxConnectionIdleTime(0)
                 .setCursorBatchSize(0)
                 .setReadPreference(ReadPreferenceType.PRIMARY)
                 .setWriteConcern(WriteConcernType.ACKNOWLEDGED)
                 .setRequiredReplicaSetName(null)
-                .setImplicitRowFieldPrefix("_pos"));
+                .setImplicitRowFieldPrefix("_pos")
+                .setProjectionPushdownEnabled(true));
     }
 
     @Test
     public void testExplicitPropertyMappings()
             throws Exception
     {
-        Path keystoreFile = Files.createTempFile(null, null);
-        Path truststoreFile = Files.createTempFile(null, null);
-
         Map<String, String> properties = ImmutableMap.<String, String>builder()
                 .put("mongodb.schema-collection", "_my_schema")
                 .put("mongodb.case-insensitive-name-matching", "true")
@@ -72,21 +60,15 @@ public void testExplicitPropertyMappings()
                 .put("mongodb.connection-timeout", "9999")
                 .put("mongodb.socket-timeout", "1")
                 .put("mongodb.tls.enabled", "true")
-                .put("mongodb.tls.keystore-path", keystoreFile.toString())
-                .put("mongodb.tls.keystore-password", "keystore-password")
-                .put("mongodb.tls.truststore-path", truststoreFile.toString())
-                .put("mongodb.tls.truststore-password", "truststore-password")
                 .put("mongodb.max-connection-idle-time", "180000")
                 .put("mongodb.cursor-batch-size", "1")
                 .put("mongodb.read-preference", "NEAREST")
                 .put("mongodb.write-concern", "UNACKNOWLEDGED")
                 .put("mongodb.required-replica-set", "replica_set")
                 .put("mongodb.implicit-row-field-prefix", "_prefix")
+                .put("mongodb.projection-pushdown-enabled", "false")
                 .buildOrThrow();
 
-        ConfigurationFactory configurationFactory = new ConfigurationFactory(properties);
-        MongoClientConfig config = configurationFactory.build(MongoClientConfig.class);
-
         MongoClientConfig expected = new MongoClientConfig()
                 .setSchemaCollection("_my_schema")
                 .setCaseInsensitiveNameMatching(true)
@@ -97,57 +79,14 @@ public void testExplicitPropertyMappings()
                 .setConnectionTimeout(9_999)
                 .setSocketTimeout(1)
                 .setTlsEnabled(true)
-                .setKeystorePath(keystoreFile.toFile())
-                .setKeystorePassword("keystore-password")
-                .setTruststorePath(truststoreFile.toFile())
-                .setTruststorePassword("truststore-password")
                 .setMaxConnectionIdleTime(180_000)
                 .setCursorBatchSize(1)
                 .setReadPreference(ReadPreferenceType.NEAREST)
                 .setWriteConcern(WriteConcernType.UNACKNOWLEDGED)
                 .setRequiredReplicaSetName("replica_set")
-                .setImplicitRowFieldPrefix("_prefix");
-
-        assertEquals(config.getSchemaCollection(), expected.getSchemaCollection());
-        assertEquals(config.isCaseInsensitiveNameMatching(), expected.isCaseInsensitiveNameMatching());
-        assertEquals(config.getConnectionUrl(), expected.getConnectionUrl());
-        assertEquals(config.getMinConnectionsPerHost(), expected.getMinConnectionsPerHost());
-        assertEquals(config.getConnectionsPerHost(), expected.getConnectionsPerHost());
-        assertEquals(config.getMaxWaitTime(), expected.getMaxWaitTime());
-        assertEquals(config.getConnectionTimeout(), expected.getConnectionTimeout());
-        assertEquals(config.getSocketTimeout(), expected.getSocketTimeout());
-        assertEquals(config.getTlsEnabled(), expected.getTlsEnabled());
-        assertEquals(config.getKeystorePath(), expected.getKeystorePath());
-        assertEquals(config.getKeystorePassword(), expected.getKeystorePassword());
-        assertEquals(config.getTruststorePath(), expected.getTruststorePath());
-        assertEquals(config.getTruststorePassword(), expected.getTruststorePassword());
-        assertEquals(config.getMaxConnectionIdleTime(), expected.getMaxConnectionIdleTime());
-        assertEquals(config.getCursorBatchSize(), expected.getCursorBatchSize());
-        assertEquals(config.getReadPreference(), expected.getReadPreference());
-        assertEquals(config.getWriteConcern(), expected.getWriteConcern());
-        assertEquals(config.getRequiredReplicaSetName(), expected.getRequiredReplicaSetName());
-        assertEquals(config.getImplicitRowFieldPrefix(), expected.getImplicitRowFieldPrefix());
-    }
-
-    @Test
-    public void testValidation()
-            throws Exception
-    {
-        Path keystoreFile = Files.createTempFile(null, null);
-        Path truststoreFile = Files.createTempFile(null, null);
+                .setImplicitRowFieldPrefix("_prefix")
+                .setProjectionPushdownEnabled(false);
 
-        assertFailsTlsValidation(new MongoClientConfig().setKeystorePath(keystoreFile.toFile()));
-        assertFailsTlsValidation(new MongoClientConfig().setKeystorePassword("keystore password"));
-        assertFailsTlsValidation(new MongoClientConfig().setTruststorePath(truststoreFile.toFile()));
-        assertFailsTlsValidation(new MongoClientConfig().setTruststorePassword("truststore password"));
-    }
-
-    private static void assertFailsTlsValidation(MongoClientConfig config)
-    {
-        assertFailsValidation(
-                config,
-                "validTlsConfig",
-                "'mongodb.tls.keystore-path', 'mongodb.tls.keystore-password', 'mongodb.tls.truststore-path' and 'mongodb.tls.truststore-password' must be empty when TLS is disabled",
-                AssertTrue.class);
+        assertFullMapping(properties, expected);
     }
 }
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoComplexTypePredicatePushDown.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoComplexTypePredicatePushDown.java
new file mode 100644
index 000000000000..5f3de81b9cf6
--- /dev/null
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoComplexTypePredicatePushDown.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.plugin.mongodb;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.trino.testing.BaseComplexTypesPredicatePushDownTest;
+import io.trino.testing.QueryRunner;
+
+import static io.trino.plugin.mongodb.MongoQueryRunner.createMongoQueryRunner;
+
+public class TestMongoComplexTypePredicatePushDown
+        extends BaseComplexTypesPredicatePushDownTest
+{
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        MongoServer server = closeAfterClass(new MongoServer());
+        return createMongoQueryRunner(server, ImmutableMap.of(), ImmutableList.of());
+    }
+}
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoConnectorTest.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoConnectorTest.java
index a90171c4ae35..a6dcbbfdf206 100644
--- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoConnectorTest.java
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoConnectorTest.java
@@ -15,13 +15,17 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.mongodb.DBRef;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Collation;
 import com.mongodb.client.model.CreateCollectionOptions;
+import io.trino.Session;
+import io.trino.sql.planner.plan.FilterNode;
 import io.trino.sql.planner.plan.LimitNode;
+import io.trino.sql.planner.plan.ProjectNode;
 import io.trino.testing.BaseConnectorTest;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.MaterializedRow;
@@ -29,9 +33,11 @@
 import io.trino.testing.TestingConnectorBehavior;
 import io.trino.testing.sql.TestTable;
 import org.bson.Document;
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 import org.testng.SkipException;
 import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -42,11 +48,13 @@
 import java.util.Date;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.Set;
 
 import static com.mongodb.client.model.CollationCaseFirst.LOWER;
 import static com.mongodb.client.model.CollationStrength.PRIMARY;
 import static io.trino.plugin.mongodb.MongoQueryRunner.createMongoClient;
 import static io.trino.plugin.mongodb.MongoQueryRunner.createMongoQueryRunner;
+import static io.trino.plugin.mongodb.TypeUtils.isPushdownSupportedType;
 import static io.trino.spi.connector.ConnectorMetadata.MODIFYING_ROWS_MESSAGE;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
@@ -60,8 +68,8 @@
 public class TestMongoConnectorTest
         extends BaseConnectorTest
 {
-    private MongoServer server;
-    private MongoClient client;
+    protected MongoServer server;
+    protected MongoClient client;
 
     @Override
     protected QueryRunner createQueryRunner()
@@ -72,6 +80,12 @@ protected QueryRunner createQueryRunner()
         return createMongoQueryRunner(server, ImmutableMap.of(), REQUIRED_TPCH_TABLES);
     }
 
+    @BeforeClass
+    public void initTestSchema()
+    {
+        assertUpdate("CREATE SCHEMA IF NOT EXISTS test");
+    }
+
     @AfterClass(alwaysRun = true)
     public final void destroy()
     {
@@ -81,27 +95,23 @@ public final void destroy()
         client = null;
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_DROP_FIELD:
-            case SUPPORTS_RENAME_COLUMN:
-                return false;
-
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return false;
-
-            case SUPPORTS_DELETE:
-                return true;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_FIELD,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_DROP_FIELD,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_RENAME_FIELD,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_SET_FIELD_TYPE,
+                    SUPPORTS_TRUNCATE,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -305,8 +315,12 @@ public void testExplainAnalyzeWithDeleteWithSubquery()
     public void testPredicatePushdown(String value)
     {
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_predicate_pushdown", "AS SELECT %s col".formatted(value))) {
-            assertThat(query("SELECT * FROM " + table.getName() + " WHERE col = " + value + ""))
-                    .isFullyPushedDown();
+            testPredicatePushdown(table.getName(), "col = " + value);
+            testPredicatePushdown(table.getName(), "col != " + value);
+            testPredicatePushdown(table.getName(), "col < " + value);
+            testPredicatePushdown(table.getName(), "col > " + value);
+            testPredicatePushdown(table.getName(), "col <= " + value);
+            testPredicatePushdown(table.getName(), "col >= " + value);
         }
     }
 
@@ -319,7 +333,10 @@ public Object[][] predicatePushdownProvider()
                 {"smallint '2'"},
                 {"integer '3'"},
                 {"bigint '4'"},
+                {"decimal '3.14'"},
+                {"decimal '1234567890.123456789'"},
                 {"'test'"},
+                {"char 'test'"},
                 {"objectid('6216f0c6c432d45190f25e7c')"},
                 {"date '1970-01-01'"},
                 {"time '00:00:00.000'"},
@@ -328,6 +345,123 @@ public Object[][] predicatePushdownProvider()
         };
     }
 
+    @Test
+    public void testPredicatePushdownRealType()
+    {
+        testPredicatePushdownFloatingPoint("real '1.234'");
+    }
+
+    @Test
+    public void testPredicatePushdownDoubleType()
+    {
+        testPredicatePushdownFloatingPoint("double '5.678'");
+    }
+
+    private void testPredicatePushdownFloatingPoint(String value)
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_floating_point_pushdown", "AS SELECT %s col".formatted(value))) {
+            assertThat(query("SELECT * FROM " + table.getName() + " WHERE col = " + value))
+                    .isFullyPushedDown();
+            assertThat(query("SELECT * FROM " + table.getName() + " WHERE col <= " + value))
+                    .isFullyPushedDown();
+            assertThat(query("SELECT * FROM " + table.getName() + " WHERE col >= " + value))
+                    .isFullyPushedDown();
+            assertThat(query("SELECT * FROM " + table.getName() + " WHERE col > " + value))
+                    .returnsEmptyResult()
+                    .isFullyPushedDown();
+            assertThat(query("SELECT * FROM " + table.getName() + " WHERE col < " + value))
+                    .returnsEmptyResult()
+                    .isFullyPushedDown();
+            assertThat(query("SELECT * FROM " + table.getName() + " WHERE col != " + value))
+                    .returnsEmptyResult()
+                    .isNotFullyPushedDown(FilterNode.class);
+        }
+    }
+
+    @Test
+    public void testPredicatePushdownCharWithPaddedSpace()
+    {
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_predicate_pushdown_char_with_padded_space",
+                "(k, v) AS VALUES" +
+                        "   (-1, CAST(NULL AS char(3))), " +
+                        "   (0, CAST('' AS char(3)))," +
+                        "   (1, CAST(' ' AS char(3))), " +
+                        "   (2, CAST('  ' AS char(3))), " +
+                        "   (3, CAST('   ' AS char(3)))," +
+                        "   (4, CAST('x' AS char(3)))," +
+                        "   (5, CAST('x ' AS char(3)))," +
+                        "   (6, CAST('x  ' AS char(3)))," +
+                        "   (7, CAST('\0' AS char(3)))," +
+                        "   (8, CAST('\0 ' AS char(3)))," +
+                        "   (9, CAST('\0  ' AS char(3)))")) {
+            assertThat(query("SELECT k FROM " + table.getName() + " WHERE v = ''"))
+                    // The value is included because both sides of the comparison are coerced to char(3)
+                    .matches("VALUES 0, 1, 2, 3")
+                    .isFullyPushedDown();
+            assertThat(query("SELECT k FROM " + table.getName() + " WHERE v = 'x '"))
+                    // The value is included because both sides of the comparison are coerced to char(3)
+                    .matches("VALUES 4, 5, 6")
+                    .isFullyPushedDown();
+            assertThat(query("SELECT k FROM " + table.getName() + " WHERE v = '\0  '"))
+                    // The value is included because both sides of the comparison are coerced to char(3)
+                    .matches("VALUES 7, 8, 9")
+                    .isFullyPushedDown();
+        }
+    }
+
+    @Test
+    public void testPredicatePushdownMultipleNotEquals()
+    {
+        // Regression test for https://github.com/trinodb/trino/issues/19404
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_predicate_pushdown_with_multiple_not_equals",
+                "(id, value) AS VALUES (1, 10), (2, 20), (3, 30)")) {
+            assertThat(query("SELECT * FROM " + table.getName() + " WHERE id != 1 AND value != 20"))
+                    .matches("VALUES (3, 30)")
+                    .isFullyPushedDown();
+        }
+    }
+
+    @Test
+    public void testHighPrecisionDecimalPredicate()
+    {
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_high_precision_decimal_predicate",
+                "(col DECIMAL(34, 0))",
+                Arrays.asList("decimal '3141592653589793238462643383279502'", null))) {
+            // Filter clause with 38 precision decimal value
+            String predicateValue = "decimal '31415926535897932384626433832795028841'";
+            assertThat(query("SELECT * FROM " + table.getName() + " WHERE col = " + predicateValue))
+                    // With EQUAL operator when column type precision is less than the predicate value's precision,
+                    // PushPredicateIntoTableScan#pushFilterIntoTableScan returns ValuesNode. So It is not possible to verify isFullyPushedDown.
+                    .returnsEmptyResult();
+            testPredicatePushdown(table.getName(), "col != " + predicateValue);
+            testPredicatePushdown(table.getName(), "col < " + predicateValue);
+            testPredicatePushdown(table.getName(), "col > " + predicateValue);
+            testPredicatePushdown(table.getName(), "col <= " + predicateValue);
+            testPredicatePushdown(table.getName(), "col >= " + predicateValue);
+
+            // Filter clause with 34 precision decimal value
+            predicateValue = "decimal '3141592653589793238462643383279502'";
+            testPredicatePushdown(table.getName(), "col = " + predicateValue);
+            testPredicatePushdown(table.getName(), "col != " + predicateValue);
+            testPredicatePushdown(table.getName(), "col < " + predicateValue);
+            testPredicatePushdown(table.getName(), "col > " + predicateValue);
+            testPredicatePushdown(table.getName(), "col <= " + predicateValue);
+            testPredicatePushdown(table.getName(), "col >= " + predicateValue);
+        }
+    }
+
+    private void testPredicatePushdown(String tableName, String whereClause)
+    {
+        assertThat(query("SELECT * FROM " + tableName + " WHERE " + whereClause))
+                .isFullyPushedDown();
+    }
+
     @Test
     public void testJson()
     {
@@ -423,6 +557,57 @@ public void testSkipUnknownTypes()
         assertUpdate("DROP TABLE test." + allUnknownFieldTable);
     }
 
+    @Test
+    public void testSkipUnsupportedDecimal128()
+    {
+        String tableName = "test_unsupported_decimal128" + randomNameSuffix();
+
+        Document document = new Document(ImmutableMap.<String, Object>builder()
+                .put("col", 1)
+                .put("nan", Decimal128.NaN)
+                .put("negative_nan", Decimal128.NEGATIVE_NaN)
+                .put("positive_infinity", Decimal128.POSITIVE_INFINITY)
+                .put("negative_infinity", Decimal128.NEGATIVE_INFINITY)
+                .put("negative_zero", Decimal128.NEGATIVE_ZERO)
+                .buildOrThrow());
+        client.getDatabase("test").getCollection(tableName).insertOne(document);
+        assertQuery("SHOW COLUMNS FROM test." + tableName, "SELECT 'col', 'bigint', '', ''");
+        assertQuery("SELECT col FROM test." + tableName, "SELECT 1");
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testNegativeZeroDecimal()
+    {
+        String tableName = "test_negative_zero" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE test." + tableName + "(id int, short_decimal decimal(1), long_decimal decimal(38))");
+        client.getDatabase("test").getCollection(tableName)
+                .insertOne(new Document(ImmutableMap.<String, Object>builder()
+                        .put("id", 1)
+                        .put("short_decimal", Decimal128.NEGATIVE_ZERO)
+                        .put("long_decimal", Decimal128.NEGATIVE_ZERO)
+                        .buildOrThrow()));
+        client.getDatabase("test").getCollection(tableName)
+                .insertOne(new Document(ImmutableMap.<String, Object>builder()
+                        .put("id", 2)
+                        .put("short_decimal", Decimal128.parse("-0.000"))
+                        .put("long_decimal", Decimal128.parse("-0.000"))
+                        .buildOrThrow()));
+
+        assertThat(query("SELECT * FROM test." + tableName))
+                .matches("VALUES (1, CAST('0' AS decimal(1)), CAST('0' AS decimal(38))), (2, CAST('0' AS decimal(1)), CAST('0' AS decimal(38)))");
+
+        assertThat(query("SELECT id FROM test." + tableName + " WHERE short_decimal = decimal '0'"))
+                .matches("VALUES 1, 2");
+
+        assertThat(query("SELECT id FROM test." + tableName + " WHERE long_decimal = decimal '0'"))
+                .matches("VALUES 1, 2");
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
     @Test(dataProvider = "dbRefProvider")
     public void testDBRef(Object objectId, String expectedValue, String expectedType)
     {
@@ -460,6 +645,80 @@ public Object[][] dbRefProvider()
         };
     }
 
+    @Test
+    public void testDbRefFieldOrder()
+    {
+        // DBRef's field order is databaseName, collectionName and id
+        // Create a table with different order and verify the result
+        String tableName = "test_dbref_field_order" + randomNameSuffix();
+        assertUpdate("CREATE TABLE test." + tableName + "(x row(id int, \"collectionName\" varchar, \"databaseName\" varchar))");
+
+        Document document = new Document()
+                .append("x", new DBRef("test_db", "test_collection", 1));
+        client.getDatabase("test").getCollection(tableName).insertOne(document);
+
+        assertThat(query("SELECT * FROM test." + tableName))
+                .matches("SELECT CAST(row(1, 'test_collection', 'test_db') AS row(id int, \"collectionName\" varchar, \"databaseName\" varchar))");
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testDbRefMissingField()
+    {
+        // DBRef has 3 fields (databaseName, collectionName and id)
+        // Create a table without id field and verify the result
+        String tableName = "test_dbref_missing_field" + randomNameSuffix();
+        assertUpdate("CREATE TABLE test." + tableName + "(x row(\"databaseName\" varchar, \"collectionName\" varchar))");
+
+        Document document = new Document()
+                .append("x", new DBRef("test_db", "test_collection", 1));
+        client.getDatabase("test").getCollection(tableName).insertOne(document);
+
+        // TODO Fix MongoPageSource to throw TrinoException
+        assertThatThrownBy(() -> query("SELECT * FROM test." + tableName))
+                .hasMessageContaining("DBRef should have 3 fields : row(databaseName varchar, collectionName varchar)");
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testDbRefWrongFieldName()
+    {
+        // DBRef has 3 fields databaseName, collectionName and id
+        // Create a table with different field names and verify the failure
+        String tableName = "test_dbref_wrong_field_name" + randomNameSuffix();
+        assertUpdate("CREATE TABLE test." + tableName + "(x row(a varchar, b varchar, c int))");
+
+        Document document = new Document()
+                .append("x", new DBRef("test_db", "test_collection", 1));
+        client.getDatabase("test").getCollection(tableName).insertOne(document);
+
+        assertQueryFails("SELECT * FROM test." + tableName, "Unexpected field name for DBRef: a");
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testDbRefWrongFieldType()
+    {
+        // DBRef has 3 fields (varchar databaseName, varchar collectionName and arbitrary type id)
+        // Create a table with different types and verify the result
+        String tableName = "test_dbref_wrong_field_type" + randomNameSuffix();
+        assertUpdate("CREATE TABLE test." + tableName + "(x row(\"databaseName\" int, \"collectionName\" int, id int))");
+
+        Document document = new Document()
+                .append("x", new DBRef("test_db", "test_collection", "test_id"));
+        client.getDatabase("test").getCollection(tableName).insertOne(document);
+
+        // The connector returns NULL when the actual field value is different from the column type
+        // See TODO comment in MongoPageSource
+        assertThat(query("SELECT * FROM test." + tableName))
+                .matches("SELECT CAST(row(NULL, NULL, NULL) AS row(\"databaseName\" int, \"collectionName\" int, id int))");
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
     @Test
     public void testMaps()
     {
@@ -736,9 +995,10 @@ public void testNativeQueryNestedRow()
         collection.insertOne(new Document("row_field", new Document("first", new Document("second", 1))));
         collection.insertOne(new Document("row_field", new Document("first", new Document("second", 2))));
 
-        assertQuery(
-                "SELECT row_field.first.second FROM TABLE(mongodb.system.query(database => 'tpch', collection => '" + tableName + "', filter => '{ \"row_field.first.second\": 1 }'))",
-                "VALUES 1");
+        assertThat(query("SELECT row_field.first.second FROM TABLE(mongodb.system.query(database => 'tpch', collection => '" + tableName + "', filter => '{ \"row_field.first.second\": 1 }'))"))
+                .matches("VALUES BIGINT '1'")
+                .isFullyPushedDown();
+
         assertUpdate("DROP TABLE " + tableName);
     }
 
@@ -791,7 +1051,8 @@ public void testNativeQueryLimit()
     public void testNativeQueryProjection()
     {
         assertThat(query("SELECT name FROM TABLE(mongodb.system.query(database => 'tpch', collection => 'region', filter => '{}'))"))
-                .matches("SELECT name FROM region");
+                .matches("SELECT name FROM region")
+                .isFullyPushedDown();
     }
 
     @Test
@@ -870,6 +1131,594 @@ public void testSystemSchemas()
         assertQueryReturnsEmptyResult("SHOW SCHEMAS IN mongodb LIKE 'local'");
     }
 
+    @Test
+    public void testReadTopLevelDottedField()
+    {
+        String tableName = "test_read_top_level_dotted_field_" + randomNameSuffix();
+
+        Document document = new Document()
+                .append("_id", new ObjectId("5126bbf64aed4daf9e2ab771"))
+                .append("dotted.field", "foo");
+        client.getDatabase("test").getCollection(tableName).insertOne(document);
+
+        assertThat(query("SELECT \"dotted.field\" FROM test." + tableName))
+                .skippingTypesCheck()
+                .matches("SELECT NULL")
+                .isFullyPushedDown();
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testReadMiddleLevelDottedField()
+    {
+        String tableName = "test_read_middle_level_dotted_field_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE test." + tableName + " (root ROW(\"dotted.field\" ROW(leaf VARCHAR)))");
+        assertUpdate("INSERT INTO test." + tableName + " SELECT ROW(ROW('foo'))", 1);
+
+        assertThat(query("SELECT root.\"dotted.field\" FROM test." + tableName))
+                .skippingTypesCheck()
+                .matches("SELECT ROW(varchar 'foo')")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertThat(query("SELECT root.\"dotted.field\".leaf FROM test." + tableName))
+                .matches("SELECT varchar 'foo'")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testReadLeafLevelDottedField()
+    {
+        String tableName = "test_read_leaf_level_dotted_field_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE test." + tableName + " (root ROW(\"dotted.field\" VARCHAR, field VARCHAR))");
+        assertUpdate("INSERT INTO test." + tableName + " SELECT ROW('foo', 'bar')", 1);
+
+        assertThat(query("SELECT root.\"dotted.field\" FROM test." + tableName))
+                .matches("SELECT varchar 'foo'")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertThat(query("SELECT root.\"dotted.field\", root.field FROM test." + tableName))
+                .matches("SELECT varchar 'foo', varchar 'bar'")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testReadWithDollarPrefixedFieldName()
+    {
+        String tableName = "test_read_with_dollar_prefixed_field_name_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE test." + tableName + " (root ROW(\"$field1\" VARCHAR, field2 VARCHAR))");
+        assertUpdate("INSERT INTO test." + tableName + " SELECT ROW('foo', 'bar')", 1);
+
+        assertThat(query("SELECT root.\"$field1\" FROM test." + tableName))
+                .matches("SELECT varchar 'foo'")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertThat(query("SELECT root.\"$field1\", root.field2 FROM test." + tableName))
+                .matches("SELECT varchar 'foo', varchar 'bar'")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testReadWithDollarInsideFieldName()
+    {
+        String tableName = "test_read_with_dollar_inside_field_name_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE test." + tableName + " (root ROW(\"fi$ld1\" VARCHAR, field2 VARCHAR))");
+        assertUpdate("INSERT INTO test." + tableName + " SELECT ROW('foo', 'bar')", 1);
+
+        assertThat(query("SELECT root.\"fi$ld1\" FROM test." + tableName))
+                .matches("SELECT varchar 'foo'")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertThat(query("SELECT root.\"fi$ld1\", root.field2 FROM test." + tableName))
+                .matches("SELECT varchar 'foo', varchar 'bar'")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testReadDottedFieldInsideDollarPrefixedField()
+    {
+        String tableName = "test_read_dotted_field_inside_dollar_prefixed_field_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE test." + tableName + " (root ROW(\"$field\" ROW(\"dotted.field\" VARCHAR)))");
+        assertUpdate("INSERT INTO test." + tableName + " SELECT ROW(ROW('foo'))", 1);
+
+        assertThat(query("SELECT root.\"$field\".\"dotted.field\" FROM test." + tableName))
+                .matches("SELECT varchar 'foo'")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testReadDollarPrefixedFieldInsideDottedField()
+    {
+        String tableName = "test_read_dollar_prefixed_field_inside_dotted_field_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE test." + tableName + " (root ROW(\"dotted.field\" ROW(\"$field\" VARCHAR)))");
+        assertUpdate("INSERT INTO test." + tableName + " SELECT ROW(ROW('foo'))", 1);
+
+        assertThat(query("SELECT root.\"dotted.field\".\"$field\" FROM test." + tableName))
+                .matches("SELECT varchar 'foo'")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testPredicateOnDottedField()
+    {
+        String tableName = "test_predicate_on_dotted_field_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE test." + tableName + " (root ROW(\"dotted.field\" VARCHAR))");
+        assertUpdate("INSERT INTO test." + tableName + " SELECT ROW('foo')", 1);
+
+        assertThat(query("SELECT root.\"dotted.field\" FROM test." + tableName + " WHERE root.\"dotted.field\" = 'foo'"))
+                .matches("SELECT varchar 'foo'")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testPredicateOnDollarPrefixedField()
+    {
+        String tableName = "test_predicate_on_dollar_prefixed_field_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE test." + tableName + " (root ROW(\"$field\" VARCHAR))");
+        assertUpdate("INSERT INTO test." + tableName + " SELECT ROW('foo')", 1);
+
+        assertThat(query("SELECT root.\"$field\" FROM test." + tableName + " WHERE root.\"$field\" = 'foo'"))
+                .matches("SELECT varchar 'foo'")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testProjectionPushdownMixedWithUnsupportedFieldName()
+    {
+        String tableName = "test_projection_pushdown_mixed_with_unsupported_field_name_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE test." + tableName + " (id INT, root1 ROW(field VARCHAR, \"dotted.field\" VARCHAR), root2 ROW(field VARCHAR, \"$field\" VARCHAR))");
+        assertUpdate("INSERT INTO test." + tableName + " SELECT 1, ROW('foo1', 'bar1'), ROW('foo2', 'bar2')", 1);
+
+        assertThat(query("SELECT root1.field, root2.\"$field\" FROM test." + tableName))
+                .matches("SELECT varchar 'foo1', varchar 'bar2'")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertThat(query("SELECT root1.\"dotted.field\", root2.field FROM test." + tableName))
+                .matches("SELECT varchar 'bar1', varchar 'foo2'")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertThat(query("SELECT root1.\"dotted.field\", root2.\"$field\" FROM test." + tableName))
+                .matches("SELECT varchar 'bar1', varchar 'bar2'")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertThat(query("SELECT root1.field, root2.field FROM test." + tableName))
+                .matches("SELECT varchar 'foo1', varchar 'foo2'")
+                .isFullyPushedDown();
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test(dataProvider = "nestedValuesProvider")
+    public void testFiltersOnDereferenceColumnReadsLessData(String expectedValue, String expectedType)
+    {
+        if (!isPushdownSupportedType(getQueryRunner().getTypeManager().fromSqlType(expectedType))) {
+            throw new SkipException("Type doesn't support filter pushdown");
+        }
+
+        Session sessionWithoutPushdown = Session.builder(getSession())
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "projection_pushdown_enabled", "false")
+                .build();
+
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "filter_on_projection_columns",
+                format("(col_0 ROW(col_1 %1$s, col_2 ROW(col_3 %1$s, col_4 ROW(col_5 %1$s))))", expectedType))) {
+            assertUpdate(format("INSERT INTO %s VALUES NULL", table.getName()), 1);
+            assertUpdate(format("INSERT INTO %1$s SELECT ROW(%2$s, ROW(%2$s, ROW(%2$s)))", table.getName(), expectedValue), 1);
+            assertUpdate(format("INSERT INTO %1$s SELECT ROW(%2$s, ROW(NULL, ROW(%2$s)))", table.getName(), expectedValue), 1);
+
+            Set<Object> expected = ImmutableSet.of(1);
+
+            assertQueryStats(
+                    getSession(),
+                    format("SELECT 1 FROM %s WHERE col_0.col_1 = %s", table.getName(), expectedValue),
+                    statsWithPushdown -> {
+                        long processedInputPositionWithPushdown = statsWithPushdown.getProcessedInputPositions();
+                        assertQueryStats(
+                                sessionWithoutPushdown,
+                                format("SELECT 1 FROM %s WHERE col_0.col_1 = %s", table.getName(), expectedValue),
+                                statsWithoutPushdown -> {
+                                    assertEquals(statsWithoutPushdown.getProcessedInputPositions(), 3);
+                                    assertEquals(processedInputPositionWithPushdown, 2);
+                                    assertThat(statsWithoutPushdown.getProcessedInputPositions()).isGreaterThan(processedInputPositionWithPushdown);
+                                },
+                                results -> assertEquals(results.getOnlyColumnAsSet(), expected));
+                    },
+                    results -> assertEquals(results.getOnlyColumnAsSet(), expected));
+
+            assertQueryStats(
+                    getSession(),
+                    format("SELECT 1 FROM %s WHERE col_0.col_2.col_3 = %s", table.getName(), expectedValue),
+                    statsWithPushdown -> {
+                        long processedInputPositionWithPushdown = statsWithPushdown.getProcessedInputPositions();
+                        assertQueryStats(
+                                sessionWithoutPushdown,
+                                format("SELECT 1 FROM %s WHERE col_0.col_2.col_3 = %s", table.getName(), expectedValue),
+                                statsWithoutPushdown -> {
+                                    assertEquals(statsWithoutPushdown.getProcessedInputPositions(), 3);
+                                    assertEquals(processedInputPositionWithPushdown, 1);
+                                    assertThat(statsWithoutPushdown.getProcessedInputPositions()).isGreaterThan(processedInputPositionWithPushdown);
+                                },
+                                results -> assertEquals(results.getOnlyColumnAsSet(), expected));
+                    },
+                    results -> assertEquals(results.getOnlyColumnAsSet(), expected));
+
+            assertQueryStats(
+                    getSession(),
+                    format("SELECT 1 FROM %s WHERE col_0.col_2.col_4.col_5 = %s", table.getName(), expectedValue),
+                    statsWithPushdown -> {
+                        long processedInputPositionWithPushdown = statsWithPushdown.getProcessedInputPositions();
+                        assertQueryStats(
+                                sessionWithoutPushdown,
+                                format("SELECT 1 FROM %s WHERE col_0.col_2.col_4.col_5 = %s", table.getName(), expectedValue),
+                                statsWithoutPushdown -> {
+                                    assertEquals(statsWithoutPushdown.getProcessedInputPositions(), 3);
+                                    assertEquals(processedInputPositionWithPushdown, 2);
+                                    assertThat(statsWithoutPushdown.getProcessedInputPositions()).isGreaterThan(processedInputPositionWithPushdown);
+                                },
+                                results -> assertEquals(results.getOnlyColumnAsSet(), expected));
+                    },
+                    results -> assertEquals(results.getOnlyColumnAsSet(), expected));
+        }
+    }
+
+    @DataProvider
+    public Object[][] nestedValuesProvider()
+    {
+        return new Object[][] {
+                {"varchar 'String type'", "varchar"},
+                {"to_utf8('BinData')", "varbinary"},
+                {"bigint '1234567890'", "bigint"},
+                {"true", "boolean"},
+                {"double '12.3'", "double"},
+                {"timestamp '1970-01-01 00:00:00.000'", "timestamp(3)"},
+                {"array[bigint '1']", "array(bigint)"},
+                {"ObjectId('5126bc054aed4daf9e2ab772')", "ObjectId"},
+        };
+    }
+
+    @Test
+    public void testFiltersOnDereferenceColumnReadsLessDataNativeQuery()
+    {
+        String tableName = "test_filter_on_dereference_column_reads_less_data_native_query_" + randomNameSuffix();
+
+        MongoCollection<Document> collection = client.getDatabase("test").getCollection(tableName);
+        collection.insertOne(new Document("row_field", new Document("first", new Document("second", 1))));
+        collection.insertOne(new Document("row_field", new Document("first", new Document("second", null))));
+        collection.insertOne(new Document("row_field", new Document("first", null)));
+
+        assertQueryStats(
+                getSession(),
+                "SELECT row_field.first.second FROM TABLE(mongodb.system.query(database => 'test', collection => '" + tableName + "', filter => '{ \"row_field.first.second\": 1 }'))",
+                stats -> assertEquals(stats.getProcessedInputPositions(), 1L),
+                results -> assertEquals(results.getOnlyColumnAsSet(), ImmutableSet.of(1L)));
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testFilterPushdownOnFieldInsideJson()
+    {
+        String tableName = "test_filter_pushdown_on_json_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE test." + tableName + " (id INT, col JSON)");
+
+        assertUpdate("INSERT INTO test." + tableName + " VALUES (1, JSON '{\"name\": { \"first\": \"Monika\", \"last\": \"Geller\" }}')", 1);
+        assertUpdate("INSERT INTO test." + tableName + " VALUES (2, JSON '{\"name\": { \"first\": \"Rachel\", \"last\": \"Green\" }}')", 1);
+
+        assertThat(query("SELECT json_extract_scalar(col, '$.name.first') FROM test." + tableName + " WHERE json_extract_scalar(col, '$.name.last') = 'Geller'"))
+                .matches("SELECT varchar 'Monika'")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("SELECT 1 FROM test." + tableName + " WHERE json_extract_scalar(col, '$.name.last') = 'Geller'"))
+                .matches("SELECT 1")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testProjectionPushdownWithDifferentTypeInDocuments()
+    {
+        String tableName = "test_projection_pushdown_with_different_type_in_document_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE test." + tableName + " (col1 ROW(child VARCHAR))");
+
+        MongoCollection<Document> collection = client.getDatabase("test").getCollection(tableName);
+        collection.insertOne(new Document("col1", 100));
+        collection.insertOne(new Document("col1", new Document("child", "value1")));
+
+        assertThat(query("SELECT col1.child FROM test." + tableName))
+                .skippingTypesCheck()
+                .matches("VALUES ('value1'), (NULL)")
+                .isFullyPushedDown();
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test
+    public void testProjectionPushdownWithColumnMissingInDocument()
+    {
+        String tableName = "test_projection_pushdown_with_column_missing_in_document_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE test." + tableName + " (col1 ROW(child VARCHAR))");
+
+        MongoCollection<Document> collection = client.getDatabase("test").getCollection(tableName);
+        collection.insertOne(new Document("col1", new Document("child1", "value1")));
+        collection.insertOne(new Document("col1", new Document("child", "value2")));
+
+        assertThat(query("SELECT col1.child FROM test." + tableName))
+                .skippingTypesCheck()
+                .matches("VALUES ('value2'), (NULL)")
+                .isFullyPushedDown();
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test(dataProvider = "dbRefProvider")
+    public void testProjectionPushdownWithDBRef(Object objectId, String expectedValue, String expectedType)
+    {
+        String tableName = "test_projection_pushdown_with_dbref_" + randomNameSuffix();
+
+        DBRef dbRef = new DBRef("test", "creators", objectId);
+        Document document = new Document()
+                .append("_id", new ObjectId("5126bbf64aed4daf9e2ab771"))
+                .append("col1", "foo")
+                .append("creator", dbRef)
+                .append("parent", new Document("child", objectId));
+
+        client.getDatabase("test").getCollection(tableName).insertOne(document);
+
+        assertThat(query("SELECT parent.child, creator.databaseName, creator.collectionName, creator.id FROM test." + tableName))
+                .matches("SELECT " + expectedValue + ", varchar 'test', varchar 'creators', " + expectedValue)
+                .isNotFullyPushedDown(ProjectNode.class);
+        assertQuery(
+                "SELECT typeof(creator) FROM test." + tableName,
+                "SELECT 'row(databaseName varchar, collectionName varchar, id " + expectedType + ")'");
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test(dataProvider = "dbRefProvider")
+    public void testProjectionPushdownWithNestedDBRef(Object objectId, String expectedValue, String expectedType)
+    {
+        String tableName = "test_projection_pushdown_with_dbref_" + randomNameSuffix();
+
+        DBRef dbRef = new DBRef("test", "creators", objectId);
+        Document document = new Document()
+                .append("_id", new ObjectId("5126bbf64aed4daf9e2ab771"))
+                .append("col1", "foo")
+                .append("parent", new Document()
+                        .append("creator", dbRef)
+                        .append("child", objectId));
+
+        client.getDatabase("test").getCollection(tableName).insertOne(document);
+
+        assertThat(query("SELECT parent.child, parent.creator.databaseName, parent.creator.collectionName, parent.creator.id FROM test." + tableName))
+                .matches("SELECT " + expectedValue + ", varchar 'test', varchar 'creators', " + expectedValue)
+                .isNotFullyPushedDown(ProjectNode.class);
+        assertQuery(
+                "SELECT typeof(parent.creator) FROM test." + tableName,
+                "SELECT 'row(databaseName varchar, collectionName varchar, id " + expectedType + ")'");
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test(dataProvider = "dbRefProvider")
+    public void testProjectionPushdownWithPredefinedDBRefKeyword(Object objectId, String expectedValue, String expectedType)
+    {
+        String tableName = "test_projection_pushdown_with_predefined_dbref_keyword_" + randomNameSuffix();
+
+        DBRef dbRef = new DBRef("test", "creators", objectId);
+        Document document = new Document()
+                .append("_id", new ObjectId("5126bbf64aed4daf9e2ab771"))
+                .append("col1", "foo")
+                .append("parent", new Document("id", dbRef));
+
+        client.getDatabase("test").getCollection(tableName).insertOne(document);
+
+        assertThat(query("SELECT parent.id, parent.id.id FROM test." + tableName))
+                .skippingTypesCheck()
+                .matches("SELECT row('test', 'creators', %1$s), %1$s".formatted(expectedValue))
+                .isNotFullyPushedDown(ProjectNode.class);
+        assertQuery(
+                "SELECT typeof(parent.id), typeof(parent.id.id) FROM test." + tableName,
+                "SELECT 'row(databaseName varchar, collectionName varchar, id %1$s)', '%1$s'".formatted(expectedType));
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test(dataProvider = "dbRefAndDocumentProvider")
+    public void testDBRefLikeDocument(Document document1, Document document2, String expectedValue)
+    {
+        String tableName = "test_dbref_like_document_" + randomNameSuffix();
+
+        client.getDatabase("test").getCollection(tableName).insertOne(document1);
+        client.getDatabase("test").getCollection(tableName).insertOne(document2);
+
+        assertThat(query("SELECT * FROM test." + tableName))
+                .skippingTypesCheck()
+                .matches("VALUES"
+                        + " ROW(ROW(varchar 'dbref_test', varchar 'dbref_creators', " + expectedValue + ")),"
+                        + " ROW(ROW(varchar 'doc_test', varchar 'doc_creators', " + expectedValue + "))")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT creator.id FROM test." + tableName))
+                .skippingTypesCheck()
+                .matches("VALUES (%1$s), (%1$s)".formatted(expectedValue))
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertThat(query("SELECT creator.databasename, creator.collectionname, creator.id FROM test." + tableName))
+                .skippingTypesCheck()
+                .matches("VALUES ('doc_test', 'doc_creators', %1$s), ('dbref_test', 'dbref_creators', %1$s)".formatted(expectedValue))
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @DataProvider
+    public Object[][] dbRefAndDocumentProvider()
+    {
+        Object[][] dbRefObjects = dbRefProvider();
+        Object[][] objects = new Object[dbRefObjects.length * 3][];
+        int i = 0;
+        for (Object[] dbRefObject : dbRefObjects) {
+            Object objectId = dbRefObject[0];
+            Object expectedValue = dbRefObject[1];
+            Document dbRefDocument = new Document()
+                    .append("_id", new ObjectId("5126bbf64aed4daf9e2ab772"))
+                    .append("creator", new DBRef("dbref_test", "dbref_creators", objectId));
+            Document documentWithSameDbRefFieldOrder = new Document()
+                    .append("_id", new ObjectId("5126bbf64aed4daf9e2ab771"))
+                    .append("creator", new Document().append("databaseName", "doc_test").append("collectionName", "doc_creators").append("id", objectId));
+            Document documentWithDifferentDbRefFieldOrder = new Document()
+                    .append("_id", new ObjectId("5126bbf64aed4daf9e2ab771"))
+                    .append("creator", new Document().append("collectionName", "doc_creators").append("id", objectId).append("databaseName", "doc_test"));
+
+            objects[i++] = new Object[] {dbRefDocument, documentWithSameDbRefFieldOrder, expectedValue};
+            objects[i++] = new Object[] {dbRefDocument, documentWithDifferentDbRefFieldOrder, expectedValue};
+            objects[i++] = new Object[] {documentWithSameDbRefFieldOrder, dbRefDocument, expectedValue};
+        }
+        return objects;
+    }
+
+    @Test(dataProvider = "dbRefProvider")
+    public void testDBRefLikeDocument(Object objectId, String expectedValue, String expectedType)
+    {
+        String tableName = "test_dbref_like_document_fails_" + randomNameSuffix();
+
+        Document documentWithDifferentDbRefFieldOrder = new Document()
+                .append("_id", new ObjectId("5126bbf64aed4daf9e2ab771"))
+                .append("creator", new Document()
+                        .append("databaseName", "doc_test")
+                        .append("collectionName", "doc_creators")
+                        .append("id", objectId));
+        Document dbRefDocument = new Document()
+                .append("_id", new ObjectId("5126bbf64aed4daf9e2ab772"))
+                .append("creator", new DBRef("dbref_test", "dbref_creators", objectId));
+        client.getDatabase("test").getCollection(tableName).insertOne(documentWithDifferentDbRefFieldOrder);
+        client.getDatabase("test").getCollection(tableName).insertOne(dbRefDocument);
+
+        assertThat(query("SELECT * FROM test." + tableName))
+                .skippingTypesCheck()
+                .matches("VALUES "
+                        + " row(row('doc_test', 'doc_creators', " + expectedValue + ")),"
+                        + " row(row('dbref_test', 'dbref_creators', " + expectedValue + "))");
+
+        assertThat(query("SELECT creator.id FROM test." + tableName))
+                .skippingTypesCheck()
+                .matches("VALUES " + "(%1$s), (%1$s)".formatted(expectedValue));
+
+        assertThat(query("SELECT creator.databasename, creator.collectionname, creator.id FROM test." + tableName))
+                .skippingTypesCheck()
+                .matches("VALUES " + "('doc_test', 'doc_creators', %1$s), ('dbref_test', 'dbref_creators', %1$s)".formatted(expectedValue));
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test(dataProvider = "dfRefPredicateProvider")
+    public void testPredicateOnDBRefField(Object objectId, String expectedValue)
+    {
+        String tableName = "test_predicate_on_dbref_field_" + randomNameSuffix();
+
+        Document document = new Document()
+                .append("_id", new ObjectId("5126bbf64aed4daf9e2ab771"))
+                .append("creator", new DBRef("test", "creators", objectId));
+
+        client.getDatabase("test").getCollection(tableName).insertOne(document);
+
+        assertThat(query("SELECT * FROM test." + tableName + " WHERE creator.id = " + expectedValue))
+                .skippingTypesCheck()
+                .matches("SELECT ROW(varchar 'test', varchar 'creators', " + expectedValue + ")")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("SELECT creator.id FROM test." + tableName + " WHERE creator.id = " + expectedValue))
+                .skippingTypesCheck()
+                .matches("SELECT " + expectedValue)
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @Test(dataProvider = "dfRefPredicateProvider")
+    public void testPredicateOnDBRefLikeDocument(Object objectId, String expectedValue)
+    {
+        String tableName = "test_predicate_on_dbref_like_document_" + randomNameSuffix();
+
+        Document document = new Document()
+                .append("_id", new ObjectId("5126bbf64aed4daf9e2ab771"))
+                .append("creator", new Document()
+                        .append("databaseName", "test")
+                        .append("collectionName", "creators")
+                        .append("id", objectId));
+
+        client.getDatabase("test").getCollection(tableName).insertOne(document);
+
+        assertThat(query("SELECT * FROM test." + tableName + " WHERE creator.id = " + expectedValue))
+                .skippingTypesCheck()
+                .matches("SELECT ROW(varchar 'test', varchar 'creators', " + expectedValue + ")")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("SELECT creator.id FROM test." + tableName + " WHERE creator.id = " + expectedValue))
+                .skippingTypesCheck()
+                .matches("SELECT " + expectedValue)
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertUpdate("DROP TABLE test." + tableName);
+    }
+
+    @DataProvider
+    public Object[][] dfRefPredicateProvider()
+    {
+        return new Object[][] {
+                {true, "true"},
+                {4, "bigint '4'"},
+                {"test", "'test'"},
+                {new ObjectId("6216f0c6c432d45190f25e7c"), "ObjectId('6216f0c6c432d45190f25e7c')"},
+                {new Date(0), "timestamp '1970-01-01 00:00:00.000'"},
+        };
+    }
+
+    @Override
+    @Test
+    public void testProjectionPushdownReadsLessData()
+    {
+        // TODO https://github.com/trinodb/trino/issues/17713
+        throw new SkipException("MongoDB connector does not calculate physical data input size");
+    }
+
+    @Override
+    @Test
+    public void testProjectionPushdownPhysicalInputSize()
+    {
+        // TODO https://github.com/trinodb/trino/issues/17713
+        throw new SkipException("MongoDB connector does not calculate physical data input size");
+    }
+
     @Override
     protected OptionalInt maxSchemaNameLength()
     {
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoPrivileges.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoPrivileges.java
index 1b18b37f84a6..e7b920c47ab3 100644
--- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoPrivileges.java
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoPrivileges.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.mongodb;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
@@ -21,57 +22,93 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import org.bson.Document;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import java.util.Locale;
+import java.util.List;
 import java.util.Optional;
 
 import static io.airlift.testing.Closeables.closeAllSuppress;
-import static io.trino.plugin.mongodb.AuthenticatedMongoServer.TEST_COLLECTION;
-import static io.trino.plugin.mongodb.AuthenticatedMongoServer.TEST_DATABASE;
-import static io.trino.plugin.mongodb.AuthenticatedMongoServer.createTestRole;
-import static io.trino.plugin.mongodb.AuthenticatedMongoServer.createTestUser;
+import static io.trino.plugin.mongodb.AuthenticatedMongoServer.createRole;
+import static io.trino.plugin.mongodb.AuthenticatedMongoServer.createUser;
+import static io.trino.plugin.mongodb.AuthenticatedMongoServer.privilege;
+import static io.trino.plugin.mongodb.AuthenticatedMongoServer.resource;
+import static io.trino.plugin.mongodb.AuthenticatedMongoServer.role;
+import static io.trino.testing.DataProviders.toDataProvider;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static java.util.Locale.ENGLISH;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestMongoPrivileges
         extends AbstractTestQueryFramework
 {
+    private static final List<String> DATABASES = ImmutableList.of("db", "MixedCaseDB", "UPPERCASEDB");
+    private static final String TEST_COLLECTION = "testCollection";
+
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
         AuthenticatedMongoServer mongoServer = closeAfterClass(setupMongoServer());
-        return createMongoQueryRunner(mongoServer.testUserConnectionString().getConnectionString());
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(testSessionBuilder()
+                        .setCatalog(Optional.empty())
+                        .setSchema(Optional.empty())
+                        .build())
+                .build();
+        try {
+            queryRunner.installPlugin(new MongoPlugin());
+            DATABASES.forEach(database -> {
+                String connectionUrl = mongoServer.testUserConnectionString(database, getUsername(database), getPassword(database)).getConnectionString();
+                queryRunner.createCatalog(getCatalogName(database), "mongodb", ImmutableMap.of(
+                        "mongodb.case-insensitive-name-matching", "true",
+                        "mongodb.connection-url", connectionUrl));
+            });
+            return queryRunner;
+        }
+        catch (Throwable e) {
+            closeAllSuppress(e, queryRunner);
+            throw e;
+        }
     }
 
-    @Test
-    public void testSchemasVisibility()
+    @Test(dataProvider = "databases")
+    public void testSchemasVisibility(String database)
     {
-        assertQuery("SHOW SCHEMAS FROM mongodb", "VALUES 'information_schema','%s'".formatted(TEST_DATABASE));
+        assertQuery("SHOW SCHEMAS FROM " + getCatalogName(database), "VALUES 'information_schema','%s'".formatted(database.toLowerCase(ENGLISH)));
     }
 
-    @Test
-    public void testTablesVisibility()
+    @Test(dataProvider = "databases")
+    public void testTablesVisibility(String database)
     {
-        assertQuery("SHOW TABLES FROM mongodb." + TEST_DATABASE, "VALUES '%s'".formatted(TEST_COLLECTION.toLowerCase(Locale.ENGLISH)));
+        assertQuery("SHOW TABLES FROM %s.%s".formatted(getCatalogName(database), database), "VALUES '%s'".formatted(TEST_COLLECTION.toLowerCase(ENGLISH)));
+    }
+
+    @Test(dataProvider = "databases")
+    public void testSelectFromTable(String database)
+    {
+        assertQuery("SELECT * from %s.%s.%s".formatted(getCatalogName(database), database, TEST_COLLECTION), "VALUES ('abc', 1)");
     }
 
     private static AuthenticatedMongoServer setupMongoServer()
     {
         AuthenticatedMongoServer mongoServer = new AuthenticatedMongoServer("4.2.0");
         try (MongoClient client = MongoClients.create(mongoServer.rootUserConnectionString())) {
-            MongoDatabase testDatabase = client.getDatabase(TEST_DATABASE);
-            runCommand(testDatabase, createTestRole());
-            runCommand(testDatabase, createTestUser());
-            testDatabase.createCollection("_schema");
-            testDatabase.createCollection(TEST_COLLECTION);
-            testDatabase.createCollection("anotherCollection"); // this collection/table should not be visible
+            DATABASES.forEach(database -> createDatabase(client, database));
             client.getDatabase("another").createCollection("_schema"); // this database/schema should not be visible
         }
         return mongoServer;
     }
 
+    private static void createDatabase(MongoClient client, String database)
+    {
+        MongoDatabase testDatabase = client.getDatabase(database);
+        runCommand(testDatabase, createTestRole(database));
+        runCommand(testDatabase, createTestUser(database));
+        testDatabase.createCollection("_schema");
+        testDatabase.getCollection(TEST_COLLECTION).insertOne(new Document(ImmutableMap.of("Name", "abc", "Value", 1)));
+        testDatabase.createCollection("anotherCollection"); // this collection/table should not be visible
+    }
+
     private static void runCommand(MongoDatabase database, Document document)
     {
         Double commandStatus = database.runCommand(document)
@@ -79,25 +116,51 @@ private static void runCommand(MongoDatabase database, Document document)
         assertThat(commandStatus).isEqualTo(1.0);
     }
 
-    private static DistributedQueryRunner createMongoQueryRunner(String connectionUrl)
-            throws Exception
+    private static Document createTestRole(String database)
     {
-        DistributedQueryRunner queryRunner = null;
-        try {
-            queryRunner = DistributedQueryRunner.builder(testSessionBuilder()
-                            .setCatalog(Optional.empty())
-                            .setSchema(Optional.empty())
-                            .build())
-                    .build();
-            queryRunner.installPlugin(new MongoPlugin());
-            queryRunner.createCatalog("mongodb", "mongodb", ImmutableMap.of(
-                    "mongodb.case-insensitive-name-matching", "true",
-                    "mongodb.connection-url", connectionUrl));
-            return queryRunner;
-        }
-        catch (Throwable e) {
-            closeAllSuppress(e, queryRunner);
-            throw e;
-        }
+        return createRole(
+                getRoleName(database),
+                ImmutableList.of(
+                        privilege(
+                                resource(database, "_schema"),
+                                ImmutableList.of("find", "listIndexes", "createIndex", "insert")),
+                        privilege(
+                                resource(database, TEST_COLLECTION),
+                                ImmutableList.of("find", "listIndexes"))),
+                ImmutableList.of());
+    }
+
+    private static String getCatalogName(String database)
+    {
+        return "mongodb_" + database.toLowerCase(ENGLISH);
+    }
+
+    private static Document createTestUser(String database)
+    {
+        return createUser(
+                getUsername(database),
+                getPassword(database),
+                ImmutableList.of(role(database, getRoleName(database))));
+    }
+
+    private static String getRoleName(String database)
+    {
+        return database + "testRole";
+    }
+
+    private static String getUsername(String database)
+    {
+        return database + "testUser";
+    }
+
+    private static String getPassword(String database)
+    {
+        return database + "pass";
+    }
+
+    @DataProvider
+    public static Object[][] databases()
+    {
+        return DATABASES.stream().collect(toDataProvider());
     }
 }
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoProjectionPushdownPlans.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoProjectionPushdownPlans.java
new file mode 100644
index 000000000000..dc85d8249468
--- /dev/null
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoProjectionPushdownPlans.java
@@ -0,0 +1,302 @@
+/*
+ * Licensed 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 io.trino.plugin.mongodb;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.io.Closer;
+import com.mongodb.client.MongoClient;
+import io.trino.Session;
+import io.trino.metadata.QualifiedObjectName;
+import io.trino.metadata.TableHandle;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.predicate.Domain;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.Type;
+import io.trino.sql.planner.assertions.BasePushdownPlanTest;
+import io.trino.sql.planner.assertions.PlanMatchPattern;
+import io.trino.testing.LocalQueryRunner;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.google.common.base.Predicates.equalTo;
+import static io.airlift.testing.Closeables.closeAllSuppress;
+import static io.trino.plugin.mongodb.MongoQueryRunner.createMongoClient;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.any;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.expression;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.filter;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.project;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
+import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestMongoProjectionPushdownPlans
+        extends BasePushdownPlanTest
+{
+    private static final String CATALOG = "mongodb";
+    private static final String SCHEMA = "test";
+
+    private Closer closer;
+
+    @Override
+    protected LocalQueryRunner createLocalQueryRunner()
+    {
+        Session session = testSessionBuilder()
+                .setCatalog(CATALOG)
+                .setSchema(SCHEMA)
+                .build();
+
+        LocalQueryRunner queryRunner = LocalQueryRunner.create(session);
+
+        closer = Closer.create();
+        MongoServer server = closer.register(new MongoServer());
+        MongoClient client = closer.register(createMongoClient(server));
+
+        try {
+            queryRunner.installPlugin(new MongoPlugin());
+            queryRunner.createCatalog(
+                    CATALOG,
+                    "mongodb",
+                    ImmutableMap.of("mongodb.connection-url", server.getConnectionString().toString()));
+            // Put an dummy schema collection because MongoDB doesn't support a database without collections
+            client.getDatabase(SCHEMA).createCollection("dummy");
+        }
+        catch (Throwable e) {
+            closeAllSuppress(e, queryRunner);
+            throw e;
+        }
+        return queryRunner;
+    }
+
+    @AfterClass(alwaysRun = true)
+    public final void destroy()
+            throws Exception
+    {
+        closer.close();
+        closer = null;
+    }
+
+    @Test
+    public void testPushdownDisabled()
+    {
+        String tableName = "test_pushdown_disabled_" + randomNameSuffix();
+
+        Session session = Session.builder(getQueryRunner().getDefaultSession())
+                .setCatalogSessionProperty(CATALOG, "projection_pushdown_enabled", "false")
+                .build();
+
+        getQueryRunner().execute("CREATE TABLE " + tableName + " (col0) AS SELECT CAST(row(5, 6) AS row(a bigint, b bigint)) AS col0 WHERE false");
+
+        assertPlan(
+                "SELECT col0.a expr_a, col0.b expr_b FROM " + tableName,
+                session,
+                any(
+                        project(
+                                ImmutableMap.of("expr_1", expression("col0[1]"), "expr_2", expression("col0[2]")),
+                                tableScan(tableName, ImmutableMap.of("col0", "col0")))));
+    }
+
+    @Test
+    public void testDereferencePushdown()
+    {
+        String tableName = "test_simple_projection_pushdown" + randomNameSuffix();
+        QualifiedObjectName completeTableName = new QualifiedObjectName(CATALOG, SCHEMA, tableName);
+
+        getQueryRunner().execute("CREATE TABLE " + tableName + " (col0, col1)" +
+                " AS SELECT CAST(row(5, 6) AS row(x BIGINT, y BIGINT)) AS col0, BIGINT '5' AS col1");
+
+        Session session = getQueryRunner().getDefaultSession();
+
+        Optional<TableHandle> tableHandle = getTableHandle(session, completeTableName);
+        assertThat(tableHandle).as("expected the table handle to be present").isPresent();
+
+        MongoTableHandle mongoTableHandle = (MongoTableHandle) tableHandle.get().getConnectorHandle();
+        Map<String, ColumnHandle> columns = getColumnHandles(session, completeTableName);
+
+        MongoColumnHandle column0Handle = (MongoColumnHandle) columns.get("col0");
+        MongoColumnHandle column1Handle = (MongoColumnHandle) columns.get("col1");
+
+        MongoColumnHandle columnX = createProjectedColumnHandle(column0Handle, ImmutableList.of("x"), BIGINT);
+        MongoColumnHandle columnY = createProjectedColumnHandle(column0Handle, ImmutableList.of("y"), BIGINT);
+
+        // Simple Projection pushdown
+        assertPlan(
+                "SELECT col0.x expr_x, col0.y expr_y FROM " + tableName,
+                any(
+                        tableScan(
+                                equalTo(mongoTableHandle.withProjectedColumns(Set.of(columnX, columnY))),
+                                TupleDomain.all(),
+                                ImmutableMap.of("col0.x", equalTo(columnX), "col0.y", equalTo(columnY)))));
+
+        // Projection and predicate pushdown
+        assertPlan(
+                "SELECT col0.x FROM " + tableName + " WHERE col0.x = col1 + 3 and col0.y = 2",
+                anyTree(
+                        filter(
+                                "x = col1 + BIGINT '3'",
+                                tableScan(
+                                        table -> {
+                                            MongoTableHandle actualTableHandle = (MongoTableHandle) table;
+                                            TupleDomain<ColumnHandle> constraint = actualTableHandle.getConstraint();
+                                            return actualTableHandle.getProjectedColumns().equals(ImmutableSet.of(column1Handle, columnX))
+                                                    && constraint.equals(TupleDomain.withColumnDomains(ImmutableMap.of(columnY, Domain.singleValue(BIGINT, 2L))));
+                                        },
+                                        TupleDomain.all(),
+                                        ImmutableMap.of("col1", equalTo(column1Handle), "x", equalTo(columnX))))));
+
+        // Projection and predicate pushdown with overlapping columns
+        assertPlan(
+                "SELECT col0, col0.y expr_y FROM " + tableName + " WHERE col0.x = 5",
+                anyTree(
+                        tableScan(
+                                table -> {
+                                    MongoTableHandle actualTableHandle = (MongoTableHandle) table;
+                                    TupleDomain<ColumnHandle> constraint = actualTableHandle.getConstraint();
+                                    return actualTableHandle.getProjectedColumns().equals(ImmutableSet.of(column0Handle, columnY))
+                                            && constraint.equals(TupleDomain.withColumnDomains(ImmutableMap.of(columnX, Domain.singleValue(BIGINT, 5L))));
+                                },
+                                TupleDomain.all(),
+                                ImmutableMap.of("col0", equalTo(column0Handle), "y", equalTo(columnY)))));
+
+        // Projection and predicate pushdown with joins
+        assertPlan(
+                "SELECT T.col0.x, T.col0, T.col0.y FROM " + tableName + " T join " + tableName + " S on T.col1 = S.col1 WHERE T.col0.x = 2",
+                anyTree(
+                        project(
+                                ImmutableMap.of(
+                                        "expr_0_x", expression("expr_0[1]"),
+                                        "expr_0", expression("expr_0"),
+                                        "expr_0_y", expression("expr_0[2]")),
+                                PlanMatchPattern.join(INNER, builder -> builder
+                                        .equiCriteria("t_expr_1", "s_expr_1")
+                                        .left(
+                                                anyTree(
+                                                        tableScan(
+                                                                table -> {
+                                                                    MongoTableHandle actualTableHandle = (MongoTableHandle) table;
+                                                                    TupleDomain<ColumnHandle> constraint = actualTableHandle.getConstraint();
+                                                                    Set<MongoColumnHandle> expectedProjections = ImmutableSet.of(column0Handle, column1Handle);
+                                                                    TupleDomain<MongoColumnHandle> expectedConstraint = TupleDomain.withColumnDomains(
+                                                                            ImmutableMap.of(columnX, Domain.singleValue(BIGINT, 2L)));
+                                                                    return actualTableHandle.getProjectedColumns().equals(expectedProjections)
+                                                                            && constraint.equals(expectedConstraint);
+                                                                },
+                                                                TupleDomain.all(),
+                                                                ImmutableMap.of("expr_0", equalTo(column0Handle), "t_expr_1", equalTo(column1Handle)))))
+                                        .right(
+                                                anyTree(
+                                                        tableScan(
+                                                                equalTo(mongoTableHandle.withProjectedColumns(Set.of(column1Handle))),
+                                                                TupleDomain.all(),
+                                                                ImmutableMap.of("s_expr_1", equalTo(column1Handle)))))))));
+    }
+
+    @Test
+    public void testDereferencePushdownWithDotAndDollarContainingField()
+    {
+        String tableName = "test_dereference_pushdown_with_dot_and_dollar_containing_field_" + randomNameSuffix();
+        QualifiedObjectName completeTableName = new QualifiedObjectName(CATALOG, SCHEMA, tableName);
+
+        getQueryRunner().execute(
+                "CREATE TABLE " + tableName + " (id, root1) AS" +
+                        " SELECT BIGINT '1', CAST(ROW(11, ROW(111, ROW(1111, varchar 'foo', varchar 'bar'))) AS" +
+                        " ROW(id BIGINT, root2 ROW(id BIGINT, root3 ROW(id BIGINT, \"dotted.field\" VARCHAR, \"$name\" VARCHAR))))");
+
+        Session session = getQueryRunner().getDefaultSession();
+
+        Optional<TableHandle> tableHandle = getTableHandle(session, completeTableName);
+        assertThat(tableHandle).as("expected the table handle to be present").isPresent();
+
+        MongoTableHandle mongoTableHandle = (MongoTableHandle) tableHandle.get().getConnectorHandle();
+        Map<String, ColumnHandle> columns = getColumnHandles(session, completeTableName);
+
+        RowType rowType = RowType.rowType(
+                RowType.field("id", BIGINT),
+                RowType.field("dotted.field", VARCHAR),
+                RowType.field("$name", VARCHAR));
+
+        MongoColumnHandle columnRoot1 = (MongoColumnHandle) columns.get("root1");
+        MongoColumnHandle columnRoot3 = createProjectedColumnHandle(columnRoot1, ImmutableList.of("root2", "root3"), rowType);
+
+        //  Dotted field will not get pushdown, But it's parent filed 'root1.root2.root3' will get pushdown
+        assertPlan(
+                "SELECT root1.root2.root3.\"dotted.field\" FROM " + tableName,
+                anyTree(
+                        tableScan(
+                                equalTo(mongoTableHandle.withProjectedColumns(Set.of(columnRoot3))),
+                                TupleDomain.all(),
+                                ImmutableMap.of("root1.root2.root3", equalTo(columnRoot3)))));
+
+        //  Dollar containing field will not get pushdown, But it's parent filed 'root1.root2.root3' will get pushdown
+        assertPlan(
+                "SELECT root1.root2.root3.\"$name\" FROM " + tableName,
+                anyTree(
+                        tableScan(
+                                equalTo(mongoTableHandle.withProjectedColumns(Set.of(columnRoot3))),
+                                TupleDomain.all(),
+                                ImmutableMap.of("root1.root2.root3", equalTo(columnRoot3)))));
+
+        assertPlan(
+                "SELECT 1 FROM " + tableName + " WHERE root1.root2.root3.\"dotted.field\" = 'foo'",
+                anyTree(
+                        tableScan(
+                                table -> {
+                                    MongoTableHandle actualTableHandle = (MongoTableHandle) table;
+                                    TupleDomain<ColumnHandle> constraint = actualTableHandle.getConstraint();
+                                    return actualTableHandle.getProjectedColumns().equals(ImmutableSet.of(columnRoot3))
+                                            && constraint.equals(TupleDomain.all()); // Predicate will not get pushdown for dollar containing field
+                                },
+                                TupleDomain.all(),
+                                ImmutableMap.of("root1.root2.root3", equalTo(columnRoot3)))));
+
+        assertPlan(
+                "SELECT 1 FROM " + tableName + " WHERE root1.root2.root3.\"$name\" = 'bar'",
+                anyTree(
+                        tableScan(
+                                table -> {
+                                    MongoTableHandle actualTableHandle = (MongoTableHandle) table;
+                                    TupleDomain<ColumnHandle> constraint = actualTableHandle.getConstraint();
+                                    return actualTableHandle.getProjectedColumns().equals(ImmutableSet.of(columnRoot3))
+                                            && constraint.equals(TupleDomain.all()); // Predicate will not get pushdown for dollar containing field
+                                },
+                                TupleDomain.all(),
+                                ImmutableMap.of("root1.root2.root3", equalTo(columnRoot3)))));
+    }
+
+    private MongoColumnHandle createProjectedColumnHandle(
+            MongoColumnHandle baseColumnHandle,
+            List<String> dereferenceNames,
+            Type type)
+    {
+        return new MongoColumnHandle(
+                baseColumnHandle.getBaseName(),
+                dereferenceNames,
+                type,
+                baseColumnHandle.isHidden(),
+                baseColumnHandle.isDbRefField(),
+                baseColumnHandle.getComment());
+    }
+}
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoSession.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoSession.java
index 6d86fd9ac773..bfc497d769a7 100644
--- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoSession.java
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoSession.java
@@ -19,12 +19,15 @@
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.predicate.ValueSet;
+import io.trino.spi.type.Type;
 import org.bson.Document;
 import org.testng.annotations.Test;
 
+import java.util.List;
 import java.util.Optional;
 
 import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.plugin.mongodb.MongoSession.projectSufficientColumns;
 import static io.trino.spi.predicate.Range.equal;
 import static io.trino.spi.predicate.Range.greaterThan;
 import static io.trino.spi.predicate.Range.greaterThanOrEqual;
@@ -34,14 +37,45 @@
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 public class TestMongoSession
 {
-    private static final MongoColumnHandle COL1 = new MongoColumnHandle("col1", BIGINT, false, Optional.empty());
-    private static final MongoColumnHandle COL2 = new MongoColumnHandle("col2", createUnboundedVarcharType(), false, Optional.empty());
-    private static final MongoColumnHandle COL3 = new MongoColumnHandle("col3", createUnboundedVarcharType(), false, Optional.empty());
-    private static final MongoColumnHandle COL4 = new MongoColumnHandle("col4", BOOLEAN, false, Optional.empty());
+    private static final MongoColumnHandle COL1 = createColumnHandle("col1", BIGINT);
+    private static final MongoColumnHandle COL2 = createColumnHandle("col2", createUnboundedVarcharType());
+    private static final MongoColumnHandle COL3 = createColumnHandle("col3", createUnboundedVarcharType());
+    private static final MongoColumnHandle COL4 = createColumnHandle("col4", BOOLEAN);
+    private static final MongoColumnHandle COL5 = createColumnHandle("col5", BIGINT);
+    private static final MongoColumnHandle COL6 = createColumnHandle("grandparent", createUnboundedVarcharType(), "parent", "col6");
+
+    private static final MongoColumnHandle ID_COL = new MongoColumnHandle("_id", ImmutableList.of(), ObjectIdType.OBJECT_ID, false, false, Optional.empty());
+
+    @Test
+    public void testBuildProjectionWithoutId()
+    {
+        List<MongoColumnHandle> columns = ImmutableList.of(COL1, COL2);
+
+        Document output = MongoSession.buildProjection(columns);
+        Document expected = new Document()
+                .append(COL1.getBaseName(), 1)
+                .append(COL2.getBaseName(), 1)
+                .append(ID_COL.getBaseName(), 0);
+        assertEquals(output, expected);
+    }
+
+    @Test
+    public void testBuildProjectionWithId()
+    {
+        List<MongoColumnHandle> columns = ImmutableList.of(COL1, COL2, ID_COL);
+
+        Document output = MongoSession.buildProjection(columns);
+        Document expected = new Document()
+                .append(COL1.getBaseName(), 1)
+                .append(COL2.getBaseName(), 1)
+                .append(ID_COL.getBaseName(), 1);
+        assertEquals(output, expected);
+    }
 
     @Test
     public void testBuildQuery()
@@ -52,8 +86,9 @@ public void testBuildQuery()
 
         Document query = MongoSession.buildQuery(tupleDomain);
         Document expected = new Document()
-                .append(COL1.getName(), new Document().append("$gt", 100L).append("$lte", 200L))
-                .append(COL2.getName(), new Document("$eq", "a value"));
+                .append("$and", ImmutableList.of(
+                        new Document(COL1.getBaseName(), new Document().append("$gt", 100L).append("$lte", 200L)),
+                        new Document(COL2.getBaseName(), new Document("$eq", "a value"))));
         assertEquals(query, expected);
     }
 
@@ -66,8 +101,9 @@ public void testBuildQueryStringType()
 
         Document query = MongoSession.buildQuery(tupleDomain);
         Document expected = new Document()
-                .append(COL3.getName(), new Document().append("$gt", "hello").append("$lte", "world"))
-                .append(COL2.getName(), new Document("$gte", "a value"));
+                .append("$and", ImmutableList.of(
+                        new Document(COL3.getBaseName(), new Document().append("$gt", "hello").append("$lte", "world")),
+                        new Document(COL2.getBaseName(), new Document("$gte", "a value"))));
         assertEquals(query, expected);
     }
 
@@ -78,7 +114,7 @@ public void testBuildQueryIn()
                 COL2, Domain.create(ValueSet.ofRanges(equal(createUnboundedVarcharType(), utf8Slice("hello")), equal(createUnboundedVarcharType(), utf8Slice("world"))), false)));
 
         Document query = MongoSession.buildQuery(tupleDomain);
-        Document expected = new Document(COL2.getName(), new Document("$in", ImmutableList.of("hello", "world")));
+        Document expected = new Document(COL2.getBaseName(), new Document("$in", ImmutableList.of("hello", "world")));
         assertEquals(query, expected);
     }
 
@@ -90,8 +126,8 @@ public void testBuildQueryOr()
 
         Document query = MongoSession.buildQuery(tupleDomain);
         Document expected = new Document("$or", asList(
-                new Document(COL1.getName(), new Document("$lt", 100L)),
-                new Document(COL1.getName(), new Document("$gt", 200L))));
+                new Document(COL1.getBaseName(), new Document("$lt", 100L)),
+                new Document(COL1.getBaseName(), new Document("$gt", 200L))));
         assertEquals(query, expected);
     }
 
@@ -103,8 +139,8 @@ public void testBuildQueryNull()
 
         Document query = MongoSession.buildQuery(tupleDomain);
         Document expected = new Document("$or", asList(
-                new Document(COL1.getName(), new Document("$gt", 200L)),
-                new Document(COL1.getName(), new Document("$eq", null))));
+                new Document(COL1.getBaseName(), new Document("$gt", 200L)),
+                new Document(COL1.getBaseName(), new Document("$eq", null))));
         assertEquals(query, expected);
     }
 
@@ -114,7 +150,95 @@ public void testBooleanPredicatePushdown()
         TupleDomain<ColumnHandle> tupleDomain = TupleDomain.withColumnDomains(ImmutableMap.of(COL4, Domain.singleValue(BOOLEAN, true)));
 
         Document query = MongoSession.buildQuery(tupleDomain);
-        Document expected = new Document().append(COL4.getName(), new Document("$eq", true));
+        Document expected = new Document().append(COL4.getBaseName(), new Document("$eq", true));
         assertEquals(query, expected);
     }
+
+    @Test
+    public void testBuildQueryNestedField()
+    {
+        TupleDomain<ColumnHandle> tupleDomain = TupleDomain.withColumnDomains(ImmutableMap.of(
+                COL5, Domain.create(ValueSet.ofRanges(greaterThan(BIGINT, 200L)), true),
+                COL6, Domain.singleValue(createUnboundedVarcharType(), utf8Slice("a value"))));
+
+        Document query = MongoSession.buildQuery(tupleDomain);
+        Document expected = new Document()
+                .append("$and", ImmutableList.of(
+                        new Document("$or", asList(
+                                new Document(COL5.getQualifiedName(), new Document("$gt", 200L)),
+                                new Document(COL5.getQualifiedName(), new Document("$eq", null)))),
+                        new Document(COL6.getQualifiedName(), new Document("$eq", "a value"))));
+        assertEquals(query, expected);
+    }
+
+    @Test
+    public void testProjectSufficientColumns()
+    {
+        MongoColumnHandle col1 = createColumnHandle("x", BIGINT, "a", "b");
+        MongoColumnHandle col2 = createColumnHandle("x", BIGINT, "b");
+        MongoColumnHandle col3 = createColumnHandle("x", BIGINT, "c");
+        MongoColumnHandle col4 = createColumnHandle("x", BIGINT);
+
+        List<MongoColumnHandle> output = projectSufficientColumns(ImmutableList
+                .of(col1, col2, col4));
+        assertThat(output)
+                .containsExactly(col4)
+                .hasSize(1);
+
+        output = projectSufficientColumns(ImmutableList.of(col4, col2, col1));
+        assertThat(output)
+                .containsExactly(col4)
+                .hasSize(1);
+
+        output = projectSufficientColumns(ImmutableList.of(col2, col1, col4));
+        assertThat(output)
+                .containsExactly(col4)
+                .hasSize(1);
+
+        output = projectSufficientColumns(ImmutableList.of(col2, col3));
+        assertThat(output)
+                .containsExactly(col2, col3)
+                .hasSize(2);
+
+        MongoColumnHandle col5 = createColumnHandle("x", BIGINT, "a", "b", "c");
+        MongoColumnHandle col6 = createColumnHandle("x", BIGINT, "a", "c", "b");
+        MongoColumnHandle col7 = createColumnHandle("x", BIGINT, "c", "a", "b");
+        MongoColumnHandle col8 = createColumnHandle("x", BIGINT, "b", "a");
+        MongoColumnHandle col9 = createColumnHandle("x", BIGINT);
+
+        output = projectSufficientColumns(ImmutableList
+                .of(col5, col6));
+        assertThat(output)
+                .containsExactly(col5, col6)
+                .hasSize(2);
+
+        output = projectSufficientColumns(ImmutableList
+                .of(col6, col7));
+        assertThat(output)
+                .containsExactly(col6, col7)
+                .hasSize(2);
+
+        output = projectSufficientColumns(ImmutableList
+                .of(col5, col8));
+        assertThat(output)
+                .containsExactly(col8, col5)
+                .hasSize(2);
+
+        output = projectSufficientColumns(ImmutableList
+                .of(col5, col6, col7, col8, col9));
+        assertThat(output)
+                .containsExactly(col9)
+                .hasSize(1);
+    }
+
+    private static MongoColumnHandle createColumnHandle(String baseName, Type type, String... dereferenceNames)
+    {
+        return new MongoColumnHandle(
+                baseName,
+                ImmutableList.copyOf(dereferenceNames),
+                type,
+                false,
+                false,
+                Optional.empty());
+    }
 }
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoSslConfig.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoSslConfig.java
new file mode 100644
index 000000000000..314c93f4c77a
--- /dev/null
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoSslConfig.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed 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 io.trino.plugin.mongodb;
+
+import com.google.common.collect.ImmutableMap;
+import org.testng.annotations.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+
+public class TestMongoSslConfig
+{
+    @Test
+    public void testDefaults()
+    {
+        assertRecordedDefaults(recordDefaults(MongoSslConfig.class)
+                .setKeystorePath(null)
+                .setKeystorePassword(null)
+                .setTruststorePath(null)
+                .setTruststorePassword(null));
+    }
+
+    @Test
+    public void testExplicitPropertyMappings()
+            throws Exception
+    {
+        Path keystoreFile = Files.createTempFile(null, null);
+        Path truststoreFile = Files.createTempFile(null, null);
+
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("mongodb.tls.keystore-path", keystoreFile.toString())
+                .put("mongodb.tls.keystore-password", "keystore-password")
+                .put("mongodb.tls.truststore-path", truststoreFile.toString())
+                .put("mongodb.tls.truststore-password", "truststore-password")
+                .buildOrThrow();
+
+        MongoSslConfig expected = new MongoSslConfig()
+                .setKeystorePath(keystoreFile.toFile())
+                .setKeystorePassword("keystore-password")
+                .setTruststorePath(truststoreFile.toFile())
+                .setTruststorePassword("truststore-password");
+        assertFullMapping(properties, expected);
+    }
+}
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoTableHandle.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoTableHandle.java
index 60042f6042c5..0e124e227f23 100644
--- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoTableHandle.java
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoTableHandle.java
@@ -13,17 +13,40 @@
  */
 package io.trino.plugin.mongodb;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import io.airlift.json.JsonCodec;
+import io.airlift.json.JsonCodecFactory;
+import io.airlift.json.ObjectMapperProvider;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.type.RowType;
+import io.trino.spi.type.Type;
+import io.trino.type.TypeDeserializer;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.Set;
 
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static org.testng.Assert.assertEquals;
 
 public class TestMongoTableHandle
 {
-    private final JsonCodec<MongoTableHandle> codec = JsonCodec.jsonCodec(MongoTableHandle.class);
+    private JsonCodec<MongoTableHandle> codec;
+
+    @BeforeClass
+    public void init()
+    {
+        ObjectMapperProvider objectMapperProvider = new ObjectMapperProvider();
+        objectMapperProvider.setJsonDeserializers(ImmutableMap.of(Type.class, new TypeDeserializer(TESTING_TYPE_MANAGER)));
+        codec = new JsonCodecFactory(objectMapperProvider).jsonCodec(MongoTableHandle.class);
+    }
 
     @Test
     public void testRoundTripWithoutQuery()
@@ -76,4 +99,35 @@ public void testRoundTripWithQueryHavingHelperFunction()
 
         assertEquals(actual.getSchemaTableName(), expected.getSchemaTableName());
     }
+
+    @Test
+    public void testRoundTripWithProjectedColumns()
+    {
+        SchemaTableName schemaTableName = new SchemaTableName("schema", "table");
+        RemoteTableName remoteTableName = new RemoteTableName("Schema", "Table");
+        Set<MongoColumnHandle> projectedColumns = ImmutableSet.of(
+                new MongoColumnHandle("id", ImmutableList.of(), INTEGER, false, false, Optional.empty()),
+                new MongoColumnHandle("address", ImmutableList.of("street"), VARCHAR, false, false, Optional.empty()),
+                new MongoColumnHandle(
+                        "user",
+                        ImmutableList.of(),
+                        RowType.from(ImmutableList.of(new RowType.Field(Optional.of("first"), VARCHAR), new RowType.Field(Optional.of("last"), VARCHAR))),
+                        false,
+                        false,
+                        Optional.empty()),
+                new MongoColumnHandle("creator", ImmutableList.of("databasename"), VARCHAR, false, true, Optional.empty()));
+
+        MongoTableHandle expected = new MongoTableHandle(
+                schemaTableName,
+                remoteTableName,
+                Optional.empty(),
+                TupleDomain.all(),
+                projectedColumns,
+                OptionalInt.empty());
+
+        String json = codec.toJson(expected);
+        MongoTableHandle actual = codec.fromJson(json);
+
+        assertEquals(actual, expected);
+    }
 }
diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoTypeMapping.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoTypeMapping.java
index c557dc3dcee0..5cbe1a3d893b 100644
--- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoTypeMapping.java
+++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoTypeMapping.java
@@ -185,6 +185,16 @@ public void testDecimal()
                 .addRoundTrip("decimal(38, 0)", "CAST(NULL AS decimal(38, 0))", createDecimalType(38, 0), "CAST(NULL AS decimal(38, 0))")
                 .execute(getQueryRunner(), trinoCreateAsSelect("test_decimal"))
                 .execute(getQueryRunner(), trinoCreateAndInsert("test_decimal"));
+
+        SqlDataTypeTest.create()
+                .addRoundTrip("NumberDecimal(\"2\")", "CAST('2' AS decimal(1, 0))")
+                .addRoundTrip("NumberDecimal(\"2.3\")", "CAST('2.3' AS decimal(2, 1))")
+                .addRoundTrip("NumberDecimal(\"-2.3\")", "CAST('-2.3' AS decimal(2, 1))")
+                .addRoundTrip("NumberDecimal(\"0.03\")", "CAST('0.03' AS decimal(2, 2))")
+                .addRoundTrip("NumberDecimal(\"-0.03\")", "CAST('-0.03' AS decimal(2, 2))")
+                .addRoundTrip("NumberDecimal(\"1234567890123456789012345678901234\")", "CAST('1234567890123456789012345678901234' AS decimal(34, 0))") // 34 is the max precision in Decimal128
+                .addRoundTrip("NumberDecimal(\"1234567890123456.789012345678901234\")", "CAST('1234567890123456.789012345678901234' AS decimal(34, 18))")
+                .execute(getQueryRunner(), mongoCreateAndInsert(getSession(), "tpch", "test_decimal"));
     }
 
     @Test
diff --git a/plugin/trino-mysql-event-listener/pom.xml b/plugin/trino-mysql-event-listener/pom.xml
index dde0ec2c1a50..396fd22384cf 100644
--- a/plugin/trino-mysql-event-listener/pom.xml
+++ b/plugin/trino-mysql-event-listener/pom.xml
@@ -5,19 +5,29 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-mysql-event-listener</artifactId>
-    <description>Trino - Mysql Event Listener</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Mysql Event Listener</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>bootstrap</artifactId>
@@ -39,47 +49,49 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>org.jdbi</groupId>
+            <artifactId>jdbi3-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>org.jdbi</groupId>
+            <artifactId>jdbi3-sqlobject</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.jdbi</groupId>
-            <artifactId>jdbi3-core</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.jdbi</groupId>
-            <artifactId>jdbi3-sqlobject</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-spi</artifactId>
@@ -87,33 +99,38 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>mysql</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mysql</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/MysqlEventListener.java b/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/MysqlEventListener.java
index bb21ce07c97c..0fff350fcac1 100644
--- a/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/MysqlEventListener.java
+++ b/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/MysqlEventListener.java
@@ -32,8 +32,7 @@
 import io.trino.spi.eventlistener.SplitCompletedEvent;
 import io.trino.spi.resourcegroups.QueryType;
 import io.trino.spi.resourcegroups.ResourceGroupId;
-
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import java.time.Duration;
 import java.util.List;
@@ -137,6 +136,7 @@ public void queryCompleted(QueryCompletedEvent event)
                 stats.getResourceWaitingTime().map(Duration::toMillis).orElse(0L),
                 stats.getAnalysisTime().map(Duration::toMillis).orElse(0L),
                 stats.getPlanningTime().map(Duration::toMillis).orElse(0L),
+                stats.getPlanningCpuTime().map(Duration::toMillis).orElse(0L),
                 stats.getExecutionTime().map(Duration::toMillis).orElse(0L),
                 stats.getInputBlockedTime().map(Duration::toMillis).orElse(0L),
                 stats.getFailedInputBlockedTime().map(Duration::toMillis).orElse(0L),
diff --git a/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/MysqlEventListenerConfig.java b/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/MysqlEventListenerConfig.java
index 960e71a96511..0173fd833d8f 100644
--- a/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/MysqlEventListenerConfig.java
+++ b/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/MysqlEventListenerConfig.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.eventlistener.mysql;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class MysqlEventListenerConfig
 {
diff --git a/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/MysqlEventListenerFactory.java b/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/MysqlEventListenerFactory.java
index 6931250d2f6d..89da9e1f04d5 100644
--- a/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/MysqlEventListenerFactory.java
+++ b/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/MysqlEventListenerFactory.java
@@ -14,10 +14,13 @@
 package io.trino.plugin.eventlistener.mysql;
 
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Module;
+import com.google.inject.Provider;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import com.google.inject.TypeLiteral;
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.json.JsonModule;
@@ -30,10 +33,6 @@
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.sqlobject.SqlObjectPlugin;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-
 import java.sql.DriverManager;
 import java.util.Map;
 import java.util.Set;
diff --git a/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/QueryDao.java b/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/QueryDao.java
index 16388fd49e1c..79d4bf789a9b 100644
--- a/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/QueryDao.java
+++ b/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/QueryDao.java
@@ -62,6 +62,7 @@ public interface QueryDao
             "  waiting_time_millis BIGINT NOT NULL,\n" +
             "  analysis_time_millis BIGINT NOT NULL,\n" +
             "  planning_time_millis BIGINT NOT NULL,\n" +
+            "  planning_cpu_time_millis BIGINT NOT NULL,\n" +
             "  execution_time_millis BIGINT NOT NULL,\n" +
             "  input_blocked_time_millis BIGINT NOT NULL,\n" +
             "  failed_input_blocked_time_millis BIGINT NOT NULL,\n" +
@@ -133,6 +134,7 @@ public interface QueryDao
             "  waiting_time_millis,\n" +
             "  analysis_time_millis,\n" +
             "  planning_time_millis,\n" +
+            "  planning_cpu_time_millis,\n" +
             "  execution_time_millis,\n" +
             "  input_blocked_time_millis,\n" +
             "  failed_input_blocked_time_millis,\n" +
@@ -201,6 +203,7 @@ public interface QueryDao
             " :waitingTimeMillis,\n" +
             " :analysisTimeMillis,\n" +
             " :planningTimeMillis,\n" +
+            " :planningCpuTimeMillis,\n" +
             " :executionTimeMillis,\n" +
             " :inputBlockedTimeMillis,\n" +
             " :failedInputBlockedTimeMillis,\n" +
diff --git a/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/QueryEntity.java b/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/QueryEntity.java
index fa3e37441c27..209a016c3329 100644
--- a/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/QueryEntity.java
+++ b/plugin/trino-mysql-event-listener/src/main/java/io/trino/plugin/eventlistener/mysql/QueryEntity.java
@@ -73,6 +73,7 @@ public class QueryEntity
     private final long waitingTimeMillis;
     private final long analysisTimeMillis;
     private final long planningTimeMillis;
+    private final long planningCpuTimeMillis;
     private final long executionTimeMillis;
     private final long inputBlockedTimeMillis;
     private final long failedInputBlockedTimeMillis;
@@ -145,6 +146,7 @@ public QueryEntity(
             long waitingTimeMillis,
             long analysisTimeMillis,
             long planningTimeMillis,
+            long planningCpuTimeMillis,
             long executionTimeMillis,
             long inputBlockedTimeMillis,
             long failedInputBlockedTimeMillis,
@@ -212,6 +214,7 @@ public QueryEntity(
         this.waitingTimeMillis = waitingTimeMillis;
         this.analysisTimeMillis = analysisTimeMillis;
         this.planningTimeMillis = planningTimeMillis;
+        this.planningCpuTimeMillis = planningCpuTimeMillis;
         this.executionTimeMillis = executionTimeMillis;
         this.inputBlockedTimeMillis = inputBlockedTimeMillis;
         this.failedInputBlockedTimeMillis = failedInputBlockedTimeMillis;
@@ -452,6 +455,11 @@ public long getPlanningTimeMillis()
         return planningTimeMillis;
     }
 
+    public long getPlanningCpuTimeMillis()
+    {
+        return planningCpuTimeMillis;
+    }
+
     public long getExecutionTimeMillis()
     {
         return executionTimeMillis;
diff --git a/plugin/trino-mysql-event-listener/src/test/java/io/trino/plugin/eventlistener/mysql/TestMysqlEventListener.java b/plugin/trino-mysql-event-listener/src/test/java/io/trino/plugin/eventlistener/mysql/TestMysqlEventListener.java
index 09ff5681e8e1..88a81c8457a4 100644
--- a/plugin/trino-mysql-event-listener/src/test/java/io/trino/plugin/eventlistener/mysql/TestMysqlEventListener.java
+++ b/plugin/trino-mysql-event-listener/src/test/java/io/trino/plugin/eventlistener/mysql/TestMysqlEventListener.java
@@ -17,6 +17,7 @@
 import com.google.common.reflect.TypeToken;
 import io.airlift.json.JsonCodecFactory;
 import io.trino.spi.TrinoWarning;
+import io.trino.spi.connector.CatalogHandle.CatalogVersion;
 import io.trino.spi.connector.StandardWarningCode;
 import io.trino.spi.eventlistener.ColumnDetail;
 import io.trino.spi.eventlistener.EventListener;
@@ -33,10 +34,11 @@
 import io.trino.spi.resourcegroups.QueryType;
 import io.trino.spi.resourcegroups.ResourceGroupId;
 import io.trino.spi.session.ResourceEstimates;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.testcontainers.containers.MySQLContainer;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 import java.net.URI;
 import java.sql.Connection;
@@ -53,14 +55,14 @@
 import java.util.Set;
 
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static java.lang.Boolean.TRUE;
 import static java.lang.String.format;
 import static java.time.Duration.ofMillis;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestMysqlEventListener
 {
     private static final QueryMetadata FULL_QUERY_METADATA = new QueryMetadata(
@@ -89,6 +91,7 @@ public class TestMysqlEventListener
             Optional.of(ofMillis(107)),
             Optional.of(ofMillis(108)),
             Optional.of(ofMillis(109)),
+            Optional.of(ofMillis(1091)),
             Optional.of(ofMillis(110)),
             Optional.of(ofMillis(111)),
             Optional.of(ofMillis(112)),
@@ -130,7 +133,9 @@ public class TestMysqlEventListener
 
     private static final QueryContext FULL_QUERY_CONTEXT = new QueryContext(
             "user",
+            "originalUser",
             Optional.of("principal"),
+            Set.of("role1", "role2"),
             Set.of("group1", "group2"),
             Optional.of("traceToken"),
             Optional.of("remoteAddress"),
@@ -140,6 +145,7 @@ public class TestMysqlEventListener
             // not stored
             Set.of(),
             Optional.of("source"),
+            UTC_KEY.getId(),
             Optional.of("catalog"),
             Optional.of("schema"),
             Optional.of(new ResourceGroupId("resourceGroup")),
@@ -156,6 +162,7 @@ public class TestMysqlEventListener
             List.of(
                     new QueryInputMetadata(
                             "catalog1",
+                            new CatalogVersion("default"),
                             "schema1",
                             "table1",
                             List.of("column1", "column2"),
@@ -165,6 +172,7 @@ public class TestMysqlEventListener
                             OptionalLong.of(202)),
                     new QueryInputMetadata(
                             "catalog2",
+                            new CatalogVersion("default"),
                             "schema2",
                             "table2",
                             List.of("column3", "column4"),
@@ -174,6 +182,7 @@ public class TestMysqlEventListener
                             OptionalLong.of(204))),
             Optional.of(new QueryOutputMetadata(
                     "catalog3",
+                    new CatalogVersion("default"),
                     "schema3",
                     "table3",
                     Optional.of(List.of(
@@ -245,6 +254,7 @@ public class TestMysqlEventListener
             Optional.empty(),
             Optional.empty(),
             Optional.empty(),
+            Optional.empty(),
             115L,
             116L,
             117L,
@@ -278,8 +288,10 @@ public class TestMysqlEventListener
 
     private static final QueryContext MINIMAL_QUERY_CONTEXT = new QueryContext(
             "user",
+            "originalUser",
             Optional.empty(),
             Set.of(),
+            Set.of(),
             Optional.empty(),
             Optional.empty(),
             Optional.empty(),
@@ -288,6 +300,7 @@ public class TestMysqlEventListener
             // not stored
             Set.of(),
             Optional.empty(),
+            UTC_KEY.getId(),
             Optional.empty(),
             Optional.empty(),
             Optional.empty(),
@@ -318,7 +331,7 @@ public class TestMysqlEventListener
     private EventListener eventListener;
     private JsonCodecFactory jsonCodecFactory;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         mysqlContainer = new MySQLContainer<>("mysql:8.0.12");
@@ -329,7 +342,7 @@ public void setup()
         jsonCodecFactory = new JsonCodecFactory();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
     {
         if (mysqlContainer != null) {
@@ -359,74 +372,75 @@ public void testFull()
             try (Statement statement = connection.createStatement()) {
                 statement.execute("SELECT * FROM trino_queries WHERE query_id = 'full_query'");
                 try (ResultSet resultSet = statement.getResultSet()) {
-                    assertTrue(resultSet.next());
-                    assertEquals(resultSet.getString("query_id"), "full_query");
-                    assertEquals(resultSet.getString("transaction_id"), "transactionId");
-                    assertEquals(resultSet.getString("query"), "query");
-                    assertEquals(resultSet.getString("update_type"), "updateType");
-                    assertEquals(resultSet.getString("prepared_query"), "preparedQuery");
-                    assertEquals(resultSet.getString("query_state"), "queryState");
-                    assertEquals(resultSet.getString("plan"), "plan");
-                    assertEquals(resultSet.getString("stage_info_json"), "stageInfo");
-                    assertEquals(resultSet.getString("user"), "user");
-                    assertEquals(resultSet.getString("principal"), "principal");
-                    assertEquals(resultSet.getString("trace_token"), "traceToken");
-                    assertEquals(resultSet.getString("remote_client_address"), "remoteAddress");
-                    assertEquals(resultSet.getString("user_agent"), "userAgent");
-                    assertEquals(resultSet.getString("client_info"), "clientInfo");
-                    assertEquals(resultSet.getString("client_tags_json"), jsonCodecFactory.jsonCodec(new TypeToken<Set<String>>() {}).toJson(FULL_QUERY_CONTEXT.getClientTags()));
-                    assertEquals(resultSet.getString("source"), "source");
-                    assertEquals(resultSet.getString("catalog"), "catalog");
-                    assertEquals(resultSet.getString("schema"), "schema");
-                    assertEquals(resultSet.getString("resource_group_id"), "resourceGroup");
-                    assertEquals(resultSet.getString("session_properties_json"), jsonCodecFactory.mapJsonCodec(String.class, String.class).toJson(FULL_QUERY_CONTEXT.getSessionProperties()));
-                    assertEquals(resultSet.getString("server_address"), "serverAddress");
-                    assertEquals(resultSet.getString("server_version"), "serverVersion");
-                    assertEquals(resultSet.getString("environment"), "environment");
-                    assertEquals(resultSet.getString("query_type"), "SELECT");
-                    assertEquals(resultSet.getString("inputs_json"), jsonCodecFactory.listJsonCodec(QueryInputMetadata.class).toJson(FULL_QUERY_IO_METADATA.getInputs()));
-                    assertEquals(resultSet.getString("output_json"), jsonCodecFactory.jsonCodec(QueryOutputMetadata.class).toJson(FULL_QUERY_IO_METADATA.getOutput().orElseThrow()));
-                    assertEquals(resultSet.getString("error_code"), GENERIC_INTERNAL_ERROR.name());
-                    assertEquals(resultSet.getString("error_type"), GENERIC_INTERNAL_ERROR.toErrorCode().getType().name());
-                    assertEquals(resultSet.getString("failure_type"), "failureType");
-                    assertEquals(resultSet.getString("failure_message"), "failureMessage");
-                    assertEquals(resultSet.getString("failure_task"), "failureTask");
-                    assertEquals(resultSet.getString("failure_host"), "failureHost");
-                    assertEquals(resultSet.getString("failures_json"), "failureJson");
-                    assertEquals(resultSet.getString("warnings_json"), jsonCodecFactory.listJsonCodec(TrinoWarning.class).toJson(FULL_QUERY_COMPLETED_EVENT.getWarnings()));
-                    assertEquals(resultSet.getLong("cpu_time_millis"), 101);
-                    assertEquals(resultSet.getLong("failed_cpu_time_millis"), 102);
-                    assertEquals(resultSet.getLong("wall_time_millis"), 103);
-                    assertEquals(resultSet.getLong("queued_time_millis"), 104);
-                    assertEquals(resultSet.getLong("scheduled_time_millis"), 105);
-                    assertEquals(resultSet.getLong("failed_scheduled_time_millis"), 106);
-                    assertEquals(resultSet.getLong("waiting_time_millis"), 107);
-                    assertEquals(resultSet.getLong("analysis_time_millis"), 108);
-                    assertEquals(resultSet.getLong("planning_time_millis"), 109);
-                    assertEquals(resultSet.getLong("execution_time_millis"), 110);
-                    assertEquals(resultSet.getLong("input_blocked_time_millis"), 111);
-                    assertEquals(resultSet.getLong("failed_input_blocked_time_millis"), 112);
-                    assertEquals(resultSet.getLong("output_blocked_time_millis"), 113);
-                    assertEquals(resultSet.getLong("failed_output_blocked_time_millis"), 114);
-                    assertEquals(resultSet.getLong("physical_input_read_time_millis"), 115);
-                    assertEquals(resultSet.getLong("peak_memory_bytes"), 115);
-                    assertEquals(resultSet.getLong("peak_task_memory_bytes"), 117);
-                    assertEquals(resultSet.getLong("physical_input_bytes"), 118);
-                    assertEquals(resultSet.getLong("physical_input_rows"), 119);
-                    assertEquals(resultSet.getLong("internal_network_bytes"), 120);
-                    assertEquals(resultSet.getLong("internal_network_rows"), 121);
-                    assertEquals(resultSet.getLong("total_bytes"), 122);
-                    assertEquals(resultSet.getLong("total_rows"), 123);
-                    assertEquals(resultSet.getLong("output_bytes"), 124);
-                    assertEquals(resultSet.getLong("output_rows"), 125);
-                    assertEquals(resultSet.getLong("written_bytes"), 126);
-                    assertEquals(resultSet.getLong("written_rows"), 127);
-                    assertEquals(resultSet.getDouble("cumulative_memory"), 128.0);
-                    assertEquals(resultSet.getDouble("failed_cumulative_memory"), 129.0);
-                    assertEquals(resultSet.getLong("completed_splits"), 130);
-                    assertEquals(resultSet.getString("retry_policy"), "TASK");
-                    assertEquals(resultSet.getString("operator_summaries_json"), "[{operator: \"operator1\"},{operator: \"operator2\"}]");
-                    assertFalse(resultSet.next());
+                    assertThat(resultSet.next()).isTrue();
+                    assertThat(resultSet.getString("query_id")).isEqualTo("full_query");
+                    assertThat(resultSet.getString("transaction_id")).isEqualTo("transactionId");
+                    assertThat(resultSet.getString("query")).isEqualTo("query");
+                    assertThat(resultSet.getString("update_type")).isEqualTo("updateType");
+                    assertThat(resultSet.getString("prepared_query")).isEqualTo("preparedQuery");
+                    assertThat(resultSet.getString("query_state")).isEqualTo("queryState");
+                    assertThat(resultSet.getString("plan")).isEqualTo("plan");
+                    assertThat(resultSet.getString("stage_info_json")).isEqualTo("stageInfo");
+                    assertThat(resultSet.getString("user")).isEqualTo("user");
+                    assertThat(resultSet.getString("principal")).isEqualTo("principal");
+                    assertThat(resultSet.getString("trace_token")).isEqualTo("traceToken");
+                    assertThat(resultSet.getString("remote_client_address")).isEqualTo("remoteAddress");
+                    assertThat(resultSet.getString("user_agent")).isEqualTo("userAgent");
+                    assertThat(resultSet.getString("client_info")).isEqualTo("clientInfo");
+                    assertThat(resultSet.getString("client_tags_json")).isEqualTo(jsonCodecFactory.jsonCodec(new TypeToken<Set<String>>() { }).toJson(FULL_QUERY_CONTEXT.getClientTags()));
+                    assertThat(resultSet.getString("source")).isEqualTo("source");
+                    assertThat(resultSet.getString("catalog")).isEqualTo("catalog");
+                    assertThat(resultSet.getString("schema")).isEqualTo("schema");
+                    assertThat(resultSet.getString("resource_group_id")).isEqualTo("resourceGroup");
+                    assertThat(resultSet.getString("session_properties_json")).isEqualTo(jsonCodecFactory.mapJsonCodec(String.class, String.class).toJson(FULL_QUERY_CONTEXT.getSessionProperties()));
+                    assertThat(resultSet.getString("server_address")).isEqualTo("serverAddress");
+                    assertThat(resultSet.getString("server_version")).isEqualTo("serverVersion");
+                    assertThat(resultSet.getString("environment")).isEqualTo("environment");
+                    assertThat(resultSet.getString("query_type")).isEqualTo("SELECT");
+                    assertThat(resultSet.getString("inputs_json")).isEqualTo(jsonCodecFactory.listJsonCodec(QueryInputMetadata.class).toJson(FULL_QUERY_IO_METADATA.getInputs()));
+                    assertThat(resultSet.getString("output_json")).isEqualTo(jsonCodecFactory.jsonCodec(QueryOutputMetadata.class).toJson(FULL_QUERY_IO_METADATA.getOutput().orElseThrow()));
+                    assertThat(resultSet.getString("error_code")).isEqualTo(GENERIC_INTERNAL_ERROR.name());
+                    assertThat(resultSet.getString("error_type")).isEqualTo(GENERIC_INTERNAL_ERROR.toErrorCode().getType().name());
+                    assertThat(resultSet.getString("failure_type")).isEqualTo("failureType");
+                    assertThat(resultSet.getString("failure_message")).isEqualTo("failureMessage");
+                    assertThat(resultSet.getString("failure_task")).isEqualTo("failureTask");
+                    assertThat(resultSet.getString("failure_host")).isEqualTo("failureHost");
+                    assertThat(resultSet.getString("failures_json")).isEqualTo("failureJson");
+                    assertThat(resultSet.getString("warnings_json")).isEqualTo(jsonCodecFactory.listJsonCodec(TrinoWarning.class).toJson(FULL_QUERY_COMPLETED_EVENT.getWarnings()));
+                    assertThat(resultSet.getLong("cpu_time_millis")).isEqualTo(101);
+                    assertThat(resultSet.getLong("failed_cpu_time_millis")).isEqualTo(102);
+                    assertThat(resultSet.getLong("wall_time_millis")).isEqualTo(103);
+                    assertThat(resultSet.getLong("queued_time_millis")).isEqualTo(104);
+                    assertThat(resultSet.getLong("scheduled_time_millis")).isEqualTo(105);
+                    assertThat(resultSet.getLong("failed_scheduled_time_millis")).isEqualTo(106);
+                    assertThat(resultSet.getLong("waiting_time_millis")).isEqualTo(107);
+                    assertThat(resultSet.getLong("analysis_time_millis")).isEqualTo(108);
+                    assertThat(resultSet.getLong("planning_time_millis")).isEqualTo(109);
+                    assertThat(resultSet.getLong("planning_cpu_time_millis")).isEqualTo(1091);
+                    assertThat(resultSet.getLong("execution_time_millis")).isEqualTo(110);
+                    assertThat(resultSet.getLong("input_blocked_time_millis")).isEqualTo(111);
+                    assertThat(resultSet.getLong("failed_input_blocked_time_millis")).isEqualTo(112);
+                    assertThat(resultSet.getLong("output_blocked_time_millis")).isEqualTo(113);
+                    assertThat(resultSet.getLong("failed_output_blocked_time_millis")).isEqualTo(114);
+                    assertThat(resultSet.getLong("physical_input_read_time_millis")).isEqualTo(115);
+                    assertThat(resultSet.getLong("peak_memory_bytes")).isEqualTo(115);
+                    assertThat(resultSet.getLong("peak_task_memory_bytes")).isEqualTo(117);
+                    assertThat(resultSet.getLong("physical_input_bytes")).isEqualTo(118);
+                    assertThat(resultSet.getLong("physical_input_rows")).isEqualTo(119);
+                    assertThat(resultSet.getLong("internal_network_bytes")).isEqualTo(120);
+                    assertThat(resultSet.getLong("internal_network_rows")).isEqualTo(121);
+                    assertThat(resultSet.getLong("total_bytes")).isEqualTo(122);
+                    assertThat(resultSet.getLong("total_rows")).isEqualTo(123);
+                    assertThat(resultSet.getLong("output_bytes")).isEqualTo(124);
+                    assertThat(resultSet.getLong("output_rows")).isEqualTo(125);
+                    assertThat(resultSet.getLong("written_bytes")).isEqualTo(126);
+                    assertThat(resultSet.getLong("written_rows")).isEqualTo(127);
+                    assertThat(resultSet.getDouble("cumulative_memory")).isEqualTo(128.0);
+                    assertThat(resultSet.getDouble("failed_cumulative_memory")).isEqualTo(129.0);
+                    assertThat(resultSet.getLong("completed_splits")).isEqualTo(130);
+                    assertThat(resultSet.getString("retry_policy")).isEqualTo("TASK");
+                    assertThat(resultSet.getString("operator_summaries_json")).isEqualTo("[{operator: \"operator1\"},{operator: \"operator2\"}]");
+                    assertThat(resultSet.next()).isFalse();
                 }
             }
         }
@@ -442,74 +456,74 @@ public void testMinimal()
             try (Statement statement = connection.createStatement()) {
                 statement.execute("SELECT * FROM trino_queries WHERE query_id = 'minimal_query'");
                 try (ResultSet resultSet = statement.getResultSet()) {
-                    assertTrue(resultSet.next());
-                    assertEquals(resultSet.getString("query_id"), "minimal_query");
-                    assertNull(resultSet.getString("transaction_id"));
-                    assertEquals(resultSet.getString("query"), "query");
-                    assertNull(resultSet.getString("update_type"));
-                    assertNull(resultSet.getString("prepared_query"));
-                    assertEquals(resultSet.getString("query_state"), "queryState");
-                    assertNull(resultSet.getString("plan"));
-                    assertNull(resultSet.getString("stage_info_json"));
-                    assertEquals(resultSet.getString("user"), "user");
-                    assertNull(resultSet.getString("principal"));
-                    assertNull(resultSet.getString("trace_token"));
-                    assertNull(resultSet.getString("remote_client_address"));
-                    assertNull(resultSet.getString("user_agent"));
-                    assertNull(resultSet.getString("client_info"));
-                    assertEquals(resultSet.getString("client_tags_json"), jsonCodecFactory.jsonCodec(new TypeToken<Set<String>>() {}).toJson(Set.of()));
-                    assertNull(resultSet.getString("source"));
-                    assertNull(resultSet.getString("catalog"));
-                    assertNull(resultSet.getString("schema"));
-                    assertNull(resultSet.getString("resource_group_id"));
-                    assertEquals(resultSet.getString("session_properties_json"), jsonCodecFactory.mapJsonCodec(String.class, String.class).toJson(Map.of()));
-                    assertEquals(resultSet.getString("server_address"), "serverAddress");
-                    assertEquals(resultSet.getString("server_version"), "serverVersion");
-                    assertEquals(resultSet.getString("environment"), "environment");
-                    assertNull(resultSet.getString("query_type"));
-                    assertEquals(resultSet.getString("inputs_json"), jsonCodecFactory.listJsonCodec(QueryInputMetadata.class).toJson(List.of()));
-                    assertNull(resultSet.getString("output_json"));
-                    assertNull(resultSet.getString("error_code"));
-                    assertNull(resultSet.getString("error_type"));
-                    assertNull(resultSet.getString("failure_type"));
-                    assertNull(resultSet.getString("failure_message"));
-                    assertNull(resultSet.getString("failure_task"));
-                    assertNull(resultSet.getString("failure_host"));
-                    assertNull(resultSet.getString("failures_json"));
-                    assertEquals(resultSet.getString("warnings_json"), jsonCodecFactory.listJsonCodec(TrinoWarning.class).toJson(List.of()));
-                    assertEquals(resultSet.getLong("cpu_time_millis"), 101);
-                    assertEquals(resultSet.getLong("failed_cpu_time_millis"), 102);
-                    assertEquals(resultSet.getLong("wall_time_millis"), 103);
-                    assertEquals(resultSet.getLong("queued_time_millis"), 104);
-                    assertEquals(resultSet.getLong("scheduled_time_millis"), 0);
-                    assertEquals(resultSet.getLong("failed_scheduled_time_millis"), 0);
-                    assertEquals(resultSet.getLong("waiting_time_millis"), 0);
-                    assertEquals(resultSet.getLong("analysis_time_millis"), 0);
-                    assertEquals(resultSet.getLong("planning_time_millis"), 0);
-                    assertEquals(resultSet.getLong("execution_time_millis"), 0);
-                    assertEquals(resultSet.getLong("input_blocked_time_millis"), 0);
-                    assertEquals(resultSet.getLong("failed_input_blocked_time_millis"), 0);
-                    assertEquals(resultSet.getLong("output_blocked_time_millis"), 0);
-                    assertEquals(resultSet.getLong("failed_output_blocked_time_millis"), 0);
-                    assertEquals(resultSet.getLong("physical_input_read_time_millis"), 0);
-                    assertEquals(resultSet.getLong("peak_memory_bytes"), 115);
-                    assertEquals(resultSet.getLong("peak_task_memory_bytes"), 117);
-                    assertEquals(resultSet.getLong("physical_input_bytes"), 118);
-                    assertEquals(resultSet.getLong("physical_input_rows"), 119);
-                    assertEquals(resultSet.getLong("internal_network_bytes"), 120);
-                    assertEquals(resultSet.getLong("internal_network_rows"), 121);
-                    assertEquals(resultSet.getLong("total_bytes"), 122);
-                    assertEquals(resultSet.getLong("total_rows"), 123);
-                    assertEquals(resultSet.getLong("output_bytes"), 124);
-                    assertEquals(resultSet.getLong("output_rows"), 125);
-                    assertEquals(resultSet.getLong("written_bytes"), 126);
-                    assertEquals(resultSet.getLong("written_rows"), 127);
-                    assertEquals(resultSet.getDouble("cumulative_memory"), 128.0);
-                    assertEquals(resultSet.getDouble("failed_cumulative_memory"), 129.0);
-                    assertEquals(resultSet.getLong("completed_splits"), 130);
-                    assertEquals(resultSet.getString("retry_policy"), "NONE");
-                    assertEquals(resultSet.getString("operator_summaries_json"), "[]");
-                    assertFalse(resultSet.next());
+                    assertThat(resultSet.next()).isTrue();
+                    assertThat(resultSet.getString("query_id")).isEqualTo("minimal_query");
+                    assertThat(resultSet.getString("transaction_id")).isNull();
+                    assertThat(resultSet.getString("query")).isEqualTo("query");
+                    assertThat(resultSet.getString("update_type")).isNull();
+                    assertThat(resultSet.getString("prepared_query")).isNull();
+                    assertThat(resultSet.getString("query_state")).isEqualTo("queryState");
+                    assertThat(resultSet.getString("plan")).isNull();
+                    assertThat(resultSet.getString("stage_info_json")).isNull();
+                    assertThat(resultSet.getString("user")).isEqualTo("user");
+                    assertThat(resultSet.getString("principal")).isNull();
+                    assertThat(resultSet.getString("trace_token")).isNull();
+                    assertThat(resultSet.getString("remote_client_address")).isNull();
+                    assertThat(resultSet.getString("user_agent")).isNull();
+                    assertThat(resultSet.getString("client_info")).isNull();
+                    assertThat(resultSet.getString("client_tags_json")).isEqualTo(jsonCodecFactory.jsonCodec(new TypeToken<Set<String>>() { }).toJson(Set.of()));
+                    assertThat(resultSet.getString("source")).isNull();
+                    assertThat(resultSet.getString("catalog")).isNull();
+                    assertThat(resultSet.getString("schema")).isNull();
+                    assertThat(resultSet.getString("resource_group_id")).isNull();
+                    assertThat(resultSet.getString("session_properties_json")).isEqualTo(jsonCodecFactory.mapJsonCodec(String.class, String.class).toJson(Map.of()));
+                    assertThat(resultSet.getString("server_address")).isEqualTo("serverAddress");
+                    assertThat(resultSet.getString("server_version")).isEqualTo("serverVersion");
+                    assertThat(resultSet.getString("environment")).isEqualTo("environment");
+                    assertThat(resultSet.getString("query_type")).isNull();
+                    assertThat(resultSet.getString("inputs_json")).isEqualTo(jsonCodecFactory.listJsonCodec(QueryInputMetadata.class).toJson(List.of()));
+                    assertThat(resultSet.getString("output_json")).isNull();
+                    assertThat(resultSet.getString("error_code")).isNull();
+                    assertThat(resultSet.getString("error_type")).isNull();
+                    assertThat(resultSet.getString("failure_type")).isNull();
+                    assertThat(resultSet.getString("failure_message")).isNull();
+                    assertThat(resultSet.getString("failure_task")).isNull();
+                    assertThat(resultSet.getString("failure_host")).isNull();
+                    assertThat(resultSet.getString("failures_json")).isNull();
+                    assertThat(resultSet.getString("warnings_json")).isEqualTo(jsonCodecFactory.listJsonCodec(TrinoWarning.class).toJson(List.of()));
+                    assertThat(resultSet.getLong("cpu_time_millis")).isEqualTo(101);
+                    assertThat(resultSet.getLong("failed_cpu_time_millis")).isEqualTo(102);
+                    assertThat(resultSet.getLong("wall_time_millis")).isEqualTo(103);
+                    assertThat(resultSet.getLong("queued_time_millis")).isEqualTo(104);
+                    assertThat(resultSet.getLong("scheduled_time_millis")).isEqualTo(0);
+                    assertThat(resultSet.getLong("failed_scheduled_time_millis")).isEqualTo(0);
+                    assertThat(resultSet.getLong("waiting_time_millis")).isEqualTo(0);
+                    assertThat(resultSet.getLong("analysis_time_millis")).isEqualTo(0);
+                    assertThat(resultSet.getLong("planning_time_millis")).isEqualTo(0);
+                    assertThat(resultSet.getLong("execution_time_millis")).isEqualTo(0);
+                    assertThat(resultSet.getLong("input_blocked_time_millis")).isEqualTo(0);
+                    assertThat(resultSet.getLong("failed_input_blocked_time_millis")).isEqualTo(0);
+                    assertThat(resultSet.getLong("output_blocked_time_millis")).isEqualTo(0);
+                    assertThat(resultSet.getLong("failed_output_blocked_time_millis")).isEqualTo(0);
+                    assertThat(resultSet.getLong("physical_input_read_time_millis")).isEqualTo(0);
+                    assertThat(resultSet.getLong("peak_memory_bytes")).isEqualTo(115);
+                    assertThat(resultSet.getLong("peak_task_memory_bytes")).isEqualTo(117);
+                    assertThat(resultSet.getLong("physical_input_bytes")).isEqualTo(118);
+                    assertThat(resultSet.getLong("physical_input_rows")).isEqualTo(119);
+                    assertThat(resultSet.getLong("internal_network_bytes")).isEqualTo(120);
+                    assertThat(resultSet.getLong("internal_network_rows")).isEqualTo(121);
+                    assertThat(resultSet.getLong("total_bytes")).isEqualTo(122);
+                    assertThat(resultSet.getLong("total_rows")).isEqualTo(123);
+                    assertThat(resultSet.getLong("output_bytes")).isEqualTo(124);
+                    assertThat(resultSet.getLong("output_rows")).isEqualTo(125);
+                    assertThat(resultSet.getLong("written_bytes")).isEqualTo(126);
+                    assertThat(resultSet.getLong("written_rows")).isEqualTo(127);
+                    assertThat(resultSet.getDouble("cumulative_memory")).isEqualTo(128.0);
+                    assertThat(resultSet.getDouble("failed_cumulative_memory")).isEqualTo(129.0);
+                    assertThat(resultSet.getLong("completed_splits")).isEqualTo(130);
+                    assertThat(resultSet.getString("retry_policy")).isEqualTo("NONE");
+                    assertThat(resultSet.getString("operator_summaries_json")).isEqualTo("[]");
+                    assertThat(resultSet.next()).isFalse();
                 }
             }
         }
diff --git a/plugin/trino-mysql-event-listener/src/test/java/io/trino/plugin/eventlistener/mysql/TestMysqlEventListenerConfig.java b/plugin/trino-mysql-event-listener/src/test/java/io/trino/plugin/eventlistener/mysql/TestMysqlEventListenerConfig.java
index 2c7c41f1b43d..1c4d456f6825 100644
--- a/plugin/trino-mysql-event-listener/src/test/java/io/trino/plugin/eventlistener/mysql/TestMysqlEventListenerConfig.java
+++ b/plugin/trino-mysql-event-listener/src/test/java/io/trino/plugin/eventlistener/mysql/TestMysqlEventListenerConfig.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.eventlistener.mysql;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-mysql/pom.xml b/plugin/trino-mysql/pom.xml
index f7fc555dd0ad..1ad673e59ea3 100644
--- a/plugin/trino-mysql/pom.xml
+++ b/plugin/trino-mysql/pom.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-mysql</artifactId>
-    <description>Trino - MySQL Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - MySQL Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,13 +19,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-base-jdbc</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
 
         <dependency>
@@ -49,58 +54,52 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-base-jdbc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.jdbi</groupId>
+            <artifactId>jdbi3-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.jdbi</groupId>
-            <artifactId>jdbi3-core</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -110,7 +109,24 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -144,6 +160,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
@@ -174,12 +197,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -192,6 +209,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>mysql</artifactId>
@@ -211,42 +234,30 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/Test*FailureRecoveryTest.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>fte-tests</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/Test*FailureRecoveryTest.java</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClient.java b/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClient.java
index 760de6f7424c..a53870ed76ce 100644
--- a/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClient.java
+++ b/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClient.java
@@ -15,16 +15,20 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import com.mysql.cj.jdbc.JdbcStatement;
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
 import io.trino.plugin.base.aggregation.AggregateFunctionRewriter;
 import io.trino.plugin.base.aggregation.AggregateFunctionRule;
 import io.trino.plugin.base.expression.ConnectorExpressionRewriter;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcClient;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
+import io.trino.plugin.jdbc.CaseSensitivity;
 import io.trino.plugin.jdbc.ColumnMapping;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.JdbcColumnHandle;
@@ -36,6 +40,9 @@
 import io.trino.plugin.jdbc.JdbcTypeHandle;
 import io.trino.plugin.jdbc.LongReadFunction;
 import io.trino.plugin.jdbc.LongWriteFunction;
+import io.trino.plugin.jdbc.ObjectReadFunction;
+import io.trino.plugin.jdbc.ObjectWriteFunction;
+import io.trino.plugin.jdbc.PredicatePushdownController;
 import io.trino.plugin.jdbc.PreparedQuery;
 import io.trino.plugin.jdbc.QueryBuilder;
 import io.trino.plugin.jdbc.RemoteTableName;
@@ -52,26 +59,34 @@
 import io.trino.plugin.jdbc.aggregation.ImplementVarianceSamp;
 import io.trino.plugin.jdbc.expression.JdbcConnectorExpressionRewriterBuilder;
 import io.trino.plugin.jdbc.expression.ParameterizedExpression;
+import io.trino.plugin.jdbc.expression.RewriteLikeEscapeWithCaseSensitivity;
+import io.trino.plugin.jdbc.expression.RewriteLikeWithCaseSensitivity;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.JoinCondition;
 import io.trino.spi.connector.JoinStatistics;
 import io.trino.spi.connector.JoinType;
 import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.connector.TableNotFoundException;
+import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.predicate.Domain;
+import io.trino.spi.predicate.ValueSet;
 import io.trino.spi.statistics.ColumnStatistics;
 import io.trino.spi.statistics.Estimate;
 import io.trino.spi.statistics.TableStatistics;
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Decimals;
+import io.trino.spi.type.LongTimestampWithTimeZone;
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.TimeType;
 import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.TimestampWithTimeZoneType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeSignature;
@@ -80,17 +95,19 @@
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.core.statement.UnableToExecuteStatementException;
 
-import javax.inject.Inject;
-
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.SQLSyntaxErrorException;
+import java.sql.Timestamp;
 import java.sql.Types;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Collection;
 import java.util.List;
@@ -99,7 +116,7 @@
 import java.util.function.BiFunction;
 import java.util.stream.Stream;
 
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.emptyToNull;
@@ -107,27 +124,32 @@
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static com.mysql.cj.exceptions.MysqlErrorNumbers.ER_NO_SUCH_TABLE;
 import static com.mysql.cj.exceptions.MysqlErrorNumbers.ER_UNKNOWN_TABLE;
 import static com.mysql.cj.exceptions.MysqlErrorNumbers.SQL_STATE_ER_TABLE_EXISTS_ERROR;
 import static io.airlift.json.JsonCodec.jsonCodec;
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.trino.plugin.base.util.JsonTypeUtil.jsonParse;
+import static io.trino.plugin.jdbc.CaseSensitivity.CASE_INSENSITIVE;
+import static io.trino.plugin.jdbc.CaseSensitivity.CASE_SENSITIVE;
 import static io.trino.plugin.jdbc.DecimalConfig.DecimalMapping.ALLOW_OVERFLOW;
 import static io.trino.plugin.jdbc.DecimalSessionSessionProperties.getDecimalDefaultScale;
 import static io.trino.plugin.jdbc.DecimalSessionSessionProperties.getDecimalRounding;
 import static io.trino.plugin.jdbc.DecimalSessionSessionProperties.getDecimalRoundingMode;
 import static io.trino.plugin.jdbc.JdbcErrorCode.JDBC_ERROR;
 import static io.trino.plugin.jdbc.JdbcJoinPushdownUtil.implementJoinCostAware;
+import static io.trino.plugin.jdbc.JdbcMetadataSessionProperties.getDomainCompactionThreshold;
+import static io.trino.plugin.jdbc.PredicatePushdownController.CASE_INSENSITIVE_CHARACTER_PUSHDOWN;
 import static io.trino.plugin.jdbc.PredicatePushdownController.DISABLE_PUSHDOWN;
 import static io.trino.plugin.jdbc.PredicatePushdownController.FULL_PUSHDOWN;
 import static io.trino.plugin.jdbc.StandardColumnMappings.bigintColumnMapping;
 import static io.trino.plugin.jdbc.StandardColumnMappings.bigintWriteFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.booleanColumnMapping;
 import static io.trino.plugin.jdbc.StandardColumnMappings.booleanWriteFunction;
+import static io.trino.plugin.jdbc.StandardColumnMappings.charReadFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.charWriteFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.dateReadFunctionUsingLocalDate;
 import static io.trino.plugin.jdbc.StandardColumnMappings.decimalColumnMapping;
-import static io.trino.plugin.jdbc.StandardColumnMappings.defaultCharColumnMapping;
 import static io.trino.plugin.jdbc.StandardColumnMappings.defaultVarcharColumnMapping;
 import static io.trino.plugin.jdbc.StandardColumnMappings.doubleColumnMapping;
 import static io.trino.plugin.jdbc.StandardColumnMappings.doubleWriteFunction;
@@ -147,13 +169,18 @@
 import static io.trino.plugin.jdbc.StandardColumnMappings.tinyintWriteFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.varbinaryReadFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.varbinaryWriteFunction;
+import static io.trino.plugin.jdbc.StandardColumnMappings.varcharReadFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.varcharWriteFunction;
 import static io.trino.plugin.jdbc.TypeHandlingJdbcSessionProperties.getUnsupportedTypeHandling;
 import static io.trino.plugin.jdbc.UnsupportedTypeHandling.CONVERT_TO_VARCHAR;
 import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_EMPTY;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.CharType.createCharType;
+import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
+import static io.trino.spi.type.DateTimeEncoding.unpackMillisUtc;
 import static io.trino.spi.type.DateType.DATE;
 import static io.trino.spi.type.DecimalType.createDecimalType;
 import static io.trino.spi.type.DoubleType.DOUBLE;
@@ -161,10 +188,19 @@
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TimeType.createTimeType;
+import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static io.trino.spi.type.TimestampType.createTimestampType;
+import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
+import static io.trino.spi.type.Timestamps.MILLISECONDS_PER_SECOND;
+import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MILLISECOND;
+import static io.trino.spi.type.Timestamps.PICOSECONDS_PER_NANOSECOND;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
+import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
+import static io.trino.spi.type.VarcharType.createVarcharType;
 import static java.lang.Float.floatToRawIntBits;
+import static java.lang.Math.floorDiv;
+import static java.lang.Math.floorMod;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static java.lang.String.format;
@@ -198,6 +234,26 @@ public class MySqlClient
     private final ConnectorExpressionRewriter<ParameterizedExpression> connectorExpressionRewriter;
     private final AggregateFunctionRewriter<JdbcExpression, ?> aggregateFunctionRewriter;
 
+    private static final PredicatePushdownController MYSQL_CHARACTER_PUSHDOWN = (session, domain) -> {
+        if (domain.isNullableSingleValue()) {
+            return FULL_PUSHDOWN.apply(session, domain);
+        }
+
+        Domain simplifiedDomain = domain.simplify(getDomainCompactionThreshold(session));
+        if (!simplifiedDomain.getValues().isDiscreteSet()) {
+            // Push down inequality predicate
+            ValueSet complement = simplifiedDomain.getValues().complement();
+            if (complement.isDiscreteSet()) {
+                return FULL_PUSHDOWN.apply(session, simplifiedDomain);
+            }
+            // Domain#simplify can turn a discrete set into a range predicate
+            // Push down of range predicate for varchar/char types could lead to incorrect results
+            // when the remote database is case insensitive
+            return DISABLE_PUSHDOWN.apply(session, domain);
+        }
+        return FULL_PUSHDOWN.apply(session, simplifiedDomain);
+    };
+
     @Inject
     public MySqlClient(
             BaseJdbcConfig config,
@@ -214,6 +270,8 @@ public MySqlClient(
 
         this.connectorExpressionRewriter = JdbcConnectorExpressionRewriterBuilder.newBuilder()
                 .addStandardRules(this::quoted)
+                .add(new RewriteLikeWithCaseSensitivity())
+                .add(new RewriteLikeEscapeWithCaseSensitivity())
                 .build();
 
         JdbcTypeHandle bigintTypeHandle = new JdbcTypeHandle(Types.BIGINT, Optional.of("bigint"), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
@@ -234,6 +292,37 @@ public MySqlClient(
                         .build());
     }
 
+    @Override
+    public Optional<ParameterizedExpression> convertPredicate(ConnectorSession session, ConnectorExpression expression, Map<String, ColumnHandle> assignments)
+    {
+        return connectorExpressionRewriter.rewrite(session, expression, assignments);
+    }
+
+    @Override
+    protected Map<String, CaseSensitivity> getCaseSensitivityForColumns(ConnectorSession session, Connection connection, JdbcTableHandle tableHandle)
+    {
+        if (tableHandle.isSynthetic()) {
+            return ImmutableMap.of();
+        }
+        PreparedQuery preparedQuery = new PreparedQuery(format("SELECT * FROM %s", quoted(tableHandle.asPlainTable().getRemoteTableName())), ImmutableList.of());
+
+        try (PreparedStatement preparedStatement = queryBuilder.prepareStatement(this, session, connection, preparedQuery, Optional.empty())) {
+            ResultSetMetaData metadata = preparedStatement.getMetaData();
+            ImmutableMap.Builder<String, CaseSensitivity> columns = ImmutableMap.builder();
+            for (int column = 1; column <= metadata.getColumnCount(); column++) {
+                String name = metadata.getColumnName(column);
+                columns.put(name, metadata.isCaseSensitive(column) ? CASE_SENSITIVE : CASE_INSENSITIVE);
+            }
+            return columns.buildOrThrow();
+        }
+        catch (SQLException e) {
+            if (e.getErrorCode() == ER_NO_SUCH_TABLE) {
+                throw new TableNotFoundException(tableHandle.asPlainTable().getSchemaTableName());
+            }
+            throw new TrinoException(JDBC_ERROR, "Failed to get case sensitivity for columns. " + firstNonNull(e.getMessage(), e), e);
+        }
+    }
+
     @Override
     public Optional<JdbcExpression> implementAggregation(ConnectorSession session, AggregateFunction aggregate, Map<String, ColumnHandle> assignments)
     {
@@ -283,6 +372,21 @@ protected boolean filterSchema(String schemaName)
         return super.filterSchema(schemaName);
     }
 
+    @Override
+    protected void dropSchema(ConnectorSession session, Connection connection, String remoteSchemaName, boolean cascade)
+            throws SQLException
+    {
+        // MySQL always deletes all tables inside the database https://dev.mysql.com/doc/refman/8.0/en/drop-database.html
+        if (!cascade) {
+            try (ResultSet tables = getTables(connection, Optional.of(remoteSchemaName), Optional.empty())) {
+                if (tables.next()) {
+                    throw new TrinoException(SCHEMA_NOT_EMPTY, "Cannot drop non-empty schema '%s'".formatted(remoteSchemaName));
+                }
+            }
+        }
+        execute(session, connection, "DROP SCHEMA " + quoted(remoteSchemaName));
+    }
+
     @Override
     public void abortReadConnection(Connection connection, ResultSet resultSet)
             throws SQLException
@@ -351,6 +455,21 @@ protected String createTableSql(RemoteTableName remoteTableName, List<String> co
         return format("CREATE TABLE %s (%s) COMMENT %s", quoted(remoteTableName), join(", ", columns), mysqlVarcharLiteral(tableMetadata.getComment().orElse(NO_COMMENT)));
     }
 
+    // This is overridden to pass NULL to MySQL for TIMESTAMP column types
+    // Without it, an "Invalid default value" error is thrown
+    @Override
+    protected String getColumnDefinitionSql(ConnectorSession session, ColumnMetadata column, String columnName)
+    {
+        if (column.getComment() != null) {
+            throw new TrinoException(NOT_SUPPORTED, "This connector does not support creating tables with column comment");
+        }
+
+        return "%s %s %s".formatted(
+                quoted(columnName),
+                toWriteMapping(session, column.getType()).getDataType(),
+                column.isNullable() ? "NULL" : "NOT NULL");
+    }
+
     private static String mysqlVarcharLiteral(String value)
     {
         requireNonNull(value, "value is null");
@@ -381,6 +500,8 @@ public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connect
                 return Optional.of(jsonColumnMapping());
             case "enum":
                 return Optional.of(defaultVarcharColumnMapping(typeHandle.getRequiredColumnSize(), false));
+            case "datetime":
+                return mysqlDateTimeToTrinoTimestamp(typeHandle);
         }
 
         switch (typeHandle.getJdbcType()) {
@@ -427,14 +548,14 @@ public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connect
                 return Optional.of(decimalColumnMapping(createDecimalType(precision, max(decimalDigits, 0))));
 
             case Types.CHAR:
-                return Optional.of(defaultCharColumnMapping(typeHandle.getRequiredColumnSize(), false));
+                return Optional.of(mySqlDefaultCharColumnMapping(typeHandle.getRequiredColumnSize(), typeHandle.getCaseSensitivity()));
 
             // TODO not all these type constants are necessarily used by the JDBC driver
             case Types.VARCHAR:
             case Types.NVARCHAR:
             case Types.LONGVARCHAR:
             case Types.LONGNVARCHAR:
-                return Optional.of(defaultVarcharColumnMapping(typeHandle.getRequiredColumnSize(), false));
+                return Optional.of(mySqlDefaultVarcharColumnMapping(typeHandle.getRequiredColumnSize(), typeHandle.getCaseSensitivity()));
 
             case Types.BINARY:
             case Types.VARBINARY:
@@ -457,12 +578,7 @@ public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connect
                         timeWriteFunction(timeType.getPrecision())));
 
             case Types.TIMESTAMP:
-                TimestampType timestampType = createTimestampType(getTimestampPrecision(typeHandle.getRequiredColumnSize()));
-                checkArgument(timestampType.getPrecision() <= TimestampType.MAX_SHORT_PRECISION, "Precision is out of range: %s", timestampType.getPrecision());
-                return Optional.of(ColumnMapping.longMapping(
-                        timestampType,
-                        mySqlTimestampReadFunction(timestampType),
-                        timestampWriteFunction(timestampType)));
+                return mysqlTimestampToTrinoTimestampWithTz(typeHandle);
         }
 
         if (getUnsupportedTypeHandling(session) == CONVERT_TO_VARCHAR) {
@@ -471,9 +587,110 @@ public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connect
         return Optional.empty();
     }
 
+    private static ColumnMapping mySqlDefaultVarcharColumnMapping(int columnSize, Optional<CaseSensitivity> caseSensitivity)
+    {
+        if (columnSize > VarcharType.MAX_LENGTH) {
+            return mySqlVarcharColumnMapping(createUnboundedVarcharType(), caseSensitivity);
+        }
+        return mySqlVarcharColumnMapping(createVarcharType(columnSize), caseSensitivity);
+    }
+
+    private static ColumnMapping mySqlVarcharColumnMapping(VarcharType varcharType, Optional<CaseSensitivity> caseSensitivity)
+    {
+        PredicatePushdownController pushdownController = caseSensitivity.orElse(CASE_INSENSITIVE) == CASE_SENSITIVE
+                ? MYSQL_CHARACTER_PUSHDOWN
+                : CASE_INSENSITIVE_CHARACTER_PUSHDOWN;
+        return ColumnMapping.sliceMapping(varcharType, varcharReadFunction(varcharType), varcharWriteFunction(), pushdownController);
+    }
+
+    private static ColumnMapping mySqlDefaultCharColumnMapping(int columnSize, Optional<CaseSensitivity> caseSensitivity)
+    {
+        if (columnSize > CharType.MAX_LENGTH) {
+            return mySqlDefaultVarcharColumnMapping(columnSize, caseSensitivity);
+        }
+        return mySqlCharColumnMapping(createCharType(columnSize), caseSensitivity);
+    }
+
+    private static ColumnMapping mySqlCharColumnMapping(CharType charType, Optional<CaseSensitivity> caseSensitivity)
+    {
+        requireNonNull(charType, "charType is null");
+        PredicatePushdownController pushdownController = caseSensitivity.orElse(CASE_INSENSITIVE) == CASE_SENSITIVE
+                ? MYSQL_CHARACTER_PUSHDOWN
+                : CASE_INSENSITIVE_CHARACTER_PUSHDOWN;
+        return ColumnMapping.sliceMapping(charType, charReadFunction(charType), charWriteFunction(), pushdownController);
+    }
+
+    private Optional<ColumnMapping> mysqlDateTimeToTrinoTimestamp(JdbcTypeHandle typeHandle)
+    {
+        TimestampType timestampType = createTimestampType(getTimestampPrecision(typeHandle.getRequiredColumnSize()));
+        checkArgument(timestampType.getPrecision() <= TimestampType.MAX_SHORT_PRECISION, "Precision is out of range: %s", timestampType.getPrecision());
+        return Optional.of(ColumnMapping.longMapping(
+                timestampType,
+                mySqlTimestampReadFunction(timestampType),
+                timestampWriteFunction(timestampType)));
+    }
+
+    private static Optional<ColumnMapping> mysqlTimestampToTrinoTimestampWithTz(JdbcTypeHandle typeHandle)
+    {
+        TimestampWithTimeZoneType trinoType = createTimestampWithTimeZoneType(getTimestampPrecision(typeHandle.getRequiredColumnSize()));
+        if (trinoType.getPrecision() <= TimestampWithTimeZoneType.MAX_SHORT_PRECISION) {
+            return Optional.of(ColumnMapping.longMapping(
+                    trinoType,
+                    shortTimestampWithTimeZoneReadFunction(),
+                    shortTimestampWithTimeZoneWriteFunction()));
+        }
+        return Optional.of(ColumnMapping.objectMapping(
+                trinoType,
+                longTimestampWithTimeZoneReadFunction(),
+                longTimestampWithTimeZoneWriteFunction()));
+    }
+
+    private static LongReadFunction shortTimestampWithTimeZoneReadFunction()
+    {
+        return (resultSet, columnIndex) -> {
+            Timestamp timestamp = resultSet.getTimestamp(columnIndex);
+            long millisUtc = timestamp.getTime();
+            return packDateTimeWithZone(millisUtc, UTC_KEY);
+        };
+    }
+
+    private static ObjectReadFunction longTimestampWithTimeZoneReadFunction()
+    {
+        return ObjectReadFunction.of(
+                LongTimestampWithTimeZone.class,
+                (resultSet, columnIndex) -> {
+                    OffsetDateTime offsetDateTime = resultSet.getObject(columnIndex, OffsetDateTime.class);
+                    return LongTimestampWithTimeZone.fromEpochSecondsAndFraction(
+                            offsetDateTime.toEpochSecond(),
+                            (long) offsetDateTime.getNano() * PICOSECONDS_PER_NANOSECOND,
+                            UTC_KEY);
+                });
+    }
+
+    private static LongWriteFunction shortTimestampWithTimeZoneWriteFunction()
+    {
+        return (statement, index, value) -> {
+            Instant instantValue = Instant.ofEpochMilli(unpackMillisUtc(value));
+            statement.setObject(index, instantValue);
+        };
+    }
+
+    private static ObjectWriteFunction longTimestampWithTimeZoneWriteFunction()
+    {
+        return ObjectWriteFunction.of(
+                LongTimestampWithTimeZone.class,
+                (statement, index, value) -> {
+                    long epochSeconds = floorDiv(value.getEpochMillis(), MILLISECONDS_PER_SECOND);
+                    long nanosOfSecond = (long) floorMod(value.getEpochMillis(), MILLISECONDS_PER_SECOND) * NANOSECONDS_PER_MILLISECOND + value.getPicosOfMilli() / PICOSECONDS_PER_NANOSECOND;
+                    Instant instantValue = Instant.ofEpochSecond(epochSeconds, nanosOfSecond);
+                    statement.setObject(index, instantValue);
+                });
+    }
+
     private LongWriteFunction mySqlDateWriteFunctionUsingLocalDate()
     {
-        return new LongWriteFunction() {
+        return new LongWriteFunction()
+        {
             @Override
             public String getBindExpression()
             {
@@ -493,6 +710,8 @@ private static LongReadFunction mySqlTimestampReadFunction(TimestampType timesta
     {
         return new LongReadFunction()
         {
+            private final LongReadFunction delegate = timestampReadFunction(timestampType);
+
             @Override
             public boolean isNull(ResultSet resultSet, int columnIndex)
                     throws SQLException
@@ -506,7 +725,7 @@ public boolean isNull(ResultSet resultSet, int columnIndex)
             public long readLong(ResultSet resultSet, int columnIndex)
                     throws SQLException
             {
-                return timestampReadFunction(timestampType).readLong(resultSet, columnIndex);
+                return delegate.readLong(resultSet, columnIndex);
             }
         };
     }
@@ -515,6 +734,8 @@ private static LongReadFunction mySqlTimeReadFunction(TimeType timeType)
     {
         return new LongReadFunction()
         {
+            private final LongReadFunction delegate = timeReadFunction(timeType);
+
             @Override
             public boolean isNull(ResultSet resultSet, int columnIndex)
                     throws SQLException
@@ -528,7 +749,7 @@ public boolean isNull(ResultSet resultSet, int columnIndex)
             public long readLong(ResultSet resultSet, int columnIndex)
                     throws SQLException
             {
-                return timeReadFunction(timeType).readLong(resultSet, columnIndex);
+                return delegate.readLong(resultSet, columnIndex);
             }
         };
     }
@@ -605,6 +826,17 @@ public WriteMapping toWriteMapping(ConnectorSession session, Type type)
             return WriteMapping.objectMapping(format("datetime(%s)", MAX_SUPPORTED_DATE_TIME_PRECISION), longTimestampWriteFunction(timestampType, MAX_SUPPORTED_DATE_TIME_PRECISION));
         }
 
+        if (type instanceof TimestampWithTimeZoneType timestampWithTimeZoneType) {
+            if (timestampWithTimeZoneType.getPrecision() <= MAX_SUPPORTED_DATE_TIME_PRECISION) {
+                String dataType = format("timestamp(%d)", timestampWithTimeZoneType.getPrecision());
+                if (timestampWithTimeZoneType.getPrecision() <= TimestampWithTimeZoneType.MAX_SHORT_PRECISION) {
+                    return WriteMapping.longMapping(dataType, shortTimestampWithTimeZoneWriteFunction());
+                }
+                return WriteMapping.objectMapping(dataType, longTimestampWithTimeZoneWriteFunction());
+            }
+            return WriteMapping.objectMapping(format("timestamp(%d)", MAX_SUPPORTED_DATE_TIME_PRECISION), longTimestampWithTimeZoneWriteFunction());
+        }
+
         if (VARBINARY.equals(type)) {
             return WriteMapping.sliceMapping("mediumblob", varbinaryWriteFunction());
         }
@@ -872,8 +1104,12 @@ private TableStatistics readTableStatistics(ConnectorSession session, JdbcTableH
                     log.debug("Reading column statistics for %s, %s from index statistics: %s", table, columnName, columnIndexStatistics);
                     updateColumnStatisticsFromIndexStatistics(table, columnName, columnStatisticsBuilder, columnIndexStatistics);
 
-                    // row count from INFORMATION_SCHEMA.TABLES is very inaccurate
-                    rowCount = max(rowCount, columnIndexStatistics.getCardinality());
+                    if (rowCount < columnIndexStatistics.cardinality()) {
+                        // row count from INFORMATION_SCHEMA.TABLES is very inaccurate but rowCount already includes MAX(CARDINALITY) from indexes
+                        // This can still happen if table's index statistics change concurrently
+                        log.debug("Table %s rowCount calculated so far [%s] is less than index cardinality for %s: %s", table, rowCount, columnName, columnIndexStatistics);
+                        rowCount = max(rowCount, columnIndexStatistics.cardinality());
+                    }
                 }
 
                 tableStatistics.setColumnStatistics(column, columnStatisticsBuilder.build());
@@ -902,9 +1138,9 @@ private static void updateColumnStatisticsFromIndexStatistics(JdbcTableHandle ta
     {
         // Prefer CARDINALITY from index statistics over NDV from a histogram.
         // Index column might be NULLABLE. Then CARDINALITY includes all
-        columnStatistics.setDistinctValuesCount(Estimate.of(columnIndexStatistics.getCardinality()));
+        columnStatistics.setDistinctValuesCount(Estimate.of(columnIndexStatistics.cardinality()));
 
-        if (!columnIndexStatistics.nullable) {
+        if (!columnIndexStatistics.nullable()) {
             double knownNullFraction = columnStatistics.build().getNullsFraction().getValue();
             if (knownNullFraction > 0) {
                 log.warn("Inconsistent statistics, null fraction for a column %s, %s, that is not nullable according to index statistics: %s", table, columnName, knownNullFraction);
@@ -949,10 +1185,17 @@ public StatisticsDao(Handle handle)
         Long getRowCount(JdbcTableHandle table)
         {
             RemoteTableName remoteTableName = table.getRequiredNamedRelation().getRemoteTableName();
-            return handle.createQuery("" +
-                            "SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES " +
-                            "WHERE TABLE_SCHEMA = :schema AND TABLE_NAME = :table_name " +
-                            "AND TABLE_TYPE = 'BASE TABLE' ")
+            return handle.createQuery("""
+                        SELECT max(row_count) FROM (
+                            (SELECT TABLE_ROWS AS row_count FROM INFORMATION_SCHEMA.TABLES
+                            WHERE TABLE_SCHEMA = :schema AND TABLE_NAME = :table_name
+                            AND TABLE_TYPE = 'BASE TABLE')
+                            UNION ALL
+                            (SELECT CARDINALITY AS row_count FROM INFORMATION_SCHEMA.STATISTICS
+                            WHERE TABLE_SCHEMA = :schema AND TABLE_NAME = :table_name
+                            AND CARDINALITY IS NOT NULL)
+                        ) t
+                        """)
                     .bind("schema", remoteTableName.getCatalogName().orElse(null))
                     .bind("table_name", remoteTableName.getTableName())
                     .mapTo(Long.class)
@@ -963,17 +1206,18 @@ Long getRowCount(JdbcTableHandle table)
         Map<String, ColumnIndexStatistics> getColumnIndexStatistics(JdbcTableHandle table)
         {
             RemoteTableName remoteTableName = table.getRequiredNamedRelation().getRemoteTableName();
-            return handle.createQuery("" +
-                            "SELECT " +
-                            "  COLUMN_NAME, " +
-                            "  MAX(NULLABLE) AS NULLABLE, " +
-                            "  MAX(CARDINALITY) AS CARDINALITY " +
-                            "FROM INFORMATION_SCHEMA.STATISTICS " +
-                            "WHERE TABLE_SCHEMA = :schema AND TABLE_NAME = :table_name " +
-                            "AND SEQ_IN_INDEX = 1 " + // first column in the index
-                            "AND SUB_PART IS NULL " + // ignore cases where only a column prefix is indexed
-                            "AND CARDINALITY IS NOT NULL " + // CARDINALITY might be null (https://stackoverflow.com/a/42242729/65458)
-                            "GROUP BY COLUMN_NAME") // there might be multiple indexes on a column
+            return handle.createQuery("""
+                        SELECT
+                            COLUMN_NAME,
+                            MAX(NULLABLE) AS NULLABLE,
+                            MAX(CARDINALITY) AS CARDINALITY
+                        FROM INFORMATION_SCHEMA.STATISTICS
+                        WHERE TABLE_SCHEMA = :schema AND TABLE_NAME = :table_name
+                        AND SEQ_IN_INDEX = 1 -- first column in the index
+                        AND SUB_PART IS NULL -- ignore cases where only a column prefix is indexed
+                        AND CARDINALITY IS NOT NULL -- CARDINALITY might be null (https://stackoverflow.com/a/42242729/65458)
+                        GROUP BY COLUMN_NAME -- there might be multiple indexes on a column
+                        """)
                     .bind("schema", remoteTableName.getCatalogName().orElse(null))
                     .bind("table_name", remoteTableName.getTableName())
                     .map((rs, ctx) -> {
@@ -1004,9 +1248,10 @@ Map<String, String> getColumnHistograms(JdbcTableHandle table)
             }
 
             RemoteTableName remoteTableName = table.getRequiredNamedRelation().getRemoteTableName();
-            return handle.createQuery("" +
-                            "SELECT COLUMN_NAME, HISTOGRAM FROM INFORMATION_SCHEMA.COLUMN_STATISTICS " +
-                            "WHERE SCHEMA_NAME = :schema AND TABLE_NAME = :table_name")
+            return handle.createQuery("""
+                        SELECT COLUMN_NAME, HISTOGRAM FROM INFORMATION_SCHEMA.COLUMN_STATISTICS
+                        WHERE SCHEMA_NAME = :schema AND TABLE_NAME = :table_name
+                        """)
                     .bind("schema", remoteTableName.getCatalogName().orElse(null))
                     .bind("table_name", remoteTableName.getTableName())
                     .map((rs, ctx) -> new SimpleEntry<>(rs.getString("COLUMN_NAME"), rs.getString("HISTOGRAM")))
@@ -1014,31 +1259,7 @@ Map<String, String> getColumnHistograms(JdbcTableHandle table)
         }
     }
 
-    private static class ColumnIndexStatistics
-    {
-        private final boolean nullable;
-        private final long cardinality;
-
-        public ColumnIndexStatistics(boolean nullable, long cardinality)
-        {
-            this.cardinality = cardinality;
-            this.nullable = nullable;
-        }
-
-        public long getCardinality()
-        {
-            return cardinality;
-        }
-
-        @Override
-        public String toString()
-        {
-            return toStringHelper(this)
-                    .add("cardinality", getCardinality())
-                    .add("nullable", nullable)
-                    .toString();
-        }
-    }
+    private record ColumnIndexStatistics(boolean nullable, long cardinality) {}
 
     // See https://dev.mysql.com/doc/refman/8.0/en/optimizer-statistics.html
     public static class ColumnHistogram
diff --git a/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClientModule.java b/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClientModule.java
index 341789aed6fb..903e5889c815 100644
--- a/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClientModule.java
+++ b/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClientModule.java
@@ -19,6 +19,7 @@
 import com.google.inject.Singleton;
 import com.mysql.cj.jdbc.Driver;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DecimalModule;
@@ -29,7 +30,7 @@
 import io.trino.plugin.jdbc.JdbcStatisticsConfig;
 import io.trino.plugin.jdbc.credential.CredentialProvider;
 import io.trino.plugin.jdbc.ptf.Query;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 
 import java.sql.SQLException;
 import java.util.Properties;
@@ -55,14 +56,15 @@ protected void setup(Binder binder)
     @Provides
     @Singleton
     @ForBaseJdbc
-    public static ConnectionFactory createConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider, MySqlConfig mySqlConfig)
+    public static ConnectionFactory createConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider, MySqlConfig mySqlConfig, OpenTelemetry openTelemetry)
             throws SQLException
     {
         return new DriverConnectionFactory(
                 new Driver(),
                 config.getConnectionUrl(),
                 getConnectionProperties(mySqlConfig),
-                credentialProvider);
+                credentialProvider,
+                openTelemetry);
     }
 
     public static Properties getConnectionProperties(MySqlConfig mySqlConfig)
@@ -74,11 +76,11 @@ public static Properties getConnectionProperties(MySqlConfig mySqlConfig)
         connectionProperties.setProperty("tinyInt1isBit", "false");
         connectionProperties.setProperty("rewriteBatchedStatements", "true");
 
-        // Try to make MySQL timestamps work (See https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-time-instants.html)
-        // without relying on server time zone (which may be configured to be totally unusable).
-        // TODO (https://github.com/trinodb/trino/issues/15668) rethink how timestamps are mapped. Also, probably worth adding tests
-        //  with MySQL server with a non-UTC system zone.
-        connectionProperties.setProperty("connectionTimeZone", "UTC");
+        // connectionTimeZone = LOCAL means the JDBC driver uses the JVM zone as the session zone
+        // forceConnectionTimeZoneToSession = true means that the server side connection zone is changed to match local JVM zone
+        // https://dev.mysql.com/doc/connector-j/8.1/en/connector-j-time-instants.html (Solution 2b)
+        connectionProperties.setProperty("connectionTimeZone", "LOCAL");
+        connectionProperties.setProperty("forceConnectionTimeZoneToSession", "true");
 
         if (mySqlConfig.isAutoReconnect()) {
             connectionProperties.setProperty("autoReconnect", String.valueOf(mySqlConfig.isAutoReconnect()));
diff --git a/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlConfig.java b/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlConfig.java
index 23d0c928c364..4b32070c7b2c 100644
--- a/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlConfig.java
+++ b/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Min;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlJdbcConfig.java b/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlJdbcConfig.java
index ecd13f188938..489fc593be7f 100644
--- a/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlJdbcConfig.java
+++ b/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlJdbcConfig.java
@@ -17,8 +17,7 @@
 import com.mysql.cj.exceptions.CJException;
 import com.mysql.cj.jdbc.Driver;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
-
-import javax.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.AssertTrue;
 
 import java.sql.SQLException;
 
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlConnectorTest.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlConnectorTest.java
index e67c8088d2a0..679dd31e4c40 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlConnectorTest.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlConnectorTest.java
@@ -13,25 +13,32 @@
  */
 package io.trino.plugin.mysql;
 
+import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
 import io.trino.plugin.jdbc.BaseJdbcConnectorTest;
+import io.trino.plugin.jdbc.JdbcTableHandle;
+import io.trino.spi.predicate.TupleDomain;
 import io.trino.sql.planner.plan.FilterNode;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.TestingConnectorBehavior;
 import io.trino.testing.sql.SqlExecutor;
 import io.trino.testing.sql.TestTable;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.time.LocalDate;
+import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
 
 import static com.google.common.base.Strings.nullToEmpty;
 import static io.trino.spi.connector.ConnectorMetadata.MODIFYING_ROWS_MESSAGE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
+import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
 import static io.trino.testing.MaterializedResult.resultBuilder;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
@@ -48,46 +55,30 @@ public abstract class BaseMySqlConnectorTest
 {
     protected TestingMySqlServer mySqlServer;
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY:
-            case SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY:
-                return false;
-
-            case SUPPORTS_AGGREGATION_PUSHDOWN_STDDEV:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_VARIANCE:
-                return true;
-
-            case SUPPORTS_JOIN_PUSHDOWN:
-                return true;
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN:
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM:
-                return false;
-
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN_WITH_COMMENT:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-            case SUPPORTS_NEGATIVE_DATE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_AGGREGATION_PUSHDOWN,
+                    SUPPORTS_JOIN_PUSHDOWN -> true;
+            case SUPPORTS_ADD_COLUMN_WITH_COMMENT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_CORRELATION,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_COVARIANCE,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_REGRESSION,
+                    SUPPORTS_ARRAY,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN,
+                    SUPPORTS_NEGATIVE_DATE,
+                    SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY,
+                    SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -112,6 +103,7 @@ protected TestTable createTableWithUnsupportedColumn()
                 "(one bigint, two decimal(50,0), three varchar(10))");
     }
 
+    @org.junit.jupiter.api.Test
     @Override
     public void testShowColumns()
     {
@@ -128,9 +120,19 @@ protected boolean isColumnNameRejected(Exception exception, String columnName, b
     protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMappingTestSetup dataMappingTestSetup)
     {
         String typeName = dataMappingTestSetup.getTrinoTypeName();
-        if (typeName.equals("timestamp(3) with time zone") ||
-                typeName.equals("timestamp(6) with time zone")) {
-            return Optional.of(dataMappingTestSetup.asUnsupported());
+
+        // MySQL TIMESTAMP has a range of '1970-01-01 00:00:01' UTC to '2038-01-19 03:14:07' UTC.
+        if (typeName.equals("timestamp(3) with time zone")) {
+            if (dataMappingTestSetup.getSampleValueLiteral().contains("1969")) {
+                return Optional.of(new DataMappingTestSetup("timestamp(3) with time zone", "TIMESTAMP '1970-01-01 15:03:00.123 +01:00'", "TIMESTAMP '1970-01-31 17:03:00.456 +01:00'"));
+            }
+            return Optional.of(new DataMappingTestSetup("timestamp(3) with time zone", "TIMESTAMP '2020-02-12 15:03:00 +01:00'", "TIMESTAMP '2038-01-19 03:14:07.000 UTC'"));
+        }
+        else if (typeName.equals("timestamp(6) with time zone")) {
+            if (dataMappingTestSetup.getSampleValueLiteral().contains("1969")) {
+                return Optional.of(new DataMappingTestSetup("timestamp(6) with time zone", "TIMESTAMP '1970-01-01 15:03:00.123456 +01:00'", "TIMESTAMP '1970-01-31 17:03:00.123456 +01:00'"));
+            }
+            return Optional.of(new DataMappingTestSetup("timestamp(6) with time zone", "TIMESTAMP '2020-02-12 15:03:00 +01:00'", "TIMESTAMP '2038-01-19 03:14:07.000 UTC'"));
         }
 
         if (typeName.equals("timestamp")) {
@@ -260,9 +262,72 @@ public void testColumnComment()
         assertUpdate("DROP TABLE test_column_comment");
     }
 
+    @Override
+    public void testAddNotNullColumn()
+    {
+        assertThatThrownBy(super::testAddNotNullColumn)
+                .isInstanceOf(AssertionError.class)
+                .hasMessage("Should fail to add not null column without a default value to a non-empty table");
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_nn_col", "(a_varchar varchar)")) {
+            String tableName = table.getName();
+
+            assertUpdate("INSERT INTO " + tableName + " VALUES ('a')", 1);
+            assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN b_varchar varchar NOT NULL");
+            assertThat(query("TABLE " + tableName))
+                    .skippingTypesCheck()
+                    // MySQL adds implicit default value of '' for b_varchar
+                    .matches("VALUES ('a', '')");
+        }
+    }
+
+    @Test
+    public void testLikePredicatePushdownWithCollation()
+    {
+        try (TestTable table = new TestTable(
+                onRemoteDatabase(),
+                "tpch.test_like_predicate_pushdown",
+                "(id integer, a_varchar varchar(1) CHARACTER SET utf8 COLLATE utf8_bin)",
+                List.of(
+                        "1, 'A'",
+                        "2, 'a'",
+                        "3, 'B'",
+                        "4, 'ą'",
+                        "5, 'Ą'"))) {
+            assertThat(query("SELECT id FROM " + table.getName() + " WHERE a_varchar LIKE '%A%'"))
+                    .isFullyPushedDown();
+            assertThat(query("SELECT id FROM " + table.getName() + " WHERE a_varchar LIKE '%ą%'"))
+                    .isFullyPushedDown();
+        }
+    }
+
+    @Test
+    public void testLikeWithEscapePredicatePushdownWithCollation()
+    {
+        try (TestTable table = new TestTable(
+                onRemoteDatabase(),
+                "tpch.test_like_with_escape_predicate_pushdown",
+                "(id integer, a_varchar varchar(4) CHARACTER SET utf8 COLLATE utf8_bin)",
+                List.of(
+                        "1, 'A%b'",
+                        "2, 'Asth'",
+                        "3, 'ą%b'",
+                        "4, 'ąsth'"))) {
+            assertThat(query("SELECT id FROM " + table.getName() + " WHERE a_varchar LIKE '%A\\%%' ESCAPE '\\'"))
+                    .isFullyPushedDown();
+            assertThat(query("SELECT id FROM " + table.getName() + " WHERE a_varchar LIKE '%ą\\%%' ESCAPE '\\'"))
+                    .isFullyPushedDown();
+        }
+    }
+
     @Test
     public void testPredicatePushdown()
     {
+        // varchar like
+        assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE name LIKE '%ROM%'"))
+                .matches("VALUES (BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar(255)))")
+                .isNotFullyPushedDown(FilterNode.class);
+
         // varchar equality
         assertThat(query("SELECT regionkey, nationkey, name FROM nation WHERE name = 'ROMANIA'"))
                 .matches("VALUES (BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar(255)))")
@@ -314,6 +379,107 @@ public void testPredicatePushdown()
                 .isFullyPushedDown();
     }
 
+    @Test(dataProvider = "charsetAndCollation")
+    public void testPredicatePushdownWithCollationView(String charset, String collation)
+    {
+        onRemoteDatabase().execute(format("CREATE OR REPLACE VIEW tpch.test_view_pushdown AS SELECT regionkey, nationkey, CONVERT(name USING %s) COLLATE %s AS name FROM tpch.nation;", charset, collation));
+        testNationCollationQueries("test_view_pushdown");
+        onRemoteDatabase().execute("DROP VIEW tpch.test_view_pushdown");
+    }
+
+    @Test(dataProvider = "charsetAndCollation")
+    public void testPredicatePushdownWithCollation(String charset, String collation)
+    {
+        try (TestTable testTable = new TestTable(
+                onRemoteDatabase(),
+                "tpch.nation_collate",
+                format("AS SELECT regionkey, nationkey, CONVERT(name USING %s) COLLATE %s AS name FROM tpch.nation", charset, collation))) {
+            testNationCollationQueries(testTable.getName());
+        }
+    }
+
+    private void testNationCollationQueries(String objectName)
+    {
+        // varchar like
+        assertThat(query(format("SELECT regionkey, nationkey, name FROM %s WHERE name LIKE '%%ROM%%'", objectName)))
+                .isFullyPushedDown();
+
+        // varchar inequality
+        assertThat(query(format("SELECT regionkey, nationkey, name FROM %s WHERE name != 'ROMANIA' AND name != 'ALGERIA'", objectName)))
+                .isFullyPushedDown();
+
+        // varchar equality
+        assertThat(query(format("SELECT regionkey, nationkey, name FROM %s WHERE name = 'ROMANIA'", objectName)))
+                .isFullyPushedDown();
+
+        // varchar range
+        assertThat(query(format("SELECT regionkey, nationkey, name FROM %s WHERE name BETWEEN 'POLAND' AND 'RPA'", objectName)))
+                .matches("VALUES (BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar(255)))")
+                // We are not supporting range predicate pushdown for varchars
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // varchar NOT IN
+        assertThat(query(format("SELECT regionkey, nationkey, name FROM %s WHERE name NOT IN ('POLAND', 'ROMANIA', 'VIETNAM')", objectName)))
+                .isFullyPushedDown();
+
+        // varchar NOT IN with small compaction threshold
+        assertThat(query(
+                Session.builder(getSession())
+                        .setCatalogSessionProperty("mysql", "domain_compaction_threshold", "1")
+                        .build(),
+                format("SELECT regionkey, nationkey, name FROM %s WHERE name NOT IN ('POLAND', 'ROMANIA', 'VIETNAM')", objectName)))
+                // no pushdown because it was converted to range predicate
+                .isNotFullyPushedDown(
+                        node(
+                                FilterNode.class,
+                                // verify that no constraint is applied by the connector
+                                tableScan(
+                                        tableHandle -> ((JdbcTableHandle) tableHandle).getConstraint().isAll(),
+                                        TupleDomain.all(),
+                                        ImmutableMap.of())));
+
+        // varchar IN without domain compaction
+        assertThat(query(format("SELECT regionkey, nationkey, name FROM %s WHERE name IN ('POLAND', 'ROMANIA', 'VIETNAM')", objectName)))
+                .matches("VALUES " +
+                        "(BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar(255))), " +
+                        "(BIGINT '2', BIGINT '21', CAST('VIETNAM' AS varchar(255)))")
+                .isFullyPushedDown();
+
+        // varchar IN with small compaction threshold
+        assertThat(query(
+                Session.builder(getSession())
+                        .setCatalogSessionProperty("mysql", "domain_compaction_threshold", "1")
+                        .build(),
+                format("SELECT regionkey, nationkey, name FROM %s WHERE name IN ('POLAND', 'ROMANIA', 'VIETNAM')", objectName)))
+                .matches("VALUES " +
+                        "(BIGINT '3', BIGINT '19', CAST('ROMANIA' AS varchar(255))), " +
+                        "(BIGINT '2', BIGINT '21', CAST('VIETNAM' AS varchar(255)))")
+                // no pushdown because it was converted to range predicate
+                .isNotFullyPushedDown(
+                        node(
+                                FilterNode.class,
+                                // verify that no constraint is applied by the connector
+                                tableScan(
+                                        tableHandle -> ((JdbcTableHandle) tableHandle).getConstraint().isAll(),
+                                        TupleDomain.all(),
+                                        ImmutableMap.of())));
+        // varchar different case
+        assertThat(query(format("SELECT regionkey, nationkey, name FROM %s WHERE name = 'romania'", objectName)))
+                .returnsEmptyResult()
+                .isFullyPushedDown();
+
+        Session joinPushdownEnabled = joinPushdownEnabled(getSession());
+        // join on varchar columns
+        assertThat(query(joinPushdownEnabled, format("SELECT n.name, n2.regionkey FROM %1$s n JOIN %1$s n2 ON n.name = n2.name", objectName)))
+                .joinIsNotFullyPushedDown();
+    }
+
+    @DataProvider
+    public static Object[][] charsetAndCollation()
+    {
+        return new Object[][] {{"latin1", "latin1_general_cs"}, {"utf8", "utf8_bin"}};
+    }
+
     /**
      * This test helps to tune TupleDomain simplification threshold.
      */
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlFailureRecoveryTest.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlFailureRecoveryTest.java
index 21a44959c612..8ed01bb00bec 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlFailureRecoveryTest.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlFailureRecoveryTest.java
@@ -19,11 +19,14 @@
 import io.trino.plugin.jdbc.BaseJdbcFailureRecoveryTest;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
+import org.testng.SkipException;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import static io.trino.plugin.mysql.MySqlQueryRunner.createMySqlQueryRunner;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public abstract class BaseMySqlFailureRecoveryTest
         extends BaseJdbcFailureRecoveryTest
@@ -52,4 +55,26 @@ protected QueryRunner createQueryRunner(
                             "exchange.base-directories", System.getProperty("java.io.tmpdir") + "/trino-local-file-system-exchange-manager"));
                 });
     }
+
+    @Override
+    protected void testUpdateWithSubquery()
+    {
+        assertThatThrownBy(super::testUpdateWithSubquery).hasMessageContaining("Unexpected Join over for-update table scan");
+        throw new SkipException("skipped");
+    }
+
+    @Override
+    protected void testUpdate()
+    {
+        // This simple update on JDBC ends up as a very simple, single-fragment, coordinator-only plan,
+        // which has no ability to recover from errors. This test simply verifies that's still the case.
+        Optional<String> setupQuery = Optional.of("CREATE TABLE <table> AS SELECT * FROM orders");
+        String testQuery = "UPDATE <table> SET shippriority = 101 WHERE custkey = 1";
+        Optional<String> cleanupQuery = Optional.of("DROP TABLE <table>");
+
+        assertThatQuery(testQuery)
+                .withSetupQuery(setupQuery)
+                .withCleanupQuery(cleanupQuery)
+                .isCoordinatorOnly();
+    }
 }
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlTableStatisticsIndexStatisticsTest.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlTableStatisticsIndexStatisticsTest.java
index 81662c8d7a58..1773f945d134 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlTableStatisticsIndexStatisticsTest.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlTableStatisticsIndexStatisticsTest.java
@@ -14,9 +14,10 @@
 package io.trino.plugin.mysql;
 
 import io.trino.testing.MaterializedRow;
-import org.testng.SkipException;
+import org.junit.jupiter.api.Test;
 
 import static java.lang.String.format;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 public abstract class BaseMySqlTableStatisticsIndexStatisticsTest
         extends BaseTestMySqlTableStatisticsTest
@@ -42,73 +43,83 @@ protected void gatherStats(String tableName)
         executeInMysql("ANALYZE TABLE " + tableName.replace("\"", "`"));
     }
 
+    @Test
     @Override
     public void testStatsWithPredicatePushdownWithStatsPrecalculationDisabled()
     {
         // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MySQL, with permissive approximate assertions
-        throw new SkipException("Test to be implemented");
+        abort("Test to be implemented");
     }
 
+    @Test
     @Override
     public void testStatsWithPredicatePushdown()
     {
         // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MySQL, with permissive approximate assertions
-        throw new SkipException("Test to be implemented");
+        abort("Test to be implemented");
     }
 
+    @Test
     @Override
     public void testStatsWithVarcharPredicatePushdown()
     {
         // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MySQL, with permissive approximate assertions
-        throw new SkipException("Test to be implemented");
+        abort("Test to be implemented");
     }
 
+    @Test
     @Override
     public void testStatsWithLimitPushdown()
     {
         // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MySQL, with permissive approximate assertions
-        throw new SkipException("Test to be implemented");
+        abort("Test to be implemented");
     }
 
+    @Test
     @Override
     public void testStatsWithTopNPushdown()
     {
         // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MySQL, with permissive approximate assertions
-        throw new SkipException("Test to be implemented");
+        abort("Test to be implemented");
     }
 
+    @Test
     @Override
     public void testStatsWithDistinctPushdown()
     {
         // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MySQL, with permissive approximate assertions
-        throw new SkipException("Test to be implemented");
+        abort("Test to be implemented");
     }
 
+    @Test
     @Override
     public void testStatsWithDistinctLimitPushdown()
     {
         // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MySQL, with permissive approximate assertions
-        throw new SkipException("Test to be implemented");
+        abort("Test to be implemented");
     }
 
+    @Test
     @Override
     public void testStatsWithAggregationPushdown()
     {
         // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MySQL, with permissive approximate assertions
-        throw new SkipException("Test to be implemented");
+        abort("Test to be implemented");
     }
 
+    @Test
     @Override
     public void testStatsWithSimpleJoinPushdown()
     {
         // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MySQL, with permissive approximate assertions
-        throw new SkipException("Test to be implemented");
+        abort("Test to be implemented");
     }
 
+    @Test
     @Override
     public void testStatsWithJoinPushdown()
     {
         // TODO (https://github.com/trinodb/trino/issues/11664) implement the test for MySQL, with permissive approximate assertions
-        throw new SkipException("Test to be implemented");
+        abort("Test to be implemented");
     }
 }
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseTestMySqlTableStatisticsTest.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseTestMySqlTableStatisticsTest.java
index 1d24da6fb2f6..16c38585aa9f 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseTestMySqlTableStatisticsTest.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseTestMySqlTableStatisticsTest.java
@@ -20,10 +20,7 @@
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.TestTable;
 import org.assertj.core.api.AbstractDoubleAssert;
-import org.jdbi.v3.core.Handle;
-import org.jdbi.v3.core.Jdbi;
-import org.testng.SkipException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.List;
@@ -44,6 +41,7 @@
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.withinPercentage;
+import static org.junit.jupiter.api.Assumptions.abort;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
@@ -170,7 +168,7 @@ public void testAllNulls()
                 }
                 else {
                     assertNotNull(row.getField(2), "NDV for " + columnName);
-                    assertThat(((Number) row.getField(2)).doubleValue()).as("NDV for " + columnName).isBetween(0.0, 2.0);
+                    assertThat((Double) row.getField(2)).as("NDV for " + columnName).isBetween(0.0, 2.0);
                     assertEquals(row.getField(3), nullFractionToExpected.apply(1.0), "null fraction for " + columnName);
                 }
 
@@ -228,14 +226,14 @@ public void testNullsFraction()
     @Test
     public void testAverageColumnLength()
     {
-        throw new SkipException("MySQL connector does not report average column length");
+        abort("MySQL connector does not report average column length");
     }
 
     @Override
     @Test
     public void testPartitionedTable()
     {
-        throw new SkipException("Not implemented"); // TODO
+        abort("Not implemented"); // TODO
     }
 
     @Override
@@ -264,12 +262,11 @@ public void testView()
     @Test
     public void testMaterializedView()
     {
-        throw new SkipException(""); // TODO is there a concept like materialized view in MySQL?
+        abort(""); // TODO is there a concept like materialized view in MySQL?
     }
 
     @Override
-    @Test(dataProvider = "testCaseColumnNamesDataProvider")
-    public void testCaseColumnNames(String tableName)
+    protected void testCaseColumnNames(String tableName)
     {
         executeInMysql(("" +
                 "CREATE TABLE " + tableName + " " +
@@ -347,10 +344,7 @@ public void testNumericCornerCases()
 
     protected void executeInMysql(String sql)
     {
-        try (Handle handle = Jdbi.open(() -> mysqlServer.createConnection())) {
-            handle.execute("USE tpch");
-            handle.execute(sql);
-        }
+        mysqlServer.execute(sql);
     }
 
     protected void assertColumnStats(MaterializedResult statsResult, Map<String, Integer> columnNdvs)
@@ -430,7 +424,7 @@ protected static double getTableCardinalityFromStats(MaterializedResult statsRes
         assertNull(lastRow.getField(6));
         assertEquals(lastRow.getFieldCount(), 7);
         assertNotNull(lastRow.getField(4));
-        return ((Number) lastRow.getField(4)).doubleValue();
+        return (Double) lastRow.getField(4);
     }
 
     protected static class MapBuilder<K, V>
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestCredentialPassthrough.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestCredentialPassthrough.java
index 88632325b3b8..c77ddb8f24af 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestCredentialPassthrough.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestCredentialPassthrough.java
@@ -18,15 +18,18 @@
 import io.trino.spi.security.Identity;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Map;
 
 import static io.airlift.testing.Closeables.closeAllSuppress;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestCredentialPassthrough
 {
     private TestingMySqlServer mySqlServer;
@@ -38,7 +41,7 @@ public void testCredentialPassthrough()
         queryRunner.execute(getSession(mySqlServer), "CREATE TABLE test_create (a bigint, b double, c varchar)");
     }
 
-    @BeforeClass
+    @BeforeAll
     public void createQueryRunner()
             throws Exception
     {
@@ -59,7 +62,7 @@ public void createQueryRunner()
         }
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public final void destroy()
     {
         queryRunner.close();
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlAutomaticJoinPushdown.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlAutomaticJoinPushdown.java
index 3e21ce44d9fc..60a625d9949d 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlAutomaticJoinPushdown.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlAutomaticJoinPushdown.java
@@ -18,12 +18,11 @@
 import io.trino.plugin.jdbc.BaseAutomaticJoinPushdownTest;
 import io.trino.testing.MaterializedRow;
 import io.trino.testing.QueryRunner;
-import org.jdbi.v3.core.Handle;
-import org.jdbi.v3.core.Jdbi;
-import org.testng.SkipException;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.mysql.MySqlQueryRunner.createMySqlQueryRunner;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 public class TestMySqlAutomaticJoinPushdown
         extends BaseAutomaticJoinPushdownTest
@@ -48,10 +47,11 @@ protected QueryRunner createQueryRunner()
                 ImmutableList.of());
     }
 
+    @Test
     @Override
     public void testJoinPushdownWithEmptyStatsInitially()
     {
-        throw new SkipException("MySQL statistics are automatically collected");
+        abort("MySQL statistics are automatically collected");
     }
 
     @Override
@@ -71,9 +71,6 @@ protected void gatherStats(String tableName)
 
     protected void onRemoteDatabase(String sql)
     {
-        try (Handle handle = Jdbi.open(() -> mySqlServer.createConnection())) {
-            handle.execute("USE tpch");
-            handle.execute(sql);
-        }
+        mySqlServer.execute(sql);
     }
 }
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlCaseInsensitiveMapping.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlCaseInsensitiveMapping.java
index 93580c98cb82..841112ebf187 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlCaseInsensitiveMapping.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlCaseInsensitiveMapping.java
@@ -18,18 +18,17 @@
 import io.trino.plugin.jdbc.BaseCaseInsensitiveMappingTest;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.SqlExecutor;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
 
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.REFRESH_PERIOD_DURATION;
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.REFRESH_PERIOD_DURATION;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
 import static io.trino.plugin.mysql.MySqlQueryRunner.createMySqlQueryRunner;
 import static java.util.Objects.requireNonNull;
 
 // With case-insensitive-name-matching enabled colliding schema/table names are considered as errors.
 // Some tests here create colliding names which can cause any other concurrent test to fail.
-@Test(singleThreaded = true)
 public class TestMySqlCaseInsensitiveMapping
         extends BaseCaseInsensitiveMappingTest
 {
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlClient.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlClient.java
index ec564f10ea5d..c080db369187 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlClient.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlClient.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.mysql;
 
+import io.trino.plugin.base.mapping.DefaultIdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ColumnMapping;
 import io.trino.plugin.jdbc.DefaultQueryBuilder;
@@ -22,7 +23,6 @@
 import io.trino.plugin.jdbc.JdbcStatisticsConfig;
 import io.trino.plugin.jdbc.JdbcTypeHandle;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.DefaultIdentifierMapping;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.expression.ConnectorExpression;
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlLegacyConnectorTest.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlLegacyConnectorTest.java
index 1dc666c9e522..91f6b197f615 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlLegacyConnectorTest.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlLegacyConnectorTest.java
@@ -18,7 +18,6 @@
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.ExchangeNode;
 import io.trino.sql.planner.plan.MarkDistinctNode;
-import io.trino.sql.planner.plan.ProjectNode;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.TestTable;
 import org.testng.annotations.Test;
@@ -122,7 +121,7 @@ public void testCountDistinctWithStringTypes()
 
             assertThat(query("SELECT count(DISTINCT t_char), count(DISTINCT t_varchar) FROM " + testTable.getName()))
                     .matches("VALUES (BIGINT '7', BIGINT '7')")
-                    .isNotFullyPushedDown(MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class, ProjectNode.class);
+                    .isNotFullyPushedDown(MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class);
         }
     }
 
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTableStatisticsMySql8Histograms.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTableStatisticsMySql8Histograms.java
index 017270fe17af..2ee898ef6bbc 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTableStatisticsMySql8Histograms.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTableStatisticsMySql8Histograms.java
@@ -15,8 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.sql.TestTable;
-import org.testng.SkipException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.function.Function;
@@ -26,6 +25,7 @@
 import static io.trino.testing.sql.TestTable.fromColumns;
 import static java.lang.String.format;
 import static java.lang.String.join;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 public class TestMySqlTableStatisticsMySql8Histograms
         extends BaseTestMySqlTableStatisticsTest
@@ -82,10 +82,11 @@ public void testNumericCornerCases()
         }
     }
 
+    @Test
     @Override
     public void testNotAnalyzed()
     {
-        throw new SkipException("MySql8 automatically calculates stats - https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_stats_auto_recalc");
+        abort("MySql8 automatically calculates stats - https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_stats_auto_recalc");
     }
 
     @Override
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTableStatisticsMySql8IndexStatistics.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTableStatisticsMySql8IndexStatistics.java
index 4b18806bc0a4..67d5570736d8 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTableStatisticsMySql8IndexStatistics.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTableStatisticsMySql8IndexStatistics.java
@@ -13,7 +13,9 @@
  */
 package io.trino.plugin.mysql;
 
-import org.testng.SkipException;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assumptions.abort;
 
 public class TestMySqlTableStatisticsMySql8IndexStatistics
         extends BaseMySqlTableStatisticsIndexStatisticsTest
@@ -23,9 +25,10 @@ public TestMySqlTableStatisticsMySql8IndexStatistics()
         super("mysql:8.0.30");
     }
 
+    @Test
     @Override
     public void testNotAnalyzed()
     {
-        throw new SkipException("MySql8 automatically calculates stats - https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_stats_auto_recalc");
+        abort("MySql8 automatically calculates stats - https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_stats_auto_recalc");
     }
 }
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTimeMappingsWithServerTimeZone.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTimeMappingsWithServerTimeZone.java
new file mode 100644
index 000000000000..af7844f723ff
--- /dev/null
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTimeMappingsWithServerTimeZone.java
@@ -0,0 +1,688 @@
+/*
+ * Licensed 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 io.trino.plugin.mysql;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.trino.Session;
+import io.trino.spi.type.TimeZoneKey;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.TestingSession;
+import io.trino.testing.datatype.CreateAndInsertDataSetup;
+import io.trino.testing.datatype.CreateAsSelectDataSetup;
+import io.trino.testing.datatype.DataSetup;
+import io.trino.testing.datatype.SqlDataTypeTest;
+import io.trino.testing.sql.TestTable;
+import io.trino.testing.sql.TrinoSqlExecutor;
+import org.intellij.lang.annotations.Language;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.time.ZoneId;
+import java.util.Map;
+
+import static io.trino.plugin.mysql.MySqlQueryRunner.createMySqlQueryRunner;
+import static io.trino.spi.type.DateType.DATE;
+import static io.trino.spi.type.TimeType.createTimeType;
+import static io.trino.spi.type.TimestampType.createTimestampType;
+import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
+import static java.time.ZoneOffset.UTC;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+/**
+ * Default MySQL time zone is set to UTC. This is to test the date and time type mappings when the server has a different time zone.
+ */
+public class TestMySqlTimeMappingsWithServerTimeZone
+        extends AbstractTestQueryFramework
+{
+    private TestingMySqlServer mySqlServer;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        mySqlServer = closeAfterClass(new TestingMySqlServer(ZoneId.of("Pacific/Apia")));
+        return createMySqlQueryRunner(mySqlServer, ImmutableMap.of(), ImmutableMap.of(), ImmutableList.of());
+    }
+
+    @Test(dataProvider = "sessionZonesDataProvider")
+    public void testDate(ZoneId sessionZone)
+    {
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        SqlDataTypeTest.create()
+                .addRoundTrip("date", "DATE '0001-01-01'", DATE, "DATE '0001-01-01'")
+                .addRoundTrip("date", "DATE '1582-10-04'", DATE, "DATE '1582-10-04'") // before julian->gregorian switch
+                .addRoundTrip("date", "DATE '1582-10-05'", DATE, "DATE '1582-10-05'") // begin julian->gregorian switch
+                .addRoundTrip("date", "DATE '1582-10-14'", DATE, "DATE '1582-10-14'") // end julian->gregorian switch
+                .addRoundTrip("date", "DATE '1952-04-03'", DATE, "DATE '1952-04-03'") // before epoch
+                .addRoundTrip("date", "DATE '1970-01-01'", DATE, "DATE '1970-01-01'")
+                .addRoundTrip("date", "DATE '1970-02-03'", DATE, "DATE '1970-02-03'")
+                .addRoundTrip("date", "DATE '2017-07-01'", DATE, "DATE '2017-07-01'") // summer on northern hemisphere (possible DST)
+                .addRoundTrip("date", "DATE '2017-01-01'", DATE, "DATE '2017-01-01'") // winter on northern hemisphere (possible DST on southern hemisphere)
+                .addRoundTrip("date", "DATE '1983-04-01'", DATE, "DATE '1983-04-01'")
+                .addRoundTrip("date", "DATE '1983-10-01'", DATE, "DATE '1983-10-01'")
+                .addRoundTrip("date", "NULL", DATE, "CAST(NULL AS DATE)")
+                .execute(getQueryRunner(), session, mysqlCreateAndInsert("tpch.test_date"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_date"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_date"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_date"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_date"));
+    }
+
+    @Test(dataProvider = "sessionZonesDataProvider")
+    public void testTimeFromMySql(ZoneId sessionZone)
+    {
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        SqlDataTypeTest.create()
+                // default precision in MySQL is 0
+                .addRoundTrip("TIME", "TIME '00:00:00'", createTimeType(0), "TIME '00:00:00'")
+                .addRoundTrip("TIME", "TIME '12:34:56'", createTimeType(0), "TIME '12:34:56'")
+                .addRoundTrip("TIME", "TIME '23:59:59'", createTimeType(0), "TIME '23:59:59'")
+
+                // maximal value for a precision
+                .addRoundTrip("TIME(1)", "TIME '23:59:59.9'", createTimeType(1), "TIME '23:59:59.9'")
+                .addRoundTrip("TIME(2)", "TIME '23:59:59.99'", createTimeType(2), "TIME '23:59:59.99'")
+                .addRoundTrip("TIME(3)", "TIME '23:59:59.999'", createTimeType(3), "TIME '23:59:59.999'")
+                .addRoundTrip("TIME(4)", "TIME '23:59:59.9999'", createTimeType(4), "TIME '23:59:59.9999'")
+                .addRoundTrip("TIME(5)", "TIME '23:59:59.99999'", createTimeType(5), "TIME '23:59:59.99999'")
+                .addRoundTrip("TIME(6)", "TIME '23:59:59.999999'", createTimeType(6), "TIME '23:59:59.999999'")
+
+                .addRoundTrip("TIME", "NULL", createTimeType(0), "CAST(NULL AS TIME(0))")
+                .execute(getQueryRunner(), session, mysqlCreateAndInsert("tpch.test_time"));
+    }
+
+    @Test(dataProvider = "sessionZonesDataProvider")
+    public void testTimeFromTrino(ZoneId sessionZone)
+    {
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        SqlDataTypeTest.create()
+                // default precision in Trino is 3
+                .addRoundTrip("TIME", "TIME '00:00:00'", createTimeType(3), "TIME '00:00:00.000'")
+                .addRoundTrip("TIME", "TIME '12:34:56.123'", createTimeType(3), "TIME '12:34:56.123'")
+                .addRoundTrip("TIME", "TIME '23:59:59.999'", createTimeType(3), "TIME '23:59:59.999'")
+
+                // maximal value for a precision
+                .addRoundTrip("TIME", "TIME '23:59:59'", createTimeType(3), "TIME '23:59:59.000'")
+                .addRoundTrip("TIME(1)", "TIME '23:59:59.9'", createTimeType(1), "TIME '23:59:59.9'")
+                .addRoundTrip("TIME(2)", "TIME '23:59:59.99'", createTimeType(2), "TIME '23:59:59.99'")
+                .addRoundTrip("TIME(3)", "TIME '23:59:59.999'", createTimeType(3), "TIME '23:59:59.999'")
+                .addRoundTrip("TIME(4)", "TIME '23:59:59.9999'", createTimeType(4), "TIME '23:59:59.9999'")
+                .addRoundTrip("TIME(5)", "TIME '23:59:59.99999'", createTimeType(5), "TIME '23:59:59.99999'")
+                .addRoundTrip("TIME(6)", "TIME '23:59:59.999999'", createTimeType(6), "TIME '23:59:59.999999'")
+
+                // supported precisions
+                .addRoundTrip("TIME '23:59:59.9'", "TIME '23:59:59.9'")
+                .addRoundTrip("TIME '23:59:59.99'", "TIME '23:59:59.99'")
+                .addRoundTrip("TIME '23:59:59.999'", "TIME '23:59:59.999'")
+                .addRoundTrip("TIME '23:59:59.9999'", "TIME '23:59:59.9999'")
+                .addRoundTrip("TIME '23:59:59.99999'", "TIME '23:59:59.99999'")
+                .addRoundTrip("TIME '23:59:59.999999'", "TIME '23:59:59.999999'")
+
+                // round down
+                .addRoundTrip("TIME '00:00:00.0000001'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '00:00:00.000000000001'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '12:34:56.1234561'", "TIME '12:34:56.123456'")
+                .addRoundTrip("TIME '23:59:59.9999994'", "TIME '23:59:59.999999'")
+                .addRoundTrip("TIME '23:59:59.999999499999'", "TIME '23:59:59.999999'")
+
+                // round down, maximal value
+                .addRoundTrip("TIME '00:00:00.0000004'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '00:00:00.00000049'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '00:00:00.000000449'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '00:00:00.0000004449'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '00:00:00.00000044449'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '00:00:00.000000444449'", "TIME '00:00:00.000000'")
+
+                // round up, minimal value
+                .addRoundTrip("TIME '00:00:00.0000005'", "TIME '00:00:00.000001'")
+                .addRoundTrip("TIME '00:00:00.00000050'", "TIME '00:00:00.000001'")
+                .addRoundTrip("TIME '00:00:00.000000500'", "TIME '00:00:00.000001'")
+                .addRoundTrip("TIME '00:00:00.0000005000'", "TIME '00:00:00.000001'")
+                .addRoundTrip("TIME '00:00:00.00000050000'", "TIME '00:00:00.000001'")
+                .addRoundTrip("TIME '00:00:00.000000500000'", "TIME '00:00:00.000001'")
+
+                // round up, maximal value
+                .addRoundTrip("TIME '00:00:00.0000009'", "TIME '00:00:00.000001'")
+                .addRoundTrip("TIME '00:00:00.00000099'", "TIME '00:00:00.000001'")
+                .addRoundTrip("TIME '00:00:00.000000999'", "TIME '00:00:00.000001'")
+                .addRoundTrip("TIME '00:00:00.0000009999'", "TIME '00:00:00.000001'")
+                .addRoundTrip("TIME '00:00:00.00000099999'", "TIME '00:00:00.000001'")
+                .addRoundTrip("TIME '00:00:00.000000999999'", "TIME '00:00:00.000001'")
+
+                // round up to next day, minimal value
+                .addRoundTrip("TIME '23:59:59.9999995'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '23:59:59.99999950'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '23:59:59.999999500'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '23:59:59.9999995000'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '23:59:59.99999950000'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '23:59:59.999999500000'", "TIME '00:00:00.000000'")
+
+                // round up to next day, maximal value
+                .addRoundTrip("TIME '23:59:59.9999999'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '23:59:59.99999999'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '23:59:59.999999999'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '23:59:59.9999999999'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '23:59:59.99999999999'", "TIME '00:00:00.000000'")
+                .addRoundTrip("TIME '23:59:59.999999999999'", "TIME '00:00:00.000000'")
+
+                // null
+                .addRoundTrip("TIME", "NULL", createTimeType(3), "CAST(NULL AS TIME(3))")
+                .addRoundTrip("TIME(1)", "NULL", createTimeType(1), "CAST(NULL AS TIME(1))")
+                .addRoundTrip("TIME(2)", "NULL", createTimeType(2), "CAST(NULL AS TIME(2))")
+                .addRoundTrip("TIME(3)", "NULL", createTimeType(3), "CAST(NULL AS TIME(3))")
+                .addRoundTrip("TIME(4)", "NULL", createTimeType(4), "CAST(NULL AS TIME(4))")
+                .addRoundTrip("TIME(5)", "NULL", createTimeType(5), "CAST(NULL AS TIME(5))")
+                .addRoundTrip("TIME(6)", "NULL", createTimeType(6), "CAST(NULL AS TIME(6))")
+
+                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_time"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_time"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_time"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_time"));
+    }
+
+    /**
+     * Read {@code DATETIME}s inserted by MySQL as Trino {@code TIMESTAMP}s
+     */
+    @Test(dataProvider = "sessionZonesDataProvider")
+    public void testMySqlDatetimeType(ZoneId sessionZone)
+    {
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        SqlDataTypeTest.create()
+                // before epoch
+                .addRoundTrip("datetime(3)", "TIMESTAMP '1958-01-01 13:18:03.123'", createTimestampType(3), "TIMESTAMP '1958-01-01 13:18:03.123'")
+                // after epoch
+                .addRoundTrip("datetime(3)", "TIMESTAMP '2019-03-18 10:01:17.987'", createTimestampType(3), "TIMESTAMP '2019-03-18 10:01:17.987'")
+                // time doubled in JVM zone
+                .addRoundTrip("datetime(3)", "TIMESTAMP '2018-10-28 01:33:17.456'", createTimestampType(3), "TIMESTAMP '2018-10-28 01:33:17.456'")
+                // time double in Vilnius
+                .addRoundTrip("datetime(3)", "TIMESTAMP '2018-10-28 03:33:33.333'", createTimestampType(3), "TIMESTAMP '2018-10-28 03:33:33.333'")
+                // epoch
+                .addRoundTrip("datetime(3)", "TIMESTAMP '1970-01-01 00:00:00.000'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:00:00.000'")
+                .addRoundTrip("datetime(3)", "TIMESTAMP '1970-01-01 00:13:42.000'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:13:42.000'")
+                .addRoundTrip("datetime(3)", "TIMESTAMP '2018-04-01 02:13:55.123'", createTimestampType(3), "TIMESTAMP '2018-04-01 02:13:55.123'")
+                // time gap in Vilnius
+                .addRoundTrip("datetime(3)", "TIMESTAMP '2018-03-25 03:17:17.000'", createTimestampType(3), "TIMESTAMP '2018-03-25 03:17:17.000'")
+                // time gap in Kathmandu
+                .addRoundTrip("datetime(3)", "TIMESTAMP '1986-01-01 00:13:07.000'", createTimestampType(3), "TIMESTAMP '1986-01-01 00:13:07.000'")
+
+                // same as above but with higher precision
+                .addRoundTrip("datetime(6)", "TIMESTAMP '1958-01-01 13:18:03.123456'", createTimestampType(6), "TIMESTAMP '1958-01-01 13:18:03.123456'")
+                .addRoundTrip("datetime(6)", "TIMESTAMP '2019-03-18 10:01:17.987654'", createTimestampType(6), "TIMESTAMP '2019-03-18 10:01:17.987654'")
+                .addRoundTrip("datetime(6)", "TIMESTAMP '2018-10-28 01:33:17.123456'", createTimestampType(6), "TIMESTAMP '2018-10-28 01:33:17.123456'")
+                .addRoundTrip("datetime(6)", "TIMESTAMP '2018-10-28 03:33:33.333333'", createTimestampType(6), "TIMESTAMP '2018-10-28 03:33:33.333333'")
+                .addRoundTrip("datetime(6)", "TIMESTAMP '1970-01-01 00:00:00.000000'", createTimestampType(6), "TIMESTAMP '1970-01-01 00:00:00.000000'")
+                .addRoundTrip("datetime(6)", "TIMESTAMP '1970-01-01 00:13:42.123456'", createTimestampType(6), "TIMESTAMP '1970-01-01 00:13:42.123456'")
+                .addRoundTrip("datetime(6)", "TIMESTAMP '2018-04-01 02:13:55.123456'", createTimestampType(6), "TIMESTAMP '2018-04-01 02:13:55.123456'")
+                .addRoundTrip("datetime(6)", "TIMESTAMP '2018-03-25 03:17:17.456789'", createTimestampType(6), "TIMESTAMP '2018-03-25 03:17:17.456789'")
+                .addRoundTrip("datetime(6)", "TIMESTAMP '1986-01-01 00:13:07.456789'", createTimestampType(6), "TIMESTAMP '1986-01-01 00:13:07.456789'")
+
+                // test arbitrary time for all supported precisions
+                .addRoundTrip("datetime(0)", "TIMESTAMP '1970-01-01 00:00:01'", createTimestampType(0), "TIMESTAMP '1970-01-01 00:00:01'")
+                .addRoundTrip("datetime(1)", "TIMESTAMP '1970-01-01 00:00:01.1'", createTimestampType(1), "TIMESTAMP '1970-01-01 00:00:01.1'")
+                .addRoundTrip("datetime(2)", "TIMESTAMP '1970-01-01 00:00:01.12'", createTimestampType(2), "TIMESTAMP '1970-01-01 00:00:01.12'")
+                .addRoundTrip("datetime(3)", "TIMESTAMP '1970-01-01 00:00:01.123'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:00:01.123'")
+                .addRoundTrip("datetime(4)", "TIMESTAMP '1970-01-01 00:00:01.1234'", createTimestampType(4), "TIMESTAMP '1970-01-01 00:00:01.1234'")
+                .addRoundTrip("datetime(5)", "TIMESTAMP '1970-01-01 00:00:01.12345'", createTimestampType(5), "TIMESTAMP '1970-01-01 00:00:01.12345'")
+                .addRoundTrip("datetime(6)", "TIMESTAMP '1970-01-01 00:00:01.123456'", createTimestampType(6), "TIMESTAMP '1970-01-01 00:00:01.123456'")
+
+                // negative epoch
+                .addRoundTrip("datetime(6)", "TIMESTAMP '1969-12-31 23:59:59.999995'", createTimestampType(6), "TIMESTAMP '1969-12-31 23:59:59.999995'")
+                .addRoundTrip("datetime(6)", "TIMESTAMP '1969-12-31 23:59:59.999949'", createTimestampType(6), "TIMESTAMP '1969-12-31 23:59:59.999949'")
+                .addRoundTrip("datetime(6)", "TIMESTAMP '1969-12-31 23:59:59.999994'", createTimestampType(6), "TIMESTAMP '1969-12-31 23:59:59.999994'")
+
+                // null
+                .addRoundTrip("datetime(0)", "NULL", createTimestampType(0), "CAST(NULL AS TIMESTAMP(0))")
+                .addRoundTrip("datetime(1)", "NULL", createTimestampType(1), "CAST(NULL AS TIMESTAMP(1))")
+                .addRoundTrip("datetime(2)", "NULL", createTimestampType(2), "CAST(NULL AS TIMESTAMP(2))")
+                .addRoundTrip("datetime(3)", "NULL", createTimestampType(3), "CAST(NULL AS TIMESTAMP(3))")
+                .addRoundTrip("datetime(4)", "NULL", createTimestampType(4), "CAST(NULL AS TIMESTAMP(4))")
+                .addRoundTrip("datetime(5)", "NULL", createTimestampType(5), "CAST(NULL AS TIMESTAMP(5))")
+                .addRoundTrip("datetime(6)", "NULL", createTimestampType(6), "CAST(NULL AS TIMESTAMP(6))")
+
+                .execute(getQueryRunner(), session, mysqlCreateAndInsert("tpch.test_datetime"));
+    }
+
+    /**
+     * Read {@code TIMESTAMP}s inserted by MySQL as Trino {@code TIMESTAMP WITH TIME ZONE}s
+     */
+    @Test(dataProvider = "sessionZonesDataProvider")
+    public void testTimestampFromMySql(ZoneId sessionZone)
+    {
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        // Same as above but with inserts from MySQL - i.e. read path
+        // Note the inserted timestamp values are using the server time zone, Pacific/Apia, and the expected timestamps are shifted to UTC time
+        SqlDataTypeTest.create()
+                // after epoch (MySQL's timestamp type doesn't support values <= epoch)
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2019-03-18 10:01:17.987'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2019-03-17 20:01:17.987 UTC'")
+                // time doubled in JVM zone
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-10-28 01:33:17.456'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-10-27 11:33:17.456 UTC'")
+                // time double in Vilnius
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-10-28 03:33:33.333'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-10-27 13:33:33.333 UTC'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:13:42.000'", createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 11:13:42.000 UTC'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-04-01 02:13:55.123'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-03-31 12:13:55.123 UTC'")
+                // time gap in Vilnius
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-03-25 03:17:17.000'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-03-24 13:17:17.000 UTC'")
+                // time gap in Kathmandu
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1986-01-01 00:13:07.000'", createTimestampWithTimeZoneType(3), "TIMESTAMP '1986-01-01 11:13:07.000 UTC'")
+
+                // same as above but with higher precision
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2019-03-18 10:01:17.987654'", createTimestampWithTimeZoneType(6), "TIMESTAMP '2019-03-17 20:01:17.987654 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-10-28 01:33:17.456789'", createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-10-27 11:33:17.456789 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-10-28 03:33:33.333333'", createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-10-27 13:33:33.333333 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '1970-01-01 00:13:42.000000'", createTimestampWithTimeZoneType(6), "TIMESTAMP '1970-01-01 11:13:42.000000 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-04-01 02:13:55.123456'", createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-03-31 12:13:55.123456 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-03-25 03:17:17.000000'", createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-03-24 13:17:17.000000 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '1986-01-01 00:13:07.000000'", createTimestampWithTimeZoneType(6), "TIMESTAMP '1986-01-01 11:13:07.000000 UTC'")
+
+                // test arbitrary time for all supported precisions
+                .addRoundTrip("timestamp(0)", "TIMESTAMP '1970-01-01 00:00:01'", createTimestampWithTimeZoneType(0), "TIMESTAMP '1970-01-01 11:00:01 UTC'")
+                .addRoundTrip("timestamp(1)", "TIMESTAMP '1970-01-01 00:00:01.1'", createTimestampWithTimeZoneType(1), "TIMESTAMP '1970-01-01 11:00:01.1 UTC'")
+                .addRoundTrip("timestamp(1)", "TIMESTAMP '1970-01-01 00:00:01.9'", createTimestampWithTimeZoneType(1), "TIMESTAMP '1970-01-01 11:00:01.9 UTC'")
+                .addRoundTrip("timestamp(2)", "TIMESTAMP '1970-01-01 00:00:01.12'", createTimestampWithTimeZoneType(2), "TIMESTAMP '1970-01-01 11:00:01.12 UTC'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:00:01.123'", createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 11:00:01.123 UTC'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:00:01.999'", createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 11:00:01.999 UTC'")
+                .addRoundTrip("timestamp(4)", "TIMESTAMP '1970-01-01 00:00:01.1234'", createTimestampWithTimeZoneType(4), "TIMESTAMP '1970-01-01 11:00:01.1234 UTC'")
+                .addRoundTrip("timestamp(5)", "TIMESTAMP '1970-01-01 00:00:01.12345'", createTimestampWithTimeZoneType(5), "TIMESTAMP '1970-01-01 11:00:01.12345 UTC'")
+                .addRoundTrip("timestamp(1)", "TIMESTAMP '2020-09-27 12:34:56.1'", createTimestampWithTimeZoneType(1), "TIMESTAMP '2020-09-26 22:34:56.1 UTC'")
+                .addRoundTrip("timestamp(1)", "TIMESTAMP '2020-09-27 12:34:56.9'", createTimestampWithTimeZoneType(1), "TIMESTAMP '2020-09-26 22:34:56.9 UTC'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2020-09-27 12:34:56.123'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2020-09-26 22:34:56.123 UTC'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2020-09-27 12:34:56.999'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2020-09-26 22:34:56.999 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2020-09-27 12:34:56.123456'", createTimestampWithTimeZoneType(6), "TIMESTAMP '2020-09-26 22:34:56.123456 UTC'")
+
+                .execute(getQueryRunner(), session, mysqlCreateAndInsert("tpch.test_timestamp"));
+    }
+
+    @Test(dataProvider = "sessionZonesDataProvider")
+    public void testTimestampFromTrino(ZoneId sessionZone)
+    {
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        SqlDataTypeTest.create()
+                // before epoch
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1958-01-01 13:18:03.123'", createTimestampType(3), "TIMESTAMP '1958-01-01 13:18:03.123'")
+                // after epoch
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2019-03-18 10:01:17.987'", createTimestampType(3), "TIMESTAMP '2019-03-18 10:01:17.987'")
+                // time doubled in JVM zone
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-10-28 01:33:17.456'", createTimestampType(3), "TIMESTAMP '2018-10-28 01:33:17.456'")
+                // time double in Vilnius
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-10-28 03:33:33.333'", createTimestampType(3), "TIMESTAMP '2018-10-28 03:33:33.333'")
+                // epoch
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:00:00.000'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:00:00.000'")
+                .addRoundTrip("timestamp(0)", "TIMESTAMP '1970-01-01 00:13:42'", createTimestampType(0), "TIMESTAMP '1970-01-01 00:13:42'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:13:42.000'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:13:42.000'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '1970-01-01 00:13:42.123456'", createTimestampType(6), "TIMESTAMP '1970-01-01 00:13:42.123456'")
+                .addRoundTrip("timestamp(0)", "TIMESTAMP '2018-04-01 02:13:55'", createTimestampType(0), "TIMESTAMP '2018-04-01 02:13:55'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-04-01 02:13:55.123'", createTimestampType(3), "TIMESTAMP '2018-04-01 02:13:55.123'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-04-01 02:13:55.123456'", createTimestampType(6), "TIMESTAMP '2018-04-01 02:13:55.123456'")
+
+                // time gap in Vilnius
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-03-25 03:17:17.123'", createTimestampType(3), "TIMESTAMP '2018-03-25 03:17:17.123'")
+                // time gap in Kathmandu
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1986-01-01 00:13:07.123'", createTimestampType(3), "TIMESTAMP '1986-01-01 00:13:07.123'")
+
+                // null
+                .addRoundTrip("timestamp", "NULL", createTimestampType(3), "CAST(NULL AS TIMESTAMP(3))")
+                .addRoundTrip("timestamp(0)", "NULL", createTimestampType(0), "CAST(NULL AS TIMESTAMP(0))")
+                .addRoundTrip("timestamp(1)", "NULL", createTimestampType(1), "CAST(NULL AS TIMESTAMP(1))")
+                .addRoundTrip("timestamp(2)", "NULL", createTimestampType(2), "CAST(NULL AS TIMESTAMP(2))")
+                .addRoundTrip("timestamp(3)", "NULL", createTimestampType(3), "CAST(NULL AS TIMESTAMP(3))")
+                .addRoundTrip("timestamp(4)", "NULL", createTimestampType(4), "CAST(NULL AS TIMESTAMP(4))")
+                .addRoundTrip("timestamp(5)", "NULL", createTimestampType(5), "CAST(NULL AS TIMESTAMP(5))")
+                .addRoundTrip("timestamp(6)", "NULL", createTimestampType(6), "CAST(NULL AS TIMESTAMP(6))")
+
+                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_timestamp"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_timestamp"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_timestamp"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_timestamp"));
+    }
+
+    /**
+     * Additional test supplementing {@link #testTimestampFromTrino} with values that do not necessarily round-trip, including
+     * timestamp precision higher than expressible with {@code LocalDateTime}.
+     *
+     * @see #testTimestampFromTrino
+     */
+    @Test
+    public void testTimestampCoercion()
+    {
+        SqlDataTypeTest.create()
+
+                // precision 0 ends up as precision 0
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00'", "TIMESTAMP '1970-01-01 00:00:00'")
+
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.1'", "TIMESTAMP '1970-01-01 00:00:00.1'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.9'", "TIMESTAMP '1970-01-01 00:00:00.9'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.123'", "TIMESTAMP '1970-01-01 00:00:00.123'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.123000'", "TIMESTAMP '1970-01-01 00:00:00.123000'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.999'", "TIMESTAMP '1970-01-01 00:00:00.999'")
+                // max supported precision
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.123456'", "TIMESTAMP '1970-01-01 00:00:00.123456'")
+
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.1'", "TIMESTAMP '2020-09-27 12:34:56.1'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.9'", "TIMESTAMP '2020-09-27 12:34:56.9'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.123'", "TIMESTAMP '2020-09-27 12:34:56.123'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.123000'", "TIMESTAMP '2020-09-27 12:34:56.123000'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.999'", "TIMESTAMP '2020-09-27 12:34:56.999'")
+                // max supported precision
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.123456'", "TIMESTAMP '2020-09-27 12:34:56.123456'")
+
+                // round down
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.1234561'", "TIMESTAMP '1970-01-01 00:00:00.123456'")
+
+                // nanoc round up, end result rounds down
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.123456499'", "TIMESTAMP '1970-01-01 00:00:00.123456'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.123456499999'", "TIMESTAMP '1970-01-01 00:00:00.123456'")
+
+                // round up
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.1234565'", "TIMESTAMP '1970-01-01 00:00:00.123457'")
+
+                // max precision
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.111222333444'", "TIMESTAMP '1970-01-01 00:00:00.111222'")
+
+                // round up to next second
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.9999995'", "TIMESTAMP '1970-01-01 00:00:01.000000'")
+
+                // round up to next day
+                .addRoundTrip("TIMESTAMP '1970-01-01 23:59:59.9999995'", "TIMESTAMP '1970-01-02 00:00:00.000000'")
+
+                // negative epoch
+                .addRoundTrip("TIMESTAMP '1969-12-31 23:59:59.9999995'", "TIMESTAMP '1970-01-01 00:00:00.000000'")
+                .addRoundTrip("TIMESTAMP '1969-12-31 23:59:59.999999499999'", "TIMESTAMP '1969-12-31 23:59:59.999999'")
+                .addRoundTrip("TIMESTAMP '1969-12-31 23:59:59.9999994'", "TIMESTAMP '1969-12-31 23:59:59.999999'")
+
+                // CTAS with Trino, where the coercion is done by the connector
+                .execute(getQueryRunner(), trinoCreateAsSelect("test_timestamp_coercion"))
+                // INSERT with Trino, where the coercion is done by the engine
+                .execute(getQueryRunner(), trinoCreateAndInsert("test_timestamp_coercion"));
+    }
+
+    @Test
+    public void testTimestampWithTimeZoneFromTrinoUtc()
+    {
+        ZoneId sessionZone = UTC;
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        SqlDataTypeTest.create()
+                // after epoch (MySQL's timestamp type doesn't support values <= epoch)
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2019-03-18 10:01:17.987 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2019-03-18 10:01:17.987 UTC'")
+                // time doubled in JVM zone
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-10-28 01:33:17.456 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-10-28 01:33:17.456 UTC'")
+                // time double in Vilnius
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-10-28 03:33:33.333 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-10-28 03:33:33.333 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:13:42.000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 00:13:42.000 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-04-01 02:13:55.123 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-04-01 02:13:55.123 UTC'")
+                // time gap in Vilnius
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-03-25 03:17:17.000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-03-25 03:17:17.000 UTC'")
+                // time gap in Kathmandu
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1986-01-01 00:13:07.000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1986-01-01 00:13:07.000 UTC'")
+
+                // same as above but with higher precision
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2019-03-18 10:01:17.987654 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2019-03-18 10:01:17.987654 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-10-28 01:33:17.456789 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-10-28 01:33:17.456789 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-10-28 03:33:33.333333 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-10-28 03:33:33.333333 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:13:42.000000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '1970-01-01 00:13:42.000000 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-04-01 02:13:55.123456 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-04-01 02:13:55.123456 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-03-25 03:17:17.000000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-03-25 03:17:17.000000 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '1986-01-01 00:13:07.000000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '1986-01-01 00:13:07.000000 UTC'")
+
+                // test arbitrary time for all supported precisions
+                .addRoundTrip("timestamp(0) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(0), "TIMESTAMP '1970-01-01 00:00:01 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.1 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '1970-01-01 00:00:01.1 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.9 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '1970-01-01 00:00:01.9 UTC'")
+                .addRoundTrip("timestamp(2) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.12 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(2), "TIMESTAMP '1970-01-01 00:00:01.12 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.123 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 00:00:01.123 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.999 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 00:00:01.999 UTC'")
+                .addRoundTrip("timestamp(4) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.1234 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(4), "TIMESTAMP '1970-01-01 00:00:01.1234 UTC'")
+                .addRoundTrip("timestamp(5) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.12345 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(5), "TIMESTAMP '1970-01-01 00:00:01.12345 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.1 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '2020-09-27 12:34:56.1 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.9 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '2020-09-27 12:34:56.9 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.123 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2020-09-27 12:34:56.123 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.999 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2020-09-27 12:34:56.999 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.123456 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2020-09-27 12:34:56.123456 UTC'")
+
+                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_timestamp_with_time_zone"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_timestamp_with_time_zone"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_timestamp_with_time_zone"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_timestamp_with_time_zone"));
+    }
+
+    @Test
+    public void testTimestampWithTimeZoneFromTrinoDefaultTimeZone()
+    {
+        // Same as above, but insert time zone is default and read time zone is UTC
+        ZoneId sessionZone = TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId();
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        SqlDataTypeTest.create()
+                // after epoch (MySQL's timestamp type doesn't support values <= epoch)
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2019-03-18 10:01:17.987 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2019-03-17 20:01:17.987 UTC'")
+                // time doubled in JVM zone
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-10-28 01:33:17.456 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-10-27 11:33:17.456 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-10-28 03:33:33.333 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-10-27 13:33:33.333 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:13:42.000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 11:13:42.000 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-04-01 02:13:55.123 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-03-31 12:13:55.123 UTC'")
+                // time gap in Vilnius
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-03-25 03:17:17.000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-03-24 13:17:17.000 UTC'")
+                // time gap in Kathmandu
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1986-01-01 00:13:07.000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1986-01-01 11:13:07.000 UTC'")
+
+                // same as above but with higher precision
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2019-03-18 10:01:17.987654 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2019-03-17 20:01:17.987654 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-10-28 01:33:17.456789 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-10-27 11:33:17.456789 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-10-28 03:33:33.333333 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-10-27 13:33:33.333333 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:13:42.000000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '1970-01-01 11:13:42.000000 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-04-01 02:13:55.123456 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-03-31 12:13:55.123456 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-03-25 03:17:17.000000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-03-24 13:17:17.000000 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '1986-01-01 00:13:07.000000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '1986-01-01 11:13:07.000000 UTC'")
+
+                // test arbitrary time for all supported precisions
+                .addRoundTrip("timestamp(0) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(0), "TIMESTAMP '1970-01-01 11:00:01 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.1 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '1970-01-01 11:00:01.1 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.9 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '1970-01-01 11:00:01.9 UTC'")
+                .addRoundTrip("timestamp(2) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.12 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(2), "TIMESTAMP '1970-01-01 11:00:01.12 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.123 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 11:00:01.123 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.999 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 11:00:01.999 UTC'")
+                .addRoundTrip("timestamp(4) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.1234 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(4), "TIMESTAMP '1970-01-01 11:00:01.1234 UTC'")
+                .addRoundTrip("timestamp(5) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.12345 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(5), "TIMESTAMP '1970-01-01 11:00:01.12345 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.1 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '2020-09-26 22:34:56.1 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.9 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '2020-09-26 22:34:56.9 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.123 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2020-09-26 22:34:56.123 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.999 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2020-09-26 22:34:56.999 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.123456 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2020-09-26 22:34:56.123456 UTC'")
+
+                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_timestamp_with_time_zone"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_timestamp_with_time_zone"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_timestamp_with_time_zone"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_timestamp_with_time_zone"));
+    }
+
+    @Test
+    public void testUnsupportedTimestampWithTimeZoneValues()
+    {
+        // The range for TIMESTAMP values is '1970-01-01 00:00:01.000000' to '2038-01-19 03:14:07.499999'
+        try (TestTable table = new TestTable(mySqlServer::execute, "tpch.test_unsupported_timestamp", "(data TIMESTAMP)")) {
+            // Verify MySQL writes -- the server timezone is set to Pacific/Apia, so we have to account for that when inserting into MySQL
+            assertMySqlQueryFails(
+                    "INSERT INTO " + table.getName() + " VALUES ('1969-12-31 13:00:00')",
+                    "Data truncation: Incorrect datetime value: '1969-12-31 13:00:00' for column 'data' at row 1");
+            assertMySqlQueryFails(
+                    "INSERT INTO " + table.getName() + " VALUES ('2038-01-19 16:14:08')",
+                    "Data truncation: Incorrect datetime value: '2038-01-19 16:14:08' for column 'data' at row 1");
+
+            // Verify Trino writes
+            assertQueryFails(
+                    "INSERT INTO " + table.getName() + " VALUES (TIMESTAMP '1970-01-01 00:00:00 UTC')", // min - 1
+                    "Failed to insert data: Data truncation: Incorrect datetime value: '1969-12-31 16:00:00' for column 'data' at row 1");
+            assertQueryFails(
+                    "INSERT INTO " + table.getName() + " VALUES (TIMESTAMP '2038-01-19 03:14:08 UTC')", // max + 1
+                    "Failed to insert data: Data truncation: Incorrect datetime value: '2038-01-18 21:14:08' for column 'data' at row 1");
+        }
+    }
+
+    /**
+     * Additional test supplementing {@link #testTimestampWithTimeZoneFromTrinoUtc()} with values that do not necessarily round-trip.
+     *
+     * @see #testTimestampWithTimeZoneFromTrinoUtc
+     */
+    @Test
+    public void testTimestampWithTimeZoneCoercion()
+    {
+        SqlDataTypeTest.create()
+                // precision 0 ends up as precision 0
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01 UTC'", "TIMESTAMP '1970-01-01 00:00:01 UTC'")
+
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.1 UTC'", "TIMESTAMP '1970-01-01 00:00:01.1 UTC'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.9 UTC'", "TIMESTAMP '1970-01-01 00:00:01.9 UTC'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.123 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123 UTC'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.123000 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123000 UTC'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.999 UTC'", "TIMESTAMP '1970-01-01 00:00:01.999 UTC'")
+                // max supported precision
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.123456 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123456 UTC'")
+
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.1 UTC'", "TIMESTAMP '2020-09-27 12:34:56.1 UTC'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.9 UTC'", "TIMESTAMP '2020-09-27 12:34:56.9 UTC'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.123 UTC'", "TIMESTAMP '2020-09-27 12:34:56.123 UTC'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.123000 UTC'", "TIMESTAMP '2020-09-27 12:34:56.123000 UTC'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.999 UTC'", "TIMESTAMP '2020-09-27 12:34:56.999 UTC'")
+                // max supported precision
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.123456 UTC'", "TIMESTAMP '2020-09-27 12:34:56.123456 UTC'")
+
+                // round down
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.1234561 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123456 UTC'")
+
+                // nanoc round up, end result rounds down
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.123456499 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123456 UTC'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.123456499999 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123456 UTC'")
+
+                // round up
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.1234565 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123457 UTC'")
+
+                // max precision
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.111222333444 UTC'", "TIMESTAMP '1970-01-01 00:00:01.111222 UTC'")
+
+                // round up to next second
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.9999995 UTC'", "TIMESTAMP '1970-01-01 00:00:02.000000 UTC'")
+
+                // round up to next day
+                .addRoundTrip("TIMESTAMP '1970-01-01 23:59:59.9999995 UTC'", "TIMESTAMP '1970-01-02 00:00:00.000000 UTC'")
+
+                // negative epoch is not supported by MySQL TIMESTAMP
+
+                // CTAS with Trino, where the coercion is done by the connector
+                .execute(getQueryRunner(), trinoCreateAsSelect("test_timestamp_with_time_zone_coercion"))
+                // INSERT with Trino, where the coercion is done by the engine
+                .execute(getQueryRunner(), trinoCreateAndInsert("test_timestamp_with_time_zone_coercion"));
+    }
+
+    @DataProvider
+    public Object[][] sessionZonesDataProvider()
+    {
+        return new Object[][] {
+                {UTC},
+                {ZoneId.systemDefault()},
+                // no DST in 1970, but has DST in later years (e.g. 2018)
+                {ZoneId.of("Europe/Vilnius")},
+                // minutes offset change since 1970-01-01, no DST
+                {ZoneId.of("Asia/Kathmandu")},
+                {TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
+        };
+    }
+
+    @Test
+    public void testZeroTimestamp()
+            throws Exception
+    {
+        String connectionUrl = mySqlServer.getJdbcUrl() + "&zeroDateTimeBehavior=convertToNull";
+
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(getSession()).build();
+        queryRunner.installPlugin(new MySqlPlugin());
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("connection-url", connectionUrl)
+                .put("connection-user", mySqlServer.getUsername())
+                .put("connection-password", mySqlServer.getPassword())
+                .buildOrThrow();
+        queryRunner.createCatalog("mysql", "mysql", properties);
+
+        try (Connection connection = DriverManager.getConnection(connectionUrl, mySqlServer.getUsername(), mySqlServer.getPassword());
+                Statement statement = connection.createStatement()) {
+            statement.execute("CREATE TABLE tpch.test_zero_ts(col_dt datetime, col_ts timestamp)");
+            statement.execute("SET sql_mode=''");
+            statement.execute("INSERT INTO tpch.test_zero_ts(col_dt, col_ts) VALUES ('0000-00-00 00:00:00', '0000-00-00 00:00:00')");
+
+            assertThat(queryRunner.execute("SELECT col_dt FROM test_zero_ts").getOnlyValue()).isNull();
+            assertThat(queryRunner.execute("SELECT col_ts FROM test_zero_ts").getOnlyValue()).isNull();
+
+            statement.execute("DROP TABLE tpch.test_zero_ts");
+        }
+    }
+
+    private DataSetup trinoCreateAsSelect(String tableNamePrefix)
+    {
+        return trinoCreateAsSelect(getSession(), tableNamePrefix);
+    }
+
+    private DataSetup trinoCreateAsSelect(Session session, String tableNamePrefix)
+    {
+        return new CreateAsSelectDataSetup(new TrinoSqlExecutor(getQueryRunner(), session), tableNamePrefix);
+    }
+
+    private DataSetup trinoCreateAndInsert(String tableNamePrefix)
+    {
+        return trinoCreateAndInsert(getSession(), tableNamePrefix);
+    }
+
+    private DataSetup trinoCreateAndInsert(Session session, String tableNamePrefix)
+    {
+        return new CreateAndInsertDataSetup(new TrinoSqlExecutor(getQueryRunner(), session), tableNamePrefix);
+    }
+
+    private DataSetup mysqlCreateAndInsert(String tableNamePrefix)
+    {
+        return new CreateAndInsertDataSetup(mySqlServer::execute, tableNamePrefix);
+    }
+
+    private void assertMySqlQueryFails(@Language("SQL") String sql, String expectedMessage)
+    {
+        assertThatThrownBy(() -> mySqlServer.execute(sql))
+                .cause()
+                .hasMessageContaining(expectedMessage);
+    }
+}
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTypeMapping.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTypeMapping.java
index f262f4f80d61..0102a40dc64c 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTypeMapping.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTypeMapping.java
@@ -63,6 +63,7 @@
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TimeType.createTimeType;
 import static io.trino.spi.type.TimestampType.createTimestampType;
+import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
@@ -700,7 +701,7 @@ public void testTimeFromTrino(ZoneId sessionZone)
     }
 
     /**
-     * Read {@code DATATIME}s inserted by MySQL as Trino {@code TIMESTAMP}s
+     * Read {@code DATETIME}s inserted by MySQL as Trino {@code TIMESTAMP}s
      */
     @Test(dataProvider = "sessionZonesDataProvider")
     public void testMySqlDatetimeType(ZoneId sessionZone)
@@ -765,7 +766,7 @@ public void testMySqlDatetimeType(ZoneId sessionZone)
     }
 
     /**
-     * Read {@code TIMESTAMP}s inserted by MySQL as Trino {@code TIMESTAMP}s
+     * Read {@code TIMESTAMP}s inserted by MySQL as Trino {@code TIMESTAMP WITH TIME ZONE}s
      */
     @Test(dataProvider = "sessionZonesDataProvider")
     public void testTimestampFromMySql(ZoneId sessionZone)
@@ -777,41 +778,41 @@ public void testTimestampFromMySql(ZoneId sessionZone)
         // Same as above but with inserts from MySQL - i.e. read path
         SqlDataTypeTest.create()
                 // after epoch (MySQL's timestamp type doesn't support values <= epoch)
-                .addRoundTrip("timestamp(3)", "TIMESTAMP '2019-03-18 10:01:17.987'", createTimestampType(3), "TIMESTAMP '2019-03-18 10:01:17.987'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2019-03-18 10:01:17.987'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2019-03-18 10:01:17.987 UTC'")
                 // time doubled in JVM zone
-                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-10-28 01:33:17.456'", createTimestampType(3), "TIMESTAMP '2018-10-28 01:33:17.456'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-10-28 01:33:17.456'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-10-28 01:33:17.456 UTC'")
                 // time double in Vilnius
-                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-10-28 03:33:33.333'", createTimestampType(3), "TIMESTAMP '2018-10-28 03:33:33.333'")
-                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:13:42.000'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:13:42.000'")
-                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-04-01 02:13:55.123'", createTimestampType(3), "TIMESTAMP '2018-04-01 02:13:55.123'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-10-28 03:33:33.333'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-10-28 03:33:33.333 UTC'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:13:42.000'", createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 00:13:42.000 UTC'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-04-01 02:13:55.123'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-04-01 02:13:55.123 UTC'")
                 // time gap in Vilnius
-                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-03-25 03:17:17.000'", createTimestampType(3), "TIMESTAMP '2018-03-25 03:17:17.000'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-03-25 03:17:17.000'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-03-25 03:17:17.000 UTC'")
                 // time gap in Kathmandu
-                .addRoundTrip("timestamp(3)", "TIMESTAMP '1986-01-01 00:13:07.000'", createTimestampType(3), "TIMESTAMP '1986-01-01 00:13:07.000'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1986-01-01 00:13:07.000'", createTimestampWithTimeZoneType(3), "TIMESTAMP '1986-01-01 00:13:07.000 UTC'")
 
                 // same as above but with higher precision
-                .addRoundTrip("timestamp(6)", "TIMESTAMP '2019-03-18 10:01:17.987654'", createTimestampType(6), "TIMESTAMP '2019-03-18 10:01:17.987654'")
-                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-10-28 01:33:17.456789'", createTimestampType(6), "TIMESTAMP '2018-10-28 01:33:17.456789'")
-                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-10-28 03:33:33.333333'", createTimestampType(6), "TIMESTAMP '2018-10-28 03:33:33.333333'")
-                .addRoundTrip("timestamp(6)", "TIMESTAMP '1970-01-01 00:13:42.000000'", createTimestampType(6), "TIMESTAMP '1970-01-01 00:13:42.000000'")
-                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-04-01 02:13:55.123456'", createTimestampType(6), "TIMESTAMP '2018-04-01 02:13:55.123456'")
-                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-03-25 03:17:17.000000'", createTimestampType(6), "TIMESTAMP '2018-03-25 03:17:17.000000'")
-                .addRoundTrip("timestamp(6)", "TIMESTAMP '1986-01-01 00:13:07.000000'", createTimestampType(6), "TIMESTAMP '1986-01-01 00:13:07.000000'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2019-03-18 10:01:17.987654'", createTimestampWithTimeZoneType(6), "TIMESTAMP '2019-03-18 10:01:17.987654 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-10-28 01:33:17.456789'", createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-10-28 01:33:17.456789 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-10-28 03:33:33.333333'", createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-10-28 03:33:33.333333 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '1970-01-01 00:13:42.000000'", createTimestampWithTimeZoneType(6), "TIMESTAMP '1970-01-01 00:13:42.000000 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-04-01 02:13:55.123456'", createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-04-01 02:13:55.123456 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-03-25 03:17:17.000000'", createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-03-25 03:17:17.000000 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '1986-01-01 00:13:07.000000'", createTimestampWithTimeZoneType(6), "TIMESTAMP '1986-01-01 00:13:07.000000 UTC'")
 
                 // test arbitrary time for all supported precisions
-                .addRoundTrip("timestamp(0)", "TIMESTAMP '1970-01-01 00:00:01'", createTimestampType(0), "TIMESTAMP '1970-01-01 00:00:01'")
-                .addRoundTrip("timestamp(1)", "TIMESTAMP '1970-01-01 00:00:01.1'", createTimestampType(1), "TIMESTAMP '1970-01-01 00:00:01.1'")
-                .addRoundTrip("timestamp(1)", "TIMESTAMP '1970-01-01 00:00:01.9'", createTimestampType(1), "TIMESTAMP '1970-01-01 00:00:01.9'")
-                .addRoundTrip("timestamp(2)", "TIMESTAMP '1970-01-01 00:00:01.12'", createTimestampType(2), "TIMESTAMP '1970-01-01 00:00:01.12'")
-                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:00:01.123'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:00:01.123'")
-                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:00:01.999'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:00:01.999'")
-                .addRoundTrip("timestamp(4)", "TIMESTAMP '1970-01-01 00:00:01.1234'", createTimestampType(4), "TIMESTAMP '1970-01-01 00:00:01.1234'")
-                .addRoundTrip("timestamp(5)", "TIMESTAMP '1970-01-01 00:00:01.12345'", createTimestampType(5), "TIMESTAMP '1970-01-01 00:00:01.12345'")
-                .addRoundTrip("timestamp(1)", "TIMESTAMP '2020-09-27 12:34:56.1'", createTimestampType(1), "TIMESTAMP '2020-09-27 12:34:56.1'")
-                .addRoundTrip("timestamp(1)", "TIMESTAMP '2020-09-27 12:34:56.9'", createTimestampType(1), "TIMESTAMP '2020-09-27 12:34:56.9'")
-                .addRoundTrip("timestamp(3)", "TIMESTAMP '2020-09-27 12:34:56.123'", createTimestampType(3), "TIMESTAMP '2020-09-27 12:34:56.123'")
-                .addRoundTrip("timestamp(3)", "TIMESTAMP '2020-09-27 12:34:56.999'", createTimestampType(3), "TIMESTAMP '2020-09-27 12:34:56.999'")
-                .addRoundTrip("timestamp(6)", "TIMESTAMP '2020-09-27 12:34:56.123456'", createTimestampType(6), "TIMESTAMP '2020-09-27 12:34:56.123456'")
+                .addRoundTrip("timestamp(0)", "TIMESTAMP '1970-01-01 00:00:01'", createTimestampWithTimeZoneType(0), "TIMESTAMP '1970-01-01 00:00:01 UTC'")
+                .addRoundTrip("timestamp(1)", "TIMESTAMP '1970-01-01 00:00:01.1'", createTimestampWithTimeZoneType(1), "TIMESTAMP '1970-01-01 00:00:01.1 UTC'")
+                .addRoundTrip("timestamp(1)", "TIMESTAMP '1970-01-01 00:00:01.9'", createTimestampWithTimeZoneType(1), "TIMESTAMP '1970-01-01 00:00:01.9 UTC'")
+                .addRoundTrip("timestamp(2)", "TIMESTAMP '1970-01-01 00:00:01.12'", createTimestampWithTimeZoneType(2), "TIMESTAMP '1970-01-01 00:00:01.12 UTC'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:00:01.123'", createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 00:00:01.123 UTC'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:00:01.999'", createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 00:00:01.999 UTC'")
+                .addRoundTrip("timestamp(4)", "TIMESTAMP '1970-01-01 00:00:01.1234'", createTimestampWithTimeZoneType(4), "TIMESTAMP '1970-01-01 00:00:01.1234 UTC'")
+                .addRoundTrip("timestamp(5)", "TIMESTAMP '1970-01-01 00:00:01.12345'", createTimestampWithTimeZoneType(5), "TIMESTAMP '1970-01-01 00:00:01.12345 UTC'")
+                .addRoundTrip("timestamp(1)", "TIMESTAMP '2020-09-27 12:34:56.1'", createTimestampWithTimeZoneType(1), "TIMESTAMP '2020-09-27 12:34:56.1 UTC'")
+                .addRoundTrip("timestamp(1)", "TIMESTAMP '2020-09-27 12:34:56.9'", createTimestampWithTimeZoneType(1), "TIMESTAMP '2020-09-27 12:34:56.9 UTC'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2020-09-27 12:34:56.123'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2020-09-27 12:34:56.123 UTC'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2020-09-27 12:34:56.999'", createTimestampWithTimeZoneType(3), "TIMESTAMP '2020-09-27 12:34:56.999 UTC'")
+                .addRoundTrip("timestamp(6)", "TIMESTAMP '2020-09-27 12:34:56.123456'", createTimestampWithTimeZoneType(6), "TIMESTAMP '2020-09-27 12:34:56.123456 UTC'")
 
                 .execute(getQueryRunner(), session, mysqlCreateAndInsert("tpch.test_timestamp"));
     }
@@ -922,6 +923,188 @@ public void testTimestampCoercion()
                 .execute(getQueryRunner(), trinoCreateAndInsert("test_timestamp_coercion"));
     }
 
+    @Test
+    public void testTimestampWithTimeZoneFromTrinoUtc()
+    {
+        ZoneId sessionZone = UTC;
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        SqlDataTypeTest.create()
+                // after epoch (MySQL's timestamp type doesn't support values <= epoch)
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2019-03-18 10:01:17.987 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2019-03-18 10:01:17.987 UTC'")
+                // time doubled in JVM zone
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-10-28 01:33:17.456 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-10-28 01:33:17.456 UTC'")
+                // time double in Vilnius
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-10-28 03:33:33.333 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-10-28 03:33:33.333 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:13:42.000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 00:13:42.000 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-04-01 02:13:55.123 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-04-01 02:13:55.123 UTC'")
+                // time gap in Vilnius
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-03-25 03:17:17.000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-03-25 03:17:17.000 UTC'")
+                // time gap in Kathmandu
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1986-01-01 00:13:07.000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1986-01-01 00:13:07.000 UTC'")
+
+                // same as above but with higher precision
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2019-03-18 10:01:17.987654 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2019-03-18 10:01:17.987654 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-10-28 01:33:17.456789 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-10-28 01:33:17.456789 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-10-28 03:33:33.333333 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-10-28 03:33:33.333333 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:13:42.000000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '1970-01-01 00:13:42.000000 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-04-01 02:13:55.123456 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-04-01 02:13:55.123456 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-03-25 03:17:17.000000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-03-25 03:17:17.000000 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '1986-01-01 00:13:07.000000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '1986-01-01 00:13:07.000000 UTC'")
+
+                // test arbitrary time for all supported precisions
+                .addRoundTrip("timestamp(0) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(0), "TIMESTAMP '1970-01-01 00:00:01 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.1 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '1970-01-01 00:00:01.1 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.9 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '1970-01-01 00:00:01.9 UTC'")
+                .addRoundTrip("timestamp(2) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.12 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(2), "TIMESTAMP '1970-01-01 00:00:01.12 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.123 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 00:00:01.123 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.999 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 00:00:01.999 UTC'")
+                .addRoundTrip("timestamp(4) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.1234 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(4), "TIMESTAMP '1970-01-01 00:00:01.1234 UTC'")
+                .addRoundTrip("timestamp(5) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.12345 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(5), "TIMESTAMP '1970-01-01 00:00:01.12345 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.1 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '2020-09-27 12:34:56.1 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.9 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '2020-09-27 12:34:56.9 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.123 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2020-09-27 12:34:56.123 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.999 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2020-09-27 12:34:56.999 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.123456 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2020-09-27 12:34:56.123456 UTC'")
+
+                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_timestamp_with_time_zone"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_timestamp_with_time_zone"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_timestamp_with_time_zone"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_timestamp_with_time_zone"));
+    }
+
+    @Test
+    public void testTimestampWithTimeZoneFromTrinoDefaultTimeZone()
+    {
+        // Same as above, but insert time zone is default and read time zone is UTC
+        ZoneId sessionZone = TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId();
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        SqlDataTypeTest.create()
+                // after epoch (MySQL's timestamp type doesn't support values <= epoch)
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2019-03-18 10:01:17.987 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2019-03-17 20:01:17.987 UTC'")
+                // time doubled in JVM zone
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-10-28 01:33:17.456 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-10-27 11:33:17.456 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-10-28 03:33:33.333 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-10-27 13:33:33.333 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:13:42.000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 11:13:42.000 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-04-01 02:13:55.123 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-03-31 12:13:55.123 UTC'")
+                // time gap in Vilnius
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2018-03-25 03:17:17.000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2018-03-24 13:17:17.000 UTC'")
+                // time gap in Kathmandu
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1986-01-01 00:13:07.000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1986-01-01 11:13:07.000 UTC'")
+
+                // same as above but with higher precision
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2019-03-18 10:01:17.987654 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2019-03-17 20:01:17.987654 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-10-28 01:33:17.456789 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-10-27 11:33:17.456789 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-10-28 03:33:33.333333 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-10-27 13:33:33.333333 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:13:42.000000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '1970-01-01 11:13:42.000000 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-04-01 02:13:55.123456 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-03-31 12:13:55.123456 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2018-03-25 03:17:17.000000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2018-03-24 13:17:17.000000 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '1986-01-01 00:13:07.000000 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '1986-01-01 11:13:07.000000 UTC'")
+
+                // test arbitrary time for all supported precisions
+                .addRoundTrip("timestamp(0) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(0), "TIMESTAMP '1970-01-01 11:00:01 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.1 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '1970-01-01 11:00:01.1 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.9 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '1970-01-01 11:00:01.9 UTC'")
+                .addRoundTrip("timestamp(2) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.12 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(2), "TIMESTAMP '1970-01-01 11:00:01.12 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.123 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 11:00:01.123 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.999 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '1970-01-01 11:00:01.999 UTC'")
+                .addRoundTrip("timestamp(4) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.1234 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(4), "TIMESTAMP '1970-01-01 11:00:01.1234 UTC'")
+                .addRoundTrip("timestamp(5) WITH TIME ZONE", "TIMESTAMP '1970-01-01 00:00:01.12345 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(5), "TIMESTAMP '1970-01-01 11:00:01.12345 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.1 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '2020-09-26 22:34:56.1 UTC'")
+                .addRoundTrip("timestamp(1) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.9 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(1), "TIMESTAMP '2020-09-26 22:34:56.9 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.123 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2020-09-26 22:34:56.123 UTC'")
+                .addRoundTrip("timestamp(3) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.999 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(3), "TIMESTAMP '2020-09-26 22:34:56.999 UTC'")
+                .addRoundTrip("timestamp(6) WITH TIME ZONE", "TIMESTAMP '2020-09-27 12:34:56.123456 %s'".formatted(sessionZone), createTimestampWithTimeZoneType(6), "TIMESTAMP '2020-09-26 22:34:56.123456 UTC'")
+
+                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_timestamp_with_time_zone"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_timestamp_with_time_zone"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_timestamp_with_time_zone"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_timestamp_with_time_zone"));
+    }
+
+    @Test
+    public void testUnsupportedTimestampWithTimeZoneValues()
+    {
+        // The range for TIMESTAMP values is '1970-01-01 00:00:01.000000' to '2038-01-19 03:14:07.499999'
+        try (TestTable table = new TestTable(mySqlServer::execute, "tpch.test_unsupported_timestamp", "(data TIMESTAMP)")) {
+            // Verify MySQL writes
+            assertMySqlQueryFails(
+                    "INSERT INTO " + table.getName() + " VALUES ('1970-01-01 00:00:00')",
+                    "Data truncation: Incorrect datetime value: '1970-01-01 00:00:00' for column 'data' at row 1");
+            assertMySqlQueryFails(
+                    "INSERT INTO " + table.getName() + " VALUES ('2038-01-19 03:14:08')",
+                    "Data truncation: Incorrect datetime value: '2038-01-19 03:14:08' for column 'data' at row 1");
+
+            // Verify Trino writes
+            assertQueryFails(
+                    "INSERT INTO " + table.getName() + " VALUES (TIMESTAMP '1970-01-01 00:00:00 UTC')", // min - 1
+                    "Failed to insert data: Data truncation: Incorrect datetime value: '1969-12-31 16:00:00' for column 'data' at row 1");
+            assertQueryFails(
+                    "INSERT INTO " + table.getName() + " VALUES (TIMESTAMP '2038-01-19 03:14:08 UTC')", // max + 1
+                    "Failed to insert data: Data truncation: Incorrect datetime value: '2038-01-18 21:14:08' for column 'data' at row 1");
+        }
+    }
+
+    /**
+     * Additional test supplementing {@link #testTimestampWithTimeZoneFromTrinoUtc()} with values that do not necessarily round-trip.
+     *
+     * @see #testTimestampWithTimeZoneFromTrinoUtc
+     */
+    @Test
+    public void testTimestampWithTimeZoneCoercion()
+    {
+        SqlDataTypeTest.create()
+                // precision 0 ends up as precision 0
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01 UTC'", "TIMESTAMP '1970-01-01 00:00:01 UTC'")
+
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.1 UTC'", "TIMESTAMP '1970-01-01 00:00:01.1 UTC'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.9 UTC'", "TIMESTAMP '1970-01-01 00:00:01.9 UTC'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.123 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123 UTC'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.123000 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123000 UTC'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.999 UTC'", "TIMESTAMP '1970-01-01 00:00:01.999 UTC'")
+                // max supported precision
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.123456 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123456 UTC'")
+
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.1 UTC'", "TIMESTAMP '2020-09-27 12:34:56.1 UTC'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.9 UTC'", "TIMESTAMP '2020-09-27 12:34:56.9 UTC'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.123 UTC'", "TIMESTAMP '2020-09-27 12:34:56.123 UTC'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.123000 UTC'", "TIMESTAMP '2020-09-27 12:34:56.123000 UTC'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.999 UTC'", "TIMESTAMP '2020-09-27 12:34:56.999 UTC'")
+                // max supported precision
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.123456 UTC'", "TIMESTAMP '2020-09-27 12:34:56.123456 UTC'")
+
+                // round down
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.1234561 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123456 UTC'")
+
+                // nanoc round up, end result rounds down
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.123456499 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123456 UTC'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.123456499999 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123456 UTC'")
+
+                // round up
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.1234565 UTC'", "TIMESTAMP '1970-01-01 00:00:01.123457 UTC'")
+
+                // max precision
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.111222333444 UTC'", "TIMESTAMP '1970-01-01 00:00:01.111222 UTC'")
+
+                // round up to next second
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:01.9999995 UTC'", "TIMESTAMP '1970-01-01 00:00:02.000000 UTC'")
+
+                // round up to next day
+                .addRoundTrip("TIMESTAMP '1970-01-01 23:59:59.9999995 UTC'", "TIMESTAMP '1970-01-02 00:00:00.000000 UTC'")
+
+                // negative epoch is not supported by MySQL TIMESTAMP
+
+                // CTAS with Trino, where the coercion is done by the connector
+                .execute(getQueryRunner(), trinoCreateAsSelect("test_timestamp_with_time_zone_coercion"))
+                // INSERT with Trino, where the coercion is done by the engine
+                .execute(getQueryRunner(), trinoCreateAndInsert("test_timestamp_with_time_zone_coercion"));
+    }
+
     @DataProvider
     public Object[][] sessionZonesDataProvider()
     {
diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java
index 86af2417c902..af3adaa9ed7b 100644
--- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java
+++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java
@@ -23,9 +23,11 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.time.ZoneId;
 
 import static io.trino.testing.containers.TestContainers.startOrReuse;
 import static java.lang.String.format;
+import static java.time.ZoneOffset.UTC;
 import static org.testcontainers.containers.MySQLContainer.MYSQL_PORT;
 
 public class TestingMySqlServer
@@ -42,22 +44,40 @@ public TestingMySqlServer()
         this(false);
     }
 
+    public TestingMySqlServer(ZoneId zoneId)
+    {
+        this(DEFAULT_IMAGE, false, zoneId);
+    }
+
     public TestingMySqlServer(boolean globalTransactionEnable)
     {
-        this(DEFAULT_IMAGE, globalTransactionEnable);
+        this(DEFAULT_IMAGE, globalTransactionEnable, UTC);
     }
 
     public TestingMySqlServer(String dockerImageName, boolean globalTransactionEnable)
+    {
+        this(dockerImageName, globalTransactionEnable, UTC);
+    }
+
+    public TestingMySqlServer(String dockerImageName, boolean globalTransactionEnable, ZoneId zoneId)
     {
         MySQLContainer<?> container = new MySQLContainer<>(dockerImageName);
         container = container.withDatabaseName("tpch");
+        container.addEnv("TZ", zoneId.getId());
         if (globalTransactionEnable) {
             container = container.withCommand("--gtid-mode=ON", "--enforce-gtid-consistency=ON");
         }
         this.container = container;
         configureContainer(container);
         cleanup = startOrReuse(container);
-        execute(format("GRANT ALL PRIVILEGES ON *.* TO '%s'", container.getUsername()), "root", container.getPassword());
+
+        try (Connection connection = DriverManager.getConnection(getJdbcUrl(), "root", container.getPassword());
+                Statement statement = connection.createStatement()) {
+            statement.execute(format("GRANT ALL PRIVILEGES ON *.* TO '%s'", container.getUsername()));
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     private void configureContainer(MySQLContainer<?> container)
@@ -66,20 +86,9 @@ private void configureContainer(MySQLContainer<?> container)
         container.addParameter("TC_MY_CNF", null);
     }
 
-    public Connection createConnection()
-            throws SQLException
-    {
-        return container.createConnection("");
-    }
-
     public void execute(String sql)
     {
-        execute(sql, getUsername(), getPassword());
-    }
-
-    public void execute(String sql, String user, String password)
-    {
-        try (Connection connection = DriverManager.getConnection(getJdbcUrl(), user, password);
+        try (Connection connection = createConnection();
                 Statement statement = connection.createStatement()) {
             statement.execute(sql);
         }
@@ -88,6 +97,12 @@ public void execute(String sql, String user, String password)
         }
     }
 
+    public Connection createConnection()
+            throws SQLException
+    {
+        return container.createConnection("");
+    }
+
     public String getUsername()
     {
         return container.getUsername();
diff --git a/plugin/trino-oracle/pom.xml b/plugin/trino-oracle/pom.xml
index 3f782ff74cd5..ced7ff63af8e 100644
--- a/plugin/trino-oracle/pom.xml
+++ b/plugin/trino-oracle/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-oracle</artifactId>
-    <description>Trino - Oracle Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Oracle Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,13 +19,25 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-base-jdbc</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc11</artifactId>
+            <version>${dep.oracle.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ucp11</artifactId>
+            <version>${dep.oracle.version}</version>
         </dependency>
 
         <dependency>
@@ -39,48 +51,59 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-jdbc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-base-jdbc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <version>${dep.oracle.version}</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ucp</artifactId>
-            <version>${dep.oracle.version}</version>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -96,32 +119,30 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -129,6 +150,19 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-exchange-filesystem</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-exchange-filesystem</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -142,12 +176,25 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-containers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing-services</artifactId>
@@ -167,14 +214,14 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -196,4 +243,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleClient.java b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleClient.java
index 3a1a34380cf8..eeeaccb62ac9 100644
--- a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleClient.java
+++ b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleClient.java
@@ -16,9 +16,11 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.plugin.base.aggregation.AggregateFunctionRewriter;
 import io.trino.plugin.base.aggregation.AggregateFunctionRule;
 import io.trino.plugin.base.expression.ConnectorExpressionRewriter;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcClient;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.BooleanWriteFunction;
@@ -32,6 +34,8 @@
 import io.trino.plugin.jdbc.JdbcTypeHandle;
 import io.trino.plugin.jdbc.LongReadFunction;
 import io.trino.plugin.jdbc.LongWriteFunction;
+import io.trino.plugin.jdbc.ObjectReadFunction;
+import io.trino.plugin.jdbc.ObjectWriteFunction;
 import io.trino.plugin.jdbc.QueryBuilder;
 import io.trino.plugin.jdbc.RemoteTableName;
 import io.trino.plugin.jdbc.SliceWriteFunction;
@@ -52,7 +56,6 @@
 import io.trino.plugin.jdbc.expression.JdbcConnectorExpressionRewriterBuilder;
 import io.trino.plugin.jdbc.expression.ParameterizedExpression;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
@@ -62,13 +65,13 @@
 import io.trino.spi.type.CharType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Decimals;
+import io.trino.spi.type.LongTimestamp;
+import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
 import oracle.jdbc.OraclePreparedStatement;
 import oracle.jdbc.OracleTypes;
 
-import javax.inject.Inject;
-
 import java.math.RoundingMode;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -81,6 +84,8 @@
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -98,6 +103,8 @@
 import static io.trino.plugin.jdbc.StandardColumnMappings.bigintColumnMapping;
 import static io.trino.plugin.jdbc.StandardColumnMappings.bigintWriteFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.charReadFunction;
+import static io.trino.plugin.jdbc.StandardColumnMappings.fromLongTrinoTimestamp;
+import static io.trino.plugin.jdbc.StandardColumnMappings.fromTrinoTimestamp;
 import static io.trino.plugin.jdbc.StandardColumnMappings.integerWriteFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.longDecimalReadFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.longDecimalWriteFunction;
@@ -105,6 +112,8 @@
 import static io.trino.plugin.jdbc.StandardColumnMappings.shortDecimalWriteFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.smallintWriteFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.tinyintWriteFunction;
+import static io.trino.plugin.jdbc.StandardColumnMappings.toLongTrinoTimestamp;
+import static io.trino.plugin.jdbc.StandardColumnMappings.toTrinoTimestamp;
 import static io.trino.plugin.jdbc.StandardColumnMappings.varbinaryWriteFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.varcharWriteFunction;
 import static io.trino.plugin.jdbc.TypeHandlingJdbcSessionProperties.getUnsupportedTypeHandling;
@@ -124,12 +133,11 @@
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
-import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
+import static io.trino.spi.type.TimestampType.MAX_SHORT_PRECISION;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_SECONDS;
+import static io.trino.spi.type.TimestampType.createTimestampType;
 import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
-import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_MILLISECOND;
 import static io.trino.spi.type.Timestamps.MICROSECONDS_PER_SECOND;
-import static io.trino.spi.type.Timestamps.NANOSECONDS_PER_MICROSECOND;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
@@ -151,6 +159,7 @@ public class OracleClient
 {
     public static final int ORACLE_MAX_LIST_EXPRESSIONS = 1000;
 
+    private static final int MAX_ORACLE_TIMESTAMP_PRECISION = 9;
     private static final int MAX_BYTES_PER_CHAR = 4;
 
     private static final int ORACLE_VARCHAR2_MAX_BYTES = 4000;
@@ -165,7 +174,13 @@ public class OracleClient
 
     private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("uuuu-MM-dd");
     private static final DateTimeFormatter TIMESTAMP_SECONDS_FORMATTER = DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss");
-    private static final DateTimeFormatter TIMESTAMP_MILLIS_FORMATTER = DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SSS");
+
+    private static final DateTimeFormatter TIMESTAMP_NANO_OPTIONAL_FORMATTER = new DateTimeFormatterBuilder()
+            .appendPattern("uuuu-MM-dd HH:mm:ss")
+            .optionalStart()
+            .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true)
+            .optionalEnd()
+            .toFormatter();
 
     private static final Set<String> INTERNAL_SCHEMAS = ImmutableSet.<String>builder()
             .add("ctxsys")
@@ -196,7 +211,6 @@ public class OracleClient
             .put(TIMESTAMP_TZ_MILLIS, WriteMapping.longMapping("timestamp(3) with time zone", oracleTimestampWithTimeZoneWriteFunction()))
             .buildOrThrow();
 
-    private final boolean disableAutomaticFetchSize;
     private final boolean synonymsEnabled;
     private final ConnectorExpressionRewriter<ParameterizedExpression> connectorExpressionRewriter;
     private final AggregateFunctionRewriter<JdbcExpression, ?> aggregateFunctionRewriter;
@@ -210,9 +224,8 @@ public OracleClient(
             IdentifierMapping identifierMapping,
             RemoteQueryModifier queryModifier)
     {
-        super("\"", connectionFactory, queryBuilder, config.getJdbcTypesMappedToVarchar(), identifierMapping, queryModifier, false);
+        super("\"", connectionFactory, queryBuilder, config.getJdbcTypesMappedToVarchar(), identifierMapping, queryModifier, true);
 
-        this.disableAutomaticFetchSize = oracleConfig.isDisableAutomaticFetchSize();
         this.synonymsEnabled = oracleConfig.isSynonymsEnabled();
 
         this.connectorExpressionRewriter = JdbcConnectorExpressionRewriterBuilder.newBuilder()
@@ -262,12 +275,9 @@ public PreparedStatement getPreparedStatement(Connection connection, String sql,
             throws SQLException
     {
         PreparedStatement statement = connection.prepareStatement(sql);
-        if (disableAutomaticFetchSize) {
-            statement.setFetchSize(1000);
-        }
         // This is a heuristic, not exact science. A better formula can perhaps be found with measurements.
         // Column count is not known for non-SELECT queries. Not setting fetch size for these.
-        else if (columnCount.isPresent()) {
+        if (columnCount.isPresent()) {
             statement.setFetchSize(max(100_000 / columnCount.get(), 1_000));
         }
         return statement;
@@ -296,11 +306,42 @@ public void createSchema(ConnectorSession session, String schemaName)
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support dropping schemas");
     }
 
+    @Override
+    protected void dropTable(ConnectorSession session, RemoteTableName remoteTableName, boolean temporaryTable)
+    {
+        String quotedTable = quoted(remoteTableName);
+        String dropTableSql = "DROP TABLE " + quotedTable;
+        try (Connection connection = connectionFactory.openConnection(session)) {
+            if (temporaryTable) {
+                // Turn off auto-commit so the lock is held until after the DROP
+                connection.setAutoCommit(false);
+                // By default, when dropping a table, oracle does not wait for the table lock.
+                // If another transaction is using the table at the same time, DROP TABLE will throw.
+                // The solution is to first lock the table, waiting for other active transactions to complete.
+                // In Oracle, DDL automatically commits, so DROP TABLE will release the lock afterwards.
+                // NOTE: We can only lock tables owned by trino, hence only doing this for temporary tables.
+                execute(session, connection, "LOCK TABLE " + quotedTable + " IN EXCLUSIVE MODE");
+                // Oracle puts dropped tables into a recycling bin, which keeps them accessible for a period of time.
+                // PURGE will bypass the bin and completely delete the table immediately.
+                // We should only PURGE the table if it is a temporary table that trino created,
+                // as purging all dropped tables may be unexpected behavior for our clients.
+                dropTableSql += " PURGE";
+            }
+            execute(session, connection, dropTableSql);
+            // Commit the transaction (for temporaryTables), or a no-op for regular tables.
+            // This is better than connection.commit() because you're not supposed to commit() if autoCommit is true.
+            connection.setAutoCommit(true);
+        }
+        catch (SQLException e) {
+            throw new TrinoException(JDBC_ERROR, e);
+        }
+    }
+
     @Override
     public void renameSchema(ConnectorSession session, String schemaName, String newSchemaName)
     {
@@ -360,7 +401,7 @@ public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connect
         if (jdbcTypeName.equalsIgnoreCase("date")) {
             return Optional.of(ColumnMapping.longMapping(
                     TIMESTAMP_SECONDS,
-                    oracleTimestampReadFunction(),
+                    oracleTimestampReadFunction(TIMESTAMP_SECONDS),
                     trinoTimestampToOracleDateWriteFunction(),
                     FULL_PUSHDOWN));
         }
@@ -457,11 +498,8 @@ else if (precision > Decimals.MAX_PRECISION || actualPrecision <= 0) {
                         DISABLE_PUSHDOWN));
 
             case OracleTypes.TIMESTAMP:
-                return Optional.of(ColumnMapping.longMapping(
-                        TIMESTAMP_MILLIS,
-                        oracleTimestampReadFunction(),
-                        trinoTimestampToOracleTimestampWriteFunction(),
-                        FULL_PUSHDOWN));
+                int timestampPrecision = typeHandle.getRequiredDecimalDigits();
+                return Optional.of(oracleTimestampColumnMapping(createTimestampType(timestampPrecision)));
             case OracleTypes.TIMESTAMPTZ:
                 return Optional.of(oracleTimestampWithTimeZoneColumnMapping());
         }
@@ -471,6 +509,22 @@ else if (precision > Decimals.MAX_PRECISION || actualPrecision <= 0) {
         return Optional.empty();
     }
 
+    private static ColumnMapping oracleTimestampColumnMapping(TimestampType timestampType)
+    {
+        if (timestampType.isShort()) {
+            return ColumnMapping.longMapping(
+                    timestampType,
+                    oracleTimestampReadFunction(timestampType),
+                    oracleTimestampWriteFunction(timestampType),
+                    FULL_PUSHDOWN);
+        }
+        return ColumnMapping.objectMapping(
+                timestampType,
+                oracleLongTimestampReadFunction(timestampType),
+                oracleLongTimestampWriteFunction(timestampType),
+                FULL_PUSHDOWN);
+    }
+
     @Override
     public Optional<JdbcExpression> implementAggregation(ConnectorSession session, AggregateFunction aggregate, Map<String, ColumnHandle> assignments)
     {
@@ -559,24 +613,57 @@ public void setNull(PreparedStatement statement, int index)
         };
     }
 
-    public static LongWriteFunction trinoTimestampToOracleTimestampWriteFunction()
+    private static ObjectWriteFunction oracleLongTimestampWriteFunction(TimestampType timestampType)
+    {
+        int precision = timestampType.getPrecision();
+        verifyLongTimestampPrecision(timestampType);
+
+        return new ObjectWriteFunction() {
+            @Override
+            public Class<?> getJavaType()
+            {
+                return LongTimestamp.class;
+            }
+
+            @Override
+            public void set(PreparedStatement statement, int index, Object value)
+                    throws SQLException
+            {
+                LocalDateTime timestamp = fromLongTrinoTimestamp((LongTimestamp) value, precision);
+                statement.setString(index, TIMESTAMP_NANO_OPTIONAL_FORMATTER.format(timestamp));
+            }
+
+            @Override
+            public String getBindExpression()
+            {
+                return getOracleBindExpression(precision);
+            }
+
+            @Override
+            public void setNull(PreparedStatement statement, int index)
+                    throws SQLException
+            {
+                statement.setNull(index, Types.VARCHAR);
+            }
+        };
+    }
+
+    private static LongWriteFunction oracleTimestampWriteFunction(TimestampType timestampType)
     {
         return new LongWriteFunction()
         {
             @Override
             public String getBindExpression()
             {
-                return "TO_TIMESTAMP(?, 'SYYYY-MM-DD HH24:MI:SS.FF')";
+                return getOracleBindExpression(timestampType.getPrecision());
             }
 
             @Override
-            public void set(PreparedStatement statement, int index, long utcMillis)
+            public void set(PreparedStatement statement, int index, long epochMicros)
                     throws SQLException
             {
-                long epochSecond = floorDiv(utcMillis, MICROSECONDS_PER_SECOND);
-                int nanoFraction = floorMod(utcMillis, MICROSECONDS_PER_SECOND) * NANOSECONDS_PER_MICROSECOND;
-                LocalDateTime localDateTime = LocalDateTime.ofEpochSecond(epochSecond, nanoFraction, ZoneOffset.UTC);
-                statement.setString(index, TIMESTAMP_MILLIS_FORMATTER.format(localDateTime));
+                LocalDateTime timestamp = fromTrinoTimestamp(epochMicros);
+                statement.setString(index, TIMESTAMP_NANO_OPTIONAL_FORMATTER.format(timestamp));
             }
 
             @Override
@@ -588,7 +675,19 @@ public void setNull(PreparedStatement statement, int index)
         };
     }
 
-    private static LongReadFunction oracleTimestampReadFunction()
+    private static String getOracleBindExpression(int precision)
+    {
+        if (precision == 0) {
+            return "TO_TIMESTAMP(?, 'SYYYY-MM-DD HH24:MI:SS')";
+        }
+        if (precision <= 2) {
+            return "TO_TIMESTAMP(?, 'SYYYY-MM-DD HH24:MI:SS.FF')";
+        }
+
+        return format("TO_TIMESTAMP(?, 'SYYYY-MM-DD HH24:MI:SS.FF%d')", precision);
+    }
+
+    private static LongReadFunction oracleTimestampReadFunction(TimestampType timestampType)
     {
         return (resultSet, columnIndex) -> {
             LocalDateTime timestamp = resultSet.getObject(columnIndex, LocalDateTime.class);
@@ -596,10 +695,32 @@ private static LongReadFunction oracleTimestampReadFunction()
             if (timestamp.getYear() <= 0) {
                 timestamp = timestamp.minusYears(1);
             }
-            return timestamp.toInstant(ZoneOffset.UTC).toEpochMilli() * MICROSECONDS_PER_MILLISECOND;
+            return toTrinoTimestamp(timestampType, timestamp);
         };
     }
 
+    private static ObjectReadFunction oracleLongTimestampReadFunction(TimestampType timestampType)
+    {
+        verifyLongTimestampPrecision(timestampType);
+        return ObjectReadFunction.of(
+                LongTimestamp.class,
+                (resultSet, columnIndex) -> {
+                    LocalDateTime timestamp = resultSet.getObject(columnIndex, LocalDateTime.class);
+                    // Adjust years when the value is B.C. dates because Oracle returns +1 year unless converting to string in their server side
+                    if (timestamp.getYear() <= 0) {
+                        timestamp = timestamp.minusYears(1);
+                    }
+                    return toLongTrinoTimestamp(timestampType, timestamp);
+                });
+    }
+
+    private static void verifyLongTimestampPrecision(TimestampType timestampType)
+    {
+        int precision = timestampType.getPrecision();
+        checkArgument(precision > MAX_SHORT_PRECISION && precision <= MAX_ORACLE_TIMESTAMP_PRECISION,
+                "Precision is out of range: %s", precision);
+    }
+
     public static ColumnMapping oracleTimestampWithTimeZoneColumnMapping()
     {
         return ColumnMapping.longMapping(
@@ -636,18 +757,18 @@ private static BooleanWriteFunction oracleBooleanWriteFunction()
     public static LongWriteFunction oracleRealWriteFunction()
     {
         return LongWriteFunction.of(Types.REAL, (statement, index, value) ->
-                ((OraclePreparedStatement) statement).setBinaryFloat(index, intBitsToFloat(toIntExact(value))));
+                statement.unwrap(OraclePreparedStatement.class).setBinaryFloat(index, intBitsToFloat(toIntExact(value))));
     }
 
     public static DoubleWriteFunction oracleDoubleWriteFunction()
     {
         return DoubleWriteFunction.of(Types.DOUBLE, (statement, index, value) ->
-                ((OraclePreparedStatement) statement).setBinaryDouble(index, value));
+                statement.unwrap(OraclePreparedStatement.class).setBinaryDouble(index, value));
     }
 
     private SliceWriteFunction oracleCharWriteFunction()
     {
-        return SliceWriteFunction.of(Types.NCHAR, (statement, index, value) -> ((OraclePreparedStatement) statement).setFixedCHAR(index, value.toStringUtf8()));
+        return SliceWriteFunction.of(Types.NCHAR, (statement, index, value) -> statement.unwrap(OraclePreparedStatement.class).setFixedCHAR(index, value.toStringUtf8()));
     }
 
     @Override
@@ -680,13 +801,18 @@ public WriteMapping toWriteMapping(ConnectorSession session, Type type)
             }
             return WriteMapping.objectMapping(dataType, longDecimalWriteFunction(decimalType));
         }
-        if (type.equals(TIMESTAMP_SECONDS)) {
-            // Specify 'date' instead of 'timestamp(0)' to propagate the type in case of CTAS from date columns
-            // Oracle date stores year, month, day, hour, minute, seconds, but not second fraction
-            return WriteMapping.longMapping("date", trinoTimestampToOracleDateWriteFunction());
-        }
-        if (type.equals(TIMESTAMP_MILLIS)) {
-            return WriteMapping.longMapping("timestamp(3)", trinoTimestampToOracleTimestampWriteFunction());
+        if (type instanceof TimestampType timestampType) {
+            if (type.equals(TIMESTAMP_SECONDS)) {
+                // Specify 'date' instead of 'timestamp(0)' to propagate the type in case of CTAS from date columns
+                // Oracle date stores year, month, day, hour, minute, seconds, but not second fraction
+                return WriteMapping.longMapping("date", trinoTimestampToOracleDateWriteFunction());
+            }
+            int precision = min(timestampType.getPrecision(), MAX_ORACLE_TIMESTAMP_PRECISION);
+            String dataType = format("timestamp(%d)", precision);
+            if (timestampType.isShort()) {
+                return WriteMapping.longMapping(dataType, oracleTimestampWriteFunction(timestampType));
+            }
+            return WriteMapping.objectMapping(dataType, oracleLongTimestampWriteFunction(createTimestampType(precision)));
         }
         WriteMapping writeMapping = WRITE_MAPPINGS.get(type);
         if (writeMapping != null) {
diff --git a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleClientModule.java b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleClientModule.java
index befc4338b224..d3c2f545861c 100644
--- a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleClientModule.java
+++ b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleClientModule.java
@@ -13,26 +13,29 @@
  */
 package io.trino.plugin.oracle;
 
+import com.google.common.base.Throwables;
 import com.google.inject.Binder;
 import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DriverConnectionFactory;
 import io.trino.plugin.jdbc.ForBaseJdbc;
 import io.trino.plugin.jdbc.JdbcClient;
 import io.trino.plugin.jdbc.MaxDomainCompactionThreshold;
-import io.trino.plugin.jdbc.RetryingConnectionFactory;
+import io.trino.plugin.jdbc.RetryingConnectionFactory.RetryStrategy;
 import io.trino.plugin.jdbc.credential.CredentialProvider;
 import io.trino.plugin.jdbc.ptf.Query;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 import oracle.jdbc.OracleConnection;
 import oracle.jdbc.OracleDriver;
 
 import java.sql.SQLException;
+import java.sql.SQLRecoverableException;
 import java.util.Properties;
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
@@ -52,12 +55,13 @@ public void configure(Binder binder)
         configBinder(binder).bindConfig(OracleConfig.class);
         newOptionalBinder(binder, Key.get(int.class, MaxDomainCompactionThreshold.class)).setBinding().toInstance(ORACLE_MAX_LIST_EXPRESSIONS);
         newSetBinder(binder, ConnectorTableFunction.class).addBinding().toProvider(Query.class).in(Scopes.SINGLETON);
+        newOptionalBinder(binder, RetryStrategy.class).setBinding().to(OracleRetryStrategy.class).in(Scopes.SINGLETON);
     }
 
     @Provides
     @Singleton
     @ForBaseJdbc
-    public static ConnectionFactory connectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider, OracleConfig oracleConfig)
+    public static ConnectionFactory connectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider, OracleConfig oracleConfig, OpenTelemetry openTelemetry)
             throws SQLException
     {
         Properties connectionProperties = new Properties();
@@ -71,13 +75,26 @@ public static ConnectionFactory connectionFactory(BaseJdbcConfig config, Credent
                     credentialProvider,
                     oracleConfig.getConnectionPoolMinSize(),
                     oracleConfig.getConnectionPoolMaxSize(),
-                    oracleConfig.getInactiveConnectionTimeout());
+                    oracleConfig.getInactiveConnectionTimeout(),
+                    openTelemetry);
         }
 
-        return new RetryingConnectionFactory(new DriverConnectionFactory(
+        return new DriverConnectionFactory(
                 new OracleDriver(),
                 config.getConnectionUrl(),
                 connectionProperties,
-                credentialProvider));
+                credentialProvider,
+                openTelemetry);
+    }
+
+    private static class OracleRetryStrategy
+            implements RetryStrategy
+    {
+        @Override
+        public boolean isExceptionRecoverable(Throwable exception)
+        {
+            return Throwables.getCausalChain(exception).stream()
+                    .anyMatch(SQLRecoverableException.class::isInstance);
+        }
     }
 }
diff --git a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleConfig.java b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleConfig.java
index 80b0f5a620be..6df60f371979 100644
--- a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleConfig.java
+++ b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleConfig.java
@@ -15,21 +15,21 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
+import io.airlift.configuration.DefunctConfig;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.math.RoundingMode;
 import java.util.Optional;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 
+@DefunctConfig("oracle.disable-automatic-fetch-size")
 public class OracleConfig
 {
-    private boolean disableAutomaticFetchSize;
     private boolean synonymsEnabled;
     private boolean remarksReportingEnabled;
     private Integer defaultNumberScale;
@@ -39,20 +39,6 @@ public class OracleConfig
     private int connectionPoolMaxSize = 30;
     private Duration inactiveConnectionTimeout = new Duration(20, MINUTES);
 
-    @Deprecated
-    public boolean isDisableAutomaticFetchSize()
-    {
-        return disableAutomaticFetchSize;
-    }
-
-    @Deprecated // TODO temporary kill-switch, to be removed
-    @Config("oracle.disable-automatic-fetch-size")
-    public OracleConfig setDisableAutomaticFetchSize(boolean disableAutomaticFetchSize)
-    {
-        this.disableAutomaticFetchSize = disableAutomaticFetchSize;
-        return this;
-    }
-
     @NotNull
     public boolean isSynonymsEnabled()
     {
diff --git a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OraclePoolConnectionFactory.java b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OraclePoolConnectionFactory.java
index 096eb38d0985..fa255f38b267 100644
--- a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OraclePoolConnectionFactory.java
+++ b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OraclePoolConnectionFactory.java
@@ -14,6 +14,8 @@
 package io.trino.plugin.oracle;
 
 import io.airlift.units.Duration;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.jdbc.datasource.OpenTelemetryDataSource;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.credential.CredentialProvider;
 import io.trino.spi.connector.ConnectorSession;
@@ -32,7 +34,7 @@
 public class OraclePoolConnectionFactory
         implements ConnectionFactory
 {
-    private final PoolDataSource dataSource;
+    private final OpenTelemetryDataSource dataSource;
 
     public OraclePoolConnectionFactory(
             String connectionUrl,
@@ -40,22 +42,23 @@ public OraclePoolConnectionFactory(
             CredentialProvider credentialProvider,
             int connectionPoolMinSize,
             int connectionPoolMaxSize,
-            Duration inactiveConnectionTimeout)
+            Duration inactiveConnectionTimeout,
+            OpenTelemetry openTelemetry)
             throws SQLException
     {
-        this.dataSource = PoolDataSourceFactory.getPoolDataSource();
+        PoolDataSource dataSource = PoolDataSourceFactory.getPoolDataSource();
 
         //Setting connection properties of the data source
-        this.dataSource.setConnectionFactoryClassName(OracleDataSource.class.getName());
-        this.dataSource.setURL(connectionUrl);
+        dataSource.setConnectionFactoryClassName(OracleDataSource.class.getName());
+        dataSource.setURL(connectionUrl);
 
         //Setting pool properties
-        this.dataSource.setInitialPoolSize(connectionPoolMinSize);
-        this.dataSource.setMinPoolSize(connectionPoolMinSize);
-        this.dataSource.setMaxPoolSize(connectionPoolMaxSize);
-        this.dataSource.setValidateConnectionOnBorrow(true);
-        this.dataSource.setConnectionProperties(connectionProperties);
-        this.dataSource.setInactiveConnectionTimeout(toIntExact(inactiveConnectionTimeout.roundTo(SECONDS)));
+        dataSource.setInitialPoolSize(connectionPoolMinSize);
+        dataSource.setMinPoolSize(connectionPoolMinSize);
+        dataSource.setMaxPoolSize(connectionPoolMaxSize);
+        dataSource.setValidateConnectionOnBorrow(true);
+        dataSource.setConnectionProperties(connectionProperties);
+        dataSource.setInactiveConnectionTimeout(toIntExact(inactiveConnectionTimeout.roundTo(SECONDS)));
         credentialProvider.getConnectionUser(Optional.empty())
                 .ifPresent(user -> {
                     try {
@@ -74,6 +77,7 @@ public OraclePoolConnectionFactory(
                         throw new RuntimeException(e);
                     }
                 });
+        this.dataSource = new OpenTelemetryDataSource(dataSource, openTelemetry);
     }
 
     @Override
diff --git a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleSessionProperties.java b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleSessionProperties.java
index b6d7e5bb367d..5ef945261b97 100644
--- a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleSessionProperties.java
+++ b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleSessionProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.oracle;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.math.RoundingMode;
 import java.util.List;
 import java.util.Optional;
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/AbstractTestOracleTypeMapping.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/AbstractTestOracleTypeMapping.java
index 0142adc41591..55ddb20ab1e5 100644
--- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/AbstractTestOracleTypeMapping.java
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/AbstractTestOracleTypeMapping.java
@@ -52,7 +52,9 @@
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.TimeZoneKey.getTimeZoneKey;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_SECONDS;
+import static io.trino.spi.type.TimestampType.createTimestampType;
 import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
@@ -727,12 +729,176 @@ public void testTimestamp(ZoneId sessionZone)
                 .addRoundTrip("timestamp", timestampDataType(3).toLiteral(timeGapInKathmandu), TIMESTAMP_MILLIS, timestampDataType(3).toLiteral(timeGapInKathmandu))
                 // max value in Oracle
                 .addRoundTrip("timestamp", "TIMESTAMP '9999-12-31 00:00:00.000'", TIMESTAMP_MILLIS, "TIMESTAMP '9999-12-31 00:00:00.000'")
-                .execute(getQueryRunner(), session, oracleCreateAndInsert("test_timestamp"))
                 .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_timestamp"))
                 .execute(getQueryRunner(), session, trinoCreateAsSelect("test_timestamp"))
                 .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_timestamp"));
     }
 
+    @Test(dataProvider = "sessionZonesDataProvider")
+    public void testTimestampNanos(ZoneId sessionZone)
+    {
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        SqlDataTypeTest.create()
+                // min value in Oracle
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '-4712-01-01 00:00:00.000000000'", TIMESTAMP_NANOS, "TIMESTAMP '-4712-01-01 00:00:00.000000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '-0001-01-01 00:00:00.000000000'", TIMESTAMP_NANOS, "TIMESTAMP '-0001-01-01 00:00:00.000000000'")
+                // day before and after julian->gregorian calendar switch
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1582-10-04 00:00:00.000000000'", TIMESTAMP_NANOS, "TIMESTAMP '1582-10-04 00:00:00.000000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1582-10-15 00:00:00.000000000'", TIMESTAMP_NANOS, "TIMESTAMP '1582-10-15 00:00:00.000000000'")
+                // before epoch
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1958-01-01 13:18:03.123123123'", TIMESTAMP_NANOS, "TIMESTAMP '1958-01-01 13:18:03.123123123'")
+                // after epoch
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '2019-03-18 10:01:17.987987987'", TIMESTAMP_NANOS, "TIMESTAMP '2019-03-18 10:01:17.987987987'")
+                // epoch, epoch also is a gap in JVM zone
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1970-01-01 00:00:00.000000000'", TIMESTAMP_NANOS, "TIMESTAMP '1970-01-01 00:00:00.000000000'")
+                .addRoundTrip("TIMESTAMP(9)", timestampDataType(9).toLiteral(timeDoubledInJvmZone), TIMESTAMP_NANOS, timestampDataType(9).toLiteral(timeDoubledInJvmZone))
+                .addRoundTrip("TIMESTAMP(9)", timestampDataType(9).toLiteral(timeDoubledInVilnius), TIMESTAMP_NANOS, timestampDataType(9).toLiteral(timeDoubledInVilnius))
+                .addRoundTrip("TIMESTAMP(9)", timestampDataType(9).toLiteral(timeGapInJvmZone1), TIMESTAMP_NANOS, timestampDataType(9).toLiteral(timeGapInJvmZone1))
+                .addRoundTrip("TIMESTAMP(9)", timestampDataType(9).toLiteral(timeGapInJvmZone2), TIMESTAMP_NANOS, timestampDataType(9).toLiteral(timeGapInJvmZone2))
+                .addRoundTrip("TIMESTAMP(9)", timestampDataType(9).toLiteral(timeGapInVilnius), TIMESTAMP_NANOS, timestampDataType(9).toLiteral(timeGapInVilnius))
+                .addRoundTrip("TIMESTAMP(9)", timestampDataType(9).toLiteral(timeGapInKathmandu), TIMESTAMP_NANOS, timestampDataType(9).toLiteral(timeGapInKathmandu))
+                // max value in Oracle
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '9999-12-31 00:00:00.000000000'", TIMESTAMP_NANOS, "TIMESTAMP '9999-12-31 00:00:00.000000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '9999-12-31 23:59:59.999999999'", TIMESTAMP_NANOS, "TIMESTAMP '9999-12-31 23:59:59.999999999'")
+                .execute(getQueryRunner(), session, oracleCreateAndInsert("test_timestamp_nano"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_timestamp_nano"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_timestamp_nano"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_timestamp_nano"));
+    }
+
+    @Test(dataProvider = "sessionZonesDataProvider")
+    public void testTimestampAllPrecisions(ZoneId sessionZone)
+    {
+        SqlDataTypeTest tests = SqlDataTypeTest.create()
+                // before epoch
+                .addRoundTrip("TIMESTAMP '1958-01-01 13:18:03.123'", "TIMESTAMP '1958-01-01 13:18:03.123'")
+                // after epoch
+                .addRoundTrip("TIMESTAMP '2019-03-18 10:01:17.987'", "TIMESTAMP '2019-03-18 10:01:17.987'")
+                // time doubled in JVM zone
+                .addRoundTrip("TIMESTAMP '2018-10-28 01:33:17.456'", "TIMESTAMP '2018-10-28 01:33:17.456'")
+                // time double in Vilnius
+                .addRoundTrip("TIMESTAMP '2018-10-28 03:33:33.333'", "TIMESTAMP '2018-10-28 03:33:33.333'")
+                // epoch
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.000'", "TIMESTAMP '1970-01-01 00:00:00.000'")
+                // time gap in JVM zone
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:13:42.000'", "TIMESTAMP '1970-01-01 00:13:42.000'")
+                .addRoundTrip("TIMESTAMP '2018-04-01 02:13:55.123'", "TIMESTAMP '2018-04-01 02:13:55.123'")
+                // time gap in Vilnius
+                .addRoundTrip("TIMESTAMP '2018-03-25 03:17:17.000'", "TIMESTAMP '2018-03-25 03:17:17.000'")
+                // time gap in Kathmandu
+                .addRoundTrip("TIMESTAMP '1986-01-01 00:13:07.000'", "TIMESTAMP '1986-01-01 00:13:07.000'")
+
+                // same as above but with higher precision
+                .addRoundTrip("TIMESTAMP '1958-01-01 13:18:03.1230000'", "TIMESTAMP '1958-01-01 13:18:03.1230000'")
+                .addRoundTrip("TIMESTAMP '2019-03-18 10:01:17.9870000'", "TIMESTAMP '2019-03-18 10:01:17.9870000'")
+                .addRoundTrip("TIMESTAMP '2018-10-28 01:33:17.4560000'", "TIMESTAMP '2018-10-28 01:33:17.4560000'")
+                .addRoundTrip("TIMESTAMP '2018-10-28 03:33:33.3330000'", "TIMESTAMP '2018-10-28 03:33:33.3330000'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.0000000'", "TIMESTAMP '1970-01-01 00:00:00.0000000'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:13:42.0000000'", "TIMESTAMP '1970-01-01 00:13:42.0000000'")
+                .addRoundTrip("TIMESTAMP '2018-04-01 02:13:55.1230000'", "TIMESTAMP '2018-04-01 02:13:55.1230000'")
+                .addRoundTrip("TIMESTAMP '2018-03-25 03:17:17.0000000'", "TIMESTAMP '2018-03-25 03:17:17.0000000'")
+                .addRoundTrip("TIMESTAMP '1986-01-01 00:13:07.0000000'", "TIMESTAMP '1986-01-01 00:13:07.0000000'")
+
+                 // test arbitrary time for all supported precisions
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00'", "TIMESTAMP '1970-01-01 00:00:00'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.1'", "TIMESTAMP '1970-01-01 00:00:00.1'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.12'", "TIMESTAMP '1970-01-01 00:00:00.12'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.123'", "TIMESTAMP '1970-01-01 00:00:00.123'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.1234'", "TIMESTAMP '1970-01-01 00:00:00.1234'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.12345'", "TIMESTAMP '1970-01-01 00:00:00.12345'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.123456'", "TIMESTAMP '1970-01-01 00:00:00.123456'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.1234567'", "TIMESTAMP '1970-01-01 00:00:00.1234567'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.12345678'", "TIMESTAMP '1970-01-01 00:00:00.12345678'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.123456789'", "TIMESTAMP '1970-01-01 00:00:00.123456789'")
+                // rounds
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.987987987111'", "TIMESTAMP '1970-01-01 00:00:00.987987987'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.987987987999'", "TIMESTAMP '1970-01-01 00:00:00.987987988'")
+
+                // before epoch with second fraction
+                .addRoundTrip("TIMESTAMP '1969-12-31 23:59:59.1230000'", "TIMESTAMP '1969-12-31 23:59:59.1230000'")
+                .addRoundTrip("TIMESTAMP '1969-12-31 23:59:59.1234567'", "TIMESTAMP '1969-12-31 23:59:59.1234567'")
+                .addRoundTrip("TIMESTAMP '1969-12-31 23:59:59.123456789'", "TIMESTAMP '1969-12-31 23:59:59.123456789'")
+
+                // precision 0 ends up as precision 0
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.9'", "TIMESTAMP '1970-01-01 00:00:00.9'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.123000'", "TIMESTAMP '1970-01-01 00:00:00.123000'")
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.999'", "TIMESTAMP '1970-01-01 00:00:00.999'")
+                // max supported precision
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.123456000'", "TIMESTAMP '1970-01-01 00:00:00.123456000'")
+
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.1'", "TIMESTAMP '2020-09-27 12:34:56.1'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.9'", "TIMESTAMP '2020-09-27 12:34:56.9'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.123'", "TIMESTAMP '2020-09-27 12:34:56.123'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.123000'", "TIMESTAMP '2020-09-27 12:34:56.123000'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.999'", "TIMESTAMP '2020-09-27 12:34:56.999'")
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.1234567'", "TIMESTAMP '2020-09-27 12:34:56.1234567'")
+                // max supported precision
+                .addRoundTrip("TIMESTAMP '2020-09-27 12:34:56.123456789'", "TIMESTAMP '2020-09-27 12:34:56.123456789'")
+
+                // max precision
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.111222333444'", "TIMESTAMP '1970-01-01 00:00:00.111222333'")
+
+                 // round up to next second
+                .addRoundTrip("TIMESTAMP '1970-01-01 00:00:00.9999999995'", "TIMESTAMP '1970-01-01 00:00:01.000000000'")
+
+                // round up to next day
+                .addRoundTrip("TIMESTAMP '1970-01-01 23:59:59.9999999995'", "TIMESTAMP '1970-01-02 00:00:00.000000000'")
+
+                // negative epoch
+                .addRoundTrip("TIMESTAMP '1969-12-31 23:59:59.9999999995'", "TIMESTAMP '1970-01-01 00:00:00.000000000'")
+                .addRoundTrip("TIMESTAMP '1969-12-31 23:59:59.999999999499'", "TIMESTAMP '1969-12-31 23:59:59.999999999'")
+                .addRoundTrip("TIMESTAMP '1969-12-31 23:59:59.9999999994'", "TIMESTAMP '1969-12-31 23:59:59.999999999'");
+
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+        tests.execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_timestamp"));
+        tests.execute(getQueryRunner(), session, trinoCreateAsSelect("test_timestamp"));
+        tests.execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_timestamp"));
+        tests.execute(getQueryRunner(), session, trinoCreateAndInsert("test_timestamp"));
+    }
+
+    @Test
+    public void testTimestampAllPrecisionsOnOracle()
+    {
+        SqlDataTypeTest.create()
+                .addRoundTrip("TIMESTAMP(0)", "TIMESTAMP '1970-01-01 00:00:00'", createTimestampType(0), "TIMESTAMP '1970-01-01 00:00:00'")
+                .addRoundTrip("TIMESTAMP(1)", "TIMESTAMP '1970-01-01 00:00:00.1'", createTimestampType(1), "TIMESTAMP '1970-01-01 00:00:00.1'")
+                .addRoundTrip("TIMESTAMP(1)", "TIMESTAMP '1970-01-01 00:00:00.9'", createTimestampType(1), "TIMESTAMP '1970-01-01 00:00:00.9'")
+                .addRoundTrip("TIMESTAMP(3)", "TIMESTAMP '1970-01-01 00:00:00.123'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:00:00.123'")
+                .addRoundTrip("TIMESTAMP(6)", "TIMESTAMP '1970-01-01 00:00:00.123000'", createTimestampType(6), "TIMESTAMP '1970-01-01 00:00:00.123000'")
+                .addRoundTrip("TIMESTAMP(3)", "TIMESTAMP '1970-01-01 00:00:00.999'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:00:00.999'")
+                .addRoundTrip("TIMESTAMP(7)", "TIMESTAMP '1970-01-01 00:00:00.1234567'", createTimestampType(7), "TIMESTAMP '1970-01-01 00:00:00.1234567'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1970-01-01 00:00:00.123456789'", createTimestampType(9), "TIMESTAMP '1970-01-01 00:00:00.123456789'")
+                .addRoundTrip("TIMESTAMP(1)", "TIMESTAMP '2020-09-27 12:34:56.1'", createTimestampType(1), "TIMESTAMP '2020-09-27 12:34:56.1'")
+                .addRoundTrip("TIMESTAMP(1)", "TIMESTAMP '2020-09-27 12:34:56.9'", createTimestampType(1), "TIMESTAMP '2020-09-27 12:34:56.9'")
+                .addRoundTrip("TIMESTAMP(3)", "TIMESTAMP '2020-09-27 12:34:56.123'", createTimestampType(3), "TIMESTAMP '2020-09-27 12:34:56.123'")
+                .addRoundTrip("TIMESTAMP(6)", "TIMESTAMP '2020-09-27 12:34:56.123000'", createTimestampType(6), "TIMESTAMP '2020-09-27 12:34:56.123000'")
+                .addRoundTrip("TIMESTAMP(3)", "TIMESTAMP '2020-09-27 12:34:56.999'", createTimestampType(3), "TIMESTAMP '2020-09-27 12:34:56.999'")
+                .addRoundTrip("TIMESTAMP(7)", "TIMESTAMP '2020-09-27 12:34:56.1234567'", createTimestampType(7), "TIMESTAMP '2020-09-27 12:34:56.1234567'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '2020-09-27 12:34:56.123456789'", createTimestampType(9), "TIMESTAMP '2020-09-27 12:34:56.123456789'")
+
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1970-01-01 00:00:00'", createTimestampType(9), "TIMESTAMP '1970-01-01 00:00:00.000000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1970-01-01 00:00:00.1'", createTimestampType(9), "TIMESTAMP '1970-01-01 00:00:00.100000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1970-01-01 00:00:00.9'", createTimestampType(9), "TIMESTAMP '1970-01-01 00:00:00.900000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1970-01-01 00:00:00.123'", createTimestampType(9), "TIMESTAMP '1970-01-01 00:00:00.123000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1970-01-01 00:00:00.123000'", createTimestampType(9), "TIMESTAMP '1970-01-01 00:00:00.123000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1970-01-01 00:00:00.999'", createTimestampType(9), "TIMESTAMP '1970-01-01 00:00:00.999000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1970-01-01 00:00:00.1234567'", createTimestampType(9), "TIMESTAMP '1970-01-01 00:00:00.123456700'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '1970-01-01 00:00:00.123456789'", createTimestampType(9), "TIMESTAMP '1970-01-01 00:00:00.123456789'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '2020-09-27 12:34:56.1'", createTimestampType(9), "TIMESTAMP '2020-09-27 12:34:56.100000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '2020-09-27 12:34:56.9'", createTimestampType(9), "TIMESTAMP '2020-09-27 12:34:56.900000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '2020-09-27 12:34:56.123'", createTimestampType(9), "TIMESTAMP '2020-09-27 12:34:56.123000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '2020-09-27 12:34:56.123000'", createTimestampType(9), "TIMESTAMP '2020-09-27 12:34:56.123000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '2020-09-27 12:34:56.999'", createTimestampType(9), "TIMESTAMP '2020-09-27 12:34:56.999000000'")
+                .addRoundTrip("TIMESTAMP(9)", "TIMESTAMP '2020-09-27 12:34:56.1234567'", createTimestampType(9), "TIMESTAMP '2020-09-27 12:34:56.123456700'")
+
+                .execute(getQueryRunner(), oracleCreateAndInsert("test_ts_oracle"));
+    }
+
     @Test
     public void testJulianGregorianTimestamp()
     {
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorSmokeTest.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorSmokeTest.java
index b77adf2a9218..a1fad523f8e3 100644
--- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorSmokeTest.java
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorSmokeTest.java
@@ -15,7 +15,7 @@
 
 import io.trino.plugin.jdbc.BaseJdbcConnectorSmokeTest;
 import io.trino.testing.TestingConnectorBehavior;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -23,20 +23,14 @@
 public abstract class BaseOracleConnectorSmokeTest
         extends BaseJdbcConnectorSmokeTest
 {
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Test
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorTest.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorTest.java
index 4c3b4c9e3bae..0d9834820a8d 100644
--- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorTest.java
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorTest.java
@@ -33,53 +33,35 @@
 import static io.trino.spi.connector.ConnectorMetadata.MODIFYING_ROWS_MESSAGE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.testing.MaterializedResult.resultBuilder;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 
 public abstract class BaseOracleConnectorTest
         extends BaseJdbcConnectorTest
 {
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_AGGREGATION_PUSHDOWN:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_STDDEV:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_VARIANCE:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_COVARIANCE:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT:
-                return true;
-
-            case SUPPORTS_JOIN_PUSHDOWN:
-                return true;
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM:
-                return false;
-
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-            case SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN_WITH_COMMENT:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_JOIN_PUSHDOWN -> true;
+            case SUPPORTS_ADD_COLUMN_WITH_COMMENT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_CORRELATION,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_REGRESSION,
+                    SUPPORTS_ARRAY,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
+                    SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -93,17 +75,13 @@ protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMapp
     {
         String typeName = dataMappingTestSetup.getTrinoTypeName();
         if (typeName.equals("date")) {
-            // TODO (https://github.com/trinodb/trino/issues) Oracle connector stores wrong result when the date value <= 1582-10-14
-            if (dataMappingTestSetup.getSampleValueLiteral().equals("DATE '0001-01-01'")
-                    || dataMappingTestSetup.getSampleValueLiteral().equals("DATE '1582-10-04'")
-                    || dataMappingTestSetup.getSampleValueLiteral().equals("DATE '1582-10-05'")
-                    || dataMappingTestSetup.getSampleValueLiteral().equals("DATE '1582-10-14'")) {
+            // Oracle TO_DATE function returns +10 days during julian and gregorian calendar switch
+            if (dataMappingTestSetup.getSampleValueLiteral().equals("DATE '1582-10-05'")) {
                 return Optional.empty();
             }
         }
         if (typeName.equals("time") ||
                 typeName.equals("time(6)") ||
-                typeName.equals("timestamp(6)") ||
                 typeName.equals("timestamp(6) with time zone")) {
             return Optional.of(dataMappingTestSetup.asUnsupported());
         }
@@ -137,13 +115,14 @@ protected TestTable createTableWithUnsupportedColumn()
                 "(one NUMBER(19), two NUMBER, three VARCHAR2(10 CHAR))");
     }
 
-    @Test
+    @org.junit.jupiter.api.Test
     @Override
     public void testShowColumns()
     {
         assertThat(query("SHOW COLUMNS FROM orders")).matches(getDescribeOrdersResult());
     }
 
+    @org.junit.jupiter.api.Test
     @Override
     public void testInformationSchemaFiltering()
     {
@@ -200,6 +179,18 @@ public void testShowCreateTable()
                         ")");
     }
 
+    @Test
+    public void testTimestampOutOfPrecisionRounded()
+    {
+        String tableName = "test_timestamp_" + randomNameSuffix();
+
+        assertUpdate("CREATE TABLE " + tableName + " (t timestamp(12))");
+
+        assertEquals(getColumnType(tableName, "t"), "timestamp(9)");
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
     @Override
     public void testCharVarcharComparison()
     {
@@ -388,13 +379,6 @@ public void testNativeQuerySimple()
         assertQuery("SELECT * FROM TABLE(system.query(query => 'SELECT CAST(1 AS number(2, 1)) FROM DUAL'))", ("VALUES 1"));
     }
 
-    @Override
-    public void testNativeQueryColumnAlias()
-    {
-        assertThat(query(format("SELECT region_name FROM TABLE(system.query(query => 'SELECT name AS region_name FROM %s.region WHERE regionkey = 0'))", getSession().getSchema().orElseThrow())))
-                .matches("VALUES CAST('AFRICA' AS VARCHAR(25))");
-    }
-
     @Override
     public void testNativeQueryParameters()
     {
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleFailureRecoveryTest.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleFailureRecoveryTest.java
new file mode 100644
index 000000000000..a41f88860013
--- /dev/null
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleFailureRecoveryTest.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed 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 io.trino.plugin.oracle;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.operator.RetryPolicy;
+import io.trino.plugin.exchange.filesystem.FileSystemExchangePlugin;
+import io.trino.plugin.jdbc.BaseJdbcFailureRecoveryTest;
+import io.trino.testing.QueryRunner;
+import io.trino.testng.services.Flaky;
+import io.trino.tpch.TpchTable;
+import org.testng.SkipException;
+import org.testng.annotations.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static io.trino.plugin.oracle.OracleQueryRunner.createOracleQueryRunner;
+import static io.trino.plugin.oracle.TestingOracleServer.TEST_PASS;
+import static io.trino.plugin.oracle.TestingOracleServer.TEST_USER;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public abstract class BaseOracleFailureRecoveryTest
+        extends BaseJdbcFailureRecoveryTest
+{
+    public BaseOracleFailureRecoveryTest(RetryPolicy retryPolicy)
+    {
+        super(retryPolicy);
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner(
+            List<TpchTable<?>> requiredTpchTables,
+            Map<String, String> configProperties,
+            Map<String, String> coordinatorProperties)
+            throws Exception
+    {
+        TestingOracleServer oracleServer = new TestingOracleServer();
+        return createOracleQueryRunner(
+                closeAfterClass(oracleServer),
+                configProperties,
+                coordinatorProperties,
+                ImmutableMap.<String, String>builder()
+                        .put("connection-url", oracleServer.getJdbcUrl())
+                        .put("connection-user", TEST_USER)
+                        .put("connection-password", TEST_PASS)
+                        .buildOrThrow(),
+                requiredTpchTables,
+                runner -> {
+                    runner.installPlugin(new FileSystemExchangePlugin());
+                    runner.loadExchangeManager("filesystem", ImmutableMap.of(
+                            "exchange.base-directories", System.getProperty("java.io.tmpdir") + "/trino-local-file-system-exchange-manager"));
+                });
+    }
+
+    @Override
+    @Flaky(issue = "https://github.com/trinodb/trino/issues/16277", match = "There should be no remaining tmp_trino tables that are queryable")
+    @Test(dataProvider = "parallelTests")
+    public void testParallel(Runnable runnable)
+    {
+        super.testParallel(runnable);
+    }
+
+    @Override
+    protected void testUpdateWithSubquery()
+    {
+        assertThatThrownBy(super::testUpdateWithSubquery).hasMessageContaining("Unexpected Join over for-update table scan");
+        throw new SkipException("skipped");
+    }
+
+    @Override
+    protected void testUpdate()
+    {
+        // This simple update on JDBC ends up as a very simple, single-fragment, coordinator-only plan,
+        // which has no ability to recover from errors. This test simply verifies that's still the case.
+        Optional<String> setupQuery = Optional.of("CREATE TABLE <table> AS SELECT * FROM orders");
+        String testQuery = "UPDATE <table> SET shippriority = 101 WHERE custkey = 1";
+        Optional<String> cleanupQuery = Optional.of("DROP TABLE <table>");
+
+        assertThatQuery(testQuery)
+                .withSetupQuery(setupQuery)
+                .withCleanupQuery(cleanupQuery)
+                .isCoordinatorOnly();
+    }
+}
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/OracleDataTypes.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/OracleDataTypes.java
index 175a23d8d655..6f36d7636710 100644
--- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/OracleDataTypes.java
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/OracleDataTypes.java
@@ -29,7 +29,6 @@ public final class OracleDataTypes
 {
     private OracleDataTypes() {}
 
-    @SuppressWarnings("MisusedWeekYear")
     public static DataType<ZonedDateTime> oracleTimestamp3TimeZoneDataType()
     {
         return dataType(
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/OracleQueryRunner.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/OracleQueryRunner.java
index e952dff6d663..5be46a30b913 100644
--- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/OracleQueryRunner.java
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/OracleQueryRunner.java
@@ -18,9 +18,11 @@
 import io.trino.Session;
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
 
 import java.util.Map;
+import java.util.function.Consumer;
 
 import static io.airlift.testing.Closeables.closeAllSuppress;
 import static io.trino.plugin.oracle.TestingOracleServer.TEST_PASS;
@@ -40,11 +42,25 @@ public static DistributedQueryRunner createOracleQueryRunner(
             Map<String, String> connectorProperties,
             Iterable<TpchTable<?>> tables)
             throws Exception
+    {
+        return createOracleQueryRunner(server, extraProperties, Map.of(), connectorProperties, tables, queryRunner -> {});
+    }
+
+    public static DistributedQueryRunner createOracleQueryRunner(
+            TestingOracleServer server,
+            Map<String, String> extraProperties,
+            Map<String, String> coordinatorProperties,
+            Map<String, String> connectorProperties,
+            Iterable<TpchTable<?>> tables,
+            Consumer<QueryRunner> moreSetup)
+            throws Exception
     {
         DistributedQueryRunner queryRunner = null;
         try {
             queryRunner = DistributedQueryRunner.builder(createSession())
                     .setExtraProperties(extraProperties)
+                    .setCoordinatorProperties(coordinatorProperties)
+                    .setAdditionalSetup(moreSetup)
                     .build();
 
             queryRunner.installPlugin(new TpchPlugin());
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleCaseInsensitiveMapping.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleCaseInsensitiveMapping.java
index 85d8e30344e9..d5b3b2fe0dfa 100644
--- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleCaseInsensitiveMapping.java
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleCaseInsensitiveMapping.java
@@ -18,13 +18,13 @@
 import io.trino.plugin.jdbc.BaseCaseInsensitiveMappingTest;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.SqlExecutor;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
 import java.util.Optional;
 
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.REFRESH_PERIOD_DURATION;
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.REFRESH_PERIOD_DURATION;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
 import static io.trino.plugin.oracle.OracleQueryRunner.createOracleQueryRunner;
 import static io.trino.plugin.oracle.TestingOracleServer.TEST_USER;
 import static java.lang.String.format;
@@ -32,7 +32,6 @@
 
 // With case-insensitive-name-matching enabled colliding schema/table names are considered as errors.
 // Some tests here create colliding names which can cause any other concurrent test to fail.
-@Test(singleThreaded = true)
 public class TestOracleCaseInsensitiveMapping
         extends BaseCaseInsensitiveMappingTest
 {
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleClient.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleClient.java
index 2a4afa2b6f23..9685fa756e2d 100644
--- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleClient.java
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleClient.java
@@ -13,13 +13,13 @@
  */
 package io.trino.plugin.oracle;
 
+import io.trino.plugin.base.mapping.DefaultIdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.DefaultQueryBuilder;
 import io.trino.plugin.jdbc.JdbcClient;
 import io.trino.plugin.jdbc.WriteFunction;
 import io.trino.plugin.jdbc.WriteMapping;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.DefaultIdentifierMapping;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
 import io.trino.testing.TestingConnectorSession;
@@ -41,7 +41,9 @@
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.RealType.REAL;
 import static io.trino.spi.type.SmallintType.SMALLINT;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_MICROS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
+import static io.trino.spi.type.TimestampType.TIMESTAMP_NANOS;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_SECONDS;
 import static io.trino.spi.type.TimestampWithTimeZoneType.TIMESTAMP_TZ_MILLIS;
 import static io.trino.spi.type.TinyintType.TINYINT;
@@ -112,7 +114,9 @@ public Object[][] writeMappingsProvider()
                 {createUnboundedVarcharType(), "?", Types.VARCHAR},
                 {createVarcharType(123), "?", Types.VARCHAR},
                 {TIMESTAMP_SECONDS, "TO_DATE(?, 'SYYYY-MM-DD HH24:MI:SS')", Types.VARCHAR},
-                {TIMESTAMP_MILLIS, "TO_TIMESTAMP(?, 'SYYYY-MM-DD HH24:MI:SS.FF')", Types.VARCHAR},
+                {TIMESTAMP_MILLIS, "TO_TIMESTAMP(?, 'SYYYY-MM-DD HH24:MI:SS.FF3')", Types.VARCHAR},
+                {TIMESTAMP_MICROS, "TO_TIMESTAMP(?, 'SYYYY-MM-DD HH24:MI:SS.FF6')", Types.VARCHAR},
+                {TIMESTAMP_NANOS, "TO_TIMESTAMP(?, 'SYYYY-MM-DD HH24:MI:SS.FF9')", Types.VARCHAR},
                 {TIMESTAMP_TZ_MILLIS, "?", OracleTypes.TIMESTAMPTZ},
                 {DATE, "TO_DATE(?, 'SYYYY-MM-DD')", Types.VARCHAR},
         };
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleConfig.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleConfig.java
index fb561e38a55a..204937256537 100644
--- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleConfig.java
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleConfig.java
@@ -15,11 +15,10 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 import org.testng.annotations.Test;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-
 import java.math.RoundingMode;
 import java.util.Map;
 
@@ -36,7 +35,6 @@ public class TestOracleConfig
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(OracleConfig.class)
-                .setDisableAutomaticFetchSize(false)
                 .setSynonymsEnabled(false)
                 .setRemarksReportingEnabled(false)
                 .setDefaultNumberScale(null)
@@ -51,7 +49,6 @@ public void testDefaults()
     public void testExplicitPropertyMappings()
     {
         Map<String, String> properties = ImmutableMap.<String, String>builder()
-                .put("oracle.disable-automatic-fetch-size", "true")
                 .put("oracle.synonyms.enabled", "true")
                 .put("oracle.remarks-reporting.enabled", "true")
                 .put("oracle.number.default-scale", "2")
@@ -63,7 +60,6 @@ public void testExplicitPropertyMappings()
                 .buildOrThrow();
 
         OracleConfig expected = new OracleConfig()
-                .setDisableAutomaticFetchSize(true)
                 .setSynonymsEnabled(true)
                 .setRemarksReportingEnabled(true)
                 .setDefaultNumberScale(2)
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleConnectorTest.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleConnectorTest.java
index a526aa6ebb22..af499f537977 100644
--- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleConnectorTest.java
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleConnectorTest.java
@@ -17,21 +17,24 @@
 import io.airlift.testing.Closeables;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.SqlExecutor;
+import io.trino.testing.sql.TestTable;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
-import java.io.IOException;
-
+import static io.trino.plugin.jdbc.DefaultJdbcMetadata.DEFAULT_COLUMN_ALIAS_LENGTH;
 import static io.trino.plugin.oracle.TestingOracleServer.TEST_PASS;
 import static io.trino.plugin.oracle.TestingOracleServer.TEST_SCHEMA;
 import static io.trino.plugin.oracle.TestingOracleServer.TEST_USER;
 import static java.lang.String.format;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.IntStream.range;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestOracleConnectorTest
         extends BaseOracleConnectorTest
 {
+    private static final String MAXIMUM_LENGTH_COLUMN_IDENTIFIER = "z".repeat(DEFAULT_COLUMN_ALIAS_LENGTH);
+
     private TestingOracleServer oracleServer;
 
     @Override
@@ -54,7 +57,7 @@ protected QueryRunner createQueryRunner()
 
     @AfterClass(alwaysRun = true)
     public final void destroy()
-            throws IOException
+            throws Exception
     {
         Closeables.closeAll(oracleServer);
         oracleServer = null;
@@ -83,6 +86,30 @@ private String getLongInClause(int start, int length)
     @Override
     protected SqlExecutor onRemoteDatabase()
     {
-        return oracleServer::execute;
+        return new SqlExecutor() {
+            @Override
+            public boolean supportsMultiRowInsert()
+            {
+                return false;
+            }
+
+            @Override
+            public void execute(String sql)
+            {
+                oracleServer.execute(sql);
+            }
+        };
+    }
+
+    @Test
+    public void testPushdownJoinWithLongNameSucceeds()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "long_identifier", "(%s bigint)".formatted(MAXIMUM_LENGTH_COLUMN_IDENTIFIER))) {
+            assertThat(query(joinPushdownEnabled(getSession()), """
+                    SELECT r.name, t.%s, n.name
+                    FROM %s t JOIN region r ON r.regionkey = t.%s
+                    JOIN nation n ON r.regionkey = n.regionkey""".formatted(MAXIMUM_LENGTH_COLUMN_IDENTIFIER, table.getName(), MAXIMUM_LENGTH_COLUMN_IDENTIFIER)))
+                    .isFullyPushedDown();
+        }
     }
 }
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOraclePoolConnectorSmokeTest.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOraclePoolConnectorSmokeTest.java
index 2deb53361b7c..f22b0d7053b4 100644
--- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOraclePoolConnectorSmokeTest.java
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOraclePoolConnectorSmokeTest.java
@@ -16,16 +16,19 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.testing.Closeables;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-
-import java.io.IOException;
+import io.trino.testng.services.ManageTestResources;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.plugin.oracle.TestingOracleServer.TEST_PASS;
 import static io.trino.plugin.oracle.TestingOracleServer.TEST_USER;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestOraclePoolConnectorSmokeTest
         extends BaseOracleConnectorSmokeTest
 {
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
     private TestingOracleServer oracleServer;
 
     @Override
@@ -45,9 +48,9 @@ protected QueryRunner createQueryRunner()
                 REQUIRED_TPCH_TABLES);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public final void destroy()
-            throws IOException
+            throws Exception
     {
         Closeables.closeAll(oracleServer);
         oracleServer = null;
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleQueryFailureRecoveryTest.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleQueryFailureRecoveryTest.java
new file mode 100644
index 000000000000..388e12602d99
--- /dev/null
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleQueryFailureRecoveryTest.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.oracle;
+
+import io.trino.operator.RetryPolicy;
+
+public class TestOracleQueryFailureRecoveryTest
+        extends BaseOracleFailureRecoveryTest
+{
+    public TestOracleQueryFailureRecoveryTest()
+    {
+        super(RetryPolicy.QUERY);
+    }
+}
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleTaskFailureRecoveryTest.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleTaskFailureRecoveryTest.java
new file mode 100644
index 000000000000..9b0f4a3ef23b
--- /dev/null
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleTaskFailureRecoveryTest.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.oracle;
+
+import io.trino.operator.RetryPolicy;
+
+public class TestOracleTaskFailureRecoveryTest
+        extends BaseOracleFailureRecoveryTest
+{
+    public TestOracleTaskFailureRecoveryTest()
+    {
+        super(RetryPolicy.TASK);
+    }
+}
diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestingOracleServer.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestingOracleServer.java
index afbcae416c90..6bf8e1ed04d9 100644
--- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestingOracleServer.java
+++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestingOracleServer.java
@@ -22,7 +22,9 @@
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DriverConnectionFactory;
 import io.trino.plugin.jdbc.RetryingConnectionFactory;
+import io.trino.plugin.jdbc.RetryingConnectionFactory.DefaultRetryStrategy;
 import io.trino.plugin.jdbc.credential.StaticCredentialProvider;
+import io.trino.plugin.jdbc.jmx.StatisticsAwareConnectionFactory;
 import io.trino.testing.ResourcePresence;
 import oracle.jdbc.OracleDriver;
 import org.testcontainers.containers.OracleContainer;
@@ -40,10 +42,11 @@
 import java.time.temporal.ChronoUnit;
 
 import static io.trino.testing.TestingConnectorSession.SESSION;
+import static io.trino.testing.containers.TestContainers.startOrReuse;
 import static java.lang.String.format;
 
 public class TestingOracleServer
-        implements Closeable
+        implements AutoCloseable
 {
     private static final Logger log = Logger.get(TestingOracleServer.class);
 
@@ -64,6 +67,8 @@ public class TestingOracleServer
 
     private final OracleContainer container;
 
+    private Closeable cleanup = () -> {};
+
     public TestingOracleServer()
     {
         container = Failsafe.with(CONTAINER_RETRY_POLICY).get(this::createContainer);
@@ -76,7 +81,7 @@ private OracleContainer createContainer()
                 .withCopyFileToContainer(MountableFile.forClasspathResource("restart.sh"), "/container-entrypoint-initdb.d/02-restart.sh")
                 .withCopyFileToContainer(MountableFile.forHostPath(createConfigureScript()), "/container-entrypoint-initdb.d/03-create-users.sql")
                 .usingSid();
-        container.start();
+        cleanup = startOrReuse(container);
         return container;
     }
 
@@ -122,17 +127,22 @@ public void execute(String sql, String user, String password)
 
     private ConnectionFactory getConnectionFactory(String connectionUrl, String username, String password)
     {
-        DriverConnectionFactory connectionFactory = new DriverConnectionFactory(
+        StatisticsAwareConnectionFactory connectionFactory = new StatisticsAwareConnectionFactory(new DriverConnectionFactory(
                 new OracleDriver(),
                 new BaseJdbcConfig().setConnectionUrl(connectionUrl),
-                StaticCredentialProvider.of(username, password));
-        return new RetryingConnectionFactory(connectionFactory);
+                StaticCredentialProvider.of(username, password)));
+        return new RetryingConnectionFactory(connectionFactory, new DefaultRetryStrategy());
     }
 
     @Override
     public void close()
     {
-        container.stop();
+        try {
+            cleanup.close();
+        }
+        catch (IOException ioe) {
+            throw new UncheckedIOException(ioe);
+        }
     }
 
     @ResourcePresence
diff --git a/plugin/trino-password-authenticators/pom.xml b/plugin/trino-password-authenticators/pom.xml
index 04c53113dec5..7d1a849924fa 100644
--- a/plugin/trino-password-authenticators/pom.xml
+++ b/plugin/trino-password-authenticators/pom.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-password-authenticators</artifactId>
-    <description>Trino - Password Authenticators</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Password Authenticators</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,13 +19,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <groupId>at.favre.lib</groupId>
+            <artifactId>bcrypt</artifactId>
+            <version>0.10.2</version>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -54,47 +60,47 @@
         </dependency>
 
         <dependency>
-            <groupId>at.favre.lib</groupId>
-            <artifactId>bcrypt</artifactId>
-            <version>0.9.0</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -104,10 +110,10 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
+            <groupId>eu.rekawek.toxiproxy</groupId>
+            <artifactId>toxiproxy-java</artifactId>
+            <version>2.1.7</version>
             <scope>test</scope>
         </dependency>
 
@@ -118,9 +124,8 @@
         </dependency>
 
         <dependency>
-            <groupId>eu.rekawek.toxiproxy</groupId>
-            <artifactId>toxiproxy-java</artifactId>
-            <version>2.1.7</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileAuthenticator.java b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileAuthenticator.java
index 65574a09f288..2e8e9dec33c4 100644
--- a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileAuthenticator.java
+++ b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileAuthenticator.java
@@ -13,12 +13,11 @@
  */
 package io.trino.plugin.password.file;
 
+import com.google.inject.Inject;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.PasswordAuthenticator;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.security.Principal;
 import java.util.function.Supplier;
diff --git a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileConfig.java b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileConfig.java
index 277466edbaf4..4caf8829f084 100644
--- a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileConfig.java
+++ b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileConfig.java
@@ -18,8 +18,7 @@
 import io.airlift.configuration.validation.FileExists;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 
diff --git a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileGroupConfig.java b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileGroupConfig.java
index bcbbf8c60f51..8ec8c390340b 100644
--- a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileGroupConfig.java
+++ b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileGroupConfig.java
@@ -18,8 +18,7 @@
 import io.airlift.configuration.validation.FileExists;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 
diff --git a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileGroupProvider.java b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileGroupProvider.java
index 6ee2160c0dee..4fb1d583a03c 100644
--- a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileGroupProvider.java
+++ b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/FileGroupProvider.java
@@ -17,11 +17,10 @@
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
+import com.google.inject.Inject;
 import io.trino.spi.TrinoException;
 import io.trino.spi.security.GroupProvider;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/PasswordStore.java b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/PasswordStore.java
index 2c2fe36878ec..61920187df12 100644
--- a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/PasswordStore.java
+++ b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/file/PasswordStore.java
@@ -18,7 +18,7 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.collect.ImmutableMap;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.plugin.password.Credential;
 import io.trino.spi.TrinoException;
 
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.plugin.password.file.EncryptionUtil.doesBCryptPasswordMatch;
 import static io.trino.plugin.password.file.EncryptionUtil.doesPBKDF2PasswordMatch;
 import static io.trino.plugin.password.file.EncryptionUtil.getHashingAlgorithm;
diff --git a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/ldap/LdapAuthenticator.java b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/ldap/LdapAuthenticator.java
index f66660f058d8..aea1599f62c2 100644
--- a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/ldap/LdapAuthenticator.java
+++ b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/ldap/LdapAuthenticator.java
@@ -18,15 +18,15 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
-import io.trino.collect.cache.NonKeyEvictableLoadingCache;
+import io.trino.cache.NonKeyEvictableLoadingCache;
 import io.trino.plugin.password.Credential;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.BasicPrincipal;
 import io.trino.spi.security.PasswordAuthenticator;
 
-import javax.inject.Inject;
 import javax.naming.NamingException;
 
 import java.security.Principal;
@@ -37,7 +37,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
+import static io.trino.cache.SafeCaches.buildNonEvictableCacheWithWeakInvalidateAll;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/ldap/LdapAuthenticatorClient.java b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/ldap/LdapAuthenticatorClient.java
index 2f3fe6524fd9..19cc139b039e 100644
--- a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/ldap/LdapAuthenticatorClient.java
+++ b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/ldap/LdapAuthenticatorClient.java
@@ -14,10 +14,10 @@
 package io.trino.plugin.password.ldap;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.plugin.base.ldap.LdapClient;
 import io.trino.plugin.base.ldap.LdapQuery;
 
-import javax.inject.Inject;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 
diff --git a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/ldap/LdapAuthenticatorConfig.java b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/ldap/LdapAuthenticatorConfig.java
index fa1750ff3171..afa45f7cfca4 100644
--- a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/ldap/LdapAuthenticatorConfig.java
+++ b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/ldap/LdapAuthenticatorConfig.java
@@ -19,8 +19,7 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
diff --git a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/salesforce/SalesforceAuthenticationClient.java b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/salesforce/SalesforceAuthenticationClient.java
index 3b27956454e4..dac94d094c0c 100644
--- a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/salesforce/SalesforceAuthenticationClient.java
+++ b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/salesforce/SalesforceAuthenticationClient.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.password.salesforce;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface SalesforceAuthenticationClient
 {
 }
diff --git a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/salesforce/SalesforceBasicAuthenticator.java b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/salesforce/SalesforceBasicAuthenticator.java
index 85b40cc17fe7..3e591fef7f30 100644
--- a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/salesforce/SalesforceBasicAuthenticator.java
+++ b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/salesforce/SalesforceBasicAuthenticator.java
@@ -18,11 +18,12 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.escape.Escaper;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.inject.Inject;
 import io.airlift.http.client.HttpClient;
 import io.airlift.http.client.Request;
 import io.airlift.http.client.StringResponseHandler;
 import io.airlift.log.Logger;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.plugin.password.Credential;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.BasicPrincipal;
@@ -32,7 +33,6 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import javax.inject.Inject;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -48,7 +48,7 @@
 import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static com.google.common.xml.XmlEscapers.xmlContentEscaper;
 import static io.airlift.http.client.StaticBodyGenerator.createStaticBodyGenerator;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/salesforce/SalesforceConfig.java b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/salesforce/SalesforceConfig.java
index e39b9ca027d7..9080a101818e 100644
--- a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/salesforce/SalesforceConfig.java
+++ b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/salesforce/SalesforceConfig.java
@@ -17,8 +17,7 @@
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
 import io.airlift.units.MaxDuration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.HashSet;
 import java.util.Locale;
diff --git a/plugin/trino-phoenix5/pom.xml b/plugin/trino-phoenix5/pom.xml
index d1b60741f358..f608cd113b80 100644
--- a/plugin/trino-phoenix5/pom.xml
+++ b/plugin/trino-phoenix5/pom.xml
@@ -1,30 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-phoenix5</artifactId>
-    <description>Trino - Phoenix 5 Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Phoenix 5 Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
         <dep.hbase.version>2.2.6</dep.hbase.version>
 
         <!-- This is required for JDK 17 to start HBase server due to illegal reflective access -->
-        <air.test.jvm.additional-arguments>
-            --add-opens=java.base/sun.nio.ch=ALL-UNNAMED
-            --add-opens=java.base/java.nio=ALL-UNNAMED
-        </air.test.jvm.additional-arguments>
+        <air.test.jvm.additional-arguments>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED</air.test.jvm.additional-arguments>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>bootstrap</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -48,71 +75,89 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>org.weakref</groupId>
+            <artifactId>jmxutils</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
         </dependency>
 
+        <!-- TODO: This explicit dependency can be removed once we update to Phoenix 5.1.4 which includes
+        https://github.com/apache/phoenix/commit/cd35c5239bd7e3f263d3f2a99ce1b996205bde4b -->
+        <!-- Phoenix depends on log4j api and since it's banned, let's use hardened API-compatible fork -->
         <dependency>
-            <groupId>org.gaul</groupId>
-            <artifactId>modernizer-maven-annotations</artifactId>
+            <groupId>ch.qos.reload4j</groupId>
+            <artifactId>reload4j</artifactId>
+            <version>1.2.25</version>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.weakref</groupId>
-            <artifactId>jmxutils</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>log-manager</artifactId>
@@ -133,38 +178,12 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Trino SPI -->
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -202,14 +221,14 @@
             <artifactId>trino-testing</artifactId>
             <scope>test</scope>
             <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>junit</groupId>
                     <artifactId>junit</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -231,17 +250,11 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-hdfs</artifactId>
-            <type>test-jar</type>
             <version>3.1.4</version>
+            <type>test-jar</type>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -254,8 +267,8 @@
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-common</artifactId>
-            <type>test-jar</type>
             <version>${dep.hbase.version}</version>
+            <type>test-jar</type>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -268,8 +281,8 @@
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-hadoop-compat</artifactId>
-            <type>test-jar</type>
             <version>${dep.hbase.version}</version>
+            <type>test-jar</type>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -282,8 +295,8 @@
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-hadoop2-compat</artifactId>
-            <type>test-jar</type>
             <version>${dep.hbase.version}</version>
+            <type>test-jar</type>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -296,8 +309,8 @@
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-server</artifactId>
-            <type>test-jar</type>
             <version>${dep.hbase.version}</version>
+            <type>test-jar</type>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -310,8 +323,8 @@
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-zookeeper</artifactId>
-            <type>test-jar</type>
             <version>${dep.hbase.version}</version>
+            <type>test-jar</type>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -362,13 +375,34 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.basepom.maven</groupId>
                 <artifactId>duplicate-finder-maven-plugin</artifactId>
                 <configuration>
                     <ignoredResourcePatterns>
                         <ignoredResourcePattern>mrapp-generated-classpath</ignoredResourcePattern>
-                        <ignoredResourcePattern>about.html</ignoredResourcePattern>
                         <!-- org.apache.commons:commons-math3 french localization file duplicate-->
                         <ignoredResourcePattern>assets/org/apache/commons/math3/exception/util/LocalizedFormats_fr.properties</ignoredResourcePattern>
                         <!-- io.airlift:joni and phoenix-client's org.jruby.joni:joni resource duplicates-->
@@ -403,7 +437,7 @@
                 <dependency>
                     <groupId>org.apache.phoenix</groupId>
                     <artifactId>phoenix-client-embedded-hbase-2.2</artifactId>
-                    <version>5.1.2</version>
+                    <version>5.1.3</version>
                     <scope>provided</scope>
                     <optional>true</optional>
                 </dependency>
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/MetadataUtil.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/MetadataUtil.java
index 6d15216cdda8..072b14605149 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/MetadataUtil.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/MetadataUtil.java
@@ -13,10 +13,9 @@
  */
 package io.trino.plugin.phoenix5;
 
+import jakarta.annotation.Nullable;
 import org.apache.phoenix.util.SchemaUtil;
 
-import javax.annotation.Nullable;
-
 import static io.trino.plugin.phoenix5.PhoenixMetadata.DEFAULT_SCHEMA;
 
 public final class MetadataUtil
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixClient.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixClient.java
index 8a8176ff78b2..9a381e6b1043 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixClient.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixClient.java
@@ -16,7 +16,10 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.plugin.base.expression.ConnectorExpressionRewriter;
+import io.trino.plugin.base.mapping.IdentifierMapping;
+import io.trino.plugin.base.mapping.RemoteIdentifiers;
 import io.trino.plugin.jdbc.BaseJdbcClient;
 import io.trino.plugin.jdbc.ColumnMapping;
 import io.trino.plugin.jdbc.ConnectionFactory;
@@ -40,7 +43,6 @@
 import io.trino.plugin.jdbc.expression.ParameterizedExpression;
 import io.trino.plugin.jdbc.expression.RewriteComparison;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.connector.ColumnHandle;
@@ -98,8 +100,6 @@
 import org.apache.phoenix.schema.types.PhoenixArray;
 import org.apache.phoenix.util.SchemaUtil;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -117,6 +117,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.Set;
 import java.util.StringJoiner;
 import java.util.function.BiFunction;
@@ -174,6 +175,7 @@
 import static io.trino.plugin.phoenix5.TypeUtils.toBoxedArray;
 import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.connector.ConnectorMetadata.MODIFYING_ROWS_MESSAGE;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DateType.DATE;
@@ -309,7 +311,7 @@ public PreparedStatement buildSql(ConnectorSession session, Connection connectio
                 table,
                 columnHandles,
                 Optional.of(split));
-        QueryPlan queryPlan = getQueryPlan((PhoenixPreparedStatement) query);
+        QueryPlan queryPlan = getQueryPlan(query.unwrap(PhoenixPreparedStatement.class));
         ResultSet resultSet = getResultSet(((PhoenixSplit) split).getPhoenixInputSplit(), queryPlan);
         return new DelegatePreparedStatement(query)
         {
@@ -359,6 +361,12 @@ public boolean isTopNGuaranteed(ConnectorSession session)
         return false;
     }
 
+    @Override
+    public OptionalLong update(ConnectorSession session, JdbcTableHandle handle)
+    {
+        throw new TrinoException(NOT_SUPPORTED, MODIFYING_ROWS_MESSAGE);
+    }
+
     @Override
     protected Optional<BiFunction<String, Long, String>> limitFunction()
     {
@@ -613,8 +621,9 @@ public JdbcOutputTableHandle beginCreateTable(ConnectorSession session, Connecto
 
         try (Connection connection = connectionFactory.openConnection(session)) {
             ConnectorIdentity identity = session.getIdentity();
-            schema = getIdentifierMapping().toRemoteSchemaName(identity, connection, schema);
-            table = getIdentifierMapping().toRemoteTableName(identity, connection, schema, table);
+            RemoteIdentifiers remoteIdentifiers = getRemoteIdentifiers(connection);
+            schema = getIdentifierMapping().toRemoteSchemaName(remoteIdentifiers, identity, schema);
+            table = getIdentifierMapping().toRemoteTableName(remoteIdentifiers, identity, schema, table);
             schema = toPhoenixSchemaName(schema);
             LinkedList<ColumnMetadata> tableColumns = new LinkedList<>(tableMetadata.getColumns());
             Map<String, Object> tableProperties = tableMetadata.getProperties();
@@ -638,7 +647,7 @@ public JdbcOutputTableHandle beginCreateTable(ConnectorSession session, Connecto
                 if (column.getComment() != null) {
                     throw new TrinoException(NOT_SUPPORTED, "This connector does not support creating tables with column comment");
                 }
-                String columnName = getIdentifierMapping().toRemoteColumnName(connection, column.getName());
+                String columnName = getIdentifierMapping().toRemoteColumnName(remoteIdentifiers, column.getName());
                 columnNames.add(columnName);
                 columnTypes.add(column.getType());
                 String typeStatement = toWriteMapping(session, column.getType()).getDataType();
@@ -943,7 +952,8 @@ public JdbcTableHandle updatedScanColumnTable(ConnectorSession session, Connecto
                 Optional.of(getUpdatedScanColumnHandles(session, tableHandle, scanColumnHandles, mergeRowIdColumnHandle)),
                 tableHandle.getOtherReferencedTables(),
                 tableHandle.getNextSyntheticColumnId(),
-                tableHandle.getAuthorization());
+                tableHandle.getAuthorization(),
+                tableHandle.getUpdateAssignments());
     }
 
     private List<JdbcColumnHandle> getUpdatedScanColumnHandles(ConnectorSession session, JdbcTableHandle tableHandle, List<JdbcColumnHandle> scanColumnHandles, JdbcColumnHandle mergeRowIdColumnHandle)
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixClientModule.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixClientModule.java
index 2882806c887d..c18bdc26d041 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixClientModule.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixClientModule.java
@@ -19,11 +19,13 @@
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorMetadata;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorPageSinkProvider;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorPageSourceProvider;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorSplitManager;
 import io.trino.plugin.base.classloader.ForClassLoaderSafe;
+import io.trino.plugin.base.mapping.IdentifierMappingModule;
 import io.trino.plugin.jdbc.ConfiguringConnectionFactory;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DecimalModule;
@@ -32,7 +34,6 @@
 import io.trino.plugin.jdbc.DynamicFilteringStats;
 import io.trino.plugin.jdbc.ForBaseJdbc;
 import io.trino.plugin.jdbc.ForJdbcDynamicFiltering;
-import io.trino.plugin.jdbc.ForLazyConnectionFactory;
 import io.trino.plugin.jdbc.ForRecordCursor;
 import io.trino.plugin.jdbc.JdbcClient;
 import io.trino.plugin.jdbc.JdbcDiagnosticModule;
@@ -46,25 +47,24 @@
 import io.trino.plugin.jdbc.LazyConnectionFactory;
 import io.trino.plugin.jdbc.MaxDomainCompactionThreshold;
 import io.trino.plugin.jdbc.QueryBuilder;
+import io.trino.plugin.jdbc.RetryingConnectionFactoryModule;
 import io.trino.plugin.jdbc.ReusableConnectionFactoryModule;
 import io.trino.plugin.jdbc.StatsCollecting;
 import io.trino.plugin.jdbc.TypeHandlingJdbcConfig;
 import io.trino.plugin.jdbc.TypeHandlingJdbcSessionProperties;
 import io.trino.plugin.jdbc.credential.EmptyCredentialProvider;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifierModule;
-import io.trino.plugin.jdbc.mapping.IdentifierMappingModule;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorPageSinkProvider;
 import io.trino.spi.connector.ConnectorPageSourceProvider;
 import io.trino.spi.connector.ConnectorSplitManager;
+import jakarta.annotation.PreDestroy;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.phoenix.jdbc.PhoenixDriver;
 import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
 
-import javax.annotation.PreDestroy;
-
 import java.sql.SQLException;
 import java.util.Map;
 import java.util.Properties;
@@ -97,6 +97,7 @@ public PhoenixClientModule(String catalogName)
     protected void setup(Binder binder)
     {
         install(new RemoteQueryModifierModule());
+        install(new RetryingConnectionFactoryModule());
         binder.bind(ConnectorSplitManager.class).annotatedWith(ForJdbcDynamicFiltering.class).to(PhoenixSplitManager.class).in(Scopes.SINGLETON);
         binder.bind(ConnectorSplitManager.class).annotatedWith(ForClassLoaderSafe.class).to(JdbcDynamicFilteringSplitManager.class).in(Scopes.SINGLETON);
         binder.bind(ConnectorSplitManager.class).to(ClassLoaderSafeConnectorSplitManager.class).in(Scopes.SINGLETON);
@@ -130,10 +131,6 @@ protected void setup(Binder binder)
         binder.bind(ConnectorMetadata.class).annotatedWith(ForClassLoaderSafe.class).to(PhoenixMetadata.class).in(Scopes.SINGLETON);
         binder.bind(ConnectorMetadata.class).to(ClassLoaderSafeConnectorMetadata.class).in(Scopes.SINGLETON);
 
-        binder.bind(ConnectionFactory.class)
-                .annotatedWith(ForLazyConnectionFactory.class)
-                .to(Key.get(ConnectionFactory.class, StatsCollecting.class))
-                .in(Scopes.SINGLETON);
         install(conditionalModule(
                 PhoenixConfig.class,
                 PhoenixConfig::isReuseConnection,
@@ -166,7 +163,7 @@ private void checkConfiguration(String connectionUrl)
     @Provides
     @Singleton
     @ForBaseJdbc
-    public ConnectionFactory getConnectionFactory(PhoenixConfig config)
+    public ConnectionFactory getConnectionFactory(PhoenixConfig config, OpenTelemetry openTelemetry)
             throws SQLException
     {
         return new ConfiguringConnectionFactory(
@@ -174,7 +171,8 @@ public ConnectionFactory getConnectionFactory(PhoenixConfig config)
                         PhoenixDriver.INSTANCE, // Note: for some reason new PhoenixDriver won't work.
                         config.getConnectionUrl(),
                         getConnectionProperties(config),
-                        new EmptyCredentialProvider()),
+                        new EmptyCredentialProvider(),
+                        openTelemetry),
                 connection -> {
                     // Per JDBC spec, a Driver is expected to have new connections in auto-commit mode.
                     // This seems not to be true for PhoenixDriver, so we need to be explicit here.
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixColumnProperties.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixColumnProperties.java
index eb1576737346..11e6c4c058d8 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixColumnProperties.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixColumnProperties.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.phoenix5;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixConfig.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixConfig.java
index 4de57340e0b3..92b64baf2558 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixConfig.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixConfig.java
@@ -18,10 +18,9 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixConnectorFactory.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixConnectorFactory.java
index 104ae491ac43..da46fa3a2127 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixConnectorFactory.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixConnectorFactory.java
@@ -16,6 +16,7 @@
 import com.google.inject.Injector;
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.json.JsonModule;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.base.CatalogName;
 import io.trino.spi.NodeManager;
 import io.trino.spi.classloader.ThreadContextClassLoader;
@@ -26,7 +27,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class PhoenixConnectorFactory
@@ -49,7 +50,7 @@ public String getName()
     public Connector create(String catalogName, Map<String, String> requiredConfig, ConnectorContext context)
     {
         requireNonNull(requiredConfig, "requiredConfig is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
             Bootstrap app = new Bootstrap(
@@ -60,6 +61,7 @@ public Connector create(String catalogName, Map<String, String> requiredConfig,
                         binder.bind(ClassLoader.class).toInstance(PhoenixConnectorFactory.class.getClassLoader());
                         binder.bind(TypeManager.class).toInstance(context.getTypeManager());
                         binder.bind(NodeManager.class).toInstance(context.getNodeManager());
+                        binder.bind(OpenTelemetry.class).toInstance(context.getOpenTelemetry());
                     });
 
             Injector injector = app
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixMergeSink.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixMergeSink.java
index 62adce6750f0..ad440238408d 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixMergeSink.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixMergeSink.java
@@ -23,7 +23,7 @@
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.ColumnarRow;
+import io.trino.spi.block.RowBlock;
 import io.trino.spi.connector.ConnectorMergeSink;
 import io.trino.spi.connector.ConnectorMergeTableHandle;
 import io.trino.spi.connector.ConnectorPageSink;
@@ -39,11 +39,9 @@
 import java.util.stream.IntStream;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.plugin.phoenix5.PhoenixClient.ROWKEY;
 import static io.trino.plugin.phoenix5.PhoenixClient.ROWKEY_COLUMN_HANDLE;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
 import static io.trino.spi.type.TinyintType.TINYINT;
 import static java.lang.String.format;
 import static java.util.concurrent.CompletableFuture.completedFuture;
@@ -158,68 +156,53 @@ public void storeMergedRows(Page page)
         checkArgument(page.getChannelCount() == 2 + columnCount, "The page size should be 2 + columnCount (%s), but is %s", columnCount, page.getChannelCount());
         int positionCount = page.getPositionCount();
         Block operationBlock = page.getBlock(columnCount);
-        ColumnarRow rowIds = toColumnarRow(page.getBlock(columnCount + 1));
 
         int[] dataChannel = IntStream.range(0, columnCount).toArray();
         Page dataPage = page.getColumns(dataChannel);
 
-        int deletePositionCount = 0;
         int[] insertPositions = new int[positionCount];
         int insertPositionCount = 0;
+        int[] deletePositions = new int[positionCount];
+        int deletePositionCount = 0;
         int[] updatePositions = new int[positionCount];
         int updatePositionCount = 0;
 
-        int rowIdPosition = 0;
-        int[] rowIdDeletePositions = new int[positionCount];
-        int rowIdDeletePositionCount = 0;
-        int[] rowIdUpdatePositions = new int[positionCount];
-        int rowIdUpdatePositionCount = 0;
-
         for (int position = 0; position < positionCount; position++) {
-            int operation = (int) TINYINT.getLong(operationBlock, position);
+            int operation = TINYINT.getByte(operationBlock, position);
             switch (operation) {
                 case INSERT_OPERATION_NUMBER -> {
                     insertPositions[insertPositionCount] = position;
                     insertPositionCount++;
                 }
                 case DELETE_OPERATION_NUMBER -> {
+                    deletePositions[deletePositionCount] = position;
                     deletePositionCount++;
-
-                    rowIdDeletePositions[rowIdDeletePositionCount] = rowIdPosition;
-                    rowIdDeletePositionCount++;
-                    rowIdPosition++;
                 }
                 case UPDATE_OPERATION_NUMBER -> {
                     updatePositions[updatePositionCount] = position;
                     updatePositionCount++;
-
-                    rowIdUpdatePositions[rowIdUpdatePositionCount] = rowIdPosition;
-                    rowIdUpdatePositionCount++;
-                    rowIdPosition++;
                 }
                 default -> throw new IllegalStateException("Unexpected value: " + operation);
             }
         }
 
-        verify(rowIdPosition == updatePositionCount + deletePositionCount);
-
         if (insertPositionCount > 0) {
             insertSink.appendPage(dataPage.getPositions(insertPositions, 0, insertPositionCount));
         }
 
+        List<Block> rowIdFields = RowBlock.getRowFieldsFromBlock(page.getBlock(columnCount + 1));
         if (deletePositionCount > 0) {
-            Block[] deleteBlocks = new Block[rowIds.getFieldCount()];
-            for (int field = 0; field < rowIds.getFieldCount(); field++) {
-                deleteBlocks[field] = rowIds.getField(field).getPositions(rowIdDeletePositions, 0, rowIdDeletePositionCount);
+            Block[] deleteBlocks = new Block[rowIdFields.size()];
+            for (int field = 0; field < rowIdFields.size(); field++) {
+                deleteBlocks[field] = rowIdFields.get(field).getPositions(deletePositions, 0, deletePositionCount);
             }
-
             deleteSink.appendPage(new Page(deletePositionCount, deleteBlocks));
         }
 
         if (updatePositionCount > 0) {
             Page updatePage = dataPage.getPositions(updatePositions, 0, updatePositionCount);
             if (hasRowKey) {
-                updatePage = updatePage.appendColumn(rowIds.getField(0).getPositions(rowIdUpdatePositions, 0, rowIdUpdatePositionCount));
+                updatePage = updatePage.appendColumn(rowIdFields.get(0).getPositions(updatePositions, 0, updatePositionCount));
             }
 
             updateSink.appendPage(updatePage);
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixMetadata.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixMetadata.java
index 13304e73fa87..ad1a46be5970 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixMetadata.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixMetadata.java
@@ -14,7 +14,9 @@
 package io.trino.plugin.phoenix5;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.DefaultJdbcMetadata;
 import io.trino.plugin.jdbc.JdbcColumnHandle;
 import io.trino.plugin.jdbc.JdbcNamedRelationHandle;
@@ -22,7 +24,6 @@
 import io.trino.plugin.jdbc.JdbcTableHandle;
 import io.trino.plugin.jdbc.JdbcTypeHandle;
 import io.trino.plugin.jdbc.RemoteTableName;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.AggregationApplicationResult;
@@ -43,13 +44,12 @@
 import io.trino.spi.connector.RowChangeParadigm;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SortingProperty;
+import io.trino.spi.expression.Constant;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.statistics.ComputedStatistics;
 import io.trino.spi.type.RowType;
 
-import javax.inject.Inject;
-
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -118,7 +118,7 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
                         .collect(toImmutableList()))
                 .orElse(ImmutableList.of());
 
-        return new ConnectorTableProperties(TupleDomain.all(), Optional.empty(), Optional.empty(), Optional.empty(), sortingProperties);
+        return new ConnectorTableProperties(TupleDomain.all(), Optional.empty(), Optional.empty(), sortingProperties);
     }
 
     @Override
@@ -126,7 +126,7 @@ public ConnectorTableSchema getTableSchema(ConnectorSession session, ConnectorTa
     {
         JdbcTableHandle handle = (JdbcTableHandle) table;
         return new ConnectorTableSchema(
-                getSchemaTableName(handle),
+                handle.getRequiredNamedRelation().getSchemaTableName(),
                 getColumnMetadata(session, handle).stream()
                         .map(ColumnMetadata::getColumnSchema)
                         .collect(toImmutableList()));
@@ -137,7 +137,7 @@ public ConnectorTableMetadata getTableMetadata(ConnectorSession session, Connect
     {
         JdbcTableHandle handle = (JdbcTableHandle) table;
         return new ConnectorTableMetadata(
-                getSchemaTableName(handle),
+                handle.getRequiredNamedRelation().getSchemaTableName(),
                 getColumnMetadata(session, handle),
                 phoenixClient.getTableProperties(session, handle));
     }
@@ -161,8 +161,12 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
     }
 
     @Override
-    public void dropSchema(ConnectorSession session, String schemaName)
+    public void dropSchema(ConnectorSession session, String schemaName, boolean cascade)
     {
+        if (cascade) {
+            // Phoenix doesn't support CASCADE option https://phoenix.apache.org/language/index.html#drop_schema
+            throw new TrinoException(NOT_SUPPORTED, "This connector does not support dropping schemas with CASCADE option");
+        }
         if (DEFAULT_SCHEMA.equalsIgnoreCase(schemaName)) {
             throw new TrinoException(NOT_SUPPORTED, "Can't drop 'default' schema which maps to Phoenix empty schema");
         }
@@ -172,13 +176,20 @@ public void dropSchema(ConnectorSession session, String schemaName)
     private String toRemoteSchemaName(ConnectorSession session, String schemaName)
     {
         try (Connection connection = phoenixClient.getConnection(session)) {
-            return identifierMapping.toRemoteSchemaName(session.getIdentity(), connection, schemaName);
+            return identifierMapping.toRemoteSchemaName(phoenixClient.getRemoteIdentifiers(connection), session.getIdentity(), schemaName);
         }
         catch (SQLException e) {
             throw new TrinoException(PHOENIX_METADATA_ERROR, "Couldn't get casing for the schema name", e);
         }
     }
 
+    @Override
+    public Optional<ConnectorTableHandle> applyUpdate(ConnectorSession session, ConnectorTableHandle handle, Map<ColumnHandle, Constant> assignments)
+    {
+        // Phoenix support row level update, so we should reject this path, earlier than in JDBC client
+        return Optional.empty();
+    }
+
     @Override
     public void createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata, boolean ignoreExisting)
     {
@@ -318,7 +329,7 @@ public ConnectorMergeTableHandle beginMerge(ConnectorSession session, ConnectorT
     }
 
     @Override
-    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle mergeTableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
     {
     }
 
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixOutputTableHandle.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixOutputTableHandle.java
index ecbfaf9c5432..e43f95b9cb1c 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixOutputTableHandle.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixOutputTableHandle.java
@@ -18,8 +18,7 @@
 import io.trino.plugin.jdbc.JdbcOutputTableHandle;
 import io.trino.plugin.jdbc.JdbcTypeHandle;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixPageSource.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixPageSource.java
index 9720e4ccf9c3..990dd3c3e47a 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixPageSource.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixPageSource.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.spi.block.RowBlock.fromFieldBlocks;
@@ -122,7 +121,7 @@ public Block getBlock(Page page)
             for (int i = 0; i < mergeRowIdBlocks.length; i++) {
                 mergeRowIdBlocks[i] = page.getBlock(mergeRowIdSourceChannels.get(i));
             }
-            return fromFieldBlocks(page.getPositionCount(), Optional.empty(), mergeRowIdBlocks);
+            return fromFieldBlocks(page.getPositionCount(), mergeRowIdBlocks);
         }
     }
 
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixPageSourceProvider.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixPageSourceProvider.java
index b4e6beb4561d..55a5f941d71d 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixPageSourceProvider.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixPageSourceProvider.java
@@ -102,7 +102,7 @@ private ColumnAdaptation buildMergeIdColumnAdaptation(List<JdbcColumnHandle> sca
                 .map(RowType.Field::getName)
                 .map(Optional::get)
                 .map(fieldName -> indexOf(scanColumns.iterator(), handle -> handle.getColumnName().equals(fieldName)))
-                .peek(fieldIndex -> checkArgument(fieldIndex != -1, "Merge row id filed must exist in scanned columns"))
+                .peek(fieldIndex -> checkArgument(fieldIndex != -1, "Merge row id field must exist in scanned columns"))
                 .collect(toImmutableList());
         return ColumnAdaptation.mergedRowColumns(mergeRowIdSourceChannels);
     }
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixSessionProperties.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixSessionProperties.java
index b05c65b9cb66..0c47c7f3a63b 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixSessionProperties.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixSessionProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.phoenix5;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.spi.TrinoException;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.spi.StandardErrorCode.INVALID_SESSION_PROPERTY;
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixSplitManager.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixSplitManager.java
index 9f8885740743..557e1bc1418c 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixSplitManager.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixSplitManager.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.plugin.jdbc.JdbcColumnHandle;
 import io.trino.plugin.jdbc.JdbcTableHandle;
@@ -40,8 +41,6 @@
 import org.apache.phoenix.mapreduce.PhoenixInputSplit;
 import org.apache.phoenix.query.KeyRange;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -82,12 +81,13 @@ public ConnectorSplitSource getSplits(
             List<JdbcColumnHandle> columns = tableHandle.getColumns()
                     .map(columnSet -> columnSet.stream().map(JdbcColumnHandle.class::cast).collect(toList()))
                     .orElseGet(() -> phoenixClient.getColumns(session, tableHandle));
-            PhoenixPreparedStatement inputQuery = (PhoenixPreparedStatement) phoenixClient.prepareStatement(
+            PhoenixPreparedStatement inputQuery = phoenixClient.prepareStatement(
                     session,
                     connection,
                     tableHandle,
                     columns,
-                    Optional.empty());
+                    Optional.empty())
+                    .unwrap(PhoenixPreparedStatement.class);
 
             int maxScansPerSplit = session.getProperty(PhoenixSessionProperties.MAX_SCANS_PER_SPLIT, Integer.class);
             List<ConnectorSplit> splits = getSplits(inputQuery, maxScansPerSplit).stream()
diff --git a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixTableProperties.java b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixTableProperties.java
index 7bc9fbfda7d9..ac32d8fb67e0 100644
--- a/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixTableProperties.java
+++ b/plugin/trino-phoenix5/src/main/java/io/trino/plugin/phoenix5/PhoenixTableProperties.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.phoenix5;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.jdbc.TablePropertiesProvider;
 import io.trino.spi.session.PropertyMetadata;
 import org.apache.hadoop.hbase.io.compress.Compression;
@@ -21,8 +22,6 @@
 import org.apache.hadoop.hbase.regionserver.BloomType;
 import org.apache.hadoop.util.StringUtils;
 
-import javax.inject.Inject;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
diff --git a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/PhoenixSqlExecutor.java b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/PhoenixSqlExecutor.java
index 92baf467f3f8..349f6700223f 100644
--- a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/PhoenixSqlExecutor.java
+++ b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/PhoenixSqlExecutor.java
@@ -41,6 +41,12 @@ public PhoenixSqlExecutor(String jdbcUrl, Properties jdbcProperties)
         this.jdbcProperties.putAll(requireNonNull(jdbcProperties, "jdbcProperties is null"));
     }
 
+    @Override
+    public boolean supportsMultiRowInsert()
+    {
+        return false;
+    }
+
     @Override
     public void execute(String sql)
     {
diff --git a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/PhoenixTestTable.java b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/PhoenixTestTable.java
index f4fa4376d219..01eb3fa40d5e 100644
--- a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/PhoenixTestTable.java
+++ b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/PhoenixTestTable.java
@@ -29,7 +29,7 @@ public PhoenixTestTable(SqlExecutor sqlExecutor, String namePrefix, String table
     }
 
     @Override
-    public void createAndInsert(List<String> rowsToInsert)
+    protected void createAndInsert(List<String> rowsToInsert)
     {
         sqlExecutor.execute(format("CREATE TABLE %s %s", name, tableDefinition));
         try {
diff --git a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixConnectorTest.java b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixConnectorTest.java
index 460de7512a09..2c5e1dcab91c 100644
--- a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixConnectorTest.java
+++ b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixConnectorTest.java
@@ -64,7 +64,6 @@
 import static java.util.Locale.ENGLISH;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 public class TestPhoenixConnectorTest
@@ -80,51 +79,32 @@ protected QueryRunner createQueryRunner()
         return createPhoenixQueryRunner(testingPhoenixServer, ImmutableMap.of(), REQUIRED_TPCH_TABLES);
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_LIMIT_PUSHDOWN:
-            case SUPPORTS_TOPN_PUSHDOWN:
-            case SUPPORTS_AGGREGATION_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_PREDICATE_ARITHMETIC_EXPRESSION_PUSHDOWN:
-                return true;
-
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN_WITH_COMMENT:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return false;
-
-            case SUPPORTS_TRUNCATE:
-                return false;
-
-            case SUPPORTS_ROW_TYPE:
-                return false;
-
-            case SUPPORTS_UPDATE:
-            case SUPPORTS_MERGE:
-                return true;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_MERGE,
+                    SUPPORTS_PREDICATE_ARITHMETIC_EXPRESSION_PUSHDOWN,
+                    SUPPORTS_ROW_LEVEL_UPDATE,
+                    SUPPORTS_UPDATE -> true;
+            case SUPPORTS_ADD_COLUMN_WITH_COMMENT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
+                    SUPPORTS_DROP_SCHEMA_CASCADE,
+                    SUPPORTS_LIMIT_PUSHDOWN,
+                    SUPPORTS_NATIVE_QUERY,
+                    SUPPORTS_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_TRUNCATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     // TODO: wait https://github.com/trinodb/trino/pull/14939 done and then remove this test
@@ -345,6 +325,7 @@ public void testShowCreateTable()
                         "   comment varchar(79)\n" +
                         ")\n" +
                         "WITH (\n" +
+                        "   bloomfilter = 'ROW',\n" +
                         "   data_block_encoding = 'FAST_DIFF',\n" +
                         "   rowkeys = 'ROWKEY',\n" +
                         "   salt_buckets = 10\n" +
@@ -407,9 +388,14 @@ public void testVarcharCharComparison()
     @Override
     public void testCharTrailingSpace()
     {
-        assertThatThrownBy(super::testCharTrailingSpace)
-                .hasMessageContaining("The table does not have a primary key. tableName=TPCH.CHAR_TRAILING_SPACE");
-        throw new SkipException("Implement test for Phoenix");
+        String schema = getSession().getSchema().orElseThrow();
+        try (TestTable table = new PhoenixTestTable(onRemoteDatabase(), schema + ".char_trailing_space", "(x char(10) primary key)", List.of("'test'"))) {
+            String tableName = table.getName();
+            assertQuery("SELECT * FROM " + tableName + " WHERE x = char 'test'", "VALUES 'test      '");
+            assertQuery("SELECT * FROM " + tableName + " WHERE x = char 'test  '", "VALUES 'test      '");
+            assertQuery("SELECT * FROM " + tableName + " WHERE x = char 'test        '", "VALUES 'test      '");
+            assertQueryReturnsEmptyResult("SELECT * FROM " + tableName + " WHERE x = char ' test'");
+        }
     }
 
     // Overridden because Phoenix requires a ROWID column
@@ -615,6 +601,7 @@ public void testCreateTableWithProperties()
                         "   d varchar(10)\n" +
                         ")\n" +
                         "WITH (\n" +
+                        "   bloomfilter = 'ROW',\n" +
                         "   data_block_encoding = 'FAST_DIFF',\n" +
                         "   rowkeys = 'A,B,C',\n" +
                         "   salt_buckets = 10\n" +
@@ -773,102 +760,6 @@ public void testUseSortedPropertiesForPartialTopNElimination()
         assertUpdate("DROP TABLE " + tableName);
     }
 
-    @Override
-    public void testNativeQuerySimple()
-    {
-        // not implemented
-        assertQueryFails("SELECT * FROM TABLE(system.query(query => 'SELECT 1'))", "line 1:21: Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQueryParameters()
-    {
-        // not implemented
-        Session session = Session.builder(getSession())
-                .addPreparedStatement("my_query_simple", "SELECT * FROM TABLE(system.query(query => ?))")
-                .addPreparedStatement("my_query", "SELECT * FROM TABLE(system.query(query => format('SELECT %s FROM %s', ?, ?)))")
-                .build();
-        assertQueryFails(session, "EXECUTE my_query_simple USING 'SELECT 1 a'", "line 1:21: Table function system.query not registered");
-        assertQueryFails(session, "EXECUTE my_query USING 'a', '(SELECT 2 a) t'", "line 1:21: Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQuerySelectFromNation()
-    {
-        // not implemented
-        assertQueryFails(
-                format("SELECT * FROM TABLE(system.query(query => 'SELECT name FROM %s.nation WHERE nationkey = 0'))", getSession().getSchema().orElseThrow()),
-                "line 1:21: Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQuerySelectFromTestTable()
-    {
-        // not implemented
-        try (TestTable testTable = simpleTable()) {
-            assertQueryFails(
-                    format("SELECT * FROM TABLE(system.query(query => 'SELECT * FROM %s'))", testTable.getName()),
-                    "line 1:21: Table function system.query not registered");
-        }
-    }
-
-    @Override
-    public void testNativeQueryColumnAlias()
-    {
-        // not implemented
-        assertQueryFails(
-                "SELECT * FROM TABLE(system.query(query => 'SELECT name AS region_name FROM tpch.region WHERE regionkey = 0'))",
-                ".* Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQueryColumnAliasNotFound()
-    {
-        // not implemented
-        assertQueryFails(
-                "SELECT name FROM TABLE(system.query(query => 'SELECT name AS region_name FROM tpch.region'))",
-                ".* Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQueryCreateStatement()
-    {
-        // not implemented
-        assertFalse(getQueryRunner().tableExists(getSession(), "numbers"));
-        assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'CREATE TABLE numbers(n INTEGER)'))"))
-                .hasMessage("line 1:21: Table function system.query not registered");
-        assertFalse(getQueryRunner().tableExists(getSession(), "numbers"));
-    }
-
-    @Override
-    public void testNativeQueryInsertStatementTableDoesNotExist()
-    {
-        // not implemented
-        assertFalse(getQueryRunner().tableExists(getSession(), "non_existent_table"));
-        assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'INSERT INTO non_existent_table VALUES (1)'))"))
-                .hasMessage("line 1:21: Table function system.query not registered");
-    }
-
-    @Override
-    public void testNativeQueryInsertStatementTableExists()
-    {
-        // not implemented
-        try (TestTable testTable = simpleTable()) {
-            assertThatThrownBy(() -> query(format("SELECT * FROM TABLE(system.query(query => 'INSERT INTO %s VALUES (3)'))", testTable.getName())))
-                    .hasMessage("line 1:21: Table function system.query not registered");
-            assertThat(query("SELECT * FROM " + testTable.getName()))
-                    .matches("VALUES BIGINT '1', BIGINT '2'");
-        }
-    }
-
-    @Override
-    public void testNativeQueryIncorrectSyntax()
-    {
-        // not implemented
-        assertThatThrownBy(() -> query("SELECT * FROM TABLE(system.query(query => 'some wrong syntax'))"))
-                .hasMessage("line 1:21: Table function system.query not registered");
-    }
-
     @Override
     protected TestTable simpleTable()
     {
@@ -879,7 +770,7 @@ protected TestTable simpleTable()
     @Override
     protected TestTable createTableWithDoubleAndRealColumns(String name, List<String> rows)
     {
-        return new TestTable(onRemoteDatabase(), name, "(t_double double primary key, u_double double, v_real float, w_real float)", rows);
+        return new PhoenixTestTable(onRemoteDatabase(), name, "(t_double double primary key, u_double double, v_real float, w_real float)", rows);
     }
 
     @Override
diff --git a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixTypeMapping.java b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixTypeMapping.java
index 69f2dd906bda..a61f8e260073 100644
--- a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixTypeMapping.java
+++ b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixTypeMapping.java
@@ -386,8 +386,8 @@ public void testBinary()
     {
         // Not testing max length (2147483647) because it leads to 'Requested array size exceeds VM limit'
         SqlDataTypeTest.create()
-                .addRoundTrip("binary(1)", "NULL", VARBINARY, "X'00'") // NULL stored as zeros
-                .addRoundTrip("binary(10)", "DECODE('', 'HEX')", VARBINARY, "X'00000000000000000000'") // empty stored as zeros
+                .addRoundTrip("binary(1)", "NULL", VARBINARY, "CAST(NULL AS VARBINARY)")
+                .addRoundTrip("binary(10)", "DECODE('', 'HEX')", VARBINARY, "CAST(NULL AS VARBINARY)")
                 .addRoundTrip("binary(5)", "DECODE('68656C6C6F', 'HEX')", VARBINARY, "to_utf8('hello')")
                 .addRoundTrip("binary(26)", "DECODE('5069C4996B6E6120C582C4856B61207720E69DB1E4BAACE983BD', 'HEX')", VARBINARY, "to_utf8('Piękna łąka w 東京都')")
                 .addRoundTrip("binary(16)", "DECODE('4261672066756C6C206F6620F09F92B0', 'HEX')", VARBINARY, "to_utf8('Bag full of 💰')")
@@ -395,12 +395,6 @@ public void testBinary()
                 .addRoundTrip("binary(6)", "DECODE('000000000000', 'HEX')", VARBINARY, "X'000000000000'")
                 .addRoundTrip("integer primary key", "1", INTEGER, "1")
                 .execute(getQueryRunner(), phoenixCreateAndInsert("tpch.test_binary"));
-
-        // Verify 'IS NULL' doesn't get rows where the value is X'00...' padded in Phoenix
-        try (TestTable table = new TestTable(new PhoenixSqlExecutor(phoenixServer.getJdbcUrl()), "tpch.test_binary", "(null_binary binary(1), empty_binary binary(10), pk integer primary key)", ImmutableList.of("NULL, DECODE('', 'HEX'), 1"))) {
-            assertQueryReturnsEmptyResult(format("SELECT * FROM %s WHERE null_binary IS NULL", table.getName()));
-            assertQueryReturnsEmptyResult(format("SELECT * FROM %s WHERE empty_binary IS NULL", table.getName()));
-        }
     }
 
     @Test
diff --git a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestingPhoenixServer.java b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestingPhoenixServer.java
index 446a089e4ab9..593124b3c6c0 100644
--- a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestingPhoenixServer.java
+++ b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestingPhoenixServer.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.phoenix5;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import io.trino.testing.ResourcePresence;
 import io.trino.testing.SharedResource;
@@ -22,8 +23,6 @@
 import org.apache.hadoop.hbase.MiniHBaseCluster;
 import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.logging.Level;
diff --git a/plugin/trino-pinot/pom.xml b/plugin/trino-pinot/pom.xml
index ead3f8fc433c..22dc70e91041 100755
--- a/plugin/trino-pinot/pom.xml
+++ b/plugin/trino-pinot/pom.xml
@@ -2,15 +2,15 @@
 <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>
-        <artifactId>trino-root</artifactId>
         <groupId>io.trino</groupId>
-        <version>413-SNAPSHOT</version>
+        <artifactId>trino-root</artifactId>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-pinot</artifactId>
-    <description>Trino - Pinot Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Pinot Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -24,122 +24,117 @@
         <air.test.parallel>instances</air.test.parallel>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>confluent</id>
-            <url>https://packages.confluent.io/maven/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.calcite</groupId>
+                <artifactId>calcite-core</artifactId>
+                <version>1.32.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-matching</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
         </dependency>
 
+        <!-- Used for basic authentication only -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>http-client</artifactId>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
+            <artifactId>bootstrap</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
+            <artifactId>concurrent</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <artifactId>configuration</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>http-client</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
         </dependency>
 
-        <!-- Used for basic authentication only -->
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-matching</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -152,17 +147,13 @@
                     <artifactId>commons-io</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.yaml</groupId>
-                    <artifactId>snakeyaml</artifactId>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.apache.logging.log4j</groupId>
                     <artifactId>log4j-core</artifactId>
@@ -172,6 +163,14 @@
                     <groupId>org.apache.logging.log4j</groupId>
                     <artifactId>log4j-slf4j-impl</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -181,128 +180,132 @@
             <version>${dep.pinot.version}</version>
             <exclusions>
                 <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty</artifactId>
+                    <groupId>com.101tec</groupId>
+                    <artifactId>zkclient</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-compat-qual</artifactId>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-slf4j-impl</artifactId>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>annotations</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-1.2-api</artifactId>
+                    <groupId>com.sun.activation</groupId>
+                    <artifactId>jakarta.activation</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>jline</artifactId>
-                    <groupId>jline</groupId>
+                    <groupId>commons-beanutils</groupId>
+                    <artifactId>commons-beanutils-core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.antlr</groupId>
-                    <artifactId>antlr4-annotations</artifactId>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.kafka</groupId>
-                    <artifactId>kafka-clients</artifactId>
+                    <groupId>jakarta.annotation</groupId>
+                    <artifactId>jakarta.annotation-api</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.codehaus.jackson</groupId>
-                    <artifactId>jackson-mapper-asl</artifactId>
+                    <groupId>jakarta.ws.rs</groupId>
+                    <artifactId>jakarta.ws.rs-api</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.kafka</groupId>
-                    <artifactId>kafka_2.10</artifactId>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>validation-api</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>commons-beanutils</groupId>
-                    <artifactId>commons-beanutils-core</artifactId>
+                    <groupId>jline</groupId>
+                    <artifactId>jline</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
+                    <groupId>org.antlr</groupId>
+                    <artifactId>antlr4-annotations</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>com.sun.activation</groupId>
-                    <artifactId>jakarta.activation</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>javax.servlet-api</artifactId>
+                    <groupId>org.apache.kafka</groupId>
+                    <artifactId>kafka-clients</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.glassfish.hk2.external</groupId>
-                    <artifactId>jakarta.inject</artifactId>
+                    <groupId>org.apache.kafka</groupId>
+                    <artifactId>kafka_2.10</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>jakarta.ws.rs</groupId>
-                    <artifactId>jakarta.ws.rs-api</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-1.2-api</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>jakarta.annotation</groupId>
-                    <artifactId>jakarta.annotation-api</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-slf4j-impl</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-compress</artifactId>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>com.101tec</groupId>
-                    <artifactId>zkclient</artifactId>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-compat-qual</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>commons-codec</groupId>
-                    <artifactId>commons-codec</artifactId>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-lang3</artifactId>
+                    <groupId>org.glassfish.hk2.external</groupId>
+                    <artifactId>jakarta.inject</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpcore</artifactId>
+                    <groupId>org.glassfish.jersey.core</groupId>
+                    <artifactId>jersey-server</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <artifactId>annotations</artifactId>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.zookeeper</groupId>
-                    <artifactId>zookeeper</artifactId>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.glassfish.jersey.core</groupId>
-                    <artifactId>jersey-server</artifactId>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -312,6 +315,18 @@
             <artifactId>pinot-core</artifactId>
             <version>${dep.pinot.version}</version>
             <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>io.netty</groupId>
                     <artifactId>netty</artifactId>
@@ -321,16 +336,16 @@
                     <artifactId>netty-all</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
+                    <groupId>jakarta.annotation</groupId>
+                    <artifactId>jakarta.annotation-api</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>jakarta.ws.rs</groupId>
+                    <artifactId>jakarta.ws.rs-api</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>validation-api</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.antlr</groupId>
@@ -345,28 +360,20 @@
                     <artifactId>kafka_2.10</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.codehaus.jackson</groupId>
-                    <artifactId>jackson-mapper-asl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
+                    <groupId>org.apache.lucene</groupId>
+                    <artifactId>lucene-analyzers-common</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>jakarta.ws.rs</groupId>
-                    <artifactId>jakarta.ws.rs-api</artifactId>
+                    <groupId>org.apache.lucene</groupId>
+                    <artifactId>lucene-core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>jakarta.annotation</groupId>
-                    <artifactId>jakarta.annotation-api</artifactId>
+                    <groupId>org.apache.lucene</groupId>
+                    <artifactId>lucene-sandbox</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.glassfish.grizzly</groupId>
@@ -378,23 +385,23 @@
                 </exclusion>
                 <exclusion>
                     <groupId>org.glassfish.hk2.external</groupId>
-                    <artifactId>jakarta.inject</artifactId>
+                    <artifactId>aopalliance-repackaged</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.glassfish.hk2.external</groupId>
-                    <artifactId>aopalliance-repackaged</artifactId>
+                    <artifactId>jakarta.inject</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.glassfish.jersey.containers</groupId>
                     <artifactId>jersey-container-grizzly2-http</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-analyzers-common</artifactId>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-core</artifactId>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -450,7 +457,42 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>log-manager</artifactId>
@@ -472,14 +514,13 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.11</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.4.13</version>
+            <version>4.4.16</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -496,32 +537,36 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-avro-serializer</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-schema-serializer</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -573,32 +618,8 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>kafka-avro-serializer</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.zookeeper</groupId>
-                    <artifactId>zookeeper</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>kafka-schema-serializer</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -614,6 +635,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>kafka</artifactId>
@@ -633,8 +660,40 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>confluent</id>
+            <url>https://packages.confluent.io/maven/</url>
+        </repository>
+    </repositories>
+
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/ForPinot.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/ForPinot.java
index 68f53c6aa664..61210e34c153 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/ForPinot.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/ForPinot.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.pinot;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForPinot
 {
 }
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotBrokerPageSource.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotBrokerPageSource.java
index 798fb2af43a8..4074959404b7 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotBrokerPageSource.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotBrokerPageSource.java
@@ -40,20 +40,16 @@ public class PinotBrokerPageSource
         implements ConnectorPageSource
 {
     private final PinotQueryInfo query;
-    private final PinotClient pinotClient;
-    private final ConnectorSession session;
-    private final List<PinotColumnHandle> columnHandles;
     private final List<Decoder> decoders;
     private final BlockBuilder[] columnBuilders;
+    private final long readTimeNanos;
+    private final Iterator<BrokerResultRow> resultIterator;
 
     private boolean finished;
-    private long readTimeNanos;
     private long completedBytes;
     private final AtomicLong currentRowCount = new AtomicLong();
     private final int limitForBrokerQueries;
 
-    private Iterator<BrokerResultRow> resultIterator;
-
     public PinotBrokerPageSource(
             ConnectorSession session,
             PinotQueryInfo query,
@@ -62,9 +58,6 @@ public PinotBrokerPageSource(
             int limitForBrokerQueries)
     {
         this.query = requireNonNull(query, "query is null");
-        this.pinotClient = requireNonNull(pinotClient, "pinotClient is null");
-        this.session = requireNonNull(session, "session is null");
-        this.columnHandles = requireNonNull(columnHandles, "columnHandles is null");
         this.decoders = createDecoders(columnHandles);
         this.limitForBrokerQueries = limitForBrokerQueries;
 
@@ -72,6 +65,9 @@ public PinotBrokerPageSource(
                 .map(PinotColumnHandle::getDataType)
                 .map(type -> type.createBlockBuilder(null, 1))
                 .toArray(BlockBuilder[]::new);
+        long start = System.nanoTime();
+        resultIterator = pinotClient.createResultIterator(session, query, columnHandles);
+        readTimeNanos = System.nanoTime() - start;
     }
 
     private static List<Decoder> createDecoders(List<PinotColumnHandle> columnHandles)
@@ -107,12 +103,6 @@ public Page getNextPage()
         if (finished) {
             return null;
         }
-        if (resultIterator == null) {
-            long start = System.nanoTime();
-            resultIterator = pinotClient.createResultIterator(session, query, columnHandles);
-            readTimeNanos = System.nanoTime() - start;
-        }
-
         if (!resultIterator.hasNext()) {
             finished = true;
             return null;
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConfig.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConfig.java
index e5237f307ed5..a0d4f0d10364 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConfig.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConfig.java
@@ -21,11 +21,10 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.annotation.PostConstruct;
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.annotation.PostConstruct;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 import java.net.URI;
 import java.util.List;
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConnector.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConnector.java
index a6ed6baba7b4..c1a7218eba63 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConnector.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConnector.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.pinot;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -25,8 +26,6 @@
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConnectorFactory.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConnectorFactory.java
index b28fdaafcea2..5c531ff96d3f 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConnectorFactory.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConnectorFactory.java
@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class PinotConnectorFactory
@@ -52,7 +52,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
     {
         requireNonNull(catalogName, "catalogName is null");
         requireNonNull(config, "config is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         ImmutableList.Builder<Module> modulesBuilder = ImmutableList.<Module>builder()
                 .add(new JsonModule())
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotMetadata.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotMetadata.java
index 6710fbfca8e1..78a6b48a48dc 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotMetadata.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotMetadata.java
@@ -20,7 +20,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import com.google.inject.Inject;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.plugin.base.aggregation.AggregateFunctionRewriter;
 import io.trino.plugin.base.aggregation.AggregateFunctionRule;
 import io.trino.plugin.base.expression.ConnectorExpressionRewriter;
@@ -52,17 +53,17 @@
 import io.trino.spi.expression.Variable;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.predicate.ValueSet;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.Type;
 import org.apache.pinot.spi.data.Schema;
 
-import javax.inject.Inject;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalLong;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -74,10 +75,14 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.plugin.pinot.PinotSessionProperties.isAggregationPushdownEnabled;
 import static io.trino.plugin.pinot.query.AggregateExpression.replaceIdentifier;
 import static io.trino.plugin.pinot.query.DynamicTablePqlExtractor.quoteIdentifier;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static java.util.function.UnaryOperator.identity;
@@ -87,6 +92,10 @@ public class PinotMetadata
 {
     public static final String SCHEMA_NAME = "default";
 
+    // Pinot does not yet have full support for predicates that are always TRUE/FALSE
+    // See https://github.com/apache/incubator-pinot/issues/10601
+    private static final Set<Type> SUPPORTS_ALWAYS_FALSE = Set.of(BIGINT, INTEGER, REAL, DOUBLE);
+
     private final NonEvictableLoadingCache<String, List<PinotColumnHandle>> pinotTableColumnCache;
     private final int maxRowsPerBrokerQuery;
     private final AggregateFunctionRewriter<AggregateExpression, Void> aggregateFunctionRewriter;
@@ -142,7 +151,7 @@ public List<String> listSchemaNames(ConnectorSession session)
     @Override
     public PinotTableHandle getTableHandle(ConnectorSession session, SchemaTableName tableName)
     {
-        if (tableName.getTableName().trim().startsWith("select ")) {
+        if (tableName.getTableName().trim().contains("select ")) {
             DynamicTable dynamicTable = DynamicTableBuilder.buildFromPql(this, tableName, pinotClient, typeConverter);
             return new PinotTableHandle(tableName.getSchemaName(), dynamicTable.getTableName(), TupleDomain.all(), OptionalLong.empty(), Optional.of(dynamicTable));
         }
@@ -227,12 +236,6 @@ public ColumnMetadata getColumnMetadata(
         return ((PinotColumnHandle) columnHandle).getColumnMetadata();
     }
 
-    @Override
-    public Optional<Object> getInfo(ConnectorTableHandle table)
-    {
-        return Optional.empty();
-    }
-
     @Override
     public Optional<LimitApplicationResult<ConnectorTableHandle>> applyLimit(ConnectorSession session, ConnectorTableHandle table, long limit)
     {
@@ -253,6 +256,7 @@ public Optional<LimitApplicationResult<ConnectorTableHandle>> applyLimit(Connect
                     dynamicTable.get().getOrderBy(),
                     OptionalLong.of(limit),
                     dynamicTable.get().getOffset(),
+                    dynamicTable.get().getQueryOptions(),
                     dynamicTable.get().getQuery()));
         }
 
@@ -292,6 +296,9 @@ else if (typeConverter.isJsonType(columnType)) {
                     // Pinot does not support filtering on json values
                     unsupported.put(entry.getKey(), entry.getValue());
                 }
+                else if (isFilterPushdownUnsupported(entry.getValue())) {
+                    unsupported.put(entry.getKey(), entry.getValue());
+                }
                 else {
                     supported.put(entry.getKey(), entry.getValue());
                 }
@@ -313,6 +320,20 @@ else if (typeConverter.isJsonType(columnType)) {
         return Optional.of(new ConstraintApplicationResult<>(handle, remainingFilter, false));
     }
 
+    // IS NULL and IS NOT NULL are handled differently in Pinot, pushing down would lead to inconsistent results.
+    // See https://docs.pinot.apache.org/developers/advanced/null-value-support for more info.
+    private boolean isFilterPushdownUnsupported(Domain domain)
+    {
+        ValueSet valueSet = domain.getValues();
+        boolean isNotNull = valueSet.isAll() && !domain.isNullAllowed();
+        boolean isUnsupportedAlwaysFalse = domain.isNone() && !SUPPORTS_ALWAYS_FALSE.contains(domain.getType());
+        boolean isInOrNull = !valueSet.getRanges().getOrderedRanges().isEmpty() && domain.isNullAllowed();
+        return isNotNull ||
+                domain.isOnlyNull() ||
+                isUnsupportedAlwaysFalse ||
+                isInOrNull;
+    }
+
     @Override
     public Optional<AggregationApplicationResult<ConnectorTableHandle>> applyAggregation(
             ConnectorSession session,
@@ -346,7 +367,8 @@ public Optional<AggregationApplicationResult<ConnectorTableHandle>> applyAggrega
         // can be pushed down: there are currently no subqueries in pinot.
         // If there is an offset then do not push the aggregation down as the results will not be correct
         if (tableHandle.getQuery().isPresent() &&
-                (!tableHandle.getQuery().get().getAggregateColumns().isEmpty() ||
+                (!isAggregationPushdownSupported(session, tableHandle.getQuery(), aggregates, assignments) ||
+                        !tableHandle.getQuery().get().getAggregateColumns().isEmpty() ||
                         tableHandle.getQuery().get().isAggregateInProjections() ||
                         tableHandle.getQuery().get().getOffset().isPresent())) {
             return Optional.empty();
@@ -368,10 +390,12 @@ public Optional<AggregationApplicationResult<ConnectorTableHandle>> applyAggrega
             projections.add(new Variable(pinotColumnHandle.getColumnName(), pinotColumnHandle.getDataType()));
             resultAssignments.add(new Assignment(pinotColumnHandle.getColumnName(), pinotColumnHandle, pinotColumnHandle.getDataType()));
         }
+
         List<PinotColumnHandle> groupingColumns = getOnlyElement(groupingSets).stream()
                 .map(PinotColumnHandle.class::cast)
                 .map(PinotMetadata::toNonAggregateColumnHandle)
                 .collect(toImmutableList());
+
         OptionalLong limitForDynamicTable = OptionalLong.empty();
         // Ensure that pinot default limit of 10 rows is not used
         // By setting the limit to maxRowsPerBrokerQuery + 1 the connector will
@@ -410,6 +434,7 @@ public Optional<AggregationApplicationResult<ConnectorTableHandle>> applyAggrega
                 ImmutableList.of(),
                 limitForDynamicTable,
                 OptionalLong.empty(),
+                ImmutableMap.of(),
                 newQuery);
         tableHandle = new PinotTableHandle(tableHandle.getSchemaName(), tableHandle.getTableName(), tableHandle.getConstraint(), tableHandle.getLimit(), Optional.of(dynamicTable));
 
@@ -421,28 +446,28 @@ public static PinotColumnHandle toNonAggregateColumnHandle(PinotColumnHandle col
         return new PinotColumnHandle(columnHandle.getColumnName(), columnHandle.getDataType(), quoteIdentifier(columnHandle.getColumnName()), false, false, true, Optional.empty(), Optional.empty());
     }
 
-    private Optional<AggregateExpression> applyCountDistinct(ConnectorSession session, AggregateFunction aggregate, Map<String, ColumnHandle> assignments, PinotTableHandle tableHandle, Optional<AggregateExpression> rewriteResult)
+    private boolean isAggregationPushdownSupported(ConnectorSession session, Optional<DynamicTable> dynamicTable, List<AggregateFunction> aggregates, Map<String, ColumnHandle> assignments)
     {
-        AggregateFunctionRule.RewriteContext<Void> context = new AggregateFunctionRule.RewriteContext<>()
-        {
-            @Override
-            public Map<String, ColumnHandle> getAssignments()
-            {
-                return assignments;
-            }
+        if (dynamicTable.isEmpty()) {
+            return true;
+        }
+        List<PinotColumnHandle> groupingColumns = dynamicTable.get().getGroupingColumns();
+        if (groupingColumns.isEmpty()) {
+            return true;
+        }
+        // Either second pass of applyAggregation or dynamic table exists
+        if (aggregates.size() != 1) {
+            return false;
+        }
+        AggregateFunction aggregate = getOnlyElement(aggregates);
+        AggregateFunctionRule.RewriteContext<Void> context = new CountDistinctContext(assignments, session);
 
-            @Override
-            public ConnectorSession getSession()
-            {
-                return session;
-            }
+        return implementCountDistinct.getPattern().matches(aggregate, context);
+    }
 
-            @Override
-            public Optional<Void> rewriteExpression(ConnectorExpression expression)
-            {
-                throw new UnsupportedOperationException();
-            }
-        };
+    private Optional<AggregateExpression> applyCountDistinct(ConnectorSession session, AggregateFunction aggregate, Map<String, ColumnHandle> assignments, PinotTableHandle tableHandle, Optional<AggregateExpression> rewriteResult)
+    {
+        AggregateFunctionRule.RewriteContext<Void> context = new CountDistinctContext(assignments, session);
 
         if (implementCountDistinct.getPattern().matches(aggregate, context)) {
             Variable argument = (Variable) getOnlyElement(aggregate.getArguments());
@@ -534,4 +559,35 @@ private List<SchemaTableName> listTables(ConnectorSession session, SchemaTablePr
         }
         return ImmutableList.of(new SchemaTableName(prefix.getSchema().get(), prefix.getTable().get()));
     }
+
+    private static class CountDistinctContext
+            implements AggregateFunctionRule.RewriteContext<Void>
+    {
+        private final Map<String, ColumnHandle> assignments;
+        private final ConnectorSession session;
+
+        CountDistinctContext(Map<String, ColumnHandle> assignments, ConnectorSession session)
+        {
+            this.assignments = requireNonNull(assignments, "assignments is null");
+            this.session = requireNonNull(session, "session is null");
+        }
+
+        @Override
+        public Map<String, ColumnHandle> getAssignments()
+        {
+            return assignments;
+        }
+
+        @Override
+        public ConnectorSession getSession()
+        {
+            return session;
+        }
+
+        @Override
+        public Optional<Void> rewriteExpression(ConnectorExpression expression)
+        {
+            throw new UnsupportedOperationException();
+        }
+    }
 }
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotPageSourceProvider.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotPageSourceProvider.java
index f85091b8aead..a650d32ab888 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotPageSourceProvider.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotPageSourceProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.pinot;
 
+import com.google.inject.Inject;
 import io.trino.plugin.pinot.client.PinotClient;
 import io.trino.plugin.pinot.client.PinotDataFetcher;
 import io.trino.plugin.pinot.query.DynamicTable;
@@ -26,8 +27,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.DynamicFilter;
 
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotSegmentPageSource.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotSegmentPageSource.java
index 23b85ff664db..bfc36fcfa20a 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotSegmentPageSource.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotSegmentPageSource.java
@@ -42,6 +42,9 @@
 import static io.trino.plugin.pinot.PinotErrorCode.PINOT_DECODE_ERROR;
 import static io.trino.plugin.pinot.PinotErrorCode.PINOT_UNSUPPORTED_COLUMN_TYPE;
 import static io.trino.plugin.pinot.decoders.VarbinaryDecoder.toBytes;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.RealType.REAL;
 import static java.lang.Float.floatToIntBits;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
@@ -298,21 +301,21 @@ private Block getArrayBlock(int rowIndex, int columnIndex)
                 int[] intArray = currentDataTable.getDataTable().getIntArray(rowIndex, columnIndex);
                 blockBuilder = elementType.createBlockBuilder(null, intArray.length);
                 for (int element : intArray) {
-                    blockBuilder.writeInt(element);
+                    INTEGER.writeInt(blockBuilder, element);
                 }
                 break;
             case LONG_ARRAY:
                 long[] longArray = currentDataTable.getDataTable().getLongArray(rowIndex, columnIndex);
                 blockBuilder = elementType.createBlockBuilder(null, longArray.length);
                 for (long element : longArray) {
-                    blockBuilder.writeLong(element);
+                    BIGINT.writeLong(blockBuilder, element);
                 }
                 break;
             case FLOAT_ARRAY:
                 float[] floatArray = currentDataTable.getDataTable().getFloatArray(rowIndex, columnIndex);
                 blockBuilder = elementType.createBlockBuilder(null, floatArray.length);
                 for (float element : floatArray) {
-                    blockBuilder.writeInt(floatToIntBits(element));
+                    REAL.writeFloat(blockBuilder, element);
                 }
                 break;
             case DOUBLE_ARRAY:
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotSessionProperties.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotSessionProperties.java
index e2cd7d9f4173..2daf7e546980 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotSessionProperties.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotSessionProperties.java
@@ -15,12 +15,11 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.units.Duration;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotSplitManager.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotSplitManager.java
index f936bf25458a..1ed259ab925e 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotSplitManager.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotSplitManager.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.pinot;
 
 import com.google.common.collect.Iterables;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.plugin.pinot.client.PinotClient;
 import io.trino.spi.ErrorCode;
@@ -31,8 +32,6 @@
 import io.trino.spi.connector.FixedSplitSource;
 import org.apache.pinot.spi.config.table.TableType;
 
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotTypeConverter.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotTypeConverter.java
index 8a055b4a716b..561cf778790d 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotTypeConverter.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotTypeConverter.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.pinot;
 
 import com.google.common.base.Suppliers;
+import com.google.inject.Inject;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.BigintType;
 import io.trino.spi.type.BooleanType;
@@ -31,8 +32,6 @@
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.spi.data.FieldSpec;
 
-import javax.inject.Inject;
-
 import java.util.Optional;
 import java.util.function.Supplier;
 
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/PinotAuthenticationModule.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/PinotAuthenticationModule.java
index f17b80d05f61..d3eede22fd9e 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/PinotAuthenticationModule.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/PinotAuthenticationModule.java
@@ -16,14 +16,13 @@
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.plugin.pinot.auth.none.PinotEmptyAuthenticationProvider;
 import io.trino.plugin.pinot.auth.password.PinotPasswordAuthenticationProvider;
 import io.trino.plugin.pinot.auth.password.inline.PinotPasswordBrokerAuthenticationConfig;
 import io.trino.plugin.pinot.auth.password.inline.PinotPasswordControllerAuthenticationConfig;
 
-import javax.inject.Singleton;
-
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static io.trino.plugin.pinot.auth.PinotAuthenticationType.NONE;
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/PinotAuthenticationTypeConfig.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/PinotAuthenticationTypeConfig.java
index 8827ddece888..835dac2edf5e 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/PinotAuthenticationTypeConfig.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/PinotAuthenticationTypeConfig.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.pinot.auth;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class PinotAuthenticationTypeConfig
 {
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/password/inline/PinotPasswordBrokerAuthenticationConfig.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/password/inline/PinotPasswordBrokerAuthenticationConfig.java
index f2124c06dc9b..4a817759e74f 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/password/inline/PinotPasswordBrokerAuthenticationConfig.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/password/inline/PinotPasswordBrokerAuthenticationConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigSecuritySensitive;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class PinotPasswordBrokerAuthenticationConfig
 {
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/password/inline/PinotPasswordControllerAuthenticationConfig.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/password/inline/PinotPasswordControllerAuthenticationConfig.java
index 05054437bf53..aa654dc9e235 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/password/inline/PinotPasswordControllerAuthenticationConfig.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/auth/password/inline/PinotPasswordControllerAuthenticationConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigSecuritySensitive;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class PinotPasswordControllerAuthenticationConfig
 {
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotClient.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotClient.java
index 8c567b4ed3d9..4f33a06d116e 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotClient.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotClient.java
@@ -28,6 +28,7 @@
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.net.HostAndPort;
+import com.google.inject.Inject;
 import io.airlift.http.client.HttpClient;
 import io.airlift.http.client.HttpUriBuilder;
 import io.airlift.http.client.JsonResponseHandler;
@@ -38,7 +39,7 @@
 import io.airlift.json.JsonCodecBinder;
 import io.airlift.json.JsonCodecFactory;
 import io.airlift.log.Logger;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.plugin.pinot.ForPinot;
 import io.trino.plugin.pinot.PinotColumnHandle;
 import io.trino.plugin.pinot.PinotConfig;
@@ -56,8 +57,6 @@
 import org.apache.pinot.common.response.broker.ResultTable;
 import org.apache.pinot.spi.data.Schema;
 
-import javax.inject.Inject;
-
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -89,7 +88,7 @@
 import static io.airlift.json.JsonCodec.jsonCodec;
 import static io.airlift.json.JsonCodec.listJsonCodec;
 import static io.airlift.json.JsonCodec.mapJsonCodec;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.plugin.pinot.PinotErrorCode.PINOT_AMBIGUOUS_TABLE_NAME;
 import static io.trino.plugin.pinot.PinotErrorCode.PINOT_EXCEPTION;
 import static io.trino.plugin.pinot.PinotErrorCode.PINOT_UNABLE_TO_FIND_BROKER;
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotGrpcDataFetcher.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotGrpcDataFetcher.java
index 54c56264a486..6e5ab6e96e0b 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotGrpcDataFetcher.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotGrpcDataFetcher.java
@@ -17,21 +17,21 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Closer;
 import com.google.common.net.HostAndPort;
+import com.google.inject.Inject;
 import io.trino.plugin.pinot.PinotErrorCode;
 import io.trino.plugin.pinot.PinotException;
 import io.trino.plugin.pinot.PinotSplit;
 import io.trino.plugin.pinot.query.PinotProxyGrpcRequestBuilder;
 import io.trino.spi.connector.ConnectorSession;
+import jakarta.annotation.PreDestroy;
 import org.apache.pinot.common.config.GrpcConfig;
+import org.apache.pinot.common.datatable.DataTable;
 import org.apache.pinot.common.datatable.DataTableFactory;
 import org.apache.pinot.common.proto.Server;
 import org.apache.pinot.common.utils.grpc.GrpcQueryClient;
 import org.apache.pinot.spi.utils.CommonConstants.Query.Response.MetadataKeys;
 import org.apache.pinot.spi.utils.CommonConstants.Query.Response.ResponseType;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.ByteBuffer;
@@ -41,7 +41,10 @@
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.plugin.pinot.PinotErrorCode.PINOT_EXCEPTION;
 import static java.lang.Boolean.FALSE;
+import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static org.apache.pinot.common.config.GrpcConfig.CONFIG_MAX_INBOUND_MESSAGE_BYTES_SIZE;
 import static org.apache.pinot.common.config.GrpcConfig.CONFIG_USE_PLAIN_TEXT;
@@ -255,17 +258,19 @@ public Iterator<PinotDataTableWithSize> queryPinot(ConnectorSession session, Str
                 grpcRequestBuilder.setHostName(mappedHostAndPort.getHost()).setPort(grpcPort);
             }
             Server.ServerRequest serverRequest = grpcRequestBuilder.build();
-            return new ResponseIterator(client.submit(serverRequest));
+            return new ResponseIterator(client.submit(serverRequest), query);
         }
 
         public static class ResponseIterator
                 extends AbstractIterator<PinotDataTableWithSize>
         {
             private final Iterator<Server.ServerResponse> responseIterator;
+            private final String query;
 
-            public ResponseIterator(Iterator<Server.ServerResponse> responseIterator)
+            public ResponseIterator(Iterator<Server.ServerResponse> responseIterator, String query)
             {
                 this.responseIterator = requireNonNull(responseIterator, "responseIterator is null");
+                this.query = requireNonNull(query, "query is null");
             }
 
             @Override
@@ -280,12 +285,22 @@ protected PinotDataTableWithSize computeNext()
                     return endOfData();
                 }
                 ByteBuffer buffer = response.getPayload().asReadOnlyByteBuffer();
+                DataTable dataTable;
                 try {
-                    return new PinotDataTableWithSize(DataTableFactory.getDataTable(buffer), buffer.remaining());
+                    dataTable = DataTableFactory.getDataTable(buffer);
                 }
                 catch (IOException e) {
                     throw new UncheckedIOException(e);
                 }
+                if (!dataTable.getExceptions().isEmpty()) {
+                    List<String> exceptions = dataTable.getExceptions().entrySet().stream()
+                            .map(entry -> format("Error code: %d Error message: %s", entry.getKey(), entry.getValue()))
+                            .collect(toImmutableList());
+
+                    throw new PinotException(PINOT_EXCEPTION, Optional.of(query), format("Encountered %d exceptions: %s", exceptions.size(), exceptions));
+                }
+
+                return new PinotDataTableWithSize(dataTable, buffer.remaining());
             }
         }
     }
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotGrpcServerQueryClientTlsConfig.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotGrpcServerQueryClientTlsConfig.java
index 2183f34f064e..448eaf2e394f 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotGrpcServerQueryClientTlsConfig.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotGrpcServerQueryClientTlsConfig.java
@@ -19,9 +19,8 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.annotation.PostConstruct;
-import javax.validation.constraints.NotNull;
+import jakarta.annotation.PostConstruct;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.Optional;
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotLegacyDataFetcher.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotLegacyDataFetcher.java
index 5accc85bae48..caafea5878f7 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotLegacyDataFetcher.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotLegacyDataFetcher.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.pinot.client;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.plugin.pinot.PinotConfig;
 import io.trino.plugin.pinot.PinotErrorCode;
@@ -38,8 +39,6 @@
 import org.apache.pinot.sql.parsers.CalciteSqlCompiler;
 import org.apache.pinot.sql.parsers.SqlCompilationException;
 
-import javax.inject.Inject;
-
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/IntegerDecoder.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/IntegerDecoder.java
index d503b19a99e1..4597df429bcb 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/IntegerDecoder.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/IntegerDecoder.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.pinot.decoders;
 
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.IntArrayBlockBuilder;
 
 import java.util.function.Supplier;
 
@@ -28,7 +29,7 @@ public void decode(Supplier<Object> getter, BlockBuilder output)
             output.appendNull();
         }
         else {
-            output.writeInt(((Number) value).intValue());
+            ((IntArrayBlockBuilder) output).writeInt(((Number) value).intValue());
         }
     }
 }
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/JsonDecoder.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/JsonDecoder.java
index dcd0280be60c..baa69b5153d1 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/JsonDecoder.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/JsonDecoder.java
@@ -16,6 +16,7 @@
 import io.airlift.slice.Slice;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 
 import java.util.function.Supplier;
 
@@ -36,7 +37,7 @@ public void decode(Supplier<Object> getter, BlockBuilder output)
         }
         else if (value instanceof String) {
             Slice slice = jsonParse(utf8Slice((String) value));
-            output.writeBytes(slice, 0, slice.length()).closeEntry();
+            ((VariableWidthBlockBuilder) output).writeEntry(slice);
         }
         else {
             throw new TrinoException(TYPE_MISMATCH, format("Expected a json value of type STRING: %s [%s]", value, value.getClass().getSimpleName()));
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/RealDecoder.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/RealDecoder.java
index ea6dd1a09cd2..2f292a9f26e3 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/RealDecoder.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/RealDecoder.java
@@ -17,7 +17,7 @@
 
 import java.util.function.Supplier;
 
-import static java.lang.Float.floatToIntBits;
+import static io.trino.spi.type.RealType.REAL;
 
 public class RealDecoder
         implements Decoder
@@ -31,10 +31,10 @@ public void decode(Supplier<Object> getter, BlockBuilder output)
         }
         else if (value instanceof String) {
             // Pinot returns NEGATIVE_INFINITY, POSITIVE_INFINITY as a String
-            output.writeInt(floatToIntBits(Float.valueOf((String) value)));
+            REAL.writeFloat(output, Float.parseFloat((String) value));
         }
         else {
-            output.writeInt((floatToIntBits(((Number) value).floatValue())));
+            REAL.writeFloat(output, ((Number) value).floatValue());
         }
     }
 }
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/VarbinaryDecoder.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/VarbinaryDecoder.java
index 472a479958f0..b09b6365b603 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/VarbinaryDecoder.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/VarbinaryDecoder.java
@@ -17,6 +17,7 @@
 import io.airlift.slice.Slices;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;
 
@@ -37,7 +38,7 @@ public void decode(Supplier<Object> getter, BlockBuilder output)
         }
         else if (value instanceof String) {
             Slice slice = Slices.wrappedBuffer(toBytes((String) value));
-            output.writeBytes(slice, 0, slice.length()).closeEntry();
+            ((VariableWidthBlockBuilder) output).writeEntry(slice);
         }
         else {
             throw new TrinoException(TYPE_MISMATCH, format("Expected a string value of type VARBINARY: %s [%s]", value, value.getClass().getSimpleName()));
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/VarcharDecoder.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/VarcharDecoder.java
index cf58f2519c24..87eb47c60a9a 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/VarcharDecoder.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/decoders/VarcharDecoder.java
@@ -16,6 +16,7 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.VariableWidthBlockBuilder;
 
 import java.util.function.Supplier;
 
@@ -31,7 +32,7 @@ public void decode(Supplier<Object> getter, BlockBuilder output)
         }
         else {
             Slice slice = Slices.utf8Slice(value.toString());
-            output.writeBytes(slice, 0, slice.length()).closeEntry();
+            ((VariableWidthBlockBuilder) output).writeEntry(slice);
         }
     }
 }
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTable.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTable.java
index 714134a5f9d9..8260295ab87b 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTable.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTable.java
@@ -16,9 +16,11 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import io.trino.plugin.pinot.PinotColumnHandle;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalLong;
@@ -48,6 +50,8 @@ public final class DynamicTable
     private final OptionalLong limit;
     private final OptionalLong offset;
 
+    private final Map<String, String> queryOptions;
+
     private final String query;
 
     private final boolean isAggregateInProjections;
@@ -64,6 +68,7 @@ public DynamicTable(
             @JsonProperty("orderBy") List<OrderByExpression> orderBy,
             @JsonProperty("limit") OptionalLong limit,
             @JsonProperty("offset") OptionalLong offset,
+            @JsonProperty("queryOptions") Map<String, String> queryOptions,
             @JsonProperty("query") String query)
     {
         this.tableName = requireNonNull(tableName, "tableName is null");
@@ -76,6 +81,7 @@ public DynamicTable(
         this.orderBy = ImmutableList.copyOf(requireNonNull(orderBy, "orderBy is null"));
         this.limit = requireNonNull(limit, "limit is null");
         this.offset = requireNonNull(offset, "offset is null");
+        this.queryOptions = ImmutableMap.copyOf(requireNonNull(queryOptions, "queryOptions is null"));
         this.query = requireNonNull(query, "query is null");
         this.isAggregateInProjections = projections.stream()
                 .anyMatch(PinotColumnHandle::isAggregate);
@@ -141,6 +147,12 @@ public OptionalLong getOffset()
         return offset;
     }
 
+    @JsonProperty
+    public Map<String, String> getQueryOptions()
+    {
+        return queryOptions;
+    }
+
     @JsonProperty
     public String getQuery()
     {
@@ -173,13 +185,14 @@ public boolean equals(Object other)
                 orderBy.equals(that.orderBy) &&
                 limit.equals(that.limit) &&
                 offset.equals(that.offset) &&
+                queryOptions.equals(that.queryOptions) &&
                 query.equals(that.query);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(tableName, projections, filter, groupingColumns, aggregateColumns, havingExpression, orderBy, limit, offset, query);
+        return Objects.hash(tableName, projections, filter, groupingColumns, aggregateColumns, havingExpression, orderBy, limit, offset, queryOptions, query);
     }
 
     @Override
@@ -195,6 +208,7 @@ public String toString()
                 .add("orderBy", orderBy)
                 .add("limit", limit)
                 .add("offset", offset)
+                .add("queryOptions", queryOptions)
                 .add("query", query)
                 .toString();
     }
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java
index cd646dae07f8..bef425ea183a 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java
@@ -127,7 +127,7 @@ public static DynamicTable buildFromPql(PinotMetadata pinotMetadata, SchemaTable
             filter = Optional.of(formatted);
         }
 
-        return new DynamicTable(pinotTableName, suffix, selectColumns, filter, groupByColumns, ImmutableList.of(), havingExpression, orderBy, OptionalLong.of(queryContext.getLimit()), getOffset(queryContext), query);
+        return new DynamicTable(pinotTableName, suffix, selectColumns, filter, groupByColumns, ImmutableList.of(), havingExpression, orderBy, OptionalLong.of(queryContext.getLimit()), getOffset(queryContext), queryContext.getQueryOptions(), query);
     }
 
     private static List<PinotColumnHandle> getPinotColumns(SchemaTableName schemaTableName, List<ExpressionContext> expressions, List<String> aliases, Map<String, ColumnHandle> columnHandles, PinotTypeResolver pinotTypeResolver, Map<String, PinotColumnNameAndTrinoType> aggregateTypes)
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTablePqlExtractor.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTablePqlExtractor.java
index 40ff0c5dccaf..51b58983a6f9 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTablePqlExtractor.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTablePqlExtractor.java
@@ -17,6 +17,7 @@
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.predicate.TupleDomain;
 
+import java.util.Map;
 import java.util.Optional;
 
 import static io.trino.plugin.pinot.query.PinotQueryBuilder.getFilterClause;
@@ -33,7 +34,15 @@ private DynamicTablePqlExtractor()
     public static String extractPql(DynamicTable table, TupleDomain<ColumnHandle> tupleDomain)
     {
         StringBuilder builder = new StringBuilder();
-        builder.append("select ");
+        Map<String, String> queryOptions = table.getQueryOptions();
+        queryOptions.keySet().stream().sorted().forEach(
+                key -> builder
+                        .append("SET ")
+                        .append(key)
+                        .append(" = ")
+                        .append(format("'%s'", queryOptions.get(key)))
+                        .append(";\n"));
+        builder.append("SELECT ");
         if (!table.getProjections().isEmpty()) {
             builder.append(table.getProjections().stream()
                     .map(DynamicTablePqlExtractor::formatExpression)
@@ -49,34 +58,34 @@ public static String extractPql(DynamicTable table, TupleDomain<ColumnHandle> tu
                     .map(DynamicTablePqlExtractor::formatExpression)
                     .collect(joining(", ")));
         }
-        builder.append(" from ");
+        builder.append(" FROM ");
         builder.append(table.getTableName());
         builder.append(table.getSuffix().orElse(""));
 
         Optional<String> filter = getFilter(table.getFilter(), tupleDomain, false);
         if (filter.isPresent()) {
-            builder.append(" where ")
+            builder.append(" WHERE ")
                     .append(filter.get());
         }
         if (!table.getGroupingColumns().isEmpty()) {
-            builder.append(" group by ");
+            builder.append(" GROUP BY ");
             builder.append(table.getGroupingColumns().stream()
                     .map(PinotColumnHandle::getExpression)
                     .collect(joining(", ")));
         }
         Optional<String> havingClause = getFilter(table.getHavingExpression(), tupleDomain, true);
         if (havingClause.isPresent()) {
-            builder.append(" having ")
+            builder.append(" HAVING ")
                     .append(havingClause.get());
         }
         if (!table.getOrderBy().isEmpty()) {
-            builder.append(" order by ")
+            builder.append(" ORDER BY ")
                     .append(table.getOrderBy().stream()
                             .map(DynamicTablePqlExtractor::convertOrderByExpressionToPql)
                             .collect(joining(", ")));
         }
         if (table.getLimit().isPresent()) {
-            builder.append(" limit ");
+            builder.append(" LIMIT ");
             if (table.getOffset().isPresent()) {
                 builder.append(table.getOffset().getAsLong())
                         .append(", ");
@@ -108,7 +117,7 @@ private static String convertOrderByExpressionToPql(OrderByExpression orderByExp
         StringBuilder builder = new StringBuilder()
                 .append(orderByExpression.getExpression());
         if (!orderByExpression.isAsc()) {
-            builder.append(" desc");
+            builder.append(" DESC");
         }
         return builder.toString();
     }
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotExpressionRewriter.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotExpressionRewriter.java
index 42a04a9b5b7c..6b97b141a2b5 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotExpressionRewriter.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotExpressionRewriter.java
@@ -183,7 +183,7 @@ public FunctionContext rewrite(FunctionContext object, Captures captures, Contex
             String outputFormat = object.getArguments().get(2).getLiteral().getValue().toString().toUpperCase(ENGLISH);
             argumentsBuilder.add(forLiteralContext(stringValue(outputFormat)));
             String granularity = object.getArguments().get(3).getLiteral().getValue().toString().toUpperCase(ENGLISH);
-            BaseDateTimeTransformer dateTimeTransformer = DateTimeTransformerFactory.getDateTimeTransformer(inputFormat, outputFormat, granularity);
+            BaseDateTimeTransformer<?, ?> dateTimeTransformer = DateTimeTransformerFactory.getDateTimeTransformer(inputFormat, outputFormat, granularity);
             // Even if the format is valid, make sure it is not a simple date format: format characters can be ambiguous due to lower casing
             checkState(dateTimeTransformer instanceof EpochToEpochTransformer, "Unsupported date format: simple date format not supported");
             argumentsBuilder.add(forLiteralContext(stringValue(granularity)));
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotQueryBuilder.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotQueryBuilder.java
index 92e8510d4ae5..0e8c20b84025 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotQueryBuilder.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotQueryBuilder.java
@@ -22,6 +22,7 @@
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.predicate.ValueSet;
 import io.trino.spi.type.RealType;
 import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.Timestamps;
@@ -37,6 +38,7 @@
 import java.util.OptionalLong;
 
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static java.lang.Float.intBitsToFloat;
@@ -103,19 +105,18 @@ private static void generateFilterPql(StringBuilder pqlBuilder, PinotTableHandle
 
     public static Optional<String> getFilterClause(TupleDomain<ColumnHandle> tupleDomain, Optional<String> timePredicate, boolean forHavingClause)
     {
+        checkState(!tupleDomain.isNone(), "Pinot does not support 1 = 0 syntax, as a workaround use <column> != <column>");
         ImmutableList.Builder<String> conjunctsBuilder = ImmutableList.builder();
         checkState((forHavingClause && timePredicate.isEmpty()) || !forHavingClause, "Unexpected time predicate with having clause");
         timePredicate.ifPresent(conjunctsBuilder::add);
-        if (!tupleDomain.equals(TupleDomain.all())) {
-            Map<ColumnHandle, Domain> domains = tupleDomain.getDomains().orElseThrow();
-            for (Map.Entry<ColumnHandle, Domain> entry : domains.entrySet()) {
-                PinotColumnHandle pinotColumnHandle = (PinotColumnHandle) entry.getKey();
-                // If this is for a having clause, only include aggregate columns.
-                // If this is for a where clause, only include non-aggregate columns.
-                // i.e. (forHavingClause && isAggregate) || (!forHavingClause && !isAggregate)
-                if (forHavingClause == pinotColumnHandle.isAggregate()) {
-                    conjunctsBuilder.add(toPredicate(pinotColumnHandle, entry.getValue()));
-                }
+        Map<ColumnHandle, Domain> domains = tupleDomain.getDomains().orElseThrow();
+        for (Map.Entry<ColumnHandle, Domain> entry : domains.entrySet()) {
+            PinotColumnHandle pinotColumnHandle = (PinotColumnHandle) entry.getKey();
+            // If this is for a having clause, only include aggregate columns.
+            // If this is for a where clause, only include non-aggregate columns.
+            // i.e. (forHavingClause && isAggregate) || (!forHavingClause && !isAggregate)
+            if (forHavingClause == pinotColumnHandle.isAggregate()) {
+                toPredicate(pinotColumnHandle, entry.getValue()).ifPresent(conjunctsBuilder::add);
             }
         }
         List<String> conjuncts = conjunctsBuilder.build();
@@ -125,12 +126,32 @@ public static Optional<String> getFilterClause(TupleDomain<ColumnHandle> tupleDo
         return Optional.empty();
     }
 
-    private static String toPredicate(PinotColumnHandle pinotColumnHandle, Domain domain)
+    private static Optional<String> toPredicate(PinotColumnHandle pinotColumnHandle, Domain domain)
     {
         String predicateArgument = pinotColumnHandle.isAggregate() ? pinotColumnHandle.getExpression() : quoteIdentifier(pinotColumnHandle.getColumnName());
+        ValueSet valueSet = domain.getValues();
+        if (valueSet.isNone()) {
+            verify(!domain.isNullAllowed(), "IS NULL is not supported due to different null handling semantics. See https://docs.pinot.apache.org/developers/advanced/null-value-support");
+            return Optional.of(format("(%s != %s)", predicateArgument, predicateArgument));
+        }
+        if (valueSet.isAll()) {
+            verify(domain.isNullAllowed(), "IS NOT NULL is not supported due to different null handling semantics. See https://docs.pinot.apache.org/developers/advanced/null-value-support");
+            // Pinot does not support "1 = 1" syntax: see https://github.com/apache/pinot/issues/10600
+            // As a workaround, skip adding always true to conjuncts
+            return Optional.empty();
+        }
+        verify(!domain.getValues().getRanges().getOrderedRanges().isEmpty() && !domain.isNullAllowed(), "IS NULL is not supported due to different null handling semantics. See https://docs.pinot.apache.org/developers/advanced/null-value-support");
         List<String> disjuncts = new ArrayList<>();
         List<Object> singleValues = new ArrayList<>();
-        for (Range range : domain.getValues().getRanges().getOrderedRanges()) {
+        boolean invertPredicate = false;
+        if (!valueSet.isDiscreteSet()) {
+            ValueSet complement = domain.getValues().complement();
+            if (complement.isDiscreteSet()) {
+                invertPredicate = complement.isDiscreteSet();
+                valueSet = complement;
+            }
+        }
+        for (Range range : valueSet.getRanges().getOrderedRanges()) {
             checkState(!range.isAll()); // Already checked
             if (range.isSingleValue()) {
                 singleValues.add(convertValue(range.getType(), range.getSingleValue()));
@@ -150,12 +171,14 @@ private static String toPredicate(PinotColumnHandle pinotColumnHandle, Domain do
         }
         // Add back all of the possible single values either as an equality or an IN predicate
         if (singleValues.size() == 1) {
-            disjuncts.add(toConjunct(predicateArgument, "=", getOnlyElement(singleValues)));
+            String operator = invertPredicate ? "!=" : "=";
+            disjuncts.add(toConjunct(predicateArgument, operator, getOnlyElement(singleValues)));
         }
         else if (singleValues.size() > 1) {
-            disjuncts.add(inClauseValues(predicateArgument, singleValues));
+            String operator = invertPredicate ? "NOT IN" : "IN";
+            disjuncts.add(inClauseValues(predicateArgument, operator, singleValues));
         }
-        return "(" + Joiner.on(" OR ").join(disjuncts) + ")";
+        return Optional.of("(" + Joiner.on(" OR ").join(disjuncts) + ")");
     }
 
     private static Object convertValue(Type type, Object value)
@@ -191,9 +214,9 @@ private static String toConjunct(String columnName, String operator, Object valu
         return format("%s %s %s", columnName, operator, singleQuote(value));
     }
 
-    private static String inClauseValues(String columnName, List<Object> singleValues)
+    private static String inClauseValues(String columnName, String operator, List<Object> singleValues)
     {
-        return format("%s IN (%s)", columnName, singleValues.stream()
+        return format("%s %s (%s)", columnName, operator, singleValues.stream()
                 .map(PinotQueryBuilder::singleQuote)
                 .collect(joining(", ")));
     }
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/BasePinotConnectorSmokeTest.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/BasePinotConnectorSmokeTest.java
new file mode 100644
index 000000000000..d06887539ce2
--- /dev/null
+++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/BasePinotConnectorSmokeTest.java
@@ -0,0 +1,2854 @@
+/*
+ * Licensed 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 io.trino.plugin.pinot;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import io.confluent.kafka.serializers.KafkaAvroSerializer;
+import io.trino.Session;
+import io.trino.plugin.pinot.client.PinotHostMapper;
+import io.trino.plugin.tpch.TpchPlugin;
+import io.trino.sql.planner.plan.AggregationNode;
+import io.trino.sql.planner.plan.ExchangeNode;
+import io.trino.sql.planner.plan.FilterNode;
+import io.trino.sql.planner.plan.LimitNode;
+import io.trino.sql.planner.plan.MarkDistinctNode;
+import io.trino.sql.planner.plan.ProjectNode;
+import io.trino.testing.BaseConnectorSmokeTest;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.MaterializedResult;
+import io.trino.testing.MaterializedRow;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.TestingConnectorBehavior;
+import io.trino.testing.kafka.TestingKafka;
+import org.apache.avro.Schema;
+import org.apache.avro.SchemaBuilder;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.generic.GenericRecordBuilder;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.apache.pinot.common.utils.TarGzCompressionUtils;
+import org.apache.pinot.segment.local.recordtransformer.CompositeTransformer;
+import org.apache.pinot.segment.local.recordtransformer.RecordTransformer;
+import org.apache.pinot.segment.local.segment.creator.RecordReaderSegmentCreationDataSource;
+import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
+import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
+import org.apache.pinot.segment.spi.creator.SegmentCreationDataSource;
+import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
+import org.apache.pinot.segment.spi.creator.name.NormalizedDateSegmentNameGenerator;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.DateTimeFormatSpec;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.data.readers.RecordReader;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static com.google.common.io.MoreFiles.deleteRecursively;
+import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
+import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
+import static io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG;
+import static io.trino.plugin.pinot.PinotQueryRunner.createPinotQueryRunner;
+import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_PREVIOUS_IMAGE_NAME;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.RealType.REAL;
+import static java.lang.String.format;
+import static java.time.temporal.ChronoUnit.DAYS;
+import static java.time.temporal.ChronoUnit.SECONDS;
+import static java.util.Objects.requireNonNull;
+import static java.util.UUID.randomUUID;
+import static java.util.stream.Collectors.joining;
+import static org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG;
+import static org.apache.pinot.spi.utils.JsonUtils.inputStreamToObject;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.testng.Assert.assertEquals;
+
+public abstract class BasePinotConnectorSmokeTest
+        extends BaseConnectorSmokeTest
+{
+    private static final int MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES = 11;
+    private static final int MAX_ROWS_PER_SPLIT_FOR_BROKER_QUERIES = 12;
+    // If a broker query does not supply a limit, pinot defaults to 10 rows
+    private static final int DEFAULT_PINOT_LIMIT_FOR_BROKER_QUERIES = 10;
+    private static final String ALL_TYPES_TABLE = "alltypes";
+    private static final String DATE_TIME_FIELDS_TABLE = "date_time_fields";
+    private static final String MIXED_CASE_COLUMN_NAMES_TABLE = "mixed_case";
+    private static final String MIXED_CASE_DISTINCT_TABLE = "mixed_case_distinct";
+    private static final String TOO_MANY_ROWS_TABLE = "too_many_rows";
+    private static final String TOO_MANY_BROKER_ROWS_TABLE = "too_many_broker_rows";
+    private static final String MIXED_CASE_TABLE_NAME = "mixedCase";
+    private static final String HYBRID_TABLE_NAME = "hybrid";
+    private static final String DUPLICATE_TABLE_LOWERCASE = "dup_table";
+    private static final String DUPLICATE_TABLE_MIXED_CASE = "dup_Table";
+    private static final String JSON_TABLE = "my_table";
+    private static final String JSON_TYPE_TABLE = "json_type_table";
+    private static final String RESERVED_KEYWORD_TABLE = "reserved_keyword";
+    private static final String QUOTES_IN_COLUMN_NAME_TABLE = "quotes_in_column_name";
+    private static final String DUPLICATE_VALUES_IN_COLUMNS_TABLE = "duplicate_values_in_columns";
+    // Use a recent value for updated_at to ensure Pinot doesn't clean up records older than retentionTimeValue as defined in the table specs
+    private static final Instant initialUpdatedAt = Instant.now().minus(Duration.ofDays(1)).truncatedTo(SECONDS);
+    // Use a fixed instant for testing date time functions
+    private static final Instant CREATED_AT_INSTANT = Instant.parse("2021-05-10T00:00:00.00Z");
+
+    private static final DateTimeFormatter MILLIS_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS").withZone(ZoneOffset.UTC);
+
+    protected abstract boolean isSecured();
+
+    protected boolean isGrpcEnabled()
+    {
+        return true;
+    }
+
+    protected String getPinotImageName()
+    {
+        return PINOT_PREVIOUS_IMAGE_NAME;
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        TestingKafka kafka = closeAfterClass(TestingKafka.createWithSchemaRegistry());
+        kafka.start();
+        TestingPinotCluster pinot = closeAfterClass(new TestingPinotCluster(kafka.getNetwork(), isSecured(), getPinotImageName()));
+        pinot.start();
+
+        createAndPopulateAllTypesTopic(kafka, pinot);
+        createAndPopulateMixedCaseTableAndTopic(kafka, pinot);
+        createAndPopulateMixedCaseDistinctTableAndTopic(kafka, pinot);
+        createAndPopulateTooManyRowsTable(kafka, pinot);
+        createAndPopulateTooManyBrokerRowsTableAndTopic(kafka, pinot);
+        createTheDuplicateTablesAndTopics(kafka, pinot);
+        createAndPopulateDateTimeFieldsTableAndTopic(kafka, pinot);
+        createAndPopulateJsonTypeTable(kafka, pinot);
+        createAndPopulateJsonTable(kafka, pinot);
+        createAndPopulateMixedCaseHybridTablesAndTopic(kafka, pinot);
+        createAndPopulateTableHavingReservedKeywordColumnNames(kafka, pinot);
+        createAndPopulateHavingQuotesInColumnNames(kafka, pinot);
+        createAndPopulateHavingMultipleColumnsWithDuplicateValues(kafka, pinot);
+
+        DistributedQueryRunner queryRunner = createPinotQueryRunner(
+                ImmutableMap.of(),
+                pinotProperties(pinot),
+                Optional.of(binder -> newOptionalBinder(binder, PinotHostMapper.class).setBinding()
+                        .toInstance(new TestingPinotHostMapper(pinot.getBrokerHostAndPort(), pinot.getServerHostAndPort(), pinot.getServerGrpcHostAndPort()))));
+
+        queryRunner.installPlugin(new TpchPlugin());
+        queryRunner.createCatalog("tpch", "tpch");
+
+        // We need the query runner to populate nation and region data from tpch schema
+        createAndPopulateNationAndRegionData(kafka, pinot, queryRunner);
+
+        return queryRunner;
+    }
+
+    private void createAndPopulateAllTypesTopic(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create and populate the all_types topic and table
+        kafka.createTopic(ALL_TYPES_TABLE);
+
+        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> allTypesRecordsBuilder = ImmutableList.builder();
+        for (int i = 0, step = 1200; i < MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES - 2; i++) {
+            int offset = i * step;
+            allTypesRecordsBuilder.add(new ProducerRecord<>(ALL_TYPES_TABLE, "key" + i * step,
+                    createTestRecord(
+                            Arrays.asList("string_" + (offset), "string1_" + (offset + 1), "string2_" + (offset + 2)),
+                            true,
+                            Arrays.asList(54 + i / 3, -10001, 1000),
+                            Arrays.asList(-7.33F + i, Float.POSITIVE_INFINITY, 17.034F + i),
+                            Arrays.asList(-17.33D + i, Double.POSITIVE_INFINITY, 10596.034D + i),
+                            Arrays.asList(-3147483647L + i, 12L - i, 4147483647L + i),
+                            initialUpdatedAt.minusMillis(offset).toEpochMilli(),
+                            initialUpdatedAt.plusMillis(offset).toEpochMilli())));
+        }
+
+        allTypesRecordsBuilder.add(new ProducerRecord<>(ALL_TYPES_TABLE, null, createNullRecord()));
+        allTypesRecordsBuilder.add(new ProducerRecord<>(ALL_TYPES_TABLE, null, createArrayNullRecord()));
+        kafka.sendMessages(allTypesRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
+
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("alltypes_schema.json"), ALL_TYPES_TABLE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("alltypes_realtimeSpec.json"), ALL_TYPES_TABLE);
+    }
+
+    private void createAndPopulateMixedCaseTableAndTopic(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create and populate mixed case table and topic
+        kafka.createTopic(MIXED_CASE_COLUMN_NAMES_TABLE);
+        Schema mixedCaseAvroSchema = SchemaBuilder.record(MIXED_CASE_COLUMN_NAMES_TABLE).fields()
+                .name("stringCol").type().stringType().noDefault()
+                .name("longCol").type().optional().longType()
+                .name("updatedAt").type().longType().noDefault()
+                .endRecord();
+
+        List<ProducerRecord<String, GenericRecord>> mixedCaseProducerRecords = ImmutableList.<ProducerRecord<String, GenericRecord>>builder()
+                .add(new ProducerRecord<>(MIXED_CASE_COLUMN_NAMES_TABLE, "key0", new GenericRecordBuilder(mixedCaseAvroSchema)
+                        .set("stringCol", "string_0")
+                        .set("longCol", 0L)
+                        .set("updatedAt", initialUpdatedAt.toEpochMilli())
+                        .build()))
+                .add(new ProducerRecord<>(MIXED_CASE_COLUMN_NAMES_TABLE, "key1", new GenericRecordBuilder(mixedCaseAvroSchema)
+                        .set("stringCol", "string_1")
+                        .set("longCol", 1L)
+                        .set("updatedAt", initialUpdatedAt.plusMillis(1000).toEpochMilli())
+                        .build()))
+                .add(new ProducerRecord<>(MIXED_CASE_COLUMN_NAMES_TABLE, "key2", new GenericRecordBuilder(mixedCaseAvroSchema)
+                        .set("stringCol", "string_2")
+                        .set("longCol", 2L)
+                        .set("updatedAt", initialUpdatedAt.plusMillis(2000).toEpochMilli())
+                        .build()))
+                .add(new ProducerRecord<>(MIXED_CASE_COLUMN_NAMES_TABLE, "key3", new GenericRecordBuilder(mixedCaseAvroSchema)
+                        .set("stringCol", "string_3")
+                        .set("longCol", 3L)
+                        .set("updatedAt", initialUpdatedAt.plusMillis(3000).toEpochMilli())
+                        .build()))
+                .build();
+
+        kafka.sendMessages(mixedCaseProducerRecords.stream(), schemaRegistryAwareProducer(kafka));
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("mixed_case_schema.json"), MIXED_CASE_COLUMN_NAMES_TABLE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("mixed_case_realtimeSpec.json"), MIXED_CASE_COLUMN_NAMES_TABLE);
+    }
+
+    private void createAndPopulateMixedCaseDistinctTableAndTopic(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create and populate mixed case distinct table and topic
+        kafka.createTopic(MIXED_CASE_DISTINCT_TABLE);
+        Schema mixedCaseDistinctAvroSchema = SchemaBuilder.record(MIXED_CASE_DISTINCT_TABLE).fields()
+                .name("string_col").type().stringType().noDefault()
+                .name("updated_at").type().longType().noDefault()
+                .endRecord();
+
+        List<ProducerRecord<String, GenericRecord>> mixedCaseDistinctProducerRecords = ImmutableList.<ProducerRecord<String, GenericRecord>>builder()
+                .add(new ProducerRecord<>(MIXED_CASE_DISTINCT_TABLE, "key0", new GenericRecordBuilder(mixedCaseDistinctAvroSchema)
+                        .set("string_col", "A")
+                        .set("updated_at", initialUpdatedAt.toEpochMilli())
+                        .build()))
+                .add(new ProducerRecord<>(MIXED_CASE_DISTINCT_TABLE, "key1", new GenericRecordBuilder(mixedCaseDistinctAvroSchema)
+                        .set("string_col", "a")
+                        .set("updated_at", initialUpdatedAt.plusMillis(1000).toEpochMilli())
+                        .build()))
+                .add(new ProducerRecord<>(MIXED_CASE_DISTINCT_TABLE, "key2", new GenericRecordBuilder(mixedCaseDistinctAvroSchema)
+                        .set("string_col", "B")
+                        .set("updated_at", initialUpdatedAt.plusMillis(2000).toEpochMilli())
+                        .build()))
+                .add(new ProducerRecord<>(MIXED_CASE_DISTINCT_TABLE, "key3", new GenericRecordBuilder(mixedCaseDistinctAvroSchema)
+                        .set("string_col", "b")
+                        .set("updated_at", initialUpdatedAt.plusMillis(3000).toEpochMilli())
+                        .build()))
+                .build();
+
+        kafka.sendMessages(mixedCaseDistinctProducerRecords.stream(), schemaRegistryAwareProducer(kafka));
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("mixed_case_distinct_schema.json"), MIXED_CASE_DISTINCT_TABLE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("mixed_case_distinct_realtimeSpec.json"), MIXED_CASE_DISTINCT_TABLE);
+
+        // Create mixed case table name, populated from the mixed case topic
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("mixed_case_table_name_schema.json"), MIXED_CASE_TABLE_NAME);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("mixed_case_table_name_realtimeSpec.json"), MIXED_CASE_TABLE_NAME);
+    }
+
+    private void createAndPopulateTooManyRowsTable(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create and populate too many rows table and topic
+        kafka.createTopic(TOO_MANY_ROWS_TABLE);
+        Schema tooManyRowsAvroSchema = SchemaBuilder.record(TOO_MANY_ROWS_TABLE).fields()
+                .name("string_col").type().optional().stringType()
+                .name("updatedAt").type().optional().longType()
+                .endRecord();
+
+        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> tooManyRowsRecordsBuilder = ImmutableList.builder();
+        for (int i = 0; i < MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 1; i++) {
+            tooManyRowsRecordsBuilder.add(new ProducerRecord<>(TOO_MANY_ROWS_TABLE, "key" + i, new GenericRecordBuilder(tooManyRowsAvroSchema)
+                    .set("string_col", "string_" + i)
+                    .set("updatedAt", initialUpdatedAt.plusMillis(i * 1000L).toEpochMilli())
+                    .build()));
+        }
+        kafka.sendMessages(tooManyRowsRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("too_many_rows_schema.json"), TOO_MANY_ROWS_TABLE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("too_many_rows_realtimeSpec.json"), TOO_MANY_ROWS_TABLE);
+    }
+
+    private void createAndPopulateTooManyBrokerRowsTableAndTopic(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create and populate too many broker rows table and topic
+        kafka.createTopic(TOO_MANY_BROKER_ROWS_TABLE);
+        Schema tooManyBrokerRowsAvroSchema = SchemaBuilder.record(TOO_MANY_BROKER_ROWS_TABLE).fields()
+                .name("string_col").type().optional().stringType()
+                .name("updatedAt").type().optional().longType()
+                .endRecord();
+
+        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> tooManyBrokerRowsRecordsBuilder = ImmutableList.builder();
+        for (int i = 0; i < MAX_ROWS_PER_SPLIT_FOR_BROKER_QUERIES + 1; i++) {
+            tooManyBrokerRowsRecordsBuilder.add(new ProducerRecord<>(TOO_MANY_BROKER_ROWS_TABLE, "key" + i, new GenericRecordBuilder(tooManyBrokerRowsAvroSchema)
+                    .set("string_col", "string_" + i)
+                    .set("updatedAt", initialUpdatedAt.plusMillis(i * 1000L).toEpochMilli())
+                    .build()));
+        }
+        kafka.sendMessages(tooManyBrokerRowsRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("too_many_broker_rows_schema.json"), TOO_MANY_BROKER_ROWS_TABLE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("too_many_broker_rows_realtimeSpec.json"), TOO_MANY_BROKER_ROWS_TABLE);
+    }
+
+    private void createTheDuplicateTablesAndTopics(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create the duplicate tables and topics
+        kafka.createTopic(DUPLICATE_TABLE_LOWERCASE);
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("dup_table_lower_case_schema.json"), DUPLICATE_TABLE_LOWERCASE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("dup_table_lower_case_realtimeSpec.json"), DUPLICATE_TABLE_LOWERCASE);
+
+        kafka.createTopic(DUPLICATE_TABLE_MIXED_CASE);
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("dup_table_mixed_case_schema.json"), DUPLICATE_TABLE_MIXED_CASE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("dup_table_mixed_case_realtimeSpec.json"), DUPLICATE_TABLE_MIXED_CASE);
+    }
+
+    private void createAndPopulateDateTimeFieldsTableAndTopic(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create and populate date time fields table and topic
+        kafka.createTopic(DATE_TIME_FIELDS_TABLE);
+        Schema dateTimeFieldsAvroSchema = SchemaBuilder.record(DATE_TIME_FIELDS_TABLE).fields()
+                .name("string_col").type().stringType().noDefault()
+                .name("created_at").type().longType().noDefault()
+                .name("updated_at").type().longType().noDefault()
+                .endRecord();
+        List<ProducerRecord<String, GenericRecord>> dateTimeFieldsProducerRecords = ImmutableList.<ProducerRecord<String, GenericRecord>>builder()
+                .add(new ProducerRecord<>(DATE_TIME_FIELDS_TABLE, "string_0", new GenericRecordBuilder(dateTimeFieldsAvroSchema)
+                        .set("string_col", "string_0")
+                        .set("created_at", CREATED_AT_INSTANT.toEpochMilli())
+                        .set("updated_at", initialUpdatedAt.toEpochMilli())
+                        .build()))
+                .add(new ProducerRecord<>(DATE_TIME_FIELDS_TABLE, "string_1", new GenericRecordBuilder(dateTimeFieldsAvroSchema)
+                        .set("string_col", "string_1")
+                        .set("created_at", CREATED_AT_INSTANT.plusMillis(1000).toEpochMilli())
+                        .set("updated_at", initialUpdatedAt.plusMillis(1000).toEpochMilli())
+                        .build()))
+                .add(new ProducerRecord<>(DATE_TIME_FIELDS_TABLE, "string_2", new GenericRecordBuilder(dateTimeFieldsAvroSchema)
+                        .set("string_col", "string_2")
+                        .set("created_at", CREATED_AT_INSTANT.plusMillis(2000).toEpochMilli())
+                        .set("updated_at", initialUpdatedAt.plusMillis(2000).toEpochMilli())
+                        .build()))
+                .build();
+        kafka.sendMessages(dateTimeFieldsProducerRecords.stream(), schemaRegistryAwareProducer(kafka));
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("date_time_fields_schema.json"), DATE_TIME_FIELDS_TABLE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("date_time_fields_realtimeSpec.json"), DATE_TIME_FIELDS_TABLE);
+    }
+
+    private void createAndPopulateJsonTypeTable(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create json type table
+        kafka.createTopic(JSON_TYPE_TABLE);
+
+        Schema jsonTableAvroSchema = SchemaBuilder.record(JSON_TYPE_TABLE).fields()
+                .name("string_col").type().optional().stringType()
+                .name("json_col").type().optional().stringType()
+                .name("updatedAt").type().optional().longType()
+                .endRecord();
+
+        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> jsonTableRecordsBuilder = ImmutableList.builder();
+        for (int i = 0; i < 3; i++) {
+            jsonTableRecordsBuilder.add(new ProducerRecord<>(JSON_TYPE_TABLE, "key" + i, new GenericRecordBuilder(jsonTableAvroSchema)
+                    .set("string_col", "string_" + i)
+                    .set("json_col", "{ \"name\": \"user_" + i + "\", \"id\": " + i + "}")
+                    .set("updatedAt", initialUpdatedAt.plusMillis(i * 1000L).toEpochMilli())
+                    .build()));
+        }
+        kafka.sendMessages(jsonTableRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("json_schema.json"), JSON_TYPE_TABLE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("json_realtimeSpec.json"), JSON_TYPE_TABLE);
+        pinot.addOfflineTable(getClass().getClassLoader().getResourceAsStream("json_offlineSpec.json"), JSON_TYPE_TABLE);
+    }
+
+    private void createAndPopulateJsonTable(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create json table
+        kafka.createTopic(JSON_TABLE);
+        long key = 0L;
+        kafka.sendMessages(Stream.of(
+                new ProducerRecord<>(JSON_TABLE, key++, TestingJsonRecord.of("vendor1", "Los Angeles", Arrays.asList("foo1", "bar1", "baz1"), Arrays.asList(5, 6, 7), Arrays.asList(3.5F, 5.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 4)),
+                new ProducerRecord<>(JSON_TABLE, key++, TestingJsonRecord.of("vendor2", "New York", Arrays.asList("foo2", "bar1", "baz1"), Arrays.asList(6, 7, 8), Arrays.asList(4.5F, 6.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 6)),
+                new ProducerRecord<>(JSON_TABLE, key++, TestingJsonRecord.of("vendor3", "Los Angeles", Arrays.asList("foo3", "bar2", "baz1"), Arrays.asList(7, 8, 9), Arrays.asList(5.5F, 7.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 8)),
+                new ProducerRecord<>(JSON_TABLE, key++, TestingJsonRecord.of("vendor4", "New York", Arrays.asList("foo4", "bar2", "baz2"), Arrays.asList(8, 9, 10), Arrays.asList(6.5F, 8.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 10)),
+                new ProducerRecord<>(JSON_TABLE, key++, TestingJsonRecord.of("vendor5", "Los Angeles", Arrays.asList("foo5", "bar3", "baz2"), Arrays.asList(9, 10, 11), Arrays.asList(7.5F, 9.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 12)),
+                new ProducerRecord<>(JSON_TABLE, key++, TestingJsonRecord.of("vendor6", "Los Angeles", Arrays.asList("foo6", "bar3", "baz2"), Arrays.asList(10, 11, 12), Arrays.asList(8.5F, 10.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 12)),
+                new ProducerRecord<>(JSON_TABLE, key, TestingJsonRecord.of("vendor7", "Los Angeles", Arrays.asList("foo6", "bar3", "baz2"), Arrays.asList(10, 11, 12), Arrays.asList(9.5F, 10.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 12))));
+
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("schema.json"), JSON_TABLE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("realtimeSpec.json"), JSON_TABLE);
+    }
+
+    private void createAndPopulateMixedCaseHybridTablesAndTopic(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create and populate mixed case table and topic
+        kafka.createTopic(HYBRID_TABLE_NAME);
+        Schema hybridAvroSchema = SchemaBuilder.record(HYBRID_TABLE_NAME).fields()
+                .name("stringCol").type().stringType().noDefault()
+                .name("longCol").type().optional().longType()
+                .name("updatedAt").type().longType().noDefault()
+                .endRecord();
+
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("hybrid_schema.json"), HYBRID_TABLE_NAME);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("hybrid_realtimeSpec.json"), HYBRID_TABLE_NAME);
+        pinot.addOfflineTable(getClass().getClassLoader().getResourceAsStream("hybrid_offlineSpec.json"), HYBRID_TABLE_NAME);
+
+        Instant startInstant = initialUpdatedAt.truncatedTo(DAYS);
+        List<ProducerRecord<String, GenericRecord>> hybridProducerRecords = ImmutableList.<ProducerRecord<String, GenericRecord>>builder()
+                .add(new ProducerRecord<>(HYBRID_TABLE_NAME, "key0", new GenericRecordBuilder(hybridAvroSchema)
+                        .set("stringCol", "string_0")
+                        .set("longCol", 0L)
+                        .set("updatedAt", startInstant.toEpochMilli())
+                        .build()))
+                .add(new ProducerRecord<>(HYBRID_TABLE_NAME, "key1", new GenericRecordBuilder(hybridAvroSchema)
+                        .set("stringCol", "string_1")
+                        .set("longCol", 1L)
+                        .set("updatedAt", startInstant.plusMillis(1000).toEpochMilli())
+                        .build()))
+                .add(new ProducerRecord<>(HYBRID_TABLE_NAME, "key2", new GenericRecordBuilder(hybridAvroSchema)
+                        .set("stringCol", "string_2")
+                        .set("longCol", 2L)
+                        .set("updatedAt", startInstant.plusMillis(2000).toEpochMilli())
+                        .build()))
+                .add(new ProducerRecord<>(HYBRID_TABLE_NAME, "key3", new GenericRecordBuilder(hybridAvroSchema)
+                        .set("stringCol", "string_3")
+                        .set("longCol", 3L)
+                        .set("updatedAt", startInstant.plusMillis(3000).toEpochMilli())
+                        .build()))
+                .build();
+
+        Path temporaryDirectory = Paths.get("/tmp/segments-" + randomUUID());
+        try {
+            Files.createDirectory(temporaryDirectory);
+            ImmutableList.Builder<GenericRow> offlineRowsBuilder = ImmutableList.builder();
+            for (int i = 4; i < 8; i++) {
+                GenericRow row = new GenericRow();
+                row.putValue("stringCol", "string_" + i);
+                row.putValue("longCol", (long) i);
+                row.putValue("updatedAt", startInstant.plus(1, DAYS).plusMillis(1000L * (i - 4)).toEpochMilli());
+                offlineRowsBuilder.add(row);
+            }
+            Path segmentPath = createSegment(getClass().getClassLoader().getResourceAsStream("hybrid_offlineSpec.json"), getClass().getClassLoader().getResourceAsStream("hybrid_schema.json"), new GenericRowRecordReader(offlineRowsBuilder.build()), temporaryDirectory.toString(), 0);
+            pinot.publishOfflineSegment("hybrid", segmentPath);
+
+            offlineRowsBuilder = ImmutableList.builder();
+            // These rows will be visible as they are older than the Pinot time boundary
+            // In Pinot the time boundary is the most recent time column value for an offline row - 24 hours
+            for (int i = 8; i < 12; i++) {
+                GenericRow row = new GenericRow();
+                row.putValue("stringCol", "string_" + i);
+                row.putValue("longCol", (long) i);
+                row.putValue("updatedAt", startInstant.minus(1, DAYS).plusMillis(1000L * (i - 7)).toEpochMilli());
+                offlineRowsBuilder.add(row);
+            }
+            segmentPath = createSegment(getClass().getClassLoader().getResourceAsStream("hybrid_offlineSpec.json"), getClass().getClassLoader().getResourceAsStream("hybrid_schema.json"), new GenericRowRecordReader(offlineRowsBuilder.build()), temporaryDirectory.toString(), 1);
+            pinot.publishOfflineSegment("hybrid", segmentPath);
+        }
+        finally {
+            deleteRecursively(temporaryDirectory, ALLOW_INSECURE);
+        }
+
+        kafka.sendMessages(hybridProducerRecords.stream(), schemaRegistryAwareProducer(kafka));
+    }
+
+    private void createAndPopulateTableHavingReservedKeywordColumnNames(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create a table having reserved keyword column names
+        kafka.createTopic(RESERVED_KEYWORD_TABLE);
+        Schema reservedKeywordAvroSchema = SchemaBuilder.record(RESERVED_KEYWORD_TABLE).fields()
+                .name("date").type().optional().stringType()
+                .name("as").type().optional().stringType()
+                .name("updatedAt").type().optional().longType()
+                .endRecord();
+        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> reservedKeywordRecordsBuilder = ImmutableList.builder();
+        reservedKeywordRecordsBuilder.add(new ProducerRecord<>(RESERVED_KEYWORD_TABLE, "key0", new GenericRecordBuilder(reservedKeywordAvroSchema).set("date", "2021-09-30").set("as", "foo").set("updatedAt", initialUpdatedAt.plusMillis(1000).toEpochMilli()).build()));
+        reservedKeywordRecordsBuilder.add(new ProducerRecord<>(RESERVED_KEYWORD_TABLE, "key1", new GenericRecordBuilder(reservedKeywordAvroSchema).set("date", "2021-10-01").set("as", "bar").set("updatedAt", initialUpdatedAt.plusMillis(2000).toEpochMilli()).build()));
+        kafka.sendMessages(reservedKeywordRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("reserved_keyword_schema.json"), RESERVED_KEYWORD_TABLE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("reserved_keyword_realtimeSpec.json"), RESERVED_KEYWORD_TABLE);
+    }
+
+    private void createAndPopulateHavingQuotesInColumnNames(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create a table having quotes in column names
+        kafka.createTopic(QUOTES_IN_COLUMN_NAME_TABLE);
+        Schema quotesInColumnNameAvroSchema = SchemaBuilder.record(QUOTES_IN_COLUMN_NAME_TABLE).fields()
+                .name("non_quoted").type().optional().stringType()
+                .name("updatedAt").type().optional().longType()
+                .endRecord();
+        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> quotesInColumnNameRecordsBuilder = ImmutableList.builder();
+        quotesInColumnNameRecordsBuilder.add(new ProducerRecord<>(QUOTES_IN_COLUMN_NAME_TABLE, "key0", new GenericRecordBuilder(quotesInColumnNameAvroSchema).set("non_quoted", "Foo").set("updatedAt", initialUpdatedAt.plusMillis(1000).toEpochMilli()).build()));
+        quotesInColumnNameRecordsBuilder.add(new ProducerRecord<>(QUOTES_IN_COLUMN_NAME_TABLE, "key1", new GenericRecordBuilder(quotesInColumnNameAvroSchema).set("non_quoted", "Bar").set("updatedAt", initialUpdatedAt.plusMillis(2000).toEpochMilli()).build()));
+        kafka.sendMessages(quotesInColumnNameRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("quotes_in_column_name_schema.json"), QUOTES_IN_COLUMN_NAME_TABLE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("quotes_in_column_name_realtimeSpec.json"), QUOTES_IN_COLUMN_NAME_TABLE);
+    }
+
+    private void createAndPopulateHavingMultipleColumnsWithDuplicateValues(TestingKafka kafka, TestingPinotCluster pinot)
+            throws Exception
+    {
+        // Create a table having multiple columns with duplicate values
+        kafka.createTopic(DUPLICATE_VALUES_IN_COLUMNS_TABLE);
+        Schema duplicateValuesInColumnsAvroSchema = SchemaBuilder.record(DUPLICATE_VALUES_IN_COLUMNS_TABLE).fields()
+                .name("dim_col").type().optional().longType()
+                .name("another_dim_col").type().optional().longType()
+                .name("string_col").type().optional().stringType()
+                .name("another_string_col").type().optional().stringType()
+                .name("metric_col1").type().optional().longType()
+                .name("metric_col2").type().optional().longType()
+                .name("updated_at").type().longType().noDefault()
+                .endRecord();
+
+        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> duplicateValuesInColumnsRecordsBuilder = ImmutableList.builder();
+        duplicateValuesInColumnsRecordsBuilder.add(new ProducerRecord<>(DUPLICATE_VALUES_IN_COLUMNS_TABLE, "key0", new GenericRecordBuilder(duplicateValuesInColumnsAvroSchema)
+                .set("dim_col", 1000L)
+                .set("another_dim_col", 1000L)
+                .set("string_col", "string1")
+                .set("another_string_col", "string1")
+                .set("metric_col1", 10L)
+                .set("metric_col2", 20L)
+                .set("updated_at", initialUpdatedAt.plusMillis(1000).toEpochMilli())
+                .build()));
+        duplicateValuesInColumnsRecordsBuilder.add(new ProducerRecord<>(DUPLICATE_VALUES_IN_COLUMNS_TABLE, "key1", new GenericRecordBuilder(duplicateValuesInColumnsAvroSchema)
+                .set("dim_col", 2000L)
+                .set("another_dim_col", 2000L)
+                .set("string_col", "string1")
+                .set("another_string_col", "string1")
+                .set("metric_col1", 100L)
+                .set("metric_col2", 200L)
+                .set("updated_at", initialUpdatedAt.plusMillis(2000).toEpochMilli())
+                .build()));
+        duplicateValuesInColumnsRecordsBuilder.add(new ProducerRecord<>(DUPLICATE_VALUES_IN_COLUMNS_TABLE, "key2", new GenericRecordBuilder(duplicateValuesInColumnsAvroSchema)
+                .set("dim_col", 3000L)
+                .set("another_dim_col", 3000L)
+                .set("string_col", "string1")
+                .set("another_string_col", "another_string1")
+                .set("metric_col1", 1000L)
+                .set("metric_col2", 2000L)
+                .set("updated_at", initialUpdatedAt.plusMillis(3000).toEpochMilli())
+                .build()));
+        duplicateValuesInColumnsRecordsBuilder.add(new ProducerRecord<>(DUPLICATE_VALUES_IN_COLUMNS_TABLE, "key1", new GenericRecordBuilder(duplicateValuesInColumnsAvroSchema)
+                .set("dim_col", 4000L)
+                .set("another_dim_col", 4000L)
+                .set("string_col", "string2")
+                .set("another_string_col", "another_string2")
+                .set("metric_col1", 100L)
+                .set("metric_col2", 200L)
+                .set("updated_at", initialUpdatedAt.plusMillis(4000).toEpochMilli())
+                .build()));
+        duplicateValuesInColumnsRecordsBuilder.add(new ProducerRecord<>(DUPLICATE_VALUES_IN_COLUMNS_TABLE, "key2", new GenericRecordBuilder(duplicateValuesInColumnsAvroSchema)
+                .set("dim_col", 4000L)
+                .set("another_dim_col", 4001L)
+                .set("string_col", "string2")
+                .set("another_string_col", "string2")
+                .set("metric_col1", 1000L)
+                .set("metric_col2", 2000L)
+                .set("updated_at", initialUpdatedAt.plusMillis(5000).toEpochMilli())
+                .build()));
+
+        kafka.sendMessages(duplicateValuesInColumnsRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("duplicate_values_in_columns_schema.json"), DUPLICATE_VALUES_IN_COLUMNS_TABLE);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("duplicate_values_in_columns_realtimeSpec.json"), DUPLICATE_VALUES_IN_COLUMNS_TABLE);
+    }
+
+    private void createAndPopulateNationAndRegionData(TestingKafka kafka, TestingPinotCluster pinot, DistributedQueryRunner queryRunner)
+            throws Exception
+    {
+        // Create and populate table and topic data
+        String regionTableName = "region";
+        kafka.createTopicWithConfig(2, 1, regionTableName, false);
+        Schema regionSchema = SchemaBuilder.record(regionTableName).fields()
+                // regionkey bigint, name varchar, comment varchar
+                .name("regionkey").type().longType().noDefault()
+                .name("name").type().stringType().noDefault()
+                .name("comment").type().stringType().noDefault()
+                .name("updated_at_seconds").type().longType().noDefault()
+                .endRecord();
+        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> regionRowsBuilder = ImmutableList.builder();
+        MaterializedResult regionRows = queryRunner.execute("SELECT * FROM tpch.tiny.region");
+        for (MaterializedRow row : regionRows.getMaterializedRows()) {
+            regionRowsBuilder.add(new ProducerRecord<>(regionTableName, "key" + row.getField(0), new GenericRecordBuilder(regionSchema)
+                    .set("regionkey", row.getField(0))
+                    .set("name", row.getField(1))
+                    .set("comment", row.getField(2))
+                    .set("updated_at_seconds", initialUpdatedAt.plusMillis(1000).toEpochMilli())
+                    .build()));
+        }
+        kafka.sendMessages(regionRowsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("region_schema.json"), regionTableName);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("region_realtimeSpec.json"), regionTableName);
+
+        String nationTableName = "nation";
+        kafka.createTopicWithConfig(2, 1, nationTableName, false);
+        Schema nationSchema = SchemaBuilder.record(nationTableName).fields()
+                // nationkey BIGINT, name VARCHAR,  VARCHAR, regionkey BIGINT
+                .name("nationkey").type().longType().noDefault()
+                .name("name").type().stringType().noDefault()
+                .name("comment").type().stringType().noDefault()
+                .name("regionkey").type().longType().noDefault()
+                .name("updated_at_seconds").type().longType().noDefault()
+                .endRecord();
+        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> nationRowsBuilder = ImmutableList.builder();
+        MaterializedResult nationRows = queryRunner.execute("SELECT * FROM tpch.tiny.nation");
+        for (MaterializedRow row : nationRows.getMaterializedRows()) {
+            nationRowsBuilder.add(new ProducerRecord<>(nationTableName, "key" + row.getField(0), new GenericRecordBuilder(nationSchema)
+                    .set("nationkey", row.getField(0))
+                    .set("name", row.getField(1))
+                    .set("comment", row.getField(3))
+                    .set("regionkey", row.getField(2))
+                    .set("updated_at_seconds", initialUpdatedAt.plusMillis(1000).toEpochMilli())
+                    .build()));
+        }
+        kafka.sendMessages(nationRowsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
+        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("nation_schema.json"), nationTableName);
+        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("nation_realtimeSpec.json"), nationTableName);
+    }
+
+    @Override
+    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
+    {
+        return switch (connectorBehavior) {
+            case SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_INSERT,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
+
+    private Map<String, String> pinotProperties(TestingPinotCluster pinot)
+    {
+        return ImmutableMap.<String, String>builder()
+                .put("pinot.controller-urls", pinot.getControllerConnectString())
+                .put("pinot.max-rows-per-split-for-segment-queries", String.valueOf(MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
+                .put("pinot.max-rows-for-broker-queries", String.valueOf(MAX_ROWS_PER_SPLIT_FOR_BROKER_QUERIES))
+                .putAll(additionalPinotProperties())
+                .buildOrThrow();
+    }
+
+    protected Map<String, String> additionalPinotProperties()
+    {
+        if (isGrpcEnabled()) {
+            return ImmutableMap.of("pinot.grpc.enabled", "true");
+        }
+        return ImmutableMap.of();
+    }
+
+    private static Path createSegment(InputStream tableConfigInputStream, InputStream pinotSchemaInputStream, RecordReader recordReader, String outputDirectory, int sequenceId)
+    {
+        try {
+            org.apache.pinot.spi.data.Schema pinotSchema = org.apache.pinot.spi.data.Schema.fromInputStream(pinotSchemaInputStream);
+            TableConfig tableConfig = inputStreamToObject(tableConfigInputStream, TableConfig.class);
+            String tableName = TableNameBuilder.extractRawTableName(tableConfig.getTableName());
+            String timeColumnName = tableConfig.getValidationConfig().getTimeColumnName();
+            String segmentTempLocation = String.join(File.separator, outputDirectory, tableName, "segments");
+            Files.createDirectories(Paths.get(outputDirectory));
+            SegmentGeneratorConfig segmentGeneratorConfig = new SegmentGeneratorConfig(tableConfig, pinotSchema);
+            segmentGeneratorConfig.setTableName(tableName);
+            segmentGeneratorConfig.setOutDir(segmentTempLocation);
+            if (timeColumnName != null) {
+                DateTimeFormatSpec formatSpec = new DateTimeFormatSpec(pinotSchema.getDateTimeSpec(timeColumnName).getFormat());
+                segmentGeneratorConfig.setSegmentNameGenerator(new NormalizedDateSegmentNameGenerator(
+                        tableName,
+                        null,
+                        false,
+                        tableConfig.getValidationConfig().getSegmentPushType(),
+                        tableConfig.getValidationConfig().getSegmentPushFrequency(),
+                        formatSpec,
+                        null));
+            }
+            else {
+                checkState(tableConfig.isDimTable(), "Null time column only allowed for dimension tables");
+            }
+            segmentGeneratorConfig.setSequenceId(sequenceId);
+            SegmentCreationDataSource dataSource = new RecordReaderSegmentCreationDataSource(recordReader);
+            RecordTransformer recordTransformer = genericRow -> {
+                GenericRow record = null;
+                try {
+                    record = CompositeTransformer.getDefaultTransformer(tableConfig, pinotSchema).transform(genericRow);
+                }
+                catch (Exception e) {
+                    // ignored
+                    record = null;
+                }
+                return record;
+            };
+            SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
+            driver.init(segmentGeneratorConfig, dataSource, recordTransformer, null);
+            driver.build();
+            File segmentOutputDirectory = driver.getOutputDirectory();
+            File tgzPath = new File(String.join(File.separator, outputDirectory, segmentOutputDirectory.getName() + ".tar.gz"));
+            TarGzCompressionUtils.createTarGzFile(segmentOutputDirectory, tgzPath);
+            return Paths.get(tgzPath.getAbsolutePath());
+        }
+        catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static Map<String, String> schemaRegistryAwareProducer(TestingKafka testingKafka)
+    {
+        return ImmutableMap.<String, String>builder()
+                .put(SCHEMA_REGISTRY_URL_CONFIG, testingKafka.getSchemaRegistryConnectString())
+                .put(KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName())
+                .put(VALUE_SERIALIZER_CLASS_CONFIG, KafkaAvroSerializer.class.getName())
+                .buildOrThrow();
+    }
+
+    private static GenericRecord createTestRecord(
+            List<String> stringArrayColumn,
+            Boolean booleanColumn,
+            List<Integer> intArrayColumn,
+            List<Float> floatArrayColumn,
+            List<Double> doubleArrayColumn,
+            List<Long> longArrayColumn,
+            long timestampColumn,
+            long updatedAtMillis)
+    {
+        Schema schema = getAllTypesAvroSchema();
+
+        return new GenericRecordBuilder(schema)
+                .set("string_col", stringArrayColumn.get(0))
+                .set("bool_col", booleanColumn)
+                .set("bytes_col", HexFormat.of().formatHex(stringArrayColumn.get(0).getBytes(StandardCharsets.UTF_8)))
+                .set("string_array_col", stringArrayColumn)
+                .set("int_array_col", intArrayColumn)
+                .set("int_array_col_with_pinot_default", intArrayColumn)
+                .set("float_array_col", floatArrayColumn)
+                .set("double_array_col", doubleArrayColumn)
+                .set("long_array_col", longArrayColumn)
+                .set("timestamp_col", timestampColumn)
+                .set("int_col", intArrayColumn.get(0))
+                .set("float_col", floatArrayColumn.get(0))
+                .set("double_col", doubleArrayColumn.get(0))
+                .set("long_col", longArrayColumn.get(0))
+                .set("updated_at", updatedAtMillis)
+                .set("ts", updatedAtMillis)
+                .build();
+    }
+
+    private static GenericRecord createNullRecord()
+    {
+        Schema schema = getAllTypesAvroSchema();
+        // Pinot does not transform the time column value to default null value
+        return new GenericRecordBuilder(schema)
+                .set("updated_at", initialUpdatedAt.toEpochMilli())
+                .build();
+    }
+
+    private static GenericRecord createArrayNullRecord()
+    {
+        Schema schema = getAllTypesAvroSchema();
+        List<String> stringList = Arrays.asList("string_0", null, "string_2", null, "string_4");
+        List<Integer> integerList = new ArrayList<>();
+        integerList.addAll(Arrays.asList(null, null, null, null, null));
+        List<Integer> integerWithDefaultList = Arrays.asList(-1112, null, 753, null, -9238);
+        List<Float> floatList = new ArrayList<>();
+        floatList.add(null);
+        List<Integer> doubleList = new ArrayList<>();
+        doubleList.add(null);
+
+        return new GenericRecordBuilder(schema)
+                .set("string_col", "array_null")
+                .set("string_array_col", stringList)
+                .set("int_array_col", integerList)
+                .set("int_array_col_with_pinot_default", integerWithDefaultList)
+                .set("float_array_col", floatList)
+                .set("double_array_col", doubleList)
+                .set("long_array_col", new ArrayList<>())
+                .set("updated_at", initialUpdatedAt.toEpochMilli())
+                .build();
+    }
+
+    private static Schema getAllTypesAvroSchema()
+    {
+        // Note:
+        // The reason optional() is used is because the avro record can omit those fields.
+        // Fields with nullable type are required to be included or have a default value.
+        //
+        // For example:
+        // If "string_col" is set to type().nullable().stringType().noDefault()
+        // the following error is returned: Field string_col type:UNION pos:0 not set and has no default value
+
+        return SchemaBuilder.record("alltypes")
+                .fields()
+                .name("string_col").type().optional().stringType()
+                .name("bool_col").type().optional().booleanType()
+                .name("bytes_col").type().optional().stringType()
+                .name("string_array_col").type().optional().array().items().nullable().stringType()
+                .name("int_array_col").type().optional().array().items().nullable().intType()
+                .name("int_array_col_with_pinot_default").type().optional().array().items().nullable().intType()
+                .name("float_array_col").type().optional().array().items().nullable().floatType()
+                .name("double_array_col").type().optional().array().items().nullable().doubleType()
+                .name("long_array_col").type().optional().array().items().nullable().longType()
+                .name("timestamp_col").type().optional().longType()
+                .name("int_col").type().optional().intType()
+                .name("float_col").type().optional().floatType()
+                .name("double_col").type().optional().doubleType()
+                .name("long_col").type().optional().longType()
+                .name("updated_at").type().optional().longType()
+                .name("ts").type().optional().longType()
+                .endRecord();
+    }
+
+    private static class TestingJsonRecord
+    {
+        private final String vendor;
+        private final String city;
+        private final List<String> neighbors;
+        private final List<Integer> luckyNumbers;
+        private final List<Float> prices;
+        private final List<Double> unluckyNumbers;
+        private final List<Long> longNumbers;
+        private final Integer luckyNumber;
+        private final Float price;
+        private final Double unluckyNumber;
+        private final Long longNumber;
+        private final long updatedAt;
+
+        @JsonCreator
+        public TestingJsonRecord(
+                @JsonProperty("vendor") String vendor,
+                @JsonProperty("city") String city,
+                @JsonProperty("neighbors") List<String> neighbors,
+                @JsonProperty("lucky_numbers") List<Integer> luckyNumbers,
+                @JsonProperty("prices") List<Float> prices,
+                @JsonProperty("unlucky_numbers") List<Double> unluckyNumbers,
+                @JsonProperty("long_numbers") List<Long> longNumbers,
+                @JsonProperty("lucky_number") Integer luckyNumber,
+                @JsonProperty("price") Float price,
+                @JsonProperty("unlucky_number") Double unluckyNumber,
+                @JsonProperty("long_number") Long longNumber,
+                @JsonProperty("updatedAt") long updatedAt)
+        {
+            this.vendor = requireNonNull(vendor, "vendor is null");
+            this.city = requireNonNull(city, "city is null");
+            this.neighbors = requireNonNull(neighbors, "neighbors is null");
+            this.luckyNumbers = requireNonNull(luckyNumbers, "luckyNumbers is null");
+            this.prices = requireNonNull(prices, "prices is null");
+            this.unluckyNumbers = requireNonNull(unluckyNumbers, "unluckyNumbers is null");
+            this.longNumbers = requireNonNull(longNumbers, "longNumbers is null");
+            this.price = requireNonNull(price, "price is null");
+            this.luckyNumber = requireNonNull(luckyNumber, "luckyNumber is null");
+            this.unluckyNumber = requireNonNull(unluckyNumber, "unluckyNumber is null");
+            this.longNumber = requireNonNull(longNumber, "longNumber is null");
+            this.updatedAt = updatedAt;
+        }
+
+        @JsonProperty
+        public String getVendor()
+        {
+            return vendor;
+        }
+
+        @JsonProperty
+        public String getCity()
+        {
+            return city;
+        }
+
+        @JsonProperty
+        public List<String> getNeighbors()
+        {
+            return neighbors;
+        }
+
+        @JsonProperty("lucky_numbers")
+        public List<Integer> getLuckyNumbers()
+        {
+            return luckyNumbers;
+        }
+
+        @JsonProperty
+        public List<Float> getPrices()
+        {
+            return prices;
+        }
+
+        @JsonProperty("unlucky_numbers")
+        public List<Double> getUnluckyNumbers()
+        {
+            return unluckyNumbers;
+        }
+
+        @JsonProperty("long_numbers")
+        public List<Long> getLongNumbers()
+        {
+            return longNumbers;
+        }
+
+        @JsonProperty("lucky_number")
+        public Integer getLuckyNumber()
+        {
+            return luckyNumber;
+        }
+
+        @JsonProperty
+        public Float getPrice()
+        {
+            return price;
+        }
+
+        @JsonProperty("unlucky_number")
+        public Double getUnluckyNumber()
+        {
+            return unluckyNumber;
+        }
+
+        @JsonProperty("long_number")
+        public Long getLongNumber()
+        {
+            return longNumber;
+        }
+
+        @JsonProperty
+        public long getUpdatedAt()
+        {
+            return updatedAt;
+        }
+
+        public static Object of(
+                String vendor,
+                String city,
+                List<String> neighbors,
+                List<Integer> luckyNumbers,
+                List<Float> prices,
+                List<Double> unluckyNumbers,
+                List<Long> longNumbers,
+                long offset)
+        {
+            return new TestingJsonRecord(vendor, city, neighbors, luckyNumbers, prices, unluckyNumbers, longNumbers, luckyNumbers.get(0), prices.get(0), unluckyNumbers.get(0), longNumbers.get(0), Instant.now().plusMillis(offset).getEpochSecond());
+        }
+    }
+
+    @Test
+    @Override
+    public void testShowCreateTable()
+    {
+        assertThat((String) computeScalar("SHOW CREATE TABLE region"))
+                .isEqualTo(
+                        "CREATE TABLE %s.%s.region (\n" +
+                                "   regionkey bigint,\n" +
+                                "   updated_at_seconds bigint,\n" +
+                                "   name varchar,\n" +
+                                "   comment varchar\n" +
+                                ")",
+                        getSession().getCatalog().orElseThrow(),
+                        getSession().getSchema().orElseThrow());
+    }
+
+    @Test
+    @Override
+    public void testSelectInformationSchemaColumns()
+    {
+        // Override because there's updated_at_seconds column
+        assertThat(query("SELECT column_name FROM information_schema.columns WHERE table_schema = 'default' AND table_name = 'region'"))
+                .skippingTypesCheck()
+                .matches("VALUES 'regionkey', 'name', 'comment', 'updated_at_seconds'");
+    }
+
+    @Test
+    @Override
+    public void testTopN()
+    {
+        // TODO https://github.com/trinodb/trino/issues/14045 Fix ORDER BY ... LIMIT query
+        assertQueryFails("SELECT regionkey FROM nation ORDER BY name LIMIT 3",
+                format("Segment query returned '%2$s' rows per split, maximum allowed is '%1$s' rows. with query \"SELECT \"regionkey\", \"name\" FROM nation_REALTIME  LIMIT 12\"", MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES, MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 1));
+    }
+
+    @Test
+    @Override
+    public void testJoin()
+    {
+        // TODO https://github.com/trinodb/trino/issues/14046 Fix JOIN query
+        assertQueryFails("SELECT n.name, r.name FROM nation n JOIN region r on n.regionkey = r.regionkey",
+                format("Segment query returned '%2$s' rows per split, maximum allowed is '%1$s' rows. with query \"SELECT \"regionkey\", \"name\" FROM nation_REALTIME  LIMIT 12\"", MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES, MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 1));
+    }
+
+    @Test
+    public void testRealType()
+    {
+        MaterializedResult result = computeActual("SELECT price FROM " + JSON_TABLE + " WHERE vendor = 'vendor1'");
+        assertEquals(getOnlyElement(result.getTypes()), REAL);
+        assertEquals(result.getOnlyValue(), 3.5F);
+    }
+
+    @Test
+    public void testIntegerType()
+    {
+        assertThat(query("SELECT lucky_number FROM " + JSON_TABLE + " WHERE vendor = 'vendor1'"))
+                .matches("VALUES (INTEGER '5')")
+                .isFullyPushedDown();
+    }
+
+    @Test
+    public void testBrokerColumnMappingForSelectQueries()
+    {
+        String expected = "VALUES" +
+                "  ('3.5', 'vendor1')," +
+                "  ('4.5', 'vendor2')," +
+                "  ('5.5', 'vendor3')," +
+                "  ('6.5', 'vendor4')," +
+                "  ('7.5', 'vendor5')," +
+                "  ('8.5', 'vendor6')";
+        assertQuery("SELECT price, vendor FROM \"SELECT price, vendor FROM " + JSON_TABLE + " WHERE vendor != 'vendor7'\"", expected);
+        assertQuery("SELECT price, vendor FROM \"SELECT * FROM " + JSON_TABLE + " WHERE vendor != 'vendor7'\"", expected);
+        assertQuery("SELECT price, vendor FROM \"SELECT vendor, lucky_numbers, price FROM " + JSON_TABLE + " WHERE vendor != 'vendor7'\"", expected);
+    }
+
+    @Test
+    public void testBrokerColumnMappingsForQueriesWithAggregates()
+    {
+        String passthroughQuery = "\"SELECT city, COUNT(*), MAX(price), SUM(lucky_number) " +
+                "  FROM " + JSON_TABLE +
+                "  WHERE vendor != 'vendor7'" +
+                "  GROUP BY city\"";
+        assertQuery("SELECT * FROM " + passthroughQuery, "VALUES" +
+                "  ('New York', 2, 6.5, 14)," +
+                "  ('Los Angeles', 4, 8.5, 31)");
+        assertQuery("SELECT \"max(price)\", city, \"sum(lucky_number)\", \"count(*)\" FROM " + passthroughQuery, "VALUES" +
+                "  (6.5, 'New York', 14, 2)," +
+                "  (8.5, 'Los Angeles', 31, 4)");
+        assertQuery("SELECT \"max(price)\", city, \"count(*)\" FROM " + passthroughQuery, "VALUES" +
+                "  (6.5, 'New York', 2)," +
+                "  (8.5, 'Los Angeles', 4)");
+    }
+
+    @Test
+    public void testBrokerColumnMappingsForArrays()
+    {
+        assertQuery("SELECT ARRAY_MIN(unlucky_numbers), ARRAY_MAX(long_numbers), ELEMENT_AT(neighbors, 2), ARRAY_MIN(lucky_numbers), ARRAY_MAX(prices)" +
+                        "  FROM \"SELECT unlucky_numbers, long_numbers, neighbors, lucky_numbers, prices" +
+                        "  FROM " + JSON_TABLE +
+                        "  WHERE vendor = 'vendor1'\"",
+                "VALUES (-3.7, 20000000, 'bar1', 5, 5.5)");
+        assertQuery("SELECT CARDINALITY(unlucky_numbers), CARDINALITY(long_numbers), CARDINALITY(neighbors), CARDINALITY(lucky_numbers), CARDINALITY(prices)" +
+                        "  FROM \"SELECT unlucky_numbers, long_numbers, neighbors, lucky_numbers, prices" +
+                        "  FROM " + JSON_TABLE +
+                        "  WHERE vendor = 'vendor1'\"",
+                "VALUES (3, 3, 3, 3, 2)");
+    }
+
+    @Test
+    public void testCountStarQueries()
+    {
+        assertQuery("SELECT COUNT(*) FROM \"SELECT * FROM " + JSON_TABLE + " WHERE vendor != 'vendor7'\"", "VALUES(6)");
+        assertQuery("SELECT COUNT(*) FROM " + JSON_TABLE + " WHERE vendor != 'vendor7'", "VALUES(6)");
+        assertQuery("SELECT \"count(*)\" FROM \"SELECT COUNT(*) FROM " + JSON_TABLE + " WHERE vendor != 'vendor7'\"", "VALUES(6)");
+    }
+
+    @Test
+    public void testBrokerQueriesWithAvg()
+    {
+        assertQuery("SELECT city, \"avg(lucky_number)\", \"avg(price)\", \"avg(long_number)\"" +
+                "  FROM \"SELECT city, AVG(price), AVG(lucky_number), AVG(long_number) FROM " + JSON_TABLE + " WHERE vendor != 'vendor7' GROUP BY city\"", "VALUES" +
+                "  ('New York', 7.0, 5.5, 10000.0)," +
+                "  ('Los Angeles', 7.75, 6.25, 10000.0)");
+        MaterializedResult result = computeActual("SELECT \"avg(lucky_number)\"" +
+                "  FROM \"SELECT AVG(lucky_number) FROM my_table WHERE vendor in ('vendor2', 'vendor4')\"");
+        assertEquals(getOnlyElement(result.getTypes()), DOUBLE);
+        assertEquals(result.getOnlyValue(), 7.0);
+    }
+
+    @Test
+    public void testNonLowerCaseColumnNames()
+    {
+        long rowCount = (long) computeScalar("SELECT COUNT(*) FROM " + MIXED_CASE_COLUMN_NAMES_TABLE);
+        List<String> rows = new ArrayList<>();
+        for (int i = 0; i < rowCount; i++) {
+            rows.add(format("('string_%s', '%s', '%s')", i, i, initialUpdatedAt.plusMillis(i * 1000L).getEpochSecond()));
+        }
+        String mixedCaseColumnNamesTableValues = rows.stream().collect(joining(",", "VALUES ", ""));
+
+        // Test segment query all rows
+        assertQuery("SELECT stringcol, longcol, updatedatseconds" +
+                        "  FROM " + MIXED_CASE_COLUMN_NAMES_TABLE,
+                mixedCaseColumnNamesTableValues);
+
+        // Test broker query all rows
+        assertQuery("SELECT stringcol, longcol, updatedatseconds" +
+                        "  FROM  \"SELECT updatedatseconds, longcol, stringcol FROM " + MIXED_CASE_COLUMN_NAMES_TABLE + "\"",
+                mixedCaseColumnNamesTableValues);
+
+        String singleRowValues = "VALUES (VARCHAR 'string_3', BIGINT '3', BIGINT '" + initialUpdatedAt.plusMillis(3 * 1000).getEpochSecond() + "')";
+
+        // Test segment query single row
+        assertThat(query("SELECT stringcol, longcol, updatedatseconds" +
+                        "  FROM " + MIXED_CASE_COLUMN_NAMES_TABLE +
+                        "  WHERE longcol = 3"))
+                .matches(singleRowValues)
+                .isFullyPushedDown();
+
+        // Test broker query single row
+        assertThat(query("SELECT stringcol, longcol, updatedatseconds" +
+                        "  FROM  \"SELECT updatedatseconds, longcol, stringcol FROM " + MIXED_CASE_COLUMN_NAMES_TABLE +
+                        "\" WHERE longcol = 3"))
+                .matches(singleRowValues)
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT AVG(longcol), MIN(longcol), MAX(longcol), APPROX_DISTINCT(longcol), SUM(longcol)" +
+                "  FROM " + MIXED_CASE_COLUMN_NAMES_TABLE))
+                .matches("VALUES (DOUBLE '1.5', BIGINT '0', BIGINT '3', BIGINT '4', BIGINT '6')")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT stringcol, AVG(longcol), MIN(longcol), MAX(longcol), APPROX_DISTINCT(longcol), SUM(longcol)" +
+                "  FROM " + MIXED_CASE_COLUMN_NAMES_TABLE +
+                "  GROUP BY stringcol"))
+                .matches("VALUES (VARCHAR 'string_0', DOUBLE '0.0', BIGINT '0', BIGINT '0', BIGINT '1', BIGINT '0')," +
+                        "  (VARCHAR 'string_1', DOUBLE '1.0', BIGINT '1', BIGINT '1', BIGINT '1', BIGINT '1')," +
+                        "  (VARCHAR 'string_2', DOUBLE '2.0', BIGINT '2', BIGINT '2', BIGINT '1', BIGINT '2')," +
+                        "  (VARCHAR 'string_3', DOUBLE '3.0', BIGINT '3', BIGINT '3', BIGINT '1', BIGINT '3')")
+                .isFullyPushedDown();
+    }
+
+    @Test
+    public void testNonLowerTable()
+    {
+        long rowCount = (long) computeScalar("SELECT COUNT(*) FROM " + MIXED_CASE_TABLE_NAME);
+        List<String> rows = new ArrayList<>();
+        for (int i = 0; i < rowCount; i++) {
+            rows.add(format("('string_%s', '%s', '%s')", i, i, initialUpdatedAt.plusMillis(i * 1000L).getEpochSecond()));
+        }
+
+        String mixedCaseColumnNamesTableValues = rows.stream().collect(joining(",", "VALUES ", ""));
+
+        // Test segment query all rows
+        assertQuery("SELECT stringcol, longcol, updatedatseconds" +
+                        "  FROM " + MIXED_CASE_TABLE_NAME,
+                mixedCaseColumnNamesTableValues);
+
+        // Test broker query all rows
+        assertQuery("SELECT stringcol, longcol, updatedatseconds" +
+                        "  FROM  \"SELECT updatedatseconds, longcol, stringcol FROM " + MIXED_CASE_TABLE_NAME + "\"",
+                mixedCaseColumnNamesTableValues);
+
+        String singleRowValues = "VALUES (VARCHAR 'string_3', BIGINT '3', BIGINT '" + initialUpdatedAt.plusMillis(3 * 1000).getEpochSecond() + "')";
+
+        // Test segment query single row
+        assertThat(query("SELECT stringcol, longcol, updatedatseconds" +
+                "  FROM " + MIXED_CASE_TABLE_NAME +
+                "  WHERE longcol = 3"))
+                .matches(singleRowValues)
+                .isFullyPushedDown();
+
+        // Test broker query single row
+        assertThat(query("SELECT stringcol, longcol, updatedatseconds" +
+                "  FROM  \"SELECT updatedatseconds, longcol, stringcol FROM " + MIXED_CASE_TABLE_NAME +
+                "\" WHERE longcol = 3"))
+                .matches(singleRowValues)
+                .isFullyPushedDown();
+
+        // Test information schema
+        assertQuery(
+                "SELECT column_name FROM information_schema.columns WHERE table_schema = 'default' AND table_name = 'mixedcase'",
+                "VALUES 'stringcol', 'updatedatseconds', 'longcol'");
+        assertQuery(
+                "SELECT column_name FROM information_schema.columns WHERE table_name = 'mixedcase'",
+                "VALUES 'stringcol', 'updatedatseconds', 'longcol'");
+        assertEquals(
+                computeActual("SHOW COLUMNS FROM default.mixedcase").getMaterializedRows().stream()
+                        .map(row -> row.getField(0))
+                        .collect(toImmutableSet()),
+                ImmutableSet.of("stringcol", "updatedatseconds", "longcol"));
+    }
+
+    @Test
+    public void testAmbiguousTables()
+    {
+        assertQueryFails("SELECT * FROM " + DUPLICATE_TABLE_LOWERCASE, "Ambiguous table names: (" + DUPLICATE_TABLE_LOWERCASE + ", " + DUPLICATE_TABLE_MIXED_CASE + "|" + DUPLICATE_TABLE_MIXED_CASE + ", " + DUPLICATE_TABLE_LOWERCASE + ")");
+        assertQueryFails("SELECT * FROM " + DUPLICATE_TABLE_MIXED_CASE, "Ambiguous table names: (" + DUPLICATE_TABLE_LOWERCASE + ", " + DUPLICATE_TABLE_MIXED_CASE + "|" + DUPLICATE_TABLE_MIXED_CASE + ", " + DUPLICATE_TABLE_LOWERCASE + ")");
+        assertQueryFails("SELECT * FROM \"SELECT * FROM " + DUPLICATE_TABLE_LOWERCASE + "\"", "Ambiguous table names: (" + DUPLICATE_TABLE_LOWERCASE + ", " + DUPLICATE_TABLE_MIXED_CASE + "|" + DUPLICATE_TABLE_MIXED_CASE + ", " + DUPLICATE_TABLE_LOWERCASE + ")");
+        assertQueryFails("SELECT * FROM \"SELECT * FROM " + DUPLICATE_TABLE_MIXED_CASE + "\"", "Ambiguous table names: (" + DUPLICATE_TABLE_LOWERCASE + ", " + DUPLICATE_TABLE_MIXED_CASE + "|" + DUPLICATE_TABLE_MIXED_CASE + ", " + DUPLICATE_TABLE_LOWERCASE + ")");
+        assertQueryFails("SELECT * FROM information_schema.columns", "Error listing table columns for catalog pinot: Ambiguous table names: (" + DUPLICATE_TABLE_LOWERCASE + ", " + DUPLICATE_TABLE_MIXED_CASE + "|" + DUPLICATE_TABLE_MIXED_CASE + ", " + DUPLICATE_TABLE_LOWERCASE + ")");
+    }
+
+    @Test
+    public void testReservedKeywordColumnNames()
+    {
+        assertQuery("SELECT date FROM " + RESERVED_KEYWORD_TABLE + " WHERE date = '2021-09-30'", "VALUES '2021-09-30'");
+        assertQuery("SELECT date FROM " + RESERVED_KEYWORD_TABLE + " WHERE date IN ('2021-09-30', '2021-10-01')", "VALUES '2021-09-30', '2021-10-01'");
+
+        assertThat(query("SELECT date FROM  \"SELECT \"\"date\"\" FROM " + RESERVED_KEYWORD_TABLE + "\""))
+                .matches("VALUES VARCHAR '2021-09-30', VARCHAR '2021-10-01'")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT date FROM  \"SELECT \"\"date\"\" FROM " + RESERVED_KEYWORD_TABLE + " WHERE \"\"date\"\" = '2021-09-30'\""))
+                .matches("VALUES VARCHAR '2021-09-30'")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT date FROM  \"SELECT \"\"date\"\" FROM " + RESERVED_KEYWORD_TABLE + " WHERE \"\"date\"\" IN ('2021-09-30', '2021-10-01')\""))
+                .matches("VALUES VARCHAR '2021-09-30', VARCHAR '2021-10-01'")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT date FROM  \"SELECT \"\"date\"\" FROM " + RESERVED_KEYWORD_TABLE + " ORDER BY \"\"date\"\"\""))
+                .matches("VALUES VARCHAR '2021-09-30', VARCHAR '2021-10-01'")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT date, \"count(*)\" FROM  \"SELECT \"\"date\"\", COUNT(*) FROM " + RESERVED_KEYWORD_TABLE + " GROUP BY \"\"date\"\"\""))
+                .matches("VALUES (VARCHAR '2021-09-30', BIGINT '1'), (VARCHAR '2021-10-01', BIGINT '1')")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT \"count(*)\" FROM  \"SELECT COUNT(*) FROM " + RESERVED_KEYWORD_TABLE + " ORDER BY COUNT(*)\""))
+                .matches("VALUES BIGINT '2'")
+                .isFullyPushedDown();
+
+        assertQuery("SELECT \"as\" FROM " + RESERVED_KEYWORD_TABLE + " WHERE \"as\" = 'foo'", "VALUES 'foo'");
+        assertQuery("SELECT \"as\" FROM " + RESERVED_KEYWORD_TABLE + " WHERE \"as\" IN ('foo', 'bar')", "VALUES 'foo', 'bar'");
+
+        assertThat(query("SELECT \"as\" FROM  \"SELECT \"\"as\"\" FROM " + RESERVED_KEYWORD_TABLE + "\""))
+                .matches("VALUES VARCHAR 'foo', VARCHAR 'bar'")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT \"as\" FROM  \"SELECT \"\"as\"\" FROM " + RESERVED_KEYWORD_TABLE + " WHERE \"\"as\"\" = 'foo'\""))
+                .matches("VALUES VARCHAR 'foo'")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT \"as\" FROM  \"SELECT \"\"as\"\" FROM " + RESERVED_KEYWORD_TABLE + " WHERE \"\"as\"\" IN ('foo', 'bar')\""))
+                .matches("VALUES VARCHAR 'foo', VARCHAR 'bar'")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT \"as\" FROM  \"SELECT \"\"as\"\" FROM " + RESERVED_KEYWORD_TABLE + " ORDER BY \"\"as\"\"\""))
+                .matches("VALUES VARCHAR 'foo', VARCHAR 'bar'")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT \"as\", \"count(*)\" FROM  \"SELECT \"\"as\"\", COUNT(*) FROM " + RESERVED_KEYWORD_TABLE + " GROUP BY \"\"as\"\"\""))
+                .matches("VALUES (VARCHAR 'foo', BIGINT '1'), (VARCHAR 'bar', BIGINT '1')")
+                .isFullyPushedDown();
+    }
+
+    @Test
+    public void testLimitForSegmentQueries()
+    {
+        // The connector will not allow segment queries to return more than MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES.
+        // This is not a pinot error, it is enforced by the connector to avoid stressing pinot servers.
+        assertQueryFails("SELECT string_col, updated_at_seconds FROM " + TOO_MANY_ROWS_TABLE,
+                format("Segment query returned '%2$s' rows per split, maximum allowed is '%1$s' rows. with query \"SELECT \"string_col\", \"updated_at_seconds\" FROM too_many_rows_REALTIME  LIMIT %2$s\"", MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES, MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 1));
+
+        // Verify the row count is greater than the max rows per segment limit
+        assertQuery("SELECT \"count(*)\" FROM \"SELECT COUNT(*) FROM " + TOO_MANY_ROWS_TABLE + "\"", format("VALUES(%s)", MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 1));
+    }
+
+    @Test
+    public void testBrokerQueryWithTooManyRowsForSegmentQuery()
+    {
+        // Note:
+        // This data does not include the null row inserted in createQueryRunner().
+        // This verifies that if the time column has a null value, pinot does not
+        // ingest the row from kafka.
+        List<String> tooManyRowsTableValues = new ArrayList<>();
+        for (int i = 0; i < MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 1; i++) {
+            tooManyRowsTableValues.add(format("('string_%s', '%s')", i, initialUpdatedAt.plusMillis(i * 1000L).getEpochSecond()));
+        }
+
+        // Explicit limit is necessary otherwise pinot returns 10 rows.
+        // The limit is greater than the result size returned.
+        assertQuery("SELECT string_col, updated_at_seconds" +
+                        "  FROM  \"SELECT updated_at_seconds, string_col FROM " + TOO_MANY_ROWS_TABLE +
+                        "  LIMIT " + (MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 2) + "\"",
+                tooManyRowsTableValues.stream().collect(joining(",", "VALUES ", "")));
+    }
+
+    @Test
+    public void testMaxLimitForPassthroughQueries()
+    {
+        assertQueryFails("SELECT string_col, updated_at_seconds" +
+                        "  FROM  \"SELECT updated_at_seconds, string_col FROM " + TOO_MANY_BROKER_ROWS_TABLE +
+                        "  LIMIT " + (MAX_ROWS_PER_SPLIT_FOR_BROKER_QUERIES + 1) + "\"",
+                "Broker query returned '13' rows, maximum allowed is '12' rows. with query \"SELECT \"updated_at_seconds\", \"string_col\" FROM too_many_broker_rows LIMIT 13\"");
+
+        // Pinot issue preventing Integer.MAX_VALUE from being a limit: https://github.com/apache/incubator-pinot/issues/7110
+        // This is now resolved in pinot 0.8.0
+        assertQuerySucceeds("SELECT * FROM \"SELECT string_col, long_col FROM " + ALL_TYPES_TABLE + " LIMIT " + Integer.MAX_VALUE + "\"");
+
+        // Pinot broker requests do not handle limits greater than Integer.MAX_VALUE
+        // Note that -2147483648 is due to an integer overflow in Pinot: https://github.com/apache/pinot/issues/7242
+        assertQueryFails("SELECT * FROM \"SELECT string_col, long_col FROM " + ALL_TYPES_TABLE + " LIMIT " + ((long) Integer.MAX_VALUE + 1) + "\"",
+                "(?s)Query SELECT \"string_col\", \"long_col\" FROM alltypes LIMIT -2147483648 encountered exception .* with query \"SELECT \"string_col\", \"long_col\" FROM alltypes LIMIT -2147483648\"");
+
+        List<String> tooManyBrokerRowsTableValues = new ArrayList<>();
+        for (int i = 0; i < MAX_ROWS_PER_SPLIT_FOR_BROKER_QUERIES; i++) {
+            tooManyBrokerRowsTableValues.add(format("('string_%s', '%s')", i, initialUpdatedAt.plusMillis(i * 1000L).getEpochSecond()));
+        }
+
+        // Explicit limit is necessary otherwise pinot returns 10 rows.
+        assertQuery("SELECT string_col, updated_at_seconds" +
+                        "  FROM  \"SELECT updated_at_seconds, string_col FROM " + TOO_MANY_BROKER_ROWS_TABLE +
+                        "  WHERE string_col != 'string_12'" +
+                        "  LIMIT " + MAX_ROWS_PER_SPLIT_FOR_BROKER_QUERIES + "\"",
+                tooManyBrokerRowsTableValues.stream().collect(joining(",", "VALUES ", "")));
+    }
+
+    @Test
+    public void testCount()
+    {
+        assertQuery("SELECT \"count(*)\" FROM \"SELECT COUNT(*) FROM " + ALL_TYPES_TABLE + "\"", "VALUES " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES);
+        // If no limit is supplied to a broker query, 10 arbitrary rows will be returned. Verify this behavior:
+        MaterializedResult result = computeActual("SELECT * FROM \"SELECT bool_col FROM " + ALL_TYPES_TABLE + "\"");
+        assertEquals(result.getRowCount(), DEFAULT_PINOT_LIMIT_FOR_BROKER_QUERIES);
+    }
+
+    @Test
+    public void testNullBehavior()
+    {
+        // Verify the null behavior of pinot:
+
+        // Default null value for timestamp single value columns is 0
+        assertThat(query("SELECT timestamp_col" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col = 'null'"))
+                .matches("VALUES(TIMESTAMP '1970-01-01 00:00:00.000')")
+                .isFullyPushedDown();
+
+        // Default null value for long single value columns is 0
+        assertThat(query("SELECT long_col" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'array_null'"))
+                .matches("VALUES(BIGINT '0')")
+                .isFullyPushedDown();
+
+        // Default null value for long array values is Long.MIN_VALUE,
+        assertThat(query("SELECT element_at(long_array_col, 1)" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'array_null'"))
+                .matches("VALUES(BIGINT '" + Long.MIN_VALUE + "')")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        // Default null value for int single value columns is 0
+        assertThat(query("SELECT int_col" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'null'"))
+                .matches("VALUES(INTEGER '0')")
+                .isFullyPushedDown();
+
+        // Default null value for int array values is Integer.MIN_VALUE,
+        assertThat(query("SELECT element_at(int_array_col, 1)" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'null'"))
+                .matches("VALUES(INTEGER '" + Integer.MIN_VALUE + "')")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        // Verify a null value for an array with all null values is a single element.
+        // The original value inserted from kafka is 5 null elements.
+        assertThat(query("SELECT element_at(int_array_col, 1)" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'array_null'"))
+                .matches("VALUES(INTEGER '" + Integer.MIN_VALUE + "')")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        // Verify default null value for array matches expected result
+        assertThat(query("SELECT element_at(int_array_col_with_pinot_default, 1)" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'null'"))
+                .matches("VALUES(INTEGER '7')")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        // Verify an array with null and non-null values omits the null values
+        assertThat(query("SELECT int_array_col_with_pinot_default" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'array_null'"))
+                .matches("VALUES(CAST(ARRAY[-1112, 753, -9238] AS ARRAY(INTEGER)))")
+                .isFullyPushedDown();
+
+        // Default null value for strings is the string 'null'
+        assertThat(query("SELECT string_col" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE bytes_col = X'' AND element_at(string_array_col, 1) = 'null'"))
+                .matches("VALUES (VARCHAR 'null')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // Default array null value for strings is the string 'null'
+        assertThat(query("SELECT element_at(string_array_col, 1)" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE bytes_col = X'' AND string_col = 'null'"))
+                .matches("VALUES (VARCHAR 'null')")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        // Default null value for booleans is the string 'null'
+        // Booleans are treated as a string
+        assertThat(query("SELECT bool_col" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'null'"))
+                .matches("VALUES (false)")
+                .isFullyPushedDown();
+
+        // Default null value for pinot BYTES type (varbinary) is the string 'null'
+        // BYTES values are treated as a strings
+        // BYTES arrays are not supported
+        assertThat(query("SELECT bytes_col" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'null'"))
+                .matches("VALUES (VARBINARY '')")
+                .isFullyPushedDown();
+
+        // Default null value for float single value columns is 0.0F
+        assertThat(query("SELECT float_col" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'array_null'"))
+                .matches("VALUES(REAL '0.0')")
+                .isFullyPushedDown();
+
+        // Default null value for float array values is -INFINITY,
+        assertThat(query("SELECT element_at(float_array_col, 1)" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'array_null'"))
+                .matches("VALUES(CAST(-POWER(0, -1) AS REAL))")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        // Default null value for double single value columns is 0.0D
+        assertThat(query("SELECT double_col" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'array_null'"))
+                .matches("VALUES(DOUBLE '0.0')")
+                .isFullyPushedDown();
+
+        // Default null value for double array values is -INFINITY,
+        assertThat(query("SELECT element_at(double_array_col, 1)" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'array_null'"))
+                .matches("VALUES(-POWER(0, -1))")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        // Null behavior for arrays:
+        // Default value for a "null" array is 1 element with default null array value,
+        // Values are tested above, this test is to verify pinot returns an array with 1 element.
+        assertThat(query("SELECT CARDINALITY(string_array_col)," +
+                        "  CARDINALITY(int_array_col_with_pinot_default)," +
+                        "  CARDINALITY(int_array_col)," +
+                        "  CARDINALITY(float_array_col)," +
+                        "  CARDINALITY(long_array_col)" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'null'"))
+                .matches("VALUES (BIGINT '1', BIGINT '1', BIGINT '1', BIGINT '1', BIGINT '1')")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        // If an array contains both null and non-null values, the null values are omitted:
+        // There are 5 values in the avro records, but only the 3 non-null values are in pinot
+        assertThat(query("SELECT CARDINALITY(string_array_col)," +
+                        "  CARDINALITY(int_array_col_with_pinot_default)," +
+                        "  CARDINALITY(int_array_col)," +
+                        "  CARDINALITY(float_array_col)," +
+                        "  CARDINALITY(long_array_col)" +
+                        "  FROM " + ALL_TYPES_TABLE +
+                        "  WHERE string_col = 'array_null'"))
+                .matches("VALUES (BIGINT '3', BIGINT '3', BIGINT '1', BIGINT '1', BIGINT '1')")
+                .isNotFullyPushedDown(ProjectNode.class);
+
+        // IS NULL and IS NOT NULL is not pushed down in Pinot due to inconsistent results.
+        // see https://docs.pinot.apache.org/developers/advanced/null-value-support
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE string_col IS NULL"""))
+                .matches("VALUES (BIGINT '0')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE string_col IS NOT NULL"""))
+                .matches("VALUES (BIGINT '11')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE string_col = 'string_0' OR string_col IS NULL"""))
+                .matches("VALUES (BIGINT '1')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE string_col = 'string_0'"""))
+                .matches("VALUES (BIGINT '1')")
+                .isFullyPushedDown();
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE string_col != 'string_0' OR string_col IS NULL"""))
+                .matches("VALUES (BIGINT '10')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE string_col != 'string_0'"""))
+                .matches("VALUES (BIGINT '10')")
+                .isFullyPushedDown();
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE string_col NOT IN ('null', 'array_null') OR string_col IS NULL"""))
+                .matches("VALUES (BIGINT '9')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // VARCHAR NOT IN is pushed down
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE string_col NOT IN ('null', 'array_null')"""))
+                .matches("VALUES (BIGINT '9')")
+                .isFullyPushedDown();
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE string_col IN ('null', 'array_null') OR string_col IS NULL"""))
+                .matches("VALUES (BIGINT '2')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // VARCHAR IN is pushed down
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE string_col IN ('null', 'array_null')"""))
+                .matches("VALUES (BIGINT '2')")
+                .isFullyPushedDown();
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE long_col IS NULL"""))
+                .matches("VALUES (BIGINT '0')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE long_col IS NOT NULL"""))
+                .matches("VALUES (BIGINT '11')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE long_col = -3147483645 OR long_col IS NULL"""))
+                .matches("VALUES (BIGINT '1')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE long_col = -3147483645"""))
+                .matches("VALUES (BIGINT '1')")
+                .isFullyPushedDown();
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE long_col != -3147483645 OR long_col IS NULL"""))
+                .matches("VALUES (BIGINT '10')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE long_col != -3147483645"""))
+                .matches("VALUES (BIGINT '10')")
+                .isFullyPushedDown();
+
+        assertThat(query("""
+                SELECT long_col
+                FROM alltypes
+                WHERE long_col NOT IN (-3147483645, -3147483646, -3147483647) OR long_col IS NULL"""))
+                .matches("""
+                        VALUES (BIGINT '-3147483644'),
+                        (BIGINT '-3147483643'),
+                        (BIGINT '-3147483642'),
+                        (BIGINT '-3147483641'),
+                        (BIGINT '-3147483640'),
+                        (BIGINT '-3147483639'),
+                        (BIGINT '0'),
+                        (BIGINT '0')""")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // BIGINT NOT IN is pushed down
+        assertThat(query("""
+                SELECT long_col
+                FROM alltypes
+                WHERE long_col NOT IN (-3147483645, -3147483646, -3147483647)"""))
+                .matches("""
+                        VALUES (BIGINT '-3147483644'),
+                        (BIGINT '-3147483643'),
+                        (BIGINT '-3147483642'),
+                        (BIGINT '-3147483641'),
+                        (BIGINT '-3147483640'),
+                        (BIGINT '-3147483639'),
+                        (BIGINT '0'),
+                        (BIGINT '0')""")
+                .isFullyPushedDown();
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE long_col IN (-3147483645, -3147483646, -3147483647) OR long_col IS NULL"""))
+                .matches("VALUES (BIGINT '3')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // BIGINT IN is pushed down
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE long_col IN (-3147483645, -3147483646, -3147483647)"""))
+                .matches("VALUES (BIGINT '3')")
+                .isFullyPushedDown();
+
+        assertThat(query("""
+                SELECT int_col
+                FROM alltypes
+                WHERE int_col NOT IN (0, 54, 56) OR int_col IS NULL"""))
+                .matches("VALUES (55), (55), (55)")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // INTEGER NOT IN is pushed down
+        assertThat(query("""
+                SELECT int_col
+                FROM alltypes
+                WHERE int_col NOT IN (0, 54, 56)"""))
+                .matches("VALUES (55), (55), (55)")
+                .isFullyPushedDown();
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE int_col IN (0, 54, 56) OR int_col IS NULL"""))
+                .matches("VALUES (BIGINT '8')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // INTEGER IN is pushed down
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE int_col IN (0, 54, 56)"""))
+                .matches("VALUES (BIGINT '8')")
+                .isFullyPushedDown();
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE bool_col OR bool_col IS NULL"""))
+                .matches("VALUES (BIGINT '9')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // BOOLEAN values are pushed down
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE bool_col"""))
+                .matches("VALUES (BIGINT '9')")
+                .isFullyPushedDown();
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE NOT bool_col OR bool_col IS NULL"""))
+                .matches("VALUES (BIGINT '2')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE NOT bool_col"""))
+                .matches("VALUES (BIGINT '2')")
+                .isFullyPushedDown();
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE float_col NOT IN (-2.33, -3.33, -4.33, -5.33, -6.33, -7.33) OR float_col IS NULL"""))
+                .matches("VALUES (BIGINT '5')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // REAL values are not pushed down, applyFilter is not called
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE float_col NOT IN (-2.33, -3.33, -4.33, -5.33, -6.33, -7.33)"""))
+                .matches("VALUES (BIGINT '5')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE double_col NOT IN (0.0, -16.33, -17.33) OR double_col IS NULL"""))
+                .matches("VALUES (BIGINT '7')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // DOUBLE values are not pushed down, applyFilter is not called
+        assertThat(query("""
+                SELECT COUNT(*)
+                FROM alltypes
+                WHERE double_col NOT IN (0.0, -16.33, -17.33)"""))
+                .matches("VALUES (BIGINT '7')")
+                .isNotFullyPushedDown(FilterNode.class);
+    }
+
+    @Test
+    public void testBrokerQueriesWithCaseStatementsInFilter()
+    {
+        // Need to invoke the UPPER function since identifiers are lower case
+        assertQuery("SELECT city, \"avg(lucky_number)\", \"avg(price)\", \"avg(long_number)\"" +
+                "  FROM \"SELECT city, AVG(price), AVG(lucky_number), AVG(long_number) FROM my_table WHERE " +
+                "  CASE WHEN city = CONCAT(CONCAT(UPPER('N'), 'ew ', ''), CONCAT(UPPER('Y'), 'ork', ''), '') THEN city WHEN city = CONCAT(CONCAT(UPPER('L'), 'os ', ''), CONCAT(UPPER('A'), 'ngeles', ''), '') THEN city ELSE 'gotham' END != 'gotham'" +
+                "  AND CASE WHEN vendor = 'vendor1' THEN 'vendor1' WHEN vendor = 'vendor2' THEN 'vendor2' ELSE vendor END != 'vendor7' GROUP BY city\"", "VALUES" +
+                "  ('New York', 7.0, 5.5, 10000.0)," +
+                "  ('Los Angeles', 7.75, 6.25, 10000.0)");
+    }
+
+    @Test
+    public void testFilterWithRealLiteral()
+    {
+        String expectedSingleValue = "VALUES (REAL '3.5', VARCHAR 'vendor1')";
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price = 3.5")).matches(expectedSingleValue).isFullyPushedDown();
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price <= 3.5")).matches(expectedSingleValue).isFullyPushedDown();
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price BETWEEN 3 AND 4")).matches(expectedSingleValue).isFullyPushedDown();
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price > 3 AND price < 4")).matches(expectedSingleValue).isFullyPushedDown();
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price >= 3.5 AND price <= 4")).matches(expectedSingleValue).isFullyPushedDown();
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price < 3.6")).matches(expectedSingleValue).isFullyPushedDown();
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price IN (3.5)")).matches(expectedSingleValue).isFullyPushedDown();
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price IN (3.5, 4)")).matches(expectedSingleValue).isFullyPushedDown();
+        // NOT IN is not pushed down for real type
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price NOT IN (4.5, 5.5, 6.5, 7.5, 8.5, 9.5)")).isNotFullyPushedDown(FilterNode.class);
+
+        String expectedMultipleValues = "VALUES" +
+                "  (REAL '3.5', VARCHAR 'vendor1')," +
+                "  (REAL '4.5', VARCHAR 'vendor2')";
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price < 4.6")).matches(expectedMultipleValues).isFullyPushedDown();
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price BETWEEN 3.5 AND 4.5")).matches(expectedMultipleValues).isFullyPushedDown();
+
+        String expectedMaxValue = "VALUES (REAL '9.5', VARCHAR 'vendor7')";
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price > 9")).matches(expectedMaxValue).isFullyPushedDown();
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price >= 9")).matches(expectedMaxValue).isFullyPushedDown();
+    }
+
+    @Test
+    public void testArrayFilter()
+    {
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE vendor != 'vendor7' AND prices = ARRAY[3.5, 5.5]"))
+                .matches("VALUES (REAL '3.5', VARCHAR 'vendor1')")
+                .isNotFullyPushedDown(FilterNode.class);
+
+        // Array filters are not pushed down, as there are no array literals in pinot
+        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE prices = ARRAY[3.5, 5.5]")).isNotFullyPushedDown(FilterNode.class);
+    }
+
+    @Test
+    public void testLimitPushdown()
+    {
+        assertThat(query("SELECT string_col, long_col FROM " + "\"SELECT string_col, long_col, bool_col FROM " + ALL_TYPES_TABLE + " WHERE int_col > 0\" " +
+                "  WHERE bool_col = false LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
+                .isFullyPushedDown();
+        assertThat(query("SELECT string_col, long_col FROM " + ALL_TYPES_TABLE + "  WHERE int_col >0 AND bool_col = false LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
+                .isNotFullyPushedDown(LimitNode.class);
+    }
+
+    /**
+     * https://github.com/trinodb/trino/issues/8307
+     */
+    @Test
+    public void testInformationSchemaColumnsTableNotExist()
+    {
+        assertThat(query("SELECT * FROM pinot.information_schema.columns WHERE table_name = 'table_not_exist'"))
+                .returnsEmptyResult();
+    }
+
+    @Test
+    public void testAggregationPushdown()
+    {
+        // Without the limit inside the passthrough query, pinot will only return 10 rows
+        assertThat(query("SELECT COUNT(*) FROM \"SELECT * FROM " + ALL_TYPES_TABLE + " LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + "\""))
+                .isFullyPushedDown();
+
+        // Test aggregates with no grouping columns
+        assertThat(query("SELECT COUNT(*)," +
+                "  MIN(int_col), MAX(int_col)," +
+                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
+                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
+                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
+                "  MIN(timestamp_col), MAX(timestamp_col)" +
+                "  FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+
+        // Test aggregates with no grouping columns with a limit
+        assertThat(query("SELECT COUNT(*)," +
+                "  MIN(int_col), MAX(int_col)," +
+                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
+                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
+                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
+                "  MIN(timestamp_col), MAX(timestamp_col)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
+                .isFullyPushedDown();
+
+        // Test aggregates with no grouping columns with a filter
+        assertThat(query("SELECT COUNT(*)," +
+                "  MIN(int_col), MAX(int_col)," +
+                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
+                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
+                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
+                "  MIN(timestamp_col), MAX(timestamp_col)" +
+                "  FROM " + ALL_TYPES_TABLE + " WHERE long_col < 4147483649"))
+                .isFullyPushedDown();
+
+        // Test aggregates with no grouping columns with a filter and limit
+        assertThat(query("SELECT COUNT(*)," +
+                "  MIN(int_col), MAX(int_col)," +
+                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
+                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
+                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
+                "  MIN(timestamp_col), MAX(timestamp_col)" +
+                "  FROM " + ALL_TYPES_TABLE + " WHERE long_col < 4147483649" +
+                "  LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
+                .isFullyPushedDown();
+
+        // Test aggregates with one grouping column
+        assertThat(query("SELECT bool_col, COUNT(*)," +
+                "  MIN(int_col), MAX(int_col)," +
+                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
+                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
+                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
+                "  MIN(timestamp_col), MAX(timestamp_col)" +
+                "  FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isFullyPushedDown();
+
+        // Test aggregates with one grouping column and a limit
+        assertThat(query("SELECT string_col, COUNT(*)," +
+                "  MIN(int_col), MAX(int_col)," +
+                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
+                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
+                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
+                "  MIN(timestamp_col), MAX(timestamp_col)" +
+                "  FROM " + ALL_TYPES_TABLE + " GROUP BY string_col" +
+                "  LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
+                .isFullyPushedDown();
+
+        // Test aggregates with one grouping column and a filter
+        assertThat(query("SELECT bool_col, COUNT(*)," +
+                "  MIN(int_col), MAX(int_col)," +
+                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
+                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
+                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
+                "  MIN(timestamp_col), MAX(timestamp_col)" +
+                "  FROM " + ALL_TYPES_TABLE + " WHERE long_col < 4147483649 GROUP BY bool_col"))
+                .isFullyPushedDown();
+
+        // Test aggregates with one grouping column, a filter and a limit
+        assertThat(query("SELECT string_col, COUNT(*)," +
+                "  MIN(int_col), MAX(int_col)," +
+                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
+                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
+                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
+                "  MIN(timestamp_col), MAX(timestamp_col)" +
+                "  FROM " + ALL_TYPES_TABLE + " WHERE long_col < 4147483649 GROUP BY string_col" +
+                "  LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
+                .isFullyPushedDown();
+
+        // Test single row from pinot where filter results in an empty result set.
+        // A direct pinot query would return 1 row with default values, not null values.
+        assertThat(query("SELECT COUNT(*)," +
+                "  MIN(int_col), MAX(int_col)," +
+                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
+                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
+                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
+                "  MIN(timestamp_col), MAX(timestamp_col)" +
+                "  FROM " + ALL_TYPES_TABLE + " WHERE long_col > 4147483649"))
+                .isFullyPushedDown();
+
+        // Ensure that isNullOnEmptyGroup is handled correctly for passthrough queries as well
+        assertThat(query("SELECT \"count(*)\", \"distinctcounthll(string_col)\", \"distinctcount(string_col)\", \"sum(created_at_seconds)\", \"max(created_at_seconds)\"" +
+                "  FROM \"SELECT count(*), distinctcounthll(string_col), distinctcount(string_col), sum(created_at_seconds), max(created_at_seconds) FROM " + DATE_TIME_FIELDS_TABLE + " WHERE created_at_seconds = 0\""))
+                .matches("VALUES (BIGINT '0', BIGINT '0', INTEGER '0', CAST(NULL AS DOUBLE), CAST(NULL AS DOUBLE))")
+                .isFullyPushedDown();
+
+        // Test passthrough queries with no aggregates
+        assertThat(query("SELECT string_col, COUNT(*)," +
+                "  MIN(int_col), MAX(int_col)," +
+                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
+                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
+                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
+                "  MIN(timestamp_col), MAX(timestamp_col)" +
+                "  FROM \"SELECT * FROM " + ALL_TYPES_TABLE + " WHERE long_col > 4147483649" +
+                "  LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + "\"  GROUP BY string_col"))
+                .isFullyPushedDown();
+
+        // Passthrough queries with aggregates will not push down more aggregations.
+        assertThat(query("SELECT bool_col, \"count(*)\", COUNT(*) FROM \"SELECT bool_col, count(*) FROM " +
+                ALL_TYPES_TABLE + " GROUP BY bool_col\" GROUP BY bool_col, \"count(*)\""))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+
+        assertThat(query("SELECT bool_col, \"max(long_col)\", COUNT(*) FROM \"SELECT bool_col, max(long_col) FROM " +
+                ALL_TYPES_TABLE + " GROUP BY bool_col\" GROUP BY bool_col, \"max(long_col)\""))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+
+        assertThat(query("SELECT int_col, COUNT(*) FROM " + ALL_TYPES_TABLE + " GROUP BY int_col LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
+                .isFullyPushedDown();
+
+        // count(<column>) should not be pushed down, as pinot currently only implements count(*)
+        assertThat(query("SELECT bool_col, COUNT(long_col)" +
+                "  FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+
+        // AVG on INTEGER columns is not pushed down
+        assertThat(query("SELECT string_col, AVG(int_col) FROM " + ALL_TYPES_TABLE + " GROUP BY string_col"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
+
+        // SUM on INTEGER columns is not pushed down
+        assertThat(query("SELECT string_col, SUM(int_col) FROM " + ALL_TYPES_TABLE + " GROUP BY string_col"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
+
+        // MIN on VARCHAR columns is not pushed down
+        assertThat(query("SELECT bool_col, MIN(string_col)" +
+                "  FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+
+        // MAX on VARCHAR columns is not pushed down
+        assertThat(query("SELECT bool_col, MAX(string_col)" +
+                "  FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+
+        // COUNT on VARCHAR columns is not pushed down
+        assertThat(query("SELECT bool_col, COUNT(string_col)" +
+                "  FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+
+        // Distinct on varchar is pushed down
+        assertThat(query("SELECT DISTINCT string_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        // Distinct on bool is pushed down
+        assertThat(query("SELECT DISTINCT bool_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        // Distinct on double is pushed down
+        assertThat(query("SELECT DISTINCT double_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        // Distinct on float is pushed down
+        assertThat(query("SELECT DISTINCT float_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        // Distinct on long is pushed down
+        assertThat(query("SELECT DISTINCT long_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        // Distinct on timestamp is pushed down
+        assertThat(query("SELECT DISTINCT timestamp_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        // Distinct on int is partially pushed down
+        assertThat(query("SELECT DISTINCT int_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+
+        // Distinct on 2 columns for supported types:
+        assertThat(query("SELECT DISTINCT bool_col, string_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        assertThat(query("SELECT DISTINCT bool_col, double_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        assertThat(query("SELECT DISTINCT bool_col, float_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        assertThat(query("SELECT DISTINCT bool_col, long_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        assertThat(query("SELECT DISTINCT bool_col, timestamp_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        assertThat(query("SELECT DISTINCT bool_col, int_col FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+
+        // Test distinct for mixed case values
+        assertThat(query("SELECT DISTINCT string_col FROM " + MIXED_CASE_DISTINCT_TABLE))
+                .isFullyPushedDown();
+
+        // Test count distinct for mixed case values
+        assertThat(query("SELECT COUNT(DISTINCT string_col) FROM " + MIXED_CASE_DISTINCT_TABLE))
+                .isFullyPushedDown();
+
+        // Approx distinct for mixed case values
+        assertThat(query("SELECT approx_distinct(string_col) FROM " + MIXED_CASE_DISTINCT_TABLE))
+                .isFullyPushedDown();
+
+        // Approx distinct on varchar is pushed down
+        assertThat(query("SELECT approx_distinct(string_col) FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        // Approx distinct on bool is pushed down
+        assertThat(query("SELECT approx_distinct(bool_col) FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        // Approx distinct on double is pushed down
+        assertThat(query("SELECT approx_distinct(double_col) FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        // Approx distinct on float is pushed down
+        assertThat(query("SELECT approx_distinct(float_col) FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        // Approx distinct on long is pushed down
+        assertThat(query("SELECT approx_distinct(long_col) FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        // Approx distinct on int is partially pushed down
+        assertThat(query("SELECT approx_distinct(int_col) FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+
+        // Approx distinct on 2 columns for supported types:
+        assertThat(query("SELECT bool_col, approx_distinct(string_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isFullyPushedDown();
+        assertThat(query("SELECT bool_col, approx_distinct(double_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isFullyPushedDown();
+        assertThat(query("SELECT bool_col, approx_distinct(float_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isFullyPushedDown();
+        assertThat(query("SELECT bool_col, approx_distinct(long_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isFullyPushedDown();
+        assertThat(query("SELECT bool_col, approx_distinct(int_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isFullyPushedDown();
+
+        // Distinct count is fully pushed down by default
+        assertThat(query("SELECT bool_col, COUNT(DISTINCT string_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isFullyPushedDown();
+        assertThat(query("SELECT bool_col, COUNT(DISTINCT double_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isFullyPushedDown();
+        assertThat(query("SELECT bool_col, COUNT(DISTINCT float_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isFullyPushedDown();
+        assertThat(query("SELECT bool_col, COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isFullyPushedDown();
+        assertThat(query("SELECT bool_col, COUNT(DISTINCT int_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isFullyPushedDown();
+        // Test queries with no grouping columns
+        assertThat(query("SELECT COUNT(DISTINCT string_col) FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        assertThat(query("SELECT COUNT(DISTINCT bool_col) FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        assertThat(query("SELECT COUNT(DISTINCT double_col) FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        assertThat(query("SELECT COUNT(DISTINCT float_col) FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        assertThat(query("SELECT COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+        assertThat(query("SELECT COUNT(DISTINCT int_col) FROM " + ALL_TYPES_TABLE))
+                .isFullyPushedDown();
+
+        // Aggregation is not pushed down for queries with count distinct and other aggregations
+        assertThat(query("SELECT bool_col, MAX(long_col), COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class);
+        assertThat(query("SELECT bool_col, COUNT(DISTINCT long_col), MAX(long_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class);
+        assertThat(query("SELECT bool_col, COUNT(*), COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class);
+        assertThat(query("SELECT bool_col, COUNT(DISTINCT long_col), COUNT(*) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class);
+        // Test queries with no grouping columns
+        assertThat(query("SELECT MAX(long_col), COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class);
+        assertThat(query("SELECT COUNT(DISTINCT long_col), MAX(long_col) FROM " + ALL_TYPES_TABLE))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class);
+        assertThat(query("SELECT COUNT(*), COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class);
+        assertThat(query("SELECT COUNT(DISTINCT long_col), COUNT(*) FROM " + ALL_TYPES_TABLE))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class);
+
+        Session countDistinctPushdownDisabledSession = Session.builder(getQueryRunner().getDefaultSession())
+                .setCatalogSessionProperty("pinot", "count_distinct_pushdown_enabled", "false")
+                .build();
+
+        // Distinct count is partially pushed down when the distinct_count_pushdown_enabled session property is disabled
+        assertThat(query(countDistinctPushdownDisabledSession, "SELECT bool_col, COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+        // Test query with no grouping columns
+        assertThat(query(countDistinctPushdownDisabledSession, "SELECT COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+
+        // Ensure that count(<column name>) is not pushed down even when a broker query is present
+        // This is also done as the second step of count distinct but should not be pushed down in this case.
+        assertThat(query("SELECT COUNT(long_col) FROM \"SELECT long_col FROM " + ALL_TYPES_TABLE + "\""))
+                .isNotFullyPushedDown(AggregationNode.class);
+
+        // Ensure that count(<column name>) is not pushed down even when a broker query is present and has grouping columns
+        // This is also done as the second step of count distinct but should not be pushed down in this case.
+        assertThat(query("SELECT bool_col, COUNT(long_col) FROM \"SELECT bool_col, long_col FROM " + ALL_TYPES_TABLE + "\" GROUP BY bool_col"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+
+        // Ensure that count(<column name>) is not pushed down even if the query contains a matching grouping column
+        assertThatExceptionOfType(RuntimeException.class)
+                .isThrownBy(() -> query("SELECT COUNT(long_col) FROM \"SELECT long_col FROM " + ALL_TYPES_TABLE + " GROUP BY long_col\""))
+                .withRootCauseInstanceOf(RuntimeException.class)
+                .withMessage("Operation not supported for DISTINCT aggregation function");
+
+        // Ensure that count(<column name>) with grouping columns is not pushed down even if the query contains a matching grouping column
+        assertThatExceptionOfType(RuntimeException.class)
+                .isThrownBy(() -> query("SELECT bool_col, COUNT(long_col) FROM \"SELECT bool_col, long_col FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col, long_col\""))
+                .withRootCauseInstanceOf(RuntimeException.class)
+                .withMessage("Operation not supported for DISTINCT aggregation function");
+
+        // Verify that count(<column name>) is pushed down only when it matches a COUNT(DISTINCT <column name>) query
+        assertThat(query("""
+                SELECT COUNT(bool_col) FROM
+                (SELECT bool_col FROM alltypes GROUP BY bool_col)
+                """))
+                .matches("VALUES (BIGINT '2')")
+                .isFullyPushedDown();
+        assertThat(query("""
+                SELECT bool_col, COUNT(long_col) FROM
+                (SELECT bool_col, long_col FROM alltypes GROUP BY bool_col, long_col)
+                GROUP BY bool_col
+                """))
+                .matches("""
+                    VALUES (FALSE, BIGINT '1'),
+                    (TRUE, BIGINT '9')
+                """)
+                .isFullyPushedDown();
+        // Verify that count(1) is not pushed down when the subquery selects distinct values for a single column
+        assertThat(query("""
+                SELECT COUNT(1) FROM
+                (SELECT bool_col FROM alltypes GROUP BY bool_col)
+                """))
+                .matches("VALUES (BIGINT '2')")
+                .isNotFullyPushedDown(AggregationNode.class);
+        // Verify that count(*) is not pushed down when the subquery selects distinct values for a single column
+        assertThat(query("""
+                SELECT COUNT(*) FROM
+                (SELECT bool_col FROM alltypes GROUP BY bool_col)
+                """))
+                .matches("VALUES (BIGINT '2')")
+                .isNotFullyPushedDown(AggregationNode.class);
+        // Verify that other aggregation types are not pushed down when the subquery selects distinct values for a single column
+        assertThat(query("""
+                SELECT SUM(long_col) FROM
+                (SELECT long_col FROM alltypes GROUP BY long_col)
+                """))
+                .matches("VALUES (BIGINT '-28327352787')")
+                .isNotFullyPushedDown(AggregationNode.class);
+        assertThat(query("""
+                SELECT bool_col, SUM(long_col) FROM
+                (SELECT bool_col, long_col FROM alltypes GROUP BY bool_col, long_col)
+                GROUP BY bool_col
+                """))
+                .matches("VALUES (TRUE, BIGINT '-28327352787'), (FALSE, BIGINT '0')")
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+        assertThat(query("""
+                SELECT AVG(long_col) FROM
+                (SELECT long_col FROM alltypes GROUP BY long_col)
+                """))
+                .matches("VALUES (DOUBLE '-2.8327352787E9')")
+                .isNotFullyPushedDown(AggregationNode.class);
+        assertThat(query("""
+                SELECT bool_col, AVG(long_col) FROM
+                (SELECT bool_col, long_col FROM alltypes GROUP BY bool_col, long_col)
+                GROUP BY bool_col
+                """))
+                .matches("VALUES (TRUE, DOUBLE '-3.147483643E9'), (FALSE, DOUBLE '0.0')")
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+        assertThat(query("""
+                SELECT MIN(long_col) FROM
+                (SELECT long_col FROM alltypes GROUP BY long_col)
+                """))
+                .matches("VALUES (BIGINT '-3147483647')")
+                .isNotFullyPushedDown(AggregationNode.class);
+        assertThat(query("""
+                SELECT bool_col, MIN(long_col) FROM
+                (SELECT bool_col, long_col FROM alltypes GROUP BY bool_col, long_col)
+                GROUP BY bool_col
+                """))
+                .matches("VALUES (TRUE, BIGINT '-3147483647'), (FALSE, BIGINT '0')")
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+        assertThat(query("""
+                SELECT MAX(long_col) FROM
+                (SELECT long_col FROM alltypes GROUP BY long_col)
+                """))
+                .matches("VALUES (BIGINT '0')")
+                .isNotFullyPushedDown(AggregationNode.class);
+        assertThat(query("""
+                SELECT bool_col, MAX(long_col) FROM
+                (SELECT bool_col, long_col FROM alltypes GROUP BY bool_col, long_col)
+                GROUP BY bool_col
+                """))
+                .matches("VALUES (TRUE, BIGINT '-3147483639'), (FALSE, BIGINT '0')")
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+    }
+
+    @Test
+    public void testInClause()
+    {
+        assertThat(query("SELECT string_col, sum(long_col)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col IN ('string_1200','string_2400','string_3600')" +
+                "  GROUP BY string_col"))
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT string_col, sum(long_col)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col NOT IN ('string_1200','string_2400','string_3600')" +
+                "  GROUP BY string_col"))
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT int_col, sum(long_col)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE int_col IN (54, 56)" +
+                "  GROUP BY int_col"))
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT int_col, sum(long_col)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE int_col NOT IN (54, 56)" +
+                "  GROUP BY int_col"))
+                .isFullyPushedDown();
+    }
+
+    @Test
+    public void testVarbinaryFilters()
+    {
+        assertThat(query("SELECT string_col" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE bytes_col = X''"))
+                .matches("VALUES (VARCHAR 'null'), (VARCHAR 'array_null')")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT string_col" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE bytes_col != X''"))
+                .matches("VALUES (VARCHAR 'string_0')," +
+                        "  (VARCHAR 'string_1200')," +
+                        "  (VARCHAR 'string_2400')," +
+                        "  (VARCHAR 'string_3600')," +
+                        "  (VARCHAR 'string_4800')," +
+                        "  (VARCHAR 'string_6000')," +
+                        "  (VARCHAR 'string_7200')," +
+                        "  (VARCHAR 'string_8400')," +
+                        "  (VARCHAR 'string_9600')")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT string_col" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE bytes_col = X'73 74 72 69 6e 67 5f 30'"))
+                .matches("VALUES (VARCHAR 'string_0')")
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT string_col" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE bytes_col != X'73 74 72 69 6e 67 5f 30'"))
+                .matches("VALUES (VARCHAR 'null')," +
+                        "  (VARCHAR 'array_null')," +
+                        "  (VARCHAR 'string_1200')," +
+                        "  (VARCHAR 'string_2400')," +
+                        "  (VARCHAR 'string_3600')," +
+                        "  (VARCHAR 'string_4800')," +
+                        "  (VARCHAR 'string_6000')," +
+                        "  (VARCHAR 'string_7200')," +
+                        "  (VARCHAR 'string_8400')," +
+                        "  (VARCHAR 'string_9600')")
+                .isFullyPushedDown();
+    }
+
+    @Test
+    public void testRealWithInfinity()
+    {
+        assertThat(query("SELECT element_at(float_array_col, 1)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE bytes_col = X''"))
+                .matches("VALUES  (CAST(-POWER(0, -1) AS REAL))," +
+                        "  (CAST(-POWER(0, -1) AS REAL))");
+
+        assertThat(query("SELECT element_at(float_array_col, 1) FROM \"SELECT float_array_col" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE bytes_col = '' \""))
+                .matches("VALUES  (CAST(-POWER(0, -1) AS REAL))," +
+                        "  (CAST(-POWER(0, -1) AS REAL))");
+
+        assertThat(query("SELECT element_at(float_array_col, 2)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col = 'string_0'"))
+                .matches("VALUES (CAST(POWER(0, -1) AS REAL))");
+
+        assertThat(query("SELECT element_at(float_array_col, 2) FROM \"SELECT float_array_col" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col = 'string_0'\""))
+                .matches("VALUES (CAST(POWER(0, -1) AS REAL))");
+    }
+
+    @Test
+    public void testDoubleWithInfinity()
+    {
+        assertThat(query("SELECT element_at(double_array_col, 1)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE bytes_col = X''"))
+                .matches("VALUES  (-POWER(0, -1))," +
+                        "  (-POWER(0, -1))");
+
+        assertThat(query("SELECT element_at(double_array_col, 1) FROM \"SELECT double_array_col" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE bytes_col = '' \""))
+                .matches("VALUES  (-POWER(0, -1))," +
+                        "  (-POWER(0, -1))");
+
+        assertThat(query("SELECT element_at(double_array_col, 2)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col = 'string_0'"))
+                .matches("VALUES (POWER(0, -1))");
+
+        assertThat(query("SELECT element_at(double_array_col, 2) FROM \"SELECT double_array_col" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col = 'string_0'\""))
+                .matches("VALUES (POWER(0, -1))");
+    }
+
+    @Test
+    public void testTransformFunctions()
+    {
+        // Test that time units and formats are correctly uppercased.
+        // The dynamic table, i.e. the query between the quotes, will be lowercased since it is passed as a SchemaTableName.
+        assertThat(query("SELECT hours_col, hours_col2 FROM \"SELECT timeconvert(created_at_seconds, 'SECONDS', 'HOURS') as hours_col," +
+                "  CAST(FLOOR(created_at_seconds / 3600) as long) as hours_col2 from " + DATE_TIME_FIELDS_TABLE + "\""))
+                .matches("VALUES (BIGINT '450168', BIGINT '450168')," +
+                        "  (BIGINT '450168', BIGINT '450168')," +
+                        "  (BIGINT '450168', BIGINT '450168')");
+        assertThat(query("SELECT \"datetimeconvert(created_at_seconds,'1:seconds:epoch','1:days:epoch','1:days')\" FROM \"SELECT datetimeconvert(created_at_seconds, '1:SECONDS:EPOCH', '1:DAYS:EPOCH', '1:DAYS')" +
+                " FROM " + DATE_TIME_FIELDS_TABLE + "\""))
+                .matches("VALUES (BIGINT '18757'), (BIGINT '18757'), (BIGINT '18757')");
+        // Multiple forms of datetrunc from 2-5 arguments
+        assertThat(query("SELECT \"datetrunc('hour',created_at)\" FROM \"SELECT datetrunc('hour', created_at)" +
+                " FROM " + DATE_TIME_FIELDS_TABLE + "\""))
+                .matches("VALUES (BIGINT '1620604800000'), (BIGINT '1620604800000'), (BIGINT '1620604800000')");
+        assertThat(query("SELECT \"datetrunc('hour',created_at_seconds,'seconds')\" FROM \"SELECT datetrunc('hour', created_at_seconds, 'SECONDS')" +
+                " FROM " + DATE_TIME_FIELDS_TABLE + "\""))
+                .matches("VALUES (BIGINT '1620604800'), (BIGINT '1620604800'), (BIGINT '1620604800')");
+        assertThat(query("SELECT \"datetrunc('hour',created_at_seconds,'seconds','utc')\" FROM \"SELECT datetrunc('hour', created_at_seconds, 'SECONDS', 'UTC')" +
+                " FROM " + DATE_TIME_FIELDS_TABLE + "\""))
+                .matches("VALUES (BIGINT '1620604800'), (BIGINT '1620604800'), (BIGINT '1620604800')");
+
+        assertThat(query("SELECT \"datetrunc('quarter',created_at_seconds,'seconds','america/los_angeles','hours')\" FROM \"SELECT datetrunc('quarter', created_at_seconds, 'SECONDS', 'America/Los_Angeles', 'HOURS')" +
+                " FROM " + DATE_TIME_FIELDS_TABLE + "\""))
+                .matches("VALUES (BIGINT '449239'), (BIGINT '449239'), (BIGINT '449239')");
+        assertThat(query("SELECT \"arraylength(double_array_col)\" FROM " +
+                "\"SELECT arraylength(double_array_col)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col in ('string_0', 'array_null')\""))
+                .matches("VALUES (3), (1)");
+
+        assertThat(query("SELECT \"cast(floor(arrayaverage(long_array_col)),'long')\" FROM " +
+                "\"SELECT cast(floor(arrayaverage(long_array_col)) as long)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE double_array_col is not null and double_col != -17.33\""))
+                .matches("VALUES (BIGINT '333333337')," +
+                        "  (BIGINT '333333338')," +
+                        "  (BIGINT '333333338')," +
+                        "  (BIGINT '333333338')," +
+                        "  (BIGINT '333333339')," +
+                        "  (BIGINT '333333339')," +
+                        "  (BIGINT '333333339')," +
+                        "  (BIGINT '333333340')");
+
+        assertThat(query("SELECT \"arraymax(long_array_col)\" FROM " +
+                "\"SELECT arraymax(long_array_col)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col is not null and string_col != 'array_null'\""))
+                .matches("VALUES (BIGINT '4147483647')," +
+                        "  (BIGINT '4147483648')," +
+                        "  (BIGINT '4147483649')," +
+                        "  (BIGINT '4147483650')," +
+                        "  (BIGINT '4147483651')," +
+                        "  (BIGINT '4147483652')," +
+                        "  (BIGINT '4147483653')," +
+                        "  (BIGINT '4147483654')," +
+                        "  (BIGINT '4147483655')");
+
+        assertThat(query("SELECT \"arraymin(long_array_col)\" FROM " +
+                "\"SELECT arraymin(long_array_col)" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col is not null and string_col != 'array_null'\""))
+                .matches("VALUES (BIGINT '-3147483647')," +
+                        "  (BIGINT '-3147483646')," +
+                        "  (BIGINT '-3147483645')," +
+                        "  (BIGINT '-3147483644')," +
+                        "  (BIGINT '-3147483643')," +
+                        "  (BIGINT '-3147483642')," +
+                        "  (BIGINT '-3147483641')," +
+                        "  (BIGINT '-3147483640')," +
+                        "  (BIGINT '-3147483639')");
+    }
+
+    @Test
+    public void testPassthroughQueriesWithAliases()
+    {
+        assertThat(query("SELECT hours_col, hours_col2 FROM " +
+                "\"SELECT timeconvert(created_at_seconds, 'SECONDS', 'HOURS') AS hours_col," +
+                "  CAST(FLOOR(created_at_seconds / 3600) as long) as hours_col2" +
+                "  FROM " + DATE_TIME_FIELDS_TABLE + "\""))
+                .matches("VALUES (BIGINT '450168', BIGINT '450168'), (BIGINT '450168', BIGINT '450168'), (BIGINT '450168', BIGINT '450168')");
+
+        // Test without aliases to verify fieldName is correctly handled
+        assertThat(query("SELECT \"timeconvert(created_at_seconds,'seconds','hours')\"," +
+                " \"cast(floor(divide(created_at_seconds,'3600')),'long')\" FROM " +
+                "\"SELECT timeconvert(created_at_seconds, 'SECONDS', 'HOURS')," +
+                "  CAST(FLOOR(created_at_seconds / 3600) as long)" +
+                "  FROM " + DATE_TIME_FIELDS_TABLE + "\""))
+                .matches("VALUES (BIGINT '450168', BIGINT '450168'), (BIGINT '450168', BIGINT '450168'), (BIGINT '450168', BIGINT '450168')");
+
+        assertThat(query("SELECT int_col2, long_col2 FROM " +
+                "\"SELECT int_col AS int_col2, long_col AS long_col2" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col IS NOT null AND string_col != 'array_null'\""))
+                .matches("VALUES (54, BIGINT '-3147483647')," +
+                        "  (54, BIGINT '-3147483646')," +
+                        "  (54, BIGINT '-3147483645')," +
+                        "  (55, BIGINT '-3147483644')," +
+                        "  (55, BIGINT '-3147483643')," +
+                        "  (55, BIGINT '-3147483642')," +
+                        "  (56, BIGINT '-3147483641')," +
+                        "  (56, BIGINT '-3147483640')," +
+                        "  (56, BIGINT '-3147483639')");
+
+        assertThat(query("SELECT int_col2, long_col2 FROM " +
+                "\"SELECT int_col AS int_col2, long_col AS long_col2 " +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col IS NOT null AND string_col != 'array_null'\""))
+                .matches("VALUES (54, BIGINT '-3147483647')," +
+                        "  (54, BIGINT '-3147483646')," +
+                        "  (54, BIGINT '-3147483645')," +
+                        "  (55, BIGINT '-3147483644')," +
+                        "  (55, BIGINT '-3147483643')," +
+                        "  (55, BIGINT '-3147483642')," +
+                        "  (56, BIGINT '-3147483641')," +
+                        "  (56, BIGINT '-3147483640')," +
+                        "  (56, BIGINT '-3147483639')");
+
+        assertQuerySucceeds("SELECT int_col FROM " +
+                "\"SELECT floor(int_col / 3) AS int_col" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col IS NOT null AND string_col != 'array_null'\"");
+    }
+
+    @Test
+    public void testPassthroughQueriesWithPushdowns()
+    {
+        assertThat(query("SELECT DISTINCT \"timeconvert(created_at_seconds,'seconds','hours')\"," +
+                "  \"cast(floor(divide(created_at_seconds,'3600')),'long')\" FROM " +
+                "\"SELECT timeconvert(created_at_seconds, 'SECONDS', 'HOURS')," +
+                "  CAST(FLOOR(created_at_seconds / 3600) AS long)" +
+                "  FROM " + DATE_TIME_FIELDS_TABLE + "\""))
+                .matches("VALUES (BIGINT '450168', BIGINT '450168')");
+
+        assertThat(query("SELECT DISTINCT \"timeconvert(created_at_seconds,'seconds','milliseconds')\"," +
+                "  \"cast(floor(divide(created_at_seco" +
+                "nds,'3600')),'long')\" FROM " +
+                "\"SELECT timeconvert(created_at_seconds, 'SECONDS', 'MILLISECONDS')," +
+                "  CAST(FLOOR(created_at_seconds / 3600) as long)" +
+                "  FROM " + DATE_TIME_FIELDS_TABLE + "\""))
+                .matches("VALUES (BIGINT '1620604802000', BIGINT '450168')," +
+                        "  (BIGINT '1620604801000', BIGINT '450168')," +
+                        "  (BIGINT '1620604800000', BIGINT '450168')");
+
+        assertThat(query("SELECT int_col, sum(long_col) FROM " +
+                "\"SELECT int_col, long_col" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col IS NOT null AND string_col != 'array_null'\"" +
+                "  GROUP BY int_col"))
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT DISTINCT int_col, long_col FROM " +
+                "\"SELECT int_col, long_col FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col IS NOT null AND string_col != 'array_null'\""))
+                .isFullyPushedDown();
+
+        assertThat(query("SELECT int_col2, long_col2, count(*) FROM " +
+                "\"SELECT int_col AS int_col2, long_col AS long_col2" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col IS NOT null AND string_col != 'array_null'\"" +
+                "  GROUP BY int_col2, long_col2"))
+                .isFullyPushedDown();
+
+        assertQuerySucceeds("SELECT DISTINCT int_col2, long_col2 FROM " +
+                "\"SELECT int_col AS int_col2, long_col AS long_col2" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col IS NOT null AND string_col != 'array_null'\"");
+        assertThat(query("SELECT int_col2, count(*) FROM " +
+                "\"SELECT int_col AS int_col2, long_col AS long_col2" +
+                "  FROM " + ALL_TYPES_TABLE +
+                "  WHERE string_col IS NOT null AND string_col != 'array_null'\"" +
+                "  GROUP BY int_col2"))
+                .isFullyPushedDown();
+    }
+
+    @Test
+    public void testColumnNamesWithDoubleQuotes()
+    {
+        assertThat(query("select \"double\"\"\"\"qu\"\"ot\"\"ed\"\"\" from quotes_in_column_name"))
+                .matches("VALUES (VARCHAR 'foo'), (VARCHAR 'bar')")
+                .isFullyPushedDown();
+
+        assertThat(query("select \"qu\"\"ot\"\"ed\" from quotes_in_column_name"))
+                .matches("VALUES (VARCHAR 'FOO'), (VARCHAR 'BAR')")
+                .isFullyPushedDown();
+
+        assertThat(query("select non_quoted from \"select \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" as non_quoted from quotes_in_column_name\""))
+                .matches("VALUES (VARCHAR 'FOO'), (VARCHAR 'BAR')")
+                .isFullyPushedDown();
+
+        assertThat(query("select \"qu\"\"ot\"\"ed\" from \"select non_quoted as \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\""))
+                .matches("VALUES (VARCHAR 'Foo'), (VARCHAR 'Bar')")
+                .isFullyPushedDown();
+
+        assertThat(query("select \"double\"\"\"\"qu\"\"ot\"\"ed\"\"\" from \"select \"\"double\"\"\"\"\"\"\"\"qu\"\"\"\"ot\"\"\"\"ed\"\"\"\"\"\" from quotes_in_column_name\""))
+                .matches("VALUES (VARCHAR 'foo'), (VARCHAR 'bar')")
+                .isFullyPushedDown();
+
+        assertThat(query("select \"qu\"\"oted\" from \"select \"\"double\"\"\"\"\"\"\"\"qu\"\"\"\"ot\"\"\"\"ed\"\"\"\"\"\" as \"\"qu\"\"\"\"oted\"\" from quotes_in_column_name\""))
+                .matches("VALUES (VARCHAR 'foo'), (VARCHAR 'bar')")
+                .isFullyPushedDown();
+
+        assertThat(query("select \"date\" from \"select \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" as \"\"date\"\" from quotes_in_column_name\""))
+                .matches("VALUES (VARCHAR 'FOO'), (VARCHAR 'BAR')")
+                .isFullyPushedDown();
+
+        assertThat(query("select \"date\" from \"select non_quoted as \"\"date\"\" from quotes_in_column_name\""))
+                .matches("VALUES (VARCHAR 'Foo'), (VARCHAR 'Bar')")
+                .isFullyPushedDown();
+
+        /// Test aggregations with double quoted columns
+        assertThat(query("select non_quoted, COUNT(DISTINCT \"date\") from \"select non_quoted, non_quoted as \"\"date\"\" from quotes_in_column_name\" GROUP BY non_quoted"))
+                .isFullyPushedDown();
+
+        assertThat(query("select non_quoted, COUNT(DISTINCT \"double\"\"\"\"qu\"\"ot\"\"ed\"\"\") from \"select non_quoted, \"\"double\"\"\"\"\"\"\"\"qu\"\"\"\"ot\"\"\"\"ed\"\"\"\"\"\" from quotes_in_column_name\" GROUP BY non_quoted"))
+                .isFullyPushedDown();
+
+        assertThat(query("select non_quoted, COUNT(DISTINCT  \"qu\"\"ot\"\"ed\") from \"select non_quoted, \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\" GROUP BY non_quoted"))
+                .isFullyPushedDown();
+
+        assertThat(query("select non_quoted, COUNT(DISTINCT  \"qu\"\"ot\"\"ed\") from \"select non_quoted, non_quoted as \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\" GROUP BY non_quoted"))
+                .isFullyPushedDown();
+
+        assertThat(query("select \"qu\"\"ot\"\"ed\", COUNT(DISTINCT \"date\") from \"select \"\"qu\"\"\"\"ot\"\"\"\"ed\"\", non_quoted as \"\"date\"\" from quotes_in_column_name\" GROUP BY \"qu\"\"ot\"\"ed\""))
+                .isFullyPushedDown();
+
+        assertThat(query("select \"qu\"\"ot\"\"ed\", COUNT(DISTINCT \"double\"\"\"\"qu\"\"ot\"\"ed\"\"\") from \"select \"\"qu\"\"\"\"ot\"\"\"\"ed\"\", \"\"double\"\"\"\"\"\"\"\"qu\"\"\"\"ot\"\"\"\"ed\"\"\"\"\"\" from quotes_in_column_name\" GROUP BY \"qu\"\"ot\"\"ed\""))
+                .isFullyPushedDown();
+
+        // Test with grouping column that has double quotes aliased to a name without double quotes
+        assertThat(query("select non_quoted, COUNT(DISTINCT  \"qu\"\"ot\"\"ed\") from \"select \"\"double\"\"\"\"\"\"\"\"qu\"\"\"\"ot\"\"\"\"ed\"\"\"\"\"\" as non_quoted, \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\" GROUP BY non_quoted"))
+                .isFullyPushedDown();
+
+        // Test with grouping column that has no double quotes aliased to a name with double quotes
+        assertThat(query("select \"qu\"\"oted\", COUNT(DISTINCT  \"qu\"\"ot\"\"ed\") from \"select non_quoted as \"\"qu\"\"\"\"oted\"\", \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\" GROUP BY \"qu\"\"oted\""))
+                .isFullyPushedDown();
+
+        assertThat(query("select \"qu\"\"oted\", COUNT(DISTINCT  \"qu\"\"oted\") from \"select \"\"qu\"\"\"\"ot\"\"\"\"ed\"\", non_quoted as \"\"qu\"\"\"\"oted\"\" from quotes_in_column_name\" GROUP BY \"qu\"\"oted\""))
+                .isFullyPushedDown();
+
+        /// Test aggregations with double quoted columns and no grouping sets
+        assertThat(query("select COUNT(DISTINCT \"date\") from \"select non_quoted as \"\"date\"\" from quotes_in_column_name\""))
+                .isFullyPushedDown();
+
+        assertThat(query("select COUNT(DISTINCT \"double\"\"\"\"qu\"\"ot\"\"ed\"\"\") from \"select \"\"double\"\"\"\"\"\"\"\"qu\"\"\"\"ot\"\"\"\"ed\"\"\"\"\"\" from quotes_in_column_name\""))
+                .isFullyPushedDown();
+
+        assertThat(query("select COUNT(DISTINCT  \"qu\"\"ot\"\"ed\") from \"select \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\""))
+                .isFullyPushedDown();
+
+        assertThat(query("select COUNT(DISTINCT  \"qu\"\"ot\"\"ed\") from \"select non_quoted as \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\""))
+                .isFullyPushedDown();
+    }
+
+    @Test
+    public void testLimitAndOffsetWithPushedDownAggregates()
+    {
+        // Aggregation pushdown must be disabled when there is an offset as the results will not be correct
+        assertThat(query("SELECT COUNT(*), MAX(long_col)" +
+                "  FROM \"SELECT long_col FROM " + ALL_TYPES_TABLE +
+                "  WHERE long_col < 0" +
+                "  ORDER BY long_col " +
+                "  LIMIT 5, 6\""))
+                .matches("VALUES (BIGINT '4', BIGINT '-3147483639')")
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+
+        assertThat(query("SELECT long_col, COUNT(*), MAX(long_col)" +
+                "  FROM \"SELECT long_col FROM " + ALL_TYPES_TABLE +
+                "  WHERE long_col < 0" +
+                "  ORDER BY long_col " +
+                "  LIMIT 5, 6\" GROUP BY long_col"))
+                .matches("VALUES (BIGINT '-3147483642', BIGINT '1', BIGINT '-3147483642')," +
+                        "  (BIGINT '-3147483640', BIGINT '1', BIGINT '-3147483640')," +
+                        "  (BIGINT '-3147483641', BIGINT '1', BIGINT '-3147483641')," +
+                        "  (BIGINT '-3147483639', BIGINT '1', BIGINT '-3147483639')")
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+
+        assertThat(query("SELECT long_col, string_col, COUNT(*), MAX(long_col)" +
+                "  FROM \"SELECT * FROM " + ALL_TYPES_TABLE +
+                "  WHERE long_col < 0" +
+                "  ORDER BY long_col, string_col" +
+                "  LIMIT 5, 6\" GROUP BY long_col, string_col"))
+                .matches("VALUES (BIGINT '-3147483641', VARCHAR 'string_7200', BIGINT '1', BIGINT '-3147483641')," +
+                        "  (BIGINT '-3147483640', VARCHAR 'string_8400', BIGINT '1', BIGINT '-3147483640')," +
+                        "  (BIGINT '-3147483642', VARCHAR 'string_6000', BIGINT '1', BIGINT '-3147483642')," +
+                        "  (BIGINT '-3147483639', VARCHAR 'string_9600', BIGINT '1', BIGINT '-3147483639')")
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+
+        // Note that the offset is the first parameter
+        assertThat(query("SELECT long_col" +
+                "  FROM \"SELECT long_col FROM " + ALL_TYPES_TABLE +
+                "  WHERE long_col < 0" +
+                "  ORDER BY long_col " +
+                "  LIMIT 2, 6\""))
+                .matches("VALUES (BIGINT '-3147483645')," +
+                        "  (BIGINT '-3147483644')," +
+                        "  (BIGINT '-3147483643')," +
+                        "  (BIGINT '-3147483642')," +
+                        "  (BIGINT '-3147483641')," +
+                        "  (BIGINT '-3147483640')")
+                .isFullyPushedDown();
+
+        // Note that the offset is the first parameter
+        assertThat(query("SELECT long_col, string_col" +
+                "  FROM \"SELECT long_col, string_col FROM " + ALL_TYPES_TABLE +
+                "  WHERE long_col < 0" +
+                "  ORDER BY long_col " +
+                "  LIMIT 2, 6\""))
+                .matches("VALUES (BIGINT '-3147483645', VARCHAR 'string_2400')," +
+                        "  (BIGINT '-3147483644', VARCHAR 'string_3600')," +
+                        "  (BIGINT '-3147483643', VARCHAR 'string_4800')," +
+                        "  (BIGINT '-3147483642', VARCHAR 'string_6000')," +
+                        "  (BIGINT '-3147483641', VARCHAR 'string_7200')," +
+                        "  (BIGINT '-3147483640', VARCHAR 'string_8400')")
+                .isFullyPushedDown();
+    }
+
+    @Test
+    public void testAggregatePassthroughQueriesWithExpressions()
+    {
+        assertThat(query("SELECT string_col, sum_metric_col1, count_dup_string_col, ratio_metric_col" +
+                "  FROM \"SELECT string_col, SUM(metric_col1) AS sum_metric_col1, COUNT(DISTINCT another_string_col) AS count_dup_string_col," +
+                "  (SUM(metric_col1) - SUM(metric_col2)) / SUM(metric_col1) AS ratio_metric_col" +
+                "  FROM duplicate_values_in_columns WHERE dim_col = another_dim_col" +
+                "  GROUP BY string_col" +
+                "  ORDER BY string_col\""))
+                .matches("VALUES (VARCHAR 'string1', DOUBLE '1110.0', 2, DOUBLE '-1.0')," +
+                        "  (VARCHAR 'string2', DOUBLE '100.0', 1, DOUBLE '-1.0')");
+
+        assertThat(query("SELECT string_col, sum_metric_col1, count_dup_string_col, ratio_metric_col" +
+                "  FROM \"SELECT string_col, SUM(metric_col1) AS sum_metric_col1," +
+                "  COUNT(DISTINCT another_string_col) AS count_dup_string_col," +
+                "  (SUM(metric_col1) - SUM(metric_col2)) / SUM(metric_col1) AS ratio_metric_col" +
+                "  FROM duplicate_values_in_columns WHERE dim_col != another_dim_col" +
+                "  GROUP BY string_col" +
+                "  ORDER BY string_col\""))
+                .matches("VALUES (VARCHAR 'string2', DOUBLE '1000.0', 1, DOUBLE '-1.0')");
+
+        assertThat(query("SELECT DISTINCT string_col, another_string_col" +
+                "  FROM \"SELECT string_col, another_string_col" +
+                "  FROM duplicate_values_in_columns WHERE dim_col = another_dim_col\""))
+                .matches("VALUES (VARCHAR 'string1', VARCHAR 'string1')," +
+                        "  (VARCHAR 'string1', VARCHAR 'another_string1')," +
+                        "  (VARCHAR 'string2', VARCHAR 'another_string2')");
+
+        assertThat(query("SELECT string_col, sum_metric_col1" +
+                "  FROM \"SELECT string_col," +
+                "  SUM(CASE WHEN dim_col = another_dim_col THEN metric_col1 ELSE 0 END) AS sum_metric_col1" +
+                "  FROM duplicate_values_in_columns GROUP BY string_col ORDER BY string_col\""))
+                .matches("VALUES (VARCHAR 'string1', DOUBLE '1110.0')," +
+                        "  (VARCHAR 'string2', DOUBLE '100.0')");
+
+        assertThat(query("SELECT \"percentile(int_col, 90.0)\"" +
+                "  FROM \"SELECT percentile(int_col, 90) FROM " + ALL_TYPES_TABLE + "\""))
+                .matches("VALUES (DOUBLE '56.0')");
+
+        assertThat(query("SELECT bool_col, \"percentile(int_col, 90.0)\"" +
+                "  FROM \"SELECT bool_col, percentile(int_col, 90) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col\""))
+                .matches("VALUES (true, DOUBLE '56.0')," +
+                        "  (false, DOUBLE '0.0')");
+
+        assertThat(query("SELECT \"sqrt(percentile(sqrt(int_col),'26.457513110645905'))\"" +
+                "  FROM \"SELECT sqrt(percentile(sqrt(int_col), sqrt(700))) FROM " + ALL_TYPES_TABLE + "\""))
+                .matches("VALUES (DOUBLE '2.7108060108295344')");
+
+        assertThat(query("SELECT int_col, \"sqrt(percentile(sqrt(int_col),'26.457513110645905'))\"" +
+                "  FROM \"SELECT int_col, sqrt(percentile(sqrt(int_col), sqrt(700))) FROM " + ALL_TYPES_TABLE + " GROUP BY int_col\""))
+                .matches("VALUES (54, DOUBLE '2.7108060108295344')," +
+                        "  (55, DOUBLE '2.7232698153315003')," +
+                        "  (56, DOUBLE '2.7355647997347607')," +
+                        "  (0, DOUBLE '0.0')");
+    }
+
+    @Test
+    public void testAggregationPushdownWithArrays()
+    {
+        assertThat(query("SELECT string_array_col, count(*) FROM " + ALL_TYPES_TABLE + " WHERE int_col = 54 GROUP BY 1"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+        assertThat(query("SELECT int_array_col, string_array_col, count(*) FROM " + ALL_TYPES_TABLE + " WHERE int_col = 54 GROUP BY 1, 2"))
+                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
+        assertThat(query("SELECT int_array_col, \"count(*)\"" +
+                "  FROM \"SELECT int_array_col, COUNT(*) FROM " + ALL_TYPES_TABLE +
+                "  WHERE int_col = 54 GROUP BY 1\""))
+                .isFullyPushedDown()
+                .matches("VALUES (-10001, BIGINT '3')," +
+                        "(54, BIGINT '3')," +
+                        "(1000, BIGINT '3')");
+        assertThat(query("SELECT int_array_col, string_array_col, \"count(*)\"" +
+                "  FROM \"SELECT int_array_col, string_array_col, COUNT(*) FROM " + ALL_TYPES_TABLE +
+                "  WHERE int_col = 56 AND string_col = 'string_8400' GROUP BY 1, 2\""))
+                .isFullyPushedDown()
+                .matches("VALUES (-10001, VARCHAR 'string_8400', BIGINT '1')," +
+                        "(-10001, VARCHAR 'string2_8402', BIGINT '1')," +
+                        "(1000, VARCHAR 'string2_8402', BIGINT '1')," +
+                        "(56, VARCHAR 'string2_8402', BIGINT '1')," +
+                        "(-10001, VARCHAR 'string1_8401', BIGINT '1')," +
+                        "(56, VARCHAR 'string1_8401', BIGINT '1')," +
+                        "(1000, VARCHAR 'string_8400', BIGINT '1')," +
+                        "(56, VARCHAR 'string_8400', BIGINT '1')," +
+                        "(1000, VARCHAR 'string1_8401', BIGINT '1')");
+    }
+
+    @Test
+    public void testVarbinary()
+    {
+        String expectedValues = "VALUES (X'')," +
+                "  (X'73 74 72 69 6e 67 5f 30')," +
+                "  (X'73 74 72 69 6e 67 5f 31 32 30 30')," +
+                "  (X'73 74 72 69 6e 67 5f 32 34 30 30')," +
+                "  (X'73 74 72 69 6e 67 5f 33 36 30 30')," +
+                "  (X'73 74 72 69 6e 67 5f 34 38 30 30')," +
+                "  (X'73 74 72 69 6e 67 5f 36 30 30 30')," +
+                "  (X'73 74 72 69 6e 67 5f 37 32 30 30')," +
+                "  (X'73 74 72 69 6e 67 5f 38 34 30 30')," +
+                "  (X'73 74 72 69 6e 67 5f 39 36 30 30')";
+        // The filter on string_col is to have a deterministic result set: the default limit for broker queries is 10 rows.
+        assertThat(query("SELECT bytes_col FROM alltypes WHERE string_col != 'array_null'"))
+                .matches(expectedValues);
+        assertThat(query("SELECT bytes_col FROM \"SELECT bytes_col, string_col FROM alltypes\" WHERE string_col != 'array_null'"))
+                .matches(expectedValues);
+    }
+
+    @Test
+    public void testTimeBoundary()
+    {
+        // Note: This table uses Pinot TIMESTAMP and not LONG as the time column type.
+        Instant startInstant = initialUpdatedAt.truncatedTo(DAYS);
+        String expectedValues = "VALUES " +
+                "(VARCHAR 'string_8', BIGINT '8', TIMESTAMP '" + MILLIS_FORMATTER.format(startInstant.minus(1, DAYS).plusMillis(1000)) + "')," +
+                "(VARCHAR 'string_9', BIGINT '9', TIMESTAMP '" + MILLIS_FORMATTER.format(startInstant.minus(1, DAYS).plusMillis(2000)) + "')," +
+                "(VARCHAR 'string_10', BIGINT '10', TIMESTAMP '" + MILLIS_FORMATTER.format(startInstant.minus(1, DAYS).plusMillis(3000)) + "')," +
+                "(VARCHAR 'string_11', BIGINT '11', TIMESTAMP '" + MILLIS_FORMATTER.format(startInstant.minus(1, DAYS).plusMillis(4000)) + "')";
+        assertThat(query("SELECT stringcol, longcol, updatedat FROM " + HYBRID_TABLE_NAME))
+                .matches(expectedValues);
+        // Verify that this matches the time boundary behavior on the broker
+        assertThat(query("SELECT stringcol, longcol, updatedat FROM \"SELECT stringcol, longcol, updatedat FROM " + HYBRID_TABLE_NAME + "\""))
+                .matches(expectedValues);
+    }
+
+    @Test
+    public void testTimestamp()
+    {
+        assertThat(query("SELECT ts FROM " + ALL_TYPES_TABLE + " ORDER BY ts LIMIT 1")).matches("VALUES (TIMESTAMP '1970-01-01 00:00:00.000')");
+        assertThat(query("SELECT min(ts) FROM " + ALL_TYPES_TABLE)).matches("VALUES (TIMESTAMP '1970-01-01 00:00:00.000')");
+        assertThat(query("SELECT max(ts) FROM " + ALL_TYPES_TABLE)).isFullyPushedDown();
+        assertThat(query("SELECT ts FROM " + ALL_TYPES_TABLE + " ORDER BY ts DESC LIMIT 1")).matches("SELECT max(ts) FROM " + ALL_TYPES_TABLE);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS").withZone(ZoneOffset.UTC);
+        for (int i = 0, step = 1200; i < MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES - 2; i++) {
+            String initialUpdatedAtStr = formatter.format(initialUpdatedAt.plusMillis((long) i * step));
+            assertThat(query("SELECT ts FROM " + ALL_TYPES_TABLE + " WHERE ts >= TIMESTAMP '" + initialUpdatedAtStr + "' ORDER BY ts LIMIT 1"))
+                    .matches("SELECT ts FROM " + ALL_TYPES_TABLE + " WHERE ts <= TIMESTAMP '" + initialUpdatedAtStr + "' ORDER BY ts DESC LIMIT 1");
+            assertThat(query("SELECT ts FROM " + ALL_TYPES_TABLE + " WHERE ts = TIMESTAMP '" + initialUpdatedAtStr + "' LIMIT 1"))
+                    .matches("VALUES (TIMESTAMP '" + initialUpdatedAtStr + "')");
+        }
+        assertThat(query("SELECT timestamp_col FROM " + ALL_TYPES_TABLE + " WHERE timestamp_col < TIMESTAMP '1971-01-01 00:00:00.000'")).isFullyPushedDown();
+        assertThat(query("SELECT timestamp_col FROM " + ALL_TYPES_TABLE + " WHERE timestamp_col < TIMESTAMP '1970-01-01 00:00:00.000'")).isFullyPushedDown();
+    }
+
+    @Test
+    public void testJson()
+    {
+        assertThat(query("SELECT json_col FROM " + JSON_TYPE_TABLE))
+                .matches("VALUES (JSON '{\"id\":0,\"name\":\"user_0\"}')," +
+                        "  (JSON '{\"id\":1,\"name\":\"user_1\"}')," +
+                        "  (JSON '{\"id\":2,\"name\":\"user_2\"}')");
+        assertThat(query("SELECT json_col" +
+                "  FROM \"SELECT json_col FROM " + JSON_TYPE_TABLE + "\""))
+                .matches("VALUES (JSON '{\"id\":0,\"name\":\"user_0\"}')," +
+                        "  (JSON '{\"id\":1,\"name\":\"user_1\"}')," +
+                        "  (JSON '{\"id\":2,\"name\":\"user_2\"}')");
+        assertThat(query("SELECT name FROM \"SELECT json_extract_scalar(json_col, '$.name', 'STRING', '0') AS name" +
+                "  FROM json_type_table WHERE json_extract_scalar(json_col, '$.id', 'INT', '0') = '1'\""))
+                .matches("VALUES (VARCHAR 'user_1')");
+        assertThat(query("SELECT JSON_EXTRACT_SCALAR(json_col, '$.name') FROM " + JSON_TYPE_TABLE +
+                "  WHERE JSON_EXTRACT_SCALAR(json_col, '$.id') = '1'"))
+                .matches("VALUES (VARCHAR 'user_1')");
+        assertThat(query("SELECT string_col FROM " + JSON_TYPE_TABLE + " WHERE json_col = JSON '{\"id\":0,\"name\":\"user_0\"}'"))
+                .matches("VALUES VARCHAR 'string_0'");
+    }
+
+    @Test
+    public void testHavingClause()
+    {
+        assertThat(query("SELECT city, \"sum(long_number)\" FROM \"SELECT city, SUM(long_number)" +
+                "  FROM my_table" +
+                "  GROUP BY city" +
+                "  HAVING SUM(long_number) > 10000\""))
+                .matches("VALUES (VARCHAR 'Los Angeles', DOUBLE '50000.0')," +
+                        "  (VARCHAR 'New York', DOUBLE '20000.0')")
+                .isFullyPushedDown();
+        assertThat(query("SELECT city, \"sum(long_number)\" FROM \"SELECT city, SUM(long_number) FROM my_table" +
+                "  GROUP BY city HAVING SUM(long_number) > 14\"" +
+                "  WHERE city != 'New York'"))
+                .matches("VALUES (VARCHAR 'Los Angeles', DOUBLE '50000.0')")
+                .isFullyPushedDown();
+        assertThat(query("SELECT city, SUM(long_number)" +
+                "  FROM my_table" +
+                "  GROUP BY city" +
+                "  HAVING SUM(long_number) > 10000"))
+                .matches("VALUES (VARCHAR 'Los Angeles', BIGINT '50000')," +
+                        "  (VARCHAR 'New York', BIGINT '20000')")
+                .isFullyPushedDown();
+        assertThat(query("SELECT city, SUM(long_number) FROM my_table" +
+                "  WHERE city != 'New York'" +
+                "  GROUP BY city HAVING SUM(long_number) > 10000"))
+                .matches("VALUES (VARCHAR 'Los Angeles', BIGINT '50000')")
+                .isFullyPushedDown();
+    }
+
+    @Test
+    public void testQueryOptions()
+    {
+        assertThat(query("SELECT city, \"sum(long_number)\" FROM" +
+                         " \"SET skipUpsert = 'true';" +
+                         " SET numReplicaGroupsToQuery = '1';" +
+                         " SELECT city, SUM(long_number)" +
+                         "  FROM my_table" +
+                         "  GROUP BY city" +
+                         "  HAVING SUM(long_number) > 10000\""))
+                .matches("VALUES (VARCHAR 'Los Angeles', DOUBLE '50000.0'), (VARCHAR 'New York', DOUBLE '20000.0')")
+                .isFullyPushedDown();
+    }
+}
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/BasePinotIntegrationConnectorSmokeTest.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/BasePinotIntegrationConnectorSmokeTest.java
deleted file mode 100644
index 0346609fe347..000000000000
--- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/BasePinotIntegrationConnectorSmokeTest.java
+++ /dev/null
@@ -1,2504 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.pinot;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import io.confluent.kafka.serializers.KafkaAvroSerializer;
-import io.trino.Session;
-import io.trino.plugin.pinot.client.PinotHostMapper;
-import io.trino.plugin.tpch.TpchPlugin;
-import io.trino.sql.planner.plan.AggregationNode;
-import io.trino.sql.planner.plan.ExchangeNode;
-import io.trino.sql.planner.plan.FilterNode;
-import io.trino.sql.planner.plan.LimitNode;
-import io.trino.sql.planner.plan.MarkDistinctNode;
-import io.trino.sql.planner.plan.ProjectNode;
-import io.trino.testing.BaseConnectorSmokeTest;
-import io.trino.testing.DistributedQueryRunner;
-import io.trino.testing.MaterializedResult;
-import io.trino.testing.MaterializedRow;
-import io.trino.testing.QueryRunner;
-import io.trino.testing.TestingConnectorBehavior;
-import io.trino.testing.kafka.TestingKafka;
-import org.apache.avro.Schema;
-import org.apache.avro.SchemaBuilder;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.generic.GenericRecordBuilder;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.serialization.StringSerializer;
-import org.apache.pinot.common.utils.TarGzCompressionUtils;
-import org.apache.pinot.segment.local.recordtransformer.CompositeTransformer;
-import org.apache.pinot.segment.local.recordtransformer.RecordTransformer;
-import org.apache.pinot.segment.local.segment.creator.RecordReaderSegmentCreationDataSource;
-import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
-import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
-import org.apache.pinot.segment.spi.creator.SegmentCreationDataSource;
-import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.segment.spi.creator.name.NormalizedDateSegmentNameGenerator;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.data.DateTimeFormatSpec;
-import org.apache.pinot.spi.data.readers.GenericRow;
-import org.apache.pinot.spi.data.readers.RecordReader;
-import org.apache.pinot.spi.utils.builder.TableNameBuilder;
-import org.testcontainers.shaded.org.bouncycastle.util.encoders.Hex;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.google.common.io.MoreFiles.deleteRecursively;
-import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
-import static io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG;
-import static io.trino.plugin.pinot.PinotQueryRunner.createPinotQueryRunner;
-import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_PREVIOUS_IMAGE_NAME;
-import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.RealType.REAL;
-import static java.lang.String.format;
-import static java.time.temporal.ChronoUnit.DAYS;
-import static java.time.temporal.ChronoUnit.SECONDS;
-import static java.util.Objects.requireNonNull;
-import static java.util.UUID.randomUUID;
-import static java.util.stream.Collectors.joining;
-import static org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG;
-import static org.apache.pinot.spi.utils.JsonUtils.inputStreamToObject;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
-
-public abstract class BasePinotIntegrationConnectorSmokeTest
-        extends BaseConnectorSmokeTest
-{
-    private static final int MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES = 11;
-    private static final int MAX_ROWS_PER_SPLIT_FOR_BROKER_QUERIES = 12;
-    // If a broker query does not supply a limit, pinot defaults to 10 rows
-    private static final int DEFAULT_PINOT_LIMIT_FOR_BROKER_QUERIES = 10;
-    private static final String ALL_TYPES_TABLE = "alltypes";
-    private static final String DATE_TIME_FIELDS_TABLE = "date_time_fields";
-    private static final String MIXED_CASE_COLUMN_NAMES_TABLE = "mixed_case";
-    private static final String MIXED_CASE_DISTINCT_TABLE = "mixed_case_distinct";
-    private static final String TOO_MANY_ROWS_TABLE = "too_many_rows";
-    private static final String TOO_MANY_BROKER_ROWS_TABLE = "too_many_broker_rows";
-    private static final String MIXED_CASE_TABLE_NAME = "mixedCase";
-    private static final String HYBRID_TABLE_NAME = "hybrid";
-    private static final String DUPLICATE_TABLE_LOWERCASE = "dup_table";
-    private static final String DUPLICATE_TABLE_MIXED_CASE = "dup_Table";
-    private static final String JSON_TABLE = "my_table";
-    private static final String JSON_TYPE_TABLE = "json_table";
-    private static final String RESERVED_KEYWORD_TABLE = "reserved_keyword";
-    private static final String QUOTES_IN_COLUMN_NAME_TABLE = "quotes_in_column_name";
-    private static final String DUPLICATE_VALUES_IN_COLUMNS_TABLE = "duplicate_values_in_columns";
-    // Use a recent value for updated_at to ensure Pinot doesn't clean up records older than retentionTimeValue as defined in the table specs
-    private static final Instant initialUpdatedAt = Instant.now().minus(Duration.ofDays(1)).truncatedTo(SECONDS);
-    // Use a fixed instant for testing date time functions
-    private static final Instant CREATED_AT_INSTANT = Instant.parse("2021-05-10T00:00:00.00Z");
-
-    private static final DateTimeFormatter MILLIS_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS").withZone(ZoneOffset.UTC);
-
-    protected abstract boolean isSecured();
-
-    protected boolean isGrpcEnabled()
-    {
-        return true;
-    }
-
-    protected String getPinotImageName()
-    {
-        return PINOT_PREVIOUS_IMAGE_NAME;
-    }
-
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        TestingKafka kafka = closeAfterClass(TestingKafka.createWithSchemaRegistry());
-        kafka.start();
-        TestingPinotCluster pinot = closeAfterClass(new TestingPinotCluster(kafka.getNetwork(), isSecured(), getPinotImageName()));
-        pinot.start();
-
-        createAndPopulateAllTypesTopic(kafka, pinot);
-        createAndPopulateMixedCaseTableAndTopic(kafka, pinot);
-        createAndPopulateMixedCaseDistinctTableAndTopic(kafka, pinot);
-        createAndPopulateTooManyRowsTable(kafka, pinot);
-        createAndPopulateTooManyBrokerRowsTableAndTopic(kafka, pinot);
-        createTheDuplicateTablesAndTopics(kafka, pinot);
-        createAndPopulateDateTimeFieldsTableAndTopic(kafka, pinot);
-        createAndPopulateJsonTypeTable(kafka, pinot);
-        createAndPopulateJsonTable(kafka, pinot);
-        createAndPopulateMixedCaseHybridTablesAndTopic(kafka, pinot);
-        createAndPopulateTableHavingReservedKeywordColumnNames(kafka, pinot);
-        createAndPopulateHavingQuotesInColumnNames(kafka, pinot);
-        createAndPopulateHavingMultipleColumnsWithDuplicateValues(kafka, pinot);
-
-        DistributedQueryRunner queryRunner = createPinotQueryRunner(
-                ImmutableMap.of(),
-                pinotProperties(pinot),
-                Optional.of(binder -> newOptionalBinder(binder, PinotHostMapper.class).setBinding()
-                        .toInstance(new TestingPinotHostMapper(pinot.getBrokerHostAndPort(), pinot.getServerHostAndPort(), pinot.getServerGrpcHostAndPort()))));
-
-        queryRunner.installPlugin(new TpchPlugin());
-        queryRunner.createCatalog("tpch", "tpch");
-
-        // We need the query runner to populate nation and region data from tpch schema
-        createAndPopulateNationAndRegionData(kafka, pinot, queryRunner);
-
-        return queryRunner;
-    }
-
-    private void createAndPopulateAllTypesTopic(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create and populate the all_types topic and table
-        kafka.createTopic(ALL_TYPES_TABLE);
-
-        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> allTypesRecordsBuilder = ImmutableList.builder();
-        for (int i = 0, step = 1200; i < MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES - 2; i++) {
-            int offset = i * step;
-            allTypesRecordsBuilder.add(new ProducerRecord<>(ALL_TYPES_TABLE, "key" + i * step,
-                    createTestRecord(
-                            Arrays.asList("string_" + (offset), "string1_" + (offset + 1), "string2_" + (offset + 2)),
-                            true,
-                            Arrays.asList(54 + i / 3, -10001, 1000),
-                            Arrays.asList(-7.33F + i, Float.POSITIVE_INFINITY, 17.034F + i),
-                            Arrays.asList(-17.33D + i, Double.POSITIVE_INFINITY, 10596.034D + i),
-                            Arrays.asList(-3147483647L + i, 12L - i, 4147483647L + i),
-                            initialUpdatedAt.minusMillis(offset).toEpochMilli(),
-                            initialUpdatedAt.plusMillis(offset).toEpochMilli())));
-        }
-
-        allTypesRecordsBuilder.add(new ProducerRecord<>(ALL_TYPES_TABLE, null, createNullRecord()));
-        allTypesRecordsBuilder.add(new ProducerRecord<>(ALL_TYPES_TABLE, null, createArrayNullRecord()));
-        kafka.sendMessages(allTypesRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
-
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("alltypes_schema.json"), ALL_TYPES_TABLE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("alltypes_realtimeSpec.json"), ALL_TYPES_TABLE);
-    }
-
-    private void createAndPopulateMixedCaseTableAndTopic(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create and populate mixed case table and topic
-        kafka.createTopic(MIXED_CASE_COLUMN_NAMES_TABLE);
-        Schema mixedCaseAvroSchema = SchemaBuilder.record(MIXED_CASE_COLUMN_NAMES_TABLE).fields()
-                .name("stringCol").type().stringType().noDefault()
-                .name("longCol").type().optional().longType()
-                .name("updatedAt").type().longType().noDefault()
-                .endRecord();
-
-        List<ProducerRecord<String, GenericRecord>> mixedCaseProducerRecords = ImmutableList.<ProducerRecord<String, GenericRecord>>builder()
-                .add(new ProducerRecord<>(MIXED_CASE_COLUMN_NAMES_TABLE, "key0", new GenericRecordBuilder(mixedCaseAvroSchema)
-                        .set("stringCol", "string_0")
-                        .set("longCol", 0L)
-                        .set("updatedAt", initialUpdatedAt.toEpochMilli())
-                        .build()))
-                .add(new ProducerRecord<>(MIXED_CASE_COLUMN_NAMES_TABLE, "key1", new GenericRecordBuilder(mixedCaseAvroSchema)
-                        .set("stringCol", "string_1")
-                        .set("longCol", 1L)
-                        .set("updatedAt", initialUpdatedAt.plusMillis(1000).toEpochMilli())
-                        .build()))
-                .add(new ProducerRecord<>(MIXED_CASE_COLUMN_NAMES_TABLE, "key2", new GenericRecordBuilder(mixedCaseAvroSchema)
-                        .set("stringCol", "string_2")
-                        .set("longCol", 2L)
-                        .set("updatedAt", initialUpdatedAt.plusMillis(2000).toEpochMilli())
-                        .build()))
-                .add(new ProducerRecord<>(MIXED_CASE_COLUMN_NAMES_TABLE, "key3", new GenericRecordBuilder(mixedCaseAvroSchema)
-                        .set("stringCol", "string_3")
-                        .set("longCol", 3L)
-                        .set("updatedAt", initialUpdatedAt.plusMillis(3000).toEpochMilli())
-                        .build()))
-                .build();
-
-        kafka.sendMessages(mixedCaseProducerRecords.stream(), schemaRegistryAwareProducer(kafka));
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("mixed_case_schema.json"), MIXED_CASE_COLUMN_NAMES_TABLE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("mixed_case_realtimeSpec.json"), MIXED_CASE_COLUMN_NAMES_TABLE);
-    }
-
-    private void createAndPopulateMixedCaseDistinctTableAndTopic(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create and populate mixed case distinct table and topic
-        kafka.createTopic(MIXED_CASE_DISTINCT_TABLE);
-        Schema mixedCaseDistinctAvroSchema = SchemaBuilder.record(MIXED_CASE_DISTINCT_TABLE).fields()
-                .name("string_col").type().stringType().noDefault()
-                .name("updated_at").type().longType().noDefault()
-                .endRecord();
-
-        List<ProducerRecord<String, GenericRecord>> mixedCaseDistinctProducerRecords = ImmutableList.<ProducerRecord<String, GenericRecord>>builder()
-                .add(new ProducerRecord<>(MIXED_CASE_DISTINCT_TABLE, "key0", new GenericRecordBuilder(mixedCaseDistinctAvroSchema)
-                        .set("string_col", "A")
-                        .set("updated_at", initialUpdatedAt.toEpochMilli())
-                        .build()))
-                .add(new ProducerRecord<>(MIXED_CASE_DISTINCT_TABLE, "key1", new GenericRecordBuilder(mixedCaseDistinctAvroSchema)
-                        .set("string_col", "a")
-                        .set("updated_at", initialUpdatedAt.plusMillis(1000).toEpochMilli())
-                        .build()))
-                .add(new ProducerRecord<>(MIXED_CASE_DISTINCT_TABLE, "key2", new GenericRecordBuilder(mixedCaseDistinctAvroSchema)
-                        .set("string_col", "B")
-                        .set("updated_at", initialUpdatedAt.plusMillis(2000).toEpochMilli())
-                        .build()))
-                .add(new ProducerRecord<>(MIXED_CASE_DISTINCT_TABLE, "key3", new GenericRecordBuilder(mixedCaseDistinctAvroSchema)
-                        .set("string_col", "b")
-                        .set("updated_at", initialUpdatedAt.plusMillis(3000).toEpochMilli())
-                        .build()))
-                .build();
-
-        kafka.sendMessages(mixedCaseDistinctProducerRecords.stream(), schemaRegistryAwareProducer(kafka));
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("mixed_case_distinct_schema.json"), MIXED_CASE_DISTINCT_TABLE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("mixed_case_distinct_realtimeSpec.json"), MIXED_CASE_DISTINCT_TABLE);
-
-        // Create mixed case table name, populated from the mixed case topic
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("mixed_case_table_name_schema.json"), MIXED_CASE_TABLE_NAME);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("mixed_case_table_name_realtimeSpec.json"), MIXED_CASE_TABLE_NAME);
-    }
-
-    private void createAndPopulateTooManyRowsTable(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create and populate too many rows table and topic
-        kafka.createTopic(TOO_MANY_ROWS_TABLE);
-        Schema tooManyRowsAvroSchema = SchemaBuilder.record(TOO_MANY_ROWS_TABLE).fields()
-                .name("string_col").type().optional().stringType()
-                .name("updatedAt").type().optional().longType()
-                .endRecord();
-
-        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> tooManyRowsRecordsBuilder = ImmutableList.builder();
-        for (int i = 0; i < MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 1; i++) {
-            tooManyRowsRecordsBuilder.add(new ProducerRecord<>(TOO_MANY_ROWS_TABLE, "key" + i, new GenericRecordBuilder(tooManyRowsAvroSchema)
-                    .set("string_col", "string_" + i)
-                    .set("updatedAt", initialUpdatedAt.plusMillis(i * 1000).toEpochMilli())
-                    .build()));
-        }
-        kafka.sendMessages(tooManyRowsRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("too_many_rows_schema.json"), TOO_MANY_ROWS_TABLE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("too_many_rows_realtimeSpec.json"), TOO_MANY_ROWS_TABLE);
-    }
-
-    private void createAndPopulateTooManyBrokerRowsTableAndTopic(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create and populate too many broker rows table and topic
-        kafka.createTopic(TOO_MANY_BROKER_ROWS_TABLE);
-        Schema tooManyBrokerRowsAvroSchema = SchemaBuilder.record(TOO_MANY_BROKER_ROWS_TABLE).fields()
-                .name("string_col").type().optional().stringType()
-                .name("updatedAt").type().optional().longType()
-                .endRecord();
-
-        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> tooManyBrokerRowsRecordsBuilder = ImmutableList.builder();
-        for (int i = 0; i < MAX_ROWS_PER_SPLIT_FOR_BROKER_QUERIES + 1; i++) {
-            tooManyBrokerRowsRecordsBuilder.add(new ProducerRecord<>(TOO_MANY_BROKER_ROWS_TABLE, "key" + i, new GenericRecordBuilder(tooManyBrokerRowsAvroSchema)
-                    .set("string_col", "string_" + i)
-                    .set("updatedAt", initialUpdatedAt.plusMillis(i * 1000).toEpochMilli())
-                    .build()));
-        }
-        kafka.sendMessages(tooManyBrokerRowsRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("too_many_broker_rows_schema.json"), TOO_MANY_BROKER_ROWS_TABLE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("too_many_broker_rows_realtimeSpec.json"), TOO_MANY_BROKER_ROWS_TABLE);
-    }
-
-    private void createTheDuplicateTablesAndTopics(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create the duplicate tables and topics
-        kafka.createTopic(DUPLICATE_TABLE_LOWERCASE);
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("dup_table_lower_case_schema.json"), DUPLICATE_TABLE_LOWERCASE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("dup_table_lower_case_realtimeSpec.json"), DUPLICATE_TABLE_LOWERCASE);
-
-        kafka.createTopic(DUPLICATE_TABLE_MIXED_CASE);
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("dup_table_mixed_case_schema.json"), DUPLICATE_TABLE_MIXED_CASE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("dup_table_mixed_case_realtimeSpec.json"), DUPLICATE_TABLE_MIXED_CASE);
-    }
-
-    private void createAndPopulateDateTimeFieldsTableAndTopic(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create and populate date time fields table and topic
-        kafka.createTopic(DATE_TIME_FIELDS_TABLE);
-        Schema dateTimeFieldsAvroSchema = SchemaBuilder.record(DATE_TIME_FIELDS_TABLE).fields()
-                .name("string_col").type().stringType().noDefault()
-                .name("created_at").type().longType().noDefault()
-                .name("updated_at").type().longType().noDefault()
-                .endRecord();
-        List<ProducerRecord<String, GenericRecord>> dateTimeFieldsProducerRecords = ImmutableList.<ProducerRecord<String, GenericRecord>>builder()
-                .add(new ProducerRecord<>(DATE_TIME_FIELDS_TABLE, "string_0", new GenericRecordBuilder(dateTimeFieldsAvroSchema)
-                        .set("string_col", "string_0")
-                        .set("created_at", CREATED_AT_INSTANT.toEpochMilli())
-                        .set("updated_at", initialUpdatedAt.toEpochMilli())
-                        .build()))
-                .add(new ProducerRecord<>(DATE_TIME_FIELDS_TABLE, "string_1", new GenericRecordBuilder(dateTimeFieldsAvroSchema)
-                        .set("string_col", "string_1")
-                        .set("created_at", CREATED_AT_INSTANT.plusMillis(1000).toEpochMilli())
-                        .set("updated_at", initialUpdatedAt.plusMillis(1000).toEpochMilli())
-                        .build()))
-                .add(new ProducerRecord<>(DATE_TIME_FIELDS_TABLE, "string_2", new GenericRecordBuilder(dateTimeFieldsAvroSchema)
-                        .set("string_col", "string_2")
-                        .set("created_at", CREATED_AT_INSTANT.plusMillis(2000).toEpochMilli())
-                        .set("updated_at", initialUpdatedAt.plusMillis(2000).toEpochMilli())
-                        .build()))
-                .build();
-        kafka.sendMessages(dateTimeFieldsProducerRecords.stream(), schemaRegistryAwareProducer(kafka));
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("date_time_fields_schema.json"), DATE_TIME_FIELDS_TABLE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("date_time_fields_realtimeSpec.json"), DATE_TIME_FIELDS_TABLE);
-    }
-
-    private void createAndPopulateJsonTypeTable(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create json type table
-        kafka.createTopic(JSON_TYPE_TABLE);
-
-        Schema jsonTableAvroSchema = SchemaBuilder.record(JSON_TYPE_TABLE).fields()
-                .name("string_col").type().optional().stringType()
-                .name("json_col").type().optional().stringType()
-                .name("updatedAt").type().optional().longType()
-                .endRecord();
-
-        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> jsonTableRecordsBuilder = ImmutableList.builder();
-        for (int i = 0; i < 3; i++) {
-            jsonTableRecordsBuilder.add(new ProducerRecord<>(JSON_TYPE_TABLE, "key" + i, new GenericRecordBuilder(jsonTableAvroSchema)
-                    .set("string_col", "string_" + i)
-                    .set("json_col", "{ \"name\": \"user_" + i + "\", \"id\": " + i + "}")
-                    .set("updatedAt", initialUpdatedAt.plusMillis(i * 1000).toEpochMilli())
-                    .build()));
-        }
-        kafka.sendMessages(jsonTableRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("json_schema.json"), JSON_TYPE_TABLE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("json_realtimeSpec.json"), JSON_TYPE_TABLE);
-        pinot.addOfflineTable(getClass().getClassLoader().getResourceAsStream("json_offlineSpec.json"), JSON_TYPE_TABLE);
-    }
-
-    private void createAndPopulateJsonTable(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create json table
-        kafka.createTopic(JSON_TABLE);
-        long key = 0L;
-        kafka.sendMessages(Stream.of(
-                new ProducerRecord<>(JSON_TABLE, key++, TestingJsonRecord.of("vendor1", "Los Angeles", Arrays.asList("foo1", "bar1", "baz1"), Arrays.asList(5, 6, 7), Arrays.asList(3.5F, 5.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 4)),
-                new ProducerRecord<>(JSON_TABLE, key++, TestingJsonRecord.of("vendor2", "New York", Arrays.asList("foo2", "bar1", "baz1"), Arrays.asList(6, 7, 8), Arrays.asList(4.5F, 6.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 6)),
-                new ProducerRecord<>(JSON_TABLE, key++, TestingJsonRecord.of("vendor3", "Los Angeles", Arrays.asList("foo3", "bar2", "baz1"), Arrays.asList(7, 8, 9), Arrays.asList(5.5F, 7.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 8)),
-                new ProducerRecord<>(JSON_TABLE, key++, TestingJsonRecord.of("vendor4", "New York", Arrays.asList("foo4", "bar2", "baz2"), Arrays.asList(8, 9, 10), Arrays.asList(6.5F, 8.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 10)),
-                new ProducerRecord<>(JSON_TABLE, key++, TestingJsonRecord.of("vendor5", "Los Angeles", Arrays.asList("foo5", "bar3", "baz2"), Arrays.asList(9, 10, 11), Arrays.asList(7.5F, 9.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 12)),
-                new ProducerRecord<>(JSON_TABLE, key++, TestingJsonRecord.of("vendor6", "Los Angeles", Arrays.asList("foo6", "bar3", "baz2"), Arrays.asList(10, 11, 12), Arrays.asList(8.5F, 10.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 12)),
-                new ProducerRecord<>(JSON_TABLE, key, TestingJsonRecord.of("vendor7", "Los Angeles", Arrays.asList("foo6", "bar3", "baz2"), Arrays.asList(10, 11, 12), Arrays.asList(9.5F, 10.5F), Arrays.asList(10_000.5D, 20_000.335D, -3.7D), Arrays.asList(10_000L, 20_000_000L, -37L), 12))));
-
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("schema.json"), JSON_TABLE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("realtimeSpec.json"), JSON_TABLE);
-    }
-
-    private void createAndPopulateMixedCaseHybridTablesAndTopic(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create and populate mixed case table and topic
-        kafka.createTopic(HYBRID_TABLE_NAME);
-        Schema hybridAvroSchema = SchemaBuilder.record(HYBRID_TABLE_NAME).fields()
-                .name("stringCol").type().stringType().noDefault()
-                .name("longCol").type().optional().longType()
-                .name("updatedAt").type().longType().noDefault()
-                .endRecord();
-
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("hybrid_schema.json"), HYBRID_TABLE_NAME);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("hybrid_realtimeSpec.json"), HYBRID_TABLE_NAME);
-        pinot.addOfflineTable(getClass().getClassLoader().getResourceAsStream("hybrid_offlineSpec.json"), HYBRID_TABLE_NAME);
-
-        Instant startInstant = initialUpdatedAt.truncatedTo(DAYS);
-        List<ProducerRecord<String, GenericRecord>> hybridProducerRecords = ImmutableList.<ProducerRecord<String, GenericRecord>>builder()
-                .add(new ProducerRecord<>(HYBRID_TABLE_NAME, "key0", new GenericRecordBuilder(hybridAvroSchema)
-                        .set("stringCol", "string_0")
-                        .set("longCol", 0L)
-                        .set("updatedAt", startInstant.toEpochMilli())
-                        .build()))
-                .add(new ProducerRecord<>(HYBRID_TABLE_NAME, "key1", new GenericRecordBuilder(hybridAvroSchema)
-                        .set("stringCol", "string_1")
-                        .set("longCol", 1L)
-                        .set("updatedAt", startInstant.plusMillis(1000).toEpochMilli())
-                        .build()))
-                .add(new ProducerRecord<>(HYBRID_TABLE_NAME, "key2", new GenericRecordBuilder(hybridAvroSchema)
-                        .set("stringCol", "string_2")
-                        .set("longCol", 2L)
-                        .set("updatedAt", startInstant.plusMillis(2000).toEpochMilli())
-                        .build()))
-                .add(new ProducerRecord<>(HYBRID_TABLE_NAME, "key3", new GenericRecordBuilder(hybridAvroSchema)
-                        .set("stringCol", "string_3")
-                        .set("longCol", 3L)
-                        .set("updatedAt", startInstant.plusMillis(3000).toEpochMilli())
-                        .build()))
-                .build();
-
-        Path temporaryDirectory = Paths.get("/tmp/segments-" + randomUUID());
-        try {
-            Files.createDirectory(temporaryDirectory);
-            ImmutableList.Builder<GenericRow> offlineRowsBuilder = ImmutableList.builder();
-            for (int i = 4; i < 8; i++) {
-                GenericRow row = new GenericRow();
-                row.putValue("stringCol", "string_" + i);
-                row.putValue("longCol", (long) i);
-                row.putValue("updatedAt", startInstant.plus(1, DAYS).plusMillis(1000 * (i - 4)).toEpochMilli());
-                offlineRowsBuilder.add(row);
-            }
-            Path segmentPath = createSegment(getClass().getClassLoader().getResourceAsStream("hybrid_offlineSpec.json"), getClass().getClassLoader().getResourceAsStream("hybrid_schema.json"), new GenericRowRecordReader(offlineRowsBuilder.build()), temporaryDirectory.toString(), 0);
-            pinot.publishOfflineSegment("hybrid", segmentPath);
-
-            offlineRowsBuilder = ImmutableList.builder();
-            // These rows will be visible as they are older than the Pinot time boundary
-            // In Pinot the time boundary is the most recent time column value for an offline row - 24 hours
-            for (int i = 8; i < 12; i++) {
-                GenericRow row = new GenericRow();
-                row.putValue("stringCol", "string_" + i);
-                row.putValue("longCol", (long) i);
-                row.putValue("updatedAt", startInstant.minus(1, DAYS).plusMillis(1000 * (i - 7)).toEpochMilli());
-                offlineRowsBuilder.add(row);
-            }
-            segmentPath = createSegment(getClass().getClassLoader().getResourceAsStream("hybrid_offlineSpec.json"), getClass().getClassLoader().getResourceAsStream("hybrid_schema.json"), new GenericRowRecordReader(offlineRowsBuilder.build()), temporaryDirectory.toString(), 1);
-            pinot.publishOfflineSegment("hybrid", segmentPath);
-        }
-        finally {
-            deleteRecursively(temporaryDirectory, ALLOW_INSECURE);
-        }
-
-        kafka.sendMessages(hybridProducerRecords.stream(), schemaRegistryAwareProducer(kafka));
-    }
-
-    private void createAndPopulateTableHavingReservedKeywordColumnNames(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create a table having reserved keyword column names
-        kafka.createTopic(RESERVED_KEYWORD_TABLE);
-        Schema reservedKeywordAvroSchema = SchemaBuilder.record(RESERVED_KEYWORD_TABLE).fields()
-                .name("date").type().optional().stringType()
-                .name("as").type().optional().stringType()
-                .name("updatedAt").type().optional().longType()
-                .endRecord();
-        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> reservedKeywordRecordsBuilder = ImmutableList.builder();
-        reservedKeywordRecordsBuilder.add(new ProducerRecord<>(RESERVED_KEYWORD_TABLE, "key0", new GenericRecordBuilder(reservedKeywordAvroSchema).set("date", "2021-09-30").set("as", "foo").set("updatedAt", initialUpdatedAt.plusMillis(1000).toEpochMilli()).build()));
-        reservedKeywordRecordsBuilder.add(new ProducerRecord<>(RESERVED_KEYWORD_TABLE, "key1", new GenericRecordBuilder(reservedKeywordAvroSchema).set("date", "2021-10-01").set("as", "bar").set("updatedAt", initialUpdatedAt.plusMillis(2000).toEpochMilli()).build()));
-        kafka.sendMessages(reservedKeywordRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("reserved_keyword_schema.json"), RESERVED_KEYWORD_TABLE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("reserved_keyword_realtimeSpec.json"), RESERVED_KEYWORD_TABLE);
-    }
-
-    private void createAndPopulateHavingQuotesInColumnNames(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create a table having quotes in column names
-        kafka.createTopic(QUOTES_IN_COLUMN_NAME_TABLE);
-        Schema quotesInColumnNameAvroSchema = SchemaBuilder.record(QUOTES_IN_COLUMN_NAME_TABLE).fields()
-                .name("non_quoted").type().optional().stringType()
-                .name("updatedAt").type().optional().longType()
-                .endRecord();
-        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> quotesInColumnNameRecordsBuilder = ImmutableList.builder();
-        quotesInColumnNameRecordsBuilder.add(new ProducerRecord<>(QUOTES_IN_COLUMN_NAME_TABLE, "key0", new GenericRecordBuilder(quotesInColumnNameAvroSchema).set("non_quoted", "Foo").set("updatedAt", initialUpdatedAt.plusMillis(1000).toEpochMilli()).build()));
-        quotesInColumnNameRecordsBuilder.add(new ProducerRecord<>(QUOTES_IN_COLUMN_NAME_TABLE, "key1", new GenericRecordBuilder(quotesInColumnNameAvroSchema).set("non_quoted", "Bar").set("updatedAt", initialUpdatedAt.plusMillis(2000).toEpochMilli()).build()));
-        kafka.sendMessages(quotesInColumnNameRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("quotes_in_column_name_schema.json"), QUOTES_IN_COLUMN_NAME_TABLE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("quotes_in_column_name_realtimeSpec.json"), QUOTES_IN_COLUMN_NAME_TABLE);
-    }
-
-    private void createAndPopulateHavingMultipleColumnsWithDuplicateValues(TestingKafka kafka, TestingPinotCluster pinot)
-            throws Exception
-    {
-        // Create a table having multiple columns with duplicate values
-        kafka.createTopic(DUPLICATE_VALUES_IN_COLUMNS_TABLE);
-        Schema duplicateValuesInColumnsAvroSchema = SchemaBuilder.record(DUPLICATE_VALUES_IN_COLUMNS_TABLE).fields()
-                .name("dim_col").type().optional().longType()
-                .name("another_dim_col").type().optional().longType()
-                .name("string_col").type().optional().stringType()
-                .name("another_string_col").type().optional().stringType()
-                .name("metric_col1").type().optional().longType()
-                .name("metric_col2").type().optional().longType()
-                .name("updated_at").type().longType().noDefault()
-                .endRecord();
-
-        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> duplicateValuesInColumnsRecordsBuilder = ImmutableList.builder();
-        duplicateValuesInColumnsRecordsBuilder.add(new ProducerRecord<>(DUPLICATE_VALUES_IN_COLUMNS_TABLE, "key0", new GenericRecordBuilder(duplicateValuesInColumnsAvroSchema)
-                .set("dim_col", 1000L)
-                .set("another_dim_col", 1000L)
-                .set("string_col", "string1")
-                .set("another_string_col", "string1")
-                .set("metric_col1", 10L)
-                .set("metric_col2", 20L)
-                .set("updated_at", initialUpdatedAt.plusMillis(1000).toEpochMilli())
-                .build()));
-        duplicateValuesInColumnsRecordsBuilder.add(new ProducerRecord<>(DUPLICATE_VALUES_IN_COLUMNS_TABLE, "key1", new GenericRecordBuilder(duplicateValuesInColumnsAvroSchema)
-                .set("dim_col", 2000L)
-                .set("another_dim_col", 2000L)
-                .set("string_col", "string1")
-                .set("another_string_col", "string1")
-                .set("metric_col1", 100L)
-                .set("metric_col2", 200L)
-                .set("updated_at", initialUpdatedAt.plusMillis(2000).toEpochMilli())
-                .build()));
-        duplicateValuesInColumnsRecordsBuilder.add(new ProducerRecord<>(DUPLICATE_VALUES_IN_COLUMNS_TABLE, "key2", new GenericRecordBuilder(duplicateValuesInColumnsAvroSchema)
-                .set("dim_col", 3000L)
-                .set("another_dim_col", 3000L)
-                .set("string_col", "string1")
-                .set("another_string_col", "another_string1")
-                .set("metric_col1", 1000L)
-                .set("metric_col2", 2000L)
-                .set("updated_at", initialUpdatedAt.plusMillis(3000).toEpochMilli())
-                .build()));
-        duplicateValuesInColumnsRecordsBuilder.add(new ProducerRecord<>(DUPLICATE_VALUES_IN_COLUMNS_TABLE, "key1", new GenericRecordBuilder(duplicateValuesInColumnsAvroSchema)
-                .set("dim_col", 4000L)
-                .set("another_dim_col", 4000L)
-                .set("string_col", "string2")
-                .set("another_string_col", "another_string2")
-                .set("metric_col1", 100L)
-                .set("metric_col2", 200L)
-                .set("updated_at", initialUpdatedAt.plusMillis(4000).toEpochMilli())
-                .build()));
-        duplicateValuesInColumnsRecordsBuilder.add(new ProducerRecord<>(DUPLICATE_VALUES_IN_COLUMNS_TABLE, "key2", new GenericRecordBuilder(duplicateValuesInColumnsAvroSchema)
-                .set("dim_col", 4000L)
-                .set("another_dim_col", 4001L)
-                .set("string_col", "string2")
-                .set("another_string_col", "string2")
-                .set("metric_col1", 1000L)
-                .set("metric_col2", 2000L)
-                .set("updated_at", initialUpdatedAt.plusMillis(5000).toEpochMilli())
-                .build()));
-
-        kafka.sendMessages(duplicateValuesInColumnsRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("duplicate_values_in_columns_schema.json"), DUPLICATE_VALUES_IN_COLUMNS_TABLE);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("duplicate_values_in_columns_realtimeSpec.json"), DUPLICATE_VALUES_IN_COLUMNS_TABLE);
-    }
-
-    private void createAndPopulateNationAndRegionData(TestingKafka kafka, TestingPinotCluster pinot, DistributedQueryRunner queryRunner)
-            throws Exception
-    {
-        // Create and populate table and topic data
-        String regionTableName = "region";
-        kafka.createTopicWithConfig(2, 1, regionTableName, false);
-        Schema regionSchema = SchemaBuilder.record(regionTableName).fields()
-                // regionkey bigint, name varchar, comment varchar
-                .name("regionkey").type().longType().noDefault()
-                .name("name").type().stringType().noDefault()
-                .name("comment").type().stringType().noDefault()
-                .name("updated_at_seconds").type().longType().noDefault()
-                .endRecord();
-        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> regionRowsBuilder = ImmutableList.builder();
-        MaterializedResult regionRows = queryRunner.execute("SELECT * FROM tpch.tiny.region");
-        for (MaterializedRow row : regionRows.getMaterializedRows()) {
-            regionRowsBuilder.add(new ProducerRecord<>(regionTableName, "key" + row.getField(0), new GenericRecordBuilder(regionSchema)
-                    .set("regionkey", row.getField(0))
-                    .set("name", row.getField(1))
-                    .set("comment", row.getField(2))
-                    .set("updated_at_seconds", initialUpdatedAt.plusMillis(1000).toEpochMilli())
-                    .build()));
-        }
-        kafka.sendMessages(regionRowsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("region_schema.json"), regionTableName);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("region_realtimeSpec.json"), regionTableName);
-
-        String nationTableName = "nation";
-        kafka.createTopicWithConfig(2, 1, nationTableName, false);
-        Schema nationSchema = SchemaBuilder.record(nationTableName).fields()
-                // nationkey BIGINT, name VARCHAR,  VARCHAR, regionkey BIGINT
-                .name("nationkey").type().longType().noDefault()
-                .name("name").type().stringType().noDefault()
-                .name("comment").type().stringType().noDefault()
-                .name("regionkey").type().longType().noDefault()
-                .name("updated_at_seconds").type().longType().noDefault()
-                .endRecord();
-        ImmutableList.Builder<ProducerRecord<String, GenericRecord>> nationRowsBuilder = ImmutableList.builder();
-        MaterializedResult nationRows = queryRunner.execute("SELECT * FROM tpch.tiny.nation");
-        for (MaterializedRow row : nationRows.getMaterializedRows()) {
-            nationRowsBuilder.add(new ProducerRecord<>(nationTableName, "key" + row.getField(0), new GenericRecordBuilder(nationSchema)
-                    .set("nationkey", row.getField(0))
-                    .set("name", row.getField(1))
-                    .set("comment", row.getField(3))
-                    .set("regionkey", row.getField(2))
-                    .set("updated_at_seconds", initialUpdatedAt.plusMillis(1000).toEpochMilli())
-                    .build()));
-        }
-        kafka.sendMessages(nationRowsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
-        pinot.createSchema(getClass().getClassLoader().getResourceAsStream("nation_schema.json"), nationTableName);
-        pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("nation_realtimeSpec.json"), nationTableName);
-    }
-
-    @SuppressWarnings("DuplicateBranchesInSwitch")
-    @Override
-    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
-    {
-        return switch (connectorBehavior) {
-            case SUPPORTS_CREATE_SCHEMA -> false;
-
-            case SUPPORTS_CREATE_TABLE, SUPPORTS_RENAME_TABLE -> false;
-
-            case SUPPORTS_INSERT -> false;
-
-            default -> super.hasBehavior(connectorBehavior);
-        };
-    }
-
-    private Map<String, String> pinotProperties(TestingPinotCluster pinot)
-    {
-        return ImmutableMap.<String, String>builder()
-                .put("pinot.controller-urls", pinot.getControllerConnectString())
-                .put("pinot.max-rows-per-split-for-segment-queries", String.valueOf(MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
-                .put("pinot.max-rows-for-broker-queries", String.valueOf(MAX_ROWS_PER_SPLIT_FOR_BROKER_QUERIES))
-                .putAll(additionalPinotProperties())
-                .buildOrThrow();
-    }
-
-    protected Map<String, String> additionalPinotProperties()
-    {
-        if (isGrpcEnabled()) {
-            return ImmutableMap.of("pinot.grpc.enabled", "true");
-        }
-        return ImmutableMap.of();
-    }
-
-    private static Path createSegment(InputStream tableConfigInputStream, InputStream pinotSchemaInputStream, RecordReader recordReader, String outputDirectory, int sequenceId)
-    {
-        try {
-            org.apache.pinot.spi.data.Schema pinotSchema = org.apache.pinot.spi.data.Schema.fromInputStream(pinotSchemaInputStream);
-            TableConfig tableConfig = inputStreamToObject(tableConfigInputStream, TableConfig.class);
-            String tableName = TableNameBuilder.extractRawTableName(tableConfig.getTableName());
-            String timeColumnName = tableConfig.getValidationConfig().getTimeColumnName();
-            String segmentTempLocation = String.join(File.separator, outputDirectory, tableName, "segments");
-            Files.createDirectories(Paths.get(outputDirectory));
-            SegmentGeneratorConfig segmentGeneratorConfig = new SegmentGeneratorConfig(tableConfig, pinotSchema);
-            segmentGeneratorConfig.setTableName(tableName);
-            segmentGeneratorConfig.setOutDir(segmentTempLocation);
-            if (timeColumnName != null) {
-                DateTimeFormatSpec formatSpec = new DateTimeFormatSpec(pinotSchema.getDateTimeSpec(timeColumnName).getFormat());
-                segmentGeneratorConfig.setSegmentNameGenerator(new NormalizedDateSegmentNameGenerator(
-                        tableName,
-                        null,
-                        false,
-                        tableConfig.getValidationConfig().getSegmentPushType(),
-                        tableConfig.getValidationConfig().getSegmentPushFrequency(),
-                        formatSpec,
-                        null));
-            }
-            else {
-                checkState(tableConfig.isDimTable(), "Null time column only allowed for dimension tables");
-            }
-            segmentGeneratorConfig.setSequenceId(sequenceId);
-            SegmentCreationDataSource dataSource = new RecordReaderSegmentCreationDataSource(recordReader);
-            RecordTransformer recordTransformer = genericRow -> {
-                GenericRow record = null;
-                try {
-                    record = CompositeTransformer.getDefaultTransformer(tableConfig, pinotSchema).transform(genericRow);
-                }
-                catch (Exception e) {
-                    // ignored
-                    record = null;
-                }
-                return record;
-            };
-            SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
-            driver.init(segmentGeneratorConfig, dataSource, recordTransformer, null);
-            driver.build();
-            File segmentOutputDirectory = driver.getOutputDirectory();
-            File tgzPath = new File(String.join(File.separator, outputDirectory, segmentOutputDirectory.getName() + ".tar.gz"));
-            TarGzCompressionUtils.createTarGzFile(segmentOutputDirectory, tgzPath);
-            return Paths.get(tgzPath.getAbsolutePath());
-        }
-        catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static Map<String, String> schemaRegistryAwareProducer(TestingKafka testingKafka)
-    {
-        return ImmutableMap.<String, String>builder()
-                .put(SCHEMA_REGISTRY_URL_CONFIG, testingKafka.getSchemaRegistryConnectString())
-                .put(KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName())
-                .put(VALUE_SERIALIZER_CLASS_CONFIG, KafkaAvroSerializer.class.getName())
-                .buildOrThrow();
-    }
-
-    private static GenericRecord createTestRecord(
-            List<String> stringArrayColumn,
-            Boolean booleanColumn,
-            List<Integer> intArrayColumn,
-            List<Float> floatArrayColumn,
-            List<Double> doubleArrayColumn,
-            List<Long> longArrayColumn,
-            long timestampColumn,
-            long updatedAtMillis)
-    {
-        Schema schema = getAllTypesAvroSchema();
-
-        return new GenericRecordBuilder(schema)
-                .set("string_col", stringArrayColumn.get(0))
-                .set("bool_col", booleanColumn)
-                .set("bytes_col", Hex.toHexString(stringArrayColumn.get(0).getBytes(StandardCharsets.UTF_8)))
-                .set("string_array_col", stringArrayColumn)
-                .set("int_array_col", intArrayColumn)
-                .set("int_array_col_with_pinot_default", intArrayColumn)
-                .set("float_array_col", floatArrayColumn)
-                .set("double_array_col", doubleArrayColumn)
-                .set("long_array_col", longArrayColumn)
-                .set("timestamp_col", timestampColumn)
-                .set("int_col", intArrayColumn.get(0))
-                .set("float_col", floatArrayColumn.get(0))
-                .set("double_col", doubleArrayColumn.get(0))
-                .set("long_col", longArrayColumn.get(0))
-                .set("updated_at", updatedAtMillis)
-                .set("ts", updatedAtMillis)
-                .build();
-    }
-
-    private static GenericRecord createNullRecord()
-    {
-        Schema schema = getAllTypesAvroSchema();
-        // Pinot does not transform the time column value to default null value
-        return new GenericRecordBuilder(schema)
-                .set("updated_at", initialUpdatedAt.toEpochMilli())
-                .build();
-    }
-
-    private static GenericRecord createArrayNullRecord()
-    {
-        Schema schema = getAllTypesAvroSchema();
-        List<String> stringList = Arrays.asList("string_0", null, "string_2", null, "string_4");
-        List<Integer> integerList = new ArrayList<>();
-        integerList.addAll(Arrays.asList(null, null, null, null, null));
-        List<Integer> integerWithDefaultList = Arrays.asList(-1112, null, 753, null, -9238);
-        List<Float> floatList = new ArrayList<>();
-        floatList.add(null);
-        List<Integer> doubleList = new ArrayList<>();
-        doubleList.add(null);
-
-        return new GenericRecordBuilder(schema)
-                .set("string_col", "array_null")
-                .set("string_array_col", stringList)
-                .set("int_array_col", integerList)
-                .set("int_array_col_with_pinot_default", integerWithDefaultList)
-                .set("float_array_col", floatList)
-                .set("double_array_col", doubleList)
-                .set("long_array_col", new ArrayList<>())
-                .set("updated_at", initialUpdatedAt.toEpochMilli())
-                .build();
-    }
-
-    private static Schema getAllTypesAvroSchema()
-    {
-        // Note:
-        // The reason optional() is used is because the avro record can omit those fields.
-        // Fields with nullable type are required to be included or have a default value.
-        //
-        // For example:
-        // If "string_col" is set to type().nullable().stringType().noDefault()
-        // the following error is returned: Field string_col type:UNION pos:0 not set and has no default value
-
-        return SchemaBuilder.record("alltypes")
-                .fields()
-                .name("string_col").type().optional().stringType()
-                .name("bool_col").type().optional().booleanType()
-                .name("bytes_col").type().optional().stringType()
-                .name("string_array_col").type().optional().array().items().nullable().stringType()
-                .name("int_array_col").type().optional().array().items().nullable().intType()
-                .name("int_array_col_with_pinot_default").type().optional().array().items().nullable().intType()
-                .name("float_array_col").type().optional().array().items().nullable().floatType()
-                .name("double_array_col").type().optional().array().items().nullable().doubleType()
-                .name("long_array_col").type().optional().array().items().nullable().longType()
-                .name("timestamp_col").type().optional().longType()
-                .name("int_col").type().optional().intType()
-                .name("float_col").type().optional().floatType()
-                .name("double_col").type().optional().doubleType()
-                .name("long_col").type().optional().longType()
-                .name("updated_at").type().optional().longType()
-                .name("ts").type().optional().longType()
-                .endRecord();
-    }
-
-    private static class TestingJsonRecord
-    {
-        private final String vendor;
-        private final String city;
-        private final List<String> neighbors;
-        private final List<Integer> luckyNumbers;
-        private final List<Float> prices;
-        private final List<Double> unluckyNumbers;
-        private final List<Long> longNumbers;
-        private final Integer luckyNumber;
-        private final Float price;
-        private final Double unluckyNumber;
-        private final Long longNumber;
-        private final long updatedAt;
-
-        @JsonCreator
-        public TestingJsonRecord(
-                @JsonProperty("vendor") String vendor,
-                @JsonProperty("city") String city,
-                @JsonProperty("neighbors") List<String> neighbors,
-                @JsonProperty("lucky_numbers") List<Integer> luckyNumbers,
-                @JsonProperty("prices") List<Float> prices,
-                @JsonProperty("unlucky_numbers") List<Double> unluckyNumbers,
-                @JsonProperty("long_numbers") List<Long> longNumbers,
-                @JsonProperty("lucky_number") Integer luckyNumber,
-                @JsonProperty("price") Float price,
-                @JsonProperty("unlucky_number") Double unluckyNumber,
-                @JsonProperty("long_number") Long longNumber,
-                @JsonProperty("updatedAt") long updatedAt)
-        {
-            this.vendor = requireNonNull(vendor, "vendor is null");
-            this.city = requireNonNull(city, "city is null");
-            this.neighbors = requireNonNull(neighbors, "neighbors is null");
-            this.luckyNumbers = requireNonNull(luckyNumbers, "luckyNumbers is null");
-            this.prices = requireNonNull(prices, "prices is null");
-            this.unluckyNumbers = requireNonNull(unluckyNumbers, "unluckyNumbers is null");
-            this.longNumbers = requireNonNull(longNumbers, "longNumbers is null");
-            this.price = requireNonNull(price, "price is null");
-            this.luckyNumber = requireNonNull(luckyNumber, "luckyNumber is null");
-            this.unluckyNumber = requireNonNull(unluckyNumber, "unluckyNumber is null");
-            this.longNumber = requireNonNull(longNumber, "longNumber is null");
-            this.updatedAt = updatedAt;
-        }
-
-        @JsonProperty
-        public String getVendor()
-        {
-            return vendor;
-        }
-
-        @JsonProperty
-        public String getCity()
-        {
-            return city;
-        }
-
-        @JsonProperty
-        public List<String> getNeighbors()
-        {
-            return neighbors;
-        }
-
-        @JsonProperty("lucky_numbers")
-        public List<Integer> getLuckyNumbers()
-        {
-            return luckyNumbers;
-        }
-
-        @JsonProperty
-        public List<Float> getPrices()
-        {
-            return prices;
-        }
-
-        @JsonProperty("unlucky_numbers")
-        public List<Double> getUnluckyNumbers()
-        {
-            return unluckyNumbers;
-        }
-
-        @JsonProperty("long_numbers")
-        public List<Long> getLongNumbers()
-        {
-            return longNumbers;
-        }
-
-        @JsonProperty("lucky_number")
-        public Integer getLuckyNumber()
-        {
-            return luckyNumber;
-        }
-
-        @JsonProperty
-        public Float getPrice()
-        {
-            return price;
-        }
-
-        @JsonProperty("unlucky_number")
-        public Double getUnluckyNumber()
-        {
-            return unluckyNumber;
-        }
-
-        @JsonProperty("long_number")
-        public Long getLongNumber()
-        {
-            return longNumber;
-        }
-
-        @JsonProperty
-        public long getUpdatedAt()
-        {
-            return updatedAt;
-        }
-
-        public static Object of(
-                String vendor,
-                String city,
-                List<String> neighbors,
-                List<Integer> luckyNumbers,
-                List<Float> prices,
-                List<Double> unluckyNumbers,
-                List<Long> longNumbers,
-                long offset)
-        {
-            return new TestingJsonRecord(vendor, city, neighbors, luckyNumbers, prices, unluckyNumbers, longNumbers, luckyNumbers.get(0), prices.get(0), unluckyNumbers.get(0), longNumbers.get(0), Instant.now().plusMillis(offset).getEpochSecond());
-        }
-    }
-
-    @Override
-    public void testShowCreateTable()
-    {
-        assertThat((String) computeScalar("SHOW CREATE TABLE region"))
-                .isEqualTo(
-                        "CREATE TABLE %s.%s.region (\n" +
-                                "   regionkey bigint,\n" +
-                                "   updated_at_seconds bigint,\n" +
-                                "   name varchar,\n" +
-                                "   comment varchar\n" +
-                                ")",
-                        getSession().getCatalog().orElseThrow(),
-                        getSession().getSchema().orElseThrow());
-    }
-
-    @Override
-    public void testSelectInformationSchemaColumns()
-    {
-        // Override because there's updated_at_seconds column
-        assertThat(query("SELECT column_name FROM information_schema.columns WHERE table_schema = 'default' AND table_name = 'region'"))
-                .skippingTypesCheck()
-                .matches("VALUES 'regionkey', 'name', 'comment', 'updated_at_seconds'");
-    }
-
-    @Override
-    public void testTopN()
-    {
-        // TODO https://github.com/trinodb/trino/issues/14045 Fix ORDER BY ... LIMIT query
-        assertQueryFails("SELECT regionkey FROM nation ORDER BY name LIMIT 3",
-                format("Segment query returned '%2$s' rows per split, maximum allowed is '%1$s' rows. with query \"SELECT \"regionkey\", \"name\" FROM nation_REALTIME  LIMIT 12\"", MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES, MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 1));
-    }
-
-    @Override
-    public void testJoin()
-    {
-        // TODO https://github.com/trinodb/trino/issues/14046 Fix JOIN query
-        assertQueryFails("SELECT n.name, r.name FROM nation n JOIN region r on n.regionkey = r.regionkey",
-                format("Segment query returned '%2$s' rows per split, maximum allowed is '%1$s' rows. with query \"SELECT \"regionkey\", \"name\" FROM nation_REALTIME  LIMIT 12\"", MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES, MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 1));
-    }
-
-    @Test
-    public void testRealType()
-    {
-        MaterializedResult result = computeActual("SELECT price FROM " + JSON_TABLE + " WHERE vendor = 'vendor1'");
-        assertEquals(getOnlyElement(result.getTypes()), REAL);
-        assertEquals(result.getOnlyValue(), 3.5F);
-    }
-
-    @Test
-    public void testIntegerType()
-    {
-        assertThat(query("SELECT lucky_number FROM " + JSON_TABLE + " WHERE vendor = 'vendor1'"))
-                .matches("VALUES (INTEGER '5')")
-                .isFullyPushedDown();
-    }
-
-    @Test
-    public void testBrokerColumnMappingForSelectQueries()
-    {
-        String expected = "VALUES" +
-                "  ('3.5', 'vendor1')," +
-                "  ('4.5', 'vendor2')," +
-                "  ('5.5', 'vendor3')," +
-                "  ('6.5', 'vendor4')," +
-                "  ('7.5', 'vendor5')," +
-                "  ('8.5', 'vendor6')";
-        assertQuery("SELECT price, vendor FROM \"SELECT price, vendor FROM " + JSON_TABLE + " WHERE vendor != 'vendor7'\"", expected);
-        assertQuery("SELECT price, vendor FROM \"SELECT * FROM " + JSON_TABLE + " WHERE vendor != 'vendor7'\"", expected);
-        assertQuery("SELECT price, vendor FROM \"SELECT vendor, lucky_numbers, price FROM " + JSON_TABLE + " WHERE vendor != 'vendor7'\"", expected);
-    }
-
-    @Test
-    public void testBrokerColumnMappingsForQueriesWithAggregates()
-    {
-        String passthroughQuery = "\"SELECT city, COUNT(*), MAX(price), SUM(lucky_number) " +
-                "  FROM " + JSON_TABLE +
-                "  WHERE vendor != 'vendor7'" +
-                "  GROUP BY city\"";
-        assertQuery("SELECT * FROM " + passthroughQuery, "VALUES" +
-                "  ('New York', 2, 6.5, 14)," +
-                "  ('Los Angeles', 4, 8.5, 31)");
-        assertQuery("SELECT \"max(price)\", city, \"sum(lucky_number)\", \"count(*)\" FROM " + passthroughQuery, "VALUES" +
-                "  (6.5, 'New York', 14, 2)," +
-                "  (8.5, 'Los Angeles', 31, 4)");
-        assertQuery("SELECT \"max(price)\", city, \"count(*)\" FROM " + passthroughQuery, "VALUES" +
-                "  (6.5, 'New York', 2)," +
-                "  (8.5, 'Los Angeles', 4)");
-    }
-
-    @Test
-    public void testBrokerColumnMappingsForArrays()
-    {
-        assertQuery("SELECT ARRAY_MIN(unlucky_numbers), ARRAY_MAX(long_numbers), ELEMENT_AT(neighbors, 2), ARRAY_MIN(lucky_numbers), ARRAY_MAX(prices)" +
-                        "  FROM \"SELECT unlucky_numbers, long_numbers, neighbors, lucky_numbers, prices" +
-                        "  FROM " + JSON_TABLE +
-                        "  WHERE vendor = 'vendor1'\"",
-                "VALUES (-3.7, 20000000, 'bar1', 5, 5.5)");
-        assertQuery("SELECT CARDINALITY(unlucky_numbers), CARDINALITY(long_numbers), CARDINALITY(neighbors), CARDINALITY(lucky_numbers), CARDINALITY(prices)" +
-                        "  FROM \"SELECT unlucky_numbers, long_numbers, neighbors, lucky_numbers, prices" +
-                        "  FROM " + JSON_TABLE +
-                        "  WHERE vendor = 'vendor1'\"",
-                "VALUES (3, 3, 3, 3, 2)");
-    }
-
-    @Test
-    public void testCountStarQueries()
-    {
-        assertQuery("SELECT COUNT(*) FROM \"SELECT * FROM " + JSON_TABLE + " WHERE vendor != 'vendor7'\"", "VALUES(6)");
-        assertQuery("SELECT COUNT(*) FROM " + JSON_TABLE + " WHERE vendor != 'vendor7'", "VALUES(6)");
-        assertQuery("SELECT \"count(*)\" FROM \"SELECT COUNT(*) FROM " + JSON_TABLE + " WHERE vendor != 'vendor7'\"", "VALUES(6)");
-    }
-
-    @Test
-    public void testBrokerQueriesWithAvg()
-    {
-        assertQuery("SELECT city, \"avg(lucky_number)\", \"avg(price)\", \"avg(long_number)\"" +
-                "  FROM \"SELECT city, AVG(price), AVG(lucky_number), AVG(long_number) FROM " + JSON_TABLE + " WHERE vendor != 'vendor7' GROUP BY city\"", "VALUES" +
-                "  ('New York', 7.0, 5.5, 10000.0)," +
-                "  ('Los Angeles', 7.75, 6.25, 10000.0)");
-        MaterializedResult result = computeActual("SELECT \"avg(lucky_number)\"" +
-                "  FROM \"SELECT AVG(lucky_number) FROM my_table WHERE vendor in ('vendor2', 'vendor4')\"");
-        assertEquals(getOnlyElement(result.getTypes()), DOUBLE);
-        assertEquals(result.getOnlyValue(), 7.0);
-    }
-
-    @Test
-    public void testNonLowerCaseColumnNames()
-    {
-        long rowCount = (long) computeScalar("SELECT COUNT(*) FROM " + MIXED_CASE_COLUMN_NAMES_TABLE);
-        List<String> rows = new ArrayList<>();
-        for (int i = 0; i < rowCount; i++) {
-            rows.add(format("('string_%s', '%s', '%s')", i, i, initialUpdatedAt.plusMillis(i * 1000).getEpochSecond()));
-        }
-        String mixedCaseColumnNamesTableValues = rows.stream().collect(joining(",", "VALUES ", ""));
-
-        // Test segment query all rows
-        assertQuery("SELECT stringcol, longcol, updatedatseconds" +
-                        "  FROM " + MIXED_CASE_COLUMN_NAMES_TABLE,
-                mixedCaseColumnNamesTableValues);
-
-        // Test broker query all rows
-        assertQuery("SELECT stringcol, longcol, updatedatseconds" +
-                        "  FROM  \"SELECT updatedatseconds, longcol, stringcol FROM " + MIXED_CASE_COLUMN_NAMES_TABLE + "\"",
-                mixedCaseColumnNamesTableValues);
-
-        String singleRowValues = "VALUES (VARCHAR 'string_3', BIGINT '3', BIGINT '" + initialUpdatedAt.plusMillis(3 * 1000).getEpochSecond() + "')";
-
-        // Test segment query single row
-        assertThat(query("SELECT stringcol, longcol, updatedatseconds" +
-                        "  FROM " + MIXED_CASE_COLUMN_NAMES_TABLE +
-                        "  WHERE longcol = 3"))
-                .matches(singleRowValues)
-                .isFullyPushedDown();
-
-        // Test broker query single row
-        assertThat(query("SELECT stringcol, longcol, updatedatseconds" +
-                        "  FROM  \"SELECT updatedatseconds, longcol, stringcol FROM " + MIXED_CASE_COLUMN_NAMES_TABLE +
-                        "\" WHERE longcol = 3"))
-                .matches(singleRowValues)
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT AVG(longcol), MIN(longcol), MAX(longcol), APPROX_DISTINCT(longcol), SUM(longcol)" +
-                "  FROM " + MIXED_CASE_COLUMN_NAMES_TABLE))
-                .matches("VALUES (DOUBLE '1.5', BIGINT '0', BIGINT '3', BIGINT '4', BIGINT '6')")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT stringcol, AVG(longcol), MIN(longcol), MAX(longcol), APPROX_DISTINCT(longcol), SUM(longcol)" +
-                "  FROM " + MIXED_CASE_COLUMN_NAMES_TABLE +
-                "  GROUP BY stringcol"))
-                .matches("VALUES (VARCHAR 'string_0', DOUBLE '0.0', BIGINT '0', BIGINT '0', BIGINT '1', BIGINT '0')," +
-                        "  (VARCHAR 'string_1', DOUBLE '1.0', BIGINT '1', BIGINT '1', BIGINT '1', BIGINT '1')," +
-                        "  (VARCHAR 'string_2', DOUBLE '2.0', BIGINT '2', BIGINT '2', BIGINT '1', BIGINT '2')," +
-                        "  (VARCHAR 'string_3', DOUBLE '3.0', BIGINT '3', BIGINT '3', BIGINT '1', BIGINT '3')")
-                .isFullyPushedDown();
-    }
-
-    @Test
-    public void testNonLowerTable()
-    {
-        long rowCount = (long) computeScalar("SELECT COUNT(*) FROM " + MIXED_CASE_TABLE_NAME);
-        List<String> rows = new ArrayList<>();
-        for (int i = 0; i < rowCount; i++) {
-            rows.add(format("('string_%s', '%s', '%s')", i, i, initialUpdatedAt.plusMillis(i * 1000).getEpochSecond()));
-        }
-
-        String mixedCaseColumnNamesTableValues = rows.stream().collect(joining(",", "VALUES ", ""));
-
-        // Test segment query all rows
-        assertQuery("SELECT stringcol, longcol, updatedatseconds" +
-                        "  FROM " + MIXED_CASE_TABLE_NAME,
-                mixedCaseColumnNamesTableValues);
-
-        // Test broker query all rows
-        assertQuery("SELECT stringcol, longcol, updatedatseconds" +
-                        "  FROM  \"SELECT updatedatseconds, longcol, stringcol FROM " + MIXED_CASE_TABLE_NAME + "\"",
-                mixedCaseColumnNamesTableValues);
-
-        String singleRowValues = "VALUES (VARCHAR 'string_3', BIGINT '3', BIGINT '" + initialUpdatedAt.plusMillis(3 * 1000).getEpochSecond() + "')";
-
-        // Test segment query single row
-        assertThat(query("SELECT stringcol, longcol, updatedatseconds" +
-                "  FROM " + MIXED_CASE_TABLE_NAME +
-                "  WHERE longcol = 3"))
-                .matches(singleRowValues)
-                .isFullyPushedDown();
-
-        // Test broker query single row
-        assertThat(query("SELECT stringcol, longcol, updatedatseconds" +
-                "  FROM  \"SELECT updatedatseconds, longcol, stringcol FROM " + MIXED_CASE_TABLE_NAME +
-                "\" WHERE longcol = 3"))
-                .matches(singleRowValues)
-                .isFullyPushedDown();
-
-        // Test information schema
-        assertQuery(
-                "SELECT column_name FROM information_schema.columns WHERE table_schema = 'default' AND table_name = 'mixedcase'",
-                "VALUES 'stringcol', 'updatedatseconds', 'longcol'");
-        assertQuery(
-                "SELECT column_name FROM information_schema.columns WHERE table_name = 'mixedcase'",
-                "VALUES 'stringcol', 'updatedatseconds', 'longcol'");
-        assertEquals(
-                computeActual("SHOW COLUMNS FROM default.mixedcase").getMaterializedRows().stream()
-                        .map(row -> row.getField(0))
-                        .collect(toImmutableSet()),
-                ImmutableSet.of("stringcol", "updatedatseconds", "longcol"));
-    }
-
-    @Test
-    public void testAmbiguousTables()
-    {
-        assertQueryFails("SELECT * FROM " + DUPLICATE_TABLE_LOWERCASE, "Ambiguous table names: (" + DUPLICATE_TABLE_LOWERCASE + ", " + DUPLICATE_TABLE_MIXED_CASE + "|" + DUPLICATE_TABLE_MIXED_CASE + ", " + DUPLICATE_TABLE_LOWERCASE + ")");
-        assertQueryFails("SELECT * FROM " + DUPLICATE_TABLE_MIXED_CASE, "Ambiguous table names: (" + DUPLICATE_TABLE_LOWERCASE + ", " + DUPLICATE_TABLE_MIXED_CASE + "|" + DUPLICATE_TABLE_MIXED_CASE + ", " + DUPLICATE_TABLE_LOWERCASE + ")");
-        assertQueryFails("SELECT * FROM \"SELECT * FROM " + DUPLICATE_TABLE_LOWERCASE + "\"", "Ambiguous table names: (" + DUPLICATE_TABLE_LOWERCASE + ", " + DUPLICATE_TABLE_MIXED_CASE + "|" + DUPLICATE_TABLE_MIXED_CASE + ", " + DUPLICATE_TABLE_LOWERCASE + ")");
-        assertQueryFails("SELECT * FROM \"SELECT * FROM " + DUPLICATE_TABLE_MIXED_CASE + "\"", "Ambiguous table names: (" + DUPLICATE_TABLE_LOWERCASE + ", " + DUPLICATE_TABLE_MIXED_CASE + "|" + DUPLICATE_TABLE_MIXED_CASE + ", " + DUPLICATE_TABLE_LOWERCASE + ")");
-        assertQueryFails("SELECT * FROM information_schema.columns", "Error listing table columns for catalog pinot: Ambiguous table names: (" + DUPLICATE_TABLE_LOWERCASE + ", " + DUPLICATE_TABLE_MIXED_CASE + "|" + DUPLICATE_TABLE_MIXED_CASE + ", " + DUPLICATE_TABLE_LOWERCASE + ")");
-    }
-
-    @Test
-    public void testReservedKeywordColumnNames()
-    {
-        assertQuery("SELECT date FROM " + RESERVED_KEYWORD_TABLE + " WHERE date = '2021-09-30'", "VALUES '2021-09-30'");
-        assertQuery("SELECT date FROM " + RESERVED_KEYWORD_TABLE + " WHERE date IN ('2021-09-30', '2021-10-01')", "VALUES '2021-09-30', '2021-10-01'");
-
-        assertThat(query("SELECT date FROM  \"SELECT \"\"date\"\" FROM " + RESERVED_KEYWORD_TABLE + "\""))
-                .matches("VALUES VARCHAR '2021-09-30', VARCHAR '2021-10-01'")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT date FROM  \"SELECT \"\"date\"\" FROM " + RESERVED_KEYWORD_TABLE + " WHERE \"\"date\"\" = '2021-09-30'\""))
-                .matches("VALUES VARCHAR '2021-09-30'")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT date FROM  \"SELECT \"\"date\"\" FROM " + RESERVED_KEYWORD_TABLE + " WHERE \"\"date\"\" IN ('2021-09-30', '2021-10-01')\""))
-                .matches("VALUES VARCHAR '2021-09-30', VARCHAR '2021-10-01'")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT date FROM  \"SELECT \"\"date\"\" FROM " + RESERVED_KEYWORD_TABLE + " ORDER BY \"\"date\"\"\""))
-                .matches("VALUES VARCHAR '2021-09-30', VARCHAR '2021-10-01'")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT date, \"count(*)\" FROM  \"SELECT \"\"date\"\", COUNT(*) FROM " + RESERVED_KEYWORD_TABLE + " GROUP BY \"\"date\"\"\""))
-                .matches("VALUES (VARCHAR '2021-09-30', BIGINT '1'), (VARCHAR '2021-10-01', BIGINT '1')")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT \"count(*)\" FROM  \"SELECT COUNT(*) FROM " + RESERVED_KEYWORD_TABLE + " ORDER BY COUNT(*)\""))
-                .matches("VALUES BIGINT '2'")
-                .isFullyPushedDown();
-
-        assertQuery("SELECT \"as\" FROM " + RESERVED_KEYWORD_TABLE + " WHERE \"as\" = 'foo'", "VALUES 'foo'");
-        assertQuery("SELECT \"as\" FROM " + RESERVED_KEYWORD_TABLE + " WHERE \"as\" IN ('foo', 'bar')", "VALUES 'foo', 'bar'");
-
-        assertThat(query("SELECT \"as\" FROM  \"SELECT \"\"as\"\" FROM " + RESERVED_KEYWORD_TABLE + "\""))
-                .matches("VALUES VARCHAR 'foo', VARCHAR 'bar'")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT \"as\" FROM  \"SELECT \"\"as\"\" FROM " + RESERVED_KEYWORD_TABLE + " WHERE \"\"as\"\" = 'foo'\""))
-                .matches("VALUES VARCHAR 'foo'")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT \"as\" FROM  \"SELECT \"\"as\"\" FROM " + RESERVED_KEYWORD_TABLE + " WHERE \"\"as\"\" IN ('foo', 'bar')\""))
-                .matches("VALUES VARCHAR 'foo', VARCHAR 'bar'")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT \"as\" FROM  \"SELECT \"\"as\"\" FROM " + RESERVED_KEYWORD_TABLE + " ORDER BY \"\"as\"\"\""))
-                .matches("VALUES VARCHAR 'foo', VARCHAR 'bar'")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT \"as\", \"count(*)\" FROM  \"SELECT \"\"as\"\", COUNT(*) FROM " + RESERVED_KEYWORD_TABLE + " GROUP BY \"\"as\"\"\""))
-                .matches("VALUES (VARCHAR 'foo', BIGINT '1'), (VARCHAR 'bar', BIGINT '1')")
-                .isFullyPushedDown();
-    }
-
-    @Test
-    public void testLimitForSegmentQueries()
-    {
-        // The connector will not allow segment queries to return more than MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES.
-        // This is not a pinot error, it is enforced by the connector to avoid stressing pinot servers.
-        assertQueryFails("SELECT string_col, updated_at_seconds FROM " + TOO_MANY_ROWS_TABLE,
-                format("Segment query returned '%2$s' rows per split, maximum allowed is '%1$s' rows. with query \"SELECT \"string_col\", \"updated_at_seconds\" FROM too_many_rows_REALTIME  LIMIT %2$s\"", MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES, MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 1));
-
-        // Verify the row count is greater than the max rows per segment limit
-        assertQuery("SELECT \"count(*)\" FROM \"SELECT COUNT(*) FROM " + TOO_MANY_ROWS_TABLE + "\"", format("VALUES(%s)", MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 1));
-    }
-
-    @Test
-    public void testBrokerQueryWithTooManyRowsForSegmentQuery()
-    {
-        // Note:
-        // This data does not include the null row inserted in createQueryRunner().
-        // This verifies that if the time column has a null value, pinot does not
-        // ingest the row from kafka.
-        List<String> tooManyRowsTableValues = new ArrayList<>();
-        for (int i = 0; i < MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 1; i++) {
-            tooManyRowsTableValues.add(format("('string_%s', '%s')", i, initialUpdatedAt.plusMillis(i * 1000).getEpochSecond()));
-        }
-
-        // Explicit limit is necessary otherwise pinot returns 10 rows.
-        // The limit is greater than the result size returned.
-        assertQuery("SELECT string_col, updated_at_seconds" +
-                        "  FROM  \"SELECT updated_at_seconds, string_col FROM " + TOO_MANY_ROWS_TABLE +
-                        "  LIMIT " + (MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + 2) + "\"",
-                tooManyRowsTableValues.stream().collect(joining(",", "VALUES ", "")));
-    }
-
-    @Test
-    public void testMaxLimitForPassthroughQueries()
-            throws InterruptedException
-    {
-        assertQueryFails("SELECT string_col, updated_at_seconds" +
-                        "  FROM  \"SELECT updated_at_seconds, string_col FROM " + TOO_MANY_BROKER_ROWS_TABLE +
-                        "  LIMIT " + (MAX_ROWS_PER_SPLIT_FOR_BROKER_QUERIES + 1) + "\"",
-                "Broker query returned '13' rows, maximum allowed is '12' rows. with query \"select \"updated_at_seconds\", \"string_col\" from too_many_broker_rows limit 13\"");
-
-        // Pinot issue preventing Integer.MAX_VALUE from being a limit: https://github.com/apache/incubator-pinot/issues/7110
-        // This is now resolved in pinot 0.8.0
-        assertQuerySucceeds("SELECT * FROM \"SELECT string_col, long_col FROM " + ALL_TYPES_TABLE + " LIMIT " + Integer.MAX_VALUE + "\"");
-
-        // Pinot broker requests do not handle limits greater than Integer.MAX_VALUE
-        // Note that -2147483648 is due to an integer overflow in Pinot: https://github.com/apache/pinot/issues/7242
-        assertQueryFails("SELECT * FROM \"SELECT string_col, long_col FROM " + ALL_TYPES_TABLE + " LIMIT " + ((long) Integer.MAX_VALUE + 1) + "\"",
-                "(?s)Query select \"string_col\", \"long_col\" from alltypes limit -2147483648 encountered exception .* with query \"select \"string_col\", \"long_col\" from alltypes limit -2147483648\"");
-
-        List<String> tooManyBrokerRowsTableValues = new ArrayList<>();
-        for (int i = 0; i < MAX_ROWS_PER_SPLIT_FOR_BROKER_QUERIES; i++) {
-            tooManyBrokerRowsTableValues.add(format("('string_%s', '%s')", i, initialUpdatedAt.plusMillis(i * 1000).getEpochSecond()));
-        }
-
-        // Explicit limit is necessary otherwise pinot returns 10 rows.
-        assertQuery("SELECT string_col, updated_at_seconds" +
-                        "  FROM  \"SELECT updated_at_seconds, string_col FROM " + TOO_MANY_BROKER_ROWS_TABLE +
-                        "  WHERE string_col != 'string_12'" +
-                        "  LIMIT " + MAX_ROWS_PER_SPLIT_FOR_BROKER_QUERIES + "\"",
-                tooManyBrokerRowsTableValues.stream().collect(joining(",", "VALUES ", "")));
-    }
-
-    @Test
-    public void testCount()
-    {
-        assertQuery("SELECT \"count(*)\" FROM \"SELECT COUNT(*) FROM " + ALL_TYPES_TABLE + "\"", "VALUES " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES);
-        // If no limit is supplied to a broker query, 10 arbitrary rows will be returned. Verify this behavior:
-        MaterializedResult result = computeActual("SELECT * FROM \"SELECT bool_col FROM " + ALL_TYPES_TABLE + "\"");
-        assertEquals(result.getRowCount(), DEFAULT_PINOT_LIMIT_FOR_BROKER_QUERIES);
-    }
-
-    @Test
-    public void testNullBehavior()
-    {
-        // Verify the null behavior of pinot:
-
-        // Default null value for timestamp single value columns is 0
-        assertThat(query("SELECT timestamp_col" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col = 'null'"))
-                .matches("VALUES(TIMESTAMP '1970-01-01 00:00:00.000')")
-                .isFullyPushedDown();
-
-        // Default null value for long single value columns is 0
-        assertThat(query("SELECT long_col" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'array_null'"))
-                .matches("VALUES(BIGINT '0')")
-                .isFullyPushedDown();
-
-        // Default null value for long array values is Long.MIN_VALUE,
-        assertThat(query("SELECT element_at(long_array_col, 1)" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'array_null'"))
-                .matches("VALUES(BIGINT '" + Long.MIN_VALUE + "')")
-                .isNotFullyPushedDown(ProjectNode.class);
-
-        // Default null value for int single value columns is 0
-        assertThat(query("SELECT int_col" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'null'"))
-                .matches("VALUES(INTEGER '0')")
-                .isFullyPushedDown();
-
-        // Default null value for int array values is Integer.MIN_VALUE,
-        assertThat(query("SELECT element_at(int_array_col, 1)" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'null'"))
-                .matches("VALUES(INTEGER '" + Integer.MIN_VALUE + "')")
-                .isNotFullyPushedDown(ProjectNode.class);
-
-        // Verify a null value for an array with all null values is a single element.
-        // The original value inserted from kafka is 5 null elements.
-        assertThat(query("SELECT element_at(int_array_col, 1)" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'array_null'"))
-                .matches("VALUES(INTEGER '" + Integer.MIN_VALUE + "')")
-                .isNotFullyPushedDown(ProjectNode.class);
-
-        // Verify default null value for array matches expected result
-        assertThat(query("SELECT element_at(int_array_col_with_pinot_default, 1)" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'null'"))
-                .matches("VALUES(INTEGER '7')")
-                .isNotFullyPushedDown(ProjectNode.class);
-
-        // Verify an array with null and non-null values omits the null values
-        assertThat(query("SELECT int_array_col_with_pinot_default" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'array_null'"))
-                .matches("VALUES(CAST(ARRAY[-1112, 753, -9238] AS ARRAY(INTEGER)))")
-                .isFullyPushedDown();
-
-        // Default null value for strings is the string 'null'
-        assertThat(query("SELECT string_col" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE bytes_col = X'' AND element_at(string_array_col, 1) = 'null'"))
-                .matches("VALUES (VARCHAR 'null')")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        // Default array null value for strings is the string 'null'
-        assertThat(query("SELECT element_at(string_array_col, 1)" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE bytes_col = X'' AND string_col = 'null'"))
-                .matches("VALUES (VARCHAR 'null')")
-                .isNotFullyPushedDown(ProjectNode.class);
-
-        // Default null value for booleans is the string 'null'
-        // Booleans are treated as a string
-        assertThat(query("SELECT bool_col" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'null'"))
-                .matches("VALUES (false)")
-                .isFullyPushedDown();
-
-        // Default null value for pinot BYTES type (varbinary) is the string 'null'
-        // BYTES values are treated as a strings
-        // BYTES arrays are not supported
-        assertThat(query("SELECT bytes_col" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'null'"))
-                .matches("VALUES (VARBINARY '')")
-                .isFullyPushedDown();
-
-        // Default null value for float single value columns is 0.0F
-        assertThat(query("SELECT float_col" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'array_null'"))
-                .matches("VALUES(REAL '0.0')")
-                .isFullyPushedDown();
-
-        // Default null value for float array values is -INFINITY,
-        assertThat(query("SELECT element_at(float_array_col, 1)" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'array_null'"))
-                .matches("VALUES(CAST(-POWER(0, -1) AS REAL))")
-                .isNotFullyPushedDown(ProjectNode.class);
-
-        // Default null value for double single value columns is 0.0D
-        assertThat(query("SELECT double_col" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'array_null'"))
-                .matches("VALUES(DOUBLE '0.0')")
-                .isFullyPushedDown();
-
-        // Default null value for double array values is -INFINITY,
-        assertThat(query("SELECT element_at(double_array_col, 1)" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'array_null'"))
-                .matches("VALUES(-POWER(0, -1))")
-                .isNotFullyPushedDown(ProjectNode.class);
-
-        // Null behavior for arrays:
-        // Default value for a "null" array is 1 element with default null array value,
-        // Values are tested above, this test is to verify pinot returns an array with 1 element.
-        assertThat(query("SELECT CARDINALITY(string_array_col)," +
-                        "  CARDINALITY(int_array_col_with_pinot_default)," +
-                        "  CARDINALITY(int_array_col)," +
-                        "  CARDINALITY(float_array_col)," +
-                        "  CARDINALITY(long_array_col)" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'null'"))
-                .matches("VALUES (BIGINT '1', BIGINT '1', BIGINT '1', BIGINT '1', BIGINT '1')")
-                .isNotFullyPushedDown(ProjectNode.class);
-
-        // If an array contains both null and non-null values, the null values are omitted:
-        // There are 5 values in the avro records, but only the 3 non-null values are in pinot
-        assertThat(query("SELECT CARDINALITY(string_array_col)," +
-                        "  CARDINALITY(int_array_col_with_pinot_default)," +
-                        "  CARDINALITY(int_array_col)," +
-                        "  CARDINALITY(float_array_col)," +
-                        "  CARDINALITY(long_array_col)" +
-                        "  FROM " + ALL_TYPES_TABLE +
-                        "  WHERE string_col = 'array_null'"))
-                .matches("VALUES (BIGINT '3', BIGINT '3', BIGINT '1', BIGINT '1', BIGINT '1')")
-                .isNotFullyPushedDown(ProjectNode.class);
-    }
-
-    @Test
-    public void testBrokerQueriesWithCaseStatementsInFilter()
-    {
-        // Need to invoke the UPPER function since identifiers are lower case
-        assertQuery("SELECT city, \"avg(lucky_number)\", \"avg(price)\", \"avg(long_number)\"" +
-                "  FROM \"SELECT city, AVG(price), AVG(lucky_number), AVG(long_number) FROM my_table WHERE " +
-                "  CASE WHEN city = CONCAT(CONCAT(UPPER('N'), 'ew ', ''), CONCAT(UPPER('Y'), 'ork', ''), '') THEN city WHEN city = CONCAT(CONCAT(UPPER('L'), 'os ', ''), CONCAT(UPPER('A'), 'ngeles', ''), '') THEN city ELSE 'gotham' END != 'gotham'" +
-                "  AND CASE WHEN vendor = 'vendor1' THEN 'vendor1' WHEN vendor = 'vendor2' THEN 'vendor2' ELSE vendor END != 'vendor7' GROUP BY city\"", "VALUES" +
-                "  ('New York', 7.0, 5.5, 10000.0)," +
-                "  ('Los Angeles', 7.75, 6.25, 10000.0)");
-    }
-
-    @Test
-    public void testFilterWithRealLiteral()
-    {
-        String expectedSingleValue = "VALUES (REAL '3.5', VARCHAR 'vendor1')";
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price = 3.5")).matches(expectedSingleValue).isFullyPushedDown();
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price <= 3.5")).matches(expectedSingleValue).isFullyPushedDown();
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price BETWEEN 3 AND 4")).matches(expectedSingleValue).isFullyPushedDown();
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price > 3 AND price < 4")).matches(expectedSingleValue).isFullyPushedDown();
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price >= 3.5 AND price <= 4")).matches(expectedSingleValue).isFullyPushedDown();
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price < 3.6")).matches(expectedSingleValue).isFullyPushedDown();
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price IN (3.5)")).matches(expectedSingleValue).isFullyPushedDown();
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price IN (3.5, 4)")).matches(expectedSingleValue).isFullyPushedDown();
-        // NOT IN is not pushed down
-        // TODO this currently fails; fix https://github.com/trinodb/trino/issues/9885 and restore: assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price NOT IN (4.5, 5.5, 6.5, 7.5, 8.5, 9.5)")).isNotFullyPushedDown(FilterNode.class);
-        assertThatThrownBy(() -> query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price NOT IN (4.5, 5.5, 6.5, 7.5, 8.5, 9.5)"))
-                .hasMessage("java.lang.IllegalStateException")
-                .hasStackTraceContaining("at com.google.common.base.Preconditions.checkState")
-                .hasStackTraceContaining("at io.trino.plugin.pinot.query.PinotQueryBuilder.toPredicate");
-
-        String expectedMultipleValues = "VALUES" +
-                "  (REAL '3.5', VARCHAR 'vendor1')," +
-                "  (REAL '4.5', VARCHAR 'vendor2')";
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price < 4.6")).matches(expectedMultipleValues).isFullyPushedDown();
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price BETWEEN 3.5 AND 4.5")).matches(expectedMultipleValues).isFullyPushedDown();
-
-        String expectedMaxValue = "VALUES (REAL '9.5', VARCHAR 'vendor7')";
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price > 9")).matches(expectedMaxValue).isFullyPushedDown();
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE price >= 9")).matches(expectedMaxValue).isFullyPushedDown();
-    }
-
-    @Test
-    public void testArrayFilter()
-    {
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE vendor != 'vendor7' AND prices = ARRAY[3.5, 5.5]"))
-                .matches("VALUES (REAL '3.5', VARCHAR 'vendor1')")
-                .isNotFullyPushedDown(FilterNode.class);
-
-        // Array filters are not pushed down, as there are no array literals in pinot
-        assertThat(query("SELECT price, vendor FROM " + JSON_TABLE + " WHERE prices = ARRAY[3.5, 5.5]")).isNotFullyPushedDown(FilterNode.class);
-    }
-
-    @Test
-    public void testLimitPushdown()
-    {
-        assertThat(query("SELECT string_col, long_col FROM " + "\"SELECT string_col, long_col, bool_col FROM " + ALL_TYPES_TABLE + " WHERE int_col > 0\" " +
-                "  WHERE bool_col = false LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
-                .isFullyPushedDown();
-        assertThat(query("SELECT string_col, long_col FROM " + ALL_TYPES_TABLE + "  WHERE int_col >0 AND bool_col = false LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
-                .isNotFullyPushedDown(LimitNode.class);
-    }
-
-    /**
-     * https://github.com/trinodb/trino/issues/8307
-     */
-    @Test
-    public void testInformationSchemaColumnsTableNotExist()
-    {
-        assertThat(query("SELECT * FROM pinot.information_schema.columns WHERE table_name = 'table_not_exist'"))
-                .returnsEmptyResult();
-    }
-
-    @Test
-    public void testAggregationPushdown()
-    {
-        // Without the limit inside the passthrough query, pinot will only return 10 rows
-        assertThat(query("SELECT COUNT(*) FROM \"SELECT * FROM " + ALL_TYPES_TABLE + " LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + "\""))
-                .isFullyPushedDown();
-
-        // Test aggregates with no grouping columns
-        assertThat(query("SELECT COUNT(*)," +
-                "  MIN(int_col), MAX(int_col)," +
-                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
-                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
-                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
-                "  MIN(timestamp_col), MAX(timestamp_col)" +
-                "  FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-
-        // Test aggregates with no grouping columns with a limit
-        assertThat(query("SELECT COUNT(*)," +
-                "  MIN(int_col), MAX(int_col)," +
-                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
-                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
-                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
-                "  MIN(timestamp_col), MAX(timestamp_col)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
-                .isFullyPushedDown();
-
-        // Test aggregates with no grouping columns with a filter
-        assertThat(query("SELECT COUNT(*)," +
-                "  MIN(int_col), MAX(int_col)," +
-                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
-                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
-                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
-                "  MIN(timestamp_col), MAX(timestamp_col)" +
-                "  FROM " + ALL_TYPES_TABLE + " WHERE long_col < 4147483649"))
-                .isFullyPushedDown();
-
-        // Test aggregates with no grouping columns with a filter and limit
-        assertThat(query("SELECT COUNT(*)," +
-                "  MIN(int_col), MAX(int_col)," +
-                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
-                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
-                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
-                "  MIN(timestamp_col), MAX(timestamp_col)" +
-                "  FROM " + ALL_TYPES_TABLE + " WHERE long_col < 4147483649" +
-                "  LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
-                .isFullyPushedDown();
-
-        // Test aggregates with one grouping column
-        assertThat(query("SELECT bool_col, COUNT(*)," +
-                "  MIN(int_col), MAX(int_col)," +
-                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
-                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
-                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
-                "  MIN(timestamp_col), MAX(timestamp_col)" +
-                "  FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isFullyPushedDown();
-
-        // Test aggregates with one grouping column and a limit
-        assertThat(query("SELECT string_col, COUNT(*)," +
-                "  MIN(int_col), MAX(int_col)," +
-                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
-                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
-                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
-                "  MIN(timestamp_col), MAX(timestamp_col)" +
-                "  FROM " + ALL_TYPES_TABLE + " GROUP BY string_col" +
-                "  LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
-                .isFullyPushedDown();
-
-        // Test aggregates with one grouping column and a filter
-        assertThat(query("SELECT bool_col, COUNT(*)," +
-                "  MIN(int_col), MAX(int_col)," +
-                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
-                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
-                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
-                "  MIN(timestamp_col), MAX(timestamp_col)" +
-                "  FROM " + ALL_TYPES_TABLE + " WHERE long_col < 4147483649 GROUP BY bool_col"))
-                .isFullyPushedDown();
-
-        // Test aggregates with one grouping column, a filter and a limit
-        assertThat(query("SELECT string_col, COUNT(*)," +
-                "  MIN(int_col), MAX(int_col)," +
-                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
-                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
-                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
-                "  MIN(timestamp_col), MAX(timestamp_col)" +
-                "  FROM " + ALL_TYPES_TABLE + " WHERE long_col < 4147483649 GROUP BY string_col" +
-                "  LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
-                .isFullyPushedDown();
-
-        // Test single row from pinot where filter results in an empty result set.
-        // A direct pinot query would return 1 row with default values, not null values.
-        assertThat(query("SELECT COUNT(*)," +
-                "  MIN(int_col), MAX(int_col)," +
-                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
-                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
-                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
-                "  MIN(timestamp_col), MAX(timestamp_col)" +
-                "  FROM " + ALL_TYPES_TABLE + " WHERE long_col > 4147483649"))
-                .isFullyPushedDown();
-
-        // Ensure that isNullOnEmptyGroup is handled correctly for passthrough queries as well
-        assertThat(query("SELECT \"count(*)\", \"distinctcounthll(string_col)\", \"distinctcount(string_col)\", \"sum(created_at_seconds)\", \"max(created_at_seconds)\"" +
-                "  FROM \"SELECT count(*), distinctcounthll(string_col), distinctcount(string_col), sum(created_at_seconds), max(created_at_seconds) FROM " + DATE_TIME_FIELDS_TABLE + " WHERE created_at_seconds = 0\""))
-                .matches("VALUES (BIGINT '0', BIGINT '0', INTEGER '0', CAST(NULL AS DOUBLE), CAST(NULL AS DOUBLE))")
-                .isFullyPushedDown();
-
-        // Test passthrough queries with no aggregates
-        assertThat(query("SELECT string_col, COUNT(*)," +
-                "  MIN(int_col), MAX(int_col)," +
-                "  MIN(long_col), MAX(long_col), AVG(long_col), SUM(long_col)," +
-                "  MIN(float_col), MAX(float_col), AVG(float_col), SUM(float_col)," +
-                "  MIN(double_col), MAX(double_col), AVG(double_col), SUM(double_col)," +
-                "  MIN(timestamp_col), MAX(timestamp_col)" +
-                "  FROM \"SELECT * FROM " + ALL_TYPES_TABLE + " WHERE long_col > 4147483649" +
-                "  LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES + "\"  GROUP BY string_col"))
-                .isFullyPushedDown();
-
-        // Passthrough queries with aggregates will not push down more aggregations.
-        assertThat(query("SELECT bool_col, \"count(*)\", COUNT(*) FROM \"SELECT bool_col, count(*) FROM " +
-                ALL_TYPES_TABLE + " GROUP BY bool_col\" GROUP BY bool_col, \"count(*)\""))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-
-        assertThat(query("SELECT bool_col, \"max(long_col)\", COUNT(*) FROM \"SELECT bool_col, max(long_col) FROM " +
-                ALL_TYPES_TABLE + " GROUP BY bool_col\" GROUP BY bool_col, \"max(long_col)\""))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-
-        assertThat(query("SELECT int_col, COUNT(*) FROM " + ALL_TYPES_TABLE + " GROUP BY int_col LIMIT " + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES))
-                .isFullyPushedDown();
-
-        // count(<column>) should not be pushed down, as pinot currently only implements count(*)
-        assertThat(query("SELECT bool_col, COUNT(long_col)" +
-                "  FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-
-        // AVG on INTEGER columns is not pushed down
-        assertThat(query("SELECT string_col, AVG(int_col) FROM " + ALL_TYPES_TABLE + " GROUP BY string_col"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-
-        // SUM on INTEGER columns is not pushed down
-        assertThat(query("SELECT string_col, SUM(int_col) FROM " + ALL_TYPES_TABLE + " GROUP BY string_col"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-
-        // MIN on VARCHAR columns is not pushed down
-        assertThat(query("SELECT bool_col, MIN(string_col)" +
-                "  FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-
-        // MAX on VARCHAR columns is not pushed down
-        assertThat(query("SELECT bool_col, MAX(string_col)" +
-                "  FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-
-        // COUNT on VARCHAR columns is not pushed down
-        assertThat(query("SELECT bool_col, COUNT(string_col)" +
-                "  FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-
-        // Distinct on varchar is pushed down
-        assertThat(query("SELECT DISTINCT string_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        // Distinct on bool is pushed down
-        assertThat(query("SELECT DISTINCT bool_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        // Distinct on double is pushed down
-        assertThat(query("SELECT DISTINCT double_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        // Distinct on float is pushed down
-        assertThat(query("SELECT DISTINCT float_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        // Distinct on long is pushed down
-        assertThat(query("SELECT DISTINCT long_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        // Distinct on timestamp is pushed down
-        assertThat(query("SELECT DISTINCT timestamp_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        // Distinct on int is partially pushed down
-        assertThat(query("SELECT DISTINCT int_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-
-        // Distinct on 2 columns for supported types:
-        assertThat(query("SELECT DISTINCT bool_col, string_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        assertThat(query("SELECT DISTINCT bool_col, double_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        assertThat(query("SELECT DISTINCT bool_col, float_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        assertThat(query("SELECT DISTINCT bool_col, long_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        assertThat(query("SELECT DISTINCT bool_col, timestamp_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        assertThat(query("SELECT DISTINCT bool_col, int_col FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-
-        // Test distinct for mixed case values
-        assertThat(query("SELECT DISTINCT string_col FROM " + MIXED_CASE_DISTINCT_TABLE))
-                .isFullyPushedDown();
-
-        // Test count distinct for mixed case values
-        assertThat(query("SELECT COUNT(DISTINCT string_col) FROM " + MIXED_CASE_DISTINCT_TABLE))
-                .isFullyPushedDown();
-
-        // Approx distinct for mixed case values
-        assertThat(query("SELECT approx_distinct(string_col) FROM " + MIXED_CASE_DISTINCT_TABLE))
-                .isFullyPushedDown();
-
-        // Approx distinct on varchar is pushed down
-        assertThat(query("SELECT approx_distinct(string_col) FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        // Approx distinct on bool is pushed down
-        assertThat(query("SELECT approx_distinct(bool_col) FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        // Approx distinct on double is pushed down
-        assertThat(query("SELECT approx_distinct(double_col) FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        // Approx distinct on float is pushed down
-        assertThat(query("SELECT approx_distinct(float_col) FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        // Approx distinct on long is pushed down
-        assertThat(query("SELECT approx_distinct(long_col) FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        // Approx distinct on int is partially pushed down
-        assertThat(query("SELECT approx_distinct(int_col) FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-
-        // Approx distinct on 2 columns for supported types:
-        assertThat(query("SELECT bool_col, approx_distinct(string_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isFullyPushedDown();
-        assertThat(query("SELECT bool_col, approx_distinct(double_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isFullyPushedDown();
-        assertThat(query("SELECT bool_col, approx_distinct(float_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isFullyPushedDown();
-        assertThat(query("SELECT bool_col, approx_distinct(long_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isFullyPushedDown();
-        assertThat(query("SELECT bool_col, approx_distinct(int_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isFullyPushedDown();
-
-        // Distinct count is fully pushed down by default
-        assertThat(query("SELECT bool_col, COUNT(DISTINCT string_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isFullyPushedDown();
-        assertThat(query("SELECT bool_col, COUNT(DISTINCT double_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isFullyPushedDown();
-        assertThat(query("SELECT bool_col, COUNT(DISTINCT float_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isFullyPushedDown();
-        assertThat(query("SELECT bool_col, COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isFullyPushedDown();
-        assertThat(query("SELECT bool_col, COUNT(DISTINCT int_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isFullyPushedDown();
-        // Test queries with no grouping columns
-        assertThat(query("SELECT COUNT(DISTINCT string_col) FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        assertThat(query("SELECT COUNT(DISTINCT bool_col) FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        assertThat(query("SELECT COUNT(DISTINCT double_col) FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        assertThat(query("SELECT COUNT(DISTINCT float_col) FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        assertThat(query("SELECT COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-        assertThat(query("SELECT COUNT(DISTINCT int_col) FROM " + ALL_TYPES_TABLE))
-                .isFullyPushedDown();
-
-        // Aggregation is not pushed down for queries with count distinct and other aggregations
-        assertThat(query("SELECT bool_col, MAX(long_col), COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class, ProjectNode.class);
-        assertThat(query("SELECT bool_col, COUNT(DISTINCT long_col), MAX(long_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class, ProjectNode.class);
-        assertThat(query("SELECT bool_col, COUNT(*), COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class, ProjectNode.class);
-        assertThat(query("SELECT bool_col, COUNT(DISTINCT long_col), COUNT(*) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class, ProjectNode.class);
-        // Test queries with no grouping columns
-        assertThat(query("SELECT MAX(long_col), COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE))
-                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class, ProjectNode.class);
-        assertThat(query("SELECT COUNT(DISTINCT long_col), MAX(long_col) FROM " + ALL_TYPES_TABLE))
-                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class, ProjectNode.class);
-        assertThat(query("SELECT COUNT(*), COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE))
-                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class, ProjectNode.class);
-        assertThat(query("SELECT COUNT(DISTINCT long_col), COUNT(*) FROM " + ALL_TYPES_TABLE))
-                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, MarkDistinctNode.class, ExchangeNode.class, ExchangeNode.class, ProjectNode.class);
-
-        Session countDistinctPushdownDisabledSession = Session.builder(getQueryRunner().getDefaultSession())
-                .setCatalogSessionProperty("pinot", "count_distinct_pushdown_enabled", "false")
-                .build();
-
-        // Distinct count is partially pushed down when the distinct_count_pushdown_enabled session property is disabled
-        assertThat(query(countDistinctPushdownDisabledSession, "SELECT bool_col, COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-        // Test query with no grouping columns
-        assertThat(query(countDistinctPushdownDisabledSession, "SELECT COUNT(DISTINCT long_col) FROM " + ALL_TYPES_TABLE))
-                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
-
-        // Ensure that count(<column name>) is not pushed down even when a broker query is present
-        // This is also done as the second step of count distinct but should not be pushed down in this case.
-        assertThat(query("SELECT COUNT(long_col) FROM \"SELECT long_col FROM " + ALL_TYPES_TABLE + "\""))
-                .isNotFullyPushedDown(AggregationNode.class);
-
-        // Ensure that count(<column name>) is not pushed down even when a broker query is present and has grouping columns
-        // This is also done as the second step of count distinct but should not be pushed down in this case.
-        assertThat(query("SELECT bool_col, COUNT(long_col) FROM \"SELECT bool_col, long_col FROM " + ALL_TYPES_TABLE + "\" GROUP BY bool_col"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-
-        // Ensure that count(<column name>) is not pushed down even if the query contains a matching grouping column
-        assertThatExceptionOfType(RuntimeException.class)
-                .isThrownBy(() -> query("SELECT COUNT(long_col) FROM \"SELECT long_col FROM " + ALL_TYPES_TABLE + " GROUP BY long_col\""))
-                .withRootCauseInstanceOf(RuntimeException.class)
-                .withMessage("Operation not supported for DISTINCT aggregation function");
-
-        // Ensure that count(<column name>) with grouping columns is not pushed down even if the query contains a matching grouping column
-        assertThatExceptionOfType(RuntimeException.class)
-                .isThrownBy(() -> query("SELECT bool_col, COUNT(long_col) FROM \"SELECT bool_col, long_col FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col, long_col\""))
-                .withRootCauseInstanceOf(RuntimeException.class)
-                .withMessage("Operation not supported for DISTINCT aggregation function");
-    }
-
-    @Test
-    public void testInClause()
-    {
-        assertThat(query("SELECT string_col, sum(long_col)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col IN ('string_1200','string_2400','string_3600')" +
-                "  GROUP BY string_col"))
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT string_col, sum(long_col)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col NOT IN ('string_1200','string_2400','string_3600')" +
-                "  GROUP BY string_col"))
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT int_col, sum(long_col)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE int_col IN (54, 56)" +
-                "  GROUP BY int_col"))
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT int_col, sum(long_col)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE int_col NOT IN (54, 56)" +
-                "  GROUP BY int_col"))
-                .isFullyPushedDown();
-    }
-
-    @Test
-    public void testVarbinaryFilters()
-    {
-        assertThat(query("SELECT string_col" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE bytes_col = X''"))
-                .matches("VALUES (VARCHAR 'null'), (VARCHAR 'array_null')")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT string_col" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE bytes_col != X''"))
-                .matches("VALUES (VARCHAR 'string_0')," +
-                        "  (VARCHAR 'string_1200')," +
-                        "  (VARCHAR 'string_2400')," +
-                        "  (VARCHAR 'string_3600')," +
-                        "  (VARCHAR 'string_4800')," +
-                        "  (VARCHAR 'string_6000')," +
-                        "  (VARCHAR 'string_7200')," +
-                        "  (VARCHAR 'string_8400')," +
-                        "  (VARCHAR 'string_9600')")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT string_col" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE bytes_col = X'73 74 72 69 6e 67 5f 30'"))
-                .matches("VALUES (VARCHAR 'string_0')")
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT string_col" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE bytes_col != X'73 74 72 69 6e 67 5f 30'"))
-                .matches("VALUES (VARCHAR 'null')," +
-                        "  (VARCHAR 'array_null')," +
-                        "  (VARCHAR 'string_1200')," +
-                        "  (VARCHAR 'string_2400')," +
-                        "  (VARCHAR 'string_3600')," +
-                        "  (VARCHAR 'string_4800')," +
-                        "  (VARCHAR 'string_6000')," +
-                        "  (VARCHAR 'string_7200')," +
-                        "  (VARCHAR 'string_8400')," +
-                        "  (VARCHAR 'string_9600')")
-                .isFullyPushedDown();
-    }
-
-    @Test
-    public void testRealWithInfinity()
-    {
-        assertThat(query("SELECT element_at(float_array_col, 1)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE bytes_col = X''"))
-                .matches("VALUES  (CAST(-POWER(0, -1) AS REAL))," +
-                        "  (CAST(-POWER(0, -1) AS REAL))");
-
-        assertThat(query("SELECT element_at(float_array_col, 1) FROM \"SELECT float_array_col" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE bytes_col = '' \""))
-                .matches("VALUES  (CAST(-POWER(0, -1) AS REAL))," +
-                        "  (CAST(-POWER(0, -1) AS REAL))");
-
-        assertThat(query("SELECT element_at(float_array_col, 2)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col = 'string_0'"))
-                .matches("VALUES (CAST(POWER(0, -1) AS REAL))");
-
-        assertThat(query("SELECT element_at(float_array_col, 2) FROM \"SELECT float_array_col" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col = 'string_0'\""))
-                .matches("VALUES (CAST(POWER(0, -1) AS REAL))");
-    }
-
-    @Test
-    public void testDoubleWithInfinity()
-    {
-        assertThat(query("SELECT element_at(double_array_col, 1)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE bytes_col = X''"))
-                .matches("VALUES  (-POWER(0, -1))," +
-                        "  (-POWER(0, -1))");
-
-        assertThat(query("SELECT element_at(double_array_col, 1) FROM \"SELECT double_array_col" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE bytes_col = '' \""))
-                .matches("VALUES  (-POWER(0, -1))," +
-                        "  (-POWER(0, -1))");
-
-        assertThat(query("SELECT element_at(double_array_col, 2)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col = 'string_0'"))
-                .matches("VALUES (POWER(0, -1))");
-
-        assertThat(query("SELECT element_at(double_array_col, 2) FROM \"SELECT double_array_col" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col = 'string_0'\""))
-                .matches("VALUES (POWER(0, -1))");
-    }
-
-    @Test
-    public void testTransformFunctions()
-    {
-        // Test that time units and formats are correctly uppercased.
-        // The dynamic table, i.e. the query between the quotes, will be lowercased since it is passed as a SchemaTableName.
-        assertThat(query("SELECT hours_col, hours_col2 FROM \"SELECT timeconvert(created_at_seconds, 'SECONDS', 'HOURS') as hours_col," +
-                "  CAST(FLOOR(created_at_seconds / 3600) as long) as hours_col2 from " + DATE_TIME_FIELDS_TABLE + "\""))
-                .matches("VALUES (BIGINT '450168', BIGINT '450168')," +
-                        "  (BIGINT '450168', BIGINT '450168')," +
-                        "  (BIGINT '450168', BIGINT '450168')");
-        assertThat(query("SELECT \"datetimeconvert(created_at_seconds,'1:seconds:epoch','1:days:epoch','1:days')\" FROM \"SELECT datetimeconvert(created_at_seconds, '1:SECONDS:EPOCH', '1:DAYS:EPOCH', '1:DAYS')" +
-                " FROM " + DATE_TIME_FIELDS_TABLE + "\""))
-                .matches("VALUES (BIGINT '18757'), (BIGINT '18757'), (BIGINT '18757')");
-        // Multiple forms of datetrunc from 2-5 arguments
-        assertThat(query("SELECT \"datetrunc('hour',created_at)\" FROM \"SELECT datetrunc('hour', created_at)" +
-                " FROM " + DATE_TIME_FIELDS_TABLE + "\""))
-                .matches("VALUES (BIGINT '1620604800000'), (BIGINT '1620604800000'), (BIGINT '1620604800000')");
-        assertThat(query("SELECT \"datetrunc('hour',created_at_seconds,'seconds')\" FROM \"SELECT datetrunc('hour', created_at_seconds, 'SECONDS')" +
-                " FROM " + DATE_TIME_FIELDS_TABLE + "\""))
-                .matches("VALUES (BIGINT '1620604800'), (BIGINT '1620604800'), (BIGINT '1620604800')");
-        assertThat(query("SELECT \"datetrunc('hour',created_at_seconds,'seconds','utc')\" FROM \"SELECT datetrunc('hour', created_at_seconds, 'SECONDS', 'UTC')" +
-                " FROM " + DATE_TIME_FIELDS_TABLE + "\""))
-                .matches("VALUES (BIGINT '1620604800'), (BIGINT '1620604800'), (BIGINT '1620604800')");
-
-        assertThat(query("SELECT \"datetrunc('quarter',created_at_seconds,'seconds','america/los_angeles','hours')\" FROM \"SELECT datetrunc('quarter', created_at_seconds, 'SECONDS', 'America/Los_Angeles', 'HOURS')" +
-                " FROM " + DATE_TIME_FIELDS_TABLE + "\""))
-                .matches("VALUES (BIGINT '449239'), (BIGINT '449239'), (BIGINT '449239')");
-        assertThat(query("SELECT \"arraylength(double_array_col)\" FROM " +
-                "\"SELECT arraylength(double_array_col)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col in ('string_0', 'array_null')\""))
-                .matches("VALUES (3), (1)");
-
-        assertThat(query("SELECT \"cast(floor(arrayaverage(long_array_col)),'long')\" FROM " +
-                "\"SELECT cast(floor(arrayaverage(long_array_col)) as long)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE double_array_col is not null and double_col != -17.33\""))
-                .matches("VALUES (BIGINT '333333337')," +
-                        "  (BIGINT '333333338')," +
-                        "  (BIGINT '333333338')," +
-                        "  (BIGINT '333333338')," +
-                        "  (BIGINT '333333339')," +
-                        "  (BIGINT '333333339')," +
-                        "  (BIGINT '333333339')," +
-                        "  (BIGINT '333333340')");
-
-        assertThat(query("SELECT \"arraymax(long_array_col)\" FROM " +
-                "\"SELECT arraymax(long_array_col)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col is not null and string_col != 'array_null'\""))
-                .matches("VALUES (BIGINT '4147483647')," +
-                        "  (BIGINT '4147483648')," +
-                        "  (BIGINT '4147483649')," +
-                        "  (BIGINT '4147483650')," +
-                        "  (BIGINT '4147483651')," +
-                        "  (BIGINT '4147483652')," +
-                        "  (BIGINT '4147483653')," +
-                        "  (BIGINT '4147483654')," +
-                        "  (BIGINT '4147483655')");
-
-        assertThat(query("SELECT \"arraymin(long_array_col)\" FROM " +
-                "\"SELECT arraymin(long_array_col)" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col is not null and string_col != 'array_null'\""))
-                .matches("VALUES (BIGINT '-3147483647')," +
-                        "  (BIGINT '-3147483646')," +
-                        "  (BIGINT '-3147483645')," +
-                        "  (BIGINT '-3147483644')," +
-                        "  (BIGINT '-3147483643')," +
-                        "  (BIGINT '-3147483642')," +
-                        "  (BIGINT '-3147483641')," +
-                        "  (BIGINT '-3147483640')," +
-                        "  (BIGINT '-3147483639')");
-    }
-
-    @Test
-    public void testPassthroughQueriesWithAliases()
-    {
-        assertThat(query("SELECT hours_col, hours_col2 FROM " +
-                "\"SELECT timeconvert(created_at_seconds, 'SECONDS', 'HOURS') AS hours_col," +
-                "  CAST(FLOOR(created_at_seconds / 3600) as long) as hours_col2" +
-                "  FROM " + DATE_TIME_FIELDS_TABLE + "\""))
-                .matches("VALUES (BIGINT '450168', BIGINT '450168'), (BIGINT '450168', BIGINT '450168'), (BIGINT '450168', BIGINT '450168')");
-
-        // Test without aliases to verify fieldName is correctly handled
-        assertThat(query("SELECT \"timeconvert(created_at_seconds,'seconds','hours')\"," +
-                " \"cast(floor(divide(created_at_seconds,'3600')),'long')\" FROM " +
-                "\"SELECT timeconvert(created_at_seconds, 'SECONDS', 'HOURS')," +
-                "  CAST(FLOOR(created_at_seconds / 3600) as long)" +
-                "  FROM " + DATE_TIME_FIELDS_TABLE + "\""))
-                .matches("VALUES (BIGINT '450168', BIGINT '450168'), (BIGINT '450168', BIGINT '450168'), (BIGINT '450168', BIGINT '450168')");
-
-        assertThat(query("SELECT int_col2, long_col2 FROM " +
-                "\"SELECT int_col AS int_col2, long_col AS long_col2" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col IS NOT null AND string_col != 'array_null'\""))
-                .matches("VALUES (54, BIGINT '-3147483647')," +
-                        "  (54, BIGINT '-3147483646')," +
-                        "  (54, BIGINT '-3147483645')," +
-                        "  (55, BIGINT '-3147483644')," +
-                        "  (55, BIGINT '-3147483643')," +
-                        "  (55, BIGINT '-3147483642')," +
-                        "  (56, BIGINT '-3147483641')," +
-                        "  (56, BIGINT '-3147483640')," +
-                        "  (56, BIGINT '-3147483639')");
-
-        assertThat(query("SELECT int_col2, long_col2 FROM " +
-                "\"SELECT int_col AS int_col2, long_col AS long_col2 " +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col IS NOT null AND string_col != 'array_null'\""))
-                .matches("VALUES (54, BIGINT '-3147483647')," +
-                        "  (54, BIGINT '-3147483646')," +
-                        "  (54, BIGINT '-3147483645')," +
-                        "  (55, BIGINT '-3147483644')," +
-                        "  (55, BIGINT '-3147483643')," +
-                        "  (55, BIGINT '-3147483642')," +
-                        "  (56, BIGINT '-3147483641')," +
-                        "  (56, BIGINT '-3147483640')," +
-                        "  (56, BIGINT '-3147483639')");
-
-        assertQuerySucceeds("SELECT int_col FROM " +
-                "\"SELECT floor(int_col / 3) AS int_col" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col IS NOT null AND string_col != 'array_null'\"");
-    }
-
-    @Test
-    public void testPassthroughQueriesWithPushdowns()
-    {
-        assertThat(query("SELECT DISTINCT \"timeconvert(created_at_seconds,'seconds','hours')\"," +
-                "  \"cast(floor(divide(created_at_seconds,'3600')),'long')\" FROM " +
-                "\"SELECT timeconvert(created_at_seconds, 'SECONDS', 'HOURS')," +
-                "  CAST(FLOOR(created_at_seconds / 3600) AS long)" +
-                "  FROM " + DATE_TIME_FIELDS_TABLE + "\""))
-                .matches("VALUES (BIGINT '450168', BIGINT '450168')");
-
-        assertThat(query("SELECT DISTINCT \"timeconvert(created_at_seconds,'seconds','milliseconds')\"," +
-                "  \"cast(floor(divide(created_at_seco" +
-                "nds,'3600')),'long')\" FROM " +
-                "\"SELECT timeconvert(created_at_seconds, 'SECONDS', 'MILLISECONDS')," +
-                "  CAST(FLOOR(created_at_seconds / 3600) as long)" +
-                "  FROM " + DATE_TIME_FIELDS_TABLE + "\""))
-                .matches("VALUES (BIGINT '1620604802000', BIGINT '450168')," +
-                        "  (BIGINT '1620604801000', BIGINT '450168')," +
-                        "  (BIGINT '1620604800000', BIGINT '450168')");
-
-        assertThat(query("SELECT int_col, sum(long_col) FROM " +
-                "\"SELECT int_col, long_col" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col IS NOT null AND string_col != 'array_null'\"" +
-                "  GROUP BY int_col"))
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT DISTINCT int_col, long_col FROM " +
-                "\"SELECT int_col, long_col FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col IS NOT null AND string_col != 'array_null'\""))
-                .isFullyPushedDown();
-
-        assertThat(query("SELECT int_col2, long_col2, count(*) FROM " +
-                "\"SELECT int_col AS int_col2, long_col AS long_col2" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col IS NOT null AND string_col != 'array_null'\"" +
-                "  GROUP BY int_col2, long_col2"))
-                .isFullyPushedDown();
-
-        assertQuerySucceeds("SELECT DISTINCT int_col2, long_col2 FROM " +
-                "\"SELECT int_col AS int_col2, long_col AS long_col2" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col IS NOT null AND string_col != 'array_null'\"");
-        assertThat(query("SELECT int_col2, count(*) FROM " +
-                "\"SELECT int_col AS int_col2, long_col AS long_col2" +
-                "  FROM " + ALL_TYPES_TABLE +
-                "  WHERE string_col IS NOT null AND string_col != 'array_null'\"" +
-                "  GROUP BY int_col2"))
-                .isFullyPushedDown();
-    }
-
-    @Test
-    public void testColumnNamesWithDoubleQuotes()
-    {
-        assertThat(query("select \"double\"\"\"\"qu\"\"ot\"\"ed\"\"\" from quotes_in_column_name"))
-                .matches("VALUES (VARCHAR 'foo'), (VARCHAR 'bar')")
-                .isFullyPushedDown();
-
-        assertThat(query("select \"qu\"\"ot\"\"ed\" from quotes_in_column_name"))
-                .matches("VALUES (VARCHAR 'FOO'), (VARCHAR 'BAR')")
-                .isFullyPushedDown();
-
-        assertThat(query("select non_quoted from \"select \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" as non_quoted from quotes_in_column_name\""))
-                .matches("VALUES (VARCHAR 'FOO'), (VARCHAR 'BAR')")
-                .isFullyPushedDown();
-
-        assertThat(query("select \"qu\"\"ot\"\"ed\" from \"select non_quoted as \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\""))
-                .matches("VALUES (VARCHAR 'Foo'), (VARCHAR 'Bar')")
-                .isFullyPushedDown();
-
-        assertThat(query("select \"double\"\"\"\"qu\"\"ot\"\"ed\"\"\" from \"select \"\"double\"\"\"\"\"\"\"\"qu\"\"\"\"ot\"\"\"\"ed\"\"\"\"\"\" from quotes_in_column_name\""))
-                .matches("VALUES (VARCHAR 'foo'), (VARCHAR 'bar')")
-                .isFullyPushedDown();
-
-        assertThat(query("select \"qu\"\"oted\" from \"select \"\"double\"\"\"\"\"\"\"\"qu\"\"\"\"ot\"\"\"\"ed\"\"\"\"\"\" as \"\"qu\"\"\"\"oted\"\" from quotes_in_column_name\""))
-                .matches("VALUES (VARCHAR 'foo'), (VARCHAR 'bar')")
-                .isFullyPushedDown();
-
-        assertThat(query("select \"date\" from \"select \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" as \"\"date\"\" from quotes_in_column_name\""))
-                .matches("VALUES (VARCHAR 'FOO'), (VARCHAR 'BAR')")
-                .isFullyPushedDown();
-
-        assertThat(query("select \"date\" from \"select non_quoted as \"\"date\"\" from quotes_in_column_name\""))
-                .matches("VALUES (VARCHAR 'Foo'), (VARCHAR 'Bar')")
-                .isFullyPushedDown();
-
-        /// Test aggregations with double quoted columns
-        assertThat(query("select non_quoted, COUNT(DISTINCT \"date\") from \"select non_quoted, non_quoted as \"\"date\"\" from quotes_in_column_name\" GROUP BY non_quoted"))
-                .isFullyPushedDown();
-
-        assertThat(query("select non_quoted, COUNT(DISTINCT \"double\"\"\"\"qu\"\"ot\"\"ed\"\"\") from \"select non_quoted, \"\"double\"\"\"\"\"\"\"\"qu\"\"\"\"ot\"\"\"\"ed\"\"\"\"\"\" from quotes_in_column_name\" GROUP BY non_quoted"))
-                .isFullyPushedDown();
-
-        assertThat(query("select non_quoted, COUNT(DISTINCT  \"qu\"\"ot\"\"ed\") from \"select non_quoted, \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\" GROUP BY non_quoted"))
-                .isFullyPushedDown();
-
-        assertThat(query("select non_quoted, COUNT(DISTINCT  \"qu\"\"ot\"\"ed\") from \"select non_quoted, non_quoted as \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\" GROUP BY non_quoted"))
-                .isFullyPushedDown();
-
-        assertThat(query("select \"qu\"\"ot\"\"ed\", COUNT(DISTINCT \"date\") from \"select \"\"qu\"\"\"\"ot\"\"\"\"ed\"\", non_quoted as \"\"date\"\" from quotes_in_column_name\" GROUP BY \"qu\"\"ot\"\"ed\""))
-                .isFullyPushedDown();
-
-        assertThat(query("select \"qu\"\"ot\"\"ed\", COUNT(DISTINCT \"double\"\"\"\"qu\"\"ot\"\"ed\"\"\") from \"select \"\"qu\"\"\"\"ot\"\"\"\"ed\"\", \"\"double\"\"\"\"\"\"\"\"qu\"\"\"\"ot\"\"\"\"ed\"\"\"\"\"\" from quotes_in_column_name\" GROUP BY \"qu\"\"ot\"\"ed\""))
-                .isFullyPushedDown();
-
-        // Test with grouping column that has double quotes aliased to a name without double quotes
-        assertThat(query("select non_quoted, COUNT(DISTINCT  \"qu\"\"ot\"\"ed\") from \"select \"\"double\"\"\"\"\"\"\"\"qu\"\"\"\"ot\"\"\"\"ed\"\"\"\"\"\" as non_quoted, \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\" GROUP BY non_quoted"))
-                .isFullyPushedDown();
-
-        // Test with grouping column that has no double quotes aliased to a name with double quotes
-        assertThat(query("select \"qu\"\"oted\", COUNT(DISTINCT  \"qu\"\"ot\"\"ed\") from \"select non_quoted as \"\"qu\"\"\"\"oted\"\", \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\" GROUP BY \"qu\"\"oted\""))
-                .isFullyPushedDown();
-
-        assertThat(query("select \"qu\"\"oted\", COUNT(DISTINCT  \"qu\"\"oted\") from \"select \"\"qu\"\"\"\"ot\"\"\"\"ed\"\", non_quoted as \"\"qu\"\"\"\"oted\"\" from quotes_in_column_name\" GROUP BY \"qu\"\"oted\""))
-                .isFullyPushedDown();
-
-        /// Test aggregations with double quoted columns and no grouping sets
-        assertThat(query("select COUNT(DISTINCT \"date\") from \"select non_quoted as \"\"date\"\" from quotes_in_column_name\""))
-                .isFullyPushedDown();
-
-        assertThat(query("select COUNT(DISTINCT \"double\"\"\"\"qu\"\"ot\"\"ed\"\"\") from \"select \"\"double\"\"\"\"\"\"\"\"qu\"\"\"\"ot\"\"\"\"ed\"\"\"\"\"\" from quotes_in_column_name\""))
-                .isFullyPushedDown();
-
-        assertThat(query("select COUNT(DISTINCT  \"qu\"\"ot\"\"ed\") from \"select \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\""))
-                .isFullyPushedDown();
-
-        assertThat(query("select COUNT(DISTINCT  \"qu\"\"ot\"\"ed\") from \"select non_quoted as \"\"qu\"\"\"\"ot\"\"\"\"ed\"\" from quotes_in_column_name\""))
-                .isFullyPushedDown();
-    }
-
-    @Test
-    public void testLimitAndOffsetWithPushedDownAggregates()
-    {
-        // Aggregation pushdown must be disabled when there is an offset as the results will not be correct
-        assertThat(query("SELECT COUNT(*), MAX(long_col)" +
-                "  FROM \"SELECT long_col FROM " + ALL_TYPES_TABLE +
-                "  WHERE long_col < 0" +
-                "  ORDER BY long_col " +
-                "  LIMIT 5, 6\""))
-                .matches("VALUES (BIGINT '4', BIGINT '-3147483639')")
-                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class);
-
-        assertThat(query("SELECT long_col, COUNT(*), MAX(long_col)" +
-                "  FROM \"SELECT long_col FROM " + ALL_TYPES_TABLE +
-                "  WHERE long_col < 0" +
-                "  ORDER BY long_col " +
-                "  LIMIT 5, 6\" GROUP BY long_col"))
-                .matches("VALUES (BIGINT '-3147483642', BIGINT '1', BIGINT '-3147483642')," +
-                        "  (BIGINT '-3147483640', BIGINT '1', BIGINT '-3147483640')," +
-                        "  (BIGINT '-3147483641', BIGINT '1', BIGINT '-3147483641')," +
-                        "  (BIGINT '-3147483639', BIGINT '1', BIGINT '-3147483639')")
-                .isNotFullyPushedDown(AggregationNode.class, ExchangeNode.class, ExchangeNode.class, ProjectNode.class, AggregationNode.class);
-
-        assertThat(query("SELECT long_col, string_col, COUNT(*), MAX(long_col)" +
-                "  FROM \"SELECT * FROM " + ALL_TYPES_TABLE +
-                "  WHERE long_col < 0" +
-                "  ORDER BY long_col, string_col" +
-                "  LIMIT 5, 6\" GROUP BY long_col, string_col"))
-                .matches("VALUES (BIGINT '-3147483641', VARCHAR 'string_7200', BIGINT '1', BIGINT '-3147483641')," +
-                        "  (BIGINT '-3147483640', VARCHAR 'string_8400', BIGINT '1', BIGINT '-3147483640')," +
-                        "  (BIGINT '-3147483642', VARCHAR 'string_6000', BIGINT '1', BIGINT '-3147483642')," +
-                        "  (BIGINT '-3147483639', VARCHAR 'string_9600', BIGINT '1', BIGINT '-3147483639')")
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-
-        // Note that the offset is the first parameter
-        assertThat(query("SELECT long_col" +
-                "  FROM \"SELECT long_col FROM " + ALL_TYPES_TABLE +
-                "  WHERE long_col < 0" +
-                "  ORDER BY long_col " +
-                "  LIMIT 2, 6\""))
-                .matches("VALUES (BIGINT '-3147483645')," +
-                        "  (BIGINT '-3147483644')," +
-                        "  (BIGINT '-3147483643')," +
-                        "  (BIGINT '-3147483642')," +
-                        "  (BIGINT '-3147483641')," +
-                        "  (BIGINT '-3147483640')")
-                .isFullyPushedDown();
-
-        // Note that the offset is the first parameter
-        assertThat(query("SELECT long_col, string_col" +
-                "  FROM \"SELECT long_col, string_col FROM " + ALL_TYPES_TABLE +
-                "  WHERE long_col < 0" +
-                "  ORDER BY long_col " +
-                "  LIMIT 2, 6\""))
-                .matches("VALUES (BIGINT '-3147483645', VARCHAR 'string_2400')," +
-                        "  (BIGINT '-3147483644', VARCHAR 'string_3600')," +
-                        "  (BIGINT '-3147483643', VARCHAR 'string_4800')," +
-                        "  (BIGINT '-3147483642', VARCHAR 'string_6000')," +
-                        "  (BIGINT '-3147483641', VARCHAR 'string_7200')," +
-                        "  (BIGINT '-3147483640', VARCHAR 'string_8400')")
-                .isFullyPushedDown();
-    }
-
-    @Test
-    public void testAggregatePassthroughQueriesWithExpressions()
-    {
-        assertThat(query("SELECT string_col, sum_metric_col1, count_dup_string_col, ratio_metric_col" +
-                "  FROM \"SELECT string_col, SUM(metric_col1) AS sum_metric_col1, COUNT(DISTINCT another_string_col) AS count_dup_string_col," +
-                "  (SUM(metric_col1) - SUM(metric_col2)) / SUM(metric_col1) AS ratio_metric_col" +
-                "  FROM duplicate_values_in_columns WHERE dim_col = another_dim_col" +
-                "  GROUP BY string_col" +
-                "  ORDER BY string_col\""))
-                .matches("VALUES (VARCHAR 'string1', DOUBLE '1110.0', 2, DOUBLE '-1.0')," +
-                        "  (VARCHAR 'string2', DOUBLE '100.0', 1, DOUBLE '-1.0')");
-
-        assertThat(query("SELECT string_col, sum_metric_col1, count_dup_string_col, ratio_metric_col" +
-                "  FROM \"SELECT string_col, SUM(metric_col1) AS sum_metric_col1," +
-                "  COUNT(DISTINCT another_string_col) AS count_dup_string_col," +
-                "  (SUM(metric_col1) - SUM(metric_col2)) / SUM(metric_col1) AS ratio_metric_col" +
-                "  FROM duplicate_values_in_columns WHERE dim_col != another_dim_col" +
-                "  GROUP BY string_col" +
-                "  ORDER BY string_col\""))
-                .matches("VALUES (VARCHAR 'string2', DOUBLE '1000.0', 1, DOUBLE '-1.0')");
-
-        assertThat(query("SELECT DISTINCT string_col, another_string_col" +
-                "  FROM \"SELECT string_col, another_string_col" +
-                "  FROM duplicate_values_in_columns WHERE dim_col = another_dim_col\""))
-                .matches("VALUES (VARCHAR 'string1', VARCHAR 'string1')," +
-                        "  (VARCHAR 'string1', VARCHAR 'another_string1')," +
-                        "  (VARCHAR 'string2', VARCHAR 'another_string2')");
-
-        assertThat(query("SELECT string_col, sum_metric_col1" +
-                "  FROM \"SELECT string_col," +
-                "  SUM(CASE WHEN dim_col = another_dim_col THEN metric_col1 ELSE 0 END) AS sum_metric_col1" +
-                "  FROM duplicate_values_in_columns GROUP BY string_col ORDER BY string_col\""))
-                .matches("VALUES (VARCHAR 'string1', DOUBLE '1110.0')," +
-                        "  (VARCHAR 'string2', DOUBLE '100.0')");
-
-        assertThat(query("SELECT \"percentile(int_col, 90.0)\"" +
-                "  FROM \"SELECT percentile(int_col, 90) FROM " + ALL_TYPES_TABLE + "\""))
-                .matches("VALUES (DOUBLE '56.0')");
-
-        assertThat(query("SELECT bool_col, \"percentile(int_col, 90.0)\"" +
-                "  FROM \"SELECT bool_col, percentile(int_col, 90) FROM " + ALL_TYPES_TABLE + " GROUP BY bool_col\""))
-                .matches("VALUES (true, DOUBLE '56.0')," +
-                        "  (false, DOUBLE '0.0')");
-
-        assertThat(query("SELECT \"sqrt(percentile(sqrt(int_col),'26.457513110645905'))\"" +
-                "  FROM \"SELECT sqrt(percentile(sqrt(int_col), sqrt(700))) FROM " + ALL_TYPES_TABLE + "\""))
-                .matches("VALUES (DOUBLE '2.7108060108295344')");
-
-        assertThat(query("SELECT int_col, \"sqrt(percentile(sqrt(int_col),'26.457513110645905'))\"" +
-                "  FROM \"SELECT int_col, sqrt(percentile(sqrt(int_col), sqrt(700))) FROM " + ALL_TYPES_TABLE + " GROUP BY int_col\""))
-                .matches("VALUES (54, DOUBLE '2.7108060108295344')," +
-                        "  (55, DOUBLE '2.7232698153315003')," +
-                        "  (56, DOUBLE '2.7355647997347607')," +
-                        "  (0, DOUBLE '0.0')");
-    }
-
-    @Test
-    public void testAggregationPushdownWithArrays()
-    {
-        assertThat(query("SELECT string_array_col, count(*) FROM " + ALL_TYPES_TABLE + " WHERE int_col = 54 GROUP BY 1"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-        assertThat(query("SELECT int_array_col, string_array_col, count(*) FROM " + ALL_TYPES_TABLE + " WHERE int_col = 54 GROUP BY 1, 2"))
-                .isNotFullyPushedDown(ProjectNode.class, AggregationNode.class, ExchangeNode.class, ExchangeNode.class, AggregationNode.class, ProjectNode.class);
-        assertThat(query("SELECT int_array_col, \"count(*)\"" +
-                "  FROM \"SELECT int_array_col, COUNT(*) FROM " + ALL_TYPES_TABLE +
-                "  WHERE int_col = 54 GROUP BY 1\""))
-                .isFullyPushedDown()
-                .matches("VALUES (-10001, BIGINT '3')," +
-                        "(54, BIGINT '3')," +
-                        "(1000, BIGINT '3')");
-        assertThat(query("SELECT int_array_col, string_array_col, \"count(*)\"" +
-                "  FROM \"SELECT int_array_col, string_array_col, COUNT(*) FROM " + ALL_TYPES_TABLE +
-                "  WHERE int_col = 56 AND string_col = 'string_8400' GROUP BY 1, 2\""))
-                .isFullyPushedDown()
-                .matches("VALUES (-10001, VARCHAR 'string_8400', BIGINT '1')," +
-                        "(-10001, VARCHAR 'string2_8402', BIGINT '1')," +
-                        "(1000, VARCHAR 'string2_8402', BIGINT '1')," +
-                        "(56, VARCHAR 'string2_8402', BIGINT '1')," +
-                        "(-10001, VARCHAR 'string1_8401', BIGINT '1')," +
-                        "(56, VARCHAR 'string1_8401', BIGINT '1')," +
-                        "(1000, VARCHAR 'string_8400', BIGINT '1')," +
-                        "(56, VARCHAR 'string_8400', BIGINT '1')," +
-                        "(1000, VARCHAR 'string1_8401', BIGINT '1')");
-    }
-
-    @Test
-    public void testVarbinary()
-    {
-        String expectedValues = "VALUES (X'')," +
-                "  (X'73 74 72 69 6e 67 5f 30')," +
-                "  (X'73 74 72 69 6e 67 5f 31 32 30 30')," +
-                "  (X'73 74 72 69 6e 67 5f 32 34 30 30')," +
-                "  (X'73 74 72 69 6e 67 5f 33 36 30 30')," +
-                "  (X'73 74 72 69 6e 67 5f 34 38 30 30')," +
-                "  (X'73 74 72 69 6e 67 5f 36 30 30 30')," +
-                "  (X'73 74 72 69 6e 67 5f 37 32 30 30')," +
-                "  (X'73 74 72 69 6e 67 5f 38 34 30 30')," +
-                "  (X'73 74 72 69 6e 67 5f 39 36 30 30')";
-        // The filter on string_col is to have a deterministic result set: the default limit for broker queries is 10 rows.
-        assertThat(query("SELECT bytes_col FROM alltypes WHERE string_col != 'array_null'"))
-                .matches(expectedValues);
-        assertThat(query("SELECT bytes_col FROM \"SELECT bytes_col, string_col FROM alltypes\" WHERE string_col != 'array_null'"))
-                .matches(expectedValues);
-    }
-
-    @Test
-    public void testTimeBoundary()
-    {
-        // Note: This table uses Pinot TIMESTAMP and not LONG as the time column type.
-        Instant startInstant = initialUpdatedAt.truncatedTo(DAYS);
-        String expectedValues = "VALUES " +
-                "(VARCHAR 'string_8', BIGINT '8', TIMESTAMP '" + MILLIS_FORMATTER.format(startInstant.minus(1, DAYS).plusMillis(1000)) + "')," +
-                "(VARCHAR 'string_9', BIGINT '9', TIMESTAMP '" + MILLIS_FORMATTER.format(startInstant.minus(1, DAYS).plusMillis(2000)) + "')," +
-                "(VARCHAR 'string_10', BIGINT '10', TIMESTAMP '" + MILLIS_FORMATTER.format(startInstant.minus(1, DAYS).plusMillis(3000)) + "')," +
-                "(VARCHAR 'string_11', BIGINT '11', TIMESTAMP '" + MILLIS_FORMATTER.format(startInstant.minus(1, DAYS).plusMillis(4000)) + "')";
-        assertThat(query("SELECT stringcol, longcol, updatedat FROM " + HYBRID_TABLE_NAME))
-                .matches(expectedValues);
-        // Verify that this matches the time boundary behavior on the broker
-        assertThat(query("SELECT stringcol, longcol, updatedat FROM \"SELECT stringcol, longcol, updatedat FROM " + HYBRID_TABLE_NAME + "\""))
-                .matches(expectedValues);
-    }
-
-    @Test
-    public void testTimestamp()
-    {
-        assertThat(query("SELECT ts FROM " + ALL_TYPES_TABLE + " ORDER BY ts LIMIT 1")).matches("VALUES (TIMESTAMP '1970-01-01 00:00:00.000')");
-        assertThat(query("SELECT min(ts) FROM " + ALL_TYPES_TABLE)).matches("VALUES (TIMESTAMP '1970-01-01 00:00:00.000')");
-        assertThat(query("SELECT max(ts) FROM " + ALL_TYPES_TABLE)).isFullyPushedDown();
-        assertThat(query("SELECT ts FROM " + ALL_TYPES_TABLE + " ORDER BY ts DESC LIMIT 1")).matches("SELECT max(ts) FROM " + ALL_TYPES_TABLE);
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS").withZone(ZoneOffset.UTC);
-        for (int i = 0, step = 1200; i < MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES - 2; i++) {
-            String initialUpdatedAtStr = formatter.format(initialUpdatedAt.plusMillis(i * step));
-            assertThat(query("SELECT ts FROM " + ALL_TYPES_TABLE + " WHERE ts >= TIMESTAMP '" + initialUpdatedAtStr + "' ORDER BY ts LIMIT 1"))
-                    .matches("SELECT ts FROM " + ALL_TYPES_TABLE + " WHERE ts <= TIMESTAMP '" + initialUpdatedAtStr + "' ORDER BY ts DESC LIMIT 1");
-            assertThat(query("SELECT ts FROM " + ALL_TYPES_TABLE + " WHERE ts = TIMESTAMP '" + initialUpdatedAtStr + "' LIMIT 1"))
-                    .matches("VALUES (TIMESTAMP '" + initialUpdatedAtStr + "')");
-        }
-        assertThat(query("SELECT timestamp_col FROM " + ALL_TYPES_TABLE + " WHERE timestamp_col < TIMESTAMP '1971-01-01 00:00:00.000'")).isFullyPushedDown();
-        assertThat(query("SELECT timestamp_col FROM " + ALL_TYPES_TABLE + " WHERE timestamp_col < TIMESTAMP '1970-01-01 00:00:00.000'")).isFullyPushedDown();
-    }
-
-    @Test
-    public void testJson()
-    {
-        assertThat(query("SELECT json_col FROM " + JSON_TYPE_TABLE))
-                .matches("VALUES (JSON '{\"id\":0,\"name\":\"user_0\"}')," +
-                        "  (JSON '{\"id\":1,\"name\":\"user_1\"}')," +
-                        "  (JSON '{\"id\":2,\"name\":\"user_2\"}')");
-        assertThat(query("SELECT json_col" +
-                "  FROM \"SELECT json_col FROM " + JSON_TYPE_TABLE + "\""))
-                .matches("VALUES (JSON '{\"id\":0,\"name\":\"user_0\"}')," +
-                        "  (JSON '{\"id\":1,\"name\":\"user_1\"}')," +
-                        "  (JSON '{\"id\":2,\"name\":\"user_2\"}')");
-        assertThat(query("SELECT name FROM \"SELECT json_extract_scalar(json_col, '$.name', 'STRING', '0') AS name" +
-                "  FROM json_table WHERE json_extract_scalar(json_col, '$.id', 'INT', '0') = '1'\""))
-                .matches("VALUES (VARCHAR 'user_1')");
-        assertThat(query("SELECT JSON_EXTRACT_SCALAR(json_col, '$.name') FROM " + JSON_TYPE_TABLE +
-                "  WHERE JSON_EXTRACT_SCALAR(json_col, '$.id') = '1'"))
-                .matches("VALUES (VARCHAR 'user_1')");
-        assertThat(query("SELECT string_col FROM " + JSON_TYPE_TABLE + " WHERE json_col = JSON '{\"id\":0,\"name\":\"user_0\"}'"))
-                .matches("VALUES VARCHAR 'string_0'");
-    }
-
-    @Test
-    public void testHavingClause()
-    {
-        assertThat(query("SELECT city, \"sum(long_number)\" FROM \"SELECT city, SUM(long_number)" +
-                "  FROM my_table" +
-                "  GROUP BY city" +
-                "  HAVING SUM(long_number) > 10000\""))
-                .matches("VALUES (VARCHAR 'Los Angeles', DOUBLE '50000.0')," +
-                        "  (VARCHAR 'New York', DOUBLE '20000.0')")
-                .isFullyPushedDown();
-        assertThat(query("SELECT city, \"sum(long_number)\" FROM \"SELECT city, SUM(long_number) FROM my_table" +
-                "  GROUP BY city HAVING SUM(long_number) > 14\"" +
-                "  WHERE city != 'New York'"))
-                .matches("VALUES (VARCHAR 'Los Angeles', DOUBLE '50000.0')")
-                .isFullyPushedDown();
-        assertThat(query("SELECT city, SUM(long_number)" +
-                "  FROM my_table" +
-                "  GROUP BY city" +
-                "  HAVING SUM(long_number) > 10000"))
-                .matches("VALUES (VARCHAR 'Los Angeles', BIGINT '50000')," +
-                        "  (VARCHAR 'New York', BIGINT '20000')")
-                .isFullyPushedDown();
-        assertThat(query("SELECT city, SUM(long_number) FROM my_table" +
-                "  WHERE city != 'New York'" +
-                "  GROUP BY city HAVING SUM(long_number) > 10000"))
-                .matches("VALUES (VARCHAR 'Los Angeles', BIGINT '50000')")
-                .isFullyPushedDown();
-    }
-}
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/PinotQueryRunner.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/PinotQueryRunner.java
index 565561700b60..e1d010bcc508 100755
--- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/PinotQueryRunner.java
+++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/PinotQueryRunner.java
@@ -78,7 +78,6 @@ public static void main(String[] args)
         Map<String, String> pinotProperties = ImmutableMap.<String, String>builder()
                 .put("pinot.controller-urls", pinot.getControllerConnectString())
                 .put("pinot.segments-per-split", "10")
-                .put("pinot.request-timeout", "3m")
                 .buildOrThrow();
         DistributedQueryRunner queryRunner = createPinotQueryRunner(properties, pinotProperties, Optional.empty());
         Thread.sleep(10);
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestDynamicTable.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestDynamicTable.java
index 981e5a80d2fd..cfbfac8dd048 100755
--- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestDynamicTable.java
+++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestDynamicTable.java
@@ -34,7 +34,6 @@
 import static io.trino.plugin.pinot.query.DynamicTableBuilder.buildFromPql;
 import static io.trino.plugin.pinot.query.DynamicTablePqlExtractor.extractPql;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static java.lang.String.format;
 import static java.lang.String.join;
 import static java.util.Locale.ENGLISH;
 import static java.util.stream.Collectors.joining;
@@ -55,11 +54,11 @@ public void testSelectNoFilter()
                 .map(columnName -> new OrderByExpression(quoteIdentifier(columnName), true))
                 .collect(toList());
         long limit = 230;
-        String query = format("select %s from %s order by %s limit %s",
+        String query = "SELECT %s FROM %s ORDER BY %s DESC LIMIT %s".formatted(
                 join(", ", columnNames),
                 tableName,
                 orderByColumns.stream()
-                        .collect(joining(", ")) + " desc",
+                        .collect(joining(", ")),
                 limit);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
         assertEquals(dynamicTable.getProjections().stream()
@@ -76,7 +75,7 @@ public void testGroupBy()
     {
         String tableName = realtimeOnlyTable.getTableName();
         long limit = 25;
-        String query = format("SELECT Origin, AirlineID, max(CarrierDelay), avg(CarrierDelay) FROM %s GROUP BY Origin, AirlineID LIMIT %s", tableName, limit);
+        String query = "SELECT Origin, AirlineID, max(CarrierDelay), avg(CarrierDelay) FROM %s GROUP BY Origin, AirlineID LIMIT %s".formatted(tableName, limit);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
         assertEquals(dynamicTable.getGroupingColumns().stream()
                         .map(PinotColumnHandle::getColumnName)
@@ -92,16 +91,22 @@ public void testGroupBy()
     public void testFilter()
     {
         String tableName = realtimeOnlyTable.getTableName();
-        String query = format("select FlightNum, AirlineID from %s where ((CancellationCode IN ('strike', 'weather', 'pilot_bac')) AND (Origin = 'jfk')) " +
-                        "OR ((OriginCityName != 'catfish paradise') AND (OriginState != 'az') AND (AirTime between 1 and 5)) " +
-                        "AND AirTime NOT IN (7,8,9) " +
-                        "OR ((DepDelayMinutes < 10) AND (Distance >= 3) AND (ArrDelay > 4) AND (SecurityDelay < 5) AND (LateAircraftDelay <= 7)) limit 60",
-                tableName);
+        String query = """
+                SELECT FlightNum, AirlineID
+                FROM %s
+                WHERE ((CancellationCode IN ('strike', 'weather', 'pilot_bac')) AND (Origin = 'jfk'))
+                OR ((OriginCityName != 'catfish paradise') AND (OriginState != 'az') AND (AirTime BETWEEN 1 AND 5))
+                AND AirTime NOT IN (7,8,9)
+                OR ((DepDelayMinutes < 10) AND (Distance >= 3) AND (ArrDelay > 4) AND (SecurityDelay < 5) AND (LateAircraftDelay <= 7))
+                LIMIT 60""".formatted(tableName);
 
-        String expected = format("select \"FlightNum\", \"AirlineID\" from %s where OR(AND(\"CancellationCode\" IN ('strike', 'weather', 'pilot_bac'), (\"Origin\") = 'jfk'), " +
-                        "AND((\"OriginCityName\") != 'catfish paradise', (\"OriginState\") != 'az', (\"AirTime\") BETWEEN '1' AND '5', \"AirTime\" NOT IN ('7', '8', '9')), " +
-                        "AND((\"DepDelayMinutes\") < '10', (\"Distance\") >= '3', (\"ArrDelay\") > '4', (\"SecurityDelay\") < '5', (\"LateAircraftDelay\") <= '7')) limit 60",
-                tableName);
+        String expected = """
+                SELECT "FlightNum", "AirlineID"\
+                 FROM %s\
+                 WHERE OR(AND("CancellationCode" IN ('strike', 'weather', 'pilot_bac'), ("Origin") = 'jfk'),\
+                 AND(("OriginCityName") != 'catfish paradise', ("OriginState") != 'az', ("AirTime") BETWEEN '1' AND '5', "AirTime" NOT IN ('7', '8', '9')),\
+                 AND(("DepDelayMinutes") < '10', ("Distance") >= '3', ("ArrDelay") > '4', ("SecurityDelay") < '5', ("LateAircraftDelay") <= '7'))\
+                 LIMIT 60""".formatted(tableName);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expected);
     }
@@ -114,13 +119,18 @@ public void testPrimitiveTypes()
         // ci will interpret as a string, i.e. "X''ABCD"
         // intellij will expand the X'abcd' to binary 0b10011100001111
         // Pinot will interpret both forms as a string regardless, so we cannot use X'....'
-        String tableName = "primitive_types_table";
-        String query = "SELECT string_col, long_col, int_col, bool_col, double_col, float_col, bytes_col" +
-                "  FROM " + tableName + " WHERE string_col = 'string' AND long_col = 12345678901 AND int_col = 123456789" +
-                "  AND double_col = 3.56 AND float_col = 3.56 AND bytes_col = 'abcd' LIMIT 60";
-        String expected = "select \"string_col\", \"long_col\", \"int_col\", \"bool_col\", \"double_col\", \"float_col\", \"bytes_col\"" +
-                " from primitive_types_table where AND((\"string_col\") = 'string', (\"long_col\") = '12345678901'," +
-                " (\"int_col\") = '123456789', (\"double_col\") = '3.56', (\"float_col\") = '3.56', (\"bytes_col\") = 'abcd') limit 60";
+        String query = """
+                SELECT string_col, long_col, int_col, bool_col, double_col, float_col, bytes_col
+                FROM primitive_types_table
+                WHERE string_col = 'string' AND long_col = 12345678901 AND int_col = 123456789
+                AND double_col = 3.56 AND float_col = 3.56 AND bytes_col = 'abcd'
+                LIMIT 60""";
+        String expected = """
+                SELECT "string_col", "long_col", "int_col", "bool_col", "double_col", "float_col", "bytes_col"\
+                 FROM primitive_types_table\
+                 WHERE AND(("string_col") = 'string', ("long_col") = '12345678901',\
+                 ("int_col") = '123456789', ("double_col") = '3.56', ("float_col") = '3.56', ("bytes_col") = 'abcd')\
+                 LIMIT 60""";
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expected);
     }
@@ -129,9 +139,9 @@ public void testPrimitiveTypes()
     public void testDoubleWithScientificNotation()
     {
         // Pinot recognizes double literals with scientific notation as of version 0.8.0
-        String tableName = "primitive_types_table";
-        String query = "SELECT string_col FROM " + tableName + " WHERE double_col = 3.5E5";
-        String expected = "select \"string_col\" from primitive_types_table where (\"double_col\") = '350000.0' limit 10";
+        String query = "SELECT string_col FROM primitive_types_table WHERE double_col = 3.5E5";
+        String expected = """
+                SELECT "string_col" FROM primitive_types_table WHERE ("double_col") = '350000.0' LIMIT 10""";
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expected);
     }
@@ -139,11 +149,15 @@ public void testDoubleWithScientificNotation()
     @Test
     public void testFilterWithCast()
     {
-        String tableName = "primitive_types_table";
-        String query = "SELECT string_col, long_col" +
-                " FROM " + tableName + " WHERE string_col = CAST(123 AS STRING) AND long_col = CAST('123' AS LONG) LIMIT 60";
-        String expected = "select \"string_col\", \"long_col\" from primitive_types_table " +
-                "where AND((\"string_col\") = '123', (\"long_col\") = '123') limit 60";
+        String query = """
+                SELECT string_col, long_col
+                FROM primitive_types_table
+                WHERE string_col = CAST(123 AS STRING) AND long_col = CAST('123' AS LONG)
+                LIMIT 60""";
+        String expected = """
+                SELECT "string_col", "long_col" FROM primitive_types_table\
+                 WHERE AND(("string_col") = '123', ("long_col") = '123')\
+                 LIMIT 60""";
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expected);
     }
@@ -152,15 +166,19 @@ public void testFilterWithCast()
     public void testFilterWithCaseStatements()
     {
         String tableName = realtimeOnlyTable.getTableName();
-        String query = format("select FlightNum, AirlineID from %s " +
-                "where case when cancellationcode = 'strike' then 3 else 4 end != 5 " +
-                "AND case origincityname when 'nyc' then 'pizza' when 'la' then 'burrito' when 'boston' then 'clam chowder' " +
-                "else 'burger' end != 'salad'", tableName);
-        String expected = format("select \"FlightNum\", \"AirlineID\" from %s where AND((CASE WHEN equals(\"CancellationCode\", 'strike') " +
-                        "THEN '3' ELSE '4' END) != '5', (CASE WHEN equals(\"OriginCityName\", 'nyc') " +
-                        "THEN 'pizza' WHEN equals(\"OriginCityName\", 'la') THEN 'burrito' WHEN equals(\"OriginCityName\", 'boston') " +
-                        "THEN 'clam chowder' ELSE 'burger' END) != 'salad') limit 10",
-                tableName);
+        String query = """
+                SELECT FlightNum, AirlineID
+                FROM %s
+                WHERE CASE WHEN cancellationcode = 'strike' THEN 3 ELSE 4 END != 5
+                AND CASE origincityname WHEN 'nyc' THEN 'pizza' WHEN 'la' THEN 'burrito' WHEN 'boston' THEN 'clam chowder'
+                ELSE 'burger' END != 'salad'""".formatted(tableName);
+        String expected = """
+                SELECT "FlightNum", "AirlineID"\
+                 FROM %s\
+                 WHERE AND((CASE WHEN equals("CancellationCode", 'strike')\
+                 THEN '3' ELSE '4' END) != '5', (CASE WHEN equals("OriginCityName", 'nyc')\
+                 THEN 'pizza' WHEN equals("OriginCityName", 'la') THEN 'burrito' WHEN equals("OriginCityName", 'boston')\
+                 THEN 'clam chowder' ELSE 'burger' END) != 'salad') LIMIT 10""".formatted(tableName);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expected);
     }
@@ -169,13 +187,17 @@ public void testFilterWithCaseStatements()
     public void testFilterWithPushdownConstraint()
     {
         String tableName = realtimeOnlyTable.getTableName();
-        String query = format("select FlightNum from %s limit 60", tableName.toLowerCase(ENGLISH));
+        String query = "SELECT FlightNum FROM %s LIMIT 60".formatted(tableName.toLowerCase(ENGLISH));
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
         PinotColumnHandle columnHandle = new PinotColumnHandle("OriginCityName", VARCHAR);
         TupleDomain<ColumnHandle> tupleDomain = TupleDomain.withColumnDomains(ImmutableMap.of(
                 columnHandle,
                 Domain.create(ValueSet.ofRanges(Range.equal(VARCHAR, Slices.utf8Slice("Catfish Paradise"))), false)));
-        String expectedPql = "select \"FlightNum\" from realtimeOnly where (\"OriginCityName\" = 'Catfish Paradise') limit 60";
+        String expectedPql = """
+                SELECT "FlightNum"\
+                 FROM realtimeOnly\
+                 WHERE ("OriginCityName" = 'Catfish Paradise')\
+                 LIMIT 60""";
         assertEquals(extractPql(dynamicTable, tupleDomain), expectedPql);
     }
 
@@ -183,9 +205,15 @@ public void testFilterWithPushdownConstraint()
     public void testFilterWithUdf()
     {
         String tableName = realtimeOnlyTable.getTableName();
-        String query = format("select FlightNum from %s where DivLongestGTimes = FLOOR(EXP(2 * LN(3))) AND 5 < EXP(CarrierDelay) limit 60", tableName.toLowerCase(ENGLISH));
+        // Note: before Pinot 0.12.1 the below query produced different results due to handling IEEE-754 approximate numerics
+        // See https://github.com/apache/pinot/issues/10637
+        String query = "SELECT FlightNum FROM %s WHERE DivLongestGTimes = FLOOR(EXP(2 * LN(3)) + 0.1) AND 5 < EXP(CarrierDelay) LIMIT 60".formatted(tableName.toLowerCase(ENGLISH));
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = "select \"FlightNum\" from realtimeOnly where AND((\"DivLongestGTimes\") = '9.0', (exp(\"CarrierDelay\")) > '5') limit 60";
+        String expectedPql = """
+                SELECT "FlightNum"\
+                 FROM realtimeOnly\
+                 WHERE AND(("DivLongestGTimes") = '9.0', (exp("CarrierDelay")) > '5')\
+                 LIMIT 60""";
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
     }
 
@@ -193,9 +221,9 @@ public void testFilterWithUdf()
     public void testSelectStarDynamicTable()
     {
         String tableName = realtimeOnlyTable.getTableName();
-        String query = format("select * from %s limit 70", tableName.toLowerCase(ENGLISH));
+        String query = "SELECT * FROM %s LIMIT 70".formatted(tableName.toLowerCase(ENGLISH));
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select %s from %s limit 70", getColumnNames(tableName).stream().map(TestDynamicTable::quoteIdentifier).collect(joining(", ")), tableName);
+        String expectedPql = "SELECT %s FROM %s LIMIT 70".formatted(getColumnNames(tableName).stream().map(TestDynamicTable::quoteIdentifier).collect(joining(", ")), tableName);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
     }
 
@@ -204,9 +232,9 @@ public void testOfflineDynamicTable()
     {
         String tableName = hybridTable.getTableName();
         String tableNameWithSuffix = tableName + OFFLINE_SUFFIX;
-        String query = format("select * from %s limit 70", tableNameWithSuffix);
+        String query = "SELECT * FROM %s LIMIT 70".formatted(tableNameWithSuffix);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select %s from %s limit 70", getColumnNames(tableName).stream().map(TestDynamicTable::quoteIdentifier).collect(joining(", ")), tableNameWithSuffix);
+        String expectedPql = "SELECT %s FROM %s LIMIT 70".formatted(getColumnNames(tableName).stream().map(TestDynamicTable::quoteIdentifier).collect(joining(", ")), tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
@@ -216,9 +244,9 @@ public void testRealtimeOnlyDynamicTable()
     {
         String tableName = hybridTable.getTableName();
         String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
-        String query = format("select * from %s limit 70", tableNameWithSuffix);
+        String query = "SELECT * FROM %s LIMIT 70".formatted(tableNameWithSuffix);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select %s from %s limit 70", getColumnNames(tableName).stream().map(TestDynamicTable::quoteIdentifier).collect(joining(", ")), tableNameWithSuffix);
+        String expectedPql = "SELECT %s FROM %s LIMIT 70".formatted(getColumnNames(tableName).stream().map(TestDynamicTable::quoteIdentifier).collect(joining(", ")), tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
@@ -228,9 +256,9 @@ public void testLimitAndOffset()
     {
         String tableName = hybridTable.getTableName();
         String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
-        String query = format("select * from %s limit 70, 40", tableNameWithSuffix);
+        String query = "SELECT * FROM %s LIMIT 70, 40".formatted(tableNameWithSuffix);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select %s from %s limit 70, 40", getColumnNames(tableName).stream().map(TestDynamicTable::quoteIdentifier).collect(joining(", ")), tableNameWithSuffix);
+        String expectedPql = "SELECT %s FROM %s LIMIT 70, 40".formatted(getColumnNames(tableName).stream().map(TestDynamicTable::quoteIdentifier).collect(joining(", ")), tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
@@ -245,9 +273,10 @@ public void testRegexpLike()
     {
         String tableName = hybridTable.getTableName();
         String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
-        String query = format("select origincityname from %s where regexp_like(origincityname, '.*york.*') limit 70", tableNameWithSuffix);
+        String query = "SELECT origincityname FROM %s WHERE regexp_like(origincityname, '.*york.*') LIMIT 70".formatted(tableNameWithSuffix);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select \"OriginCityName\" from %s where regexp_like(\"OriginCityName\", '.*york.*') limit 70", tableNameWithSuffix);
+        String expectedPql = """
+                SELECT "OriginCityName" FROM %s WHERE regexp_like("OriginCityName", '.*york.*') LIMIT 70""".formatted(tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
@@ -257,9 +286,10 @@ public void testTextMatch()
     {
         String tableName = hybridTable.getTableName();
         String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
-        String query = format("select origincityname from %s where text_match(origincityname, 'new AND york') limit 70", tableNameWithSuffix);
+        String query = "SELECT origincityname FROM %s WHERE text_match(origincityname, 'new AND york') LIMIT 70".formatted(tableNameWithSuffix);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select \"OriginCityName\" from %s where text_match(\"OriginCityName\", 'new and york') limit 70", tableNameWithSuffix);
+        String expectedPql = """
+                SELECT "OriginCityName" FROM %s WHERE text_match("OriginCityName", 'new and york') LIMIT 70""".formatted(tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
@@ -269,9 +299,11 @@ public void testJsonMatch()
     {
         String tableName = hybridTable.getTableName();
         String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
-        String query = format("select origincityname from %s where json_match(origincityname, '\"$.name\"=''new york''') limit 70", tableNameWithSuffix);
+        String query = """
+                SELECT origincityname FROM %s WHERE json_match(origincityname, '"$.name"=''new york''') LIMIT 70""".formatted(tableNameWithSuffix);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select \"OriginCityName\" from %s where json_match(\"OriginCityName\", '\"$.name\"=''new york''') limit 70", tableNameWithSuffix);
+        String expectedPql = """
+                SELECT "OriginCityName" FROM %s WHERE json_match("OriginCityName", '"$.name"=''new york''') LIMIT 70""".formatted(tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
@@ -281,16 +313,21 @@ public void testSelectExpressionsWithAliases()
     {
         String tableName = hybridTable.getTableName();
         String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
-        String query = format("select datetimeconvert(dayssinceEpoch, '1:seconds:epoch', '1:milliseconds:epoch', '15:minutes'), " +
-                "case origincityname when 'nyc' then 'pizza' when 'la' then 'burrito' when 'boston' then 'clam chowder'" +
-                " else 'burger' end != 'salad'," +
-                " timeconvert(dayssinceEpoch, 'seconds', 'minutes') as foo" +
-                " from %s  limit 70", tableNameWithSuffix);
+        String query = """
+                SELECT datetimeconvert(dayssinceEpoch, '1:seconds:epoch', '1:milliseconds:epoch', '15:minutes'),
+                CASE origincityname WHEN 'nyc' THEN 'pizza' WHEN 'la' THEN 'burrito' WHEN 'boston' THEN 'clam chowder'
+                ELSE 'burger' END != 'salad',
+                timeconvert(dayssinceEpoch, 'seconds', 'minutes') AS foo
+                FROM %s
+                LIMIT 70""".formatted(tableNameWithSuffix);
 
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select datetimeconvert(\"DaysSinceEpoch\", '1:SECONDS:EPOCH', '1:MILLISECONDS:EPOCH', '15:MINUTES')," +
-                " not_equals(CASE WHEN equals(\"OriginCityName\", 'nyc') THEN 'pizza' WHEN equals(\"OriginCityName\", 'la') THEN 'burrito' WHEN equals(\"OriginCityName\", 'boston') THEN 'clam chowder' ELSE 'burger' END, 'salad')," +
-                " timeconvert(\"DaysSinceEpoch\", 'SECONDS', 'MINUTES') AS \"foo\" from %s limit 70", tableNameWithSuffix);
+        String expectedPql = """
+                SELECT datetimeconvert("DaysSinceEpoch", '1:SECONDS:EPOCH', '1:MILLISECONDS:EPOCH', '15:MINUTES'),\
+                 not_equals(CASE WHEN equals("OriginCityName", 'nyc') THEN 'pizza' WHEN equals("OriginCityName", 'la') THEN 'burrito' WHEN equals(\"OriginCityName\", 'boston') THEN 'clam chowder' ELSE 'burger' END, 'salad'),\
+                 timeconvert("DaysSinceEpoch", 'SECONDS', 'MINUTES') AS "foo"\
+                 FROM %s\
+                 LIMIT 70""".formatted(tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
@@ -300,26 +337,30 @@ public void testAggregateExpressionsWithAliases()
     {
         String tableName = hybridTable.getTableName();
         String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
-        String query = format("select datetimeconvert(dayssinceEpoch, '1:seconds:epoch', '1:milliseconds:epoch', '15:minutes'), " +
-                " count(*) as bar," +
-                " case origincityname when 'nyc' then 'pizza' when 'la' then 'burrito' when 'boston' then 'clam chowder'" +
-                " else 'burger' end != 'salad'," +
-                " timeconvert(dayssinceEpoch, 'seconds', 'minutes') as foo," +
-                " max(airtime) as baz" +
-                " from %s  group by 1, 3, 4 limit 70", tableNameWithSuffix);
+        String query = """
+                SELECT datetimeconvert(dayssinceEpoch, '1:seconds:epoch', '1:milliseconds:epoch', '15:minutes'),
+                count(*) AS bar,
+                CASE origincityname WHEN 'nyc' then 'pizza' WHEN 'la' THEN 'burrito' WHEN 'boston' THEN 'clam chowder'
+                ELSE 'burger' END != 'salad',
+                timeconvert(dayssinceEpoch, 'seconds', 'minutes') AS foo,
+                max(airtime) as baz
+                FROM %s
+                GROUP BY 1, 3, 4
+                LIMIT 70""".formatted(tableNameWithSuffix);
 
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select datetimeconvert(\"DaysSinceEpoch\", '1:SECONDS:EPOCH'," +
-                " '1:MILLISECONDS:EPOCH', '15:MINUTES'), count(*) AS \"bar\"," +
-                " not_equals(CASE WHEN equals(\"OriginCityName\", 'nyc') THEN 'pizza' WHEN equals(\"OriginCityName\", 'la') THEN 'burrito'" +
-                " WHEN equals(\"OriginCityName\", 'boston') THEN 'clam chowder' ELSE 'burger' END, 'salad')," +
-                " timeconvert(\"DaysSinceEpoch\", 'SECONDS', 'MINUTES') AS \"foo\"," +
-                " max(\"AirTime\") AS \"baz\"" +
-                " from %s" +
-                " group by datetimeconvert(\"DaysSinceEpoch\", '1:SECONDS:EPOCH', '1:MILLISECONDS:EPOCH', '15:MINUTES')," +
-                " not_equals(CASE WHEN equals(\"OriginCityName\", 'nyc') THEN 'pizza' WHEN equals(\"OriginCityName\", 'la') THEN 'burrito' WHEN equals(\"OriginCityName\", 'boston') THEN 'clam chowder' ELSE 'burger' END, 'salad')," +
-                " timeconvert(\"DaysSinceEpoch\", 'SECONDS', 'MINUTES')" +
-                " limit 70", tableNameWithSuffix);
+        String expectedPql = """
+                SELECT datetimeconvert("DaysSinceEpoch", '1:SECONDS:EPOCH',\
+                 '1:MILLISECONDS:EPOCH', '15:MINUTES'), count(*) AS "bar",\
+                 not_equals(CASE WHEN equals("OriginCityName", 'nyc') THEN 'pizza' WHEN equals("OriginCityName", 'la') THEN 'burrito'\
+                 WHEN equals("OriginCityName", 'boston') THEN 'clam chowder' ELSE 'burger' END, 'salad'),\
+                 timeconvert("DaysSinceEpoch", 'SECONDS', 'MINUTES') AS "foo",\
+                 max("AirTime") AS "baz"\
+                 FROM %s\
+                 GROUP BY datetimeconvert("DaysSinceEpoch", '1:SECONDS:EPOCH', '1:MILLISECONDS:EPOCH', '15:MINUTES'),\
+                 not_equals(CASE WHEN equals("OriginCityName", 'nyc') THEN 'pizza' WHEN equals("OriginCityName", 'la') THEN 'burrito' WHEN equals("OriginCityName", 'boston') THEN 'clam chowder' ELSE 'burger' END, 'salad'),\
+                 timeconvert("DaysSinceEpoch", 'SECONDS', 'MINUTES')\
+                 LIMIT 70""".formatted(tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
@@ -329,9 +370,13 @@ public void testOrderBy()
     {
         String tableName = hybridTable.getTableName();
         String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
-        String query = format("select ArrDelay + 34 - DaysSinceEpoch, FlightNum from %s order by ArrDelay asc, DaysSinceEpoch desc", tableNameWithSuffix);
+        String query = "SELECT ArrDelay + 34 - DaysSinceEpoch, FlightNum FROM %s ORDER BY ArrDelay ASC, DaysSinceEpoch DESC".formatted(tableNameWithSuffix);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select plus(\"ArrDelay\", '34') - \"DaysSinceEpoch\", \"FlightNum\" from %s order by \"ArrDelay\", \"DaysSinceEpoch\" desc limit 10", tableNameWithSuffix);
+        String expectedPql = """
+                SELECT plus("ArrDelay", '34') - "DaysSinceEpoch", "FlightNum"\
+                 FROM %s\
+                 ORDER BY "ArrDelay", "DaysSinceEpoch" DESC\
+                 LIMIT 10""".formatted(tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
@@ -341,9 +386,13 @@ public void testOrderByCountStar()
     {
         String tableName = hybridTable.getTableName();
         String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
-        String query = format("select count(*) from %s order by count(*)", tableNameWithSuffix);
+        String query = "SELECT count(*) FROM %s ORDER BY count(*)".formatted(tableNameWithSuffix);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select count(*) from %s order by count(*) limit 10", tableNameWithSuffix);
+        String expectedPql = """
+                SELECT count(*)\
+                 FROM %s\
+                 ORDER BY count(*)\
+                 LIMIT 10""".formatted(tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
@@ -353,9 +402,13 @@ public void testOrderByExpression()
     {
         String tableName = hybridTable.getTableName();
         String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
-        String query = format("select ArrDelay + 34 - DaysSinceEpoch, FlightNum from %s order by ArrDelay + 34 - DaysSinceEpoch desc", tableNameWithSuffix);
+        String query = "SELECT ArrDelay + 34 - DaysSinceEpoch, FlightNum FROM %s ORDER BY ArrDelay + 34 - DaysSinceEpoch desc".formatted(tableNameWithSuffix);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select plus(\"ArrDelay\", '34') - \"DaysSinceEpoch\", \"FlightNum\" from %s order by plus(\"ArrDelay\", '34') - \"DaysSinceEpoch\" desc limit 10", tableNameWithSuffix);
+        String expectedPql = """
+                SELECT plus("ArrDelay", '34') - "DaysSinceEpoch", "FlightNum"\
+                 FROM %s\
+                 ORDER BY plus("ArrDelay", '34') - "DaysSinceEpoch" DESC\
+                 LIMIT 10""".formatted(tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
@@ -365,9 +418,15 @@ public void testQuotesInAlias()
     {
         String tableName = "quotes_in_column_names";
         String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
-        String query = format("select non_quoted AS \"non\"\"quoted\" from %s limit 50", tableNameWithSuffix);
+        String query = """
+                SELECT non_quoted AS "non""quoted"
+                FROM %s
+                LIMIT 50""".formatted(tableNameWithSuffix);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select \"non_quoted\" AS \"non\"\"quoted\" from %s limit 50", tableNameWithSuffix);
+        String expectedPql = """
+                SELECT "non_quoted" AS "non""quoted"\
+                 FROM %s\
+                 LIMIT 50""".formatted(tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
@@ -377,9 +436,38 @@ public void testQuotesInColumnName()
     {
         String tableName = "quotes_in_column_names";
         String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
-        String query = format("select \"qu\"\"ot\"\"ed\" from %s limit 50", tableNameWithSuffix);
+        String query = """
+                SELECT "qu""ot""ed"
+                FROM %s
+                LIMIT 50""".formatted(tableNameWithSuffix);
         DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
-        String expectedPql = format("select \"qu\"\"ot\"\"ed\" from %s limit 50", tableNameWithSuffix);
+        String expectedPql = """
+                SELECT "qu""ot""ed"\
+                 FROM %s\
+                 LIMIT 50""".formatted(tableNameWithSuffix);
+        assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
+        assertEquals(dynamicTable.getTableName(), tableName);
+    }
+
+    @Test
+    public void testQueryOptions()
+    {
+        String tableName = realtimeOnlyTable.getTableName();
+        String tableNameWithSuffix = tableName + REALTIME_SUFFIX;
+        String query = """
+                SET skipUpsert='true';
+                SET useMultistageEngine='true';
+                SELECT FlightNum
+                FROM %s
+                LIMIT 50;
+                """.formatted(tableNameWithSuffix);
+        DynamicTable dynamicTable = buildFromPql(pinotMetadata, new SchemaTableName("default", query), mockClusterInfoFetcher, TESTING_TYPE_CONVERTER);
+        String expectedPql = """
+                SET skipUpsert = 'true';
+                SET useMultistageEngine = 'true';
+                SELECT "FlightNum" \
+                FROM %s \
+                LIMIT 50""".formatted(tableNameWithSuffix);
         assertEquals(extractPql(dynamicTable, TupleDomain.all()), expectedPql);
         assertEquals(dynamicTable.getTableName(), tableName);
     }
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotConnectorSmokeTest.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotConnectorSmokeTest.java
new file mode 100644
index 000000000000..cf7472454d90
--- /dev/null
+++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotConnectorSmokeTest.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed 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 io.trino.plugin.pinot;
+
+public class TestPinotConnectorSmokeTest
+        extends BasePinotConnectorSmokeTest
+{
+    @Override
+    protected boolean isSecured()
+    {
+        return false;
+    }
+}
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotLatestConnectorSmokeTest.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotLatestConnectorSmokeTest.java
new file mode 100644
index 000000000000..e68cfaa7144d
--- /dev/null
+++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotLatestConnectorSmokeTest.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed 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 io.trino.plugin.pinot;
+
+import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_LATEST_IMAGE_NAME;
+
+public class TestPinotLatestConnectorSmokeTest
+        extends BasePinotConnectorSmokeTest
+{
+    @Override
+    protected boolean isSecured()
+    {
+        return false;
+    }
+
+    @Override
+    protected String getPinotImageName()
+    {
+        return PINOT_LATEST_IMAGE_NAME;
+    }
+}
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotLatestNoGrpcConnectorSmokeTest.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotLatestNoGrpcConnectorSmokeTest.java
new file mode 100644
index 000000000000..229c8c4a3213
--- /dev/null
+++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotLatestNoGrpcConnectorSmokeTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed 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 io.trino.plugin.pinot;
+
+import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_LATEST_IMAGE_NAME;
+
+public class TestPinotLatestNoGrpcConnectorSmokeTest
+        extends BasePinotConnectorSmokeTest
+{
+    @Override
+    protected boolean isSecured()
+    {
+        return false;
+    }
+
+    @Override
+    protected String getPinotImageName()
+    {
+        return PINOT_LATEST_IMAGE_NAME;
+    }
+
+    @Override
+    protected boolean isGrpcEnabled()
+    {
+        return false;
+    }
+}
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotSecuredConnectorSmokeTest.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotSecuredConnectorSmokeTest.java
new file mode 100644
index 000000000000..42894ca2ee90
--- /dev/null
+++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotSecuredConnectorSmokeTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed 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 io.trino.plugin.pinot;
+
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Map;
+
+import static io.trino.plugin.pinot.auth.PinotAuthenticationType.PASSWORD;
+
+public class TestPinotSecuredConnectorSmokeTest
+        extends BasePinotConnectorSmokeTest
+{
+    @Override
+    protected boolean isSecured()
+    {
+        return true;
+    }
+
+    @Override
+    protected Map<String, String> additionalPinotProperties()
+    {
+        return ImmutableMap.<String, String>builder()
+                .put("pinot.controller.authentication.type", PASSWORD.name())
+                .put("pinot.controller.authentication.user", "admin")
+                .put("pinot.controller.authentication.password", "verysecret")
+                .put("pinot.broker.authentication.type", PASSWORD.name())
+                .put("pinot.broker.authentication.user", "query")
+                .put("pinot.broker.authentication.password", "secret")
+                .buildOrThrow();
+    }
+}
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotWithoutAuthenticationIntegrationConnectorConnectorSmokeTest.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotWithoutAuthenticationIntegrationConnectorConnectorSmokeTest.java
deleted file mode 100644
index 424aa53ec07d..000000000000
--- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotWithoutAuthenticationIntegrationConnectorConnectorSmokeTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.pinot;
-
-public class TestPinotWithoutAuthenticationIntegrationConnectorConnectorSmokeTest
-        extends BasePinotIntegrationConnectorSmokeTest
-{
-    @Override
-    protected boolean isSecured()
-    {
-        return false;
-    }
-}
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotWithoutAuthenticationIntegrationLatestVersionConnectorSmokeTest.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotWithoutAuthenticationIntegrationLatestVersionConnectorSmokeTest.java
deleted file mode 100644
index 6555cdbe69b1..000000000000
--- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotWithoutAuthenticationIntegrationLatestVersionConnectorSmokeTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.pinot;
-
-import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_LATEST_IMAGE_NAME;
-
-public class TestPinotWithoutAuthenticationIntegrationLatestVersionConnectorSmokeTest
-        extends BasePinotIntegrationConnectorSmokeTest
-{
-    @Override
-    protected boolean isSecured()
-    {
-        return false;
-    }
-
-    @Override
-    protected String getPinotImageName()
-    {
-        return PINOT_LATEST_IMAGE_NAME;
-    }
-}
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotWithoutAuthenticationIntegrationLatestVersionNoGrpcConnectorSmokeTest.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotWithoutAuthenticationIntegrationLatestVersionNoGrpcConnectorSmokeTest.java
deleted file mode 100644
index 274e6f2da1a0..000000000000
--- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotWithoutAuthenticationIntegrationLatestVersionNoGrpcConnectorSmokeTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.pinot;
-
-import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_LATEST_IMAGE_NAME;
-
-public class TestPinotWithoutAuthenticationIntegrationLatestVersionNoGrpcConnectorSmokeTest
-        extends BasePinotIntegrationConnectorSmokeTest
-{
-    @Override
-    protected boolean isSecured()
-    {
-        return false;
-    }
-
-    @Override
-    protected String getPinotImageName()
-    {
-        return PINOT_LATEST_IMAGE_NAME;
-    }
-
-    @Override
-    protected boolean isGrpcEnabled()
-    {
-        return false;
-    }
-}
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestSecuredPinotIntegrationConnectorSmokeTest.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestSecuredPinotIntegrationConnectorSmokeTest.java
deleted file mode 100644
index 4cd780e1b046..000000000000
--- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestSecuredPinotIntegrationConnectorSmokeTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed 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 io.trino.plugin.pinot;
-
-import com.google.common.collect.ImmutableMap;
-
-import java.util.Map;
-
-import static io.trino.plugin.pinot.auth.PinotAuthenticationType.PASSWORD;
-
-public class TestSecuredPinotIntegrationConnectorSmokeTest
-        extends BasePinotIntegrationConnectorSmokeTest
-{
-    @Override
-    protected boolean isSecured()
-    {
-        return true;
-    }
-
-    @Override
-    protected Map<String, String> additionalPinotProperties()
-    {
-        return ImmutableMap.<String, String>builder()
-                .put("pinot.controller.authentication.type", PASSWORD.name())
-                .put("pinot.controller.authentication.user", "admin")
-                .put("pinot.controller.authentication.password", "verysecret")
-                .put("pinot.broker.authentication.type", PASSWORD.name())
-                .put("pinot.broker.authentication.user", "query")
-                .put("pinot.broker.authentication.password", "secret")
-                .buildOrThrow();
-    }
-}
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestingPinotCluster.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestingPinotCluster.java
index c3d717ea0d31..874d01c797cf 100644
--- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestingPinotCluster.java
+++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestingPinotCluster.java
@@ -56,9 +56,9 @@
 import static io.airlift.http.client.JsonResponseHandler.createJsonResponseHandler;
 import static io.airlift.json.JsonCodec.jsonCodec;
 import static io.airlift.json.JsonCodec.listJsonCodec;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 import static org.apache.pinot.common.utils.http.HttpClient.DEFAULT_SOCKET_TIMEOUT_MS;
 import static org.testcontainers.containers.KafkaContainer.ZOOKEEPER_PORT;
 import static org.testcontainers.utility.DockerImageName.parse;
diff --git a/plugin/trino-pinot/src/test/resources/json_offlineSpec.json b/plugin/trino-pinot/src/test/resources/json_offlineSpec.json
index 0f93e1e147b2..cdbbc6e0fa67 100644
--- a/plugin/trino-pinot/src/test/resources/json_offlineSpec.json
+++ b/plugin/trino-pinot/src/test/resources/json_offlineSpec.json
@@ -1,5 +1,5 @@
 {
-    "tableName": "json_table",
+    "tableName": "json_type_table",
     "tableType": "OFFLINE",
     "segmentsConfig": {
         "timeColumnName": "updated_at_seconds",
diff --git a/plugin/trino-pinot/src/test/resources/json_realtimeSpec.json b/plugin/trino-pinot/src/test/resources/json_realtimeSpec.json
index d52d2decff3e..b61a31bf2548 100644
--- a/plugin/trino-pinot/src/test/resources/json_realtimeSpec.json
+++ b/plugin/trino-pinot/src/test/resources/json_realtimeSpec.json
@@ -1,5 +1,5 @@
 {
-    "tableName": "json_table",
+    "tableName": "json_type_table",
     "tableType": "REALTIME",
     "segmentsConfig": {
         "timeColumnName": "updated_at_seconds",
@@ -9,7 +9,7 @@
         "segmentPushType": "APPEND",
         "segmentPushFrequency": "daily",
         "segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy",
-        "schemaName": "json_table",
+        "schemaName": "json_type_table",
         "replicasPerPartition": "1"
     },
     "tenants": {
@@ -24,7 +24,7 @@
         "streamConfigs": {
             "streamType": "kafka",
             "stream.kafka.consumer.type": "LowLevel",
-            "stream.kafka.topic.name": "json_table",
+            "stream.kafka.topic.name": "json_type_table",
             "stream.kafka.decoder.class.name": "org.apache.pinot.plugin.inputformat.avro.confluent.KafkaConfluentSchemaRegistryAvroMessageDecoder",
             "stream.kafka.consumer.factory.class.name": "org.apache.pinot.plugin.stream.kafka20.KafkaConsumerFactory",
             "stream.kafka.decoder.prop.schema.registry.rest.url": "http://schema-registry:8081",
@@ -35,7 +35,7 @@
             "realtime.segment.flush.desired.size": "1M",
             "isolation.level": "read_committed",
             "stream.kafka.consumer.prop.auto.offset.reset": "smallest",
-            "stream.kafka.consumer.prop.group.id": "json_table"
+            "stream.kafka.consumer.prop.group.id": "json_type_table"
         }
     },
     "metadata": {
diff --git a/plugin/trino-pinot/src/test/resources/json_schema.json b/plugin/trino-pinot/src/test/resources/json_schema.json
index a6b1c20db3a4..aa6005b91266 100644
--- a/plugin/trino-pinot/src/test/resources/json_schema.json
+++ b/plugin/trino-pinot/src/test/resources/json_schema.json
@@ -1,5 +1,5 @@
 {
-    "schemaName": "json_table",
+    "schemaName": "json_type_table",
     "dimensionFieldSpecs": [
         {
             "name": "string_col",
diff --git a/plugin/trino-postgresql/pom.xml b/plugin/trino-postgresql/pom.xml
index e902ffceb5d3..87c504bfe5e8 100644
--- a/plugin/trino-postgresql/pom.xml
+++ b/plugin/trino-postgresql/pom.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-postgresql</artifactId>
-    <description>Trino - PostgreSQL Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - PostgreSQL Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,13 +19,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-base-jdbc</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -39,23 +39,18 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-base-jdbc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -73,7 +68,42 @@
             <artifactId>postgresql</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>concurrent</artifactId>
@@ -98,32 +128,18 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -169,6 +185,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
@@ -199,12 +222,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -217,6 +234,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
@@ -236,42 +259,30 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/Test*FailureRecoveryTest.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>fte-tests</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/Test*FailureRecoveryTest.java</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlClient.java b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlClient.java
index 4da5d2e6da2c..c4a87c4df937 100644
--- a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlClient.java
+++ b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlClient.java
@@ -17,11 +17,13 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.math.LongMath;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
 import io.trino.plugin.base.aggregation.AggregateFunctionRewriter;
 import io.trino.plugin.base.aggregation.AggregateFunctionRule;
 import io.trino.plugin.base.expression.ConnectorExpressionRewriter;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcClient;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.BooleanReadFunction;
@@ -69,12 +71,12 @@
 import io.trino.plugin.jdbc.expression.RewriteComparison;
 import io.trino.plugin.jdbc.expression.RewriteIn;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.plugin.postgresql.PostgreSqlConfig.ArrayMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
-import io.trino.spi.block.SingleMapBlock;
+import io.trino.spi.block.MapBlock;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorSession;
@@ -109,8 +111,6 @@
 import org.postgresql.core.TypeInfo;
 import org.postgresql.jdbc.PgConnection;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.sql.Array;
 import java.sql.Connection;
@@ -269,7 +269,6 @@ public class PostgreSqlClient
         return FULL_PUSHDOWN.apply(session, simplifiedDomain);
     };
 
-    private final boolean disableAutomaticFetchSize;
     private final Type jsonType;
     private final Type uuidType;
     private final MapType varcharMapType;
@@ -290,7 +289,6 @@ public PostgreSqlClient(
             RemoteQueryModifier queryModifier)
     {
         super("\"", connectionFactory, queryBuilder, config.getJdbcTypesMappedToVarchar(), identifierMapping, queryModifier, true);
-        this.disableAutomaticFetchSize = postgreSqlConfig.isDisableAutomaticFetchSize();
         this.jsonType = typeManager.getType(new TypeSignature(JSON));
         this.uuidType = typeManager.getType(new TypeSignature(StandardTypes.UUID));
         this.varcharMapType = (MapType) typeManager.getType(mapType(VARCHAR.getTypeSignature(), VARCHAR.getTypeSignature()));
@@ -408,12 +406,9 @@ public PreparedStatement getPreparedStatement(Connection connection, String sql,
         // fetch-size is ignored when connection is in auto-commit
         connection.setAutoCommit(false);
         PreparedStatement statement = connection.prepareStatement(sql);
-        if (disableAutomaticFetchSize) {
-            statement.setFetchSize(1000);
-        }
         // This is a heuristic, not exact science. A better formula can perhaps be found with measurements.
         // Column count is not known for non-SELECT queries. Not setting fetch size for these.
-        else if (columnCount.isPresent()) {
+        if (columnCount.isPresent()) {
             statement.setFetchSize(max(100_000 / columnCount.get(), 1_000));
         }
         return statement;
@@ -667,6 +662,21 @@ private Optional<ColumnMapping> arrayToTrinoType(ConnectorSession session, Conne
         throw new IllegalStateException("Unsupported array mapping type: " + arrayMapping);
     }
 
+    @Override
+    public Optional<Type> getSupportedType(ConnectorSession session, Type type)
+    {
+        if (type instanceof TimeType timeType && timeType.getPrecision() > POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION) {
+            return Optional.of(createTimeType(POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION));
+        }
+        if (type instanceof TimestampType timestampType && timestampType.getPrecision() > POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION) {
+            return Optional.of(createTimestampType(POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION));
+        }
+        if (type instanceof TimestampWithTimeZoneType timestampWithTimeZoneType && timestampWithTimeZoneType.getPrecision() > POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION) {
+            return Optional.of(createTimestampWithTimeZoneType(POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION));
+        }
+        return Optional.empty();
+    }
+
     @Override
     public WriteMapping toWriteMapping(ConnectorSession session, Type type)
     {
@@ -726,29 +736,21 @@ public WriteMapping toWriteMapping(ConnectorSession session, Type type)
         }
 
         if (type instanceof TimeType timeType) {
-            if (timeType.getPrecision() <= POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION) {
-                return WriteMapping.longMapping(format("time(%s)", timeType.getPrecision()), timeWriteFunction(timeType.getPrecision()));
-            }
-            return WriteMapping.longMapping(format("time(%s)", POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION), timeWriteFunction(POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION));
+            verify(timeType.getPrecision() <= POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION);
+            return WriteMapping.longMapping(format("time(%s)", timeType.getPrecision()), timeWriteFunction(timeType.getPrecision()));
         }
 
         if (type instanceof TimestampType timestampType) {
-            if (timestampType.getPrecision() <= POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION) {
-                verify(timestampType.getPrecision() <= TimestampType.MAX_SHORT_PRECISION);
-                return WriteMapping.longMapping(format("timestamp(%s)", timestampType.getPrecision()), PostgreSqlClient::shortTimestampWriteFunction);
-            }
-            verify(timestampType.getPrecision() > TimestampType.MAX_SHORT_PRECISION);
-            return WriteMapping.objectMapping(format("timestamp(%s)", POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION), longTimestampWriteFunction());
+            verify(timestampType.getPrecision() <= POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION);
+            return WriteMapping.longMapping(format("timestamp(%s)", timestampType.getPrecision()), PostgreSqlClient::shortTimestampWriteFunction);
         }
         if (type instanceof TimestampWithTimeZoneType timestampWithTimeZoneType) {
-            if (timestampWithTimeZoneType.getPrecision() <= POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION) {
-                String dataType = format("timestamptz(%d)", timestampWithTimeZoneType.getPrecision());
-                if (timestampWithTimeZoneType.getPrecision() <= TimestampWithTimeZoneType.MAX_SHORT_PRECISION) {
-                    return WriteMapping.longMapping(dataType, shortTimestampWithTimeZoneWriteFunction());
-                }
-                return WriteMapping.objectMapping(dataType, longTimestampWithTimeZoneWriteFunction());
+            verify(timestampWithTimeZoneType.getPrecision() <= POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION);
+            String dataType = format("timestamptz(%d)", timestampWithTimeZoneType.getPrecision());
+            if (timestampWithTimeZoneType.isShort()) {
+                return WriteMapping.longMapping(dataType, shortTimestampWithTimeZoneWriteFunction());
             }
-            return WriteMapping.objectMapping(format("timestamptz(%d)", POSTGRESQL_MAX_SUPPORTED_TIMESTAMP_PRECISION), longTimestampWithTimeZoneWriteFunction());
+            return WriteMapping.objectMapping(dataType, longTimestampWithTimeZoneWriteFunction());
         }
         if (type.equals(jsonType)) {
             return WriteMapping.sliceMapping("jsonb", typedVarcharWriteFunction("json"));
@@ -865,6 +867,7 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
         checkArgument(handle.isNamedRelation(), "Unable to delete from synthetic table: %s", handle);
         checkArgument(handle.getLimit().isEmpty(), "Unable to delete when limit is set: %s", handle);
         checkArgument(handle.getSortOrder().isEmpty(), "Unable to delete when sort order is set: %s", handle);
+        checkArgument(handle.getUpdateAssignments().isEmpty(), "Unable to delete when update assignments are set: %s", handle);
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
             PreparedQuery preparedQuery = queryBuilder.prepareDeleteQuery(
@@ -886,6 +889,35 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
         }
     }
 
+    @Override
+    public OptionalLong update(ConnectorSession session, JdbcTableHandle handle)
+    {
+        checkArgument(handle.isNamedRelation(), "Unable to update from synthetic table: %s", handle);
+        checkArgument(handle.getLimit().isEmpty(), "Unable to update when limit is set: %s", handle);
+        checkArgument(handle.getSortOrder().isEmpty(), "Unable to update when sort order is set: %s", handle);
+        checkArgument(!handle.getUpdateAssignments().isEmpty(), "Unable to update when update assignments are not set: %s", handle);
+        try (Connection connection = connectionFactory.openConnection(session)) {
+            verify(connection.getAutoCommit());
+            PreparedQuery preparedQuery = queryBuilder.prepareUpdateQuery(
+                    this,
+                    session,
+                    connection,
+                    handle.getRequiredNamedRelation(),
+                    handle.getConstraint(),
+                    getAdditionalPredicate(handle.getConstraintExpressions(), Optional.empty()),
+                    handle.getUpdateAssignments());
+            try (PreparedStatement preparedStatement = queryBuilder.prepareStatement(this, session, connection, preparedQuery, Optional.empty())) {
+                int affectedRows = preparedStatement.executeUpdate();
+                // In getPreparedStatement we set autocommit to false so here we need an explicit commit
+                connection.commit();
+                return OptionalLong.of(affectedRows);
+            }
+        }
+        catch (SQLException e) {
+            throw new TrinoException(JDBC_ERROR, e);
+        }
+    }
+
     @Override
     public TableStatistics getTableStatistics(ConnectorSession session, JdbcTableHandle handle)
     {
@@ -919,7 +951,10 @@ private TableStatistics readTableStatistics(ConnectorSession session, JdbcTableH
                 return TableStatistics.empty();
             }
             long rowCount = optionalRowCount.get();
-
+            if (rowCount == -1) {
+                // Table has never yet been vacuumed or analyzed
+                return TableStatistics.empty();
+            }
             TableStatistics.Builder tableStatistics = TableStatistics.builder();
             tableStatistics.setRowCount(Estimate.of(rowCount));
 
@@ -1255,7 +1290,7 @@ private ColumnMapping hstoreColumnMapping(ConnectorSession session)
 
     private ObjectReadFunction varcharMapReadFunction()
     {
-        return ObjectReadFunction.of(Block.class, (resultSet, columnIndex) -> {
+        return ObjectReadFunction.of(SqlMap.class, (resultSet, columnIndex) -> {
             @SuppressWarnings("unchecked")
             Map<String, String> map = (Map<String, String>) resultSet.getObject(columnIndex);
             BlockBuilder keyBlockBuilder = varcharMapType.getKeyType().createBlockBuilder(null, map.size());
@@ -1272,18 +1307,24 @@ private ObjectReadFunction varcharMapReadFunction()
                     varcharMapType.getValueType().writeSlice(valueBlockBuilder, utf8Slice(entry.getValue()));
                 }
             }
-            return varcharMapType.createBlockFromKeyValue(Optional.empty(), new int[] {0, map.size()}, keyBlockBuilder.build(), valueBlockBuilder.build())
-                    .getObject(0, Block.class);
+            MapBlock mapBlock = varcharMapType.createBlockFromKeyValue(Optional.empty(), new int[]{0, map.size()}, keyBlockBuilder.build(), valueBlockBuilder.build());
+            return varcharMapType.getObject(mapBlock, 0);
         });
     }
 
     private ObjectWriteFunction hstoreWriteFunction(ConnectorSession session)
     {
-        return ObjectWriteFunction.of(Block.class, (statement, index, block) -> {
-            checkArgument(block instanceof SingleMapBlock, "wrong block type: %s. expected SingleMapBlock", block.getClass().getSimpleName());
+        return ObjectWriteFunction.of(SqlMap.class, (statement, index, sqlMap) -> {
+            int rawOffset = sqlMap.getRawOffset();
+            Block rawKeyBlock = sqlMap.getRawKeyBlock();
+            Block rawValueBlock = sqlMap.getRawValueBlock();
+
+            Type keyType = varcharMapType.getKeyType();
+            Type valueType = varcharMapType.getValueType();
+
             Map<Object, Object> map = new HashMap<>();
-            for (int i = 0; i < block.getPositionCount(); i += 2) {
-                map.put(varcharMapType.getKeyType().getObjectValue(session, block, i), varcharMapType.getValueType().getObjectValue(session, block, i + 1));
+            for (int i = 0; i < sqlMap.getSize(); i++) {
+                map.put(keyType.getObjectValue(session, rawKeyBlock, rawOffset + i), valueType.getObjectValue(session, rawValueBlock, rawOffset + i));
             }
             statement.setObject(index, Collections.unmodifiableMap(map));
         });
diff --git a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlClientModule.java b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlClientModule.java
index e6c612303fd4..38fc87001de5 100644
--- a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlClientModule.java
+++ b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlClientModule.java
@@ -24,7 +24,7 @@
 import io.trino.plugin.jdbc.QueryBuilder;
 import io.trino.plugin.jdbc.RemoteQueryCancellationModule;
 import io.trino.plugin.jdbc.ptf.Query;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
diff --git a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlConfig.java b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlConfig.java
index beb48172d237..f7b0ca32f962 100644
--- a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlConfig.java
+++ b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlConfig.java
@@ -14,31 +14,17 @@
 package io.trino.plugin.postgresql;
 
 import io.airlift.configuration.Config;
+import io.airlift.configuration.DefunctConfig;
 import io.airlift.configuration.LegacyConfig;
+import jakarta.validation.constraints.NotNull;
 
-import javax.validation.constraints.NotNull;
-
+@DefunctConfig("postgresql.disable-automatic-fetch-size")
 public class PostgreSqlConfig
 {
-    private boolean disableAutomaticFetchSize;
     private ArrayMapping arrayMapping = ArrayMapping.DISABLED;
     private boolean includeSystemTables;
     private boolean enableStringPushdownWithCollate;
 
-    @Deprecated
-    public boolean isDisableAutomaticFetchSize()
-    {
-        return disableAutomaticFetchSize;
-    }
-
-    @Deprecated // TODO temporary kill-switch, to be removed
-    @Config("postgresql.disable-automatic-fetch-size")
-    public PostgreSqlConfig setDisableAutomaticFetchSize(boolean disableAutomaticFetchSize)
-    {
-        this.disableAutomaticFetchSize = disableAutomaticFetchSize;
-        return this;
-    }
-
     public enum ArrayMapping
     {
         DISABLED,
diff --git a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlConnectionFactoryModule.java b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlConnectionFactoryModule.java
index 84dab79e42fd..9faa4c0c71fd 100644
--- a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlConnectionFactoryModule.java
+++ b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlConnectionFactoryModule.java
@@ -17,6 +17,7 @@
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DriverConnectionFactory;
@@ -37,10 +38,10 @@ public void setup(Binder binder) {}
     @Provides
     @Singleton
     @ForBaseJdbc
-    public static ConnectionFactory getConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider)
+    public static ConnectionFactory getConnectionFactory(BaseJdbcConfig config, CredentialProvider credentialProvider, OpenTelemetry openTelemetry)
     {
         Properties connectionProperties = new Properties();
         connectionProperties.put(REWRITE_BATCHED_INSERTS.getName(), "true");
-        return new DriverConnectionFactory(new Driver(), config.getConnectionUrl(), connectionProperties, credentialProvider);
+        return new DriverConnectionFactory(new Driver(), config.getConnectionUrl(), connectionProperties, credentialProvider, openTelemetry);
     }
 }
diff --git a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlSessionProperties.java b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlSessionProperties.java
index 2f80fd11b265..240cdb9676c6 100644
--- a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlSessionProperties.java
+++ b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlSessionProperties.java
@@ -14,13 +14,12 @@
 package io.trino.plugin.postgresql;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.plugin.postgresql.PostgreSqlConfig.ArrayMapping;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.spi.session.PropertyMetadata.booleanProperty;
diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/BasePostgresFailureRecoveryTest.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/BasePostgresFailureRecoveryTest.java
index 82864489a332..2545eb4f2600 100644
--- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/BasePostgresFailureRecoveryTest.java
+++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/BasePostgresFailureRecoveryTest.java
@@ -19,11 +19,14 @@
 import io.trino.plugin.jdbc.BaseJdbcFailureRecoveryTest;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
+import org.testng.SkipException;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import static io.trino.plugin.postgresql.PostgreSqlQueryRunner.createPostgreSqlQueryRunner;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public abstract class BasePostgresFailureRecoveryTest
         extends BaseJdbcFailureRecoveryTest
@@ -52,4 +55,26 @@ protected QueryRunner createQueryRunner(
                             "exchange.base-directories", System.getProperty("java.io.tmpdir") + "/trino-local-file-system-exchange-manager"));
                 });
     }
+
+    @Override
+    protected void testUpdateWithSubquery()
+    {
+        assertThatThrownBy(super::testUpdateWithSubquery).hasMessageContaining("Unexpected Join over for-update table scan");
+        throw new SkipException("skipped");
+    }
+
+    @Override
+    protected void testUpdate()
+    {
+        // This simple update on JDBC ends up as a very simple, single-fragment, coordinator-only plan,
+        // which has no ability to recover from errors. This test simply verifies that's still the case.
+        Optional<String> setupQuery = Optional.of("CREATE TABLE <table> AS SELECT * FROM orders");
+        String testQuery = "UPDATE <table> SET shippriority = 101 WHERE custkey = 1";
+        Optional<String> cleanupQuery = Optional.of("DROP TABLE <table>");
+
+        assertThatQuery(testQuery)
+                .withSetupQuery(setupQuery)
+                .withCleanupQuery(cleanupQuery)
+                .isCoordinatorOnly();
+    }
 }
diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlAutomaticJoinPushdown.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlAutomaticJoinPushdown.java
index c725485b7fe8..2d5e084cb759 100644
--- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlAutomaticJoinPushdown.java
+++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlAutomaticJoinPushdown.java
@@ -15,7 +15,8 @@
 
 import io.trino.plugin.jdbc.BaseAutomaticJoinPushdownTest;
 import io.trino.testing.QueryRunner;
-import org.testng.SkipException;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -39,11 +40,12 @@ protected QueryRunner createQueryRunner()
                 List.of());
     }
 
+    @Test
     @Override
+    @Disabled
     public void testJoinPushdownWithEmptyStatsInitially()
     {
         // PostgreSQL automatically collects stats for newly created tables via the autovacuum daemon and this cannot be disabled reliably
-        throw new SkipException("PostgreSQL table statistics are automatically populated");
     }
 
     @Override
diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlCaseInsensitiveMapping.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlCaseInsensitiveMapping.java
index 7af8e82592ed..9e115ab6dbf6 100644
--- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlCaseInsensitiveMapping.java
+++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlCaseInsensitiveMapping.java
@@ -18,17 +18,16 @@
 import io.trino.plugin.jdbc.BaseCaseInsensitiveMappingTest;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.SqlExecutor;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
 
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.REFRESH_PERIOD_DURATION;
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.REFRESH_PERIOD_DURATION;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
 import static java.util.Objects.requireNonNull;
 
 // With case-insensitive-name-matching enabled colliding schema/table names are considered as errors.
 // Some tests here create colliding names which can cause any other concurrent test to fail.
-@Test(singleThreaded = true)
 public class TestPostgreSqlCaseInsensitiveMapping
         extends BaseCaseInsensitiveMappingTest
 {
diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlClient.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlClient.java
index 8c6f4c78e317..45cfc6bcafeb 100644
--- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlClient.java
+++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlClient.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.postgresql;
 
 import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.base.mapping.DefaultIdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ColumnMapping;
 import io.trino.plugin.jdbc.DefaultQueryBuilder;
@@ -27,7 +28,6 @@
 import io.trino.plugin.jdbc.QueryParameter;
 import io.trino.plugin.jdbc.expression.ParameterizedExpression;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.DefaultIdentifierMapping;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorSession;
@@ -236,11 +236,11 @@ public void testConvertOr()
                                                 new ComparisonExpression(
                                                         ComparisonExpression.Operator.EQUAL,
                                                         new SymbolReference("c_bigint_symbol"),
-                                                        LITERAL_ENCODER.toExpression(TEST_SESSION, 42L, BIGINT)),
+                                                        LITERAL_ENCODER.toExpression(42L, BIGINT)),
                                                 new ComparisonExpression(
                                                         ComparisonExpression.Operator.EQUAL,
                                                         new SymbolReference("c_bigint_symbol_2"),
-                                                        LITERAL_ENCODER.toExpression(TEST_SESSION, 415L, BIGINT)))),
+                                                        LITERAL_ENCODER.toExpression(415L, BIGINT)))),
                                 Map.of(
                                         "c_bigint_symbol", BIGINT,
                                         "c_bigint_symbol_2", BIGINT)),
@@ -266,18 +266,18 @@ public void testConvertOrWithAnd()
                                                 new ComparisonExpression(
                                                         ComparisonExpression.Operator.EQUAL,
                                                         new SymbolReference("c_bigint_symbol"),
-                                                        LITERAL_ENCODER.toExpression(TEST_SESSION, 42L, BIGINT)),
+                                                        LITERAL_ENCODER.toExpression(42L, BIGINT)),
                                                 new LogicalExpression(
                                                         LogicalExpression.Operator.AND,
                                                         List.of(
                                                                 new ComparisonExpression(
                                                                         ComparisonExpression.Operator.EQUAL,
                                                                         new SymbolReference("c_bigint_symbol"),
-                                                                        LITERAL_ENCODER.toExpression(TEST_SESSION, 43L, BIGINT)),
+                                                                        LITERAL_ENCODER.toExpression(43L, BIGINT)),
                                                                 new ComparisonExpression(
                                                                         ComparisonExpression.Operator.EQUAL,
                                                                         new SymbolReference("c_bigint_symbol_2"),
-                                                                        LITERAL_ENCODER.toExpression(TEST_SESSION, 44L, BIGINT)))))),
+                                                                        LITERAL_ENCODER.toExpression(44L, BIGINT)))))),
                                 Map.of(
                                         "c_bigint_symbol", BIGINT,
                                         "c_bigint_symbol_2", BIGINT)),
@@ -301,7 +301,7 @@ public void testConvertComparison(ComparisonExpression.Operator operator)
                         new ComparisonExpression(
                                 operator,
                                 new SymbolReference("c_bigint_symbol"),
-                                LITERAL_ENCODER.toExpression(TEST_SESSION, 42L, BIGINT)),
+                                LITERAL_ENCODER.toExpression(42L, BIGINT)),
                         Map.of("c_bigint_symbol", BIGINT)),
                 Map.of("c_bigint_symbol", BIGINT_COLUMN));
 
@@ -340,7 +340,7 @@ public void testConvertArithmeticBinary(ArithmeticBinaryExpression.Operator oper
                                 new ArithmeticBinaryExpression(
                                         operator,
                                         new SymbolReference("c_bigint_symbol"),
-                                        LITERAL_ENCODER.toExpression(TEST_SESSION, 42L, BIGINT)),
+                                        LITERAL_ENCODER.toExpression(42L, BIGINT)),
                                 Map.of("c_bigint_symbol", BIGINT)),
                         Map.of("c_bigint_symbol", BIGINT_COLUMN))
                 .orElseThrow();
diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConfig.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConfig.java
index f51481e69121..8ca80f04f058 100644
--- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConfig.java
+++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConfig.java
@@ -28,7 +28,6 @@ public class TestPostgreSqlConfig
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(PostgreSqlConfig.class)
-                .setDisableAutomaticFetchSize(false)
                 .setArrayMapping(PostgreSqlConfig.ArrayMapping.DISABLED)
                 .setIncludeSystemTables(false)
                 .setEnableStringPushdownWithCollate(false));
@@ -38,14 +37,12 @@ public void testDefaults()
     public void testExplicitPropertyMappings()
     {
         Map<String, String> properties = ImmutableMap.<String, String>builder()
-                .put("postgresql.disable-automatic-fetch-size", "true")
                 .put("postgresql.array-mapping", "AS_ARRAY")
                 .put("postgresql.include-system-tables", "true")
                 .put("postgresql.experimental.enable-string-pushdown-with-collate", "true")
                 .buildOrThrow();
 
         PostgreSqlConfig expected = new PostgreSqlConfig()
-                .setDisableAutomaticFetchSize(true)
                 .setArrayMapping(PostgreSqlConfig.ArrayMapping.AS_ARRAY)
                 .setIncludeSystemTables(true)
                 .setEnableStringPushdownWithCollate(true);
diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConnectorTest.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConnectorTest.java
index c65f7090ac5d..083ab976e1f5 100644
--- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConnectorTest.java
+++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConnectorTest.java
@@ -38,6 +38,7 @@
 import io.trino.testing.sql.TestTable;
 import io.trino.testing.sql.TestView;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.sql.Connection;
@@ -73,6 +74,7 @@
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.IntStream.range;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 public class TestPostgreSqlConnectorTest
@@ -91,58 +93,33 @@ protected QueryRunner createQueryRunner()
     @BeforeClass
     public void setExtensions()
     {
-        onRemoteDatabase().execute("CREATE EXTENSION file_fdw");
+        onRemoteDatabase().execute("CREATE EXTENSION IF NOT EXISTS file_fdw");
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY:
-                return false;
-            case SUPPORTS_PREDICATE_EXPRESSION_PUSHDOWN:
+        return switch (connectorBehavior) {
+            case SUPPORTS_PREDICATE_EXPRESSION_PUSHDOWN -> {
                 // TODO remove once super has this set to true
                 verify(!super.hasBehavior(connectorBehavior));
-                return true;
-
-            case SUPPORTS_TOPN_PUSHDOWN:
-            case SUPPORTS_TOPN_PUSHDOWN_WITH_VARCHAR:
-                return true;
-
-            case SUPPORTS_AGGREGATION_PUSHDOWN_STDDEV:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_VARIANCE:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_COVARIANCE:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_CORRELATION:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_REGRESSION:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT:
-                return true;
-
-            case SUPPORTS_JOIN_PUSHDOWN:
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_EQUALITY:
-                return true;
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-            case SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN_WITH_COMMENT:
-                return false;
-
-            case SUPPORTS_ARRAY:
-                // Arrays are supported conditionally. Check the defaults.
-                return new PostgreSqlConfig().getArrayMapping() != PostgreSqlConfig.ArrayMapping.DISABLED;
-            case SUPPORTS_ROW_TYPE:
-                return false;
-
-            case SUPPORTS_CANCELLATION:
-                return true;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+                yield true;
+            }
+            // Arrays are supported conditionally. Check the defaults.
+            case SUPPORTS_ARRAY -> new PostgreSqlConfig().getArrayMapping() != PostgreSqlConfig.ArrayMapping.DISABLED;
+            case SUPPORTS_CANCELLATION,
+                    SUPPORTS_JOIN_PUSHDOWN,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_EQUALITY,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_TOPN_PUSHDOWN_WITH_VARCHAR -> true;
+            case SUPPORTS_ADD_COLUMN_WITH_COMMENT,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN,
+                    SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY,
+                    SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS,
+                    SUPPORTS_ROW_TYPE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -167,6 +144,93 @@ protected TestTable createTableWithUnsupportedColumn()
                 "(one bigint, two decimal(50,0), three varchar(10))");
     }
 
+    @Test(dataProvider = "testTimestampPrecisionOnCreateTable")
+    public void testTimestampPrecisionOnCreateTable(String inputType, String expectedType)
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_coercion_show_create_table",
+                format("(a %s)", inputType))) {
+            assertEquals(getColumnType(testTable.getName(), "a"), expectedType);
+        }
+    }
+
+    @DataProvider(name = "testTimestampPrecisionOnCreateTable")
+    public static Object[][] timestampPrecisionOnCreateTableProvider()
+    {
+        return new Object[][]{
+                {"timestamp(0)", "timestamp(0)"},
+                {"timestamp(1)", "timestamp(1)"},
+                {"timestamp(2)", "timestamp(2)"},
+                {"timestamp(3)", "timestamp(3)"},
+                {"timestamp(4)", "timestamp(4)"},
+                {"timestamp(5)", "timestamp(5)"},
+                {"timestamp(6)", "timestamp(6)"},
+                {"timestamp(7)", "timestamp(6)"},
+                {"timestamp(8)", "timestamp(6)"},
+                {"timestamp(9)", "timestamp(6)"},
+                {"timestamp(10)", "timestamp(6)"},
+                {"timestamp(11)", "timestamp(6)"},
+                {"timestamp(12)", "timestamp(6)"}
+        };
+    }
+
+    @Test(dataProvider = "testTimestampPrecisionOnCreateTableAsSelect")
+    public void testTimestampPrecisionOnCreateTableAsSelect(String inputType, String tableType, String tableValue)
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_coercion_show_create_table",
+                format("AS SELECT %s a", inputType))) {
+            assertEquals(getColumnType(testTable.getName(), "a"), tableType);
+            assertQuery(
+                    format("SELECT * FROM %s", testTable.getName()),
+                    format("VALUES (%s)", tableValue));
+        }
+    }
+
+    @Test(dataProvider = "testTimestampPrecisionOnCreateTableAsSelect")
+    public void testTimestampPrecisionOnCreateTableAsSelectWithNoData(String inputType, String tableType, String ignored)
+    {
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_coercion_show_create_table",
+                format("AS SELECT %s a WITH NO DATA", inputType))) {
+            assertEquals(getColumnType(testTable.getName(), "a"), tableType);
+        }
+    }
+
+    @DataProvider(name = "testTimestampPrecisionOnCreateTableAsSelect")
+    public static Object[][] timestampPrecisionOnCreateTableAsSelectProvider()
+    {
+        return new Object[][] {
+                {"TIMESTAMP '1970-01-01 00:00:00'", "timestamp(0)", "TIMESTAMP '1970-01-01 00:00:00'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.9'", "timestamp(1)", "TIMESTAMP '1970-01-01 00:00:00.9'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.56'", "timestamp(2)", "TIMESTAMP '1970-01-01 00:00:00.56'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.123'", "timestamp(3)", "TIMESTAMP '1970-01-01 00:00:00.123'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.4896'", "timestamp(4)", "TIMESTAMP '1970-01-01 00:00:00.4896'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.89356'", "timestamp(5)", "TIMESTAMP '1970-01-01 00:00:00.89356'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.123000'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123000'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.999'", "timestamp(3)", "TIMESTAMP '1970-01-01 00:00:00.999'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.123456'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123456'"},
+                {"TIMESTAMP '2020-09-27 12:34:56.1'", "timestamp(1)", "TIMESTAMP '2020-09-27 12:34:56.1'"},
+                {"TIMESTAMP '2020-09-27 12:34:56.9'", "timestamp(1)", "TIMESTAMP '2020-09-27 12:34:56.9'"},
+                {"TIMESTAMP '2020-09-27 12:34:56.123'", "timestamp(3)", "TIMESTAMP '2020-09-27 12:34:56.123'"},
+                {"TIMESTAMP '2020-09-27 12:34:56.123000'", "timestamp(6)", "TIMESTAMP '2020-09-27 12:34:56.123000'"},
+                {"TIMESTAMP '2020-09-27 12:34:56.999'", "timestamp(3)", "TIMESTAMP '2020-09-27 12:34:56.999'"},
+                {"TIMESTAMP '2020-09-27 12:34:56.123456'", "timestamp(6)", "TIMESTAMP '2020-09-27 12:34:56.123456'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.1234561'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123456'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.123456499'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123456'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.123456499999'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123456'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.1234565'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.123457'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.111222333444'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.111222'"},
+                {"TIMESTAMP '1970-01-01 00:00:00.9999995'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:01.000000'"},
+                {"TIMESTAMP '1970-01-01 23:59:59.9999995'", "timestamp(6)", "TIMESTAMP '1970-01-02 00:00:00.000000'"},
+                {"TIMESTAMP '1969-12-31 23:59:59.9999995'", "timestamp(6)", "TIMESTAMP '1970-01-01 00:00:00.000000'"},
+                {"TIMESTAMP '1969-12-31 23:59:59.999999499999'", "timestamp(6)", "TIMESTAMP '1969-12-31 23:59:59.999999'"},
+                {"TIMESTAMP '1969-12-31 23:59:59.9999994'", "timestamp(6)", "TIMESTAMP '1969-12-31 23:59:59.999999'"}};
+    }
+
     @Override
     protected void verifyAddNotNullColumnToNonEmptyTableFailurePermissible(Throwable e)
     {
@@ -703,7 +767,7 @@ public void testOrPredicatePushdown()
         assertThat(query("SELECT * FROM nation WHERE nationkey != 3 OR regionkey != 4")).isFullyPushedDown();
         assertThat(query("SELECT * FROM nation WHERE name = 'ALGERIA' OR regionkey = 4")).isFullyPushedDown();
         assertThat(query("SELECT * FROM nation WHERE name IS NULL OR regionkey = 4")).isFullyPushedDown();
-        assertThat(query("SELECT * FROM nation WHERE name = NULL OR regionkey = 4")).isNotFullyPushedDown(FilterNode.class); // TODO `name = NULL` should be eliminated by the engine
+        assertThat(query("SELECT * FROM nation WHERE name = NULL OR regionkey = 4")).isFullyPushedDown();
     }
 
     @Test
diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlJdbcConnectionCreation.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlJdbcConnectionCreation.java
index 8ef14b24945d..5cc8a3c76021 100644
--- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlJdbcConnectionCreation.java
+++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlJdbcConnectionCreation.java
@@ -19,6 +19,7 @@
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.BaseJdbcConnectionCreationTest;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DriverConnectionFactory;
@@ -30,10 +31,8 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
-import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
 import org.postgresql.Driver;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.util.Optional;
 import java.util.Properties;
@@ -48,7 +47,6 @@
 import static io.trino.tpch.TpchTable.REGION;
 import static java.util.Objects.requireNonNull;
 
-@Test(singleThreaded = true) // inherited from BaseJdbcConnectionCreationTest
 public class TestPostgreSqlJdbcConnectionCreation
         extends BaseJdbcConnectionCreationTest
 {
@@ -61,43 +59,35 @@ protected QueryRunner createQueryRunner()
         CredentialProvider credentialProvider = new StaticCredentialProvider(
                 Optional.of(postgreSqlServer.getUser()),
                 Optional.of(postgreSqlServer.getPassword()));
-        DriverConnectionFactory delegate = new DriverConnectionFactory(new Driver(), postgreSqlServer.getJdbcUrl(), connectionProperties, credentialProvider);
+        DriverConnectionFactory delegate = new DriverConnectionFactory(new Driver(), postgreSqlServer.getJdbcUrl(), connectionProperties, credentialProvider, OpenTelemetry.noop());
         this.connectionFactory = new ConnectionCountingConnectionFactory(delegate);
         return createPostgreSqlQueryRunner(postgreSqlServer, ImmutableList.of(NATION, REGION), connectionFactory);
     }
 
-    @Test(dataProvider = "testCases")
-    public void testJdbcConnectionCreations(@Language("SQL") String query, int expectedJdbcConnectionsCount, Optional<String> errorMessage)
+    @Test
+    public void testJdbcConnectionCreations()
     {
-        assertJdbcConnections(query, expectedJdbcConnectionsCount, errorMessage);
-    }
-
-    @DataProvider
-    public Object[][] testCases()
-    {
-        return new Object[][] {
-                {"SELECT * FROM nation LIMIT 1", 3, Optional.empty()},
-                {"SELECT * FROM nation ORDER BY nationkey LIMIT 1", 3, Optional.empty()},
-                {"SELECT * FROM nation WHERE nationkey = 1", 3, Optional.empty()},
-                {"SELECT avg(nationkey) FROM nation", 2, Optional.empty()},
-                {"SELECT * FROM nation, region", 3, Optional.empty()},
-                {"SELECT * FROM nation n, region r WHERE n.regionkey = r.regionkey", 3, Optional.empty()},
-                {"SELECT * FROM nation JOIN region USING(regionkey)", 5, Optional.empty()},
-                {"SELECT * FROM information_schema.schemata", 1, Optional.empty()},
-                {"SELECT * FROM information_schema.tables", 1, Optional.empty()},
-                {"SELECT * FROM information_schema.columns", 1, Optional.empty()},
-                {"SELECT * FROM nation", 3, Optional.empty()},
-                {"SELECT * FROM TABLE (system.query(query => 'SELECT * FROM tpch.nation'))", 2, Optional.empty()},
-                {"CREATE TABLE copy_of_nation AS SELECT * FROM nation", 6, Optional.empty()},
-                {"INSERT INTO copy_of_nation SELECT * FROM nation", 6, Optional.empty()},
-                {"DELETE FROM copy_of_nation WHERE nationkey = 3", 1, Optional.empty()},
-                {"UPDATE copy_of_nation SET name = 'POLAND' WHERE nationkey = 1", 1, Optional.of(MODIFYING_ROWS_MESSAGE)},
-                {"MERGE INTO copy_of_nation n USING region r ON r.regionkey= n.regionkey WHEN MATCHED THEN DELETE", 1, Optional.of(MODIFYING_ROWS_MESSAGE)},
-                {"DROP TABLE copy_of_nation", 1, Optional.empty()},
-                {"SHOW SCHEMAS", 1, Optional.empty()},
-                {"SHOW TABLES", 1, Optional.empty()},
-                {"SHOW STATS FOR nation", 2, Optional.empty()},
-        };
+        assertJdbcConnections("SELECT * FROM nation LIMIT 1", 3, Optional.empty());
+        assertJdbcConnections("SELECT * FROM nation ORDER BY nationkey LIMIT 1", 3, Optional.empty());
+        assertJdbcConnections("SELECT * FROM nation WHERE nationkey = 1", 3, Optional.empty());
+        assertJdbcConnections("SELECT avg(nationkey) FROM nation", 2, Optional.empty());
+        assertJdbcConnections("SELECT * FROM nation, region", 3, Optional.empty());
+        assertJdbcConnections("SELECT * FROM nation n, region r WHERE n.regionkey = r.regionkey", 3, Optional.empty());
+        assertJdbcConnections("SELECT * FROM nation JOIN region USING(regionkey)", 5, Optional.empty());
+        assertJdbcConnections("SELECT * FROM information_schema.schemata", 1, Optional.empty());
+        assertJdbcConnections("SELECT * FROM information_schema.tables", 1, Optional.empty());
+        assertJdbcConnections("SELECT * FROM information_schema.columns", 1, Optional.empty());
+        assertJdbcConnections("SELECT * FROM nation", 2, Optional.empty());
+        assertJdbcConnections("SELECT * FROM TABLE (system.query(query => 'SELECT * FROM tpch.nation'))", 2, Optional.empty());
+        assertJdbcConnections("CREATE TABLE copy_of_nation AS SELECT * FROM nation", 6, Optional.empty());
+        assertJdbcConnections("INSERT INTO copy_of_nation SELECT * FROM nation", 6, Optional.empty());
+        assertJdbcConnections("DELETE FROM copy_of_nation WHERE nationkey = 3", 1, Optional.empty());
+        assertJdbcConnections("UPDATE copy_of_nation SET name = 'POLAND' WHERE nationkey = 1", 1, Optional.empty());
+        assertJdbcConnections("MERGE INTO copy_of_nation n USING region r ON r.regionkey= n.regionkey WHEN MATCHED THEN DELETE", 1, Optional.of(MODIFYING_ROWS_MESSAGE));
+        assertJdbcConnections("DROP TABLE copy_of_nation", 1, Optional.empty());
+        assertJdbcConnections("SHOW SCHEMAS", 1, Optional.empty());
+        assertJdbcConnections("SHOW TABLES", 1, Optional.empty());
+        assertJdbcConnections("SHOW STATS FOR nation", 2, Optional.empty());
     }
 
     private static DistributedQueryRunner createPostgreSqlQueryRunner(
diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlTableStatistics.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlTableStatistics.java
index 19f17b246699..6aa9538e503e 100644
--- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlTableStatistics.java
+++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlTableStatistics.java
@@ -20,7 +20,7 @@
 import io.trino.testing.sql.TestTable;
 import org.jdbi.v3.core.HandleConsumer;
 import org.jdbi.v3.core.Jdbi;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Properties;
@@ -30,6 +30,7 @@
 import static io.trino.tpch.TpchTable.ORDERS;
 import static java.lang.String.format;
 import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 public class TestPostgreSqlTableStatistics
         extends BaseJdbcTableStatisticsTest
@@ -53,31 +54,11 @@ protected QueryRunner createQueryRunner()
                 ImmutableList.of(ORDERS));
     }
 
+    @Test
     @Override
-    @Test(invocationCount = 10, successPercentage = 50) // PostgreSQL can auto-analyze data before we SHOW STATS
     public void testNotAnalyzed()
     {
-        String tableName = "test_stats_not_analyzed";
-        assertUpdate("DROP TABLE IF EXISTS " + tableName);
-        computeActual(format("CREATE TABLE %s AS SELECT * FROM tpch.tiny.orders", tableName));
-        try {
-            assertQuery(
-                    "SHOW STATS FOR " + tableName,
-                    "VALUES " +
-                            "('orderkey', null, null, null, null, null, null)," +
-                            "('custkey', null, null, null, null, null, null)," +
-                            "('orderstatus', null, null, null, null, null, null)," +
-                            "('totalprice', null, null, null, null, null, null)," +
-                            "('orderdate', null, null, null, null, null, null)," +
-                            "('orderpriority', null, null, null, null, null, null)," +
-                            "('clerk', null, null, null, null, null, null)," +
-                            "('shippriority', null, null, null, null, null, null)," +
-                            "('comment', null, null, null, null, null, null)," +
-                            "(null, null, null, null, 15000, null, null)");
-        }
-        finally {
-            assertUpdate("DROP TABLE " + tableName);
-        }
+        abort("PostgreSQL analyzes tables automatically");
     }
 
     @Override
@@ -331,8 +312,7 @@ public void testMaterializedView()
     }
 
     @Override
-    @Test(dataProvider = "testCaseColumnNamesDataProvider")
-    public void testCaseColumnNames(String tableName)
+    protected void testCaseColumnNames(String tableName)
     {
         executeInPostgres("" +
                 "CREATE TABLE " + tableName + " " +
diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlTypeMapping.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlTypeMapping.java
index b9b27bcefd20..d14f146cba2a 100644
--- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlTypeMapping.java
+++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlTypeMapping.java
@@ -1421,9 +1421,7 @@ public void testTimestampCoercion()
                 .addRoundTrip("TIMESTAMP '1969-12-31 23:59:59.999999499999'", "TIMESTAMP '1969-12-31 23:59:59.999999'")
                 .addRoundTrip("TIMESTAMP '1969-12-31 23:59:59.9999994'", "TIMESTAMP '1969-12-31 23:59:59.999999'")
 
-                // CTAS with Trino, where the coercion is done by the connector
                 .execute(getQueryRunner(), trinoCreateAsSelect("test_timestamp_coercion"))
-                // INSERT with Trino, where the coercion is done by the engine
                 .execute(getQueryRunner(), trinoCreateAndInsert("test_timestamp_coercion"));
     }
 
diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestingPostgreSqlServer.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestingPostgreSqlServer.java
index f62a92f15ccb..d34d9c8e74c1 100644
--- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestingPostgreSqlServer.java
+++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestingPostgreSqlServer.java
@@ -20,6 +20,8 @@
 import org.testcontainers.containers.PostgreSQLContainer;
 
 import java.io.Closeable;
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -36,13 +38,14 @@
 import static io.trino.plugin.jdbc.RemoteDatabaseEvent.Status.CANCELLED;
 import static io.trino.plugin.jdbc.RemoteDatabaseEvent.Status.RUNNING;
 import static io.trino.testing.containers.TestContainers.exposeFixedPorts;
+import static io.trino.testing.containers.TestContainers.startOrReuse;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.function.Predicate.not;
 import static org.testcontainers.containers.PostgreSQLContainer.POSTGRESQL_PORT;
 
 public class TestingPostgreSqlServer
-        implements Closeable
+        implements AutoCloseable
 {
     private static final String USER = "test";
     private static final String PASSWORD = "test";
@@ -57,6 +60,8 @@ public class TestingPostgreSqlServer
 
     private final PostgreSQLContainer<?> dockerContainer;
 
+    private final Closeable cleanup;
+
     public TestingPostgreSqlServer()
     {
         this(false);
@@ -65,7 +70,7 @@ public TestingPostgreSqlServer()
     public TestingPostgreSqlServer(boolean shouldExposeFixedPorts)
     {
         // Use the oldest supported PostgreSQL version
-        dockerContainer = new PostgreSQLContainer<>("postgres:10.20")
+        dockerContainer = new PostgreSQLContainer<>("postgres:11")
                 .withStartupAttempts(3)
                 .withDatabaseName(DATABASE)
                 .withUsername(USER)
@@ -74,9 +79,9 @@ public TestingPostgreSqlServer(boolean shouldExposeFixedPorts)
         if (shouldExposeFixedPorts) {
             exposeFixedPorts(dockerContainer);
         }
-        dockerContainer.start();
+        cleanup = startOrReuse(dockerContainer);
 
-        execute("CREATE SCHEMA tpch");
+        execute("CREATE SCHEMA IF NOT EXISTS tpch");
     }
 
     public void execute(@Language("SQL") String sql)
@@ -162,7 +167,12 @@ public String getJdbcUrl()
     @Override
     public void close()
     {
-        dockerContainer.close();
+        try {
+            cleanup.close();
+        }
+        catch (IOException ioe) {
+            throw new UncheckedIOException(ioe);
+        }
     }
 
     @ResourcePresence
diff --git a/plugin/trino-prometheus/pom.xml b/plugin/trino-prometheus/pom.xml
index 65cd1b54bdb8..74faea8fe804 100644
--- a/plugin/trino-prometheus/pom.xml
+++ b/plugin/trino-prometheus/pom.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-prometheus</artifactId>
-    <description>Trino - Prometheus Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Prometheus Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,8 +18,33 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
         </dependency>
 
         <dependency>
@@ -53,56 +78,56 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>log-manager</artifactId>
@@ -115,37 +140,22 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <artifactId>http-server</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
             <scope>test</scope>
-
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -159,7 +169,6 @@
             <artifactId>trino-main</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -172,7 +181,6 @@
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
             <scope>test</scope>
-
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -187,18 +195,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>http-server</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -215,7 +211,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.4.13</version>
+            <version>4.4.16</version>
             <scope>test</scope>
         </dependency>
 
@@ -227,7 +223,7 @@
 
         <dependency>
             <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-servlet-api</artifactId>
+            <artifactId>jetty-jakarta-servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -243,4 +239,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusClient.java b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusClient.java
index f67fec5a45b8..d49d3abd43ba 100644
--- a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusClient.java
+++ b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusClient.java
@@ -16,12 +16,14 @@
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.http.client.HttpUriBuilder;
 import io.airlift.json.JsonCodec;
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.DoubleType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeManager;
+import jakarta.annotation.Nullable;
 import okhttp3.Credentials;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
@@ -29,9 +31,6 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -164,18 +163,15 @@ private Map<String, Object> fetchMetrics(JsonCodec<Map<String, Object>> metricsC
     public byte[] fetchUri(URI uri)
     {
         Request.Builder requestBuilder = new Request.Builder().url(uri.toString());
-        Response response;
-        try {
-            response = httpClient.newCall(requestBuilder.build()).execute();
+        try (Response response = httpClient.newCall(requestBuilder.build()).execute()) {
             if (response.isSuccessful() && response.body() != null) {
                 return response.body().bytes();
             }
+            throw new TrinoException(PROMETHEUS_UNKNOWN_ERROR, "Bad response " + response.code() + " " + response.message());
         }
         catch (IOException e) {
             throw new TrinoException(PROMETHEUS_UNKNOWN_ERROR, "Error reading metrics", e);
         }
-
-        throw new TrinoException(PROMETHEUS_UNKNOWN_ERROR, "Bad response " + response.code() + " " + response.message());
     }
 
     private Optional<String> getBearerAuthInfoFromFile(Optional<File> bearerTokenFile)
diff --git a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusClock.java b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusClock.java
index 098185f10a4b..c407bfeb472a 100644
--- a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusClock.java
+++ b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusClock.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.prometheus;
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 
 import java.time.Clock;
 import java.time.Instant;
diff --git a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusConnector.java b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusConnector.java
index 4478cb9f2c34..88dcca932f5d 100644
--- a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusConnector.java
+++ b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusConnector.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.prometheus;
 
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.log.Logger;
 import io.trino.spi.connector.Connector;
@@ -23,8 +24,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import static io.trino.plugin.prometheus.PrometheusTransactionHandle.INSTANCE;
 import static java.util.Objects.requireNonNull;
 
diff --git a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusConnectorConfig.java b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusConnectorConfig.java
index 6ed34452f926..5c09de2d3560 100644
--- a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusConnectorConfig.java
+++ b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusConnectorConfig.java
@@ -21,9 +21,8 @@
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.annotation.PostConstruct;
-import javax.validation.constraints.NotNull;
+import jakarta.annotation.PostConstruct;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.net.URI;
diff --git a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusConnectorFactory.java b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusConnectorFactory.java
index 3d3ed81cdbd8..d4e0e3911656 100644
--- a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusConnectorFactory.java
+++ b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusConnectorFactory.java
@@ -24,7 +24,7 @@
 import java.util.Map;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class PrometheusConnectorFactory
@@ -40,7 +40,7 @@ public String getName()
     public Connector create(String catalogName, Map<String, String> requiredConfig, ConnectorContext context)
     {
         requireNonNull(requiredConfig, "requiredConfig is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         try {
             // A plugin is not required to use Guice; it is just very convenient
diff --git a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusMetadata.java b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusMetadata.java
index 4e5e79f4703e..b1b5e828f218 100644
--- a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusMetadata.java
+++ b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusMetadata.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -28,8 +29,6 @@
 import io.trino.spi.connector.SchemaTablePrefix;
 import io.trino.spi.connector.TableNotFoundException;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusQueryResponseParse.java b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusQueryResponseParse.java
index 86ab33b9c630..a6a785ddd6d7 100644
--- a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusQueryResponseParse.java
+++ b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusQueryResponseParse.java
@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.prometheus;
 
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -28,6 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static io.trino.plugin.base.util.JsonUtils.jsonFactory;
 import static io.trino.plugin.prometheus.PrometheusErrorCode.PROMETHEUS_PARSE_ERROR;
 import static java.util.Collections.singletonList;
 
@@ -46,7 +46,7 @@ public PrometheusQueryResponseParse(InputStream response)
     {
         ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JavaTimeModule());
-        JsonParser parser = new JsonFactory().createParser(response);
+        JsonParser parser = jsonFactory().createParser(response);
         while (!parser.isClosed()) {
             JsonToken jsonToken = parser.nextToken();
             if (JsonToken.FIELD_NAME.equals(jsonToken)) {
diff --git a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusRecordCursor.java b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusRecordCursor.java
index 34df2d0658de..40d160635cf8 100644
--- a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusRecordCursor.java
+++ b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusRecordCursor.java
@@ -19,8 +19,11 @@
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.MapBlockBuilder;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.MapType;
@@ -42,6 +45,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.plugin.prometheus.PrometheusClient.TIMESTAMP_COLUMN_TYPE;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DateTimeEncoding.packDateTimeWithZone;
@@ -118,7 +122,7 @@ private Object getFieldValue(int field)
         int columnIndex = fieldToColumnIndex[field];
         switch (columnIndex) {
             case 0:
-                return getBlockFromMap(columnHandles.get(columnIndex).getColumnType(), fields.getLabels());
+                return getSqlMapFromMap(columnHandles.get(columnIndex).getColumnType(), fields.getLabels());
             case 1:
                 return fields.getTimestamp();
             case 2:
@@ -191,35 +195,36 @@ private List<PrometheusStandardizedRow> prometheusResultsInStandardizedForm(List
                 .collect(Collectors.toList());
     }
 
-    static Block getBlockFromMap(Type mapType, Map<?, ?> map)
+    static SqlMap getSqlMapFromMap(Type type, Map<?, ?> map)
     {
         // on functions like COUNT() the Type won't be a MapType
-        if (!(mapType instanceof MapType)) {
+        if (!(type instanceof MapType mapType)) {
             return null;
         }
-        Type keyType = mapType.getTypeParameters().get(0);
-        Type valueType = mapType.getTypeParameters().get(1);
-
-        BlockBuilder mapBlockBuilder = mapType.createBlockBuilder(null, 1);
-        BlockBuilder builder = mapBlockBuilder.beginBlockEntry();
-
-        for (Map.Entry<?, ?> entry : map.entrySet()) {
-            writeObject(builder, keyType, entry.getKey());
-            writeObject(builder, valueType, entry.getValue());
-        }
+        Type keyType = mapType.getKeyType();
+        Type valueType = mapType.getValueType();
 
-        mapBlockBuilder.closeEntry();
-        return (Block) mapType.getObject(mapBlockBuilder, 0);
+        return buildMapValue(mapType, map.size(), (keyBuilder, valueBuilder) -> {
+            map.forEach((key, value) -> {
+                writeObject(keyBuilder, keyType, key);
+                writeObject(valueBuilder, valueType, value);
+            });
+        });
     }
 
-    static Map<Object, Object> getMapFromBlock(Type type, Block block)
+    static Map<Object, Object> getMapFromSqlMap(Type type, SqlMap sqlMap)
     {
         MapType mapType = (MapType) type;
         Type keyType = mapType.getKeyType();
         Type valueType = mapType.getValueType();
-        Map<Object, Object> map = new HashMap<>(block.getPositionCount() / 2);
-        for (int i = 0; i < block.getPositionCount(); i += 2) {
-            map.put(readObject(keyType, block, i), readObject(valueType, block, i + 1));
+
+        int rawOffset = sqlMap.getRawOffset();
+        Block rawKeyBlock = sqlMap.getRawKeyBlock();
+        Block rawValueBlock = sqlMap.getRawValueBlock();
+
+        Map<Object, Object> map = new HashMap<>(sqlMap.getSize());
+        for (int i = 0; i < sqlMap.getSize(); i++) {
+            map.put(readObject(keyType, rawKeyBlock, rawOffset + i), readObject(valueType, rawValueBlock, rawOffset + i));
         }
         return map;
     }
@@ -228,19 +233,19 @@ private static void writeObject(BlockBuilder builder, Type type, Object obj)
     {
         if (type instanceof ArrayType arrayType) {
             Type elementType = arrayType.getElementType();
-            BlockBuilder arrayBuilder = builder.beginBlockEntry();
-            for (Object item : (List<?>) obj) {
-                writeObject(arrayBuilder, elementType, item);
-            }
-            builder.closeEntry();
+            ((ArrayBlockBuilder) builder).buildEntry(elementBuilder -> {
+                for (Object item : (List<?>) obj) {
+                    writeObject(elementBuilder, elementType, item);
+                }
+            });
         }
         else if (type instanceof MapType mapType) {
-            BlockBuilder mapBlockBuilder = builder.beginBlockEntry();
-            for (Map.Entry<?, ?> entry : ((Map<?, ?>) obj).entrySet()) {
-                writeObject(mapBlockBuilder, mapType.getKeyType(), entry.getKey());
-                writeObject(mapBlockBuilder, mapType.getValueType(), entry.getValue());
-            }
-            builder.closeEntry();
+            ((MapBlockBuilder) builder).buildEntry((keyBuilder, valueBuilder) -> {
+                for (Map.Entry<?, ?> entry : ((Map<?, ?>) obj).entrySet()) {
+                    writeObject(keyBuilder, mapType.getKeyType(), entry.getKey());
+                    writeObject(valueBuilder, mapType.getValueType(), entry.getValue());
+                }
+            });
         }
         else {
             if (BOOLEAN.equals(type)
@@ -257,12 +262,12 @@ else if (type instanceof MapType mapType) {
 
     private static Object readObject(Type type, Block block, int position)
     {
-        if (type instanceof ArrayType) {
-            Type elementType = ((ArrayType) type).getElementType();
-            return getArrayFromBlock(elementType, block.getObject(position, Block.class));
+        if (type instanceof ArrayType arrayType) {
+            Type elementType = arrayType.getElementType();
+            return getArrayFromBlock(elementType, arrayType.getObject(block, position));
         }
-        if (type instanceof MapType) {
-            return getMapFromBlock(type, block.getObject(position, Block.class));
+        if (type instanceof MapType mapType) {
+            return getMapFromSqlMap(type, mapType.getObject(block, position));
         }
         if (type.getJavaType() == Slice.class) {
             Slice slice = (Slice) requireNonNull(TypeUtils.readNativeValue(type, block, position));
diff --git a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusRecordSetProvider.java b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusRecordSetProvider.java
index f63481815f46..ce1a990319bc 100644
--- a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusRecordSetProvider.java
+++ b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusRecordSetProvider.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.prometheus;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
 import io.trino.spi.connector.ConnectorSession;
@@ -22,8 +23,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.RecordSet;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusSplitManager.java b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusSplitManager.java
index a8ec6fea5c67..01cca5ee3c8e 100644
--- a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusSplitManager.java
+++ b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusSplitManager.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
+import com.google.inject.Inject;
 import io.airlift.http.client.HttpUriBuilder;
 import io.airlift.units.Duration;
 import io.trino.spi.TrinoException;
@@ -33,8 +34,6 @@
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.TupleDomain;
 
-import javax.inject.Inject;
-
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URI;
diff --git a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusHttpServer.java b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusHttpServer.java
index 82cb3fcdd876..221a9cde652f 100644
--- a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusHttpServer.java
+++ b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusHttpServer.java
@@ -25,11 +25,10 @@
 import io.airlift.http.server.testing.TestingHttpServer;
 import io.airlift.http.server.testing.TestingHttpServerModule;
 import io.airlift.node.testing.TestingNodeModule;
-
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusConnectorConfig.java b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusConnectorConfig.java
index bde3c56764a1..ac8e3c5bee46 100644
--- a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusConnectorConfig.java
+++ b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusConnectorConfig.java
@@ -20,7 +20,6 @@
 
 import java.io.File;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Map;
 
 import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
@@ -34,10 +33,9 @@ public class TestPrometheusConnectorConfig
 {
     @Test
     public void testDefaults()
-            throws URISyntaxException
     {
         assertRecordedDefaults(recordDefaults(PrometheusConnectorConfig.class)
-                .setPrometheusURI(new URI("http://localhost:9090"))
+                .setPrometheusURI(URI.create("http://localhost:9090"))
                 .setQueryChunkSizeDuration(new Duration(1, DAYS))
                 .setMaxQueryRangeDuration(new Duration(21, DAYS))
                 .setCacheDuration(new Duration(30, SECONDS))
@@ -80,10 +78,9 @@ public void testExplicitPropertyMappings()
 
     @Test
     public void testFailOnDurationLessThanQueryChunkConfig()
-            throws Exception
     {
         PrometheusConnectorConfig config = new PrometheusConnectorConfig();
-        config.setPrometheusURI(new URI("http://doesnotmatter.com"));
+        config.setPrometheusURI(URI.create("http://doesnotmatter.com"));
         config.setQueryChunkSizeDuration(new Duration(21, DAYS));
         config.setMaxQueryRangeDuration(new Duration(1, DAYS));
         config.setCacheDuration(new Duration(30, SECONDS));
diff --git a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusRecordSet.java b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusRecordSet.java
index bb84a880406d..cdac316251cc 100644
--- a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusRecordSet.java
+++ b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusRecordSet.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.type.DoubleType;
@@ -31,8 +31,8 @@
 import static io.trino.plugin.prometheus.MetadataUtil.METRIC_CODEC;
 import static io.trino.plugin.prometheus.MetadataUtil.varcharMapType;
 import static io.trino.plugin.prometheus.PrometheusClient.TIMESTAMP_COLUMN_TYPE;
-import static io.trino.plugin.prometheus.PrometheusRecordCursor.getBlockFromMap;
-import static io.trino.plugin.prometheus.PrometheusRecordCursor.getMapFromBlock;
+import static io.trino.plugin.prometheus.PrometheusRecordCursor.getMapFromSqlMap;
+import static io.trino.plugin.prometheus.PrometheusRecordCursor.getSqlMapFromMap;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.time.Instant.ofEpochMilli;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -63,7 +63,7 @@ public void testCursorSimple()
         List<PrometheusStandardizedRow> actual = new ArrayList<>();
         while (cursor.advanceNextPosition()) {
             actual.add(new PrometheusStandardizedRow(
-                    getMapFromBlock(varcharMapType, (Block) cursor.getObject(0)).entrySet().stream()
+                    getMapFromSqlMap(varcharMapType, (SqlMap) cursor.getObject(0)).entrySet().stream()
                             .collect(toImmutableMap(entry -> (String) entry.getKey(), entry -> (String) entry.getValue())),
                     (Instant) cursor.getObject(1),
                     cursor.getDouble(2)));
@@ -87,7 +87,7 @@ public void testCursorSimple()
         for (int i = 0; i < actual.size(); i++) {
             PrometheusStandardizedRow actualRow = actual.get(i);
             PrometheusStandardizedRow expectedRow = expected.get(i);
-            assertEquals(getMapFromBlock(varcharMapType, getBlockFromMap(varcharMapType, actualRow.getLabels())), getMapFromBlock(varcharMapType, getBlockFromMap(varcharMapType, expectedRow.getLabels())));
+            assertEquals(getMapFromSqlMap(varcharMapType, getSqlMapFromMap(varcharMapType, actualRow.getLabels())), getMapFromSqlMap(varcharMapType, getSqlMapFromMap(varcharMapType, expectedRow.getLabels())));
             assertEquals(actualRow.getTimestamp(), expectedRow.getTimestamp());
             assertEquals(actualRow.getValue(), expectedRow.getValue());
         }
diff --git a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusRecordSetProvider.java b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusRecordSetProvider.java
index a332939f5bcc..65613688c21d 100644
--- a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusRecordSetProvider.java
+++ b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusRecordSetProvider.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.connector.ConnectorTableHandle;
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.RecordSet;
@@ -31,7 +31,7 @@
 import static io.trino.plugin.prometheus.MetadataUtil.METRIC_CODEC;
 import static io.trino.plugin.prometheus.MetadataUtil.varcharMapType;
 import static io.trino.plugin.prometheus.PrometheusClient.TIMESTAMP_COLUMN_TYPE;
-import static io.trino.plugin.prometheus.PrometheusRecordCursor.getMapFromBlock;
+import static io.trino.plugin.prometheus.PrometheusRecordCursor.getMapFromSqlMap;
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.time.Instant.ofEpochMilli;
@@ -78,7 +78,7 @@ public void testGetRecordSet()
 
         Map<Instant, Map<?, ?>> actual = new LinkedHashMap<>();
         while (cursor.advanceNextPosition()) {
-            actual.put((Instant) cursor.getObject(1), getMapFromBlock(varcharMapType, (Block) cursor.getObject(0)));
+            actual.put((Instant) cursor.getObject(1), getMapFromSqlMap(varcharMapType, (SqlMap) cursor.getObject(0)));
         }
         Map<Instant, Map<String, String>> expected = ImmutableMap.<Instant, Map<String, String>>builder()
                 .put(ofEpochMilli(1565962969044L), ImmutableMap.of("instance",
diff --git a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusSplit.java b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusSplit.java
index a51309acf5a4..7f347c3ed1cb 100644
--- a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusSplit.java
+++ b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/TestPrometheusSplit.java
@@ -34,7 +34,6 @@
 
 import java.math.BigDecimal;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
@@ -122,7 +121,6 @@ public void testJsonRoundTrip()
 
     @Test
     public void testQueryWithTableNameNeedingURLEncodeInSplits()
-            throws URISyntaxException
     {
         Instant now = LocalDateTime.of(2019, 10, 2, 7, 26, 56, 0).toInstant(UTC);
         PrometheusConnectorConfig config = getCommonConfig(prometheusHttpServer.resolve("/prometheus-data/prom-metrics-non-standard-name.json"));
@@ -142,13 +140,12 @@ public void testQueryWithTableNameNeedingURLEncodeInSplits()
                 config.getQueryChunkSizeDuration().toMillis() -
                 OFFSET_MILLIS * 20);
         assertEquals(queryInSplit,
-                new URI("http://doesnotmatter:9090/api/v1/query?query=up%20now[" + getQueryChunkSizeDurationAsPrometheusCompatibleDurationString(config) + "]" + "&time=" +
+                URI.create("http://doesnotmatter:9090/api/v1/query?query=up%20now[" + getQueryChunkSizeDurationAsPrometheusCompatibleDurationString(config) + "]" + "&time=" +
                         timeShouldBe).getQuery());
     }
 
     @Test
     public void testQueryDividedIntoSplitsFirstSplitHasRightTime()
-            throws URISyntaxException
     {
         Instant now = LocalDateTime.of(2019, 10, 2, 7, 26, 56, 0).toInstant(UTC);
         PrometheusConnectorConfig config = getCommonConfig(prometheusHttpServer.resolve("/prometheus-data/prometheus-metrics.json"));
@@ -168,13 +165,12 @@ public void testQueryDividedIntoSplitsFirstSplitHasRightTime()
                 config.getQueryChunkSizeDuration().toMillis() -
                 OFFSET_MILLIS * 20);
         assertEquals(queryInSplit,
-                new URI("http://doesnotmatter:9090/api/v1/query?query=up[" + getQueryChunkSizeDurationAsPrometheusCompatibleDurationString(config) + "]" + "&time=" +
+                URI.create("http://doesnotmatter:9090/api/v1/query?query=up[" + getQueryChunkSizeDurationAsPrometheusCompatibleDurationString(config) + "]" + "&time=" +
                         timeShouldBe).getQuery());
     }
 
     @Test
     public void testQueryDividedIntoSplitsLastSplitHasRightTime()
-            throws URISyntaxException
     {
         Instant now = LocalDateTime.of(2019, 10, 2, 7, 26, 56, 0).toInstant(UTC);
         PrometheusConnectorConfig config = getCommonConfig(prometheusHttpServer.resolve("/prometheus-data/prometheus-metrics.json"));
@@ -192,7 +188,7 @@ public void testQueryDividedIntoSplitsLastSplitHasRightTime()
         PrometheusSplit lastSplit = (PrometheusSplit) splits.get(lastSplitIndex);
         String queryInSplit = URI.create(lastSplit.getUri()).getQuery();
         String timeShouldBe = decimalSecondString(now.toEpochMilli());
-        URI uriAsFormed = new URI("http://doesnotmatter:9090/api/v1/query?query=up[" +
+        URI uriAsFormed = URI.create("http://doesnotmatter:9090/api/v1/query?query=up[" +
                 getQueryChunkSizeDurationAsPrometheusCompatibleDurationString(config) + "]" +
                 "&time=" + timeShouldBe);
         assertEquals(queryInSplit, uriAsFormed.getQuery());
diff --git a/plugin/trino-raptor-legacy/pom.xml b/plugin/trino-raptor-legacy/pom.xml
index 062a32b8e906..f0b4149b30d6 100644
--- a/plugin/trino-raptor-legacy/pom.xml
+++ b/plugin/trino-raptor-legacy/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-raptor-legacy</artifactId>
-    <description>Trino - Raptor Legacy Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Raptor Legacy Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,23 +19,29 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-memory-context</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-orc</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
 
         <dependency>
@@ -79,24 +85,23 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-memory-context</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-orc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
@@ -105,18 +110,13 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -124,11 +124,6 @@
             <artifactId>joda-time</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.gaul</groupId>
             <artifactId>modernizer-maven-annotations</artifactId>
@@ -149,35 +144,33 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>node</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -187,6 +180,36 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>node</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>http-server</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>jaxrs</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!-- for benchmark -->
         <dependency>
             <groupId>io.trino</groupId>
@@ -194,7 +217,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-client</artifactId>
@@ -239,26 +261,8 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>http-server</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>jaxrs</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -270,7 +274,7 @@
 
         <dependency>
             <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-servlet-api</artifactId>
+            <artifactId>jetty-jakarta-servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -298,4 +302,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorBucketFunction.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorBucketFunction.java
index dad39946f31c..ee2f13535429 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorBucketFunction.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorBucketFunction.java
@@ -83,7 +83,7 @@ private static HashFunction bigintHashFunction()
 
     private static HashFunction intHashFunction()
     {
-        return (block, position) -> XxHash64.hash(INTEGER.getLong(block, position));
+        return (block, position) -> XxHash64.hash(INTEGER.getInt(block, position));
     }
 
     private static HashFunction varcharHashFunction()
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorBucketedUpdateFunction.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorBucketedUpdateFunction.java
index f5d56cb72599..2910c6658d31 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorBucketedUpdateFunction.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorBucketedUpdateFunction.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.raptor.legacy;
 
 import io.trino.spi.Page;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.BucketFunction;
 
 import static io.trino.spi.type.IntegerType.INTEGER;
-import static java.lang.Math.toIntExact;
 
 public class RaptorBucketedUpdateFunction
         implements BucketFunction
@@ -26,7 +25,7 @@ public class RaptorBucketedUpdateFunction
     @Override
     public int getBucket(Page page, int position)
     {
-        Block row = page.getBlock(0).getObject(position, Block.class);
-        return toIntExact(INTEGER.getLong(row, 0)); // bucket field of row ID
+        SqlRow row = page.getBlock(0).getObject(position, SqlRow.class);
+        return INTEGER.getInt(row.getRawFieldBlock(0), row.getRawIndex()); // bucket field of row ID
     }
 }
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorConnector.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorConnector.java
index db782221f6a0..8e362eca5fa0 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorConnector.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorConnector.java
@@ -15,6 +15,8 @@
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.SetMultimap;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.log.Logger;
 import io.trino.plugin.raptor.legacy.metadata.ForMetadata;
@@ -32,12 +34,9 @@
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
+import jakarta.annotation.PostConstruct;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorConnectorFactory.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorConnectorFactory.java
index 675b965750a6..fea02223d51d 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorConnectorFactory.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorConnectorFactory.java
@@ -37,7 +37,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class RaptorConnectorFactory
@@ -64,7 +64,7 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 new CatalogNameModule(catalogName),
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorMergeSink.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorMergeSink.java
index 8fc0369434ae..551b45aca93c 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorMergeSink.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorMergeSink.java
@@ -23,7 +23,6 @@
 import io.trino.plugin.raptor.legacy.storage.StorageManager;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.block.ColumnarRow;
 import io.trino.spi.connector.ConnectorMergeSink;
 import io.trino.spi.connector.ConnectorPageSink;
 import io.trino.spi.connector.MergePage;
@@ -43,7 +42,7 @@
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.json.JsonCodec.jsonCodec;
-import static io.trino.spi.block.ColumnarRow.toColumnarRow;
+import static io.trino.spi.block.RowBlock.getRowFieldsFromBlock;
 import static io.trino.spi.connector.MergePage.createDeleteAndInsertPages;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.IntegerType.INTEGER;
@@ -81,15 +80,15 @@ public void storeMergedRows(Page page)
         mergePage.getInsertionsPage().ifPresent(pageSink::appendPage);
 
         mergePage.getDeletionsPage().ifPresent(deletions -> {
-            ColumnarRow rowIdRow = toColumnarRow(deletions.getBlock(deletions.getChannelCount() - 1));
-            Block shardBucketBlock = rowIdRow.getField(0);
-            Block shardUuidBlock = rowIdRow.getField(1);
-            Block shardRowIdBlock = rowIdRow.getField(2);
+            List<Block> fields = getRowFieldsFromBlock(deletions.getBlock(deletions.getChannelCount() - 1));
+            Block shardBucketBlock = fields.get(0);
+            Block shardUuidBlock = fields.get(1);
+            Block shardRowIdBlock = fields.get(2);
 
-            for (int position = 0; position < rowIdRow.getPositionCount(); position++) {
+            for (int position = 0; position < shardRowIdBlock.getPositionCount(); position++) {
                 OptionalInt bucketNumber = shardBucketBlock.isNull(position)
                         ? OptionalInt.empty()
-                        : OptionalInt.of(toIntExact(INTEGER.getLong(shardBucketBlock, position)));
+                        : OptionalInt.of(INTEGER.getInt(shardBucketBlock, position));
                 UUID uuid = trinoUuidToJavaUuid(UuidType.UUID.getSlice(shardUuidBlock, position));
                 int rowId = toIntExact(BIGINT.getLong(shardRowIdBlock, position));
                 Entry<OptionalInt, BitSet> entry = rowsToDelete.computeIfAbsent(uuid, ignored -> Map.entry(bucketNumber, new BitSet()));
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorMetadata.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorMetadata.java
index 1319aab62707..4b9268970c17 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorMetadata.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorMetadata.java
@@ -349,8 +349,8 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
                 TupleDomain.all(),
                 Optional.of(new ConnectorTablePartitioning(
                         partitioning,
-                        ImmutableList.copyOf(bucketColumnHandles))),
-                oneSplitPerBucket ? Optional.of(ImmutableSet.copyOf(bucketColumnHandles)) : Optional.empty(),
+                        ImmutableList.copyOf(bucketColumnHandles),
+                        oneSplitPerBucket)),
                 Optional.empty(),
                 ImmutableList.of());
     }
@@ -852,9 +852,9 @@ public ConnectorMergeTableHandle beginMerge(ConnectorSession session, ConnectorT
     }
 
     @Override
-    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle tableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
+    public void finishMerge(ConnectorSession session, ConnectorMergeTableHandle mergeTableHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
     {
-        RaptorMergeTableHandle handle = (RaptorMergeTableHandle) tableHandle;
+        RaptorMergeTableHandle handle = (RaptorMergeTableHandle) mergeTableHandle;
         long transactionId = handle.getInsertTableHandle().getTransactionId();
         finishDelete(session, handle.getTableHandle(), transactionId, fragments);
     }
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorMetadataFactory.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorMetadataFactory.java
index c3a75ccd86d5..5a5f5865420e 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorMetadataFactory.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorMetadataFactory.java
@@ -13,12 +13,11 @@
  */
 package io.trino.plugin.raptor.legacy;
 
+import com.google.inject.Inject;
 import io.trino.plugin.raptor.legacy.metadata.ForMetadata;
 import io.trino.plugin.raptor.legacy.metadata.ShardManager;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.inject.Inject;
-
 import java.util.function.LongConsumer;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorModule.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorModule.java
index 6b40b579af9d..460cc13fd172 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorModule.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorModule.java
@@ -17,6 +17,7 @@
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import com.google.inject.multibindings.Multibinder;
 import io.trino.plugin.raptor.legacy.metadata.Distribution;
 import io.trino.plugin.raptor.legacy.metadata.ForMetadata;
@@ -31,8 +32,6 @@
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.sqlobject.SqlObjectPlugin;
 
-import javax.inject.Singleton;
-
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static io.trino.plugin.raptor.legacy.metadata.SchemaDaoUtil.createTablesWithRetry;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorNodePartitioningProvider.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorNodePartitioningProvider.java
index 58d129a52eaa..7b8969efe494 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorNodePartitioningProvider.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorNodePartitioningProvider.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.raptor.legacy;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.Node;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.BucketFunction;
@@ -25,8 +26,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorPageSinkProvider.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorPageSinkProvider.java
index 0cc1737b002e..7a32548b4fd9 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorPageSinkProvider.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorPageSinkProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.raptor.legacy;
 
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 import io.trino.plugin.raptor.legacy.storage.StorageManager;
 import io.trino.plugin.raptor.legacy.storage.StorageManagerConfig;
@@ -27,8 +28,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorPageSourceProvider.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorPageSourceProvider.java
index 447656055328..e266d8562e73 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorPageSourceProvider.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorPageSourceProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.raptor.legacy;
 
+import com.google.inject.Inject;
 import io.trino.orc.OrcReaderOptions;
 import io.trino.plugin.raptor.legacy.storage.StorageManager;
 import io.trino.plugin.raptor.legacy.util.ConcatPageSource;
@@ -27,8 +28,6 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.Iterator;
 import java.util.List;
 import java.util.OptionalInt;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorSessionProperties.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorSessionProperties.java
index 188dc127c3e4..f9f47e1edf25 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorSessionProperties.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorSessionProperties.java
@@ -14,13 +14,12 @@
 package io.trino.plugin.raptor.legacy;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.units.DataSize;
 import io.trino.plugin.raptor.legacy.storage.StorageManagerConfig;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorSplitManager.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorSplitManager.java
index f120ba06bfa9..0bf045b23bac 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorSplitManager.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorSplitManager.java
@@ -14,6 +14,8 @@
 package io.trino.plugin.raptor.legacy;
 
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.trino.plugin.base.CatalogName;
 import io.trino.plugin.raptor.legacy.backup.BackupService;
 import io.trino.plugin.raptor.legacy.metadata.BucketShards;
@@ -32,12 +34,9 @@
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.predicate.TupleDomain;
+import jakarta.annotation.PreDestroy;
 import org.jdbi.v3.core.result.ResultIterator;
 
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorTableProperties.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorTableProperties.java
index fd3894c24026..293f89a602f2 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorTableProperties.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorTableProperties.java
@@ -14,12 +14,11 @@
 package io.trino.plugin.raptor.legacy;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.TypeManager;
 import io.trino.spi.type.TypeSignatureParameter;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.OptionalInt;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorUnbucketedUpdateFunction.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorUnbucketedUpdateFunction.java
index f967f325b1ec..0223c7286d0f 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorUnbucketedUpdateFunction.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorUnbucketedUpdateFunction.java
@@ -15,7 +15,7 @@
 
 import io.airlift.slice.Slice;
 import io.trino.spi.Page;
-import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.connector.BucketFunction;
 import io.trino.spi.type.UuidType;
 
@@ -32,8 +32,8 @@ public RaptorUnbucketedUpdateFunction(int bucketCount)
     @Override
     public int getBucket(Page page, int position)
     {
-        Block row = page.getBlock(0).getObject(position, Block.class);
-        Slice uuid = UuidType.UUID.getSlice(row, 1); // uuid field of row ID
+        SqlRow row = page.getBlock(0).getObject(position, SqlRow.class);
+        Slice uuid = UuidType.UUID.getSlice(row.getRawFieldBlock(1), row.getRawIndex()); // uuid field of row ID
         return (uuid.hashCode() & Integer.MAX_VALUE) % bucketCount;
     }
 }
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupConfig.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupConfig.java
index 509d79a587d4..b081961f8f4e 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupConfig.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupConfig.java
@@ -18,10 +18,9 @@
 import io.airlift.units.Duration;
 import io.airlift.units.MaxDuration;
 import io.airlift.units.MinDuration;
-
-import javax.annotation.Nullable;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupManager.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupManager.java
index a9b664d0116f..0f8284708f88 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupManager.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupManager.java
@@ -14,18 +14,17 @@
 package io.trino.plugin.raptor.legacy.backup;
 
 import com.google.common.io.Files;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.plugin.raptor.legacy.storage.BackupStats;
 import io.trino.plugin.raptor.legacy.storage.StorageService;
 import io.trino.spi.TrinoException;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupModule.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupModule.java
index 63c1b1c0132d..c556232528c7 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupModule.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupModule.java
@@ -18,16 +18,15 @@
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import com.google.inject.util.Providers;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.airlift.configuration.ConfigurationAwareModule;
 import io.trino.plugin.base.CatalogName;
+import jakarta.annotation.Nullable;
 import org.weakref.jmx.MBeanExporter;
 
-import javax.annotation.Nullable;
-import javax.inject.Singleton;
-
 import java.util.Map;
 import java.util.Optional;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupServiceManager.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupServiceManager.java
index b70ac5a614e1..7eef51dbd7f0 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupServiceManager.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/BackupServiceManager.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.raptor.legacy.backup;
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/FileBackupConfig.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/FileBackupConfig.java
index f1ee6d48ae0a..7f54dc56ce44 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/FileBackupConfig.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/FileBackupConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/FileBackupStore.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/FileBackupStore.java
index b835bedbffc9..77da266d28a5 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/FileBackupStore.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/FileBackupStore.java
@@ -14,10 +14,9 @@
 package io.trino.plugin.raptor.legacy.backup;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.inject.Inject;
 import io.trino.spi.TrinoException;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/ForHttpBackup.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/ForHttpBackup.java
index 2c2f864adfdc..7f62f6a0a2b3 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/ForHttpBackup.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/ForHttpBackup.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.raptor.legacy.backup;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForHttpBackup
 {
 }
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/HttpBackupConfig.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/HttpBackupConfig.java
index 83b538e7a7ef..2dfceae6015a 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/HttpBackupConfig.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/HttpBackupConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.net.URI;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/HttpBackupModule.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/HttpBackupModule.java
index 264dbc8af22d..739bc9fa815b 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/HttpBackupModule.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/HttpBackupModule.java
@@ -17,8 +17,7 @@
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
-
-import javax.inject.Singleton;
+import com.google.inject.Singleton;
 
 import java.net.URI;
 import java.util.function.Supplier;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/HttpBackupStore.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/HttpBackupStore.java
index 2bd197e18816..cac0405f8869 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/HttpBackupStore.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/HttpBackupStore.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.raptor.legacy.backup;
 
 import com.google.common.io.ByteStreams;
+import com.google.inject.Inject;
 import io.airlift.http.client.FileBodyGenerator;
 import io.airlift.http.client.HttpClient;
 import io.airlift.http.client.HttpStatus;
@@ -25,8 +26,6 @@
 import io.trino.spi.NodeManager;
 import io.trino.spi.TrinoException;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/TimeoutBackupStore.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/TimeoutBackupStore.java
index 1a2e707af2de..f627b6bf369e 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/TimeoutBackupStore.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/backup/TimeoutBackupStore.java
@@ -20,8 +20,7 @@
 import io.airlift.concurrent.ExecutorServiceAdapter;
 import io.airlift.units.Duration;
 import io.trino.spi.TrinoException;
-
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import java.io.File;
 import java.util.UUID;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/AssignmentLimiter.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/AssignmentLimiter.java
index 84acd69a61a9..fedc32a774c2 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/AssignmentLimiter.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/AssignmentLimiter.java
@@ -14,16 +14,15 @@
 package io.trino.plugin.raptor.legacy.metadata;
 
 import com.google.common.base.Ticker;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.plugin.raptor.legacy.NodeSupplier;
 import io.trino.spi.Node;
 import io.trino.spi.TrinoException;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ColumnStats.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ColumnStats.java
index e9c169d73fba..77b63ffbfe4d 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ColumnStats.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ColumnStats.java
@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseConfig.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseConfig.java
index 3c9648eccb96..26befd10a601 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseConfig.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class DatabaseConfig
 {
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseMetadataModule.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseMetadataModule.java
index b407d706f10e..4cf735884e1d 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseMetadataModule.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseMetadataModule.java
@@ -16,13 +16,12 @@
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.plugin.raptor.legacy.util.DaoSupplier;
 import org.jdbi.v3.core.ConnectionFactory;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.inject.Singleton;
-
 import java.sql.DriverManager;
 
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseShardManager.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseShardManager.java
index 8eec488bd1e3..447981fcf0e0 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseShardManager.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseShardManager.java
@@ -22,9 +22,10 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.plugin.raptor.legacy.NodeSupplier;
 import io.trino.plugin.raptor.legacy.RaptorColumnHandle;
 import io.trino.plugin.raptor.legacy.storage.organization.ShardOrganizerDao;
@@ -40,8 +41,6 @@
 import org.jdbi.v3.core.JdbiException;
 import org.jdbi.v3.core.result.ResultIterator;
 
-import javax.inject.Inject;
-
 import java.sql.Connection;
 import java.sql.JDBCType;
 import java.sql.PreparedStatement;
@@ -64,7 +63,7 @@
 import static com.google.common.base.Throwables.throwIfInstanceOf;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.Iterables.partition;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.plugin.raptor.legacy.RaptorErrorCode.RAPTOR_ERROR;
 import static io.trino.plugin.raptor.legacy.RaptorErrorCode.RAPTOR_EXTERNAL_BATCH_ALREADY_EXISTS;
 import static io.trino.plugin.raptor.legacy.storage.ColumnIndexStatsUtils.jdbcType;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseShardRecorder.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseShardRecorder.java
index 2fa998d5948d..801a570e6c82 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseShardRecorder.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/DatabaseShardRecorder.java
@@ -13,12 +13,11 @@
  */
 package io.trino.plugin.raptor.legacy.metadata;
 
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.plugin.raptor.legacy.util.DaoSupplier;
 import io.trino.spi.TrinoException;
 
-import javax.inject.Inject;
-
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/Distribution.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/Distribution.java
index 239e1db0b761..9ee87bb9f269 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/Distribution.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/Distribution.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.raptor.legacy.metadata;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeId;
@@ -21,8 +22,6 @@
 import org.jdbi.v3.core.mapper.RowMapper;
 import org.jdbi.v3.core.statement.StatementContext;
 
-import javax.inject.Inject;
-
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ForMetadata.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ForMetadata.java
index 6e3324cb0cbe..ee2b31918ddb 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ForMetadata.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ForMetadata.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.raptor.legacy.metadata;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForMetadata
 {
 }
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/H2DatabaseConfig.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/H2DatabaseConfig.java
index a99fc3b88505..e00ef7eea310 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/H2DatabaseConfig.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/H2DatabaseConfig.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.raptor.legacy.metadata;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class H2DatabaseConfig
 {
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/JdbcDatabaseConfig.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/JdbcDatabaseConfig.java
index f0d56c5207a3..0ff540f8631b 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/JdbcDatabaseConfig.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/JdbcDatabaseConfig.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.raptor.legacy.metadata;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class JdbcDatabaseConfig
 {
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/MetadataConfig.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/MetadataConfig.java
index da8db17caa5c..55a1dca3e251 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/MetadataConfig.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/MetadataConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ShardCleaner.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ShardCleaner.java
index d2036ebc1f6c..6fa8169e00cc 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ShardCleaner.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ShardCleaner.java
@@ -17,6 +17,8 @@
 import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.stats.CounterStat;
 import io.airlift.units.Duration;
@@ -24,14 +26,11 @@
 import io.trino.plugin.raptor.legacy.storage.StorageService;
 import io.trino.plugin.raptor.legacy.util.DaoSupplier;
 import io.trino.spi.NodeManager;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.io.File;
 import java.sql.Timestamp;
 import java.util.ArrayList;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ShardCleanerConfig.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ShardCleanerConfig.java
index 63161d3c06ab..9c112b2773df 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ShardCleanerConfig.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/ShardCleanerConfig.java
@@ -18,9 +18,8 @@
 import io.airlift.units.Duration;
 import io.airlift.units.MaxDuration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import static java.util.concurrent.TimeUnit.DAYS;
 import static java.util.concurrent.TimeUnit.HOURS;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/TableColumn.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/TableColumn.java
index 5381d7e3d96c..af07d86df157 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/TableColumn.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/metadata/TableColumn.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.raptor.legacy.metadata;
 
+import com.google.inject.Inject;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.type.Type;
@@ -21,8 +22,6 @@
 import org.jdbi.v3.core.mapper.RowMapper;
 import org.jdbi.v3.core.statement.StatementContext;
 
-import javax.inject.Inject;
-
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.OptionalInt;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/security/RaptorSecurityConfig.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/security/RaptorSecurityConfig.java
index 76a8a9f5be7a..f62552835047 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/security/RaptorSecurityConfig.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/security/RaptorSecurityConfig.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.raptor.legacy.security;
 
 import io.airlift.configuration.Config;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class RaptorSecurityConfig
 {
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/BackupStats.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/BackupStats.java
index d4419453d9ca..8d6c25f19621 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/BackupStats.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/BackupStats.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.raptor.legacy.storage;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.stats.CounterStat;
 import io.airlift.stats.DistributionStat;
 import io.airlift.units.DataSize;
@@ -20,8 +21,6 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import static io.trino.plugin.raptor.legacy.storage.ShardRecoveryManager.dataRate;
 
 @ThreadSafe
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/BucketBalancer.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/BucketBalancer.java
index cbf09f00e192..7003435b3bcb 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/BucketBalancer.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/BucketBalancer.java
@@ -22,6 +22,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multiset;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.stats.CounterStat;
 import io.airlift.units.Duration;
@@ -33,13 +34,11 @@
 import io.trino.plugin.raptor.legacy.metadata.ShardManager;
 import io.trino.spi.Node;
 import io.trino.spi.NodeManager;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/FileStorageService.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/FileStorageService.java
index e44dc8b92f7c..29e2fb6f0a1a 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/FileStorageService.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/FileStorageService.java
@@ -15,12 +15,11 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.spi.TrinoException;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/RaptorPageSource.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/RaptorPageSource.java
index b029156574aa..bbc7aba4661d 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/RaptorPageSource.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/RaptorPageSource.java
@@ -30,7 +30,6 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.UUID;
 
@@ -264,7 +263,6 @@ public Block block(Page sourcePage, long filePosition)
             Block rowIdBlock = RowIdColumn.INSTANCE.block(sourcePage, filePosition);
             return RowBlock.fromFieldBlocks(
                     sourcePage.getPositionCount(),
-                    Optional.empty(),
                     new Block[] {bucketNumberBlock, shardUuidBlock, rowIdBlock});
         }
     }
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/RaptorStorageManager.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/RaptorStorageManager.java
index 4d12b2d7cc51..80365c1fce53 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/RaptorStorageManager.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/RaptorStorageManager.java
@@ -16,6 +16,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
@@ -57,9 +58,7 @@
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/ShardEjector.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/ShardEjector.java
index cf7852eb3f7b..f2279740f514 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/ShardEjector.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/ShardEjector.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.raptor.legacy.storage;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.stats.CounterStat;
 import io.airlift.units.Duration;
@@ -24,13 +25,11 @@
 import io.trino.plugin.raptor.legacy.metadata.ShardMetadata;
 import io.trino.spi.Node;
 import io.trino.spi.NodeManager;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.io.File;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/ShardRecoveryManager.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/ShardRecoveryManager.java
index 1fcd9f85b5cf..e4fda1d06105 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/ShardRecoveryManager.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/ShardRecoveryManager.java
@@ -19,6 +19,7 @@
 import com.google.common.cache.LoadingCache;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
@@ -28,14 +29,12 @@
 import io.trino.plugin.raptor.legacy.util.PrioritizedFifoExecutor;
 import io.trino.spi.NodeManager;
 import io.trino.spi.TrinoException;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileAlreadyExistsException;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/ShardRecoveryStats.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/ShardRecoveryStats.java
index e85a0531abf0..ff25a862cdb4 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/ShardRecoveryStats.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/ShardRecoveryStats.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.raptor.legacy.storage;
 
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.stats.CounterStat;
 import io.airlift.stats.DistributionStat;
 import io.airlift.units.DataSize;
@@ -20,8 +21,6 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 @ThreadSafe
 public class ShardRecoveryStats
 {
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/StorageManagerConfig.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/StorageManagerConfig.java
index 3a71d4285b4e..2ce5a87410cb 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/StorageManagerConfig.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/StorageManagerConfig.java
@@ -23,10 +23,9 @@
 import io.airlift.units.MinDataSize;
 import io.airlift.units.MinDuration;
 import io.trino.orc.OrcReaderOptions;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/OrganizationJobFactory.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/OrganizationJobFactory.java
index ecaf2f85a167..fc9e69134186 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/OrganizationJobFactory.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/OrganizationJobFactory.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.raptor.legacy.storage.organization;
 
+import com.google.inject.Inject;
 import io.trino.plugin.raptor.legacy.metadata.ForMetadata;
 import io.trino.plugin.raptor.legacy.metadata.MetadataDao;
 import io.trino.plugin.raptor.legacy.metadata.ShardManager;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.inject.Inject;
-
 import static io.trino.plugin.raptor.legacy.util.DatabaseUtil.onDemandDao;
 import static java.util.Objects.requireNonNull;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardCompactionManager.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardCompactionManager.java
index 8b5e37af19ef..a8b554259b31 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardCompactionManager.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardCompactionManager.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Multimaps;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
@@ -28,12 +29,10 @@
 import io.trino.plugin.raptor.legacy.storage.StorageManagerConfig;
 import io.trino.spi.NodeManager;
 import io.trino.spi.type.Type;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map.Entry;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardCompactor.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardCompactor.java
index 8f11cfcab2ad..dde85a397068 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardCompactor.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardCompactor.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.stats.CounterStat;
 import io.airlift.stats.DistributionStat;
 import io.trino.orc.OrcReaderOptions;
@@ -37,8 +38,6 @@
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.inject.Inject;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardOrganizationManager.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardOrganizationManager.java
index ecfbec415d68..cb6e1792506f 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardOrganizationManager.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardOrganizationManager.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.plugin.raptor.legacy.metadata.ForMetadata;
@@ -27,12 +28,10 @@
 import io.trino.plugin.raptor.legacy.metadata.Table;
 import io.trino.plugin.raptor.legacy.storage.StorageManagerConfig;
 import io.trino.spi.NodeManager;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardOrganizer.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardOrganizer.java
index 085887551065..19d31a66b8f9 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardOrganizer.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardOrganizer.java
@@ -13,16 +13,15 @@
  */
 package io.trino.plugin.raptor.legacy.storage.organization;
 
+import com.google.inject.Inject;
 import io.airlift.concurrent.ThreadPoolExecutorMBean;
 import io.airlift.log.Logger;
 import io.airlift.stats.CounterStat;
 import io.trino.plugin.raptor.legacy.storage.StorageManagerConfig;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/TemporalFunction.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/TemporalFunction.java
index df01de026319..94c35acdce91 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/TemporalFunction.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/TemporalFunction.java
@@ -33,7 +33,7 @@ private TemporalFunction() {}
     public static int getDay(Type type, Block block, int position)
     {
         if (type.equals(DATE)) {
-            return toIntExact(DATE.getLong(block, position));
+            return DATE.getInt(block, position);
         }
 
         if (type.equals(TIMESTAMP_MILLIS)) {
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/ShardMetadataRecordCursor.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/ShardMetadataRecordCursor.java
index 51a266e7c8ca..710913c502f9 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/ShardMetadataRecordCursor.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/ShardMetadataRecordCursor.java
@@ -24,7 +24,6 @@
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.SchemaTableName;
-import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
 import org.jdbi.v3.core.Jdbi;
@@ -35,10 +34,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkPositionIndex;
@@ -53,9 +50,11 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DateType.DATE;
 import static io.trino.spi.type.TimestampType.TIMESTAMP_MILLIS;
+import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.spi.type.VarcharType.createVarcharType;
 import static java.lang.String.format;
+import static java.util.Collections.emptySet;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
 
@@ -331,36 +330,18 @@ private List<String> getMappedColumnNames(String minTimestampColumn, String maxT
     @VisibleForTesting
     static Iterator<Long> getTableIds(Jdbi dbi, TupleDomain<Integer> tupleDomain)
     {
-        Map<Integer, Domain> domains = tupleDomain.getDomains().get();
-        Domain schemaNameDomain = domains.get(getColumnIndex(SHARD_METADATA, SCHEMA_NAME));
-        Domain tableNameDomain = domains.get(getColumnIndex(SHARD_METADATA, TABLE_NAME));
-
-        List<String> values = new ArrayList<>();
-        StringBuilder sql = new StringBuilder("SELECT table_id FROM tables ");
-        if (schemaNameDomain != null || tableNameDomain != null) {
-            sql.append("WHERE ");
-            List<String> predicates = new ArrayList<>();
-            if (tableNameDomain != null && tableNameDomain.isSingleValue()) {
-                predicates.add("table_name = ?");
-                values.add(getStringValue(tableNameDomain.getSingleValue()));
-            }
-            if (schemaNameDomain != null && schemaNameDomain.isSingleValue()) {
-                predicates.add("schema_name = ?");
-                values.add(getStringValue(schemaNameDomain.getSingleValue()));
-            }
-            sql.append(Joiner.on(" AND ").join(predicates));
-        }
-
         ImmutableList.Builder<Long> tableIds = ImmutableList.builder();
         try (Connection connection = dbi.open().getConnection();
-                PreparedStatement statement = connection.prepareStatement(sql.toString())) {
-            for (int i = 0; i < values.size(); i++) {
-                statement.setString(i + 1, values.get(i));
-            }
-            try (ResultSet resultSet = statement.executeQuery()) {
-                while (resultSet.next()) {
-                    tableIds.add(resultSet.getLong("table_id"));
-                }
+                PreparedStatement statement = PreparedStatementBuilder.create(
+                        connection,
+                        "SELECT table_id FROM tables ",
+                        List.of("schema_name", "table_name"),
+                        List.of(VARCHAR, VARCHAR),
+                        emptySet(),
+                        tupleDomain.filter((key, domain) -> (key == 0) || (key == 1)));
+                ResultSet resultSet = statement.executeQuery()) {
+            while (resultSet.next()) {
+                tableIds.add(resultSet.getLong("table_id"));
             }
         }
         catch (SQLException | JdbiException e) {
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/ShardMetadataSystemTable.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/ShardMetadataSystemTable.java
index 2ce73206f7c2..b4e7a8364746 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/ShardMetadataSystemTable.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/ShardMetadataSystemTable.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.raptor.legacy.systemtables;
 
+import com.google.inject.Inject;
 import io.trino.plugin.raptor.legacy.metadata.ForMetadata;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTableMetadata;
@@ -22,8 +23,6 @@
 import io.trino.spi.predicate.TupleDomain;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.inject.Inject;
-
 import static io.trino.plugin.raptor.legacy.systemtables.ShardMetadataRecordCursor.SHARD_METADATA;
 import static io.trino.spi.connector.SystemTable.Distribution.SINGLE_COORDINATOR;
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/TableMetadataSystemTable.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/TableMetadataSystemTable.java
index 1627868d514d..28192417bca6 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/TableMetadataSystemTable.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/TableMetadataSystemTable.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.PeekingIterator;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.plugin.raptor.legacy.metadata.ColumnMetadataRow;
 import io.trino.plugin.raptor.legacy.metadata.ForMetadata;
@@ -23,6 +24,7 @@
 import io.trino.plugin.raptor.legacy.metadata.TableMetadataRow;
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorPageSource;
@@ -38,8 +40,6 @@
 import io.trino.spi.type.TypeManager;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.inject.Inject;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -199,11 +199,11 @@ private static void writeArray(BlockBuilder blockBuilder, Collection<String> val
             blockBuilder.appendNull();
         }
         else {
-            BlockBuilder array = blockBuilder.beginBlockEntry();
-            for (String value : values) {
-                VARCHAR.writeSlice(array, utf8Slice(value));
-            }
-            blockBuilder.closeEntry();
+            ((ArrayBlockBuilder) blockBuilder).buildEntry(elementBuilder -> {
+                for (String value : values) {
+                    VARCHAR.writeSlice(elementBuilder, utf8Slice(value));
+                }
+            });
         }
     }
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/TableStatsSystemTable.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/TableStatsSystemTable.java
index b5158d20ff22..bde918a3781b 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/TableStatsSystemTable.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/TableStatsSystemTable.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.plugin.raptor.legacy.metadata.ForMetadata;
 import io.trino.plugin.raptor.legacy.metadata.MetadataDao;
 import io.trino.plugin.raptor.legacy.metadata.TableStatsRow;
@@ -31,8 +32,6 @@
 import io.trino.spi.predicate.TupleDomain;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/ValueBuffer.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/ValueBuffer.java
index 256a49850bde..539156f705a6 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/ValueBuffer.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/systemtables/ValueBuffer.java
@@ -16,8 +16,7 @@
 import com.google.common.primitives.Primitives;
 import io.airlift.slice.Slice;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/PrioritizedFifoExecutor.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/PrioritizedFifoExecutor.java
index 4f9234d21518..15ddd990d7b3 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/PrioritizedFifoExecutor.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/PrioritizedFifoExecutor.java
@@ -16,10 +16,9 @@
 import com.google.common.collect.ComparisonChain;
 import com.google.common.util.concurrent.ExecutionList;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.log.Logger;
 
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.Comparator;
 import java.util.Objects;
 import java.util.Queue;
diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/SynchronizedResultIterator.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/SynchronizedResultIterator.java
index 5d237237833b..2562cb727761 100644
--- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/SynchronizedResultIterator.java
+++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/SynchronizedResultIterator.java
@@ -13,11 +13,10 @@
  */
 package io.trino.plugin.raptor.legacy.util;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import org.jdbi.v3.core.result.ResultIterator;
 import org.jdbi.v3.core.statement.StatementContext;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
diff --git a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/BaseRaptorConnectorTest.java b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/BaseRaptorConnectorTest.java
index 22406006b80a..5691851118c6 100644
--- a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/BaseRaptorConnectorTest.java
+++ b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/BaseRaptorConnectorTest.java
@@ -26,7 +26,6 @@
 import io.trino.testng.services.Flaky;
 import org.intellij.lang.annotations.Language;
 import org.testng.SkipException;
-import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.time.LocalDate;
@@ -68,46 +67,24 @@
 public abstract class BaseRaptorConnectorTest
         extends BaseConnectorTest
 {
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN_WITH_COMMENT:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_CREATE_VIEW:
-                return true;
-
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return false;
-
-            case SUPPORTS_DELETE:
-            case SUPPORTS_UPDATE:
-            case SUPPORTS_MERGE:
-                return true;
-
-            case SUPPORTS_ROW_TYPE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN_WITH_COMMENT,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
+                    SUPPORTS_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_TRUNCATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -804,7 +781,6 @@ public void testTablesSystemTable()
         assertEquals(computeActual("SELECT * FROM system.tables WHERE table_schema IN ('foo', 'bar')").getRowCount(), 0);
     }
 
-    @SuppressWarnings("OverlyStrongTypeCast")
     @Test
     public void testTableStatsSystemTable()
     {
@@ -1051,8 +1027,16 @@ public void testMergeSimpleQueryBucketed()
         assertQuery("SELECT * FROM " + targetTable, "VALUES ('Aaron', 11, 'Arches'), ('Bill', 7, 'Buena'), ('Dave', 22, 'Darbyshire'), ('Ed', 7, 'Etherville')");
     }
 
-    @Test(dataProvider = "partitionedBucketedFailure")
-    public void testMergeMultipleRowsMatchFails(String createTableSql)
+    @Test
+    public void testMergeMultipleRows()
+    {
+        testMergeMultipleRowsMatchFails("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR)");
+        testMergeMultipleRowsMatchFails("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 3, bucketed_on = ARRAY['customer'])");
+        testMergeMultipleRowsMatchFails("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 4, bucketed_on = ARRAY['address'])");
+        testMergeMultipleRowsMatchFails("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 4, bucketed_on = ARRAY['address', 'purchases', 'customer'])");
+    }
+
+    private void testMergeMultipleRowsMatchFails(String createTableSql)
     {
         String targetTable = "merge_all_matches_deleted_target_" + randomNameSuffix();
         assertUpdate(format(createTableSql, targetTable));
@@ -1077,23 +1061,28 @@ public void testMergeMultipleRowsMatchFails(String createTableSql)
         assertUpdate("DROP TABLE " + targetTable);
     }
 
-    @DataProvider
-    public Object[][] partitionedBucketedFailure()
-    {
-        return new Object[][] {
-                {"CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR)"},
-                {"CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 3, bucketed_on = ARRAY['customer'])"},
-                {"CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 4, bucketed_on = ARRAY['address'])"},
-                {"CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 4, bucketed_on = ARRAY['address', 'purchases', 'customer'])"}};
-    }
-
-    @Test(dataProvider = "targetAndSourceWithDifferentBucketing")
-    public void testMergeWithDifferentBucketing(String testDescription, String createTargetTableSql, String createSourceTableSql)
+    @Test
+    public void testMergeWithDifferentBucketing()
     {
-        testMergeWithDifferentBucketingInternal(testDescription, createTargetTableSql, createSourceTableSql);
+        testMergeWithDifferentBucketing(
+                "target_and_source_with_different_bucketing_counts",
+                "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 5, bucketed_on = ARRAY['customer'])",
+                "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 3, bucketed_on = ARRAY['purchases', 'address'])");
+        testMergeWithDifferentBucketing(
+                "target_and_source_with_different_bucketing_columns",
+                "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 3, bucketed_on = ARRAY['address'])",
+                "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 3, bucketed_on = ARRAY['customer'])");
+        testMergeWithDifferentBucketing(
+                "target_flat_source_bucketed_by_customer",
+                "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR)",
+                "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 3, bucketed_on = ARRAY['customer'])");
+        testMergeWithDifferentBucketing(
+                "target_bucketed_by_customer_source_flat",
+                "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 3, bucketed_on = ARRAY['customer'])",
+                "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR)");
     }
 
-    private void testMergeWithDifferentBucketingInternal(String testDescription, String createTargetTableSql, String createSourceTableSql)
+    private void testMergeWithDifferentBucketing(String testDescription, String createTargetTableSql, String createSourceTableSql)
     {
         String targetTable = format("%s_target_%s", testDescription, randomNameSuffix());
         assertUpdate(format(createTargetTableSql, targetTable));
@@ -1118,33 +1107,6 @@ private void testMergeWithDifferentBucketingInternal(String testDescription, Str
         assertUpdate("DROP TABLE " + targetTable);
     }
 
-    @DataProvider
-    public Object[][] targetAndSourceWithDifferentBucketing()
-    {
-        return new Object[][] {
-                {
-                        "target_and_source_with_different_bucketing_counts",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 5, bucketed_on = ARRAY['customer'])",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 3, bucketed_on = ARRAY['purchases', 'address'])",
-                },
-                {
-                        "target_and_source_with_different_bucketing_columns",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 3, bucketed_on = ARRAY['address'])",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 3, bucketed_on = ARRAY['customer'])",
-                },
-                {
-                        "target_flat_source_bucketed_by_customer",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR)",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 3, bucketed_on = ARRAY['customer'])",
-                },
-                {
-                        "target_bucketed_by_customer_source_flat",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (bucket_count = 3, bucketed_on = ARRAY['customer'])",
-                        "CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR)",
-                },
-        };
-    }
-
     @Test
     public void testMergeOverManySplits()
     {
diff --git a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/backup/TestHttpBackupStore.java b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/backup/TestHttpBackupStore.java
index 4e4f102714fc..e9f717a26ee4 100644
--- a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/backup/TestHttpBackupStore.java
+++ b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/backup/TestHttpBackupStore.java
@@ -18,6 +18,7 @@
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.http.server.HttpServerInfo;
@@ -31,8 +32,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import javax.inject.Singleton;
-
 import java.io.IOException;
 import java.net.URI;
 import java.util.Map;
diff --git a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/backup/TestingHttpBackupResource.java b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/backup/TestingHttpBackupResource.java
index 30bae12e2853..17eb2634d2e1 100644
--- a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/backup/TestingHttpBackupResource.java
+++ b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/backup/TestingHttpBackupResource.java
@@ -13,24 +13,23 @@
  */
 package io.trino.plugin.raptor.legacy.backup;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.slice.Slices;
 import io.airlift.slice.XxHash64;
 import io.trino.spi.NodeManager;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HEAD;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HEAD;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -39,13 +38,13 @@
 
 import static io.trino.plugin.raptor.legacy.backup.HttpBackupStore.CONTENT_XXH64;
 import static io.trino.plugin.raptor.legacy.backup.HttpBackupStore.TRINO_ENVIRONMENT;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.GONE;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 import static java.lang.Long.parseUnsignedLong;
 import static java.util.Objects.requireNonNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.GONE;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 
 @Path("/")
 public class TestingHttpBackupResource
diff --git a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/metadata/TestRaptorMetadata.java b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/metadata/TestRaptorMetadata.java
index 908033490548..873aebddf938 100644
--- a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/metadata/TestRaptorMetadata.java
+++ b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/metadata/TestRaptorMetadata.java
@@ -779,7 +779,8 @@ private static ConnectorViewDefinition testingViewDefinition(String sql)
                 ImmutableList.of(new ViewColumn("test", BIGINT.getTypeId(), Optional.empty())),
                 Optional.empty(),
                 Optional.empty(),
-                true);
+                true,
+                ImmutableList.of());
     }
 
     private static void assertTableEqual(ConnectorTableMetadata actual, ConnectorTableMetadata expected)
diff --git a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/metadata/TestRaptorSplitManager.java b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/metadata/TestRaptorSplitManager.java
index 0f34b1f285bd..d8d1a1035d23 100644
--- a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/metadata/TestRaptorSplitManager.java
+++ b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/metadata/TestRaptorSplitManager.java
@@ -45,7 +45,6 @@
 
 import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
@@ -159,12 +158,11 @@ public void testNoHostForShard()
 
     @Test
     public void testAssignRandomNodeWhenBackupAvailable()
-            throws URISyntaxException
     {
         TestingNodeManager nodeManager = new TestingNodeManager();
         CatalogName connectorId = new CatalogName("raptor");
         NodeSupplier nodeSupplier = nodeManager::getWorkerNodes;
-        InternalNode node = new InternalNode(UUID.randomUUID().toString(), new URI("http://127.0.0.1/"), NodeVersion.UNKNOWN, false);
+        InternalNode node = new InternalNode(UUID.randomUUID().toString(), URI.create("http://127.0.0.1/"), NodeVersion.UNKNOWN, false);
         nodeManager.addNode(node);
         RaptorSplitManager raptorSplitManagerWithBackup = new RaptorSplitManager(connectorId, nodeSupplier, shardManager, true);
 
diff --git a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestOrcFileRewriter.java b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestOrcFileRewriter.java
index bf3cbe0c7ae1..8ca7727d3eb6 100644
--- a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestOrcFileRewriter.java
+++ b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestOrcFileRewriter.java
@@ -21,6 +21,7 @@
 import io.trino.plugin.raptor.legacy.storage.OrcFileRewriter.OrcFileInfo;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.StandardTypes;
@@ -52,8 +53,8 @@
 import static io.trino.spi.type.VarcharType.createVarcharType;
 import static io.trino.testing.StructuralTestUtil.arrayBlockOf;
 import static io.trino.testing.StructuralTestUtil.arrayBlocksEqual;
-import static io.trino.testing.StructuralTestUtil.mapBlockOf;
-import static io.trino.testing.StructuralTestUtil.mapBlocksEqual;
+import static io.trino.testing.StructuralTestUtil.sqlMapEqual;
+import static io.trino.testing.StructuralTestUtil.sqlMapOf;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.nio.file.Files.createTempDirectory;
 import static java.nio.file.Files.readAllBytes;
@@ -101,11 +102,11 @@ public void testRewrite()
         File file = temporary.resolve(randomUUID().toString()).toFile();
         try (OrcFileWriter writer = new OrcFileWriter(TESTING_TYPE_MANAGER, columnIds, columnTypes, file)) {
             List<Page> pages = rowPagesBuilder(columnTypes)
-                    .row(123L, "hello", arrayBlockOf(BIGINT, 1, 2), mapBlockOf(createVarcharType(5), BOOLEAN, "k1", true), arrayBlockOf(arrayType, arrayBlockOf(BIGINT, 5)), new BigDecimal("2.3"))
-                    .row(777L, "sky", arrayBlockOf(BIGINT, 3, 4), mapBlockOf(createVarcharType(5), BOOLEAN, "k2", false), arrayBlockOf(arrayType, arrayBlockOf(BIGINT, 6)), new BigDecimal("2.3"))
-                    .row(456L, "bye", arrayBlockOf(BIGINT, 5, 6), mapBlockOf(createVarcharType(5), BOOLEAN, "k3", true), arrayBlockOf(arrayType, arrayBlockOf(BIGINT, 7)), new BigDecimal("2.3"))
-                    .row(888L, "world", arrayBlockOf(BIGINT, 7, 8), mapBlockOf(createVarcharType(5), BOOLEAN, "k4", true), arrayBlockOf(arrayType, null, arrayBlockOf(BIGINT, 8), null), new BigDecimal("2.3"))
-                    .row(999L, "done", arrayBlockOf(BIGINT, 9, 10), mapBlockOf(createVarcharType(5), BOOLEAN, "k5", true), arrayBlockOf(arrayType, arrayBlockOf(BIGINT, 9, 10)), new BigDecimal("2.3"))
+                    .row(123L, "hello", arrayBlockOf(BIGINT, 1, 2), sqlMapOf(createVarcharType(5), BOOLEAN, "k1", true), arrayBlockOf(arrayType, arrayBlockOf(BIGINT, 5)), new BigDecimal("2.3"))
+                    .row(777L, "sky", arrayBlockOf(BIGINT, 3, 4), sqlMapOf(createVarcharType(5), BOOLEAN, "k2", false), arrayBlockOf(arrayType, arrayBlockOf(BIGINT, 6)), new BigDecimal("2.3"))
+                    .row(456L, "bye", arrayBlockOf(BIGINT, 5, 6), sqlMapOf(createVarcharType(5), BOOLEAN, "k3", true), arrayBlockOf(arrayType, arrayBlockOf(BIGINT, 7)), new BigDecimal("2.3"))
+                    .row(888L, "world", arrayBlockOf(BIGINT, 7, 8), sqlMapOf(createVarcharType(5), BOOLEAN, "k4", true), arrayBlockOf(arrayType, null, arrayBlockOf(BIGINT, 8), null), new BigDecimal("2.3"))
+                    .row(999L, "done", arrayBlockOf(BIGINT, 9, 10), sqlMapOf(createVarcharType(5), BOOLEAN, "k5", true), arrayBlockOf(arrayType, arrayBlockOf(BIGINT, 9, 10)), new BigDecimal("2.3"))
                     .build();
             writer.appendPages(pages);
         }
@@ -158,11 +159,11 @@ public void testRewrite()
             for (int i = 0; i < 5; i++) {
                 assertEquals(column3.isNull(i), false);
             }
-            assertTrue(mapBlocksEqual(createVarcharType(5), BOOLEAN, arrayType.getObject(column3, 0), mapBlockOf(createVarcharType(5), BOOLEAN, "k1", true)));
-            assertTrue(mapBlocksEqual(createVarcharType(5), BOOLEAN, arrayType.getObject(column3, 1), mapBlockOf(createVarcharType(5), BOOLEAN, "k2", false)));
-            assertTrue(mapBlocksEqual(createVarcharType(5), BOOLEAN, arrayType.getObject(column3, 2), mapBlockOf(createVarcharType(5), BOOLEAN, "k3", true)));
-            assertTrue(mapBlocksEqual(createVarcharType(5), BOOLEAN, arrayType.getObject(column3, 3), mapBlockOf(createVarcharType(5), BOOLEAN, "k4", true)));
-            assertTrue(mapBlocksEqual(createVarcharType(5), BOOLEAN, arrayType.getObject(column3, 4), mapBlockOf(createVarcharType(5), BOOLEAN, "k5", true)));
+            assertTrue(sqlMapEqual(createVarcharType(5), BOOLEAN, (SqlMap) mapType.getObject(column3, 0), sqlMapOf(createVarcharType(5), BOOLEAN, "k1", true)));
+            assertTrue(sqlMapEqual(createVarcharType(5), BOOLEAN, (SqlMap) mapType.getObject(column3, 1), sqlMapOf(createVarcharType(5), BOOLEAN, "k2", false)));
+            assertTrue(sqlMapEqual(createVarcharType(5), BOOLEAN, (SqlMap) mapType.getObject(column3, 2), sqlMapOf(createVarcharType(5), BOOLEAN, "k3", true)));
+            assertTrue(sqlMapEqual(createVarcharType(5), BOOLEAN, (SqlMap) mapType.getObject(column3, 3), sqlMapOf(createVarcharType(5), BOOLEAN, "k4", true)));
+            assertTrue(sqlMapEqual(createVarcharType(5), BOOLEAN, (SqlMap) mapType.getObject(column3, 4), sqlMapOf(createVarcharType(5), BOOLEAN, "k5", true)));
 
             Block column4 = page.getBlock(4);
             assertEquals(column4.getPositionCount(), 5);
@@ -237,8 +238,8 @@ public void testRewrite()
             for (int i = 0; i < 2; i++) {
                 assertEquals(column3.isNull(i), false);
             }
-            assertTrue(mapBlocksEqual(createVarcharType(5), BOOLEAN, arrayType.getObject(column3, 0), mapBlockOf(createVarcharType(5), BOOLEAN, "k1", true)));
-            assertTrue(mapBlocksEqual(createVarcharType(5), BOOLEAN, arrayType.getObject(column3, 1), mapBlockOf(createVarcharType(5), BOOLEAN, "k3", true)));
+            assertTrue(sqlMapEqual(createVarcharType(5), BOOLEAN, (SqlMap) mapType.getObject(column3, 0), sqlMapOf(createVarcharType(5), BOOLEAN, "k1", true)));
+            assertTrue(sqlMapEqual(createVarcharType(5), BOOLEAN, (SqlMap) mapType.getObject(column3, 1), sqlMapOf(createVarcharType(5), BOOLEAN, "k3", true)));
 
             Block column4 = page.getBlock(4);
             assertEquals(column4.getPositionCount(), 2);
diff --git a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestShardWriter.java b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestShardWriter.java
index 8246e67b03db..02b8a99bd321 100644
--- a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestShardWriter.java
+++ b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestShardWriter.java
@@ -21,6 +21,7 @@
 import io.trino.orc.OrcRecordReader;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
+import io.trino.spi.block.SqlMap;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.StandardTypes;
@@ -51,8 +52,8 @@
 import static io.trino.spi.type.VarcharType.createVarcharType;
 import static io.trino.testing.StructuralTestUtil.arrayBlockOf;
 import static io.trino.testing.StructuralTestUtil.arrayBlocksEqual;
-import static io.trino.testing.StructuralTestUtil.mapBlockOf;
-import static io.trino.testing.StructuralTestUtil.mapBlocksEqual;
+import static io.trino.testing.StructuralTestUtil.sqlMapEqual;
+import static io.trino.testing.StructuralTestUtil.sqlMapOf;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static java.nio.file.Files.createTempDirectory;
 import static org.testng.Assert.assertEquals;
@@ -97,9 +98,9 @@ public void testWriter()
         byte[] bytes3 = octets(0x01, 0x02, 0x19, 0x80);
 
         RowPagesBuilder rowPagesBuilder = RowPagesBuilder.rowPagesBuilder(columnTypes)
-                .row(123L, "hello", wrappedBuffer(bytes1), 123.456, true, arrayBlockOf(BIGINT, 1, 2), mapBlockOf(createVarcharType(5), BOOLEAN, "k1", true), arrayBlockOf(arrayType, arrayBlockOf(BIGINT, 5)))
-                .row(null, "world", null, Double.POSITIVE_INFINITY, null, arrayBlockOf(BIGINT, 3, null), mapBlockOf(createVarcharType(5), BOOLEAN, "k2", null), arrayBlockOf(arrayType, null, arrayBlockOf(BIGINT, 6, 7)))
-                .row(456L, "bye \u2603", wrappedBuffer(bytes3), Double.NaN, false, arrayBlockOf(BIGINT), mapBlockOf(createVarcharType(5), BOOLEAN, "k3", false), arrayBlockOf(arrayType, arrayBlockOf(BIGINT)));
+                .row(123L, "hello", wrappedBuffer(bytes1), 123.456, true, arrayBlockOf(BIGINT, 1, 2), sqlMapOf(createVarcharType(5), BOOLEAN, "k1", true), arrayBlockOf(arrayType, arrayBlockOf(BIGINT, 5)))
+                .row(null, "world", null, Double.POSITIVE_INFINITY, null, arrayBlockOf(BIGINT, 3, null), sqlMapOf(createVarcharType(5), BOOLEAN, "k2", null), arrayBlockOf(arrayType, null, arrayBlockOf(BIGINT, 6, 7)))
+                .row(456L, "bye \u2603", wrappedBuffer(bytes3), Double.NaN, false, arrayBlockOf(BIGINT), sqlMapOf(createVarcharType(5), BOOLEAN, "k3", false), arrayBlockOf(arrayType, arrayBlockOf(BIGINT)));
 
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(new EmptyClassLoader());
                 OrcFileWriter writer = new OrcFileWriter(TESTING_TYPE_MANAGER, columnIds, columnTypes, file)) {
@@ -160,11 +161,11 @@ public void testWriter()
             Block column6 = page.getBlock(6);
             assertEquals(column6.getPositionCount(), 3);
 
-            assertTrue(mapBlocksEqual(createVarcharType(5), BOOLEAN, arrayType.getObject(column6, 0), mapBlockOf(createVarcharType(5), BOOLEAN, "k1", true)));
-            Block object = arrayType.getObject(column6, 1);
-            Block k2 = mapBlockOf(createVarcharType(5), BOOLEAN, "k2", null);
-            assertTrue(mapBlocksEqual(createVarcharType(5), BOOLEAN, object, k2));
-            assertTrue(mapBlocksEqual(createVarcharType(5), BOOLEAN, arrayType.getObject(column6, 2), mapBlockOf(createVarcharType(5), BOOLEAN, "k3", false)));
+            assertTrue(sqlMapEqual(createVarcharType(5), BOOLEAN, (SqlMap) mapType.getObject(column6, 0), sqlMapOf(createVarcharType(5), BOOLEAN, "k1", true)));
+            SqlMap object = (SqlMap) mapType.getObject(column6, 1);
+            SqlMap k2 = sqlMapOf(createVarcharType(5), BOOLEAN, "k2", null);
+            assertTrue(sqlMapEqual(createVarcharType(5), BOOLEAN, object, k2));
+            assertTrue(sqlMapEqual(createVarcharType(5), BOOLEAN, (SqlMap) mapType.getObject(column6, 2), sqlMapOf(createVarcharType(5), BOOLEAN, "k3", false)));
 
             Block column7 = page.getBlock(7);
             assertEquals(column7.getPositionCount(), 3);
diff --git a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestStorageManagerConfig.java b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestStorageManagerConfig.java
index e4edc7206e28..57116c729648 100644
--- a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestStorageManagerConfig.java
+++ b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestStorageManagerConfig.java
@@ -16,10 +16,9 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import jakarta.validation.constraints.NotNull;
 import org.testng.annotations.Test;
 
-import javax.validation.constraints.NotNull;
-
 import java.io.File;
 import java.util.Map;
 
@@ -128,6 +127,6 @@ public void testExplicitPropertyMappings()
     @Test
     public void testValidations()
     {
-        assertFailsValidation(new StorageManagerConfig().setDataDirectory(null), "dataDirectory", "may not be null", NotNull.class);
+        assertFailsValidation(new StorageManagerConfig().setDataDirectory(null), "dataDirectory", "must not be null", NotNull.class);
     }
 }
diff --git a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/util/TestPrioritizedFifoExecutor.java b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/util/TestPrioritizedFifoExecutor.java
index 00dbc2ff5a6d..822f5e18754d 100644
--- a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/util/TestPrioritizedFifoExecutor.java
+++ b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/util/TestPrioritizedFifoExecutor.java
@@ -70,8 +70,8 @@ public void testCounter()
             futures.add(executor.submit(() -> {
                 try {
                     // wait for the go signal
-                    awaitUninterruptibly(startLatch, 1, TimeUnit.MINUTES);
 
+                    assertTrue(awaitUninterruptibly(startLatch, 1, TimeUnit.MINUTES));
                     assertFalse(futures.get(taskNumber).isDone());
 
                     // intentional distinct read and write calls
@@ -90,7 +90,7 @@ public void testCounter()
 
         // signal go and wait for tasks to complete
         startLatch.countDown();
-        awaitUninterruptibly(completeLatch, 1, TimeUnit.MINUTES);
+        assertTrue(awaitUninterruptibly(completeLatch, 1, TimeUnit.MINUTES));
 
         assertEquals(counter.get(), totalTasks);
         // since this is a fifo executor with one thread and completeLatch is decremented inside the future,
@@ -142,7 +142,7 @@ private void testBound(int maxThreads, int totalTasks)
 
         // signal go and wait for tasks to complete
         startLatch.countDown();
-        awaitUninterruptibly(completeLatch, 1, TimeUnit.MINUTES);
+        assertTrue(awaitUninterruptibly(completeLatch, 1, TimeUnit.MINUTES));
 
         assertFalse(failed.get());
     }
diff --git a/plugin/trino-redis/pom.xml b/plugin/trino-redis/pom.xml
index 9505d436ceab..a900c0c8af15 100644
--- a/plugin/trino-redis/pom.xml
+++ b/plugin/trino-redis/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-redis</artifactId>
-    <description>Trino - Redis Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Redis Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,13 +19,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-record-decoder</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -54,67 +54,66 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-record-decoder</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+            <version>2.12.0</version>
         </dependency>
 
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>5.0.2</version>
         </dependency>
 
         <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>4.1.1</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-spi</artifactId>
@@ -122,24 +121,41 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <artifactId>jackson-core</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-client</artifactId>
@@ -178,14 +194,14 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -204,6 +220,28 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.basepom.maven</groupId>
                 <artifactId>duplicate-finder-maven-plugin</artifactId>
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnector.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnector.java
index d9a1ec63d2eb..3a4c8fe57986 100644
--- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnector.java
+++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnector.java
@@ -13,6 +13,8 @@
  */
 package io.trino.plugin.redis;
 
+import com.google.inject.Inject;
+import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
@@ -21,8 +23,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import static io.trino.spi.transaction.IsolationLevel.READ_COMMITTED;
 import static io.trino.spi.transaction.IsolationLevel.checkConnectorSupports;
 import static java.util.Objects.requireNonNull;
@@ -33,6 +33,7 @@
 public class RedisConnector
         implements Connector
 {
+    private final LifeCycleManager lifeCycleManager;
     private final RedisMetadata metadata;
 
     private final RedisSplitManager splitManager;
@@ -40,10 +41,12 @@ public class RedisConnector
 
     @Inject
     public RedisConnector(
+            LifeCycleManager lifeCycleManager,
             RedisMetadata metadata,
             RedisSplitManager splitManager,
             RedisRecordSetProvider recordSetProvider)
     {
+        this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null");
         this.metadata = requireNonNull(metadata, "metadata is null");
         this.splitManager = requireNonNull(splitManager, "splitManager is null");
         this.recordSetProvider = requireNonNull(recordSetProvider, "recordSetProvider is null");
@@ -73,4 +76,10 @@ public ConnectorRecordSetProvider getRecordSetProvider()
     {
         return recordSetProvider;
     }
+
+    @Override
+    public void shutdown()
+    {
+        lifeCycleManager.stop();
+    }
 }
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnectorConfig.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnectorConfig.java
index f93730192115..88a0caa51908 100644
--- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnectorConfig.java
+++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnectorConfig.java
@@ -21,11 +21,10 @@
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
 import io.trino.spi.HostAddress;
-
-import javax.annotation.Nullable;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 import java.io.File;
 import java.util.Set;
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnectorFactory.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnectorFactory.java
index c29b0c44b09d..5a48bfd3bbdc 100644
--- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnectorFactory.java
+++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnectorFactory.java
@@ -29,7 +29,7 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class RedisConnectorFactory
@@ -53,7 +53,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
     {
         requireNonNull(catalogName, "catalogName is null");
         requireNonNull(config, "config is null");
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 new JsonModule(),
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisJedisManager.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisJedisManager.java
index 8d1fa1f82bd5..d3f7a25c6a6e 100644
--- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisJedisManager.java
+++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisJedisManager.java
@@ -13,15 +13,14 @@
  */
 package io.trino.plugin.redis;
 
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.spi.HostAddress;
+import jakarta.annotation.PreDestroy;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisMetadata.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisMetadata.java
index e2505e399d5e..ead3c6e30fa1 100644
--- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisMetadata.java
+++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisMetadata.java
@@ -17,6 +17,7 @@
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.decoder.dummy.DummyRowDecoder;
 import io.trino.spi.connector.ColumnHandle;
@@ -36,9 +37,7 @@
 import io.trino.spi.predicate.SortedRangeSet;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.predicate.ValueSet;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
+import jakarta.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.LinkedHashSet;
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisRecordCursor.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisRecordCursor.java
index 5c591291096d..7e9f24ae87dc 100644
--- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisRecordCursor.java
+++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisRecordCursor.java
@@ -30,6 +30,7 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.predicate.ValueSet;
 import io.trino.spi.type.Type;
+import jakarta.annotation.Nullable;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.Pipeline;
@@ -37,8 +38,6 @@
 import redis.clients.jedis.params.ScanParams;
 import redis.clients.jedis.resps.ScanResult;
 
-import javax.annotation.Nullable;
-
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.LinkedList;
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisRecordSetProvider.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisRecordSetProvider.java
index 230700c514eb..b228d07de78b 100644
--- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisRecordSetProvider.java
+++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisRecordSetProvider.java
@@ -13,8 +13,10 @@
  */
 package io.trino.plugin.redis;
 
+import com.google.inject.Inject;
 import io.trino.decoder.DispatchingRowDecoderFactory;
 import io.trino.decoder.RowDecoder;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
 import io.trino.spi.connector.ConnectorSession;
@@ -23,8 +25,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.RecordSet;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
@@ -58,20 +58,24 @@ public RecordSet getRecordSet(ConnectorTransactionHandle transaction, ConnectorS
                 .collect(toImmutableList());
 
         RowDecoder keyDecoder = decoderFactory.create(
-                redisSplit.getKeyDataFormat(),
-                emptyMap(),
-                redisColumns.stream()
-                        .filter(col -> !col.isInternal())
-                        .filter(RedisColumnHandle::isKeyDecoder)
-                        .collect(toImmutableSet()));
+                session,
+                new RowDecoderSpec(
+                        redisSplit.getKeyDataFormat(),
+                        emptyMap(),
+                        redisColumns.stream()
+                                .filter(col -> !col.isInternal())
+                                .filter(RedisColumnHandle::isKeyDecoder)
+                                .collect(toImmutableSet())));
 
         RowDecoder valueDecoder = decoderFactory.create(
-                redisSplit.getValueDataFormat(),
-                emptyMap(),
-                redisColumns.stream()
-                        .filter(col -> !col.isInternal())
-                        .filter(col -> !col.isKeyDecoder())
-                        .collect(toImmutableSet()));
+                session,
+                new RowDecoderSpec(
+                        redisSplit.getValueDataFormat(),
+                        emptyMap(),
+                        redisColumns.stream()
+                                .filter(col -> !col.isInternal())
+                                .filter(col -> !col.isKeyDecoder())
+                                .collect(toImmutableSet())));
 
         return new RedisRecordSet(redisSplit, jedisManager, redisColumns, keyDecoder, valueDecoder);
     }
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisSplitManager.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisSplitManager.java
index 5cec68ae831e..c15b35c5a93a 100644
--- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisSplitManager.java
+++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisSplitManager.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.trino.spi.HostAddress;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplit;
@@ -27,8 +28,6 @@
 import io.trino.spi.connector.FixedSplitSource;
 import redis.clients.jedis.Jedis;
 
-import javax.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisTableDescriptionSupplier.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisTableDescriptionSupplier.java
index 57f9c7b43ba7..909188857321 100644
--- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisTableDescriptionSupplier.java
+++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisTableDescriptionSupplier.java
@@ -17,13 +17,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
 import io.trino.decoder.dummy.DummyRowDecoder;
 import io.trino.spi.connector.SchemaTableName;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/decoder/RedisRowDecoder.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/decoder/RedisRowDecoder.java
index 980397a3e9e2..935e6856c2fa 100644
--- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/decoder/RedisRowDecoder.java
+++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/decoder/RedisRowDecoder.java
@@ -16,8 +16,7 @@
 import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.FieldValueProvider;
 import io.trino.decoder.RowDecoder;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/decoder/hash/HashRedisRowDecoderFactory.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/decoder/hash/HashRedisRowDecoderFactory.java
index d37fe1dd7ff3..97d74df8411c 100644
--- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/decoder/hash/HashRedisRowDecoderFactory.java
+++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/decoder/hash/HashRedisRowDecoderFactory.java
@@ -15,8 +15,10 @@
 
 import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.RowDecoderFactory;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.plugin.redis.RedisFieldDecoder;
 import io.trino.plugin.redis.decoder.RedisRowDecoder;
+import io.trino.spi.connector.ConnectorSession;
 
 import java.util.Map;
 import java.util.Set;
@@ -24,17 +26,15 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
 import static java.util.function.Function.identity;
 
 public class HashRedisRowDecoderFactory
         implements RowDecoderFactory
 {
     @Override
-    public RedisRowDecoder create(Map<String, String> decoderParams, Set<DecoderColumnHandle> columns)
+    public RedisRowDecoder create(ConnectorSession session, RowDecoderSpec rowDecoderSpec)
     {
-        requireNonNull(columns, "columns is null");
-        return new HashRedisRowDecoder(chooseFieldDecoders(columns));
+        return new HashRedisRowDecoder(chooseFieldDecoders(rowDecoderSpec.columns()));
     }
 
     private Map<DecoderColumnHandle, RedisFieldDecoder<String>> chooseFieldDecoders(Set<DecoderColumnHandle> columns)
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/decoder/zset/ZsetRedisRowDecoderFactory.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/decoder/zset/ZsetRedisRowDecoderFactory.java
index 26b6c26a696d..b15c6e199835 100644
--- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/decoder/zset/ZsetRedisRowDecoderFactory.java
+++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/decoder/zset/ZsetRedisRowDecoderFactory.java
@@ -15,13 +15,11 @@
 
 import io.trino.decoder.DecoderColumnHandle;
 import io.trino.decoder.RowDecoderFactory;
+import io.trino.decoder.RowDecoderSpec;
 import io.trino.plugin.redis.decoder.RedisRowDecoder;
-
-import java.util.Map;
-import java.util.Set;
+import io.trino.spi.connector.ConnectorSession;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static java.util.Objects.requireNonNull;
 
 public class ZsetRedisRowDecoderFactory
         implements RowDecoderFactory
@@ -29,10 +27,9 @@ public class ZsetRedisRowDecoderFactory
     private static final RedisRowDecoder DECODER_INSTANCE = new ZsetRedisRowDecoder();
 
     @Override
-    public RedisRowDecoder create(Map<String, String> decoderParams, Set<DecoderColumnHandle> columns)
+    public RedisRowDecoder create(ConnectorSession session, RowDecoderSpec rowDecoderSpec)
     {
-        requireNonNull(columns, "columns is null");
-        checkArgument(columns.stream().noneMatch(DecoderColumnHandle::isInternal), "unexpected internal column");
+        checkArgument(rowDecoderSpec.columns().stream().noneMatch(DecoderColumnHandle::isInternal), "unexpected internal column");
         return DECODER_INSTANCE;
     }
 }
diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/AbstractTestMinimalFunctionality.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/AbstractTestMinimalFunctionality.java
index 140e20fea29c..d20b74b9eed0 100644
--- a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/AbstractTestMinimalFunctionality.java
+++ b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/AbstractTestMinimalFunctionality.java
@@ -20,9 +20,9 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.sql.query.QueryAssertions;
 import io.trino.testing.StandaloneQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 import redis.clients.jedis.Jedis;
 
 import java.util.Map;
@@ -32,8 +32,9 @@
 import static io.trino.plugin.redis.util.RedisTestUtils.installRedisPlugin;
 import static io.trino.plugin.redis.util.RedisTestUtils.loadSimpleTableDescription;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public abstract class AbstractTestMinimalFunctionality
 {
     protected static final Session SESSION = testSessionBuilder()
@@ -50,7 +51,7 @@ public abstract class AbstractTestMinimalFunctionality
 
     protected abstract Map<String, String> connectorProperties();
 
-    @BeforeClass
+    @BeforeAll
     public void startRedis()
             throws Exception
     {
@@ -76,7 +77,7 @@ public void startRedis()
         populateData(1000);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void stopRedis()
     {
         clearData();
diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/BaseRedisConnectorTest.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/BaseRedisConnectorTest.java
index 88a5d420ca24..90f929c11f2c 100644
--- a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/BaseRedisConnectorTest.java
+++ b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/BaseRedisConnectorTest.java
@@ -23,40 +23,29 @@
 public abstract class BaseRedisConnectorTest
         extends BaseConnectorTest
 {
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE:
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN:
-            case SUPPORTS_RENAME_COLUMN:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_INSERT:
-            case SUPPORTS_DELETE:
-                return false;
-
-            case SUPPORTS_ARRAY:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN,
+                    SUPPORTS_ARRAY,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_INSERT,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_RENAME_COLUMN,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Test
diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestMinimalFunctionality.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestMinimalFunctionality.java
index 0d28825e9443..a891275cdf4d 100644
--- a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestMinimalFunctionality.java
+++ b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestMinimalFunctionality.java
@@ -17,7 +17,7 @@
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.TableHandle;
 import io.trino.security.AllowAllAccessControl;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Optional;
@@ -27,7 +27,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
 public class TestMinimalFunctionality
         extends AbstractTestMinimalFunctionality
 {
@@ -41,7 +40,7 @@ protected Map<String, String> connectorProperties()
     public void testTableExists()
     {
         QualifiedObjectName name = new QualifiedObjectName("redis", "default", tableName);
-        transaction(queryRunner.getTransactionManager(), new AllowAllAccessControl())
+        transaction(queryRunner.getTransactionManager(), queryRunner.getMetadata(), new AllowAllAccessControl())
                 .singleStatement()
                 .execute(SESSION, session -> {
                     Optional<TableHandle> handle = queryRunner.getServer().getMetadata().getTableHandle(session, name);
diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestMinimalFunctionalityWithoutKeyPrefix.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestMinimalFunctionalityWithoutKeyPrefix.java
index b565400a86d3..72ecdcfab6b4 100644
--- a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestMinimalFunctionalityWithoutKeyPrefix.java
+++ b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestMinimalFunctionalityWithoutKeyPrefix.java
@@ -14,15 +14,14 @@
 package io.trino.plugin.redis;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-@Test(singleThreaded = true)
 public class TestMinimalFunctionalityWithoutKeyPrefix
         extends AbstractTestMinimalFunctionality
 {
diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisConnectorConfig.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisConnectorConfig.java
index 57703516c73b..15b3d22183b2 100644
--- a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisConnectorConfig.java
+++ b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisConnectorConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.Map;
diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisDistributedHash.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisDistributedHash.java
index 85b3adee745a..588fdb156197 100644
--- a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisDistributedHash.java
+++ b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisDistributedHash.java
@@ -18,7 +18,7 @@
 import io.trino.sql.planner.plan.FilterNode;
 import io.trino.testing.AbstractTestQueries;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.redis.RedisQueryRunner.createRedisQueryRunner;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisPlugin.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisPlugin.java
index 1d09a94026a3..1ca0df8aac7b 100644
--- a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisPlugin.java
+++ b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisPlugin.java
@@ -17,7 +17,7 @@
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.airlift.testing.Assertions.assertInstanceOf;
diff --git a/plugin/trino-redshift/pom.xml b/plugin/trino-redshift/pom.xml
index 8ed8dc410b6e..4be89db9f3cc 100644
--- a/plugin/trino-redshift/pom.xml
+++ b/plugin/trino-redshift/pom.xml
@@ -1,23 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-redshift</artifactId>
-    <description>Trino - Redshift Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Redshift Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.amazon.redshift</groupId>
+            <artifactId>redshift-jdbc42</artifactId>
+            <version>2.1.0.20</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -34,84 +55,92 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <groupId>org.jdbi</groupId>
+            <artifactId>jdbi3-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.amazon.redshift</groupId>
-            <artifactId>redshift-jdbc42</artifactId>
-            <version>2.1.0.12</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.jdbi</groupId>
-            <artifactId>jdbi3-core</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
+            <artifactId>log</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-base-jdbc</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-exchange-filesystem</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-base-jdbc</artifactId>
+            <artifactId>trino-exchange-filesystem</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -154,14 +183,14 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -172,6 +201,33 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>default</id>
@@ -190,6 +246,8 @@
                                 <exclude>**/TestRedshiftConnectorSmokeTest.java</exclude>
                                 <exclude>**/TestRedshiftTableStatisticsReader.java</exclude>
                                 <exclude>**/TestRedshiftTypeMapping.java</exclude>
+                                <exclude>**/Test*FailureRecoveryTest.java</exclude>
+                                <exclude>**/Test*FailureRecoverySmokeTest.java</exclude>
                             </excludes>
                         </configuration>
                     </plugin>
@@ -219,5 +277,29 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>fte-tests</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <!-- Failure recovery tests spend most of the time waiting for a retry -->
+                            <threadCount>4</threadCount>
+                            <includes>
+                                <!-- Run only the smoke tests of the connector for the fault-tolerant execution functionality -->
+                                <!-- on the CI environment due to unpredictable locations of GitHub runners which can lead -->
+                                <!-- to increased client latency on the JDBC operations performed on the ephemeral AWS Redshift cluster.  -->
+                                <include>**/Test*FailureRecoverySmokeTest.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftClient.java b/plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftClient.java
index 0b1091665b99..67184ff6604c 100644
--- a/plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftClient.java
+++ b/plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftClient.java
@@ -16,11 +16,14 @@
 import com.amazon.redshift.jdbc.RedshiftPreparedStatement;
 import com.amazon.redshift.util.RedshiftObject;
 import com.google.common.base.CharMatcher;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.plugin.base.aggregation.AggregateFunctionRewriter;
 import io.trino.plugin.base.aggregation.AggregateFunctionRule;
 import io.trino.plugin.base.expression.ConnectorExpressionRewriter;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcClient;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ColumnMapping;
@@ -38,6 +41,7 @@
 import io.trino.plugin.jdbc.ObjectWriteFunction;
 import io.trino.plugin.jdbc.PreparedQuery;
 import io.trino.plugin.jdbc.QueryBuilder;
+import io.trino.plugin.jdbc.RemoteTableName;
 import io.trino.plugin.jdbc.SliceWriteFunction;
 import io.trino.plugin.jdbc.StandardColumnMappings;
 import io.trino.plugin.jdbc.WriteMapping;
@@ -54,11 +58,12 @@
 import io.trino.plugin.jdbc.expression.JdbcConnectorExpressionRewriterBuilder;
 import io.trino.plugin.jdbc.expression.ParameterizedExpression;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.JoinCondition;
 import io.trino.spi.connector.JoinStatistics;
 import io.trino.spi.connector.JoinType;
@@ -77,8 +82,6 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
 
-import javax.inject.Inject;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.MathContext;
@@ -174,6 +177,7 @@
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static java.lang.String.format;
+import static java.lang.String.join;
 import static java.math.RoundingMode.UNNECESSARY;
 import static java.time.temporal.ChronoField.NANO_OF_SECOND;
 import static java.util.Objects.requireNonNull;
@@ -227,7 +231,6 @@ public class RedshiftClient
             .toFormatter();
     private static final OffsetDateTime REDSHIFT_MIN_SUPPORTED_TIMESTAMP_TZ = OffsetDateTime.of(-4712, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC);
 
-    private final boolean disableAutomaticFetchSize;
     private final AggregateFunctionRewriter<JdbcExpression, ?> aggregateFunctionRewriter;
     private final boolean statisticsEnabled;
     private final RedshiftTableStatisticsReader statisticsReader;
@@ -243,8 +246,7 @@ public RedshiftClient(
             RemoteQueryModifier queryModifier,
             RedshiftConfig redshiftConfig)
     {
-        super("\"", connectionFactory, queryBuilder, config.getJdbcTypesMappedToVarchar(), identifierMapping, queryModifier, false);
-        this.disableAutomaticFetchSize = redshiftConfig.isDisableAutomaticFetchSize();
+        super("\"", connectionFactory, queryBuilder, config.getJdbcTypesMappedToVarchar(), identifierMapping, queryModifier, true);
         this.legacyTypeMapping = redshiftConfig.isLegacyTypeMapping();
         ConnectorExpressionRewriter<ParameterizedExpression> connectorExpressionRewriter = JdbcConnectorExpressionRewriterBuilder.newBuilder()
                 .addStandardRules(this::quoted)
@@ -305,10 +307,41 @@ public Connection getConnection(ConnectorSession session, JdbcSplit split, JdbcT
     }
 
     @Override
-    public Optional<String> getTableComment(ResultSet resultSet)
+    protected void dropSchema(ConnectorSession session, Connection connection, String remoteSchemaName, boolean cascade)
+            throws SQLException
     {
-        // Don't return a comment until the connector supports creating tables with comment
-        return Optional.empty();
+        if (cascade) {
+            // Dropping schema with cascade option may lead to other metadata listing operations. Disable until finding the solution.
+            throw new TrinoException(NOT_SUPPORTED, "This connector does not support dropping schemas with CASCADE option");
+        }
+        execute(session, connection, "DROP SCHEMA " + quoted(remoteSchemaName));
+    }
+
+    @Override
+    protected List<String> createTableSqls(RemoteTableName remoteTableName, List<String> columns, ConnectorTableMetadata tableMetadata)
+    {
+        checkArgument(tableMetadata.getProperties().isEmpty(), "Unsupported table properties: %s", tableMetadata.getProperties());
+        ImmutableList.Builder<String> createTableSqlsBuilder = ImmutableList.builder();
+        createTableSqlsBuilder.add(format("CREATE TABLE %s (%s)", quoted(remoteTableName), join(", ", columns)));
+        Optional<String> tableComment = tableMetadata.getComment();
+        if (tableComment.isPresent()) {
+            createTableSqlsBuilder.add(buildTableCommentSql(remoteTableName, tableComment));
+        }
+        return createTableSqlsBuilder.build();
+    }
+
+    @Override
+    public void setTableComment(ConnectorSession session, JdbcTableHandle handle, Optional<String> comment)
+    {
+        execute(session, buildTableCommentSql(handle.asPlainTable().getRemoteTableName(), comment));
+    }
+
+    private String buildTableCommentSql(RemoteTableName remoteTableName, Optional<String> tableComment)
+    {
+        return format(
+                "COMMENT ON TABLE %s IS %s",
+                quoted(remoteTableName),
+                tableComment.map(RedshiftClient::redshiftVarcharLiteral).orElse("NULL"));
     }
 
     @Override
@@ -415,12 +448,9 @@ public PreparedStatement getPreparedStatement(Connection connection, String sql,
         // that.
         connection.setAutoCommit(false);
         PreparedStatement statement = connection.prepareStatement(sql);
-        if (disableAutomaticFetchSize) {
-            statement.setFetchSize(1000);
-        }
         // This is a heuristic, not exact science. A better formula can perhaps be found with measurements.
         // Column count is not known for non-SELECT queries. Not setting fetch size for these.
-        else if (columnCount.isPresent()) {
+        if (columnCount.isPresent()) {
             statement.setFetchSize(max(100_000 / columnCount.get(), 1_000));
         }
         return statement;
@@ -432,6 +462,7 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
         checkArgument(handle.isNamedRelation(), "Unable to delete from synthetic table: %s", handle);
         checkArgument(handle.getLimit().isEmpty(), "Unable to delete when limit is set: %s", handle);
         checkArgument(handle.getSortOrder().isEmpty(), "Unable to delete when sort order is set: %s", handle);
+        checkArgument(handle.getUpdateAssignments().isEmpty(), "Unable to delete when update assignments are set: %s", handle);
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
             PreparedQuery preparedQuery = queryBuilder.prepareDeleteQuery(this, session, connection, handle.getRequiredNamedRelation(), handle.getConstraint(), Optional.empty());
@@ -447,6 +478,46 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
         }
     }
 
+    @Override
+    public OptionalLong update(ConnectorSession session, JdbcTableHandle handle)
+    {
+        checkArgument(handle.isNamedRelation(), "Unable to update from synthetic table: %s", handle);
+        checkArgument(handle.getLimit().isEmpty(), "Unable to update when limit is set: %s", handle);
+        checkArgument(handle.getSortOrder().isEmpty(), "Unable to update when sort order is set: %s", handle);
+        checkArgument(!handle.getUpdateAssignments().isEmpty(), "Unable to update when update assignments are not set: %s", handle);
+        try (Connection connection = connectionFactory.openConnection(session)) {
+            verify(connection.getAutoCommit());
+            PreparedQuery preparedQuery = queryBuilder.prepareUpdateQuery(
+                    this,
+                    session,
+                    connection,
+                    handle.getRequiredNamedRelation(),
+                    handle.getConstraint(),
+                    getAdditionalPredicate(handle.getConstraintExpressions(), Optional.empty()),
+                    handle.getUpdateAssignments());
+            try (PreparedStatement preparedStatement = queryBuilder.prepareStatement(this, session, connection, preparedQuery, Optional.empty())) {
+                int affectedRows = preparedStatement.executeUpdate();
+                // connection.getAutoCommit() == true is not enough to make UPDATE effective and explicit commit is required
+                connection.commit();
+                return OptionalLong.of(affectedRows);
+            }
+        }
+        catch (SQLException e) {
+            throw new TrinoException(JDBC_ERROR, e);
+        }
+    }
+
+    @Override
+    protected void addColumn(ConnectorSession session, Connection connection, RemoteTableName table, ColumnMetadata column)
+            throws SQLException
+    {
+        if (!column.isNullable()) {
+            // Redshift doesn't support adding not null columns without default expression
+            throw new TrinoException(NOT_SUPPORTED, "This connector does not support adding not null columns");
+        }
+        super.addColumn(session, connection, table, column);
+    }
+
     @Override
     protected void verifySchemaName(DatabaseMetaData databaseMetadata, String schemaName)
             throws SQLException
@@ -568,8 +639,10 @@ public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connect
                         longTimestampWithTimeZoneWriteFunction()));
         }
 
-        // Fall back to default behavior
-        return legacyToColumnMapping(session, type);
+        if (getUnsupportedTypeHandling(session) == CONVERT_TO_VARCHAR) {
+            return mapToUnboundedVarchar(type);
+        }
+        return Optional.empty();
     }
 
     private Optional<ColumnMapping> legacyToColumnMapping(ConnectorSession session, JdbcTypeHandle typeHandle)
@@ -688,10 +761,7 @@ public WriteMapping toWriteMapping(ConnectorSession session, Type type)
             return WriteMapping.objectMapping("timestamptz", longTimestampWithTimeZoneWriteFunction());
         }
 
-        // Fall back to legacy behavior
-        // TODO we should not fall back to legacy behavior, the mappings should be explicit (the legacyToWriteMapping
-        //  is just a copy of some generic default mappings that used to exist)
-        return legacyToWriteMapping(type);
+        throw new TrinoException(NOT_SUPPORTED, "Unsupported column type: " + type.getDisplayName());
     }
 
     @Override
diff --git a/plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftClientModule.java b/plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftClientModule.java
index 072f4bead5da..983585b4fe32 100644
--- a/plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftClientModule.java
+++ b/plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftClientModule.java
@@ -18,6 +18,7 @@
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DecimalModule;
@@ -28,7 +29,7 @@
 import io.trino.plugin.jdbc.JdbcStatisticsConfig;
 import io.trino.plugin.jdbc.credential.CredentialProvider;
 import io.trino.plugin.jdbc.ptf.Query;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 
 import java.util.Properties;
 
@@ -56,12 +57,13 @@ public void setup(Binder binder)
     @ForBaseJdbc
     public static ConnectionFactory getConnectionFactory(
             BaseJdbcConfig config,
-            CredentialProvider credentialProvider)
+            CredentialProvider credentialProvider,
+            OpenTelemetry openTelemetry)
     {
         Properties properties = new Properties();
         properties.put("reWriteBatchedInserts", "true");
         properties.put("reWriteBatchedInsertsSize", "512");
 
-        return new DriverConnectionFactory(new Driver(), config.getConnectionUrl(), properties, credentialProvider);
+        return new DriverConnectionFactory(new Driver(), config.getConnectionUrl(), properties, credentialProvider, openTelemetry);
     }
 }
diff --git a/plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftConfig.java b/plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftConfig.java
index 6af2cfb0fb1a..7797f51c9726 100644
--- a/plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftConfig.java
+++ b/plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftConfig.java
@@ -14,26 +14,13 @@
 package io.trino.plugin.redshift;
 
 import io.airlift.configuration.Config;
+import io.airlift.configuration.DefunctConfig;
 
+@DefunctConfig("redshift.disable-automatic-fetch-size")
 public class RedshiftConfig
 {
-    private boolean disableAutomaticFetchSize;
     private boolean legacyTypeMapping;
 
-    @Deprecated
-    public boolean isDisableAutomaticFetchSize()
-    {
-        return disableAutomaticFetchSize;
-    }
-
-    @Deprecated // TODO temporary kill-switch, to be removed
-    @Config("redshift.disable-automatic-fetch-size")
-    public RedshiftConfig setDisableAutomaticFetchSize(boolean disableAutomaticFetchSize)
-    {
-        this.disableAutomaticFetchSize = disableAutomaticFetchSize;
-        return this;
-    }
-
     public boolean isLegacyTypeMapping()
     {
         return legacyTypeMapping;
diff --git a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/BaseRedshiftFailureRecoveryTest.java b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/BaseRedshiftFailureRecoveryTest.java
new file mode 100644
index 000000000000..7a98f158eaa1
--- /dev/null
+++ b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/BaseRedshiftFailureRecoveryTest.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed 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 io.trino.plugin.redshift;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.operator.RetryPolicy;
+import io.trino.plugin.exchange.filesystem.FileSystemExchangePlugin;
+import io.trino.plugin.jdbc.BaseJdbcFailureRecoveryTest;
+import io.trino.testing.QueryRunner;
+import io.trino.tpch.TpchTable;
+import org.testng.SkipException;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static io.trino.plugin.redshift.RedshiftQueryRunner.createRedshiftQueryRunner;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public abstract class BaseRedshiftFailureRecoveryTest
+        extends BaseJdbcFailureRecoveryTest
+{
+    public BaseRedshiftFailureRecoveryTest(RetryPolicy retryPolicy)
+    {
+        super(retryPolicy);
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner(
+            List<TpchTable<?>> requiredTpchTables,
+            Map<String, String> configProperties,
+            Map<String, String> coordinatorProperties)
+            throws Exception
+    {
+        return createRedshiftQueryRunner(
+                configProperties,
+                coordinatorProperties,
+                Map.of(),
+                requiredTpchTables,
+                runner -> {
+                    runner.installPlugin(new FileSystemExchangePlugin());
+                    runner.loadExchangeManager("filesystem", ImmutableMap.of(
+                            "exchange.base-directories", System.getProperty("java.io.tmpdir") + "/trino-local-file-system-exchange-manager"));
+                });
+    }
+
+    @Override
+    protected void testUpdateWithSubquery()
+    {
+        assertThatThrownBy(super::testUpdateWithSubquery).hasMessageContaining("Unexpected Join over for-update table scan");
+        throw new SkipException("skipped");
+    }
+
+    @Override
+    protected void testUpdate()
+    {
+        // This simple update on JDBC ends up as a very simple, single-fragment, coordinator-only plan,
+        // which has no ability to recover from errors. This test simply verifies that's still the case.
+        Optional<String> setupQuery = Optional.of("CREATE TABLE <table> AS SELECT * FROM orders");
+        String testQuery = "UPDATE <table> SET shippriority = 101 WHERE custkey = 1";
+        Optional<String> cleanupQuery = Optional.of("DROP TABLE <table>");
+
+        assertThatQuery(testQuery)
+                .withSetupQuery(setupQuery)
+                .withCleanupQuery(cleanupQuery)
+                .isCoordinatorOnly();
+    }
+}
diff --git a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/RedshiftQueryRunner.java b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/RedshiftQueryRunner.java
index 97a67c1ffea1..fb9477742ce7 100644
--- a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/RedshiftQueryRunner.java
+++ b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/RedshiftQueryRunner.java
@@ -36,6 +36,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import static io.airlift.testing.Closeables.closeAllSuppress;
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
@@ -79,20 +80,43 @@ public static DistributedQueryRunner createRedshiftQueryRunner(
         return createRedshiftQueryRunner(
                 createSession(),
                 extraProperties,
+                Map.of(),
                 connectorProperties,
-                tables);
+                tables,
+                queryRunner -> {});
+    }
+
+    public static DistributedQueryRunner createRedshiftQueryRunner(
+            Map<String, String> extraProperties,
+            Map<String, String> coordinatorProperties,
+            Map<String, String> connectorProperties,
+            Iterable<TpchTable<?>> tables,
+            Consumer<QueryRunner> additionalSetup)
+            throws Exception
+    {
+        return createRedshiftQueryRunner(
+                createSession(),
+                extraProperties,
+                coordinatorProperties,
+                connectorProperties,
+                tables,
+                additionalSetup);
     }
 
     public static DistributedQueryRunner createRedshiftQueryRunner(
             Session session,
             Map<String, String> extraProperties,
+            Map<String, String> coordinatorProperties,
             Map<String, String> connectorProperties,
-            Iterable<TpchTable<?>> tables)
+            Iterable<TpchTable<?>> tables,
+            Consumer<QueryRunner> additionalSetup)
             throws Exception
     {
-        DistributedQueryRunner.Builder<?> builder = DistributedQueryRunner.builder(session);
-        extraProperties.forEach(builder::addExtraProperty);
-        DistributedQueryRunner runner = builder.build();
+        DistributedQueryRunner runner = DistributedQueryRunner.builder(session)
+                .setExtraProperties(extraProperties)
+                .setCoordinatorProperties(coordinatorProperties)
+                .setAdditionalSetup(additionalSetup)
+                .build();
         try {
             runner.installPlugin(new TpchPlugin());
             runner.createCatalog(TPCH_CATALOG, "tpch", Map.of());
diff --git a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftAutomaticJoinPushdown.java b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftAutomaticJoinPushdown.java
index 3509f8dd8b9c..349dbfcd768a 100644
--- a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftAutomaticJoinPushdown.java
+++ b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftAutomaticJoinPushdown.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.plugin.jdbc.BaseAutomaticJoinPushdownTest;
 import io.trino.testing.QueryRunner;
-import org.testng.SkipException;
+import org.junit.jupiter.api.Disabled;
 
 import static io.trino.plugin.redshift.RedshiftQueryRunner.TEST_SCHEMA;
 import static io.trino.plugin.redshift.RedshiftQueryRunner.createRedshiftQueryRunner;
@@ -39,9 +39,9 @@ protected QueryRunner createQueryRunner()
     }
 
     @Override
+    @Disabled
     public void testJoinPushdownWithEmptyStatsInitially()
     {
-        throw new SkipException("Redshift table statistics are automatically populated");
     }
 
     @Override
diff --git a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConfig.java b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConfig.java
index ae434ea10cd2..2b516055d33d 100644
--- a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConfig.java
+++ b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConfig.java
@@ -28,7 +28,6 @@ public class TestRedshiftConfig
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(RedshiftConfig.class)
-                .setDisableAutomaticFetchSize(false)
                 .setLegacyTypeMapping(false));
     }
 
@@ -36,12 +35,10 @@ public void testDefaults()
     public void testExplicitPropertyMappings()
     {
         Map<String, String> properties = ImmutableMap.<String, String>builder()
-                .put("redshift.disable-automatic-fetch-size", "true")
                 .put("redshift.use-legacy-type-mapping", "true")
                 .buildOrThrow();
 
         RedshiftConfig expected = new RedshiftConfig()
-                .setDisableAutomaticFetchSize(true)
                 .setLegacyTypeMapping(true);
 
         assertFullMapping(properties, expected);
diff --git a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConnectorSmokeTest.java b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConnectorSmokeTest.java
index 7d7f43c45212..1cffa1519965 100644
--- a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConnectorSmokeTest.java
+++ b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConnectorSmokeTest.java
@@ -19,22 +19,17 @@
 import io.trino.testing.TestingConnectorBehavior;
 
 import static io.trino.plugin.redshift.RedshiftQueryRunner.createRedshiftQueryRunner;
-import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS;
 
 public class TestRedshiftConnectorSmokeTest
         extends BaseJdbcConnectorSmokeTest
 {
     @Override
-    @SuppressWarnings("DuplicateBranchesInSwitch") // options here are grouped per-feature
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
diff --git a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConnectorTest.java b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConnectorTest.java
index 29127905b220..0b458b229d15 100644
--- a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConnectorTest.java
+++ b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConnectorTest.java
@@ -34,6 +34,8 @@
 import java.util.stream.Stream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.plugin.jdbc.TypeHandlingJdbcSessionProperties.UNSUPPORTED_TYPE_HANDLING;
+import static io.trino.plugin.jdbc.UnsupportedTypeHandling.CONVERT_TO_VARCHAR;
 import static io.trino.plugin.redshift.RedshiftQueryRunner.TEST_SCHEMA;
 import static io.trino.plugin.redshift.RedshiftQueryRunner.createRedshiftQueryRunner;
 import static io.trino.plugin.redshift.RedshiftQueryRunner.executeInRedshift;
@@ -62,40 +64,60 @@ protected QueryRunner createQueryRunner()
     }
 
     @Override
-    @SuppressWarnings("DuplicateBranchesInSwitch") // options here are grouped per-feature
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN_WITH_COMMENT:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-                return false;
-
-            case SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS:
-                return false;
-
-            case SUPPORTS_AGGREGATION_PUSHDOWN_STDDEV:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_VARIANCE:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT:
-                return true;
-
-            case SUPPORTS_JOIN_PUSHDOWN:
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_EQUALITY:
-                return true;
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM:
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
+        return switch (connectorBehavior) {
+            case SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_JOIN_PUSHDOWN,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_EQUALITY -> true;
+            case SUPPORTS_ADD_COLUMN_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_ADD_COLUMN_WITH_COMMENT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_CORRELATION,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_COVARIANCE,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_REGRESSION,
+                    SUPPORTS_ARRAY,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_DROP_SCHEMA_CASCADE,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN,
+                    SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
+
+    @Test
+    public void testSuperColumnType()
+    {
+        Session convertToVarchar = Session.builder(getSession())
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), UNSUPPORTED_TYPE_HANDLING, CONVERT_TO_VARCHAR.name())
+                .build();
+        try (TestTable table = new TestTable(
+                onRemoteDatabase(),
+                format("%s.test_table_with_super_columns", TEST_SCHEMA),
+                "(c1 integer, c2 super)",
+                ImmutableList.of(
+                        "1, null",
+                        "2, 'super value string'",
+                        "3, " + """
+                                JSON_PARSE('{"r_nations":[
+                                      {"n_comment":"s. ironic, unusual asymptotes wake blithely r",
+                                         "n_nationkey":16,
+                                         "n_name":"MOZAMBIQUE"
+                                      }
+                                   ]
+                                }')
+                                """,
+                        "4, 4"))) {
+            assertQuery("SELECT * FROM " + table.getName(), "VALUES (1), (2), (3), (4)");
+            assertQuery(convertToVarchar, "SELECT * FROM " + table.getName(), """
+                    VALUES
+                    (1, null),
+                    (2, '\"super value string\"'),
+                    (3, '{"r_nations":[{"n_comment":"s. ironic, unusual asymptotes wake blithely r","n_nationkey":16,"n_name":"MOZAMBIQUE"}]}'),
+                    (4, '4')
+                    """);
         }
     }
 
@@ -194,6 +216,15 @@ public Object[][] redshiftTypeToTrinoTypes()
                 {"TIMESTAMPTZ", "timestamp(6) with time zone"}};
     }
 
+    @Test
+    public void testRedshiftAddNotNullColumn()
+    {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, TEST_SCHEMA + ".test_add_column_", "(col int)")) {
+            assertThatThrownBy(() -> onRemoteDatabase().execute("ALTER TABLE " + table.getName() + " ADD COLUMN new_col int NOT NULL"))
+                    .hasMessageContaining("ERROR: ALTER TABLE ADD COLUMN defined as NOT NULL must have a non-null default expression");
+        }
+    }
+
     @Override
     public void testDelete()
     {
@@ -536,9 +567,9 @@ public void testDecimalAvgPushdownForMaximumDecimalScale()
                     .isInstanceOf(AssertionError.class)
                     .hasMessageContaining("""
                             elements not found:
-                              <(555555555555555555561728450.9938271605)>
+                              (555555555555555555561728450.9938271605)
                             and elements not expected:
-                              <(555555555555555555561728450.9938271604)>
+                              (555555555555555555561728450.9938271604)
                             """);
         }
     }
@@ -633,13 +664,6 @@ public void testDeleteWithLike()
                 .hasStackTraceContaining("TrinoException: This connector does not support modifying table rows");
     }
 
-    @Test
-    @Override
-    public void testAddNotNullColumnToNonEmptyTable()
-    {
-        throw new SkipException("Redshift ALTER TABLE ADD COLUMN defined as NOT NULL must have a non-null default expression");
-    }
-
     private static class TestView
             implements AutoCloseable
     {
diff --git a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftQueryFailureRecoverySmokeTest.java b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftQueryFailureRecoverySmokeTest.java
new file mode 100644
index 000000000000..a71ca7450c4e
--- /dev/null
+++ b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftQueryFailureRecoverySmokeTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed 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 io.trino.plugin.redshift;
+
+import io.trino.operator.RetryPolicy;
+import org.testng.annotations.DataProvider;
+
+import java.util.Optional;
+
+import static io.trino.execution.FailureInjector.InjectedFailureType.TASK_GET_RESULTS_REQUEST_FAILURE;
+
+public class TestRedshiftQueryFailureRecoverySmokeTest
+        extends BaseRedshiftFailureRecoveryTest
+{
+    public TestRedshiftQueryFailureRecoverySmokeTest()
+    {
+        super(RetryPolicy.QUERY);
+    }
+
+    @Override
+    @DataProvider(name = "parallelTests", parallel = true)
+    public Object[][] parallelTests()
+    {
+        // Skip the regular FTE tests to execute the smoke test faster
+        return new Object[][] {
+                parallelTest("testCreateTableAsSelect", this::testCreateTableAsSelect),
+        };
+    }
+
+    private void testCreateTableAsSelect()
+    {
+        assertThatQuery("CREATE TABLE <table> AS SELECT * FROM orders")
+                .withCleanupQuery(Optional.of("DROP TABLE <table>"))
+                .experiencing(TASK_GET_RESULTS_REQUEST_FAILURE)
+                .at(boundaryDistributedStage())
+                .failsWithoutRetries(failure -> failure.hasMessageFindingMatch("Error 500 Internal Server Error|Error closing remote buffer, expected 204 got 500"))
+                .finishesSuccessfully()
+                .cleansUpTemporaryTables();
+    }
+}
diff --git a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftQueryFailureRecoveryTest.java b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftQueryFailureRecoveryTest.java
new file mode 100644
index 000000000000..3e294d5a9a7b
--- /dev/null
+++ b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftQueryFailureRecoveryTest.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.redshift;
+
+import io.trino.operator.RetryPolicy;
+
+public class TestRedshiftQueryFailureRecoveryTest
+        extends BaseRedshiftFailureRecoveryTest
+{
+    public TestRedshiftQueryFailureRecoveryTest()
+    {
+        super(RetryPolicy.QUERY);
+    }
+}
diff --git a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftTableStatisticsReader.java b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftTableStatisticsReader.java
index ff713337ea53..5a2b85eb3856 100644
--- a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftTableStatisticsReader.java
+++ b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftTableStatisticsReader.java
@@ -240,7 +240,6 @@ public void testMaterializedView()
             executeInRedshift("CREATE MATERIALIZED VIEW " + schemaAndTable +
                     " AS SELECT custkey, mktsegment, comment FROM " + TEST_SCHEMA + ".customer");
             executeInRedshift("REFRESH MATERIALIZED VIEW " + schemaAndTable);
-            executeInRedshift("ANALYZE VERBOSE " + schemaAndTable);
             TableStatistics tableStatistics = statsReader.readTableStatistics(
                     SESSION,
                     new JdbcTableHandle(
diff --git a/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftTaskFailureRecoveryTest.java b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftTaskFailureRecoveryTest.java
new file mode 100644
index 000000000000..61595536941b
--- /dev/null
+++ b/plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftTaskFailureRecoveryTest.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.redshift;
+
+import io.trino.operator.RetryPolicy;
+
+public class TestRedshiftTaskFailureRecoveryTest
+        extends BaseRedshiftFailureRecoveryTest
+{
+    public TestRedshiftTaskFailureRecoveryTest()
+    {
+        super(RetryPolicy.TASK);
+    }
+}
diff --git a/plugin/trino-resource-group-managers/pom.xml b/plugin/trino-resource-group-managers/pom.xml
index a54dede0eaee..efcc153b9bb1 100644
--- a/plugin/trino-resource-group-managers/pom.xml
+++ b/plugin/trino-resource-group-managers/pom.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-resource-group-managers</artifactId>
-    <description>Trino - Resource Group Configuration Managers</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Resource Group Configuration Managers</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,8 +19,29 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -59,114 +80,110 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>org.jdbi</groupId>
+            <artifactId>jdbi3-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>org.jdbi</groupId>
+            <artifactId>jdbi3-sqlobject</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>org.weakref</groupId>
+            <artifactId>jmxutils</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.jdbi</groupId>
-            <artifactId>jdbi3-core</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.jdbi</groupId>
-            <artifactId>jdbi3-sqlobject</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.weakref</groupId>
-            <artifactId>jmxutils</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <version>${dep.oracle.version}</version>
-            <scope>runtime</scope>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc11</artifactId>
+            <version>${dep.oracle.version}</version>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-database-oracle</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-mysql</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -177,8 +194,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -212,6 +229,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
diff --git a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/AbstractResourceConfigurationManager.java b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/AbstractResourceConfigurationManager.java
index 2f363a3d0641..c9c758ca70c0 100644
--- a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/AbstractResourceConfigurationManager.java
+++ b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/AbstractResourceConfigurationManager.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.resourcegroups;
 
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.spi.TrinoException;
@@ -24,8 +25,6 @@
 import io.trino.spi.resourcegroups.ResourceGroupId;
 import io.trino.spi.resourcegroups.SelectionContext;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
diff --git a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/FileResourceGroupConfig.java b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/FileResourceGroupConfig.java
index 0228d1142bb8..37ee8cb036f7 100644
--- a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/FileResourceGroupConfig.java
+++ b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/FileResourceGroupConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class FileResourceGroupConfig
 {
diff --git a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/FileResourceGroupConfigurationManager.java b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/FileResourceGroupConfigurationManager.java
index 95dfc69b45cc..430f6c0ce7d4 100644
--- a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/FileResourceGroupConfigurationManager.java
+++ b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/FileResourceGroupConfigurationManager.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
 import io.airlift.json.ObjectMapperProvider;
@@ -26,8 +27,6 @@
 import io.trino.spi.resourcegroups.SelectionContext;
 import io.trino.spi.resourcegroups.SelectionCriteria;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
diff --git a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/DaoProvider.java b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/DaoProvider.java
index 3647f039b04d..72bddfec292b 100644
--- a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/DaoProvider.java
+++ b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/DaoProvider.java
@@ -13,12 +13,11 @@
  */
 package io.trino.plugin.resourcegroups.db;
 
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.sqlobject.SqlObjectPlugin;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 public class DaoProvider
         implements Provider<ResourceGroupsDao>
 {
diff --git a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/DbResourceGroupConfig.java b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/DbResourceGroupConfig.java
index 965424bb9c2e..d954edfa95c8 100644
--- a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/DbResourceGroupConfig.java
+++ b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/DbResourceGroupConfig.java
@@ -18,8 +18,7 @@
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.AssertTrue;
 
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.SECONDS;
diff --git a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/DbResourceGroupConfigurationManager.java b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/DbResourceGroupConfigurationManager.java
index a13ebe668ff5..09393d3252ab 100644
--- a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/DbResourceGroupConfigurationManager.java
+++ b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/DbResourceGroupConfigurationManager.java
@@ -17,6 +17,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.stats.CounterStat;
 import io.airlift.units.Duration;
@@ -32,14 +34,11 @@
 import io.trino.spi.resourcegroups.ResourceGroupId;
 import io.trino.spi.resourcegroups.SelectionContext;
 import io.trino.spi.resourcegroups.SelectionCriteria;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/ForEnvironment.java b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/ForEnvironment.java
index 74edcd3e9ae6..cc682ccf87d2 100644
--- a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/ForEnvironment.java
+++ b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/ForEnvironment.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.resourcegroups.db;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForEnvironment
 {
 }
diff --git a/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/H2DaoProvider.java b/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/H2DaoProvider.java
index 2347c52754be..44eb30d3d1c7 100644
--- a/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/H2DaoProvider.java
+++ b/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/H2DaoProvider.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.resourcegroups.db;
 
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import org.h2.jdbcx.JdbcDataSource;
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.sqlobject.SqlObjectPlugin;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import static java.util.Objects.requireNonNull;
 
 public class H2DaoProvider
diff --git a/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/TestDbResourceGroupConfig.java b/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/TestDbResourceGroupConfig.java
index 6bf518e8ecb3..0832722560ab 100644
--- a/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/TestDbResourceGroupConfig.java
+++ b/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/TestDbResourceGroupConfig.java
@@ -15,10 +15,9 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
+import jakarta.validation.constraints.AssertTrue;
 import org.testng.annotations.Test;
 
-import javax.validation.constraints.AssertTrue;
-
 import java.util.Map;
 
 import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
diff --git a/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/TestDbResourceGroupsPostgresqlFlywayMigration.java b/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/TestDbResourceGroupsPostgresqlFlywayMigration.java
index bedcaec878a1..6bda1c6a2008 100644
--- a/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/TestDbResourceGroupsPostgresqlFlywayMigration.java
+++ b/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/TestDbResourceGroupsPostgresqlFlywayMigration.java
@@ -24,8 +24,16 @@ public class TestDbResourceGroupsPostgresqlFlywayMigration
     @Override
     protected final JdbcDatabaseContainer<?> startContainer()
     {
-        JdbcDatabaseContainer<?> container = new PostgreSQLContainer<>("postgres:10.20");
+        JdbcDatabaseContainer<?> container = new PostgreSQLContainer<>("postgres:11");
         container.start();
         return container;
     }
+
+    @Test
+    public void forceTestNgToRespectSingleThreaded()
+    {
+        // TODO: Remove after updating TestNG to 7.4.0+ (https://github.com/trinodb/trino/issues/8571)
+        // TestNG doesn't enforce @Test(singleThreaded = true) when tests are defined in base class. According to
+        // https://github.com/cbeust/testng/issues/2361#issuecomment-688393166 a workaround it to add a dummy test to the leaf test class.
+    }
 }
diff --git a/plugin/trino-session-property-managers/pom.xml b/plugin/trino-session-property-managers/pom.xml
index 9706b6f8a8e8..44e09e5249ea 100644
--- a/plugin/trino-session-property-managers/pom.xml
+++ b/plugin/trino-session-property-managers/pom.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-session-property-managers</artifactId>
-    <description>Trino - Session Property Managers</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Session Property Managers</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,89 +19,78 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
+            <artifactId>bootstrap</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>stats</artifactId>
+            <artifactId>concurrent</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <artifactId>configuration</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>stats</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -119,10 +108,9 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -133,8 +121,20 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -144,18 +144,17 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-hive</artifactId>
             <type>jar</type>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.alluxio</groupId>
-                    <artifactId>alluxio-shaded-client</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -163,12 +162,6 @@
             <artifactId>trino-hive</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.alluxio</groupId>
-                    <artifactId>alluxio-shaded-client</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -183,12 +176,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -213,4 +200,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/DbSessionPropertyManager.java b/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/DbSessionPropertyManager.java
index fba2b035dced..fbcea55205dc 100644
--- a/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/DbSessionPropertyManager.java
+++ b/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/DbSessionPropertyManager.java
@@ -14,13 +14,12 @@
 package io.trino.plugin.session.db;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.plugin.session.AbstractSessionPropertyManager;
 import io.trino.plugin.session.SessionMatchSpec;
 import io.trino.spi.session.SessionConfigurationContext;
 import io.trino.spi.session.SessionPropertyConfigurationManager;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/DbSessionPropertyManagerConfig.java b/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/DbSessionPropertyManagerConfig.java
index 387b2e36198b..0b64533bca71 100644
--- a/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/DbSessionPropertyManagerConfig.java
+++ b/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/DbSessionPropertyManagerConfig.java
@@ -17,9 +17,8 @@
 import io.airlift.configuration.ConfigSecuritySensitive;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
-
-import javax.annotation.Nullable;
-import javax.validation.constraints.NotNull;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 
diff --git a/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/RefreshingDbSpecsProvider.java b/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/RefreshingDbSpecsProvider.java
index 3e45ed260f2d..fd540f3ffc0c 100644
--- a/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/RefreshingDbSpecsProvider.java
+++ b/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/RefreshingDbSpecsProvider.java
@@ -15,16 +15,15 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.stats.CounterStat;
 import io.trino.plugin.session.SessionMatchSpec;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
diff --git a/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/SessionPropertiesDaoProvider.java b/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/SessionPropertiesDaoProvider.java
index 1ca3e03afa76..e8035d5cdb8c 100644
--- a/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/SessionPropertiesDaoProvider.java
+++ b/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/db/SessionPropertiesDaoProvider.java
@@ -13,13 +13,12 @@
  */
 package io.trino.plugin.session.db;
 
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import com.mysql.cj.jdbc.MysqlDataSource;
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.sqlobject.SqlObjectPlugin;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/file/FileSessionPropertyManager.java b/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/file/FileSessionPropertyManager.java
index 6a34b6fe8602..5c8662bab380 100644
--- a/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/file/FileSessionPropertyManager.java
+++ b/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/file/FileSessionPropertyManager.java
@@ -16,14 +16,13 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
 import io.airlift.json.ObjectMapperProvider;
 import io.trino.plugin.session.AbstractSessionPropertyManager;
 import io.trino.plugin.session.SessionMatchSpec;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
diff --git a/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/file/FileSessionPropertyManagerConfig.java b/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/file/FileSessionPropertyManagerConfig.java
index 37df69d5d8b6..13fe4f5f6cf6 100644
--- a/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/file/FileSessionPropertyManagerConfig.java
+++ b/plugin/trino-session-property-managers/src/main/java/io/trino/plugin/session/file/FileSessionPropertyManagerConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 
diff --git a/plugin/trino-session-property-managers/src/test/java/io/trino/plugin/session/db/TestDbSessionPropertyManagerIntegration.java b/plugin/trino-session-property-managers/src/test/java/io/trino/plugin/session/db/TestDbSessionPropertyManagerIntegration.java
index cd597095a8b4..fb9ec0de90e8 100644
--- a/plugin/trino-session-property-managers/src/test/java/io/trino/plugin/session/db/TestDbSessionPropertyManagerIntegration.java
+++ b/plugin/trino-session-property-managers/src/test/java/io/trino/plugin/session/db/TestDbSessionPropertyManagerIntegration.java
@@ -177,10 +177,11 @@ private static Session.SessionBuilder testSessionBuilder()
         return Session.builder(new SessionPropertyManager())
                 .setQueryId(new QueryIdGenerator().createNextQueryId())
                 .setIdentity(Identity.ofUser("user"))
+                .setOriginalIdentity(Identity.ofUser("user"))
                 .setSource("test")
                 .setCatalog("catalog")
                 .setSchema("schema")
-                .setPath(new SqlPath(Optional.of("path")))
+                .setPath(SqlPath.buildPath("path", Optional.empty()))
                 .setTimeZoneKey(DEFAULT_TIME_ZONE_KEY)
                 .setLocale(ENGLISH)
                 .setRemoteUserAddress("address")
diff --git a/plugin/trino-session-property-managers/src/test/java/io/trino/plugin/session/db/TestingDbSpecsProvider.java b/plugin/trino-session-property-managers/src/test/java/io/trino/plugin/session/db/TestingDbSpecsProvider.java
index 0b49d396f84f..3cee337b4f1a 100644
--- a/plugin/trino-session-property-managers/src/test/java/io/trino/plugin/session/db/TestingDbSpecsProvider.java
+++ b/plugin/trino-session-property-managers/src/test/java/io/trino/plugin/session/db/TestingDbSpecsProvider.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.session.db;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.plugin.session.SessionMatchSpec;
-
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/plugin/trino-singlestore/pom.xml b/plugin/trino-singlestore/pom.xml
index 57b9928df78a..53dc6652ef31 100644
--- a/plugin/trino-singlestore/pom.xml
+++ b/plugin/trino-singlestore/pom.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-singlestore</artifactId>
-    <description>Trino - SingleStore Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - SingleStore Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,13 +19,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-base-jdbc</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.singlestore</groupId>
+            <artifactId>singlestore-jdbc-client</artifactId>
+            <version>1.2.0</version>
         </dependency>
 
         <dependency>
@@ -39,32 +45,56 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-base-jdbc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.singlestore</groupId>
-            <artifactId>singlestore-jdbc-client</artifactId>
-            <version>1.0.1</version>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>bootstrap</artifactId>
@@ -83,32 +113,18 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -129,6 +145,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
@@ -153,12 +176,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -171,6 +188,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>jdbc</artifactId>
@@ -189,4 +212,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreClient.java b/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreClient.java
index 044f08fc5ffb..b715c1b293d8 100644
--- a/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreClient.java
+++ b/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreClient.java
@@ -14,6 +14,8 @@
 package io.trino.plugin.singlestore;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcClient;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ColumnMapping;
@@ -30,7 +32,6 @@
 import io.trino.plugin.jdbc.RemoteTableName;
 import io.trino.plugin.jdbc.WriteMapping;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
@@ -50,8 +51,6 @@
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.VarcharType;
 
-import javax.inject.Inject;
-
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -108,6 +107,7 @@
 import static io.trino.plugin.jdbc.TypeHandlingJdbcSessionProperties.getUnsupportedTypeHandling;
 import static io.trino.plugin.jdbc.UnsupportedTypeHandling.CONVERT_TO_VARCHAR;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.trino.spi.StandardErrorCode.SCHEMA_NOT_EMPTY;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
 import static io.trino.spi.type.DateType.DATE;
@@ -221,6 +221,22 @@ protected boolean filterSchema(String schemaName)
         return super.filterSchema(schemaName);
     }
 
+    @Override
+    protected void dropSchema(ConnectorSession session, Connection connection, String remoteSchemaName, boolean cascade)
+            throws SQLException
+    {
+        // SingleStore always deletes all tables inside the database though
+        // the behavior isn't documented in https://docs.singlestore.com/cloud/reference/sql-reference/data-definition-language-ddl/drop-database/
+        if (!cascade) {
+            try (ResultSet tables = getTables(connection, Optional.of(remoteSchemaName), Optional.empty())) {
+                if (tables.next()) {
+                    throw new TrinoException(SCHEMA_NOT_EMPTY, "Cannot drop non-empty schema '%s'".formatted(remoteSchemaName));
+                }
+            }
+        }
+        execute(session, connection, "DROP SCHEMA " + quoted(remoteSchemaName));
+    }
+
     @Override
     public Optional<String> getTableComment(ResultSet resultSet)
     {
diff --git a/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreClientModule.java b/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreClientModule.java
index 2426c62264c5..95e72cc6b059 100644
--- a/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreClientModule.java
+++ b/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreClientModule.java
@@ -19,6 +19,7 @@
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
 import com.singlestore.jdbc.Driver;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DecimalModule;
 import io.trino.plugin.jdbc.DriverConnectionFactory;
@@ -26,7 +27,7 @@
 import io.trino.plugin.jdbc.JdbcClient;
 import io.trino.plugin.jdbc.credential.CredentialProvider;
 import io.trino.plugin.jdbc.ptf.Query;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
 
 import java.util.Properties;
 
@@ -49,7 +50,7 @@ public void configure(Binder binder)
     @Provides
     @Singleton
     @ForBaseJdbc
-    public static ConnectionFactory createConnectionFactory(SingleStoreJdbcConfig config, CredentialProvider credentialProvider, SingleStoreConfig singleStoreConfig)
+    public static ConnectionFactory createConnectionFactory(SingleStoreJdbcConfig config, CredentialProvider credentialProvider, SingleStoreConfig singleStoreConfig, OpenTelemetry openTelemetry)
     {
         Properties connectionProperties = new Properties();
         // we don't want to interpret tinyInt type (with cardinality as 2) as boolean/bit
@@ -61,6 +62,7 @@ public static ConnectionFactory createConnectionFactory(SingleStoreJdbcConfig co
                 new Driver(),
                 config.getConnectionUrl(),
                 connectionProperties,
-                credentialProvider);
+                credentialProvider,
+                openTelemetry);
     }
 }
diff --git a/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreConfig.java b/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreConfig.java
index d3051ce031f5..f195e905aaa5 100644
--- a/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreConfig.java
+++ b/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreConfig.java
@@ -17,8 +17,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.LegacyConfig;
 import io.airlift.units.Duration;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreJdbcConfig.java b/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreJdbcConfig.java
index 4e4f19497208..dfd550c0712f 100644
--- a/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreJdbcConfig.java
+++ b/plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreJdbcConfig.java
@@ -14,8 +14,7 @@
 package io.trino.plugin.singlestore;
 
 import io.trino.plugin.jdbc.BaseJdbcConfig;
-
-import javax.validation.constraints.AssertFalse;
+import jakarta.validation.constraints.AssertFalse;
 
 public class SingleStoreJdbcConfig
         extends BaseJdbcConfig
diff --git a/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreCaseInsensitiveMapping.java b/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreCaseInsensitiveMapping.java
index 2aef9aa092a1..698ad64bb05e 100644
--- a/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreCaseInsensitiveMapping.java
+++ b/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreCaseInsensitiveMapping.java
@@ -18,17 +18,16 @@
 import io.trino.plugin.jdbc.BaseCaseInsensitiveMappingTest;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.SqlExecutor;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
 
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
 import static io.trino.plugin.singlestore.SingleStoreQueryRunner.createSingleStoreQueryRunner;
 import static java.util.Objects.requireNonNull;
 
 // With case-insensitive-name-matching enabled colliding schema/table names are considered as errors.
 // Some tests here create colliding names which can cause any other concurrent test to fail.
-@Test(singleThreaded = true)
 public class TestSingleStoreCaseInsensitiveMapping
         extends BaseCaseInsensitiveMappingTest
 {
diff --git a/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreConnectorTest.java b/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreConnectorTest.java
index b03e3fd4971f..7c9243212187 100644
--- a/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreConnectorTest.java
+++ b/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreConnectorTest.java
@@ -63,47 +63,28 @@ public final void destroy()
         singleStoreServer.close();
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY:
-            case SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY:
-                return false;
-
-            case SUPPORTS_AGGREGATION_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_JOIN_PUSHDOWN:
-                return true;
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN:
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM:
-                return false;
-
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-            case SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN_WITH_COMMENT:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_JOIN_PUSHDOWN -> true;
+            case SUPPORTS_ADD_COLUMN_WITH_COMMENT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN,
+                    SUPPORTS_ARRAY,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN,
+                    SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY,
+                    SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -272,6 +253,25 @@ public void testColumnComment()
         assertUpdate("DROP TABLE test_column_comment");
     }
 
+    @Override
+    public void testAddNotNullColumn()
+    {
+        assertThatThrownBy(super::testAddNotNullColumn)
+                .isInstanceOf(AssertionError.class)
+                .hasMessage("Should fail to add not null column without a default value to a non-empty table");
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_nn_col", "(a_varchar varchar)")) {
+            String tableName = table.getName();
+
+            assertUpdate("INSERT INTO " + tableName + " VALUES ('a')", 1);
+            assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN b_varchar varchar NOT NULL");
+            assertThat(query("TABLE " + tableName))
+                    .skippingTypesCheck()
+                    // SingleStore adds implicit default value of '' for b_varchar
+                    .matches("VALUES ('a', '')");
+        }
+    }
+
     @Test
     public void testPredicatePushdown()
     {
diff --git a/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreLatestConnectorSmokeTest.java b/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreLatestConnectorSmokeTest.java
index 63588c8d7b2c..a934e018c33a 100644
--- a/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreLatestConnectorSmokeTest.java
+++ b/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreLatestConnectorSmokeTest.java
@@ -31,19 +31,13 @@ protected QueryRunner createQueryRunner()
         return createSingleStoreQueryRunner(singleStoreServer, ImmutableMap.of(), ImmutableMap.of(), REQUIRED_TPCH_TABLES);
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 }
diff --git a/plugin/trino-snowflake/pom.xml b/plugin/trino-snowflake/pom.xml
new file mode 100644
index 000000000000..d83bedf057c2
--- /dev/null
+++ b/plugin/trino-snowflake/pom.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>io.trino</groupId>
+        <artifactId>trino-root</artifactId>
+        <version>432-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>trino-snowflake</artifactId>
+    <packaging>trino-plugin</packaging>
+    <description>Trino - Snowflake Connector</description>
+
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-base-jdbc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>net.snowflake</groupId>
+            <artifactId>snowflake-jdbc</artifactId>
+            <version>3.13.32</version>
+        </dependency>
+
+        <!-- Trino SPI -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-base-jdbc</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-tpch</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino.tpch</groupId>
+            <artifactId>tpch</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>jdbc</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/TestSnowflakeClient.java</exclude>
+                                <exclude>**/TestSnowflakeConfig.java</exclude>
+                                <exclude>**/TestSnowflakeConnectorTest.java</exclude>
+                                <exclude>**/TestSnowflakePlugin.java</exclude>
+                                <exclude>**/TestSnowflakeTypeMapping.java</exclude>
+                                <exclude>**/Test*FailureRecoveryTest.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <!-- Tests which require third party cloud services are separated from the main test profile -->
+            <id>cloud-tests</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <includes>
+                                <exclude>**/TestSnowflakeClient.java</exclude>
+                                <exclude>**/TestSnowflakeConfig.java</exclude>
+                                <exclude>**/TestSnowflakeConnectorTest.java</exclude>
+                                <exclude>**/TestSnowflakePlugin.java</exclude>
+                                <exclude>**/TestSnowflakeTypeMapping.java</exclude>
+                                <exclude>**/Test*FailureRecoveryTest.java</exclude>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>fte-tests</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <includes>
+                                <include>**/Test*FailureRecoveryTest.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakeClient.java b/plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakeClient.java
new file mode 100644
index 000000000000..949ec492561f
--- /dev/null
+++ b/plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakeClient.java
@@ -0,0 +1,660 @@
+/*
+ * Licensed 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 io.trino.plugin.snowflake;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import io.airlift.log.Logger;
+import io.airlift.slice.Slices;
+import io.trino.plugin.base.aggregation.AggregateFunctionRewriter;
+import io.trino.plugin.base.aggregation.AggregateFunctionRule;
+import io.trino.plugin.base.expression.ConnectorExpressionRewriter;
+import io.trino.plugin.base.mapping.IdentifierMapping;
+import io.trino.plugin.jdbc.BaseJdbcClient;
+import io.trino.plugin.jdbc.BaseJdbcConfig;
+import io.trino.plugin.jdbc.ColumnMapping;
+import io.trino.plugin.jdbc.ConnectionFactory;
+import io.trino.plugin.jdbc.JdbcColumnHandle;
+import io.trino.plugin.jdbc.JdbcExpression;
+import io.trino.plugin.jdbc.JdbcTableHandle;
+import io.trino.plugin.jdbc.JdbcTypeHandle;
+import io.trino.plugin.jdbc.LongWriteFunction;
+import io.trino.plugin.jdbc.ObjectReadFunction;
+import io.trino.plugin.jdbc.ObjectWriteFunction;
+import io.trino.plugin.jdbc.PredicatePushdownController;
+import io.trino.plugin.jdbc.QueryBuilder;
+import io.trino.plugin.jdbc.SliceReadFunction;
+import io.trino.plugin.jdbc.SliceWriteFunction;
+import io.trino.plugin.jdbc.StandardColumnMappings;
+import io.trino.plugin.jdbc.WriteMapping;
+import io.trino.plugin.jdbc.aggregation.ImplementAvgDecimal;
+import io.trino.plugin.jdbc.aggregation.ImplementAvgFloatingPoint;
+import io.trino.plugin.jdbc.aggregation.ImplementCount;
+import io.trino.plugin.jdbc.aggregation.ImplementCountAll;
+import io.trino.plugin.jdbc.aggregation.ImplementMinMax;
+import io.trino.plugin.jdbc.aggregation.ImplementSum;
+import io.trino.plugin.jdbc.expression.JdbcConnectorExpressionRewriterBuilder;
+import io.trino.plugin.jdbc.expression.ParameterizedExpression;
+import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.AggregateFunction;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.type.CharType;
+import io.trino.spi.type.Chars;
+import io.trino.spi.type.DateTimeEncoding;
+import io.trino.spi.type.DateType;
+import io.trino.spi.type.DecimalType;
+import io.trino.spi.type.LongTimestamp;
+import io.trino.spi.type.LongTimestampWithTimeZone;
+import io.trino.spi.type.StandardTypes;
+import io.trino.spi.type.TimeType;
+import io.trino.spi.type.TimeZoneKey;
+import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.TimestampWithTimeZoneType;
+import io.trino.spi.type.Timestamps;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeManager;
+import io.trino.spi.type.TypeSignature;
+import io.trino.spi.type.VarcharType;
+
+import java.math.RoundingMode;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.TimeZone;
+import java.util.function.BiFunction;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static io.airlift.slice.Slices.utf8Slice;
+import static io.trino.plugin.base.util.JsonTypeUtil.jsonParse;
+import static io.trino.plugin.jdbc.JdbcErrorCode.JDBC_ERROR;
+import static io.trino.plugin.jdbc.PredicatePushdownController.DISABLE_PUSHDOWN;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+
+public class SnowflakeClient
+        extends BaseJdbcClient
+{
+    /* TIME supports an optional precision parameter for fractional seconds, e.g. TIME(3). Time precision can range from 0 (seconds) to 9 (nanoseconds). The default precision is 9.
+      All TIME values must be between 00:00:00 and 23:59:59.999999999. TIME internally stores “wallclock” time, and all operations on TIME values are performed without taking any time zone into consideration.
+     */
+    private static final int SNOWFLAKE_MAX_SUPPORTED_TIMESTAMP_PRECISION = 9;
+    private static final Logger log = Logger.get(SnowflakeClient.class);
+    private static final DateTimeFormatter SNOWFLAKE_DATETIME_FORMATTER = DateTimeFormatter.ofPattern("y-MM-dd'T'HH:mm:ss.SSSSSSSSSXXX");
+    private static final DateTimeFormatter SNOWFLAKE_DATE_FORMATTER = DateTimeFormatter.ofPattern("uuuu-MM-dd");
+    private static final DateTimeFormatter SNOWFLAKE_TIMESTAMP_FORMATTER = DateTimeFormatter.ofPattern("y-MM-dd'T'HH:mm:ss.SSSSSSSSS");
+    private static final DateTimeFormatter SNOWFLAKE_TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss.SSSSSSSSS");
+    private final Type jsonType;
+    private final AggregateFunctionRewriter aggregateFunctionRewriter;
+
+    private interface WriteMappingFunction
+    {
+        WriteMapping convert(Type type);
+    }
+
+    private interface ColumnMappingFunction
+    {
+        Optional<ColumnMapping> convert(JdbcTypeHandle typeHandle);
+    }
+
+    private static final TimeZone UTC_TZ = TimeZone.getTimeZone(ZoneId.of("UTC"));
+    // Mappings for JDBC column types to internal Trino types
+    private static final Map<Integer, ColumnMapping> STANDARD_COLUMN_MAPPINGS = ImmutableMap.<Integer, ColumnMapping>builder()
+            .put(Types.BOOLEAN, StandardColumnMappings.booleanColumnMapping())
+            .put(Types.TINYINT, StandardColumnMappings.tinyintColumnMapping())
+            .put(Types.SMALLINT, StandardColumnMappings.smallintColumnMapping())
+            .put(Types.INTEGER, StandardColumnMappings.integerColumnMapping())
+            .put(Types.BIGINT, StandardColumnMappings.bigintColumnMapping())
+            .put(Types.REAL, StandardColumnMappings.realColumnMapping())
+            .put(Types.DOUBLE, StandardColumnMappings.doubleColumnMapping())
+            .put(Types.FLOAT, StandardColumnMappings.doubleColumnMapping())
+            .put(Types.BINARY, StandardColumnMappings.varbinaryColumnMapping())
+            .put(Types.VARBINARY, StandardColumnMappings.varbinaryColumnMapping())
+            .put(Types.LONGVARBINARY, StandardColumnMappings.varbinaryColumnMapping())
+            .buildOrThrow();
+
+    private static final Map<String, ColumnMappingFunction> SHOWFLAKE_COLUMN_MAPPINGS = ImmutableMap.<String, ColumnMappingFunction>builder()
+            .put("time", typeHandle -> {
+                //return Optional.of(columnMappingPushdown(timeColumnMapping(typeHandle)));
+                return Optional.of(timeColumnMapping(typeHandle));
+            })
+            .put("timestampntz", typeHandle -> {
+                return Optional.of(timestampColumnMapping(typeHandle));
+            })
+            .put("timestamptz", typeHandle -> {
+                return Optional.of(timestampTZColumnMapping(typeHandle));
+            })
+            .put("timestampltz", typeHandle -> {
+                return Optional.of(timestampTZColumnMapping(typeHandle));
+            })
+            .put("date", typeHandle -> {
+                return Optional.of(ColumnMapping.longMapping(
+                        DateType.DATE, (resultSet, columnIndex) ->
+                                LocalDate.ofEpochDay(resultSet.getLong(columnIndex)).toEpochDay(),
+                        snowFlakeDateWriter()));
+            })
+            .put("object", typeHandle -> {
+                return Optional.of(ColumnMapping.sliceMapping(
+                        VarcharType.createUnboundedVarcharType(),
+                        StandardColumnMappings.varcharReadFunction(VarcharType.createUnboundedVarcharType()),
+                        StandardColumnMappings.varcharWriteFunction(),
+                        PredicatePushdownController.DISABLE_PUSHDOWN));
+            })
+            .put("array", typeHandle -> {
+                return Optional.of(ColumnMapping.sliceMapping(
+                        VarcharType.createUnboundedVarcharType(),
+                        StandardColumnMappings.varcharReadFunction(VarcharType.createUnboundedVarcharType()),
+                        StandardColumnMappings.varcharWriteFunction(),
+                        PredicatePushdownController.DISABLE_PUSHDOWN));
+            })
+            .put("variant", typeHandle -> {
+                return Optional.of(ColumnMapping.sliceMapping(
+                        VarcharType.createUnboundedVarcharType(), variantReadFunction(), StandardColumnMappings.varcharWriteFunction(),
+                        PredicatePushdownController.FULL_PUSHDOWN));
+            })
+            .put("varchar", typeHandle -> {
+                return Optional.of(varcharColumnMapping(typeHandle.getRequiredColumnSize()));
+            })
+            .put("number", typeHandle -> {
+                int decimalDigits = typeHandle.getRequiredDecimalDigits();
+                int precision = typeHandle.getRequiredColumnSize() + Math.max(-decimalDigits, 0);
+                if (precision > 38) {
+                    return Optional.empty();
+                }
+                return Optional.of(columnMappingPushdown(
+                        StandardColumnMappings.decimalColumnMapping(DecimalType.createDecimalType(
+                                precision, Math.max(decimalDigits, 0)), RoundingMode.UNNECESSARY)));
+            })
+            .buildOrThrow();
+
+    // Mappings for internal Trino types to JDBC column types
+    private static final Map<String, WriteMapping> STANDARD_WRITE_MAPPINGS = ImmutableMap.<String, WriteMapping>builder()
+            .put("BooleanType", WriteMapping.booleanMapping("boolean", StandardColumnMappings.booleanWriteFunction()))
+            .put("BigintType", WriteMapping.longMapping("number(19)", StandardColumnMappings.bigintWriteFunction()))
+            .put("IntegerType", WriteMapping.longMapping("number(10)", StandardColumnMappings.integerWriteFunction()))
+            .put("SmallintType", WriteMapping.longMapping("number(5)", StandardColumnMappings.smallintWriteFunction()))
+            .put("TinyintType", WriteMapping.longMapping("number(3)", StandardColumnMappings.tinyintWriteFunction()))
+            .put("DoubleType", WriteMapping.doubleMapping("double precision", StandardColumnMappings.doubleWriteFunction()))
+            .put("RealType", WriteMapping.longMapping("real", StandardColumnMappings.realWriteFunction()))
+            .put("VarbinaryType", WriteMapping.sliceMapping("varbinary", StandardColumnMappings.varbinaryWriteFunction()))
+            .put("DateType", WriteMapping.longMapping("date", snowFlakeDateWriter()))
+            .buildOrThrow();
+
+    private static final Map<String, WriteMappingFunction> SNOWFLAKE_WRITE_MAPPINGS = ImmutableMap.<String, WriteMappingFunction>builder()
+            .put("TimeType", type -> {
+                return WriteMapping.longMapping("time", SnowflakeClient.snowFlaketimeWriter(type));
+            })
+            .put("ShortTimestampType", type -> {
+                WriteMapping myMap = SnowflakeClient.snowFlakeTimestampWriter(type);
+                return myMap;
+            })
+            .put("ShortTimestampWithTimeZoneType", type -> {
+                WriteMapping myMap = SnowflakeClient.snowFlakeTimestampWithTZWriter(type);
+                return myMap;
+            })
+            .put("LongTimestampType", type -> {
+                WriteMapping myMap = SnowflakeClient.snowFlakeTimestampWithTZWriter(type);
+                return myMap;
+            })
+            .put("LongTimestampWithTimeZoneType", type -> {
+                WriteMapping myMap = SnowflakeClient.snowFlakeTimestampWithTZWriter(type);
+                return myMap;
+            })
+            .put("VarcharType", type -> {
+                WriteMapping myMap = SnowflakeClient.snowFlakeVarCharWriter(type);
+                return myMap;
+            })
+            .put("CharType", type -> {
+                WriteMapping myMap = SnowflakeClient.snowFlakeCharWriter(type);
+                return myMap;
+            })
+            .put("LongDecimalType", type -> {
+                WriteMapping myMap = SnowflakeClient.snowFlakeDecimalWriter(type);
+                return myMap;
+            })
+            .put("ShortDecimalType", type -> {
+                WriteMapping myMap = SnowflakeClient.snowFlakeDecimalWriter(type);
+                return myMap;
+            })
+            .buildOrThrow();
+
+    @Inject
+    public SnowflakeClient(BaseJdbcConfig config, ConnectionFactory connectionFactory, QueryBuilder queryBuilder,
+                           TypeManager typeManager, IdentifierMapping identifierMapping,
+                           RemoteQueryModifier remoteQueryModifier)
+    {
+        super("\"", connectionFactory, queryBuilder, config.getJdbcTypesMappedToVarchar(), identifierMapping, remoteQueryModifier, false);
+        this.jsonType = typeManager.getType(new TypeSignature(StandardTypes.JSON));
+
+        JdbcTypeHandle bigintTypeHandle = new JdbcTypeHandle(Types.BIGINT, Optional.of("bigint"), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
+        ConnectorExpressionRewriter<ParameterizedExpression> connectorExpressionRewriter = JdbcConnectorExpressionRewriterBuilder.newBuilder()
+                .addStandardRules(this::quoted)
+                .build();
+
+        this.aggregateFunctionRewriter = new AggregateFunctionRewriter<>(
+                connectorExpressionRewriter,
+                ImmutableSet.<AggregateFunctionRule<JdbcExpression, ParameterizedExpression>>builder()
+                        .add(new ImplementCountAll(bigintTypeHandle))
+                        .add(new ImplementCount(bigintTypeHandle))
+                        .add(new ImplementMinMax(false))
+                        .add(new ImplementSum(SnowflakeClient::toTypeHandle))
+                        .add(new ImplementAvgFloatingPoint())
+                        .add(new ImplementAvgDecimal())
+                        .build());
+    }
+
+    @Override
+    public void abortReadConnection(Connection connection, ResultSet resultSet)
+            throws SQLException
+    {
+        // Abort connection before closing. Without this, the Snowflake driver
+        // attempts to drain the connection by reading all the results.
+        connection.abort(directExecutor());
+    }
+
+    @Override
+    public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connection connection, JdbcTypeHandle typeHandle)
+    {
+        String jdbcTypeName = typeHandle.getJdbcTypeName()
+                .orElseThrow(() -> new TrinoException(JDBC_ERROR, "Type name is missing: " + typeHandle));
+        jdbcTypeName = jdbcTypeName.toLowerCase(Locale.ENGLISH);
+        int type = typeHandle.getJdbcType();
+
+        ColumnMapping columnMap = STANDARD_COLUMN_MAPPINGS.get(type);
+        if (columnMap != null) {
+            return Optional.of(columnMap);
+        }
+
+        ColumnMappingFunction columnMappingFunction = SHOWFLAKE_COLUMN_MAPPINGS.get(jdbcTypeName);
+        if (columnMappingFunction != null) {
+            return columnMappingFunction.convert(typeHandle);
+        }
+
+        // Code should never reach here so throw an error.
+        throw new TrinoException(NOT_SUPPORTED, "SNOWFLAKE_CONNECTOR_COLUMN_TYPE_NOT_SUPPORTED: Unsupported column type(" + type +
+                "):" + jdbcTypeName);
+    }
+
+    @Override
+    public WriteMapping toWriteMapping(ConnectorSession session, Type type)
+    {
+        Class myClass = type.getClass();
+        String simple = myClass.getSimpleName();
+
+        WriteMapping writeMapping = STANDARD_WRITE_MAPPINGS.get(simple);
+        if (writeMapping != null) {
+            return writeMapping;
+        }
+
+        WriteMappingFunction writeMappingFunction = SNOWFLAKE_WRITE_MAPPINGS.get(simple);
+        if (writeMappingFunction != null) {
+            return writeMappingFunction.convert(type);
+        }
+
+        log.debug("SnowflakeClient.toWriteMapping: SNOWFLAKE_CONNECTOR_COLUMN_TYPE_NOT_SUPPORTED: Unsupported column type: " + type.getDisplayName() + ", simple:" + simple);
+
+        throw new TrinoException(NOT_SUPPORTED, "SNOWFLAKE_CONNECTOR_COLUMN_TYPE_NOT_SUPPORTED: Unsupported column type: " + type.getDisplayName() + ", simple:" + simple);
+    }
+
+    @Override
+    public Optional<JdbcExpression> implementAggregation(ConnectorSession session, AggregateFunction aggregate, Map<String, ColumnHandle> assignments)
+    {
+        // TODO support complex ConnectorExpressions
+        return aggregateFunctionRewriter.rewrite(session, aggregate, assignments);
+    }
+
+    private static Optional<JdbcTypeHandle> toTypeHandle(DecimalType decimalType)
+    {
+        return Optional.of(new JdbcTypeHandle(Types.NUMERIC, Optional.of("decimal"), Optional.of(decimalType.getPrecision()), Optional.of(decimalType.getScale()), Optional.empty(), Optional.empty()));
+    }
+
+    @Override
+    protected Optional<BiFunction<String, Long, String>> limitFunction()
+    {
+        return Optional.of((sql, limit) -> sql + " LIMIT " + limit);
+    }
+
+    @Override
+    public boolean isLimitGuaranteed(ConnectorSession session)
+    {
+        return true;
+    }
+
+    private ColumnMapping jsonColumnMapping()
+    {
+        return ColumnMapping.sliceMapping(
+                jsonType,
+                (resultSet, columnIndex) -> jsonParse(utf8Slice(resultSet.getString(columnIndex))),
+                StandardColumnMappings.varcharWriteFunction(),
+                DISABLE_PUSHDOWN);
+    }
+
+    @Override
+    public void setColumnType(ConnectorSession session, JdbcTableHandle handle, JdbcColumnHandle column, Type type)
+    {
+        throw new TrinoException(NOT_SUPPORTED, "This connector does not support setting column types");
+    }
+
+    private static SliceReadFunction variantReadFunction()
+    {
+        return (resultSet, columnIndex) -> Slices.utf8Slice(resultSet.getString(columnIndex).replaceAll("^\"|\"$", ""));
+    }
+
+    private static ColumnMapping columnMappingPushdown(ColumnMapping mapping)
+    {
+        if (mapping.getPredicatePushdownController() == PredicatePushdownController.DISABLE_PUSHDOWN) {
+            log.debug("SnowflakeClient.columnMappingPushdown: NOT_SUPPORTED mapping.getPredicatePushdownController() is DISABLE_PUSHDOWN. Type was " + mapping.getType());
+            throw new TrinoException(NOT_SUPPORTED, "mapping.getPredicatePushdownController() is DISABLE_PUSHDOWN. Type was " + mapping.getType());
+        }
+
+        return new ColumnMapping(mapping.getType(), mapping.getReadFunction(), mapping.getWriteFunction(),
+                PredicatePushdownController.FULL_PUSHDOWN);
+    }
+
+    private static ColumnMapping timeColumnMapping(JdbcTypeHandle typeHandle)
+    {
+        int precision = typeHandle.getRequiredDecimalDigits();
+        checkArgument((precision <= SNOWFLAKE_MAX_SUPPORTED_TIMESTAMP_PRECISION),
+                "The max timestamp precision in Snowflake is " + SNOWFLAKE_MAX_SUPPORTED_TIMESTAMP_PRECISION);
+        return ColumnMapping.longMapping(
+                TimeType.createTimeType(precision),
+                (resultSet, columnIndex) -> {
+                    LocalTime time = SNOWFLAKE_TIME_FORMATTER.parse(resultSet.getString(columnIndex), LocalTime::from);
+                    long nanosOfDay = time.toNanoOfDay();
+                    long picosOfDay = nanosOfDay * Timestamps.PICOSECONDS_PER_NANOSECOND;
+                    return Timestamps.round(picosOfDay, 12 - precision);
+                },
+                timeWriteFunction(precision),
+                PredicatePushdownController.FULL_PUSHDOWN);
+    }
+
+    private static LongWriteFunction snowFlaketimeWriter(Type type)
+    {
+        TimeType timeType = (TimeType) type;
+        int precision = timeType.getPrecision();
+        return timeWriteFunction(precision);
+    }
+
+    private static LongWriteFunction timeWriteFunction(int precision)
+    {
+        checkArgument(precision <= SNOWFLAKE_MAX_SUPPORTED_TIMESTAMP_PRECISION, "Unsupported precision: %s", precision);
+        String bindExpression = String.format("CAST(? AS time(%s))", precision);
+        return new LongWriteFunction()
+        {
+            @Override
+            public String getBindExpression()
+            {
+                return bindExpression;
+            }
+
+            @Override
+            public void set(PreparedStatement statement, int index, long picosOfDay)
+                    throws SQLException
+            {
+                picosOfDay = Timestamps.round(picosOfDay, 12 - precision);
+                if (picosOfDay == Timestamps.PICOSECONDS_PER_DAY) {
+                    picosOfDay = 0;
+                }
+                LocalTime localTime = LocalTime.ofNanoOfDay(picosOfDay / Timestamps.PICOSECONDS_PER_NANOSECOND);
+                // statement.setObject(.., localTime) would yield incorrect end result for 23:59:59.999000
+                statement.setString(index, SNOWFLAKE_TIME_FORMATTER.format(localTime));
+            }
+        };
+    }
+
+    private static long toTrinoTime(Time sqlTime)
+    {
+        return Timestamps.PICOSECONDS_PER_SECOND * sqlTime.getTime();
+    }
+
+    private static ColumnMapping timestampTZColumnMapping(JdbcTypeHandle typeHandle)
+    {
+        int precision = typeHandle.getRequiredDecimalDigits();
+        String jdbcTypeName = typeHandle.getJdbcTypeName()
+                .orElseThrow(() -> new TrinoException(JDBC_ERROR, "Type name is missing: " + typeHandle));
+        int type = typeHandle.getJdbcType();
+        log.debug("timestampTZColumnMapping: jdbcTypeName(%s):%s precision:precision", type, jdbcTypeName, precision);
+
+        if (precision <= 3) {
+            return ColumnMapping.longMapping(TimestampWithTimeZoneType.createTimestampWithTimeZoneType(precision),
+                    (resultSet, columnIndex) -> {
+                        ZonedDateTime timestamp = (ZonedDateTime) SNOWFLAKE_DATETIME_FORMATTER.parse(resultSet.getString(columnIndex), ZonedDateTime::from);
+                        return DateTimeEncoding.packDateTimeWithZone(timestamp.toInstant().toEpochMilli(), timestamp.getZone().getId());
+                    },
+                    timestampWithTZWriter(), PredicatePushdownController.FULL_PUSHDOWN);
+        }
+        else {
+            return ColumnMapping.objectMapping(TimestampWithTimeZoneType.createTimestampWithTimeZoneType(precision), longTimestampWithTimezoneReadFunction(), longTimestampWithTZWriteFunction());
+        }
+    }
+
+    private static ColumnMapping varcharColumnMapping(int varcharLength)
+    {
+        VarcharType varcharType = varcharLength <= VarcharType.MAX_LENGTH
+                ? VarcharType.createVarcharType(varcharLength)
+                : VarcharType.createUnboundedVarcharType();
+        return ColumnMapping.sliceMapping(
+                varcharType,
+                StandardColumnMappings.varcharReadFunction(varcharType),
+                StandardColumnMappings.varcharWriteFunction());
+    }
+
+    private static ObjectReadFunction longTimestampWithTimezoneReadFunction()
+    {
+        return ObjectReadFunction.of(LongTimestampWithTimeZone.class, (resultSet, columnIndex) -> {
+            ZonedDateTime timestamp = (ZonedDateTime) SNOWFLAKE_DATETIME_FORMATTER.parse(resultSet.getString(columnIndex), ZonedDateTime::from);
+            return LongTimestampWithTimeZone.fromEpochSecondsAndFraction(timestamp.toEpochSecond(),
+                    (long) timestamp.getNano() * Timestamps.PICOSECONDS_PER_NANOSECOND,
+                    TimeZoneKey.getTimeZoneKey(timestamp.getZone().getId()));
+        });
+    }
+
+    private static ObjectWriteFunction longTimestampWithTZWriteFunction()
+    {
+        return ObjectWriteFunction.of(LongTimestampWithTimeZone.class, (statement, index, value) -> {
+            long epoMilli = value.getEpochMillis();
+            long epoSeconds = Math.floorDiv(epoMilli, Timestamps.MILLISECONDS_PER_SECOND);
+            long adjNano = Math.floorMod(epoMilli, Timestamps.MILLISECONDS_PER_SECOND) *
+                    Timestamps.NANOSECONDS_PER_MILLISECOND + value.getPicosOfMilli() / Timestamps.PICOSECONDS_PER_NANOSECOND;
+            ZoneId zone = TimeZoneKey.getTimeZoneKey(value.getTimeZoneKey()).getZoneId();
+            Instant timeI = Instant.ofEpochSecond(epoSeconds, adjNano);
+            statement.setString(index, SNOWFLAKE_DATETIME_FORMATTER.format(ZonedDateTime.ofInstant(timeI, zone)));
+        });
+    }
+
+    private static LongWriteFunction snowFlakeDateTimeWriter()
+    {
+        return (statement, index, encodedTimeWithZone) -> {
+            Instant time = Instant.ofEpochMilli(DateTimeEncoding.unpackMillisUtc(encodedTimeWithZone));
+            ZoneId zone = ZoneId.of(DateTimeEncoding.unpackZoneKey(encodedTimeWithZone).getId());
+            statement.setString(index, SNOWFLAKE_DATETIME_FORMATTER.format(time.atZone(zone)));
+        };
+    }
+
+    private static WriteMapping snowFlakeDecimalWriter(Type type)
+    {
+        DecimalType decimalType = (DecimalType) type;
+        String dataType = String.format("decimal(%s, %s)", new Object[] {
+                Integer.valueOf(decimalType.getPrecision()), Integer.valueOf(decimalType.getScale())
+        });
+
+        if (decimalType.isShort()) {
+            return WriteMapping.longMapping(dataType, StandardColumnMappings.shortDecimalWriteFunction(decimalType));
+        }
+        return WriteMapping.objectMapping(dataType, StandardColumnMappings.longDecimalWriteFunction(decimalType));
+    }
+
+    private static LongWriteFunction snowFlakeDateWriter()
+    {
+        return (statement, index, day) -> statement.setString(index, SNOWFLAKE_DATE_FORMATTER.format(LocalDate.ofEpochDay(day)));
+    }
+
+    private static WriteMapping snowFlakeCharWriter(Type type)
+    {
+        CharType charType = (CharType) type;
+        return WriteMapping.sliceMapping("char(" + charType.getLength() + ")",
+                charWriteFunction(charType));
+    }
+
+    private static WriteMapping snowFlakeVarCharWriter(Type type)
+    {
+        String dataType;
+        VarcharType varcharType = (VarcharType) type;
+
+        if (varcharType.isUnbounded()) {
+            dataType = "varchar";
+        }
+        else {
+            dataType = "varchar(" + varcharType.getBoundedLength() + ")";
+        }
+        return WriteMapping.sliceMapping(dataType, StandardColumnMappings.varcharWriteFunction());
+    }
+
+    private static SliceWriteFunction charWriteFunction(CharType charType)
+    {
+        return (statement, index, value) -> statement.setString(index, Chars.padSpaces(value, charType).toStringUtf8());
+    }
+
+    private static WriteMapping snowFlakeTimestampWriter(Type type)
+    {
+        TimestampType timestampType = (TimestampType) type;
+        checkArgument((timestampType.getPrecision() <= SNOWFLAKE_MAX_SUPPORTED_TIMESTAMP_PRECISION),
+                "The max timestamp precision in Snowflake is " + SNOWFLAKE_MAX_SUPPORTED_TIMESTAMP_PRECISION);
+
+        if (timestampType.isShort()) {
+            return WriteMapping.longMapping(
+                    String.format("timestamp_ntz(%d)", new Object[] {Integer.valueOf(timestampType.getPrecision()) }),
+                    timestampWriteFunction());
+        }
+        return WriteMapping.objectMapping(
+                String.format("timestamp_ntz(%d)", new Object[] {Integer.valueOf(timestampType.getPrecision()) }),
+                longTimestampWriter(timestampType.getPrecision()));
+    }
+
+    private static LongWriteFunction timestampWriteFunction()
+    {
+        return (statement, index, value) -> statement.setString(index,
+                StandardColumnMappings.fromTrinoTimestamp(value).toString());
+    }
+
+    private static ObjectWriteFunction longTimestampWriter(int precision)
+    {
+        return ObjectWriteFunction.of(LongTimestamp.class,
+                (statement, index, value) -> statement.setString(index,
+                        SNOWFLAKE_TIMESTAMP_FORMATTER.format(StandardColumnMappings.fromLongTrinoTimestamp(value,
+                                precision))));
+    }
+
+    private static WriteMapping snowFlakeTimestampWithTZWriter(Type type)
+    {
+        TimestampWithTimeZoneType timeTZType = (TimestampWithTimeZoneType) type;
+
+        checkArgument((timeTZType.getPrecision() <= SNOWFLAKE_MAX_SUPPORTED_TIMESTAMP_PRECISION),
+                "Max Snowflake precision is is " + SNOWFLAKE_MAX_SUPPORTED_TIMESTAMP_PRECISION);
+        if (timeTZType.isShort()) {
+            return WriteMapping.longMapping(String.format("timestamp_tz(%d)",
+                            new Object[] {Integer.valueOf(timeTZType.getPrecision()) }),
+                    timestampWithTZWriter());
+        }
+        return WriteMapping.objectMapping(
+                String.format("timestamp_tz(%d)", new Object[] {Integer.valueOf(timeTZType.getPrecision()) }),
+                longTimestampWithTZWriteFunction());
+    }
+
+    private static LongWriteFunction timestampWithTZWriter()
+    {
+        return (statement, index, encodedTimeWithZone) -> {
+            Instant timeI = Instant.ofEpochMilli(DateTimeEncoding.unpackMillisUtc(encodedTimeWithZone));
+            ZoneId zone = ZoneId.of(DateTimeEncoding.unpackZoneKey(encodedTimeWithZone).getId());
+            statement.setString(index, SNOWFLAKE_DATETIME_FORMATTER.format(timeI.atZone(zone)));
+        };
+    }
+
+    private static ObjectReadFunction longTimestampWithTZReadFunction()
+    {
+        return ObjectReadFunction.of(LongTimestampWithTimeZone.class, (resultSet, columnIndex) -> {
+            ZonedDateTime timestamp = SNOWFLAKE_DATETIME_FORMATTER.<ZonedDateTime>parse(resultSet.getString(columnIndex), ZonedDateTime::from);
+            return LongTimestampWithTimeZone.fromEpochSecondsAndFraction(timestamp.toEpochSecond(),
+                    timestamp.getNano() * Timestamps.PICOSECONDS_PER_NANOSECOND, TimeZoneKey.getTimeZoneKey(timestamp.getZone().getId()));
+        });
+    }
+
+    private static ObjectReadFunction longTimestampReader()
+    {
+        return ObjectReadFunction.of(LongTimestamp.class, (resultSet, columnIndex) -> {
+            Calendar calendar = new GregorianCalendar(UTC_TZ, Locale.ENGLISH);
+            calendar.setTime(new Date(0));
+            Timestamp ts = resultSet.getTimestamp(columnIndex, calendar);
+            long epochMillis = ts.getTime();
+            int nanosInTheSecond = ts.getNanos();
+            int nanosInTheMilli = nanosInTheSecond % Timestamps.NANOSECONDS_PER_MILLISECOND;
+            long micro = epochMillis * Timestamps.MICROSECONDS_PER_MILLISECOND + (nanosInTheMilli / Timestamps.NANOSECONDS_PER_MICROSECOND);
+            int picosOfMicro = nanosInTheMilli % 1000 * 1000;
+            return new LongTimestamp(micro, picosOfMicro);
+        });
+    }
+
+    private static ColumnMapping timestampColumnMapping(JdbcTypeHandle typeHandle)
+    {
+        int precision = typeHandle.getRequiredDecimalDigits();
+        String jdbcTypeName = typeHandle.getJdbcTypeName()
+                .orElseThrow(() -> new TrinoException(JDBC_ERROR, "Type name is missing: " + typeHandle));
+        int type = typeHandle.getJdbcType();
+        log.debug("timestampColumnMapping: jdbcTypeName(%s):%s precision:%s", type, jdbcTypeName, precision);
+
+        // <= 6 fits into a long
+        if (precision <= 6) {
+            return ColumnMapping.longMapping(
+                    (Type) TimestampType.createTimestampType(precision), (resultSet, columnIndex) ->
+                            StandardColumnMappings.toTrinoTimestamp(TimestampType.createTimestampType(precision),
+                                    toLocalDateTime(resultSet, columnIndex)),
+                    timestampWriteFunction());
+        }
+
+        // Too big. Put it in an object
+        return ColumnMapping.objectMapping(
+                (Type) TimestampType.createTimestampType(precision),
+                longTimestampReader(),
+                longTimestampWriter(precision));
+    }
+
+    private static LocalDateTime toLocalDateTime(ResultSet resultSet, int columnIndex)
+            throws SQLException
+    {
+        Calendar calendar = new GregorianCalendar(UTC_TZ, Locale.ENGLISH);
+        calendar.setTime(new Date(0));
+        Timestamp ts = resultSet.getTimestamp(columnIndex, calendar);
+        return LocalDateTime.ofInstant(Instant.ofEpochMilli(ts.getTime()), ZoneOffset.UTC);
+    }
+}
diff --git a/plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakeClientModule.java b/plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakeClientModule.java
new file mode 100644
index 000000000000..19fc35847191
--- /dev/null
+++ b/plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakeClientModule.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed 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 io.trino.plugin.snowflake;
+
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import com.google.inject.Provides;
+import com.google.inject.Scopes;
+import com.google.inject.Singleton;
+import io.trino.plugin.jdbc.BaseJdbcConfig;
+import io.trino.plugin.jdbc.ConnectionFactory;
+import io.trino.plugin.jdbc.DriverConnectionFactory;
+import io.trino.plugin.jdbc.ForBaseJdbc;
+import io.trino.plugin.jdbc.JdbcClient;
+import io.trino.plugin.jdbc.TypeHandlingJdbcConfig;
+import io.trino.plugin.jdbc.credential.CredentialProvider;
+import io.trino.spi.TrinoException;
+import net.snowflake.client.jdbc.SnowflakeDriver;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Properties;
+
+import static io.airlift.configuration.ConfigBinder.configBinder;
+import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
+
+public class SnowflakeClientModule
+        implements Module
+{
+    @Override
+    public void configure(Binder binder)
+    {
+        binder.bind(JdbcClient.class).annotatedWith(ForBaseJdbc.class).to(SnowflakeClient.class).in(Scopes.SINGLETON);
+        configBinder(binder).bindConfig(SnowflakeConfig.class);
+        configBinder(binder).bindConfig(TypeHandlingJdbcConfig.class);
+    }
+
+    @Singleton
+    @Provides
+    @ForBaseJdbc
+    public ConnectionFactory getConnectionFactory(BaseJdbcConfig baseJdbcConfig, SnowflakeConfig snowflakeConfig, CredentialProvider credentialProvider)
+            throws MalformedURLException
+    {
+        Properties properties = new Properties();
+        snowflakeConfig.getAccount().ifPresent(account -> properties.setProperty("account", account));
+        snowflakeConfig.getDatabase().ifPresent(database -> properties.setProperty("db", database));
+        snowflakeConfig.getRole().ifPresent(role -> properties.setProperty("role", role));
+        snowflakeConfig.getWarehouse().ifPresent(warehouse -> properties.setProperty("warehouse", warehouse));
+
+        // Set the expected date/time formatting we expect for our plugin to parse
+        properties.setProperty("TIMESTAMP_OUTPUT_FORMAT", "YYYY-MM-DD\"T\"HH24:MI:SS.FF9TZH:TZM");
+        properties.setProperty("TIMESTAMP_NTZ_OUTPUT_FORMAT", "YYYY-MM-DD\"T\"HH24:MI:SS.FF9TZH:TZM");
+        properties.setProperty("TIMESTAMP_TZ_OUTPUT_FORMAT", "YYYY-MM-DD\"T\"HH24:MI:SS.FF9TZH:TZM");
+        properties.setProperty("TIMESTAMP_LTZ_OUTPUT_FORMAT", "YYYY-MM-DD\"T\"HH24:MI:SS.FF9TZH:TZM");
+        properties.setProperty("TIME_OUTPUT_FORMAT", "HH24:MI:SS.FF9");
+        snowflakeConfig.getTimestampNoTimezoneAsUTC().ifPresent(as_utc -> properties.setProperty("JDBC_TREAT_TIMESTAMP_NTZ_AS_UTC", as_utc ? "true" : "false"));
+
+        // Support for Corporate proxies
+        if (snowflakeConfig.getHTTPProxy().isPresent()) {
+            String proxy = snowflakeConfig.getHTTPProxy().get();
+
+            URL url = new URL(proxy);
+
+            properties.setProperty("useProxy", "true");
+            properties.setProperty("proxyHost", url.getHost());
+            properties.setProperty("proxyPort", Integer.toString(url.getPort()));
+            properties.setProperty("proxyProtocol", url.getProtocol());
+
+            String userInfo = url.getUserInfo();
+            if (userInfo != null) {
+                String[] usernamePassword = userInfo.split(":", 2);
+
+                if (usernamePassword.length != 2) {
+                    throw new TrinoException(NOT_SUPPORTED, "Improper snowflake.http_proxy. username:password@ is optional but what was entered was not correct");
+                }
+
+                properties.setProperty("proxyUser", usernamePassword[0]);
+                properties.setProperty("proxyPassword", usernamePassword[1]);
+            }
+        }
+
+        return new DriverConnectionFactory(new SnowflakeDriver(), baseJdbcConfig.getConnectionUrl(), properties, credentialProvider);
+    }
+}
diff --git a/plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakeConfig.java b/plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakeConfig.java
new file mode 100644
index 000000000000..6dbf12520177
--- /dev/null
+++ b/plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakeConfig.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed 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 io.trino.plugin.snowflake;
+
+import io.airlift.configuration.Config;
+
+import java.util.Optional;
+
+public class SnowflakeConfig
+{
+    private String account;
+    private String database;
+    private String role;
+    private String warehouse;
+    private Boolean timestampNoTimezoneAsUTC;
+    private String httpProxy;
+
+    public Optional<String> getAccount()
+    {
+        return Optional.ofNullable(account);
+    }
+
+    @Config("snowflake.account")
+    public SnowflakeConfig setAccount(String account)
+    {
+        this.account = account;
+        return this;
+    }
+
+    public Optional<String> getDatabase()
+    {
+        return Optional.ofNullable(database);
+    }
+
+    @Config("snowflake.database")
+    public SnowflakeConfig setDatabase(String database)
+    {
+        this.database = database;
+        return this;
+    }
+
+    public Optional<String> getRole()
+    {
+        return Optional.ofNullable(role);
+    }
+
+    @Config("snowflake.role")
+    public SnowflakeConfig setRole(String role)
+    {
+        this.role = role;
+        return this;
+    }
+
+    public Optional<String> getWarehouse()
+    {
+        return Optional.ofNullable(warehouse);
+    }
+
+    @Config("snowflake.warehouse")
+    public SnowflakeConfig setWarehouse(String warehouse)
+    {
+        this.warehouse = warehouse;
+        return this;
+    }
+
+    public Optional<Boolean> getTimestampNoTimezoneAsUTC()
+    {
+        return Optional.ofNullable(timestampNoTimezoneAsUTC);
+    }
+
+    @Config("snowflake.timestamp-no-timezone-as-utc")
+    public SnowflakeConfig setTimestampNoTimezoneAsUTC(Boolean timestampNoTimezoneAsUTC)
+    {
+        this.timestampNoTimezoneAsUTC = timestampNoTimezoneAsUTC;
+        return this;
+    }
+
+    public Optional<String> getHTTPProxy()
+    {
+        return Optional.ofNullable(httpProxy);
+    }
+
+    @Config("snowflake.http-proxy")
+    public SnowflakeConfig setHTTPProxy(String httpProxy)
+    {
+        this.httpProxy = httpProxy;
+        return this;
+    }
+}
diff --git a/plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakePlugin.java b/plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakePlugin.java
new file mode 100644
index 000000000000..728264d29778
--- /dev/null
+++ b/plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakePlugin.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed 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 io.trino.plugin.snowflake;
+
+import io.trino.plugin.jdbc.JdbcPlugin;
+
+public class SnowflakePlugin
+        extends JdbcPlugin
+{
+    public SnowflakePlugin()
+    {
+        super("snowflake", new SnowflakeClientModule());
+    }
+}
diff --git a/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/SnowflakeQueryRunner.java b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/SnowflakeQueryRunner.java
new file mode 100644
index 000000000000..a50debaf003b
--- /dev/null
+++ b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/SnowflakeQueryRunner.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed 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 io.trino.plugin.snowflake;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.airlift.log.Logger;
+import io.trino.Session;
+import io.trino.plugin.tpch.TpchPlugin;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.tpch.TpchTable;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static io.airlift.testing.Closeables.closeAllSuppress;
+import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
+import static io.trino.testing.QueryAssertions.copyTpchTables;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+
+public final class SnowflakeQueryRunner
+{
+    public static final String TPCH_SCHEMA = "tpch";
+
+    private SnowflakeQueryRunner() {}
+
+    public static DistributedQueryRunner createSnowflakeQueryRunner(
+            TestingSnowflakeServer server,
+            Map<String, String> extraProperties,
+            Map<String, String> connectorProperties,
+            Iterable<TpchTable<?>> tables)
+            throws Exception
+    {
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(createSession())
+                .setExtraProperties(extraProperties)
+                .build();
+        try {
+            queryRunner.installPlugin(new TpchPlugin());
+            queryRunner.createCatalog("tpch", "tpch");
+
+            connectorProperties = new HashMap<>(ImmutableMap.copyOf(connectorProperties));
+            connectorProperties.putIfAbsent("connection-url", TestingSnowflakeServer.TEST_URL);
+            connectorProperties.putIfAbsent("connection-user", TestingSnowflakeServer.TEST_USER);
+            connectorProperties.putIfAbsent("connection-password", TestingSnowflakeServer.TEST_PASSWORD);
+            connectorProperties.putIfAbsent("snowflake.database", TestingSnowflakeServer.TEST_DATABASE);
+            connectorProperties.putIfAbsent("snowflake.role", TestingSnowflakeServer.TEST_ROLE);
+            connectorProperties.putIfAbsent("snowflake.warehouse", TestingSnowflakeServer.TEST_WAREHOUSE);
+            if (TestingSnowflakeServer.TEST_PROXY != null) {
+                connectorProperties.putIfAbsent("snowflake.httpProxy", TestingSnowflakeServer.TEST_PROXY);
+            }
+
+            queryRunner.installPlugin(new SnowflakePlugin());
+            queryRunner.createCatalog("snowflake", "snowflake", connectorProperties);
+
+            copyTpchTables(queryRunner, "tpch", TINY_SCHEMA_NAME, createSession(), tables);
+
+            return queryRunner;
+        }
+        catch (Throwable e) {
+            closeAllSuppress(e, queryRunner);
+            throw e;
+        }
+    }
+
+    public static Session createSession()
+    {
+        return testSessionBuilder()
+                .setCatalog("snowflake")
+                .setSchema(TPCH_SCHEMA)
+                .build();
+    }
+
+    public static void main(String[] args)
+            throws Exception
+    {
+        DistributedQueryRunner queryRunner = createSnowflakeQueryRunner(
+                new TestingSnowflakeServer(),
+                ImmutableMap.of("http-server.http.port", "8080"),
+                ImmutableMap.of(),
+                ImmutableList.of());
+
+        Logger log = Logger.get(SnowflakeQueryRunner.class);
+        log.info("======== SERVER STARTED ========");
+        log.info("\n====\n%s\n====", queryRunner.getCoordinator().getBaseUrl());
+    }
+}
diff --git a/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeClient.java b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeClient.java
new file mode 100644
index 000000000000..b743314af763
--- /dev/null
+++ b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeClient.java
@@ -0,0 +1,153 @@
+/*
+ * Licensed 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 io.trino.plugin.snowflake;
+
+import io.trino.plugin.base.mapping.DefaultIdentifierMapping;
+import io.trino.plugin.jdbc.BaseJdbcConfig;
+import io.trino.plugin.jdbc.ColumnMapping;
+import io.trino.plugin.jdbc.DefaultQueryBuilder;
+import io.trino.plugin.jdbc.JdbcClient;
+import io.trino.plugin.jdbc.JdbcColumnHandle;
+import io.trino.plugin.jdbc.JdbcExpression;
+import io.trino.plugin.jdbc.JdbcTypeHandle;
+import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
+import io.trino.spi.connector.AggregateFunction;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.expression.ConnectorExpression;
+import io.trino.spi.expression.Variable;
+import org.testng.annotations.Test;
+
+import java.sql.Types;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.testing.TestingConnectorSession.SESSION;
+import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class TestSnowflakeClient
+{
+    private static final JdbcColumnHandle BIGINT_COLUMN =
+            JdbcColumnHandle.builder()
+                    .setColumnName("c_bigint")
+                    .setColumnType(BIGINT)
+                    .setJdbcTypeHandle(new JdbcTypeHandle(Types.BIGINT, Optional.of("int8"), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty()))
+                    .build();
+
+    private static final JdbcColumnHandle DOUBLE_COLUMN =
+            JdbcColumnHandle.builder()
+                    .setColumnName("c_double")
+                    .setColumnType(DOUBLE)
+                    .setJdbcTypeHandle(new JdbcTypeHandle(Types.DOUBLE, Optional.of("double"), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty()))
+                    .build();
+
+    private static final JdbcClient JDBC_CLIENT = new SnowflakeClient(
+            new BaseJdbcConfig(),
+            session -> { throw new UnsupportedOperationException(); },
+            new DefaultQueryBuilder(RemoteQueryModifier.NONE),
+            TESTING_TYPE_MANAGER,
+            new DefaultIdentifierMapping(),
+            RemoteQueryModifier.NONE);
+
+    @Test
+    public void testImplementCount()
+    {
+        Variable bigintVariable = new Variable("v_bigint", BIGINT);
+        Variable doubleVariable = new Variable("v_double", BIGINT);
+        Optional<ConnectorExpression> filter = Optional.of(new Variable("a_filter", BOOLEAN));
+
+        // count(*)
+        testImplementAggregation(
+                new AggregateFunction("count", BIGINT, List.of(), List.of(), false, Optional.empty()),
+                Map.of(),
+                Optional.of("count(*)"));
+
+        // count(bigint)
+        testImplementAggregation(
+                new AggregateFunction("count", BIGINT, List.of(bigintVariable), List.of(), false, Optional.empty()),
+                Map.of(bigintVariable.getName(), BIGINT_COLUMN),
+                Optional.of("count(\"c_bigint\")"));
+
+        // count(double)
+        testImplementAggregation(
+                new AggregateFunction("count", BIGINT, List.of(doubleVariable), List.of(), false, Optional.empty()),
+                Map.of(doubleVariable.getName(), DOUBLE_COLUMN),
+                Optional.of("count(\"c_double\")"));
+
+        // count() FILTER (WHERE ...)
+        testImplementAggregation(
+                new AggregateFunction("count", BIGINT, List.of(), List.of(), false, filter),
+                Map.of(),
+                Optional.empty());
+
+        // count(bigint) FILTER (WHERE ...)
+        testImplementAggregation(
+                new AggregateFunction("count", BIGINT, List.of(bigintVariable), List.of(), false, filter),
+                Map.of(bigintVariable.getName(), BIGINT_COLUMN),
+                Optional.empty());
+    }
+
+    @Test
+    public void testImplementSum()
+    {
+        Variable bigintVariable = new Variable("v_bigint", BIGINT);
+        Variable doubleVariable = new Variable("v_double", DOUBLE);
+        Optional<ConnectorExpression> filter = Optional.of(new Variable("a_filter", BOOLEAN));
+
+        // sum(bigint)
+        testImplementAggregation(
+                new AggregateFunction("sum", BIGINT, List.of(bigintVariable), List.of(), false, Optional.empty()),
+                Map.of(bigintVariable.getName(), BIGINT_COLUMN),
+                Optional.of("sum(\"c_bigint\")"));
+
+        // sum(double)
+        testImplementAggregation(
+                new AggregateFunction("sum", DOUBLE, List.of(doubleVariable), List.of(), false, Optional.empty()),
+                Map.of(doubleVariable.getName(), DOUBLE_COLUMN),
+                Optional.of("sum(\"c_double\")"));
+
+        // sum(DISTINCT bigint)
+        testImplementAggregation(
+                new AggregateFunction("sum", BIGINT, List.of(bigintVariable), List.of(), true, Optional.empty()),
+                Map.of(bigintVariable.getName(), BIGINT_COLUMN),
+                Optional.of("sum(DISTINCT \"c_bigint\")"));
+
+        // sum(bigint) FILTER (WHERE ...)
+        testImplementAggregation(
+                new AggregateFunction("sum", BIGINT, List.of(bigintVariable), List.of(), false, filter),
+                Map.of(bigintVariable.getName(), BIGINT_COLUMN),
+                Optional.empty()); // filter not supported
+    }
+
+    private static void testImplementAggregation(AggregateFunction aggregateFunction, Map<String, ColumnHandle> assignments, Optional<String> expectedExpression)
+    {
+        Optional<JdbcExpression> result = JDBC_CLIENT.implementAggregation(SESSION, aggregateFunction, assignments);
+        if (expectedExpression.isEmpty()) {
+            assertThat(result).isEmpty();
+        }
+        else {
+            assertThat(result).isPresent();
+            assertEquals(result.get().getExpression(), expectedExpression.get());
+            Optional<ColumnMapping> columnMapping = JDBC_CLIENT.toColumnMapping(SESSION, null, result.get().getJdbcTypeHandle());
+            assertTrue(columnMapping.isPresent(), "No mapping for: " + result.get().getJdbcTypeHandle());
+            assertEquals(columnMapping.get().getType(), aggregateFunction.getOutputType());
+        }
+    }
+}
diff --git a/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeConfig.java b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeConfig.java
new file mode 100644
index 000000000000..eb5c32a3d063
--- /dev/null
+++ b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeConfig.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed 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 io.trino.plugin.snowflake;
+
+import com.google.common.collect.ImmutableMap;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+
+public class TestSnowflakeConfig
+{
+    @Test
+    public void testDefaults()
+    {
+        assertRecordedDefaults(recordDefaults(SnowflakeConfig.class)
+                .setAccount(null)
+                .setDatabase(null)
+                .setRole(null)
+                .setWarehouse(null)
+                .setHTTPProxy(null)
+                .setTimestampNoTimezoneAsUTC(null));
+    }
+
+    @Test
+    public void testExplicitPropertyMappings()
+    {
+        Map<String, String> properties = ImmutableMap.<String, String>builder()
+                .put("snowflake.account", "MYACCOUNT")
+                .put("snowflake.database", "MYDATABASE")
+                .put("snowflake.role", "MYROLE")
+                .put("snowflake.warehouse", "MYWAREHOUSE")
+                .put("snowflake.http-proxy", "MYPROXY")
+                .put("snowflake.timestamp-no-timezone-as-utc", "true")
+                .buildOrThrow();
+
+        SnowflakeConfig expected = new SnowflakeConfig()
+                .setAccount("MYACCOUNT")
+                .setDatabase("MYDATABASE")
+                .setRole("MYROLE")
+                .setWarehouse("MYWAREHOUSE")
+                .setHTTPProxy("MYPROXY")
+                .setTimestampNoTimezoneAsUTC(true);
+
+        assertFullMapping(properties, expected);
+    }
+}
diff --git a/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeConnectorTest.java b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeConnectorTest.java
new file mode 100644
index 000000000000..e5cdac953eff
--- /dev/null
+++ b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeConnectorTest.java
@@ -0,0 +1,630 @@
+/*
+ * Licensed 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 io.trino.plugin.snowflake;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.Session;
+import io.trino.plugin.jdbc.BaseJdbcConnectorTest;
+import io.trino.testing.MaterializedResult;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.TestingConnectorBehavior;
+import io.trino.testing.sql.SqlExecutor;
+import io.trino.testing.sql.TestTable;
+import org.testng.SkipException;
+import org.testng.annotations.Test;
+
+import java.util.Optional;
+import java.util.OptionalInt;
+
+import static com.google.common.base.Strings.nullToEmpty;
+import static io.trino.plugin.snowflake.SnowflakeQueryRunner.createSnowflakeQueryRunner;
+import static io.trino.plugin.snowflake.TestingSnowflakeServer.TEST_SCHEMA;
+import static io.trino.spi.connector.ConnectorMetadata.MODIFYING_ROWS_MESSAGE;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.testing.MaterializedResult.resultBuilder;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_TABLE;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_TABLE_WITH_DATA;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+public class TestSnowflakeConnectorTest
+        extends BaseJdbcConnectorTest
+{
+    protected TestingSnowflakeServer snowflakeServer;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        snowflakeServer = new TestingSnowflakeServer();
+        return createSnowflakeQueryRunner(snowflakeServer, ImmutableMap.of(), ImmutableMap.of(), REQUIRED_TPCH_TABLES);
+    }
+
+    @Override
+    protected SqlExecutor onRemoteDatabase()
+    {
+        return snowflakeServer::execute;
+    }
+
+    @Override
+    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
+    {
+        switch (connectorBehavior) {
+            case SUPPORTS_AGGREGATION_PUSHDOWN:
+            case SUPPORTS_TOPN_PUSHDOWN:
+            case SUPPORTS_LIMIT_PUSHDOWN:
+                return false;
+            case SUPPORTS_COMMENT_ON_COLUMN:
+            case SUPPORTS_ADD_COLUMN_WITH_COMMENT:
+            case SUPPORTS_COMMENT_ON_TABLE:
+            case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
+            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
+            case SUPPORTS_SET_COLUMN_TYPE:
+                return false;
+            case SUPPORTS_DROP_FIELD:
+            case SUPPORTS_ROW_TYPE:
+            case SUPPORTS_ARRAY:
+                return false;
+            default:
+                return super.hasBehavior(connectorBehavior);
+        }
+    }
+
+    @Override
+    protected TestTable createTableWithDefaultColumns()
+    {
+        return new TestTable(
+                onRemoteDatabase(),
+                TEST_SCHEMA,
+                "(col_required BIGINT NOT NULL," +
+                        "col_nullable BIGINT," +
+                        "col_default BIGINT DEFAULT 43," +
+                        "col_nonnull_default BIGINT NOT NULL DEFAULT 42," +
+                        "col_required2 BIGINT NOT NULL)");
+    }
+
+    @Override
+    protected TestTable createTableWithUnsupportedColumn()
+    {
+        return new TestTable(
+                onRemoteDatabase(),
+                TEST_SCHEMA,
+                "(one bigint, two decimal(38,0), three varchar(10))");
+    }
+
+    @Override
+    protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMappingTestSetup dataMappingTestSetup)
+    {
+        String typeName = dataMappingTestSetup.getTrinoTypeName();
+        // TODO: Test fails with these types
+        // Error: No result for query: SELECT row_id FROM test_data_mapping_smoke_real_3u8xo6hp59 WHERE rand() = 42 OR value = REAL '567.123'
+        // In the testDataMappingSmokeTestDataProvider(), the type sampleValueLiteral of type real should be "DOUBLE" rather than "REAL".
+        if (typeName.equals("real")) {
+            return Optional.empty();
+        }
+        // Error: Failed to insert data: SQL compilation error: error line 1 at position 130
+        if (typeName.equals("time")
+                || typeName.equals("time(6)")
+                || typeName.equals("timestamp(6)")) {
+            return Optional.empty();
+        }
+        // Error: not equal
+        if (typeName.equals("char(3)")) {
+            return Optional.empty();
+        }
+        return Optional.of(dataMappingTestSetup);
+    }
+
+    @Override
+    protected boolean isColumnNameRejected(Exception exception, String columnName, boolean delimited)
+    {
+        return nullToEmpty(exception.getMessage()).matches(".*(Incorrect column name).*");
+    }
+
+    @Override
+    protected MaterializedResult getDescribeOrdersResult()
+    {
+        // Override this test because the type of row "shippriority" should be bigint rather than integer for snowflake case
+        return resultBuilder(getSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
+                .row("orderkey", "bigint", "", "")
+                .row("custkey", "bigint", "", "")
+                .row("orderstatus", "varchar(1)", "", "")
+                .row("totalprice", "double", "", "")
+                .row("orderdate", "date", "", "")
+                .row("orderpriority", "varchar(15)", "", "")
+                .row("clerk", "varchar(15)", "", "")
+                .row("shippriority", "bigint", "", "")
+                .row("comment", "varchar(79)", "", "")
+                .build();
+    }
+
+    @Test
+    @Override
+    public void testShowColumns()
+    {
+        assertThat(query("SHOW COLUMNS FROM orders")).matches(getDescribeOrdersResult());
+    }
+
+    @Test
+    public void testViews()
+    {
+        String tableName = "test_view_" + randomNameSuffix();
+        onRemoteDatabase().execute("CREATE OR REPLACE VIEW tpch." + tableName + " AS SELECT * FROM tpch.orders");
+        assertQuery("SELECT orderkey FROM " + tableName, "SELECT orderkey FROM orders");
+        onRemoteDatabase().execute("DROP VIEW IF EXISTS tpch." + tableName);
+    }
+
+    @Test
+    @Override
+    public void testShowCreateTable()
+    {
+        // Override this test because the type of row "shippriority" should be bigint rather than integer for snowflake case
+        assertThat(computeActual("SHOW CREATE TABLE orders").getOnlyValue())
+                .isEqualTo("CREATE TABLE snowflake.tpch.orders (\n" +
+                        "   orderkey bigint,\n" +
+                        "   custkey bigint,\n" +
+                        "   orderstatus varchar(1),\n" +
+                        "   totalprice double,\n" +
+                        "   orderdate date,\n" +
+                        "   orderpriority varchar(15),\n" +
+                        "   clerk varchar(15),\n" +
+                        "   shippriority bigint,\n" +
+                        "   comment varchar(79)\n" +
+                        ")\n" +
+                        "COMMENT ''");
+    }
+
+    @Override
+    public void testAddNotNullColumn()
+    {
+        assertThatThrownBy(super::testAddNotNullColumn)
+                .isInstanceOf(AssertionError.class)
+                .hasMessage("Unexpected failure when adding not null column");
+    }
+
+    @Test
+    @Override
+    public void testCharVarcharComparison()
+    {
+        assertThatThrownBy(super::testCharVarcharComparison)
+                .hasMessageContaining("For query")
+                .hasMessageContaining("Actual rows")
+                .hasMessageContaining("Expected rows");
+
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testCountDistinctWithStringTypes()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testInsertInPresenceOfNotSupportedColumn()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testAggregationPushdown()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testDistinctAggregationPushdown()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testNumericAggregationPushdown()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testLimitPushdown()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testInsertIntoNotNullColumn()
+    {
+        // TODO: java.lang.UnsupportedOperationException: This method should be overridden
+        assertThatThrownBy(super::testInsertIntoNotNullColumn);
+    }
+
+    @Test
+    @Override
+    public void testDeleteWithLike()
+    {
+        assertThatThrownBy(super::testDeleteWithLike)
+                .hasStackTraceContaining("TrinoException: " + MODIFYING_ROWS_MESSAGE);
+    }
+
+    @Test
+    public void testCreateTableAsSelect()
+    {
+        String tableName = "test_ctas" + randomNameSuffix();
+        if (!hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA)) {
+            assertQueryFails("CREATE TABLE IF NOT EXISTS " + tableName + " AS SELECT name, regionkey FROM nation", "This connector does not support creating tables with data");
+            return;
+        }
+        assertUpdate("CREATE TABLE IF NOT EXISTS " + tableName + " AS SELECT name, regionkey FROM nation", "SELECT count(*) FROM nation");
+        assertTableColumnNames(tableName, "name", "regionkey");
+
+        assertEquals(getTableComment(getSession().getCatalog().orElseThrow(), getSession().getSchema().orElseThrow(), tableName), "");
+        assertUpdate("DROP TABLE " + tableName);
+
+        // Some connectors support CREATE TABLE AS but not the ordinary CREATE TABLE. Let's test CTAS IF NOT EXISTS with a table that is guaranteed to exist.
+        assertUpdate("CREATE TABLE IF NOT EXISTS nation AS SELECT nationkey, regionkey FROM nation", 0);
+        assertTableColumnNames("nation", "nationkey", "name", "regionkey", "comment");
+
+        assertCreateTableAsSelect(
+                "SELECT nationkey, name, regionkey FROM nation",
+                "SELECT count(*) FROM nation");
+
+        assertCreateTableAsSelect(
+                "SELECT mktsegment, sum(acctbal) x FROM customer GROUP BY mktsegment",
+                "SELECT count(DISTINCT mktsegment) FROM customer");
+
+        assertCreateTableAsSelect(
+                "SELECT count(*) x FROM nation JOIN region ON nation.regionkey = region.regionkey",
+                "SELECT 1");
+
+        assertCreateTableAsSelect(
+                "SELECT nationkey FROM nation ORDER BY nationkey LIMIT 10",
+                "SELECT 10");
+
+        assertCreateTableAsSelect(
+                "SELECT * FROM nation WITH DATA",
+                "SELECT * FROM nation",
+                "SELECT count(*) FROM nation");
+
+        assertCreateTableAsSelect(
+                "SELECT * FROM nation WITH NO DATA",
+                "SELECT * FROM nation LIMIT 0",
+                "SELECT 0");
+
+        // Tests for CREATE TABLE with UNION ALL: exercises PushTableWriteThroughUnion optimizer
+
+        assertCreateTableAsSelect(
+                "SELECT name, nationkey, regionkey FROM nation WHERE nationkey % 2 = 0 UNION ALL " +
+                        "SELECT name, nationkey, regionkey FROM nation WHERE nationkey % 2 = 1",
+                "SELECT name, nationkey, regionkey FROM nation",
+                "SELECT count(*) FROM nation");
+
+        assertCreateTableAsSelect(
+                Session.builder(getSession()).setSystemProperty("redistribute_writes", "true").build(),
+                "SELECT CAST(nationkey AS BIGINT) nationkey, regionkey FROM nation UNION ALL " +
+                        "SELECT 1234567890, 123",
+                "SELECT nationkey, regionkey FROM nation UNION ALL " +
+                        "SELECT 1234567890, 123",
+                "SELECT count(*) + 1 FROM nation");
+
+        assertCreateTableAsSelect(
+                Session.builder(getSession()).setSystemProperty("redistribute_writes", "false").build(),
+                "SELECT CAST(nationkey AS BIGINT) nationkey, regionkey FROM nation UNION ALL " +
+                        "SELECT 1234567890, 123",
+                "SELECT nationkey, regionkey FROM nation UNION ALL " +
+                        "SELECT 1234567890, 123",
+                "SELECT count(*) + 1 FROM nation");
+
+        // TODO: BigQuery throws table not found at BigQueryClient.insert if we reuse the same table name
+        tableName = "test_ctas" + randomNameSuffix();
+        assertExplainAnalyze("EXPLAIN ANALYZE CREATE TABLE " + tableName + " AS SELECT name FROM nation");
+        assertQuery("SELECT * from " + tableName, "SELECT name FROM nation");
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    @Override
+    public void testCreateTable()
+    {
+        String tableName = "test_create_" + randomNameSuffix();
+        if (!hasBehavior(SUPPORTS_CREATE_TABLE)) {
+            assertQueryFails("CREATE TABLE " + tableName + " (a bigint, b double, c varchar(50))", "This connector does not support creating tables");
+            return;
+        }
+
+        assertThat(computeActual("SHOW TABLES").getOnlyColumnAsSet()) // prime the cache, if any
+                .doesNotContain(tableName);
+        assertUpdate("CREATE TABLE " + tableName + " (a bigint, b double, c varchar(50))");
+        assertTrue(getQueryRunner().tableExists(getSession(), tableName));
+        assertThat(computeActual("SHOW TABLES").getOnlyColumnAsSet())
+                .contains(tableName);
+        assertTableColumnNames(tableName, "a", "b", "c");
+        assertEquals(getTableComment(getSession().getCatalog().orElseThrow(), getSession().getSchema().orElseThrow(), tableName), "");
+
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+        assertThat(computeActual("SHOW TABLES").getOnlyColumnAsSet())
+                .doesNotContain(tableName);
+
+        assertQueryFails("CREATE TABLE " + tableName + " (a bad_type)", ".* Unknown type 'bad_type' for column 'a'");
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+
+        // TODO (https://github.com/trinodb/trino/issues/5901) revert to longer name when Oracle version is updated
+        tableName = "test_cr_not_exists_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (a bigint, b varchar(50), c double)");
+        assertTrue(getQueryRunner().tableExists(getSession(), tableName));
+        assertTableColumnNames(tableName, "a", "b", "c");
+
+        assertUpdate("CREATE TABLE IF NOT EXISTS " + tableName + " (d bigint, e varchar(50))");
+        assertTrue(getQueryRunner().tableExists(getSession(), tableName));
+        assertTableColumnNames(tableName, "a", "b", "c");
+
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+
+        // Test CREATE TABLE LIKE
+        tableName = "test_create_orig_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (a bigint, b double, c varchar(50))");
+        assertTrue(getQueryRunner().tableExists(getSession(), tableName));
+        assertTableColumnNames(tableName, "a", "b", "c");
+
+        String tableNameLike = "test_create_like_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableNameLike + " (LIKE " + tableName + ", d bigint, e varchar(50))");
+        assertTrue(getQueryRunner().tableExists(getSession(), tableNameLike));
+        assertTableColumnNames(tableNameLike, "a", "b", "c", "d", "e");
+
+        assertUpdate("DROP TABLE " + tableName);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+
+        assertUpdate("DROP TABLE " + tableNameLike);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableNameLike));
+    }
+
+    @Test
+    @Override
+    public void testNativeQueryCreateStatement()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testNativeQueryInsertStatementTableExists()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testNativeQuerySelectUnsupportedType()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Override
+    public void testCreateTableWithLongColumnName()
+    {
+        String tableName = "test_long_column" + randomNameSuffix();
+        String baseColumnName = "col";
+
+        int maxLength = maxColumnNameLength()
+                // Assume 2^16 is enough for most use cases. Add a bit more to ensure 2^16 isn't actual limit.
+                .orElse(65536 + 5);
+
+        String validColumnName = baseColumnName + "z".repeat(maxLength - baseColumnName.length());
+        assertUpdate("CREATE TABLE " + tableName + " (" + validColumnName + " bigint)");
+        assertTrue(columnExists(tableName, validColumnName));
+        assertUpdate("DROP TABLE " + tableName);
+
+        if (maxColumnNameLength().isEmpty()) {
+            return;
+        }
+//        TODO: Expecting code to raise a throwable.
+//        String invalidColumnName = validColumnName + "z";
+//        assertThatThrownBy(() -> assertUpdate("CREATE TABLE " + tableName + " (" + invalidColumnName + " bigint)"))
+//                .satisfies(this::verifyColumnNameLengthFailurePermissible);
+        assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+    }
+
+    @Override
+    public void testCreateTableWithLongTableName()
+    {
+        // TODO: Find the maximum table name length in Snowflake and enable this test.
+        throw new SkipException("TODO");
+    }
+
+    @Override
+    protected OptionalInt maxColumnNameLength()
+    {
+        return OptionalInt.of(251);
+    }
+
+    @Override
+    public void testAlterTableAddLongColumnName()
+    {
+        String tableName = "test_long_column" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 123 x", 1);
+
+        String baseColumnName = "col";
+        int maxLength = maxColumnNameLength()
+                // Assume 2^16 is enough for most use cases. Add a bit more to ensure 2^16 isn't actual limit.
+                .orElse(65536 + 5);
+
+        String validTargetColumnName = baseColumnName + "z".repeat(maxLength - baseColumnName.length());
+        assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + validTargetColumnName + " int");
+        assertTrue(getQueryRunner().tableExists(getSession(), tableName));
+        assertQuery("SELECT x FROM " + tableName, "VALUES 123");
+        assertUpdate("DROP TABLE " + tableName);
+
+        if (maxColumnNameLength().isEmpty()) {
+            return;
+        }
+
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 123 x", 1);
+//        TODO: Expecting code to raise a throwable.
+//        String invalidTargetColumnName = validTargetColumnName + "z";
+//        assertThatThrownBy(() -> assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + invalidTargetColumnName + " int"))
+//                .satisfies(this::verifyColumnNameLengthFailurePermissible);
+        assertQuery("SELECT x FROM " + tableName, "VALUES 123");
+    }
+
+    @Override
+    public void testAlterTableRenameColumnToLongName()
+    {
+        String tableName = "test_long_column" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 123 x", 1);
+
+        String baseColumnName = "col";
+        int maxLength = maxColumnNameLength()
+                // Assume 2^16 is enough for most use cases. Add a bit more to ensure 2^16 isn't actual limit.
+                .orElse(65536 + 5);
+
+        String validTargetColumnName = baseColumnName + "z".repeat(maxLength - baseColumnName.length());
+        assertUpdate("ALTER TABLE " + tableName + " RENAME COLUMN x TO " + validTargetColumnName);
+        assertQuery("SELECT " + validTargetColumnName + " FROM " + tableName, "VALUES 123");
+        assertUpdate("DROP TABLE " + tableName);
+
+        if (maxColumnNameLength().isEmpty()) {
+            return;
+        }
+
+        assertUpdate("CREATE TABLE " + tableName + " AS SELECT 123 x", 1);
+//        TODO: Expecting code to raise a throwable.
+//        String invalidTargetTableName = validTargetColumnName + "z";
+//        assertThatThrownBy(() -> assertUpdate("ALTER TABLE " + tableName + " RENAME COLUMN x TO " + invalidTargetTableName))
+//                .satisfies(this::verifyColumnNameLengthFailurePermissible);
+        assertQuery("SELECT x FROM " + tableName, "VALUES 123");
+    }
+
+    @Override
+    public void testCreateSchemaWithLongName()
+    {
+        // TODO: Find the maximum table schema length in Snowflake and enable this test.
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testInsertArray()
+    {
+        // Snowflake does not support this feature.
+        throw new SkipException("Not supported");
+    }
+
+    @Override
+    public void testInsertRowConcurrently()
+    {
+        throw new SkipException("TODO: Connection is already closed");
+    }
+
+    @Test
+    @Override
+    public void testNativeQueryColumnAlias()
+    {
+        throw new SkipException("TODO: Table function system.query not registered");
+    }
+
+    @Test
+    @Override
+    public void testNativeQueryColumnAliasNotFound()
+    {
+        throw new SkipException("TODO: Table function system.query not registered");
+    }
+
+    @Test
+    @Override
+    public void testNativeQueryIncorrectSyntax()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testNativeQueryInsertStatementTableDoesNotExist()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testNativeQueryParameters()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testNativeQuerySelectFromNation()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testNativeQuerySelectFromTestTable()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testNativeQuerySimple()
+    {
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testRenameSchemaToLongName()
+    {
+        // TODO: Find the maximum table schema length in Snowflake and enable this test.
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testRenameTableToLongTableName()
+    {
+        // TODO: Find the maximum table length in Snowflake and enable this test.
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testCharTrailingSpace()
+    {
+        assertThatThrownBy(super::testCharVarcharComparison)
+                .hasMessageContaining("For query")
+                .hasMessageContaining("Actual rows")
+                .hasMessageContaining("Expected rows");
+
+        throw new SkipException("TODO");
+    }
+
+    @Test
+    @Override
+    public void testDescribeTable()
+    {
+        assertThat(query("DESCRIBE orders")).matches(getDescribeOrdersResult());
+    }
+}
diff --git a/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakePlugin.java b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakePlugin.java
new file mode 100644
index 000000000000..26165c3f018c
--- /dev/null
+++ b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakePlugin.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.plugin.snowflake;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.spi.Plugin;
+import io.trino.spi.connector.ConnectorFactory;
+import io.trino.testing.TestingConnectorContext;
+import org.testng.annotations.Test;
+
+import static com.google.common.collect.Iterables.getOnlyElement;
+
+public class TestSnowflakePlugin
+{
+    @Test
+    public void testCreateConnector()
+    {
+        Plugin plugin = new SnowflakePlugin();
+        ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
+        factory.create("test", ImmutableMap.of("connection-url", "jdbc:snowflake://test"), new TestingConnectorContext()).shutdown();
+    }
+}
diff --git a/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeTypeMapping.java b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeTypeMapping.java
new file mode 100644
index 000000000000..5eb6c14f82ec
--- /dev/null
+++ b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeTypeMapping.java
@@ -0,0 +1,403 @@
+/*
+ * Licensed 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 io.trino.plugin.snowflake;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.trino.Session;
+import io.trino.spi.type.TimeZoneKey;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.TestingSession;
+import io.trino.testing.datatype.CreateAndInsertDataSetup;
+import io.trino.testing.datatype.CreateAsSelectDataSetup;
+import io.trino.testing.datatype.DataSetup;
+import io.trino.testing.datatype.SqlDataTypeTest;
+import io.trino.testing.sql.TrinoSqlExecutor;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Verify.verify;
+import static io.trino.plugin.snowflake.SnowflakeQueryRunner.createSnowflakeQueryRunner;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.BooleanType.BOOLEAN;
+import static io.trino.spi.type.DateType.DATE;
+import static io.trino.spi.type.DecimalType.createDecimalType;
+import static io.trino.spi.type.DoubleType.DOUBLE;
+import static io.trino.spi.type.TimeZoneKey.getTimeZoneKey;
+import static io.trino.spi.type.TimestampType.createTimestampType;
+import static io.trino.spi.type.VarbinaryType.VARBINARY;
+import static io.trino.spi.type.VarcharType.createVarcharType;
+import static java.time.ZoneOffset.UTC;
+
+public class TestSnowflakeTypeMapping
+        extends AbstractTestQueryFramework
+{
+    protected TestingSnowflakeServer snowflakeServer;
+
+    private final ZoneId jvmZone = ZoneId.systemDefault();
+    // no DST in 1970, but has DST in later years (e.g. 2018)
+    private final ZoneId vilnius = ZoneId.of("Europe/Vilnius");
+    // minutes offset change since 1970-01-01, no DST
+    private final ZoneId kathmandu = ZoneId.of("Asia/Kathmandu");
+
+    @BeforeClass
+    public void setUp()
+    {
+        String zone = jvmZone.getId();
+        checkState(jvmZone.getId().equals("America/Bahia_Banderas"), "Timezone not configured correctly. Add -Duser.timezone=America/Bahia_Banderas to your JVM arguments");
+        checkIsGap(jvmZone, LocalDate.of(1970, 1, 1));
+        checkIsGap(vilnius, LocalDate.of(1983, 4, 1));
+        verify(vilnius.getRules().getValidOffsets(LocalDate.of(1983, 10, 1).atStartOfDay().minusMinutes(1)).size() == 2);
+    }
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        snowflakeServer = new TestingSnowflakeServer();
+        return createSnowflakeQueryRunner(
+                snowflakeServer,
+                ImmutableMap.of(),
+                ImmutableMap.of(),
+                ImmutableList.of());
+    }
+
+    @Test
+    public void testBoolean()
+    {
+        SqlDataTypeTest.create()
+                .addRoundTrip("boolean", "true", BOOLEAN, "BOOLEAN '1'")
+                .addRoundTrip("boolean", "false", BOOLEAN, "BOOLEAN '0'")
+                .addRoundTrip("boolean", "NULL", BOOLEAN, "CAST(NULL AS BOOLEAN)")
+                .execute(getQueryRunner(), snowflakeCreateAndInsert("tpch.test_boolean"))
+                .execute(getQueryRunner(), trinoCreateAsSelect("tpch.test_boolean"))
+                .execute(getQueryRunner(), trinoCreateAndInsert("tpch.test_boolean"));
+    }
+
+    @Test(dataProvider = "snowflakeIntegerTypeProvider")
+    public void testInteger(String inputType)
+    {
+        SqlDataTypeTest.create()
+                .addRoundTrip(inputType, "-9223372036854775808", BIGINT, "-9223372036854775808")
+                .addRoundTrip(inputType, "9223372036854775807", BIGINT, "9223372036854775807")
+                .addRoundTrip(inputType, "0", BIGINT, "CAST(0 AS BIGINT)")
+                .addRoundTrip(inputType, "NULL", BIGINT, "CAST(NULL AS BIGINT)")
+                .execute(getQueryRunner(), snowflakeCreateAndInsert("tpch.integer"));
+    }
+
+    @DataProvider
+    public Object[][] snowflakeIntegerTypeProvider()
+    {
+        // INT , INTEGER , BIGINT , SMALLINT , TINYINT , BYTEINT, DECIMAL , NUMERIC are aliases for NUMBER(38, 0) in snowflake
+        // https://docs.snowflake.com/en/sql-reference/data-types-numeric.html#int-integer-bigint-smallint-tinyint-byteint
+        return new Object[][] {
+                {"INT"},
+                {"INTEGER"},
+                {"BIGINT"},
+                {"SMALLINT"},
+                {"TINYINT"},
+                {"BYTEINT"},
+        };
+    }
+
+    @Test
+    public void testDecimal()
+    {
+        SqlDataTypeTest.create()
+                .addRoundTrip("decimal(3, 0)", "NULL", BIGINT, "CAST(NULL AS BIGINT)")
+                .addRoundTrip("decimal(3, 0)", "CAST('193' AS decimal(3, 0))", BIGINT, "CAST('193' AS BIGINT)")
+                .addRoundTrip("decimal(3, 0)", "CAST('19' AS decimal(3, 0))", BIGINT, "CAST('19' AS BIGINT)")
+                .addRoundTrip("decimal(3, 0)", "CAST('-193' AS decimal(3, 0))", BIGINT, "CAST('-193' AS BIGINT)")
+                .addRoundTrip("decimal(3, 1)", "CAST('10.0' AS decimal(3, 1))", createDecimalType(3, 1), "CAST('10.0' AS decimal(3, 1))")
+                .addRoundTrip("decimal(3, 1)", "CAST('10.1' AS decimal(3, 1))", createDecimalType(3, 1), "CAST('10.1' AS decimal(3, 1))")
+                .addRoundTrip("decimal(3, 1)", "CAST('-10.1' AS decimal(3, 1))", createDecimalType(3, 1), "CAST('-10.1' AS decimal(3, 1))")
+                .addRoundTrip("decimal(4, 2)", "CAST('2' AS decimal(4, 2))", createDecimalType(4, 2), "CAST('2' AS decimal(4, 2))")
+                .addRoundTrip("decimal(4, 2)", "CAST('2.3' AS decimal(4, 2))", createDecimalType(4, 2), "CAST('2.3' AS decimal(4, 2))")
+                .addRoundTrip("decimal(24, 2)", "CAST('2' AS decimal(24, 2))", createDecimalType(24, 2), "CAST('2' AS decimal(24, 2))")
+                .addRoundTrip("decimal(24, 2)", "CAST('2.3' AS decimal(24, 2))", createDecimalType(24, 2), "CAST('2.3' AS decimal(24, 2))")
+                .addRoundTrip("decimal(24, 2)", "CAST('123456789.3' AS decimal(24, 2))", createDecimalType(24, 2), "CAST('123456789.3' AS decimal(24, 2))")
+                .addRoundTrip("decimal(24, 4)", "CAST('12345678901234567890.31' AS decimal(24, 4))", createDecimalType(24, 4), "CAST('12345678901234567890.31' AS decimal(24, 4))")
+                .addRoundTrip("decimal(30, 5)", "CAST('3141592653589793238462643.38327' AS decimal(30, 5))", createDecimalType(30, 5), "CAST('3141592653589793238462643.38327' AS decimal(30, 5))")
+                .addRoundTrip("decimal(30, 5)", "CAST('-3141592653589793238462643.38327' AS decimal(30, 5))", createDecimalType(30, 5), "CAST('-3141592653589793238462643.38327' AS decimal(30, 5))")
+//                .addRoundTrip("decimal(38, 0)", "CAST('27182818284590452353602874713526624977' AS decimal(38, 0))", createDecimalType(38, 0), "CAST('27182818284590452353602874713526624977' AS decimal(38, 0))")
+//                .addRoundTrip("decimal(38, 0)", "CAST('-27182818284590452353602874713526624977' AS decimal(38, 0))", createDecimalType(38, 0), "CAST('-27182818284590452353602874713526624977' AS decimal(38, 0))")
+                .addRoundTrip("decimal(38, 0)", "CAST(NULL AS decimal(38, 0))", BIGINT, "CAST(NULL AS BIGINT)")
+                .execute(getQueryRunner(), snowflakeCreateAndInsert("tpch.test_decimal"))
+                .execute(getQueryRunner(), trinoCreateAsSelect("test_decimal"))
+                .execute(getQueryRunner(), trinoCreateAndInsert("test_decimal"));
+    }
+
+    @Test
+    public void testFloat()
+    {
+        // https://docs.snowflake.com/en/sql-reference/data-types-numeric.html#float-float4-float8
+        SqlDataTypeTest.create()
+                .addRoundTrip("real", "3.14", DOUBLE, "DOUBLE '3.14'")
+                .addRoundTrip("real", "10.3e0", DOUBLE, "DOUBLE '10.3e0'")
+                .addRoundTrip("real", "NULL", DOUBLE, "CAST(NULL AS DOUBLE)")
+                .addRoundTrip("real", "CAST('NaN' AS DOUBLE)", DOUBLE, "nan()")
+                .addRoundTrip("real", "CAST('Infinity' AS DOUBLE)", DOUBLE, "+infinity()")
+                .addRoundTrip("real", "CAST('-Infinity' AS DOUBLE)", DOUBLE, "-infinity()")
+                .execute(getQueryRunner(), trinoCreateAsSelect("tpch.test_real"))
+                .execute(getQueryRunner(), trinoCreateAndInsert("tpch.test_real"));
+
+        SqlDataTypeTest.create()
+                .addRoundTrip("float", "3.14", DOUBLE, "DOUBLE '3.14'")
+                .addRoundTrip("float", "10.3e0", DOUBLE, "DOUBLE '10.3e0'")
+                .addRoundTrip("float", "NULL", DOUBLE, "CAST(NULL AS DOUBLE)")
+                .addRoundTrip("float", "CAST('NaN' AS float)", DOUBLE, "nan()")
+                .addRoundTrip("float", "CAST('Infinity' AS float)", DOUBLE, "+infinity()")
+                .addRoundTrip("float", "CAST('-Infinity' AS float)", DOUBLE, "-infinity()")
+                .execute(getQueryRunner(), snowflakeCreateAndInsert("tpch.test_float"));
+    }
+
+    @Test
+    public void testDouble()
+    {
+        SqlDataTypeTest.create()
+                .addRoundTrip("double", "3.14", DOUBLE, "CAST(3.14 AS DOUBLE)")
+                .addRoundTrip("double", "1.0E100", DOUBLE, "1.0E100")
+                .addRoundTrip("double", "1.23456E12", DOUBLE, "1.23456E12")
+                .addRoundTrip("double", "NULL", DOUBLE, "CAST(NULL AS DOUBLE)")
+                .addRoundTrip("double", "CAST('NaN' AS DOUBLE)", DOUBLE, "nan()")
+                .addRoundTrip("double", "CAST('Infinity' AS DOUBLE)", DOUBLE, "+infinity()")
+                .addRoundTrip("double", "CAST('-Infinity' AS DOUBLE)", DOUBLE, "-infinity()")
+                .execute(getQueryRunner(), trinoCreateAsSelect("trino_test_double"))
+                .execute(getQueryRunner(), trinoCreateAndInsert("trino_test_double"))
+                .execute(getQueryRunner(), snowflakeCreateAndInsert("tpch.test_double"));
+    }
+
+    @Test
+    public void testSnowflakeCreatedParameterizedVarchar()
+    {
+        SqlDataTypeTest.create()
+                .addRoundTrip("text", "'b'", createVarcharType(16777216), "CAST('b' AS VARCHAR(16777216))")
+                .addRoundTrip("varchar(32)", "'e'", createVarcharType(32), "CAST('e' AS VARCHAR(32))")
+                .addRoundTrip("varchar(15000)", "'f'", createVarcharType(15000), "CAST('f' AS VARCHAR(15000))")
+                .execute(getQueryRunner(), snowflakeCreateAndInsert("tpch.snowflake_test_parameterized_varchar"));
+    }
+
+    @Test
+    public void testSnowflakeCreatedParameterizedVarcharUnicode()
+    {
+        SqlDataTypeTest.create()
+                .addRoundTrip("text collate \'utf8\'", "'攻殻機動隊'", createVarcharType(16777216), "CAST('攻殻機動隊' AS VARCHAR(16777216))")
+                .addRoundTrip("varchar(5) collate \'utf8\'", "'攻殻機動隊'", createVarcharType(5), "CAST('攻殻機動隊' AS VARCHAR(5))")
+                .addRoundTrip("varchar(32) collate \'utf8\'", "'攻殻機動隊'", createVarcharType(32), "CAST('攻殻機動隊' AS VARCHAR(32))")
+                .addRoundTrip("varchar(20000) collate \'utf8\'", "'攻殻機動隊'", createVarcharType(20000), "CAST('攻殻機動隊' AS VARCHAR(20000))")
+                .addRoundTrip("varchar(1) collate \'utf8mb4\'", "'😂'", createVarcharType(1), "CAST('😂' AS VARCHAR(1))")
+                .addRoundTrip("varchar(77) collate \'utf8mb4\'", "'Ну, погоди!'", createVarcharType(77), "CAST('Ну, погоди!' AS VARCHAR(77))")
+                .execute(getQueryRunner(), snowflakeCreateAndInsert("tpch.snowflake_test_parameterized_varchar_unicode"));
+    }
+
+    @Test
+    public void testParameterizedChar()
+    {
+        SqlDataTypeTest.create()
+                .addRoundTrip("char", "''", createVarcharType(1), "CAST(' ' AS varchar(1))")
+                .addRoundTrip("char", "'a'", createVarcharType(1), "CAST('a' AS varchar(1))")
+                .addRoundTrip("char(1)", "''", createVarcharType(1), "CAST(' ' AS varchar(1))")
+                .addRoundTrip("char(1)", "'a'", createVarcharType(1), "CAST('a' AS varchar(1))")
+                .addRoundTrip("char(8)", "'abc'", createVarcharType(8), "CAST('abc     ' AS varchar(8))")
+                .addRoundTrip("char(8)", "'12345678'", createVarcharType(8), "CAST('12345678' AS varchar(8))")
+                .execute(getQueryRunner(), trinoCreateAsSelect("snowflake_test_parameterized_char"));
+
+        SqlDataTypeTest.create()
+                .addRoundTrip("char", "''", createVarcharType(1), "CAST('' AS varchar(1))")
+                .addRoundTrip("char", "'a'", createVarcharType(1), "CAST('a' AS varchar(1))")
+                .addRoundTrip("char(1)", "''", createVarcharType(1), "CAST('' AS varchar(1))")
+                .addRoundTrip("char(1)", "'a'", createVarcharType(1), "CAST('a' AS varchar(1))")
+                .addRoundTrip("char(8)", "'abc'", createVarcharType(8), "CAST('abc' AS varchar(8))")
+                .addRoundTrip("char(8)", "'12345678'", createVarcharType(8), "CAST('12345678' AS varchar(8))")
+                .execute(getQueryRunner(), trinoCreateAndInsert("snowflake_test_parameterized_char"))
+                .execute(getQueryRunner(), snowflakeCreateAndInsert("tpch.snowflake_test_parameterized_char"));
+    }
+
+    @Test
+    public void testSnowflakeParameterizedCharUnicode()
+    {
+        SqlDataTypeTest.create()
+                .addRoundTrip("char(1) collate \'utf8\'", "'攻'", createVarcharType(1), "CAST('攻' AS VARCHAR(1))")
+                .addRoundTrip("char(5) collate \'utf8\'", "'攻殻'", createVarcharType(5), "CAST('攻殻' AS VARCHAR(5))")
+                .addRoundTrip("char(5) collate \'utf8\'", "'攻殻機動隊'", createVarcharType(5), "CAST('攻殻機動隊' AS VARCHAR(5))")
+                .addRoundTrip("char(1)", "'😂'", createVarcharType(1), "CAST('😂' AS VARCHAR(1))")
+                .addRoundTrip("char(77)", "'Ну, погоди!'", createVarcharType(77), "CAST('Ну, погоди!' AS VARCHAR(77))")
+                .execute(getQueryRunner(), snowflakeCreateAndInsert("tpch.snowflake_test_parameterized_char"));
+    }
+
+    @Test
+    public void testBinary()
+    {
+        SqlDataTypeTest.create()
+                .addRoundTrip("binary(18)", "NULL", VARBINARY, "CAST(NULL AS varbinary)")
+                .addRoundTrip("binary(18)", "X''", VARBINARY, "X''")
+                .addRoundTrip("binary(18)", "X'68656C6C6F'", VARBINARY, "to_utf8('hello')")
+                .addRoundTrip("binary(18)", "X'C582C4856B61207720E69DB1E4BAACE983BD'", VARBINARY, "to_utf8('łąka w 東京都')") // no trailing zeros
+                .addRoundTrip("binary(18)", "X'4261672066756C6C206F6620F09F92B0'", VARBINARY, "to_utf8('Bag full of 💰')")
+                .addRoundTrip("binary(18)", "X'0001020304050607080DF9367AA7000000'", VARBINARY, "X'0001020304050607080DF9367AA7000000'") // non-text prefix
+                .addRoundTrip("binary(18)", "X'000000000000'", VARBINARY, "X'000000000000'")
+                .execute(getQueryRunner(), snowflakeCreateAndInsert("tpch.test_binary"));
+    }
+
+    @Test
+    public void testVarbinary()
+    {
+        SqlDataTypeTest.create()
+                .addRoundTrip("varbinary", "NULL", VARBINARY, "CAST(NULL AS varbinary)")
+                .addRoundTrip("varbinary", "X''", VARBINARY, "X''")
+                .addRoundTrip("varbinary", "X'68656C6C6F'", VARBINARY, "to_utf8('hello')")
+                .addRoundTrip("varbinary", "X'5069C4996B6E6120C582C4856B61207720E69DB1E4BAACE983BD'", VARBINARY, "to_utf8('Piękna łąka w 東京都')")
+                .addRoundTrip("varbinary", "X'4261672066756C6C206F6620F09F92B0'", VARBINARY, "to_utf8('Bag full of 💰')")
+                .addRoundTrip("varbinary", "X'0001020304050607080DF9367AA7000000'", VARBINARY, "X'0001020304050607080DF9367AA7000000'") // non-text
+                .addRoundTrip("varbinary", "X'000000000000'", VARBINARY, "X'000000000000'")
+                .execute(getQueryRunner(), trinoCreateAsSelect("test_varbinary"))
+                .execute(getQueryRunner(), trinoCreateAndInsert("test_varbinary"))
+                .execute(getQueryRunner(), snowflakeCreateAndInsert("tpch.test_varbinary"));
+    }
+
+    @Test(dataProvider = "sessionZonesDataProvider")
+    public void testDate(ZoneId sessionZone)
+    {
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        SqlDataTypeTest.create()
+                .addRoundTrip("date", "NULL", DATE, "CAST(NULL AS DATE)")
+                .addRoundTrip("date", "'-5877641-06-23'", DATE, "DATE '-5877641-06-23'") // min value in Trino
+                .addRoundTrip("date", "'0000-01-01'", DATE, "DATE '0000-01-01'")
+                .addRoundTrip("date", "DATE '0001-01-01'", DATE, "DATE '0001-01-01'") // Min value for the function Date.
+                .addRoundTrip("date", "DATE '1582-10-05'", DATE, "DATE '1582-10-05'") // begin julian->gregorian switch
+                .addRoundTrip("date", "DATE '1582-10-14'", DATE, "DATE '1582-10-14'") // end julian->gregorian switch
+                .addRoundTrip("date", "DATE '1983-04-01'", DATE, "DATE '1983-04-01'")
+                .addRoundTrip("date", "DATE '1983-10-01'", DATE, "DATE '1983-10-01'")
+                .addRoundTrip("date", "DATE '2017-07-01'", DATE, "DATE '2017-07-01'") // summer on northern hemisphere (possible DST)
+                .addRoundTrip("date", "DATE '2017-01-01'", DATE, "DATE '2017-01-01'") // winter on northern hemisphere (possible DST on southern hemisphere)
+                .addRoundTrip("date", "DATE '99999-12-31'", DATE, "DATE '99999-12-31'")
+                .addRoundTrip("date", "'5881580-07-11'", DATE, "DATE '5881580-07-11'") // max value in Trino
+                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_date"))
+                .execute(getQueryRunner(), session, snowflakeCreateAndInsert("tpch.test_date"));
+    }
+
+    @Test(dataProvider = "sessionZonesDataProvider")
+    public void testTimestamp(ZoneId sessionZone)
+    {
+        Session session = Session.builder(getSession())
+                .setTimeZoneKey(TimeZoneKey.getTimeZoneKey(sessionZone.getId()))
+                .build();
+
+        SqlDataTypeTest.create()
+                // after epoch (MariaDb's timestamp type doesn't support values <= epoch)
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2019-03-18 10:01:17.987'", createTimestampType(3), "TIMESTAMP '2019-03-18 10:01:17.987'")
+                // time doubled in JVM zone
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-10-28 01:33:17.456'", createTimestampType(3), "TIMESTAMP '2018-10-28 01:33:17.456'")
+                // time double in Vilnius
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-10-28 03:33:33.333'", createTimestampType(3), "TIMESTAMP '2018-10-28 03:33:33.333'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:13:42.000'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:13:42.000'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-04-01 02:13:55.123'", createTimestampType(3), "TIMESTAMP '2018-04-01 02:13:55.123'")
+                // time gap in Vilnius
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2018-03-25 03:17:17.000'", createTimestampType(3), "TIMESTAMP '2018-03-25 03:17:17.000'")
+                // time gap in Kathmandu
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1986-01-01 00:13:07.000'", createTimestampType(3), "TIMESTAMP '1986-01-01 00:13:07.000'")
+                // max value 2038-01-19 03:14:07
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2038-01-19 03:14:07.000'", createTimestampType(3), "TIMESTAMP '2038-01-19 03:14:07.000'")
+
+//                TODO: Fix the precision > 3 tests
+                // same as above but with higher precision
+//                .addRoundTrip("timestamp(6)", "TIMESTAMP '2019-03-18 10:01:17.987654'", createTimestampType(6), "TIMESTAMP '2019-03-18 10:01:17.987654'")
+//                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-10-28 01:33:17.456789'", createTimestampType(6), "TIMESTAMP '2018-10-28 01:33:17.456789'")
+//                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-10-28 03:33:33.333333'", createTimestampType(6), "TIMESTAMP '2018-10-28 03:33:33.333333'")
+//                .addRoundTrip("timestamp(6)", "TIMESTAMP '1970-01-01 00:13:42.000000'", createTimestampType(6), "TIMESTAMP '1970-01-01 00:13:42.000000'")
+//                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-04-01 02:13:55.123456'", createTimestampType(6), "TIMESTAMP '2018-04-01 02:13:55.123456'")
+//                .addRoundTrip("timestamp(6)", "TIMESTAMP '2018-03-25 03:17:17.000000'", createTimestampType(6), "TIMESTAMP '2018-03-25 03:17:17.000000'")
+//                .addRoundTrip("timestamp(6)", "TIMESTAMP '1986-01-01 00:13:07.000000'", createTimestampType(6), "TIMESTAMP '1986-01-01 00:13:07.000000'")
+//                // max value 2038-01-19 03:14:07
+//                .addRoundTrip("timestamp(6)", "TIMESTAMP '2038-01-19 03:14:07.000000'", createTimestampType(6), "TIMESTAMP '2038-01-19 03:14:07.000000'")
+
+                // test arbitrary time for all supported precisions
+                .addRoundTrip("timestamp(0)", "TIMESTAMP '1970-01-01 00:00:01'", createTimestampType(0), "TIMESTAMP '1970-01-01 00:00:01'")
+                .addRoundTrip("timestamp(1)", "TIMESTAMP '1970-01-01 00:00:01.1'", createTimestampType(1), "TIMESTAMP '1970-01-01 00:00:01.1'")
+                .addRoundTrip("timestamp(1)", "TIMESTAMP '1970-01-01 00:00:01.9'", createTimestampType(1), "TIMESTAMP '1970-01-01 00:00:01.9'")
+                .addRoundTrip("timestamp(2)", "TIMESTAMP '1970-01-01 00:00:01.12'", createTimestampType(2), "TIMESTAMP '1970-01-01 00:00:01.12'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:00:01.123'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:00:01.123'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:00:01.999'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:00:01.999'")
+
+                .addRoundTrip("timestamp(1)", "TIMESTAMP '2020-09-27 12:34:56.1'", createTimestampType(1), "TIMESTAMP '2020-09-27 12:34:56.1'")
+                .addRoundTrip("timestamp(1)", "TIMESTAMP '2020-09-27 12:34:56.9'", createTimestampType(1), "TIMESTAMP '2020-09-27 12:34:56.9'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2020-09-27 12:34:56.123'", createTimestampType(3), "TIMESTAMP '2020-09-27 12:34:56.123'")
+                .addRoundTrip("timestamp(3)", "TIMESTAMP '2020-09-27 12:34:56.999'", createTimestampType(3), "TIMESTAMP '2020-09-27 12:34:56.999'")
+//                .addRoundTrip("timestamp(4)", "TIMESTAMP '1970-01-01 00:00:01.1234'", createTimestampType(4), "TIMESTAMP '1970-01-01 00:00:01.1234'")
+//                .addRoundTrip("timestamp(5)", "TIMESTAMP '1970-01-01 00:00:01.12345'", createTimestampType(5), "TIMESTAMP '1970-01-01 00:00:01.12345'")
+//                .addRoundTrip("timestamp(6)", "TIMESTAMP '2020-09-27 12:34:56.123456'", createTimestampType(6), "TIMESTAMP '2020-09-27 12:34:56.123456'")
+
+                .execute(getQueryRunner(), session, snowflakeCreateAndInsert("tpch.test_timestamp"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect(session, "test_timestamp"))
+                .execute(getQueryRunner(), session, trinoCreateAsSelect("test_timestamp"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert(session, "test_timestamp"))
+                .execute(getQueryRunner(), session, trinoCreateAndInsert("test_timestamp"));
+    }
+
+    @DataProvider
+    public Object[][] sessionZonesDataProvider()
+    {
+        return new Object[][] {
+                {UTC},
+                {jvmZone},
+                {vilnius},
+                {kathmandu},
+                {ZoneId.of(TestingSession.DEFAULT_TIME_ZONE_KEY.getId())},
+        };
+    }
+
+    private DataSetup trinoCreateAsSelect(String tableNamePrefix)
+    {
+        return trinoCreateAsSelect(getSession(), tableNamePrefix);
+    }
+
+    private DataSetup trinoCreateAsSelect(Session session, String tableNamePrefix)
+    {
+        return new CreateAsSelectDataSetup(new TrinoSqlExecutor(getQueryRunner(), session), tableNamePrefix);
+    }
+
+    private DataSetup trinoCreateAndInsert(String tableNamePrefix)
+    {
+        return trinoCreateAndInsert(getSession(), tableNamePrefix);
+    }
+
+    private DataSetup trinoCreateAndInsert(Session session, String tableNamePrefix)
+    {
+        return new CreateAndInsertDataSetup(new TrinoSqlExecutor(getQueryRunner(), session), tableNamePrefix);
+    }
+
+    private DataSetup snowflakeCreateAndInsert(String tableNamePrefix)
+    {
+        return new CreateAndInsertDataSetup(snowflakeServer::execute, tableNamePrefix);
+    }
+
+    private static void checkIsGap(ZoneId zone, LocalDate date)
+    {
+        verify(isGap(zone, date), "Expected %s to be a gap in %s", date, zone);
+    }
+
+    private static boolean isGap(ZoneId zone, LocalDate date)
+    {
+        return zone.getRules().getValidOffsets(date.atStartOfDay()).isEmpty();
+    }
+}
diff --git a/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestingSnowflakeServer.java b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestingSnowflakeServer.java
new file mode 100644
index 000000000000..bfc2fc907814
--- /dev/null
+++ b/plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestingSnowflakeServer.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed 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 io.trino.plugin.snowflake;
+
+import org.intellij.lang.annotations.Language;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+import static java.util.Objects.requireNonNull;
+
+public class TestingSnowflakeServer
+{
+    public static final String TEST_URL = requireNonNull(System.getProperty("snowflake.test.server.url"), "snowflake.test.server.url is not set");
+    public static final String TEST_USER = requireNonNull(System.getProperty("snowflake.test.server.user"), "snowflake.test.server.user is not set");
+    public static final String TEST_PASSWORD = requireNonNull(System.getProperty("snowflake.test.server.password"), "snowflake.test.server.password is not set");
+    public static final String TEST_DATABASE = requireNonNull(System.getProperty("snowflake.test.server.database"), "snowflake.test.server.database is not set");
+    public static final String TEST_WAREHOUSE = requireNonNull(System.getProperty("snowflake.test.server.warehouse"), "snowflake.test.server.warehouse is not set");
+    public static final String TEST_ROLE = requireNonNull(System.getProperty("snowflake.test.server.role"), "snowflake.test.server.role is not set");
+    public static final String TEST_PROXY = System.getProperty("snowflake.test.http_proxy");
+    public static final String TEST_SCHEMA = "tpch";
+
+    public TestingSnowflakeServer()
+    {
+        execute("CREATE SCHEMA IF NOT EXISTS tpch");
+    }
+
+    public void execute(@Language("SQL") String sql)
+    {
+        execute(TEST_URL, getProperties(), sql);
+    }
+
+    private static void execute(String url, Properties properties, String sql)
+    {
+        try (Connection connection = DriverManager.getConnection(url, properties);
+                Statement statement = connection.createStatement()) {
+            statement.execute(sql);
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public Properties getProperties()
+    {
+        Properties properties = new Properties();
+        properties.setProperty("user", TEST_USER);
+        properties.setProperty("password", TEST_PASSWORD);
+        properties.setProperty("db", TEST_DATABASE);
+        properties.setProperty("schema", TEST_SCHEMA);
+        properties.setProperty("warehouse", TEST_WAREHOUSE);
+        properties.setProperty("role", TEST_ROLE);
+        return properties;
+    }
+}
diff --git a/plugin/trino-sqlserver/pom.xml b/plugin/trino-sqlserver/pom.xml
index 3cf65b03ddbd..3bb828710c42 100644
--- a/plugin/trino-sqlserver/pom.xml
+++ b/plugin/trino-sqlserver/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-sqlserver</artifactId>
-    <description>Trino - SQL Server Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - SQL Server Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -28,23 +28,23 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-base-jdbc</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-matching</artifactId>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
         </dependency>
 
         <dependency>
@@ -58,28 +58,23 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-base-jdbc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-matching</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
@@ -87,35 +82,33 @@
             <artifactId>jdbi3-core</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-            <scope>runtime</scope>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -125,7 +118,30 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-base-jdbc</artifactId>
@@ -159,6 +175,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
@@ -189,12 +212,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -207,6 +224,18 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>jdbc</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>mssqlserver</artifactId>
@@ -226,42 +255,30 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/Test*FailureRecoveryTest.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>fte-tests</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/Test*FailureRecoveryTest.java</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClient.java b/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClient.java
index b8af12d0170b..7a1e196087b9 100644
--- a/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClient.java
+++ b/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClient.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import com.microsoft.sqlserver.jdbc.SQLServerConnection;
 import com.microsoft.sqlserver.jdbc.SQLServerException;
 import dev.failsafe.Failsafe;
@@ -29,6 +30,7 @@
 import io.trino.plugin.base.aggregation.AggregateFunctionRewriter;
 import io.trino.plugin.base.aggregation.AggregateFunctionRule;
 import io.trino.plugin.base.expression.ConnectorExpressionRewriter;
+import io.trino.plugin.base.mapping.IdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcClient;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.CaseSensitivity;
@@ -63,7 +65,6 @@
 import io.trino.plugin.jdbc.expression.RewriteComparison;
 import io.trino.plugin.jdbc.expression.RewriteIn;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.IdentifierMapping;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
@@ -93,8 +94,6 @@
 import org.jdbi.v3.core.Handle;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.inject.Inject;
-
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -294,6 +293,17 @@ public SqlServerClient(
                         .build());
     }
 
+    @Override
+    protected void dropSchema(ConnectorSession session, Connection connection, String remoteSchemaName, boolean cascade)
+            throws SQLException
+    {
+        if (cascade) {
+            // SQL Server doesn't support CASCADE option https://learn.microsoft.com/en-us/sql/t-sql/statements/drop-schema-transact-sql
+            throw new TrinoException(NOT_SUPPORTED, "This connector does not support dropping schemas with CASCADE option");
+        }
+        execute(session, connection, "DROP SCHEMA " + quoted(remoteSchemaName));
+    }
+
     @Override
     public JdbcOutputTableHandle beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata)
     {
diff --git a/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClientModule.java b/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClientModule.java
index 7601cfb3473c..04dda541845a 100644
--- a/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClientModule.java
+++ b/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClientModule.java
@@ -20,6 +20,7 @@
 import com.google.inject.Singleton;
 import com.microsoft.sqlserver.jdbc.SQLServerDriver;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.plugin.jdbc.DriverConnectionFactory;
@@ -31,7 +32,9 @@
 import io.trino.plugin.jdbc.credential.CredentialProvider;
 import io.trino.plugin.jdbc.ptf.Procedure;
 import io.trino.plugin.jdbc.ptf.Query;
-import io.trino.spi.ptf.ConnectorTableFunction;
+import io.trino.spi.function.table.ConnectorTableFunction;
+
+import java.util.Properties;
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
@@ -68,8 +71,16 @@ protected void setup(Binder binder)
     public static ConnectionFactory getConnectionFactory(
             BaseJdbcConfig config,
             SqlServerConfig sqlServerConfig,
-            CredentialProvider credentialProvider)
+            CredentialProvider credentialProvider,
+            OpenTelemetry openTelemetry)
     {
-        return new SqlServerConnectionFactory(new DriverConnectionFactory(new SQLServerDriver(), config, credentialProvider), sqlServerConfig.isSnapshotIsolationDisabled());
+        return new SqlServerConnectionFactory(
+                new DriverConnectionFactory(
+                        new SQLServerDriver(),
+                        config.getConnectionUrl(),
+                        new Properties(),
+                        credentialProvider,
+                        openTelemetry),
+                sqlServerConfig.isSnapshotIsolationDisabled());
     }
 }
diff --git a/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerConnectionFactory.java b/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerConnectionFactory.java
index f098bb284e3f..237cd6545927 100644
--- a/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerConnectionFactory.java
+++ b/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerConnectionFactory.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.sqlserver;
 
 import com.google.common.cache.CacheBuilder;
-import io.trino.collect.cache.NonEvictableCache;
+import io.trino.cache.NonEvictableCache;
 import io.trino.plugin.jdbc.ConnectionFactory;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
@@ -26,7 +26,7 @@
 import java.util.concurrent.ExecutionException;
 
 import static com.microsoft.sqlserver.jdbc.ISQLServerConnection.TRANSACTION_SNAPSHOT;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static java.time.Duration.ofMinutes;
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorSmokeTest.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorSmokeTest.java
index 4eca36ac014c..d1b9a09a4680 100644
--- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorSmokeTest.java
+++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorSmokeTest.java
@@ -15,27 +15,21 @@
 
 import io.trino.plugin.jdbc.BaseJdbcConnectorSmokeTest;
 import io.trino.testing.TestingConnectorBehavior;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class BaseSqlServerConnectorSmokeTest
         extends BaseJdbcConnectorSmokeTest
 {
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Test
diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java
index 28f97159b37d..aedbd809daef 100644
--- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java
+++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java
@@ -49,51 +49,34 @@
 public abstract class BaseSqlServerConnectorTest
         extends BaseJdbcConnectorTest
 {
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_EQUALITY:
-            case SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY:
-                return true;
-            case SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY:
-                return false;
-
-            case SUPPORTS_PREDICATE_EXPRESSION_PUSHDOWN:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_STDDEV:
-            case SUPPORTS_AGGREGATION_PUSHDOWN_VARIANCE:
-                return true;
-
-            case SUPPORTS_JOIN_PUSHDOWN:
-                return true;
-            case SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM:
-                return false;
-
-            case SUPPORTS_RENAME_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
-            case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
-            case SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN_WITH_COMMENT:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-            case SUPPORTS_NEGATIVE_DATE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_JOIN_PUSHDOWN,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_EQUALITY,
+                    SUPPORTS_PREDICATE_EXPRESSION_PUSHDOWN,
+                    SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY -> true;
+            case SUPPORTS_ADD_COLUMN_WITH_COMMENT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_CORRELATION,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_COVARIANCE,
+                    SUPPORTS_AGGREGATION_PUSHDOWN_REGRESSION,
+                    SUPPORTS_ARRAY,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
+                    SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
+                    SUPPORTS_DROP_SCHEMA_CASCADE,
+                    SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
+                    SUPPORTS_NEGATIVE_DATE,
+                    SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY,
+                    SUPPORTS_RENAME_SCHEMA,
+                    SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
@@ -167,6 +150,7 @@ public void testReadMetadataWithRelationsConcurrentModifications()
                     .hasMessageMatching("(?s).*(" +
                             "No task completed before timeout|" +
                             "was deadlocked on lock resources with another process and has been chosen as the deadlock victim|" +
+                            "Lock request time out period exceeded|" +
                             // E.g. system.metadata.table_comments can return empty results, when underlying metadata list tables call fails
                             "Expecting actual not to be empty).*");
             throw new SkipException("to be fixed");
@@ -600,7 +584,7 @@ public void testDateYearOfEraPredicate()
         assertQuery("SELECT orderdate FROM orders WHERE orderdate = DATE '1997-09-14'", "VALUES DATE '1997-09-14'");
         assertQueryFails(
                 "SELECT * FROM orders WHERE orderdate = DATE '-1996-09-14'",
-                "Conversion failed when converting date and/or time from character string\\.");
+                ".*\\QConversion failed when converting date and/or time from character string.\\E");
     }
 
     @Override
@@ -868,6 +852,17 @@ THEN INSERT(id) VALUES(SOURCE.id)
         }
     }
 
+    @Test
+    @Override
+    public void testConstantUpdateWithVarcharInequalityPredicates()
+    {
+        // Sql Server supports push down predicate for not equal operator
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_update_varchar", "(col1 INT, col2 varchar(1))", ImmutableList.of("1, 'a'", "2, 'A'"))) {
+            assertUpdate("UPDATE " + table.getName() + " SET col1 = 20 WHERE col2 != 'A'", 1);
+            assertQuery("SELECT * FROM " + table.getName(), "VALUES (20, 'a'), (2, 'A')");
+        }
+    }
+
     private TestProcedure createTestingProcedure(String baseQuery)
     {
         return createTestingProcedure("", baseQuery);
diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerFailureRecoveryTest.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerFailureRecoveryTest.java
index 7e5214bb05d8..11c5d85614bd 100644
--- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerFailureRecoveryTest.java
+++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerFailureRecoveryTest.java
@@ -19,11 +19,14 @@
 import io.trino.plugin.jdbc.BaseJdbcFailureRecoveryTest;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
+import org.testng.SkipException;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import static io.trino.plugin.sqlserver.SqlServerQueryRunner.createSqlServerQueryRunner;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public abstract class BaseSqlServerFailureRecoveryTest
         extends BaseJdbcFailureRecoveryTest
@@ -52,4 +55,26 @@ protected QueryRunner createQueryRunner(
                             "exchange.base-directories", System.getProperty("java.io.tmpdir") + "/trino-local-file-system-exchange-manager"));
                 });
     }
+
+    @Override
+    protected void testUpdateWithSubquery()
+    {
+        assertThatThrownBy(super::testUpdateWithSubquery).hasMessageContaining("Unexpected Join over for-update table scan");
+        throw new SkipException("skipped");
+    }
+
+    @Override
+    protected void testUpdate()
+    {
+        // This simple update on JDBC ends up as a very simple, single-fragment, coordinator-only plan,
+        // which has no ability to recover from errors. This test simply verifies that's still the case.
+        Optional<String> setupQuery = Optional.of("CREATE TABLE <table> AS SELECT * FROM orders");
+        String testQuery = "UPDATE <table> SET shippriority = 101 WHERE custkey = 1";
+        Optional<String> cleanupQuery = Optional.of("DROP TABLE <table>");
+
+        assertThatQuery(testQuery)
+                .withSetupQuery(setupQuery)
+                .withCleanupQuery(cleanupQuery)
+                .isCoordinatorOnly();
+    }
 }
diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerTransactionIsolationTest.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerTransactionIsolationTest.java
index 57032b250ebe..859371798c1d 100644
--- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerTransactionIsolationTest.java
+++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerTransactionIsolationTest.java
@@ -25,7 +25,7 @@
 import static io.trino.plugin.sqlserver.SqlServerQueryRunner.createSqlServerQueryRunner;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.tpch.TpchTable.NATION;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class BaseSqlServerTransactionIsolationTest
         extends AbstractTestQueryFramework
diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerCaseInsensitiveMapping.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerCaseInsensitiveMapping.java
index 93a569296070..ca60f511f667 100644
--- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerCaseInsensitiveMapping.java
+++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerCaseInsensitiveMapping.java
@@ -18,22 +18,21 @@
 import io.trino.plugin.jdbc.BaseCaseInsensitiveMappingTest;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.SqlExecutor;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
 
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.REFRESH_PERIOD_DURATION;
-import static io.trino.plugin.jdbc.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.REFRESH_PERIOD_DURATION;
+import static io.trino.plugin.base.mapping.RuleBasedIdentifierMappingUtils.createRuleBasedIdentifierMappingFile;
 import static io.trino.plugin.sqlserver.SqlServerQueryRunner.createSqlServerQueryRunner;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 
 // With case-insensitive-name-matching enabled colliding schema/table names are considered as errors.
 // Some tests here create colliding names which can cause any other concurrent test to fail.
-@Test(singleThreaded = true)
 public class TestSqlServerCaseInsensitiveMapping
         extends BaseCaseInsensitiveMappingTest
 {
diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerClient.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerClient.java
index 9dde9aa76aa5..8be977683b19 100644
--- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerClient.java
+++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerClient.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.sqlserver;
 
+import io.trino.plugin.base.mapping.DefaultIdentifierMapping;
 import io.trino.plugin.jdbc.BaseJdbcConfig;
 import io.trino.plugin.jdbc.ColumnMapping;
 import io.trino.plugin.jdbc.DefaultQueryBuilder;
@@ -22,7 +23,6 @@
 import io.trino.plugin.jdbc.JdbcStatisticsConfig;
 import io.trino.plugin.jdbc.JdbcTypeHandle;
 import io.trino.plugin.jdbc.logging.RemoteQueryModifier;
-import io.trino.plugin.jdbc.mapping.DefaultIdentifierMapping;
 import io.trino.spi.connector.AggregateFunction;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.expression.ConnectorExpression;
diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerTableStatistics.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerTableStatistics.java
index b2ce0f624108..16660425161b 100644
--- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerTableStatistics.java
+++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerTableStatistics.java
@@ -20,8 +20,7 @@
 import io.trino.testing.sql.TestTable;
 import org.jdbi.v3.core.Handle;
 import org.jdbi.v3.core.Jdbi;
-import org.testng.SkipException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -31,6 +30,7 @@
 import static io.trino.testing.sql.TestTable.fromColumns;
 import static io.trino.tpch.TpchTable.ORDERS;
 import static java.lang.String.format;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 public class TestSqlServerTableStatistics
         extends BaseJdbcTableStatisticsTest
@@ -211,7 +211,7 @@ public void testAverageColumnLength()
     @Test
     public void testPartitionedTable()
     {
-        throw new SkipException("Not implemented"); // TODO
+        abort("Not implemented"); // TODO
     }
 
     @Override
@@ -236,10 +236,11 @@ public void testView()
         }
     }
 
+    @Test
     @Override
     public void testMaterializedView()
     {
-        throw new SkipException("see testIndexedView");
+        abort("see testIndexedView");
     }
 
     @Test
@@ -275,8 +276,7 @@ public void testIndexedView() // materialized view
     }
 
     @Override
-    @Test(dataProvider = "testCaseColumnNamesDataProvider")
-    public void testCaseColumnNames(String tableName)
+    protected void testCaseColumnNames(String tableName)
     {
         sqlServer.execute("" +
                 "SELECT " +
diff --git a/plugin/trino-teradata-functions/pom.xml b/plugin/trino-teradata-functions/pom.xml
index 9b618bed3ed9..e8a0c7c342c1 100644
--- a/plugin/trino-teradata-functions/pom.xml
+++ b/plugin/trino-teradata-functions/pom.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-teradata-functions</artifactId>
-    <description>Teradata's specific functions for Trino</description>
     <packaging>trino-plugin</packaging>
+    <description>Teradata's specific functions for Trino</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,13 +18,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>concurrent</artifactId>
         </dependency>
 
         <dependency>
@@ -37,16 +37,15 @@
             <artifactId>antlr4-runtime</artifactId>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -56,7 +55,12 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -93,12 +97,6 @@
             <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/plugin/trino-teradata-functions/src/main/java/io/trino/plugin/teradata/functions/TeradataStringFunctions.java b/plugin/trino-teradata-functions/src/main/java/io/trino/plugin/teradata/functions/TeradataStringFunctions.java
index acd6a6aa234d..e7a56748599b 100644
--- a/plugin/trino-teradata-functions/src/main/java/io/trino/plugin/teradata/functions/TeradataStringFunctions.java
+++ b/plugin/trino-teradata-functions/src/main/java/io/trino/plugin/teradata/functions/TeradataStringFunctions.java
@@ -63,7 +63,7 @@ public static long index(
     @SqlType(StandardTypes.VARCHAR)
     public static Slice char2HexInt(@SqlType(StandardTypes.VARCHAR) Slice string)
     {
-        Slice utf16 = Slices.wrappedBuffer(UTF_16BE.encode(string.toStringUtf8()));
+        Slice utf16 = Slices.wrappedHeapBuffer(UTF_16BE.encode(string.toStringUtf8()));
         String encoded = BaseEncoding.base16().encode(utf16.getBytes());
         return Slices.utf8Slice(encoded);
     }
diff --git a/plugin/trino-teradata-functions/src/test/java/io/trino/plugin/teradata/functions/dateformat/TestDateFormatParser.java b/plugin/trino-teradata-functions/src/test/java/io/trino/plugin/teradata/functions/dateformat/TestDateFormatParser.java
index 6cd117553a73..f8c5004e44f5 100644
--- a/plugin/trino-teradata-functions/src/test/java/io/trino/plugin/teradata/functions/dateformat/TestDateFormatParser.java
+++ b/plugin/trino-teradata-functions/src/test/java/io/trino/plugin/teradata/functions/dateformat/TestDateFormatParser.java
@@ -17,12 +17,13 @@
 import org.antlr.v4.runtime.Token;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.Collectors;
 
 import static java.util.Arrays.asList;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestDateFormatParser
 {
@@ -30,42 +31,44 @@ public class TestDateFormatParser
     public void testTokenize()
     {
         assertEquals(
-                DateFormatParser.tokenize("yyyy mm").stream().map(Token::getType).collect(Collectors.toList()),
-                asList(DateFormat.YYYY, DateFormat.TEXT, DateFormat.MM));
+                asList(DateFormat.YYYY, DateFormat.TEXT, DateFormat.MM),
+                DateFormatParser.tokenize("yyyy mm").stream().map(Token::getType).collect(Collectors.toList()));
     }
 
     @Test
     public void testGreedinessLongFirst()
     {
-        assertEquals(1, DateFormatParser.tokenize("yy").size());
-        assertEquals(1, DateFormatParser.tokenize("yyyy").size());
-        assertEquals(2, DateFormatParser.tokenize("yyyyyy").size());
+        assertEquals(DateFormatParser.tokenize("yy").size(), 1);
+        assertEquals(DateFormatParser.tokenize("yyyy").size(), 1);
+        assertEquals(DateFormatParser.tokenize("yyyyyy").size(), 2);
     }
 
     @Test
     public void testInvalidTokenTokenize()
     {
         assertEquals(
-                DateFormatParser.tokenize("ala").stream().map(Token::getType).collect(Collectors.toList()),
-                asList(DateFormat.UNRECOGNIZED, DateFormat.UNRECOGNIZED, DateFormat.UNRECOGNIZED));
+                asList(DateFormat.UNRECOGNIZED, DateFormat.UNRECOGNIZED, DateFormat.UNRECOGNIZED),
+                DateFormatParser.tokenize("ala").stream().map(Token::getType).collect(Collectors.toList()));
     }
 
-    @Test(expectedExceptions = TrinoException.class)
+    @Test
     public void testInvalidTokenCreate1()
     {
-        DateFormatParser.createDateTimeFormatter("ala");
+        assertThatThrownBy(() -> DateFormatParser.createDateTimeFormatter("ala"))
+                .isInstanceOf(TrinoException.class);
     }
 
-    @Test(expectedExceptions = TrinoException.class)
+    @Test
     public void testInvalidTokenCreate2()
     {
-        DateFormatParser.createDateTimeFormatter("yyym/mm/dd");
+        assertThatThrownBy(() -> DateFormatParser.createDateTimeFormatter("yyym/mm/dd"))
+                .isInstanceOf(TrinoException.class);
     }
 
     @Test
     public void testCreateDateTimeFormatter()
     {
         DateTimeFormatter formatter = DateFormatParser.createDateTimeFormatter("yyyy/mm/dd");
-        assertEquals(formatter.parseDateTime("1988/04/08"), new DateTime(1988, 4, 8, 0, 0));
+        assertEquals(new DateTime(1988, 4, 8, 0, 0), formatter.parseDateTime("1988/04/08"));
     }
 }
diff --git a/plugin/trino-thrift-api/pom.xml b/plugin/trino-thrift-api/pom.xml
index 63c55eebf51f..bfb08482f0e5 100644
--- a/plugin/trino-thrift-api/pom.xml
+++ b/plugin/trino-thrift-api/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-thrift-api</artifactId>
-    <description>Trino - Thrift Connector API</description>
     <packaging>jar</packaging>
+    <description>Trino - Thrift Connector API</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,8 +19,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
@@ -34,34 +39,27 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>stats</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>stats</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftBlock.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftBlock.java
index 7279ca56741c..dd77d85fd430 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftBlock.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftBlock.java
@@ -41,8 +41,7 @@
 import io.trino.spi.type.TimestampType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftColumnMetadata.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftColumnMetadata.java
index a6f1640f645d..7c25d650d8fb 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftColumnMetadata.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftColumnMetadata.java
@@ -18,8 +18,7 @@
 import io.airlift.drift.annotations.ThriftStruct;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.type.TypeManager;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableColumnSet.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableColumnSet.java
index 7bb6b1994ea6..1ff7d6327027 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableColumnSet.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableColumnSet.java
@@ -16,8 +16,7 @@
 import io.airlift.drift.annotations.ThriftConstructor;
 import io.airlift.drift.annotations.ThriftField;
 import io.airlift.drift.annotations.ThriftStruct;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 import java.util.Set;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableSchemaName.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableSchemaName.java
index 7216d42d8b18..c789b3159916 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableSchemaName.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableSchemaName.java
@@ -16,8 +16,7 @@
 import io.airlift.drift.annotations.ThriftConstructor;
 import io.airlift.drift.annotations.ThriftField;
 import io.airlift.drift.annotations.ThriftStruct;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableTableMetadata.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableTableMetadata.java
index e017fdd0397b..edaa2eb57c9f 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableTableMetadata.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableTableMetadata.java
@@ -16,8 +16,7 @@
 import io.airlift.drift.annotations.ThriftConstructor;
 import io.airlift.drift.annotations.ThriftField;
 import io.airlift.drift.annotations.ThriftStruct;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableToken.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableToken.java
index 9726a016a69c..d4bf886cc04f 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableToken.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftNullableToken.java
@@ -16,8 +16,7 @@
 import io.airlift.drift.annotations.ThriftConstructor;
 import io.airlift.drift.annotations.ThriftField;
 import io.airlift.drift.annotations.ThriftStruct;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftPageResult.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftPageResult.java
index f451d63fa3f8..d93adab16fbe 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftPageResult.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftPageResult.java
@@ -22,8 +22,7 @@
 import io.trino.spi.connector.RecordCursor;
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftSplitBatch.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftSplitBatch.java
index 82856f7745b3..8b0da515e307 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftSplitBatch.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftSplitBatch.java
@@ -16,8 +16,7 @@
 import io.airlift.drift.annotations.ThriftConstructor;
 import io.airlift.drift.annotations.ThriftField;
 import io.airlift.drift.annotations.ThriftStruct;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftTableMetadata.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftTableMetadata.java
index 8e75620c6922..7900c3085bdd 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftTableMetadata.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftTableMetadata.java
@@ -16,8 +16,7 @@
 import io.airlift.drift.annotations.ThriftConstructor;
 import io.airlift.drift.annotations.ThriftField;
 import io.airlift.drift.annotations.ThriftStruct;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftTupleDomain.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftTupleDomain.java
index 9175d99bf8c4..bb404de7992b 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftTupleDomain.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/TrinoThriftTupleDomain.java
@@ -17,8 +17,7 @@
 import io.airlift.drift.annotations.ThriftConstructor;
 import io.airlift.drift.annotations.ThriftField;
 import io.airlift.drift.annotations.ThriftStruct;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/SliceData.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/SliceData.java
index 7a620164c9ba..8bd273f7385b 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/SliceData.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/SliceData.java
@@ -19,8 +19,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.VariableWidthBlock;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftBigint.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftBigint.java
index e483bdff0a3d..3b5d301d7504 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftBigint.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftBigint.java
@@ -21,8 +21,7 @@
 import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftBigintArray.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftBigintArray.java
index 56874d0fed87..05f7db487ed2 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftBigintArray.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftBigintArray.java
@@ -17,14 +17,12 @@
 import io.airlift.drift.annotations.ThriftField;
 import io.airlift.drift.annotations.ThriftStruct;
 import io.trino.plugin.thrift.api.TrinoThriftBlock;
-import io.trino.spi.block.AbstractArrayBlock;
 import io.trino.spi.block.ArrayBlock;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Objects;
@@ -154,8 +152,8 @@ public static TrinoThriftBlock fromBlock(Block block)
             Arrays.fill(nulls, true);
             return bigintArrayData(new TrinoThriftBigintArray(nulls, null, null));
         }
-        checkArgument(block instanceof AbstractArrayBlock, "block is not of an array type");
-        AbstractArrayBlock arrayBlock = (AbstractArrayBlock) block;
+        checkArgument(block instanceof ArrayBlock, "block is not of an array type");
+        ArrayBlock arrayBlock = (ArrayBlock) block;
 
         boolean[] nulls = null;
         int[] sizes = null;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftBoolean.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftBoolean.java
index 156367323a6c..fd71e7dff297 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftBoolean.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftBoolean.java
@@ -20,8 +20,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.ByteArrayBlock;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftDate.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftDate.java
index d448279c49cb..76af0146ed01 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftDate.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftDate.java
@@ -21,8 +21,7 @@
 import io.trino.spi.block.IntArrayBlock;
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftDouble.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftDouble.java
index b0570260ddaf..7c2c49993d54 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftDouble.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftDouble.java
@@ -20,8 +20,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftHyperLogLog.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftHyperLogLog.java
index 3dac3c05a48e..ce9bc978b99f 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftHyperLogLog.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftHyperLogLog.java
@@ -19,8 +19,7 @@
 import io.trino.plugin.thrift.api.TrinoThriftBlock;
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftInteger.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftInteger.java
index c9d658f349f9..d27a34a7d68a 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftInteger.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftInteger.java
@@ -21,8 +21,7 @@
 import io.trino.spi.block.IntArrayBlock;
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftJson.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftJson.java
index a60b98b5bbb0..61aefc3bba2c 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftJson.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftJson.java
@@ -19,8 +19,7 @@
 import io.trino.plugin.thrift.api.TrinoThriftBlock;
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftTimestamp.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftTimestamp.java
index dbbb243f3326..c792e1dc12a3 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftTimestamp.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftTimestamp.java
@@ -21,8 +21,7 @@
 import io.trino.spi.block.LongArrayBlock;
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftVarchar.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftVarchar.java
index f72dc006b900..358f7d205366 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftVarchar.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/datatypes/TrinoThriftVarchar.java
@@ -20,8 +20,7 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/valuesets/TrinoThriftRangeValueSet.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/valuesets/TrinoThriftRangeValueSet.java
index 215cb2215dd9..faf432f3f13b 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/valuesets/TrinoThriftRangeValueSet.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/valuesets/TrinoThriftRangeValueSet.java
@@ -21,8 +21,7 @@
 import io.trino.plugin.thrift.api.TrinoThriftBlock;
 import io.trino.spi.predicate.Range;
 import io.trino.spi.predicate.SortedRangeSet;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/valuesets/TrinoThriftValueSet.java b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/valuesets/TrinoThriftValueSet.java
index 8741510796b8..0f8b47286bf1 100644
--- a/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/valuesets/TrinoThriftValueSet.java
+++ b/plugin/trino-thrift-api/src/main/java/io/trino/plugin/thrift/api/valuesets/TrinoThriftValueSet.java
@@ -20,8 +20,7 @@
 import io.trino.spi.predicate.EquatableValueSet;
 import io.trino.spi.predicate.SortedRangeSet;
 import io.trino.spi.predicate.ValueSet;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 
diff --git a/plugin/trino-thrift-api/src/test/java/io/trino/plugin/thrift/api/TestReadWrite.java b/plugin/trino-thrift-api/src/test/java/io/trino/plugin/thrift/api/TestReadWrite.java
index 56868d3f96f5..56c6a97cfac5 100644
--- a/plugin/trino-thrift-api/src/test/java/io/trino/plugin/thrift/api/TestReadWrite.java
+++ b/plugin/trino-thrift-api/src/test/java/io/trino/plugin/thrift/api/TestReadWrite.java
@@ -18,6 +18,7 @@
 import io.airlift.stats.cardinality.HyperLogLog;
 import io.trino.operator.index.PageRecordSet;
 import io.trino.spi.Page;
+import io.trino.spi.block.ArrayBlockBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.type.ArrayType;
@@ -242,16 +243,16 @@ private static Slice nextHyperLogLog(Random random)
     private static void generateBigintArray(Random random, BlockBuilder parentBuilder)
     {
         int numberOfElements = random.nextInt(MAX_ARRAY_GENERATED_LENGTH);
-        BlockBuilder builder = parentBuilder.beginBlockEntry();
-        for (int i = 0; i < numberOfElements; i++) {
-            if (random.nextDouble() < NULL_FRACTION) {
-                builder.appendNull();
-            }
-            else {
-                builder.writeLong(random.nextLong());
+        ((ArrayBlockBuilder) parentBuilder).buildEntry(elementBuilder -> {
+            for (int i = 0; i < numberOfElements; i++) {
+                if (random.nextDouble() < NULL_FRACTION) {
+                    elementBuilder.appendNull();
+                }
+                else {
+                    BIGINT.writeLong(elementBuilder, random.nextLong());
+                }
             }
-        }
-        parentBuilder.closeEntry();
+        });
     }
 
     private abstract static class ColumnDefinition
@@ -284,7 +285,7 @@ public IntegerColumn()
         @Override
         Object extractValue(Block block, int position)
         {
-            return INTEGER.getLong(block, position);
+            return INTEGER.getInt(block, position);
         }
 
         @Override
@@ -392,7 +393,7 @@ public DateColumn()
         @Override
         Object extractValue(Block block, int position)
         {
-            return DATE.getLong(block, position);
+            return DATE.getInt(block, position);
         }
 
         @Override
diff --git a/plugin/trino-thrift-api/src/test/java/io/trino/plugin/thrift/api/datatypes/TestTrinoThriftBigint.java b/plugin/trino-thrift-api/src/test/java/io/trino/plugin/thrift/api/datatypes/TestTrinoThriftBigint.java
index 8002605004cd..e41e35a5071b 100644
--- a/plugin/trino-thrift-api/src/test/java/io/trino/plugin/thrift/api/datatypes/TestTrinoThriftBigint.java
+++ b/plugin/trino-thrift-api/src/test/java/io/trino/plugin/thrift/api/datatypes/TestTrinoThriftBigint.java
@@ -174,7 +174,7 @@ private static Block longBlock(Integer... values)
                 blockBuilder.appendNull();
             }
             else {
-                blockBuilder.writeLong(value).closeEntry();
+                BIGINT.writeLong(blockBuilder, value);
             }
         }
         return blockBuilder.build();
diff --git a/plugin/trino-thrift-testing-server/pom.xml b/plugin/trino-thrift-testing-server/pom.xml
index 74770e23f81e..a717b257eb95 100644
--- a/plugin/trino-thrift-testing-server/pom.xml
+++ b/plugin/trino-thrift-testing-server/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-thrift-testing-server</artifactId>
-    <name>trino-thrift-testing-server</name>
     <description>Trino - Thrift Testing Server</description>
 
     <properties>
@@ -20,43 +19,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.assertj</groupId>
-                    <artifactId>assertj-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.testng</groupId>
-                    <artifactId>testng</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-thrift-api</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-tpch</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.tpch</groupId>
-            <artifactId>tpch</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -95,32 +69,50 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.assertj</groupId>
+                    <artifactId>assertj-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.testng</groupId>
+                    <artifactId>testng</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-thrift-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-tpch</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.trino.tpch</groupId>
+            <artifactId>tpch</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -133,4 +125,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-thrift-testing-server/src/main/java/io/trino/plugin/thrift/server/ThriftTpchService.java b/plugin/trino-thrift-testing-server/src/main/java/io/trino/plugin/thrift/server/ThriftTpchService.java
index b73b6ba0b1fa..3d7f753d855f 100644
--- a/plugin/trino-thrift-testing-server/src/main/java/io/trino/plugin/thrift/server/ThriftTpchService.java
+++ b/plugin/trino-thrift-testing-server/src/main/java/io/trino/plugin/thrift/server/ThriftTpchService.java
@@ -42,9 +42,8 @@
 import io.trino.tpch.TpchColumn;
 import io.trino.tpch.TpchEntity;
 import io.trino.tpch.TpchTable;
-
-import javax.annotation.Nullable;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PreDestroy;
 
 import java.io.Closeable;
 import java.util.ArrayList;
diff --git a/plugin/trino-thrift/pom.xml b/plugin/trino-thrift/pom.xml
index a07bd21ede09..5ad1af7bf99f 100644
--- a/plugin/trino-thrift/pom.xml
+++ b/plugin/trino-thrift/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-thrift</artifactId>
-    <description>Trino - Thrift Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - Thrift Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,18 +19,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-collect</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-thrift-api</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -66,6 +61,12 @@
         <dependency>
             <groupId>io.airlift.drift</groupId>
             <artifactId>drift-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>validation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -79,29 +80,34 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-transport-spi</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-cache</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-thrift-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -109,7 +115,42 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>log</artifactId>
@@ -128,32 +169,24 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-server</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -192,14 +225,14 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-server</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -209,4 +242,39 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <configuration>
+                        <ignoredNonTestScopedDependencies>
+                            <ignoredNonTestScopedDependency>io.airlift.drift:drift-transport-spi</ignoredNonTestScopedDependency>
+                        </ignoredNonTestScopedDependencies>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftColumnHandle.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftColumnHandle.java
index ec1a9b62a0b4..3e9d1779aa71 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftColumnHandle.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftColumnHandle.java
@@ -18,8 +18,7 @@
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftConnector.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftConnector.java
index 699a2b19aaae..c7362c3456a6 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftConnector.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftConnector.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.thrift;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorIndexProvider;
@@ -25,8 +26,6 @@
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftConnectorConfig.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftConnectorConfig.java
index 510c15199134..5f7c972d099b 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftConnectorConfig.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftConnectorConfig.java
@@ -17,9 +17,8 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.MaxDataSize;
 import io.airlift.units.MinDataSize;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftConnectorFactory.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftConnectorFactory.java
index c459f1a7060c..d7654ad68b5a 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftConnectorFactory.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftConnectorFactory.java
@@ -28,7 +28,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class ThriftConnectorFactory
@@ -52,7 +52,7 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(
                 new MBeanModule(),
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftIndexPageSource.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftIndexPageSource.java
index 36ead2d164ee..318ece1ad96c 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftIndexPageSource.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftIndexPageSource.java
@@ -29,8 +29,7 @@
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.RecordSet;
 import io.trino.spi.type.Type;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftIndexProvider.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftIndexProvider.java
index a72b3001ce27..a2a4b8cecd0a 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftIndexProvider.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftIndexProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.thrift;
 
+import com.google.inject.Inject;
 import io.airlift.drift.client.DriftClient;
 import io.trino.plugin.thrift.api.TrinoThriftService;
 import io.trino.spi.connector.ColumnHandle;
@@ -22,8 +23,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftMetadata.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftMetadata.java
index 1ab22188272e..edaf3290ff33 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftMetadata.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftMetadata.java
@@ -17,10 +17,11 @@
 import com.google.common.cache.CacheLoader;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
 import io.airlift.drift.TException;
 import io.airlift.drift.client.DriftClient;
 import io.airlift.units.Duration;
-import io.trino.collect.cache.NonEvictableLoadingCache;
+import io.trino.cache.NonEvictableLoadingCache;
 import io.trino.plugin.thrift.annotations.ForMetadataRefresh;
 import io.trino.plugin.thrift.api.TrinoThriftNullableSchemaName;
 import io.trino.plugin.thrift.api.TrinoThriftNullableTableMetadata;
@@ -46,8 +47,6 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.TypeManager;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -58,7 +57,7 @@
 import static com.google.common.cache.CacheLoader.asyncReloading;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static io.trino.collect.cache.SafeCaches.buildNonEvictableCache;
+import static io.trino.cache.SafeCaches.buildNonEvictableCache;
 import static io.trino.plugin.thrift.ThriftErrorCode.THRIFT_SERVICE_INVALID_RESPONSE;
 import static io.trino.plugin.thrift.util.ThriftExceptions.toTrinoException;
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftModule.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftModule.java
index 32388bbda4e5..3531b4bd7b62 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftModule.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftModule.java
@@ -17,14 +17,13 @@
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import io.airlift.drift.client.ExceptionClassification;
 import io.airlift.drift.client.ExceptionClassification.HostStatus;
 import io.trino.plugin.thrift.annotations.ForMetadataRefresh;
 import io.trino.plugin.thrift.api.TrinoThriftService;
 import io.trino.plugin.thrift.api.TrinoThriftServiceException;
 
-import javax.inject.Singleton;
-
 import java.util.Optional;
 import java.util.concurrent.Executor;
 
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftPageSourceProvider.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftPageSourceProvider.java
index 823aafd755b6..508c959bd6c7 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftPageSourceProvider.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftPageSourceProvider.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.thrift;
 
+import com.google.inject.Inject;
 import io.airlift.drift.client.DriftClient;
 import io.trino.plugin.thrift.api.TrinoThriftService;
 import io.trino.spi.connector.ColumnHandle;
@@ -24,8 +25,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.DynamicFilter;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftSplitManager.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftSplitManager.java
index 38895ca4ccf9..6691d1300b6d 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftSplitManager.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/ThriftSplitManager.java
@@ -15,7 +15,9 @@
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.airlift.drift.client.DriftClient;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.plugin.thrift.api.TrinoThriftHostAddress;
 import io.trino.plugin.thrift.api.TrinoThriftId;
 import io.trino.plugin.thrift.api.TrinoThriftNullableColumnSet;
@@ -36,9 +38,6 @@
 import io.trino.spi.connector.Constraint;
 import io.trino.spi.connector.DynamicFilter;
 
-import javax.annotation.concurrent.NotThreadSafe;
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/annotations/ForMetadataRefresh.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/annotations/ForMetadataRefresh.java
index 22f2460203f6..8940a3014bdf 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/annotations/ForMetadataRefresh.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/annotations/ForMetadataRefresh.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.thrift.annotations;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({PARAMETER, METHOD, FIELD})
-@Qualifier
+@BindingAnnotation
 public @interface ForMetadataRefresh
 {
 }
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/location/ExtendedSimpleAddressSelector.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/location/ExtendedSimpleAddressSelector.java
index b6c2fe238eea..d2cb7094e876 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/location/ExtendedSimpleAddressSelector.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/location/ExtendedSimpleAddressSelector.java
@@ -14,7 +14,6 @@
 package io.trino.plugin.thrift.location;
 
 import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.net.HostAndPort;
 import io.airlift.drift.client.address.AddressSelector;
 import io.airlift.drift.client.address.SimpleAddressSelector.SimpleAddress;
@@ -36,12 +35,6 @@ public ExtendedSimpleAddressSelector(AddressSelector<SimpleAddress> delegate)
         this.delegate = requireNonNull(delegate, "delegate is null");
     }
 
-    @Override
-    public Optional<SimpleAddress> selectAddress(Optional<String> context)
-    {
-        return selectAddress(context, ImmutableSet.of());
-    }
-
     @Override
     public Optional<SimpleAddress> selectAddress(Optional<String> context, Set<SimpleAddress> attempted)
     {
diff --git a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/location/ExtendedSimpleAddressSelectorBinder.java b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/location/ExtendedSimpleAddressSelectorBinder.java
index ee30cb3e12d3..757330a4ef1d 100644
--- a/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/location/ExtendedSimpleAddressSelectorBinder.java
+++ b/plugin/trino-thrift/src/main/java/io/trino/plugin/thrift/location/ExtendedSimpleAddressSelectorBinder.java
@@ -21,6 +21,7 @@
 import io.airlift.drift.client.address.SimpleAddressSelectorConfig;
 import io.airlift.drift.client.guice.AbstractAnnotatedProvider;
 import io.airlift.drift.client.guice.AddressSelectorBinder;
+import io.airlift.drift.transport.client.Address;
 
 import java.lang.annotation.Annotation;
 
@@ -45,7 +46,7 @@ public void bind(Binder binder, Annotation annotation, String prefix)
     }
 
     private static class ExtendedSimpleAddressSelectorProvider
-            extends AbstractAnnotatedProvider<AddressSelector<?>>
+            extends AbstractAnnotatedProvider<AddressSelector<? extends Address>>
     {
         public ExtendedSimpleAddressSelectorProvider(Annotation annotation)
         {
@@ -53,7 +54,7 @@ public ExtendedSimpleAddressSelectorProvider(Annotation annotation)
         }
 
         @Override
-        protected AddressSelector<?> get(Injector injector, Annotation annotation)
+        protected AddressSelector<? extends Address> get(Injector injector, Annotation annotation)
         {
             return new ExtendedSimpleAddressSelector(new SimpleAddressSelector(
                     injector.getInstance(Key.get(SimpleAddressSelectorConfig.class, annotation))));
diff --git a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftConnectorConfig.java b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftConnectorConfig.java
index bb5ab374b39c..63603f5d3efb 100644
--- a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftConnectorConfig.java
+++ b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftConnectorConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftIndexPageSource.java b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftIndexPageSource.java
index c07de8ad467e..1176b83a65e8 100644
--- a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftIndexPageSource.java
+++ b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftIndexPageSource.java
@@ -36,7 +36,7 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftPlugin.java b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftPlugin.java
index 9f2e0460f266..234c1114cf6a 100644
--- a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftPlugin.java
+++ b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftPlugin.java
@@ -18,7 +18,7 @@
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftConnectorTest.java b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftConnectorTest.java
index 3cec4019dfa3..922894af3c44 100644
--- a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftConnectorTest.java
+++ b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftConnectorTest.java
@@ -18,7 +18,7 @@
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.thrift.integration.ThriftQueryRunner.createThriftQueryRunner;
 import static io.trino.spi.type.VarcharType.VARCHAR;
@@ -27,37 +27,29 @@
 public class TestThriftConnectorTest
         extends BaseConnectorTest
 {
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE:
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN:
-            case SUPPORTS_RENAME_COLUMN:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_INSERT:
-            case SUPPORTS_NOT_NULL_CONSTRAINT:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_INSERT,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_NOT_NULL_CONSTRAINT,
+                    SUPPORTS_RENAME_COLUMN,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Override
diff --git a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftDistributedQueriesIndexed.java b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftDistributedQueriesIndexed.java
index f51a48346500..722d45d44b09 100644
--- a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftDistributedQueriesIndexed.java
+++ b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftDistributedQueriesIndexed.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestIndexedQueries;
 import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.thrift.integration.ThriftQueryRunner.createThriftQueryRunner;
 
@@ -29,6 +30,7 @@ protected QueryRunner createQueryRunner()
         return createThriftQueryRunner(2, true, ImmutableMap.of());
     }
 
+    @Test
     @Override
     public void testExampleSystemTable()
     {
diff --git a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftProjectionPushdown.java b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftProjectionPushdown.java
index 723f1f092df9..ba4a5113669d 100644
--- a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftProjectionPushdown.java
+++ b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/TestThriftProjectionPushdown.java
@@ -35,8 +35,9 @@
 import io.trino.sql.planner.plan.Assignments;
 import io.trino.sql.tree.SymbolReference;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.util.List;
@@ -53,7 +54,9 @@
 import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestThriftProjectionPushdown
         extends BaseRuleTest
 {
@@ -98,7 +101,7 @@ protected Optional<LocalQueryRunner> createLocalQueryRunner()
         return Optional.of(runner);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void cleanup()
     {
         if (servers != null) {
@@ -169,6 +172,7 @@ public void testProjectionPushdown()
                 Optional.of(ImmutableSet.of(columnHandle)));
 
         tester().assertThat(pushProjectionIntoTableScan)
+                .withSession(SESSION)
                 .on(p -> {
                     Symbol orderStatusSymbol = p.symbol(columnName, VARCHAR);
                     return p.project(
@@ -180,7 +184,6 @@ public void testProjectionPushdown()
                                     ImmutableList.of(orderStatusSymbol),
                                     ImmutableMap.of(orderStatusSymbol, columnHandle)));
                 })
-                .withSession(SESSION)
                 .matches(project(
                         ImmutableMap.of("expr_2", expression(new SymbolReference(columnName))),
                         tableScan(
@@ -198,6 +201,7 @@ public void testPruneColumns()
         ThriftColumnHandle nameColumn = new ThriftColumnHandle("name", VARCHAR, "", false);
 
         tester().assertThat(rule)
+                .withSession(SESSION)
                 .on(p -> {
                     Symbol nationKey = p.symbol(nationKeyColumn.getColumnName(), VARCHAR);
                     Symbol name = p.symbol(nameColumn.getColumnName(), VARCHAR);
@@ -213,7 +217,6 @@ public void testPruneColumns()
                                             .put(name, nameColumn)
                                             .buildOrThrow()));
                 })
-                .withSession(SESSION)
                 .matches(project(
                         ImmutableMap.of("expr", expression(new SymbolReference(nationKeyColumn.getColumnName()))),
                         tableScan(
diff --git a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/ThriftQueryRunner.java b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/ThriftQueryRunner.java
index 3fa5c76f7a89..c1890f3cfb78 100644
--- a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/ThriftQueryRunner.java
+++ b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/integration/ThriftQueryRunner.java
@@ -31,6 +31,7 @@
 import io.trino.execution.FailureInjector.InjectedFailureType;
 import io.trino.metadata.FunctionBundle;
 import io.trino.metadata.FunctionManager;
+import io.trino.metadata.LanguageFunctionManager;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.SessionPropertyManager;
@@ -246,6 +247,12 @@ public FunctionManager getFunctionManager()
             return source.getFunctionManager();
         }
 
+        @Override
+        public LanguageFunctionManager getLanguageFunctionManager()
+        {
+            return source.getLanguageFunctionManager();
+        }
+
         @Override
         public SplitManager getSplitManager()
         {
diff --git a/plugin/trino-tpcds/pom.xml b/plugin/trino-tpcds/pom.xml
index d976c99c5341..f405cb30be41 100644
--- a/plugin/trino-tpcds/pom.xml
+++ b/plugin/trino-tpcds/pom.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-tpcds</artifactId>
-    <description>Trino - TPC-DS Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - TPC-DS Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,13 +18,23 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.tpcds</groupId>
-            <artifactId>tpcds</artifactId>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -38,41 +48,61 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jdk8</artifactId>
+            <groupId>io.trino.tpcds</groupId>
+            <artifactId>tpcds</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- used by tests but also needed transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>log</artifactId>
@@ -85,32 +115,24 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Trino SPI -->
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
+            <artifactId>bytecode</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>joni</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jol</groupId>
-            <artifactId>jol-core</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -137,26 +159,20 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bytecode</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>joni</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsConfig.java b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsConfig.java
index 2089fb36c81a..ee068000c926 100644
--- a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsConfig.java
+++ b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsConfig.java
@@ -15,8 +15,7 @@
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Min;
 
 public class TpcdsConfig
 {
diff --git a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsConnector.java b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsConnector.java
index 09b1ab99ee96..d60232d41ac1 100644
--- a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsConnector.java
+++ b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsConnector.java
@@ -13,6 +13,8 @@
  */
 package io.trino.plugin.tpcds;
 
+import com.google.inject.Inject;
+import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorNodePartitioningProvider;
@@ -23,8 +25,6 @@
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static java.util.Objects.requireNonNull;
@@ -32,6 +32,7 @@
 public class TpcdsConnector
         implements Connector
 {
+    private final LifeCycleManager lifeCycleManager;
     private final TpcdsMetadata metadata;
     private final TpcdsSplitManager splitManager;
     private final TpcdsRecordSetProvider recordSetProvider;
@@ -40,12 +41,14 @@ public class TpcdsConnector
 
     @Inject
     public TpcdsConnector(
+            LifeCycleManager lifeCycleManager,
             TpcdsMetadata metadata,
             TpcdsSplitManager splitManager,
             TpcdsRecordSetProvider recordSetProvider,
             TpcdsNodePartitioningProvider nodePartitioningProvider,
             TpcdsSessionProperties sessionProperties)
     {
+        this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null");
         this.metadata = requireNonNull(metadata, "metadata is null");
         this.splitManager = requireNonNull(splitManager, "splitManager is null");
         this.recordSetProvider = requireNonNull(recordSetProvider, "recordSetProvider is null");
@@ -88,4 +91,10 @@ public List<PropertyMetadata<?>> getSessionProperties()
     {
         return sessionProperties.getSessionProperties();
     }
+
+    @Override
+    public void shutdown()
+    {
+        lifeCycleManager.stop();
+    }
 }
diff --git a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsConnectorFactory.java b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsConnectorFactory.java
index 9a0707ea7d7f..f7e2c8c5c02e 100644
--- a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsConnectorFactory.java
+++ b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsConnectorFactory.java
@@ -21,7 +21,7 @@
 
 import java.util.Map;
 
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 
 public class TpcdsConnectorFactory
         implements ConnectorFactory
@@ -35,7 +35,7 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
     {
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         Bootstrap app = new Bootstrap(new TpcdsModule(context.getNodeManager()));
 
diff --git a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsNodePartitioningProvider.java b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsNodePartitioningProvider.java
index 687f49d62451..13b378655f46 100644
--- a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsNodePartitioningProvider.java
+++ b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsNodePartitioningProvider.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.tpcds;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.Node;
 import io.trino.spi.NodeManager;
 import io.trino.spi.connector.BucketFunction;
@@ -25,8 +26,6 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.type.Type;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
diff --git a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsSessionProperties.java b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsSessionProperties.java
index 13eff693170e..a45a280d3ffd 100644
--- a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsSessionProperties.java
+++ b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsSessionProperties.java
@@ -14,11 +14,10 @@
 package io.trino.plugin.tpcds;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.session.PropertyMetadata;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.OptionalInt;
 
diff --git a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsSplitManager.java b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsSplitManager.java
index 90fbeaa231e9..9a0de3ace9e0 100644
--- a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsSplitManager.java
+++ b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsSplitManager.java
@@ -14,6 +14,7 @@
 package io.trino.plugin.tpcds;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.spi.Node;
 import io.trino.spi.NodeManager;
 import io.trino.spi.connector.ConnectorSession;
@@ -26,8 +27,6 @@
 import io.trino.spi.connector.DynamicFilter;
 import io.trino.spi.connector.FixedSplitSource;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Set;
 
diff --git a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/EstimateAssertion.java b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/EstimateAssertion.java
index d907b4a9a035..d5ef5b860dfc 100644
--- a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/EstimateAssertion.java
+++ b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/EstimateAssertion.java
@@ -20,7 +20,8 @@
 import java.util.Optional;
 
 import static java.lang.String.format;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.withinPercentage;
 
 class EstimateAssertion
 {
@@ -45,7 +46,9 @@ public void assertClose(Optional<?> actual, Optional<?> expected, String compare
     {
         if (actual.isPresent() != expected.isPresent()) {
             // Trigger exception message that includes compared values
-            assertEquals(actual, expected, comparedValue);
+            assertThat(actual)
+                    .describedAs(comparedValue)
+                    .isEqualTo(expected);
         }
         if (actual.isPresent()) {
             Object actualValue = actual.get();
@@ -57,13 +60,17 @@ public void assertClose(Optional<?> actual, Optional<?> expected, String compare
     private void assertClose(Object actual, Object expected, String comparedValue)
     {
         if (actual instanceof Slice) {
-            assertEquals(actual.getClass(), expected.getClass(), comparedValue);
-            assertEquals(((Slice) actual).toStringUtf8(), ((Slice) expected).toStringUtf8());
+            assertThat(actual.getClass())
+                    .describedAs(comparedValue)
+                    .isEqualTo(expected.getClass());
+            assertThat(((Slice) actual).toStringUtf8())
+                    .isEqualTo(((Slice) expected).toStringUtf8());
         }
         else {
             double actualDouble = toDouble(actual);
             double expectedDouble = toDouble(expected);
-            assertEquals(actualDouble, expectedDouble, expectedDouble * tolerance, comparedValue);
+            assertThat(actualDouble)
+                    .isCloseTo(expectedDouble, withinPercentage(tolerance * 100));
         }
     }
 
diff --git a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcds.java b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcds.java
index 5e604f041121..5116058c2841 100644
--- a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcds.java
+++ b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcds.java
@@ -17,7 +17,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.time.LocalTime;
diff --git a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsConfig.java b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsConfig.java
index 6a63f6161cae..269b4f5cde98 100644
--- a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsConfig.java
+++ b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.tpcds;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsMetadata.java b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsMetadata.java
index 36daad9921b5..00fb3cad354f 100644
--- a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsMetadata.java
+++ b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsMetadata.java
@@ -14,10 +14,9 @@
 package io.trino.plugin.tpcds;
 
 import io.trino.spi.connector.ConnectorSession;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTpcdsMetadata
 {
@@ -27,11 +26,11 @@ public class TestTpcdsMetadata
     @Test
     public void testHiddenSchemas()
     {
-        assertTrue(tpcdsMetadata.schemaExists(session, "sf1"));
-        assertTrue(tpcdsMetadata.schemaExists(session, "sf3000.0"));
-        assertFalse(tpcdsMetadata.schemaExists(session, "sf0"));
-        assertFalse(tpcdsMetadata.schemaExists(session, "hf1"));
-        assertFalse(tpcdsMetadata.schemaExists(session, "sf"));
-        assertFalse(tpcdsMetadata.schemaExists(session, "sfabc"));
+        assertThat(tpcdsMetadata.schemaExists(session, "sf1")).isTrue();
+        assertThat(tpcdsMetadata.schemaExists(session, "sf3000.0")).isTrue();
+        assertThat(tpcdsMetadata.schemaExists(session, "sf0")).isFalse();
+        assertThat(tpcdsMetadata.schemaExists(session, "hf1")).isFalse();
+        assertThat(tpcdsMetadata.schemaExists(session, "sf")).isFalse();
+        assertThat(tpcdsMetadata.schemaExists(session, "sfabc")).isFalse();
     }
 }
diff --git a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsMetadataStatistics.java b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsMetadataStatistics.java
index 2d58c529a389..c65dec50f9cb 100644
--- a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsMetadataStatistics.java
+++ b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsMetadataStatistics.java
@@ -25,15 +25,12 @@
 import io.trino.tpcds.Table;
 import io.trino.tpcds.column.CallCenterColumn;
 import io.trino.tpcds.column.WebSiteColumn;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.stream.Stream;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTpcdsMetadataStatistics
 {
@@ -50,8 +47,8 @@ public void testNoTableStatsForNotSupportedSchema()
                             SchemaTableName schemaTableName = new SchemaTableName(schemaName, table.getName());
                             ConnectorTableHandle tableHandle = metadata.getTableHandle(session, schemaTableName);
                             TableStatistics tableStatistics = metadata.getTableStatistics(session, tableHandle);
-                            assertTrue(tableStatistics.getRowCount().isUnknown());
-                            assertTrue(tableStatistics.getColumnStatistics().isEmpty());
+                            assertThat(tableStatistics.getRowCount().isUnknown()).isTrue();
+                            assertThat(tableStatistics.getColumnStatistics().isEmpty()).isTrue();
                         }));
     }
 
@@ -64,10 +61,10 @@ public void testTableStatsExistenceSupportedSchema()
                             SchemaTableName schemaTableName = new SchemaTableName(schemaName, table.getName());
                             ConnectorTableHandle tableHandle = metadata.getTableHandle(session, schemaTableName);
                             TableStatistics tableStatistics = metadata.getTableStatistics(session, tableHandle);
-                            assertFalse(tableStatistics.getRowCount().isUnknown());
+                            assertThat(tableStatistics.getRowCount().isUnknown()).isFalse();
                             for (ColumnHandle column : metadata.getColumnHandles(session, tableHandle).values()) {
-                                assertTrue(tableStatistics.getColumnStatistics().containsKey(column));
-                                assertNotNull(tableStatistics.getColumnStatistics().get(column));
+                                assertThat(tableStatistics.getColumnStatistics().containsKey(column)).isTrue();
+                                assertThat(tableStatistics.getColumnStatistics().get(column)).isNotNull();
                             }
                         }));
     }
@@ -84,8 +81,8 @@ public void testTableStatsDetails()
         // all columns have stats
         Map<String, ColumnHandle> columnHandles = metadata.getColumnHandles(session, tableHandle);
         for (ColumnHandle column : columnHandles.values()) {
-            assertTrue(tableStatistics.getColumnStatistics().containsKey(column));
-            assertNotNull(tableStatistics.getColumnStatistics().get(column));
+            assertThat(tableStatistics.getColumnStatistics().containsKey(column)).isTrue();
+            assertThat(tableStatistics.getColumnStatistics().get(column)).isNotNull();
         }
 
         // identifier
@@ -166,6 +163,6 @@ private void assertColumnStatistics(ColumnStatistics actual, ColumnStatistics ex
         estimateAssertion.assertClose(actual.getNullsFraction(), expected.getNullsFraction(), "Nulls fraction");
         estimateAssertion.assertClose(actual.getDataSize(), expected.getDataSize(), "Data size");
         estimateAssertion.assertClose(actual.getDistinctValuesCount(), expected.getDistinctValuesCount(), "Distinct values count");
-        assertEquals(actual.getRange(), expected.getRange());
+        assertThat(actual.getRange()).isEqualTo(expected.getRange());
     }
 }
diff --git a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/statistics/TestTpcdsLocalStats.java b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/statistics/TestTpcdsLocalStats.java
index 2a7ef0ee84b2..69240dde8620 100644
--- a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/statistics/TestTpcdsLocalStats.java
+++ b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/statistics/TestTpcdsLocalStats.java
@@ -17,9 +17,10 @@
 import io.trino.plugin.tpcds.TpcdsConnectorFactory;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.statistics.StatisticsAssertion;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.SystemSessionProperties.COLLECT_PLAN_STATISTICS_FOR_ALL_QUERIES;
 import static io.trino.testing.TestingSession.testSessionBuilder;
@@ -30,12 +31,14 @@
 import static io.trino.testing.statistics.Metrics.OUTPUT_ROW_COUNT;
 import static io.trino.testing.statistics.Metrics.distinctValuesCount;
 import static java.util.Collections.emptyMap;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestTpcdsLocalStats
 {
     private StatisticsAssertion statisticsAssertion;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         Session defaultSession = testSessionBuilder()
@@ -50,7 +53,7 @@ public void setUp()
         statisticsAssertion = new StatisticsAssertion(queryRunner);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         statisticsAssertion.close();
diff --git a/plugin/trino-tpch/pom.xml b/plugin/trino-tpch/pom.xml
index c4dd5682132c..4c832a619ab4 100644
--- a/plugin/trino-tpch/pom.xml
+++ b/plugin/trino-tpch/pom.xml
@@ -1,32 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-tpch</artifactId>
-    <description>Trino - TPC-H Connector</description>
     <packaging>trino-plugin</packaging>
+    <description>Trino - TPC-H Connector</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino.tpch</groupId>
-            <artifactId>tpch</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -42,10 +32,19 @@
             <artifactId>guava</artifactId>
         </dependency>
 
-        <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino.tpch</groupId>
+            <artifactId>tpch</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -56,8 +55,20 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -67,10 +78,27 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchConnectorFactory.java b/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchConnectorFactory.java
index 9b8e18211eb8..ec06eecfaefc 100644
--- a/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchConnectorFactory.java
+++ b/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchConnectorFactory.java
@@ -30,7 +30,7 @@
 import java.util.Optional;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.lang.Boolean.FALSE;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
@@ -76,7 +76,7 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> properties, ConnectorContext context)
     {
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         int splitsPerNode = getSplitsPerNode(properties);
         ColumnNaming columnNaming = ColumnNaming.valueOf(properties.getOrDefault(TPCH_COLUMN_NAMING_PROPERTY, ColumnNaming.SIMPLIFIED.name()).toUpperCase(ENGLISH));
diff --git a/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchMetadata.java b/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchMetadata.java
index 03f3cddc6393..f529842f0c0e 100644
--- a/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchMetadata.java
+++ b/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchMetadata.java
@@ -422,7 +422,6 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
         TpchTableHandle tableHandle = (TpchTableHandle) table;
 
         Optional<ConnectorTablePartitioning> tablePartitioning = Optional.empty();
-        Optional<Set<ColumnHandle>> partitioningColumns = Optional.empty();
         List<LocalProperty<ColumnHandle>> localProperties = ImmutableList.of();
 
         Map<String, ColumnHandle> columns = getColumnHandles(session, tableHandle);
@@ -432,8 +431,8 @@ public ConnectorTableProperties getTableProperties(ConnectorSession session, Con
                     new TpchPartitioningHandle(
                             TpchTable.ORDERS.getTableName(),
                             calculateTotalRows(OrderGenerator.SCALE_BASE, tableHandle.getScaleFactor())),
-                    ImmutableList.of(orderKeyColumn)));
-            partitioningColumns = Optional.of(ImmutableSet.of(orderKeyColumn));
+                    ImmutableList.of(orderKeyColumn),
+                    true));
             localProperties = ImmutableList.of(new SortingProperty<>(orderKeyColumn, SortOrder.ASC_NULLS_FIRST));
         }
         else if (partitioningEnabled && tableHandle.getTableName().equals(TpchTable.LINE_ITEM.getTableName())) {
@@ -442,8 +441,8 @@ else if (partitioningEnabled && tableHandle.getTableName().equals(TpchTable.LINE
                     new TpchPartitioningHandle(
                             TpchTable.ORDERS.getTableName(),
                             calculateTotalRows(OrderGenerator.SCALE_BASE, tableHandle.getScaleFactor())),
-                    ImmutableList.of(orderKeyColumn)));
-            partitioningColumns = Optional.of(ImmutableSet.of(orderKeyColumn));
+                    ImmutableList.of(orderKeyColumn),
+                    true));
             localProperties = ImmutableList.of(
                     new SortingProperty<>(orderKeyColumn, SortOrder.ASC_NULLS_FIRST),
                     new SortingProperty<>(columns.get(columnNaming.getName(LineItemColumn.LINE_NUMBER)), SortOrder.ASC_NULLS_FIRST));
@@ -466,7 +465,6 @@ else if (tableHandle.getTableName().equals(TpchTable.PART.getTableName())) {
         return new ConnectorTableProperties(
                 constraint,
                 tablePartitioning,
-                partitioningColumns,
                 Optional.empty(),
                 localProperties);
     }
diff --git a/plugin/trino-tpch/src/test/java/io/trino/plugin/tpch/EstimateAssertion.java b/plugin/trino-tpch/src/test/java/io/trino/plugin/tpch/EstimateAssertion.java
index d60af4f2c931..3cd9c237290a 100644
--- a/plugin/trino-tpch/src/test/java/io/trino/plugin/tpch/EstimateAssertion.java
+++ b/plugin/trino-tpch/src/test/java/io/trino/plugin/tpch/EstimateAssertion.java
@@ -20,7 +20,8 @@
 import java.util.Optional;
 
 import static java.lang.String.format;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.withinPercentage;
 
 class EstimateAssertion
 {
@@ -45,7 +46,9 @@ public void assertClose(Optional<?> actual, Optional<?> expected, String compare
     {
         if (actual.isPresent() != expected.isPresent()) {
             // Trigger exception message that includes compared values
-            assertEquals(actual, expected, comparedValue);
+            assertThat(actual)
+                    .describedAs(comparedValue)
+                    .isEqualTo(expected);
         }
         if (actual.isPresent()) {
             Object actualValue = actual.get();
@@ -57,8 +60,11 @@ public void assertClose(Optional<?> actual, Optional<?> expected, String compare
     private void assertClose(Object actual, Object expected, String comparedValue)
     {
         if (actual instanceof Slice actualSlice) {
-            assertEquals(actual.getClass(), expected.getClass(), comparedValue);
-            assertEquals(actualSlice.toStringUtf8(), ((Slice) expected).toStringUtf8());
+            assertThat(actual.getClass())
+                    .describedAs(comparedValue)
+                    .isEqualTo(expected.getClass());
+            assertThat(((Slice) actual).toStringUtf8())
+                    .isEqualTo(((Slice) expected).toStringUtf8());
         }
         else if (actual instanceof DoubleRange actualRange) {
             DoubleRange expectedRange = (DoubleRange) expected;
@@ -68,7 +74,8 @@ else if (actual instanceof DoubleRange actualRange) {
         else {
             double actualDouble = toDouble(actual);
             double expectedDouble = toDouble(expected);
-            assertEquals(actualDouble, expectedDouble, expectedDouble * tolerance, comparedValue);
+            assertThat(actualDouble)
+                    .isCloseTo(expectedDouble, withinPercentage(tolerance * 100));
         }
     }
 
diff --git a/plugin/trino-tpch/src/test/java/io/trino/plugin/tpch/TestTpchMetadata.java b/plugin/trino-tpch/src/test/java/io/trino/plugin/tpch/TestTpchMetadata.java
index 98fb17c351a4..0a64b046b0b6 100644
--- a/plugin/trino-tpch/src/test/java/io/trino/plugin/tpch/TestTpchMetadata.java
+++ b/plugin/trino-tpch/src/test/java/io/trino/plugin/tpch/TestTpchMetadata.java
@@ -32,7 +32,7 @@
 import io.trino.tpch.PartColumn;
 import io.trino.tpch.TpchColumn;
 import io.trino.tpch.TpchTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -70,10 +70,8 @@
 import static java.util.Arrays.stream;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.withinPercentage;
 
 public class TestTpchMetadata
 {
@@ -150,19 +148,19 @@ private void testGetTableMetadata(String schema, TpchTable<?> table)
     {
         TpchTableHandle tableHandle = tpchMetadata.getTableHandle(session, new SchemaTableName(schema, table.getTableName()));
         ConnectorTableMetadata tableMetadata = tpchMetadata.getTableMetadata(session, tableHandle);
-        assertEquals(tableMetadata.getTableSchema().getTable().getTableName(), table.getTableName());
-        assertEquals(tableMetadata.getTableSchema().getTable().getSchemaName(), schema);
+        assertThat(tableMetadata.getTableSchema().getTable().getTableName()).isEqualTo(table.getTableName());
+        assertThat(tableMetadata.getTableSchema().getTable().getSchemaName()).isEqualTo(schema);
     }
 
     @Test
     public void testHiddenSchemas()
     {
-        assertTrue(tpchMetadata.schemaExists(session, "sf1"));
-        assertTrue(tpchMetadata.schemaExists(session, "sf3000.0"));
-        assertFalse(tpchMetadata.schemaExists(session, "sf0"));
-        assertFalse(tpchMetadata.schemaExists(session, "hf1"));
-        assertFalse(tpchMetadata.schemaExists(session, "sf"));
-        assertFalse(tpchMetadata.schemaExists(session, "sfabc"));
+        assertThat(tpchMetadata.schemaExists(session, "sf1")).isTrue();
+        assertThat(tpchMetadata.schemaExists(session, "sf3000.0")).isTrue();
+        assertThat(tpchMetadata.schemaExists(session, "sf0")).isFalse();
+        assertThat(tpchMetadata.schemaExists(session, "hf1")).isFalse();
+        assertThat(tpchMetadata.schemaExists(session, "sf")).isFalse();
+        assertThat(tpchMetadata.schemaExists(session, "sfabc")).isFalse();
     }
 
     private void testTableStats(String schema, TpchTable<?> table, double expectedRowCount)
@@ -180,15 +178,16 @@ private void testTableStats(String schema, TpchTable<?> table, Constraint constr
         TableStatistics tableStatistics = tpchMetadata.getTableStatistics(session, tableHandle);
 
         double actualRowCountValue = tableStatistics.getRowCount().getValue();
-        assertEquals(tableStatistics.getRowCount(), Estimate.of(actualRowCountValue));
-        assertEquals(actualRowCountValue, expectedRowCount, expectedRowCount * TOLERANCE);
+        assertThat(tableStatistics.getRowCount()).isEqualTo(Estimate.of(actualRowCountValue));
+        assertThat(actualRowCountValue)
+                .isCloseTo(expectedRowCount, withinPercentage(TOLERANCE * 100));
     }
 
     private void testNoTableStats(String schema, TpchTable<?> table)
     {
         TpchTableHandle tableHandle = tpchMetadata.getTableHandle(session, new SchemaTableName(schema, table.getTableName()));
         TableStatistics tableStatistics = tpchMetadata.getTableStatistics(session, tableHandle);
-        assertTrue(tableStatistics.getRowCount().isUnknown());
+        assertThat(tableStatistics.getRowCount().isUnknown()).isTrue();
     }
 
     @Test
@@ -405,7 +404,7 @@ private Predicate<Map<ColumnHandle, NullableValue>> convertToPredicate(TupleDoma
     private void assertTupleDomainEquals(TupleDomain<?> actual, TupleDomain<?> expected, ConnectorSession session)
     {
         if (!Objects.equals(actual, expected)) {
-            fail(format("expected [%s] but found [%s]", expected.toString(session), actual.toString(session)));
+            throw new AssertionError(format("expected [%s] but found [%s]", expected.toString(session), actual.toString(session)));
         }
     }
 
diff --git a/pom.xml b/pom.xml
index 29a61421b6be..48d05df2d214 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,16 +5,16 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>134</version>
+        <version>147</version>
     </parent>
 
     <groupId>io.trino</groupId>
     <artifactId>trino-root</artifactId>
-    <version>413-SNAPSHOT</version>
+    <version>432-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <name>trino-root</name>
+    <name>${project.artifactId}</name>
     <description>Trino</description>
-    <packaging>pom</packaging>
     <url>https://trino.io</url>
 
     <inceptionYear>2012</inceptionYear>
@@ -27,83 +27,11 @@
         </license>
     </licenses>
 
-    <scm>
-        <connection>scm:git:git://github.com/trinodb/trino.git</connection>
-        <url>https://github.com/trinodb/trino</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <properties>
-        <air.main.basedir>${project.basedir}</air.main.basedir>
-
-        <air.check.skip-spotbugs>true</air.check.skip-spotbugs>
-        <air.check.skip-pmd>true</air.check.skip-pmd>
-        <air.check.skip-jacoco>true</air.check.skip-jacoco>
-
-        <project.build.targetJdk>17</project.build.targetJdk>
-        <air.java.version>17.0.4</air.java.version>
-        <air.modernizer.java-version>8</air.modernizer.java-version>
-
-        <air.release.preparation-goals>clean verify -DskipTests</air.release.preparation-goals>
-
-        <dep.accumulo.version>1.10.2</dep.accumulo.version>
-        <dep.accumulo-hadoop.version>2.7.7-1</dep.accumulo-hadoop.version>
-        <dep.antlr.version>4.11.1</dep.antlr.version>
-        <dep.airlift.version>228</dep.airlift.version>
-        <dep.arrow.version>9.0.0</dep.arrow.version>
-        <dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
-        <dep.aws-sdk.version>1.12.261</dep.aws-sdk.version>
-        <dep.jsonwebtoken.version>0.11.5</dep.jsonwebtoken.version>
-        <dep.oracle.version>21.9.0.0</dep.oracle.version>
-        <dep.drift.version>1.14</dep.drift.version>
-        <dep.tempto.version>191</dep.tempto.version>
-        <dep.gcs.version>2.2.8</dep.gcs.version>
-        <dep.errorprone.version>2.18.0</dep.errorprone.version>
-        <dep.testcontainers.version>1.17.6</dep.testcontainers.version>
-        <dep.duct-tape.version>1.0.8</dep.duct-tape.version>
-        <dep.coral.version>2.0.77</dep.coral.version>
-        <dep.confluent.version>7.3.1</dep.confluent.version>
-        <dep.kafka-clients.version>3.3.2</dep.kafka-clients.version>
-        <dep.casandra.version>4.14.0</dep.casandra.version>
-        <dep.minio.version>8.4.5</dep.minio.version>
-        <dep.iceberg.version>1.1.0</dep.iceberg.version>
-        <dep.protobuf.version>3.22.2</dep.protobuf.version>
-        <dep.wire.version>4.5.0</dep.wire.version>
-        <dep.kotlin.version>1.8.0</dep.kotlin.version>
-        <dep.netty.version>4.1.79.Final</dep.netty.version>
-
-        <dep.docker.images.version>77</dep.docker.images.version>
-
-        <!--
-          America/Bahia_Banderas has:
-           - offset change since 1970 (offset Jan 1970: -08:00, offset Jan 2018: -06:00)
-           - DST (e.g. at 2017-04-02 02:00:00 clocks turned forward 1 hour; 2017-10-29 02:00:00 clocks turned backward 1 hour)
-           - has forward offset change on first day of epoch (1970-01-01 00:00:00 clocks turned forward 1 hour)
-           - had forward change at midnight (1970-01-01 00:00:00 clocks turned forward 1 hour)
-          -->
-        <air.test.timezone>America/Bahia_Banderas</air.test.timezone>
-        <air.test.parallel>methods</air.test.parallel>
-        <air.test.thread-count>2</air.test.thread-count>
-        <!-- Be conservative about memory allotment, because tests start background process (e.g. docker containers) -->
-        <air.test.jvmsize>3g</air.test.jvmsize>
-        <!-- G1 default region size for a small heap is 1MB. Tests (TestHiveConnectorTest.testMultipleWritersWhenTaskScaleWritersIsEnabled) in particular
-             were observed allocating large number of byte[] of about 1.6MB in size, thus being treated as humongous allocations and preventing heap saturation.
-             Force bigger region size in attempt to help G1 utilize heap fully. -->
-        <air.test.jvm.additional-arguments>
-            -XX:G1HeapRegionSize=32M
-            -XX:+UnlockDiagnosticVMOptions
-            <!-- bump from default of 2 -->
-            -XX:GCLockerRetryAllocationCount=10
-            -XX:-G1UsePreventiveGC
-        </air.test.jvm.additional-arguments>
-
-        <air.javadoc.lint>-missing</air.javadoc.lint>
-    </properties>
-
     <modules>
         <module>client/trino-cli</module>
         <module>client/trino-client</module>
         <module>client/trino-jdbc</module>
+        <module>core/trino-grammar</module>
         <module>core/trino-main</module>
         <module>core/trino-parser</module>
         <module>core/trino-server</module>
@@ -112,12 +40,17 @@
         <module>core/trino-spi</module>
         <module>docs</module>
         <module>lib/trino-array</module>
-        <module>lib/trino-collect</module>
+        <module>lib/trino-cache</module>
         <module>lib/trino-filesystem</module>
+        <module>lib/trino-filesystem-azure</module>
+        <module>lib/trino-filesystem-manager</module>
+        <module>lib/trino-filesystem-s3</module>
         <module>lib/trino-geospatial-toolkit</module>
         <module>lib/trino-hadoop-toolkit</module>
         <module>lib/trino-hdfs</module>
         <module>lib/trino-hive-formats</module>
+        <!-- TODO Remove whole module when Ignite is released -->
+        <module>lib/trino-ignite-patched</module>
         <module>lib/trino-matching</module>
         <module>lib/trino-memory-context</module>
         <module>lib/trino-orc</module>
@@ -172,6 +105,7 @@
         <module>plugin/trino-resource-group-managers</module>
         <module>plugin/trino-session-property-managers</module>
         <module>plugin/trino-singlestore</module>
+        <module>plugin/trino-snowflake</module>
         <module>plugin/trino-sqlserver</module>
         <module>plugin/trino-teradata-functions</module>
         <module>plugin/trino-thrift</module>
@@ -199,1444 +133,1408 @@
         <module>testing/trino-tests</module>
     </modules>
 
+    <scm>
+        <connection>scm:git:git://github.com/trinodb/trino.git</connection>
+        <tag>HEAD</tag>
+        <url>https://github.com/trinodb/trino</url>
+    </scm>
+
+    <properties>
+        <air.main.basedir>${project.basedir}</air.main.basedir>
+
+        <air.check.skip-spotbugs>true</air.check.skip-spotbugs>
+        <air.check.skip-pmd>true</air.check.skip-pmd>
+        <air.check.skip-jacoco>true</air.check.skip-jacoco>
+
+        <project.build.targetJdk>17</project.build.targetJdk>
+        <air.java.version>17.0.4</air.java.version>
+        <air.modernizer.java-version>8</air.modernizer.java-version>
+
+        <air.release.preparation-goals>clean verify -DskipTests</air.release.preparation-goals>
+
+        <dep.accumulo.version>1.10.2</dep.accumulo.version>
+        <dep.accumulo-hadoop.version>2.7.7-1</dep.accumulo-hadoop.version>
+        <dep.antlr.version>4.13.0</dep.antlr.version>
+        <dep.airlift.version>237</dep.airlift.version>
+        <dep.arrow.version>13.0.0</dep.arrow.version>
+        <dep.avro.version>1.11.3</dep.avro.version>
+        <dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
+        <dep.takari.version>2.1.1</dep.takari.version>
+        <dep.aws-sdk.version>1.12.560</dep.aws-sdk.version>
+        <dep.aws-sdk-v2.version>2.21.4</dep.aws-sdk-v2.version>
+        <dep.jsonwebtoken.version>0.12.3</dep.jsonwebtoken.version>
+        <dep.oracle.version>21.9.0.0</dep.oracle.version>
+        <dep.drift.version>1.21</dep.drift.version>
+        <dep.tempto.version>201</dep.tempto.version>
+        <dep.gcs.version>2.2.17</dep.gcs.version>
+        <dep.swagger.version>1.6.12</dep.swagger.version>
+        <dep.kotlin.version>1.9.10</dep.kotlin.version>
+        <dep.google.http.client.version>1.43.3</dep.google.http.client.version>
+        <dep.errorprone.version>2.22.0</dep.errorprone.version>
+        <dep.testcontainers.version>1.19.1</dep.testcontainers.version>
+        <dep.duct-tape.version>1.0.8</dep.duct-tape.version>
+        <dep.confluent.version>7.4.1</dep.confluent.version>
+        <dep.kafka-clients.version>3.6.0</dep.kafka-clients.version>
+        <dep.casandra.version>4.17.0</dep.casandra.version>
+        <dep.minio.version>8.5.6</dep.minio.version>
+        <dep.iceberg.version>1.4.1</dep.iceberg.version>
+        <dep.protobuf.version>3.24.4</dep.protobuf.version>
+        <dep.wire.version>4.5.0</dep.wire.version>
+        <dep.netty.version>4.1.100.Final</dep.netty.version>
+        <dep.jna.version>5.13.0</dep.jna.version>
+        <dep.okio.version>3.6.0</dep.okio.version>
+        <dep.flyway.version>9.22.3</dep.flyway.version>
+        <dep.parquet.version>1.13.1</dep.parquet.version>
+        <dep.antlr.version>4.13.1</dep.antlr.version>
+        <dep.asm.version>9.6</dep.asm.version>
+
+        <dep.docker.images.version>87</dep.docker.images.version>
+
+        <!--
+          America/Bahia_Banderas has:
+           - offset change since 1970 (offset Jan 1970: -08:00, offset Jan 2018: -06:00)
+           - DST (e.g. at 2017-04-02 02:00:00 clocks turned forward 1 hour; 2017-10-29 02:00:00 clocks turned backward 1 hour)
+           - has forward offset change on first day of epoch (1970-01-01 00:00:00 clocks turned forward 1 hour)
+           - had forward change at midnight (1970-01-01 00:00:00 clocks turned forward 1 hour)
+          -->
+        <air.test.timezone>America/Bahia_Banderas</air.test.timezone>
+        <air.test.parallel>methods</air.test.parallel>
+        <air.test.thread-count>2</air.test.thread-count>
+        <!-- Be conservative about memory allotment, because tests start background process (e.g. docker containers) -->
+        <air.test.jvmsize>3g</air.test.jvmsize>
+        <!-- G1 default region size for a small heap is 1MB. Tests (TestHiveConnectorTest.testMultipleWritersWhenTaskScaleWritersIsEnabled) in particular
+             were observed allocating large number of byte[] of about 1.6MB in size, thus being treated as humongous allocations and preventing heap saturation.
+             Force bigger region size in attempt to help G1 utilize heap fully. -->
+        <air.test.jvm.additional-arguments>
+            -XX:G1HeapRegionSize=32M
+            -XX:+UnlockDiagnosticVMOptions
+            <!-- bump from default of 2 -->
+            -XX:GCLockerRetryAllocationCount=10
+            -XX:-G1UsePreventiveGC
+        </air.test.jvm.additional-arguments>
+
+        <air.javadoc.lint>-missing</air.javadoc.lint>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
-            <!-- Trino -->
-            <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-array</artifactId>
-                <version>${project.version}</version>
-            </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-base-jdbc</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.azure</groupId>
+                <artifactId>azure-sdk-bom</artifactId>
+                <version>1.2.17</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-base-jdbc</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>com.google.cloud</groupId>
+                <artifactId>libraries-bom</artifactId>
+                <version>26.25.0</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-benchmark</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp-bom</artifactId>
+                <version>4.12.0</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-benchmark-queries</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.airlift</groupId>
+                <artifactId>bom</artifactId>
+                <version>${dep.airlift.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-benchto-benchmarks</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-bom</artifactId>
+                <version>1.59.0</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-blackhole</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-bom</artifactId>
+                <version>${dep.netty.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-cli</artifactId>
-                <version>${project.version}</version>
+                <groupId>org.jdbi</groupId>
+                <artifactId>jdbi3-bom</artifactId>
+                <version>3.41.3</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-client</artifactId>
-                <version>${project.version}</version>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-bom</artifactId>
+                <version>${dep.asm.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-collect</artifactId>
-                <version>${project.version}</version>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>${dep.testcontainers.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-collect</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>bom</artifactId>
+                <version>${dep.aws-sdk-v2.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-delta-lake</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.adobe.testing</groupId>
+                <artifactId>s3mock-testcontainers</artifactId>
+                <version>3.1.0</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-delta-lake</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>amazon-kinesis-client</artifactId>
+                <version>1.15.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.amazonaws</groupId>
+                        <artifactId>aws-java-sdk</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.amazonaws</groupId>
+                        <artifactId>aws-java-sdk-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.google.protobuf</groupId>
+                        <artifactId>protobuf-java</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-lang</groupId>
+                        <artifactId>commons-lang</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>joda-time</groupId>
+                        <artifactId>joda-time</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-elasticsearch</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-java-sdk-core</artifactId>
+                <version>${dep.aws-sdk.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>joda-time</groupId>
+                        <artifactId>joda-time</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-example-http</artifactId>
-                <type>zip</type>
-                <version>${project.version}</version>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-java-sdk-dynamodb</artifactId>
+                <version>${dep.aws-sdk.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-exchange-filesystem</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-java-sdk-glue</artifactId>
+                <version>${dep.aws-sdk.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>joda-time</groupId>
+                        <artifactId>joda-time</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-exchange-filesystem</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
-            </dependency>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-java-sdk-kinesis</artifactId>
+                <version>${dep.aws-sdk.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>joda-time</groupId>
+                        <artifactId>joda-time</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-faulttolerant-tests</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-java-sdk-s3</artifactId>
+                <version>${dep.aws-sdk.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>joda-time</groupId>
+                        <artifactId>joda-time</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-filesystem</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-java-sdk-sts</artifactId>
+                <version>${dep.aws-sdk.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>joda-time</groupId>
+                        <artifactId>joda-time</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-filesystem</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>com.clearspring.analytics</groupId>
+                <artifactId>stream</artifactId>
+                <version>2.9.8</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-geospatial</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.clickhouse</groupId>
+                <artifactId>clickhouse-jdbc</artifactId>
+                <version>0.5.0</version>
+                <classifier>all</classifier>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-geospatial-toolkit</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.datastax.oss</groupId>
+                <artifactId>java-driver-core</artifactId>
+                <version>${dep.casandra.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.ow2.asm</groupId>
+                        <artifactId>asm-analysis</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-hadoop-toolkit</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.esri.geometry</groupId>
+                <artifactId>esri-geometry-api</artifactId>
+                <version>2.2.4</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-core</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-hdfs</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.facebook.thirdparty</groupId>
+                <artifactId>libsvm</artifactId>
+                <version>3.18.1</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-hive</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.github.ben-manes.caffeine</groupId>
+                <artifactId>caffeine</artifactId>
+                <version>3.1.8</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-hive</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>com.github.docker-java</groupId>
+                <artifactId>docker-java-api</artifactId>
+                <version>3.3.3</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-hive-formats</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.github.luben</groupId>
+                <artifactId>zstd-jni</artifactId>
+                <version>1.5.5-6</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-hive-hadoop2</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.github.oshi</groupId>
+                <artifactId>oshi-core</artifactId>
+                <version>6.4.6</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-hudi</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.google.auto.value</groupId>
+                <artifactId>auto-value-annotations</artifactId>
+                <version>1.10.4</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-iceberg</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.google.cloud.bigdataoss</groupId>
+                <artifactId>gcs-connector</artifactId>
+                <version>hadoop3-${dep.gcs.version}</version>
+                <classifier>shaded</classifier>
+                <exclusions>
+                    <exclusion>
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
+            <!-- force newer version to be used for dependencies -->
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-iceberg</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>2.10.1</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-ignite</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_annotations</artifactId>
+                <version>${dep.errorprone.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-jdbc</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.google.http-client</groupId>
+                <artifactId>google-http-client</artifactId>
+                <version>${dep.google.http.client.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-jmx</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.google.http-client</groupId>
+                <artifactId>google-http-client-gson</artifactId>
+                <version>${dep.google.http.client.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-local-file</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${dep.protobuf.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-main</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java-util</artifactId>
+                <version>${dep.protobuf.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-main</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-kotlin</artifactId>
+                <version>${dep.protobuf.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-mariadb</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.h2database</groupId>
+                <artifactId>h2</artifactId>
+                <version>2.2.224</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-matching</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.microsoft.sqlserver</groupId>
+                <artifactId>mssql-jdbc</artifactId>
+                <version>12.4.1.jre11</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-memory</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.mysql</groupId>
+                <artifactId>mysql-connector-j</artifactId>
+                <version>8.1.0</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-memory</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>com.nimbusds</groupId>
+                <artifactId>nimbus-jose-jwt</artifactId>
+                <version>9.37</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-memory-context</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.nimbusds</groupId>
+                <artifactId>oauth2-oidc-sdk</artifactId>
+                <version>11.4</version>
+                <classifier>jdk11</classifier>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-mongodb</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.qubole.rubix</groupId>
+                <artifactId>rubix-presto-shaded</artifactId>
+                <version>0.3.18</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-mongodb</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>com.squareup.okio</groupId>
+                <artifactId>okio</artifactId>
+                <version>${dep.okio.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-mysql</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.squareup.okio</groupId>
+                <artifactId>okio-jvm</artifactId>
+                <version>${dep.okio.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-mysql</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>com.squareup.wire</groupId>
+                <artifactId>wire-runtime-jvm</artifactId>
+                <version>${dep.wire.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-orc</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.squareup.wire</groupId>
+                <artifactId>wire-schema-jvm</artifactId>
+                <version>${dep.wire.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-parquet</artifactId>
-                <version>${project.version}</version>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.16.0</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-parser</artifactId>
-                <version>${project.version}</version>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.14.0</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-parser</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>dev.failsafe</groupId>
+                <artifactId>failsafe</artifactId>
+                <version>3.3.2</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-password-authenticators</artifactId>
-                <version>${project.version}</version>
+                <groupId>info.picocli</groupId>
+                <artifactId>picocli</artifactId>
+                <version>4.7.5</version>
             </dependency>
 
-            <!-- TODO(https://github.com/trinodb/trino/issues/13051): Remove when Phoenix5 is released -->
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-phoenix5-patched</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.airlift</groupId>
+                <artifactId>aircompressor</artifactId>
+                <version>0.25</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-pinot</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.airlift</groupId>
+                <artifactId>bytecode</artifactId>
+                <version>1.5</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-plugin-reader</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.airlift</groupId>
+                <artifactId>joni</artifactId>
+                <version>2.1.5.3</version>
+            </dependency>
+            <dependency>
+                <groupId>io.airlift</groupId>
+                <artifactId>junit-extensions</artifactId>
+                <version>1</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-plugin-toolkit</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.airlift</groupId>
+                <artifactId>units</artifactId>
+                <version>1.10</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-plugin-toolkit</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>io.airlift.discovery</groupId>
+                <artifactId>discovery-server</artifactId>
+                <version>1.36</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.airlift</groupId>
+                        <artifactId>event-http</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>io.airlift</groupId>
+                        <artifactId>jmx-http-rpc</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.iq80.leveldb</groupId>
+                        <artifactId>leveldb</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.iq80.leveldb</groupId>
+                        <artifactId>leveldb-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-api</artifactId>
+                <version>${dep.drift.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-client</artifactId>
+                <version>${dep.drift.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-codec</artifactId>
+                <version>${dep.drift.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-protocol</artifactId>
+                <version>${dep.drift.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-server</artifactId>
+                <version>${dep.drift.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-transport-netty</artifactId>
+                <version>${dep.drift.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-transport-spi</artifactId>
+                <version>${dep.drift.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.airlift.resolver</groupId>
+                <artifactId>resolver</artifactId>
+                <version>1.6</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.confluent</groupId>
+                <artifactId>kafka-avro-serializer</artifactId>
+                <version>${dep.confluent.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.re2j</groupId>
+                        <artifactId>re2j</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-cli</groupId>
+                        <artifactId>commons-cli</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>net.sf.jopt-simple</groupId>
+                        <artifactId>jopt-simple</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.kafka</groupId>
+                        <artifactId>kafka-clients</artifactId>
+                    </exclusion>
+                    <!--
+                        This library depends on:
+                         - org.glassfish.hk2.external:jakarta.inject that conflicts with javax.inject:javax.inject
+                    -->
+                    <exclusion>
+                        <groupId>org.glassfish.hk2.external</groupId>
+                        <artifactId>jakarta.inject</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>io.confluent</groupId>
+                <artifactId>kafka-schema-registry-client</artifactId>
+                <version>${dep.confluent.version}</version>
+                <exclusions>
+                    <!-- Brings in a 2.13.4.2 version of databind -->
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-databind</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.activation</groupId>
+                        <artifactId>jakarta.activation</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>jakarta.activation</groupId>
+                        <artifactId>jakarta.activation-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.kafka</groupId>
+                        <artifactId>kafka-clients</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.glassfish</groupId>
+                        <artifactId>jakarta.el</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.glassfish.hk2.external</groupId>
+                        <artifactId>jakarta.inject</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>io.confluent</groupId>
+                <artifactId>kafka-schema-serializer</artifactId>
+                <version>${dep.confluent.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.dropwizard.metrics</groupId>
+                <artifactId>metrics-core</artifactId>
+                <version>4.2.21</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt-api</artifactId>
+                <version>${dep.jsonwebtoken.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt-impl</artifactId>
+                <version>${dep.jsonwebtoken.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt-jackson</artifactId>
+                <version>${dep.jsonwebtoken.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.minio</groupId>
+                <artifactId>minio</artifactId>
+                <version>${dep.minio.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.projectreactor</groupId>
+                <artifactId>reactor-core</artifactId>
+                <version>3.4.31</version>
+            </dependency>
+
+            <!-- io.confluent:kafka-avro-serializer uses multiple versions of this transitive dependency -->
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-annotations</artifactId>
+                <version>${dep.swagger.version}</version>
             </dependency>
 
+            <!-- io.confluent:kafka-avro-serializer uses multiple versions of this transitive dependency -->
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-core</artifactId>
+                <version>${dep.swagger.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-postgresql</artifactId>
+                <artifactId>re2j</artifactId>
+                <version>1.6</version>
+            </dependency>
+            <dependency>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-array</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-postgresql</artifactId>
-                <type>test-jar</type>
+                <artifactId>trino-base-jdbc</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-product-tests</artifactId>
+                <artifactId>trino-base-jdbc</artifactId>
                 <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-raptor-legacy</artifactId>
+                <artifactId>trino-benchmark</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-record-decoder</artifactId>
+                <artifactId>trino-benchmark-queries</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-record-decoder</artifactId>
-                <type>test-jar</type>
+                <artifactId>trino-benchto-benchmarks</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-resource-group-managers</artifactId>
+                <artifactId>trino-blackhole</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-resource-group-managers</artifactId>
-                <type>test-jar</type>
+                <artifactId>trino-cache</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-server</artifactId>
+                <artifactId>trino-cache</artifactId>
                 <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-server-rpm</artifactId>
+                <artifactId>trino-cli</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-session-property-managers</artifactId>
+                <artifactId>trino-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-session-property-managers</artifactId>
-                <type>test-jar</type>
+                <artifactId>trino-delta-lake</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-spi</artifactId>
+                <artifactId>trino-delta-lake</artifactId>
                 <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-spi</artifactId>
-                <type>test-jar</type>
+                <artifactId>trino-elasticsearch</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-sqlserver</artifactId>
+                <artifactId>trino-example-http</artifactId>
                 <version>${project.version}</version>
+                <type>zip</type>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-sqlserver</artifactId>
-                <type>test-jar</type>
+                <artifactId>trino-exchange-filesystem</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-testing</artifactId>
+                <artifactId>trino-exchange-filesystem</artifactId>
                 <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-testing-containers</artifactId>
+                <artifactId>trino-faulttolerant-tests</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-testing-kafka</artifactId>
+                <artifactId>trino-filesystem</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-testing-resources</artifactId>
+                <artifactId>trino-filesystem</artifactId>
                 <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-testing-services</artifactId>
+                <artifactId>trino-filesystem-azure</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-tests</artifactId>
+                <artifactId>trino-filesystem-manager</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-tests</artifactId>
-                <type>test-jar</type>
+                <artifactId>trino-filesystem-s3</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-thrift</artifactId>
-                <type>zip</type>
+                <artifactId>trino-geospatial</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-thrift-api</artifactId>
+                <artifactId>trino-geospatial-toolkit</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-thrift-api</artifactId>
-                <type>test-jar</type>
+                <artifactId>trino-grammar</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-thrift-testing-server</artifactId>
+                <artifactId>trino-hadoop-toolkit</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-tpcds</artifactId>
+                <artifactId>trino-hdfs</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.trino</groupId>
-                <artifactId>trino-tpch</artifactId>
+                <artifactId>trino-hive</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- Trino external -->
             <dependency>
-                <groupId>io.trino.benchto</groupId>
-                <artifactId>benchto-driver</artifactId>
-                <version>0.23</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-hive</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>io.trino.hadoop</groupId>
-                <artifactId>hadoop-apache</artifactId>
-                <version>3.2.0-18</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-hive-formats</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino.hive</groupId>
-                <artifactId>hive-apache</artifactId>
-                <version>3.1.2-20</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-hive-hadoop2</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino.hive</groupId>
-                <artifactId>hive-apache-jdbc</artifactId>
-                <version>0.13.1-9</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-hudi</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino.hive</groupId>
-                <artifactId>hive-thrift</artifactId>
-                <version>1</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-iceberg</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino.orc</groupId>
-                <artifactId>orc-protobuf</artifactId>
-                <version>14</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-iceberg</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>io.trino.tempto</groupId>
-                <artifactId>tempto-core</artifactId>
-                <version>${dep.tempto.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.google.code.findbugs</groupId>
-                        <artifactId>annotations</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-ignite</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
+            <!-- TODO Remove whole module when Ignite is released -->
             <dependency>
-                <groupId>io.trino.tempto</groupId>
-                <artifactId>tempto-kafka</artifactId>
-                <version>${dep.tempto.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-log4j12</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-ignite-patched</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino.tempto</groupId>
-                <artifactId>tempto-ldap</artifactId>
-                <version>${dep.tempto.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-jdbc</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino.tempto</groupId>
-                <artifactId>tempto-runner</artifactId>
-                <version>${dep.tempto.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-jmx</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino.tpcds</groupId>
-                <artifactId>tpcds</artifactId>
-                <version>1.4</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-local-file</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.trino.tpch</groupId>
-                <artifactId>tpch</artifactId>
-                <version>1.1</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-main</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
-            <!-- Airlift -->
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>aircompressor</artifactId>
-                <version>0.24</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-main</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>bootstrap</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-mariadb</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>bytecode</artifactId>
-                <version>1.4</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-matching</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>concurrent</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-memory</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>configuration</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-memory</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>dbpool</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-memory-context</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>discovery</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-mongodb</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>event</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-mongodb</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>http-client</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-mysql</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>http-server</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-mysql</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>jaxrs</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-orc</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>jaxrs-testing</artifactId>
-                <version>${dep.airlift.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.hamcrest</groupId>
-                        <artifactId>hamcrest</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-parquet</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>jmx</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-parser</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>jmx-http</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-parser</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>joni</artifactId>
-                <version>2.1.5.3</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-password-authenticators</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
+            <!-- TODO(https://github.com/trinodb/trino/issues/13051): Remove when Phoenix5 is released -->
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>json</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-phoenix5-patched</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>log</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-pinot</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>log-manager</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-plugin-reader</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>node</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-plugin-toolkit</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>openmetrics</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-plugin-toolkit</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>parameternames</artifactId>
-                <version>1.4</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-postgresql</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>security</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-postgresql</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>stats</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-product-tests</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>testing</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-raptor-legacy</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>trace-token</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-record-decoder</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>units</artifactId>
-                <version>1.8</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-record-decoder</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift.discovery</groupId>
-                <artifactId>discovery-server</artifactId>
-                <version>1.32</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>io.airlift</groupId>
-                        <artifactId>event-http</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>io.airlift</groupId>
-                        <artifactId>jmx-http-rpc</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.iq80.leveldb</groupId>
-                        <artifactId>leveldb</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.iq80.leveldb</groupId>
-                        <artifactId>leveldb-api</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-resource-group-managers</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-api</artifactId>
-                <version>${dep.drift.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-resource-group-managers</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-client</artifactId>
-                <version>${dep.drift.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-codec</artifactId>
-                <version>${dep.drift.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-protocol</artifactId>
-                <version>${dep.drift.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-server</artifactId>
-                <version>${dep.drift.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-transport-netty</artifactId>
-                <version>${dep.drift.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.airlift.resolver</groupId>
-                <artifactId>resolver</artifactId>
-                <version>1.6</version>
-            </dependency>
-
-            <!-- 3rd party -->
-            <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>amazon-kinesis-client</artifactId>
-                <version>1.6.3</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-lang</groupId>
-                        <artifactId>commons-lang</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>joda-time</groupId>
-                        <artifactId>joda-time</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.google.protobuf</groupId>
-                        <artifactId>protobuf-java</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.amazonaws</groupId>
-                        <artifactId>aws-java-sdk</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.amazonaws</groupId>
-                        <artifactId>aws-java-sdk-core</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-core</artifactId>
-                <version>${dep.aws-sdk.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>joda-time</groupId>
-                        <artifactId>joda-time</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-dynamodb</artifactId>
-                <version>${dep.aws-sdk.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-glue</artifactId>
-                <version>${dep.aws-sdk.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>joda-time</groupId>
-                        <artifactId>joda-time</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-kinesis</artifactId>
-                <version>${dep.aws-sdk.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>joda-time</groupId>
-                        <artifactId>joda-time</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-s3</artifactId>
-                <version>${dep.aws-sdk.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>joda-time</groupId>
-                        <artifactId>joda-time</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-sts</artifactId>
-                <version>${dep.aws-sdk.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>joda-time</groupId>
-                        <artifactId>joda-time</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>com.clearspring.analytics</groupId>
-                <artifactId>stream</artifactId>
-                <version>2.9.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.clickhouse</groupId>
-                <artifactId>clickhouse-jdbc</artifactId>
-                <version>0.4.1</version>
-                <classifier>all</classifier>
-                <exclusions>
-                    <exclusion>
-                        <groupId>*</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>com.databricks</groupId>
-                <artifactId>databricks-jdbc</artifactId>
-                <version>2.6.29</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-server</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.datastax.oss</groupId>
-                <artifactId>java-driver-core</artifactId>
-                <version>${dep.casandra.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-analysis</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-server-rpm</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.esri.geometry</groupId>
-                <artifactId>esri-geometry-api</artifactId>
-                <version>2.2.4</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-core</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-session-property-managers</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.facebook.thirdparty</groupId>
-                <artifactId>libsvm</artifactId>
-                <version>3.18.1</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-session-property-managers</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>com.github.ben-manes.caffeine</groupId>
-                <artifactId>caffeine</artifactId>
-                <version>3.0.5</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-snowflake</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.github.docker-java</groupId>
-                <artifactId>docker-java-api</artifactId>
-                <version>3.2.13</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-spi</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.github.luben</groupId>
-                <artifactId>zstd-jni</artifactId>
-                <version>1.5.2-3</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-spi</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>com.github.oshi</groupId>
-                <artifactId>oshi-core</artifactId>
-                <version>5.8.5</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-sqlserver</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.google.cloud.bigdataoss</groupId>
-                <artifactId>gcs-connector</artifactId>
-                <version>hadoop2-${dep.gcs.version}</version>
-                <classifier>shaded</classifier>
-                <exclusions>
-                    <exclusion>
-                        <groupId>*</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-sqlserver</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>com.google.errorprone</groupId>
-                <artifactId>error_prone_annotations</artifactId>
-                <version>${dep.errorprone.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-testing</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.google.protobuf</groupId>
-                <artifactId>protobuf-java</artifactId>
-                <version>${dep.protobuf.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-testing-containers</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.google.protobuf</groupId>
-                <artifactId>protobuf-java-util</artifactId>
-                <version>${dep.protobuf.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-testing-kafka</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>2.1.214</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-testing-resources</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.linkedin.calcite</groupId>
-                <artifactId>calcite-core</artifactId>
-                <version>1.21.0.152</version>
-                <classifier>shaded</classifier>
-                <exclusions>
-                    <exclusion>
-                        <!-- Exclude everything because shaded version of calcite-core still pulls in all the original dependencies -->
-                        <groupId>*</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-testing-services</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.linkedin.coral</groupId>
-                <artifactId>coral-common</artifactId>
-                <version>${dep.coral.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.hive</groupId>
-                        <artifactId>hive-metastore</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.hadoop</groupId>
-                        <artifactId>hadoop-common</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-tests</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.linkedin.coral</groupId>
-                <artifactId>coral-hive</artifactId>
-                <version>${dep.coral.version}</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-tests</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>com.linkedin.coral</groupId>
-                <artifactId>coral-trino</artifactId>
-                <version>${dep.coral.version}</version>
-                <exclusions>
-                    <!--
-                        The `trino-parser` library is being used internally within the `coral-trino` library for
-                        parsing Trino SQL statements. This functionality is irrelevant in the context of
-                        using Coral for Hive view translations within Trino.
-                        This dependency is excluded because `trino-parser` does not guarantee API or behavioral
-                        backwards compatibility.
-                        Trino cannot provide the version on which `coral-trino` library depends on, because the
-                        current version of `trino-parser` is used in tests of this module.
-                        The dependency is therefore intentionally excluded to avoid breaking in an unexpected way,
-                        or silent correctness issues.
-                    -->
-                    <exclusion>
-                        <groupId>io.trino</groupId>
-                        <artifactId>trino-parser</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-thrift</artifactId>
+                <version>${project.version}</version>
+                <type>zip</type>
             </dependency>
 
             <dependency>
-                <groupId>com.microsoft.sqlserver</groupId>
-                <artifactId>mssql-jdbc</artifactId>
-                <version>11.2.1.jre17</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-thrift-api</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.nimbusds</groupId>
-                <artifactId>nimbus-jose-jwt</artifactId>
-                <version>9.14</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-thrift-api</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>com.nimbusds</groupId>
-                <artifactId>oauth2-oidc-sdk</artifactId>
-                <version>9.18</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-thrift-testing-server</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.qubole.rubix</groupId>
-                <artifactId>rubix-presto-shaded</artifactId>
-                <version>0.3.18</version>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-tpcds</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.squareup.okhttp3</groupId>
-                <artifactId>okhttp-bom</artifactId>
-                <type>pom</type>
-                <version>4.10.0</version>
-                <scope>import</scope>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-tpch</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.squareup.okio</groupId>
-                <artifactId>okio-jvm</artifactId>
-                <version>3.3.0</version>
+                <groupId>io.trino.benchto</groupId>
+                <artifactId>benchto-driver</artifactId>
+                <version>0.25</version>
             </dependency>
 
             <dependency>
-                <groupId>com.squareup.wire</groupId>
-                <artifactId>wire-runtime-jvm</artifactId>
-                <version>${dep.wire.version}</version>
+                <groupId>io.trino.coral</groupId>
+                <artifactId>coral</artifactId>
+                <version>2.2.14-1</version>
             </dependency>
 
             <dependency>
-                <groupId>com.squareup.wire</groupId>
-                <artifactId>wire-schema-jvm</artifactId>
-                <version>${dep.wire.version}</version>
+                <groupId>io.trino.hadoop</groupId>
+                <artifactId>hadoop-apache</artifactId>
+                <version>3.3.5-1</version>
             </dependency>
 
             <dependency>
-                <groupId>com.teradata</groupId>
-                <artifactId>re2j-td</artifactId>
-                <version>1.4</version>
+                <groupId>io.trino.hive</groupId>
+                <artifactId>hive-apache</artifactId>
+                <version>3.1.2-22</version>
             </dependency>
 
             <dependency>
-                 <groupId>commons-codec</groupId>
-                 <artifactId>commons-codec</artifactId>
-                 <version>1.15</version>
-             </dependency>
-
-            <dependency>
-                <groupId>dev.failsafe</groupId>
-                <artifactId>failsafe</artifactId>
-                <version>3.3.0</version>
+                <groupId>io.trino.hive</groupId>
+                <artifactId>hive-apache-jdbc</artifactId>
+                <version>0.13.1-9</version>
             </dependency>
 
             <dependency>
-                <groupId>info.picocli</groupId>
-                <artifactId>picocli</artifactId>
-                <version>4.7.0</version>
+                <groupId>io.trino.hive</groupId>
+                <artifactId>hive-thrift</artifactId>
+                <version>1</version>
             </dependency>
 
             <dependency>
-                <groupId>io.confluent</groupId>
-                <artifactId>kafka-avro-serializer</artifactId>
-                <version>${dep.confluent.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.kafka</groupId>
-                        <artifactId>kafka-clients</artifactId>
-                    </exclusion>
-                    <!--
-                        This library depends on:
-                         - org.glassfish.hk2.external:jakarta.inject that conflicts with javax.inject:javax.inject
-                    -->
-                    <exclusion>
-                        <groupId>org.glassfish.hk2.external</groupId>
-                        <artifactId>jakarta.inject</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>net.sf.jopt-simple</groupId>
-                        <artifactId>jopt-simple</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-cli</groupId>
-                        <artifactId>commons-cli</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.google.re2j</groupId>
-                        <artifactId>re2j</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.trino.orc</groupId>
+                <artifactId>orc-protobuf</artifactId>
+                <version>14</version>
             </dependency>
 
             <dependency>
-                <groupId>io.confluent</groupId>
-                <artifactId>kafka-json-schema-serializer</artifactId>
-                <version>${dep.confluent.version}</version>
-                <!-- This is under Confluent Community License and it should not be used with compile scope -->
-                <scope>test</scope>
+                <groupId>io.trino.tempto</groupId>
+                <artifactId>tempto-core</artifactId>
+                <version>${dep.tempto.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.kafka</groupId>
-                        <artifactId>kafka-clients</artifactId>
-                    </exclusion>
-                    <!-- Brings in a 2.13.4.2 version of databind-->
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-databind</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.google.re2j</groupId>
-                        <artifactId>re2j</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
+                        <groupId>com.google.code.findbugs</groupId>
+                        <artifactId>annotations</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>io.confluent</groupId>
-                <artifactId>kafka-protobuf-provider</artifactId>
-                <version>${dep.confluent.version}</version>
-                <!-- This is under Confluent Community License and it should not be used with compile scope -->
-                <scope>provided</scope>
+                <groupId>io.trino.tempto</groupId>
+                <artifactId>tempto-kafka</artifactId>
+                <version>${dep.tempto.version}</version>
                 <exclusions>
-                    <!-- Brings in a 2.13.4.2 version of databind -->
                     <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-databind</artifactId>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-log4j12</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>io.confluent</groupId>
-                <artifactId>kafka-protobuf-serializer</artifactId>
-                <version>${dep.confluent.version}</version>
-                <!-- This is under Confluent Community License and it should not be used with compile scope -->
-                <scope>test</scope>
+                <groupId>io.trino.tempto</groupId>
+                <artifactId>tempto-ldap</artifactId>
+                <version>${dep.tempto.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.confluent</groupId>
-                <artifactId>kafka-protobuf-types</artifactId>
-                <version>${dep.confluent.version}</version>
-                <!-- This is under Confluent Community License and it should not be used with compile scope -->
-                <scope>provided</scope>
+                <groupId>io.trino.tempto</groupId>
+                <artifactId>tempto-runner</artifactId>
+                <version>${dep.tempto.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.confluent</groupId>
-                <artifactId>kafka-schema-registry-client</artifactId>
-                <version>${dep.confluent.version}</version>
+                <groupId>io.trino.tpcds</groupId>
+                <artifactId>tpcds</artifactId>
+                <version>1.4</version>
                 <exclusions>
+                    <!-- not used in the runtime -->
                     <exclusion>
-                        <groupId>org.apache.kafka</groupId>
-                        <artifactId>kafka-clients</artifactId>
-                    </exclusion>
-                    <!-- Brings in a 2.13.4.2 version of databind -->
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-databind</artifactId>
-                    </exclusion>
-                    <!--
-                        This library depends on conflicting:
-                        - com.sun.activation:jakarta.activation and jakarta.activation:jakarta.activation-api
-                        - jakarta.el:jakarta.el-api and org.glassfish:jakarta.el
-                        This library depends on:
-                        - org.glassfish.hk2.external:jakarta.inject that conflicts with javax.inject:javax.inject
-                        - jakarta.validation:jakarta.validation-api that conflicts with javax.validation:validation-api
-                        - jakarta.annotation:jakarta.annotation-api that conflicts with javax.annotation:javax.annotation-api
-                        - com.sun.activation:jakarta.activation that conflicts with javax.activation:javax.activation-api
-                        - jakarta.ws.rs:jakarta.ws.rs-api that conflicts with javax.ws.rs:javax.ws.rs-api
-                        - jakarta.xml.bind:jakarta.xml.bind-api that conflicts with javax.xml.bind:jaxb-api
-                    -->
-                    <exclusion>
-                        <groupId>com.sun.activation</groupId>
-                        <artifactId>jakarta.activation</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>jakarta.activation</groupId>
-                        <artifactId>jakarta.activation-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>jakarta.annotation</groupId>
-                        <artifactId>jakarta.annotation-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>jakarta.validation</groupId>
-                        <artifactId>jakarta.validation-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>jakarta.ws.rs</groupId>
-                        <artifactId>jakarta.ws.rs-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>jakarta.xml.bind</groupId>
-                        <artifactId>jakarta.xml.bind-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.glassfish</groupId>
-                        <artifactId>jakarta.el</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.glassfish.hk2.external</groupId>
-                        <artifactId>jakarta.inject</artifactId>
+                        <groupId>javax.inject</groupId>
+                        <artifactId>javax.inject</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>io.confluent</groupId>
-                <artifactId>kafka-schema-serializer</artifactId>
-                <version>${dep.confluent.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.dropwizard.metrics</groupId>
-                <artifactId>metrics-core</artifactId>
-                <version>4.1.18</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt-api</artifactId>
-                <version>${dep.jsonwebtoken.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt-impl</artifactId>
-                <version>${dep.jsonwebtoken.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt-jackson</artifactId>
-                <version>${dep.jsonwebtoken.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.minio</groupId>
-                <artifactId>minio</artifactId>
-                <version>${dep.minio.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-bom</artifactId>
-                <type>pom</type>
-                <version>${dep.netty.version}</version>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- io.confluent:kafka-avro-serializer uses multiple versions of this transitive dependency -->
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>1.6.2</version>
-            </dependency>
-
-            <!-- io.confluent:kafka-avro-serializer uses multiple versions of this transitive dependency -->
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-core</artifactId>
-                <version>1.6.2</version>
+                <groupId>io.trino.tpch</groupId>
+                <artifactId>tpch</artifactId>
+                <version>1.2</version>
             </dependency>
 
             <dependency>
                 <groupId>it.unimi.dsi</groupId>
                 <artifactId>fastutil</artifactId>
-                <version>8.3.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>2.3.1</version>
+                <version>8.5.12</version>
             </dependency>
 
             <dependency>
@@ -1645,24 +1543,30 @@
                 <version>4.13.2</version>
             </dependency>
 
-            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>8.0.29</version>
-            </dependency>
-
             <!-- force newer version to be used for dependencies -->
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy</artifactId>
-                <version>1.14.1</version>
+                <version>1.14.9</version>
             </dependency>
 
             <dependency>
                 <!-- org.testcontainers:testcontainer's dependencies pull two different versions of this artifact and this is to negotiate the version -->
                 <groupId>net.java.dev.jna</groupId>
                 <artifactId>jna</artifactId>
-                <version>5.12.1</version>
+                <version>${dep.jna.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna-platform</artifactId>
+                <version>${dep.jna.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.minidev</groupId>
+                <artifactId>json-smart</artifactId>
+                <version>2.5.0</version>
             </dependency>
 
             <dependency>
@@ -1674,23 +1578,23 @@
             <dependency>
                 <groupId>org.alluxio</groupId>
                 <artifactId>alluxio-shaded-client</artifactId>
-                <version>2.8.1</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
+                <version>2.9.3</version>
+                <exclusions>
                     <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-log4j12</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-log4j12</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -1707,12 +1611,24 @@
                 <version>${dep.arrow.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.arrow</groupId>
+                <artifactId>arrow-format</artifactId>
+                <version>${dep.arrow.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.arrow</groupId>
                 <artifactId>arrow-memory-core</artifactId>
                 <version>${dep.arrow.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.arrow</groupId>
+                <artifactId>arrow-memory-netty</artifactId>
+                <version>${dep.arrow.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.arrow</groupId>
                 <artifactId>arrow-vector</artifactId>
@@ -1722,19 +1638,25 @@
             <dependency>
                 <groupId>org.apache.avro</groupId>
                 <artifactId>avro</artifactId>
-                <version>1.11.0</version>
+                <version>${dep.avro.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.avro</groupId>
+                <artifactId>avro-mapred</artifactId>
+                <version>${dep.avro.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>1.22</version>
+                <version>1.24.0</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.12.0</version>
+                <version>3.13.0</version>
             </dependency>
 
             <dependency>
@@ -1809,10 +1731,6 @@
                 <artifactId>iceberg-parquet</artifactId>
                 <version>${dep.iceberg.version}</version>
                 <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.parquet</groupId>
-                        <artifactId>parquet-avro</artifactId>
-                    </exclusion>
                     <exclusion>
                         <groupId>org.slf4j</groupId>
                         <artifactId>slf4j-api</artifactId>
@@ -1829,27 +1747,109 @@
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-model</artifactId>
-                <version>3.8.4</version>
+                <version>3.9.5</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.parquet</groupId>
+                <artifactId>parquet-avro</artifactId>
+                <version>${dep.parquet.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.parquet</groupId>
+                <artifactId>parquet-column</artifactId>
+                <version>${dep.parquet.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.yetus</groupId>
+                        <artifactId>audience-annotations</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.parquet</groupId>
+                <artifactId>parquet-common</artifactId>
+                <version>${dep.parquet.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.yetus</groupId>
+                        <artifactId>audience-annotations</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.parquet</groupId>
+                <artifactId>parquet-encoding</artifactId>
+                <version>${dep.parquet.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.parquet</groupId>
+                <artifactId>parquet-format-structures</artifactId>
+                <version>${dep.parquet.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.parquet</groupId>
+                <artifactId>parquet-hadoop</artifactId>
+                <version>${dep.parquet.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.github.luben</groupId>
+                        <artifactId>zstd-jni</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-pool</groupId>
+                        <artifactId>commons-pool</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.yetus</groupId>
+                        <artifactId>audience-annotations</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.xerial.snappy</groupId>
+                        <artifactId>snappy-java</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.parquet</groupId>
+                <artifactId>parquet-jackson</artifactId>
+                <version>${dep.parquet.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.thrift</groupId>
                 <artifactId>libthrift</artifactId>
-                <version>0.17.0</version>
+                <version>0.19.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>jakarta.servlet</groupId>
+                        <artifactId>jakarta.servlet-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
-                <version>3.6.3</version>
+                <version>3.9.1</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
+                        <groupId>ch.qos.logback</groupId>
+                        <artifactId>logback-classic</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-log4j12</artifactId>
+                        <groupId>commons-cli</groupId>
+                        <artifactId>commons-cli</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>org.eclipse.jetty</groupId>
@@ -1860,8 +1860,8 @@
                         <artifactId>jetty-servlet</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>commons-cli</groupId>
-                        <artifactId>commons-cli</artifactId>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-log4j12</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -1869,25 +1869,37 @@
             <dependency>
                 <groupId>org.checkerframework</groupId>
                 <artifactId>checker-qual</artifactId>
-                <version>3.25.0</version>
+                <version>3.39.0</version>
             </dependency>
 
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-utils</artifactId>
-                <version>3.4.1</version>
+                <version>4.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-xml</artifactId>
+                <version>4.0.2</version>
             </dependency>
 
             <dependency>
                 <groupId>org.flywaydb</groupId>
                 <artifactId>flyway-core</artifactId>
-                <version>7.15.0</version>
+                <version>${dep.flyway.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.flywaydb</groupId>
+                <artifactId>flyway-database-oracle</artifactId>
+                <version>${dep.flyway.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-common</artifactId>
-                <version>2.39</version>
+                <groupId>org.flywaydb</groupId>
+                <artifactId>flyway-mysql</artifactId>
+                <version>${dep.flyway.version}</version>
             </dependency>
 
             <!-- force newer version to be used for dependencies -->
@@ -1897,48 +1909,22 @@
                 <version>3.29.2-GA</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.jdbi</groupId>
-                <artifactId>jdbi3-bom</artifactId>
-                <type>pom</type>
-                <version>3.32.0</version>
-                <scope>import</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.jetbrains</groupId>
                 <artifactId>annotations</artifactId>
                 <version>19.0.0</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-stdlib</artifactId>
-                <version>${dep.kotlin.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-stdlib-common</artifactId>
-                <version>${dep.kotlin.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-stdlib-jdk8</artifactId>
-                <version>${dep.kotlin.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.locationtech.jts</groupId>
                 <artifactId>jts-core</artifactId>
-                <version>1.16.1</version>
+                <version>1.19.0</version>
             </dependency>
 
             <dependency>
                 <groupId>org.locationtech.jts.io</groupId>
                 <artifactId>jts-io-common</artifactId>
-                <version>1.16.1</version>
+                <version>1.19.0</version>
                 <exclusions>
                     <exclusion>
                         <groupId>junit</groupId>
@@ -1950,39 +1936,37 @@
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
                 <artifactId>mariadb-java-client</artifactId>
-                <version>3.0.5</version>
+                <version>3.2.0</version>
             </dependency>
 
             <dependency>
                 <groupId>org.openjdk.jol</groupId>
                 <artifactId>jol-core</artifactId>
-                <version>0.16</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm-bom</artifactId>
-                <type>pom</type>
-                <version>9.5</version>
-                <scope>import</scope>
+                <version>0.17</version>
             </dependency>
 
             <dependency>
                 <groupId>org.pcollections</groupId>
                 <artifactId>pcollections</artifactId>
-                <version>2.1.2</version>
+                <version>4.0.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.postgresql</groupId>
                 <artifactId>postgresql</artifactId>
-                <version>42.5.0</version>
+                <version>42.6.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.reactivestreams</groupId>
+                <artifactId>reactive-streams</artifactId>
+                <version>1.0.4</version>
             </dependency>
 
             <dependency>
                 <groupId>org.roaringbitmap</groupId>
                 <artifactId>RoaringBitmap</artifactId>
-                <version>0.9.35</version>
+                <version>1.0.0</version>
             </dependency>
 
             <dependency>
@@ -2003,18 +1987,10 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>testcontainers-bom</artifactId>
-                <type>pom</type>
-                <version>${dep.testcontainers.version}</version>
-                <scope>import</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.xerial.snappy</groupId>
                 <artifactId>snappy-java</artifactId>
-                <version>1.1.8.4</version>
+                <version>1.1.10.5</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.osgi</groupId>
@@ -2027,7 +2003,65 @@
             <dependency>
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
-                <version>1.33</version>
+                <version>2.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.confluent</groupId>
+                <artifactId>kafka-protobuf-provider</artifactId>
+                <version>${dep.confluent.version}</version>
+                <!-- This is under Confluent Community License and it should not be used with compile scope -->
+                <scope>provided</scope>
+                <exclusions>
+                    <!-- Brings in a 2.13.4.2 version of databind -->
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-databind</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>io.confluent</groupId>
+                <artifactId>kafka-protobuf-types</artifactId>
+                <version>${dep.confluent.version}</version>
+                <!-- This is under Confluent Community License and it should not be used with compile scope -->
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>io.confluent</groupId>
+                <artifactId>kafka-json-schema-serializer</artifactId>
+                <version>${dep.confluent.version}</version>
+                <!-- This is under Confluent Community License and it should not be used with compile scope -->
+                <scope>test</scope>
+                <exclusions>
+                    <!-- Brings in a 2.13.4.2 version of databind-->
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-databind</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.google.re2j</groupId>
+                        <artifactId>re2j</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.kafka</groupId>
+                        <artifactId>kafka-clients</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>io.confluent</groupId>
+                <artifactId>kafka-protobuf-serializer</artifactId>
+                <version>${dep.confluent.version}</version>
+                <!-- This is under Confluent Community License and it should not be used with compile scope -->
+                <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -2039,6 +2073,9 @@
                     <groupId>org.antlr</groupId>
                     <artifactId>antlr4-maven-plugin</artifactId>
                     <version>${dep.antlr.version}</version>
+                    <configuration>
+                        <visitor>true</visitor>
+                    </configuration>
                     <executions>
                         <execution>
                             <goals>
@@ -2046,21 +2083,26 @@
                             </goals>
                         </execution>
                     </executions>
-                    <configuration>
-                        <visitor>true</visitor>
-                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>${dep.plugin.surefire.version}</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.2.4</version>
+                    <configuration>
+                        <dependencyReducedPomLocation>${project.build.directory}/pom.xml</dependencyReducedPomLocation>
+                    </configuration>
                 </plugin>
 
                 <plugin>
                     <groupId>org.skife.maven</groupId>
                     <artifactId>really-executable-jar-maven-plugin</artifactId>
-                    <version>1.0.5</version>
+                    <version>2.1.1</version>
                 </plugin>
 
                 <plugin>
@@ -2072,7 +2114,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.6.0</version>
+                    <version>3.1.0</version>
                 </plugin>
 
                 <plugin>
@@ -2117,6 +2159,9 @@
                             <exclusion>com/google/common/collect/Iterables.getOnlyElement:(Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object;</exclusion>
                             <!-- com.google.common.io.BaseEncoding.base64 provides more reach interfaces than java.util.Base64 -->
                             <exclusion>com/google/common/io/BaseEncoding.base64:()Lcom/google/common/io/BaseEncoding;</exclusion>
+
+                            <!-- disable default modernizer violation -->
+                            <exclusion>com/google/inject/Provider</exclusion>
                         </exclusions>
                     </configuration>
                 </plugin>
@@ -2126,16 +2171,6 @@
                     <artifactId>maven-enforcer-plugin</artifactId>
                     <configuration>
                         <rules>
-                            <compound implementation="com.github.ferstl.maven.pomenforcers.CompoundPedanticEnforcer">
-                                <enforcers>POM_SECTION_ORDER,MODULE_ORDER,DEPENDENCY_MANAGEMENT_ORDER,DEPENDENCY_ORDER,DEPENDENCY_ELEMENT</enforcers>
-                                <pomSectionPriorities>modelVersion,parent,groupId,artifactId,version,name,description,packaging,url,inceptionYear,licenses,scm,properties,modules</pomSectionPriorities>
-                                <dependenciesGroupIdPriorities>io.trino,io.airlift</dependenciesGroupIdPriorities>
-                                <dependenciesOrderBy>scope,groupId,artifactId</dependenciesOrderBy>
-                                <dependenciesScopePriorities>compile,runtime,provided,test</dependenciesScopePriorities>
-                                <dependencyManagementOrderBy>groupId,artifactId</dependencyManagementOrderBy>
-                                <dependencyManagementGroupIdPriorities>io.trino,io.airlift</dependencyManagementGroupIdPriorities>
-                                <dependencyElementOrdering>groupId,artifactId,type,version</dependencyElementOrdering>
-                            </compound>
                             <requireUpperBoundDeps>
                                 <excludes combine.children="append">
                                     <!-- TODO: fix this in Airlift resolver -->
@@ -2149,39 +2184,40 @@
                                 <excludes combine.children="append">
                                     <!-- We don't use log4j2, additionally versions < 2.15.0 are vulnerable to the RCE Log4Shell (CVE-2021-44228) -->
                                     <exclude>org.apache.logging.log4j:log4j-core</exclude>
+                                    <!-- 1.x versions are banned due to https://www.cve.org/CVERecord?id=CVE-2022-1471 -->
+                                    <exclude>org.yaml:snakeyaml</exclude>
+                                    <!-- use Guice version -->
+                                    <exclude>javax.inject:javax.inject</exclude>
+                                    <!-- use Jakarta version -->
+                                    <exclude>javax.annotation:javax.annotation-api</exclude>
                                 </excludes>
+                                <includes combine.children="append">
+                                    <!-- 2.x versions are not affected by CVE-2022-1471 -->
+                                    <include>org.yaml:snakeyaml:2.+</include>
+                                </includes>
                             </bannedDependencies>
+                            <requireProfileIdsExist />
                         </rules>
                     </configuration>
-                    <dependencies>
-                        <dependency>
-                            <groupId>com.github.ferstl</groupId>
-                            <artifactId>pedantic-pom-enforcers</artifactId>
-                            <version>2.0.0</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>de.skuzzle.enforcer</groupId>
-                            <artifactId>restrict-imports-enforcer-rule</artifactId>
-                            <version>2.1.0</version>
-                        </dependency>
-                    </dependencies>
                 </plugin>
 
                 <plugin>
                     <groupId>ca.vanzyl.provisio.maven.plugins</groupId>
                     <artifactId>provisio-maven-plugin</artifactId>
-                    <version>1.0.18</version>
+                    <version>1.0.20</version>
                 </plugin>
 
                 <plugin>
-                    <groupId>pl.project13.maven</groupId>
-                    <artifactId>git-commit-id-plugin</artifactId>
+                    <groupId>io.github.git-commit-id</groupId>
+                    <artifactId>git-commit-id-maven-plugin</artifactId>
                     <configuration>
                         <runOnlyOnce>true</runOnlyOnce>
                         <injectAllReactorProjects>true</injectAllReactorProjects>
-                        <offline>true</offline>
                         <!-- A workaround to make build work in a Git worktree, see https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/215 -->
                         <useNativeGit>true</useNativeGit>
+                        <!-- git-commit-id 6.0.0 incorrectly detects the .git dir, breaking the native-git workaround; see https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/639 -->
+                        <!-- When Maven 4.0 is used, this can be replaced by a native Maven property (see MNG-7038), assuming git-commit-id #639 isn't yet fixed -->
+                        <dotGitDirectory>${air.main.basedir}/.git</dotGitDirectory>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -2199,6 +2235,10 @@
                                         <groupId>org.apache.httpcomponents</groupId>
                                         <artifactId>httpclient</artifactId>
                                     </dependency>
+                                    <dependency>
+                                        <groupId>org.apache.httpcomponents.client5</groupId>
+                                        <artifactId>httpclient5</artifactId>
+                                    </dependency>
                                 </conflictingDependencies>
                                 <resources>
                                     <resource>mozilla/public-suffix-list.txt</resource>
@@ -2219,6 +2259,55 @@
                                     <resource>dependencies.properties</resource>
                                 </resources>
                             </exception>
+                            <exception>
+                                <conflictingDependencies>
+                                    <dependency>
+                                        <groupId>com.amazonaws</groupId>
+                                        <artifactId>aws-java-sdk-s3</artifactId>
+                                    </dependency>
+                                    <dependency>
+                                        <groupId>software.amazon.awssdk</groupId>
+                                        <artifactId>sdk-core</artifactId>
+                                    </dependency>
+                                </conflictingDependencies>
+                                <resources>
+                                    <resource>mime.types</resource>
+                                </resources>
+                            </exception>
+                            <exception>
+                                <conflictingDependencies>
+                                    <dependency>
+                                        <groupId>org.flywaydb</groupId>
+                                        <artifactId>flyway-database-oracle</artifactId>
+                                    </dependency>
+                                    <dependency>
+                                        <groupId>org.flywaydb</groupId>
+                                        <artifactId>flyway-mysql</artifactId>
+                                    </dependency>
+                                </conflictingDependencies>
+                                <resources>
+                                    <resource>org/flywaydb/database/version.txt</resource>
+                                </resources>
+                            </exception>
+                            <exception>
+                                <conflictingDependencies>
+                                    <dependency>
+                                        <groupId>org.apache.parquet</groupId>
+                                        <artifactId>parquet-avro</artifactId>
+                                    </dependency>
+                                    <dependency>
+                                        <groupId>org.apache.parquet</groupId>
+                                        <artifactId>parquet-column</artifactId>
+                                    </dependency>
+                                    <dependency>
+                                        <groupId>org.apache.parquet</groupId>
+                                        <artifactId>parquet-hadoop</artifactId>
+                                    </dependency>
+                                </conflictingDependencies>
+                                <packages>
+                                    <package>shaded.parquet.it.unimi.dsi.fastutil</package>
+                                </packages>
+                            </exception>
                         </exceptions>
                     </configuration>
                 </plugin>
@@ -2229,6 +2318,12 @@
                     <version>1.2.8</version>
                     <configuration>
                         <dynamicDependencies>
+                            <DynamicDependency>
+                                <groupId>ca.vanzyl.provisio.maven.plugins</groupId>
+                                <artifactId>provisio-maven-plugin</artifactId>
+                                <version>1.0.20</version>
+                                <repositoryType>PLUGIN</repositoryType>
+                            </DynamicDependency>
                             <DynamicDependency>
                                 <groupId>org.apache.maven.plugins</groupId>
                                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -2247,6 +2342,12 @@
                                 <version>${dep.drift.version}</version>
                                 <repositoryType>PLUGIN</repositoryType>
                             </DynamicDependency>
+                            <DynamicDependency>
+                                <groupId>io.takari.maven.plugins</groupId>
+                                <artifactId>takari-lifecycle-plugin</artifactId>
+                                <version>${dep.takari.version}</version>
+                                <repositoryType>PLUGIN</repositoryType>
+                            </DynamicDependency>
                             <DynamicDependency>
                                 <groupId>com.google.errorprone</groupId>
                                 <artifactId>error_prone_core</artifactId>
@@ -2256,70 +2357,103 @@
                             <DynamicDependency>
                                 <groupId>org.junit.jupiter</groupId>
                                 <artifactId>junit-jupiter-engine</artifactId>
-                                <version>5.3.2</version> <!-- legacy version which Surefire seems to need for some reason -->
+                                <!-- legacy version which Surefire seems to need for some reason -->
+                                <version>5.3.2</version>
                                 <type>pom</type>
                                 <repositoryType>MAIN</repositoryType>
                             </DynamicDependency>
                             <DynamicDependency>
                                 <groupId>org.junit.jupiter</groupId>
                                 <artifactId>junit-jupiter-params</artifactId>
-                                <version>5.3.2</version> <!-- legacy version which Surefire seems to need for some reason -->
+                                <!-- legacy version which Surefire seems to need for some reason -->
+                                <version>5.3.2</version>
                                 <type>pom</type>
                                 <repositoryType>MAIN</repositoryType>
                             </DynamicDependency>
                             <DynamicDependency>
                                 <groupId>org.mockito</groupId>
                                 <artifactId>mockito-core</artifactId>
-                                <version>2.28.2</version> <!-- legacy version which Surefire seems to need for some reason -->
+                                <!-- legacy version which Surefire seems to need for some reason -->
+                                <version>2.28.2</version>
                                 <type>pom</type>
                                 <repositoryType>MAIN</repositoryType>
                             </DynamicDependency>
                             <DynamicDependency>
                                 <groupId>org.powermock</groupId>
                                 <artifactId>powermock-reflect</artifactId>
-                                <version>2.0.5</version> <!-- legacy version which Surefire seems to need for some reason -->
+                                <!-- legacy version which Surefire seems to need for some reason -->
+                                <version>2.0.5</version>
                                 <type>pom</type>
                                 <repositoryType>MAIN</repositoryType>
                             </DynamicDependency>
                             <DynamicDependency>
                                 <groupId>junit</groupId>
                                 <artifactId>junit</artifactId>
-                                <version>4.13</version> <!-- legacy version which Surefire seems to need for some reason -->
+                                <!-- legacy version which Surefire seems to need for some reason -->
+                                <version>4.13</version>
                                 <type>pom</type>
                                 <repositoryType>MAIN</repositoryType>
                             </DynamicDependency>
                             <DynamicDependency>
                                 <groupId>org.testng</groupId>
                                 <artifactId>testng</artifactId>
-                                <version>5.10</version> <!-- legacy version which Surefire seems to need for some reason -->
+                                <!-- legacy version which Surefire seems to need for some reason -->
+                                <version>5.10</version>
                                 <type>pom</type>
                                 <repositoryType>MAIN</repositoryType>
                             </DynamicDependency>
                             <DynamicDependency>
                                 <groupId>org.assertj</groupId>
                                 <artifactId>assertj-core</artifactId>
-                                <version>3.9.1</version> <!-- legacy version which Surefire seems to need for some reason -->
+                                <!-- legacy version which Surefire seems to need for some reason -->
+                                <version>3.9.1</version>
                                 <type>pom</type>
                                 <repositoryType>MAIN</repositoryType>
                             </DynamicDependency>
                             <DynamicDependency>
                                 <groupId>org.hamcrest</groupId>
                                 <artifactId>hamcrest-library</artifactId>
-                                <version>1.3</version> <!-- legacy version which Surefire seems to need for some reason -->
+                                <!-- legacy version which Surefire seems to need for some reason -->
+                                <version>1.3</version>
                                 <type>pom</type>
                                 <repositoryType>MAIN</repositoryType>
                             </DynamicDependency>
                             <DynamicDependency>
                                 <groupId>org.easytesting</groupId>
                                 <artifactId>fest-assert</artifactId>
-                                <version>1.4</version> <!-- legacy version which Surefire seems to need for some reason -->
+                                <!-- legacy version which Surefire seems to need for some reason -->
+                                <version>1.4</version>
                                 <type>pom</type>
                                 <repositoryType>MAIN</repositoryType>
                             </DynamicDependency>
                             <DynamicDependency>
                                 <groupId>org.apache.maven.surefire</groupId>
                                 <artifactId>surefire-testng</artifactId>
-                                <version>2.22.2</version> <!-- legacy version which Surefire seems to need for some reason -->
+                                <version>${dep.plugin.surefire.version}</version>
+                                <type>jar</type>
+                                <repositoryType>MAIN</repositoryType>
+                            </DynamicDependency>
+                            <DynamicDependency>
+                                <groupId>org.junit.platform</groupId>
+                                <artifactId>junit-platform-launcher</artifactId>
+                                <!-- legacy version which Surefire seems to need for some reason -->
+                                <version>1.10.0</version>
+                                <type>jar</type>
+                                <repositoryType>MAIN</repositoryType>
+                            </DynamicDependency>
+                            <DynamicDependency>
+                                <groupId>io.airlift</groupId>
+                                <artifactId>event-http</artifactId>
+                                <!-- it's not resolved by dependency-plugin correctly -->
+                                <version>${dep.airlift.version}</version>
+                                <type>jar</type>
+                                <repositoryType>MAIN</repositoryType>
+                            </DynamicDependency>
+                            <DynamicDependency>
+                                <groupId>io.airlift</groupId>
+                                <artifactId>jmx-http-rpc</artifactId>
+                                <!-- it's not resolved by dependency-plugin correctly -->
+                                <version>${dep.airlift.version}</version>
                                 <type>jar</type>
                                 <repositoryType>MAIN</repositoryType>
                             </DynamicDependency>
@@ -2343,18 +2477,14 @@
                 <extensions>true</extensions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration combine.children="append">
-                    <fork>false</fork>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <properties>
+                        <configurationParameters>junit.jupiter.execution.timeout.thread.mode.default = SEPARATE_THREAD
+                            junit.jupiter.extensions.autodetection.enabled = true</configurationParameters>
+                    </properties>
                     <includes>
                         <!-- Tests classes should start with "Test", but we do also want to include tests incorrectly named, with "Test" at the end -->
                         <include>**/Test*.java</include>
@@ -2382,10 +2512,14 @@
                         <configuration combine.children="merge">
                             <!-- forking not required due to JVM flags in .mvn/jvm.config -->
                             <!-- see https://errorprone.info/docs/installation#maven -->
+                            <!-- Do not fail on error-prone's warnings even for modules using air.compiler.fail-warnings -->
+                            <!-- TODO silence warnings we choose to ignore and raise important warnings to error and then remove <failOnWarning> -->
+                            <failOnWarning>false</failOnWarning>
                             <compilerArgs>
                                 <arg>-XDcompilePolicy=simple</arg>
                                 <arg>
                                     -Xplugin:ErrorProne \
+                                    -Xep:BadComparable:ERROR \
                                     -Xep:BadInstanceof:ERROR \
                                     -Xep:BoxedPrimitiveConstructor:ERROR \
                                     -Xep:ClassCanBeStatic:ERROR \
@@ -2393,31 +2527,45 @@
                                     -Xep:DefaultCharset:ERROR \
                                     -Xep:DistinctVarargsChecker:ERROR \
                                     -Xep:EmptyBlockTag:ERROR \
-                                    -Xep:EqualsGetClass:OFF <!-- we would rather want the opposite check --> \
+                                    <!-- we would rather want the opposite check -->
+                                    -Xep:EqualsGetClass:OFF \
                                     -Xep:EqualsIncompatibleType:ERROR \
                                     -Xep:FallThrough:ERROR \
-                                    -Xep:GuardedBy:OFF <!-- needs some careful inspection --> \
+                                    -Xep:GetClassOnEnum:ERROR \
+                                    <!-- needs some careful inspection -->
+                                    -Xep:GuardedBy:OFF \
                                     -Xep:HidingField:ERROR \
-                                    -Xep:ImmutableEnumChecker:OFF <!-- flags enums with List fields even if initialized with ImmutableList, and other false positives --> \
+                                    <!-- This check requires list fields to be declared as ImmutableList, which is not in line with project's code style -->
+                                    -Xep:Immutable:OFF \
+                                    <!-- flags enums with List fields even if initialized with ImmutableList, and other false positives -->
+                                    -Xep:ImmutableEnumChecker:OFF \
                                     -Xep:ImmutableSetForContains:ERROR \
-                                    -Xep:InconsistentCapitalization:ERROR <!-- fields/variables should not differ only in case --> \
+                                    <!-- fields/variables should not differ only in case -->
+                                    -Xep:InconsistentCapitalization:ERROR \
                                     -Xep:InconsistentHashCode:ERROR \
                                     -Xep:InjectOnConstructorOfAbstractClass:ERROR \
                                     -Xep:MissingCasesInEnumSwitch:ERROR \
                                     -Xep:MissingOverride:ERROR \
-                                    -Xep:MissingSummary:OFF <!-- Sometimes our javadoc contains just a @see directive --> \
+                                    <!-- Sometimes our javadoc contains just a @see directive -->
+                                    -Xep:MissingSummary:OFF \
                                     -Xep:MutablePublicArray:ERROR \
+                                    -Xep:NarrowCalculation:ERROR \
+                                    -Xep:NarrowingCompoundAssignment:ERROR \
                                     -Xep:NullOptional:ERROR \
+                                    -Xep:NullableOptional:ERROR \
                                     -Xep:ObjectToString:ERROR \
                                     -Xep:OptionalNotPresent:ERROR \
+                                    -Xep:OrphanedFormatString:ERROR \
                                     -Xep:Overrides:ERROR \
-                                    -Xep:PreferredInterfaceType:OFF <!-- flags List fields even if initialized with ImmutableList --> \
+                                    <!-- flags List fields even if initialized with ImmutableList -->
+                                    -Xep:PreferredInterfaceType:OFF \
                                     -Xep:PrimitiveArrayPassedToVarargsMethod:ERROR \
+                                    -Xep:StaticAssignmentOfThrowable:ERROR \
                                     -Xep:StreamResourceLeak:ERROR \
-                                    -Xep:UnnecessaryLambda:OFF <!-- we deliberately use it in a couple of places --> \
                                     -Xep:UnnecessaryMethodReference:ERROR \
                                     -Xep:UnnecessaryOptionalGet:ERROR \
-                                    -Xep:UnusedVariable:ERROR \
+                                    <!-- Enable when https://github.com/google/error-prone/pull/3837 is fixed -->
+                                    <!-- -Xep:UnusedVariable:ERROR \ -->
                                     -Xep:UseEnumSwitch:ERROR \
                                     -XepExcludedPaths:.*/target/generated-(|test-)sources/.*
                                 </arg>
@@ -2457,21 +2605,22 @@
             <properties>
                 <!-- the *local* master, not refs/remotes/... -->
                 <gib.referenceBranch>master</gib.referenceBranch>
+                <!-- set as properties, not configuration, to allow overriding them -->
+                <gib.buildDownstream>true</gib.buildDownstream>
+                <gib.buildUpstream>true</gib.buildUpstream>
             </properties>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>io.github.gitflow-incremental-builder</groupId>
                         <artifactId>gitflow-incremental-builder</artifactId>
-                        <version>4.1.1</version>
+                        <version>4.5.1</version>
                         <extensions>true</extensions>
                         <configuration>
                             <disableIfBranchMatches>master</disableIfBranchMatches>
                             <compareToMergeBase>true</compareToMergeBase>
                             <uncommitted>true</uncommitted>
                             <untracked>true</untracked>
-                            <buildDownstream>true</buildDownstream>
-                            <buildUpstream>true</buildUpstream>
                             <buildUpstreamMode>impacted</buildUpstreamMode>
                             <!-- Skip tests and checks for upstream modules since they have not been modified but are still required to be built -->
                             <skipTestsForUpstreamModules>true</skipTestsForUpstreamModules>
diff --git a/service/trino-proxy/pom.xml b/service/trino-proxy/pom.xml
index 8f4af06af1e9..d2c06aab42c6 100644
--- a/service/trino-proxy/pom.xml
+++ b/service/trino-proxy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -18,6 +18,21 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>bootstrap</artifactId>
@@ -90,22 +105,12 @@
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <artifactId>tracing</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
         </dependency>
 
         <dependency>
@@ -124,28 +129,28 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-servlet-api</artifactId>
+            <artifactId>jetty-jakarta-servlet-api</artifactId>
         </dependency>
 
         <dependency>
@@ -153,7 +158,12 @@
             <artifactId>jmxutils</artifactId>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-blackhole</artifactId>
@@ -172,6 +182,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-tpch</artifactId>
@@ -185,8 +201,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/service/trino-proxy/src/main/java/io/trino/proxy/ForProxy.java b/service/trino-proxy/src/main/java/io/trino/proxy/ForProxy.java
index 7e7ac05210db..fc9c70a62e63 100644
--- a/service/trino-proxy/src/main/java/io/trino/proxy/ForProxy.java
+++ b/service/trino-proxy/src/main/java/io/trino/proxy/ForProxy.java
@@ -13,7 +13,7 @@
  */
 package io.trino.proxy;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ForProxy
 {
 }
diff --git a/service/trino-proxy/src/main/java/io/trino/proxy/JsonWebTokenHandler.java b/service/trino-proxy/src/main/java/io/trino/proxy/JsonWebTokenHandler.java
index d21888dd6f8f..cb908bd69435 100644
--- a/service/trino-proxy/src/main/java/io/trino/proxy/JsonWebTokenHandler.java
+++ b/service/trino-proxy/src/main/java/io/trino/proxy/JsonWebTokenHandler.java
@@ -13,14 +13,13 @@
  */
 package io.trino.proxy;
 
+import com.google.inject.Inject;
 import io.airlift.security.pem.PemReader;
 import io.jsonwebtoken.JwtBuilder;
 import io.jsonwebtoken.impl.DefaultJwtBuilder;
 import io.jsonwebtoken.jackson.io.JacksonSerializer;
 import io.jsonwebtoken.security.Keys;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
diff --git a/service/trino-proxy/src/main/java/io/trino/proxy/ProxyConfig.java b/service/trino-proxy/src/main/java/io/trino/proxy/ProxyConfig.java
index 456dadfe906f..5f30518fb9f8 100644
--- a/service/trino-proxy/src/main/java/io/trino/proxy/ProxyConfig.java
+++ b/service/trino-proxy/src/main/java/io/trino/proxy/ProxyConfig.java
@@ -16,8 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.validation.FileExists;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.File;
 import java.net.URI;
diff --git a/service/trino-proxy/src/main/java/io/trino/proxy/ProxyResource.java b/service/trino-proxy/src/main/java/io/trino/proxy/ProxyResource.java
index 64c09209786f..0c6708676fc4 100644
--- a/service/trino-proxy/src/main/java/io/trino/proxy/ProxyResource.java
+++ b/service/trino-proxy/src/main/java/io/trino/proxy/ProxyResource.java
@@ -14,7 +14,6 @@
 package io.trino.proxy;
 
 import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
@@ -22,29 +21,28 @@
 import com.google.common.hash.HashFunction;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Inject;
 import io.airlift.http.client.HttpClient;
 import io.airlift.http.client.Request;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.proxy.ProxyResponseHandler.ProxyResponse;
-
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
+import jakarta.annotation.PreDestroy;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -73,6 +71,12 @@
 import static io.airlift.http.client.Request.Builder.preparePost;
 import static io.airlift.http.client.StaticBodyGenerator.createStaticBodyGenerator;
 import static io.airlift.jaxrs.AsyncResponseHandler.bindAsyncResponse;
+import static io.trino.plugin.base.util.JsonUtils.jsonFactoryBuilder;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;
+import static jakarta.ws.rs.core.Response.Status.BAD_GATEWAY;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.noContent;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.Files.readAllBytes;
@@ -81,20 +85,15 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.TimeUnit.MINUTES;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;
-import static javax.ws.rs.core.Response.Status.BAD_GATEWAY;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.noContent;
 
 @Path("/")
 public class ProxyResource
 {
     private static final Logger log = Logger.get(ProxyResource.class);
 
-    private static final String X509_ATTRIBUTE = "javax.servlet.request.X509Certificate";
+    private static final String X509_ATTRIBUTE = "jakarta.servlet.request.X509Certificate";
     private static final Duration ASYNC_TIMEOUT = new Duration(2, MINUTES);
-    private static final JsonFactory JSON_FACTORY = new JsonFactoryBuilder().disable(CANONICALIZE_FIELD_NAMES).build();
+    private static final JsonFactory JSON_FACTORY = jsonFactoryBuilder().disable(CANONICALIZE_FIELD_NAMES).build();
 
     private final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed("proxy-%s"));
     private final HttpClient httpClient;
diff --git a/service/trino-proxy/src/main/java/io/trino/proxy/TrinoProxy.java b/service/trino-proxy/src/main/java/io/trino/proxy/TrinoProxy.java
index bed547e9e297..242786b0b9e5 100644
--- a/service/trino-proxy/src/main/java/io/trino/proxy/TrinoProxy.java
+++ b/service/trino-proxy/src/main/java/io/trino/proxy/TrinoProxy.java
@@ -25,10 +25,15 @@
 import io.airlift.log.Logger;
 import io.airlift.node.NodeModule;
 import io.airlift.tracetoken.TraceTokenModule;
+import io.airlift.tracing.TracingModule;
 import org.weakref.jmx.guice.MBeanModule;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
+
 public final class TrinoProxy
 {
+    private static final String VERSION = firstNonNull(TrinoProxy.class.getPackage().getImplementationVersion(), "unknown");
+
     private TrinoProxy() {}
 
     public static void start(Module... extraModules)
@@ -42,6 +47,7 @@ public static void start(Module... extraModules)
                 .add(new JmxModule())
                 .add(new LogJmxModule())
                 .add(new TraceTokenModule())
+                .add(new TracingModule("trino-proxy", VERSION))
                 .add(new EventModule())
                 .add(new ProxyModule())
                 .add(extraModules)
diff --git a/service/trino-proxy/src/test/java/io/trino/proxy/TestJwtHandlerConfig.java b/service/trino-proxy/src/test/java/io/trino/proxy/TestJwtHandlerConfig.java
index 1e46f5263cb8..194d4de9a8fa 100644
--- a/service/trino-proxy/src/test/java/io/trino/proxy/TestJwtHandlerConfig.java
+++ b/service/trino-proxy/src/test/java/io/trino/proxy/TestJwtHandlerConfig.java
@@ -14,7 +14,7 @@
 package io.trino.proxy;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/service/trino-proxy/src/test/java/io/trino/proxy/TestProxyConfig.java b/service/trino-proxy/src/test/java/io/trino/proxy/TestProxyConfig.java
index 61b91223ce65..1166e9791854 100644
--- a/service/trino-proxy/src/test/java/io/trino/proxy/TestProxyConfig.java
+++ b/service/trino-proxy/src/test/java/io/trino/proxy/TestProxyConfig.java
@@ -14,7 +14,7 @@
 package io.trino.proxy;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/service/trino-proxy/src/test/java/io/trino/proxy/TestProxyServer.java b/service/trino-proxy/src/test/java/io/trino/proxy/TestProxyServer.java
index 565569883684..1c179d875f70 100644
--- a/service/trino-proxy/src/test/java/io/trino/proxy/TestProxyServer.java
+++ b/service/trino-proxy/src/test/java/io/trino/proxy/TestProxyServer.java
@@ -29,9 +29,11 @@
 import io.trino.plugin.blackhole.BlackHolePlugin;
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.server.testing.TestingTrinoServer;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.io.IOException;
 import java.net.URI;
@@ -56,11 +58,9 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestProxyServer
 {
     private Path sharedSecretFile;
@@ -69,7 +69,7 @@ public class TestProxyServer
     private HttpServerInfo httpServerInfo;
     private ExecutorService executorService;
 
-    @BeforeClass
+    @BeforeAll
     public void setupServer()
             throws Exception
     {
@@ -108,7 +108,7 @@ public void setupServer()
         setupTestTable();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDownServer()
             throws IOException
     {
@@ -125,7 +125,7 @@ public void testMetadata()
             throws Exception
     {
         try (Connection connection = createConnection()) {
-            assertEquals(connection.getMetaData().getDatabaseProductVersion(), "testversion");
+            assertThat(connection.getMetaData().getDatabaseProductVersion()).isEqualTo("testversion");
         }
     }
 
@@ -142,8 +142,8 @@ public void testQuery()
                 count++;
                 sum += rs.getLong("n");
             }
-            assertEquals(count, 15000);
-            assertEquals(sum, (count / 2) * (1 + count));
+            assertThat(count).isEqualTo(15000);
+            assertThat(sum).isEqualTo((count / 2) * (1 + count));
         }
     }
 
@@ -167,7 +167,8 @@ public void testSetSession()
         }
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testCancel()
             throws Exception
     {
@@ -195,20 +196,21 @@ public void testCancel()
 
             // start query and make sure it is not finished
             queryStarted.await(10, SECONDS);
-            assertNotNull(queryId.get());
-            assertFalse(getQueryState(queryId.get()).isDone());
+            assertThat(queryId.get()).isNotNull();
+            assertThat(getQueryState(queryId.get()).isDone()).isFalse();
 
             // cancel the query from this test thread
             statement.cancel();
 
             // make sure the query was aborted
             queryFinished.await(10, SECONDS);
-            assertNotNull(queryFailure.get());
-            assertEquals(getQueryState(queryId.get()), FAILED);
+            assertThat(queryFailure.get()).isNotNull();
+            assertThat(getQueryState(queryId.get())).isEqualTo(FAILED);
         }
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testPartialCancel()
             throws Exception
     {
@@ -216,8 +218,8 @@ public void testPartialCancel()
                 Statement statement = connection.createStatement();
                 ResultSet resultSet = statement.executeQuery("SELECT count(*) FROM blackhole.test.slow")) {
             statement.unwrap(TrinoStatement.class).partialCancel();
-            assertTrue(resultSet.next());
-            assertEquals(resultSet.getLong(1), 0);
+            assertThat(resultSet.next()).isTrue();
+            assertThat(resultSet.getLong(1)).isEqualTo(0);
         }
     }
 
@@ -228,7 +230,9 @@ private QueryState getQueryState(String queryId)
         try (Connection connection = createConnection();
                 Statement statement = connection.createStatement();
                 ResultSet rs = statement.executeQuery(sql)) {
-            assertTrue(rs.next(), "query not found");
+            assertThat(rs.next())
+                    .describedAs("query not found")
+                    .isTrue();
             return QueryState.valueOf(rs.getString("state"));
         }
     }
@@ -238,14 +242,15 @@ private void setupTestTable()
     {
         try (Connection connection = createConnection();
                 Statement statement = connection.createStatement()) {
-            assertEquals(statement.executeUpdate("CREATE SCHEMA blackhole.test"), 0);
-            assertEquals(statement.executeUpdate("CREATE TABLE blackhole.test.slow (x bigint) " +
+            assertThat(statement.executeUpdate("CREATE SCHEMA blackhole.test")).isEqualTo(0);
+            assertThat(statement.executeUpdate("CREATE TABLE blackhole.test.slow (x bigint) " +
                     "WITH (" +
                     "   split_count = 1, " +
                     "   pages_per_split = 1, " +
                     "   rows_per_page = 1, " +
                     "   page_processing_delay = '1m'" +
-                    ")"), 0);
+                    ")"))
+                    .isEqualTo(0);
         }
     }
 
diff --git a/service/trino-verifier/pom.xml b/service/trino-verifier/pom.xml
index cb2de0bb6074..3cde6e3776b0 100644
--- a/service/trino-verifier/pom.xml
+++ b/service/trino-verifier/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-verifier</artifactId>
-    <name>trino-verifier</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,18 +18,29 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-jdbc</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-parser</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>info.picocli</groupId>
+            <artifactId>picocli</artifactId>
         </dependency>
 
         <dependency>
@@ -69,44 +79,33 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-jdbc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-parser</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>info.picocli</groupId>
-            <artifactId>picocli</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -125,12 +124,23 @@
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>testing</artifactId>
@@ -138,20 +148,20 @@
         </dependency>
 
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>mysql</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mysql</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -163,10 +173,10 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <phase>package</phase>
                         <configuration>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>executable</shadedClassifierName>
@@ -192,10 +202,10 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>really-executable-jar</goal>
                         </goals>
+                        <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/DatabaseEventClient.java b/service/trino-verifier/src/main/java/io/trino/verifier/DatabaseEventClient.java
index a50ed768743e..c8f0733f2a24 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/DatabaseEventClient.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/DatabaseEventClient.java
@@ -13,12 +13,11 @@
  */
 package io.trino.verifier;
 
+import com.google.inject.Inject;
 import io.airlift.event.client.AbstractEventClient;
 import io.airlift.json.JsonCodec;
-
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/HumanReadableEventClient.java b/service/trino-verifier/src/main/java/io/trino/verifier/HumanReadableEventClient.java
index 1486d03b7a02..c13abcfe64d8 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/HumanReadableEventClient.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/HumanReadableEventClient.java
@@ -13,12 +13,11 @@
  */
 package io.trino.verifier;
 
+import com.google.inject.Inject;
 import io.airlift.event.client.AbstractEventClient;
 import io.airlift.stats.QuantileDigest;
 import io.airlift.units.Duration;
 
-import javax.inject.Inject;
-
 import java.io.Closeable;
 import java.util.Optional;
 import java.util.regex.Pattern;
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/JsonEventClient.java b/service/trino-verifier/src/main/java/io/trino/verifier/JsonEventClient.java
index 5b930fe6c093..243c9451e7d4 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/JsonEventClient.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/JsonEventClient.java
@@ -16,17 +16,17 @@
 import com.fasterxml.jackson.core.JsonEncoding;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
+import com.google.inject.Inject;
 import io.airlift.event.client.AbstractEventClient;
 import io.airlift.event.client.JsonEventSerializer;
 
-import javax.inject.Inject;
-
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.UncheckedIOException;
 
+import static io.trino.plugin.base.util.JsonUtils.jsonFactory;
 import static java.nio.charset.Charset.defaultCharset;
 import static java.util.Objects.requireNonNull;
 
@@ -35,7 +35,7 @@ public class JsonEventClient
 {
     // TODO we should use JsonEventWriter instead
     private final JsonEventSerializer serializer = new JsonEventSerializer(VerifierQueryEvent.class);
-    private final JsonFactory factory = new JsonFactory();
+    private final JsonFactory factory = jsonFactory();
     private final PrintStream out;
 
     @Inject
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/QueryRewriter.java b/service/trino-verifier/src/main/java/io/trino/verifier/QueryRewriter.java
index 008193fc9916..a7b1c684194a 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/QueryRewriter.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/QueryRewriter.java
@@ -19,7 +19,6 @@
 import com.google.common.util.concurrent.TimeLimiter;
 import com.google.common.util.concurrent.UncheckedTimeoutException;
 import io.airlift.units.Duration;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.CreateTable;
 import io.trino.sql.tree.CreateTableAsSelect;
@@ -56,8 +55,8 @@
 import java.util.concurrent.TimeUnit;
 
 import static io.trino.sql.SqlFormatter.formatSql;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DOUBLE;
 import static io.trino.sql.tree.LikeClause.PropertiesOption.INCLUDING;
+import static io.trino.sql.tree.SaveMode.IGNORE;
 import static io.trino.verifier.QueryType.READ;
 import static io.trino.verifier.VerifyCommand.statementToQueryType;
 import static java.lang.String.format;
@@ -104,7 +103,7 @@ public Query shadowQuery(Query query)
             throw new QueryRewriteException("Cannot rewrite queries that use post-queries");
         }
 
-        Statement statement = parser.createStatement(query.getQuery(), new ParsingOptions(AS_DOUBLE /* anything */));
+        Statement statement = parser.createStatement(query.getQuery());
         try (Connection connection = DriverManager.getConnection(gatewayUrl, usernameOverride.orElse(query.getUsername()), passwordOverride.orElse(query.getPassword()))) {
             trySetConnectionProperties(query, connection);
             if (statement instanceof CreateTableAsSelect) {
@@ -122,7 +121,7 @@ private Query rewriteCreateTableAsSelect(Connection connection, Query query, Cre
             throws SQLException, QueryRewriteException
     {
         QualifiedName temporaryTableName = generateTemporaryTableName(statement.getName());
-        Statement rewritten = new CreateTableAsSelect(temporaryTableName, statement.getQuery(), statement.isNotExists(), statement.getProperties(), statement.isWithData(), statement.getColumnAliases(), Optional.empty());
+        Statement rewritten = new CreateTableAsSelect(temporaryTableName, statement.getQuery(), statement.getSaveMode(), statement.getProperties(), statement.isWithData(), statement.getColumnAliases(), Optional.empty());
         String createTableAsSql = formatSql(rewritten);
         String checksumSql = checksumSql(getColumns(connection, statement), temporaryTableName);
         String dropTableSql = dropTableSql(temporaryTableName);
@@ -133,7 +132,7 @@ private Query rewriteInsertQuery(Connection connection, Query query, Insert stat
             throws SQLException, QueryRewriteException
     {
         QualifiedName temporaryTableName = generateTemporaryTableName(statement.getTarget());
-        Statement createTemporaryTable = new CreateTable(temporaryTableName, ImmutableList.of(new LikeClause(statement.getTarget(), Optional.of(INCLUDING))), true, ImmutableList.of(), Optional.empty());
+        Statement createTemporaryTable = new CreateTable(temporaryTableName, ImmutableList.of(new LikeClause(statement.getTarget(), Optional.of(INCLUDING))), IGNORE, ImmutableList.of(), Optional.empty());
         String createTemporaryTableSql = formatSql(createTemporaryTable);
         String insertSql = formatSql(new Insert(new Table(temporaryTableName), statement.getColumns(), statement.getQuery()));
         String checksumSql = checksumSql(getColumnsForTable(connection, query.getCatalog(), query.getSchema(), statement.getTarget().toString()), temporaryTableName);
@@ -207,10 +206,10 @@ private List<Column> getColumns(Connection connection, CreateTableAsSelect creat
                     querySpecification.getOffset(),
                     Optional.of(new Limit(new LongLiteral("0"))));
 
-            zeroRowsQuery = new io.trino.sql.tree.Query(createSelectClause.getWith(), innerQuery, Optional.empty(), Optional.empty(), Optional.empty());
+            zeroRowsQuery = new io.trino.sql.tree.Query(ImmutableList.of(), createSelectClause.getWith(), innerQuery, Optional.empty(), Optional.empty(), Optional.empty());
         }
         else {
-            zeroRowsQuery = new io.trino.sql.tree.Query(createSelectClause.getWith(), innerQuery, Optional.empty(), Optional.empty(), Optional.of(new Limit(new LongLiteral("0"))));
+            zeroRowsQuery = new io.trino.sql.tree.Query(ImmutableList.of(), createSelectClause.getWith(), innerQuery, Optional.empty(), Optional.empty(), Optional.of(new Limit(new LongLiteral("0"))));
         }
 
         ImmutableList.Builder<Column> columns = ImmutableList.builder();
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/SupportedEventClients.java b/service/trino-verifier/src/main/java/io/trino/verifier/SupportedEventClients.java
index 8cd9da243906..8a12cd2b816e 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/SupportedEventClients.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/SupportedEventClients.java
@@ -13,7 +13,7 @@
  */
 package io.trino.verifier;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface SupportedEventClients
 {
 }
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/TrinoVerifierModule.java b/service/trino-verifier/src/main/java/io/trino/verifier/TrinoVerifierModule.java
index 99ff8f945b5f..42b8f4d6d516 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/TrinoVerifierModule.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/TrinoVerifierModule.java
@@ -15,14 +15,13 @@
 
 import com.google.inject.Binder;
 import com.google.inject.Inject;
+import com.google.inject.Provider;
 import com.google.inject.Scopes;
 import com.google.inject.multibindings.Multibinder;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.airlift.event.client.EventClient;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.inject.Provider;
-
 import java.util.Set;
 
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/Verifier.java b/service/trino-verifier/src/main/java/io/trino/verifier/Verifier.java
index e3446b3ab491..1cd786b7a4e4 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/Verifier.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/Verifier.java
@@ -20,8 +20,7 @@
 import io.airlift.units.Duration;
 import io.trino.spi.ErrorCode;
 import io.trino.spi.TrinoException;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/VerifierConfig.java b/service/trino-verifier/src/main/java/io/trino/verifier/VerifierConfig.java
index ca9938346c67..22f7b4da045c 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/VerifierConfig.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/VerifierConfig.java
@@ -23,12 +23,11 @@
 import io.airlift.units.Duration;
 import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.QualifiedName;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 import org.joda.time.DateTime;
 
-import javax.annotation.Nullable;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/VerifierQueryEvent.java b/service/trino-verifier/src/main/java/io/trino/verifier/VerifierQueryEvent.java
index afc33a57c3ad..7845278818f4 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/VerifierQueryEvent.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/VerifierQueryEvent.java
@@ -14,11 +14,10 @@
 package io.trino.verifier;
 
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.airlift.event.client.EventField;
 import io.airlift.event.client.EventType;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.List;
 
 @Immutable
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/VerifyCommand.java b/service/trino-verifier/src/main/java/io/trino/verifier/VerifyCommand.java
index a4c55fd9fdab..9874dc86d07d 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/VerifyCommand.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/VerifyCommand.java
@@ -23,6 +23,7 @@
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
+import com.google.inject.Provider;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
@@ -32,7 +33,6 @@
 import io.airlift.event.client.EventClient;
 import io.airlift.json.JsonModule;
 import io.airlift.log.Logger;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.AddColumn;
 import io.trino.sql.tree.Comment;
@@ -71,8 +71,6 @@
 import picocli.CommandLine.Parameters;
 import picocli.CommandLine.Spec;
 
-import javax.inject.Provider;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -97,7 +95,6 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Throwables.throwIfUnchecked;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DOUBLE;
 import static io.trino.verifier.QueryType.CREATE;
 import static io.trino.verifier.QueryType.MODIFY;
 import static io.trino.verifier.QueryType.READ;
@@ -363,7 +360,7 @@ private static boolean queryTypeAllowed(SqlParser parser, Set<QueryType> allowed
     static QueryType statementToQueryType(SqlParser parser, String sql)
     {
         try {
-            return statementToQueryType(parser.createStatement(sql, new ParsingOptions(AS_DOUBLE /* anything */)));
+            return statementToQueryType(parser.createStatement(sql));
         }
         catch (RuntimeException e) {
             throw new UnsupportedOperationException();
diff --git a/service/trino-verifier/src/test/java/io/trino/verifier/TestDatabaseEventClient.java b/service/trino-verifier/src/test/java/io/trino/verifier/TestDatabaseEventClient.java
index 9eca4f8cada9..be4875b7f8b4 100644
--- a/service/trino-verifier/src/test/java/io/trino/verifier/TestDatabaseEventClient.java
+++ b/service/trino-verifier/src/test/java/io/trino/verifier/TestDatabaseEventClient.java
@@ -17,10 +17,11 @@
 import io.airlift.json.JsonCodecFactory;
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.sqlobject.SqlObjectPlugin;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.testcontainers.containers.MySQLContainer;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -30,11 +31,10 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestDatabaseEventClient
 {
     private static final VerifierQueryEvent FULL_EVENT = new VerifierQueryEvent(
@@ -98,7 +98,7 @@ public class TestDatabaseEventClient
     private JsonCodec<List<String>> codec;
     private DatabaseEventClient eventClient;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         mysqlContainer = new MySQLContainer<>("mysql:8.0.30");
@@ -120,7 +120,7 @@ private static String getJdbcUrl(MySQLContainer<?> container)
                 container.getPassword());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void teardown()
     {
         if (mysqlContainer != null) {
@@ -142,28 +142,28 @@ public void testFull()
             try (Statement statement = connection.createStatement()) {
                 statement.execute("SELECT * FROM verifier_query_events WHERE suite = 'suite_full'");
                 try (ResultSet resultSet = statement.getResultSet()) {
-                    assertTrue(resultSet.next());
-                    assertEquals(resultSet.getString("suite"), "suite_full");
-                    assertEquals(resultSet.getString("run_id"), "runid");
-                    assertEquals(resultSet.getString("source"), "source");
-                    assertEquals(resultSet.getString("name"), "name");
-                    assertTrue(resultSet.getBoolean("failed"));
-                    assertEquals(resultSet.getString("test_catalog"), "testcatalog");
-                    assertEquals(resultSet.getString("test_schema"), "testschema");
-                    assertEquals(resultSet.getString("test_setup_query_ids_json"), codec.toJson(FULL_EVENT.getTestSetupQueryIds()));
-                    assertEquals(resultSet.getString("test_query_id"), "TEST_QUERY_ID");
-                    assertEquals(resultSet.getString("test_teardown_query_ids_json"), codec.toJson(FULL_EVENT.getTestTeardownQueryIds()));
-                    assertEquals(resultSet.getDouble("test_cpu_time_seconds"), 1.1);
-                    assertEquals(resultSet.getDouble("test_wall_time_seconds"), 2.2);
-                    assertEquals(resultSet.getString("control_catalog"), "controlcatalog");
-                    assertEquals(resultSet.getString("control_schema"), "controlschema");
-                    assertEquals(resultSet.getString("control_setup_query_ids_json"), codec.toJson(FULL_EVENT.getControlSetupQueryIds()));
-                    assertEquals(resultSet.getString("control_query_id"), "CONTROL_QUERY_ID");
-                    assertEquals(resultSet.getString("control_teardown_query_ids_json"), codec.toJson(FULL_EVENT.getControlTeardownQueryIds()));
-                    assertEquals(resultSet.getDouble("control_cpu_time_seconds"), 3.3);
-                    assertEquals(resultSet.getDouble("control_wall_time_seconds"), 4.4);
-                    assertEquals(resultSet.getString("error_message"), "error message");
-                    assertFalse(resultSet.next());
+                    assertThat(resultSet.next()).isTrue();
+                    assertThat(resultSet.getString("suite")).isEqualTo("suite_full");
+                    assertThat(resultSet.getString("run_id")).isEqualTo("runid");
+                    assertThat(resultSet.getString("source")).isEqualTo("source");
+                    assertThat(resultSet.getString("name")).isEqualTo("name");
+                    assertThat(resultSet.getBoolean("failed")).isTrue();
+                    assertThat(resultSet.getString("test_catalog")).isEqualTo("testcatalog");
+                    assertThat(resultSet.getString("test_schema")).isEqualTo("testschema");
+                    assertThat(resultSet.getString("test_setup_query_ids_json")).isEqualTo(codec.toJson(FULL_EVENT.getTestSetupQueryIds()));
+                    assertThat(resultSet.getString("test_query_id")).isEqualTo("TEST_QUERY_ID");
+                    assertThat(resultSet.getString("test_teardown_query_ids_json")).isEqualTo(codec.toJson(FULL_EVENT.getTestTeardownQueryIds()));
+                    assertThat(resultSet.getDouble("test_cpu_time_seconds")).isEqualTo(1.1);
+                    assertThat(resultSet.getDouble("test_wall_time_seconds")).isEqualTo(2.2);
+                    assertThat(resultSet.getString("control_catalog")).isEqualTo("controlcatalog");
+                    assertThat(resultSet.getString("control_schema")).isEqualTo("controlschema");
+                    assertThat(resultSet.getString("control_setup_query_ids_json")).isEqualTo(codec.toJson(FULL_EVENT.getControlSetupQueryIds()));
+                    assertThat(resultSet.getString("control_query_id")).isEqualTo("CONTROL_QUERY_ID");
+                    assertThat(resultSet.getString("control_teardown_query_ids_json")).isEqualTo(codec.toJson(FULL_EVENT.getControlTeardownQueryIds()));
+                    assertThat(resultSet.getDouble("control_cpu_time_seconds")).isEqualTo(3.3);
+                    assertThat(resultSet.getDouble("control_wall_time_seconds")).isEqualTo(4.4);
+                    assertThat(resultSet.getString("error_message")).isEqualTo("error message");
+                    assertThat(resultSet.next()).isFalse();
                 }
             }
         }
@@ -179,28 +179,28 @@ public void testMinimal()
             try (Statement statement = connection.createStatement()) {
                 statement.execute("SELECT * FROM verifier_query_events WHERE suite = 'suite_minimal'");
                 try (ResultSet resultSet = statement.getResultSet()) {
-                    assertTrue(resultSet.next());
-                    assertEquals(resultSet.getString("suite"), "suite_minimal");
-                    assertNull(resultSet.getString("run_id"));
-                    assertNull(resultSet.getString("source"));
-                    assertNull(resultSet.getString("name"));
-                    assertFalse(resultSet.getBoolean("failed"));
-                    assertNull(resultSet.getString("test_catalog"));
-                    assertNull(resultSet.getString("test_schema"));
-                    assertNull(resultSet.getString("test_setup_query_ids_json"));
-                    assertNull(resultSet.getString("test_query_id"));
-                    assertNull(resultSet.getString("test_teardown_query_ids_json"));
-                    assertNull(resultSet.getObject("test_cpu_time_seconds"));
-                    assertNull(resultSet.getObject("test_wall_time_seconds"));
-                    assertNull(resultSet.getString("control_catalog"));
-                    assertNull(resultSet.getString("control_schema"));
-                    assertNull(resultSet.getString("control_setup_query_ids_json"));
-                    assertNull(resultSet.getString("control_query_id"));
-                    assertNull(resultSet.getString("control_teardown_query_ids_json"));
-                    assertNull(resultSet.getObject("control_cpu_time_seconds"));
-                    assertNull(resultSet.getObject("control_wall_time_seconds"));
-                    assertNull(resultSet.getString("error_message"));
-                    assertFalse(resultSet.next());
+                    assertThat(resultSet.next()).isTrue();
+                    assertThat(resultSet.getString("suite")).isEqualTo("suite_minimal");
+                    assertThat(resultSet.getString("run_id")).isNull();
+                    assertThat(resultSet.getString("source")).isNull();
+                    assertThat(resultSet.getString("name")).isNull();
+                    assertThat(resultSet.getBoolean("failed")).isFalse();
+                    assertThat(resultSet.getString("test_catalog")).isNull();
+                    assertThat(resultSet.getString("test_schema")).isNull();
+                    assertThat(resultSet.getString("test_setup_query_ids_json")).isNull();
+                    assertThat(resultSet.getString("test_query_id")).isNull();
+                    assertThat(resultSet.getString("test_teardown_query_ids_json")).isNull();
+                    assertThat(resultSet.getObject("test_cpu_time_seconds")).isNull();
+                    assertThat(resultSet.getObject("test_wall_time_seconds")).isNull();
+                    assertThat(resultSet.getString("control_catalog")).isNull();
+                    assertThat(resultSet.getString("control_schema")).isNull();
+                    assertThat(resultSet.getString("control_setup_query_ids_json")).isNull();
+                    assertThat(resultSet.getString("control_query_id")).isNull();
+                    assertThat(resultSet.getString("control_teardown_query_ids_json")).isNull();
+                    assertThat(resultSet.getObject("control_cpu_time_seconds")).isNull();
+                    assertThat(resultSet.getObject("control_wall_time_seconds")).isNull();
+                    assertThat(resultSet.getString("error_message")).isNull();
+                    assertThat(resultSet.next()).isFalse();
                 }
             }
         }
diff --git a/service/trino-verifier/src/test/java/io/trino/verifier/TestShadowing.java b/service/trino-verifier/src/test/java/io/trino/verifier/TestShadowing.java
index f302b8601f23..47fdcb4a4b86 100644
--- a/service/trino-verifier/src/test/java/io/trino/verifier/TestShadowing.java
+++ b/service/trino-verifier/src/test/java/io/trino/verifier/TestShadowing.java
@@ -16,7 +16,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import io.trino.sql.parser.ParsingOptions;
 import io.trino.sql.parser.SqlParser;
 import io.trino.sql.tree.CreateTable;
 import io.trino.sql.tree.CreateTableAsSelect;
@@ -30,8 +29,9 @@
 import io.trino.sql.tree.Table;
 import org.jdbi.v3.core.Handle;
 import org.jdbi.v3.core.Jdbi;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Optional;
 
@@ -41,16 +41,15 @@
 import static io.trino.verifier.QueryType.READ;
 import static io.trino.verifier.VerifyCommand.statementToQueryType;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestShadowing
 {
     private static final String CATALOG = "TEST_REWRITE";
     private static final String SCHEMA = "PUBLIC";
     private static final String URL = "jdbc:h2:mem:" + CATALOG;
-    private static final ParsingOptions PARSING_OPTIONS = new ParsingOptions();
 
     private final Handle handle;
 
@@ -59,7 +58,7 @@ public TestShadowing()
         handle = Jdbi.open(URL);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void close()
     {
         handle.close();
@@ -74,22 +73,22 @@ public void testCreateTableAsSelect()
         Query query = new Query(CATALOG, SCHEMA, ImmutableList.of(), "CREATE TABLE my_test_table AS SELECT 1 column1, CAST('2.0' AS DOUBLE) column2 LIMIT 1", ImmutableList.of(), null, null, ImmutableMap.of());
         QueryRewriter rewriter = new QueryRewriter(parser, URL, QualifiedName.of("tmp_"), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), 1, new Duration(10, SECONDS));
         Query rewrittenQuery = rewriter.shadowQuery(query);
-        assertEquals(rewrittenQuery.getPreQueries().size(), 1);
-        assertEquals(rewrittenQuery.getPostQueries().size(), 1);
+        assertThat(rewrittenQuery.getPreQueries().size()).isEqualTo(1);
+        assertThat(rewrittenQuery.getPostQueries().size()).isEqualTo(1);
 
-        CreateTableAsSelect createTableAs = (CreateTableAsSelect) parser.createStatement(rewrittenQuery.getPreQueries().get(0), PARSING_OPTIONS);
-        assertEquals(createTableAs.getName().getParts().size(), 1);
-        assertTrue(createTableAs.getName().getSuffix().startsWith("tmp_"));
-        assertFalse(createTableAs.getName().getSuffix().contains("my_test_table"));
+        CreateTableAsSelect createTableAs = (CreateTableAsSelect) parser.createStatement(rewrittenQuery.getPreQueries().get(0));
+        assertThat(createTableAs.getName().getParts().size()).isEqualTo(1);
+        assertThat(createTableAs.getName().getSuffix().startsWith("tmp_")).isTrue();
+        assertThat(createTableAs.getName().getSuffix().contains("my_test_table")).isFalse();
 
-        assertEquals(statementToQueryType(parser, rewrittenQuery.getQuery()), READ);
+        assertThat(statementToQueryType(parser, rewrittenQuery.getQuery())).isEqualTo(READ);
 
         Table table = new Table(createTableAs.getName());
         SingleColumn column1 = new SingleColumn(new FunctionCall(QualifiedName.of("checksum"), ImmutableList.of(new Identifier("COLUMN1"))));
         SingleColumn column2 = new SingleColumn(new FunctionCall(QualifiedName.of("checksum"), ImmutableList.of(new FunctionCall(QualifiedName.of("round"), ImmutableList.of(new Identifier("COLUMN2"), new LongLiteral("1"))))));
-        assertEquals(parser.createStatement(rewrittenQuery.getQuery(), PARSING_OPTIONS), simpleQuery(selectList(column1, column2), table));
+        assertThat(parser.createStatement(rewrittenQuery.getQuery())).isEqualTo(simpleQuery(selectList(column1, column2), table));
 
-        assertEquals(parser.createStatement(rewrittenQuery.getPostQueries().get(0), PARSING_OPTIONS), new DropTable(createTableAs.getName(), true));
+        assertThat(parser.createStatement(rewrittenQuery.getPostQueries().get(0))).isEqualTo(new DropTable(createTableAs.getName(), true));
     }
 
     @Test
@@ -101,12 +100,12 @@ public void testCreateTableAsSelectDifferentCatalog()
         Query query = new Query(CATALOG, SCHEMA, ImmutableList.of(), "CREATE TABLE public.my_test_table2 AS SELECT 1 column1, 2E0 column2", ImmutableList.of(), null, null, ImmutableMap.of());
         QueryRewriter rewriter = new QueryRewriter(parser, URL, QualifiedName.of("other_catalog", "other_schema", "tmp_"), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), 1, new Duration(10, SECONDS));
         Query rewrittenQuery = rewriter.shadowQuery(query);
-        assertEquals(rewrittenQuery.getPreQueries().size(), 1);
-        CreateTableAsSelect createTableAs = (CreateTableAsSelect) parser.createStatement(rewrittenQuery.getPreQueries().get(0), PARSING_OPTIONS);
-        assertEquals(createTableAs.getName().getParts().size(), 3);
-        assertEquals(createTableAs.getName().getPrefix().get(), QualifiedName.of("other_catalog", "other_schema"));
-        assertTrue(createTableAs.getName().getSuffix().startsWith("tmp_"));
-        assertFalse(createTableAs.getName().getSuffix().contains("my_test_table"));
+        assertThat(rewrittenQuery.getPreQueries().size()).isEqualTo(1);
+        CreateTableAsSelect createTableAs = (CreateTableAsSelect) parser.createStatement(rewrittenQuery.getPreQueries().get(0));
+        assertThat(createTableAs.getName().getParts().size()).isEqualTo(3);
+        assertThat(createTableAs.getName().getPrefix().get()).isEqualTo(QualifiedName.of("other_catalog", "other_schema"));
+        assertThat(createTableAs.getName().getSuffix().startsWith("tmp_")).isTrue();
+        assertThat(createTableAs.getName().getSuffix().contains("my_test_table")).isFalse();
     }
 
     @Test
@@ -119,24 +118,24 @@ public void testInsert()
         QueryRewriter rewriter = new QueryRewriter(parser, URL, QualifiedName.of("other_catalog", "other_schema", "tmp_"), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), 1, new Duration(10, SECONDS));
         Query rewrittenQuery = rewriter.shadowQuery(query);
 
-        assertEquals(rewrittenQuery.getPreQueries().size(), 2);
-        CreateTable createTable = (CreateTable) parser.createStatement(rewrittenQuery.getPreQueries().get(0), PARSING_OPTIONS);
-        assertEquals(createTable.getName().getParts().size(), 3);
-        assertEquals(createTable.getName().getPrefix().get(), QualifiedName.of("other_catalog", "other_schema"));
-        assertTrue(createTable.getName().getSuffix().startsWith("tmp_"));
-        assertFalse(createTable.getName().getSuffix().contains("test_insert_table"));
+        assertThat(rewrittenQuery.getPreQueries().size()).isEqualTo(2);
+        CreateTable createTable = (CreateTable) parser.createStatement(rewrittenQuery.getPreQueries().get(0));
+        assertThat(createTable.getName().getParts().size()).isEqualTo(3);
+        assertThat(createTable.getName().getPrefix().get()).isEqualTo(QualifiedName.of("other_catalog", "other_schema"));
+        assertThat(createTable.getName().getSuffix().startsWith("tmp_")).isTrue();
+        assertThat(createTable.getName().getSuffix().contains("test_insert_table")).isFalse();
 
-        Insert insert = (Insert) parser.createStatement(rewrittenQuery.getPreQueries().get(1), PARSING_OPTIONS);
-        assertEquals(insert.getTarget(), createTable.getName());
-        assertEquals(insert.getColumns(), Optional.of(ImmutableList.of(identifier("b"), identifier("a"), identifier("c"))));
+        Insert insert = (Insert) parser.createStatement(rewrittenQuery.getPreQueries().get(1));
+        assertThat(insert.getTarget()).isEqualTo(createTable.getName());
+        assertThat(insert.getColumns()).isEqualTo(Optional.of(ImmutableList.of(identifier("b"), identifier("a"), identifier("c"))));
 
         Table table = new Table(createTable.getName());
         SingleColumn columnA = new SingleColumn(new FunctionCall(QualifiedName.of("checksum"), ImmutableList.of(new Identifier("A"))));
         SingleColumn columnB = new SingleColumn(new FunctionCall(QualifiedName.of("checksum"), ImmutableList.of(new FunctionCall(QualifiedName.of("round"), ImmutableList.of(new Identifier("B"), new LongLiteral("1"))))));
         SingleColumn columnC = new SingleColumn(new FunctionCall(QualifiedName.of("checksum"), ImmutableList.of(new Identifier("C"))));
-        assertEquals(parser.createStatement(rewrittenQuery.getQuery(), PARSING_OPTIONS), simpleQuery(selectList(columnA, columnB, columnC), table));
+        assertThat(parser.createStatement(rewrittenQuery.getQuery())).isEqualTo(simpleQuery(selectList(columnA, columnB, columnC), table));
 
-        assertEquals(rewrittenQuery.getPostQueries().size(), 1);
-        assertEquals(parser.createStatement(rewrittenQuery.getPostQueries().get(0), PARSING_OPTIONS), new DropTable(createTable.getName(), true));
+        assertThat(rewrittenQuery.getPostQueries().size()).isEqualTo(1);
+        assertThat(parser.createStatement(rewrittenQuery.getPostQueries().get(0))).isEqualTo(new DropTable(createTable.getName(), true));
     }
 }
diff --git a/service/trino-verifier/src/test/java/io/trino/verifier/TestValidator.java b/service/trino-verifier/src/test/java/io/trino/verifier/TestValidator.java
index 4d146925745f..ae5b844b2c67 100644
--- a/service/trino-verifier/src/test/java/io/trino/verifier/TestValidator.java
+++ b/service/trino-verifier/src/test/java/io/trino/verifier/TestValidator.java
@@ -13,25 +13,25 @@
  */
 package io.trino.verifier;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.verifier.Validator.precisionCompare;
 import static java.lang.Double.NaN;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestValidator
 {
     @Test
     public void testDoubleComparison()
     {
-        assertEquals(precisionCompare(0.9045, 0.9045000000000001, 3), 0);
-        assertEquals(precisionCompare(0.9045, 0.9045000000000001, 2), 0);
-        assertEquals(precisionCompare(0.9041, 0.9042, 3), 0);
-        assertEquals(precisionCompare(0.9041, 0.9042, 4), 0);
-        assertEquals(precisionCompare(0.9042, 0.9041, 4), 0);
-        assertEquals(precisionCompare(-0.9042, -0.9041, 4), 0);
-        assertEquals(precisionCompare(-0.9042, -0.9041, 3), 0);
-        assertEquals(precisionCompare(0.899, 0.901, 3), 0);
-        assertEquals(precisionCompare(NaN, NaN, 4), Double.compare(NaN, NaN));
+        assertThat(precisionCompare(0.9045, 0.9045000000000001, 3)).isEqualTo(0);
+        assertThat(precisionCompare(0.9045, 0.9045000000000001, 2)).isEqualTo(0);
+        assertThat(precisionCompare(0.9041, 0.9042, 3)).isEqualTo(0);
+        assertThat(precisionCompare(0.9041, 0.9042, 4)).isEqualTo(0);
+        assertThat(precisionCompare(0.9042, 0.9041, 4)).isEqualTo(0);
+        assertThat(precisionCompare(-0.9042, -0.9041, 4)).isEqualTo(0);
+        assertThat(precisionCompare(-0.9042, -0.9041, 3)).isEqualTo(0);
+        assertThat(precisionCompare(0.899, 0.901, 3)).isEqualTo(0);
+        assertThat(precisionCompare(NaN, NaN, 4)).isEqualTo(Double.compare(NaN, NaN));
     }
 }
diff --git a/service/trino-verifier/src/test/java/io/trino/verifier/TestVerifierConfig.java b/service/trino-verifier/src/test/java/io/trino/verifier/TestVerifierConfig.java
index ddda7a582666..89e7afedd7bc 100644
--- a/service/trino-verifier/src/test/java/io/trino/verifier/TestVerifierConfig.java
+++ b/service/trino-verifier/src/test/java/io/trino/verifier/TestVerifierConfig.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
 import org.joda.time.DateTime;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
diff --git a/service/trino-verifier/src/test/java/io/trino/verifier/TestVerifierRewriteQueries.java b/service/trino-verifier/src/test/java/io/trino/verifier/TestVerifierRewriteQueries.java
index f1e093d11e74..0c2bb1542f04 100644
--- a/service/trino-verifier/src/test/java/io/trino/verifier/TestVerifierRewriteQueries.java
+++ b/service/trino-verifier/src/test/java/io/trino/verifier/TestVerifierRewriteQueries.java
@@ -19,16 +19,18 @@
 import io.trino.sql.parser.SqlParser;
 import org.jdbi.v3.core.Handle;
 import org.jdbi.v3.core.Jdbi;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static io.trino.verifier.VerifyCommand.rewriteQueries;
-import static org.testng.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestVerifierRewriteQueries
 {
     private static final String CATALOG = "TEST_VERIFIER_REWRITE_QUERIES";
@@ -83,7 +85,7 @@ public TestVerifierRewriteQueries()
         queryPairs = builder.build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void close()
     {
         handle.close();
@@ -95,7 +97,7 @@ public void testSingleThread()
         config.setControlGateway(URL);
         config.setThreadCount(1);
         List<QueryPair> rewrittenQueries = rewriteQueries(parser, config, queryPairs);
-        assertEquals(rewrittenQueries.size(), queryPairs.size());
+        assertThat(rewrittenQueries.size()).isEqualTo(queryPairs.size());
     }
 
     @Test
@@ -104,7 +106,7 @@ public void testMultipleThreads()
         config.setControlGateway(URL);
         config.setThreadCount(5);
         List<QueryPair> rewrittenQueries = rewriteQueries(parser, config, queryPairs);
-        assertEquals(rewrittenQueries.size(), queryPairs.size());
+        assertThat(rewrittenQueries.size()).isEqualTo(queryPairs.size());
     }
 
     @Test
@@ -124,7 +126,7 @@ public void testQueryRewriteException()
                 .addAll(queryPairs)
                 .add(new QueryPair(QUERY_SUITE, QUERY_NAME, invalidQuery, invalidQuery))
                 .build());
-        assertEquals(rewrittenQueries.size(), queryPairs.size());
+        assertThat(rewrittenQueries.size()).isEqualTo(queryPairs.size());
     }
 
     @Test
@@ -132,6 +134,6 @@ public void testSQLException()
     {
         config.setControlGateway("invalid:url");
         List<QueryPair> rewrittenQueries = rewriteQueries(parser, config, queryPairs);
-        assertEquals(rewrittenQueries.size(), 0);
+        assertThat(rewrittenQueries.size()).isEqualTo(0);
     }
 }
diff --git a/testing/trino-benchmark-queries/pom.xml b/testing/trino-benchmark-queries/pom.xml
index 5105ddeb8d24..fde1b9916d54 100644
--- a/testing/trino-benchmark-queries/pom.xml
+++ b/testing/trino-benchmark-queries/pom.xml
@@ -4,12 +4,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-benchmark-queries</artifactId>
-    <name>trino-benchmark-queries</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -17,8 +16,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/trino-benchmark-queries/src/test/java/io/trino/benchmark/queries/TestDummy.java b/testing/trino-benchmark-queries/src/test/java/io/trino/benchmark/queries/TestDummy.java
index 7a74cf01fc90..2dc18a4a44c9 100644
--- a/testing/trino-benchmark-queries/src/test/java/io/trino/benchmark/queries/TestDummy.java
+++ b/testing/trino-benchmark-queries/src/test/java/io/trino/benchmark/queries/TestDummy.java
@@ -13,7 +13,7 @@
  */
 package io.trino.benchmark.queries;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestDummy
 {
diff --git a/testing/trino-benchmark/pom.xml b/testing/trino-benchmark/pom.xml
index dc289a46ee20..54d8de3bd8e2 100644
--- a/testing/trino-benchmark/pom.xml
+++ b/testing/trino-benchmark/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-benchmark</artifactId>
-    <name>trino-benchmark</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,23 +17,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-parser</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-tpch</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
@@ -63,24 +57,44 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-parser</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-tpch</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- for benchmark run -->
@@ -91,18 +105,17 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-memory</artifactId>
@@ -116,20 +129,20 @@
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
+            <artifactId>jmh-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/AbstractBenchmark.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/AbstractBenchmark.java
index 7521542d49ba..0d93d5e799c2 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/AbstractBenchmark.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/AbstractBenchmark.java
@@ -15,8 +15,7 @@
 
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Map;
 
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/AbstractOperatorBenchmark.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/AbstractOperatorBenchmark.java
index 6cd816c7a2e9..43d2f892ea93 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/AbstractOperatorBenchmark.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/AbstractOperatorBenchmark.java
@@ -19,6 +19,7 @@
 import io.airlift.stats.CpuTimer;
 import io.airlift.stats.TestingGcMonitor;
 import io.airlift.units.DataSize;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.execution.StageId;
 import io.trino.execution.TaskId;
@@ -60,7 +61,6 @@
 import io.trino.sql.relational.RowExpression;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.NodeRef;
-import io.trino.sql.tree.QualifiedName;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.transaction.TransactionId;
 
@@ -80,9 +80,8 @@
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.SystemSessionProperties.getFilterAndProjectMinOutputPageRowCount;
 import static io.trino.SystemSessionProperties.getFilterAndProjectMinOutputPageSize;
-import static io.trino.execution.executor.PrioritizedSplitRunner.SPLIT_RUN_QUANTA;
+import static io.trino.execution.executor.timesharing.PrioritizedSplitRunner.SPLIT_RUN_QUANTA;
 import static io.trino.spi.connector.Constraint.alwaysTrue;
-import static io.trino.spi.connector.DynamicFilter.EMPTY;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.analyzer.TypeSignatureProvider.fromTypes;
 import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
@@ -100,6 +99,7 @@ public abstract class AbstractOperatorBenchmark
         extends AbstractBenchmark
 {
     protected final LocalQueryRunner localQueryRunner;
+    protected final Session nonTransactionSession;
     protected final Session session;
 
     protected AbstractOperatorBenchmark(
@@ -119,6 +119,7 @@ protected AbstractOperatorBenchmark(
             int measuredIterations)
     {
         super(benchmarkName, warmupIterations, measuredIterations);
+        this.nonTransactionSession = requireNonNull(session, "session is null");
         this.localQueryRunner = requireNonNull(localQueryRunner, "localQueryRunner is null");
 
         TransactionId transactionId = localQueryRunner.getTransactionManager().beginTransaction(false);
@@ -155,7 +156,7 @@ protected final List<Type> getColumnTypes(String tableName, String... columnName
 
     protected final BenchmarkAggregationFunction createAggregationFunction(String name, Type... argumentTypes)
     {
-        ResolvedFunction resolvedFunction = localQueryRunner.getMetadata().resolveFunction(session, QualifiedName.of(name), fromTypes(argumentTypes));
+        ResolvedFunction resolvedFunction = localQueryRunner.getMetadata().resolveBuiltinFunction(name, fromTypes(argumentTypes));
         AggregationImplementation aggregationImplementation = localQueryRunner.getFunctionManager().getAggregationImplementation(resolvedFunction);
         return new BenchmarkAggregationFunction(resolvedFunction, aggregationImplementation);
     }
@@ -209,7 +210,7 @@ public OperatorFactory duplicate()
 
     private Split getLocalQuerySplit(Session session, TableHandle handle)
     {
-        SplitSource splitSource = localQueryRunner.getSplitManager().getSplits(session, handle, EMPTY, alwaysTrue());
+        SplitSource splitSource = localQueryRunner.getSplitManager().getSplits(session, Span.getInvalid(), handle, DynamicFilter.EMPTY, alwaysTrue());
         List<Split> splits = new ArrayList<>();
         while (!splitSource.isFinished()) {
             splits.addAll(getNextBatch(splitSource));
@@ -236,7 +237,6 @@ protected final OperatorFactory createHashProjectOperator(int operatorId, PlanNo
 
         Map<Symbol, Type> symbolTypes = symbolAllocator.getTypes().allTypes();
         Optional<Expression> hashExpression = HashGenerationOptimizer.getHashExpression(
-                session,
                 localQueryRunner.getMetadata(),
                 symbolAllocator,
                 ImmutableList.copyOf(symbolTypes.keySet()));
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/AbstractSqlBenchmark.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/AbstractSqlBenchmark.java
index 7fa4882b0dbd..93ce22b3a34e 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/AbstractSqlBenchmark.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/AbstractSqlBenchmark.java
@@ -41,6 +41,6 @@ protected AbstractSqlBenchmark(
     @Override
     protected List<Driver> createDrivers(TaskContext taskContext)
     {
-        return localQueryRunner.createDrivers(session, query, new NullOutputFactory(), taskContext);
+        return localQueryRunner.createDrivers(nonTransactionSession, query, new NullOutputFactory(), taskContext);
     }
 }
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/BenchmarkAggregationFunction.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/BenchmarkAggregationFunction.java
index 62ca20d61bae..9f48902a4bf5 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/BenchmarkAggregationFunction.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/BenchmarkAggregationFunction.java
@@ -39,7 +39,7 @@ public BenchmarkAggregationFunction(ResolvedFunction resolvedFunction, Aggregati
         BoundSignature signature = resolvedFunction.getSignature();
         intermediateType = getOnlyElement(aggregationImplementation.getAccumulatorStateDescriptors()).getSerializer().getSerializedType();
         finalType = signature.getReturnType();
-        accumulatorFactory = generateAccumulatorFactory(signature, aggregationImplementation, resolvedFunction.getFunctionNullability());
+        accumulatorFactory = generateAccumulatorFactory(signature, aggregationImplementation, resolvedFunction.getFunctionNullability(), true);
     }
 
     public AggregatorFactory bind(List<Integer> inputChannels)
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/HandTpchQuery1.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/HandTpchQuery1.java
index 636988d87e61..9e7d6bd4fdca 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/HandTpchQuery1.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/HandTpchQuery1.java
@@ -42,7 +42,6 @@
 import static io.trino.spi.type.DateType.DATE;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
 public class HandTpchQuery1
@@ -121,7 +120,7 @@ protected List<? extends OperatorFactory> createOperatorFactories()
                 10_000,
                 Optional.of(DataSize.of(16, MEGABYTE)),
                 new JoinCompiler(localQueryRunner.getTypeOperators()),
-                localQueryRunner.getBlockTypeOperators(),
+                localQueryRunner.getTypeOperators(),
                 Optional.empty());
 
         return ImmutableList.of(tableScanOperator, tpchQuery1Operator, aggregationOperator);
@@ -249,7 +248,7 @@ private static void filterAndProjectRowOriented(
                     continue;
                 }
 
-                int shipDate = toIntExact(DATE.getLong(shipDateBlock, position));
+                int shipDate = DATE.getInt(shipDateBlock, position);
 
                 // where
                 //     shipdate <= '1998-09-02'
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/HandTpchQuery6.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/HandTpchQuery6.java
index ba3306285ffe..62058f5124c9 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/HandTpchQuery6.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/HandTpchQuery6.java
@@ -123,8 +123,8 @@ private static boolean filter(Page page, int position)
             Block discountBlock = page.getBlock(0);
             Block shipDateBlock = page.getBlock(1);
             Block quantityBlock = page.getBlock(2);
-            return !shipDateBlock.isNull(position) && DATE.getLong(shipDateBlock, position) >= MIN_SHIP_DATE &&
-                    !shipDateBlock.isNull(position) && DATE.getLong(shipDateBlock, position) < MAX_SHIP_DATE &&
+            return !shipDateBlock.isNull(position) && DATE.getInt(shipDateBlock, position) >= MIN_SHIP_DATE &&
+                    !shipDateBlock.isNull(position) && DATE.getInt(shipDateBlock, position) < MAX_SHIP_DATE &&
                     !discountBlock.isNull(position) && DOUBLE.getDouble(discountBlock, position) >= 0.05 &&
                     !discountBlock.isNull(position) && DOUBLE.getDouble(discountBlock, position) <= 0.07 &&
                     !quantityBlock.isNull(position) && BIGINT.getLong(quantityBlock, position) < 24;
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashAggregationBenchmark.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashAggregationBenchmark.java
index 8eec3fd5bd98..021a30a1861a 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashAggregationBenchmark.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashAggregationBenchmark.java
@@ -61,7 +61,7 @@ protected List<? extends OperatorFactory> createOperatorFactories()
                 100_000,
                 Optional.of(DataSize.of(16, MEGABYTE)),
                 new JoinCompiler(localQueryRunner.getTypeOperators()),
-                localQueryRunner.getBlockTypeOperators(),
+                localQueryRunner.getTypeOperators(),
                 Optional.empty());
         return ImmutableList.of(tableScanOperator, aggregationOperator);
     }
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashBuildAndJoinBenchmark.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashBuildAndJoinBenchmark.java
index 7653b8444dc0..a6dfef0a9b1d 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashBuildAndJoinBenchmark.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashBuildAndJoinBenchmark.java
@@ -19,11 +19,9 @@
 import io.trino.SystemSessionProperties;
 import io.trino.operator.Driver;
 import io.trino.operator.DriverFactory;
-import io.trino.operator.OperatorFactories;
 import io.trino.operator.OperatorFactory;
 import io.trino.operator.PagesIndex;
 import io.trino.operator.TaskContext;
-import io.trino.operator.TrinoOperatorFactories;
 import io.trino.operator.join.HashBuilderOperator.HashBuilderOperatorFactory;
 import io.trino.operator.join.JoinBridgeManager;
 import io.trino.operator.join.PartitionedLookupSourceFactory;
@@ -33,7 +31,6 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.NullOutputOperator.NullOutputOperatorFactory;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
 import java.util.Optional;
@@ -43,11 +40,11 @@
 import static io.trino.benchmark.BenchmarkQueryRunner.createLocalQueryRunner;
 import static io.trino.benchmark.BenchmarkQueryRunner.createLocalQueryRunnerHashEnabled;
 import static io.trino.operator.HashArraySizeSupplier.incrementalLoadFactorHashArraySizeSupplier;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.innerJoin;
+import static io.trino.operator.JoinOperatorType.innerJoin;
+import static io.trino.operator.OperatorFactories.spillingJoin;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spiller.PartitioningSpillerFactory.unsupportedPartitioningSpillerFactory;
 import static io.trino.testing.TestingSession.testSessionBuilder;
-import static java.util.Objects.requireNonNull;
 
 public class HashBuildAndJoinBenchmark
         extends AbstractOperatorBenchmark
@@ -57,18 +54,11 @@ public class HashBuildAndJoinBenchmark
     private final OperatorFactory ordersTableScan = createTableScanOperator(0, new PlanNodeId("test"), "orders", "orderkey", "totalprice");
     private final List<Type> lineItemTableTypes = getColumnTypes("lineitem", "orderkey", "quantity");
     private final OperatorFactory lineItemTableScan = createTableScanOperator(0, new PlanNodeId("test"), "lineitem", "orderkey", "quantity");
-    private final OperatorFactories operatorFactories;
 
     public HashBuildAndJoinBenchmark(Session session, LocalQueryRunner localQueryRunner)
-    {
-        this(session, localQueryRunner, new TrinoOperatorFactories());
-    }
-
-    public HashBuildAndJoinBenchmark(Session session, LocalQueryRunner localQueryRunner, OperatorFactories operatorFactories)
     {
         super(session, localQueryRunner, "hash_build_and_join_hash_enabled_" + isHashEnabled(session), 4, 5);
         this.hashEnabled = isHashEnabled(session);
-        this.operatorFactories = requireNonNull(operatorFactories, "operatorFactories is null");
     }
 
     private static boolean isHashEnabled(Session session)
@@ -97,7 +87,7 @@ protected List<Driver> createDrivers(TaskContext taskContext)
         }
 
         // hash build
-        BlockTypeOperators blockTypeOperators = new BlockTypeOperators(new TypeOperators());
+        TypeOperators typeOperators = new TypeOperators();
         JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactoryManager = JoinBridgeManager.lookupAllAtOnce(new PartitionedLookupSourceFactory(
                 sourceTypes,
                 ImmutableList.of(0, 1).stream()
@@ -108,7 +98,7 @@ protected List<Driver> createDrivers(TaskContext taskContext)
                         .collect(toImmutableList()),
                 1,
                 false,
-                blockTypeOperators));
+                typeOperators));
         HashBuilderOperatorFactory hashBuilder = new HashBuilderOperatorFactory(
                 2,
                 new PlanNodeId("test"),
@@ -141,7 +131,7 @@ protected List<Driver> createDrivers(TaskContext taskContext)
             hashChannel = OptionalInt.of(sourceTypes.size() - 1);
         }
 
-        OperatorFactory joinOperator = operatorFactories.spillingJoin(
+        OperatorFactory joinOperator = spillingJoin(
                 innerJoin(false, false),
                 2,
                 new PlanNodeId("test"),
@@ -153,7 +143,7 @@ protected List<Driver> createDrivers(TaskContext taskContext)
                 Optional.empty(),
                 OptionalInt.empty(),
                 unsupportedPartitioningSpillerFactory(),
-                blockTypeOperators);
+                typeOperators);
         joinDriversBuilder.add(joinOperator);
         joinDriversBuilder.add(new NullOutputOperatorFactory(3, new PlanNodeId("test")));
         DriverFactory joinDriverFactory = new DriverFactory(1, true, true, joinDriversBuilder.build(), OptionalInt.empty());
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashBuildBenchmark.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashBuildBenchmark.java
index 9235295fe0aa..377cd114587c 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashBuildBenchmark.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashBuildBenchmark.java
@@ -17,11 +17,9 @@
 import com.google.common.primitives.Ints;
 import io.trino.operator.Driver;
 import io.trino.operator.DriverFactory;
-import io.trino.operator.OperatorFactories;
 import io.trino.operator.OperatorFactory;
 import io.trino.operator.PagesIndex;
 import io.trino.operator.TaskContext;
-import io.trino.operator.TrinoOperatorFactories;
 import io.trino.operator.ValuesOperator.ValuesOperatorFactory;
 import io.trino.operator.join.HashBuilderOperator.HashBuilderOperatorFactory;
 import io.trino.operator.join.JoinBridgeManager;
@@ -32,7 +30,6 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.NullOutputOperator.NullOutputOperatorFactory;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
 import java.util.Optional;
@@ -41,25 +38,17 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.benchmark.BenchmarkQueryRunner.createLocalQueryRunner;
 import static io.trino.operator.HashArraySizeSupplier.incrementalLoadFactorHashArraySizeSupplier;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.innerJoin;
+import static io.trino.operator.JoinOperatorType.innerJoin;
+import static io.trino.operator.OperatorFactories.spillingJoin;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spiller.PartitioningSpillerFactory.unsupportedPartitioningSpillerFactory;
-import static java.util.Objects.requireNonNull;
 
 public class HashBuildBenchmark
         extends AbstractOperatorBenchmark
 {
-    private final OperatorFactories operatorFactories;
-
     public HashBuildBenchmark(LocalQueryRunner localQueryRunner)
-    {
-        this(localQueryRunner, new TrinoOperatorFactories());
-    }
-
-    public HashBuildBenchmark(LocalQueryRunner localQueryRunner, OperatorFactories operatorFactories)
     {
         super(localQueryRunner, "hash_build", 4, 5);
-        this.operatorFactories = requireNonNull(operatorFactories, "operatorFactories is null");
     }
 
     @Override
@@ -68,7 +57,7 @@ protected List<Driver> createDrivers(TaskContext taskContext)
         // hash build
         List<Type> ordersTypes = getColumnTypes("orders", "orderkey", "totalprice");
         OperatorFactory ordersTableScan = createTableScanOperator(0, new PlanNodeId("test"), "orders", "orderkey", "totalprice");
-        BlockTypeOperators blockTypeOperators = new BlockTypeOperators(new TypeOperators());
+        TypeOperators typeOperators = new TypeOperators();
         JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactoryManager = JoinBridgeManager.lookupAllAtOnce(new PartitionedLookupSourceFactory(
                 ordersTypes,
                 ImmutableList.of(0, 1).stream()
@@ -79,7 +68,7 @@ protected List<Driver> createDrivers(TaskContext taskContext)
                         .collect(toImmutableList()),
                 1,
                 false,
-                blockTypeOperators));
+                typeOperators));
         HashBuilderOperatorFactory hashBuilder = new HashBuilderOperatorFactory(
                 1,
                 new PlanNodeId("test"),
@@ -100,7 +89,7 @@ protected List<Driver> createDrivers(TaskContext taskContext)
         // empty join so build finishes
         ImmutableList.Builder<OperatorFactory> joinDriversBuilder = ImmutableList.builder();
         joinDriversBuilder.add(new ValuesOperatorFactory(0, new PlanNodeId("values"), ImmutableList.of()));
-        OperatorFactory joinOperator = operatorFactories.spillingJoin(
+        OperatorFactory joinOperator = spillingJoin(
                 innerJoin(false, false),
                 2,
                 new PlanNodeId("test"),
@@ -112,7 +101,7 @@ protected List<Driver> createDrivers(TaskContext taskContext)
                 Optional.empty(),
                 OptionalInt.empty(),
                 unsupportedPartitioningSpillerFactory(),
-                blockTypeOperators);
+                typeOperators);
         joinDriversBuilder.add(joinOperator);
         joinDriversBuilder.add(new NullOutputOperatorFactory(3, new PlanNodeId("test")));
         DriverFactory joinDriverFactory = new DriverFactory(1, true, true, joinDriversBuilder.build(), OptionalInt.empty());
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashJoinBenchmark.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashJoinBenchmark.java
index c43edde2055c..f2d5eed3f20d 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashJoinBenchmark.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/HashJoinBenchmark.java
@@ -18,11 +18,9 @@
 import io.trino.operator.Driver;
 import io.trino.operator.DriverContext;
 import io.trino.operator.DriverFactory;
-import io.trino.operator.OperatorFactories;
 import io.trino.operator.OperatorFactory;
 import io.trino.operator.PagesIndex;
 import io.trino.operator.TaskContext;
-import io.trino.operator.TrinoOperatorFactories;
 import io.trino.operator.join.HashBuilderOperator.HashBuilderOperatorFactory;
 import io.trino.operator.join.JoinBridgeManager;
 import io.trino.operator.join.LookupSourceProvider;
@@ -33,7 +31,6 @@
 import io.trino.sql.planner.plan.PlanNodeId;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.NullOutputOperator.NullOutputOperatorFactory;
-import io.trino.type.BlockTypeOperators;
 
 import java.util.List;
 import java.util.Optional;
@@ -43,27 +40,20 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.trino.benchmark.BenchmarkQueryRunner.createLocalQueryRunner;
-import static io.trino.execution.executor.PrioritizedSplitRunner.SPLIT_RUN_QUANTA;
+import static io.trino.execution.executor.timesharing.PrioritizedSplitRunner.SPLIT_RUN_QUANTA;
 import static io.trino.operator.HashArraySizeSupplier.incrementalLoadFactorHashArraySizeSupplier;
-import static io.trino.operator.OperatorFactories.JoinOperatorType.innerJoin;
+import static io.trino.operator.JoinOperatorType.innerJoin;
+import static io.trino.operator.OperatorFactories.spillingJoin;
 import static io.trino.spiller.PartitioningSpillerFactory.unsupportedPartitioningSpillerFactory;
-import static java.util.Objects.requireNonNull;
 
 public class HashJoinBenchmark
         extends AbstractOperatorBenchmark
 {
-    private final OperatorFactories operatorFactories;
     private DriverFactory probeDriverFactory;
 
     public HashJoinBenchmark(LocalQueryRunner localQueryRunner)
-    {
-        this(localQueryRunner, new TrinoOperatorFactories());
-    }
-
-    public HashJoinBenchmark(LocalQueryRunner localQueryRunner, OperatorFactories operatorFactories)
     {
         super(localQueryRunner, "hash_join", 4, 50);
-        this.operatorFactories = requireNonNull(operatorFactories, "operatorFactories is null");
     }
 
     /*
@@ -77,7 +67,7 @@ protected List<Driver> createDrivers(TaskContext taskContext)
         if (probeDriverFactory == null) {
             List<Type> ordersTypes = getColumnTypes("orders", "orderkey", "totalprice");
             OperatorFactory ordersTableScan = createTableScanOperator(0, new PlanNodeId("test"), "orders", "orderkey", "totalprice");
-            BlockTypeOperators blockTypeOperators = new BlockTypeOperators(new TypeOperators());
+            TypeOperators typeOperators = new TypeOperators();
             JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactoryManager = JoinBridgeManager.lookupAllAtOnce(new PartitionedLookupSourceFactory(
                     ordersTypes,
                     ImmutableList.of(0, 1).stream()
@@ -88,7 +78,7 @@ protected List<Driver> createDrivers(TaskContext taskContext)
                             .collect(toImmutableList()),
                     1,
                     false,
-                    blockTypeOperators));
+                    typeOperators));
             HashBuilderOperatorFactory hashBuilder = new HashBuilderOperatorFactory(
                     1,
                     new PlanNodeId("test"),
@@ -110,7 +100,7 @@ protected List<Driver> createDrivers(TaskContext taskContext)
 
             List<Type> lineItemTypes = getColumnTypes("lineitem", "orderkey", "quantity");
             OperatorFactory lineItemTableScan = createTableScanOperator(0, new PlanNodeId("test"), "lineitem", "orderkey", "quantity");
-            OperatorFactory joinOperator = operatorFactories.spillingJoin(
+            OperatorFactory joinOperator = spillingJoin(
                     innerJoin(false, false),
                     1,
                     new PlanNodeId("test"),
@@ -122,7 +112,7 @@ protected List<Driver> createDrivers(TaskContext taskContext)
                     Optional.empty(),
                     OptionalInt.empty(),
                     unsupportedPartitioningSpillerFactory(),
-                    blockTypeOperators);
+                    typeOperators);
             NullOutputOperatorFactory output = new NullOutputOperatorFactory(2, new PlanNodeId("test"));
             this.probeDriverFactory = new DriverFactory(1, true, true, ImmutableList.of(lineItemTableScan, joinOperator, output), OptionalInt.empty());
 
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/JsonBenchmarkResultWriter.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/JsonBenchmarkResultWriter.java
index 0b9fca6034a8..c54cc896b112 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/JsonBenchmarkResultWriter.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/JsonBenchmarkResultWriter.java
@@ -14,7 +14,6 @@
 package io.trino.benchmark;
 
 import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 
 import java.io.IOException;
@@ -22,6 +21,7 @@
 import java.io.UncheckedIOException;
 import java.util.Map;
 
+import static io.trino.plugin.base.util.JsonUtils.jsonFactory;
 import static java.util.Objects.requireNonNull;
 
 public class JsonBenchmarkResultWriter
@@ -33,7 +33,7 @@ public JsonBenchmarkResultWriter(OutputStream outputStream)
     {
         requireNonNull(outputStream, "outputStream is null");
         try {
-            jsonGenerator = new JsonFactory().createGenerator(outputStream, JsonEncoding.UTF8);
+            jsonGenerator = jsonFactory().createGenerator(outputStream, JsonEncoding.UTF8);
             jsonGenerator.writeStartObject();
             jsonGenerator.writeArrayFieldStart("samples");
         }
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/OdsBenchmarkResultWriter.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/OdsBenchmarkResultWriter.java
index 949aea6ec9c3..6730e02bd8ea 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/OdsBenchmarkResultWriter.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/OdsBenchmarkResultWriter.java
@@ -14,7 +14,6 @@
 package io.trino.benchmark;
 
 import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 
 import java.io.IOException;
@@ -22,6 +21,7 @@
 import java.io.UncheckedIOException;
 import java.util.Map;
 
+import static io.trino.plugin.base.util.JsonUtils.jsonFactory;
 import static java.util.Objects.requireNonNull;
 
 public class OdsBenchmarkResultWriter
@@ -36,7 +36,7 @@ public OdsBenchmarkResultWriter(String entity, OutputStream outputStream)
         requireNonNull(outputStream, "outputStream is null");
         this.entity = entity;
         try {
-            jsonGenerator = new JsonFactory().createGenerator(outputStream, JsonEncoding.UTF8);
+            jsonGenerator = jsonFactory().createGenerator(outputStream, JsonEncoding.UTF8);
             jsonGenerator.writeStartArray();
         }
         catch (IOException e) {
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/PredicateFilterBenchmark.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/PredicateFilterBenchmark.java
index 94c2c56327c8..06d88bf9da20 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/PredicateFilterBenchmark.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/PredicateFilterBenchmark.java
@@ -48,7 +48,7 @@ protected List<? extends OperatorFactory> createOperatorFactories()
     {
         OperatorFactory tableScanOperator = createTableScanOperator(0, new PlanNodeId("test"), "orders", "totalprice");
         RowExpression filter = call(
-                localQueryRunner.getMetadata().resolveOperator(session, LESS_THAN_OR_EQUAL, ImmutableList.of(DOUBLE, DOUBLE)),
+                localQueryRunner.getMetadata().resolveOperator(LESS_THAN_OR_EQUAL, ImmutableList.of(DOUBLE, DOUBLE)),
                 constant(50000.0, DOUBLE),
                 field(0, DOUBLE));
         ExpressionCompiler expressionCompiler = new ExpressionCompiler(localQueryRunner.getFunctionManager(), new PageFunctionCompiler(localQueryRunner.getFunctionManager(), 0));
diff --git a/testing/trino-benchmark/src/main/java/io/trino/benchmark/SqlTopNBenchmark.java b/testing/trino-benchmark/src/main/java/io/trino/benchmark/SqlTopNBenchmark.java
index 8982a90d7844..d4cb2b5f5b3c 100644
--- a/testing/trino-benchmark/src/main/java/io/trino/benchmark/SqlTopNBenchmark.java
+++ b/testing/trino-benchmark/src/main/java/io/trino/benchmark/SqlTopNBenchmark.java
@@ -14,6 +14,7 @@
 package io.trino.benchmark;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.math.IntMath;
 import io.trino.testing.LocalQueryRunner;
 
 import static io.trino.benchmark.BenchmarkQueryRunner.createLocalQueryRunner;
@@ -35,7 +36,7 @@ public static void main(String[] args)
     {
         LocalQueryRunner localQueryRunner = createLocalQueryRunner(ImmutableMap.of("resource_overcommit", "true"));
         for (int i = 0; i < 11; i++) {
-            new SqlTopNBenchmark(localQueryRunner, (int) Math.pow(4, i)).runBenchmark(new SimpleLineBenchmarkResultWriter(System.out));
+            new SqlTopNBenchmark(localQueryRunner, IntMath.pow(4, i)).runBenchmark(new SimpleLineBenchmarkResultWriter(System.out));
         }
     }
 }
diff --git a/testing/trino-benchmark/src/test/java/io/trino/benchmark/BenchmarkInequalityJoin.java b/testing/trino-benchmark/src/test/java/io/trino/benchmark/BenchmarkInequalityJoin.java
index a877305dc3ad..1b79e398ac36 100644
--- a/testing/trino-benchmark/src/test/java/io/trino/benchmark/BenchmarkInequalityJoin.java
+++ b/testing/trino-benchmark/src/test/java/io/trino/benchmark/BenchmarkInequalityJoin.java
@@ -14,6 +14,7 @@
 package io.trino.benchmark;
 
 import io.trino.spi.Page;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -25,7 +26,6 @@
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.runner.RunnerException;
-import org.testng.annotations.Test;
 
 import java.util.List;
 
diff --git a/testing/trino-benchmark/src/test/java/io/trino/benchmark/MemoryLocalQueryRunner.java b/testing/trino-benchmark/src/test/java/io/trino/benchmark/MemoryLocalQueryRunner.java
index d1caf805a36d..8385f5bcb040 100644
--- a/testing/trino-benchmark/src/test/java/io/trino/benchmark/MemoryLocalQueryRunner.java
+++ b/testing/trino-benchmark/src/test/java/io/trino/benchmark/MemoryLocalQueryRunner.java
@@ -28,14 +28,12 @@
 import io.trino.plugin.memory.MemoryConnectorFactory;
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.spi.Page;
-import io.trino.spi.QueryId;
 import io.trino.spiller.SpillSpaceTracker;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.PageConsumerOperator;
 import org.intellij.lang.annotations.Language;
 
 import java.util.List;
-import java.util.Map;
 
 import static io.airlift.units.DataSize.Unit.GIGABYTE;
 import static io.trino.testing.TestingSession.testSessionBuilder;
@@ -43,71 +41,15 @@
 public class MemoryLocalQueryRunner
         implements AutoCloseable
 {
-    protected final LocalQueryRunner localQueryRunner;
+    private final LocalQueryRunner localQueryRunner;
 
     public MemoryLocalQueryRunner()
-    {
-        this(ImmutableMap.of());
-    }
-
-    public MemoryLocalQueryRunner(Map<String, String> properties)
     {
         Session.SessionBuilder sessionBuilder = testSessionBuilder()
                 .setCatalog("memory")
                 .setSchema("default");
-        properties.forEach(sessionBuilder::setSystemProperty);
-
-        localQueryRunner = createMemoryLocalQueryRunner(sessionBuilder.build());
-    }
-
-    public List<Page> execute(@Language("SQL") String query)
-    {
-        MemoryPool memoryPool = new MemoryPool(DataSize.of(2, GIGABYTE));
-        SpillSpaceTracker spillSpaceTracker = new SpillSpaceTracker(DataSize.of(1, GIGABYTE));
-        QueryContext queryContext = new QueryContext(
-                new QueryId("test"),
-                DataSize.of(1, GIGABYTE),
-                memoryPool,
-                new TestingGcMonitor(),
-                localQueryRunner.getExecutor(),
-                localQueryRunner.getScheduler(),
-                DataSize.of(4, GIGABYTE),
-                spillSpaceTracker);
-
-        TaskContext taskContext = queryContext
-                .addTaskContext(new TaskStateMachine(new TaskId(new StageId("query", 0), 0, 0), localQueryRunner.getExecutor()),
-                        localQueryRunner.getDefaultSession(),
-                        () -> {},
-                        false,
-                        false);
-
-        // Use NullOutputFactory to avoid coping out results to avoid affecting benchmark results
-        ImmutableList.Builder<Page> output = ImmutableList.builder();
-        List<Driver> drivers = localQueryRunner.createDrivers(
-                query,
-                new PageConsumerOperator.PageConsumerOutputFactory(types -> output::add),
-                taskContext);
-
-        boolean done = false;
-        while (!done) {
-            boolean processed = false;
-            for (Driver driver : drivers) {
-                if (!driver.isFinished()) {
-                    driver.processForNumberOfIterations(1);
-                    processed = true;
-                }
-            }
-            done = !processed;
-        }
-
-        return output.build();
-    }
 
-    private static LocalQueryRunner createMemoryLocalQueryRunner(Session session)
-    {
-        LocalQueryRunner localQueryRunner = LocalQueryRunner.builder(session)
-                .withInitialTransaction()
-                .build();
+        localQueryRunner = LocalQueryRunner.create(sessionBuilder.build());
 
         // add tpch
         localQueryRunner.createCatalog("tpch", new TpchConnectorFactory(1), ImmutableMap.of());
@@ -115,8 +57,56 @@ private static LocalQueryRunner createMemoryLocalQueryRunner(Session session)
                 "memory",
                 new MemoryConnectorFactory(),
                 ImmutableMap.of("memory.max-data-per-node", "4GB"));
+    }
+
+    public List<Page> execute(@Language("SQL") String query)
+    {
+        return localQueryRunner.inTransaction(session -> {
+            // enroll the memory and tpch connectors in the transaction
+            localQueryRunner.getMetadata().getCatalogHandle(session, "tpch");
+            localQueryRunner.getMetadata().getCatalogHandle(session, "memory");
+
+            MemoryPool memoryPool = new MemoryPool(DataSize.of(2, GIGABYTE));
+            SpillSpaceTracker spillSpaceTracker = new SpillSpaceTracker(DataSize.of(1, GIGABYTE));
+            QueryContext queryContext = new QueryContext(
+                    session.getQueryId(),
+                    DataSize.of(1, GIGABYTE),
+                    memoryPool,
+                    new TestingGcMonitor(),
+                    localQueryRunner.getExecutor(),
+                    localQueryRunner.getScheduler(),
+                    DataSize.of(4, GIGABYTE),
+                    spillSpaceTracker);
+
+            TaskContext taskContext = queryContext
+                    .addTaskContext(
+                            new TaskStateMachine(new TaskId(new StageId("query", 0), 0, 0), localQueryRunner.getExecutor()),
+                            session,
+                            () -> {},
+                            false,
+                            false);
+
+            // Use NullOutputFactory to avoid coping out results to avoid affecting benchmark results
+            ImmutableList.Builder<Page> output = ImmutableList.builder();
+            List<Driver> drivers = localQueryRunner.createDrivers(
+                    query,
+                    new PageConsumerOperator.PageConsumerOutputFactory(types -> output::add),
+                    taskContext);
+
+            boolean done = false;
+            while (!done) {
+                boolean processed = false;
+                for (Driver driver : drivers) {
+                    if (!driver.isFinished()) {
+                        driver.processForNumberOfIterations(1);
+                        processed = true;
+                    }
+                }
+                done = !processed;
+            }
 
-        return localQueryRunner;
+            return output.build();
+        });
     }
 
     @Override
diff --git a/testing/trino-benchmark/src/test/java/io/trino/benchmark/TestBenchmarks.java b/testing/trino-benchmark/src/test/java/io/trino/benchmark/TestBenchmarks.java
index 1d61d6c08080..23ba20f9d5a2 100644
--- a/testing/trino-benchmark/src/test/java/io/trino/benchmark/TestBenchmarks.java
+++ b/testing/trino-benchmark/src/test/java/io/trino/benchmark/TestBenchmarks.java
@@ -14,7 +14,7 @@
 package io.trino.benchmark;
 
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.benchmark.BenchmarkQueryRunner.createLocalQueryRunner;
 import static io.trino.benchmark.BenchmarkSuite.createBenchmarks;
diff --git a/testing/trino-benchto-benchmarks/pom.xml b/testing/trino-benchto-benchmarks/pom.xml
index 1f2c2139ad2e..b3d6f3d1a6ac 100644
--- a/testing/trino-benchto-benchmarks/pom.xml
+++ b/testing/trino-benchto-benchmarks/pom.xml
@@ -4,12 +4,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-benchto-benchmarks</artifactId>
-    <name>trino-benchto-benchmarks</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -17,6 +16,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <!-- TODO document why we have explicit dependency on Guava -->
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <!-- benchmark queries referenced from benchmark definition files -->
             <groupId>io.trino</groupId>
@@ -39,15 +45,14 @@
         </dependency>
 
         <dependency>
-            <!-- TODO document why we have explicit dependency on Guava -->
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -56,6 +61,7 @@
         <plugins>
             <!-- Build archive files -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
                     <descriptors>
@@ -66,10 +72,10 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
+                        <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>
@@ -90,6 +96,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <configuration>
+                    <rules>
+                        <bannedDependencies>
+                            <includes combine.children="append">
+                                <!-- allow vulnerable snakeyaml version until benchto is updated -->
+                                <include>org.yaml:snakeyaml:1.33</include>
+                                <!-- benchto still uses javax.annotation -->
+                                <include>javax.annotation:javax.annotation-api</include>
+                            </includes>
+                        </bannedDependencies>
+                    </rules>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/testing/trino-benchto-benchmarks/src/test/java/io/trino/benchmarks/TestDummy.java b/testing/trino-benchto-benchmarks/src/test/java/io/trino/benchmarks/TestDummy.java
index f91752b76233..182018cfc54b 100644
--- a/testing/trino-benchto-benchmarks/src/test/java/io/trino/benchmarks/TestDummy.java
+++ b/testing/trino-benchto-benchmarks/src/test/java/io/trino/benchmarks/TestDummy.java
@@ -13,7 +13,7 @@
  */
 package io.trino.benchmarks;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestDummy
 {
diff --git a/testing/trino-faulttolerant-tests/pom.xml b/testing/trino-faulttolerant-tests/pom.xml
index 326ee333fc8a..f1d2141e5950 100644
--- a/testing/trino-faulttolerant-tests/pom.xml
+++ b/testing/trino-faulttolerant-tests/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-faulttolerant-tests</artifactId>
-    <name>trino-faulttolerant-tests</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -27,7 +26,30 @@
     </properties>
 
     <dependencies>
-        <!-- used by tests but also needed transitively -->
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>concurrent</artifactId>
@@ -77,51 +99,39 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>bootstrap</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -179,12 +189,6 @@
             <groupId>io.trino</groupId>
             <artifactId>trino-hive</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.alluxio</groupId>
-                    <artifactId>alluxio-shaded-client</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -192,25 +196,12 @@
             <artifactId>trino-hive</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.alluxio</groupId>
-                    <artifactId>alluxio-shaded-client</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-iceberg</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <!-- calcite-core and iceberg-data have conflicting versions of org.apache.commons:commons-lang3 -->
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-lang3</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -218,13 +209,6 @@
             <artifactId>trino-iceberg</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <!-- calcite-core and iceberg-data have conflicting versions of org.apache.commons:commons-lang3 -->
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-lang3</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -373,24 +357,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
@@ -403,6 +369,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!-- for benchmarks -->
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -455,18 +427,35 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.basepom.maven</groupId>
                 <artifactId>duplicate-finder-maven-plugin</artifactId>
                 <configuration>
                     <ignoredResourcePatterns>
-                        <!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
-                        <ignoredResourcePattern>mime.types</ignoredResourcePattern>
-                        <ignoredResourcePattern>about.html</ignoredResourcePattern>
                         <ignoredResourcePattern>iceberg-build.properties</ignoredResourcePattern>
                         <ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
-                        <!-- TODO: To be removed https://github.com/trinodb/trino/issues/15371 -->
-                        <ignoredResourcePattern>google/protobuf/.*\.proto$</ignoredResourcePattern>
                     </ignoredResourcePatterns>
                 </configuration>
             </plugin>
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/BaseFaultTolerantExecutionTest.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/BaseFaultTolerantExecutionTest.java
index ee40714e3e1f..9a19b45249f9 100644
--- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/BaseFaultTolerantExecutionTest.java
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/BaseFaultTolerantExecutionTest.java
@@ -16,7 +16,7 @@
 import io.trino.Session;
 import io.trino.testing.AbstractTestQueryFramework;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -101,8 +101,8 @@ private static Session withSingleWriterPerTask(Session session)
     {
         return Session.builder(session)
                 // one writer per partition per task
-                .setSystemProperty("task_writer_count", "1")
-                .setSystemProperty("task_partitioned_writer_count", "1")
+                .setSystemProperty("task_min_writer_count", "1")
+                .setSystemProperty("task_max_writer_count", "1")
                 .setSystemProperty("task_scale_writers_enabled", "false")
                 .build();
     }
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestDistributedFaultTolerantEngineOnlyQueries.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestDistributedFaultTolerantEngineOnlyQueries.java
index 40151ba1bd02..278eb5013cf1 100644
--- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestDistributedFaultTolerantEngineOnlyQueries.java
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestDistributedFaultTolerantEngineOnlyQueries.java
@@ -14,18 +14,32 @@
 package io.trino.faulttolerant;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.MoreCollectors;
+import io.trino.Session;
 import io.trino.connector.MockConnectorFactory;
 import io.trino.connector.MockConnectorPlugin;
+import io.trino.execution.QueryState;
+import io.trino.plugin.blackhole.BlackHolePlugin;
 import io.trino.plugin.exchange.filesystem.FileSystemExchangePlugin;
 import io.trino.plugin.memory.MemoryQueryRunner;
+import io.trino.server.BasicQueryInfo;
 import io.trino.testing.AbstractDistributedEngineOnlyQueries;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.FaultTolerantExecutionConnectorTestHelper;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
 
 import static io.airlift.testing.Closeables.closeAllSuppress;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.testing.assertions.Assert.assertEventually;
+import static java.util.concurrent.Executors.newCachedThreadPool;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDistributedFaultTolerantEngineOnlyQueries
         extends AbstractDistributedEngineOnlyQueries
@@ -53,6 +67,8 @@ protected QueryRunner createQueryRunner()
                     .withSessionProperties(TEST_CATALOG_PROPERTIES)
                     .build()));
             queryRunner.createCatalog(TESTING_CATALOG, "mock");
+            queryRunner.installPlugin(new BlackHolePlugin());
+            queryRunner.createCatalog("blackhole", "blackhole");
         }
         catch (RuntimeException e) {
             throw closeAllSuppress(e, queryRunner);
@@ -61,16 +77,127 @@ protected QueryRunner createQueryRunner()
     }
 
     @Override
-    @Test(enabled = false)
+    @Test
+    @Disabled
     public void testExplainAnalyzeVerbose()
     {
         // Spooling exchange does not prove output buffer utilization histogram
     }
 
+    @Test
     @Override
-    @Test(enabled = false)
+    @Disabled
     public void testSelectiveLimit()
     {
         // FTE mode does not terminate query when limit is reached
     }
+
+    @Test
+    public void testIssue18383()
+    {
+        String tableName = "test_issue_18383_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (id VARCHAR)");
+
+        assertQueryReturnsEmptyResult(
+                """
+                        WITH
+                        t1 AS (
+                            SELECT NULL AS address_id FROM %s i1
+                                INNER JOIN %s i2 ON i1.id = i2.id),
+                        t2 AS (
+                            SELECT id AS address_id FROM %s
+                            UNION
+                            SELECT * FROM t1)
+                        SELECT * FROM t2
+                            INNER JOIN %s i ON i.id = t2.address_id
+                        """.formatted(tableName, tableName, tableName, tableName));
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    @Timeout(60)
+    public void testMetadataOnlyQueries()
+            throws InterruptedException
+    {
+        // enforce single task uses whole node
+        Session highTaskMemorySession = Session.builder(getSession())
+                .setSystemProperty("fault_tolerant_execution_coordinator_task_memory", "500GB")
+                .setSystemProperty("fault_tolerant_execution_task_memory", "500GB")
+                // enforce each split in separate task
+                .setSystemProperty("fault_tolerant_execution_arbitrary_distribution_compute_task_target_size_min", "1B")
+                .setSystemProperty("fault_tolerant_execution_arbitrary_distribution_compute_task_target_size_max", "1B")
+                .build();
+
+        String slowTableName = "blackhole.default.testMetadataOnlyQueries_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + slowTableName + " (a INT, b INT) WITH (split_count = 3, pages_per_split = 1, rows_per_page = 1, page_processing_delay = '60s')");
+
+        String slowQuery = "select count(*) FROM " + slowTableName;
+        String nonMetadataQuery = "select count(*) non_metadata_query_count_" + System.currentTimeMillis() + " from nation";
+
+        ExecutorService backgroundExecutor = newCachedThreadPool();
+        try {
+            backgroundExecutor.submit(() -> {
+                query(highTaskMemorySession, slowQuery);
+            });
+            assertEventually(() -> queryIsInState(slowQuery, QueryState.RUNNING));
+
+            assertThat(query("DESCRIBE lineitem")).succeeds();
+            assertThat(query("SHOW TABLES")).succeeds();
+            assertThat(query("SHOW TABLES LIKE 'line%'")).succeeds();
+            assertThat(query("SHOW SCHEMAS")).succeeds();
+            assertThat(query("SHOW SCHEMAS LIKE 'def%'")).succeeds();
+            assertThat(query("SHOW CATALOGS")).succeeds();
+            assertThat(query("SHOW CATALOGS LIKE 'mem%'")).succeeds();
+            assertThat(query("SHOW FUNCTIONS")).succeeds();
+            assertThat(query("SHOW FUNCTIONS LIKE 'split%'")).succeeds();
+            assertThat(query("SHOW COLUMNS FROM lineitem")).succeeds();
+            assertThat(query("SHOW SESSION")).succeeds();
+            assertThat(query("SELECT count(*) FROM information_schema.tables")).succeeds();
+            assertThat(query("SELECT * FROM system.jdbc.tables WHERE table_schem LIKE 'def%'")).succeeds();
+
+            // check non-metadata queries still wait for resources
+            backgroundExecutor.submit(() -> {
+                query(nonMetadataQuery);
+            });
+            assertEventually(() -> queryIsInState(nonMetadataQuery, QueryState.STARTING));
+            Thread.sleep(1000); // wait a bit longer and query should be still STARTING
+            assertThat(queryState(nonMetadataQuery).orElseThrow()).isEqualTo(QueryState.STARTING);
+
+            // slow query should be still running
+            assertThat(queryState(slowQuery).orElseThrow()).isEqualTo(QueryState.RUNNING);
+        }
+        finally {
+            cancelQuery(slowQuery);
+            cancelQuery(nonMetadataQuery);
+            backgroundExecutor.shutdownNow();
+        }
+    }
+
+    private Optional<QueryState> queryState(String queryText)
+    {
+        return getDistributedQueryRunner().getCoordinator().getQueryManager().getQueries().stream()
+                .filter(query -> query.getQuery().equals(queryText))
+                .collect(MoreCollectors.toOptional())
+                .map(BasicQueryInfo::getState);
+    }
+
+    private boolean queryIsInState(String queryText, QueryState queryState)
+    {
+        return queryState(queryText).map(state -> state == queryState).orElse(false);
+    }
+
+    private void cancelQuery(String queryText)
+    {
+        getDistributedQueryRunner().getCoordinator().getQueryManager().getQueries().stream()
+                .filter(query -> query.getQuery().equals(queryText))
+                .forEach(query -> {
+                    try {
+                        getDistributedQueryRunner().getCoordinator().getQueryManager().cancelQuery(query.getQueryId());
+                    }
+                    catch (Exception e) {
+                        // ignore
+                    }
+                });
+    }
 }
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestFaultTolerantExecutionDynamicFiltering.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestFaultTolerantExecutionDynamicFiltering.java
index f9c3d8b58a05..9247c1ce3c60 100644
--- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestFaultTolerantExecutionDynamicFiltering.java
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestFaultTolerantExecutionDynamicFiltering.java
@@ -56,8 +56,8 @@ protected QueryRunner createQueryRunner()
                 })
                 .setExtraProperties(FaultTolerantExecutionConnectorTestHelper.getExtraProperties())
                 // keep limits lower to test edge cases
-                .addExtraProperty("dynamic-filtering.small-partitioned.max-distinct-values-per-driver", "10")
-                .addExtraProperty("dynamic-filtering.small-broadcast.max-distinct-values-per-driver", "10")
+                .addExtraProperty("dynamic-filtering.small.max-distinct-values-per-driver", "10")
+                .addExtraProperty("dynamic-filtering.small.range-row-limit-per-driver", "100")
                 .build();
     }
 
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestOverridePartitionCountRecursively.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestOverridePartitionCountRecursively.java
new file mode 100644
index 000000000000..d5b1bb8a502e
--- /dev/null
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/TestOverridePartitionCountRecursively.java
@@ -0,0 +1,307 @@
+/*
+ * Licensed 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 io.trino.faulttolerant;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import io.trino.Session;
+import io.trino.connector.CoordinatorDynamicCatalogManager;
+import io.trino.connector.InMemoryCatalogStore;
+import io.trino.connector.LazyCatalogFactory;
+import io.trino.execution.QueryManagerConfig;
+import io.trino.execution.warnings.WarningCollector;
+import io.trino.plugin.exchange.filesystem.FileSystemExchangePlugin;
+import io.trino.plugin.hive.HiveQueryRunner;
+import io.trino.security.AllowAllAccessControl;
+import io.trino.sql.planner.PartitioningHandle;
+import io.trino.sql.planner.Plan;
+import io.trino.sql.planner.PlanFragment;
+import io.trino.sql.planner.PlanFragmentIdAllocator;
+import io.trino.sql.planner.PlanFragmenter;
+import io.trino.sql.planner.PlanNodeIdAllocator;
+import io.trino.sql.planner.SubPlan;
+import io.trino.sql.planner.plan.PlanFragmentId;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.FaultTolerantExecutionConnectorTestHelper;
+import io.trino.testing.QueryRunner;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static io.trino.SystemSessionProperties.getFaultTolerantExecutionMaxPartitionCount;
+import static io.trino.sql.planner.RuntimeAdaptivePartitioningRewriter.consumesHashPartitionedInput;
+import static io.trino.sql.planner.RuntimeAdaptivePartitioningRewriter.getMaxPlanFragmentId;
+import static io.trino.sql.planner.RuntimeAdaptivePartitioningRewriter.getMaxPlanId;
+import static io.trino.sql.planner.RuntimeAdaptivePartitioningRewriter.overridePartitionCountRecursively;
+import static io.trino.sql.planner.SystemPartitioningHandle.COORDINATOR_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_BROADCAST_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_HASH_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION;
+import static io.trino.sql.planner.SystemPartitioningHandle.SOURCE_DISTRIBUTION;
+import static io.trino.sql.planner.TopologicalOrderSubPlanVisitor.sortPlanInTopologicalOrder;
+import static io.trino.tpch.TpchTable.getTables;
+import static io.trino.transaction.TransactionBuilder.transaction;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class TestOverridePartitionCountRecursively
+        extends AbstractTestQueryFramework
+{
+    private static final int PARTITION_COUNT_OVERRIDE = 40;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        ImmutableMap.Builder<String, String> extraPropertiesWithRuntimeAdaptivePartitioning = ImmutableMap.builder();
+        extraPropertiesWithRuntimeAdaptivePartitioning.putAll(FaultTolerantExecutionConnectorTestHelper.getExtraProperties());
+        extraPropertiesWithRuntimeAdaptivePartitioning.putAll(FaultTolerantExecutionConnectorTestHelper.enforceRuntimeAdaptivePartitioningProperties());
+
+        return HiveQueryRunner.builder()
+                .setExtraProperties(extraPropertiesWithRuntimeAdaptivePartitioning.buildOrThrow())
+                .setAdditionalSetup(runner -> {
+                    runner.installPlugin(new FileSystemExchangePlugin());
+                    runner.loadExchangeManager("filesystem", ImmutableMap.of("exchange.base-directories",
+                                    System.getProperty("java.io.tmpdir") + "/trino-local-file-system-exchange-manager"));
+                })
+                .setInitialTables(getTables())
+                .build();
+    }
+
+    @Test
+    public void testCreateTableAs()
+    {
+        // already started: 3, 5, 6
+        // added fragments: 7, 8, 9
+        //   0                 0
+        //   |                 |
+        //   1                 1
+        //   |                 |
+        //   2                 2
+        //  / \              /  \
+        // 3*  4     =>    [7]   4
+        //    / \           |   / \
+        //   5* 6*         3* [8] [9]
+        //                     |   |
+        //                    5*   6*
+        assertOverridePartitionCountRecursively(
+                noJoinReordering(),
+                "CREATE TABLE tmp AS " +
+                "SELECT n1.* FROM nation n1 " +
+                        "RIGHT JOIN " +
+                        "(SELECT n.nationkey FROM (SELECT * FROM lineitem WHERE suppkey BETWEEN 20 and 30) l LEFT JOIN nation n on l.suppkey = n.nationkey) n2" +
+                        " ON n1.nationkey = n2.nationkey + 1",
+                ImmutableMap.<Integer, FragmentPartitioningInfo>builder()
+                        .put(0, new FragmentPartitioningInfo(COORDINATOR_DISTRIBUTION, Optional.empty(), SINGLE_DISTRIBUTION, Optional.empty()))
+                        .put(1, new FragmentPartitioningInfo(SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION, Optional.empty(), SINGLE_DISTRIBUTION, Optional.empty()))
+                        .put(2, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.empty(), SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION, Optional.empty()))
+                        .put(3, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.empty()))
+                        .put(4, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.empty()))
+                        .put(5, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.empty()))
+                        .put(6, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.empty()))
+                        .buildOrThrow(),
+                ImmutableMap.<Integer, FragmentPartitioningInfo>builder()
+                        .put(0, new FragmentPartitioningInfo(COORDINATOR_DISTRIBUTION, Optional.empty(), SINGLE_DISTRIBUTION, Optional.empty()))
+                        .put(1, new FragmentPartitioningInfo(SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION, Optional.empty(), SINGLE_DISTRIBUTION, Optional.empty()))
+                        .put(2, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(40), SCALED_WRITER_ROUND_ROBIN_DISTRIBUTION, Optional.empty()))
+                        .put(3, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.empty()))
+                        .put(4, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(40), FIXED_HASH_DISTRIBUTION, Optional.of(40)))
+                        .put(5, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.empty()))
+                        .put(6, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.empty()))
+                        .put(7, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(5), FIXED_HASH_DISTRIBUTION, Optional.of(40)))
+                        .put(8, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(5), FIXED_HASH_DISTRIBUTION, Optional.of(40)))
+                        .put(9, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(5), FIXED_HASH_DISTRIBUTION, Optional.of(40)))
+                        .buildOrThrow(),
+                ImmutableSet.of(3, 5, 6));
+    }
+
+    @Test
+    public void testSkipBroadcastSubtree()
+    {
+        // result of fragment 7 will be broadcast,
+        // so no runtime adaptive partitioning will be applied to its subtree
+        // already started: 4, 10, 11, 12
+        // added fragments: 13
+        //        0                  0
+        //        |                  |
+        //        1                  1
+        //       / \              /     \
+        //      2   7     =>     2       7
+        //     / \  |           / \      |
+        //    3  6  8          3  6      8
+        //   / \   / \        / \       / \
+        //  4* 5  9  12*    [13] 5     9  12*
+        //       / \          |       / \
+        //     10* 11*       4*     10* 11*
+        assertOverridePartitionCountRecursively(
+                noJoinReordering(),
+                "SELECT\n" +
+                        "  ps.partkey,\n" +
+                        "  sum(ps.supplycost * ps.availqty) AS value\n" +
+                        "FROM\n" +
+                        "  partsupp ps,\n" +
+                        "  supplier s,\n" +
+                        "  nation n\n" +
+                        "WHERE\n" +
+                        "  ps.suppkey = s.suppkey\n" +
+                        "  AND s.nationkey = n.nationkey\n" +
+                        "  AND n.name = 'GERMANY'\n" +
+                        "GROUP BY\n" +
+                        "  ps.partkey\n" +
+                        "HAVING\n" +
+                        "  sum(ps.supplycost * ps.availqty) > (\n" +
+                        "    SELECT sum(ps.supplycost * ps.availqty) * 0.0001\n" +
+                        "    FROM\n" +
+                        "      partsupp ps,\n" +
+                        "      supplier s,\n" +
+                        "      nation n\n" +
+                        "    WHERE\n" +
+                        "      ps.suppkey = s.suppkey\n" +
+                        "      AND s.nationkey = n.nationkey\n" +
+                        "      AND n.name = 'GERMANY'\n" +
+                        "  )\n" +
+                        "ORDER BY\n" +
+                        "  value DESC",
+                ImmutableMap.<Integer, FragmentPartitioningInfo>builder()
+                        .put(0, new FragmentPartitioningInfo(SINGLE_DISTRIBUTION, Optional.empty(), SINGLE_DISTRIBUTION, Optional.empty()))
+                        .put(1, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(4), SINGLE_DISTRIBUTION, Optional.empty()))
+                        .put(2, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(4), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(3, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(4), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(4, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(5, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(6, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(7, new FragmentPartitioningInfo(SINGLE_DISTRIBUTION, Optional.empty(), FIXED_BROADCAST_DISTRIBUTION, Optional.empty()))
+                        .put(8, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(4), SINGLE_DISTRIBUTION, Optional.empty()))
+                        .put(9, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(4), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(10, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(11, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(12, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .buildOrThrow(),
+                ImmutableMap.<Integer, FragmentPartitioningInfo>builder()
+                        .put(0, new FragmentPartitioningInfo(SINGLE_DISTRIBUTION, Optional.empty(), SINGLE_DISTRIBUTION, Optional.empty()))
+                        .put(1, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(40), SINGLE_DISTRIBUTION, Optional.empty()))
+                        .put(2, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(40), FIXED_HASH_DISTRIBUTION, Optional.of(40)))
+                        .put(3, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(40), FIXED_HASH_DISTRIBUTION, Optional.of(40)))
+                        .put(4, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(5, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.of(40)))
+                        .put(6, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.of(40)))
+                        .put(7, new FragmentPartitioningInfo(SINGLE_DISTRIBUTION, Optional.empty(), FIXED_BROADCAST_DISTRIBUTION, Optional.empty()))
+                        .put(8, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(4), SINGLE_DISTRIBUTION, Optional.empty()))
+                        .put(9, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(4), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(10, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(11, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(12, new FragmentPartitioningInfo(SOURCE_DISTRIBUTION, Optional.empty(), FIXED_HASH_DISTRIBUTION, Optional.of(4)))
+                        .put(13, new FragmentPartitioningInfo(FIXED_HASH_DISTRIBUTION, Optional.of(4), FIXED_HASH_DISTRIBUTION, Optional.of(40)))
+                        .buildOrThrow(),
+                ImmutableSet.of(4, 10, 11, 12));
+    }
+
+    private void assertOverridePartitionCountRecursively(
+            Session session,
+            @Language("SQL") String sql,
+            Map<Integer, FragmentPartitioningInfo> fragmentPartitioningInfoBefore,
+            Map<Integer, FragmentPartitioningInfo> fragmentPartitioningInfoAfter,
+            Set<Integer> startedFragments)
+    {
+        SubPlan plan = getSubPlan(session, sql);
+        List<SubPlan> planInTopologicalOrder = sortPlanInTopologicalOrder(plan);
+        assertThat(planInTopologicalOrder).hasSize(fragmentPartitioningInfoBefore.size());
+        for (SubPlan subPlan : planInTopologicalOrder) {
+            PlanFragment fragment = subPlan.getFragment();
+            int fragmentIdAsInt = Integer.parseInt(fragment.getId().toString());
+            FragmentPartitioningInfo fragmentPartitioningInfo = fragmentPartitioningInfoBefore.get(fragmentIdAsInt);
+            assertEquals(fragment.getPartitionCount(), fragmentPartitioningInfo.inputPartitionCount());
+            assertEquals(fragment.getPartitioning(), fragmentPartitioningInfo.inputPartitioning());
+            assertEquals(fragment.getOutputPartitioningScheme().getPartitionCount(), fragmentPartitioningInfo.outputPartitionCount());
+            assertEquals(fragment.getOutputPartitioningScheme().getPartitioning().getHandle(), fragmentPartitioningInfo.outputPartitioning());
+        }
+
+        PlanFragmentIdAllocator planFragmentIdAllocator = new PlanFragmentIdAllocator(getMaxPlanFragmentId(planInTopologicalOrder) + 1);
+        PlanNodeIdAllocator planNodeIdAllocator = new PlanNodeIdAllocator(getMaxPlanId(planInTopologicalOrder) + 1);
+        int oldPartitionCount = planInTopologicalOrder.stream()
+                .mapToInt(subPlan -> {
+                    PlanFragment fragment = subPlan.getFragment();
+                    if (consumesHashPartitionedInput(fragment)) {
+                        return fragment.getPartitionCount().orElse(getFaultTolerantExecutionMaxPartitionCount(session));
+                    }
+                    else {
+                        return 0;
+                    }
+                })
+                .max()
+                .orElseThrow();
+        assertTrue(oldPartitionCount > 0);
+
+        SubPlan newPlan = overridePartitionCountRecursively(
+                plan,
+                oldPartitionCount,
+                PARTITION_COUNT_OVERRIDE,
+                planFragmentIdAllocator,
+                planNodeIdAllocator,
+                startedFragments.stream().map(fragmentIdAsInt -> new PlanFragmentId(String.valueOf(fragmentIdAsInt))).collect(toImmutableSet()));
+        planInTopologicalOrder = sortPlanInTopologicalOrder(newPlan);
+        assertThat(planInTopologicalOrder).hasSize(fragmentPartitioningInfoAfter.size());
+        for (SubPlan subPlan : planInTopologicalOrder) {
+            PlanFragment fragment = subPlan.getFragment();
+            int fragmentIdAsInt = Integer.parseInt(fragment.getId().toString());
+            FragmentPartitioningInfo fragmentPartitioningInfo = fragmentPartitioningInfoAfter.get(fragmentIdAsInt);
+            assertEquals(fragment.getPartitionCount(), fragmentPartitioningInfo.inputPartitionCount());
+            assertEquals(fragment.getPartitioning(), fragmentPartitioningInfo.inputPartitioning());
+            assertEquals(fragment.getOutputPartitioningScheme().getPartitionCount(), fragmentPartitioningInfo.outputPartitionCount());
+            assertEquals(fragment.getOutputPartitioningScheme().getPartitioning().getHandle(), fragmentPartitioningInfo.outputPartitioning());
+        }
+    }
+
+    private SubPlan getSubPlan(Session session, @Language("SQL") String sql)
+    {
+        QueryRunner queryRunner = getDistributedQueryRunner();
+        return transaction(queryRunner.getTransactionManager(), queryRunner.getMetadata(), new AllowAllAccessControl())
+                .singleStatement()
+                .execute(session, transactionSession -> {
+                    Plan plan = queryRunner.createPlan(transactionSession, sql);
+                    // metadata.getCatalogHandle() registers the catalog for the transaction
+                    transactionSession.getCatalog().ifPresent(catalog -> queryRunner.getMetadata().getCatalogHandle(transactionSession, catalog));
+                    return new PlanFragmenter(
+                            queryRunner.getMetadata(),
+                            queryRunner.getFunctionManager(),
+                            queryRunner.getTransactionManager(),
+                            new CoordinatorDynamicCatalogManager(new InMemoryCatalogStore(), new LazyCatalogFactory(), directExecutor()),
+                            queryRunner.getLanguageFunctionManager(),
+                            new QueryManagerConfig()).createSubPlans(transactionSession, plan, false, WarningCollector.NOOP);
+                });
+    }
+
+    private record FragmentPartitioningInfo(
+            PartitioningHandle inputPartitioning,
+            Optional<Integer> inputPartitionCount,
+            PartitioningHandle outputPartitioning,
+            Optional<Integer> outputPartitionCount)
+    {
+        FragmentPartitioningInfo {
+            requireNonNull(inputPartitioning, "inputPartitioning is null");
+            requireNonNull(inputPartitionCount, "inputPartitionCount is null");
+            requireNonNull(outputPartitioning, "outputPartitioning is null");
+            requireNonNull(outputPartitionCount, "outputPartitionCount is null");
+        }
+    }
+}
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/delta/TestDeltaFaultTolerantExecutionTest.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/delta/TestDeltaFaultTolerantExecutionTest.java
index 6d45644f2662..bc20cc405e0b 100644
--- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/delta/TestDeltaFaultTolerantExecutionTest.java
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/delta/TestDeltaFaultTolerantExecutionTest.java
@@ -21,6 +21,7 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.FaultTolerantExecutionConnectorTestHelper;
 import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.DELTA_CATALOG;
 import static io.trino.plugin.deltalake.DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner;
@@ -33,7 +34,8 @@ public class TestDeltaFaultTolerantExecutionTest
         extends BaseFaultTolerantExecutionTest
 {
     private static final String SCHEMA = "fte_preferred_write_partitioning";
-    private static final String BUCKET_NAME = "test-fte-preferred-write-partitioning-" + randomNameSuffix();
+
+    private final String bucketName = "test-fte-preferred-write-partitioning-" + randomNameSuffix();
 
     public TestDeltaFaultTolerantExecutionTest()
     {
@@ -44,9 +46,9 @@ public TestDeltaFaultTolerantExecutionTest()
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        HiveMinioDataLake hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(BUCKET_NAME));
+        HiveMinioDataLake hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
         hiveMinioDataLake.start();
-        MinioStorage minioStorage = closeAfterClass(new MinioStorage(BUCKET_NAME));
+        MinioStorage minioStorage = closeAfterClass(new MinioStorage(bucketName));
         minioStorage.start();
 
         DistributedQueryRunner runner = createS3DeltaLakeQueryRunner(
@@ -61,10 +63,11 @@ protected QueryRunner createQueryRunner()
                     instance.installPlugin(new FileSystemExchangePlugin());
                     instance.loadExchangeManager("filesystem", getExchangeManagerProperties(minioStorage));
                 });
-        runner.execute(format("CREATE SCHEMA %s WITH (location = 's3://%s/%s')", SCHEMA, BUCKET_NAME, SCHEMA));
+        runner.execute(format("CREATE SCHEMA %s WITH (location = 's3://%s/%s')", SCHEMA, bucketName, SCHEMA));
         return runner;
     }
 
+    @Test
     @Override
     public void testExecutePreferredWritePartitioningSkewMitigation()
     {
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionAggregations.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionAggregations.java
index 97599b6478bf..19dcd88fbaac 100644
--- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionAggregations.java
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionAggregations.java
@@ -18,17 +18,22 @@
 import io.trino.plugin.hive.HiveQueryRunner;
 import io.trino.testing.AbstractTestFaultTolerantExecutionAggregations;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
+import io.trino.testng.services.ManageTestResources;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Map;
 
 import static io.trino.plugin.exchange.filesystem.containers.MinioStorage.getExchangeManagerProperties;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tpch.TpchTable.getTables;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestHiveFaultTolerantExecutionAggregations
         extends AbstractTestFaultTolerantExecutionAggregations
 {
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
     private MinioStorage minioStorage;
 
     @Override
@@ -48,7 +53,7 @@ protected QueryRunner createQueryRunner(Map<String, String> extraProperties)
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void destroy()
             throws Exception
     {
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionConnectorTest.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionConnectorTest.java
index db9e24b570d5..b79ba9ff5b71 100644
--- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionConnectorTest.java
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionConnectorTest.java
@@ -18,12 +18,14 @@
 import io.trino.plugin.exchange.filesystem.FileSystemExchangePlugin;
 import io.trino.plugin.exchange.filesystem.containers.MinioStorage;
 import io.trino.plugin.hive.BaseHiveConnectorTest;
+import io.trino.plugin.hive.HiveQueryRunner;
 import io.trino.testing.QueryRunner;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
 import static io.airlift.units.DataSize.Unit.GIGABYTE;
-import static io.trino.SystemSessionProperties.FAULT_TOLERANT_EXECUTION_PARTITION_COUNT;
+import static io.trino.SystemSessionProperties.FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT;
+import static io.trino.SystemSessionProperties.FAULT_TOLERANT_EXECUTION_MIN_PARTITION_COUNT;
 import static io.trino.plugin.exchange.filesystem.containers.MinioStorage.getExchangeManagerProperties;
 import static io.trino.testing.FaultTolerantExecutionConnectorTestHelper.getExtraProperties;
 import static io.trino.testing.TestingNames.randomNameSuffix;
@@ -40,18 +42,24 @@ protected QueryRunner createQueryRunner()
         this.minioStorage = new MinioStorage("test-exchange-spooling-" + randomNameSuffix());
         minioStorage.start();
 
-        return BaseHiveConnectorTest.createHiveQueryRunner(
-                getExtraProperties(),
-                runner -> {
+        return BaseHiveConnectorTest.createHiveQueryRunner(HiveQueryRunner.builder()
+                .setExtraProperties(getExtraProperties())
+                .setAdditionalSetup(runner -> {
                     runner.installPlugin(new FileSystemExchangePlugin());
                     runner.loadExchangeManager("filesystem", getExchangeManagerProperties(minioStorage));
-                });
+                }));
     }
 
     @Override
-    public void testScaleWriters()
+    public void testMultipleWriters()
     {
-        testWithAllStorageFormats(this::testSingleWriter);
+        // Not applicable for fault-tolerant mode.
+    }
+
+    @Override
+    public void testMultipleWritersWithSkewedData()
+    {
+        // Not applicable for fault-tolerant mode.
     }
 
     // We need to override this method because in the case of pipeline execution,
@@ -60,7 +68,8 @@ public void testScaleWriters()
     @Override
     public void testTaskWritersDoesNotScaleWithLargeMinWriterSize()
     {
-        testTaskScaleWriters(getSession(), DataSize.of(2, GIGABYTE), 4, false).isEqualTo(1);
+        testTaskScaleWriters(getSession(), DataSize.of(2, GIGABYTE), 4, false, DataSize.of(64, GIGABYTE))
+                .isEqualTo(1);
     }
 
     @Override
@@ -91,7 +100,8 @@ public void testWritersAcrossMultipleWorkersWhenScaleWritersIsEnabled()
     public void testMaxOutputPartitionCountCheck()
     {
         Session session = Session.builder(getSession())
-                .setSystemProperty(FAULT_TOLERANT_EXECUTION_PARTITION_COUNT, "51")
+                .setSystemProperty(FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT, "51")
+                .setSystemProperty(FAULT_TOLERANT_EXECUTION_MIN_PARTITION_COUNT, "51")
                 .build();
         assertQueryFails(session, "SELECT nationkey, count(*) FROM nation GROUP BY nationkey", "Max number of output partitions exceeded for exchange.*");
     }
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionJoinQueries.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionJoinQueries.java
index fb2ee32dd168..a1e5f3fa7495 100644
--- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionJoinQueries.java
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionJoinQueries.java
@@ -19,8 +19,10 @@
 import io.trino.plugin.hive.HiveQueryRunner;
 import io.trino.testing.AbstractTestFaultTolerantExecutionJoinQueries;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import io.trino.testng.services.ManageTestResources.Suppress;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Map;
 
@@ -28,10 +30,13 @@
 import static io.trino.plugin.exchange.filesystem.containers.MinioStorage.getExchangeManagerProperties;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tpch.TpchTable.getTables;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestHiveFaultTolerantExecutionJoinQueries
         extends AbstractTestFaultTolerantExecutionJoinQueries
 {
+    @Suppress(because = "Not a TestNG test class")
     private MinioStorage minioStorage;
 
     @Override
@@ -61,7 +66,7 @@ public void verifyDynamicFilteringEnabled()
                 "VALUES ('enable_dynamic_filtering', 'true', 'true', 'boolean', 'Enable dynamic filtering')");
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void destroy()
             throws Exception
     {
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionOrderByQueries.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionOrderByQueries.java
index c0d591ea000f..48f0e58d69cb 100644
--- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionOrderByQueries.java
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionOrderByQueries.java
@@ -18,8 +18,9 @@
 import io.trino.plugin.hive.HiveQueryRunner;
 import io.trino.testing.AbstractTestFaultTolerantExecutionOrderByQueries;
 import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
 
 import java.util.Map;
 
@@ -49,6 +50,7 @@ protected QueryRunner createQueryRunner(Map<String, String> extraProperties)
                 .build();
     }
 
+    @AfterAll
     @AfterClass(alwaysRun = true)
     public void destroy()
             throws Exception
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionTest.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionTest.java
index 643c2334ac9a..300498a87075 100644
--- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionTest.java
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionTest.java
@@ -20,7 +20,8 @@
 import io.trino.plugin.hive.HiveQueryRunner;
 import io.trino.testing.FaultTolerantExecutionConnectorTestHelper;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import static io.trino.plugin.exchange.filesystem.containers.MinioStorage.getExchangeManagerProperties;
 import static io.trino.testing.TestingNames.randomNameSuffix;
@@ -58,7 +59,8 @@ protected Session getSession()
                 .build();
     }
 
-    @Test(timeOut = 120_000)
+    @Test
+    @Timeout(120)
     public void testPotentialDeadlocks()
     {
         // create a highly granular table to ensure the number of splits is high
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionWindowQueries.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionWindowQueries.java
index d5e4c5223e6f..9b61d9ee2f69 100644
--- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionWindowQueries.java
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionWindowQueries.java
@@ -18,6 +18,8 @@
 import io.trino.plugin.hive.HiveQueryRunner;
 import io.trino.testing.AbstractTestFaultTolerantExecutionWindowQueries;
 import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.TestInstance;
 import org.testng.annotations.AfterClass;
 
 import java.util.Map;
@@ -25,7 +27,9 @@
 import static io.trino.plugin.exchange.filesystem.containers.MinioStorage.getExchangeManagerProperties;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tpch.TpchTable.getTables;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestHiveFaultTolerantExecutionWindowQueries
         extends AbstractTestFaultTolerantExecutionWindowQueries
 {
@@ -48,6 +52,7 @@ protected QueryRunner createQueryRunner(Map<String, String> extraProperties)
                 .build();
     }
 
+    @AfterAll
     @AfterClass(alwaysRun = true)
     public void destroy()
             throws Exception
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveRuntimeAdaptivePartitioningFaultTolerantExecutionAggregations.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveRuntimeAdaptivePartitioningFaultTolerantExecutionAggregations.java
new file mode 100644
index 000000000000..e09a4ddff0c3
--- /dev/null
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveRuntimeAdaptivePartitioningFaultTolerantExecutionAggregations.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed 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 io.trino.faulttolerant.hive;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.exchange.filesystem.FileSystemExchangePlugin;
+import io.trino.plugin.hive.HiveQueryRunner;
+import io.trino.testing.AbstractTestFaultTolerantExecutionAggregations;
+import io.trino.testing.FaultTolerantExecutionConnectorTestHelper;
+import io.trino.testing.QueryRunner;
+
+import java.util.Map;
+
+import static io.trino.tpch.TpchTable.getTables;
+
+public class TestHiveRuntimeAdaptivePartitioningFaultTolerantExecutionAggregations
+        extends AbstractTestFaultTolerantExecutionAggregations
+{
+    @Override
+    protected QueryRunner createQueryRunner(Map<String, String> extraProperties)
+            throws Exception
+    {
+        ImmutableMap.Builder<String, String> extraPropertiesWithRuntimeAdaptivePartitioning = ImmutableMap.builder();
+        extraPropertiesWithRuntimeAdaptivePartitioning.putAll(extraProperties);
+        extraPropertiesWithRuntimeAdaptivePartitioning.putAll(FaultTolerantExecutionConnectorTestHelper.enforceRuntimeAdaptivePartitioningProperties());
+
+        return HiveQueryRunner.builder()
+                .setExtraProperties(extraPropertiesWithRuntimeAdaptivePartitioning.buildOrThrow())
+                .setAdditionalSetup(runner -> {
+                    runner.installPlugin(new FileSystemExchangePlugin());
+                    runner.loadExchangeManager("filesystem", ImmutableMap.of("exchange.base-directories",
+                            System.getProperty("java.io.tmpdir") + "/trino-local-file-system-exchange-manager"));
+                })
+                .setInitialTables(getTables())
+                .build();
+    }
+}
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveRuntimeAdaptivePartitioningFaultTolerantExecutionJoinQueries.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveRuntimeAdaptivePartitioningFaultTolerantExecutionJoinQueries.java
new file mode 100644
index 000000000000..66a0820269a4
--- /dev/null
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveRuntimeAdaptivePartitioningFaultTolerantExecutionJoinQueries.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed 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 io.trino.faulttolerant.hive;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.execution.DynamicFilterConfig;
+import io.trino.plugin.exchange.filesystem.FileSystemExchangePlugin;
+import io.trino.plugin.hive.HiveQueryRunner;
+import io.trino.testing.AbstractTestFaultTolerantExecutionJoinQueries;
+import io.trino.testing.FaultTolerantExecutionConnectorTestHelper;
+import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static com.google.common.base.Verify.verify;
+import static io.trino.tpch.TpchTable.getTables;
+
+public class TestHiveRuntimeAdaptivePartitioningFaultTolerantExecutionJoinQueries
+        extends AbstractTestFaultTolerantExecutionJoinQueries
+{
+    @Override
+    protected QueryRunner createQueryRunner(Map<String, String> extraProperties)
+            throws Exception
+    {
+        ImmutableMap.Builder<String, String> extraPropertiesWithRuntimeAdaptivePartitioning = ImmutableMap.builder();
+        extraPropertiesWithRuntimeAdaptivePartitioning.putAll(extraProperties);
+        extraPropertiesWithRuntimeAdaptivePartitioning.putAll(FaultTolerantExecutionConnectorTestHelper.enforceRuntimeAdaptivePartitioningProperties());
+
+        verify(new DynamicFilterConfig().isEnableDynamicFiltering(), "this class assumes dynamic filtering is enabled by default");
+        return HiveQueryRunner.builder()
+                .setExtraProperties(extraPropertiesWithRuntimeAdaptivePartitioning.buildOrThrow())
+                .setAdditionalSetup(runner -> {
+                    runner.installPlugin(new FileSystemExchangePlugin());
+                    runner.loadExchangeManager("filesystem", ImmutableMap.of("exchange.base-directories",
+                            System.getProperty("java.io.tmpdir") + "/trino-local-file-system-exchange-manager"));
+                })
+                .setInitialTables(getTables())
+                .addHiveProperty("hive.dynamic-filtering.wait-timeout", "1h")
+                .build();
+    }
+
+    @Test
+    public void verifyDynamicFilteringEnabled()
+    {
+        assertQuery(
+                "SHOW SESSION LIKE 'enable_dynamic_filtering'",
+                "VALUES ('enable_dynamic_filtering', 'true', 'true', 'boolean', 'Enable dynamic filtering')");
+    }
+}
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveRuntimeAdaptivePartitioningFaultTolerantExecutionWindowQueries.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveRuntimeAdaptivePartitioningFaultTolerantExecutionWindowQueries.java
new file mode 100644
index 000000000000..c3ef5a24f4b1
--- /dev/null
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/hive/TestHiveRuntimeAdaptivePartitioningFaultTolerantExecutionWindowQueries.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed 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 io.trino.faulttolerant.hive;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.plugin.exchange.filesystem.FileSystemExchangePlugin;
+import io.trino.plugin.hive.HiveQueryRunner;
+import io.trino.testing.AbstractTestFaultTolerantExecutionWindowQueries;
+import io.trino.testing.FaultTolerantExecutionConnectorTestHelper;
+import io.trino.testing.QueryRunner;
+
+import java.util.Map;
+
+import static io.trino.tpch.TpchTable.getTables;
+
+public class TestHiveRuntimeAdaptivePartitioningFaultTolerantExecutionWindowQueries
+        extends AbstractTestFaultTolerantExecutionWindowQueries
+{
+    @Override
+    protected QueryRunner createQueryRunner(Map<String, String> extraProperties)
+            throws Exception
+    {
+        ImmutableMap.Builder<String, String> extraPropertiesWithRuntimeAdaptivePartitioning = ImmutableMap.builder();
+        extraPropertiesWithRuntimeAdaptivePartitioning.putAll(extraProperties);
+        extraPropertiesWithRuntimeAdaptivePartitioning.putAll(FaultTolerantExecutionConnectorTestHelper.enforceRuntimeAdaptivePartitioningProperties());
+
+        return HiveQueryRunner.builder()
+                .setExtraProperties(extraPropertiesWithRuntimeAdaptivePartitioning.buildOrThrow())
+                .setAdditionalSetup(runner -> {
+                    runner.installPlugin(new FileSystemExchangePlugin());
+                    runner.loadExchangeManager("filesystem", ImmutableMap.of("exchange.base-directories",
+                            System.getProperty("java.io.tmpdir") + "/trino-local-file-system-exchange-manager"));
+                })
+                .setInitialTables(getTables())
+                .build();
+    }
+}
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/iceberg/TestIcebergFaultTolerantExecutionTest.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/iceberg/TestIcebergFaultTolerantExecutionTest.java
index 238ecbb22795..4b3eaeb2ffb5 100644
--- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/iceberg/TestIcebergFaultTolerantExecutionTest.java
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/iceberg/TestIcebergFaultTolerantExecutionTest.java
@@ -19,6 +19,7 @@
 import io.trino.plugin.iceberg.IcebergQueryRunner;
 import io.trino.testing.FaultTolerantExecutionConnectorTestHelper;
 import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.exchange.filesystem.containers.MinioStorage.getExchangeManagerProperties;
 import static io.trino.testing.TestingNames.randomNameSuffix;
@@ -48,6 +49,7 @@ protected QueryRunner createQueryRunner()
                 .build();
     }
 
+    @Test
     @Override
     public void testExecutePreferredWritePartitioningSkewMitigation()
     {
diff --git a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/iceberg/TestIcebergParquetFaultTolerantExecutionConnectorTest.java b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/iceberg/TestIcebergParquetFaultTolerantExecutionConnectorTest.java
index 8e3a22d476ea..6bb86779e0ae 100644
--- a/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/iceberg/TestIcebergParquetFaultTolerantExecutionConnectorTest.java
+++ b/testing/trino-faulttolerant-tests/src/test/java/io/trino/faulttolerant/iceberg/TestIcebergParquetFaultTolerantExecutionConnectorTest.java
@@ -37,13 +37,12 @@ protected IcebergQueryRunner.Builder createQueryRunnerBuilder()
         this.minioStorage = new MinioStorage("test-exchange-spooling-" + randomNameSuffix());
         minioStorage.start();
 
-        IcebergQueryRunner.Builder builder = super.createQueryRunnerBuilder();
-        getExtraProperties().forEach(builder::addExtraProperty);
-        builder.setAdditionalSetup(runner -> {
-            runner.installPlugin(new FileSystemExchangePlugin());
-            runner.loadExchangeManager("filesystem", getExchangeManagerProperties(minioStorage));
-        });
-        return builder;
+        return super.createQueryRunnerBuilder()
+                .addExtraProperties(getExtraProperties())
+                .setAdditionalSetup(runner -> {
+                    runner.installPlugin(new FileSystemExchangePlugin());
+                    runner.loadExchangeManager("filesystem", getExchangeManagerProperties(minioStorage));
+                });
     }
 
     @Override
diff --git a/testing/trino-plugin-reader/pom.xml b/testing/trino-plugin-reader/pom.xml
index 4ff7cf5eca64..9d67e26fb20e 100644
--- a/testing/trino-plugin-reader/pom.xml
+++ b/testing/trino-plugin-reader/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-plugin-reader</artifactId>
-    <name>trino-plugin-reader</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,13 +18,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>info.picocli</groupId>
+            <artifactId>picocli</artifactId>
         </dependency>
 
         <dependency>
@@ -34,13 +33,13 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>info.picocli</groupId>
-            <artifactId>picocli</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
         </dependency>
 
         <dependency>
@@ -50,25 +49,30 @@
 
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
+            <artifactId>plexus-xml</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- for testing -->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
+            <artifactId>junit-extensions</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -89,12 +93,6 @@
             <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -104,13 +102,14 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <phase>package</phase>
                         <configuration>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>executable</shadedClassifierName>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -133,10 +132,10 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>really-executable-jar</goal>
                         </goals>
+                        <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>
diff --git a/testing/trino-product-tests-launcher/pom.xml b/testing/trino-product-tests-launcher/pom.xml
index 6786a6b8fc4a..7190280da708 100644
--- a/testing/trino-product-tests-launcher/pom.xml
+++ b/testing/trino-product-tests-launcher/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-product-tests-launcher</artifactId>
-    <name>trino-product-tests-launcher</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -19,107 +18,117 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-reader</artifactId>
-            <exclusions>
-                <exclusion>
-                    <!-- trino-main pulls a lot of dependencies pumping jar size, and we only need categories definitions defined in PluginReader class.
-                         Also, we want product-test-launcher to treat Trino as "blackbox" as possible, and having trino-main on classpath is not in line with that.-->
-                    <groupId>io.trino</groupId>
-                    <artifactId>trino-main</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-containers</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
+            <groupId>com.github.docker-java</groupId>
+            <artifactId>docker-java-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>com.squareup.okio</groupId>
+            <artifactId>okio-jvm</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.github.docker-java</groupId>
-            <artifactId>docker-java-api</artifactId>
+            <groupId>info.picocli</groupId>
+            <artifactId>picocli</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
+            <groupId>io.airlift</groupId>
+            <artifactId>bootstrap</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>concurrent</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>info.picocli</groupId>
-            <artifactId>picocli</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-reader</artifactId>
+            <exclusions>
+                <exclusion>
+                    <!-- trino-main pulls a lot of dependencies pumping jar size, and we only need categories definitions defined in PluginReader class.
+                         Also, we want product-test-launcher to treat Trino as "blackbox" as possible, and having trino-main on classpath is not in line with that.-->
+                    <groupId>io.trino</groupId>
+                    <artifactId>trino-main</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-containers</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -127,11 +136,29 @@
             <artifactId>junit</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.databricks</groupId>
+            <artifactId>databricks-jdbc</artifactId>
+            <version>2.6.32</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>io.confluent</groupId>
             <artifactId>kafka-protobuf-provider</artifactId>
@@ -158,6 +185,20 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-jdbc</artifactId>
+            <version>3.1.3</version>
+            <classifier>standalone</classifier>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-jdbc</artifactId>
@@ -179,18 +220,37 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.basepom.maven</groupId>
+                <artifactId>duplicate-finder-maven-plugin</artifactId>
+                <configuration>
+                    <ignoredDependencies>
+                        <dependency>
+                            <groupId>com.databricks</groupId>
+                            <artifactId>databricks-jdbc</artifactId>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.hive</groupId>
+                            <artifactId>hive-jdbc</artifactId>
+                        </dependency>
+                    </ignoredDependencies>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <phase>package</phase>
                         <configuration>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>executable</shadedClassifierName>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <filters>
                                 <filter>
                                     <!-- filter out signature files from signed dependencies -->
@@ -220,10 +280,10 @@
                 <executions>
                     <execution>
                         <id>copy</id>
-                        <phase>package</phase>
                         <goals>
                             <goal>copy</goal>
                         </goals>
+                        <phase>package</phase>
                         <configuration>
                             <skip>false</skip>
                             <artifactItems>
@@ -239,6 +299,21 @@
                                     <type>jar</type>
                                     <outputDirectory>${project.build.directory}</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.hive</groupId>
+                                    <artifactId>hive-jdbc</artifactId>
+                                    <classifier>standalone</classifier>
+                                    <type>jar</type>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <destFileName>hive-jdbc.jar</destFileName>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.databricks</groupId>
+                                    <artifactId>databricks-jdbc</artifactId>
+                                    <type>jar</type>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <destFileName>databricks-jdbc.jar</destFileName>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
@@ -255,10 +330,10 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>really-executable-jar</goal>
                         </goals>
+                        <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/Configurations.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/Configurations.java
index 152a5a6795f1..dc9c5a240ea3 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/Configurations.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/Configurations.java
@@ -19,6 +19,7 @@
 import io.trino.tests.product.launcher.env.EnvironmentProvider;
 import io.trino.tests.product.launcher.env.Environments;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
+import io.trino.tests.product.launcher.env.jdk.JdkProvider;
 import io.trino.tests.product.launcher.suite.Suite;
 
 import java.io.IOException;
@@ -61,6 +62,21 @@ public static List<Class<? extends EnvironmentConfig>> findConfigsByBasePackage(
         }
     }
 
+    public static List<Class<? extends JdkProvider>> findJdkProvidersByBasePackage(String packageName)
+    {
+        try {
+            return ClassPath.from(Environments.class.getClassLoader()).getTopLevelClassesRecursive(packageName).stream()
+                    .map(ClassPath.ClassInfo::load)
+                    .filter(clazz -> !isAbstract(clazz.getModifiers()))
+                    .filter(JdkProvider.class::isAssignableFrom)
+                    .map(clazz -> (Class<? extends JdkProvider>) clazz.asSubclass(JdkProvider.class))
+                    .collect(toImmutableList());
+        }
+        catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public static List<Class<? extends Suite>> findSuitesByPackageName(String packageName)
     {
         try {
@@ -90,6 +106,13 @@ public static String nameForConfigClass(Class<? extends EnvironmentConfig> clazz
         return canonicalConfigName(className);
     }
 
+    public static String nameForJdkProvider(Class<? extends JdkProvider> clazz)
+    {
+        String className = clazz.getSimpleName();
+        checkArgument(className.matches("^[A-Z].*JdkProvider$"), "Name of %s should end with 'JdkProvider'", clazz);
+        return canonicalJdkProviderName(className);
+    }
+
     public static String nameForSuiteClass(Class<? extends Suite> clazz)
     {
         String className = clazz.getSimpleName();
@@ -106,6 +129,15 @@ public static String canonicalEnvironmentName(String name)
         return canonicalName(name);
     }
 
+    public static String canonicalJdkProviderName(String name)
+    {
+        if (name.matches("^.*?JdkProvider$")) {
+            name = name.replaceFirst("JdkProvider$", "");
+        }
+
+        return canonicalName(name);
+    }
+
     public static String canonicalConfigName(String name)
     {
         return canonicalName(name);
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/LauncherModule.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/LauncherModule.java
index 89cb460d57d5..285ac6ba6202 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/LauncherModule.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/LauncherModule.java
@@ -15,15 +15,38 @@
 
 import com.google.inject.Binder;
 import com.google.inject.Module;
+import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+
+import static java.util.Objects.requireNonNull;
+
 public final class LauncherModule
         implements Module
 {
+    private final OutputStream outputStream;
+
+    public LauncherModule(OutputStream outputStream)
+    {
+        this.outputStream = requireNonNull(outputStream, "outputStream is null");
+    }
+
     @Override
     public void configure(Binder binder)
     {
         binder.bind(DockerFiles.class).in(Scopes.SINGLETON);
+        binder.bind(OutputStream.class).toInstance(outputStream);
+    }
+
+    @Provides
+    @Singleton
+    private PrintStream provideOutputStreamPrinter()
+    {
+        return new PrintStream(outputStream, true, StandardCharsets.UTF_8);
     }
 }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/Commands.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/Commands.java
deleted file mode 100644
index 5a8a71d6423a..000000000000
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/Commands.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.launcher.cli;
-
-import com.google.common.collect.ImmutableList;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-import io.airlift.bootstrap.Bootstrap;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-
-final class Commands
-{
-    private Commands() {}
-
-    public static int runCommand(List<Module> modules, Class<? extends Callable<Integer>> commandExecution)
-    {
-        Bootstrap app = new Bootstrap(
-                ImmutableList.<Module>builder()
-                        .addAll(modules)
-                        .add(binder -> binder.bind(commandExecution))
-                        .build());
-
-        Injector injector = app
-                .initialize();
-
-        try {
-            return injector.getInstance(commandExecution)
-                    .call();
-        }
-        catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentDescribe.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentDescribe.java
index df41996e45aa..5331a5cbc23a 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentDescribe.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentDescribe.java
@@ -16,11 +16,11 @@
 import com.github.dockerjava.api.model.Bind;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import io.airlift.log.Logger;
 import io.airlift.units.DataSize;
 import io.trino.tests.product.launcher.Extensions;
-import io.trino.tests.product.launcher.LauncherModule;
 import io.trino.tests.product.launcher.cli.EnvironmentUp.EnvironmentUpOptions;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -32,22 +32,23 @@
 import io.trino.tests.product.launcher.util.ConsoleTable;
 import org.testcontainers.utility.MountableFile;
 import picocli.CommandLine;
+import picocli.CommandLine.ExitCode;
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.stream.Stream;
 
-import static io.trino.tests.product.launcher.cli.Commands.runCommand;
 import static io.trino.tests.product.launcher.docker.DockerFiles.ROOT_PATH;
 import static java.util.Objects.requireNonNull;
 
@@ -56,7 +57,7 @@
         description = "Describes provided environment",
         usageHelpAutoWidth = true)
 public class EnvironmentDescribe
-        implements Callable<Integer>
+        extends LauncherCommand
 {
     private static final Logger log = Logger.get(EnvironmentDescribe.class);
 
@@ -69,23 +70,17 @@ public class EnvironmentDescribe
     @Mixin
     public EnvironmentUpOptions environmentUpOptions = new EnvironmentUpOptions();
 
-    private final Module additionalEnvironments;
-
-    public EnvironmentDescribe(Extensions extensions)
+    public EnvironmentDescribe(OutputStream outputStream, Extensions extensions)
     {
-        this.additionalEnvironments = extensions.getAdditionalEnvironments();
+        super(EnvironmentDescribe.Execution.class, outputStream, extensions);
     }
 
     @Override
-    public Integer call()
+    List<Module> getCommandModules()
     {
-        return runCommand(
-                ImmutableList.<Module>builder()
-                        .add(new LauncherModule())
-                        .add(new EnvironmentModule(environmentOptions, additionalEnvironments))
-                        .add(environmentUpOptions.toModule())
-                        .build(),
-                EnvironmentDescribe.Execution.class);
+        return ImmutableList.of(
+                new EnvironmentModule(environmentOptions, extensions.getAdditionalEnvironments()),
+                environmentUpOptions.toModule());
     }
 
     public static class Execution
@@ -116,23 +111,32 @@ public static class Execution
         private final EnvironmentOptions environmentOptions;
         private final EnvironmentUpOptions environmentUpOptions;
         private final Path dockerFilesBasePath;
+        private final PrintStream printStream;
 
         @Inject
-        public Execution(DockerFiles dockerFiles, EnvironmentFactory environmentFactory, EnvironmentConfig environmentConfig, EnvironmentOptions environmentOptions, EnvironmentUpOptions environmentUpOptions)
+        public Execution(
+                DockerFiles dockerFiles,
+                EnvironmentFactory environmentFactory,
+                EnvironmentConfig environmentConfig,
+                EnvironmentOptions environmentOptions,
+                EnvironmentUpOptions environmentUpOptions,
+                PrintStream printStream)
         {
             this.dockerFilesBasePath = dockerFiles.getDockerFilesHostPath();
             this.environmentFactory = requireNonNull(environmentFactory, "environmentFactory is null");
             this.environmentConfig = requireNonNull(environmentConfig, "environmentConfig is null");
             this.environmentOptions = requireNonNull(environmentOptions, "environmentOptions is null");
             this.environmentUpOptions = requireNonNull(environmentUpOptions, "environmentUpOptions is null");
+            this.printStream = requireNonNull(printStream, "printStream is null");
         }
 
         @Override
-        public Integer call() throws Exception
+        public Integer call()
+                throws Exception
         {
             Optional<Path> environmentLogPath = environmentUpOptions.logsDirBase.map(dir -> dir.resolve(environmentUpOptions.environment));
 
-            Environment.Builder builder = environmentFactory.get(environmentUpOptions.environment, environmentConfig, environmentUpOptions.extraOptions)
+            Environment.Builder builder = environmentFactory.get(environmentUpOptions.environment, printStream, environmentConfig, environmentUpOptions.extraOptions)
                     .setContainerOutputMode(environmentOptions.output)
                     .setLogsBaseDir(environmentLogPath);
 
@@ -153,7 +157,7 @@ public Integer call() throws Exception
                 containersTable.addSeparator();
             }
 
-            log.info("Environment '%s' containers:\n%s", environmentUpOptions.environment, containersTable.render());
+            printStream.printf("Environment '%s' containers:\n%s\n", environmentUpOptions.environment, containersTable.render());
 
             ConsoleTable mountsTable = new ConsoleTable();
             mountsTable.addHeader(MOUNTS_LIST_HEADER);
@@ -188,9 +192,9 @@ public Integer call() throws Exception
                 mountsTable.addSeparator();
             }
 
-            log.info("Environment '%s' file mounts:\n%s", environmentUpOptions.environment, mountsTable.render());
+            printStream.printf("Environment '%s' file mounts:\n%s\n", environmentUpOptions.environment, mountsTable.render());
 
-            return 1;
+            return ExitCode.OK;
         }
 
         private String simplifyPath(String path)
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentList.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentList.java
index 2692ad1f8b6d..54729df01685 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentList.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentList.java
@@ -14,9 +14,9 @@
 package io.trino.tests.product.launcher.cli;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import io.trino.tests.product.launcher.Extensions;
-import io.trino.tests.product.launcher.LauncherModule;
 import io.trino.tests.product.launcher.env.EnvironmentConfigFactory;
 import io.trino.tests.product.launcher.env.EnvironmentFactory;
 import io.trino.tests.product.launcher.env.EnvironmentModule;
@@ -24,16 +24,11 @@
 import picocli.CommandLine.ExitCode;
 import picocli.CommandLine.Option;
 
-import javax.inject.Inject;
-
-import java.io.FileDescriptor;
-import java.io.FileOutputStream;
+import java.io.OutputStream;
 import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
+import java.util.List;
 import java.util.concurrent.Callable;
 
-import static io.trino.tests.product.launcher.cli.Commands.runCommand;
 import static java.util.Objects.requireNonNull;
 import static picocli.CommandLine.Command;
 
@@ -42,27 +37,20 @@
         description = "List environments",
         usageHelpAutoWidth = true)
 public final class EnvironmentList
-        implements Callable<Integer>
+        extends LauncherCommand
 {
     @Option(names = {"-h", "--help"}, usageHelp = true, description = "Show this help message and exit")
     public boolean usageHelpRequested;
 
-    private final Module additionalEnvironments;
-
-    public EnvironmentList(Extensions extensions)
+    public EnvironmentList(OutputStream outputStream, Extensions extensions)
     {
-        this.additionalEnvironments = extensions.getAdditionalEnvironments();
+        super(EnvironmentList.Execution.class, outputStream, extensions);
     }
 
     @Override
-    public Integer call()
+    List<Module> getCommandModules()
     {
-        return runCommand(
-                ImmutableList.<Module>builder()
-                        .add(new LauncherModule())
-                        .add(new EnvironmentModule(EnvironmentOptions.empty(), additionalEnvironments))
-                        .build(),
-                EnvironmentList.Execution.class);
+        return ImmutableList.of(new EnvironmentModule(EnvironmentOptions.empty(), extensions.getAdditionalEnvironments()));
     }
 
     public static class Execution
@@ -73,17 +61,11 @@ public static class Execution
         private final EnvironmentConfigFactory configFactory;
 
         @Inject
-        public Execution(EnvironmentFactory factory, EnvironmentConfigFactory configFactory)
+        public Execution(PrintStream out, EnvironmentFactory factory, EnvironmentConfigFactory configFactory)
         {
             this.factory = requireNonNull(factory, "factory is null");
             this.configFactory = requireNonNull(configFactory, "configFactory is null");
-
-            try {
-                this.out = new PrintStream(new FileOutputStream(FileDescriptor.out), true, Charset.defaultCharset().name());
-            }
-            catch (UnsupportedEncodingException e) {
-                throw new IllegalStateException("Could not create print stream", e);
-            }
+            this.out = requireNonNull(out, "out is null");
         }
 
         @Override
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java
index 79a2db5c6108..3c68f228b20d 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java
@@ -15,10 +15,10 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import io.airlift.log.Logger;
 import io.trino.tests.product.launcher.Extensions;
-import io.trino.tests.product.launcher.LauncherModule;
 import io.trino.tests.product.launcher.docker.ContainerUtil;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -30,15 +30,15 @@
 import picocli.CommandLine.Command;
 import picocli.CommandLine.ExitCode;
 
-import javax.inject.Inject;
-
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.nio.file.Path;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
-import static io.trino.tests.product.launcher.cli.Commands.runCommand;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer;
 import static io.trino.tests.product.launcher.env.EnvironmentListener.getStandardListeners;
@@ -51,7 +51,7 @@
         description = "Start an environment",
         usageHelpAutoWidth = true)
 public final class EnvironmentUp
-        implements Callable<Integer>
+        extends LauncherCommand
 {
     private static final Logger log = Logger.get(EnvironmentUp.class);
 
@@ -64,23 +64,17 @@ public final class EnvironmentUp
     @Mixin
     public EnvironmentUpOptions environmentUpOptions = new EnvironmentUpOptions();
 
-    private final Module additionalEnvironments;
-
-    public EnvironmentUp(Extensions extensions)
+    public EnvironmentUp(OutputStream outputStream, Extensions extensions)
     {
-        this.additionalEnvironments = extensions.getAdditionalEnvironments();
+        super(EnvironmentUp.Execution.class, outputStream, extensions);
     }
 
     @Override
-    public Integer call()
+    List<Module> getCommandModules()
     {
-        return runCommand(
-                ImmutableList.<Module>builder()
-                        .add(new LauncherModule())
-                        .add(new EnvironmentModule(environmentOptions, additionalEnvironments))
-                        .add(environmentUpOptions.toModule())
-                        .build(),
-                EnvironmentUp.Execution.class);
+        return ImmutableList.of(
+                new EnvironmentModule(environmentOptions, extensions.getAdditionalEnvironments()),
+                environmentUpOptions.toModule());
     }
 
     public static class EnvironmentUpOptions
@@ -116,9 +110,10 @@ public static class Execution
         private final Optional<Path> logsDirBase;
         private final DockerContainer.OutputMode outputMode;
         private final Map<String, String> extraOptions;
+        private final PrintStream printStream;
 
         @Inject
-        public Execution(EnvironmentFactory environmentFactory, EnvironmentConfig environmentConfig, EnvironmentOptions options, EnvironmentUpOptions environmentUpOptions)
+        public Execution(EnvironmentFactory environmentFactory, EnvironmentConfig environmentConfig, EnvironmentOptions options, EnvironmentUpOptions environmentUpOptions, PrintStream printStream)
         {
             this.environmentFactory = requireNonNull(environmentFactory, "environmentFactory is null");
             this.environmentConfig = requireNonNull(environmentConfig, "environmentConfig is null");
@@ -128,13 +123,14 @@ public Execution(EnvironmentFactory environmentFactory, EnvironmentConfig enviro
             this.outputMode = requireNonNull(options.output, "options.output is null");
             this.logsDirBase = requireNonNull(environmentUpOptions.logsDirBase, "environmentUpOptions.logsDirBase is null");
             this.extraOptions = ImmutableMap.copyOf(requireNonNull(environmentUpOptions.extraOptions, "environmentUpOptions.extraOptions is null"));
+            this.printStream = requireNonNull(printStream, "printStream is null");
         }
 
         @Override
         public Integer call()
         {
             Optional<Path> environmentLogPath = logsDirBase.map(dir -> dir.resolve(environment));
-            Environment.Builder builder = environmentFactory.get(environment, environmentConfig, extraOptions)
+            Environment.Builder builder = environmentFactory.get(environment, printStream, environmentConfig, extraOptions)
                     .setContainerOutputMode(outputMode)
                     .setLogsBaseDir(environmentLogPath)
                     .removeContainer(TESTS);
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/Launcher.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/Launcher.java
index 60daca5961c6..241145a06f1e 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/Launcher.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/Launcher.java
@@ -23,6 +23,9 @@
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Option;
 
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ListResourceBundle;
@@ -59,21 +62,22 @@ public class Launcher
     public static void main(String[] args)
     {
         Launcher launcher = new Launcher();
-        run(launcher, new LauncherBundle(), args);
+        // write directly to System.out, bypassing logging & io.airlift.log.Logging#rewireStdStreams
+        System.exit(execute(launcher, new LauncherBundle(), new FileOutputStream(FileDescriptor.out), args));
     }
 
-    public static void run(Launcher launcher, ResourceBundle bundle, String[] args)
+    public static int execute(Launcher launcher, ResourceBundle bundle, OutputStream outputStream, String[] args)
     {
-        IFactory factory = createFactory(launcher.getExtensions());
-        System.exit(new CommandLine(launcher, factory)
+        IFactory factory = createFactory(outputStream, launcher.getExtensions());
+        return new CommandLine(launcher, factory)
                 .setCaseInsensitiveEnumValuesAllowed(true)
                 .registerConverter(Duration.class, Duration::valueOf)
                 .registerConverter(Path.class, Paths::get)
                 .setResourceBundle(bundle)
-                .execute(args));
+                .execute(args);
     }
 
-    private static IFactory createFactory(Extensions extensions)
+    private static IFactory createFactory(OutputStream outputStream, Extensions extensions)
     {
         requireNonNull(extensions, "extensions is null");
         return new IFactory()
@@ -83,7 +87,7 @@ public <T> T create(Class<T> clazz)
                     throws Exception
             {
                 try {
-                    return clazz.getConstructor(Extensions.class).newInstance(extensions);
+                    return clazz.getConstructor(OutputStream.class, Extensions.class).newInstance(outputStream, extensions);
                 }
                 catch (NoSuchMethodException ignore) {
                     return CommandLine.defaultFactory().create(clazz);
@@ -157,7 +161,7 @@ public String[] getVersion()
         }
     }
 
-    private static class LauncherBundle
+    static class LauncherBundle
             extends ListResourceBundle
     {
         @Override
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/LauncherCommand.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/LauncherCommand.java
new file mode 100644
index 000000000000..6a694489bcc1
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/LauncherCommand.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.cli;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+import io.airlift.bootstrap.Bootstrap;
+import io.trino.tests.product.launcher.Extensions;
+import io.trino.tests.product.launcher.LauncherModule;
+
+import java.io.OutputStream;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import static java.util.Objects.requireNonNull;
+
+public abstract class LauncherCommand
+        implements Callable<Integer>
+{
+    private final Class<? extends Callable<Integer>> commandClass;
+    private final OutputStream outputStream;
+    protected final Extensions extensions;
+
+    public LauncherCommand(Class<? extends Callable<Integer>> commandClass, OutputStream outputStream, Extensions extensions)
+    {
+        this.commandClass = requireNonNull(commandClass, "commandClass is null");
+        this.outputStream = requireNonNull(outputStream, "outputStream is null");
+        this.extensions = requireNonNull(extensions, "extensions is null");
+    }
+
+    abstract List<Module> getCommandModules();
+
+    @Override
+    public Integer call()
+            throws Exception
+    {
+        Bootstrap app = new Bootstrap(
+                ImmutableList.<Module>builder()
+                        .add(new LauncherModule(outputStream))
+                        .addAll(getCommandModules())
+                        .add(binder -> binder.bind(commandClass))
+                        .build());
+
+        Injector injector = app
+                .initialize();
+
+        try {
+            return injector.getInstance(commandClass)
+                    .call();
+        }
+        catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteDescribe.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteDescribe.java
index 19e7ea414085..0718c528944d 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteDescribe.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteDescribe.java
@@ -14,11 +14,11 @@
 package io.trino.tests.product.launcher.cli;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
 import io.trino.tests.product.launcher.Extensions;
-import io.trino.tests.product.launcher.LauncherModule;
 import io.trino.tests.product.launcher.cli.suite.describe.json.JsonOutput;
 import io.trino.tests.product.launcher.cli.suite.describe.json.JsonSuite;
 import io.trino.tests.product.launcher.cli.suite.describe.json.JsonTestRun;
@@ -35,21 +35,15 @@
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 
-import javax.inject.Inject;
-
 import java.io.File;
-import java.io.FileDescriptor;
-import java.io.FileOutputStream;
+import java.io.OutputStream;
 import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
 
-import static io.trino.tests.product.launcher.cli.Commands.runCommand;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static picocli.CommandLine.ExitCode.OK;
@@ -60,11 +54,8 @@
         description = "Describe tests suite",
         usageHelpAutoWidth = true)
 public class SuiteDescribe
-        implements Callable<Integer>
+        extends LauncherCommand
 {
-    private final Module additionalSuites;
-    private final Module additionalEnvironments;
-
     @Option(names = {"-h", "--help"}, usageHelp = true, description = "Show this help message and exit")
     public boolean usageHelpRequested;
 
@@ -74,23 +65,18 @@ public class SuiteDescribe
     @Mixin
     public EnvironmentOptions environmentOptions = new EnvironmentOptions();
 
-    public SuiteDescribe(Extensions extensions)
+    public SuiteDescribe(OutputStream outputStream, Extensions extensions)
     {
-        this.additionalSuites = extensions.getAdditionalSuites();
-        this.additionalEnvironments = extensions.getAdditionalEnvironments();
+        super(SuiteDescribe.Execution.class, outputStream, extensions);
     }
 
     @Override
-    public Integer call()
+    List<Module> getCommandModules()
     {
-        return runCommand(
-                ImmutableList.<Module>builder()
-                        .add(new LauncherModule())
-                        .add(new SuiteModule(additionalSuites))
-                        .add(new EnvironmentModule(environmentOptions, additionalEnvironments))
-                        .add(options.toModule())
-                        .build(),
-                SuiteDescribe.Execution.class);
+        return ImmutableList.of(
+                new SuiteModule(extensions.getAdditionalSuites()),
+                new EnvironmentModule(environmentOptions, extensions.getAdditionalEnvironments()),
+                options.toModule());
     }
 
     public enum SuiteDescribeFormat
@@ -213,7 +199,7 @@ public static class Execution
         private final EnvironmentConfigFactory configFactory;
         private final EnvironmentFactory environmentFactory;
         private final EnvironmentOptions environmentOptions;
-        private final PrintStream out;
+        private final PrintStream printStream;
         private final OutputBuilder outputBuilder;
 
         @Inject
@@ -222,7 +208,8 @@ public Execution(
                 SuiteFactory suiteFactory,
                 EnvironmentConfigFactory configFactory,
                 EnvironmentFactory environmentFactory,
-                EnvironmentOptions environmentOptions)
+                EnvironmentOptions environmentOptions,
+                PrintStream printStream)
         {
             this.describeOptions = requireNonNull(describeOptions, "describeOptions is null");
             this.config = requireNonNull(environmentOptions.config, "environmentOptions.config is null");
@@ -230,14 +217,8 @@ public Execution(
             this.configFactory = requireNonNull(configFactory, "configFactory is null");
             this.environmentFactory = requireNonNull(environmentFactory, "environmentFactory is null");
             this.environmentOptions = requireNonNull(environmentOptions, "environmentOptions is null");
+            this.printStream = requireNonNull(printStream, "printStream is null");
             this.outputBuilder = describeOptions.format.outputBuilderFactory.get();
-
-            try {
-                this.out = new PrintStream(new FileOutputStream(FileDescriptor.out), true, Charset.defaultCharset().name());
-            }
-            catch (UnsupportedEncodingException e) {
-                throw new IllegalStateException("Could not create print stream", e);
-            }
         }
 
         @Override
@@ -252,13 +233,13 @@ public Integer call()
                 for (SuiteTestRun testRun : suite.getTestRuns(config)) {
                     testRun = testRun.withConfigApplied(config);
                     TestRun.TestRunOptions runOptions = createTestRunOptions(suiteName, testRun, config);
-                    Environment.Builder builder = environmentFactory.get(runOptions.environment, config, testRun.getExtraOptions())
+                    Environment.Builder builder = environmentFactory.get(runOptions.environment, printStream, config, testRun.getExtraOptions())
                             .setContainerOutputMode(environmentOptions.output);
                     Environment environment = builder.build();
                     outputBuilder.addTestRun(environmentOptions, runOptions, environment);
                 }
             }
-            out.print(outputBuilder.build());
+            printStream.print(outputBuilder.build());
             return OK;
         }
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteList.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteList.java
index 31a39325e190..905a976d2593 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteList.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteList.java
@@ -15,9 +15,9 @@
  */
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import io.trino.tests.product.launcher.Extensions;
-import io.trino.tests.product.launcher.LauncherModule;
 import io.trino.tests.product.launcher.env.EnvironmentConfigFactory;
 import io.trino.tests.product.launcher.env.EnvironmentModule;
 import io.trino.tests.product.launcher.env.EnvironmentOptions;
@@ -27,16 +27,11 @@
 import picocli.CommandLine.ExitCode;
 import picocli.CommandLine.Option;
 
-import javax.inject.Inject;
-
-import java.io.FileDescriptor;
-import java.io.FileOutputStream;
+import java.io.OutputStream;
 import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
+import java.util.List;
 import java.util.concurrent.Callable;
 
-import static io.trino.tests.product.launcher.cli.Commands.runCommand;
 import static java.util.Objects.requireNonNull;
 
 @Command(
@@ -44,61 +39,47 @@
         description = "List tests suite",
         usageHelpAutoWidth = true)
 public final class SuiteList
-        implements Callable<Integer>
+        extends LauncherCommand
 {
-    private final Module additionalEnvironments;
-    private final Module additionalSuites;
-
     @Option(names = {"-h", "--help"}, usageHelp = true, description = "Show this help message and exit")
     public boolean usageHelpRequested;
 
-    public SuiteList(Extensions extensions)
+    public SuiteList(OutputStream outputStream, Extensions extensions)
     {
-        this.additionalEnvironments = extensions.getAdditionalEnvironments();
-        this.additionalSuites = extensions.getAdditionalSuites();
+        super(SuiteList.Execution.class, outputStream, extensions);
     }
 
     @Override
-    public Integer call()
+    List<Module> getCommandModules()
     {
-        return runCommand(
-                ImmutableList.<Module>builder()
-                        .add(new LauncherModule())
-                        .add(new EnvironmentModule(EnvironmentOptions.empty(), additionalEnvironments))
-                        .add(new SuiteModule(additionalSuites))
-                        .build(),
-                SuiteList.Execution.class);
+        return ImmutableList.of(
+                new EnvironmentModule(EnvironmentOptions.empty(), extensions.getAdditionalEnvironments()),
+                new SuiteModule(extensions.getAdditionalSuites()));
     }
 
     public static class Execution
             implements Callable<Integer>
     {
-        private final PrintStream out;
+        private final PrintStream printStream;
         private final EnvironmentConfigFactory configFactory;
         private final SuiteFactory suiteFactory;
 
         @Inject
-        public Execution(SuiteFactory suiteFactory, EnvironmentConfigFactory configFactory)
+        public Execution(PrintStream printStream, SuiteFactory suiteFactory, EnvironmentConfigFactory configFactory)
         {
             this.configFactory = requireNonNull(configFactory, "configFactory is null");
             this.suiteFactory = requireNonNull(suiteFactory, "suiteFactory is null");
-
-            try {
-                this.out = new PrintStream(new FileOutputStream(FileDescriptor.out), true, Charset.defaultCharset().name());
-            }
-            catch (UnsupportedEncodingException e) {
-                throw new IllegalStateException("Could not create print stream", e);
-            }
+            this.printStream = requireNonNull(printStream, "printStream is null");
         }
 
         @Override
         public Integer call()
         {
-            out.println("Available suites: ");
-            this.suiteFactory.listSuites().forEach(out::println);
+            printStream.println("Available suites: ");
+            this.suiteFactory.listSuites().forEach(printStream::println);
 
-            out.println("\nAvailable environment configs: ");
-            this.configFactory.listConfigs().forEach(out::println);
+            printStream.println("\nAvailable environment configs: ");
+            this.configFactory.listConfigs().forEach(printStream::println);
 
             return ExitCode.OK;
         }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteRun.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteRun.java
index 3b2d7c81906d..b15c9137e9dd 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteRun.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteRun.java
@@ -16,17 +16,18 @@
 import com.google.common.base.Joiner;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.jvm.Threads;
 import io.trino.tests.product.launcher.Extensions;
-import io.trino.tests.product.launcher.LauncherModule;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.env.EnvironmentConfigFactory;
 import io.trino.tests.product.launcher.env.EnvironmentFactory;
 import io.trino.tests.product.launcher.env.EnvironmentModule;
 import io.trino.tests.product.launcher.env.EnvironmentOptions;
+import io.trino.tests.product.launcher.env.jdk.JdkProviderFactory;
 import io.trino.tests.product.launcher.suite.Suite;
 import io.trino.tests.product.launcher.suite.SuiteFactory;
 import io.trino.tests.product.launcher.suite.SuiteModule;
@@ -37,9 +38,9 @@
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 
-import javax.inject.Inject;
-
 import java.io.File;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -58,7 +59,6 @@
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static io.airlift.units.Duration.nanosSince;
 import static io.airlift.units.Duration.succinctNanos;
-import static io.trino.tests.product.launcher.cli.Commands.runCommand;
 import static io.trino.tests.product.launcher.cli.SuiteRun.TestRunResult.HEADER;
 import static io.trino.tests.product.launcher.cli.TestRun.Execution.ENVIRONMENT_SKIPPED_EXIT_CODE;
 import static java.lang.Math.max;
@@ -76,15 +76,12 @@
         description = "Run suite tests",
         usageHelpAutoWidth = true)
 public class SuiteRun
-        implements Callable<Integer>
+        extends LauncherCommand
 {
     private static final Logger log = Logger.get(SuiteRun.class);
 
     private static final ScheduledExecutorService diagnosticExecutor = newScheduledThreadPool(2, daemonThreadsNamed("TestRun-diagnostic"));
 
-    private final Module additionalEnvironments;
-    private final Module additionalSuites;
-
     @Option(names = {"-h", "--help"}, usageHelp = true, description = "Show this help message and exit")
     public boolean usageHelpRequested;
 
@@ -94,23 +91,18 @@ public class SuiteRun
     @Mixin
     public EnvironmentOptions environmentOptions = new EnvironmentOptions();
 
-    public SuiteRun(Extensions extensions)
+    public SuiteRun(OutputStream outputStream, Extensions extensions)
     {
-        this.additionalEnvironments = extensions.getAdditionalEnvironments();
-        this.additionalSuites = extensions.getAdditionalSuites();
+        super(SuiteRun.Execution.class, outputStream, extensions);
     }
 
     @Override
-    public Integer call()
+    List<Module> getCommandModules()
     {
-        return runCommand(
-                ImmutableList.<Module>builder()
-                        .add(new LauncherModule())
-                        .add(new SuiteModule(additionalSuites))
-                        .add(new EnvironmentModule(environmentOptions, additionalEnvironments))
-                        .add(suiteRunOptions.toModule())
-                        .build(),
-                Execution.class);
+        return ImmutableList.of(
+                new SuiteModule(extensions.getAdditionalSuites()),
+                new EnvironmentModule(environmentOptions, extensions.getAdditionalEnvironments()),
+                suiteRunOptions.toModule());
     }
 
     public static class SuiteRunOptions
@@ -149,8 +141,10 @@ public static class Execution
         // TODO do not store mutable state
         private final EnvironmentOptions environmentOptions;
         private final SuiteFactory suiteFactory;
+        private final JdkProviderFactory jdkProviderFactory;
         private final EnvironmentFactory environmentFactory;
         private final EnvironmentConfigFactory configFactory;
+        private final PrintStream printStream;
         private final long suiteStartTime;
 
         @Inject
@@ -158,14 +152,18 @@ public Execution(
                 SuiteRunOptions suiteRunOptions,
                 EnvironmentOptions environmentOptions,
                 SuiteFactory suiteFactory,
+                JdkProviderFactory jdkProviderFactory,
                 EnvironmentFactory environmentFactory,
-                EnvironmentConfigFactory configFactory)
+                EnvironmentConfigFactory configFactory,
+                PrintStream printStream)
         {
             this.suiteRunOptions = requireNonNull(suiteRunOptions, "suiteRunOptions is null");
             this.environmentOptions = requireNonNull(environmentOptions, "environmentOptions is null");
             this.suiteFactory = requireNonNull(suiteFactory, "suiteFactory is null");
+            this.jdkProviderFactory = requireNonNull(jdkProviderFactory, "jdkProviderFactory is null");
             this.environmentFactory = requireNonNull(environmentFactory, "environmentFactory is null");
             this.configFactory = requireNonNull(configFactory, "configFactory is null");
+            this.printStream = requireNonNull(printStream, "printStream is null");
             this.suiteStartTime = System.nanoTime();
         }
 
@@ -299,7 +297,7 @@ private static String generateRandomRunId()
 
         private int runTest(String runId, EnvironmentConfig environmentConfig, TestRun.TestRunOptions testRunOptions)
         {
-            TestRun.Execution execution = new TestRun.Execution(environmentFactory, environmentOptions, environmentConfig, testRunOptions);
+            TestRun.Execution execution = new TestRun.Execution(environmentFactory, jdkProviderFactory, environmentOptions, environmentConfig, testRunOptions, printStream);
 
             log.info("Test run %s started", runId);
             int exitCode = execution.call();
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/TestRun.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/TestRun.java
index b9295b8b0dae..c4f5be427557 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/TestRun.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/TestRun.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import dev.failsafe.Failsafe;
 import dev.failsafe.Timeout;
@@ -24,23 +25,23 @@
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.tests.product.launcher.Extensions;
-import io.trino.tests.product.launcher.LauncherModule;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.env.EnvironmentFactory;
 import io.trino.tests.product.launcher.env.EnvironmentModule;
 import io.trino.tests.product.launcher.env.EnvironmentOptions;
-import io.trino.tests.product.launcher.env.SupportedTrinoJdk;
+import io.trino.tests.product.launcher.env.jdk.JdkProvider;
+import io.trino.tests.product.launcher.env.jdk.JdkProviderFactory;
 import io.trino.tests.product.launcher.testcontainers.ExistingNetwork;
 import picocli.CommandLine.ExitCode;
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Parameters;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -53,7 +54,6 @@
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.tests.product.launcher.cli.Commands.runCommand;
 import static io.trino.tests.product.launcher.env.DockerContainer.cleanOrCreateHostPath;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
 import static io.trino.tests.product.launcher.env.EnvironmentListener.getStandardListeners;
@@ -76,7 +76,7 @@
         description = "Run a Trino product test",
         usageHelpAutoWidth = true)
 public final class TestRun
-        implements Callable<Integer>
+        extends LauncherCommand
 {
     private static final Logger log = Logger.get(TestRun.class);
 
@@ -90,23 +90,17 @@ public final class TestRun
     @Mixin
     public TestRunOptions testRunOptions = new TestRunOptions();
 
-    private final Module additionalEnvironments;
-
-    public TestRun(Extensions extensions)
+    public TestRun(OutputStream outputStream, Extensions extensions)
     {
-        this.additionalEnvironments = extensions.getAdditionalEnvironments();
+        super(TestRun.Execution.class, outputStream, extensions);
     }
 
     @Override
-    public Integer call()
+    List<Module> getCommandModules()
     {
-        return runCommand(
-                ImmutableList.<Module>builder()
-                        .add(new LauncherModule())
-                        .add(new EnvironmentModule(environmentOptions, additionalEnvironments))
-                        .add(testRunOptions.toModule())
-                        .build(),
-                TestRun.Execution.class);
+        return ImmutableList.of(
+                new EnvironmentModule(environmentOptions, extensions.getAdditionalEnvironments()),
+                testRunOptions.toModule());
     }
 
     public static class TestRunOptions
@@ -162,7 +156,7 @@ public static class Execution
         private final EnvironmentFactory environmentFactory;
         private final boolean debug;
         private final boolean debugSuspend;
-        private final SupportedTrinoJdk jdkVersion;
+        private final JdkProvider jdkProvider;
         private final File testJar;
         private final File cliJar;
         private final List<String> testArguments;
@@ -175,18 +169,25 @@ public static class Execution
         private final Optional<Path> logsDirBase;
         private final EnvironmentConfig environmentConfig;
         private final Map<String, String> extraOptions;
+        private final PrintStream printStream;
         private final Optional<List<String>> impactedFeatures;
 
         public static final Integer ENVIRONMENT_SKIPPED_EXIT_CODE = 98;
 
         @Inject
-        public Execution(EnvironmentFactory environmentFactory, EnvironmentOptions environmentOptions, EnvironmentConfig environmentConfig, TestRunOptions testRunOptions)
+        public Execution(
+                EnvironmentFactory environmentFactory,
+                JdkProviderFactory jdkProviderFactory,
+                EnvironmentOptions environmentOptions,
+                EnvironmentConfig environmentConfig,
+                TestRunOptions testRunOptions,
+                PrintStream printStream)
         {
             this.environmentFactory = requireNonNull(environmentFactory, "environmentFactory is null");
             requireNonNull(environmentOptions, "environmentOptions is null");
             this.debug = environmentOptions.debug;
             this.debugSuspend = testRunOptions.debugSuspend;
-            this.jdkVersion = requireNonNull(environmentOptions.jdkVersion, "environmentOptions.jdkVersion is null");
+            this.jdkProvider = jdkProviderFactory.get(requireNonNull(environmentOptions.jdkProvider, "environmentOptions.jdkProvider is null"));
             this.testJar = requireNonNull(testRunOptions.testJar, "testRunOptions.testJar is null");
             this.cliJar = requireNonNull(testRunOptions.cliJar, "testRunOptions.cliJar is null");
             this.testArguments = ImmutableList.copyOf(requireNonNull(testRunOptions.testArguments, "testRunOptions.testArguments is null"));
@@ -199,6 +200,7 @@ public Execution(EnvironmentFactory environmentFactory, EnvironmentOptions envir
             this.logsDirBase = requireNonNull(testRunOptions.logsDirBase, "testRunOptions.logsDirBase is empty");
             this.environmentConfig = requireNonNull(environmentConfig, "environmentConfig is null");
             this.extraOptions = ImmutableMap.copyOf(requireNonNull(testRunOptions.extraOptions, "testRunOptions.extraOptions is null"));
+            this.printStream = requireNonNull(printStream, "printStream is null");
             Optional<File> impactedFeaturesFile = requireNonNull(testRunOptions.impactedFeatures, "testRunOptions.impactedFeatures is null");
             if (impactedFeaturesFile.isPresent()) {
                 try {
@@ -304,7 +306,7 @@ private Environment startEnvironment(Environment environment)
                         .collect(toImmutableList());
                 testsContainer.dependsOn(environmentContainers);
 
-                log.info("Starting environment '%s' with config '%s' and options '%s'. Trino will be started using JAVA_HOME: %s.", this.environment, environmentConfig.getConfigName(), extraOptions, jdkVersion.getJavaHome());
+                log.info("Starting environment '%s' with config '%s' and options '%s'. Trino will be started using JAVA_HOME: %s.", this.environment, environmentConfig.getConfigName(), extraOptions, jdkProvider.getJavaHome());
                 environment.start();
             }
             else {
@@ -318,7 +320,7 @@ private Environment startEnvironment(Environment environment)
 
         private Environment getEnvironment()
         {
-            Environment.Builder builder = environmentFactory.get(environment, environmentConfig, extraOptions)
+            Environment.Builder builder = environmentFactory.get(environment, printStream, environmentConfig, extraOptions)
                     .setContainerOutputMode(outputMode)
                     .setStartupRetries(startupRetries)
                     .setLogsBaseDir(logsDirBase);
@@ -337,15 +339,17 @@ private Environment getEnvironment()
                 if (System.getenv("CONTINUOUS_INTEGRATION") != null) {
                     container.withEnv("CONTINUOUS_INTEGRATION", "true");
                 }
-                container
+
+                // Install Java distribution if necessary
+                jdkProvider.applyTo(container)
                         // the test jar is hundreds MB and file system bind is much more efficient
                         .withFileSystemBind(testJar.getPath(), "/docker/test.jar", READ_ONLY)
                         .withFileSystemBind(cliJar.getPath(), "/docker/trino-cli", READ_ONLY)
                         .withCopyFileToContainer(forClasspathResource("docker/presto-product-tests/common/standard/set-trino-cli.sh"), "/etc/profile.d/set-trino-cli.sh")
-                        .withEnv("JAVA_HOME", jdkVersion.getJavaHome())
+                        .withEnv("JAVA_HOME", jdkProvider.getJavaHome())
                         .withCommand(ImmutableList.<String>builder()
                                 .add(
-                                        jdkVersion.getJavaCommand(),
+                                        jdkProvider.getJavaCommand(),
                                         "-Xmx1g",
                                         // Force Parallel GC to ensure MaxHeapFreeRatio is respected
                                         "-XX:+UseParallelGC",
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/docker/DockerFiles.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/docker/DockerFiles.java
index 429fbb20026a..cffdce82086e 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/docker/DockerFiles.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/docker/DockerFiles.java
@@ -14,12 +14,11 @@
 package io.trino.tests.product.launcher.docker;
 
 import com.google.common.reflect.ClassPath;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import dev.failsafe.Failsafe;
 import dev.failsafe.RetryPolicy;
 import io.airlift.log.Logger;
-
-import javax.annotation.PreDestroy;
-import javax.annotation.concurrent.GuardedBy;
+import jakarta.annotation.PreDestroy;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Debug.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Debug.java
index a530bf483785..29cafd22872d 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Debug.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Debug.java
@@ -13,7 +13,7 @@
  */
 package io.trino.tests.product.launcher.env;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface Debug
 {
 }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/DockerContainer.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/DockerContainer.java
index a6441dfe8b80..d204eed5854d 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/DockerContainer.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/DockerContainer.java
@@ -20,6 +20,7 @@
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.RecursiveDeleteOption;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import dev.failsafe.Failsafe;
 import dev.failsafe.FailsafeExecutor;
 import dev.failsafe.Timeout;
@@ -36,8 +37,6 @@
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java
index 30e7c139d724..61c6fe03ea87 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java
@@ -40,14 +40,10 @@
 import org.testcontainers.utility.MountableFile;
 
 import java.io.File;
-import java.io.FileDescriptor;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.UncheckedIOException;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collection;
@@ -303,9 +299,9 @@ public List<String> getFeatures()
                 .collect(toImmutableList());
     }
 
-    public static Builder builder(String name)
+    public static Builder builder(String name, PrintStream printStream)
     {
-        return new Builder(name);
+        return new Builder(name, printStream);
     }
 
     @Override
@@ -375,12 +371,14 @@ public static class Builder
         private int startupRetries = 1;
         private Map<String, DockerContainer> containers = new HashMap<>();
         private Optional<Path> logsBaseDir = Optional.empty();
+        private PrintStream printStream;
         private boolean attached;
         private Multimap<String, String> configuredFeatures = HashMultimap.create();
 
-        public Builder(String name)
+        public Builder(String name, PrintStream printStream)
         {
             this.name = requireNonNull(name, "name is null");
+            this.printStream = requireNonNull(printStream, "printStream is null");
         }
 
         public String getEnvironmentName()
@@ -578,12 +576,12 @@ public Environment build(EnvironmentListener listener)
                     log.warn("Containers logs are not printed to stdout");
                     setContainerOutputConsumer(Builder::discardContainerLogs);
                 }
-                case PRINT -> setContainerOutputConsumer(Builder::printContainerLogs);
+                case PRINT -> setContainerOutputConsumer(frame -> printContainerLogs(printStream, frame));
                 case PRINT_WRITE -> {
                     verify(logsBaseDir.isPresent(), "--logs-dir must be set with --output WRITE");
                     setContainerOutputConsumer(container -> combineConsumers(
                             writeContainerLogs(container, logsBaseDir.get()),
-                            printContainerLogs(container)));
+                            printContainerLogs(printStream, container)));
                 }
                 case WRITE -> {
                     verify(logsBaseDir.isPresent(), "--logs-dir must be set with --output WRITE");
@@ -631,16 +629,9 @@ private static Consumer<OutputFrame> writeContainerLogs(DockerContainer containe
             }
         }
 
-        private static Consumer<OutputFrame> printContainerLogs(DockerContainer container)
+        private static Consumer<OutputFrame> printContainerLogs(PrintStream output, DockerContainer container)
         {
-            try {
-                // write directly to System.out, bypassing logging & io.airlift.log.Logging#rewireStdStreams
-                PrintStream out = new PrintStream(new FileOutputStream(FileDescriptor.out), true, Charset.defaultCharset().name());
-                return new PrintingLogConsumer(out, format("%-20s| ", container.getLogicalName()));
-            }
-            catch (UnsupportedEncodingException e) {
-                throw new RuntimeException(e);
-            }
+            return new PrintingLogConsumer(output, format("%-20s| ", container.getLogicalName()));
         }
 
         private static Consumer<OutputFrame> discardContainerLogs(DockerContainer container)
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentDefaults.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentDefaults.java
index 2ffea00de0ce..681b105910b7 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentDefaults.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentDefaults.java
@@ -18,7 +18,7 @@
 public final class EnvironmentDefaults
 {
     public static final String DOCKER_IMAGES_VERSION = TestingProperties.getDockerImagesVersion();
-    public static final String HADOOP_BASE_IMAGE = "ghcr.io/trinodb/testing/hdp2.6-hive";
+    public static final String HADOOP_BASE_IMAGE = "ghcr.io/trinodb/testing/hdp3.1-hive";
     public static final String HADOOP_IMAGES_VERSION = DOCKER_IMAGES_VERSION;
     public static final String TEMPTO_ENVIRONMENT_CONFIG = "/dev/null";
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentFactory.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentFactory.java
index 28639ef1018b..f3eccb1197a5 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentFactory.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentFactory.java
@@ -14,9 +14,9 @@
 package io.trino.tests.product.launcher.env;
 
 import com.google.common.collect.Ordering;
+import com.google.inject.Inject;
 
-import javax.inject.Inject;
-
+import java.io.PrintStream;
 import java.util.List;
 import java.util.Map;
 
@@ -34,12 +34,12 @@ public EnvironmentFactory(Map<String, EnvironmentProvider> environmentProviders)
         this.environmentProviders = requireNonNull(environmentProviders, "environmentProviders is null");
     }
 
-    public Environment.Builder get(String environmentName, EnvironmentConfig config, Map<String, String> extraOptions)
+    public Environment.Builder get(String environmentName, PrintStream printStream, EnvironmentConfig config, Map<String, String> extraOptions)
     {
         environmentName = canonicalEnvironmentName(environmentName);
         checkArgument(environmentProviders.containsKey(environmentName), "No environment with name '%s'. Those do exist, however: %s", environmentName, list());
         return environmentProviders.get(environmentName)
-                .createEnvironment(environmentName, config, extraOptions);
+                .createEnvironment(environmentName, printStream, config, extraOptions);
     }
 
     public List<String> list()
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentModule.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentModule.java
index 17a0aea10843..410ae76b3cb0 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentModule.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentModule.java
@@ -30,6 +30,8 @@
 import io.trino.tests.product.launcher.env.common.Minio;
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.StandardMultinode;
+import io.trino.tests.product.launcher.env.jdk.JdkProvider;
+import io.trino.tests.product.launcher.env.jdk.JdkProviderFactory;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
 import java.io.File;
@@ -38,8 +40,10 @@
 import static com.google.inject.multibindings.MapBinder.newMapBinder;
 import static io.trino.tests.product.launcher.Configurations.findConfigsByBasePackage;
 import static io.trino.tests.product.launcher.Configurations.findEnvironmentsByBasePackage;
+import static io.trino.tests.product.launcher.Configurations.findJdkProvidersByBasePackage;
 import static io.trino.tests.product.launcher.Configurations.nameForConfigClass;
 import static io.trino.tests.product.launcher.Configurations.nameForEnvironmentClass;
+import static io.trino.tests.product.launcher.Configurations.nameForJdkProvider;
 import static java.util.Objects.requireNonNull;
 import static java.util.Objects.requireNonNullElse;
 
@@ -49,6 +53,8 @@ public final class EnvironmentModule
     private static final String LAUNCHER_PACKAGE = "io.trino.tests.product.launcher";
     private static final String ENVIRONMENT_PACKAGE = LAUNCHER_PACKAGE + ".env.environment";
     private static final String CONFIG_PACKAGE = LAUNCHER_PACKAGE + ".env.configs";
+    private static final String JDK_PACKAGE = LAUNCHER_PACKAGE + ".env.jdk";
+
     private final EnvironmentOptions environmentOptions;
     private final Module additionalEnvironments;
 
@@ -85,6 +91,10 @@ public void configure(Binder binder)
         findConfigsByBasePackage(CONFIG_PACKAGE).forEach(clazz -> environmentConfigs.addBinding(nameForConfigClass(clazz)).to(clazz).in(SINGLETON));
 
         binder.install(additionalEnvironments);
+
+        binder.bind(JdkProviderFactory.class).in(SINGLETON);
+        MapBinder<String, JdkProvider> providers = newMapBinder(binder, String.class, JdkProvider.class);
+        findJdkProvidersByBasePackage(JDK_PACKAGE).forEach(clazz -> providers.addBinding(nameForJdkProvider(clazz)).to(clazz).in(SINGLETON));
     }
 
     @Provides
@@ -120,9 +130,9 @@ public File provideServerPackage(EnvironmentOptions options)
 
     @Provides
     @Singleton
-    public SupportedTrinoJdk provideJavaVersion(EnvironmentOptions options)
+    public JdkProvider provideJdkProvider(JdkProviderFactory factory, EnvironmentOptions options)
     {
-        return requireNonNull(options.jdkVersion, "JDK version is null");
+        return factory.get(requireNonNull(options.jdkProvider, "options.jdkProvider is null"));
     }
 
     @Provides
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java
index 6192df32aa6e..1ade2cfd8cd2 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java
@@ -13,14 +13,17 @@
  */
 package io.trino.tests.product.launcher.env;
 
+import jakarta.annotation.Nullable;
 import picocli.CommandLine;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Spec;
 
 import java.io.File;
+import java.nio.file.Path;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
+import static io.trino.tests.product.launcher.env.jdk.BuiltInJdkProvider.BUILT_IN_NAME;
 import static java.util.Locale.ENGLISH;
 import static picocli.CommandLine.Option;
 
@@ -54,8 +57,12 @@ public final class EnvironmentOptions
     @Option(names = "--launcher-bin", paramLabel = "<launcher bin>", description = "Launcher bin path (used to display run commands)", defaultValue = "${launcher.bin}", hidden = true)
     public String launcherBin;
 
-    @Option(names = "--trino-jdk-version", paramLabel = "<trino-jdk-version>", description = "JDK to use for running Trino: ${COMPLETION-CANDIDATES} " + DEFAULT_VALUE, defaultValue = "ZULU_17")
-    public SupportedTrinoJdk jdkVersion = SupportedTrinoJdk.ZULU_17;
+    @Option(names = "--trino-jdk-version", paramLabel = "<trino-jdk-version>", description = "JDK to use for running Trino " + DEFAULT_VALUE)
+    public String jdkProvider = BUILT_IN_NAME;
+
+    @Option(names = "--jdk-tmp-download-path", paramLabel = "<jdk-tmp-download-path>", defaultValue = "${env:PTL_TMP_DOWNLOAD_PATH:-${sys:java.io.tmpdir}/ptl-tmp-download}", description = "Path to use to download JDK distributions " + DEFAULT_VALUE)
+    @Nullable
+    public Path jdkDownloadPath;
 
     @Option(names = "--bind", description = "Bind exposed container ports to host ports, possible values: " + BIND_ON_HOST + ", " + DO_NOT_BIND + ", [port base number] " + DEFAULT_VALUE, defaultValue = BIND_ON_HOST, arity = "0..1", fallbackValue = BIND_ON_HOST)
     public void setBindOnHost(String value)
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentProvider.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentProvider.java
index ef7776882339..b47ee768b0e1 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentProvider.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentProvider.java
@@ -17,6 +17,7 @@
 import io.airlift.log.Logger;
 import io.trino.tests.product.launcher.env.common.EnvironmentExtender;
 
+import java.io.PrintStream;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,11 +43,11 @@ protected EnvironmentProvider(List<EnvironmentExtender> bases)
         this.bases = ImmutableList.copyOf(requireNonNull(bases, "bases is null"));
     }
 
-    public final Environment.Builder createEnvironment(String name, EnvironmentConfig environmentConfig, Map<String, String> extraOptions)
+    public final Environment.Builder createEnvironment(String name, PrintStream printStream, EnvironmentConfig environmentConfig, Map<String, String> extraOptions)
     {
         requireNonNull(environmentConfig, "environmentConfig is null");
         requireNonNull(extraOptions, "extraOptions is null");
-        Environment.Builder builder = Environment.builder(name);
+        Environment.Builder builder = Environment.builder(name, printStream);
 
         // Environment is created by applying bases, environment definition and environment config to builder
         ImmutableList<EnvironmentExtender> extenders = ImmutableList.<EnvironmentExtender>builder()
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/ServerPackage.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/ServerPackage.java
index b610be7edbb3..37f4810f8be4 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/ServerPackage.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/ServerPackage.java
@@ -13,7 +13,7 @@
  */
 package io.trino.tests.product.launcher.env;
 
-import javax.inject.Qualifier;
+import com.google.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -25,7 +25,7 @@
 
 @Retention(RUNTIME)
 @Target({FIELD, PARAMETER, METHOD})
-@Qualifier
+@BindingAnnotation
 public @interface ServerPackage
 {
 }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/SupportedTrinoJdk.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/SupportedTrinoJdk.java
deleted file mode 100644
index 4dd53ae581cc..000000000000
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/SupportedTrinoJdk.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.launcher.env;
-
-public enum SupportedTrinoJdk
-{
-    ZULU_17("/usr/lib/jvm/zulu-17"),
-    /**/;
-
-    private final String javaHome;
-
-    SupportedTrinoJdk(String javaHome)
-    {
-        this.javaHome = javaHome;
-    }
-
-    public String getJavaHome()
-    {
-        return javaHome;
-    }
-
-    public String getJavaCommand()
-    {
-        return javaHome + "/bin/java";
-    }
-}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Hadoop.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Hadoop.java
index af504ba88afe..f404ddc15de3 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Hadoop.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Hadoop.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.launcher.env.common;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -20,8 +21,6 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import java.time.Duration;
 
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
@@ -82,6 +81,8 @@ public static DockerContainer createHadoopContainer(DockerFiles dockerFiles, Por
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("health-checks/hadoop-health-check.sh")), CONTAINER_HEALTH_D + "hadoop-health-check.sh")
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hadoop-run.sh")), "/usr/local/hadoop-run.sh")
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/apply-config-overrides.sh")), CONTAINER_HADOOP_INIT_D + "00-apply-config-overrides.sh")
+                // When hive performs implicit coercion to/from timestamp for ORC files, it depends on timezone of the HiveServer
+                .withEnv("TZ", "UTC")
                 .withCommand("/usr/local/hadoop-run.sh")
                 .withExposedLogPaths("/var/log/hadoop-yarn", "/var/log/hadoop-hdfs", "/var/log/hive", "/var/log/container-health.log")
                 .withStartupCheckStrategy(new IsRunningStartupCheckStrategy())
@@ -96,12 +97,10 @@ public static DockerContainer createHadoopContainer(DockerFiles dockerFiles, Por
         portBinder.exposePort(container, 8088);
         portBinder.exposePort(container, 9000);
         portBinder.exposePort(container, 9083); // Metastore Thrift
-        portBinder.exposePort(container, 9864); // DataNode Web UI since Hadoop 3
-        portBinder.exposePort(container, 9870); // NameNode Web UI since Hadoop 3
+        portBinder.exposePort(container, 9864); // DataNode Web UI
+        portBinder.exposePort(container, 9870); // NameNode Web UI
         portBinder.exposePort(container, 10000); // HiveServer2
         portBinder.exposePort(container, 19888);
-        portBinder.exposePort(container, 50070); // NameNode Web UI prior to Hadoop 3
-        portBinder.exposePort(container, 50075); // DataNode Web UI prior to Hadoop 3
 
         return container;
     }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberos.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberos.java
index 7e1ecac9d50d..57af71be6327 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberos.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberos.java
@@ -14,13 +14,12 @@
 package io.trino.tests.product.launcher.env.common;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberosKms.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberosKms.java
index 8b3930ec16b1..82630b3a709f 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberosKms.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberosKms.java
@@ -14,12 +14,11 @@
 package io.trino.tests.product.launcher.env.common;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
@@ -49,13 +48,12 @@ public HadoopKerberosKms(DockerFiles dockerFiles, EnvironmentConfig environmentC
     @Override
     public void extendEnvironment(Environment.Builder builder)
     {
-        // TODO (https://github.com/trinodb/trino/issues/1652) create images with HDP and KMS
-        String dockerImageName = "ghcr.io/trinodb/testing/cdh5.15-hive-kerberized-kms:" + hadoopImagesVersion;
+        String dockerImageName = "ghcr.io/trinodb/testing/hdp3.1-hive-kerberized-kms:" + hadoopImagesVersion;
 
         builder.configureContainer(HADOOP, container -> {
             container.setDockerImageName(dockerImageName);
             container
-                    .withCopyFileToContainer(forHostPath(configDir.getPath("kms-core-site.xml")), "/etc/hadoop-kms/conf/core-site.xml");
+                    .withCopyFileToContainer(forHostPath(configDir.getPath("kms-core-site.xml")), "/opt/hadoop/etc/hadoop/core-site.xml");
         });
 
         builder.configureContainer(COORDINATOR,
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberosKmsWithImpersonation.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberosKmsWithImpersonation.java
index 6d6ffd7d8f0c..7af22574ccee 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberosKmsWithImpersonation.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberosKmsWithImpersonation.java
@@ -14,12 +14,11 @@
 package io.trino.tests.product.launcher.env.common;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
@@ -47,7 +46,7 @@ public void extendEnvironment(Environment.Builder builder)
                 HADOOP,
                 container ->
                         container
-                                .withCopyFileToContainer(forHostPath(configDir.getPath("kms-acls.xml")), "/etc/hadoop-kms/conf/kms-acls.xml")
+                                .withCopyFileToContainer(forHostPath(configDir.getPath("kms-acls.xml")), "/opt/hadoop/etc/kms-acls.xml")
                                 .withCopyFileToContainer(forHostPath(configDir.getPath("hiveserver2-site.xml")), "/etc/hive/conf/hiveserver2-site.xml"));
     }
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java
index d20ebd1a098f..28a03cc726b3 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java
@@ -14,6 +14,7 @@
 
 package io.trino.tests.product.launcher.env.common;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -22,18 +23,13 @@
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 import org.testcontainers.utility.MountableFile;
 
-import javax.inject.Inject;
-
-import java.io.File;
 import java.time.Duration;
 
-import static io.trino.testing.TestingProperties.getConfluentVersion;
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.containers.wait.strategy.Wait.forLogMessage;
-import static org.testcontainers.utility.MountableFile.forClasspathResource;
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 public class Kafka
@@ -41,8 +37,6 @@ public class Kafka
 {
     private static final String CONFLUENT_VERSION = "7.3.1";
     private static final int SCHEMA_REGISTRY_PORT = 8081;
-    private static final File KAFKA_PROTOBUF_PROVIDER = new File("testing/trino-product-tests-launcher/target/kafka-protobuf-provider-" + getConfluentVersion() + ".jar");
-    private static final File KAFKA_PROTOBUF_TYPES = new File("testing/trino-product-tests-launcher/target/kafka-protobuf-types-" + getConfluentVersion() + ".jar");
     static final String KAFKA = "kafka";
     static final String SCHEMA_REGISTRY = "schema-registry";
     static final String ZOOKEEPER = "zookeeper";
@@ -70,10 +64,7 @@ public void extendEnvironment(Environment.Builder builder)
             if (isTrinoContainer(container.getLogicalName())) {
                 MountableFile logConfigFile = forHostPath(configDir.getPath("log.properties"));
                 container
-                        .withCopyFileToContainer(logConfigFile, CONTAINER_TRINO_ETC + "/log.properties")
-                        .withCopyFileToContainer(forHostPath(KAFKA_PROTOBUF_PROVIDER.getAbsolutePath()), "/docker/kafka-protobuf-provider/kafka-protobuf-provider.jar")
-                        .withCopyFileToContainer(forHostPath(KAFKA_PROTOBUF_TYPES.getAbsolutePath()), "/docker/kafka-protobuf-provider/kafka-protobuf-types.jar")
-                        .withCopyFileToContainer(forClasspathResource("install-kafka-protobuf-provider.sh", 0755), "/docker/presto-init.d/install-kafka-protobuf-provider.sh");
+                        .withCopyFileToContainer(logConfigFile, CONTAINER_TRINO_ETC + "/log.properties");
             }
         });
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSaslPlaintext.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSaslPlaintext.java
index b667f3032bcb..fa1db52f1fd1 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSaslPlaintext.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSaslPlaintext.java
@@ -15,11 +15,10 @@
 package io.trino.tests.product.launcher.env.common;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.env.Environment;
 import org.testcontainers.containers.BindMode;
 
-import javax.inject.Inject;
-
 import java.time.Duration;
 import java.util.List;
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSsl.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSsl.java
index 86251cfd77f6..ef954ff0d8c4 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSsl.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSsl.java
@@ -15,11 +15,10 @@
 package io.trino.tests.product.launcher.env.common;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.env.Environment;
 import org.testcontainers.containers.BindMode;
 
-import javax.inject.Inject;
-
 import java.time.Duration;
 import java.util.List;
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kerberos.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kerberos.java
index 28ed4b445a82..4e8081bb6b72 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kerberos.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kerberos.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.launcher.env.common;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
@@ -21,8 +22,6 @@
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.containers.wait.strategy.Wait.forLogMessage;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Minio.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Minio.java
index b872f9260497..0177f87bfe43 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Minio.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Minio.java
@@ -14,14 +14,13 @@
 package io.trino.tests.product.launcher.env.common;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import java.time.Duration;
 
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java
index 3cceb0a4d17c..3201792fd67b 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.launcher.env.common;
 
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Debug;
@@ -21,13 +22,11 @@
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.env.EnvironmentContainers;
 import io.trino.tests.product.launcher.env.ServerPackage;
-import io.trino.tests.product.launcher.env.SupportedTrinoJdk;
+import io.trino.tests.product.launcher.env.jdk.JdkProvider;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -80,7 +79,7 @@ public final class Standard
     private final PortBinder portBinder;
 
     private final String imagesVersion;
-    private final SupportedTrinoJdk jdkVersion;
+    private final JdkProvider jdkProvider;
     private final File serverPackage;
     private final boolean debug;
 
@@ -90,13 +89,13 @@ public Standard(
             PortBinder portBinder,
             EnvironmentConfig environmentConfig,
             @ServerPackage File serverPackage,
-            SupportedTrinoJdk jdkVersion,
+            JdkProvider jdkProvider,
             @Debug boolean debug)
     {
         this.dockerFiles = requireNonNull(dockerFiles, "dockerFiles is null");
         this.portBinder = requireNonNull(portBinder, "portBinder is null");
         this.imagesVersion = environmentConfig.getImagesVersion();
-        this.jdkVersion = requireNonNull(jdkVersion, "jdkVersion is null");
+        this.jdkProvider = requireNonNull(jdkProvider, "jdkProvider is null");
         this.serverPackage = requireNonNull(serverPackage, "serverPackage is null");
         this.debug = debug;
         checkArgument(serverPackage.getName().endsWith(".tar.gz"), "Currently only server .tar.gz package is supported");
@@ -117,7 +116,7 @@ public void extendEnvironment(Environment.Builder builder)
     private DockerContainer createTrinoCoordinator()
     {
         DockerContainer container =
-                createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, COORDINATOR)
+                createTrinoContainer(dockerFiles, serverPackage, jdkProvider, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, COORDINATOR)
                         .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard/access-control.properties")), CONTAINER_TRINO_ACCESS_CONTROL_PROPERTIES)
                         .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard/config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES);
 
@@ -136,7 +135,7 @@ private DockerContainer createTestsContainer()
     }
 
     @SuppressWarnings("resource")
-    public static DockerContainer createTrinoContainer(DockerFiles dockerFiles, File serverPackage, SupportedTrinoJdk jdkVersion, boolean debug, String dockerImageName, String logicalName)
+    public static DockerContainer createTrinoContainer(DockerFiles dockerFiles, File serverPackage, JdkProvider jdkProvider, boolean debug, String dockerImageName, String logicalName)
     {
         DockerContainer container = new DockerContainer(dockerImageName, logicalName)
                 .withNetworkAliases(logicalName + ".docker.cluster")
@@ -146,7 +145,7 @@ public static DockerContainer createTrinoContainer(DockerFiles dockerFiles, File
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("health-checks/trino-health-check.sh")), CONTAINER_HEALTH_D + "trino-health-check.sh")
                 // the server package is hundreds MB and file system bind is much more efficient
                 .withFileSystemBind(serverPackage.getPath(), "/docker/presto-server.tar.gz", READ_ONLY)
-                .withEnv("JAVA_HOME", jdkVersion.getJavaHome())
+                .withEnv("JAVA_HOME", jdkProvider.getJavaHome())
                 .withCommand("/docker/presto-product-tests/run-presto.sh")
                 .withStartupCheckStrategy(new IsRunningStartupCheckStrategy())
                 .waitingForAll(forLogMessage(".*======== SERVER STARTED ========.*", 1), forHealthcheck())
@@ -158,7 +157,8 @@ public static DockerContainer createTrinoContainer(DockerFiles dockerFiles, File
         else {
             container.withHealthCheck(dockerFiles.getDockerFilesHostPath("health-checks/health.sh"));
         }
-        return container;
+
+        return jdkProvider.applyTo(container);
     }
 
     private static void enableTrinoJavaDebugger(DockerContainer dockerContainer)
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/StandardMultinode.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/StandardMultinode.java
index 0b62621c550f..959a6348d240 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/StandardMultinode.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/StandardMultinode.java
@@ -14,15 +14,14 @@
 package io.trino.tests.product.launcher.env.common;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Debug;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.env.ServerPackage;
-import io.trino.tests.product.launcher.env.SupportedTrinoJdk;
-
-import javax.inject.Inject;
+import io.trino.tests.product.launcher.env.jdk.JdkProvider;
 
 import java.io.File;
 import java.util.List;
@@ -43,7 +42,7 @@ public class StandardMultinode
     private final DockerFiles.ResourceProvider configDir;
     private final String imagesVersion;
     private final File serverPackage;
-    private final SupportedTrinoJdk jdkVersion;
+    private final JdkProvider jdkProvider;
     private final boolean debug;
 
     @Inject
@@ -52,14 +51,14 @@ public StandardMultinode(
             DockerFiles dockerFiles,
             EnvironmentConfig environmentConfig,
             @ServerPackage File serverPackage,
-            SupportedTrinoJdk jdkVersion,
+            JdkProvider jdkProvider,
             @Debug boolean debug)
     {
         this.standard = requireNonNull(standard, "standard is null");
         this.dockerFiles = requireNonNull(dockerFiles, "dockerFiles is null");
         this.configDir = dockerFiles.getDockerFilesHostDirectory("common/standard-multinode");
         this.imagesVersion = environmentConfig.getImagesVersion();
-        this.jdkVersion = requireNonNull(jdkVersion, "jdkVersion is null");
+        this.jdkProvider = requireNonNull(jdkProvider, "jdkProvider is null");
         this.serverPackage = requireNonNull(serverPackage, "serverPackage is null");
         this.debug = debug;
         checkArgument(serverPackage.getName().endsWith(".tar.gz"), "Currently only server .tar.gz package is supported");
@@ -82,7 +81,7 @@ public void extendEnvironment(Environment.Builder builder)
     @SuppressWarnings("resource")
     private DockerContainer createTrinoWorker()
     {
-        return createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, WORKER)
+        return createTrinoContainer(dockerFiles, serverPackage, jdkProvider, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, WORKER)
                 .withCopyFileToContainer(forHostPath(configDir.getPath("multinode-worker-config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES);
     }
 }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigApacheHive3.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigApacheHive3.java
index e2b5033ce317..07cf2764cce2 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigApacheHive3.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigApacheHive3.java
@@ -25,6 +25,6 @@ public String getHadoopBaseImage()
     @Override
     public String getTemptoEnvironmentConfigFile()
     {
-        return "/docker/presto-product-tests/conf/tempto/tempto-configuration-for-hive3.yaml,/docker/presto-product-tests/conf/tempto/tempto-configuration-for-hms-only.yaml";
+        return "/docker/presto-product-tests/conf/tempto/tempto-configuration-for-hms-only.yaml";
     }
 }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigEnvBased.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigEnvBased.java
index 7ffd0c529acf..8d14d8b97c50 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigEnvBased.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigEnvBased.java
@@ -15,11 +15,10 @@
 
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Environment;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Optional;
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigHdp3.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigHdp3.java
deleted file mode 100644
index a4bc22f30bed..000000000000
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigHdp3.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.launcher.env.configs;
-
-import io.trino.tests.product.launcher.docker.DockerFiles;
-import io.trino.tests.product.launcher.env.Environment;
-
-import javax.inject.Inject;
-
-import static io.trino.tests.product.launcher.env.EnvironmentContainers.TRINO;
-import static java.util.Objects.requireNonNull;
-import static org.testcontainers.utility.MountableFile.forHostPath;
-
-public class ConfigHdp3
-        extends ConfigDefault
-{
-    private final DockerFiles dockerFiles;
-
-    @Inject
-    public ConfigHdp3(DockerFiles dockerFiles)
-    {
-        this.dockerFiles = requireNonNull(dockerFiles, "dockerFiles is null");
-    }
-
-    /**
-     * export HADOOP_BASE_IMAGE="ghcr.io/trinodb/testing/hdp3.1-hive"
-     * export TEMPTO_ENVIRONMENT_CONFIG_FILE="/docker/presto-product-tests/conf/tempto/tempto-configuration-for-hive3.yaml"
-     * export DISTRO_SKIP_GROUP=iceberg
-     */
-    @Override
-    public String getHadoopBaseImage()
-    {
-        return "ghcr.io/trinodb/testing/hdp3.1-hive";
-    }
-
-    @Override
-    public void extendEnvironment(Environment.Builder builder)
-    {
-        builder.configureContainers(container -> {
-            if (container.getLogicalName().startsWith(TRINO)) {
-                container.withCopyFileToContainer(forHostPath(
-                        // HDP3's handling of timestamps is incompatible with previous versions of Hive (see https://issues.apache.org/jira/browse/HIVE-21002);
-                        // in order for Trino to deal with the differences, we must set catalog properties for Parquet and RCFile
-                        dockerFiles.getDockerFilesHostPath("common/standard/presto-init-hdp3.sh")),
-                        "/docker/presto-init.d/presto-init-hdp3.sh");
-            }
-        });
-    }
-
-    @Override
-    public String getTemptoEnvironmentConfigFile()
-    {
-        return "/docker/presto-product-tests/conf/tempto/tempto-configuration-for-hive3.yaml";
-    }
-}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeDeltaLakeDatabricks.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeDeltaLakeDatabricks.java
index ee040a083a75..ef7666f5cbb1 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeDeltaLakeDatabricks.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeDeltaLakeDatabricks.java
@@ -19,6 +19,8 @@
 import io.trino.tests.product.launcher.env.EnvironmentProvider;
 import io.trino.tests.product.launcher.env.common.Standard;
 
+import java.io.File;
+
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto;
@@ -33,6 +35,8 @@
 public abstract class AbstractSinglenodeDeltaLakeDatabricks
         extends EnvironmentProvider
 {
+    private static final File DATABRICKS_JDBC_PROVIDER = new File("testing/trino-product-tests-launcher/target/databricks-jdbc.jar");
+
     private final DockerFiles dockerFiles;
 
     abstract String databricksTestJdbcUrl();
@@ -69,7 +73,10 @@ public void extendEnvironment(Environment.Builder builder)
                 .withEnv("AWS_REGION", awsRegion)
                 .withEnv("DATABRICKS_JDBC_URL", databricksTestJdbcUrl)
                 .withEnv("DATABRICKS_LOGIN", databricksTestLogin)
-                .withEnv("DATABRICKS_TOKEN", databricksTestToken));
+                .withEnv("DATABRICKS_TOKEN", databricksTestToken)
+                .withCopyFileToContainer(
+                        forHostPath(DATABRICKS_JDBC_PROVIDER.getAbsolutePath()),
+                        "/docker/jdbc/databricks-jdbc.jar"));
 
         configureTempto(builder, configDir);
     }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinode.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinode.java
index 33d778b30338..4daa4830ec38 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinode.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinode.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentProvider;
@@ -21,8 +22,6 @@
 import io.trino.tests.product.launcher.env.common.StandardMultinode;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.WORKER;
 import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_HIVE_PROPERTIES;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAllConnectors.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAllConnectors.java
index b3a14ff124fe..7e289ee8583c 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAllConnectors.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAllConnectors.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.launcher.env.environment;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -20,8 +21,6 @@
 import io.trino.tests.product.launcher.env.common.StandardMultinode;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import java.util.List;
 
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer;
@@ -78,6 +77,7 @@ public void extendEnvironment(Environment.Builder builder)
                         "raptor_legacy",
                         "redis",
                         "redshift",
+                        "snowflake",
                         "sqlserver",
                         "trino_thrift",
                         "tpcds")
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAzure.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAzure.java
index 6479552fbd0d..0f28bb6e3879 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAzure.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAzure.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.StandardMultinode;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeCassandra.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeCassandra.java
index cd3786c87d01..4400b4faf61f 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeCassandra.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeCassandra.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -23,8 +24,6 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import java.time.Duration;
 
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeClickhouse.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeClickhouse.java
index 9107e8980ba2..0eb754dc2002 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeClickhouse.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeClickhouse.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.launcher.env.environment;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -23,8 +24,6 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeConfluentKafka.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeConfluentKafka.java
new file mode 100644
index 000000000000..a999c26ca3d0
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeConfluentKafka.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.environment;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import io.trino.tests.product.launcher.docker.DockerFiles;
+import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
+import io.trino.tests.product.launcher.env.Environment;
+import io.trino.tests.product.launcher.env.EnvironmentProvider;
+import io.trino.tests.product.launcher.env.common.Kafka;
+import io.trino.tests.product.launcher.env.common.StandardMultinode;
+import io.trino.tests.product.launcher.env.common.TestsEnvironment;
+
+import java.io.File;
+
+import static io.trino.testing.TestingProperties.getConfluentVersion;
+import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto;
+import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer;
+import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
+import static java.util.Objects.requireNonNull;
+import static org.testcontainers.utility.MountableFile.forClasspathResource;
+import static org.testcontainers.utility.MountableFile.forHostPath;
+
+/**
+ * {@link EnvMultinodeConfluentKafka} is intended to be the only Kafka product test environment which copies the non-free Confluent License libraries to the Kafka connector
+ * classpath to test functionality which requires those classes.
+ * The other {@link Kafka} environments MUST NOT copy these jars otherwise it's not possible to verify the out of box Trino setup which doesn't ship with the Confluent licensed
+ * libraries.
+ */
+@TestsEnvironment
+public final class EnvMultinodeConfluentKafka
+        extends EnvironmentProvider
+{
+    private static final File KAFKA_PROTOBUF_PROVIDER = new File("testing/trino-product-tests-launcher/target/kafka-protobuf-provider-" + getConfluentVersion() + ".jar");
+    private static final File KAFKA_PROTOBUF_TYPES = new File("testing/trino-product-tests-launcher/target/kafka-protobuf-types-" + getConfluentVersion() + ".jar");
+
+    private final ResourceProvider configDir;
+
+    @Inject
+    public EnvMultinodeConfluentKafka(Kafka kafka, StandardMultinode standardMultinode, DockerFiles dockerFiles)
+    {
+        super(ImmutableList.of(standardMultinode, kafka));
+        requireNonNull(dockerFiles, "dockerFiles is null");
+        configDir = dockerFiles.getDockerFilesHostDirectory("conf/environment/multinode-kafka-confluent-license/");
+    }
+
+    @Override
+    public void extendEnvironment(Environment.Builder builder)
+    {
+        builder.configureContainers(container -> {
+            if (isTrinoContainer(container.getLogicalName())) {
+                builder.addConnector("kafka", forHostPath(configDir.getPath("kafka.properties")), CONTAINER_TRINO_ETC + "/catalog/kafka.properties");
+                builder.addConnector("kafka", forHostPath(configDir.getPath("kafka_schema_registry.properties")), CONTAINER_TRINO_ETC + "/catalog/kafka_schema_registry.properties");
+                container
+                        .withCopyFileToContainer(forHostPath(KAFKA_PROTOBUF_PROVIDER.getAbsolutePath()), "/docker/kafka-protobuf-provider/kafka-protobuf-provider.jar")
+                        .withCopyFileToContainer(forHostPath(KAFKA_PROTOBUF_TYPES.getAbsolutePath()), "/docker/kafka-protobuf-provider/kafka-protobuf-types.jar")
+                        .withCopyFileToContainer(forClasspathResource("install-kafka-protobuf-provider.sh", 0755), "/docker/presto-init.d/install-kafka-protobuf-provider.sh");
+            }
+        });
+
+        configureTempto(builder, configDir);
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java
index 053bc9261fbd..9fbb25e61866 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.StandardMultinode;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -41,6 +40,7 @@
 import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_HADOOP_INIT_D;
 import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_HIVE_PROPERTIES;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.attribute.PosixFilePermissions.fromString;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.utility.MountableFile.forHostPath;
@@ -73,11 +73,13 @@ public void extendEnvironment(Environment.Builder builder)
         String gcpBase64EncodedCredentials = requireEnv("GCP_CREDENTIALS_KEY");
         String gcpStorageBucket = requireEnv("GCP_STORAGE_BUCKET");
 
+        byte[] gcpCredentialsBytes = Base64.getDecoder().decode(gcpBase64EncodedCredentials);
+        String gcpCredentials = new String(gcpCredentialsBytes, UTF_8);
         File gcpCredentialsFile;
         try {
             gcpCredentialsFile = Files.createTempFile("gcp-credentials", ".xml", PosixFilePermissions.asFileAttribute(fromString("rw-r--r--"))).toFile();
             gcpCredentialsFile.deleteOnExit();
-            Files.write(gcpCredentialsFile.toPath(), Base64.getDecoder().decode(gcpBase64EncodedCredentials));
+            Files.write(gcpCredentialsFile.toPath(), gcpCredentialsBytes);
         }
         catch (IOException e) {
             throw new UncheckedIOException(e);
@@ -85,7 +87,6 @@ public void extendEnvironment(Environment.Builder builder)
 
         String containerGcpCredentialsFile = CONTAINER_TRINO_ETC + "gcp-credentials.json";
         builder.configureContainer(HADOOP, container -> {
-            container.setDockerImageName("ghcr.io/trinodb/testing/hdp3.1-hive:" + hadoopImageVersion);
             container.withCopyFileToContainer(
                     forHostPath(getCoreSiteOverrideXml(containerGcpCredentialsFile)),
                     "/docker/presto-product-tests/conf/environment/multinode-gcs/core-site-overrides.xml");
@@ -99,16 +100,12 @@ public void extendEnvironment(Environment.Builder builder)
         });
 
         builder.configureContainer(COORDINATOR, container -> container
-                .withCopyFileToContainer(forHostPath(gcpCredentialsFile.toPath()), containerGcpCredentialsFile)
-                .withEnv("GCP_CREDENTIALS_FILE_PATH", containerGcpCredentialsFile));
+                .withEnv("GCP_CREDENTIALS", gcpCredentials));
 
         builder.configureContainer(WORKER, container -> container
-                .withCopyFileToContainer(forHostPath(gcpCredentialsFile.toPath()), containerGcpCredentialsFile)
-                .withEnv("GCP_CREDENTIALS_FILE_PATH", containerGcpCredentialsFile));
+                .withEnv("GCP_CREDENTIALS", gcpCredentials));
 
         builder.configureContainer(TESTS, container -> container
-                .withCopyFileToContainer(forHostPath(gcpCredentialsFile.toPath()), containerGcpCredentialsFile)
-                .withEnv("GCP_CREDENTIALS_FILE_PATH", containerGcpCredentialsFile)
                 .withEnv("GCP_STORAGE_BUCKET", gcpStorageBucket)
                 .withEnv("GCP_TEST_DIRECTORY", gcsTestDirectory));
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeHiveCaching.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeHiveCaching.java
index 08f3ce0557ea..a1dfdd133cd9 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeHiveCaching.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeHiveCaching.java
@@ -15,18 +15,17 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Debug;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.env.EnvironmentProvider;
 import io.trino.tests.product.launcher.env.ServerPackage;
-import io.trino.tests.product.launcher.env.SupportedTrinoJdk;
 import io.trino.tests.product.launcher.env.common.Hadoop;
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
-
-import javax.inject.Inject;
+import io.trino.tests.product.launcher.env.jdk.JdkProvider;
 
 import java.io.File;
 
@@ -50,7 +49,7 @@ public final class EnvMultinodeHiveCaching
     private final DockerFiles.ResourceProvider configDir;
 
     private final String imagesVersion;
-    private final SupportedTrinoJdk jdkVersion;
+    private final JdkProvider jdkProvider;
     private final File serverPackage;
     private final boolean debug;
 
@@ -61,14 +60,14 @@ public EnvMultinodeHiveCaching(
             Hadoop hadoop,
             EnvironmentConfig environmentConfig,
             @ServerPackage File serverPackage,
-            SupportedTrinoJdk jdkVersion,
+            JdkProvider jdkProvider,
             @Debug boolean debug)
     {
         super(ImmutableList.of(standard, hadoop));
         this.dockerFiles = requireNonNull(dockerFiles, "dockerFiles is null");
         this.configDir = dockerFiles.getDockerFilesHostDirectory("conf/environment");
         this.imagesVersion = environmentConfig.getImagesVersion();
-        this.jdkVersion = requireNonNull(jdkVersion, "jdkVersion is null");
+        this.jdkProvider = requireNonNull(jdkProvider, "jdkProvider is null");
         this.serverPackage = requireNonNull(serverPackage, "serverPackage is null");
         this.debug = debug;
     }
@@ -90,7 +89,7 @@ public void extendEnvironment(Environment.Builder builder)
     @SuppressWarnings("resource")
     private void createTrinoWorker(Environment.Builder builder, int workerNumber)
     {
-        builder.addContainer(createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, worker(workerNumber))
+        builder.addContainer(createTrinoContainer(dockerFiles, serverPackage, jdkProvider, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, worker(workerNumber))
                 .withCopyFileToContainer(forHostPath(configDir.getPath("multinode/multinode-worker-jvm.config")), CONTAINER_TRINO_JVM_CONFIG)
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard-multinode/multinode-worker-config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES)
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_TRINO_HIVE_NON_CACHED_PROPERTIES)
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeIgnite.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeIgnite.java
index c4a3b871e66f..31c00ece819a 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeIgnite.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeIgnite.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.launcher.env.environment;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -23,8 +24,6 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import java.time.Duration;
 
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto;
@@ -69,7 +68,7 @@ public void extendEnvironment(Environment.Builder builder)
 
     private DockerContainer createIgnite(int number)
     {
-        return new DockerContainer("apacheignite/ignite:2.8.0", logicalName(number))
+        return new DockerContainer("apacheignite/ignite:2.9.0", logicalName(number))
                 .withStartupCheckStrategy(new IsRunningStartupCheckStrategy())
                 .withStartupTimeout(Duration.ofMinutes(5));
     }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafka.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafka.java
index a3f3e8079185..98defe3aebe5 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafka.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafka.java
@@ -15,6 +15,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -24,8 +25,6 @@
 import io.trino.tests.product.launcher.env.common.StandardMultinode;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.WORKER;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSaslPlaintext.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSaslPlaintext.java
index b21883f160ec..a84b408a97fc 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSaslPlaintext.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSaslPlaintext.java
@@ -14,6 +14,7 @@
 
 package io.trino.tests.product.launcher.env.environment;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -23,8 +24,6 @@
 import io.trino.tests.product.launcher.env.common.StandardMultinode;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.WORKER;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSsl.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSsl.java
index b76bc021d6a1..0d2af492c58b 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSsl.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSsl.java
@@ -14,6 +14,7 @@
 
 package io.trino.tests.product.launcher.env.environment;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -23,8 +24,6 @@
 import io.trino.tests.product.launcher.env.common.StandardMultinode;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.WORKER;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKerberosKudu.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKerberosKudu.java
index 6a1410830038..b9d639dcbc6d 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKerberosKudu.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKerberosKudu.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.launcher.env.environment;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMariadb.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMariadb.java
index 07fa17e23639..5f3fb645571e 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMariadb.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMariadb.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.launcher.env.environment;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -23,8 +24,6 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto;
 import static java.util.Objects.requireNonNull;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMinioDataLake.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMinioDataLake.java
index 676c2b3c7a0b..2eff3421563c 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMinioDataLake.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMinioDataLake.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.launcher.env.environment;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentProvider;
@@ -21,8 +22,6 @@
 import io.trino.tests.product.launcher.env.common.StandardMultinode;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMysql.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMysql.java
index 2f78771d7d48..fe5a5b3472c8 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMysql.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMysql.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -23,8 +24,6 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.utility.MountableFile.forHostPath;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeParquet.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeParquet.java
index eeb12390133a..4036004bd669 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeParquet.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeParquet.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.launcher.env.environment;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentProvider;
@@ -20,8 +21,6 @@
 import io.trino.tests.product.launcher.env.common.StandardMultinode;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePhoenix5.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePhoenix5.java
index cba2b351d0a7..00b4cd4566b3 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePhoenix5.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePhoenix5.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.launcher.env.environment;
 
+import com.google.inject.Inject;
 import io.trino.testing.TestingProperties;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
@@ -24,8 +25,6 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import java.time.Duration;
 
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePostgresql.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePostgresql.java
index b3bac48eeb03..33e06b58d094 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePostgresql.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePostgresql.java
@@ -15,6 +15,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -24,8 +25,6 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.utility.MountableFile.forHostPath;
@@ -61,7 +60,7 @@ public void extendEnvironment(Environment.Builder builder)
     private DockerContainer createPostgreSql()
     {
         // Use the oldest supported PostgreSQL version
-        DockerContainer container = new DockerContainer("postgres:10.20", "postgresql")
+        DockerContainer container = new DockerContainer("postgres:11", "postgresql")
                 .withEnv("POSTGRES_PASSWORD", "test")
                 .withEnv("POSTGRES_USER", "test")
                 .withEnv("POSTGRES_DB", "test")
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSnowflake.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSnowflake.java
new file mode 100644
index 000000000000..ade68640bab2
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSnowflake.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.environment;
+
+import io.trino.tests.product.launcher.docker.DockerFiles;
+import io.trino.tests.product.launcher.env.Environment;
+import io.trino.tests.product.launcher.env.EnvironmentProvider;
+import io.trino.tests.product.launcher.env.common.Standard;
+import io.trino.tests.product.launcher.env.common.TestsEnvironment;
+
+import javax.inject.Inject;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermissions;
+
+import static java.nio.file.attribute.PosixFilePermissions.fromString;
+import static java.util.Objects.requireNonNull;
+import static org.testcontainers.utility.MountableFile.forHostPath;
+
+@TestsEnvironment
+public class EnvMultinodeSnowflake
+        extends EnvironmentProvider
+{
+    private final DockerFiles.ResourceProvider configDir;
+
+    @Inject
+    public EnvMultinodeSnowflake(DockerFiles dockerFiles, Standard standard)
+    {
+        super(standard);
+        configDir = requireNonNull(dockerFiles, "dockerFiles is null").getDockerFilesHostDirectory("conf/environment/multinode-snowflake");
+    }
+
+    @Override
+    public void extendEnvironment(Environment.Builder builder)
+    {
+        builder.addConnector("snowflake", forHostPath(getEnvProperties()));
+    }
+
+    private Path getEnvProperties()
+    {
+        try {
+            String properties = Files.readString(configDir.getPath("snowflake.properties"))
+                    .replace("${ENV:SNOWFLAKE_URL}", requireEnv("SNOWFLAKE_URL"))
+                    .replace("${ENV:SNOWFLAKE_USER}", requireEnv("SNOWFLAKE_USER"))
+                    .replace("${ENV:SNOWFLAKE_PASSWORD}", requireEnv("SNOWFLAKE_PASSWORD"))
+                    .replace("${ENV:SNOWFLAKE_DATABASE}", requireEnv("SNOWFLAKE_DATABASE"))
+                    .replace("${ENV:SNOWFLAKE_ROLE}", requireEnv("SNOWFLAKE_ROLE"))
+                    .replace("${ENV:SNOWFLAKE_WAREHOUSE}", requireEnv("SNOWFLAKE_WAREHOUSE"));
+            File newProperties = Files.createTempFile("snowflake-replaced", ".properties", PosixFilePermissions.asFileAttribute(fromString("rwxrwxrwx"))).toFile();
+            newProperties.deleteOnExit();
+            Files.writeString(newProperties.toPath(), properties);
+            return newProperties.toPath();
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    private static String requireEnv(String variable)
+    {
+        return requireNonNull(System.getenv(variable), () -> "environment variable not set: " + variable);
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSqlserver.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSqlserver.java
index a8f392486b9b..f0db7b02853d 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSqlserver.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSqlserver.java
@@ -15,6 +15,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -24,8 +25,6 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.utility.MountableFile.forHostPath;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTls.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTls.java
index 25e6fc92e1e1..15c4c8c9d299 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTls.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTls.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Debug;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -21,14 +22,12 @@
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.env.EnvironmentProvider;
 import io.trino.tests.product.launcher.env.ServerPackage;
-import io.trino.tests.product.launcher.env.SupportedTrinoJdk;
 import io.trino.tests.product.launcher.env.common.Hadoop;
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
+import io.trino.tests.product.launcher.env.jdk.JdkProvider;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import java.io.File;
 
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
@@ -52,7 +51,7 @@ public final class EnvMultinodeTls
     private final String imagesVersion;
     private final File serverPackage;
     private final boolean debug;
-    private final SupportedTrinoJdk jdkVersion;
+    private final JdkProvider jdkProvider;
 
     @Inject
     public EnvMultinodeTls(
@@ -62,14 +61,14 @@ public EnvMultinodeTls(
             Hadoop hadoop,
             EnvironmentConfig environmentConfig,
             @ServerPackage File serverPackage,
-            SupportedTrinoJdk jdkVersion,
+            JdkProvider jdkProvider,
             @Debug boolean debug)
     {
         super(ImmutableList.of(standard, hadoop));
         this.dockerFiles = requireNonNull(dockerFiles, "dockerFiles is null");
         this.portBinder = requireNonNull(portBinder, "portBinder is null");
         this.imagesVersion = environmentConfig.getImagesVersion();
-        this.jdkVersion = requireNonNull(jdkVersion, "jdkVersion is null");
+        this.jdkProvider = requireNonNull(jdkProvider, "jdkProvider is null");
         this.serverPackage = requireNonNull(serverPackage, "serverPackage is null");
         this.debug = debug;
     }
@@ -94,7 +93,7 @@ public void extendEnvironment(Environment.Builder builder)
 
     private DockerContainer createTrinoWorker(String workerName)
     {
-        return createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, workerName)
+        return createTrinoContainer(dockerFiles, serverPackage, jdkProvider, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, workerName)
                 .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withDomainName("docker.cluster"))
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls/config-worker.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES)
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES)
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberos.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberos.java
index 123ae95109b2..76d10b72640b 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberos.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberos.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Debug;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -21,12 +22,10 @@
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.env.EnvironmentProvider;
 import io.trino.tests.product.launcher.env.ServerPackage;
-import io.trino.tests.product.launcher.env.SupportedTrinoJdk;
 import io.trino.tests.product.launcher.env.common.HadoopKerberos;
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
-
-import javax.inject.Inject;
+import io.trino.tests.product.launcher.env.jdk.JdkProvider;
 
 import java.io.File;
 import java.util.Objects;
@@ -48,7 +47,7 @@ public final class EnvMultinodeTlsKerberos
     private final DockerFiles dockerFiles;
 
     private final String trinoDockerImageName;
-    private final SupportedTrinoJdk jdkVersion;
+    private final JdkProvider jdkProvider;
     private final File serverPackage;
     private final boolean debug;
 
@@ -59,7 +58,7 @@ public EnvMultinodeTlsKerberos(
             HadoopKerberos hadoopKerberos,
             EnvironmentConfig config,
             @ServerPackage File serverPackage,
-            SupportedTrinoJdk jdkVersion,
+            JdkProvider jdkProvider,
             @Debug boolean debug)
     {
         super(ImmutableList.of(standard, hadoopKerberos));
@@ -67,7 +66,7 @@ public EnvMultinodeTlsKerberos(
         String hadoopBaseImage = config.getHadoopBaseImage();
         String hadoopImagesVersion = config.getHadoopImagesVersion();
         this.trinoDockerImageName = hadoopBaseImage + "-kerberized:" + hadoopImagesVersion;
-        this.jdkVersion = requireNonNull(jdkVersion, "jdkVersion is null");
+        this.jdkProvider = requireNonNull(jdkProvider, "jdkProvider is null");
         this.serverPackage = requireNonNull(serverPackage, "serverPackage is null");
         this.debug = debug;
     }
@@ -90,7 +89,7 @@ public void extendEnvironment(Environment.Builder builder)
     @SuppressWarnings("resource")
     private DockerContainer createTrinoWorker(String workerName)
     {
-        return createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, trinoDockerImageName, workerName)
+        return createTrinoContainer(dockerFiles, serverPackage, jdkProvider, debug, trinoDockerImageName, workerName)
                 .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withDomainName("docker.cluster"))
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/config-worker.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES)
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES)
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberosDelegation.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberosDelegation.java
index ab0364267b25..917fd5938bd5 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberosDelegation.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberosDelegation.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Debug;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -21,18 +22,17 @@
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.env.EnvironmentProvider;
 import io.trino.tests.product.launcher.env.ServerPackage;
-import io.trino.tests.product.launcher.env.SupportedTrinoJdk;
 import io.trino.tests.product.launcher.env.common.HadoopKerberos;
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
-
-import javax.inject.Inject;
+import io.trino.tests.product.launcher.env.jdk.JdkProvider;
 
 import java.io.File;
 import java.util.Objects;
 
 import static com.google.common.base.Verify.verify;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
+import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.worker;
 import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_HIVE_PROPERTIES;
@@ -50,7 +50,7 @@ public final class EnvMultinodeTlsKerberosDelegation
 
     private final DockerFiles.ResourceProvider configDir;
     private final String trinoDockerImageName;
-    private final SupportedTrinoJdk jdkVersion;
+    private final JdkProvider jdkProvider;
     private final File serverPackage;
     private final boolean debug;
 
@@ -61,7 +61,7 @@ public EnvMultinodeTlsKerberosDelegation(
             HadoopKerberos hadoopKerberos,
             EnvironmentConfig config,
             @ServerPackage File serverPackage,
-            SupportedTrinoJdk jdkVersion,
+            JdkProvider jdkProvider,
             @Debug boolean debug)
     {
         super(ImmutableList.of(standard, hadoopKerberos));
@@ -70,7 +70,7 @@ public EnvMultinodeTlsKerberosDelegation(
         String hadoopBaseImage = config.getHadoopBaseImage();
         String hadoopImagesVersion = config.getHadoopImagesVersion();
         this.trinoDockerImageName = hadoopBaseImage + "-kerberized:" + hadoopImagesVersion;
-        this.jdkVersion = requireNonNull(jdkVersion, "jdkVersion is null");
+        this.jdkProvider = requireNonNull(jdkProvider, "jdkProvider is null");
         this.serverPackage = requireNonNull(serverPackage, "serverPackage is null");
         this.debug = debug;
     }
@@ -88,13 +88,17 @@ public void extendEnvironment(Environment.Builder builder)
         builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/iceberg.properties")), CONTAINER_TRINO_ICEBERG_PROPERTIES);
 
         builder.addContainers(createTrinoWorker(worker(1)), createTrinoWorker(worker(2)));
+        builder.configureContainer(TESTS, container -> {
+            // Configures a low ticket lifetime to ensure tickets get expired during tests
+            container.withCopyFileToContainer(forHostPath(configDir.getPath("krb5_client.conf")), "/etc/krb5.conf");
+        });
         configureTempto(builder, configDir);
     }
 
     @SuppressWarnings("resource")
     private DockerContainer createTrinoWorker(String workerName)
     {
-        return createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, trinoDockerImageName, workerName)
+        return createTrinoContainer(dockerFiles, serverPackage, jdkProvider, debug, trinoDockerImageName, workerName)
                 .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withDomainName("docker.cluster"))
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/config-worker.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES)
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES)
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java
index b6514f612611..e3a0b7b828e2 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -25,8 +26,6 @@
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-import javax.inject.Inject;
-
 import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeDatabricks122.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeDatabricks122.java
new file mode 100644
index 000000000000..0435b226bfb1
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeDatabricks122.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.environment;
+
+import com.google.inject.Inject;
+import io.trino.tests.product.launcher.docker.DockerFiles;
+import io.trino.tests.product.launcher.env.common.Standard;
+import io.trino.tests.product.launcher.env.common.TestsEnvironment;
+
+import static java.util.Objects.requireNonNull;
+
+@TestsEnvironment
+public class EnvSinglenodeDeltaLakeDatabricks122
+        extends AbstractSinglenodeDeltaLakeDatabricks
+{
+    @Inject
+    public EnvSinglenodeDeltaLakeDatabricks122(Standard standard, DockerFiles dockerFiles)
+    {
+        super(standard, dockerFiles);
+    }
+
+    @Override
+    String databricksTestJdbcUrl()
+    {
+        return requireNonNull(System.getenv("DATABRICKS_122_JDBC_URL"), "Environment DATABRICKS_122_JDBC_URL was not set");
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeDatabricks133.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeDatabricks133.java
new file mode 100644
index 000000000000..e054cec92822
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeDatabricks133.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.environment;
+
+import com.google.inject.Inject;
+import io.trino.tests.product.launcher.docker.DockerFiles;
+import io.trino.tests.product.launcher.env.common.Standard;
+import io.trino.tests.product.launcher.env.common.TestsEnvironment;
+
+import static java.util.Objects.requireNonNull;
+
+@TestsEnvironment
+public class EnvSinglenodeDeltaLakeDatabricks133
+        extends AbstractSinglenodeDeltaLakeDatabricks
+{
+    @Inject
+    public EnvSinglenodeDeltaLakeDatabricks133(Standard standard, DockerFiles dockerFiles)
+    {
+        super(standard, dockerFiles);
+    }
+
+    @Override
+    String databricksTestJdbcUrl()
+    {
+        return requireNonNull(System.getenv("DATABRICKS_133_JDBC_URL"), "Environment DATABRICKS_133_JDBC_URL was not set");
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeDatabricks73.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeDatabricks73.java
deleted file mode 100644
index ca6450dcfcc5..000000000000
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeDatabricks73.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.launcher.env.environment;
-
-import com.google.inject.Inject;
-import io.trino.tests.product.launcher.docker.DockerFiles;
-import io.trino.tests.product.launcher.env.common.Standard;
-import io.trino.tests.product.launcher.env.common.TestsEnvironment;
-
-import static java.util.Objects.requireNonNull;
-
-@TestsEnvironment
-public class EnvSinglenodeDeltaLakeDatabricks73
-        extends AbstractSinglenodeDeltaLakeDatabricks
-
-{
-    @Inject
-    public EnvSinglenodeDeltaLakeDatabricks73(Standard standard, DockerFiles dockerFiles)
-    {
-        super(standard, dockerFiles);
-    }
-
-    @Override
-    String databricksTestJdbcUrl()
-    {
-        return requireNonNull(System.getenv("DATABRICKS_73_JDBC_URL"), "Environment DATABRICKS_73_JDBC_URL was not set");
-    }
-}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeKerberizedHdfs.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeKerberizedHdfs.java
index 5605bf6ca1d6..221ecba6dd29 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeKerberizedHdfs.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeKerberizedHdfs.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.launcher.env.environment;
 
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentProvider;
@@ -21,8 +22,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeOss.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeOss.java
index 48f25da34fa2..c327ae6e512a 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeOss.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeOss.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -24,10 +25,10 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
+import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
+import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
@@ -42,7 +43,6 @@
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto;
 import static io.trino.tests.product.launcher.env.common.Minio.MINIO_CONTAINER_NAME;
-import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TEMPTO_PROFILE_CONFIG;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.utility.MountableFile.forHostPath;
@@ -57,11 +57,13 @@
 public class EnvSinglenodeDeltaLakeOss
         extends EnvironmentProvider
 {
+    private static final File HIVE_JDBC_PROVIDER = new File("testing/trino-product-tests-launcher/target/hive-jdbc.jar");
+
     private static final int SPARK_THRIFT_PORT = 10213;
 
     private static final String SPARK_CONTAINER_NAME = "spark";
 
-    private static final String DEFAULT_S3_BUCKET_NAME = "trino-ci-test";
+    private static final String S3_BUCKET_NAME = "test-bucket";
 
     private final DockerFiles dockerFiles;
     private final PortBinder portBinder;
@@ -87,13 +89,6 @@ public EnvSinglenodeDeltaLakeOss(
     @Override
     public void extendEnvironment(Environment.Builder builder)
     {
-        String s3Bucket = getS3Bucket();
-
-        // Using hdp3.1 so we are using Hive metastore with version close to versions of  hive-*.jars Spark uses
-        builder.configureContainer(HADOOP, container -> {
-            container.setDockerImageName("ghcr.io/trinodb/testing/hdp3.1-hive:" + hadoopImagesVersion);
-        });
-
         builder.addConnector("hive", forHostPath(configDir.getPath("hive.properties")));
         builder.addConnector(
                 "delta_lake",
@@ -101,10 +96,9 @@ public void extendEnvironment(Environment.Builder builder)
                 CONTAINER_TRINO_ETC + "/catalog/delta.properties");
 
         builder.configureContainer(TESTS, dockerContainer -> {
-            dockerContainer.withEnv("S3_BUCKET", s3Bucket)
-                    .withCopyFileToContainer(
-                            forHostPath(dockerFiles.getDockerFilesHostPath("conf/tempto/tempto-configuration-for-hive3.yaml")),
-                            CONTAINER_TEMPTO_PROFILE_CONFIG);
+            dockerContainer.withEnv("S3_BUCKET", S3_BUCKET_NAME)
+                    // Binding instead of copying for avoiding OutOfMemoryError https://github.com/testcontainers/testcontainers-java/issues/2863
+                    .withFileSystemBind(HIVE_JDBC_PROVIDER.getParent(), "/docker/jdbc", BindMode.READ_ONLY);
         });
 
         builder.addContainer(createSparkContainer())
@@ -115,14 +109,14 @@ public void extendEnvironment(Environment.Builder builder)
         FileAttribute<Set<PosixFilePermission>> posixFilePermissions = PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rw-r--r--"));
         Path minioBucketDirectory;
         try {
-            minioBucketDirectory = Files.createTempDirectory("trino-ci-test", posixFilePermissions);
+            minioBucketDirectory = Files.createTempDirectory("test-bucket-contents", posixFilePermissions);
             minioBucketDirectory.toFile().deleteOnExit();
         }
         catch (IOException e) {
             throw new UncheckedIOException(e);
         }
         builder.configureContainer(MINIO_CONTAINER_NAME, container ->
-                container.withCopyFileToContainer(forHostPath(minioBucketDirectory), "/data/" + s3Bucket));
+                container.withCopyFileToContainer(forHostPath(minioBucketDirectory), "/data/" + S3_BUCKET_NAME));
 
         configureTempto(builder, configDir);
     }
@@ -132,6 +126,7 @@ private DockerContainer createSparkContainer()
     {
         DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-delta:" + hadoopImagesVersion, SPARK_CONTAINER_NAME)
                 .withCopyFileToContainer(forHostPath(configDir.getPath("spark-defaults.conf")), "/spark/conf/spark-defaults.conf")
+                .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/spark/log4j2.properties")), "/spark/conf/log4j2.properties")
                 .withStartupCheckStrategy(new IsRunningStartupCheckStrategy())
                 .waitingFor(forSelectedPorts(SPARK_THRIFT_PORT));
 
@@ -139,13 +134,4 @@ private DockerContainer createSparkContainer()
 
         return container;
     }
-
-    private String getS3Bucket()
-    {
-        String s3Bucket = System.getenv("S3_BUCKET");
-        if (s3Bucket == null) {
-            s3Bucket = DEFAULT_S3_BUCKET_NAME;
-        }
-        return s3Bucket;
-    }
 }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHdfsImpersonation.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHdfsImpersonation.java
index 93c4027fb773..dd7d707e3aeb 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHdfsImpersonation.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHdfsImpersonation.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentProvider;
@@ -21,8 +22,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHdp3.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHdp3.java
deleted file mode 100644
index ba9d89813051..000000000000
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHdp3.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.launcher.env.environment;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.tests.product.launcher.docker.DockerFiles;
-import io.trino.tests.product.launcher.env.Environment;
-import io.trino.tests.product.launcher.env.EnvironmentConfig;
-import io.trino.tests.product.launcher.env.EnvironmentProvider;
-import io.trino.tests.product.launcher.env.common.Hadoop;
-import io.trino.tests.product.launcher.env.common.Standard;
-import io.trino.tests.product.launcher.env.common.TestsEnvironment;
-
-import javax.inject.Inject;
-
-import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
-import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
-import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_HADOOP_INIT_D;
-import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TEMPTO_PROFILE_CONFIG;
-import static java.util.Objects.requireNonNull;
-import static org.testcontainers.utility.MountableFile.forHostPath;
-
-// HDP 3.1 images (code) + HDP 3.1-like configuration.
-// See https://github.com/trinodb/trino/issues/1841 for more information.
-@TestsEnvironment
-public class EnvSinglenodeHdp3
-        extends EnvironmentProvider
-{
-    private final DockerFiles dockerFiles;
-    private final String hadoopImagesVersion;
-
-    @Inject
-    protected EnvSinglenodeHdp3(DockerFiles dockerFiles, Standard standard, Hadoop hadoop, EnvironmentConfig environmentConfig)
-    {
-        super(ImmutableList.of(standard, hadoop));
-        this.dockerFiles = requireNonNull(dockerFiles, "dockerFiles is null");
-        this.hadoopImagesVersion = environmentConfig.getHadoopImagesVersion();
-    }
-
-    @Override
-    public void extendEnvironment(Environment.Builder builder)
-    {
-        String dockerImageName = "ghcr.io/trinodb/testing/hdp3.1-hive:" + hadoopImagesVersion;
-
-        builder.configureContainer(HADOOP, dockerContainer -> {
-            dockerContainer.setDockerImageName(dockerImageName);
-            dockerContainer.withCopyFileToContainer(
-                    forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-hdp3/apply-hdp3-config.sh")),
-                    CONTAINER_HADOOP_INIT_D + "apply-hdp3-config.sh");
-        });
-
-        builder.configureContainer(TESTS, dockerContainer -> {
-            dockerContainer.withCopyFileToContainer(
-                    forHostPath(dockerFiles.getDockerFilesHostPath("conf/tempto/tempto-configuration-for-hive3.yaml")),
-                    CONTAINER_TEMPTO_PROFILE_CONFIG);
-        });
-    }
-}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveAcid.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveAcid.java
new file mode 100644
index 000000000000..d10f2f39a5e1
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveAcid.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.environment;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import io.trino.tests.product.launcher.docker.DockerFiles;
+import io.trino.tests.product.launcher.env.Environment;
+import io.trino.tests.product.launcher.env.EnvironmentProvider;
+import io.trino.tests.product.launcher.env.common.Hadoop;
+import io.trino.tests.product.launcher.env.common.Standard;
+import io.trino.tests.product.launcher.env.common.TestsEnvironment;
+
+import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
+import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_HADOOP_INIT_D;
+import static java.util.Objects.requireNonNull;
+import static org.testcontainers.utility.MountableFile.forHostPath;
+
+@TestsEnvironment
+public class EnvSinglenodeHiveAcid
+        extends EnvironmentProvider
+{
+    private final DockerFiles dockerFiles;
+
+    @Inject
+    protected EnvSinglenodeHiveAcid(DockerFiles dockerFiles, Standard standard, Hadoop hadoop)
+    {
+        super(ImmutableList.of(standard, hadoop));
+        this.dockerFiles = requireNonNull(dockerFiles, "dockerFiles is null");
+    }
+
+    @Override
+    public void extendEnvironment(Environment.Builder builder)
+    {
+        builder.configureContainer(HADOOP, dockerContainer -> {
+            dockerContainer.withCopyFileToContainer(
+                    forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-hive-acid/apply-hive-config.sh")),
+                    CONTAINER_HADOOP_INIT_D + "apply-hive-config.sh");
+        });
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveHudiRedirections.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveHudiRedirections.java
index 15bca5119cbc..52dae080594e 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveHudiRedirections.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveHudiRedirections.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -26,8 +27,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
@@ -53,7 +52,7 @@ public class EnvSinglenodeHiveHudiRedirections
     private static final int SPARK_THRIFT_PORT = 10213;
 
     private static final String SPARK_CONTAINER_NAME = "spark";
-    private static final String S3_BUCKET_NAME = "trino-ci-test";
+    private static final String S3_BUCKET_NAME = "test-bucket";
 
     private final PortBinder portBinder;
     private final String hadoopImagesVersion;
@@ -76,9 +75,6 @@ public EnvSinglenodeHiveHudiRedirections(
     @Override
     public void extendEnvironment(Environment.Builder builder)
     {
-        // Using hdp3.1 so we are using Hive metastore with version close to versions of hive-*.jars Spark uses
-        builder.configureContainer(HADOOP, container -> container.setDockerImageName("ghcr.io/trinodb/testing/hdp3.1-hive:" + hadoopImagesVersion));
-
         builder.addConnector("hive", forHostPath(configDir.getPath("hive.properties")));
         builder.addConnector("hudi", forHostPath(configDir.getPath("hudi.properties")));
 
@@ -92,7 +88,7 @@ public void extendEnvironment(Environment.Builder builder)
         FileAttribute<Set<PosixFilePermission>> posixFilePermissions = PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rw-r--r--"));
         Path minioBucketDirectory;
         try {
-            minioBucketDirectory = Files.createTempDirectory("trino-ci-test", posixFilePermissions);
+            minioBucketDirectory = Files.createTempDirectory("test-bucket-contents", posixFilePermissions);
             minioBucketDirectory.toFile().deleteOnExit();
         }
         catch (IOException e) {
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveIcebergRedirections.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveIcebergRedirections.java
index 3c1288bae314..46c646ebead1 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveIcebergRedirections.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveIcebergRedirections.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveImpersonation.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveImpersonation.java
index 4328419dcb4d..4428996b31a0 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveImpersonation.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveImpersonation.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHudi.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHudi.java
index ad020c483caa..134aaa54934e 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHudi.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHudi.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -25,8 +26,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
@@ -57,7 +56,7 @@ public class EnvSinglenodeHudi
     private static final int SPARK_THRIFT_PORT = 10213;
 
     private static final String SPARK_CONTAINER_NAME = "spark";
-    private static final String S3_BUCKET_NAME = "trino-ci-test";
+    private static final String S3_BUCKET_NAME = "test-bucket";
 
     private final PortBinder portBinder;
     private final String hadoopImagesVersion;
@@ -81,8 +80,6 @@ public EnvSinglenodeHudi(
     @Override
     public void extendEnvironment(Environment.Builder builder)
     {
-        // Using hdp3.1 so we are using Hive metastore with version close to versions of hive-*.jars Spark uses
-        builder.configureContainer(HADOOP, container -> container.setDockerImageName("ghcr.io/trinodb/testing/hdp3.1-hive:" + hadoopImagesVersion));
         builder.addConnector(
                 "hive",
                 forHostPath(configDir.getPath("hive.properties")),
@@ -102,7 +99,7 @@ public void extendEnvironment(Environment.Builder builder)
         FileAttribute<Set<PosixFilePermission>> posixFilePermissions = PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rw-r--r--"));
         Path minioBucketDirectory;
         try {
-            minioBucketDirectory = Files.createTempDirectory("trino-ci-test", posixFilePermissions);
+            minioBucketDirectory = Files.createTempDirectory("test-bucket-contents", posixFilePermissions);
             minioBucketDirectory.toFile().deleteOnExit();
         }
         catch (IOException e) {
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonation.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonation.java
index 276ff1ef247e..96e572e3f5be 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonation.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonation.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentProvider;
@@ -21,8 +22,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationCrossRealm.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationCrossRealm.java
index 855a5557b55e..020def2481c7 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationCrossRealm.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationCrossRealm.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationWithDataProtection.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationWithDataProtection.java
index 984e9d9e1400..ec2d3ba861df 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationWithDataProtection.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationWithDataProtection.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationWithWireEncryption.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationWithWireEncryption.java
index cb140f34a1ea..cf0d1ec01b8e 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationWithWireEncryption.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationWithWireEncryption.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsNoImpersonation.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsNoImpersonation.java
index bd39531a21f9..9e576d648cab 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsNoImpersonation.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsNoImpersonation.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHiveImpersonation.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHiveImpersonation.java
index 46617907ed19..4d20443d6a58 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHiveImpersonation.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHiveImpersonation.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHiveImpersonationWithCredentialCache.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHiveImpersonationWithCredentialCache.java
index 310253405e9c..28cb19ddb925 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHiveImpersonationWithCredentialCache.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHiveImpersonationWithCredentialCache.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHiveNoImpersonationWithCredentialCache.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHiveNoImpersonationWithCredentialCache.java
index 6ff9b23dd610..d41af110ae20 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHiveNoImpersonationWithCredentialCache.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHiveNoImpersonationWithCredentialCache.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsImpersonation.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsImpersonation.java
index 35dc17a1d5d6..ccf4de0b06bb 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsImpersonation.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsImpersonation.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsImpersonationWithCredentialCache.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsImpersonationWithCredentialCache.java
index 3409dcbe2727..111c5a7e0b6d 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsImpersonationWithCredentialCache.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsImpersonationWithCredentialCache.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsNoImpersonation.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsNoImpersonation.java
index cf579edbf340..caaaadc4ac90 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsNoImpersonation.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsNoImpersonation.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsNoImpersonationWithCredentialCache.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsNoImpersonationWithCredentialCache.java
index 3188c88b6dab..c9929f1ea8e5 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsNoImpersonationWithCredentialCache.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosKmsHdfsNoImpersonationWithCredentialCache.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 
-import javax.inject.Inject;
-
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdap.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdap.java
index 1e92e1aaecf8..b8ae6d5ab357 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdap.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdap.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.env.common.Hadoop;
@@ -21,8 +22,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 @TestsEnvironment
 public class EnvSinglenodeLdap
         extends AbstractEnvSinglenodeLdap
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapAndFile.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapAndFile.java
index d9b48880d84e..88e60c7ba291 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapAndFile.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapAndFile.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.Environment;
@@ -23,8 +24,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapBindDn.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapBindDn.java
index 280a8ee4735d..242f88f4f75d 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapBindDn.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapBindDn.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.env.common.Hadoop;
@@ -21,8 +22,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 @TestsEnvironment
 public class EnvSinglenodeLdapBindDn
         extends AbstractEnvSinglenodeLdap
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapInsecure.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapInsecure.java
index ed2a75638b4f..945cb497c551 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapInsecure.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapInsecure.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.Environment;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
@@ -22,8 +23,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import static java.util.Objects.requireNonNull;
 
 @TestsEnvironment
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapReferrals.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapReferrals.java
index 1b3678b16a42..3bdaec291a5b 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapReferrals.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapReferrals.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.env.common.Hadoop;
@@ -21,8 +22,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 @TestsEnvironment
 public class EnvSinglenodeLdapReferrals
         extends AbstractEnvSinglenodeLdap
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java
index 0d20572ad6bc..af8d05b8a8e4 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -24,8 +25,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java
index 4ceb613ee716..a84abe024858 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -24,8 +25,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java
index 63f72030382f..2b1f0b92e7ad 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -24,8 +25,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2Refresh.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2Refresh.java
index 020095be4b5c..082a4b0716c5 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2Refresh.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2Refresh.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -24,8 +25,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidc.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidc.java
index 491467644419..7ea79bf6efc7 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidc.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidc.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -24,8 +25,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES;
 import static java.util.Objects.requireNonNull;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidcRefresh.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidcRefresh.java
index 44fc59a53b20..033588503511 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidcRefresh.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidcRefresh.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -24,8 +25,6 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES;
 import static java.util.Objects.requireNonNull;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHive.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHive.java
index 2fe141956b24..5c1dfa73bb36 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHive.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHive.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -25,13 +26,10 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
-import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
+import static io.trino.tests.product.launcher.env.EnvironmentDefaults.HADOOP_BASE_IMAGE;
 import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_HADOOP_INIT_D;
-import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TEMPTO_PROFILE_CONFIG;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
@@ -57,19 +55,11 @@ public EnvSinglenodeSparkHive(Standard standard, Hadoop hadoop, DockerFiles dock
     @Override
     public void extendEnvironment(Environment.Builder builder)
     {
-        String dockerImageName = "ghcr.io/trinodb/testing/hdp3.1-hive:" + hadoopImagesVersion;
-
         builder.configureContainer(HADOOP, dockerContainer -> {
-            dockerContainer.setDockerImageName(dockerImageName);
-            dockerContainer.withCopyFileToContainer(
-                    forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-hdp3/apply-hdp3-config.sh")),
-                    CONTAINER_HADOOP_INIT_D + "apply-hdp3-config.sh");
-        });
-
-        builder.configureContainer(TESTS, dockerContainer -> {
+            dockerContainer.setDockerImageName(HADOOP_BASE_IMAGE);
             dockerContainer.withCopyFileToContainer(
-                    forHostPath(dockerFiles.getDockerFilesHostPath("conf/tempto/tempto-configuration-for-hive3.yaml")),
-                    CONTAINER_TEMPTO_PROFILE_CONFIG);
+                    forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-hive-acid/apply-hive-config.sh")),
+                    CONTAINER_HADOOP_INIT_D + "apply-hive-config.sh");
         });
 
         builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-hive/hive.properties")));
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHiveNoStatsFallback.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHiveNoStatsFallback.java
index 7ae4eb9cd15f..6f0555c367c8 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHiveNoStatsFallback.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHiveNoStatsFallback.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -26,8 +27,6 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
 import static java.util.Objects.requireNonNull;
@@ -56,7 +55,6 @@ public EnvSinglenodeSparkHiveNoStatsFallback(Standard standard, Hadoop hadoop, D
     @Override
     public void extendEnvironment(Environment.Builder builder)
     {
-        builder.configureContainer(HADOOP, container -> container.setDockerImageName("ghcr.io/trinodb/testing/hdp3.1-hive:" + hadoopImagesVersion));
         builder.addConnector("hive", forHostPath(configDir.getPath("hive.properties")));
         builder.addContainer(createSpark()).containerDependsOn("spark", HADOOP);
     }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java
index 8bcaa3415d22..da45501d6b7f 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -25,13 +26,10 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
-import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
+import static io.trino.tests.product.launcher.env.EnvironmentDefaults.HADOOP_BASE_IMAGE;
 import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_HADOOP_INIT_D;
-import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TEMPTO_PROFILE_CONFIG;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
@@ -57,21 +55,13 @@ public EnvSinglenodeSparkIceberg(Standard standard, Hadoop hadoop, DockerFiles d
     @Override
     public void extendEnvironment(Environment.Builder builder)
     {
-        String dockerImageName = "ghcr.io/trinodb/testing/hdp3.1-hive:" + hadoopImagesVersion;
-
         builder.configureContainer(HADOOP, container -> {
-            container.setDockerImageName(dockerImageName);
+            container.setDockerImageName(HADOOP_BASE_IMAGE);
             container.withCopyFileToContainer(
                     forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg/apply-hive-config-for-iceberg.sh")),
                     CONTAINER_HADOOP_INIT_D + "/apply-hive-config-for-iceberg.sh");
         });
 
-        builder.configureContainer(TESTS, dockerContainer -> {
-            dockerContainer.withCopyFileToContainer(
-                    forHostPath(dockerFiles.getDockerFilesHostPath("conf/tempto/tempto-configuration-for-hive3.yaml")),
-                    CONTAINER_TEMPTO_PROFILE_CONFIG);
-        });
-
         builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg/iceberg.properties")));
 
         builder.addContainer(createSpark())
@@ -86,6 +76,9 @@ private DockerContainer createSpark()
                 .withCopyFileToContainer(
                         forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg/spark-defaults.conf")),
                         "/spark/conf/spark-defaults.conf")
+                .withCopyFileToContainer(
+                        forHostPath(dockerFiles.getDockerFilesHostPath("common/spark/log4j2.properties")),
+                        "/spark/conf/log4j2.properties")
                 .withCommand(
                         "spark-submit",
                         "--master", "local[*]",
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergJdbcCatalog.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergJdbcCatalog.java
index 323aa02a30a3..acb4f5ae5094 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergJdbcCatalog.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergJdbcCatalog.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -25,13 +26,10 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
-import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
+import static io.trino.tests.product.launcher.env.EnvironmentDefaults.HADOOP_BASE_IMAGE;
 import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_HADOOP_INIT_D;
-import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TEMPTO_PROFILE_CONFIG;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
@@ -61,21 +59,13 @@ public EnvSinglenodeSparkIcebergJdbcCatalog(Standard standard, Hadoop hadoop, Do
     @Override
     public void extendEnvironment(Environment.Builder builder)
     {
-        String dockerImageName = "ghcr.io/trinodb/testing/hdp3.1-hive:" + hadoopImagesVersion;
-
         builder.configureContainer(HADOOP, container -> {
-            container.setDockerImageName(dockerImageName);
+            container.setDockerImageName(HADOOP_BASE_IMAGE);
             container.withCopyFileToContainer(
                     forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg/apply-hive-config-for-iceberg.sh")),
                     CONTAINER_HADOOP_INIT_D + "/apply-hive-config-for-iceberg.sh");
         });
 
-        builder.configureContainer(TESTS, dockerContainer -> {
-            dockerContainer.withCopyFileToContainer(
-                    forHostPath(dockerFiles.getDockerFilesHostPath("conf/tempto/tempto-configuration-for-hive3.yaml")),
-                    CONTAINER_TEMPTO_PROFILE_CONFIG);
-        });
-
         builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg-jdbc-catalog/iceberg.properties")));
 
         builder.addContainer(createPostgreSql());
@@ -112,6 +102,9 @@ private DockerContainer createSpark()
                     .withCopyFileToContainer(
                             forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg-jdbc-catalog/spark-defaults.conf")),
                             "/spark/conf/spark-defaults.conf")
+                    .withCopyFileToContainer(
+                            forHostPath(dockerFiles.getDockerFilesHostPath("common/spark/log4j2.properties")),
+                            "/spark/conf/log4j2.properties")
                     .withCommand(
                             "spark-submit",
                             "--master", "local[*]",
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergNessie.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergNessie.java
new file mode 100644
index 000000000000..4c3a9857083c
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergNessie.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.environment;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import io.trino.tests.product.launcher.docker.DockerFiles;
+import io.trino.tests.product.launcher.env.DockerContainer;
+import io.trino.tests.product.launcher.env.Environment;
+import io.trino.tests.product.launcher.env.EnvironmentConfig;
+import io.trino.tests.product.launcher.env.EnvironmentProvider;
+import io.trino.tests.product.launcher.env.common.Hadoop;
+import io.trino.tests.product.launcher.env.common.Standard;
+import io.trino.tests.product.launcher.env.common.TestsEnvironment;
+import io.trino.tests.product.launcher.testcontainers.PortBinder;
+import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
+
+import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
+import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
+import static java.util.Objects.requireNonNull;
+import static org.testcontainers.utility.MountableFile.forHostPath;
+
+@TestsEnvironment
+public class EnvSinglenodeSparkIcebergNessie
+        extends EnvironmentProvider
+{
+    private static final int SPARK_THRIFT_PORT = 10213;
+    private static final int NESSIE_PORT = 19120;
+    private static final String NESSIE_VERSION = "0.71.0";
+    private static final String SPARK = "spark";
+
+    private final DockerFiles dockerFiles;
+    private final PortBinder portBinder;
+    private final String hadoopImagesVersion;
+
+    @Inject
+    public EnvSinglenodeSparkIcebergNessie(Standard standard, Hadoop hadoop, DockerFiles dockerFiles, EnvironmentConfig config, PortBinder portBinder)
+    {
+        super(ImmutableList.of(standard, hadoop));
+        this.dockerFiles = requireNonNull(dockerFiles, "dockerFiles is null");
+        this.portBinder = requireNonNull(portBinder, "portBinder is null");
+        this.hadoopImagesVersion = requireNonNull(config, "config is null").getHadoopImagesVersion();
+    }
+
+    @Override
+    public void extendEnvironment(Environment.Builder builder)
+    {
+        builder.addContainer(createNessieContainer());
+        builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg-nessie/iceberg.properties")));
+
+        builder.addContainer(createSparkContainer()).containerDependsOn(SPARK, HADOOP);
+    }
+
+    @SuppressWarnings("resource")
+    private DockerContainer createSparkContainer()
+    {
+        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:" + hadoopImagesVersion, SPARK)
+                .withEnv("HADOOP_USER_NAME", "hive")
+                .withCopyFileToContainer(
+                        forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg-nessie/spark-defaults.conf")),
+                        "/spark/conf/spark-defaults.conf")
+                .withCopyFileToContainer(
+                        forHostPath(dockerFiles.getDockerFilesHostPath("common/spark/log4j2.properties")),
+                        "/spark/conf/log4j2.properties")
+                .withCommand(
+                        "spark-submit",
+                        "--master", "local[*]",
+                        "--class", "org.apache.spark.sql.hive.thriftserver.HiveThriftServer2",
+                        "--name", "Thrift JDBC/ODBC Server",
+                        "--conf", "spark.hive.server2.thrift.port=" + SPARK_THRIFT_PORT,
+                        "spark-internal")
+                .withStartupCheckStrategy(new IsRunningStartupCheckStrategy())
+                .waitingFor(forSelectedPorts(SPARK_THRIFT_PORT));
+
+        portBinder.exposePort(container, SPARK_THRIFT_PORT);
+        return container;
+    }
+
+    private DockerContainer createNessieContainer()
+    {
+        DockerContainer container = new DockerContainer("projectnessie/nessie:" + NESSIE_VERSION, "nessie-server")
+                .withEnv("NESSIE_VERSION_STORE_TYPE", "INMEMORY")
+                .withEnv("QUARKUS_HTTP_PORT", Integer.valueOf(NESSIE_PORT).toString())
+                .withStartupCheckStrategy(new IsRunningStartupCheckStrategy())
+                .waitingFor(forSelectedPorts(NESSIE_PORT));
+
+        portBinder.exposePort(container, NESSIE_PORT);
+        return container;
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergRest.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergRest.java
index aeced013c34f..f427a0bb8eff 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergRest.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergRest.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.env.DockerContainer;
 import io.trino.tests.product.launcher.env.Environment;
@@ -25,8 +26,6 @@
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
 import static java.util.Objects.requireNonNull;
@@ -43,7 +42,7 @@ public class EnvSinglenodeSparkIcebergRest
     private static final int REST_SERVER_PORT = 8181;
     private static final String SPARK_CONTAINER_NAME = "spark";
     private static final String REST_CONTAINER_NAME = "iceberg-with-rest";
-    private static final String REST_SERVER_IMAGE = "tabulario/iceberg-rest:0.2.0";
+    private static final String REST_SERVER_IMAGE = "tabulario/iceberg-rest:0.4.0";
     private static final String CATALOG_WAREHOUSE = "hdfs://hadoop-master:9000/user/hive/warehouse";
 
     private final DockerFiles dockerFiles;
@@ -91,6 +90,10 @@ private DockerContainer createSparkContainer()
                         forHostPath(dockerFiles.getDockerFilesHostPath(
                                 "conf/environment/singlenode-spark-iceberg-rest/spark-defaults.conf")),
                         "/spark/conf/spark-defaults.conf")
+                .withCopyFileToContainer(
+                        forHostPath(dockerFiles.getDockerFilesHostPath(
+                                "common/spark/log4j2.properties")),
+                        "/spark/conf/log4j2.properties")
                 .withCommand(
                         "spark-submit",
                         "--master", "local[*]",
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoKerberosHives.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoKerberosHives.java
index 824b2ac3df94..917e8fe5210c 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoKerberosHives.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoKerberosHives.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Closer;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -25,9 +26,7 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
-
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -133,6 +132,9 @@ private DockerContainer createHadoopMaster2(String keytabsHostDirectory)
                 .withFileSystemBind(keytabsHostDirectory, "/presto_keytabs", READ_WRITE)
                 .withCopyFileToContainer(
                         forHostPath(configDir.getPath("hadoop-master-2-copy-keytabs.sh")),
-                        CONTAINER_HADOOP_INIT_D + "copy-kerberos.sh");
+                        CONTAINER_HADOOP_INIT_D + "copy-kerberos.sh")
+                .withCopyFileToContainer(
+                        forHostPath(configDir.getPath("update-location.sh")),
+                        CONTAINER_HADOOP_INIT_D + "update-location.sh");
     }
 }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoMixedHives.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoMixedHives.java
index 5fc4c22085e8..4e04864906dc 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoMixedHives.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoMixedHives.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.launcher.env.environment;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tests.product.launcher.docker.DockerFiles;
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 import io.trino.tests.product.launcher.env.DockerContainer;
@@ -25,9 +26,8 @@
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
 
-import javax.inject.Inject;
-
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
+import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_HADOOP_INIT_D;
 import static io.trino.tests.product.launcher.env.common.Hadoop.createHadoopContainer;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
 import static java.util.Objects.requireNonNull;
@@ -83,11 +83,17 @@ private DockerContainer createHadoopMaster2()
                 .withCopyFileToContainer(
                         forHostPath(configDir.getPath("hadoop-master-2/core-site.xml")),
                         "/etc/hadoop/conf/core-site.xml")
+                .withCopyFileToContainer(
+                        forHostPath(configDir.getPath("hadoop-master-2/hdfs-site.xml")),
+                        "/etc/hadoop/conf/hdfs-site.xml")
                 .withCopyFileToContainer(
                         forHostPath(configDir.getPath("hadoop-master-2/mapred-site.xml")),
                         "/etc/hadoop/conf/mapred-site.xml")
                 .withCopyFileToContainer(
                         forHostPath(configDir.getPath("hadoop-master-2/yarn-site.xml")),
-                        "/etc/hadoop/conf/yarn-site.xml");
+                        "/etc/hadoop/conf/yarn-site.xml")
+                .withCopyFileToContainer(
+                        forHostPath(configDir.getPath("hadoop-master-2/update-location.sh")),
+                        CONTAINER_HADOOP_INIT_D + "update-location.sh");
     }
 }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/AdoptiumApiResolvingJdkProvider.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/AdoptiumApiResolvingJdkProvider.java
new file mode 100644
index 000000000000..f84fba2a112a
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/AdoptiumApiResolvingJdkProvider.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.jdk;
+
+import io.trino.testing.containers.TestContainers;
+import io.trino.tests.product.launcher.env.EnvironmentOptions;
+
+public abstract class AdoptiumApiResolvingJdkProvider
+        extends TarDownloadingJdkProvider
+{
+    public AdoptiumApiResolvingJdkProvider(EnvironmentOptions environmentOptions)
+    {
+        super(environmentOptions);
+    }
+
+    protected abstract String getReleaseName();
+
+    @Override
+    public String getDescription()
+    {
+        return "Temurin " + getReleaseName();
+    }
+
+    @Override
+    protected String getDownloadUri(TestContainers.DockerArchitecture architecture)
+    {
+        return switch (architecture) {
+            case AMD64 -> "https://api.adoptium.net/v3/binary/version/%s/linux/%s/jdk/hotspot/normal/eclipse?project=jdk".formatted(getReleaseName(), "x64");
+            case ARM64 -> "https://api.adoptium.net/v3/binary/version/%s/linux/%s/jdk/hotspot/normal/eclipse?project=jdk".formatted(getReleaseName(), "aarch64");
+            default -> throw new UnsupportedOperationException("Fetching Temurin JDK for arch " + architecture + " is not supported");
+        };
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/BuiltInJdkProvider.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/BuiltInJdkProvider.java
new file mode 100644
index 000000000000..b2446232da5c
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/BuiltInJdkProvider.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.jdk;
+
+import io.trino.tests.product.launcher.env.DockerContainer;
+
+import static io.trino.tests.product.launcher.Configurations.nameForJdkProvider;
+
+public class BuiltInJdkProvider
+        implements JdkProvider
+{
+    public static final String BUILT_IN_NAME = nameForJdkProvider(BuiltInJdkProvider.class);
+
+    @Override
+    public DockerContainer applyTo(DockerContainer container)
+    {
+        return container;
+    }
+
+    @Override
+    public String getJavaHome()
+    {
+        // This is provided by docker image
+        return "/usr/lib/jvm/zulu-17";
+    }
+
+    @Override
+    public String getDescription()
+    {
+        return "JDK provider by base image";
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/JdkProvider.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/JdkProvider.java
new file mode 100644
index 000000000000..d3c10f65813f
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/JdkProvider.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.jdk;
+
+import io.trino.tests.product.launcher.env.DockerContainer;
+
+import static io.trino.tests.product.launcher.Configurations.nameForJdkProvider;
+
+public interface JdkProvider
+{
+    DockerContainer applyTo(DockerContainer container);
+
+    String getJavaHome();
+
+    String getDescription();
+
+    default String getJavaCommand()
+    {
+        return getJavaHome() + "/bin/java";
+    }
+
+    default String getName()
+    {
+        return nameForJdkProvider(this.getClass());
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/JdkProviderFactory.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/JdkProviderFactory.java
new file mode 100644
index 000000000000..4dea4f0b9c5b
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/JdkProviderFactory.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.jdk;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Ordering;
+import com.google.inject.Inject;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+public class JdkProviderFactory
+{
+    private final Map<String, JdkProvider> providers;
+
+    @Inject
+    public JdkProviderFactory(Map<String, JdkProvider> providers)
+    {
+        this.providers = ImmutableMap.copyOf(requireNonNull(providers, "providers is null"));
+    }
+
+    public JdkProvider get(String name)
+    {
+        checkArgument(providers.containsKey(name), "No JDK provider with name '%s'. Those do exist, however: %s", name, list());
+        return providers.get(name);
+    }
+
+    public List<String> list()
+    {
+        return Ordering.natural().sortedCopy(providers.keySet());
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/TarDownloadingJdkProvider.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/TarDownloadingJdkProvider.java
new file mode 100644
index 000000000000..8ce2d01a940e
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/TarDownloadingJdkProvider.java
@@ -0,0 +1,206 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.jdk;
+
+import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Volume;
+import io.airlift.log.Logger;
+import io.trino.testing.containers.TestContainers.DockerArchitecture;
+import io.trino.testing.containers.TestContainers.DockerArchitectureInfo;
+import io.trino.tests.product.launcher.env.DockerContainer;
+import io.trino.tests.product.launcher.env.EnvironmentOptions;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
+import org.apache.commons.compress.utils.IOUtils;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static com.google.common.base.Verify.verify;
+import static io.trino.testing.containers.TestContainers.getDockerArchitectureInfo;
+import static io.trino.tests.product.launcher.util.DirectoryUtils.getOnlyDescendant;
+import static io.trino.tests.product.launcher.util.UriDownloader.download;
+import static java.nio.file.Files.exists;
+import static java.nio.file.Files.isDirectory;
+import static java.util.Locale.ENGLISH;
+import static java.util.Objects.requireNonNull;
+
+public abstract class TarDownloadingJdkProvider
+        implements JdkProvider
+{
+    private final Path downloadPath;
+    private final Logger log = Logger.get(getClass());
+
+    public TarDownloadingJdkProvider(EnvironmentOptions environmentOptions)
+    {
+        try {
+            this.downloadPath = firstNonNull(environmentOptions.jdkDownloadPath, Files.createTempDirectory("ptl-temp-path"));
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    protected abstract String getDownloadUri(DockerArchitecture architecture);
+
+    @Override
+    public String getJavaHome()
+    {
+        return "/usr/lib/jvm/" + getName();
+    }
+
+    @Override
+    public DockerContainer applyTo(DockerContainer container)
+    {
+        ensureDownloadPathExists();
+        String javaHome = getJavaHome();
+        return container
+                .withCreateContainerCmdModifier(cmd -> {
+                    DockerArchitectureInfo architecture = getDockerArchitectureInfo(DockerImageName.parse(container.getDockerImageName()));
+                    String downloadUri = getDownloadUri(architecture.imageArch());
+                    String fullName = "JDK distribution '%s' for %s".formatted(getDescription(), architecture.imageArch());
+
+                    verify(!isNullOrEmpty(downloadUri), "There is no download uri for " + fullName);
+                    Path targetDownloadPath = downloadPath.resolve(getName() + "-" + architecture.imageArch().toString().toLowerCase(ENGLISH) + ".tar.gz");
+                    Path extractPath = downloadPath.resolve(getName() + "-" + architecture.imageArch().toString().toLowerCase(ENGLISH));
+
+                    synchronized (TarDownloadingJdkProvider.this) {
+                        if (exists(targetDownloadPath)) {
+                            log.info("%s already downloaded to %s", fullName, targetDownloadPath);
+                        }
+                        else if (!exists(extractPath)) { // Distribution not extracted and not downloaded yet
+                            log.info("Downloading %s from %s to %s", fullName, downloadUri, targetDownloadPath);
+                            download(downloadUri, targetDownloadPath, new EveryNthPercentProgress(progress -> log.info("Downloading %s %d%%...", fullName, progress), 5));
+                            log.info("Downloaded %s to %s", fullName, targetDownloadPath);
+                        }
+
+                        if (exists(extractPath)) {
+                            log.info("%s already extracted to %s", fullName, extractPath);
+                        }
+                        else {
+                            extractTar(targetDownloadPath, extractPath);
+                            try {
+                                Files.deleteIfExists(targetDownloadPath);
+                            }
+                            catch (IOException e) {
+                                throw new UncheckedIOException(e);
+                            }
+                        }
+                    }
+
+                    Path javaHomePath = getOnlyDescendant(extractPath);
+                    verify(exists(javaHomePath.resolve("bin/java")), "bin/java does not exist in %s", javaHomePath);
+
+                    log.info("Mounting %s from %s in container '%s':%s", fullName, javaHomePath, container.getLogicalName(), javaHome);
+
+                    Bind[] binds = cmd.getHostConfig().getBinds();
+                    binds = Arrays.copyOf(binds, binds.length + 1);
+                    binds[binds.length - 1] = new Bind(
+                            javaHomePath.toAbsolutePath().toString(),
+                            new Volume(javaHome),
+                            AccessMode.rw);
+                    cmd.getHostConfig().setBinds(binds);
+                })
+                .withEnv("JAVA_HOME", javaHome);
+    }
+
+    private static void extractTar(Path filePath, Path extractPath)
+    {
+        try {
+            try (TarArchiveInputStream archiveStream = new TarArchiveInputStream(new GzipCompressorInputStream(new FileInputStream(filePath.toFile())))) {
+                TarArchiveEntry entry;
+                while ((entry = archiveStream.getNextTarEntry()) != null) {
+                    if (!archiveStream.canReadEntryData(entry)) {
+                        continue;
+                    }
+                    if (entry.isDirectory()) {
+                        continue;
+                    }
+                    File currentFile = extractPath.resolve(entry.getName()).toFile();
+                    File parent = currentFile.getParentFile();
+                    if (!parent.exists()) {
+                        verify(parent.mkdirs(), "Could not create directory %s", parent);
+                    }
+                    try (OutputStream output = Files.newOutputStream(currentFile.toPath())) {
+                        IOUtils.copy(archiveStream, output, 16 * 1024);
+
+                        boolean isExecutable = (entry.getMode() & 0100) > 0;
+                        if (isExecutable) {
+                            verify(currentFile.setExecutable(true), "Could not set file %s as executable", currentFile.getAbsolutePath());
+                        }
+                    }
+                }
+            }
+        }
+        catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void ensureDownloadPathExists()
+    {
+        if (!exists(downloadPath)) {
+            try {
+                Files.createDirectories(downloadPath);
+            }
+            catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+
+        verify(isDirectory(downloadPath), "--jdk-tmp-download-path '%s' is not a directory", downloadPath);
+    }
+
+    private static class EveryNthPercentProgress
+            implements Consumer<Integer>
+    {
+        private final AtomicInteger currentProgress = new AtomicInteger(0);
+        private final Consumer<Integer> delegate;
+        private final int n;
+
+        public EveryNthPercentProgress(Consumer<Integer> delegate, int n)
+        {
+            this.delegate = requireNonNull(delegate, "delegate is null");
+            this.n = n;
+        }
+
+        @Override
+        public void accept(Integer percent)
+        {
+            int currentBand = currentProgress.get() / n;
+            int band = percent / n;
+
+            if (band == currentBand) {
+                return;
+            }
+
+            if (currentProgress.compareAndSet(currentBand * n, band * n)) {
+                delegate.accept(percent);
+            }
+        }
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/Temurin19JdkProvider.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/Temurin19JdkProvider.java
new file mode 100644
index 000000000000..45d3c727536f
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/Temurin19JdkProvider.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.jdk;
+
+import com.google.inject.Inject;
+import io.trino.tests.product.launcher.env.EnvironmentOptions;
+
+public class Temurin19JdkProvider
+        extends AdoptiumApiResolvingJdkProvider
+{
+    @Inject
+    public Temurin19JdkProvider(EnvironmentOptions environmentOptions)
+    {
+        super(environmentOptions);
+    }
+
+    @Override
+    protected String getReleaseName()
+    {
+        return "jdk-19.0.2+7";
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/Temurin20JdkProvider.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/Temurin20JdkProvider.java
new file mode 100644
index 000000000000..65ae7713e642
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/Temurin20JdkProvider.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.jdk;
+
+import com.google.inject.Inject;
+import io.trino.tests.product.launcher.env.EnvironmentOptions;
+
+public class Temurin20JdkProvider
+        extends AdoptiumApiResolvingJdkProvider
+{
+    @Inject
+    public Temurin20JdkProvider(EnvironmentOptions environmentOptions)
+    {
+        super(environmentOptions);
+    }
+
+    @Override
+    protected String getReleaseName()
+    {
+        return "jdk-20.0.2+9";
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/Temurin21JdkProvider.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/Temurin21JdkProvider.java
new file mode 100644
index 000000000000..a29d12cae591
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/jdk/Temurin21JdkProvider.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.env.jdk;
+
+import com.google.inject.Inject;
+import io.trino.tests.product.launcher.env.EnvironmentOptions;
+
+public class Temurin21JdkProvider
+        extends AdoptiumApiResolvingJdkProvider
+{
+    @Inject
+    public Temurin21JdkProvider(EnvironmentOptions environmentOptions)
+    {
+        super(environmentOptions);
+    }
+
+    @Override
+    protected String getReleaseName()
+    {
+        return "jdk-21.0.1+12";
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/SuiteFactory.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/SuiteFactory.java
index fc63c031fbea..da4fb3b03dc8 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/SuiteFactory.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/SuiteFactory.java
@@ -14,8 +14,7 @@
 package io.trino.tests.product.launcher.suite;
 
 import com.google.common.collect.Ordering;
-
-import javax.inject.Inject;
+import com.google.inject.Inject;
 
 import java.util.List;
 import java.util.Map;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite1.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite1.java
index f663bdcf45ca..b13727846468 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite1.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite1.java
@@ -36,6 +36,7 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
                                 "cli",
                                 "jdbc",
                                 "trino_jdbc",
+                                "jdbc_kerberos_constrained_delegation",
                                 "functions",
                                 "hive_compression",
                                 "large_query",
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite2.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite2.java
index 88e8235f3f93..dbf588f70a66 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite2.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite2.java
@@ -36,6 +36,7 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
         return ImmutableList.of(
                 testOnEnvironment(EnvMultinode.class)
                         .withGroups("configured_features", "hdfs_no_impersonation")
+                        .withExcludedTests("io.trino.tests.product.TestImpersonation.testExternalLocationTableCreationSuccess")
                         .build(),
                 testOnEnvironment(EnvSinglenodeKerberosHdfsNoImpersonation.class)
                         .withGroups("configured_features", "storage_formats", "hdfs_no_impersonation", "hive_kerberos")
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite3.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite3.java
index eeec64f77a6e..dff21ceec753 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite3.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite3.java
@@ -49,7 +49,7 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
                         .withTests("TestHiveStorageFormats.testOrcTableCreatedInTrino", "TestHiveCreateTable.testCreateTable")
                         .build(),
                 testOnEnvironment(EnvMultinodeTlsKerberosDelegation.class)
-                        .withGroups("configured_features", "jdbc")
+                        .withGroups("configured_features", "jdbc", "jdbc_kerberos_constrained_delegation")
                         .build());
     }
 }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite8NonGeneric.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite8NonGeneric.java
index f4e4e0d00361..be6a4c7860e3 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite8NonGeneric.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite8NonGeneric.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
 import io.trino.tests.product.launcher.env.EnvironmentDefaults;
-import io.trino.tests.product.launcher.env.environment.EnvSinglenodeHdp3;
+import io.trino.tests.product.launcher.env.environment.EnvSinglenodeHiveAcid;
 import io.trino.tests.product.launcher.suite.Suite;
 import io.trino.tests.product.launcher.suite.SuiteTestRun;
 
@@ -34,7 +34,7 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
         verify(config.getHadoopBaseImage().equals(EnvironmentDefaults.HADOOP_BASE_IMAGE), "The suite should be run with default HADOOP_BASE_IMAGE. Leave HADOOP_BASE_IMAGE unset.");
 
         return ImmutableList.of(
-                testOnEnvironment(EnvSinglenodeHdp3.class)
+                testOnEnvironment(EnvSinglenodeHiveAcid.class)
                         .withGroups("configured_features", "hdp3_only", "hive_transactional")
                         .build());
     }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks104.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks104.java
index ca14a819bdd5..e5a127728d24 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks104.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks104.java
@@ -31,7 +31,7 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
     {
         return ImmutableList.of(
                 testOnEnvironment(EnvSinglenodeDeltaLakeDatabricks104.class)
-                        .withGroups("configured_features", "delta-lake-databricks")
+                        .withGroups("configured_features", "delta-lake-databricks-104")
                         .withExcludedTests(getExcludedTests())
                         .build());
     }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks113.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks113.java
index 989ba6495b90..659e0556550b 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks113.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks113.java
@@ -31,8 +31,7 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
     {
         return ImmutableList.of(
                 testOnEnvironment(EnvSinglenodeDeltaLakeDatabricks113.class)
-                        .withGroups("configured_features", "delta-lake-databricks")
-                        .withExcludedGroups("delta-lake-exclude-113")
+                        .withGroups("configured_features", "delta-lake-databricks-113")
                         .withExcludedTests(getExcludedTests())
                         .build());
     }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks122.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks122.java
new file mode 100644
index 000000000000..4751b9e31e0b
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks122.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.suite.suites;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.tests.product.launcher.env.EnvironmentConfig;
+import io.trino.tests.product.launcher.env.environment.EnvSinglenodeDeltaLakeDatabricks122;
+import io.trino.tests.product.launcher.suite.SuiteDeltaLakeDatabricks;
+import io.trino.tests.product.launcher.suite.SuiteTestRun;
+
+import java.util.List;
+
+import static io.trino.tests.product.launcher.suite.SuiteTestRun.testOnEnvironment;
+
+public class SuiteDeltaLakeDatabricks122
+        extends SuiteDeltaLakeDatabricks
+{
+    @Override
+    public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
+    {
+        return ImmutableList.of(
+                testOnEnvironment(EnvSinglenodeDeltaLakeDatabricks122.class)
+                        .withGroups("configured_features", "delta-lake-databricks-122")
+                        .withExcludedTests(getExcludedTests())
+                        .build());
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks133.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks133.java
new file mode 100644
index 000000000000..dff965e3fe22
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks133.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.suite.suites;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.tests.product.launcher.env.EnvironmentConfig;
+import io.trino.tests.product.launcher.env.environment.EnvSinglenodeDeltaLakeDatabricks133;
+import io.trino.tests.product.launcher.suite.SuiteDeltaLakeDatabricks;
+import io.trino.tests.product.launcher.suite.SuiteTestRun;
+
+import java.util.List;
+
+import static io.trino.tests.product.launcher.suite.SuiteTestRun.testOnEnvironment;
+
+public class SuiteDeltaLakeDatabricks133
+        extends SuiteDeltaLakeDatabricks
+{
+    @Override
+    public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
+    {
+        return ImmutableList.of(
+                testOnEnvironment(EnvSinglenodeDeltaLakeDatabricks133.class)
+                        .withGroups("configured_features", "delta-lake-databricks")
+                        .withExcludedGroups("delta-lake-exclude-133")
+                        .withExcludedTests(getExcludedTests())
+                        .build());
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks73.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks73.java
deleted file mode 100644
index f1749758aa57..000000000000
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks73.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.launcher.suite.suites;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.tests.product.launcher.env.EnvironmentConfig;
-import io.trino.tests.product.launcher.env.environment.EnvSinglenodeDeltaLakeDatabricks73;
-import io.trino.tests.product.launcher.suite.SuiteDeltaLakeDatabricks;
-import io.trino.tests.product.launcher.suite.SuiteTestRun;
-
-import java.util.List;
-
-import static io.trino.tests.product.launcher.suite.SuiteTestRun.testOnEnvironment;
-
-public class SuiteDeltaLakeDatabricks73
-        extends SuiteDeltaLakeDatabricks
-{
-    @Override
-    public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
-    {
-        return ImmutableList.of(
-                testOnEnvironment(EnvSinglenodeDeltaLakeDatabricks73.class)
-                        .withGroups("configured_features", "delta-lake-databricks")
-                        .withExcludedGroups("delta-lake-exclude-73")
-                        .withExcludedTests(getExcludedTests())
-                        .build());
-    }
-}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteIceberg.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteIceberg.java
index ed1331a67660..0a84358dadc8 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteIceberg.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteIceberg.java
@@ -19,6 +19,7 @@
 import io.trino.tests.product.launcher.env.environment.EnvSinglenodeHiveIcebergRedirections;
 import io.trino.tests.product.launcher.env.environment.EnvSinglenodeSparkIceberg;
 import io.trino.tests.product.launcher.env.environment.EnvSinglenodeSparkIcebergJdbcCatalog;
+import io.trino.tests.product.launcher.env.environment.EnvSinglenodeSparkIcebergNessie;
 import io.trino.tests.product.launcher.env.environment.EnvSinglenodeSparkIcebergRest;
 import io.trino.tests.product.launcher.suite.Suite;
 import io.trino.tests.product.launcher.suite.SuiteTestRun;
@@ -49,6 +50,9 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
                         .build(),
                 testOnEnvironment(EnvSinglenodeSparkIcebergJdbcCatalog.class)
                         .withGroups("configured_features", "iceberg_jdbc")
+                        .build(),
+                testOnEnvironment(EnvSinglenodeSparkIcebergNessie.class)
+                        .withGroups("configured_features", "iceberg_nessie")
                         .build());
     }
 }
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteKafka.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteKafka.java
index bd4acb69d7aa..f541f510ac08 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteKafka.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteKafka.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.tests.product.launcher.env.EnvironmentConfig;
+import io.trino.tests.product.launcher.env.environment.EnvMultinodeConfluentKafka;
 import io.trino.tests.product.launcher.env.environment.EnvMultinodeKafka;
 import io.trino.tests.product.launcher.env.environment.EnvMultinodeKafkaSaslPlaintext;
 import io.trino.tests.product.launcher.env.environment.EnvMultinodeKafkaSsl;
@@ -35,6 +36,10 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
                 testOnEnvironment(EnvMultinodeKafka.class)
                         .withGroups("configured_features", "kafka")
                         .build(),
+                testOnEnvironment(EnvMultinodeConfluentKafka.class)
+                        // testing kafka group with this env is slightly redundant but helps verify that copying confluent libraries doesn't break non-confluent functionality
+                        .withGroups("configured_features", "kafka", "kafka_confluent_license")
+                        .build(),
                 testOnEnvironment(EnvMultinodeKafkaSsl.class)
                         .withGroups("configured_features", "kafka")
                         .build(),
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteSnowflake.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteSnowflake.java
new file mode 100644
index 000000000000..317d34817236
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteSnowflake.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.suite.suites;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.tests.product.launcher.env.EnvironmentConfig;
+import io.trino.tests.product.launcher.env.environment.EnvMultinodeSnowflake;
+import io.trino.tests.product.launcher.suite.Suite;
+import io.trino.tests.product.launcher.suite.SuiteTestRun;
+
+import java.util.List;
+
+import static io.trino.tests.product.launcher.suite.SuiteTestRun.testOnEnvironment;
+
+public class SuiteSnowflake
+        extends Suite
+{
+    @Override
+    public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
+    {
+        return ImmutableList.of(
+                testOnEnvironment(EnvMultinodeSnowflake.class)
+                        .withGroups("configured_features", "snowflake")
+                        .build());
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/util/DirectoryUtils.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/util/DirectoryUtils.java
new file mode 100644
index 000000000000..512c64d1bb8c
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/util/DirectoryUtils.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.util;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static java.util.Objects.requireNonNull;
+
+public final class DirectoryUtils
+{
+    private DirectoryUtils() {}
+
+    public static List<Path> listDirectDescendants(Path directory)
+    {
+        return Stream.of(requireNonNull(directory.toFile().listFiles(), "listFiles is null"))
+                .map(file -> directory.resolve(file.getName()))
+                .collect(toImmutableList());
+    }
+
+    public static Path getOnlyDescendant(Path directory)
+    {
+        return getOnlyElement(listDirectDescendants(directory));
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/util/UriDownloader.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/util/UriDownloader.java
new file mode 100644
index 000000000000..296586a9abb1
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/util/UriDownloader.java
@@ -0,0 +1,156 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.util;
+
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.BufferedSource;
+import okio.ForwardingSource;
+import okio.Okio;
+import okio.Source;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Path;
+import java.util.function.Consumer;
+
+import static java.lang.Math.toIntExact;
+import static okio.Okio.buffer;
+
+// Based on https://github.com/square/okhttp/blob/f9901627431be098ad73abd725fbb3738747461c/samples/guide/src/main/java/okhttp3/recipes/Progress.java
+public class UriDownloader
+{
+    private UriDownloader() {}
+
+    public static void download(String location, Path target, Consumer<Integer> progressListener)
+    {
+        OkHttpClient client = clientWithProgressListener(progressListener);
+        Request request = new Request.Builder().url(location).build();
+
+        try (Response response = client.newCall(request).execute()) {
+            if (!response.isSuccessful()) {
+                throw new IOException("Could not download file " + location + "(response: " + response + ")");
+            }
+
+            try (BufferedSink bufferedSink = Okio.buffer(Okio.sink(target))) {
+                bufferedSink.writeAll(response.body().source());
+                bufferedSink.flush();
+            }
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    private static OkHttpClient clientWithProgressListener(Consumer<Integer> progressListener)
+    {
+        return new OkHttpClient.Builder()
+                .addNetworkInterceptor(chain -> {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                            .body(new ProgressResponseBody(originalResponse.body(), listener(progressListener)))
+                            .build();
+                }).build();
+    }
+
+    private static ProgressListener listener(Consumer<Integer> progressConsumer)
+    {
+        return new ProgressListener()
+        {
+            boolean firstUpdate = true;
+
+            @Override
+            public void update(long bytesRead, long contentLength, boolean done)
+            {
+                if (done) {
+                    progressConsumer.accept(100);
+                }
+                else {
+                    if (firstUpdate) {
+                        progressConsumer.accept(0);
+                        firstUpdate = false;
+                    }
+
+                    if (contentLength != -1) {
+                        progressConsumer.accept(toIntExact((100 * bytesRead) / contentLength));
+                    }
+                }
+            }
+        };
+    }
+
+    private static class ProgressResponseBody
+            extends ResponseBody
+    {
+        private final ResponseBody responseBody;
+        private final ProgressListener progressListener;
+        private BufferedSource bufferedSource;
+
+        ProgressResponseBody(ResponseBody responseBody, ProgressListener progressListener)
+        {
+            this.responseBody = responseBody;
+            this.progressListener = progressListener;
+        }
+
+        @Override
+        public MediaType contentType()
+        {
+            return responseBody.contentType();
+        }
+
+        @Override
+        public long contentLength()
+        {
+            return responseBody.contentLength();
+        }
+
+        @Override
+        public BufferedSource source()
+        {
+            if (bufferedSource == null) {
+                bufferedSource = buffer(source(responseBody.source()));
+            }
+            return bufferedSource;
+        }
+
+        private Source source(Source source)
+        {
+            return new ForwardingSource(source) {
+                long totalBytesRead;
+
+                @Override
+                public long read(Buffer sink, long byteCount)
+                        throws IOException
+                {
+                    long bytesRead = super.read(sink, byteCount);
+                    // read() returns the number of bytes read, or -1 if this source is exhausted.
+                    totalBytesRead += bytesRead != -1 ? bytesRead : 0;
+                    progressListener.update(totalBytesRead, responseBody.contentLength(), bytesRead == -1);
+                    return bytesRead;
+                }
+            };
+        }
+    }
+
+    @FunctionalInterface
+    private interface ProgressListener
+    {
+        void update(long bytesRead, long contentLength, boolean done);
+    }
+}
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/camelCaseSchema.avsc b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/camelCaseSchema.avsc
new file mode 100644
index 000000000000..e44e6ef40b46
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/camelCaseSchema.avsc
@@ -0,0 +1,8 @@
+{
+  "namespace": "io.trino.test",
+  "name": "product_tests_avro_table",
+  "type": "record",
+  "fields": [
+    { "name":"stringCol", "type":"string"},
+    { "name":"intCol", "type":"int" }
+]}
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/config.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/config.properties
index 05b292005d11..facbc5966c27 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/config.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/config.properties
@@ -22,4 +22,3 @@ internal-communication.https.required=true
 internal-communication.shared-secret=internal-shared-secret
 internal-communication.https.keystore.path=/docker/presto-product-tests/conf/presto/etc/docker.cluster.jks
 internal-communication.https.keystore.key=123456
-legacy.allow-set-view-authorization=true
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive.properties
index d0ffc37b843a..a8ebd6d42ea2 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive.properties
@@ -14,3 +14,7 @@ hive.fs.cache.max-size=10
 hive.max-partitions-per-scan=100
 hive.max-partitions-for-eager-load=100
 hive.hive-views.enabled=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
+# Using smaller than default parquet.small-file-threshold to get better code coverage in tests
+parquet.small-file-threshold=100kB
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_timestamp_nanos.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_timestamp_nanos.properties
index 9ca0bbb8b3df..9c5164373090 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_timestamp_nanos.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_timestamp_nanos.properties
@@ -5,3 +5,5 @@ hive.allow-drop-table=true
 hive.metastore-cache-ttl=0s
 hive.hive-views.enabled=true
 hive.timestamp-precision=NANOSECONDS
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_external_writes.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_external_writes.properties
index 83662e70e4a6..9b25bca84b2a 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_external_writes.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_external_writes.properties
@@ -15,3 +15,5 @@ hive.max-partitions-per-scan=100
 hive.max-partitions-for-eager-load=100
 hive.hive-views.enabled=true
 hive.non-managed-table-writes-enabled=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties
index 440d35a7b07e..e094cbcf1c2a 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties
@@ -6,3 +6,5 @@ hive.fs.cache.max-size=10
 hive.hive-views.enabled=true
 hive.hive-views.run-as-invoker=true
 hive.security=sql-standard
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/spark/log4j2.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/spark/log4j2.properties
new file mode 100644
index 000000000000..386ce31060a3
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/spark/log4j2.properties
@@ -0,0 +1,15 @@
+rootLogger.level = error
+rootLogger.appenderRef.stdout.ref = console
+
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+
+logger.repl.name = org.apache.spark.repl.Main
+logger.repl.level = error
+
+# SPARK-34128: Suppress undesirable TTransportException warnings involved in THRIFT-4805
+appender.console.filter.1.type = RegexFilter
+appender.console.filter.1.regex = .*Thrift error occurred during processing of message.*
+appender.console.filter.1.onMatch = deny
+appender.console.filter.1.onMismatch = neutral
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard-multinode/multinode-master-config.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard-multinode/multinode-master-config.properties
index 1333097597a5..e3dc3e74ade7 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard-multinode/multinode-master-config.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard-multinode/multinode-master-config.properties
@@ -8,7 +8,7 @@ http-server.http.port=8080
 query.max-memory=1GB
 discovery.uri=http://presto-master:8080
 
-# Use task.writer-count > 1, as this allows to expose writer-concurrency related bugs.
-task.writer-count=2
+# Use task.min-writer-count > 1, as this allows to expose writer-concurrency related bugs.
+task.min-writer-count=2
 task.concurrency=2
-task.partitioned-writer-count=2
+task.max-writer-count=2
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard-multinode/multinode-worker-config.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard-multinode/multinode-worker-config.properties
index 083fd1861fdb..554a00fa99a6 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard-multinode/multinode-worker-config.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard-multinode/multinode-worker-config.properties
@@ -8,7 +8,7 @@ query.max-memory=1GB
 query.max-memory-per-node=1GB
 discovery.uri=http://presto-master:8080
 
-# Use task.writer-count > 1, as this allows to expose writer-concurrency related bugs.
-task.writer-count=2
+# Use task.min-writer-count > 1, as this allows to expose writer-concurrency related bugs.
+task.min-writer-count=2
 task.concurrency=2
-task.partitioned-writer-count=2
+task.max-writer-count=2
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/config.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/config.properties
index 984b91f176db..6ad61ff2be58 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/config.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/config.properties
@@ -9,7 +9,7 @@ query.max-memory=2GB
 query.max-memory-per-node=1.25GB
 discovery.uri=http://presto-master:8080
 
-# Use task.writer-count > 1, as this allows to expose writer-concurrency related bugs.
-task.writer-count=2
+# Use task.min-writer-count > 1, as this allows to expose writer-concurrency related bugs.
+task.min-writer-count=2
 task.concurrency=2
-task.partitioned-writer-count=2
+task.max-writer-count=2
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/presto-init-hdp3.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/presto-init-hdp3.sh
deleted file mode 100755
index 932b9fe2a572..000000000000
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/presto-init-hdp3.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -xeuo pipefail
-
-for hive_properties in $(find '/docker/presto-product-tests/conf/presto/etc/catalog' -name '*hive*.properties'); do
-    echo "Updating $hive_properties for HDP3"
-    # Add file format time zone properties
-    echo "hive.parquet.time-zone=UTC" >> "${hive_properties}"
-    echo "hive.rcfile.time-zone=UTC" >> "${hive_properties}"
-done
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/snowflake.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/snowflake.properties
new file mode 100644
index 000000000000..669489ea4363
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/snowflake.properties
@@ -0,0 +1,4 @@
+connector.name=snowflake
+connection-url=${ENV:SNOWFLAKE_URL}
+connection-user=${ENV:SNOWFLAKE_USER}
+connection-password=${ENV:SNOWFLAKE_PASSWORD}
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/hive.properties
index 8a9f623b07ec..139e457a87db 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/hive.properties
@@ -11,3 +11,5 @@ hive.allow-comment-table=true
 hive.allow-drop-table=true
 hive.allow-rename-table=true
 hive.translate-hive-views=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-cached/hive-coordinator.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-cached/hive-coordinator.properties
index d4d3e56ba08d..8a5d028c9e34 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-cached/hive-coordinator.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-cached/hive-coordinator.properties
@@ -3,3 +3,5 @@ hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-
 hive.metastore.uri=thrift://hadoop-master:9083
 hive.allow-drop-table=true
 hive.cache.enabled=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-cached/hive-worker.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-cached/hive-worker.properties
index d5dc79022610..4bee1ef360a7 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-cached/hive-worker.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-cached/hive-worker.properties
@@ -4,3 +4,5 @@ hive.metastore.uri=thrift://hadoop-master:9083
 hive.allow-drop-table=true
 hive.cache.enabled=true
 hive.cache.location=/tmp/cache
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/delta.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/delta.properties
index f0c8e261d7ab..441dd9f5d19b 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/delta.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/delta.properties
@@ -1,3 +1,3 @@
 connector.name=delta_lake
 hive.metastore.uri=thrift://hadoop-master:9083
-hive.gcs.json-key-file-path=${ENV:GCP_CREDENTIALS_FILE_PATH}
+hive.gcs.json-key=${ENV:GCP_CREDENTIALS}
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/hive.properties
index 97f72abfd742..921d1b8a73d2 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/hive.properties
@@ -1,7 +1,7 @@
 connector.name=hive
 hive.metastore.uri=thrift://hadoop-master:9083
 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml
-hive.gcs.json-key-file-path=${ENV:GCP_CREDENTIALS_FILE_PATH}
+hive.gcs.json-key=${ENV:GCP_CREDENTIALS}
 hive.non-managed-table-writes-enabled=true
 hive.allow-add-column=true
 hive.allow-drop-column=true
@@ -9,3 +9,5 @@ hive.allow-rename-column=true
 hive.allow-comment-table=true
 hive.allow-drop-table=true
 hive.allow-rename-table=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/iceberg.properties
index 8c3a265dfbcc..9f7876e82003 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/iceberg.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/iceberg.properties
@@ -2,4 +2,4 @@ connector.name=iceberg
 hive.metastore.uri=thrift://hadoop-master:9083
 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml
 iceberg.file-format=PARQUET
-hive.gcs.json-key-file-path=${ENV:GCP_CREDENTIALS_FILE_PATH}
+hive.gcs.json-key=${ENV:GCP_CREDENTIALS}
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/kafka.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/kafka.properties
new file mode 100644
index 000000000000..bd6631b76e9c
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/kafka.properties
@@ -0,0 +1,23 @@
+connector.name=kafka
+kafka.table-names=product_tests.read_simple_key_and_value,\
+                    product_tests.read_all_datatypes_raw,\
+                    product_tests.read_all_datatypes_csv,\
+                    product_tests.read_all_datatypes_json,\
+                    product_tests.read_all_datatypes_avro,\
+                    product_tests.read_all_null_avro,\
+                    product_tests.read_structural_datatype_avro,\
+                    product_tests.write_simple_key_and_value,\
+                    product_tests.write_all_datatypes_raw,\
+                    product_tests.write_all_datatypes_csv,\
+                    product_tests.write_all_datatypes_json,\
+                    product_tests.write_all_datatypes_avro,\
+                    product_tests.write_structural_datatype_avro,\
+                    product_tests.pushdown_partition,\
+                    product_tests.pushdown_offset,\
+                    product_tests.pushdown_create_time,\
+                    product_tests.all_datatypes_protobuf,\
+                    product_tests.structural_datatype_protobuf,\
+                    product_tests.read_basic_datatypes_protobuf,\
+                    product_tests.read_basic_structural_datatypes_protobuf
+kafka.nodes=kafka:9092
+kafka.table-description-dir=/docker/presto-product-tests/conf/presto/etc/catalog/kafka
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/kafka_schema_registry.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/kafka_schema_registry.properties
new file mode 100644
index 000000000000..2fe25b5c653b
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/kafka_schema_registry.properties
@@ -0,0 +1,5 @@
+connector.name=kafka
+kafka.nodes=kafka:9092
+kafka.table-description-supplier=confluent
+kafka.confluent-schema-registry-url=http://schema-registry:8081
+kafka.default-schema=product_tests
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/tempto-configuration.yaml
new file mode 100644
index 000000000000..8a101f06e8a1
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/tempto-configuration.yaml
@@ -0,0 +1,2 @@
+schema-registry:
+  url: http://schema-registry:8081
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake/hive.properties
index 9c4b9cf36f06..1852ad915eda 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake/hive.properties
@@ -6,3 +6,5 @@ hive.s3.endpoint=http://minio:9080/
 hive.s3.path-style-access=true
 hive.s3.ssl.enabled=false
 hive.allow-drop-table=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-snowflake/snowflake.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-snowflake/snowflake.properties
new file mode 100644
index 000000000000..669489ea4363
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-snowflake/snowflake.properties
@@ -0,0 +1,4 @@
+connector.name=snowflake
+connection-url=${ENV:SNOWFLAKE_URL}
+connection-user=${ENV:SNOWFLAKE_USER}
+connection-password=${ENV:SNOWFLAKE_PASSWORD}
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos-delegation/krb5_client.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos-delegation/krb5_client.conf
new file mode 100644
index 000000000000..72bbb6a6d34e
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos-delegation/krb5_client.conf
@@ -0,0 +1,25 @@
+# Copy of hdp2.6-hive-kerberized/etc/krb5.conf with lower ticket_lifetime
+[logging]
+ default = FILE:/var/log/krb5libs.log
+ kdc = FILE:/var/log/krb5kdc.log
+ admin_server = FILE:/var/log/kadmind.log
+
+[libdefaults]
+ default_realm = LABS.TERADATA.COM
+ dns_lookup_realm = false
+ dns_lookup_kdc = false
+ forwardable = true
+ allow_weak_crypto = true
+ # low ticket_lifetime to make sure ticket could expired if needed (on client side - timeout is 60s)
+ ticket_lifetime = 80s
+
+[realms]
+ LABS.TERADATA.COM = {
+  kdc = hadoop-master:88
+  admin_server = hadoop-master
+ }
+ OTHERLABS.TERADATA.COM = {
+  kdc = hadoop-master:89
+  admin_server = hadoop-master
+ }
+
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos/hive.properties
index 52c85f4632cb..007bc8691c12 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos/hive.properties
@@ -9,6 +9,8 @@ hive.metastore-cache-ttl=0s
 hive.allow-add-column=true
 hive.allow-drop-column=true
 hive.allow-rename-column=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/hive-hadoop2.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/hive-hadoop2.properties
index eca055ccdeab..59e6560302fb 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/hive-hadoop2.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/hive-hadoop2.properties
@@ -1,2 +1,4 @@
 connector.name=hive-hadoop2
 hive.metastore.uri=thrift://hadoop-master:9083
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/hive.properties
index d9fe1819cbc9..934cffb83c6e 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/hive.properties
@@ -1,2 +1,4 @@
 connector.name=hive
 hive.metastore.uri=thrift://hadoop-master:9083
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/presto-tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/presto-tempto-configuration.yaml
index 73676339fbf8..b32c041625af 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/presto-tempto-configuration.yaml
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/presto-tempto-configuration.yaml
@@ -6,5 +6,5 @@ databases:
     jdbc_driver_class: io.prestosql.jdbc.PrestoDriver
     jdbc_url: jdbc:presto://${databases.compatibility-test-server.host}:${databases.compatibility-test-server.port}/hive/${databases.hive.schema}
     jdbc_user: hive
-    jdbc_password: "***empty***"
+    jdbc_password: ""
     jdbc_pooling: false
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/trino-tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/trino-tempto-configuration.yaml
index c4fa1eec7687..009fa745296a 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/trino-tempto-configuration.yaml
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/trino-tempto-configuration.yaml
@@ -6,5 +6,5 @@ databases:
     jdbc_driver_class: io.trino.jdbc.TrinoDriver
     jdbc_url: jdbc:trino://${databases.compatibility-test-server.host}:${databases.compatibility-test-server.port}/hive/${databases.hive.schema}
     jdbc_user: hive
-    jdbc_password: "***empty***"
+    jdbc_password: ""
     jdbc_pooling: false
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-databricks/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-databricks/hive.properties
index 1a207291a5ed..82d96d95b948 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-databricks/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-databricks/hive.properties
@@ -11,3 +11,5 @@ hive.allow-comment-table=true
 hive.allow-comment-column=true
 hive.allow-rename-table=true
 hive.delta-lake-catalog-name=delta
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-databricks/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-databricks/tempto-configuration.yaml
index 048e3c6e552e..6f8071225ac6 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-databricks/tempto-configuration.yaml
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-databricks/tempto-configuration.yaml
@@ -3,6 +3,7 @@ databases:
     jdbc_user: root
   delta:
     jdbc_driver_class: com.databricks.client.jdbc.Driver
+    jdbc_jar: /docker/jdbc/databricks-jdbc.jar
     schema: default
     prepare_statement:
       - USE ${databases.delta.schema}
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-oss/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-oss/hive.properties
index b7c12af22503..fe3951947a23 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-oss/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-oss/hive.properties
@@ -13,3 +13,5 @@ hive.allow-comment-table=true
 hive.allow-comment-column=true
 hive.allow-rename-table=true
 hive.delta-lake-catalog-name=delta
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdfs-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdfs-impersonation/hive.properties
index 3987b3b09440..cd177028fb42 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdfs-impersonation/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdfs-impersonation/hive.properties
@@ -14,3 +14,6 @@ hive.hdfs.impersonation.enabled=true
 hive.fs.cache.max-size=10
 hive.max-partitions-per-scan=100
 hive.max-partitions-for-eager-load=100
+hive.non-managed-table-writes-enabled=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdp3/apply-hdp3-config.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdp3/apply-hdp3-config.sh
deleted file mode 100755
index f0c60845b0a2..000000000000
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdp3/apply-hdp3-config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -exuo pipefail
-
-echo "Applying HDP3 hive-site configuration overrides"
-apply-site-xml-override /etc/hive/conf/hive-site.xml "/docker/presto-product-tests/conf/environment/singlenode-hdp3/hive-site-overrides.xml"
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-acid/apply-hive-config.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-acid/apply-hive-config.sh
new file mode 100755
index 000000000000..b29bcc092b1f
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-acid/apply-hive-config.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -exuo pipefail
+
+echo "Applying HDP3 hive-site configuration overrides"
+apply-site-xml-override /etc/hive/conf/hive-site.xml "/docker/presto-product-tests/conf/environment/singlenode-hive-acid/hive-site-overrides.xml"
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdp3/hive-site-overrides.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-acid/hive-site-overrides.xml
similarity index 100%
rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdp3/hive-site-overrides.xml
rename to testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-acid/hive-site-overrides.xml
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-hudi-redirections/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-hudi-redirections/hive.properties
index 3e565f9bde02..ab04e3cbd014 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-hudi-redirections/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-hudi-redirections/hive.properties
@@ -9,3 +9,5 @@ hive.allow-drop-table=true
 hive.allow-rename-table=true
 hive.hudi-catalog-name=hudi
 hive.hive-views.enabled=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-iceberg-redirections/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-iceberg-redirections/hive.properties
index 8c8bd114f10c..00343c8845c1 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-iceberg-redirections/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-iceberg-redirections/hive.properties
@@ -9,3 +9,5 @@ hive.allow-drop-table=true
 hive.allow-rename-table=true
 hive.iceberg-catalog-name=iceberg
 hive.hive-views.enabled=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-impersonation/hive.properties
index a6c83d3f1a87..42d444e5a717 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-impersonation/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-impersonation/hive.properties
@@ -16,3 +16,6 @@ hive.fs.new-directory-permissions=0700
 hive.fs.cache.max-size=10
 hive.max-partitions-per-scan=100
 hive.max-partitions-for-eager-load=100
+hive.non-managed-table-writes-enabled=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hudi/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hudi/hive.properties
index de8a1b226642..7d020ed0235b 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hudi/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hudi/hive.properties
@@ -1,4 +1,6 @@
 connector.name=hive
 hive.metastore.uri=thrift://hadoop-master:9083
 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml
-hive.hudi-catalog-name=hudi
+hive.allow-drop-table=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/hive.properties
index a6d7acee72ce..05cb0a2144a8 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/hive.properties
@@ -15,6 +15,8 @@ hive.metastore-cache-ttl=0s
 hive.allow-add-column=true
 hive.allow-drop-column=true
 hive.allow-rename-column=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM
@@ -29,3 +31,4 @@ hive.hdfs.trino.keytab=/etc/hadoop/conf/hdfs-other.keytab
 hive.fs.cache.max-size=10
 hive.max-partitions-per-scan=100
 hive.max-partitions-for-eager-load=100
+hive.non-managed-table-writes-enabled=true
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-data-protection/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-data-protection/hive.properties
index 3b30e924111c..b580e2c05fd4 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-data-protection/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-data-protection/hive.properties
@@ -2,6 +2,8 @@ connector.name=hive
 hive.metastore.uri=thrift://hadoop-master:9083
 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml,/docker/presto-product-tests/conf/presto/etc/hive-data-protection-site.xml
 hive.metastore-cache-ttl=0s
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/hive.properties
index 42eda368ad90..1a9a43cef24b 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/hive.properties
@@ -2,6 +2,8 @@ connector.name=hive
 hive.metastore.uri=thrift://hadoop-master:9083
 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml
 hive.metastore-cache-ttl=0s
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM
@@ -20,3 +22,4 @@ hive.security=sql-standard
 hive.hive-views.enabled=true
 
 hive.hdfs.wire-encryption.enabled=true
+hive.non-managed-table-writes-enabled=true
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation/hive.properties
index df60795c248b..b55e8077bc12 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation/hive.properties
@@ -2,6 +2,8 @@ connector.name=hive
 hive.metastore.uri=thrift://hadoop-master:9083
 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml
 hive.metastore-cache-ttl=0s
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM
@@ -20,3 +22,4 @@ hive.max-partitions-for-eager-load=100
 hive.security=sql-standard
 #required for testAccessControlSetHiveViewAuthorization() product test
 hive.hive-views.enabled=true
+hive.non-managed-table-writes-enabled=true
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-no-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-no-impersonation/hive.properties
index c28244fea67f..c139292f2925 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-no-impersonation/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-no-impersonation/hive.properties
@@ -8,6 +8,8 @@ hive.metastore-cache-ttl=0s
 hive.allow-add-column=true
 hive.allow-drop-column=true
 hive.allow-rename-column=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM
@@ -21,3 +23,4 @@ hive.hdfs.trino.keytab=/etc/hadoop/conf/hdfs.keytab
 hive.fs.cache.max-size=10
 hive.max-partitions-per-scan=100
 hive.max-partitions-for-eager-load=100
+hive.non-managed-table-writes-enabled=true
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/hive.properties
index 0bd68817f824..17e2033e5e7d 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/hive.properties
@@ -2,6 +2,8 @@ connector.name=hive
 hive.metastore.uri=thrift://hadoop-master:9083
 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml
 hive.metastore-cache-ttl=0s
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.thrift.impersonation.enabled=true
@@ -24,3 +26,4 @@ hive.max-partitions-for-eager-load=100
 hive.security=sql-standard
 #required for testAccessControlSetHiveViewAuthorization() product test
 hive.hive-views.enabled=true
+hive.non-managed-table-writes-enabled=true
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation/hive.properties
index af6ca5b018d0..e81984f40414 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation/hive.properties
@@ -2,6 +2,8 @@ connector.name=hive
 hive.metastore.uri=thrift://hadoop-master:9083
 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml
 hive.metastore-cache-ttl=0s
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.thrift.impersonation.enabled=true
@@ -24,3 +26,4 @@ hive.max-partitions-for-eager-load=100
 hive.security=sql-standard
 #required for testAccessControlSetHiveViewAuthorization() product test
 hive.hive-views.enabled=true
+hive.non-managed-table-writes-enabled=true
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/hive.properties
index a6c0271428fc..16f65d30066e 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/hive.properties
@@ -8,6 +8,8 @@ hive.metastore-cache-ttl=0s
 hive.allow-add-column=true
 hive.allow-drop-column=true
 hive.allow-rename-column=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM
@@ -21,3 +23,4 @@ hive.hdfs.trino.credential-cache.location=/etc/trino/conf/hdfs-krbcc
 hive.fs.cache.max-size=10
 hive.max-partitions-per-scan=100
 hive.max-partitions-for-eager-load=100
+hive.non-managed-table-writes-enabled=true
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/hive.properties
index e2bd095360e9..c21e95701370 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/hive.properties
@@ -5,6 +5,8 @@ hive.allow-rename-table=true
 hive.allow-add-column=true
 hive.allow-drop-column=true
 hive.allow-rename-column=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.service.principal=hive/_HOST@LABS.TERADATA.COM
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/hive.properties
index 100538ce71a4..964548264701 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/hive.properties
@@ -5,6 +5,8 @@ hive.allow-rename-table=true
 hive.allow-add-column=true
 hive.allow-drop-column=true
 hive.allow-rename-column=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.service.principal=hive/_HOST@LABS.TERADATA.COM
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/hive.properties
index 62db20623271..5958c78979be 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/hive.properties
@@ -5,6 +5,8 @@ hive.allow-rename-table=true
 hive.allow-add-column=true
 hive.allow-drop-column=true
 hive.allow-rename-column=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.service.principal=hive/_HOST@LABS.TERADATA.COM
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/hive.properties
index 93ae094ed300..08c6e5af715c 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/hive.properties
@@ -5,6 +5,8 @@ hive.allow-rename-table=true
 hive.allow-add-column=true
 hive.allow-drop-column=true
 hive.allow-rename-column=true
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.service.principal=hive/_HOST@LABS.TERADATA.COM
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive-no-stats-fallback/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive-no-stats-fallback/hive.properties
index 66e861f1fc52..155ce80fc4cf 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive-no-stats-fallback/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive-no-stats-fallback/hive.properties
@@ -6,3 +6,4 @@ hive.allow-drop-table=true
 
 # Note: it's currently unclear why this one is needed, while also hive.orc.time-zone=UTC is not needed.
 hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive/hive.properties
index 25bfc1eabf97..44329691da13 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive/hive.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive/hive.properties
@@ -2,6 +2,8 @@ connector.name=hive
 hive.metastore.uri=thrift://hadoop-master:9083
 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml
 hive.allow-drop-table=true
+hive.non-managed-table-writes-enabled=true
 
 # Note: it's currently unclear why this one is needed, while also hive.orc.time-zone=UTC is not needed.
 hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-nessie/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-nessie/iceberg.properties
new file mode 100644
index 000000000000..f087f9cec4a0
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-nessie/iceberg.properties
@@ -0,0 +1,4 @@
+connector.name=iceberg
+iceberg.catalog.type=nessie
+iceberg.nessie-catalog.uri=http://nessie-server:19120/api/v1
+iceberg.nessie-catalog.default-warehouse-dir=hdfs://hadoop-master:9000/user/hive/warehouse
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-nessie/spark-defaults.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-nessie/spark-defaults.conf
new file mode 100644
index 000000000000..41e3e2b6bb2d
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-nessie/spark-defaults.conf
@@ -0,0 +1,10 @@
+spark.sql.catalog.iceberg_test=org.apache.iceberg.spark.SparkCatalog
+spark.sql.catalog.iceberg_test.catalog-impl=org.apache.iceberg.nessie.NessieCatalog
+spark.sql.catalog.iceberg_test.uri=http://nessie-server:19120/api/v1
+spark.sql.catalog.iceberg_test.authentication.type=NONE
+spark.sql.catalog.iceberg_test.warehouse=hdfs://hadoop-master:9000/user/hive/warehouse
+; disabling caching allows us to run spark queries interchangeably with trino's
+spark.sql.catalog.iceberg_test.cache-enabled=false
+spark.sql.extensions=org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions
+
+spark.hadoop.fs.defaultFS=hdfs://hadoop-master:9000
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive1.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive1.properties
index 28b4d97243bb..a4f1d8374acc 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive1.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive1.properties
@@ -2,6 +2,8 @@ connector.name=hive
 hive.metastore.uri=thrift://hadoop-master:9083
 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml
 hive.metastore-cache-ttl=0s
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.thrift.impersonation.enabled=true
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive2.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive2.properties
index 955111047d84..bd2616ce9ba2 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive2.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive2.properties
@@ -3,6 +3,8 @@ hive.metastore.uri=thrift://hadoop-master-2:9083
 hive.config.resources=/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive2-default-fs-site.xml,\
   /docker/presto-product-tests/conf/environment/two-kerberos-hives/auth-to-local.xml
 hive.metastore-cache-ttl=0s
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.service.principal=hive/hadoop-master-2@OTHERREALM.COM
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/presto-krb5.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/presto-krb5.conf
index 4b9e021504a8..0dc73408a2c9 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/presto-krb5.conf
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/presto-krb5.conf
@@ -8,7 +8,8 @@
  dns_lookup_realm = false
  dns_lookup_kdc = false
  ticket_lifetime = 24h
- renew_lifetime = 7d
+ # this setting is causing a Message stream modified (41) error when talking to KDC running on CentOS 7: https://stackoverflow.com/a/60978520
+ # renew_lifetime = 7d
  forwardable = true
 
 [realms]
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/update-location.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/update-location.sh
new file mode 100644
index 000000000000..d0802cb5c08e
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/update-location.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+/usr/bin/mysqld_safe &
+while ! mysqladmin ping -proot --silent; do sleep 1; done
+
+hive --service metatool -updateLocation hdfs://hadoop-master-2:9000/user/hive/warehouse hdfs://hadoop-master:9000/user/hive/warehouse
+
+killall mysqld
+while pgrep mysqld; do sleep 1; done
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hadoop-master-2/core-site.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hadoop-master-2/core-site.xml
index e4fb11b3debe..4e4fc837026a 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hadoop-master-2/core-site.xml
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hadoop-master-2/core-site.xml
@@ -4,4 +4,76 @@
         <name>fs.defaultFS</name>
         <value>hdfs://hadoop-master-2:9000</value>
     </property>
+
+    <!-- OOZIE proxy user setting -->
+    <property>
+        <name>hadoop.proxyuser.oozie.hosts</name>
+        <value>*</value>
+    </property>
+    <property>
+        <name>hadoop.proxyuser.oozie.groups</name>
+        <value>*</value>
+    </property>
+
+    <!-- HTTPFS proxy user setting -->
+    <property>
+        <name>hadoop.proxyuser.httpfs.hosts</name>
+        <value>*</value>
+    </property>
+    <property>
+        <name>hadoop.proxyuser.httpfs.groups</name>
+        <value>*</value>
+    </property>
+
+    <!-- Llama proxy user setting -->
+    <property>
+        <name>hadoop.proxyuser.llama.hosts</name>
+        <value>*</value>
+    </property>
+    <property>
+        <name>hadoop.proxyuser.llama.groups</name>
+        <value>*</value>
+    </property>
+
+    <!-- Hue proxy user setting -->
+    <property>
+        <name>hadoop.proxyuser.hue.hosts</name>
+        <value>*</value>
+    </property>
+    <property>
+        <name>hadoop.proxyuser.hue.groups</name>
+        <value>*</value>
+    </property>
+
+    <!-- Mapred proxy user setting -->
+    <property>
+        <name>hadoop.proxyuser.mapred.hosts</name>
+        <value>*</value>
+    </property>
+    <property>
+        <name>hadoop.proxyuser.mapred.groups</name>
+        <value>*</value>
+    </property>
+
+    <!-- Hive impersonation -->
+    <property>
+        <name>hadoop.proxyuser.hive.hosts</name>
+        <value>*</value>
+    </property>
+
+    <property>
+        <name>hadoop.proxyuser.hive.groups</name>
+        <value>*</value>
+    </property>
+
+    <!-- Hdfs impersonation -->
+    <property>
+        <name>hadoop.proxyuser.hdfs.groups</name>
+        <value>*</value>
+    </property>
+
+    <property>
+        <name>hadoop.proxyuser.hdfs.hosts</name>
+        <value>*</value>
+    </property>
 </configuration>
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hadoop-master-2/hdfs-site.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hadoop-master-2/hdfs-site.xml
new file mode 100644
index 000000000000..c8f55aff9808
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hadoop-master-2/hdfs-site.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<configuration>
+    <property>
+        <name>dfs.namenode.name.dir</name>
+        <value>/var/lib/hadoop-hdfs/cache/name/</value>
+    </property>
+
+    <property>
+        <name>dfs.datanode.data.dir</name>
+        <value>/var/lib/hadoop-hdfs/cache/data/</value>
+    </property>
+
+    <property>
+        <name>fs.viewfs.mounttable.hadoop-viewfs.link./default</name>
+        <value>hdfs://hadoop-master-2:9000/user/hive/warehouse</value>
+    </property>
+
+    <!-- This property explicitly forbids datanode to enter safe mode which results in 30 s penalty on environment startup -->
+    <property>
+        <name>dfs.safemode.threshold.pct</name>
+        <value>0</value>
+    </property>
+</configuration>
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hadoop-master-2/update-location.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hadoop-master-2/update-location.sh
new file mode 100644
index 000000000000..d0802cb5c08e
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hadoop-master-2/update-location.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+/usr/bin/mysqld_safe &
+while ! mysqladmin ping -proot --silent; do sleep 1; done
+
+hive --service metatool -updateLocation hdfs://hadoop-master-2:9000/user/hive/warehouse hdfs://hadoop-master:9000/user/hive/warehouse
+
+killall mysqld
+while pgrep mysqld; do sleep 1; done
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive1.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive1.properties
index 28b4d97243bb..a4f1d8374acc 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive1.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive1.properties
@@ -2,6 +2,8 @@ connector.name=hive
 hive.metastore.uri=thrift://hadoop-master:9083
 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml
 hive.metastore-cache-ttl=0s
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
 
 hive.metastore.authentication.type=KERBEROS
 hive.metastore.thrift.impersonation.enabled=true
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive2.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive2.properties
index 172f0cad19d0..b01bac39ace1 100644
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive2.properties
+++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive2.properties
@@ -11,3 +11,5 @@ hive.metastore-cache-ttl=0s
 hive.fs.cache.max-size=10
 hive.max-partitions-per-scan=100
 hive.max-partitions-for-eager-load=100
+hive.parquet.time-zone=UTC
+hive.rcfile.time-zone=UTC
diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/tempto/tempto-configuration-for-hive3.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/tempto/tempto-configuration-for-hive3.yaml
deleted file mode 100644
index 9142bbddb72f..000000000000
--- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/tempto/tempto-configuration-for-hive3.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-hdfs:
-  webhdfs:
-    # 9870 is the name node's default port in Hadoop 3
-    uri: http://${databases.hive.host}:9870
-
-databases:
-  hive:
-    prepare_statement:
-      - USE ${databases.hive.schema}
-      # Hive 3 gathers stats by default. For test purposes we need to disable this behavior.
-      - SET hive.stats.column.autogather=false
diff --git a/testing/trino-product-tests-launcher/src/test/java/io/trino/tests/product/launcher/cli/TestInvocations.java b/testing/trino-product-tests-launcher/src/test/java/io/trino/tests/product/launcher/cli/TestInvocations.java
new file mode 100644
index 000000000000..c3fc55911bc4
--- /dev/null
+++ b/testing/trino-product-tests-launcher/src/test/java/io/trino/tests/product/launcher/cli/TestInvocations.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed 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 io.trino.tests.product.launcher.cli;
+
+import com.google.common.base.Splitter;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.List;
+
+import static io.trino.tests.product.launcher.cli.Launcher.execute;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Test(singleThreaded = true)
+public class TestInvocations
+{
+    @Test
+    public void testEnvironmentList()
+    {
+        InvocationResult invocationResult = invokeLauncher("env", "list");
+
+        assertThat(invocationResult.exitCode()).isEqualTo(0);
+        assertThat(invocationResult.lines())
+                .contains("Available environments: ")
+                .contains("multinode")
+                .contains("two-mixed-hives");
+    }
+
+    @Test
+    public void testSuiteList()
+    {
+        InvocationResult invocationResult = invokeLauncher("suite", "list");
+
+        assertThat(invocationResult.exitCode()).isEqualTo(0);
+        assertThat(invocationResult.lines())
+                .contains("Available suites: ")
+                .contains("suite-1");
+    }
+
+    @Test
+    public void testDescribeEnvironment()
+            throws IOException
+    {
+        InvocationResult invocationResult = invokeLauncher(
+                "env", "describe",
+                "--server-package", Files.createTempFile("server", ".tar.gz").toString(),
+                // This is known to work for both arm and x86
+                "--environment", "multinode-postgresql");
+
+        assertThat(invocationResult.exitCode()).isEqualTo(0);
+        assertThat(invocationResult.lines())
+                .contains("Environment 'multinode-postgresql' file mounts:");
+    }
+
+    @Test
+    public void testDescribeSuite()
+            throws IOException
+    {
+        InvocationResult invocationResult = invokeLauncher(
+                "suite", "describe",
+                "--server-package", Files.createTempFile("server", ".tar.gz").toString(),
+                "--suite", "suite-1");
+
+        assertThat(invocationResult.exitCode()).isEqualTo(0);
+        assertThat(invocationResult.lines())
+                .contains("Suite 'suite-1' with configuration 'config-default' consists of following test runs: ");
+    }
+
+    @Test
+    public void testEnvUpDown()
+            throws IOException
+    {
+        InvocationResult upResult = invokeLauncher(
+                "env", "up",
+                "--server-package", Files.createTempFile("server", ".tar.gz").toString(),
+                "--without-trino",
+                "--background",
+                "--bind",
+                "off",
+                // This is known to work for both arm and x86
+                "--environment", "multinode-postgresql");
+
+        assertThat(upResult.exitCode()).isEqualTo(0);
+        InvocationResult downResult = invokeLauncher("env", "down");
+        assertThat(downResult.exitCode()).isEqualTo(0);
+    }
+
+    public static InvocationResult invokeLauncher(String... args)
+    {
+        Launcher launcher = new Launcher();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        int exitCode = execute(launcher, new Launcher.LauncherBundle(), out, args);
+        return new InvocationResult(exitCode, Splitter.on("\n").splitToList(out.toString(UTF_8)));
+    }
+
+    private record InvocationResult(int exitCode, List<String> lines) {}
+}
diff --git a/testing/trino-product-tests-launcher/src/test/java/io/trino/tests/product/launcher/util/TestConsoleTable.java b/testing/trino-product-tests-launcher/src/test/java/io/trino/tests/product/launcher/util/TestConsoleTable.java
index dbdca3d1a31c..99170caa82fe 100644
--- a/testing/trino-product-tests-launcher/src/test/java/io/trino/tests/product/launcher/util/TestConsoleTable.java
+++ b/testing/trino-product-tests-launcher/src/test/java/io/trino/tests/product/launcher/util/TestConsoleTable.java
@@ -15,7 +15,7 @@
 
 import org.testng.annotations.Test;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestConsoleTable
 {
diff --git a/testing/trino-product-tests/README.md b/testing/trino-product-tests/README.md
index f8c30a763ffd..03a219b44fe2 100644
--- a/testing/trino-product-tests/README.md
+++ b/testing/trino-product-tests/README.md
@@ -104,11 +104,7 @@ testing/bin/ptl env list
 
 #### Environment config
 
-Most of the Hadoop-based environments can be run in multiple configurations that use different Hadoop distribution:
-
-- **config-default** - executes tests against vanilla Hadoop distribution
-- **config-hdp3** - executes tests against HDP3 distribution of Hadoop
-
+Most of the Hadoop-based environments can be run in multiple configurations.
 You can obtain list of available environment configurations using command:
 
 ```
diff --git a/testing/trino-product-tests/pom.xml b/testing/trino-product-tests/pom.xml
index 49fa900d1097..1647790cf9df 100644
--- a/testing/trino-product-tests/pom.xml
+++ b/testing/trino-product-tests/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-product-tests</artifactId>
-    <name>trino-product-tests</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,91 +17,66 @@
         <air.check.skip-duplicate-finder>true</air.check.skip-duplicate-finder>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>confluent</id>
-            <url>https://packages.confluent.io/maven/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hive</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpclient</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-jdbc</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.squareup.okio</groupId>
-                    <artifactId>okio</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.squareup.okhttp</groupId>
-                    <artifactId>okhttp</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-glue</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-containers</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-s3</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
+            <groupId>com.datastax.oss</groupId>
+            <artifactId>java-driver-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hive</groupId>
-            <artifactId>hive-apache</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hive</groupId>
-            <artifactId>hive-thrift</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.tempto</groupId>
-            <artifactId>tempto-core</artifactId>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
             <exclusions>
                 <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpclient</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpcore</artifactId>
+                    <groupId>com.squareup.okio</groupId>
+                    <artifactId>okio</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.tempto</groupId>
-            <artifactId>tempto-kafka</artifactId>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp-tls</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.tempto</groupId>
-            <artifactId>tempto-ldap</artifactId>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp-urlconnection</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.tempto</groupId>
-            <artifactId>tempto-runner</artifactId>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
         </dependency>
 
         <dependency>
@@ -131,44 +105,47 @@
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-glue</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-s3</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.datastax.oss</groupId>
-            <artifactId>java-driver-core</artifactId>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-protobuf-provider</artifactId>
+            <!-- This is under Confluent Community License and we use it under compile scope only for tests -->
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-cli</groupId>
+                    <artifactId>commons-cli</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-schema-registry-client</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hive</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-jdbc</artifactId>
             <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>com.squareup.okio</groupId>
                     <artifactId>okio</artifactId>
@@ -177,46 +154,63 @@
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp-tls</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-containers</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp-urlconnection</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe</artifactId>
+            <groupId>io.trino.hive</groupId>
+            <artifactId>hive-thrift</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>kafka-protobuf-provider</artifactId>
-            <!-- This is under Confluent Community License and we use it under compile scope only for tests -->
-            <scope>compile</scope>
+            <groupId>io.trino.tempto</groupId>
+            <artifactId>tempto-core</artifactId>
             <exclusions>
                 <exclusion>
-                    <groupId>commons-cli</groupId>
-                    <artifactId>commons-cli</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>kafka-schema-registry-client</artifactId>
+            <groupId>io.trino.tempto</groupId>
+            <artifactId>tempto-kafka</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
+            <groupId>io.trino.tempto</groupId>
+            <artifactId>tempto-ldap</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino.tempto</groupId>
+            <artifactId>tempto-runner</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-hadoop</artifactId>
         </dependency>
 
         <dependency>
@@ -230,20 +224,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-resources</artifactId>
-            <scope>runtime</scope>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.hive</groupId>
-            <artifactId>hive-apache-jdbc</artifactId>
-            <scope>runtime</scope>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
         </dependency>
 
         <dependency>
@@ -254,14 +241,14 @@
         </dependency>
 
         <dependency>
-            <groupId>com.databricks</groupId>
-            <artifactId>databricks-jdbc</artifactId>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>runtime</scope>
         </dependency>
 
@@ -279,9 +266,22 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-resources</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino.hive</groupId>
+            <artifactId>hive-apache-jdbc</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
+            <version>2.1.1</version>
             <!--
             It is required by SchemaRegistryClient. The actual dependencies
             are excluded from SchemaRegistryClient as it conflicts with Trino's dependency
@@ -289,9 +289,10 @@
             <scope>runtime</scope>
         </dependency>
 
+        <!-- TODO: move it to airlift -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-xml</artifactId>
             <scope>runtime</scope>
         </dependency>
 
@@ -314,18 +315,28 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>confluent</id>
+            <url>https://packages.confluent.io/maven/</url>
+        </repository>
+    </repositories>
+
     <build>
         <resources>
             <resource>
-                <directory>src/main/resources</directory>
                 <filtering>true</filtering>
+                <directory>src/main/resources</directory>
                 <includes>
                     <include>trino-cli-version.txt</include>
                 </includes>
             </resource>
             <resource>
-                <directory>src/main/resources</directory>
                 <filtering>false</filtering>
+                <directory>src/main/resources</directory>
                 <excludes>
                     <exclude>trino-cli-version.txt</exclude>
                 </excludes>
@@ -338,10 +349,10 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <phase>package</phase>
                         <configuration>
                             <!--
                             trino-product-tests has a dependency on SQL Server (mssql-jdbc) which is a signed jar.
@@ -363,6 +374,7 @@
                             </filters>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>executable</shadedClassifierName>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestAlterTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestAlterTable.java
index f97c8f54dc2b..8f059c1c900e 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestAlterTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestAlterTable.java
@@ -13,8 +13,8 @@
  */
 package io.trino.tests.product;
 
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.Requires;
 import io.trino.tempto.fulfillment.table.hive.tpch.ImmutableTpchTablesRequirements.ImmutableNationTable;
@@ -22,11 +22,11 @@
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.ALTER_TABLE;
 import static io.trino.tests.product.TestGroups.SMOKE;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Requires(ImmutableNationTable.class)
 public class TestAlterTable
@@ -35,8 +35,8 @@ public class TestAlterTable
     private static final String TABLE_NAME = "table_name";
     private static final String RENAMED_TABLE_NAME = "renamed_table_name";
 
-    @BeforeTestWithContext
-    @AfterTestWithContext
+    @BeforeMethodWithContext
+    @AfterMethodWithContext
     public void dropTestTables()
     {
         onTrino().executeQuery(format("DROP TABLE IF EXISTS %s", TABLE_NAME));
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestConfiguredFeatures.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestConfiguredFeatures.java
index 0d0e0570db83..14643da66f02 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestConfiguredFeatures.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestConfiguredFeatures.java
@@ -23,10 +23,10 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.CONFIGURED_FEATURES;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.sql.JDBCType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests in this class verify that the test environments have been defined correctly,
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateDropView.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateDropView.java
index 87e2222948ff..9d402b1d0e88 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateDropView.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateDropView.java
@@ -19,13 +19,13 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.context.ContextDsl.executeWith;
 import static io.trino.tempto.sql.SqlContexts.createViewAs;
 import static io.trino.tests.product.TestGroups.CREATE_DROP_VIEW;
 import static io.trino.tests.product.TestGroups.SMOKE;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Requires(ImmutableNationTable.class)
 public class TestCreateDropView
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateTable.java
index 5cb49fd8615a..1ef8ef2867b2 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateTable.java
@@ -19,11 +19,11 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.CREATE_TABLE;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Requires(ImmutableNationTable.class)
 public class TestCreateTable
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestFunctions.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestFunctions.java
index 3a9f3a8a8309..45a204ad686f 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestFunctions.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestFunctions.java
@@ -17,9 +17,9 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.FUNCTIONS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 public class TestFunctions
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestGroups.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestGroups.java
index 21a512e2f3e3..1d4b1c7a32c0 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestGroups.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestGroups.java
@@ -28,6 +28,7 @@ public final class TestGroups
     public static final String BLACKHOLE_CONNECTOR = "blackhole";
     public static final String SMOKE = "smoke";
     public static final String JDBC = "jdbc";
+    public static final String JDBC_KERBEROS_CONSTRAINED_DELEGATION = "jdbc_kerberos_constrained_delegation";
     public static final String OAUTH2 = "oauth2";
     public static final String OAUTH2_REFRESH = "oauth2_refresh";
     public static final String MYSQL = "mysql";
@@ -69,24 +70,29 @@ public final class TestGroups
     public static final String CANCEL_QUERY = "cancel_query";
     public static final String LARGE_QUERY = "large_query";
     public static final String KAFKA = "kafka";
+    public static final String KAFKA_CONFLUENT_LICENSE = "kafka_confluent_license";
     public static final String TWO_HIVES = "two_hives";
     public static final String ICEBERG = "iceberg";
     public static final String ICEBERG_FORMAT_VERSION_COMPATIBILITY = "iceberg_format_version_compatibility";
     public static final String ICEBERG_REST = "iceberg_rest";
     public static final String ICEBERG_JDBC = "iceberg_jdbc";
+    public static final String ICEBERG_NESSIE = "iceberg_nessie";
     public static final String AVRO = "avro";
     public static final String PHOENIX = "phoenix";
     public static final String CLICKHOUSE = "clickhouse";
     public static final String KUDU = "kudu";
     public static final String MARIADB = "mariadb";
+    public static final String SNOWFLAKE = "snowflake";
     public static final String DELTA_LAKE_OSS = "delta-lake-oss";
     public static final String DELTA_LAKE_HDFS = "delta-lake-hdfs";
     public static final String DELTA_LAKE_MINIO = "delta-lake-minio";
     public static final String DELTA_LAKE_GCS = "delta-lake-gcs";
     public static final String DELTA_LAKE_DATABRICKS = "delta-lake-databricks";
-    public static final String DELTA_LAKE_EXCLUDE_73 = "delta-lake-exclude-73";
+    public static final String DELTA_LAKE_DATABRICKS_104 = "delta-lake-databricks-104";
+    public static final String DELTA_LAKE_DATABRICKS_113 = "delta-lake-databricks-113";
+    public static final String DELTA_LAKE_DATABRICKS_122 = "delta-lake-databricks-122";
     public static final String DELTA_LAKE_EXCLUDE_91 = "delta-lake-exclude-91";
-    public static final String DELTA_LAKE_EXCLUDE_113 = "delta-lake-exclude-113";
+    public static final String DELTA_LAKE_EXCLUDE_133 = "delta-lake-exclude-133";
     public static final String HUDI = "hudi";
     public static final String PARQUET = "parquet";
     public static final String IGNITE = "ignite";
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestImpersonation.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestImpersonation.java
index 7ab1f6673c50..ad5d7b8f26f4 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestImpersonation.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestImpersonation.java
@@ -15,8 +15,8 @@
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import io.trino.tempto.query.QueryExecutor;
@@ -24,9 +24,10 @@
 import org.testng.annotations.Test;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.HDFS_IMPERSONATION;
 import static io.trino.tests.product.TestGroups.HDFS_NO_IMPERSONATION;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
@@ -34,12 +35,14 @@
 import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_MATCH;
 import static io.trino.tests.product.utils.QueryExecutors.connectToTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 public class TestImpersonation
         extends ProductTest
 {
     private QueryExecutor aliceExecutor;
+    private QueryExecutor bobExecutor;
 
     @Inject
     private HdfsClient hdfsClient;
@@ -48,6 +51,10 @@ public class TestImpersonation
     @Named("databases.alice@presto.jdbc_user")
     private String aliceJdbcUser;
 
+    @Inject
+    @Named("databases.bob@presto.jdbc_user")
+    private String bobJdbcUser;
+
     // The value for configuredHdfsUser is profile dependent
     // For non-Kerberos environments this variable will be equal to -DHADOOP_USER_NAME as set in jvm.config
     // For Kerberized environments this variable will be equal to the hive.hdfs.trino.principal property as set in hive.properties
@@ -55,17 +62,65 @@ public class TestImpersonation
     @Named("databases.presto.configured_hdfs_user")
     private String configuredHdfsUser;
 
-    @BeforeTestWithContext
+    @Inject
+    @Named("databases.hive.warehouse_directory_path")
+    private String warehouseLocation;
+
+    @BeforeMethodWithContext
     public void setup()
     {
         aliceExecutor = connectToTrino("alice@presto");
+        bobExecutor = connectToTrino("bob@presto");
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void cleanup()
     {
         // should not be closed, this would close a shared, global QueryExecutor
         aliceExecutor = null;
+        bobExecutor = null;
+    }
+
+    @Test(groups = {HDFS_IMPERSONATION, PROFILE_SPECIFIC_TESTS})
+    public void testExternalLocationTableCreationFailure()
+    {
+        String commonExternalLocationPath = warehouseLocation + "/nested_" + randomNameSuffix();
+
+        String tableNameBob = "bob_external_table" + randomNameSuffix();
+        String tableLocationBob = commonExternalLocationPath + "/bob_table";
+        bobExecutor.executeQuery(format("CREATE TABLE %s (a bigint) WITH (external_location = '%s')", tableNameBob, tableLocationBob));
+        String owner = hdfsClient.getOwner(commonExternalLocationPath);
+        assertEquals(owner, bobJdbcUser);
+
+        String tableNameAlice = "alice_external_table" + randomNameSuffix();
+        String tableLocationAlice = commonExternalLocationPath + "/alice_table";
+        assertQueryFailure(() -> aliceExecutor.executeQuery(format("CREATE TABLE %s (a bigint) WITH (external_location = '%s')", tableNameAlice, tableLocationAlice)))
+                .hasStackTraceContaining("Permission denied");
+
+        bobExecutor.executeQuery(format("DROP TABLE IF EXISTS %s", tableNameBob));
+        aliceExecutor.executeQuery(format("DROP TABLE IF EXISTS %s", tableNameAlice));
+    }
+
+    @Test(groups = {HDFS_NO_IMPERSONATION, PROFILE_SPECIFIC_TESTS})
+    public void testExternalLocationTableCreationSuccess()
+    {
+        String commonExternalLocationPath = warehouseLocation + "/nested_" + randomNameSuffix();
+
+        String tableNameBob = "bob_external_table" + randomNameSuffix();
+        String tableLocationBob = commonExternalLocationPath + "/bob_table";
+        bobExecutor.executeQuery(format("CREATE TABLE %s (a bigint) WITH (external_location = '%s')", tableNameBob, tableLocationBob));
+        String owner = hdfsClient.getOwner(tableLocationBob);
+        assertEquals(owner, configuredHdfsUser);
+
+        String tableNameAlice = "alice_external_table" + randomNameSuffix();
+        String tableLocationAlice = commonExternalLocationPath + "/alice_table";
+        aliceExecutor.executeQuery(format("CREATE TABLE %s (a bigint) WITH (external_location = '%s')", tableNameAlice, tableLocationAlice));
+        assertThat(aliceExecutor.executeQuery(format("SELECT * FROM %s", tableNameAlice))).hasRowsCount(0);
+        owner = hdfsClient.getOwner(tableLocationAlice);
+        assertEquals(owner, configuredHdfsUser);
+
+        bobExecutor.executeQuery(format("DROP TABLE IF EXISTS %s", tableNameBob));
+        aliceExecutor.executeQuery(format("DROP TABLE IF EXISTS %s", tableNameAlice));
     }
 
     @Test(groups = {HDFS_NO_IMPERSONATION, PROFILE_SPECIFIC_TESTS})
@@ -89,13 +144,7 @@ private static String getTableLocation(QueryExecutor executor, String tableName)
     {
         String location = getOnlyElement(executor.executeQuery(format("SELECT DISTINCT regexp_replace(\"$path\", '/[^/]*$', '') FROM %s", tableName)).column(1));
         if (location.startsWith("hdfs://")) {
-            try {
-                URI uri = new URI(location);
-                return uri.getPath();
-            }
-            catch (URISyntaxException e) {
-                throw new RuntimeException(e);
-            }
+            return URI.create(location).getPath();
         }
         return location;
     }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestJmxConnector.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestJmxConnector.java
index 83870611caff..5924e16aa8a8 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestJmxConnector.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestJmxConnector.java
@@ -16,12 +16,12 @@
 import io.trino.tempto.ProductTest;
 import org.testng.annotations.Test;
 
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.JDBC;
 import static io.trino.tests.product.TestGroups.JMX_CONNECTOR;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.sql.JDBCType.BIGINT;
 import static java.sql.JDBCType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJmxConnector
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestParquet.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestParquet.java
index 6958c3ba11d9..2ae3bb520b1a 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestParquet.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestParquet.java
@@ -13,97 +13,40 @@
  */
 package io.trino.tests.product;
 
-import com.google.common.base.CharMatcher;
 import com.google.common.io.Resources;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
-import org.assertj.core.data.Percentage;
-import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.io.Resources.getResource;
 import static io.trino.tests.product.TestGroups.PARQUET;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.TpcTestUtils.assertResults;
+import static io.trino.tests.product.TpcTestUtils.createTpcdsAndTpchDatasets;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.data.Percentage.withPercentage;
 
 @SuppressWarnings("UnstableApiUsage")
 public class TestParquet
         extends ProductTest
 {
-    // Do not increase this value without examination and multiple local runs.
-    // 1E-10 fails roughly once every 100 - 1000 runs.
-    // 1.1E-10 should be orders of magnitude safer.
-    private static final Percentage DOUBLE_COMPARISON_ACCURACY = withPercentage(1.1E-10);
-
-    private static final String[] TPCDS_TABLES = {
-            "call_center",
-            "catalog_page",
-            "catalog_returns",
-            "catalog_sales",
-            "customer",
-            "customer_address",
-            "customer_demographics",
-            "date_dim",
-            "household_demographics",
-            "income_band",
-            "inventory",
-            "item",
-            "promotion",
-            "reason",
-            "ship_mode",
-            "store",
-            "store_returns",
-            "store_sales",
-            "time_dim",
-            "warehouse",
-            "web_page",
-            "web_returns",
-            "web_sales",
-            "web_site"};
-
-    private static final String[] TPCH_TABLES = {
-            "nation",
-            "region",
-            "part",
-            "supplier",
-            "partsupp",
-            "customer",
-            "orders",
-            "lineitem"};
-
     private volatile boolean initialized;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void init()
     {
         if (initialized) {
             return;
         }
-        onTrino().executeQuery("CREATE SCHEMA hive.tpch");
-        onTrino().executeQuery("CREATE SCHEMA hive.tpcds");
-
-        for (String table : TPCDS_TABLES) {
-            onTrino().executeQuery("CREATE TABLE hive.tpcds." + table + " WITH (format='PARQUET') AS SELECT * FROM tpcds.sf1." + table);
-        }
-        for (String table : TPCH_TABLES) {
-            onTrino().executeQuery("CREATE TABLE hive.tpch." + table + " WITH (format='PARQUET') AS SELECT * FROM tpch.sf1." + table);
-        }
+        createTpcdsAndTpchDatasets("hive");
         initialized = true;
     }
 
-    @Test(groups = {PARQUET, PROFILE_SPECIFIC_TESTS}, dataProvider = "tpcdsQueries")
+    @Test(groups = {PARQUET, PROFILE_SPECIFIC_TESTS}, dataProvider = "tpcdsQueries", dataProviderClass = TpcTestUtils.class)
     public void testTpcds(String queryId)
             throws IOException
     {
@@ -116,7 +59,7 @@ public void testTpcds(String queryId)
         assertResults(expected, query);
     }
 
-    @Test(groups = {PARQUET, PROFILE_SPECIFIC_TESTS}, dataProvider = "tpchQueries")
+    @Test(groups = {PARQUET, PROFILE_SPECIFIC_TESTS}, dataProvider = "tpchQueries", dataProviderClass = TpcTestUtils.class)
     public void testTpch(String queryId)
             throws IOException
     {
@@ -128,80 +71,4 @@ public void testTpch(String queryId)
         onTrino().executeQuery("USE hive.tpch");
         assertResults(expected, query);
     }
-
-    /**
-     * We use hardcoded results from Trino tpch/tpcds suite stored as plain text.
-     * Some minor conversions are needed:
-     * Double values may different at last bits due to decimal conversion to text.
-     * Big decimal values may have trailing zeros and dots
-     */
-    private void assertResults(List<String> expected, String query)
-    {
-        List<List<?>> result = onTrino().executeQuery(query).rows();
-        assertThat(result.size()).isEqualTo(expected.size());
-
-        for (int i = 0; i < expected.size(); i++) {
-            String expectedRow = expected.get(i);
-            String[] expectedValues = expectedRow.split("\\|");
-            List<?> resultRow = result.get(i);
-
-            assertThat(expectedValues.length).isEqualTo(resultRow.size());
-            for (int j = 0; j < expectedValues.length; j++) {
-                String expectedValue = expectedValues[j];
-                Object resultValue = resultRow.get(j);
-                if (resultValue instanceof Double) {
-                    expectedValue = trimIfNeeded(expectedValue);
-                    BigDecimal expectedDecimal = new BigDecimal(expectedValue);
-                    BigDecimal resultDecimal = BigDecimal.valueOf((Double) resultValue);
-                    resultDecimal = resultDecimal.setScale(expectedDecimal.scale(), RoundingMode.HALF_DOWN);
-
-                    assertThat(expectedDecimal).isCloseTo(resultDecimal, DOUBLE_COMPARISON_ACCURACY);
-                }
-                else if (resultValue instanceof BigDecimal) {
-                    assertThat(trimIfNeeded(Objects.toString(resultValue))).isEqualTo(trimIfNeeded(expectedValue));
-                }
-                else {
-                    assertThat(Objects.toString(resultValue)).isEqualTo(expectedValue);
-                }
-            }
-        }
-    }
-
-    private String trimIfNeeded(String value)
-    {
-        // Trim zeros and a trailing dot to match Big Decimals in different formats
-        if (value.contains(".")) {
-            return CharMatcher.is('.').trimTrailingFrom(
-                    CharMatcher.is('0').trimTrailingFrom(value));
-        }
-        return value;
-    }
-
-    @DataProvider
-    public static Object[][] tpchQueries()
-    {
-        return IntStream.range(1, 23)
-                .filter(i -> i != 15) // Query creates a view beforehand, not supported here
-                .mapToObj(i -> String.format("%02d", i))
-                .sorted()
-                .map(value -> new Object[] {value})
-                .toArray(Object[][]::new);
-    }
-
-    @DataProvider
-    public static Object[][] tpcdsQueries()
-    {
-        return Stream.concat(
-                IntStream.range(1, 100)
-                        .filter(i -> i != 14) // There are two queries with id 14, 23, 24 and 39
-                        .filter(i -> i != 23)
-                        .filter(i -> i != 24)
-                        .filter(i -> i != 39)
-                        .filter(i -> i != 72) // TODO Results for q72 need to be fixed. https://github.com/trinodb/trino/issues/4564
-                        .mapToObj(i -> String.format("%02d", i)),
-                Stream.of("14_1", "14_2", "23_1", "23_2", "24_2", "39_1", "39_2")) // 24_1 is ignored as it relies on the order of the result
-                .sorted()
-                .map(value -> new Object[] {value})
-                .toArray(Object[][]::new);
-    }
 }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSimpleQuery.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSimpleQuery.java
index a06678b78165..11a44877cfa5 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSimpleQuery.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSimpleQuery.java
@@ -13,13 +13,12 @@
  */
 package io.trino.tests.product;
 
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.Requirement;
 import io.trino.tempto.RequirementsProvider;
 import io.trino.tempto.Requires;
-import io.trino.tempto.assertions.QueryAssert;
 import io.trino.tempto.configuration.Configuration;
 import io.trino.tempto.fulfillment.table.ImmutableTableRequirement;
 import org.testng.annotations.Test;
@@ -45,13 +44,13 @@ public Requirement getRequirements(Configuration configuration)
         }
     }
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void beforeTest()
     {
         assertThat(testContextIfSet().isPresent()).isTrue();
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void afterTest()
     {
         assertThat(testContextIfSet().isPresent()).isTrue();
@@ -61,14 +60,14 @@ public void afterTest()
     @Requires(SimpleTestRequirements.class)
     public void selectAllFromNation()
     {
-        QueryAssert.assertThat(onTrino().executeQuery("select * from nation")).hasRowsCount(25);
+        assertThat(onTrino().executeQuery("select * from nation")).hasRowsCount(25);
     }
 
     @Test(groups = {SIMPLE, SMOKE})
     @Requires(SimpleTestRequirements.class)
     public void selectCountFromNation()
     {
-        QueryAssert.assertThat(onTrino().executeQuery("select count(*) from nation"))
+        assertThat(onTrino().executeQuery("select count(*) from nation"))
                 .hasRowsCount(1)
                 .contains(row(25));
     }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSqlCancel.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSqlCancel.java
index 5e05dee988f8..4ccf81292643 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSqlCancel.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSqlCancel.java
@@ -24,11 +24,10 @@
 import io.airlift.http.client.Response;
 import io.airlift.http.client.ResponseHandler;
 import io.airlift.http.client.jetty.JettyHttpClient;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.query.QueryResult;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.Test;
 
 import java.io.Closeable;
@@ -44,7 +43,6 @@
 import static io.airlift.http.client.Request.Builder.prepareDelete;
 import static io.airlift.http.client.ResponseHandlerUtils.propagate;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.CANCEL_QUERY;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
@@ -53,6 +51,7 @@
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.fail;
 
 public class TestSqlCancel
@@ -66,7 +65,7 @@ public class TestSqlCancel
     @Named("databases.presto.server_address")
     private String serverAddress;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         closer = Closer.create();
@@ -75,7 +74,7 @@ public void setUp()
         queryCanceller = closer.register(new QueryCanceller(serverAddress));
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void cleanUp()
             throws IOException
     {
@@ -132,7 +131,7 @@ private void runAndCancelQuery(String sql)
             throw e;
         }
         catch (ExecutionException expected) {
-            Assertions.assertThat(expected.getCause())
+            assertThat(expected.getCause())
                     .hasMessageEndingWith("Query was canceled");
         }
     }
@@ -148,7 +147,7 @@ private void cancelQuery(String sql)
             if (queryResult.getRowsCount() == 1) {
                 String queryId = (String) queryResult.getOnlyValue();
                 Response response = queryCanceller.cancel(queryId);
-                Assertions.assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT.code());
+                assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT.code());
                 return;
             }
             MILLISECONDS.sleep(100L);
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSystemConnector.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSystemConnector.java
index 65c33cbb6eee..77c12661ff25 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSystemConnector.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestSystemConnector.java
@@ -18,7 +18,6 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.JDBC;
 import static io.trino.tests.product.TestGroups.SYSTEM_CONNECTOR;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
@@ -26,6 +25,7 @@
 import static java.sql.JDBCType.BIGINT;
 import static java.sql.JDBCType.TIMESTAMP_WITH_TIMEZONE;
 import static java.sql.JDBCType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSystemConnector
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestTwoHives.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestTwoHives.java
index a0a159bf6844..c393610bf37f 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestTwoHives.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestTwoHives.java
@@ -20,13 +20,13 @@
 import java.util.List;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.TestGroups.TWO_HIVES;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.Math.pow;
 import static java.lang.String.format;
 import static java.util.stream.Collectors.joining;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTwoHives
 {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TpcTestUtils.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TpcTestUtils.java
new file mode 100644
index 000000000000..ac1db384fc0b
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TpcTestUtils.java
@@ -0,0 +1,175 @@
+/*
+ * Licensed 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 io.trino.tests.product;
+
+import com.google.common.base.CharMatcher;
+import org.assertj.core.data.Percentage;
+import org.testng.annotations.DataProvider;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.data.Percentage.withPercentage;
+
+public final class TpcTestUtils
+{
+    // Do not increase this value without examination and multiple local runs.
+    // 1E-10 fails roughly once every 100 - 1000 runs.
+    // 1.1E-10 should be orders of magnitude safer.
+    private static final Percentage DOUBLE_COMPARISON_ACCURACY = withPercentage(1.1E-10);
+
+    private static final String[] TPCDS_TABLES = {
+            "call_center",
+            "catalog_page",
+            "catalog_returns",
+            "catalog_sales",
+            "customer",
+            "customer_address",
+            "customer_demographics",
+            "date_dim",
+            "household_demographics",
+            "income_band",
+            "inventory",
+            "item",
+            "promotion",
+            "reason",
+            "ship_mode",
+            "store",
+            "store_returns",
+            "store_sales",
+            "time_dim",
+            "warehouse",
+            "web_page",
+            "web_returns",
+            "web_sales",
+            "web_site"};
+
+    private static final String[] TPCH_TABLES = {
+            "nation",
+            "region",
+            "part",
+            "supplier",
+            "partsupp",
+            "customer",
+            "orders",
+            "lineitem"};
+
+    private TpcTestUtils()
+    {
+    }
+
+    public static void createTpchDataset(String catalog)
+    {
+        onTrino().executeQuery("CREATE SCHEMA IF NOT EXISTS " + catalog + ".tpch");
+        for (String table : TPCH_TABLES) {
+            onTrino().executeQuery("CREATE TABLE IF NOT EXISTS " + catalog + ".tpch." + table + " WITH (format='PARQUET') AS SELECT * FROM tpch.sf1." + table);
+        }
+    }
+
+    public static void createTpcdsDataset(String catalog)
+    {
+        onTrino().executeQuery("CREATE SCHEMA IF NOT EXISTS " + catalog + ".tpcds");
+        for (String table : TPCDS_TABLES) {
+            onTrino().executeQuery("CREATE TABLE IF NOT EXISTS " + catalog + ".tpcds." + table + " WITH (format='PARQUET') AS SELECT * FROM tpcds.sf1." + table);
+        }
+    }
+
+    public static void createTpcdsAndTpchDatasets(String catalog)
+    {
+        createTpcdsDataset(catalog);
+        createTpchDataset(catalog);
+    }
+
+    @DataProvider
+    public static Object[][] tpchQueries()
+    {
+        return IntStream.range(1, 23)
+                .filter(i -> i != 15) // Query creates a view beforehand, not supported here
+                .mapToObj(i -> String.format("%02d", i))
+                .sorted()
+                .map(value -> new Object[] {value})
+                .toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public static Object[][] tpcdsQueries()
+    {
+        return Stream.concat(
+                        IntStream.range(1, 100)
+                                .filter(i -> i != 14) // There are two queries with id 14, 23, 24 and 39
+                                .filter(i -> i != 23)
+                                .filter(i -> i != 24)
+                                .filter(i -> i != 39)
+                                .filter(i -> i != 72) // TODO Results for q72 need to be fixed. https://github.com/trinodb/trino/issues/4564
+                                .mapToObj(i -> String.format("%02d", i)),
+                        Stream.of("14_1", "14_2", "23_1", "23_2", "24_2", "39_1", "39_2")) // 24_1 is ignored as it relies on the order of the result
+                .sorted()
+                .map(value -> new Object[] {value})
+                .toArray(Object[][]::new);
+    }
+
+    /**
+     * We use hardcoded results from Trino tpch/tpcds suite stored as plain text.
+     * Some minor conversions are needed:
+     * Double values may different at last bits due to decimal conversion to text.
+     * Big decimal values may have trailing zeros and dots
+     */
+    public static void assertResults(List<String> expected, String query)
+    {
+        List<List<?>> result = onTrino().executeQuery(query).rows();
+        assertThat(result.size()).isEqualTo(expected.size());
+
+        for (int i = 0; i < expected.size(); i++) {
+            String expectedRow = expected.get(i);
+            String[] expectedValues = expectedRow.split("\\|");
+            List<?> resultRow = result.get(i);
+
+            assertThat(expectedValues.length).isEqualTo(resultRow.size());
+            for (int j = 0; j < expectedValues.length; j++) {
+                String expectedValue = expectedValues[j];
+                Object resultValue = resultRow.get(j);
+                if (resultValue instanceof Double) {
+                    expectedValue = trimIfNeeded(expectedValue);
+                    BigDecimal expectedDecimal = new BigDecimal(expectedValue);
+                    BigDecimal resultDecimal = BigDecimal.valueOf((Double) resultValue);
+                    resultDecimal = resultDecimal.setScale(expectedDecimal.scale(), RoundingMode.HALF_DOWN);
+
+                    assertThat(expectedDecimal).isCloseTo(resultDecimal, DOUBLE_COMPARISON_ACCURACY);
+                }
+                else if (resultValue instanceof BigDecimal) {
+                    assertThat(trimIfNeeded(Objects.toString(resultValue))).isEqualTo(trimIfNeeded(expectedValue));
+                }
+                else {
+                    assertThat(Objects.toString(resultValue)).isEqualTo(expectedValue);
+                }
+            }
+        }
+    }
+
+    public static String trimIfNeeded(String value)
+    {
+        // Trim zeros and a trailing dot to match Big Decimals in different formats
+        if (value.contains(".")) {
+            return CharMatcher.is('.').trimTrailingFrom(
+                    CharMatcher.is('0').trimTrailingFrom(value));
+        }
+        return value;
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/blackhole/TestBlackHoleConnector.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/blackhole/TestBlackHoleConnector.java
index dc695abdc6ca..64ab1998aa8a 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/blackhole/TestBlackHoleConnector.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/blackhole/TestBlackHoleConnector.java
@@ -19,10 +19,10 @@
 import java.util.UUID;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.BLACKHOLE_CONNECTOR;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBlackHoleConnector
 {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestInsertIntoCassandraTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestInsertIntoCassandraTable.java
index fc14500a7f3c..c34a33213025 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestInsertIntoCassandraTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestInsertIntoCassandraTable.java
@@ -30,7 +30,6 @@
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED;
 import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState;
 import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable;
@@ -43,6 +42,7 @@
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestInsertIntoCassandraTable
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelect.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelect.java
index f0e22e5a5287..93c4ccffd0b8 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelect.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelect.java
@@ -21,7 +21,6 @@
 import io.trino.tempto.configuration.Configuration;
 import io.trino.tempto.internal.query.CassandraQueryExecutor;
 import io.trino.tempto.query.QueryResult;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.Test;
 
 import java.sql.Date;
@@ -33,7 +32,6 @@
 
 import static io.trino.tempto.Requirements.compose;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable;
 import static io.trino.tests.product.TestGroups.CASSANDRA;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
@@ -60,6 +58,7 @@
 import static java.sql.JDBCType.VARBINARY;
 import static java.sql.JDBCType.VARCHAR;
 import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSelect
         extends ProductTest
@@ -391,8 +390,8 @@ public void testSelectTupleType()
         QueryResult queryResult = onTrino().executeQuery(
                  format("SELECT * FROM %s.%s.%s", CONNECTOR_NAME, KEY_SPACE, tableName));
         assertThat(queryResult).hasRowsCount(1);
-        Assertions.assertThat(queryResult.row(0).get(0)).isEqualTo(1);
-        Assertions.assertThat(queryResult.row(0).get(1)).isEqualTo(Row.builder()
+        assertThat(queryResult.row(0).get(0)).isEqualTo(1);
+        assertThat(queryResult.row(0).get(1)).isEqualTo(Row.builder()
                 .addUnnamedField(1)
                 .addUnnamedField("text-1")
                 .addUnnamedField(1.11f)
@@ -414,8 +413,8 @@ public void testSelectTupleTypeInPrimaryKey()
 
         Consumer<QueryResult> assertion = queryResult -> {
             assertThat(queryResult).hasRowsCount(1);
-            Assertions.assertThat(queryResult.row(0).get(0)).isEqualTo(1);
-            Assertions.assertThat(queryResult.row(0).get(1)).isEqualTo(Row.builder()
+            assertThat(queryResult.row(0).get(0)).isEqualTo(1);
+            assertThat(queryResult.row(0).get(1)).isEqualTo(Row.builder()
                     .addUnnamedField(1)
                     .addUnnamedField("text-1")
                     .addUnnamedField(1.11f)
@@ -550,8 +549,8 @@ public void testSelectUserDefinedTypeInPrimaryKey()
 
         Consumer<QueryResult> assertion = queryResult -> {
             assertThat(queryResult).hasRowsCount(1);
-            Assertions.assertThat(queryResult.row(0).get(0)).isEqualTo(1);
-            Assertions.assertThat(queryResult.row(0).get(1)).isEqualTo(Row.builder()
+            assertThat(queryResult.row(0).get(0)).isEqualTo(1);
+            assertThat(queryResult.row(0).get(1)).isEqualTo(Row.builder()
                     .addField("field1", "udt-1")
                     .build());
         };
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelectMultiColumnKey.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelectMultiColumnKey.java
index ac8c27dc1fa8..3fdc6a3ff855 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelectMultiColumnKey.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cassandra/TestSelectMultiColumnKey.java
@@ -21,7 +21,6 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable;
 import static io.trino.tests.product.TestGroups.CASSANDRA;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
@@ -30,6 +29,7 @@
 import static io.trino.tests.product.cassandra.TestConstants.KEY_SPACE;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSelectMultiColumnKey
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cli/TestTrinoCli.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cli/TestTrinoCli.java
index cf0426bf3c09..9ecf3fc9c640 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cli/TestTrinoCli.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cli/TestTrinoCli.java
@@ -20,7 +20,7 @@
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import io.airlift.testing.TempFile;
-import io.trino.tempto.AfterTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
 import io.trino.tempto.Requirement;
 import io.trino.tempto.RequirementsProvider;
 import io.trino.tempto.configuration.Configuration;
@@ -95,7 +95,7 @@ public TestTrinoCli()
             throws IOException
     {}
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     @Override
     public void stopCli()
             throws InterruptedException
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cli/TestTrinoLdapCli.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cli/TestTrinoLdapCli.java
index 795bb82d03ed..95b98d8d7bb4 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/cli/TestTrinoLdapCli.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/cli/TestTrinoLdapCli.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.trino.tempto.AfterTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
 import io.trino.tempto.Requirement;
 import io.trino.tempto.RequirementsProvider;
 import io.trino.tempto.configuration.Configuration;
@@ -93,7 +93,7 @@ public TestTrinoLdapCli()
             throws IOException
     {}
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     @Override
     public void stopCli()
             throws InterruptedException
@@ -229,7 +229,7 @@ public void shouldFailQueryForEmptyUser()
         ldapUserName = "";
         launchTrinoCliWithServerArgument("--execute", SELECT_FROM_NATION);
         assertThat(trimLines(trino.readRemainingErrorLines())).anySatisfy(line ->
-                assertThat(line).contains("Malformed credentials: user is empty"));
+                assertThat(line).contains("Both username and password must be specified"));
     }
 
     @Test(groups = {LDAP, LDAP_CLI, PROFILE_SPECIFIC_TESTS}, timeOut = TIMEOUT)
@@ -252,8 +252,8 @@ public void shouldFailQueryForLdapWithoutHttps()
         ldapServerAddress = format("http://%s:8443", serverHost);
         launchTrinoCliWithServerArgument("--execute", SELECT_FROM_NATION);
         assertThat(trimLines(trino.readRemainingErrorLines())).anySatisfy(line ->
-                assertThat(line).contains("Authentication using username/password requires HTTPS to be enabled"));
-        skipAfterTestWithContext();
+                assertThat(line).contains("TLS/SSL required for authentication with username and password"));
+        skipAfterMethodWithContext();
     }
 
     @Test(groups = {LDAP, LDAP_CLI, PROFILE_SPECIFIC_TESTS}, timeOut = TIMEOUT)
@@ -264,10 +264,10 @@ public void shouldFailForIncorrectTrustStore()
         launchTrinoCliWithServerArgument("--execute", SELECT_FROM_NATION);
         assertThat(trimLines(trino.readRemainingErrorLines())).anySatisfy(line ->
                 assertThat(line).contains("Error setting up SSL: keystore password was incorrect"));
-        skipAfterTestWithContext();
+        skipAfterMethodWithContext();
     }
 
-    private void skipAfterTestWithContext()
+    private void skipAfterMethodWithContext()
     {
         trino.close();
         trino = null;
@@ -291,7 +291,7 @@ public void shouldFailForUserWithColon()
         launchTrinoCliWithServerArgument("--execute", SELECT_FROM_NATION);
         assertThat(trimLines(trino.readRemainingErrorLines())).anySatisfy(line ->
                 assertThat(line).contains("Illegal character ':' found in username"));
-        skipAfterTestWithContext();
+        skipAfterMethodWithContext();
     }
 
     @Test(groups = {LDAP_AND_FILE_CLI, PROFILE_SPECIFIC_TESTS}, timeOut = TIMEOUT)
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/clickhouse/TestClickHouse.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/clickhouse/TestClickHouse.java
index 5a26f4b803ae..f10eafadc7ef 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/clickhouse/TestClickHouse.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/clickhouse/TestClickHouse.java
@@ -18,10 +18,10 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.CLICKHOUSE;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestClickHouse
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeHdfsReads.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeHdfsReads.java
index d2d9834a2e96..66e29269295d 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeHdfsReads.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeHdfsReads.java
@@ -15,7 +15,7 @@
 
 import com.google.common.reflect.ClassPath;
 import com.google.inject.Inject;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import org.testng.annotations.Test;
@@ -27,12 +27,12 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_HDFS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.util.Objects.requireNonNull;
 import static java.util.regex.Matcher.quoteReplacement;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class BaseTestDeltaLakeHdfsReads
         extends ProductTest
@@ -46,7 +46,7 @@ public BaseTestDeltaLakeHdfsReads(String regionResourcePath)
         this.regionResourcePath = requireNonNull(regionResourcePath, "regionResourcePath is null");
     }
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
             throws IOException
     {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeMinioReads.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeMinioReads.java
index 8e6ac35eee4e..351ea5a17a1e 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeMinioReads.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeMinioReads.java
@@ -13,8 +13,8 @@
  */
 package io.trino.tests.product.deltalake;
 
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.testing.minio.MinioClient;
 import org.testng.annotations.Test;
@@ -22,7 +22,6 @@
 import static io.minio.messages.EventType.OBJECT_ACCESSED_GET;
 import static io.minio.messages.EventType.OBJECT_ACCESSED_HEAD;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_MINIO;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.MinioNotificationsAssertions.assertNotificationsCount;
@@ -32,6 +31,7 @@
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class BaseTestDeltaLakeMinioReads
         extends ProductTest
@@ -50,7 +50,7 @@ public BaseTestDeltaLakeMinioReads(String regionTableName, String regionResource
         this.regionResourcePath = requireNonNull(regionResourcePath, "regionResourcePath is null");
     }
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         client = new MinioClient();
@@ -62,7 +62,7 @@ public void setUp()
         client.captureBucketNotifications(BUCKET_NAME, notification -> recordNotification(NOTIFICATIONS_TABLE, notification));
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void tearDown()
     {
         deleteNotificationsTable(NOTIFICATIONS_TABLE);
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeS3Storage.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeS3Storage.java
index d4d6724f24b8..a0ec14e63776 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeS3Storage.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/BaseTestDeltaLakeS3Storage.java
@@ -13,7 +13,7 @@
  */
 package io.trino.tests.product.deltalake;
 
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 
 import static java.util.Objects.requireNonNull;
@@ -23,7 +23,7 @@ public abstract class BaseTestDeltaLakeS3Storage
 {
     protected String bucketName;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         bucketName = requireNonNull(System.getenv("S3_BUCKET"), "Environment variable not set: S3_BUCKET");
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDatabricksWithGlueMetastoreCleanUp.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDatabricksWithGlueMetastoreCleanUp.java
index f728dcdb8c45..339432e4aa40 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDatabricksWithGlueMetastoreCleanUp.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDatabricksWithGlueMetastoreCleanUp.java
@@ -15,6 +15,9 @@
 
 import com.amazonaws.services.glue.AWSGlueAsync;
 import com.amazonaws.services.glue.AWSGlueAsyncClientBuilder;
+import com.amazonaws.services.glue.model.Database;
+import com.amazonaws.services.glue.model.EntityNotFoundException;
+import com.amazonaws.services.glue.model.GetDatabaseRequest;
 import com.amazonaws.services.glue.model.GetTableRequest;
 import com.amazonaws.services.glue.model.Table;
 import com.google.common.collect.ImmutableSet;
@@ -69,6 +72,20 @@ public void testCleanUpOldTablesUsingDelta()
 
     private void cleanSchema(String schema, long startTime, AWSGlueAsync glueClient)
     {
+        Database database;
+        try {
+            database = glueClient.getDatabase(new GetDatabaseRequest().withName(schema)).getDatabase();
+        }
+        catch (EntityNotFoundException ignored) {
+            // this may happen when database is being deleted concurrently
+            return;
+        }
+
+        if (database.getCreateTime().toInstant().isAfter(SCHEMA_CLEANUP_THRESHOLD)) {
+            log.info("Skip dropping recently created schema %s", schema);
+            return;
+        }
+
         Set<String> allTestTableNames = findAllTablesInSchema(schema).stream()
                 .filter(name -> name.toLowerCase(ENGLISH).startsWith("test"))
                 .collect(toImmutableSet());
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeActiveFilesCache.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeActiveFilesCache.java
index 60412d201c88..9e3aea2742bf 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeActiveFilesCache.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeActiveFilesCache.java
@@ -16,23 +16,20 @@
 import com.amazonaws.services.s3.AmazonS3;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.trino.tempto.BeforeTestWithContext;
-import io.trino.testng.services.Flaky;
+import io.trino.tempto.BeforeMethodWithContext;
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.removeS3Directory;
 import static io.trino.tests.product.utils.QueryExecutors.onDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDeltaLakeActiveFilesCache
         extends BaseTestDeltaLakeS3Storage
@@ -43,15 +40,14 @@ public class TestDeltaLakeActiveFilesCache
 
     private AmazonS3 s3;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setup()
     {
         super.setUp();
         s3 = new S3ClientFactory().createS3Client(s3ServerType);
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testRefreshTheFilesCacheWhenTableIsRecreated()
     {
         String tableName = "test_dl_cached_table_files_refresh_" + randomNameSuffix();
@@ -67,7 +63,7 @@ public void testRefreshTheFilesCacheWhenTableIsRecreated()
         assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).containsOnly(row(1));
 
         // Recreate the table outside Trino to avoid updating the Trino table active files cache
-        onDelta().executeQuery("DROP TABLE default." + tableName);
+        dropDeltaTableWithRetry("default." + tableName);
         // Delete the contents of the table explicitly from storage (because it has been created as `EXTERNAL`)
         removeS3Directory(s3, bucketName, tableDirectory);
 
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeAlterTableCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeAlterTableCompatibility.java
index ebca92e1b7dc..dbde393581fe 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeAlterTableCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeAlterTableCompatibility.java
@@ -13,10 +13,7 @@
  */
 package io.trino.tests.product.deltalake;
 
-import com.google.common.collect.ImmutableList;
-import io.trino.tempto.assertions.QueryAssert;
 import io.trino.testng.services.Flaky;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.Test;
 
 import java.util.List;
@@ -24,10 +21,8 @@
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_91;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
@@ -39,17 +34,19 @@
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getColumnCommentOnTrino;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getDatabricksRuntimeVersion;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTableCommentOnDelta;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTableCommentOnTrino;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTablePropertyOnDelta;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.skipTestUnlessUnsupportedWriterVersionExists;
 import static io.trino.tests.product.utils.QueryExecutors.onDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
 
 public class TestDeltaLakeAlterTableCompatibility
         extends BaseTestDeltaLakeS3Storage
 {
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testAddColumnWithCommentOnTrino()
     {
         String tableName = "test_dl_add_column_with_comment_" + randomNameSuffix();
@@ -70,32 +67,32 @@ public void testAddColumnWithCommentOnTrino()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testAddColumnUnsupportedWriterVersion()
     {
+        skipTestUnlessUnsupportedWriterVersionExists();
+
         String tableName = "test_dl_add_column_unsupported_writer_" + randomNameSuffix();
         String tableDirectory = "databricks-compatibility-test-" + tableName;
 
         onDelta().executeQuery(format("" +
                         "CREATE TABLE default.%s (col int) " +
                         "USING DELTA LOCATION 's3://%s/%s'" +
-                        "TBLPROPERTIES ('delta.minWriterVersion'='5')",
+                        "TBLPROPERTIES ('delta.minWriterVersion'='8')",
                 tableName,
                 bucketName,
                 tableDirectory));
 
         try {
             assertQueryFailure(() -> onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN new_col int"))
-                    .hasMessageMatching(".* Table .* requires Delta Lake writer version 5 which is not supported");
+                    .hasMessageMatching(".* Table .* requires Delta Lake writer version 8 which is not supported");
         }
         finally {
             dropDeltaTableWithRetry("default." + tableName);
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testRenameColumn()
     {
         String tableName = "test_dl_rename_column_" + randomNameSuffix();
@@ -127,8 +124,7 @@ public void testRenameColumn()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testRenamePartitionedColumn()
     {
         String tableName = "test_dl_rename_partitioned_column_" + randomNameSuffix();
@@ -161,8 +157,7 @@ public void testRenamePartitionedColumn()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testCommentOnTable()
     {
         String tableName = "test_dl_comment_table_" + randomNameSuffix();
@@ -175,9 +170,7 @@ public void testCommentOnTable()
 
         try {
             onTrino().executeQuery("COMMENT ON TABLE delta.default." + tableName + " IS 'test comment'");
-            assertThat(onTrino().executeQuery("SELECT comment FROM system.metadata.table_comments WHERE catalog_name = 'delta' AND schema_name = 'default' AND table_name = '" + tableName + "'"))
-                    .containsOnly(row("test comment"));
-
+            assertEquals(getTableCommentOnTrino("default", tableName), "test comment");
             assertEquals(getTableCommentOnDelta("default", tableName), "test comment");
         }
         finally {
@@ -185,32 +178,32 @@ public void testCommentOnTable()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testCommentOnTableUnsupportedWriterVersion()
     {
+        skipTestUnlessUnsupportedWriterVersionExists();
+
         String tableName = "test_dl_comment_table_unsupported_writer_" + randomNameSuffix();
         String tableDirectory = "databricks-compatibility-test-" + tableName;
 
         onDelta().executeQuery(format("" +
                         "CREATE TABLE default.%s (col int) " +
                         "USING DELTA LOCATION 's3://%s/%s'" +
-                        "TBLPROPERTIES ('delta.minWriterVersion'='5')",
+                        "TBLPROPERTIES ('delta.minWriterVersion'='8')",
                 tableName,
                 bucketName,
                 tableDirectory));
 
         try {
             assertQueryFailure(() -> onTrino().executeQuery("COMMENT ON TABLE delta.default." + tableName + " IS 'test comment'"))
-                    .hasMessageMatching(".* Table .* requires Delta Lake writer version 5 which is not supported");
+                    .hasMessageMatching(".* Table .* requires Delta Lake writer version 8 which is not supported");
         }
         finally {
             onTrino().executeQuery("DROP TABLE delta.default." + tableName);
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testCommentOnColumn()
     {
         String tableName = "test_dl_comment_column_" + randomNameSuffix();
@@ -231,32 +224,57 @@ public void testCommentOnColumn()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testCommentOnColumnUnsupportedWriterVersion()
     {
+        skipTestUnlessUnsupportedWriterVersionExists();
+
         String tableName = "test_dl_comment_column_unsupported_writer_" + randomNameSuffix();
         String tableDirectory = "databricks-compatibility-test-" + tableName;
 
         onDelta().executeQuery(format("" +
                         "CREATE TABLE default.%s (col int) " +
                         "USING DELTA LOCATION 's3://%s/%s'" +
-                        "TBLPROPERTIES ('delta.minWriterVersion'='5')",
+                        "TBLPROPERTIES ('delta.minWriterVersion'='8')",
                 tableName,
                 bucketName,
                 tableDirectory));
 
         try {
             assertQueryFailure(() -> onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".col IS 'test column comment'"))
-                    .hasMessageMatching(".* Table .* requires Delta Lake writer version 5 which is not supported");
+                    .hasMessageMatching(".* Table .* requires Delta Lake writer version 8 which is not supported");
         }
         finally {
             onTrino().executeQuery("DROP TABLE delta.default." + tableName);
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testOptimizeUnsupportedWriterVersion()
+    {
+        skipTestUnlessUnsupportedWriterVersionExists();
+
+        String tableName = "test_dl_optimize_unsupported_writer_" + randomNameSuffix();
+        String tableDirectory = "databricks-compatibility-test-" + tableName;
+
+        onDelta().executeQuery(format("" +
+                        "CREATE TABLE default.%s (col int) " +
+                        "USING DELTA LOCATION 's3://%s/%s'" +
+                        "TBLPROPERTIES ('delta.minWriterVersion'='8')",
+                tableName,
+                bucketName,
+                tableDirectory));
+
+        try {
+            assertQueryFailure(() -> onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " EXECUTE OPTIMIZE"))
+                    .hasMessageMatching(".* Table .* requires Delta Lake writer version 8 which is not supported");
+        }
+        finally {
+            dropDeltaTableWithRetry(tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testTrinoAlterTablePreservesTableMetadata()
     {
         String tableName = "test_trino_alter_table_preserves_table_metadata_" + randomNameSuffix();
@@ -274,15 +292,15 @@ public void testTrinoAlterTablePreservesTableMetadata()
             onTrino().executeQuery("COMMENT ON TABLE delta.default." + tableName + " IS 'test table comment'");
             onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN new_column INT");
 
-            List<?> properties = getOnlyElement(onDelta().executeQuery("SHOW TBLPROPERTIES " + tableName + "(delta.appendOnly)").rows());
-            assertTrue(Boolean.parseBoolean((String) properties.get(1)));
+            assertThat(getTablePropertyOnDelta("default", tableName, "delta.appendOnly"))
+                    .isEqualTo("true");
         }
         finally {
             onTrino().executeQuery("DROP TABLE delta.default." + tableName);
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
     @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
     public void testTrinoAlterTablePreservesChangeDataFeed()
     {
@@ -310,12 +328,9 @@ public void testTrinoAlterTablePreservesChangeDataFeed()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testTrinoPreservesReaderAndWriterVersions()
     {
-        // Databricks 7.3 doesn't support 'delta.minReaderVersion' and 'delta.minWriterVersion' table properties
-        // Writing those properties to protocol entry in COMMENT and ADD COLUMN statements is fine
         String tableName = "test_trino_preserves_versions_" + randomNameSuffix();
         String tableDirectory = "databricks-compatibility-test-" + tableName;
 
@@ -345,11 +360,37 @@ public void testTrinoPreservesReaderAndWriterVersions()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_91, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testTrinoPreservesTableFeature()
+    {
+        String tableName = "test_trino_preserves_table_feature_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName + " (col int)" +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.checkpointInterval'=1, 'delta.feature.columnMapping'='supported')");
+        try {
+            onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".col IS 'test column comment'");
+            onTrino().executeQuery("COMMENT ON TABLE delta.default." + tableName + " IS 'test table comment'");
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN new_col INT");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 1)");
+            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET col = 2");
+            onTrino().executeQuery("DELETE FROM delta.default." + tableName);
+            onTrino().executeQuery("MERGE INTO delta.default." + tableName + " t USING delta.default." + tableName + " s " + "ON (t.col = s.col) WHEN MATCHED THEN UPDATE SET new_col = 3");
+
+            assertThat(getTablePropertyOnDelta("default", tableName, "delta.feature.columnMapping"))
+                    .isEqualTo("supported");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
     @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
     public void testTrinoAlterTablePreservesGeneratedColumn()
     {
-        // Databricks 7.3 doesn't support generated columns
         String tableName = "test_trino_alter_table_preserves_generated_column_" + randomNameSuffix();
         String tableDirectory = "databricks-compatibility-test-" + tableName;
 
@@ -365,7 +406,7 @@ public void testTrinoAlterTablePreservesGeneratedColumn()
             onTrino().executeQuery("COMMENT ON TABLE delta.default." + tableName + " IS 'test table comment'");
             onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN c INT");
 
-            Assertions.assertThat((String) onDelta().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
+            assertThat((String) onDelta().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
                             .contains((getDatabricksRuntimeVersion().orElseThrow().equals(DATABRICKS_91_RUNTIME_VERSION) ? "`b`" : "b") + " INT GENERATED ALWAYS AS ( a * 2 )");
             onDelta().executeQuery("INSERT INTO default." + tableName + " (a, c) VALUES (1, 3)");
             assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
@@ -383,44 +424,31 @@ public void testTrinoAlterTablePreservesGeneratedColumn()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testIdentityColumn()
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testUnsupportedStatementWithUnsupportedWriterFeature()
     {
-        // Databricks 7.3 & 9.1 and OSS Delta Lake don't support identity columns https://github.com/delta-io/delta/issues/1100
-        String tableName = "test_identity_column_" + randomNameSuffix();
-        String tableDirectory = "databricks-compatibility-test-" + tableName;
+        String tableName = "test_dl_add_column_unsupported_writer_feature_" + randomNameSuffix();
 
-        onDelta().executeQuery(format(
-                        """
-                        CREATE TABLE default.%s (a INT, b BIGINT GENERATED ALWAYS AS IDENTITY)
-                        USING DELTA LOCATION 's3://%s/%s'
-                        """,
-                tableName,
-                bucketName,
-                tableDirectory));
+        onDelta().executeQuery("CREATE TABLE default." + tableName + "" +
+                "(a int, b int) " +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.feature.generatedColumns'='supported')");
         try {
-            String failureMessage = ".* Table .* requires Delta Lake writer version 6 which is not supported";
-            assertQueryFailure(() -> onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".b IS 'test column comment'"))
-                    .hasMessageMatching(failureMessage);
-            assertQueryFailure(() -> onTrino().executeQuery("COMMENT ON TABLE delta.default." + tableName + " IS 'test table comment'"))
-                    .hasMessageMatching(failureMessage);
-            assertQueryFailure(() -> onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN c INT"))
-                    .hasMessageMatching(failureMessage);
-            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + "(a) VALUES (0)"))
-                    .hasMessageMatching(failureMessage);
-            assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM delta.default." + tableName))
-                    .hasMessageMatching(failureMessage);
-            assertQueryFailure(() -> onTrino().executeQuery("MERGE INTO delta.default." + tableName + " t USING delta.default." + tableName + " s " + "ON (t.a = s.a) WHEN MATCHED THEN UPDATE SET b = 1"))
-                    .hasMessageMatching(failureMessage);
-
-            Assertions.assertThat((String) onDelta().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
-                    .contains("b BIGINT GENERATED ALWAYS AS IDENTITY");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " (a) VALUES (0)");
-
-            List<QueryAssert.Row> expected = ImmutableList.of(row(0, 1));
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).containsOnly(expected);
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName)).containsOnly(expected);
+            assertQueryFailure(() -> onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN new_col int"))
+                    .hasMessageContaining("Unsupported writer features: [generatedColumns]");
+            assertQueryFailure(() -> onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " RENAME COLUMN a TO renamed"))
+                    .hasMessageContaining("Unsupported writer features: [generatedColumns]");
+            assertQueryFailure(() -> onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " DROP COLUMN b"))
+                    .hasMessageContaining("Unsupported writer features: [generatedColumns]");
+            assertQueryFailure(() -> onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " EXECUTE OPTIMIZE"))
+                    .hasMessageContaining("Unsupported writer features: [generatedColumns]");
+            assertQueryFailure(() -> onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ALTER COLUMN b SET DATA TYPE bigint"))
+                    .hasMessageContaining("This connector does not support setting column types");
+            assertQueryFailure(() -> onTrino().executeQuery("COMMENT ON TABLE delta.default." + tableName + " IS 'test comment'"))
+                    .hasMessageContaining("Unsupported writer features: [generatedColumns]");
+            assertQueryFailure(() -> onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".a IS 'test column comment'"))
+                    .hasMessageContaining("Unsupported writer features: [generatedColumns]");
         }
         finally {
             dropDeltaTableWithRetry("default." + tableName);
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCaseInsensitiveMapping.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCaseInsensitiveMapping.java
new file mode 100644
index 000000000000..dede9e45d364
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCaseInsensitiveMapping.java
@@ -0,0 +1,232 @@
+/*
+ * Licensed 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 io.trino.tests.product.deltalake;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.tempto.assertions.QueryAssert;
+import io.trino.testng.services.Flaky;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_104;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_113;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_91;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getColumnCommentOnDelta;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getColumnCommentOnTrino;
+import static io.trino.tests.product.utils.QueryExecutors.onDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testng.Assert.assertEquals;
+
+public class TestDeltaLakeCaseInsensitiveMapping
+        extends BaseTestDeltaLakeS3Storage
+{
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testNonLowercaseColumnNames()
+    {
+        String tableName = "test_dl_non_lowercase_column" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(UPPER_CASE_INT INT, Camel_Case_String STRING, PART INT)" +
+                "USING delta " +
+                "PARTITIONED BY (PART)" +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 'a', 10)");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (2, 'ab', 20)");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (null, null, null)");
+
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(
+                            row("upper_case_int", null, 1.0, 0.33333333333, null, "1", "2"),
+                            row("camel_case_string", 2.0, 1.0, 0.33333333333, null, null, null),
+                            row("part", null, 2.0, 0.33333333333, null, null, null),
+                            row(null, null, null, null, 3.0, null, null));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_104, DELTA_LAKE_DATABRICKS_113, DELTA_LAKE_DATABRICKS_122, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testNonLowercaseFieldNames()
+    {
+        String tableName = "test_dl_non_lowercase_field" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(id int, UPPER_CASE STRUCT<UPPER_FIELD: string>, Mixed_Case struct<Mixed_Nested: struct<Mixed_Field: string>>)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+        try {
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " SELECT 1, row('test uppercase'), row(row('test mixedcase'))");
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(
+                            row("id", null, 1.0, 0.0, null, "1", "1"),
+                            row("upper_case", null, null, null, null, null, null),
+                            row("mixed_case", null, null, null, null, null, null),
+                            row(null, null, null, null, 1.0, null, null));
+
+            // Specify field names to test projection pushdown
+            List<QueryAssert.Row> expectedRows = ImmutableList.of(row(1, "test uppercase", "test mixedcase"));
+            assertThat(onDelta().executeQuery("SELECT id, upper_case.upper_field, mixed_case.mixed_nested.mixed_field FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT id, upper_case.upper_field, mixed_case.mixed_nested.mixed_field FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+
+            assertThat(onTrino().executeQuery("SELECT id FROM delta.default." + tableName + " WHERE upper_case.upper_field = 'test uppercase'"))
+                    .containsOnly(row(1));
+            assertThat(onTrino().executeQuery("SELECT id FROM delta.default." + tableName + " WHERE mixed_case.mixed_nested.mixed_field = 'test mixedcase'"))
+                    .containsOnly(row(1));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testColumnCommentWithNonLowerCaseColumnName()
+    {
+        String tableName = "test_dl_column_comment_uppercase_name" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(UPPER_CASE INT COMMENT 'test column comment')" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            assertEquals(getColumnCommentOnTrino("default", tableName, "upper_case"), "test column comment");
+            assertEquals(getColumnCommentOnDelta("default", tableName, "UPPER_CASE"), "test column comment");
+
+            onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".upper_case IS 'test updated comment'");
+
+            assertEquals(getColumnCommentOnTrino("default", tableName, "upper_case"), "test updated comment");
+            assertEquals(getColumnCommentOnDelta("default", tableName, "UPPER_CASE"), "test updated comment");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testNotNullColumnWithNonLowerCaseColumnName()
+    {
+        String tableName = "test_dl_notnull_column_uppercase_name" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(UPPER_CASE INT NOT NULL)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            // Verify column operation doesn't delete NOT NULL constraint
+            onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".upper_case IS 'test comment'");
+
+            assertThatThrownBy(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES NULL"))
+                    .hasMessageContaining("NULL value not allowed for NOT NULL column");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testGeneratedColumnWithNonLowerCaseColumnName()
+    {
+        String tableName = "test_dl_generated_column_uppercase_name" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(A INT, B INT GENERATED ALWAYS AS (A * 2))" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            // Verify column operation doesn't delete generated expressions
+            onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".a IS 'test comment for a'");
+            onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".b IS 'test comment for b'");
+
+            assertThatThrownBy(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 2)"))
+                    .hasMessageContaining("Writing to tables with generated columns is not supported");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    // Exclude 10.4 because it throws MISSING_COLUMN when executing INSERT statement
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testIdentityColumnWithNonLowerCaseColumnName()
+    {
+        String tableName = "test_identity_column_case_sensitivity_" + randomNameSuffix();
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(data INT, UPPERCASE_IDENTITY BIGINT GENERATED ALWAYS AS IDENTITY)" +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.columnMapping.mode'='name')");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " (data) VALUES (1), (2), (3)");
+
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1, 1), row(2, 2), row(3, 3));
+
+            // Verify identify column is recognized even when the name contains uppercase characters
+            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (4, 4)"))
+                    .hasMessageContaining("Writing to tables with identity columns is not supported");
+            assertQueryFailure(() -> onTrino().executeQuery("UPDATE delta.default." + tableName + " SET data = 3"))
+                    .hasMessageContaining("Writing to tables with identity columns is not supported");
+            assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM delta.default." + tableName))
+                    .hasMessageContaining("Writing to tables with identity columns is not supported");
+            assertQueryFailure(() -> onTrino().executeQuery("MERGE INTO delta.default." + tableName + " t USING delta.default." + tableName + " s " +
+                    "ON (t.data = s.data) WHEN MATCHED THEN UPDATE SET data = 1"))
+                    .hasMessageContaining("Writing to tables with identity columns is not supported");
+
+            // Verify column operations preserves the identify column name and property
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN new_col integer");
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " RENAME COLUMN new_col TO renamed_col");
+            onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".uppercase_identity IS 'test comment'");
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " DROP COLUMN renamed_col");
+
+            assertThat((String) onDelta().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
+                    .contains("UPPERCASE_IDENTITY BIGINT GENERATED ALWAYS AS IDENTITY");
+
+            // Verify the connector preserves column identity property when renaming columns containing uppercase characters
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " RENAME COLUMN uppercase_identity TO renamed_identity");
+            assertThat((String) onDelta().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
+                    .contains("renamed_identity BIGINT GENERATED ALWAYS AS IDENTITY");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeChangeDataFeedCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeChangeDataFeedCompatibility.java
new file mode 100644
index 000000000000..9a05fa119557
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeChangeDataFeedCompatibility.java
@@ -0,0 +1,863 @@
+/*
+ * Licensed 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 io.trino.tests.product.deltalake;
+
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.model.ListObjectsV2Result;
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import io.trino.tempto.BeforeMethodWithContext;
+import io.trino.tempto.assertions.QueryAssert.Row;
+import io.trino.testng.services.Flaky;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_104;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_113;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_91;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTablePropertiesOnDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+
+public class TestDeltaLakeChangeDataFeedCompatibility
+        extends BaseTestDeltaLakeS3Storage
+{
+    @Inject
+    @Named("s3.server_type")
+    private String s3ServerType;
+
+    private AmazonS3 s3Client;
+
+    @BeforeMethodWithContext
+    public void setup()
+    {
+        super.setUp();
+        s3Client = new S3ClientFactory().createS3Client(s3ServerType);
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingModeDataProvider")
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testUpdateTableWithCdf(String columnMappingMode)
+    {
+        String tableName = "test_updates_to_table_with_cdf_" + randomNameSuffix();
+        try {
+            onTrino().executeQuery("CREATE TABLE delta.default." + tableName + " (col1 VARCHAR, updated_column INT) " +
+                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "', " +
+                    "change_data_feed_enabled = true, column_mapping_mode = '" + columnMappingMode + "')");
+
+            assertThat(onTrino().executeQuery("SHOW CREATE TABLE " + tableName).getOnlyValue().toString()).contains("change_data_feed_enabled = true");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue2', 2)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue3', 3)");
+            onTrino().executeQuery("UPDATE delta.default." + tableName +
+                    " SET updated_column = 5 WHERE col1 = 'testValue3'");
+            onTrino().executeQuery("UPDATE delta.default." + tableName +
+                    " SET updated_column = 4, col1 = 'testValue4' WHERE col1 = 'testValue3'");
+
+            assertThat(onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
+                    "FROM table_changes('default." + tableName + "', 0)"))
+                    .containsOnly(
+                            row("testValue1", 1, "insert", 1L),
+                            row("testValue2", 2, "insert", 2L),
+                            row("testValue3", 3, "insert", 3L),
+                            row("testValue3", 3, "update_preimage", 4L),
+                            row("testValue3", 5, "update_postimage", 4L),
+                            row("testValue3", 5, "update_preimage", 5L),
+                            row("testValue4", 4, "update_postimage", 5L));
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE IF EXISTS delta.default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testUpdateTableWithChangeDataFeedWriterFeature()
+    {
+        String tableName = "test_change_data_feed_writer_feature_" + randomNameSuffix();
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(col1 STRING, updated_column INT)" +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.enableChangeDataFeed'=true, 'delta.minWriterVersion'=7)");
+        try {
+            assertThat(onTrino().executeQuery("SHOW CREATE TABLE delta.default." + tableName).getOnlyValue().toString()).contains("change_data_feed_enabled = true");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1), ('testValue2', 2), ('testValue3', 3)");
+            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET updated_column = 30 WHERE col1 = 'testValue3'");
+
+            assertThat(onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version FROM table_changes('default." + tableName + "', 0)"))
+                    .containsOnly(
+                            row("testValue1", 1, "insert", 1L),
+                            row("testValue2", 2, "insert", 1L),
+                            row("testValue3", 3, "insert", 1L),
+                            row("testValue3", 3, "update_preimage", 2L),
+                            row("testValue3", 30, "update_postimage", 2L));
+
+            // CDF shouldn't be generated when delta.feature.changeDataFeed exists, but delta.enableChangeDataFeed doesn't exist
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " UNSET TBLPROPERTIES ('delta.enableChangeDataFeed')");
+            assertThat(getTablePropertiesOnDelta("default", tableName))
+                    .contains(entry("delta.feature.changeDataFeed", "supported"))
+                    .doesNotContainKey("delta.enableChangeDataFeed");
+            assertThat(onTrino().executeQuery("SHOW CREATE TABLE delta.default." + tableName).getOnlyValue().toString()).doesNotContain("change_data_feed_enabled");
+
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES ('testValue4', 4)");
+            assertQueryFailure(() -> onDelta().executeQuery("SELECT * FROM table_changes('default." + tableName + "', 4)"))
+                    .hasMessageMatching("(?s)(.*Error getting change data for range \\[4 , 4] as change data was not\nrecorded for version \\[4].*)");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue5', 5)");
+            assertQueryFailure(() -> onDelta().executeQuery("SELECT * FROM table_changes('default." + tableName + "', 5)"))
+                    .hasMessageMatching("(?s)(.*Error getting change data for range \\[5 , 5] as change data was not\nrecorded for version \\[5].*)");
+
+            // CDF shouldn't be generated when delta.feature.changeDataFeed exists, but delta.enableChangeDataFeed is disabled
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " SET TBLPROPERTIES ('delta.feature.changeDataFeed'='supported', 'delta.enableChangeDataFeed'=false)");
+            assertThat(getTablePropertiesOnDelta("default", tableName))
+                    .contains(entry("delta.feature.changeDataFeed", "supported"))
+                    .contains(entry("delta.enableChangeDataFeed", "false"));
+            assertThat(onTrino().executeQuery("SHOW CREATE TABLE delta.default." + tableName).getOnlyValue().toString()).contains("change_data_feed_enabled = false");
+
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES ('testValue7', 7)");
+            assertQueryFailure(() -> onDelta().executeQuery("SELECT * FROM table_changes('default." + tableName + "', 7)"))
+                    .hasMessageMatching("(?s)(.*Error getting change data for range \\[7 , 7] as change data was not\nrecorded for version \\[7].*)");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue8', 8)");
+            assertQueryFailure(() -> onDelta().executeQuery("SELECT * FROM table_changes('default." + tableName + "', 8)"))
+                    .hasMessageMatching("(?s)(.*Error getting change data for range \\[8 , 8] as change data was not\nrecorded for version \\[8].*)");
+
+            // Enabling only delta.enableChangeDataFeed without delta.feature.changeDataFeed property is unsupported
+        }
+        finally {
+            dropDeltaTableWithRetry(tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingModeDataProvider")
+    public void testUpdateCdfTableWithNonLowercaseColumn(String columnMappingMode)
+    {
+        String tableName = "test_updates_cdf_with_non_lowercase_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(col1 string, Updated_Column int)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.enableChangeDataFeed' = true, 'delta.columnMapping.mode'='" + columnMappingMode + "')");
+        try {
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES ('testValue1', 1), ('testValue2', 2), ('testValue3', 3)");
+            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET updated_column = 5 WHERE col1 = 'testValue3'");
+
+            List<Row> expectedRows = ImmutableList.<Row>builder()
+                    .add(row("testValue1", 1, "insert", 1L))
+                    .add(row("testValue2", 2, "insert", 1L))
+                    .add(row("testValue3", 3, "insert", 1L))
+                    .add(row("testValue3", 3, "update_preimage", 2L))
+                    .add(row("testValue3", 5, "update_postimage", 2L))
+                    .build();
+            assertThat(onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
+                    "FROM table_changes('default." + tableName + "', 0)"))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
+                    "FROM TABLE(delta.system.table_changes('default', '" + tableName + "'))"))
+                    .containsOnly(expectedRows);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingModeDataProvider")
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testUpdatePartitionedTableWithCdf(String columnMappingMode)
+    {
+        String tableName = "test_updates_to_partitioned_table_with_cdf_" + randomNameSuffix();
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + tableName + " (updated_column STRING, partitioning_column_1 INT, partitioning_column_2 STRING) " +
+                    "USING DELTA " +
+                    "PARTITIONED BY (partitioning_column_1, partitioning_column_2) " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                    "TBLPROPERTIES (delta.enableChangeDataFeed = true, 'delta.columnMapping.mode'='" + columnMappingMode + "')");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1, 'partition1')");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue2', 2, 'partition2')");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue3', 3, 'partition3')");
+            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET updated_column = 'testValue5' WHERE partitioning_column_1 = 3");
+
+            assertThat(onDelta().executeQuery(
+                    "SELECT updated_column, partitioning_column_1, partitioning_column_2, _change_type, _commit_version " +
+                            "FROM table_changes('default." + tableName + "', 0)"))
+                    .containsOnly(
+                            row("testValue1", 1, "partition1", "insert", 1L),
+                            row("testValue2", 2, "partition2", "insert", 2L),
+                            row("testValue3", 3, "partition3", "insert", 3L),
+                            row("testValue3", 3, "partition3", "update_preimage", 4L),
+                            row("testValue5", 3, "partition3", "update_postimage", 4L));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testUpdateTableWithManyRowsInsertedInTheSameQueryAndCdfEnabled()
+    {
+        String tableName = "test_updates_to_table_with_many_rows_inserted_in_one_query_cdf_" + randomNameSuffix();
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + tableName + " (col1 STRING, updated_column INT) " +
+                    "USING DELTA " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1), ('testValue2', 2), ('testValue3', 3)");
+            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET updated_column = 5 WHERE col1 = 'testValue3'");
+
+            assertThat(onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
+                    "FROM table_changes('default." + tableName + "', 0)"))
+                    .containsOnly(
+                            row("testValue1", 1, "insert", 1L),
+                            row("testValue2", 2, "insert", 1L),
+                            row("testValue3", 3, "insert", 1L),
+                            row("testValue3", 3, "update_preimage", 2L),
+                            row("testValue3", 5, "update_postimage", 2L));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testUpdatePartitionedTableWithManyRowsInsertedInTheSameRequestAndCdfEnabled()
+    {
+        String tableName = "test_updates_to_partitioned_table_with_many_rows_inserted_in_one_query_cdf_" + randomNameSuffix();
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + tableName + " (updated_column STRING, partitioning_column_1 INT, partitioning_column_2 STRING) " +
+                    "USING DELTA " +
+                    "PARTITIONED BY (partitioning_column_1, partitioning_column_2) " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES " +
+                    "('testValue1', 1, 'partition1'), " +
+                    "('testValue2', 2, 'partition2'), " +
+                    "('testValue3', 3, 'partition3')");
+            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET updated_column = 'testValue5' WHERE partitioning_column_1 = 3");
+
+            assertThat(onDelta().executeQuery(
+                    "SELECT updated_column, partitioning_column_1, partitioning_column_2, _change_type, _commit_version " +
+                            "FROM table_changes('default." + tableName + "', 0)"))
+                    .containsOnly(
+                            row("testValue1", 1, "partition1", "insert", 1L),
+                            row("testValue2", 2, "partition2", "insert", 1L),
+                            row("testValue3", 3, "partition3", "insert", 1L),
+                            row("testValue3", 3, "partition3", "update_preimage", 2L),
+                            row("testValue5", 3, "partition3", "update_postimage", 2L));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testUpdatePartitionedTableCdfEnabledAndPartitioningColumnUpdated()
+    {
+        String tableName = "test_updates_partitioning_column_in_table_with_cdf_" + randomNameSuffix();
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + tableName + " (updated_column STRING, partitioning_column_1 INT, partitioning_column_2 STRING) " +
+                    "USING DELTA " +
+                    "PARTITIONED BY (partitioning_column_1, partitioning_column_2) " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES " +
+                    "('testValue1', 1, 'partition1'), " +
+                    "('testValue2', 2, 'partition2'), " +
+                    "('testValue3', 3, 'partition3')");
+            onTrino().executeQuery("UPDATE delta.default." + tableName +
+                    " SET partitioning_column_1 = 5 WHERE partitioning_column_2 = 'partition1'");
+            onTrino().executeQuery("UPDATE delta.default." + tableName +
+                    " SET partitioning_column_1 = 4, updated_column = 'testValue4' WHERE partitioning_column_2 = 'partition2'");
+
+            assertThat(onDelta().executeQuery(
+                    "SELECT updated_column, partitioning_column_1, partitioning_column_2, _change_type, _commit_version " +
+                            "FROM table_changes('default." + tableName + "', 0)"))
+                    .containsOnly(
+                            row("testValue1", 1, "partition1", "insert", 1L),
+                            row("testValue2", 2, "partition2", "insert", 1L),
+                            row("testValue3", 3, "partition3", "insert", 1L),
+                            row("testValue1", 1, "partition1", "update_preimage", 2L),
+                            row("testValue1", 5, "partition1", "update_postimage", 2L),
+                            row("testValue2", 2, "partition2", "update_preimage", 3L),
+                            row("testValue4", 4, "partition2", "update_postimage", 3L));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testUpdateTableWithCdfEnabledAfterTableIsAlreadyCreated()
+    {
+        String tableName = "test_updates_to_table_with_cdf_enabled_later_" + randomNameSuffix();
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + tableName + " (col1 STRING, updated_column INT) " +
+                    "USING DELTA " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue2', 2)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue3', 3)");
+            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET updated_column = 5 WHERE col1 = 'testValue3'");
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " SET TBLPROPERTIES (delta.enableChangeDataFeed = true)");
+            long versionWithCdfEnabled = (long) onDelta().executeQuery("DESCRIBE HISTORY default." + tableName + " LIMIT 1")
+                    .row(0)
+                    .get(0);
+            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET updated_column = 4 WHERE col1 = 'testValue3'");
+
+            assertQueryFailure(() -> onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
+                    "FROM table_changes('default." + tableName + "', 0)"))
+                    .hasMessageMatching("(?s)(.*Error getting change data for range \\[0 , 6] as change data was not\nrecorded for version \\[0].*)");
+
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES ('testValue6', 6)");
+            assertThat(onDelta().executeQuery(
+                    format("SELECT col1, updated_column, _change_type, _commit_version FROM table_changes('default.%s', %d)",
+                            tableName,
+                            versionWithCdfEnabled)))
+                    .containsOnly(
+                            row("testValue3", 5, "update_preimage", 6L),
+                            row("testValue3", 4, "update_postimage", 6L),
+                            row("testValue6", 6, "insert", 7L));
+
+            long lastVersionWithCdf = (long) onDelta().executeQuery("DESCRIBE HISTORY default." + tableName + " LIMIT 1")
+                    .row(0)
+                    .get(0);
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " SET TBLPROPERTIES (delta.enableChangeDataFeed = false)");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES ('testValue7', 7)");
+
+            assertThat(onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
+                    format("FROM table_changes('default.%s', %d, %d)", tableName, versionWithCdfEnabled, lastVersionWithCdf)))
+                    .containsOnly(
+                            row("testValue3", 5, "update_preimage", 6L),
+                            row("testValue3", 4, "update_postimage", 6L),
+                            row("testValue6", 6, "insert", 7L));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingModeDataProvider")
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testDeleteFromTableWithCdf(String columnMappingMode)
+    {
+        String tableName = "test_deletes_from_table_with_cdf_" + randomNameSuffix();
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + tableName + " (col1 STRING, updated_column INT) " +
+                    "USING DELTA " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                    "TBLPROPERTIES (delta.enableChangeDataFeed = true, 'delta.columnMapping.mode' = '" + columnMappingMode + "')");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES('testValue1', 1)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES('testValue2', 2)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES('testValue3', 3)");
+            onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE col1 = 'testValue3'");
+
+            assertThat(onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
+                    "FROM table_changes('default." + tableName + "', 0)"))
+                    .containsOnly(
+                            row("testValue1", 1, "insert", 1L),
+                            row("testValue2", 2, "insert", 2L),
+                            row("testValue3", 3, "insert", 3L),
+                            row("testValue3", 3, "delete", 4L));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingModeDataProvider")
+    public void testMergeUpdateIntoTableWithCdfEnabled(String columnMappingMode)
+    {
+        String tableName1 = "test_merge_update_into_table_with_cdf_" + randomNameSuffix();
+        String tableName2 = "test_merge_update_into_table_with_cdf_data_table_" + randomNameSuffix();
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + tableName1 + " (nationkey INT, name STRING, regionkey INT) " +
+                    "USING DELTA " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName1 + "'" +
+                    "TBLPROPERTIES (delta.enableChangeDataFeed = true, 'delta.columnMapping.mode' = '" + columnMappingMode + "')");
+            onDelta().executeQuery("CREATE TABLE default." + tableName2 + " (nationkey INT, name STRING, regionkey INT) " +
+                    "USING DELTA " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName2 + "'" +
+                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName1 + " VALUES (1, 'nation1', 100)");
+            onDelta().executeQuery("INSERT INTO default." + tableName1 + " VALUES (2, 'nation2', 200)");
+            onDelta().executeQuery("INSERT INTO default." + tableName1 + " VALUES (3, 'nation3', 300)");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName2 + " VALUES (1000, 'nation1000', 1000)");
+            onDelta().executeQuery("INSERT INTO default." + tableName2 + " VALUES (2, 'nation2', 20000)");
+            onDelta().executeQuery("INSERT INTO default." + tableName2 + " VALUES (3000, 'nation3000', 3000)");
+
+            onTrino().executeQuery("MERGE INTO delta.default." + tableName1 + " cdf USING delta.default." + tableName2 + " n " +
+                    "ON (cdf.nationkey = n.nationkey) " +
+                    "WHEN MATCHED " +
+                    "THEN UPDATE SET nationkey = (cdf.nationkey + n.nationkey + n.regionkey) " +
+                    "WHEN NOT MATCHED " +
+                    "THEN INSERT (nationkey, name, regionkey) VALUES (n.nationkey, n.name, n.regionkey)");
+
+            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName1))
+                    .containsOnly(
+                            row(1000, "nation1000", 1000),
+                            row(3000, "nation3000", 3000),
+                            row(1, "nation1", 100),
+                            row(3, "nation3", 300),
+                            row(20004, "nation2", 200));
+
+            assertThat(onDelta().executeQuery(
+                    "SELECT nationkey, name, regionkey, _change_type, _commit_version " +
+                            "FROM table_changes('default." + tableName1 + "', 0)"))
+                    .containsOnly(
+                            row(1, "nation1", 100, "insert", 1),
+                            row(2, "nation2", 200, "insert", 2),
+                            row(3, "nation3", 300, "insert", 3),
+                            row(1000, "nation1000", 1000, "insert", 4),
+                            row(3000, "nation3000", 3000, "insert", 4),
+                            row(2, "nation2", 200, "update_preimage", 4),
+                            row(20004, "nation2", 200, "update_postimage", 4));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName1);
+            dropDeltaTableWithRetry("default." + tableName2);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingModeDataProvider")
+    public void testMergeDeleteIntoTableWithCdfEnabled(String columnMappingMode)
+    {
+        String tableName1 = "test_merge_delete_into_table_with_cdf_" + randomNameSuffix();
+        String tableName2 = "test_merge_delete_into_table_with_cdf_data_table_" + randomNameSuffix();
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + tableName1 + " (nationkey INT, name STRING, regionkey INT) " +
+                    "USING DELTA " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName1 + "'" +
+                    "TBLPROPERTIES (delta.enableChangeDataFeed = true, 'delta.columnMapping.mode' = '" + columnMappingMode + "')");
+            onDelta().executeQuery("CREATE TABLE default." + tableName2 + " (nationkey INT, name STRING, regionkey INT) " +
+                    "USING DELTA " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName2 + "'" +
+                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName1 + " VALUES (1, 'nation1', 100)");
+            onDelta().executeQuery("INSERT INTO default." + tableName1 + " VALUES (2, 'nation2', 200)");
+            onDelta().executeQuery("INSERT INTO default." + tableName1 + " VALUES (3, 'nation3', 300)");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName2 + " VALUES (1000, 'nation1000', 1000)");
+            onDelta().executeQuery("INSERT INTO default." + tableName2 + " VALUES (2, 'nation2', 20000)");
+            onDelta().executeQuery("INSERT INTO default." + tableName2 + " VALUES (3000, 'nation3000', 3000)");
+
+            onTrino().executeQuery("MERGE INTO delta.default." + tableName1 + " cdf USING delta.default." + tableName2 + " n " +
+                    "ON (cdf.nationkey = n.nationkey) " +
+                    "WHEN MATCHED " +
+                    "THEN DELETE " +
+                    "WHEN NOT MATCHED " +
+                    "THEN INSERT (nationkey, name, regionkey) VALUES (n.nationkey, n.name, n.regionkey)");
+
+            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName1))
+                    .containsOnly(
+                            row(1000, "nation1000", 1000),
+                            row(3000, "nation3000", 3000),
+                            row(1, "nation1", 100),
+                            row(3, "nation3", 300));
+
+            assertThat(onDelta().executeQuery(
+                    "SELECT nationkey, name, regionkey, _change_type, _commit_version " +
+                            "FROM table_changes('default." + tableName1 + "', 0)"))
+                    .containsOnly(
+                            row(1, "nation1", 100, "insert", 1),
+                            row(2, "nation2", 200, "insert", 2),
+                            row(3, "nation3", 300, "insert", 3),
+                            row(1000, "nation1000", 1000, "insert", 4),
+                            row(3000, "nation3000", 3000, "insert", 4),
+                            row(2, "nation2", 200, "delete", 4));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName1);
+            dropDeltaTableWithRetry("default." + tableName2);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_104, DELTA_LAKE_DATABRICKS_113, DELTA_LAKE_DATABRICKS_122, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testMergeMixedDeleteAndUpdateIntoTableWithCdfEnabled()
+    {
+        String targetTableName = "test_merge_mixed_delete_and_update_into_table_with_cdf_" + randomNameSuffix();
+        String sourceTableName = "test_merge_mixed_delete_and_update_into_table_with_cdf_data_table_" + randomNameSuffix();
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + targetTableName + " (page_id INT, page_url STRING, views INT) " +
+                    "USING DELTA " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + targetTableName + "'" +
+                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
+            onDelta().executeQuery("CREATE TABLE default." + sourceTableName + " (page_id INT, page_url STRING, views INT) " +
+                    "USING DELTA " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + sourceTableName + "'");
+
+            onDelta().executeQuery("INSERT INTO default." + targetTableName + " VALUES (1, 'pageUrl1', 100)");
+            onDelta().executeQuery("INSERT INTO default." + targetTableName + " VALUES (2, 'pageUrl2', 200)");
+            onDelta().executeQuery("INSERT INTO default." + targetTableName + " VALUES (3, 'pageUrl3', 300)");
+            onDelta().executeQuery("INSERT INTO default." + targetTableName + " VALUES (4, 'pageUrl4', 400)");
+
+            onDelta().executeQuery("INSERT INTO default." + sourceTableName + " VALUES (1000, 'pageUrl1000', 1000)");
+            onDelta().executeQuery("INSERT INTO default." + sourceTableName + " VALUES (2, 'pageUrl2', 20000)");
+            onDelta().executeQuery("INSERT INTO default." + sourceTableName + " VALUES (3000, 'pageUrl3000', 3000)");
+            onDelta().executeQuery("INSERT INTO default." + sourceTableName + " VALUES (4, 'pageUrl4000', 4000)");
+
+            onTrino().executeQuery("MERGE INTO delta.default." + targetTableName + " targetTable USING delta.default." + sourceTableName + " sourceTable " +
+                    "ON (targetTable.page_id = sourceTable.page_id) " +
+                    "WHEN MATCHED AND targetTable.page_id = 2 " +
+                    "THEN DELETE " +
+                    "WHEN MATCHED AND targetTable.page_id > 2 " +
+                    "THEN UPDATE SET views = (targetTable.views + sourceTable.views) " +
+                    "WHEN NOT MATCHED " +
+                    "THEN INSERT (page_id, page_url, views) VALUES (sourceTable.page_id, sourceTable.page_url, sourceTable.views)");
+
+            assertThat(onDelta().executeQuery("SELECT * FROM " + targetTableName))
+                    .containsOnly(
+                            row(1000, "pageUrl1000", 1000),
+                            row(3000, "pageUrl3000", 3000),
+                            row(4, "pageUrl4", 4400),
+                            row(1, "pageUrl1", 100),
+                            row(3, "pageUrl3", 300));
+
+            assertThat(onDelta().executeQuery(
+                    "SELECT page_id, page_url, views, _change_type, _commit_version " +
+                            "FROM table_changes('default." + targetTableName + "', 0)"))
+                    .containsOnly(
+                            row(1, "pageUrl1", 100, "insert", 1),
+                            row(2, "pageUrl2", 200, "insert", 2),
+                            row(3, "pageUrl3", 300, "insert", 3),
+                            row(4, "pageUrl4", 400, "insert", 4),
+                            row(1000, "pageUrl1000", 1000, "insert", 5),
+                            row(3000, "pageUrl3000", 3000, "insert", 5),
+                            row(2, "pageUrl2", 200, "delete", 5),
+                            row(4, "pageUrl4", 4400, "update_postimage", 5),
+                            row(4, "pageUrl4", 400, "update_preimage", 5));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + targetTableName);
+            dropDeltaTableWithRetry("default." + sourceTableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeleteFromNullPartitionWithCdfEnabled()
+    {
+        String tableName = "test_delete_from_null_partition_with_cdf_enabled" + randomNameSuffix();
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + tableName + " (updated_column STRING, partitioning_column_1 INT, partitioning_column_2 STRING) " +
+                    "USING DELTA " +
+                    "PARTITIONED BY (partitioning_column_1, partitioning_column_2) " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES " +
+                    "('testValue1', 1, 'partition1'), " +
+                    "('testValue2', 2, 'partition2'), " +
+                    "('testValue3', 3, NULL)");
+            onTrino().executeQuery("DELETE FROM delta.default." + tableName +
+                    " WHERE partitioning_column_2 IS NULL");
+
+            assertThat(onTrino().executeQuery(
+                    "SELECT * FROM delta.default." + tableName
+            )).containsOnly(
+                    row("testValue1", 1, "partition1"),
+                    row("testValue2", 2, "partition2"));
+
+            assertThat(onDelta().executeQuery(
+                    "SELECT updated_column, partitioning_column_1, partitioning_column_2, _change_type, _commit_version " +
+                            "FROM table_changes('default." + tableName + "', 0)"))
+                    .containsOnly(
+                            row("testValue1", 1, "partition1", "insert", 1L),
+                            row("testValue2", 2, "partition2", "insert", 1L),
+                            row("testValue3", 3, null, "insert", 1L),
+                            row("testValue3", 3, null, "delete", 2L));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTurningOnAndOffCdfFromTrino()
+    {
+        String tableName = "test_turning_cdf_on_and_off_from_trino" + randomNameSuffix();
+        try {
+            onTrino().executeQuery("CREATE TABLE delta.default." + tableName + " (col1 VARCHAR, updated_column INT) " +
+                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "', change_data_feed_enabled = true)");
+
+            assertThat(onTrino().executeQuery("SHOW CREATE TABLE " + tableName).getOnlyValue().toString()).contains("change_data_feed_enabled = true");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1)");
+            onDelta().executeQuery("UPDATE default." + tableName + " SET updated_column = 10 WHERE col1 = 'testValue1'");
+            assertThat(onDelta().executeQuery(
+                    "SELECT col1, updated_column, _change_type, _commit_version " +
+                            "FROM table_changes('default." + tableName + "', 0, 2)"))
+                    .containsOnly(
+                            row("testValue1", 1, "insert", 1L),
+                            row("testValue1", 1, "update_preimage", 2L),
+                            row("testValue1", 10, "update_postimage", 2L));
+
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " SET PROPERTIES change_data_feed_enabled = false");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue2', 2)");
+            onDelta().executeQuery("UPDATE default." + tableName + " SET updated_column = 20 WHERE col1 = 'testValue2'");
+            assertQueryFailure(() -> onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
+                    "FROM table_changes('default." + tableName + "', 4, 5)"))
+                    .hasMessageMatching("(?s)(.*Error getting change data for range \\[4 , 5] as change data was not\nrecorded for version \\[4].*)");
+            assertThat(onDelta().executeQuery(
+                    "SELECT col1, updated_column, _change_type, _commit_version " +
+                            "FROM table_changes('default." + tableName + "', 0, 2)"))
+                    .containsOnly(
+                            row("testValue1", 1, "insert", 1L),
+                            row("testValue1", 1, "update_preimage", 2L),
+                            row("testValue1", 10, "update_postimage", 2L));
+
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " SET PROPERTIES change_data_feed_enabled = true");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue3', 3)");
+            onDelta().executeQuery("UPDATE default." + tableName + " SET updated_column = 30 WHERE col1 = 'testValue3'");
+            assertThat(onDelta().executeQuery(
+                    "SELECT col1, updated_column, _change_type, _commit_version " +
+                            "FROM table_changes('default." + tableName + "', 7, 8)"))
+                    .containsOnly(
+                            row("testValue3", 3, "insert", 7L),
+                            row("testValue3", 3, "update_preimage", 8L),
+                            row("testValue3", 30, "update_postimage", 8L));
+
+            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName))
+                    .containsOnly(row("testValue1", 10), row("testValue2", 20), row("testValue3", 30));
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE IF EXISTS delta.default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testThatCdfDoesntWorkWhenPropertyIsNotSet()
+    {
+        String tableName1 = "test_cdf_doesnt_work_when_property_is_not_set_1_" + randomNameSuffix();
+        String tableName2 = "test_cdf_doesnt_work_when_property_is_not_set_2_" + randomNameSuffix();
+        assertThereIsNoCdfFileGenerated(tableName1, "");
+        assertThereIsNoCdfFileGenerated(tableName2, "change_data_feed_enabled = false");
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoCanReadCdfEntriesGeneratedByDelta()
+    {
+        String targetTableName = "test_trino_can_read_cdf_entries_generated_by_delta_target_" + randomNameSuffix();
+        String sourceTableName = "test_trino_can_read_cdf_entries_generated_by_delta_source_" + randomNameSuffix();
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + targetTableName + " (page_id INT, page_url STRING, views INT) " +
+                    "USING DELTA " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + targetTableName + "'" +
+                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
+            onDelta().executeQuery("CREATE TABLE default." + sourceTableName + " (page_id INT, page_url STRING, views INT) " +
+                    "USING DELTA " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + sourceTableName + "'");
+
+            onDelta().executeQuery("INSERT INTO default." + targetTableName + " VALUES (1, 'pageUrl1', 100), (2, 'pageUrl2', 200), (3, 'pageUrl3', 300)");
+            onDelta().executeQuery("INSERT INTO default." + targetTableName + " VALUES (4, 'pageUrl4', 400)");
+
+            onDelta().executeQuery("INSERT INTO default." + sourceTableName + " VALUES (1000, 'pageUrl1000', 1000), (2, 'pageUrl2', 20000)");
+            onDelta().executeQuery("INSERT INTO default." + sourceTableName + " VALUES (3000, 'pageUrl3000', 3000), (4, 'pageUrl4000', 4000)");
+
+            onDelta().executeQuery("MERGE INTO default." + targetTableName + " targetTable USING default." + sourceTableName + " sourceTable " +
+                    "ON (targetTable.page_id = sourceTable.page_id) " +
+                    "WHEN MATCHED AND targetTable.page_id = 2 " +
+                    "THEN DELETE " +
+                    "WHEN MATCHED AND targetTable.page_id > 2 " +
+                    "THEN UPDATE SET views = (targetTable.views + sourceTable.views) " +
+                    "WHEN NOT MATCHED " +
+                    "THEN INSERT (page_id, page_url, views) VALUES (sourceTable.page_id, sourceTable.page_url, sourceTable.views)");
+            onDelta().executeQuery("UPDATE default." + targetTableName + " SET page_url = 'pageUrl30' WHERE page_id = 3");
+            onDelta().executeQuery("DELETE FROM default." + targetTableName + " WHERE page_url = 'pageUrl1'");
+
+            assertThat(onDelta().executeQuery("SELECT * FROM " + targetTableName))
+                    .containsOnly(
+                            row(1000, "pageUrl1000", 1000),
+                            row(3000, "pageUrl3000", 3000),
+                            row(4, "pageUrl4", 4400),
+                            row(3, "pageUrl30", 300));
+
+            Row[] rows = {
+                    row(1, "pageUrl1", 100, "insert", 1),
+                    row(2, "pageUrl2", 200, "insert", 1),
+                    row(3, "pageUrl3", 300, "insert", 1),
+                    row(4, "pageUrl4", 400, "insert", 2),
+                    row(1000, "pageUrl1000", 1000, "insert", 3),
+                    row(3000, "pageUrl3000", 3000, "insert", 3),
+                    row(2, "pageUrl2", 200, "delete", 3),
+                    row(4, "pageUrl4", 4400, "update_postimage", 3),
+                    row(4, "pageUrl4", 400, "update_preimage", 3),
+                    row(3, "pageUrl3", 300, "update_preimage", 4),
+                    row(3, "pageUrl30", 300, "update_postimage", 4),
+                    row(1, "pageUrl1", 100, "delete", 5)};
+            assertThat(onTrino().executeQuery(
+                    "SELECT page_id, page_url, views, _change_type, _commit_version " +
+                            "FROM TABLE(delta.system.table_changes('default', '" + targetTableName + "'))"))
+                    .containsOnly(rows);
+
+            assertThat(onDelta().executeQuery(
+                    "SELECT page_id, page_url, views, _change_type, _commit_version " +
+                            "FROM table_changes('default." + targetTableName + "', 0)"))
+                    .containsOnly(rows);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + targetTableName);
+            dropDeltaTableWithRetry("default." + sourceTableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeltaCanReadCdfEntriesGeneratedByTrino()
+    {
+        String targetTableName = "test_delta_can_read_cdf_entries_generated_by_trino_target_" + randomNameSuffix();
+        String sourceTableName = "test_delta_can_read_cdf_entries_generated_by_trino_source_" + randomNameSuffix();
+        try {
+            onTrino().executeQuery("CREATE TABLE delta.default." + targetTableName + " (page_id INT, page_url VARCHAR, views INT) " +
+                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + targetTableName +
+                    "', change_data_feed_enabled = true)");
+
+            onTrino().executeQuery("CREATE TABLE delta.default." + sourceTableName + " (page_id INT, page_url VARCHAR, views INT) " +
+                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + sourceTableName +
+                    "', change_data_feed_enabled = true)");
+
+            onTrino().executeQuery("INSERT INTO delta.default." + targetTableName + " VALUES (1, 'pageUrl1', 100), (2, 'pageUrl2', 200), (3, 'pageUrl3', 300)");
+            onTrino().executeQuery("INSERT INTO delta.default." + targetTableName + " VALUES (4, 'pageUrl4', 400)");
+
+            onTrino().executeQuery("INSERT INTO delta.default." + sourceTableName + " VALUES (1000, 'pageUrl1000', 1000), (2, 'pageUrl2', 20000)");
+            onTrino().executeQuery("INSERT INTO delta.default." + sourceTableName + " VALUES (3000, 'pageUrl3000', 3000), (4, 'pageUrl4000', 4000)");
+
+            onTrino().executeQuery("MERGE INTO delta.default." + targetTableName + " targetTable USING delta.default." + sourceTableName + " sourceTable " +
+                    "ON (targetTable.page_id = sourceTable.page_id) " +
+                    "WHEN MATCHED AND targetTable.page_id = 2 " +
+                    "THEN DELETE " +
+                    "WHEN MATCHED AND targetTable.page_id > 2 " +
+                    "THEN UPDATE SET views = (targetTable.views + sourceTable.views) " +
+                    "WHEN NOT MATCHED " +
+                    "THEN INSERT (page_id, page_url, views) VALUES (sourceTable.page_id, sourceTable.page_url, sourceTable.views)");
+            onTrino().executeQuery("UPDATE delta.default." + targetTableName + " SET page_url = 'pageUrl30' WHERE page_id = 3");
+            onTrino().executeQuery("DELETE FROM delta.default." + targetTableName + " WHERE page_url = 'pageUrl1'");
+
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + targetTableName))
+                    .containsOnly(
+                            row(1000, "pageUrl1000", 1000),
+                            row(3000, "pageUrl3000", 3000),
+                            row(4, "pageUrl4", 4400),
+                            row(3, "pageUrl30", 300));
+
+            List<Row> rows = ImmutableList.<Row>builder()
+                    .add(row(1, "pageUrl1", 100, "insert", 1))
+                    .add(row(2, "pageUrl2", 200, "insert", 1))
+                    .add(row(3, "pageUrl3", 300, "insert", 1))
+                    .add(row(4, "pageUrl4", 400, "insert", 2))
+                    .add(row(1000, "pageUrl1000", 1000, "insert", 3))
+                    .add(row(3000, "pageUrl3000", 3000, "insert", 3))
+                    .add(row(2, "pageUrl2", 200, "delete", 3))
+                    .add(row(4, "pageUrl4", 4400, "update_postimage", 3))
+                    .add(row(4, "pageUrl4", 400, "update_preimage", 3))
+                    .add(row(3, "pageUrl3", 300, "update_preimage", 4))
+                    .add(row(3, "pageUrl30", 300, "update_postimage", 4))
+                    .add(row(1, "pageUrl1", 100, "delete", 5))
+                    .build();
+            assertThat(onTrino().executeQuery(
+                    "SELECT page_id, page_url, views, _change_type, _commit_version " +
+                            "FROM TABLE(delta.system.table_changes('default', '" + targetTableName + "'))"))
+                    .containsOnly(rows);
+
+            assertThat(onDelta().executeQuery(
+                    "SELECT page_id, page_url, views, _change_type, _commit_version " +
+                            "FROM table_changes('default." + targetTableName + "', 0)"))
+                    .containsOnly(rows);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + targetTableName);
+            dropDeltaTableWithRetry("default." + sourceTableName);
+        }
+    }
+
+    @DataProvider
+    public Object[][] columnMappingModeDataProvider()
+    {
+        return new Object[][] {
+                {"name"},
+                {"id"},
+                {"none"}};
+    }
+
+    private void assertThereIsNoCdfFileGenerated(String tableName, String tableProperty)
+    {
+        try {
+            onTrino().executeQuery("CREATE TABLE delta.default." + tableName + " (col1 VARCHAR, updated_column INT) " +
+                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                    (tableProperty.isEmpty() ? "" : ", " + tableProperty) + ")");
+
+            if (tableProperty.isEmpty()) {
+                assertThat(onTrino().executeQuery("SHOW CREATE TABLE " + tableName).getOnlyValue().toString())
+                        .doesNotContain("change_data_feed_enabled");
+            }
+            else {
+                assertThat(onTrino().executeQuery("SHOW CREATE TABLE " + tableName).getOnlyValue().toString())
+                        .contains(tableProperty);
+            }
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue2', 2)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue3', 3)");
+
+            // as INSERTs don't generate cdf files other operation is needed, UPDATE will do
+            onTrino().executeQuery("UPDATE delta.default." + tableName +
+                    " SET updated_column = 5 WHERE col1 = 'testValue3'");
+            onDelta().executeQuery("UPDATE default." + tableName +
+                    " SET updated_column = 4 WHERE col1 = 'testValue2'");
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(
+                            row("testValue1", 1),
+                            row("testValue2", 4),
+                            row("testValue3", 5));
+
+            assertThatThereIsNoChangeDataFiles(tableName);
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE IF EXISTS delta.default." + tableName);
+        }
+    }
+
+    private void assertThatThereIsNoChangeDataFiles(String tableName)
+    {
+        String prefix = "databricks-compatibility-test-" + tableName + "/_change_data/";
+        ListObjectsV2Result listResult = s3Client.listObjectsV2(bucketName, prefix);
+        assertThat(listResult.getObjectSummaries()).isEmpty();
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCheckConstraintCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCheckConstraintCompatibility.java
index 687068a5af09..10ceaa963d02 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCheckConstraintCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCheckConstraintCompatibility.java
@@ -14,33 +14,29 @@
 package io.trino.tests.product.deltalake;
 
 import io.trino.tempto.assertions.QueryAssert.Row;
-import io.trino.testng.services.Flaky;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTablePropertiesOnDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.entry;
 
 public class TestDeltaLakeCheckConstraintCompatibility
         extends BaseTestDeltaLakeS3Storage
 {
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS}, dataProvider = "checkConstraints")
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testCheckConstraintCompatibility(String columnDefinition, String checkConstraint, String validInput, Row insertedValue, String invalidInput)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "checkConstraints")
+    public void testCheckConstraintInsertCompatibility(String columnDefinition, String checkConstraint, String validInput, Row insertedValue, String invalidInput)
     {
-        String tableName = "test_check_constraint_" + randomNameSuffix();
+        String tableName = "test_check_constraint_insert_" + randomNameSuffix();
 
         onDelta().executeQuery("CREATE TABLE default." + tableName +
                 "(" + columnDefinition + ") " +
@@ -89,6 +85,12 @@ public static Object[][] checkConstraints()
                 {"a INT, b INT", "a = b % 2", "1, 5", row(1, 5), "1, 6"},
                 {"a INT, b INT", "a = b & 5", "1, 3", row(1, 3), "1, 4"},
                 {"a INT, b INT", "a = b ^ 5", "6, 3", row(6, 3), "6, 4"},
+                // Between
+                {"a INT", "a BETWEEN 1 AND 10", "1", row(1), "0"},
+                {"a INT", "a BETWEEN 1 AND 10", "10", row(10), "11"},
+                {"a INT", "a NOT BETWEEN 1 AND 10", "0", row(0), "1"},
+                {"a INT", "a NOT BETWEEN 1 AND 10", "11", row(11), "10"},
+                {"a INT, b INT, c INT", "a BETWEEN b AND c", "5, 1, 10", row(5, 1, 10), "11, 1, 10"},
                 // Supported types
                 {"a INT", "a < 100", "1", row(1), "100"},
                 {"a STRING", "a = 'valid'", "'valid'", row("valid"), "'invalid'"},
@@ -98,8 +100,167 @@ public static Object[][] checkConstraints()
         };
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testCheckConstraintUpdateCompatibility()
+    {
+        String tableName = "test_check_constraint_update_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(a INT) " +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD CONSTRAINT a_constraint CHECK (a < 3)");
+
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES 1");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1));
+            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET a = 2");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(2));
+
+            assertThatThrownBy(() -> onDelta().executeQuery("UPDATE default." + tableName + " SET a = 3"))
+                    .hasMessageMatching("(?s).* CHECK constraint .* violated by row with values.*");
+            assertThatThrownBy(() -> onTrino().executeQuery("UPDATE delta.default." + tableName + " SET a = 3"))
+                    .hasMessageContaining("Check constraint violation");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(2));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    // TODO: Add DELTA_LAKE_DATABRICKS groups once flakiness on Databricks is resolved
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testCheckConstraintMergeCompatibility()
+    {
+        String tableName1 = "test_check_constraint_merge_" + randomNameSuffix();
+        String tableName2 = "test_check_constraint_merge_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName1 +
+                "(a INT) " +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName1 + "'");
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName2 +
+                "(a INT) " +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName2 + "'");
+
+        try {
+            onDelta().executeQuery("ALTER TABLE default." + tableName1 + " ADD CONSTRAINT a_constraint CHECK (a < 3)");
+
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName1 + " VALUES (1)");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName2 + " VALUES (1), (2)");
+
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName1))
+                    .containsOnly(row(1));
+
+            onTrino().executeQuery("MERGE INTO delta.default." + tableName1 + " t USING delta.default." + tableName2 + " s " +
+                    "ON (t.a = s.a) " +
+                    "WHEN MATCHED " +
+                    "THEN UPDATE SET a = 2 " +
+                    "WHEN NOT MATCHED " +
+                    "THEN INSERT (a) VALUES (2)");
+
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName1))
+                    .containsOnly(
+                            row(2),
+                            row(2));
+
+            assertThatThrownBy(() -> onDelta().executeQuery("MERGE INTO default." + tableName1 + " t USING default." + tableName2 + " s " +
+                    "ON (t.a = s.a) " +
+                    "WHEN MATCHED " +
+                    "THEN UPDATE SET a = 3 " +
+                    "WHEN NOT MATCHED " +
+                    "THEN INSERT (a) VALUES (3)"))
+                    .hasMessageMatching("(?s).* CHECK constraint .* violated by row with values.*");
+            assertThatThrownBy(() -> onTrino().executeQuery("MERGE INTO delta.default." + tableName1 + " t USING delta.default." + tableName2 + " s " +
+                    "ON (t.a = s.a) " +
+                    "WHEN MATCHED " +
+                    "THEN UPDATE SET a = 3 " +
+                    "WHEN NOT MATCHED " +
+                    "THEN INSERT (a) VALUES (3)"))
+                    .hasMessageContaining("Check constraint violation");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName1))
+                    .containsOnly(
+                            row(2),
+                            row(2));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName1);
+            dropDeltaTableWithRetry("default." + tableName2);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testCheckConstraintWriterFeature()
+    {
+        String tableName = "test_check_constraint_writer_feature_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(a INT) " +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.minWriterVersion'='7')");
+        onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD CONSTRAINT a_constraint CHECK (a > 1)");
+        try {
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES 2");
+            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES 1"))
+                    .hasMessageContaining("Check constraint violation");
+
+            // delta.feature.checkConstraints still exists even after unsetting the property
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " UNSET TBLPROPERTIES ('delta.feature.checkConstraints')");
+            assertThat(getTablePropertiesOnDelta("default", tableName))
+                    .contains(entry("delta.feature.checkConstraints", "supported"))
+                    .contains(entry("delta.constraints.a_constraint", "a > 1"));
+
+            // Remove the constraint directly
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " UNSET TBLPROPERTIES ('delta.constraints.a_constraint')");
+            assertThat(getTablePropertiesOnDelta("default", tableName))
+                    .contains(entry("delta.feature.checkConstraints", "supported"))
+                    .doesNotContainKey("delta.constraints.a_constraint");
+
+            // CHECK constraints shouldn't be enforced after the constraint property was removed
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES 3");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES 4");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(2), row(3), row(4));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testCheckConstraintUnknownCondition()
+    {
+        String tableName = "test_check_constraint_unknown_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(a INT) " +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+        onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD CONSTRAINT a_constraint CHECK (a > 1)");
+
+        try {
+            // Values which produces unknown conditions are treated as FALSE by DELTA specification and as TRUE by Trino according to SQL standard
+            // https://github.com/delta-io/delta/issues/1714
+            assertThatThrownBy(() -> onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (null)"))
+                    .hasMessageMatching("(?s).* CHECK constraint .* violated by row with values.*");
+
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (null)");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row((Object) null));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testCheckConstraintAcrossColumns()
     {
         String tableName = "test_check_constraint_across_columns_" + randomNameSuffix();
@@ -126,43 +287,52 @@ public void testCheckConstraintAcrossColumns()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_OSS, DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testWritesToTableWithCheckConstraintFails()
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testMetadataOperationsRetainCheckConstraint()
     {
-        String tableName = "test_check_constraint_unsupported_operatins_" + randomNameSuffix();
-
+        String tableName = "test_metadata_operations_retain_check_constraints_" + randomNameSuffix();
         onDelta().executeQuery("CREATE TABLE default." + tableName + " (a INT, b INT) " +
                 "USING DELTA " +
                 "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
         onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD CONSTRAINT aIsPositive CHECK (a > 0)");
         try {
-            assertQueryFailure(() -> onTrino().executeQuery("UPDATE delta.default." + tableName + " SET a = 3 WHERE b = 3"))
-                    .hasMessageContaining("Updating a table with a check constraint is not supported");
-            assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE a = 3"))
-                    .hasMessageContaining("Writing to tables with CHECK constraints is not supported");
-            assertQueryFailure(() -> onTrino().executeQuery("MERGE INTO delta.default." + tableName + " t USING delta.default." + tableName + " s " +
-                    "ON (t.a = s.a) WHEN MATCHED THEN UPDATE SET b = 42"))
-                    .hasMessageContaining("Cannot merge into a table with check constraints");
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN c INT");
+            onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".c IS 'example column comment'");
+            onTrino().executeQuery("COMMENT ON TABLE delta.default." + tableName + " IS 'example table comment'");
         }
         finally {
             dropDeltaTableWithRetry("default." + tableName);
         }
     }
 
-    @Test(groups = {DELTA_LAKE_OSS, DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testMetadataOperationsRetainCheckConstraint()
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testUnsupportedCheckConstraintExpression()
     {
-        String tableName = "test_metadata_operations_retain_check_constraints_" + randomNameSuffix();
+        String tableName = "test_unsupported_check_constraints_" + randomNameSuffix();
         onDelta().executeQuery("CREATE TABLE default." + tableName + " (a INT, b INT) " +
                 "USING DELTA " +
                 "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
-        onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD CONSTRAINT aIsPositive CHECK (a > 0)");
+
         try {
+            // This constraint should be changed to a new one if the connector supports the expression
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD CONSTRAINT test_constraint CHECK (a = abs(b))");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, -1), (2, -2)");
+
+            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, -1)"))
+                    .hasMessageContaining("Failed to convert Delta check constraints to Trino expression");
+            assertQueryFailure(() -> onTrino().executeQuery("UPDATE delta.default." + tableName + " SET a = -1"))
+                    .hasMessageContaining("Failed to convert Delta check constraints to Trino expression");
+            onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE a = 2");
+            assertQueryFailure(() -> onTrino().executeQuery("MERGE INTO delta.default." + tableName + " t USING delta.default." + tableName + " s " +
+                    "ON (t.a = s.a) WHEN MATCHED THEN UPDATE SET b = -1"))
+                    .hasMessageContaining("Failed to convert Delta check constraints to Trino expression");
+
+            // Verify these operations succeed even if check constraints have unsupported expressions
             onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN c INT");
             onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".c IS 'example column comment'");
             onTrino().executeQuery("COMMENT ON TABLE delta.default." + tableName + " IS 'example table comment'");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1, -1, null));
         }
         finally {
             dropDeltaTableWithRetry("default." + tableName);
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCheckpointsCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCheckpointsCompatibility.java
new file mode 100644
index 000000000000..49d8cce5ed4f
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCheckpointsCompatibility.java
@@ -0,0 +1,622 @@
+/*
+ * Licensed 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 io.trino.tests.product.deltalake;
+
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.model.ObjectListing;
+import com.amazonaws.services.s3.model.S3ObjectSummary;
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import io.trino.tempto.BeforeMethodWithContext;
+import io.trino.tempto.assertions.QueryAssert;
+import io.trino.testng.services.Flaky;
+import io.trino.tests.product.deltalake.util.DatabricksVersion;
+import org.testng.SkipException;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_104;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_113;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.deltalake.TransactionLogAssertions.assertLastEntryIsCheckpointed;
+import static io.trino.tests.product.deltalake.TransactionLogAssertions.assertTransactionLogVersion;
+import static io.trino.tests.product.deltalake.util.DatabricksVersion.DATABRICKS_104_RUNTIME_VERSION;
+import static io.trino.tests.product.deltalake.util.DatabricksVersion.DATABRICKS_91_RUNTIME_VERSION;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getDatabricksRuntimeVersion;
+import static io.trino.tests.product.utils.QueryExecutors.onDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestDeltaLakeCheckpointsCompatibility
+        extends BaseTestDeltaLakeS3Storage
+{
+    @Inject
+    @Named("s3.server_type")
+    private String s3ServerType;
+
+    private AmazonS3 s3;
+    private Optional<DatabricksVersion> databricksRuntimeVersion;
+
+    @BeforeMethodWithContext
+    public void setup()
+    {
+        super.setUp();
+        s3 = new S3ClientFactory().createS3Client(s3ServerType);
+        databricksRuntimeVersion = getDatabricksRuntimeVersion();
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testSparkCanReadTrinoCheckpoint()
+    {
+        String tableName = "test_dl_checkpoints_compat_" + randomNameSuffix();
+        String tableDirectory = "delta-compatibility-test-" + tableName;
+        // using mixed case column names for extend test coverage
+
+        onDelta().executeQuery(format(
+                "CREATE TABLE default.%s" +
+                        "      (a_NuMbEr INT, a_StRiNg STRING)" +
+                        "      USING delta" +
+                        "      PARTITIONED BY (a_NuMbEr)" +
+                        "      LOCATION 's3://%s/%s'",
+                tableName, bucketName, tableDirectory));
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,'ala'), (2, 'kota')");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'osla')");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (3, 'psa'), (4, 'bobra')");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (4, 'lwa'), (5, 'jeza')");
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a_string = 'jeza'");
+            onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE a_string = 'bobra'");
+
+            List<QueryAssert.Row> expectedRows = ImmutableList.of(
+                    row(1, "ala"),
+                    row(2, "kota"),
+                    row(3, "osla"),
+                    row(3, "psa"),
+                    row(4, "lwa"));
+
+            // sanity check
+            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(0);
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName + " WHERE a_string <> 'fill'"))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE a_string <> 'fill'"))
+                    .containsOnly(expectedRows);
+
+            // fill with inserts to trigger checkpoint
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'fill')");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'fill')");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'fill')");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'fill')");
+
+            // check we can still query data
+            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(1);
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName + " WHERE a_string <> 'fill'"))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE a_string <> 'fill'"))
+                    .containsOnly(expectedRows);
+        }
+        finally {
+            // cleanup
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoUsesCheckpointInterval()
+    {
+        trinoUsesCheckpointInterval("'delta.checkpointInterval' = '5'");
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoUsesCheckpointIntervalWithTableFeature()
+    {
+        trinoUsesCheckpointInterval("'delta.checkpointInterval' = '5', 'delta.feature.columnMapping'='supported'");
+    }
+
+    private void trinoUsesCheckpointInterval(String deltaTableProperties)
+    {
+        String tableName = "test_dl_checkpoints_compat_" + randomNameSuffix();
+        String tableDirectory = "databricks-compatibility-test-" + tableName;
+
+        onDelta().executeQuery(format(
+                "CREATE TABLE default.%s" +
+                        "      (a_NuMbEr INT, a_StRiNg STRING)" +
+                        "      USING delta" +
+                        "      PARTITIONED BY (a_NuMbEr)" +
+                        "      LOCATION 's3://%s/%s'" +
+                        "      TBLPROPERTIES (%s)",
+                tableName, bucketName, tableDirectory, deltaTableProperties));
+
+        try {
+            // validate that we can see the checkpoint interval
+            assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE delta.default." + tableName).getOnlyValue())
+                    .contains("checkpoint_interval = 5");
+
+            // sanity check
+            fillWithInserts("delta.default." + tableName, "(1, 'trino')", 4);
+            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(0);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE a_string <> 'trino'")).hasNoRows();
+
+            // fill to first checkpoint using Trino
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'ala'), (2, 'kota')");
+            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(1);
+
+            // fill to next checkpoint using a mix of Trino and Databricks
+            fillWithInserts("delta.default." + tableName, "(2, 'trino')", 3);
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'psa'), (4, 'bobra')");
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a_string = 'trino'");
+
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " SET TBLPROPERTIES ('delta.checkpointInterval' = '2')");
+            // Starting with Databricks Runtime 8.4 checkpoint writing is dynamic rather than relying on a set interval
+            int initialCheckpointCount = listCheckpointFiles(bucketName, tableDirectory).size();
+
+            fillWithInserts("delta.default." + tableName, "(3, 'trino')", 4);
+            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(initialCheckpointCount + 2);
+        }
+        finally {
+            // cleanup
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_104, DELTA_LAKE_DATABRICKS_113, DELTA_LAKE_DATABRICKS_122, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testDatabricksUsesCheckpointInterval()
+    {
+        String tableName = "test_dl_checkpoints_compat_" + randomNameSuffix();
+        String tableDirectory = "databricks-compatibility-test-" + tableName;
+
+        onTrino().executeQuery(format("CREATE TABLE delta.default.%s (a_number bigint, a_string varchar) " +
+                "WITH (" +
+                "      location = 's3://%s/%s'," +
+                "      partitioned_by = ARRAY['a_number']," +
+                "      checkpoint_interval = 3" +
+                ")", tableName, bucketName, tableDirectory));
+
+        try {
+            // validate that Databricks can see the checkpoint interval
+            assertThat((String) onDelta().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
+                    .contains("'delta.checkpointInterval' = '3'");
+
+            // sanity check
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 'databricks')");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (2, 'databricks')");
+            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(0);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE a_string <> 'databricks'")).hasNoRows();
+
+            // fill to first checkpoint using Databricks
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'databricks')");
+            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(1);
+
+            // fill to next checkpoint using a mix of Trino and Databricks
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'ala'), (2, 'kota')");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'psa'), (4, 'bobra')");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (5, 'osla'), (6, 'lwa')");
+            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(2);
+        }
+        finally {
+            // cleanup
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testTrinoCheckpointMinMaxStatisticsForRowType()
+    {
+        String tableName = "test_dl_checkpoints_row_compat_min_max_trino_" + randomNameSuffix();
+        testCheckpointMinMaxStatisticsForRowType(sql -> onTrino().executeQuery(sql), tableName, "delta.default." + tableName);
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testDatabricksCheckpointMinMaxStatisticsForRowType()
+    {
+        String tableName = "test_dl_checkpoints_row_compat_min_max_databricks_" + randomNameSuffix();
+        testCheckpointMinMaxStatisticsForRowType(sql -> onDelta().executeQuery(sql), tableName, "default." + tableName);
+    }
+
+    private void testCheckpointMinMaxStatisticsForRowType(Consumer<String> sqlExecutor, String tableName, String qualifiedTableName)
+    {
+        List<QueryAssert.Row> expectedRows = ImmutableList.of(
+                row(1, "ala"),
+                row(2, "kota"),
+                row(3, "osla"),
+                row(4, "zulu"));
+
+        onDelta().executeQuery(format(
+                "CREATE TABLE default.%s" +
+                        "      (id INT, root STRUCT<entry_one : INT, entry_two : STRING>)" +
+                        "      USING DELTA " +
+                        "      LOCATION 's3://%s/databricks-compatibility-test-%1$s' " +
+                        "      TBLPROPERTIES (delta.checkpointInterval = 1)",
+                tableName, bucketName));
+
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, STRUCT(1,'ala')), (2, STRUCT(2, 'kota'))");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, STRUCT(3, 'osla'))");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (4, STRUCT(4, 'zulu'))");
+
+            // sanity check
+            assertThat(listCheckpointFiles(bucketName, "databricks-compatibility-test-" + tableName)).hasSize(3);
+            assertTransactionLogVersion(s3, bucketName, tableName, 3);
+            assertThat(onDelta().executeQuery("SELECT DISTINCT root.entry_one, root.entry_two FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT DISTINCT root.entry_one, root.entry_two FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+
+            // Trigger a checkpoint
+            sqlExecutor.accept("DELETE FROM " + qualifiedTableName + " WHERE id = 4");
+            assertLastEntryIsCheckpointed(s3, bucketName, tableName);
+
+            // Assert min/max queries can be computed from just metadata
+            String explainSelectMax = getOnlyElement(onDelta().executeQuery("EXPLAIN SELECT max(root.entry_one) FROM default." + tableName).column(1));
+            String column = databricksRuntimeVersion.orElseThrow().isAtLeast(DATABRICKS_104_RUNTIME_VERSION) ? "root.entry_one" : "root.entry_one AS `entry_one`";
+            assertThat(explainSelectMax).matches("== Physical Plan ==\\s*LocalTableScan \\[max\\(" + column + "\\).*]\\s*");
+
+            // check both engines can read both tables
+            List<QueryAssert.Row> maxMin = ImmutableList.of(row(3, "ala"));
+            assertThat(onDelta().executeQuery("SELECT max(root.entry_one), min(root.entry_two) FROM default." + tableName))
+                    .containsOnly(maxMin);
+            assertThat(onTrino().executeQuery("SELECT max(root.entry_one), min(root.entry_two) FROM delta.default." + tableName))
+                    .containsOnly(maxMin);
+        }
+        finally {
+            // cleanup
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testTrinoCheckpointNullStatisticsForRowType()
+    {
+        String tableName = "test_dl_checkpoints_row_compat_trino_" + randomNameSuffix();
+        testCheckpointNullStatisticsForRowType(sql -> onTrino().executeQuery(sql), tableName, "delta.default." + tableName);
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testDatabricksCheckpointNullStatisticsForRowType()
+    {
+        String tableName = "test_dl_checkpoints_row_compat_databricks_" + randomNameSuffix();
+        testCheckpointNullStatisticsForRowType(sql -> onDelta().executeQuery(sql), tableName, "default." + tableName);
+    }
+
+    private void testCheckpointNullStatisticsForRowType(Consumer<String> sqlExecutor, String tableName, String qualifiedTableName)
+    {
+        List<QueryAssert.Row> expectedRows = ImmutableList.of(
+                row(1, "ala"),
+                row(2, "kota"),
+                row(null, null),
+                row(4, "zulu"));
+
+        onDelta().executeQuery(format(
+                "CREATE TABLE default.%s" +
+                        "      (id INT, root STRUCT<entry_one : INT, entry_two : STRING>)" +
+                        "      USING DELTA " +
+                        "      LOCATION 's3://%s/databricks-compatibility-test-%1$s' " +
+                        "      TBLPROPERTIES (delta.checkpointInterval = 1)",
+                tableName, bucketName));
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, STRUCT(1,'ala')), (2, STRUCT(2, 'kota'))");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, STRUCT(null, null))");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (4, STRUCT(4, 'zulu'))");
+
+            // sanity check
+            assertThat(listCheckpointFiles(bucketName, "databricks-compatibility-test-" + tableName)).hasSize(3);
+            assertTransactionLogVersion(s3, bucketName, tableName, 3);
+            assertThat(onDelta().executeQuery("SELECT DISTINCT root.entry_one, root.entry_two FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT DISTINCT root.entry_one, root.entry_two FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+
+            // Trigger a checkpoint with a DELETE
+            sqlExecutor.accept("DELETE FROM " + qualifiedTableName + " WHERE id = 4");
+            assertLastEntryIsCheckpointed(s3, bucketName, tableName);
+
+            // Assert counting non null entries can be computed from just metadata
+            String explainCountNotNull = getOnlyElement(onDelta().executeQuery("EXPLAIN SELECT count(root.entry_two) FROM default." + tableName).column(1));
+            String column = databricksRuntimeVersion.orElseThrow().isAtLeast(DATABRICKS_104_RUNTIME_VERSION) ? "root.entry_two" : "root.entry_two AS `entry_two`";
+            assertThat(explainCountNotNull).matches("== Physical Plan ==\\s*LocalTableScan \\[count\\(" + column + "\\).*]\\s*");
+
+            // check both engines can read both tables
+            assertThat(onDelta().executeQuery("SELECT count(root.entry_two) FROM default." + tableName))
+                    .containsOnly(row(2));
+            assertThat(onTrino().executeQuery("SELECT count(root.entry_two) FROM delta.default." + tableName))
+                    .containsOnly(row(2));
+        }
+        finally {
+            // cleanup
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoWriteStatsAsJsonDisabled()
+    {
+        String tableName = "test_dl_checkpoints_write_stats_as_json_disabled_trino_" + randomNameSuffix();
+        testWriteStatsAsJsonDisabled(sql -> onTrino().executeQuery(sql), tableName, "delta.default." + tableName, 3.0, 1.0);
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testSparkWriteStatsAsJsonDisabled()
+    {
+        String tableName = "test_dl_checkpoints_write_stats_as_json_disabled_spark_" + randomNameSuffix();
+        testWriteStatsAsJsonDisabled(sql -> onDelta().executeQuery(sql), tableName, "default." + tableName, null, null);
+    }
+
+    private void testWriteStatsAsJsonDisabled(Consumer<String> sqlExecutor, String tableName, String qualifiedTableName, Double dataSize, Double distinctValues)
+    {
+        onDelta().executeQuery(format(
+                "CREATE TABLE default.%s" +
+                        "(a_number INT, a_string STRING) " +
+                        "USING DELTA " +
+                        "PARTITIONED BY (a_number) " +
+                        "LOCATION 's3://%s/databricks-compatibility-test-%1$s' " +
+                        "TBLPROPERTIES (" +
+                        " delta.checkpointInterval = 5, " +
+                        " delta.checkpoint.writeStatsAsJson = false)",
+                tableName, bucketName));
+
+        try {
+            sqlExecutor.accept("INSERT INTO " + qualifiedTableName + " VALUES (1,'ala')");
+
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(ImmutableList.of(
+                            row("a_number", null, 1.0, 0.0, null, null, null),
+                            row("a_string", dataSize, distinctValues, 0.0, null, null, null),
+                            row(null, null, null, null, 1.0, null, null)));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoWriteStatsAsStructDisabled()
+    {
+        String tableName = "test_dl_checkpoints_write_stats_as_struct_disabled_trino_" + randomNameSuffix();
+        testWriteStatsAsStructDisabled(sql -> onTrino().executeQuery(sql), tableName, "delta.default." + tableName);
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testSparkWriteStatsAsStructDisabled()
+    {
+        String tableName = "test_dl_checkpoints_write_stats_as_struct_disabled_spark_" + randomNameSuffix();
+        testWriteStatsAsStructDisabled(sql -> onDelta().executeQuery(sql), tableName, "default." + tableName);
+    }
+
+    private void testWriteStatsAsStructDisabled(Consumer<String> sqlExecutor, String tableName, String qualifiedTableName)
+    {
+        onDelta().executeQuery(format(
+                "CREATE TABLE default.%s" +
+                        "(a_number INT, a_string STRING) " +
+                        "USING DELTA " +
+                        "PARTITIONED BY (a_number) " +
+                        "LOCATION 's3://%s/databricks-compatibility-test-%1$s' " +
+                        "TBLPROPERTIES (" +
+                        " delta.checkpointInterval = 1, " +
+                        " delta.checkpoint.writeStatsAsJson = false, " + // Disable json stats to avoid merging statistics with 'stats' field
+                        " delta.checkpoint.writeStatsAsStruct = false)",
+                tableName, bucketName));
+
+        try {
+            sqlExecutor.accept("INSERT INTO " + qualifiedTableName + " VALUES (1,'ala')");
+
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(ImmutableList.of(
+                            row("a_number", null, null, null, null, null, null),
+                            row("a_string", null, null, null, null, null, null),
+                            row(null, null, null, null, null, null, null)));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "testTrinoCheckpointWriteStatsAsJson")
+    public void testTrinoWriteStatsAsJsonEnabled(String type, String inputValue, Double dataSize, Double distinctValues, Double nullsFraction, Object statsValue)
+    {
+        String tableName = "test_dl_checkpoints_write_stats_as_json_enabled_trino_" + randomNameSuffix();
+        testWriteStatsAsJsonEnabled(sql -> onTrino().executeQuery(sql), tableName, "delta.default." + tableName, type, inputValue, dataSize, distinctValues, nullsFraction, statsValue);
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS}, dataProvider = "testDeltaCheckpointWriteStatsAsJson")
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testDatabricksWriteStatsAsJsonEnabled(String type, String inputValue, Double nullsFraction, Object statsValue)
+    {
+        String tableName = "test_dl_checkpoints_write_stats_as_json_enabled_databricks_" + randomNameSuffix();
+        testWriteStatsAsJsonEnabled(sql -> onDelta().executeQuery(sql), tableName, "default." + tableName, type, inputValue, null, null, nullsFraction, statsValue);
+    }
+
+    private void testWriteStatsAsJsonEnabled(Consumer<String> sqlExecutor, String tableName, String qualifiedTableName, String type, String inputValue, Double dataSize, Double distinctValues, Double nullsFraction, Object statsValue)
+    {
+        String createTableSql = format(
+                "CREATE TABLE default.%s" +
+                        "(col %s) " +
+                        "USING DELTA " +
+                        "LOCATION 's3://%s/databricks-compatibility-test-%1$s' " +
+                        "TBLPROPERTIES (" +
+                        " delta.checkpointInterval = 2, " +
+                        " delta.checkpoint.writeStatsAsJson = false, " +
+                        " delta.checkpoint.writeStatsAsStruct = true)",
+                tableName, type, bucketName);
+
+        if (databricksRuntimeVersion.isPresent() && databricksRuntimeVersion.get().equals(DATABRICKS_91_RUNTIME_VERSION) && type.equals("struct<x bigint>")) {
+            assertThatThrownBy(() -> onDelta().executeQuery(createTableSql)).hasStackTraceContaining("ParseException");
+            throw new SkipException("New runtime version covers the type");
+        }
+
+        onDelta().executeQuery(createTableSql);
+
+        try {
+            sqlExecutor.accept("INSERT INTO " + qualifiedTableName + " SELECT " + inputValue);
+            sqlExecutor.accept("INSERT INTO " + qualifiedTableName + " SELECT " + inputValue);
+
+            // SET TBLPROPERTIES increments checkpoint
+            onDelta().executeQuery("" +
+                    "ALTER TABLE default." + tableName + " SET TBLPROPERTIES (" +
+                    "'delta.checkpoint.writeStatsAsJson' = true, " +
+                    "'delta.checkpoint.writeStatsAsStruct' = false)");
+
+            sqlExecutor.accept("INSERT INTO " + qualifiedTableName + " SELECT " + inputValue);
+
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(ImmutableList.of(
+                            row("col", dataSize, distinctValues, nullsFraction, null, statsValue, statsValue),
+                            row(null, null, null, null, 3.0, null, null)));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @DataProvider
+    public Object[][] testTrinoCheckpointWriteStatsAsJson()
+    {
+        return new Object[][] {
+                {"boolean", "true", null, 1.0, 0.0, null},
+                {"integer", "1", null, 1.0, 0.0, "1"},
+                {"tinyint", "2", null, 1.0, 0.0, "2"},
+                {"smallint", "3", null, 1.0, 0.0, "3"},
+                {"bigint", "1000", null, 1.0, 0.0, "1000"},
+                {"real", "0.1", null, 1.0, 0.0, "0.1"},
+                {"double", "1.0", null, 1.0, 0.0, "1.0"},
+                {"decimal(3,2)", "3.14", null, 1.0, 0.0, "3.14"},
+                {"decimal(30,1)", "12345", null, 1.0, 0.0, "12345.0"},
+                {"string", "'test'", 12.0, 1.0, 0.0, null},
+                {"binary", "X'65683F'", 9.0, 1.0, 0.0, null},
+                {"date", "date '2021-02-03'", null, 1.0, 0.0, "2021-02-03"},
+                {"timestamp", "timestamp '2001-08-22 11:04:05.321 UTC'", null, 1.0, 0.0, "2001-08-22 11:04:05.321 UTC"},
+                {"array<int>", "array[1]", null, null, null, null},
+                {"map<string,int>", "map(array['key1', 'key2'], array[1, 2])", null, null, null, null},
+                {"struct<x bigint>", "cast(row(1) as row(x bigint))", null, null, null, null},
+        };
+    }
+
+    @DataProvider
+    public Object[][] testDeltaCheckpointWriteStatsAsJson()
+    {
+        return new Object[][] {
+                {"boolean", "true", 0.0, null},
+                {"integer", "1", 0.0, "1"},
+                {"tinyint", "2", 0.0, "2"},
+                {"smallint", "3", 0.0, "3"},
+                {"bigint", "1000", 0.0, "1000"},
+                {"real", "0.1", 0.0, "0.1"},
+                {"double", "1.0", 0.0, "1.0"},
+                {"decimal(3,2)", "3.14", 0.0, "3.14"},
+                {"decimal(30,1)", "12345", 0.0, "12345.0"},
+                {"string", "'test'", 0.0, null},
+                {"binary", "X'65683F'", 0.0, null},
+                {"date", "date '2021-02-03'", 0.0, "2021-02-03"},
+                {"timestamp", "timestamp '2001-08-22 11:04:05.321 UTC'", 0.0, "2001-08-22 11:04:05.321 UTC"},
+                {"array<int>", "array(1)", 0.0, null},
+                {"map<string,int>", "map('key1', 1, 'key2', 2)", 0.0, null},
+                {"struct<x bigint>", "named_struct('x', 1)", null, null},
+        };
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoWriteStatsAsStructEnabled()
+    {
+        String tableName = "test_dl_checkpoints_write_stats_as_struct_enabled_trino_" + randomNameSuffix();
+        testWriteStatsAsStructEnabled(sql -> onTrino().executeQuery(sql), tableName, "delta.default." + tableName, 3.0, 1.0);
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testDatabricksWriteStatsAsStructEnabled()
+    {
+        String tableName = "test_dl_checkpoints_write_stats_as_struct_enabled_databricks_" + randomNameSuffix();
+        testWriteStatsAsStructEnabled(sql -> onDelta().executeQuery(sql), tableName, "default." + tableName, null, null);
+    }
+
+    private void testWriteStatsAsStructEnabled(Consumer<String> sqlExecutor, String tableName, String qualifiedTableName, Double dataSize, Double distinctValues)
+    {
+        onDelta().executeQuery(format(
+                "CREATE TABLE default.%s" +
+                        "(a_number INT, a_string STRING) " +
+                        "USING DELTA " +
+                        "PARTITIONED BY (a_number) " +
+                        "LOCATION 's3://%s/databricks-compatibility-test-%1$s' " +
+                        "TBLPROPERTIES (" +
+                        " delta.checkpointInterval = 1, " +
+                        " delta.checkpoint.writeStatsAsJson = false, " +
+                        " delta.checkpoint.writeStatsAsStruct = true)",
+                tableName, bucketName));
+
+        try {
+            sqlExecutor.accept("INSERT INTO " + qualifiedTableName + " VALUES (1,'ala')");
+
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(ImmutableList.of(
+                            row("a_number", null, 1.0, 0.0, null, null, null),
+                            row("a_string", dataSize, distinctValues, 0.0, null, null, null),
+                            row(null, null, null, null, 1.0, null, null)));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    private void fillWithInserts(String tableName, String values, int toCreate)
+    {
+        for (int i = 0; i < toCreate; i++) {
+            assertThat(onTrino().executeQuery(format("INSERT INTO %s VALUES %s", tableName, values))).updatedRowsCountIsEqualTo(1);
+        }
+    }
+
+    private List<String> listCheckpointFiles(String bucketName, String tableDirectory)
+    {
+        List<String> allFiles = listS3Directory(bucketName, tableDirectory + "/_delta_log");
+        return allFiles.stream()
+                .filter(path -> path.contains("checkpoint.parquet"))
+                .collect(toImmutableList());
+    }
+
+    private List<String> listS3Directory(String bucketName, String directory)
+    {
+        ImmutableList.Builder<String> result = ImmutableList.builder();
+        ObjectListing listing = s3.listObjects(bucketName, directory);
+        do {
+            listing.getObjectSummaries().stream().map(S3ObjectSummary::getKey).forEach(result::add);
+            listing = s3.listNextBatchOfObjects(listing);
+        }
+        while (listing.isTruncated());
+        return result.build();
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeColumnMappingMode.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeColumnMappingMode.java
index 8246f1da4b02..8952c67ef044 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeColumnMappingMode.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeColumnMappingMode.java
@@ -20,26 +20,42 @@
 import org.testng.annotations.Test;
 
 import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_104;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_113;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_91;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getColumnCommentOnDelta;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getColumnCommentOnTrino;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getColumnNamesOnDelta;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTableCommentOnDelta;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTableCommentOnTrino;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTablePropertiesOnDelta;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTablePropertyOnDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.util.Locale.ENGLISH;
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.entry;
+import static org.testng.Assert.assertEquals;
 
 public class TestDeltaLakeColumnMappingMode
         extends BaseTestDeltaLakeS3Storage
 {
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_104, DELTA_LAKE_DATABRICKS_113, DELTA_LAKE_DATABRICKS_122, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
     @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
     public void testColumnMappingModeNone()
     {
@@ -47,7 +63,7 @@ public void testColumnMappingModeNone()
 
         onDelta().executeQuery("" +
                 "CREATE TABLE default." + tableName +
-                " (a_number INT)" +
+                " (a_number INT, nested STRUCT<field1: STRING>)" +
                 " USING delta " +
                 " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
                 " TBLPROPERTIES (" +
@@ -55,12 +71,12 @@ public void testColumnMappingModeNone()
                 " 'delta.minWriterVersion'='5')");
 
         try {
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, struct('nested 1'))");
 
-            List<Row> expectedRows = ImmutableList.of(row(1));
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+            List<Row> expectedRows = ImmutableList.of(row(1, "nested 1"));
+            assertThat(onDelta().executeQuery("SELECT a_number, nested.field1 FROM default." + tableName))
                     .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+            assertThat(onTrino().executeQuery("SELECT a_number, nested.field1 FROM delta.default." + tableName))
                     .containsOnly(expectedRows);
         }
         finally {
@@ -68,13 +84,105 @@ public void testColumnMappingModeNone()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testColumnMappingMode(String mode)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "supportedColumnMappingForDmlDataProvider")
+    public void testColumnMappingModeTableFeature(String mode)
     {
-        String tableName = "test_dl_column_mapping_mode_name_" + randomNameSuffix();
+        String tableName = "test_dl_column_mapping_mode_table_feature" + randomNameSuffix();
 
         onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                " (col INT)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.feature.columnMapping'='supported', 'delta.columnMapping.mode'='" + mode + "')");
+        try {
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES 1");
+            assertThat(getTablePropertiesOnDelta("default", tableName))
+                    .contains(entry("delta.feature.columnMapping", "supported"))
+                    .contains(entry("delta.columnMapping.mode", mode));
+
+            // delta.feature.columnMapping still exists even after unsetting the property
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " UNSET TBLPROPERTIES ('delta.feature.columnMapping')");
+            assertThat(getTablePropertiesOnDelta("default", tableName))
+                    .contains(entry("delta.feature.columnMapping", "supported"));
+
+            // Unsetting delta.columnMapping.mode means changing to 'none' column mapping mode
+            if (mode.equals("none")) {
+                onDelta().executeQuery("ALTER TABLE default." + tableName + " UNSET TBLPROPERTIES ('delta.columnMapping.mode')");
+                assertThat(getTablePropertiesOnDelta("default", tableName))
+                        .contains(entry("delta.feature.columnMapping", "supported"))
+                        .doesNotContainKey("delta.columnMapping.mode");
+                assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE delta.default." + tableName).getOnlyValue())
+                        .doesNotContain("column_mapping_mode =");
+            }
+            else {
+                assertQueryFailure(() -> onDelta().executeQuery("ALTER TABLE default." + tableName + " UNSET TBLPROPERTIES ('delta.columnMapping.mode')"))
+                        .hasMessageContaining("Changing column mapping mode from '" + mode + "' to 'none' is not supported");
+                assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE delta.default." + tableName).getOnlyValue())
+                        .contains("column_mapping_mode = '" + mode.toUpperCase(ENGLISH) + "'");
+            }
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
+    public void testTrinoColumnMappingModeReaderAndWriterVersion(String mode)
+    {
+        testColumnMappingModeReaderAndWriterVersion(tableName -> onTrino().executeQuery("" +
+                "CREATE TABLE delta.default." + tableName +
+                "(x INT) " +
+                "WITH (" +
+                " location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'," +
+                " column_mapping_mode = '" + mode + "'" +
+                ")"));
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
+    public void testDeltaColumnMappingModeReaderAndWriterVersion(String mode)
+    {
+        testColumnMappingModeReaderAndWriterVersion(tableName -> onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(x INT) " +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.columnMapping.mode'='" + mode + "')"));
+    }
+
+    private void testColumnMappingModeReaderAndWriterVersion(Consumer<String> createTable)
+    {
+        String tableName = "test_dl_column_mapping_version_" + randomNameSuffix();
+
+        createTable.accept(tableName);
+
+        assertThat(getTablePropertyOnDelta("default", tableName, "delta.minReaderVersion"))
+                .isEqualTo("2");
+        assertThat(getTablePropertyOnDelta("default", tableName, "delta.minWriterVersion"))
+                .isEqualTo("5");
+
+        onTrino().executeQuery("DROP TABLE delta.default." + tableName);
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_104, DELTA_LAKE_DATABRICKS_113, DELTA_LAKE_DATABRICKS_122, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testTrinoColumnMappingMode(String mode)
+    {
+        testColumnMappingMode(tableName -> onTrino().executeQuery("" +
+                "CREATE TABLE delta.default." + tableName +
+                " (a_number INT, array_col ARRAY(ROW(array_struct_element VARCHAR)), nested ROW(field1 VARCHAR), a_string VARCHAR, part VARCHAR)" +
+                " WITH (" +
+                " partitioned_by = ARRAY['part']," +
+                " location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'," +
+                " column_mapping_mode = '" + mode + "'" +
+                ")"));
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testDeltaColumnMappingMode(String mode)
+    {
+        testColumnMappingMode(tableName -> onDelta().executeQuery("" +
                 "CREATE TABLE default." + tableName +
                 " (a_number INT, array_col ARRAY<STRUCT<array_struct_element: STRING>>, nested STRUCT<field1: STRING>, a_string STRING, part STRING)" +
                 " USING delta " +
@@ -83,13 +191,22 @@ public void testColumnMappingMode(String mode)
                 " TBLPROPERTIES (" +
                 " 'delta.columnMapping.mode'='" + mode + "'," +
                 " 'delta.minReaderVersion'='2'," +
-                " 'delta.minWriterVersion'='5')");
+                " 'delta.minWriterVersion'='5')"));
+    }
+
+    private void testColumnMappingMode(Consumer<String> createTable)
+    {
+        String tableName = "test_dl_column_mapping_mode_name_" + randomNameSuffix();
+
+        createTable.accept(tableName);
 
         try {
             onDelta().executeQuery("" +
                     "INSERT INTO default." + tableName + " VALUES " +
-                    "(1, array(struct('nested 1')), struct('databricks 1'),'ala', 'part1'), " +
-                    "(2, array(struct('nested 2')), struct('databricks 2'), 'kota', 'part2')");
+                    "(1, array(struct('nested 1')), struct('databricks 1'),'ala', 'part1')");
+            onTrino().executeQuery("" +
+                    "INSERT INTO delta.default." + tableName + " VALUES " +
+                    "(2, ARRAY[ROW('nested 2')], ROW('databricks 2'), 'kota', 'part2')");
 
             List<Row> expectedRows = ImmutableList.of(
                     row(1, "nested 1", "databricks 1", "ala", "part1"),
@@ -131,9 +248,8 @@ public void testColumnMappingMode(String mode)
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testColumnMappingModeNameWithNonLowerCaseColumn(String mode)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testColumnMappingModeNameWithNonLowerCaseColumn()
     {
         String tableName = "test_dl_column_mapping_mode_name_non_loewr_case_" + randomNameSuffix();
 
@@ -143,7 +259,7 @@ public void testColumnMappingModeNameWithNonLowerCaseColumn(String mode)
                 " USING delta " +
                 " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
                 " TBLPROPERTIES (" +
-                " 'delta.columnMapping.mode'='" + mode + "'," +
+                " 'delta.columnMapping.mode'='name'," +
                 " 'delta.minReaderVersion'='2'," +
                 " 'delta.minWriterVersion'='5')");
 
@@ -161,15 +277,145 @@ public void testColumnMappingModeNameWithNonLowerCaseColumn(String mode)
                     .containsOnly(ImmutableList.of(
                             row("mixed_case", null, null, 0.0, null, "0", "9"),
                             row(null, null, null, null, 2.0, null, null)));
+
+            // Verify column comments
+            onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".mixed_case IS 'test column comment'");
+            assertEquals(getColumnCommentOnTrino("default", tableName, "mixed_case"), "test column comment");
+            assertEquals(getColumnCommentOnDelta("default", tableName, "mixed_case"), "test column comment");
         }
         finally {
             dropDeltaTableWithRetry("default." + tableName);
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testColumnMappingModeAddColumn(String mode)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testColumnMappingModeNameCreatePartitionTableAsSelect()
+    {
+        String tableName = "test_dl_create_partition_table_as_select_" + randomNameSuffix();
+
+        onTrino().executeQuery("" +
+                "CREATE TABLE delta.default." + tableName + " " +
+                "WITH (" +
+                "location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'," +
+                "column_mapping_mode = 'name'" +
+                ")" +
+                "AS SELECT 1 AS id, 'part#1' AS part");
+        try {
+            Row expected = row(1, "part#1");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).containsOnly(expected);
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName)).containsOnly(expected);
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE delta.default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testCreateTableWithCommentsColumnMappingModeName()
+    {
+        String tableName = "test_dl_create_table_with_comments_" + randomNameSuffix();
+
+        onTrino().executeQuery("" +
+                "CREATE TABLE delta.default." + tableName +
+                "(col INT COMMENT 'test column comment')" +
+                "COMMENT 'test table comment'" +
+                "WITH ( " +
+                " location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'," +
+                " column_mapping_mode = 'name'" +
+                ")");
+        try {
+            assertEquals(getTableCommentOnTrino("default", tableName), "test table comment");
+            assertEquals(getTableCommentOnDelta("default", tableName), "test table comment");
+
+            assertEquals(getColumnCommentOnTrino("default", tableName, "col"), "test column comment");
+            assertEquals(getColumnCommentOnDelta("default", tableName, "col"), "test column comment");
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE delta.default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testColumnMappingModeNameCommentOnTable()
+    {
+        String tableName = "test_dl_column_mapping_mode_comment_on_table_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                " (a_number INT)" +
+                " USING delta " +
+                " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                " TBLPROPERTIES (" +
+                " 'delta.columnMapping.mode' = 'name'" +
+                ")");
+        try {
+            onTrino().executeQuery("COMMENT ON TABLE delta.default." + tableName + " IS 'test comment by trino'");
+            assertEquals(getTableCommentOnTrino("default", tableName), "test comment by trino");
+            assertEquals(getTableCommentOnDelta("default", tableName), "test comment by trino");
+
+            onDelta().executeQuery("COMMENT ON TABLE default." + tableName + " IS 'test comment by delta'");
+            assertEquals(getTableCommentOnTrino("default", tableName), "test comment by delta");
+            assertEquals(getTableCommentOnDelta("default", tableName), "test comment by delta");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testColumnMappingModeNameCommentOnColumn()
+    {
+        String tableName = "test_dl_column_mapping_mode_comment_on_column_" + randomNameSuffix();
+
+        onTrino().executeQuery("" +
+                "CREATE TABLE delta.default." + tableName +
+                " (col INT)" +
+                " WITH ( " +
+                " location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'," +
+                " column_mapping_mode = 'name'" +
+                ")");
+
+        try {
+            onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".col IS 'test column comment by trino'");
+            assertEquals(getColumnCommentOnTrino("default", tableName, "col"), "test column comment by trino");
+            assertEquals(getColumnCommentOnDelta("default", tableName, "col"), "test column comment by trino");
+
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " ALTER COLUMN col COMMENT 'test column comment by delta'");
+            assertEquals(getColumnCommentOnTrino("default", tableName, "col"), "test column comment by delta");
+            assertEquals(getColumnCommentOnDelta("default", tableName, "col"), "test column comment by delta");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testColumnMappingModeNameAddColumn()
+    {
+        testColumnMappingModeAddColumn(
+                "name",
+                tableName -> {
+                    onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN another_varchar VARCHAR");
+                    onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD COLUMN a_array array<integer>");
+                    onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN a_map map(varchar, integer)");
+                    onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD COLUMN a_row struct<x integer>");
+                });
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testColumnMappingModeIdAddColumn()
+    {
+        testColumnMappingModeAddColumn(
+                "id",
+                tableName -> {
+                    onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD COLUMN another_varchar STRING");
+                    onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN a_array array(integer)");
+                    onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD COLUMN a_map map<string, integer>");
+                    onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN a_row row(x integer)");
+                });
+    }
+
+    private void testColumnMappingModeAddColumn(String mode, Consumer<String> addColumn)
     {
         String tableName = "test_dl_column_mapping_mode_add_column_" + randomNameSuffix();
 
@@ -192,43 +438,66 @@ public void testColumnMappingModeAddColumn(String mode)
                     .containsOnly(expectedRows);
 
             // Verify the connector can read added columns correctly
-            onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD COLUMN another_varchar STRING");
+            addColumn.accept(tableName);
             assertThat(onTrino().executeQuery("DESCRIBE delta.default." + tableName))
                     .containsOnly(
                             row("a_number", "integer", "", ""),
-                            row("another_varchar", "varchar", "", ""));
+                            row("another_varchar", "varchar", "", ""),
+                            row("a_array", "array(integer)", "", ""),
+                            row("a_map", "map(varchar, integer)", "", ""),
+                            row("a_row", "row(x integer)", "", ""));
 
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES  (3, 'new column')");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'new column', array(3), map('key', 4), named_struct('x', 5))");
             expectedRows = ImmutableList.of(
-                    row(1, null),
-                    row(2, null),
-                    row(3, "new column"));
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
+                    row(1, null, null, null, null),
+                    row(2, null, null, null, null),
+                    row(3, "new column", 3, 4, 5));
+            assertThat(onDelta().executeQuery("SELECT a_number, another_varchar, a_array[0], a_map['key'], a_row.x FROM default." + tableName)).containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT a_number, another_varchar, a_array[1], a_map['key'], a_row.x FROM delta.default." + tableName)).containsOnly(expectedRows);
+
+            // 5 comes from 1 (a_number) + 1 (a_array) + 1 (a_map) + 2 (column & field of a_row)
+            assertThat(getTablePropertyOnDelta("default", tableName, "delta.columnMapping.maxColumnId"))
+                    .isEqualTo("6");
 
             // Replace table to partition by added column for testing predicate pushdown on the column
             onDelta().executeQuery("REPLACE TABLE default." + tableName + " USING DELTA PARTITIONED BY (another_varchar) AS SELECT * FROM " + tableName);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE another_varchar = 'new column'"))
-                    .containsOnly(row(3, "new column"));
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE another_varchar = 'expect no rows'"))
-                    .hasNoRows();
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE another_varchar <> 'new column'"))
-                    .hasNoRows();
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE another_varchar IS NOT NULL"))
-                    .containsOnly(row(3, "new column"));
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE another_varchar IS NULL"))
-                    .containsOnly(row(1, null), row(2, null));
+            assertThat(onTrino().executeQuery("SELECT a_number, another_varchar, a_array[1], a_map['key'], a_row.x FROM delta.default." + tableName)).containsOnly(expectedRows);
         }
         finally {
             dropDeltaTableWithRetry("default." + tableName);
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testShowStatsFromJsonForColumnMappingMode(String mode)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoColumnMappingModeNameAddColumnWithExistingNonLowerCaseColumn()
+    {
+        String tableName = "test_dl_column_mapping_mode_add_column_existing_non_lowercase_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                " (UPPER_CASE INT)" +
+                " USING delta" +
+                " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                " TBLPROPERTIES (" +
+                " 'delta.columnMapping.mode' = 'name'" +
+                ")");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES 1");
+
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN new_col VARCHAR");
+
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1, null));
+            assertThat(getColumnNamesOnDelta("default", tableName))
+                    .containsExactly("UPPER_CASE", "new_col");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testShowStatsFromJsonForColumnMappingMode()
     {
         String tableName = "test_dl_show_stats_json_for_column_mapping_mode_" + randomNameSuffix();
 
@@ -238,7 +507,7 @@ public void testShowStatsFromJsonForColumnMappingMode(String mode)
                 " USING delta " +
                 " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
                 " TBLPROPERTIES (" +
-                " 'delta.columnMapping.mode' = '" + mode + "'" +
+                " 'delta.columnMapping.mode' = 'id'" +
                 ")");
 
         try {
@@ -259,9 +528,8 @@ public void testShowStatsFromJsonForColumnMappingMode(String mode)
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testShowStatsFromParquetForColumnMappingMode(String mode)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testShowStatsFromParquetForColumnMappingModeName()
     {
         String tableName = "test_dl_show_parquet_stats_parquet_for_column_mapping_mode_" + randomNameSuffix();
 
@@ -271,7 +539,7 @@ public void testShowStatsFromParquetForColumnMappingMode(String mode)
                 " USING delta " +
                 " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
                 " TBLPROPERTIES (" +
-                " 'delta.columnMapping.mode' = '" + mode + "'," +
+                " 'delta.columnMapping.mode' = 'name'," +
                 " 'delta.checkpointInterval' = 3" +
                 ")");
 
@@ -295,9 +563,8 @@ public void testShowStatsFromParquetForColumnMappingMode(String mode)
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testShowStatsOnPartitionedForColumnMappingMode(String mode)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testShowStatsOnPartitionedForColumnMappingModeId()
     {
         String tableName = "test_dl_show_stats_partitioned_for_column_mapping_mode_" + randomNameSuffix();
 
@@ -308,7 +575,7 @@ public void testShowStatsOnPartitionedForColumnMappingMode(String mode)
                 " PARTITIONED BY (part) " +
                 " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
                 " TBLPROPERTIES (" +
-                " 'delta.columnMapping.mode' = '" + mode + "'," +
+                " 'delta.columnMapping.mode' = 'id'," +
                 " 'delta.checkpointInterval' = 3" +
                 ")");
 
@@ -328,74 +595,550 @@ public void testShowStatsOnPartitionedForColumnMappingMode(String mode)
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
     @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testUnsupportedOperationsColumnMappingModeName(String mode)
+    public void testProjectionPushdownDmlWithColumnMappingMode(String mode)
     {
-        String tableName = "test_dl_unsupported_column_mapping_mode_" + randomNameSuffix();
+        String sourceTableName = "test_projection_pushdown_source_column_mapping_mode_" + randomNameSuffix();
+        String targetTableName = "test_projection_pushdown_target_column_mapping_mode_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + targetTableName + " (nation STRUCT<key INT, name STRING>, regionkey INT) " +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + targetTableName + "'" +
+                "TBLPROPERTIES ('delta.columnMapping.mode' = '" + mode + "')");
+        onDelta().executeQuery("CREATE TABLE default." + sourceTableName + "  (nation STRUCT<key INT, name STRING>, regionkey INT) " +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + sourceTableName + "'");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + targetTableName + " VALUES (struct(1, 'nation1'), 100), (struct(2, 'nation2'), 200), (struct(3, 'nation3'), 300), (struct(4, 'nation4'), 400)");
+            onDelta().executeQuery("INSERT INTO default." + sourceTableName + " VALUES (struct(1000, 'nation1000'), 1000), (struct(2, 'nation2'), 20000), (struct(3000, 'nation3000'), 3000), (struct(4, 'nation4'), 40000)");
+
+            onDelta().executeQuery("MERGE INTO default." + targetTableName + " target USING default." + sourceTableName + " source " +
+                    "ON (target.nation.key = source.nation.key) " +
+                    "WHEN MATCHED AND source.nation.name = 'nation4' THEN DELETE " +
+                    "WHEN MATCHED THEN UPDATE SET nation.key = (target.nation.key + source.nation.key + source.regionkey) " +
+                    "WHEN NOT MATCHED THEN INSERT (nation, regionkey) VALUES (source.nation, source.regionkey)");
+
+            assertThat(onTrino().executeQuery("SELECT nation.key, nation.name, regionkey FROM " + targetTableName))
+                    .containsOnly(
+                            row(1000, "nation1000", 1000),
+                            row(3000, "nation3000", 3000),
+                            row(1, "nation1", 100),
+                            row(3, "nation3", 300),
+                            row(20004, "nation2", 200));
+
+            onDelta().executeQuery("DELETE FROM " + targetTableName + " WHERE regionkey = 100");
+            onDelta().executeQuery("UPDATE " + targetTableName + " SET nation.name = 'nation20004' WHERE regionkey = 200");
+
+            assertThat(onTrino().executeQuery("SELECT nation.key, nation.name, regionkey FROM " + targetTableName))
+                    .containsOnly(
+                            row(1000, "nation1000", 1000),
+                            row(3000, "nation3000", 3000),
+                            row(3, "nation3", 300),
+                            row(20004, "nation20004", 200));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + targetTableName);
+            dropDeltaTableWithRetry("default." + sourceTableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testChangeColumnMappingAndShowStatsForColumnMappingMode()
+    {
+        String tableName = "test_dl_change_column_mapping_and_show_stats_for_column_mapping_mode_" + randomNameSuffix();
 
         onDelta().executeQuery("" +
                 "CREATE TABLE default." + tableName +
-                " (a_number INT, a_string STRING)" +
+                " (a_number INT, b_number INT)" +
                 " USING delta " +
                 " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
                 " TBLPROPERTIES (" +
-                " 'delta.columnMapping.mode'='" + mode + "'," +
+                " 'delta.columnMapping.mode'='none'," +
                 " 'delta.minReaderVersion'='2'," +
                 " 'delta.minWriterVersion'='5')");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 10), (2, 20), (null, null)");
+            onTrino().executeQuery("ANALYZE delta.default." + tableName);
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(
+                            row("a_number", null, 2.0, 0.33333333333, null, "1", "2"),
+                            row("b_number", null, 2.0, 0.33333333333, null, "10", "20"),
+                            row(null, null, null, null, 3.0, null, null));
+
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " SET TBLPROPERTIES('delta.columnMapping.mode'='name')");
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " DROP COLUMN b_number");
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD COLUMN b_number INT");
+
+            // Ensure SHOW STATS doesn't return stats for the restored column
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(
+                            row("a_number", null, 2.0, 0.33333333333, null, "1", "2"),
+                            row("b_number", null, null, null, null, null, null),
+                            row(null, null, null, null, 3.0, null, null));
 
+            // SHOW STATS returns the expected stats after executing ANALYZE
+            onTrino().executeQuery("ANALYZE delta.default." + tableName);
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(
+                            row("a_number", null, 2.0, 0.33333333333, null, "1", "2"),
+                            row("b_number", 0.0, 0.0, 1.0, null, null, null),
+                            row(null, null, null, null, 3.0, null, null));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "changeColumnMappingDataProvider")
+    public void testChangeColumnMappingMode(String sourceMappingMode, String targetMappingMode, boolean supported)
+    {
+        String tableName = "test_dl_change_column_mapping_mode_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                " (a_number INT)" +
+                " USING delta " +
+                " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                " TBLPROPERTIES (" +
+                " 'delta.columnMapping.mode'='" + sourceMappingMode + "'," +
+                " 'delta.minReaderVersion'='2'," +
+                " 'delta.minWriterVersion'='5')");
         try {
-            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 'one'), (2, 'two')"))
-                    .hasMessageContaining("Delta Lake writer version 5 which is not supported");
-            assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM default." + tableName))
-                    .hasMessageContaining("Delta Lake writer version 5 which is not supported");
-            assertQueryFailure(() -> onTrino().executeQuery("UPDATE default." + tableName + " SET a_string = 'test'"))
-                    .hasMessageContaining("Delta Lake writer version 5 which is not supported");
-            assertQueryFailure(() -> onTrino().executeQuery("ALTER TABLE default." + tableName + " EXECUTE OPTIMIZE"))
-                    .hasMessageContaining("Delta Lake writer version 5 which is not supported");
-            assertQueryFailure(() -> onTrino().executeQuery("ALTER TABLE default." + tableName + " ADD COLUMN new_col varchar"))
-                    .hasMessageContaining("Delta Lake writer version 5 which is not supported");
-            assertQueryFailure(() -> onTrino().executeQuery("ALTER TABLE default." + tableName + " RENAME COLUMN a_number TO renamed_column"))
-                    .hasMessageContaining("This connector does not support renaming columns");
-            assertQueryFailure(() -> onTrino().executeQuery("ALTER TABLE default." + tableName + " DROP COLUMN a_number"))
-                    .hasMessageContaining("This connector does not support dropping columns");
+            if (supported) {
+                onDelta().executeQuery("ALTER TABLE default." + tableName + " SET TBLPROPERTIES('delta.columnMapping.mode'='" + targetMappingMode + "')");
+            }
+            else {
+                assertQueryFailure(() -> onDelta().executeQuery("ALTER TABLE default." + tableName + " SET TBLPROPERTIES('delta.columnMapping.mode'='" + targetMappingMode + "')"))
+                        .hasMessageContaining("Changing column mapping mode from '%s' to '%s' is not supported".formatted(sourceMappingMode, targetMappingMode));
+            }
         }
         finally {
             dropDeltaTableWithRetry("default." + tableName);
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testSpecialCharacterColumnNamesWithColumnMappingMode(String mode)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testRecalculateStatsForColumnMappingModeIdAndNoInitialStatistics()
     {
-        String tableName = "test_dl_special_character_column_mapping_mode_" + randomNameSuffix();
+        String tableName = "test_recalculate_stats_for_column_mapping_mode_" + randomNameSuffix();
 
         onDelta().executeQuery("" +
                 "CREATE TABLE default." + tableName +
-                " (`;{}()\\n\\t=` INT)" +
+                " (a_number INT, a_string STRING)" +
                 " USING delta " +
                 " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
                 " TBLPROPERTIES (" +
-                " 'delta.columnMapping.mode' = '" + mode + "'," +
-                " 'delta.checkpointInterval' = 3" +
+                " 'delta.columnMapping.mode' = 'id', " +
+                " 'delta.dataSkippingNumIndexedCols' = 0" +
                 ")");
 
         try {
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (0)");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1)");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (null)");
+            List<Row> expectedRows = ImmutableList.of(
+                    row(1, "a"),
+                    row(2, "bc"),
+                    row(null, null));
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 'a'), (2, 'bc'), (null, null)");
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
 
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(
+                            row("a_number", null, null, null, null, null, null),
+                            row("a_string", null, null, null, null, null, null),
+                            row(null, null, null, null, 3.0, null, null));
+
+            onTrino().executeQuery("ANALYZE delta.default." + tableName);
             assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
                     .containsOnly(ImmutableList.of(
-                            row(";{}()\\n\\t=", null, null, 0.33333333333, null, "0", "1"),
+                            row("a_number", null, 2.0, 0.33333333333, null, "1", "2"),
+                            row("a_string", 3.0, 2.0, 0.33333333333, null, null, null),
                             row(null, null, null, null, 3.0, null, null)));
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
         }
         finally {
             dropDeltaTableWithRetry("default." + tableName);
         }
     }
 
+    @DataProvider
+    public Object[][] changeColumnMappingDataProvider()
+    {
+        // Update testChangeColumnMappingAndShowStatsForColumnMappingMode if Delta Lake changes their behavior
+        return new Object[][] {
+                // sourceMappingMode targetMappingMode supported
+                {"none", "id", false},
+                {"none", "name", true},
+                {"id", "none", false},
+                {"id", "name", false},
+                {"name", "none", false},
+                {"name", "id", false},
+        };
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "supportedColumnMappingForDmlDataProvider")
+    public void testMergeUpdateWithColumnMapping(String mode)
+    {
+        String sourceTableName = "test_merge_update_source_column_mapping_mode_" + randomNameSuffix();
+        String targetTableName = "test_merge_update_target_column_mapping_mode_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + targetTableName + " (nationkey INT, name STRING, regionkey INT) " +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + targetTableName + "'" +
+                "TBLPROPERTIES ('delta.columnMapping.mode' = '" + mode + "')");
+        onDelta().executeQuery("CREATE TABLE default." + sourceTableName + " (nationkey INT, name STRING, regionkey INT) " +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + sourceTableName + "'");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + targetTableName + " VALUES (1, 'nation1', 100), (2, 'nation2', 200), (3, 'nation3', 300)");
+            onDelta().executeQuery("INSERT INTO default." + sourceTableName + " VALUES (1000, 'nation1000', 1000), (2, 'nation2', 20000), (3000, 'nation3000', 3000)");
+
+            onTrino().executeQuery("MERGE INTO delta.default." + targetTableName + " target USING delta.default." + sourceTableName + " source " +
+                    "ON (target.nationkey = source.nationkey) " +
+                    "WHEN MATCHED " +
+                    "THEN UPDATE SET nationkey = (target.nationkey + source.nationkey + source.regionkey) " +
+                    "WHEN NOT MATCHED " +
+                    "THEN INSERT (nationkey, name, regionkey) VALUES (source.nationkey, source.name, source.regionkey)");
+
+            assertThat(onDelta().executeQuery("SELECT * FROM " + targetTableName))
+                    .containsOnly(
+                            row(1000, "nation1000", 1000),
+                            row(3000, "nation3000", 3000),
+                            row(1, "nation1", 100),
+                            row(3, "nation3", 300),
+                            row(20004, "nation2", 200));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + targetTableName);
+            dropDeltaTableWithRetry("default." + sourceTableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "supportedColumnMappingForDmlDataProvider")
+    public void testMergeDeleteWithColumnMapping(String mode)
+    {
+        String sourceTableName = "test_dl_merge_delete_source_column_mapping_mode_" + mode + randomNameSuffix();
+        String targetTableName = "test_dl_merge_delete_target_column_mapping_mode_" + mode + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + sourceTableName +
+                " (a_number INT, a_string STRING, array_col ARRAY<STRUCT<array_struct_element: STRING>>, nested STRUCT<field1: STRING>)" +
+                " USING delta " +
+                " PARTITIONED BY (a_string)" +
+                " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + sourceTableName + "'" +
+                " TBLPROPERTIES (" +
+                " 'delta.columnMapping.mode' ='" + mode + "')");
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + targetTableName +
+                " (a_number INT, a_string STRING, array_col ARRAY<STRUCT<array_struct_element: STRING>>, nested STRUCT<field1: STRING>)" +
+                " USING delta " +
+                " PARTITIONED BY (a_string)" +
+                " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + targetTableName + "'" +
+                " TBLPROPERTIES (" +
+                " 'delta.columnMapping.mode' ='" + mode + "')");
+        try {
+            onTrino().executeQuery("INSERT INTO delta.default." + sourceTableName +
+                    " VALUES (1, 'first value', ARRAY[ROW('nested 1')], ROW('databricks 1'))," +
+                    "        (2, 'two', ARRAY[ROW('nested 2')], ROW('databricks 2'))," +
+                    "        (3, 'third value', ARRAY[ROW('nested 3')], ROW('databricks 3'))," +
+                    "        (4, 'four', ARRAY[ROW('nested 4')], ROW('databricks 4'))");
+
+            String trinoColumns = "a_number, a_string, array_col[1].array_struct_element, nested.field1";
+            String deltaColumns = "a_number, a_string, array_col[0].array_struct_element, nested.field1";
+            assertDeltaTrinoTableEquals(sourceTableName, trinoColumns, deltaColumns, ImmutableList.of(
+                    row(1, "first value", "nested 1", "databricks 1"),
+                    row(2, "two", "nested 2", "databricks 2"),
+                    row(3, "third value", "nested 3", "databricks 3"),
+                    row(4, "four", "nested 4", "databricks 4")));
+
+            onTrino().executeQuery("INSERT INTO delta.default." + targetTableName +
+                    " VALUES (1000, '1000 value', ARRAY[ROW('nested 1000')], ROW('databricks 1000'))," +
+                    "        (2, 'two', ARRAY[ROW('nested 2')], ROW('databricks 2'))");
+            onDelta().executeQuery("INSERT INTO default." + targetTableName +
+                    " VALUES (3000, '3000 value', array(struct('nested 3000')), struct('databricks 3000'))," +
+                    "        (4, 'four', array(struct('nested 4')), struct('databricks 4'))");
+
+            assertDeltaTrinoTableEquals(targetTableName, trinoColumns, deltaColumns, ImmutableList.of(
+                    row(1000, "1000 value", "nested 1000", "databricks 1000"),
+                    row(2, "two", "nested 2", "databricks 2"),
+                    row(3000, "3000 value", "nested 3000", "databricks 3000"),
+                    row(4, "four", "nested 4", "databricks 4")));
+
+            onTrino().executeQuery("MERGE INTO delta.default." + targetTableName + " t USING delta.default." + sourceTableName + " s " +
+                    "ON (t.a_number = s.a_number) " +
+                    "WHEN MATCHED " +
+                    "THEN DELETE " +
+                    "WHEN NOT MATCHED " +
+                    "THEN INSERT (a_number, a_string, array_col, nested) VALUES (s.a_number, s.a_string, s.array_col, s.nested)");
+
+            assertDeltaTrinoTableEquals(targetTableName, trinoColumns, deltaColumns, ImmutableList.of(
+                    row(1000, "1000 value", "nested 1000", "databricks 1000"),
+                    row(3000, "3000 value", "nested 3000", "databricks 3000"),
+                    row(1, "first value", "nested 1", "databricks 1"),
+                    row(3, "third value", "nested 3", "databricks 3")));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + sourceTableName);
+            dropDeltaTableWithRetry("default." + targetTableName);
+        }
+    }
+
+    private void assertDeltaTrinoTableEquals(String tableName, String trinoQuery, String deltaQuery, List<Row> expectedRows)
+    {
+        assertThat(onDelta().executeQuery("SELECT " + deltaQuery + " FROM default." + tableName))
+                .containsOnly(expectedRows);
+        assertThat(onTrino().executeQuery("SELECT " + trinoQuery + " FROM delta.default." + tableName))
+                .containsOnly(expectedRows);
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
+    public void testDropLastNonPartitionColumnWithColumnMappingMode(String mode)
+    {
+        String tableName = "test_drop_column_" + randomNameSuffix();
+        String tableLocation = "s3://" + bucketName + "/databricks-compatibility-test-" + tableName;
+
+        onTrino().executeQuery("CREATE TABLE delta.default." + tableName +
+                " WITH (column_mapping_mode = '" + mode + "', partitioned_by = ARRAY['part'], location = '" + tableLocation + "')" +
+                "AS SELECT 1 data, 'part#1' part");
+        try {
+            assertThatThrownBy(() -> onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " DROP COLUMN data"))
+                    .hasMessageContaining("Dropping the last non-partition column is unsupported");
+
+            // TODO https://github.com/delta-io/delta/issues/1929 Delta Lake disallows creating tables with all partitioned column, but allows dropping the non-partition column
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " DROP COLUMN data");
+
+            Row expected = row("part#1");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).containsOnly(expected);
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName)).containsOnly(expected);
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE delta.default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
+    public void testTrinoExtendedStatisticsDropAndAddColumnWithColumnMappingMode(String mode)
+    {
+        String tableName = "test_drop_and_add_column_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                " (a INT, b INT)" +
+                " USING delta " +
+                " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                " TBLPROPERTIES ('delta.columnMapping.mode' = '" + mode + "')");
+
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 2)");
+            onTrino().executeQuery("ANALYZE delta.default." + tableName);
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(
+                            row("a", null, 1.0, 0.0, null, "1", "1"),
+                            row("b", null, 1.0, 0.0, null, "2", "2"),
+                            row(null, null, null, null, 1.0, null, null));
+
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " DROP COLUMN b");
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(
+                            row("a", null, 1.0, 0.0, null, "1", "1"),
+                            row(null, null, null, null, 1.0, null, null));
+
+            // TODO: Add a new column on Trino once the connector supports adding a column with the column mapping mode
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD COLUMN b INTEGER");
+
+            // Verify column statistics of dropped column isn't restored
+            onTrino().executeQuery("ANALYZE delta.default." + tableName);
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(
+                            row("a", null, 1.0, 0.0, null, "1", "1"),
+                            row("b", 0.0, 0.0, 1.0, null, null, null),
+                            row(null, null, null, null, 1.0, null, null));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
+    public void testDropNonLowercaseColumnWithColumnMappingMode(String mode)
+    {
+        String tableName = "test_drop_non_lowercase_column_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                " (UPPER_ID INT, UPPER_DATA INT, UPPER_PART STRING)" +
+                " USING delta " +
+                " PARTITIONED BY (UPPER_PART) " +
+                " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                " TBLPROPERTIES ('delta.columnMapping.mode' = '" + mode + "')");
+
+        try {
+            assertThat(getColumnNamesOnDelta("default", tableName))
+                    .containsExactly("UPPER_ID", "UPPER_DATA", "UPPER_PART");
+
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 10, 'part#1')");
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(ImmutableList.of(
+                            row("upper_id", null, 1.0, 0.0, null, "1", "1"),
+                            row("upper_data", null, 1.0, 0.0, null, "10", "10"),
+                            row("upper_part", null, 1.0, 0.0, null, null, null),
+                            row(null, null, null, null, 1.0, null, null)));
+
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " DROP COLUMN upper_data");
+            assertThat(getColumnNamesOnDelta("default", tableName))
+                    .containsExactly("UPPER_ID", "UPPER_PART");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1, "part#1"));
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(ImmutableList.of(
+                            row("upper_id", null, 1.0, 0.0, null, "1", "1"),
+                            row("upper_part", null, 1.0, 0.0, null, null, null),
+                            row(null, null, null, null, 1.0, null, null)));
+
+            assertThatThrownBy(() -> onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " DROP COLUMN upper_part"))
+                    .hasMessageContaining("Cannot drop partition column");
+
+            // Verify adding a column with the same name doesn't restore the old statistics
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " ADD COLUMN UPPER_DATA INT");
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(ImmutableList.of(
+                            row("upper_id", null, 1.0, 0.0, null, "1", "1"),
+                            row("upper_data", null, null, null, null, null, null),
+                            row("upper_part", null, 1.0, 0.0, null, null, null),
+                            row(null, null, null, null, 1.0, null, null)));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoRenameColumnWithColumnMappingModeName()
+    {
+        testRenameColumnWithColumnMappingMode(
+                "name",
+                (tableName, column) -> onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " RENAME COLUMN " + column.sourceColumn + " TO " + column.newColumn));
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testSparkRenameColumnWithColumnMappingModeId()
+    {
+        testRenameColumnWithColumnMappingMode(
+                "id",
+                (tableName, column) -> onDelta().executeQuery("ALTER TABLE default." + tableName + " RENAME COLUMN " + column.sourceColumn + " TO " + column.newColumn));
+    }
+
+    private void testRenameColumnWithColumnMappingMode(String mode, BiConsumer<String, RenameColumn> renameColumns)
+    {
+        String tableName = "test_rename_column_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                " (id INT, data INT, part STRING)" +
+                " USING delta " +
+                " PARTITIONED BY (part) " +
+                " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                " TBLPROPERTIES ('delta.columnMapping.mode' = '" + mode + "')");
+
+        try {
+            assertThat(getTablePropertyOnDelta("default", tableName, "delta.columnMapping.maxColumnId"))
+                    .isEqualTo("3");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 10, 'part#1')");
+
+            renameColumns.accept(tableName, new RenameColumn("data", "new_data"));
+            renameColumns.accept(tableName, new RenameColumn("part", "new_part"));
+            assertThat(getTablePropertyOnDelta("default", tableName, "delta.columnMapping.maxColumnId"))
+                    .isEqualTo("3");
+
+            assertThat(onTrino().executeQuery("DESCRIBE delta.default." + tableName))
+                    .containsOnly(
+                            row("id", "integer", "", ""),
+                            row("new_data", "integer", "", ""),
+                            row("new_part", "varchar", "", ""));
+
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1, 10, "part#1"));
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(1, 10, "part#1"));
+
+            // Ensure renaming to the dropped column doesn't restore the old data
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " DROP COLUMN id");
+            renameColumns.accept(tableName, new RenameColumn("new_data", "id"));
+
+            assertThat(onTrino().executeQuery("SELECT id, new_part FROM delta.default." + tableName))
+                    .containsOnly(row(10, "part#1"));
+            assertThat(onDelta().executeQuery("SELECT id, new_part FROM default." + tableName))
+                    .containsOnly(row(10, "part#1"));
+        }
+        finally {
+            dropDeltaTableWithRetry(tableName);
+        }
+    }
+
+    private record RenameColumn(String sourceColumn, String newColumn)
+    {
+        private RenameColumn
+        {
+            requireNonNull(sourceColumn, "sourceColumn is null");
+            requireNonNull(newColumn, "newColumn is null");
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
+    public void testRenameNonLowercaseColumn(String mode)
+    {
+        String tableName = "test_rename_non_lowercase_column_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                " (UPPER_COL INT NOT NULL COMMENT 'test comment', UPPER_PART INT)" +
+                " USING delta" +
+                " PARTITIONED BY (UPPER_PART)" +
+                " LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                " TBLPROPERTIES ('delta.columnMapping.mode' = '" + mode + "')");
+        try {
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 2)");
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(
+                            row("upper_col", null, 1.0, 0.0, null, "1", "1"),
+                            row("upper_part", null, 1.0, 0.0, null, null, null),
+                            row(null, null, null, null, 1.0, null, null));
+
+            assertThat(getColumnNamesOnDelta("default", tableName))
+                    .containsExactly("UPPER_COL", "UPPER_PART");
+
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " RENAME COLUMN upper_col TO new_col");
+            assertThat(getColumnNamesOnDelta("default", tableName))
+                    .containsExactly("new_col", "UPPER_PART");
+            assertEquals(getColumnCommentOnDelta("default", tableName, "new_col"), "test comment");
+            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " (new_col) VALUES NULL"))
+                    .hasMessageContaining("NULL value not allowed for NOT NULL column: new_col");
+
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " RENAME COLUMN upper_part TO new_part");
+            assertThat(getColumnNamesOnDelta("default", tableName))
+                    .containsExactly("new_col", "new_part");
+
+            assertThat(onTrino().executeQuery("SELECT new_col, new_part FROM delta.default." + tableName))
+                    .containsOnly(row(1, 2));
+            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
+                    .containsOnly(
+                            row("new_col", null, 1.0, 0.0, null, "1", "1"),
+                            row("new_part", null, 1.0, 0.0, null, null, null),
+                            row(null, null, null, null, 1.0, null, null));
+        }
+        finally {
+            dropDeltaTableWithRetry(tableName);
+        }
+    }
+
     @DataProvider
     public Object[][] columnMappingDataProvider()
     {
@@ -404,4 +1147,14 @@ public Object[][] columnMappingDataProvider()
                 {"name"},
         };
     }
+
+    @DataProvider
+    public Object[][] supportedColumnMappingForDmlDataProvider()
+    {
+        return new Object[][] {
+                {"none"},
+                {"name"},
+                {"id"}
+        };
+    }
 }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCreateTableAsSelectCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCreateTableAsSelectCompatibility.java
new file mode 100644
index 000000000000..bf9f5aa00781
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCreateTableAsSelectCompatibility.java
@@ -0,0 +1,272 @@
+/*
+ * Licensed 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 io.trino.tests.product.deltalake;
+
+import com.amazonaws.services.s3.AmazonS3;
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import io.trino.tempto.BeforeMethodWithContext;
+import io.trino.tempto.assertions.QueryAssert;
+import io.trino.tempto.query.QueryResult;
+import io.trino.testng.services.Flaky;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_104;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_113;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_133;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.deltalake.TransactionLogAssertions.assertLastEntryIsCheckpointed;
+import static io.trino.tests.product.deltalake.TransactionLogAssertions.assertTransactionLogVersion;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.utils.QueryExecutors.onDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestDeltaLakeCreateTableAsSelectCompatibility
+        extends BaseTestDeltaLakeS3Storage
+{
+    @Inject
+    @Named("s3.server_type")
+    private String s3ServerType;
+
+    private AmazonS3 s3;
+
+    @BeforeMethodWithContext
+    public void setup()
+    {
+        super.setUp();
+        s3 = new S3ClientFactory().createS3Client(s3ServerType);
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_104, DELTA_LAKE_DATABRICKS_113, DELTA_LAKE_DATABRICKS_122, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testPrestoTypesWithDatabricks()
+    {
+        String tableName = "test_dl_ctas_" + randomNameSuffix();
+
+        try {
+            assertThat(onTrino().executeQuery("CREATE TABLE delta.default.\"" + tableName + "\" " +
+                    "(id, boolean, tinyint, smallint, integer, bigint, real, double, short_decimal, long_decimal, varchar_25, varchar, date) " +
+                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "') AS VALUES " +
+                    "(1, BOOLEAN 'false', TINYINT '-128', SMALLINT '-32768', INTEGER '-2147483648', BIGINT '-9223372036854775808', REAL '-0x1.fffffeP+127f', DOUBLE '-0x1.fffffffffffffP+1023', CAST('-123456789.123456789' AS DECIMAL(18,9)), CAST('-12345678901234567890.123456789012345678' AS DECIMAL(38,18)), CAST('Romania' AS VARCHAR(25)), CAST('Poland' AS VARCHAR), DATE '1901-01-01')" +
+                    ", (2, BOOLEAN 'true', TINYINT '127', SMALLINT '32767', INTEGER '2147483647', BIGINT '9223372036854775807', REAL '0x1.fffffeP+127f', DOUBLE '0x1.fffffffffffffP+1023', CAST('123456789.123456789' AS DECIMAL(18,9)), CAST('12345678901234567890.123456789012345678' AS DECIMAL(38,18)), CAST('Canada' AS VARCHAR(25)), CAST('Germany' AS VARCHAR), DATE '9999-12-31')" +
+                    ", (3, BOOLEAN 'true', TINYINT '0', SMALLINT '0', INTEGER '0', BIGINT '0', REAL '0', DOUBLE '0', CAST('0' AS DECIMAL(18,9)), CAST('0' AS DECIMAL(38,18)), CAST('' AS VARCHAR(25)), CAST('' AS VARCHAR), DATE '2020-08-22')" +
+                    ", (4, BOOLEAN 'true', TINYINT '1', SMALLINT '1', INTEGER '1', BIGINT '1', REAL '1', DOUBLE '1', CAST('1' AS DECIMAL(18,9)), CAST('1' AS DECIMAL(38,18)), CAST('Romania' AS VARCHAR(25)), CAST('Poland' AS VARCHAR), DATE '2001-08-22')" +
+                    ", (5, BOOLEAN 'true', TINYINT '37', SMALLINT '12242', INTEGER '2524', BIGINT '132', REAL '3.141592653', DOUBLE '2.718281828459045', CAST('3.141592653' AS DECIMAL(18,9)), CAST('2.718281828459045' AS DECIMAL(38,18)), CAST('\u653b\u6bbb\u6a5f\u52d5\u968a' AS VARCHAR(25)), CAST('\u041d\u0443, \u043f\u043e\u0433\u043e\u0434\u0438!' AS VARCHAR), DATE '2020-08-22')" +
+                    ", (6, BOOLEAN 'true', TINYINT '0', SMALLINT '0', INTEGER '0', BIGINT '0', REAL '0x0.000002P-126f', DOUBLE '0x0.0000000000001P-1022', CAST('0' AS DECIMAL(18,9)), CAST('0' AS DECIMAL(38,18)), CAST('Romania' AS VARCHAR(25)), CAST('Poland' AS VARCHAR), DATE '2001-08-22')" +
+                    ", (7, BOOLEAN 'true', TINYINT '0', SMALLINT '0', INTEGER '0', BIGINT '0', REAL '0x1.0p-126f', DOUBLE '0x1.0p-1022', CAST('0' AS DECIMAL(18,9)), CAST('0' AS DECIMAL(38,18)), CAST('Romania' AS VARCHAR(25)), CAST('Poland' AS VARCHAR), DATE '2001-08-22')"))
+                    .containsOnly(row(7));
+
+            QueryResult databricksResult = onDelta().executeQuery(format("SELECT * FROM default.%s", tableName));
+            QueryResult prestoResult = onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s\"", tableName));
+            assertThat(databricksResult).containsOnly(prestoResult.rows().stream()
+                    .map(QueryAssert.Row::new)
+                    .collect(toImmutableList()));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testPrestoTimestampsWithDatabricks()
+    {
+        String tableName = "test_dl_ctas_timestamps_" + randomNameSuffix();
+
+        try {
+            assertThat(onTrino().executeQuery("CREATE TABLE delta.default.\"" + tableName + "\" " +
+                    "(id, timestamp_in_utc, timestamp_in_new_york, timestamp_in_warsaw) " +
+                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "') AS VALUES " +
+                    "(1, TIMESTAMP '1901-01-01 00:00:00 UTC', TIMESTAMP '1902-01-01 00:00:00 America/New_York', TIMESTAMP '1902-01-01 00:00:00 Europe/Warsaw')" +
+                    ", (2, TIMESTAMP '9999-12-31 23:59:59.999 UTC', TIMESTAMP '9998-12-31 23:59:59.999 America/New_York', TIMESTAMP '9998-12-31 23:59:59.999 Europe/Warsaw')" +
+                    ", (3, TIMESTAMP '2020-06-10 15:55:23 UTC', TIMESTAMP '2020-06-10 15:55:23.123 America/New_York', TIMESTAMP '2020-06-10 15:55:23.123 Europe/Warsaw')" +
+                    ", (4, TIMESTAMP '2001-08-22 03:04:05.321 UTC', TIMESTAMP '2001-08-22 03:04:05.321 America/New_York', TIMESTAMP '2001-08-22 03:04:05.321 Europe/Warsaw')"))
+                    .containsOnly(row(4));
+
+            QueryResult databricksResult = onDelta().executeQuery("SELECT id, date_format(timestamp_in_utc, \"yyyy-MM-dd HH:mm:ss.SSS\"), date_format(timestamp_in_new_york, \"yyyy-MM-dd HH:mm:ss.SSS\"), date_format(timestamp_in_warsaw, \"yyyy-MM-dd HH:mm:ss.SSS\") FROM default." + tableName);
+            QueryResult prestoResult = onTrino().executeQuery("SELECT id, format('%1$tF %1$tT.%1$tL', timestamp_in_utc), format('%1$tF %1$tT.%1$tL', timestamp_in_new_york), format('%1$tF %1$tT.%1$tL', timestamp_in_warsaw) FROM delta.default.\"" + tableName + "\"");
+            assertThat(databricksResult).containsOnly(prestoResult.rows().stream()
+                    .map(QueryAssert.Row::new)
+                    .collect(toImmutableList()));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testCreateFromTrinoWithDefaultPartitionValues()
+    {
+        String tableName = "test_create_partitioned_table_default_as_" + randomNameSuffix();
+
+        try {
+            assertThat(onTrino().executeQuery(
+                    "CREATE TABLE delta.default." + tableName + "(number_partition, string_partition, a_value) " +
+                            "WITH (" +
+                            "   location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "', " +
+                            "   partitioned_by = ARRAY['number_partition', 'string_partition']) " +
+                            "AS VALUES (NULL, 'partition_a', 'jarmuz'), (1, NULL, 'brukselka'), (NULL, NULL, 'kalafior')"))
+                    .containsOnly(row(3));
+
+            List<QueryAssert.Row> expectedRows = ImmutableList.of(
+                    row(null, "partition_a", "jarmuz"),
+                    row(1, null, "brukselka"),
+                    row(null, null, "kalafior"));
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE IF EXISTS delta.default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testReplaceTableWithSchemaChange()
+    {
+        String tableName = "test_replace_table_with_schema_change_" + randomNameSuffix();
+
+        onTrino().executeQuery("CREATE TABLE delta.default." + tableName + " (ts VARCHAR) " +
+                "with (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "', checkpoint_interval = 10)");
+        try {
+            ImmutableList.Builder<QueryAssert.Row> expected = ImmutableList.builder();
+            // Write to the table until a checkpoint file is written
+            for (int i = 0; i < 12; i++) {
+                onDelta().executeQuery("INSERT INTO " + tableName + " VALUES \"1960-01-01 01:02:03\", \"1961-01-01 01:02:03\", \"1962-01-01 01:02:03\"");
+                expected.add(row("1960-01-01T01:02:03.000Z"), row("1961-01-01T01:02:03.000Z"), row("1962-01-01T01:02:03.000Z"));
+            }
+
+            assertTransactionLogVersion(s3, bucketName, tableName, 12);
+            onDelta().executeQuery("CREATE OR REPLACE TABLE " + tableName + " USING DELTA AS SELECT CAST(ts AS TIMESTAMP) FROM " + tableName);
+            assertThat(onTrino().executeQuery("SELECT to_iso8601(ts) FROM delta.default." + tableName)).containsOnly(expected.build());
+        }
+        finally {
+            dropDeltaTableWithRetry(tableName);
+        }
+    }
+
+    // Databricks 11.3, 12.2 and 13.3 don't create a checkpoint file at 'CREATE OR REPLACE TABLE' statement
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_133, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testReplaceTableWithSchemaChangeOnCheckpoint()
+    {
+        String tableName = "test_replace_table_with_schema_change_" + randomNameSuffix();
+        onTrino().executeQuery("CREATE TABLE delta.default." + tableName + " (ts VARCHAR) " +
+                "with (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "', checkpoint_interval = 10)");
+        try {
+            ImmutableList.Builder<QueryAssert.Row> expected = ImmutableList.builder();
+            // Write to the table until a checkpoint file is written
+            for (int i = 0; i < 9; i++) {
+                onDelta().executeQuery("INSERT INTO " + tableName + " VALUES \"1960-01-01 01:02:03\", \"1961-01-01 01:02:03\", \"1962-01-01 01:02:03\"");
+                expected.add(row("1960-01-01T01:02:03.000Z"), row("1961-01-01T01:02:03.000Z"), row("1962-01-01T01:02:03.000Z"));
+            }
+            onDelta().executeQuery("CREATE OR REPLACE TABLE " + tableName + " USING DELTA AS SELECT CAST(ts AS TIMESTAMP) FROM " + tableName);
+            assertLastEntryIsCheckpointed(s3, bucketName, tableName);
+
+            onDelta().executeQuery("INSERT INTO " + tableName + " VALUES \"1960-01-01 01:02:03\", \"1961-01-01 01:02:03\", \"1962-01-01 01:02:03\"");
+            expected.add(row("1960-01-01T01:02:03.000Z"), row("1961-01-01T01:02:03.000Z"), row("1962-01-01T01:02:03.000Z"));
+            assertTransactionLogVersion(s3, bucketName, tableName, 11);
+
+            assertThat(onTrino().executeQuery("SELECT to_iso8601(ts) FROM delta.default." + tableName)).containsOnly(expected.build());
+        }
+        finally {
+            dropDeltaTableWithRetry(tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testCreateTableWithUnsupportedPartitionType()
+    {
+        String tableName = "test_dl_ctas_unsupported_column_types_" + randomNameSuffix();
+        String tableLocation = "s3://%s/databricks-compatibility-test-%s".formatted(bucketName, tableName);
+        try {
+            assertThatThrownBy(() -> onTrino().executeQuery("" +
+                    "CREATE TABLE delta.default." + tableName + " WITH (partitioned_by = ARRAY['part'], location = '" + tableLocation + "') AS SELECT 1 a, array[1] part"))
+                    .hasMessageContaining("Using array, map or row type on partitioned columns is unsupported");
+            assertThatThrownBy(() -> onTrino().executeQuery("" +
+                    "CREATE TABLE delta.default." + tableName + " WITH (partitioned_by = ARRAY['part'], location = '" + tableLocation + "') AS SELECT 1 a, map() part"))
+                    .hasMessageContaining("Using array, map or row type on partitioned columns is unsupported");
+            assertThatThrownBy(() -> onTrino().executeQuery("" +
+                    "CREATE TABLE delta.default." + tableName + " WITH (partitioned_by = ARRAY['part'], location = '" + tableLocation + "') AS SELECT 1 a, row(1) part"))
+                    .hasMessageContaining("Using array, map or row type on partitioned columns is unsupported");
+
+            assertThatThrownBy(() -> onDelta().executeQuery(
+                    "CREATE TABLE default." + tableName + " USING DELTA PARTITIONED BY (part) LOCATION '" + tableLocation + "' AS SELECT 1 a, array(1) part"))
+                    .hasMessageMatching("(?s).*(Cannot use .* for partition column|Using column part of type .* as a partition column is not supported).*");
+            assertThatThrownBy(() -> onDelta().executeQuery(
+                    "CREATE TABLE default." + tableName + " USING DELTA PARTITIONED BY (part) LOCATION '" + tableLocation + "' AS SELECT 1 a, map() part"))
+                    .hasMessageMatching("(?s).*(Cannot use .* for partition column|Using column part of type .* as a partition column is not supported).*");
+            assertThatThrownBy(() -> onDelta().executeQuery(
+                    "CREATE TABLE default." + tableName + " USING DELTA PARTITIONED BY (part) LOCATION '" + tableLocation + "' AS SELECT 1 a, named_struct('x', 1) part"))
+                    .hasMessageMatching("(?s).*(Cannot use .* for partition column|Using column part of type .* as a partition column is not supported).*");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testCreateTableAsSelectWithAllPartitionColumns()
+    {
+        String tableName = "test_dl_ctas_with_all_partition_columns_" + randomNameSuffix();
+        String tableDirectory = "databricks-compatibility-test-" + tableName;
+
+        try {
+            assertThatThrownBy(() -> onTrino().executeQuery("" +
+                    "CREATE TABLE delta.default." + tableName + " " +
+                    "WITH (partitioned_by = ARRAY['part'], location = 's3://" + bucketName + "/" + tableDirectory + "')" +
+                    "AS SELECT 1 part"))
+                    .hasMessageContaining("Using all columns for partition columns is unsupported");
+            assertThatThrownBy(() -> onTrino().executeQuery("" +
+                    "CREATE TABLE delta.default." + tableName + " " +
+                    "WITH (partitioned_by = ARRAY['part', 'another_part'], location = 's3://" + bucketName + "/" + tableDirectory + "')" +
+                    "AS SELECT 1 part, 2 another_part"))
+                    .hasMessageContaining("Using all columns for partition columns is unsupported");
+
+            assertThatThrownBy(() -> onDelta().executeQuery("" +
+                    "CREATE TABLE default." + tableName + " " +
+                    "USING DELTA " +
+                    "PARTITIONED BY (part)" +
+                    "LOCATION 's3://" + bucketName + "/" + tableDirectory + "'" +
+                    "AS SELECT 1 part"))
+                    .hasMessageContaining("Cannot use all columns for partition columns");
+            assertThatThrownBy(() -> onDelta().executeQuery("" +
+                    "CREATE TABLE default." + tableName + " " +
+                    "USING DELTA " +
+                    "PARTITIONED BY (part, another_part)" +
+                    "LOCATION 's3://" + bucketName + "/" + tableDirectory + "'" +
+                    "SELECT 1 part, 2 another_part"))
+                    .hasMessageContaining("Cannot use all columns for partition columns");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksChangeDataFeedCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksChangeDataFeedCompatibility.java
deleted file mode 100644
index a4218e90bfa2..000000000000
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksChangeDataFeedCompatibility.java
+++ /dev/null
@@ -1,623 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.deltalake;
-
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.ListObjectsV2Result;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import io.trino.tempto.BeforeTestWithContext;
-import io.trino.testng.services.Flaky;
-import org.assertj.core.api.Assertions;
-import org.testng.annotations.Test;
-
-import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73;
-import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
-import static io.trino.tests.product.utils.QueryExecutors.onDelta;
-import static io.trino.tests.product.utils.QueryExecutors.onTrino;
-import static java.lang.String.format;
-
-public class TestDeltaLakeDatabricksChangeDataFeedCompatibility
-        extends BaseTestDeltaLakeS3Storage
-{
-    @Inject
-    @Named("s3.server_type")
-    private String s3ServerType;
-
-    private AmazonS3 s3Client;
-
-    @BeforeTestWithContext
-    public void setup()
-    {
-        super.setUp();
-        s3Client = new S3ClientFactory().createS3Client(s3ServerType);
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testUpdateTableWithCdf()
-    {
-        String tableName = "test_updates_to_table_with_cdf_" + randomNameSuffix();
-        try {
-            onTrino().executeQuery("CREATE TABLE delta.default." + tableName + " (col1 VARCHAR, updated_column INT) " +
-                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "', change_data_feed_enabled = true)");
-
-            Assertions.assertThat(onTrino().executeQuery("SHOW CREATE TABLE " + tableName).getOnlyValue().toString()).contains("change_data_feed_enabled = true");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1)");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue2', 2)");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue3', 3)");
-            onTrino().executeQuery("UPDATE delta.default." + tableName +
-                    " SET updated_column = 5 WHERE col1 = 'testValue3'");
-            onTrino().executeQuery("UPDATE delta.default." + tableName +
-                    " SET updated_column = 4, col1 = 'testValue4' WHERE col1 = 'testValue3'");
-
-            assertThat(onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
-                    "FROM table_changes('default." + tableName + "', 0)"))
-                    .containsOnly(
-                            row("testValue1", 1, "insert", 1L),
-                            row("testValue2", 2, "insert", 2L),
-                            row("testValue3", 3, "insert", 3L),
-                            row("testValue3", 3, "update_preimage", 4L),
-                            row("testValue3", 5, "update_postimage", 4L),
-                            row("testValue3", 5, "update_preimage", 5L),
-                            row("testValue4", 4, "update_postimage", 5L));
-        }
-        finally {
-            onTrino().executeQuery("DROP TABLE IF EXISTS delta.default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testUpdatePartitionedTableWithCdf()
-    {
-        String tableName = "test_updates_to_partitioned_table_with_cdf_" + randomNameSuffix();
-        try {
-            onDelta().executeQuery("CREATE TABLE default." + tableName + " (updated_column STRING, partitioning_column_1 INT, partitioning_column_2 STRING) " +
-                    "USING DELTA " +
-                    "PARTITIONED BY (partitioning_column_1, partitioning_column_2) " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
-                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1, 'partition1')");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue2', 2, 'partition2')");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue3', 3, 'partition3')");
-            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET updated_column = 'testValue5' WHERE partitioning_column_1 = 3");
-
-            assertThat(onDelta().executeQuery(
-                    "SELECT updated_column, partitioning_column_1, partitioning_column_2, _change_type, _commit_version " +
-                            "FROM table_changes('default." + tableName + "', 0)"))
-                    .containsOnly(
-                            row("testValue1", 1, "partition1", "insert", 1L),
-                            row("testValue2", 2, "partition2", "insert", 2L),
-                            row("testValue3", 3, "partition3", "insert", 3L),
-                            row("testValue3", 3, "partition3", "update_preimage", 4L),
-                            row("testValue5", 3, "partition3", "update_postimage", 4L));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testUpdateTableWithManyRowsInsertedInTheSameQueryAndCdfEnabled()
-    {
-        String tableName = "test_updates_to_table_with_many_rows_inserted_in_one_query_cdf_" + randomNameSuffix();
-        try {
-            onDelta().executeQuery("CREATE TABLE default." + tableName + " (col1 STRING, updated_column INT) " +
-                    "USING DELTA " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
-                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1), ('testValue2', 2), ('testValue3', 3)");
-            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET updated_column = 5 WHERE col1 = 'testValue3'");
-
-            assertThat(onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
-                    "FROM table_changes('default." + tableName + "', 0)"))
-                    .containsOnly(
-                            row("testValue1", 1, "insert", 1L),
-                            row("testValue2", 2, "insert", 1L),
-                            row("testValue3", 3, "insert", 1L),
-                            row("testValue3", 3, "update_preimage", 2L),
-                            row("testValue3", 5, "update_postimage", 2L));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testUpdatePartitionedTableWithManyRowsInsertedInTheSameRequestAndCdfEnabled()
-    {
-        String tableName = "test_updates_to_partitioned_table_with_many_rows_inserted_in_one_query_cdf_" + randomNameSuffix();
-        try {
-            onDelta().executeQuery("CREATE TABLE default." + tableName + " (updated_column STRING, partitioning_column_1 INT, partitioning_column_2 STRING) " +
-                    "USING DELTA " +
-                    "PARTITIONED BY (partitioning_column_1, partitioning_column_2) " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
-                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES " +
-                    "('testValue1', 1, 'partition1'), " +
-                    "('testValue2', 2, 'partition2'), " +
-                    "('testValue3', 3, 'partition3')");
-            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET updated_column = 'testValue5' WHERE partitioning_column_1 = 3");
-
-            assertThat(onDelta().executeQuery(
-                    "SELECT updated_column, partitioning_column_1, partitioning_column_2, _change_type, _commit_version " +
-                            "FROM table_changes('default." + tableName + "', 0)"))
-                    .containsOnly(
-                            row("testValue1", 1, "partition1", "insert", 1L),
-                            row("testValue2", 2, "partition2", "insert", 1L),
-                            row("testValue3", 3, "partition3", "insert", 1L),
-                            row("testValue3", 3, "partition3", "update_preimage", 2L),
-                            row("testValue5", 3, "partition3", "update_postimage", 2L));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testUpdatePartitionedTableCdfEnabledAndPartitioningColumnUpdated()
-    {
-        String tableName = "test_updates_partitioning_column_in_table_with_cdf_" + randomNameSuffix();
-        try {
-            onDelta().executeQuery("CREATE TABLE default." + tableName + " (updated_column STRING, partitioning_column_1 INT, partitioning_column_2 STRING) " +
-                    "USING DELTA " +
-                    "PARTITIONED BY (partitioning_column_1, partitioning_column_2) " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
-                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES " +
-                    "('testValue1', 1, 'partition1'), " +
-                    "('testValue2', 2, 'partition2'), " +
-                    "('testValue3', 3, 'partition3')");
-            onTrino().executeQuery("UPDATE delta.default." + tableName +
-                    " SET partitioning_column_1 = 5 WHERE partitioning_column_2 = 'partition1'");
-            onTrino().executeQuery("UPDATE delta.default." + tableName +
-                    " SET partitioning_column_1 = 4, updated_column = 'testValue4' WHERE partitioning_column_2 = 'partition2'");
-
-            assertThat(onDelta().executeQuery(
-                    "SELECT updated_column, partitioning_column_1, partitioning_column_2, _change_type, _commit_version " +
-                            "FROM table_changes('default." + tableName + "', 0)"))
-                    .containsOnly(
-                            row("testValue1", 1, "partition1", "insert", 1L),
-                            row("testValue2", 2, "partition2", "insert", 1L),
-                            row("testValue3", 3, "partition3", "insert", 1L),
-                            row("testValue1", 1, "partition1", "update_preimage", 2L),
-                            row("testValue1", 5, "partition1", "update_postimage", 2L),
-                            row("testValue2", 2, "partition2", "update_preimage", 3L),
-                            row("testValue4", 4, "partition2", "update_postimage", 3L));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testUpdateTableWithCdfEnabledAfterTableIsAlreadyCreated()
-    {
-        String tableName = "test_updates_to_table_with_cdf_enabled_later_" + randomNameSuffix();
-        try {
-            onDelta().executeQuery("CREATE TABLE default." + tableName + " (col1 STRING, updated_column INT) " +
-                    "USING DELTA " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1)");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue2', 2)");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue3', 3)");
-            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET updated_column = 5 WHERE col1 = 'testValue3'");
-            onDelta().executeQuery("ALTER TABLE default." + tableName + " SET TBLPROPERTIES (delta.enableChangeDataFeed = true)");
-            long versionWithCdfEnabled = (long) onDelta().executeQuery("DESCRIBE HISTORY default." + tableName + " LIMIT 1")
-                    .row(0)
-                    .get(0);
-            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET updated_column = 4 WHERE col1 = 'testValue3'");
-
-            assertQueryFailure(() -> onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
-                    "FROM table_changes('default." + tableName + "', 0)"))
-                    .hasMessageMatching("(?s)(.*Error getting change data for range \\[0 , 6] as change data was not\nrecorded for version \\[0].*)");
-
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES ('testValue6', 6)");
-            assertThat(onDelta().executeQuery(
-                    format("SELECT col1, updated_column, _change_type, _commit_version FROM table_changes('default.%s', %d)",
-                            tableName,
-                            versionWithCdfEnabled)))
-                    .containsOnly(
-                            row("testValue3", 5, "update_preimage", 6L),
-                            row("testValue3", 4, "update_postimage", 6L),
-                            row("testValue6", 6, "insert", 7L));
-
-            long lastVersionWithCdf = (long) onDelta().executeQuery("DESCRIBE HISTORY default." + tableName + " LIMIT 1")
-                    .row(0)
-                    .get(0);
-            onDelta().executeQuery("ALTER TABLE default." + tableName + " SET TBLPROPERTIES (delta.enableChangeDataFeed = false)");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES ('testValue7', 7)");
-
-            assertThat(onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
-                    format("FROM table_changes('default.%s', %d, %d)", tableName, versionWithCdfEnabled, lastVersionWithCdf)))
-                    .containsOnly(
-                            row("testValue3", 5, "update_preimage", 6L),
-                            row("testValue3", 4, "update_postimage", 6L),
-                            row("testValue6", 6, "insert", 7L));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDeleteFromTableWithCdf()
-    {
-        String tableName = "test_deletes_from_table_with_cdf_" + randomNameSuffix();
-        try {
-            onDelta().executeQuery("CREATE TABLE default." + tableName + " (col1 STRING, updated_column INT) " +
-                    "USING DELTA " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
-                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES('testValue1', 1)");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES('testValue2', 2)");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES('testValue3', 3)");
-            onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE col1 = 'testValue3'");
-
-            assertThat(onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
-                    "FROM table_changes('default." + tableName + "', 0)"))
-                    .containsOnly(
-                            row("testValue1", 1, "insert", 1L),
-                            row("testValue2", 2, "insert", 2L),
-                            row("testValue3", 3, "insert", 3L),
-                            row("testValue3", 3, "delete", 4L));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testMergeUpdateIntoTableWithCdfEnabled()
-    {
-        String tableName1 = "test_merge_update_into_table_with_cdf_" + randomNameSuffix();
-        String tableName2 = "test_merge_update_into_table_with_cdf_data_table_" + randomNameSuffix();
-        try {
-            onDelta().executeQuery("CREATE TABLE default." + tableName1 + " (nationkey INT, name STRING, regionkey INT) " +
-                    "USING DELTA " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName1 + "'" +
-                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
-            onDelta().executeQuery("CREATE TABLE default." + tableName2 + " (nationkey INT, name STRING, regionkey INT) " +
-                    "USING DELTA " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName2 + "'" +
-                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName1 + " VALUES (1, 'nation1', 100)");
-            onDelta().executeQuery("INSERT INTO default." + tableName1 + " VALUES (2, 'nation2', 200)");
-            onDelta().executeQuery("INSERT INTO default." + tableName1 + " VALUES (3, 'nation3', 300)");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName2 + " VALUES (1000, 'nation1000', 1000)");
-            onDelta().executeQuery("INSERT INTO default." + tableName2 + " VALUES (2, 'nation2', 20000)");
-            onDelta().executeQuery("INSERT INTO default." + tableName2 + " VALUES (3000, 'nation3000', 3000)");
-
-            onTrino().executeQuery("MERGE INTO delta.default." + tableName1 + " cdf USING delta.default." + tableName2 + " n " +
-                    "ON (cdf.nationkey = n.nationkey) " +
-                    "WHEN MATCHED " +
-                    "THEN UPDATE SET nationkey = (cdf.nationkey + n.nationkey + n.regionkey) " +
-                    "WHEN NOT MATCHED " +
-                    "THEN INSERT (nationkey, name, regionkey) VALUES (n.nationkey, n.name, n.regionkey)");
-
-            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName1))
-                    .containsOnly(
-                            row(1000, "nation1000", 1000),
-                            row(3000, "nation3000", 3000),
-                            row(1, "nation1", 100),
-                            row(3, "nation3", 300),
-                            row(20004, "nation2", 200));
-
-            assertThat(onDelta().executeQuery(
-                    "SELECT nationkey, name, regionkey, _change_type, _commit_version " +
-                            "FROM table_changes('default." + tableName1 + "', 0)"))
-                    .containsOnly(
-                            row(1, "nation1", 100, "insert", 1),
-                            row(2, "nation2", 200, "insert", 2),
-                            row(3, "nation3", 300, "insert", 3),
-                            row(1000, "nation1000", 1000, "insert", 4),
-                            row(3000, "nation3000", 3000, "insert", 4),
-                            row(2, "nation2", 200, "update_preimage", 4),
-                            row(20004, "nation2", 200, "update_postimage", 4));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName1);
-            dropDeltaTableWithRetry("default." + tableName2);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testMergeDeleteIntoTableWithCdfEnabled()
-    {
-        String tableName1 = "test_merge_delete_into_table_with_cdf_" + randomNameSuffix();
-        String tableName2 = "test_merge_delete_into_table_with_cdf_data_table_" + randomNameSuffix();
-        try {
-            onDelta().executeQuery("CREATE TABLE default." + tableName1 + " (nationkey INT, name STRING, regionkey INT) " +
-                    "USING DELTA " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName1 + "'" +
-                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
-            onDelta().executeQuery("CREATE TABLE default." + tableName2 + " (nationkey INT, name STRING, regionkey INT) " +
-                    "USING DELTA " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName2 + "'" +
-                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName1 + " VALUES (1, 'nation1', 100)");
-            onDelta().executeQuery("INSERT INTO default." + tableName1 + " VALUES (2, 'nation2', 200)");
-            onDelta().executeQuery("INSERT INTO default." + tableName1 + " VALUES (3, 'nation3', 300)");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName2 + " VALUES (1000, 'nation1000', 1000)");
-            onDelta().executeQuery("INSERT INTO default." + tableName2 + " VALUES (2, 'nation2', 20000)");
-            onDelta().executeQuery("INSERT INTO default." + tableName2 + " VALUES (3000, 'nation3000', 3000)");
-
-            onTrino().executeQuery("MERGE INTO delta.default." + tableName1 + " cdf USING delta.default." + tableName2 + " n " +
-                    "ON (cdf.nationkey = n.nationkey) " +
-                    "WHEN MATCHED " +
-                    "THEN DELETE " +
-                    "WHEN NOT MATCHED " +
-                    "THEN INSERT (nationkey, name, regionkey) VALUES (n.nationkey, n.name, n.regionkey)");
-
-            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName1))
-                    .containsOnly(
-                            row(1000, "nation1000", 1000),
-                            row(3000, "nation3000", 3000),
-                            row(1, "nation1", 100),
-                            row(3, "nation3", 300));
-
-            assertThat(onDelta().executeQuery(
-                    "SELECT nationkey, name, regionkey, _change_type, _commit_version " +
-                            "FROM table_changes('default." + tableName1 + "', 0)"))
-                    .containsOnly(
-                            row(1, "nation1", 100, "insert", 1),
-                            row(2, "nation2", 200, "insert", 2),
-                            row(3, "nation3", 300, "insert", 3),
-                            row(1000, "nation1000", 1000, "insert", 4),
-                            row(3000, "nation3000", 3000, "insert", 4),
-                            row(2, "nation2", 200, "delete", 4));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName1);
-            dropDeltaTableWithRetry("default." + tableName2);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testMergeMixedDeleteAndUpdateIntoTableWithCdfEnabled()
-    {
-        String targetTableName = "test_merge_mixed_delete_and_update_into_table_with_cdf_" + randomNameSuffix();
-        String sourceTableName = "test_merge_mixed_delete_and_update_into_table_with_cdf_data_table_" + randomNameSuffix();
-        try {
-            onDelta().executeQuery("CREATE TABLE default." + targetTableName + " (page_id INT, page_url STRING, views INT) " +
-                    "USING DELTA " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + targetTableName + "'" +
-                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
-            onDelta().executeQuery("CREATE TABLE default." + sourceTableName + " (page_id INT, page_url STRING, views INT) " +
-                    "USING DELTA " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + sourceTableName + "'");
-
-            onDelta().executeQuery("INSERT INTO default." + targetTableName + " VALUES (1, 'pageUrl1', 100)");
-            onDelta().executeQuery("INSERT INTO default." + targetTableName + " VALUES (2, 'pageUrl2', 200)");
-            onDelta().executeQuery("INSERT INTO default." + targetTableName + " VALUES (3, 'pageUrl3', 300)");
-            onDelta().executeQuery("INSERT INTO default." + targetTableName + " VALUES (4, 'pageUrl4', 400)");
-
-            onDelta().executeQuery("INSERT INTO default." + sourceTableName + " VALUES (1000, 'pageUrl1000', 1000)");
-            onDelta().executeQuery("INSERT INTO default." + sourceTableName + " VALUES (2, 'pageUrl2', 20000)");
-            onDelta().executeQuery("INSERT INTO default." + sourceTableName + " VALUES (3000, 'pageUrl3000', 3000)");
-            onDelta().executeQuery("INSERT INTO default." + sourceTableName + " VALUES (4, 'pageUrl4000', 4000)");
-
-            onTrino().executeQuery("MERGE INTO delta.default." + targetTableName + " targetTable USING delta.default." + sourceTableName + " sourceTable " +
-                    "ON (targetTable.page_id = sourceTable.page_id) " +
-                    "WHEN MATCHED AND targetTable.page_id = 2 " +
-                    "THEN DELETE " +
-                    "WHEN MATCHED AND targetTable.page_id > 2 " +
-                    "THEN UPDATE SET views = (targetTable.views + sourceTable.views) " +
-                    "WHEN NOT MATCHED " +
-                    "THEN INSERT (page_id, page_url, views) VALUES (sourceTable.page_id, sourceTable.page_url, sourceTable.views)");
-
-            assertThat(onDelta().executeQuery("SELECT * FROM " + targetTableName))
-                    .containsOnly(
-                            row(1000, "pageUrl1000", 1000),
-                            row(3000, "pageUrl3000", 3000),
-                            row(4, "pageUrl4", 4400),
-                            row(1, "pageUrl1", 100),
-                            row(3, "pageUrl3", 300));
-
-            assertThat(onDelta().executeQuery(
-                    "SELECT page_id, page_url, views, _change_type, _commit_version " +
-                            "FROM table_changes('default." + targetTableName + "', 0)"))
-                    .containsOnly(
-                            row(1, "pageUrl1", 100, "insert", 1),
-                            row(2, "pageUrl2", 200, "insert", 2),
-                            row(3, "pageUrl3", 300, "insert", 3),
-                            row(4, "pageUrl4", 400, "insert", 4),
-                            row(1000, "pageUrl1000", 1000, "insert", 5),
-                            row(3000, "pageUrl3000", 3000, "insert", 5),
-                            row(2, "pageUrl2", 200, "delete", 5),
-                            row(4, "pageUrl4", 4400, "update_postimage", 5),
-                            row(4, "pageUrl4", 400, "update_preimage", 5));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + targetTableName);
-            dropDeltaTableWithRetry("default." + sourceTableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDeleteFromNullPartitionWithCdfEnabled()
-    {
-        String tableName = "test_delete_from_null_partition_with_cdf_enabled" + randomNameSuffix();
-        try {
-            onDelta().executeQuery("CREATE TABLE default." + tableName + " (updated_column STRING, partitioning_column_1 INT, partitioning_column_2 STRING) " +
-                    "USING DELTA " +
-                    "PARTITIONED BY (partitioning_column_1, partitioning_column_2) " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
-                    "TBLPROPERTIES (delta.enableChangeDataFeed = true)");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES " +
-                    "('testValue1', 1, 'partition1'), " +
-                    "('testValue2', 2, 'partition2'), " +
-                    "('testValue3', 3, NULL)");
-            onTrino().executeQuery("DELETE FROM delta.default." + tableName +
-                    " WHERE partitioning_column_2 IS NULL");
-
-            assertThat(onTrino().executeQuery(
-                    "SELECT * FROM delta.default." + tableName
-            )).containsOnly(
-                    row("testValue1", 1, "partition1"),
-                    row("testValue2", 2, "partition2"));
-
-            assertThat(onDelta().executeQuery(
-                    "SELECT updated_column, partitioning_column_1, partitioning_column_2, _change_type, _commit_version " +
-                            "FROM table_changes('default." + tableName + "', 0)"))
-                    .containsOnly(
-                            row("testValue1", 1, "partition1", "insert", 1L),
-                            row("testValue2", 2, "partition2", "insert", 1L),
-                            row("testValue3", 3, null, "insert", 1L),
-                            row("testValue3", 3, null, "delete", 2L));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTurningOnAndOffCdfFromTrino()
-    {
-        String tableName = "test_turning_cdf_on_and_off_from_trino" + randomNameSuffix();
-        try {
-            onTrino().executeQuery("CREATE TABLE delta.default." + tableName + " (col1 VARCHAR, updated_column INT) " +
-                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "', change_data_feed_enabled = true)");
-
-            Assertions.assertThat(onTrino().executeQuery("SHOW CREATE TABLE " + tableName).getOnlyValue().toString()).contains("change_data_feed_enabled = true");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1)");
-            onDelta().executeQuery("UPDATE default." + tableName + " SET updated_column = 10 WHERE col1 = 'testValue1'");
-            assertThat(onDelta().executeQuery(
-                    "SELECT col1, updated_column, _change_type, _commit_version " +
-                            "FROM table_changes('default." + tableName + "', 0, 2)"))
-                    .containsOnly(
-                            row("testValue1", 1, "insert", 1L),
-                            row("testValue1", 1, "update_preimage", 2L),
-                            row("testValue1", 10, "update_postimage", 2L));
-
-            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " SET PROPERTIES change_data_feed_enabled = false");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue2', 2)");
-            onDelta().executeQuery("UPDATE default." + tableName + " SET updated_column = 20 WHERE col1 = 'testValue2'");
-            assertQueryFailure(() -> onDelta().executeQuery("SELECT col1, updated_column, _change_type, _commit_version " +
-                    "FROM table_changes('default." + tableName + "', 4, 5)"))
-                    .hasMessageMatching("(?s)(.*Error getting change data for range \\[4 , 5] as change data was not\nrecorded for version \\[4].*)");
-            assertThat(onDelta().executeQuery(
-                    "SELECT col1, updated_column, _change_type, _commit_version " +
-                            "FROM table_changes('default." + tableName + "', 0, 2)"))
-                    .containsOnly(
-                            row("testValue1", 1, "insert", 1L),
-                            row("testValue1", 1, "update_preimage", 2L),
-                            row("testValue1", 10, "update_postimage", 2L));
-
-            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " SET PROPERTIES change_data_feed_enabled = true");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue3', 3)");
-            onDelta().executeQuery("UPDATE default." + tableName + " SET updated_column = 30 WHERE col1 = 'testValue3'");
-            assertThat(onDelta().executeQuery(
-                    "SELECT col1, updated_column, _change_type, _commit_version " +
-                            "FROM table_changes('default." + tableName + "', 7, 8)"))
-                    .containsOnly(
-                            row("testValue3", 3, "insert", 7L),
-                            row("testValue3", 3, "update_preimage", 8L),
-                            row("testValue3", 30, "update_postimage", 8L));
-
-            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName))
-                    .containsOnly(row("testValue1", 10), row("testValue2", 20), row("testValue3", 30));
-        }
-        finally {
-            onTrino().executeQuery("DROP TABLE IF EXISTS delta.default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testThatCdfDoesntWorkWhenPropertyIsNotSet()
-    {
-        String tableName1 = "test_cdf_doesnt_work_when_property_is_not_set_1_" + randomNameSuffix();
-        String tableName2 = "test_cdf_doesnt_work_when_property_is_not_set_2_" + randomNameSuffix();
-        assertThereIsNoCdfFileGenerated(tableName1, "");
-        assertThereIsNoCdfFileGenerated(tableName2, "change_data_feed_enabled = false");
-    }
-
-    private void assertThereIsNoCdfFileGenerated(String tableName, String tableProperty)
-    {
-        try {
-            onTrino().executeQuery("CREATE TABLE delta.default." + tableName + " (col1 VARCHAR, updated_column INT) " +
-                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
-                    (tableProperty.isEmpty() ? "" : ", " + tableProperty) + ")");
-
-            if (tableProperty.isEmpty()) {
-                Assertions.assertThat(onTrino().executeQuery("SHOW CREATE TABLE " + tableName).getOnlyValue().toString())
-                        .doesNotContain("change_data_feed_enabled");
-            }
-            else {
-                Assertions.assertThat(onTrino().executeQuery("SHOW CREATE TABLE " + tableName).getOnlyValue().toString())
-                        .contains(tableProperty);
-            }
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue1', 1)");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue2', 2)");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('testValue3', 3)");
-
-            // as INSERTs don't generate cdf files other operation is needed, UPDATE will do
-            onTrino().executeQuery("UPDATE delta.default." + tableName +
-                    " SET updated_column = 5 WHERE col1 = 'testValue3'");
-            onDelta().executeQuery("UPDATE default." + tableName +
-                    " SET updated_column = 4 WHERE col1 = 'testValue2'");
-
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                    .containsOnly(
-                            row("testValue1", 1),
-                            row("testValue2", 4),
-                            row("testValue3", 5));
-
-            assertThatThereIsNoChangeDataFiles(tableName);
-        }
-        finally {
-            onTrino().executeQuery("DROP TABLE IF EXISTS delta.default." + tableName);
-        }
-    }
-
-    private void assertThatThereIsNoChangeDataFiles(String tableName)
-    {
-        String prefix = "databricks-compatibility-test-" + tableName + "/_change_data/";
-        ListObjectsV2Result listResult = s3Client.listObjectsV2(bucketName, prefix);
-        Assertions.assertThat(listResult.getObjectSummaries()).isEmpty();
-    }
-}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCheckpointsCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCheckpointsCompatibility.java
deleted file mode 100644
index 30e8d719a978..000000000000
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCheckpointsCompatibility.java
+++ /dev/null
@@ -1,674 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.deltalake;
-
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
-import com.google.common.collect.ImmutableList;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import io.trino.tempto.BeforeTestWithContext;
-import io.trino.tempto.assertions.QueryAssert;
-import io.trino.testng.services.Flaky;
-import io.trino.tests.product.deltalake.util.DatabricksVersion;
-import org.testng.SkipException;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import java.util.function.Consumer;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73;
-import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.TransactionLogAssertions.assertLastEntryIsCheckpointed;
-import static io.trino.tests.product.deltalake.TransactionLogAssertions.assertTransactionLogVersion;
-import static io.trino.tests.product.deltalake.util.DatabricksVersion.DATABRICKS_104_RUNTIME_VERSION;
-import static io.trino.tests.product.deltalake.util.DatabricksVersion.DATABRICKS_113_RUNTIME_VERSION;
-import static io.trino.tests.product.deltalake.util.DatabricksVersion.DATABRICKS_91_RUNTIME_VERSION;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getDatabricksRuntimeVersion;
-import static io.trino.tests.product.utils.QueryExecutors.onDelta;
-import static io.trino.tests.product.utils.QueryExecutors.onTrino;
-import static java.lang.String.format;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-public class TestDeltaLakeDatabricksCheckpointsCompatibility
-        extends BaseTestDeltaLakeS3Storage
-{
-    @Inject
-    @Named("s3.server_type")
-    private String s3ServerType;
-
-    private AmazonS3 s3;
-    private DatabricksVersion databricksRuntimeVersion;
-
-    @BeforeTestWithContext
-    public void setup()
-    {
-        super.setUp();
-        s3 = new S3ClientFactory().createS3Client(s3ServerType);
-        databricksRuntimeVersion = getDatabricksRuntimeVersion().orElseThrow();
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDatabricksCanReadTrinoCheckpoint()
-    {
-        String tableName = "test_dl_checkpoints_compat_" + randomNameSuffix();
-        String tableDirectory = "databricks-compatibility-test-" + tableName;
-        // using mixed case column names for extend test coverage
-
-        onDelta().executeQuery(format(
-                "CREATE TABLE default.%s" +
-                        "      (a_NuMbEr INT, a_StRiNg STRING)" +
-                        "      USING delta" +
-                        "      PARTITIONED BY (a_NuMbEr)" +
-                        "      LOCATION 's3://%s/%s'",
-                tableName, bucketName, tableDirectory));
-        try {
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,'ala'), (2, 'kota')");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'osla')");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (3, 'psa'), (4, 'bobra')");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (4, 'lwa'), (5, 'jeza')");
-            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a_string = 'jeza'");
-            onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE a_string = 'bobra'");
-
-            List<QueryAssert.Row> expectedRows = ImmutableList.of(
-                    row(1, "ala"),
-                    row(2, "kota"),
-                    row(3, "osla"),
-                    row(3, "psa"),
-                    row(4, "lwa"));
-
-            // sanity check
-            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(0);
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
-
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName + " WHERE a_string <> 'fill'"))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE a_string <> 'fill'"))
-                    .containsOnly(expectedRows);
-
-            // fill with inserts to trigger checkpoint
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'fill')");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'fill')");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'fill')");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'fill')");
-
-            // check we can still query data
-            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(1);
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName + " WHERE a_string <> 'fill'"))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE a_string <> 'fill'"))
-                    .containsOnly(expectedRows);
-        }
-        finally {
-            // cleanup
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTrinoUsesCheckpointInterval()
-    {
-        String tableName = "test_dl_checkpoints_compat_" + randomNameSuffix();
-        String tableDirectory = "databricks-compatibility-test-" + tableName;
-
-        onDelta().executeQuery(format(
-                "CREATE TABLE default.%s" +
-                        "      (a_NuMbEr INT, a_StRiNg STRING)" +
-                        "      USING delta" +
-                        "      PARTITIONED BY (a_NuMbEr)" +
-                        "      LOCATION 's3://%s/%s'" +
-                        "      TBLPROPERTIES ('delta.checkpointInterval' = '5')",
-                tableName, bucketName, tableDirectory));
-
-        try {
-            // validate that we can see the checkpoint interval
-            String showCreateTable = format(
-                    "CREATE TABLE delta.default.%s (\n" +
-                            "   a_number integer,\n" +
-                            "   a_string varchar\n" +
-                            ")\n" +
-                            "WITH (\n" +
-                            "   checkpoint_interval = 5,\n" +
-                            "   location = 's3://%s/%s',\n" +
-                            "   partitioned_by = ARRAY['a_number']\n" +
-                            ")",
-                    tableName,
-                    bucketName,
-                    tableDirectory);
-            assertThat(onTrino().executeQuery("SHOW CREATE TABLE delta.default." + tableName)).containsExactlyInOrder(row(showCreateTable));
-
-            // sanity check
-            fillWithInserts("delta.default." + tableName, "(1, 'trino')", 4);
-            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(0);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE a_string <> 'trino'")).hasNoRows();
-
-            // fill to first checkpoint using Trino
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'ala'), (2, 'kota')");
-            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(1);
-
-            // fill to next checkpoint using a mix of Trino and Databricks
-            fillWithInserts("delta.default." + tableName, "(2, 'trino')", 3);
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'psa'), (4, 'bobra')");
-            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a_string = 'trino'");
-
-            onDelta().executeQuery("ALTER TABLE default." + tableName + " SET TBLPROPERTIES ('delta.checkpointInterval' = '2')");
-            // Starting with Databricks Runtime 8.4 checkpoint writing is dynamic rather than relying on a set interval
-            int initialCheckpointCount = listCheckpointFiles(bucketName, tableDirectory).size();
-
-            fillWithInserts("delta.default." + tableName, "(3, 'trino')", 4);
-            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(initialCheckpointCount + 2);
-        }
-        finally {
-            // cleanup
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDatabricksUsesCheckpointInterval()
-    {
-        String tableName = "test_dl_checkpoints_compat_" + randomNameSuffix();
-        String tableDirectory = "databricks-compatibility-test-" + tableName;
-
-        onTrino().executeQuery(format("CREATE TABLE delta.default.%s (a_number bigint, a_string varchar) " +
-                "WITH (" +
-                "      location = 's3://%s/%s'," +
-                "      partitioned_by = ARRAY['a_number']," +
-                "      checkpoint_interval = 3" +
-                ")", tableName, bucketName, tableDirectory));
-
-        try {
-            // validate that Databricks can see the checkpoint interval
-            String showCreateTable;
-            if (databricksRuntimeVersion.isAtLeast(DATABRICKS_104_RUNTIME_VERSION)) {
-                showCreateTable = format(
-                        "CREATE TABLE spark_catalog.default.%s (\n" +
-                                "  a_number BIGINT,\n" +
-                                "  a_string STRING)\n" +
-                                "USING delta\n" +
-                                "PARTITIONED BY (a_number)\n" +
-                                "LOCATION 's3://%s/%s'\n%s",
-                        tableName,
-                        bucketName,
-                        tableDirectory,
-                        getDatabricksTablePropertiesWithCheckpointInterval());
-            }
-            else {
-                showCreateTable = format(
-                        "CREATE TABLE `default`.`%s` (\n" +
-                                "  `a_number` BIGINT,\n" +
-                                "  `a_string` STRING)\n" +
-                                "USING DELTA\n" +
-                                "PARTITIONED BY (a_number)\n" +
-                                "LOCATION 's3://%s/%s'\n" +
-                                "TBLPROPERTIES (\n" +
-                                "  'delta.checkpointInterval' = '3')\n",
-                        tableName,
-                        bucketName,
-                        tableDirectory);
-            }
-            assertThat(onDelta().executeQuery("SHOW CREATE TABLE default." + tableName)).containsExactlyInOrder(row(showCreateTable));
-
-            // sanity check
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 'databricks')");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (2, 'databricks')");
-            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(0);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName + " WHERE a_string <> 'databricks'")).hasNoRows();
-
-            // fill to first checkpoint using Databricks
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'databricks')");
-            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(1);
-
-            // fill to next checkpoint using a mix of Trino and Databricks
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'ala'), (2, 'kota')");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'psa'), (4, 'bobra')");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (5, 'osla'), (6, 'lwa')");
-            assertThat(listCheckpointFiles(bucketName, tableDirectory)).hasSize(2);
-        }
-        finally {
-            // cleanup
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    private String getDatabricksTablePropertiesWithCheckpointInterval()
-    {
-        if (databricksRuntimeVersion.equals(DATABRICKS_113_RUNTIME_VERSION)) {
-            return "TBLPROPERTIES (\n" +
-                    "  'delta.checkpointInterval' = '3',\n" +
-                    "  'delta.minReaderVersion' = '1',\n" +
-                    "  'delta.minWriterVersion' = '2')\n";
-        }
-        if (databricksRuntimeVersion.equals(DATABRICKS_104_RUNTIME_VERSION)) {
-            return "TBLPROPERTIES (\n" +
-                    "  'Type' = 'EXTERNAL',\n" +
-                    "  'delta.checkpointInterval' = '3',\n" +
-                    "  'delta.minReaderVersion' = '1',\n" +
-                    "  'delta.minWriterVersion' = '2')\n";
-        }
-        throw new IllegalArgumentException("Unsupported databricks runtime version: " + databricksRuntimeVersion);
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTrinoCheckpointMinMaxStatisticsForRowType()
-    {
-        String tableName = "test_dl_checkpoints_row_compat_min_max_trino_" + randomNameSuffix();
-        testCheckpointMinMaxStatisticsForRowType(sql -> onTrino().executeQuery(sql), tableName, "delta.default." + tableName);
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDatabricksCheckpointMinMaxStatisticsForRowType()
-    {
-        String tableName = "test_dl_checkpoints_row_compat_min_max_databricks_" + randomNameSuffix();
-        testCheckpointMinMaxStatisticsForRowType(sql -> onDelta().executeQuery(sql), tableName, "default." + tableName);
-    }
-
-    private void testCheckpointMinMaxStatisticsForRowType(Consumer<String> sqlExecutor, String tableName, String qualifiedTableName)
-    {
-        List<QueryAssert.Row> expectedRows = ImmutableList.of(
-                row(1, "ala"),
-                row(2, "kota"),
-                row(3, "osla"),
-                row(4, "zulu"));
-
-        onDelta().executeQuery(format(
-                "CREATE TABLE default.%s" +
-                        "      (id INT, root STRUCT<entry_one : INT, entry_two : STRING>)" +
-                        "      USING DELTA " +
-                        "      LOCATION 's3://%s/databricks-compatibility-test-%1$s' " +
-                        "      TBLPROPERTIES (delta.checkpointInterval = 1)",
-                tableName, bucketName));
-
-        try {
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, STRUCT(1,'ala')), (2, STRUCT(2, 'kota'))");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, STRUCT(3, 'osla'))");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (4, STRUCT(4, 'zulu'))");
-
-            // sanity check
-            assertThat(listCheckpointFiles(bucketName, "databricks-compatibility-test-" + tableName)).hasSize(3);
-            assertTransactionLogVersion(s3, bucketName, tableName, 3);
-            assertThat(onDelta().executeQuery("SELECT DISTINCT root.entry_one, root.entry_two FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT DISTINCT root.entry_one, root.entry_two FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
-
-            // Trigger a checkpoint
-            sqlExecutor.accept("DELETE FROM " + qualifiedTableName + " WHERE id = 4");
-            assertLastEntryIsCheckpointed(s3, bucketName, tableName);
-
-            // Assert min/max queries can be computed from just metadata
-            String explainSelectMax = getOnlyElement(onDelta().executeQuery("EXPLAIN SELECT max(root.entry_one) FROM default." + tableName).column(1));
-            String column = databricksRuntimeVersion.isAtLeast(DATABRICKS_104_RUNTIME_VERSION) ? "root.entry_one" : "root.entry_one AS `entry_one`";
-            assertThat(explainSelectMax).matches("== Physical Plan ==\\s*LocalTableScan \\[max\\(" + column + "\\).*]\\s*");
-
-            // check both engines can read both tables
-            List<QueryAssert.Row> maxMin = ImmutableList.of(row(3, "ala"));
-            assertThat(onDelta().executeQuery("SELECT max(root.entry_one), min(root.entry_two) FROM default." + tableName))
-                    .containsOnly(maxMin);
-            assertThat(onTrino().executeQuery("SELECT max(root.entry_one), min(root.entry_two) FROM delta.default." + tableName))
-                    .containsOnly(maxMin);
-        }
-        finally {
-            // cleanup
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTrinoCheckpointNullStatisticsForRowType()
-    {
-        String tableName = "test_dl_checkpoints_row_compat_trino_" + randomNameSuffix();
-        testCheckpointNullStatisticsForRowType(sql -> onTrino().executeQuery(sql), tableName, "delta.default." + tableName);
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDatabricksCheckpointNullStatisticsForRowType()
-    {
-        String tableName = "test_dl_checkpoints_row_compat_databricks_" + randomNameSuffix();
-        testCheckpointNullStatisticsForRowType(sql -> onDelta().executeQuery(sql), tableName, "default." + tableName);
-    }
-
-    private void testCheckpointNullStatisticsForRowType(Consumer<String> sqlExecutor, String tableName, String qualifiedTableName)
-    {
-        List<QueryAssert.Row> expectedRows = ImmutableList.of(
-                row(1, "ala"),
-                row(2, "kota"),
-                row(null, null),
-                row(4, "zulu"));
-
-        onDelta().executeQuery(format(
-                "CREATE TABLE default.%s" +
-                        "      (id INT, root STRUCT<entry_one : INT, entry_two : STRING>)" +
-                        "      USING DELTA " +
-                        "      LOCATION 's3://%s/databricks-compatibility-test-%1$s' " +
-                        "      TBLPROPERTIES (delta.checkpointInterval = 1)",
-                tableName, bucketName));
-        try {
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, STRUCT(1,'ala')), (2, STRUCT(2, 'kota'))");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, STRUCT(null, null))");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (4, STRUCT(4, 'zulu'))");
-
-            // sanity check
-            assertThat(listCheckpointFiles(bucketName, "databricks-compatibility-test-" + tableName)).hasSize(3);
-            assertTransactionLogVersion(s3, bucketName, tableName, 3);
-            assertThat(onDelta().executeQuery("SELECT DISTINCT root.entry_one, root.entry_two FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT DISTINCT root.entry_one, root.entry_two FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
-
-            // Trigger a checkpoint with a DELETE
-            sqlExecutor.accept("DELETE FROM " + qualifiedTableName + " WHERE id = 4");
-            assertLastEntryIsCheckpointed(s3, bucketName, tableName);
-
-            // Assert counting non null entries can be computed from just metadata
-            String explainCountNotNull = getOnlyElement(onDelta().executeQuery("EXPLAIN SELECT count(root.entry_two) FROM default." + tableName).column(1));
-            String column = databricksRuntimeVersion.isAtLeast(DATABRICKS_104_RUNTIME_VERSION) ? "root.entry_two" : "root.entry_two AS `entry_two`";
-            assertThat(explainCountNotNull).matches("== Physical Plan ==\\s*LocalTableScan \\[count\\(" + column + "\\).*]\\s*");
-
-            // check both engines can read both tables
-            assertThat(onDelta().executeQuery("SELECT count(root.entry_two) FROM default." + tableName))
-                    .containsOnly(row(2));
-            assertThat(onTrino().executeQuery("SELECT count(root.entry_two) FROM delta.default." + tableName))
-                    .containsOnly(row(2));
-        }
-        finally {
-            // cleanup
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTrinoWriteStatsAsJsonDisabled()
-    {
-        String tableName = "test_dl_checkpoints_write_stats_as_json_disabled_trino_" + randomNameSuffix();
-        testWriteStatsAsJsonDisabled(sql -> onTrino().executeQuery(sql), tableName, "delta.default." + tableName, 3.0, 1.0);
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDatabricksWriteStatsAsJsonDisabled()
-    {
-        String tableName = "test_dl_checkpoints_write_stats_as_json_disabled_databricks_" + randomNameSuffix();
-        testWriteStatsAsJsonDisabled(sql -> onDelta().executeQuery(sql), tableName, "default." + tableName, null, null);
-    }
-
-    private void testWriteStatsAsJsonDisabled(Consumer<String> sqlExecutor, String tableName, String qualifiedTableName, Double dataSize, Double distinctValues)
-    {
-        onDelta().executeQuery(format(
-                "CREATE TABLE default.%s" +
-                        "(a_number INT, a_string STRING) " +
-                        "USING DELTA " +
-                        "PARTITIONED BY (a_number) " +
-                        "LOCATION 's3://%s/databricks-compatibility-test-%1$s' " +
-                        "TBLPROPERTIES (" +
-                        " delta.checkpointInterval = 5, " +
-                        " delta.checkpoint.writeStatsAsJson = false)",
-                tableName, bucketName));
-
-        try {
-            sqlExecutor.accept("INSERT INTO " + qualifiedTableName + " VALUES (1,'ala')");
-
-            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
-                    .containsOnly(ImmutableList.of(
-                            row("a_number", null, 1.0, 0.0, null, null, null),
-                            row("a_string", dataSize, distinctValues, 0.0, null, null, null),
-                            row(null, null, null, null, 1.0, null, null)));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTrinoWriteStatsAsStructDisabled()
-    {
-        String tableName = "test_dl_checkpoints_write_stats_as_struct_disabled_trino_" + randomNameSuffix();
-        testWriteStatsAsStructDisabled(sql -> onTrino().executeQuery(sql), tableName, "delta.default." + tableName);
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDatabricksWriteStatsAsStructDisabled()
-    {
-        String tableName = "test_dl_checkpoints_write_stats_as_struct_disabled_databricks_" + randomNameSuffix();
-        testWriteStatsAsStructDisabled(sql -> onDelta().executeQuery(sql), tableName, "default." + tableName);
-    }
-
-    private void testWriteStatsAsStructDisabled(Consumer<String> sqlExecutor, String tableName, String qualifiedTableName)
-    {
-        onDelta().executeQuery(format(
-                "CREATE TABLE default.%s" +
-                        "(a_number INT, a_string STRING) " +
-                        "USING DELTA " +
-                        "PARTITIONED BY (a_number) " +
-                        "LOCATION 's3://%s/databricks-compatibility-test-%1$s' " +
-                        "TBLPROPERTIES (" +
-                        " delta.checkpointInterval = 1, " +
-                        " delta.checkpoint.writeStatsAsJson = false, " + // Disable json stats to avoid merging statistics with 'stats' field
-                        " delta.checkpoint.writeStatsAsStruct = false)",
-                tableName, bucketName));
-
-        try {
-            sqlExecutor.accept("INSERT INTO " + qualifiedTableName + " VALUES (1,'ala')");
-
-            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
-                    .containsOnly(ImmutableList.of(
-                            row("a_number", null, null, null, null, null, null),
-                            row("a_string", null, null, null, null, null, null),
-                            row(null, null, null, null, null, null, null)));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS}, dataProvider = "testTrinoCheckpointWriteStatsAsJson")
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTrinoWriteStatsAsJsonEnabled(String type, String inputValue, Double dataSize, Double distinctValues, Double nullsFraction, Object statsValue)
-    {
-        String tableName = "test_dl_checkpoints_write_stats_as_json_enabled_trino_" + randomNameSuffix();
-        testWriteStatsAsJsonEnabled(sql -> onTrino().executeQuery(sql), tableName, "delta.default." + tableName, type, inputValue, dataSize, distinctValues, nullsFraction, statsValue);
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS}, dataProvider = "testDeltaCheckpointWriteStatsAsJson")
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDatabricksWriteStatsAsJsonEnabled(String type, String inputValue, Double nullsFraction, Object statsValue)
-    {
-        String tableName = "test_dl_checkpoints_write_stats_as_json_enabled_databricks_" + randomNameSuffix();
-        testWriteStatsAsJsonEnabled(sql -> onDelta().executeQuery(sql), tableName, "default." + tableName, type, inputValue, null, null, nullsFraction, statsValue);
-    }
-
-    private void testWriteStatsAsJsonEnabled(Consumer<String> sqlExecutor, String tableName, String qualifiedTableName, String type, String inputValue, Double dataSize, Double distinctValues, Double nullsFraction, Object statsValue)
-    {
-        String createTableSql = format(
-                "CREATE TABLE default.%s" +
-                        "(col %s) " +
-                        "USING DELTA " +
-                        "LOCATION 's3://%s/databricks-compatibility-test-%1$s' " +
-                        "TBLPROPERTIES (" +
-                        " delta.checkpointInterval = 2, " +
-                        " delta.checkpoint.writeStatsAsJson = false, " +
-                        " delta.checkpoint.writeStatsAsStruct = true)",
-                tableName, type, bucketName);
-
-        if (databricksRuntimeVersion.equals(DATABRICKS_91_RUNTIME_VERSION) && type.equals("struct<x bigint>")) {
-            assertThatThrownBy(() -> onDelta().executeQuery(createTableSql)).hasStackTraceContaining("ParseException");
-            throw new SkipException("New runtime version covers the type");
-        }
-
-        onDelta().executeQuery(createTableSql);
-
-        try {
-            sqlExecutor.accept("INSERT INTO " + qualifiedTableName + " SELECT " + inputValue);
-            sqlExecutor.accept("INSERT INTO " + qualifiedTableName + " SELECT " + inputValue);
-
-            // SET TBLPROPERTIES increments checkpoint
-            onDelta().executeQuery("" +
-                    "ALTER TABLE default." + tableName + " SET TBLPROPERTIES (" +
-                    "'delta.checkpoint.writeStatsAsJson' = true, " +
-                    "'delta.checkpoint.writeStatsAsStruct' = false)");
-
-            sqlExecutor.accept("INSERT INTO " + qualifiedTableName + " SELECT " + inputValue);
-
-            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
-                    .containsOnly(ImmutableList.of(
-                            row("col", dataSize, distinctValues, nullsFraction, null, statsValue, statsValue),
-                            row(null, null, null, null, 3.0, null, null)));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @DataProvider
-    public Object[][] testTrinoCheckpointWriteStatsAsJson()
-    {
-        return new Object[][] {
-                {"boolean", "true", null, 1.0, 0.0, null},
-                {"integer", "1", null, 1.0, 0.0, "1"},
-                {"tinyint", "2", null, 1.0, 0.0, "2"},
-                {"smallint", "3", null, 1.0, 0.0, "3"},
-                {"bigint", "1000", null, 1.0, 0.0, "1000"},
-                {"real", "0.1", null, 1.0, 0.0, "0.1"},
-                {"double", "1.0", null, 1.0, 0.0, "1.0"},
-                {"decimal(3,2)", "3.14", null, 1.0, 0.0, "3.14"},
-                {"decimal(30,1)", "12345", null, 1.0, 0.0, "12345.0"},
-                {"string", "'test'", 12.0, 1.0, 0.0, null},
-                {"binary", "X'65683F'", 9.0, 1.0, 0.0, null},
-                {"date", "date '2021-02-03'", null, 1.0, 0.0, "2021-02-03"},
-                {"timestamp", "timestamp '2001-08-22 11:04:05.321 UTC'", null, 1.0, 0.0, "2001-08-22 11:04:05.321 UTC"},
-                {"array<int>", "array[1]", null, null, null, null},
-                {"map<string,int>", "map(array['key1', 'key2'], array[1, 2])", null, null, null, null},
-                {"struct<x bigint>", "cast(row(1) as row(x bigint))", null, null, null, null},
-        };
-    }
-
-    @DataProvider
-    public Object[][] testDeltaCheckpointWriteStatsAsJson()
-    {
-        return new Object[][] {
-                {"boolean", "true", 0.0, null},
-                {"integer", "1", 0.0, "1"},
-                {"tinyint", "2", 0.0, "2"},
-                {"smallint", "3", 0.0, "3"},
-                {"bigint", "1000", 0.0, "1000"},
-                {"real", "0.1", 0.0, "0.1"},
-                {"double", "1.0", 0.0, "1.0"},
-                {"decimal(3,2)", "3.14", 0.0, "3.14"},
-                {"decimal(30,1)", "12345", 0.0, "12345.0"},
-                {"string", "'test'", 0.0, null},
-                {"binary", "X'65683F'", 0.0, null},
-                {"date", "date '2021-02-03'", 0.0, "2021-02-03"},
-                {"timestamp", "timestamp '2001-08-22 11:04:05.321 UTC'", 0.0, "2001-08-22 11:04:05.321 UTC"},
-                {"array<int>", "array(1)", 0.0, null},
-                {"map<string,int>", "map('key1', 1, 'key2', 2)", 0.0, null},
-                {"struct<x bigint>", "named_struct('x', 1)", null, null},
-        };
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTrinoWriteStatsAsStructEnabled()
-    {
-        String tableName = "test_dl_checkpoints_write_stats_as_struct_enabled_trino_" + randomNameSuffix();
-        testWriteStatsAsStructEnabled(sql -> onTrino().executeQuery(sql), tableName, "delta.default." + tableName, 3.0, 1.0);
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDatabricksWriteStatsAsStructEnabled()
-    {
-        String tableName = "test_dl_checkpoints_write_stats_as_struct_enabled_databricks_" + randomNameSuffix();
-        testWriteStatsAsStructEnabled(sql -> onDelta().executeQuery(sql), tableName, "default." + tableName, null, null);
-    }
-
-    private void testWriteStatsAsStructEnabled(Consumer<String> sqlExecutor, String tableName, String qualifiedTableName, Double dataSize, Double distinctValues)
-    {
-        onDelta().executeQuery(format(
-                "CREATE TABLE default.%s" +
-                        "(a_number INT, a_string STRING) " +
-                        "USING DELTA " +
-                        "PARTITIONED BY (a_number) " +
-                        "LOCATION 's3://%s/databricks-compatibility-test-%1$s' " +
-                        "TBLPROPERTIES (" +
-                        " delta.checkpointInterval = 1, " +
-                        " delta.checkpoint.writeStatsAsJson = false, " +
-                        " delta.checkpoint.writeStatsAsStruct = true)",
-                tableName, bucketName));
-
-        try {
-            sqlExecutor.accept("INSERT INTO " + qualifiedTableName + " VALUES (1,'ala')");
-
-            assertThat(onTrino().executeQuery("SHOW STATS FOR delta.default." + tableName))
-                    .containsOnly(ImmutableList.of(
-                            row("a_number", null, 1.0, 0.0, null, null, null),
-                            row("a_string", dataSize, distinctValues, 0.0, null, null, null),
-                            row(null, null, null, null, 1.0, null, null)));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    private void fillWithInserts(String tableName, String values, int toCreate)
-    {
-        for (int i = 0; i < toCreate; i++) {
-            assertThat(onTrino().executeQuery(format("INSERT INTO %s VALUES %s", tableName, values))).updatedRowsCountIsEqualTo(1);
-        }
-    }
-
-    private List<String> listCheckpointFiles(String bucketName, String tableDirectory)
-    {
-        List<String> allFiles = listS3Directory(bucketName, tableDirectory + "/_delta_log");
-        return allFiles.stream()
-                .filter(path -> path.contains("checkpoint.parquet"))
-                .collect(toImmutableList());
-    }
-
-    private List<String> listS3Directory(String bucketName, String directory)
-    {
-        ImmutableList.Builder<String> result = ImmutableList.builder();
-        ObjectListing listing = s3.listObjects(bucketName, directory);
-        do {
-            listing.getObjectSummaries().stream().map(S3ObjectSummary::getKey).forEach(result::add);
-            listing = s3.listNextBatchOfObjects(listing);
-        }
-        while (listing.isTruncated());
-        return result.build();
-    }
-}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableAsSelectCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableAsSelectCompatibility.java
deleted file mode 100644
index e1b1ee36d855..000000000000
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableAsSelectCompatibility.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.deltalake;
-
-import com.amazonaws.services.s3.AmazonS3;
-import com.google.common.collect.ImmutableList;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import io.trino.tempto.BeforeTestWithContext;
-import io.trino.tempto.assertions.QueryAssert;
-import io.trino.tempto.query.QueryResult;
-import io.trino.testng.services.Flaky;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.List;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_113;
-import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.TransactionLogAssertions.assertLastEntryIsCheckpointed;
-import static io.trino.tests.product.deltalake.TransactionLogAssertions.assertTransactionLogVersion;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.removeS3Directory;
-import static io.trino.tests.product.utils.QueryExecutors.onDelta;
-import static io.trino.tests.product.utils.QueryExecutors.onTrino;
-import static java.lang.String.format;
-
-public class TestDeltaLakeDatabricksCreateTableAsSelectCompatibility
-        extends BaseTestDeltaLakeS3Storage
-{
-    @Inject
-    @Named("s3.server_type")
-    private String s3ServerType;
-
-    private AmazonS3 s3;
-
-    @BeforeTestWithContext
-    public void setup()
-    {
-        super.setUp();
-        s3 = new S3ClientFactory().createS3Client(s3ServerType);
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testPrestoTypesWithDatabricks()
-    {
-        String tableName = "test_dl_ctas_" + randomNameSuffix();
-
-        try {
-            assertThat(onTrino().executeQuery("CREATE TABLE delta.default.\"" + tableName + "\" " +
-                    "(id, boolean, tinyint, smallint, integer, bigint, real, double, short_decimal, long_decimal, varchar_25, varchar, date) " +
-                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "') AS VALUES " +
-                    "(1, BOOLEAN 'false', TINYINT '-128', SMALLINT '-32768', INTEGER '-2147483648', BIGINT '-9223372036854775808', REAL '-0x1.fffffeP+127f', DOUBLE '-0x1.fffffffffffffP+1023', CAST('-123456789.123456789' AS DECIMAL(18,9)), CAST('-12345678901234567890.123456789012345678' AS DECIMAL(38,18)), CAST('Romania' AS VARCHAR(25)), CAST('Poland' AS VARCHAR), DATE '1901-01-01')" +
-                    ", (2, BOOLEAN 'true', TINYINT '127', SMALLINT '32767', INTEGER '2147483647', BIGINT '9223372036854775807', REAL '0x1.fffffeP+127f', DOUBLE '0x1.fffffffffffffP+1023', CAST('123456789.123456789' AS DECIMAL(18,9)), CAST('12345678901234567890.123456789012345678' AS DECIMAL(38,18)), CAST('Canada' AS VARCHAR(25)), CAST('Germany' AS VARCHAR), DATE '9999-12-31')" +
-                    ", (3, BOOLEAN 'true', TINYINT '0', SMALLINT '0', INTEGER '0', BIGINT '0', REAL '0', DOUBLE '0', CAST('0' AS DECIMAL(18,9)), CAST('0' AS DECIMAL(38,18)), CAST('' AS VARCHAR(25)), CAST('' AS VARCHAR), DATE '2020-08-22')" +
-                    ", (4, BOOLEAN 'true', TINYINT '1', SMALLINT '1', INTEGER '1', BIGINT '1', REAL '1', DOUBLE '1', CAST('1' AS DECIMAL(18,9)), CAST('1' AS DECIMAL(38,18)), CAST('Romania' AS VARCHAR(25)), CAST('Poland' AS VARCHAR), DATE '2001-08-22')" +
-                    ", (5, BOOLEAN 'true', TINYINT '37', SMALLINT '12242', INTEGER '2524', BIGINT '132', REAL '3.141592653', DOUBLE '2.718281828459045', CAST('3.141592653' AS DECIMAL(18,9)), CAST('2.718281828459045' AS DECIMAL(38,18)), CAST('\u653b\u6bbb\u6a5f\u52d5\u968a' AS VARCHAR(25)), CAST('\u041d\u0443, \u043f\u043e\u0433\u043e\u0434\u0438!' AS VARCHAR), DATE '2020-08-22')" +
-                    ", (6, BOOLEAN 'true', TINYINT '0', SMALLINT '0', INTEGER '0', BIGINT '0', REAL '0x0.000002P-126f', DOUBLE '0x0.0000000000001P-1022', CAST('0' AS DECIMAL(18,9)), CAST('0' AS DECIMAL(38,18)), CAST('Romania' AS VARCHAR(25)), CAST('Poland' AS VARCHAR), DATE '2001-08-22')" +
-                    ", (7, BOOLEAN 'true', TINYINT '0', SMALLINT '0', INTEGER '0', BIGINT '0', REAL '0x1.0p-126f', DOUBLE '0x1.0p-1022', CAST('0' AS DECIMAL(18,9)), CAST('0' AS DECIMAL(38,18)), CAST('Romania' AS VARCHAR(25)), CAST('Poland' AS VARCHAR), DATE '2001-08-22')"))
-                    .containsOnly(row(7));
-
-            QueryResult databricksResult = onDelta().executeQuery(format("SELECT * FROM default.%s", tableName));
-            QueryResult prestoResult = onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s\"", tableName));
-            assertThat(databricksResult).containsOnly(prestoResult.rows().stream()
-                    .map(QueryAssert.Row::new)
-                    .collect(toImmutableList()));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testPrestoTimestampsWithDatabricks()
-    {
-        String tableName = "test_dl_ctas_timestamps_" + randomNameSuffix();
-
-        try {
-            assertThat(onTrino().executeQuery("CREATE TABLE delta.default.\"" + tableName + "\" " +
-                    "(id, timestamp_in_utc, timestamp_in_new_york, timestamp_in_warsaw) " +
-                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "') AS VALUES " +
-                    "(1, TIMESTAMP '1901-01-01 00:00:00 UTC', TIMESTAMP '1902-01-01 00:00:00 America/New_York', TIMESTAMP '1902-01-01 00:00:00 Europe/Warsaw')" +
-                    ", (2, TIMESTAMP '9999-12-31 23:59:59.999 UTC', TIMESTAMP '9998-12-31 23:59:59.999 America/New_York', TIMESTAMP '9998-12-31 23:59:59.999 Europe/Warsaw')" +
-                    ", (3, TIMESTAMP '2020-06-10 15:55:23 UTC', TIMESTAMP '2020-06-10 15:55:23.123 America/New_York', TIMESTAMP '2020-06-10 15:55:23.123 Europe/Warsaw')" +
-                    ", (4, TIMESTAMP '2001-08-22 03:04:05.321 UTC', TIMESTAMP '2001-08-22 03:04:05.321 America/New_York', TIMESTAMP '2001-08-22 03:04:05.321 Europe/Warsaw')"))
-                    .containsOnly(row(4));
-
-            QueryResult databricksResult = onDelta().executeQuery("SELECT id, date_format(timestamp_in_utc, \"yyyy-MM-dd HH:mm:ss.SSS\"), date_format(timestamp_in_new_york, \"yyyy-MM-dd HH:mm:ss.SSS\"), date_format(timestamp_in_warsaw, \"yyyy-MM-dd HH:mm:ss.SSS\") FROM default." + tableName);
-            QueryResult prestoResult = onTrino().executeQuery("SELECT id, format('%1$tF %1$tT.%1$tL', timestamp_in_utc), format('%1$tF %1$tT.%1$tL', timestamp_in_new_york), format('%1$tF %1$tT.%1$tL', timestamp_in_warsaw) FROM delta.default.\"" + tableName + "\"");
-            assertThat(databricksResult).containsOnly(prestoResult.rows().stream()
-                    .map(QueryAssert.Row::new)
-                    .collect(toImmutableList()));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testPrestoCacheInvalidatedOnCreateTable()
-            throws URISyntaxException, IOException
-    {
-        String tableName = "test_dl_ctas_caching_" + randomNameSuffix();
-
-        try {
-            assertThat(onTrino().executeQuery("CREATE TABLE delta.default.\"" + tableName + "\" " +
-                    "(id, boolean, tinyint) " +
-                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "') AS VALUES " +
-                    "(1, BOOLEAN 'false', TINYINT '-128')" +
-                    ", (2, BOOLEAN 'true', TINYINT '127')" +
-                    ", (3, BOOLEAN 'false', TINYINT '0')" +
-                    ", (4, BOOLEAN 'false', TINYINT '1')" +
-                    ", (5, BOOLEAN 'true', TINYINT '37')"))
-                    .containsOnly(row(5));
-
-            QueryResult databricksResult = onDelta().executeQuery(format("SELECT * FROM default.%s", tableName));
-            QueryResult prestoResult = onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s\"", tableName));
-            assertThat(databricksResult).containsOnly(prestoResult.rows().stream()
-                    .map(QueryAssert.Row::new)
-                    .collect(toImmutableList()));
-
-            dropDeltaTableWithRetry("default." + tableName);
-            removeS3Directory(s3, bucketName, "databricks-compatibility-test-" + tableName);
-
-            assertThat(onTrino().executeQuery("CREATE TABLE delta.default.\"" + tableName + "\" " +
-                    "(id, boolean, tinyint) " +
-                    "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "') AS VALUES " +
-                    "(1, BOOLEAN 'true', TINYINT '1')" +
-                    ", (2, BOOLEAN 'true', TINYINT '1')" +
-                    ", (3, BOOLEAN 'false', TINYINT '2')" +
-                    ", (4, BOOLEAN 'true', TINYINT '3')" +
-                    ", (5, BOOLEAN 'true', TINYINT '5')" +
-                    ", (6, BOOLEAN 'false', TINYINT '8')" +
-                    ", (7, BOOLEAN 'true', TINYINT '13')"))
-                    .containsOnly(row(7));
-
-            databricksResult = onDelta().executeQuery(format("SELECT * FROM default.%s", tableName));
-            prestoResult = onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s\"", tableName));
-            assertThat(databricksResult).containsOnly(prestoResult.rows().stream()
-                    .map(QueryAssert.Row::new)
-                    .collect(toImmutableList()));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testCreateFromTrinoWithDefaultPartitionValues()
-    {
-        String tableName = "test_create_partitioned_table_default_as_" + randomNameSuffix();
-
-        try {
-            assertThat(onTrino().executeQuery(
-                    "CREATE TABLE delta.default." + tableName + "(number_partition, string_partition, a_value) " +
-                            "WITH (" +
-                            "   location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "', " +
-                            "   partitioned_by = ARRAY['number_partition', 'string_partition']) " +
-                            "AS VALUES (NULL, 'partition_a', 'jarmuz'), (1, NULL, 'brukselka'), (NULL, NULL, 'kalafior')"))
-                    .containsOnly(row(3));
-
-            List<QueryAssert.Row> expectedRows = ImmutableList.of(
-                    row(null, "partition_a", "jarmuz"),
-                    row(1, null, "brukselka"),
-                    row(null, null, "kalafior"));
-
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
-        }
-        finally {
-            onTrino().executeQuery("DROP TABLE IF EXISTS delta.default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testReplaceTableWithSchemaChange()
-    {
-        String tableName = "test_replace_table_with_schema_change_" + randomNameSuffix();
-
-        onTrino().executeQuery("CREATE TABLE delta.default." + tableName + " (ts VARCHAR) " +
-                "with (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "', checkpoint_interval = 10)");
-        try {
-            ImmutableList.Builder<QueryAssert.Row> expected = ImmutableList.builder();
-            // Write to the table until a checkpoint file is written
-            for (int i = 0; i < 12; i++) {
-                onDelta().executeQuery("INSERT INTO " + tableName + " VALUES \"1960-01-01 01:02:03\", \"1961-01-01 01:02:03\", \"1962-01-01 01:02:03\"");
-                expected.add(row("1960-01-01T01:02:03.000Z"), row("1961-01-01T01:02:03.000Z"), row("1962-01-01T01:02:03.000Z"));
-            }
-
-            assertTransactionLogVersion(s3, bucketName, tableName, 12);
-            onDelta().executeQuery("CREATE OR REPLACE TABLE " + tableName + " USING DELTA AS SELECT CAST(ts AS TIMESTAMP) FROM " + tableName);
-            assertThat(onTrino().executeQuery("SELECT to_iso8601(ts) FROM delta.default." + tableName)).containsOnly(expected.build());
-        }
-        finally {
-            dropDeltaTableWithRetry(tableName);
-        }
-    }
-
-    // Databricks 11.3 doesn't create a checkpoint file at 'CREATE OR REPLACE TABLE' statement
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_113, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testReplaceTableWithSchemaChangeOnCheckpoint()
-    {
-        String tableName = "test_replace_table_with_schema_change_" + randomNameSuffix();
-        onTrino().executeQuery("CREATE TABLE delta.default." + tableName + " (ts VARCHAR) " +
-                "with (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "', checkpoint_interval = 10)");
-        try {
-            ImmutableList.Builder<QueryAssert.Row> expected = ImmutableList.builder();
-            // Write to the table until a checkpoint file is written
-            for (int i = 0; i < 9; i++) {
-                onDelta().executeQuery("INSERT INTO " + tableName + " VALUES \"1960-01-01 01:02:03\", \"1961-01-01 01:02:03\", \"1962-01-01 01:02:03\"");
-                expected.add(row("1960-01-01T01:02:03.000Z"), row("1961-01-01T01:02:03.000Z"), row("1962-01-01T01:02:03.000Z"));
-            }
-            onDelta().executeQuery("CREATE OR REPLACE TABLE " + tableName + " USING DELTA AS SELECT CAST(ts AS TIMESTAMP) FROM " + tableName);
-            assertLastEntryIsCheckpointed(s3, bucketName, tableName);
-
-            onDelta().executeQuery("INSERT INTO " + tableName + " VALUES \"1960-01-01 01:02:03\", \"1961-01-01 01:02:03\", \"1962-01-01 01:02:03\"");
-            expected.add(row("1960-01-01T01:02:03.000Z"), row("1961-01-01T01:02:03.000Z"), row("1962-01-01T01:02:03.000Z"));
-            assertTransactionLogVersion(s3, bucketName, tableName, 11);
-
-            assertThat(onTrino().executeQuery("SELECT to_iso8601(ts) FROM delta.default." + tableName)).containsOnly(expected.build());
-        }
-        finally {
-            dropDeltaTableWithRetry(tableName);
-        }
-    }
-}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableCompatibility.java
index cfd1b3356739..e10708c2b550 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksCreateTableCompatibility.java
@@ -14,7 +14,7 @@
 package io.trino.tests.product.deltalake;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.testng.services.Flaky;
 import io.trino.tests.product.deltalake.util.DatabricksVersion;
@@ -23,7 +23,6 @@
 import java.util.List;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
@@ -36,9 +35,12 @@
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getColumnCommentOnTrino;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getDatabricksRuntimeVersion;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTableCommentOnDelta;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTableCommentOnTrino;
 import static io.trino.tests.product.utils.QueryExecutors.onDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
 public class TestDeltaLakeDatabricksCreateTableCompatibility
@@ -46,7 +48,7 @@ public class TestDeltaLakeDatabricksCreateTableCompatibility
 {
     private DatabricksVersion databricksRuntimeVersion;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setup()
     {
         super.setUp();
@@ -257,9 +259,7 @@ public void testCreateTableWithTableComment()
                 tableDirectory));
 
         try {
-            assertThat(onTrino().executeQuery("SELECT comment FROM system.metadata.table_comments WHERE catalog_name = 'delta' AND schema_name = 'default' AND table_name = '" + tableName + "'"))
-                    .containsOnly(row("test comment"));
-
+            assertEquals(getTableCommentOnTrino("default", tableName), "test comment");
             assertEquals(getTableCommentOnDelta("default", tableName), "test comment");
         }
         finally {
@@ -313,16 +313,94 @@ public void testCreateTableWithColumnCommentOnDelta()
         }
     }
 
-    private String getDatabricksDefaultTableProperties()
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testCreateTableWithDuplicatedColumnNames()
     {
-        if (databricksRuntimeVersion.equals(DATABRICKS_113_RUNTIME_VERSION)) {
-            return "TBLPROPERTIES (\n" +
-                    "  'delta.minReaderVersion' = '1',\n" +
-                    "  'delta.minWriterVersion' = '2')\n";
+        String tableName = "test_dl_create_table_with_duplicated_column_names_" + randomNameSuffix();
+        String tableDirectory = "databricks-compatibility-test-" + tableName;
+
+        try {
+            assertThatThrownBy(() -> onDelta().executeQuery(
+                    "CREATE TABLE default." + tableName + " (col INT, COL int) USING DELTA LOCATION 's3://" + bucketName + "/" + tableDirectory + "'"))
+                    .hasMessageMatching("(?s).*(Found duplicate column|The column `col` already exists).*");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testCreateTableWithUnsupportedPartitionType()
+    {
+        String tableName = "test_dl_create_table_with_unsupported_column_types_" + randomNameSuffix();
+        String tableLocation = "s3://%s/databricks-compatibility-test-%s".formatted(bucketName, tableName);
+        try {
+            assertThatThrownBy(() -> onTrino().executeQuery("" +
+                    "CREATE TABLE delta.default." + tableName + "(a INT, part ARRAY(INT)) WITH (partitioned_by = ARRAY['part'], location = '" + tableLocation + "')"))
+                    .hasMessageContaining("Using array, map or row type on partitioned columns is unsupported");
+            assertThatThrownBy(() -> onTrino().executeQuery("" +
+                    "CREATE TABLE delta.default." + tableName + "(a INT, part MAP(INT,INT)) WITH (partitioned_by = ARRAY['part'], location = '" + tableLocation + "')"))
+                    .hasMessageContaining("Using array, map or row type on partitioned columns is unsupported");
+            assertThatThrownBy(() -> onTrino().executeQuery("" +
+                    "CREATE TABLE delta.default." + tableName + "(a INT, part ROW(field INT)) WITH (partitioned_by = ARRAY['part'], location = '" + tableLocation + "')"))
+                    .hasMessageContaining("Using array, map or row type on partitioned columns is unsupported");
+
+            assertThatThrownBy(() -> onDelta().executeQuery(
+                    "CREATE TABLE default." + tableName + "(a INT, part ARRAY<INT>) USING DELTA PARTITIONED BY (part) LOCATION '" + tableLocation + "'"))
+                    .hasMessageMatching("(?s).*(Cannot use .* for partition column|Using column part of type .* as a partition column is not supported).*");
+            assertThatThrownBy(() -> onDelta().executeQuery(
+                    "CREATE TABLE default." + tableName + "(a INT, part MAP<INT,INT>) USING DELTA PARTITIONED BY (part) LOCATION '" + tableLocation + "'"))
+                    .hasMessageMatching("(?s).*(Cannot use .* for partition column|Using column part of type .* as a partition column is not supported).*");
+            assertThatThrownBy(() -> onDelta().executeQuery(
+                    "CREATE TABLE default." + tableName + "(a INT, part STRUCT<field: INT>) USING DELTA PARTITIONED BY (part) LOCATION '" + tableLocation + "'"))
+                    .hasMessageMatching("(?s).*(Cannot use .* for partition column|Using column part of type .* as a partition column is not supported).*");
         }
-        if (databricksRuntimeVersion.equals(DATABRICKS_104_RUNTIME_VERSION)) {
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testCreateTableWithAllPartitionColumns()
+    {
+        String tableName = "test_dl_create_table_with_all_partition_columns_" + randomNameSuffix();
+        String tableDirectory = "databricks-compatibility-test-" + tableName;
+
+        try {
+            assertThatThrownBy(() -> onTrino().executeQuery("" +
+                    "CREATE TABLE delta.default." + tableName + "(part int)" +
+                    "WITH (partitioned_by = ARRAY['part'], location = 's3://" + bucketName + "/" + tableDirectory + "')"))
+                    .hasMessageContaining("Using all columns for partition columns is unsupported");
+            assertThatThrownBy(() -> onTrino().executeQuery("" +
+                    "CREATE TABLE delta.default." + tableName + "(part int, another_part int)" +
+                    "WITH (partitioned_by = ARRAY['part', 'another_part'], location = 's3://" + bucketName + "/" + tableDirectory + "')"))
+                    .hasMessageContaining("Using all columns for partition columns is unsupported");
+
+            assertThatThrownBy(() -> onDelta().executeQuery("" +
+                    "CREATE TABLE default." + tableName + "(part int)" +
+                    "USING DELTA " +
+                    "PARTITIONED BY (part)" +
+                    "LOCATION 's3://" + bucketName + "/" + tableDirectory + "'"))
+                    .hasMessageContaining("Cannot use all columns for partition columns");
+            assertThatThrownBy(() -> onDelta().executeQuery("" +
+                    "CREATE TABLE default." + tableName + "(part int, another_part int)" +
+                    "USING DELTA " +
+                    "PARTITIONED BY (part, another_part)" +
+                    "LOCATION 's3://" + bucketName + "/" + tableDirectory + "'"))
+                    .hasMessageContaining("Cannot use all columns for partition columns");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    private String getDatabricksDefaultTableProperties()
+    {
+        if (databricksRuntimeVersion.isAtLeast(DATABRICKS_113_RUNTIME_VERSION)) {
             return "TBLPROPERTIES (\n" +
-                    "  'Type' = 'EXTERNAL',\n" +
                     "  'delta.minReaderVersion' = '1',\n" +
                     "  'delta.minWriterVersion' = '2')\n";
         }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksDelete.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksDelete.java
deleted file mode 100644
index b4b545c5f239..000000000000
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksDelete.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.deltalake;
-
-import io.trino.testng.services.Flaky;
-import org.testng.annotations.Test;
-
-import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
-import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
-import static io.trino.tests.product.utils.QueryExecutors.onDelta;
-import static io.trino.tests.product.utils.QueryExecutors.onTrino;
-
-public class TestDeltaLakeDatabricksDelete
-        extends BaseTestDeltaLakeS3Storage
-{
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDeleteOnAppendOnlyTableFails()
-    {
-        String tableName = "test_delete_on_append_only_table_fails_" + randomNameSuffix();
-        onDelta().executeQuery("" +
-                "CREATE TABLE default." + tableName +
-                "         (a INT, b INT)" +
-                "         USING delta " +
-                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
-                "         TBLPROPERTIES ('delta.appendOnly' = true)");
-
-        onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,11), (2, 12)");
-        assertQueryFailure(() -> onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = 1"))
-                .hasMessageContaining("This table is configured to only allow appends");
-        assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM default." + tableName + " WHERE a = 1"))
-                .hasMessageContaining("Cannot modify rows from a table with 'delta.appendOnly' set to true");
-
-        assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                .containsOnly(row(1, 11), row(2, 12));
-        onTrino().executeQuery("DROP TABLE " + tableName);
-    }
-}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksHdfsReads.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksHdfsReads.java
index df6df216a1a5..27aa3a8a46ee 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksHdfsReads.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksHdfsReads.java
@@ -18,6 +18,6 @@ public class TestDeltaLakeDatabricksHdfsReads
 {
     public TestDeltaLakeDatabricksHdfsReads()
     {
-        super("io/trino/plugin/deltalake/testing/resources/databricks/region");
+        super("io/trino/plugin/deltalake/testing/resources/databricks73/region");
     }
 }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksInsertCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksInsertCompatibility.java
deleted file mode 100644
index e50f21096e05..000000000000
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksInsertCompatibility.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.deltalake;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.tempto.BeforeTestWithContext;
-import io.trino.tempto.assertions.QueryAssert.Row;
-import io.trino.testng.services.Flaky;
-import io.trino.tests.product.deltalake.util.DatabricksVersion;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
-import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.util.DatabricksVersion.DATABRICKS_104_RUNTIME_VERSION;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getDatabricksRuntimeVersion;
-import static io.trino.tests.product.utils.QueryExecutors.onDelta;
-import static io.trino.tests.product.utils.QueryExecutors.onTrino;
-import static java.util.Arrays.asList;
-
-public class TestDeltaLakeDatabricksInsertCompatibility
-        extends BaseTestDeltaLakeS3Storage
-{
-    private Optional<DatabricksVersion> databricksRuntimeVersion;
-
-    @BeforeTestWithContext
-    public void setup()
-    {
-        super.setUp();
-        databricksRuntimeVersion = getDatabricksRuntimeVersion();
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testInsertCompatibility()
-    {
-        String tableName = "test_dl_insert_" + randomNameSuffix();
-
-        onDelta().executeQuery("" +
-                "CREATE TABLE default." + tableName +
-                "         (a_number INT, a_string STRING)" +
-                "         USING delta " +
-                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
-
-        try {
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,'ala'), (2, 'kota')");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'psa')");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (4, 'lwa'), (5, 'jeza')");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (6, 'wilka')");
-
-            List<Row> expectedRows = ImmutableList.of(
-                    row(1, "ala"),
-                    row(2, "kota"),
-                    row(3, "psa"),
-                    row(4, "lwa"),
-                    row(5, "jeza"),
-                    row(6, "wilka"));
-
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testPartitionedInsertCompatibility()
-    {
-        String tableName = "test_dl_partitioned_insert_" + randomNameSuffix();
-
-        onDelta().executeQuery("" +
-                "CREATE TABLE default." + tableName +
-                "         (a_number INT, a_string STRING)" +
-                "         USING delta " +
-                "         PARTITIONED BY (a_number)" +
-                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
-
-        try {
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,'ala'), (2, 'kota')");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'osla')");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (3, 'psa'), (4, 'bobra')");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (4, 'lwa'), (5, 'jeza')");
-
-            List<Row> expectedRows = ImmutableList.of(
-                    row(1, "ala"),
-                    row(2, "kota"),
-                    row(3, "osla"),
-                    row(3, "psa"),
-                    row(4, "bobra"),
-                    row(4, "lwa"),
-                    row(5, "jeza"));
-
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTrinoPartitionedDifferentOrderInsertCompatibility()
-    {
-        String tableName = "test_dl_trino_partitioned_different_order_insert_" + randomNameSuffix();
-
-        onTrino().executeQuery("" +
-                "CREATE TABLE delta.default." + tableName +
-                "         (a_number INT, first VARCHAR, second VARCHAR)" +
-                "         WITH (" +
-                "         partitioned_by = ARRAY['second', 'first']," +
-                "         location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "')");
-
-        try {
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'first', 'second')");
-
-            List<Row> expectedRows = ImmutableList.of(row(1, "first", "second"));
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
-        }
-        finally {
-            onTrino().executeQuery("DROP TABLE delta.default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDeltaPartitionedDifferentOrderInsertCompatibility()
-    {
-        String tableName = "test_dl_delta_partitioned_different_order_insert_" + randomNameSuffix();
-
-        onDelta().executeQuery("" +
-                "CREATE TABLE default." + tableName +
-                "         (a_number INT, first STRING, second STRING)" +
-                "         USING delta " +
-                "         PARTITIONED BY (second, first)" +
-                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
-
-        try {
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 'first', 'second')");
-
-            List<Row> expectedRows = ImmutableList.of(row(1, "first", "second"));
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testInsertNonLowercaseColumnsCompatibility()
-    {
-        String tableName = "test_dl_insert_nonlowercase_columns_" + randomNameSuffix();
-
-        onDelta().executeQuery("" +
-                "CREATE TABLE default." + tableName +
-                "         (lower_case_string STRING, UPPER_CASE_STRING STRING, MiXeD_CaSe_StRiNg STRING)" +
-                "         USING delta " +
-                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
-
-        try {
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('databricks', 'DATABRICKS', 'DaTaBrIcKs'), ('databricks', 'DATABRICKS', NULL)");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (NULL, NULL, 'DaTaBrIcKs'), (NULL, NULL, NULL)");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES ('trino', 'TRINO', 'TrInO'), ('trino', 'TRINO', NULL)");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (NULL, NULL, 'TrInO'), (NULL, NULL, NULL)");
-
-            List<Row> expectedRows = ImmutableList.of(
-                    row("databricks", "DATABRICKS", "DaTaBrIcKs"),
-                    row("databricks", "DATABRICKS", null),
-                    row(null, null, "DaTaBrIcKs"),
-                    row(null, null, null),
-                    row("trino", "TRINO", "TrInO"),
-                    row("trino", "TRINO", null),
-                    row(null, null, "TrInO"),
-                    row(null, null, null));
-
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testInsertNestedNonLowercaseColumnsCompatibility()
-    {
-        String tableName = "test_dl_insert_nested_nonlowercase_columns_" + randomNameSuffix();
-
-        onDelta().executeQuery("" +
-                "CREATE TABLE default." + tableName +
-                "         (an_int INT, nested STRUCT<lower_case_string: STRING, UPPER_CASE_STRING: STRING, MiXeD_CaSe_StRiNg: STRING>)" +
-                "         USING delta " +
-                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
-
-        try {
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, struct('databricks', 'DATABRICKS', 'DaTaBrIcKs')), (2, struct('databricks', 'DATABRICKS', NULL))");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES " +
-                    "(3, struct(NULL, NULL, 'DaTaBrIcKs'))," +
-                    "(4, struct(NULL, NULL, NULL))");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (10, ROW('trino', 'TRINO', 'TrInO')), (20, ROW('trino', 'TRINO', NULL))");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (30, ROW(NULL, NULL, 'TrInO')), (40, ROW(NULL, NULL, NULL))");
-
-            List<Row> expectedRows = ImmutableList.of(
-                    row(1, "databricks", "DATABRICKS", "DaTaBrIcKs"),
-                    row(2, "databricks", "DATABRICKS", null),
-                    row(3, null, null, "DaTaBrIcKs"),
-                    row(4, null, null, null),
-                    row(10, "trino", "TRINO", "TrInO"),
-                    row(20, "trino", "TRINO", null),
-                    row(30, null, null, "TrInO"),
-                    row(40, null, null, null));
-
-            assertThat(onDelta().executeQuery("SELECT an_int, nested.lower_case_string, nested.UPPER_CASE_STRING, nested.MiXeD_CaSe_StRiNg FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT an_int, nested.lower_case_string, nested.UPPER_CASE_STRING, nested.MiXeD_CaSe_StRiNg FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testPartitionedInsertNonLowercaseColumnsCompatibility()
-    {
-        String tableName = "test_dl_partitioned_insert_nonlowercase_columns" + randomNameSuffix();
-
-        onDelta().executeQuery("" +
-                "CREATE TABLE default." + tableName +
-                "         (lower_case_string STRING, UPPER_CASE_STRING STRING, MiXeD_CaSe_StRiNg STRING)" +
-                "         USING delta " +
-                "         PARTITIONED BY (MiXeD_CaSe_StRiNg)" +
-                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
-
-        try {
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('databricks', 'DATABRICKS', 'DaTaBrIcKs'), ('databricks', 'DATABRICKS', NULL)");
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (NULL, NULL, 'DaTaBrIcKs'), (NULL, NULL, NULL)");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES ('trino', 'TRINO', 'TrInO'), ('trino', 'TRINO', NULL)");
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (NULL, NULL, 'TrInO'), (NULL, NULL, NULL)");
-
-            List<Row> expectedRows = ImmutableList.of(
-                    row("databricks", "DATABRICKS", "DaTaBrIcKs"),
-                    row("databricks", "DATABRICKS", null),
-                    row(null, null, "DaTaBrIcKs"),
-                    row(null, null, null),
-                    row("trino", "TRINO", "TrInO"),
-                    row("trino", "TRINO", null),
-                    row(null, null, "TrInO"),
-                    row(null, null, null));
-
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDeleteCompatibility()
-    {
-        String tableName = "test_delete_compatibility_" + randomNameSuffix();
-
-        onDelta().executeQuery("CREATE TABLE default." + tableName + " (a int, b int)" +
-                " USING DELTA LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
-
-        try {
-            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)");
-            onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE a % 2 = 0");
-
-            List<Row> expectedRows = ImmutableList.of(
-                    row(1, 2),
-                    row(3, 4),
-                    row(5, 6));
-
-            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                    .containsOnly(expectedRows);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
-                    .containsOnly(expectedRows);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    /**
-     * Smoke test compression when writing to a Delta table. It's verified that writer doesn't fail and reads succeed,
-     * but it's not verified that compression actually takes place.
-     */
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS}, dataProvider = "compressionCodecs")
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testCompression(String compressionCodec)
-    {
-        String tableName = "test_compression_" + compressionCodec + "_" + randomNameSuffix();
-        String trinoTableName = "delta.default." + tableName;
-        String location = "s3://" + bucketName + "/databricks-compatibility-test-" + tableName;
-
-        onTrino().executeQuery("CREATE TABLE " + trinoTableName + " WITH (location = '" + location + "') " +
-                "AS TABLE tpch.tiny.nation WITH NO DATA");
-
-        try {
-            if ("LZ4".equals(compressionCodec)) {
-                // TODO (https://github.com/trinodb/trino/issues/9142) LZ4 is not supported with native Parquet writer
-                assertQueryFailure(() -> onTrino().executeQuery("SET SESSION delta.compression_codec = '" + compressionCodec + "'"))
-                        .hasMessageMatching("Query failed .* Unsupported codec: LZ4");
-            }
-            else {
-                onTrino().executeQuery("SET SESSION delta.compression_codec = '" + compressionCodec + "'");
-
-                onTrino().executeQuery("INSERT INTO " + trinoTableName + " TABLE tpch.tiny.nation");
-                List<Row> expected = onTrino().executeQuery("TABLE tpch.tiny.nation").rows().stream()
-                        .map(row -> row(row.toArray()))
-                        .collect(toImmutableList());
-                assertThat(onTrino().executeQuery("SELECT * FROM " + trinoTableName))
-                        .containsOnly(expected);
-
-                if ("ZSTD".equals(compressionCodec) && databricksRuntimeVersion.orElseThrow().isOlderThan(DATABRICKS_104_RUNTIME_VERSION)) {
-                    assertQueryFailure(() -> onDelta().executeQuery("SELECT * FROM default." + tableName))
-                            .hasMessageContaining("java.lang.ClassNotFoundException: org.apache.hadoop.io.compress.ZStandardCodec");
-                }
-                else {
-                    assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                            .containsOnly(expected);
-                }
-            }
-        }
-        finally {
-            onTrino().executeQuery("DROP TABLE " + trinoTableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void verifyCompressionCodecsDataProvider()
-    {
-        assertThat(onTrino().executeQuery("SHOW SESSION LIKE 'delta.compression_codec'"))
-                .containsOnly(row(
-                        "delta.compression_codec",
-                        "SNAPPY",
-                        "SNAPPY",
-                        "varchar",
-                        "Compression codec to use when writing new data files. Possible values: " +
-                                Stream.of(compressionCodecs())
-                                        .map(arguments -> (String) getOnlyElement(asList(arguments)))
-                                        .collect(toImmutableList())));
-    }
-
-    @DataProvider
-    public Object[][] compressionCodecs()
-    {
-        return new Object[][] {
-                {"NONE"},
-                {"SNAPPY"},
-                {"LZ4"},
-                {"ZSTD"},
-                {"GZIP"},
-        };
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testWritesToTableWithGeneratedColumnFails()
-    {
-        String tableName = "test_writes_into_table_with_generated_column_" + randomNameSuffix();
-        try {
-            onDelta().executeQuery("CREATE TABLE default." + tableName + " (a INT, b BOOLEAN GENERATED ALWAYS AS (CAST(true AS BOOLEAN))) " +
-                    "USING DELTA " +
-                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
-
-            onDelta().executeQuery("INSERT INTO default." + tableName + " (a) VALUES (1), (2), (3)");
-
-            assertThat(onTrino().executeQuery("SELECT a, b FROM " + tableName))
-                    .containsOnly(row(1, true), row(2, true), row(3, true));
-
-            // Disallowing all statements just in case though some statements may not unrelated to generated columns
-            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, false)"))
-                    .hasMessageContaining("Writing to tables with generated columns is not supported");
-            assertQueryFailure(() -> onTrino().executeQuery("UPDATE delta.default." + tableName + " SET a = 3 WHERE b = true"))
-                    .hasMessageContaining("Writing to tables with generated columns is not supported");
-            assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE a = 3"))
-                    .hasMessageContaining("Writing to tables with generated columns is not supported");
-            assertQueryFailure(() -> onTrino().executeQuery("MERGE INTO delta.default." + tableName + " t USING delta.default." + tableName + " s " +
-                    "ON (t.a = s.a) WHEN MATCHED THEN UPDATE SET b = false"))
-                    .hasMessageContaining("Writing to tables with generated columns is not supported");
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksMinioReads.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksMinioReads.java
index ba8965c00e8c..4eac31ad60ea 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksMinioReads.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksMinioReads.java
@@ -25,7 +25,7 @@ public class TestDeltaLakeDatabricksMinioReads
 {
     public TestDeltaLakeDatabricksMinioReads()
     {
-        super("region_databricks", "io/trino/plugin/deltalake/testing/resources/databricks/region");
+        super("region_databricks", "io/trino/plugin/deltalake/testing/resources/databricks73/region");
     }
 
     @Override
@@ -33,6 +33,6 @@ public TestDeltaLakeDatabricksMinioReads()
     public void testReadRegionTable()
     {
         super.testReadRegionTable();
-        assertNotificationsCount(NOTIFICATIONS_TABLE, OBJECT_ACCESSED_GET, tableName + "/part-00000-98195ace-e492-4cd7-97d1-9b955202874b-c000.snappy.parquet", 2);
+        assertNotificationsCount(NOTIFICATIONS_TABLE, OBJECT_ACCESSED_GET, tableName + "/part-00000-98195ace-e492-4cd7-97d1-9b955202874b-c000.snappy.parquet", 1);
     }
 }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksPartitioningCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksPartitioningCompatibility.java
deleted file mode 100644
index 802d9e474abd..000000000000
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksPartitioningCompatibility.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.deltalake;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.tempto.assertions.QueryAssert;
-import io.trino.testng.services.Flaky;
-import org.testng.annotations.Test;
-
-import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
-import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
-import static io.trino.tests.product.utils.QueryExecutors.onDelta;
-import static io.trino.tests.product.utils.QueryExecutors.onTrino;
-import static java.lang.String.format;
-
-public class TestDeltaLakeDatabricksPartitioningCompatibility
-        extends BaseTestDeltaLakeS3Storage
-{
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDatabricksCanReadFromCtasTableCreatedByTrinoWithSpecialCharactersInPartitioningColumn()
-    {
-        testDatabricksCanReadFromCtasTableCreatedByTrinoWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(1);
-        testDatabricksCanReadFromCtasTableCreatedByTrinoWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(20);
-    }
-
-    private void testDatabricksCanReadFromCtasTableCreatedByTrinoWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(int interval)
-    {
-        String tableName = format("test_dl_create_table_partition_by_special_char_with_%d_partitions_%s", interval, randomNameSuffix());
-        String tableDirectory = "databricks-compatibility-test-" + tableName;
-
-        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(
-                row(1, "with-hyphen"),
-                row(2, "with.dot"),
-                row(3, "with:colon"),
-                row(4, "with/slash"),
-                row(5, "with\\\\backslash"),
-                row(6, "with=equal"),
-                row(7, "with?question"),
-                row(8, "with!exclamation"),
-                row(9, "with%percent"),
-                row(10, "with space"));
-
-        onTrino().executeQuery(format("CREATE TABLE delta.default.%s (id, col_name)" +
-                        "WITH(location = 's3://%s/%s', partitioned_by = ARRAY['col_name'], checkpoint_interval = " + interval + ") " +
-                        "AS VALUES " +
-                        "(1, 'with-hyphen')," +
-                        "(2, 'with.dot')," +
-                        "(3, 'with:colon')," +
-                        "(4, 'with/slash')," +
-                        "(5, 'with\\\\backslash')," +
-                        "(6, 'with=equal')," +
-                        "(7, 'with?question')," +
-                        "(8, 'with!exclamation')," +
-                        "(9, 'with%%percent')," +
-                        "(10, 'with space')",
-                tableName,
-                bucketName,
-                tableDirectory));
-
-        try {
-            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName)).containsOnly(expected);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTrinoCanReadFromCtasTableCreatedByDatabricksWithSpecialCharactersInPartitioningColumn()
-    {
-        testTrinoCanReadFromCtasTableCreatedByDatabricksWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(1);
-        testTrinoCanReadFromCtasTableCreatedByDatabricksWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(20);
-    }
-
-    private void testTrinoCanReadFromCtasTableCreatedByDatabricksWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(int interval)
-    {
-        String tableName = format("test_dl_create_table_partition_by_special_char_with_%d_partitions_%s", interval, randomNameSuffix());
-        String tableDirectory = "databricks-compatibility-test-" + tableName;
-
-        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(
-                row(1, "with-hyphen"),
-                row(2, "with.dot"),
-                row(3, "with:colon"),
-                row(4, "with/slash"),
-                row(5, "with\\backslash"),
-                row(6, "with=equal"),
-                row(7, "with?question"),
-                row(8, "with!exclamation"),
-                row(9, "with%percent"),
-                row(10, "with space"));
-
-        onDelta().executeQuery(format("CREATE TABLE default.%s " +
-                        "USING DELTA " +
-                        "OPTIONS (checkpointInterval = " + interval + ") " +
-                        "PARTITIONED BY (`col_name`) LOCATION 's3://%s/%s' AS " +
-                        "SELECT * FROM (VALUES " +
-                        "(1, 'with-hyphen')," +
-                        "(2, 'with.dot')," +
-                        "(3, 'with:colon')," +
-                        "(4, 'with/slash')," +
-                        "(5, 'with\\\\backslash')," +
-                        "(6, 'with=equal')," +
-                        "(7, 'with?question')," +
-                        "(8, 'with!exclamation')," +
-                        "(9, 'with%%percent')," +
-                        "(10, 'with space')" +
-                        ") t(id, col_name)",
-                tableName,
-                bucketName,
-                tableDirectory));
-
-        try {
-            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName)).containsOnly(expected);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDatabricksCanReadTableCreatedByTrinoWithSpecialCharactersInPartitioningColumn()
-    {
-        testDatabricksCanReadTableCreatedByTrinoWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(1);
-        testDatabricksCanReadTableCreatedByTrinoWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(20);
-    }
-
-    private void testDatabricksCanReadTableCreatedByTrinoWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(int interval)
-    {
-        String tableName = format("test_dl_create_table_partition_by_special_char_with_%d_partitions_%s", interval, randomNameSuffix());
-        String tableDirectory = "databricks-compatibility-test-" + tableName;
-
-        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(
-                row(1, "with-hyphen"),
-                row(2, "with.dot"),
-                row(3, "with:colon"),
-                row(4, "with/slash"),
-                row(5, "with\\\\backslash"),
-                row(6, "with=equal"),
-                row(7, "with?question"),
-                row(8, "with!exclamation"),
-                row(9, "with%percent"),
-                row(10, "with space"));
-
-        onTrino().executeQuery(format("CREATE TABLE delta.default.%s (id INTEGER, col_name VARCHAR) " +
-                        "WITH(location = 's3://%s/%s', partitioned_by = ARRAY['col_name'], checkpoint_interval = " + interval + ") ",
-                tableName,
-                bucketName,
-                tableDirectory));
-
-        try {
-            onTrino().executeQuery(format("INSERT INTO delta.default.%s " +
-                            "VALUES" +
-                            "(1, 'with-hyphen'), " +
-                            "(2, 'with.dot'), " +
-                            "(3, 'with:colon'), " +
-                            "(4, 'with/slash'), " +
-                            "(5, 'with\\\\backslash'), " +
-                            "(6, 'with=equal'), " +
-                            "(7, 'with?question'), " +
-                            "(8, 'with!exclamation'), " +
-                            "(9, 'with%%percent')," +
-                            "(10, 'with space')",
-                    tableName));
-            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName)).containsOnly(expected);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTrinoCanReadTableCreatedByDatabricksWithSpecialCharactersInPartitioningColumn()
-    {
-        testTrinoCanReadTableCreatedByDatabricksWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(1);
-        testTrinoCanReadTableCreatedByDatabricksWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(20);
-    }
-
-    private void testTrinoCanReadTableCreatedByDatabricksWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(int interval)
-    {
-        String tableName = format("test_dl_create_table_partition_by_special_char_with_%d_partitions_%s", interval, randomNameSuffix());
-        String tableDirectory = "databricks-compatibility-test-" + tableName;
-
-        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(
-                row(1, "with-hyphen"),
-                row(2, "with.dot"),
-                row(3, "with:colon"),
-                row(4, "with/slash"),
-                row(5, "with\\backslash"),
-                row(6, "with=equal"),
-                row(7, "with?question"),
-                row(8, "with!exclamation"),
-                row(9, "with%percent"),
-                row(10, "with space"));
-
-        onDelta().executeQuery(format("CREATE TABLE default.%s (id INTEGER, col_name STRING) " +
-                        "USING DELTA " +
-                        "OPTIONS (checkpointInterval = " + interval + ") " +
-                        "PARTITIONED BY (`col_name`) LOCATION 's3://%s/%s'",
-                tableName,
-                bucketName,
-                tableDirectory));
-
-        try {
-            onDelta().executeQuery(format("INSERT INTO default.%s " +
-                            "VALUES" +
-                            "(1, 'with-hyphen'), " +
-                            "(2, 'with.dot'), " +
-                            "(3, 'with:colon'), " +
-                            "(4, 'with/slash'), " +
-                            "(5, 'with\\\\backslash'), " +
-                            "(6, 'with=equal'), " +
-                            "(7, 'with?question'), " +
-                            "(8, 'with!exclamation'), " +
-                            "(9, 'with%%percent')," +
-                            "(10, 'with space')",
-                    tableName));
-
-            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName)).containsOnly(expected);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testDatabricksCanReadFromTableUpdatedByTrino()
-    {
-        testDatabricksCanReadFromTableUpdatedByTrinoWithCpIntervalSet(1);
-        testDatabricksCanReadFromTableUpdatedByTrinoWithCpIntervalSet(20);
-    }
-
-    private void testDatabricksCanReadFromTableUpdatedByTrinoWithCpIntervalSet(int interval)
-    {
-        String tableName = format("test_dl_create_table_partition_by_special_char_with_%d_partitions_%s", interval, randomNameSuffix());
-        String tableDirectory = "databricks-compatibility-test-" + tableName;
-
-        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(
-                row(101, "with-hyphen"),
-                row(102, "with.dot"),
-                row(103, "with:colon"),
-                row(104, "with/slash"),
-                row(105, "with\\\\backslash"),
-                row(106, "with=equal"),
-                row(107, "with?question"),
-                row(108, "with!exclamation"),
-                row(109, "with%percent"),
-                row(110, "with space"));
-
-        onTrino().executeQuery(format("CREATE TABLE delta.default.%s (id, col_name) " +
-                        "WITH(location = 's3://%s/%s', partitioned_by = ARRAY['col_name'], checkpoint_interval = " + interval + ") " +
-                        "AS VALUES " +
-                        "(1, 'with-hyphen')," +
-                        "(2, 'with.dot')," +
-                        "(3, 'with:colon')," +
-                        "(4, 'with/slash')," +
-                        "(5, 'with\\\\backslash')," +
-                        "(6, 'with=equal')," +
-                        "(7, 'with?question')," +
-                        "(8, 'with!exclamation')," +
-                        "(9, 'with%%percent')," +
-                        "(10, 'with space')",
-                tableName,
-                bucketName,
-                tableDirectory));
-
-        try {
-            onTrino().executeQuery(format("UPDATE delta.default.%s SET id = id + 100", tableName));
-
-            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName)).containsOnly(expected);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTrinoCanReadFromTableUpdatedByDatabricks()
-    {
-        testTrinoCanReadFromTableUpdatedByDatabricksWithCpIntervalSet(1);
-        testTrinoCanReadFromTableUpdatedByDatabricksWithCpIntervalSet(20);
-    }
-
-    private void testTrinoCanReadFromTableUpdatedByDatabricksWithCpIntervalSet(int interval)
-    {
-        String tableName = format("test_dl_create_table_partition_by_special_char_with_%d_partitions_%s", interval, randomNameSuffix());
-        String tableDirectory = "databricks-compatibility-test-" + tableName;
-
-        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(
-                row(101, "with-hyphen"),
-                row(102, "with.dot"),
-                row(103, "with:colon"),
-                row(104, "with/slash"),
-                row(105, "with\\backslash"),
-                row(106, "with=equal"),
-                row(107, "with?question"),
-                row(108, "with!exclamation"),
-                row(109, "with%percent"),
-                row(110, "with space"));
-
-        onDelta().executeQuery(format("CREATE TABLE default.%s " +
-                        "USING DELTA " +
-                        "OPTIONS (checkpointInterval = " + interval + ") " +
-                        "PARTITIONED BY (`col_name`) LOCATION 's3://%s/%s' AS " +
-                        "SELECT * FROM (VALUES " +
-                        "(1, 'with-hyphen')," +
-                        "(2, 'with.dot')," +
-                        "(3, 'with:colon')," +
-                        "(4, 'with/slash')," +
-                        "(5, 'with\\\\backslash')," +
-                        "(6, 'with=equal')," +
-                        "(7, 'with?question')," +
-                        "(8, 'with!exclamation')," +
-                        "(9, 'with%%percent')," +
-                        "(10, 'with space')" +
-                        ") t(id, col_name)",
-                tableName,
-                bucketName,
-                tableDirectory));
-
-        try {
-            onDelta().executeQuery(format("UPDATE default.%s SET id = id + 100", tableName));
-
-            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName)).containsOnly(expected);
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testTrinoCanReadFromTablePartitionChangedByDatabricks()
-    {
-        String tableName = "test_dl_create_table_partition_changed_by_databricks_" + randomNameSuffix();
-        String tableDirectory = "databricks-compatibility-test-" + tableName;
-
-        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(row(1, "part"));
-
-        onDelta().executeQuery(format("CREATE TABLE default.%s " +
-                        "USING DELTA " +
-                        "PARTITIONED BY (`original_part_col`) LOCATION 's3://%s/%s' AS " +
-                        "SELECT 1 AS original_part_col, 'part' AS new_part_col",
-                tableName,
-                bucketName,
-                tableDirectory));
-
-        try {
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
-
-            onDelta().executeQuery("REPLACE TABLE default." + tableName + " USING DELTA PARTITIONED BY (new_part_col) AS SELECT * FROM " + tableName);
-
-            // This 2nd SELECT query caused NPE when the connector had cache for partitions and the column was changed remotely
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testPartitionedByNonLowercaseColumn()
-    {
-        String tableName = "test_dl_partitioned_by_non_lowercase_" + randomNameSuffix();
-        String tableDirectory = "databricks-compatibility-test-" + tableName;
-
-        onDelta().executeQuery(format("CREATE TABLE default.%s " +
-                        "USING DELTA " +
-                        "PARTITIONED BY (`PART`) LOCATION 's3://%s/%s' AS " +
-                        "SELECT 1 AS data, 2 AS `PART`",
-                tableName,
-                bucketName,
-                tableDirectory));
-        try {
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(row(1, 2));
-
-            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (3, 4)");
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(row(1, 2), row(3, 4));
-
-            onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE data = 3");
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(row(1, 2));
-
-            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET part = 20");
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(row(1, 20));
-
-            onTrino().executeQuery("MERGE INTO delta.default." + tableName + " USING (SELECT 1 a) input ON true WHEN MATCHED THEN DELETE");
-            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).hasNoRows();
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksUpdates.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksUpdates.java
deleted file mode 100644
index a7b3024fb335..000000000000
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDatabricksUpdates.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.deltalake;
-
-import io.trino.tempto.assertions.QueryAssert;
-import io.trino.tempto.query.QueryResult;
-import io.trino.testng.services.Flaky;
-import org.testng.annotations.Test;
-
-import java.util.List;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
-import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
-import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
-import static io.trino.tests.product.utils.QueryExecutors.onDelta;
-import static io.trino.tests.product.utils.QueryExecutors.onTrino;
-import static java.lang.String.format;
-
-public class TestDeltaLakeDatabricksUpdates
-        extends BaseTestDeltaLakeS3Storage
-{
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testUpdateOnAppendOnlyTableFails()
-    {
-        String tableName = "test_update_on_append_only_table_fails_" + randomNameSuffix();
-        onDelta().executeQuery("" +
-                "CREATE TABLE default." + tableName +
-                "         (a INT, b INT)" +
-                "         USING delta " +
-                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
-                "         TBLPROPERTIES ('delta.appendOnly' = true)");
-
-        onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,11), (2, 12)");
-        assertQueryFailure(() -> onDelta().executeQuery("UPDATE default." + tableName + " SET a = a + 1"))
-                .hasMessageContaining("This table is configured to only allow appends");
-        assertQueryFailure(() -> onTrino().executeQuery("UPDATE default." + tableName + " SET a = a + 1"))
-                .hasMessageContaining("Cannot modify rows from a table with 'delta.appendOnly' set to true");
-
-        assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
-                .containsOnly(row(1, 11), row(2, 12));
-        onTrino().executeQuery("DROP TABLE " + tableName);
-    }
-
-    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
-    public void testUpdatesFromDatabricks()
-    {
-        String tableName = "test_updates_" + randomNameSuffix();
-
-        assertThat(onTrino().executeQuery("CREATE TABLE delta.default.\"" + tableName + "\" " +
-                "(id, value) " +
-                "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "') AS VALUES " +
-                "  (1, 'Poland')" +
-                ", (2, 'Germany')" +
-                ", (3, 'Romania')"))
-                .containsOnly(row(3));
-
-        try {
-            QueryResult databricksResult = onDelta().executeQuery(format("SELECT * FROM default.%s ORDER BY id", tableName));
-            QueryResult prestoResult = onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s\" ORDER BY id", tableName));
-            assertThat(databricksResult).containsExactly(toRows(prestoResult));
-
-            onDelta().executeQuery(format("UPDATE default.%s SET value = 'France' WHERE id = 2", tableName));
-            databricksResult = onDelta().executeQuery(format("SELECT * FROM default.%s ORDER BY id", tableName));
-            prestoResult = onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s\" ORDER BY id", tableName));
-            assertThat(databricksResult).containsExactly(toRows(prestoResult));
-
-            onDelta().executeQuery(format("UPDATE default.%s SET value = 'Spain' WHERE id = 2", tableName));
-            databricksResult = onDelta().executeQuery(format("SELECT * FROM default.%s ORDER BY id", tableName));
-            prestoResult = onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s\" ORDER BY id", tableName));
-            assertThat(databricksResult).containsExactly(toRows(prestoResult));
-
-            onDelta().executeQuery(format("UPDATE default.%s SET value = 'Portugal' WHERE id = 2", tableName));
-            databricksResult = onDelta().executeQuery(format("SELECT * FROM default.%s ORDER BY id", tableName));
-            prestoResult = onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s\" ORDER BY id", tableName));
-            assertThat(databricksResult).containsExactly(toRows(prestoResult));
-        }
-        finally {
-            dropDeltaTableWithRetry("default." + tableName);
-        }
-    }
-
-    private static List<QueryAssert.Row> toRows(QueryResult result)
-    {
-        return result.rows().stream()
-                .map(QueryAssert.Row::new)
-                .collect(toImmutableList());
-    }
-}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDeleteCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDeleteCompatibility.java
new file mode 100644
index 000000000000..e80609c6185a
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDeleteCompatibility.java
@@ -0,0 +1,588 @@
+/*
+ * Licensed 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 io.trino.tests.product.deltalake;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.tempto.BeforeMethodWithContext;
+import io.trino.tempto.assertions.QueryAssert.Row;
+import io.trino.testing.DataProviders;
+import io.trino.testng.services.Flaky;
+import io.trino.tests.product.deltalake.util.DatabricksVersion;
+import org.testng.SkipException;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_91;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getDatabricksRuntimeVersion;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTablePropertiesOnDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.entry;
+
+public class TestDeltaLakeDeleteCompatibility
+        extends BaseTestDeltaLakeS3Storage
+{
+    private Optional<DatabricksVersion> databricksRuntimeVersion;
+
+    @BeforeMethodWithContext
+    public void determineDatabricksVersion()
+    {
+        databricksRuntimeVersion = getDatabricksRuntimeVersion();
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
+    public void testDeleteOnEnforcedConstraintsReturnsRowsCount(boolean partitioned)
+    {
+        String tableName = "test_delete_push_down_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(v INT, p INT)" +
+                "USING delta " +
+                (partitioned ? "PARTITIONED BY (p)" : "") +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 10), (2, 10), (11, 20), (21, 30), (22, 30)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 10), (12, 20)");
+            if (partitioned) {
+                assertThat(onTrino().executeQuery("DELETE FROM default." + tableName + " WHERE p = 10"))
+                        .containsOnly(row(3));
+                assertThat(onTrino().executeQuery("DELETE FROM default." + tableName))
+                        .containsOnly(row(4));
+            }
+            else {
+                assertThat(onTrino().executeQuery("DELETE FROM default." + tableName))
+                        .containsOnly(row(7));
+            }
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName)).hasNoRows();
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testDeleteCompatibility()
+    {
+        String tableName = "test_delete_compatibility_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName + " (a int, b int)" +
+                " USING DELTA LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)");
+            onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE a % 2 = 0");
+
+            List<Row> expectedRows = ImmutableList.of(
+                    row(1, 2),
+                    row(3, 4),
+                    row(5, 6));
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeleteOnAppendOnlyTableFails()
+    {
+        String tableName = "test_delete_on_append_only_table_fails_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "         (a INT, b INT)" +
+                "         USING delta " +
+                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
+                "         TBLPROPERTIES ('delta.appendOnly' = true)");
+
+        onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,11), (2, 12)");
+        assertQueryFailure(() -> onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = 1"))
+                .hasMessageContaining("This table is configured to only allow appends");
+        assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM default." + tableName + " WHERE a = 1"))
+                .hasMessageContaining("Cannot modify rows from a table with 'delta.appendOnly' set to true");
+        // Whole table deletes should be disallowed as well
+        assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM default." + tableName))
+                .hasMessageContaining("Cannot modify rows from a table with 'delta.appendOnly' set to true");
+        assertQueryFailure(() -> onTrino().executeQuery("TRUNCATE TABLE delta.default." + tableName))
+                .hasMessageContaining("Cannot modify rows from a table with 'delta.appendOnly' set to true");
+
+        assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                .containsOnly(row(1, 11), row(2, 12));
+        onTrino().executeQuery("DROP TABLE " + tableName);
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeleteOnAppendOnlyWriterFeature()
+    {
+        String tableName = "test_delete_on_append_only_feature_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(a INT, b INT)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.minWriterVersion'='7', 'delta.appendOnly' = true)");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,11), (2, 12)");
+            assertThat(getTablePropertiesOnDelta("default", tableName))
+                    .contains(entry("delta.feature.appendOnly", "supported"))
+                    .contains(entry("delta.appendOnly", "true"));
+
+            assertQueryFailure(() -> onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = 1"))
+                    .hasMessageContaining("This table is configured to only allow appends");
+            assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE a = 1"))
+                    .hasMessageContaining("Cannot modify rows from a table with 'delta.appendOnly' set to true");
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(1, 11), row(2, 12));
+
+            // delta.feature.appendOnly still exists even after unsetting the property
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " UNSET TBLPROPERTIES ('delta.feature.appendOnly')");
+            assertThat(getTablePropertiesOnDelta("default", tableName))
+                    .contains(entry("delta.feature.appendOnly", "supported"))
+                    .contains(entry("delta.appendOnly", "true"));
+
+            // Disable delta.appendOnly property
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " SET TBLPROPERTIES ('delta.appendOnly'=false)");
+            assertThat(getTablePropertiesOnDelta("default", tableName))
+                    .contains(entry("delta.feature.appendOnly", "supported"))
+                    .contains(entry("delta.appendOnly", "false"));
+
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = 1");
+            onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE a = 2");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).hasNoRows();
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    // OSS Delta doesn't support TRUNCATE TABLE statement
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testTruncateTable()
+    {
+        String tableName = "test_truncate_table_" + randomNameSuffix();
+        onTrino().executeQuery("" +
+                "CREATE TABLE delta.default." + tableName +
+                "(a INT)" +
+                "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "')");
+        try {
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES 1, 2, 3");
+            onTrino().executeQuery("TRUNCATE TABLE delta.default." + tableName);
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName)).hasNoRows();
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES 4, 5, 6");
+            onDelta().executeQuery("TRUNCATE TABLE default." + tableName);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).hasNoRows();
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE delta.default." + tableName);
+        }
+    }
+
+    // Databricks 12.1 and OSS Delta 2.4.0 added support for deletion vectors
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingModeDataProvider")
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testDeletionVectors(String mode)
+    {
+        String tableName = "test_deletion_vectors_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "         (a INT, b INT)" +
+                "         USING delta " +
+                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
+                "         TBLPROPERTIES ('delta.enableDeletionVectors' = true, 'delta.columnMapping.mode' = '" + mode + "')");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,11), (2, 22)");
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = 2");
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(1, 11));
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1, 11));
+
+            // Reinsert the deleted row and verify that the row appears correctly
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (2, 22)");
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(1, 11), row(2, 22));
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1, 11), row(2, 22));
+
+            // Execute DELETE statement which doesn't delete any rows
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = -1");
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(1, 11), row(2, 22));
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1, 11), row(2, 22));
+
+            // Verify other statements
+            assertThat(onTrino().executeQuery("SHOW TABLES FROM delta.default"))
+                    .contains(row(tableName));
+            assertThat(onTrino().executeQuery("SELECT version, operation FROM delta.default.\"" + tableName + "$history\""))
+                    // Use 'contains' method because newer Databricks clusters execute OPTIMIZE statement in the background
+                    .contains(row(0, "CREATE TABLE"), row(1, "WRITE"), row(2, "DELETE"));
+            assertThat(onTrino().executeQuery("SELECT column_name FROM delta.information_schema.columns WHERE table_schema = 'default' AND table_name = '" + tableName + "'"))
+                    .contains(row("a"), row("b"));
+            assertThat(onTrino().executeQuery("SHOW COLUMNS FROM delta.default." + tableName))
+                    .contains(row("a", "integer", "", ""), row("b", "integer", "", ""));
+            assertThat(onTrino().executeQuery("DESCRIBE delta.default." + tableName))
+                    .contains(row("a", "integer", "", ""), row("b", "integer", "", ""));
+
+            // TODO https://github.com/trinodb/trino/issues/17063 Use Delta Deletion Vectors for row-level deletes
+            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (3, 33)"))
+                    .hasMessageContaining("Unsupported writer features: [deletionVectors]");
+            assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM delta.default." + tableName))
+                    .hasMessageContaining("Unsupported writer features: [deletionVectors]");
+            assertQueryFailure(() -> onTrino().executeQuery("UPDATE delta.default." + tableName + " SET a = 3"))
+                    .hasMessageContaining("Unsupported writer features: [deletionVectors]");
+            assertQueryFailure(() -> onTrino().executeQuery("MERGE INTO delta.default." + tableName + " t USING delta.default." + tableName + " s " +
+                    "ON (t.a = s.a) WHEN MATCHED THEN UPDATE SET b = -1"))
+                    .hasMessageContaining("Unsupported writer features: [deletionVectors]");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeletionVectorsWithRandomPrefix()
+    {
+        String tableName = "test_deletion_vectors_random_prefix_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(a INT, b INT)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
+                "TBLPROPERTIES ('delta.enableDeletionVectors' = true, 'delta.randomizeFilePrefixes' = true)");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 11), (2, 22)");
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = 2");
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(1, 11));
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1, 11));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDisableDeletionVectors()
+    {
+        String tableName = "test_deletion_vectors_random_prefix_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(a INT, b INT)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
+                "TBLPROPERTIES ('delta.enableDeletionVectors' = true)");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 11), (2, 22), (3, 33)");
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = 2");
+
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " SET TBLPROPERTIES ('delta.enableDeletionVectors' = false)");
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(1, 11), row(3, 33));
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1, 11), row(3, 33));
+
+            // Delete rows which already existed before disabling deletion vectors
+            onDelta().executeQuery("DELETE FROM default." + tableName);
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .hasNoRows();
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .hasNoRows();
+
+            // Insert new rows and delete it after disabling deletion vectors
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (4, 44), (5, 55)");
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = 4");
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(5, 55));
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(5, 55));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeletionVectorsWithCheckpointInterval()
+    {
+        String tableName = "test_deletion_vectors_random_prefix_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(a INT, b INT)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
+                "TBLPROPERTIES ('delta.enableDeletionVectors' = true, 'delta.checkpointInterval' = 1)");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 11), (2, 22)");
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = 2");
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(1, 11));
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1, 11));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeletionVectorsMergeDelete()
+    {
+        String tableName = "test_deletion_vectors_merge_delete_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(a INT)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
+                "TBLPROPERTIES ('delta.enableDeletionVectors' = true)");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " SELECT explode(sequence(1, 10))");
+            onDelta().executeQuery("MERGE INTO default." + tableName + " t USING default." + tableName + " s " +
+                    "ON (t.a = s.a) WHEN MATCHED AND t.a > 5 THEN DELETE");
+
+            List<Row> expected = ImmutableList.of(row(1), row(2), row(3), row(4), row(5));
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName)).contains(expected);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeletionVectorsLargeNumbers()
+    {
+        String tableName = "test_deletion_vectors_large_numbers_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(a INT)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
+                "TBLPROPERTIES ('delta.enableDeletionVectors' = true)");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " SELECT explode(sequence(1, 10000))");
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a > 1");
+
+            List<Row> expected = ImmutableList.of(row(1));
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName)).contains(expected);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS},
+            dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
+    public void testDeletionVectorsAcrossAddFile(boolean partitioned)
+    {
+        String tableName = "test_deletion_vectors_accross_add_file_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(a INT, b INT)" +
+                "USING delta " +
+                (partitioned ? "PARTITIONED BY (a)" : "") +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
+                "TBLPROPERTIES ('delta.enableDeletionVectors' = true)");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,11), (2,22)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3,33), (4,44)");
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = 2 OR a = 4");
+
+            List<Row> expected = ImmutableList.of(row(1, 11), row(3, 33));
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName)).containsOnly(expected);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).containsOnly(expected);
+
+            // Verify behavior when the query doesn't read non-partition columns
+            assertThat(onTrino().executeQuery("SELECT count(*) FROM delta.default." + tableName)).containsOnly(row(2));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testDeletionVectorsTruncateTable()
+    {
+        testDeletionVectorsDeleteAll(tableName -> {
+            if (databricksRuntimeVersion.isPresent()) {
+                onDelta().executeQuery("TRUNCATE TABLE default." + tableName);
+            }
+            else {
+                assertThatThrownBy(() -> onDelta().executeQuery("TRUNCATE TABLE default." + tableName))
+                        .hasMessageContaining("Table does not support truncates");
+                throw new SkipException("OSS Delta Lake doesn't support truncating tables with deletion vector");
+            }
+        });
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeletionVectorsDeleteFrom()
+    {
+        testDeletionVectorsDeleteAll(tableName -> onDelta().executeQuery("DELETE FROM default." + tableName));
+    }
+
+    private void testDeletionVectorsDeleteAll(Consumer<String> deleteRow)
+    {
+        String tableName = "test_deletion_vectors_delete_all_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(a INT)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
+                "TBLPROPERTIES ('delta.enableDeletionVectors' = true)");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " SELECT explode(sequence(1, 1000))");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).hasRowsCount(1000);
+
+            deleteRow.accept(tableName);
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName)).hasNoRows();
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).hasNoRows();
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeletionVectorsOptimize()
+    {
+        String tableName = "test_deletion_vectors_optimize_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(a INT, b INT)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
+                "TBLPROPERTIES ('delta.enableDeletionVectors' = true)");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,11), (2,22)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3,33), (4,44)");
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = 1 OR a = 3");
+
+            List<Row> expected = ImmutableList.of(row(2, 22), row(4, 44));
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
+
+            onDelta().executeQuery("OPTIMIZE default." + tableName);
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName)).contains(expected);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeletionVectorsAbsolutePath()
+    {
+        String baseTableName = "test_deletion_vectors_base_absolute_" + randomNameSuffix();
+        String tableName = "test_deletion_vectors_absolute_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + baseTableName +
+                "(a INT, b INT)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + baseTableName + "' " +
+                "TBLPROPERTIES ('delta.enableDeletionVectors' = true)");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + baseTableName + " VALUES (1,11), (2,22), (3,33), (4,44)");
+            onDelta().executeQuery("DELETE FROM default." + baseTableName + " WHERE a = 1 OR a = 3");
+
+            // The cloned table has 'p' (absolute path) storageType for deletion vector
+            onDelta().executeQuery("CREATE TABLE default." + tableName + " SHALLOW CLONE " + baseTableName);
+
+            List<Row> expected = ImmutableList.of(row(2, 22), row(4, 44));
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName)).contains(expected);
+            // TODO https://github.com/trinodb/trino/issues/17205 Fix below assertion when supporting absolute path
+            assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .hasMessageContaining("Failed to generate splits");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + baseTableName);
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeletionVectorsWithChangeDataFeed()
+    {
+        String tableName = "test_deletion_vectors_cdf_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "(a INT, b INT)" +
+                "USING delta " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
+                "TBLPROPERTIES ('delta.enableDeletionVectors' = true, 'delta.enableChangeDataFeed' = true)");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,11), (2,22), (3,33), (4,44)");
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE a = 1 OR a = 3");
+
+            assertThat(onDelta().executeQuery(
+                    "SELECT a, b, _change_type, _commit_version FROM table_changes('default." + tableName + "', 0)"))
+                    .containsOnly(
+                            row(1, 11, "insert", 1L),
+                            row(2, 22, "insert", 1L),
+                            row(3, 33, "insert", 1L),
+                            row(4, 44, "insert", 1L),
+                            row(1, 11, "delete", 2L),
+                            row(3, 33, "delete", 2L));
+
+            // TODO Fix table_changes function failure
+            assertQueryFailure(() -> onTrino().executeQuery("SELECT a, b, _change_type, _commit_version FROM TABLE(delta.system.table_changes('default', '" + tableName + "', 0))"))
+                    .hasMessageContaining("Change Data Feed is not enabled at version 2. Version contains 'remove' entries without 'cdc' entries");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @DataProvider
+    public Object[][] columnMappingModeDataProvider()
+    {
+        return new Object[][] {
+                {"none"},
+                {"name"},
+                {"id"}
+        };
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDropTableCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDropTableCompatibility.java
index badec3dd8a79..3a4c22644d5c 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDropTableCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeDropTableCompatibility.java
@@ -17,7 +17,7 @@
 import com.amazonaws.services.s3.model.ObjectListing;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.testng.services.Flaky;
 import io.trino.tests.product.hive.Engine;
 import org.testng.annotations.DataProvider;
@@ -48,7 +48,7 @@ public class TestDeltaLakeDropTableCompatibility
 
     private AmazonS3 s3;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setup()
     {
         super.setUp();
@@ -87,40 +87,34 @@ private void testDropTableAccuracy(Engine creator, Engine dropper, boolean expli
                 : Optional.empty();
 
         switch (creator) {
-            case TRINO:
-                onTrino().executeQuery(format("CREATE SCHEMA delta.%s WITH (location = '%s')", schemaName, schemaLocation));
-                break;
-            case DELTA:
-                onDelta().executeQuery(format("CREATE SCHEMA %s LOCATION \"%s\"", schemaName, schemaLocation));
-                break;
-            default:
-                throw new UnsupportedOperationException("Unsupported engine: " + creator);
+            case TRINO -> onTrino().executeQuery(format("CREATE SCHEMA delta.%s WITH (location = '%s')", schemaName, schemaLocation));
+            case DELTA -> onDelta().executeQuery(format("CREATE SCHEMA %s LOCATION \"%s\"", schemaName, schemaLocation));
+            default -> throw new UnsupportedOperationException("Unsupported engine: " + creator);
         }
         try {
             onTrino().executeQuery("USE delta." + schemaName);
             switch (creator) {
-                case TRINO:
-                    onTrino().executeQuery(format(
-                            "CREATE TABLE %s.%s (a, b) %s AS VALUES (1, 2), (2, 3), (3, 4)",
-                            schemaName,
-                            tableName,
-                            tableLocation.map(location -> "WITH (location = '" + location + "')").orElse("")));
-                    break;
-                case DELTA:
-                    onDelta().executeQuery(format(
-                            "CREATE TABLE %s.%s USING DELTA %s AS VALUES (1, 2), (2, 3), (3, 4)",
-                            schemaName,
-                            tableName,
-                            tableLocation.map(location -> "LOCATION \"" + location + "\"").orElse("")));
-                    break;
-                default:
-                    throw new UnsupportedOperationException("Unsupported engine: " + creator);
+                case TRINO -> onTrino().executeQuery(format(
+                        "CREATE TABLE %s.%s (a, b) %s AS VALUES (1, 2), (2, 3), (3, 4)",
+                        schemaName,
+                        tableName,
+                        tableLocation.map(location -> "WITH (location = '" + location + "')").orElse("")));
+                case DELTA -> onDelta().executeQuery(format(
+                        "CREATE TABLE %s.%s USING DELTA %s AS VALUES (1, 2), (2, 3), (3, 4)",
+                        schemaName,
+                        tableName,
+                        tableLocation.map(location -> "LOCATION \"" + location + "\"").orElse("")));
+                default -> throw new UnsupportedOperationException("Unsupported engine: " + creator);
             }
 
             ObjectListing tableFiles = s3.listObjects(bucketName, "databricks-compatibility-test-" + schemaName + "/" + tableName);
             assertThat(tableFiles.getObjectSummaries()).isNotEmpty();
 
-            dropper.queryExecutor().executeQuery("DROP TABLE " + schemaName + "." + tableName);
+            switch (dropper) {
+                case DELTA -> dropDeltaTableWithRetry(schemaName + "." + tableName);
+                case TRINO -> onTrino().executeQuery("DROP TABLE " + schemaName + "." + tableName);
+                default -> throw new UnsupportedOperationException("Unsupported engine: " + dropper);
+            }
             tableFiles = s3.listObjects(bucketName, "databricks-compatibility-test-" + schemaName + "/" + tableName);
             if (explicitLocation) {
                 assertThat(tableFiles.getObjectSummaries()).isNotEmpty();
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeGcs.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeGcs.java
index 53e4ac1a27ae..269048e370af 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeGcs.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeGcs.java
@@ -19,12 +19,12 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_GCS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDeltaLakeGcs
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeIdentityColumnCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeIdentityColumnCompatibility.java
new file mode 100644
index 000000000000..0bd27a8cea56
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeIdentityColumnCompatibility.java
@@ -0,0 +1,303 @@
+/*
+ * Licensed 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 io.trino.tests.product.deltalake;
+
+import io.trino.tempto.assertions.QueryAssert;
+import io.trino.testng.services.Flaky;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_91;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getColumnCommentOnDelta;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getColumnNamesOnDelta;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getTableCommentOnDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDeltaLakeIdentityColumnCompatibility
+        extends BaseTestDeltaLakeS3Storage
+{
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testIdentityColumn()
+    {
+        // Databricks 7.3 & 9.1 and OSS Delta Lake don't support identity columns https://github.com/delta-io/delta/issues/1100
+        String tableName = "test_identity_column_" + randomNameSuffix();
+        String tableDirectory = "databricks-compatibility-test-" + tableName;
+
+        onDelta().executeQuery(format(
+                """
+                CREATE TABLE default.%s (a INT, b BIGINT GENERATED ALWAYS AS IDENTITY)
+                USING DELTA LOCATION 's3://%s/%s'
+                """,
+                tableName,
+                bucketName,
+                tableDirectory));
+        try {
+            onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".b IS 'test column comment'");
+            assertThat(getColumnCommentOnDelta("default", tableName, "b")).isEqualTo("test column comment");
+
+            onTrino().executeQuery("COMMENT ON TABLE delta.default." + tableName + " IS 'test table comment'");
+            assertThat(getTableCommentOnDelta("default", tableName)).isEqualTo("test table comment");
+
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN c INT");
+            assertThat(getColumnNamesOnDelta("default", tableName)).containsExactly("a", "b", "c");
+            // Don't execute other column operations because column mapping mode 'none' doesn't support it. See other test methods in this class.
+
+            assertThat((String) onDelta().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
+                    .contains("b BIGINT GENERATED ALWAYS AS IDENTITY");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " (a, c) VALUES (0, 2)");
+
+            QueryAssert.Row expected = row(0, 1, 2);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).containsOnly(expected);
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName)).containsOnly(expected);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testIdentityColumnTableFeature()
+    {
+        String tableName = "test_identity_column_feature_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(data INT, col_identity BIGINT GENERATED ALWAYS AS IDENTITY)" +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/" + "databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.feature.identityColumns'='supported')");
+        try {
+            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 1)"))
+                    .hasMessageMatching(".* Writing to tables with identity columns is not supported");
+            assertQueryFailure(() -> onTrino().executeQuery("UPDATE delta.default." + tableName + " SET data = 1"))
+                    .hasMessageMatching(".* Writing to tables with identity columns is not supported");
+            assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM delta.default." + tableName))
+                    .hasMessageMatching(".* Writing to tables with identity columns is not supported");
+            assertQueryFailure(() -> onTrino().executeQuery("MERGE INTO delta.default." + tableName + " t USING delta.default." + tableName + " s " +
+                    "ON (t.data = s.data) WHEN MATCHED THEN UPDATE SET data = 1"))
+                    .hasMessageMatching(".* Writing to tables with identity columns is not supported");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testWritesToTableWithIdentityColumnFails()
+    {
+        String tableName = "test_writes_into_table_with_identity_column_" + randomNameSuffix();
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(data INT, col_identity BIGINT GENERATED ALWAYS AS IDENTITY)" +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " (data) VALUES (1), (2), (3)");
+
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(1, 1), row(2, 2), row(3, 3));
+
+            // Disallowing all statements just in case though some statements may not unrelated to identity columns
+            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (4, 4)"))
+                    .hasMessageContaining("Writing to tables with identity columns is not supported");
+            assertQueryFailure(() -> onTrino().executeQuery("UPDATE delta.default." + tableName + " SET data = 3"))
+                    .hasMessageContaining("Writing to tables with identity columns is not supported");
+            assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM delta.default." + tableName))
+                    .hasMessageContaining("Writing to tables with identity columns is not supported");
+            assertQueryFailure(() -> onTrino().executeQuery("MERGE INTO delta.default." + tableName + " t USING delta.default." + tableName + " s " +
+                    "ON (t.data = s.data) WHEN MATCHED THEN UPDATE SET data = 1"))
+                    .hasMessageContaining("Writing to tables with identity columns is not supported");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testRenameIdentityColumn(String mode)
+    {
+        String tableName = "test_rename_identity_column_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(data INT, col_identity BIGINT GENERATED ALWAYS AS IDENTITY)" +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/" + "databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.columnMapping.mode'='" + mode + "')");
+        try {
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " RENAME COLUMN col_identity TO delta_col_identity");
+            assertThat((String) onDelta().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
+                    .contains("delta_col_identity BIGINT GENERATED ALWAYS AS IDENTITY");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " (data) VALUES 10");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(10, 1));
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(10, 1));
+
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " RENAME COLUMN delta_col_identity TO trino_col_identity");
+            assertThat((String) onDelta().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
+                    .contains("trino_col_identity BIGINT GENERATED ALWAYS AS IDENTITY");
+            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " (data) VALUES (1)"))
+                    .hasMessageContaining("Writing to tables with identity columns is not supported");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " (data) VALUES 20");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(10, 1), row(20, 2));
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(10, 1), row(20, 2));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testDropIdentityColumn(String mode)
+    {
+        String tableName = "test_drop_identity_column_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(data INT, first_identity BIGINT GENERATED ALWAYS AS IDENTITY, second_identity BIGINT GENERATED ALWAYS AS IDENTITY)" +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/" + "databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.columnMapping.mode'='" + mode + "')");
+        try {
+            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " (data) VALUES (1)"))
+                    .hasMessageContaining("Writing to tables with identity columns is not supported");
+
+            onDelta().executeQuery("ALTER TABLE default." + tableName + " DROP COLUMN first_identity");
+            assertThat(getColumnNamesOnDelta("default", tableName))
+                    .containsExactly("data", "second_identity");
+            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " (data) VALUES (1)"))
+                    .hasMessageContaining("Writing to tables with identity columns is not supported");
+
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " DROP COLUMN second_identity");
+            assertThat(getColumnNamesOnDelta("default", tableName))
+                    .containsExactly("data");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES 10");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES 20");
+
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(10), row(20));
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(10), row(20));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testVacuumProcedureWithIdentityColumn()
+    {
+        String tableName = "test_vacuum_identity_column_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(data INT, col_identity BIGINT GENERATED ALWAYS AS IDENTITY)" +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/" + "databricks-compatibility-test-" + tableName + "'");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " (data) VALUES 10");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " (data) VALUES 20");
+            onDelta().executeQuery("DELETE FROM default." + tableName + " WHERE data = 20");
+
+            onTrino().executeQuery("SET SESSION delta.vacuum_min_retention = '0s'");
+            onTrino().executeQuery("CALL delta.system.vacuum('default', '" + tableName + "', '0s')");
+
+            assertThat((String) onDelta().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
+                    .contains("col_identity BIGINT GENERATED ALWAYS AS IDENTITY");
+
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(10, 1));
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(10, 1));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testOptimizeProcedureWithIdentityColumn()
+    {
+        String tableName = "test_optimize_identity_column_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(data INT, col_identity BIGINT GENERATED ALWAYS AS IDENTITY)" +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/" + "databricks-compatibility-test-" + tableName + "'");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " (data) VALUES 10");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " (data) VALUES 20");
+
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " EXECUTE OPTIMIZE");
+
+            assertThat((String) onDelta().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
+                    .contains("col_identity BIGINT GENERATED ALWAYS AS IDENTITY");
+
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(row(10, 1), row(20, 2));
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(row(10, 1), row(20, 2));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testIdentityColumnCheckpointInterval()
+    {
+        String tableName = "test_identity_column_checkpoint_interval_" + randomNameSuffix();
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(data INT, col_identity BIGINT GENERATED ALWAYS AS IDENTITY)" +
+                "USING DELTA " +
+                "LOCATION 's3://" + bucketName + "/" + "databricks-compatibility-test-" + tableName + "'" +
+                "TBLPROPERTIES ('delta.checkpointInterval' = 1)");
+        try {
+            onTrino().executeQuery("COMMENT ON COLUMN delta.default." + tableName + ".col_identity IS 'test column comment'");
+            assertThat((String) onDelta().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
+                    .contains("col_identity BIGINT GENERATED ALWAYS AS IDENTITY");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @DataProvider
+    public Object[][] columnMappingDataProvider()
+    {
+        return new Object[][] {
+                {"id"},
+                {"name"},
+        };
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeInsertCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeInsertCompatibility.java
new file mode 100644
index 000000000000..4fa678d210b1
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeInsertCompatibility.java
@@ -0,0 +1,492 @@
+/*
+ * Licensed 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 io.trino.tests.product.deltalake;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.tempto.BeforeMethodWithContext;
+import io.trino.tempto.assertions.QueryAssert.Row;
+import io.trino.testng.services.Flaky;
+import io.trino.tests.product.deltalake.util.DatabricksVersion;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_104;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_113;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_91;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.deltalake.util.DatabricksVersion.DATABRICKS_104_RUNTIME_VERSION;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getDatabricksRuntimeVersion;
+import static io.trino.tests.product.utils.QueryExecutors.onDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDeltaLakeInsertCompatibility
+        extends BaseTestDeltaLakeS3Storage
+{
+    private Optional<DatabricksVersion> databricksRuntimeVersion;
+
+    @BeforeMethodWithContext
+    public void setup()
+    {
+        super.setUp();
+        databricksRuntimeVersion = getDatabricksRuntimeVersion();
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_104, DELTA_LAKE_DATABRICKS_113, DELTA_LAKE_DATABRICKS_122, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testInsertCompatibility()
+    {
+        String tableName = "test_dl_insert_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "         (a_number INT, a_string STRING)" +
+                "         USING delta " +
+                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,'ala'), (2, 'kota')");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'psa')");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (4, 'lwa'), (5, 'jeza')");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (6, 'wilka')");
+
+            List<Row> expectedRows = ImmutableList.of(
+                    row(1, "ala"),
+                    row(2, "kota"),
+                    row(3, "psa"),
+                    row(4, "lwa"),
+                    row(5, "jeza"),
+                    row(6, "wilka"));
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_104, DELTA_LAKE_DATABRICKS_113, DELTA_LAKE_DATABRICKS_122, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testPartitionedInsertCompatibility()
+    {
+        String tableName = "test_dl_partitioned_insert_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "         (a_number INT, a_string STRING)" +
+                "         USING delta " +
+                "         PARTITIONED BY (a_number)" +
+                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,'ala'), (2, 'kota')");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (3, 'osla')");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (null, 'mysz')");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (3, 'psa'), (4, 'bobra')");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (4, 'lwa'), (5, 'jeza')");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (null, 'kon')");
+
+            List<Row> expectedRows = ImmutableList.of(
+                    row(1, "ala"),
+                    row(2, "kota"),
+                    row(3, "osla"),
+                    row(3, "psa"),
+                    row(4, "bobra"),
+                    row(4, "lwa"),
+                    row(5, "jeza"),
+                    row(null, "mysz"),
+                    row(null, "kon"));
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+
+            assertThat(onTrino().executeQuery("SELECT \"$path\" FROM delta.default." + tableName + " WHERE a_number IS NULL").column(1))
+                    .hasSize(2)
+                    .allMatch(path -> ((String) path).contains("/a_number=__HIVE_DEFAULT_PARTITION__/"));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_91, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testTimestampInsertCompatibility()
+    {
+        String tableName = "test_dl_timestamp_ntz_insert_" + randomNameSuffix();
+
+        onTrino().executeQuery("" +
+                               "CREATE TABLE delta.default." + tableName +
+                               "(id INT, ts TIMESTAMP(6))" +
+                               "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "')");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES" +
+                                   "(1, TIMESTAMP '0001-01-01 00:00:00.000')," +
+                                   "(2, TIMESTAMP '2023-01-02 01:02:03.999')");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES" +
+                                   "(3, TIMESTAMP '2023-03-04 01:02:03.999')," +
+                                   "(4, TIMESTAMP '9999-12-31 23:59:59.999')");
+
+            assertThat(onDelta().executeQuery("SELECT id, date_format(ts, \"yyyy-MM-dd HH:mm:ss.SSS\") FROM default." + tableName))
+                    .containsOnly(
+                            row(1, databricksRuntimeVersion.isPresent() ? "0001-01-03 00:00:00.000" : "0001-01-01 00:00:00.000"), // Databricks returns incorrect results
+                            row(2, "2023-01-02 01:02:03.999"),
+                            row(3, "2023-03-04 01:02:03.999"),
+                            row(4, "9999-12-31 23:59:59.999"));
+            assertThat(onTrino().executeQuery("SELECT id, format_datetime(ts, 'yyyy-MM-dd HH:mm:ss.SSS') FROM delta.default." + tableName))
+                    .containsOnly(
+                            row(1, "0001-01-01 00:00:00.000"),
+                            row(2, "2023-01-02 01:02:03.999"),
+                            row(3, "2023-03-04 01:02:03.999"),
+                            row(4, "9999-12-31 23:59:59.999"));
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE delta.default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTimestampWithTimeZonePartitionedInsertCompatibility()
+    {
+        String tableName = "test_dl_timestamp_tz_partitioned_insert_" + randomNameSuffix();
+
+        onTrino().executeQuery("" +
+                "CREATE TABLE delta.default." + tableName +
+                "(id INT, part TIMESTAMP WITH TIME ZONE)" +
+                "WITH (partitioned_by = ARRAY['part'], location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "')");
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES" +
+                    "(1, TIMESTAMP '0001-01-01 00:00:00.000 UTC')," +
+                    "(2, TIMESTAMP '2023-01-02 01:02:03.999 +01:00')");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES" +
+                    "(3, TIMESTAMP '2023-03-04 01:02:03.999 -01:00')," +
+                    "(4, TIMESTAMP '9999-12-31 23:59:59.999 UTC')");
+
+            List<Row> expectedRows = ImmutableList.<Row>builder()
+                    .add(row(1, "0001-01-01 00:00:00.000"))
+                    .add(row(2, "2023-01-02 00:02:03.999"))
+                    .add(row(3, "2023-03-04 02:02:03.999"))
+                    .add(row(4, "9999-12-31 23:59:59.999"))
+                    .build();
+
+            assertThat(onDelta().executeQuery("SELECT id, date_format(part, \"yyyy-MM-dd HH:mm:ss.SSS\") FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT id, format_datetime(part, 'yyyy-MM-dd HH:mm:ss.SSS') FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+
+            assertThat((String) onTrino().executeQuery("SELECT \"$path\" FROM delta.default." + tableName + " WHERE id = 1").getOnlyValue())
+                    .contains("/part=0001-01-01 00%3A00%3A00/");
+            assertThat((String) onTrino().executeQuery("SELECT \"$path\" FROM delta.default." + tableName + " WHERE id = 2").getOnlyValue())
+                    .contains("/part=2023-01-02 00%3A02%3A03.999/");
+            assertThat((String) onTrino().executeQuery("SELECT \"$path\" FROM delta.default." + tableName + " WHERE id = 3").getOnlyValue())
+                    .contains("/part=2023-03-04 02%3A02%3A03.999/");
+            assertThat((String) onTrino().executeQuery("SELECT \"$path\" FROM delta.default." + tableName + " WHERE id = 4").getOnlyValue())
+                    .contains("/part=9999-12-31 23%3A59%3A59.999/");
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE delta.default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoPartitionedDifferentOrderInsertCompatibility()
+    {
+        String tableName = "test_dl_trino_partitioned_different_order_insert_" + randomNameSuffix();
+
+        onTrino().executeQuery("" +
+                "CREATE TABLE delta.default." + tableName +
+                "         (a_number INT, first VARCHAR, second VARCHAR)" +
+                "         WITH (" +
+                "         partitioned_by = ARRAY['second', 'first']," +
+                "         location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "')");
+
+        try {
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, 'first', 'second')");
+
+            List<Row> expectedRows = ImmutableList.of(row(1, "first", "second"));
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE delta.default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testDeltaPartitionedDifferentOrderInsertCompatibility()
+    {
+        String tableName = "test_dl_delta_partitioned_different_order_insert_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "         (a_number INT, first STRING, second STRING)" +
+                "         USING delta " +
+                "         PARTITIONED BY (second, first)" +
+                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 'first', 'second')");
+
+            List<Row> expectedRows = ImmutableList.of(row(1, "first", "second"));
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testInsertNonLowercaseColumnsCompatibility()
+    {
+        String tableName = "test_dl_insert_nonlowercase_columns_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "         (lower_case_string STRING, UPPER_CASE_STRING STRING, MiXeD_CaSe_StRiNg STRING)" +
+                "         USING delta " +
+                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('databricks', 'DATABRICKS', 'DaTaBrIcKs'), ('databricks', 'DATABRICKS', NULL)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (NULL, NULL, 'DaTaBrIcKs'), (NULL, NULL, NULL)");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES ('trino', 'TRINO', 'TrInO'), ('trino', 'TRINO', NULL)");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (NULL, NULL, 'TrInO'), (NULL, NULL, NULL)");
+
+            List<Row> expectedRows = ImmutableList.of(
+                    row("databricks", "DATABRICKS", "DaTaBrIcKs"),
+                    row("databricks", "DATABRICKS", null),
+                    row(null, null, "DaTaBrIcKs"),
+                    row(null, null, null),
+                    row("trino", "TRINO", "TrInO"),
+                    row("trino", "TRINO", null),
+                    row(null, null, "TrInO"),
+                    row(null, null, null));
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testInsertNestedNonLowercaseColumnsCompatibility()
+    {
+        String tableName = "test_dl_insert_nested_nonlowercase_columns_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "         (an_int INT, nested STRUCT<lower_case_string: STRING, UPPER_CASE_STRING: STRING, MiXeD_CaSe_StRiNg: STRING>)" +
+                "         USING delta " +
+                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1, struct('databricks', 'DATABRICKS', 'DaTaBrIcKs')), (2, struct('databricks', 'DATABRICKS', NULL))");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES " +
+                    "(3, struct(NULL, NULL, 'DaTaBrIcKs'))," +
+                    "(4, struct(NULL, NULL, NULL))");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (10, ROW('trino', 'TRINO', 'TrInO')), (20, ROW('trino', 'TRINO', NULL))");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (30, ROW(NULL, NULL, 'TrInO')), (40, ROW(NULL, NULL, NULL))");
+
+            List<Row> expectedRows = ImmutableList.of(
+                    row(1, "databricks", "DATABRICKS", "DaTaBrIcKs"),
+                    row(2, "databricks", "DATABRICKS", null),
+                    row(3, null, null, "DaTaBrIcKs"),
+                    row(4, null, null, null),
+                    row(10, "trino", "TRINO", "TrInO"),
+                    row(20, "trino", "TRINO", null),
+                    row(30, null, null, "TrInO"),
+                    row(40, null, null, null));
+
+            assertThat(onDelta().executeQuery("SELECT an_int, nested.lower_case_string, nested.UPPER_CASE_STRING, nested.MiXeD_CaSe_StRiNg FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT an_int, nested.lower_case_string, nested.UPPER_CASE_STRING, nested.MiXeD_CaSe_StRiNg FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testPartitionedInsertNonLowercaseColumnsCompatibility()
+    {
+        String tableName = "test_dl_partitioned_insert_nonlowercase_columns" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "         (lower_case_string STRING, UPPER_CASE_STRING STRING, MiXeD_CaSe_StRiNg STRING)" +
+                "         USING delta " +
+                "         PARTITIONED BY (MiXeD_CaSe_StRiNg)" +
+                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+        try {
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES ('databricks', 'DATABRICKS', 'DaTaBrIcKs'), ('databricks', 'DATABRICKS', NULL)");
+            onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (NULL, NULL, 'DaTaBrIcKs'), (NULL, NULL, NULL)");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES ('trino', 'TRINO', 'TrInO'), ('trino', 'TRINO', NULL)");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (NULL, NULL, 'TrInO'), (NULL, NULL, NULL)");
+
+            List<Row> expectedRows = ImmutableList.of(
+                    row("databricks", "DATABRICKS", "DaTaBrIcKs"),
+                    row("databricks", "DATABRICKS", null),
+                    row(null, null, "DaTaBrIcKs"),
+                    row(null, null, null),
+                    row("trino", "TRINO", "TrInO"),
+                    row("trino", "TRINO", null),
+                    row(null, null, "TrInO"),
+                    row(null, null, null));
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    /**
+     * Smoke test compression when writing to a Delta table. It's verified that writer doesn't fail and reads succeed,
+     * but it's not verified that compression actually takes place.
+     */
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS}, dataProvider = "compressionCodecs")
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testCompression(String compressionCodec)
+    {
+        String tableName = "test_compression_" + compressionCodec + "_" + randomNameSuffix();
+        String trinoTableName = "delta.default." + tableName;
+        String location = "s3://" + bucketName + "/databricks-compatibility-test-" + tableName;
+
+        onTrino().executeQuery("CREATE TABLE " + trinoTableName + " WITH (location = '" + location + "') " +
+                "AS TABLE tpch.tiny.nation WITH NO DATA");
+
+        try {
+            if ("LZ4".equals(compressionCodec)) {
+                // TODO (https://github.com/trinodb/trino/issues/9142) LZ4 is not supported with native Parquet writer
+                assertQueryFailure(() -> onTrino().executeQuery("SET SESSION delta.compression_codec = '" + compressionCodec + "'"))
+                        .hasMessageMatching("Query failed .* Unsupported codec: LZ4");
+            }
+            else {
+                onTrino().executeQuery("SET SESSION delta.compression_codec = '" + compressionCodec + "'");
+
+                onTrino().executeQuery("INSERT INTO " + trinoTableName + " TABLE tpch.tiny.nation");
+                List<Row> expected = onTrino().executeQuery("TABLE tpch.tiny.nation").rows().stream()
+                        .map(row -> row(row.toArray()))
+                        .collect(toImmutableList());
+                assertThat(onTrino().executeQuery("SELECT * FROM " + trinoTableName))
+                        .containsOnly(expected);
+
+                if ("ZSTD".equals(compressionCodec) && databricksRuntimeVersion.orElseThrow().isOlderThan(DATABRICKS_104_RUNTIME_VERSION)) {
+                    assertQueryFailure(() -> onDelta().executeQuery("SELECT * FROM default." + tableName))
+                            .hasMessageContaining("java.lang.ClassNotFoundException: org.apache.hadoop.io.compress.ZStandardCodec");
+                }
+                else {
+                    assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                            .containsOnly(expected);
+                }
+            }
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE " + trinoTableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void verifyCompressionCodecsDataProvider()
+    {
+        assertThat(onTrino().executeQuery("SHOW SESSION LIKE 'delta.compression_codec'"))
+                .containsOnly(row(
+                        "delta.compression_codec",
+                        "SNAPPY",
+                        "SNAPPY",
+                        "varchar",
+                        "Compression codec to use when writing new data files. Possible values: " +
+                                Stream.of(compressionCodecs())
+                                        .map(arguments -> (String) getOnlyElement(asList(arguments)))
+                                        .collect(toImmutableList())));
+    }
+
+    @DataProvider
+    public Object[][] compressionCodecs()
+    {
+        return new Object[][] {
+                {"NONE"},
+                {"SNAPPY"},
+                {"LZ4"},
+                {"ZSTD"},
+                {"GZIP"},
+        };
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testWritesToTableWithGeneratedColumnFails()
+    {
+        String tableName = "test_writes_into_table_with_generated_column_" + randomNameSuffix();
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + tableName + " (a INT, b BOOLEAN GENERATED ALWAYS AS (CAST(true AS BOOLEAN))) " +
+                    "USING DELTA " +
+                    "LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'");
+
+            onDelta().executeQuery("INSERT INTO default." + tableName + " (a) VALUES (1), (2), (3)");
+
+            assertThat(onTrino().executeQuery("SELECT a, b FROM " + tableName))
+                    .containsOnly(row(1, true), row(2, true), row(3, true));
+
+            // Disallowing all statements just in case though some statements may not unrelated to generated columns
+            assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (1, false)"))
+                    .hasMessageContaining("Writing to tables with generated columns is not supported");
+            assertQueryFailure(() -> onTrino().executeQuery("UPDATE delta.default." + tableName + " SET a = 3 WHERE b = true"))
+                    .hasMessageContaining("Writing to tables with generated columns is not supported");
+            assertQueryFailure(() -> onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE a = 3"))
+                    .hasMessageContaining("Writing to tables with generated columns is not supported");
+            assertQueryFailure(() -> onTrino().executeQuery("MERGE INTO delta.default." + tableName + " t USING delta.default." + tableName + " s " +
+                    "ON (t.a = s.a) WHEN MATCHED THEN UPDATE SET b = false"))
+                    .hasMessageContaining("Writing to tables with generated columns is not supported");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeJmx.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeJmx.java
index 60fcb8d1fb55..fcd2dfb578c2 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeJmx.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeJmx.java
@@ -18,13 +18,13 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDeltaLakeJmx
         extends ProductTest
@@ -34,9 +34,10 @@ public class TestDeltaLakeJmx
     public void testJmxTablesExposedByDeltaLakeConnectorBackedByGlueMetastore()
     {
         assertThat(onTrino().executeQuery("SHOW TABLES IN jmx.current LIKE '%name=delta%'")).containsOnly(
+                row("io.trino.hdfs:name=delta,type=trinohdfsfilesystemstats"),
                 row("io.trino.plugin.hive.metastore.cache:name=delta,type=cachinghivemetastore"),
                 row("io.trino.plugin.hive.metastore.glue:name=delta,type=gluehivemetastore"),
-                row("io.trino.plugin.hive.s3:name=delta,type=trinos3filesystem"),
+                row("io.trino.hdfs.s3:name=delta,type=trinos3filesystem"),
                 row("io.trino.plugin.hive:catalog=delta,name=delta,type=fileformatdatasourcestats"),
                 row("trino.plugin.deltalake.transactionlog:catalog=delta,name=delta,type=transactionlogaccess"));
     }
@@ -45,9 +46,10 @@ public void testJmxTablesExposedByDeltaLakeConnectorBackedByGlueMetastore()
     public void testJmxTablesExposedByDeltaLakeConnectorBackedByThriftMetastore()
     {
         assertThat(onTrino().executeQuery("SHOW TABLES IN jmx.current LIKE '%name=delta%'")).containsOnly(
+                row("io.trino.hdfs:name=delta,type=trinohdfsfilesystemstats"),
                 row("io.trino.plugin.hive.metastore.cache:name=delta,type=cachinghivemetastore"),
                 row("io.trino.plugin.hive.metastore.thrift:name=delta,type=thrifthivemetastore"),
-                row("io.trino.plugin.hive.s3:name=delta,type=trinos3filesystem"),
+                row("io.trino.hdfs.s3:name=delta,type=trinos3filesystem"),
                 row("io.trino.plugin.hive:catalog=delta,name=delta,type=fileformatdatasourcestats"),
                 row("trino.plugin.deltalake.transactionlog:catalog=delta,name=delta,type=transactionlogaccess"));
     }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeOssDeltaLakeMinioReads.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeOssDeltaLakeMinioReads.java
index 9d84079e24e2..3f4a8a85baf9 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeOssDeltaLakeMinioReads.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeOssDeltaLakeMinioReads.java
@@ -33,6 +33,6 @@ public TestDeltaLakeOssDeltaLakeMinioReads()
     public void testReadRegionTable()
     {
         super.testReadRegionTable();
-        assertNotificationsCount(NOTIFICATIONS_TABLE, OBJECT_ACCESSED_GET, tableName + "/part-00000-274dcbf4-d64c-43ea-8eb7-e153feac98ce-c000.snappy.parquet", 2);
+        assertNotificationsCount(NOTIFICATIONS_TABLE, OBJECT_ACCESSED_GET, tableName + "/part-00000-274dcbf4-d64c-43ea-8eb7-e153feac98ce-c000.snappy.parquet", 1);
     }
 }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakePartitioningCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakePartitioningCompatibility.java
new file mode 100644
index 000000000000..cece11e8b780
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakePartitioningCompatibility.java
@@ -0,0 +1,411 @@
+/*
+ * Licensed 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 io.trino.tests.product.deltalake;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.tempto.assertions.QueryAssert;
+import org.testng.annotations.Test;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.utils.QueryExecutors.onDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDeltaLakePartitioningCompatibility
+        extends BaseTestDeltaLakeS3Storage
+{
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testSparkCanReadFromCtasTableCreatedByTrinoWithSpecialCharactersInPartitioningColumn()
+    {
+        testSparkCanReadFromCtasTableCreatedByTrinoWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(1);
+        testSparkCanReadFromCtasTableCreatedByTrinoWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(20);
+    }
+
+    private void testSparkCanReadFromCtasTableCreatedByTrinoWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(int interval)
+    {
+        String tableName = format("test_dl_create_table_partition_by_special_char_with_%d_partitions_%s", interval, randomNameSuffix());
+        String tableDirectory = "delta-compatibility-test-" + tableName;
+
+        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(
+                row(1, "with-hyphen"),
+                row(2, "with.dot"),
+                row(3, "with:colon"),
+                row(4, "with/slash"),
+                row(5, "with\\\\backslash"),
+                row(6, "with=equal"),
+                row(7, "with?question"),
+                row(8, "with!exclamation"),
+                row(9, "with%percent"),
+                row(10, "with space"));
+
+        onTrino().executeQuery(format("CREATE TABLE delta.default.%s (id, col_name)" +
+                        "WITH(location = 's3://%s/%s', partitioned_by = ARRAY['col_name'], checkpoint_interval = " + interval + ") " +
+                        "AS VALUES " +
+                        "(1, 'with-hyphen')," +
+                        "(2, 'with.dot')," +
+                        "(3, 'with:colon')," +
+                        "(4, 'with/slash')," +
+                        "(5, 'with\\\\backslash')," +
+                        "(6, 'with=equal')," +
+                        "(7, 'with?question')," +
+                        "(8, 'with!exclamation')," +
+                        "(9, 'with%%percent')," +
+                        "(10, 'with space')",
+                tableName,
+                bucketName,
+                tableDirectory));
+
+        try {
+            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName)).containsOnly(expected);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoCanReadFromCtasTableCreatedBySparkWithSpecialCharactersInPartitioningColumn()
+    {
+        testTrinoCanReadFromCtasTableCreatedBySparkWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(1);
+        testTrinoCanReadFromCtasTableCreatedBySparkWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(20);
+    }
+
+    private void testTrinoCanReadFromCtasTableCreatedBySparkWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(int interval)
+    {
+        String tableName = format("test_dl_create_table_partition_by_special_char_with_%d_partitions_%s", interval, randomNameSuffix());
+        String tableDirectory = "delta-compatibility-test-" + tableName;
+
+        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(
+                row(1, "with-hyphen"),
+                row(2, "with.dot"),
+                row(3, "with:colon"),
+                row(4, "with/slash"),
+                row(5, "with\\backslash"),
+                row(6, "with=equal"),
+                row(7, "with?question"),
+                row(8, "with!exclamation"),
+                row(9, "with%percent"),
+                row(10, "with space"));
+
+        onDelta().executeQuery(format("CREATE TABLE default.%s " +
+                        "USING DELTA " +
+                        "OPTIONS (checkpointInterval = " + interval + ") " +
+                        "PARTITIONED BY (`col_name`) LOCATION 's3://%s/%s' AS " +
+                        "SELECT * FROM (VALUES " +
+                        "(1, 'with-hyphen')," +
+                        "(2, 'with.dot')," +
+                        "(3, 'with:colon')," +
+                        "(4, 'with/slash')," +
+                        "(5, 'with\\\\backslash')," +
+                        "(6, 'with=equal')," +
+                        "(7, 'with?question')," +
+                        "(8, 'with!exclamation')," +
+                        "(9, 'with%%percent')," +
+                        "(10, 'with space')" +
+                        ") t(id, col_name)",
+                tableName,
+                bucketName,
+                tableDirectory));
+
+        try {
+            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName)).containsOnly(expected);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testSparkCanReadTableCreatedByTrinoWithSpecialCharactersInPartitioningColumn()
+    {
+        testSparkCanReadTableCreatedByTrinoWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(1);
+        testSparkCanReadTableCreatedByTrinoWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(20);
+    }
+
+    private void testSparkCanReadTableCreatedByTrinoWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(int interval)
+    {
+        String tableName = format("test_dl_create_table_partition_by_special_char_with_%d_partitions_%s", interval, randomNameSuffix());
+        String tableDirectory = "delta-compatibility-test-" + tableName;
+
+        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(
+                row(1, "with-hyphen"),
+                row(2, "with.dot"),
+                row(3, "with:colon"),
+                row(4, "with/slash"),
+                row(5, "with\\\\backslash"),
+                row(6, "with=equal"),
+                row(7, "with?question"),
+                row(8, "with!exclamation"),
+                row(9, "with%percent"),
+                row(10, "with space"));
+
+        onTrino().executeQuery(format("CREATE TABLE delta.default.%s (id INTEGER, col_name VARCHAR) " +
+                        "WITH(location = 's3://%s/%s', partitioned_by = ARRAY['col_name'], checkpoint_interval = " + interval + ") ",
+                tableName,
+                bucketName,
+                tableDirectory));
+
+        try {
+            onTrino().executeQuery(format("INSERT INTO delta.default.%s " +
+                            "VALUES" +
+                            "(1, 'with-hyphen'), " +
+                            "(2, 'with.dot'), " +
+                            "(3, 'with:colon'), " +
+                            "(4, 'with/slash'), " +
+                            "(5, 'with\\\\backslash'), " +
+                            "(6, 'with=equal'), " +
+                            "(7, 'with?question'), " +
+                            "(8, 'with!exclamation'), " +
+                            "(9, 'with%%percent')," +
+                            "(10, 'with space')",
+                    tableName));
+            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName)).containsOnly(expected);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoCanReadTableCreatedBySaprkWithSpecialCharactersInPartitioningColumn()
+    {
+        testTrinoCanReadTableCreatedBySparkWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(1);
+        testTrinoCanReadTableCreatedBySparkWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(20);
+    }
+
+    private void testTrinoCanReadTableCreatedBySparkWithSpecialCharactersInPartitioningColumnWithCpIntervalSet(int interval)
+    {
+        String tableName = format("test_dl_create_table_partition_by_special_char_with_%d_partitions_%s", interval, randomNameSuffix());
+        String tableDirectory = "delta-compatibility-test-" + tableName;
+
+        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(
+                row(1, "with-hyphen"),
+                row(2, "with.dot"),
+                row(3, "with:colon"),
+                row(4, "with/slash"),
+                row(5, "with\\backslash"),
+                row(6, "with=equal"),
+                row(7, "with?question"),
+                row(8, "with!exclamation"),
+                row(9, "with%percent"),
+                row(10, "with space"));
+
+        onDelta().executeQuery(format("CREATE TABLE default.%s (id INTEGER, col_name STRING) " +
+                        "USING DELTA " +
+                        "OPTIONS (checkpointInterval = " + interval + ") " +
+                        "PARTITIONED BY (`col_name`) LOCATION 's3://%s/%s'",
+                tableName,
+                bucketName,
+                tableDirectory));
+
+        try {
+            onDelta().executeQuery(format("INSERT INTO default.%s " +
+                            "VALUES" +
+                            "(1, 'with-hyphen'), " +
+                            "(2, 'with.dot'), " +
+                            "(3, 'with:colon'), " +
+                            "(4, 'with/slash'), " +
+                            "(5, 'with\\\\backslash'), " +
+                            "(6, 'with=equal'), " +
+                            "(7, 'with?question'), " +
+                            "(8, 'with!exclamation'), " +
+                            "(9, 'with%%percent')," +
+                            "(10, 'with space')",
+                    tableName));
+
+            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName)).containsOnly(expected);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testSparkCanReadFromTableUpdatedByTrino()
+    {
+        testSparkCanReadFromTableUpdatedByTrinoWithCpIntervalSet(1);
+        testSparkCanReadFromTableUpdatedByTrinoWithCpIntervalSet(20);
+    }
+
+    private void testSparkCanReadFromTableUpdatedByTrinoWithCpIntervalSet(int interval)
+    {
+        String tableName = format("test_dl_create_table_partition_by_special_char_with_%d_partitions_%s", interval, randomNameSuffix());
+        String tableDirectory = "delta-compatibility-test-" + tableName;
+
+        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(
+                row(101, "with-hyphen"),
+                row(102, "with.dot"),
+                row(103, "with:colon"),
+                row(104, "with/slash"),
+                row(105, "with\\\\backslash"),
+                row(106, "with=equal"),
+                row(107, "with?question"),
+                row(108, "with!exclamation"),
+                row(109, "with%percent"),
+                row(110, "with space"));
+
+        onTrino().executeQuery(format("CREATE TABLE delta.default.%s (id, col_name) " +
+                        "WITH(location = 's3://%s/%s', partitioned_by = ARRAY['col_name'], checkpoint_interval = " + interval + ") " +
+                        "AS VALUES " +
+                        "(1, 'with-hyphen')," +
+                        "(2, 'with.dot')," +
+                        "(3, 'with:colon')," +
+                        "(4, 'with/slash')," +
+                        "(5, 'with\\\\backslash')," +
+                        "(6, 'with=equal')," +
+                        "(7, 'with?question')," +
+                        "(8, 'with!exclamation')," +
+                        "(9, 'with%%percent')," +
+                        "(10, 'with space')",
+                tableName,
+                bucketName,
+                tableDirectory));
+
+        try {
+            onTrino().executeQuery(format("UPDATE delta.default.%s SET id = id + 100", tableName));
+
+            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName)).containsOnly(expected);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoCanReadFromTableUpdatedBySpark()
+    {
+        testTrinoCanReadFromTableUpdatedBySparkWithCpIntervalSet(1);
+        testTrinoCanReadFromTableUpdatedBySparkWithCpIntervalSet(20);
+    }
+
+    private void testTrinoCanReadFromTableUpdatedBySparkWithCpIntervalSet(int interval)
+    {
+        String tableName = format("test_dl_create_table_partition_by_special_char_with_%d_partitions_%s", interval, randomNameSuffix());
+        String tableDirectory = "delta-compatibility-test-" + tableName;
+
+        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(
+                row(101, "with-hyphen"),
+                row(102, "with.dot"),
+                row(103, "with:colon"),
+                row(104, "with/slash"),
+                row(105, "with\\backslash"),
+                row(106, "with=equal"),
+                row(107, "with?question"),
+                row(108, "with!exclamation"),
+                row(109, "with%percent"),
+                row(110, "with space"));
+
+        onDelta().executeQuery(format("CREATE TABLE default.%s " +
+                        "USING DELTA " +
+                        "OPTIONS (checkpointInterval = " + interval + ") " +
+                        "PARTITIONED BY (`col_name`) LOCATION 's3://%s/%s' AS " +
+                        "SELECT * FROM (VALUES " +
+                        "(1, 'with-hyphen')," +
+                        "(2, 'with.dot')," +
+                        "(3, 'with:colon')," +
+                        "(4, 'with/slash')," +
+                        "(5, 'with\\\\backslash')," +
+                        "(6, 'with=equal')," +
+                        "(7, 'with?question')," +
+                        "(8, 'with!exclamation')," +
+                        "(9, 'with%%percent')," +
+                        "(10, 'with space')" +
+                        ") t(id, col_name)",
+                tableName,
+                bucketName,
+                tableDirectory));
+
+        try {
+            onDelta().executeQuery(format("UPDATE default.%s SET id = id + 100", tableName));
+
+            assertThat(onDelta().executeQuery("SELECT * FROM " + tableName)).containsOnly(expected);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoCanReadFromTablePartitionChangedBySpark()
+    {
+        String tableName = "test_dl_create_table_partition_changed_by_spark_" + randomNameSuffix();
+        String tableDirectory = "delta-compatibility-test-" + tableName;
+
+        ImmutableList<QueryAssert.Row> expected = ImmutableList.of(row(1, "part"));
+
+        onDelta().executeQuery(format("CREATE TABLE default.%s " +
+                        "USING DELTA " +
+                        "PARTITIONED BY (`original_part_col`) LOCATION 's3://%s/%s' AS " +
+                        "SELECT 1 AS original_part_col, 'part' AS new_part_col",
+                tableName,
+                bucketName,
+                tableDirectory));
+
+        try {
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
+
+            onDelta().executeQuery("REPLACE TABLE default." + tableName + " USING DELTA PARTITIONED BY (new_part_col) AS SELECT * FROM " + tableName);
+
+            // This 2nd SELECT query caused NPE when the connector had cache for partitions and the column was changed remotely
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(expected);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testPartitionedByNonLowercaseColumn()
+    {
+        String tableName = "test_dl_partitioned_by_non_lowercase_" + randomNameSuffix();
+        String tableDirectory = "delta-compatibility-test-" + tableName;
+
+        onDelta().executeQuery(format("CREATE TABLE default.%s " +
+                        "USING DELTA " +
+                        "PARTITIONED BY (`PART`) LOCATION 's3://%s/%s' AS " +
+                        "SELECT 1 AS data, 2 AS `PART`",
+                tableName,
+                bucketName,
+                tableDirectory));
+        try {
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(row(1, 2));
+
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES (3, 4)");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(row(1, 2), row(3, 4));
+
+            onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE data = 3");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(row(1, 2));
+
+            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET part = 20");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).contains(row(1, 20));
+
+            onTrino().executeQuery("MERGE INTO delta.default." + tableName + " USING (SELECT 1 a) input ON true WHEN MATCHED THEN DELETE");
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName)).hasNoRows();
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeProceduresCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeProceduresCompatibility.java
index a5896ddafaee..ac21a5a03ed5 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeProceduresCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeProceduresCompatibility.java
@@ -13,27 +13,22 @@
  */
 package io.trino.tests.product.deltalake;
 
-import io.trino.testng.services.Flaky;
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
 import static io.trino.tests.product.utils.QueryExecutors.onDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDeltaLakeProceduresCompatibility
         extends BaseTestDeltaLakeS3Storage
 {
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testUnregisterTable()
     {
         String tableName = "test_dl_unregister_table" + randomNameSuffix();
@@ -52,7 +47,7 @@ public void testUnregisterTable()
             assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
                     .hasMessageMatching(".* Table '.*' does not exist");
             assertQueryFailure(() -> onDelta().executeQuery("SELECT * FROM default." + tableName))
-                    .hasMessageMatching("(?s).* Table or view not found: .*");
+                    .hasMessageMatching("(?s).*(Table or view not found|The table or view .* cannot be found).*");
         }
         finally {
             onTrino().executeQuery("DROP TABLE IF EXISTS delta.default." + tableName);
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeSelectCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeSelectCompatibility.java
index 19f7070ed50d..b281a9ff4dca 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeSelectCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeSelectCompatibility.java
@@ -22,9 +22,11 @@
 import java.util.List;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_104;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_113;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
@@ -33,13 +35,14 @@
 import static io.trino.tests.product.utils.QueryExecutors.onDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotEquals;
 
 public class TestDeltaLakeSelectCompatibility
         extends BaseTestDeltaLakeS3Storage
 {
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_104, DELTA_LAKE_DATABRICKS_113, DELTA_LAKE_DATABRICKS_122, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
     public void testPartitionedSelectSpecialCharacters()
     {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeSystemTableCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeSystemTableCompatibility.java
new file mode 100644
index 000000000000..1b7ac73454bf
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeSystemTableCompatibility.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed 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 io.trino.tests.product.deltalake;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.tempto.assertions.QueryAssert.Row;
+import io.trino.tempto.query.QueryResult;
+import io.trino.testng.services.Flaky;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_91;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.utils.QueryExecutors.onDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDeltaLakeSystemTableCompatibility
+        extends BaseTestDeltaLakeS3Storage
+{
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_91, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testTablePropertiesCaseSensitivity()
+    {
+        String tableName = "test_dl_table_properties_case_sensitivity_" + randomNameSuffix();
+        String tableDirectory = "databricks-compatibility-test-" + tableName;
+
+        onDelta().executeQuery(format("CREATE TABLE default.%s (col INT) USING DELTA LOCATION 's3://%s/%s' TBLPROPERTIES ('test_key'='test_value', 'Test_Key'='Test_Mixed_Case')",
+                tableName,
+                bucketName,
+                tableDirectory));
+        List<Row> expectedRows = ImmutableList.of(
+                row("test_key", "test_value"),
+                row("Test_Key", "Test_Mixed_Case"));
+        try {
+            QueryResult deltaResult = onDelta().executeQuery("SHOW TBLPROPERTIES default." + tableName);
+            QueryResult trinoResult = onTrino().executeQuery("SELECT * FROM default.\"" + tableName + "$properties\"");
+            assertThat(deltaResult).contains(expectedRows);
+            assertThat(trinoResult).contains(expectedRows);
+            assertThat(trinoResult.rows()).containsExactlyInAnyOrderElementsOf(deltaResult.rows());
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testTablePropertiesWithTableFeatures()
+    {
+        String tableName = "test_dl_table_properties_with_features_" + randomNameSuffix();
+        String tableDirectory = "databricks-compatibility-test-" + tableName;
+
+        onDelta().executeQuery(format("CREATE TABLE default.%s (col INT) USING DELTA LOCATION 's3://%s/%s'" +
+                        " TBLPROPERTIES ('delta.minReaderVersion'='3', 'delta.minWriterVersion'='7', 'delta.columnMapping.mode'='id')",
+                tableName,
+                bucketName,
+                tableDirectory));
+
+        List<Row> expectedRows = ImmutableList.of(
+                row("delta.columnMapping.mode", "id"),
+                row("delta.feature.columnMapping", "supported"),
+                row("delta.minReaderVersion", "3"),
+                row("delta.minWriterVersion", "7"));
+        try {
+            QueryResult deltaResult = onDelta().executeQuery("SHOW TBLPROPERTIES default." + tableName);
+            QueryResult trinoResult = onTrino().executeQuery("SELECT * FROM default.\"" + tableName + "$properties\"");
+            assertThat(deltaResult).contains(expectedRows);
+            assertThat(trinoResult).contains(expectedRows);
+            assertThat(trinoResult.rows()).containsExactlyInAnyOrderElementsOf(deltaResult.rows());
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTimeTravelCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTimeTravelCompatibility.java
new file mode 100644
index 000000000000..73e367c19720
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTimeTravelCompatibility.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed 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 io.trino.tests.product.deltalake;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.tempto.assertions.QueryAssert;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.utils.QueryExecutors.onDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDeltaLakeTimeTravelCompatibility
+        extends BaseTestDeltaLakeS3Storage
+{
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testReadFromTableRestoredToPreviousVersion()
+    {
+        String tableName = "test_dl_time_travel_restore_" + randomNameSuffix();
+        String tableDirectory = "databricks-compatibility-test-" + tableName;
+
+        onTrino().executeQuery(format("CREATE TABLE delta.default.%s (a_integer integer) WITH (location = 's3://%s/%s')",
+                tableName,
+                bucketName,
+                tableDirectory));
+
+        try {
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES 1");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES 2");
+            onTrino().executeQuery("INSERT INTO delta.default." + tableName + " VALUES 3");
+            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET a_integer = a_integer + 10 WHERE a_integer > 1");
+            onTrino().executeQuery("DELETE FROM delta.default." + tableName + " WHERE a_integer < 10");
+            onTrino().executeQuery("ALTER TABLE delta.default." + tableName + " ADD COLUMN a_varchar varchar");
+            onTrino().executeQuery("UPDATE delta.default." + tableName + " SET a_varchar = 'foo'");
+
+            List<QueryAssert.Row> expectedRows = ImmutableList.of(
+                    row(12, "foo"),
+                    row(13, "foo"));
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+
+            onDelta().executeQuery("RESTORE TABLE default." + tableName + " TO VERSION AS OF 1");
+            expectedRows = ImmutableList.of(row(1));
+
+            assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                    .containsOnly(expectedRows);
+            assertThat(onTrino().executeQuery("SELECT * FROM delta.default." + tableName))
+                    .containsOnly(expectedRows);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTransactionLogCache.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTransactionLogCache.java
index 6d72f448bab4..15bbc3e4aff5 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTransactionLogCache.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeTransactionLogCache.java
@@ -18,10 +18,8 @@
 import com.amazonaws.services.s3.model.DeleteObjectsResult;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.assertions.QueryAssert;
-import io.trino.testng.services.Flaky;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.Test;
 
 import java.util.List;
@@ -29,16 +27,13 @@
 import java.util.stream.IntStream;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
 import static io.trino.tests.product.utils.QueryExecutors.onDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDeltaLakeTransactionLogCache
         extends BaseTestDeltaLakeS3Storage
@@ -49,15 +44,14 @@ public class TestDeltaLakeTransactionLogCache
 
     private AmazonS3 s3;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setup()
     {
         super.setUp();
         s3 = new S3ClientFactory().createS3Client(s3ServerType);
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testAllDataFilesAreLoadedWhenTransactionLogFileAfterTheCachedTableVersionIsMissing()
     {
         String tableName = "test_dl_cached_table_files_accuracy_" + randomNameSuffix();
@@ -102,7 +96,7 @@ public void testAllDataFilesAreLoadedWhenTransactionLogFileAfterTheCachedTableVe
         DeleteObjectsResult deleteObjectsResult = s3.deleteObjects(
                 new DeleteObjectsRequest(bucketName)
                         .withKeys(transactionLogFilesToRemove));
-        Assertions.assertThat(
+        assertThat(
                         deleteObjectsResult.getDeletedObjects().stream()
                                 .map(DeleteObjectsResult.DeletedObject::getKey)
                                 .collect(Collectors.toList()))
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeUpdateCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeUpdateCompatibility.java
new file mode 100644
index 000000000000..ed4976192bb9
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeUpdateCompatibility.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed 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 io.trino.tests.product.deltalake;
+
+import io.trino.tempto.assertions.QueryAssert;
+import io.trino.tempto.query.QueryResult;
+import io.trino.testng.services.Flaky;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_104;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_113;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.utils.QueryExecutors.onDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDeltaLakeUpdateCompatibility
+        extends BaseTestDeltaLakeS3Storage
+{
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testUpdateOnAppendOnlyTableFails()
+    {
+        String tableName = "test_update_on_append_only_table_fails_" + randomNameSuffix();
+        onDelta().executeQuery("" +
+                "CREATE TABLE default." + tableName +
+                "         (a INT, b INT)" +
+                "         USING delta " +
+                "         LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "' " +
+                "         TBLPROPERTIES ('delta.appendOnly' = true)");
+
+        onDelta().executeQuery("INSERT INTO default." + tableName + " VALUES (1,11), (2, 12)");
+        assertQueryFailure(() -> onDelta().executeQuery("UPDATE default." + tableName + " SET a = a + 1"))
+                .hasMessageContaining("This table is configured to only allow appends");
+        assertQueryFailure(() -> onTrino().executeQuery("UPDATE default." + tableName + " SET a = a + 1"))
+                .hasMessageContaining("Cannot modify rows from a table with 'delta.appendOnly' set to true");
+
+        assertThat(onDelta().executeQuery("SELECT * FROM default." + tableName))
+                .containsOnly(row(1, 11), row(2, 12));
+        onTrino().executeQuery("DROP TABLE " + tableName);
+    }
+
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_104, DELTA_LAKE_DATABRICKS_113, DELTA_LAKE_DATABRICKS_122, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    public void testUpdatesFromDatabricks()
+    {
+        String tableName = "test_updates_" + randomNameSuffix();
+
+        assertThat(onTrino().executeQuery("CREATE TABLE delta.default.\"" + tableName + "\" " +
+                "(id, value) " +
+                "WITH (location = 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "') AS VALUES " +
+                "  (1, 'Poland')" +
+                ", (2, 'Germany')" +
+                ", (3, 'Romania')"))
+                .containsOnly(row(3));
+
+        try {
+            QueryResult databricksResult = onDelta().executeQuery(format("SELECT * FROM default.%s ORDER BY id", tableName));
+            QueryResult prestoResult = onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s\" ORDER BY id", tableName));
+            assertThat(databricksResult).containsExactlyInOrder(toRows(prestoResult));
+
+            onDelta().executeQuery(format("UPDATE default.%s SET value = 'France' WHERE id = 2", tableName));
+            databricksResult = onDelta().executeQuery(format("SELECT * FROM default.%s ORDER BY id", tableName));
+            prestoResult = onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s\" ORDER BY id", tableName));
+            assertThat(databricksResult).containsExactlyInOrder(toRows(prestoResult));
+
+            onDelta().executeQuery(format("UPDATE default.%s SET value = 'Spain' WHERE id = 2", tableName));
+            databricksResult = onDelta().executeQuery(format("SELECT * FROM default.%s ORDER BY id", tableName));
+            prestoResult = onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s\" ORDER BY id", tableName));
+            assertThat(databricksResult).containsExactlyInOrder(toRows(prestoResult));
+
+            onDelta().executeQuery(format("UPDATE default.%s SET value = 'Portugal' WHERE id = 2", tableName));
+            databricksResult = onDelta().executeQuery(format("SELECT * FROM default.%s ORDER BY id", tableName));
+            prestoResult = onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s\" ORDER BY id", tableName));
+            assertThat(databricksResult).containsExactlyInOrder(toRows(prestoResult));
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    private static List<QueryAssert.Row> toRows(QueryResult result)
+    {
+        return result.rows().stream()
+                .map(QueryAssert.Row::new)
+                .collect(toImmutableList());
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeWriteDatabricksCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeWriteDatabricksCompatibility.java
index d4017e295705..52f41807c20a 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeWriteDatabricksCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeWriteDatabricksCompatibility.java
@@ -14,12 +14,13 @@
 package io.trino.tests.product.deltalake;
 
 import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.model.S3ObjectSummary;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.testng.services.Flaky;
-import org.assertj.core.api.Assertions;
+import io.trino.tests.product.deltalake.util.DatabricksVersion;
 import org.assertj.core.api.SoftAssertions;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -30,14 +31,16 @@
 import java.util.stream.Stream;
 
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_73;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.deltalake.util.DatabricksVersion.DATABRICKS_122_RUNTIME_VERSION;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getDatabricksRuntimeVersion;
+import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.skipTestUnlessUnsupportedWriterVersionExists;
 import static io.trino.tests.product.utils.QueryExecutors.onDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
@@ -45,6 +48,8 @@
 import static java.util.function.Predicate.not;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestDeltaLakeWriteDatabricksCompatibility
         extends BaseTestDeltaLakeS3Storage
@@ -55,7 +60,7 @@ public class TestDeltaLakeWriteDatabricksCompatibility
 
     private AmazonS3 s3;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setup()
     {
         super.setUp();
@@ -297,7 +302,8 @@ public void testDatabricksRespectsTrinoSettingNonNullableColumn()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
     public void testInsertingIntoDatabricksTableWithAddedNotNullConstraint()
     {
         String tableName = "test_databricks_table_altered_after_initial_write_" + randomNameSuffix();
@@ -325,7 +331,7 @@ public void testInsertingIntoDatabricksTableWithAddedNotNullConstraint()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
     @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
     public void testTrinoVacuumRemoveChangeDataFeedFiles()
     {
@@ -335,7 +341,7 @@ public void testTrinoVacuumRemoveChangeDataFeedFiles()
         });
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, PROFILE_SPECIFIC_TESTS})
+    @Test(groups = {DELTA_LAKE_DATABRICKS, PROFILE_SPECIFIC_TESTS})
     @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
     public void testDatabricksVacuumRemoveChangeDataFeedFiles()
     {
@@ -361,13 +367,65 @@ private void testVacuumRemoveChangeDataFeedFiles(Consumer<String> vacuumExecutor
             onDelta().executeQuery("INSERT INTO " + tableName + " VALUES (1)");
             onDelta().executeQuery("UPDATE " + tableName + " SET a = 2");
 
-            Assertions.assertThat(s3.listObjectsV2(bucketName, changeDataPrefix).getObjectSummaries()).hasSize(1);
+            assertThat(s3.listObjectsV2(bucketName, changeDataPrefix).getObjectSummaries()).hasSize(1);
 
             // Vacuum procedure should remove files in _change_data directory
             // https://docs.delta.io/2.1.0/delta-change-data-feed.html#change-data-storage
             vacuumExecutor.accept(tableName);
 
-            Assertions.assertThat(s3.listObjectsV2(bucketName, changeDataPrefix).getObjectSummaries()).hasSize(0);
+            List<S3ObjectSummary> summaries = s3.listObjectsV2(bucketName, changeDataPrefix).getObjectSummaries();
+            assertThat(summaries).hasSizeBetween(0, 1);
+            if (!summaries.isEmpty()) {
+                // Databricks version >= 12.2 keep an empty _change_data directory
+                DatabricksVersion databricksRuntimeVersion = getDatabricksRuntimeVersion().orElseThrow();
+                assertThat(databricksRuntimeVersion.isAtLeast(DATABRICKS_122_RUNTIME_VERSION)).isTrue();
+                S3ObjectSummary summary = summaries.get(0);
+                assertThat(summary.getKey()).endsWith(changeDataPrefix + "/");
+                assertThat(summary.getSize()).isEqualTo(0);
+            }
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testVacuumUnsupportedWriterVersion()
+    {
+        skipTestUnlessUnsupportedWriterVersionExists();
+
+        String tableName = "test_vacuum_unsupported_writer_version_" + randomNameSuffix();
+        String directoryName = "databricks-compatibility-test-" + tableName;
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(a INT)" +
+                "USING DELTA " +
+                "LOCATION '" + ("s3://" + bucketName + "/" + directoryName) + "'" +
+                "TBLPROPERTIES ('delta.minWriterVersion'='8')");
+
+        try {
+            assertThatThrownBy(() -> onTrino().executeQuery("CALL delta.system.vacuum('default', '" + tableName + "', '7d')"))
+                    .hasMessageContaining("Cannot execute vacuum procedure with 8 writer version");
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testVacuumUnsupportedWriterFeature()
+    {
+        String tableName = "test_vacuum_unsupported_writer_feature_" + randomNameSuffix();
+        String directoryName = "databricks-compatibility-test-" + tableName;
+
+        onDelta().executeQuery("CREATE TABLE default." + tableName +
+                "(a INT)" +
+                "USING DELTA " +
+                "LOCATION '" + ("s3://" + bucketName + "/" + directoryName) + "'" +
+                "TBLPROPERTIES ('delta.enableDeletionVectors' = true)");
+        try {
+            assertThatThrownBy(() -> onTrino().executeQuery("CALL delta.system.vacuum('default', '" + tableName + "', '7d')"))
+                    .hasMessageContaining("Cannot execute vacuum procedure with [deletionVectors] writer features");
         }
         finally {
             dropDeltaTableWithRetry("default." + tableName);
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeCompatibility.java
index 05f6a7580f72..a561939242c0 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeCompatibility.java
@@ -14,26 +14,27 @@
 package io.trino.tests.product.deltalake;
 
 import io.trino.tempto.ProductTest;
-import io.trino.testng.services.Flaky;
+import io.trino.tests.product.hudi.TestHudiHiveViewsCompatibility;
+import io.trino.tests.product.iceberg.TestIcebergHiveViewsCompatibility;
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+/**
+ * @see TestIcebergHiveViewsCompatibility
+ * @see TestHudiHiveViewsCompatibility
+ */
 public class TestHiveAndDeltaLakeCompatibility
         extends ProductTest
 {
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testInformationSchemaColumnsOnPresenceOfHiveView()
     {
         // use dedicated schema so we control the number and shape of tables
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeRedirect.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeRedirect.java
index 83284c5b37e2..d72f2f048a3b 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeRedirect.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestHiveAndDeltaLakeRedirect.java
@@ -17,9 +17,7 @@
 import io.trino.tempto.assertions.QueryAssert.Row;
 import io.trino.tempto.query.QueryExecutionException;
 import io.trino.tempto.query.QueryResult;
-import io.trino.testng.services.Flaky;
 import org.assertj.core.api.AbstractStringAssert;
-import org.assertj.core.api.Assertions;
 import org.assertj.core.api.Condition;
 import org.intellij.lang.annotations.Language;
 import org.testng.annotations.DataProvider;
@@ -33,25 +31,21 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.query.QueryExecutor.param;
 import static io.trino.testing.TestingNames.randomNameSuffix;
-import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
 import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
-import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
 import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
 import static io.trino.tests.product.utils.QueryExecutors.onDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 import static java.sql.JDBCType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveAndDeltaLakeRedirect
         extends BaseTestDeltaLakeS3Storage
 {
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testHiveToDeltaRedirect()
     {
         String tableName = "test_redirect_to_delta_" + randomNameSuffix();
@@ -59,9 +53,9 @@ public void testHiveToDeltaRedirect()
         onDelta().executeQuery(createTableOnDelta(tableName, false));
 
         try {
-            QueryResult databricksResult = onDelta().executeQuery("SELECT * FROM " + tableName);
+            QueryResult sparkResult = onDelta().executeQuery("SELECT * FROM " + tableName);
             QueryResult hiveResult = onTrino().executeQuery(format("SELECT * FROM hive.default.\"%s\"", tableName));
-            assertThat(databricksResult).containsOnly(hiveResult.rows().stream()
+            assertThat(sparkResult).containsOnly(hiveResult.rows().stream()
                     .map(Row::new)
                     .collect(toImmutableList()));
         }
@@ -70,8 +64,7 @@ public void testHiveToDeltaRedirect()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testHiveToDeltaNonDefaultSchemaRedirect()
     {
         String schemaName = "test_extraordinary_" + randomNameSuffix();
@@ -81,20 +74,19 @@ public void testHiveToDeltaNonDefaultSchemaRedirect()
         onDelta().executeQuery(format("CREATE SCHEMA IF NOT EXISTS %s LOCATION \"%s\"", schemaName, schemaLocation));
         onDelta().executeQuery(createTableOnDelta(schemaName, tableName, false));
         try {
-            QueryResult databricksResult = onDelta().executeQuery(format("SELECT * FROM %s.%s", schemaName, tableName));
+            QueryResult sparkResult = onDelta().executeQuery(format("SELECT * FROM %s.%s", schemaName, tableName));
             QueryResult hiveResult = onTrino().executeQuery(format("SELECT * FROM hive.%s.\"%s\"", schemaName, tableName));
-            assertThat(databricksResult).containsOnly(hiveResult.rows().stream()
+            assertThat(sparkResult).containsOnly(hiveResult.rows().stream()
                     .map(Row::new)
                     .collect(toImmutableList()));
         }
         finally {
-            onDelta().executeQuery(format("DROP TABLE %s.%s", schemaName, tableName));
+            dropDeltaTableWithRetry(format("%s.%s", schemaName, tableName));
             onDelta().executeQuery("DROP SCHEMA " + schemaName);
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testHiveToNonexistentDeltaCatalogRedirectFailure()
     {
         String tableName = "test_redirect_to_nonexistent_delta_" + randomNameSuffix();
@@ -113,8 +105,7 @@ public void testHiveToNonexistentDeltaCatalogRedirectFailure()
     }
 
     // Note: this tests engine more than connectors. Still good scenario to test.
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testHiveToDeltaRedirectWithDefaultSchemaInSession()
     {
         String tableName = "test_redirect_to_delta_with_use_" + randomNameSuffix();
@@ -124,9 +115,9 @@ public void testHiveToDeltaRedirectWithDefaultSchemaInSession()
         try {
             onTrino().executeQuery("USE hive.default");
 
-            QueryResult databricksResult = onDelta().executeQuery("SELECT * FROM " + tableName);
+            QueryResult sparkResult = onDelta().executeQuery("SELECT * FROM " + tableName);
             QueryResult hiveResult = onTrino().executeQuery(format("SELECT * FROM \"%s\"", tableName));
-            assertThat(databricksResult).containsOnly(hiveResult.rows().stream()
+            assertThat(sparkResult).containsOnly(hiveResult.rows().stream()
                     .map(Row::new)
                     .collect(toImmutableList()));
         }
@@ -135,8 +126,7 @@ public void testHiveToDeltaRedirectWithDefaultSchemaInSession()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testHiveToUnpartitionedDeltaPartitionsRedirectFailure()
     {
         String tableName = "test_delta_lake_unpartitioned_table_" + randomNameSuffix();
@@ -153,8 +143,7 @@ public void testHiveToUnpartitionedDeltaPartitionsRedirectFailure()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testHiveToPartitionedDeltaPartitionsRedirectFailure()
     {
         String tableName = "test_delta_lake_partitioned_table_" + randomNameSuffix();
@@ -171,8 +160,7 @@ public void testHiveToPartitionedDeltaPartitionsRedirectFailure()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testDeltaToHiveRedirect()
     {
         String tableName = "test_redirect_to_hive_" + randomNameSuffix();
@@ -196,8 +184,7 @@ public void testDeltaToHiveRedirect()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testDeltaToHiveNonDefaultSchemaRedirect()
     {
         String schemaName = "test_extraordinary" + randomNameSuffix();
@@ -226,8 +213,7 @@ public void testDeltaToHiveNonDefaultSchemaRedirect()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testDeltaToNonexistentHiveCatalogRedirectFailure()
     {
         String tableName = "test_redirect_to_nonexistent_hive_" + randomNameSuffix();
@@ -246,8 +232,7 @@ public void testDeltaToNonexistentHiveCatalogRedirectFailure()
     }
 
     // Note: this tests engine more than connectors. Still good scenario to test.
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testDeltaToHiveRedirectWithDefaultSchemaInSession()
     {
         String tableName = "test_redirect_to_hive_with_use_" + randomNameSuffix();
@@ -273,8 +258,7 @@ public void testDeltaToHiveRedirectWithDefaultSchemaInSession()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testDeltaToPartitionedHivePartitionsRedirect()
     {
         String tableName = "test_hive_partitioned_table_" + randomNameSuffix();
@@ -298,8 +282,7 @@ public void testDeltaToPartitionedHivePartitionsRedirect()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testDeltaToUnpartitionedHivePartitionsRedirectFailure()
     {
         String tableName = "test_hive_unpartitioned_table_" + randomNameSuffix();
@@ -315,8 +298,7 @@ public void testDeltaToUnpartitionedHivePartitionsRedirectFailure()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testDeltaToHiveInsert()
     {
         String tableName = "test_hive_insert_by_delta_" + randomNameSuffix();
@@ -345,8 +327,7 @@ public void testDeltaToHiveInsert()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testHiveToDeltaInsert()
     {
         String tableName = "test_delta_insert_by_hive_" + randomNameSuffix();
@@ -364,8 +345,7 @@ public void testHiveToDeltaInsert()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testDeltaToHiveDescribe()
     {
         String tableName = "test_hive_describe_by_delta_" + randomNameSuffix();
@@ -385,8 +365,7 @@ public void testDeltaToHiveDescribe()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testHiveToDeltaDescribe()
     {
         String tableName = "test_delta_describe_by_hive_" + randomNameSuffix();
@@ -407,8 +386,7 @@ public void testHiveToDeltaDescribe()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testDeltaToHiveShowCreateTable()
     {
         String tableName = "test_hive_show_create_table_by_delta_" + randomNameSuffix();
@@ -424,8 +402,7 @@ public void testDeltaToHiveShowCreateTable()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testHiveToDeltaShowCreateTable()
     {
         String tableName = "test_delta_show_create_table_by_hive_" + randomNameSuffix();
@@ -441,8 +418,7 @@ public void testHiveToDeltaShowCreateTable()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testDeltaToHiveAlterTable()
     {
         String tableName = "test_hive_alter_table_by_delta_" + randomNameSuffix();
@@ -467,8 +443,7 @@ public void testDeltaToHiveAlterTable()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testHiveToDeltaAlterTable()
     {
         String tableName = "test_delta_alter_table_by_hive_" + randomNameSuffix();
@@ -486,8 +461,7 @@ public void testHiveToDeltaAlterTable()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testDeltaToHiveCommentTable()
     {
         String tableName = "test_hive_comment_table_by_delta_" + randomNameSuffix();
@@ -507,8 +481,7 @@ public void testDeltaToHiveCommentTable()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testHiveToDeltaCommentTable()
     {
         String tableName = "test_delta_comment_table_by_hive_" + randomNameSuffix();
@@ -529,8 +502,7 @@ public void testHiveToDeltaCommentTable()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testDeltaToHiveCommentColumn()
     {
         String tableName = "test_hive_comment_column_by_delta_" + randomNameSuffix();
@@ -552,8 +524,7 @@ public void testDeltaToHiveCommentColumn()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testHiveToDeltaCommentColumn()
     {
         String tableName = "test_delta_comment_column_by_hive_" + randomNameSuffix();
@@ -576,8 +547,7 @@ public void testHiveToDeltaCommentColumn()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testInsertIntoDeltaTableFromHiveNonDefaultSchemaRedirect()
     {
         String destSchema = "test_extraordinary_" + randomNameSuffix();
@@ -607,13 +577,12 @@ public void testInsertIntoDeltaTableFromHiveNonDefaultSchemaRedirect()
                     .containsOnly(expectedDestinationTableRows);
         }
         finally {
-            onDelta().executeQuery(format("DROP TABLE %s.%s", destSchema, destTableName));
+            dropDeltaTableWithRetry(format("%s.%s", destSchema, destTableName));
             onTrino().executeQuery("DROP SCHEMA " + destSchema);
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testInformationSchemaColumnsHiveToDeltaRedirect()
     {
         // use dedicated schema so we control the number and shape of tables
@@ -653,13 +622,12 @@ public void testInformationSchemaColumnsHiveToDeltaRedirect()
                             row("delta", schemaName, tableName, "comment", 4, null, "YES", "varchar"));
         }
         finally {
-            onDelta().executeQuery(format("DROP TABLE IF EXISTS %s.%s", schemaName, tableName));
+            dropDeltaTableWithRetry(format("%s.%s", schemaName, tableName));
             onTrino().executeQuery("DROP SCHEMA " + schemaName);
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testInformationSchemaColumnsDeltaToHiveRedirect()
     {
         // use dedicated schema so we control the number and shape of tables
@@ -701,8 +669,7 @@ public void testInformationSchemaColumnsDeltaToHiveRedirect()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testSystemJdbcColumnsHiveToDeltaRedirect()
     {
         // use dedicated schema so we control the number and shape of tables
@@ -743,13 +710,12 @@ public void testSystemJdbcColumnsHiveToDeltaRedirect()
                             row("delta", schemaName, tableName, "comment"));
         }
         finally {
-            onDelta().executeQuery(format("DROP TABLE IF EXISTS %s.%s", schemaName, tableName));
+            dropDeltaTableWithRetry(format("%s.%s", schemaName, tableName));
             onTrino().executeQuery("DROP SCHEMA " + schemaName);
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
     public void testSystemJdbcColumnsDeltaToHiveRedirect()
     {
         // use dedicated schema so we control the number and shape of tables
@@ -791,8 +757,7 @@ public void testSystemJdbcColumnsDeltaToHiveRedirect()
         }
     }
 
-    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "trueFalse")
-    @Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "trueFalse")
     public void testViewReferencingHiveAndDeltaTable(boolean legacyHiveViewTranslation)
     {
         String hiveTableName = "test_view_hive_table_" + randomNameSuffix();
@@ -877,6 +842,29 @@ public void testViewReferencingHiveAndDeltaTable(boolean legacyHiveViewTranslati
         }
     }
 
+    @Test(groups = {DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testHiveToDeltaPropertiesRedirect()
+    {
+        String tableName = "test_redirect_to_delta_properties_" + randomNameSuffix();
+
+        onDelta().executeQuery("" +
+                "CREATE TABLE " + tableName + " USING DELTA " +
+                "LOCATION '" + locationForTable(tableName) + "' " +
+                " AS SELECT true AS a_boolean");
+
+        List<Row> expected = List.of(
+                row("delta.minReaderVersion", "1"),
+                row("delta.minWriterVersion", "2"));
+
+        try {
+            assertThat(onTrino().executeQuery(format("SELECT * FROM delta.default.\"%s$properties\"", tableName))).containsOnly(expected);
+            assertThat(onTrino().executeQuery(format("SELECT * FROM hive.default.\"%s$properties\"", tableName))).containsOnly(expected);
+        }
+        finally {
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+    }
+
     @DataProvider
     public Object[][] trueFalse()
     {
@@ -926,7 +914,7 @@ private String locationForTable(String tableName)
 
     private static AbstractStringAssert<?> assertTableComment(String catalog, String schema, String tableName)
     {
-        return Assertions.assertThat((String) readTableComment(catalog, schema, tableName).getOnlyValue());
+        return assertThat((String) readTableComment(catalog, schema, tableName).getOnlyValue());
     }
 
     private static QueryResult readTableComment(String catalog, String schema, String tableName)
@@ -940,7 +928,7 @@ private static QueryResult readTableComment(String catalog, String schema, Strin
 
     private static AbstractStringAssert<?> assertColumnComment(String catalog, String schema, String tableName, String columnName)
     {
-        return Assertions.assertThat((String) readColumnComment(catalog, schema, tableName, columnName).getOnlyValue());
+        return assertThat((String) readColumnComment(catalog, schema, tableName, columnName).getOnlyValue());
     }
 
     private static QueryResult readColumnComment(String catalog, String schema, String tableName, String columnName)
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/util/DatabricksVersion.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/util/DatabricksVersion.java
index bcf548ab7143..52063a7fb479 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/util/DatabricksVersion.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/util/DatabricksVersion.java
@@ -21,6 +21,7 @@
 public record DatabricksVersion(int majorVersion, int minorVersion)
         implements Comparable<DatabricksVersion>
 {
+    public static final DatabricksVersion DATABRICKS_122_RUNTIME_VERSION = new DatabricksVersion(12, 2);
     public static final DatabricksVersion DATABRICKS_113_RUNTIME_VERSION = new DatabricksVersion(11, 3);
     public static final DatabricksVersion DATABRICKS_104_RUNTIME_VERSION = new DatabricksVersion(10, 4);
     public static final DatabricksVersion DATABRICKS_91_RUNTIME_VERSION = new DatabricksVersion(9, 1);
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/util/DeltaLakeTestUtils.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/util/DeltaLakeTestUtils.java
index 0efff02e2aec..680aeca64c1e 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/util/DeltaLakeTestUtils.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/util/DeltaLakeTestUtils.java
@@ -22,18 +22,25 @@
 import dev.failsafe.Failsafe;
 import dev.failsafe.RetryPolicy;
 import io.airlift.log.Logger;
+import io.trino.tempto.query.QueryExecutionException;
 import io.trino.tempto.query.QueryResult;
 import org.intellij.lang.annotations.Language;
+import org.testng.SkipException;
 
 import java.time.temporal.ChronoUnit;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.collect.MoreCollectors.onlyElement;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.utils.QueryExecutors.onDelta;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public final class DeltaLakeTestUtils
 {
@@ -42,7 +49,9 @@ public final class DeltaLakeTestUtils
     public static final String DATABRICKS_COMMUNICATION_FAILURE_ISSUE = "https://github.com/trinodb/trino/issues/14391";
     @Language("RegExp")
     public static final String DATABRICKS_COMMUNICATION_FAILURE_MATCH =
-            "\\Q[Databricks][DatabricksJDBCDriver](500593) Communication link failure. Failed to connect to server. Reason: HTTP retry after response received with no Retry-After header, error: HTTP Response code: 503, Error message: Unknown.";
+            "\\Q[Databricks][DatabricksJDBCDriver](500593) Communication link failure. Failed to connect to server. Reason: \\E" +
+            "(HTTP retry after response received with no Retry-After header, error: HTTP Response code: 503|HTTP Response code: 504)" +
+            ", Error message: Unknown.";
     private static final RetryPolicy<QueryResult> CONCURRENT_MODIFICATION_EXCEPTION_RETRY_POLICY = RetryPolicy.<QueryResult>builder()
             .handleIf(throwable -> Throwables.getRootCause(throwable) instanceof ConcurrentModificationException)
             .handleIf(throwable -> throwable.getMessage() != null && throwable.getMessage().contains("Table being modified concurrently"))
@@ -63,10 +72,31 @@ public static Optional<DatabricksVersion> getDatabricksRuntimeVersion()
         return Optional.of(DatabricksVersion.parse(version));
     }
 
+    public static void skipTestUnlessUnsupportedWriterVersionExists()
+    {
+        // TODO: This method should be called only once per environment. Consider using a cache or creating a new module like HiveVersionProvider.
+        String tableName = "test_dl_unsupported_writer_version_" + randomNameSuffix();
+
+        try {
+            onDelta().executeQuery("CREATE TABLE default." + tableName + "(col int) USING DELTA TBLPROPERTIES ('delta.minWriterVersion'='8')");
+            dropDeltaTableWithRetry("default." + tableName);
+        }
+        catch (QueryExecutionException e) {
+            assertThat(e).hasMessageMatching("(?s).* delta.minWriterVersion needs to be (an integer between \\[1, 7]|one of 1, 2, 3, 4, 5(, 6)?, 7).*");
+            throw new SkipException("Cannot test unsupported writer version");
+        }
+    }
+
+    public static List<String> getColumnNamesOnDelta(String schemaName, String tableName)
+    {
+        QueryResult result = onDelta().executeQuery("SHOW COLUMNS IN " + schemaName + "." + tableName);
+        return result.column(1);
+    }
+
     public static String getColumnCommentOnTrino(String schemaName, String tableName, String columnName)
     {
         return (String) onTrino()
-                .executeQuery("SELECT comment FROM information_schema.columns WHERE table_schema = '" + schemaName + "' AND table_name = '" + tableName + "' AND column_name = '" + columnName + "'")
+                .executeQuery("SELECT comment FROM delta.information_schema.columns WHERE table_schema = '" + schemaName + "' AND table_name = '" + tableName + "' AND column_name = '" + columnName + "'")
                 .getOnlyValue();
     }
 
@@ -76,6 +106,12 @@ public static String getColumnCommentOnDelta(String schemaName, String tableName
         return (String) result.row(2).get(1);
     }
 
+    public static String getTableCommentOnTrino(String schemaName, String tableName)
+    {
+        return (String) onTrino().executeQuery("SELECT comment FROM system.metadata.table_comments WHERE catalog_name = 'delta' AND schema_name = '" + schemaName + "' AND table_name = '" + tableName + "'")
+                .getOnlyValue();
+    }
+
     public static String getTableCommentOnDelta(String schemaName, String tableName)
     {
         QueryResult result = onDelta().executeQuery(format("DESCRIBE EXTENDED %s.%s", schemaName, tableName));
@@ -85,6 +121,20 @@ public static String getTableCommentOnDelta(String schemaName, String tableName)
                 .collect(onlyElement());
     }
 
+    public static Map<String, String> getTablePropertiesOnDelta(String schemaName, String tableName)
+    {
+        QueryResult result = onDelta().executeQuery("SHOW TBLPROPERTIES %s.%s".formatted(schemaName, tableName));
+        return result.rows().stream()
+                .map(column -> Map.entry((String) column.get(0), (String) column.get(1)))
+                .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    public static String getTablePropertyOnDelta(String schemaName, String tableName, String propertyName)
+    {
+        QueryResult result = onDelta().executeQuery("SHOW TBLPROPERTIES %s.%s(%s)".formatted(schemaName, tableName, propertyName));
+        return (String) getOnlyElement(result.rows()).get(1);
+    }
+
     /**
      * Workaround method to avoid <a href="https://github.com/trinodb/trino/issues/13199">Table being modified concurrently error in Glue</a>.
      */
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/TestFunctions.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/TestFunctions.java
index 2230fd83ad81..c6f73aed646d 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/TestFunctions.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/TestFunctions.java
@@ -17,9 +17,9 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.JSON_FUNCTIONS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestFunctions
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestComparison.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestComparison.java
index 629f3d6a8d4f..45b508e19b1b 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestComparison.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestComparison.java
@@ -18,11 +18,11 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.COMPARISON;
 import static io.trino.tests.product.TestGroups.QUERY_ENGINE;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestComparison
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestLogical.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestLogical.java
index 208a35633fe9..c5a801edd8c8 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestLogical.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/functions/operators/TestLogical.java
@@ -17,10 +17,10 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.LOGICAL;
 import static io.trino.tests.product.TestGroups.QUERY_ENGINE;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestLogical
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/AbstractTestHiveViews.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/AbstractTestHiveViews.java
index 94f00eb77d3c..cbf872c0d361 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/AbstractTestHiveViews.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/AbstractTestHiveViews.java
@@ -40,7 +40,6 @@
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.HIVE_ICEBERG_REDIRECTIONS;
 import static io.trino.tests.product.TestGroups.HIVE_VIEWS;
@@ -51,6 +50,7 @@
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 import static java.util.stream.Collectors.joining;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
@@ -63,6 +63,7 @@ public abstract class AbstractTestHiveViews
         extends HiveProductTest
 {
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testSelectOnView()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS hive_test_view");
@@ -78,6 +79,7 @@ public void testSelectOnView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testArrayIndexingInView()
     {
         onHive().executeQuery("DROP TABLE IF EXISTS test_hive_view_array_index_table");
@@ -100,6 +102,7 @@ public void testArrayIndexingInView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testCommonTableExpression()
     {
         onHive().executeQuery(
@@ -113,6 +116,7 @@ public void testCommonTableExpression()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testNestedCommonTableExpression()
     {
         onHive().executeQuery(
@@ -127,6 +131,7 @@ public void testNestedCommonTableExpression()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testArrayConstructionInView()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS test_array_construction_view");
@@ -139,6 +144,7 @@ public void testArrayConstructionInView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testMapConstructionInView()
     {
         onHive().executeQuery(
@@ -158,6 +164,7 @@ public void testMapConstructionInView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testSelectOnViewFromDifferentSchema()
     {
         onHive().executeQuery("DROP SCHEMA IF EXISTS test_schema CASCADE");
@@ -171,6 +178,7 @@ public void testSelectOnViewFromDifferentSchema()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testViewReferencingTableInDifferentSchema()
     {
         String schemaX = "test_view_table_in_different_schema_x" + randomNameSuffix();
@@ -191,6 +199,7 @@ public void testViewReferencingTableInDifferentSchema()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testViewReferencingTableInTheSameSchemaWithoutQualifier()
     {
         String schemaX = "test_view_table_same_schema_without_qualifier_schema" + randomNameSuffix();
@@ -209,6 +218,7 @@ public void testViewReferencingTableInTheSameSchemaWithoutQualifier()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     // TODO (https://github.com/trinodb/trino/issues/5911) the test does not test view coercion
     public void testViewWithUnsupportedCoercion()
     {
@@ -220,6 +230,7 @@ public void testViewWithUnsupportedCoercion()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testOuterParentheses()
     {
         if (getHiveVersionMajor() <= 1) {
@@ -235,6 +246,7 @@ public void testOuterParentheses()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testDateFunction()
     {
         onHive().executeQuery("DROP TABLE IF EXISTS hive_table_date_function");
@@ -250,6 +262,7 @@ public void testDateFunction()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testPmodFunction()
     {
         onHive().executeQuery("DROP TABLE IF EXISTS hive_table_pmod_function");
@@ -265,6 +278,7 @@ public void testPmodFunction()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     // TODO (https://github.com/trinodb/trino/issues/5911) the test does not test view coercion
     public void testWithUnsupportedFunction()
     {
@@ -276,6 +290,7 @@ public void testWithUnsupportedFunction()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testExistingView()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS hive_duplicate_view");
@@ -286,6 +301,7 @@ public void testExistingView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testShowCreateView()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS hive_show_view");
@@ -293,13 +309,9 @@ public void testShowCreateView()
 
         String showCreateViewSql = "SHOW CREATE VIEW %s.default.hive_show_view";
         String expectedResult = "CREATE VIEW %s.default.hive_show_view SECURITY DEFINER AS\n" +
-                "SELECT\n" +
-                "  \"n_nationkey\"\n" +
-                ", \"n_name\"\n" +
-                ", \"n_regionkey\"\n" +
-                ", \"n_comment\"\n" +
+                "SELECT *\n" +
                 "FROM\n" +
-                "  \"default\".\"nation\"";
+                "  \"default\".\"nation\" \"nation\"";
 
         QueryResult actualResult = onTrino().executeQuery(format(showCreateViewSql, "hive"));
         assertThat(actualResult).hasRowsCount(1);
@@ -353,6 +365,7 @@ public void testRichSqlSyntax()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testIdentifierThatStartWithDigit()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS \"7_table_with_number\"");
@@ -367,6 +380,7 @@ public void testIdentifierThatStartWithDigit()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testHiveViewInInformationSchema()
     {
         onHive().executeQuery("DROP SCHEMA IF EXISTS test_schema CASCADE");
@@ -386,13 +400,14 @@ public void testHiveViewInInformationSchema()
                 row("hive", "test_schema", "trino_test_view", "VIEW"));
 
         assertThat(onTrino().executeQuery("SELECT view_definition FROM information_schema.views WHERE table_schema = 'test_schema' and table_name = 'hive_test_view'")).containsOnly(
-                row("SELECT \"n_nationkey\", \"n_name\", \"n_regionkey\", \"n_comment\"\nFROM \"default\".\"nation\""));
+                row("SELECT *\nFROM \"default\".\"nation\" AS \"nation\""));
 
         assertThat(onTrino().executeQuery("DESCRIBE test_schema.hive_test_view"))
                 .contains(row("n_nationkey", "bigint", "", ""));
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testHiveViewWithParametrizedTypes()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS hive_view_parametrized");
@@ -413,6 +428,7 @@ public void testHiveViewWithParametrizedTypes()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testHiveViewWithTextualTypes()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS hive_view_textual");
@@ -440,6 +456,7 @@ public void testHiveViewWithTextualTypes()
     protected abstract List<QueryAssert.Row> getExpectedHiveViewTextualColumnsTypes();
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testNestedHiveViews()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS nested_base_view");
@@ -456,6 +473,7 @@ public void testNestedHiveViews()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testSelectFromHiveViewWithoutDefaultCatalogAndSchema()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS no_catalog_schema_view");
@@ -469,6 +487,7 @@ public void testSelectFromHiveViewWithoutDefaultCatalogAndSchema()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testTimestampHiveView()
     {
         onHive().executeQuery("DROP TABLE IF EXISTS timestamp_hive_table");
@@ -501,6 +520,7 @@ public void testTimestampHiveView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testCurrentUser()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS current_user_hive_view");
@@ -512,6 +532,7 @@ public void testCurrentUser()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testNestedGroupBy()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS test_nested_group_by_view");
@@ -600,6 +621,7 @@ public void testUnionDistinctViews()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testHivePartitionViews()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS test_view_partitioned_column");
@@ -619,6 +641,7 @@ public void testHivePartitionViews()
      * any potential view translation to follow redirections.
      */
     @Test(groups = {HIVE_ICEBERG_REDIRECTIONS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testViewReferencingHiveAndIcebergTables()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS iceberg.default.view_iceberg_table_actual_data");
@@ -702,6 +725,7 @@ public void testViewReferencingHiveAndIcebergTables()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testViewWithColumnAliasesDifferingInCase()
     {
         onHive().executeQuery("DROP TABLE IF EXISTS test_hive_namesake_column_name_a");
@@ -728,6 +752,7 @@ public void testViewWithColumnAliasesDifferingInCase()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testRunAsInvoker()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS run_as_invoker");
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestAvroSchemaEvolution.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestAvroSchemaEvolution.java
index 2fab8b5c084a..4f6a873bf2ef 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestAvroSchemaEvolution.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestAvroSchemaEvolution.java
@@ -15,8 +15,8 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.assertions.QueryAssert.Row;
 import org.testng.annotations.Test;
@@ -33,11 +33,11 @@
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.AVRO;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class BaseTestAvroSchemaEvolution
         extends ProductTest
@@ -65,7 +65,7 @@ protected BaseTestAvroSchemaEvolution(String tableName, String... varcharPartiti
         this.varcharPartitionColumns = ImmutableList.copyOf(varcharPartitionColumns);
     }
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void createAndLoadTable()
             throws IOException
     {
@@ -97,7 +97,7 @@ public void createAndLoadTable()
         insertData(tableWithSchemaLiteral, 0, "'stringA0'", "0");
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void dropTestTable()
     {
         onTrino().executeQuery(format("DROP TABLE IF EXISTS %s", tableWithSchemaUrl));
@@ -155,9 +155,9 @@ public void testSchemaEvolutionWithIncompatibleType()
         alterTableSchemaLiteral(readSchemaLiteralFromUrl(INCOMPATIBLE_TYPE_SCHEMA));
 
         assertQueryFailure(() -> onTrino().executeQuery(format(selectStarStatement, tableWithSchemaUrl)))
-                .hasMessageContaining("Found int, expecting string");
+                .hasStackTraceContaining("Found int, expecting string");
         assertQueryFailure(() -> onTrino().executeQuery(format(selectStarStatement, tableWithSchemaLiteral)))
-                .hasMessageContaining("Found int, expecting string");
+                .hasStackTraceContaining("Found int, expecting string");
     }
 
     @Test(groups = AVRO)
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestHiveCoercion.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestHiveCoercion.java
index 89ab09735580..b8544dacbe3a 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestHiveCoercion.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestHiveCoercion.java
@@ -16,7 +16,10 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Streams;
 import io.trino.jdbc.TrinoArray;
+import io.trino.plugin.hive.HiveTimestampPrecision;
 import io.trino.tempto.assertions.QueryAssert.Row;
 import io.trino.tempto.fulfillment.table.MutableTablesState;
 import io.trino.tempto.fulfillment.table.TableDefinition;
@@ -28,29 +31,35 @@
 
 import java.math.BigDecimal;
 import java.sql.JDBCType;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.airlift.testing.Assertions.assertEqualsIgnoreOrder;
+import static io.trino.plugin.hive.HiveTimestampPrecision.NANOSECONDS;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.context.ThreadLocalTestContextHolder.testContext;
 import static io.trino.tempto.fulfillment.table.TableHandle.tableHandle;
+import static io.trino.tests.product.utils.JdbcDriverUtils.setSessionProperty;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 import static java.sql.JDBCType.ARRAY;
 import static java.sql.JDBCType.BIGINT;
 import static java.sql.JDBCType.CHAR;
+import static java.sql.JDBCType.DATE;
 import static java.sql.JDBCType.DECIMAL;
 import static java.sql.JDBCType.DOUBLE;
 import static java.sql.JDBCType.FLOAT;
@@ -59,10 +68,14 @@
 import static java.sql.JDBCType.REAL;
 import static java.sql.JDBCType.SMALLINT;
 import static java.sql.JDBCType.STRUCT;
+import static java.sql.JDBCType.TIMESTAMP;
+import static java.sql.JDBCType.TINYINT;
 import static java.sql.JDBCType.VARCHAR;
+import static java.util.Collections.nCopies;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
@@ -95,6 +108,9 @@ protected void doTestHiveCoercion(HiveTableDefinition tableDefinition)
                 "bigint_to_varchar",
                 "float_to_double",
                 "double_to_float",
+                "double_to_string",
+                "double_to_bounded_varchar",
+                "double_infinity_to_string",
                 "shortdecimal_to_shortdecimal",
                 "shortdecimal_to_longdecimal",
                 "longdecimal_to_shortdecimal",
@@ -103,14 +119,31 @@ protected void doTestHiveCoercion(HiveTableDefinition tableDefinition)
                 "double_to_decimal",
                 "decimal_to_float",
                 "decimal_to_double",
+                "longdecimal_to_tinyint",
+                "shortdecimal_to_tinyint",
+                "longdecimal_to_smallint",
+                "shortdecimal_to_smallint",
+                "too_big_shortdecimal_to_smallint",
+                "longdecimal_to_int",
+                "shortdecimal_to_int",
+                "shortdecimal_with_0_scale_to_int",
+                "longdecimal_to_bigint",
+                "shortdecimal_to_bigint",
                 "short_decimal_to_varchar",
                 "long_decimal_to_varchar",
                 "short_decimal_to_bounded_varchar",
                 "long_decimal_to_bounded_varchar",
                 "varchar_to_bigger_varchar",
                 "varchar_to_smaller_varchar",
+                "varchar_to_date",
+                "varchar_to_distant_date",
                 "char_to_bigger_char",
                 "char_to_smaller_char",
+                "timestamp_to_string",
+                "timestamp_to_bounded_varchar",
+                "timestamp_to_smaller_varchar",
+                "smaller_varchar_to_timestamp",
+                "varchar_to_timestamp",
                 "id");
 
         Function<Engine, Map<String, List<Object>>> expected = engine -> expectedValuesForEngineProvider(engine, tableName, decimalToFloatVal, floatToDecimalVal);
@@ -151,10 +184,23 @@ protected void insertTableRows(String tableName, String floatToDoubleType)
                         "  12345, " +
                         "  REAL '0.5', " +
                         "  DOUBLE '0.5', " +
+                        "  DOUBLE '12345.12345', " +
+                        "  DOUBLE '12345.12345', " +
+                        "  DOUBLE 'Infinity' ," +
                         "  DECIMAL '12345678.12', " +
                         "  DECIMAL '12345678.12', " +
                         "  DECIMAL '12345678.123456123456', " +
                         "  DECIMAL '12345678.123456123456', " +
+                        "  DECIMAL '13.1313', " +
+                        "  DECIMAL '11.99', " +
+                        "  DECIMAL '140.1323', " +
+                        "  DECIMAL '142.99', " +
+                        "  DECIMAL '312343.99', " +
+                        "  DECIMAL '312345.99', " +
+                        "  DECIMAL '312347.13433', " +
+                        "  DECIMAL '123', " +
+                        "  DECIMAL '123471234567.9989', " +
+                        "  DECIMAL '12345678.12', " +
                         "  %2$s '12345.12345', " +
                         "  DOUBLE '12345.12345', " +
                         "  DECIMAL '12345.12345', " +
@@ -165,8 +211,15 @@ protected void insertTableRows(String tableName, String floatToDoubleType)
                         "  DECIMAL '12345678.123456123456', " +
                         "  'abc', " +
                         "  'abc', " +
+                        "  '2023-09-28', " +
+                        "  '8000-04-13', " +
                         "  'abc', " +
                         "  'abc', " +
+                        "  TIMESTAMP '2121-07-15 15:30:12.123', " +
+                        "  TIMESTAMP '2121-07-15 15:30:12.123', " +
+                        "  TIMESTAMP '2121-07-15 15:30:12.123', " +
+                        "  '2121', " +
+                        "  '2019-01-29 23:59:59.123', " +
                         "  1), " +
                         "(" +
                         "  CAST(ROW (NULL, 1, -100, -2323, -12345, 2) AS ROW(keep VARCHAR, ti2si TINYINT, si2int SMALLINT, int2bi INTEGER, bi2vc BIGINT, lower2uppercase BIGINT)), " +
@@ -181,10 +234,23 @@ protected void insertTableRows(String tableName, String floatToDoubleType)
                         "  -12345, " +
                         "  REAL '-1.5', " +
                         "  DOUBLE '-1.5', " +
+                        "  DOUBLE 'NaN', " +
+                        "  DOUBLE '-12345.12345', " +
+                        "  DOUBLE '-Infinity' ," +
                         "  DECIMAL '-12345678.12', " +
                         "  DECIMAL '-12345678.12', " +
                         "  DECIMAL '-12345678.123456123456', " +
                         "  DECIMAL '-12345678.123456123456', " +
+                        "  DECIMAL '-12.1313', " +
+                        "  DECIMAL '-10.99', " +
+                        "  DECIMAL '-141.1323', " +
+                        "  DECIMAL '-143.99', " +
+                        "  DECIMAL '-312342.99', " +
+                        "  DECIMAL '-312346.99', " +
+                        "  DECIMAL '-312348.13433', " +
+                        "  DECIMAL '-124', " +
+                        "  DECIMAL '-123471234577.9989', " +
+                        "  DECIMAL '-12345678.12', " +
                         "  %2$s '-12345.12345', " +
                         "  DOUBLE '-12345.12345', " +
                         "  DECIMAL '-12345.12345', " +
@@ -195,8 +261,15 @@ protected void insertTableRows(String tableName, String floatToDoubleType)
                         "  DECIMAL '-12345678.123456123456', " +
                         "  '\uD83D\uDCB0\uD83D\uDCB0\uD83D\uDCB0', " +
                         "  '\uD83D\uDCB0\uD83D\uDCB0\uD83D\uDCB0', " +
+                        "  '2023-09-27', " +
+                        "  '1900-01-01', " +
                         "  '\uD83D\uDCB0\uD83D\uDCB0\uD83D\uDCB0', " +
                         "  '\uD83D\uDCB0\uD83D\uDCB0\uD83D\uDCB0', " +
+                        "  TIMESTAMP '1970-01-01 00:00:00.123', " +
+                        "  TIMESTAMP '1970-01-01 00:00:00.123', " +
+                        "  TIMESTAMP '1970-01-01 00:00:00.123', " +
+                        "  '1970', " +
+                        "  '1970-01-01 00:00:00.123', " +
                         "  1)",
                 tableName,
                 floatToDoubleType));
@@ -205,8 +278,9 @@ protected void insertTableRows(String tableName, String floatToDoubleType)
     protected Map<String, List<Object>> expectedValuesForEngineProvider(Engine engine, String tableName, String decimalToFloatVal, String floatToDecimalVal)
     {
         String hiveValueForCaseChangeField;
+        String coercedNaN = "NaN";
         Predicate<String> isFormat = formatName -> tableName.toLowerCase(ENGLISH).contains(formatName);
-        if (isFormat.test("rctext") || isFormat.test("textfile")) {
+        if (Stream.of("rctext", "textfile", "sequencefile").anyMatch(isFormat)) {
             hiveValueForCaseChangeField = "\"lower2uppercase\":2";
         }
         else if (getHiveVersionMajor() == 3 && isFormat.test("orc")) {
@@ -216,6 +290,11 @@ else if (getHiveVersionMajor() == 3 && isFormat.test("orc")) {
             hiveValueForCaseChangeField = "\"LOWER2UPPERCASE\":2";
         }
 
+        // Apache Hive reads Double.NaN as null when coerced to varchar for ORC file format
+        if (isFormat.test("orc")) {
+            coercedNaN = null;
+        }
+
         return ImmutableMap.<String, List<Object>>builder()
                 .put("row_to_row", ImmutableList.of(
                         engine == Engine.TRINO ?
@@ -296,6 +375,9 @@ else if (getHiveVersionMajor() == 3 && isFormat.test("orc")) {
                         0.5,
                         -1.5))
                 .put("double_to_float", ImmutableList.of(0.5, -1.5))
+                .put("double_to_string", Arrays.asList("12345.12345", coercedNaN))
+                .put("double_to_bounded_varchar", ImmutableList.of("12345.12345", "-12345.12345"))
+                .put("double_infinity_to_string", ImmutableList.of("Infinity", "-Infinity"))
                 .put("shortdecimal_to_shortdecimal", ImmutableList.of(
                         new BigDecimal("12345678.1200"),
                         new BigDecimal("-12345678.1200")))
@@ -316,6 +398,36 @@ else if (getHiveVersionMajor() == 3 && isFormat.test("orc")) {
                 .put("decimal_to_double", ImmutableList.of(
                         12345.12345,
                         -12345.12345))
+                .put("longdecimal_to_tinyint", ImmutableList.of(
+                        13,
+                        -12))
+                .put("shortdecimal_to_tinyint", ImmutableList.of(
+                        11,
+                        -10))
+                .put("longdecimal_to_smallint", ImmutableList.of(
+                        140,
+                        -141))
+                .put("shortdecimal_to_smallint", ImmutableList.of(
+                        142,
+                        -143))
+                .put("too_big_shortdecimal_to_smallint", Arrays.asList(
+                        null,
+                        null))
+                .put("longdecimal_to_int", ImmutableList.of(
+                        312345,
+                        -312346))
+                .put("shortdecimal_to_int", ImmutableList.of(
+                        312347,
+                        -312348))
+                .put("shortdecimal_with_0_scale_to_int", ImmutableList.of(
+                        123,
+                        -124))
+                .put("longdecimal_to_bigint", ImmutableList.of(
+                        123471234567L,
+                        -123471234577L))
+                .put("shortdecimal_to_bigint", ImmutableList.of(
+                        12345678,
+                        -12345678))
                 .put("short_decimal_to_varchar", ImmutableList.of(
                         "12345.12345",
                         "-12345.12345"))
@@ -334,18 +446,192 @@ else if (getHiveVersionMajor() == 3 && isFormat.test("orc")) {
                 .put("varchar_to_smaller_varchar", ImmutableList.of(
                         "ab",
                         "\uD83D\uDCB0\uD83D\uDCB0"))
+                .put("varchar_to_date", ImmutableList.of(
+                        java.sql.Date.valueOf("2023-09-28"),
+                        java.sql.Date.valueOf("2023-09-27")))
+                .put("varchar_to_distant_date", ImmutableList.of(
+                        java.sql.Date.valueOf("8000-04-13"),
+                        java.sql.Date.valueOf("1900-01-01")))
                 .put("char_to_bigger_char", ImmutableList.of(
                         "abc ",
                         "\uD83D\uDCB0\uD83D\uDCB0\uD83D\uDCB0 "))
                 .put("char_to_smaller_char", ImmutableList.of(
                         "ab",
                         "\uD83D\uDCB0\uD83D\uDCB0"))
+                .put("timestamp_to_string", ImmutableList.of(
+                        "2121-07-15 15:30:12.123",
+                        "1970-01-01 00:00:00.123"))
+                .put("timestamp_to_bounded_varchar", ImmutableList.of(
+                        "2121-07-15 15:30:12.123",
+                        "1970-01-01 00:00:00.123"))
+                .put("timestamp_to_smaller_varchar", ImmutableList.of(
+                        "2121",
+                        "1970"))
+                .put("smaller_varchar_to_timestamp", Arrays.asList(
+                        null,
+                        null))
+                .put("varchar_to_timestamp", Arrays.asList(
+                        Timestamp.valueOf("2019-01-29 23:59:59.123"),
+                        Timestamp.valueOf("1970-01-01 00:00:00.123")))
                 .put("id", ImmutableList.of(
                         1,
                         1))
                 .buildOrThrow();
     }
 
+    protected void doTestHiveCoercionWithDifferentTimestampPrecision(HiveTableDefinition tableDefinition)
+    {
+        String tableName = mutableTableInstanceOf(tableDefinition).getNameInDatabase();
+
+        // Insert all the data with nanoseconds precision
+        setHiveTimestampPrecision(NANOSECONDS);
+        onTrino().executeQuery(
+                """
+                        INSERT INTO %s
+                            SELECT
+                                (CAST(ROW (timestamp_value, -1, timestamp_value, CAST(timestamp_value AS VARCHAR)) AS ROW(keep TIMESTAMP(9), si2i SMALLINT, timestamp2string TIMESTAMP(9), string2timestamp VARCHAR))),
+                                ARRAY [CAST(ROW (timestamp_value, -1, timestamp_value, CAST(timestamp_value AS VARCHAR)) AS ROW (keep TIMESTAMP(9), si2i SMALLINT, timestamp2string TIMESTAMP(9), string2timestamp VARCHAR))],
+                                MAP (ARRAY [2], ARRAY [CAST(ROW (timestamp_value, -1, timestamp_value, CAST(timestamp_value AS VARCHAR)) AS ROW (keep TIMESTAMP(9), si2i SMALLINT, timestamp2string TIMESTAMP(9), string2timestamp VARCHAR))]),
+                                timestamp_value,
+                                CAST(timestamp_value AS VARCHAR),
+                                1
+                            FROM (VALUES
+                                (TIMESTAMP '2121-07-15 15:30:12.123499'),
+                                (TIMESTAMP '2121-07-15 15:30:12.123500'),
+                                (TIMESTAMP '2121-07-15 15:30:12.123501'),
+                                (TIMESTAMP '2121-07-15 15:30:12.123499999'),
+                                (TIMESTAMP '2121-07-15 15:30:12.123500000'),
+                                (TIMESTAMP '2121-07-15 15:30:12.123500001')) AS t (timestamp_value)
+                        """.formatted(tableName));
+
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN timestamp_row_to_row timestamp_row_to_row struct<keep:timestamp, si2i:int, timestamp2string:string, string2timestamp:timestamp>", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN timestamp_list_to_list timestamp_list_to_list array<struct<keep:timestamp, si2i:int, timestamp2string:string, string2timestamp:timestamp>>", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN timestamp_map_to_map timestamp_map_to_map map<int,struct<keep:timestamp, si2i:int, timestamp2string:string, string2timestamp:timestamp>>", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN timestamp_to_string timestamp_to_string string", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN string_to_timestamp string_to_timestamp TIMESTAMP", tableName));
+
+        for (HiveTimestampPrecision hiveTimestampPrecision : HiveTimestampPrecision.values()) {
+            String timestampType = "timestamp(%d)".formatted(hiveTimestampPrecision.getPrecision());
+            setHiveTimestampPrecision(hiveTimestampPrecision);
+            assertThat(onTrino().executeQuery("SHOW COLUMNS FROM " + tableName).project(1, 2)).containsExactlyInOrder(
+                    row("timestamp_row_to_row", "row(keep %1$s, si2i integer, timestamp2string varchar, string2timestamp %1$s)".formatted(timestampType)),
+                    row("timestamp_list_to_list", "array(row(keep %1$s, si2i integer, timestamp2string varchar, string2timestamp %1$s))".formatted(timestampType)),
+                    row("timestamp_map_to_map", "map(integer, row(keep %1$s, si2i integer, timestamp2string varchar, string2timestamp %1$s))".formatted(timestampType)),
+                    row("timestamp_to_string", "varchar"),
+                    row("string_to_timestamp", timestampType),
+                    row("id", "bigint"));
+
+            List<String> allColumns = ImmutableList.of(
+                    "timestamp_row_to_row",
+                    "timestamp_list_to_list",
+                    "timestamp_map_to_map",
+                    "timestamp_to_string",
+                    "string_to_timestamp",
+                    "id");
+
+            // For Trino, remove unsupported columns
+            List<String> trinoReadColumns = removeUnsupportedColumnsForTrino(allColumns, tableName);
+            Map<String, List<Object>> expectedTinoResults = Maps.filterKeys(
+                    expectedRowsForEngineProvider(Engine.TRINO, hiveTimestampPrecision),
+                    trinoReadColumns::contains);
+
+            String trinoReadQuery = format("SELECT %s FROM %s", String.join(", ", trinoReadColumns), tableName);
+            assertQueryResults(Engine.TRINO, trinoReadQuery, expectedTinoResults, trinoReadColumns, 6, tableName);
+
+            List<String> hiveReadColumns = removeUnsupportedColumnsForHive(allColumns, tableName);
+            Map<String, List<Object>> expectedHiveResults = Maps.filterKeys(
+                    expectedRowsForEngineProvider(Engine.HIVE, hiveTimestampPrecision),
+                    hiveReadColumns::contains);
+
+            String hiveSelectQuery = format("SELECT %s FROM %s", String.join(", ", hiveReadColumns), tableName);
+            assertQueryResults(Engine.HIVE, hiveSelectQuery, expectedHiveResults, hiveReadColumns, 6, tableName);
+        }
+    }
+
+    protected Map<String, List<Object>> expectedRowsForEngineProvider(Engine engine, HiveTimestampPrecision timestampPrecision)
+    {
+        List<Object> timestampAsString = ImmutableList.of(
+                "2121-07-15 15:30:12.123499",
+                "2121-07-15 15:30:12.1235",
+                "2121-07-15 15:30:12.123501",
+                "2121-07-15 15:30:12.123499999",
+                "2121-07-15 15:30:12.1235",
+                "2121-07-15 15:30:12.123500001");
+        if (engine == Engine.HIVE) {
+            List<Object> baseData = ImmutableList.of(
+                    "{\"keep\":\"2121-07-15 15:30:12.123499\",\"si2i\":-1,\"timestamp2string\":\"2121-07-15 15:30:12.123499\",\"string2timestamp\":\"2121-07-15 15:30:12.123499\"}",
+                    "{\"keep\":\"2121-07-15 15:30:12.1235\",\"si2i\":-1,\"timestamp2string\":\"2121-07-15 15:30:12.1235\",\"string2timestamp\":\"2121-07-15 15:30:12.1235\"}",
+                    "{\"keep\":\"2121-07-15 15:30:12.123501\",\"si2i\":-1,\"timestamp2string\":\"2121-07-15 15:30:12.123501\",\"string2timestamp\":\"2121-07-15 15:30:12.123501\"}",
+                    "{\"keep\":\"2121-07-15 15:30:12.123499999\",\"si2i\":-1,\"timestamp2string\":\"2121-07-15 15:30:12.123499999\",\"string2timestamp\":\"2121-07-15 15:30:12.123499999\"}",
+                    "{\"keep\":\"2121-07-15 15:30:12.1235\",\"si2i\":-1,\"timestamp2string\":\"2121-07-15 15:30:12.1235\",\"string2timestamp\":\"2121-07-15 15:30:12.1235\"}",
+                    "{\"keep\":\"2121-07-15 15:30:12.123500001\",\"si2i\":-1,\"timestamp2string\":\"2121-07-15 15:30:12.123500001\",\"string2timestamp\":\"2121-07-15 15:30:12.123500001\"}");
+            return ImmutableMap.<String, List<Object>>builder()
+                    .put("timestamp_row_to_row", baseData)
+                    .put("timestamp_list_to_list", baseData.stream()
+                            .map(ImmutableList::of)
+                            .map(Objects::toString)
+                            .collect(toImmutableList()))
+                    .put("timestamp_map_to_map", baseData.stream()
+                            .map("{2:%s}"::formatted)
+                            .collect(toImmutableList()))
+                    .put("timestamp_to_string", timestampAsString)
+                    .put("string_to_timestamp", timestampAsString.stream()
+                            .map(String.class::cast)
+                            .map(Timestamp::valueOf)
+                            .collect(toImmutableList()))
+                    .put("id", nCopies(6, 1))
+                    .buildOrThrow();
+        }
+
+        List<Object> timestampValue = switch (timestampPrecision) {
+            case MILLISECONDS -> ImmutableList.of(
+                    Timestamp.valueOf("2121-07-15 15:30:12.123"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.124"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.124"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.123"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.124"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.124"));
+            case MICROSECONDS -> ImmutableList.of(
+                    Timestamp.valueOf("2121-07-15 15:30:12.123499"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.1235"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.123501"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.1235"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.1235"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.1235"));
+            case NANOSECONDS -> ImmutableList.of(
+                    Timestamp.valueOf("2121-07-15 15:30:12.123499"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.1235"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.123501"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.123499999"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.1235"),
+                    Timestamp.valueOf("2121-07-15 15:30:12.123500001"));
+        };
+
+        List<Object> baseData = Streams.zip(
+                timestampValue.stream(),
+                timestampAsString.stream(),
+                (timestamp, timestampCoerced) -> rowBuilder()
+                        .addField("keep", timestamp)
+                        .addField("si2i", -1)
+                        .addField("timestamp2string", timestampCoerced)
+                        .addField("string2timestamp", timestamp)
+                        .build())
+                .collect(toImmutableList());
+
+        return ImmutableMap.<String, List<Object>>builder()
+                .put("timestamp_row_to_row", baseData)
+                .put("timestamp_list_to_list", baseData.stream()
+                        .map(ImmutableList::of)
+                        .collect(toImmutableList()))
+                .put("timestamp_map_to_map", baseData.stream()
+                        .map(entry -> ImmutableMap.of(2, entry))
+                        .collect(toImmutableList()))
+                .put("timestamp_to_string", timestampAsString)
+                .put("string_to_timestamp", timestampValue)
+                .put("id", nCopies(6, 1))
+                .buildOrThrow();
+    }
+
     protected List<String> removeUnsupportedColumnsForHive(List<String> columns, String tableName)
     {
         // TODO: assert exceptions being thrown for each column
@@ -442,10 +728,16 @@ protected Map<ColumnContext, String> expectedExceptionsWithHiveContext()
                 .put(columnContext("1.2", "orc", "map_to_map"), "Unknown encoding kind: DIRECT_V2")
                 // Parquet
                 .put(columnContext("1.2", "parquet", "list_to_list"), "java.lang.UnsupportedOperationException: Cannot inspect java.util.ArrayList")
+                .put(columnContext("1.2", "parquet", "timestamp_row_to_row"), "Timestamp value coerced to a different value due to zone difference in HiveServer")
+                .put(columnContext("1.2", "parquet", "timestamp_list_to_list"), "java.lang.UnsupportedOperationException: Cannot inspect java.util.ArrayList")
+                .put(columnContext("1.2", "parquet", "timestamp_map_to_map"), "java.lang.UnsupportedOperationException: Cannot inspect java.util.ArrayList")
                 // Rcbinary
                 .put(columnContext("1.2", "rcbinary", "row_to_row"), "java.util.ArrayList cannot be cast to org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryStruct")
                 .put(columnContext("1.2", "rcbinary", "list_to_list"), "java.util.ArrayList cannot be cast to org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryArray")
                 .put(columnContext("1.2", "rcbinary", "map_to_map"), "java.util.HashMap cannot be cast to org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryMap")
+                .put(columnContext("1.2", "rcbinary", "timestamp_row_to_row"), "java.util.ArrayList cannot be cast to org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryStruct")
+                .put(columnContext("1.2", "rcbinary", "timestamp_list_to_list"), "java.util.ArrayList cannot be cast to org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryArray")
+                .put(columnContext("1.2", "rcbinary", "timestamp_map_to_map"), "java.util.HashMap cannot be cast to org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryMap")
                 //
                 // 2.1
                 // Parquet
@@ -472,6 +764,9 @@ protected Map<ColumnContext, String> expectedExceptionsWithHiveContext()
                 .put(columnContext("3.1", "rcbinary", "row_to_row"), "java.util.ArrayList cannot be cast to org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryStruct")
                 .put(columnContext("3.1", "rcbinary", "list_to_list"), "java.util.ArrayList cannot be cast to org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryArray")
                 .put(columnContext("3.1", "rcbinary", "map_to_map"), "java.util.LinkedHashMap cannot be cast to org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryMap")
+                .put(columnContext("3.1", "rcbinary", "timestamp_row_to_row"), "java.util.ArrayList cannot be cast to org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryStruct")
+                .put(columnContext("3.1", "rcbinary", "timestamp_list_to_list"), "java.util.ArrayList cannot be cast to org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryArray")
+                .put(columnContext("3.1", "rcbinary", "timestamp_map_to_map"), "java.util.LinkedHashMap cannot be cast to org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryMap")
                 .buildOrThrow();
     }
 
@@ -509,7 +804,7 @@ private void assertQueryResults(
         for (int sqlIndex = 1; sqlIndex <= columns.size(); sqlIndex++) {
             String column = columns.get(sqlIndex - 1);
 
-            if (column.equals("row_to_row") || column.equals("map_to_map")) {
+            if (column.contains("row_to_row") || column.contains("map_to_map")) {
                 assertEqualsIgnoreOrder(
                         actual.column(sqlIndex),
                         column(expectedRows, sqlIndex),
@@ -517,7 +812,7 @@ private void assertQueryResults(
                 continue;
             }
 
-            if (column.equals("list_to_list")) {
+            if (column.contains("list_to_list")) {
                 assertEqualsIgnoreOrder(
                         engine == Engine.TRINO ? extract(actual.column(sqlIndex)) : actual.column(sqlIndex),
                         column(expectedRows, sqlIndex),
@@ -548,10 +843,23 @@ private void assertProperAlteredTableSchema(String tableName)
                 row("bigint_to_varchar", "varchar"),
                 row("float_to_double", "double"),
                 row("double_to_float", floatType),
+                row("double_to_string", "varchar"),
+                row("double_to_bounded_varchar", "varchar(12)"),
+                row("double_infinity_to_string", "varchar"),
                 row("shortdecimal_to_shortdecimal", "decimal(18,4)"),
                 row("shortdecimal_to_longdecimal", "decimal(20,4)"),
                 row("longdecimal_to_shortdecimal", "decimal(12,2)"),
                 row("longdecimal_to_longdecimal", "decimal(38,14)"),
+                row("longdecimal_to_tinyint", "tinyint"),
+                row("shortdecimal_to_tinyint", "tinyint"),
+                row("longdecimal_to_smallint", "smallint"),
+                row("shortdecimal_to_smallint", "smallint"),
+                row("too_big_shortdecimal_to_smallint", "smallint"),
+                row("longdecimal_to_int", "integer"),
+                row("shortdecimal_to_int", "integer"),
+                row("shortdecimal_with_0_scale_to_int", "integer"),
+                row("longdecimal_to_bigint", "bigint"),
+                row("shortdecimal_to_bigint", "bigint"),
                 row("float_to_decimal", "decimal(10,5)"),
                 row("double_to_decimal", "decimal(10,5)"),
                 row("decimal_to_float", floatType),
@@ -562,8 +870,15 @@ private void assertProperAlteredTableSchema(String tableName)
                 row("long_decimal_to_bounded_varchar", "varchar(30)"),
                 row("varchar_to_bigger_varchar", "varchar(4)"),
                 row("varchar_to_smaller_varchar", "varchar(2)"),
+                row("varchar_to_date", "date"),
+                row("varchar_to_distant_date", "date"),
                 row("char_to_bigger_char", "char(4)"),
                 row("char_to_smaller_char", "char(2)"),
+                row("timestamp_to_string", "varchar"),
+                row("timestamp_to_bounded_varchar", "varchar(30)"),
+                row("timestamp_to_smaller_varchar", "varchar(4)"),
+                row("smaller_varchar_to_timestamp", "timestamp(3)"),
+                row("varchar_to_timestamp", "timestamp(3)"),
                 row("id", "bigint"));
     }
 
@@ -594,10 +909,23 @@ private void assertColumnTypes(
                 .put("bigint_to_varchar", VARCHAR)
                 .put("float_to_double", DOUBLE)
                 .put("double_to_float", floatType)
+                .put("double_to_string", VARCHAR)
+                .put("double_to_bounded_varchar", VARCHAR)
+                .put("double_infinity_to_string", VARCHAR)
                 .put("shortdecimal_to_shortdecimal", DECIMAL)
                 .put("shortdecimal_to_longdecimal", DECIMAL)
                 .put("longdecimal_to_shortdecimal", DECIMAL)
                 .put("longdecimal_to_longdecimal", DECIMAL)
+                .put("longdecimal_to_tinyint", TINYINT)
+                .put("shortdecimal_to_tinyint", TINYINT)
+                .put("longdecimal_to_smallint", SMALLINT)
+                .put("shortdecimal_to_smallint", SMALLINT)
+                .put("too_big_shortdecimal_to_smallint", SMALLINT)
+                .put("longdecimal_to_int", INTEGER)
+                .put("shortdecimal_to_int", INTEGER)
+                .put("shortdecimal_with_0_scale_to_int", INTEGER)
+                .put("longdecimal_to_bigint", BIGINT)
+                .put("shortdecimal_to_bigint", BIGINT)
                 .put("float_to_decimal", DECIMAL)
                 .put("double_to_decimal", DECIMAL)
                 .put("decimal_to_float", floatType)
@@ -608,10 +936,22 @@ private void assertColumnTypes(
                 .put("long_decimal_to_bounded_varchar", VARCHAR)
                 .put("varchar_to_bigger_varchar", VARCHAR)
                 .put("varchar_to_smaller_varchar", VARCHAR)
+                .put("varchar_to_date", DATE)
+                .put("varchar_to_distant_date", DATE)
                 .put("char_to_bigger_char", CHAR)
                 .put("char_to_smaller_char", CHAR)
                 .put("id", BIGINT)
                 .put("nested_field", BIGINT)
+                .put("timestamp_to_string", VARCHAR)
+                .put("timestamp_to_bounded_varchar", VARCHAR)
+                .put("timestamp_to_smaller_varchar", VARCHAR)
+                .put("smaller_varchar_to_timestamp", TIMESTAMP)
+                .put("varchar_to_timestamp", TIMESTAMP)
+                .put("timestamp_to_varchar", VARCHAR)
+                .put("timestamp_row_to_row", engine == Engine.TRINO ? JAVA_OBJECT : STRUCT)   // row
+                .put("timestamp_list_to_list", ARRAY) // list
+                .put("timestamp_map_to_map", JAVA_OBJECT) // map
+                .put("string_to_timestamp", TIMESTAMP)
                 .buildOrThrow();
 
         assertThat(queryResult)
@@ -634,10 +974,23 @@ private static void alterTableColumnTypes(String tableName)
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN bigint_to_varchar bigint_to_varchar string", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN float_to_double float_to_double double", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN double_to_float double_to_float %s", tableName, floatType));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN double_to_string double_to_string string", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN double_to_bounded_varchar double_to_bounded_varchar varchar(12)", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN double_infinity_to_string double_infinity_to_string string", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN shortdecimal_to_shortdecimal shortdecimal_to_shortdecimal DECIMAL(18,4)", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN shortdecimal_to_longdecimal shortdecimal_to_longdecimal DECIMAL(20,4)", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN longdecimal_to_shortdecimal longdecimal_to_shortdecimal DECIMAL(12,2)", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN longdecimal_to_longdecimal longdecimal_to_longdecimal DECIMAL(38,14)", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN longdecimal_to_tinyint longdecimal_to_tinyint TINYINT", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN shortdecimal_to_tinyint shortdecimal_to_tinyint TINYINT", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN longdecimal_to_smallint longdecimal_to_smallint SMALLINT", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN shortdecimal_to_smallint shortdecimal_to_smallint SMALLINT", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN too_big_shortdecimal_to_smallint too_big_shortdecimal_to_smallint SMALLINT", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN longdecimal_to_int longdecimal_to_int INTEGER", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN shortdecimal_to_int shortdecimal_to_int INTEGER", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN shortdecimal_with_0_scale_to_int shortdecimal_with_0_scale_to_int INTEGER", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN longdecimal_to_bigint longdecimal_to_bigint BIGINT", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN shortdecimal_to_bigint shortdecimal_to_bigint BIGINT", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN float_to_decimal float_to_decimal DECIMAL(10,5)", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN double_to_decimal double_to_decimal DECIMAL(10,5)", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN decimal_to_float decimal_to_float %s", tableName, floatType));
@@ -648,8 +1001,15 @@ private static void alterTableColumnTypes(String tableName)
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN long_decimal_to_bounded_varchar long_decimal_to_bounded_varchar varchar(30)", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN varchar_to_bigger_varchar varchar_to_bigger_varchar varchar(4)", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN varchar_to_smaller_varchar varchar_to_smaller_varchar varchar(2)", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN varchar_to_date varchar_to_date date", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN varchar_to_distant_date varchar_to_distant_date date", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN char_to_bigger_char char_to_bigger_char char(4)", tableName));
         onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN char_to_smaller_char char_to_smaller_char char(2)", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN timestamp_to_string timestamp_to_string string", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN timestamp_to_bounded_varchar timestamp_to_bounded_varchar varchar(30)", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN timestamp_to_smaller_varchar timestamp_to_smaller_varchar varchar(4)", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN smaller_varchar_to_timestamp smaller_varchar_to_timestamp timestamp", tableName));
+        onHive().executeQuery(format("ALTER TABLE %s CHANGE COLUMN varchar_to_timestamp varchar_to_timestamp timestamp", tableName));
     }
 
     protected static TableInstance<?> mutableTableInstanceOf(TableDefinition tableDefinition)
@@ -736,4 +1096,14 @@ private static QueryResult execute(Engine engine, String sql, QueryExecutor.Quer
     {
         return engine.queryExecutor().executeQuery(sql, params);
     }
+
+    private static void setHiveTimestampPrecision(HiveTimestampPrecision hiveTimestampPrecision)
+    {
+        try {
+            setSessionProperty(onTrino().getConnection(), "hive.timestamp_precision", hiveTimestampPrecision.name());
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestSyncPartitionMetadata.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestSyncPartitionMetadata.java
index 1c33c37e4300..704ea07cf780 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestSyncPartitionMetadata.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/BaseTestSyncPartitionMetadata.java
@@ -19,10 +19,10 @@
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.hive.util.TableLocationUtils.getTableLocation;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/HiveProductTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/HiveProductTest.java
index 15d4cc0b2b1c..bdbf9c549fc2 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/HiveProductTest.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/HiveProductTest.java
@@ -13,10 +13,9 @@
  */
 package io.trino.tests.product.hive;
 
+import com.google.inject.Inject;
 import io.trino.tempto.ProductTest;
 
-import javax.inject.Inject;
-
 public class HiveProductTest
         extends ProductTest
 {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/HiveVersionProvider.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/HiveVersionProvider.java
index d21b4d2b695c..6380ef90c00a 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/HiveVersionProvider.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/HiveVersionProvider.java
@@ -14,11 +14,10 @@
 package io.trino.tests.product.hive;
 
 import com.google.inject.Module;
+import com.google.inject.Singleton;
 import io.trino.tempto.configuration.Configuration;
 import io.trino.tempto.initialization.SuiteModuleProvider;
 
-import javax.inject.Singleton;
-
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
 import java.util.Optional;
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAbfsSyncPartitionMetadata.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAbfsSyncPartitionMetadata.java
index 21fad74372e0..6dd1acf764ad 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAbfsSyncPartitionMetadata.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAbfsSyncPartitionMetadata.java
@@ -13,8 +13,8 @@
  */
 package io.trino.tests.product.hive;
 
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.testng.services.Flaky;
 import org.testng.annotations.Test;
 
@@ -34,14 +34,14 @@ public class TestAbfsSyncPartitionMetadata
 {
     private final String schema = "test_" + randomNameSuffix();
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         removeHdfsDirectory(schemaLocation());
         makeHdfsDirectory(schemaLocation());
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void tearDown()
     {
         removeHdfsDirectory(schemaLocation());
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAllDatatypesFromHiveConnector.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAllDatatypesFromHiveConnector.java
index 2bf4374d4abc..00614073c6db 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAllDatatypesFromHiveConnector.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAllDatatypesFromHiveConnector.java
@@ -24,6 +24,7 @@
 import io.trino.tempto.fulfillment.table.TableHandle;
 import io.trino.tempto.fulfillment.table.TableInstance;
 import io.trino.tempto.query.QueryResult;
+import io.trino.testng.services.Flaky;
 import org.testng.annotations.Test;
 
 import java.math.BigDecimal;
@@ -32,7 +33,6 @@
 import java.time.LocalDateTime;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.context.ThreadLocalTestContextHolder.testContext;
 import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED;
 import static io.trino.tempto.fulfillment.table.TableHandle.tableHandle;
@@ -45,6 +45,8 @@
 import static io.trino.tests.product.hive.AllSimpleTypesTableDefinitions.ALL_HIVE_SIMPLE_TYPES_RCFILE;
 import static io.trino.tests.product.hive.AllSimpleTypesTableDefinitions.ALL_HIVE_SIMPLE_TYPES_TEXTFILE;
 import static io.trino.tests.product.hive.AllSimpleTypesTableDefinitions.populateDataToHiveTable;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_MATCH;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
@@ -62,6 +64,7 @@
 import static java.sql.JDBCType.TINYINT;
 import static java.sql.JDBCType.VARBINARY;
 import static java.sql.JDBCType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAllDatatypesFromHiveConnector
         extends HiveProductTest
@@ -348,6 +351,7 @@ private void assertColumnTypesParquet(QueryResult queryResult)
 
     @Requires(ParquetRequirements.class)
     @Test
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testSelectAllDatatypesParquetFile()
     {
         String tableName = mutableTableInstanceOf(ALL_HIVE_SIMPLE_TYPES_PARQUET).getNameInDatabase();
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaLiteral.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaLiteral.java
index f5f224eae13f..dbfed1b08d65 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaLiteral.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaLiteral.java
@@ -17,11 +17,11 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.AVRO;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAvroSchemaLiteral
         extends HiveProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaStrictness.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaStrictness.java
index 7fc082a044be..223321694065 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaStrictness.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaStrictness.java
@@ -13,24 +13,23 @@
  */
 package io.trino.tests.product.hive;
 
+import com.google.inject.Inject;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import org.testng.annotations.Test;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Path;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.query.QueryExecutor.param;
 import static io.trino.tests.product.TestGroups.AVRO;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 import static java.nio.file.Files.newInputStream;
 import static java.sql.JDBCType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Avro 1.8.2 was not strict about schema validation, causing the more-strict
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaUrl.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaUrl.java
index 2243d60dd155..83d9520ebc9c 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaUrl.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaUrl.java
@@ -14,10 +14,11 @@
 package io.trino.tests.product.hive;
 
 import com.google.inject.Inject;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import io.trino.tempto.query.QueryExecutionException;
+import io.trino.testng.services.Flaky;
 import org.testng.SkipException;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -29,13 +30,15 @@
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.AVRO;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_MATCH;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 import static java.nio.file.Files.newInputStream;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAvroSchemaUrl
         extends HiveProductTest
@@ -43,7 +46,7 @@ public class TestAvroSchemaUrl
     @Inject
     private HdfsClient hdfsClient;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setup()
             throws Exception
     {
@@ -52,12 +55,13 @@ public void setup()
         hdfsClient.createDirectory("/user/hive/warehouse/TestAvroSchemaUrl/schemas");
         saveResourceOnHdfs("avro/original_schema.avsc", "/user/hive/warehouse/TestAvroSchemaUrl/schemas/original_schema.avsc");
         saveResourceOnHdfs("avro/column_with_long_type_definition_schema.avsc", "/user/hive/warehouse/TestAvroSchemaUrl/schemas/column_with_long_type_definition_schema.avsc");
+        saveResourceOnHdfs("avro/camelCaseSchema.avsc", "/user/hive/warehouse/TestAvroSchemaUrl/schemas/camelCaseSchema.avsc");
 
         hdfsClient.createDirectory("/user/hive/warehouse/TestAvroSchemaUrl/data");
         saveResourceOnHdfs("avro/column_with_long_type_definition_data.avro", "/user/hive/warehouse/TestAvroSchemaUrl/data/column_with_long_type_definition_data.avro");
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void cleanup()
     {
         hdfsClient.delete("/user/hive/warehouse/TestAvroSchemaUrl");
@@ -84,6 +88,7 @@ public Object[][] avroSchemaLocations()
     }
 
     @Test(dataProvider = "avroSchemaLocations", groups = {AVRO, STORAGE_FORMATS})
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testHiveCreatedTable(String schemaLocation)
     {
         onHive().executeQuery("DROP TABLE IF EXISTS test_avro_schema_url_hive");
@@ -104,6 +109,7 @@ public void testHiveCreatedTable(String schemaLocation)
     }
 
     @Test(groups = AVRO)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testAvroSchemaUrlInSerdeProperties()
             throws IOException
     {
@@ -146,6 +152,7 @@ public void testAvroSchemaUrlInSerdeProperties()
     }
 
     @Test(dataProvider = "avroSchemaLocations", groups = {AVRO, STORAGE_FORMATS})
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testPrestoCreatedTable(String schemaLocation)
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS test_avro_schema_url_presto");
@@ -159,6 +166,7 @@ public void testPrestoCreatedTable(String schemaLocation)
     }
 
     @Test(groups = {AVRO, STORAGE_FORMATS})
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testTableWithLongColumnType()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS test_avro_schema_url_long_column");
@@ -188,6 +196,7 @@ public void testTableWithLongColumnType()
     }
 
     @Test(groups = {AVRO, STORAGE_FORMATS})
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testPartitionedTableWithLongColumnType()
     {
         if (isOnHdp() && getHiveVersionMajor() < 3) {
@@ -231,6 +240,30 @@ public void testPartitionedTableWithLongColumnType()
         onHive().executeQuery("DROP TABLE IF EXISTS test_avro_schema_url_partitioned_long_column");
     }
 
+    @Test(groups = {AVRO, STORAGE_FORMATS})
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
+    public void testHiveCreatedCamelCaseColumnTable()
+    {
+        onHive().executeQuery("DROP TABLE IF EXISTS test_camelCase_avro_schema_url_hive");
+        onHive().executeQuery("" +
+                "CREATE TABLE test_camelCase_avro_schema_url_hive " +
+                "ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe' " +
+                "STORED AS " +
+                "INPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat' " +
+                "OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerOutputFormat' " +
+                "TBLPROPERTIES ('avro.schema.url'='/user/hive/warehouse/TestAvroSchemaUrl/schemas/camelCaseSchema.avsc')");
+        onHive().executeQuery("INSERT INTO test_camelCase_avro_schema_url_hive VALUES ('hi', 1)");
+        onTrino().executeQuery("INSERT INTO test_camelCase_avro_schema_url_hive VALUES ('bye', 2)");
+        assertThat(onHive().executeQuery("SELECT * FROM test_camelCase_avro_schema_url_hive")).containsOnly(row("hi", 1), row("bye", 2));
+        assertThat(onTrino().executeQuery("SELECT * FROM test_camelCase_avro_schema_url_hive")).containsOnly(row("hi", 1), row("bye", 2));
+        assertThat(onHive().executeQuery("SELECT intCol, stringCol FROM test_camelCase_avro_schema_url_hive")).containsOnly(row(1, "hi"), row(2, "bye"));
+        assertThat(onTrino().executeQuery("SELECT intCol, stringCol FROM test_camelCase_avro_schema_url_hive")).containsOnly(row(1, "hi"), row(2, "bye"));
+        assertThat(onTrino().executeQuery("SELECT column_name FROM information_schema.columns WHERE table_name = 'test_camelcase_avro_schema_url_hive'"))
+                .containsOnly(row("stringcol"), row("intcol"));
+
+        onHive().executeQuery("DROP TABLE IF EXISTS test_camelCase_avro_schema_url_hive");
+    }
+
     private boolean isOnHdp()
     {
         try {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSymlinkInputFormat.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSymlinkInputFormat.java
index d1c277b2201d..ef4ca83f70f7 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSymlinkInputFormat.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSymlinkInputFormat.java
@@ -13,25 +13,24 @@
  */
 package io.trino.tests.product.hive;
 
+import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import org.testng.annotations.Test;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Paths;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.AVRO;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 import static java.nio.file.Files.newInputStream;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAvroSymlinkInputFormat
         extends ProductTest
@@ -137,9 +136,9 @@ public void testSymlinkTableWithNestedDirectory()
                 "OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'");
 
         String tableRoot = warehouseDirectory + '/' + table;
-        String dataDir = warehouseDirectory + "/data_test_avro_symlink_with_nested_directory";
+        String dataDir = warehouseDirectory + "/data_test_avro_symlink_with_nested_directory/nested_directory";
         saveResourceOnHdfs("avro/original_data.avro", dataDir + "/original_data.avro");
-        hdfsClient.saveFile(tableRoot + "/symlink.txt", format("hdfs://%s/", dataDir));
+        hdfsClient.saveFile(tableRoot + "/symlink.txt", format("hdfs://%s/original_data.avro", dataDir));
         assertThat(onTrino().executeQuery("SELECT * FROM " + table)).containsExactlyInOrder(row("someValue", 1));
 
         onHive().executeQuery("DROP TABLE " + table);
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAzureBlobFileSystem.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAzureBlobFileSystem.java
index 846ce7f01452..94ecf31a6a20 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAzureBlobFileSystem.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAzureBlobFileSystem.java
@@ -14,8 +14,8 @@
 package io.trino.tests.product.hive;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.testng.services.Flaky;
@@ -24,7 +24,6 @@
 import java.util.List;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.AZURE;
 import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES;
@@ -33,13 +32,14 @@
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAzureBlobFileSystem
         extends ProductTest
 {
     private String schemaLocation;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         String container = requireNonNull(System.getenv("ABFS_CONTAINER"), "Environment variable not set: ABFS_CONTAINER");
@@ -50,7 +50,7 @@ public void setUp()
         onHive().executeQuery("dfs -mkdir -p " + schemaLocation);
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void tearDown()
     {
         onHive().executeQuery("dfs -mkdir -p " + schemaLocation);
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestComments.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestComments.java
index 54c5081bc1fa..dec82553e2ea 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestComments.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestComments.java
@@ -13,8 +13,8 @@
  */
 package io.trino.tests.product.hive;
 
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import org.testng.annotations.Test;
 
@@ -33,8 +33,8 @@ public class TestComments
     private static final String COMMENT_COLUMN_NAME = "comment_column_test";
     private static final String COMMENT_HIVE_VIEW_NAME = "comment_hive_view_test";
 
-    @BeforeTestWithContext
-    @AfterTestWithContext
+    @BeforeMethodWithContext
+    @AfterMethodWithContext
     public void dropTestTable()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS " + COMMENT_TABLE_NAME);
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCreateDropSchema.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCreateDropSchema.java
index e1a13fe38f04..be18f8de0fe9 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCreateDropSchema.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCreateDropSchema.java
@@ -31,7 +31,7 @@ public class TestCreateDropSchema
     @Inject
     private HdfsClient hdfsClient;
 
-    @javax.inject.Inject
+    @Inject
     @Named("databases.hive.warehouse_directory_path")
     private String warehouseDirectory;
 
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsv.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsv.java
index 581303f674a8..652e79e8663b 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsv.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsv.java
@@ -23,7 +23,6 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HMS_ONLY;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
 import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES;
@@ -31,6 +30,7 @@
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestCsv
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsvFileHiveTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsvFileHiveTable.java
index 509f5cdaae55..3a97b21aa160 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsvFileHiveTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestCsvFileHiveTable.java
@@ -17,9 +17,9 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestCsvFileHiveTable
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestExternalHiveTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestExternalHiveTable.java
index 1d1e31ea540e..a4361cf8e821 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestExternalHiveTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestExternalHiveTable.java
@@ -26,7 +26,6 @@
 import static io.trino.tempto.Requirements.compose;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState;
 import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable;
 import static io.trino.tempto.fulfillment.table.hive.tpch.TpchTableDefinitions.NATION;
@@ -35,6 +34,7 @@
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestExternalHiveTable
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestGrantRevoke.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestGrantRevoke.java
index 555f10392fad..0c9aa289d451 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestGrantRevoke.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestGrantRevoke.java
@@ -17,8 +17,8 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.query.QueryExecutor;
 import org.testng.annotations.Test;
@@ -29,7 +29,6 @@
 import static io.trino.tempto.assertions.QueryAssert.Row;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.context.ContextDsl.executeWith;
 import static io.trino.tempto.sql.SqlContexts.createViewAs;
 import static io.trino.tests.product.TestGroups.AUTHORIZATION;
@@ -38,6 +37,7 @@
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestGrantRevoke
         extends ProductTest
@@ -65,7 +65,7 @@ public class TestGrantRevoke
      *     (all other values of the connection are same as that of the default "presto" connection).
      */
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setup()
     {
         tableName = "alice_owned_table";
@@ -82,7 +82,7 @@ public void setup()
         assertAccessDeniedOnAllOperationsOnTable(bobExecutor, tableName);
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void cleanup()
     {
         aliceExecutor.executeQuery(format("DROP TABLE IF EXISTS %s", tableName));
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveBucketedTables.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveBucketedTables.java
index a1e4429d1ced..96631d662f01 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveBucketedTables.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveBucketedTables.java
@@ -24,7 +24,6 @@
 import io.trino.tempto.query.QueryResult;
 import io.trino.testng.services.Flaky;
 import io.trino.tests.product.hive.util.TemporaryHiveTable;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -36,7 +35,6 @@
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.anyOf;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED;
 import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.PREPARED;
 import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState;
@@ -59,6 +57,7 @@
 import static java.lang.String.join;
 import static java.sql.JDBCType.VARCHAR;
 import static java.util.stream.Collectors.joining;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveBucketedTables
         extends HiveProductTest
@@ -337,7 +336,7 @@ public void testBucketingWithUnsupportedDataTypes(BucketingType bucketingType, S
             QueryResult showCreateTableResult = onTrino().executeQuery("SHOW CREATE TABLE " + tableName);
             assertThat(showCreateTableResult)
                     .hasRowsCount(1);
-            Assertions.assertThat((String) showCreateTableResult.getOnlyValue())
+            assertThat((String) showCreateTableResult.getOnlyValue())
                     .matches(Pattern.compile(format("\\QCREATE TABLE hive.default.%s (\n" +
                                     "   n_integer integer,\n" +
                                     "   n_decimal decimal(9, 2),\n" +
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCaching.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCaching.java
index cd01af15a9b1..5f473544e059 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCaching.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCaching.java
@@ -25,13 +25,13 @@
 import static io.airlift.testing.Assertions.assertGreaterThan;
 import static io.airlift.testing.Assertions.assertGreaterThanOrEqual;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HIVE_CACHING;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.hive.util.CachingTestUtils.getCacheStats;
 import static io.trino.tests.product.utils.QueryAssertions.assertEventually;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 public class TestHiveCaching
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCoercionOnPartitionedTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCoercionOnPartitionedTable.java
index 88f41358fb6e..bdf780749326 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCoercionOnPartitionedTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCoercionOnPartitionedTable.java
@@ -24,8 +24,8 @@
 
 import java.util.Optional;
 
+import static io.trino.tempto.Requirements.compose;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED;
 import static io.trino.tests.product.TestGroups.HIVE_COERCION;
 import static io.trino.tests.product.TestGroups.JDBC;
@@ -35,6 +35,7 @@
 import static java.sql.JDBCType.BIGINT;
 import static java.sql.JDBCType.DOUBLE;
 import static java.util.Locale.ENGLISH;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveCoercionOnPartitionedTable
         extends BaseTestHiveCoercion
@@ -43,10 +44,18 @@ public class TestHiveCoercionOnPartitionedTable
             .setNoData()
             .build();
 
+    public static final HiveTableDefinition HIVE_TIMESTAMP_COERCION_TEXTFILE = tableDefinitionForTimestampCoercionBuilder("TEXTFILE", Optional.empty(), Optional.of("DELIMITED FIELDS TERMINATED BY '|'"))
+            .setNoData()
+            .build();
+
     public static final HiveTableDefinition HIVE_COERCION_PARQUET = tableDefinitionBuilder("PARQUET", Optional.empty(), Optional.empty())
             .setNoData()
             .build();
 
+    public static final HiveTableDefinition HIVE_TIMESTAMP_COERCION_PARQUET = tableDefinitionForTimestampCoercionBuilder("PARQUET", Optional.empty(), Optional.empty())
+            .setNoData()
+            .build();
+
     public static final HiveTableDefinition HIVE_COERCION_AVRO = avroTableDefinitionBuilder()
             .setNoData()
             .build();
@@ -55,14 +64,34 @@ public class TestHiveCoercionOnPartitionedTable
             .setNoData()
             .build();
 
+    public static final HiveTableDefinition HIVE_TIMESTAMP_COERCION_ORC = tableDefinitionForTimestampCoercionBuilder("ORC", Optional.empty(), Optional.empty())
+            .setNoData()
+            .build();
+
     public static final HiveTableDefinition HIVE_COERCION_RCTEXT = tableDefinitionBuilder("RCFILE", Optional.of("RCTEXT"), Optional.of("SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'"))
             .setNoData()
             .build();
 
+    public static final HiveTableDefinition HIVE_TIMESTAMP_COERCION_RCTEXT = tableDefinitionForTimestampCoercionBuilder("RCFILE", Optional.of("RCTEXT"), Optional.of("SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'"))
+            .setNoData()
+            .build();
+
     public static final HiveTableDefinition HIVE_COERCION_RCBINARY = tableDefinitionBuilder("RCFILE", Optional.of("RCBINARY"), Optional.of("SERDE 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe'"))
             .setNoData()
             .build();
 
+    public static final HiveTableDefinition HIVE_TIMESTAMP_COERCION_RCBINARY = tableDefinitionForTimestampCoercionBuilder("RCFILE", Optional.of("RCBINARY"), Optional.of("SERDE 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe'"))
+            .setNoData()
+            .build();
+
+    public static final HiveTableDefinition HIVE_COERCION_SEQUENCE = tableDefinitionBuilder("SEQUENCEFILE", Optional.empty(), Optional.empty())
+            .setNoData()
+            .build();
+
+    public static final HiveTableDefinition HIVE_TIMESTAMP_COERCION_SEQUENCE = tableDefinitionForTimestampCoercionBuilder("SEQUENCEFILE", Optional.empty(), Optional.empty())
+            .setNoData()
+            .build();
+
     private static HiveTableDefinition.HiveTableDefinitionBuilder tableDefinitionBuilder(String fileFormat, Optional<String> recommendTableName, Optional<String> rowFormat)
     {
         String tableName = format("%s_hive_coercion", recommendTableName.orElse(fileFormat).toLowerCase(ENGLISH));
@@ -83,10 +112,23 @@ private static HiveTableDefinition.HiveTableDefinitionBuilder tableDefinitionBui
                         "    bigint_to_varchar          BIGINT," +
                         "    float_to_double            " + floatType + "," +
                         "    double_to_float            DOUBLE," +
+                        "    double_to_string           DOUBLE," +
+                        "    double_to_bounded_varchar  DOUBLE," +
+                        "    double_infinity_to_string  DOUBLE," +
                         "    shortdecimal_to_shortdecimal          DECIMAL(10,2)," +
                         "    shortdecimal_to_longdecimal           DECIMAL(10,2)," +
                         "    longdecimal_to_shortdecimal           DECIMAL(20,12)," +
                         "    longdecimal_to_longdecimal            DECIMAL(20,12)," +
+                        "    longdecimal_to_tinyint                DECIMAL(20,12)," +
+                        "    shortdecimal_to_tinyint               DECIMAL(10,2)," +
+                        "    longdecimal_to_smallint               DECIMAL(20,12)," +
+                        "    shortdecimal_to_smallint              DECIMAL(10,2)," +
+                        "    too_big_shortdecimal_to_smallint      DECIMAL(10,2)," +
+                        "    longdecimal_to_int                    DECIMAL(20,12)," +
+                        "    shortdecimal_to_int                   DECIMAL(10,2)," +
+                        "    shortdecimal_with_0_scale_to_int      DECIMAL(10,0)," +
+                        "    longdecimal_to_bigint                 DECIMAL(20,4)," +
+                        "    shortdecimal_to_bigint                DECIMAL(10,2)," +
                         "    float_to_decimal           " + floatType + "," +
                         "    double_to_decimal          DOUBLE," +
                         "    decimal_to_float                   DECIMAL(10,5)," +
@@ -97,8 +139,32 @@ private static HiveTableDefinition.HiveTableDefinitionBuilder tableDefinitionBui
                         "    long_decimal_to_bounded_varchar    DECIMAL(20,12)," +
                         "    varchar_to_bigger_varchar          VARCHAR(3)," +
                         "    varchar_to_smaller_varchar         VARCHAR(3)," +
+                        "    varchar_to_date                    VARCHAR(10)," +
+                        "    varchar_to_distant_date            VARCHAR(12)," +
                         "    char_to_bigger_char                CHAR(3)," +
-                        "    char_to_smaller_char               CHAR(3)" +
+                        "    char_to_smaller_char               CHAR(3)," +
+                        "    timestamp_to_string                TIMESTAMP," +
+                        "    timestamp_to_bounded_varchar       TIMESTAMP," +
+                        "    timestamp_to_smaller_varchar       TIMESTAMP," +
+                        "    smaller_varchar_to_timestamp       VARCHAR(4)," +
+                        "    varchar_to_timestamp               STRING" +
+                        ") " +
+                        "PARTITIONED BY (id BIGINT) " +
+                        rowFormat.map(s -> format("ROW FORMAT %s ", s)).orElse("") +
+                        "STORED AS " + fileFormat);
+    }
+
+    private static HiveTableDefinition.HiveTableDefinitionBuilder tableDefinitionForTimestampCoercionBuilder(String fileFormat, Optional<String> tablePrefix, Optional<String> rowFormat)
+    {
+        String tableName = format("%s_hive_timestamp_coercion", tablePrefix.orElse(fileFormat).toLowerCase(ENGLISH));
+        return HiveTableDefinition.builder(tableName)
+                .setCreateTableDDLTemplate("" +
+                        "CREATE TABLE %NAME%(" +
+                        "    timestamp_row_to_row                 STRUCT<keep: TIMESTAMP, si2i: SMALLINT, timestamp2string: TIMESTAMP, string2timestamp: STRING>, " +
+                        "    timestamp_list_to_list               ARRAY<STRUCT<keep: TIMESTAMP, si2i: SMALLINT, timestamp2string: TIMESTAMP, string2timestamp: STRING>>, " +
+                        "    timestamp_map_to_map                 MAP<SMALLINT, STRUCT<keep: TIMESTAMP, si2i: SMALLINT, timestamp2string: TIMESTAMP, string2timestamp: STRING>>," +
+                        "    timestamp_to_string                  TIMESTAMP," +
+                        "    string_to_timestamp                  STRING" +
                         ") " +
                         "PARTITIONED BY (id BIGINT) " +
                         rowFormat.map(s -> format("ROW FORMAT %s ", s)).orElse("") +
@@ -123,7 +189,9 @@ public static final class TextRequirements
         @Override
         public Requirement getRequirements(Configuration configuration)
         {
-            return MutableTableRequirement.builder(HIVE_COERCION_TEXTFILE).withState(CREATED).build();
+            return compose(
+                    MutableTableRequirement.builder(HIVE_COERCION_TEXTFILE).withState(CREATED).build(),
+                    MutableTableRequirement.builder(HIVE_TIMESTAMP_COERCION_TEXTFILE).withState(CREATED).build());
         }
     }
 
@@ -133,7 +201,9 @@ public static final class OrcRequirements
         @Override
         public Requirement getRequirements(Configuration configuration)
         {
-            return MutableTableRequirement.builder(HIVE_COERCION_ORC).withState(CREATED).build();
+            return compose(
+                    MutableTableRequirement.builder(HIVE_COERCION_ORC).withState(CREATED).build(),
+                    MutableTableRequirement.builder(HIVE_TIMESTAMP_COERCION_ORC).withState(CREATED).build());
         }
     }
 
@@ -143,7 +213,9 @@ public static final class RcTextRequirements
         @Override
         public Requirement getRequirements(Configuration configuration)
         {
-            return MutableTableRequirement.builder(HIVE_COERCION_RCTEXT).withState(CREATED).build();
+            return compose(
+                    MutableTableRequirement.builder(HIVE_COERCION_RCTEXT).withState(CREATED).build(),
+                    MutableTableRequirement.builder(HIVE_TIMESTAMP_COERCION_RCTEXT).withState(CREATED).build());
         }
     }
 
@@ -153,7 +225,9 @@ public static final class RcBinaryRequirements
         @Override
         public Requirement getRequirements(Configuration configuration)
         {
-            return MutableTableRequirement.builder(HIVE_COERCION_RCBINARY).withState(CREATED).build();
+            return compose(
+                    MutableTableRequirement.builder(HIVE_COERCION_RCBINARY).withState(CREATED).build(),
+                    MutableTableRequirement.builder(HIVE_TIMESTAMP_COERCION_RCBINARY).withState(CREATED).build());
         }
     }
 
@@ -163,7 +237,9 @@ public static final class ParquetRequirements
         @Override
         public Requirement getRequirements(Configuration configuration)
         {
-            return MutableTableRequirement.builder(HIVE_COERCION_PARQUET).withState(CREATED).build();
+            return compose(
+                    MutableTableRequirement.builder(HIVE_COERCION_PARQUET).withState(CREATED).build(),
+                    MutableTableRequirement.builder(HIVE_TIMESTAMP_COERCION_PARQUET).withState(CREATED).build());
         }
     }
 
@@ -177,6 +253,18 @@ public Requirement getRequirements(Configuration configuration)
         }
     }
 
+    public static final class SequenceRequirements
+            implements RequirementsProvider
+    {
+        @Override
+        public Requirement getRequirements(Configuration configuration)
+        {
+            return compose(
+                    MutableTableRequirement.builder(HIVE_COERCION_SEQUENCE).withState(CREATED).build(),
+                    MutableTableRequirement.builder(HIVE_TIMESTAMP_COERCION_SEQUENCE).withState(CREATED).build());
+        }
+    }
+
     @Requires(TextRequirements.class)
     @Test(groups = {HIVE_COERCION, JDBC})
     public void testHiveCoercionTextFile()
@@ -184,6 +272,13 @@ public void testHiveCoercionTextFile()
         doTestHiveCoercion(HIVE_COERCION_TEXTFILE);
     }
 
+    @Requires(TextRequirements.class)
+    @Test(groups = {HIVE_COERCION, JDBC})
+    public void testHiveCoercionWithDifferentTimestampPrecisionTextFile()
+    {
+        doTestHiveCoercionWithDifferentTimestampPrecision(HIVE_TIMESTAMP_COERCION_TEXTFILE);
+    }
+
     @Requires(OrcRequirements.class)
     @Test(groups = {HIVE_COERCION, JDBC})
     public void testHiveCoercionOrc()
@@ -191,6 +286,13 @@ public void testHiveCoercionOrc()
         doTestHiveCoercion(HIVE_COERCION_ORC);
     }
 
+    @Requires(OrcRequirements.class)
+    @Test(groups = {HIVE_COERCION, JDBC})
+    public void testHiveCoercionWithDifferentTimestampPrecisionOrc()
+    {
+        doTestHiveCoercionWithDifferentTimestampPrecision(HIVE_TIMESTAMP_COERCION_ORC);
+    }
+
     @Requires(RcTextRequirements.class)
     @Test(groups = {HIVE_COERCION, JDBC})
     public void testHiveCoercionRcText()
@@ -198,6 +300,13 @@ public void testHiveCoercionRcText()
         doTestHiveCoercion(HIVE_COERCION_RCTEXT);
     }
 
+    @Requires(RcTextRequirements.class)
+    @Test(groups = {HIVE_COERCION, JDBC})
+    public void testHiveCoercionWithDifferentTimestampPrecisionRcText()
+    {
+        doTestHiveCoercionWithDifferentTimestampPrecision(HIVE_TIMESTAMP_COERCION_RCTEXT);
+    }
+
     @Requires(RcBinaryRequirements.class)
     @Test(groups = {HIVE_COERCION, JDBC})
     public void testHiveCoercionRcBinary()
@@ -205,6 +314,13 @@ public void testHiveCoercionRcBinary()
         doTestHiveCoercion(HIVE_COERCION_RCBINARY);
     }
 
+    @Requires(RcBinaryRequirements.class)
+    @Test(groups = {HIVE_COERCION, JDBC})
+    public void testHiveCoercionWithDifferentTimestampPrecisionRcBinary()
+    {
+        doTestHiveCoercionWithDifferentTimestampPrecision(HIVE_TIMESTAMP_COERCION_RCBINARY);
+    }
+
     @Requires(ParquetRequirements.class)
     @Test(groups = {HIVE_COERCION, JDBC})
     public void testHiveCoercionParquet()
@@ -212,6 +328,27 @@ public void testHiveCoercionParquet()
         doTestHiveCoercion(HIVE_COERCION_PARQUET);
     }
 
+    @Requires(ParquetRequirements.class)
+    @Test(groups = {HIVE_COERCION, JDBC})
+    public void testHiveCoercionWithDifferentTimestampPrecisionParquet()
+    {
+        doTestHiveCoercionWithDifferentTimestampPrecision(HIVE_TIMESTAMP_COERCION_PARQUET);
+    }
+
+    @Requires(SequenceRequirements.class)
+    @Test(groups = {HIVE_COERCION, JDBC})
+    public void testHiveCoercionSequence()
+    {
+        doTestHiveCoercion(HIVE_COERCION_SEQUENCE);
+    }
+
+    @Requires(SequenceRequirements.class)
+    @Test(groups = {HIVE_COERCION, JDBC})
+    public void testHiveCoercionWithDifferentTimestampPrecisionSequence()
+    {
+        doTestHiveCoercionWithDifferentTimestampPrecision(HIVE_TIMESTAMP_COERCION_SEQUENCE);
+    }
+
     @Requires(AvroRequirements.class)
     @Test(groups = {HIVE_COERCION, JDBC})
     public void testHiveCoercionAvro()
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCoercionOnUnpartitionedTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCoercionOnUnpartitionedTable.java
index 442faa342d4a..a32ef3d969bb 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCoercionOnUnpartitionedTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCoercionOnUnpartitionedTable.java
@@ -24,6 +24,7 @@
 
 import java.util.Map;
 
+import static io.trino.tempto.Requirements.compose;
 import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED;
 import static io.trino.tests.product.TestGroups.HIVE_COERCION;
 import static io.trino.tests.product.TestGroups.JDBC;
@@ -37,6 +38,10 @@ public class TestHiveCoercionOnUnpartitionedTable
             .setNoData()
             .build();
 
+    public static final HiveTableDefinition HIVE_TIMESTAMP_COERCION_ORC = tableDefinitionForTimestampCoercionBuilder("ORC")
+            .setNoData()
+            .build();
+
     private static HiveTableDefinition.HiveTableDefinitionBuilder tableDefinitionBuilder(String fileFormat)
     {
         String tableName = format("%s_hive_coercion_unpartitioned", fileFormat.toLowerCase(ENGLISH));
@@ -56,10 +61,23 @@ private static HiveTableDefinition.HiveTableDefinitionBuilder tableDefinitionBui
                             bigint_to_varchar                  BIGINT,
                             float_to_double                    FLOAT,
                             double_to_float                    DOUBLE,
+                            double_to_string                   DOUBLE,
+                            double_to_bounded_varchar          DOUBLE,
+                            double_infinity_to_string          DOUBLE,
                             shortdecimal_to_shortdecimal       DECIMAL(10,2),
                             shortdecimal_to_longdecimal        DECIMAL(10,2),
                             longdecimal_to_shortdecimal        DECIMAL(20,12),
                             longdecimal_to_longdecimal         DECIMAL(20,12),
+                            longdecimal_to_tinyint             DECIMAL(20,12),
+                            shortdecimal_to_tinyint            DECIMAL(10,2),
+                            longdecimal_to_smallint            DECIMAL(20,12),
+                            shortdecimal_to_smallint           DECIMAL(10,2),
+                            too_big_shortdecimal_to_smallint   DECIMAL(10,2),
+                            longdecimal_to_int                 DECIMAL(20,12),
+                            shortdecimal_to_int                DECIMAL(10,2),
+                            shortdecimal_with_0_scale_to_int   DECIMAL(10,0),
+                            longdecimal_to_bigint              DECIMAL(20,4),
+                            shortdecimal_to_bigint             DECIMAL(10,2),
                             float_to_decimal                   FLOAT,
                             double_to_decimal                  DOUBLE,
                             decimal_to_float                   DECIMAL(10,5),
@@ -70,19 +88,43 @@ short_decimal_to_bounded_varchar   DECIMAL(10,5),
                             long_decimal_to_bounded_varchar    DECIMAL(20,12),
                             varchar_to_bigger_varchar          VARCHAR(3),
                             varchar_to_smaller_varchar         VARCHAR(3),
+                            varchar_to_date                    VARCHAR(10),
+                            varchar_to_distant_date            VARCHAR(12),
                             char_to_bigger_char                CHAR(3),
                             char_to_smaller_char               CHAR(3),
+                            timestamp_to_string                TIMESTAMP,
+                            timestamp_to_bounded_varchar       TIMESTAMP,
+                            timestamp_to_smaller_varchar       TIMESTAMP,
+                            smaller_varchar_to_timestamp       VARCHAR(4),
+                            varchar_to_timestamp               STRING,
                             id                                 BIGINT)
                        STORED AS\s""" + fileFormat);
     }
 
+    private static HiveTableDefinition.HiveTableDefinitionBuilder tableDefinitionForTimestampCoercionBuilder(String fileFormat)
+    {
+        String tableName = format("%s_hive_timestamp_coercion_unpartitioned", fileFormat.toLowerCase(ENGLISH));
+        return HiveTableDefinition.builder(tableName)
+                .setCreateTableDDLTemplate("""
+                         CREATE TABLE %NAME%(
+                             timestamp_row_to_row       STRUCT<keep: TIMESTAMP, si2i: SMALLINT, timestamp2string: TIMESTAMP, string2timestamp: STRING>,
+                             timestamp_list_to_list     ARRAY<STRUCT<keep: TIMESTAMP, si2i: SMALLINT, timestamp2string: TIMESTAMP, string2timestamp: STRING>>,
+                             timestamp_map_to_map       MAP<SMALLINT, STRUCT<keep: TIMESTAMP, si2i: SMALLINT, timestamp2string: TIMESTAMP, string2timestamp: STRING>>,
+                             timestamp_to_string        TIMESTAMP,
+                             string_to_timestamp        STRING,
+                             id                         BIGINT)
+                        STORED AS\s""" + fileFormat);
+    }
+
     public static final class OrcRequirements
             implements RequirementsProvider
     {
         @Override
         public Requirement getRequirements(Configuration configuration)
         {
-            return MutableTableRequirement.builder(HIVE_COERCION_ORC).withState(CREATED).build();
+            return compose(
+                    MutableTableRequirement.builder(HIVE_COERCION_ORC).withState(CREATED).build(),
+                    MutableTableRequirement.builder(HIVE_TIMESTAMP_COERCION_ORC).withState(CREATED).build());
         }
     }
 
@@ -93,6 +135,13 @@ public void testHiveCoercionOrc()
         doTestHiveCoercion(HIVE_COERCION_ORC);
     }
 
+    @Requires(OrcRequirements.class)
+    @Test(groups = {HIVE_COERCION, JDBC})
+    public void testHiveCoercionWithDifferentTimestampPrecision()
+    {
+        doTestHiveCoercionWithDifferentTimestampPrecision(HIVE_TIMESTAMP_COERCION_ORC);
+    }
+
     @Override
     protected Map<ColumnContext, String> expectedExceptionsWithTrinoContext()
     {
@@ -114,8 +163,21 @@ protected Map<ColumnContext, String> expectedExceptionsWithTrinoContext()
                 .put(columnContext("orc", "decimal_to_double"), "Cannot read SQL type 'double' from ORC stream '.decimal_to_double' of type DECIMAL")
                 .put(columnContext("orc", "short_decimal_to_varchar"), "Cannot read SQL type 'varchar' from ORC stream '.short_decimal_to_varchar' of type DECIMAL")
                 .put(columnContext("orc", "long_decimal_to_varchar"), "Cannot read SQL type 'varchar' from ORC stream '.long_decimal_to_varchar' of type DECIMAL")
+                .put(columnContext("orc", "longdecimal_to_tinyint"), "Cannot read SQL type 'tinyint' from ORC stream '.longdecimal_to_tinyint' of type DECIMAL")
+                .put(columnContext("orc", "shortdecimal_to_tinyint"), "Cannot read SQL type 'tinyint' from ORC stream '.shortdecimal_to_tinyint' of type DECIMAL")
+                .put(columnContext("orc", "longdecimal_to_smallint"), "Cannot read SQL type 'smallint' from ORC stream '.longdecimal_to_smallint' of type DECIMAL")
+                .put(columnContext("orc", "shortdecimal_to_smallint"), "Cannot read SQL type 'smallint' from ORC stream '.shortdecimal_to_smallint' of type DECIMAL")
+                .put(columnContext("orc", "too_big_shortdecimal_to_smallint"), "Cannot read SQL type 'smallint' from ORC stream '.too_big_shortdecimal_to_smallint' of type DECIMAL")
+                .put(columnContext("orc", "longdecimal_to_int"), "Cannot read SQL type 'integer' from ORC stream '.longdecimal_to_int' of type DECIMAL")
+                .put(columnContext("orc", "shortdecimal_to_int"), "Cannot read SQL type 'integer' from ORC stream '.shortdecimal_to_int' of type DECIMAL")
+                .put(columnContext("orc", "shortdecimal_with_0_scale_to_int"), "Cannot read SQL type 'integer' from ORC stream '.shortdecimal_with_0_scale_to_int' of type DECIMAL")
+                .put(columnContext("orc", "longdecimal_to_bigint"), "Cannot read SQL type 'bigint' from ORC stream '.longdecimal_to_bigint' of type DECIMAL")
+                .put(columnContext("orc", "shortdecimal_to_bigint"), "Cannot read SQL type 'bigint' from ORC stream '.shortdecimal_to_bigint' of type DECIMAL")
                 .put(columnContext("orc", "short_decimal_to_bounded_varchar"), "Cannot read SQL type 'varchar(30)' from ORC stream '.short_decimal_to_bounded_varchar' of type DECIMAL")
                 .put(columnContext("orc", "long_decimal_to_bounded_varchar"), "Cannot read SQL type 'varchar(30)' from ORC stream '.long_decimal_to_bounded_varchar' of type DECIMAL")
+                .put(columnContext("orc", "timestamp_row_to_row"), "Cannot read SQL type 'varchar' from ORC stream '.timestamp_row_to_row.timestamp2string' of type TIMESTAMP with attributes {}")
+                .put(columnContext("orc", "timestamp_list_to_list"), "Cannot read SQL type 'varchar' from ORC stream '.timestamp_row_to_row.timestamp2string' of type TIMESTAMP with attributes {}")
+                .put(columnContext("orc", "timestamp_map_to_map"), "Cannot read SQL type 'varchar' from ORC stream '.timestamp_row_to_row.timestamp2string' of type TIMESTAMP with attributes {}")
                 .buildOrThrow();
     }
 }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompatibility.java
index 54a556c09683..16372f70dfee 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompatibility.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.math.IntMath;
 import com.google.inject.Inject;
+import com.google.inject.name.Named;
 import io.trino.plugin.hive.HiveTimestampPrecision;
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.tempto.query.QueryResult;
@@ -23,8 +24,6 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import javax.inject.Named;
-
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.nio.charset.StandardCharsets;
@@ -41,7 +40,6 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS_DETAILED;
 import static io.trino.tests.product.utils.JdbcDriverUtils.setSessionProperty;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
@@ -49,6 +47,7 @@
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static java.util.stream.Collectors.joining;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveCompatibility
         extends HiveProductTest
@@ -165,10 +164,6 @@ public void testInsertAllSupportedDataTypesWithTrino(TestHiveStorageFormats.Stor
     public void testTimestampFieldWrittenByOptimizedParquetWriterCanBeReadByHive()
             throws Exception
     {
-        // only admin user is allowed to change session properties
-        setAdminRole(onTrino().getConnection());
-        setSessionProperty(onTrino().getConnection(), "hive.parquet_optimized_writer_enabled", "true");
-
         String tableName = "parquet_table_timestamp_created_in_trino";
         onTrino().executeQuery("DROP TABLE IF EXISTS " + tableName);
         onTrino().executeQuery("CREATE TABLE " + tableName + "(timestamp_precision varchar, a_timestamp timestamp) WITH (format = 'PARQUET')");
@@ -199,10 +194,6 @@ public void testTimestampFieldWrittenByOptimizedParquetWriterCanBeReadByHive()
     public void testSmallDecimalFieldWrittenByOptimizedParquetWriterCanBeReadByHive()
             throws Exception
     {
-        // only admin user is allowed to change session properties
-        setAdminRole(onTrino().getConnection());
-        setSessionProperty(onTrino().getConnection(), "hive.parquet_optimized_writer_enabled", "true");
-
         String tableName = "parquet_table_small_decimal_created_in_trino";
         onTrino().executeQuery("DROP TABLE IF EXISTS " + tableName);
         onTrino().executeQuery("CREATE TABLE " + tableName + " (a_decimal DECIMAL(5,0)) WITH (format='PARQUET')");
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompression.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompression.java
index 3203ab777a67..723470b101d5 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompression.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCompression.java
@@ -20,7 +20,6 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable;
 import static io.trino.tempto.fulfillment.table.hive.tpch.TpchTableDefinitions.ORDERS;
 import static io.trino.tests.product.TestGroups.HIVE_COMPRESSION;
@@ -80,18 +79,7 @@ public void testSnappyCompressedParquetTableCreatedInHive()
     @Test(groups = HIVE_COMPRESSION)
     public void testSnappyCompressedParquetTableCreatedInTrino()
     {
-        testSnappyCompressedParquetTableCreatedInTrino(false);
-    }
-
-    @Test(groups = HIVE_COMPRESSION)
-    public void testSnappyCompressedParquetTableCreatedInTrinoWithNativeWriter()
-    {
-        testSnappyCompressedParquetTableCreatedInTrino(true);
-    }
-
-    private void testSnappyCompressedParquetTableCreatedInTrino(boolean optimizedParquetWriter)
-    {
-        String tableName = "table_trino_parquet_snappy" + (optimizedParquetWriter ? "_native_writer" : "");
+        String tableName = "table_trino_parquet_snappy";
         onTrino().executeQuery("DROP TABLE IF EXISTS " + tableName);
         onTrino().executeQuery(format(
                 "CREATE TABLE %s (" +
@@ -102,7 +90,6 @@ private void testSnappyCompressedParquetTableCreatedInTrino(boolean optimizedPar
 
         String catalog = (String) onTrino().executeQuery("SELECT CURRENT_CATALOG").getOnlyValue();
         onTrino().executeQuery("SET SESSION " + catalog + ".compression_codec = 'SNAPPY'");
-        onTrino().executeQuery("SET SESSION " + catalog + ".parquet_optimized_writer_enabled = " + optimizedParquetWriter);
         onTrino().executeQuery(format("INSERT INTO %s VALUES(1, 'test data')", tableName));
 
         assertThat(onTrino().executeQuery("SELECT * FROM " + tableName)).containsExactlyInOrder(row(1, "test data"));
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveConnectorKerberosSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveConnectorKerberosSmokeTest.java
index b50c9e3509a0..dc050f03ed1b 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveConnectorKerberosSmokeTest.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveConnectorKerberosSmokeTest.java
@@ -14,8 +14,8 @@
 package io.trino.tests.product.hive;
 
 import com.google.common.io.Closer;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.query.QueryResult;
 import org.testng.annotations.Test;
 
@@ -39,7 +39,7 @@ public class TestHiveConnectorKerberosSmokeTest
     private Closer closer;
     private ExecutorService executor;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         closer = Closer.create();
@@ -47,7 +47,7 @@ public void setUp()
         closer.register(executor::shutdownNow);
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void cleanUp()
             throws IOException
     {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCreateTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCreateTable.java
index de3a28aa47f6..90f0c84113d1 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCreateTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveCreateTable.java
@@ -15,7 +15,6 @@
 
 import io.trino.tempto.ProductTest;
 import io.trino.testng.services.Flaky;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.Test;
 
 import java.sql.ResultSet;
@@ -24,7 +23,6 @@
 import java.util.Optional;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HDP3_ONLY;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
@@ -33,6 +31,7 @@
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveCreateTable
         extends ProductTest
@@ -52,7 +51,7 @@ public void testCreateTable()
                         row(null, null, null),
                         row(-42, "abc", -127),
                         row(9223372036854775807L, "abcdefghijklmnopqrstuvwxyz", 32767));
-        Assertions.assertThat(getTableProperty("test_create_table", "transactional"))
+        assertThat(getTableProperty("test_create_table", "transactional"))
                 // Hive 3 removes "transactional" table property when it has value "false"
                 .isIn(Optional.empty(), Optional.of("false"));
         onTrino().executeQuery("DROP TABLE test_create_table");
@@ -75,7 +74,7 @@ public void testCreateTableAsSelect()
                         row(null, null, null),
                         row(-42, "abc", -127),
                         row(9223372036854775807L, "abcdefghijklmnopqrstuvwxyz", 32767));
-        Assertions.assertThat(getTableProperty("test_create_table_as_select", "transactional"))
+        assertThat(getTableProperty("test_create_table_as_select", "transactional"))
                 // Hive 3 removes "transactional" table property when it has value "false"
                 .isIn(Optional.empty(), Optional.of("false"));
         onTrino().executeQuery("DROP TABLE test_create_table_as_select");
@@ -86,7 +85,7 @@ public void testVerifyEnvironmentHiveTransactionalByDefault()
             throws SQLException
     {
         onHive().executeQuery("CREATE TABLE test_hive_transactional_by_default(a bigint) STORED AS ORC");
-        Assertions.assertThat(getTableProperty("test_hive_transactional_by_default", "transactional"))
+        assertThat(getTableProperty("test_hive_transactional_by_default", "transactional"))
                 .contains("true");
         onHive().executeQuery("DROP TABLE test_hive_transactional_by_default");
     }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveHiddenFiles.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveHiddenFiles.java
new file mode 100644
index 000000000000..7aa5220ec1ab
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveHiddenFiles.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed 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 io.trino.tests.product.hive;
+
+import com.google.inject.Inject;
+import io.trino.tempto.ProductTest;
+import io.trino.tempto.assertions.QueryAssert;
+import io.trino.tempto.hadoop.hdfs.HdfsClient;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.hive.util.TableLocationUtils.getTablePath;
+import static io.trino.tests.product.utils.QueryExecutors.onHive;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestHiveHiddenFiles
+        extends ProductTest
+{
+    @Inject
+    private HdfsClient hdfsClient;
+
+    @Test
+    public void testSelectFromTableContainingHiddenFiles()
+            throws Exception
+    {
+        String tableName = "test_table_hidden_files" + randomNameSuffix();
+        onTrino().executeQuery("CREATE TABLE " + tableName + " (col integer)");
+
+        onTrino().executeQuery("INSERT INTO " + tableName + " VALUES 1");
+        onTrino().executeQuery("INSERT INTO " + tableName + " VALUES 2");
+
+        List<QueryAssert.Row> tableRows = List.of(row(1), row(2));
+        assertThat(onTrino().executeQuery("SELECT * FROM " + tableName)).containsOnly(tableRows);
+        assertThat(onHive().executeQuery("SELECT * FROM " + tableName)).containsOnly(tableRows);
+
+        String tableLocation = getTablePath(tableName);
+        // Rename the table files to Hive hidden tableFiles (prefixed by `.` or `_` characters)
+        List<String> tableFiles = hdfsClient.listDirectory(tableLocation);
+        assertThat(tableFiles).hasSize(2);
+        renameFile(tableLocation, tableFiles.get(0), '.' + tableFiles.get(0));
+        renameFile(tableLocation, tableFiles.get(1), '_' + tableFiles.get(1));
+
+        assertThat(onTrino().executeQuery("SELECT * FROM " + tableName)).hasNoRows();
+        assertThat(onHive().executeQuery("SELECT * FROM " + tableName)).hasNoRows();
+
+        onTrino().executeQuery("DROP TABLE IF EXISTS " + tableName);
+    }
+
+    @Test
+    public void testSelectFromTableContainingFilenamesWithUnderscore()
+            throws Exception
+    {
+        String tableName = "test_table_visible_underscore_files" + randomNameSuffix();
+        onTrino().executeQuery("CREATE TABLE " + tableName + " AS SELECT 1 AS col");
+
+        List<QueryAssert.Row> tableRows = List.of(row(1));
+        assertThat(onTrino().executeQuery("SELECT * FROM " + tableName)).containsOnly(tableRows);
+        assertThat(onHive().executeQuery("SELECT * FROM " + tableName)).containsOnly(tableRows);
+
+        String tableLocation = getTablePath(tableName);
+        // Prefix the table files with `f_` which should still keep them visible to Hive
+        for (String filename : hdfsClient.listDirectory(tableLocation)) {
+            // As long as the file is not hidden (starting with `.` or `_`), it should not be ignored by Hive
+            renameFile(tableLocation, filename, "f_" + filename);
+        }
+
+        assertThat(onTrino().executeQuery("SELECT * FROM " + tableName)).containsOnly(tableRows);
+        assertThat(onHive().executeQuery("SELECT * FROM " + tableName)).containsOnly(tableRows);
+
+        onTrino().executeQuery("DROP TABLE " + tableName);
+    }
+
+    private void renameFile(String directoryLocation, String filename, String newFilename)
+            throws IOException
+    {
+        try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
+            hdfsClient.loadFile(directoryLocation + "/" + filename, bos);
+            hdfsClient.saveFile(directoryLocation + "/" + newFilename, new ByteArrayInputStream(bos.toByteArray()));
+            hdfsClient.delete(directoryLocation + "/" + filename);
+        }
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveIgnoreAbsentPartitions.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveIgnoreAbsentPartitions.java
index d50c6e563bda..e18353245bf0 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveIgnoreAbsentPartitions.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveIgnoreAbsentPartitions.java
@@ -24,13 +24,13 @@
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.LOADED;
 import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable;
 import static io.trino.tests.product.hive.HiveTableDefinitions.NATION_PARTITIONED_BY_BIGINT_REGIONKEY;
 import static io.trino.tests.product.hive.util.TableLocationUtils.getTablePath;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
@@ -52,7 +52,6 @@ public Requirement getRequirements(Configuration configuration)
 
     @Test
     public void testIgnoreAbsentPartitions()
-            throws Exception
     {
         String tableNameInDatabase = tablesState.get("test_table").getNameInDatabase();
         String tablePath = getTablePath(tableNameInDatabase, 1);
@@ -74,7 +73,6 @@ public void testIgnoreAbsentPartitions()
 
     @Test
     public void testShouldThrowErrorOnUnpartitionedTableMissingData()
-            throws Exception
     {
         String tableName = "unpartitioned_absent_table_data";
 
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMaterializedView.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMaterializedView.java
index 63b991ca55dd..accad931f3da 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMaterializedView.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMaterializedView.java
@@ -13,16 +13,16 @@
  */
 package io.trino.tests.product.hive;
 
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveMaterializedView
         extends HiveProductTest
@@ -33,7 +33,7 @@ private boolean isTestEnabled()
         return getHiveVersionMajor() >= 3;
     }
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         if (!isTestEnabled()) {
@@ -47,7 +47,7 @@ public void setUp()
         onHive().executeQuery("INSERT INTO test_materialized_view_table VALUES ('a'), ('a'), ('b')");
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void tearDown()
     {
         if (!isTestEnabled()) {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java
index 29285c2e6b9c..974d2a29f857 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java
@@ -14,7 +14,6 @@
 package io.trino.tests.product.hive;
 
 import io.trino.tempto.assertions.QueryAssert;
-import io.trino.tempto.query.QueryExecutor;
 import io.trino.tempto.query.QueryResult;
 import io.trino.tests.product.hive.util.TemporaryHiveTable;
 import org.testng.SkipException;
@@ -28,6 +27,7 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
 import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HIVE_TRANSACTIONAL;
 import static io.trino.tests.product.hive.BucketingType.BUCKETED_V2;
@@ -374,9 +374,9 @@ public void testMergeMultipleRowsMatchFails(String createTableSql)
 
                 onTrino().executeQuery(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 6, 'Adelphi'), ('Aaron', 8, 'Ashland')", sourceTable));
 
-                assertThat(() -> onTrino().executeQuery(format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) +
+                assertQueryFailure(() -> onTrino().executeQuery(format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) +
                         "    WHEN MATCHED THEN UPDATE SET address = s.address"))
-                        .failsWithMessage("One MERGE target table row matched more than one source row");
+                        .hasMessageMatching("\\QQuery failed (#\\E\\S+\\Q): One MERGE target table row matched more than one source row");
 
                 onTrino().executeQuery(format("MERGE INTO %s t USING %s s ON (t.customer = s.customer)", targetTable, sourceTable) +
                         "    WHEN MATCHED AND s.address = 'Adelphi' THEN UPDATE SET address = s.address");
@@ -662,11 +662,11 @@ public void testMergeOriginalFilesTarget()
             onTrino().executeQuery(format("CREATE TABLE %s WITH (transactional=true) AS TABLE tpch.tiny.region", targetTable));
 
             // This merge is illegal, because many nations have the same region
-            assertThat(() -> onTrino().executeQuery(format("MERGE INTO %s r USING tpch.tiny.nation n", targetTable) +
+            assertQueryFailure(() -> onTrino().executeQuery(format("MERGE INTO %s r USING tpch.tiny.nation n", targetTable) +
                     "    ON r.regionkey = n.regionkey" +
                     "    WHEN MATCHED" +
                     "        THEN UPDATE SET comment = n.comment"))
-                    .failsWithMessage("One MERGE target table row matched more than one source row");
+                    .hasMessageMatching("\\QQuery failed (#\\E\\S+\\Q): One MERGE target table row matched more than one source row");
 
             onTrino().executeQuery(format("MERGE INTO %s r USING tpch.tiny.nation n", targetTable) +
                     "    ON r.regionkey = n.regionkey AND n.name = 'FRANCE'" +
@@ -740,11 +740,6 @@ public Object[][] insertersProvider()
         };
     }
 
-    private static QueryResult execute(Engine engine, String sql, QueryExecutor.QueryParam... params)
-    {
-        return engine.queryExecutor().executeQuery(sql, params);
-    }
-
     @DataProvider
     public Object[][] inserterAndDeleterProvider()
     {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMetastoreClientFactory.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMetastoreClientFactory.java
index c66395b2ed1f..ebfa143d710a 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMetastoreClientFactory.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMetastoreClientFactory.java
@@ -34,6 +34,7 @@ public final class TestHiveMetastoreClientFactory
             Optional.empty(),
             Optional.empty(),
             new Duration(10, SECONDS),
+            new Duration(10, SECONDS),
             new NoHiveMetastoreAuthentication(),
             "localhost");
 
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionProcedures.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionProcedures.java
index df2c1ba13651..0d202be91e8c 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionProcedures.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionProcedures.java
@@ -15,7 +15,6 @@
 
 import com.google.inject.Inject;
 import io.trino.tempto.ProductTest;
-import io.trino.tempto.assertions.QueryAssert;
 import io.trino.tempto.fulfillment.table.hive.HiveDataSource;
 import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import io.trino.tempto.internal.hadoop.hdfs.HdfsDataSourceWriter;
@@ -23,11 +22,11 @@
 import io.trino.testng.services.Flaky;
 import org.testng.annotations.Test;
 
-import java.net.URISyntaxException;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
 import static io.trino.tempto.fulfillment.table.hive.InlineDataSource.createResourceDataSource;
 import static io.trino.tests.product.TestGroups.HIVE_PARTITIONING;
 import static io.trino.tests.product.TestGroups.SMOKE;
@@ -55,7 +54,6 @@ public class TestHivePartitionProcedures
     @Test(groups = {HIVE_PARTITIONING, SMOKE})
     @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testUnregisterPartition()
-            throws URISyntaxException
     {
         createPartitionedTable(FIRST_TABLE);
 
@@ -78,7 +76,7 @@ public void testUnregisterViewTableShouldFail()
         createPartitionedTable(FIRST_TABLE);
         createView(VIEW_TABLE, FIRST_TABLE);
 
-        QueryAssert.assertQueryFailure(() -> dropPartition(VIEW_TABLE, "col", "a"))
+        assertQueryFailure(() -> dropPartition(VIEW_TABLE, "col", "a"))
                 .hasMessageContaining("Table is a view: default." + VIEW_TABLE);
     }
 
@@ -88,7 +86,7 @@ public void testUnregisterMissingTableShouldFail()
     {
         createPartitionedTable(FIRST_TABLE);
 
-        QueryAssert.assertQueryFailure(() -> dropPartition("missing_table", "col", "f"))
+        assertQueryFailure(() -> dropPartition("missing_table", "col", "f"))
                 .hasMessageContaining("Table 'default.missing_table' not found");
     }
 
@@ -98,7 +96,7 @@ public void testUnregisterUnpartitionedTableShouldFail()
     {
         createUnpartitionedTable(SECOND_TABLE);
 
-        QueryAssert.assertQueryFailure(() -> dropPartition(SECOND_TABLE, "col", "a"))
+        assertQueryFailure(() -> dropPartition(SECOND_TABLE, "col", "a"))
                 .hasMessageContaining("Table is not partitioned: default." + SECOND_TABLE);
     }
 
@@ -108,7 +106,7 @@ public void testUnregisterInvalidPartitionColumnsShouldFail()
     {
         createPartitionedTable(FIRST_TABLE);
 
-        QueryAssert.assertQueryFailure(() -> dropPartition(FIRST_TABLE, "not_existing_partition_col", "a"))
+        assertQueryFailure(() -> dropPartition(FIRST_TABLE, "not_existing_partition_col", "a"))
                 .hasMessageContaining("Provided partition column names do not match actual partition column names: [col]");
     }
 
@@ -118,7 +116,7 @@ public void testUnregisterMissingPartitionShouldFail()
     {
         createPartitionedTable(FIRST_TABLE);
 
-        QueryAssert.assertQueryFailure(() -> dropPartition(FIRST_TABLE, "col", "f"))
+        assertQueryFailure(() -> dropPartition(FIRST_TABLE, "col", "f"))
                 .hasMessageContaining("Partition 'col=f' does not exist");
     }
 
@@ -126,7 +124,7 @@ public void testUnregisterMissingPartitionShouldFail()
     @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testRegisterPartitionMissingTableShouldFail()
     {
-        QueryAssert.assertQueryFailure(() -> addPartition("missing_table", "col", "f", "/"))
+        assertQueryFailure(() -> addPartition("missing_table", "col", "f", "/"))
                 .hasMessageContaining("Table 'default.missing_table' not found");
     }
 
@@ -136,7 +134,7 @@ public void testRegisterUnpartitionedTableShouldFail()
     {
         createUnpartitionedTable(SECOND_TABLE);
 
-        QueryAssert.assertQueryFailure(() -> addPartition(SECOND_TABLE, "col", "a", "/"))
+        assertQueryFailure(() -> addPartition(SECOND_TABLE, "col", "a", "/"))
                 .hasMessageContaining("Table is not partitioned: default." + SECOND_TABLE);
     }
 
@@ -147,7 +145,7 @@ public void testRegisterViewTableShouldFail()
         createPartitionedTable(FIRST_TABLE);
         createView(VIEW_TABLE, FIRST_TABLE);
 
-        QueryAssert.assertQueryFailure(() -> addPartition(VIEW_TABLE, "col", "a", "/"))
+        assertQueryFailure(() -> addPartition(VIEW_TABLE, "col", "a", "/"))
                 .hasMessageContaining("Table is a view: default." + VIEW_TABLE);
     }
 
@@ -157,7 +155,7 @@ public void testRegisterPartitionCollisionShouldFail()
     {
         createPartitionedTable(FIRST_TABLE);
 
-        QueryAssert.assertQueryFailure(() -> addPartition(FIRST_TABLE, "col", "a", "/"))
+        assertQueryFailure(() -> addPartition(FIRST_TABLE, "col", "a", "/"))
                 .hasMessageContaining("Partition [col=a] is already registered");
     }
 
@@ -167,7 +165,7 @@ public void testRegisterPartitionInvalidPartitionColumnsShouldFail()
     {
         createPartitionedTable(FIRST_TABLE);
 
-        QueryAssert.assertQueryFailure(() -> addPartition(FIRST_TABLE, "not_existing_partition_col", "a", "/"))
+        assertQueryFailure(() -> addPartition(FIRST_TABLE, "not_existing_partition_col", "a", "/"))
                 .hasMessageContaining("Provided partition column names do not match actual partition column names: [col]");
     }
 
@@ -177,7 +175,7 @@ public void testRegisterPartitionInvalidLocationShouldFail()
     {
         createPartitionedTable(FIRST_TABLE);
 
-        QueryAssert.assertQueryFailure(() -> addPartition(FIRST_TABLE, "col", "f", "/some/non/existing/path"))
+        assertQueryFailure(() -> addPartition(FIRST_TABLE, "col", "f", "/some/non/existing/path"))
                 .hasMessageContaining("Partition location does not exist: /some/non/existing/path");
     }
 
@@ -202,7 +200,6 @@ public void testRegisterPartitionWithDefaultPartitionLocation()
     @Test(groups = {HIVE_PARTITIONING, SMOKE})
     @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testRegisterPartition()
-            throws URISyntaxException
     {
         createPartitionedTable(FIRST_TABLE);
         createPartitionedTable(SECOND_TABLE);
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionSchemaEvolution.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionSchemaEvolution.java
index bcad0ec538b4..2fbe7ebe2c5f 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionSchemaEvolution.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionSchemaEvolution.java
@@ -13,27 +13,26 @@
  */
 package io.trino.tests.product.hive;
 
+import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import io.airlift.log.Logger;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.tempto.query.QueryExecutionException;
 import io.trino.tests.product.hive.util.TemporaryHiveTable;
 import org.testng.annotations.Test;
 
-import javax.inject.Inject;
-
 import java.sql.SQLException;
 import java.util.function.Supplier;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.hive.util.TemporaryHiveTable.temporaryHiveTable;
 import static io.trino.tests.product.utils.JdbcDriverUtils.setSessionProperty;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHivePartitionSchemaEvolution
         extends HiveProductTest
@@ -44,7 +43,7 @@ public class TestHivePartitionSchemaEvolution
     @Named("databases.hive.enforce_non_transactional_tables")
     private boolean createTablesAsAcid;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void useColumnMappingByName()
             throws SQLException
     {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionsTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionsTable.java
index 95bbf1f6c17f..67584db0bb44 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionsTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePartitionsTable.java
@@ -14,6 +14,7 @@
 package io.trino.tests.product.hive;
 
 import com.google.common.math.IntMath;
+import com.google.inject.Inject;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.Requirement;
 import io.trino.tempto.RequirementsProvider;
@@ -27,8 +28,6 @@
 import io.trino.testng.services.Flaky;
 import org.testng.annotations.Test;
 
-import javax.inject.Inject;
-
 import java.math.RoundingMode;
 import java.util.Optional;
 import java.util.stream.IntStream;
@@ -36,7 +35,6 @@
 import static io.trino.tempto.Requirements.compose;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable;
 import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable;
 import static io.trino.tempto.fulfillment.table.hive.InlineDataSource.createResourceDataSource;
@@ -49,6 +47,7 @@
 import static java.lang.Math.min;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePropertiesTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePropertiesTable.java
index 84c47edb4a9d..5febb4c55440 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePropertiesTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHivePropertiesTable.java
@@ -21,10 +21,10 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HIVE_VIEWS;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHivePropertiesTable
         extends HiveProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToHudi.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToHudi.java
index 266fbf1422ed..d5a199b7cd06 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToHudi.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToHudi.java
@@ -13,7 +13,7 @@
  */
 package io.trino.tests.product.hive;
 
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.tempto.query.QueryResult;
@@ -23,13 +23,13 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.HIVE_HUDI_REDIRECTIONS;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onHudi;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveRedirectionToHudi
         extends ProductTest
@@ -38,10 +38,10 @@ public class TestHiveRedirectionToHudi
     private static final String HUDI_TABLE_TYPE_COPY_ON_WRITE = "cow";
     private static final String HUDI_TABLE_TYPE_MERGE_ON_READ = "mor";
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
-        bucketName = System.getenv().getOrDefault("S3_BUCKET", "trino-ci-test");
+        bucketName = System.getenv().getOrDefault("S3_BUCKET", "test-bucket");
     }
 
     @DataProvider
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToIceberg.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToIceberg.java
index 417ea40c43cd..c3ea7cd86325 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToIceberg.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToIceberg.java
@@ -13,19 +13,17 @@
  */
 package io.trino.tests.product.hive;
 
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.tempto.query.QueryResult;
 import org.assertj.core.api.AbstractStringAssert;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.query.QueryExecutor.param;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.HIVE_ICEBERG_REDIRECTIONS;
@@ -33,11 +31,12 @@
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 import static java.sql.JDBCType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveRedirectionToIceberg
         extends ProductTest
 {
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void createAdditionalSchema()
     {
         onTrino().executeQuery("CREATE SCHEMA IF NOT EXISTS hive.nondefaultschema");
@@ -288,7 +287,7 @@ public void testShowCreateTable()
 
         createIcebergTable(icebergTableName, true);
 
-        Assertions.assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE " + hiveTableName).getOnlyValue())
+        assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE " + hiveTableName).getOnlyValue())
                 .matches("\\QCREATE TABLE " + icebergTableName + " (\n" +
                         "   nationkey bigint,\n" +
                         "   name varchar,\n" +
@@ -296,7 +295,7 @@ public void testShowCreateTable()
                         "   comment varchar\n" +
                         ")\n" +
                         "WITH (\n" +
-                        "   format = 'ORC',\n" +
+                        "   format = 'PARQUET',\n" +
                         "   format_version = 2,\n" +
                         format("   location = 'hdfs://hadoop-master:9000/user/hive/warehouse/%s-\\E.*\\Q',\n", tableName) +
                         "   partitioning = ARRAY['regionkey']\n" + // 'partitioning' comes from Iceberg
@@ -317,9 +316,9 @@ public void testShowStats()
         assertThat(onTrino().executeQuery("SHOW STATS FOR " + hiveTableName))
                 .containsOnly(
                         row("nationkey", null, 25d, 0d, null, "0", "24"),
-                        row("name", null, 25d, 0d, null, null, null),
+                        row("name", 1231d, 25d, 0d, null, null, null),
                         row("regionkey", null, 5d, 0d, null, "0", "4"),
-                        row("comment", null, 25d, 0d, null, null, null),
+                        row("comment", 3558d, 25d, 0d, null, null, null),
                         row(null, null, null, null, 25d, null, null));
 
         onTrino().executeQuery("DROP TABLE " + icebergTableName);
@@ -362,7 +361,7 @@ public void testAlterTableAddColumn()
 
         onTrino().executeQuery("ALTER TABLE " + hiveTableName + " ADD COLUMN some_new_column double");
 
-        Assertions.assertThat(onTrino().executeQuery("DESCRIBE " + icebergTableName).column(1))
+        assertThat(onTrino().executeQuery("DESCRIBE " + icebergTableName).column(1))
                 .containsOnly("nationkey", "name", "regionkey", "comment", "some_new_column");
 
         assertResultsEqual(
@@ -382,7 +381,7 @@ public void testAlterTableDropColumn()
 
         onTrino().executeQuery("ALTER TABLE " + hiveTableName + " DROP COLUMN comment");
 
-        Assertions.assertThat(onTrino().executeQuery("DESCRIBE " + icebergTableName).column(1))
+        assertThat(onTrino().executeQuery("DESCRIBE " + icebergTableName).column(1))
                 .containsOnly("nationkey", "name", "regionkey");
 
         assertResultsEqual(
@@ -402,7 +401,7 @@ public void testAlterTableRenameColumn()
 
         onTrino().executeQuery("ALTER TABLE " + hiveTableName + " RENAME COLUMN nationkey TO nation_key");
 
-        Assertions.assertThat(onTrino().executeQuery("DESCRIBE " + icebergTableName).column(1))
+        assertThat(onTrino().executeQuery("DESCRIBE " + icebergTableName).column(1))
                 .containsOnly("nation_key", "name", "regionkey", "comment");
 
         assertResultsEqual(
@@ -631,7 +630,7 @@ private static void createIcebergTable(String tableName, boolean partitioned, bo
 
     private static AbstractStringAssert<?> assertTableComment(String catalog, String schema, String tableName)
     {
-        return Assertions.assertThat((String) readTableComment(catalog, schema, tableName).getOnlyValue());
+        return assertThat((String) readTableComment(catalog, schema, tableName).getOnlyValue());
     }
 
     private static QueryResult readTableComment(String catalog, String schema, String tableName)
@@ -645,7 +644,7 @@ private static QueryResult readTableComment(String catalog, String schema, Strin
 
     private static AbstractStringAssert<?> assertColumnComment(String catalog, String schema, String tableName, String columnName)
     {
-        return Assertions.assertThat((String) readColumnComment(catalog, schema, tableName, columnName).getOnlyValue());
+        return assertThat((String) readColumnComment(catalog, schema, tableName, columnName).getOnlyValue());
     }
 
     private static QueryResult readColumnComment(String catalog, String schema, String tableName, String columnName)
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRequireQueryPartitionsFilter.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRequireQueryPartitionsFilter.java
index 6a35e4a4dd78..31e6ebefa986 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRequireQueryPartitionsFilter.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRequireQueryPartitionsFilter.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests.product.hive;
 
+import com.google.inject.Inject;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.Requirement;
 import io.trino.tempto.RequirementsProvider;
@@ -21,16 +22,14 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import javax.inject.Inject;
-
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.LOADED;
 import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable;
 import static io.trino.tests.product.hive.HiveTableDefinitions.NATION_PARTITIONED_BY_BIGINT_REGIONKEY;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveRequireQueryPartitionsFilter
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSchema.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSchema.java
index f4da011dcb1b..9a9f3a1abf86 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSchema.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSchema.java
@@ -14,13 +14,12 @@
 package io.trino.tests.product.hive;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.tempto.query.QueryExecutionException;
 import io.trino.tempto.query.QueryResult;
-import org.assertj.core.api.Assertions;
 import org.assertj.core.api.Condition;
 import org.testng.annotations.Test;
 
@@ -31,16 +30,16 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HMS_ONLY;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveSchema
         extends ProductTest
 {
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         // make sure hive.default schema is not empty
@@ -48,7 +47,7 @@ public void setUp()
         onTrino().executeQuery("CREATE TABLE hive.default.test_sys_schema_disabled_table_in_default(a bigint)");
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void tearDown()
     {
         onTrino().executeQuery("DROP TABLE hive.default.test_sys_schema_disabled_table_in_default");
@@ -191,7 +190,7 @@ public void testHiveInformationSchemaFilteredOut()
                 .satisfies(containsFirstColumnValue("information_schema"));
         assertThat(onTrino().executeQuery("SELECT table_name FROM information_schema.tables WHERE table_schema = 'information_schema'"))
                 .containsOnly(allInformationSchemaTablesAsRows);
-        Assertions.assertThat(onTrino().executeQuery("SELECT table_schema, table_name FROM information_schema.tables").rows().stream()
+        assertThat(onTrino().executeQuery("SELECT table_schema, table_name FROM information_schema.tables").rows().stream()
                 .filter(row -> row.get(0).equals("information_schema"))
                 .map(row -> (String) row.get(1)))
                 .containsOnly(allInformationSchemaTables.toArray(new String[0]));
@@ -204,7 +203,7 @@ public void testHiveInformationSchemaFilteredOut()
                 .satisfies(containsFirstColumnValue("information_schema"));
         assertThat(onTrino().executeQuery("SELECT DISTINCT table_name FROM information_schema.columns WHERE table_schema = 'information_schema' AND table_name != 'roles'"))
                 .containsOnly(allInformationSchemaTablesExceptRolesAsRows);
-        Assertions.assertThat(onTrino().executeQuery("SELECT table_schema, table_name, column_name FROM information_schema.columns").rows().stream()
+        assertThat(onTrino().executeQuery("SELECT table_schema, table_name, column_name FROM information_schema.columns").rows().stream()
                 .filter(row -> row.get(0).equals("information_schema"))
                 .map(row -> (String) row.get(1))
                 .filter(tableName -> !tableName.equals("roles"))
@@ -232,7 +231,7 @@ public void testHiveInformationSchemaFilteredOut()
                     .doesNotHave(containsFirstColumnValue("information_schema")); // tables in information_schema have no privileges
             assertThat(onTrino().executeQuery("SELECT table_name FROM information_schema.table_privileges WHERE table_schema = 'information_schema'"))
                     .hasNoRows(); // tables in information_schema have no privileges
-            Assertions.assertThat(onTrino().executeQuery("SELECT table_schema, table_name, privilege_type FROM information_schema.table_privileges").rows().stream()
+            assertThat(onTrino().executeQuery("SELECT table_schema, table_name, privilege_type FROM information_schema.table_privileges").rows().stream()
                     .filter(row -> row.get(0).equals("information_schema"))
                     .map(row -> (String) row.get(1)))
                     .isEmpty(); // tables in information_schema have no privileges
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSparkCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSparkCompatibility.java
index 2dea41dc7429..4ef02f32f18b 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSparkCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveSparkCompatibility.java
@@ -14,19 +14,23 @@
 package io.trino.tests.product.hive;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
 import io.trino.tempto.ProductTest;
+import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.tempto.assertions.QueryAssert.Row;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.HIVE_SPARK;
 import static io.trino.tests.product.TestGroups.HIVE_SPARK_NO_STATS_FALLBACK;
@@ -38,6 +42,7 @@
 import static java.lang.String.join;
 import static java.util.Collections.nCopies;
 import static java.util.Locale.ENGLISH;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveSparkCompatibility
         extends ProductTest
@@ -45,6 +50,9 @@ public class TestHiveSparkCompatibility
     // see spark-defaults.conf
     private static final String TRINO_CATALOG = "hive";
 
+    @Inject
+    private HdfsClient hdfsClient;
+
     @Test(groups = {HIVE_SPARK, PROFILE_SPECIFIC_TESTS}, dataProvider = "testReadSparkCreatedTableDataProvider")
     public void testReadSparkCreatedTable(String sparkTableFormat, String expectedTrinoTableFormat)
     {
@@ -353,7 +361,7 @@ public void testDeleteFailsOnBucketedTableCreatedBySpark()
         onSpark().executeQuery("DROP TABLE " + hiveTableName);
     }
 
-    private static final String[] HIVE_TIMESTAMP_PRECISIONS = new String[]{"MILLISECONDS", "MICROSECONDS", "NANOSECONDS"};
+    private static final String[] HIVE_TIMESTAMP_PRECISIONS = new String[] {"MILLISECONDS", "MICROSECONDS", "NANOSECONDS"};
 
     @DataProvider
     public static Object[][] sparkParquetTimestampFormats()
@@ -364,10 +372,10 @@ public static Object[][] sparkParquetTimestampFormats()
 
         // Ordering of expected values matches the ordering in HIVE_TIMESTAMP_PRECISIONS
         return new Object[][] {
-                {"TIMESTAMP_MILLIS", millisTimestamp, new String[]{millisTimestamp, millisTimestamp, millisTimestamp}},
-                {"TIMESTAMP_MICROS", microsTimestamp, new String[]{millisTimestamp, microsTimestamp, microsTimestamp}},
+                {"TIMESTAMP_MILLIS", millisTimestamp, new String[] {millisTimestamp, millisTimestamp, millisTimestamp}},
+                {"TIMESTAMP_MICROS", microsTimestamp, new String[] {millisTimestamp, microsTimestamp, microsTimestamp}},
                 // note that Spark timestamp has microsecond precision
-                {"INT96", nanosTimestamp, new String[]{millisTimestamp, microsTimestamp, microsTimestamp}},
+                {"INT96", nanosTimestamp, new String[] {millisTimestamp, microsTimestamp, microsTimestamp}},
         };
     }
 
@@ -393,13 +401,6 @@ public void testReadTrinoCreatedParquetTable()
         testReadTrinoCreatedTable("using_parquet", "PARQUET");
     }
 
-    @Test(groups = {HIVE_SPARK, PROFILE_SPECIFIC_TESTS})
-    public void testReadTrinoCreatedParquetTableWithNativeWriter()
-    {
-        onTrino().executeQuery("SET SESSION " + TRINO_CATALOG + ".parquet_optimized_writer_enabled = true");
-        testReadTrinoCreatedTable("using_native_parquet", "PARQUET");
-    }
-
     private void testReadTrinoCreatedTable(String tableName, String tableFormat)
     {
         String sparkTableName = "trino_created_table_" + tableName + "_" + randomNameSuffix();
@@ -574,6 +575,32 @@ public void testReadSparkdDateAndTimePartitionName()
         onTrino().executeQuery("DROP TABLE " + trinoTableName);
     }
 
+    @Test(groups = {HIVE_SPARK, PROFILE_SPECIFIC_TESTS})
+    public void testTextInputFormatWithParquetHiveSerDe()
+            throws IOException
+    {
+        String tableName = "test_text_input_format_with_parquet_hive_ser_de" + randomNameSuffix();
+        onHive().executeQuery("" +
+                "CREATE EXTERNAL TABLE " + tableName +
+                "(col INT) " +
+                "ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' " +
+                "STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat' " +
+                "OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat' " +
+                "LOCATION '/tmp/" + tableName + "'");
+        onSpark().executeQuery("INSERT INTO " + tableName + " VALUES(1)");
+        assertThat(onSpark().executeQuery("SELECT * FROM " + tableName)).containsOnly(row(1));
+        assertThat(onTrino().executeQuery("SELECT * FROM " + tableName)).containsOnly(row(1));
+        List<String> files = hdfsClient.listDirectory("/tmp/" + tableName + "/");
+        assertThat(files).hasSize(2);
+        assertThat(files.stream().filter(name -> !name.contains("SUCCESS")).collect(toImmutableList()).get(0)).endsWith("parquet");
+        List<Object> result = new ArrayList<>();
+        result.add(null);
+        assertThat(onHive().executeQuery("SELECT * FROM " + tableName)).containsOnly(new Row(result), new Row(result));
+        assertQueryFailure(() -> onTrino().executeQuery("INSERT INTO " + tableName + " VALUES(2)")).hasMessageFindingMatch("Output format org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat with SerDe org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe is not supported");
+        assertQueryFailure(() -> onHive().executeQuery("INSERT INTO " + tableName + " VALUES(2)")).hasMessageFindingMatch(".*Error while processing statement.*");
+        onHive().executeQuery("DROP TABLE " + tableName);
+    }
+
     @Test(groups = {HIVE_SPARK, PROFILE_SPECIFIC_TESTS}, dataProvider = "unsupportedPartitionDates")
     public void testReadSparkInvalidDatePartitionName(String inputDate, java.sql.Date outputDate)
     {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveStorageFormats.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveStorageFormats.java
index 2c1b96d2f739..c491b82e2d11 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveStorageFormats.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveStorageFormats.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
+import com.google.inject.name.Named;
 import io.airlift.units.DataSize;
 import io.trino.plugin.hive.HiveTimestampPrecision;
 import io.trino.tempto.ProductTest;
@@ -29,13 +30,10 @@
 import io.trino.testng.services.Flaky;
 import io.trino.tests.product.utils.JdbcDriverUtils;
 import org.apache.parquet.hadoop.ParquetWriter;
-import org.assertj.core.api.Assertions;
 import org.assertj.core.api.SoftAssertions;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import javax.inject.Named;
-
 import java.sql.Connection;
 import java.sql.JDBCType;
 import java.sql.SQLException;
@@ -60,7 +58,6 @@
 import static io.trino.plugin.hive.HiveTimestampPrecision.MILLISECONDS;
 import static io.trino.plugin.hive.HiveTimestampPrecision.NANOSECONDS;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.query.QueryExecutor.param;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.HMS_ONLY;
@@ -79,6 +76,7 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveStorageFormats
         extends ProductTest
@@ -244,8 +242,7 @@ public static StorageFormat[] storageFormatsWithConfiguration()
     {
         return new StorageFormat[] {
                 storageFormat("ORC", ImmutableMap.of("hive.orc_optimized_writer_validate", "true")),
-                storageFormat("PARQUET"),
-                storageFormat("PARQUET", ImmutableMap.of("hive.parquet_optimized_writer_enabled", "true")),
+                storageFormat("PARQUET", ImmutableMap.of("hive.parquet_optimized_writer_validation_percentage", "100")),
                 storageFormat("RCBINARY", ImmutableMap.of("hive.rcfile_optimized_writer_validate", "true")),
                 storageFormat("RCTEXT", ImmutableMap.of("hive.rcfile_optimized_writer_validate", "true")),
                 storageFormat("SEQUENCEFILE"),
@@ -294,7 +291,7 @@ public void verifyDataProviderCompleteness()
     {
         String formatsDescription = (String) onTrino().executeQuery("SELECT description FROM system.metadata.table_properties WHERE catalog_name = CURRENT_CATALOG AND property_name = 'format'").getOnlyValue();
         Pattern pattern = Pattern.compile("Hive storage format for the table. Possible values: \\[([A-Z]+(, [A-z]+)+)]");
-        Assertions.assertThat(formatsDescription).matches(pattern);
+        assertThat(formatsDescription).matches(pattern);
         Matcher matcher = pattern.matcher(formatsDescription);
         verify(matcher.matches());
 
@@ -312,7 +309,7 @@ public void verifyDataProviderCompleteness()
                 .filter(format -> !"OPENX_JSON".equals(format))
                 .collect(toImmutableSet());
 
-        Assertions.assertThat(ImmutableSet.copyOf(storageFormats()))
+        assertThat(ImmutableSet.copyOf(storageFormats()))
                 .isEqualTo(allFormatsToTest);
     }
 
@@ -621,8 +618,8 @@ private void testNestedFields(String format, Engine writer)
             catch (QueryExecutionException e) {
                 if ("AVRO".equals(format)) {
                     // TODO (https://github.com/trinodb/trino/issues/9285) Some versions of Hive cannot read Avro nested structs written by Trino
-                    Assertions.assertThat(e.getCause())
-                            .hasToString("java.sql.SQLException: java.io.IOException: org.apache.avro.AvroTypeException: Found default.record_1, expecting union");
+                    assertThat(e.getCause())
+                            .hasToString("java.sql.SQLException: java.io.IOException: org.apache.avro.AvroTypeException: Found record_1, expecting union");
                 }
                 else {
                     throw e;
@@ -784,20 +781,7 @@ public void testLargeParquetInsert()
                 ImmutableMap.of(
                         "hive.parquet_writer_page_size", reducedRowGroupSize.toBytesValueString(),
                         "task_scale_writers_enabled", "false",
-                        "task_writer_count", "1")));
-    }
-
-    @Test(groups = STORAGE_FORMATS_DETAILED)
-    public void testLargeParquetInsertWithNativeWriter()
-    {
-        DataSize reducedRowGroupSize = DataSize.ofBytes(ParquetWriter.DEFAULT_PAGE_SIZE / 4);
-        runLargeInsert(storageFormat(
-                "PARQUET",
-                ImmutableMap.of(
-                        "hive.parquet_optimized_writer_enabled", "true",
-                        "hive.parquet_writer_page_size", reducedRowGroupSize.toBytesValueString(),
-                        "task_scale_writers_enabled", "false",
-                        "task_writer_count", "1")));
+                        "task_min_writer_count", "1")));
     }
 
     @Test(groups = STORAGE_FORMATS_DETAILED)
@@ -1021,7 +1005,7 @@ private static void setSessionProperties(Connection connection, Map<String, Stri
     {
         try {
             // create more than one split
-            setSessionProperty(connection, "task_writer_count", "4");
+            setSessionProperty(connection, "task_min_writer_count", "4");
             setSessionProperty(connection, "task_scale_writers_enabled", "false");
             setSessionProperty(connection, "redistribute_writes", "false");
             for (Map.Entry<String, String> sessionProperty : sessionProperties.entrySet()) {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTableStatistics.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTableStatistics.java
index ca56764718de..1512451a5538 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTableStatistics.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTableStatistics.java
@@ -32,10 +32,10 @@
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.anyOf;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState;
 import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable;
 import static io.trino.tempto.fulfillment.table.hive.tpch.TpchTableDefinitions.NATION;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.hive.AllSimpleTypesTableDefinitions.ALL_HIVE_SIMPLE_TYPES_TEXTFILE;
 import static io.trino.tests.product.hive.HiveTableDefinitions.NATION_PARTITIONED_BY_BIGINT_REGIONKEY;
 import static io.trino.tests.product.hive.HiveTableDefinitions.NATION_PARTITIONED_BY_VARCHAR_REGIONKEY;
@@ -44,6 +44,7 @@
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveTableStatistics
         extends HiveProductTest
@@ -1460,6 +1461,43 @@ public void testMixedHiveAndPrestoStatistics()
         }
     }
 
+    @Test
+    public void testEmptyPartitionedHiveStatistics()
+    {
+        String tableName = "test_empty_partitioned_hive_" + randomNameSuffix();
+        try {
+            onHive().executeQuery(format("CREATE TABLE %s (a INT) PARTITIONED BY (p INT)", tableName));
+
+            // disable computation of statistics
+            onHive().executeQuery("set hive.stats.autogather=false");
+
+            onHive().executeQuery(format("INSERT INTO TABLE %s PARTITION (p=1) VALUES (11),(12),(13),(14)", tableName));
+            onHive().executeQuery(format("INSERT INTO TABLE %s PARTITION (p=2) VALUES (21),(22),(23)", tableName));
+
+            String showStatsPartitionOne = format("SHOW STATS FOR (SELECT * FROM %s WHERE p = 1)", tableName);
+            String showStatsPartitionTwo = format("SHOW STATS FOR (SELECT * FROM %s WHERE p = 2)", tableName);
+            String showStatsWholeTable = format("SHOW STATS FOR %s", tableName);
+
+            assertThat(onTrino().executeQuery(showStatsPartitionOne)).containsOnly(
+                    row("p", null, 1.0, 0.0, null, "1", "1"),
+                    row("a", null, null, null, null, null, null),
+                    row(null, null, null, null, null, null, null));
+            assertThat(onTrino().executeQuery(showStatsPartitionTwo)).containsOnly(
+                    row("p", null, 1.0, 0.0, null, "2", "2"),
+                    row("a", null, null, null, null, null, null),
+                    row(null, null, null, null, null, null, null));
+            assertThat(onTrino().executeQuery(showStatsWholeTable)).containsOnly(
+                    row("p", null, 2.0, 0.0, null, "1", "2"),
+                    row("a", null, null, null, null, null, null),
+                    row(null, null, null, null, null, null, null));
+        }
+        finally {
+            // enable computation of statistics
+            onHive().executeQuery("set hive.stats.autogather=true");
+            onHive().executeQuery("DROP TABLE " + tableName);
+        }
+    }
+
     private static void assertComputeTableStatisticsOnCreateTable(String sourceTableName, List<Row> expectedStatistics)
     {
         String copiedTableName = "assert_compute_table_statistics_on_create_table_" + sourceTableName;
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTable.java
index c2dde16d46e4..d51aa798fb66 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTable.java
@@ -27,7 +27,6 @@
 import io.trino.tempto.query.QueryResult;
 import io.trino.testng.services.Flaky;
 import io.trino.tests.product.hive.util.TemporaryHiveTable;
-import org.assertj.core.api.Assertions;
 import org.testng.SkipException;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -55,7 +54,6 @@
 import static io.trino.plugin.hive.HiveMetadata.MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.HIVE_TRANSACTIONAL;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
@@ -75,6 +73,7 @@
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toUnmodifiableList;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
@@ -573,7 +572,7 @@ public void testSimpleUnpartitionedTransactionalInsert()
 
             // ensure that we treat ACID tables as implicitly bucketed on INSERT
             String explainOutput = (String) onTrino().executeQuery("EXPLAIN " + insertQuery).getOnlyValue();
-            Assertions.assertThat(explainOutput).contains("Output partitioning: hive:HivePartitioningHandle{buckets=1");
+            assertThat(explainOutput).contains("Output partitioning: hive:HivePartitioningHandle{buckets=1");
 
             onTrino().executeQuery(insertQuery);
 
@@ -733,6 +732,7 @@ public void testTransactionalMetadataDelete(Engine inserter, Engine deleter)
     }
 
     @Test(groups = HIVE_TRANSACTIONAL, timeOut = TEST_TIMEOUT)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testNonTransactionalMetadataDelete()
     {
         withTemporaryTable("non_transactional_metadata_delete", false, true, NONE, tableName -> {
@@ -1902,9 +1902,9 @@ public void testDeleteWithOriginalFiles()
         withTemporaryTable("test_delete_with_original_files", true, false, NONE, tableName -> {
             // these 3 properties are necessary to make sure there is more than 1 original file created
             onTrino().executeQuery("SET SESSION scale_writers = true");
-            onTrino().executeQuery("SET SESSION writer_min_size = '4kB'");
+            onTrino().executeQuery("SET SESSION writer_scaling_min_data_processed = '4kB'");
             onTrino().executeQuery("SET SESSION task_scale_writers_enabled = false");
-            onTrino().executeQuery("SET SESSION task_writer_count = 2");
+            onTrino().executeQuery("SET SESSION task_min_writer_count = 2");
             onTrino().executeQuery(format(
                     "CREATE TABLE %s WITH (transactional = true) AS SELECT * FROM tpch.sf1000.orders LIMIT 100000", tableName));
 
@@ -1923,9 +1923,9 @@ public void testDeleteWithOriginalFilesWithWhereClause()
         withTemporaryTable("test_delete_with_original_files_with_where_clause", true, false, NONE, tableName -> {
             // these 3 properties are necessary to make sure there is more than 1 original file created
             onTrino().executeQuery("SET SESSION scale_writers = true");
-            onTrino().executeQuery("SET SESSION writer_min_size = '4kB'");
+            onTrino().executeQuery("SET SESSION writer_scaling_min_data_processed = '4kB'");
             onTrino().executeQuery("SET SESSION task_scale_writers_enabled = false");
-            onTrino().executeQuery("SET SESSION task_writer_count = 2");
+            onTrino().executeQuery("SET SESSION task_min_writer_count = 2");
             onTrino().executeQuery(format("CREATE TABLE %s WITH (transactional = true) AS SELECT * FROM tpch.sf1000.orders LIMIT 100000", tableName));
 
             verify(onTrino().executeQuery(format("SELECT DISTINCT \"$path\" FROM %s", tableName)).getRowsCount() >= 2,
@@ -1989,10 +1989,10 @@ private void unbucketedTransactionalTableWithTaskWriterCountGreaterThanOne(boole
                             ") AS SELECT orderkey, orderstatus, totalprice, orderdate, clerk, shippriority, \"comment\", custkey, orderpriority " +
                             "FROM tpch.sf1000.orders LIMIT 0", tableName, isPartitioned ? ", partitioned_by = ARRAY['orderpriority']" : ""));
             onTrino().executeQuery("SET SESSION scale_writers = true");
-            onTrino().executeQuery("SET SESSION writer_min_size = '4kB'");
+            onTrino().executeQuery("SET SESSION writer_scaling_min_data_processed = '4kB'");
             onTrino().executeQuery("SET SESSION task_scale_writers_enabled = false");
-            onTrino().executeQuery("SET SESSION task_writer_count = 4");
-            onTrino().executeQuery("SET SESSION task_partitioned_writer_count = 4");
+            onTrino().executeQuery("SET SESSION task_min_writer_count = 4");
+            onTrino().executeQuery("SET SESSION task_max_writer_count = 4");
             onTrino().executeQuery("SET SESSION hive.target_max_file_size = '1MB'");
 
             onTrino().executeQuery(
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTableInsert.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTableInsert.java
index d799bbbf0e92..07cfa1f9dc4b 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTableInsert.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTableInsert.java
@@ -18,12 +18,12 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HIVE_TRANSACTIONAL;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.util.Locale.ENGLISH;
 import static java.util.stream.Collectors.joining;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHiveTransactionalTableInsert
         extends HiveProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewCompatibility.java
index 2a011fe138e3..6714de397a5e 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewCompatibility.java
@@ -23,12 +23,12 @@
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HIVE_VIEW_COMPATIBILITY;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onCompatibilityTestServer;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Requires(ImmutableNationTable.class)
 public class TestHiveViewCompatibility
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViews.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViews.java
index 5898e701e355..9a6815e8b5d1 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViews.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViews.java
@@ -19,7 +19,7 @@
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.tempto.fulfillment.table.hive.tpch.ImmutableTpchTablesRequirements.ImmutableNationTable;
 import io.trino.tempto.fulfillment.table.hive.tpch.ImmutableTpchTablesRequirements.ImmutableOrdersTable;
-import org.assertj.core.api.Assertions;
+import io.trino.testng.services.Flaky;
 import org.testng.annotations.Test;
 
 import java.math.BigDecimal;
@@ -27,10 +27,12 @@
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HIVE_VIEWS;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_MATCH;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @Requires({
@@ -53,6 +55,7 @@ protected List<QueryAssert.Row> getExpectedHiveViewTextualColumnsTypes()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testFailingHiveViewsWithMetadataListing()
     {
         setupBrokenView();
@@ -75,7 +78,7 @@ private void testFailingHiveViewsWithInformationSchema()
         }
         else {
             assertThat(onTrino().executeQuery(withSchemaFilter)).hasNoRows();
-            Assertions.assertThat(onTrino().executeQuery(withNoFilter).rows()).doesNotContain(ImmutableList.of("correct_view"));
+            assertThat(onTrino().executeQuery(withNoFilter).rows()).doesNotContain(ImmutableList.of("correct_view"));
         }
 
         // Queries with filters on table_schema and table_name are optimized to only fetch the specified table and uses
@@ -88,7 +91,7 @@ private void testFailingHiveViewsWithInformationSchema()
                 .hasMessageContaining("Failed to translate Hive view 'test_list_failing_views.failing_view'");
 
         // Queries on information_schema.columns also trigger ConnectorMetadata#getViews. Columns from failing_view are
-        // listed too since HiveMetadata#listTableColumns does not ignore views.
+        // listed too since HiveMetadata#listTableColumns does not ignore Hive views.
         assertThat(onTrino().executeQuery("SELECT table_name, column_name FROM information_schema.columns WHERE table_schema = 'test_list_failing_views'"))
                 .containsOnly(
                         row("correct_view", "n_nationkey"),
@@ -117,7 +120,7 @@ private void testFailingHiveViewsWithSystemJdbc()
         }
         else {
             assertThat(onTrino().executeQuery(withSchemaFilter)).hasNoRows();
-            Assertions.assertThat(onTrino().executeQuery(withNoFilter).rows()).doesNotContain(ImmutableList.of("correct_view"));
+            assertThat(onTrino().executeQuery(withNoFilter).rows()).doesNotContain(ImmutableList.of("correct_view"));
         }
 
         // Queries with filters on table_schema and table_name are optimized to only fetch the specified table and uses
@@ -138,7 +141,7 @@ private void testFailingHiveViewsWithSystemJdbc()
                 .hasMessageContaining("Failed to translate Hive view 'test_list_failing_views.failing_view'");
 
         // Queries on system.jdbc.columns also trigger ConnectorMetadata#getViews. Columns from failing_view are
-        // listed too since HiveMetadata#listTableColumns does not ignore views.
+        // listed too since HiveMetadata#listTableColumns does not ignore Hive views.
         assertThat(onTrino().executeQuery("SELECT table_name, column_name FROM system.jdbc.columns WHERE table_cat = 'hive' AND table_schem = 'test_list_failing_views'"))
                 .containsOnly(
                         row("correct_view", "n_nationkey"),
@@ -164,6 +167,7 @@ private static void setupBrokenView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testLateralViewExplode()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS pageAds");
@@ -199,6 +203,7 @@ public void testLateralViewExplode()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testLateralViewExplodeArrayOfStructs()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS pageAdsStructs");
@@ -235,6 +240,7 @@ public void testLateralViewExplodeArrayOfStructs()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testLateralViewJsonTupleAs()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS test_json_tuple_table");
@@ -253,6 +259,7 @@ public void testLateralViewJsonTupleAs()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testFromUtcTimestamp()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS test_from_utc_timestamp_source");
@@ -388,6 +395,7 @@ public void testFromUtcTimestamp()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testFromUtcTimestampInvalidTimeZone()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS test_from_utc_timestamp_invalid_time_zone_source");
@@ -413,6 +421,7 @@ public void testFromUtcTimestampInvalidTimeZone()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testNestedFieldWithReservedKeyNames()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS test_nested_field_with_reserved_key_names_source");
@@ -446,6 +455,7 @@ public void testNestedFieldWithReservedKeyNames()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testFromUtcTimestampCornerCases()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS test_from_utc_timestamp_corner_cases_source");
@@ -506,6 +516,7 @@ private boolean isObsoleteFromUtcTimestampSemantics()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testCastTimestampAsDecimal()
     {
         onHive().executeQuery("DROP TABLE IF EXISTS cast_timestamp_as_decimal");
@@ -530,4 +541,32 @@ public void testCastTimestampAsDecimal()
         onHive().executeQuery("DROP VIEW cast_timestamp_as_decimal_view");
         onHive().executeQuery("DROP TABLE cast_timestamp_as_decimal");
     }
+
+    @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
+    public void testUnionBetweenCharAndVarchar()
+    {
+        onHive().executeQuery("DROP TABLE IF EXISTS union_char_varchar");
+        onHive().executeQuery("CREATE TABLE union_char_varchar (a_char char(1), a_varchar varchar(1024))");
+        onHive().executeQuery("INSERT INTO union_char_varchar VALUES ('a', 'Trino')");
+        onHive().executeQuery("INSERT INTO union_char_varchar VALUES (NULL, NULL)");
+        onHive().executeQuery("DROP VIEW IF EXISTS union_char_varchar_view");
+        onHive().executeQuery("""
+                CREATE VIEW union_char_varchar_view AS
+                SELECT a_char AS col FROM union_char_varchar
+                UNION ALL
+                SELECT a_varchar AS col FROM union_char_varchar
+                """);
+
+        List<QueryAssert.Row> expected = List.of(
+                row("a"),
+                row("Trino"),
+                row((Object) null),
+                row((Object) null));
+        assertThat(onTrino().executeQuery("SELECT * FROM union_char_varchar_view")).containsOnly(expected);
+        assertThat(onHive().executeQuery("SELECT * FROM union_char_varchar_view")).containsOnly(expected);
+
+        onHive().executeQuery("DROP VIEW union_char_varchar_view");
+        onHive().executeQuery("DROP TABLE union_char_varchar");
+    }
 }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewsLegacy.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewsLegacy.java
index 621059855197..5aa21f74550b 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewsLegacy.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewsLegacy.java
@@ -14,22 +14,25 @@
 package io.trino.tests.product.hive;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.Requires;
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.tempto.fulfillment.table.hive.tpch.ImmutableTpchTablesRequirements.ImmutableNationTable;
 import io.trino.tempto.fulfillment.table.hive.tpch.ImmutableTpchTablesRequirements.ImmutableOrdersTable;
 import io.trino.tempto.query.QueryExecutor;
+import io.trino.testng.services.Flaky;
 import org.testng.annotations.Test;
 
 import java.math.BigDecimal;
 import java.util.List;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HIVE_VIEWS;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_MATCH;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @Requires({
@@ -39,7 +42,7 @@
 public class TestHiveViewsLegacy
         extends AbstractTestHiveViews
 {
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setup()
     {
         setSessionProperty("hive.hive_views_legacy_translation", "true");
@@ -118,6 +121,8 @@ public void testArrayIndexingInView()
     }
 
     @Override
+    @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testArrayConstructionInView()
     {
         assertThatThrownBy(super::testArrayConstructionInView)
@@ -125,6 +130,8 @@ public void testArrayConstructionInView()
     }
 
     @Override
+    @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testMapConstructionInView()
     {
         assertThatThrownBy(super::testMapConstructionInView)
@@ -132,6 +139,8 @@ public void testMapConstructionInView()
     }
 
     @Override
+    @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testPmodFunction()
     {
         assertThatThrownBy(super::testPmodFunction)
@@ -151,6 +160,8 @@ protected List<QueryAssert.Row> getExpectedHiveViewTextualColumnsTypes()
     }
 
     @Override
+    @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testNestedHiveViews()
     {
         assertThatThrownBy(super::testNestedHiveViews)
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestInsertIntoHiveTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestInsertIntoHiveTable.java
index b7be55de10ff..080bb706d6c8 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestInsertIntoHiveTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestInsertIntoHiveTable.java
@@ -28,7 +28,6 @@
 
 import static io.trino.tempto.Requirements.compose;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED;
 import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState;
 import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable;
@@ -36,6 +35,7 @@
 import static io.trino.tests.product.hive.AllSimpleTypesTableDefinitions.ALL_HIVE_SIMPLE_TYPES_TEXTFILE;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestInsertIntoHiveTable
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestParquetFileWithReorderedColumns.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestParquetFileWithReorderedColumns.java
new file mode 100644
index 000000000000..ac4125612ea8
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestParquetFileWithReorderedColumns.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed 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 io.trino.tests.product.hive;
+
+import com.google.common.io.Resources;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
+import io.trino.tempto.ProductTest;
+import io.trino.tempto.hadoop.hdfs.HdfsClient;
+import org.testng.annotations.Test;
+
+import java.io.InputStream;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.HIVE_SPARK;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.utils.QueryExecutors.onHive;
+import static io.trino.tests.product.utils.QueryExecutors.onSpark;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestParquetFileWithReorderedColumns
+        extends ProductTest
+{
+    @Inject
+    private HdfsClient hdfsClient;
+
+    @Inject
+    @Named("databases.hive.warehouse_directory_path")
+    private String warehouseDirectory;
+
+    @BeforeMethodWithContext
+    public void setup()
+            throws Exception
+    {
+        hdfsClient.createDirectory(warehouseDirectory + "/TestParquetFileWithReorderedColumns");
+        try (InputStream inputStream = Resources.asByteSource(Resources.getResource("parquet/reordered_columns.parquet")).openStream()) {
+            hdfsClient.saveFile(warehouseDirectory + "/TestParquetFileWithReorderedColumns/reordered_columns.parquet", inputStream);
+        }
+    }
+
+    @AfterMethodWithContext
+    public void cleanup()
+    {
+        hdfsClient.delete(warehouseDirectory + "/TestParquetFileWithReorderedColumns");
+    }
+
+    @Test(groups = {HIVE_SPARK, PROFILE_SPECIFIC_TESTS})
+    public void testReadParquetFileWithReorderedColumns()
+    {
+        String sourceTableName = "test_reordered_columns_table_" + randomNameSuffix();
+        String tableName = "test_read_reordered_columns_table_" + randomNameSuffix();
+        try {
+            onTrino().executeQuery(format(
+                    "CREATE TABLE %s" +
+                            " (id bigint, buyplan_style_detail_id bigint, last_modified_on bigint) " +
+                            "WITH ( " +
+                            "   format = 'PARQUET', " +
+                            "   external_location = 'hdfs://hadoop-master:9000%s/TestParquetFileWithReorderedColumns/' " +
+                            ")",
+                    sourceTableName,
+                    warehouseDirectory));
+            // Write parquet file with Trino parquet writer using an existing file as the source which reproduces the problem of Apache Spark not reading the file
+            onTrino().executeQuery(format("CREATE TABLE %s WITH (format = 'PARQUET') AS SELECT * FROM %s", tableName, sourceTableName));
+            String sql = "SELECT COUNT(*), SUM(id), SUM(buyplan_style_detail_id), SUM(last_modified_on) FROM " + tableName;
+            assertThat(onTrino().executeQuery(sql))
+                    .containsExactlyInOrder(row(50438L, 323043905052L, 67694121262L, 83905381446283000L));
+
+            assertThat(onHive().executeQuery(sql))
+                    .containsExactlyInOrder(row(50438L, 323043905052L, 67694121262L, 83905381446283000L));
+
+            assertThat(onSpark().executeQuery(sql))
+                    .containsExactlyInOrder(row(50438L, 323043905052L, 67694121262L, 83905381446283000L));
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE " + tableName);
+            onTrino().executeQuery("DROP TABLE " + sourceTableName);
+        }
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestParquetSymlinkInputFormat.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestParquetSymlinkInputFormat.java
index 16ac8766f059..abd7bbf7f096 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestParquetSymlinkInputFormat.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestParquetSymlinkInputFormat.java
@@ -13,24 +13,24 @@
  */
 package io.trino.tests.product.hive;
 
+import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import org.testng.annotations.Test;
 
-import javax.inject.Inject;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Paths;
 
 import static com.google.common.io.Resources.getResource;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.AVRO;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestParquetSymlinkInputFormat
 {
@@ -67,6 +67,33 @@ public void testSymlinkTable()
         hdfsClient.delete(dataDir);
     }
 
+    @Test(groups = STORAGE_FORMATS)
+    public void testSymlinkTableWithSymlinkFileContainingNonExistentPath()
+            throws Exception
+    {
+        String table = "test_parquet_invalid_symlink";
+        onHive().executeQuery("DROP TABLE IF EXISTS " + table);
+
+        onHive().executeQuery("" +
+                "CREATE TABLE " + table +
+                "(col int) " +
+                "ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' " +
+                "STORED AS " +
+                "INPUTFORMAT 'org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat' " +
+                "OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'");
+
+        String tableRoot = warehouseDirectory + '/' + table;
+        String dataDir = warehouseDirectory + "/data_test_parquet_invalid_symlink";
+
+        saveResourceOnHdfs("data.parquet", dataDir + "/data.parquet");
+        hdfsClient.saveFile(tableRoot + "/symlink.txt", format("hdfs:%s/data.parquet\nhdfs:%s/missingfile.parquet", dataDir, dataDir));
+        assertThatThrownBy(() -> onTrino().executeQuery("SELECT * FROM " + table))
+                .hasMessageMatching(".*Manifest file from the location \\[.*data_test_parquet_invalid_symlink\\] contains non-existent path:.*missingfile.parquet");
+
+        onHive().executeQuery("DROP TABLE " + table);
+        hdfsClient.delete(dataDir);
+    }
+
     @Test(groups = {AVRO, STORAGE_FORMATS})
     public void testSymlinkTableWithMultipleParentDirectories()
             throws Exception
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestReadUniontype.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestReadUniontype.java
index 17a77ae8e36c..c061c57ca798 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestReadUniontype.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestReadUniontype.java
@@ -14,9 +14,10 @@
 package io.trino.tests.product.hive;
 
 import io.trino.jdbc.Row;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.query.QueryResult;
+import io.trino.testng.services.Flaky;
 import org.testng.SkipException;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -25,7 +26,10 @@
 import java.util.List;
 
 import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.AVRO;
 import static io.trino.tests.product.TestGroups.SMOKE;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_MATCH;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
@@ -38,8 +42,8 @@ public class TestReadUniontype
     private static final String TABLE_NAME = "test_read_uniontype";
     private static final String TABLE_NAME_SCHEMA_EVOLUTION = "test_read_uniontype_with_schema_evolution";
 
-    @BeforeTestWithContext
-    @AfterTestWithContext
+    @BeforeMethodWithContext
+    @AfterMethodWithContext
     public void cleanup()
     {
         onHive().executeQuery(format("DROP TABLE IF EXISTS %s", TABLE_NAME));
@@ -133,7 +137,8 @@ public static Object[][] unionDereferenceTestCases()
                         "DROP TABLE IF EXISTS " + tableUnionDereference}};
     }
 
-    @Test(dataProvider = "storage_formats", groups = SMOKE)
+    @Test(dataProvider = "storage_formats", groups = {SMOKE, AVRO})
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testReadUniontype(String storageFormat)
     {
         // According to testing results, the Hive INSERT queries here only work in Hive 1.2
@@ -219,7 +224,8 @@ public void testReadUniontype(String storageFormat)
         }
     }
 
-    @Test(dataProvider = "union_dereference_test_cases", groups = SMOKE)
+    @Test(dataProvider = "union_dereference_test_cases", groups = {SMOKE, AVRO})
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testReadUniontypeWithDereference(String createTableSql, String insertSql, String selectSql, List<Object> expectedResult, String selectTagSql, List<Object> expectedTagResult, String dropTableSql)
     {
         // According to testing results, the Hive INSERT queries here only work in Hive 1.2
@@ -238,7 +244,8 @@ public void testReadUniontypeWithDereference(String createTableSql, String inser
         onTrino().executeQuery(dropTableSql);
     }
 
-    @Test(dataProvider = "storage_formats", groups = SMOKE)
+    @Test(dataProvider = "storage_formats", groups = {SMOKE, AVRO})
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testUnionTypeSchemaEvolution(String storageFormat)
     {
         // According to testing results, the Hive INSERT queries here only work in Hive 1.2
@@ -276,6 +283,7 @@ public void testUnionTypeSchemaEvolution(String storageFormat)
      * Therefore, it can read ORC files even after changing the schema.
      */
     @Test(groups = SMOKE)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testORCUnionToStructSchemaEvolution()
     {
         // According to testing results, the Hive INSERT queries here only work in Hive 1.2
@@ -319,6 +327,7 @@ public void testORCUnionToStructSchemaEvolution()
      * Therefore, it can read ORC files even after changing the schema.
      */
     @Test(groups = SMOKE)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testORCStructToUnionSchemaEvolution()
     {
         // According to testing results, the Hive INSERT queries here only work in Hive 1.2
@@ -356,6 +365,7 @@ public void testORCStructToUnionSchemaEvolution()
     }
 
     @Test(groups = SMOKE)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testReadOrcUniontypeWithCheckpoint()
     {
         // According to testing results, the Hive INSERT queries here only work in Hive 1.2
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestRoles.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestRoles.java
index ba897e2927fd..439bd97f61a1 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestRoles.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestRoles.java
@@ -18,9 +18,8 @@
 import com.google.common.collect.Iterables;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
-import io.trino.tempto.assertions.QueryAssert;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.query.QueryExecutor;
 import io.trino.tempto.query.QueryResult;
 import org.testng.SkipException;
@@ -32,6 +31,7 @@
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.anyOf;
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
 import static io.trino.tests.product.TestGroups.AUTHORIZATION;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.TestGroups.ROLES;
@@ -53,7 +53,7 @@ public class TestRoles
     @Named("databases.presto.jdbc_user")
     private String userName;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         onTrino().executeQuery("SET ROLE admin IN hive");
@@ -61,7 +61,7 @@ public void setUp()
         cleanup();
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void tearDown()
     {
         cleanup();
@@ -122,14 +122,14 @@ public void testListGrants()
 
         onTrino().executeQuery("CREATE TABLE test_list_grants(c int)");
 
-        QueryAssert.assertThat(onTrino().executeQuery("SHOW GRANTS"))
+        assertThat(onTrino().executeQuery("SHOW GRANTS"))
                 .contains(
                         row(userName, "USER", userName, "USER", "hive", "default", "test_list_grants", "SELECT", "YES", null),
                         row(userName, "USER", userName, "USER", "hive", "default", "test_list_grants", "INSERT", "YES", null),
                         row(userName, "USER", userName, "USER", "hive", "default", "test_list_grants", "UPDATE", "YES", null),
                         row(userName, "USER", userName, "USER", "hive", "default", "test_list_grants", "DELETE", "YES", null));
 
-        QueryAssert.assertThat(onTrino().executeQuery("SELECT * FROM information_schema.table_privileges"))
+        assertThat(onTrino().executeQuery("SELECT * FROM information_schema.table_privileges"))
                 .contains(
                         row(userName, "USER", userName, "USER", "hive", "default", "test_list_grants", "SELECT", "YES", null),
                         row(userName, "USER", userName, "USER", "hive", "default", "test_list_grants", "INSERT", "YES", null),
@@ -143,14 +143,14 @@ public void testListGrants()
     public void testCreateDuplicateRole()
     {
         onTrino().executeQuery(format("CREATE ROLE %s IN hive", ROLE1));
-        QueryAssert.assertQueryFailure(() -> onTrino().executeQuery(format("CREATE ROLE %s IN hive", ROLE1)))
+        assertQueryFailure(() -> onTrino().executeQuery(format("CREATE ROLE %s IN hive", ROLE1)))
                 .hasMessageContaining("Role '%s' already exists", ROLE1);
     }
 
     @Test(groups = {ROLES, AUTHORIZATION, PROFILE_SPECIFIC_TESTS})
     public void testDropNonExistentRole()
     {
-        QueryAssert.assertQueryFailure(() -> onTrino().executeQuery(format("DROP ROLE %s IN hive", ROLE3)))
+        assertQueryFailure(() -> onTrino().executeQuery(format("DROP ROLE %s IN hive", ROLE3)))
                 .hasMessageContaining("Role '%s' does not exist", ROLE3);
     }
 
@@ -159,27 +159,27 @@ public void testCreateDropRoleAccessControl()
     {
         // Only users that are granted with "admin" role can create, drop and list roles
         // Alice is not granted with "admin" role
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery(format("CREATE ROLE %s IN hive", ROLE3)))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery(format("CREATE ROLE %s IN hive", ROLE3)))
                 .hasMessageContaining("Cannot create role %s", ROLE3);
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery(format("DROP ROLE %s IN hive", ROLE3)))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery(format("DROP ROLE %s IN hive", ROLE3)))
                 .hasMessageContaining("Cannot drop role %s", ROLE3);
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.roles"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.roles"))
                 .hasMessageContaining("Cannot select from table information_schema.roles");
     }
 
     @Test(groups = {ROLES, AUTHORIZATION, PROFILE_SPECIFIC_TESTS})
     public void testPublicRoleIsGrantedToEveryone()
     {
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .contains(row("alice", "USER", "public", "NO"));
-        QueryAssert.assertThat(onPrestoBob().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoBob().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .contains(row("bob", "USER", "public", "NO"));
     }
 
     @Test(groups = {ROLES, AUTHORIZATION, PROFILE_SPECIFIC_TESTS})
     public void testAdminRoleIsGrantedToHdfs()
     {
-        QueryAssert.assertThat(onTrino().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onTrino().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .contains(row(userName, "USER", "admin", anyOf("YES", "NO")));
     }
 
@@ -188,7 +188,7 @@ public void testGrantRoleToUser()
     {
         onTrino().executeQuery("CREATE ROLE role1 IN hive");
         onTrino().executeQuery("GRANT role1 TO USER alice IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"));
@@ -201,7 +201,7 @@ public void testGrantRoleToRole()
         onTrino().executeQuery("CREATE ROLE role2 IN hive");
         onTrino().executeQuery("GRANT role1 TO USER alice IN hive");
         onTrino().executeQuery("GRANT role2 TO ROLE role1 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"),
@@ -215,7 +215,7 @@ public void testGrantRoleWithAdminOption()
         onTrino().executeQuery("CREATE ROLE role2 IN hive");
         onTrino().executeQuery("GRANT role1 TO USER alice WITH ADMIN OPTION IN hive");
         onTrino().executeQuery("GRANT role2 TO ROLE role1 WITH ADMIN OPTION IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "YES"),
@@ -235,7 +235,7 @@ public void testGrantRoleMultipleTimes()
         onTrino().executeQuery("GRANT role2 TO ROLE role1 WITH ADMIN OPTION IN hive");
         onTrino().executeQuery("GRANT role1 TO USER alice WITH ADMIN OPTION IN hive");
         onTrino().executeQuery("GRANT role2 TO ROLE role1 WITH ADMIN OPTION IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "YES"),
@@ -247,13 +247,13 @@ public void testRevokeRoleFromUser()
     {
         onTrino().executeQuery("CREATE ROLE role1 IN hive");
         onTrino().executeQuery("GRANT role1 TO USER alice IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"));
 
         onTrino().executeQuery("REVOKE role1 FROM USER alice IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"));
     }
@@ -265,14 +265,14 @@ public void testRevokeRoleFromRole()
         onTrino().executeQuery("CREATE ROLE role2 IN hive");
         onTrino().executeQuery("GRANT role1 TO USER alice IN hive");
         onTrino().executeQuery("GRANT role2 TO ROLE role1 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"),
                         row("role1", "ROLE", "role2", "NO"));
 
         onTrino().executeQuery("REVOKE role2 FROM ROLE role1 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"));
@@ -283,7 +283,7 @@ public void testRevokeRoleFromOwner()
     {
         try {
             onPrestoAlice().executeQuery("CREATE TABLE hive.default.test_table (foo BIGINT)");
-            QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table"))
+            assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table"))
                     .containsOnly(ImmutableList.of(
                             row("alice", "USER", "alice", "USER", "hive", "default", "test_table", "SELECT", "YES", null),
                             row("alice", "USER", "alice", "USER", "hive", "default", "test_table", "DELETE", "YES", null),
@@ -293,7 +293,7 @@ public void testRevokeRoleFromOwner()
             onTrino().executeQuery("REVOKE SELECT ON hive.default.test_table FROM USER alice");
 
             // now there should be no SELECT privileges shown even though alice has OWNERSHIP
-            QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table"))
+            assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table"))
                     .containsOnly(ImmutableList.of(
                             row("alice", "USER", "alice", "USER", "hive", "default", "test_table", "DELETE", "YES", null),
                             row("alice", "USER", "alice", "USER", "hive", "default", "test_table", "UPDATE", "YES", null),
@@ -309,13 +309,13 @@ public void testDropGrantedRole()
     {
         onTrino().executeQuery("CREATE ROLE role1 IN hive");
         onTrino().executeQuery("GRANT role1 TO USER alice IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"));
 
         onTrino().executeQuery("DROP ROLE role1 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"));
     }
@@ -327,14 +327,14 @@ public void testRevokeTransitiveRoleFromUser()
         onTrino().executeQuery("CREATE ROLE role2 IN hive");
         onTrino().executeQuery("GRANT role1 TO USER alice IN hive");
         onTrino().executeQuery("GRANT role2 TO ROLE role1 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"),
                         row("role1", "ROLE", "role2", "NO"));
 
         onTrino().executeQuery("REVOKE role1 FROM USER alice IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"));
     }
@@ -348,7 +348,7 @@ public void testRevokeTransitiveRoleFromRole()
         onTrino().executeQuery("GRANT role1 TO USER alice IN hive");
         onTrino().executeQuery("GRANT role2 TO ROLE role1 IN hive");
         onTrino().executeQuery("GRANT role3 TO ROLE role2 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"),
@@ -356,7 +356,7 @@ public void testRevokeTransitiveRoleFromRole()
                         row("role2", "ROLE", "role3", "NO"));
 
         onTrino().executeQuery("REVOKE role2 FROM ROLE role1 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"));
@@ -371,7 +371,7 @@ public void testDropTransitiveRole()
         onTrino().executeQuery("GRANT role1 TO USER alice IN hive");
         onTrino().executeQuery("GRANT role2 TO ROLE role1 IN hive");
         onTrino().executeQuery("GRANT role3 TO ROLE role2 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"),
@@ -379,7 +379,7 @@ public void testDropTransitiveRole()
                         row("role2", "ROLE", "role3", "NO"));
 
         onTrino().executeQuery("DROP ROLE role2 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"));
@@ -392,7 +392,7 @@ public void testRevokeAdminOption()
         onTrino().executeQuery("CREATE ROLE role2 IN hive");
         onTrino().executeQuery("GRANT role1 TO USER alice WITH ADMIN OPTION IN hive");
         onTrino().executeQuery("GRANT role2 TO ROLE role1 WITH ADMIN OPTION IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "YES"),
@@ -401,7 +401,7 @@ public void testRevokeAdminOption()
         onTrino().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER alice IN hive");
         onTrino().executeQuery("REVOKE ADMIN OPTION FOR role2 FROM ROLE role1 IN hive");
 
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"),
@@ -415,7 +415,7 @@ public void testRevokeMultipleTimes()
         onTrino().executeQuery("CREATE ROLE role2 IN hive");
         onTrino().executeQuery("GRANT role1 TO USER alice WITH ADMIN OPTION IN hive");
         onTrino().executeQuery("GRANT role2 TO ROLE role1 WITH ADMIN OPTION IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "YES"),
@@ -426,7 +426,7 @@ public void testRevokeMultipleTimes()
         onTrino().executeQuery("REVOKE ADMIN OPTION FOR role2 FROM ROLE role1 IN hive");
         onTrino().executeQuery("REVOKE ADMIN OPTION FOR role2 FROM ROLE role1 IN hive");
 
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"),
                         row("alice", "USER", "role1", "NO"),
@@ -437,7 +437,7 @@ public void testRevokeMultipleTimes()
         onTrino().executeQuery("REVOKE role2 FROM ROLE role1 IN hive");
         onTrino().executeQuery("REVOKE role2 FROM ROLE role1 IN hive");
 
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.applicable_roles"))
                 .containsOnly(
                         row("alice", "USER", "public", "NO"));
     }
@@ -448,13 +448,13 @@ public void testGrantRevokeRoleAccessControl()
         onTrino().executeQuery("CREATE ROLE role1 IN hive");
         onTrino().executeQuery("CREATE ROLE role2 IN hive");
 
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob IN hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob IN hive"))
                 .hasMessageContaining("Cannot grant roles [role1] to [USER bob]");
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob WITH ADMIN OPTION IN hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob WITH ADMIN OPTION IN hive"))
                 .hasMessageContaining("Cannot grant roles [role1] to [USER bob]");
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE role1 FROM USER bob IN hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE role1 FROM USER bob IN hive"))
                 .hasMessageContaining("Cannot revoke roles [role1] from [USER bob]");
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER bob IN hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER bob IN hive"))
                 .hasMessageContaining("Cannot revoke roles [role1] from [USER bob]");
 
         onTrino().executeQuery("GRANT role1 TO USER alice WITH ADMIN OPTION IN hive");
@@ -466,13 +466,13 @@ public void testGrantRevokeRoleAccessControl()
 
         onTrino().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER alice IN hive");
 
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob IN hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob IN hive"))
                 .hasMessageContaining("Cannot grant roles [role1] to [USER bob]");
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob WITH ADMIN OPTION IN hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob WITH ADMIN OPTION IN hive"))
                 .hasMessageContaining("Cannot grant roles [role1] to [USER bob]");
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE role1 FROM USER bob IN hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE role1 FROM USER bob IN hive"))
                 .hasMessageContaining("Cannot revoke roles [role1] from [USER bob]");
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER bob IN hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER bob IN hive"))
                 .hasMessageContaining("Cannot revoke roles [role1] from [USER bob]");
 
         onTrino().executeQuery("GRANT role2 TO USER alice IN hive");
@@ -485,13 +485,13 @@ public void testGrantRevokeRoleAccessControl()
 
         onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM ROLE role2 IN hive");
 
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob IN hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob IN hive"))
                 .hasMessageContaining("Cannot grant roles [role1] to [USER bob]");
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob WITH ADMIN OPTION IN hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("GRANT role1 TO USER bob WITH ADMIN OPTION IN hive"))
                 .hasMessageContaining("Cannot grant roles [role1] to [USER bob]");
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE role1 FROM USER bob IN hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE role1 FROM USER bob IN hive"))
                 .hasMessageContaining("Cannot revoke roles [role1] from [USER bob]");
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER bob IN hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("REVOKE ADMIN OPTION FOR role1 FROM USER bob IN hive"))
                 .hasMessageContaining("Cannot revoke roles [role1] from [USER bob]");
     }
 
@@ -506,7 +506,7 @@ public void testSetRole()
         onTrino().executeQuery("GRANT role3 TO ROLE role2 IN hive");
 
         onPrestoAlice().executeQuery("SET ROLE ALL IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
                 .containsOnly(
                         row("public"),
                         row("role1"),
@@ -514,12 +514,12 @@ public void testSetRole()
                         row("role3"));
 
         onPrestoAlice().executeQuery("SET ROLE NONE IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
                 .containsOnly(
                         row("public"));
 
         onPrestoAlice().executeQuery("SET ROLE role1 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
                 .containsOnly(
                         row("public"),
                         row("role1"),
@@ -527,14 +527,14 @@ public void testSetRole()
                         row("role3"));
 
         onPrestoAlice().executeQuery("SET ROLE role2 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
                 .containsOnly(
                         row("public"),
                         row("role2"),
                         row("role3"));
 
         onPrestoAlice().executeQuery("SET ROLE role3 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
+        assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
                 .containsOnly(
                         row("public"),
                         row("role3"));
@@ -544,11 +544,11 @@ public void testSetRole()
     public void testSetAdminRole()
     {
         onTrino().executeQuery("SET ROLE NONE IN hive");
-        QueryAssert.assertThat(onTrino().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
+        assertThat(onTrino().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
                 .containsOnly(
                         row("public"));
         onTrino().executeQuery("SET ROLE admin IN hive");
-        QueryAssert.assertThat(onTrino().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
+        assertThat(onTrino().executeQuery("SELECT * FROM hive.information_schema.enabled_roles"))
                 .containsOnly(
                         row("public"),
                         row("admin"));
@@ -557,21 +557,21 @@ public void testSetAdminRole()
     @Test(groups = {ROLES, AUTHORIZATION, PROFILE_SPECIFIC_TESTS})
     public void testShowRoles()
     {
-        QueryAssert.assertThat(onTrino().executeQuery("SHOW ROLES FROM hive"))
+        assertThat(onTrino().executeQuery("SHOW ROLES FROM hive"))
                 .containsOnly(
                         row("public"),
                         row("admin"));
         onTrino().executeQuery("CREATE ROLE role1 IN hive");
-        QueryAssert.assertThat(onTrino().executeQuery("SHOW ROLES FROM hive"))
+        assertThat(onTrino().executeQuery("SHOW ROLES FROM hive"))
                 .containsOnly(
                         row("public"),
                         row("admin"),
                         row("role1"));
-        QueryAssert.assertQueryFailure(() -> onPrestoAlice().executeQuery("SHOW ROLES FROM hive"))
+        assertQueryFailure(() -> onPrestoAlice().executeQuery("SHOW ROLES FROM hive"))
                 .hasMessageContaining("Cannot show roles");
         onTrino().executeQuery("GRANT admin TO alice IN hive");
         onPrestoAlice().executeQuery("SET ROLE admin IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW ROLES FROM hive"))
+        assertThat(onPrestoAlice().executeQuery("SHOW ROLES FROM hive"))
                 .containsOnly(
                         row("public"),
                         row("admin"),
@@ -581,20 +581,20 @@ public void testShowRoles()
     @Test(groups = {ROLES, AUTHORIZATION, PROFILE_SPECIFIC_TESTS})
     public void testShowCurrentRoles()
     {
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW CURRENT ROLES FROM hive"))
+        assertThat(onPrestoAlice().executeQuery("SHOW CURRENT ROLES FROM hive"))
                 .containsOnly(
                         row("public"));
         onTrino().executeQuery("CREATE ROLE role1 IN hive");
         onTrino().executeQuery("CREATE ROLE role2 IN hive");
         onTrino().executeQuery("GRANT role1 TO alice IN hive");
         onTrino().executeQuery("GRANT role2 TO alice IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW CURRENT ROLES FROM hive"))
+        assertThat(onPrestoAlice().executeQuery("SHOW CURRENT ROLES FROM hive"))
                 .containsOnly(
                         row("public"),
                         row("role1"),
                         row("role2"));
         onPrestoAlice().executeQuery("SET ROLE role2 IN hive");
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW CURRENT ROLES FROM hive"))
+        assertThat(onPrestoAlice().executeQuery("SHOW CURRENT ROLES FROM hive"))
                 .containsOnly(
                         row("public"),
                         row("role2"));
@@ -603,22 +603,22 @@ public void testShowCurrentRoles()
     @Test(groups = {ROLES, AUTHORIZATION, PROFILE_SPECIFIC_TESTS})
     public void testShowRoleGrants()
     {
-        QueryAssert.assertThat(onTrino().executeQuery("SHOW ROLE GRANTS FROM hive"))
+        assertThat(onTrino().executeQuery("SHOW ROLE GRANTS FROM hive"))
                 .containsOnly(
                         row("public"),
                         row("admin"));
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW ROLE GRANTS FROM hive"))
+        assertThat(onPrestoAlice().executeQuery("SHOW ROLE GRANTS FROM hive"))
                 .containsOnly(
                         row("public"));
         onTrino().executeQuery("CREATE ROLE role1 IN hive");
         onTrino().executeQuery("CREATE ROLE role2 IN hive");
         onTrino().executeQuery("GRANT role1 TO alice IN hive");
         onTrino().executeQuery("GRANT role2 TO role1 IN hive");
-        QueryAssert.assertThat(onTrino().executeQuery("SHOW ROLE GRANTS FROM hive"))
+        assertThat(onTrino().executeQuery("SHOW ROLE GRANTS FROM hive"))
                 .containsOnly(
                         row("public"),
                         row("admin"));
-        QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW ROLE GRANTS FROM hive"))
+        assertThat(onPrestoAlice().executeQuery("SHOW ROLE GRANTS FROM hive"))
                 .containsOnly(
                         row("public"),
                         row("role1"));
@@ -671,14 +671,14 @@ public void testAdminCanShowAllGrants()
             onTrino().executeQuery("GRANT admin TO alice IN hive");
             onPrestoAlice().executeQuery("SET ROLE ADMIN IN hive");
 
-            QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_alice"))
+            assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_alice"))
                     .containsOnly(ImmutableList.of(
                             row("alice", "USER", "alice", "USER", "hive", "default", "test_table_alice", "SELECT", "YES", null),
                             row("alice", "USER", "alice", "USER", "hive", "default", "test_table_alice", "DELETE", "YES", null),
                             row("alice", "USER", "alice", "USER", "hive", "default", "test_table_alice", "UPDATE", "YES", null),
                             row("alice", "USER", "alice", "USER", "hive", "default", "test_table_alice", "INSERT", "YES", null)));
 
-            QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_bob"))
+            assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_bob"))
                     .containsOnly(ImmutableList.of(
                             row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "SELECT", "YES", null),
                             row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "DELETE", "YES", null),
@@ -688,7 +688,7 @@ public void testAdminCanShowAllGrants()
             onPrestoAlice().executeQuery("GRANT SELECT ON hive.default.test_table_alice  TO bob WITH GRANT OPTION");
             onPrestoAlice().executeQuery("GRANT INSERT ON hive.default.test_table_alice  TO bob");
 
-            QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_alice"))
+            assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_alice"))
                     .containsOnly(ImmutableList.of(
                             row("alice", "USER", "alice", "USER", "hive", "default", "test_table_alice", "SELECT", "YES", null),
                             row("alice", "USER", "alice", "USER", "hive", "default", "test_table_alice", "DELETE", "YES", null),
@@ -714,20 +714,20 @@ public void testAdminCanShowGrantsOnlyFromCurrentSchema()
             onPrestoAlice().executeQuery("SET ROLE ADMIN IN hive");
             onPrestoAlice().executeQuery("CREATE TABLE hive.test.test_table_bob (foo BIGINT) with (external_location='/tmp')");
 
-            QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_bob"))
+            assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.default.test_table_bob"))
                     .containsOnly(ImmutableList.of(
                             row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "SELECT", "YES", null),
                             row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "DELETE", "YES", null),
                             row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "UPDATE", "YES", null),
                             row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "INSERT", "YES", null)));
 
-            QueryAssert.assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.test.test_table_bob"))
+            assertThat(onPrestoAlice().executeQuery("SHOW GRANTS ON hive.test.test_table_bob"))
                     .containsOnly(ImmutableList.of(
                             row("alice", "USER", "alice", "USER", "hive", "test", "test_table_bob", "SELECT", "YES", null),
                             row("alice", "USER", "alice", "USER", "hive", "test", "test_table_bob", "DELETE", "YES", null),
                             row("alice", "USER", "alice", "USER", "hive", "test", "test_table_bob", "UPDATE", "YES", null),
                             row("alice", "USER", "alice", "USER", "hive", "test", "test_table_bob", "INSERT", "YES", null)));
-            QueryAssert.assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.table_privileges where table_name = 'test_table_bob'"))
+            assertThat(onPrestoAlice().executeQuery("SELECT * FROM hive.information_schema.table_privileges where table_name = 'test_table_bob'"))
                     .containsOnly(ImmutableList.of(
                             row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "SELECT", "YES", null),
                             row("bob", "USER", "bob", "USER", "hive", "default", "test_table_bob", "DELETE", "YES", null),
@@ -767,7 +767,7 @@ public void testSetRoleTablePermissions()
 
         onPrestoBob().executeQuery(select);
         onPrestoBob().executeQuery(insert);
-        QueryAssert.assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table"))
+        assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table"))
                 .containsOnly(ImmutableList.of(
                         row("alice", "USER", "role1", "ROLE", "hive", "default", "test_table", "SELECT", "NO", null),
                         row("alice", "USER", "role2", "ROLE", "hive", "default", "test_table", "INSERT", "NO", null)));
@@ -775,32 +775,32 @@ public void testSetRoleTablePermissions()
         onPrestoBob().executeQuery("SET ROLE ALL IN hive");
         onPrestoBob().executeQuery(select);
         onPrestoBob().executeQuery(insert);
-        QueryAssert.assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table"))
+        assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table"))
                 .containsOnly(ImmutableList.of(
                         row("alice", "USER", "role1", "ROLE", "hive", "default", "test_table", "SELECT", "NO", null),
                         row("alice", "USER", "role2", "ROLE", "hive", "default", "test_table", "INSERT", "NO", null)));
 
         onPrestoBob().executeQuery("SET ROLE NONE IN hive");
-        QueryAssert.assertQueryFailure(() -> onPrestoBob().executeQuery(select))
+        assertQueryFailure(() -> onPrestoBob().executeQuery(select))
                 .hasMessageContaining("Access Denied");
-        QueryAssert.assertQueryFailure(() -> onPrestoBob().executeQuery(insert))
+        assertQueryFailure(() -> onPrestoBob().executeQuery(insert))
                 .hasMessageContaining("Access Denied");
-        QueryAssert.assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table"))
+        assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table"))
                 .containsOnly(ImmutableList.of());
 
         onPrestoBob().executeQuery("SET ROLE role1 IN hive");
         onPrestoBob().executeQuery(select);
-        QueryAssert.assertQueryFailure(() -> onPrestoBob().executeQuery(insert))
+        assertQueryFailure(() -> onPrestoBob().executeQuery(insert))
                 .hasMessageContaining("Access Denied");
-        QueryAssert.assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table"))
+        assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table"))
                 .containsOnly(ImmutableList.of(
                         row("alice", "USER", "role1", "ROLE", "hive", "default", "test_table", "SELECT", "NO", null)));
 
         onPrestoBob().executeQuery("SET ROLE role2 IN hive");
-        QueryAssert.assertQueryFailure(() -> onPrestoBob().executeQuery(select))
+        assertQueryFailure(() -> onPrestoBob().executeQuery(select))
                 .hasMessageContaining("Access Denied");
         onPrestoBob().executeQuery(insert);
-        QueryAssert.assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table"))
+        assertThat(onPrestoBob().executeQuery("SHOW GRANTS ON hive.default.test_table"))
                 .containsOnly(ImmutableList.of(
                         row("alice", "USER", "role2", "ROLE", "hive", "default", "test_table", "INSERT", "NO", null)));
 
@@ -810,11 +810,11 @@ public void testSetRoleTablePermissions()
     private static void assertAdminExecute(String query)
     {
         onTrino().executeQuery("SET ROLE NONE IN hive");
-        QueryAssert.assertQueryFailure(() -> onTrino().executeQuery(query))
+        assertQueryFailure(() -> onTrino().executeQuery(query))
                 .hasMessageContaining("Access Denied");
 
         onTrino().executeQuery("SET ROLE ALL IN hive");
-        QueryAssert.assertQueryFailure(() -> onTrino().executeQuery(query))
+        assertQueryFailure(() -> onTrino().executeQuery(query))
                 .hasMessageContaining("Access Denied");
 
         onTrino().executeQuery("SET ROLE admin IN hive");
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestSqlStandardAccessControlChecks.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestSqlStandardAccessControlChecks.java
index a58506bcf146..9a416f117374 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestSqlStandardAccessControlChecks.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestSqlStandardAccessControlChecks.java
@@ -13,20 +13,20 @@
  */
 package io.trino.tests.product.hive;
 
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.query.QueryExecutor;
 import org.testng.annotations.Test;
 
 import static io.trino.plugin.hive.HiveMetadata.MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.AUTHORIZATION;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.connectToTrino;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSqlStandardAccessControlChecks
         extends ProductTest
@@ -37,14 +37,16 @@ public class TestSqlStandardAccessControlChecks
     private QueryExecutor bobExecutor;
     private QueryExecutor charlieExecutor;
     private QueryExecutor caseSensitiveUserNameExecutor;
+    private QueryExecutor hdfsExecutor;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setup()
     {
         aliceExecutor = connectToTrino("alice@presto");
         bobExecutor = connectToTrino("bob@presto");
         charlieExecutor = connectToTrino("charlie@presto");
         caseSensitiveUserNameExecutor = connectToTrino("CaseSensitiveUserName@presto");
+        hdfsExecutor = connectToTrino("hdfs@presto");
 
         aliceExecutor.executeQuery(format("DROP TABLE IF EXISTS %s", tableName));
         aliceExecutor.executeQuery(format("CREATE TABLE %s(month bigint, day bigint) WITH (partitioned_by = ARRAY['day'])", tableName));
@@ -53,7 +55,7 @@ public void setup()
         aliceExecutor.executeQuery(format("CREATE VIEW %s AS SELECT month, day FROM %s", viewName, tableName));
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void cleanup()
     {
         // should not be closed, this would close a shared, global QueryExecutor
@@ -61,6 +63,7 @@ public void cleanup()
         bobExecutor = null;
         charlieExecutor = null;
         caseSensitiveUserNameExecutor = null;
+        hdfsExecutor = null;
     }
 
     @Test(groups = {AUTHORIZATION, PROFILE_SPECIFIC_TESTS})
@@ -243,10 +246,15 @@ public void testAccessControlSelectWithCaseSensitiveUserName()
     @Test(groups = {AUTHORIZATION, PROFILE_SPECIFIC_TESTS})
     public void testAccessControlSetTableAuthorization()
     {
+        // Using custom table name as drop table as different user may leave some data in HDFS
+        String tableName = "set_table_authorization_test";
+        aliceExecutor.executeQuery(format("CREATE TABLE %s(col1 bigint, col2 bigint)", tableName));
         assertQueryFailure(() -> bobExecutor.executeQuery(format("ALTER TABLE %s SET AUTHORIZATION bob", tableName)))
                 .hasMessageContaining("Access Denied: Cannot set authorization for table default.%s to USER bob", tableName);
-        aliceExecutor.executeQuery(format("ALTER TABLE %s SET AUTHORIZATION bob", tableName));
-        bobExecutor.executeQuery(format("ALTER TABLE %s SET AUTHORIZATION alice", tableName));
+        hdfsExecutor.executeQuery("SET SESSION legacy_catalog_roles=true");
+        hdfsExecutor.executeQuery("SET ROLE ADMIN");
+        hdfsExecutor.executeQuery(format("ALTER TABLE %s SET AUTHORIZATION bob", tableName));
+        bobExecutor.executeQuery("DROP TABLE " + tableName);
     }
 
     @Test(groups = {AUTHORIZATION, PROFILE_SPECIFIC_TESTS})
@@ -257,7 +265,9 @@ public void testAccessControlSetViewAuthorization()
         assertQueryFailure(() -> bobExecutor.executeQuery(format("DROP VIEW %s", viewName)))
                 .hasMessageContaining("Access Denied: Cannot drop view default.%s", viewName);
 
-        aliceExecutor.executeQuery(format("ALTER VIEW %s SET AUTHORIZATION bob", viewName));
+        hdfsExecutor.executeQuery("SET SESSION legacy_catalog_roles=true");
+        hdfsExecutor.executeQuery("SET ROLE ADMIN");
+        hdfsExecutor.executeQuery(format("ALTER VIEW %s SET AUTHORIZATION bob", viewName));
         bobExecutor.executeQuery(format("DROP VIEW %s", viewName));
     }
 
@@ -267,13 +277,13 @@ public void testAccessControlSetHiveViewAuthorization()
         onHive().executeQuery("CREATE TABLE test_hive_table (col1 int)");
         onHive().executeQuery("CREATE VIEW test_hive_view AS SELECT * FROM test_hive_table");
 
-        QueryExecutor hdfsExecutor = connectToTrino("hdfs@presto");
-
         assertQueryFailure(() -> bobExecutor.executeQuery("ALTER VIEW test_hive_view SET AUTHORIZATION bob"))
                 .hasMessageContaining("Access Denied: Cannot set authorization for view default.test_hive_view to USER bob");
         assertQueryFailure(() -> bobExecutor.executeQuery("DROP VIEW test_hive_view"))
                 .hasMessageContaining("Access Denied: Cannot drop view default.test_hive_view");
 
+        hdfsExecutor.executeQuery("SET SESSION legacy_catalog_roles=true");
+        hdfsExecutor.executeQuery("SET ROLE ADMIN");
         hdfsExecutor.executeQuery("ALTER VIEW test_hive_view SET AUTHORIZATION bob");
         bobExecutor.executeQuery("DROP VIEW test_hive_view");
 
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningSelect.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningSelect.java
index 18b3303d0dcd..316e022ba94a 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningSelect.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningSelect.java
@@ -30,12 +30,12 @@
 
 import static io.trino.tempto.Requirements.allOf;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.LOADED;
 import static io.trino.tempto.fulfillment.table.TableRequirements.mutableTable;
 import static io.trino.tempto.fulfillment.table.hive.InlineDataSource.createResourceDataSource;
 import static io.trino.tempto.fulfillment.table.hive.InlineDataSource.createStringDataSource;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTablePartitioningSelect
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningWithSpecialChars.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningWithSpecialChars.java
index 7052dcf12d26..0564f48a081e 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningWithSpecialChars.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTablePartitioningWithSpecialChars.java
@@ -20,11 +20,11 @@
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HIVE_PARTITIONING;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTablePartitioningWithSpecialChars
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTextFileHiveTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTextFileHiveTable.java
index 25df8812811d..017202f2891b 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTextFileHiveTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestTextFileHiveTable.java
@@ -16,8 +16,8 @@
 import com.google.common.io.Resources;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import org.testng.annotations.Test;
@@ -25,10 +25,10 @@
 import java.io.InputStream;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestTextFileHiveTable
@@ -41,7 +41,7 @@ public class TestTextFileHiveTable
     @Named("databases.hive.warehouse_directory_path")
     private String warehouseDirectory;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setup()
             throws Exception
     {
@@ -51,7 +51,7 @@ public void setup()
         }
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void cleanup()
     {
         hdfsClient.delete(warehouseDirectory + "/TestTextFileHiveTable");
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestWriteToHiveTransactionalTableInTrino.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestWriteToHiveTransactionalTableInTrino.java
index 1ca9026ec68b..591f4a4b98d2 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestWriteToHiveTransactionalTableInTrino.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestWriteToHiveTransactionalTableInTrino.java
@@ -17,11 +17,11 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HMS_ONLY;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestWriteToHiveTransactionalTableInTrino
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/util/TableLocationUtils.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/util/TableLocationUtils.java
index 531bd08157a9..5155f81ecdc9 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/util/TableLocationUtils.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/util/TableLocationUtils.java
@@ -14,7 +14,6 @@
 package io.trino.tests.product.hive.util;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -52,16 +51,13 @@ public static String getTableLocation(String tableName, int partitionColumns)
     }
 
     public static String getTablePath(String tableName)
-            throws URISyntaxException
     {
         return getTablePath(tableName, 0);
     }
 
     public static String getTablePath(String tableName, int partitionColumns)
-            throws URISyntaxException
     {
         String location = getTableLocation(tableName, partitionColumns);
-        URI uri = new URI(location);
-        return uri.getPath();
+        return URI.create(location).getPath();
     }
 }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiHiveTablesCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiHiveTablesCompatibility.java
new file mode 100644
index 000000000000..695ec6e36e74
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiHiveTablesCompatibility.java
@@ -0,0 +1,152 @@
+/*
+ * Licensed 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 io.trino.tests.product.hudi;
+
+import io.trino.tempto.ProductTest;
+import io.trino.tests.product.iceberg.TestIcebergHiveTablesCompatibility;
+import org.testng.annotations.Test;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.HUDI;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests interactions between Hudi and Hive connectors, when one tries to read a table created by the other.
+ *
+ * @see TestHudiHiveViewsCompatibility
+ * @see TestIcebergHiveTablesCompatibility
+ */
+public class TestHudiHiveTablesCompatibility
+        extends ProductTest
+{
+    @Test(groups = {HUDI, PROFILE_SPECIFIC_TESTS})
+    public void testHudiSelectFromHiveTable()
+    {
+        String tableName = "test_hudi_select_from_hive_" + randomNameSuffix();
+        onTrino().executeQuery("CREATE TABLE hive.default." + tableName + "(a bigint)");
+
+        assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM hudi.default." + tableName))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q Not a Hudi table: default." + tableName);
+
+        assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM hudi.default.\"" + tableName + "$data\""))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q line 1:15: Table 'hudi.default." + tableName + "$data' does not exist");
+
+        assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM hudi.default.\"" + tableName + "$timeline\""))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q line 1:15: Table 'hudi.default." + tableName + "$timeline' does not exist");
+
+        assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM hudi.default.\"" + tableName + "$files\""))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q Invalid Hudi table name (unknown type 'files'): " + tableName + "$files");
+
+        onTrino().executeQuery("DROP TABLE hive.default." + tableName);
+    }
+
+    @Test(groups = {HUDI, PROFILE_SPECIFIC_TESTS})
+    public void testHiveSelectFromHudiTable()
+    {
+        String tableName = "test_hive_select_from_hudi_" + randomNameSuffix();
+        assertQueryFailure(() -> onTrino().executeQuery("CREATE TABLE hudi.default." + tableName + "(a bigint)"))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q This connector does not support creating tables");
+
+        assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM hive.default." + tableName))
+                // TODO should be "Cannot query Hudi table" once CREATE TABLE is supported
+                .hasMessageMatching(format("Query failed \\(#\\w+\\):\\Q line 1:15: Table 'hive.default.%s' does not exist", tableName));
+
+        assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM hive.default.\"" + tableName + "$partitions\""))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q line 1:15: Table 'hive.default." + tableName + "$partitions' does not exist");
+
+        assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM hive.default.\"" + tableName + "$properties\""))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q Table 'default." + tableName + "$properties' not found");
+    }
+
+    @Test(groups = {HUDI, PROFILE_SPECIFIC_TESTS})
+    public void testHudiCannotCreateTableNamesakeToHiveTable()
+    {
+        String tableName = "test_hudi_create_namesake_hive_table_" + randomNameSuffix();
+        onTrino().executeQuery("CREATE TABLE hive.default." + tableName + "(a bigint)");
+
+        assertQueryFailure(() -> onTrino().executeQuery("CREATE TABLE hudi.default." + tableName + "(a bigint)"))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q line 1:1: Table 'hudi.default." + tableName + "' of unsupported type already exists");
+
+        onTrino().executeQuery("DROP TABLE hive.default." + tableName);
+    }
+
+    @Test(groups = {HUDI, PROFILE_SPECIFIC_TESTS})
+    public void testHiveCannotCreateTableNamesakeToHudiTable()
+    {
+        String tableName = "test_hive_create_namesake_hudi_table_" + randomNameSuffix();
+        assertQueryFailure(() -> onTrino().executeQuery("CREATE TABLE hudi.default." + tableName + "(a bigint)"))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q This connector does not support creating tables");
+        // TODO implement test like TestIcebergHiveTablesCompatibility.testHiveCannotCreateTableNamesakeToIcebergTable when CREATE TABLE supported
+    }
+
+    @Test(groups = {HUDI, PROFILE_SPECIFIC_TESTS})
+    public void testHiveSelectTableColumns()
+    {
+        String hiveTableName = "test_hive_table_columns_table_" + randomNameSuffix();
+        onTrino().executeQuery("CREATE TABLE hive.default." + hiveTableName + "(a bigint)");
+
+        String hudiTableName = "test_hudi_table_columns_table_" + randomNameSuffix();
+        assertQueryFailure(() -> onTrino().executeQuery("CREATE TABLE hudi.default." + hudiTableName + "(a bigint)"))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q This connector does not support creating tables");
+
+        assertThat(onTrino().executeQuery(
+                format("SELECT table_cat, table_schem, table_name, column_name FROM system.jdbc.columns WHERE table_cat = 'hive' AND table_schem = 'default' AND table_name = '%s'", hiveTableName)))
+                .containsOnly(row("hive", "default", hiveTableName, "a"));
+        // Hive does not show any information about tables with unsupported format
+        assertThat(onTrino().executeQuery(
+                format("SELECT table_cat, table_schem, table_name, column_name FROM system.jdbc.columns WHERE table_cat = 'hive' AND table_schem = 'default' AND table_name = '%s'", hudiTableName)))
+                .hasNoRows();
+
+        onTrino().executeQuery("DROP TABLE hive.default." + hiveTableName);
+    }
+
+    @Test(groups = {HUDI, PROFILE_SPECIFIC_TESTS})
+    public void testHiveListsHudiTable()
+    {
+        String tableName = "test_hive_lists_hudi_table_" + randomNameSuffix();
+        assertQueryFailure(() -> onTrino().executeQuery("CREATE TABLE hudi.default." + tableName + "(a bigint)"))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q This connector does not support creating tables");
+        // TODO change doesNotContain to contains once CREATE TABLE supported
+        assertThat(onTrino().executeQuery("SHOW TABLES FROM hive.default").column(1)).doesNotContain(tableName);
+    }
+
+    @Test(groups = {HUDI, PROFILE_SPECIFIC_TESTS})
+    public void testHudiListsHiveTable()
+    {
+        String tableName = "test_hudi_lists_hive_table_" + randomNameSuffix();
+        onTrino().executeQuery("CREATE TABLE hive.default." + tableName + "(a bigint)");
+        assertThat(onTrino().executeQuery("SHOW TABLES FROM hudi.default")).contains(row(tableName));
+        onTrino().executeQuery("DROP TABLE hive.default." + tableName);
+    }
+
+    @Test(groups = {HUDI, PROFILE_SPECIFIC_TESTS})
+    public void testHudiSelectFromHiveView()
+    {
+        String tableName = "hudi_from_hive_table_" + randomNameSuffix();
+        String viewName = "hudi_from_trino_hive_view_" + randomNameSuffix();
+        onTrino().executeQuery("CREATE TABLE hive.default." + tableName + " AS SELECT 1 a");
+        onTrino().executeQuery("CREATE VIEW hive.default." + viewName + " AS TABLE hive.default." + tableName);
+
+        assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM hudi.default." + viewName))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q Not a Hudi table: default." + viewName);
+
+        onTrino().executeQuery("DROP VIEW hive.default." + viewName);
+        onTrino().executeQuery("DROP TABLE hive.default." + tableName);
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiHiveViewsCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiHiveViewsCompatibility.java
new file mode 100644
index 000000000000..6b1cced567d6
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiHiveViewsCompatibility.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed 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 io.trino.tests.product.hudi;
+
+import io.trino.tempto.ProductTest;
+import io.trino.tests.product.deltalake.TestHiveAndDeltaLakeCompatibility;
+import io.trino.tests.product.iceberg.TestIcebergHiveViewsCompatibility;
+import org.testng.annotations.Test;
+
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.HUDI;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+
+/**
+ * Tests interactions between Hudi and Hive connectors, when one tries to read a view created by the other.
+ *
+ * @see TestIcebergHiveViewsCompatibility
+ * @see TestHiveAndDeltaLakeCompatibility
+ */
+public class TestHudiHiveViewsCompatibility
+        extends ProductTest
+{
+    @Test(groups = {HUDI, PROFILE_SPECIFIC_TESTS})
+    public void testHudiSelectFromHiveView()
+    {
+        String tableName = "hudi_from_hive_table_" + randomNameSuffix();
+        String viewName = "hudi_from_trino_hive_view_" + randomNameSuffix();
+        onTrino().executeQuery("CREATE TABLE hive.default." + tableName + " AS SELECT 1 a");
+        onTrino().executeQuery("CREATE VIEW hive.default." + viewName + " AS TABLE hive.default." + tableName);
+
+        assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM hudi.default." + viewName))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q Not a Hudi table: default." + viewName);
+
+        onTrino().executeQuery("DROP VIEW hive.default." + viewName);
+        onTrino().executeQuery("DROP TABLE hive.default." + tableName);
+    }
+
+    @Test(groups = {HUDI, PROFILE_SPECIFIC_TESTS})
+    public void testHiveSelectFromHudiView()
+    {
+        assertQueryFailure(() -> onTrino().executeQuery("CREATE VIEW hudi.default.a_new_view AS SELECT 1 a"))
+                .hasMessageMatching("Query failed \\(#\\w+\\):\\Q This connector does not support creating views");
+        // TODO test reading via Hive once Hudi supports CREATE VIEW
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiSparkCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiSparkCompatibility.java
index 5f0650ff9b51..76d0491be87c 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiSparkCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hudi/TestHudiSparkCompatibility.java
@@ -14,24 +14,24 @@
 package io.trino.tests.product.hudi;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.assertions.QueryAssert;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.Test;
 
 import java.util.List;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.TestGroups.HIVE_HUDI_REDIRECTIONS;
 import static io.trino.tests.product.TestGroups.HUDI;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onHudi;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHudiSparkCompatibility
         extends ProductTest
@@ -41,7 +41,7 @@ public class TestHudiSparkCompatibility
 
     private String bucketName;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         bucketName = requireNonNull(System.getenv("S3_BUCKET"), "Environment variable not set: S3_BUCKET");
@@ -55,7 +55,7 @@ public void testCopyOnWriteShowCreateTable()
         createNonPartitionedTable(tableName, COW_TABLE_TYPE);
 
         try {
-            Assertions.assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE hudi.default." + tableName).getOnlyValue())
+            assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE hudi.default." + tableName).getOnlyValue())
                     .isEqualTo(format(
                             "CREATE TABLE hudi.default.%s (\n" +
                                     "   _hoodie_commit_time varchar,\n" +
@@ -75,7 +75,7 @@ public void testCopyOnWriteShowCreateTable()
                             bucketName,
                             tableName));
             String lastCommitTimeSync = (String) onHudi().executeQuery("show TBLPROPERTIES " + tableName + " ('last_commit_time_sync')").project(2).getOnlyValue();
-            Assertions.assertThat((String) onHudi().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
+            assertThat((String) onHudi().executeQuery("SHOW CREATE TABLE default." + tableName).getOnlyValue())
                     .isEqualTo(format("""
                                     CREATE TABLE default.%s (
                                       _hoodie_commit_time STRING,
@@ -303,7 +303,7 @@ public void testTimelineTable()
         }
     }
 
-    @Test(groups = {HUDI, PROFILE_SPECIFIC_TESTS})
+    @Test(groups = {HIVE_HUDI_REDIRECTIONS, PROFILE_SPECIFIC_TESTS})
     public void testTimelineTableRedirect()
     {
         String tableName = "test_hudi_timeline_system_table_redirect_" + randomNameSuffix();
@@ -320,6 +320,32 @@ public void testTimelineTableRedirect()
         }
     }
 
+    @Test(groups = {HUDI, PROFILE_SPECIFIC_TESTS})
+    public void testReadCopyOnWriteTableWithReplaceCommits()
+    {
+        String tableName = "test_hudi_cow_replace_commits_select_" + randomNameSuffix();
+
+        onHudi().executeQuery("CREATE TABLE default." + tableName +
+                              "(id bigint, name string, ts bigint)" +
+                              "USING hudi " +
+                              "TBLPROPERTIES (" +
+                              " type = 'cow'," +
+                              " primaryKey = 'id'," +
+                              " preCombineField = 'ts'," +
+                              " hoodie.clustering.inline = 'true'," +
+                              " hoodie.clustering.inline.max.commits = '1')" +
+                              "LOCATION 's3://" + bucketName + "/" + tableName + "'");
+
+        try {
+            onHudi().executeQuery("INSERT INTO default." + tableName + " VALUES (1, 'a1', 1000), (2, 'a2', 2000)");
+            assertThat(onTrino().executeQuery("SELECT id, name FROM hudi.default." + tableName))
+                    .containsOnly(row(1, "a1"), row(2, "a2"));
+        }
+        finally {
+            onHudi().executeQuery("DROP TABLE default." + tableName);
+        }
+    }
+
     private void createNonPartitionedTable(String tableName, String tableType)
     {
         onHudi().executeQuery(format(
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestCreateDropSchema.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestCreateDropSchema.java
index 8ec58b37fdd1..efe3162a00f0 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestCreateDropSchema.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestCreateDropSchema.java
@@ -13,15 +13,14 @@
  */
 package io.trino.tests.product.iceberg;
 
+import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import io.trino.tempto.query.QueryExecutionException;
 import org.testng.annotations.Test;
 
-import javax.inject.Inject;
-
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.ICEBERG;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
@@ -39,7 +38,7 @@ public class TestCreateDropSchema
     @Named("databases.hive.warehouse_directory_path")
     private String warehouseDirectory;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void useIceberg()
     {
         onTrino().executeQuery("USE iceberg.default");
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergCreateTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergCreateTable.java
index cc6f0a33f6c9..fa0fd3ac9e23 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergCreateTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergCreateTable.java
@@ -14,20 +14,20 @@
 package io.trino.tests.product.iceberg;
 
 import com.google.inject.Inject;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.HMS_ONLY;
 import static io.trino.tests.product.TestGroups.ICEBERG;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIcebergCreateTable
         extends ProductTest
@@ -35,14 +35,14 @@ public class TestIcebergCreateTable
     @Inject
     private HdfsClient hdfsClient;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         // Use IF NOT EXISTS because the schema can be left behind after previous test, as the tests are @Flaky
         onTrino().executeQuery("CREATE SCHEMA IF NOT EXISTS iceberg.iceberg");
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void cleanUp()
     {
         onTrino().executeQuery("DROP SCHEMA iceberg.iceberg");
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergFormatVersionCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergFormatVersionCompatibility.java
index 770610ab3cd7..9e0c5ff876f1 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergFormatVersionCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergFormatVersionCompatibility.java
@@ -21,13 +21,13 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.ICEBERG_FORMAT_VERSION_COMPATIBILITY;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onCompatibilityTestServer;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 public class TestIcebergFormatVersionCompatibility
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveMetadataListing.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveMetadataListing.java
index 2e6d96182cf8..7564761a75a0 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveMetadataListing.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveMetadataListing.java
@@ -14,8 +14,8 @@
 package io.trino.tests.product.iceberg;
 
 import com.google.common.collect.ImmutableList;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.assertions.QueryAssert;
 import org.testng.annotations.Test;
@@ -24,12 +24,12 @@
 
 import static com.google.common.collect.Iterators.getOnlyElement;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HMS_ONLY;
 import static io.trino.tests.product.TestGroups.ICEBERG;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIcebergHiveMetadataListing
         extends ProductTest
@@ -38,7 +38,7 @@ public class TestIcebergHiveMetadataListing
     private List<QueryAssert.Row> preexistingTables;
     private List<QueryAssert.Row> preexistingColumns;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         cleanUp();
@@ -66,7 +66,7 @@ public void setUp()
         onTrino().executeQuery("CREATE VIEW iceberg.default.iceberg_view AS SELECT * FROM iceberg.default.iceberg_table1");
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void cleanUp()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS hive.default.hive_table");
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveTablesCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveTablesCompatibility.java
index f89631145eaa..761ee986054e 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveTablesCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveTablesCompatibility.java
@@ -14,23 +14,25 @@
 package io.trino.tests.product.iceberg;
 
 import io.trino.tempto.ProductTest;
+import io.trino.tests.product.hudi.TestHudiHiveTablesCompatibility;
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.HMS_ONLY;
 import static io.trino.tests.product.TestGroups.ICEBERG;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests interactions between Iceberg and Hive connectors, when one tries to read a table created by the other.
  *
  * @see TestIcebergRedirectionToHive
  * @see TestIcebergHiveViewsCompatibility
+ * @see TestHudiHiveTablesCompatibility
  */
 public class TestIcebergHiveTablesCompatibility
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveViewsCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveViewsCompatibility.java
index 84f7cff66aed..4fd1459dc889 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveViewsCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergHiveViewsCompatibility.java
@@ -16,24 +16,28 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.assertions.QueryAssert;
+import io.trino.tests.product.deltalake.TestHiveAndDeltaLakeCompatibility;
+import io.trino.tests.product.hudi.TestHudiHiveViewsCompatibility;
 import org.testng.annotations.Test;
 
 import java.util.List;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HMS_ONLY;
 import static io.trino.tests.product.TestGroups.ICEBERG;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
  * Tests interactions between Iceberg and Hive connectors, when one tries to read a view created by the other.
  *
  * @see TestIcebergHiveTablesCompatibility
+ * @see TestHiveAndDeltaLakeCompatibility
+ * @see TestHudiHiveViewsCompatibility
  */
 public class TestIcebergHiveViewsCompatibility
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergInsert.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergInsert.java
index 66b7f142d964..0212bd02dae8 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergInsert.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergInsert.java
@@ -18,7 +18,6 @@
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.tempto.query.QueryExecutionException;
 import io.trino.tempto.query.QueryExecutor;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;
@@ -30,13 +29,13 @@
 import java.util.stream.IntStream;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.HMS_ONLY;
 import static io.trino.tests.product.TestGroups.ICEBERG;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS_DETAILED;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIcebergInsert
         extends ProductTest
@@ -83,7 +82,7 @@ public void testIcebergConcurrentInsert()
                     .collect(toImmutableList());
 
             // At least one INSERT per round should succeed
-            Assertions.assertThat(allInserted).hasSizeBetween(insertsPerThread, threads * insertsPerThread);
+            assertThat(allInserted).hasSizeBetween(insertsPerThread, threads * insertsPerThread);
 
             assertThat(onTrino().executeQuery("SELECT * FROM " + tableName))
                     .containsOnly(allInserted.stream()
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergOptimize.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergOptimize.java
index 310edc520472..8297e6157e62 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergOptimize.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergOptimize.java
@@ -14,20 +14,19 @@
 package io.trino.tests.product.iceberg;
 
 import io.trino.tempto.ProductTest;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.Test;
 
 import java.util.List;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.ICEBERG;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onSpark;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests compatibility between Iceberg connector and Spark Iceberg.
@@ -76,10 +75,12 @@ public void testOptimizeTableAfterDelete()
         // TODO Drop Spark dependency once that the setting 'read.split.target-size' can be set through Trino
         onSpark().executeQuery("ALTER TABLE " + sparkTableName + " SET TBLPROPERTIES ('read.split.target-size'='100')");
 
+        // For optimize we need to set task_min_writer_count to 1, otherwise it will create more than one file.
+        onTrino().executeQuery("SET SESSION task_min_writer_count = 1");
         onTrino().executeQuery("ALTER TABLE " + trinoTableName + " EXECUTE OPTIMIZE");
 
         List<String> updatedFiles = getActiveFiles(TRINO_CATALOG, TEST_SCHEMA_NAME, baseTableName);
-        Assertions.assertThat(updatedFiles)
+        assertThat(updatedFiles)
                 .hasSize(1)
                 .isNotEqualTo(initialFiles);
 
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergPartitionEvolution.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergPartitionEvolution.java
index e71f939e255e..a5893d762efd 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergPartitionEvolution.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergPartitionEvolution.java
@@ -14,16 +14,15 @@
 package io.trino.tests.product.iceberg;
 
 import io.trino.tempto.ProductTest;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.ICEBERG;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onSpark;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIcebergPartitionEvolution
         extends ProductTest
@@ -44,7 +43,7 @@ public void testDroppedPartitionField(boolean dropFirst)
 
         onSpark().executeQuery("ALTER TABLE iceberg_test.default.test_dropped_partition_field DROP PARTITION FIELD " + (dropFirst ? "a" : "b"));
 
-        Assertions.assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE test_dropped_partition_field").getOnlyValue())
+        assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE test_dropped_partition_field").getOnlyValue())
                 .matches(
                         "\\QCREATE TABLE iceberg.default.test_dropped_partition_field (\n" +
                                 "   a varchar,\n" +
@@ -52,7 +51,7 @@ public void testDroppedPartitionField(boolean dropFirst)
                                 "   c varchar\n" +
                                 ")\n" +
                                 "WITH (\n" +
-                                "   format = 'ORC',\n" +
+                                "   format = 'PARQUET',\n" +
                                 "   format_version = 1,\n" +
                                 "   location = 'hdfs://hadoop-master:9000/user/hive/warehouse/test_dropped_partition_field-\\E.*\\Q',\n" +
                                 "   partitioning = ARRAY[" + (dropFirst ? "'void(a)','b'" : "'a','void(b)'") + "]\n" +
@@ -69,9 +68,9 @@ public void testDroppedPartitionField(boolean dropFirst)
 
         assertThat(onTrino().executeQuery("SHOW STATS FOR test_dropped_partition_field"))
                 .containsOnly(
-                        row("a", null, null, 1. / 6, null, null, null),
-                        row("b", null, null, 1. / 6, null, null, null),
-                        row("c", null, null, 0., null, null, null),
+                        row("a", 664.0, 3.0, 1. / 6, null, null, null),
+                        row("b", 666.0, 3.0, 1. / 6, null, null, null),
+                        row("c", 639.0, 4.0, 0., null, null, null),
                         row(null, null, null, null, 6., null, null));
 
         assertThat(onTrino().executeQuery("SELECT column_name, data_type FROM information_schema.columns WHERE table_name = 'test_dropped_partition_field$partitions'"))
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergProcedureCalls.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergProcedureCalls.java
index fcb9ac3b25ef..f5b5bb77f834 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergProcedureCalls.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergProcedureCalls.java
@@ -13,19 +13,26 @@
  */
 package io.trino.tests.product.iceberg;
 
+import com.google.common.collect.ImmutableList;
 import io.trino.tempto.ProductTest;
-import org.assertj.core.api.Assertions;
+import io.trino.tempto.assertions.QueryAssert.Row;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+import java.util.List;
+import java.util.function.Consumer;
+
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.ICEBERG;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.hive.util.TableLocationUtils.getTableLocation;
+import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onSpark;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestIcebergProcedureCalls
@@ -52,6 +59,58 @@ public void testMigrateHiveTable()
         onTrino().executeQuery("DROP TABLE IF EXISTS " + icebergTableName);
     }
 
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS}, dataProvider = "fileFormats")
+    public void testMigrateHiveTableWithTinyintType(String fileFormat)
+    {
+        String tableName = "test_migrate_tinyint" + randomNameSuffix();
+        String hiveTableName = "hive.default." + tableName;
+        String icebergTableName = "iceberg.default." + tableName;
+        String sparkTableName = "iceberg_test.default." + tableName;
+
+        String createTable = "CREATE TABLE " + hiveTableName + "(col TINYINT) WITH (format = '" + fileFormat + "')";
+        if (fileFormat.equals("AVRO")) {
+            assertQueryFailure(() -> onTrino().executeQuery(createTable))
+                    .hasMessageContaining("Column 'col' is tinyint, which is not supported by Avro. Use integer instead.");
+            return;
+        }
+        onTrino().executeQuery(createTable);
+        onTrino().executeQuery("INSERT INTO " + hiveTableName + " VALUES -128, 127");
+
+        onTrino().executeQuery("CALL iceberg.system.migrate('default', '" + tableName + "')");
+
+        List<Row> expected = ImmutableList.of(row(-128), row(127));
+        assertThat(onTrino().executeQuery("SELECT * FROM " + icebergTableName)).containsOnly(expected);
+        assertThat(onSpark().executeQuery("SELECT * FROM " + sparkTableName)).containsOnly(expected);
+
+        onTrino().executeQuery("DROP TABLE " + icebergTableName);
+    }
+
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS}, dataProvider = "fileFormats")
+    public void testMigrateHiveTableWithSmallintType(String fileFormat)
+    {
+        String tableName = "test_migrate_smallint" + randomNameSuffix();
+        String hiveTableName = "hive.default." + tableName;
+        String icebergTableName = "iceberg.default." + tableName;
+        String sparkTableName = "iceberg_test.default." + tableName;
+
+        String createTable = "CREATE TABLE " + hiveTableName + "(col SMALLINT) WITH (format = '" + fileFormat + "')";
+        if (fileFormat.equals("AVRO")) {
+            assertQueryFailure(() -> onTrino().executeQuery(createTable))
+                    .hasMessageContaining("Column 'col' is smallint, which is not supported by Avro. Use integer instead.");
+            return;
+        }
+        onTrino().executeQuery(createTable);
+        onTrino().executeQuery("INSERT INTO " + hiveTableName + " VALUES -32768, 32767");
+
+        onTrino().executeQuery("CALL iceberg.system.migrate('default', '" + tableName + "')");
+
+        List<Row> expected = ImmutableList.of(row(-32768), row(32767));
+        assertThat(onTrino().executeQuery("SELECT * FROM " + icebergTableName)).containsOnly(expected);
+        assertThat(onSpark().executeQuery("SELECT * FROM " + sparkTableName)).containsOnly(expected);
+
+        onTrino().executeQuery("DROP TABLE " + icebergTableName);
+    }
+
     @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS})
     public void testMigrateHivePartitionedTable()
     {
@@ -70,7 +129,7 @@ public void testMigrateHivePartitionedTable()
         assertThat(onSpark().executeQuery("SELECT * FROM " + sparkTableName))
                 .containsOnly(row(1, "test"));
 
-        Assertions.assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE " + icebergTableName).getOnlyValue())
+        assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE " + icebergTableName).getOnlyValue())
                         .contains("partitioning = ARRAY['part']");
 
         onTrino().executeQuery("DROP TABLE IF EXISTS " + icebergTableName);
@@ -82,21 +141,24 @@ public void testMigrateHiveBucketedTable()
         String tableName = "test_migrate_bucketed_" + randomNameSuffix();
         String hiveTableName = "hive.default." + tableName;
         String icebergTableName = "iceberg.default." + tableName;
+        String sparkTableName = "iceberg_test.default." + tableName;
 
         onTrino().executeQuery("DROP TABLE IF EXISTS " + hiveTableName);
         onTrino().executeQuery("" +
                 "CREATE TABLE " + hiveTableName + " WITH (partitioned_by = ARRAY['part'], bucketed_by = ARRAY['bucket'], bucket_count = 10)" +
                 "AS SELECT 1 bucket, 'test' part");
 
-        assertThatThrownBy(() -> onTrino().executeQuery("CALL iceberg.system.migrate('default', '" + tableName + "')"))
-                .hasStackTraceContaining("Cannot migrate bucketed table");
+        onTrino().executeQuery("CALL iceberg.system.migrate('default', '" + tableName + "')");
 
-        assertThatThrownBy(() -> onTrino().executeQuery("SELECT * FROM " + icebergTableName))
-                .hasMessageContaining("Not an Iceberg table: default." + tableName);
-        assertThat(onTrino().executeQuery("SELECT * FROM " + hiveTableName))
+        assertThat(onTrino().executeQuery("SELECT * FROM " + icebergTableName))
+                .containsOnly(row(1, "test"));
+        assertThat(onSpark().executeQuery("SELECT * FROM " + sparkTableName))
                 .containsOnly(row(1, "test"));
 
-        onTrino().executeQuery("DROP TABLE IF EXISTS " + hiveTableName);
+        assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE " + icebergTableName).getOnlyValue())
+                .contains("partitioning = ARRAY['part']");
+
+        onTrino().executeQuery("DROP TABLE IF EXISTS " + icebergTableName);
     }
 
     @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS})
@@ -105,21 +167,64 @@ public void testMigrateHiveBucketedOnMultipleColumns()
         String tableName = "test_migrate_bucketed_" + randomNameSuffix();
         String hiveTableName = "hive.default." + tableName;
         String icebergTableName = "iceberg.default." + tableName;
+        String sparkTableName = "iceberg_test.default." + tableName;
 
         onTrino().executeQuery("DROP TABLE IF EXISTS " + hiveTableName);
         onTrino().executeQuery("" +
                 "CREATE TABLE " + hiveTableName + " WITH (partitioned_by = ARRAY['part'], bucketed_by = ARRAY['bucket', 'another_bucket'], bucket_count = 10)" +
                 "AS SELECT 1 bucket, 'a' another_bucket, 'test' part");
 
-        assertThatThrownBy(() -> onTrino().executeQuery("CALL iceberg.system.migrate('default', '" + tableName + "')"))
-                .hasStackTraceContaining("Cannot migrate bucketed table");
+        onTrino().executeQuery("CALL iceberg.system.migrate('default', '" + tableName + "')");
 
-        assertThatThrownBy(() -> onTrino().executeQuery("SELECT * FROM " + icebergTableName))
-                .hasMessageContaining("Not an Iceberg table: default." + tableName);
-        assertThat(onTrino().executeQuery("SELECT * FROM " + hiveTableName))
+        assertThat(onTrino().executeQuery("SELECT * FROM " + icebergTableName))
+                .containsOnly(row(1, "a", "test"));
+        assertThat(onSpark().executeQuery("SELECT * FROM " + sparkTableName))
                 .containsOnly(row(1, "a", "test"));
 
-        onTrino().executeQuery("DROP TABLE IF EXISTS " + hiveTableName);
+        assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE " + icebergTableName).getOnlyValue())
+                .contains("partitioning = ARRAY['part']");
+
+        onTrino().executeQuery("DROP TABLE IF EXISTS " + icebergTableName);
+    }
+
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS})
+    public void testTrinoMigrateExternalTable()
+    {
+        migrateExternalTable(tableName -> onTrino().executeQuery("CALL iceberg.system.migrate('default', '" + tableName + "')"));
+    }
+
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS})
+    public void testSparkMigrateExternalTable()
+    {
+        migrateExternalTable(tableName -> onSpark().executeQuery("CALL iceberg_test.system.migrate('default." + tableName + "')"));
+    }
+
+    private void migrateExternalTable(Consumer<String> migrateTable)
+    {
+        String managedTableName = "test_migrate_managed_" + randomNameSuffix();
+        String externalTableName = "test_migrate_external_" + randomNameSuffix();
+        String icebergTableName = "iceberg.default." + externalTableName;
+        String sparkTableName = "iceberg_test.default." + externalTableName;
+
+        onTrino().executeQuery("DROP TABLE IF EXISTS hive.default." + managedTableName);
+        onTrino().executeQuery("CREATE TABLE hive.default." + managedTableName + " AS SELECT 1 x");
+        String tableLocation = getTableLocation("hive.default." + managedTableName);
+        onTrino().executeQuery("CREATE TABLE hive.default." + externalTableName + "(x integer) WITH (external_location = '" + tableLocation + "')");
+
+        // Migrate an external table
+        migrateTable.accept(externalTableName);
+
+        assertThat(onTrino().executeQuery("SELECT * FROM " + icebergTableName)).containsOnly(row(1));
+        assertThat(onSpark().executeQuery("SELECT * FROM " + sparkTableName)).containsOnly(row(1));
+
+        // The migrated table behaves like managed tables because Iceberg doesn't have an external table concept
+        onTrino().executeQuery("DROP TABLE " + icebergTableName);
+
+        assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM hive.default." + managedTableName))
+                .hasMessageContaining("Partition location does not exist");
+        assertThat(onHive().executeQuery("SELECT * FROM default." + managedTableName)).hasNoRows();
+
+        onTrino().executeQuery("DROP TABLE hive.default." + managedTableName);
     }
 
     @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS})
@@ -179,4 +284,10 @@ private long getSecondOldestTableSnapshot(String tableName)
                 format("SELECT snapshot_id FROM iceberg.default.\"%s$snapshots\" WHERE parent_id IS NOT NULL ORDER BY committed_at FETCH FIRST 1 ROW WITH TIES", tableName))
                 .getOnlyValue();
     }
+
+    @DataProvider
+    public static Object[][] fileFormats()
+    {
+        return new Object[][] {{"ORC"}, {"PARQUET"}, {"AVRO"}};
+    }
 }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRedirectionToHive.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRedirectionToHive.java
index d6fa19bd1444..ca8afab6b255 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRedirectionToHive.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRedirectionToHive.java
@@ -13,12 +13,11 @@
  */
 package io.trino.tests.product.iceberg;
 
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.tempto.query.QueryResult;
 import org.assertj.core.api.AbstractStringAssert;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -26,7 +25,6 @@
 import static io.trino.plugin.hive.HiveMetadata.MODIFYING_NON_TRANSACTIONAL_TABLE_MESSAGE;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.query.QueryExecutor.param;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.HIVE_ICEBERG_REDIRECTIONS;
@@ -34,6 +32,7 @@
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 import static java.sql.JDBCType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests interactions between Iceberg and Hive connectors, when one tries to read a table created by the other
@@ -44,7 +43,7 @@
 public class TestIcebergRedirectionToHive
         extends ProductTest
 {
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void createAdditionalSchema()
     {
         onTrino().executeQuery("CREATE SCHEMA IF NOT EXISTS iceberg.nondefaultschema");
@@ -240,6 +239,19 @@ public void testUpdate()
         onTrino().executeQuery("DROP TABLE " + hiveTableName);
     }
 
+    @Test(groups = {HIVE_ICEBERG_REDIRECTIONS, PROFILE_SPECIFIC_TESTS})
+    public void testCreateOrReplaceTable()
+    {
+        String tableName = "iceberg_create_or_replace_hive_" + randomNameSuffix();
+        String hiveTableName = "hive.default." + tableName;
+        String icebergTableName = "iceberg.default." + tableName;
+
+        createHiveTable(hiveTableName, false);
+
+        assertQueryFailure(() -> onTrino().executeQuery("CREATE OR REPLACE TABLE " + icebergTableName + " (d integer)"))
+                .hasMessageMatching("\\QQuery failed (#\\E\\S+\\Q): line 1:1: Table '" + icebergTableName + "' of unsupported type already exists");
+    }
+
     @Test(groups = {HIVE_ICEBERG_REDIRECTIONS, PROFILE_SPECIFIC_TESTS})
     public void testDropTable()
     {
@@ -350,7 +362,7 @@ public void testAlterTableAddColumn()
 
         onTrino().executeQuery("ALTER TABLE " + icebergTableName + " ADD COLUMN some_new_column double");
 
-        Assertions.assertThat(onTrino().executeQuery("DESCRIBE " + hiveTableName).column(1))
+        assertThat(onTrino().executeQuery("DESCRIBE " + hiveTableName).column(1))
                 .containsOnly("nationkey", "name", "regionkey", "comment", "some_new_column");
 
         assertResultsEqual(
@@ -370,7 +382,7 @@ public void testAlterTableRenameColumn()
 
         onTrino().executeQuery("ALTER TABLE " + icebergTableName + " RENAME COLUMN nationkey TO nation_key");
 
-        Assertions.assertThat(onTrino().executeQuery("DESCRIBE " + icebergTableName).column(1))
+        assertThat(onTrino().executeQuery("DESCRIBE " + icebergTableName).column(1))
                 .containsOnly("nation_key", "name", "regionkey", "comment");
 
         assertResultsEqual(
@@ -391,7 +403,7 @@ public void testAlterTableDropColumn()
 
         onTrino().executeQuery("ALTER TABLE " + icebergTableName + " DROP COLUMN comment");
 
-        Assertions.assertThat(onTrino().executeQuery("DESCRIBE " + icebergTableName).column(1))
+        assertThat(onTrino().executeQuery("DESCRIBE " + icebergTableName).column(1))
                 .containsOnly("nationkey", "name", "regionkey");
 
         // After dropping the column from the Hive metastore, access ORC columns by name
@@ -602,7 +614,7 @@ private static void createHiveTable(String tableName, boolean partitioned, boole
 
     private static AbstractStringAssert<?> assertTableComment(String catalog, String schema, String tableName)
     {
-        return Assertions.assertThat((String) readTableComment(catalog, schema, tableName).getOnlyValue());
+        return assertThat((String) readTableComment(catalog, schema, tableName).getOnlyValue());
     }
 
     private static QueryResult readTableComment(String catalog, String schema, String tableName)
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRenameTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRenameTable.java
index d5a1594e9c98..1d821cc4fde7 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRenameTable.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRenameTable.java
@@ -17,12 +17,12 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.HMS_ONLY;
 import static io.trino.tests.product.TestGroups.ICEBERG;
 import static io.trino.tests.product.TestGroups.STORAGE_FORMATS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestIcebergRenameTable
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkCompatibility.java
index 9d01a376993f..9d51741b127e 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkCompatibility.java
@@ -16,10 +16,11 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Streams;
+import com.google.inject.Inject;
 import io.airlift.concurrent.MoreFutures;
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreClient;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import io.trino.tempto.query.QueryExecutionException;
@@ -28,13 +29,10 @@
 import io.trino.tests.product.hive.Engine;
 import io.trino.tests.product.hive.TestHiveMetastoreClientFactory;
 import org.apache.thrift.TException;
-import org.assertj.core.api.Assertions;
 import org.testng.SkipException;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import javax.inject.Inject;
-
 import java.math.BigDecimal;
 import java.net.URI;
 import java.sql.Date;
@@ -59,12 +57,12 @@
 import static io.trino.tempto.assertions.QueryAssert.Row;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.testing.DataProviders.cartesianProduct;
 import static io.trino.testing.DataProviders.toDataProvider;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.ICEBERG;
 import static io.trino.tests.product.TestGroups.ICEBERG_JDBC;
+import static io.trino.tests.product.TestGroups.ICEBERG_NESSIE;
 import static io.trino.tests.product.TestGroups.ICEBERG_REST;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.iceberg.TestIcebergSparkCompatibility.CreateMode.CREATE_TABLE_AND_INSERT;
@@ -80,6 +78,7 @@
 import static java.util.Locale.ENGLISH;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.stream.Collectors.toUnmodifiableSet;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
@@ -96,7 +95,7 @@ public class TestIcebergSparkCompatibility
     private TestHiveMetastoreClientFactory testHiveMetastoreClientFactory;
     private ThriftMetastoreClient metastoreClient;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setup()
             throws TException
     {
@@ -105,7 +104,7 @@ public void setup()
         onTrino().executeQuery("CREATE SCHEMA IF NOT EXISTS iceberg.default WITH (location = 'hdfs://hadoop-master:9000/user/hive/warehouse/default')");
     }
 
-    @AfterTestWithContext
+    @AfterMethodWithContext
     public void tearDown()
     {
         metastoreClient.close();
@@ -117,14 +116,14 @@ public void tearDown()
     private static final String TRINO_CATALOG = "iceberg";
     private static final String TEST_SCHEMA_NAME = "default";
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
     {
         // we create default schema so that we can re-use the same test for the Iceberg REST catalog (since Iceberg itself doesn't support a default schema)
         onTrino().executeQuery(format("CREATE SCHEMA IF NOT EXISTS %s.%s", TRINO_CATALOG, TEST_SCHEMA_NAME));
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormatsWithSpecVersion")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormatsWithSpecVersion")
     public void testTrinoReadingSparkData(StorageFormat storageFormat, int specVersion)
     {
         String baseTableName = toLowerCase("test_trino_reading_primitive_types_" + storageFormat);
@@ -221,7 +220,7 @@ public void testTrinoReadingSparkData(StorageFormat storageFormat, int specVersi
         onSpark().executeQuery("DROP TABLE " + sparkTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "testSparkReadingTrinoDataDataProvider")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "testSparkReadingTrinoDataDataProvider")
     public void testSparkReadingTrinoData(StorageFormat storageFormat, CreateMode createMode)
     {
         String baseTableName = toLowerCase("test_spark_reading_primitive_types_" + storageFormat + "_" + createMode);
@@ -349,7 +348,7 @@ public Object[][] testSparkReadingTrinoDataDataProvider()
                 .toArray(Object[][]::new);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormats")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormats")
     public void testSparkReadTrinoUuid(StorageFormat storageFormat)
     {
         String tableName = toLowerCase("test_spark_read_trino_uuid_" + storageFormat);
@@ -366,12 +365,12 @@ public void testSparkReadTrinoUuid(StorageFormat storageFormat)
                 // TODO Iceberg Spark integration needs yet to gain support
                 //  once this is supported, merge this test with testSparkReadingTrinoData()
                 .isInstanceOf(SQLException.class)
-                .hasMessageMatching("org.apache.hive.service.cli.HiveSQLException: Error running query:.*\\Q java.lang.ClassCastException\\E(?s:.*)");
+                .hasMessageMatching("org.apache.hive.service.cli.HiveSQLException: Error running query:.*\\Q java.lang.UnsupportedOperationException\\E(?s:.*)");
 
         onTrino().executeQuery("DROP TABLE " + trinoTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "specVersions")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "specVersions")
     public void testSparkCreatesTrinoDrops(int specVersion)
     {
         String baseTableName = "test_spark_creates_trino_drops";
@@ -379,7 +378,7 @@ public void testSparkCreatesTrinoDrops(int specVersion)
         onTrino().executeQuery("DROP TABLE " + trinoTableName(baseTableName));
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC})
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE})
     public void testTrinoCreatesSparkDrops()
     {
         String baseTableName = "test_trino_creates_spark_drops";
@@ -387,7 +386,7 @@ public void testTrinoCreatesSparkDrops()
         onSpark().executeQuery("DROP TABLE " + sparkTableName(baseTableName));
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormats")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormats")
     public void testSparkReadsTrinoPartitionedTable(StorageFormat storageFormat)
     {
         String baseTableName = toLowerCase("test_spark_reads_trino_partitioned_table_" + storageFormat);
@@ -415,7 +414,7 @@ public void testSparkReadsTrinoPartitionedTable(StorageFormat storageFormat)
         onTrino().executeQuery("DROP TABLE " + trinoTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormatsWithSpecVersion")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormatsWithSpecVersion")
     public void testTrinoReadsSparkPartitionedTable(StorageFormat storageFormat, int specVersion)
     {
         String baseTableName = toLowerCase("test_trino_reads_spark_partitioned_table_" + storageFormat);
@@ -536,7 +535,7 @@ public void testPartitionedByNestedField()
         onSpark().executeQuery("DROP TABLE " + sparkTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormatsWithSpecVersion")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormatsWithSpecVersion")
     public void testTrinoReadingCompositeSparkData(StorageFormat storageFormat, int specVersion)
     {
         String baseTableName = toLowerCase("test_trino_reading_spark_composites_" + storageFormat);
@@ -564,7 +563,7 @@ public void testTrinoReadingCompositeSparkData(StorageFormat storageFormat, int
         onSpark().executeQuery("DROP TABLE " + sparkTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormats")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormats")
     public void testSparkReadingCompositeTrinoData(StorageFormat storageFormat)
     {
         String baseTableName = toLowerCase("test_spark_reading_trino_composites_" + storageFormat);
@@ -591,7 +590,7 @@ public void testSparkReadingCompositeTrinoData(StorageFormat storageFormat)
         onTrino().executeQuery("DROP TABLE " + trinoTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormatsWithSpecVersion")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormatsWithSpecVersion")
     public void testTrinoReadingSparkIcebergTablePropertiesData(StorageFormat storageFormat, int specVersion)
     {
         String baseTableName = toLowerCase("test_trino_reading_spark_iceberg_table_properties_" + storageFormat);
@@ -619,7 +618,7 @@ public void testTrinoReadingSparkIcebergTablePropertiesData(StorageFormat storag
         onSpark().executeQuery("DROP TABLE IF EXISTS " + sparkTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormatsWithSpecVersion")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormatsWithSpecVersion")
     public void testTrinoReadingNestedSparkData(StorageFormat storageFormat, int specVersion)
     {
         String baseTableName = toLowerCase("test_trino_reading_nested_spark_data_" + storageFormat);
@@ -676,7 +675,7 @@ public void testTrinoReadingNestedSparkData(StorageFormat storageFormat, int spe
         onSpark().executeQuery("DROP TABLE " + sparkTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormats")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormats")
     public void testSparkReadingNestedTrinoData(StorageFormat storageFormat)
     {
         String baseTableName = toLowerCase("test_spark_reading_nested_trino_data_" + storageFormat);
@@ -733,7 +732,7 @@ public void testSparkReadingNestedTrinoData(StorageFormat storageFormat)
         onTrino().executeQuery("DROP TABLE " + trinoTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormatsWithSpecVersion")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormatsWithSpecVersion")
     public void testIdBasedFieldMapping(StorageFormat storageFormat, int specVersion)
     {
         String baseTableName = toLowerCase("test_schema_evolution_for_nested_fields_" + storageFormat);
@@ -851,7 +850,7 @@ public void testIdBasedFieldMapping(StorageFormat storageFormat, int specVersion
         onSpark().executeQuery("DROP TABLE " + sparkTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormatsWithSpecVersion")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormatsWithSpecVersion")
     public void testReadAfterPartitionEvolution(StorageFormat storageFormat, int specVersion)
     {
         String baseTableName = toLowerCase("test_read_after_partition_evolution_" + storageFormat);
@@ -982,12 +981,12 @@ public void testCreateAndDropTableWithSameLocationFailsOnTrino(int specVersion)
         onTrino().executeQuery(format("DROP TABLE %s", trinoTableName(tableSameLocation1)));
 
         assertQueryFailure(() -> onTrino().executeQuery(format("SELECT * FROM %s", trinoTableName(tableSameLocation2))))
-                .hasMessageMatching(".*Failed to open input stream for file.*");
+                .hasMessageMatching(".*Metadata not found in metadata location for table default." + tableSameLocation2);
 
-        // Can't clean up tableSameLocation2 as all data and metadata has been removed
+        onTrino().executeQuery(format("DROP TABLE %s", trinoTableName(tableSameLocation2)));
     }
 
-    @Test(groups = {ICEBERG, ICEBERG_JDBC, PROFILE_SPECIFIC_TESTS}, dataProvider = "storageFormatsWithSpecVersion")
+    @Test(groups = {ICEBERG, ICEBERG_JDBC, PROFILE_SPECIFIC_TESTS, ICEBERG_NESSIE}, dataProvider = "storageFormatsWithSpecVersion")
     public void testTrinoWritingDataWithObjectStorageLocationProvider(StorageFormat storageFormat, int specVersion)
     {
         String baseTableName = toLowerCase("test_object_storage_location_provider_" + storageFormat);
@@ -1017,7 +1016,7 @@ public void testTrinoWritingDataWithObjectStorageLocationProvider(StorageFormat
         onSpark().executeQuery("DROP TABLE " + sparkTableName);
     }
 
-    @Test(groups = {ICEBERG, ICEBERG_JDBC, PROFILE_SPECIFIC_TESTS}, dataProvider = "storageFormatsWithSpecVersion")
+    @Test(groups = {ICEBERG, ICEBERG_JDBC, PROFILE_SPECIFIC_TESTS, ICEBERG_NESSIE}, dataProvider = "storageFormatsWithSpecVersion")
     public void testTrinoWritingDataWithWriterDataPathSet(StorageFormat storageFormat, int specVersion)
     {
         String baseTableName = toLowerCase("test_writer_data_path_" + storageFormat);
@@ -1084,7 +1083,7 @@ public void testTrinoWritingDataWithWriterDataPathSet(StorageFormat storageForma
             Streams.mapWithIndex(SPECIAL_CHARACTER_VALUES.stream(), ((value, index) -> row((int) index, value)))
                     .collect(toImmutableList());
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC})
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE})
     public void testStringPartitioningWithSpecialCharactersCtasInTrino()
     {
         String baseTableName = "test_string_partitioning_with_special_chars_ctas_in_trino";
@@ -1102,7 +1101,7 @@ public void testStringPartitioningWithSpecialCharactersCtasInTrino()
         onTrino().executeQuery("DROP TABLE " + trinoTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC})
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE})
     public void testStringPartitioningWithSpecialCharactersInsertInTrino()
     {
         String baseTableName = "test_string_partitioning_with_special_chars_ctas_in_trino";
@@ -1118,7 +1117,7 @@ public void testStringPartitioningWithSpecialCharactersInsertInTrino()
         onTrino().executeQuery("DROP TABLE " + trinoTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC})
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE})
     public void testStringPartitioningWithSpecialCharactersInsertInSpark()
     {
         String baseTableName = "test_string_partitioning_with_special_chars_ctas_in_spark";
@@ -1271,7 +1270,7 @@ public void testTrinoReadsSparkSortOrder()
         onSpark().executeQuery("CREATE TABLE " + sparkTableName + " (a INT, b INT, c INT) USING ICEBERG");
         onSpark().executeQuery("ALTER TABLE " + sparkTableName + " WRITE ORDERED BY b, c DESC NULLS LAST");
 
-        Assertions.assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE " + trinoTableName).getOnlyValue())
+        assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE " + trinoTableName).getOnlyValue())
                 .contains("sorted_by = ARRAY['b ASC NULLS FIRST','c DESC NULLS LAST']");
 
         onTrino().executeQuery("INSERT INTO " + trinoTableName + " VALUES (3, 2, 1), (1, 2, 3), (NULL, NULL, NULL)");
@@ -1292,7 +1291,7 @@ public void testTrinoIgnoresUnsupportedSparkSortOrder()
         onSpark().executeQuery("CREATE TABLE " + sparkTableName + " (a INT, b INT, c INT) USING ICEBERG");
         onSpark().executeQuery("ALTER TABLE " + sparkTableName + " WRITE ORDERED BY truncate(b, 3), a NULLS LAST");
 
-        Assertions.assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE " + trinoTableName).getOnlyValue())
+        assertThat((String) onTrino().executeQuery("SHOW CREATE TABLE " + trinoTableName).getOnlyValue())
                 .doesNotContain("sorted_by");
 
         onTrino().executeQuery("INSERT INTO " + trinoTableName + " VALUES (3, 2333, 1), (NULL, NULL, NULL), (1, 2222, 3)");
@@ -1357,7 +1356,7 @@ public void testTrinoSparkConcurrentInsert()
                     .collect(toImmutableList());
 
             // At least one INSERT per round should succeed
-            Assertions.assertThat(allInserted).hasSizeBetween(insertsPerEngine, insertsPerEngine * 2);
+            assertThat(allInserted).hasSizeBetween(insertsPerEngine, insertsPerEngine * 2);
 
             // All Spark inserts should succeed (and not be obliterated)
             assertThat(onTrino().executeQuery("SELECT count(*) FROM " + trinoTableName + " WHERE e = 'spark'"))
@@ -1373,7 +1372,7 @@ public void testTrinoSparkConcurrentInsert()
         }
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormatsAndCompressionCodecs")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormatsAndCompressionCodecs")
     public void testTrinoReadingSparkCompressedData(StorageFormat storageFormat, String compressionCodec)
     {
         String baseTableName = toLowerCase("test_spark_compression" +
@@ -1438,7 +1437,7 @@ else if ("ZSTD".equals(compressionCodec)) {
         onSpark().executeQuery("DROP TABLE " + sparkTableName);
     }
 
-    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC}, dataProvider = "storageFormatsAndCompressionCodecs")
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC, ICEBERG_NESSIE}, dataProvider = "storageFormatsAndCompressionCodecs")
     public void testSparkReadingTrinoCompressedData(StorageFormat storageFormat, String compressionCodec)
     {
         String baseTableName = toLowerCase("test_trino_compression" +
@@ -2031,7 +2030,7 @@ public void testSparkReadsTrinoTableAfterCleaningUp(StorageFormat storageFormat)
         onTrino().executeQuery(format("ALTER TABLE %s EXECUTE REMOVE_ORPHAN_FILES (retention_threshold => '0s')", trinoTableName));
 
         int updatedNumberOfMetadataFiles = calculateMetadataFilesForPartitionedTable(baseTableName);
-        Assertions.assertThat(updatedNumberOfMetadataFiles).isLessThan(initialNumberOfMetadataFiles);
+        assertThat(updatedNumberOfMetadataFiles).isLessThan(initialNumberOfMetadataFiles);
 
         Row row = row(3006);
         String selectByString = "SELECT SUM(_bigint) FROM %s WHERE _string = 'a'";
@@ -2073,9 +2072,9 @@ public void testSparkReadsTrinoTableAfterOptimizeAndCleaningUp(StorageFormat sto
         onTrino().executeQuery(format("ALTER TABLE %s EXECUTE REMOVE_ORPHAN_FILES (retention_threshold => '0s')", trinoTableName));
 
         int updatedNumberOfFiles = onTrino().executeQuery(format("SELECT * FROM iceberg.default.\"%s$files\"", baseTableName)).getRowsCount();
-        Assertions.assertThat(updatedNumberOfFiles).isLessThan(initialNumberOfFiles);
+        assertThat(updatedNumberOfFiles).isLessThan(initialNumberOfFiles);
         int updatedNumberOfMetadataFiles = calculateMetadataFilesForPartitionedTable(baseTableName);
-        Assertions.assertThat(updatedNumberOfMetadataFiles).isLessThan(initialNumberOfMetadataFiles);
+        assertThat(updatedNumberOfMetadataFiles).isLessThan(initialNumberOfMetadataFiles);
 
         Row row = row(3006);
         String selectByString = "SELECT SUM(_bigint) FROM %s WHERE _string = 'a'";
@@ -2250,6 +2249,46 @@ public void testAddNotNullColumn()
         onTrino().executeQuery("DROP TABLE " + trinoTableName);
     }
 
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC})
+    public void testAddNestedField()
+    {
+        String baseTableName = "test_add_nested_field_" + randomNameSuffix();
+        String trinoTableName = trinoTableName(baseTableName);
+        String sparkTableName = sparkTableName(baseTableName);
+
+        onTrino().executeQuery("CREATE TABLE " + trinoTableName + " AS SELECT CAST(row(1, row(10)) AS row(a integer, b row(x integer))) AS col");
+
+        onTrino().executeQuery("ALTER TABLE " + trinoTableName + " ADD COLUMN col.c integer");
+        assertThat(onTrino().executeQuery("SELECT col.a, col.b.x, col.c FROM " + trinoTableName)).containsOnly(row(1, 10, null));
+        assertThat(onSpark().executeQuery("SELECT col.a, col.b.x, col.c FROM " + sparkTableName)).containsOnly(row(1, 10, null));
+
+        onTrino().executeQuery("ALTER TABLE " + trinoTableName + " ADD COLUMN col.b.y integer");
+        assertThat(onTrino().executeQuery("SELECT col.a, col.b.x, col.b.y, col.c FROM " + trinoTableName)).containsOnly(row(1, 10, null, null));
+        assertThat(onSpark().executeQuery("SELECT col.a, col.b.x, col.b.y, col.c FROM " + sparkTableName)).containsOnly(row(1, 10, null, null));
+
+        onTrino().executeQuery("DROP TABLE " + trinoTableName);
+    }
+
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC})
+    public void testRenameNestedField()
+    {
+        String baseTableName = "test_rename_nested_field_" + randomNameSuffix();
+        String trinoTableName = trinoTableName(baseTableName);
+        String sparkTableName = sparkTableName(baseTableName);
+
+        onTrino().executeQuery("CREATE TABLE " + trinoTableName + " AS SELECT CAST(row(1, row(10)) AS row(a integer, b row(x integer))) AS col");
+
+        onTrino().executeQuery("ALTER TABLE " + trinoTableName + " ADD COLUMN col.c integer");
+        assertThat(onTrino().executeQuery("SELECT col.a, col.b.x, col.c FROM " + trinoTableName)).containsOnly(row(1, 10, null));
+        assertThat(onSpark().executeQuery("SELECT col.a, col.b.x, col.c FROM " + sparkTableName)).containsOnly(row(1, 10, null));
+
+        onTrino().executeQuery("ALTER TABLE " + trinoTableName + " ADD COLUMN col.b.y integer");
+        assertThat(onTrino().executeQuery("SELECT col.a, col.b.x, col.b.y, col.c FROM " + trinoTableName)).containsOnly(row(1, 10, null, null));
+        assertThat(onSpark().executeQuery("SELECT col.a, col.b.x, col.b.y, col.c FROM " + sparkTableName)).containsOnly(row(1, 10, null, null));
+
+        onTrino().executeQuery("DROP TABLE " + trinoTableName);
+    }
+
     @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS, ICEBERG_REST, ICEBERG_JDBC})
     public void testDropNestedField()
     {
@@ -2397,7 +2436,7 @@ public void testMetadataCompressionCodecGzip()
         List<String> metadataFiles = hdfsClient.listDirectory(tableLocation + "/metadata").stream()
                 .filter(file -> file.endsWith("metadata.json"))
                 .collect(toImmutableList());
-        Assertions.assertThat(metadataFiles)
+        assertThat(metadataFiles)
                 .isNotEmpty()
                 .filteredOn(file -> file.endsWith("gz.metadata.json"))
                 .isEqualTo(metadataFiles);
@@ -2422,8 +2461,8 @@ private void validatePartitioning(String baseTableName, String sparkTableName, L
         List<Object> partitioning = onTrino().executeQuery(format("SELECT partition, record_count FROM iceberg.default.\"%s$partitions\"", baseTableName))
                 .column(1);
         Set<String> partitions = partitioning.stream().map(String::valueOf).collect(toUnmodifiableSet());
-        Assertions.assertThat(partitions.size()).isEqualTo(expectedValues.size());
-        Assertions.assertThat(partitions).containsAll(trinoResult);
+        assertThat(partitions.size()).isEqualTo(expectedValues.size());
+        assertThat(partitions).containsAll(trinoResult);
         List<String> sparkResult = expectedValues.stream().map(m ->
                 m.entrySet().stream()
                         .map(entry -> format("\"%s\":%s", entry.getKey(), entry.getValue()))
@@ -2431,8 +2470,8 @@ private void validatePartitioning(String baseTableName, String sparkTableName, L
                 .collect(toImmutableList());
         partitioning = onSpark().executeQuery(format("SELECT partition from %s.files", sparkTableName)).column(1);
         partitions = partitioning.stream().map(String::valueOf).collect(toUnmodifiableSet());
-        Assertions.assertThat(partitions.size()).isEqualTo(expectedValues.size());
-        Assertions.assertThat(partitions).containsAll(sparkResult);
+        assertThat(partitions.size()).isEqualTo(expectedValues.size());
+        assertThat(partitions).containsAll(sparkResult);
     }
 
     @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS})
@@ -2517,10 +2556,10 @@ public void testRegisterTableWithComments(StorageFormat storageFormat)
 
         onTrino().executeQuery(format("CALL iceberg.system.register_table ('%s', '%s', '%s')", TEST_SCHEMA_NAME, baseTableName, tableLocation));
 
-        Assertions.assertThat(getTableComment(baseTableName)).isEqualTo("my-table-comment");
-        Assertions.assertThat(getColumnComment(baseTableName, "a")).isEqualTo("a-comment");
-        Assertions.assertThat(getColumnComment(baseTableName, "b")).isEqualTo("b-comment");
-        Assertions.assertThat(getColumnComment(baseTableName, "c")).isEqualTo("c-comment");
+        assertThat(getTableComment(baseTableName)).isEqualTo("my-table-comment");
+        assertThat(getColumnComment(baseTableName, "a")).isEqualTo("a-comment");
+        assertThat(getColumnComment(baseTableName, "b")).isEqualTo("b-comment");
+        assertThat(getColumnComment(baseTableName, "c")).isEqualTo("c-comment");
         onTrino().executeQuery(format("DROP TABLE %s", trinoTableName));
     }
 
@@ -2709,6 +2748,26 @@ private void testTrinoSetColumnType(boolean partitioned, StorageFormat storageFo
         onTrino().executeQuery("DROP TABLE " + trinoTableName);
     }
 
+    @Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS}, dataProvider = "testSetColumnTypeDataProvider")
+    public void testTrinoSetFieldType(StorageFormat storageFormat, String sourceFieldType, String sourceValueLiteral, String newFieldType, Object newValue)
+    {
+        String baseTableName = "test_set_field_type_" + randomNameSuffix();
+        String trinoTableName = trinoTableName(baseTableName);
+        String sparkTableName = sparkTableName(baseTableName);
+
+        onTrino().executeQuery("CREATE TABLE " + trinoTableName + " " +
+                "WITH (format = '" + storageFormat + "')" +
+                "AS SELECT CAST(row(" + sourceValueLiteral + ") AS row(field " + sourceFieldType + ")) AS col");
+
+        onTrino().executeQuery("ALTER TABLE " + trinoTableName + " ALTER COLUMN col.field SET DATA TYPE " + newFieldType);
+
+        assertEquals(getColumnType(baseTableName, "col"), "row(field " + newFieldType + ")");
+        assertThat(onTrino().executeQuery("SELECT col.field FROM " + trinoTableName)).containsOnly(row(newValue));
+        assertThat(onSpark().executeQuery("SELECT col.field FROM " + sparkTableName)).containsOnly(row(newValue));
+
+        onTrino().executeQuery("DROP TABLE " + trinoTableName);
+    }
+
     @DataProvider
     public static Object[][] testSetColumnTypeDataProvider()
     {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkDropTableCompatibility.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkDropTableCompatibility.java
index 38044e358902..fe16f4c20ed6 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkDropTableCompatibility.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkDropTableCompatibility.java
@@ -13,18 +13,15 @@
  */
 package io.trino.tests.product.iceberg;
 
-import io.trino.tempto.BeforeTestWithContext;
+import com.google.inject.Inject;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.hadoop.hdfs.HdfsClient;
 import io.trino.tests.product.hive.Engine;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import javax.inject.Inject;
-
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -38,6 +35,7 @@
 import static io.trino.tests.product.utils.QueryExecutors.onSpark;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests drop table compatibility between Iceberg connector and Spark Iceberg.
@@ -48,7 +46,7 @@ public class TestIcebergSparkDropTableCompatibility
     @Inject
     private HdfsClient hdfsClient;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void useIceberg()
     {
         onTrino().executeQuery("USE iceberg.default");
@@ -87,7 +85,7 @@ public void testCleanupOnDropTable(Engine tableCreatorEngine, Engine tableDroppe
 
     private void assertFileExistence(String path, boolean exists, String description)
     {
-        Assertions.assertThat(hdfsClient.exist(path)).as(description).isEqualTo(exists);
+        assertThat(hdfsClient.exist(path)).as(description).isEqualTo(exists);
     }
 
     private static List<String> getDataFilePaths(String icebergTableName)
@@ -99,14 +97,8 @@ private static List<String> getDataFilePaths(String icebergTableName)
     private static String getPath(String uri)
     {
         if (uri.startsWith("hdfs://")) {
-            try {
-                return new URI(uri).getPath();
-            }
-            catch (URISyntaxException e) {
-                throw new RuntimeException("Invalid syntax for the URI: " + uri, e);
-            }
+            return URI.create(uri).getPath();
         }
-
         return uri;
     }
 }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/ignite/TestIgnite.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/ignite/TestIgnite.java
index fd2959220b08..25ad5fc6fc0c 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/ignite/TestIgnite.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/ignite/TestIgnite.java
@@ -18,10 +18,10 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.IGNITE;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestIgnite
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2.java
index 82eda57b7444..f44062a12260 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2.java
@@ -16,7 +16,7 @@
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import io.trino.jdbc.TestingRedirectHandlerInjector;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tests.product.TpchTableResults;
 import okhttp3.JavaNetCookieJar;
@@ -40,12 +40,12 @@
 import java.sql.ResultSet;
 
 import static com.google.common.base.Preconditions.checkState;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.query.QueryResult.forResultSet;
 import static io.trino.tests.product.TestGroups.OAUTH2;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestExternalAuthorizerOAuth2
         extends ProductTest
@@ -64,7 +64,7 @@ public class TestExternalAuthorizerOAuth2
 
     private OkHttpClient httpClient;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
             throws Exception
     {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2RefreshToken.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2RefreshToken.java
index 8a7194d2a993..ad2fbcff197a 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2RefreshToken.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestExternalAuthorizerOAuth2RefreshToken.java
@@ -16,7 +16,7 @@
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import io.trino.jdbc.TestingRedirectHandlerInjector;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tests.product.TpchTableResults;
 import okhttp3.JavaNetCookieJar;
@@ -24,7 +24,6 @@
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.tls.HandshakeCertificates;
-import org.assertj.core.api.Assertions;
 import org.testng.annotations.Test;
 
 import java.io.File;
@@ -44,12 +43,12 @@
 import java.util.function.Consumer;
 
 import static com.google.common.base.Preconditions.checkState;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.query.QueryResult.forResultSet;
 import static io.trino.tests.product.TestGroups.OAUTH2_REFRESH;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestExternalAuthorizerOAuth2RefreshToken
         extends ProductTest
@@ -68,7 +67,7 @@ public class TestExternalAuthorizerOAuth2RefreshToken
 
     private OkHttpClient httpClient;
 
-    @BeforeTestWithContext
+    @BeforeMethodWithContext
     public void setUp()
             throws Exception
     {
@@ -105,7 +104,7 @@ public void shouldRefreshTokenAfterTokenExpire()
                 ResultSet results = statement.executeQuery()) {
             assertThat(forResultSet(results)).matches(TpchTableResults.PRESTO_NATION_RESULT);
 
-            Assertions.assertThat(redirectHandler.getRedirectCount()).isEqualTo(1);
+            assertThat(redirectHandler.getRedirectCount()).isEqualTo(1);
 
             //Wait until the token expires. See: HydraIdentityProvider.TTL_ACCESS_TOKEN_IN_SECONDS
             SECONDS.sleep(10);
@@ -115,7 +114,7 @@ public void shouldRefreshTokenAfterTokenExpire()
                 assertThat(forResultSet(repeatedResults)).matches(TpchTableResults.PRESTO_NATION_RESULT);
             }
 
-            Assertions.assertThat(redirectHandler.getRedirectCount()).isEqualTo(1);
+            assertThat(redirectHandler.getRedirectCount()).isEqualTo(1);
         }
     }
 
@@ -131,7 +130,7 @@ public void shouldAuthenticateAfterRefreshTokenExpires()
                 ResultSet results = statement.executeQuery()) {
             assertThat(forResultSet(results)).matches(TpchTableResults.PRESTO_NATION_RESULT);
 
-            Assertions.assertThat(redirectHandler.getRedirectCount()).isEqualTo(1);
+            assertThat(redirectHandler.getRedirectCount()).isEqualTo(1);
 
             //Wait until the refresh token expires (15s) . See: HydraIdentityProvider.TTL_REFRESH_TOKEN_IN_SECONDS
             SECONDS.sleep(20);
@@ -140,7 +139,7 @@ public void shouldAuthenticateAfterRefreshTokenExpires()
                 assertThat(forResultSet(repeatedResults)).matches(TpchTableResults.PRESTO_NATION_RESULT);
             }
 
-            Assertions.assertThat(redirectHandler.getRedirectCount()).isEqualTo(2);
+            assertThat(redirectHandler.getRedirectCount()).isEqualTo(2);
         }
     }
 
@@ -156,7 +155,7 @@ public void shouldAuthenticateAfterIssuedTokenExpires()
                 ResultSet results = statement.executeQuery()) {
             assertThat(forResultSet(results)).matches(TpchTableResults.PRESTO_NATION_RESULT);
 
-            Assertions.assertThat(redirectHandler.getRedirectCount()).isEqualTo(1);
+            assertThat(redirectHandler.getRedirectCount()).isEqualTo(1);
 
             //Wait until the internally issued token expires. See: http-server.authentication.oauth2.refresh-tokens.issued-token.timeout
             SECONDS.sleep(35);
@@ -166,7 +165,7 @@ public void shouldAuthenticateAfterIssuedTokenExpires()
                 assertThat(forResultSet(repeatedResults)).matches(TpchTableResults.PRESTO_NATION_RESULT);
             }
 
-            Assertions.assertThat(redirectHandler.getRedirectCount()).isEqualTo(2);
+            assertThat(redirectHandler.getRedirectCount()).isEqualTo(2);
         }
     }
 
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestJdbc.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestJdbc.java
index de3847e4f684..6035c5e836c2 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestJdbc.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestJdbc.java
@@ -31,7 +31,6 @@
 
 import static io.trino.tempto.Requirements.compose;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED;
 import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState;
 import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable;
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestKerberosConstrainedDelegationJdbc.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestKerberosConstrainedDelegationJdbc.java
new file mode 100644
index 000000000000..c41813c5c57c
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestKerberosConstrainedDelegationJdbc.java
@@ -0,0 +1,165 @@
+/*
+ * Licensed 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 io.trino.tests.product.jdbc;
+
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import io.trino.tempto.BeforeMethodWithContext;
+import io.trino.tempto.ProductTest;
+import io.trino.tempto.kerberos.KerberosAuthentication;
+import io.trino.tests.product.TpchTableResults;
+import org.assertj.core.api.Assertions;
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSManager;
+import org.ietf.jgss.Oid;
+import org.testng.annotations.Test;
+
+import javax.security.auth.Subject;
+
+import java.security.Principal;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Properties;
+
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static io.trino.tempto.assertions.QueryAssert.assertThat;
+import static io.trino.tempto.query.QueryResult.forResultSet;
+import static io.trino.tests.product.TestGroups.JDBC_KERBEROS_CONSTRAINED_DELEGATION;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.ietf.jgss.GSSCredential.DEFAULT_LIFETIME;
+import static org.ietf.jgss.GSSCredential.INITIATE_ONLY;
+import static org.ietf.jgss.GSSName.NT_USER_NAME;
+
+public class TestKerberosConstrainedDelegationJdbc
+        extends ProductTest
+{
+    private static final String KERBEROS_OID = "1.2.840.113554.1.2.2";
+    @Inject
+    @Named("databases.presto.jdbc_url")
+    String jdbcUrl;
+
+    @Inject
+    @Named("databases.presto.kerberos_principal")
+    private String kerberosPrincipal;
+
+    @Inject
+    @Named("databases.presto.kerberos_keytab")
+    private String kerberosKeytab;
+
+    private GSSManager gssManager;
+    private KerberosAuthentication kerberosAuthentication;
+
+    @BeforeMethodWithContext
+    public void setUp()
+    {
+        this.gssManager = GSSManager.getInstance();
+        this.kerberosAuthentication = new KerberosAuthentication(kerberosPrincipal, kerberosKeytab);
+    }
+
+    @Test(groups = JDBC_KERBEROS_CONSTRAINED_DELEGATION)
+    public void testSelectConstrainedDelegationKerberos()
+            throws Exception
+    {
+        Properties driverProperties = new Properties();
+        GSSCredential credential = createGssCredential();
+        driverProperties.put("KerberosConstrainedDelegation", credential);
+        try (Connection connection = DriverManager.getConnection(jdbcUrl, driverProperties);
+                PreparedStatement statement = connection.prepareStatement("SELECT * FROM tpch.tiny.nation");
+                ResultSet results = statement.executeQuery()) {
+            assertThat(forResultSet(results)).matches(TpchTableResults.PRESTO_NATION_RESULT);
+        }
+        finally {
+            credential.dispose();
+        }
+    }
+
+    @Test(groups = JDBC_KERBEROS_CONSTRAINED_DELEGATION)
+    public void testCtasConstrainedDelegationKerberos()
+            throws Exception
+    {
+        Properties driverProperties = new Properties();
+        GSSCredential credential = createGssCredential();
+        driverProperties.put("KerberosConstrainedDelegation", credential);
+        try (Connection connection = DriverManager.getConnection(jdbcUrl, driverProperties);
+                PreparedStatement statement = connection.prepareStatement(format("CREATE TABLE %s AS SELECT * FROM tpch.tiny.nation", "test_kerberos_ctas"))) {
+            int results = statement.executeUpdate();
+            Assertions.assertThat(results).isEqualTo(25);
+        }
+        finally {
+            credential.dispose();
+        }
+    }
+
+    @Test(groups = JDBC_KERBEROS_CONSTRAINED_DELEGATION)
+    public void testQueryOnDisposedCredential()
+            throws Exception
+    {
+        Properties driverProperties = new Properties();
+        GSSCredential credential = createGssCredential();
+        credential.dispose();
+        driverProperties.put("KerberosConstrainedDelegation", credential);
+        try (Connection connection = DriverManager.getConnection(jdbcUrl, driverProperties)) {
+            assertThatThrownBy(() -> connection.prepareStatement("SELECT * FROM tpch.tiny.nation"))
+                    .cause()
+                    .isInstanceOf(IllegalStateException.class)
+                    .hasMessageContaining("This credential is no longer valid");
+        }
+    }
+
+    @Test(groups = JDBC_KERBEROS_CONSTRAINED_DELEGATION)
+    public void testQueryOnExpiredCredential()
+            throws Exception
+    {
+        Properties driverProperties = new Properties();
+        GSSCredential credential = createGssCredential();
+        // ticket default lifetime is 80s by kerb.conf, sleep to expire ticket
+        Thread.sleep(30000);
+        // check before execution that current lifetime is less than 60s (MIN_LIFETIME on client), to be sure that we already expired
+        Assertions.assertThat(credential.getRemainingLifetime()).isLessThanOrEqualTo(60);
+        driverProperties.put("KerberosConstrainedDelegation", credential);
+        try (Connection connection = DriverManager.getConnection(jdbcUrl, driverProperties)) {
+            assertThatThrownBy(() -> connection.prepareStatement("SELECT * FROM tpch.tiny.nation"))
+                    .isInstanceOf(SQLException.class)
+                    .hasMessageContaining("Kerberos credential is expired");
+        }
+        finally {
+            credential.dispose();
+        }
+    }
+
+    private GSSCredential createGssCredential()
+    {
+        Subject authenticatedSubject = this.kerberosAuthentication.authenticate();
+        Principal clientPrincipal = getOnlyElement(authenticatedSubject.getPrincipals());
+
+        try {
+            return Subject.doAs(authenticatedSubject,
+                    (PrivilegedExceptionAction<GSSCredential>) () ->
+                            gssManager.createCredential(
+                                    gssManager.createName(clientPrincipal.getName(), NT_USER_NAME),
+                                    DEFAULT_LIFETIME,
+                                    new Oid(KERBEROS_OID),
+                                    INITIATE_ONLY));
+        }
+        catch (PrivilegedActionException e) {
+            throw new RuntimeException(e.getCause());
+        }
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestLdapTrinoJdbc.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestLdapTrinoJdbc.java
index e15810ce9a77..27dc54b088e2 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestLdapTrinoJdbc.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestLdapTrinoJdbc.java
@@ -22,7 +22,6 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.ImmutableLdapObjectDefinitions.CHILD_GROUP_USER;
 import static io.trino.tests.product.ImmutableLdapObjectDefinitions.ORPHAN_USER;
 import static io.trino.tests.product.ImmutableLdapObjectDefinitions.PARENT_GROUP_USER;
@@ -35,7 +34,8 @@
 import static io.trino.tests.product.TestGroups.TRINO_JDBC;
 import static io.trino.tests.product.TpchTableResults.PRESTO_NATION_RESULT;
 import static java.lang.String.format;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestLdapTrinoJdbc
         extends BaseLdapJdbcTest
@@ -116,7 +116,7 @@ public void shouldFailQueryForWrongLdapUser()
     @Test(groups = {LDAP, TRINO_JDBC, PROFILE_SPECIFIC_TESTS}, timeOut = TIMEOUT)
     public void shouldFailQueryForEmptyUser()
     {
-        expectQueryToFail("", ldapUserPassword, "Connection property 'user' value is empty");
+        expectQueryToFail("", ldapUserPassword, "Connection property user value is empty");
     }
 
     @Test(groups = {LDAP, TRINO_JDBC, PROFILE_SPECIFIC_TESTS}, timeOut = TIMEOUT)
@@ -130,7 +130,7 @@ public void shouldFailQueryForLdapWithoutSsl()
     {
         assertThatThrownBy(() -> DriverManager.getConnection("jdbc:trino://" + prestoServer(), ldapUserName, ldapUserPassword))
                 .isInstanceOf(SQLException.class)
-                .hasMessageContaining("Authentication using username/password requires SSL to be enabled");
+                .hasMessageContaining("TLS/SSL is required for authentication with username and password");
     }
 
     @Test(groups = {LDAP, TRINO_JDBC, PROFILE_SPECIFIC_TESTS}, timeOut = TIMEOUT)
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestPreparedStatements.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestPreparedStatements.java
index 57dbfd1fdce6..4640c593e3f4 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestPreparedStatements.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/jdbc/TestPreparedStatements.java
@@ -30,7 +30,6 @@
 import java.sql.Timestamp;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.MutableTableRequirement.State.CREATED;
 import static io.trino.tempto.fulfillment.table.MutableTablesState.mutableTablesState;
 import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable;
@@ -55,6 +54,7 @@
 import static java.sql.JDBCType.TINYINT;
 import static java.sql.JDBCType.VARBINARY;
 import static java.sql.JDBCType.VARCHAR;
+import static org.assertj.core.api.Assertions.assertThat;
 
 // TODO Consider merging this class with TestJdbcPreparedStatement
 public class TestPreparedStatements
@@ -105,7 +105,7 @@ public void preparedSelectSql()
             throws SQLException
     {
         String prepareSql = "PREPARE ps1 from SELECT c_int FROM " + TABLE_NAME + " WHERE c_int = ?";
-        final int testValue = 2147483647;
+        int testValue = 2147483647;
         String executeSql = "EXECUTE ps1 using ";
 
         try (Statement statement = connection().createStatement()) {
@@ -120,6 +120,24 @@ public void preparedSelectSql()
         }
     }
 
+    @Test(groups = JDBC)
+    @Requires(ImmutableAllTypesTable.class)
+    public void executeImmediateSelectSql()
+            throws SQLException
+    {
+        int testValue = 2147483647;
+        String executeSql = "EXECUTE IMMEDIATE 'SELECT c_int FROM " + TABLE_NAME + " WHERE c_int = ?' USING ";
+
+        try (Connection conn = connection(); Statement statement = conn.createStatement()) {
+            assertThat(QueryResult.forResultSet(statement.executeQuery(executeSql + testValue)))
+                    .containsOnly(row(testValue));
+            assertThat(QueryResult.forResultSet(statement.executeQuery(executeSql + "NULL")))
+                    .hasNoRows();
+            assertThat(QueryResult.forResultSet(statement.executeQuery(executeSql + 2)))
+                    .hasNoRows();
+        }
+    }
+
     @Test(groups = JDBC)
     @Requires(MutableAllTypesTable.class)
     public void preparedInsertVarbinaryApi()
@@ -263,98 +281,118 @@ public void preparedInsertSql()
         String selectSqlWithTable = format(SELECT_STAR_SQL, tableNameInDatabase);
         String executeSql = "EXECUTE ps1 using ";
 
-        try (Statement statement = connection().createStatement()) {
+        try (Connection conn = connection(); Statement statement = conn.createStatement()) {
             statement.execute(insertSqlWithTable);
-            statement.execute(executeSql +
-                    "cast(127 as tinyint), " +
-                    "cast(32767 as smallint), " +
-                    "2147483647, " +
-                    "9223372036854775807, " +
-                    "cast(123.345 as real), " +
-                    "cast(234.567 as double), " +
-                    "cast(345 as decimal(10)), " +
-                    "cast(345.678 as decimal(10,5)), " +
-                    "timestamp '2015-05-10 12:15:35', " +
-                    "date '2015-05-10', " +
-                    "'ala ma kota', " +
-                    "'ala ma kot', " +
-                    "cast('ala ma' as char(10)), " +
-                    "true, " +
-                    "X'00010203002AF9'");
-
-            statement.execute(executeSql +
-                    "cast(1 as tinyint), " +
-                    "cast(2 as smallint), " +
-                    "3, " +
-                    "4, " +
-                    "cast(5.6 as real), " +
-                    "cast(7.8 as double), " +
-                    "cast(9 as decimal(10)), " +
-                    "cast(2.3 as decimal(10,5)), " +
-                    "timestamp '2012-05-10 1:35:15', " +
-                    "date '2014-03-10', " +
-                    "'abc', " +
-                    "'def', " +
-                    "cast('ghi' as char(10)), " +
-                    "false, " +
-                    "varbinary 'jkl'");
-
-            statement.execute(executeSql +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null");
-
-            QueryResult result = onTrino().executeQuery(selectSqlWithTable);
-            assertColumnTypes(result);
-            assertThat(result).containsOnly(
-                    row(
-                            127,
-                            32767,
-                            2147483647,
-                            Long.valueOf("9223372036854775807"),
-                            Float.valueOf("123.345"),
-                            234.567,
-                            BigDecimal.valueOf(345),
-                            new BigDecimal("345.67800"),
-                            Timestamp.valueOf("2015-05-10 12:15:35"),
-                            Date.valueOf("2015-05-10"),
-                            "ala ma kota",
-                            "ala ma kot",
-                            "ala ma    ",
-                            Boolean.TRUE,
-                            new byte[] {0, 1, 2, 3, 0, 42, -7}),
-                    row(
-                            1,
-                            2,
-                            3,
-                            4,
-                            Float.valueOf("5.6"),
-                            7.8,
-                            BigDecimal.valueOf(9),
-                            new BigDecimal("2.30000"),
-                            Timestamp.valueOf("2012-05-10 1:35:15"),
-                            Date.valueOf("2014-03-10"),
-                            "abc",
-                            "def",
-                            "ghi       ",
-                            Boolean.FALSE,
-                            "jkl".getBytes(UTF_8)),
-                    row(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null));
+            insertAndVerify(statement, executeSql, selectSqlWithTable);
         }
     }
 
+    @Test(groups = JDBC)
+    @Requires(MutableAllTypesTable.class)
+    public void executeImmediateInsertSql()
+            throws SQLException
+    {
+        String tableNameInDatabase = mutableTablesState().get(TABLE_NAME_MUTABLE).getNameInDatabase();
+        String selectSqlWithTable = format(SELECT_STAR_SQL, tableNameInDatabase);
+        String executeInsertSql = format("EXECUTE IMMEDIATE '%s' using ", format(INSERT_SQL, tableNameInDatabase));
+
+        try (Connection conn = connection(); Statement statement = conn.createStatement()) {
+            insertAndVerify(statement, executeInsertSql, selectSqlWithTable);
+        }
+    }
+
+    private void insertAndVerify(Statement statement, String insertSql, String verifySql)
+            throws SQLException
+    {
+        statement.execute(insertSql +
+                "cast(127 as tinyint), " +
+                "cast(32767 as smallint), " +
+                "2147483647, " +
+                "9223372036854775807, " +
+                "cast(123.345 as real), " +
+                "cast(234.567 as double), " +
+                "cast(345 as decimal(10)), " +
+                "cast(345.678 as decimal(10,5)), " +
+                "timestamp '2015-05-10 12:15:35', " +
+                "date '2015-05-10', " +
+                "'ala ma kota', " +
+                "'ala ma kot', " +
+                "cast('ala ma' as char(10)), " +
+                "true, " +
+                "X'00010203002AF9'");
+
+        statement.execute(insertSql +
+                "cast(1 as tinyint), " +
+                "cast(2 as smallint), " +
+                "3, " +
+                "4, " +
+                "cast(5.6 as real), " +
+                "cast(7.8 as double), " +
+                "cast(9 as decimal(10)), " +
+                "cast(2.3 as decimal(10,5)), " +
+                "timestamp '2012-05-10 1:35:15', " +
+                "date '2014-03-10', " +
+                "'abc', " +
+                "'def', " +
+                "cast('ghi' as char(10)), " +
+                "false, " +
+                "varbinary 'jkl'");
+
+        statement.execute(insertSql +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null");
+
+        QueryResult result = onTrino().executeQuery(verifySql);
+        assertColumnTypes(result);
+        assertThat(result).containsOnly(
+                row(
+                        127,
+                        32767,
+                        2147483647,
+                        Long.valueOf("9223372036854775807"),
+                        Float.valueOf("123.345"),
+                        234.567,
+                        BigDecimal.valueOf(345),
+                        new BigDecimal("345.67800"),
+                        Timestamp.valueOf("2015-05-10 12:15:35"),
+                        Date.valueOf("2015-05-10"),
+                        "ala ma kota",
+                        "ala ma kot",
+                        "ala ma    ",
+                        Boolean.TRUE,
+                        new byte[] {0, 1, 2, 3, 0, 42, -7}),
+                row(
+                        1,
+                        2,
+                        3,
+                        4,
+                        Float.valueOf("5.6"),
+                        7.8,
+                        BigDecimal.valueOf(9),
+                        new BigDecimal("2.30000"),
+                        Timestamp.valueOf("2012-05-10 1:35:15"),
+                        Date.valueOf("2014-03-10"),
+                        "abc",
+                        "def",
+                        "ghi       ",
+                        Boolean.FALSE,
+                        "jkl".getBytes(UTF_8)),
+                row(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null));
+    }
+
     @Test(groups = JDBC)
     @Requires(MutableAllTypesTable.class)
     public void preparedInsertVarbinarySql()
@@ -367,31 +405,53 @@ public void preparedInsertVarbinarySql()
 
         try (Statement statement = connection().createStatement()) {
             statement.execute(insertSqlWithTable);
-            statement.execute(executeSql +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "null, " +
-                    "X'00010203002AF9'");
-
-            QueryResult result = onTrino().executeQuery(selectSqlWithTable);
-            assertColumnTypes(result);
-            assertThat(result).containsOnly(
-                    row(null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-                            new byte[] {0, 1, 2, 3, 0, 42, -7}));
+            insertAndVerifyVarbinary(statement, executeSql, selectSqlWithTable);
         }
     }
 
+    @Test(groups = JDBC)
+    @Requires(MutableAllTypesTable.class)
+    public void executeImmediateVarbinarySql()
+            throws SQLException
+    {
+        String tableNameInDatabase = mutableTablesState().get(TABLE_NAME_MUTABLE).getNameInDatabase();
+        String insertSqlWithTable = "PREPARE ps1 from " + format(INSERT_SQL, tableNameInDatabase);
+        String selectSqlWithTable = format(SELECT_STAR_SQL, tableNameInDatabase);
+        String executeSql = format("EXECUTE IMMEDIATE '%s' using ", format(INSERT_SQL, tableNameInDatabase));
+
+        try (Connection conn = connection(); Statement statement = conn.createStatement()) {
+            statement.execute(insertSqlWithTable);
+            insertAndVerifyVarbinary(statement, executeSql, selectSqlWithTable);
+        }
+    }
+
+    private void insertAndVerifyVarbinary(Statement statement, String insertSql, String verifySql)
+            throws SQLException
+    {
+        statement.execute(insertSql +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "null, " +
+                "X'00010203002AF9'");
+
+        QueryResult result = onTrino().executeQuery(verifySql);
+        assertColumnTypes(result);
+        assertThat(result).containsOnly(
+                row(null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+                        new byte[] {0, 1, 2, 3, 0, 42, -7}));
+    }
+
     private void assertColumnTypes(QueryResult queryResult)
     {
         assertThat(queryResult).hasColumns(
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroReadsSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroReadsSmokeTest.java
index b5c8b5016a6b..438990ec3d20 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroReadsSmokeTest.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroReadsSmokeTest.java
@@ -18,6 +18,9 @@
 import com.google.common.primitives.Ints;
 import io.airlift.units.Duration;
 import io.confluent.kafka.schemaregistry.ParsedSchema;
+import io.confluent.kafka.schemaregistry.SchemaEntity;
+import io.confluent.kafka.schemaregistry.client.rest.entities.Metadata;
+import io.confluent.kafka.schemaregistry.client.rest.entities.RuleSet;
 import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaReference;
 import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
 import io.trino.tempto.ProductTest;
@@ -46,9 +49,9 @@
 import java.nio.file.Files;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.context.ThreadLocalTestContextHolder.testContext;
 import static io.trino.tempto.fulfillment.table.TableHandle.tableHandle;
 import static io.trino.tempto.fulfillment.table.kafka.KafkaMessageContentsBuilder.contentsBuilder;
@@ -60,6 +63,7 @@
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Test(singleThreaded = true)
 public class TestKafkaAvroReadsSmokeTest
@@ -79,7 +83,7 @@ public class TestKafkaAvroReadsSmokeTest
     private static final String AVRO_SCHEMA_WITH_REFERENCES_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/schema_with_references.avsc";
 
     @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS}, dataProvider = "catalogs")
-    public void testSelectPrimitiveDataType(KafkaCatalog kafkaCatalog, MessageSerializer messageSerializer)
+    public void testSelectPrimitiveDataType(KafkaCatalog kafkaCatalog)
             throws Exception
     {
         ImmutableMap<String, Object> record = ImmutableMap.of(
@@ -87,12 +91,12 @@ public void testSelectPrimitiveDataType(KafkaCatalog kafkaCatalog, MessageSerial
                 "a_bigint", 127L,
                 "a_double", 234.567,
                 "a_boolean", true);
-        String topicName = ALL_DATATYPES_AVRO_TOPIC_NAME + kafkaCatalog.getTopicNameSuffix();
-        createAvroTable(ALL_DATATYPE_SCHEMA_PATH, ALL_DATATYPES_AVRO_TOPIC_NAME, topicName, record, messageSerializer);
+        String topicName = ALL_DATATYPES_AVRO_TOPIC_NAME + kafkaCatalog.topicNameSuffix();
+        createAvroTable(ALL_DATATYPE_SCHEMA_PATH, ALL_DATATYPES_AVRO_TOPIC_NAME, topicName, record, kafkaCatalog.messageSerializer());
         assertEventually(
                 new Duration(30, SECONDS),
                 () -> {
-                    QueryResult queryResult = onTrino().executeQuery(format("select * from %s.%s", kafkaCatalog.getCatalogName(), KAFKA_SCHEMA + "." + topicName));
+                    QueryResult queryResult = onTrino().executeQuery(format("select * from %s.%s", kafkaCatalog.catalogName(), KAFKA_SCHEMA + "." + topicName));
                     assertThat(queryResult).containsOnly(row(
                             "foobar",
                             127,
@@ -102,15 +106,15 @@ public void testSelectPrimitiveDataType(KafkaCatalog kafkaCatalog, MessageSerial
     }
 
     @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS}, dataProvider = "catalogs")
-    public void testNullType(KafkaCatalog kafkaCatalog, MessageSerializer messageSerializer)
+    public void testNullType(KafkaCatalog kafkaCatalog)
             throws Exception
     {
-        String topicName = ALL_NULL_AVRO_TOPIC_NAME + kafkaCatalog.getTopicNameSuffix();
-        createAvroTable(ALL_DATATYPE_SCHEMA_PATH, ALL_NULL_AVRO_TOPIC_NAME, topicName, ImmutableMap.of(), messageSerializer);
+        String topicName = ALL_NULL_AVRO_TOPIC_NAME + kafkaCatalog.topicNameSuffix();
+        createAvroTable(ALL_DATATYPE_SCHEMA_PATH, ALL_NULL_AVRO_TOPIC_NAME, topicName, ImmutableMap.of(), kafkaCatalog.messageSerializer());
         assertEventually(
                 new Duration(30, SECONDS),
                 () -> {
-                    QueryResult queryResult = onTrino().executeQuery(format("select * from %s.%s", kafkaCatalog.getCatalogName(), KAFKA_SCHEMA + "." + topicName));
+                    QueryResult queryResult = onTrino().executeQuery(format("select * from %s.%s", kafkaCatalog.catalogName(), KAFKA_SCHEMA + "." + topicName));
                     assertThat(queryResult).containsOnly(row(
                             null,
                             null,
@@ -120,22 +124,22 @@ public void testNullType(KafkaCatalog kafkaCatalog, MessageSerializer messageSer
     }
 
     @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS}, dataProvider = "catalogs")
-    public void testSelectStructuralDataType(KafkaCatalog kafkaCatalog, MessageSerializer messageSerializer)
+    public void testSelectStructuralDataType(KafkaCatalog kafkaCatalog)
             throws Exception
     {
         ImmutableMap<String, Object> record = ImmutableMap.of(
                 "a_array", ImmutableList.of(100L, 102L),
                 "a_map", ImmutableMap.of("key1", "value1"));
-        String topicName = STRUCTURAL_AVRO_TOPIC_NAME + kafkaCatalog.getTopicNameSuffix();
-        createAvroTable(STRUCTURAL_SCHEMA_PATH, STRUCTURAL_AVRO_TOPIC_NAME, topicName, record, messageSerializer);
+        String topicName = STRUCTURAL_AVRO_TOPIC_NAME + kafkaCatalog.topicNameSuffix();
+        createAvroTable(STRUCTURAL_SCHEMA_PATH, STRUCTURAL_AVRO_TOPIC_NAME, topicName, record, kafkaCatalog.messageSerializer());
         assertEventually(
                 new Duration(30, SECONDS),
                 () -> {
                     QueryResult queryResult = onTrino().executeQuery(format(
                             "SELECT a[1], a[2], m['key1'] FROM (SELECT %s as a, %s as m FROM %s.%s) t",
-                            kafkaCatalog.isColumnMappingSupported() ? "c_array" : "a_array",
-                            kafkaCatalog.isColumnMappingSupported() ? "c_map" : "a_map",
-                            kafkaCatalog.getCatalogName(),
+                            kafkaCatalog.columnMappingSupported() ? "c_array" : "a_array",
+                            kafkaCatalog.columnMappingSupported() ? "c_map" : "a_map",
+                            kafkaCatalog.catalogName(),
                             KAFKA_SCHEMA + "." + topicName));
                     assertThat(queryResult).containsOnly(row(100, 102, "value1"));
                 });
@@ -146,40 +150,22 @@ public static Object[][] catalogs()
     {
         return new Object[][] {
                 {
-                        new KafkaCatalog("kafka", "", true), new AvroMessageSerializer(),
+                        new KafkaCatalog("kafka", "", true, new AvroMessageSerializer()),
                 },
                 {
-                        new KafkaCatalog("kafka_schema_registry", "_schema_registry", false), new SchemaRegistryAvroMessageSerializer(),
+                        new KafkaCatalog("kafka_schema_registry", "_schema_registry", false, new SchemaRegistryAvroMessageSerializer()),
                 },
         };
     }
 
-    private static final class KafkaCatalog
+    private record KafkaCatalog(String catalogName, String topicNameSuffix, boolean columnMappingSupported, MessageSerializer messageSerializer)
     {
-        private final String catalogName;
-        private final String topicNameSuffix;
-        private final boolean columnMappingSupported;
-
-        private KafkaCatalog(String catalogName, String topicNameSuffix, boolean columnMappingSupported)
+        private KafkaCatalog(String catalogName, String topicNameSuffix, boolean columnMappingSupported, MessageSerializer messageSerializer)
         {
             this.catalogName = requireNonNull(catalogName, "catalogName is null");
             this.topicNameSuffix = requireNonNull(topicNameSuffix, "topicNameSuffix is null");
             this.columnMappingSupported = columnMappingSupported;
-        }
-
-        public String getCatalogName()
-        {
-            return catalogName;
-        }
-
-        public String getTopicNameSuffix()
-        {
-            return topicNameSuffix;
-        }
-
-        public boolean isColumnMappingSupported()
-        {
-            return columnMappingSupported;
+            this.messageSerializer = requireNonNull(messageSerializer, "messageSerializer is null");
         }
 
         @Override
@@ -349,12 +335,54 @@ public String canonicalString()
             return avroSchemaString;
         }
 
+        @Override
+        public Integer version()
+        {
+            return 1;
+        }
+
         @Override
         public List<SchemaReference> references()
         {
             return schemaReferences;
         }
 
+        @Override
+        public Metadata metadata()
+        {
+            return new Metadata(null, null, Set.of());
+        }
+
+        @Override
+        public RuleSet ruleSet()
+        {
+            return new RuleSet(null, null);
+        }
+
+        @Override
+        public ParsedSchema copy()
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ParsedSchema copy(Integer version)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ParsedSchema copy(Metadata metadata, RuleSet ruleSet)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ParsedSchema copy(Map<SchemaEntity, Set<String>> tagsToAdd, Map<SchemaEntity, Set<String>> tagsToRemove)
+        {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public List<String> isBackwardCompatible(ParsedSchema parsedSchema)
         {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroWritesSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroWritesSmokeTest.java
index ce382203397e..ec051722b4ca 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroWritesSmokeTest.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroWritesSmokeTest.java
@@ -18,11 +18,11 @@
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.KAFKA;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestKafkaAvroWritesSmokeTest
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobuf.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobuf.java
deleted file mode 100644
index 7d4720f166af..000000000000
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobuf.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.kafka;
-
-import com.google.common.collect.ImmutableList;
-import io.trino.tempto.ProductTest;
-import io.trino.tempto.fulfillment.table.TableManager;
-import io.trino.tempto.fulfillment.table.kafka.KafkaTableDefinition;
-import io.trino.tempto.fulfillment.table.kafka.KafkaTableManager;
-import io.trino.tempto.fulfillment.table.kafka.ListKafkaDataSource;
-import org.testng.annotations.Test;
-
-import java.sql.SQLException;
-import java.sql.Timestamp;
-
-import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
-import static io.trino.tempto.context.ThreadLocalTestContextHolder.testContext;
-import static io.trino.tempto.fulfillment.table.TableHandle.tableHandle;
-import static io.trino.tests.product.TestGroups.KAFKA;
-import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.utils.QueryExecutors.onTrino;
-import static java.lang.String.format;
-
-public class TestKafkaProtobuf
-        extends ProductTest
-{
-    private static final String KAFKA_CATALOG = "kafka";
-    private static final String KAFKA_SCHEMA = "product_tests";
-
-    private static final String ALL_DATATYPES_PROTOBUF_TABLE_NAME = "all_datatypes_protobuf";
-    private static final String ALL_DATATYPES_PROTOBUF_TOPIC_NAME = "write_all_datatypes_protobuf";
-
-    private static final String STRUCTURAL_PROTOBUF_TABLE_NAME = "structural_datatype_protobuf";
-    private static final String STRUCTURAL_PROTOBUF_TOPIC_NAME = "structural_datatype_protobuf";
-
-    private static void createProtobufTable(String tableName, String topicName)
-    {
-        KafkaTableDefinition tableDefinition = new KafkaTableDefinition(
-                tableName,
-                topicName,
-                new ListKafkaDataSource(ImmutableList.of()),
-                1,
-                1);
-        KafkaTableManager kafkaTableManager = (KafkaTableManager) testContext().getDependency(TableManager.class, "kafka");
-        kafkaTableManager.createImmutable(tableDefinition, tableHandle(tableName).inSchema(KAFKA_SCHEMA));
-    }
-
-    @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS})
-    public void testInsertAllDataType()
-    {
-        createProtobufTable(ALL_DATATYPES_PROTOBUF_TABLE_NAME, ALL_DATATYPES_PROTOBUF_TOPIC_NAME);
-        assertThat(onTrino().executeQuery(format(
-                "INSERT INTO %s.%s.%s VALUES " +
-                        "('Chennai', 314, 9223372036854775807, 1234567890.123456789, 3.14, true, 'ZERO', TIMESTAMP '2020-12-21 15:45:00.012345')," +
-                        "('TamilNadu', -314, -9223372036854775808, -1234567890.123456789, -3.14, false, 'ONE', TIMESTAMP '1970-01-01 15:45:00.012345'), " +
-                        "('India', 314, 9223372036854775807, 1234567890.123456789, 3.14, false, 'TWO', TIMESTAMP '0001-01-01 00:00:00.000001')",
-                KAFKA_CATALOG,
-                KAFKA_SCHEMA,
-                ALL_DATATYPES_PROTOBUF_TABLE_NAME)))
-                .updatedRowsCountIsEqualTo(3);
-
-        assertThat(onTrino().executeQuery(format(
-                "SELECT * FROM %s.%s.%s",
-                KAFKA_CATALOG,
-                KAFKA_SCHEMA,
-                ALL_DATATYPES_PROTOBUF_TABLE_NAME)))
-                .containsOnly(
-                        row("Chennai", 314, 9223372036854775807L, 1234567890.123456789, 3.14f, true, "ZERO", Timestamp.valueOf("2020-12-21 15:45:00.012345")),
-                        row("TamilNadu", -314, -9223372036854775808L, -1234567890.123456789, -3.14f, false, "ONE", Timestamp.valueOf("1970-01-01 15:45:00.012345")),
-                        row("India", 314, 9223372036854775807L, 1234567890.123456789, 3.14f, false, "TWO", Timestamp.valueOf("0001-01-01 00:00:00.000001")));
-
-        assertQueryFailure(() -> onTrino().executeQuery(format(
-                "INSERT INTO %s.%s.%s (h_varchar) VALUES ('Chennai')", KAFKA_CATALOG, KAFKA_SCHEMA, ALL_DATATYPES_PROTOBUF_TABLE_NAME)))
-                .isInstanceOf(SQLException.class)
-                .hasMessageMatching("Query failed \\(.+\\): Protobuf doesn't support serializing null values");
-    }
-
-    @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS})
-    public void testInsertStructuralDataType()
-    {
-        createProtobufTable(STRUCTURAL_PROTOBUF_TABLE_NAME, STRUCTURAL_PROTOBUF_TOPIC_NAME);
-        assertThat(onTrino().executeQuery(format(
-                "INSERT INTO %s.%s.%s VALUES " +
-                        "(ARRAY[CAST(ROW('Entry1') AS ROW(simple_string VARCHAR))], " +
-                        "map_from_entries(ARRAY[('key1', CAST(ROW('value1') AS ROW(simple_string VARCHAR)))]), " +
-                        "CAST(ROW(1234567890.123456789, 3.14, 'ONE') AS ROW(d_double DOUBLE, e_float REAL, g_enum VARCHAR)), " +
-                        "'Chennai', " +
-                        "314, " +
-                        "9223372036854775807, " +
-                        "CAST(ROW('Entry2') AS ROW(simple_string VARCHAR)), " +
-                        "TIMESTAMP '2020-12-21 15:45:00.012345')",
-                KAFKA_CATALOG,
-                KAFKA_SCHEMA,
-                STRUCTURAL_PROTOBUF_TABLE_NAME)))
-                .updatedRowsCountIsEqualTo(1);
-
-        assertThat(onTrino().executeQuery(format(
-                "SELECT c_array[1].simple_string, b_map['key1'].simple_string, a_row.d_double, a_row.e_float, a_row.g_enum, a_string, c_integer, c_bigint, d_row.simple_string, e_timestamp FROM %s.%s.%s",
-                KAFKA_CATALOG,
-                KAFKA_SCHEMA,
-                STRUCTURAL_PROTOBUF_TABLE_NAME)))
-                .containsOnly(
-                        row(
-                                "Entry1",
-                                "value1",
-                                1234567890.1234567890,
-                                3.14f,
-                                "ONE",
-                                "Chennai",
-                                314,
-                                9223372036854775807L,
-                                "Entry2",
-                                Timestamp.valueOf("2020-12-21 15:45:00.012345")));
-    }
-}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReads.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReads.java
deleted file mode 100644
index f46a27ee0db4..000000000000
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReads.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.kafka;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.io.Resources;
-import com.google.common.primitives.Ints;
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.DynamicMessage;
-import io.airlift.units.Duration;
-import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaReference;
-import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
-import io.trino.tempto.ProductTest;
-import io.trino.tempto.fulfillment.table.TableManager;
-import io.trino.tempto.fulfillment.table.kafka.KafkaMessage;
-import io.trino.tempto.fulfillment.table.kafka.KafkaTableDefinition;
-import io.trino.tempto.fulfillment.table.kafka.KafkaTableManager;
-import io.trino.tempto.fulfillment.table.kafka.ListKafkaDataSource;
-import io.trino.tempto.query.QueryResult;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import java.io.ByteArrayOutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.util.Map;
-
-import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
-import static io.trino.tempto.context.ThreadLocalTestContextHolder.testContext;
-import static io.trino.tempto.fulfillment.table.TableHandle.tableHandle;
-import static io.trino.tempto.fulfillment.table.kafka.KafkaMessageContentsBuilder.contentsBuilder;
-import static io.trino.tests.product.TestGroups.KAFKA;
-import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.utils.QueryAssertions.assertEventually;
-import static io.trino.tests.product.utils.QueryExecutors.onTrino;
-import static io.trino.tests.product.utils.SchemaRegistryClientUtils.getSchemaRegistryClient;
-import static java.lang.String.format;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-@Test(singleThreaded = true)
-public class TestKafkaProtobufReads
-        extends ProductTest
-{
-    private static final String KAFKA_SCHEMA = "product_tests";
-
-    private static final String BASIC_DATATYPES_PROTOBUF_TOPIC_NAME = "read_basic_datatypes_protobuf";
-    private static final String BASIC_DATATYPES_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/basic_datatypes.proto";
-
-    private static final String BASIC_STRUCTURAL_PROTOBUF_TOPIC_NAME = "read_basic_structural_datatypes_protobuf";
-    private static final String BASIC_STRUCTURAL_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/basic_structural_datatypes.proto";
-
-    private static final String ALL_DATATYPES_PROTOBUF_TOPIC_SCHEMA_REGISTRY = "all_datatypes_protobuf_schema_registry";
-    private static final String ALL_DATATYPES_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/all_datatypes.proto";
-
-    @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS}, dataProvider = "catalogs")
-    public void testSelectPrimitiveDataType(KafkaCatalog kafkaCatalog, MessageSerializer messageSerializer)
-            throws Exception
-    {
-        Map<String, Object> record = ImmutableMap.<String, Object>builder()
-                .put("a_varchar", "foobar")
-                .put("b_integer", 314)
-                .put("c_bigint", 9223372036854775807L)
-                .put("d_double", 1234567890.123456789)
-                .put("e_float", 3.14f)
-                .put("f_boolean", true)
-                .buildOrThrow();
-        String topicName = BASIC_DATATYPES_PROTOBUF_TOPIC_NAME + kafkaCatalog.getTopicNameSuffix();
-        createProtobufTable(BASIC_DATATYPES_SCHEMA_PATH, BASIC_DATATYPES_PROTOBUF_TOPIC_NAME, topicName, record, messageSerializer);
-
-        assertEventually(
-                new Duration(30, SECONDS),
-                () -> {
-                    QueryResult queryResult = onTrino().executeQuery(format("select * from %s.%s", kafkaCatalog.getCatalogName(), KAFKA_SCHEMA + "." + topicName));
-                    assertThat(queryResult).containsOnly(row(
-                            "foobar",
-                            314,
-                            9223372036854775807L,
-                            1234567890.123456789,
-                            3.14f,
-                            true));
-                });
-    }
-
-    @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS}, dataProvider = "catalogs")
-    public void testSelectStructuralDataType(KafkaCatalog kafkaCatalog, MessageSerializer messageSerializer)
-            throws Exception
-    {
-        ImmutableMap<String, Object> record = ImmutableMap.of(
-                "a_array", ImmutableList.of(100L, 101L),
-                "a_map", ImmutableMap.of(
-                        "key", "key1",
-                        "value", 1234567890.123456789));
-        String topicName = BASIC_STRUCTURAL_PROTOBUF_TOPIC_NAME + kafkaCatalog.getTopicNameSuffix();
-        createProtobufTable(BASIC_STRUCTURAL_SCHEMA_PATH, BASIC_STRUCTURAL_PROTOBUF_TOPIC_NAME, topicName, record, messageSerializer);
-        assertEventually(
-                new Duration(30, SECONDS),
-                () -> {
-                    QueryResult queryResult = onTrino().executeQuery(format(
-                            "SELECT a[1], a[2], m['key1'] FROM (SELECT %s as a, %s as m FROM %s.%s) t",
-                            kafkaCatalog.isColumnMappingSupported() ? "c_array" : "a_array",
-                            kafkaCatalog.isColumnMappingSupported() ? "c_map" : "a_map",
-                            kafkaCatalog.getCatalogName(),
-                            KAFKA_SCHEMA + "." + topicName));
-                    assertThat(queryResult).containsOnly(row(100L, 101L, 1234567890.123456789));
-                });
-    }
-
-    @DataProvider
-    public static Object[][] catalogs()
-    {
-        return new Object[][] {
-                {
-                        new KafkaCatalog("kafka", "", true), new ProtobufMessageSerializer(),
-                },
-                {
-                        new KafkaCatalog("kafka_schema_registry", "_schema_registry", false), new SchemaRegistryProtobufMessageSerializer(),
-                },
-        };
-    }
-
-    private static final class KafkaCatalog
-    {
-        private final String catalogName;
-        private final String topicNameSuffix;
-        private final boolean columnMappingSupported;
-
-        private KafkaCatalog(String catalogName, String topicNameSuffix, boolean columnMappingSupported)
-        {
-            this.catalogName = requireNonNull(catalogName, "catalogName is null");
-            this.topicNameSuffix = requireNonNull(topicNameSuffix, "topicNameSuffix is null");
-            this.columnMappingSupported = columnMappingSupported;
-        }
-
-        public String getCatalogName()
-        {
-            return catalogName;
-        }
-
-        public String getTopicNameSuffix()
-        {
-            return topicNameSuffix;
-        }
-
-        public boolean isColumnMappingSupported()
-        {
-            return columnMappingSupported;
-        }
-
-        @Override
-        public String toString()
-        {
-            return catalogName;
-        }
-    }
-
-    @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS})
-    public void testProtobufWithSchemaReferences()
-            throws Exception
-    {
-        String timestampTopic = "timestamp";
-        String timestampProtoFile = "google/protobuf/timestamp.proto";
-        ProtobufSchema baseSchema = new ProtobufSchema(
-                Resources.toString(Resources.getResource(TestKafkaProtobufReads.class, "/" + timestampProtoFile), UTF_8),
-                ImmutableList.of(),
-                ImmutableMap.of(),
-                null,
-                timestampProtoFile);
-
-        getSchemaRegistryClient().register(timestampTopic, baseSchema);
-
-        ProtobufSchema actualSchema = new ProtobufSchema(
-                Files.readString(Path.of(ALL_DATATYPES_SCHEMA_PATH)),
-                ImmutableList.of(new SchemaReference(baseSchema.name(), timestampTopic, 1)),
-                ImmutableMap.of(timestampProtoFile, baseSchema.canonicalString()),
-                null,
-                null);
-
-        LocalDateTime timestamp = LocalDateTime.parse("2020-12-12T15:35:45.923");
-        com.google.protobuf.Timestamp timestampProto = com.google.protobuf.Timestamp.newBuilder()
-                .setSeconds(timestamp.toEpochSecond(ZoneOffset.UTC))
-                .setNanos(timestamp.getNano())
-                .build();
-
-        Map<String, Object> record = ImmutableMap.<String, Object>builder()
-                .put("a_varchar", "foobar")
-                .put("b_integer", 2)
-                .put("c_bigint", 9223372036854775807L)
-                .put("d_double", 1234567890.123456789)
-                .put("e_float", 3.14f)
-                .put("f_boolean", true)
-                .put("h_timestamp", timestampProto)
-                .buildOrThrow();
-
-        // This is a bit hacky as KafkaTableManager relies on kafka catalog's tables for inserting data into a given topic
-        createProtobufTable(actualSchema, BASIC_DATATYPES_PROTOBUF_TOPIC_NAME, ALL_DATATYPES_PROTOBUF_TOPIC_SCHEMA_REGISTRY, record, new SchemaRegistryProtobufMessageSerializer());
-
-        assertEventually(
-                new Duration(30, SECONDS),
-                () -> {
-                    QueryResult queryResult = onTrino().executeQuery(format("select * from kafka_schema_registry.%s.%s", KAFKA_SCHEMA, ALL_DATATYPES_PROTOBUF_TOPIC_SCHEMA_REGISTRY));
-                    assertThat(queryResult).containsOnly(row(
-                            "foobar",
-                            2,
-                            9223372036854775807L,
-                            1234567890.123456789,
-                            3.14f,
-                            true,
-                            "ZERO",
-                            Timestamp.valueOf(timestamp)));
-                });
-    }
-
-    private static void createProtobufTable(String schemaPath, String tableName, String topicName, Map<String, Object> record, MessageSerializer messageSerializer)
-            throws Exception
-    {
-        createProtobufTable(new ProtobufSchema(Files.readString(Path.of(schemaPath))), tableName, topicName, record, messageSerializer);
-    }
-
-    private static void createProtobufTable(ProtobufSchema protobufSchema, String tableName, String topicName, Map<String, Object> record, MessageSerializer messageSerializer)
-            throws Exception
-    {
-        byte[] protobufData = messageSerializer.serialize(topicName, protobufSchema, record);
-
-        KafkaTableDefinition tableDefinition = new KafkaTableDefinition(
-                KAFKA_SCHEMA + "." + tableName,
-                topicName,
-                new ListKafkaDataSource(ImmutableList.of(
-                        new KafkaMessage(
-                                contentsBuilder()
-                                        .appendBytes(protobufData)
-                                        .build()))),
-                1,
-                1);
-        KafkaTableManager kafkaTableManager = (KafkaTableManager) testContext().getDependency(TableManager.class, "kafka");
-        kafkaTableManager.createImmutable(tableDefinition, tableHandle(tableName).inSchema(KAFKA_SCHEMA));
-    }
-
-    @FunctionalInterface
-    private interface MessageSerializer
-    {
-        byte[] serialize(String topic, ProtobufSchema protobufSchema, Map<String, Object> values)
-                throws Exception;
-    }
-
-    private static final class ProtobufMessageSerializer
-            implements MessageSerializer
-    {
-        @Override
-        public byte[] serialize(String topic, ProtobufSchema protobufSchema, Map<String, Object> values)
-        {
-            return buildDynamicMessage(protobufSchema.toDescriptor(), values).toByteArray();
-        }
-    }
-
-    private static final class SchemaRegistryProtobufMessageSerializer
-            implements MessageSerializer
-    {
-        @Override
-        public byte[] serialize(String topic, ProtobufSchema protobufSchema, Map<String, Object> values)
-                throws Exception
-        {
-            try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-                // Write magic byte
-                out.write((byte) 0);
-
-                // Write SchemaId
-                int schemaId = getSchemaRegistryClient().register(
-                        topic + "-value",
-                        protobufSchema);
-                out.write(Ints.toByteArray(schemaId));
-
-                // Write empty MessageIndexes
-                out.write((byte) 0);
-
-                out.write(buildDynamicMessage(protobufSchema.toDescriptor(), values).toByteArray());
-                return out.toByteArray();
-            }
-        }
-    }
-
-    private static DynamicMessage buildDynamicMessage(Descriptor descriptor, Map<String, Object> data)
-    {
-        DynamicMessage.Builder builder = DynamicMessage.newBuilder(descriptor);
-        for (Map.Entry<String, Object> entry : data.entrySet()) {
-            FieldDescriptor fieldDescriptor = descriptor.findFieldByName(entry.getKey());
-            if (entry.getValue() instanceof Map<?, ?>) {
-                builder.setField(
-                        fieldDescriptor,
-                        ImmutableList.of(
-                                buildDynamicMessage(fieldDescriptor.getMessageType(), (Map<String, Object>) entry.getValue())));
-            }
-            else {
-                builder.setField(fieldDescriptor, entry.getValue());
-            }
-        }
-        return builder.build();
-    }
-}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReadsSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReadsSmokeTest.java
new file mode 100644
index 000000000000..ccb114198abd
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReadsSmokeTest.java
@@ -0,0 +1,315 @@
+/*
+ * Licensed 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 io.trino.tests.product.kafka;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Resources;
+import com.google.common.primitives.Ints;
+import com.google.protobuf.Descriptors.Descriptor;
+import com.google.protobuf.Descriptors.FieldDescriptor;
+import com.google.protobuf.DynamicMessage;
+import io.airlift.units.Duration;
+import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaReference;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
+import io.trino.tempto.ProductTest;
+import io.trino.tempto.fulfillment.table.TableManager;
+import io.trino.tempto.fulfillment.table.kafka.KafkaMessage;
+import io.trino.tempto.fulfillment.table.kafka.KafkaTableDefinition;
+import io.trino.tempto.fulfillment.table.kafka.KafkaTableManager;
+import io.trino.tempto.fulfillment.table.kafka.ListKafkaDataSource;
+import io.trino.tempto.query.QueryResult;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Map;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tempto.context.ThreadLocalTestContextHolder.testContext;
+import static io.trino.tempto.fulfillment.table.TableHandle.tableHandle;
+import static io.trino.tempto.fulfillment.table.kafka.KafkaMessageContentsBuilder.contentsBuilder;
+import static io.trino.tests.product.TestGroups.KAFKA;
+import static io.trino.tests.product.TestGroups.KAFKA_CONFLUENT_LICENSE;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.utils.QueryAssertions.assertEventually;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static io.trino.tests.product.utils.SchemaRegistryClientUtils.getSchemaRegistryClient;
+import static java.lang.String.format;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Test(singleThreaded = true)
+public class TestKafkaProtobufReadsSmokeTest
+        extends ProductTest
+{
+    private static final String KAFKA_SCHEMA = "product_tests";
+
+    private static final String BASIC_DATATYPES_PROTOBUF_TOPIC_NAME = "read_basic_datatypes_protobuf";
+    private static final String BASIC_DATATYPES_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/basic_datatypes.proto";
+
+    private static final String BASIC_STRUCTURAL_PROTOBUF_TOPIC_NAME = "read_basic_structural_datatypes_protobuf";
+    private static final String BASIC_STRUCTURAL_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/basic_structural_datatypes.proto";
+
+    private static final String ALL_DATATYPES_PROTOBUF_TOPIC_SCHEMA_REGISTRY = "all_datatypes_protobuf_schema_registry";
+    private static final String ALL_DATATYPES_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/all_datatypes.proto";
+
+    private static final KafkaCatalog KAFKA_CATALOG = new KafkaCatalog("kafka", "", true, new ProtobufMessageSerializer());
+    private static final KafkaCatalog KAFKA_SCHEMA_REGISTRY_CATALOG = new KafkaCatalog("kafka_schema_registry", "_schema_registry", false, new SchemaRegistryProtobufMessageSerializer());
+
+    @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS})
+    public void testSelectPrimitiveDataType()
+            throws Exception
+    {
+        selectPrimitiveDataType(KAFKA_CATALOG);
+    }
+
+    @Test(groups = {KAFKA_CONFLUENT_LICENSE, PROFILE_SPECIFIC_TESTS})
+    public void testSelectPrimitiveDataTypeWithSchemaRegistry()
+            throws Exception
+    {
+        selectPrimitiveDataType(KAFKA_SCHEMA_REGISTRY_CATALOG);
+    }
+
+    private void selectPrimitiveDataType(KafkaCatalog kafkaCatalog)
+            throws Exception
+    {
+        Map<String, Object> record = ImmutableMap.<String, Object>builder()
+                .put("a_varchar", "foobar")
+                .put("b_integer", 314)
+                .put("c_bigint", 9223372036854775807L)
+                .put("d_double", 1234567890.123456789)
+                .put("e_float", 3.14f)
+                .put("f_boolean", true)
+                .buildOrThrow();
+        String topicName = BASIC_DATATYPES_PROTOBUF_TOPIC_NAME + kafkaCatalog.topicNameSuffix();
+        createProtobufTable(BASIC_DATATYPES_SCHEMA_PATH, BASIC_DATATYPES_PROTOBUF_TOPIC_NAME, topicName, record, kafkaCatalog.messageSerializer());
+
+        assertEventually(
+                new Duration(30, SECONDS),
+                () -> {
+                    QueryResult queryResult = onTrino().executeQuery(format("select * from %s.%s", kafkaCatalog.catalogName(), KAFKA_SCHEMA + "." + topicName));
+                    assertThat(queryResult).containsOnly(row(
+                            "foobar",
+                            314,
+                            9223372036854775807L,
+                            1234567890.123456789,
+                            3.14f,
+                            true));
+                });
+    }
+
+    @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS})
+    public void testSelectStructuralDataType()
+            throws Exception
+    {
+        selectStructuralDataType(KAFKA_CATALOG);
+    }
+
+    @Test(groups = {KAFKA_CONFLUENT_LICENSE, PROFILE_SPECIFIC_TESTS})
+    public void testSelectStructuralDataTypeWithSchemaRegistry()
+            throws Exception
+    {
+        selectStructuralDataType(KAFKA_SCHEMA_REGISTRY_CATALOG);
+    }
+
+    private void selectStructuralDataType(KafkaCatalog kafkaCatalog)
+            throws Exception
+    {
+        ImmutableMap<String, Object> record = ImmutableMap.of(
+                "a_array", ImmutableList.of(100L, 101L),
+                "a_map", ImmutableMap.of(
+                        "key", "key1",
+                        "value", 1234567890.123456789));
+        String topicName = BASIC_STRUCTURAL_PROTOBUF_TOPIC_NAME + kafkaCatalog.topicNameSuffix();
+        createProtobufTable(BASIC_STRUCTURAL_SCHEMA_PATH, BASIC_STRUCTURAL_PROTOBUF_TOPIC_NAME, topicName, record, kafkaCatalog.messageSerializer());
+        assertEventually(
+                new Duration(30, SECONDS),
+                () -> {
+                    QueryResult queryResult = onTrino().executeQuery(format(
+                            "SELECT a[1], a[2], m['key1'] FROM (SELECT %s as a, %s as m FROM %s.%s) t",
+                            kafkaCatalog.columnMappingSupported() ? "c_array" : "a_array",
+                            kafkaCatalog.columnMappingSupported() ? "c_map" : "a_map",
+                            kafkaCatalog.catalogName(),
+                            KAFKA_SCHEMA + "." + topicName));
+                    assertThat(queryResult).containsOnly(row(100L, 101L, 1234567890.123456789));
+                });
+    }
+
+    private record KafkaCatalog(String catalogName, String topicNameSuffix, boolean columnMappingSupported, MessageSerializer messageSerializer)
+    {
+        private KafkaCatalog(String catalogName, String topicNameSuffix, boolean columnMappingSupported, MessageSerializer messageSerializer)
+        {
+            this.catalogName = requireNonNull(catalogName, "catalogName is null");
+            this.topicNameSuffix = requireNonNull(topicNameSuffix, "topicNameSuffix is null");
+            this.columnMappingSupported = columnMappingSupported;
+            this.messageSerializer = requireNonNull(messageSerializer, "messageSerializer is null");
+        }
+
+        @Override
+        public String toString()
+        {
+            return catalogName;
+        }
+    }
+
+    @Test(groups = {KAFKA_CONFLUENT_LICENSE, PROFILE_SPECIFIC_TESTS})
+    public void testProtobufWithSchemaReferences()
+            throws Exception
+    {
+        String timestampTopic = "timestamp";
+        String timestampProtoFile = "google/protobuf/timestamp.proto";
+        ProtobufSchema baseSchema = new ProtobufSchema(
+                Resources.toString(Resources.getResource(TestKafkaProtobufReadsSmokeTest.class, "/" + timestampProtoFile), UTF_8),
+                ImmutableList.of(),
+                ImmutableMap.of(),
+                null,
+                timestampProtoFile);
+
+        getSchemaRegistryClient().register(timestampTopic, baseSchema);
+
+        ProtobufSchema actualSchema = new ProtobufSchema(
+                Files.readString(Path.of(ALL_DATATYPES_SCHEMA_PATH)),
+                ImmutableList.of(new SchemaReference(baseSchema.name(), timestampTopic, 1)),
+                ImmutableMap.of(timestampProtoFile, baseSchema.canonicalString()),
+                null,
+                null);
+
+        LocalDateTime timestamp = LocalDateTime.parse("2020-12-12T15:35:45.923");
+        com.google.protobuf.Timestamp timestampProto = com.google.protobuf.Timestamp.newBuilder()
+                .setSeconds(timestamp.toEpochSecond(ZoneOffset.UTC))
+                .setNanos(timestamp.getNano())
+                .build();
+
+        Map<String, Object> record = ImmutableMap.<String, Object>builder()
+                .put("a_varchar", "foobar")
+                .put("b_integer", 2)
+                .put("c_bigint", 9223372036854775807L)
+                .put("d_double", 1234567890.123456789)
+                .put("e_float", 3.14f)
+                .put("f_boolean", true)
+                .put("h_timestamp", timestampProto)
+                .buildOrThrow();
+
+        // This is a bit hacky as KafkaTableManager relies on kafka catalog's tables for inserting data into a given topic
+        createProtobufTable(actualSchema, BASIC_DATATYPES_PROTOBUF_TOPIC_NAME, ALL_DATATYPES_PROTOBUF_TOPIC_SCHEMA_REGISTRY, record, new SchemaRegistryProtobufMessageSerializer());
+
+        assertEventually(
+                new Duration(30, SECONDS),
+                () -> {
+                    QueryResult queryResult = onTrino().executeQuery(format("select * from %s.%s.%s", KAFKA_SCHEMA_REGISTRY_CATALOG.catalogName(), KAFKA_SCHEMA, ALL_DATATYPES_PROTOBUF_TOPIC_SCHEMA_REGISTRY));
+                    assertThat(queryResult).containsOnly(row(
+                            "foobar",
+                            2,
+                            9223372036854775807L,
+                            1234567890.123456789,
+                            3.14f,
+                            true,
+                            "ZERO",
+                            Timestamp.valueOf(timestamp)));
+                });
+    }
+
+    private static void createProtobufTable(String schemaPath, String tableName, String topicName, Map<String, Object> record, MessageSerializer messageSerializer)
+            throws Exception
+    {
+        createProtobufTable(new ProtobufSchema(Files.readString(Path.of(schemaPath))), tableName, topicName, record, messageSerializer);
+    }
+
+    private static void createProtobufTable(ProtobufSchema protobufSchema, String tableName, String topicName, Map<String, Object> record, MessageSerializer messageSerializer)
+            throws Exception
+    {
+        byte[] protobufData = messageSerializer.serialize(topicName, protobufSchema, record);
+
+        KafkaTableDefinition tableDefinition = new KafkaTableDefinition(
+                KAFKA_SCHEMA + "." + tableName,
+                topicName,
+                new ListKafkaDataSource(ImmutableList.of(
+                        new KafkaMessage(
+                                contentsBuilder()
+                                        .appendBytes(protobufData)
+                                        .build()))),
+                1,
+                1);
+        KafkaTableManager kafkaTableManager = (KafkaTableManager) testContext().getDependency(TableManager.class, "kafka");
+        kafkaTableManager.createImmutable(tableDefinition, tableHandle(tableName).inSchema(KAFKA_SCHEMA));
+    }
+
+    @FunctionalInterface
+    private interface MessageSerializer
+    {
+        byte[] serialize(String topic, ProtobufSchema protobufSchema, Map<String, Object> values)
+                throws Exception;
+    }
+
+    private static final class ProtobufMessageSerializer
+            implements MessageSerializer
+    {
+        @Override
+        public byte[] serialize(String topic, ProtobufSchema protobufSchema, Map<String, Object> values)
+        {
+            return buildDynamicMessage(protobufSchema.toDescriptor(), values).toByteArray();
+        }
+    }
+
+    private static final class SchemaRegistryProtobufMessageSerializer
+            implements MessageSerializer
+    {
+        @Override
+        public byte[] serialize(String topic, ProtobufSchema protobufSchema, Map<String, Object> values)
+                throws Exception
+        {
+            try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+                // Write magic byte
+                out.write((byte) 0);
+
+                // Write SchemaId
+                int schemaId = getSchemaRegistryClient().register(
+                        topic + "-value",
+                        protobufSchema);
+                out.write(Ints.toByteArray(schemaId));
+
+                // Write empty MessageIndexes
+                out.write((byte) 0);
+
+                out.write(buildDynamicMessage(protobufSchema.toDescriptor(), values).toByteArray());
+                return out.toByteArray();
+            }
+        }
+    }
+
+    private static DynamicMessage buildDynamicMessage(Descriptor descriptor, Map<String, Object> data)
+    {
+        DynamicMessage.Builder builder = DynamicMessage.newBuilder(descriptor);
+        for (Map.Entry<String, Object> entry : data.entrySet()) {
+            FieldDescriptor fieldDescriptor = descriptor.findFieldByName(entry.getKey());
+            if (entry.getValue() instanceof Map<?, ?>) {
+                builder.setField(
+                        fieldDescriptor,
+                        ImmutableList.of(
+                                buildDynamicMessage(fieldDescriptor.getMessageType(), (Map<String, Object>) entry.getValue())));
+            }
+            else {
+                builder.setField(fieldDescriptor, entry.getValue());
+            }
+        }
+        return builder.build();
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufWritesSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufWritesSmokeTest.java
new file mode 100644
index 000000000000..79eb5badcecb
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufWritesSmokeTest.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed 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 io.trino.tests.product.kafka;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.tempto.ProductTest;
+import io.trino.tempto.fulfillment.table.TableManager;
+import io.trino.tempto.fulfillment.table.kafka.KafkaTableDefinition;
+import io.trino.tempto.fulfillment.table.kafka.KafkaTableManager;
+import io.trino.tempto.fulfillment.table.kafka.ListKafkaDataSource;
+import org.testng.annotations.Test;
+
+import java.sql.SQLException;
+import java.sql.Timestamp;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
+import static io.trino.tempto.context.ThreadLocalTestContextHolder.testContext;
+import static io.trino.tempto.fulfillment.table.TableHandle.tableHandle;
+import static io.trino.tests.product.TestGroups.KAFKA;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestKafkaProtobufWritesSmokeTest
+        extends ProductTest
+{
+    private static final String KAFKA_CATALOG = "kafka";
+    private static final String KAFKA_SCHEMA = "product_tests";
+
+    private static final String ALL_DATATYPES_PROTOBUF_TABLE_NAME = "all_datatypes_protobuf";
+    private static final String ALL_DATATYPES_PROTOBUF_TOPIC_NAME = "write_all_datatypes_protobuf";
+
+    private static final String STRUCTURAL_PROTOBUF_TABLE_NAME = "structural_datatype_protobuf";
+    private static final String STRUCTURAL_PROTOBUF_TOPIC_NAME = "structural_datatype_protobuf";
+
+    private static void createProtobufTable(String tableName, String topicName)
+    {
+        KafkaTableDefinition tableDefinition = new KafkaTableDefinition(
+                tableName,
+                topicName,
+                new ListKafkaDataSource(ImmutableList.of()),
+                1,
+                1);
+        KafkaTableManager kafkaTableManager = (KafkaTableManager) testContext().getDependency(TableManager.class, "kafka");
+        kafkaTableManager.createImmutable(tableDefinition, tableHandle(tableName).inSchema(KAFKA_SCHEMA));
+    }
+
+    @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS})
+    public void testInsertAllDataType()
+    {
+        createProtobufTable(ALL_DATATYPES_PROTOBUF_TABLE_NAME, ALL_DATATYPES_PROTOBUF_TOPIC_NAME);
+        assertThat(onTrino().executeQuery(format(
+                "INSERT INTO %s.%s.%s VALUES " +
+                        "('Chennai', 314, 9223372036854775807, 1234567890.123456789, 3.14, true, 'ZERO', TIMESTAMP '2020-12-21 15:45:00.012345')," +
+                        "('TamilNadu', -314, -9223372036854775808, -1234567890.123456789, -3.14, false, 'ONE', TIMESTAMP '1970-01-01 15:45:00.012345'), " +
+                        "('India', 314, 9223372036854775807, 1234567890.123456789, 3.14, false, 'TWO', TIMESTAMP '0001-01-01 00:00:00.000001')",
+                KAFKA_CATALOG,
+                KAFKA_SCHEMA,
+                ALL_DATATYPES_PROTOBUF_TABLE_NAME)))
+                .updatedRowsCountIsEqualTo(3);
+
+        assertThat(onTrino().executeQuery(format(
+                "SELECT * FROM %s.%s.%s",
+                KAFKA_CATALOG,
+                KAFKA_SCHEMA,
+                ALL_DATATYPES_PROTOBUF_TABLE_NAME)))
+                .containsOnly(
+                        row("Chennai", 314, 9223372036854775807L, 1234567890.123456789, 3.14f, true, "ZERO", Timestamp.valueOf("2020-12-21 15:45:00.012345")),
+                        row("TamilNadu", -314, -9223372036854775808L, -1234567890.123456789, -3.14f, false, "ONE", Timestamp.valueOf("1970-01-01 15:45:00.012345")),
+                        row("India", 314, 9223372036854775807L, 1234567890.123456789, 3.14f, false, "TWO", Timestamp.valueOf("0001-01-01 00:00:00.000001")));
+
+        assertQueryFailure(() -> onTrino().executeQuery(format(
+                "INSERT INTO %s.%s.%s (h_varchar) VALUES ('Chennai')", KAFKA_CATALOG, KAFKA_SCHEMA, ALL_DATATYPES_PROTOBUF_TABLE_NAME)))
+                .isInstanceOf(SQLException.class)
+                .hasMessageMatching("Query failed \\(.+\\): Protobuf doesn't support serializing null values");
+    }
+
+    @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS})
+    public void testInsertStructuralDataType()
+    {
+        createProtobufTable(STRUCTURAL_PROTOBUF_TABLE_NAME, STRUCTURAL_PROTOBUF_TOPIC_NAME);
+        assertThat(onTrino().executeQuery(format(
+                "INSERT INTO %s.%s.%s VALUES " +
+                        "(ARRAY[CAST(ROW('Entry1') AS ROW(simple_string VARCHAR))], " +
+                        "map_from_entries(ARRAY[('key1', CAST(ROW('value1') AS ROW(simple_string VARCHAR)))]), " +
+                        "CAST(ROW(1234567890.123456789, 3.14, 'ONE') AS ROW(d_double DOUBLE, e_float REAL, g_enum VARCHAR)), " +
+                        "'Chennai', " +
+                        "314, " +
+                        "9223372036854775807, " +
+                        "CAST(ROW('Entry2') AS ROW(simple_string VARCHAR)), " +
+                        "TIMESTAMP '2020-12-21 15:45:00.012345')",
+                KAFKA_CATALOG,
+                KAFKA_SCHEMA,
+                STRUCTURAL_PROTOBUF_TABLE_NAME)))
+                .updatedRowsCountIsEqualTo(1);
+
+        assertThat(onTrino().executeQuery(format(
+                "SELECT c_array[1].simple_string, b_map['key1'].simple_string, a_row.d_double, a_row.e_float, a_row.g_enum, a_string, c_integer, c_bigint, d_row.simple_string, e_timestamp FROM %s.%s.%s",
+                KAFKA_CATALOG,
+                KAFKA_SCHEMA,
+                STRUCTURAL_PROTOBUF_TABLE_NAME)))
+                .containsOnly(
+                        row(
+                                "Entry1",
+                                "value1",
+                                1234567890.1234567890,
+                                3.14f,
+                                "ONE",
+                                "Chennai",
+                                314,
+                                9223372036854775807L,
+                                "Entry2",
+                                Timestamp.valueOf("2020-12-21 15:45:00.012345")));
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaPushdownSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaPushdownSmokeTest.java
index 242765b2b1b3..c508172152f6 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaPushdownSmokeTest.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaPushdownSmokeTest.java
@@ -28,13 +28,13 @@
 import java.util.stream.LongStream;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable;
 import static io.trino.tempto.fulfillment.table.kafka.KafkaMessageContentsBuilder.contentsBuilder;
 import static io.trino.tests.product.TestGroups.KAFKA;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestKafkaPushdownSmokeTest
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaReadsSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaReadsSmokeTest.java
index eb2cd22ca3ab..52c0a8c79c8f 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaReadsSmokeTest.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaReadsSmokeTest.java
@@ -33,7 +33,6 @@
 import java.time.LocalTime;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable;
 import static io.trino.tempto.fulfillment.table.kafka.KafkaMessageContentsBuilder.contentsBuilder;
 import static io.trino.tests.product.TestGroups.KAFKA;
@@ -42,6 +41,7 @@
 import static java.lang.Double.doubleToRawLongBits;
 import static java.lang.Float.floatToIntBits;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestKafkaReadsSmokeTest
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaWritesSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaWritesSmokeTest.java
index f7b5e1db847b..774b21341756 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaWritesSmokeTest.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaWritesSmokeTest.java
@@ -24,11 +24,11 @@
 import java.time.LocalTime;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.KAFKA;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestKafkaWritesSmokeTest
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kudu/TestKuduConnectoKerberosSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kudu/TestKuduConnectoKerberosSmokeTest.java
deleted file mode 100644
index 2551b54dbbd6..000000000000
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kudu/TestKuduConnectoKerberosSmokeTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed 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 io.trino.tests.product.kudu;
-
-import io.trino.tempto.query.QueryResult;
-import org.testng.annotations.Test;
-
-import java.util.UUID;
-
-import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
-import static io.trino.tests.product.TestGroups.KUDU;
-import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
-import static io.trino.tests.product.utils.QueryExecutors.onTrino;
-import static java.lang.String.format;
-
-public class TestKuduConnectoKerberosSmokeTest
-{
-    @Test(groups = {KUDU, PROFILE_SPECIFIC_TESTS})
-    public void kerberosAuthTicketExpiryTest() throws InterruptedException
-    {
-        String kuduTable = "kudu.default.nation_" + UUID.randomUUID().toString().replace("-", "");
-        String table = "tpch.tiny.nation";
-
-        assertThat(onTrino().executeQuery(format("SELECT count(*) from %s", table))).containsExactlyInOrder(row(25));
-        QueryResult result = onTrino().executeQuery(format("CREATE TABLE %s AS SELECT * FROM %s", kuduTable, table));
-        try {
-            assertThat(result).updatedRowsCountIsEqualTo(25);
-            assertThat(onTrino().executeQuery(format("SELECT count(*) FROM %s", kuduTable))).containsExactlyInOrder(row(25));
-            // Kerberos tickets are configured to expire after 60 seconds, this should expire the ticket
-            Thread.sleep(70_000L);
-            assertThat(onTrino().executeQuery(format("SELECT count(*) FROM %s", kuduTable))).containsExactlyInOrder(row(25));
-        }
-        finally {
-            onTrino().executeQuery(format("DROP TABLE %s", kuduTable));
-        }
-    }
-}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kudu/TestKuduConnectorKerberosSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kudu/TestKuduConnectorKerberosSmokeTest.java
new file mode 100644
index 000000000000..1c4bc68cc226
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kudu/TestKuduConnectorKerberosSmokeTest.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed 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 io.trino.tests.product.kudu;
+
+import io.trino.tempto.query.QueryResult;
+import org.testng.annotations.Test;
+
+import java.util.UUID;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tests.product.TestGroups.KUDU;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestKuduConnectorKerberosSmokeTest
+{
+    @Test(groups = {KUDU, PROFILE_SPECIFIC_TESTS})
+    public void kerberosAuthTicketExpiryTest()
+            throws InterruptedException
+    {
+        String kuduTable = "kudu.default.nation_" + UUID.randomUUID().toString().replace("-", "");
+        String table = "tpch.tiny.nation";
+
+        assertThat(onTrino().executeQuery(format("SELECT count(*) from %s", table))).containsExactlyInOrder(row(25));
+        QueryResult result = onTrino().executeQuery(format("CREATE TABLE %s AS SELECT * FROM %s", kuduTable, table));
+        try {
+            assertThat(result).updatedRowsCountIsEqualTo(25);
+            assertThat(onTrino().executeQuery(format("SELECT count(*) FROM %s", kuduTable))).containsExactlyInOrder(row(25));
+            // Kerberos tickets are configured to expire after 60 seconds, this should expire the ticket
+            Thread.sleep(70_000L);
+            assertThat(onTrino().executeQuery(format("SELECT count(*) FROM %s", kuduTable))).containsExactlyInOrder(row(25));
+        }
+        finally {
+            onTrino().executeQuery(format("DROP TABLE %s", kuduTable));
+        }
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/mariadb/TestMariaDb.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/mariadb/TestMariaDb.java
index c8b32f316af7..945946f0f53f 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/mariadb/TestMariaDb.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/mariadb/TestMariaDb.java
@@ -18,10 +18,10 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.MARIADB;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestMariaDb
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestCreateTableAsSelect.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestCreateTableAsSelect.java
index 2cee10b51831..191e8f13d95c 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestCreateTableAsSelect.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestCreateTableAsSelect.java
@@ -13,27 +13,27 @@
  */
 package io.trino.tests.product.mysql;
 
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.query.QueryResult;
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.MYSQL;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onMySql;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestCreateTableAsSelect
         extends ProductTest
 {
     private static final String TABLE_NAME = "test.nation_tmp";
 
-    @BeforeTestWithContext
-    @AfterTestWithContext
+    @BeforeMethodWithContext
+    @AfterMethodWithContext
     public void dropTestTable()
     {
         onMySql().executeQuery(format("DROP TABLE IF EXISTS %s", TABLE_NAME));
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestJdbcDynamicFilteringJmx.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestJdbcDynamicFilteringJmx.java
index 8239918a612c..e48ccb8f8b6c 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestJdbcDynamicFilteringJmx.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/mysql/TestJdbcDynamicFilteringJmx.java
@@ -13,26 +13,26 @@
  */
 package io.trino.tests.product.mysql;
 
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.MYSQL;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onMySql;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJdbcDynamicFilteringJmx
         extends ProductTest
 {
     private static final String TABLE_NAME = "test.nation_tmp";
 
-    @BeforeTestWithContext
-    @AfterTestWithContext
+    @BeforeMethodWithContext
+    @AfterMethodWithContext
     public void dropTestTable()
     {
         onMySql().executeQuery(format("DROP TABLE IF EXISTS %s", TABLE_NAME));
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/phoenix/TestPhoenix.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/phoenix/TestPhoenix.java
index c0676e7d2eba..3d2ca3b1884d 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/phoenix/TestPhoenix.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/phoenix/TestPhoenix.java
@@ -18,10 +18,10 @@
 import org.testng.annotations.Test;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.PHOENIX;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestPhoenix
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/snowflake/TestSnowflake.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/snowflake/TestSnowflake.java
new file mode 100644
index 000000000000..9ad47f213da3
--- /dev/null
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/snowflake/TestSnowflake.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed 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 io.trino.tests.product.snowflake;
+
+import io.trino.tempto.ProductTest;
+import io.trino.tempto.query.QueryResult;
+import org.testng.annotations.Test;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tempto.assertions.QueryAssert.assertThat;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.TestGroups.SNOWFLAKE;
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+
+public class TestSnowflake
+        extends ProductTest
+{
+    @Test(groups = {SNOWFLAKE, PROFILE_SPECIFIC_TESTS})
+    public void testCreateTableAsSelect()
+    {
+        String tableName = "snowflake.tpch.nation_" + randomNameSuffix();
+
+        onTrino().executeQuery("DROP TABLE IF EXISTS " + tableName);
+        QueryResult result = onTrino().executeQuery("CREATE TABLE " + tableName + " AS SELECT * FROM tpch.tiny.nation");
+        try {
+            assertThat(result).updatedRowsCountIsEqualTo(25);
+            assertThat(onTrino().executeQuery("SELECT COUNT(*) FROM " + tableName))
+                    .containsOnly(row(25));
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE " + tableName);
+        }
+    }
+}
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestInsert.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestInsert.java
index 785e02a61f81..3920060777c0 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestInsert.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestInsert.java
@@ -13,8 +13,8 @@
  */
 package io.trino.tests.product.sqlserver;
 
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.Requirement;
 import io.trino.tempto.RequirementsProvider;
@@ -25,7 +25,6 @@
 import java.sql.Date;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.TestGroups.SQL_SERVER;
@@ -34,6 +33,7 @@
 import static io.trino.tests.product.utils.QueryExecutors.onSqlServer;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestInsert
         extends ProductTest
@@ -49,8 +49,8 @@ public Requirement getRequirements(Configuration configuration)
     private static final String MASTER = "master";
     private static final String INSERT_TABLE_NAME = format("%s.%s", KEY_SPACE, SQLSERVER_INSERT.getName());
 
-    @BeforeTestWithContext
-    @AfterTestWithContext
+    @BeforeMethodWithContext
+    @AfterMethodWithContext
     public void dropTestTables()
     {
         onTrino().executeQuery(format("DROP TABLE IF EXISTS %s", INSERT_TABLE_NAME));
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestSelect.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestSelect.java
index beccde02c2f1..075dc9af468f 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestSelect.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestSelect.java
@@ -14,8 +14,8 @@
 package io.trino.tests.product.sqlserver;
 
 import io.airlift.log.Logger;
-import io.trino.tempto.AfterTestWithContext;
-import io.trino.tempto.BeforeTestWithContext;
+import io.trino.tempto.AfterMethodWithContext;
+import io.trino.tempto.BeforeMethodWithContext;
 import io.trino.tempto.ProductTest;
 import io.trino.tempto.Requirement;
 import io.trino.tempto.RequirementsProvider;
@@ -28,7 +28,6 @@
 
 import static io.trino.tempto.Requirements.compose;
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tempto.fulfillment.table.TableRequirements.immutableTable;
 import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
 import static io.trino.tests.product.TestGroups.SQL_SERVER;
@@ -50,6 +49,7 @@
 import static java.sql.JDBCType.TIMESTAMP;
 import static java.sql.JDBCType.VARCHAR;
 import static java.util.Collections.nCopies;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSelect
         extends ProductTest
@@ -70,8 +70,8 @@ public Requirement getRequirements(Configuration configuration)
     private static final String CREATE_TABLE_AS_SELECT = format("%s.%s.%s", CONNECTOR_NAME, KEY_SPACE, CTAS_TABLE_NAME);
     private static final String ALL_TYPES_TABLE_NAME = format("%s.%s.%s", CONNECTOR_NAME, KEY_SPACE, SQLSERVER_ALL_TYPES.getName());
 
-    @BeforeTestWithContext
-    @AfterTestWithContext
+    @BeforeMethodWithContext
+    @AfterMethodWithContext
     public void dropTestTables()
     {
         try {
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/teradata/TestTeradataFunctions.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/teradata/TestTeradataFunctions.java
index 83e48f196e55..f13fb80a6976 100644
--- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/teradata/TestTeradataFunctions.java
+++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/teradata/TestTeradataFunctions.java
@@ -21,9 +21,9 @@
 import java.time.LocalDateTime;
 
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
-import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.FUNCTIONS;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTeradataFunctions
         extends ProductTest
diff --git a/testing/trino-product-tests/src/main/resources/parquet/reordered_columns.parquet b/testing/trino-product-tests/src/main/resources/parquet/reordered_columns.parquet
new file mode 100644
index 000000000000..9837aa306aab
Binary files /dev/null and b/testing/trino-product-tests/src/main/resources/parquet/reordered_columns.parquet differ
diff --git a/testing/trino-product-tests/src/main/resources/tempto-configuration.yaml b/testing/trino-product-tests/src/main/resources/tempto-configuration.yaml
index 4b11d578692e..a0ab89b98d76 100644
--- a/testing/trino-product-tests/src/main/resources/tempto-configuration.yaml
+++ b/testing/trino-product-tests/src/main/resources/tempto-configuration.yaml
@@ -1,7 +1,7 @@
 hdfs:
   username: hive
   webhdfs:
-    uri: http://${databases.hive.host}:50070
+    uri: http://${databases.hive.host}:9870
 
 databases:
   hive:
@@ -14,6 +14,8 @@ databases:
     schema: default
     prepare_statement:
       - USE ${databases.hive.schema}
+      # Hive 3 gathers stats by default. For test purposes we need to disable this behavior.
+      - SET hive.stats.column.autogather=false
     table_manager_type: hive
     warehouse_directory_path: /user/hive/warehouse
     inject_stats_for_immutable_tables: true
@@ -30,7 +32,7 @@ databases:
     jdbc_driver_class: io.trino.jdbc.TrinoDriver
     jdbc_url: jdbc:trino://${databases.presto.host}:${databases.presto.port}/hive/${databases.hive.schema}
     jdbc_user: hive
-    jdbc_password: "***empty***"
+    jdbc_password: ""
     jdbc_pooling: false
 
   presto_no_default_catalog:
@@ -46,7 +48,7 @@ databases:
     jdbc_driver_class: ${databases.presto.jdbc_driver_class}
     jdbc_url: jdbc:trino://${databases.presto.host}:${databases.presto.port}/hive/tpcds
     jdbc_user: hive
-    jdbc_password: "***empty***"
+    jdbc_password: ""
     jdbc_pooling: false
 
   alice@presto:
@@ -56,7 +58,7 @@ databases:
     jdbc_driver_class: ${databases.presto.jdbc_driver_class}
     jdbc_url: ${databases.presto.jdbc_url}
     jdbc_user: alice
-    jdbc_password: "***empty***"
+    jdbc_password: ""
     jdbc_pooling: false
     https_keystore_path: ${databases.presto.https_keystore_path}
     https_keystore_password: ${databases.presto.https_keystore_password}
@@ -68,7 +70,7 @@ databases:
     jdbc_driver_class: ${databases.presto.jdbc_driver_class}
     jdbc_url: ${databases.presto.jdbc_url}
     jdbc_user: bob
-    jdbc_password: "***empty***"
+    jdbc_password: ""
     jdbc_pooling: false
     https_keystore_path: ${databases.presto.https_keystore_path}
     https_keystore_password: ${databases.presto.https_keystore_password}
@@ -80,7 +82,7 @@ databases:
     jdbc_driver_class: ${databases.presto.jdbc_driver_class}
     jdbc_url: ${databases.presto.jdbc_url}
     jdbc_user: charlie
-    jdbc_password: "***empty***"
+    jdbc_password: ""
     jdbc_pooling: false
     https_keystore_path: ${databases.presto.https_keystore_path}
     https_keystore_password: ${databases.presto.https_keystore_password}
@@ -92,7 +94,7 @@ databases:
     jdbc_driver_class: ${databases.presto.jdbc_driver_class}
     jdbc_url: ${databases.presto.jdbc_url}
     jdbc_user: hdfs
-    jdbc_password: "***empty***"
+    jdbc_password: ""
     jdbc_pooling: false
     https_keystore_path: ${databases.presto.https_keystore_path}
     https_keystore_password: ${databases.presto.https_keystore_password}
@@ -104,7 +106,7 @@ databases:
     jdbc_driver_class: ${databases.presto.jdbc_driver_class}
     jdbc_url: ${databases.presto.jdbc_url}
     jdbc_user: CaseSensitiveUserName
-    jdbc_password: "***empty***"
+    jdbc_password: ""
     jdbc_pooling: false
     https_keystore_path: ${databases.presto.https_keystore_path}
     https_keystore_password: ${databases.presto.https_keystore_password}
@@ -132,6 +134,9 @@ databases:
     default_schema: test
     skip_create_schema: false
     table_manager_type: cassandra
+    basic:
+      request:
+        timeout_seconds: 30
 
   sqlserver:
     jdbc_driver_class: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -166,6 +171,7 @@ databases:
 
   delta:
       jdbc_driver_class: org.apache.hive.jdbc.HiveDriver
+      jdbc_jar: /docker/jdbc/hive-jdbc.jar
       schema: default
       prepare_statement:
           - USE ${databases.delta.schema}
diff --git a/testing/trino-server-dev/etc/catalog/tpch.properties b/testing/trino-server-dev/etc/catalog/tpch.properties
index 84ad37e11186..2d5766018b7f 100644
--- a/testing/trino-server-dev/etc/catalog/tpch.properties
+++ b/testing/trino-server-dev/etc/catalog/tpch.properties
@@ -7,3 +7,5 @@
 
 connector.name=tpch
 tpch.splits-per-node=4
+tpch.column-naming=STANDARD
+tpch.double-type-mapping=DECIMAL
diff --git a/testing/trino-server-dev/etc/config.properties b/testing/trino-server-dev/etc/config.properties
index b786657e8d2b..be896f4a2670 100644
--- a/testing/trino-server-dev/etc/config.properties
+++ b/testing/trino-server-dev/etc/config.properties
@@ -46,6 +46,7 @@ plugin.bundles=\
   ../../plugin/trino-mysql/pom.xml,\
   ../../plugin/trino-mariadb/pom.xml,\
   ../../plugin/trino-singlestore/pom.xml,\
+  ../../plugin/trino-snowflake/pom.xml, \
   ../../plugin/trino-sqlserver/pom.xml, \
   ../../plugin/trino-prometheus/pom.xml, \
   ../../plugin/trino-postgresql/pom.xml, \
diff --git a/testing/trino-server-dev/pom.xml b/testing/trino-server-dev/pom.xml
index 3617abf18c8e..d9f4a154ea14 100644
--- a/testing/trino-server-dev/pom.xml
+++ b/testing/trino-server-dev/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-server-dev</artifactId>
-    <name>trino-server-dev</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,13 +17,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
@@ -38,23 +37,18 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -67,10 +61,22 @@
             <artifactId>aether-api</artifactId>
         </dependency>
 
-        <!-- for testing -->
+        <!-- TODO: move it to airlift -->
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-xml</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/trino-server-dev/src/main/java/io/trino/server/DevelopmentLoaderConfig.java b/testing/trino-server-dev/src/main/java/io/trino/server/DevelopmentLoaderConfig.java
index d5601e3edf5a..d624a9a7b023 100644
--- a/testing/trino-server-dev/src/main/java/io/trino/server/DevelopmentLoaderConfig.java
+++ b/testing/trino-server-dev/src/main/java/io/trino/server/DevelopmentLoaderConfig.java
@@ -17,8 +17,7 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.configuration.Config;
 import io.airlift.resolver.ArtifactResolver;
-
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
diff --git a/testing/trino-server-dev/src/main/java/io/trino/server/DevelopmentPluginsProvider.java b/testing/trino-server-dev/src/main/java/io/trino/server/DevelopmentPluginsProvider.java
index f8a36946c3ce..ccd8c67574b8 100644
--- a/testing/trino-server-dev/src/main/java/io/trino/server/DevelopmentPluginsProvider.java
+++ b/testing/trino-server-dev/src/main/java/io/trino/server/DevelopmentPluginsProvider.java
@@ -15,13 +15,12 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Ordering;
+import com.google.inject.Inject;
 import io.airlift.resolver.ArtifactResolver;
 import io.airlift.resolver.DefaultArtifact;
 import io.trino.server.PluginManager.PluginsProvider;
 import org.sonatype.aether.artifact.Artifact;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/testing/trino-server-dev/src/test/java/io/trino/server/TestDevelopmentLoaderConfig.java b/testing/trino-server-dev/src/test/java/io/trino/server/TestDevelopmentLoaderConfig.java
index 6b7f6ff9b323..176d095e1ced 100644
--- a/testing/trino-server-dev/src/test/java/io/trino/server/TestDevelopmentLoaderConfig.java
+++ b/testing/trino-server-dev/src/test/java/io/trino/server/TestDevelopmentLoaderConfig.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.resolver.ArtifactResolver;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
diff --git a/testing/trino-test-jdbc-compatibility-old-driver/bin/run_tests.sh b/testing/trino-test-jdbc-compatibility-old-driver/bin/run_tests.sh
index 264ff9a62f6e..ae0607e7b39b 100755
--- a/testing/trino-test-jdbc-compatibility-old-driver/bin/run_tests.sh
+++ b/testing/trino-test-jdbc-compatibility-old-driver/bin/run_tests.sh
@@ -12,21 +12,14 @@ current_version=$(${maven} help:evaluate -Dexpression=project.version -q -Dforce
 previous_released_version=$((${current_version%-SNAPSHOT}-1))
 first_tested_version=352
 # test n-th version only
-version_step=7
+version_step=$(( (previous_released_version - first_tested_version) / 7 ))
 
 echo "Current version: ${current_version}"
-
-if (( previous_released_version == 404 )); then
-    # 404 was skipped
-    previous_released_version=403
-fi
-
-(( previous_released_version >= first_tested_version )) || exit 0
-
 echo "Testing every ${version_step}. version between ${first_tested_version} and ${previous_released_version}"
 
 # 404 was skipped
-tested_versions=$(seq "${first_tested_version}" ${version_step} "${previous_released_version}" | grep -vx 404)
+# 422-424 depend on the incompatible version of the open-telemetry semantic conventions used while invoking tests
+tested_versions=$(seq "${first_tested_version}" ${version_step} "${previous_released_version}" | grep -vx '404\|42[234]')
 
 if (( (previous_released_version - first_tested_version) % version_step != 0 )); then
     tested_versions="${tested_versions} ${previous_released_version}"
diff --git a/testing/trino-test-jdbc-compatibility-old-driver/pom.xml b/testing/trino-test-jdbc-compatibility-old-driver/pom.xml
index 1aa98ed58e65..8a6e310f8d79 100644
--- a/testing/trino-test-jdbc-compatibility-old-driver/pom.xml
+++ b/testing/trino-test-jdbc-compatibility-old-driver/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -14,58 +14,65 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <dep.presto-jdbc-under-test>413-SNAPSHOT</dep.presto-jdbc-under-test>
+        <!-- Version needs to be hardcoded for the release plugin to work. It will be updated by the release plugin. -->
+        <dep.presto-jdbc-under-test>432-SNAPSHOT</dep.presto-jdbc-under-test>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-jdbc</artifactId>
-            <version>${dep.presto-jdbc-under-test}</version>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-jdbc</artifactId>
-            <type>test-jar</type>
-            <version>${dep.presto-jdbc-under-test}</version>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-mongodb</artifactId>
+            <artifactId>trino-jdbc</artifactId>
+            <version>${dep.presto-jdbc-under-test}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-jdbc</artifactId>
+            <version>${dep.presto-jdbc-under-test}</version>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-mongodb</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/testing/trino-test-jdbc-compatibility-old-server/pom.xml b/testing/trino-test-jdbc-compatibility-old-server/pom.xml
index 6d41c841414a..4e64517e65d0 100644
--- a/testing/trino-test-jdbc-compatibility-old-server/pom.xml
+++ b/testing/trino-test-jdbc-compatibility-old-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -18,58 +18,64 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-jdbc</artifactId>
+            <groupId>com.github.docker-java</groupId>
+            <artifactId>docker-java-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-jdbc</artifactId>
-            <type>test-jar</type>
-            <version>${project.version}</version>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-mongodb</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log-manager</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
+            <artifactId>trino-jdbc</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-jdbc</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log-manager</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-mongodb</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -101,15 +107,15 @@
     <build>
         <resources>
             <resource>
-                <directory>src/main/resources</directory>
                 <filtering>true</filtering>
+                <directory>src/main/resources</directory>
                 <includes>
                     <include>trino-test-jdbc-compatibility-old-server-version.txt</include>
                 </includes>
             </resource>
             <resource>
-                <directory>src/main/resources</directory>
                 <filtering>false</filtering>
+                <directory>src/main/resources</directory>
                 <excludes>
                     <exclude>trino-test-jdbc-compatibility-old-server-version.txt</exclude>
                 </excludes>
diff --git a/testing/trino-test-jdbc-compatibility-old-server/src/test/java/io/trino/TestJdbcResultSetCompatibilityOldServer.java b/testing/trino-test-jdbc-compatibility-old-server/src/test/java/io/trino/TestJdbcResultSetCompatibilityOldServer.java
index 2f32b7a7e3e4..2a851bf0c8ae 100644
--- a/testing/trino-test-jdbc-compatibility-old-server/src/test/java/io/trino/TestJdbcResultSetCompatibilityOldServer.java
+++ b/testing/trino-test-jdbc-compatibility-old-server/src/test/java/io/trino/TestJdbcResultSetCompatibilityOldServer.java
@@ -16,12 +16,14 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Resources;
 import io.trino.jdbc.BaseTestJdbcResultSet;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.TrinoContainer;
 import org.testcontainers.utility.DockerImageName;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Factory;
+import org.testng.annotations.Test;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -41,6 +43,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+@Test(singleThreaded = true)
 public class TestJdbcResultSetCompatibilityOldServer
         extends BaseTestJdbcResultSet
 {
@@ -121,7 +124,10 @@ public void tearDownTrinoContainer()
     {
         if (trinoContainer != null) {
             trinoContainer.stop();
+            String imageName = trinoContainer.getDockerImageName();
             trinoContainer = null;
+
+            removeDockerImage(imageName);
         }
     }
 
@@ -150,4 +156,9 @@ protected String getTestedTrinoVersion()
     {
         return testedTrinoVersion.orElseThrow(() -> new IllegalStateException("Trino version not set"));
     }
+
+    private static void removeDockerImage(String imageName)
+    {
+        DockerClientFactory.lazyClient().removeImageCmd(imageName).exec();
+    }
 }
diff --git a/testing/trino-testing-containers/pom.xml b/testing/trino-testing-containers/pom.xml
index e7c4b05c9d22..776141bbce2f 100644
--- a/testing/trino-testing-containers/pom.xml
+++ b/testing/trino-testing-containers/pom.xml
@@ -5,28 +5,17 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-testing-containers</artifactId>
-    <name>trino-testing-containers</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.github.docker-java</groupId>
             <artifactId>docker-java-api</artifactId>
@@ -42,6 +31,16 @@
             <artifactId>failsafe</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
@@ -58,8 +57,8 @@
         </dependency>
 
         <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
         </dependency>
 
         <dependency>
@@ -74,8 +73,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/BaseTestContainer.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/BaseTestContainer.java
index 49a42fff6557..86e3bd4550b5 100644
--- a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/BaseTestContainer.java
+++ b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/BaseTestContainer.java
@@ -13,6 +13,7 @@
  */
 package io.trino.testing.containers;
 
+import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.HostAndPort;
@@ -20,6 +21,7 @@
 import dev.failsafe.RetryPolicy;
 import io.airlift.log.Logger;
 import io.trino.testing.ResourcePresence;
+import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
@@ -113,6 +115,16 @@ protected void copyResourceToContainer(String resourcePath, String dockerPath)
                 dockerPath);
     }
 
+    protected void mountDirectory(String hostPath, String dockerPath)
+    {
+        container.addFileSystemBind(hostPath, dockerPath, BindMode.READ_WRITE);
+    }
+
+    protected void withCreateContainerModifier(Consumer<CreateContainerCmd> modifier)
+    {
+        container.withCreateContainerCmdModifier(modifier);
+    }
+
     protected HostAndPort getMappedHostAndPortForExposedPort(int exposedPort)
     {
         return fromParts(container.getHost(), container.getMappedPort(exposedPort));
diff --git a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/ConditionalPullPolicy.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/ConditionalPullPolicy.java
index 5aebfd692c23..058cc9373776 100644
--- a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/ConditionalPullPolicy.java
+++ b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/ConditionalPullPolicy.java
@@ -22,7 +22,7 @@
 public class ConditionalPullPolicy
         implements ImagePullPolicy
 {
-    private static final boolean TESTCONTAINERS_NEVER_PULL = "true".equalsIgnoreCase(getenv("TESTCONTAINERS_NEVER_PULL"));
+    public static final boolean TESTCONTAINERS_NEVER_PULL = "true".equalsIgnoreCase(getenv("TESTCONTAINERS_NEVER_PULL"));
     private static final ImagePullPolicy defaultPolicy = PullPolicy.defaultPolicy();
 
     @Override
diff --git a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/Minio.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/Minio.java
index 6948b149517e..624d7c5f9ac4 100644
--- a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/Minio.java
+++ b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/Minio.java
@@ -41,7 +41,7 @@ public class Minio
 {
     private static final Logger log = Logger.get(Minio.class);
 
-    public static final String DEFAULT_IMAGE = "minio/minio:RELEASE.2022-10-05T14-58-27Z";
+    public static final String DEFAULT_IMAGE = "minio/minio:RELEASE.2023-05-18T00-05-36Z";
     public static final String DEFAULT_HOST_NAME = "minio";
 
     public static final int MINIO_API_PORT = 4566;
@@ -50,6 +50,7 @@ public class Minio
     // defaults
     public static final String MINIO_ACCESS_KEY = "accesskey";
     public static final String MINIO_SECRET_KEY = "secretkey";
+    public static final String MINIO_REGION = "us-east-1";
 
     public static Builder builder()
     {
diff --git a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/MitmProxy.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/MitmProxy.java
new file mode 100644
index 000000000000..284aa5d36205
--- /dev/null
+++ b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/MitmProxy.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed 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 io.trino.testing.containers;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.net.HostAndPort;
+import io.airlift.log.Logger;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.output.OutputFrame;
+
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+public class MitmProxy
+        extends BaseTestContainer
+{
+    private static final Logger log = Logger.get(MitmProxy.class);
+
+    public static final String DEFAULT_IMAGE = "mitmproxy/mitmproxy:9.0.1";
+    public static final String DEFAULT_HOST_NAME = "mitmproxy";
+
+    public static final int MITMPROXY_PORT = 6660;
+
+    public static Builder builder()
+    {
+        return new Builder();
+    }
+
+    private MitmProxy(
+            String image,
+            String hostName,
+            Set<Integer> exposePorts,
+            Map<String, String> filesToMount,
+            Map<String, String> envVars,
+            Optional<Network> network,
+            int retryLimit)
+    {
+        super(
+                image,
+                hostName,
+                exposePorts,
+                filesToMount,
+                envVars,
+                network,
+                retryLimit);
+    }
+
+    @Override
+    protected void setupContainer()
+    {
+        super.setupContainer();
+        withRunCommand(
+                ImmutableList.of(
+                        "mitmdump",
+                        "--listen-port", Integer.toString(MITMPROXY_PORT),
+                        "--certs", "/tmp/cert.pem",
+                        "--set", "proxy_debug=true",
+                        "--set", "stream_large_bodies=0"));
+
+        withLogConsumer(MitmProxy::printProxiedRequest);
+    }
+
+    private static void printProxiedRequest(OutputFrame outputFrame)
+    {
+        String line = outputFrame.getUtf8String().trim();
+        if (!line.startsWith("<<")) {
+            log.info("Proxied " + line);
+        }
+    }
+
+    @Override
+    public void start()
+    {
+        super.start();
+        log.info("Mitm proxy container started with address: " + getProxyEndpoint());
+    }
+
+    public HostAndPort getProxyHostAndPort()
+    {
+        return getMappedHostAndPortForExposedPort(MITMPROXY_PORT);
+    }
+
+    public String getProxyEndpoint()
+    {
+        return "https://" + getProxyHostAndPort();
+    }
+
+    public static class Builder
+            extends BaseTestContainer.Builder<MitmProxy.Builder, MitmProxy>
+    {
+        private Builder()
+        {
+            this.image = DEFAULT_IMAGE;
+            this.hostName = DEFAULT_HOST_NAME;
+            this.exposePorts = ImmutableSet.of(MITMPROXY_PORT);
+            this.envVars = ImmutableMap.of();
+        }
+
+        public Builder withSSLCertificate(Path filename)
+        {
+            return withFilesToMount(Map.of("/tmp/cert.pem", filename.toString()));
+        }
+
+        @Override
+        public MitmProxy build()
+        {
+            return new MitmProxy(image, hostName, exposePorts, filesToMount, envVars, network, startupRetryLimit);
+        }
+    }
+}
diff --git a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/OpenTracingCollector.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/OpenTracingCollector.java
new file mode 100644
index 000000000000..ef8921026d89
--- /dev/null
+++ b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/OpenTracingCollector.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed 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 io.trino.testing.containers;
+
+import io.airlift.units.DataSize;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import static com.google.common.net.UrlEscapers.urlFragmentEscaper;
+import static io.airlift.units.DataSize.Unit.GIGABYTE;
+
+public class OpenTracingCollector
+        extends BaseTestContainer
+{
+    private static final int COLLECTOR_PORT = 4317;
+    private static final int HTTP_PORT = 16686;
+
+    private final Path storageDirectory;
+
+    public OpenTracingCollector()
+    {
+        super(
+                "jaegertracing/all-in-one:latest",
+                "opentracing-collector",
+                Set.of(COLLECTOR_PORT, HTTP_PORT),
+                Map.of(),
+                Map.of(
+                    "COLLECTOR_OTLP_ENABLED", "true",
+                    "SPAN_STORAGE_TYPE", "badger", // KV that stores spans to the disk
+                    "GOMAXPROCS", "2"), // limit number of threads used for goroutines
+                Optional.empty(),
+                1);
+
+        withRunCommand(List.of(
+                "--badger.ephemeral=false",
+                "--badger.span-store-ttl=15m",
+                "--badger.directory-key=/badger/data",
+                "--badger.directory-value=/badger/data",
+                "--badger.maintenance-interval=30s"));
+
+        withCreateContainerModifier(command -> command.getHostConfig()
+                .withMemory(DataSize.of(1, GIGABYTE).toBytes()));
+
+        try {
+            this.storageDirectory = Files.createTempDirectory("tracing-collector");
+            mountDirectory(storageDirectory.toString(), "/badger");
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @Override
+    public void close()
+    {
+        super.close();
+        try (Stream<File> files = Files.walk(storageDirectory)
+                    .sorted(Comparator.reverseOrder())
+                    .map(Path::toFile)) {
+            files.forEach(File::delete);
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    public URI getExporterEndpoint()
+    {
+        return URI.create("http://" + getMappedHostAndPortForExposedPort(COLLECTOR_PORT));
+    }
+
+    public URI searchForQueryId(String queryId)
+    {
+        String query = "{\"trino.query_id\": \"%s\"}".formatted(queryId);
+        return URI.create("http://%s/search?operation=query&service=trino&tags=%s".formatted(getMappedHostAndPortForExposedPort(HTTP_PORT), urlFragmentEscaper().escape(query)));
+    }
+}
diff --git a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/PlatformChecks.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/PlatformChecks.java
deleted file mode 100644
index 770a4b7a87ba..000000000000
--- a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/PlatformChecks.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed 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 io.trino.testing.containers;
-
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.PullImageResultCallback;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.PullResponseItem;
-import org.testcontainers.DockerClientFactory;
-import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.ImageNameSubstitutor;
-
-import static com.google.common.base.Strings.padEnd;
-import static com.sun.jna.Platform.isARM;
-import static java.lang.System.exit;
-import static java.lang.System.getenv;
-import static java.util.Locale.ENGLISH;
-
-public class PlatformChecks
-        extends ImageNameSubstitutor
-{
-    private static final boolean TESTCONTAINERS_SKIP_ARCH_CHECK = "true".equalsIgnoreCase(getenv("TESTCONTAINERS_SKIP_ARCHITECTURE_CHECK"));
-
-    @Override
-    public DockerImageName apply(DockerImageName dockerImageName)
-    {
-        if (TESTCONTAINERS_SKIP_ARCH_CHECK) {
-            return dockerImageName;
-        }
-
-        DockerClient client = DockerClientFactory.lazyClient();
-        if (!imageExists(client, dockerImageName)) {
-            pullImage(client, dockerImageName);
-        }
-
-        String imageArch = getImageArch(client, dockerImageName);
-
-        boolean isJavaOnArm = isARM();
-        boolean isImageArmBased = imageArch.contains("arm");
-        boolean hasIncompatibleRuntime = (isJavaOnArm != isImageArmBased);
-
-        if (hasIncompatibleRuntime) {
-            String dockerArch = client.versionCmd().exec().getArch();
-
-            System.err.println("""
-
-                    !!! ERROR !!!
-                    Detected incompatible Docker image and host architectures. The performance of running docker images in such scenarios can vary or not work at all.
-                    Host: %s (%s).
-                    Docker architecture: %s.
-                    Docker image architecture: %s.
-
-                    Set environment variable TESTCONTAINERS_SKIP_ARCHITECTURE_CHECK=true to skip this check.
-                    !!! ERROR !!!
-                    """.formatted(System.getProperty("os.name"), System.getProperty("os.arch"), dockerArch, imageArch));
-
-            exit(99);
-        }
-
-        return dockerImageName;
-    }
-
-    @Override
-    protected String getDescription()
-    {
-        return "Image substitutor that checks whether the image platform matches host platform";
-    }
-
-    private static boolean imageExists(DockerClient client, DockerImageName imageName)
-    {
-        try {
-            getImageArch(client, imageName);
-            return true;
-        }
-        catch (NotFoundException e) {
-            return false;
-        }
-    }
-
-    private static String getImageArch(DockerClient client, DockerImageName imageName)
-    {
-        return client.inspectImageCmd(imageName.asCanonicalNameString())
-                .exec()
-                .getArch()
-                .toLowerCase(ENGLISH);
-    }
-
-    private static void pullImage(DockerClient client, DockerImageName imageName)
-    {
-        try {
-            client.pullImageCmd(imageName.asCanonicalNameString()).exec(new PullImageResultCallback() {
-                @Override
-                public void onNext(PullResponseItem item)
-                {
-                    String progress = item.getProgress();
-                    if (progress != null) {
-                        System.err.println(padEnd(imageName.asCanonicalNameString() + ":" + item.getId(), 50, ' ') + ' ' + progress);
-                    }
-                }
-            }).awaitCompletion();
-        }
-        catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/PrintingLogConsumer.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/PrintingLogConsumer.java
similarity index 95%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/PrintingLogConsumer.java
rename to testing/trino-testing-containers/src/main/java/io/trino/testing/containers/PrintingLogConsumer.java
index 67a4866f47e4..7ef003707185 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/PrintingLogConsumer.java
+++ b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/PrintingLogConsumer.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.containers;
+package io.trino.testing.containers;
 
 import io.airlift.log.Logger;
 import org.testcontainers.containers.output.BaseConsumer;
@@ -20,7 +20,7 @@
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.containers.output.OutputFrame.OutputType.END;
 
-final class PrintingLogConsumer
+public final class PrintingLogConsumer
         extends BaseConsumer<PrintingLogConsumer>
 {
     private static final Logger log = Logger.get(PrintingLogConsumer.class);
diff --git a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/TestContainers.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/TestContainers.java
index cdbce606315b..03330b35f54c 100644
--- a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/TestContainers.java
+++ b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/TestContainers.java
@@ -14,18 +14,27 @@
 
 package io.trino.testing.containers;
 
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.PullImageResultCallback;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.PullResponseItem;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.io.Closeable;
 
 import static com.github.dockerjava.api.model.Ports.Binding.bindPort;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Strings.padEnd;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.testing.containers.ConditionalPullPolicy.TESTCONTAINERS_NEVER_PULL;
 import static java.lang.Boolean.parseBoolean;
 import static java.lang.System.getenv;
+import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.utility.MountableFile.forClasspathResource;
 
@@ -74,4 +83,72 @@ public static void exposeFixedPorts(GenericContainer<?> container)
                                 .map(exposedPort -> new PortBinding(bindPort(exposedPort), new ExposedPort(exposedPort)))
                                 .collect(toImmutableList()))));
     }
+
+    public static DockerArchitectureInfo getDockerArchitectureInfo(DockerImageName imageName)
+    {
+        checkState(!TESTCONTAINERS_NEVER_PULL, "Cannot get arch for image %s without pulling it, and pulling is forbidden", imageName);
+        DockerClient client = DockerClientFactory.lazyClient();
+        if (!imageExists(client, imageName)) {
+            pullImage(client, imageName);
+        }
+        return new DockerArchitectureInfo(DockerArchitecture.fromString(client.versionCmd().exec().getArch()), DockerArchitecture.fromString(getImageArch(client, imageName)));
+    }
+
+    private static String getImageArch(DockerClient client, DockerImageName imageName)
+    {
+        return client.inspectImageCmd(imageName.asCanonicalNameString())
+                .exec()
+                .getArch()
+                .toLowerCase(ENGLISH);
+    }
+
+    private static boolean imageExists(DockerClient client, DockerImageName imageName)
+    {
+        try {
+            getImageArch(client, imageName);
+            return true;
+        }
+        catch (NotFoundException e) {
+            return false;
+        }
+    }
+
+    private static void pullImage(DockerClient client, DockerImageName imageName)
+    {
+        try {
+            client.pullImageCmd(imageName.asCanonicalNameString()).exec(new PullImageResultCallback() {
+                @Override
+                public void onNext(PullResponseItem item)
+                {
+                    String progress = item.getProgress();
+                    if (progress != null) {
+                        System.err.println(padEnd(imageName.asCanonicalNameString() + ":" + item.getId(), 50, ' ') + ' ' + progress);
+                    }
+                }
+            }).awaitCompletion();
+        }
+        catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RuntimeException(e);
+        }
+    }
+
+    public record DockerArchitectureInfo(DockerArchitecture hostArch, DockerArchitecture imageArch) {}
+
+    public enum DockerArchitecture
+    {
+        ARM64,
+        AMD64,
+        PPC64;
+
+        public static DockerArchitecture fromString(String value)
+        {
+            return switch (value.toLowerCase(ENGLISH)) {
+                case "linux/arm64", "arm64" -> ARM64;
+                case "linux/amd64", "amd64" -> AMD64;
+                case "ppc64", "ppc64le" -> PPC64;
+                default -> throw new IllegalArgumentException("Unrecognized docker image architecture: " + value);
+            };
+        }
+    }
 }
diff --git a/testing/trino-testing-containers/src/main/resources/testcontainers.properties b/testing/trino-testing-containers/src/main/resources/testcontainers.properties
deleted file mode 100644
index 3c483c1c5e95..000000000000
--- a/testing/trino-testing-containers/src/main/resources/testcontainers.properties
+++ /dev/null
@@ -1 +0,0 @@
-image.substitutor=io.trino.testing.containers.PlatformChecks
diff --git a/testing/trino-testing-containers/src/test/java/io/trino/server/TestDummy.java b/testing/trino-testing-containers/src/test/java/io/trino/server/TestDummy.java
index dea00f6fd596..b560df431cb6 100644
--- a/testing/trino-testing-containers/src/test/java/io/trino/server/TestDummy.java
+++ b/testing/trino-testing-containers/src/test/java/io/trino/server/TestDummy.java
@@ -13,7 +13,7 @@
  */
 package io.trino.server;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestDummy
 {
diff --git a/testing/trino-testing-kafka/pom.xml b/testing/trino-testing-kafka/pom.xml
index 288d375f33ea..3071ae69fa24 100644
--- a/testing/trino-testing-kafka/pom.xml
+++ b/testing/trino-testing-kafka/pom.xml
@@ -5,28 +5,17 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-testing-kafka</artifactId>
-    <name>trino-testing-kafka</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -47,6 +36,16 @@
             <artifactId>failsafe</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
@@ -69,8 +68,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/trino-testing-kafka/src/test/java/io/trino/server/TestDummy.java b/testing/trino-testing-kafka/src/test/java/io/trino/server/TestDummy.java
index dea00f6fd596..b560df431cb6 100644
--- a/testing/trino-testing-kafka/src/test/java/io/trino/server/TestDummy.java
+++ b/testing/trino-testing-kafka/src/test/java/io/trino/server/TestDummy.java
@@ -13,7 +13,7 @@
  */
 package io.trino.server;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestDummy
 {
diff --git a/testing/trino-testing-resources/pom.xml b/testing/trino-testing-resources/pom.xml
index c26c09d42e09..802b4cd540a6 100644
--- a/testing/trino-testing-resources/pom.xml
+++ b/testing/trino-testing-resources/pom.xml
@@ -5,21 +5,26 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-testing-resources</artifactId>
-    <name>trino-testing-resources</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000000.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000000.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000000.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000000.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000001.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000001.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000001.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000001.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000002.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000002.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000002.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000002.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000003.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000003.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000003.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000003.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000004.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000004.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000004.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000004.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000005.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000005.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000005.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000005.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000006.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000006.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000006.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000006.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000007.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000007.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000007.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000007.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000008.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000008.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000008.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000008.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000009.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000009.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000009.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000009.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000010.checkpoint.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000010.checkpoint.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000010.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000010.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000010.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000010.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000011.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000011.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000011.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000011.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000012.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000012.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000012.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000012.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000013.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000013.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000013.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000013.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000014.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000014.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000014.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000014.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000015.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000015.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000015.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000015.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000016.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000016.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000016.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000016.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000017.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000017.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000017.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000017.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000018.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000018.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000018.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000018.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000019.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000019.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000019.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000019.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000020.checkpoint.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000020.checkpoint.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000020.checkpoint.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000020.checkpoint.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000020.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000020.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/00000000000000000020.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/00000000000000000020.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/_last_checkpoint b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/_last_checkpoint
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/_delta_log/_last_checkpoint
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/_delta_log/_last_checkpoint
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/part-00000-81626978-0b68-49fe-8ce7-0869145ad4fe-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/part-00000-81626978-0b68-49fe-8ce7-0869145ad4fe-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/customer/part-00000-81626978-0b68-49fe-8ce7-0869145ad4fe-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/customer/part-00000-81626978-0b68-49fe-8ce7-0869145ad4fe-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000000.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000000.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000000.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000000.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000001.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000001.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000001.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000001.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000002.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000002.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000002.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000002.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000003.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000003.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000003.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000003.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000004.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000004.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000004.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000004.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000005.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000005.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000005.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000005.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000006.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000006.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000006.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000006.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000007.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000007.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000007.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000007.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000008.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000008.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000008.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000008.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000009.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000009.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000009.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000009.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000010.checkpoint.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000010.checkpoint.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000010.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000010.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000010.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000010.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000011.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000011.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000011.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000011.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000012.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000012.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/00000000000000000012.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/00000000000000000012.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/_last_checkpoint b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/_last_checkpoint
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/_delta_log/_last_checkpoint
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/_delta_log/_last_checkpoint
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00000-aaaccec3-1d98-4fa6-8ad7-4b9100e46b14-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00000-aaaccec3-1d98-4fa6-8ad7-4b9100e46b14-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00000-aaaccec3-1d98-4fa6-8ad7-4b9100e46b14-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00000-aaaccec3-1d98-4fa6-8ad7-4b9100e46b14-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00001-90827a60-5339-4b09-a428-2c3d692736db-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00001-90827a60-5339-4b09-a428-2c3d692736db-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00001-90827a60-5339-4b09-a428-2c3d692736db-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00001-90827a60-5339-4b09-a428-2c3d692736db-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00002-62ca7e3f-2a91-498a-b99e-266e6d720982-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00002-62ca7e3f-2a91-498a-b99e-266e6d720982-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00002-62ca7e3f-2a91-498a-b99e-266e6d720982-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00002-62ca7e3f-2a91-498a-b99e-266e6d720982-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00003-aa429af4-35df-4fff-81b7-2cb7220698f7-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00003-aa429af4-35df-4fff-81b7-2cb7220698f7-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00003-aa429af4-35df-4fff-81b7-2cb7220698f7-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00003-aa429af4-35df-4fff-81b7-2cb7220698f7-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00004-53e7f54a-e774-40cd-9d49-d6f399913ec0-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00004-53e7f54a-e774-40cd-9d49-d6f399913ec0-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00004-53e7f54a-e774-40cd-9d49-d6f399913ec0-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00004-53e7f54a-e774-40cd-9d49-d6f399913ec0-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00005-bc21ce9f-2122-4582-ae11-06bf40a5e5ee-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00005-bc21ce9f-2122-4582-ae11-06bf40a5e5ee-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00005-bc21ce9f-2122-4582-ae11-06bf40a5e5ee-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00005-bc21ce9f-2122-4582-ae11-06bf40a5e5ee-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00006-a7b871e3-1405-46ca-b151-c2df4821642e-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00006-a7b871e3-1405-46ca-b151-c2df4821642e-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00006-a7b871e3-1405-46ca-b151-c2df4821642e-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00006-a7b871e3-1405-46ca-b151-c2df4821642e-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00007-ba2a46c8-01cc-4c86-abfa-0b9149a7e55a-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00007-ba2a46c8-01cc-4c86-abfa-0b9149a7e55a-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00007-ba2a46c8-01cc-4c86-abfa-0b9149a7e55a-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00007-ba2a46c8-01cc-4c86-abfa-0b9149a7e55a-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00008-6e247bff-d0b1-4164-b5de-0f6bf7995dc3-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00008-6e247bff-d0b1-4164-b5de-0f6bf7995dc3-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00008-6e247bff-d0b1-4164-b5de-0f6bf7995dc3-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00008-6e247bff-d0b1-4164-b5de-0f6bf7995dc3-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00009-5aec8cfb-6be5-4560-b0dd-ad89910c3ffd-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00009-5aec8cfb-6be5-4560-b0dd-ad89910c3ffd-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00009-5aec8cfb-6be5-4560-b0dd-ad89910c3ffd-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00009-5aec8cfb-6be5-4560-b0dd-ad89910c3ffd-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00010-155b9899-dcfa-458f-a6a4-fdde6401871b-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00010-155b9899-dcfa-458f-a6a4-fdde6401871b-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00010-155b9899-dcfa-458f-a6a4-fdde6401871b-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00010-155b9899-dcfa-458f-a6a4-fdde6401871b-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00011-ebb931c8-4ae0-4320-a3a4-e4fcd91cef97-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00011-ebb931c8-4ae0-4320-a3a4-e4fcd91cef97-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00011-ebb931c8-4ae0-4320-a3a4-e4fcd91cef97-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00011-ebb931c8-4ae0-4320-a3a4-e4fcd91cef97-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00012-ae4e5f8a-8577-4d73-b38e-ea7421a6f220-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00012-ae4e5f8a-8577-4d73-b38e-ea7421a6f220-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00012-ae4e5f8a-8577-4d73-b38e-ea7421a6f220-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00012-ae4e5f8a-8577-4d73-b38e-ea7421a6f220-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00013-538d6279-0da7-4ef0-82e6-ae14dfbffc7c-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00013-538d6279-0da7-4ef0-82e6-ae14dfbffc7c-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00013-538d6279-0da7-4ef0-82e6-ae14dfbffc7c-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00013-538d6279-0da7-4ef0-82e6-ae14dfbffc7c-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00014-69bc5c81-628e-406d-b2b6-bcc70191f22c-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00014-69bc5c81-628e-406d-b2b6-bcc70191f22c-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00014-69bc5c81-628e-406d-b2b6-bcc70191f22c-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00014-69bc5c81-628e-406d-b2b6-bcc70191f22c-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00015-75c18b70-9f74-4872-8a13-8a97aef1068a-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00015-75c18b70-9f74-4872-8a13-8a97aef1068a-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00015-75c18b70-9f74-4872-8a13-8a97aef1068a-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00015-75c18b70-9f74-4872-8a13-8a97aef1068a-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00016-304ef448-0163-4aa3-bfab-f3aaac90354e-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00016-304ef448-0163-4aa3-bfab-f3aaac90354e-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00016-304ef448-0163-4aa3-bfab-f3aaac90354e-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00016-304ef448-0163-4aa3-bfab-f3aaac90354e-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00017-dd27ce7e-fcde-436b-99c3-a32e53f5b61b-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00017-dd27ce7e-fcde-436b-99c3-a32e53f5b61b-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00017-dd27ce7e-fcde-436b-99c3-a32e53f5b61b-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00017-dd27ce7e-fcde-436b-99c3-a32e53f5b61b-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00018-14a227ec-b0e7-4be5-8144-58faed7450b0-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00018-14a227ec-b0e7-4be5-8144-58faed7450b0-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00018-14a227ec-b0e7-4be5-8144-58faed7450b0-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00018-14a227ec-b0e7-4be5-8144-58faed7450b0-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00019-436b8805-ae66-4eb4-93b1-2fc1f56fc7b5-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00019-436b8805-ae66-4eb4-93b1-2fc1f56fc7b5-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/lineitem/part-00019-436b8805-ae66-4eb4-93b1-2fc1f56fc7b5-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/lineitem/part-00019-436b8805-ae66-4eb4-93b1-2fc1f56fc7b5-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/nation/_delta_log/00000000000000000000.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/nation/_delta_log/00000000000000000000.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/nation/_delta_log/00000000000000000000.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/nation/_delta_log/00000000000000000000.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/nation/part-00000-dd98e67d-30f8-43ed-a4f8-667773604b4f-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/nation/part-00000-dd98e67d-30f8-43ed-a4f8-667773604b4f-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/nation/part-00000-dd98e67d-30f8-43ed-a4f8-667773604b4f-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/nation/part-00000-dd98e67d-30f8-43ed-a4f8-667773604b4f-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000000.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000000.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000000.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000000.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000001.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000001.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000001.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000001.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000002.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000002.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000002.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000002.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000003.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000003.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000003.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000003.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000004.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000004.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000004.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000004.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000005.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000005.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000005.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000005.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000006.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000006.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000006.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000006.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000007.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000007.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000007.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000007.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000008.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000008.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000008.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000008.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000009.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000009.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000009.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000009.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000010.checkpoint.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000010.checkpoint.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000010.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000010.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000010.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000010.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000011.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000011.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000011.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000011.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000012.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000012.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000012.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000012.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000013.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000013.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000013.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000013.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000014.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000014.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000014.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000014.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000015.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000015.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000015.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000015.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000016.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000016.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/00000000000000000016.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/00000000000000000016.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/_last_checkpoint b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/_last_checkpoint
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/_delta_log/_last_checkpoint
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/_delta_log/_last_checkpoint
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/part-00000-05c5c5a6-fbe6-4912-b1b0-a4141d85203e-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/part-00000-05c5c5a6-fbe6-4912-b1b0-a4141d85203e-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/orders/part-00000-05c5c5a6-fbe6-4912-b1b0-a4141d85203e-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/orders/part-00000-05c5c5a6-fbe6-4912-b1b0-a4141d85203e-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000000.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000000.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000000.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000000.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000001.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000001.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000001.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000001.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000002.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000002.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000002.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000002.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000003.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000003.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000003.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000003.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000004.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000004.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000004.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000004.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000005.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000005.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000005.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000005.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000006.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000006.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000006.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000006.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000007.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000007.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000007.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000007.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000008.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000008.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000008.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000008.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000009.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000009.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000009.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000009.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000010.checkpoint.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000010.checkpoint.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000010.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000010.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000010.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000010.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000011.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000011.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000011.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000011.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000012.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000012.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000012.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000012.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000013.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000013.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000013.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000013.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000014.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000014.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000014.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000014.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000015.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000015.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000015.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000015.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000016.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000016.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000016.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000016.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000017.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000017.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000017.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000017.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000018.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000018.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000018.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000018.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000019.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000019.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000019.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000019.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000020.checkpoint.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000020.checkpoint.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000020.checkpoint.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000020.checkpoint.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000020.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000020.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000020.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000020.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000021.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000021.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000021.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000021.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000022.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000022.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000022.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000022.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000023.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000023.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000023.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000023.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000024.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000024.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/00000000000000000024.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/00000000000000000024.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/_last_checkpoint b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/_last_checkpoint
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/_delta_log/_last_checkpoint
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/_delta_log/_last_checkpoint
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/part-00000-785b7594-4202-4ccd-a8f3-d54fea18991b-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/part-00000-785b7594-4202-4ccd-a8f3-d54fea18991b-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/part/part-00000-785b7594-4202-4ccd-a8f3-d54fea18991b-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/part/part-00000-785b7594-4202-4ccd-a8f3-d54fea18991b-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000000.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000000.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000000.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000000.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000001.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000001.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000001.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000001.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000002.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000002.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000002.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000002.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000003.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000003.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000003.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000003.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000004.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000004.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000004.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000004.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000005.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000005.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000005.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000005.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000006.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000006.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000006.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000006.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000007.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000007.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000007.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000007.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000008.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000008.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000008.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000008.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000009.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000009.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000009.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000009.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000010.checkpoint.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000010.checkpoint.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000010.checkpoint.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000010.checkpoint.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000010.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000010.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000010.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000010.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000011.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000011.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000011.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000011.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000012.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000012.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000012.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000012.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000013.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000013.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000013.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000013.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000014.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000014.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000014.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000014.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000015.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000015.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000015.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000015.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000016.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000016.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000016.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000016.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000017.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000017.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000017.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000017.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000018.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000018.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000018.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000018.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000019.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000019.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000019.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000019.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000020.checkpoint.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000020.checkpoint.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000020.checkpoint.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000020.checkpoint.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000020.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000020.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000020.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000020.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000021.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000021.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000021.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000021.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000022.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000022.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000022.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000022.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000023.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000023.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000023.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000023.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000024.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000024.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/00000000000000000024.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/00000000000000000024.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/_last_checkpoint b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/_last_checkpoint
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/_delta_log/_last_checkpoint
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/_delta_log/_last_checkpoint
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/part-00000-ddc6c400-a412-4d79-a5ed-e319e98d33ba-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/part-00000-ddc6c400-a412-4d79-a5ed-e319e98d33ba-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/partsupp/part-00000-ddc6c400-a412-4d79-a5ed-e319e98d33ba-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/partsupp/part-00000-ddc6c400-a412-4d79-a5ed-e319e98d33ba-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/region/_delta_log/.s3-optimization-1 b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/region/_delta_log/.s3-optimization-0
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/region/_delta_log/.s3-optimization-1
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/region/_delta_log/.s3-optimization-0
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/region/_delta_log/.s3-optimization-2 b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/region/_delta_log/.s3-optimization-1
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/region/_delta_log/.s3-optimization-2
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/region/_delta_log/.s3-optimization-1
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/region/_delta_log/.s3-optimization-2 b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/region/_delta_log/.s3-optimization-2
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/region/_delta_log/00000000000000000000.crc b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/region/_delta_log/00000000000000000000.crc
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/region/_delta_log/00000000000000000000.crc
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/region/_delta_log/00000000000000000000.crc
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/region/_delta_log/00000000000000000000.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/region/_delta_log/00000000000000000000.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/region/_delta_log/00000000000000000000.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/region/_delta_log/00000000000000000000.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/region/part-00000-98195ace-e492-4cd7-97d1-9b955202874b-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/region/part-00000-98195ace-e492-4cd7-97d1-9b955202874b-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/region/part-00000-98195ace-e492-4cd7-97d1-9b955202874b-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/region/part-00000-98195ace-e492-4cd7-97d1-9b955202874b-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/supplier/_delta_log/00000000000000000000.json b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/supplier/_delta_log/00000000000000000000.json
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/supplier/_delta_log/00000000000000000000.json
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/supplier/_delta_log/00000000000000000000.json
diff --git a/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/supplier/part-00000-e22ef4cc-5ebf-41ef-a87f-6cb7d56de633-c000.snappy.parquet b/testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/supplier/part-00000-e22ef4cc-5ebf-41ef-a87f-6cb7d56de633-c000.snappy.parquet
similarity index 100%
rename from testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks/supplier/part-00000-e22ef4cc-5ebf-41ef-a87f-6cb7d56de633-c000.snappy.parquet
rename to testing/trino-testing-resources/src/main/resources/io/trino/plugin/deltalake/testing/resources/databricks73/supplier/part-00000-e22ef4cc-5ebf-41ef-a87f-6cb7d56de633-c000.snappy.parquet
diff --git a/testing/trino-testing-resources/src/test/java/io/trino/testing/resources/TestDummy.java b/testing/trino-testing-resources/src/test/java/io/trino/testing/resources/TestDummy.java
index 4abc29842741..572eb22c42e4 100644
--- a/testing/trino-testing-resources/src/test/java/io/trino/testing/resources/TestDummy.java
+++ b/testing/trino-testing-resources/src/test/java/io/trino/testing/resources/TestDummy.java
@@ -13,7 +13,7 @@
  */
 package io.trino.testing.resources;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestDummy
 {
diff --git a/testing/trino-testing-services/pom.xml b/testing/trino-testing-services/pom.xml
index b012cd0311b5..998ed95cb34a 100644
--- a/testing/trino-testing-services/pom.xml
+++ b/testing/trino-testing-services/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-testing-services</artifactId>
-    <name>trino-testing-services</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,34 +17,34 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
+            <artifactId>concurrent</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
-            <optional>true</optional>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -83,15 +82,15 @@
     <build>
         <resources>
             <resource>
-                <directory>src/main/resources</directory>
                 <filtering>true</filtering>
+                <directory>src/main/resources</directory>
                 <includes>
                     <include>trino-testing.properties</include>
                 </includes>
             </resource>
             <resource>
-                <directory>src/main/resources</directory>
                 <filtering>false</filtering>
+                <directory>src/main/resources</directory>
                 <excludes>
                     <exclude>trino-testing.properties</exclude>
                 </excludes>
diff --git a/testing/trino-testing-services/src/main/java/io/trino/testing/SharedResource.java b/testing/trino-testing-services/src/main/java/io/trino/testing/SharedResource.java
index d3e272442105..2a98d55f78fc 100644
--- a/testing/trino-testing-services/src/main/java/io/trino/testing/SharedResource.java
+++ b/testing/trino-testing-services/src/main/java/io/trino/testing/SharedResource.java
@@ -13,9 +13,9 @@
  */
 package io.trino.testing;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
+import jakarta.annotation.Nullable;
 
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
diff --git a/testing/trino-testing-services/src/main/java/io/trino/testng/services/FlakyTestRetryAnalyzer.java b/testing/trino-testing-services/src/main/java/io/trino/testng/services/FlakyTestRetryAnalyzer.java
index be8269c8fd2f..849403bea407 100644
--- a/testing/trino-testing-services/src/main/java/io/trino/testng/services/FlakyTestRetryAnalyzer.java
+++ b/testing/trino-testing-services/src/main/java/io/trino/testng/services/FlakyTestRetryAnalyzer.java
@@ -15,13 +15,12 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import org.testng.IRetryAnalyzer;
 import org.testng.ITestNGMethod;
 import org.testng.ITestResult;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/testing/trino-testing-services/src/main/java/io/trino/testng/services/LogTestDurationListener.java b/testing/trino-testing-services/src/main/java/io/trino/testng/services/LogTestDurationListener.java
index 03c7c4627a16..f5e0e4d726b7 100644
--- a/testing/trino-testing-services/src/main/java/io/trino/testng/services/LogTestDurationListener.java
+++ b/testing/trino-testing-services/src/main/java/io/trino/testng/services/LogTestDurationListener.java
@@ -14,6 +14,7 @@
 package io.trino.testng.services;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.trino.jvm.Threads;
@@ -24,8 +25,6 @@
 import org.testng.ITestClass;
 import org.testng.ITestResult;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/testing/trino-testing-services/src/main/java/io/trino/testng/services/ManageTestResources.java b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ManageTestResources.java
index 3b3046f54f57..cc87125d3e8a 100644
--- a/testing/trino-testing-services/src/main/java/io/trino/testng/services/ManageTestResources.java
+++ b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ManageTestResources.java
@@ -41,6 +41,7 @@
 import static io.trino.testng.services.Listeners.reportListenerFailure;
 import static io.trino.testng.services.ManageTestResources.Stage.AFTER_CLASS;
 import static io.trino.testng.services.ManageTestResources.Stage.BEFORE_CLASS;
+import static java.lang.System.getenv;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -88,7 +89,10 @@ private static boolean isEnabled()
         if (System.getProperty("ManageTestResources.enabled") != null) {
             return Boolean.getBoolean("ManageTestResources.enabled");
         }
-        if (System.getenv("DISABLE_REPORT_RESOURCE_HUNGRY_TESTS_CHECK") != null) {
+        if (getenv("DISABLE_REPORT_RESOURCE_HUNGRY_TESTS_CHECK") != null) {
+            return false;
+        }
+        if (getenv("TESTCONTAINERS_REUSE_ENABLE") != null) {
             return false;
         }
         return true;
diff --git a/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportAfterMethodNotAlwaysRun.java b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportAfterMethodNotAlwaysRun.java
index 93d3e534f883..0443fe6c68b2 100644
--- a/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportAfterMethodNotAlwaysRun.java
+++ b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportAfterMethodNotAlwaysRun.java
@@ -21,7 +21,6 @@
 import org.testng.annotations.AfterGroups;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterSuite;
-import org.testng.annotations.AfterTest;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -42,7 +41,6 @@ public class ReportAfterMethodNotAlwaysRun
         implements IClassListener
 {
     private static final Set<AnnotationPredicate<?>> VIOLATIONS = ImmutableSet.of(
-            new AnnotationPredicate<>(AfterTest.class, not(AfterTest::alwaysRun)),
             new AnnotationPredicate<>(AfterMethod.class, not(AfterMethod::alwaysRun)),
             new AnnotationPredicate<>(AfterClass.class, not(AfterClass::alwaysRun)),
             new AnnotationPredicate<>(AfterSuite.class, not(AfterSuite::alwaysRun)),
diff --git a/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportBadTestAnnotations.java b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportBadTestAnnotations.java
new file mode 100644
index 000000000000..8ee1d334927d
--- /dev/null
+++ b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportBadTestAnnotations.java
@@ -0,0 +1,223 @@
+/*
+ * Licensed 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 io.trino.testng.services;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.testng.IClassListener;
+import org.testng.ITestClass;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.base.Throwables.getStackTraceAsString;
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.testng.services.Listeners.reportListenerFailure;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.util.Objects.deepEquals;
+import static java.util.stream.Collectors.joining;
+
+public class ReportBadTestAnnotations
+        implements IClassListener
+{
+    @Override
+    public void onBeforeClass(ITestClass testClass)
+    {
+        try {
+            reportBadTestAnnotations(testClass);
+        }
+        catch (RuntimeException | Error e) {
+            reportListenerFailure(
+                    ReportBadTestAnnotations.class,
+                    "Failed to process %s: \n%s",
+                    testClass,
+                    getStackTraceAsString(e));
+        }
+    }
+
+    private void reportBadTestAnnotations(ITestClass testClass)
+    {
+        Class<?> realClass = testClass.getRealClass();
+
+        if (realClass.getSuperclass() != null &&
+                "io.trino.tempto.internal.convention.ConventionBasedTestProxyGenerator$ConventionBasedTestProxy".equals(realClass.getSuperclass().getName())) {
+            // Ignore tempto generated convention tests.
+            return;
+        }
+
+        List<Method> unannotatedTestMethods = findUnannotatedTestMethods(realClass);
+        if (!unannotatedTestMethods.isEmpty()) {
+            reportListenerFailure(
+                    ReportBadTestAnnotations.class,
+                    "Test class %s has methods which are public but not explicitly annotated. Are they missing @Test?%s",
+                    realClass.getName(),
+                    unannotatedTestMethods.stream()
+                            .map(Method::toString)
+                            .collect(joining("\n\t\t", "\n\t\t", "")));
+        }
+
+        if (!realClass.isAnnotationPresent(Suppress.class)) {
+            Optional<Class<?>> clazz = classWithMeaninglessTestAnnotation(realClass);
+            if (clazz.isPresent()) {
+                reportListenerFailure(
+                        ReportBadTestAnnotations.class,
+                        "Test class %s (%s) has meaningless class-level @Test annotation. We require each test method be explicitly " +
+                                "annotated, deliberately not leveraging https://testng.org/doc/documentation-main.html#class-level.",
+                        clazz.get().getName(),
+                        realClass.getName());
+            }
+        }
+    }
+
+    @VisibleForTesting
+    static Optional<Class<?>> classWithMeaninglessTestAnnotation(Class<?> realClass)
+    {
+        for (Class<?> clazz = realClass; clazz != null; clazz = clazz.getSuperclass()) {
+            org.testng.annotations.Test testAnnotation = clazz.getAnnotation(org.testng.annotations.Test.class);
+            if (testAnnotation != null && isAllDefaults(testAnnotation)) {
+                return Optional.of(clazz);
+            }
+        }
+        return Optional.empty();
+    }
+
+    private static boolean isAllDefaults(org.testng.annotations.Test annotationInstance)
+    {
+        try {
+            for (Method method : org.testng.annotations.Test.class.getDeclaredMethods()) {
+                if (Modifier.isStatic(method.getModifiers())) {
+                    continue;
+                }
+
+                Object value = method.invoke(annotationInstance);
+                Object defaultValue = method.getDefaultValue();
+                if (!deepEquals(value, defaultValue)) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+        catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @VisibleForTesting
+    static List<Method> findUnannotatedTestMethods(Class<?> realClass)
+    {
+        return Arrays.stream(realClass.getMethods())
+                .filter(method -> method.getDeclaringClass() != Object.class)
+                .filter(method -> !Modifier.isStatic(method.getModifiers()))
+                .filter(method -> !method.isBridge())
+                .filter(method -> !isAllowedPublicMethodInTest(method))
+                .collect(toImmutableList());
+    }
+
+    @Override
+    public void onAfterClass(ITestClass testClass) {}
+
+    /**
+     * Is explicitly annotated as @Test, @BeforeMethod, @DataProvider, or any method that implements Tempto SPI
+     */
+    private static boolean isAllowedPublicMethodInTest(Method method)
+    {
+        if (isTestAnnotated(method)) {
+            return true;
+        }
+
+        if (method.getDeclaringClass() == Object.class) {
+            return true;
+        }
+
+        if (method.getDeclaringClass().isInterface()) {
+            return isTemptoClass(method.getDeclaringClass());
+        }
+
+        for (Class<?> interfaceClass : method.getDeclaringClass().getInterfaces()) {
+            Optional<Method> overridden = getOverridden(method, interfaceClass);
+            if (overridden.isPresent() && isTemptoClass(interfaceClass)) {
+                return true;
+            }
+        }
+
+        return getOverridden(method, method.getDeclaringClass().getSuperclass())
+                .map(ReportBadTestAnnotations::isAllowedPublicMethodInTest)
+                .orElse(false);
+    }
+
+    private static Optional<Method> getOverridden(Method method, Class<?> base)
+    {
+        try {
+            // Simplistic override detection
+            return Optional.of(base.getMethod(method.getName(), method.getParameterTypes()));
+        }
+        catch (NoSuchMethodException ignored) {
+            return Optional.empty();
+        }
+    }
+
+    private static boolean isTestAnnotated(Method method)
+    {
+        return Arrays.stream(method.getAnnotations())
+                .map(Annotation::annotationType)
+                .anyMatch(annotationClass -> {
+                    if (Suppress.class.equals(annotationClass)) {
+                        return true;
+                    }
+                    if ("org.openjdk.jmh.annotations.Benchmark".equals(annotationClass.getName())) {
+                        return true;
+                    }
+                    if (org.testng.annotations.Test.class.getPackage().equals(annotationClass.getPackage())) {
+                        // testng annotation (@Test, @Before*, @DataProvider, etc.)
+                        return true;
+                    }
+                    if (isJUnitAnnotation(annotationClass)) {
+                        // allowed so that we can transition tests gradually to JUnit
+                        return true;
+                    }
+                    if (isTemptoClass(annotationClass)) {
+                        // tempto annotation (@BeforeMethodWithContext, @AfterMethodWithContext)
+                        return true;
+                    }
+                    return false;
+                });
+    }
+
+    private static boolean isJUnitAnnotation(Class<? extends Annotation> clazz)
+    {
+        return clazz.getPackage().getName().startsWith("org.junit.jupiter.");
+    }
+
+    @VisibleForTesting
+    static boolean isTemptoClass(Class<?> aClass)
+    {
+        String temptoPackage = "io.trino.tempto";
+        String aPackage = aClass.getPackage().getName();
+        return aPackage.equals(temptoPackage) || aPackage.startsWith(temptoPackage + ".");
+    }
+
+    @Retention(RUNTIME)
+    @Target({TYPE, METHOD})
+    public @interface Suppress
+    {
+    }
+}
diff --git a/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportIllNamedTest.java b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportIllNamedTest.java
index 5e77fdf27cc2..f639a273c884 100644
--- a/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportIllNamedTest.java
+++ b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportIllNamedTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.base.Throwables.getStackTraceAsString;
 import static io.trino.testng.services.Listeners.reportListenerFailure;
-import static io.trino.testng.services.ReportUnannotatedMethods.isTemptoClass;
+import static io.trino.testng.services.ReportBadTestAnnotations.isTemptoClass;
 
 public class ReportIllNamedTest
         implements IClassListener
diff --git a/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportPrivateMethods.java b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportPrivateMethods.java
index 22949b4557a8..88a0dd18aaff 100644
--- a/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportPrivateMethods.java
+++ b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportPrivateMethods.java
@@ -97,7 +97,7 @@ private static boolean isTestAnnotated(Method method)
                         return true;
                     }
                     if ("io.trino.tempto".equals(annotationClass.getPackage().getName())) {
-                        // tempto annotation (@BeforeTestWithContext, @AfterTestWithContext)
+                        // tempto annotation (@BeforeMethodWithContext, @AfterMethodWithContext)
                         return true;
                     }
                     return false;
diff --git a/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportUnannotatedMethods.java b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportUnannotatedMethods.java
deleted file mode 100644
index ae8719e97684..000000000000
--- a/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportUnannotatedMethods.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Licensed 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 io.trino.testng.services;
-
-import com.google.common.annotations.VisibleForTesting;
-import org.testng.IClassListener;
-import org.testng.ITestClass;
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-import static com.google.common.base.Throwables.getStackTraceAsString;
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.testng.services.Listeners.reportListenerFailure;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.util.stream.Collectors.joining;
-
-public class ReportUnannotatedMethods
-        implements IClassListener
-{
-    @Override
-    public void onBeforeClass(ITestClass testClass)
-    {
-        try {
-            reportUnannotatedTestMethods(testClass);
-        }
-        catch (RuntimeException | Error e) {
-            reportListenerFailure(
-                    ReportUnannotatedMethods.class,
-                    "Failed to process %s: \n%s",
-                    testClass,
-                    getStackTraceAsString(e));
-        }
-    }
-
-    private void reportUnannotatedTestMethods(ITestClass testClass)
-    {
-        Class<?> realClass = testClass.getRealClass();
-
-        if (realClass.getSuperclass() != null &&
-                "io.trino.tempto.internal.convention.ConventionBasedTestProxyGenerator$ConventionBasedTestProxy".equals(realClass.getSuperclass().getName())) {
-            // Ignore tempto generated convention tests.
-            return;
-        }
-
-        List<Method> unannotatedTestMethods = findUnannotatedTestMethods(realClass);
-        if (!unannotatedTestMethods.isEmpty()) {
-            reportListenerFailure(
-                    ReportUnannotatedMethods.class,
-                    "Test class %s has methods which are public but not explicitly annotated. Are they missing @Test?%s",
-                    realClass.getName(),
-                    unannotatedTestMethods.stream()
-                            .map(Method::toString)
-                            .collect(joining("\n\t\t", "\n\t\t", "")));
-        }
-    }
-
-    @VisibleForTesting
-    static List<Method> findUnannotatedTestMethods(Class<?> realClass)
-    {
-        return Arrays.stream(realClass.getMethods())
-                .filter(method -> method.getDeclaringClass() != Object.class)
-                .filter(method -> !Modifier.isStatic(method.getModifiers()))
-                .filter(method -> !method.isBridge())
-                .filter(method -> !isAllowedPublicMethodInTest(method))
-                .collect(toImmutableList());
-    }
-
-    @Override
-    public void onAfterClass(ITestClass testClass) {}
-
-    /**
-     * Is explicitly annotated as @Test, @BeforeMethod, @DataProvider, or any method that implements Tempto SPI
-     */
-    private static boolean isAllowedPublicMethodInTest(Method method)
-    {
-        if (isTestAnnotated(method)) {
-            return true;
-        }
-
-        if (method.getDeclaringClass() == Object.class) {
-            return true;
-        }
-
-        if (method.getDeclaringClass().isInterface()) {
-            return isTemptoClass(method.getDeclaringClass());
-        }
-
-        for (Class<?> interfaceClass : method.getDeclaringClass().getInterfaces()) {
-            Optional<Method> overridden = getOverridden(method, interfaceClass);
-            if (overridden.isPresent() && isTemptoClass(interfaceClass)) {
-                return true;
-            }
-        }
-
-        return getOverridden(method, method.getDeclaringClass().getSuperclass())
-                .map(ReportUnannotatedMethods::isAllowedPublicMethodInTest)
-                .orElse(false);
-    }
-
-    private static Optional<Method> getOverridden(Method method, Class<?> base)
-    {
-        try {
-            // Simplistic override detection
-            return Optional.of(base.getMethod(method.getName(), method.getParameterTypes()));
-        }
-        catch (NoSuchMethodException ignored) {
-            return Optional.empty();
-        }
-    }
-
-    private static boolean isTestAnnotated(Method method)
-    {
-        return Arrays.stream(method.getAnnotations())
-                .map(Annotation::annotationType)
-                .anyMatch(annotationClass -> {
-                    if (Suppress.class.equals(annotationClass)) {
-                        return true;
-                    }
-                    if ("org.openjdk.jmh.annotations.Benchmark".equals(annotationClass.getName())) {
-                        return true;
-                    }
-                    if (org.testng.annotations.Test.class.getPackage().equals(annotationClass.getPackage())) {
-                        // testng annotation (@Test, @Before*, @DataProvider, etc.)
-                        return true;
-                    }
-                    if (isTemptoClass(annotationClass)) {
-                        // tempto annotation (@BeforeTestWithContext, @AfterTestWithContext)
-                        return true;
-                    }
-                    return false;
-                });
-    }
-
-    @VisibleForTesting
-    static boolean isTemptoClass(Class<?> aClass)
-    {
-        String temptoPackage = "io.trino.tempto";
-        String aPackage = aClass.getPackage().getName();
-        return aPackage.equals(temptoPackage) || aPackage.startsWith(temptoPackage + ".");
-    }
-
-    @Retention(RUNTIME)
-    @Target(METHOD)
-    public @interface Suppress
-    {
-    }
-}
diff --git a/testing/trino-testing-services/src/main/resources/META-INF/services/org.testng.ITestNGListener b/testing/trino-testing-services/src/main/resources/META-INF/services/org.testng.ITestNGListener
index 0984bcec6e23..b8a312673338 100644
--- a/testing/trino-testing-services/src/main/resources/META-INF/services/org.testng.ITestNGListener
+++ b/testing/trino-testing-services/src/main/resources/META-INF/services/org.testng.ITestNGListener
@@ -1,8 +1,8 @@
 io.trino.testng.services.ManageTestResources
 io.trino.testng.services.ReportAfterMethodNotAlwaysRun
+io.trino.testng.services.ReportBadTestAnnotations
 io.trino.testng.services.ReportOrphanedExecutors
 io.trino.testng.services.ReportPrivateMethods
-io.trino.testng.services.ReportUnannotatedMethods
 io.trino.testng.services.ReportIllNamedTest
 io.trino.testng.services.ReportMultiThreadedBeforeOrAfterMethod
 io.trino.testng.services.LogTestDurationListener
diff --git a/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestFlakyAnnotationVerifier.java b/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestFlakyAnnotationVerifier.java
index 6db9dbaa6765..d89db9e21f4a 100644
--- a/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestFlakyAnnotationVerifier.java
+++ b/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestFlakyAnnotationVerifier.java
@@ -73,7 +73,7 @@ public void testInvalidPattern()
     private static class TestNotTestMethodWithFlaky
     {
         @Flaky(issue = "Blah", match = "Blah")
-        @ReportUnannotatedMethods.Suppress
+        @ReportBadTestAnnotations.Suppress
         public void test() {}
     }
 
diff --git a/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportAfterMethodNotAlwaysRun.java b/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportAfterMethodNotAlwaysRun.java
index ae062a51da74..6ec8095c7db1 100644
--- a/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportAfterMethodNotAlwaysRun.java
+++ b/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportAfterMethodNotAlwaysRun.java
@@ -17,7 +17,6 @@
 import org.testng.annotations.AfterGroups;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterSuite;
-import org.testng.annotations.AfterTest;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -75,10 +74,6 @@ public static Object[][] incorrectCases()
                         SuiteNotAlwaysRun.class,
                         SuiteNotAlwaysRun.class.getMethod("afterSuite").toString(),
                 },
-                {
-                        TestNotAlwaysRun.class,
-                        TestNotAlwaysRun.class.getMethod("afterTest").toString(),
-                },
                 {
                         AllNotAlwaysRunTwice.class,
                         AllNotAlwaysRunTwice.class.getMethod("afterClass1").toString(),
@@ -89,8 +84,6 @@ public static Object[][] incorrectCases()
                         AllNotAlwaysRunTwice.class.getMethod("afterMethod2").toString(),
                         AllNotAlwaysRunTwice.class.getMethod("afterSuite1").toString(),
                         AllNotAlwaysRunTwice.class.getMethod("afterSuite2").toString(),
-                        AllNotAlwaysRunTwice.class.getMethod("afterTest1").toString(),
-                        AllNotAlwaysRunTwice.class.getMethod("afterTest2").toString(),
                 },
                 {
                         SubClassWithBaseNotAlwaysRunNoOverride.class,
@@ -137,9 +130,6 @@ public void afterMethod() {}
 
         @AfterSuite(alwaysRun = true)
         public void afterSuite() {}
-
-        @AfterTest(alwaysRun = true)
-        public void afterTest() {}
     }
 
     private static class ClassNotAlwaysRun
@@ -155,9 +145,6 @@ public void afterMethod() {}
 
         @AfterSuite(alwaysRun = true)
         public void afterSuite() {}
-
-        @AfterTest(alwaysRun = true)
-        public void afterTest() {}
     }
 
     private static class GroupNotAlwaysRun
@@ -173,9 +160,6 @@ public void afterMethod() {}
 
         @AfterSuite(alwaysRun = true)
         public void afterSuite() {}
-
-        @AfterTest(alwaysRun = true)
-        public void afterTest() {}
     }
 
     private static class MethodNotAlwaysRun
@@ -191,9 +175,6 @@ public void afterMethod() {}
 
         @AfterSuite(alwaysRun = true)
         public void afterSuite() {}
-
-        @AfterTest(alwaysRun = true)
-        public void afterTest() {}
     }
 
     private static class SuiteNotAlwaysRun
@@ -209,27 +190,6 @@ public void afterMethod() {}
 
         @AfterSuite
         public void afterSuite() {}
-
-        @AfterTest(alwaysRun = true)
-        public void afterTest() {}
-    }
-
-    private static class TestNotAlwaysRun
-    {
-        @AfterClass(alwaysRun = true)
-        public void afterClass() {}
-
-        @AfterGroups(alwaysRun = true)
-        public void afterGroup() {}
-
-        @AfterMethod(alwaysRun = true)
-        public void afterMethod() {}
-
-        @AfterSuite(alwaysRun = true)
-        public void afterSuite() {}
-
-        @AfterTest
-        public void afterTest() {}
     }
 
     private static class AllNotAlwaysRunTwice
@@ -257,12 +217,6 @@ public void afterSuite1() {}
 
         @AfterSuite
         public void afterSuite2() {}
-
-        @AfterTest
-        public void afterTest1() {}
-
-        @AfterTest
-        public void afterTest2() {}
     }
 
     private abstract static class BaseClassAlwaysRun
diff --git a/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportBadTestAnnotations.java b/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportBadTestAnnotations.java
new file mode 100644
index 000000000000..161414bda6e9
--- /dev/null
+++ b/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportBadTestAnnotations.java
@@ -0,0 +1,208 @@
+/*
+ * Licensed 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 io.trino.testng.services;
+
+import io.trino.tempto.Requirement;
+import io.trino.tempto.Requirements;
+import io.trino.tempto.RequirementsProvider;
+import io.trino.tempto.configuration.Configuration;
+import io.trino.tempto.testmarkers.WithName;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static io.trino.testng.services.ReportBadTestAnnotations.classWithMeaninglessTestAnnotation;
+import static io.trino.testng.services.ReportBadTestAnnotations.findUnannotatedTestMethods;
+import static io.trino.testng.services.ReportBadTestAnnotations.isTemptoClass;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+public class TestReportBadTestAnnotations
+{
+    @Test
+    public void testTest()
+    {
+        assertThat(findUnannotatedTestMethods(TestingTest.class))
+                .isEmpty();
+        assertThat(findUnannotatedTestMethods(TestingTestWithProxy.class))
+                .isEmpty();
+    }
+
+    @Test
+    public void testTestWithoutTestAnnotation()
+    {
+        assertThat(findUnannotatedTestMethods(TestingTestWithoutTestAnnotation.class))
+                .extracting(Method::getName)
+                .containsExactly("testWithMissingTestAnnotation", "methodInInterface");
+    }
+
+    @Test
+    public void testTemptoRequirementsProvider()
+    {
+        assertThat(findUnannotatedTestMethods(TestingRequirementsProvider.class))
+                .extracting(Method::getName)
+                .containsExactly("testWithMissingTestAnnotation");
+        assertThat(findUnannotatedTestMethods(TestingRequirementsProviderWithProxyClass.class))
+                .extracting(Method::getName)
+                .containsExactly("testWithMissingTestAnnotation", "testWithMissingTestAnnotationInProxy");
+    }
+
+    @Test
+    public void testTemptoPackage()
+    {
+        assertTrue(isTemptoClass(RequirementsProvider.class));
+        assertTrue(isTemptoClass(WithName.class));
+        assertFalse(isTemptoClass(getClass()));
+    }
+
+    @Test
+    public void testSuppressedMethods()
+    {
+        assertThat(findUnannotatedTestMethods(TestingTestWithSuppressedPublicMethod.class))
+                .isEmpty();
+        assertThat(findUnannotatedTestMethods(TestingTestWithSuppressedPublicMethodInInterface.class))
+                .isEmpty();
+    }
+
+    @Test
+    public void testClassLevelTestAnnotation()
+    {
+        assertThat(classWithMeaninglessTestAnnotation(TestingTestWithClassLevelTrivialAnnotation.class))
+                .contains(TestingTestWithClassLevelTrivialAnnotation.class);
+        assertThat(classWithMeaninglessTestAnnotation(TestingTestWithClassLevelUsefulAnnotation.class))
+                .isEmpty();
+        assertThat(classWithMeaninglessTestAnnotation(TestingTestInheritingFromBaseWithClassLevelTrivialAnnotation.class))
+                .contains(BaseClassWithClassLevelTrivialAnnotation.class);
+    }
+
+    private static class TestingTest
+            implements TestingInterfaceWithTest
+    {
+        @Test
+        public void test() {}
+    }
+
+    private static class TestingTestWithProxy
+            extends TestingInterfaceWithTestProxy
+    {
+        @Test
+        public void test() {}
+    }
+
+    private static class TestingTestWithoutTestAnnotation
+            implements TestingInterface
+    {
+        public void testWithMissingTestAnnotation() {}
+
+        @Override
+        public String toString()
+        {
+            return "test override";
+        }
+    }
+
+    private static class TestingRequirementsProvider
+            implements RequirementsProvider
+    {
+        @Override
+        public Requirement getRequirements(Configuration configuration)
+        {
+            return Requirements.allOf();
+        }
+
+        public void testWithMissingTestAnnotation() {}
+    }
+
+    private static class TestingRequirementsProviderWithProxyClass
+            extends RequirementsProviderProxy
+    {
+        @Override
+        public Requirement getRequirements(Configuration configuration)
+        {
+            return Requirements.allOf();
+        }
+
+        public void testWithMissingTestAnnotation() {}
+    }
+
+    private abstract static class RequirementsProviderProxy
+            implements RequirementsProvider
+    {
+        public void testWithMissingTestAnnotationInProxy() {}
+    }
+
+    private static class TestingInterfaceWithTestProxy
+            implements TestingInterfaceWithTest {}
+
+    private interface TestingInterfaceWithTest
+    {
+        @Test
+        default void testInInterface() {}
+    }
+
+    private interface TestingInterface
+    {
+        default void methodInInterface() {}
+    }
+
+    private static class TestingTestWithSuppressedPublicMethod
+    {
+        @Test
+        public void test() {}
+
+        @ReportBadTestAnnotations.Suppress
+        public void method() {}
+    }
+
+    private static class TestingTestWithSuppressedPublicMethodInInterface
+            implements InterfaceWithSuppressedPublicMethod
+    {
+        @Test
+        public void test() {}
+    }
+
+    private interface InterfaceWithSuppressedPublicMethod
+    {
+        @ReportBadTestAnnotations.Suppress
+        default void method() {}
+    }
+
+    @Test
+    @ReportBadTestAnnotations.Suppress
+    private static class TestingTestWithClassLevelTrivialAnnotation
+    {
+        @Test
+        public void test() {}
+    }
+
+    @Test(singleThreaded = true)
+    @ReportBadTestAnnotations.Suppress
+    private static class TestingTestWithClassLevelUsefulAnnotation
+    {
+        @Test
+        public void test() {}
+    }
+
+    @Test
+    private abstract static class BaseClassWithClassLevelTrivialAnnotation
+    {
+        @Test
+        public void test() {}
+    }
+
+    @ReportBadTestAnnotations.Suppress
+    private static class TestingTestInheritingFromBaseWithClassLevelTrivialAnnotation
+            extends BaseClassWithClassLevelTrivialAnnotation {}
+}
diff --git a/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportPrivateMethods.java b/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportPrivateMethods.java
index 4089edeb5639..4eee5860b7a8 100644
--- a/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportPrivateMethods.java
+++ b/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportPrivateMethods.java
@@ -13,7 +13,7 @@
  */
 package io.trino.testng.services;
 
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -65,7 +65,7 @@ public void testSuppression()
     private static class PackagePrivateTest
     {
         // using @Test would make the class a test, and fail the build
-        @BeforeTest
+        @BeforeMethod
         void testPackagePrivate() {}
     }
 
@@ -84,7 +84,7 @@ private Object[][] foosDataProvider()
     private static class BasePackagePrivateTest
     {
         // using @Test would make the class a test, and fail the build
-        @BeforeTest
+        @BeforeMethod
         void testPackagePrivateInBase() {}
     }
 
@@ -92,14 +92,14 @@ private static class DerivedTest
             extends BasePackagePrivateTest
     {
         // using @Test would make the class a test, and fail the build
-        @BeforeTest
+        @BeforeMethod
         public void testPublic() {}
     }
 
     private static class PackagePrivateSuppressedTest
     {
         // using @Test would make the class a test, and fail the build
-        @BeforeTest
+        @BeforeMethod
         @ReportPrivateMethods.Suppress
         void testPackagePrivate() {}
     }
diff --git a/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportUnannotatedMethods.java b/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportUnannotatedMethods.java
deleted file mode 100644
index 5b133f83f905..000000000000
--- a/testing/trino-testing-services/src/test/java/io/trino/testng/services/TestReportUnannotatedMethods.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Licensed 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 io.trino.testng.services;
-
-import io.trino.tempto.Requirement;
-import io.trino.tempto.Requirements;
-import io.trino.tempto.RequirementsProvider;
-import io.trino.tempto.configuration.Configuration;
-import io.trino.tempto.testmarkers.WithName;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static io.trino.testng.services.ReportUnannotatedMethods.findUnannotatedTestMethods;
-import static io.trino.testng.services.ReportUnannotatedMethods.isTemptoClass;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-public class TestReportUnannotatedMethods
-{
-    @Test
-    public void testTest()
-    {
-        assertThat(findUnannotatedTestMethods(TestingTest.class))
-                .isEmpty();
-        assertThat(findUnannotatedTestMethods(TestingTestWithProxy.class))
-                .isEmpty();
-    }
-
-    @Test
-    public void testTestWithoutTestAnnotation()
-    {
-        assertThat(findUnannotatedTestMethods(TestingTestWithoutTestAnnotation.class))
-                .extracting(Method::getName)
-                .containsExactly("testWithMissingTestAnnotation", "methodInInterface");
-    }
-
-    @Test
-    public void testTemptoRequirementsProvider()
-    {
-        assertThat(findUnannotatedTestMethods(TestingRequirementsProvider.class))
-                .extracting(Method::getName)
-                .containsExactly("testWithMissingTestAnnotation");
-        assertThat(findUnannotatedTestMethods(TestingRequirementsProviderWithProxyClass.class))
-                .extracting(Method::getName)
-                .containsExactly("testWithMissingTestAnnotation", "testWithMissingTestAnnotationInProxy");
-    }
-
-    @Test
-    public void testTemptoPackage()
-    {
-        assertTrue(isTemptoClass(RequirementsProvider.class));
-        assertTrue(isTemptoClass(WithName.class));
-        assertFalse(isTemptoClass(getClass()));
-    }
-
-    @Test
-    public void testSuppressedMethods()
-    {
-        assertThat(findUnannotatedTestMethods(TestingTestWithSuppressedPublicMethod.class))
-                .isEmpty();
-        assertThat(findUnannotatedTestMethods(TestingTestWithSuppressedPublicMethodInInterface.class))
-                .isEmpty();
-    }
-
-    private static class TestingTest
-            implements TestingInterfaceWithTest
-    {
-        @Test
-        public void test() {}
-    }
-
-    private static class TestingTestWithProxy
-            extends TestingInterfaceWithTestProxy
-    {
-        @Test
-        public void test() {}
-    }
-
-    private static class TestingTestWithoutTestAnnotation
-            implements TestingInterface
-    {
-        public void testWithMissingTestAnnotation() {}
-
-        @Override
-        public String toString()
-        {
-            return "test override";
-        }
-    }
-
-    private static class TestingRequirementsProvider
-            implements RequirementsProvider
-    {
-        @Override
-        public Requirement getRequirements(Configuration configuration)
-        {
-            return Requirements.allOf();
-        }
-
-        public void testWithMissingTestAnnotation() {}
-    }
-
-    private static class TestingRequirementsProviderWithProxyClass
-            extends RequirementsProviderProxy
-    {
-        @Override
-        public Requirement getRequirements(Configuration configuration)
-        {
-            return Requirements.allOf();
-        }
-
-        public void testWithMissingTestAnnotation() {}
-    }
-
-    private abstract static class RequirementsProviderProxy
-            implements RequirementsProvider
-    {
-        public void testWithMissingTestAnnotationInProxy() {}
-    }
-
-    private static class TestingInterfaceWithTestProxy
-            implements TestingInterfaceWithTest {}
-
-    private interface TestingInterfaceWithTest
-    {
-        @Test
-        default void testInInterface() {}
-    }
-
-    private interface TestingInterface
-    {
-        default void methodInInterface() {}
-    }
-
-    private static class TestingTestWithSuppressedPublicMethod
-    {
-        @Test
-        public void test() {}
-
-        @ReportUnannotatedMethods.Suppress
-        public void method() {}
-    }
-
-    private static class TestingTestWithSuppressedPublicMethodInInterface
-            implements InterfaceWithSuppressedPublicMethod
-    {
-        @Test
-        public void test() {}
-    }
-
-    private interface InterfaceWithSuppressedPublicMethod
-    {
-        @ReportUnannotatedMethods.Suppress
-        default void method() {}
-    }
-}
diff --git a/testing/trino-testing/pom.xml b/testing/trino-testing/pom.xml
index 0e56bad5a986..32303eb4394f 100644
--- a/testing/trino-testing/pom.xml
+++ b/testing/trino-testing/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-testing</artifactId>
-    <name>trino-testing</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,56 +17,28 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
-            <type>test-jar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-parser</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-plugin-toolkit</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing-services</artifactId>
-            <exclusions>
-                <exclusion>
-                    <!-- conflicts with test-scoped dependency declared below -->
-                    <groupId>org.openjdk.jmh</groupId>
-                    <artifactId>jmh-core</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-tpch</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.trino.tpch</groupId>
-            <artifactId>tpch</artifactId>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
         </dependency>
 
         <dependency>
@@ -111,28 +82,76 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk-testing</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk-trace</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-client</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <type>test-jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-parser</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-containers</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <exclusions>
+                <exclusion>
+                    <!-- conflicts with test-scoped dependency declared below -->
+                    <groupId>org.openjdk.jmh</groupId>
+                    <artifactId>jmh-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-tpch</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino.tpch</groupId>
+            <artifactId>tpch</artifactId>
         </dependency>
 
         <dependency>
@@ -155,11 +174,22 @@
             <artifactId>jdbi3-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -167,9 +197,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <!-- for benchmarks -->
@@ -185,4 +215,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${dep.junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractDistributedEngineOnlyQueries.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractDistributedEngineOnlyQueries.java
index 04118e638ea1..7f8c83704b85 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractDistributedEngineOnlyQueries.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractDistributedEngineOnlyQueries.java
@@ -19,9 +19,11 @@
 import io.trino.execution.QueryManager;
 import io.trino.server.BasicQueryInfo;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.time.ZonedDateTime;
 import java.util.List;
@@ -39,19 +41,21 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public abstract class AbstractDistributedEngineOnlyQueries
         extends AbstractTestEngineOnlyQueries
 {
     private ExecutorService executorService;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         executorService = newCachedThreadPool();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void shutdown()
     {
         if (executorService != null) {
@@ -348,7 +352,8 @@ public void testImplicitCastToRowWithFieldsRequiringDelimitation()
         assertUpdate("INSERT INTO target_table SELECT * from source_table", 0);
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testQueryTransitionsToRunningState()
     {
         String query = format(
@@ -374,7 +379,8 @@ public void testQueryTransitionsToRunningState()
         assertThatThrownBy(queryFuture::get).hasMessageContaining("Query was canceled");
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testSelectiveLimit()
     {
         assertQuery("" +
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestAggregations.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestAggregations.java
index fe6b2ca42955..3714a499cdc1 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestAggregations.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestAggregations.java
@@ -17,11 +17,11 @@
 import io.trino.Session;
 import io.trino.spi.type.TimeZoneKey;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static io.trino.SystemSessionProperties.USE_MARK_DISTINCT;
+import static io.trino.SystemSessionProperties.MARK_DISTINCT_STRATEGY;
 import static io.trino.testing.MaterializedResult.resultBuilder;
 import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
 import static org.testng.Assert.assertEquals;
@@ -229,7 +229,15 @@ public void testHistogram()
     public void testCountDistinct()
     {
         assertQuery("SELECT COUNT(DISTINCT custkey + 1) FROM orders", "SELECT COUNT(*) FROM (SELECT DISTINCT custkey + 1 FROM orders) t");
-        assertQuery("SELECT COUNT(DISTINCT linenumber), COUNT(*) from lineitem where linenumber < 0");
+    }
+
+    @Test
+    public void testMixedDistinctAndZeroOnEmptyInputAggregations()
+    {
+        assertQuery("SELECT COUNT(DISTINCT linenumber), COUNT(*), COUNT(linenumber) from lineitem where linenumber < 0");
+        assertQuery("SELECT COUNT(DISTINCT linenumber), COUNT_IF(linenumber < 0) from lineitem where linenumber < 0", "VALUES (0, 0)");
+        assertQuery("SELECT COUNT(DISTINCT linenumber), approx_distinct(linenumber), approx_distinct(linenumber, 0.5) from lineitem where linenumber < 0", "VALUES (0, 0, 0)");
+        assertQuery("SELECT COUNT(DISTINCT linenumber), approx_distinct(orderkey > 10), approx_distinct(orderkey > 10, 0.5) from lineitem where linenumber < 0", "VALUES (0, 0, 0)");
     }
 
     @Test
@@ -243,7 +251,7 @@ public void testDistinctGroupBy()
         assertQuery(query);
         assertQuery(
                 Session.builder(getSession())
-                        .setSystemProperty(USE_MARK_DISTINCT, "false")
+                        .setSystemProperty(MARK_DISTINCT_STRATEGY, "none")
                         .build(),
                 query);
     }
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestEngineOnlyQueries.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestEngineOnlyQueries.java
index 6290d1ef6215..ce8e53716e6c 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestEngineOnlyQueries.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestEngineOnlyQueries.java
@@ -23,6 +23,7 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Ordering;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.SystemSessionProperties;
 import io.trino.spi.session.PropertyMetadata;
@@ -32,10 +33,9 @@
 import io.trino.type.SqlIntervalDayTime;
 import io.trino.type.SqlIntervalYearMonth;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -60,27 +60,24 @@
 import static io.trino.SystemSessionProperties.LATE_MATERIALIZATION;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
-import static io.trino.spi.type.DecimalType.createDecimalType;
-import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.sql.planner.OptimizerConfig.JoinDistributionType.BROADCAST;
 import static io.trino.sql.planner.OptimizerConfig.JoinReorderingStrategy.NONE;
 import static io.trino.sql.tree.ExplainType.Type.DISTRIBUTED;
 import static io.trino.sql.tree.ExplainType.Type.IO;
 import static io.trino.sql.tree.ExplainType.Type.LOGICAL;
-import static io.trino.testing.DataProviders.toDataProvider;
 import static io.trino.testing.MaterializedResult.resultBuilder;
 import static io.trino.testing.QueryAssertions.assertContains;
 import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
 import static io.trino.tests.QueryTemplate.parameter;
 import static io.trino.tests.QueryTemplate.queryTemplate;
-import static io.trino.type.UnknownType.UNKNOWN;
 import static java.lang.String.format;
 import static java.util.Collections.nCopies;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.IntStream.range;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotEquals;
@@ -855,17 +852,11 @@ public void testQuantifiedComparison()
         assertQuery("SELECT CAST(1 AS decimal(3,2)) <> ANY(SELECT CAST(1 AS decimal(3,1)))");
     }
 
-    @Test(dataProvider = "quantified_comparisons_corner_cases")
-    public void testQuantifiedComparisonCornerCases(String query)
-    {
-        assertQuery(query);
-    }
-
-    @DataProvider(name = "quantified_comparisons_corner_cases")
-    public Object[][] qualifiedComparisonsCornerCases()
+    @Test
+    public void testQuantifiedComparisonCornerCases()
     {
         //the %subquery% is wrapped in a SELECT so that H2 does not blow up on the VALUES subquery
-        return queryTemplate("SELECT %value% %operator% %quantifier% (SELECT * FROM (%subquery%))")
+        queryTemplate("SELECT %value% %operator% %quantifier% (SELECT * FROM (%subquery%))")
                 .replaceAll(
                         parameter("subquery").of(
                                 "SELECT 1 WHERE false",
@@ -874,7 +865,7 @@ public Object[][] qualifiedComparisonsCornerCases()
                         parameter("quantifier").of("ALL", "ANY"),
                         parameter("value").of("1", "NULL"),
                         parameter("operator").of("=", "!=", "<", ">", "<=", ">="))
-                .collect(toDataProvider());
+                .forEach(this::assertQuery);
     }
 
     @Test
@@ -922,28 +913,6 @@ public void testTryInvalidCast()
                 "SELECT NULL");
     }
 
-    @Test
-    public void testDefaultDecimalLiteralSwitch()
-    {
-        Session decimalLiteral = Session.builder(getSession())
-                .setSystemProperty(SystemSessionProperties.PARSE_DECIMAL_LITERALS_AS_DOUBLE, "false")
-                .build();
-        MaterializedResult decimalColumnResult = computeActual(decimalLiteral, "SELECT 1.0");
-
-        assertEquals(decimalColumnResult.getRowCount(), 1);
-        assertEquals(decimalColumnResult.getTypes().get(0), createDecimalType(2, 1));
-        assertEquals(decimalColumnResult.getMaterializedRows().get(0).getField(0), new BigDecimal("1.0"));
-
-        Session doubleLiteral = Session.builder(getSession())
-                .setSystemProperty(SystemSessionProperties.PARSE_DECIMAL_LITERALS_AS_DOUBLE, "true")
-                .build();
-        MaterializedResult doubleColumnResult = computeActual(doubleLiteral, "SELECT 1.0");
-
-        assertEquals(doubleColumnResult.getRowCount(), 1);
-        assertEquals(doubleColumnResult.getTypes().get(0), DOUBLE);
-        assertEquals(doubleColumnResult.getMaterializedRows().get(0).getField(0), 1.0);
-    }
-
     @Test
     public void testExecute()
     {
@@ -1413,7 +1382,7 @@ public void testDescribeInputNoParameters()
                 .addPreparedStatement("my_query", "SELECT * FROM nation")
                 .build();
         assertThat(query(session, "DESCRIBE INPUT my_query"))
-                .hasOutputTypes(List.of(UNKNOWN, UNKNOWN))
+                .hasOutputTypes(List.of(BIGINT, VARCHAR))
                 .returnsEmptyResult();
     }
 
@@ -1603,6 +1572,23 @@ public void testPreparedStatementWithSubqueries()
                 });
     }
 
+    @Test
+    public void testExecuteImmediateWithSubqueries()
+    {
+        List<QueryTemplate.Parameter> leftValues = parameter("left").of(
+                "", "1 = ",
+                "EXISTS",
+                "1 IN",
+                "1 = ANY", "1 = ALL",
+                "2 <> ANY", "2 <> ALL",
+                "0 < ALL", "0 < ANY",
+                "1 <= ALL", "1 <= ANY");
+
+        queryTemplate("SELECT %left% (SELECT 1 WHERE 2 = ?)")
+                .replaceAll(leftValues)
+                .forEach(query -> assertQuery("EXECUTE IMMEDIATE '" + query + "' USING 2", "SELECT true"));
+    }
+
     @Test
     public void testFunctionNotRegistered()
     {
@@ -5332,9 +5318,11 @@ public void testShowSession()
     {
         Session session = new Session(
                 getSession().getQueryId(),
+                Span.getInvalid(),
                 Optional.empty(),
                 getSession().isClientTransactionSupport(),
                 getSession().getIdentity(),
+                getSession().getOriginalIdentity(),
                 getSession().getSource(),
                 getSession().getCatalog(),
                 getSession().getSchema(),
@@ -5508,7 +5496,7 @@ public void testTry()
         assertQuery("SELECT apply(5 + RANDOM(1), x -> x + TRY(1 / 0))", "SELECT NULL");
 
         // test try with invalid JSON
-        assertQueryFails("SELECT JSON_FORMAT(TRY(JSON 'INVALID'))", "line 1:24: 'INVALID' is not a valid json literal");
+        assertQueryFails("SELECT JSON_FORMAT(TRY(JSON 'INVALID'))", "line 1:24: 'INVALID' is not a valid JSON literal");
         assertQuery("SELECT JSON_FORMAT(TRY (JSON_PARSE('INVALID')))", "SELECT NULL");
 
         // tests that might be constant folded
@@ -5523,7 +5511,7 @@ public void testTry()
         assertQuery("SELECT COALESCE(TRY(CAST(CONCAT('a', CAST(123 AS VARCHAR)) AS BIGINT)), 0)", "SELECT 0L");
         assertQuery("SELECT 123 + TRY(ABS(-9223372036854775807 - 1))", "SELECT NULL");
         assertQuery("SELECT JSON_FORMAT(TRY(JSON '[]')) || '123'", "SELECT '[]123'");
-        assertQueryFails("SELECT JSON_FORMAT(TRY(JSON 'INVALID')) || '123'", "line 1:24: 'INVALID' is not a valid json literal");
+        assertQueryFails("SELECT JSON_FORMAT(TRY(JSON 'INVALID')) || '123'", "line 1:24: 'INVALID' is not a valid JSON literal");
         assertQuery("SELECT TRY(2/1)", "SELECT 2");
         assertQuery("SELECT TRY(2/0)", "SELECT null");
         assertQuery("SELECT COALESCE(TRY(2/0), 0)", "SELECT 0");
@@ -6241,7 +6229,8 @@ private static String pivotQuery(int columnsCount)
         return format("SELECT * FROM (SELECT %s FROM region LIMIT 1) a(%s) INNER JOIN unnest(ARRAY[%s], ARRAY[%2$s]) b(b1, b2) ON true", fields, columns, literals);
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testLateMaterializationOuterJoin()
     {
         Session session = Session.builder(getSession())
@@ -6624,6 +6613,99 @@ public void testColumnNames()
         assertEquals(showCreateTableResult.getColumnNames(), ImmutableList.of("Create Table"));
     }
 
+    @Test
+    public void testInlineSqlFunctions()
+    {
+        assertThat(query("""
+                WITH FUNCTION abc(x integer) RETURNS integer RETURN x * 2
+                SELECT abc(21)
+                """))
+                .matches("VALUES 42");
+        assertThat(query("""
+                WITH FUNCTION abc(x integer) RETURNS integer RETURN abs(x)
+                SELECT abc(-21)
+                """))
+                .matches("VALUES 21");
+
+        assertThat(query("""
+                WITH
+                  FUNCTION abc(x integer) RETURNS integer RETURN x * 2,
+                  FUNCTION xyz(x integer) RETURNS integer RETURN abc(x) + 1
+                SELECT xyz(21)
+                """))
+                .matches("VALUES 43");
+
+        assertThat(query("""
+                WITH
+                  FUNCTION my_pow(n int, p int)
+                  RETURNS int
+                  BEGIN
+                    DECLARE r int DEFAULT n;
+                    top: LOOP
+                      IF p <= 1 THEN
+                        LEAVE top;
+                      END IF;
+                      SET r = r * n;
+                      SET p = p - 1;
+                    END LOOP;
+                    RETURN r;
+                  END
+                SELECT my_pow(2, 8)
+                """))
+                .matches("VALUES 256");
+
+        // validations for inline functions
+        assertQueryFails("WITH FUNCTION a.b() RETURNS int RETURN 42 SELECT a.b()",
+                "line 1:6: Inline function names cannot be qualified: a.b");
+
+        assertQueryFails("WITH FUNCTION x() RETURNS int SECURITY INVOKER RETURN 42 SELECT x()",
+                "line 1:31: Security mode not supported for inline functions");
+
+        assertQueryFails("WITH FUNCTION x() RETURNS bigint SECURITY DEFINER RETURN 42 SELECT x()",
+                "line 1:34: Security mode not supported for inline functions");
+
+        // Verify the current restrictions on inline functions are enforced
+
+        // inline function can mask a global function
+        assertThat(query("""
+                WITH FUNCTION abs(x integer) RETURNS integer RETURN x * 2
+                SELECT abs(-10)
+                """))
+                .matches("VALUES -20");
+        assertThat(query("""
+                WITH
+                  FUNCTION abs(x integer) RETURNS integer RETURN x * 2,
+                  FUNCTION wrap_abs(x integer) RETURNS integer RETURN abs(x)
+                SELECT wrap_abs(-10)
+                """))
+                .matches("VALUES -20");
+
+        // inline function can have the same name as a global function with a different signature
+        assertThat(query("""
+                WITH FUNCTION abs(x varchar) RETURNS varchar RETURN reverse(x)
+                SELECT abs('abc')
+                """))
+                .skippingTypesCheck()
+                .matches("VALUES 'cba'");
+
+        // inline functions must be declared before they are used
+        assertThatThrownBy(() -> query("""
+                WITH
+                  FUNCTION a(x integer) RETURNS integer RETURN b(x),
+                  FUNCTION b(x integer) RETURNS integer RETURN x * 2
+                SELECT a(10)
+                """))
+                .hasMessage("line 3:8: Function 'b' not registered");
+
+        // inline function cannot be recursive
+        // note: mutual recursion is not supported either, but it is not tested due to the forward declaration limitation above
+        assertThatThrownBy(() -> query("""
+                WITH FUNCTION a(x integer) RETURNS integer RETURN a(x)
+                SELECT a(10)
+                """))
+                .hasMessage("line 3:8: Recursive language functions are not supported: a(integer):integer");
+    }
+
     private static ZonedDateTime zonedDateTime(String value)
     {
         return ZONED_DATE_TIME_FORMAT.parse(value, ZonedDateTime::from);
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestIndexedQueries.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestIndexedQueries.java
index 08347bf9f798..73672ddbadc8 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestIndexedQueries.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestIndexedQueries.java
@@ -17,7 +17,7 @@
 import io.trino.plugin.tpch.TpchMetadata;
 import io.trino.testing.tpch.TpchIndexSpec;
 import io.trino.testing.tpch.TpchIndexSpec.Builder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestJoinQueries.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestJoinQueries.java
index e22e016eb37b..cbdbfce23ae6 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestJoinQueries.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestJoinQueries.java
@@ -22,7 +22,8 @@
 import io.trino.tests.QueryTemplate;
 import io.trino.tpch.TpchTable;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.List;
 
@@ -2190,7 +2191,8 @@ public void testSemiJoinPredicateMoveAround()
                 "    orderkey % 2 = 0");
     }
 
-    @Test(timeOut = 120_000)
+    @Test
+    @Timeout(120)
     public void testInnerJoinWithEmptyBuildSide()
     {
         // TODO: increase lineitem schema size when build side short-circuit is fixed
@@ -2202,7 +2204,8 @@ public void testInnerJoinWithEmptyBuildSide()
                 "SELECT 0 WHERE false");
     }
 
-    @Test(timeOut = 120_000)
+    @Test
+    @Timeout(120)
     public void testRightJoinWithEmptyBuildSide()
     {
         // TODO: increase lineitem schema size when build side short-circuit is fixed
@@ -2232,7 +2235,8 @@ public void testFullJoinWithEmptyBuildSide()
                 "WITH small_part AS (SELECT * FROM part WHERE name = 'a') SELECT lineitem.orderkey FROM lineitem LEFT JOIN small_part ON lineitem.partkey = small_part.partkey");
     }
 
-    @Test(timeOut = 120_000)
+    @Test
+    @Timeout(120)
     public void testInnerJoinWithEmptyProbeSide()
     {
         // TODO: increase lineitem schema size when probe side short-circuit is fixed
@@ -2252,7 +2256,8 @@ public void testRightJoinWithEmptyProbeSide()
                 "WITH small_part AS (SELECT * FROM part WHERE name = 'a') SELECT lineitem.orderkey FROM small_part RIGHT JOIN lineitem ON  small_part.partkey = lineitem.partkey");
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testRightJoinWithOuterJoinInLookupSource()
     {
         assertQuery(
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestOrderByQueries.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestOrderByQueries.java
index 1583cff31aaa..5daebc5453b7 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestOrderByQueries.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestOrderByQueries.java
@@ -14,7 +14,7 @@
 package io.trino.testing;
 
 import io.trino.Session;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SystemSessionProperties.DISTRIBUTED_SORT;
 import static io.trino.tests.QueryTemplate.parameter;
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestQueries.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestQueries.java
index f90ff5636255..6cb30033cddc 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestQueries.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestQueries.java
@@ -19,8 +19,7 @@
 import io.trino.metadata.InternalFunctionBundle;
 import io.trino.tpch.TpchTable;
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Set;
@@ -36,7 +35,6 @@
 import static io.trino.testing.QueryAssertions.assertContains;
 import static io.trino.testing.StatefulSleepingSum.STATEFUL_SLEEPING_SUM;
 import static io.trino.testing.assertions.Assert.assertEventually;
-import static io.trino.tpch.TpchTable.CUSTOMER;
 import static io.trino.tpch.TpchTable.NATION;
 import static io.trino.tpch.TpchTable.ORDERS;
 import static io.trino.tpch.TpchTable.REGION;
@@ -50,7 +48,7 @@
 public abstract class AbstractTestQueries
         extends AbstractTestQueryFramework
 {
-    protected static final List<TpchTable<?>> REQUIRED_TPCH_TABLES = ImmutableList.of(CUSTOMER, NATION, ORDERS, REGION);
+    protected static final List<TpchTable<?>> REQUIRED_TPCH_TABLES = ImmutableList.of(NATION, ORDERS, REGION);
 
     // We can just use the default type registry, since we don't use any parametric types
     protected static final FunctionBundle CUSTOM_FUNCTIONS = InternalFunctionBundle.builder()
@@ -244,47 +242,38 @@ public void testIn()
         assertQuery("SELECT orderkey FROM orders WHERE totalprice IN (1, 2, 3)");
     }
 
-    @Test(dataProvider = "largeInValuesCount")
-    public void testLargeIn(int valuesCount)
+    @Test
+    public void testLargeIn()
     {
-        String longValues = range(0, valuesCount)
-                .mapToObj(Integer::toString)
-                .collect(joining(", "));
-        assertQuery("SELECT orderkey FROM orders WHERE orderkey IN (" + longValues + ")");
-        assertQuery("SELECT orderkey FROM orders WHERE orderkey NOT IN (" + longValues + ")");
-
-        assertQuery("SELECT orderkey FROM orders WHERE orderkey IN (mod(1000, orderkey), " + longValues + ")");
-        assertQuery("SELECT orderkey FROM orders WHERE orderkey NOT IN (mod(1000, orderkey), " + longValues + ")");
-    }
+        for (int count : largeInValuesCountData()) {
+            String longValues = range(0, count)
+                    .mapToObj(Integer::toString)
+                    .collect(joining(", "));
+            assertQuery("SELECT orderkey FROM orders WHERE orderkey IN (" + longValues + ")");
+            assertQuery("SELECT orderkey FROM orders WHERE orderkey NOT IN (" + longValues + ")");
 
-    @DataProvider
-    public Object[][] largeInValuesCount()
-    {
-        return largeInValuesCountData();
+            assertQuery("SELECT orderkey FROM orders WHERE orderkey IN (mod(1000, orderkey), " + longValues + ")");
+            assertQuery("SELECT orderkey FROM orders WHERE orderkey NOT IN (mod(1000, orderkey), " + longValues + ")");
+        }
     }
 
-    protected Object[][] largeInValuesCountData()
+    protected List<Integer> largeInValuesCountData()
     {
-        return new Object[][] {
-                {200},
-                {500},
-                {1000},
-                {5000}
-        };
+        return ImmutableList.of(200, 500, 1000, 5000);
     }
 
     @Test
     public void testShowSchemas()
     {
         MaterializedResult result = computeActual("SHOW SCHEMAS");
-        assertTrue(result.getOnlyColumnAsSet().containsAll(ImmutableSet.of(getSession().getSchema().get(), INFORMATION_SCHEMA)));
+        assertThat(result.getOnlyColumnAsSet()).contains(getSession().getSchema().get(), INFORMATION_SCHEMA);
     }
 
     @Test
     public void testShowSchemasFrom()
     {
         MaterializedResult result = computeActual(format("SHOW SCHEMAS FROM %s", getSession().getCatalog().get()));
-        assertTrue(result.getOnlyColumnAsSet().containsAll(ImmutableSet.of(getSession().getSchema().get(), INFORMATION_SCHEMA)));
+        assertThat(result.getOnlyColumnAsSet()).contains(getSession().getSchema().get(), INFORMATION_SCHEMA);
     }
 
     @Test
@@ -305,7 +294,7 @@ public void testShowSchemasLikeWithEscape()
             Set<Object> allSchemas = computeActual("SHOW SCHEMAS").getOnlyColumnAsSet();
             assertEquals(allSchemas, computeActual("SHOW SCHEMAS LIKE '%_%'").getOnlyColumnAsSet());
             Set<Object> result = computeActual("SHOW SCHEMAS LIKE '%$_%' ESCAPE '$'").getOnlyColumnAsSet();
-            verify(allSchemas.stream().anyMatch(schema -> ((String) schema).contains("_")),
+            verify(allSchemas.stream().anyMatch(schema -> !((String) schema).contains("_")),
                     "This test expects at least one schema without underscore in it's name. Satisfy this assumption or override the test.");
             assertThat(result)
                     .isSubsetOf(allSchemas)
@@ -374,8 +363,8 @@ public void testInformationSchemaFiltering()
                 "SELECT table_name FROM information_schema.tables WHERE table_name = 'orders' LIMIT 1",
                 "SELECT 'orders' table_name");
         assertQuery(
-                "SELECT table_name FROM information_schema.columns WHERE data_type = 'bigint' AND table_name = 'customer' and column_name = 'custkey' LIMIT 1",
-                "SELECT 'customer' table_name");
+                "SELECT table_name FROM information_schema.columns WHERE data_type = 'bigint' AND table_name = 'nation' and column_name = 'nationkey' LIMIT 1",
+                "SELECT 'nation' table_name");
     }
 
     @Test
@@ -502,4 +491,10 @@ public void testFilterPushdownWithAggregation()
         assertQuery("SELECT * FROM (SELECT count(*) FROM orders) WHERE 0=1");
         assertQuery("SELECT * FROM (SELECT count(*) FROM orders) WHERE null");
     }
+
+    @Test
+    public void testUnionAllAboveBroadcastJoin()
+    {
+        assertQuery("SELECT COUNT(*) FROM region r JOIN (SELECT nationkey FROM nation UNION ALL SELECT nationkey as key FROM nation) n ON r.regionkey = n.nationkey", "VALUES 10");
+    }
 }
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestQueryFramework.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestQueryFramework.java
index dfce1a3c13d4..8c9e52b67f38 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestQueryFramework.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestQueryFramework.java
@@ -13,7 +13,6 @@
  */
 package io.trino.testing;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.MoreCollectors;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -32,12 +31,12 @@
 import io.trino.memory.MemoryPool;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.TableHandle;
-import io.trino.metadata.TableMetadata;
 import io.trino.operator.OperatorStats;
 import io.trino.server.BasicQueryInfo;
 import io.trino.server.DynamicFilterService.DynamicFiltersStats;
 import io.trino.server.testing.TestingTrinoServer;
 import io.trino.spi.QueryId;
+import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.type.Type;
 import io.trino.sql.analyzer.QueryExplainer;
 import io.trino.sql.parser.SqlParser;
@@ -51,14 +50,16 @@
 import io.trino.sql.query.QueryAssertions.QueryAssert;
 import io.trino.sql.tree.ExplainType;
 import io.trino.testing.TestingAccessControlManager.TestingPrivilege;
+import io.trino.testng.services.ReportBadTestAnnotations;
 import io.trino.transaction.TransactionBuilder;
 import io.trino.util.AutoCloseableCloser;
 import org.assertj.core.api.AssertProvider;
 import org.intellij.lang.annotations.Language;
-import org.testng.SkipException;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -76,7 +77,6 @@
 import static io.trino.SystemSessionProperties.JOIN_REORDERING_STRATEGY;
 import static io.trino.execution.StageInfo.getAllStages;
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
-import static io.trino.sql.ParsingUtil.createParsingOptions;
 import static io.trino.sql.SqlFormatter.formatSql;
 import static io.trino.sql.planner.OptimizerConfig.JoinReorderingStrategy;
 import static io.trino.testing.assertions.Assert.assertEventually;
@@ -86,9 +86,10 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.fail;
 
+@TestInstance(PER_CLASS)
 public abstract class AbstractTestQueryFramework
 {
     private static final SqlParser SQL_PARSER = new SqlParser();
@@ -99,6 +100,7 @@ public abstract class AbstractTestQueryFramework
     private io.trino.sql.query.QueryAssertions queryAssertions;
 
     @BeforeClass
+    @BeforeAll
     public void init()
             throws Exception
     {
@@ -111,6 +113,7 @@ public void init()
     protected abstract QueryRunner createQueryRunner()
             throws Exception;
 
+    @AfterAll
     @AfterClass(alwaysRun = true)
     public final void close()
             throws Exception
@@ -267,7 +270,8 @@ private static String createQueryDebuggingSummary(BasicQueryInfo basicQueryInfo,
         }
     }
 
-    @Test
+    // TODO @Test - Temporarily disabled to avoid test classes running twice. Re-enable once all tests migrated to JUnit.
+    @ReportBadTestAnnotations.Suppress
     public void ensureTestNamingConvention()
     {
         // Enforce a naming convention to make code navigation easier.
@@ -288,7 +292,7 @@ protected final int getNodeCount()
 
     protected TransactionBuilder newTransaction()
     {
-        return transaction(queryRunner.getTransactionManager(), queryRunner.getAccessControl());
+        return transaction(queryRunner.getTransactionManager(), queryRunner.getMetadata(), queryRunner.getAccessControl());
     }
 
     protected void inTransaction(Consumer<Session> callback)
@@ -491,6 +495,15 @@ protected void assertAccessDenied(
         assertException(session, sql, ".*Access Denied: " + exceptionsMessageRegExp, deniedPrivileges);
     }
 
+    protected void assertFunctionNotFound(
+            Session session,
+            @Language("SQL") String sql,
+            String functionName,
+            TestingPrivilege... deniedPrivileges)
+    {
+        assertException(session, sql, ".*[Ff]unction '" + functionName + "' not registered", deniedPrivileges);
+    }
+
     private void assertException(Session session, @Language("SQL") String sql, @Language("RegExp") String exceptionsMessageRegExp, TestingPrivilege[] deniedPrivileges)
     {
         assertThatThrownBy(() -> executeExclusively(session, sql, deniedPrivileges))
@@ -501,11 +514,11 @@ private void assertException(Session session, @Language("SQL") String sql, @Lang
     protected void assertTableColumnNames(String tableName, String... columnNames)
     {
         MaterializedResult result = computeActual("DESCRIBE " + tableName);
-        List<String> expected = ImmutableList.copyOf(columnNames);
         List<String> actual = result.getMaterializedRows().stream()
                 .map(row -> (String) row.getField(0))
                 .collect(toImmutableList());
-        assertEquals(actual, expected);
+        assertThat(actual).as("Columns of table %s", tableName)
+                .isEqualTo(List.of(columnNames));
     }
 
     protected void assertExplain(@Language("SQL") String query, @Language("RegExp") String... expectedExplainRegExps)
@@ -563,6 +576,15 @@ protected void assertQueryStats(
         resultAssertion.accept(resultWithQueryId.getResult());
     }
 
+    protected void assertNoDataRead(@Language("SQL") String sql)
+    {
+        assertQueryStats(
+                getSession(),
+                sql,
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isEqualTo(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+    }
+
     protected MaterializedResult computeExpected(@Language("SQL") String sql, List<? extends Type> resultTypes)
     {
         return h2QueryRunner.execute(getSession(), sql, resultTypes);
@@ -581,7 +603,7 @@ protected void executeExclusively(Runnable executionBlock)
 
     protected String formatSqlText(@Language("SQL") String sql)
     {
-        return formatSql(SQL_PARSER.createStatement(sql, createParsingOptions(getSession())));
+        return formatSql(SQL_PARSER.createStatement(sql));
     }
 
     protected String getExplainPlan(@Language("SQL") String query, ExplainType.Type planType)
@@ -595,7 +617,7 @@ protected String getExplainPlan(Session session, @Language("SQL") String query,
         return newTransaction()
                 .singleStatement()
                 .execute(session, transactionSession -> {
-                    return explainer.getPlan(transactionSession, SQL_PARSER.createStatement(query, createParsingOptions(transactionSession)), planType, emptyList(), WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+                    return explainer.getPlan(transactionSession, SQL_PARSER.createStatement(query), planType, emptyList(), WarningCollector.NOOP, createPlanOptimizersStatsCollector());
                 });
     }
 
@@ -605,17 +627,10 @@ protected String getGraphvizExplainPlan(@Language("SQL") String query, ExplainTy
         return newTransaction()
                 .singleStatement()
                 .execute(queryRunner.getDefaultSession(), session -> {
-                    return explainer.getGraphvizPlan(session, SQL_PARSER.createStatement(query, createParsingOptions(session)), planType, emptyList(), WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+                    return explainer.getGraphvizPlan(session, SQL_PARSER.createStatement(query), planType, emptyList(), WarningCollector.NOOP, createPlanOptimizersStatsCollector());
                 });
     }
 
-    protected static void skipTestUnless(boolean requirement)
-    {
-        if (!requirement) {
-            throw new SkipException("requirement not met");
-        }
-    }
-
     protected final QueryRunner getQueryRunner()
     {
         checkState(queryRunner != null, "queryRunner not set");
@@ -665,8 +680,8 @@ protected OperatorStats searchScanFilterAndProjectOperatorStats(QueryId queryId,
                     if (!(filterNode.getSource() instanceof TableScanNode tableScanNode)) {
                         return false;
                     }
-                    TableMetadata tableMetadata = getTableMetadata(tableScanNode.getTable());
-                    return tableMetadata.getQualifiedName().equals(catalogSchemaTableName);
+                    CatalogSchemaTableName tableName = getTableName(tableScanNode.getTable());
+                    return tableName.equals(catalogSchemaTableName.asCatalogSchemaTableName());
                 })
                 .findOnlyElement()
                 .getId();
@@ -699,18 +714,18 @@ protected QualifiedObjectName getQualifiedTableName(String tableName)
                 tableName);
     }
 
-    private TableMetadata getTableMetadata(TableHandle tableHandle)
+    private CatalogSchemaTableName getTableName(TableHandle tableHandle)
     {
         return inTransaction(getSession(), transactionSession -> {
             // metadata.getCatalogHandle() registers the catalog for the transaction
             getQueryRunner().getMetadata().getCatalogHandle(transactionSession, tableHandle.getCatalogHandle().getCatalogName());
-            return getQueryRunner().getMetadata().getTableMetadata(transactionSession, tableHandle);
+            return getQueryRunner().getMetadata().getTableName(transactionSession, tableHandle);
         });
     }
 
     private <T> T inTransaction(Session session, Function<Session, T> transactionSessionConsumer)
     {
-        return transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getAccessControl())
+        return transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getMetadata(), getQueryRunner().getAccessControl())
                 .singleStatement()
                 .execute(session, transactionSessionConsumer);
     }
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestWindowQueries.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestWindowQueries.java
index 7c5fddb1a289..54b4d88af37b 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestWindowQueries.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestWindowQueries.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.spi.type.VarcharType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
@@ -290,7 +290,6 @@ public void testWindowFunctionWithImplicitCoercion()
         assertQuery("SELECT *, 1.0 * sum(x) OVER () FROM (VALUES 1) t(x)", "SELECT 1, 1.0");
     }
 
-    @SuppressWarnings("PointlessArithmeticExpression")
     @Test
     public void testWindowFunctionsExpressions()
     {
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestingTrinoClient.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestingTrinoClient.java
index 2679256700cf..806ba333ecb0 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestingTrinoClient.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestingTrinoClient.java
@@ -43,11 +43,11 @@
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.trino.client.StatementClientFactory.newStatementClient;
 import static io.trino.spi.security.SelectedRole.Type.ROLE;
 import static io.trino.spi.session.ResourceEstimates.CPU_TIME;
 import static io.trino.spi.session.ResourceEstimates.EXECUTION_TIME;
 import static io.trino.spi.session.ResourceEstimates.PEAK_MEMORY;
+import static io.trino.testing.TestingStatementClientFactory.DEFAULT_STATEMENT_FACTORY;
 import static io.trino.transaction.TransactionBuilder.transaction;
 import static java.util.Objects.requireNonNull;
 
@@ -57,17 +57,29 @@ public abstract class AbstractTestingTrinoClient<T>
     private final TestingTrinoServer trinoServer;
     private final Session defaultSession;
     private final OkHttpClient httpClient;
+    private final TestingStatementClientFactory statementClientFactory;
 
     protected AbstractTestingTrinoClient(TestingTrinoServer trinoServer, Session defaultSession)
     {
-        this(trinoServer, defaultSession, new OkHttpClient());
+        this(trinoServer, DEFAULT_STATEMENT_FACTORY, defaultSession, new OkHttpClient());
+    }
+
+    protected AbstractTestingTrinoClient(TestingTrinoServer trinoServer, TestingStatementClientFactory statementClientFactory, Session defaultSession)
+    {
+        this(trinoServer, statementClientFactory, defaultSession, new OkHttpClient());
     }
 
     protected AbstractTestingTrinoClient(TestingTrinoServer trinoServer, Session defaultSession, OkHttpClient httpClient)
+    {
+        this(trinoServer, DEFAULT_STATEMENT_FACTORY, defaultSession, httpClient);
+    }
+
+    protected AbstractTestingTrinoClient(TestingTrinoServer trinoServer, TestingStatementClientFactory statementClientFactory, Session defaultSession, OkHttpClient httpClient)
     {
         this.trinoServer = requireNonNull(trinoServer, "trinoServer is null");
         this.defaultSession = requireNonNull(defaultSession, "defaultSession is null");
         this.httpClient = requireNonNull(httpClient, "httpClient is null");
+        this.statementClientFactory = requireNonNull(statementClientFactory, "statementClientFactory is null");
     }
 
     @Override
@@ -91,8 +103,7 @@ public ResultWithQueryId<T> execute(Session session, @Language("SQL") String sql
         ResultsSession<T> resultsSession = getResultSession(session);
 
         ClientSession clientSession = toClientSession(session, trinoServer.getBaseUrl(), new Duration(2, TimeUnit.MINUTES));
-
-        try (StatementClient client = newStatementClient(httpClient, clientSession, sql, Optional.of(session.getClientCapabilities()))) {
+        try (StatementClient client = statementClientFactory.create(httpClient, session, clientSession, sql)) {
             while (client.isRunning()) {
                 resultsSession.addResults(client.currentStatusInfo(), client.currentData());
                 client.advance();
@@ -196,7 +207,7 @@ public boolean tableExists(Session session, String table)
 
     private <V> V inTransaction(Session session, Function<Session, V> callback)
     {
-        return transaction(trinoServer.getTransactionManager(), trinoServer.getAccessControl())
+        return transaction(trinoServer.getTransactionManager(), trinoServer.getMetadata(), trinoServer.getAccessControl())
                 .readOnly()
                 .singleStatement()
                 .execute(session, callback);
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseComplexTypesPredicatePushDownTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseComplexTypesPredicatePushDownTest.java
new file mode 100644
index 000000000000..155b7facd06c
--- /dev/null
+++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseComplexTypesPredicatePushDownTest.java
@@ -0,0 +1,168 @@
+/*
+ * Licensed 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 io.trino.testing;
+
+import org.junit.jupiter.api.Test;
+
+import static io.trino.testing.TestingNames.randomNameSuffix;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public abstract class BaseComplexTypesPredicatePushDownTest
+        extends AbstractTestQueryFramework
+{
+    @Test
+    public void testRowTypeOnlyNullsRowGroupPruning()
+    {
+        String tableName = "test_primitive_column_nulls_pruning_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (col BIGINT)");
+        assertUpdate("INSERT INTO " + tableName + " SELECT * FROM unnest(repeat(NULL, 4096))", 4096);
+        assertNoDataRead("SELECT * FROM " + tableName + " WHERE col IS NOT NULL");
+
+        tableName = "test_nested_column_nulls_pruning_" + randomNameSuffix();
+        // Nested column `a` has nulls count of 4096 and contains only nulls
+        // Nested column `b` also has nulls count of 4096, but it contains non nulls as well
+        assertUpdate("CREATE TABLE " + tableName + " (col ROW(a BIGINT, b ARRAY(DOUBLE)))");
+        assertUpdate("INSERT INTO " + tableName + " SELECT * FROM unnest(transform(repeat(1, 4096), x -> ROW(ROW(NULL, ARRAY [NULL, rand()]))))", 4096);
+
+        assertNoDataRead("SELECT * FROM " + tableName + " WHERE col.a IS NOT NULL");
+
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE col.a IS NULL",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(4096));
+
+        // no predicate push down for the entire array type
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE col.b IS NOT NULL",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(4096));
+
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE col.b IS NULL",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+
+        // no predicate push down for entire ROW
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE col IS NOT NULL",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(4096));
+
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE col IS NULL",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testRowTypeRowGroupPruning()
+    {
+        String tableName = "test_nested_column_pruning_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (col1Row ROW(a BIGINT, b BIGINT, c ROW(c1 BIGINT, c2 ROW(c21 BIGINT, c22 BIGINT))))");
+        assertUpdate("INSERT INTO " + tableName + " SELECT * FROM unnest(transform(SEQUENCE(1, 10000), x -> ROW(ROW(x*2, 100, ROW(x, ROW(x*5, x*6))))))", 10000);
+
+        // no data read since the row dereference predicate is pushed down
+        assertNoDataRead("SELECT * FROM " + tableName + " WHERE col1Row.a = -1");
+        assertNoDataRead("SELECT * FROM " + tableName + " WHERE col1Row.a IS NULL");
+        assertNoDataRead("SELECT * FROM " + tableName + " WHERE col1Row.c.c2.c22 = -1");
+        assertNoDataRead("SELECT * FROM " + tableName + " WHERE col1Row.a = -1 AND col1ROW.b = -1 AND col1ROW.c.c1 = -1 AND col1Row.c.c2.c22 = -1");
+
+        // read all since predicate case matches with the data
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE col1Row.b = 100",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(10000));
+
+        // no predicate push down for matching with ROW type, as file format only stores stats for primitives
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE col1Row.c = ROW(-1, ROW(-1, -1))",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE col1Row.c = ROW(-1, ROW(-1, -1)) OR col1Row.a = -1 ",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+
+        // no data read since the row group get filtered by primitives in the predicate
+        assertNoDataRead("SELECT * FROM " + tableName + " WHERE col1Row.c = ROW(-1, ROW(-1, -1)) AND col1Row.a = -1 ");
+
+        // no predicate push down for entire ROW, as file format only stores stats for primitives
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE col1Row = ROW(-1, -1, ROW(-1, ROW(-1, -1)))",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testMapTypeRowGroupPruning()
+    {
+        String tableName = "test_nested_column_pruning_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (colMap Map(VARCHAR, BIGINT))");
+        assertUpdate("INSERT INTO " + tableName + " SELECT * FROM unnest(transform(SEQUENCE(1, 10000), x -> ROW(MAP(ARRAY['FOO', 'BAR'], ARRAY[100, 200]))))", 10000);
+
+        // no predicate push down for MAP type dereference
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE colMap['FOO'] = -1",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+
+        // no predicate push down for entire Map type
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE colMap = MAP(ARRAY['FOO', 'BAR'], ARRAY[-1, -1])",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    @Test
+    public void testArrayTypeRowGroupPruning()
+    {
+        String tableName = "test_nested_column_pruning_" + randomNameSuffix();
+        assertUpdate("CREATE TABLE " + tableName + " (colArray ARRAY(BIGINT))");
+        assertUpdate("INSERT INTO " + tableName + " SELECT * FROM unnest(transform(SEQUENCE(1, 10000), x -> ROW(ARRAY[100, 200])))", 10000);
+
+        // no predicate push down for ARRAY type dereference
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE colArray[1] = -1",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+
+        // no predicate push down for entire ARRAY type
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE colArray = ARRAY[-1, -1]",
+                queryStats -> assertThat(queryStats.getProcessedInputDataSize().toBytes()).isGreaterThan(0),
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+}
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorSmokeTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorSmokeTest.java
index a30ef33c5e8b..c7cdabd36d93 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorSmokeTest.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorSmokeTest.java
@@ -14,15 +14,20 @@
 package io.trino.testing;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.Session;
+import io.trino.spi.security.Identity;
 import io.trino.testing.sql.TestTable;
+import io.trino.testing.sql.TestView;
 import io.trino.tpch.TpchTable;
-import org.testng.SkipException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.regex.Pattern;
 
 import static io.trino.spi.connector.ConnectorMetadata.MODIFYING_ROWS_MESSAGE;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_COMMENT_ON_MATERIALIZED_VIEW_COLUMN;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_COMMENT_ON_VIEW;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_COMMENT_ON_VIEW_COLUMN;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_MATERIALIZED_VIEW;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_SCHEMA;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_TABLE;
@@ -35,12 +40,16 @@
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_RENAME_TABLE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ROW_LEVEL_DELETE;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ROW_LEVEL_UPDATE;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_TRUNCATE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_UPDATE;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tpch.TpchTable.NATION;
 import static io.trino.tpch.TpchTable.REGION;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assumptions.abort;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * A connector smoke test exercising various connector functionalities without going in depth on any of them.
@@ -53,7 +62,6 @@ public abstract class BaseConnectorSmokeTest
 
     /**
      * Make sure to group related behaviours together in the order and grouping they are declared in {@link TestingConnectorBehavior}.
-     * If required, annotate the method with {@code @SuppressWarnings("DuplicateBranchesInSwitch")}.
      */
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
@@ -197,7 +205,7 @@ public void verifySupportsDeleteDeclaration()
             return;
         }
 
-        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE));
+        assumeTrue(hasBehavior(SUPPORTS_CREATE_TABLE));
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_supports_delete", "AS SELECT * FROM region")) {
             assertQueryFails("DELETE FROM " + table.getName(), MODIFYING_ROWS_MESSAGE);
         }
@@ -211,16 +219,54 @@ public void verifySupportsRowLevelDeleteDeclaration()
             return;
         }
 
-        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE));
+        assumeTrue(hasBehavior(SUPPORTS_CREATE_TABLE));
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_supports_row_level_delete", "AS SELECT * FROM region")) {
             assertQueryFails("DELETE FROM " + table.getName() + " WHERE regionkey = 2", MODIFYING_ROWS_MESSAGE);
         }
     }
 
+    @Test
+    public void verifySupportsUpdateDeclaration()
+    {
+        if (hasBehavior(SUPPORTS_UPDATE)) {
+            // Covered by testUpdate
+            return;
+        }
+
+        assumeTrue(hasBehavior(SUPPORTS_CREATE_TABLE));
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_supports_update", "AS SELECT * FROM nation")) {
+            assertQueryFails("UPDATE " + table.getName() + " SET nationkey = 100 WHERE regionkey = 2", MODIFYING_ROWS_MESSAGE);
+        }
+    }
+
+    @Test
+    public void verifySupportsRowLevelUpdateDeclaration()
+    {
+        if (hasBehavior(SUPPORTS_ROW_LEVEL_UPDATE)) {
+            // Covered by testRowLevelUpdate
+            return;
+        }
+
+        assumeTrue(hasBehavior(SUPPORTS_CREATE_TABLE));
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_row_update", "AS SELECT * FROM nation")) {
+            assertQueryFails("UPDATE " + table.getName() + " SET nationkey = nationkey * 100 WHERE regionkey = 2", MODIFYING_ROWS_MESSAGE);
+        }
+    }
+
+    @Test
+    public void testUpdate()
+    {
+        assumeTrue(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_UPDATE));
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_row_update", "AS SELECT * FROM nation")) {
+            assertUpdate("UPDATE " + table.getName() + " SET nationkey = 100 WHERE regionkey = 2", 5);
+            assertQuery("SELECT count(*) FROM " + table.getName() + " WHERE nationkey = 100", "VALUES 5");
+        }
+    }
+
     @Test
     public void testDeleteAllDataFromTable()
     {
-        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_DELETE));
+        assumeTrue(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_DELETE));
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_delete_all_data", "AS SELECT * FROM region")) {
             // not using assertUpdate as some connectors provide update count and some do not
             getQueryRunner().execute("DELETE FROM " + table.getName());
@@ -231,7 +277,7 @@ public void testDeleteAllDataFromTable()
     @Test
     public void testRowLevelDelete()
     {
-        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_ROW_LEVEL_DELETE));
+        assumeTrue(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_ROW_LEVEL_DELETE));
         // TODO (https://github.com/trinodb/trino/issues/5901) Use longer table name once Oracle version is updated
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_row_delete", "AS SELECT * FROM region")) {
             assertUpdate("DELETE FROM " + table.getName() + " WHERE regionkey = 2", 1);
@@ -244,9 +290,26 @@ public void testRowLevelDelete()
     }
 
     @Test
-    public void testUpdate()
+    public void testTruncateTable()
+    {
+        if (!hasBehavior(SUPPORTS_TRUNCATE)) {
+            assertQueryFails("TRUNCATE TABLE nation", "This connector does not support truncating tables");
+            return;
+        }
+
+        assumeTrue(hasBehavior(SUPPORTS_CREATE_TABLE));
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_truncate", "AS SELECT * FROM region")) {
+            assertUpdate("TRUNCATE TABLE " + table.getName());
+            assertThat(query("TABLE " + table.getName()))
+                    .returnsEmptyResult();
+        }
+    }
+
+    @Test
+    public void testRowLevelUpdate()
     {
-        if (!hasBehavior(SUPPORTS_UPDATE)) {
+        if (!hasBehavior(SUPPORTS_ROW_LEVEL_UPDATE)) {
             // Note this change is a no-op, if actually run
             assertQueryFails("UPDATE nation SET nationkey = nationkey + regionkey WHERE regionkey < 1", MODIFYING_ROWS_MESSAGE);
             return;
@@ -315,6 +378,22 @@ public void testCreateSchema()
         assertUpdate("DROP SCHEMA " + schemaName);
     }
 
+    @Test
+    public void testCreateSchemaWithNonLowercaseOwnerName()
+    {
+        assumeTrue(hasBehavior(SUPPORTS_CREATE_SCHEMA));
+
+        Session newSession = Session.builder(getSession())
+                .setIdentity(Identity.ofUser("ADMIN"))
+                .build();
+        String schemaName = "test_schema_create_uppercase_owner_name_" + randomNameSuffix();
+        assertUpdate(newSession, createSchemaSql(schemaName));
+        assertThat(query(newSession, "SHOW SCHEMAS"))
+                .skippingTypesCheck()
+                .containsAll(format("VALUES '%s'", schemaName));
+        assertUpdate(newSession, "DROP SCHEMA " + schemaName);
+    }
+
     @Test
     public void testRenameSchema()
     {
@@ -327,7 +406,7 @@ public void testRenameSchema()
         }
 
         if (!hasBehavior(SUPPORTS_CREATE_SCHEMA)) {
-            throw new SkipException("Skipping as connector does not support CREATE SCHEMA");
+            abort("Skipping as connector does not support CREATE SCHEMA");
         }
 
         String schemaName = "test_rename_schema_" + randomNameSuffix();
@@ -389,7 +468,7 @@ public void testRenameTableAcrossSchemas()
     {
         if (!hasBehavior(SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS)) {
             if (!hasBehavior(SUPPORTS_RENAME_TABLE)) {
-                throw new SkipException("Skipping since rename table is not supported at all");
+                abort("Skipping since rename table is not supported at all");
             }
             assertQueryFails("ALTER TABLE nation RENAME TO other_schema.yyyy", "This connector does not support renaming tables across schemas");
             return;
@@ -536,6 +615,145 @@ public void testMaterializedView()
                         "FROM\n" +
                         "  nation");
 
+        // information_schema.tables (no filtering on table_name so that ConnectorMetadata.listViews is exercised)
+        assertThat(query("SELECT table_name, table_type FROM information_schema.tables WHERE table_schema = '" + schemaName + "'"))
+                .containsAll("VALUES (VARCHAR '" + viewName + "', VARCHAR 'BASE TABLE')");
+
+        // information_schema.views
+        assertThat(computeActual("SELECT table_name FROM information_schema.views WHERE table_schema = '" + schemaName + "'").getOnlyColumnAsSet())
+                .doesNotContain(viewName);
+        assertThat(query("SELECT table_name FROM information_schema.views WHERE table_schema = '" + schemaName + "' AND table_name = '" + viewName + "'"))
+                .returnsEmptyResult();
+
+        // materialized view-specific listings
+        assertThat(query("SELECT name FROM system.metadata.materialized_views WHERE catalog_name = '" + catalogName + "' AND schema_name = '" + schemaName + "'"))
+                .containsAll("VALUES VARCHAR '" + viewName + "'");
+
         assertUpdate("DROP MATERIALIZED VIEW " + viewName);
     }
+
+    @Test
+    public void testCommentView()
+    {
+        if (!hasBehavior(SUPPORTS_COMMENT_ON_VIEW)) {
+            if (hasBehavior(SUPPORTS_CREATE_VIEW)) {
+                try (TestView view = new TestView(getQueryRunner()::execute, "test_comment_view", "SELECT * FROM region")) {
+                    assertQueryFails("COMMENT ON VIEW " + view.getName() + " IS 'new comment'", "This connector does not support setting view comments");
+                }
+                return;
+            }
+            abort("Skipping as connector does not support CREATE VIEW");
+        }
+
+        try (TestView view = new TestView(getQueryRunner()::execute, "test_comment_view", "SELECT * FROM region")) {
+            // comment set
+            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS 'new comment'");
+            assertThat((String) computeScalar("SHOW CREATE VIEW " + view.getName())).contains("COMMENT 'new comment'");
+            assertThat(getTableComment(view.getName())).isEqualTo("new comment");
+
+            // comment updated
+            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS 'updated comment'");
+            assertThat(getTableComment(view.getName())).isEqualTo("updated comment");
+
+            // comment set to empty
+            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS ''");
+            assertThat(getTableComment(view.getName())).isEmpty();
+
+            // comment deleted
+            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS 'a comment'");
+            assertThat(getTableComment(view.getName())).isEqualTo("a comment");
+            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS NULL");
+            assertThat(getTableComment(view.getName())).isNull();
+        }
+    }
+
+    @Test
+    public void testCommentViewColumn()
+    {
+        if (!hasBehavior(SUPPORTS_COMMENT_ON_VIEW_COLUMN)) {
+            if (hasBehavior(SUPPORTS_CREATE_VIEW)) {
+                try (TestView view = new TestView(getQueryRunner()::execute, "test_comment_view_column", "SELECT * FROM region")) {
+                    assertQueryFails("COMMENT ON COLUMN " + view.getName() + ".regionkey IS 'new region key comment'", "This connector does not support setting view column comments");
+                }
+                return;
+            }
+            abort("Skipping as connector does not support CREATE VIEW");
+        }
+
+        String viewColumnName = "regionkey";
+        try (TestView view = new TestView(getQueryRunner()::execute, "test_comment_view_column", "SELECT * FROM region")) {
+            // comment set
+            assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS 'new region key comment'");
+            assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo("new region key comment");
+
+            // comment updated
+            assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS 'updated region key comment'");
+            assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo("updated region key comment");
+
+            // comment set to empty
+            assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS ''");
+            assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo("");
+
+            // comment deleted
+            assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS NULL");
+            assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo(null);
+        }
+    }
+
+    @Test
+    public void testCommentMaterializedViewColumn()
+    {
+        if (!hasBehavior(SUPPORTS_COMMENT_ON_MATERIALIZED_VIEW_COLUMN)) {
+            if (hasBehavior(SUPPORTS_CREATE_MATERIALIZED_VIEW)) {
+                String viewName = "test_materialized_view_" + randomNameSuffix();
+                assertUpdate("CREATE MATERIALIZED VIEW " + viewName + " AS SELECT * FROM nation");
+                assertQueryFails("COMMENT ON COLUMN " + viewName + ".regionkey IS 'new region key comment'", "This connector does not support setting materialized view column comments");
+                assertUpdate("DROP MATERIALIZED VIEW " + viewName);
+                return;
+            }
+            abort("Skipping as connector does not support MATERIALIZED VIEW COLUMN COMMENT");
+        }
+
+        String viewName = "test_materialized_view_" + randomNameSuffix();
+        try {
+            assertUpdate("CREATE MATERIALIZED VIEW " + viewName + " AS SELECT * FROM nation");
+
+            // comment set
+            assertUpdate("COMMENT ON COLUMN " + viewName + ".regionkey IS 'new region key comment'");
+            assertThat(getColumnComment(viewName, "regionkey")).isEqualTo("new region key comment");
+
+            // comment updated
+            assertUpdate("COMMENT ON COLUMN " + viewName + ".regionkey IS 'updated region key comment'");
+            assertThat(getColumnComment(viewName, "regionkey")).isEqualTo("updated region key comment");
+
+            // refresh materialized view
+            assertUpdate("REFRESH MATERIALIZED VIEW " + viewName, 25);
+            assertThat(getColumnComment(viewName, "regionkey")).isEqualTo("updated region key comment");
+
+            // comment set to empty
+            assertUpdate("COMMENT ON COLUMN " + viewName + ".regionkey IS ''");
+            assertThat(getColumnComment(viewName, "regionkey")).isEqualTo("");
+
+            // comment deleted
+            assertUpdate("COMMENT ON COLUMN " + viewName + ".regionkey IS NULL");
+            assertThat(getColumnComment(viewName, "regionkey")).isEqualTo(null);
+        }
+        finally {
+            assertUpdate("DROP MATERIALIZED VIEW " + viewName);
+        }
+    }
+
+    protected String getTableComment(String tableName)
+    {
+        return (String) computeScalar(format("SELECT comment FROM system.metadata.table_comments WHERE catalog_name = '%s' AND schema_name = '%s' AND table_name = '%s'", getSession().getCatalog().orElseThrow(), getSession().getSchema().orElseThrow(), tableName));
+    }
+
+    protected String getColumnComment(String tableName, String columnName)
+    {
+        return (String) computeScalar(format(
+                "SELECT comment FROM information_schema.columns WHERE table_schema = '%s' AND table_name = '%s' AND column_name = '%s'",
+                getSession().getSchema().orElseThrow(),
+                tableName,
+                columnName));
+    }
 }
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
index f1ac663c3fa8..031fc152a3fa 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
@@ -15,13 +15,13 @@
 
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.UncheckedTimeoutException;
 import io.airlift.log.Logger;
+import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.Session;
-import io.trino.connector.CatalogName;
 import io.trino.connector.MockConnectorFactory;
 import io.trino.connector.MockConnectorPlugin;
 import io.trino.cost.StatsAndCosts;
@@ -34,15 +34,18 @@
 import io.trino.server.BasicQueryInfo;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.MaterializedViewFreshness;
+import io.trino.spi.security.Identity;
 import io.trino.sql.planner.OptimizerConfig.JoinDistributionType;
 import io.trino.sql.planner.Plan;
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.LimitNode;
 import io.trino.sql.planner.plan.OutputNode;
+import io.trino.sql.planner.plan.ProjectNode;
 import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.testing.sql.TestTable;
 import io.trino.testing.sql.TestView;
+import io.trino.tpch.TpchTable;
 import org.intellij.lang.annotations.Language;
 import org.testng.SkipException;
 import org.testng.annotations.BeforeClass;
@@ -68,6 +71,7 @@
 import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
@@ -102,17 +106,23 @@
 import static io.trino.testing.DataProviders.toDataProvider;
 import static io.trino.testing.MaterializedResult.resultBuilder;
 import static io.trino.testing.QueryAssertions.assertContains;
+import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
 import static io.trino.testing.QueryAssertions.getTrinoExceptionCause;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ADD_COLUMN;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ADD_COLUMN_NOT_NULL_CONSTRAINT;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ADD_COLUMN_WITH_COMMENT;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ADD_FIELD;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ARRAY;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_COMMENT_ON_COLUMN;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_COMMENT_ON_MATERIALIZED_VIEW_COLUMN;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_COMMENT_ON_TABLE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_COMMENT_ON_VIEW;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_COMMENT_ON_VIEW_COLUMN;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_FEDERATED_MATERIALIZED_VIEW;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_FUNCTION;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_MATERIALIZED_VIEW;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_MATERIALIZED_VIEW_GRACE_PERIOD;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_OR_REPLACE_TABLE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_SCHEMA;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_TABLE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT;
@@ -120,29 +130,36 @@
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_VIEW;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_DELETE;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_DEREFERENCE_PUSHDOWN;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_DROP_COLUMN;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_DROP_FIELD;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_DROP_SCHEMA_CASCADE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_INSERT;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_MATERIALIZED_VIEW_FRESHNESS_FROM_BASE_TABLES;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_MERGE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_MULTI_STATEMENT_WRITES;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_NEGATIVE_DATE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_NOT_NULL_CONSTRAINT;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_RENAME_COLUMN;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_RENAME_FIELD;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_RENAME_MATERIALIZED_VIEW;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_RENAME_MATERIALIZED_VIEW_ACROSS_SCHEMAS;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_RENAME_SCHEMA;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_RENAME_TABLE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_REPORTING_WRITTEN_BYTES;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ROW_LEVEL_DELETE;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ROW_LEVEL_UPDATE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_ROW_TYPE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_SET_COLUMN_TYPE;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_SET_FIELD_TYPE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_TOPN_PUSHDOWN;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_TRUNCATE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_UPDATE;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.testing.assertions.Assert.assertEventually;
 import static io.trino.testing.assertions.TestUtil.verifyResultOrFailure;
-import static io.trino.transaction.TransactionBuilder.transaction;
+import static io.trino.tpch.TpchTable.CUSTOMER;
 import static java.lang.String.format;
 import static java.lang.String.join;
 import static java.lang.Thread.currentThread;
@@ -160,7 +177,6 @@
 import static org.assertj.core.api.InstanceOfAssertFactories.ZONED_DATE_TIME;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
@@ -173,6 +189,11 @@ public abstract class BaseConnectorTest
 {
     private static final Logger log = Logger.get(BaseConnectorTest.class);
 
+    protected static final List<TpchTable<?>> REQUIRED_TPCH_TABLES = ImmutableSet.<TpchTable<?>>builder()
+            .addAll(AbstractTestQueries.REQUIRED_TPCH_TABLES)
+            .add(CUSTOMER)
+            .build().asList();
+
     private final ConcurrentMap<String, Function<ConnectorSession, List<String>>> mockTableListings = new ConcurrentHashMap<>();
 
     @BeforeClass
@@ -188,15 +209,14 @@ protected MockConnectorPlugin buildMockConnectorPlugin()
         MockConnectorFactory connectorFactory = MockConnectorFactory.builder()
                 .withListSchemaNames(session -> ImmutableList.copyOf(mockTableListings.keySet()))
                 .withListTables((session, schemaName) ->
-                    verifyNotNull(mockTableListings.get(schemaName), "No listing function registered for [%s]", schemaName)
-                            .apply(session))
+                        verifyNotNull(mockTableListings.get(schemaName), "No listing function registered for [%s]", schemaName)
+                                .apply(session))
                 .build();
         return new MockConnectorPlugin(connectorFactory);
     }
 
     /**
      * Make sure to group related behaviours together in the order and grouping they are declared in {@link TestingConnectorBehavior}.
-     * If required, annotate the method with {@code @SuppressWarnings("DuplicateBranchesInSwitch")}.
      */
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
@@ -456,6 +476,13 @@ public void testAggregation()
         assertQuery(
                 "SELECT count(*) FROM (SELECT count(*) FROM nation UNION ALL SELECT count(*) FROM region)",
                 "VALUES 2");
+
+        // HAVING, i.e. filter after aggregation
+        assertQuery("SELECT count(*) FROM nation HAVING count(*) = 25");
+        assertQuery("SELECT regionkey, count(*) FROM nation GROUP BY regionkey HAVING count(*) = 5");
+        assertQuery(
+                "SELECT regionkey, count(*) FROM nation GROUP BY GROUPING SETS ((), (regionkey)) HAVING count(*) IN (5, 25)",
+                "(SELECT NULL, count(*) FROM nation) UNION ALL (SELECT regionkey, count(*) FROM nation GROUP BY regionkey)");
     }
 
     @Test
@@ -813,7 +840,11 @@ public void testView()
         String schemaName = getSession().getSchema().orElseThrow();
         String testView = "test_view_" + randomNameSuffix();
         String testViewWithComment = "test_view_with_comment_" + randomNameSuffix();
+        assertThat(computeActual("SHOW TABLES").getOnlyColumnAsSet()) // prime the cache, if any
+                .doesNotContain(testView);
         assertUpdate("CREATE VIEW " + testView + " AS SELECT 123 x");
+        assertThat(computeActual("SHOW TABLES").getOnlyColumnAsSet())
+                .contains(testView);
         assertUpdate("CREATE OR REPLACE VIEW " + testView + " AS " + query);
 
         assertUpdate("CREATE VIEW " + testViewWithComment + " COMMENT 'orders' AS SELECT 123 x");
@@ -949,6 +980,8 @@ public void testView()
                                 "CROSS JOIN UNNEST(ARRAY['orderkey', 'orderstatus', 'half'])");
 
         assertUpdate("DROP VIEW " + testView);
+        assertThat(computeActual("SHOW TABLES").getOnlyColumnAsSet())
+                .doesNotContain(testView);
     }
 
     @Test
@@ -996,21 +1029,14 @@ public void testMaterializedView()
             return;
         }
 
+        String catalog = getSession().getCatalog().orElseThrow();
+        String schema = getSession().getSchema().orElseThrow();
         String otherSchema = "other_schema" + randomNameSuffix();
         assertUpdate(createSchemaSql(otherSchema));
 
-        QualifiedObjectName view = new QualifiedObjectName(
-                getSession().getCatalog().orElseThrow(),
-                getSession().getSchema().orElseThrow(),
-                "test_materialized_view_" + randomNameSuffix());
-        QualifiedObjectName otherView = new QualifiedObjectName(
-                getSession().getCatalog().orElseThrow(),
-                otherSchema,
-                "test_materialized_view_" + randomNameSuffix());
-        QualifiedObjectName viewWithComment = new QualifiedObjectName(
-                getSession().getCatalog().orElseThrow(),
-                getSession().getSchema().orElseThrow(),
-                "test_materialized_view_with_comment_" + randomNameSuffix());
+        QualifiedObjectName view = new QualifiedObjectName(catalog, schema, "test_materialized_view_" + randomNameSuffix());
+        QualifiedObjectName otherView = new QualifiedObjectName(catalog, otherSchema, "test_materialized_view_" + randomNameSuffix());
+        QualifiedObjectName viewWithComment = new QualifiedObjectName(catalog, schema, "test_materialized_view_with_comment_" + randomNameSuffix());
 
         createTestingMaterializedView(view, Optional.empty());
         createTestingMaterializedView(otherView, Optional.of("sarcastic comment"));
@@ -1037,12 +1063,12 @@ public void testMaterializedView()
         assertThat(query("SHOW TABLES"))
                 .skippingTypesCheck()
                 .containsAll("VALUES '" + view.getObjectName() + "'");
-        // information_schema.tables without table_name filter
+        // information_schema.tables without table_name filter so that ConnectorMetadata.listViews is exercised
         assertThat(query(
                 "SELECT table_name, table_type FROM information_schema.tables " +
                         "WHERE table_schema = '" + view.getSchemaName() + "'"))
                 .skippingTypesCheck()
-                .containsAll("VALUES ('" + view.getObjectName() + "', 'BASE TABLE')"); // TODO table_type should probably be "* VIEW"
+                .containsAll("VALUES ('" + view.getObjectName() + "', 'BASE TABLE')");
         // information_schema.tables with table_name filter
         assertQuery(
                 "SELECT table_name, table_type FROM information_schema.tables " +
@@ -1095,7 +1121,14 @@ public void testMaterializedView()
                                 "CROSS JOIN UNNEST(ARRAY['nationkey', 'name', 'regionkey', 'comment'])");
 
         // view-specific listings
-        checkInformationSchemaViewsForMaterializedView(view.getSchemaName(), view.getObjectName());
+        assertThat(computeActual("SELECT table_name FROM information_schema.views WHERE table_schema = '" + view.getSchemaName() + "'").getOnlyColumnAsSet())
+                .doesNotContain(view.getObjectName());
+        assertThat(query("SELECT table_name FROM information_schema.views WHERE table_schema = '" + view.getSchemaName() + "' AND table_name = '" + view.getObjectName() + "'"))
+                .returnsEmptyResult();
+
+        // materialized view-specific listings
+        assertThat(query("SELECT name FROM system.metadata.materialized_views WHERE catalog_name = '" + catalog + "' AND schema_name = '" + view.getSchemaName() + "'"))
+                .containsAll("VALUES VARCHAR '" + view.getObjectName() + "'");
 
         // system.jdbc.columns without filter
         assertThat(query("SELECT table_schem, table_name, column_name FROM system.jdbc.columns"))
@@ -1273,14 +1306,15 @@ public void testMaterializedViewGracePeriod()
                     node(AggregationNode.class, // final
                             anyTree(// exchanges
                                     node(AggregationNode.class, // partial
-                                            anyTree(tableScan(table.getName()))))));
+                                            node(ProjectNode.class, // format()
+                                                    tableScan(table.getName()))))));
             PlanMatchPattern readFromStorageTable = node(OutputNode.class, node(TableScanNode.class));
 
             assertUpdate("CREATE MATERIALIZED VIEW " + viewName + " " +
                     "GRACE PERIOD INTERVAL '1' HOUR " +
-                    "AS SELECT DISTINCT regionkey, name FROM " + table.getName());
+                    "AS SELECT DISTINCT regionkey, format('%s', name) name FROM " + table.getName());
 
-            String initialResults = "SELECT DISTINCT regionkey, name FROM region";
+            String initialResults = "SELECT DISTINCT regionkey, CAST(name AS varchar) FROM region";
 
             // The MV is initially not fresh
             assertThat(getMaterializedViewFreshness(viewName)).isEqualTo(STALE);
@@ -1289,15 +1323,27 @@ public void testMaterializedViewGracePeriod()
             assertThat(query(legacySession, "TABLE " + viewName)).hasPlan(readFromBaseTables).matches(initialResults);
             assertThat(query(futureSession, "TABLE " + viewName)).hasPlan(readFromBaseTables).matches(initialResults);
 
+            ZonedDateTime beforeRefresh = ZonedDateTime.now();
             assertUpdate("REFRESH MATERIALIZED VIEW " + viewName, 5);
+            ZonedDateTime afterRefresh = ZonedDateTime.now();
 
             // Right after the REFRESH, the view is FRESH (note: it could also be UNKNOWN)
-            assertThat(getMaterializedViewFreshness(viewName)).isEqualTo(FRESH);
-            assertThat(getMaterializedViewLastFreshTime(viewName))
-                    .isEmpty(); // last_fresh_time should not be reported for FRESH views to avoid ambiguity when it "races with currentTimeMillis"
+            boolean supportsFresh = hasBehavior(SUPPORTS_MATERIALIZED_VIEW_FRESHNESS_FROM_BASE_TABLES);
+            if (supportsFresh) {
+                assertThat(getMaterializedViewFreshness(viewName)).isEqualTo(FRESH);
+                assertThat(getMaterializedViewLastFreshTime(viewName))
+                        .isEmpty(); // last_fresh_time should not be reported for FRESH views to avoid ambiguity when it "races with currentTimeMillis"
+            }
+            else {
+                assertThat(getMaterializedViewFreshness(viewName)).isEqualTo(UNKNOWN);
+                assertThat(getMaterializedViewLastFreshTime(viewName))
+                        .get(ZONED_DATE_TIME).isBetween(beforeRefresh, afterRefresh);
+            }
             assertThat(query(defaultSession, "TABLE " + viewName)).hasPlan(readFromStorageTable).matches(initialResults);
             assertThat(query(legacySession, "TABLE " + viewName)).hasPlan(readFromStorageTable).matches(initialResults);
-            assertThat(query(futureSession, "TABLE " + viewName)).hasPlan(readFromStorageTable).matches(initialResults);
+            assertThat(query(futureSession, "TABLE " + viewName))
+                    .hasPlan(supportsFresh ? readFromStorageTable : readFromBaseTables)
+                    .matches(initialResults);
 
             // Change underlying state
             ZonedDateTime beforeModification = ZonedDateTime.now();
@@ -1305,24 +1351,35 @@ public void testMaterializedViewGracePeriod()
             ZonedDateTime afterModification = ZonedDateTime.now();
             String updatedResults = initialResults + " UNION ALL VALUES (42, 'foo new region')";
 
-            // The materialization is stale now (note: it could also be UNKNOWN)
-            assertThat(getMaterializedViewFreshness(viewName)).isEqualTo(STALE);
+            // The materialization is stale now
+            assertThat(getMaterializedViewFreshness(viewName)).isEqualTo(supportsFresh ? STALE : UNKNOWN);
             assertThat(getMaterializedViewLastFreshTime(viewName))
-                    .get(ZONED_DATE_TIME).isBetween(beforeModification, afterModification);
+                    .get(ZONED_DATE_TIME).isBetween(
+                            supportsFresh ? beforeModification : beforeRefresh,
+                            supportsFresh ? afterModification : afterRefresh);
             assertThat(query(defaultSession, "TABLE " + viewName)).hasPlan(readFromStorageTable).matches(initialResults);
-            assertThat(query(legacySession, "TABLE " + viewName)).hasPlan(readFromBaseTables).matches(updatedResults);
+            assertThat(query(legacySession, "TABLE " + viewName))
+                    .hasPlan(supportsFresh ? readFromBaseTables : readFromStorageTable)
+                    .matches(supportsFresh ? updatedResults : initialResults);
             assertThat(query(futureSession, "TABLE " + viewName)).hasPlan(readFromBaseTables).matches(updatedResults);
 
             assertUpdate("REFRESH MATERIALIZED VIEW " + viewName, 6);
 
-            // Right after the REFRESH, the view is FRESH (note: it could also be UNKNOWN)
-            assertThat(getMaterializedViewFreshness(viewName)).isEqualTo(FRESH);
-            assertThat(getMaterializedViewLastFreshTime(viewName))
-                    .isEmpty(); // last_fresh_time should not be reported for FRESH views to avoid ambiguity when it "races with currentTimeMillis"
+            // Right after the REFRESH, the view is FRESH (or UNKNOWN)
+            if (supportsFresh) {
+                assertThat(getMaterializedViewFreshness(viewName)).isEqualTo(FRESH);
+                assertThat(getMaterializedViewLastFreshTime(viewName))
+                        .isEmpty(); // last_fresh_time should not be reported for FRESH views to avoid ambiguity when it "races with currentTimeMillis"
+            }
+            else {
+                assertThat(getMaterializedViewFreshness(viewName)).isEqualTo(UNKNOWN);
+            }
 
             assertThat(query(defaultSession, "TABLE " + viewName)).hasPlan(readFromStorageTable).matches(updatedResults);
             assertThat(query(legacySession, "TABLE " + viewName)).hasPlan(readFromStorageTable).matches(updatedResults);
-            assertThat(query(futureSession, "TABLE " + viewName)).hasPlan(readFromStorageTable).matches(updatedResults);
+            assertThat(query(futureSession, "TABLE " + viewName))
+                    .hasPlan(supportsFresh ? readFromStorageTable : readFromBaseTables)
+                    .matches(updatedResults);
 
             assertUpdate("DROP MATERIALIZED VIEW " + viewName);
         }
@@ -1545,6 +1602,45 @@ private Optional<ZonedDateTime> getMaterializedViewLastFreshTime(String material
         return Optional.ofNullable(lastFreshTime);
     }
 
+    @Test
+    public void testColumnCommentMaterializedView()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_MATERIALIZED_VIEW));
+
+        String viewName = "test_materialized_view_" + randomNameSuffix();
+        if (!hasBehavior(SUPPORTS_COMMENT_ON_MATERIALIZED_VIEW_COLUMN)) {
+            assertUpdate("CREATE MATERIALIZED VIEW " + viewName + " AS SELECT * FROM nation");
+            assertQueryFails("COMMENT ON COLUMN " + viewName + ".regionkey IS 'new region key comment'", "This connector does not support setting materialized view column comments");
+            assertUpdate("DROP MATERIALIZED VIEW " + viewName);
+            return;
+        }
+
+        assertUpdate("CREATE MATERIALIZED VIEW " + viewName + " AS SELECT * FROM nation");
+        try {
+            assertUpdate("COMMENT ON COLUMN " + viewName + ".name IS 'new comment'");
+            assertThat(getColumnComment(viewName, "name")).isEqualTo("new comment");
+
+            // comment deleted
+            assertUpdate("COMMENT ON COLUMN " + viewName + ".name IS NULL");
+            assertThat(getColumnComment(viewName, "name")).isEqualTo(null);
+
+            // comment set to non-empty value before verifying setting empty comment
+            assertUpdate("COMMENT ON COLUMN " + viewName + ".name IS 'updated comment'");
+            assertThat(getColumnComment(viewName, "name")).isEqualTo("updated comment");
+
+            // refresh materialized view
+            assertUpdate("REFRESH MATERIALIZED VIEW " + viewName, 25);
+            assertThat(getColumnComment(viewName, "name")).isEqualTo("updated comment");
+
+            // comment set to empty
+            assertUpdate("COMMENT ON COLUMN " + viewName + ".name IS ''");
+            assertThat(getColumnComment(viewName, "name")).isEmpty();
+        }
+        finally {
+            assertUpdate("DROP MATERIALIZED VIEW " + viewName);
+        }
+    }
+
     @Test
     public void testCompatibleTypeChangeForView()
     {
@@ -1641,9 +1737,9 @@ public void testViewMetadata(String securityClauseInCreate, String securityClaus
         // test SHOW COLUMNS
         assertThat(query("SHOW COLUMNS FROM " + viewName))
                 .matches(resultBuilder(getSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
-                .row("x", "bigint", "", "")
-                .row("y", "varchar(3)", "", "")
-                .build());
+                        .row("x", "bigint", "", "")
+                        .row("y", "varchar(3)", "", "")
+                        .build());
 
         // test SHOW CREATE VIEW
         String expectedSql = formatSqlText(format(
@@ -1842,6 +1938,7 @@ public void testViewAndMaterializedViewTogether()
         }
         // Validate that it is possible to have views and materialized views defined at the same time and both are operational
 
+        String catalogName = getSession().getCatalog().orElseThrow();
         String schemaName = getSession().getSchema().orElseThrow();
 
         String regularViewName = "test_views_together_normal_" + randomNameSuffix();
@@ -1850,12 +1947,17 @@ public void testViewAndMaterializedViewTogether()
         String materializedViewName = "test_views_together_materialized_" + randomNameSuffix();
         assertUpdate("CREATE MATERIALIZED VIEW " + materializedViewName + " AS SELECT * FROM nation");
 
-        // both should be accessible via information_schema.views
-        // TODO: actually it is not the cased now hence overridable `checkInformationSchemaViewsForMaterializedView`
-        assertThat(query("SELECT table_name FROM information_schema.views WHERE table_schema = '" + schemaName + "'"))
-                .skippingTypesCheck()
-                .containsAll("VALUES '" + regularViewName + "'");
-        checkInformationSchemaViewsForMaterializedView(schemaName, materializedViewName);
+        // only the regular view should be accessible via information_schema.views
+        assertThat(query("SELECT table_name FROM information_schema.views WHERE table_schema = '" + schemaName + "' AND table_name IN ('" + regularViewName + "', '" + materializedViewName + "')"))
+                .matches("VALUES VARCHAR '" + regularViewName + "'");
+        assertThat(computeActual("SELECT table_name FROM information_schema.views WHERE table_schema = '" + schemaName + "'").getOnlyColumnAsSet())
+                .contains(regularViewName)
+                .doesNotContain(materializedViewName);
+
+        // only the materialized view should be accessible via system.metadata.materialized_view
+        assertThat(computeActual("SELECT name FROM system.metadata.materialized_views WHERE catalog_name = '" + catalogName + "' AND schema_name = '" + schemaName + "'").getOnlyColumnAsSet())
+                .doesNotContain(regularViewName)
+                .contains(materializedViewName);
 
         // check we can query from both
         assertThat(query("SELECT * FROM " + regularViewName)).containsAll("SELECT * FROM region");
@@ -1865,14 +1967,6 @@ public void testViewAndMaterializedViewTogether()
         assertUpdate("DROP MATERIALIZED VIEW " + materializedViewName);
     }
 
-    // TODO inline when all implementations fixed
-    protected void checkInformationSchemaViewsForMaterializedView(String schemaName, String viewName)
-    {
-        assertThat(query("SELECT table_name FROM information_schema.views WHERE table_schema = '" + schemaName + "'"))
-                .skippingTypesCheck()
-                .containsAll("VALUES '" + viewName + "'");
-    }
-
     /**
      * Test that reading table, column metadata, like {@code SHOW TABLES} or reading from {@code information_schema.views}
      * does not fail when relations are concurrently created or dropped.
@@ -1922,7 +2016,8 @@ protected void testReadMetadataWithRelationsConcurrentModifications(int readIter
         writeTasksCount = 2 * writeTasksCount; // writes are scheduled twice
         CountDownLatch writeTasksInitialized = new CountDownLatch(writeTasksCount);
         Runnable writeInitialized = writeTasksInitialized::countDown;
-        Supplier<Boolean> done = () -> incompleteReadTasks.get() == 0;
+        AtomicBoolean aborted = new AtomicBoolean();
+        Supplier<Boolean> done = () -> aborted.get() || incompleteReadTasks.get() == 0;
         List<Callable<Void>> writeTasks = new ArrayList<>();
         writeTasks.add(createDropRepeatedly(writeInitialized, done, "concur_table", createTableSqlTemplateForConcurrentModifications(), "DROP TABLE %s"));
         if (hasBehavior(SUPPORTS_CREATE_VIEW)) {
@@ -1953,6 +2048,14 @@ protected void testReadMetadataWithRelationsConcurrentModifications(int readIter
                 future.get(); // non-blocking
             }
         }
+        catch (Throwable failure) {
+            aborted.set(true);
+            executor.shutdownNow();
+            if (!executor.awaitTermination(10, SECONDS)) {
+                throw new AssertionError("Test threads did not complete. Leaving test threads behind may violate AbstractTestQueryFramework.checkQueryInfosFinal", failure);
+            }
+            throw failure;
+        }
         finally {
             executor.shutdownNow();
         }
@@ -2308,6 +2411,52 @@ public void testRenameSchema()
         }
     }
 
+    @Test
+    public void testDropSchemaCascade()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_SCHEMA));
+
+        if (!hasBehavior(SUPPORTS_DROP_SCHEMA_CASCADE)) {
+            String schemaName = "test_drop_schema_cascade_" + randomNameSuffix();
+            assertUpdate(createSchemaSql(schemaName));
+            assertQueryFails(
+                    "DROP SCHEMA " + schemaName + " CASCADE",
+                    "This connector does not support dropping schemas with CASCADE option");
+            assertUpdate("DROP SCHEMA " + schemaName);
+            return;
+        }
+
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) || hasBehavior(SUPPORTS_CREATE_VIEW) || hasBehavior(SUPPORTS_CREATE_MATERIALIZED_VIEW));
+
+        String schemaName = "test_drop_schema_cascade_" + randomNameSuffix();
+        String tableName = "test_table" + randomNameSuffix();
+        String viewName = "test_view" + randomNameSuffix();
+        String materializedViewName = "test_materialized_view" + randomNameSuffix();
+        try {
+            assertUpdate(createSchemaSql(schemaName));
+            if (hasBehavior(SUPPORTS_CREATE_TABLE)) {
+                assertUpdate("CREATE TABLE " + schemaName + "." + tableName + "(a INT)");
+            }
+            if (hasBehavior(SUPPORTS_CREATE_VIEW)) {
+                assertUpdate("CREATE VIEW " + schemaName + "." + viewName + " AS SELECT 1 a");
+            }
+            if (hasBehavior(SUPPORTS_CREATE_MATERIALIZED_VIEW)) {
+                assertUpdate("CREATE MATERIALIZED VIEW " + schemaName + "." + materializedViewName + " AS SELECT 1 a");
+            }
+
+            assertThat(computeActual("SHOW SCHEMAS").getOnlyColumnAsSet()).contains(schemaName);
+
+            assertUpdate("DROP SCHEMA " + schemaName + " CASCADE");
+            assertThat(computeActual("SHOW SCHEMAS").getOnlyColumnAsSet()).doesNotContain(schemaName);
+        }
+        finally {
+            assertUpdate("DROP TABLE IF EXISTS " + schemaName + "." + tableName);
+            assertUpdate("DROP VIEW IF EXISTS " + schemaName + "." + viewName);
+            assertUpdate("DROP MATERIALIZED VIEW IF EXISTS " + schemaName + "." + materializedViewName);
+            assertUpdate("DROP SCHEMA IF EXISTS " + schemaName);
+        }
+    }
+
     @Test
     public void testAddColumn()
     {
@@ -2386,33 +2535,55 @@ public void testAddColumnWithComment()
     }
 
     @Test
-    public void testAddNotNullColumnToNonEmptyTable()
+    public void testAddNotNullColumnToEmptyTable()
     {
         skipTestUnless(hasBehavior(SUPPORTS_ADD_COLUMN));
 
-        if (!hasBehavior(SUPPORTS_NOT_NULL_CONSTRAINT)) {
-            assertQueryFails(
-                    "ALTER TABLE nation ADD COLUMN test_add_not_null_col bigint NOT NULL",
-                    ".* Catalog '.*' does not support NOT NULL for column '.*'");
-            return;
-        }
-
-        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_notnull_col", "(a_varchar varchar)")) {
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_nn_to_empty", "(a_varchar varchar)")) {
             String tableName = table.getName();
+            String addNonNullColumn = "ALTER TABLE " + tableName + " ADD COLUMN b_varchar varchar NOT NULL";
 
-            assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN b_varchar varchar NOT NULL");
-            assertFalse(columnIsNullable(tableName, "b_varchar"));
+            if (!hasBehavior(SUPPORTS_ADD_COLUMN_NOT_NULL_CONSTRAINT)) {
+                assertQueryFails(
+                        addNonNullColumn,
+                        hasBehavior(SUPPORTS_NOT_NULL_CONSTRAINT)
+                                ? "This connector does not support adding not null columns"
+                                : ".* Catalog '.*' does not support NOT NULL for column '.*'");
+                return;
+            }
 
+            assertUpdate(addNonNullColumn);
+            assertFalse(columnIsNullable(tableName, "b_varchar"));
             assertUpdate("INSERT INTO " + tableName + " VALUES ('a', 'b')", 1);
+            assertThat(query("TABLE " + tableName))
+                    .skippingTypesCheck()
+                    .matches("VALUES ('a', 'b')");
+        }
+    }
+
+    @Test
+    public void testAddNotNullColumn()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_ADD_COLUMN_NOT_NULL_CONSTRAINT)); // covered by testAddNotNullColumnToEmptyTable
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_nn_col", "(a_varchar varchar)")) {
+            String tableName = table.getName();
+
+            assertUpdate("INSERT INTO " + tableName + " VALUES ('a')", 1);
+            boolean success = false;
             try {
-                assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN c_varchar varchar NOT NULL");
-                assertFalse(columnIsNullable(tableName, "c_varchar"));
-                // Remote database might set implicit default values
-                assertNotNull(computeScalar("SELECT c_varchar FROM " + tableName));
+                assertUpdate("ALTER TABLE " + tableName + " ADD COLUMN b_varchar varchar NOT NULL");
+                success = true;
             }
             catch (Throwable e) {
                 verifyAddNotNullColumnToNonEmptyTableFailurePermissible(e);
             }
+            if (success) {
+                throw new AssertionError("Should fail to add not null column without a default value to a non-empty table");
+            }
+            assertThat(query("TABLE " + tableName))
+                    .skippingTypesCheck()
+                    .matches("VALUES 'a'");
         }
     }
 
@@ -2421,12 +2592,54 @@ protected boolean columnIsNullable(String tableName, String columnName)
         String isNullable = (String) computeScalar(
                 "SELECT is_nullable FROM information_schema.columns WHERE " +
                         "table_schema = '" + getSession().getSchema().orElseThrow() + "' AND table_name = '" + tableName + "' AND column_name = '" + columnName + "'");
-        return "YES".equals(isNullable);
+        return switch (requireNonNull(isNullable, "isNullable is null")) {
+            case "YES" -> true;
+            case "NO" -> false;
+            default -> throw new IllegalStateException("Unrecognized is_nullable value: " + isNullable);
+        };
     }
 
     protected void verifyAddNotNullColumnToNonEmptyTableFailurePermissible(Throwable e)
     {
-        throw new AssertionError("Unexpected adding not null columns failure", e);
+        throw new AssertionError("Unexpected failure when adding not null column", e);
+    }
+
+    @Test
+    public void testAddRowField()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_ROW_TYPE));
+
+        if (!hasBehavior(SUPPORTS_ADD_FIELD)) {
+            try (TestTable table = new TestTable(getQueryRunner()::execute, "test_add_field_", "AS SELECT CAST(row(1) AS row(x integer)) AS col")) {
+                assertQueryFails(
+                        "ALTER TABLE " + table.getName() + " ADD COLUMN col.y integer",
+                        "This connector does not support adding fields");
+            }
+            return;
+        }
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute,
+                "test_add_field_",
+                "AS SELECT CAST(row(1, row(10)) AS row(a integer, b row(x integer))) AS col")) {
+            assertEquals(getColumnType(table.getName(), "col"), "row(a integer, b row(x integer))");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN col.c integer");
+            assertEquals(getColumnType(table.getName(), "col"), "row(a integer, b row(x integer), c integer)");
+            assertThat(query("SELECT * FROM " + table.getName())).matches("SELECT CAST(row(1, row(10), NULL) AS row(a integer, b row(x integer), c integer))");
+
+            // Add a nested field
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN col.b.y integer");
+            assertEquals(getColumnType(table.getName(), "col"), "row(a integer, b row(x integer, y integer), c integer)");
+            assertThat(query("SELECT * FROM " + table.getName())).matches("SELECT CAST(row(1, row(10, NULL), NULL) AS row(a integer, b row(x integer, y integer), c integer))");
+
+            // Specify existing fields with IF NOT EXISTS option
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN IF NOT EXISTS col.a varchar");
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN IF NOT EXISTS col.b.x varchar");
+            assertEquals(getColumnType(table.getName(), "col"), "row(a integer, b row(x integer, y integer), c integer)");
+
+            // Specify existing fields without IF NOT EXISTS option
+            assertQueryFails("ALTER TABLE " + table.getName() + " ADD COLUMN col.a varchar", ".* Field 'a' already exists");
+        }
     }
 
     @Test
@@ -2624,6 +2837,81 @@ public void testRenameColumn()
         assertFalse(getQueryRunner().tableExists(getSession(), tableName));
     }
 
+    @Test
+    public void testRenameColumnWithComment()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_RENAME_COLUMN) && hasBehavior(SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT));
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_rename_column_", "(col INT COMMENT 'test column comment')")) {
+            assertThat(getColumnComment(table.getName(), "col")).isEqualTo("test column comment");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " RENAME COLUMN col TO renamed_col");
+            assertThat(getColumnComment(table.getName(), "renamed_col")).isEqualTo("test column comment");
+        }
+    }
+
+    @Test
+    public void testRenameRowField()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_ROW_TYPE));
+
+        if (!hasBehavior(SUPPORTS_RENAME_FIELD)) {
+            try (TestTable table = new TestTable(getQueryRunner()::execute, "test_rename_field_", "AS SELECT CAST(row(1) AS row(x integer)) AS col")) {
+                assertQueryFails(
+                        "ALTER TABLE " + table.getName() + " RENAME COLUMN col.x TO x_renamed",
+                        "This connector does not support renaming fields");
+            }
+            return;
+        }
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute,
+                "test_add_field_",
+                "AS SELECT CAST(row(1, row(10)) AS row(a integer, b row(x integer))) AS col")) {
+            assertEquals(getColumnType(table.getName(), "col"), "row(a integer, b row(x integer))");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " RENAME COLUMN col.a TO a_renamed");
+            assertEquals(getColumnType(table.getName(), "col"), "row(a_renamed integer, b row(x integer))");
+            assertThat(query("SELECT * FROM " + table.getName())).matches("SELECT CAST(row(1, row(10)) AS row(a_renamed integer, b row(x integer)))");
+
+            // Rename a nested field
+            assertUpdate("ALTER TABLE " + table.getName() + " RENAME COLUMN col.b.x TO x_renamed");
+            assertEquals(getColumnType(table.getName(), "col"), "row(a_renamed integer, b row(x_renamed integer))");
+            assertThat(query("SELECT * FROM " + table.getName())).matches("SELECT CAST(row(1, row(10)) AS row(a_renamed integer, b row(x_renamed integer)))");
+
+            // Specify not existing fields with IF EXISTS option
+            assertUpdate("ALTER TABLE " + table.getName() + " RENAME COLUMN IF EXISTS col.a_missing TO a_missing_renamed");
+            assertUpdate("ALTER TABLE " + table.getName() + " RENAME COLUMN IF EXISTS col.b.x_missing TO x_missing_renamed");
+            assertEquals(getColumnType(table.getName(), "col"), "row(a_renamed integer, b row(x_renamed integer))");
+
+            // Specify existing fields without IF EXISTS option
+            assertQueryFails("ALTER TABLE " + table.getName() + " RENAME COLUMN col.a_renamed TO a_renamed", ".* Field 'a_renamed' already exists");
+        }
+    }
+
+    @Test
+    public void testRenameRowFieldCaseSensitivity()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_RENAME_FIELD));
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute,
+                "test_add_row_field_case_sensitivity_",
+                "AS SELECT CAST(row(1, 2) AS row(lower integer, \"UPPER\" integer)) AS col")) {
+            assertEquals(getColumnType(table.getName(), "col"), "row(lower integer, UPPER integer)");
+
+            assertQueryFails("ALTER TABLE " + table.getName() + " RENAME COLUMN col.lower TO UPPER", ".* Field 'upper' already exists");
+            assertQueryFails("ALTER TABLE " + table.getName() + " RENAME COLUMN col.lower TO upper", ".* Field 'upper' already exists");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " RENAME COLUMN col.lower TO LOWER_RENAMED");
+            assertEquals(getColumnType(table.getName(), "col"), "row(lower_renamed integer, UPPER integer)");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " RENAME COLUMN col.\"UPPER\" TO upper_renamed");
+            assertEquals(getColumnType(table.getName(), "col"), "row(lower_renamed integer, upper_renamed integer)");
+
+            assertThat(query("SELECT * FROM " + table.getName()))
+                    .matches("SELECT CAST(row(1, 2) AS row(lower_renamed integer, upper_renamed integer))");
+        }
+    }
+
     @Test
     public void testSetColumnType()
     {
@@ -2823,7 +3111,157 @@ protected void verifySetColumnTypeFailurePermissible(Throwable e)
         throw new AssertionError("Unexpected set column type failure", e);
     }
 
-    private String getColumnType(String tableName, String columnName)
+    @Test
+    public void testSetFieldType()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_ROW_TYPE));
+
+        if (!hasBehavior(SUPPORTS_SET_FIELD_TYPE)) {
+            try (TestTable table = new TestTable(getQueryRunner()::execute, "test_set_field_type_", "(col row(field int))")) {
+                assertQueryFails(
+                        "ALTER TABLE " + table.getName() + " ALTER COLUMN col.field SET DATA TYPE bigint",
+                        "This connector does not support setting field types");
+            }
+            return;
+        }
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_set_field_type_", "AS SELECT CAST(row(123) AS row(field integer)) AS col")) {
+            assertEquals(getColumnType(table.getName(), "col"), "row(field integer)");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " ALTER COLUMN col.field SET DATA TYPE bigint");
+
+            assertEquals(getColumnType(table.getName(), "col"), "row(field bigint)");
+            assertThat(query("SELECT * FROM " + table.getName()))
+                    .skippingTypesCheck()
+                    .matches("SELECT row(bigint '123')");
+        }
+    }
+
+    @Test(dataProvider = "setFieldTypesDataProvider")
+    public void testSetFieldTypes(SetColumnTypeSetup setup)
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_SET_FIELD_TYPE) && hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA));
+
+        TestTable table;
+        try {
+            table = new TestTable(
+                    getQueryRunner()::execute,
+                    "test_set_field_type_",
+                    " AS SELECT CAST(row(" + setup.sourceValueLiteral + ") AS row(field " + setup.sourceColumnType + ")) AS col");
+        }
+        catch (Exception e) {
+            verifyUnsupportedTypeException(e, setup.sourceColumnType);
+            throw new SkipException("Unsupported column type: " + setup.sourceColumnType);
+        }
+        try (table) {
+            Runnable setFieldType = () -> assertUpdate("ALTER TABLE " + table.getName() + " ALTER COLUMN col.field SET DATA TYPE " + setup.newColumnType);
+            if (setup.unsupportedType) {
+                assertThatThrownBy(setFieldType::run)
+                        .satisfies(this::verifySetFieldTypeFailurePermissible);
+                return;
+            }
+            setFieldType.run();
+
+            assertEquals(getColumnType(table.getName(), "col"), "row(field " + setup.newColumnType + ")");
+            assertThat(query("SELECT * FROM " + table.getName()))
+                    .skippingTypesCheck()
+                    .matches("SELECT row(" + setup.newValueLiteral + ")");
+        }
+    }
+
+    @DataProvider
+    public Object[][] setFieldTypesDataProvider()
+    {
+        return setColumnTypeSetupData().stream()
+                .map(this::filterSetFieldTypesDataProvider)
+                .flatMap(Optional::stream)
+                .collect(toDataProvider());
+    }
+
+    protected Optional<SetColumnTypeSetup> filterSetFieldTypesDataProvider(SetColumnTypeSetup setup)
+    {
+        return Optional.of(setup);
+    }
+
+    @Test
+    public void testSetFieldTypeCaseSensitivity()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_SET_FIELD_TYPE) && hasBehavior(SUPPORTS_NOT_NULL_CONSTRAINT));
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_set_field_type_case_", " AS SELECT CAST(row(1) AS row(\"UPPER\" integer)) col")) {
+            assertEquals(getColumnType(table.getName(), "col"), "row(UPPER integer)");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " ALTER COLUMN col.upper SET DATA TYPE bigint");
+            assertEquals(getColumnType(table.getName(), "col"), "row(UPPER bigint)");
+            assertThat(query("SELECT * FROM " + table.getName()))
+                    .matches("SELECT CAST(row(1) AS row(UPPER bigint))");
+        }
+    }
+
+    @Test
+    public void testSetFieldTypeWithNotNull()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_SET_FIELD_TYPE) && hasBehavior(SUPPORTS_NOT_NULL_CONSTRAINT));
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_set_field_type_null_", "(col row(field int) NOT NULL)")) {
+            assertFalse(columnIsNullable(table.getName(), "col"));
+
+            assertUpdate("ALTER TABLE " + table.getName() + " ALTER COLUMN col.field SET DATA TYPE bigint");
+            assertFalse(columnIsNullable(table.getName(), "col"));
+        }
+    }
+
+    @Test
+    public void testSetFieldTypeWithComment()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_SET_FIELD_TYPE) && hasBehavior(SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT));
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_set_field_type_comment_", "(col row(field int) COMMENT 'test comment')")) {
+            assertEquals(getColumnComment(table.getName(), "col"), "test comment");
+
+            assertUpdate("ALTER TABLE " + table.getName() + " ALTER COLUMN col.field SET DATA TYPE bigint");
+            assertEquals(getColumnComment(table.getName(), "col"), "test comment");
+        }
+    }
+
+    @Test
+    public void testSetFieldIncompatibleType()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_SET_FIELD_TYPE) && hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA));
+
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_set_invalid_field_type_",
+                "(row_col row(field varchar), nested_col row(field row(nested int)))")) {
+            assertThatThrownBy(() -> assertUpdate("ALTER TABLE " + table.getName() + " ALTER COLUMN row_col.field SET DATA TYPE row(nested integer)"))
+                    .satisfies(this::verifySetFieldTypeFailurePermissible);
+            assertThatThrownBy(() -> assertUpdate("ALTER TABLE " + table.getName() + " ALTER COLUMN row_col.field SET DATA TYPE integer"))
+                    .satisfies(this::verifySetFieldTypeFailurePermissible);
+            assertThatThrownBy(() -> assertUpdate("ALTER TABLE " + table.getName() + " ALTER COLUMN nested_col.field SET DATA TYPE integer"))
+                    .satisfies(this::verifySetFieldTypeFailurePermissible);
+        }
+    }
+
+    @Test
+    public void testSetFieldOutOfRangeType()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_SET_FIELD_TYPE) && hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA));
+
+        try (TestTable table = new TestTable(
+                getQueryRunner()::execute,
+                "test_set_field_type_invalid_range_",
+                "AS SELECT CAST(row(9223372036854775807) AS row(field bigint)) AS col")) {
+            assertThatThrownBy(() -> assertUpdate("ALTER TABLE " + table.getName() + " ALTER COLUMN col.field SET DATA TYPE integer"))
+                    .satisfies(this::verifySetFieldTypeFailurePermissible);
+        }
+    }
+
+    protected void verifySetFieldTypeFailurePermissible(Throwable e)
+    {
+        throw new AssertionError("Unexpected set field type failure", e);
+    }
+
+    protected String getColumnType(String tableName, String columnName)
     {
         return (String) computeScalar(format("SELECT data_type FROM information_schema.columns WHERE table_schema = CURRENT_SCHEMA AND table_name = '%s' AND column_name = '%s'",
                 tableName,
@@ -2839,13 +3277,19 @@ public void testCreateTable()
             return;
         }
 
+        assertThat(computeActual("SHOW TABLES").getOnlyColumnAsSet()) // prime the cache, if any
+                .doesNotContain(tableName);
         assertUpdate("CREATE TABLE " + tableName + " (a bigint, b double, c varchar(50))");
         assertTrue(getQueryRunner().tableExists(getSession(), tableName));
+        assertThat(computeActual("SHOW TABLES").getOnlyColumnAsSet())
+                .contains(tableName);
         assertTableColumnNames(tableName, "a", "b", "c");
         assertNull(getTableComment(getSession().getCatalog().orElseThrow(), getSession().getSchema().orElseThrow(), tableName));
 
         assertUpdate("DROP TABLE " + tableName);
         assertFalse(getQueryRunner().tableExists(getSession(), tableName));
+        assertThat(computeActual("SHOW TABLES").getOnlyColumnAsSet())
+                .doesNotContain(tableName);
 
         assertQueryFails("CREATE TABLE " + tableName + " (a bad_type)", ".* Unknown type 'bad_type' for column 'a'");
         assertFalse(getQueryRunner().tableExists(getSession(), tableName));
@@ -2881,6 +3325,128 @@ public void testCreateTable()
         assertFalse(getQueryRunner().tableExists(getSession(), tableNameLike));
     }
 
+    @Test
+    public void testCreateSchemaWithNonLowercaseOwnerName()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_SCHEMA));
+
+        Session newSession = Session.builder(getSession())
+                .setIdentity(Identity.ofUser("ADMIN"))
+                .build();
+        String schemaName = "test_schema_create_uppercase_owner_name_" + randomNameSuffix();
+        assertUpdate(newSession, createSchemaSql(schemaName));
+        assertThat(query(newSession, "SHOW SCHEMAS"))
+                .skippingTypesCheck()
+                .containsAll(format("VALUES '%s'", schemaName));
+        assertUpdate(newSession, "DROP SCHEMA " + schemaName);
+    }
+
+    @Test
+    public void testCreateOrReplaceTableWhenTableDoesNotExist()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE));
+        String table = "test_create_or_replace_" + randomNameSuffix();
+        if (!hasBehavior(SUPPORTS_CREATE_OR_REPLACE_TABLE)) {
+            assertQueryFails("CREATE OR REPLACE TABLE " + table + " (a bigint, b double, c varchar(50))", "This connector does not support replacing tables");
+            return;
+        }
+
+        try {
+            assertUpdate("CREATE OR REPLACE TABLE " + table + " (a bigint, b double, c varchar(50))");
+            assertQueryReturnsEmptyResult("SELECT * FROM " + table);
+        } finally {
+            assertUpdate("DROP TABLE IF EXISTS " + table);
+        }
+    }
+
+    @Test
+    public void testCreateOrReplaceTableAsSelectWhenTableDoesNotExists()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE));
+        String table = "test_create_or_replace_" + randomNameSuffix();
+        @Language("SQL") String query = "SELECT nationkey, name, regionkey FROM nation";
+        @Language("SQL") String rowCountQuery = "SELECT count(*) FROM nation";
+        if (!hasBehavior(SUPPORTS_CREATE_OR_REPLACE_TABLE)) {
+            assertQueryFails("CREATE OR REPLACE TABLE " + table + " AS " + query, "This connector does not support replacing tables");
+            return;
+        }
+
+        try {
+            assertUpdate("CREATE OR REPLACE TABLE " + table + " AS " + query, rowCountQuery);
+            assertQuery("SELECT * FROM " + table, query);
+        } finally {
+            assertUpdate("DROP TABLE IF EXISTS " + table);
+        }
+    }
+
+    @Test
+    public void testCreateOrReplaceTableWhenTableAlreadyExistsSameSchema()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE));
+        if (!hasBehavior(SUPPORTS_CREATE_OR_REPLACE_TABLE)) {
+            // covered in testCreateOrReplaceTableWhenTableDoesNotExist
+            return;
+        }
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_create_or_replace_", "AS SELECT CAST(1 AS BIGINT) AS nationkey, 'test' AS name, CAST(2 AS BIGINT) AS regionkey FROM nation LIMIT 1")) {
+            @Language("SQL") String query = "SELECT nationkey, name, regionkey FROM nation";
+            @Language("SQL") String rowCountQuery = "SELECT count(*) FROM nation";
+            assertUpdate("CREATE OR REPLACE TABLE " + table.getName() + " AS " + query, rowCountQuery);
+            assertQuery("SELECT * FROM " + table.getName(), query);
+        }
+    }
+
+    @Test
+    public void testCreateOrReplaceTableWhenTableAlreadyExistsSameSchemaNoData()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE));
+        if (!hasBehavior(SUPPORTS_CREATE_OR_REPLACE_TABLE)) {
+            // covered in testCreateOrReplaceTableWhenTableDoesNotExist
+            return;
+        }
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_create_or_replace_", " AS SELECT nationkey, name, regionkey FROM nation")) {
+            assertUpdate("CREATE OR REPLACE TABLE " + table.getName() + " AS SELECT nationkey, name, regionkey FROM nation WITH NO DATA", 0L);
+            assertQueryReturnsEmptyResult("SELECT * FROM " + table.getName());
+        }
+    }
+
+    @Test
+    public void testCreateOrReplaceTableWithNewColumnNames()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE));
+        if (!hasBehavior(SUPPORTS_CREATE_OR_REPLACE_TABLE)) {
+            // covered in testCreateOrReplaceTableWhenTableDoesNotExist
+            return;
+        }
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_create_or_replace_", " AS SELECT nationkey, name, regionkey FROM nation")) {
+            assertTableColumnNames(table.getName(), "nationkey", "name", "regionkey");
+            @Language("SQL") String query = "SELECT nationkey AS nationkey_new, name AS name_new_2, regionkey AS region_key_new FROM nation";
+            @Language("SQL") String rowCountQuery = "SELECT count(*) FROM nation";
+            assertUpdate("CREATE OR REPLACE TABLE " + table.getName() + " AS " + query, rowCountQuery);
+            assertTableColumnNames(table.getName(), "nationkey_new", "name_new_2", "region_key_new");
+            assertQuery("SELECT * FROM " + table.getName(), query);
+        }
+    }
+
+    @Test
+    public void testCreateOrReplaceTableWithDifferentDataType()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE));
+        if (!hasBehavior(SUPPORTS_CREATE_OR_REPLACE_TABLE)) {
+            // covered in testCreateOrReplaceTableWhenTableDoesNotExist
+            return;
+        }
+
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_create_or_replace_", " AS SELECT nationkey, name FROM nation")) {
+            @Language("SQL") String query = "SELECT name AS nationkey, nationkey AS name FROM nation";
+            @Language("SQL") String rowCountQuery = "SELECT count(*) FROM nation";
+            assertUpdate("CREATE OR REPLACE TABLE " + table.getName() + " AS " + query, rowCountQuery);
+            assertQuery(getSession(), "SELECT * FROM " + table.getName(), query);
+        }
+    }
+
     @Test
     public void testCreateSchemaWithLongName()
     {
@@ -3478,30 +4044,30 @@ public void testCommentTable()
         String catalogName = getSession().getCatalog().orElseThrow();
         String schemaName = getSession().getSchema().orElseThrow();
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_comment_", "(a integer)")) {
+            // comment initially not set
+            assertThat(getTableComment(catalogName, schemaName, table.getName())).isEqualTo(null);
+
             // comment set
             assertUpdate("COMMENT ON TABLE " + table.getName() + " IS 'new comment'");
             assertThat((String) computeScalar("SHOW CREATE TABLE " + table.getName())).contains("COMMENT 'new comment'");
             assertThat(getTableComment(catalogName, schemaName, table.getName())).isEqualTo("new comment");
             assertThat(query(
                     "SELECT table_name, comment FROM system.metadata.table_comments " +
-                            "WHERE catalog_name = '" + catalogName + "' AND " +
-                            "schema_name = '" + schemaName + "'"))
+                            "WHERE catalog_name = '" + catalogName + "' AND schema_name = '" + schemaName + "'")) // without table_name filter
                     .skippingTypesCheck()
                     .containsAll("VALUES ('" + table.getName() + "', 'new comment')");
 
-            // comment updated
+            // comment deleted
+            assertUpdate("COMMENT ON TABLE " + table.getName() + " IS NULL");
+            assertThat(getTableComment(catalogName, schemaName, table.getName())).isEqualTo(null);
+
+            // comment set to non-empty value before verifying setting empty comment
             assertUpdate("COMMENT ON TABLE " + table.getName() + " IS 'updated comment'");
             assertThat(getTableComment(catalogName, schemaName, table.getName())).isEqualTo("updated comment");
 
             // comment set to empty or deleted
             assertUpdate("COMMENT ON TABLE " + table.getName() + " IS ''");
             assertThat(getTableComment(catalogName, schemaName, table.getName())).isIn("", null); // Some storages do not preserve empty comment
-
-            // comment deleted
-            assertUpdate("COMMENT ON TABLE " + table.getName() + " IS 'a comment'");
-            assertThat(getTableComment(catalogName, schemaName, table.getName())).isEqualTo("a comment");
-            assertUpdate("COMMENT ON TABLE " + table.getName() + " IS NULL");
-            assertThat(getTableComment(catalogName, schemaName, table.getName())).isEqualTo(null);
         }
 
         String tableName = "test_comment_" + randomNameSuffix();
@@ -3542,19 +4108,17 @@ public void testCommentView()
             assertThat((String) computeScalar("SHOW CREATE VIEW " + view.getName())).contains("COMMENT 'new comment'");
             assertThat(getTableComment(catalogName, schemaName, view.getName())).isEqualTo("new comment");
 
-            // comment updated
+            // comment deleted
+            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS NULL");
+            assertThat(getTableComment(catalogName, schemaName, view.getName())).isEqualTo(null);
+
+            // comment set to non-empty value before verifying setting empty comment
             assertUpdate("COMMENT ON VIEW " + view.getName() + " IS 'updated comment'");
             assertThat(getTableComment(catalogName, schemaName, view.getName())).isEqualTo("updated comment");
 
             // comment set to empty
             assertUpdate("COMMENT ON VIEW " + view.getName() + " IS ''");
             assertThat(getTableComment(catalogName, schemaName, view.getName())).isEqualTo("");
-
-            // comment deleted
-            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS 'a comment'");
-            assertThat(getTableComment(catalogName, schemaName, view.getName())).isEqualTo("a comment");
-            assertUpdate("COMMENT ON VIEW " + view.getName() + " IS NULL");
-            assertThat(getTableComment(catalogName, schemaName, view.getName())).isEqualTo(null);
         }
 
         String viewName = "test_comment_view" + randomNameSuffix();
@@ -3582,19 +4146,17 @@ public void testCommentColumn()
             assertThat((String) computeScalar("SHOW CREATE TABLE " + table.getName())).contains("COMMENT 'new comment'");
             assertThat(getColumnComment(table.getName(), "a")).isEqualTo("new comment");
 
-            // comment updated
+            // comment deleted
+            assertUpdate("COMMENT ON COLUMN " + table.getName() + ".a IS NULL");
+            assertThat(getColumnComment(table.getName(), "a")).isEqualTo(null);
+
+            // comment set to non-empty value before verifying setting empty comment
             assertUpdate("COMMENT ON COLUMN " + table.getName() + ".a IS 'updated comment'");
             assertThat(getColumnComment(table.getName(), "a")).isEqualTo("updated comment");
 
             // comment set to empty or deleted
             assertUpdate("COMMENT ON COLUMN " + table.getName() + ".a IS ''");
             assertThat(getColumnComment(table.getName(), "a")).isIn("", null); // Some storages do not preserve empty comment
-
-            // comment deleted
-            assertUpdate("COMMENT ON COLUMN " + table.getName() + ".a IS 'a comment'");
-            assertThat(getColumnComment(table.getName(), "a")).isEqualTo("a comment");
-            assertUpdate("COMMENT ON COLUMN " + table.getName() + ".a IS NULL");
-            assertThat(getColumnComment(table.getName(), "a")).isEqualTo(null);
         }
     }
 
@@ -3646,17 +4208,17 @@ public void testCommentViewColumn()
             assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS 'new region key comment'");
             assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo("new region key comment");
 
-            // comment updated
+            // comment deleted
+            assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS NULL");
+            assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo(null);
+
+            // comment set to non-empty value before verifying setting empty comment
             assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS 'updated region key comment'");
             assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo("updated region key comment");
 
             // comment set to empty
             assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS ''");
             assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo("");
-
-            // comment deleted
-            assertUpdate("COMMENT ON COLUMN " + view.getName() + "." + viewColumnName + " IS NULL");
-            assertThat(getColumnComment(view.getName(), viewColumnName)).isEqualTo(null);
         }
     }
 
@@ -3682,38 +4244,38 @@ public void testInsert()
             throw new AssertionError("Cannot test INSERT without CTAS, the test needs to be implemented in a connector-specific way");
         }
 
-        String query = "SELECT phone, custkey, acctbal FROM customer";
+        String query = "SELECT name, nationkey, regionkey FROM nation";
 
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_insert_", "AS " + query + " WITH NO DATA")) {
             assertQuery("SELECT count(*) FROM " + table.getName() + "", "SELECT 0");
 
-            assertUpdate("INSERT INTO " + table.getName() + " " + query, "SELECT count(*) FROM customer");
+            assertUpdate("INSERT INTO " + table.getName() + " " + query, 25);
 
             assertQuery("SELECT * FROM " + table.getName() + "", query);
 
-            assertUpdate("INSERT INTO " + table.getName() + " (custkey) VALUES (-1)", 1);
-            assertUpdate("INSERT INTO " + table.getName() + " (custkey) VALUES (null)", 1);
-            assertUpdate("INSERT INTO " + table.getName() + " (phone) VALUES ('3283-2001-01-01')", 1);
-            assertUpdate("INSERT INTO " + table.getName() + " (custkey, phone) VALUES (-2, '3283-2001-01-02')", 1);
-            assertUpdate("INSERT INTO " + table.getName() + " (phone, custkey) VALUES ('3283-2001-01-03', -3)", 1);
-            assertUpdate("INSERT INTO " + table.getName() + " (acctbal) VALUES (1234)", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " (nationkey) VALUES (-1)", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " (nationkey) VALUES (null)", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " (name) VALUES ('name-dummy-1')", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " (nationkey, name) VALUES (-2, 'name-dummy-2')", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " (name, nationkey) VALUES ('name-dummy-3', -3)", 1);
+            assertUpdate("INSERT INTO " + table.getName() + " (regionkey) VALUES (1234)", 1);
 
             assertQuery("SELECT * FROM " + table.getName() + "", query
                     + " UNION ALL SELECT null, -1, null"
                     + " UNION ALL SELECT null, null, null"
-                    + " UNION ALL SELECT '3283-2001-01-01', null, null"
-                    + " UNION ALL SELECT '3283-2001-01-02', -2, null"
-                    + " UNION ALL SELECT '3283-2001-01-03', -3, null"
+                    + " UNION ALL SELECT 'name-dummy-1', null, null"
+                    + " UNION ALL SELECT 'name-dummy-2', -2, null"
+                    + " UNION ALL SELECT 'name-dummy-3', -3, null"
                     + " UNION ALL SELECT null, null, 1234");
 
             // UNION query produces columns in the opposite order
             // of how they are declared in the table schema
             assertUpdate(
-                    "INSERT INTO " + table.getName() + " (custkey, phone, acctbal) " +
-                            "SELECT custkey, phone, acctbal FROM customer " +
+                    "INSERT INTO " + table.getName() + " (nationkey, name, regionkey) " +
+                            "SELECT nationkey, name, regionkey FROM nation " +
                             "UNION ALL " +
-                            "SELECT custkey, phone, acctbal FROM customer",
-                    "SELECT 2 * count(*) FROM customer");
+                            "SELECT nationkey, name, regionkey FROM nation",
+                    50);
         }
     }
 
@@ -3852,34 +4414,6 @@ protected String errorMessageForInsertNegativeDate(String date)
         throw new UnsupportedOperationException("This method should be overridden");
     }
 
-    protected boolean isReportingWrittenBytesSupported(Session session)
-    {
-        CatalogName catalogName = session.getCatalog()
-                .map(CatalogName::new)
-                .orElseThrow();
-        Metadata metadata = getQueryRunner().getMetadata();
-        metadata.getCatalogHandle(session, catalogName.getCatalogName());
-        QualifiedObjectName fullTableName = new QualifiedObjectName(catalogName.getCatalogName(), "any", "any");
-        return getQueryRunner().getMetadata().supportsReportingWrittenBytes(session, fullTableName, ImmutableMap.of());
-    }
-
-    @Test
-    public void isReportingWrittenBytesSupported()
-    {
-        transaction(getQueryRunner().getTransactionManager(), getQueryRunner().getAccessControl())
-                .singleStatement()
-                .execute(getSession(), (Consumer<Session>) session -> skipTestUnless(isReportingWrittenBytesSupported(session)));
-
-        @Language("SQL")
-        String query = "CREATE TABLE temp AS SELECT * FROM tpch.tiny.nation";
-
-        assertQueryStats(
-                getSession(),
-                query,
-                queryStats -> assertThat(queryStats.getPhysicalWrittenDataSize().toBytes()).isGreaterThan(0L),
-                results -> {});
-    }
-
     @Test
     public void testInsertIntoNotNullColumn()
     {
@@ -4219,7 +4753,7 @@ public void testDeleteAllDataFromTable()
     @Test
     public void testRowLevelDelete()
     {
-        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_ROW_LEVEL_DELETE));
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_ROW_LEVEL_DELETE));
         // TODO (https://github.com/trinodb/trino/issues/5901) Use longer table name once Oracle version is updated
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_row_delete", "AS SELECT * FROM region")) {
             assertUpdate("DELETE FROM " + table.getName() + " WHERE regionkey = 2", 1);
@@ -4227,6 +4761,34 @@ public void testRowLevelDelete()
         }
     }
 
+    @Test
+    public void verifySupportsUpdateDeclaration()
+    {
+        if (hasBehavior(SUPPORTS_UPDATE)) {
+            // Covered by testUpdate
+            return;
+        }
+
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA));
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_supports_update", "AS SELECT * FROM nation")) {
+            assertQueryFails("UPDATE " + table.getName() + " SET nationkey = 100 WHERE regionkey = 2", MODIFYING_ROWS_MESSAGE);
+        }
+    }
+
+    @Test
+    public void verifySupportsRowLevelUpdateDeclaration()
+    {
+        if (hasBehavior(SUPPORTS_ROW_LEVEL_UPDATE)) {
+            // Covered by testRowLevelUpdate
+            return;
+        }
+
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA));
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_supports_update", "AS SELECT * FROM nation")) {
+            assertQueryFails("UPDATE " + table.getName() + " SET nationkey = nationkey * 100 WHERE regionkey = 2", MODIFYING_ROWS_MESSAGE);
+        }
+    }
+
     @Test
     public void testUpdate()
     {
@@ -4235,6 +4797,21 @@ public void testUpdate()
             assertQueryFails("UPDATE nation SET nationkey = nationkey + regionkey WHERE regionkey < 1", MODIFYING_ROWS_MESSAGE);
             return;
         }
+        try (TestTable table = new TestTable(getQueryRunner()::execute, "test_row_update", "AS SELECT * FROM nation")) {
+            assertUpdate("UPDATE " + table.getName() + " SET nationkey = 100 WHERE regionkey = 2", 5);
+            assertQuery("SELECT count(*) FROM " + table.getName() + " WHERE nationkey = 100", "VALUES 5");
+        }
+    }
+
+    @Test
+    public void testRowLevelUpdate()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA));
+        if (!hasBehavior(SUPPORTS_ROW_LEVEL_UPDATE)) {
+            // Note this change is a no-op, if actually run
+            assertQueryFails("UPDATE nation SET nationkey = nationkey + regionkey WHERE regionkey < 1", MODIFYING_ROWS_MESSAGE);
+            return;
+        }
 
         try (TestTable table = new TestTable(getQueryRunner()::execute, "test_update", "AS TABLE tpch.tiny.nation")) {
             String tableName = table.getName();
@@ -4450,6 +5027,87 @@ protected void verifyConcurrentAddColumnFailurePermissible(Exception e)
         throw new AssertionError("Unexpected concurrent add column failure", e);
     }
 
+    // Repeat test with invocationCount for better test coverage, since the tested aspect is inherently non-deterministic.
+    @Test(timeOut = 60_000, invocationCount = 4)
+    public void testCreateOrReplaceTableConcurrently()
+            throws Exception
+    {
+        if (!hasBehavior(SUPPORTS_CREATE_OR_REPLACE_TABLE)) {
+            // Already handled in testCreateOrReplaceTableWhenTableDoesNotExist
+            return;
+        }
+
+        int threads = 4;
+        int numOfCreateOrReplaceStatements = 4;
+        int numOfReads = 16;
+        CyclicBarrier barrier = new CyclicBarrier(threads + 1);
+        ExecutorService executor = newFixedThreadPool(threads + 1);
+        List<Future<?>> futures = new ArrayList<>();
+        try (TestTable table = createTableWithOneIntegerColumn("test_create_or_replace")) {
+            String tableName = table.getName();
+
+            getQueryRunner().execute("CREATE OR REPLACE TABLE " + tableName + " AS SELECT 1 a");
+            assertThat(query("SELECT * FROM " + tableName)).matches("VALUES 1");
+
+            /// One thread submits some CREATE OR REPLACE statements
+            futures.add(executor.submit(() -> {
+                barrier.await(30, SECONDS);
+                IntStream.range(0, numOfCreateOrReplaceStatements).forEach(index -> {
+                    try {
+                        getQueryRunner().execute("CREATE OR REPLACE TABLE " + tableName + " AS SELECT * FROM (VALUES (1), (2)) AS t(a) ");
+                    } catch (Exception e) {
+                        RuntimeException trinoException = getTrinoExceptionCause(e);
+                        try {
+                            throw new AssertionError("Unexpected concurrent CREATE OR REPLACE failure", trinoException);
+                        } catch (Throwable verifyFailure) {
+                            if (verifyFailure != e) {
+                                verifyFailure.addSuppressed(e);
+                            }
+                            throw verifyFailure;
+                        }
+                    }
+                });
+                return null;
+            }));
+            // Other 4 threads continue try to read the same table, none of the reads should fail.
+            IntStream.range(0, threads)
+                    .forEach(threadNumber -> futures.add(executor.submit(() -> {
+                        barrier.await(30, SECONDS);
+                        IntStream.range(0, numOfReads).forEach(readIndex -> {
+                            try {
+                                MaterializedResult result = computeActual("SELECT * FROM " + tableName);
+                                if (result.getRowCount() == 1) {
+                                    assertEqualsIgnoreOrder(result.getMaterializedRows(), List.of(new MaterializedRow(List.of(1))));
+                                }
+                                else {
+                                    assertEqualsIgnoreOrder(result.getMaterializedRows(), List.of(new MaterializedRow(List.of(1)), new MaterializedRow(List.of(2))));
+                                }
+                            }
+                            catch (Exception e) {
+                                RuntimeException trinoException = getTrinoExceptionCause(e);
+                                try {
+                                    throw new AssertionError("Unexpected concurrent CREATE OR REPLACE failure", trinoException);
+                                }
+                                catch (Throwable verifyFailure) {
+                                    if (verifyFailure != e) {
+                                        verifyFailure.addSuppressed(e);
+                                    }
+                                    throw verifyFailure;
+                                }
+                            }
+                        });
+                        return null;
+                    })));
+            futures.forEach(Futures::getUnchecked);
+            getQueryRunner().execute("CREATE OR REPLACE TABLE " + tableName + " AS SELECT * FROM (VALUES (1), (2), (3)) AS t(a)");
+            assertThat(query("SELECT * FROM " + tableName)).matches("VALUES 1, 2, 3");
+        }
+        finally {
+            executor.shutdownNow();
+            executor.awaitTermination(30, SECONDS);
+        }
+    }
+
     protected TestTable createTableWithOneIntegerColumn(String namePrefix)
     {
         return new TestTable(getQueryRunner()::execute, namePrefix, "(col integer)");
@@ -4681,6 +5339,24 @@ public void testWrittenStats()
         }
     }
 
+    @Test
+    public void testWrittenDataSize()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_REPORTING_WRITTEN_BYTES));
+        String tableName = "write_stats_" + randomNameSuffix();
+        try {
+            String query = "CREATE TABLE " + tableName + " AS SELECT * FROM tpch.tiny.nation";
+            assertQueryStats(
+                    getSession(),
+                    query,
+                    queryStats -> assertThat(queryStats.getPhysicalWrittenDataSize().toBytes()).isPositive(),
+                    results -> {});
+        }
+        finally {
+            assertUpdate("DROP TABLE IF EXISTS " + tableName);
+        }
+    }
+
     /**
      * Some connectors support system table denoted with $-suffix. Ensure no connector exposes table_name$data
      * directly to users, as it would mean the same thing as table_name itself.
@@ -4880,7 +5556,7 @@ protected Optional<String> filterColumnNameTestData(String columnName)
 
     protected String dataMappingTableName(String trinoTypeName)
     {
-        return "test_data_mapping_smoke_" + trinoTypeName.replaceAll("[^a-zA-Z0-9]", "_") + "_" + randomNameSuffix();
+        return "test_data_mapping_smoke_" + trinoTypeName.replaceAll("[^a-zA-Z0-9]", "_") + randomNameSuffix();
     }
 
     @Test(dataProvider = "testCommentDataProvider")
@@ -5164,6 +5840,36 @@ public void testPotentialDuplicateDereferencePushdown()
         }
     }
 
+    @Test
+    public void testMergeDeleteWithCTAS()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_MERGE) && hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA));
+
+        String target = "merge_target_with_ctas_" + randomNameSuffix();
+        String source = "merge_source_with_ctas_" + randomNameSuffix();
+        @Language("SQL") String createTableSql = """
+                CREATE TABLE %s AS
+                SELECT * FROM (
+                        VALUES
+                        (1, 'a', 'aa'),
+                        (2, 'b', 'bb'),
+                        (3, 'c', 'cc'),
+                        (4, 'd', 'dd')
+                ) AS t (id, name, value)
+                """;
+        assertUpdate(createTableSql.formatted(target), 4);
+        assertUpdate(createTableSql.formatted(source), 4);
+
+        assertQuery("SELECT COUNT(*) FROM " + target, "VALUES 4");
+        assertUpdate("DELETE FROM %s WHERE id IN (SELECT id FROM %s WHERE id > 2)".formatted(target, source), 2);
+        assertQuery("SELECT * FROM " + target, "VALUES (1, 'a', 'aa'), (2, 'b', 'bb')");
+        assertUpdate("MERGE INTO %s t USING %s s ON (t.id = s.id) WHEN MATCHED AND s.id > 1 THEN DELETE".formatted(target, source), 1);
+        assertQuery("SELECT * FROM " + target, "VALUES (1, 'a', 'aa')");
+
+        assertUpdate("DROP TABLE " + target);
+        assertUpdate("DROP TABLE " + source);
+    }
+
     protected String createTableForWrites(String createTable)
     {
         return createTable;
@@ -5193,12 +5899,12 @@ public void testMergeLarge()
         assertQuery("SELECT count(*) FROM " + tableName + " WHERE mod(orderkey, 3) = 1", "SELECT 0");
 
         // verify untouched rows
-        assertThat(query("SELECT count(*), cast(sum(totalprice) AS decimal(18,2)) FROM " + tableName + " WHERE mod(orderkey, 3) = 2"))
-                .matches("SELECT count(*), cast(sum(totalprice) AS decimal(18,2)) FROM tpch.sf1.orders WHERE mod(orderkey, 3) = 2");
+        assertThat(query("SELECT count(*), sum(cast(totalprice AS decimal(18,2))) FROM " + tableName + " WHERE mod(orderkey, 3) = 2"))
+                .matches("SELECT count(*), sum(cast(totalprice AS decimal(18,2))) FROM tpch.sf1.orders WHERE mod(orderkey, 3) = 2");
 
         // verify updated rows
-        assertThat(query("SELECT count(*), cast(sum(totalprice) AS decimal(18,2)) FROM " + tableName + " WHERE mod(orderkey, 3) = 0"))
-                .matches("SELECT count(*), cast(sum(totalprice * 2) AS decimal(18,2)) FROM tpch.sf1.orders WHERE mod(orderkey, 3) = 0");
+        assertThat(query("SELECT count(*), sum(cast(totalprice AS decimal(18,2))) FROM " + tableName + " WHERE mod(orderkey, 3) = 0"))
+                .matches("SELECT count(*), sum(cast(totalprice AS decimal(18,2)) * 2) FROM tpch.sf1.orders WHERE mod(orderkey, 3) = 0");
 
         assertUpdate("DROP TABLE " + tableName);
     }
@@ -5658,7 +6364,8 @@ public void testMergeSubqueries()
 
         assertUpdate(format("INSERT INTO %s VALUES ('ALGERIA', 'AFRICA'), ('FRANCE', 'EUROPE'), ('EGYPT', 'MIDDLE EAST'), ('RUSSIA', 'EUROPE')", sourceTable), 4);
 
-        assertUpdate(format("MERGE INTO %s t USING %s s", targetTable, sourceTable) +
+        assertUpdate(
+                format("MERGE INTO %s t USING %s s", targetTable, sourceTable) +
                         "    ON (t.nation_name = s.nation_name)" +
                         "    WHEN MATCHED AND t.nation_name > (SELECT name FROM tpch.tiny.region WHERE name = t.region_name AND name LIKE ('A%'))" +
                         "        THEN DELETE" +
@@ -5771,6 +6478,346 @@ private void testMaterializedViewColumnName(String columnName, boolean delimited
         assertUpdate("DROP MATERIALIZED VIEW " + viewName);
     }
 
+    @Test
+    public void testCreateFunction()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_FUNCTION));
+
+        String name = "test_" + randomNameSuffix();
+        String name2 = "test_" + randomNameSuffix();
+        String name3 = "test_" + randomNameSuffix();
+
+        assertUpdate("CREATE FUNCTION " + name + "(x integer) RETURNS bigint COMMENT 't42' RETURN x * 42");
+
+        assertQuery("SELECT " + name + "(99)", "SELECT 4158");
+        assertQueryFails("SELECT " + name + "(2.9)", ".*Unexpected parameters.*");
+
+        assertUpdate("CREATE FUNCTION " + name + "(x double) RETURNS double COMMENT 't88' RETURN x * 8.8");
+
+        assertThat(query("SHOW FUNCTIONS"))
+                .skippingTypesCheck()
+                .containsAll(resultBuilder(getSession())
+                        .row(name, "bigint", "integer", "scalar", true, "t42")
+                        .row(name, "double", "double", "scalar", true, "t88")
+                        .build());
+
+        assertQuery("SELECT " + name + "(99)", "SELECT 4158");
+        assertQuery("SELECT " + name + "(2.9)", "SELECT 25.52");
+
+        assertQueryFails("CREATE FUNCTION " + name + "(x int) RETURNS bigint RETURN x", "line 1:1: Function already exists");
+
+        assertQuery("SELECT " + name + "(99)", "SELECT 4158");
+        assertQuery("SELECT " + name + "(2.9)", "SELECT 25.52");
+
+        assertUpdate("CREATE OR REPLACE FUNCTION " + name + "(x bigint) RETURNS bigint RETURN x * 23");
+        assertUpdate("CREATE FUNCTION " + name2 + "(s varchar) RETURNS varchar RETURN 'Hello ' || s");
+
+        assertThat(query("SHOW FUNCTIONS"))
+                .skippingTypesCheck()
+                .containsAll(resultBuilder(getSession())
+                        .row(name, "bigint", "integer", "scalar", true, "t42")
+                        .row(name, "bigint", "bigint", "scalar", true, "")
+                        .row(name, "double", "double", "scalar", true, "t88")
+                        .row(name2, "varchar", "varchar", "scalar", true, "")
+                        .build());
+
+        assertQuery("SELECT " + name + "(99)", "SELECT 4158");
+        assertQuery("SELECT " + name + "(cast(99 as bigint))", "SELECT 2277");
+        assertQuery("SELECT " + name + "(2.9)", "SELECT 25.52");
+        assertQuery("SELECT " + name2 + "('world')", "SELECT 'Hello world'");
+
+        assertQuery("SELECT sum(" + name + "(orderkey)) FROM orders", "SELECT sum(orderkey * 23) FROM orders");
+
+        assertUpdate("CREATE FUNCTION " + name3 + "() RETURNS double NOT DETERMINISTIC RETURN random()");
+
+        assertThat(query("SHOW FUNCTIONS"))
+                .skippingTypesCheck()
+                .containsAll(resultBuilder(getSession())
+                        .row(name3, "double", "", "scalar", false, "")
+                        .build());
+
+        assertThat(query("SHOW FUNCTIONS FROM " + computeScalar("SELECT current_path")))
+                .skippingTypesCheck()
+                .matches(resultBuilder(getSession())
+                        .row(name, "bigint", "integer", "scalar", true, "t42")
+                        .row(name, "bigint", "bigint", "scalar", true, "")
+                        .row(name, "double", "double", "scalar", true, "t88")
+                        .row(name2, "varchar", "varchar", "scalar", true, "")
+                        .row(name3, "double", "", "scalar", false, "")
+                        .build());
+
+        assertQueryFails("DROP FUNCTION " + name + "(varchar)", "line 1:1: Function not found");
+        assertUpdate("DROP FUNCTION " + name + "(z bigint)");
+        assertUpdate("DROP FUNCTION " + name + "(double)");
+        assertQueryFails("DROP FUNCTION " + name + "(bigint)", "line 1:1: Function not found");
+        assertUpdate("DROP FUNCTION IF EXISTS " + name + "(bigint)");
+        assertUpdate("DROP FUNCTION " + name + "(int)");
+        assertUpdate("DROP FUNCTION " + name2 + "(varchar)");
+        assertQueryFails("DROP FUNCTION " + name2 + "(varchar)", "line 1:1: Function not found");
+        assertUpdate("DROP FUNCTION " + name3 + "()");
+        assertQueryFails("DROP FUNCTION " + name3 + "()", "line 1:1: Function not found");
+
+        assertThat(query("SHOW FUNCTIONS FROM " + computeScalar("SELECT current_path")))
+                .returnsEmptyResult();
+
+        // verify stored functions cannot see inline functions
+        String myAbs = "my_abs_" + randomNameSuffix();
+        assertUpdate("CREATE FUNCTION " + myAbs + "(x integer) RETURNS integer RETURN abs(x)");
+        // test with inline function first as FunctionManager caches compiled implementations
+        assertQuery("WITH FUNCTION abs(x integer) RETURNS integer RETURN x * 2 SELECT " + myAbs + "(-33)", "SELECT 33");
+        assertQuery("SELECT " + myAbs + "(-33)", "SELECT 33");
+
+        String wrapMyAbs = "wrap_my_abs_" + randomNameSuffix();
+        assertUpdate("CREATE FUNCTION " + wrapMyAbs + "(x integer) RETURNS integer RETURN " + myAbs + "(x)");
+        // test with inline function first as FunctionManager caches compiled implementations
+        assertQuery("WITH FUNCTION " + myAbs + "(x integer) RETURNS integer RETURN x * 2 SELECT " + wrapMyAbs + "(-33)", "SELECT 33");
+        assertQuery("SELECT " + wrapMyAbs + "(-33)", "SELECT 33");
+        assertUpdate("DROP FUNCTION " + myAbs + "(integer)");
+        assertUpdate("DROP FUNCTION " + wrapMyAbs + "(integer)");
+
+        // verify mutually recursive functions are not allowed
+        String recursive1 = "recursive1_" + randomNameSuffix();
+        String recursive2 = "recursive2_" + randomNameSuffix();
+        assertUpdate("CREATE FUNCTION " + recursive1 + "(x integer) RETURNS integer RETURN x");
+        assertUpdate("CREATE FUNCTION " + recursive2 + "(x integer) RETURNS integer RETURN " + recursive1 + "(x)");
+        assertUpdate("CREATE OR REPLACE FUNCTION " + recursive1 + "(x integer) RETURNS integer RETURN " + recursive2 + "(x)");
+        assertQueryFails("SELECT " + recursive1 + "(42)", "line 3:8: Recursive language functions are not supported: " + recursive1 + "\\(integer\\):integer");
+        assertUpdate("DROP FUNCTION " + recursive1 + "(integer)");
+        assertUpdate("DROP FUNCTION " + recursive2 + "(integer)");
+    }
+
+    @Test
+    public void testProjectionPushdown()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_ROW_TYPE));
+
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_projection_pushdown_",
+                "(id BIGINT, root ROW(f1 BIGINT, f2 BIGINT))",
+                ImmutableList.of("(1, ROW(1, 2))", "(2, NULl)", "(3, ROW(NULL, 4))"))) {
+            String selectQuery = "SELECT id, root.f1 FROM " + testTable.getName();
+            String expectedResult = "VALUES (BIGINT '1', BIGINT '1'), (BIGINT '2', NULL), (BIGINT '3', NULL)";
+
+            if (!hasBehavior(SUPPORTS_DEREFERENCE_PUSHDOWN)) {
+                assertThat(query(selectQuery))
+                        .matches(expectedResult)
+                        .isNotFullyPushedDown(ProjectNode.class);
+            }
+            else {
+                // With Projection Pushdown enabled
+                assertThat(query(selectQuery))
+                        .matches(expectedResult)
+                        .isFullyPushedDown();
+
+                // With Projection Pushdown disabled
+                Session sessionWithoutPushdown = sessionWithProjectionPushdownDisabled(getSession());
+                assertThat(query(sessionWithoutPushdown, selectQuery))
+                        .matches(expectedResult)
+                        .isNotFullyPushedDown(ProjectNode.class);
+            }
+        }
+    }
+
+    @Test
+    public void testProjectionWithCaseSensitiveField()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_DEREFERENCE_PUSHDOWN));
+
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_projection_with_case_sensitive_field_",
+                "(id INT, a ROW(\"UPPER_CASE\" INT, \"lower_case\" INT, \"MiXeD_cAsE\" INT))",
+                ImmutableList.of("(1, ROW(2, 3, 4))", "(5, ROW(6, 7, 8))"))) {
+            String expected = "VALUES (2, 3, 4), (6, 7, 8)";
+            assertThat(query("SELECT a.UPPER_CASE, a.lower_case, a.MiXeD_cAsE FROM " + testTable.getName()))
+                    .matches(expected)
+                    .isFullyPushedDown();
+            assertThat(query("SELECT a.upper_case, a.lower_case, a.mixed_case FROM " + testTable.getName()))
+                    .matches(expected)
+                    .isFullyPushedDown();
+            assertThat(query("SELECT a.UPPER_CASE, a.LOWER_CASE, a.MIXED_CASE FROM " + testTable.getName()))
+                    .matches(expected)
+                    .isFullyPushedDown();
+        }
+    }
+
+    @Test
+    public void testProjectionPushdownMultipleRows()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_DEREFERENCE_PUSHDOWN));
+
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_projection_pushdown_multiple_rows_",
+                "(id INT, nested1 ROW(child1 INT, child2 VARCHAR, child3 INT), nested2 ROW(child1 DOUBLE, child2 BOOLEAN, child3 DATE))",
+                ImmutableList.of(
+                        "(1, ROW(10, 'a', 100), ROW(10.10, true, DATE '2023-04-19'))",
+                        "(2, ROW(20, 'b', 200), ROW(20.20, false, DATE '1990-04-20'))",
+                        "(4, ROW(40, NULL, 400), NULL)",
+                        "(5, NULL, ROW(NULL, true, NULL))"))) {
+            // Select one field from one row field
+            assertThat(query("SELECT id, nested1.child1 FROM " + testTable.getName()))
+                    .matches("VALUES (1, 10), (2, 20), (4, 40), (5, NULL)")
+                    .isFullyPushedDown();
+            assertThat(query("SELECT nested2.child3, id FROM " + testTable.getName()))
+                    .matches("VALUES (DATE '2023-04-19', 1), (DATE '1990-04-20', 2), (NULL, 4), (NULL, 5)")
+                    .isFullyPushedDown();
+
+            // Select one field each from multiple row fields
+            assertThat(query("SELECT nested2.child1, id, nested1.child2 FROM " + testTable.getName()))
+                    .skippingTypesCheck()
+                    .matches("VALUES (DOUBLE '10.10', 1, 'a'), (DOUBLE '20.20', 2, 'b'), (NULL, 4, NULL), (NULL, 5, NULL)")
+                    .isFullyPushedDown();
+
+            // Select multiple fields from one row field
+            assertThat(query("SELECT nested1.child3, id, nested1.child2 FROM " + testTable.getName()))
+                    .skippingTypesCheck()
+                    .matches("VALUES (100, 1, 'a'), (200, 2, 'b'), (400, 4, NULL), (NULL, 5, NULL)")
+                    .isFullyPushedDown();
+            assertThat(query("SELECT nested2.child2, nested2.child3, id FROM " + testTable.getName()))
+                    .matches("VALUES (true, DATE '2023-04-19' , 1), (false, DATE '1990-04-20', 2), (NULL, NULL, 4), (true, NULL, 5)")
+                    .isFullyPushedDown();
+
+            // Select multiple fields from multiple row fields
+            assertThat(query("SELECT id, nested2.child1, nested1.child3, nested2.child2, nested1.child1 FROM " + testTable.getName()))
+                    .matches("VALUES (1, DOUBLE '10.10', 100, true, 10), (2, DOUBLE '20.20', 200, false, 20), (4, NULL, 400, NULL, 40), (5, NULL, NULL, true, NULL)")
+                    .isFullyPushedDown();
+
+            // Select only nested fields
+            assertThat(query("SELECT nested2.child2, nested1.child3 FROM " + testTable.getName()))
+                    .matches("VALUES (true, 100), (false, 200), (NULL, 400), (true, NULL)")
+                    .isFullyPushedDown();
+        }
+    }
+
+    @Test
+    public void testProjectionPushdownWithHighlyNestedData()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_DEREFERENCE_PUSHDOWN));
+
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_highly_nested_data_",
+                "(id INT, row1_t ROW(f1 INT, f2 INT, row2_t ROW (f1 INT, f2 INT, row3_t ROW(f1 INT, f2 INT))))",
+                ImmutableList.of("(1, ROW(2, 3, ROW(4, 5, ROW(6, 7))))",
+                        "(11, ROW(12, 13, ROW(14, 15, ROW(16, 17))))",
+                        "(21, ROW(22, 23, ROW(24, 25, ROW(26, 27))))"))) {
+            // Test select projected columns, with and without their parent column
+            assertQuery("SELECT id, row1_t.row2_t.row3_t.f2 FROM " + testTable.getName(), "VALUES (1, 7), (11, 17), (21, 27)");
+            assertQuery("SELECT id, row1_t.row2_t.row3_t.f2, CAST(row1_t AS JSON) FROM " + testTable.getName(),
+                    "VALUES (1, 7, '{\"f1\":2,\"f2\":3,\"row2_t\":{\"f1\":4,\"f2\":5,\"row3_t\":{\"f1\":6,\"f2\":7}}}'), " +
+                            "(11, 17, '{\"f1\":12,\"f2\":13,\"row2_t\":{\"f1\":14,\"f2\":15,\"row3_t\":{\"f1\":16,\"f2\":17}}}'), " +
+                            "(21, 27, '{\"f1\":22,\"f2\":23,\"row2_t\":{\"f1\":24,\"f2\":25,\"row3_t\":{\"f1\":26,\"f2\":27}}}')");
+
+            // Test predicates on immediate child column and deeper nested column
+            assertQuery("SELECT id, CAST(row1_t.row2_t.row3_t AS JSON) FROM " + testTable.getName() + " WHERE row1_t.row2_t.row3_t.f2 = 27", "VALUES (21, '{\"f1\":26,\"f2\":27}')");
+            assertQuery("SELECT id, CAST(row1_t.row2_t.row3_t AS JSON) FROM " + testTable.getName() + " WHERE row1_t.row2_t.row3_t.f2 > 20", "VALUES (21, '{\"f1\":26,\"f2\":27}')");
+            assertQuery("SELECT id, CAST(row1_t AS JSON) FROM " + testTable.getName() + " WHERE row1_t.row2_t.row3_t.f2 = 27",
+                    "VALUES (21, '{\"f1\":22,\"f2\":23,\"row2_t\":{\"f1\":24,\"f2\":25,\"row3_t\":{\"f1\":26,\"f2\":27}}}')");
+            assertQuery("SELECT id, CAST(row1_t AS JSON) FROM " + testTable.getName() + " WHERE row1_t.row2_t.row3_t.f2 > 20",
+                    "VALUES (21, '{\"f1\":22,\"f2\":23,\"row2_t\":{\"f1\":24,\"f2\":25,\"row3_t\":{\"f1\":26,\"f2\":27}}}')");
+
+            // Test predicates on parent columns
+            assertQuery("SELECT id, row1_t.row2_t.row3_t.f1 FROM " + testTable.getName() + " WHERE row1_t.row2_t.row3_t = ROW(16, 17)", "VALUES (11, 16)");
+            assertQuery("SELECT id, row1_t.row2_t.row3_t.f1 FROM " + testTable.getName() + " WHERE row1_t = ROW(22, 23, ROW(24, 25, ROW(26, 27)))", "VALUES (21, 26)");
+        }
+    }
+
+    @Test
+    public void testProjectionPushdownReadsLessData()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_DEREFERENCE_PUSHDOWN));
+
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_projection_pushdown_reads_less_data_",
+                "AS SELECT val AS id, CAST(ROW(val + 1, val + 2) AS ROW(leaf1 BIGINT, leaf2 BIGINT)) AS root FROM UNNEST(SEQUENCE(1, 10)) AS t(val)")) {
+            MaterializedResult expectedResult = computeActual("SELECT val + 2 FROM UNNEST(SEQUENCE(1, 10)) AS t(val)");
+            String selectQuery = "SELECT root.leaf2 FROM " + testTable.getName();
+            Session sessionWithoutSmallFileThreshold = withoutSmallFileThreshold(getSession());
+            Session sessionWithoutPushdown = sessionWithProjectionPushdownDisabled(sessionWithoutSmallFileThreshold);
+
+            assertQueryStats(
+                    sessionWithoutSmallFileThreshold,
+                    selectQuery,
+                    statsWithPushdown -> {
+                        DataSize physicalInputDataSizeWithPushdown = statsWithPushdown.getPhysicalInputDataSize();
+                        DataSize processedDataSizeWithPushdown = statsWithPushdown.getProcessedInputDataSize();
+                        assertQueryStats(
+                                sessionWithoutPushdown,
+                                selectQuery,
+                                statsWithoutPushdown -> {
+                                    if (supportsPhysicalPushdown()) {
+                                        assertThat(statsWithoutPushdown.getPhysicalInputDataSize()).isGreaterThan(physicalInputDataSizeWithPushdown);
+                                    }
+                                    else {
+                                        // TODO https://github.com/trinodb/trino/issues/17201
+                                        assertThat(statsWithoutPushdown.getPhysicalInputDataSize()).isEqualTo(physicalInputDataSizeWithPushdown);
+                                    }
+                                    assertThat(statsWithoutPushdown.getProcessedInputDataSize()).isGreaterThan(processedDataSizeWithPushdown);
+                                },
+                                results -> assertEquals(results.getOnlyColumnAsSet(), expectedResult.getOnlyColumnAsSet()));
+                    },
+                    results -> assertEquals(results.getOnlyColumnAsSet(), expectedResult.getOnlyColumnAsSet()));
+        }
+    }
+
+    @Test
+    public void testProjectionPushdownPhysicalInputSize()
+    {
+        skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_DEREFERENCE_PUSHDOWN));
+
+        try (TestTable testTable = new TestTable(
+                getQueryRunner()::execute,
+                "test_projection_pushdown_physical_input_size_",
+                "AS SELECT val AS id, CAST(ROW(val + 1, val + 2) AS ROW(leaf1 BIGINT, leaf2 BIGINT)) AS root FROM UNNEST(SEQUENCE(1, 10)) AS t(val)")) {
+            // Verify that the physical input size is smaller when reading the root.leaf1 field compared to reading the root field
+            Session sessionWithoutSmallFileThreshold = withoutSmallFileThreshold(getSession());
+            assertQueryStats(
+                    sessionWithoutSmallFileThreshold,
+                    "SELECT root FROM " + testTable.getName(),
+                    statsWithSelectRootField -> {
+                        assertQueryStats(
+                                sessionWithoutSmallFileThreshold,
+                                "SELECT root.leaf1 FROM " + testTable.getName(),
+                                statsWithSelectLeafField -> {
+                                    if (supportsPhysicalPushdown()) {
+                                        assertThat(statsWithSelectLeafField.getPhysicalInputDataSize()).isLessThan(statsWithSelectRootField.getPhysicalInputDataSize());
+                                    }
+                                    else {
+                                        // TODO https://github.com/trinodb/trino/issues/17201
+                                        assertThat(statsWithSelectLeafField.getPhysicalInputDataSize()).isEqualTo(statsWithSelectRootField.getPhysicalInputDataSize());
+                                    }
+                                },
+                                results -> assertEquals(results.getOnlyColumnAsSet(), computeActual("SELECT val + 1 FROM UNNEST(SEQUENCE(1, 10)) AS t(val)").getOnlyColumnAsSet()));
+                    },
+                    results -> assertEquals(results.getOnlyColumnAsSet(), computeActual("SELECT ROW(val + 1, val + 2) FROM UNNEST(SEQUENCE(1, 10)) AS t(val)").getOnlyColumnAsSet()));
+
+            // Verify that the physical input size is the same when reading the root field compared to reading both the root and root.leaf1 fields
+            assertQueryStats(
+                    sessionWithoutSmallFileThreshold,
+                    "SELECT root FROM " + testTable.getName(),
+                    statsWithSelectRootField -> {
+                        assertQueryStats(
+                                sessionWithoutSmallFileThreshold,
+                                "SELECT root, root.leaf1 FROM " + testTable.getName(),
+                                statsWithSelectRootAndLeafField -> {
+                                    assertThat(statsWithSelectRootAndLeafField.getPhysicalInputDataSize()).isEqualTo(statsWithSelectRootField.getPhysicalInputDataSize());
+                                },
+                                results -> assertEqualsIgnoreOrder(results.getMaterializedRows(), computeActual("SELECT ROW(val + 1, val + 2), val + 1 FROM UNNEST(SEQUENCE(1, 10)) AS t(val)").getMaterializedRows()));
+                    },
+                    results -> assertEquals(results.getOnlyColumnAsSet(), computeActual("SELECT ROW(val + 1, val + 2) FROM UNNEST(SEQUENCE(1, 10)) AS t(val)").getOnlyColumnAsSet()));
+        }
+    }
+
+    protected static void skipTestUnless(boolean requirement)
+    {
+        if (!requirement) {
+            throw new SkipException("requirement not met");
+        }
+    }
+
     protected Consumer<Plan> assertPartialLimitWithPreSortedInputsCount(Session session, int expectedCount)
     {
         return plan -> {
@@ -5810,6 +6857,23 @@ protected String createSchemaSql(String schemaName)
         return "CREATE SCHEMA " + schemaName;
     }
 
+    protected boolean supportsPhysicalPushdown()
+    {
+        return true;
+    }
+
+    protected Session sessionWithProjectionPushdownDisabled(Session session)
+    {
+        return Session.builder(session)
+                .setCatalogSessionProperty(getSession().getCatalog().orElseThrow(), "projection_pushdown_enabled", "false")
+                .build();
+    }
+
+    protected Session withoutSmallFileThreshold(Session session)
+    {
+        throw new UnsupportedOperationException();
+    }
+
     protected static final class DataMappingTestSetup
     {
         private final String trinoTypeName;
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseDynamicPartitionPruningTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseDynamicPartitionPruningTest.java
index 5d24d3cd56a8..1edd986c17f7 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/BaseDynamicPartitionPruningTest.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseDynamicPartitionPruningTest.java
@@ -27,14 +27,14 @@
 import io.trino.sql.planner.OptimizerConfig.JoinDistributionType;
 import io.trino.tpch.TpchTable;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Stream;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.SystemSessionProperties.ENABLE_LARGE_DYNAMIC_FILTERS;
@@ -46,7 +46,6 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.sql.planner.OptimizerConfig.JoinDistributionType.PARTITIONED;
 import static io.trino.sql.planner.OptimizerConfig.JoinReorderingStrategy.NONE;
-import static io.trino.testing.DataProviders.toDataProvider;
 import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
 import static io.trino.tpch.TpchTable.LINE_ITEM;
 import static io.trino.tpch.TpchTable.ORDERS;
@@ -54,9 +53,11 @@
 import static io.trino.util.DynamicFiltersTestUtil.getSimplifiedDomainString;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+@TestInstance(PER_CLASS)
 public abstract class BaseDynamicPartitionPruningTest
         extends AbstractTestQueryFramework
 {
@@ -70,7 +71,7 @@ public abstract class BaseDynamicPartitionPruningTest
             // disable semi join to inner join rewrite to test semi join operators explicitly
             "optimizer.rewrite-filtering-semi-join-to-inner-join", "false");
 
-    @BeforeClass
+    @BeforeAll
     public void initTables()
             throws Exception
     {
@@ -95,7 +96,8 @@ protected Session getSession()
                 .build();
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testJoinWithEmptyBuildSide()
     {
         @Language("SQL") String selectQuery = "SELECT * FROM partitioned_lineitem JOIN supplier ON partitioned_lineitem.suppkey = supplier.suppkey AND supplier.name = 'abc'";
@@ -105,9 +107,6 @@ public void testJoinWithEmptyBuildSide()
         MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
         assertEqualsIgnoreOrder(result.getResult(), expected);
 
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(result.getQueryId(), getQualifiedTableName(PARTITIONED_LINEITEM));
-        assertEquals(probeStats.getInputPositions(), 0L);
-
         DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.getQueryId());
         assertEquals(dynamicFiltersStats.getTotalDynamicFilters(), 1L);
         assertEquals(dynamicFiltersStats.getLazyDynamicFilters(), 1L);
@@ -119,7 +118,8 @@ public void testJoinWithEmptyBuildSide()
         assertTrue(domainStats.getCollectionDuration().isPresent());
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testJoinWithSelectiveBuildSide()
     {
         @Language("SQL") String selectQuery = "SELECT * FROM partitioned_lineitem JOIN supplier ON partitioned_lineitem.suppkey = supplier.suppkey " +
@@ -130,10 +130,6 @@ public void testJoinWithSelectiveBuildSide()
         MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
         assertEqualsIgnoreOrder(result.getResult(), expected);
 
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(result.getQueryId(), getQualifiedTableName(PARTITIONED_LINEITEM));
-        // Probe-side is partially scanned
-        assertEquals(probeStats.getInputPositions(), 615L);
-
         DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.getQueryId());
         assertEquals(dynamicFiltersStats.getTotalDynamicFilters(), 1L);
         assertEquals(dynamicFiltersStats.getLazyDynamicFilters(), 1L);
@@ -144,7 +140,8 @@ public void testJoinWithSelectiveBuildSide()
         assertEquals(domainStats.getSimplifiedDomain(), singleValue(BIGINT, 1L).toString(getSession().toConnectorSession()));
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testJoinWithNonSelectiveBuildSide()
     {
         @Language("SQL") String selectQuery = "SELECT * FROM partitioned_lineitem JOIN supplier ON partitioned_lineitem.suppkey = supplier.suppkey";
@@ -154,10 +151,6 @@ public void testJoinWithNonSelectiveBuildSide()
         MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
         assertEqualsIgnoreOrder(result.getResult(), expected);
 
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(result.getQueryId(), getQualifiedTableName(PARTITIONED_LINEITEM));
-        // Probe-side is fully scanned
-        assertEquals(probeStats.getInputPositions(), LINEITEM_COUNT);
-
         DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.getQueryId());
         assertEquals(dynamicFiltersStats.getTotalDynamicFilters(), 1L);
         assertEquals(dynamicFiltersStats.getLazyDynamicFilters(), 1L);
@@ -169,7 +162,8 @@ public void testJoinWithNonSelectiveBuildSide()
                 .isEqualTo(getSimplifiedDomainString(1L, 100L, 100, BIGINT));
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testJoinLargeBuildSideRangeDynamicFiltering()
     {
         @Language("SQL") String selectQuery = "SELECT * FROM partitioned_lineitem JOIN orders ON partitioned_lineitem.orderkey = orders.orderkey";
@@ -179,10 +173,6 @@ public void testJoinLargeBuildSideRangeDynamicFiltering()
         MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
         assertEqualsIgnoreOrder(result.getResult(), expected);
 
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(result.getQueryId(), getQualifiedTableName(PARTITIONED_LINEITEM));
-        // Probe-side is fully scanned because the build-side is too large for dynamic filtering
-        assertEquals(probeStats.getInputPositions(), LINEITEM_COUNT);
-
         DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.getQueryId());
         assertEquals(dynamicFiltersStats.getTotalDynamicFilters(), 1L);
         assertEquals(dynamicFiltersStats.getLazyDynamicFilters(), 1L);
@@ -196,7 +186,8 @@ public void testJoinLargeBuildSideRangeDynamicFiltering()
                         .toString(getSession().toConnectorSession()));
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testJoinWithMultipleDynamicFiltersOnProbe()
     {
         // supplier names Supplier#000000001 and Supplier#000000002 match suppkey 1 and 2
@@ -210,10 +201,6 @@ public void testJoinWithMultipleDynamicFiltersOnProbe()
         MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
         assertEqualsIgnoreOrder(result.getResult(), expected);
 
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(result.getQueryId(), getQualifiedTableName(PARTITIONED_LINEITEM));
-        // Probe-side is partially scanned
-        assertEquals(probeStats.getInputPositions(), 558L);
-
         DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.getQueryId());
         assertEquals(dynamicFiltersStats.getTotalDynamicFilters(), 2L);
         assertEquals(dynamicFiltersStats.getLazyDynamicFilters(), 2L);
@@ -227,7 +214,8 @@ public void testJoinWithMultipleDynamicFiltersOnProbe()
                         getSimplifiedDomainString(2L, 2L, 1, BIGINT));
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testJoinWithImplicitCoercion()
     {
         // setup partitioned fact table with integer suppkey
@@ -256,7 +244,8 @@ public void testJoinWithImplicitCoercion()
         assertEquals(domainStats.getSimplifiedDomain(), singleValue(BIGINT, 1L).toString(getSession().toConnectorSession()));
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testSemiJoinWithEmptyBuildSide()
     {
         @Language("SQL") String selectQuery = "SELECT * FROM partitioned_lineitem WHERE suppkey IN (SELECT suppkey FROM supplier WHERE name = 'abc')";
@@ -266,9 +255,6 @@ public void testSemiJoinWithEmptyBuildSide()
         MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
         assertEqualsIgnoreOrder(result.getResult(), expected);
 
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(result.getQueryId(), getQualifiedTableName(PARTITIONED_LINEITEM));
-        assertEquals(probeStats.getInputPositions(), 0L);
-
         DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.getQueryId());
         assertEquals(dynamicFiltersStats.getTotalDynamicFilters(), 1L);
         assertEquals(dynamicFiltersStats.getLazyDynamicFilters(), 1L);
@@ -279,7 +265,8 @@ public void testSemiJoinWithEmptyBuildSide()
         assertEquals(domainStats.getSimplifiedDomain(), none(BIGINT).toString(getSession().toConnectorSession()));
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testSemiJoinWithSelectiveBuildSide()
     {
         @Language("SQL") String selectQuery = "SELECT * FROM partitioned_lineitem WHERE suppkey IN (SELECT suppkey FROM supplier WHERE name = 'Supplier#000000001')";
@@ -289,10 +276,6 @@ public void testSemiJoinWithSelectiveBuildSide()
         MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
         assertEqualsIgnoreOrder(result.getResult(), expected);
 
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(result.getQueryId(), getQualifiedTableName(PARTITIONED_LINEITEM));
-        // Probe-side is partially scanned
-        assertEquals(probeStats.getInputPositions(), 615L);
-
         DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.getQueryId());
         assertEquals(dynamicFiltersStats.getTotalDynamicFilters(), 1L);
         assertEquals(dynamicFiltersStats.getLazyDynamicFilters(), 1L);
@@ -303,7 +286,8 @@ public void testSemiJoinWithSelectiveBuildSide()
         assertEquals(domainStats.getSimplifiedDomain(), singleValue(BIGINT, 1L).toString(getSession().toConnectorSession()));
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testSemiJoinWithNonSelectiveBuildSide()
     {
         @Language("SQL") String selectQuery = "SELECT * FROM partitioned_lineitem WHERE suppkey IN (SELECT suppkey FROM supplier)";
@@ -313,10 +297,6 @@ public void testSemiJoinWithNonSelectiveBuildSide()
         MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
         assertEqualsIgnoreOrder(result.getResult(), expected);
 
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(result.getQueryId(), getQualifiedTableName(PARTITIONED_LINEITEM));
-        // Probe-side is fully scanned
-        assertEquals(probeStats.getInputPositions(), LINEITEM_COUNT);
-
         DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.getQueryId());
         assertEquals(dynamicFiltersStats.getTotalDynamicFilters(), 1L);
         assertEquals(dynamicFiltersStats.getLazyDynamicFilters(), 1L);
@@ -328,7 +308,8 @@ public void testSemiJoinWithNonSelectiveBuildSide()
                 .isEqualTo(getSimplifiedDomainString(1L, 100L, 100, BIGINT));
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testSemiJoinLargeBuildSideRangeDynamicFiltering()
     {
         @Language("SQL") String selectQuery = "SELECT * FROM partitioned_lineitem WHERE orderkey IN (SELECT orderkey FROM orders)";
@@ -338,10 +319,6 @@ public void testSemiJoinLargeBuildSideRangeDynamicFiltering()
         MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
         assertEqualsIgnoreOrder(result.getResult(), expected);
 
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(result.getQueryId(), getQualifiedTableName(PARTITIONED_LINEITEM));
-        // Probe-side is fully scanned because the build-side is too large for dynamic filtering
-        assertEquals(probeStats.getInputPositions(), LINEITEM_COUNT);
-
         DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.getQueryId());
         assertEquals(dynamicFiltersStats.getTotalDynamicFilters(), 1L);
         assertEquals(dynamicFiltersStats.getLazyDynamicFilters(), 1L);
@@ -355,7 +332,8 @@ public void testSemiJoinLargeBuildSideRangeDynamicFiltering()
                         .toString(getSession().toConnectorSession()));
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testRightJoinWithEmptyBuildSide()
     {
         @Language("SQL") String selectQuery = "SELECT * FROM partitioned_lineitem l RIGHT JOIN supplier s ON l.suppkey = s.suppkey WHERE name = 'abc'";
@@ -365,9 +343,6 @@ public void testRightJoinWithEmptyBuildSide()
         MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
         assertEqualsIgnoreOrder(result.getResult(), expected);
 
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(result.getQueryId(), getQualifiedTableName(PARTITIONED_LINEITEM));
-        assertEquals(probeStats.getInputPositions(), 0L);
-
         DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.getQueryId());
         assertEquals(dynamicFiltersStats.getTotalDynamicFilters(), 1L);
         assertEquals(dynamicFiltersStats.getLazyDynamicFilters(), 1L);
@@ -378,7 +353,8 @@ public void testRightJoinWithEmptyBuildSide()
         assertEquals(domainStats.getSimplifiedDomain(), none(BIGINT).toString(getSession().toConnectorSession()));
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testRightJoinWithSelectiveBuildSide()
     {
         @Language("SQL") String selectQuery = "SELECT * FROM partitioned_lineitem l RIGHT JOIN supplier s ON l.suppkey = s.suppkey WHERE name = 'Supplier#000000001'";
@@ -388,10 +364,6 @@ public void testRightJoinWithSelectiveBuildSide()
         MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
         assertEqualsIgnoreOrder(result.getResult(), expected);
 
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(result.getQueryId(), getQualifiedTableName(PARTITIONED_LINEITEM));
-        // Probe-side is partially scanned
-        assertEquals(probeStats.getInputPositions(), 615L);
-
         DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.getQueryId());
         assertEquals(dynamicFiltersStats.getTotalDynamicFilters(), 1L);
         assertEquals(dynamicFiltersStats.getLazyDynamicFilters(), 1L);
@@ -402,7 +374,8 @@ public void testRightJoinWithSelectiveBuildSide()
         assertEquals(domainStats.getSimplifiedDomain(), singleValue(BIGINT, 1L).toString(getSession().toConnectorSession()));
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testRightJoinWithNonSelectiveBuildSide()
     {
         @Language("SQL") String selectQuery = "SELECT * FROM partitioned_lineitem l RIGHT JOIN supplier s ON l.suppkey = s.suppkey";
@@ -412,10 +385,6 @@ public void testRightJoinWithNonSelectiveBuildSide()
         MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
         assertEqualsIgnoreOrder(result.getResult(), expected);
 
-        OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(result.getQueryId(), getQualifiedTableName(PARTITIONED_LINEITEM));
-        // Probe-side is fully scanned
-        assertEquals(probeStats.getInputPositions(), LINEITEM_COUNT);
-
         DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.getQueryId());
         assertEquals(dynamicFiltersStats.getTotalDynamicFilters(), 1L);
         assertEquals(dynamicFiltersStats.getLazyDynamicFilters(), 1L);
@@ -427,34 +396,38 @@ public void testRightJoinWithNonSelectiveBuildSide()
                 .isEqualTo(getSimplifiedDomainString(1L, 100L, 100, BIGINT));
     }
 
-    @Test(timeOut = 30_000, dataProvider = "joinDistributionTypes")
-    public void testJoinDynamicFilteringMultiJoinOnPartitionedTables(JoinDistributionType joinDistributionType)
+    @Test
+    @Timeout(30)
+    public void testJoinDynamicFilteringMultiJoinOnPartitionedTables()
     {
-        assertUpdate("DROP TABLE IF EXISTS t0_part");
-        assertUpdate("DROP TABLE IF EXISTS t1_part");
-        assertUpdate("DROP TABLE IF EXISTS t2_part");
-        createPartitionedTable("t0_part", ImmutableList.of("v0 real", "k0 integer"), ImmutableList.of("k0"));
-        createPartitionedTable("t1_part", ImmutableList.of("v1 real", "i1 integer"), ImmutableList.of());
-        createPartitionedTable("t2_part", ImmutableList.of("v2 real", "i2 integer", "k2 integer"), ImmutableList.of("k2"));
-        assertUpdate("INSERT INTO t0_part VALUES (1.0, 1), (1.0, 2)", 2);
-        assertUpdate("INSERT INTO t1_part VALUES (2.0, 10), (2.0, 20)", 2);
-        assertUpdate("INSERT INTO t2_part VALUES (3.0, 1, 1), (3.0, 2, 2)", 2);
-        testJoinDynamicFilteringMultiJoin(joinDistributionType, "t0_part", "t1_part", "t2_part");
+        for (JoinDistributionType joinDistributionType : JoinDistributionType.values()) {
+            assertUpdate("DROP TABLE IF EXISTS t0_part");
+            assertUpdate("DROP TABLE IF EXISTS t1_part");
+            assertUpdate("DROP TABLE IF EXISTS t2_part");
+            createPartitionedTable("t0_part", ImmutableList.of("v0 real", "k0 integer"), ImmutableList.of("k0"));
+            createPartitionedTable("t1_part", ImmutableList.of("v1 real", "i1 integer"), ImmutableList.of());
+            createPartitionedTable("t2_part", ImmutableList.of("v2 real", "i2 integer", "k2 integer"), ImmutableList.of("k2"));
+            assertUpdate("INSERT INTO t0_part VALUES (1.0, 1), (1.0, 2)", 2);
+            assertUpdate("INSERT INTO t1_part VALUES (2.0, 10), (2.0, 20)", 2);
+            assertUpdate("INSERT INTO t2_part VALUES (3.0, 1, 1), (3.0, 2, 2)", 2);
+            testJoinDynamicFilteringMultiJoin(joinDistributionType, "t0_part", "t1_part", "t2_part");
+        }
     }
 
     // TODO: use joinDistributionTypeProvider when https://github.com/trinodb/trino/issues/4713 is done as currently waiting for BROADCAST DFs doesn't work for bucketed tables
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testJoinDynamicFilteringMultiJoinOnBucketedTables()
     {
         assertUpdate("DROP TABLE IF EXISTS t0_bucketed");
         assertUpdate("DROP TABLE IF EXISTS t1_bucketed");
         assertUpdate("DROP TABLE IF EXISTS t2_bucketed");
-        createPartitionedAndBucketedTable("t0_bucketed", ImmutableList.of("v0 real", "k0 integer"), ImmutableList.of("k0"), ImmutableList.of("v0"));
-        createPartitionedAndBucketedTable("t1_bucketed", ImmutableList.of("v1 real", "i1 integer"), ImmutableList.of(), ImmutableList.of("v1"));
-        createPartitionedAndBucketedTable("t2_bucketed", ImmutableList.of("v2 real", "i2 integer", "k2 integer"), ImmutableList.of("k2"), ImmutableList.of("v2"));
-        assertUpdate("INSERT INTO t0_bucketed VALUES (1.0, 1), (1.0, 2)", 2);
-        assertUpdate("INSERT INTO t1_bucketed VALUES (2.0, 10), (2.0, 20)", 2);
-        assertUpdate("INSERT INTO t2_bucketed VALUES (3.0, 1, 1), (3.0, 2, 2)", 2);
+        createPartitionedAndBucketedTable("t0_bucketed", ImmutableList.of("v0 bigint", "k0 integer"), ImmutableList.of("k0"), ImmutableList.of("v0"));
+        createPartitionedAndBucketedTable("t1_bucketed", ImmutableList.of("v1 bigint", "i1 integer"), ImmutableList.of(), ImmutableList.of("v1"));
+        createPartitionedAndBucketedTable("t2_bucketed", ImmutableList.of("v2 bigint", "i2 integer", "k2 integer"), ImmutableList.of("k2"), ImmutableList.of("v2"));
+        assertUpdate("INSERT INTO t0_bucketed VALUES (1, 1), (1, 2)", 2);
+        assertUpdate("INSERT INTO t1_bucketed VALUES (2, 10), (2, 20)", 2);
+        assertUpdate("INSERT INTO t2_bucketed VALUES (3, 1, 1), (3, 2, 2)", 2);
         testJoinDynamicFilteringMultiJoin(PARTITIONED, "t0_bucketed", "t1_bucketed", "t2_bucketed");
     }
 
@@ -502,13 +475,6 @@ private long getQueryInputPositions(Session session, @Language("SQL") String sql
         return stats.getPhysicalInputPositions();
     }
 
-    @DataProvider
-    public Object[][] joinDistributionTypes()
-    {
-        return Stream.of(JoinDistributionType.values())
-                .collect(toDataProvider());
-    }
-
     private Session withDynamicFilteringDisabled()
     {
         return withDynamicFilteringDisabled(getSession());
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
index f767970cc66d..9a6e8d1e8938 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
@@ -78,7 +78,6 @@
 public abstract class BaseFailureRecoveryTest
         extends AbstractTestQueryFramework
 {
-    protected static final int INVOCATION_COUNT = 1;
     private static final Duration MAX_ERROR_DURATION = new Duration(5, SECONDS);
     private static final Duration REQUEST_TIMEOUT = new Duration(5, SECONDS);
     private static final int DEFAULT_MAX_PARALLEL_TEST_CONCURRENCY = 4;
@@ -117,7 +116,7 @@ protected final QueryRunner createQueryRunner()
                         .put("failure-injection.request-timeout", new Duration(REQUEST_TIMEOUT.toMillis() * 2, MILLISECONDS).toString())
                         // making http timeouts shorter so tests which simulate communication timeouts finish in reasonable amount of time
                         .put("exchange.http-client.idle-timeout", REQUEST_TIMEOUT.toString())
-                        .put("fault-tolerant-execution-partition-count", "5")
+                        .put("fault-tolerant-execution-max-partition-count", "5")
                         // to trigger spilling
                         .put("exchange.deduplication-buffer-size", "1kB")
                         .put("fault-tolerant-execution-task-memory", "1GB")
@@ -209,8 +208,8 @@ public Object[][] parallelTests()
         };
     }
 
-    @Test(invocationCount = INVOCATION_COUNT, dataProvider = "parallelTests")
-    public final void testParallel(Runnable runnable)
+    @Test(dataProvider = "parallelTests")
+    public void testParallel(Runnable runnable)
     {
         try {
             // By default, a test method using a @DataProvider with parallel attribute is run in 10 threads (org.testng.xml.XmlSuite#DEFAULT_DATA_PROVIDER_THREAD_COUNT).
@@ -443,7 +442,7 @@ protected void checkTemporaryTables(Set<String> queryIds)
                 String temporaryTableName = (String) temporaryTableRow.getField(0);
                 try {
                     assertThatThrownBy(() -> getQueryRunner().execute("SELECT 1 FROM %s WHERE 1 = 0".formatted(temporaryTableName)))
-                            .hasMessageContaining("Table '%s' does not exist", temporaryTableName);
+                            .hasMessageContaining(".%s' does not exist", temporaryTableName);
                 }
                 catch (AssertionError e) {
                     remainingTemporaryTables.computeIfAbsent(queryId, ignored -> new HashSet<>()).add(temporaryTableName);
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseOrcWithBloomFiltersTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseOrcWithBloomFiltersTest.java
index 44d2c64cabd1..8ce425b4fb5d 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/BaseOrcWithBloomFiltersTest.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseOrcWithBloomFiltersTest.java
@@ -15,7 +15,7 @@
 
 import io.trino.Session;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseTestParquetWithBloomFilters.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseTestParquetWithBloomFilters.java
new file mode 100644
index 000000000000..4cd93f25296f
--- /dev/null
+++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseTestParquetWithBloomFilters.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed 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 io.trino.testing;
+
+import com.google.common.collect.ImmutableSet;
+import io.trino.Session;
+import io.trino.spi.connector.CatalogSchemaTableName;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public abstract class BaseTestParquetWithBloomFilters
+        extends AbstractTestQueryFramework
+{
+    protected Path dataDirectory;
+    private static final String COLUMN_NAME = "dataColumn";
+    // containing extreme values, so the row group cannot be eliminated by the column chunk's min/max statistics
+    private static final List<Integer> TEST_VALUES = Arrays.asList(Integer.MIN_VALUE, Integer.MAX_VALUE, 1, 3, 7, 10, 15);
+    private static final int MISSING_VALUE = 0;
+
+    @Test
+    public void verifyBloomFilterEnabled()
+    {
+        assertThat(query(format("SHOW SESSION LIKE '%s.parquet_use_bloom_filter'", getSession().getCatalog().orElseThrow())))
+                .skippingTypesCheck()
+                .matches(result -> result.getRowCount() == 1)
+                .matches(result -> {
+                    String value = (String) result.getMaterializedRows().get(0).getField(1);
+                    return value.equals("true");
+                });
+    }
+
+    @Test
+    public void testBloomFilterRowGroupPruning()
+    {
+        CatalogSchemaTableName tableName = createParquetTableWithBloomFilter(COLUMN_NAME, TEST_VALUES);
+
+        // assert table is populated with data
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName,
+                queryStats -> {},
+                results -> assertThat(results.getOnlyColumnAsSet()).isEqualTo(ImmutableSet.copyOf(TEST_VALUES)));
+
+        // When reading bloom filter is enabled, row groups are pruned when searching for a missing value
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE " + COLUMN_NAME + " = " + MISSING_VALUE,
+                queryStats -> {
+                    assertThat(queryStats.getPhysicalInputPositions()).isEqualTo(0);
+                    assertThat(queryStats.getProcessedInputPositions()).isEqualTo(0);
+                },
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+
+        // When reading bloom filter is enabled, row groups are not pruned when searching for a value present in the file
+        assertQueryStats(
+                getSession(),
+                "SELECT * FROM " + tableName + " WHERE " + COLUMN_NAME + " = " + TEST_VALUES.get(0),
+                queryStats -> {
+                    assertThat(queryStats.getPhysicalInputPositions()).isGreaterThan(0);
+                    assertThat(queryStats.getProcessedInputPositions()).isEqualTo(queryStats.getPhysicalInputPositions());
+                },
+                results -> assertThat(results.getRowCount()).isEqualTo(1));
+
+        // When reading bloom filter is disabled, row groups are not pruned when searching for a missing value
+        assertQueryStats(
+                bloomFiltersDisabled(getSession()),
+                "SELECT * FROM " + tableName + " WHERE " + COLUMN_NAME + " = " + MISSING_VALUE,
+                queryStats -> {
+                    assertThat(queryStats.getPhysicalInputPositions()).isGreaterThan(0);
+                    assertThat(queryStats.getProcessedInputPositions()).isEqualTo(queryStats.getPhysicalInputPositions());
+                },
+                results -> assertThat(results.getRowCount()).isEqualTo(0));
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
+    private static Session bloomFiltersDisabled(Session session)
+    {
+        return Session.builder(session)
+                .setCatalogSessionProperty(session.getCatalog().orElseThrow(), "parquet_use_bloom_filter", "false")
+                .build();
+    }
+
+    protected abstract CatalogSchemaTableName createParquetTableWithBloomFilter(String columnName, List<Integer> testValues);
+}
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/CountingMockConnector.java b/testing/trino-testing/src/main/java/io/trino/testing/CountingMockConnector.java
index c8bd8937836d..b0c6f17af68d 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/CountingMockConnector.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/CountingMockConnector.java
@@ -14,50 +14,68 @@
 package io.trino.testing;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Multiset;
+import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
 import io.trino.connector.MockConnectorFactory;
 import io.trino.spi.Plugin;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.security.RoleGrant;
 import io.trino.spi.security.TrinoPrincipal;
+import io.trino.tracing.TracingConnectorMetadata;
+import io.trino.util.AutoCloseableCloser;
 
-import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.OptionalLong;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableMultiset.toImmutableMultiset;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.connector.MockConnectorFactory.Builder.defaultGetColumns;
 import static io.trino.connector.MockConnectorFactory.Builder.defaultGetTableHandle;
 import static io.trino.spi.security.PrincipalType.USER;
+import static java.util.Map.entry;
+import static java.util.stream.Collectors.joining;
 
 public class CountingMockConnector
+        implements AutoCloseable
 {
     private final Object lock = new Object();
 
-    private final List<String> tablesTestSchema1 = IntStream.range(0, 1000)
+    private final Set<String> tablesTestSchema1 = IntStream.range(0, 1000)
             .mapToObj(i -> "test_table" + i)
-            .collect(toImmutableList());
+            .collect(toImmutableSet());
 
-    private final List<String> tablesTestSchema2 = IntStream.range(0, 2000)
+    private final Set<String> tablesTestSchema2 = IntStream.range(0, 2000)
             .mapToObj(i -> "test_table" + i)
-            .collect(toImmutableList());
+            .collect(toImmutableSet());
 
     private final Set<RoleGrant> roleGrants = IntStream.range(0, 100)
             .mapToObj(i -> new RoleGrant(new TrinoPrincipal(USER, "user" + (i == 0 ? "" : i)), "role" + i / 2, false))
             .collect(toImmutableSet());
 
-    private final AtomicLong listSchemasCallsCounter = new AtomicLong();
-    private final AtomicLong listTablesCallsCounter = new AtomicLong();
-    private final AtomicLong getTableHandleCallsCounter = new AtomicLong();
-    private final AtomicLong getColumnsCallsCounter = new AtomicLong();
-    private final ListRoleGrantsCounter listRoleGranstCounter = new ListRoleGrantsCounter();
+    private final AutoCloseableCloser closer = AutoCloseableCloser.create();
+
+    private final InMemorySpanExporter spanExporter;
+    private final SdkTracerProvider tracerProvider;
+
+    public CountingMockConnector()
+    {
+        spanExporter = closer.register(InMemorySpanExporter.create());
+        tracerProvider = closer.register(SdkTracerProvider.builder()
+                .addSpanProcessor(SimpleSpanProcessor.create(spanExporter))
+                .build());
+    }
+
+    @Override
+    public void close()
+            throws Exception
+    {
+        closer.close();
+    }
 
     public Plugin getPlugin()
     {
@@ -80,274 +98,67 @@ public Stream<SchemaTableName> getAllTables()
                         .map(tableName -> new SchemaTableName("test_schema2", tableName)));
     }
 
-    public MetadataCallsCount runCounting(Runnable runnable)
+    public Multiset<String> runTracing(Runnable runnable)
     {
         synchronized (lock) {
-            listSchemasCallsCounter.set(0);
-            listTablesCallsCounter.set(0);
-            getTableHandleCallsCounter.set(0);
-            getColumnsCallsCounter.set(0);
-            listRoleGranstCounter.reset();
+            spanExporter.reset();
 
             runnable.run();
 
-            return new MetadataCallsCount(
-                    listSchemasCallsCounter.get(),
-                    listTablesCallsCounter.get(),
-                    getTableHandleCallsCounter.get(),
-                    getColumnsCallsCounter.get(),
-                    listRoleGranstCounter.listRowGrantsCallsCounter.get(),
-                    listRoleGranstCounter.rolesPushedCounter.get(),
-                    listRoleGranstCounter.granteesPushedCounter.get(),
-                    listRoleGranstCounter.limitPushedCounter.get());
+            return spanExporter.getFinishedSpanItems().stream()
+                    .map(span -> {
+                        String attributes = span.getAttributes().asMap().entrySet().stream()
+                                .map(entry -> entry(entry.getKey().getKey(), entry.getValue()))
+                                .filter(entry -> !entry.getKey().equals("trino.catalog"))
+                                .map(entry -> "%s=%s".formatted(entry.getKey().replaceFirst("^trino\\.", ""), entry.getValue()))
+                                .sorted()
+                                .collect(joining(", "));
+                        if (attributes.isEmpty()) {
+                            return span.getName();
+                        }
+                        return "%s(%s)".formatted(span.getName(), attributes);
+                    })
+                    .collect(toImmutableMultiset());
         }
     }
 
     private ConnectorFactory getConnectorFactory()
     {
         MockConnectorFactory mockConnectorFactory = MockConnectorFactory.builder()
-                .withListSchemaNames(connectorSession -> {
-                    listSchemasCallsCounter.incrementAndGet();
-                    return ImmutableList.of("test_schema1", "test_schema2");
-                })
+                .withMetadataWrapper(connectorMetadata -> new TracingConnectorMetadata(tracerProvider.get("test"), "mock", connectorMetadata))
+                .withListSchemaNames(connectorSession -> ImmutableList.of("test_schema1", "test_schema2", "test_schema3_empty", "test_schema4_empty"))
                 .withListTables((connectorSession, schemaName) -> {
-                    listTablesCallsCounter.incrementAndGet();
                     if (schemaName.equals("test_schema1")) {
-                        return tablesTestSchema1;
+                        return ImmutableList.copyOf(tablesTestSchema1);
                     }
                     if (schemaName.equals("test_schema2")) {
-                        return tablesTestSchema2;
+                        return ImmutableList.copyOf(tablesTestSchema2);
                     }
                     return ImmutableList.of();
                 })
                 .withGetTableHandle((connectorSession, schemaTableName) -> {
-                    getTableHandleCallsCounter.incrementAndGet();
+                    switch (schemaTableName.getSchemaName()) {
+                        case "test_schema1" -> {
+                            if (!tablesTestSchema1.contains(schemaTableName.getTableName())) {
+                                return null;
+                            }
+                        }
+                        case "test_schema2" -> {
+                            if (!tablesTestSchema2.contains(schemaTableName.getTableName())) {
+                                return null;
+                            }
+                        }
+                        default -> {
+                            return null;
+                        }
+                    }
                     return defaultGetTableHandle().apply(connectorSession, schemaTableName);
                 })
-                .withGetColumns(schemaTableName -> {
-                    getColumnsCallsCounter.incrementAndGet();
-                    return defaultGetColumns().apply(schemaTableName);
-                })
-                .withListRoleGrants((connectorSession, roles, grantees, limit) -> {
-                    listRoleGranstCounter.incrementListRoleGrants(roles, grantees, limit);
-                    return roleGrants;
-                })
+                .withGetColumns(schemaTableName -> defaultGetColumns().apply(schemaTableName))
+                .withGetComment(schemaTableName -> Optional.of("comment for " + schemaTableName))
+                .withListRoleGrants((connectorSession, roles, grantees, limit) -> roleGrants)
                 .build();
 
         return mockConnectorFactory;
     }
-
-    public static final class MetadataCallsCount
-    {
-        private final long listSchemasCount;
-        private final long listTablesCount;
-        private final long getTableHandleCount;
-        private final long getColumnsCount;
-        private final long listRoleGrantsCount;
-        private final long rolesPushedCount;
-        private final long granteesPushedCount;
-        private final long limitPushedCount;
-
-        public MetadataCallsCount()
-        {
-            this(0, 0, 0, 0, 0, 0, 0, 0);
-        }
-
-        public MetadataCallsCount(
-                long listSchemasCount,
-                long listTablesCount,
-                long getTableHandleCount,
-                long getColumnsCount,
-                long listRoleGrantsCount,
-                long rolesPushedCount,
-                long granteesPushedCount,
-                long limitPushedCount)
-        {
-            this.listSchemasCount = listSchemasCount;
-            this.listTablesCount = listTablesCount;
-            this.getTableHandleCount = getTableHandleCount;
-            this.getColumnsCount = getColumnsCount;
-            this.listRoleGrantsCount = listRoleGrantsCount;
-            this.rolesPushedCount = rolesPushedCount;
-            this.granteesPushedCount = granteesPushedCount;
-            this.limitPushedCount = limitPushedCount;
-        }
-
-        public MetadataCallsCount withListSchemasCount(long listSchemasCount)
-        {
-            return new MetadataCallsCount(
-                    listSchemasCount,
-                    listTablesCount,
-                    getTableHandleCount,
-                    getColumnsCount,
-                    listRoleGrantsCount,
-                    rolesPushedCount,
-                    granteesPushedCount,
-                    limitPushedCount);
-        }
-
-        public MetadataCallsCount withListTablesCount(long listTablesCount)
-        {
-            return new MetadataCallsCount(
-                    listSchemasCount,
-                    listTablesCount,
-                    getTableHandleCount,
-                    getColumnsCount,
-                    listRoleGrantsCount,
-                    rolesPushedCount,
-                    granteesPushedCount,
-                    limitPushedCount);
-        }
-
-        public MetadataCallsCount withGetTableHandleCount(long getTableHandleCount)
-        {
-            return new MetadataCallsCount(
-                    listSchemasCount,
-                    listTablesCount,
-                    getTableHandleCount,
-                    getColumnsCount,
-                    listRoleGrantsCount,
-                    rolesPushedCount,
-                    granteesPushedCount,
-                    limitPushedCount);
-        }
-
-        public MetadataCallsCount withGetColumnsCount(long getColumnsCount)
-        {
-            return new MetadataCallsCount(
-                    listSchemasCount,
-                    listTablesCount,
-                    getTableHandleCount,
-                    getColumnsCount,
-                    listRoleGrantsCount,
-                    rolesPushedCount,
-                    granteesPushedCount,
-                    limitPushedCount);
-        }
-
-        public MetadataCallsCount withListRoleGrantsCount(long listRoleGrantsCount)
-        {
-            return new MetadataCallsCount(
-                    listSchemasCount,
-                    listTablesCount,
-                    getTableHandleCount,
-                    getColumnsCount,
-                    listRoleGrantsCount,
-                    rolesPushedCount,
-                    granteesPushedCount,
-                    limitPushedCount);
-        }
-
-        public MetadataCallsCount withRolesPushedCount(long rolesPushedCount)
-        {
-            return new MetadataCallsCount(
-                    listSchemasCount,
-                    listTablesCount,
-                    getTableHandleCount,
-                    getColumnsCount,
-                    listRoleGrantsCount,
-                    rolesPushedCount,
-                    granteesPushedCount,
-                    limitPushedCount);
-        }
-
-        public MetadataCallsCount withGranteesPushedCount(long granteesPushedCount)
-        {
-            return new MetadataCallsCount(
-                    listSchemasCount,
-                    listTablesCount,
-                    getTableHandleCount,
-                    getColumnsCount,
-                    listRoleGrantsCount,
-                    rolesPushedCount,
-                    granteesPushedCount,
-                    limitPushedCount);
-        }
-
-        public MetadataCallsCount withLimitPushedCount(long limitPushedCount)
-        {
-            return new MetadataCallsCount(
-                    listSchemasCount,
-                    listTablesCount,
-                    getTableHandleCount,
-                    getColumnsCount,
-                    listRoleGrantsCount,
-                    rolesPushedCount,
-                    granteesPushedCount,
-                    limitPushedCount);
-        }
-
-        @Override
-        public boolean equals(Object o)
-        {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            MetadataCallsCount that = (MetadataCallsCount) o;
-            return listSchemasCount == that.listSchemasCount &&
-                    listTablesCount == that.listTablesCount &&
-                    getTableHandleCount == that.getTableHandleCount &&
-                    getColumnsCount == that.getColumnsCount &&
-                    listRoleGrantsCount == that.listRoleGrantsCount &&
-                    rolesPushedCount == that.rolesPushedCount &&
-                    granteesPushedCount == that.granteesPushedCount &&
-                    limitPushedCount == that.limitPushedCount;
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hash(
-                    listSchemasCount,
-                    listTablesCount,
-                    getTableHandleCount,
-                    getColumnsCount,
-                    listRoleGrantsCount,
-                    rolesPushedCount,
-                    granteesPushedCount,
-                    limitPushedCount);
-        }
-
-        @Override
-        public String toString()
-        {
-            return toStringHelper(this)
-                    .add("listSchemasCount", listSchemasCount)
-                    .add("listTablesCount", listTablesCount)
-                    .add("getTableHandleCount", getTableHandleCount)
-                    .add("getColumnsCount", getColumnsCount)
-                    .add("listRoleGrantsCount", listRoleGrantsCount)
-                    .add("rolesPushedCount", rolesPushedCount)
-                    .add("granteesPushedCount", granteesPushedCount)
-                    .add("limitPushedCount", limitPushedCount)
-                    .toString();
-        }
-    }
-
-    public static class ListRoleGrantsCounter
-    {
-        private final AtomicLong listRowGrantsCallsCounter = new AtomicLong();
-        private final AtomicLong rolesPushedCounter = new AtomicLong();
-        private final AtomicLong granteesPushedCounter = new AtomicLong();
-        private final AtomicLong limitPushedCounter = new AtomicLong();
-
-        public void reset()
-        {
-            listRowGrantsCallsCounter.set(0);
-            rolesPushedCounter.set(0);
-            granteesPushedCounter.set(0);
-            limitPushedCounter.set(0);
-        }
-
-        public void incrementListRoleGrants(Optional<Set<String>> roles, Optional<Set<String>> grantees, OptionalLong limit)
-        {
-            listRowGrantsCallsCounter.incrementAndGet();
-            roles.ifPresent(x -> rolesPushedCounter.incrementAndGet());
-            grantees.ifPresent(x -> granteesPushedCounter.incrementAndGet());
-            limit.ifPresent(x -> limitPushedCounter.incrementAndGet());
-        }
-    }
 }
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/DistributedQueryRunner.java b/testing/trino-testing/src/main/java/io/trino/testing/DistributedQueryRunner.java
index cf80b64e25ac..acd427cda249 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/DistributedQueryRunner.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/DistributedQueryRunner.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Closer;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.google.inject.Key;
 import com.google.inject.Module;
 import io.airlift.discovery.server.testing.TestingDiscoveryServer;
 import io.airlift.log.Logger;
@@ -28,29 +29,34 @@
 import io.trino.cost.StatsCalculator;
 import io.trino.execution.FailureInjector.InjectedFailureType;
 import io.trino.execution.QueryManager;
-import io.trino.execution.querystats.PlanOptimizersStatsCollector;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.metadata.AllNodes;
 import io.trino.metadata.FunctionBundle;
 import io.trino.metadata.FunctionManager;
+import io.trino.metadata.LanguageFunctionManager;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.SessionPropertyManager;
 import io.trino.server.BasicQueryInfo;
 import io.trino.server.SessionPropertyDefaults;
+import io.trino.server.testing.FactoryConfiguration;
 import io.trino.server.testing.TestingTrinoServer;
 import io.trino.spi.ErrorType;
 import io.trino.spi.Plugin;
 import io.trino.spi.QueryId;
 import io.trino.spi.eventlistener.EventListener;
+import io.trino.spi.eventlistener.QueryCompletedEvent;
 import io.trino.spi.exchange.ExchangeManager;
 import io.trino.spi.security.SystemAccessControl;
 import io.trino.spi.type.TypeManager;
 import io.trino.split.PageSourceManager;
 import io.trino.split.SplitManager;
 import io.trino.sql.analyzer.QueryExplainer;
+import io.trino.sql.parser.SqlParser;
 import io.trino.sql.planner.NodePartitioningManager;
 import io.trino.sql.planner.Plan;
+import io.trino.sql.tree.Statement;
+import io.trino.testing.containers.OpenTracingCollector;
 import io.trino.transaction.TransactionManager;
 import org.intellij.lang.annotations.Language;
 
@@ -69,6 +75,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Throwables.throwIfUnchecked;
 import static com.google.inject.util.Modules.EMPTY_MODULE;
@@ -77,6 +84,9 @@
 import static io.airlift.log.Level.WARN;
 import static io.airlift.testing.Closeables.closeAllSuppress;
 import static io.airlift.units.Duration.nanosSince;
+import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static java.lang.Boolean.parseBoolean;
+import static java.lang.System.getenv;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -117,27 +127,29 @@ private DistributedQueryRunner(
             String environment,
             Module additionalModule,
             Optional<Path> baseDataDir,
-            List<SystemAccessControl> systemAccessControls,
-            List<EventListener> eventListeners)
+            Optional<FactoryConfiguration> systemAccessControlConfiguration,
+            Optional<List<SystemAccessControl>> systemAccessControls,
+            List<EventListener> eventListeners,
+            List<AutoCloseable> extraCloseables,
+            TestingTrinoClientFactory testingTrinoClientFactory)
             throws Exception
     {
         requireNonNull(defaultSession, "defaultSession is null");
 
-        if (backupCoordinatorProperties.isPresent()) {
-            checkArgument(nodeCount >= 2, "the nodeCount must be greater than or equal to two!");
-        }
-
         setupLogging();
 
         try {
             long start = System.nanoTime();
             discoveryServer = new TestingDiscoveryServer(environment);
             closer.register(() -> closeUnchecked(discoveryServer));
+            closer.register(() -> extraCloseables.forEach(DistributedQueryRunner::closeUnchecked));
             log.info("Created TestingDiscoveryServer in %s", nanosSince(start).convertToMostSuccinctTimeUnit());
 
-            registerNewWorker = () -> createServer(false, extraProperties, environment, additionalModule, baseDataDir, ImmutableList.of(), ImmutableList.of());
+            registerNewWorker = () -> createServer(false, extraProperties, environment, additionalModule, baseDataDir, Optional.empty(), Optional.of(ImmutableList.of()), ImmutableList.of());
 
-            for (int i = backupCoordinatorProperties.isEmpty() ? 1 : 2; i < nodeCount; i++) {
+            int coordinatorCount = backupCoordinatorProperties.isEmpty() ? 1 : 2;
+            checkArgument(nodeCount >= coordinatorCount, "nodeCount includes coordinator(s) count, so must be at least %s, got: %s", coordinatorCount, nodeCount);
+            for (int i = coordinatorCount; i < nodeCount; i++) {
                 registerNewWorker.run();
             }
 
@@ -152,7 +164,7 @@ private DistributedQueryRunner(
                 extraCoordinatorProperties.put("web-ui.user", "admin");
             }
 
-            coordinator = createServer(true, extraCoordinatorProperties, environment, additionalModule, baseDataDir, systemAccessControls, eventListeners);
+            coordinator = createServer(true, extraCoordinatorProperties, environment, additionalModule, baseDataDir, systemAccessControlConfiguration, systemAccessControls, eventListeners);
             if (backupCoordinatorProperties.isPresent()) {
                 Map<String, String> extraBackupCoordinatorProperties = new HashMap<>();
                 extraBackupCoordinatorProperties.putAll(extraProperties);
@@ -163,6 +175,7 @@ private DistributedQueryRunner(
                         environment,
                         additionalModule,
                         baseDataDir,
+                        systemAccessControlConfiguration,
                         systemAccessControls,
                         eventListeners));
             }
@@ -181,7 +194,7 @@ private DistributedQueryRunner(
 
         // copy session using property manager in coordinator
         defaultSession = defaultSession.toSessionRepresentation().toSession(coordinator.getSessionPropertyManager(), defaultSession.getIdentity().getExtraCredentials(), defaultSession.getExchangeEncryptionKey());
-        this.trinoClient = closer.register(new TestingTrinoClient(coordinator, defaultSession));
+        this.trinoClient = closer.register(testingTrinoClientFactory.create(coordinator, defaultSession));
 
         waitForAllNodesGloballyVisible();
     }
@@ -192,7 +205,8 @@ private TestingTrinoServer createServer(
             String environment,
             Module additionalModule,
             Optional<Path> baseDataDir,
-            List<SystemAccessControl> systemAccessControls,
+            Optional<FactoryConfiguration> systemAccessControlConfiguration,
+            Optional<List<SystemAccessControl>> systemAccessControls,
             List<EventListener> eventListeners)
     {
         TestingTrinoServer server = closer.register(createTestingTrinoServer(
@@ -202,6 +216,7 @@ private TestingTrinoServer createServer(
                 environment,
                 additionalModule,
                 baseDataDir,
+                systemAccessControlConfiguration,
                 systemAccessControls,
                 eventListeners));
         servers.add(server);
@@ -226,7 +241,8 @@ private static TestingTrinoServer createTestingTrinoServer(
             String environment,
             Module additionalModule,
             Optional<Path> baseDataDir,
-            List<SystemAccessControl> systemAccessControls,
+            Optional<FactoryConfiguration> systemAccessControlConfiguration,
+            Optional<List<SystemAccessControl>> systemAccessControls,
             List<EventListener> eventListeners)
     {
         long start = System.nanoTime();
@@ -259,6 +275,7 @@ private static TestingTrinoServer createTestingTrinoServer(
                 .setDiscoveryUri(discoveryUri)
                 .setAdditionalModule(additionalModule)
                 .setBaseDataDir(baseDataDir)
+                .setSystemAccessControlConfiguration(systemAccessControlConfiguration)
                 .setSystemAccessControls(systemAccessControls)
                 .setEventListeners(eventListeners)
                 .build();
@@ -354,6 +371,12 @@ public FunctionManager getFunctionManager()
         return coordinator.getFunctionManager();
     }
 
+    @Override
+    public LanguageFunctionManager getLanguageFunctionManager()
+    {
+        return coordinator.getLanguageFunctionManager();
+    }
+
     @Override
     public SplitManager getSplitManager()
     {
@@ -512,12 +535,14 @@ public MaterializedResultWithPlan executeWithPlan(Session session, String sql, W
     }
 
     @Override
-    public Plan createPlan(Session session, String sql, WarningCollector warningCollector, PlanOptimizersStatsCollector planOptimizersStatsCollector)
+    public Plan createPlan(Session session, String sql)
     {
-        QueryId queryId = executeWithQueryId(session, sql).getQueryId();
-        Plan queryPlan = getQueryPlan(queryId);
-        coordinator.getQueryManager().cancelQuery(queryId);
-        return queryPlan;
+        // session must be in a transaction registered with the transaction manager in this query runner
+        getTransactionManager().getTransactionInfo(session.getRequiredTransactionId());
+
+        SqlParser sqlParser = coordinator.getInstance(Key.get(SqlParser.class));
+        Statement statement = sqlParser.createStatement(sql);
+        return coordinator.getQueryExplainer().getLogicalPlan(session, statement, ImmutableList.of(), WarningCollector.NOOP, createPlanOptimizersStatsCollector());
     }
 
     public Plan getQueryPlan(QueryId queryId)
@@ -616,15 +641,18 @@ public static class Builder<SELF extends Builder<?>>
     {
         private Session defaultSession;
         private int nodeCount = 3;
-        private Map<String, String> extraProperties = new HashMap<>();
+        private Map<String, String> extraProperties = ImmutableMap.of();
         private Map<String, String> coordinatorProperties = ImmutableMap.of();
         private Optional<Map<String, String>> backupCoordinatorProperties = Optional.empty();
         private Consumer<QueryRunner> additionalSetup = queryRunner -> {};
         private String environment = ENVIRONMENT;
         private Module additionalModule = EMPTY_MODULE;
         private Optional<Path> baseDataDir = Optional.empty();
-        private List<SystemAccessControl> systemAccessControls = ImmutableList.of();
+        private Optional<FactoryConfiguration> systemAccessControlConfiguration = Optional.empty();
+        private Optional<List<SystemAccessControl>> systemAccessControls = Optional.empty();
         private List<EventListener> eventListeners = ImmutableList.of();
+        private List<AutoCloseable> extraCloseables = ImmutableList.of();
+        private TestingTrinoClientFactory testingTrinoClientFactory = TestingTrinoClient::new;
 
         protected Builder(Session defaultSession)
         {
@@ -649,21 +677,42 @@ public SELF setNodeCount(int nodeCount)
         @CanIgnoreReturnValue
         public SELF setExtraProperties(Map<String, String> extraProperties)
         {
-            this.extraProperties = new HashMap<>(extraProperties);
+            this.extraProperties = ImmutableMap.copyOf(extraProperties);
+            return self();
+        }
+
+        @CanIgnoreReturnValue
+        public SELF addExtraProperties(Map<String, String> extraProperties)
+        {
+            this.extraProperties = addProperties(this.extraProperties, extraProperties);
             return self();
         }
 
         @CanIgnoreReturnValue
         public SELF addExtraProperty(String key, String value)
         {
-            this.extraProperties.put(key, value);
+            this.extraProperties = addProperty(this.extraProperties, key, value);
             return self();
         }
 
         @CanIgnoreReturnValue
         public SELF setCoordinatorProperties(Map<String, String> coordinatorProperties)
         {
-            this.coordinatorProperties = coordinatorProperties;
+            this.coordinatorProperties = ImmutableMap.copyOf(coordinatorProperties);
+            return self();
+        }
+
+        @CanIgnoreReturnValue
+        public SELF addCoordinatorProperties(Map<String, String> coordinatorProperties)
+        {
+            this.coordinatorProperties = addProperties(this.coordinatorProperties, coordinatorProperties);
+            return self();
+        }
+
+        @CanIgnoreReturnValue
+        public SELF addCoordinatorProperty(String key, String value)
+        {
+            this.coordinatorProperties = addProperty(this.coordinatorProperties, key, value);
             return self();
         }
 
@@ -686,17 +735,6 @@ public SELF setAdditionalSetup(Consumer<QueryRunner> additionalSetup)
             return self();
         }
 
-        /**
-         * Sets coordinator properties being equal to a map containing given key and value.
-         * Note, that calling this method OVERWRITES previously set property values.
-         * As a result, it should only be used when only one coordinator property needs to be set.
-         */
-        @CanIgnoreReturnValue
-        public SELF setSingleCoordinatorProperty(String key, String value)
-        {
-            return setCoordinatorProperties(ImmutableMap.of(key, value));
-        }
-
         @CanIgnoreReturnValue
         public SELF setEnvironment(String environment)
         {
@@ -718,6 +756,13 @@ public SELF setBaseDataDir(Optional<Path> baseDataDir)
             return self();
         }
 
+        @CanIgnoreReturnValue
+        public SELF setSystemAccessControl(String name, Map<String, String> configuration)
+        {
+            this.systemAccessControlConfiguration = Optional.of(new FactoryConfiguration(name, configuration));
+            return self();
+        }
+
         @SuppressWarnings("unused")
         @CanIgnoreReturnValue
         public SELF setSystemAccessControl(SystemAccessControl systemAccessControl)
@@ -729,7 +774,7 @@ public SELF setSystemAccessControl(SystemAccessControl systemAccessControl)
         @CanIgnoreReturnValue
         public SELF setSystemAccessControls(List<SystemAccessControl> systemAccessControls)
         {
-            this.systemAccessControls = ImmutableList.copyOf(requireNonNull(systemAccessControls, "systemAccessControls is null"));
+            this.systemAccessControls = Optional.of(ImmutableList.copyOf(requireNonNull(systemAccessControls, "systemAccessControls is null")));
             return self();
         }
 
@@ -748,6 +793,14 @@ public SELF setEventListeners(List<EventListener> eventListeners)
             return self();
         }
 
+        @SuppressWarnings("unused")
+        @CanIgnoreReturnValue
+        public SELF setTestingTrinoClientFactory(TestingTrinoClientFactory testingTrinoClientFactory)
+        {
+            this.testingTrinoClientFactory = requireNonNull(testingTrinoClientFactory, "testingTrinoClientFactory is null");
+            return self();
+        }
+
         @CanIgnoreReturnValue
         public SELF enableBackupCoordinator()
         {
@@ -757,6 +810,24 @@ public SELF enableBackupCoordinator()
             return self();
         }
 
+        public SELF withTracing()
+        {
+            OpenTracingCollector collector = new OpenTracingCollector();
+            collector.start();
+            extraCloseables = ImmutableList.of(collector);
+            this.addExtraProperties(Map.of("tracing.enabled", "true", "tracing.exporter.endpoint", collector.getExporterEndpoint().toString()));
+            this.setEventListener(new EventListener()
+            {
+                @Override
+                public void queryCompleted(QueryCompletedEvent queryCompletedEvent)
+                {
+                    String queryId = queryCompletedEvent.getMetadata().getQueryId();
+                    log.info("TRACING: %s :: %s", queryId, collector.searchForQueryId(queryId));
+                }
+            });
+            return self();
+        }
+
         @SuppressWarnings("unchecked")
         protected SELF self()
         {
@@ -766,6 +837,17 @@ protected SELF self()
         public DistributedQueryRunner build()
                 throws Exception
         {
+            String tracingEnabled = firstNonNull(getenv("TESTS_TRACING_ENABLED"), "false");
+            if (parseBoolean(tracingEnabled) || tracingEnabled.equals("1")) {
+                withTracing();
+            }
+
+            Optional<FactoryConfiguration> systemAccessControlConfiguration = this.systemAccessControlConfiguration;
+            Optional<List<SystemAccessControl>> systemAccessControls = this.systemAccessControls;
+            if (systemAccessControlConfiguration.isEmpty() && systemAccessControls.isEmpty()) {
+                systemAccessControls = Optional.of(ImmutableList.of());
+            }
+
             DistributedQueryRunner queryRunner = new DistributedQueryRunner(
                     defaultSession,
                     nodeCount,
@@ -775,8 +857,11 @@ public DistributedQueryRunner build()
                     environment,
                     additionalModule,
                     baseDataDir,
+                    systemAccessControlConfiguration,
                     systemAccessControls,
-                    eventListeners);
+                    eventListeners,
+                    extraCloseables,
+                    testingTrinoClientFactory);
 
             try {
                 additionalSetup.accept(queryRunner);
@@ -788,5 +873,26 @@ public DistributedQueryRunner build()
 
             return queryRunner;
         }
+
+        protected static Map<String, String> addProperties(Map<String, String> properties, Map<String, String> update)
+        {
+            return ImmutableMap.<String, String>builder()
+                    .putAll(requireNonNull(properties, "properties is null"))
+                    .putAll(requireNonNull(update, "update is null"))
+                    .buildOrThrow();
+        }
+
+        protected static ImmutableMap<String, String> addProperty(Map<String, String> extraProperties, String key, String value)
+        {
+            return ImmutableMap.<String, String>builder()
+                    .putAll(requireNonNull(extraProperties, "properties is null"))
+                    .put(requireNonNull(key, "key is null"), requireNonNull(value, "value is null"))
+                    .buildOrThrow();
+        }
+    }
+
+    public interface TestingTrinoClientFactory
+    {
+        TestingTrinoClient create(TestingTrinoServer server, Session session);
     }
 }
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/ExtendedFailureRecoveryTest.java b/testing/trino-testing/src/main/java/io/trino/testing/ExtendedFailureRecoveryTest.java
index 91a0421ec193..b78493c49e52 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/ExtendedFailureRecoveryTest.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/ExtendedFailureRecoveryTest.java
@@ -15,7 +15,6 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.Session;
-import io.trino.operator.OperatorStats;
 import io.trino.operator.RetryPolicy;
 import io.trino.server.DynamicFilterService.DynamicFilterDomainStats;
 import io.trino.server.DynamicFilterService.DynamicFiltersStats;
@@ -106,10 +105,6 @@ protected void testJoinDynamicFilteringEnabled()
                     DynamicFilterDomainStats domainStats = getOnlyElement(dynamicFiltersStats.getDynamicFilterDomainStats());
                     assertThat(domainStats.getSimplifiedDomain())
                             .isEqualTo(singleValue(BIGINT, 1L).toString(getSession().toConnectorSession()));
-                    OperatorStats probeStats = searchScanFilterAndProjectOperatorStats(queryId, getQualifiedTableName(PARTITIONED_LINEITEM));
-                    // Currently, stats from all attempts are combined.
-                    // Asserting on multiple of 615L as well in case the probe scan was completed twice
-                    assertThat(probeStats.getInputPositions()).isIn(615L, 1230L);
                 });
     }
 
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/FaultTolerantExecutionConnectorTestHelper.java b/testing/trino-testing/src/main/java/io/trino/testing/FaultTolerantExecutionConnectorTestHelper.java
index e1ab7038b761..96f2adffd60b 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/FaultTolerantExecutionConnectorTestHelper.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/FaultTolerantExecutionConnectorTestHelper.java
@@ -27,7 +27,7 @@ public static Map<String, String> getExtraProperties()
                 .put("retry-policy", "TASK")
                 .put("retry-initial-delay", "50ms")
                 .put("retry-max-delay", "100ms")
-                .put("fault-tolerant-execution-partition-count", "5")
+                .put("fault-tolerant-execution-max-partition-count", "5")
                 .put("fault-tolerant-execution-arbitrary-distribution-compute-task-target-size-min", "5MB")
                 .put("fault-tolerant-execution-arbitrary-distribution-compute-task-target-size-max", "10MB")
                 .put("fault-tolerant-execution-arbitrary-distribution-write-task-target-size-min", "10MB")
@@ -35,6 +35,8 @@ public static Map<String, String> getExtraProperties()
                 .put("fault-tolerant-execution-hash-distribution-compute-task-target-size", "5MB")
                 .put("fault-tolerant-execution-hash-distribution-write-task-target-size", "10MB")
                 .put("fault-tolerant-execution-standard-split-size", "2.5MB")
+                .put("fault-tolerant-execution-hash-distribution-compute-task-to-node-min-ratio", "0.0")
+                .put("fault-tolerant-execution-hash-distribution-write-task-to-node-min-ratio", "0.0")
                 // to trigger spilling
                 .put("exchange.deduplication-buffer-size", "1kB")
                 .put("fault-tolerant-execution-task-memory", "1GB")
@@ -47,4 +49,14 @@ public static Map<String, String> getExtraProperties()
                 .put("query.schedule-split-batch-size", "2")
                 .buildOrThrow();
     }
+
+    public static Map<String, String> enforceRuntimeAdaptivePartitioningProperties()
+    {
+        return ImmutableMap.<String, String>builder()
+                .put("fault-tolerant-execution-runtime-adaptive-partitioning-enabled", "true")
+                .put("fault-tolerant-execution-runtime-adaptive-partitioning-partition-count", "40")
+                // to ensure runtime adaptive partitioning is triggered
+                .put("fault-tolerant-execution-runtime-adaptive-partitioning-max-task-size", "1B")
+                .buildOrThrow();
+    }
 }
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/MultisetAssertions.java b/testing/trino-testing/src/main/java/io/trino/testing/MultisetAssertions.java
new file mode 100644
index 000000000000..1d3f9fbf1607
--- /dev/null
+++ b/testing/trino-testing/src/main/java/io/trino/testing/MultisetAssertions.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed 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 io.trino.testing;
+
+import com.google.common.collect.Multiset;
+import com.google.common.collect.Sets;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static java.lang.String.format;
+import static java.lang.String.join;
+import static org.testng.Assert.fail;
+
+public final class MultisetAssertions
+{
+    private MultisetAssertions() {}
+
+    public static void assertMultisetsEqual(Multiset<?> actual, Multiset<?> expected)
+    {
+        if (expected.equals(actual)) {
+            return;
+        }
+
+        List<String> mismatchReport = Sets.union(expected.elementSet(), actual.elementSet()).stream()
+                .filter(key -> expected.count(key) != actual.count(key))
+                .flatMap(key -> {
+                    int expectedCount = expected.count(key);
+                    int actualCount = actual.count(key);
+                    if (actualCount < expectedCount) {
+                        return Stream.of(format("%s more occurrences of %s", expectedCount - actualCount, key));
+                    }
+                    if (actualCount > expectedCount) {
+                        return Stream.of(format("%s fewer occurrences of %s", actualCount - expectedCount, key));
+                    }
+                    return Stream.of();
+                })
+                .collect(toImmutableList());
+
+        fail("Expected: \n\t\t" + join(",\n\t\t", mismatchReport));
+    }
+}
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/PlanDeterminismChecker.java b/testing/trino-testing/src/main/java/io/trino/testing/PlanDeterminismChecker.java
index d9d539a8e6ef..9d859db9458c 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/PlanDeterminismChecker.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/PlanDeterminismChecker.java
@@ -14,13 +14,13 @@
 package io.trino.testing;
 
 import io.trino.Session;
-import io.trino.execution.warnings.WarningCollector;
 import io.trino.sql.planner.Plan;
 import io.trino.sql.planner.planprinter.PlanPrinter;
 
 import java.util.function.Function;
 
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static io.trino.execution.warnings.WarningCollector.NOOP;
 import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED;
 import static org.testng.Assert.assertEquals;
 
@@ -59,7 +59,7 @@ public void checkPlanIsDeterministic(Session session, String sql)
     private String getPlanText(Session session, String sql)
     {
         return localQueryRunner.inTransaction(session, transactionSession -> {
-            Plan plan = localQueryRunner.createPlan(transactionSession, sql, OPTIMIZED_AND_VALIDATED, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+            Plan plan = localQueryRunner.createPlan(transactionSession, sql, localQueryRunner.getPlanOptimizers(true), OPTIMIZED_AND_VALIDATED, NOOP, createPlanOptimizersStatsCollector());
             return PlanPrinter.textLogicalPlan(
                     plan.getRoot(),
                     plan.getTypes(),
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/QueryAssertions.java b/testing/trino-testing/src/main/java/io/trino/testing/QueryAssertions.java
index 5593921163f8..57ca5f2f72f2 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/QueryAssertions.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/QueryAssertions.java
@@ -507,9 +507,9 @@ public static void copyTable(QueryRunner queryRunner, QualifiedObjectName table,
         long rows = (Long) queryRunner.execute(session, sql).getMaterializedRows().get(0).getField(0);
         log.info("Imported %s rows for %s in %s", rows, table.getObjectName(), nanosSince(start).convertToMostSuccinctTimeUnit());
 
-        assertThat(queryRunner.execute(session, "SELECT count(*) FROM " + table).getOnlyValue())
-                .as("Table is not loaded properly: %s", table)
-                .isEqualTo(queryRunner.execute(session, "SELECT count(*) FROM " + table.getObjectName()).getOnlyValue());
+        assertThat(queryRunner.execute(session, "SELECT count(*) FROM " + table.getObjectName()).getOnlyValue())
+                .as("Table is not loaded properly: %s", table.getObjectName())
+                .isEqualTo(queryRunner.execute(session, "SELECT count(*) FROM " + table).getOnlyValue());
     }
 
     public static RuntimeException getTrinoExceptionCause(Throwable e)
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/StandaloneQueryRunner.java b/testing/trino-testing/src/main/java/io/trino/testing/StandaloneQueryRunner.java
index ae5e2534ec60..5a9824e46624 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/StandaloneQueryRunner.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/StandaloneQueryRunner.java
@@ -19,6 +19,7 @@
 import io.trino.execution.FailureInjector.InjectedFailureType;
 import io.trino.metadata.FunctionBundle;
 import io.trino.metadata.FunctionManager;
+import io.trino.metadata.LanguageFunctionManager;
 import io.trino.metadata.Metadata;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.metadata.SessionPropertyManager;
@@ -147,6 +148,12 @@ public FunctionManager getFunctionManager()
         return server.getFunctionManager();
     }
 
+    @Override
+    public LanguageFunctionManager getLanguageFunctionManager()
+    {
+        return server.getLanguageFunctionManager();
+    }
+
     @Override
     public SplitManager getSplitManager()
     {
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/StatefulSleepingSum.java b/testing/trino-testing/src/main/java/io/trino/testing/StatefulSleepingSum.java
index aad4a27639ee..0c5e17e9723e 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/StatefulSleepingSum.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/StatefulSleepingSum.java
@@ -40,9 +40,8 @@ public class StatefulSleepingSum
 
     private StatefulSleepingSum()
     {
-        super(FunctionMetadata.scalarBuilder()
+        super(FunctionMetadata.scalarBuilder("stateful_sleeping_sum")
                 .signature(Signature.builder()
-                        .name("stateful_sleeping_sum")
                         .typeVariable("bigint")
                         .returnType(BIGINT)
                         .argumentType(DOUBLE)
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/StructuralTestUtil.java b/testing/trino-testing/src/main/java/io/trino/testing/StructuralTestUtil.java
index 142ab680efe4..9903d63f57f6 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/StructuralTestUtil.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/StructuralTestUtil.java
@@ -16,6 +16,8 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
+import io.trino.spi.block.SqlMap;
+import io.trino.spi.block.SqlRow;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Int128;
@@ -31,6 +33,8 @@
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.spi.block.MapValueBuilder.buildMapValue;
+import static io.trino.spi.block.RowValueBuilder.buildRowValue;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
 import static io.trino.util.StructuralTestUtil.appendToBlockBuilder;
 
@@ -57,22 +61,30 @@ public static boolean arrayBlocksEqual(Type elementType, Block block1, Block blo
         return true;
     }
 
-    public static boolean mapBlocksEqual(Type keyType, Type valueType, Block block1, Block block2)
+    public static boolean sqlMapEqual(Type keyType, Type valueType, SqlMap leftMap, SqlMap rightMap)
     {
-        if (block1.getPositionCount() != block2.getPositionCount()) {
+        if (leftMap.getSize() != rightMap.getSize()) {
             return false;
         }
 
+        int leftRawOffset = leftMap.getRawOffset();
+        Block leftRawKeyBlock = leftMap.getRawKeyBlock();
+        Block leftRawValueBlock = leftMap.getRawValueBlock();
+        int rightRawOffset = rightMap.getRawOffset();
+        Block rightRawKeyBlock = rightMap.getRawKeyBlock();
+        Block rightRawValueBlock = rightMap.getRawValueBlock();
+
         BlockPositionEqual keyEqualOperator = TYPE_OPERATORS_CACHE.getEqualOperator(keyType);
         BlockPositionEqual valueEqualOperator = TYPE_OPERATORS_CACHE.getEqualOperator(valueType);
-        for (int i = 0; i < block1.getPositionCount(); i += 2) {
-            if (block1.isNull(i) != block2.isNull(i) || block1.isNull(i + 1) != block2.isNull(i + 1)) {
+        for (int i = 0; i < leftMap.getSize(); i++) {
+            if (leftRawKeyBlock.isNull(leftRawOffset + i) != rightRawKeyBlock.isNull(rightRawOffset + i) ||
+                    leftRawValueBlock.isNull(leftRawOffset + i) != rightRawValueBlock.isNull(rightRawOffset + i)) {
                 return false;
             }
-            if (!block1.isNull(i) && !keyEqualOperator.equal(block1, i, block2, i)) {
+            if (!leftRawKeyBlock.isNull(leftRawOffset + i) && !keyEqualOperator.equal(leftRawKeyBlock, leftRawOffset + i, rightRawKeyBlock, rightRawOffset + i)) {
                 return false;
             }
-            if (!block1.isNull(i + 1) && !valueEqualOperator.equal(block1, i + 1, block2, i + 1)) {
+            if (!leftRawValueBlock.isNull(leftRawOffset + i) && !valueEqualOperator.equal(leftRawValueBlock, leftRawOffset + i, rightRawValueBlock, rightRawOffset + i)) {
                 return false;
             }
         }
@@ -88,43 +100,40 @@ public static Block arrayBlockOf(Type elementType, Object... values)
         return blockBuilder.build();
     }
 
-    public static Block mapBlockOf(Type keyType, Type valueType, Object key, Object value)
+    public static SqlMap sqlMapOf(Type keyType, Type valueType, Object key, Object value)
     {
-        MapType mapType = mapType(keyType, valueType);
-        BlockBuilder blockBuilder = mapType.createBlockBuilder(null, 10);
-        BlockBuilder singleMapBlockWriter = blockBuilder.beginBlockEntry();
-        appendToBlockBuilder(keyType, key, singleMapBlockWriter);
-        appendToBlockBuilder(valueType, value, singleMapBlockWriter);
-        blockBuilder.closeEntry();
-        return mapType.getObject(blockBuilder, 0);
+        return buildMapValue(
+                mapType(keyType, valueType),
+                1,
+                (keyBuilder, valueBuilder) -> {
+                    appendToBlockBuilder(keyType, key, keyBuilder);
+                    appendToBlockBuilder(valueType, value, valueBuilder);
+                });
     }
 
-    public static Block mapBlockOf(Type keyType, Type valueType, Object[] keys, Object[] values)
+    public static SqlMap sqlMapOf(Type keyType, Type valueType, Object[] keys, Object[] values)
     {
         checkArgument(keys.length == values.length, "keys/values must have the same length");
-        MapType mapType = mapType(keyType, valueType);
-        BlockBuilder blockBuilder = mapType.createBlockBuilder(null, 10);
-        BlockBuilder singleMapBlockWriter = blockBuilder.beginBlockEntry();
-        for (int i = 0; i < keys.length; i++) {
-            Object key = keys[i];
-            Object value = values[i];
-            appendToBlockBuilder(keyType, key, singleMapBlockWriter);
-            appendToBlockBuilder(valueType, value, singleMapBlockWriter);
-        }
-        blockBuilder.closeEntry();
-        return mapType.getObject(blockBuilder, 0);
+        return buildMapValue(
+                mapType(keyType, valueType),
+                keys.length,
+                (keyBuilder, valueBuilder) -> {
+                    for (int i = 0; i < keys.length; i++) {
+                        Object key = keys[i];
+                        Object value = values[i];
+                        appendToBlockBuilder(keyType, key, keyBuilder);
+                        appendToBlockBuilder(valueType, value, valueBuilder);
+                    }
+                });
     }
 
-    public static Block rowBlockOf(List<Type> parameterTypes, Object... values)
+    public static SqlRow rowBlockOf(List<Type> parameterTypes, Object... values)
     {
-        RowType rowType = RowType.anonymous(parameterTypes);
-        BlockBuilder blockBuilder = rowType.createBlockBuilder(null, 1);
-        BlockBuilder singleRowBlockWriter = blockBuilder.beginBlockEntry();
-        for (int i = 0; i < values.length; i++) {
-            appendToBlockBuilder(parameterTypes.get(i), values[i], singleRowBlockWriter);
-        }
-        blockBuilder.closeEntry();
-        return rowType.getObject(blockBuilder, 0);
+        return buildRowValue(RowType.anonymous(parameterTypes), fields -> {
+            for (int i = 0; i < values.length; i++) {
+                appendToBlockBuilder(parameterTypes.get(i), values[i], fields.get(i));
+            }
+        });
     }
 
     public static Block decimalArrayBlockOf(DecimalType type, BigDecimal decimal)
@@ -137,14 +146,14 @@ public static Block decimalArrayBlockOf(DecimalType type, BigDecimal decimal)
         return arrayBlockOf(type, sliceDecimal);
     }
 
-    public static Block decimalMapBlockOf(DecimalType type, BigDecimal decimal)
+    public static SqlMap decimalSqlMapOf(DecimalType type, BigDecimal decimal)
     {
         if (type.isShort()) {
             long longDecimal = decimal.unscaledValue().longValue();
-            return mapBlockOf(type, type, longDecimal, longDecimal);
+            return sqlMapOf(type, type, longDecimal, longDecimal);
         }
         Int128 sliceDecimal = Int128.valueOf(decimal.unscaledValue());
-        return mapBlockOf(type, type, sliceDecimal, sliceDecimal);
+        return sqlMapOf(type, type, sliceDecimal, sliceDecimal);
     }
 
     public static MapType mapType(Type keyType, Type valueType)
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/TestingConnectorBehavior.java b/testing/trino-testing/src/main/java/io/trino/testing/TestingConnectorBehavior.java
index 03e4611c1494..76536736d4f7 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/TestingConnectorBehavior.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/TestingConnectorBehavior.java
@@ -13,12 +13,26 @@
  */
 package io.trino.testing;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+import java.util.List;
 import java.util.function.Predicate;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 public enum TestingConnectorBehavior
 {
+    SUPPORTS_INSERT,
+    SUPPORTS_DELETE,
+    SUPPORTS_ROW_LEVEL_DELETE(SUPPORTS_DELETE),
+    SUPPORTS_UPDATE,
+    SUPPORTS_ROW_LEVEL_UPDATE(SUPPORTS_UPDATE),
+    SUPPORTS_MERGE,
+
+    SUPPORTS_TRUNCATE(SUPPORTS_DELETE),
+
     SUPPORTS_ARRAY,
     SUPPORTS_ROW_TYPE,
 
@@ -34,16 +48,15 @@ public enum TestingConnectorBehavior
     SUPPORTS_LIMIT_PUSHDOWN,
 
     SUPPORTS_TOPN_PUSHDOWN,
-    SUPPORTS_TOPN_PUSHDOWN_WITH_VARCHAR(fallback -> fallback.test(SUPPORTS_TOPN_PUSHDOWN) && fallback.test(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY)),
+    SUPPORTS_TOPN_PUSHDOWN_WITH_VARCHAR(and(SUPPORTS_TOPN_PUSHDOWN, SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY)),
 
     SUPPORTS_AGGREGATION_PUSHDOWN,
-    // Most connectors don't support aggregation pushdown for statistical functions
-    SUPPORTS_AGGREGATION_PUSHDOWN_STDDEV(false),
-    SUPPORTS_AGGREGATION_PUSHDOWN_VARIANCE(false),
-    SUPPORTS_AGGREGATION_PUSHDOWN_COVARIANCE(false),
-    SUPPORTS_AGGREGATION_PUSHDOWN_CORRELATION(false),
-    SUPPORTS_AGGREGATION_PUSHDOWN_REGRESSION(false),
-    SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT(false),
+    SUPPORTS_AGGREGATION_PUSHDOWN_STDDEV(SUPPORTS_AGGREGATION_PUSHDOWN),
+    SUPPORTS_AGGREGATION_PUSHDOWN_VARIANCE(SUPPORTS_AGGREGATION_PUSHDOWN),
+    SUPPORTS_AGGREGATION_PUSHDOWN_COVARIANCE(SUPPORTS_AGGREGATION_PUSHDOWN),
+    SUPPORTS_AGGREGATION_PUSHDOWN_CORRELATION(SUPPORTS_AGGREGATION_PUSHDOWN),
+    SUPPORTS_AGGREGATION_PUSHDOWN_REGRESSION(SUPPORTS_AGGREGATION_PUSHDOWN),
+    SUPPORTS_AGGREGATION_PUSHDOWN_COUNT_DISTINCT(SUPPORTS_AGGREGATION_PUSHDOWN),
 
     SUPPORTS_JOIN_PUSHDOWN(
             // Currently no connector supports Join pushdown by default. JDBC connectors may support Join pushdown and BaseJdbcConnectorTest
@@ -51,14 +64,18 @@ public enum TestingConnectorBehavior
             false),
     SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN(SUPPORTS_JOIN_PUSHDOWN),
     SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM(SUPPORTS_JOIN_PUSHDOWN),
-    SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_EQUALITY(fallback -> fallback.test(SUPPORTS_JOIN_PUSHDOWN) && fallback.test(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY)),
-    SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_INEQUALITY(fallback -> fallback.test(SUPPORTS_JOIN_PUSHDOWN) && fallback.test(SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY)),
+    SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_EQUALITY(and(SUPPORTS_JOIN_PUSHDOWN, SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY)),
+    SUPPORTS_JOIN_PUSHDOWN_WITH_VARCHAR_INEQUALITY(and(SUPPORTS_JOIN_PUSHDOWN, SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY)),
+
+    SUPPORTS_DEREFERENCE_PUSHDOWN(SUPPORTS_ROW_TYPE),
 
     SUPPORTS_CREATE_SCHEMA,
     // Expect rename to be supported when create schema is supported, to help make connector implementations coherent.
     SUPPORTS_RENAME_SCHEMA(SUPPORTS_CREATE_SCHEMA),
+    SUPPORTS_DROP_SCHEMA_CASCADE(SUPPORTS_CREATE_SCHEMA),
 
     SUPPORTS_CREATE_TABLE,
+    SUPPORTS_CREATE_OR_REPLACE_TABLE(false),
     SUPPORTS_CREATE_TABLE_WITH_DATA(SUPPORTS_CREATE_TABLE),
     SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT(SUPPORTS_CREATE_TABLE),
     SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT(SUPPORTS_CREATE_TABLE),
@@ -67,35 +84,33 @@ public enum TestingConnectorBehavior
 
     SUPPORTS_ADD_COLUMN,
     SUPPORTS_ADD_COLUMN_WITH_COMMENT(SUPPORTS_ADD_COLUMN),
+    SUPPORTS_ADD_FIELD(fallback -> fallback.test(SUPPORTS_ADD_COLUMN) && fallback.test(SUPPORTS_ROW_TYPE)),
     SUPPORTS_DROP_COLUMN(SUPPORTS_ADD_COLUMN),
-    SUPPORTS_DROP_FIELD(fallback -> fallback.test(SUPPORTS_DROP_COLUMN) && fallback.test(SUPPORTS_ROW_TYPE)),
+    SUPPORTS_DROP_FIELD(and(SUPPORTS_DROP_COLUMN, SUPPORTS_ROW_TYPE)),
     SUPPORTS_RENAME_COLUMN,
+    SUPPORTS_RENAME_FIELD(fallback -> fallback.test(SUPPORTS_RENAME_COLUMN) && fallback.test(SUPPORTS_ROW_TYPE)),
     SUPPORTS_SET_COLUMN_TYPE,
+    SUPPORTS_SET_FIELD_TYPE(fallback -> fallback.test(SUPPORTS_SET_COLUMN_TYPE) && fallback.test(SUPPORTS_ROW_TYPE)),
 
     SUPPORTS_COMMENT_ON_TABLE,
-    SUPPORTS_COMMENT_ON_VIEW(false),
-    SUPPORTS_COMMENT_ON_COLUMN,
-    SUPPORTS_COMMENT_ON_VIEW_COLUMN(false),
+    SUPPORTS_COMMENT_ON_COLUMN(SUPPORTS_COMMENT_ON_TABLE),
 
-    SUPPORTS_CREATE_VIEW(false),
+    SUPPORTS_CREATE_VIEW,
+    SUPPORTS_COMMENT_ON_VIEW(and(SUPPORTS_CREATE_VIEW, SUPPORTS_COMMENT_ON_TABLE)),
+    SUPPORTS_COMMENT_ON_VIEW_COLUMN(SUPPORTS_COMMENT_ON_VIEW),
 
-    SUPPORTS_CREATE_MATERIALIZED_VIEW(false),
+    SUPPORTS_CREATE_MATERIALIZED_VIEW,
     SUPPORTS_CREATE_MATERIALIZED_VIEW_GRACE_PERIOD(SUPPORTS_CREATE_MATERIALIZED_VIEW),
     SUPPORTS_CREATE_FEDERATED_MATERIALIZED_VIEW(SUPPORTS_CREATE_MATERIALIZED_VIEW), // i.e. an MV that spans catalogs
+    SUPPORTS_MATERIALIZED_VIEW_FRESHNESS_FROM_BASE_TABLES(SUPPORTS_CREATE_MATERIALIZED_VIEW),
     SUPPORTS_RENAME_MATERIALIZED_VIEW(SUPPORTS_CREATE_MATERIALIZED_VIEW),
     SUPPORTS_RENAME_MATERIALIZED_VIEW_ACROSS_SCHEMAS(SUPPORTS_RENAME_MATERIALIZED_VIEW),
+    SUPPORTS_COMMENT_ON_MATERIALIZED_VIEW_COLUMN(SUPPORTS_CREATE_MATERIALIZED_VIEW),
 
-    SUPPORTS_INSERT,
     SUPPORTS_NOT_NULL_CONSTRAINT(SUPPORTS_CREATE_TABLE),
+    SUPPORTS_ADD_COLUMN_NOT_NULL_CONSTRAINT(and(SUPPORTS_NOT_NULL_CONSTRAINT, SUPPORTS_ADD_COLUMN)),
 
-    SUPPORTS_DELETE(false),
-    SUPPORTS_ROW_LEVEL_DELETE(SUPPORTS_DELETE),
-
-    SUPPORTS_UPDATE(false),
-
-    SUPPORTS_MERGE(false),
-
-    SUPPORTS_TRUNCATE(false),
+    SUPPORTS_CREATE_FUNCTION(false),
 
     SUPPORTS_NEGATIVE_DATE,
 
@@ -103,6 +118,10 @@ public enum TestingConnectorBehavior
 
     SUPPORTS_MULTI_STATEMENT_WRITES(false),
 
+    SUPPORTS_NATIVE_QUERY(true), // system.query or equivalent PTF for query passthrough
+
+    SUPPORTS_REPORTING_WRITTEN_BYTES(false),
+
     /**/;
 
     private final Predicate<Predicate<TestingConnectorBehavior>> hasBehaviorByDefault;
@@ -115,6 +134,18 @@ public enum TestingConnectorBehavior
     TestingConnectorBehavior(boolean hasBehaviorByDefault)
     {
         this(fallback -> hasBehaviorByDefault);
+        checkArgument(
+                !hasBehaviorByDefault ==
+                        // TODO make these marked as expected by default
+                        (name().equals("SUPPORTS_CANCELLATION") ||
+                                name().equals("SUPPORTS_DYNAMIC_FILTER_PUSHDOWN") ||
+                                name().equals("SUPPORTS_JOIN_PUSHDOWN") ||
+                                name().equals("SUPPORTS_CREATE_OR_REPLACE_TABLE") ||
+                                name().equals("SUPPORTS_CREATE_FUNCTION") ||
+                                name().equals("SUPPORTS_REPORTING_WRITTEN_BYTES") ||
+                                name().equals("SUPPORTS_MULTI_STATEMENT_WRITES")),
+                "Every behavior should be expected to be true by default. Having mixed defaults makes reasoning about tests harder. False default provided for %s",
+                name());
     }
 
     TestingConnectorBehavior(TestingConnectorBehavior defaultBehaviorSource)
@@ -138,4 +169,10 @@ boolean hasBehaviorByDefault(Predicate<TestingConnectorBehavior> fallback)
     {
         return hasBehaviorByDefault.test(fallback);
     }
+
+    private static Predicate<Predicate<TestingConnectorBehavior>> and(TestingConnectorBehavior first, TestingConnectorBehavior... rest)
+    {
+        List<TestingConnectorBehavior> conjuncts = ImmutableList.copyOf(Lists.asList(first, rest));
+        return fallback -> conjuncts.stream().allMatch(fallback);
+    }
 }
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/TestingSessionContext.java b/testing/trino-testing/src/main/java/io/trino/testing/TestingSessionContext.java
index 71df76db4051..2463d152db4c 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/TestingSessionContext.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/TestingSessionContext.java
@@ -47,9 +47,10 @@ else if (enabledRoles.size() == 1) {
                 session.getProtocolHeaders(),
                 session.getCatalog(),
                 session.getSchema(),
-                session.getPath().getRawPath(),
+                Optional.of(session.getPath().getRawPath()),
                 Optional.empty(),
                 session.getIdentity(),
+                session.getOriginalIdentity(),
                 selectedRole,
                 session.getSource(),
                 session.getTraceToken(),
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/TestingStatementClientFactory.java b/testing/trino-testing/src/main/java/io/trino/testing/TestingStatementClientFactory.java
new file mode 100644
index 000000000000..ac53b3370c3f
--- /dev/null
+++ b/testing/trino-testing/src/main/java/io/trino/testing/TestingStatementClientFactory.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed 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 io.trino.testing;
+
+import io.trino.Session;
+import io.trino.client.ClientSession;
+import io.trino.client.StatementClient;
+import okhttp3.OkHttpClient;
+
+import java.util.Optional;
+
+import static io.trino.client.StatementClientFactory.newStatementClient;
+
+public interface TestingStatementClientFactory
+{
+    TestingStatementClientFactory DEFAULT_STATEMENT_FACTORY = new TestingStatementClientFactory() {};
+
+    default StatementClient create(OkHttpClient httpClient, Session session, ClientSession clientSession, String query)
+    {
+        return newStatementClient(httpClient, clientSession, query, Optional.of(session.getClientCapabilities()));
+    }
+}
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/TestingTrinoClient.java b/testing/trino-testing/src/main/java/io/trino/testing/TestingTrinoClient.java
index 5aad271a268e..b57c34777333 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/TestingTrinoClient.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/TestingTrinoClient.java
@@ -111,6 +111,11 @@ public TestingTrinoClient(TestingTrinoServer trinoServer, Session defaultSession
         super(trinoServer, defaultSession, httpClient);
     }
 
+    public TestingTrinoClient(TestingTrinoServer trinoServer, TestingStatementClientFactory statementClientFactory, Session defaultSession, OkHttpClient httpClient)
+    {
+        super(trinoServer, statementClientFactory, defaultSession, httpClient);
+    }
+
     @Override
     protected ResultsSession<MaterializedResult> getResultSession(Session session)
     {
@@ -326,11 +331,11 @@ private static Object convertToRowValue(Type type, Object value)
         }
         if (type.getBaseName().equals("Geometry")) {
             //noinspection RedundantCast
-            return (byte[]) value;
+            return (String) value;
         }
         if (type.getBaseName().equals("SphericalGeography")) {
             //noinspection RedundantCast
-            return (byte[]) value;
+            return (String) value;
         }
         if (type.getBaseName().equals("ObjectId")) {
             //noinspection RedundantCast
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/datatype/CreateAndInsertDataSetup.java b/testing/trino-testing/src/main/java/io/trino/testing/datatype/CreateAndInsertDataSetup.java
index 0793a97d6fc8..4415f33b2331 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/datatype/CreateAndInsertDataSetup.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/datatype/CreateAndInsertDataSetup.java
@@ -14,6 +14,7 @@
 package io.trino.testing.datatype;
 
 import io.trino.testing.sql.SqlExecutor;
+import io.trino.testing.sql.TemporaryRelation;
 import io.trino.testing.sql.TestTable;
 import io.trino.testing.sql.TrinoSqlExecutor;
 
@@ -38,7 +39,7 @@ public CreateAndInsertDataSetup(SqlExecutor sqlExecutor, String tableNamePrefix)
     }
 
     @Override
-    public TestTable setupTemporaryRelation(List<ColumnSetup> inputs)
+    public TemporaryRelation setupTemporaryRelation(List<ColumnSetup> inputs)
     {
         TestTable testTable = createTestTable(inputs);
         try {
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/sql/SqlExecutor.java b/testing/trino-testing/src/main/java/io/trino/testing/sql/SqlExecutor.java
index 7984d1ad3739..14d283d80ba2 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/sql/SqlExecutor.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/sql/SqlExecutor.java
@@ -15,5 +15,10 @@
 
 public interface SqlExecutor
 {
+    default boolean supportsMultiRowInsert()
+    {
+        return true;
+    }
+
     void execute(String sql);
 }
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/sql/TestTable.java b/testing/trino-testing/src/main/java/io/trino/testing/sql/TestTable.java
index 8f80948ab500..998ee402a487 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/sql/TestTable.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/sql/TestTable.java
@@ -23,6 +23,8 @@
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static java.lang.String.join;
+import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.joining;
 
 public class TestTable
         implements TemporaryRelation
@@ -38,26 +40,27 @@ public TestTable(SqlExecutor sqlExecutor, String namePrefix, String tableDefinit
 
     public TestTable(SqlExecutor sqlExecutor, String namePrefix, String tableDefinition, List<String> rowsToInsert)
     {
-        this.sqlExecutor = sqlExecutor;
-        this.name = namePrefix + randomNameSuffix();
-        this.tableDefinition = tableDefinition;
+        this.sqlExecutor = requireNonNull(sqlExecutor, "sqlExecutor is null");
+        this.name = requireNonNull(namePrefix, "namePrefix is null") + randomNameSuffix();
+        this.tableDefinition = requireNonNull(tableDefinition, "tableDefinition is null");
         createAndInsert(rowsToInsert);
     }
 
-    public TestTable(SqlExecutor sqlExecutor, String namePrefix)
-    {
-        this.sqlExecutor = sqlExecutor;
-        this.name = namePrefix + randomNameSuffix();
-        this.tableDefinition = null;
-    }
-
-    public void createAndInsert(List<String> rowsToInsert)
+    protected void createAndInsert(List<String> rowsToInsert)
     {
         sqlExecutor.execute(format("CREATE TABLE %s %s", name, tableDefinition));
         try {
-            for (String row : rowsToInsert) {
-                // some databases do not support multi value insert statement
-                sqlExecutor.execute(format("INSERT INTO %s VALUES (%s)", name, row));
+            if (!rowsToInsert.isEmpty()) {
+                if (sqlExecutor.supportsMultiRowInsert()) {
+                    sqlExecutor.execute(format("INSERT INTO %s VALUES %s", name, rowsToInsert.stream()
+                            .map("(%s)"::formatted)
+                            .collect(joining(", "))));
+                }
+                else {
+                    for (String row : rowsToInsert) {
+                        sqlExecutor.execute(format("INSERT INTO %s VALUES (%s)", name, row));
+                    }
+                }
             }
         }
         catch (Exception e) {
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/statistics/MetricComparator.java b/testing/trino-testing/src/main/java/io/trino/testing/statistics/MetricComparator.java
index 07bfd690c5bc..40c4e59d6369 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/statistics/MetricComparator.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/statistics/MetricComparator.java
@@ -17,7 +17,6 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
 import io.trino.cost.PlanNodeStatsEstimate;
-import io.trino.execution.warnings.WarningCollector;
 import io.trino.sql.planner.Plan;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.OutputNode;
@@ -29,7 +28,6 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
 import static io.trino.transaction.TransactionBuilder.transaction;
 import static java.lang.String.format;
 import static java.util.stream.Collectors.joining;
@@ -56,7 +54,7 @@ static List<MetricComparison> getMetricComparisons(String query, QueryRunner run
 
     private static List<OptionalDouble> getEstimatedValues(List<Metric> metrics, String query, QueryRunner runner)
     {
-        return transaction(runner.getTransactionManager(), runner.getAccessControl())
+        return transaction(runner.getTransactionManager(), runner.getMetadata(), runner.getAccessControl())
                 .singleStatement()
                 .execute(runner.getDefaultSession(), (Session session) -> getEstimatedValuesInternal(metrics, query, runner, session));
     }
@@ -64,7 +62,7 @@ private static List<OptionalDouble> getEstimatedValues(List<Metric> metrics, Str
     private static List<OptionalDouble> getEstimatedValuesInternal(List<Metric> metrics, String query, QueryRunner runner, Session session)
     // TODO inline back this method
     {
-        Plan queryPlan = runner.createPlan(session, query, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+        Plan queryPlan = runner.createPlan(session, query);
         OutputNode outputNode = (OutputNode) queryPlan.getRoot();
         PlanNodeStatsEstimate outputNodeStats = queryPlan.getStatsAndCosts().getStats().getOrDefault(queryPlan.getRoot().getId(), PlanNodeStatsEstimate.unknown());
         StatsContext statsContext = buildStatsContext(queryPlan, outputNode);
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/tpch/IndexedTpchConnectorFactory.java b/testing/trino-testing/src/main/java/io/trino/testing/tpch/IndexedTpchConnectorFactory.java
index b7f76095b80d..5defebc371e8 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/tpch/IndexedTpchConnectorFactory.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/tpch/IndexedTpchConnectorFactory.java
@@ -37,7 +37,7 @@
 import java.util.Set;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
-import static io.trino.plugin.base.Versions.checkSpiVersion;
+import static io.trino.plugin.base.Versions.checkStrictSpiVersionMatch;
 import static java.util.Objects.requireNonNull;
 
 public class IndexedTpchConnectorFactory
@@ -61,7 +61,7 @@ public String getName()
     @Override
     public Connector create(String catalogName, Map<String, String> properties, ConnectorContext context)
     {
-        checkSpiVersion(context, this);
+        checkStrictSpiVersionMatch(context, this);
 
         int splitsPerNode = getSplitsPerNode(properties);
         TpchIndexedData indexedData = new TpchIndexedData(indexSpec);
diff --git a/testing/trino-testing/src/test/java/io/trino/testing/TestTestingTrinoClient.java b/testing/trino-testing/src/test/java/io/trino/testing/TestTestingTrinoClient.java
index 326e519b3e9f..e356e43fd205 100644
--- a/testing/trino-testing/src/test/java/io/trino/testing/TestTestingTrinoClient.java
+++ b/testing/trino-testing/src/test/java/io/trino/testing/TestTestingTrinoClient.java
@@ -47,6 +47,7 @@ public class TestTestingTrinoClient
     private static final SessionPropertyManager sessionManager = new SessionPropertyManager();
     private static final Session session = Session.builder(sessionManager)
             .setIdentity(Identity.forUser(TEST_USER).build())
+            .setOriginalIdentity(Identity.forUser(TEST_USER).build())
             .setQueryId(queryIdGenerator.createNextQueryId())
             .build();
 
diff --git a/testing/trino-tests/pom.xml b/testing/trino-tests/pom.xml
index eac4c21b5af0..ced92c35ddcb 100644
--- a/testing/trino-tests/pom.xml
+++ b/testing/trino-tests/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>413-SNAPSHOT</version>
+        <version>432-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>trino-tests</artifactId>
-    <name>trino-tests</name>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -27,7 +26,36 @@
     </properties>
 
     <dependencies>
-        <!-- used by tests but also needed transitively -->
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>concurrent</artifactId>
@@ -77,51 +105,63 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>bootstrap</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk-trace</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -161,6 +201,18 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-filesystem-s3</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-hdfs</artifactId>
@@ -171,18 +223,6 @@
             <groupId>io.trino</groupId>
             <artifactId>trino-hive</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <!-- conflicts with com.google.protobuf:protobuf-java -->
-                    <groupId>org.alluxio</groupId>
-                    <artifactId>alluxio-shaded-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- calcite-core and Iceberg have conflicting versions of org.apache.commons:commons-lang3 -->
-                    <groupId>com.linkedin.calcite</groupId>
-                    <artifactId>calcite-core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -190,18 +230,6 @@
             <artifactId>trino-hive</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <!-- conflicts with com.google.protobuf:protobuf-java -->
-                    <groupId>org.alluxio</groupId>
-                    <artifactId>alluxio-shaded-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- calcite-core and Iceberg have conflicting versions of org.apache.commons:commons-lang3 -->
-                    <groupId>com.linkedin.calcite</groupId>
-                    <artifactId>calcite-core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -243,6 +271,19 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-parser</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-parser</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-plugin-toolkit</artifactId>
@@ -323,24 +364,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
@@ -359,6 +382,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!-- for benchmarks -->
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -386,16 +415,33 @@
                 <artifactId>duplicate-finder-maven-plugin</artifactId>
                 <configuration>
                     <ignoredResourcePatterns>
-                        <!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
-                        <ignoredResourcePattern>mime.types</ignoredResourcePattern>
-                        <ignoredResourcePattern>about.html</ignoredResourcePattern>
                         <ignoredResourcePattern>iceberg-build.properties</ignoredResourcePattern>
                         <ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
-                        <!-- TODO: To be removed https://github.com/trinodb/trino/issues/15371 -->
-                        <ignoredResourcePattern>google/protobuf/.*\.proto$</ignoredResourcePattern>
                     </ignoredResourcePatterns>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <!-- allow both JUnit and TestNG -->
+                    <!--                    <dependency>-->
+                    <!--                        <groupId>org.apache.maven.surefire</groupId>-->
+                    <!--                        <artifactId>surefire-junit-platform</artifactId>-->
+                    <!--                        <version>${dep.plugin.surefire.version}</version>-->
+                    <!--                    </dependency>-->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                    <!--                    <dependency>-->
+                    <!--                        <groupId>org.junit.jupiter</groupId>-->
+                    <!--                        <artifactId>junit-jupiter-engine</artifactId>-->
+                    <!--                        <version>${dep.junit.version}</version>-->
+                    <!--                    </dependency>-->
+                </dependencies>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/testing/trino-tests/src/test/java/io/trino/connector/informationschema/BenchmarkInformationSchema.java b/testing/trino-tests/src/test/java/io/trino/connector/informationschema/BenchmarkInformationSchema.java
index 339686f2698e..3c1ecd4b2d7a 100644
--- a/testing/trino-tests/src/test/java/io/trino/connector/informationschema/BenchmarkInformationSchema.java
+++ b/testing/trino-tests/src/test/java/io/trino/connector/informationschema/BenchmarkInformationSchema.java
@@ -23,6 +23,7 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -35,7 +36,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
-import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.Map;
diff --git a/testing/trino-tests/src/test/java/io/trino/connector/informationschema/TestInformationSchemaConnector.java b/testing/trino-tests/src/test/java/io/trino/connector/informationschema/TestInformationSchemaConnector.java
new file mode 100644
index 000000000000..0fde9748a50c
--- /dev/null
+++ b/testing/trino-tests/src/test/java/io/trino/connector/informationschema/TestInformationSchemaConnector.java
@@ -0,0 +1,426 @@
+/*
+ * Licensed 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 io.trino.connector.informationschema;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultiset;
+import com.google.common.collect.Multiset;
+import io.trino.Session;
+import io.trino.plugin.tpch.TpchPlugin;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.CountingMockConnector;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testng.services.ManageTestResources;
+import io.trino.tests.FailingMockConnectorPlugin;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
+
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static io.trino.testing.MultisetAssertions.assertMultisetsEqual;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+@TestInstance(PER_CLASS)
+public class TestInformationSchemaConnector
+        extends AbstractTestQueryFramework
+{
+    private static final int MAX_PREFIXES_COUNT = 10;
+
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
+    private CountingMockConnector countingMockConnector;
+
+    @Override
+    protected DistributedQueryRunner createQueryRunner()
+            throws Exception
+    {
+        countingMockConnector = closeAfterClass(new CountingMockConnector());
+        Session session = testSessionBuilder().build();
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session)
+                .setNodeCount(1)
+                .addCoordinatorProperty("optimizer.experimental-max-prefetched-information-schema-prefixes", Integer.toString(MAX_PREFIXES_COUNT))
+                .build();
+        try {
+            queryRunner.installPlugin(new TpchPlugin());
+            queryRunner.createCatalog("tpch", "tpch");
+
+            queryRunner.installPlugin(countingMockConnector.getPlugin());
+            queryRunner.createCatalog("test_catalog", "mock", ImmutableMap.of());
+
+            queryRunner.installPlugin(new FailingMockConnectorPlugin());
+            queryRunner.createCatalog("broken_catalog", "failing_mock", ImmutableMap.of());
+            return queryRunner;
+        }
+        catch (Exception e) {
+            queryRunner.close();
+            throw e;
+        }
+    }
+
+    @AfterAll
+    public void cleanUp()
+    {
+        countingMockConnector = null; // closed by closeAfterClass
+    }
+
+    @Test
+    public void testBasic()
+    {
+        assertQuery("SELECT count(*) FROM tpch.information_schema.schemata", "VALUES 10");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.tables", "VALUES 80");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns", "VALUES 583");
+        assertQuery("SELECT * FROM tpch.information_schema.schemata ORDER BY 1 DESC, 2 DESC LIMIT 1", "VALUES ('tpch', 'tiny')");
+        assertQuery("SELECT * FROM tpch.information_schema.tables ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC LIMIT 1", "VALUES ('tpch', 'tiny', 'supplier', 'BASE TABLE')");
+        assertQuery("SELECT * FROM tpch.information_schema.columns ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC LIMIT 1", "VALUES ('tpch', 'tiny', 'supplier', 'suppkey', 1, NULL, 'NO', 'bigint')");
+        assertQuery("SELECT * FROM test_catalog.information_schema.columns ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC LIMIT 1", "VALUES ('test_catalog', 'test_schema2', 'test_table999', 'column_99', 100, NULL, 'YES', 'varchar')");
+        assertQuery("SELECT count(*) FROM test_catalog.information_schema.columns", "VALUES 300034");
+    }
+
+    @Test
+    public void testSchemaNamePredicate()
+    {
+        assertQuery("SELECT count(*) FROM tpch.information_schema.schemata WHERE schema_name = 'sf1'", "VALUES 1");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.schemata WHERE schema_name IS NOT NULL", "VALUES 10");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_schema = 'sf1'", "VALUES 8");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_schema IS NOT NULL", "VALUES 80");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema = 'sf1'", "VALUES 61");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema = 'information_schema'", "VALUES 34");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema > 'sf100'", "VALUES 427");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema != 'sf100'", "VALUES 522");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema LIKE 'sf100'", "VALUES 61");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema LIKE 'sf%'", "VALUES 488");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema IS NOT NULL", "VALUES 583");
+    }
+
+    @Test
+    public void testTableNamePredicate()
+    {
+        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name = 'orders'", "VALUES 9");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name = 'ORDERS'", "VALUES 0");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name LIKE 'orders'", "VALUES 9");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name < 'orders'", "VALUES 30");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name LIKE 'part'", "VALUES 9");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name LIKE 'part%'", "VALUES 18");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name IS NOT NULL", "VALUES 80");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_name = 'orders'", "VALUES 81");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_name LIKE 'orders'", "VALUES 81");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_name < 'orders'", "VALUES 265");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_name LIKE 'part'", "VALUES 81");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_name LIKE 'part%'", "VALUES 126");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_name IS NOT NULL", "VALUES 583");
+    }
+
+    @Test
+    public void testMixedPredicate()
+    {
+        assertQuery("SELECT * FROM tpch.information_schema.tables WHERE table_schema = 'sf1' and table_name = 'orders'", "VALUES ('tpch', 'sf1', 'orders', 'BASE TABLE')");
+        assertQuery("SELECT table_schema FROM tpch.information_schema.tables WHERE table_schema IS NOT NULL and table_name = 'orders'", "VALUES 'tiny', 'sf1', 'sf100', 'sf1000', 'sf10000', 'sf100000', 'sf300', 'sf3000', 'sf30000'");
+        assertQuery("SELECT table_name FROM tpch.information_schema.tables WHERE table_schema = 'sf1' and table_name IS NOT NULL", "VALUES 'customer', 'lineitem', 'orders', 'part', 'partsupp', 'supplier', 'nation', 'region'");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema = 'sf1' and table_name = 'orders'", "VALUES 9");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema IS NOT NULL and table_name = 'orders'", "VALUES 81");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema = 'sf1' and table_name IS NOT NULL", "VALUES 61");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_schema > 'sf1' and table_name < 'orders'", "VALUES 24");
+        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema > 'sf1' and table_name < 'orders'", "VALUES 224");
+    }
+
+    @Test
+    public void testProject()
+    {
+        assertQuery("SELECT schema_name FROM tpch.information_schema.schemata ORDER BY 1 DESC LIMIT 1", "VALUES 'tiny'");
+        assertQuery("SELECT table_name, table_type FROM tpch.information_schema.tables ORDER BY 1 DESC, 2 DESC LIMIT 1", "VALUES ('views', 'BASE TABLE')");
+        assertQuery("SELECT column_name, data_type FROM tpch.information_schema.columns ORDER BY 1 DESC, 2 DESC LIMIT 1", "VALUES ('with_hierarchy', 'varchar')");
+    }
+
+    @Test
+    public void testLimit()
+    {
+        assertQuery("SELECT count(*) FROM (SELECT * from tpch.information_schema.columns LIMIT 1)", "VALUES 1");
+        assertQuery("SELECT count(*) FROM (SELECT * FROM tpch.information_schema.columns LIMIT 100)", "VALUES 100");
+        assertQuery("SELECT count(*) FROM (SELECT * FROM test_catalog.information_schema.tables LIMIT 1000)", "VALUES 1000");
+    }
+
+    @Test
+    @Timeout(60)
+    public void testMetadataCalls()
+    {
+        assertMetadataCalls(
+                "SELECT count(*) from test_catalog.information_schema.schemata WHERE schema_name LIKE 'test_sch_ma1'",
+                "VALUES 1",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listSchemaNames")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(*) from test_catalog.information_schema.schemata WHERE schema_name LIKE 'test_sch_ma1' AND schema_name IN ('test_schema1', 'test_schema2')",
+                "VALUES 1",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listSchemaNames")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(table_name), count(table_type) from test_catalog.information_schema.tables",
+                "VALUES (3008, 3008)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listTables")
+                        .add("ConnectorMetadata.listViews")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(table_name), count(table_type) from test_catalog.information_schema.tables WHERE table_schema = 'test_schema1'",
+                "VALUES (1000, 1000)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listTables(schema=test_schema1)")
+                        .add("ConnectorMetadata.listViews(schema=test_schema1)")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(table_name), count(table_type) from test_catalog.information_schema.tables WHERE table_schema LIKE 'test_sch_ma1'",
+                "VALUES (1000, 1000)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listSchemaNames")
+                        .add("ConnectorMetadata.listTables(schema=test_schema1)")
+                        .add("ConnectorMetadata.listViews(schema=test_schema1)")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(table_name), count(table_type) from test_catalog.information_schema.tables WHERE table_schema LIKE 'test_sch_ma1' AND table_schema IN ('test_schema1', 'test_schema2')",
+                "VALUES (1000, 1000)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listTables(schema=test_schema1)")
+                        .add("ConnectorMetadata.listViews(schema=test_schema1)")
+                        .add("ConnectorMetadata.listTables(schema=test_schema2)")
+                        .add("ConnectorMetadata.listViews(schema=test_schema2)")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(table_name), count(table_type) from test_catalog.information_schema.tables WHERE table_schema IN " +
+                        Stream.concat(
+                                        Stream.of("test_schema1", "test_schema2"),
+                                        IntStream.range(1, MAX_PREFIXES_COUNT + 1)
+                                                .mapToObj(i -> "bogus_schema" + i))
+                                .map("'%s'"::formatted)
+                                .collect(joining(",", "(", ")")),
+                "VALUES (3000, 3000)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listTables")
+                        .add("ConnectorMetadata.listViews")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(table_name), count(table_type) from test_catalog.information_schema.tables WHERE table_name = 'test_table1'",
+                "VALUES (2, 2)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listSchemaNames")
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 5)
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema2, table=test_table1)", 5)
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema3_empty, table=test_table1)", 5)
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema4_empty, table=test_table1)", 5)
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema2, table=test_table1)")
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema3_empty, table=test_table1)")
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema4_empty, table=test_table1)")
+                        .addCopies("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)", 2)
+                        .addCopies("ConnectorMetadata.getView(schema=test_schema2, table=test_table1)", 2)
+                        .addCopies("ConnectorMetadata.getView(schema=test_schema3_empty, table=test_table1)", 2)
+                        .addCopies("ConnectorMetadata.getView(schema=test_schema4_empty, table=test_table1)", 2)
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema2, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema3_empty, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema4_empty, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema2, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema3_empty, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema4_empty, table=test_table1)")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(table_name), count(table_type) from test_catalog.information_schema.tables WHERE table_name LIKE 'test_t_ble1'",
+                "VALUES (2, 2)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listSchemaNames")
+                        .add("ConnectorMetadata.listTables(schema=test_schema1)")
+                        .add("ConnectorMetadata.listTables(schema=test_schema2)")
+                        .add("ConnectorMetadata.listTables(schema=test_schema3_empty)")
+                        .add("ConnectorMetadata.listTables(schema=test_schema4_empty)")
+                        .add("ConnectorMetadata.listViews(schema=test_schema1)")
+                        .add("ConnectorMetadata.listViews(schema=test_schema2)")
+                        .add("ConnectorMetadata.listViews(schema=test_schema3_empty)")
+                        .add("ConnectorMetadata.listViews(schema=test_schema4_empty)")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(table_name), count(table_type) from test_catalog.information_schema.tables WHERE table_name LIKE 'test_t_ble1' AND table_name IN ('test_table1', 'test_table2')",
+                "VALUES (2, 2)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listSchemaNames")
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 5)
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table2)", 5)
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema2, table=test_table1)", 5)
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema2, table=test_table2)", 5)
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema3_empty, table=test_table1)", 5)
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema3_empty, table=test_table2)", 5)
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema4_empty, table=test_table1)", 5)
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema4_empty, table=test_table2)", 5)
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table2)")
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema2, table=test_table2)")
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema2, table=test_table1)")
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema3_empty, table=test_table2)")
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema3_empty, table=test_table1)")
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema4_empty, table=test_table2)")
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema4_empty, table=test_table1)")
+                        .addCopies("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)", 2)
+                        .addCopies("ConnectorMetadata.getView(schema=test_schema1, table=test_table2)", 2)
+                        .addCopies("ConnectorMetadata.getView(schema=test_schema2, table=test_table1)", 2)
+                        .addCopies("ConnectorMetadata.getView(schema=test_schema2, table=test_table2)", 2)
+                        .addCopies("ConnectorMetadata.getView(schema=test_schema3_empty, table=test_table1)", 2)
+                        .addCopies("ConnectorMetadata.getView(schema=test_schema3_empty, table=test_table2)", 2)
+                        .addCopies("ConnectorMetadata.getView(schema=test_schema4_empty, table=test_table1)", 2)
+                        .addCopies("ConnectorMetadata.getView(schema=test_schema4_empty, table=test_table2)", 2)
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table2)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema2, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema2, table=test_table2)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema3_empty, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema3_empty, table=test_table2)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema4_empty, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema4_empty, table=test_table2)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table2)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema2, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema2, table=test_table2)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema3_empty, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema3_empty, table=test_table2)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema4_empty, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema4_empty, table=test_table2)")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(*) from test_catalog.information_schema.columns WHERE table_schema = 'test_schema1' AND table_name = 'test_table1'",
+                "VALUES 100",
+                ImmutableMultiset.<String>builder()
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 4)
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getTableMetadata(handle=test_schema1.test_table1)")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(*) from test_catalog.information_schema.columns WHERE table_catalog = 'wrong'",
+                "VALUES 0",
+                ImmutableMultiset.of());
+        assertMetadataCalls(
+                "SELECT count(*) from test_catalog.information_schema.columns WHERE table_catalog = 'test_catalog' AND table_schema = 'wrong_schema1' AND table_name = 'test_table1'",
+                "VALUES 0",
+                ImmutableMultiset.<String>builder()
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=wrong_schema1, table=test_table1)", 4)
+                        .add("ConnectorMetadata.getMaterializedView(schema=wrong_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getView(schema=wrong_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=wrong_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=wrong_schema1, table=test_table1)")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(*) from test_catalog.information_schema.columns WHERE table_catalog IN ('wrong', 'test_catalog') AND table_schema = 'wrong_schema1' AND table_name = 'test_table1'",
+                "VALUES 0",
+                ImmutableMultiset.<String>builder()
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=wrong_schema1, table=test_table1)", 4)
+                        .add("ConnectorMetadata.getMaterializedView(schema=wrong_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getView(schema=wrong_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=wrong_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=wrong_schema1, table=test_table1)")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(*) FROM (SELECT * from test_catalog.information_schema.columns LIMIT 1)",
+                "VALUES 1",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listSchemaNames")
+                        .build());
+        assertMetadataCalls(
+                "SELECT count(*) FROM (SELECT * from test_catalog.information_schema.columns LIMIT 1000)",
+                "VALUES 1000",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listSchemaNames")
+                        .add("ConnectorMetadata.streamRelationColumns(schema=test_schema1)")
+                        .build());
+
+        // Empty table schema and table name
+        assertMetadataCalls(
+                "SELECT count(table_name), count(table_type) from test_catalog.information_schema.tables WHERE table_schema = '' AND table_name = ''",
+                "VALUES (0, 0)",
+                ImmutableMultiset.of());
+
+        // Empty table schema
+        assertMetadataCalls(
+                "SELECT count(table_name), count(table_type) from test_catalog.information_schema.tables WHERE table_schema = ''",
+                "VALUES (0, 0)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listTables(schema=)")
+                        .add("ConnectorMetadata.listViews(schema=)")
+                        .build());
+
+        // Empty table name
+        assertMetadataCalls(
+                "SELECT count(table_name), count(table_type) from test_catalog.information_schema.tables WHERE table_name = ''",
+                "VALUES (0, 0)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listSchemaNames")
+                        .build());
+
+        // Subset of tables' columns: table_type not selected
+        assertMetadataCalls(
+                "SELECT count(table_name) from test_catalog.information_schema.tables WHERE table_schema LIKE 'test_sch_ma1'",
+                "VALUES 1000",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.listSchemaNames")
+                        .add("ConnectorMetadata.listTables(schema=test_schema1)")
+                        // view-related methods such as listViews not being called
+                        .build());
+    }
+
+    @Test
+    public void testMetadataListingExceptionHandling()
+    {
+        assertQueryFails(
+                "SELECT * FROM broken_catalog.information_schema.schemata",
+                "Error listing schemas for catalog broken_catalog: Catalog is broken");
+
+        assertQueryFails(
+                "SELECT * FROM broken_catalog.information_schema.tables",
+                "Error listing tables for catalog broken_catalog: Catalog is broken");
+
+        assertQueryFails(
+                "SELECT * FROM broken_catalog.information_schema.views",
+                "Error listing views for catalog broken_catalog: Catalog is broken");
+
+        assertQueryFails(
+                "SELECT * FROM broken_catalog.information_schema.table_privileges",
+                "Error listing table privileges for catalog broken_catalog: Catalog is broken");
+
+        assertQueryFails(
+                "SELECT * FROM broken_catalog.information_schema.columns",
+                "Error listing table columns for catalog broken_catalog: Catalog is broken");
+    }
+
+    private void assertMetadataCalls(@Language("SQL") String actualSql, @Language("SQL") String expectedSql, Multiset<String> expectedMetadataCallsCount)
+    {
+        expectedMetadataCallsCount = ImmutableMultiset.<String>builder()
+                // Every query involves beginQuery and cleanupQuery, so expect them implicitly.
+                .add("ConnectorMetadata.beginQuery", "ConnectorMetadata.cleanupQuery")
+                .addAll(expectedMetadataCallsCount)
+                .build();
+
+        Multiset<String> actualMetadataCallsCount = countingMockConnector.runTracing(() -> {
+            // expectedSql is run on H2, so does not affect counts.
+            assertQuery(actualSql, expectedSql);
+        });
+
+        assertMultisetsEqual(actualMetadataCallsCount, expectedMetadataCallsCount);
+    }
+}
diff --git a/testing/trino-tests/src/test/java/io/trino/connector/system/metadata/TestSystemMetadataConnector.java b/testing/trino-tests/src/test/java/io/trino/connector/system/metadata/TestSystemMetadataConnector.java
new file mode 100644
index 000000000000..10ae1875308d
--- /dev/null
+++ b/testing/trino-tests/src/test/java/io/trino/connector/system/metadata/TestSystemMetadataConnector.java
@@ -0,0 +1,408 @@
+/*
+ * Licensed 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 io.trino.connector.system.metadata;
+
+import com.google.common.collect.ImmutableMultiset;
+import com.google.common.collect.Multiset;
+import io.trino.Session;
+import io.trino.plugin.tpch.TpchPlugin;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.CountingMockConnector;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.tests.FailingMockConnectorPlugin;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static com.google.common.collect.ImmutableMultiset.toImmutableMultiset;
+import static io.trino.testing.MultisetAssertions.assertMultisetsEqual;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static java.util.stream.Collectors.joining;
+
+public class TestSystemMetadataConnector
+        extends AbstractTestQueryFramework
+{
+    private static final int MAX_PREFIXES_COUNT = 10;
+
+    private CountingMockConnector countingMockConnector;
+
+    @Override
+    protected DistributedQueryRunner createQueryRunner()
+            throws Exception
+    {
+        countingMockConnector = closeAfterClass(new CountingMockConnector());
+        closeAfterClass(() -> countingMockConnector = null);
+        Session session = testSessionBuilder().build();
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session)
+                .setNodeCount(1)
+                .addCoordinatorProperty("optimizer.experimental-max-prefetched-information-schema-prefixes", Integer.toString(MAX_PREFIXES_COUNT))
+                .build();
+        try {
+            queryRunner.installPlugin(new TpchPlugin());
+            queryRunner.createCatalog("tpch", "tpch");
+
+            queryRunner.installPlugin(countingMockConnector.getPlugin());
+            queryRunner.createCatalog("test_catalog", "mock", Map.of());
+
+            queryRunner.installPlugin(new FailingMockConnectorPlugin());
+            queryRunner.createCatalog("broken_catalog", "failing_mock", Map.of());
+            return queryRunner;
+        }
+        catch (Exception e) {
+            queryRunner.close();
+            throw e;
+        }
+    }
+
+    @Test
+    public void testTableCommentsMetadataCalls()
+    {
+        // Specific relation
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.table_comments WHERE catalog_name = 'test_catalog' AND schema_name = 'test_schema1' AND table_name = 'test_table1'",
+                "VALUES 'comment for test_schema1.test_table1'",
+                ImmutableMultiset.<String>builder()
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=test_table1)", 4)
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getView(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getTableMetadata(handle=test_schema1.test_table1)")
+                        .build());
+
+        // Specific relation that does not exist
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.table_comments WHERE catalog_name = 'test_catalog' AND schema_name = 'test_schema1' AND table_name = 'does_not_exist'",
+                "SELECT '' WHERE false",
+                ImmutableMultiset.<String>builder()
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=test_schema1, table=does_not_exist)", 4)
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=does_not_exist)")
+                        .add("ConnectorMetadata.getView(schema=test_schema1, table=does_not_exist)")
+                        .add("ConnectorMetadata.redirectTable(schema=test_schema1, table=does_not_exist)")
+                        .add("ConnectorMetadata.getTableHandle(schema=test_schema1, table=does_not_exist)")
+                        .build());
+
+        // Specific relation in a schema that does not exist
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.table_comments WHERE catalog_name = 'test_catalog' AND schema_name = 'wrong_schema1' AND table_name = 'test_table1'",
+                "SELECT '' WHERE false",
+                ImmutableMultiset.<String>builder()
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=wrong_schema1, table=test_table1)", 4)
+                        .add("ConnectorMetadata.getMaterializedView(schema=wrong_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getView(schema=wrong_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=wrong_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=wrong_schema1, table=test_table1)")
+                        .build());
+
+        // Specific relation in a schema that does not exist across existing and non-existing catalogs
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.table_comments WHERE catalog_name IN ('wrong', 'test_catalog') AND schema_name = 'wrong_schema1' AND table_name = 'test_table1'",
+                "SELECT '' WHERE false",
+                ImmutableMultiset.<String>builder()
+                        .addCopies("ConnectorMetadata.getSystemTable(schema=wrong_schema1, table=test_table1)", 4)
+                        .add("ConnectorMetadata.getMaterializedView(schema=wrong_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getView(schema=wrong_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.redirectTable(schema=wrong_schema1, table=test_table1)")
+                        .add("ConnectorMetadata.getTableHandle(schema=wrong_schema1, table=test_table1)")
+                        .build());
+
+        // Whole catalog
+        assertMetadataCalls(
+                "SELECT count(DISTINCT schema_name), count(DISTINCT table_name), count(comment), count(*) FROM system.metadata.table_comments WHERE catalog_name = 'test_catalog'",
+                "VALUES (3, 2008, 3000, 3008)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.streamRelationComments")
+                        .build());
+
+        // Whole catalog except for information_schema (typical query run by BI tools)
+        assertMetadataCalls(
+                "SELECT count(DISTINCT schema_name), count(DISTINCT table_name), count(comment), count(*) FROM system.metadata.table_comments WHERE catalog_name = 'test_catalog' AND schema_name != 'information_schema'",
+                "VALUES (2, 2000, 3000, 3000)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.streamRelationComments")
+                        .build());
+
+        // Two catalogs
+        assertMetadataCalls(
+                "SELECT count(DISTINCT schema_name), count(DISTINCT table_name), count(comment), count(*) FROM system.metadata.table_comments WHERE catalog_name IN ('test_catalog', 'tpch')",
+                "VALUES (12, 2016, 3000, 3088)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.streamRelationComments")
+                        .build());
+
+        // Whole schema
+        assertMetadataCalls(
+                "SELECT count(table_name), count(comment) FROM system.metadata.table_comments WHERE catalog_name = 'test_catalog' AND schema_name = 'test_schema1'",
+                "VALUES (1000, 1000)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.streamRelationComments(schema=test_schema1)")
+                        .build());
+
+        // Two schemas
+        assertMetadataCalls(
+                "SELECT count(DISTINCT schema_name), count(DISTINCT table_name), count(comment), count(*) FROM system.metadata.table_comments WHERE catalog_name = 'test_catalog' AND schema_name IN ('test_schema1', 'test_schema2')",
+                "VALUES (2, 2000, 3000, 3000)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.streamRelationComments(schema=test_schema1)")
+                        .add("ConnectorMetadata.streamRelationComments(schema=test_schema2)")
+                        .build());
+
+        // Multiple schemas
+        assertMetadataCalls(
+                "SELECT count(DISTINCT schema_name), count(DISTINCT table_name), count(comment), count(*) FROM system.metadata.table_comments WHERE catalog_name = 'test_catalog' AND schema_name IN " +
+                        Stream.concat(
+                                        Stream.of("test_schema1", "test_schema2"),
+                                        IntStream.range(1, MAX_PREFIXES_COUNT + 1)
+                                                .mapToObj(i -> "bogus_schema" + i))
+                                .map("'%s'"::formatted)
+                                .collect(joining(",", "(", ")")),
+                "VALUES (2, 2000, 3000, 3000)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.streamRelationComments(schema=test_schema1)")
+                        .add("ConnectorMetadata.streamRelationComments(schema=test_schema2)")
+                        .addAll(IntStream.range(1, MAX_PREFIXES_COUNT + 1)
+                                .mapToObj("ConnectorMetadata.streamRelationComments(schema=bogus_schema%s)"::formatted)
+                                .toList())
+                        .build());
+
+        // Small LIMIT
+        assertMetadataCalls(
+                "SELECT count(*) FROM (SELECT * FROM system.metadata.table_comments WHERE catalog_name = 'test_catalog' LIMIT 1)",
+                "VALUES 1",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.streamRelationComments")
+                        .build());
+
+        // Big LIMIT
+        assertMetadataCalls(
+                "SELECT count(*) FROM (SELECT * FROM system.metadata.table_comments WHERE catalog_name = 'test_catalog' LIMIT 1000)",
+                "VALUES 1000",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.streamRelationComments")
+                        .build());
+
+        // Non-existent catalog
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.table_comments WHERE catalog_name = 'wrong'",
+                "SELECT '' WHERE false",
+                ImmutableMultiset.of());
+
+        // Empty catalog name
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.table_comments WHERE catalog_name = ''",
+                "SELECT '' WHERE false",
+                ImmutableMultiset.of());
+
+        // Empty table schema and table name
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.table_comments WHERE schema_name = '' AND table_name = ''",
+                "SELECT '' WHERE false",
+                ImmutableMultiset.of());
+
+        // Empty table schema
+        assertMetadataCalls(
+                "SELECT count(comment) FROM system.metadata.table_comments WHERE schema_name = ''",
+                "VALUES 0",
+                ImmutableMultiset.of());
+
+        // Empty table name
+        assertMetadataCalls(
+                "SELECT count(comment) FROM system.metadata.table_comments WHERE table_name = ''",
+                "VALUES 0",
+                ImmutableMultiset.of());
+    }
+
+    @Test
+    public void testMaterializedViewsMetadataCalls()
+    {
+        // Specific relation
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.materialized_views WHERE catalog_name = 'test_catalog' AND schema_name = 'test_schema1' AND name = 'test_table1'",
+                // TODO introduce materialized views in CountingMockConnector
+                "SELECT '' WHERE false",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=test_table1)")
+                        .build());
+
+        // Specific relation that does not exist
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.materialized_views WHERE catalog_name = 'test_catalog' AND schema_name = 'test_schema1' AND name = 'does_not_exist'",
+                "SELECT '' WHERE false",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.getMaterializedView(schema=test_schema1, table=does_not_exist)")
+                        .build());
+
+        // Specific relation in a schema that does not exist
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.materialized_views WHERE catalog_name = 'test_catalog' AND schema_name = 'wrong_schema1' AND name = 'test_table1'",
+                "SELECT '' WHERE false",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.getMaterializedView(schema=wrong_schema1, table=test_table1)")
+                        .build());
+
+        // Specific relation in a schema that does not exist across existing and non-existing catalogs
+        assertMetadataCalls(
+                // TODO should succeed, the broken_catalog is not one of the selected catalogs
+                "SELECT comment FROM system.metadata.materialized_views WHERE catalog_name IN ('wrong', 'test_catalog') AND schema_name = 'wrong_schema1' AND name = 'test_table1'",
+                "SELECT '' WHERE false",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.getMaterializedView(schema=wrong_schema1, table=test_table1)")
+                        .build());
+
+        // Whole catalog
+        assertMetadataCalls(
+                "SELECT count(DISTINCT schema_name), count(DISTINCT name), count(comment), count(*) FROM system.metadata.materialized_views WHERE catalog_name = 'test_catalog'",
+                // TODO introduce materialized views in CountingMockConnector
+                "VALUES (0, 0, 0, 0)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.getMaterializedViews")
+                        .build());
+
+        // Whole catalog except for information_schema (typical query run by BI tools)
+        assertMetadataCalls(
+                "SELECT count(DISTINCT schema_name), count(DISTINCT name), count(comment), count(*) FROM system.metadata.materialized_views WHERE catalog_name = 'test_catalog' AND schema_name != 'information_schema'",
+                // TODO introduce materialized views in CountingMockConnector
+                "VALUES (0, 0, 0, 0)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.getMaterializedViews")
+                        .build());
+
+        // Two catalogs
+        assertMetadataCalls(
+                "SELECT count(DISTINCT schema_name), count(DISTINCT name), count(comment), count(*) FROM system.metadata.materialized_views WHERE catalog_name IN ('test_catalog', 'tpch')",
+                // TODO introduce materialized views in CountingMockConnector
+                "VALUES (0, 0, 0, 0)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.getMaterializedViews")
+                        .build());
+
+        // Whole schema
+        assertMetadataCalls(
+                "SELECT count(name), count(comment) FROM system.metadata.materialized_views WHERE catalog_name = 'test_catalog' AND schema_name = 'test_schema1'",
+                // TODO introduce materialized views in CountingMockConnector
+                "VALUES (0, 0)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.getMaterializedViews(schema=test_schema1)")
+                        .build());
+
+        // Two schemas
+        assertMetadataCalls(
+                "SELECT count(DISTINCT schema_name), count(DISTINCT name), count(comment), count(*) FROM system.metadata.materialized_views WHERE catalog_name = 'test_catalog' AND schema_name IN ('test_schema1', 'test_schema2')",
+                // TODO introduce materialized views in CountingMockConnector
+                "VALUES (0, 0, 0, 0)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.getMaterializedViews(schema=test_schema1)")
+                        .add("ConnectorMetadata.getMaterializedViews(schema=test_schema2)")
+                        .build());
+
+        // Multiple schemas
+        assertMetadataCalls(
+                "SELECT count(DISTINCT schema_name), count(DISTINCT name), count(comment), count(*) FROM system.metadata.materialized_views WHERE catalog_name = 'test_catalog' AND schema_name IN " +
+                        Stream.concat(
+                                        Stream.of("test_schema1", "test_schema2"),
+                                        IntStream.range(1, MAX_PREFIXES_COUNT + 1)
+                                                .mapToObj(i -> "bogus_schema" + i))
+                                .map("'%s'"::formatted)
+                                .collect(joining(",", "(", ")")),
+                // TODO introduce materialized views in CountingMockConnector
+                "VALUES (0, 0, 0, 0)",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.getMaterializedViews(schema=test_schema1)")
+                        .add("ConnectorMetadata.getMaterializedViews(schema=test_schema2)")
+                        .addAll(IntStream.range(1, MAX_PREFIXES_COUNT + 1)
+                                .mapToObj("ConnectorMetadata.getMaterializedViews(schema=bogus_schema%s)"::formatted)
+                                .toList())
+                        .build());
+
+        // Small LIMIT
+        assertMetadataCalls(
+                "SELECT count(*) FROM (SELECT * FROM system.metadata.materialized_views WHERE catalog_name = 'test_catalog' LIMIT 1)",
+                // TODO introduce materialized views in CountingMockConnector
+                "VALUES 0",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.getMaterializedViews")
+                        .build());
+
+        // Big LIMIT
+        assertMetadataCalls(
+                "SELECT count(*) FROM (SELECT * FROM system.metadata.materialized_views WHERE catalog_name = 'test_catalog' LIMIT 1000)",
+                // TODO introduce thousands of materialized views in CountingMockConnector
+                "VALUES 0",
+                ImmutableMultiset.<String>builder()
+                        .add("ConnectorMetadata.getMaterializedViews")
+                        .build());
+
+        // Non-existent catalog
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.materialized_views WHERE catalog_name = 'wrong'",
+                "SELECT '' WHERE false",
+                ImmutableMultiset.of());
+
+        // Empty catalog name
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.materialized_views WHERE catalog_name = ''",
+                "SELECT '' WHERE false",
+                ImmutableMultiset.of());
+
+        // Empty table schema and table name
+        assertMetadataCalls(
+                "SELECT comment FROM system.metadata.materialized_views WHERE schema_name = '' AND name = ''",
+                "SELECT '' WHERE false",
+                ImmutableMultiset.of());
+
+        // Empty table schema
+        assertMetadataCalls(
+                "SELECT count(comment) FROM system.metadata.materialized_views WHERE schema_name = ''",
+                "VALUES 0",
+                ImmutableMultiset.of());
+
+        // Empty table name
+        assertMetadataCalls(
+                "SELECT count(comment) FROM system.metadata.materialized_views WHERE name = ''",
+                "VALUES 0",
+                ImmutableMultiset.of());
+    }
+
+    @Test
+    public void testMetadataListingExceptionHandling()
+    {
+        // TODO this should probably gracefully continue when some catalog is "broken" (does not currently work, e.g. is offline)
+        assertQueryFails(
+                "SELECT * FROM system.metadata.table_comments",
+                "Catalog is broken");
+
+        // TODO this should probably gracefully continue when some catalog is "broken" (does not currently work, e.g. is offline)
+        assertQueryFails(
+                "SELECT * FROM system.metadata.materialized_views",
+                "Error listing materialized views for catalog broken_catalog: Catalog is broken");
+    }
+
+    private void assertMetadataCalls(@Language("SQL") String actualSql, @Language("SQL") String expectedSql, Multiset<String> expectedMetadataCallsCount)
+    {
+        Multiset<String> actualMetadataCallsCount = countingMockConnector.runTracing(() -> {
+            // expectedSql is run on H2, so does not affect counts.
+            assertQuery(actualSql, expectedSql);
+        });
+
+        actualMetadataCallsCount = actualMetadataCallsCount.stream()
+                // Every query involves beginQuery and cleanupQuery, so ignore them.
+                .filter(method -> !"ConnectorMetadata.beginQuery".equals(method) && !"ConnectorMetadata.cleanupQuery".equals(method))
+                .collect(toImmutableMultiset());
+
+        assertMultisetsEqual(actualMetadataCallsCount, expectedMetadataCallsCount);
+    }
+}
diff --git a/testing/trino-tests/src/test/java/io/trino/connector/system/runtime/TestKillQuery.java b/testing/trino-tests/src/test/java/io/trino/connector/system/runtime/TestKillQuery.java
index 0998b23e52b7..0bd75bd08db0 100644
--- a/testing/trino-tests/src/test/java/io/trino/connector/system/runtime/TestKillQuery.java
+++ b/testing/trino-tests/src/test/java/io/trino/connector/system/runtime/TestKillQuery.java
@@ -19,8 +19,12 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import io.trino.testng.services.ManageTestResources;
+import io.trino.testng.services.ReportOrphanedExecutors;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
@@ -39,12 +43,15 @@
 import static java.lang.String.format;
 import static java.util.UUID.randomUUID;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertFalse;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestKillQuery
         extends AbstractTestQueryFramework
 {
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
+    @ReportOrphanedExecutors.Suppress(because = "Not a TestNG test class")
     private final ExecutorService executor = Executors.newSingleThreadScheduledExecutor(threadsNamed(TestKillQuery.class.getSimpleName()));
 
     @Override
@@ -62,13 +69,14 @@ protected QueryRunner createQueryRunner()
         return queryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         executor.shutdownNow();
     }
 
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testKillQuery()
     {
         killQuery(queryId -> format("CALL system.runtime.kill_query('%s', 'because')", queryId), "Message: because");
diff --git a/testing/trino-tests/src/test/java/io/trino/connector/system/runtime/TestSystemConnector.java b/testing/trino-tests/src/test/java/io/trino/connector/system/runtime/TestSystemConnector.java
deleted file mode 100644
index 072dcad5d55f..000000000000
--- a/testing/trino-tests/src/test/java/io/trino/connector/system/runtime/TestSystemConnector.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Licensed 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 io.trino.connector.system.runtime;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.util.concurrent.SettableFuture;
-import io.airlift.units.Duration;
-import io.trino.Session;
-import io.trino.connector.MockConnectorFactory;
-import io.trino.spi.Plugin;
-import io.trino.spi.connector.ColumnMetadata;
-import io.trino.spi.connector.ConnectorFactory;
-import io.trino.spi.connector.SchemaTableName;
-import io.trino.testing.AbstractTestQueryFramework;
-import io.trino.testing.DistributedQueryRunner;
-import io.trino.testing.MaterializedResult;
-import io.trino.testing.MaterializedRow;
-import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import java.time.ZonedDateTime;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Function;
-
-import static com.google.common.collect.MoreCollectors.toOptional;
-import static io.airlift.concurrent.Threads.threadsNamed;
-import static io.trino.spi.type.BigintType.BIGINT;
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.testing.TestingSession.testSessionBuilder;
-import static io.trino.testing.assertions.Assert.assertEventually;
-import static java.lang.String.format;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-@Test(singleThreaded = true)
-public class TestSystemConnector
-        extends AbstractTestQueryFramework
-{
-    private static final Function<SchemaTableName, List<ColumnMetadata>> DEFAULT_GET_COLUMNS = table -> ImmutableList.of(new ColumnMetadata("c", VARCHAR));
-    private static final AtomicLong counter = new AtomicLong();
-
-    private static Function<SchemaTableName, List<ColumnMetadata>> getColumns = DEFAULT_GET_COLUMNS;
-
-    private final ExecutorService executor = Executors.newSingleThreadScheduledExecutor(threadsNamed(TestSystemConnector.class.getSimpleName()));
-
-    @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        Session defaultSession = testSessionBuilder()
-                .setCatalog("mock")
-                .setSchema("default")
-                .build();
-
-        DistributedQueryRunner queryRunner = DistributedQueryRunner
-                .builder(defaultSession)
-                .enableBackupCoordinator()
-                .build();
-        queryRunner.installPlugin(new Plugin()
-        {
-            @Override
-            public Iterable<ConnectorFactory> getConnectorFactories()
-            {
-                MockConnectorFactory connectorFactory = MockConnectorFactory.builder()
-                        .withGetViews((session, schemaTablePrefix) -> ImmutableMap.of())
-                        .withListTables((session, s) -> ImmutableList.of("test_table"))
-                        .withGetColumns(tableName -> getColumns.apply(tableName))
-                        .build();
-                return ImmutableList.of(connectorFactory);
-            }
-        });
-        queryRunner.createCatalog("mock", "mock", ImmutableMap.of());
-        return queryRunner;
-    }
-
-    @BeforeMethod
-    public void cleanup()
-    {
-        getColumns = DEFAULT_GET_COLUMNS;
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-    {
-        executor.shutdownNow();
-    }
-
-    @Test
-    public void testRuntimeNodes()
-    {
-        assertQuery(
-                "SELECT node_version, coordinator, state FROM system.runtime.nodes",
-                "VALUES " +
-                        "('testversion', true, 'active')," +
-                        "('testversion', true, 'active')," + // backup coordinator
-                        "('testversion', false, 'active')");
-    }
-
-    // Test is run multiple times because it is vulnerable to OS clock adjustment. See https://github.com/trinodb/trino/issues/5608
-    @Test(invocationCount = 10, successPercentage = 80)
-    public void testRuntimeQueriesTimestamps()
-    {
-        ZonedDateTime timeBefore = ZonedDateTime.now();
-        computeActual("SELECT 1");
-        MaterializedResult result = computeActual("" +
-                "SELECT max(created), max(started), max(last_heartbeat), max(\"end\") " +
-                "FROM system.runtime.queries");
-        ZonedDateTime timeAfter = ZonedDateTime.now();
-
-        MaterializedRow row = Iterables.getOnlyElement(result.toTestTypes().getMaterializedRows());
-        List<Object> fields = row.getFields();
-        assertThat(fields).hasSize(4);
-        for (int i = 0; i < fields.size(); i++) {
-            Object value = fields.get(i);
-            assertThat((ZonedDateTime) value)
-                    .as("value for field " + i)
-                    .isNotNull()
-                    .isAfterOrEqualTo(timeBefore)
-                    .isBeforeOrEqualTo(timeAfter);
-        }
-    }
-
-    // Test is run multiple times because it is vulnerable to OS clock adjustment. See https://github.com/trinodb/trino/issues/5608
-    @Test(invocationCount = 10, successPercentage = 80)
-    public void testRuntimeTasksTimestamps()
-    {
-        ZonedDateTime timeBefore = ZonedDateTime.now();
-        computeActual("SELECT 1");
-        MaterializedResult result = computeActual("" +
-                "SELECT max(created), max(start), max(last_heartbeat), max(\"end\") " +
-                "FROM system.runtime.tasks");
-        ZonedDateTime timeAfter = ZonedDateTime.now();
-
-        MaterializedRow row = Iterables.getOnlyElement(result.toTestTypes().getMaterializedRows());
-        List<Object> fields = row.getFields();
-        assertThat(fields).hasSize(4);
-        for (int i = 0; i < fields.size(); i++) {
-            Object value = fields.get(i);
-            assertThat((ZonedDateTime) value)
-                    .as("value for field " + i)
-                    .isNotNull()
-                    .isAfterOrEqualTo(timeBefore)
-                    .isBeforeOrEqualTo(timeAfter);
-        }
-    }
-
-    // Test is run multiple times because it is vulnerable to OS clock adjustment. See https://github.com/trinodb/trino/issues/5608
-    @Test(invocationCount = 10, successPercentage = 80)
-    public void testRuntimeTransactionsTimestamps()
-    {
-        ZonedDateTime timeBefore = ZonedDateTime.now();
-        computeActual("START TRANSACTION");
-        MaterializedResult result = computeActual("" +
-                "SELECT max(create_time) " +
-                "FROM system.runtime.transactions");
-        ZonedDateTime timeAfter = ZonedDateTime.now();
-
-        MaterializedRow row = Iterables.getOnlyElement(result.toTestTypes().getMaterializedRows());
-        List<Object> fields = row.getFields();
-        assertThat(fields).hasSize(1);
-        for (int i = 0; i < fields.size(); i++) {
-            Object value = fields.get(i);
-            assertThat((ZonedDateTime) value)
-                    .as("value for field " + i)
-                    .isNotNull()
-                    .isAfterOrEqualTo(timeBefore)
-                    .isBeforeOrEqualTo(timeAfter);
-        }
-    }
-
-    @Test
-    public void testFinishedQueryIsCaptured()
-    {
-        String testQueryId = "test_query_id_" + counter.incrementAndGet();
-        getQueryRunner().execute(format("EXPLAIN SELECT 1 AS %s FROM test_table", testQueryId));
-
-        assertQuery(
-                format("SELECT state FROM system.runtime.queries WHERE query LIKE '%%%s%%' AND query NOT LIKE '%%system.runtime.queries%%'", testQueryId),
-                "VALUES 'FINISHED'");
-    }
-
-    @Test(timeOut = 60_000)
-    public void testQueryDuringAnalysisIsCaptured()
-    {
-        SettableFuture<List<ColumnMetadata>> metadataFuture = SettableFuture.create();
-        getColumns = schemaTableName -> {
-            try {
-                return metadataFuture.get();
-            }
-            catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        };
-        String testQueryId = "test_query_id_" + counter.incrementAndGet();
-        Future<?> queryFuture = executor.submit(() -> {
-            getQueryRunner().execute(format("EXPLAIN SELECT 1 AS %s FROM test_table", testQueryId));
-        });
-
-        assertQueryEventually(
-                getSession(),
-                format("SELECT state FROM system.runtime.queries WHERE query LIKE '%%%s%%' AND query NOT LIKE '%%system.runtime.queries%%'", testQueryId),
-                "VALUES 'WAITING_FOR_RESOURCES'",
-                new Duration(10, SECONDS));
-        assertFalse(metadataFuture.isDone());
-        assertFalse(queryFuture.isDone());
-
-        metadataFuture.set(ImmutableList.of(new ColumnMetadata("a", BIGINT)));
-
-        assertQueryEventually(
-                getSession(),
-                format("SELECT state FROM system.runtime.queries WHERE query LIKE '%%%s%%' AND query NOT LIKE '%%system.runtime.queries%%'", testQueryId),
-                "VALUES 'FINISHED'",
-                new Duration(10, SECONDS));
-        // Client should receive query result immediately afterwards
-        assertEventually(new Duration(5, SECONDS), () -> assertTrue(queryFuture.isDone()));
-    }
-
-    @Test(timeOut = 60_000)
-    public void testQueryKillingDuringAnalysis()
-    {
-        SettableFuture<List<ColumnMetadata>> metadataFuture = SettableFuture.create();
-        getColumns = schemaTableName -> {
-            try {
-                return metadataFuture.get();
-            }
-            catch (InterruptedException e) {
-                metadataFuture.cancel(true);
-                Thread.currentThread().interrupt();
-                throw new RuntimeException(e);
-            }
-            catch (ExecutionException e) {
-                throw new RuntimeException(e);
-            }
-        };
-        String testQueryId = "test_query_id_" + counter.incrementAndGet();
-        Future<?> queryFuture = executor.submit(() -> {
-            getQueryRunner().execute(format("EXPLAIN SELECT 1 AS %s FROM test_table", testQueryId));
-        });
-
-        // Wait for query to start
-        assertQueryEventually(
-                getSession(),
-                format("SELECT count(*) FROM system.runtime.queries WHERE query LIKE '%%%s%%' AND query NOT LIKE '%%system.runtime.queries%%'", testQueryId),
-                "VALUES 1",
-                new Duration(5, SECONDS));
-
-        Optional<Object> queryId = computeActual(format("SELECT query_id FROM system.runtime.queries WHERE query LIKE '%%%s%%' AND query NOT LIKE '%%system.runtime.queries%%'", testQueryId))
-                .getOnlyColumn()
-                .collect(toOptional());
-        assertFalse(metadataFuture.isDone());
-        assertFalse(queryFuture.isDone());
-        assertTrue(queryId.isPresent());
-
-        getQueryRunner().execute(format("CALL system.runtime.kill_query('%s', 'because')", queryId.get()));
-        // Cancellation should happen within kill_query, but it still needs to be propagated to the thread performing analysis.
-        assertEventually(new Duration(5, SECONDS), () -> assertTrue(metadataFuture.isCancelled()));
-        // Client should receive query result (failure) immediately afterwards
-        assertEventually(new Duration(5, SECONDS), () -> assertTrue(queryFuture.isDone()));
-    }
-
-    @Test
-    public void testTasksTable()
-    {
-        getQueryRunner().execute("SELECT 1");
-        getQueryRunner().execute("SELECT * FROM system.runtime.tasks");
-    }
-}
diff --git a/testing/trino-tests/src/test/java/io/trino/connector/system/runtime/TestSystemRuntimeConnector.java b/testing/trino-tests/src/test/java/io/trino/connector/system/runtime/TestSystemRuntimeConnector.java
new file mode 100644
index 000000000000..cc69d5b4b78c
--- /dev/null
+++ b/testing/trino-tests/src/test/java/io/trino/connector/system/runtime/TestSystemRuntimeConnector.java
@@ -0,0 +1,290 @@
+/*
+ * Licensed 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 io.trino.connector.system.runtime;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.google.common.util.concurrent.SettableFuture;
+import io.airlift.units.Duration;
+import io.trino.Session;
+import io.trino.connector.MockConnectorFactory;
+import io.trino.spi.Plugin;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.ConnectorFactory;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.MaterializedResult;
+import io.trino.testing.MaterializedRow;
+import io.trino.testing.QueryRunner;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+
+import static com.google.common.collect.MoreCollectors.toOptional;
+import static io.airlift.concurrent.Threads.threadsNamed;
+import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static io.trino.testing.assertions.Assert.assertEventually;
+import static java.lang.String.format;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+@Test(singleThreaded = true)
+public class TestSystemRuntimeConnector
+        extends AbstractTestQueryFramework
+{
+    private static final Function<SchemaTableName, List<ColumnMetadata>> DEFAULT_GET_COLUMNS = table -> ImmutableList.of(new ColumnMetadata("c", VARCHAR));
+    private static final AtomicLong counter = new AtomicLong();
+
+    private static Function<SchemaTableName, List<ColumnMetadata>> getColumns = DEFAULT_GET_COLUMNS;
+
+    private final ExecutorService executor = Executors.newSingleThreadScheduledExecutor(threadsNamed(TestSystemRuntimeConnector.class.getSimpleName()));
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        Session defaultSession = testSessionBuilder()
+                .setCatalog("mock")
+                .setSchema("default")
+                .build();
+
+        DistributedQueryRunner queryRunner = DistributedQueryRunner
+                .builder(defaultSession)
+                .enableBackupCoordinator()
+                .build();
+        queryRunner.installPlugin(new Plugin()
+        {
+            @Override
+            public Iterable<ConnectorFactory> getConnectorFactories()
+            {
+                MockConnectorFactory connectorFactory = MockConnectorFactory.builder()
+                        .withGetViews((session, schemaTablePrefix) -> ImmutableMap.of())
+                        .withListTables((session, s) -> ImmutableList.of("test_table"))
+                        .withGetColumns(tableName -> getColumns.apply(tableName))
+                        .build();
+                return ImmutableList.of(connectorFactory);
+            }
+        });
+        queryRunner.createCatalog("mock", "mock", ImmutableMap.of());
+        return queryRunner;
+    }
+
+    @BeforeMethod
+    public void cleanup()
+    {
+        getColumns = DEFAULT_GET_COLUMNS;
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void tearDown()
+    {
+        executor.shutdownNow();
+    }
+
+    @Test
+    public void testRuntimeNodes()
+    {
+        assertQuery(
+                "SELECT node_version, coordinator, state FROM system.runtime.nodes",
+                "VALUES " +
+                        "('testversion', true, 'active')," +
+                        "('testversion', true, 'active')," + // backup coordinator
+                        "('testversion', false, 'active')");
+    }
+
+    // Test is run multiple times because it is vulnerable to OS clock adjustment. See https://github.com/trinodb/trino/issues/5608
+    @Test(invocationCount = 10, successPercentage = 80)
+    public void testRuntimeQueriesTimestamps()
+    {
+        ZonedDateTime timeBefore = ZonedDateTime.now();
+        computeActual("SELECT 1");
+        MaterializedResult result = computeActual("" +
+                "SELECT max(created), max(started), max(last_heartbeat), max(\"end\") " +
+                "FROM system.runtime.queries");
+        ZonedDateTime timeAfter = ZonedDateTime.now();
+
+        MaterializedRow row = Iterables.getOnlyElement(result.toTestTypes().getMaterializedRows());
+        List<Object> fields = row.getFields();
+        assertThat(fields).hasSize(4);
+        for (int i = 0; i < fields.size(); i++) {
+            Object value = fields.get(i);
+            assertThat((ZonedDateTime) value)
+                    .as("value for field " + i)
+                    .isNotNull()
+                    .isAfterOrEqualTo(timeBefore)
+                    .isBeforeOrEqualTo(timeAfter);
+        }
+    }
+
+    // Test is run multiple times because it is vulnerable to OS clock adjustment. See https://github.com/trinodb/trino/issues/5608
+    @Test(invocationCount = 10, successPercentage = 80)
+    public void testRuntimeTasksTimestamps()
+    {
+        ZonedDateTime timeBefore = ZonedDateTime.now();
+        computeActual("SELECT 1");
+        MaterializedResult result = computeActual("" +
+                "SELECT max(created), max(start), max(last_heartbeat), max(\"end\") " +
+                "FROM system.runtime.tasks");
+        ZonedDateTime timeAfter = ZonedDateTime.now();
+
+        MaterializedRow row = Iterables.getOnlyElement(result.toTestTypes().getMaterializedRows());
+        List<Object> fields = row.getFields();
+        assertThat(fields).hasSize(4);
+        for (int i = 0; i < fields.size(); i++) {
+            Object value = fields.get(i);
+            assertThat((ZonedDateTime) value)
+                    .as("value for field " + i)
+                    .isNotNull()
+                    .isAfterOrEqualTo(timeBefore)
+                    .isBeforeOrEqualTo(timeAfter);
+        }
+    }
+
+    // Test is run multiple times because it is vulnerable to OS clock adjustment. See https://github.com/trinodb/trino/issues/5608
+    @Test(invocationCount = 10, successPercentage = 80)
+    public void testRuntimeTransactionsTimestamps()
+    {
+        ZonedDateTime timeBefore = ZonedDateTime.now();
+        computeActual("START TRANSACTION");
+        MaterializedResult result = computeActual("" +
+                "SELECT max(create_time) " +
+                "FROM system.runtime.transactions");
+        ZonedDateTime timeAfter = ZonedDateTime.now();
+
+        MaterializedRow row = Iterables.getOnlyElement(result.toTestTypes().getMaterializedRows());
+        List<Object> fields = row.getFields();
+        assertThat(fields).hasSize(1);
+        for (int i = 0; i < fields.size(); i++) {
+            Object value = fields.get(i);
+            assertThat((ZonedDateTime) value)
+                    .as("value for field " + i)
+                    .isNotNull()
+                    .isAfterOrEqualTo(timeBefore)
+                    .isBeforeOrEqualTo(timeAfter);
+        }
+    }
+
+    @Test
+    public void testFinishedQueryIsCaptured()
+    {
+        String testQueryId = "test_query_id_" + counter.incrementAndGet();
+        getQueryRunner().execute(format("EXPLAIN SELECT 1 AS %s FROM test_table", testQueryId));
+
+        assertQuery(
+                format("SELECT state FROM system.runtime.queries WHERE query LIKE '%%%s%%' AND query NOT LIKE '%%system.runtime.queries%%'", testQueryId),
+                "VALUES 'FINISHED'");
+    }
+
+    @Test(timeOut = 60_000)
+    public void testQueryDuringAnalysisIsCaptured()
+    {
+        SettableFuture<List<ColumnMetadata>> metadataFuture = SettableFuture.create();
+        getColumns = schemaTableName -> {
+            try {
+                return metadataFuture.get();
+            }
+            catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        };
+        String testQueryId = "test_query_id_" + counter.incrementAndGet();
+        Future<?> queryFuture = executor.submit(() -> {
+            getQueryRunner().execute(format("EXPLAIN SELECT 1 AS %s FROM test_table", testQueryId));
+        });
+
+        assertQueryEventually(
+                getSession(),
+                format("SELECT state FROM system.runtime.queries WHERE query LIKE '%%%s%%' AND query NOT LIKE '%%system.runtime.queries%%'", testQueryId),
+                "VALUES 'WAITING_FOR_RESOURCES'",
+                new Duration(10, SECONDS));
+        assertFalse(metadataFuture.isDone());
+        assertFalse(queryFuture.isDone());
+
+        metadataFuture.set(ImmutableList.of(new ColumnMetadata("a", BIGINT)));
+
+        assertQueryEventually(
+                getSession(),
+                format("SELECT state FROM system.runtime.queries WHERE query LIKE '%%%s%%' AND query NOT LIKE '%%system.runtime.queries%%'", testQueryId),
+                "VALUES 'FINISHED'",
+                new Duration(10, SECONDS));
+        // Client should receive query result immediately afterwards
+        assertEventually(new Duration(5, SECONDS), () -> assertTrue(queryFuture.isDone()));
+    }
+
+    @Test(timeOut = 60_000)
+    public void testQueryKillingDuringAnalysis()
+    {
+        SettableFuture<List<ColumnMetadata>> metadataFuture = SettableFuture.create();
+        getColumns = schemaTableName -> {
+            try {
+                return metadataFuture.get();
+            }
+            catch (InterruptedException e) {
+                metadataFuture.cancel(true);
+                Thread.currentThread().interrupt();
+                throw new RuntimeException(e);
+            }
+            catch (ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        };
+        String testQueryId = "test_query_id_" + counter.incrementAndGet();
+        Future<?> queryFuture = executor.submit(() -> {
+            getQueryRunner().execute(format("EXPLAIN SELECT 1 AS %s FROM test_table", testQueryId));
+        });
+
+        // Wait for query to start
+        assertQueryEventually(
+                getSession(),
+                format("SELECT count(*) FROM system.runtime.queries WHERE query LIKE '%%%s%%' AND query NOT LIKE '%%system.runtime.queries%%'", testQueryId),
+                "VALUES 1",
+                new Duration(5, SECONDS));
+
+        Optional<Object> queryId = computeActual(format("SELECT query_id FROM system.runtime.queries WHERE query LIKE '%%%s%%' AND query NOT LIKE '%%system.runtime.queries%%'", testQueryId))
+                .getOnlyColumn()
+                .collect(toOptional());
+        assertFalse(metadataFuture.isDone());
+        assertFalse(queryFuture.isDone());
+        assertTrue(queryId.isPresent());
+
+        getQueryRunner().execute(format("CALL system.runtime.kill_query('%s', 'because')", queryId.get()));
+        // Cancellation should happen within kill_query, but it still needs to be propagated to the thread performing analysis.
+        assertEventually(new Duration(5, SECONDS), () -> assertTrue(metadataFuture.isCancelled()));
+        // Client should receive query result (failure) immediately afterwards
+        assertEventually(new Duration(5, SECONDS), () -> assertTrue(queryFuture.isDone()));
+    }
+
+    @Test
+    public void testTasksTable()
+    {
+        getQueryRunner().execute("SELECT 1");
+        getQueryRunner().execute("SELECT * FROM system.runtime.tasks");
+    }
+}
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/AbstractTestCoordinatorDynamicFiltering.java b/testing/trino-tests/src/test/java/io/trino/execution/AbstractTestCoordinatorDynamicFiltering.java
index bc6163caa303..ee313e8f525a 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/AbstractTestCoordinatorDynamicFiltering.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/AbstractTestCoordinatorDynamicFiltering.java
@@ -104,7 +104,7 @@ public abstract class AbstractTestCoordinatorDynamicFiltering
     public void setup()
     {
         // create lineitem table in test connector
-        getQueryRunner().installPlugin(new TestPlugin(getRetryPolicy() == RetryPolicy.TASK));
+        getQueryRunner().installPlugin(new TestingPlugin(getRetryPolicy() == RetryPolicy.TASK));
         getQueryRunner().installPlugin(new TpchPlugin());
         getQueryRunner().installPlugin(new TpcdsPlugin());
         getQueryRunner().installPlugin(new MemoryPlugin());
@@ -425,12 +425,12 @@ protected void assertQueryDynamicFilters(
         computeActual(session, query);
     }
 
-    private class TestPlugin
+    private class TestingPlugin
             implements Plugin
     {
         private final boolean isTaskRetryMode;
 
-        public TestPlugin(boolean isTaskRetryMode)
+        public TestingPlugin(boolean isTaskRetryMode)
         {
             this.isTaskRetryMode = isTaskRetryMode;
         }
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/EventsCollector.java b/testing/trino-tests/src/test/java/io/trino/execution/EventsCollector.java
index 1eb1f553202a..bda5aaf11920 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/EventsCollector.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/EventsCollector.java
@@ -14,15 +14,14 @@
 package io.trino.execution;
 
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.ThreadSafe;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.units.Duration;
 import io.trino.spi.QueryId;
 import io.trino.spi.eventlistener.QueryCompletedEvent;
 import io.trino.spi.eventlistener.QueryCreatedEvent;
 import io.trino.spi.eventlistener.SplitCompletedEvent;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/QueryRunnerUtil.java b/testing/trino-tests/src/test/java/io/trino/execution/QueryRunnerUtil.java
index 87ddb86786a3..ca1786c26a67 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/QueryRunnerUtil.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/QueryRunnerUtil.java
@@ -14,6 +14,7 @@
 package io.trino.execution;
 
 import com.google.common.collect.ImmutableSet;
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.dispatcher.DispatchManager;
 import io.trino.server.BasicQueryInfo;
@@ -35,7 +36,7 @@ private QueryRunnerUtil() {}
     public static QueryId createQuery(DistributedQueryRunner queryRunner, Session session, String sql)
     {
         DispatchManager dispatchManager = queryRunner.getCoordinator().getDispatchManager();
-        getFutureValue(dispatchManager.createQuery(session.getQueryId(), Slug.createNew(), TestingSessionContext.fromSession(session), sql));
+        getFutureValue(dispatchManager.createQuery(session.getQueryId(), Span.getInvalid(), Slug.createNew(), TestingSessionContext.fromSession(session), sql));
         return session.getQueryId();
     }
 
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestBeginQuery.java b/testing/trino-tests/src/test/java/io/trino/execution/TestBeginQuery.java
index 7b657e5fdadb..8ddc1b5df3ad 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestBeginQuery.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestBeginQuery.java
@@ -41,10 +41,7 @@
 import io.trino.testing.TestingPageSinkProvider;
 import io.trino.testing.TestingSplitManager;
 import io.trino.testing.TestingTransactionHandle;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -54,11 +51,10 @@
 import static java.util.Objects.requireNonNull;
 import static org.testng.Assert.assertEquals;
 
-@Test(singleThreaded = true)
 public class TestBeginQuery
         extends AbstractTestQueryFramework
 {
-    private TestMetadata metadata;
+    private final TestMetadata metadata = new TestMetadata();
 
     @Override
     protected QueryRunner createQueryRunner()
@@ -68,45 +64,30 @@ protected QueryRunner createQueryRunner()
                 .setCatalog("test")
                 .setSchema("default")
                 .build();
-        return DistributedQueryRunner.builder(session).build();
-    }
-
-    @BeforeClass
-    public void setUp()
-    {
-        metadata = new TestMetadata();
-        getQueryRunner().installPlugin(new TestPlugin(metadata));
-        getQueryRunner().installPlugin(new TpchPlugin());
-        getQueryRunner().createCatalog("test", "test", ImmutableMap.of());
-        getQueryRunner().createCatalog("tpch", "tpch", ImmutableMap.of());
-    }
-
-    @AfterMethod(alwaysRun = true)
-    public void afterMethod()
-    {
-        if (metadata != null) {
-            metadata.clear();
-        }
-    }
 
-    @AfterClass(alwaysRun = true)
-    public void tearDown()
-    {
-        if (metadata != null) {
-            metadata.clear();
-            metadata = null;
-        }
+        return DistributedQueryRunner.builder(session)
+                .setAdditionalSetup(runner -> {
+                    runner.installPlugin(new TestingPlugin(metadata));
+                    runner.installPlugin(new TpchPlugin());
+                    runner.createCatalog("test", "test", ImmutableMap.of());
+                    runner.createCatalog("tpch", "tpch", ImmutableMap.of());
+                })
+                .build();
     }
 
     @Test
     public void testCreateTableAsSelect()
     {
+        metadata.clear();
+
         assertBeginQuery("CREATE TABLE nation AS SELECT * FROM tpch.tiny.nation");
     }
 
     @Test
     public void testCreateTableAsSelectSameConnector()
     {
+        metadata.clear();
+
         assertBeginQuery("CREATE TABLE nation AS SELECT * FROM tpch.tiny.nation");
         assertBeginQuery("CREATE TABLE nation_copy AS SELECT * FROM nation");
     }
@@ -114,6 +95,8 @@ public void testCreateTableAsSelectSameConnector()
     @Test
     public void testInsert()
     {
+        metadata.clear();
+
         assertBeginQuery("CREATE TABLE nation AS SELECT * FROM tpch.tiny.nation");
         assertBeginQuery("INSERT INTO nation SELECT * FROM tpch.tiny.nation");
         assertBeginQuery("INSERT INTO nation VALUES (12345, 'name', 54321, 'comment')");
@@ -122,6 +105,8 @@ public void testInsert()
     @Test
     public void testInsertSelectSameConnector()
     {
+        metadata.clear();
+
         assertBeginQuery("CREATE TABLE nation AS SELECT * FROM tpch.tiny.nation");
         assertBeginQuery("INSERT INTO nation SELECT * FROM nation");
     }
@@ -129,6 +114,8 @@ public void testInsertSelectSameConnector()
     @Test
     public void testSelect()
     {
+        metadata.clear();
+
         assertBeginQuery("CREATE TABLE nation AS SELECT * FROM tpch.tiny.nation");
         assertBeginQuery("SELECT * FROM nation");
     }
@@ -142,12 +129,12 @@ private void assertBeginQuery(String query)
         metadata.resetCounters();
     }
 
-    private static class TestPlugin
+    private static class TestingPlugin
             implements Plugin
     {
         private final TestMetadata metadata;
 
-        private TestPlugin(TestMetadata metadata)
+        private TestingPlugin(TestMetadata metadata)
         {
             this.metadata = requireNonNull(metadata, "metadata is null");
         }
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestCompletedEventWarnings.java b/testing/trino-tests/src/test/java/io/trino/execution/TestCompletedEventWarnings.java
index 3c6e4e2e5f6e..356645ff703d 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestCompletedEventWarnings.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestCompletedEventWarnings.java
@@ -24,9 +24,10 @@
 import io.trino.testing.TestingWarningCollector;
 import io.trino.testing.TestingWarningCollectorConfig;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.util.List;
@@ -35,9 +36,10 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.SessionTestUtils.TEST_SESSION;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.fail;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestCompletedEventWarnings
 {
     private static final int TEST_WARNINGS = 5;
@@ -47,7 +49,7 @@ public class TestCompletedEventWarnings
     private Closer closer;
     private EventsAwaitingQueries queries;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -61,7 +63,7 @@ public void setUp()
         queries = new EventsAwaitingQueries(generatedEvents, queryRunner);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws IOException
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestConnectorEventListener.java b/testing/trino-tests/src/test/java/io/trino/execution/TestConnectorEventListener.java
index a54b7f18a464..13b0022c4996 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestConnectorEventListener.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestConnectorEventListener.java
@@ -19,14 +19,17 @@
 import io.trino.spi.Plugin;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestConnectorEventListener
 {
     private final EventsCollector generatedEvents = new EventsCollector();
@@ -34,7 +37,7 @@ public class TestConnectorEventListener
     private Closer closer;
     private EventsAwaitingQueries queries;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -58,7 +61,7 @@ public Iterable<ConnectorFactory> getConnectorFactories()
         queries = new EventsAwaitingQueries(generatedEvents, queryRunner);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws IOException
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestCoordinatorDynamicFiltering.java b/testing/trino-tests/src/test/java/io/trino/execution/TestCoordinatorDynamicFiltering.java
index ee627862dedf..1a52a4fe8fc9 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestCoordinatorDynamicFiltering.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestCoordinatorDynamicFiltering.java
@@ -34,7 +34,7 @@ protected QueryRunner createQueryRunner()
                         "retry-policy", getRetryPolicy().name(),
                         // keep limits lower to test edge cases
                         "dynamic-filtering.small-partitioned.max-distinct-values-per-driver", "10",
-                        "dynamic-filtering.small-broadcast.max-distinct-values-per-driver", "10"))
+                        "dynamic-filtering.small.max-distinct-values-per-driver", "10"))
                 .build();
     }
 
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestDeprecatedFunctionWarning.java b/testing/trino-tests/src/test/java/io/trino/execution/TestDeprecatedFunctionWarning.java
index 9994780ec88e..e0fc5b0e985c 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestDeprecatedFunctionWarning.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestDeprecatedFunctionWarning.java
@@ -35,9 +35,10 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Set;
@@ -45,8 +46,10 @@
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.fail;
 
+@TestInstance(PER_CLASS)
 public class TestDeprecatedFunctionWarning
 {
     private static final WarningCode DEPRECATED_FUNCTION_WARNING_CODE = StandardWarningCode.DEPRECATED_FUNCTION.toWarningCode();
@@ -54,7 +57,7 @@ public class TestDeprecatedFunctionWarning
 
     private QueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -71,7 +74,7 @@ public void setUp()
         queryRunner.installPlugin(new DeprecatedFunctionsPlugin());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestErrorThrowableInQuery.java b/testing/trino-tests/src/test/java/io/trino/execution/TestErrorThrowableInQuery.java
index 1832a1717583..7d5db6e258da 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestErrorThrowableInQuery.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestErrorThrowableInQuery.java
@@ -27,7 +27,7 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.spi.StandardErrorCode.NOT_FOUND;
 import static io.trino.spi.type.BigintType.BIGINT;
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestEventListenerBasic.java b/testing/trino-tests/src/test/java/io/trino/execution/TestEventListenerBasic.java
index 886e49d9ec53..d968cb2ffe45 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestEventListenerBasic.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestEventListenerBasic.java
@@ -157,7 +157,8 @@ public Iterable<ConnectorFactory> getConnectorFactories()
                                     ImmutableList.of(new ConnectorViewDefinition.ViewColumn("test_column", BIGINT.getTypeId(), Optional.empty())),
                                     Optional.empty(),
                                     Optional.empty(),
-                                    true);
+                                    true,
+                                    ImmutableList.of());
                             SchemaTableName viewName = new SchemaTableName("default", "test_view");
                             return ImmutableMap.of(viewName, definition);
                         })
@@ -168,8 +169,10 @@ public Iterable<ConnectorFactory> getConnectorFactories()
                                     Optional.empty(),
                                     Optional.empty(),
                                     ImmutableList.of(new Column("test_column", BIGINT.getTypeId())),
+                                    Optional.of(Duration.ZERO),
                                     Optional.empty(),
                                     Optional.of("alice"),
+                                    ImmutableList.of(),
                                     ImmutableMap.of());
                             SchemaTableName materializedViewName = new SchemaTableName("default", "test_materialized_view");
                             return ImmutableMap.of(materializedViewName, definition);
@@ -188,13 +191,23 @@ public Iterable<ConnectorFactory> getConnectorFactories()
                         })
                         .withRowFilter(schemaTableName -> {
                             if (schemaTableName.getTableName().equals("test_table_with_row_filter")) {
-                                return new ViewExpression("user", Optional.of("tpch"), Optional.of("tiny"), "EXISTS (SELECT 1 FROM nation WHERE name = test_varchar)");
+                                return ViewExpression.builder()
+                                        .identity("user")
+                                        .catalog("tpch")
+                                        .schema("tiny")
+                                        .expression("EXISTS (SELECT 1 FROM nation WHERE name = test_varchar)")
+                                        .build();
                             }
                             return null;
                         })
                         .withColumnMask((schemaTableName, columnName) -> {
                             if (schemaTableName.getTableName().equals("test_table_with_column_mask") && columnName.equals("test_varchar")) {
-                                return new ViewExpression("user", Optional.of("tpch"), Optional.of("tiny"), "(SELECT cast(max(orderkey) AS varchar(15)) FROM orders)");
+                                return ViewExpression.builder()
+                                        .identity("user")
+                                        .catalog("tpch")
+                                        .schema("tiny")
+                                        .expression("(SELECT cast(max(orderkey) AS varchar(15)) FROM orders)")
+                                        .build();
                             }
                             return null;
                         })
@@ -238,7 +251,7 @@ public void testAnalysisFailure()
     public void testParseError()
             throws Exception
     {
-        assertFailedQuery("You shall not parse!", "line 1:1: mismatched input 'You'. Expecting: 'ALTER', 'ANALYZE', 'CALL', 'COMMENT', 'COMMIT', 'CREATE', 'DEALLOCATE', 'DELETE', 'DENY', 'DESC', 'DESCRIBE', 'DROP', 'EXECUTE', 'EXPLAIN', 'GRANT', 'INSERT', 'MERGE', 'PREPARE', 'REFRESH', 'RESET', 'REVOKE', 'ROLLBACK', 'SET', 'SHOW', 'START', 'TRUNCATE', 'UPDATE', 'USE', <query>");
+        assertFailedQuery("You shall not parse!", "line 1:1: mismatched input 'You'. Expecting: 'ALTER', 'ANALYZE', 'CALL', 'COMMENT', 'COMMIT', 'CREATE', 'DEALLOCATE', 'DELETE', 'DENY', 'DESC', 'DESCRIBE', 'DROP', 'EXECUTE', 'EXPLAIN', 'GRANT', 'INSERT', 'MERGE', 'PREPARE', 'REFRESH', 'RESET', 'REVOKE', 'ROLLBACK', 'SET', 'SHOW', 'START', 'TRUNCATE', 'UPDATE', 'USE', 'WITH', <query>");
     }
 
     @Test
@@ -1077,6 +1090,65 @@ public void testOutputColumnsForUpdatingSingleColumn()
                 .containsExactly(new OutputColumnMetadata("test_varchar", VARCHAR_TYPE, ImmutableSet.of()));
     }
 
+    @Test
+    public void testOutputColumnsForUpdatingColumnWithSelectQuery()
+            throws Exception
+    {
+        QueryEvents queryEvents = runQueryAndWaitForEvents("UPDATE mock.default.table_for_output SET test_varchar = (SELECT name from nation LIMIT 1)").getQueryEvents();
+        QueryCompletedEvent event = queryEvents.getQueryCompletedEvent();
+        assertThat(event.getIoMetadata().getOutput().get().getColumns().get())
+                .containsExactly(new OutputColumnMetadata("test_varchar", VARCHAR_TYPE, ImmutableSet.of(new ColumnDetail("tpch", "tiny", "nation", "name"))));
+    }
+
+    @Test
+    public void testOutputColumnsForUpdatingColumnWithSelectQueryWithAliasedField()
+            throws Exception
+    {
+        QueryEvents queryEvents = runQueryAndWaitForEvents("UPDATE mock.default.table_for_output SET test_varchar = (SELECT name AS aliased_name from nation LIMIT 1)").getQueryEvents();
+        QueryCompletedEvent event = queryEvents.getQueryCompletedEvent();
+        assertThat(event.getIoMetadata().getOutput().get().getColumns().get())
+                .containsExactly(new OutputColumnMetadata("test_varchar", VARCHAR_TYPE, ImmutableSet.of(new ColumnDetail("tpch", "tiny", "nation", "name"))));
+    }
+
+    @Test
+    public void testOutputColumnsForUpdatingColumnsWithSelectQueries()
+            throws Exception
+    {
+        QueryEvents queryEvents = runQueryAndWaitForEvents("""
+                UPDATE mock.default.table_for_output SET test_varchar = (SELECT name AS aliased_name from nation LIMIT 1), test_bigint = (SELECT nationkey FROM nation LIMIT 1)
+                """).getQueryEvents();
+        QueryCompletedEvent event = queryEvents.getQueryCompletedEvent();
+        assertThat(event.getIoMetadata().getOutput().get().getColumns().get())
+                .containsExactlyInAnyOrder(
+                        new OutputColumnMetadata("test_varchar", VARCHAR_TYPE, ImmutableSet.of(new ColumnDetail("tpch", "tiny", "nation", "name"))),
+                        new OutputColumnMetadata("test_bigint", BIGINT_TYPE, ImmutableSet.of(new ColumnDetail("tpch", "tiny", "nation", "nationkey"))));
+    }
+
+    @Test
+    public void testOutputColumnsForUpdatingColumnsWithSelectQueryAndRawValue()
+            throws Exception
+    {
+        QueryEvents queryEvents = runQueryAndWaitForEvents("""
+                UPDATE mock.default.table_for_output SET test_varchar = (SELECT name AS aliased_name from nation LIMIT 1), test_bigint = 1
+                """).getQueryEvents();
+        QueryCompletedEvent event = queryEvents.getQueryCompletedEvent();
+        assertThat(event.getIoMetadata().getOutput().get().getColumns().get())
+                .containsExactlyInAnyOrder(
+                        new OutputColumnMetadata("test_varchar", VARCHAR_TYPE, ImmutableSet.of(new ColumnDetail("tpch", "tiny", "nation", "name"))),
+                        new OutputColumnMetadata("test_bigint", BIGINT_TYPE, ImmutableSet.of()));
+    }
+
+    @Test
+    public void testOutputColumnsForUpdatingColumnWithSelectQueryAndWhereClauseWithOuterColumn()
+            throws Exception
+    {
+        QueryEvents queryEvents = runQueryAndWaitForEvents("""
+                UPDATE mock.default.table_for_output SET test_varchar = (SELECT name from nation WHERE test_bigint = nationkey)""").getQueryEvents();
+        QueryCompletedEvent event = queryEvents.getQueryCompletedEvent();
+        assertThat(event.getIoMetadata().getOutput().get().getColumns().get())
+                .containsExactly(new OutputColumnMetadata("test_varchar", VARCHAR_TYPE, ImmutableSet.of(new ColumnDetail("tpch", "tiny", "nation", "name"))));
+    }
+
     @Test
     public void testCreateTable()
             throws Exception
@@ -1173,7 +1245,7 @@ public void testAnonymizedJsonPlan()
                                 ImmutableList.of(),
                                 ImmutableList.of(),
                                 ImmutableList.of(new JsonRenderedNode(
-                                        "173",
+                                        "171",
                                         "LocalExchange",
                                         ImmutableMap.of(
                                                 "partitioning", "[connectorHandleType = SystemPartitioningHandle, partitioning = SINGLE, function = SINGLE]",
@@ -1184,7 +1256,7 @@ public void testAnonymizedJsonPlan()
                                         ImmutableList.of(),
                                         ImmutableList.of(),
                                         ImmutableList.of(new JsonRenderedNode(
-                                                "140",
+                                                "138",
                                                 "RemoteSource",
                                                 ImmutableMap.of("sourceFragmentIds", "[1]"),
                                                 ImmutableList.of(typedSymbol("symbol_1", "double")),
@@ -1192,7 +1264,7 @@ public void testAnonymizedJsonPlan()
                                                 ImmutableList.of(),
                                                 ImmutableList.of()))))))),
                 "1", new JsonRenderedNode(
-                        "139",
+                        "137",
                         "LimitPartial",
                         ImmutableMap.of(
                                 "count", "10",
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestEventListenerWithSplits.java b/testing/trino-tests/src/test/java/io/trino/execution/TestEventListenerWithSplits.java
index 902464d5dc29..f854b4998d27 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestEventListenerWithSplits.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestEventListenerWithSplits.java
@@ -35,7 +35,7 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -51,7 +51,6 @@
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
 public class TestEventListenerWithSplits
         extends AbstractTestQueryFramework
 {
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestExecutionJmxMetrics.java b/testing/trino-tests/src/test/java/io/trino/execution/TestExecutionJmxMetrics.java
index 129473fc8463..37622b73c5bb 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestExecutionJmxMetrics.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestExecutionJmxMetrics.java
@@ -21,7 +21,8 @@
 import io.trino.spi.QueryId;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
@@ -39,7 +40,8 @@ public class TestExecutionJmxMetrics
 {
     private static final String LONG_RUNNING_QUERY = "SELECT COUNT(*) FROM tpch.sf100000.lineitem";
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testQueryStats()
             throws Exception
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestFinalQueryInfo.java b/testing/trino-tests/src/test/java/io/trino/execution/TestFinalQueryInfo.java
index 8c10fd157ddf..d0590d58d928 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestFinalQueryInfo.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestFinalQueryInfo.java
@@ -21,8 +21,10 @@
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.spi.QueryId;
 import io.trino.testing.DistributedQueryRunner;
+import okhttp3.Call;
 import okhttp3.OkHttpClient;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.time.ZoneId;
 import java.util.Locale;
@@ -37,7 +39,8 @@
 
 public class TestFinalQueryInfo
 {
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testFinalQueryInfoSetOnAbort()
             throws Exception
     {
@@ -73,7 +76,7 @@ private static QueryId startQuery(String sql, DistributedQueryRunner queryRunner
                     .build();
 
             // start query
-            StatementClient client = newStatementClient(httpClient, clientSession, sql);
+            StatementClient client = newStatementClient((Call.Factory) httpClient, clientSession, sql);
 
             // wait for query to be fully scheduled
             while (client.isRunning() && !client.currentStatusInfo().getStats().isScheduled()) {
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestPendingStageState.java b/testing/trino-tests/src/test/java/io/trino/execution/TestPendingStageState.java
index 245e3fd4b76f..dd98f0667d8f 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestPendingStageState.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestPendingStageState.java
@@ -18,9 +18,11 @@
 import io.trino.spi.QueryId;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.execution.QueryRunnerUtil.createQuery;
@@ -29,13 +31,15 @@
 import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_SPLITS_PER_NODE;
 import static io.trino.testing.assertions.Assert.assertEventually;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
+@TestInstance(PER_CLASS)
 public class TestPendingStageState
 {
     private DistributedQueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
             throws Exception
     {
@@ -43,7 +47,8 @@ public void setup()
         queryRunner.createCatalog("tpch", "tpch", ImmutableMap.of(TPCH_SPLITS_PER_NODE, "10000"));
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testPendingState()
             throws Exception
     {
@@ -67,7 +72,7 @@ public void testPendingState()
         assertEquals(queryInfo.getOutputStage().get().getSubStages().get(0).getState(), StageState.PENDING);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         if (queryRunner != null) {
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestQueryTracker.java b/testing/trino-tests/src/test/java/io/trino/execution/TestQueryTracker.java
index e4b3f6d8562a..6e1d3bfe17e4 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestQueryTracker.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestQueryTracker.java
@@ -22,8 +22,10 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.concurrent.CountDownLatch;
 
@@ -31,17 +33,18 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 // Tests need to finish before strict timeouts. Any background work
 // may make them flaky
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestQueryTracker
         extends AbstractTestQueryFramework
 {
     private final CountDownLatch freeze = new CountDownLatch(1);
     private final CountDownLatch interrupted = new CountDownLatch(1);
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void unfreeze()
     {
         freeze.countDown();
@@ -77,7 +80,8 @@ public Iterable<ConnectorFactory> getConnectorFactories()
         return queryRunner;
     }
 
-    @Test(timeOut = 10_000)
+    @Test
+    @Timeout(10)
     public void testInterruptApplyFilter()
             throws InterruptedException
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestQueues.java b/testing/trino-tests/src/test/java/io/trino/execution/TestQueues.java
index 9f7d4787b13e..af9dea4ef84c 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestQueues.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestQueues.java
@@ -26,7 +26,8 @@
 import io.trino.spi.session.ResourceEstimates;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.Optional;
 import java.util.Set;
@@ -51,12 +52,12 @@
 import static org.testng.Assert.assertTrue;
 
 // run single threaded to avoid creating multiple query runners at once
-@Test(singleThreaded = true)
 public class TestQueues
 {
     private static final String LONG_LASTING_QUERY = "SELECT COUNT(*) FROM lineitem";
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testResourceGroupManager()
             throws Exception
     {
@@ -95,7 +96,8 @@ public void testResourceGroupManager()
         }
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testExceedSoftLimits()
             throws Exception
     {
@@ -159,7 +161,8 @@ private QueryId createScheduledQuery(DistributedQueryRunner queryRunner)
         return createQuery(queryRunner, newSession("scheduled", ImmutableSet.of(), null), LONG_LASTING_QUERY);
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testResourceGroupManagerWithTwoDashboardQueriesRequestedAtTheSameTime()
             throws Exception
     {
@@ -176,7 +179,8 @@ public void testResourceGroupManagerWithTwoDashboardQueriesRequestedAtTheSameTim
         }
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testResourceGroupManagerWithTooManyQueriesScheduled()
             throws Exception
     {
@@ -195,14 +199,16 @@ public void testResourceGroupManagerWithTooManyQueriesScheduled()
         }
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testResourceGroupManagerRejection()
             throws Exception
     {
         testRejection();
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testClientTagsBasedSelection()
             throws Exception
     {
@@ -216,7 +222,8 @@ public void testClientTagsBasedSelection()
         }
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testSelectorResourceEstimateBasedSelection()
             throws Exception
     {
@@ -272,7 +279,8 @@ public void testSelectorResourceEstimateBasedSelection()
         }
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testQueryTypeBasedSelection()
             throws Exception
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestRefreshMaterializedView.java b/testing/trino-tests/src/test/java/io/trino/execution/TestRefreshMaterializedView.java
index e73181d26677..6c45998fbf4f 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestRefreshMaterializedView.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestRefreshMaterializedView.java
@@ -30,12 +30,15 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
+import io.trino.testng.services.ManageTestResources;
+import io.trino.testng.services.ReportOrphanedExecutors;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
+import java.time.Duration;
 import java.util.Optional;
 
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
@@ -50,30 +53,26 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestRefreshMaterializedView
         extends AbstractTestQueryFramework
 {
-    private ListeningExecutorService executorService;
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
+    @ReportOrphanedExecutors.Suppress(because = "Not a TestNG test class")
+    private final ListeningExecutorService executorService = listeningDecorator(newCachedThreadPool());
     private SettableFuture<Void> startRefreshMaterializedView;
     private SettableFuture<Void> finishRefreshMaterializedView;
     private SettableFuture<Void> refreshInterrupted;
 
-    @BeforeClass
-    public void setUp()
-    {
-        executorService = listeningDecorator(newCachedThreadPool());
-    }
-
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void shutdown()
     {
         executorService.shutdownNow();
     }
 
-    @BeforeMethod
-    public void resetState()
+    private void resetState()
     {
         startRefreshMaterializedView = SettableFuture.create();
         finishRefreshMaterializedView = SettableFuture.create();
@@ -104,8 +103,10 @@ protected QueryRunner createQueryRunner()
                                                 Optional.of("mock"),
                                                 Optional.of("default"),
                                                 ImmutableList.of(new ConnectorMaterializedViewDefinition.Column("nationkey", BIGINT.getTypeId())),
+                                                Optional.of(Duration.ZERO),
                                                 Optional.empty(),
                                                 Optional.of("alice"),
+                                                ImmutableList.of(),
                                                 ImmutableMap.of())))
                                 .withDelegateMaterializedViewRefreshToConnector((connectorSession, schemaTableName) -> true)
                                 .withRefreshMaterializedView(((connectorSession, schemaTableName) -> {
@@ -120,9 +121,12 @@ protected QueryRunner createQueryRunner()
         return queryRunner;
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testDelegateRefreshMaterializedViewToConnector()
     {
+        resetState();
+
         ListenableFuture<Void> queryFuture = assertUpdateAsync("REFRESH MATERIALIZED VIEW mock.default.delegate_refresh_to_connector");
 
         // wait for connector to start refreshing MV
@@ -142,9 +146,12 @@ public void testDelegateRefreshMaterializedViewToConnector()
         getFutureValue(queryFuture);
     }
 
-    @Test(timeOut = 30_000)
+    @Test
+    @Timeout(30)
     public void testDelegateRefreshMaterializedViewToConnectorWithCancellation()
     {
+        resetState();
+
         ListenableFuture<Void> queryFuture = assertUpdateAsync("REFRESH MATERIALIZED VIEW mock.default.delegate_refresh_to_connector");
 
         // wait for connector to start refreshing MV
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestSetSessionAuthorization.java b/testing/trino-tests/src/test/java/io/trino/execution/TestSetSessionAuthorization.java
new file mode 100644
index 000000000000..6c9698436094
--- /dev/null
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestSetSessionAuthorization.java
@@ -0,0 +1,285 @@
+/*
+ * Licensed 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 io.trino.execution;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.units.Duration;
+import io.trino.client.ClientSession;
+import io.trino.client.QueryData;
+import io.trino.client.StatementClient;
+import io.trino.spi.ErrorCode;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+import okhttp3.OkHttpClient;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.time.ZoneId;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.common.io.Resources.getResource;
+import static io.trino.SessionTestUtils.TEST_SESSION;
+import static io.trino.client.StatementClientFactory.newStatementClient;
+import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
+import static io.trino.spi.StandardErrorCode.PERMISSION_DENIED;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.testng.Assert.assertEquals;
+
+public class TestSetSessionAuthorization
+        extends AbstractTestQueryFramework
+{
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(TEST_SESSION)
+                .setSystemAccessControl("file", Map.of("security.config-file", new File(getResource("set_session_authorization_permissions.json").toURI()).getPath()))
+                .build();
+        return queryRunner;
+    }
+
+    @Test
+    public void testSetSessionAuthorizationToSelf()
+    {
+        ClientSession clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .user(Optional.of("user"))
+                .build();
+        assertEquals(submitQuery("SET SESSION AUTHORIZATION user", clientSession).getSetAuthorizationUser().get(),
+                "user");
+        assertEquals(submitQuery("SET SESSION AUTHORIZATION alice", clientSession).getSetAuthorizationUser().get(),
+                "alice");
+        assertEquals(submitQuery("SET SESSION AUTHORIZATION user", clientSession).getSetAuthorizationUser().get(),
+                "user");
+    }
+
+    @Test
+    public void testValidSetSessionAuthorization()
+    {
+        ClientSession clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .user(Optional.of("user"))
+                .build();
+        assertEquals(submitQuery("SET SESSION AUTHORIZATION alice", clientSession).getSetAuthorizationUser().get(),
+                "alice");
+
+        clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user2"))
+                .user(Optional.of("user2"))
+                .build();
+        assertEquals(submitQuery("SET SESSION AUTHORIZATION bob", clientSession).getSetAuthorizationUser().get(),
+                "bob");
+    }
+
+    @Test
+    public void testInvalidSetSessionAuthorization()
+    {
+        ClientSession clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .user(Optional.of("user"))
+                .build();
+        assertError(submitQuery("SET SESSION AUTHORIZATION user2", clientSession),
+                PERMISSION_DENIED.toErrorCode(), "Access Denied: User user cannot impersonate user user2");
+        assertError(submitQuery("SET SESSION AUTHORIZATION bob", clientSession),
+                PERMISSION_DENIED.toErrorCode(), "Access Denied: User user cannot impersonate user bob");
+        assertEquals(submitQuery("SET SESSION AUTHORIZATION alice", clientSession).getSetAuthorizationUser().get(), "alice");
+        assertError(submitQuery("SET SESSION AUTHORIZATION charlie", clientSession),
+                PERMISSION_DENIED.toErrorCode(), "Access Denied: User user cannot impersonate user charlie");
+        StatementClient client = submitQuery("START TRANSACTION", clientSession);
+        clientSession = ClientSession.builder(clientSession).transactionId(client.getStartedTransactionId()).build();
+        assertError(submitQuery("SET SESSION AUTHORIZATION alice", clientSession),
+                GENERIC_USER_ERROR.toErrorCode(), "Can't set authorization user in the middle of a transaction");
+    }
+
+    // If user A can impersonate user B, and B can impersonate C - but A cannot go to C,
+    // then we can only go from A->B or B->C, but not A->B->C
+    @Test
+    public void testInvalidTransitiveSetSessionAuthorization()
+    {
+        ClientSession clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .user(Optional.of("user"))
+                .build();
+        assertEquals(submitQuery("SET SESSION AUTHORIZATION alice", clientSession).getSetAuthorizationUser().get(), "alice");
+
+        clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("alice"))
+                .user(Optional.of("alice"))
+                .build();
+        assertEquals(submitQuery("SET SESSION AUTHORIZATION charlie", clientSession).getSetAuthorizationUser().get(), "charlie");
+
+        clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .user(Optional.of("user"))
+                .build();
+        assertEquals(submitQuery("SET SESSION AUTHORIZATION alice", clientSession).getSetAuthorizationUser().get(), "alice");
+        assertError(submitQuery("SET SESSION AUTHORIZATION charlie", clientSession),
+                PERMISSION_DENIED.toErrorCode(), "Access Denied: User user cannot impersonate user charlie");
+    }
+
+    @Test
+    public void testValidSessionAuthorizationExecution()
+    {
+        ClientSession clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .user(Optional.of("user"))
+                .authorizationUser(Optional.of("alice"))
+                .build();
+        assertEquals(submitQuery("SELECT 1+1", clientSession).currentStatusInfo().getError(), null);
+
+        clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .user(Optional.of("user"))
+                .authorizationUser(Optional.of("user"))
+                .build();
+        assertEquals(submitQuery("SELECT 1+1", clientSession).currentStatusInfo().getError(), null);
+
+        clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .authorizationUser(Optional.of("alice"))
+                .build();
+        assertEquals(submitQuery("SELECT 1+1", clientSession).currentStatusInfo().getError(), null);
+    }
+
+    @Test
+    public void testInvalidSessionAuthorizationExecution()
+    {
+        ClientSession clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .user(Optional.of("user"))
+                .authorizationUser(Optional.of("user2"))
+                .build();
+        assertError(submitQuery("SELECT 1+1", clientSession),
+                PERMISSION_DENIED.toErrorCode(), "Access Denied: User user cannot impersonate user user2");
+
+        clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .user(Optional.of("user"))
+                .authorizationUser(Optional.of("user3"))
+                .build();
+        assertError(submitQuery("SELECT 1+1", clientSession),
+                PERMISSION_DENIED.toErrorCode(), "Access Denied: User user cannot impersonate user user3");
+
+        clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .user(Optional.of("user"))
+                .authorizationUser(Optional.of("charlie"))
+                .build();
+        assertError(submitQuery("SELECT 1+1", clientSession),
+                PERMISSION_DENIED.toErrorCode(), "Access Denied: User user cannot impersonate user charlie");
+    }
+
+    @Test
+    public void testSelectCurrentUser()
+    {
+        ClientSession clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .user(Optional.of("user"))
+                .authorizationUser(Optional.of("alice"))
+                .build();
+
+        ImmutableList.Builder<List<Object>> data = ImmutableList.builder();
+        submitQuery("SELECT CURRENT_USER", clientSession, data);
+        List<List<Object>> rows = data.build();
+        assertEquals((String) rows.get(0).get(0), "alice");
+    }
+
+    @Test
+    public void testResetSessionAuthorization()
+    {
+        ClientSession clientSession = defaultClientSessionBuilder()
+                .principal(Optional.of("user"))
+                .user(Optional.of("user"))
+                .build();
+        assertResetAuthorizationUser(submitQuery("RESET SESSION AUTHORIZATION", clientSession));
+        assertEquals(submitQuery("SET SESSION AUTHORIZATION alice", clientSession).getSetAuthorizationUser().get(), "alice");
+        assertResetAuthorizationUser(submitQuery("RESET SESSION AUTHORIZATION", clientSession));
+        StatementClient client = submitQuery("START TRANSACTION", clientSession);
+        clientSession = ClientSession.builder(clientSession).transactionId(client.getStartedTransactionId()).build();
+        assertError(submitQuery("RESET SESSION AUTHORIZATION", clientSession),
+                GENERIC_USER_ERROR.toErrorCode(), "Can't reset authorization user in the middle of a transaction");
+    }
+
+    private void assertError(StatementClient client, ErrorCode errorCode, String errorMessage)
+    {
+        assertEquals(client.getSetAuthorizationUser(), Optional.empty());
+        assertEquals(client.currentStatusInfo().getError().getErrorName(), errorCode.getName());
+        assertEquals(client.currentStatusInfo().getError().getMessage(), errorMessage);
+    }
+
+    private void assertResetAuthorizationUser(StatementClient client)
+    {
+        assertEquals(client.isResetAuthorizationUser(), true);
+        assertEquals(client.getSetAuthorizationUser().isEmpty(), true);
+    }
+
+    private ClientSession.Builder defaultClientSessionBuilder()
+    {
+        return ClientSession.builder()
+                .server(getDistributedQueryRunner().getCoordinator().getBaseUrl())
+                .source("source")
+                .timeZone(ZoneId.of("America/Los_Angeles"))
+                .locale(Locale.ENGLISH)
+                .clientRequestTimeout(new Duration(2, MINUTES));
+    }
+
+    private StatementClient submitQuery(String query, ClientSession clientSession)
+    {
+        OkHttpClient httpClient = new OkHttpClient();
+        try {
+            try (StatementClient client = newStatementClient(httpClient, clientSession, query)) {
+                // wait for query to be fully scheduled
+                while (client.isRunning() && !client.currentStatusInfo().getStats().isScheduled()) {
+                    client.advance();
+                }
+                return client;
+            }
+        }
+        finally {
+            // close the client since, query is not managed by the client protocol
+            httpClient.dispatcher().executorService().shutdown();
+            httpClient.connectionPool().evictAll();
+        }
+    }
+
+    private StatementClient submitQuery(String query, ClientSession clientSession, ImmutableList.Builder<List<Object>> data)
+    {
+        OkHttpClient httpClient = new OkHttpClient();
+        try {
+            try (StatementClient client = newStatementClient(httpClient, clientSession, query)) {
+                while (client.isRunning() && !Thread.currentThread().isInterrupted()) {
+                    QueryData results = client.currentData();
+                    if (results.getData() != null) {
+                        data.addAll(results.getData());
+                    }
+                    client.advance();
+                }
+                // wait for query to be fully scheduled
+                while (client.isRunning() && !client.currentStatusInfo().getStats().isScheduled()) {
+                    client.advance();
+                }
+                return client;
+            }
+        }
+        finally {
+            // close the client since, query is not managed by the client protocol
+            httpClient.dispatcher().executorService().shutdown();
+            httpClient.connectionPool().evictAll();
+        }
+    }
+}
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestStatementStats.java b/testing/trino-tests/src/test/java/io/trino/execution/TestStatementStats.java
index 07d31e80fd0b..f51dd6c53fdd 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestStatementStats.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestStatementStats.java
@@ -19,7 +19,7 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.MaterializedResult;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.testng.Assert.assertEquals;
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestTableRedirection.java b/testing/trino-tests/src/test/java/io/trino/execution/TestTableRedirection.java
index 8330fce9a817..aa79d1f96388 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestTableRedirection.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestTableRedirection.java
@@ -32,7 +32,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestTry.java b/testing/trino-tests/src/test/java/io/trino/execution/TestTry.java
index 12ffe185654e..177dbd4bfbb4 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestTry.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestTry.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.memory.MemoryQueryRunner.createMemoryQueryRunner;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestUserImpersonationAccessControl.java b/testing/trino-tests/src/test/java/io/trino/execution/TestUserImpersonationAccessControl.java
index a4ae993975a2..89a842f6133a 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestUserImpersonationAccessControl.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestUserImpersonationAccessControl.java
@@ -18,19 +18,18 @@
 import io.trino.client.ClientSession;
 import io.trino.client.QueryError;
 import io.trino.client.StatementClient;
-import io.trino.plugin.base.security.FileBasedSystemAccessControl;
 import io.trino.plugin.tpch.TpchPlugin;
-import io.trino.spi.security.SystemAccessControl;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
+import jakarta.annotation.Nullable;
 import okhttp3.OkHttpClient;
-import org.testng.annotations.Test;
-
-import javax.annotation.Nullable;
+import org.junit.jupiter.api.Test;
 
+import java.io.File;
 import java.time.ZoneId;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.io.Resources.getResource;
@@ -49,11 +48,10 @@ public class TestUserImpersonationAccessControl
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        String securityConfigFile = getResource("access_control_rules.json").getPath();
-        SystemAccessControl accessControl = new FileBasedSystemAccessControl.Factory().create(ImmutableMap.of(SECURITY_CONFIG_FILE, securityConfigFile));
+        String securityConfigFile = new File(getResource("access_control_rules.json").toURI()).getPath();
         QueryRunner queryRunner = DistributedQueryRunner.builder(TEST_SESSION)
                 .setNodeCount(1)
-                .setSystemAccessControl(accessControl)
+                .setSystemAccessControl("file", Map.of(SECURITY_CONFIG_FILE, securityConfigFile))
                 .build();
 
         queryRunner.installPlugin(new TpchPlugin());
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestWarnings.java b/testing/trino-tests/src/test/java/io/trino/execution/TestWarnings.java
index f5ab18d75e74..f886ba32c278 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestWarnings.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestWarnings.java
@@ -19,23 +19,26 @@
 import io.trino.testing.QueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Set;
 
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.spi.connector.StandardWarningCode.TOO_MANY_STAGES;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.fail;
 
+@TestInstance(PER_CLASS)
 public class TestWarnings
 {
     private static final int STAGE_COUNT_WARNING_THRESHOLD = 20;
     private QueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -44,7 +47,7 @@ public void setUp()
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/TestResourceGroupIntegration.java b/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/TestResourceGroupIntegration.java
index afe848876ad7..730297b6d24b 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/TestResourceGroupIntegration.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/TestResourceGroupIntegration.java
@@ -19,7 +19,7 @@
 import io.trino.spi.resourcegroups.ResourceGroupId;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/H2ResourceGroupsModule.java b/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/H2ResourceGroupsModule.java
index 188be9bfa59a..13afaa390750 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/H2ResourceGroupsModule.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/H2ResourceGroupsModule.java
@@ -17,6 +17,7 @@
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
+import com.google.inject.Singleton;
 import io.trino.plugin.resourcegroups.db.DbResourceGroupConfig;
 import io.trino.plugin.resourcegroups.db.DbResourceGroupConfigurationManager;
 import io.trino.plugin.resourcegroups.db.ForEnvironment;
@@ -25,8 +26,6 @@
 import io.trino.spi.resourcegroups.ResourceGroupConfigurationManager;
 import io.trino.spi.resourcegroups.ResourceGroupConfigurationManagerContext;
 
-import javax.inject.Singleton;
-
 import static io.airlift.configuration.ConfigBinder.configBinder;
 
 public class H2ResourceGroupsModule
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/TestEnvironments.java b/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/TestEnvironments.java
index 196cb1f75972..e826087d2ed8 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/TestEnvironments.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/TestEnvironments.java
@@ -16,7 +16,8 @@
 import io.trino.plugin.resourcegroups.db.H2ResourceGroupsDao;
 import io.trino.spi.QueryId;
 import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import static io.trino.execution.QueryRunnerUtil.createQuery;
 import static io.trino.execution.QueryRunnerUtil.waitForQueryState;
@@ -29,12 +30,12 @@
 import static io.trino.execution.resourcegroups.db.H2TestUtil.getDao;
 import static io.trino.execution.resourcegroups.db.H2TestUtil.getDbConfigUrl;
 
-@Test(singleThreaded = true)
 public class TestEnvironments
 {
     private static final String LONG_LASTING_QUERY = "SELECT COUNT(*) FROM lineitem";
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testEnvironment1()
             throws Exception
     {
@@ -48,7 +49,8 @@ public void testEnvironment1()
         }
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testEnvironment2()
             throws Exception
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/TestQueuesDb.java b/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/TestQueuesDb.java
index 8a9a503a1b57..7fe884b5ea74 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/TestQueuesDb.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/TestQueuesDb.java
@@ -27,9 +27,11 @@
 import io.trino.spi.resourcegroups.ResourceGroupId;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.MaterializedResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.Optional;
 import java.util.Set;
@@ -62,11 +64,12 @@
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.lang.String.format;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 // run single threaded to avoid creating multiple query runners at once
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestQueuesDb
 {
     // Copy of TestQueues with tests for db reconfiguration of resource groups
@@ -74,7 +77,7 @@ public class TestQueuesDb
     private DistributedQueryRunner queryRunner;
     private H2ResourceGroupsDao dao;
 
-    @BeforeMethod
+    @BeforeEach
     public void setup()
             throws Exception
     {
@@ -83,14 +86,15 @@ public void setup()
         queryRunner = createQueryRunner(dbConfigUrl, dao);
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void tearDown()
     {
         queryRunner.close();
         queryRunner = null;
     }
 
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testRunningQuery()
             throws Exception
     {
@@ -106,7 +110,8 @@ public void testRunningQuery()
         }
     }
 
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testBasic()
             throws Exception
     {
@@ -146,7 +151,8 @@ public void testBasic()
         waitForCompleteQueryCount(queryRunner, 1);
     }
 
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testTwoQueriesAtSameTime()
             throws Exception
     {
@@ -156,7 +162,8 @@ public void testTwoQueriesAtSameTime()
         waitForQueryState(queryRunner, secondDashboardQuery, QUEUED);
     }
 
-    @Test(timeOut = 90_000)
+    @Test
+    @Timeout(90)
     public void testTooManyQueries()
             throws Exception
     {
@@ -193,7 +200,8 @@ public void testTooManyQueries()
         waitForQueryState(queryRunner, thirdDashboardQuery, QUEUED);
     }
 
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testRejection()
             throws Exception
     {
@@ -218,7 +226,8 @@ public void testRejection()
         waitForQueryState(queryRunner, queryId, FAILED);
     }
 
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testQuerySystemTableResourceGroup()
             throws Exception
     {
@@ -228,7 +237,8 @@ public void testQuerySystemTableResourceGroup()
         assertEquals(result.getOnlyValue(), ImmutableList.of("global", "user-user", "dashboard-user"));
     }
 
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testSelectorPriority()
             throws Exception
     {
@@ -260,7 +270,8 @@ public void testSelectorPriority()
         assertEquals(basicQueryInfo.getErrorCode(), QUERY_QUEUE_FULL.toErrorCode());
     }
 
-    @Test(timeOut = 60_000)
+    @Test
+    @Timeout(60)
     public void testQueryExecutionTimeLimit()
             throws Exception
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/TestResourceGroupDbIntegration.java b/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/TestResourceGroupDbIntegration.java
index 80b757d0543b..e5951316f024 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/TestResourceGroupDbIntegration.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/resourcegroups/db/TestResourceGroupDbIntegration.java
@@ -14,7 +14,7 @@
 package io.trino.execution.resourcegroups.db;
 
 import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.execution.resourcegroups.TestResourceGroupIntegration.waitForGlobalResourceGroup;
 import static io.trino.execution.resourcegroups.db.H2TestUtil.getSimpleQueryRunner;
diff --git a/testing/trino-tests/src/test/java/io/trino/memory/TestClusterMemoryLeakDetector.java b/testing/trino-tests/src/test/java/io/trino/memory/TestClusterMemoryLeakDetector.java
index aa8e6fc9169c..850955491a20 100644
--- a/testing/trino-tests/src/test/java/io/trino/memory/TestClusterMemoryLeakDetector.java
+++ b/testing/trino-tests/src/test/java/io/trino/memory/TestClusterMemoryLeakDetector.java
@@ -25,7 +25,7 @@
 import io.trino.spi.QueryId;
 import io.trino.spi.resourcegroups.ResourceGroupId;
 import org.joda.time.DateTime;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.util.Optional;
@@ -104,7 +104,8 @@ private static BasicQueryInfo createQueryInfo(String queryId, QueryState state)
                         new Duration(33, MINUTES),
                         true,
                         ImmutableSet.of(WAITING_FOR_MEMORY),
-                        OptionalDouble.of(20)),
+                        OptionalDouble.of(20),
+                        OptionalDouble.of(0)),
                 null,
                 null,
                 Optional.empty(),
diff --git a/testing/trino-tests/src/test/java/io/trino/memory/TestMemoryManager.java b/testing/trino-tests/src/test/java/io/trino/memory/TestMemoryManager.java
index 0b644bb74de8..dbcfe9f703dc 100644
--- a/testing/trino-tests/src/test/java/io/trino/memory/TestMemoryManager.java
+++ b/testing/trino-tests/src/test/java/io/trino/memory/TestMemoryManager.java
@@ -26,9 +26,11 @@
 import io.trino.testing.QueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -53,14 +55,14 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-// run single threaded to avoid creating multiple query runners at once
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestMemoryManager
 {
     private static final Session SESSION = testSessionBuilder()
@@ -76,20 +78,21 @@ public class TestMemoryManager
 
     private ExecutorService executor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         executor = newCachedThreadPool();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void shutdown()
     {
         executor.shutdownNow();
         executor = null;
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testResourceOverCommit()
             throws Exception
     {
@@ -111,7 +114,8 @@ public void testResourceOverCommit()
         }
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testOutOfMemoryKiller()
             throws Exception
     {
@@ -187,7 +191,8 @@ private void waitForQueryToBeKilled(DistributedQueryRunner queryRunner)
         }
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testNoLeak()
             throws Exception
     {
@@ -215,7 +220,8 @@ private void testNoLeak(@Language("SQL") String query)
         }
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testClusterPools()
             throws Exception
     {
@@ -302,50 +308,62 @@ private static boolean isBlockedWaitingForMemory(BasicQueryInfo info)
         return stats.isFullyBlocked() || stats.getRunningDrivers() == 0;
     }
 
-    @Test(timeOut = 60_000, expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = ".*Query exceeded distributed user memory limit of 1kB.*")
+    @Test
+    @Timeout(60)
     public void testQueryUserMemoryLimit()
-            throws Exception
     {
-        Map<String, String> properties = ImmutableMap.<String, String>builder()
-                .put("task.max-partial-aggregation-memory", "1B")
-                .put("query.max-memory", "1kB")
-                .put("query.max-total-memory", "1GB")
-                .buildOrThrow();
-        try (QueryRunner queryRunner = createQueryRunner(SESSION, properties)) {
-            queryRunner.execute(SESSION, "SELECT COUNT(*), repeat(orderstatus, 1000) FROM orders GROUP BY 2");
-        }
+        assertThatThrownBy(() -> {
+            Map<String, String> properties = ImmutableMap.<String, String>builder()
+                    .put("task.max-partial-aggregation-memory", "1B")
+                    .put("query.max-memory", "1kB")
+                    .put("query.max-total-memory", "1GB")
+                    .buildOrThrow();
+            try (QueryRunner queryRunner = createQueryRunner(SESSION, properties)) {
+                queryRunner.execute(SESSION, "SELECT COUNT(*), repeat(orderstatus, 1000) FROM orders GROUP BY 2");
+            }
+        })
+                .isInstanceOf(RuntimeException.class)
+                .hasMessageContaining("Query exceeded distributed user memory limit of 1kB");
     }
 
-    @Test(timeOut = 60_000, expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = ".*Query exceeded distributed total memory limit of 120MB.*")
+    @Test
+    @Timeout(60)
     public void testQueryTotalMemoryLimit()
-            throws Exception
     {
-        Map<String, String> properties = ImmutableMap.<String, String>builder()
-                // Relatively high memory limit is required, so that the table scan memory usage alone does not cause the query to fail.
-                .put("query.max-memory", "120MB")
-                .put("query.max-total-memory", "120MB")
-                // The user memory enforcement is tested in testQueryTotalMemoryLimit().
-                // Total memory = user memory + revocable memory.
-                .put("spill-enabled", "true")
-                .put("spiller-spill-path", Paths.get(System.getProperty("java.io.tmpdir"), "trino", "spills", randomUUID().toString()).toString())
-                .put("spiller-max-used-space-threshold", "1.0")
-                .buildOrThrow();
-        try (QueryRunner queryRunner = createQueryRunner(SESSION, properties)) {
-            queryRunner.execute(SESSION, "SELECT * FROM tpch.sf10.orders ORDER BY orderkey");
-        }
+        assertThatThrownBy(() -> {
+            Map<String, String> properties = ImmutableMap.<String, String>builder()
+                    // Relatively high memory limit is required, so that the table scan memory usage alone does not cause the query to fail.
+                    .put("query.max-memory", "120MB")
+                    .put("query.max-total-memory", "120MB")
+                    // The user memory enforcement is tested in testQueryTotalMemoryLimit().
+                    // Total memory = user memory + revocable memory.
+                    .put("spill-enabled", "true")
+                    .put("spiller-spill-path", Paths.get(System.getProperty("java.io.tmpdir"), "trino", "spills", randomUUID().toString()).toString())
+                    .put("spiller-max-used-space-threshold", "1.0")
+                    .buildOrThrow();
+            try (QueryRunner queryRunner = createQueryRunner(SESSION, properties)) {
+                queryRunner.execute(SESSION, "SELECT * FROM tpch.sf10.orders ORDER BY orderkey");
+            }
+        })
+                .isInstanceOf(RuntimeException.class)
+                .hasMessageContaining("Query exceeded distributed total memory limit of 120MB");
     }
 
-    @Test(timeOut = 60_000, expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = ".*Query exceeded per-node memory limit of 1kB.*")
+    @Test
+    @Timeout(60)
     public void testQueryMemoryPerNodeLimit()
-            throws Exception
     {
-        Map<String, String> properties = ImmutableMap.<String, String>builder()
-                .put("task.max-partial-aggregation-memory", "1B")
-                .put("query.max-memory-per-node", "1kB")
-                .buildOrThrow();
-        try (QueryRunner queryRunner = createQueryRunner(SESSION, properties)) {
-            queryRunner.execute(SESSION, "SELECT COUNT(*), repeat(orderstatus, 1000) FROM orders GROUP BY 2");
-        }
+        assertThatThrownBy(() -> {
+            Map<String, String> properties = ImmutableMap.<String, String>builder()
+                    .put("task.max-partial-aggregation-memory", "1B")
+                    .put("query.max-memory-per-node", "1kB")
+                    .buildOrThrow();
+            try (QueryRunner queryRunner = createQueryRunner(SESSION, properties)) {
+                queryRunner.execute(SESSION, "SELECT COUNT(*), repeat(orderstatus, 1000) FROM orders GROUP BY 2");
+            }
+        })
+                .isInstanceOf(RuntimeException.class)
+                .hasMessageContaining("Query exceeded per-node memory limit of 1kB");
     }
 
     public static DistributedQueryRunner createQueryRunner(Session session, Map<String, String> extraProperties)
diff --git a/testing/trino-tests/src/test/java/io/trino/memory/TestMemorySessionProperties.java b/testing/trino-tests/src/test/java/io/trino/memory/TestMemorySessionProperties.java
index ab5094a5e97e..2c7ddb5896d1 100644
--- a/testing/trino-tests/src/test/java/io/trino/memory/TestMemorySessionProperties.java
+++ b/testing/trino-tests/src/test/java/io/trino/memory/TestMemorySessionProperties.java
@@ -17,7 +17,8 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import static io.trino.SystemSessionProperties.QUERY_MAX_MEMORY_PER_NODE;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -34,7 +35,8 @@ protected QueryRunner createQueryRunner()
         return TpchQueryRunnerBuilder.builder().setNodeCount(2).build();
     }
 
-    @Test(timeOut = 240_000)
+    @Test
+    @Timeout(240)
     public void testSessionQueryMemoryPerNodeLimit()
     {
         assertQuery(sql);
diff --git a/testing/trino-tests/src/test/java/io/trino/procedure/TestProcedure.java b/testing/trino-tests/src/test/java/io/trino/procedure/TestProcedure.java
index 132ffc2dcf27..77806fcb164c 100644
--- a/testing/trino-tests/src/test/java/io/trino/procedure/TestProcedure.java
+++ b/testing/trino-tests/src/test/java/io/trino/procedure/TestProcedure.java
@@ -13,10 +13,9 @@
  */
 package io.trino.procedure;
 
+import com.google.inject.Provider;
 import io.trino.spi.procedure.Procedure;
 
-import javax.inject.Provider;
-
 import java.lang.invoke.MethodHandle;
 
 import static io.trino.util.Reflection.methodHandle;
diff --git a/testing/trino-tests/src/test/java/io/trino/security/TestAccessControl.java b/testing/trino-tests/src/test/java/io/trino/security/TestAccessControl.java
index 9dde277210bb..195d43bae951 100644
--- a/testing/trino-tests/src/test/java/io/trino/security/TestAccessControl.java
+++ b/testing/trino-tests/src/test/java/io/trino/security/TestAccessControl.java
@@ -40,6 +40,14 @@
 import io.trino.spi.connector.ConnectorViewDefinition;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SchemaTablePrefix;
+import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.FunctionDependencies;
+import io.trino.spi.function.FunctionId;
+import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.FunctionProvider;
+import io.trino.spi.function.InvocationConvention;
+import io.trino.spi.function.ScalarFunctionImplementation;
+import io.trino.spi.function.Signature;
 import io.trino.spi.security.AccessDeniedException;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.RoleGrant;
@@ -48,17 +56,19 @@
 import io.trino.spi.security.SystemSecurityContext;
 import io.trino.spi.security.TrinoPrincipal;
 import io.trino.spi.security.ViewExpression;
+import io.trino.sql.SqlPath;
 import io.trino.testing.AbstractTestQueryFramework;
-import io.trino.testing.DataProviders;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingAccessControlManager;
 import io.trino.testing.TestingAccessControlManager.TestingPrivilege;
 import io.trino.testing.TestingGroupProvider;
 import io.trino.testing.TestingSession;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.lang.invoke.MethodHandles;
+import java.time.Duration;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -109,10 +119,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-@Test(singleThreaded = true) // Test is stateful, see @BeforeMethod
 public class TestAccessControl
         extends AbstractTestQueryFramework
 {
+    private static final String DEFAULT_SCHEMA = "default";
+    private static final String REDIRECTED_SOURCE = "redirected_source";
+    private static final String REDIRECTED_TARGET = "redirected_target";
     private final AtomicReference<SystemAccessControl> systemAccessControl = new AtomicReference<>(new DefaultSystemAccessControl());
     private final TestingGroupProvider groupProvider = new TestingGroupProvider();
     private TestingSystemSecurityMetadata systemSecurityMetadata;
@@ -125,6 +137,7 @@ protected QueryRunner createQueryRunner()
                 .setSource("test")
                 .setCatalog("blackhole")
                 .setSchema("default")
+                .setPath(SqlPath.buildPath("mock.function", Optional.empty()))
                 .build();
         DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session)
                 .setAdditionalModule(binder -> {
@@ -134,7 +147,8 @@ protected QueryRunner createQueryRunner()
                             .in(Scopes.SINGLETON);
                 })
                 .setNodeCount(1)
-                .setSystemAccessControl(new ForwardingSystemAccessControl() {
+                .setSystemAccessControl(new ForwardingSystemAccessControl()
+                {
                     @Override
                     protected SystemAccessControl delegate()
                     {
@@ -156,39 +170,51 @@ protected SystemAccessControl delegate()
                     }
                     return new MockConnectorTableHandle(schemaTableName);
                 })
+                .withListSchemaNames((connectorSession -> ImmutableList.of(DEFAULT_SCHEMA)))
+                .withListTables((connectorSession, schemaName) -> {
+                    if (schemaName.equals(DEFAULT_SCHEMA)) {
+                        return ImmutableList.of(REDIRECTED_SOURCE);
+                    }
+                    return ImmutableList.of();
+                })
                 .withGetViews((connectorSession, prefix) -> {
                     ConnectorViewDefinition definitionRunAsDefiner = new ConnectorViewDefinition(
-                            "select 1",
+                            "SELECT 1 AS test",
                             Optional.of("mock"),
                             Optional.of("default"),
                             ImmutableList.of(new ConnectorViewDefinition.ViewColumn("test", BIGINT.getTypeId(), Optional.empty())),
                             Optional.of("comment"),
                             Optional.of("admin"),
-                            false);
+                            false,
+                            ImmutableList.of());
                     ConnectorViewDefinition definitionRunAsInvoker = new ConnectorViewDefinition(
-                            "select 1",
+                            "SELECT 1 AS test",
                             Optional.of("mock"),
                             Optional.of("default"),
                             ImmutableList.of(new ConnectorViewDefinition.ViewColumn("test", BIGINT.getTypeId(), Optional.empty())),
                             Optional.of("comment"),
                             Optional.empty(),
-                            true);
+                            true,
+                            ImmutableList.of());
                     return ImmutableMap.of(
                             new SchemaTableName("default", "test_view_definer"), definitionRunAsDefiner,
                             new SchemaTableName("default", "test_view_invoker"), definitionRunAsInvoker);
                 })
-                .withGetMaterializedViews(new BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorMaterializedViewDefinition>>() {
+                .withGetMaterializedViews(new BiFunction<ConnectorSession, SchemaTablePrefix, Map<SchemaTableName, ConnectorMaterializedViewDefinition>>()
+                {
                     @Override
                     public Map<SchemaTableName, ConnectorMaterializedViewDefinition> apply(ConnectorSession session, SchemaTablePrefix schemaTablePrefix)
                     {
                         ConnectorMaterializedViewDefinition materializedViewDefinition = new ConnectorMaterializedViewDefinition(
-                                "select 1",
+                                "SELECT 1 AS test",
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),
                                 ImmutableList.of(new ConnectorMaterializedViewDefinition.Column("test", BIGINT.getTypeId())),
+                                Optional.of(Duration.ZERO),
                                 Optional.of("comment"),
                                 Optional.of("owner"),
+                                ImmutableList.of(),
                                 ImmutableMap.of());
                         return ImmutableMap.of(
                                 new SchemaTableName("default", "test_materialized_view"), materializedViewDefinition);
@@ -210,6 +236,39 @@ public Map<SchemaTableName, ConnectorMaterializedViewDefinition> apply(Connector
                 .withColumnProperties(() -> ImmutableList.of(
                         integerProperty("another_property", "description", 0, false),
                         stringProperty("string_column_property", "description", "", false)))
+                .withRedirectTable(((connectorSession, schemaTableName) -> {
+                    if (schemaTableName.equals(SchemaTableName.schemaTableName(DEFAULT_SCHEMA, REDIRECTED_SOURCE))) {
+                        return Optional.of(
+                                new CatalogSchemaTableName("mock", SchemaTableName.schemaTableName(DEFAULT_SCHEMA, REDIRECTED_TARGET)));
+                    }
+                    return Optional.empty();
+                }))
+                .withGetComment((schemaTableName -> {
+                    if (schemaTableName.getTableName().equals(REDIRECTED_TARGET)) {
+                        return Optional.of("this is a redirected table");
+                    }
+                    return Optional.empty();
+                }))
+                .withFunctions(ImmutableList.<FunctionMetadata>builder()
+                        .add(FunctionMetadata.scalarBuilder("my_function")
+                                .signature(Signature.builder().argumentType(BIGINT).returnType(BIGINT).build())
+                                .noDescription()
+                                .build())
+                        .add(FunctionMetadata.scalarBuilder("other_function")
+                                .signature(Signature.builder().argumentType(BIGINT).returnType(BIGINT).build())
+                                .noDescription()
+                                .build())
+                        .build())
+                .withFunctionProvider(Optional.of(new FunctionProvider()
+                {
+                    @Override
+                    public ScalarFunctionImplementation getScalarFunctionImplementation(FunctionId functionId, BoundSignature boundSignature, FunctionDependencies functionDependencies, InvocationConvention invocationConvention)
+                    {
+                        return ScalarFunctionImplementation.builder()
+                                .methodHandle(MethodHandles.identity(long.class))
+                                .build();
+                    }
+                }))
                 .build()));
         queryRunner.createCatalog("mock", "mock");
         queryRunner.installPlugin(new JdbcPlugin("base_jdbc", new TestingH2JdbcModule()));
@@ -221,8 +280,7 @@ public Map<SchemaTableName, ConnectorMaterializedViewDefinition> apply(Connector
         return queryRunner;
     }
 
-    @BeforeMethod
-    public void reset()
+    private void reset()
     {
         systemAccessControl.set(new DefaultSystemAccessControl());
         requireNonNull(systemSecurityMetadata, "systemSecurityMetadata is null")
@@ -234,6 +292,8 @@ public void reset()
     @Test
     public void testAccessControl()
     {
+        reset();
+
         assertAccessDenied("SELECT * FROM orders", "Cannot execute query", privilege("query", EXECUTE_QUERY));
         assertAccessDenied("INSERT INTO orders SELECT * FROM orders", "Cannot insert into table .*.orders.*", privilege("orders", INSERT_TABLE));
         assertAccessDenied("DELETE FROM orders", "Cannot delete from table .*.orders.*", privilege("orders", DELETE_TABLE));
@@ -253,6 +313,26 @@ public void testAccessControl()
         assertAccessAllowed("SELECT name AS my_alias FROM nation", privilege("my_alias", SELECT_COLUMN));
         assertAccessAllowed("SELECT my_alias from (SELECT name AS my_alias FROM nation)", privilege("my_alias", SELECT_COLUMN));
         assertAccessDenied("SELECT name AS my_alias FROM nation", "Cannot select from columns \\[name] in table .*.nation.*", privilege("nation.name", SELECT_COLUMN));
+        assertAccessAllowed("SELECT 1 FROM mock.default.test_materialized_view");
+        assertAccessDenied("SELECT 1 FROM mock.default.test_materialized_view", "Cannot select from columns.*", privilege("test_materialized_view", SELECT_COLUMN));
+        assertAccessAllowed("SELECT * FROM mock.default.test_materialized_view");
+        assertAccessDenied("SELECT * FROM mock.default.test_materialized_view", "Cannot select from columns.*", privilege("test_materialized_view", SELECT_COLUMN));
+        assertAccessAllowed("SELECT 1 FROM mock.default.test_view_definer");
+        assertAccessDenied("SELECT 1 FROM mock.default.test_view_definer", "Cannot select from columns.*", privilege("test_view_definer", SELECT_COLUMN));
+        assertAccessAllowed("SELECT * FROM mock.default.test_view_definer");
+        assertAccessDenied("SELECT * FROM mock.default.test_view_definer", "Cannot select from columns.*", privilege("test_view_definer", SELECT_COLUMN));
+        assertAccessAllowed("SELECT 1 FROM mock.default.test_view_invoker");
+        assertAccessDenied("SELECT 1 FROM mock.default.test_view_invoker", "Cannot select from columns.*", privilege("test_view_invoker", SELECT_COLUMN));
+        assertAccessAllowed("SELECT * FROM mock.default.test_view_invoker");
+        assertAccessDenied("SELECT * FROM mock.default.test_view_invoker", "Cannot select from columns.*", privilege("test_view_invoker", SELECT_COLUMN));
+        // with current implementation this next block of checks is redundant to `SELECT 1 FROM ..`, but it is not obvious unless details of how
+        // semantics analyzer works are known
+        assertAccessAllowed("SELECT count(*) FROM mock.default.test_materialized_view");
+        assertAccessDenied("SELECT count(*) FROM mock.default.test_materialized_view", "Cannot select from columns.*", privilege("test_materialized_view", SELECT_COLUMN));
+        assertAccessAllowed("SELECT count(*) FROM mock.default.test_view_invoker");
+        assertAccessDenied("SELECT count(*) FROM mock.default.test_view_invoker", "Cannot select from columns.*", privilege("test_view_invoker", SELECT_COLUMN));
+        assertAccessAllowed("SELECT count(*) FROM mock.default.test_view_definer");
+        assertAccessDenied("SELECT count(*) FROM mock.default.test_view_definer", "Cannot select from columns.*", privilege("test_view_definer", SELECT_COLUMN));
 
         assertAccessDenied(
                 "SELECT orders.custkey, lineitem.quantity FROM orders JOIN lineitem USING (orderkey)",
@@ -266,8 +346,10 @@ public void testAccessControl()
 
         assertAccessDenied("SHOW CREATE TABLE orders", "Cannot show create table for .*.orders.*", privilege("orders", SHOW_CREATE_TABLE));
         assertAccessAllowed("SHOW CREATE TABLE lineitem", privilege("orders", SHOW_CREATE_TABLE));
-        assertAccessDenied("SELECT abs(1)", "Cannot execute function abs", privilege("abs", EXECUTE_FUNCTION));
-        assertAccessAllowed("SELECT abs(1)", privilege("max", EXECUTE_FUNCTION));
+        assertAccessDenied("SELECT my_function(1)", "Cannot execute function my_function", privilege("mock.function.my_function", EXECUTE_FUNCTION));
+        assertAccessAllowed("SELECT my_function(1)", privilege("max", EXECUTE_FUNCTION));
+        assertAccessAllowed("SELECT abs(-10)", privilege("abs", EXECUTE_FUNCTION));
+        assertAccessAllowed("SELECT abs(-10)", privilege("system.builtin.abs", EXECUTE_FUNCTION));
         assertAccessAllowed("SHOW STATS FOR lineitem");
         assertAccessAllowed("SHOW STATS FOR lineitem", privilege("orders", SELECT_COLUMN));
         assertAccessAllowed("SHOW STATS FOR (SELECT * FROM lineitem)");
@@ -286,6 +368,8 @@ public void testAccessControl()
     @Test
     public void testViewColumnAccessControl()
     {
+        reset();
+
         Session viewOwnerSession = TestingSession.testSessionBuilder()
                 .setIdentity(Identity.ofUser("test_view_access_owner"))
                 .setCatalog(getSession().getCatalog())
@@ -384,6 +468,8 @@ public void testViewColumnAccessControl()
     @Test
     public void testViewOwnersRoleGrants()
     {
+        reset();
+
         String viewOwner = "view_owner";
         TrinoPrincipal viewOwnerPrincipal = new TrinoPrincipal(USER, viewOwner);
         String viewName = "test_view_column_access_" + randomNameSuffix();
@@ -424,6 +510,8 @@ public void testViewOwnersRoleGrants()
     @Test
     public void testJoinBaseTableWithView()
     {
+        reset();
+
         String viewOwner = "view_owner";
         TrinoPrincipal viewOwnerPrincipal = new TrinoPrincipal(USER, viewOwner);
         String viewName = "test_join_base_table_with_view_" + randomNameSuffix();
@@ -466,10 +554,13 @@ public void testJoinBaseTableWithView()
     @Test
     public void testViewFunctionAccessControl()
     {
+        reset();
+
         Session viewOwnerSession = TestingSession.testSessionBuilder()
                 .setIdentity(Identity.ofUser("test_view_access_owner"))
                 .setCatalog(getSession().getCatalog())
                 .setSchema(getSession().getSchema())
+                .setPath(SqlPath.buildPath("mock.function", Optional.empty()))
                 .build();
 
         // TEST FUNCTION PRIVILEGES
@@ -477,33 +568,33 @@ public void testViewFunctionAccessControl()
         String functionAccessViewName = "test_view_function_access_" + randomNameSuffix();
         assertAccessAllowed(
                 viewOwnerSession,
-                "CREATE VIEW " + functionAccessViewName + " AS SELECT abs(1) AS c",
-                privilege("abs", GRANT_EXECUTE_FUNCTION));
+                "CREATE VIEW " + functionAccessViewName + " AS SELECT my_function(1) AS c",
+                privilege("mock.function.my_function", GRANT_EXECUTE_FUNCTION));
 
         assertAccessDenied(
                 "SELECT * FROM " + functionAccessViewName,
-                "View owner does not have sufficient privileges: 'test_view_access_owner' cannot grant 'abs' execution to user '\\w*'",
-                privilege(viewOwnerSession.getUser(), "abs", GRANT_EXECUTE_FUNCTION));
+                "Cannot execute function my_function",
+                privilege(viewOwnerSession.getUser(), "mock.function.my_function", GRANT_EXECUTE_FUNCTION));
 
         // verify executing from a view over a function does not require the session user to have execute privileges on the underlying function
         assertAccessAllowed(
                 "SELECT * FROM " + functionAccessViewName,
-                privilege(getSession().getUser(), "abs", EXECUTE_FUNCTION));
+                privilege(getSession().getUser(), "mock.function.my_function", EXECUTE_FUNCTION));
 
         // TEST SECURITY INVOKER
         // view creation permissions are only checked at query time, not at creation
         String invokerFunctionAccessViewName = "test_invoker_view_function_access_" + randomNameSuffix();
         assertAccessAllowed(
                 viewOwnerSession,
-                "CREATE VIEW " + invokerFunctionAccessViewName + " SECURITY INVOKER AS SELECT abs(1) AS c",
-                privilege("abs", GRANT_EXECUTE_FUNCTION));
+                "CREATE VIEW " + invokerFunctionAccessViewName + " SECURITY INVOKER AS SELECT my_function(1) AS c",
+                privilege("mock.function.my_function", GRANT_EXECUTE_FUNCTION));
         assertAccessAllowed(
                 "SELECT * FROM " + invokerFunctionAccessViewName,
-                privilege(viewOwnerSession.getUser(), "abs", EXECUTE_FUNCTION));
+                privilege(viewOwnerSession.getUser(), "mock.function.my_function", EXECUTE_FUNCTION));
         assertAccessDenied(
                 "SELECT * FROM " + invokerFunctionAccessViewName,
-                "Cannot execute function abs",
-                privilege(getSession().getUser(), "abs", EXECUTE_FUNCTION));
+                "Cannot execute function my_function",
+                privilege(getSession().getUser(), "mock.function.my_function", EXECUTE_FUNCTION));
 
         assertAccessAllowed(viewOwnerSession, "DROP VIEW " + functionAccessViewName);
         assertAccessAllowed(viewOwnerSession, "DROP VIEW " + invokerFunctionAccessViewName);
@@ -512,78 +603,144 @@ public void testViewFunctionAccessControl()
     @Test
     public void testFunctionAccessControl()
     {
+        reset();
+
         assertAccessDenied(
-                "SELECT reverse('a')",
-                "Cannot execute function reverse",
-                new TestingPrivilege(Optional.empty(), "reverse", EXECUTE_FUNCTION));
+                "SELECT my_function(42)",
+                "Cannot execute function my_function",
+                new TestingPrivilege(Optional.empty(), "mock.function.my_function", EXECUTE_FUNCTION));
+
+        // inline and builtin functions are always allowed, and there are no security checks
+        TestingPrivilege denyAllFunctionCalls = new TestingPrivilege(Optional.empty(), name -> true, EXECUTE_FUNCTION);
+        assertAccessAllowed("SELECT abs(42)", denyAllFunctionCalls);
+        assertAccessAllowed("WITH FUNCTION foo() RETURNS int RETURN 42 SELECT foo()", denyAllFunctionCalls);
+        assertAccessDenied("SELECT my_function(42)", "Cannot execute function my_function", denyAllFunctionCalls);
+
+        TestingPrivilege denyNonMyFunctionCalls = new TestingPrivilege(Optional.empty(), name -> !name.equals("mock.function.my_function"), EXECUTE_FUNCTION);
+        assertAccessAllowed("SELECT my_function(42)", denyNonMyFunctionCalls);
+        assertAccessDenied("SELECT other_function(42)", "Cannot execute function other_function", denyNonMyFunctionCalls);
+    }
 
-        TestingPrivilege denyNonReverseFunctionCalls = new TestingPrivilege(Optional.empty(), name -> !name.equals("reverse"), EXECUTE_FUNCTION);
-        assertAccessAllowed("SELECT reverse('a')", denyNonReverseFunctionCalls);
-        assertAccessDenied("SELECT concat('a', 'b')", "Cannot execute function concat", denyNonReverseFunctionCalls);
+    @Test
+    public void testTableFunctionRequiredColumns()
+    {
+        reset();
+
+        assertAccessDenied(
+                "SELECT * FROM TABLE(exclude_columns(TABLE(nation), descriptor(regionkey, comment)))",
+                "Cannot select from columns \\[nationkey, name] in table .*.nation.*",
+                privilege("nation.nationkey", SELECT_COLUMN));
     }
 
     @Test
     public void testAnalyzeAccessControl()
     {
+        reset();
+
         assertAccessAllowed("ANALYZE nation");
         assertAccessDenied("ANALYZE nation", "Cannot ANALYZE \\(missing insert privilege\\) table .*.nation.*", privilege("nation", INSERT_TABLE));
         assertAccessDenied("ANALYZE nation", "Cannot select from columns \\[.*] in table or view .*.nation", privilege("nation", SELECT_COLUMN));
         assertAccessDenied("ANALYZE nation", "Cannot select from columns \\[.*nationkey.*] in table or view .*.nation", privilege("nation.nationkey", SELECT_COLUMN));
     }
 
+    @Test
+    public void testMetadataFilterColumns()
+    {
+        reset();
+
+        getQueryRunner().getAccessControl().deny(privilege("nation.regionkey", SELECT_COLUMN));
+
+        assertThat(query("SELECT column_name FROM information_schema.columns WHERE table_catalog = CURRENT_CATALOG AND table_schema = CURRENT_SCHEMA and table_name = 'nation'"))
+                .matches("VALUES VARCHAR 'nationkey', 'name', 'comment'");
+
+        assertThat(query("SELECT column_name FROM system.jdbc.columns WHERE table_cat = CURRENT_CATALOG AND table_schem = CURRENT_SCHEMA and table_name = 'nation'"))
+                .matches("VALUES VARCHAR 'nationkey', 'name', 'comment'");
+    }
+
     @Test
     public void testCommentView()
     {
+        reset();
+
         String viewName = "comment_view" + randomNameSuffix();
         assertUpdate("CREATE VIEW " + viewName + " COMMENT 'old comment' AS SELECT * FROM orders");
         assertAccessDenied("COMMENT ON VIEW " + viewName + " IS 'new comment'", "Cannot comment view to .*", privilege(viewName, COMMENT_VIEW));
-        assertThatThrownBy(() -> getQueryRunner().execute(getSession(), "COMMENT ON VIEW " + viewName + " IS 'new comment'"))
-                .hasMessageContaining("This connector does not support setting view comments");
+        assertAccessAllowed("COMMENT ON VIEW " + viewName + " IS 'new comment'");
     }
 
-    @Test(dataProviderClass = DataProviders.class, dataProvider = "trueFalse")
-    public void testViewWithTableFunction(boolean securityDefiner)
+    @Test
+    public void testCommentOnRedirectedTable()
     {
-        Session viewOwner = getSession();
-        Session otherUser = Session.builder(getSession())
-                .setIdentity(Identity.ofUser(getSession().getUser() + "-someone-else"))
-                .build();
+        reset();
 
-        String viewName = "memory.default.definer_view_with_ptf";
-        assertUpdate(viewOwner, "CREATE VIEW " + viewName + " SECURITY " + (securityDefiner ? "DEFINER" : "INVOKER") + " AS SELECT * FROM TABLE (jdbc.system.query('SELECT ''from h2'', monthname(CAST(''2005-09-10'' AS date))'))");
-        String viewValues = "VALUES ('from h2', 'September') ";
-
-        assertThat(query(viewOwner, "TABLE " + viewName)).matches(viewValues);
-        assertThat(query(otherUser, "TABLE " + viewName)).matches(viewValues);
-
-        TestingPrivilege grantExecute = TestingAccessControlManager.privilege("jdbc.system.query", GRANT_EXECUTE_FUNCTION);
-        assertAccessAllowed(viewOwner, "TABLE " + viewName, grantExecute);
-        if (securityDefiner) {
-            assertAccessDenied(
-                    otherUser,
-                    "TABLE " + viewName,
-                    "View owner does not have sufficient privileges: 'user' cannot grant 'jdbc.system.query' execution to user 'user-someone-else'",
-                    grantExecute);
-        }
-        else {
-            assertAccessAllowed(otherUser, "TABLE " + viewName, grantExecute);
-        }
+        String query = "SELECT * FROM system.metadata.table_comments WHERE catalog_name = 'mock' AND schema_name = 'default' AND table_name LIKE 'redirected%'";
+        assertQuery(query, "VALUES ('mock', 'default', 'redirected_source', 'this is a redirected table')");
+        getQueryRunner().getAccessControl().denyTables(schemaTableName -> !schemaTableName.getTableName().equals("redirected_target"));
+        assertQueryReturnsEmptyResult(query);
+    }
 
-        assertUpdate("DROP VIEW " + viewName);
+    @Test
+    public void testViewWithTableFunction()
+    {
+        reset();
+
+        for (boolean securityDefiner : Arrays.asList(true, false)) {
+            Session viewOwner = getSession();
+            Session otherUser = Session.builder(getSession())
+                    .setIdentity(Identity.ofUser(getSession().getUser() + "-someone-else"))
+                    .build();
+
+            String viewName = "memory.default.definer_view_with_ptf";
+            assertUpdate(viewOwner, "CREATE VIEW " + viewName + " SECURITY " + (securityDefiner ? "DEFINER" : "INVOKER") + " AS SELECT * FROM TABLE (jdbc.system.query('SELECT ''from h2'', monthname(CAST(''2005-09-10'' AS date))'))");
+            String viewValues = "VALUES ('from h2', 'September') ";
+
+            assertThat(query(viewOwner, "TABLE " + viewName)).matches(viewValues);
+            assertThat(query(otherUser, "TABLE " + viewName)).matches(viewValues);
+
+            TestingPrivilege grantExecute = TestingAccessControlManager.privilege("jdbc.system.query", GRANT_EXECUTE_FUNCTION);
+            assertAccessAllowed(viewOwner, "TABLE " + viewName, grantExecute);
+            if (securityDefiner) {
+                assertAccessDenied(
+                        otherUser,
+                        "TABLE " + viewName,
+                        "Cannot execute function jdbc.system.query",
+                        grantExecute);
+            }
+            else {
+                assertAccessAllowed(otherUser, "TABLE " + viewName, grantExecute);
+            }
+
+            assertUpdate("DROP VIEW " + viewName);
+        }
     }
 
     @Test
     public void testCommentColumnView()
     {
+        reset();
+
         String viewName = "comment_view" + randomNameSuffix();
         assertUpdate("CREATE VIEW " + viewName + " AS SELECT * FROM orders");
         assertAccessDenied("COMMENT ON COLUMN " + viewName + ".orderkey IS 'new order key comment'", "Cannot comment column to .*", privilege(viewName, COMMENT_COLUMN));
         assertUpdate(getSession(), "COMMENT ON COLUMN " + viewName + ".orderkey IS 'new comment'");
     }
 
+    @Test
+    public void testCommentColumnMaterializedView()
+    {
+        reset();
+
+        String viewName = "comment_materialized_view" + randomNameSuffix();
+        assertUpdate("CREATE MATERIALIZED VIEW mock.default." + viewName + " AS SELECT * FROM orders");
+        assertAccessDenied("COMMENT ON COLUMN mock.default." + viewName + ".column_0 IS 'new comment'", "Cannot comment column to .*", privilege(viewName, COMMENT_COLUMN));
+        assertUpdate(getSession(), "COMMENT ON COLUMN mock.default." + viewName + ".column_0 IS 'new comment'");
+    }
+
     @Test
     public void testSetColumnType()
     {
+        reset();
+
         String tableName = "test_set_colun_type" + randomNameSuffix();
         assertUpdate("CREATE TABLE " + tableName + " AS SELECT * FROM orders", 0);
 
@@ -594,6 +751,8 @@ public void testSetColumnType()
     @Test
     public void testSetTableProperties()
     {
+        reset();
+
         assertAccessDenied("ALTER TABLE orders SET PROPERTIES field_length = 32", "Cannot set table properties to .*.orders.*", privilege("orders", SET_TABLE_PROPERTIES));
         assertThatThrownBy(() -> getQueryRunner().execute(getSession(), "ALTER TABLE orders SET PROPERTIES field_length = 32"))
                 .hasMessageContaining("This connector does not support setting table properties");
@@ -602,6 +761,8 @@ public void testSetTableProperties()
     @Test
     public void testDeleteAccessControl()
     {
+        reset();
+
         assertAccessDenied("DELETE FROM orders WHERE orderkey < 12", "Cannot select from columns \\[orderkey] in table or view .*.orders.*", privilege("orders.orderkey", SELECT_COLUMN));
         assertAccessAllowed("DELETE FROM orders WHERE orderkey < 12", privilege("orders" + ".orderdate", SELECT_COLUMN));
         assertAccessAllowed("DELETE FROM orders", privilege("orders", SELECT_COLUMN));
@@ -610,12 +771,16 @@ public void testDeleteAccessControl()
     @Test
     public void testTruncateAccessControl()
     {
+        reset();
+
         assertAccessAllowed("TRUNCATE TABLE orders", privilege("orders", SELECT_COLUMN));
     }
 
     @Test
     public void testUpdateAccessControl()
     {
+        reset();
+
         assertAccessDenied("UPDATE orders SET orderkey=123", "Cannot update columns \\[orderkey] in table .*", privilege("orders", UPDATE_TABLE));
         assertAccessDenied("UPDATE orders SET orderkey=123 WHERE custkey < 12", "Cannot select from columns \\[custkey] in table or view .*.default.orders", privilege("orders.custkey", SELECT_COLUMN));
         assertAccessAllowed("UPDATE orders SET orderkey=123", privilege("orders", SELECT_COLUMN));
@@ -624,6 +789,8 @@ public void testUpdateAccessControl()
     @Test
     public void testMergeAccessControl()
     {
+        reset();
+
         String catalogName = getSession().getCatalog().orElseThrow();
         String schemaName = getSession().getSchema().orElseThrow();
 
@@ -681,6 +848,8 @@ WHEN NOT MATCHED THEN INSERT VALUES (null, null, null, null, null, null, null, n
     @Test
     public void testNonQueryAccessControl()
     {
+        reset();
+
         assertAccessDenied("SET SESSION " + QUERY_MAX_MEMORY + " = '10MB'",
                 "Cannot set system session property " + QUERY_MAX_MEMORY,
                 privilege(QUERY_MAX_MEMORY, SET_SESSION));
@@ -708,6 +877,8 @@ public void testNonQueryAccessControl()
     @Test
     public void testDescribe()
     {
+        reset();
+
         assertAccessDenied("DESCRIBE orders", "Cannot show columns of table default.orders", privilege("orders", SHOW_COLUMNS));
         getQueryRunner().getAccessControl().deny(privilege("orders.orderkey", SELECT_COLUMN));
         assertQuery(
@@ -727,6 +898,8 @@ public void testDescribe()
     @Test
     public void testDescribeForViews()
     {
+        reset();
+
         String viewName = "describe_orders_view" + randomNameSuffix();
         assertUpdate("CREATE VIEW " + viewName + " AS SELECT * FROM orders");
         assertAccessDenied("DESCRIBE " + viewName, "Cannot show columns of table default.*", privilege(viewName, SHOW_COLUMNS));
@@ -749,6 +922,8 @@ public void testDescribeForViews()
     @Test
     public void testNoCatalogIsNeededInSessionForShowRoles()
     {
+        reset();
+
         Session session = testSessionBuilder()
                 .setIdentity(Identity.forUser("alice")
                         .withConnectorRoles(ImmutableMap.of("mock", new SelectedRole(ROLE, Optional.of("alice_role"))))
@@ -763,6 +938,8 @@ public void testNoCatalogIsNeededInSessionForShowRoles()
     @Test
     public void testShowRolesWithLegacyCatalogRoles()
     {
+        reset();
+
         Session session = testSessionBuilder()
                 .setCatalog("mock")
                 .setIdentity(Identity.forUser("alice")
@@ -779,6 +956,8 @@ public void testShowRolesWithLegacyCatalogRoles()
     @Test
     public void testEmptyRoles()
     {
+        reset();
+
         assertQueryReturnsEmptyResult("SHOW ROLES");
         assertQueryReturnsEmptyResult("SHOW ROLE GRANTS");
         assertQueryReturnsEmptyResult("SHOW CURRENT ROLES");
@@ -788,20 +967,24 @@ public void testEmptyRoles()
     @Test
     public void testSetViewAuthorizationWithSecurityDefiner()
     {
-        assertQueryFails(
-                "ALTER VIEW mock.default.test_view_definer SET AUTHORIZATION some_other_user",
-                "Cannot set authorization for view mock.default.test_view_definer to USER some_other_user: this feature is disabled");
+        reset();
+
+        assertQuerySucceeds("ALTER VIEW mock.default.test_view_definer SET AUTHORIZATION some_other_user");
     }
 
     @Test
     public void testSetViewAuthorizationWithSecurityInvoker()
     {
+        reset();
+
         assertQuerySucceeds("ALTER VIEW mock.default.test_view_invoker SET AUTHORIZATION some_other_user");
     }
 
     @Test
     public void testSystemMetadataAnalyzePropertiesFilteringValues()
     {
+        reset();
+
         getQueryRunner().getAccessControl().denyCatalogs(catalog -> !catalog.equals("mock"));
         assertQueryReturnsEmptyResult("SELECT * FROM system.metadata.analyze_properties");
     }
@@ -809,6 +992,8 @@ public void testSystemMetadataAnalyzePropertiesFilteringValues()
     @Test
     public void testSystemMetadataMaterializedViewPropertiesFilteringValues()
     {
+        reset();
+
         getQueryRunner().getAccessControl().denyCatalogs(catalog -> !catalog.equals("mock"));
         assertQueryReturnsEmptyResult("SELECT * FROM system.metadata.materialized_view_properties");
     }
@@ -816,6 +1001,8 @@ public void testSystemMetadataMaterializedViewPropertiesFilteringValues()
     @Test
     public void testSystemMetadataSchemaPropertiesFilteringValues()
     {
+        reset();
+
         getQueryRunner().getAccessControl().denyCatalogs(catalog -> !catalog.equals("mock"));
         assertQueryReturnsEmptyResult("SELECT * FROM system.metadata.schema_properties");
     }
@@ -823,6 +1010,8 @@ public void testSystemMetadataSchemaPropertiesFilteringValues()
     @Test
     public void testSystemMetadataTablePropertiesFilteringValues()
     {
+        reset();
+
         getQueryRunner().getAccessControl().denyCatalogs(catalog -> !catalog.equals("blackhole") && !catalog.equals("mock"));
         assertQueryReturnsEmptyResult("SELECT * FROM system.metadata.table_properties");
     }
@@ -830,6 +1019,8 @@ public void testSystemMetadataTablePropertiesFilteringValues()
     @Test
     public void testSystemMetadataColumnPropertiesFilteringValues()
     {
+        reset();
+
         getQueryRunner().getAccessControl().denyCatalogs(catalog -> !catalog.equals("mock"));
         assertQueryReturnsEmptyResult("SELECT * FROM system.metadata.column_properties");
     }
@@ -837,6 +1028,8 @@ public void testSystemMetadataColumnPropertiesFilteringValues()
     @Test
     public void testUseStatementAccessControl()
     {
+        reset();
+
         Session session = testSessionBuilder()
                 .setCatalog(Optional.empty())
                 .setSchema(Optional.empty())
@@ -851,6 +1044,8 @@ public void testUseStatementAccessControl()
     @Test
     public void testUseStatementAccessControlWithDeniedCatalog()
     {
+        reset();
+
         getQueryRunner().getAccessControl().denyCatalogs(catalog -> !catalog.equals("tpch"));
         assertThatThrownBy(() -> getQueryRunner().execute("USE tpch.tiny"))
                 .hasMessageMatching("Access Denied: Cannot access catalog tpch");
@@ -861,6 +1056,8 @@ public void testUseStatementAccessControlWithDeniedCatalog()
     @Test
     public void testUseStatementAccessControlWithDeniedSchema()
     {
+        reset();
+
         getQueryRunner().getAccessControl().denySchemas(schema -> !schema.equals("tiny"));
         assertThatThrownBy(() -> getQueryRunner().execute("USE tpch.tiny"))
                 .hasMessageMatching("Access Denied: Cannot access schema: tpch.tiny");
@@ -869,6 +1066,8 @@ public void testUseStatementAccessControlWithDeniedSchema()
     @Test
     public void testPropertiesAccessControl()
     {
+        reset();
+
         systemAccessControl.set(new DenySetPropertiesSystemAccessControl());
         assertAccessDenied(
                 "CREATE TABLE mock.default.new_table (pk bigint) WITH (double_table_property = 0.0)", // default value
@@ -953,6 +1152,8 @@ public void testPropertiesAccessControl()
     @Test
     public void testPropertiesAccessControlIsSkippedWhenUsingDefaults()
     {
+        reset();
+
         systemAccessControl.set(new DenySetPropertiesSystemAccessControl());
         systemAccessControl.set(new DenySetPropertiesSystemAccessControl());
         assertAccessAllowed("CREATE TABLE mock.default.new_table (pk bigint)");
@@ -963,6 +1164,8 @@ public void testPropertiesAccessControlIsSkippedWhenUsingDefaults()
     @Test
     public void testAccessControlWithGroupsAndColumnMask()
     {
+        reset();
+
         groupProvider.setUserGroups(ImmutableMap.of(getSession().getUser(), ImmutableSet.of("group")));
         TestingAccessControlManager accessControlManager = getQueryRunner().getAccessControl();
         accessControlManager.denyIdentityTable((identity, table) -> (identity.getGroups().contains("group") && "orders".equals(table)));
@@ -970,7 +1173,7 @@ public void testAccessControlWithGroupsAndColumnMask()
                 new QualifiedObjectName("blackhole", "default", "orders"),
                 "comment",
                 getSession().getUser(),
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "substr(comment,1,3)"));
+                ViewExpression.builder().expression("substr(comment,1,3)").build());
 
         assertAccessAllowed("SELECT comment FROM orders");
     }
@@ -978,13 +1181,15 @@ public void testAccessControlWithGroupsAndColumnMask()
     @Test
     public void testAccessControlWithGroupsAndRowFilter()
     {
+        reset();
+
         groupProvider.setUserGroups(ImmutableMap.of(getSession().getUser(), ImmutableSet.of("group")));
         TestingAccessControlManager accessControlManager = getQueryRunner().getAccessControl();
         accessControlManager.denyIdentityTable((identity, table) -> (identity.getGroups().contains("group") && "nation".equals(table)));
         accessControlManager.rowFilter(
                 new QualifiedObjectName("blackhole", "default", "nation"),
                 getSession().getUser(),
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "nationkey % 2 = 0"));
+                ViewExpression.builder().expression("nationkey % 2 = 0").build());
 
         assertAccessAllowed("SELECT nationkey FROM nation");
     }
@@ -992,6 +1197,8 @@ public void testAccessControlWithGroupsAndRowFilter()
     @Test
     public void testAccessControlWithRolesAndColumnMask()
     {
+        reset();
+
         String role = "role";
         String user = "user";
         Session session = Session.builder(getSession())
@@ -1006,7 +1213,7 @@ public void testAccessControlWithRolesAndColumnMask()
                 new QualifiedObjectName("blackhole", "default", "orders"),
                 "comment",
                 getSession().getUser(),
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "substr(comment,1,3)"));
+                ViewExpression.builder().expression("substr(comment,1,3)").build());
 
         assertAccessAllowed(session, "SELECT comment FROM orders");
     }
@@ -1014,6 +1221,8 @@ public void testAccessControlWithRolesAndColumnMask()
     @Test
     public void testAccessControlWithRolesAndRowFilter()
     {
+        reset();
+
         String role = "role";
         String user = "user";
         Session session = Session.builder(getSession())
@@ -1027,7 +1236,7 @@ public void testAccessControlWithRolesAndRowFilter()
         accessControlManager.rowFilter(
                 new QualifiedObjectName("blackhole", "default", "nation"),
                 getSession().getUser(),
-                new ViewExpression(Optional.empty(), Optional.empty(), Optional.empty(), "nationkey % 2 = 0"));
+                ViewExpression.builder().expression("nationkey % 2 = 0").build());
 
         assertAccessAllowed(session, "SELECT nationkey FROM nation");
     }
diff --git a/testing/trino-tests/src/test/java/io/trino/security/TestAccessControlTableRedirection.java b/testing/trino-tests/src/test/java/io/trino/security/TestAccessControlTableRedirection.java
index 8f69817bd644..bb6154d57392 100644
--- a/testing/trino-tests/src/test/java/io/trino/security/TestAccessControlTableRedirection.java
+++ b/testing/trino-tests/src/test/java/io/trino/security/TestAccessControlTableRedirection.java
@@ -31,7 +31,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/testing/trino-tests/src/test/java/io/trino/security/TestFunctionsInViewsWithFileBasedSystemAccessControl.java b/testing/trino-tests/src/test/java/io/trino/security/TestFunctionsInViewsWithFileBasedSystemAccessControl.java
index 17dfa7f6fa80..97285ea0a9e3 100644
--- a/testing/trino-tests/src/test/java/io/trino/security/TestFunctionsInViewsWithFileBasedSystemAccessControl.java
+++ b/testing/trino-tests/src/test/java/io/trino/security/TestFunctionsInViewsWithFileBasedSystemAccessControl.java
@@ -13,26 +13,37 @@
  */
 package io.trino.security;
 
-import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import io.trino.Session;
 import io.trino.connector.MockConnectorFactory;
 import io.trino.connector.MockConnectorPlugin;
 import io.trino.connector.TestingTableFunctions;
-import io.trino.plugin.base.security.FileBasedSystemAccessControl;
 import io.trino.plugin.blackhole.BlackHolePlugin;
 import io.trino.spi.connector.TableFunctionApplicationResult;
+import io.trino.spi.function.BoundSignature;
+import io.trino.spi.function.FunctionDependencies;
+import io.trino.spi.function.FunctionId;
+import io.trino.spi.function.FunctionMetadata;
+import io.trino.spi.function.FunctionProvider;
+import io.trino.spi.function.InvocationConvention;
+import io.trino.spi.function.ScalarFunctionImplementation;
+import io.trino.spi.function.Signature;
 import io.trino.spi.security.Identity;
-import io.trino.spi.security.SystemAccessControl;
+import io.trino.sql.SqlPath;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.io.File;
+import java.lang.invoke.MethodHandles;
+import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.io.Resources.getResource;
 import static io.trino.plugin.base.security.FileBasedAccessControlConfig.SECURITY_CONFIG_FILE;
+import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 
 public class TestFunctionsInViewsWithFileBasedSystemAccessControl
@@ -46,14 +57,14 @@ public class TestFunctionsInViewsWithFileBasedSystemAccessControl
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        String securityConfigFile = getResource("file-based-system-functions-access.json").getPath();
-        SystemAccessControl accessControl = new FileBasedSystemAccessControl.Factory().create(ImmutableMap.of(SECURITY_CONFIG_FILE, securityConfigFile));
+        String securityConfigFile = new File(getResource("file-based-system-functions-access.json").toURI()).getPath();
         DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(testSessionBuilder()
                         .setCatalog(Optional.empty())
                         .setSchema(Optional.empty())
+                        .setPath(SqlPath.buildPath("mock.function", Optional.empty()))
                         .build())
                 .setNodeCount(1)
-                .setSystemAccessControl(accessControl)
+                .setSystemAccessControl("file", Map.of(SECURITY_CONFIG_FILE, securityConfigFile))
                 .build();
         queryRunner.installPlugin(new BlackHolePlugin());
         queryRunner.createCatalog("blackhole", "blackhole");
@@ -65,6 +76,22 @@ protected QueryRunner createQueryRunner()
                     }
                     throw new IllegalStateException("Unsupported table function handle: " + handle.getClass().getSimpleName());
                 })
+                .withFunctions(ImmutableList.<FunctionMetadata>builder()
+                        .add(FunctionMetadata.scalarBuilder("my_function")
+                                .signature(Signature.builder().returnType(BIGINT).build())
+                                .noDescription()
+                                .build())
+                        .build())
+                .withFunctionProvider(Optional.of(new FunctionProvider()
+                {
+                    @Override
+                    public ScalarFunctionImplementation getScalarFunctionImplementation(FunctionId functionId, BoundSignature boundSignature, FunctionDependencies functionDependencies, InvocationConvention invocationConvention)
+                    {
+                        return ScalarFunctionImplementation.builder()
+                                .methodHandle(MethodHandles.constant(long.class, 42L))
+                                .build();
+                    }
+                }))
                 .build()));
         queryRunner.createCatalog("mock", "mock");
         return queryRunner;
@@ -87,13 +114,13 @@ public void testPtfSecurityInvokerViewCreatedByAlice()
         String securityInvokerQuery = "SELECT * FROM blackhole.default.view_ptf_alice_security_invoker";
         assertQuerySucceeds(ALICE_USER, securityInvokerQuery);
         assertQuerySucceeds(BOB_USER, securityInvokerQuery);
-        assertAccessDenied(CHARLIE_USER, securityInvokerQuery, "Cannot access catalog mock");
+        assertAccessDenied(CHARLIE_USER, securityInvokerQuery, "Cannot execute function mock.system.simple_table_function");
     }
 
     @Test
     public void testFunctionSecurityDefinerViewCreatedByAlice()
     {
-        assertQuerySucceeds(ALICE_USER, "CREATE VIEW blackhole.default.view_function_alice_security_definer SECURITY DEFINER AS SELECT now() AS t");
+        assertQuerySucceeds(ALICE_USER, "CREATE VIEW blackhole.default.view_function_alice_security_definer SECURITY DEFINER AS SELECT my_function() AS t");
         String securityDefinerQuery = "SELECT * FROM blackhole.default.view_function_alice_security_definer";
         assertQuerySucceeds(ALICE_USER, securityDefinerQuery);
         assertQuerySucceeds(BOB_USER, securityDefinerQuery);
@@ -103,11 +130,11 @@ public void testFunctionSecurityDefinerViewCreatedByAlice()
     @Test
     public void testFunctionSecurityInvokerViewCreatedByAlice()
     {
-        assertQuerySucceeds(ALICE_USER, "CREATE VIEW blackhole.default.view_function_alice_security_invoker SECURITY INVOKER AS SELECT now() AS t");
+        assertQuerySucceeds(ALICE_USER, "CREATE VIEW blackhole.default.view_function_alice_security_invoker SECURITY INVOKER AS SELECT my_function() AS t");
         String securityInvokerQuery = "SELECT * FROM blackhole.default.view_function_alice_security_invoker";
         assertQuerySucceeds(ALICE_USER, securityInvokerQuery);
         assertQuerySucceeds(BOB_USER, securityInvokerQuery);
-        assertAccessDenied(CHARLIE_USER, securityInvokerQuery, "Cannot execute function now");
+        assertAccessDenied(CHARLIE_USER, securityInvokerQuery, "Cannot execute function my_function");
     }
 
     @Test
@@ -115,9 +142,9 @@ public void testPtfSecurityDefinerViewCreatedByBob()
     {
         assertQuerySucceeds(BOB_USER, "CREATE VIEW blackhole.default.view_ptf_bob_security_definer SECURITY DEFINER AS SELECT * FROM TABLE(mock.system.simple_table_function())");
         String securityDefinerQuery = "SELECT * FROM blackhole.default.view_ptf_bob_security_definer";
-        assertAccessDenied(ALICE_USER, securityDefinerQuery, "View owner does not have sufficient privileges: 'bob' cannot grant 'mock\\.system\\.simple_table_function' execution to user 'alice'");
+        assertAccessDenied(ALICE_USER, securityDefinerQuery, "Cannot execute function mock.system.simple_table_function");
         assertQuerySucceeds(BOB_USER, securityDefinerQuery);
-        assertAccessDenied(CHARLIE_USER, securityDefinerQuery, "View owner does not have sufficient privileges: 'bob' cannot grant 'mock\\.system\\.simple_table_function' execution to user 'charlie'");
+        assertAccessDenied(CHARLIE_USER, securityDefinerQuery, "Cannot execute function mock.system.simple_table_function");
     }
 
     @Test
@@ -127,33 +154,34 @@ public void testPtfSecurityInvokerViewCreatedByBob()
         String securityInvokerQuery = "SELECT * FROM blackhole.default.view_ptf_bob_security_invoker";
         assertQuerySucceeds(ALICE_USER, securityInvokerQuery);
         assertQuerySucceeds(BOB_USER, securityInvokerQuery);
-        assertAccessDenied(CHARLIE_USER, securityInvokerQuery, "Cannot access catalog mock");
+        assertAccessDenied(CHARLIE_USER, securityInvokerQuery, "Cannot execute function mock.system.simple_table_function");
     }
 
     @Test
     public void testFunctionSecurityDefinerViewCreatedByBob()
     {
-        assertQuerySucceeds(BOB_USER, "CREATE VIEW blackhole.default.view_function_bob_security_definer SECURITY DEFINER AS SELECT now() AS t");
+        assertQuerySucceeds(BOB_USER, "CREATE VIEW blackhole.default.view_function_bob_security_definer SECURITY DEFINER AS SELECT my_function() AS t");
         String securityDefinerQuery = "SELECT * FROM blackhole.default.view_function_bob_security_definer";
-        assertAccessDenied(ALICE_USER, securityDefinerQuery, "View owner does not have sufficient privileges: 'bob' cannot grant 'now' execution to user 'alice'");
+        assertAccessDenied(ALICE_USER, securityDefinerQuery, "Cannot execute function my_function");
         assertQuerySucceeds(BOB_USER, securityDefinerQuery);
-        assertAccessDenied(CHARLIE_USER, securityDefinerQuery, "View owner does not have sufficient privileges: 'bob' cannot grant 'now' execution to user 'charlie'");
+        assertAccessDenied(CHARLIE_USER, securityDefinerQuery, "Cannot execute function my_function");
     }
 
     @Test
     public void testFunctionSecurityInvokerViewCreatedByBob()
     {
-        assertQuerySucceeds(BOB_USER, "CREATE VIEW blackhole.default.view_function_bob_security_invoker SECURITY INVOKER AS SELECT now() AS t");
+        assertQuerySucceeds(BOB_USER, "CREATE VIEW blackhole.default.view_function_bob_security_invoker SECURITY INVOKER AS SELECT my_function() AS t");
         String securityInvokerQuery = "SELECT * FROM blackhole.default.view_function_bob_security_invoker";
         assertQuerySucceeds(ALICE_USER, securityInvokerQuery);
         assertQuerySucceeds(BOB_USER, securityInvokerQuery);
-        assertAccessDenied(CHARLIE_USER, securityInvokerQuery, "Cannot execute function now");
+        assertAccessDenied(CHARLIE_USER, securityInvokerQuery, "Cannot execute function my_function");
     }
 
     private static Session user(String user)
     {
         return testSessionBuilder()
                 .setIdentity(Identity.ofUser(user))
+                .setPath(SqlPath.buildPath("mock.function", Optional.empty()))
                 .build();
     }
 }
diff --git a/testing/trino-tests/src/test/java/io/trino/security/TestSystemSecurityMetadata.java b/testing/trino-tests/src/test/java/io/trino/security/TestSystemSecurityMetadata.java
index ce5a207456d9..0136d6bf0f1e 100644
--- a/testing/trino-tests/src/test/java/io/trino/security/TestSystemSecurityMetadata.java
+++ b/testing/trino-tests/src/test/java/io/trino/security/TestSystemSecurityMetadata.java
@@ -20,20 +20,17 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 
-@Test(singleThreaded = true) // singleThreaded is because TestingSystemSecurityMetadata is stateful and is shared between tests
 public class TestSystemSecurityMetadata
         extends AbstractTestQueryFramework
 {
     private final TestingSystemSecurityMetadata securityMetadata = new TestingSystemSecurityMetadata();
 
-    @BeforeMethod
-    public void reset()
+    private void reset()
     {
         securityMetadata.reset();
     }
@@ -59,6 +56,8 @@ protected QueryRunner createQueryRunner()
     @Test
     public void testNoSystemRoles()
     {
+        reset();
+
         assertQueryReturnsEmptyResult("SHOW ROLES");
         assertQueryReturnsEmptyResult("SHOW CURRENT ROLES");
         assertQueryReturnsEmptyResult("SHOW ROLE GRANTS");
@@ -68,6 +67,8 @@ public void testNoSystemRoles()
     @Test
     public void testRoleCreationAndDeletion()
     {
+        reset();
+
         assertQueryReturnsEmptyResult("SHOW ROLES");
 
         assertQuerySucceeds("CREATE ROLE role1");
@@ -80,6 +81,8 @@ public void testRoleCreationAndDeletion()
     @Test
     public void testRoleGrant()
     {
+        reset();
+
         Session alice = user("alice");
         Session aliceWithRole = user("alice", "role1");
 
@@ -122,6 +125,8 @@ public void testRoleGrant()
     @Test
     public void testTransitiveRoleGrant()
     {
+        reset();
+
         Session alice = user("alice");
         Session aliceWithRole = user("alice", "role2");
 
diff --git a/testing/trino-tests/src/test/java/io/trino/security/TestingSystemSecurityMetadata.java b/testing/trino-tests/src/test/java/io/trino/security/TestingSystemSecurityMetadata.java
index 2e554e14f788..0870af6ef057 100644
--- a/testing/trino-tests/src/test/java/io/trino/security/TestingSystemSecurityMetadata.java
+++ b/testing/trino-tests/src/test/java/io/trino/security/TestingSystemSecurityMetadata.java
@@ -20,6 +20,7 @@
 import io.trino.metadata.SystemSecurityMetadata;
 import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.CatalogSchemaTableName;
+import io.trino.spi.function.CatalogSchemaFunctionName;
 import io.trino.spi.security.GrantInfo;
 import io.trino.spi.security.Identity;
 import io.trino.spi.security.Privilege;
@@ -242,6 +243,12 @@ public void setViewOwner(Session session, CatalogSchemaTableName view, TrinoPrin
         viewOwners.put(view, Identity.ofUser(principal.getName()));
     }
 
+    @Override
+    public Optional<Identity> getFunctionRunAsIdentity(Session session, CatalogSchemaFunctionName functionName)
+    {
+        return Optional.empty();
+    }
+
     @Override
     public void schemaCreated(Session session, CatalogSchemaName schema) {}
 
@@ -259,4 +266,22 @@ public void tableRenamed(Session session, CatalogSchemaTableName sourceTable, Ca
 
     @Override
     public void tableDropped(Session session, CatalogSchemaTableName table) {}
+
+    @Override
+    public void columnCreated(Session session, CatalogSchemaTableName table, String column)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void columnRenamed(Session session, CatalogSchemaTableName table, String oldName, String newName)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void columnDropped(Session session, CatalogSchemaTableName table, String column)
+    {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseCostBasedPlanTest.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseCostBasedPlanTest.java
index 9f34c2fe1a77..0312d088fa57 100644
--- a/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseCostBasedPlanTest.java
+++ b/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseCostBasedPlanTest.java
@@ -19,15 +19,15 @@
 import com.google.common.io.Resources;
 import io.airlift.log.Logger;
 import io.trino.Session;
-import io.trino.execution.warnings.WarningCollector;
-import io.trino.metadata.TableHandle;
-import io.trino.metadata.TableMetadata;
+import io.trino.spi.connector.CatalogSchemaTableName;
 import io.trino.spi.connector.ConnectorFactory;
+import io.trino.sql.DynamicFilters;
 import io.trino.sql.planner.OptimizerConfig.JoinDistributionType;
 import io.trino.sql.planner.OptimizerConfig.JoinReorderingStrategy;
 import io.trino.sql.planner.assertions.BasePlanTest;
 import io.trino.sql.planner.plan.AggregationNode;
 import io.trino.sql.planner.plan.ExchangeNode;
+import io.trino.sql.planner.plan.FilterNode;
 import io.trino.sql.planner.plan.JoinNode;
 import io.trino.sql.planner.plan.SemiJoinNode;
 import io.trino.sql.planner.plan.TableScanNode;
@@ -56,6 +56,8 @@
 import static io.trino.SystemSessionProperties.JOIN_DISTRIBUTION_TYPE;
 import static io.trino.SystemSessionProperties.JOIN_REORDERING_STRATEGY;
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
+import static io.trino.execution.warnings.WarningCollector.NOOP;
+import static io.trino.sql.DynamicFilters.extractDynamicFilters;
 import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED;
 import static io.trino.sql.planner.plan.JoinNode.DistributionType.REPLICATED;
 import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
@@ -110,6 +112,8 @@ protected LocalQueryRunner createLocalQueryRunner()
         SessionBuilder sessionBuilder = testSessionBuilder()
                 .setCatalog(CATALOG_NAME)
                 .setSchema(schemaName)
+                // Reducing ARM and x86 floating point arithmetic differences, mostly visible at PlanNodeStatsEstimateMath::estimateCorrelatedConjunctionRowCount
+                .setSystemProperty("filter_conjunction_independence_factor", "0.750000001")
                 .setSystemProperty("task_concurrency", "1") // these tests don't handle exchanges from local parallel
                 .setSystemProperty(JOIN_REORDERING_STRATEGY, JoinReorderingStrategy.AUTOMATIC.name())
                 .setSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.AUTOMATIC.name());
@@ -214,7 +218,8 @@ private String generateQueryPlan(String query)
     {
         try {
             return getQueryRunner().inTransaction(transactionSession -> {
-                Plan plan = getQueryRunner().createPlan(transactionSession, query, OPTIMIZED_AND_VALIDATED, false, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+                LocalQueryRunner localQueryRunner = getQueryRunner();
+                Plan plan = localQueryRunner.createPlan(transactionSession, query, localQueryRunner.getPlanOptimizers(false), OPTIMIZED_AND_VALIDATED, NOOP, createPlanOptimizersStatsCollector());
                 JoinOrderPrinter joinOrderPrinter = new JoinOrderPrinter(transactionSession);
                 plan.getRoot().accept(joinOrderPrinter, 0);
                 return joinOrderPrinter.result();
@@ -315,17 +320,28 @@ public Void visitAggregation(AggregationNode node, Integer indent)
         }
 
         @Override
-        public Void visitTableScan(TableScanNode node, Integer indent)
+        public Void visitFilter(FilterNode node, Integer indent)
         {
-            TableMetadata tableMetadata = getTableMetadata(node.getTable());
-            output(indent, "scan %s", tableMetadata.getTable().getTableName());
-
-            return null;
+            DynamicFilters.ExtractResult filters = extractDynamicFilters(node.getPredicate());
+            String inputs = filters.getDynamicConjuncts().stream()
+                    .map(descriptor -> descriptor.getInput().toString())
+                    .sorted()
+                    .collect(joining(", "));
+
+            if (!inputs.isEmpty()) {
+                output(indent, "dynamic filter ([%s])", inputs);
+                indent = indent + 1;
+            }
+            return visitPlan(node, indent);
         }
 
-        private TableMetadata getTableMetadata(TableHandle tableHandle)
+        @Override
+        public Void visitTableScan(TableScanNode node, Integer indent)
         {
-            return getQueryRunner().getMetadata().getTableMetadata(session, tableHandle);
+            CatalogSchemaTableName tableName = getQueryRunner().getMetadata().getTableName(session, node.getTable());
+            output(indent, "scan %s", tableName.getSchemaTableName().getTableName());
+
+            return null;
         }
 
         @Override
diff --git a/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseHiveCostBasedPlanTest.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseHiveCostBasedPlanTest.java
index 2b90f0cb9489..c627ac63fe83 100644
--- a/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseHiveCostBasedPlanTest.java
+++ b/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseHiveCostBasedPlanTest.java
@@ -23,8 +23,6 @@
 import org.testng.annotations.BeforeClass;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.net.URL;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -55,18 +53,13 @@ protected ConnectorFactory createConnectorFactory()
         RecordingMetastoreConfig recordingConfig = new RecordingMetastoreConfig()
                 .setRecordingPath(getRecordingPath(metadataDir))
                 .setReplay(true);
-        try {
-            // The RecordingHiveMetastore loads the metadata files generated through HiveMetadataRecorder
-            // which essentially helps to generate the optimal query plans for validation purposes. These files
-            // contain all the metadata including statistics.
-            RecordingHiveMetastore metastore = new RecordingHiveMetastore(
-                    new UnimplementedHiveMetastore(),
-                    new HiveMetastoreRecording(recordingConfig, createJsonCodec()));
-            return new TestingHiveConnectorFactory(metastore);
-        }
-        catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
+        // The RecordingHiveMetastore loads the metadata files generated through HiveMetadataRecorder
+        // which essentially helps to generate the optimal query plans for validation purposes. These files
+        // contain all the metadata including statistics.
+        RecordingHiveMetastore metastore = new RecordingHiveMetastore(
+                new UnimplementedHiveMetastore(),
+                new HiveMetastoreRecording(recordingConfig, createJsonCodec()));
+        return new TestingHiveConnectorFactory(metastore);
     }
 
     private static String getSchema(String metadataDir)
diff --git a/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseIcebergCostBasedPlanTest.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseIcebergCostBasedPlanTest.java
index ae3109abde0e..f72934d93be8 100644
--- a/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseIcebergCostBasedPlanTest.java
+++ b/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseIcebergCostBasedPlanTest.java
@@ -15,19 +15,13 @@
 package io.trino.sql.planner;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.log.Logger;
-import io.trino.hdfs.DynamicHdfsConfiguration;
-import io.trino.hdfs.HdfsConfig;
-import io.trino.hdfs.HdfsConfigurationInitializer;
-import io.trino.hdfs.HdfsEnvironment;
-import io.trino.hdfs.authentication.NoHdfsAuthentication;
-import io.trino.plugin.hive.NodeVersion;
 import io.trino.plugin.hive.metastore.Database;
+import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.hive.metastore.HiveMetastoreFactory;
 import io.trino.plugin.hive.metastore.Table;
-import io.trino.plugin.hive.metastore.file.FileHiveMetastore;
-import io.trino.plugin.hive.metastore.file.FileHiveMetastoreConfig;
-import io.trino.plugin.hive.s3.HiveS3Config;
-import io.trino.plugin.hive.s3.TrinoS3ConfigurationInitializer;
+import io.trino.plugin.iceberg.IcebergConnector;
 import io.trino.plugin.iceberg.IcebergConnectorFactory;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorContext;
@@ -40,15 +34,12 @@
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeClass;
 
-import javax.annotation.concurrent.GuardedBy;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
@@ -61,6 +52,7 @@
 import static io.trino.plugin.iceberg.IcebergUtil.METADATA_FILE_EXTENSION;
 import static io.trino.plugin.iceberg.catalog.AbstractIcebergTableOperations.ICEBERG_METASTORE_STORAGE_FORMAT;
 import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
+import static io.trino.testing.containers.Minio.MINIO_REGION;
 import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
 import static java.nio.file.Files.createTempDirectory;
 import static java.util.Locale.ENGLISH;
@@ -86,7 +78,7 @@ public abstract class BaseIcebergCostBasedPlanTest
 
     protected Minio minio;
     private Path temporaryMetastoreDirectory;
-    private FileHiveMetastore fileMetastore;
+    private HiveMetastore hiveMetastore;
     private Map<String, String> connectorConfiguration;
 
     protected BaseIcebergCostBasedPlanTest(String schemaName, String fileFormatName, boolean partitioned)
@@ -119,34 +111,15 @@ protected ConnectorFactory createConnectorFactory()
             throw new UncheckedIOException(e);
         }
 
-        HdfsConfig hdfsConfig = new HdfsConfig();
-        HiveS3Config s3Config = new HiveS3Config()
-                .setS3Endpoint(minio.getMinioAddress())
-                .setS3AwsAccessKey(MINIO_ACCESS_KEY)
-                .setS3AwsSecretKey(MINIO_SECRET_KEY)
-                .setS3PathStyleAccess(true);
-        HdfsEnvironment hdfsEnvironment = new HdfsEnvironment(
-                new DynamicHdfsConfiguration(
-                        new HdfsConfigurationInitializer(hdfsConfig, Set.of(new TrinoS3ConfigurationInitializer(s3Config))),
-                        Set.of()),
-                hdfsConfig,
-                new NoHdfsAuthentication());
-
-        fileMetastore = new FileHiveMetastore(
-                // Must match the version picked by the LocalQueryRunner
-                new NodeVersion("<unknown>"),
-                hdfsEnvironment,
-                false,
-                new FileHiveMetastoreConfig()
-                        .setCatalogDirectory(temporaryMetastoreDirectory.toString()));
-
         connectorConfiguration = ImmutableMap.<String, String>builder()
                 .put("iceberg.catalog.type", TESTING_FILE_METASTORE.name())
                 .put("hive.metastore.catalog.dir", temporaryMetastoreDirectory.toString())
-                .put("hive.s3.endpoint", minio.getMinioAddress())
-                .put("hive.s3.aws-access-key", MINIO_ACCESS_KEY)
-                .put("hive.s3.aws-secret-key", MINIO_SECRET_KEY)
-                .put("hive.s3.path-style-access", "true")
+                .put("fs.native-s3.enabled", "true")
+                .put("s3.aws-access-key", MINIO_ACCESS_KEY)
+                .put("s3.aws-secret-key", MINIO_SECRET_KEY)
+                .put("s3.region", MINIO_REGION)
+                .put("s3.endpoint", minio.getMinioAddress())
+                .put("s3.path-style-access", "true")
                 .put(EXTENDED_STATISTICS_CONFIG, "true")
                 .buildOrThrow();
 
@@ -156,7 +129,11 @@ protected ConnectorFactory createConnectorFactory()
             public Connector create(String catalogName, Map<String, String> config, ConnectorContext context)
             {
                 checkArgument(config.isEmpty(), "Unexpected configuration %s", config);
-                return super.create(catalogName, connectorConfiguration, context);
+                Connector connector = super.create(catalogName, connectorConfiguration, context);
+                hiveMetastore = ((IcebergConnector) connector).getInjector()
+                        .getInstance(HiveMetastoreFactory.class)
+                        .createMetastore(Optional.empty());
+                return connector;
             }
         };
     }
@@ -166,7 +143,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
     public void prepareTables()
     {
         String schema = getQueryRunner().getDefaultSession().getSchema().orElseThrow();
-        fileMetastore.createDatabase(
+        hiveMetastore.createDatabase(
                 Database.builder()
                         .setDatabaseName(schema)
                         .setOwnerName(Optional.empty())
@@ -195,7 +172,7 @@ protected void populateTableFromResource(String tableName, String resourcePath,
         }
 
         log.info("Registering table %s using metadata location %s", tableName, metadataLocation);
-        fileMetastore.createTable(
+        hiveMetastore.createTable(
                 Table.builder()
                         .setDatabaseName(schema)
                         .setTableName(tableName)
@@ -228,7 +205,7 @@ public void cleanUp()
             deleteRecursively(temporaryMetastoreDirectory, ALLOW_INSECURE);
         }
 
-        fileMetastore = null;
+        hiveMetastore = null;
         connectorConfiguration = null;
     }
 
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/BaseQueryAssertionsTest.java b/testing/trino-tests/src/test/java/io/trino/tests/BaseQueryAssertionsTest.java
index 0b9abeb8f2d4..68a95015e993 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/BaseQueryAssertionsTest.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/BaseQueryAssertionsTest.java
@@ -24,7 +24,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -93,7 +93,11 @@ public void testWrongType()
     {
         QueryAssert queryAssert = assertThat(query("SELECT X'001234'"));
         assertThatThrownBy(() -> queryAssert.matches("VALUES '001234'"))
-                .hasMessageContaining("[Output types for query [SELECT X'001234']] expected:<[var[char(6)]]> but was:<[var[binary]]>");
+                .hasMessageContaining("""
+                        [Output types for query [SELECT X'001234']]\s
+                        expected: [varchar(6)]
+                         but was: [varbinary]
+                        """);
     }
 
     @Test
@@ -101,7 +105,11 @@ public void testWrongTypeWithEmptyResult()
     {
         QueryAssert queryAssert = assertThat(query("SELECT X'001234' WHERE false"));
         assertThatThrownBy(() -> queryAssert.matches("SELECT '001234' WHERE false"))
-                .hasMessageContaining("[Output types for query [SELECT X'001234' WHERE false]] expected:<[var[char(6)]]> but was:<[var[binary]]>");
+                .hasMessageContaining("""
+                        [Output types for query [SELECT X'001234' WHERE false]]\s
+                        expected: [varchar(6)]
+                         but was: [varbinary]
+                        """);
     }
 
     @Test
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/FailingMockConnectorPlugin.java b/testing/trino-tests/src/test/java/io/trino/tests/FailingMockConnectorPlugin.java
new file mode 100644
index 000000000000..e686d8f5a8f0
--- /dev/null
+++ b/testing/trino-tests/src/test/java/io/trino/tests/FailingMockConnectorPlugin.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed 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 io.trino.tests;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.connector.MockConnectorFactory;
+import io.trino.spi.Plugin;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorFactory;
+
+import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+
+public class FailingMockConnectorPlugin
+        implements Plugin
+{
+    @Override
+    public Iterable<ConnectorFactory> getConnectorFactories()
+    {
+        return ImmutableList.of(
+                MockConnectorFactory.builder()
+                        .withName("failing_mock")
+                        .withListSchemaNames(session -> {
+                            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Catalog is broken");
+                        })
+                        .withListTables((session, schema) -> {
+                            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Catalog is broken");
+                        })
+                        .withGetViews((session, prefix) -> {
+                            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Catalog is broken");
+                        })
+                        .withGetMaterializedViews((session, prefix) -> {
+                            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Catalog is broken");
+                        })
+                        .withListTablePrivileges((session, prefix) -> {
+                            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Catalog is broken");
+                        })
+                        .withStreamTableColumns((session, prefix) -> {
+                            throw new TrinoException(GENERIC_INTERNAL_ERROR, "Catalog is broken");
+                        })
+                        .build());
+    }
+}
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestAdaptivePartialAggregation.java b/testing/trino-tests/src/test/java/io/trino/tests/TestAdaptivePartialAggregation.java
index 3b9fa208c216..331aaa258b08 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestAdaptivePartialAggregation.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestAdaptivePartialAggregation.java
@@ -27,7 +27,6 @@ protected QueryRunner createQueryRunner()
     {
         return TpchQueryRunnerBuilder.builder()
                 .setExtraProperties(ImmutableMap.of(
-                        "adaptive-partial-aggregation.min-rows", "0",
                         "task.max-partial-aggregation-memory", "0B"))
                 .build();
     }
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestAggregations.java b/testing/trino-tests/src/test/java/io/trino/tests/TestAggregations.java
index 1355594176a9..df2da3a39792 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestAggregations.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestAggregations.java
@@ -22,7 +22,7 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Predicate;
 
@@ -90,18 +90,6 @@ public void testPreAggregate()
                 "VALUES (22, 2, 11, 64)",
                 plan -> assertAggregationNodeCount(plan, 4));
 
-        assertQuery(
-                memorySession,
-                "SELECT " +
-                        "sum(CASE WHEN sequence = 0 THEN value END), " +
-                        "min(CASE WHEN sequence = 1 THEN value ELSE null END), " +
-                        "max(CASE WHEN sequence = 0 THEN value END), " +
-                        "sum(CASE WHEN sequence = 1 THEN value * 2 ELSE 0 END) " +
-                        "FROM test_table " +
-                        "WHERE sequence = 42",
-                "VALUES (null, null, null, null)",
-                plan -> assertAggregationNodeCount(plan, 4));
-
         assertQuery(
                 memorySession,
                 "SELECT " +
@@ -155,6 +143,22 @@ public void testPreAggregate()
                 plan -> assertAggregationNodeCount(plan, 4));
     }
 
+    @Test
+    public void testPreAggregateWithFilter()
+    {
+        assertQuery(
+                memorySession,
+                "SELECT " +
+                        "sum(CASE WHEN sequence = 0 THEN value END), " +
+                        "min(CASE WHEN sequence = 1 THEN value ELSE null END), " +
+                        "max(CASE WHEN sequence = 0 THEN value END), " +
+                        "sum(CASE WHEN sequence = 1 THEN value * 2 ELSE 0 END) " +
+                        "FROM test_table " +
+                        "WHERE sequence = 42",
+                "VALUES (null, null, null, null)",
+                plan -> assertAggregationNodeCount(plan, 4));
+    }
+
     private void assertAggregationNodeCount(Plan plan, int count)
     {
         assertThat(countOfMatchingNodes(plan, AggregationNode.class::isInstance)).isEqualTo(count);
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestDictionaryAggregation.java b/testing/trino-tests/src/test/java/io/trino/tests/TestDictionaryAggregation.java
index daca464ea087..c45cbe27a408 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestDictionaryAggregation.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestDictionaryAggregation.java
@@ -18,7 +18,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SystemSessionProperties.DICTIONARY_AGGREGATION;
 import static io.trino.SystemSessionProperties.JOIN_REORDERING_STRATEGY;
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestDistributedQueriesNoHashGeneration.java b/testing/trino-tests/src/test/java/io/trino/tests/TestDistributedQueriesNoHashGeneration.java
index e05076d031f1..6fa44589bc15 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestDistributedQueriesNoHashGeneration.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestDistributedQueriesNoHashGeneration.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests;
 
+import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestQueries;
 import io.trino.testing.QueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
@@ -25,7 +26,7 @@ protected QueryRunner createQueryRunner()
             throws Exception
     {
         return TpchQueryRunnerBuilder.builder()
-                .setSingleCoordinatorProperty("optimizer.optimize-hash-generation", "false")
+                .setCoordinatorProperties(ImmutableMap.of("optimizer.optimize-hash-generation", "false"))
                 .build();
     }
 }
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestDistributedSpilledQueries.java b/testing/trino-tests/src/test/java/io/trino/tests/TestDistributedSpilledQueries.java
index 3036cbbda357..216e04e2bc8c 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestDistributedSpilledQueries.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestDistributedSpilledQueries.java
@@ -19,14 +19,12 @@
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.testing.AbstractTestQueries;
 import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.Test;
 
 import java.nio.file.Paths;
 
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.util.UUID.randomUUID;
-import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDistributedSpilledQueries
         extends AbstractTestQueries
@@ -71,12 +69,4 @@ public static DistributedQueryRunner createSpillingQueryRunner()
             throw e;
         }
     }
-
-    // The spilling does not happen deterministically. TODO improve query and configuration so that it does.
-    @Test(invocationCount = 10, successPercentage = 20)
-    public void testExplainAnalyzeReportSpilledDataSize()
-    {
-        assertThat((String) computeActual("EXPLAIN ANALYZE SELECT sum(custkey) OVER (PARTITION BY orderkey) FROM orders").getOnlyValue())
-                .containsPattern(", Spilled: [1-9][0-9]*\\wB");
-    }
 }
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestExcludeColumnsFunction.java b/testing/trino-tests/src/test/java/io/trino/tests/TestExcludeColumnsFunction.java
index 439445cf1eb6..774e0d3df022 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestExcludeColumnsFunction.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestExcludeColumnsFunction.java
@@ -17,7 +17,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestGetTableStatisticsOperations.java b/testing/trino-tests/src/test/java/io/trino/tests/TestGetTableStatisticsOperations.java
index e5f8ce4dc6d2..e50a7c4307f9 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestGetTableStatisticsOperations.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestGetTableStatisticsOperations.java
@@ -14,89 +14,104 @@
 package io.trino.tests;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMultiset;
+import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.sdk.trace.data.SpanData;
+import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
 import io.trino.execution.warnings.WarningCollector;
-import io.trino.metadata.CountingAccessMetadata;
-import io.trino.metadata.MetadataManager;
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.QueryRunner;
+import io.trino.testng.services.ManageTestResources;
+import io.trino.tracing.TracingMetadata;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
 import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.transaction.TransactionBuilder.transaction;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true) // counting metadata is a shared mutable state
+@TestInstance(PER_CLASS)
 public class TestGetTableStatisticsOperations
         extends AbstractTestQueryFramework
 {
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
     private LocalQueryRunner localQueryRunner;
-    private CountingAccessMetadata metadata;
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
+    private InMemorySpanExporter spanExporter;
 
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
+        spanExporter = closeAfterClass(InMemorySpanExporter.create());
+
+        SdkTracerProvider tracerProvider = SdkTracerProvider.builder()
+                .addSpanProcessor(SimpleSpanProcessor.create(spanExporter))
+                .build();
+
         localQueryRunner = LocalQueryRunner.builder(testSessionBuilder().build())
-                .withMetadataProvider((systemSecurityMetadata, transactionManager, globalFunctionCatalog, typeManager)
-                        -> new CountingAccessMetadata(new MetadataManager(systemSecurityMetadata, transactionManager, globalFunctionCatalog, typeManager)))
+                .withMetadataDecorator(metadata -> new TracingMetadata(tracerProvider.get("test"), metadata))
                 .build();
-        metadata = (CountingAccessMetadata) localQueryRunner.getMetadata();
         localQueryRunner.installPlugin(new TpchPlugin());
         localQueryRunner.createCatalog("tpch", "tpch", ImmutableMap.of());
         return localQueryRunner;
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         localQueryRunner.close();
         localQueryRunner = null;
-        metadata = null;
+        spanExporter = null;
     }
 
-    @BeforeMethod
-    public void resetCounters()
+    private void resetCounters()
     {
-        metadata.resetCounters();
+        spanExporter.reset();
     }
 
     @Test
     public void testTwoWayJoin()
     {
+        resetCounters();
+
         planDistributedQuery("SELECT * " +
                 "FROM tpch.tiny.orders o, tpch.tiny.lineitem l " +
                 "WHERE o.orderkey = l.orderkey");
-        assertThat(metadata.getMethodInvocations()).containsExactlyInAnyOrderElementsOf(
-                ImmutableMultiset.<CountingAccessMetadata.Methods>builder()
-                        .addCopies(CountingAccessMetadata.Methods.GET_TABLE_STATISTICS, 2)
-                        .build());
+        assertThat(getTableStatisticsMethodInvocations()).isEqualTo(2);
     }
 
     @Test
     public void testThreeWayJoin()
     {
+        resetCounters();
+
         planDistributedQuery("SELECT * " +
                 "FROM tpch.tiny.customer c, tpch.tiny.orders o, tpch.tiny.lineitem l " +
                 "WHERE o.orderkey = l.orderkey AND c.custkey = o.custkey");
-        assertThat(metadata.getMethodInvocations()).containsExactlyInAnyOrderElementsOf(
-                ImmutableMultiset.<CountingAccessMetadata.Methods>builder()
-                        .addCopies(CountingAccessMetadata.Methods.GET_TABLE_STATISTICS, 3)
-                        .build());
+        assertThat(getTableStatisticsMethodInvocations()).isEqualTo(3);
     }
 
     private void planDistributedQuery(@Language("SQL") String sql)
     {
-        transaction(localQueryRunner.getTransactionManager(), localQueryRunner.getAccessControl())
-                .execute(localQueryRunner.getDefaultSession(), session -> {
-                    localQueryRunner.createPlan(session, sql, OPTIMIZED_AND_VALIDATED, false, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
+        transaction(localQueryRunner.getTransactionManager(), localQueryRunner.getMetadata(), localQueryRunner.getAccessControl())
+                .execute(localQueryRunner.getDefaultSession(), transactionSession -> {
+                    localQueryRunner.createPlan(transactionSession, sql, localQueryRunner.getPlanOptimizers(false), OPTIMIZED_AND_VALIDATED, WarningCollector.NOOP, createPlanOptimizersStatsCollector());
                 });
     }
+
+    private long getTableStatisticsMethodInvocations()
+    {
+        return spanExporter.getFinishedSpanItems().stream()
+                .map(SpanData::getName)
+                .filter(name -> name.equals("Metadata.getTableStatistics"))
+                .count();
+    }
 }
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestGracefulShutdown.java b/testing/trino-tests/src/test/java/io/trino/tests/TestGracefulShutdown.java
index 9a949f3e7c8e..511b52a9da5c 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestGracefulShutdown.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestGracefulShutdown.java
@@ -24,13 +24,16 @@
 import io.trino.server.testing.TestingTrinoServer;
 import io.trino.server.testing.TestingTrinoServer.TestShutdownAction;
 import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static io.trino.execution.QueryState.FINISHED;
@@ -39,10 +42,11 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestGracefulShutdown
 {
     private static final long SHUTDOWN_TIMEOUT_MILLIS = 240_000;
@@ -53,19 +57,20 @@ public class TestGracefulShutdown
 
     private ListeningExecutorService executor;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         executor = MoreExecutors.listeningDecorator(newCachedThreadPool());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void shutdown()
     {
         executor.shutdownNow();
     }
 
-    @Test(timeOut = SHUTDOWN_TIMEOUT_MILLIS)
+    @Test
+    @Timeout(value = SHUTDOWN_TIMEOUT_MILLIS, unit = TimeUnit.MILLISECONDS)
     public void testShutdown()
             throws Exception
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestInformationSchemaConnector.java b/testing/trino-tests/src/test/java/io/trino/tests/TestInformationSchemaConnector.java
deleted file mode 100644
index 7bcd02a57efd..000000000000
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestInformationSchemaConnector.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Licensed 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 io.trino.tests;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import io.trino.Session;
-import io.trino.connector.MockConnectorFactory;
-import io.trino.plugin.tpch.TpchPlugin;
-import io.trino.spi.Plugin;
-import io.trino.spi.TrinoException;
-import io.trino.spi.connector.ConnectorFactory;
-import io.trino.testing.AbstractTestQueryFramework;
-import io.trino.testing.CountingMockConnector;
-import io.trino.testing.CountingMockConnector.MetadataCallsCount;
-import io.trino.testing.DistributedQueryRunner;
-import org.testng.annotations.Test;
-
-import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
-import static io.trino.testing.TestingSession.testSessionBuilder;
-import static org.testng.Assert.assertEquals;
-
-@Test(singleThreaded = true)
-public class TestInformationSchemaConnector
-        extends AbstractTestQueryFramework
-{
-    private final CountingMockConnector countingMockConnector = new CountingMockConnector();
-
-    @Test
-    public void testBasic()
-    {
-        assertQuery("SELECT count(*) FROM tpch.information_schema.schemata", "VALUES 10");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.tables", "VALUES 80");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns", "VALUES 583");
-        assertQuery("SELECT * FROM tpch.information_schema.schemata ORDER BY 1 DESC, 2 DESC LIMIT 1", "VALUES ('tpch', 'tiny')");
-        assertQuery("SELECT * FROM tpch.information_schema.tables ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC LIMIT 1", "VALUES ('tpch', 'tiny', 'supplier', 'BASE TABLE')");
-        assertQuery("SELECT * FROM tpch.information_schema.columns ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC LIMIT 1", "VALUES ('tpch', 'tiny', 'supplier', 'suppkey', 1, NULL, 'NO', 'bigint')");
-        assertQuery("SELECT * FROM test_catalog.information_schema.columns ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC LIMIT 1", "VALUES ('test_catalog', 'test_schema2', 'test_table999', 'column_99', 100, NULL, 'YES', 'varchar')");
-        assertQuery("SELECT count(*) FROM test_catalog.information_schema.columns", "VALUES 300034");
-    }
-
-    @Test
-    public void testSchemaNamePredicate()
-    {
-        assertQuery("SELECT count(*) FROM tpch.information_schema.schemata WHERE schema_name = 'sf1'", "VALUES 1");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.schemata WHERE schema_name IS NOT NULL", "VALUES 10");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_schema = 'sf1'", "VALUES 8");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_schema IS NOT NULL", "VALUES 80");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema = 'sf1'", "VALUES 61");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema = 'information_schema'", "VALUES 34");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema > 'sf100'", "VALUES 427");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema != 'sf100'", "VALUES 522");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema LIKE 'sf100'", "VALUES 61");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema LIKE 'sf%'", "VALUES 488");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema IS NOT NULL", "VALUES 583");
-    }
-
-    @Test
-    public void testTableNamePredicate()
-    {
-        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name = 'orders'", "VALUES 9");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name = 'ORDERS'", "VALUES 0");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name LIKE 'orders'", "VALUES 9");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name < 'orders'", "VALUES 30");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name LIKE 'part'", "VALUES 9");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name LIKE 'part%'", "VALUES 18");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_name IS NOT NULL", "VALUES 80");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_name = 'orders'", "VALUES 81");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_name LIKE 'orders'", "VALUES 81");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_name < 'orders'", "VALUES 265");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_name LIKE 'part'", "VALUES 81");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_name LIKE 'part%'", "VALUES 126");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_name IS NOT NULL", "VALUES 583");
-    }
-
-    @Test
-    public void testMixedPredicate()
-    {
-        assertQuery("SELECT * FROM tpch.information_schema.tables WHERE table_schema = 'sf1' and table_name = 'orders'", "VALUES ('tpch', 'sf1', 'orders', 'BASE TABLE')");
-        assertQuery("SELECT table_schema FROM tpch.information_schema.tables WHERE table_schema IS NOT NULL and table_name = 'orders'", "VALUES 'tiny', 'sf1', 'sf100', 'sf1000', 'sf10000', 'sf100000', 'sf300', 'sf3000', 'sf30000'");
-        assertQuery("SELECT table_name FROM tpch.information_schema.tables WHERE table_schema = 'sf1' and table_name IS NOT NULL", "VALUES 'customer', 'lineitem', 'orders', 'part', 'partsupp', 'supplier', 'nation', 'region'");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema = 'sf1' and table_name = 'orders'", "VALUES 9");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema IS NOT NULL and table_name = 'orders'", "VALUES 81");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema = 'sf1' and table_name IS NOT NULL", "VALUES 61");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.tables WHERE table_schema > 'sf1' and table_name < 'orders'", "VALUES 24");
-        assertQuery("SELECT count(*) FROM tpch.information_schema.columns WHERE table_schema > 'sf1' and table_name < 'orders'", "VALUES 224");
-    }
-
-    @Test
-    public void testProject()
-    {
-        assertQuery("SELECT schema_name FROM tpch.information_schema.schemata ORDER BY 1 DESC LIMIT 1", "VALUES 'tiny'");
-        assertQuery("SELECT table_name, table_type FROM tpch.information_schema.tables ORDER BY 1 DESC, 2 DESC LIMIT 1", "VALUES ('views', 'BASE TABLE')");
-        assertQuery("SELECT column_name, data_type FROM tpch.information_schema.columns ORDER BY 1 DESC, 2 DESC LIMIT 1", "VALUES ('with_hierarchy', 'varchar')");
-    }
-
-    @Test
-    public void testLimit()
-    {
-        assertQuery("SELECT count(*) FROM (SELECT * from tpch.information_schema.columns LIMIT 1)", "VALUES 1");
-        assertQuery("SELECT count(*) FROM (SELECT * FROM tpch.information_schema.columns LIMIT 100)", "VALUES 100");
-        assertQuery("SELECT count(*) FROM (SELECT * FROM test_catalog.information_schema.tables LIMIT 1000)", "VALUES 1000");
-    }
-
-    @Test(timeOut = 60_000)
-    public void testMetadataCalls()
-    {
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.schemata WHERE schema_name LIKE 'test_sch_ma1'",
-                "VALUES 1",
-                new MetadataCallsCount()
-                        .withListSchemasCount(1));
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.schemata WHERE schema_name LIKE 'test_sch_ma1' AND schema_name IN ('test_schema1', 'test_schema2')",
-                "VALUES 1",
-                new MetadataCallsCount()
-                        .withListSchemasCount(1));
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.tables",
-                "VALUES 3008",
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2));
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.tables WHERE table_schema = 'test_schema1'",
-                "VALUES 1000",
-                new MetadataCallsCount()
-                        .withListTablesCount(1));
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.tables WHERE table_schema LIKE 'test_sch_ma1'",
-                "VALUES 1000",
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(1));
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.tables WHERE table_schema LIKE 'test_sch_ma1' AND table_schema IN ('test_schema1', 'test_schema2')",
-                "VALUES 1000",
-                new MetadataCallsCount()
-                        .withListTablesCount(2));
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.tables WHERE table_name = 'test_table1'",
-                "VALUES 2",
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withGetTableHandleCount(2));
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.tables WHERE table_name LIKE 'test_t_ble1'",
-                "VALUES 2",
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(2));
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.tables WHERE table_name LIKE 'test_t_ble1' AND table_name IN ('test_table1', 'test_table2')",
-                "VALUES 2",
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withGetTableHandleCount(4));
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.columns WHERE table_schema = 'test_schema1' AND table_name = 'test_table1'",
-                "VALUES 100",
-                new MetadataCallsCount()
-                        .withListTablesCount(1)
-                        .withGetTableHandleCount(1)
-                        .withGetColumnsCount(1));
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.columns WHERE table_catalog = 'wrong'",
-                "VALUES 0",
-                new MetadataCallsCount());
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.columns WHERE table_catalog = 'test_catalog' AND table_schema = 'wrong_schema1' AND table_name = 'test_table1'",
-                "VALUES 0",
-                new MetadataCallsCount()
-                        .withListTablesCount(1)
-                        .withGetTableHandleCount(1));
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.columns WHERE table_catalog IN ('wrong', 'test_catalog') AND table_schema = 'wrong_schema1' AND table_name = 'test_table1'",
-                "VALUES 0",
-                new MetadataCallsCount()
-                        .withListTablesCount(1)
-                        .withGetTableHandleCount(1));
-        assertMetadataCalls(
-                "SELECT count(*) FROM (SELECT * from test_catalog.information_schema.columns LIMIT 1)",
-                "VALUES 1",
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withGetColumnsCount(0));
-        assertMetadataCalls(
-                "SELECT count(*) FROM (SELECT * from test_catalog.information_schema.columns LIMIT 1000)",
-                "VALUES 1000",
-                new MetadataCallsCount()
-                        .withListSchemasCount(1)
-                        .withListTablesCount(1)
-                        .withGetColumnsCount(1000));
-
-        // Empty table schema and table name
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.tables WHERE table_schema = '' AND table_name = ''",
-                "VALUES 0",
-                new MetadataCallsCount());
-
-        // Empty table schema
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.tables WHERE table_schema = ''",
-                "VALUES 0",
-                new MetadataCallsCount()
-                        .withListTablesCount(1));
-
-        // Empty table name
-        assertMetadataCalls(
-                "SELECT count(*) from test_catalog.information_schema.tables WHERE table_name = ''",
-                "VALUES 0",
-                new MetadataCallsCount()
-                        .withListSchemasCount(1));
-    }
-
-    @Test
-    public void testMetadataListingExceptionHandling()
-    {
-        assertQueryFails(
-                "SELECT * FROM broken_catalog.information_schema.schemata",
-                "Error listing schemas for catalog broken_catalog: Catalog is broken");
-
-        assertQueryFails(
-                "SELECT * FROM broken_catalog.information_schema.tables",
-                "Error listing tables for catalog broken_catalog: Catalog is broken");
-
-        assertQueryFails(
-                "SELECT * FROM broken_catalog.information_schema.views",
-                "Error listing views for catalog broken_catalog: Catalog is broken");
-
-        assertQueryFails(
-                "SELECT * FROM broken_catalog.information_schema.table_privileges",
-                "Error listing table privileges for catalog broken_catalog: Catalog is broken");
-
-        assertQueryFails(
-                "SELECT * FROM broken_catalog.information_schema.columns",
-                "Error listing table columns for catalog broken_catalog: Catalog is broken");
-    }
-
-    @Override
-    protected DistributedQueryRunner createQueryRunner()
-            throws Exception
-    {
-        Session session = testSessionBuilder().build();
-        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session)
-                .setNodeCount(1)
-                .build();
-        try {
-            queryRunner.installPlugin(new TpchPlugin());
-            queryRunner.createCatalog("tpch", "tpch");
-
-            queryRunner.installPlugin(countingMockConnector.getPlugin());
-            queryRunner.createCatalog("test_catalog", "mock", ImmutableMap.of());
-
-            queryRunner.installPlugin(new FailingMockConnectorPlugin());
-            queryRunner.createCatalog("broken_catalog", "failing_mock", ImmutableMap.of());
-            return queryRunner;
-        }
-        catch (Exception e) {
-            queryRunner.close();
-            throw e;
-        }
-    }
-
-    private void assertMetadataCalls(String actualSql, String expectedSql, MetadataCallsCount expectedMetadataCallsCount)
-    {
-        MetadataCallsCount actualMetadataCallsCount = countingMockConnector.runCounting(() -> {
-            // expectedSql is run on H2, so does not affect counts.
-            assertQuery(actualSql, expectedSql);
-        });
-
-        assertEquals(actualMetadataCallsCount, expectedMetadataCallsCount);
-    }
-
-    private static final class FailingMockConnectorPlugin
-            implements Plugin
-    {
-        @Override
-        public Iterable<ConnectorFactory> getConnectorFactories()
-        {
-            return ImmutableList.of(
-                    MockConnectorFactory.builder()
-                            .withName("failing_mock")
-                            .withListSchemaNames(session -> {
-                                throw new TrinoException(GENERIC_INTERNAL_ERROR, "Catalog is broken");
-                            })
-                            .withListTables((session, schema) -> {
-                                throw new TrinoException(GENERIC_INTERNAL_ERROR, "Catalog is broken");
-                            })
-                            .withGetViews((session, prefix) -> {
-                                throw new TrinoException(GENERIC_INTERNAL_ERROR, "Catalog is broken");
-                            })
-                            .withGetMaterializedViews((session, prefix) -> {
-                                throw new TrinoException(GENERIC_INTERNAL_ERROR, "Catalog is broken");
-                            })
-                            .withListTablePrivileges((session, prefix) -> {
-                                throw new TrinoException(GENERIC_INTERNAL_ERROR, "Catalog is broken");
-                            })
-                            .withStreamTableColumns((session, prefix) -> {
-                                throw new TrinoException(GENERIC_INTERNAL_ERROR, "Catalog is broken");
-                            })
-                            .build());
-        }
-    }
-}
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestJoinQueries.java b/testing/trino-tests/src/test/java/io/trino/tests/TestJoinQueries.java
index 1d87547ccb30..f1c8aace13f2 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestJoinQueries.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestJoinQueries.java
@@ -19,7 +19,8 @@
 import io.trino.testing.MaterializedResult;
 import io.trino.testing.QueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import static com.google.common.base.Verify.verify;
 import static io.trino.testing.QueryAssertions.assertEqualsIgnoreOrder;
@@ -61,7 +62,8 @@ public void verifyDynamicFilteringEnabled()
      * Note: The test is expected to take ~25 second. The increase in run time is contributed by the decreased split queue size and the
      * decreased size of the broadcast output buffer.
      */
-    @Test(timeOut = 120_000)
+    @Test
+    @Timeout(120)
     public void testBroadcastJoinDeadlockResolution()
             throws Exception
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestJoinQueriesWithoutDynamicFiltering.java b/testing/trino-tests/src/test/java/io/trino/tests/TestJoinQueriesWithoutDynamicFiltering.java
index 2e9395003afa..d2e0de4cd0c3 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestJoinQueriesWithoutDynamicFiltering.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestJoinQueriesWithoutDynamicFiltering.java
@@ -17,7 +17,7 @@
 import io.trino.testing.AbstractTestJoinQueries;
 import io.trino.testing.QueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @see TestJoinQueries for tests with dynamic filtering enabled
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestLateMaterializationQueries.java b/testing/trino-tests/src/test/java/io/trino/tests/TestLateMaterializationQueries.java
index e97f3025e861..65b18bc48389 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestLateMaterializationQueries.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestLateMaterializationQueries.java
@@ -22,7 +22,7 @@
 import io.trino.testing.QueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SystemSessionProperties.FILTERING_SEMI_JOIN_TO_INNER;
 import static io.trino.SystemSessionProperties.JOIN_DISTRIBUTION_TYPE;
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestLocalQueries.java b/testing/trino-tests/src/test/java/io/trino/tests/TestLocalQueries.java
index 0b77e3daf21f..3de29535bd5c 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestLocalQueries.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestLocalQueries.java
@@ -19,7 +19,7 @@
 import io.trino.testing.AbstractTestQueries;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.SystemSessionProperties.PUSH_PARTIAL_AGGREGATION_THROUGH_JOIN;
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestLocalQueryAssertions.java b/testing/trino-tests/src/test/java/io/trino/tests/TestLocalQueryAssertions.java
index 3bb02e43a1b2..2a22eda30e60 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestLocalQueryAssertions.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestLocalQueryAssertions.java
@@ -16,7 +16,7 @@
 import io.trino.Session;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.testing.Closeables.closeAllSuppress;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -44,6 +44,7 @@ protected QueryRunner createQueryRunner()
         return queryRunner;
     }
 
+    @Test
     @Override
     public void testIsFullyPushedDown()
     {
@@ -52,6 +53,7 @@ public void testIsFullyPushedDown()
                 .hasMessage("isFullyPushedDown() currently does not work with LocalQueryRunner");
     }
 
+    @Test
     @Override
     public void testIsFullyPushedDownWithSession()
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestMetadataManager.java b/testing/trino-tests/src/test/java/io/trino/tests/TestMetadataManager.java
index e9cb45d476a7..ccd39bc5a479 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestMetadataManager.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestMetadataManager.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.opentelemetry.api.trace.Span;
 import io.trino.connector.MockConnectorFactory;
 import io.trino.connector.MockConnectorTableHandle;
 import io.trino.dispatcher.DispatchManager;
@@ -30,11 +31,13 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.TestingSessionContext;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
+import io.trino.tracing.TracingMetadata;
 import io.trino.transaction.TransactionBuilder;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 import java.util.Optional;
@@ -45,6 +48,7 @@
 import static io.trino.spi.type.BigintType.BIGINT;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 
 /**
@@ -53,13 +57,13 @@
  * while registering catalog -> query Id mapping.
  * This mapping has to be manually cleaned when query finishes execution (Metadata#cleanupQuery method).
  */
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestMetadataManager
 {
     private DistributedQueryRunner queryRunner;
     private MetadataManager metadataManager;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -87,10 +91,10 @@ public Iterable<ConnectorFactory> getConnectorFactories()
             }
         });
         queryRunner.createCatalog("upper_case_schema_catalog", "mock");
-        metadataManager = (MetadataManager) queryRunner.getMetadata();
+        metadataManager = (MetadataManager) ((TracingMetadata) queryRunner.getMetadata()).getDelegate();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
@@ -121,7 +125,7 @@ public void testMetadataIsClearedAfterQueryFailed()
     @Test
     public void testMetadataListTablesReturnsQualifiedView()
     {
-        TransactionBuilder.transaction(queryRunner.getTransactionManager(), queryRunner.getAccessControl())
+        TransactionBuilder.transaction(queryRunner.getTransactionManager(), metadataManager, queryRunner.getAccessControl())
                 .execute(
                         TEST_SESSION,
                         transactionSession -> {
@@ -138,6 +142,7 @@ public void testMetadataIsClearedAfterQueryCanceled()
         QueryId queryId = dispatchManager.createQueryId();
         dispatchManager.createQuery(
                 queryId,
+                Span.getInvalid(),
                 Slug.createNew(),
                 TestingSessionContext.fromSession(TEST_SESSION),
                 "SELECT * FROM lineitem")
@@ -164,7 +169,7 @@ public void testMetadataIsClearedAfterQueryCanceled()
     @Test
     public void testUpperCaseSchemaIsChangedToLowerCase()
     {
-        TransactionBuilder.transaction(queryRunner.getTransactionManager(), queryRunner.getAccessControl())
+        TransactionBuilder.transaction(queryRunner.getTransactionManager(), metadataManager, queryRunner.getAccessControl())
                 .execute(
                         TEST_SESSION,
                         transactionSession -> {
@@ -214,6 +219,7 @@ private static ConnectorViewDefinition getConnectorViewDefinition()
                 ImmutableList.of(new ConnectorViewDefinition.ViewColumn("col", BIGINT.getTypeId(), Optional.empty())),
                 Optional.of("comment"),
                 Optional.of("test_owner"),
-                false);
+                false,
+                ImmutableList.of());
     }
 }
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestMockConnector.java b/testing/trino-tests/src/test/java/io/trino/tests/TestMockConnector.java
index a3a109be2ed6..8defcb268fdb 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestMockConnector.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestMockConnector.java
@@ -36,8 +36,9 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
+import java.time.Duration;
 import java.util.Optional;
 
 import static io.trino.connector.MockConnectorEntities.TPCH_NATION_DATA;
@@ -86,7 +87,8 @@ protected QueryRunner createQueryRunner()
                                                 ImmutableList.of(new ViewColumn("nationkey", BIGINT.getTypeId(), Optional.empty())),
                                                 Optional.empty(),
                                                 Optional.of("alice"),
-                                                false)))
+                                                false,
+                                                ImmutableList.of())))
                                 .withGetMaterializedViewProperties(() -> ImmutableList.of(
                                         durationProperty(
                                                 "refresh_interval",
@@ -101,8 +103,10 @@ protected QueryRunner createQueryRunner()
                                                 Optional.of("mock"),
                                                 Optional.of("default"),
                                                 ImmutableList.of(new Column("nationkey", BIGINT.getTypeId())),
+                                                Optional.of(Duration.ZERO),
                                                 Optional.empty(),
                                                 Optional.of("alice"),
+                                                ImmutableList.of(),
                                                 ImmutableMap.of())))
                                 .withData(schemaTableName -> {
                                     if (schemaTableName.equals(new SchemaTableName("default", "nation"))) {
@@ -235,9 +239,9 @@ public void testTableProcedure()
     public void testTableFunction()
     {
         assertThatThrownBy(() -> assertUpdate("SELECT * FROM TABLE(mock.system.simple_table_function())"))
-                .hasMessage("missing ConnectorSplitSource for table function system.simple_table_function");
+                .hasMessage("missing ConnectorSplitSource for table function handle SimpleTableFunctionHandle");
         assertThatThrownBy(() -> assertUpdate("SELECT * FROM TABLE(mock.system.non_existing_table_function())"))
-                .hasMessageContaining("Table function mock.system.non_existing_table_function not registered");
+                .hasMessageContaining("Table function 'mock.system.non_existing_table_function' not registered");
     }
 
     @Test
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestOptimizeMixedDistinctAggregations.java b/testing/trino-tests/src/test/java/io/trino/tests/TestOptimizeMixedDistinctAggregations.java
index e700aca33cfc..595f0606a06b 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestOptimizeMixedDistinctAggregations.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestOptimizeMixedDistinctAggregations.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests;
 
+import com.google.common.collect.ImmutableMap;
 import io.trino.testing.AbstractTestAggregations;
 import io.trino.testing.QueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
@@ -25,16 +26,9 @@ protected QueryRunner createQueryRunner()
             throws Exception
     {
         return TpchQueryRunnerBuilder.builder()
-                .setSingleCoordinatorProperty("optimizer.optimize-mixed-distinct-aggregations", "true")
+                .setCoordinatorProperties(ImmutableMap.of("optimizer.optimize-mixed-distinct-aggregations", "true"))
                 .build();
     }
 
-    @Override
-    public void testCountDistinct()
-    {
-        assertQuery("SELECT COUNT(DISTINCT custkey + 1) FROM orders", "SELECT COUNT(*) FROM (SELECT DISTINCT custkey + 1 FROM orders) t");
-        assertQuery("SELECT COUNT(DISTINCT linenumber), COUNT(*) from lineitem where linenumber < 0");
-    }
-
     // TODO add dedicated test cases and remove `extends AbstractTestAggregation`
 }
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestProcedureCall.java b/testing/trino-tests/src/test/java/io/trino/tests/TestProcedureCall.java
index 1ec93d57e26e..6b48e1144a15 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestProcedureCall.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestProcedureCall.java
@@ -23,9 +23,10 @@
 import io.trino.testing.TestingProcedures;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
 
@@ -33,10 +34,11 @@
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestProcedureCall
         extends AbstractTestQueryFramework
 {
@@ -53,7 +55,7 @@ protected QueryRunner createQueryRunner()
         return TpchQueryRunnerBuilder.builder().build();
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         DistributedQueryRunner queryRunner = getDistributedQueryRunner();
@@ -69,7 +71,7 @@ public void setUp()
         queryRunner.createCatalog(TESTING_CATALOG, "mock");
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         tester = null;
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestProcedureCreation.java b/testing/trino-tests/src/test/java/io/trino/tests/TestProcedureCreation.java
index a424cca56245..c5fc0e30c374 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestProcedureCreation.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestProcedureCreation.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.procedure.Procedure;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestQueryManager.java b/testing/trino-tests/src/test/java/io/trino/tests/TestQueryManager.java
index 5c919b934bd6..4a22efe0e071 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestQueryManager.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestQueryManager.java
@@ -13,6 +13,7 @@
  */
 package io.trino.tests;
 
+import io.opentelemetry.api.trace.Span;
 import io.trino.Session;
 import io.trino.client.ClientCapabilities;
 import io.trino.dispatcher.DispatchManager;
@@ -26,9 +27,11 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.TestingSessionContext;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.SessionTestUtils.TEST_SESSION;
@@ -42,30 +45,32 @@
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.util.Arrays.stream;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.fail;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestQueryManager
 {
     private DistributedQueryRunner queryRunner;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
         queryRunner = TpchQueryRunnerBuilder.builder().build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         queryRunner.close();
         queryRunner = null;
     }
 
-    @Test(timeOut = 60_000L)
+    @Test
+    @Timeout(60)
     public void testFailQuery()
             throws Exception
     {
@@ -73,6 +78,7 @@ public void testFailQuery()
         QueryId queryId = dispatchManager.createQueryId();
         dispatchManager.createQuery(
                 queryId,
+                Span.getInvalid(),
                 Slug.createNew(),
                 TestingSessionContext.fromSession(TEST_SESSION),
                 "SELECT * FROM lineitem")
@@ -100,7 +106,8 @@ public void testFailQuery()
         assertEquals(queryInfo.getFailureInfo().getMessage(), "mock exception");
     }
 
-    @Test(timeOut = 60_000L)
+    @Test
+    @Timeout(60)
     public void testQueryCpuLimit()
             throws Exception
     {
@@ -114,7 +121,8 @@ public void testQueryCpuLimit()
         }
     }
 
-    @Test(timeOut = 60_000L)
+    @Test
+    @Timeout(60)
     public void testQueryScanExceeded()
             throws Exception
     {
@@ -128,7 +136,8 @@ public void testQueryScanExceeded()
         }
     }
 
-    @Test(timeOut = 60_000L)
+    @Test
+    @Timeout(60)
     public void testQueryScanExceededSession()
             throws Exception
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestQueryPlanDeterminism.java b/testing/trino-tests/src/test/java/io/trino/tests/TestQueryPlanDeterminism.java
index d37bed67ac5e..71bd2d193611 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestQueryPlanDeterminism.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestQueryPlanDeterminism.java
@@ -24,28 +24,31 @@
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingAccessControlManager.TestingPrivilege;
 import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 import java.util.List;
 
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestQueryPlanDeterminism
         extends AbstractTestQueries
 {
     private PlanDeterminismChecker determinismChecker;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         determinismChecker = new PlanDeterminismChecker((LocalQueryRunner) getQueryRunner());
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         determinismChecker = null;
@@ -265,7 +268,7 @@ public void testTpcdsQ6deterministic()
     }
 
     @Override
-    public void testLargeIn(int valuesCount)
+    public void testLargeIn()
     {
         // testLargeIn is expensive
         throw new SkipException("Skipping testLargeIn");
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestRepartitionQueries.java b/testing/trino-tests/src/test/java/io/trino/tests/TestRepartitionQueries.java
index 0833486b2c17..2e7a179a2022 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestRepartitionQueries.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestRepartitionQueries.java
@@ -16,7 +16,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.lang.String.format;
 
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestSequenceFunction.java b/testing/trino-tests/src/test/java/io/trino/tests/TestSequenceFunction.java
new file mode 100644
index 000000000000..1be55965f674
--- /dev/null
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestSequenceFunction.java
@@ -0,0 +1,325 @@
+/*
+ * Licensed 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 io.trino.tests;
+
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.operator.table.Sequence.SequenceFunctionSplit.DEFAULT_SPLIT_SIZE;
+import static io.trino.testing.TestingSession.testSessionBuilder;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class TestSequenceFunction
+        extends AbstractTestQueryFramework
+{
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        return DistributedQueryRunner.builder(testSessionBuilder().build()).build();
+    }
+
+    @Test
+    public void testSequence()
+    {
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(0, 8000, 3))
+                """))
+                .matches("SELECT * FROM UNNEST(sequence(0, 8000, 3))");
+
+        assertThat(query("SELECT * FROM TABLE(sequence(1, 10, 3))"))
+                .matches("VALUES BIGINT '1', 4, 7, 10");
+
+        assertThat(query("SELECT * FROM TABLE(sequence(1, 10, 6))"))
+                .matches("VALUES BIGINT '1', 7");
+
+        assertThat(query("SELECT * FROM TABLE(sequence(-1, -10, -3))"))
+                .matches("VALUES BIGINT '-1', -4, -7, -10");
+
+        assertThat(query("SELECT * FROM TABLE(sequence(-1, -10, -6))"))
+                .matches("VALUES BIGINT '-1', -7");
+
+        assertThat(query("SELECT * FROM TABLE(sequence(-5, 5, 3))"))
+                .matches("VALUES BIGINT '-5', -2, 1, 4");
+
+        assertThat(query("SELECT * FROM TABLE(sequence(5, -5, -3))"))
+                .matches("VALUES BIGINT '5', 2, -1, -4");
+
+        assertThat(query("SELECT * FROM TABLE(sequence(0, 10, 3))"))
+                .matches("VALUES BIGINT '0', 3, 6, 9");
+
+        assertThat(query("SELECT * FROM TABLE(sequence(0, -10, -3))"))
+                .matches("VALUES BIGINT '0', -3, -6, -9");
+    }
+
+    @Test
+    public void testDefaultArguments()
+    {
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(stop => 10))
+                """))
+                .matches("SELECT * FROM UNNEST(sequence(0, 10, 1))");
+    }
+
+    @Test
+    public void testInvalidArgument()
+    {
+        assertThatThrownBy(() -> query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => -5,
+                                    stop => 10,
+                                    step => -2))
+                """))
+                .hasMessage("Step must be positive for sequence [-5, 10]");
+
+        assertThatThrownBy(() -> query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => 10,
+                                    stop => -5,
+                                    step => 2))
+                """))
+                .hasMessage("Step must be negative for sequence [10, -5]");
+
+        assertThatThrownBy(() -> query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => null,
+                                    stop => -5,
+                                    step => 2))
+                """))
+                .hasMessage("Start is null");
+
+        assertThatThrownBy(() -> query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => 10,
+                                    stop => null,
+                                    step => 2))
+                """))
+                .hasMessage("Stop is null");
+
+        assertThatThrownBy(() -> query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => 10,
+                                    stop => -5,
+                                    step => null))
+                """))
+                .hasMessage("Step is null");
+    }
+
+    @Test
+    public void testSingletonSequence()
+    {
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => 10,
+                                    stop => 10,
+                                    step => 2))
+                """))
+                .matches("VALUES BIGINT '10'");
+
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => 10,
+                                    stop => 10,
+                                    step => -2))
+                """))
+                .matches("VALUES BIGINT '10'");
+
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => 10,
+                                    stop => 10,
+                                    step => 0))
+                """))
+                .matches("VALUES BIGINT '10'");
+    }
+
+    @Test
+    public void testBigStep()
+    {
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => 10,
+                                    stop => -5,
+                                    step => %s))
+                """.formatted(Long.MIN_VALUE / (DEFAULT_SPLIT_SIZE - 1))))
+                .matches("VALUES BIGINT '10'");
+
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => 10,
+                                    stop => -5,
+                                    step => %s))
+                """.formatted(Long.MIN_VALUE / (DEFAULT_SPLIT_SIZE - 1) - 1)))
+                .matches("VALUES BIGINT '10'");
+
+        assertThat(query("""
+                SELECT DISTINCT x - lag(x, 1) OVER(ORDER BY x DESC)
+                FROM TABLE(sequence(
+                                    start => %s,
+                                    stop => %s,
+                                    step => %s)) t(x)
+                """.formatted(Long.MAX_VALUE, Long.MIN_VALUE, Long.MIN_VALUE / (DEFAULT_SPLIT_SIZE - 1) - 1)))
+                .matches(format("VALUES (null), (%s)", Long.MIN_VALUE / (DEFAULT_SPLIT_SIZE - 1) - 1));
+
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => 10,
+                                    stop => -5,
+                                    step => %s))
+                """.formatted(Long.MIN_VALUE)))
+                .matches("VALUES BIGINT '10'");
+
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => -5,
+                                    stop => 10,
+                                    step => %s))
+                """.formatted(Long.MAX_VALUE / (DEFAULT_SPLIT_SIZE - 1))))
+                .matches("VALUES BIGINT '-5'");
+
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => -5,
+                                    stop => 10,
+                                    step => %s))
+                """.formatted(Long.MAX_VALUE / (DEFAULT_SPLIT_SIZE - 1) + 1)))
+                .matches("VALUES BIGINT '-5'");
+
+        assertThat(query("""
+                SELECT DISTINCT x - lag(x, 1) OVER(ORDER BY x)
+                FROM TABLE(sequence(
+                                    start => %s,
+                                    stop => %s,
+                                    step => %s)) t(x)
+                """.formatted(Long.MIN_VALUE, Long.MAX_VALUE, Long.MAX_VALUE / (DEFAULT_SPLIT_SIZE - 1) + 1)))
+                .matches(format("VALUES (null), (%s)", Long.MAX_VALUE / (DEFAULT_SPLIT_SIZE - 1) + 1));
+
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => -5,
+                                    stop => 10,
+                                    step => %s))
+                """.formatted(Long.MAX_VALUE)))
+                .matches("VALUES BIGINT '-5'");
+    }
+
+    @Test
+    public void testMultipleSplits()
+    {
+        long sequenceLength = DEFAULT_SPLIT_SIZE * 10 + DEFAULT_SPLIT_SIZE / 2;
+        long start = 10;
+        long step = 5;
+        long stop = start + (sequenceLength - 1) * step;
+        assertThat(query("""
+                SELECT count(x), count(DISTINCT x), min(x), max(x)
+                FROM TABLE(sequence(
+                                    start => %s,
+                                    stop => %s,
+                                    step => %s)) t(x)
+                """.formatted(start, stop, step)))
+                .matches(format("SELECT BIGINT '%s', BIGINT '%s', BIGINT '%s', BIGINT '%s'", sequenceLength, sequenceLength, start, stop));
+
+        sequenceLength = DEFAULT_SPLIT_SIZE * 4 + DEFAULT_SPLIT_SIZE / 2;
+        stop = start + (sequenceLength - 1) * step;
+        assertThat(query("""
+                SELECT min(x), max(x)
+                FROM TABLE(sequence(
+                                    start => %s,
+                                    stop => %s,
+                                    step => %s)) t(x)
+                """.formatted(start, stop, step)))
+                .matches(format("SELECT BIGINT '%s', BIGINT '%s'", start, stop));
+
+        step = -5;
+        stop = start + (sequenceLength - 1) * step;
+        assertThat(query("""
+                SELECT max(x), min(x)
+                FROM TABLE(sequence(
+                                    start => %s,
+                                    stop => %s,
+                                    step => %s)) t(x)
+                """.formatted(start, stop, step)))
+                .matches(format("SELECT BIGINT '%s', BIGINT '%s'", start, stop));
+    }
+
+    @Test
+    public void testEdgeValues()
+    {
+        long start = Long.MIN_VALUE + 15;
+        long stop = Long.MIN_VALUE + 3;
+        long step = -10;
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => %s,
+                                    stop => %s,
+                                    step => %s))
+                """.formatted(start, stop, step)))
+                .matches(format("VALUES (%s), (%s)", start, start + step));
+
+        start = Long.MIN_VALUE + 1 - (DEFAULT_SPLIT_SIZE - 1) * step;
+        stop = Long.MIN_VALUE + 1;
+        assertThat(query("""
+                SELECT max(x), min(x)
+                FROM TABLE(sequence(
+                                    start => %s,
+                                    stop => %s,
+                                    step => %s)) t(x)
+                """.formatted(start, stop, step)))
+                .matches(format("SELECT %s, %s", start, Long.MIN_VALUE + 1));
+
+        start = Long.MAX_VALUE - 15;
+        stop = Long.MAX_VALUE - 3;
+        step = 10;
+        assertThat(query("""
+                SELECT *
+                FROM TABLE(sequence(
+                                    start => %s,
+                                    stop => %s,
+                                    step => %s))
+                """.formatted(start, stop, step)))
+                .matches(format("VALUES (%s), (%s)", start, start + step));
+
+        start = Long.MAX_VALUE - 1 - (DEFAULT_SPLIT_SIZE - 1) * step;
+        stop = Long.MAX_VALUE - 1;
+        assertThat(query("""
+                SELECT min(x), max(x)
+                FROM TABLE(sequence(
+                                    start => %s,
+                                    stop => %s,
+                                    step => %s)) t(x)
+                """.formatted(start, stop, step)))
+                .matches(format("SELECT %s, %s", start, Long.MAX_VALUE - 1));
+    }
+}
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestServer.java b/testing/trino-tests/src/test/java/io/trino/tests/TestServer.java
index db624e999fda..825fc08f3587 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestServer.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestServer.java
@@ -34,9 +34,9 @@
 import io.trino.spi.type.TimeZoneNotSupportedException;
 import io.trino.testing.TestingTrinoClient;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.util.Collections;
@@ -68,16 +68,17 @@
 import static io.trino.SystemSessionProperties.MAX_HASH_PARTITION_COUNT;
 import static io.trino.SystemSessionProperties.QUERY_MAX_MEMORY;
 import static io.trino.client.ClientCapabilities.PATH;
+import static io.trino.client.ClientCapabilities.SESSION_AUTHORIZATION;
 import static io.trino.client.ProtocolHeaders.TRINO_HEADERS;
 import static io.trino.spi.StandardErrorCode.INCOMPATIBLE_CLIENT;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.SEE_OTHER;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.SEE_OTHER;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
@@ -91,7 +92,7 @@ public class TestServer
     private TestingTrinoServer server;
     private HttpClient client;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
     {
         server = TestingTrinoServer.builder()
@@ -104,7 +105,7 @@ public void setup()
         client = new JettyHttpClient();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
@@ -291,6 +292,34 @@ public void testSetPathSupportByClient()
         }
     }
 
+    @Test
+    public void testSetSessionSupportByClient()
+    {
+        try (TestingTrinoClient testingClient = new TestingTrinoClient(server, testSessionBuilder().setClientCapabilities(Set.of()).build())) {
+            assertThatThrownBy(() -> testingClient.execute("SET SESSION AUTHORIZATION userA"))
+                    .hasMessage("SET SESSION AUTHORIZATION not supported by client");
+        }
+
+        try (TestingTrinoClient testingClient = new TestingTrinoClient(server, testSessionBuilder().setClientCapabilities(Set.of(
+                SESSION_AUTHORIZATION.name())).build())) {
+            testingClient.execute("SET SESSION AUTHORIZATION userA");
+        }
+    }
+
+    @Test
+    public void testResetSessionSupportByClient()
+    {
+        try (TestingTrinoClient testingClient = new TestingTrinoClient(server, testSessionBuilder().setClientCapabilities(Set.of()).build())) {
+            assertThatThrownBy(() -> testingClient.execute("RESET SESSION AUTHORIZATION"))
+                    .hasMessage("RESET SESSION AUTHORIZATION not supported by client");
+        }
+
+        try (TestingTrinoClient testingClient = new TestingTrinoClient(server, testSessionBuilder().setClientCapabilities(Set.of(
+                SESSION_AUTHORIZATION.name())).build())) {
+            testingClient.execute("RESET SESSION AUTHORIZATION");
+        }
+    }
+
     private void checkVersionOnError(String query, @Language("RegExp") String proofOfOrigin)
     {
         QueryResults queryResults = postQuery(request -> request
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestTableFunctionInvocation.java b/testing/trino-tests/src/test/java/io/trino/tests/TestTableFunctionInvocation.java
index d40d838658d3..7fc083b47128 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestTableFunctionInvocation.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestTableFunctionInvocation.java
@@ -14,50 +14,29 @@
 package io.trino.tests;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.trino.connector.MockConnectorFactory;
 import io.trino.connector.MockConnectorPlugin;
-import io.trino.connector.TestingTableFunctions.ConstantFunction;
-import io.trino.connector.TestingTableFunctions.ConstantFunction.ConstantFunctionHandle;
-import io.trino.connector.TestingTableFunctions.ConstantFunction.ConstantFunctionProcessorProvider;
-import io.trino.connector.TestingTableFunctions.EmptyOutputFunction;
-import io.trino.connector.TestingTableFunctions.EmptyOutputFunction.EmptyOutputProcessorProvider;
-import io.trino.connector.TestingTableFunctions.EmptyOutputWithPassThroughFunction;
-import io.trino.connector.TestingTableFunctions.EmptyOutputWithPassThroughFunction.EmptyOutputWithPassThroughProcessorProvider;
-import io.trino.connector.TestingTableFunctions.EmptySourceFunction;
-import io.trino.connector.TestingTableFunctions.EmptySourceFunction.EmptySourceFunctionProcessorProvider;
-import io.trino.connector.TestingTableFunctions.IdentityFunction;
-import io.trino.connector.TestingTableFunctions.IdentityFunction.IdentityFunctionProcessorProvider;
-import io.trino.connector.TestingTableFunctions.IdentityPassThroughFunction;
-import io.trino.connector.TestingTableFunctions.IdentityPassThroughFunction.IdentityPassThroughFunctionProcessorProvider;
-import io.trino.connector.TestingTableFunctions.PassThroughInputFunction;
-import io.trino.connector.TestingTableFunctions.PassThroughInputFunction.PassThroughInputProcessorProvider;
-import io.trino.connector.TestingTableFunctions.RepeatFunction;
-import io.trino.connector.TestingTableFunctions.RepeatFunction.RepeatFunctionProcessorProvider;
-import io.trino.connector.TestingTableFunctions.SimpleTableFunction;
-import io.trino.connector.TestingTableFunctions.SimpleTableFunction.SimpleTableFunctionHandle;
-import io.trino.connector.TestingTableFunctions.TestInputFunction;
-import io.trino.connector.TestingTableFunctions.TestInputFunction.TestInputProcessorProvider;
-import io.trino.connector.TestingTableFunctions.TestInputsFunction;
-import io.trino.connector.TestingTableFunctions.TestInputsFunction.TestInputsFunctionProcessorProvider;
-import io.trino.connector.TestingTableFunctions.TestSingleInputRowSemanticsFunction;
-import io.trino.connector.TestingTableFunctions.TestSingleInputRowSemanticsFunction.TestSingleInputFunctionProcessorProvider;
+import io.trino.connector.TestingTableFunctions;
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.spi.connector.FixedSplitSource;
 import io.trino.spi.connector.TableFunctionApplicationResult;
 import io.trino.spi.function.FunctionProvider;
 import io.trino.spi.function.SchemaFunctionName;
-import io.trino.spi.ptf.TableFunctionProcessorProvider;
+import io.trino.spi.function.table.ConnectorTableFunctionHandle;
+import io.trino.spi.function.table.TableFunctionProcessorProvider;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
 import static io.trino.connector.MockConnector.MockConnectorSplit.MOCK_CONNECTOR_SPLIT;
 import static io.trino.connector.TestingTableFunctions.ConstantFunction.getConstantFunctionSplitSource;
+import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.SELECT_COLUMN;
+import static io.trino.testing.TestingAccessControlManager.privilege;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -76,87 +55,73 @@ protected QueryRunner createQueryRunner()
                         .setCatalog(TESTING_CATALOG)
                         .setSchema(TABLE_FUNCTION_SCHEMA)
                         .build())
-                .build();
-    }
-
-    @BeforeClass
-    public void setUp()
-    {
-        DistributedQueryRunner queryRunner = getDistributedQueryRunner();
-
-        queryRunner.installPlugin(new MockConnectorPlugin(MockConnectorFactory.builder()
-                .withTableFunctions(ImmutableSet.of(
-                        new SimpleTableFunction(),
-                        new IdentityFunction(),
-                        new IdentityPassThroughFunction(),
-                        new RepeatFunction(),
-                        new EmptyOutputFunction(),
-                        new EmptyOutputWithPassThroughFunction(),
-                        new TestInputsFunction(),
-                        new PassThroughInputFunction(),
-                        new TestInputFunction(),
-                        new TestSingleInputRowSemanticsFunction(),
-                        new ConstantFunction(),
-                        new EmptySourceFunction()))
-                .withApplyTableFunction((session, handle) -> {
-                    if (handle instanceof SimpleTableFunctionHandle functionHandle) {
-                        return Optional.of(new TableFunctionApplicationResult<>(functionHandle.getTableHandle(), functionHandle.getTableHandle().getColumns().orElseThrow()));
-                    }
-                    return Optional.empty();
+                .setAdditionalSetup(queryRunner -> {
+                    queryRunner.installPlugin(new MockConnectorPlugin(MockConnectorFactory.builder()
+                            .withTableFunctions(ImmutableSet.of(
+                                    new TestingTableFunctions.SimpleTableFunctionWithAccessControl(),
+                                    new TestingTableFunctions.IdentityFunction(),
+                                    new TestingTableFunctions.IdentityPassThroughFunction(),
+                                    new TestingTableFunctions.RepeatFunction(),
+                                    new TestingTableFunctions.EmptyOutputFunction(),
+                                    new TestingTableFunctions.EmptyOutputWithPassThroughFunction(),
+                                    new TestingTableFunctions.TestInputsFunction(),
+                                    new TestingTableFunctions.PassThroughInputFunction(),
+                                    new TestingTableFunctions.TestInputFunction(),
+                                    new TestingTableFunctions.TestSingleInputRowSemanticsFunction(),
+                                    new TestingTableFunctions.ConstantFunction(),
+                                    new TestingTableFunctions.EmptySourceFunction()))
+                            .withApplyTableFunction((session, handle) -> {
+                                if (handle instanceof TestingTableFunctions.SimpleTableFunction.SimpleTableFunctionHandle functionHandle) {
+                                    return Optional.of(new TableFunctionApplicationResult<>(functionHandle.getTableHandle(), functionHandle.getTableHandle().getColumns().orElseThrow()));
+                                }
+                                return Optional.empty();
+                            })
+                            .withFunctionProvider(Optional.of(new FunctionProvider()
+                            {
+                                @Override
+                                public TableFunctionProcessorProvider getTableFunctionProcessorProvider(ConnectorTableFunctionHandle functionHandle)
+                                {
+                                    if (functionHandle instanceof TestingTableFunctions.TestingTableFunctionHandle handle) {
+                                        return switch (handle.name().getFunctionName()) {
+                                            case "identity_function" -> new TestingTableFunctions.IdentityFunction.IdentityFunctionProcessorProvider();
+                                            case "identity_pass_through_function" -> new TestingTableFunctions.IdentityPassThroughFunction.IdentityPassThroughFunctionProcessorProvider();
+                                            case "empty_output" -> new TestingTableFunctions.EmptyOutputFunction.EmptyOutputProcessorProvider();
+                                            case "empty_output_with_pass_through" -> new TestingTableFunctions.EmptyOutputWithPassThroughFunction.EmptyOutputWithPassThroughProcessorProvider();
+                                            case "test_inputs_function" -> new TestingTableFunctions.TestInputsFunction.TestInputsFunctionProcessorProvider();
+                                            case "pass_through" -> new TestingTableFunctions.PassThroughInputFunction.PassThroughInputProcessorProvider();
+                                            case "test_input" -> new TestingTableFunctions.TestInputFunction.TestInputProcessorProvider();
+                                            case "test_single_input_function" -> new TestingTableFunctions.TestSingleInputRowSemanticsFunction.TestSingleInputFunctionProcessorProvider();
+                                            case "empty_source" -> new TestingTableFunctions.EmptySourceFunction.EmptySourceFunctionProcessorProvider();
+                                            default -> throw new IllegalArgumentException("unexpected table function: " + handle.name());
+                                        };
+                                    }
+                                    if (functionHandle instanceof TestingTableFunctions.RepeatFunction.RepeatFunctionHandle) {
+                                        return new TestingTableFunctions.RepeatFunction.RepeatFunctionProcessorProvider();
+                                    }
+                                    if (functionHandle instanceof TestingTableFunctions.ConstantFunction.ConstantFunctionHandle) {
+                                        return new TestingTableFunctions.ConstantFunction.ConstantFunctionProcessorProvider();
+                                    }
+
+                                    return null;
+                                }
+                            }))
+                            .withTableFunctionSplitSources(functionHandle -> {
+                                if (functionHandle instanceof TestingTableFunctions.ConstantFunction.ConstantFunctionHandle handle) {
+                                    return getConstantFunctionSplitSource(handle);
+                                }
+                                if (functionHandle instanceof TestingTableFunctions.TestingTableFunctionHandle handle && handle.name().equals(new SchemaFunctionName("system", "empty_source"))) {
+                                    return new FixedSplitSource(ImmutableList.of(MOCK_CONNECTOR_SPLIT));
+                                }
+
+                                return null;
+                            })
+                            .build()));
+                    queryRunner.createCatalog(TESTING_CATALOG, "mock", ImmutableMap.of());
+
+                    queryRunner.installPlugin(new TpchPlugin());
+                    queryRunner.createCatalog("tpch", "tpch", ImmutableMap.of());
                 })
-                .withFunctionProvider(Optional.of(new FunctionProvider()
-                {
-                    @Override
-                    public TableFunctionProcessorProvider getTableFunctionProcessorProvider(SchemaFunctionName name)
-                    {
-                        if (name.equals(new SchemaFunctionName("system", "identity_function"))) {
-                            return new IdentityFunctionProcessorProvider();
-                        }
-                        if (name.equals(new SchemaFunctionName("system", "identity_pass_through_function"))) {
-                            return new IdentityPassThroughFunctionProcessorProvider();
-                        }
-                        if (name.equals(new SchemaFunctionName("system", "repeat"))) {
-                            return new RepeatFunctionProcessorProvider();
-                        }
-                        if (name.equals(new SchemaFunctionName("system", "empty_output"))) {
-                            return new EmptyOutputProcessorProvider();
-                        }
-                        if (name.equals(new SchemaFunctionName("system", "empty_output_with_pass_through"))) {
-                            return new EmptyOutputWithPassThroughProcessorProvider();
-                        }
-                        if (name.equals(new SchemaFunctionName("system", "test_inputs_function"))) {
-                            return new TestInputsFunctionProcessorProvider();
-                        }
-                        if (name.equals(new SchemaFunctionName("system", "pass_through"))) {
-                            return new PassThroughInputProcessorProvider();
-                        }
-                        if (name.equals(new SchemaFunctionName("system", "test_input"))) {
-                            return new TestInputProcessorProvider();
-                        }
-                        if (name.equals(new SchemaFunctionName("system", "test_single_input_function"))) {
-                            return new TestSingleInputFunctionProcessorProvider();
-                        }
-                        if (name.equals(new SchemaFunctionName("system", "constant"))) {
-                            return new ConstantFunctionProcessorProvider();
-                        }
-                        if (name.equals(new SchemaFunctionName("system", "empty_source"))) {
-                            return new EmptySourceFunctionProcessorProvider();
-                        }
-
-                        return null;
-                    }
-                }))
-                .withTableFunctionSplitSource(
-                        new SchemaFunctionName("system", "constant"),
-                        handle -> getConstantFunctionSplitSource((ConstantFunctionHandle) handle))
-                .withTableFunctionSplitSource(
-                        new SchemaFunctionName("system", "empty_source"),
-                        handle -> new FixedSplitSource(ImmutableList.of(MOCK_CONNECTOR_SPLIT)))
-                .build()));
-        queryRunner.createCatalog(TESTING_CATALOG, "mock");
-
-        queryRunner.installPlugin(new TpchPlugin());
-        queryRunner.createCatalog("tpch", "tpch");
+                .build();
     }
 
     @Test
@@ -170,6 +135,20 @@ public void testPrimitiveDefaultArgument()
                 .matches("SELECT true WHERE false");
     }
 
+    @Test
+    public void testAccessControl()
+    {
+        assertAccessDenied(
+                "SELECT boolean_column FROM TABLE(system.simple_table_function(column => 'boolean_column', ignored => 1))",
+                "Cannot select from columns .*",
+                privilege("simple_table.boolean_column", SELECT_COLUMN));
+
+        assertAccessDenied(
+                "SELECT boolean_column FROM TABLE(system.simple_table_function(column => 'boolean_column', ignored => 1))",
+                "Cannot select from columns .*",
+                privilege("simple_table", SELECT_COLUMN));
+    }
+
     @Test
     public void testNoArgumentsPassed()
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestTablesample.java b/testing/trino-tests/src/test/java/io/trino/tests/TestTablesample.java
index aa52f5b3a7ef..76f4a5a68646 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestTablesample.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestTablesample.java
@@ -18,22 +18,25 @@
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.sql.query.QueryAssertions;
 import io.trino.testing.LocalQueryRunner;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.SessionTestUtils.TEST_SESSION;
 import static io.trino.spi.StandardErrorCode.INVALID_ARGUMENTS;
 import static io.trino.spi.StandardErrorCode.TYPE_MISMATCH;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestTablesample
 {
     private LocalQueryRunner queryRunner;
     private QueryAssertions assertions;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
             throws Exception
     {
@@ -42,7 +45,7 @@ public void setUp()
         assertions = new QueryAssertions(queryRunner);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
             throws Exception
     {
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestUnionQueries.java b/testing/trino-tests/src/test/java/io/trino/tests/TestUnionQueries.java
new file mode 100644
index 000000000000..b50ce6045505
--- /dev/null
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestUnionQueries.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed 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 io.trino.tests;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.Session;
+import io.trino.plugin.tpcds.TpcdsPlugin;
+import io.trino.sql.planner.OptimizerConfig;
+import io.trino.testing.AbstractTestQueryFramework;
+import io.trino.testing.DistributedQueryRunner;
+import io.trino.testing.QueryRunner;
+import io.trino.tests.tpch.TpchQueryRunnerBuilder;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.SystemSessionProperties.JOIN_DISTRIBUTION_TYPE;
+import static io.trino.SystemSessionProperties.JOIN_REORDERING_STRATEGY;
+import static io.trino.sql.planner.OptimizerConfig.JoinReorderingStrategy.NONE;
+
+public class TestUnionQueries
+        extends AbstractTestQueryFramework
+{
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        DistributedQueryRunner queryRunner = TpchQueryRunnerBuilder.builder().build();
+        queryRunner.installPlugin(new TpcdsPlugin());
+        queryRunner.createCatalog("tpcds", "tpcds", ImmutableMap.of());
+        return queryRunner;
+    }
+
+    @Test
+    public void testUnionFromDifferentCatalogs()
+    {
+        @Language("SQL")
+        String query = "SELECT count(*) FROM (SELECT nationkey FROM tpch.tiny.nation UNION ALL SELECT ss_sold_date_sk FROM tpcds.tiny.store_sales) n JOIN tpch.tiny.region r ON n.nationkey = r.regionkey";
+        assertQuery(query, "VALUES(5)");
+    }
+
+    @Test
+    public void testUnionAllOnConnectorPartitionedTables()
+    {
+        Session session = Session.builder(getQueryRunner().getDefaultSession())
+                .setSystemProperty(JOIN_REORDERING_STRATEGY, NONE.name())
+                .setSystemProperty(JOIN_DISTRIBUTION_TYPE, OptimizerConfig.JoinDistributionType.BROADCAST.name()).build();
+
+        @Language("SQL")
+        String query = "SELECT count(*) FROM ((SELECT orderkey FROM orders) union all (SELECT nationkey FROM nation)) o JOIN nation n ON o.orderkey = n.nationkey";
+        assertQuery(session, query, "VALUES(32)");
+    }
+}
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestVerifyTrinoTestsTestSetup.java b/testing/trino-tests/src/test/java/io/trino/tests/TestVerifyTrinoTestsTestSetup.java
index 665ab02df9ac..6a890243f18a 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestVerifyTrinoTestsTestSetup.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestVerifyTrinoTestsTestSetup.java
@@ -13,7 +13,7 @@
  */
 package io.trino.tests;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.ZoneId;
 import java.util.Locale;
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchConnectorTest.java b/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchConnectorTest.java
index 3a95661d8d69..0fac01156129 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchConnectorTest.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchConnectorTest.java
@@ -49,40 +49,29 @@ protected QueryRunner createQueryRunner()
         return TpchQueryRunnerBuilder.builder().build();
     }
 
-    @SuppressWarnings("DuplicateBranchesInSwitch")
     @Override
     protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
     {
-        switch (connectorBehavior) {
-            case SUPPORTS_TOPN_PUSHDOWN:
-                return false;
-
-            case SUPPORTS_CREATE_SCHEMA:
-                return false;
-
-            case SUPPORTS_CREATE_TABLE:
-            case SUPPORTS_RENAME_TABLE:
-                return false;
-
-            case SUPPORTS_ADD_COLUMN:
-            case SUPPORTS_RENAME_COLUMN:
-            case SUPPORTS_SET_COLUMN_TYPE:
-                return false;
-
-            case SUPPORTS_COMMENT_ON_TABLE:
-            case SUPPORTS_COMMENT_ON_COLUMN:
-                return false;
-
-            case SUPPORTS_INSERT:
-                return false;
-
-            case SUPPORTS_ARRAY:
-            case SUPPORTS_ROW_TYPE:
-                return false;
-
-            default:
-                return super.hasBehavior(connectorBehavior);
-        }
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN,
+                    SUPPORTS_ARRAY,
+                    SUPPORTS_COMMENT_ON_COLUMN,
+                    SUPPORTS_COMMENT_ON_TABLE,
+                    SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                    SUPPORTS_CREATE_SCHEMA,
+                    SUPPORTS_CREATE_TABLE,
+                    SUPPORTS_CREATE_VIEW,
+                    SUPPORTS_DELETE,
+                    SUPPORTS_INSERT,
+                    SUPPORTS_MERGE,
+                    SUPPORTS_RENAME_COLUMN,
+                    SUPPORTS_RENAME_TABLE,
+                    SUPPORTS_ROW_TYPE,
+                    SUPPORTS_SET_COLUMN_TYPE,
+                    SUPPORTS_TOPN_PUSHDOWN,
+                    SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
     }
 
     @Test
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchDistributedStats.java b/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchDistributedStats.java
index 08b2544f085e..b44fae88bf80 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchDistributedStats.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchDistributedStats.java
@@ -18,9 +18,10 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.statistics.StatisticsAssertion;
 import io.trino.tpch.TpchTable;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.SystemSessionProperties.COLLECT_PLAN_STATISTICS_FOR_ALL_QUERIES;
 import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_COLUMN_NAMING_PROPERTY;
@@ -31,12 +32,14 @@
 import static io.trino.testing.statistics.MetricComparisonStrategies.relativeError;
 import static io.trino.testing.statistics.Metrics.OUTPUT_ROW_COUNT;
 import static io.trino.testing.statistics.Metrics.distinctValuesCount;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestTpchDistributedStats
 {
     private StatisticsAssertion statisticsAssertion;
 
-    @BeforeClass
+    @BeforeAll
     public void setup()
             throws Exception
     {
@@ -52,7 +55,7 @@ public void setup()
         statisticsAssertion = new StatisticsAssertion(runner);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         statisticsAssertion.close();
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchLocalStats.java b/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchLocalStats.java
index dc3e2f621ae3..5595dd78506b 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchLocalStats.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchLocalStats.java
@@ -19,9 +19,10 @@
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.statistics.StatisticsAssertion;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import static io.trino.SystemSessionProperties.COLLECT_PLAN_STATISTICS_FOR_ALL_QUERIES;
 import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_COLUMN_NAMING_PROPERTY;
@@ -36,12 +37,14 @@
 import static io.trino.testing.statistics.Metrics.highValue;
 import static io.trino.testing.statistics.Metrics.lowValue;
 import static io.trino.testing.statistics.Metrics.nullsFraction;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestTpchLocalStats
 {
     private StatisticsAssertion statisticsAssertion;
 
-    @BeforeClass
+    @BeforeAll
     public void setUp()
     {
         Session defaultSession = testSessionBuilder()
@@ -59,7 +62,7 @@ public void setUp()
         statisticsAssertion = new StatisticsAssertion(queryRunner);
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void tearDown()
     {
         statisticsAssertion.close();
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchTableScanRedirection.java b/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchTableScanRedirection.java
index a8fb3672ec22..7a8abdb94886 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchTableScanRedirection.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchTableScanRedirection.java
@@ -17,7 +17,8 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import static org.testng.Assert.assertEquals;
 
@@ -40,7 +41,8 @@ protected QueryRunner createQueryRunner()
         return queryRunner;
     }
 
-    @Test(timeOut = 20_000)
+    @Test
+    @Timeout(20)
     public void testTableScanRedirection()
     {
         // select orderstatus, count(*) from tpch.tiny.orders group by 1
@@ -52,7 +54,8 @@ public void testTableScanRedirection()
         assertEquals(computeActual("SELECT * FROM tpch.tiny.orders WHERE orderstatus IN ('O', 'F')").getRowCount(), 7333L);
     }
 
-    @Test(timeOut = 20_000)
+    @Test
+    @Timeout(20)
     public void testTableScanRedirectionWithCoercion()
     {
         assertUpdate("CREATE TABLE memory.test.nation AS SELECT * FROM (VALUES '42') t(nationkey)", 1L);
diff --git a/testing/trino-tests/src/test/resources/file-based-system-functions-access.json b/testing/trino-tests/src/test/resources/file-based-system-functions-access.json
index 35e4ed45e734..4a0f6544888f 100644
--- a/testing/trino-tests/src/test/resources/file-based-system-functions-access.json
+++ b/testing/trino-tests/src/test/resources/file-based-system-functions-access.json
@@ -35,11 +35,9 @@
     "functions": [
         {
             "user": "alice",
-            "function_kinds": [
-                "SCALAR",
-                "AGGREGATE",
-                "WINDOW"
-            ],
+            "catalog": "mock",
+            "schema": "function",
+            "function": "my_function",
             "privileges": [
                 "EXECUTE",
                 "GRANT_EXECUTE"
@@ -50,9 +48,6 @@
             "catalog": "mock",
             "schema": "system",
             "function": "simple_table_function",
-            "function_kinds": [
-                "TABLE"
-            ],
             "privileges": [
                 "EXECUTE",
                 "GRANT_EXECUTE"
@@ -60,11 +55,9 @@
         },
         {
             "user": "bob",
-            "function_kinds": [
-                "SCALAR",
-                "AGGREGATE",
-                "WINDOW"
-            ],
+            "catalog": "mock",
+            "schema": "function",
+            "function": "my_function",
             "privileges": [
                 "EXECUTE"
             ]
@@ -74,9 +67,6 @@
             "catalog": "mock",
             "schema": "system",
             "function": "simple_table_function",
-            "function_kinds": [
-                "TABLE"
-            ],
             "privileges": [
                 "EXECUTE"
             ]
diff --git a/testing/trino-tests/src/test/resources/hive_metadata/partitioned_tpcds/tpcds_sf1000_orc_part.json.gz b/testing/trino-tests/src/test/resources/hive_metadata/partitioned_tpcds/tpcds_sf1000_orc_part.json.gz
index e701bf3ba496..7857aa79c469 100644
Binary files a/testing/trino-tests/src/test/resources/hive_metadata/partitioned_tpcds/tpcds_sf1000_orc_part.json.gz and b/testing/trino-tests/src/test/resources/hive_metadata/partitioned_tpcds/tpcds_sf1000_orc_part.json.gz differ
diff --git a/testing/trino-tests/src/test/resources/hive_metadata/partitioned_tpch/tpch_sf1000_orc_part.json.gz b/testing/trino-tests/src/test/resources/hive_metadata/partitioned_tpch/tpch_sf1000_orc_part.json.gz
index 2776ef305686..2fc9c63f0131 100644
Binary files a/testing/trino-tests/src/test/resources/hive_metadata/partitioned_tpch/tpch_sf1000_orc_part.json.gz and b/testing/trino-tests/src/test/resources/hive_metadata/partitioned_tpch/tpch_sf1000_orc_part.json.gz differ
diff --git a/testing/trino-tests/src/test/resources/hive_metadata/unpartitioned_tpcds/tpcds_sf1000_orc.json.gz b/testing/trino-tests/src/test/resources/hive_metadata/unpartitioned_tpcds/tpcds_sf1000_orc.json.gz
index 429bae55434b..4106422cb970 100644
Binary files a/testing/trino-tests/src/test/resources/hive_metadata/unpartitioned_tpcds/tpcds_sf1000_orc.json.gz and b/testing/trino-tests/src/test/resources/hive_metadata/unpartitioned_tpcds/tpcds_sf1000_orc.json.gz differ
diff --git a/testing/trino-tests/src/test/resources/hive_metadata/unpartitioned_tpch/tpch_sf1000_orc.json.gz b/testing/trino-tests/src/test/resources/hive_metadata/unpartitioned_tpch/tpch_sf1000_orc.json.gz
index 7a36bac30da4..5940fef87df1 100644
Binary files a/testing/trino-tests/src/test/resources/hive_metadata/unpartitioned_tpch/tpch_sf1000_orc.json.gz and b/testing/trino-tests/src/test/resources/hive_metadata/unpartitioned_tpch/tpch_sf1000_orc.json.gz differ
diff --git a/testing/trino-tests/src/test/resources/set_session_authorization_permissions.json b/testing/trino-tests/src/test/resources/set_session_authorization_permissions.json
new file mode 100644
index 000000000000..ae8f035cb54d
--- /dev/null
+++ b/testing/trino-tests/src/test/resources/set_session_authorization_permissions.json
@@ -0,0 +1,16 @@
+{
+    "impersonation": [
+        {
+            "originalUser": "user",
+            "newUser": "alice"
+        },
+        {
+            "originalUser": "user2",
+            "newUser": "bob"
+        },
+        {
+            "originalUser": "alice",
+            "newUser": "charlie"
+        }
+    ]
+}
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q01.plan.txt
index 61a20a28c4d3..7b1f1c7f2488 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q01.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q01.plan.txt
@@ -3,7 +3,8 @@ local exchange (GATHER, SINGLE, [])
         cross join:
             join (LEFT, REPLICATED):
                 join (INNER, REPLICATED):
-                    scan customer
+                    dynamic filter (["c_customer_sk"])
+                        scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPLICATE, BROADCAST, [])
                             join (INNER, REPLICATED):
@@ -12,7 +13,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_store_sk"])
                                             partial aggregation over (sr_customer_sk, sr_store_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan store_returns
+                                                    dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                        scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -30,7 +32,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk_11", "sr_store_sk_15"])
                                                     partial aggregation over (sr_customer_sk_11, sr_store_sk_15)
                                                         join (INNER, REPLICATED):
-                                                            scan store_returns
+                                                            dynamic filter (["sr_returned_date_sk_28"])
+                                                                scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q02.plan.txt
index 3897414ae1d0..19b2cbba2280 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q02.plan.txt
@@ -9,15 +9,19 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq"])
                                     partial aggregation over (d_day_name, d_week_seq)
                                         join (INNER, REPLICATED):
-                                            remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                scan web_sales
-                                                scan catalog_sales
+                                            local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                dynamic filter (["ws_sold_date_sk"])
+                                                    scan web_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan date_dim
+                                                    dynamic filter (["d_week_seq", "d_week_seq"])
+                                                        scan date_dim
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["d_week_seq_23"])
-                            scan date_dim
+                            dynamic filter (["d_week_seq_23"])
+                                scan date_dim
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["expr_229"])
                         join (INNER, PARTITIONED):
@@ -27,12 +31,15 @@ remote exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["d_week_seq_132"])
                                             partial aggregation over (d_day_name_142, d_week_seq_132)
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
-                                                        scan catalog_sales
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ws_sold_date_sk_85"])
+                                                            scan web_sales
+                                                        dynamic filter (["cs_sold_date_sk_123"])
+                                                            scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan date_dim
+                                                            dynamic filter (["d_week_seq_132"])
+                                                                scan date_dim
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq_178"])
                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q03.plan.txt
index 70aae3fa1bdd..ede6415850e5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q03.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q04.plan.txt
index e6fa625b1bdb..ce5e6af22a29 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q04.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id", "c_customer_id"])
+                                                scan customer
                 join (INNER, PARTITIONED):
                     join (INNER, PARTITIONED):
                         final aggregation over (c_birth_country_587, c_customer_id_574, c_email_address_589, c_first_name_581, c_last_name_582, c_login_588, c_preferred_cust_flag_583, d_year_638)
@@ -24,11 +26,13 @@ local exchange (GATHER, SINGLE, [])
                                     partial aggregation over (c_birth_country_587, c_customer_id_574, c_email_address_589, c_first_name_581, c_last_name_582, c_login_588, c_preferred_cust_flag_583, d_year_638)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_573"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_574", "c_customer_id_574", "c_customer_id_574", "c_customer_sk_573"])
+                                                    scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_596"])
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_sold_date_sk_627"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -39,11 +43,13 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (c_birth_country_1624, c_customer_id_1611, c_email_address_1626, c_first_name_1618, c_last_name_1619, c_login_1625, c_preferred_cust_flag_1620, d_year_1675)
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_1610"])
-                                                    scan customer
+                                                    dynamic filter (["c_customer_id_1611", "c_customer_id_1611", "c_customer_id_1611", "c_customer_sk_1610"])
+                                                        scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1634"])
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_1664"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -53,11 +59,13 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (c_birth_country_1312, c_customer_id_1299, c_email_address_1314, c_first_name_1306, c_last_name_1307, c_login_1313, c_preferred_cust_flag_1308, d_year_1363)
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_1298"])
-                                                    scan customer
+                                                    dynamic filter (["c_customer_id_1299", "c_customer_id_1299", "c_customer_sk_1298"])
+                                                        scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1322"])
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_1352"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -67,11 +75,13 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (c_birth_country_899, c_customer_id_886, c_email_address_901, c_first_name_893, c_last_name_894, c_login_900, c_preferred_cust_flag_895, d_year_950)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_885"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_886", "c_customer_sk_885"])
+                                                scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_908"])
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_sold_date_sk_939"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -82,7 +92,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk_194"])
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk_194", "ss_sold_date_sk_214"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q05.plan.txt
index f98eebbfad6e..227f36ad9b2c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q05.plan.txt
@@ -11,9 +11,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (s_store_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan store_sales
-                                                        scan store_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -26,9 +28,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (cp_catalog_page_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan catalog_sales
-                                                        scan catalog_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["cs_catalog_page_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
+                                                        dynamic filter (["cr_catalog_page_sk", "cr_returned_date_sk"])
+                                                            scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -42,13 +46,16 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_site_sk"])
+                                                            scan web_sales
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ws_item_sk_96", "ws_order_number_110"])
-                                                                scan web_sales
+                                                                dynamic filter (["ws_item_sk_96", "ws_order_number_110", "ws_web_site_sk_106"])
+                                                                    scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                    scan web_returns
+                                                                    dynamic filter (["wr_returned_date_sk"])
+                                                                        scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q06.plan.txt
index d3d2cfba574a..907e4f9d3572 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q06.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q06.plan.txt
@@ -10,20 +10,24 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                scan customer_address
+                                                dynamic filter (["ca_address_sk"])
+                                                    scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                            scan customer
+                                                            dynamic filter (["c_customer_sk"])
+                                                                scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_month_seq"])
+                                                                                    scan date_dim
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         local exchange (GATHER, SINGLE, [])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q07.plan.txt
index cbab34a925c5..f381cc4e8932 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q07.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q08.plan.txt
index 432e37f5b19c..2144fe01874b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q08.plan.txt
@@ -5,10 +5,11 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["s_store_name"])
                     partial aggregation over (s_store_name)
                         join (INNER, PARTITIONED):
-                            remote exchange (REPARTITION, HASH, ["substr_39"])
+                            remote exchange (REPARTITION, HASH, ["substring"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -16,7 +17,7 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan store
                             local exchange (GATHER, SINGLE, [])
-                                remote exchange (REPARTITION, HASH, ["substr_40"])
+                                remote exchange (REPARTITION, HASH, ["substring_39"])
                                     final aggregation over (ca_zip)
                                         local exchange (REPARTITION, HASH, ["ca_zip"])
                                             remote exchange (REPARTITION, HASH, ["ca_zip_31"])
@@ -30,7 +31,8 @@ local exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over (ca_zip_19)
                                                                     join (INNER, PARTITIONED):
                                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk_10"])
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk_10"])
+                                                                                scan customer_address
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q09.plan.txt
index 4466a2d88feb..cbcd78f04da6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q09.plan.txt
@@ -1,93 +1,122 @@
-cross join:
-    cross join:
-        cross join:
-            cross join:
-                cross join:
-                    cross join:
-                        cross join:
-                            cross join:
-                                cross join:
-                                    cross join:
-                                        cross join:
-                                            cross join:
-                                                cross join:
-                                                    cross join:
-                                                        cross join:
-                                                            final aggregation over ()
-                                                                local exchange (GATHER, SINGLE, [])
-                                                                    remote exchange (GATHER, SINGLE, [])
-                                                                        partial aggregation over ()
-                                                                            scan store_sales
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    scan reason
-                                                        final aggregation over ()
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    partial aggregation over ()
-                                                                        scan store_sales
+join (LEFT, REPLICATED):
+    join (LEFT, REPLICATED):
+        join (LEFT, REPLICATED):
+            join (LEFT, REPLICATED):
+                join (LEFT, REPLICATED):
+                    join (LEFT, REPLICATED):
+                        join (LEFT, REPLICATED):
+                            join (RIGHT, PARTITIONED):
+                                remote exchange (REPARTITION, HASH, [])
+                                    final aggregation over ()
+                                        local exchange (GATHER, SINGLE, [])
+                                            remote exchange (GATHER, SINGLE, [])
+                                                partial aggregation over ()
+                                                    scan store_sales
+                                local exchange (GATHER, SINGLE, [])
+                                    join (RIGHT, PARTITIONED):
+                                        remote exchange (REPARTITION, HASH, [])
+                                            final aggregation over ()
+                                                local exchange (GATHER, SINGLE, [])
+                                                    remote exchange (GATHER, SINGLE, [])
+                                                        partial aggregation over ()
+                                                            scan store_sales
+                                        local exchange (GATHER, SINGLE, [])
+                                            join (RIGHT, PARTITIONED):
+                                                remote exchange (REPARTITION, HASH, [])
                                                     final aggregation over ()
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over ()
                                                                     scan store_sales
-                                                final aggregation over ()
-                                                    local exchange (GATHER, SINGLE, [])
-                                                        remote exchange (GATHER, SINGLE, [])
-                                                            partial aggregation over ()
-                                                                scan store_sales
-                                            final aggregation over ()
                                                 local exchange (GATHER, SINGLE, [])
-                                                    remote exchange (GATHER, SINGLE, [])
-                                                        partial aggregation over ()
-                                                            scan store_sales
-                                        final aggregation over ()
-                                            local exchange (GATHER, SINGLE, [])
-                                                remote exchange (GATHER, SINGLE, [])
-                                                    partial aggregation over ()
-                                                        scan store_sales
+                                                    join (RIGHT, PARTITIONED):
+                                                        remote exchange (REPARTITION, HASH, [])
+                                                            final aggregation over ()
+                                                                local exchange (GATHER, SINGLE, [])
+                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                        partial aggregation over ()
+                                                                            scan store_sales
+                                                        local exchange (GATHER, SINGLE, [])
+                                                            join (RIGHT, PARTITIONED):
+                                                                remote exchange (REPARTITION, HASH, [])
+                                                                    final aggregation over ()
+                                                                        local exchange (GATHER, SINGLE, [])
+                                                                            remote exchange (GATHER, SINGLE, [])
+                                                                                partial aggregation over ()
+                                                                                    scan store_sales
+                                                                local exchange (GATHER, SINGLE, [])
+                                                                    join (RIGHT, PARTITIONED):
+                                                                        remote exchange (REPARTITION, HASH, [])
+                                                                            final aggregation over ()
+                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                                        partial aggregation over ()
+                                                                                            scan store_sales
+                                                                        local exchange (GATHER, SINGLE, [])
+                                                                            join (RIGHT, PARTITIONED):
+                                                                                remote exchange (REPARTITION, HASH, [])
+                                                                                    final aggregation over ()
+                                                                                        local exchange (GATHER, SINGLE, [])
+                                                                                            remote exchange (GATHER, SINGLE, [])
+                                                                                                partial aggregation over ()
+                                                                                                    scan store_sales
+                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                    join (RIGHT, PARTITIONED):
+                                                                                        remote exchange (REPARTITION, HASH, [])
+                                                                                            final aggregation over ()
+                                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                                                        partial aggregation over ()
+                                                                                                            scan store_sales
+                                                                                        local exchange (GATHER, SINGLE, [])
+                                                                                            remote exchange (REPARTITION, HASH, [])
+                                                                                                scan reason
+                            local exchange (GATHER, SINGLE, [])
+                                remote exchange (REPLICATE, BROADCAST, [])
                                     final aggregation over ()
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (GATHER, SINGLE, [])
                                                 partial aggregation over ()
                                                     scan store_sales
+                        local exchange (GATHER, SINGLE, [])
+                            remote exchange (REPLICATE, BROADCAST, [])
                                 final aggregation over ()
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (GATHER, SINGLE, [])
                                             partial aggregation over ()
                                                 scan store_sales
+                    local exchange (GATHER, SINGLE, [])
+                        remote exchange (REPLICATE, BROADCAST, [])
                             final aggregation over ()
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (GATHER, SINGLE, [])
                                         partial aggregation over ()
                                             scan store_sales
+                local exchange (GATHER, SINGLE, [])
+                    remote exchange (REPLICATE, BROADCAST, [])
                         final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         scan store_sales
+            local exchange (GATHER, SINGLE, [])
+                remote exchange (REPLICATE, BROADCAST, [])
                     final aggregation over ()
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over ()
                                     scan store_sales
+        local exchange (GATHER, SINGLE, [])
+            remote exchange (REPLICATE, BROADCAST, [])
                 final aggregation over ()
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (GATHER, SINGLE, [])
                             partial aggregation over ()
                                 scan store_sales
+    local exchange (GATHER, SINGLE, [])
+        remote exchange (REPLICATE, BROADCAST, [])
             final aggregation over ()
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (GATHER, SINGLE, [])
                         partial aggregation over ()
                             scan store_sales
-        final aggregation over ()
-            local exchange (GATHER, SINGLE, [])
-                remote exchange (GATHER, SINGLE, [])
-                    partial aggregation over ()
-                        scan store_sales
-    final aggregation over ()
-        local exchange (GATHER, SINGLE, [])
-            remote exchange (GATHER, SINGLE, [])
-                partial aggregation over ()
-                    scan store_sales
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q10.plan.txt
index 1cee500dbb4b..004cb96531ae 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q10.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_ship_customer_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -18,7 +19,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (LEFT, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan customer_demographics
+                                            dynamic filter (["cd_demo_sk"])
+                                                scan customer_demographics
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, PARTITIONED):
@@ -27,14 +29,16 @@ local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                     partial aggregation over (ss_customer_sk)
                                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan customer
+                                                                    dynamic filter (["c_current_addr_sk"])
+                                                                        scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan customer_address
@@ -43,7 +47,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                 partial aggregation over (ws_bill_customer_sk)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q11.plan.txt
index d05ca5e74dbd..9b5655764dca 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q11.plan.txt
@@ -7,11 +7,13 @@ local exchange (GATHER, SINGLE, [])
                         partial aggregation over (c_birth_country_98, c_customer_id_85, c_email_address_100, c_first_name_92, c_last_name_93, c_login_99, c_preferred_cust_flag_94, d_year_138)
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_84"])
-                                    scan customer
+                                    dynamic filter (["c_customer_id_85", "c_customer_sk_84"])
+                                        scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_107"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_sold_date_sk_127"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -22,11 +24,13 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year)
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                        scan customer
+                                        dynamic filter (["c_customer_id", "c_customer_sk"])
+                                            scan customer
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -37,11 +41,13 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (c_birth_country_590, c_customer_id_577, c_email_address_592, c_first_name_584, c_last_name_585, c_login_591, c_preferred_cust_flag_586, d_year_641)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_576"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_577", "c_customer_sk_576"])
+                                                scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_600"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk_630"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -51,11 +57,13 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (c_birth_country_389, c_customer_id_376, c_email_address_391, c_first_name_383, c_last_name_384, c_login_390, c_preferred_cust_flag_385, d_year_440)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_375"])
-                                            scan customer
+                                            dynamic filter (["c_customer_sk_375"])
+                                                scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_399"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk_429"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q12.plan.txt
index f7ec908dd084..5e037afebaaa 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q12.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                        scan item
+                                        dynamic filter (["i_item_sk"])
+                                            scan item
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q13.plan.txt
index 515bc8719e42..e44220615434 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q13.plan.txt
@@ -5,13 +5,15 @@ final aggregation over ()
                 join (INNER, REPLICATED):
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["cd_demo_sk"])
-                            scan customer_demographics
+                            dynamic filter (["cd_demo_sk"])
+                                scan customer_demographics
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ss_cdemo_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_addr_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q14.plan.txt
index ac9f82f11b05..08b00b248605 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q14.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_6, i_category_id_8, i_class_id_7)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -20,21 +21,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_15)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_15"])
                                                                             partial aggregation over (i_item_sk_15)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_22", "i_category_id_26", "i_class_id_24"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_22", "i_category_id_26", "i_class_id_24"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id, category_id, class_id)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_77", "i_category_id_81", "i_class_id_79"])
                                                                                                 partial aggregation over (i_brand_id_77, i_category_id_81, i_class_id_79)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_44", "ss_sold_date_sk_65"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -45,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_137, i_category_id_141, i_class_id_139)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -56,7 +61,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_197, i_category_id_201, i_class_id_199)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -70,19 +76,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_273"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_342"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_411"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -93,7 +102,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_495, i_category_id_499, i_class_id_497)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_item_sk_464", "cs_sold_date_sk_483"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -101,21 +111,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk_488"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk_488"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_546)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_546"])
                                                                             partial aggregation over (i_item_sk_546)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_553", "i_category_id_557", "i_class_id_555"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_553", "i_category_id_557", "i_class_id_555"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id_571, category_id_573, class_id_572)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_611", "i_category_id_615", "i_class_id_613"])
                                                                                                 partial aggregation over (i_brand_id_611, i_category_id_615, i_class_id_613)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_578", "ss_sold_date_sk_599"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -126,7 +139,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_705, i_category_id_709, i_class_id_707)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk_674", "cs_sold_date_sk_693"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -137,7 +151,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_799, i_category_id_803, i_class_id_801)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk_756", "ws_sold_date_sk_787"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -151,19 +166,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_882"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_951"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_1020"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -175,28 +193,32 @@ local exchange (GATHER, SINGLE, [])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["ws_item_sk_1061"])
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_item_sk_1061", "ws_sold_date_sk_1092"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["i_item_sk_1097"])
-                                                                scan item
+                                                                dynamic filter (["i_item_sk_1097"])
+                                                                    scan item
                                                             final aggregation over (i_item_sk_1155)
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["i_item_sk_1155"])
                                                                         partial aggregation over (i_item_sk_1155)
                                                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                                                 remote exchange (REPARTITION, HASH, ["i_brand_id_1162", "i_category_id_1166", "i_class_id_1164"])
-                                                                                    scan item
+                                                                                    dynamic filter (["i_brand_id_1162", "i_category_id_1166", "i_class_id_1164"])
+                                                                                        scan item
                                                                                 final aggregation over (brand_id_1180, category_id_1182, class_id_1181)
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPARTITION, HASH, ["i_brand_id_1220", "i_category_id_1224", "i_class_id_1222"])
                                                                                             partial aggregation over (i_brand_id_1220, i_category_id_1224, i_class_id_1222)
                                                                                                 join (INNER, REPLICATED):
                                                                                                     join (INNER, REPLICATED):
-                                                                                                        scan store_sales
+                                                                                                        dynamic filter (["ss_item_sk_1187", "ss_sold_date_sk_1208"])
+                                                                                                            scan store_sales
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan date_dim
@@ -207,7 +229,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                             partial aggregation over (i_brand_id_1314, i_category_id_1318, i_class_id_1316)
                                                                                                 join (INNER, REPLICATED):
                                                                                                     join (INNER, REPLICATED):
-                                                                                                        scan catalog_sales
+                                                                                                        dynamic filter (["cs_item_sk_1283", "cs_sold_date_sk_1302"])
+                                                                                                            scan catalog_sales
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan date_dim
@@ -218,7 +241,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                             partial aggregation over (i_brand_id_1408, i_category_id_1412, i_class_id_1410)
                                                                                                 join (INNER, REPLICATED):
                                                                                                     join (INNER, REPLICATED):
-                                                                                                        scan web_sales
+                                                                                                        dynamic filter (["ws_item_sk_1365", "ws_sold_date_sk_1396"])
+                                                                                                            scan web_sales
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan date_dim
@@ -232,19 +256,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_1491"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_1560"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_1629"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q15.plan.txt
index 946683bd17b5..8e0026d70798 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q15.plan.txt
@@ -6,16 +6,19 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (ca_zip)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                scan customer_address
+                                dynamic filter (["ca_address_sk"])
+                                    scan customer_address
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_sk"])
+                                                scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q16.plan.txt
index 2583381afcd8..94e5cf069df5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q16.plan.txt
@@ -10,13 +10,15 @@ final aggregation over ()
                                     remote exchange (REPARTITION, HASH, ["ca_state", "cc_county", "cs_call_center_sk", "cs_ext_ship_cost", "cs_net_profit", "cs_order_number_25", "cs_ship_addr_sk", "cs_ship_date_sk", "cs_warehouse_sk", "d_date", "unique"])
                                         partial aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number_25, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_order_number_25"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_call_center_sk", "cs_ship_addr_sk", "cs_ship_date_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q17.plan.txt
index add2e9b8dfad..c2d0611df9dc 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q17.plan.txt
@@ -5,26 +5,30 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_item_desc", "i_item_id", "s_state"])
                     partial aggregation over (i_item_desc, i_item_id, s_state)
                         join (INNER, REPLICATED):
-                            scan item
+                            dynamic filter (["i_item_sk"])
+                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q18.plan.txt
index f3ff54aad741..c275a371ba10 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q18.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_cdemo_sk", "cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -25,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                                    scan customer
+                                                                    dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk"])
+                                                                        scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q19.plan.txt
index 43f0630f3559..aaec727a26ef 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q19.plan.txt
@@ -5,17 +5,20 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_brand", "i_brand_id", "i_manufact", "i_manufact_id"])
                     partial aggregation over (i_brand, i_brand_id, i_manufact, i_manufact_id)
                         join (INNER, REPLICATED):
-                            scan customer_address
+                            dynamic filter (["ca_address_sk"])
+                                scan customer_address
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED):
-                                        scan customer
+                                        dynamic filter (["c_customer_sk"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q20.plan.txt
index 95a4e8334e25..e9298a40e626 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q20.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q21.plan.txt
index c127db88db46..d81f0744adee 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q21.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan inventory
+                                    dynamic filter (["inv_date_sk", "inv_item_sk", "inv_warehouse_sk"])
+                                        scan inventory
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q22.plan.txt
index 2fd28d3f31ed..6f1d958f18df 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q22.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["i_brand", "i_product_name"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan inventory
+                                        dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                            scan inventory
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q23.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q23.plan.txt
index ae79551dd25a..11f0dd17a162 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q23.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q23.plan.txt
@@ -12,17 +12,20 @@ final aggregation over ()
                                             partial aggregation over (d_date_9, ss_item_sk, substr$gid)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_item_sk"])
+                                                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -33,7 +36,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_47)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_47"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_47"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                     scan customer
@@ -49,7 +53,8 @@ final aggregation over ()
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_78"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_78", "ss_sold_date_sk_98"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
@@ -67,17 +72,20 @@ final aggregation over ()
                                             partial aggregation over (d_date_227, ss_item_sk_199, substr$gid_284)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk_199", "ss_item_sk_199", "ss_sold_date_sk_220"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_item_sk_256"])
+                                                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -88,7 +96,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_292)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_292"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_292"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_317"])
                                                     scan customer
@@ -104,7 +113,8 @@ final aggregation over ()
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_343"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_343", "ss_sold_date_sk_363"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q24.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q24.plan.txt
index b24eafd9738a..a2a88e46de4c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q24.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q24.plan.txt
@@ -14,23 +14,27 @@ remote exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_birth_country", "s_zip"])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                                scan customer
+                                                                dynamic filter (["c_birth_country", "c_customer_sk"])
+                                                                    scan customer
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                     join (INNER, PARTITIONED):
                                                                         remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                            scan store_returns
+                                                                            dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                                                                scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                                                 join (INNER, REPLICATED):
                                                                                     join (INNER, REPLICATED):
-                                                                                        scan store_sales
+                                                                                        dynamic filter (["ss_item_sk", "ss_store_sk"])
+                                                                                            scan store_sales
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                 scan item
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                                                            scan store
+                                                                                            dynamic filter (["s_zip"])
+                                                                                                scan store
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ca_zip", "upper"])
                                                             scan customer_address
@@ -52,16 +56,20 @@ remote exchange (GATHER, SINGLE, [])
                                                                             join (INNER, PARTITIONED):
                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk_18", "ss_ticket_number_25"])
                                                                                     join (INNER, REPLICATED):
-                                                                                        scan store_sales
+                                                                                        dynamic filter (["ss_customer_sk_19", "ss_item_sk_18", "ss_item_sk_18", "ss_store_sk_23", "ss_ticket_number_25"])
+                                                                                            scan store_sales
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                scan store
+                                                                                                dynamic filter (["s_zip_93"])
+                                                                                                    scan store
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_45", "sr_ticket_number_52"])
-                                                                                        scan store_returns
+                                                                                        dynamic filter (["sr_item_sk_45"])
+                                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_125"])
-                                                                                scan customer
+                                                                                dynamic filter (["c_birth_country_139"])
+                                                                                    scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q25.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q25.plan.txt
index 06e9bc127b43..d0d7b6296cea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q25.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q25.plan.txt
@@ -5,27 +5,31 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_item_desc", "i_item_id", "s_store_id", "s_store_name"])
                     partial aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name)
                         join (INNER, REPLICATED):
-                            scan item
+                            dynamic filter (["i_item_sk"])
+                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ss_store_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_sales
+                                                                        dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                            scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_returns
+                                                                            dynamic filter (["sr_returned_date_sk"])
+                                                                                scan store_returns
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q26.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q26.plan.txt
index 10e8a2551020..602d57ff1148 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q26.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q26.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_bill_cdemo_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q27.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q27.plan.txt
index e15f77571f95..3a99da130086 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q27.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q27.plan.txt
@@ -6,13 +6,15 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (groupid, i_item_id$gid, s_state$gid)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                scan item
+                                dynamic filter (["i_item_sk"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_cdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q29.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q29.plan.txt
index e563e2d9b18a..3d4240339ab3 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q29.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q29.plan.txt
@@ -5,26 +5,31 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_item_desc", "i_item_id", "s_store_id", "s_store_name"])
                     partial aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name)
                         join (INNER, REPLICATED):
-                            scan item
+                            dynamic filter (["i_item_sk"])
+                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["s_store_sk"])
-                                            scan store
+                                            dynamic filter (["s_store_sk"])
+                                                scan store
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ss_store_sk"])
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_sales
+                                                                        dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_ticket_number"])
+                                                                            scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 join (INNER, REPLICATED):
-                                                                                    scan store_returns
+                                                                                    dynamic filter (["sr_returned_date_sk"])
+                                                                                        scan store_returns
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q30.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q30.plan.txt
index 5b86b774635f..5520e1444779 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q30.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q30.plan.txt
@@ -5,7 +5,8 @@ local exchange (GATHER, SINGLE, [])
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                         join (INNER, REPLICATED):
-                            scan customer
+                            dynamic filter (["c_current_addr_sk", "c_customer_sk"])
+                                scan customer
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan customer_address
@@ -15,11 +16,13 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (ca_state, wr_returning_customer_sk)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk"])
+                                                scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_returns
+                                                    dynamic filter (["wr_returned_date_sk"])
+                                                        scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -35,11 +38,13 @@ local exchange (GATHER, SINGLE, [])
                                                     partial aggregation over (ca_state_92, wr_returning_customer_sk_31)
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ca_address_sk_84"])
-                                                                scan customer_address
+                                                                dynamic filter (["ca_address_sk_84"])
+                                                                    scan customer_address
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk_34"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_returned_date_sk_48"])
+                                                                            scan web_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q31.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q31.plan.txt
index d16f0e1ce966..70c4df6cee27 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q31.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q31.plan.txt
@@ -11,13 +11,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_11"])
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk_11", "ss_sold_date_sk_28"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_64"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_71", "ca_county_71", "ca_county_71"])
+                                                        scan customer_address
                         final aggregation over (ca_county_149, d_qoy_121, d_year_117)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_149"])
@@ -25,13 +27,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_89"])
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk_89", "ss_sold_date_sk_106"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_142"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_149", "ca_county_149"])
+                                                        scan customer_address
                     join (INNER, PARTITIONED):
                         final aggregation over (ca_county_293, d_qoy_265, d_year_261)
                             local exchange (GATHER, SINGLE, [])
@@ -39,11 +43,13 @@ remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over (ca_county_293, d_qoy_265, d_year_261)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk_286"])
-                                                scan customer_address
+                                                dynamic filter (["ca_address_sk_286", "ca_county_293", "ca_county_293"])
+                                                    scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_223"])
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk_250"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -53,11 +59,13 @@ remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over (ca_county_382, d_qoy_354, d_year_350)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk_375"])
-                                                scan customer_address
+                                                dynamic filter (["ca_address_sk_375", "ca_county_382"])
+                                                    scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_312"])
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk_339"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -69,24 +77,28 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                scan customer_address
+                                                dynamic filter (["ca_county"])
+                                                    scan customer_address
                     final aggregation over (ca_county_204, d_qoy_176, d_year_172)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_county_204"])
                                 partial aggregation over (ca_county_204, d_qoy_176, d_year_172)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ca_address_sk_197"])
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk_197"])
+                                                scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q32.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q32.plan.txt
index 3fe019ccd451..693ec20dacec 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q32.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q32.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk_20"])
                                     partial aggregation over (cs_item_sk_20)
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk_20", "cs_sold_date_sk_39"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q33.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q33.plan.txt
index fb7279d7b9b0..6e219bf97e9f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q33.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q33.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -21,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_8"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_25)
@@ -38,7 +40,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -48,7 +51,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["i_item_sk_90"])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_103"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_130)
@@ -66,7 +70,8 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -76,7 +81,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["i_item_sk_197"])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_210"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_237)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q34.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q34.plan.txt
index 64d4ce451141..3feb2363558e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q34.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q34.plan.txt
@@ -2,7 +2,8 @@ remote exchange (GATHER, SINGLE, [])
     local exchange (GATHER, UNKNOWN, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, REPLICATED):
-                scan customer
+                dynamic filter (["c_customer_sk"])
+                    scan customer
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPLICATE, BROADCAST, [])
                         final aggregation over (ss_customer_sk, ss_ticket_number)
@@ -12,7 +13,8 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q35.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q35.plan.txt
index d88f27b4c7b6..63e07be79289 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q35.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q35.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                        scan customer
+                                                        dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_customer_sk"])
+                                                            scan customer
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                             scan customer_address
@@ -21,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                         partial aggregation over (ss_customer_sk)
                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -35,7 +37,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     partial aggregation over (ws_bill_customer_sk)
                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                                 partial aggregation over (cs_ship_customer_sk)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q36.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q36.plan.txt
index 630dacce4c1e..32892fd149b0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q36.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q36.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q37.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q37.plan.txt
index 3ae83aae01f0..7f124a8f96ae 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q37.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q37.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"])
                     partial aggregation over (i_current_price, i_item_desc, i_item_id)
                         join (INNER, REPLICATED, can skip output duplicates):
-                            scan catalog_sales
+                            dynamic filter (["cs_item_sk"])
+                                scan catalog_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED, can skip output duplicates):
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan inventory
+                                            dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                                scan inventory
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q38.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q38.plan.txt
index 94d514729231..e7dab0f2199b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q38.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q38.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -26,11 +27,13 @@ final aggregation over ()
                                         partial aggregation over (c_first_name_55, c_last_name_56, d_date_18)
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_47"])
-                                                    scan customer
+                                                    dynamic filter (["c_customer_sk_47"])
+                                                        scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -41,11 +44,13 @@ final aggregation over ()
                                         partial aggregation over (c_first_name_111, c_last_name_112, d_date_74)
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_103"])
-                                                    scan customer
+                                                    dynamic filter (["c_customer_sk_103"])
+                                                        scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q39.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q39.plan.txt
index 0761f10365a3..f71ceb03b6c9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q39.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q39.plan.txt
@@ -10,16 +10,19 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan inventory
+                                                dynamic filter (["inv_date_sk", "inv_item_sk", "inv_item_sk", "inv_warehouse_sk", "inv_warehouse_sk"])
+                                                    scan inventory
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_item_sk"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                scan warehouse
+                                                dynamic filter (["w_warehouse_sk"])
+                                                    scan warehouse
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["inv_item_sk_11", "inv_warehouse_sk_12"])
                         final aggregation over (d_moy_69, inv_item_sk_11, inv_warehouse_sk_12, w_warehouse_name_46)
@@ -29,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan inventory
+                                                    dynamic filter (["inv_date_sk_14", "inv_item_sk_11", "inv_warehouse_sk_12"])
+                                                        scan inventory
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q40.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q40.plan.txt
index b7cf1dd0bae2..00523038b966 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q40.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q40.plan.txt
@@ -9,10 +9,12 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (LEFT, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_warehouse_sk"])
+                                                scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                scan catalog_returns
+                                                dynamic filter (["cr_item_sk"])
+                                                    scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q41.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q41.plan.txt
index 58a96c8d1ec2..772ad4b317c4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q41.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q41.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_product_name)
                         single aggregation over (i_manufact, i_manufact_id, i_product_name, unique)
                             join (INNER, REPLICATED, can skip output duplicates):
-                                scan item
+                                dynamic filter (["i_manufact"])
+                                    scan item
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q42.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q42.plan.txt
index 17cc12f10e9e..b35f518a9b70 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q42.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q42.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_category, i_category_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q43.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q43.plan.txt
index 9d9e36441a12..b94077c666ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q43.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q43.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     partial aggregation over (d_day_name, s_store_id, s_store_name)
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q45.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q45.plan.txt
index 7dd52a5c0765..82d16c569b9a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q45.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q45.plan.txt
@@ -8,16 +8,19 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                        scan customer_address
+                                        dynamic filter (["ca_address_sk"])
+                                            scan customer_address
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                    scan customer
+                                                    dynamic filter (["c_customer_sk"])
+                                                        scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q46.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q46.plan.txt
index cd659271967f..53574e4e4200 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q46.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q46.plan.txt
@@ -2,11 +2,13 @@ local exchange (GATHER, SINGLE, [])
     remote exchange (GATHER, SINGLE, [])
         join (INNER, PARTITIONED):
             remote exchange (REPARTITION, HASH, ["ca_address_sk_16"])
-                scan customer_address
+                dynamic filter (["ca_address_sk_16"])
+                    scan customer_address
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                     join (INNER, REPLICATED):
-                        scan customer
+                        dynamic filter (["c_customer_sk"])
+                            scan customer
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPLICATE, BROADCAST, [])
                                 final aggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number)
@@ -14,13 +16,15 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number)
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q47.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q47.plan.txt
index 0911429ef31b..0881f2c84d9d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q47.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q47.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan store
+                                                        dynamic filter (["s_company_name", "s_company_name", "s_store_name", "s_store_name"])
+                                                            scan store
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                        scan item
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["i_brand_17", "i_category_21", "s_company_name_109", "s_store_name_97"])
                         final aggregation over (d_moy_69, d_year_67, i_brand_17, i_category_21, s_company_name_109, s_store_name_97)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_35", "ss_sold_date_sk_56", "ss_store_sk_40"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan store
+                                                        dynamic filter (["s_company_name_109", "s_store_name_97"])
+                                                            scan store
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand_17", "i_category_21"])
+                                                        scan item
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_brand_141", "i_category_145", "s_company_name_233", "s_store_name_221"])
                     final aggregation over (d_moy_193, d_year_191, i_brand_141, i_category_145, s_company_name_233, s_store_name_221)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk_159", "ss_sold_date_sk_180", "ss_store_sk_164"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q48.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q48.plan.txt
index d002184141c7..a5721f69fdbb 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q48.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q48.plan.txt
@@ -5,12 +5,14 @@ final aggregation over ()
                 join (INNER, REPLICATED):
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                            scan customer_address
+                            dynamic filter (["ca_address_sk"])
+                                scan customer_address
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_cdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q49.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q49.plan.txt
index 6b7ece910520..22709678e263 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q49.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q49.plan.txt
@@ -11,11 +11,13 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["wr_item_sk"])
                                             partial aggregation over (wr_item_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan web_returns
+                                                    dynamic filter (["wr_item_sk", "wr_order_number"])
+                                                        scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_sold_date_sk"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -28,11 +30,13 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cr_item_sk"])
                                             partial aggregation over (cr_item_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_returns
+                                                    dynamic filter (["cr_item_sk", "cr_order_number"])
+                                                        scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan catalog_sales
+                                                                dynamic filter (["cs_sold_date_sk"])
+                                                                    scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -45,11 +49,13 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_item_sk"])
                                             partial aggregation over (sr_item_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan store_returns
+                                                    dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                                        scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q50.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q50.plan.txt
index 9f5732a36de7..0f116c50b18b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q50.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q50.plan.txt
@@ -7,11 +7,13 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan store_returns
+                                                dynamic filter (["sr_returned_date_sk"])
+                                                    scan store_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q51.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q51.plan.txt
index 483853492137..00f5de669883 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q51.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q51.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 partial aggregation over (d_date, ws_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                 partial aggregation over (d_date_10, ss_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q52.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q52.plan.txt
index 33752e693e6c..79ab5d5f2dc7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q52.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q52.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q53.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q53.plan.txt
index 8b8179689d06..2fd2be567abd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q53.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q53.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_store_sk"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q54.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q54.plan.txt
index 260df3663afb..d524385f72f4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q54.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q54.plan.txt
@@ -8,17 +8,19 @@ local exchange (GATHER, SINGLE, [])
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                     partial aggregation over (ss_customer_sk)
-                                        cross join:
-                                            cross join:
+                                        join (LEFT, REPLICATED):
+                                            join (LEFT, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk", "ca_county", "ca_state"])
+                                                                                scan customer_address
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan store
@@ -27,14 +29,17 @@ local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 partial aggregation over (c_current_addr_sk, c_customer_sk)
                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                        scan customer
+                                                                                        dynamic filter (["c_customer_sk"])
+                                                                                            scan customer
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                 join (INNER, REPLICATED, can skip output duplicates):
                                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                                        remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                                                                            scan catalog_sales
-                                                                                                            scan web_sales
+                                                                                                        local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                                                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                                scan catalog_sales
+                                                                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                                scan web_sales
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q55.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q55.plan.txt
index 0322599f01e5..72d129c6fab1 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q55.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q55.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q56.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q56.plan.txt
index 0f2f93f9a976..52d3c4050de4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q56.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q56.plan.txt
@@ -11,14 +11,16 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan item
+                                                            dynamic filter (["i_item_id_8"])
+                                                                scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (i_item_id_13)
@@ -38,14 +40,16 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_bill_addr_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan item
+                                                            dynamic filter (["i_item_id_91"])
+                                                                scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (i_item_id_118)
@@ -65,14 +69,16 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan item
+                                                            dynamic filter (["i_item_id_198"])
+                                                                scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (i_item_id_225)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q57.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q57.plan.txt
index 4bed99d3b879..121a5a60df95 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q57.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q57.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan call_center
+                                                        dynamic filter (["cc_name", "cc_name"])
+                                                            scan call_center
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                        scan item
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["cc_name_109", "i_brand_17", "i_category_21"])
                         final aggregation over (cc_name_109, d_moy_80, d_year_78, i_brand_17, i_category_21)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk_44", "cs_item_sk_48", "cs_sold_date_sk_67"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan call_center
+                                                        dynamic filter (["cc_name_109"])
+                                                            scan call_center
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand_17", "i_category_21"])
+                                                        scan item
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["cc_name_245", "i_brand_153", "i_category_157"])
                     final aggregation over (cc_name_245, d_moy_216, d_year_214, i_brand_153, i_category_157)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_call_center_sk_180", "cs_item_sk_184", "cs_sold_date_sk_203"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q58.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q58.plan.txt
index fb65ed72a690..a55228cd42ba 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q58.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q58.plan.txt
@@ -9,11 +9,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_101"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_134)
@@ -21,7 +23,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_134"])
                                                                             partial aggregation over (d_date_134)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_136"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             local exchange (GATHER, SINGLE, [])
@@ -29,7 +32,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_74"])
-                                            scan item
+                                            dynamic filter (["i_item_id_75", "i_item_id_75"])
+                                                scan item
                 final aggregation over (i_item_id_203)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["i_item_id_203"])
@@ -37,11 +41,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_229"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_262)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_262"])
                                                                             partial aggregation over (d_date_262)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_264"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             local exchange (GATHER, SINGLE, [])
@@ -57,18 +64,21 @@ local exchange (GATHER, SINGLE, [])
                                                                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_202"])
-                                            scan item
+                                            dynamic filter (["i_item_id_203"])
+                                                scan item
             final aggregation over (i_item_id)
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["i_item_id"])
                         partial aggregation over (i_item_id)
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan date_dim
+                                                dynamic filter (["d_date"])
+                                                    scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         final aggregation over (d_date_8)
@@ -76,7 +86,8 @@ local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["d_date_8"])
                                                                     partial aggregation over (d_date_8)
                                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                                            scan date_dim
+                                                                            dynamic filter (["d_week_seq_10"])
+                                                                                scan date_dim
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     local exchange (GATHER, SINGLE, [])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q59.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q59.plan.txt
index 719af5ccc77b..3bda2d6dce57 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q59.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q59.plan.txt
@@ -13,16 +13,20 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["d_day_name", "d_week_seq", "ss_store_sk"])
                                                     partial aggregation over (d_day_name, d_week_seq, ss_store_sk)
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                                    scan date_dim
+                                                                    dynamic filter (["d_week_seq", "d_week_seq"])
+                                                                        scan date_dim
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPLICATE, BROADCAST, [])
-                                scan date_dim
+                                dynamic filter (["d_week_seq_22"])
+                                    scan date_dim
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPLICATE, BROADCAST, [])
-                            scan store
+                            dynamic filter (["s_store_id"])
+                                scan store
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["expr_211", "s_store_id_124"])
                     join (INNER, REPLICATED):
@@ -36,10 +40,12 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["d_day_name_90", "d_week_seq_80", "ss_store_sk_55"])
                                                         partial aggregation over (d_day_name_90, d_week_seq_80, ss_store_sk_55)
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk_71", "ss_store_sk_55"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                        scan date_dim
+                                                                        dynamic filter (["d_week_seq_80"])
+                                                                            scan date_dim
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q60.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q60.plan.txt
index c573da2e1725..0b33df359a22 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q60.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q60.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -21,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_8"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_13)
@@ -38,14 +40,16 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_bill_addr_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan item
+                                                            dynamic filter (["i_item_id_91"])
+                                                                scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (i_item_id_118)
@@ -65,14 +69,16 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan item
+                                                            dynamic filter (["i_item_id_198"])
+                                                                scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (i_item_id_225)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q61.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q61.plan.txt
index 958cb1b32e1b..891c0b642617 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q61.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q61.plan.txt
@@ -5,18 +5,21 @@ cross join:
                 partial aggregation over ()
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                            scan customer_address
+                            dynamic filter (["ca_address_sk"])
+                                scan customer_address
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                 join (INNER, REPLICATED):
-                                    scan customer
+                                    dynamic filter (["c_customer_sk"])
+                                        scan customer
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -35,17 +38,20 @@ cross join:
                 partial aggregation over ()
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["ca_address_sk_129"])
-                            scan customer_address
+                            dynamic filter (["ca_address_sk_129"])
+                                scan customer_address
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk_112"])
                                 join (INNER, REPLICATED):
-                                    scan customer
+                                    dynamic filter (["c_customer_sk_108"])
+                                        scan customer
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk_19", "ss_sold_date_sk_40", "ss_store_sk_24"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q62.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q62.plan.txt
index 61172c74fc4f..26846a9ba0a9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q62.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q62.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_ship_date_sk", "ws_ship_mode_sk", "ws_warehouse_sk", "ws_web_site_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q63.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q63.plan.txt
index 23a54b451e8f..e4b2fc096542 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q63.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q63.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_store_sk"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q64.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q64.plan.txt
index 0ab88e33c808..4b39a07ceb53 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q64.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q64.plan.txt
@@ -8,17 +8,20 @@ remote exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_city", "ca_city_122", "ca_street_name", "ca_street_name_119", "ca_street_number", "ca_street_number_118", "ca_zip", "ca_zip_125", "d_year", "d_year_22", "d_year_53", "i_product_name", "s_store_name", "s_zip", "ss_item_sk"])
                                 partial aggregation over (ca_city, ca_city_122, ca_street_name, ca_street_name_119, ca_street_number, ca_street_number_118, ca_zip, ca_zip_125, d_year, d_year_22, d_year_53, i_product_name, s_store_name, s_zip, ss_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan customer_address
+                                        dynamic filter (["ca_address_sk_116"])
+                                            scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["cd_demo_sk_87"])
-                                                                        scan customer_demographics
+                                                                        dynamic filter (["cd_demo_sk_87"])
+                                                                            scan customer_demographics
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                                             join (INNER, REPLICATED):
@@ -28,7 +31,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                                             join (INNER, REPLICATED):
                                                                                                 join (INNER, PARTITIONED):
                                                                                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                                                                        scan customer
+                                                                                                        dynamic filter (["c_current_hdemo_sk", "c_customer_sk", "c_first_sales_date_sk", "c_first_shipto_date_sk"])
+                                                                                                            scan customer
                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                                                             join (INNER, REPLICATED):
@@ -37,14 +41,16 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                         join (INNER, PARTITIONED):
                                                                                                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                                                                                                 join (INNER, REPLICATED):
-                                                                                                                                    scan store_sales
+                                                                                                                                    dynamic filter (["ss_cdemo_sk", "ss_hdemo_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                                                                                        scan store_sales
                                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                             scan date_dim
                                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                                 remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
                                                                                                                                     join (INNER, REPLICATED):
-                                                                                                                                        scan store_returns
+                                                                                                                                        dynamic filter (["sr_item_sk", "sr_item_sk", "sr_item_sk"])
+                                                                                                                                            scan store_returns
                                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                                 final aggregation over (cs_item_sk)
@@ -53,16 +59,19 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                                                             partial aggregation over (cs_item_sk)
                                                                                                                                                                 join (INNER, PARTITIONED):
                                                                                                                                                                     remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                                                                                                                        scan catalog_sales
+                                                                                                                                                                        dynamic filter (["cs_item_sk", "cs_item_sk", "cs_item_sk", "cs_order_number"])
+                                                                                                                                                                            scan catalog_sales
                                                                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                                                                         remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                                                                                                                            scan catalog_returns
+                                                                                                                                                                            dynamic filter (["cr_item_sk", "cr_item_sk"])
+                                                                                                                                                                                scan catalog_returns
                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                         remote exchange (REPARTITION, HASH, ["cd_demo_sk"])
                                                                                                                             scan customer_demographics
                                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                                        scan store
+                                                                                                                        dynamic filter (["s_store_name", "s_zip"])
+                                                                                                                            scan store
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                                         scan date_dim
@@ -71,21 +80,24 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                     scan date_dim
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                scan item
+                                                                                                dynamic filter (["i_item_sk"])
+                                                                                                    scan item
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             scan promotion
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         join (INNER, REPLICATED):
-                                                                                            scan household_demographics
+                                                                                            dynamic filter (["hd_income_band_sk"])
+                                                                                                scan household_demographics
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan income_band
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, REPLICATED):
-                                                                            scan household_demographics
+                                                                            dynamic filter (["hd_income_band_sk_106"])
+                                                                                scan household_demographics
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan income_band
@@ -96,17 +108,20 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_city_491", "ca_city_507", "ca_street_name_488", "ca_street_name_504", "ca_street_number_487", "ca_street_number_503", "ca_zip_494", "ca_zip_510", "d_year_283", "d_year_314", "d_year_345", "i_product_name_550", "s_store_name_375", "s_zip_395", "ss_item_sk_154"])
                                     partial aggregation over (ca_city_491, ca_city_507, ca_street_name_488, ca_street_name_504, ca_street_number_487, ca_street_number_503, ca_zip_494, ca_zip_510, d_year_283, d_year_314, d_year_345, i_product_name_550, s_store_name_375, s_zip_395, ss_item_sk_154)
                                         join (INNER, REPLICATED):
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk_501"])
+                                                scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan customer_address
+                                                        dynamic filter (["ca_address_sk_485"])
+                                                            scan customer_address
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
                                                                     join (INNER, PARTITIONED):
                                                                         remote exchange (REPARTITION, HASH, ["cd_demo_sk_435"])
-                                                                            scan customer_demographics
+                                                                            dynamic filter (["cd_demo_sk_435"])
+                                                                                scan customer_demographics
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk_404"])
                                                                                 join (INNER, REPLICATED):
@@ -116,7 +131,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                 join (INNER, REPLICATED):
                                                                                                     join (INNER, PARTITIONED):
                                                                                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_402"])
-                                                                                                            scan customer
+                                                                                                            dynamic filter (["c_current_hdemo_sk_405", "c_customer_sk_402", "c_first_sales_date_sk_408", "c_first_shipto_date_sk_407"])
+                                                                                                                scan customer
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_155"])
                                                                                                                 join (INNER, REPLICATED):
@@ -125,14 +141,16 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                             join (INNER, PARTITIONED):
                                                                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk_154", "ss_ticket_number_161"])
                                                                                                                                     join (INNER, REPLICATED):
-                                                                                                                                        scan store_sales
+                                                                                                                                        dynamic filter (["ss_cdemo_sk_156", "ss_hdemo_sk_157", "ss_item_sk_154", "ss_item_sk_154", "ss_promo_sk_160", "ss_sold_date_sk_175", "ss_store_sk_159", "ss_ticket_number_161"])
+                                                                                                                                            scan store_sales
                                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                                 scan date_dim
                                                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_181", "sr_ticket_number_188"])
                                                                                                                                         join (INNER, REPLICATED):
-                                                                                                                                            scan store_returns
+                                                                                                                                            dynamic filter (["sr_item_sk_181", "sr_item_sk_181"])
+                                                                                                                                                scan store_returns
                                                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                                     final aggregation over (cs_item_sk_218)
@@ -141,10 +159,12 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                                                                 partial aggregation over (cs_item_sk_218)
                                                                                                                                                                     join (INNER, PARTITIONED):
                                                                                                                                                                         remote exchange (REPARTITION, HASH, ["cs_item_sk_218", "cs_order_number_220"])
-                                                                                                                                                                            scan catalog_sales
+                                                                                                                                                                            dynamic filter (["cs_item_sk_218", "cs_item_sk_218", "cs_order_number_220"])
+                                                                                                                                                                                scan catalog_sales
                                                                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                                                                             remote exchange (REPARTITION, HASH, ["cr_item_sk_243", "cr_order_number_257"])
-                                                                                                                                                                                scan catalog_returns
+                                                                                                                                                                                dynamic filter (["cr_item_sk_243"])
+                                                                                                                                                                                    scan catalog_returns
                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                             remote exchange (REPARTITION, HASH, ["cd_demo_sk_423"])
                                                                                                                                 scan customer_demographics
@@ -166,14 +186,16 @@ remote exchange (GATHER, SINGLE, [])
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             join (INNER, REPLICATED):
-                                                                                                scan household_demographics
+                                                                                                dynamic filter (["hd_income_band_sk_470"])
+                                                                                                    scan household_demographics
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                                         scan income_band
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk_478"])
+                                                                                    scan household_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q65.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q65.plan.txt
index 744c84a2143a..5e33f94404ba 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q65.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q65.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_item_sk_10", "ss_store_sk_15"])
                             partial aggregation over (ss_item_sk_10, ss_store_sk_15)
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk_10", "ss_sold_date_sk_31", "ss_store_sk_15"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                     remote exchange (REPLICATE, BROADCAST, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["s_store_sk"])
-                                scan store
+                                dynamic filter (["s_store_sk"])
+                                    scan store
                             final aggregation over (ss_store_sk)
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_store_sk"])
@@ -25,7 +27,8 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_store_sk"])
                                                         partial aggregation over (ss_item_sk, ss_store_sk)
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q66.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q66.plan.txt
index 785f1198b31c..aa4ba2b09959 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q66.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q66.plan.txt
@@ -15,7 +15,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_ship_mode_sk", "ws_sold_date_sk", "ws_sold_time_sk", "ws_warehouse_sk"])
+                                                                        scan web_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
@@ -41,7 +42,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_ship_mode_sk", "cs_sold_date_sk", "cs_sold_time_sk", "cs_warehouse_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q67.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q67.plan.txt
index 60f46f2fcf90..66c2001151d6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q67.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q67.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q68.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q68.plan.txt
index 6c71f017bae6..098a4cf5bf05 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q68.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q68.plan.txt
@@ -2,11 +2,13 @@ local exchange (GATHER, SINGLE, [])
     remote exchange (GATHER, SINGLE, [])
         join (INNER, PARTITIONED):
             remote exchange (REPARTITION, HASH, ["ca_address_sk_17"])
-                scan customer_address
+                dynamic filter (["ca_address_sk_17"])
+                    scan customer_address
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                     join (INNER, REPLICATED):
-                        scan customer
+                        dynamic filter (["c_customer_sk"])
+                            scan customer
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPLICATE, BROADCAST, [])
                                 final aggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number)
@@ -14,13 +16,15 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ca_address_sk", "ca_city", "ss_customer_sk", "ss_ticket_number"])
                                             partial aggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number)
                                                 join (INNER, REPLICATED):
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_sales
+                                                                        dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                            scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q69.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q69.plan.txt
index 18406802cc1b..b806bd15ae93 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q69.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q69.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (LEFT, REPLICATED):
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cd_demo_sk"])
-                                            scan customer_demographics
+                                            dynamic filter (["cd_demo_sk"])
+                                                scan customer_demographics
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                 join (INNER, PARTITIONED):
@@ -18,14 +19,16 @@ local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                 partial aggregation over (ss_customer_sk)
                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                        scan store_sales
+                                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                            scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                             join (INNER, REPLICATED):
-                                                                scan customer
+                                                                dynamic filter (["c_current_addr_sk"])
+                                                                    scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan customer_address
@@ -36,7 +39,8 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                         partial aggregation over (ws_bill_customer_sk)
                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_sold_date_sk"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -45,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q70.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q70.plan.txt
index 7f94b5469eb9..8d615a4b74a0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q70.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q70.plan.txt
@@ -10,13 +10,15 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["s_state"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan store
+                                                    dynamic filter (["s_state"])
+                                                        scan store
                                     single aggregation over (s_state_57)
                                         final aggregation over (s_state_57)
                                             local exchange (GATHER, SINGLE, [])
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                                     partial aggregation over (s_state_57)
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk_28", "ss_store_sk_12"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q71.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q71.plan.txt
index 02c955d77dfd..cff7dc32485c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q71.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q71.plan.txt
@@ -8,19 +8,22 @@ remote exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["time_sk"])
                                     join (INNER, REPLICATED):
-                                        remote exchange (REPARTITION, ROUND_ROBIN, [])
+                                        local exchange (REPARTITION, ROUND_ROBIN, [])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_item_sk", "ws_sold_date_sk", "ws_sold_time_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_sold_time_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_sold_time_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q72.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q72.plan.txt
index 8c52b501aa32..a283563bc484 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q72.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q72.plan.txt
@@ -6,14 +6,16 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_week_seq, i_item_desc, w_warehouse_name)
                         join (RIGHT, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["cr_item_sk"])
-                                scan catalog_returns
+                                dynamic filter (["cr_item_sk", "cr_order_number"])
+                                    scan catalog_returns
                             local exchange (GATHER, SINGLE, [])
                                 join (LEFT, REPLICATED):
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["inv_item_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan inventory
+                                                    dynamic filter (["inv_date_sk", "inv_item_sk", "inv_item_sk", "inv_quantity_on_hand", "inv_warehouse_sk"])
+                                                        scan inventory
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
@@ -21,10 +23,12 @@ local exchange (GATHER, SINGLE, [])
                                                                     join (INNER, REPLICATED):
                                                                         join (INNER, REPLICATED):
                                                                             join (INNER, REPLICATED):
-                                                                                scan catalog_sales
+                                                                                dynamic filter (["cs_bill_cdemo_sk", "cs_bill_hdemo_sk", "cs_item_sk", "cs_ship_date_sk", "cs_sold_date_sk"])
+                                                                                    scan catalog_sales
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                        scan date_dim
+                                                                                        dynamic filter (["d_week_seq"])
+                                                                                            scan date_dim
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan household_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q73.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q73.plan.txt
index 8ca487c16558..ce3ce9ac9b93 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q73.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q73.plan.txt
@@ -2,7 +2,8 @@ remote exchange (GATHER, SINGLE, [])
     local exchange (GATHER, UNKNOWN, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, REPLICATED):
-                scan customer
+                dynamic filter (["c_customer_sk"])
+                    scan customer
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPLICATE, BROADCAST, [])
                         final aggregation over (ss_customer_sk, ss_ticket_number)
@@ -12,7 +13,8 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q74.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q74.plan.txt
index 4bdf6ae6e53f..d2d1b748a50d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q74.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q74.plan.txt
@@ -8,13 +8,15 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk_97"])
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk_97", "ss_sold_date_sk_117"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["c_customer_sk_74"])
-                                        scan customer
+                                        dynamic filter (["c_customer_id_75"])
+                                            scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_customer_id, c_first_name, c_last_name, d_year)
                     local exchange (GATHER, SINGLE, [])
@@ -23,13 +25,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id"])
+                                                scan customer
                 join (INNER, PARTITIONED):
                     final aggregation over (c_customer_id_534, c_first_name_541, c_last_name_542, d_year_598)
                         local exchange (GATHER, SINGLE, [])
@@ -37,11 +41,13 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (c_customer_id_534, c_first_name_541, c_last_name_542, d_year_598)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_533"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_534", "c_customer_sk_533"])
+                                                scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_557"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk_587"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -51,11 +57,13 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (c_customer_id_347, c_first_name_354, c_last_name_355, d_year_411)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_346"])
-                                            scan customer
+                                            dynamic filter (["c_customer_sk_346"])
+                                                scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_370"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk_400"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q75.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q75.plan.txt
index 20311d91862a..1a4324d04b55 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q75.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q75.plan.txt
@@ -8,50 +8,59 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_14, expr, expr_22, i_brand_id_7, i_category_id_9, i_class_id_8, i_manufact_id_10)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                        scan catalog_returns
+                                        dynamic filter (["cr_item_sk", "cr_order_number"])
+                                            scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_brand_id_7", "i_category_id_9", "i_class_id_8", "i_manufact_id_10"])
+                                                            scan item
                         remote exchange (REPARTITION, HASH, ["i_brand_id_34", "i_category_id_38", "i_class_id_36", "i_manufact_id_40"])
                             partial aggregation over (d_year_58, expr_87, expr_88, i_brand_id_34, i_category_id_38, i_class_id_36, i_manufact_id_40)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                            scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_brand_id_34", "i_category_id_38", "i_class_id_36", "i_manufact_id_40"])
+                                                            scan item
                         remote exchange (REPARTITION, HASH, ["i_brand_id_100", "i_category_id_104", "i_class_id_102", "i_manufact_id_106"])
                             partial aggregation over (d_year_124, expr_153, expr_154, i_brand_id_100, i_category_id_104, i_class_id_102, i_manufact_id_106)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                        scan web_returns
+                                        dynamic filter (["wr_item_sk", "wr_order_number"])
+                                            scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_brand_id_100", "i_category_id_104", "i_class_id_102", "i_manufact_id_106"])
+                                                            scan item
             single aggregation over (d_year_157, i_brand_id_158, i_category_id_160, i_class_id_159, i_manufact_id_161)
                 final aggregation over (d_year_157, i_brand_id_158, i_category_id_160, i_class_id_159, i_manufact_id_161, sales_amt_163, sales_cnt_162)
                     local exchange (GATHER, SINGLE, [])
@@ -59,12 +68,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_240, expr_296, expr_297, i_brand_id_216, i_category_id_220, i_class_id_218, i_manufact_id_222)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk_266", "cr_order_number_280"])
-                                        scan catalog_returns
+                                        dynamic filter (["cr_item_sk_266", "cr_order_number_280"])
+                                            scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk_185", "cs_order_number_187"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_item_sk_185", "cs_sold_date_sk_204"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -75,12 +86,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_356, expr_405, expr_406, i_brand_id_332, i_category_id_336, i_class_id_334, i_manufact_id_338)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_382", "sr_ticket_number_389"])
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk_382", "sr_ticket_number_389"])
+                                            scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk_299", "ss_ticket_number_306"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_299", "ss_sold_date_sk_320"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -91,12 +104,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_476, expr_529, expr_530, i_brand_id_452, i_category_id_456, i_class_id_454, i_manufact_id_458)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk_502", "wr_order_number_513"])
-                                        scan web_returns
+                                        dynamic filter (["wr_item_sk_502", "wr_order_number_513"])
+                                            scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk_409", "ws_order_number_423"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_item_sk_409", "ws_sold_date_sk_440"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q76.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q76.plan.txt
index d7b6d9db21ac..ad45adef936d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q76.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q76.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_11, d_year_10, expr_144, expr_145, i_category_6)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
@@ -18,7 +19,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 join (INNER, REPLICATED):
-                                    scan web_sales
+                                    dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                        scan web_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -29,7 +31,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_120, d_year_116, expr_141, expr_143, i_category_97)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan catalog_sales
+                                dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                    scan catalog_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q77.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q77.plan.txt
index f5f8b7b62eea..b632624a3d15 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q77.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q77.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ss_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -25,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (sr_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_returns
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -38,7 +40,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_call_center_sk"])
                                             partial aggregation over (cs_call_center_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -49,7 +52,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["cr_call_center_sk"])
                                                     partial aggregation over (cr_call_center_sk)
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_returns
+                                                            dynamic filter (["cr_returned_date_sk"])
+                                                                scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -60,7 +64,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ws_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_page_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -73,7 +78,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (wr_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_returns
+                                                        dynamic filter (["wr_returned_date_sk", "wr_web_page_sk"])
+                                                            scan web_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q78.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q78.plan.txt
index b4323e2a4d9e..90e088aff90e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q78.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q78.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (LEFT, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
                                             scan catalog_returns
@@ -25,10 +26,12 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (LEFT, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                    scan store_sales
+                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                        scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                        scan store_returns
+                                                        dynamic filter (["sr_item_sk"])
+                                                            scan store_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -41,7 +44,8 @@ local exchange (GATHER, SINGLE, [])
                                                 join (INNER, REPLICATED):
                                                     join (LEFT, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk"])
+                                                                scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
                                                                 scan web_returns
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q79.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q79.plan.txt
index c41171325a3c..733be6f6e8b7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q79.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q79.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q80.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q80.plan.txt
index a4b2da9fdab0..61944a8d3ab3 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q80.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q80.plan.txt
@@ -15,10 +15,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                        scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_item_sk"])
+                                                                            scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -41,10 +43,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_catalog_page_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                        scan catalog_returns
+                                                                        dynamic filter (["cr_item_sk"])
+                                                                            scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -67,10 +71,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_item_sk", "ws_promo_sk", "ws_sold_date_sk", "ws_web_site_sk"])
+                                                                        scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_item_sk"])
+                                                                            scan web_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q81.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q81.plan.txt
index e2cfda6fe649..ea246cf5012d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q81.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q81.plan.txt
@@ -9,18 +9,21 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (ca_state, cr_returning_customer_sk)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk"])
+                                                scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_returns
+                                                    dynamic filter (["cr_returned_date_sk", "cr_returning_customer_sk"])
+                                                        scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                             join (INNER, REPLICATED):
-                                scan customer
+                                dynamic filter (["c_current_addr_sk"])
+                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
@@ -36,11 +39,13 @@ local exchange (GATHER, SINGLE, [])
                                                     partial aggregation over (ca_state_95, cr_returning_customer_sk_31)
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ca_address_sk_87"])
-                                                                scan customer_address
+                                                                dynamic filter (["ca_address_sk_87"])
+                                                                    scan customer_address
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk_34"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan catalog_returns
+                                                                        dynamic filter (["cr_returned_date_sk_51"])
+                                                                            scan catalog_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q82.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q82.plan.txt
index ab193ba29af9..5e08b02dfbf9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q82.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q82.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"])
                     partial aggregation over (i_current_price, i_item_desc, i_item_id)
                         join (INNER, REPLICATED, can skip output duplicates):
-                            scan store_sales
+                            dynamic filter (["ss_item_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED, can skip output duplicates):
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan inventory
+                                            dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                                scan inventory
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q83.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q83.plan.txt
index 87e080b8e1e2..a385eb207651 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q83.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q83.plan.txt
@@ -9,11 +9,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_returns
+                                            dynamic filter (["cr_item_sk", "cr_returned_date_sk"])
+                                                scan catalog_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_106"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_139)
@@ -21,7 +23,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_139"])
                                                                             partial aggregation over (d_date_139)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_141"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             final aggregation over (d_week_seq_174)
@@ -31,22 +34,26 @@ local exchange (GATHER, SINGLE, [])
                                                                                                             scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_79"])
-                                            scan item
+                                            dynamic filter (["i_item_id_80", "i_item_id_80"])
+                                                scan item
                 final aggregation over (i_item_id_213)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["i_item_id_213"])
                             partial aggregation over (i_item_id_213)
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["i_item_sk_212"])
-                                        scan item
+                                        dynamic filter (["i_item_id_213", "i_item_sk_212"])
+                                            scan item
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["wr_item_sk"])
                                             join (INNER, REPLICATED):
-                                                scan web_returns
+                                                dynamic filter (["wr_returned_date_sk"])
+                                                    scan web_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan date_dim
+                                                            dynamic filter (["d_date_239"])
+                                                                scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (d_date_272)
@@ -54,7 +61,8 @@ local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["d_date_272"])
                                                                                 partial aggregation over (d_date_272)
                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                        scan date_dim
+                                                                                        dynamic filter (["d_week_seq_274"])
+                                                                                            scan date_dim
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                 final aggregation over (d_week_seq_307)
@@ -69,11 +77,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["sr_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk", "sr_returned_date_sk"])
+                                            scan store_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan date_dim
+                                                    dynamic filter (["d_date"])
+                                                        scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (d_date_8)
@@ -81,7 +91,8 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["d_date_8"])
                                                                         partial aggregation over (d_date_8)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_10"])
+                                                                                    scan date_dim
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         final aggregation over (d_week_seq_43)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q84.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q84.plan.txt
index ec22af2c6a55..b1402e98e5ab 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q84.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q84.plan.txt
@@ -1,23 +1,27 @@
 local exchange (GATHER, SINGLE, [])
     remote exchange (GATHER, SINGLE, [])
         join (INNER, REPLICATED):
-            scan store_returns
+            dynamic filter (["sr_cdemo_sk"])
+                scan store_returns
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPLICATE, BROADCAST, [])
                     join (INNER, REPLICATED):
-                        scan customer_demographics
+                        dynamic filter (["cd_demo_sk"])
+                            scan customer_demographics
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPLICATE, BROADCAST, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan customer
+                                        dynamic filter (["c_current_addr_sk", "c_current_hdemo_sk"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_address
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan household_demographics
+                                                dynamic filter (["hd_income_band_sk"])
+                                                    scan household_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q85.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q85.plan.txt
index 2ae4cae3b89b..487162785ab2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q85.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q85.plan.txt
@@ -5,25 +5,29 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["r_reason_desc"])
                     partial aggregation over (r_reason_desc)
                         join (INNER, REPLICATED):
-                            scan customer_demographics
+                            dynamic filter (["cd_demo_sk_10", "cd_education_status_13", "cd_marital_status_12"])
+                                scan customer_demographics
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["wr_refunded_addr_sk"])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["wr_refunded_cdemo_sk"])
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_item_sk", "wr_order_number", "wr_reason_sk", "wr_refunded_cdemo_sk"])
+                                                                            scan web_returns
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                                                             join (INNER, REPLICATED):
-                                                                                scan web_sales
+                                                                                dynamic filter (["ws_sold_date_sk", "ws_web_page_sk"])
+                                                                                    scan web_sales
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan date_dim
@@ -32,7 +36,7 @@ local exchange (GATHER, SINGLE, [])
                                                                     scan customer_demographics
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan web_page
+                                                    scan reason
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                scan reason
+                                                scan web_page
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q86.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q86.plan.txt
index 990089879464..b6f0f04ea799 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q86.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q86.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (groupid, i_category$gid, i_class$gid)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q87.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q87.plan.txt
index 94d514729231..e7dab0f2199b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q87.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q87.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -26,11 +27,13 @@ final aggregation over ()
                                         partial aggregation over (c_first_name_55, c_last_name_56, d_date_18)
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_47"])
-                                                    scan customer
+                                                    dynamic filter (["c_customer_sk_47"])
+                                                        scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -41,11 +44,13 @@ final aggregation over ()
                                         partial aggregation over (c_first_name_111, c_last_name_112, d_date_74)
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_103"])
-                                                    scan customer
+                                                    dynamic filter (["c_customer_sk_103"])
+                                                        scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q88.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q88.plan.txt
index 6e297c60e201..c91fc4bf8056 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q88.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q88.plan.txt
@@ -12,7 +12,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan time_dim
@@ -29,7 +30,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk_13", "ss_sold_time_sk_9", "ss_store_sk_15"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan time_dim
@@ -46,7 +48,8 @@ cross join:
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_hdemo_sk_94", "ss_sold_time_sk_90", "ss_store_sk_96"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan time_dim
@@ -63,7 +66,8 @@ cross join:
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_hdemo_sk_175", "ss_sold_time_sk_171", "ss_store_sk_177"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan time_dim
@@ -80,7 +84,8 @@ cross join:
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk_256", "ss_sold_time_sk_252", "ss_store_sk_258"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan time_dim
@@ -97,7 +102,8 @@ cross join:
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_hdemo_sk_337", "ss_sold_time_sk_333", "ss_store_sk_339"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan time_dim
@@ -114,7 +120,8 @@ cross join:
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_hdemo_sk_418", "ss_sold_time_sk_414", "ss_store_sk_420"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan time_dim
@@ -131,7 +138,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_hdemo_sk_499", "ss_sold_time_sk_495", "ss_store_sk_501"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan time_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q89.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q89.plan.txt
index 2737c0093fbb..1d116106d04d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q89.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q89.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q90.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q90.plan.txt
index 0ddf21aa574d..2c74f5194fe4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q90.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q90.plan.txt
@@ -6,7 +6,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk", "ws_sold_time_sk", "ws_web_page_sk"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan web_page
@@ -23,7 +24,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk_18", "ws_sold_time_sk_9", "ws_web_page_sk_20"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan web_page
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q91.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q91.plan.txt
index c113b8bda923..d15fab949fef 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q91.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q91.plan.txt
@@ -12,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan customer
+                                                        dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_current_hdemo_sk", "c_customer_sk"])
+                                                            scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan customer_demographics
@@ -22,7 +23,8 @@ remote exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cr_returning_customer_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_returns
+                                                    dynamic filter (["cr_call_center_sk", "cr_returned_date_sk"])
+                                                        scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q92.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q92.plan.txt
index 4d76e724d197..19c57a5b9657 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q92.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q92.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk_8"])
                                     partial aggregation over (ws_item_sk_8)
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk_8", "ws_sold_date_sk_39"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q93.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q93.plan.txt
index ca9dc7543db7..e1cd897adff9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q93.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q93.plan.txt
@@ -7,10 +7,12 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk", "ss_ticket_number"])
+                                        scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_reason_sk"])
+                                            scan store_returns
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan reason
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q94.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q94.plan.txt
index 259bf30db48e..c39bbd5e9062 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q94.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q94.plan.txt
@@ -8,13 +8,15 @@ final aggregation over ()
                             partial aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number_25, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk)
                                 join (INNER, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["ws_order_number_25"])
-                                        scan web_sales
+                                        dynamic filter (["ws_order_number_25"])
+                                            scan web_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_order_number"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q95.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q95.plan.txt
index ea818962db9f..c6579b63bad2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q95.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q95.plan.txt
@@ -8,7 +8,8 @@ final aggregation over ()
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_order_number", "ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -26,20 +27,24 @@ final aggregation over ()
                                                 partial aggregation over (ws_order_number_25)
                                                     join (INNER, PARTITIONED, can skip output duplicates):
                                                         remote exchange (REPARTITION, HASH, ["ws_order_number_25"])
-                                                            scan web_sales
+                                                            dynamic filter (["ws_order_number_25", "ws_order_number_25"])
+                                                                scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["ws_order_number_63"])
-                                                                scan web_sales
+                                                                dynamic filter (["ws_order_number_63"])
+                                                                    scan web_sales
                                         final aggregation over (ws_order_number_109)
                                             local exchange (GATHER, SINGLE, [])
                                                 partial aggregation over (ws_order_number_109)
                                                     join (INNER, PARTITIONED, can skip output duplicates):
                                                         join (INNER, PARTITIONED, can skip output duplicates):
                                                             remote exchange (REPARTITION, HASH, ["ws_order_number_109"])
-                                                                scan web_sales
+                                                                dynamic filter (["ws_order_number_109", "ws_order_number_109"])
+                                                                    scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["wr_order_number"])
-                                                                    scan web_returns
+                                                                    dynamic filter (["wr_order_number"])
+                                                                        scan web_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["ws_order_number_147"])
                                                                 scan web_sales
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q96.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q96.plan.txt
index 6ac294895946..e4fdf4d14611 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q96.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q96.plan.txt
@@ -5,7 +5,8 @@ final aggregation over ()
                 join (INNER, REPLICATED):
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
-                            scan store_sales
+                            dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan time_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q97.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q97.plan.txt
index 7b9c83293534..959bbfe9de73 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q97.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q97.plan.txt
@@ -8,7 +8,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"])
                                 partial aggregation over (ss_customer_sk, ss_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"])
                                 partial aggregation over (cs_bill_customer_sk, cs_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q98.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q98.plan.txt
index a6a04beb1e8b..380d0394ba6f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q98.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q98.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q99.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q99.plan.txt
index 6e2c1451c321..4037170bb1d7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q99.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q99.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_call_center_sk", "cs_ship_date_sk", "cs_ship_mode_sk", "cs_warehouse_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q01.plan.txt
index da4afcb7be2b..113b0d7ec48b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q01.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q01.plan.txt
@@ -4,7 +4,8 @@ local exchange (GATHER, SINGLE, [])
             join (LEFT, REPLICATED):
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                        scan customer
+                        dynamic filter (["c_customer_sk"])
+                            scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["sr_customer_sk"])
                             join (INNER, REPLICATED):
@@ -13,7 +14,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_store_sk"])
                                             partial aggregation over (sr_customer_sk, sr_store_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan store_returns
+                                                    dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                        scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -31,7 +33,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk_12", "sr_store_sk_16"])
                                                     partial aggregation over (sr_customer_sk_12, sr_store_sk_16)
                                                         join (INNER, REPLICATED):
-                                                            scan store_returns
+                                                            dynamic filter (["sr_returned_date_sk_9"])
+                                                                scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q02.plan.txt
index 3915d9d4ef91..df26dffc410e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q02.plan.txt
@@ -9,15 +9,19 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq"])
                                     partial aggregation over (d_day_name, d_week_seq)
                                         join (INNER, REPLICATED):
-                                            remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                scan web_sales
-                                                scan catalog_sales
+                                            local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                dynamic filter (["ws_sold_date_sk"])
+                                                    scan web_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan date_dim
+                                                    dynamic filter (["d_week_seq", "d_week_seq"])
+                                                        scan date_dim
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["d_week_seq_22"])
-                            scan date_dim
+                            dynamic filter (["d_week_seq_22"])
+                                scan date_dim
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["expr_226"])
                         join (INNER, PARTITIONED):
@@ -27,12 +31,15 @@ remote exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["d_week_seq_129"])
                                             partial aggregation over (d_day_name_139, d_week_seq_129)
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
-                                                        scan catalog_sales
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ws_sold_date_sk_51"])
+                                                            scan web_sales
+                                                        dynamic filter (["cs_sold_date_sk_88"])
+                                                            scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan date_dim
+                                                            dynamic filter (["d_week_seq_129"])
+                                                                scan date_dim
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq_175"])
                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q03.plan.txt
index 70aae3fa1bdd..ede6415850e5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q03.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q04.plan.txt
index de846009f168..394dfb1bcd62 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q04.plan.txt
@@ -10,13 +10,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_900"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk_900", "cs_sold_date_sk_897"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_876"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_877", "c_customer_id_877", "c_customer_id_877"])
+                                                    scan customer
                     final aggregation over (c_birth_country_1608, c_customer_id_1595, c_email_address_1610, c_first_name_1602, c_last_name_1603, c_login_1609, c_preferred_cust_flag_1604, d_year_1658)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_id_1595"])
@@ -24,13 +26,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1619"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_1619", "ws_sold_date_sk_1615"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_1594"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_1595", "c_customer_id_1595"])
+                                                    scan customer
                 join (INNER, PARTITIONED):
                     final aggregation over (c_birth_country_581, c_customer_id_568, c_email_address_583, c_first_name_575, c_last_name_576, c_login_582, c_preferred_cust_flag_577, d_year_631)
                         local exchange (GATHER, SINGLE, [])
@@ -39,13 +43,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_591"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk_591", "cs_sold_date_sk_588"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_567"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_568", "c_customer_id_568"])
+                                                    scan customer
                     final aggregation over (c_birth_country_1299, c_customer_id_1286, c_email_address_1301, c_first_name_1293, c_last_name_1294, c_login_1300, c_preferred_cust_flag_1295, d_year_1349)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_id_1286"])
@@ -53,13 +59,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1310"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_1310", "ws_sold_date_sk_1306"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_1285"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_1286"])
+                                                    scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_birth_country_183, c_customer_id_170, c_email_address_185, c_first_name_177, c_last_name_178, c_login_184, c_preferred_cust_flag_179, d_year_222)
                     local exchange (GATHER, SINGLE, [])
@@ -68,13 +76,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_193"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_193", "ss_sold_date_sk_190"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_169"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_170"])
+                                                scan customer
                 final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id"])
@@ -82,7 +92,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q05.plan.txt
index 4155bb638c70..37d27a5e7ebf 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q05.plan.txt
@@ -11,9 +11,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (s_store_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan store_sales
-                                                        scan store_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -26,9 +28,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (cp_catalog_page_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan catalog_sales
-                                                        scan catalog_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["cs_catalog_page_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
+                                                        dynamic filter (["cr_catalog_page_sk", "cr_returned_date_sk"])
+                                                            scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -42,13 +46,16 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_site_sk"])
+                                                            scan web_sales
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ws_item_sk_92", "ws_order_number_106"])
-                                                                scan web_sales
+                                                                dynamic filter (["ws_item_sk_92", "ws_order_number_106", "ws_web_site_sk_102"])
+                                                                    scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                    scan web_returns
+                                                                    dynamic filter (["wr_returned_date_sk"])
+                                                                        scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q06.plan.txt
index 2a72afdda3fa..5f995244674e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q06.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q06.plan.txt
@@ -10,11 +10,13 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan date_dim
+                                                            dynamic filter (["d_month_seq"])
+                                                                scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     local exchange (GATHER, SINGLE, [])
@@ -28,7 +30,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                        scan customer
+                                                        dynamic filter (["c_current_addr_sk"])
+                                                            scan customer
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q07.plan.txt
index 32f4763b443d..a8da2880635e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q07.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q08.plan.txt
index 432e37f5b19c..2144fe01874b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q08.plan.txt
@@ -5,10 +5,11 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["s_store_name"])
                     partial aggregation over (s_store_name)
                         join (INNER, PARTITIONED):
-                            remote exchange (REPARTITION, HASH, ["substr_39"])
+                            remote exchange (REPARTITION, HASH, ["substring"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -16,7 +17,7 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan store
                             local exchange (GATHER, SINGLE, [])
-                                remote exchange (REPARTITION, HASH, ["substr_40"])
+                                remote exchange (REPARTITION, HASH, ["substring_39"])
                                     final aggregation over (ca_zip)
                                         local exchange (REPARTITION, HASH, ["ca_zip"])
                                             remote exchange (REPARTITION, HASH, ["ca_zip_31"])
@@ -30,7 +31,8 @@ local exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over (ca_zip_19)
                                                                     join (INNER, PARTITIONED):
                                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk_10"])
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk_10"])
+                                                                                scan customer_address
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q09.plan.txt
index 4466a2d88feb..cbcd78f04da6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q09.plan.txt
@@ -1,93 +1,122 @@
-cross join:
-    cross join:
-        cross join:
-            cross join:
-                cross join:
-                    cross join:
-                        cross join:
-                            cross join:
-                                cross join:
-                                    cross join:
-                                        cross join:
-                                            cross join:
-                                                cross join:
-                                                    cross join:
-                                                        cross join:
-                                                            final aggregation over ()
-                                                                local exchange (GATHER, SINGLE, [])
-                                                                    remote exchange (GATHER, SINGLE, [])
-                                                                        partial aggregation over ()
-                                                                            scan store_sales
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    scan reason
-                                                        final aggregation over ()
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    partial aggregation over ()
-                                                                        scan store_sales
+join (LEFT, REPLICATED):
+    join (LEFT, REPLICATED):
+        join (LEFT, REPLICATED):
+            join (LEFT, REPLICATED):
+                join (LEFT, REPLICATED):
+                    join (LEFT, REPLICATED):
+                        join (LEFT, REPLICATED):
+                            join (RIGHT, PARTITIONED):
+                                remote exchange (REPARTITION, HASH, [])
+                                    final aggregation over ()
+                                        local exchange (GATHER, SINGLE, [])
+                                            remote exchange (GATHER, SINGLE, [])
+                                                partial aggregation over ()
+                                                    scan store_sales
+                                local exchange (GATHER, SINGLE, [])
+                                    join (RIGHT, PARTITIONED):
+                                        remote exchange (REPARTITION, HASH, [])
+                                            final aggregation over ()
+                                                local exchange (GATHER, SINGLE, [])
+                                                    remote exchange (GATHER, SINGLE, [])
+                                                        partial aggregation over ()
+                                                            scan store_sales
+                                        local exchange (GATHER, SINGLE, [])
+                                            join (RIGHT, PARTITIONED):
+                                                remote exchange (REPARTITION, HASH, [])
                                                     final aggregation over ()
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over ()
                                                                     scan store_sales
-                                                final aggregation over ()
-                                                    local exchange (GATHER, SINGLE, [])
-                                                        remote exchange (GATHER, SINGLE, [])
-                                                            partial aggregation over ()
-                                                                scan store_sales
-                                            final aggregation over ()
                                                 local exchange (GATHER, SINGLE, [])
-                                                    remote exchange (GATHER, SINGLE, [])
-                                                        partial aggregation over ()
-                                                            scan store_sales
-                                        final aggregation over ()
-                                            local exchange (GATHER, SINGLE, [])
-                                                remote exchange (GATHER, SINGLE, [])
-                                                    partial aggregation over ()
-                                                        scan store_sales
+                                                    join (RIGHT, PARTITIONED):
+                                                        remote exchange (REPARTITION, HASH, [])
+                                                            final aggregation over ()
+                                                                local exchange (GATHER, SINGLE, [])
+                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                        partial aggregation over ()
+                                                                            scan store_sales
+                                                        local exchange (GATHER, SINGLE, [])
+                                                            join (RIGHT, PARTITIONED):
+                                                                remote exchange (REPARTITION, HASH, [])
+                                                                    final aggregation over ()
+                                                                        local exchange (GATHER, SINGLE, [])
+                                                                            remote exchange (GATHER, SINGLE, [])
+                                                                                partial aggregation over ()
+                                                                                    scan store_sales
+                                                                local exchange (GATHER, SINGLE, [])
+                                                                    join (RIGHT, PARTITIONED):
+                                                                        remote exchange (REPARTITION, HASH, [])
+                                                                            final aggregation over ()
+                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                                        partial aggregation over ()
+                                                                                            scan store_sales
+                                                                        local exchange (GATHER, SINGLE, [])
+                                                                            join (RIGHT, PARTITIONED):
+                                                                                remote exchange (REPARTITION, HASH, [])
+                                                                                    final aggregation over ()
+                                                                                        local exchange (GATHER, SINGLE, [])
+                                                                                            remote exchange (GATHER, SINGLE, [])
+                                                                                                partial aggregation over ()
+                                                                                                    scan store_sales
+                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                    join (RIGHT, PARTITIONED):
+                                                                                        remote exchange (REPARTITION, HASH, [])
+                                                                                            final aggregation over ()
+                                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                                                        partial aggregation over ()
+                                                                                                            scan store_sales
+                                                                                        local exchange (GATHER, SINGLE, [])
+                                                                                            remote exchange (REPARTITION, HASH, [])
+                                                                                                scan reason
+                            local exchange (GATHER, SINGLE, [])
+                                remote exchange (REPLICATE, BROADCAST, [])
                                     final aggregation over ()
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (GATHER, SINGLE, [])
                                                 partial aggregation over ()
                                                     scan store_sales
+                        local exchange (GATHER, SINGLE, [])
+                            remote exchange (REPLICATE, BROADCAST, [])
                                 final aggregation over ()
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (GATHER, SINGLE, [])
                                             partial aggregation over ()
                                                 scan store_sales
+                    local exchange (GATHER, SINGLE, [])
+                        remote exchange (REPLICATE, BROADCAST, [])
                             final aggregation over ()
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (GATHER, SINGLE, [])
                                         partial aggregation over ()
                                             scan store_sales
+                local exchange (GATHER, SINGLE, [])
+                    remote exchange (REPLICATE, BROADCAST, [])
                         final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         scan store_sales
+            local exchange (GATHER, SINGLE, [])
+                remote exchange (REPLICATE, BROADCAST, [])
                     final aggregation over ()
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over ()
                                     scan store_sales
+        local exchange (GATHER, SINGLE, [])
+            remote exchange (REPLICATE, BROADCAST, [])
                 final aggregation over ()
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (GATHER, SINGLE, [])
                             partial aggregation over ()
                                 scan store_sales
+    local exchange (GATHER, SINGLE, [])
+        remote exchange (REPLICATE, BROADCAST, [])
             final aggregation over ()
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (GATHER, SINGLE, [])
                         partial aggregation over ()
                             scan store_sales
-        final aggregation over ()
-            local exchange (GATHER, SINGLE, [])
-                remote exchange (GATHER, SINGLE, [])
-                    partial aggregation over ()
-                        scan store_sales
-    final aggregation over ()
-        local exchange (GATHER, SINGLE, [])
-            remote exchange (GATHER, SINGLE, [])
-                partial aggregation over ()
-                    scan store_sales
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q10.plan.txt
index 7d60d2a5fdd5..751f1ac52a8c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q10.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_ship_customer_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -21,14 +22,16 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                 partial aggregation over (ws_bill_customer_sk)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                             join (INNER, REPLICATED):
-                                                scan customer_demographics
+                                                dynamic filter (["cd_demo_sk"])
+                                                    scan customer_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
@@ -37,14 +40,16 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                         partial aggregation over (ss_customer_sk)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan store_sales
+                                                                                dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                                    scan store_sales
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan customer
+                                                                        dynamic filter (["c_current_addr_sk"])
+                                                                            scan customer
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q11.plan.txt
index b7d39628c9e9..32e112eb2fed 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q11.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_107"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_107", "ss_sold_date_sk_104"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_83"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_84", "c_customer_id_84"])
+                                                scan customer
                 final aggregation over (c_birth_country_385, c_customer_id_372, c_email_address_387, c_first_name_379, c_last_name_380, c_login_386, c_preferred_cust_flag_381, d_year_435)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_372"])
@@ -23,13 +25,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_396"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_396", "ws_sold_date_sk_392"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_371"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_372"])
+                                                scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year)
                     local exchange (GATHER, SINGLE, [])
@@ -38,13 +42,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id"])
+                                                scan customer
                 final aggregation over (c_birth_country_584, c_customer_id_571, c_email_address_586, c_first_name_578, c_last_name_579, c_login_585, c_preferred_cust_flag_580, d_year_634)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_571"])
@@ -52,7 +58,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_595"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_595", "ws_sold_date_sk_591"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q12.plan.txt
index 6f94c98c5224..04b0eb523fd6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q12.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q13.plan.txt
index 011d5b20fbba..8f205090a87c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q13.plan.txt
@@ -7,7 +7,8 @@ final aggregation over ()
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q14.plan.txt
index fe1028ad939b..c19a48e3a386 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q14.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_6, i_category_id_8, i_class_id_7)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -20,21 +21,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_15)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_15"])
                                                                             partial aggregation over (i_item_sk_15)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_22", "i_category_id_26", "i_class_id_24"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_22", "i_category_id_26", "i_class_id_24"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id, category_id, class_id)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_76", "i_category_id_80", "i_class_id_78"])
                                                                                                 partial aggregation over (i_brand_id_76, i_category_id_80, i_class_id_78)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_45", "ss_sold_date_sk_43"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -45,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_135, i_category_id_139, i_class_id_137)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -56,7 +61,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_194, i_category_id_198, i_class_id_196)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -70,19 +76,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_248"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_305"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_373"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -93,7 +102,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_488, i_category_id_492, i_class_id_490)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_item_sk_459", "cs_sold_date_sk_444"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -101,21 +111,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk_481"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk_481"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_539)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_539"])
                                                                             partial aggregation over (i_item_sk_539)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_546", "i_category_id_550", "i_class_id_548"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_546", "i_category_id_550", "i_class_id_548"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id_564, category_id_566, class_id_565)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_603", "i_category_id_607", "i_class_id_605"])
                                                                                                 partial aggregation over (i_brand_id_603, i_category_id_607, i_class_id_605)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_572", "ss_sold_date_sk_570"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -126,7 +139,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_696, i_category_id_700, i_class_id_698)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk_667", "cs_sold_date_sk_652"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -137,7 +151,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_789, i_category_id_793, i_class_id_791)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk_748", "ws_sold_date_sk_745"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -151,19 +166,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_850"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_907"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_975"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -174,7 +192,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_1090, i_category_id_1094, i_class_id_1092)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_item_sk_1049", "ws_sold_date_sk_1046"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -182,21 +201,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk_1083"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk_1083"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_1141)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_1141"])
                                                                             partial aggregation over (i_item_sk_1141)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_1148", "i_category_id_1152", "i_class_id_1150"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_1148", "i_category_id_1152", "i_class_id_1150"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id_1166, category_id_1168, class_id_1167)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_1205", "i_category_id_1209", "i_class_id_1207"])
                                                                                                 partial aggregation over (i_brand_id_1205, i_category_id_1209, i_class_id_1207)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_1174", "ss_sold_date_sk_1172"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -207,7 +229,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_1298, i_category_id_1302, i_class_id_1300)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk_1269", "cs_sold_date_sk_1254"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -218,7 +241,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_1391, i_category_id_1395, i_class_id_1393)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk_1350", "ws_sold_date_sk_1347"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -232,19 +256,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_1452"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_1509"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_1577"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q15.plan.txt
index f359fbefb40f..f6e8849bd9b5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q15.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                 join (INNER, REPLICATED):
-                                    scan catalog_sales
+                                    dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                        scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                            scan customer
+                                            dynamic filter (["c_current_addr_sk"])
+                                                scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q16.plan.txt
index c15c528fe625..59deb196e0c3 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q16.plan.txt
@@ -8,19 +8,22 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cr_order_number"])
                                     partial aggregation over (cr_order_number)
-                                        scan catalog_returns
+                                        dynamic filter (["cr_order_number"])
+                                            scan catalog_returns
                         final aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number_26, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_order_number_26"])
                                     partial aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number_26, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique)
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_order_number_26"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan catalog_sales
+                                                                dynamic filter (["cs_call_center_sk", "cs_ship_addr_sk", "cs_ship_date_sk"])
+                                                                    scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q17.plan.txt
index 47c73f484403..7082811c8502 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q17.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_item_desc, i_item_id, s_state)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                scan item
+                                dynamic filter (["i_item_sk"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q18.plan.txt
index f338fb880363..5a6585df67fc 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q18.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_cdemo_sk", "cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan customer_demographics
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                                    scan customer
+                                                                    dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk"])
+                                                                        scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q19.plan.txt
index 5230f46699ba..f1187ea40a27 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q19.plan.txt
@@ -6,18 +6,21 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_brand, i_brand_id, i_manufact, i_manufact_id)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                scan customer_address
+                                dynamic filter (["ca_address_sk"])
+                                    scan customer_address
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_sk"])
+                                                scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q20.plan.txt
index 852a9d2a3e5c..2e873503ece8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q20.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q21.plan.txt
index 50e40917c430..2ec2a1799207 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q21.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan inventory
+                                    dynamic filter (["inv_date_sk", "inv_item_sk", "inv_warehouse_sk"])
+                                        scan inventory
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q22.plan.txt
index 2fd28d3f31ed..6f1d958f18df 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q22.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["i_brand", "i_product_name"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan inventory
+                                        dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                            scan inventory
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q23.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q23.plan.txt
index 27916e13ceea..5fa13ead1f8d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q23.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q23.plan.txt
@@ -12,17 +12,20 @@ final aggregation over ()
                                             partial aggregation over (d_date_8, ss_item_sk, substr$gid)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_item_sk"])
+                                                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -33,7 +36,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_47)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_47"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_47"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                     scan customer
@@ -49,7 +53,8 @@ final aggregation over ()
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_77"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_77", "ss_sold_date_sk_74"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
@@ -67,17 +72,20 @@ final aggregation over ()
                                             partial aggregation over (d_date_222, ss_item_sk_196, substr$gid_279)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk_196", "ss_item_sk_196", "ss_sold_date_sk_194"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_item_sk_251"])
+                                                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -88,7 +96,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_288)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_288"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_288"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_311"])
                                                     scan customer
@@ -104,7 +113,8 @@ final aggregation over ()
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_338"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_338", "ss_sold_date_sk_335"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q24.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q24.plan.txt
index 5a1ffc003e35..a0d51a4d85a3 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q24.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q24.plan.txt
@@ -12,21 +12,25 @@ remote exchange (GATHER, SINGLE, [])
                                             partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["ca_zip", "upper"])
-                                                        scan customer_address
+                                                        dynamic filter (["ca_zip"])
+                                                            scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_birth_country", "s_zip"])
                                                             join (INNER, REPLICATED):
-                                                                scan customer
+                                                                dynamic filter (["c_customer_sk"])
+                                                                    scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, PARTITIONED):
                                                                             remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                                scan store_returns
+                                                                                dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                                                                    scan store_returns
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                                                     join (INNER, REPLICATED):
                                                                                         join (INNER, REPLICATED):
-                                                                                            scan store_sales
+                                                                                            dynamic filter (["ss_item_sk", "ss_store_sk"])
+                                                                                                scan store_sales
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan item
@@ -51,16 +55,20 @@ remote exchange (GATHER, SINGLE, [])
                                                                             join (INNER, PARTITIONED):
                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk_18", "ss_ticket_number_25"])
                                                                                     join (INNER, REPLICATED):
-                                                                                        scan store_sales
+                                                                                        dynamic filter (["ss_customer_sk_19", "ss_item_sk_18", "ss_item_sk_18", "ss_store_sk_23", "ss_ticket_number_25"])
+                                                                                            scan store_sales
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                scan store
+                                                                                                dynamic filter (["s_zip_90"])
+                                                                                                    scan store
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_44", "sr_ticket_number_51"])
-                                                                                        scan store_returns
+                                                                                        dynamic filter (["sr_item_sk_44"])
+                                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_122"])
-                                                                                scan customer
+                                                                                dynamic filter (["c_birth_country_136"])
+                                                                                    scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q25.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q25.plan.txt
index a21872e9dd27..2cf400cb82cd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q25.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q25.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                scan item
+                                dynamic filter (["i_item_sk"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q26.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q26.plan.txt
index 555bb67d3baa..d91ef68bdab5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q26.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q26.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_cdemo_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q27.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q27.plan.txt
index ed0e2e73e9f3..bb3578559862 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q27.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q27.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q29.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q29.plan.txt
index a21872e9dd27..2cf400cb82cd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q29.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q29.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                scan item
+                                dynamic filter (["i_item_sk"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q30.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q30.plan.txt
index e13b23c55ef6..6f9ba58b4915 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q30.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q30.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan web_returns
+                                                dynamic filter (["wr_returned_date_sk", "wr_returning_addr_sk", "wr_returning_customer_sk"])
+                                                    scan web_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                             join (INNER, REPLICATED):
-                                scan customer
+                                dynamic filter (["c_current_addr_sk"])
+                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
@@ -37,7 +39,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk_35"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan web_returns
+                                                                    dynamic filter (["wr_returned_date_sk_25", "wr_returning_addr_sk_35"])
+                                                                        scan web_returns
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q31.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q31.plan.txt
index ee2d19c0ffcf..a0f39464ea33 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q31.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q31.plan.txt
@@ -11,13 +11,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_12"])
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk_12", "ss_sold_date_sk_6"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_63"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_70", "ca_county_70", "ca_county_70"])
+                                                        scan customer_address
                         final aggregation over (ca_county_147, d_qoy_119, d_year_115)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_147"])
@@ -25,13 +27,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_89"])
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk_89", "ss_sold_date_sk_83"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_140"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_147", "ca_county_147"])
+                                                        scan customer_address
                     join (INNER, PARTITIONED):
                         final aggregation over (ca_county_289, d_qoy_261, d_year_257)
                             local exchange (GATHER, SINGLE, [])
@@ -40,13 +44,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_221"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk_221", "ws_sold_date_sk_214"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_282"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_289", "ca_county_289"])
+                                                        scan customer_address
                         final aggregation over (ca_county_377, d_qoy_349, d_year_345)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_377"])
@@ -54,13 +60,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_309"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk_309", "ws_sold_date_sk_302"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_370"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_377"])
+                                                        scan customer_address
                 join (INNER, PARTITIONED):
                     final aggregation over (ca_county, d_qoy, d_year)
                         local exchange (GATHER, SINGLE, [])
@@ -69,13 +77,15 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                scan customer_address
+                                                dynamic filter (["ca_county"])
+                                                    scan customer_address
                     final aggregation over (ca_county_201, d_qoy_173, d_year_169)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_county_201"])
@@ -83,7 +93,8 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q32.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q32.plan.txt
index fbb263a8d062..06b08360b712 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q32.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q32.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk_21"])
                                     partial aggregation over (cs_item_sk_21)
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk_21", "cs_sold_date_sk_6"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q33.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q33.plan.txt
index 6d9187d8b05b..2823edeef950 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q33.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q33.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_8"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_25)
@@ -36,7 +38,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_102"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_129)
@@ -62,7 +66,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -72,7 +77,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_208"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_235)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q34.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q34.plan.txt
index e9f7af9e157c..537336239d51 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q34.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q34.plan.txt
@@ -3,7 +3,8 @@ remote exchange (GATHER, SINGLE, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, PARTITIONED):
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                    scan customer
+                    dynamic filter (["c_customer_sk"])
+                        scan customer
                 final aggregation over (ss_customer_sk, ss_ticket_number)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
@@ -11,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q35.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q35.plan.txt
index f1fed4317214..5a7a74e49f1f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q35.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q35.plan.txt
@@ -13,7 +13,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                            scan customer
+                                                            dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_customer_sk"])
+                                                                scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                 scan customer_address
@@ -22,7 +23,8 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                             partial aggregation over (ss_customer_sk)
                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_sold_date_sk"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
@@ -34,7 +36,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -43,7 +46,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q36.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q36.plan.txt
index 3fe86fe51161..c4ad4ee53ecf 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q36.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q36.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q37.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q37.plan.txt
index 2582d9fa4122..eadc54781cf8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q37.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q37.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"])
                     partial aggregation over (i_current_price, i_item_desc, i_item_id)
                         join (INNER, REPLICATED, can skip output duplicates):
-                            scan catalog_sales
+                            dynamic filter (["cs_item_sk"])
+                                scan catalog_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED, can skip output duplicates):
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan inventory
+                                            dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                                scan inventory
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q38.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q38.plan.txt
index 6590f3356d80..5bc1ea22a688 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q38.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q38.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -27,7 +28,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -42,7 +44,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q39.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q39.plan.txt
index c06e49455217..f002dbe411e5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q39.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q39.plan.txt
@@ -10,16 +10,19 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan inventory
+                                                dynamic filter (["inv_date_sk", "inv_item_sk", "inv_item_sk", "inv_warehouse_sk", "inv_warehouse_sk"])
+                                                    scan inventory
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_item_sk"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                scan warehouse
+                                                dynamic filter (["w_warehouse_sk"])
+                                                    scan warehouse
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["inv_item_sk_12", "inv_warehouse_sk_13"])
                         final aggregation over (d_moy_68, inv_item_sk_12, inv_warehouse_sk_13, w_warehouse_name_45)
@@ -29,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan inventory
+                                                    dynamic filter (["inv_date_sk_11", "inv_item_sk_12", "inv_warehouse_sk_13"])
+                                                        scan inventory
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q40.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q40.plan.txt
index 266142fc4c1a..7b700b882104 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q40.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q40.plan.txt
@@ -9,10 +9,12 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (LEFT, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_warehouse_sk"])
+                                                scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                scan catalog_returns
+                                                dynamic filter (["cr_item_sk"])
+                                                    scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q41.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q41.plan.txt
index 58a96c8d1ec2..772ad4b317c4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q41.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q41.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_product_name)
                         single aggregation over (i_manufact, i_manufact_id, i_product_name, unique)
                             join (INNER, REPLICATED, can skip output duplicates):
-                                scan item
+                                dynamic filter (["i_manufact"])
+                                    scan item
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q42.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q42.plan.txt
index 87792b40cd98..534e670ed02a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q42.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q42.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_category, i_category_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q43.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q43.plan.txt
index 9d9e36441a12..b94077c666ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q43.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q43.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     partial aggregation over (d_day_name, s_store_id, s_store_name)
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q45.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q45.plan.txt
index 6af76139314e..b4b112847006 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q45.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q45.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                    scan customer
+                                                    dynamic filter (["c_current_addr_sk"])
+                                                        scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q46.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q46.plan.txt
index 87414d60d6a0..c2b50b79e318 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q46.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q46.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan store
@@ -27,7 +28,8 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                            scan customer
+                            dynamic filter (["c_current_addr_sk"])
+                                scan customer
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_address_sk_16"])
                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q47.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q47.plan.txt
index 626ebbc4e55f..fda3108a0949 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q47.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q47.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan store
+                                                        dynamic filter (["s_company_name", "s_company_name", "s_store_name", "s_store_name"])
+                                                            scan store
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                        scan item
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["i_brand_17", "i_category_21", "s_company_name_108", "s_store_name_96"])
                         final aggregation over (d_moy_68, d_year_66, i_brand_17, i_category_21, s_company_name_108, s_store_name_96)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_36", "ss_sold_date_sk_34", "ss_store_sk_41"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan store
+                                                        dynamic filter (["s_company_name_108", "s_store_name_96"])
+                                                            scan store
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand_17", "i_category_21"])
+                                                        scan item
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_brand_140", "i_category_144", "s_company_name_231", "s_store_name_219"])
                     final aggregation over (d_moy_191, d_year_189, i_brand_140, i_category_144, s_company_name_231, s_store_name_219)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk_159", "ss_sold_date_sk_157", "ss_store_sk_164"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q48.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q48.plan.txt
index dd3059b1afd4..17d20aa59ac5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q48.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q48.plan.txt
@@ -6,7 +6,8 @@ final aggregation over ()
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q49.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q49.plan.txt
index fed42e3537db..9ee85aa8c159 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q49.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q49.plan.txt
@@ -12,11 +12,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (wr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                        scan web_returns
+                                                        dynamic filter (["wr_item_sk", "wr_order_number"])
+                                                            scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_sold_date_sk"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -30,11 +32,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (cr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                        scan catalog_returns
+                                                        dynamic filter (["cr_item_sk", "cr_order_number"])
+                                                            scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan catalog_sales
+                                                                dynamic filter (["cs_sold_date_sk"])
+                                                                    scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -48,11 +52,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (sr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                        scan store_returns
+                                                        dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                                            scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q50.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q50.plan.txt
index c2a9d481bf10..8ff8d8dbfebf 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q50.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q50.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                            scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                             join (INNER, REPLICATED):
-                                                scan store_returns
+                                                dynamic filter (["sr_returned_date_sk"])
+                                                    scan store_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q51.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q51.plan.txt
index 31354b085b64..6d4f17eaa6ad 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q51.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q51.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 partial aggregation over (d_date, ws_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                 partial aggregation over (d_date_9, ss_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q52.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q52.plan.txt
index 70aae3fa1bdd..ede6415850e5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q52.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q52.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q53.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q53.plan.txt
index cd10ab3698e6..799e43e0eca0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q53.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q53.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q54.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q54.plan.txt
index 9e373b4ddc1c..623a7d64ea2c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q54.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q54.plan.txt
@@ -8,17 +8,19 @@ local exchange (GATHER, SINGLE, [])
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                     partial aggregation over (ss_customer_sk)
-                                        cross join:
-                                            cross join:
+                                        join (LEFT, REPLICATED):
+                                            join (LEFT, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk", "ca_county", "ca_state"])
+                                                                                scan customer_address
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan store
@@ -27,14 +29,17 @@ local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 partial aggregation over (c_current_addr_sk, c_customer_sk)
                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                        scan customer
+                                                                                        dynamic filter (["c_customer_sk"])
+                                                                                            scan customer
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                 join (INNER, REPLICATED, can skip output duplicates):
                                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                                        remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                                                                            scan catalog_sales
-                                                                                                            scan web_sales
+                                                                                                        local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                                                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                                scan catalog_sales
+                                                                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                                scan web_sales
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q55.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q55.plan.txt
index f89f2f078b63..c58f37a50aa2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q55.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q55.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q56.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q56.plan.txt
index be881ce912e9..289e7cfd56ee 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q56.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q56.plan.txt
@@ -10,14 +10,16 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan item
+                                                        dynamic filter (["i_item_id_8"])
+                                                            scan item
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (i_item_id_13)
@@ -37,14 +39,16 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_bill_addr_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan item
+                                                            dynamic filter (["i_item_id_90"])
+                                                                scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (i_item_id_117)
@@ -64,14 +68,16 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan item
+                                                            dynamic filter (["i_item_id_196"])
+                                                                scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (i_item_id_223)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q57.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q57.plan.txt
index e9f0b1bd10c0..3877634bd233 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q57.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q57.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan call_center
+                                                        dynamic filter (["cc_name", "cc_name"])
+                                                            scan call_center
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                        scan item
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["cc_name_108", "i_brand_17", "i_category_21"])
                         final aggregation over (cc_name_108, d_moy_79, d_year_77, i_brand_17, i_category_21)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk_45", "cs_item_sk_49", "cs_sold_date_sk_34"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan call_center
+                                                        dynamic filter (["cc_name_108"])
+                                                            scan call_center
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand_17", "i_category_21"])
+                                                        scan item
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["cc_name_243", "i_brand_152", "i_category_156"])
                     final aggregation over (cc_name_243, d_moy_214, d_year_212, i_brand_152, i_category_156)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_call_center_sk_180", "cs_item_sk_184", "cs_sold_date_sk_169"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q58.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q58.plan.txt
index b5044356bbce..e6f484b37c06 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q58.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q58.plan.txt
@@ -7,11 +7,13 @@ local exchange (GATHER, SINGLE, [])
                         partial aggregation over (i_item_id)
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan date_dim
+                                                dynamic filter (["d_date"])
+                                                    scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         final aggregation over (d_date_8)
@@ -19,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["d_date_8"])
                                                                     partial aggregation over (d_date_8)
                                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                                            scan date_dim
+                                                                            dynamic filter (["d_week_seq_10"])
+                                                                                scan date_dim
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     local exchange (GATHER, SINGLE, [])
@@ -27,7 +30,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                             scan date_dim
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
-                                        scan item
+                                        dynamic filter (["i_item_id"])
+                                            scan item
             join (INNER, PARTITIONED):
                 final aggregation over (i_item_id_74)
                     local exchange (GATHER, SINGLE, [])
@@ -36,11 +40,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_100"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_133)
@@ -48,7 +54,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_133"])
                                                                             partial aggregation over (d_date_133)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_135"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             local exchange (GATHER, SINGLE, [])
@@ -56,7 +63,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_73"])
-                                            scan item
+                                            dynamic filter (["i_item_id_74"])
+                                                scan item
                 final aggregation over (i_item_id_201)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["i_item_id_201"])
@@ -64,11 +72,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_227"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_260)
@@ -76,7 +86,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_260"])
                                                                             partial aggregation over (d_date_260)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_262"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             local exchange (GATHER, SINGLE, [])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q59.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q59.plan.txt
index 8c0032f32687..e93410ecd0d8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q59.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q59.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["d_day_name", "d_week_seq", "ss_store_sk"])
                                         partial aggregation over (d_day_name, d_week_seq, ss_store_sk)
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq"])
+                                                            scan date_dim
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["expr_210", "s_store_sk"])
                     join (INNER, PARTITIONED):
@@ -29,10 +31,12 @@ local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["d_day_name_89", "d_week_seq_79", "ss_store_sk_56"])
                                                                 partial aggregation over (d_day_name_89, d_week_seq_79, ss_store_sk_56)
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_sales
+                                                                        dynamic filter (["ss_sold_date_sk_49", "ss_store_sk_56"])
+                                                                            scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_79"])
+                                                                                    scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -43,7 +47,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["s_store_sk_122"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["s_store_id"])
-                                        scan store
+                                        dynamic filter (["s_store_id"])
+                                            scan store
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["s_store_id_123"])
                                             scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q60.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q60.plan.txt
index b42dce272fe4..e9c8ee306946 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q60.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q60.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_8"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_13)
@@ -36,7 +38,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_90"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_117)
@@ -62,7 +66,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -72,7 +77,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_196"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_223)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q61.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q61.plan.txt
index aa366b079da7..f43253f5a7a4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q61.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q61.plan.txt
@@ -9,7 +9,8 @@ cross join:
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -22,7 +23,8 @@ cross join:
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                     join (INNER, REPLICATED):
-                                        scan customer
+                                        dynamic filter (["c_current_addr_sk"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_address
@@ -38,7 +40,8 @@ cross join:
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk_21", "ss_item_sk_20", "ss_sold_date_sk_18", "ss_store_sk_25"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -51,7 +54,8 @@ cross join:
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_sk_107"])
                                 join (INNER, REPLICATED):
-                                    scan customer
+                                    dynamic filter (["c_current_addr_sk_111"])
+                                        scan customer
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q62.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q62.plan.txt
index 61172c74fc4f..26846a9ba0a9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q62.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q62.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_ship_date_sk", "ws_ship_mode_sk", "ws_warehouse_sk", "ws_web_site_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q63.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q63.plan.txt
index 23e28eddc4b7..da2cbd549a64 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q63.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q63.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q64.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q64.plan.txt
index 6497c0e5dec4..1a0e3df6e41e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q64.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q64.plan.txt
@@ -9,11 +9,13 @@ remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over (ca_city, ca_city_119, ca_street_name, ca_street_name_116, ca_street_number, ca_street_number_115, ca_zip, ca_zip_122, d_year, d_year_19, d_year_50, i_product_name, s_store_name, s_zip, ss_item_sk)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ca_address_sk_113"])
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk_113"])
+                                                scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
@@ -30,13 +32,15 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                         join (INNER, PARTITIONED):
                                                                                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                                                                                 join (INNER, REPLICATED):
-                                                                                                                    scan store_sales
+                                                                                                                    dynamic filter (["ss_cdemo_sk", "ss_customer_sk", "ss_hdemo_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                                                                        scan store_sales
                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                             scan date_dim
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                                                                    scan store_returns
+                                                                                                                    dynamic filter (["sr_item_sk", "sr_item_sk", "sr_item_sk"])
+                                                                                                                        scan store_returns
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 final aggregation over (cs_item_sk)
@@ -45,21 +49,25 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                             partial aggregation over (cs_item_sk)
                                                                                                                                 join (INNER, PARTITIONED):
                                                                                                                                     remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                                                                                        scan catalog_sales
+                                                                                                                                        dynamic filter (["cs_item_sk", "cs_item_sk", "cs_item_sk", "cs_order_number"])
+                                                                                                                                            scan catalog_sales
                                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                                         remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                                                                                            scan catalog_returns
+                                                                                                                                            dynamic filter (["cr_item_sk", "cr_item_sk"])
+                                                                                                                                                scan catalog_returns
                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                                             scan customer_demographics
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                        scan store
+                                                                                                        dynamic filter (["s_store_name", "s_zip"])
+                                                                                                            scan store
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                                                 join (INNER, REPLICATED):
                                                                                                     join (INNER, REPLICATED):
-                                                                                                        scan customer
+                                                                                                        dynamic filter (["c_current_cdemo_sk", "c_current_hdemo_sk", "c_first_sales_date_sk", "c_first_shipto_date_sk"])
+                                                                                                            scan customer
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan date_dim
@@ -68,7 +76,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                             scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                                                            scan item
+                                                                                            dynamic filter (["i_item_sk"])
+                                                                                                scan item
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPARTITION, HASH, ["cd_demo_sk_84"])
                                                                                     scan customer_demographics
@@ -78,14 +87,16 @@ remote exchange (GATHER, SINGLE, [])
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk"])
+                                                                                    scan household_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan income_band
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, REPLICATED):
-                                                                            scan household_demographics
+                                                                            dynamic filter (["hd_income_band_sk_103"])
+                                                                                scan household_demographics
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan income_band
@@ -97,11 +108,13 @@ remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over (ca_city_484, ca_city_500, ca_street_name_481, ca_street_name_497, ca_street_number_480, ca_street_number_496, ca_zip_487, ca_zip_503, d_year_276, d_year_307, d_year_338, i_product_name_543, s_store_name_368, s_zip_388, ss_item_sk_152)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk_494"])
-                                                scan customer_address
+                                                dynamic filter (["ca_address_sk_494"])
+                                                    scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk_399"])
                                                     join (INNER, REPLICATED):
-                                                        scan customer_address
+                                                        dynamic filter (["ca_address_sk_478"])
+                                                            scan customer_address
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
@@ -118,13 +131,15 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                             join (INNER, PARTITIONED):
                                                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk_152", "ss_ticket_number_159"])
                                                                                                                     join (INNER, REPLICATED):
-                                                                                                                        scan store_sales
+                                                                                                                        dynamic filter (["ss_cdemo_sk_154", "ss_customer_sk_153", "ss_hdemo_sk_155", "ss_item_sk_152", "ss_item_sk_152", "ss_item_sk_152", "ss_promo_sk_158", "ss_sold_date_sk_150", "ss_store_sk_157", "ss_ticket_number_159"])
+                                                                                                                            scan store_sales
                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                 scan date_dim
                                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_178", "sr_ticket_number_185"])
-                                                                                                                        scan store_returns
+                                                                                                                        dynamic filter (["sr_item_sk_178", "sr_item_sk_178"])
+                                                                                                                            scan store_returns
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     final aggregation over (cs_item_sk_214)
@@ -133,10 +148,12 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                                 partial aggregation over (cs_item_sk_214)
                                                                                                                                     join (INNER, PARTITIONED):
                                                                                                                                         remote exchange (REPARTITION, HASH, ["cs_item_sk_214", "cs_order_number_216"])
-                                                                                                                                            scan catalog_sales
+                                                                                                                                            dynamic filter (["cs_item_sk_214", "cs_item_sk_214", "cs_order_number_216"])
+                                                                                                                                                scan catalog_sales
                                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                                             remote exchange (REPARTITION, HASH, ["cr_item_sk_238", "cr_order_number_252"])
-                                                                                                                                                scan catalog_returns
+                                                                                                                                                dynamic filter (["cr_item_sk_238"])
+                                                                                                                                                    scan catalog_returns
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan customer_demographics
@@ -147,7 +164,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_395"])
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan customer
+                                                                                                            dynamic filter (["c_current_cdemo_sk_397", "c_current_hdemo_sk_398", "c_first_sales_date_sk_401", "c_first_shipto_date_sk_400"])
+                                                                                                                scan customer
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -166,14 +184,16 @@ remote exchange (GATHER, SINGLE, [])
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 join (INNER, REPLICATED):
-                                                                                    scan household_demographics
+                                                                                    dynamic filter (["hd_income_band_sk_463"])
+                                                                                        scan household_demographics
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             scan income_band
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk_471"])
+                                                                                    scan household_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q65.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q65.plan.txt
index 16d4126e5149..61f01b3fa142 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q65.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q65.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_item_sk_11", "ss_store_sk_16"])
                             partial aggregation over (ss_item_sk_11, ss_store_sk_16)
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk_11", "ss_sold_date_sk_9", "ss_store_sk_16"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                     remote exchange (REPLICATE, BROADCAST, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["s_store_sk"])
-                                scan store
+                                dynamic filter (["s_store_sk"])
+                                    scan store
                             final aggregation over (ss_store_sk)
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_store_sk"])
@@ -25,7 +27,8 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_store_sk"])
                                                         partial aggregation over (ss_item_sk, ss_store_sk)
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q66.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q66.plan.txt
index d78688a29a6c..51363df4de0e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q66.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q66.plan.txt
@@ -15,7 +15,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_ship_mode_sk", "ws_sold_date_sk", "ws_sold_time_sk", "ws_warehouse_sk"])
+                                                                        scan web_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan ship_mode
@@ -41,7 +42,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_ship_mode_sk", "cs_sold_date_sk", "cs_sold_time_sk", "cs_warehouse_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan ship_mode
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q67.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q67.plan.txt
index 60f46f2fcf90..66c2001151d6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q67.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q67.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q68.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q68.plan.txt
index ecbd5a004789..e33ba7b62a75 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q68.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q68.plan.txt
@@ -4,7 +4,8 @@ local exchange (GATHER, SINGLE, [])
             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                        scan customer
+                        dynamic filter (["c_current_addr_sk", "c_customer_sk"])
+                            scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                             final aggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number)
@@ -12,13 +13,15 @@ local exchange (GATHER, SINGLE, [])
                                     partial aggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                scan customer_address
+                                                dynamic filter (["ca_address_sk"])
+                                                    scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q69.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q69.plan.txt
index d304792469c0..c79f374b67e4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q69.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q69.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -19,7 +20,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["cd_demo_sk"])
-                                                scan customer_demographics
+                                                dynamic filter (["cd_demo_sk"])
+                                                    scan customer_demographics
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                     join (INNER, PARTITIONED):
@@ -28,14 +30,16 @@ local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                     partial aggregation over (ss_customer_sk)
                                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan customer
+                                                                    dynamic filter (["c_current_addr_sk"])
+                                                                        scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan customer_address
@@ -44,7 +48,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q70.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q70.plan.txt
index ad464d39cb92..2ef4b83f1a2e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q70.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q70.plan.txt
@@ -10,13 +10,15 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["s_state"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan store
+                                                    dynamic filter (["s_state"])
+                                                        scan store
                                     single aggregation over (s_state_56)
                                         final aggregation over (s_state_56)
                                             local exchange (GATHER, SINGLE, [])
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                                     partial aggregation over (s_state_56)
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk_6", "ss_store_sk_13"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q71.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q71.plan.txt
index 599dd0ab9f9c..f5d3c7ec8a7e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q71.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q71.plan.txt
@@ -7,19 +7,22 @@ remote exchange (GATHER, SINGLE, [])
                         partial aggregation over (i_brand, i_brand_id, t_hour, t_minute)
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
+                                    local exchange (REPARTITION, ROUND_ROBIN, [])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk", "ws_sold_time_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_sold_time_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_sold_time_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q72.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q72.plan.txt
index 9da6042a0c9d..691351a17b1b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q72.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q72.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["inv_item_sk"])
                                             join (INNER, REPLICATED):
-                                                scan inventory
+                                                dynamic filter (["inv_date_sk", "inv_item_sk", "inv_quantity_on_hand", "inv_warehouse_sk"])
+                                                    scan inventory
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq_22"])
+                                                            scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
@@ -21,7 +23,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_bill_cdemo_sk", "cs_bill_hdemo_sk", "cs_item_sk", "cs_ship_date_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan household_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q73.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q73.plan.txt
index 8a3c9f5087e6..0ceb0cf526e0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q73.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q73.plan.txt
@@ -3,7 +3,8 @@ remote exchange (GATHER, SINGLE, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, PARTITIONED):
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                    scan customer
+                    dynamic filter (["c_customer_sk"])
+                        scan customer
                 final aggregation over (ss_customer_sk, ss_ticket_number)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
@@ -11,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q74.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q74.plan.txt
index f60b1a673ca9..07c30512a762 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q74.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q74.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_97"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_97", "ss_sold_date_sk_94"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_73"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_74", "c_customer_id_74"])
+                                                scan customer
                 final aggregation over (c_customer_id_343, c_first_name_350, c_last_name_351, d_year_406)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_343"])
@@ -23,13 +25,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_367"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_367", "ws_sold_date_sk_363"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_342"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_343"])
+                                                scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_customer_id, c_first_name, c_last_name, d_year)
                     local exchange (GATHER, SINGLE, [])
@@ -38,13 +42,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id"])
+                                                scan customer
                 final aggregation over (c_customer_id_528, c_first_name_535, c_last_name_536, d_year_591)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_528"])
@@ -52,7 +58,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_552"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_552", "ws_sold_date_sk_548"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q75.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q75.plan.txt
index d5a331127722..39f85889c5ba 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q75.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q75.plan.txt
@@ -8,15 +8,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_14, expr, expr_21, i_brand_id_7, i_category_id_9, i_class_id_8, i_manufact_id_10)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                        scan catalog_returns
+                                        dynamic filter (["cr_item_sk", "cr_order_number"])
+                                            scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_7", "i_category_id_9", "i_class_id_8", "i_manufact_id_10"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -24,15 +27,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_56, expr_84, expr_85, i_brand_id_32, i_category_id_36, i_class_id_34, i_manufact_id_38)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                            scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_32", "i_category_id_36", "i_class_id_34", "i_manufact_id_38"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -40,15 +46,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_120, expr_148, expr_149, i_brand_id_96, i_category_id_100, i_class_id_98, i_manufact_id_102)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                        scan web_returns
+                                        dynamic filter (["wr_item_sk", "wr_order_number"])
+                                            scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_96", "i_category_id_100", "i_class_id_98", "i_manufact_id_102"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -59,12 +68,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_234, expr_289, expr_290, i_brand_id_210, i_category_id_214, i_class_id_212, i_manufact_id_216)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk_261", "cr_order_number_275"])
-                                        scan catalog_returns
+                                        dynamic filter (["cr_item_sk_261", "cr_order_number_275"])
+                                            scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk_181", "cs_order_number_183"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_item_sk_181", "cs_sold_date_sk_166"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
@@ -75,12 +86,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_348, expr_396, expr_397, i_brand_id_324, i_category_id_328, i_class_id_326, i_manufact_id_330)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_375", "sr_ticket_number_382"])
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk_375", "sr_ticket_number_382"])
+                                            scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk_293", "ss_ticket_number_300"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_293", "ss_sold_date_sk_291"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
@@ -91,12 +104,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_466, expr_518, expr_519, i_brand_id_442, i_category_id_446, i_class_id_444, i_manufact_id_448)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk_493", "wr_order_number_504"])
-                                        scan web_returns
+                                        dynamic filter (["wr_item_sk_493", "wr_order_number_504"])
+                                            scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk_401", "ws_order_number_415"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_item_sk_401", "ws_sold_date_sk_398"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q76.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q76.plan.txt
index 2c646494d11f..730ca4dd07a5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q76.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q76.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_11, d_year_10, expr_142, expr_143, i_category_6)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
@@ -17,12 +18,14 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_55, d_year_51, expr_148, expr_149, i_category_32)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk_20"])
-                                scan item
+                                dynamic filter (["i_item_sk_20"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_sold_date_sk"])
-                                            scan web_sales
+                                            dynamic filter (["ws_sold_date_sk"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["d_date_sk_45"])
                                                 scan date_dim
@@ -30,7 +33,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_118, d_year_114, expr_139, expr_141, i_category_95)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan catalog_sales
+                                dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                    scan catalog_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q77.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q77.plan.txt
index f5f8b7b62eea..b632624a3d15 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q77.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q77.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ss_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -25,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (sr_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_returns
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -38,7 +40,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_call_center_sk"])
                                             partial aggregation over (cs_call_center_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -49,7 +52,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["cr_call_center_sk"])
                                                     partial aggregation over (cr_call_center_sk)
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_returns
+                                                            dynamic filter (["cr_returned_date_sk"])
+                                                                scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -60,7 +64,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ws_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_page_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -73,7 +78,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (wr_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_returns
+                                                        dynamic filter (["wr_returned_date_sk", "wr_web_page_sk"])
+                                                            scan web_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q78.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q78.plan.txt
index 67354600be94..05f604f31b0f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q78.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q78.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk", "ss_customer_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                    scan store_returns
+                                                    dynamic filter (["sr_item_sk"])
+                                                        scan store_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
                                                     scan web_returns
@@ -38,7 +41,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (LEFT, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                        scan catalog_sales
+                                        dynamic filter (["cs_sold_date_sk"])
+                                            scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
                                             scan catalog_returns
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q79.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q79.plan.txt
index c41171325a3c..733be6f6e8b7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q79.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q79.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q80.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q80.plan.txt
index a4b2da9fdab0..61944a8d3ab3 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q80.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q80.plan.txt
@@ -15,10 +15,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                        scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_item_sk"])
+                                                                            scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -41,10 +43,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_catalog_page_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                        scan catalog_returns
+                                                                        dynamic filter (["cr_item_sk"])
+                                                                            scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -67,10 +71,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_item_sk", "ws_promo_sk", "ws_sold_date_sk", "ws_web_site_sk"])
+                                                                        scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_item_sk"])
+                                                                            scan web_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q81.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q81.plan.txt
index 0f6856f9c813..a55559ba33ae 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q81.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q81.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_returns
+                                                dynamic filter (["cr_returned_date_sk", "cr_returning_addr_sk", "cr_returning_customer_sk"])
+                                                    scan catalog_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPLICATE, BROADCAST, [])
                             join (INNER, REPLICATED):
-                                scan customer
+                                dynamic filter (["c_current_addr_sk"])
+                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
@@ -37,7 +39,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk_35"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_returns
+                                                                    dynamic filter (["cr_returned_date_sk_25", "cr_returning_addr_sk_35"])
+                                                                        scan catalog_returns
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q82.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q82.plan.txt
index 532952036fc3..d3b691e03fe2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q82.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q82.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"])
                     partial aggregation over (i_current_price, i_item_desc, i_item_id)
                         join (INNER, REPLICATED, can skip output duplicates):
-                            scan store_sales
+                            dynamic filter (["ss_item_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED, can skip output duplicates):
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan inventory
+                                            dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                                scan inventory
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q83.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q83.plan.txt
index cc4b500d368e..68311b10a8a8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q83.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q83.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["sr_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk", "sr_returned_date_sk"])
+                                            scan store_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan date_dim
+                                                    dynamic filter (["d_date"])
+                                                        scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (d_date_8)
@@ -20,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["d_date_8"])
                                                                         partial aggregation over (d_date_8)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_10"])
+                                                                                    scan date_dim
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         final aggregation over (d_week_seq_43)
@@ -30,7 +33,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                         scan date_dim
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                        scan item
+                                        dynamic filter (["i_item_id"])
+                                            scan item
             join (INNER, PARTITIONED):
                 final aggregation over (i_item_id_79)
                     local exchange (GATHER, SINGLE, [])
@@ -39,11 +43,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_returns
+                                            dynamic filter (["cr_item_sk", "cr_returned_date_sk"])
+                                                scan catalog_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_105"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_138)
@@ -51,7 +57,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_138"])
                                                                             partial aggregation over (d_date_138)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_140"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             final aggregation over (d_week_seq_173)
@@ -61,7 +68,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                             scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_78"])
-                                            scan item
+                                            dynamic filter (["i_item_id_79"])
+                                                scan item
                 final aggregation over (i_item_id_211)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["i_item_id_211"])
@@ -69,11 +77,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan web_returns
+                                            dynamic filter (["wr_item_sk", "wr_returned_date_sk"])
+                                                scan web_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_237"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_270)
@@ -81,7 +91,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_270"])
                                                                             partial aggregation over (d_date_270)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_272"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             final aggregation over (d_week_seq_305)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q84.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q84.plan.txt
index ec22af2c6a55..b1402e98e5ab 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q84.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q84.plan.txt
@@ -1,23 +1,27 @@
 local exchange (GATHER, SINGLE, [])
     remote exchange (GATHER, SINGLE, [])
         join (INNER, REPLICATED):
-            scan store_returns
+            dynamic filter (["sr_cdemo_sk"])
+                scan store_returns
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPLICATE, BROADCAST, [])
                     join (INNER, REPLICATED):
-                        scan customer_demographics
+                        dynamic filter (["cd_demo_sk"])
+                            scan customer_demographics
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPLICATE, BROADCAST, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan customer
+                                        dynamic filter (["c_current_addr_sk", "c_current_hdemo_sk"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_address
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan household_demographics
+                                                dynamic filter (["hd_income_band_sk"])
+                                                    scan household_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q85.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q85.plan.txt
index ab3b2c159101..bd95b54c9bc8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q85.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q85.plan.txt
@@ -6,13 +6,15 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (r_reason_desc)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan customer_demographics
+                                dynamic filter (["cd_demo_sk_9", "cd_education_status_12", "cd_marital_status_11"])
+                                    scan customer_demographics
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["wr_refunded_addr_sk"])
                                                         join (INNER, PARTITIONED):
@@ -20,13 +22,15 @@ local exchange (GATHER, SINGLE, [])
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan web_sales
+                                                                            dynamic filter (["ws_item_sk", "ws_order_number", "ws_sold_date_sk", "ws_web_page_sk"])
+                                                                                scan web_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                            scan web_returns
+                                                                            dynamic filter (["wr_reason_sk", "wr_refunded_cdemo_sk"])
+                                                                                scan web_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["cd_demo_sk"])
                                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q86.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q86.plan.txt
index 990089879464..b6f0f04ea799 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q86.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q86.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (groupid, i_category$gid, i_class$gid)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q87.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q87.plan.txt
index 6590f3356d80..5bc1ea22a688 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q87.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q87.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -27,7 +28,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -42,7 +44,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q88.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q88.plan.txt
index 6e297c60e201..933c8e09c951 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q88.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q88.plan.txt
@@ -12,7 +12,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan time_dim
@@ -29,7 +30,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk_14", "ss_sold_time_sk_10", "ss_store_sk_16"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan time_dim
@@ -46,7 +48,8 @@ cross join:
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_hdemo_sk_94", "ss_sold_time_sk_90", "ss_store_sk_96"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan time_dim
@@ -63,7 +66,8 @@ cross join:
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_hdemo_sk_174", "ss_sold_time_sk_170", "ss_store_sk_176"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan time_dim
@@ -80,7 +84,8 @@ cross join:
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk_254", "ss_sold_time_sk_250", "ss_store_sk_256"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan time_dim
@@ -97,7 +102,8 @@ cross join:
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_hdemo_sk_334", "ss_sold_time_sk_330", "ss_store_sk_336"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan time_dim
@@ -114,7 +120,8 @@ cross join:
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_hdemo_sk_414", "ss_sold_time_sk_410", "ss_store_sk_416"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan time_dim
@@ -131,7 +138,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_hdemo_sk_494", "ss_sold_time_sk_490", "ss_store_sk_496"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan time_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q89.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q89.plan.txt
index 396d705bbc38..221dfc17c333 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q89.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q89.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q90.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q90.plan.txt
index 0ddf21aa574d..1d5fb0078c8e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q90.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q90.plan.txt
@@ -6,7 +6,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk", "ws_sold_time_sk", "ws_web_page_sk"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan web_page
@@ -23,7 +24,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk_19", "ws_sold_time_sk_10", "ws_web_page_sk_21"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan web_page
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q91.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q91.plan.txt
index f1c8dfe5de34..88aa947559a2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q91.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q91.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cr_returning_customer_sk"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_returns
+                                                dynamic filter (["cr_call_center_sk", "cr_returned_date_sk", "cr_returning_customer_sk"])
+                                                    scan catalog_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -19,7 +20,8 @@ remote exchange (GATHER, SINGLE, [])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                         join (INNER, REPLICATED):
-                                                            scan customer
+                                                            dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_current_hdemo_sk"])
+                                                                scan customer
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q92.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q92.plan.txt
index 2e92e9b3a1a9..e8379e0b3d7d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q92.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q92.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk_9"])
                                     partial aggregation over (ws_item_sk_9)
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk_9", "ws_sold_date_sk_6"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q93.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q93.plan.txt
index ca9dc7543db7..e1cd897adff9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q93.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q93.plan.txt
@@ -7,10 +7,12 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk", "ss_ticket_number"])
+                                        scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_reason_sk"])
+                                            scan store_returns
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan reason
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q94.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q94.plan.txt
index 94db94105538..f2a67379c67d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q94.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q94.plan.txt
@@ -8,19 +8,22 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["wr_order_number"])
                                     partial aggregation over (wr_order_number)
-                                        scan web_returns
+                                        dynamic filter (["wr_order_number"])
+                                            scan web_returns
                         final aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number_26, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_order_number_26"])
                                     partial aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number_26, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk)
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_26"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q95.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q95.plan.txt
index 9daf91528a0a..ced52810409b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q95.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q95.plan.txt
@@ -9,29 +9,35 @@ final aggregation over ()
                                 join (INNER, PARTITIONED, can skip output duplicates):
                                     join (INNER, PARTITIONED, can skip output duplicates):
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_107"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_107", "ws_order_number_107", "ws_order_number_107"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["wr_order_number"])
-                                                scan web_returns
+                                                dynamic filter (["wr_order_number", "wr_order_number"])
+                                                    scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_144"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_144"])
+                                                scan web_sales
                     join (INNER, PARTITIONED):
                         final aggregation over (ws_order_number_26)
                             local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (ws_order_number_26)
                                     join (INNER, PARTITIONED, can skip output duplicates):
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_26"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_26", "ws_order_number_26"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_order_number_63"])
-                                                scan web_sales
+                                                dynamic filter (["ws_order_number_63"])
+                                                    scan web_sales
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_order_number"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q96.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q96.plan.txt
index 6ac294895946..e4fdf4d14611 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q96.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q96.plan.txt
@@ -5,7 +5,8 @@ final aggregation over ()
                 join (INNER, REPLICATED):
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
-                            scan store_sales
+                            dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan time_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q97.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q97.plan.txt
index 7b9c83293534..959bbfe9de73 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q97.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q97.plan.txt
@@ -8,7 +8,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"])
                                 partial aggregation over (ss_customer_sk, ss_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"])
                                 partial aggregation over (cs_bill_customer_sk, cs_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q98.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q98.plan.txt
index 9775b6c511f5..7c0caca03f27 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q98.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q98.plan.txt
@@ -9,7 +9,8 @@ remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q99.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q99.plan.txt
index 6e2c1451c321..4037170bb1d7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q99.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q99.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_call_center_sk", "cs_ship_date_sk", "cs_ship_mode_sk", "cs_warehouse_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q01.plan.txt
index d091b5f71d8b..9f5479141165 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q01.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q01.plan.txt
@@ -4,7 +4,8 @@ local exchange (GATHER, SINGLE, [])
             join (LEFT, REPLICATED):
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                        scan customer
+                        dynamic filter (["c_customer_sk"])
+                            scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["sr_customer_sk"])
                             join (INNER, REPLICATED):
@@ -13,7 +14,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_store_sk"])
                                             partial aggregation over (sr_customer_sk, sr_store_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan store_returns
+                                                    dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                        scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -31,7 +33,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk_8", "sr_store_sk_12"])
                                                     partial aggregation over (sr_customer_sk_8, sr_store_sk_12)
                                                         join (INNER, REPLICATED):
-                                                            scan store_returns
+                                                            dynamic filter (["sr_returned_date_sk_25"])
+                                                                scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q02.plan.txt
index ebb55d3dc0a5..2e122b9b4261 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q02.plan.txt
@@ -9,15 +9,19 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq"])
                                     partial aggregation over (d_day_name, d_week_seq)
                                         join (INNER, REPLICATED):
-                                            remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                scan web_sales
-                                                scan catalog_sales
+                                            local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                dynamic filter (["ws_sold_date_sk"])
+                                                    scan web_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan date_dim
+                                                    dynamic filter (["d_week_seq", "d_week_seq"])
+                                                        scan date_dim
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["d_week_seq_20"])
-                            scan date_dim
+                            dynamic filter (["d_week_seq_20"])
+                                scan date_dim
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["expr_219"])
                         join (INNER, PARTITIONED):
@@ -27,12 +31,15 @@ remote exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["d_week_seq_124"])
                                             partial aggregation over (d_day_name_134, d_week_seq_124)
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
-                                                        scan catalog_sales
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ws_sold_date_sk_81"])
+                                                            scan web_sales
+                                                        dynamic filter (["cs_sold_date_sk_117"])
+                                                            scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan date_dim
+                                                            dynamic filter (["d_week_seq_124"])
+                                                                scan date_dim
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq_169"])
                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q03.plan.txt
index 70aae3fa1bdd..ede6415850e5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q03.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q04.plan.txt
index 7a475db42e6d..10ebe8629d94 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q04.plan.txt
@@ -10,13 +10,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_869"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk_869", "cs_sold_date_sk_900"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_847"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_848", "c_customer_id_848", "c_customer_id_848"])
+                                                    scan customer
                     final aggregation over (c_birth_country_1558, c_customer_id_1545, c_email_address_1560, c_first_name_1552, c_last_name_1553, c_login_1559, c_preferred_cust_flag_1554, d_year_1606)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_id_1545"])
@@ -24,13 +26,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1567"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_1567", "ws_sold_date_sk_1597"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_1544"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_1545", "c_customer_id_1545"])
+                                                    scan customer
                 join (INNER, PARTITIONED):
                     final aggregation over (c_birth_country_561, c_customer_id_548, c_email_address_563, c_first_name_555, c_last_name_556, c_login_562, c_preferred_cust_flag_557, d_year_609)
                         local exchange (GATHER, SINGLE, [])
@@ -39,13 +43,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_569"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk_569", "cs_sold_date_sk_600"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_547"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_548", "c_customer_id_548"])
+                                                    scan customer
                     final aggregation over (c_birth_country_1258, c_customer_id_1245, c_email_address_1260, c_first_name_1252, c_last_name_1253, c_login_1259, c_preferred_cust_flag_1254, d_year_1306)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_id_1245"])
@@ -53,13 +59,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1267"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_1267", "ws_sold_date_sk_1297"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_1244"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_1245"])
+                                                    scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_birth_country_175, c_customer_id_162, c_email_address_177, c_first_name_169, c_last_name_170, c_login_176, c_preferred_cust_flag_171, d_year_212)
                     local exchange (GATHER, SINGLE, [])
@@ -68,13 +76,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_183"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_183", "ss_sold_date_sk_203"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_161"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_162"])
+                                                scan customer
                 final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id"])
@@ -82,7 +92,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q05.plan.txt
index 169f66124bda..b2230c61d3bf 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q05.plan.txt
@@ -11,9 +11,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (s_store_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan store_sales
-                                                        scan store_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -26,9 +28,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (cp_catalog_page_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan catalog_sales
-                                                        scan catalog_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["cs_catalog_page_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
+                                                        dynamic filter (["cr_catalog_page_sk", "cr_returned_date_sk"])
+                                                            scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -42,13 +46,16 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_site_sk"])
+                                                            scan web_sales
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ws_item_sk_81", "ws_order_number_95"])
-                                                                scan web_sales
+                                                                dynamic filter (["ws_item_sk_81", "ws_order_number_95", "ws_web_site_sk_91"])
+                                                                    scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                    scan web_returns
+                                                                    dynamic filter (["wr_returned_date_sk"])
+                                                                        scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q06.plan.txt
index fb3592d65b6e..5b35c89d1047 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q06.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q06.plan.txt
@@ -12,11 +12,13 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
-                                                                    scan date_dim
+                                                                    dynamic filter (["d_month_seq"])
+                                                                        scan date_dim
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             local exchange (GATHER, SINGLE, [])
@@ -28,7 +30,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                     scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                        scan customer
+                                                        dynamic filter (["c_current_addr_sk"])
+                                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q07.plan.txt
index 32f4763b443d..a8da2880635e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q07.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q08.plan.txt
index 45b29afc325b..c8c9a0381d97 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q08.plan.txt
@@ -5,10 +5,11 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["s_store_name"])
                     partial aggregation over (s_store_name)
                         join (INNER, PARTITIONED):
-                            remote exchange (REPARTITION, HASH, ["substr_34"])
+                            remote exchange (REPARTITION, HASH, ["substring"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -16,7 +17,7 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan store
                             local exchange (GATHER, SINGLE, [])
-                                remote exchange (REPARTITION, HASH, ["substr_35"])
+                                remote exchange (REPARTITION, HASH, ["substring_34"])
                                     final aggregation over (ca_zip)
                                         local exchange (REPARTITION, HASH, ["ca_zip"])
                                             remote exchange (REPARTITION, HASH, ["ca_zip_26"])
@@ -30,7 +31,8 @@ local exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over (ca_zip_16)
                                                                     join (INNER, PARTITIONED):
                                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk_7"])
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk_7"])
+                                                                                scan customer_address
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q09.plan.txt
index 4466a2d88feb..cbcd78f04da6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q09.plan.txt
@@ -1,93 +1,122 @@
-cross join:
-    cross join:
-        cross join:
-            cross join:
-                cross join:
-                    cross join:
-                        cross join:
-                            cross join:
-                                cross join:
-                                    cross join:
-                                        cross join:
-                                            cross join:
-                                                cross join:
-                                                    cross join:
-                                                        cross join:
-                                                            final aggregation over ()
-                                                                local exchange (GATHER, SINGLE, [])
-                                                                    remote exchange (GATHER, SINGLE, [])
-                                                                        partial aggregation over ()
-                                                                            scan store_sales
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    scan reason
-                                                        final aggregation over ()
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    partial aggregation over ()
-                                                                        scan store_sales
+join (LEFT, REPLICATED):
+    join (LEFT, REPLICATED):
+        join (LEFT, REPLICATED):
+            join (LEFT, REPLICATED):
+                join (LEFT, REPLICATED):
+                    join (LEFT, REPLICATED):
+                        join (LEFT, REPLICATED):
+                            join (RIGHT, PARTITIONED):
+                                remote exchange (REPARTITION, HASH, [])
+                                    final aggregation over ()
+                                        local exchange (GATHER, SINGLE, [])
+                                            remote exchange (GATHER, SINGLE, [])
+                                                partial aggregation over ()
+                                                    scan store_sales
+                                local exchange (GATHER, SINGLE, [])
+                                    join (RIGHT, PARTITIONED):
+                                        remote exchange (REPARTITION, HASH, [])
+                                            final aggregation over ()
+                                                local exchange (GATHER, SINGLE, [])
+                                                    remote exchange (GATHER, SINGLE, [])
+                                                        partial aggregation over ()
+                                                            scan store_sales
+                                        local exchange (GATHER, SINGLE, [])
+                                            join (RIGHT, PARTITIONED):
+                                                remote exchange (REPARTITION, HASH, [])
                                                     final aggregation over ()
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over ()
                                                                     scan store_sales
-                                                final aggregation over ()
-                                                    local exchange (GATHER, SINGLE, [])
-                                                        remote exchange (GATHER, SINGLE, [])
-                                                            partial aggregation over ()
-                                                                scan store_sales
-                                            final aggregation over ()
                                                 local exchange (GATHER, SINGLE, [])
-                                                    remote exchange (GATHER, SINGLE, [])
-                                                        partial aggregation over ()
-                                                            scan store_sales
-                                        final aggregation over ()
-                                            local exchange (GATHER, SINGLE, [])
-                                                remote exchange (GATHER, SINGLE, [])
-                                                    partial aggregation over ()
-                                                        scan store_sales
+                                                    join (RIGHT, PARTITIONED):
+                                                        remote exchange (REPARTITION, HASH, [])
+                                                            final aggregation over ()
+                                                                local exchange (GATHER, SINGLE, [])
+                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                        partial aggregation over ()
+                                                                            scan store_sales
+                                                        local exchange (GATHER, SINGLE, [])
+                                                            join (RIGHT, PARTITIONED):
+                                                                remote exchange (REPARTITION, HASH, [])
+                                                                    final aggregation over ()
+                                                                        local exchange (GATHER, SINGLE, [])
+                                                                            remote exchange (GATHER, SINGLE, [])
+                                                                                partial aggregation over ()
+                                                                                    scan store_sales
+                                                                local exchange (GATHER, SINGLE, [])
+                                                                    join (RIGHT, PARTITIONED):
+                                                                        remote exchange (REPARTITION, HASH, [])
+                                                                            final aggregation over ()
+                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                                        partial aggregation over ()
+                                                                                            scan store_sales
+                                                                        local exchange (GATHER, SINGLE, [])
+                                                                            join (RIGHT, PARTITIONED):
+                                                                                remote exchange (REPARTITION, HASH, [])
+                                                                                    final aggregation over ()
+                                                                                        local exchange (GATHER, SINGLE, [])
+                                                                                            remote exchange (GATHER, SINGLE, [])
+                                                                                                partial aggregation over ()
+                                                                                                    scan store_sales
+                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                    join (RIGHT, PARTITIONED):
+                                                                                        remote exchange (REPARTITION, HASH, [])
+                                                                                            final aggregation over ()
+                                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                                                        partial aggregation over ()
+                                                                                                            scan store_sales
+                                                                                        local exchange (GATHER, SINGLE, [])
+                                                                                            remote exchange (REPARTITION, HASH, [])
+                                                                                                scan reason
+                            local exchange (GATHER, SINGLE, [])
+                                remote exchange (REPLICATE, BROADCAST, [])
                                     final aggregation over ()
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (GATHER, SINGLE, [])
                                                 partial aggregation over ()
                                                     scan store_sales
+                        local exchange (GATHER, SINGLE, [])
+                            remote exchange (REPLICATE, BROADCAST, [])
                                 final aggregation over ()
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (GATHER, SINGLE, [])
                                             partial aggregation over ()
                                                 scan store_sales
+                    local exchange (GATHER, SINGLE, [])
+                        remote exchange (REPLICATE, BROADCAST, [])
                             final aggregation over ()
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (GATHER, SINGLE, [])
                                         partial aggregation over ()
                                             scan store_sales
+                local exchange (GATHER, SINGLE, [])
+                    remote exchange (REPLICATE, BROADCAST, [])
                         final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         scan store_sales
+            local exchange (GATHER, SINGLE, [])
+                remote exchange (REPLICATE, BROADCAST, [])
                     final aggregation over ()
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over ()
                                     scan store_sales
+        local exchange (GATHER, SINGLE, [])
+            remote exchange (REPLICATE, BROADCAST, [])
                 final aggregation over ()
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (GATHER, SINGLE, [])
                             partial aggregation over ()
                                 scan store_sales
+    local exchange (GATHER, SINGLE, [])
+        remote exchange (REPLICATE, BROADCAST, [])
             final aggregation over ()
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (GATHER, SINGLE, [])
                         partial aggregation over ()
                             scan store_sales
-        final aggregation over ()
-            local exchange (GATHER, SINGLE, [])
-                remote exchange (GATHER, SINGLE, [])
-                    partial aggregation over ()
-                        scan store_sales
-    final aggregation over ()
-        local exchange (GATHER, SINGLE, [])
-            remote exchange (GATHER, SINGLE, [])
-                partial aggregation over ()
-                    scan store_sales
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q10.plan.txt
index 7d60d2a5fdd5..751f1ac52a8c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q10.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_ship_customer_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -21,14 +22,16 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                 partial aggregation over (ws_bill_customer_sk)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                             join (INNER, REPLICATED):
-                                                scan customer_demographics
+                                                dynamic filter (["cd_demo_sk"])
+                                                    scan customer_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
@@ -37,14 +40,16 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                         partial aggregation over (ss_customer_sk)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan store_sales
+                                                                                dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                                    scan store_sales
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan customer
+                                                                        dynamic filter (["c_current_addr_sk"])
+                                                                            scan customer
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q11.plan.txt
index bca78917b94d..41aaf0c91c75 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q11.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_100"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_100", "ss_sold_date_sk_120"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_78"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_79", "c_customer_id_79"])
+                                                scan customer
                 final aggregation over (c_birth_country_371, c_customer_id_358, c_email_address_373, c_first_name_365, c_last_name_366, c_login_372, c_preferred_cust_flag_367, d_year_419)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_358"])
@@ -23,13 +25,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_380"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_380", "ws_sold_date_sk_410"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_357"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_358"])
+                                                scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year)
                     local exchange (GATHER, SINGLE, [])
@@ -38,13 +42,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id"])
+                                                scan customer
                 final aggregation over (c_birth_country_564, c_customer_id_551, c_email_address_566, c_first_name_558, c_last_name_559, c_login_565, c_preferred_cust_flag_560, d_year_612)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_551"])
@@ -52,7 +58,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_573"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_573", "ws_sold_date_sk_603"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q12.plan.txt
index eb114fe9092d..db9389ab3d6e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q12.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q13.plan.txt
index a4d7d7d75438..6bb6b2b7a4c7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q13.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q14.plan.txt
index c8326b25e125..ce5fda5a2106 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q14.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_6, i_category_id_8, i_class_id_7)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -20,21 +21,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_13)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_13"])
                                                                             partial aggregation over (i_item_sk_13)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_20", "i_category_id_24", "i_class_id_22"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_20", "i_category_id_24", "i_class_id_22"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id, category_id, class_id)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_72", "i_category_id_76", "i_class_id_74"])
                                                                                                 partial aggregation over (i_brand_id_72, i_category_id_76, i_class_id_74)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_41", "ss_sold_date_sk_62"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -45,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_128, i_category_id_132, i_class_id_130)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -56,7 +61,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_184, i_category_id_188, i_class_id_186)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -70,19 +76,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_258"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_324"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_390"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -93,7 +102,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_469, i_category_id_473, i_class_id_471)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_item_sk_440", "cs_sold_date_sk_459"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -101,21 +111,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk_462"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk_462"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_518)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_518"])
                                                                             partial aggregation over (i_item_sk_518)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_525", "i_category_id_529", "i_class_id_527"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_525", "i_category_id_529", "i_class_id_527"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id_542, category_id_544, class_id_543)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_580", "i_category_id_584", "i_class_id_582"])
                                                                                                 partial aggregation over (i_brand_id_580, i_category_id_584, i_class_id_582)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_549", "ss_sold_date_sk_570"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -126,7 +139,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_670, i_category_id_674, i_class_id_672)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk_641", "cs_sold_date_sk_660"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -137,7 +151,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_760, i_category_id_764, i_class_id_762)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk_719", "ws_sold_date_sk_750"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -151,19 +166,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_841"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_907"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_973"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -174,7 +192,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_1052, i_category_id_1056, i_class_id_1054)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_item_sk_1011", "ws_sold_date_sk_1042"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -182,21 +201,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk_1045"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk_1045"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_1101)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_1101"])
                                                                             partial aggregation over (i_item_sk_1101)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_1108", "i_category_id_1112", "i_class_id_1110"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_1108", "i_category_id_1112", "i_class_id_1110"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id_1125, category_id_1127, class_id_1126)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_1163", "i_category_id_1167", "i_class_id_1165"])
                                                                                                 partial aggregation over (i_brand_id_1163, i_category_id_1167, i_class_id_1165)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_1132", "ss_sold_date_sk_1153"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -207,7 +229,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_1253, i_category_id_1257, i_class_id_1255)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk_1224", "cs_sold_date_sk_1243"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -218,7 +241,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_1343, i_category_id_1347, i_class_id_1345)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk_1302", "ws_sold_date_sk_1333"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -232,19 +256,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_1424"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_1490"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_1556"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q15.plan.txt
index 56302f05c739..ec58f1619767 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q15.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                 join (INNER, REPLICATED):
-                                    scan catalog_sales
+                                    dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                        scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk"])
+                                                scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                 scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q16.plan.txt
index 8dcf233bf561..60f1ee48b6a9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q16.plan.txt
@@ -8,19 +8,22 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cr_order_number"])
                                     partial aggregation over (cr_order_number)
-                                        scan catalog_returns
+                                        dynamic filter (["cr_order_number"])
+                                            scan catalog_returns
                         final aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number_22, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_order_number_22"])
                                     partial aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number_22, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique)
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_order_number_22"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan catalog_sales
+                                                                dynamic filter (["cs_call_center_sk", "cs_ship_addr_sk", "cs_ship_date_sk"])
+                                                                    scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q17.plan.txt
index 49c98c0b8dda..5062413e205f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q17.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_item_desc, i_item_id, s_state)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                scan item
+                                dynamic filter (["i_item_sk"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q18.plan.txt
index 5f2dfaaeb4fa..8e2571b0d36a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q18.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_bill_cdemo_sk", "cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan customer_demographics
@@ -24,7 +25,8 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
-                                                                scan customer
+                                                                dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk"])
+                                                                    scan customer
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["cd_demo_sk_2"])
                                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q19.plan.txt
index c500acf6fca3..698ecbc98b33 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q19.plan.txt
@@ -7,17 +7,20 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                    scan customer_address
+                                    dynamic filter (["ca_address_sk"])
+                                        scan customer_address
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                scan customer
+                                                dynamic filter (["c_customer_sk"])
+                                                    scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q20.plan.txt
index 852a9d2a3e5c..2e873503ece8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q20.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q21.plan.txt
index 50e40917c430..2ec2a1799207 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q21.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan inventory
+                                    dynamic filter (["inv_date_sk", "inv_item_sk", "inv_warehouse_sk"])
+                                        scan inventory
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q22.plan.txt
index 2fd28d3f31ed..6f1d958f18df 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q22.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["i_brand", "i_product_name"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan inventory
+                                        dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                            scan inventory
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q23.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q23.plan.txt
index 7cbaa1dbba4d..36966192b554 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q23.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q23.plan.txt
@@ -12,17 +12,20 @@ final aggregation over ()
                                             partial aggregation over (d_date_6, ss_item_sk, substr$gid)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_item_sk"])
+                                                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -33,7 +36,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_42)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_42"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_42"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                     scan customer
@@ -49,7 +53,8 @@ final aggregation over ()
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_70"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_70", "ss_sold_date_sk_90"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
@@ -67,17 +72,20 @@ final aggregation over ()
                                             partial aggregation over (d_date_210, ss_item_sk_184, substr$gid_265)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk_184", "ss_item_sk_184", "ss_sold_date_sk_205"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_item_sk_238"])
+                                                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -88,7 +96,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_273)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_273"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_273"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_296"])
                                                     scan customer
@@ -104,7 +113,8 @@ final aggregation over ()
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_321"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_321", "ss_sold_date_sk_341"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q24.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q24.plan.txt
index 243f543065be..c73b8598f773 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q24.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q24.plan.txt
@@ -12,22 +12,26 @@ remote exchange (GATHER, SINGLE, [])
                                             partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["ca_zip", "upper"])
-                                                        scan customer_address
+                                                        dynamic filter (["ca_zip"])
+                                                            scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_birth_country", "s_zip"])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                                    scan customer
+                                                                    dynamic filter (["c_customer_sk"])
+                                                                        scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                         join (INNER, PARTITIONED):
                                                                             remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                                scan store_returns
+                                                                                dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                                                                    scan store_returns
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                                                     join (INNER, REPLICATED):
                                                                                         join (INNER, REPLICATED):
-                                                                                            scan store_sales
+                                                                                            dynamic filter (["ss_item_sk", "ss_store_sk"])
+                                                                                                scan store_sales
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan item
@@ -52,16 +56,20 @@ remote exchange (GATHER, SINGLE, [])
                                                                             join (INNER, REPLICATED):
                                                                                 join (INNER, PARTITIONED):
                                                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk_12", "ss_ticket_number_19"])
-                                                                                        scan store_sales
+                                                                                        dynamic filter (["ss_customer_sk_13", "ss_item_sk_12", "ss_item_sk_12", "ss_store_sk_17", "ss_ticket_number_19"])
+                                                                                            scan store_sales
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPARTITION, HASH, ["sr_item_sk_37", "sr_ticket_number_44"])
-                                                                                            scan store_returns
+                                                                                            dynamic filter (["sr_item_sk_37"])
+                                                                                                scan store_returns
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                        scan store
+                                                                                        dynamic filter (["s_zip_83"])
+                                                                                            scan store
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_113"])
-                                                                                scan customer
+                                                                                dynamic filter (["c_birth_country_127"])
+                                                                                    scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q25.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q25.plan.txt
index 8eedb8e05888..b1efa4fcf91a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q25.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q25.plan.txt
@@ -7,25 +7,29 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                    scan item
+                                    dynamic filter (["i_item_sk"])
+                                        scan item
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q26.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q26.plan.txt
index 555bb67d3baa..d91ef68bdab5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q26.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q26.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_cdemo_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q27.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q27.plan.txt
index b637b1d27f97..3de726f1cc03 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q27.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q27.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q29.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q29.plan.txt
index 8eedb8e05888..b1efa4fcf91a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q29.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q29.plan.txt
@@ -7,25 +7,29 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                    scan item
+                                    dynamic filter (["i_item_sk"])
+                                        scan item
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q30.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q30.plan.txt
index f6d2620e2a9b..16cf422f1235 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q30.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q30.plan.txt
@@ -9,18 +9,21 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (ca_state, wr_returning_customer_sk)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk"])
+                                                scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_returns
+                                                    dynamic filter (["wr_returned_date_sk", "wr_returning_customer_sk"])
+                                                        scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                             join (INNER, REPLICATED):
-                                scan customer
+                                dynamic filter (["c_current_addr_sk"])
+                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
@@ -36,11 +39,13 @@ local exchange (GATHER, SINGLE, [])
                                                     partial aggregation over (ca_state_85, wr_returning_customer_sk_27)
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ca_address_sk_77"])
-                                                                scan customer_address
+                                                                dynamic filter (["ca_address_sk_77"])
+                                                                    scan customer_address
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk_30"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_returned_date_sk_44"])
+                                                                            scan web_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q31.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q31.plan.txt
index 0056aa780bc4..68eaa09566a1 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q31.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q31.plan.txt
@@ -11,13 +11,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_9"])
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk_9", "ss_sold_date_sk_26"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_59"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_66", "ca_county_66", "ca_county_66"])
+                                                        scan customer_address
                         final aggregation over (ca_county_140, d_qoy_113, d_year_109)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_140"])
@@ -25,13 +27,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_83"])
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk_83", "ss_sold_date_sk_100"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_133"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_140", "ca_county_140"])
+                                                        scan customer_address
                     join (INNER, PARTITIONED):
                         final aggregation over (ca_county_276, d_qoy_249, d_year_245)
                             local exchange (GATHER, SINGLE, [])
@@ -40,13 +44,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_209"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk_209", "ws_sold_date_sk_236"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_269"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_276", "ca_county_276"])
+                                                        scan customer_address
                         final aggregation over (ca_county_361, d_qoy_334, d_year_330)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_361"])
@@ -54,13 +60,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_294"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk_294", "ws_sold_date_sk_321"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_354"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_361"])
+                                                        scan customer_address
                 join (INNER, PARTITIONED):
                     final aggregation over (ca_county, d_qoy, d_year)
                         local exchange (GATHER, SINGLE, [])
@@ -69,13 +77,15 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                scan customer_address
+                                                dynamic filter (["ca_county"])
+                                                    scan customer_address
                     final aggregation over (ca_county_191, d_qoy_164, d_year_160)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_county_191"])
@@ -83,7 +93,8 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q32.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q32.plan.txt
index e09ec6de273c..02f6814dbdab 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q32.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q32.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk_18"])
                                     partial aggregation over (cs_item_sk_18)
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk_18", "cs_sold_date_sk_37"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q33.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q33.plan.txt
index 1b2427d4e654..b0447bd7c0a9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q33.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q33.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_6"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_22)
@@ -36,7 +38,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_95"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_121)
@@ -62,7 +66,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -72,7 +77,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_196"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_222)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q34.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q34.plan.txt
index e9f7af9e157c..537336239d51 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q34.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q34.plan.txt
@@ -3,7 +3,8 @@ remote exchange (GATHER, SINGLE, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, PARTITIONED):
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                    scan customer
+                    dynamic filter (["c_customer_sk"])
+                        scan customer
                 final aggregation over (ss_customer_sk, ss_ticket_number)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
@@ -11,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q35.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q35.plan.txt
index f94ec8be8411..42c0747cc500 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q35.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q35.plan.txt
@@ -11,18 +11,21 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                                scan customer
+                                                                dynamic filter (["c_current_cdemo_sk", "c_customer_sk"])
+                                                                    scan customer
                                                             final aggregation over (ss_customer_sk)
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                         partial aggregation over (ss_customer_sk)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan store_sales
+                                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                                    scan store_sales
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan date_dim
@@ -34,7 +37,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -43,7 +47,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q36.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q36.plan.txt
index d640f5ac0d14..06cf870e256c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q36.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q36.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q37.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q37.plan.txt
index 2582d9fa4122..eadc54781cf8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q37.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q37.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"])
                     partial aggregation over (i_current_price, i_item_desc, i_item_id)
                         join (INNER, REPLICATED, can skip output duplicates):
-                            scan catalog_sales
+                            dynamic filter (["cs_item_sk"])
+                                scan catalog_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED, can skip output duplicates):
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan inventory
+                                            dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                                scan inventory
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q38.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q38.plan.txt
index 9f02b3c87024..b342ddb2e44f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q38.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q38.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -27,7 +28,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -42,7 +44,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q39.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q39.plan.txt
index eb2349ef1574..96555d1e77b4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q39.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q39.plan.txt
@@ -10,16 +10,19 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan inventory
+                                                dynamic filter (["inv_date_sk", "inv_item_sk", "inv_item_sk", "inv_warehouse_sk", "inv_warehouse_sk"])
+                                                    scan inventory
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_item_sk"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                scan warehouse
+                                                dynamic filter (["w_warehouse_sk"])
+                                                    scan warehouse
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["inv_item_sk_8", "inv_warehouse_sk_9"])
                         final aggregation over (d_moy_62, inv_item_sk_8, inv_warehouse_sk_9, w_warehouse_name_40)
@@ -29,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan inventory
+                                                    dynamic filter (["inv_date_sk_11", "inv_item_sk_8", "inv_warehouse_sk_9"])
+                                                        scan inventory
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q40.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q40.plan.txt
index 266142fc4c1a..7b700b882104 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q40.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q40.plan.txt
@@ -9,10 +9,12 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (LEFT, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_warehouse_sk"])
+                                                scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                scan catalog_returns
+                                                dynamic filter (["cr_item_sk"])
+                                                    scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q41.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q41.plan.txt
index 58a96c8d1ec2..772ad4b317c4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q41.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q41.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_product_name)
                         single aggregation over (i_manufact, i_manufact_id, i_product_name, unique)
                             join (INNER, REPLICATED, can skip output duplicates):
-                                scan item
+                                dynamic filter (["i_manufact"])
+                                    scan item
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q42.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q42.plan.txt
index 17cc12f10e9e..b35f518a9b70 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q42.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q42.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_category, i_category_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q43.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q43.plan.txt
index 9d9e36441a12..b94077c666ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q43.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q43.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     partial aggregation over (d_day_name, s_store_id, s_store_name)
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q45.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q45.plan.txt
index 5b30cdf7426c..c23529328ac7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q45.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q45.plan.txt
@@ -11,13 +11,15 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_customer_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                    scan customer
+                                                    dynamic filter (["c_current_addr_sk"])
+                                                        scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q46.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q46.plan.txt
index e8aa3db7886c..2fbada568690 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q46.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q46.plan.txt
@@ -4,7 +4,8 @@ local exchange (GATHER, SINGLE, [])
             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                        scan customer
+                        dynamic filter (["c_current_addr_sk", "c_customer_sk"])
+                            scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ca_address_sk_11"])
                             scan customer_address
@@ -18,7 +19,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q47.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q47.plan.txt
index 2d63bde52f55..6bda63bab469 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q47.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q47.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan store
+                                                        dynamic filter (["s_company_name", "s_company_name", "s_store_name", "s_store_name"])
+                                                            scan store
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                        scan item
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["i_brand_14", "i_category_18", "s_company_name_102", "s_store_name_90"])
                         final aggregation over (d_moy_63, d_year_61, i_brand_14, i_category_18, s_company_name_102, s_store_name_90)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_31", "ss_sold_date_sk_52", "ss_store_sk_36"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan store
+                                                        dynamic filter (["s_company_name_102", "s_store_name_90"])
+                                                            scan store
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand_14", "i_category_18"])
+                                                        scan item
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_brand_133", "i_category_137", "s_company_name_221", "s_store_name_209"])
                     final aggregation over (d_moy_182, d_year_180, i_brand_133, i_category_137, s_company_name_221, s_store_name_209)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk_150", "ss_sold_date_sk_171", "ss_store_sk_155"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q48.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q48.plan.txt
index 7eb552bd09e3..bf1527240cfe 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q48.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q48.plan.txt
@@ -8,7 +8,8 @@ final aggregation over ()
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q49.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q49.plan.txt
index 6f687392953d..e3a416cd5356 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q49.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q49.plan.txt
@@ -12,11 +12,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (wr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                        scan web_returns
+                                                        dynamic filter (["wr_item_sk", "wr_order_number"])
+                                                            scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_sold_date_sk"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -30,11 +32,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (cr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                        scan catalog_returns
+                                                        dynamic filter (["cr_item_sk", "cr_order_number"])
+                                                            scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan catalog_sales
+                                                                dynamic filter (["cs_sold_date_sk"])
+                                                                    scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -48,11 +52,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (sr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                        scan store_returns
+                                                        dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                                            scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q50.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q50.plan.txt
index c2a9d481bf10..8ff8d8dbfebf 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q50.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q50.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                            scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                             join (INNER, REPLICATED):
-                                                scan store_returns
+                                                dynamic filter (["sr_returned_date_sk"])
+                                                    scan store_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q51.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q51.plan.txt
index 6a1ca8bd4aca..32fa4cc52c6c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q51.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q51.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 partial aggregation over (d_date, ws_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                 partial aggregation over (d_date_7, ss_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q52.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q52.plan.txt
index 33752e693e6c..79ab5d5f2dc7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q52.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q52.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q53.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q53.plan.txt
index cd10ab3698e6..799e43e0eca0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q53.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q53.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q54.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q54.plan.txt
index f5c3ef3b83c8..851fa255cf39 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q54.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q54.plan.txt
@@ -8,17 +8,19 @@ local exchange (GATHER, SINGLE, [])
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                     partial aggregation over (ss_customer_sk)
-                                        cross join:
-                                            cross join:
+                                        join (LEFT, REPLICATED):
+                                            join (LEFT, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk", "ca_county", "ca_state"])
+                                                                                scan customer_address
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan store
@@ -27,14 +29,17 @@ local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 partial aggregation over (c_current_addr_sk, c_customer_sk)
                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                        scan customer
+                                                                                        dynamic filter (["c_customer_sk"])
+                                                                                            scan customer
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                 join (INNER, REPLICATED, can skip output duplicates):
                                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                                        remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                                                                            scan catalog_sales
-                                                                                                            scan web_sales
+                                                                                                        local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                                                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                                scan catalog_sales
+                                                                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                                scan web_sales
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q55.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q55.plan.txt
index 0322599f01e5..72d129c6fab1 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q55.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q55.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q56.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q56.plan.txt
index e96c8c31aabb..34ac61dc445c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q56.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q56.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_6"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_10)
@@ -36,7 +38,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_83"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_109)
@@ -62,7 +66,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -72,7 +77,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_184"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_210)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q57.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q57.plan.txt
index 26f16c8477dc..3df7a342b38c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q57.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q57.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan call_center
+                                                        dynamic filter (["cc_name", "cc_name"])
+                                                            scan call_center
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                        scan item
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["cc_name_102", "i_brand_14", "i_category_18"])
                         final aggregation over (cc_name_102, d_moy_74, d_year_72, i_brand_14, i_category_18)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk_40", "cs_item_sk_44", "cs_sold_date_sk_63"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan call_center
+                                                        dynamic filter (["cc_name_102"])
+                                                            scan call_center
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand_14", "i_category_18"])
+                                                        scan item
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["cc_name_232", "i_brand_144", "i_category_148"])
                     final aggregation over (cc_name_232, d_moy_204, d_year_202, i_brand_144, i_category_148)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_call_center_sk_170", "cs_item_sk_174", "cs_sold_date_sk_193"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q58.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q58.plan.txt
index 192c6d359edd..4d29a46b942a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q58.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q58.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan date_dim
+                                                    dynamic filter (["d_date"])
+                                                        scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (d_date_6)
@@ -20,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["d_date_6"])
                                                                         partial aggregation over (d_date_6)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_8"])
+                                                                                    scan date_dim
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         local exchange (GATHER, SINGLE, [])
@@ -28,7 +31,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 scan date_dim
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                        scan item
+                                        dynamic filter (["i_item_id"])
+                                            scan item
             join (INNER, PARTITIONED):
                 final aggregation over (i_item_id_69)
                     local exchange (GATHER, SINGLE, [])
@@ -37,11 +41,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_94"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_126)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_126"])
                                                                             partial aggregation over (d_date_126)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_128"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             local exchange (GATHER, SINGLE, [])
@@ -57,7 +64,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_68"])
-                                            scan item
+                                            dynamic filter (["i_item_id_69"])
+                                                scan item
                 final aggregation over (i_item_id_191)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["i_item_id_191"])
@@ -65,11 +73,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_216"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_248)
@@ -77,7 +87,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_248"])
                                                                             partial aggregation over (d_date_248)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_250"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             local exchange (GATHER, SINGLE, [])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q59.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q59.plan.txt
index 7f584558007b..b71b03defefe 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q59.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q59.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["d_day_name", "d_week_seq", "ss_store_sk"])
                                         partial aggregation over (d_day_name, d_week_seq, ss_store_sk)
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq"])
+                                                            scan date_dim
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["expr_203", "s_store_sk"])
                     join (INNER, PARTITIONED):
@@ -29,10 +31,12 @@ local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["d_day_name_85", "d_week_seq_75", "ss_store_sk_52"])
                                                                 partial aggregation over (d_day_name_85, d_week_seq_75, ss_store_sk_52)
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_sales
+                                                                        dynamic filter (["ss_sold_date_sk_68", "ss_store_sk_52"])
+                                                                            scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_75"])
+                                                                                    scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -43,7 +47,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["s_store_sk_117"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["s_store_id"])
-                                        scan store
+                                        dynamic filter (["s_store_id"])
+                                            scan store
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["s_store_id_118"])
                                             scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q60.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q60.plan.txt
index 4616b0ad95b6..cd5904cf7598 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q60.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q60.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -21,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["i_item_id_6"])
-                                                        scan item
+                                                        dynamic filter (["i_item_id_6"])
+                                                            scan item
                                                     final aggregation over (i_item_id_10)
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["i_item_id_10"])
@@ -35,7 +37,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["i_item_id_83"])
-                                                        scan item
+                                                        dynamic filter (["i_item_id_83"])
+                                                            scan item
                                                     final aggregation over (i_item_id_109)
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["i_item_id_109"])
@@ -60,7 +64,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -71,7 +76,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["i_item_id_184"])
-                                                        scan item
+                                                        dynamic filter (["i_item_id_184"])
+                                                            scan item
                                                     final aggregation over (i_item_id_210)
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["i_item_id_210"])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q61.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q61.plan.txt
index ff3d350a643f..1cd788781e8b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q61.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q61.plan.txt
@@ -9,7 +9,8 @@ cross join:
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -22,7 +23,8 @@ cross join:
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                     join (INNER, REPLICATED):
-                                        scan customer
+                                        dynamic filter (["c_current_addr_sk"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_address
@@ -38,7 +40,8 @@ cross join:
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk_14", "ss_item_sk_13", "ss_sold_date_sk_34", "ss_store_sk_18"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -51,7 +54,8 @@ cross join:
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_sk_98"])
                                 join (INNER, REPLICATED):
-                                    scan customer
+                                    dynamic filter (["c_current_addr_sk_102"])
+                                        scan customer
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q62.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q62.plan.txt
index 90f04a71a65b..1c3444200bc5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q62.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q62.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_ship_date_sk", "ws_ship_mode_sk", "ws_warehouse_sk", "ws_web_site_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q63.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q63.plan.txt
index 23e28eddc4b7..da2cbd549a64 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q63.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q63.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q64.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q64.plan.txt
index 5b7e66dd9c00..9bdac814cbd5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q64.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q64.plan.txt
@@ -8,11 +8,13 @@ remote exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_city", "ca_city_105", "ca_street_name", "ca_street_name_102", "ca_street_number", "ca_street_number_101", "ca_zip", "ca_zip_108", "d_year", "d_year_15", "d_year_45", "i_product_name", "s_store_name", "s_zip", "ss_item_sk"])
                                 partial aggregation over (ca_city, ca_city_105, ca_street_name, ca_street_name_102, ca_street_number, ca_street_number_101, ca_zip, ca_zip_108, d_year, d_year_15, d_year_45, i_product_name, s_store_name, s_zip, ss_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan customer_address
+                                        dynamic filter (["ca_address_sk_99"])
+                                            scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
@@ -20,7 +22,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                     join (INNER, REPLICATED):
                                                                         join (INNER, PARTITIONED):
                                                                             remote exchange (REPARTITION, HASH, ["cd_demo_sk_75"])
-                                                                                scan customer_demographics
+                                                                                dynamic filter (["cd_demo_sk_75"])
+                                                                                    scan customer_demographics
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                                                     join (INNER, REPLICATED):
@@ -33,13 +36,15 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                 join (INNER, PARTITIONED):
                                                                                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                                                                                         join (INNER, REPLICATED):
-                                                                                                                            scan store_sales
+                                                                                                                            dynamic filter (["ss_cdemo_sk", "ss_customer_sk", "ss_hdemo_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                                                                                scan store_sales
                                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                     scan date_dim
                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                         remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                                                                            scan store_returns
+                                                                                                                            dynamic filter (["sr_item_sk", "sr_item_sk", "sr_item_sk"])
+                                                                                                                                scan store_returns
                                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                         final aggregation over (cs_item_sk)
@@ -48,15 +53,18 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                                     partial aggregation over (cs_item_sk)
                                                                                                                                         join (INNER, PARTITIONED):
                                                                                                                                             remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                                                                                                scan catalog_sales
+                                                                                                                                                dynamic filter (["cs_item_sk", "cs_item_sk", "cs_item_sk", "cs_order_number"])
+                                                                                                                                                    scan catalog_sales
                                                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                                                 remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                                                                                                    scan catalog_returns
+                                                                                                                                                    dynamic filter (["cr_item_sk", "cr_item_sk"])
+                                                                                                                                                        scan catalog_returns
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                                                                 join (INNER, REPLICATED):
                                                                                                                     join (INNER, REPLICATED):
-                                                                                                                        scan customer
+                                                                                                                        dynamic filter (["c_current_hdemo_sk", "c_first_sales_date_sk", "c_first_shipto_date_sk"])
+                                                                                                                            scan customer
                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                 scan date_dim
@@ -68,24 +76,28 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                         scan customer_demographics
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                    scan store
+                                                                                                    dynamic filter (["s_store_name", "s_zip"])
+                                                                                                        scan store
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                scan item
+                                                                                                dynamic filter (["i_item_sk"])
+                                                                                                    scan item
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan promotion
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk"])
+                                                                                    scan household_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan income_band
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, REPLICATED):
-                                                                            scan household_demographics
+                                                                            dynamic filter (["hd_income_band_sk_91"])
+                                                                                scan household_demographics
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan income_band
@@ -96,11 +108,13 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_city_452", "ca_city_467", "ca_street_name_449", "ca_street_name_464", "ca_street_number_448", "ca_street_number_463", "ca_zip_455", "ca_zip_470", "d_year_254", "d_year_284", "d_year_314", "i_product_name_507", "s_store_name_343", "s_zip_363", "ss_item_sk_133"])
                                     partial aggregation over (ca_city_452, ca_city_467, ca_street_name_449, ca_street_name_464, ca_street_number_448, ca_street_number_463, ca_zip_455, ca_zip_470, d_year_254, d_year_284, d_year_314, i_product_name_507, s_store_name_343, s_zip_363, ss_item_sk_133)
                                         join (INNER, REPLICATED):
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk_461"])
+                                                scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan customer_address
+                                                        dynamic filter (["ca_address_sk_446"])
+                                                            scan customer_address
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
@@ -108,7 +122,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                         join (INNER, REPLICATED):
                                                                             join (INNER, PARTITIONED):
                                                                                 remote exchange (REPARTITION, HASH, ["cd_demo_sk_400"])
-                                                                                    scan customer_demographics
+                                                                                    dynamic filter (["cd_demo_sk_400"])
+                                                                                        scan customer_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk_371"])
                                                                                         join (INNER, REPLICATED):
@@ -121,13 +136,15 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                     join (INNER, PARTITIONED):
                                                                                                                         remote exchange (REPARTITION, HASH, ["ss_item_sk_133", "ss_ticket_number_140"])
                                                                                                                             join (INNER, REPLICATED):
-                                                                                                                                scan store_sales
+                                                                                                                                dynamic filter (["ss_cdemo_sk_135", "ss_customer_sk_134", "ss_hdemo_sk_136", "ss_item_sk_133", "ss_item_sk_133", "ss_item_sk_133", "ss_promo_sk_139", "ss_sold_date_sk_154", "ss_store_sk_138", "ss_ticket_number_140"])
+                                                                                                                                    scan store_sales
                                                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                         scan date_dim
                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                             remote exchange (REPARTITION, HASH, ["sr_item_sk_158", "sr_ticket_number_165"])
-                                                                                                                                scan store_returns
+                                                                                                                                dynamic filter (["sr_item_sk_158", "sr_item_sk_158"])
+                                                                                                                                    scan store_returns
                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                             final aggregation over (cs_item_sk_193)
@@ -136,15 +153,18 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                                         partial aggregation over (cs_item_sk_193)
                                                                                                                                             join (INNER, PARTITIONED):
                                                                                                                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk_193", "cs_order_number_195"])
-                                                                                                                                                    scan catalog_sales
+                                                                                                                                                    dynamic filter (["cs_item_sk_193", "cs_item_sk_193", "cs_order_number_195"])
+                                                                                                                                                        scan catalog_sales
                                                                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk_216", "cr_order_number_230"])
-                                                                                                                                                        scan catalog_returns
+                                                                                                                                                        dynamic filter (["cr_item_sk_216"])
+                                                                                                                                                            scan catalog_returns
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_369"])
                                                                                                                     join (INNER, REPLICATED):
                                                                                                                         join (INNER, REPLICATED):
-                                                                                                                            scan customer
+                                                                                                                            dynamic filter (["c_current_hdemo_sk_372", "c_first_sales_date_sk_375", "c_first_shipto_date_sk_374"])
+                                                                                                                                scan customer
                                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                     scan date_dim
@@ -166,14 +186,16 @@ remote exchange (GATHER, SINGLE, [])
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 join (INNER, REPLICATED):
-                                                                                    scan household_demographics
+                                                                                    dynamic filter (["hd_income_band_sk_433"])
+                                                                                        scan household_demographics
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             scan income_band
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk_440"])
+                                                                                    scan household_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q65.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q65.plan.txt
index 0c80486a2845..e709c2b79828 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q65.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q65.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_item_sk_7", "ss_store_sk_12"])
                             partial aggregation over (ss_item_sk_7, ss_store_sk_12)
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk_7", "ss_sold_date_sk_28", "ss_store_sk_12"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                     remote exchange (REPLICATE, BROADCAST, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["s_store_sk"])
-                                scan store
+                                dynamic filter (["s_store_sk"])
+                                    scan store
                             final aggregation over (ss_store_sk)
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_store_sk"])
@@ -25,7 +27,8 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_store_sk"])
                                                         partial aggregation over (ss_item_sk, ss_store_sk)
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q66.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q66.plan.txt
index b87ae78025f5..ba2954f5d404 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q66.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q66.plan.txt
@@ -15,7 +15,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_ship_mode_sk", "ws_sold_date_sk", "ws_sold_time_sk", "ws_warehouse_sk"])
+                                                                        scan web_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan ship_mode
@@ -41,7 +42,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_ship_mode_sk", "cs_sold_date_sk", "cs_sold_time_sk", "cs_warehouse_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan ship_mode
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q67.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q67.plan.txt
index 60f46f2fcf90..66c2001151d6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q67.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q67.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q68.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q68.plan.txt
index 5feab810ee06..198e4327c76a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q68.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q68.plan.txt
@@ -4,7 +4,8 @@ local exchange (GATHER, SINGLE, [])
             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                        scan customer
+                        dynamic filter (["c_current_addr_sk", "c_customer_sk"])
+                            scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                             final aggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number)
@@ -12,13 +13,15 @@ local exchange (GATHER, SINGLE, [])
                                     partial aggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                scan customer_address
+                                                dynamic filter (["ca_address_sk"])
+                                                    scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q69.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q69.plan.txt
index 4b87cab3294e..1ed946056199 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q69.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q69.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (LEFT, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                     join (INNER, REPLICATED):
-                                        scan customer_demographics
+                                        dynamic filter (["cd_demo_sk"])
+                                            scan customer_demographics
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, PARTITIONED):
@@ -17,14 +18,16 @@ local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                 partial aggregation over (ss_customer_sk)
                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                        scan store_sales
+                                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                            scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                             join (INNER, REPLICATED):
-                                                                scan customer
+                                                                dynamic filter (["c_current_addr_sk"])
+                                                                    scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan customer_address
@@ -33,7 +36,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -42,7 +46,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q70.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q70.plan.txt
index 0ba93430749a..6782961fcb04 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q70.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q70.plan.txt
@@ -10,13 +10,15 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["s_state"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan store
+                                                    dynamic filter (["s_state"])
+                                                        scan store
                                     single aggregation over (s_state_53)
                                         final aggregation over (s_state_53)
                                             local exchange (GATHER, SINGLE, [])
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                                     partial aggregation over (s_state_53)
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk_26", "ss_store_sk_10"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q71.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q71.plan.txt
index 599dd0ab9f9c..f5d3c7ec8a7e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q71.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q71.plan.txt
@@ -7,19 +7,22 @@ remote exchange (GATHER, SINGLE, [])
                         partial aggregation over (i_brand, i_brand_id, t_hour, t_minute)
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
+                                    local exchange (REPARTITION, ROUND_ROBIN, [])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk", "ws_sold_time_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_sold_time_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_sold_time_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q72.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q72.plan.txt
index 9c47f45ae5a1..cc812789f826 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q72.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q72.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["inv_item_sk"])
                                             join (INNER, REPLICATED):
-                                                scan inventory
+                                                dynamic filter (["inv_date_sk", "inv_item_sk", "inv_quantity_on_hand", "inv_warehouse_sk"])
+                                                    scan inventory
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq_16"])
+                                                            scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
@@ -21,7 +23,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_bill_cdemo_sk", "cs_bill_hdemo_sk", "cs_item_sk", "cs_ship_date_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan household_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q73.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q73.plan.txt
index 8a3c9f5087e6..0ceb0cf526e0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q73.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q73.plan.txt
@@ -3,7 +3,8 @@ remote exchange (GATHER, SINGLE, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, PARTITIONED):
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                    scan customer
+                    dynamic filter (["c_customer_sk"])
+                        scan customer
                 final aggregation over (ss_customer_sk, ss_ticket_number)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
@@ -11,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q74.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q74.plan.txt
index 89fdfff32752..aa0066ea858b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q74.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q74.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_90"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_90", "ss_sold_date_sk_110"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_68"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_69", "c_customer_id_69"])
+                                                scan customer
                 final aggregation over (c_customer_id_329, c_first_name_336, c_last_name_337, d_year_390)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_329"])
@@ -23,13 +25,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_351"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_351", "ws_sold_date_sk_381"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_328"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_329"])
+                                                scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_customer_id, c_first_name, c_last_name, d_year)
                     local exchange (GATHER, SINGLE, [])
@@ -38,13 +42,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id"])
+                                                scan customer
                 final aggregation over (c_customer_id_508, c_first_name_515, c_last_name_516, d_year_569)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_508"])
@@ -52,7 +58,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_530"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_530", "ws_sold_date_sk_560"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q75.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q75.plan.txt
index 72ac1ec6cf65..41b95bbc141b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q75.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q75.plan.txt
@@ -8,15 +8,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_13, expr, expr_18, i_brand_id_7, i_category_id_9, i_class_id_8, i_manufact_id_10)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                        scan catalog_returns
+                                        dynamic filter (["cr_item_sk", "cr_order_number"])
+                                            scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_7", "i_category_id_9", "i_class_id_8", "i_manufact_id_10"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -24,15 +27,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_51, expr_77, expr_78, i_brand_id_28, i_category_id_32, i_class_id_30, i_manufact_id_34)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                            scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_28", "i_category_id_32", "i_class_id_30", "i_manufact_id_34"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -40,15 +46,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_111, expr_137, expr_138, i_brand_id_88, i_category_id_92, i_class_id_90, i_manufact_id_94)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                        scan web_returns
+                                        dynamic filter (["wr_item_sk", "wr_order_number"])
+                                            scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_88", "i_category_id_92", "i_class_id_90", "i_manufact_id_94"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -59,12 +68,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_221, expr_274, expr_275, i_brand_id_198, i_category_id_202, i_class_id_200, i_manufact_id_204)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk_246", "cr_order_number_260"])
-                                        scan catalog_returns
+                                        dynamic filter (["cr_item_sk_246", "cr_order_number_260"])
+                                            scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk_169", "cs_order_number_171"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_item_sk_169", "cs_sold_date_sk_188"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
@@ -75,12 +86,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_331, expr_377, expr_378, i_brand_id_308, i_category_id_312, i_class_id_310, i_manufact_id_314)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_356", "sr_ticket_number_363"])
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk_356", "sr_ticket_number_363"])
+                                            scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk_277", "ss_ticket_number_284"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_277", "ss_sold_date_sk_298"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
@@ -91,12 +104,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_445, expr_495, expr_496, i_brand_id_422, i_category_id_426, i_class_id_424, i_manufact_id_428)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk_470", "wr_order_number_481"])
-                                        scan web_returns
+                                        dynamic filter (["wr_item_sk_470", "wr_order_number_481"])
+                                            scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk_381", "ws_order_number_395"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_item_sk_381", "ws_sold_date_sk_412"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q76.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q76.plan.txt
index 96f6228260dc..f9599e0446e5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q76.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q76.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_10, d_year_9, expr_134, expr_135, i_category_6)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
@@ -17,12 +18,14 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_51, d_year_47, expr_140, expr_141, i_category_29)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk_17"])
-                                scan item
+                                dynamic filter (["i_item_sk_17"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_sold_date_sk"])
-                                            scan web_sales
+                                            dynamic filter (["ws_sold_date_sk"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["d_date_sk_41"])
                                                 scan date_dim
@@ -31,7 +34,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                 join (INNER, REPLICATED):
-                                    scan catalog_sales
+                                    dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                        scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q77.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q77.plan.txt
index f5f8b7b62eea..b632624a3d15 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q77.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q77.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ss_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -25,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (sr_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_returns
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -38,7 +40,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_call_center_sk"])
                                             partial aggregation over (cs_call_center_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -49,7 +52,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["cr_call_center_sk"])
                                                     partial aggregation over (cr_call_center_sk)
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_returns
+                                                            dynamic filter (["cr_returned_date_sk"])
+                                                                scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -60,7 +64,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ws_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_page_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -73,7 +78,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (wr_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_returns
+                                                        dynamic filter (["wr_returned_date_sk", "wr_web_page_sk"])
+                                                            scan web_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q78.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q78.plan.txt
index e9a4bce6caf7..a13222cb0024 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q78.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q78.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk", "ss_customer_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                    scan store_returns
+                                                    dynamic filter (["sr_item_sk"])
+                                                        scan store_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
                                                     scan web_returns
@@ -38,7 +41,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (LEFT, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                        scan catalog_sales
+                                        dynamic filter (["cs_sold_date_sk"])
+                                            scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
                                             scan catalog_returns
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q79.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q79.plan.txt
index c41171325a3c..733be6f6e8b7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q79.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q79.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q80.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q80.plan.txt
index a4b2da9fdab0..61944a8d3ab3 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q80.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q80.plan.txt
@@ -15,10 +15,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                        scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_item_sk"])
+                                                                            scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -41,10 +43,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_catalog_page_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                        scan catalog_returns
+                                                                        dynamic filter (["cr_item_sk"])
+                                                                            scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -67,10 +71,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_item_sk", "ws_promo_sk", "ws_sold_date_sk", "ws_web_site_sk"])
+                                                                        scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_item_sk"])
+                                                                            scan web_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q81.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q81.plan.txt
index 1d349b955cdc..49d771cb6434 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q81.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q81.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_returns
+                                                dynamic filter (["cr_returned_date_sk", "cr_returning_addr_sk", "cr_returning_customer_sk"])
+                                                    scan catalog_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                             join (INNER, REPLICATED):
-                                scan customer
+                                dynamic filter (["c_current_addr_sk"])
+                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
@@ -37,7 +39,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk_30"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_returns
+                                                                    dynamic filter (["cr_returned_date_sk_47", "cr_returning_addr_sk_30"])
+                                                                        scan catalog_returns
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q82.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q82.plan.txt
index 532952036fc3..d3b691e03fe2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q82.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q82.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"])
                     partial aggregation over (i_current_price, i_item_desc, i_item_id)
                         join (INNER, REPLICATED, can skip output duplicates):
-                            scan store_sales
+                            dynamic filter (["ss_item_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED, can skip output duplicates):
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan inventory
+                                            dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                                scan inventory
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q83.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q83.plan.txt
index d5992a1244c4..9c4f78a6d332 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q83.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q83.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["sr_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk", "sr_returned_date_sk"])
+                                            scan store_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan date_dim
+                                                    dynamic filter (["d_date"])
+                                                        scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (d_date_6)
@@ -20,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["d_date_6"])
                                                                         partial aggregation over (d_date_6)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_8"])
+                                                                                    scan date_dim
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         final aggregation over (d_week_seq_40)
@@ -30,7 +33,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                         scan date_dim
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                        scan item
+                                        dynamic filter (["i_item_id"])
+                                            scan item
             join (INNER, PARTITIONED):
                 final aggregation over (i_item_id_74)
                     local exchange (GATHER, SINGLE, [])
@@ -39,11 +43,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_returns
+                                            dynamic filter (["cr_item_sk", "cr_returned_date_sk"])
+                                                scan catalog_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_99"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_131)
@@ -51,7 +57,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_131"])
                                                                             partial aggregation over (d_date_131)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_133"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             final aggregation over (d_week_seq_165)
@@ -61,22 +68,26 @@ local exchange (GATHER, SINGLE, [])
                                                                                                             scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_73"])
-                                            scan item
+                                            dynamic filter (["i_item_id_74"])
+                                                scan item
                 final aggregation over (i_item_id_201)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["i_item_id_201"])
                             partial aggregation over (i_item_id_201)
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["i_item_sk_200"])
-                                        scan item
+                                        dynamic filter (["i_item_sk_200"])
+                                            scan item
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["wr_item_sk"])
                                             join (INNER, REPLICATED):
-                                                scan web_returns
+                                                dynamic filter (["wr_returned_date_sk"])
+                                                    scan web_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan date_dim
+                                                            dynamic filter (["d_date_226"])
+                                                                scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (d_date_258)
@@ -84,7 +95,8 @@ local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["d_date_258"])
                                                                                 partial aggregation over (d_date_258)
                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                        scan date_dim
+                                                                                        dynamic filter (["d_week_seq_260"])
+                                                                                            scan date_dim
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                 final aggregation over (d_week_seq_292)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q84.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q84.plan.txt
index ec22af2c6a55..b1402e98e5ab 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q84.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q84.plan.txt
@@ -1,23 +1,27 @@
 local exchange (GATHER, SINGLE, [])
     remote exchange (GATHER, SINGLE, [])
         join (INNER, REPLICATED):
-            scan store_returns
+            dynamic filter (["sr_cdemo_sk"])
+                scan store_returns
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPLICATE, BROADCAST, [])
                     join (INNER, REPLICATED):
-                        scan customer_demographics
+                        dynamic filter (["cd_demo_sk"])
+                            scan customer_demographics
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPLICATE, BROADCAST, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan customer
+                                        dynamic filter (["c_current_addr_sk", "c_current_hdemo_sk"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_address
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan household_demographics
+                                                dynamic filter (["hd_income_band_sk"])
+                                                    scan household_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q85.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q85.plan.txt
index 2a72b1dbbed5..eedf6f3329c2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q85.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q85.plan.txt
@@ -6,13 +6,15 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (r_reason_desc)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan customer_address
+                                dynamic filter (["ca_address_sk"])
+                                    scan customer_address
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["cd_demo_sk_6", "cd_education_status_9", "cd_marital_status_8"])
-                                                    scan customer_demographics
+                                                    dynamic filter (["cd_demo_sk_6", "cd_education_status_9", "cd_marital_status_8"])
+                                                        scan customer_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["cd_education_status", "cd_marital_status", "wr_returning_cdemo_sk"])
                                                         join (INNER, PARTITIONED):
@@ -20,13 +22,15 @@ local exchange (GATHER, SINGLE, [])
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan web_sales
+                                                                            dynamic filter (["ws_item_sk", "ws_order_number", "ws_sold_date_sk", "ws_web_page_sk"])
+                                                                                scan web_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                            scan web_returns
+                                                                            dynamic filter (["wr_reason_sk", "wr_refunded_cdemo_sk"])
+                                                                                scan web_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["cd_demo_sk"])
                                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q86.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q86.plan.txt
index cca927926827..38fdc67f5412 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q86.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q86.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (groupid, i_category$gid, i_class$gid)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q87.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q87.plan.txt
index 9f02b3c87024..b342ddb2e44f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q87.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q87.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -27,7 +28,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -42,7 +44,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q88.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q88.plan.txt
index 6e297c60e201..fbeb9bec31cc 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q88.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q88.plan.txt
@@ -12,7 +12,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan time_dim
@@ -29,7 +30,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk_10", "ss_sold_time_sk_6", "ss_store_sk_12"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan time_dim
@@ -46,7 +48,8 @@ cross join:
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_hdemo_sk_86", "ss_sold_time_sk_82", "ss_store_sk_88"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan time_dim
@@ -63,7 +66,8 @@ cross join:
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_hdemo_sk_162", "ss_sold_time_sk_158", "ss_store_sk_164"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan time_dim
@@ -80,7 +84,8 @@ cross join:
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk_238", "ss_sold_time_sk_234", "ss_store_sk_240"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan time_dim
@@ -97,7 +102,8 @@ cross join:
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_hdemo_sk_314", "ss_sold_time_sk_310", "ss_store_sk_316"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan time_dim
@@ -114,7 +120,8 @@ cross join:
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_hdemo_sk_390", "ss_sold_time_sk_386", "ss_store_sk_392"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan time_dim
@@ -131,7 +138,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_hdemo_sk_466", "ss_sold_time_sk_462", "ss_store_sk_468"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan time_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q89.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q89.plan.txt
index 396d705bbc38..221dfc17c333 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q89.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q89.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q90.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q90.plan.txt
index 0ddf21aa574d..0324ff34e833 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q90.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q90.plan.txt
@@ -6,7 +6,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk", "ws_sold_time_sk", "ws_web_page_sk"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan web_page
@@ -23,7 +24,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk_15", "ws_sold_time_sk_6", "ws_web_page_sk_17"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan web_page
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q91.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q91.plan.txt
index 750e4be2dcb9..cae49eea1e14 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q91.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q91.plan.txt
@@ -9,7 +9,8 @@ remote exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cr_returning_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_returns
+                                            dynamic filter (["cr_call_center_sk", "cr_returned_date_sk", "cr_returning_customer_sk"])
+                                                scan catalog_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -20,7 +21,8 @@ remote exchange (GATHER, SINGLE, [])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                             join (INNER, REPLICATED):
-                                                                scan customer
+                                                                dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_current_hdemo_sk"])
+                                                                    scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan household_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q92.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q92.plan.txt
index 2dfed78f9a62..26d64d4d3541 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q92.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q92.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk_6"])
                                     partial aggregation over (ws_item_sk_6)
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk_6", "ws_sold_date_sk_37"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q93.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q93.plan.txt
index ca9dc7543db7..e1cd897adff9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q93.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q93.plan.txt
@@ -7,10 +7,12 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk", "ss_ticket_number"])
+                                        scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_reason_sk"])
+                                            scan store_returns
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan reason
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q94.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q94.plan.txt
index 704afb8ed5c1..d2a476965598 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q94.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q94.plan.txt
@@ -8,19 +8,22 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["wr_order_number"])
                                     partial aggregation over (wr_order_number)
-                                        scan web_returns
+                                        dynamic filter (["wr_order_number"])
+                                            scan web_returns
                         final aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number_22, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_order_number_22"])
                                     partial aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number_22, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk)
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_22"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q95.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q95.plan.txt
index 5e42003378f2..ee593ef8a918 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q95.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q95.plan.txt
@@ -9,29 +9,35 @@ final aggregation over ()
                                 join (INNER, PARTITIONED, can skip output duplicates):
                                     join (INNER, PARTITIONED, can skip output duplicates):
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_100"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_100", "ws_order_number_100", "ws_order_number_100"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["wr_order_number"])
-                                                scan web_returns
+                                                dynamic filter (["wr_order_number", "wr_order_number"])
+                                                    scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_136"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_136"])
+                                                scan web_sales
                     join (INNER, PARTITIONED):
                         final aggregation over (ws_order_number_22)
                             local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (ws_order_number_22)
                                     join (INNER, PARTITIONED, can skip output duplicates):
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_22"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_22", "ws_order_number_22"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_order_number_58"])
-                                                scan web_sales
+                                                dynamic filter (["ws_order_number_58"])
+                                                    scan web_sales
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_order_number"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q96.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q96.plan.txt
index 6ac294895946..e4fdf4d14611 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q96.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q96.plan.txt
@@ -5,7 +5,8 @@ final aggregation over ()
                 join (INNER, REPLICATED):
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
-                            scan store_sales
+                            dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan time_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q97.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q97.plan.txt
index 7b9c83293534..959bbfe9de73 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q97.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q97.plan.txt
@@ -8,7 +8,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"])
                                 partial aggregation over (ss_customer_sk, ss_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"])
                                 partial aggregation over (cs_bill_customer_sk, cs_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q98.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q98.plan.txt
index 9775b6c511f5..7c0caca03f27 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q98.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q98.plan.txt
@@ -9,7 +9,8 @@ remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q99.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q99.plan.txt
index 7f8838ac985a..87cec8152a11 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q99.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/partitioned/q99.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_call_center_sk", "cs_ship_date_sk", "cs_ship_mode_sk", "cs_warehouse_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q01.plan.txt
index 114fb89fe851..821640079948 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q01.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q01.plan.txt
@@ -4,7 +4,8 @@ local exchange (GATHER, SINGLE, [])
             join (LEFT, REPLICATED):
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                        scan customer
+                        dynamic filter (["c_customer_sk"])
+                            scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["sr_customer_sk"])
                             join (INNER, REPLICATED):
@@ -13,7 +14,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_store_sk"])
                                             partial aggregation over (sr_customer_sk, sr_store_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan store_returns
+                                                    dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                        scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -31,7 +33,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk_9", "sr_store_sk_13"])
                                                     partial aggregation over (sr_customer_sk_9, sr_store_sk_13)
                                                         join (INNER, REPLICATED):
-                                                            scan store_returns
+                                                            dynamic filter (["sr_returned_date_sk_6"])
+                                                                scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q02.plan.txt
index ebb55d3dc0a5..599edf949617 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q02.plan.txt
@@ -9,15 +9,19 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq"])
                                     partial aggregation over (d_day_name, d_week_seq)
                                         join (INNER, REPLICATED):
-                                            remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                scan web_sales
-                                                scan catalog_sales
+                                            local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                dynamic filter (["ws_sold_date_sk"])
+                                                    scan web_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan date_dim
+                                                    dynamic filter (["d_week_seq", "d_week_seq"])
+                                                        scan date_dim
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["d_week_seq_20"])
-                            scan date_dim
+                            dynamic filter (["d_week_seq_20"])
+                                scan date_dim
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["expr_219"])
                         join (INNER, PARTITIONED):
@@ -27,12 +31,15 @@ remote exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["d_week_seq_124"])
                                             partial aggregation over (d_day_name_134, d_week_seq_124)
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
-                                                        scan catalog_sales
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ws_sold_date_sk_48"])
+                                                            scan web_sales
+                                                        dynamic filter (["cs_sold_date_sk_84"])
+                                                            scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan date_dim
+                                                            dynamic filter (["d_week_seq_124"])
+                                                                scan date_dim
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq_169"])
                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q03.plan.txt
index 70aae3fa1bdd..ede6415850e5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q03.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q04.plan.txt
index a6efbe49650b..a7206f469c83 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q04.plan.txt
@@ -10,13 +10,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_870"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk_870", "cs_sold_date_sk_867"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_847"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_848", "c_customer_id_848", "c_customer_id_848"])
+                                                    scan customer
                     final aggregation over (c_birth_country_1558, c_customer_id_1545, c_email_address_1560, c_first_name_1552, c_last_name_1553, c_login_1559, c_preferred_cust_flag_1554, d_year_1606)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_id_1545"])
@@ -24,13 +26,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1568"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_1568", "ws_sold_date_sk_1564"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_1544"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_1545", "c_customer_id_1545"])
+                                                    scan customer
                 join (INNER, PARTITIONED):
                     final aggregation over (c_birth_country_561, c_customer_id_548, c_email_address_563, c_first_name_555, c_last_name_556, c_login_562, c_preferred_cust_flag_557, d_year_609)
                         local exchange (GATHER, SINGLE, [])
@@ -39,13 +43,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_570"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk_570", "cs_sold_date_sk_567"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_547"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_548", "c_customer_id_548"])
+                                                    scan customer
                     final aggregation over (c_birth_country_1258, c_customer_id_1245, c_email_address_1260, c_first_name_1252, c_last_name_1253, c_login_1259, c_preferred_cust_flag_1254, d_year_1306)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_id_1245"])
@@ -53,13 +59,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1268"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_1268", "ws_sold_date_sk_1264"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_1244"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_1245"])
+                                                    scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_birth_country_175, c_customer_id_162, c_email_address_177, c_first_name_169, c_last_name_170, c_login_176, c_preferred_cust_flag_171, d_year_212)
                     local exchange (GATHER, SINGLE, [])
@@ -68,13 +76,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_184"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_184", "ss_sold_date_sk_181"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_161"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_162"])
+                                                scan customer
                 final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id"])
@@ -82,7 +92,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q05.plan.txt
index a837004a655b..9be0861f4b8a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q05.plan.txt
@@ -11,9 +11,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (s_store_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan store_sales
-                                                        scan store_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -26,9 +28,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (cp_catalog_page_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan catalog_sales
-                                                        scan catalog_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["cs_catalog_page_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
+                                                        dynamic filter (["cr_catalog_page_sk", "cr_returned_date_sk"])
+                                                            scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -42,13 +46,16 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_site_sk"])
+                                                            scan web_sales
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ws_item_sk_82", "ws_order_number_96"])
-                                                                scan web_sales
+                                                                dynamic filter (["ws_item_sk_82", "ws_order_number_96", "ws_web_site_sk_92"])
+                                                                    scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                    scan web_returns
+                                                                    dynamic filter (["wr_returned_date_sk"])
+                                                                        scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q06.plan.txt
index fb3592d65b6e..5b35c89d1047 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q06.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q06.plan.txt
@@ -12,11 +12,13 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
-                                                                    scan date_dim
+                                                                    dynamic filter (["d_month_seq"])
+                                                                        scan date_dim
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             local exchange (GATHER, SINGLE, [])
@@ -28,7 +30,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                     scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                        scan customer
+                                                        dynamic filter (["c_current_addr_sk"])
+                                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q07.plan.txt
index 32f4763b443d..a8da2880635e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q07.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q08.plan.txt
index 45b29afc325b..c8c9a0381d97 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q08.plan.txt
@@ -5,10 +5,11 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["s_store_name"])
                     partial aggregation over (s_store_name)
                         join (INNER, PARTITIONED):
-                            remote exchange (REPARTITION, HASH, ["substr_34"])
+                            remote exchange (REPARTITION, HASH, ["substring"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -16,7 +17,7 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan store
                             local exchange (GATHER, SINGLE, [])
-                                remote exchange (REPARTITION, HASH, ["substr_35"])
+                                remote exchange (REPARTITION, HASH, ["substring_34"])
                                     final aggregation over (ca_zip)
                                         local exchange (REPARTITION, HASH, ["ca_zip"])
                                             remote exchange (REPARTITION, HASH, ["ca_zip_26"])
@@ -30,7 +31,8 @@ local exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over (ca_zip_16)
                                                                     join (INNER, PARTITIONED):
                                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk_7"])
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk_7"])
+                                                                                scan customer_address
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q09.plan.txt
index 4466a2d88feb..cbcd78f04da6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q09.plan.txt
@@ -1,93 +1,122 @@
-cross join:
-    cross join:
-        cross join:
-            cross join:
-                cross join:
-                    cross join:
-                        cross join:
-                            cross join:
-                                cross join:
-                                    cross join:
-                                        cross join:
-                                            cross join:
-                                                cross join:
-                                                    cross join:
-                                                        cross join:
-                                                            final aggregation over ()
-                                                                local exchange (GATHER, SINGLE, [])
-                                                                    remote exchange (GATHER, SINGLE, [])
-                                                                        partial aggregation over ()
-                                                                            scan store_sales
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    scan reason
-                                                        final aggregation over ()
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    partial aggregation over ()
-                                                                        scan store_sales
+join (LEFT, REPLICATED):
+    join (LEFT, REPLICATED):
+        join (LEFT, REPLICATED):
+            join (LEFT, REPLICATED):
+                join (LEFT, REPLICATED):
+                    join (LEFT, REPLICATED):
+                        join (LEFT, REPLICATED):
+                            join (RIGHT, PARTITIONED):
+                                remote exchange (REPARTITION, HASH, [])
+                                    final aggregation over ()
+                                        local exchange (GATHER, SINGLE, [])
+                                            remote exchange (GATHER, SINGLE, [])
+                                                partial aggregation over ()
+                                                    scan store_sales
+                                local exchange (GATHER, SINGLE, [])
+                                    join (RIGHT, PARTITIONED):
+                                        remote exchange (REPARTITION, HASH, [])
+                                            final aggregation over ()
+                                                local exchange (GATHER, SINGLE, [])
+                                                    remote exchange (GATHER, SINGLE, [])
+                                                        partial aggregation over ()
+                                                            scan store_sales
+                                        local exchange (GATHER, SINGLE, [])
+                                            join (RIGHT, PARTITIONED):
+                                                remote exchange (REPARTITION, HASH, [])
                                                     final aggregation over ()
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over ()
                                                                     scan store_sales
-                                                final aggregation over ()
-                                                    local exchange (GATHER, SINGLE, [])
-                                                        remote exchange (GATHER, SINGLE, [])
-                                                            partial aggregation over ()
-                                                                scan store_sales
-                                            final aggregation over ()
                                                 local exchange (GATHER, SINGLE, [])
-                                                    remote exchange (GATHER, SINGLE, [])
-                                                        partial aggregation over ()
-                                                            scan store_sales
-                                        final aggregation over ()
-                                            local exchange (GATHER, SINGLE, [])
-                                                remote exchange (GATHER, SINGLE, [])
-                                                    partial aggregation over ()
-                                                        scan store_sales
+                                                    join (RIGHT, PARTITIONED):
+                                                        remote exchange (REPARTITION, HASH, [])
+                                                            final aggregation over ()
+                                                                local exchange (GATHER, SINGLE, [])
+                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                        partial aggregation over ()
+                                                                            scan store_sales
+                                                        local exchange (GATHER, SINGLE, [])
+                                                            join (RIGHT, PARTITIONED):
+                                                                remote exchange (REPARTITION, HASH, [])
+                                                                    final aggregation over ()
+                                                                        local exchange (GATHER, SINGLE, [])
+                                                                            remote exchange (GATHER, SINGLE, [])
+                                                                                partial aggregation over ()
+                                                                                    scan store_sales
+                                                                local exchange (GATHER, SINGLE, [])
+                                                                    join (RIGHT, PARTITIONED):
+                                                                        remote exchange (REPARTITION, HASH, [])
+                                                                            final aggregation over ()
+                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                                        partial aggregation over ()
+                                                                                            scan store_sales
+                                                                        local exchange (GATHER, SINGLE, [])
+                                                                            join (RIGHT, PARTITIONED):
+                                                                                remote exchange (REPARTITION, HASH, [])
+                                                                                    final aggregation over ()
+                                                                                        local exchange (GATHER, SINGLE, [])
+                                                                                            remote exchange (GATHER, SINGLE, [])
+                                                                                                partial aggregation over ()
+                                                                                                    scan store_sales
+                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                    join (RIGHT, PARTITIONED):
+                                                                                        remote exchange (REPARTITION, HASH, [])
+                                                                                            final aggregation over ()
+                                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                                                        partial aggregation over ()
+                                                                                                            scan store_sales
+                                                                                        local exchange (GATHER, SINGLE, [])
+                                                                                            remote exchange (REPARTITION, HASH, [])
+                                                                                                scan reason
+                            local exchange (GATHER, SINGLE, [])
+                                remote exchange (REPLICATE, BROADCAST, [])
                                     final aggregation over ()
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (GATHER, SINGLE, [])
                                                 partial aggregation over ()
                                                     scan store_sales
+                        local exchange (GATHER, SINGLE, [])
+                            remote exchange (REPLICATE, BROADCAST, [])
                                 final aggregation over ()
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (GATHER, SINGLE, [])
                                             partial aggregation over ()
                                                 scan store_sales
+                    local exchange (GATHER, SINGLE, [])
+                        remote exchange (REPLICATE, BROADCAST, [])
                             final aggregation over ()
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (GATHER, SINGLE, [])
                                         partial aggregation over ()
                                             scan store_sales
+                local exchange (GATHER, SINGLE, [])
+                    remote exchange (REPLICATE, BROADCAST, [])
                         final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         scan store_sales
+            local exchange (GATHER, SINGLE, [])
+                remote exchange (REPLICATE, BROADCAST, [])
                     final aggregation over ()
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over ()
                                     scan store_sales
+        local exchange (GATHER, SINGLE, [])
+            remote exchange (REPLICATE, BROADCAST, [])
                 final aggregation over ()
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (GATHER, SINGLE, [])
                             partial aggregation over ()
                                 scan store_sales
+    local exchange (GATHER, SINGLE, [])
+        remote exchange (REPLICATE, BROADCAST, [])
             final aggregation over ()
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (GATHER, SINGLE, [])
                         partial aggregation over ()
                             scan store_sales
-        final aggregation over ()
-            local exchange (GATHER, SINGLE, [])
-                remote exchange (GATHER, SINGLE, [])
-                    partial aggregation over ()
-                        scan store_sales
-    final aggregation over ()
-        local exchange (GATHER, SINGLE, [])
-            remote exchange (GATHER, SINGLE, [])
-                partial aggregation over ()
-                    scan store_sales
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q10.plan.txt
index 7d60d2a5fdd5..751f1ac52a8c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q10.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_ship_customer_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -21,14 +22,16 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                 partial aggregation over (ws_bill_customer_sk)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                             join (INNER, REPLICATED):
-                                                scan customer_demographics
+                                                dynamic filter (["cd_demo_sk"])
+                                                    scan customer_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
@@ -37,14 +40,16 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                         partial aggregation over (ss_customer_sk)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan store_sales
+                                                                                dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                                    scan store_sales
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan customer
+                                                                        dynamic filter (["c_current_addr_sk"])
+                                                                            scan customer
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q11.plan.txt
index 19f529a8c0c8..d6c17e531127 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q11.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_101"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_101", "ss_sold_date_sk_98"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_78"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_79", "c_customer_id_79"])
+                                                scan customer
                 final aggregation over (c_birth_country_371, c_customer_id_358, c_email_address_373, c_first_name_365, c_last_name_366, c_login_372, c_preferred_cust_flag_367, d_year_419)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_358"])
@@ -23,13 +25,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_381"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_381", "ws_sold_date_sk_377"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_357"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_358"])
+                                                scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year)
                     local exchange (GATHER, SINGLE, [])
@@ -38,13 +42,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id"])
+                                                scan customer
                 final aggregation over (c_birth_country_564, c_customer_id_551, c_email_address_566, c_first_name_558, c_last_name_559, c_login_565, c_preferred_cust_flag_560, d_year_612)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_551"])
@@ -52,7 +58,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_574"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_574", "ws_sold_date_sk_570"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q12.plan.txt
index eb114fe9092d..db9389ab3d6e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q12.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q13.plan.txt
index a4d7d7d75438..6bb6b2b7a4c7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q13.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q14.plan.txt
index c8326b25e125..6e0414b614d4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q14.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_6, i_category_id_8, i_class_id_7)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -20,21 +21,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_13)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_13"])
                                                                             partial aggregation over (i_item_sk_13)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_20", "i_category_id_24", "i_class_id_22"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_20", "i_category_id_24", "i_class_id_22"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id, category_id, class_id)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_72", "i_category_id_76", "i_class_id_74"])
                                                                                                 partial aggregation over (i_brand_id_72, i_category_id_76, i_class_id_74)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_42", "ss_sold_date_sk_40"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -45,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_128, i_category_id_132, i_class_id_130)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -56,7 +61,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_184, i_category_id_188, i_class_id_186)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -70,19 +76,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_236"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_291"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_357"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -93,7 +102,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_469, i_category_id_473, i_class_id_471)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_item_sk_441", "cs_sold_date_sk_426"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -101,21 +111,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk_462"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk_462"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_518)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_518"])
                                                                             partial aggregation over (i_item_sk_518)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_525", "i_category_id_529", "i_class_id_527"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_525", "i_category_id_529", "i_class_id_527"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id_542, category_id_544, class_id_543)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_580", "i_category_id_584", "i_class_id_582"])
                                                                                                 partial aggregation over (i_brand_id_580, i_category_id_584, i_class_id_582)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_550", "ss_sold_date_sk_548"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -126,7 +139,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_670, i_category_id_674, i_class_id_672)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk_642", "cs_sold_date_sk_627"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -137,7 +151,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_760, i_category_id_764, i_class_id_762)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk_720", "ws_sold_date_sk_717"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -151,19 +166,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_819"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_874"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_940"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -174,7 +192,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_1052, i_category_id_1056, i_class_id_1054)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_item_sk_1012", "ws_sold_date_sk_1009"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -182,21 +201,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk_1045"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk_1045"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_1101)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_1101"])
                                                                             partial aggregation over (i_item_sk_1101)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_1108", "i_category_id_1112", "i_class_id_1110"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_1108", "i_category_id_1112", "i_class_id_1110"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id_1125, category_id_1127, class_id_1126)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_1163", "i_category_id_1167", "i_class_id_1165"])
                                                                                                 partial aggregation over (i_brand_id_1163, i_category_id_1167, i_class_id_1165)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_1133", "ss_sold_date_sk_1131"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -207,7 +229,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_1253, i_category_id_1257, i_class_id_1255)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk_1225", "cs_sold_date_sk_1210"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -218,7 +241,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_1343, i_category_id_1347, i_class_id_1345)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk_1303", "ws_sold_date_sk_1300"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -232,19 +256,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_1402"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_1457"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_1523"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q15.plan.txt
index 56302f05c739..ec58f1619767 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q15.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                 join (INNER, REPLICATED):
-                                    scan catalog_sales
+                                    dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                        scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk"])
+                                                scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                 scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q16.plan.txt
index 58337bb6677e..3d9dca3748b4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q16.plan.txt
@@ -8,19 +8,22 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cr_order_number"])
                                     partial aggregation over (cr_order_number)
-                                        scan catalog_returns
+                                        dynamic filter (["cr_order_number"])
+                                            scan catalog_returns
                         final aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number_23, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_order_number_23"])
                                     partial aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number_23, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique)
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_order_number_23"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan catalog_sales
+                                                                dynamic filter (["cs_call_center_sk", "cs_ship_addr_sk", "cs_ship_date_sk"])
+                                                                    scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q17.plan.txt
index 49c98c0b8dda..5062413e205f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q17.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_item_desc, i_item_id, s_state)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                scan item
+                                dynamic filter (["i_item_sk"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q18.plan.txt
index 5f2dfaaeb4fa..8e2571b0d36a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q18.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_bill_cdemo_sk", "cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan customer_demographics
@@ -24,7 +25,8 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
-                                                                scan customer
+                                                                dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk"])
+                                                                    scan customer
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["cd_demo_sk_2"])
                                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q19.plan.txt
index c500acf6fca3..698ecbc98b33 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q19.plan.txt
@@ -7,17 +7,20 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                    scan customer_address
+                                    dynamic filter (["ca_address_sk"])
+                                        scan customer_address
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                scan customer
+                                                dynamic filter (["c_customer_sk"])
+                                                    scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q20.plan.txt
index 852a9d2a3e5c..2e873503ece8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q20.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q21.plan.txt
index 50e40917c430..2ec2a1799207 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q21.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan inventory
+                                    dynamic filter (["inv_date_sk", "inv_item_sk", "inv_warehouse_sk"])
+                                        scan inventory
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q22.plan.txt
index 2fd28d3f31ed..6f1d958f18df 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q22.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["i_brand", "i_product_name"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan inventory
+                                        dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                            scan inventory
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q23.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q23.plan.txt
index 789f96505ed5..2df6cf04552c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q23.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q23.plan.txt
@@ -12,17 +12,20 @@ final aggregation over ()
                                             partial aggregation over (d_date_6, ss_item_sk, substr$gid)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_item_sk"])
+                                                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -33,7 +36,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_43)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_43"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_43"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                     scan customer
@@ -49,7 +53,8 @@ final aggregation over ()
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_71"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_71", "ss_sold_date_sk_68"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
@@ -67,17 +72,20 @@ final aggregation over ()
                                             partial aggregation over (d_date_210, ss_item_sk_185, substr$gid_265)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk_185", "ss_item_sk_185", "ss_sold_date_sk_183"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_item_sk_238"])
+                                                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -88,7 +96,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_274)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_274"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_274"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_296"])
                                                     scan customer
@@ -104,7 +113,8 @@ final aggregation over ()
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_322"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_322", "ss_sold_date_sk_319"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q24.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q24.plan.txt
index 14c2547a1059..1c3d7959c6ae 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q24.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q24.plan.txt
@@ -12,22 +12,26 @@ remote exchange (GATHER, SINGLE, [])
                                             partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["ca_zip", "upper"])
-                                                        scan customer_address
+                                                        dynamic filter (["ca_zip"])
+                                                            scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_birth_country", "s_zip"])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                                    scan customer
+                                                                    dynamic filter (["c_customer_sk"])
+                                                                        scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                         join (INNER, PARTITIONED):
                                                                             remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                                scan store_returns
+                                                                                dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                                                                    scan store_returns
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                                                     join (INNER, REPLICATED):
                                                                                         join (INNER, REPLICATED):
-                                                                                            scan store_sales
+                                                                                            dynamic filter (["ss_item_sk", "ss_store_sk"])
+                                                                                                scan store_sales
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan item
@@ -52,16 +56,20 @@ remote exchange (GATHER, SINGLE, [])
                                                                             join (INNER, REPLICATED):
                                                                                 join (INNER, PARTITIONED):
                                                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk_13", "ss_ticket_number_20"])
-                                                                                        scan store_sales
+                                                                                        dynamic filter (["ss_customer_sk_14", "ss_item_sk_13", "ss_item_sk_13", "ss_store_sk_18", "ss_ticket_number_20"])
+                                                                                            scan store_sales
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPARTITION, HASH, ["sr_item_sk_38", "sr_ticket_number_45"])
-                                                                                            scan store_returns
+                                                                                            dynamic filter (["sr_item_sk_38"])
+                                                                                                scan store_returns
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                        scan store
+                                                                                        dynamic filter (["s_zip_83"])
+                                                                                            scan store
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_113"])
-                                                                                scan customer
+                                                                                dynamic filter (["c_birth_country_127"])
+                                                                                    scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q25.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q25.plan.txt
index 8eedb8e05888..b1efa4fcf91a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q25.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q25.plan.txt
@@ -7,25 +7,29 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                    scan item
+                                    dynamic filter (["i_item_sk"])
+                                        scan item
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q26.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q26.plan.txt
index 555bb67d3baa..d91ef68bdab5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q26.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q26.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_cdemo_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q27.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q27.plan.txt
index b637b1d27f97..3de726f1cc03 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q27.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q27.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q29.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q29.plan.txt
index 8eedb8e05888..b1efa4fcf91a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q29.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q29.plan.txt
@@ -7,25 +7,29 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                    scan item
+                                    dynamic filter (["i_item_sk"])
+                                        scan item
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q30.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q30.plan.txt
index 86527fb7e2b8..7c28bc32e90f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q30.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q30.plan.txt
@@ -9,18 +9,21 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (ca_state, wr_returning_customer_sk)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk"])
+                                                scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_returns
+                                                    dynamic filter (["wr_returned_date_sk", "wr_returning_customer_sk"])
+                                                        scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                             join (INNER, REPLICATED):
-                                scan customer
+                                dynamic filter (["c_current_addr_sk"])
+                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
@@ -36,11 +39,13 @@ local exchange (GATHER, SINGLE, [])
                                                     partial aggregation over (ca_state_85, wr_returning_customer_sk_28)
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ca_address_sk_77"])
-                                                                scan customer_address
+                                                                dynamic filter (["ca_address_sk_77"])
+                                                                    scan customer_address
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk_31"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_returned_date_sk_21"])
+                                                                            scan web_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q31.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q31.plan.txt
index c89b05c7d74d..2486fa37f74f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q31.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q31.plan.txt
@@ -11,13 +11,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_10"])
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk_10", "ss_sold_date_sk_4"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_59"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_66", "ca_county_66", "ca_county_66"])
+                                                        scan customer_address
                         final aggregation over (ca_county_140, d_qoy_113, d_year_109)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_140"])
@@ -25,13 +27,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_84"])
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk_84", "ss_sold_date_sk_78"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_133"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_140", "ca_county_140"])
+                                                        scan customer_address
                     join (INNER, PARTITIONED):
                         final aggregation over (ca_county_276, d_qoy_249, d_year_245)
                             local exchange (GATHER, SINGLE, [])
@@ -40,13 +44,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_210"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk_210", "ws_sold_date_sk_203"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_269"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_276", "ca_county_276"])
+                                                        scan customer_address
                         final aggregation over (ca_county_361, d_qoy_334, d_year_330)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_361"])
@@ -54,13 +60,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_295"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk_295", "ws_sold_date_sk_288"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_354"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_361"])
+                                                        scan customer_address
                 join (INNER, PARTITIONED):
                     final aggregation over (ca_county, d_qoy, d_year)
                         local exchange (GATHER, SINGLE, [])
@@ -69,13 +77,15 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                scan customer_address
+                                                dynamic filter (["ca_county"])
+                                                    scan customer_address
                     final aggregation over (ca_county_191, d_qoy_164, d_year_160)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_county_191"])
@@ -83,7 +93,8 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q32.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q32.plan.txt
index d2a7e4049c81..c5607e291e5b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q32.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q32.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk_19"])
                                     partial aggregation over (cs_item_sk_19)
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk_19", "cs_sold_date_sk_4"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q33.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q33.plan.txt
index 1b2427d4e654..b0447bd7c0a9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q33.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q33.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_6"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_22)
@@ -36,7 +38,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_95"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_121)
@@ -62,7 +66,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -72,7 +77,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_196"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_222)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q34.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q34.plan.txt
index e9f7af9e157c..537336239d51 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q34.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q34.plan.txt
@@ -3,7 +3,8 @@ remote exchange (GATHER, SINGLE, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, PARTITIONED):
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                    scan customer
+                    dynamic filter (["c_customer_sk"])
+                        scan customer
                 final aggregation over (ss_customer_sk, ss_ticket_number)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
@@ -11,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q35.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q35.plan.txt
index f94ec8be8411..42c0747cc500 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q35.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q35.plan.txt
@@ -11,18 +11,21 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                                scan customer
+                                                                dynamic filter (["c_current_cdemo_sk", "c_customer_sk"])
+                                                                    scan customer
                                                             final aggregation over (ss_customer_sk)
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                         partial aggregation over (ss_customer_sk)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan store_sales
+                                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                                    scan store_sales
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan date_dim
@@ -34,7 +37,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -43,7 +47,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q36.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q36.plan.txt
index d640f5ac0d14..06cf870e256c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q36.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q36.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q37.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q37.plan.txt
index 2582d9fa4122..eadc54781cf8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q37.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q37.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"])
                     partial aggregation over (i_current_price, i_item_desc, i_item_id)
                         join (INNER, REPLICATED, can skip output duplicates):
-                            scan catalog_sales
+                            dynamic filter (["cs_item_sk"])
+                                scan catalog_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED, can skip output duplicates):
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan inventory
+                                            dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                                scan inventory
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q38.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q38.plan.txt
index 9f02b3c87024..b342ddb2e44f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q38.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q38.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -27,7 +28,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -42,7 +44,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q39.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q39.plan.txt
index 657fe01edba1..ef6b7c34e1a2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q39.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q39.plan.txt
@@ -10,16 +10,19 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan inventory
+                                                dynamic filter (["inv_date_sk", "inv_item_sk", "inv_item_sk", "inv_warehouse_sk", "inv_warehouse_sk"])
+                                                    scan inventory
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_item_sk"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                scan warehouse
+                                                dynamic filter (["w_warehouse_sk"])
+                                                    scan warehouse
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["inv_item_sk_9", "inv_warehouse_sk_10"])
                         final aggregation over (d_moy_62, inv_item_sk_9, inv_warehouse_sk_10, w_warehouse_name_40)
@@ -29,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan inventory
+                                                    dynamic filter (["inv_date_sk_8", "inv_item_sk_9", "inv_warehouse_sk_10"])
+                                                        scan inventory
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q40.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q40.plan.txt
index 266142fc4c1a..7b700b882104 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q40.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q40.plan.txt
@@ -9,10 +9,12 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (LEFT, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_warehouse_sk"])
+                                                scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                scan catalog_returns
+                                                dynamic filter (["cr_item_sk"])
+                                                    scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q41.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q41.plan.txt
index 58a96c8d1ec2..772ad4b317c4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q41.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q41.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_product_name)
                         single aggregation over (i_manufact, i_manufact_id, i_product_name, unique)
                             join (INNER, REPLICATED, can skip output duplicates):
-                                scan item
+                                dynamic filter (["i_manufact"])
+                                    scan item
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q42.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q42.plan.txt
index 17cc12f10e9e..b35f518a9b70 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q42.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q42.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_category, i_category_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q43.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q43.plan.txt
index 9d9e36441a12..b94077c666ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q43.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q43.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     partial aggregation over (d_day_name, s_store_id, s_store_name)
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q45.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q45.plan.txt
index 5b30cdf7426c..c23529328ac7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q45.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q45.plan.txt
@@ -11,13 +11,15 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_customer_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                    scan customer
+                                                    dynamic filter (["c_current_addr_sk"])
+                                                        scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q46.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q46.plan.txt
index e8aa3db7886c..2fbada568690 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q46.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q46.plan.txt
@@ -4,7 +4,8 @@ local exchange (GATHER, SINGLE, [])
             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                        scan customer
+                        dynamic filter (["c_current_addr_sk", "c_customer_sk"])
+                            scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ca_address_sk_11"])
                             scan customer_address
@@ -18,7 +19,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q47.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q47.plan.txt
index 2d63bde52f55..deca457a85b4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q47.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q47.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan store
+                                                        dynamic filter (["s_company_name", "s_company_name", "s_store_name", "s_store_name"])
+                                                            scan store
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                        scan item
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["i_brand_14", "i_category_18", "s_company_name_102", "s_store_name_90"])
                         final aggregation over (d_moy_63, d_year_61, i_brand_14, i_category_18, s_company_name_102, s_store_name_90)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_32", "ss_sold_date_sk_30", "ss_store_sk_37"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan store
+                                                        dynamic filter (["s_company_name_102", "s_store_name_90"])
+                                                            scan store
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand_14", "i_category_18"])
+                                                        scan item
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_brand_133", "i_category_137", "s_company_name_221", "s_store_name_209"])
                     final aggregation over (d_moy_182, d_year_180, i_brand_133, i_category_137, s_company_name_221, s_store_name_209)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk_151", "ss_sold_date_sk_149", "ss_store_sk_156"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q48.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q48.plan.txt
index 7eb552bd09e3..bf1527240cfe 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q48.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q48.plan.txt
@@ -8,7 +8,8 @@ final aggregation over ()
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q49.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q49.plan.txt
index 6f687392953d..e3a416cd5356 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q49.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q49.plan.txt
@@ -12,11 +12,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (wr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                        scan web_returns
+                                                        dynamic filter (["wr_item_sk", "wr_order_number"])
+                                                            scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_sold_date_sk"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -30,11 +32,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (cr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                        scan catalog_returns
+                                                        dynamic filter (["cr_item_sk", "cr_order_number"])
+                                                            scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan catalog_sales
+                                                                dynamic filter (["cs_sold_date_sk"])
+                                                                    scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -48,11 +52,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (sr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                        scan store_returns
+                                                        dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                                            scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q50.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q50.plan.txt
index c2a9d481bf10..8ff8d8dbfebf 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q50.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q50.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                            scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                             join (INNER, REPLICATED):
-                                                scan store_returns
+                                                dynamic filter (["sr_returned_date_sk"])
+                                                    scan store_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q51.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q51.plan.txt
index 6a1ca8bd4aca..32fa4cc52c6c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q51.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q51.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 partial aggregation over (d_date, ws_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                 partial aggregation over (d_date_7, ss_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q52.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q52.plan.txt
index 33752e693e6c..79ab5d5f2dc7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q52.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q52.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q53.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q53.plan.txt
index cd10ab3698e6..799e43e0eca0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q53.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q53.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q54.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q54.plan.txt
index f5c3ef3b83c8..851fa255cf39 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q54.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q54.plan.txt
@@ -8,17 +8,19 @@ local exchange (GATHER, SINGLE, [])
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                     partial aggregation over (ss_customer_sk)
-                                        cross join:
-                                            cross join:
+                                        join (LEFT, REPLICATED):
+                                            join (LEFT, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk", "ca_county", "ca_state"])
+                                                                                scan customer_address
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan store
@@ -27,14 +29,17 @@ local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 partial aggregation over (c_current_addr_sk, c_customer_sk)
                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                        scan customer
+                                                                                        dynamic filter (["c_customer_sk"])
+                                                                                            scan customer
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                 join (INNER, REPLICATED, can skip output duplicates):
                                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                                        remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                                                                            scan catalog_sales
-                                                                                                            scan web_sales
+                                                                                                        local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                                                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                                scan catalog_sales
+                                                                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                                scan web_sales
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q55.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q55.plan.txt
index 0322599f01e5..72d129c6fab1 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q55.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q55.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q56.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q56.plan.txt
index e96c8c31aabb..34ac61dc445c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q56.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q56.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_6"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_10)
@@ -36,7 +38,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_83"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_109)
@@ -62,7 +66,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -72,7 +77,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_184"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_210)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q57.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q57.plan.txt
index 26f16c8477dc..0605ac8bfdc2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q57.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q57.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan call_center
+                                                        dynamic filter (["cc_name", "cc_name"])
+                                                            scan call_center
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                        scan item
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["cc_name_102", "i_brand_14", "i_category_18"])
                         final aggregation over (cc_name_102, d_moy_74, d_year_72, i_brand_14, i_category_18)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk_41", "cs_item_sk_45", "cs_sold_date_sk_30"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan call_center
+                                                        dynamic filter (["cc_name_102"])
+                                                            scan call_center
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand_14", "i_category_18"])
+                                                        scan item
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["cc_name_232", "i_brand_144", "i_category_148"])
                     final aggregation over (cc_name_232, d_moy_204, d_year_202, i_brand_144, i_category_148)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_call_center_sk_171", "cs_item_sk_175", "cs_sold_date_sk_160"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q58.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q58.plan.txt
index 192c6d359edd..4d29a46b942a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q58.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q58.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan date_dim
+                                                    dynamic filter (["d_date"])
+                                                        scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (d_date_6)
@@ -20,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["d_date_6"])
                                                                         partial aggregation over (d_date_6)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_8"])
+                                                                                    scan date_dim
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         local exchange (GATHER, SINGLE, [])
@@ -28,7 +31,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 scan date_dim
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                        scan item
+                                        dynamic filter (["i_item_id"])
+                                            scan item
             join (INNER, PARTITIONED):
                 final aggregation over (i_item_id_69)
                     local exchange (GATHER, SINGLE, [])
@@ -37,11 +41,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_94"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_126)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_126"])
                                                                             partial aggregation over (d_date_126)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_128"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             local exchange (GATHER, SINGLE, [])
@@ -57,7 +64,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_68"])
-                                            scan item
+                                            dynamic filter (["i_item_id_69"])
+                                                scan item
                 final aggregation over (i_item_id_191)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["i_item_id_191"])
@@ -65,11 +73,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_216"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_248)
@@ -77,7 +87,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_248"])
                                                                             partial aggregation over (d_date_248)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_250"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             local exchange (GATHER, SINGLE, [])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q59.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q59.plan.txt
index ae30fe8f578e..933affe1eb9a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q59.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q59.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["d_day_name", "d_week_seq", "ss_store_sk"])
                                         partial aggregation over (d_day_name, d_week_seq, ss_store_sk)
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq"])
+                                                            scan date_dim
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["expr_203", "s_store_sk"])
                     join (INNER, PARTITIONED):
@@ -29,10 +31,12 @@ local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["d_day_name_85", "d_week_seq_75", "ss_store_sk_53"])
                                                                 partial aggregation over (d_day_name_85, d_week_seq_75, ss_store_sk_53)
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_sales
+                                                                        dynamic filter (["ss_sold_date_sk_46", "ss_store_sk_53"])
+                                                                            scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_75"])
+                                                                                    scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -43,7 +47,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["s_store_sk_117"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["s_store_id"])
-                                        scan store
+                                        dynamic filter (["s_store_id"])
+                                            scan store
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["s_store_id_118"])
                                             scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q60.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q60.plan.txt
index 4616b0ad95b6..cd5904cf7598 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q60.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q60.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -21,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["i_item_id_6"])
-                                                        scan item
+                                                        dynamic filter (["i_item_id_6"])
+                                                            scan item
                                                     final aggregation over (i_item_id_10)
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["i_item_id_10"])
@@ -35,7 +37,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["i_item_id_83"])
-                                                        scan item
+                                                        dynamic filter (["i_item_id_83"])
+                                                            scan item
                                                     final aggregation over (i_item_id_109)
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["i_item_id_109"])
@@ -60,7 +64,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -71,7 +76,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["i_item_id_184"])
-                                                        scan item
+                                                        dynamic filter (["i_item_id_184"])
+                                                            scan item
                                                     final aggregation over (i_item_id_210)
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["i_item_id_210"])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q61.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q61.plan.txt
index f5183d67d01e..e5538ffe3d08 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q61.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q61.plan.txt
@@ -9,7 +9,8 @@ cross join:
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -22,7 +23,8 @@ cross join:
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                     join (INNER, REPLICATED):
-                                        scan customer
+                                        dynamic filter (["c_current_addr_sk"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_address
@@ -38,7 +40,8 @@ cross join:
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk_15", "ss_item_sk_14", "ss_sold_date_sk_12", "ss_store_sk_19"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -51,7 +54,8 @@ cross join:
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_sk_98"])
                                 join (INNER, REPLICATED):
-                                    scan customer
+                                    dynamic filter (["c_current_addr_sk_102"])
+                                        scan customer
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q62.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q62.plan.txt
index 90f04a71a65b..1c3444200bc5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q62.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q62.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_ship_date_sk", "ws_ship_mode_sk", "ws_warehouse_sk", "ws_web_site_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q63.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q63.plan.txt
index 23e28eddc4b7..da2cbd549a64 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q63.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q63.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q64.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q64.plan.txt
index b3b3aa65cb46..a21f273ac8d8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q64.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q64.plan.txt
@@ -8,11 +8,13 @@ remote exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_city", "ca_city_105", "ca_street_name", "ca_street_name_102", "ca_street_number", "ca_street_number_101", "ca_zip", "ca_zip_108", "d_year", "d_year_15", "d_year_45", "i_product_name", "s_store_name", "s_zip", "ss_item_sk"])
                                 partial aggregation over (ca_city, ca_city_105, ca_street_name, ca_street_name_102, ca_street_number, ca_street_number_101, ca_zip, ca_zip_108, d_year, d_year_15, d_year_45, i_product_name, s_store_name, s_zip, ss_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan customer_address
+                                        dynamic filter (["ca_address_sk_99"])
+                                            scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
@@ -20,7 +22,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                     join (INNER, REPLICATED):
                                                                         join (INNER, PARTITIONED):
                                                                             remote exchange (REPARTITION, HASH, ["cd_demo_sk_75"])
-                                                                                scan customer_demographics
+                                                                                dynamic filter (["cd_demo_sk_75"])
+                                                                                    scan customer_demographics
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                                                     join (INNER, REPLICATED):
@@ -33,13 +36,15 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                 join (INNER, PARTITIONED):
                                                                                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                                                                                         join (INNER, REPLICATED):
-                                                                                                                            scan store_sales
+                                                                                                                            dynamic filter (["ss_cdemo_sk", "ss_customer_sk", "ss_hdemo_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                                                                                scan store_sales
                                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                     scan date_dim
                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                         remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                                                                            scan store_returns
+                                                                                                                            dynamic filter (["sr_item_sk", "sr_item_sk", "sr_item_sk"])
+                                                                                                                                scan store_returns
                                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                         final aggregation over (cs_item_sk)
@@ -48,15 +53,18 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                                     partial aggregation over (cs_item_sk)
                                                                                                                                         join (INNER, PARTITIONED):
                                                                                                                                             remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                                                                                                scan catalog_sales
+                                                                                                                                                dynamic filter (["cs_item_sk", "cs_item_sk", "cs_item_sk", "cs_order_number"])
+                                                                                                                                                    scan catalog_sales
                                                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                                                 remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                                                                                                    scan catalog_returns
+                                                                                                                                                    dynamic filter (["cr_item_sk", "cr_item_sk"])
+                                                                                                                                                        scan catalog_returns
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                                                                 join (INNER, REPLICATED):
                                                                                                                     join (INNER, REPLICATED):
-                                                                                                                        scan customer
+                                                                                                                        dynamic filter (["c_current_hdemo_sk", "c_first_sales_date_sk", "c_first_shipto_date_sk"])
+                                                                                                                            scan customer
                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                 scan date_dim
@@ -68,24 +76,28 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                         scan customer_demographics
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                    scan store
+                                                                                                    dynamic filter (["s_store_name", "s_zip"])
+                                                                                                        scan store
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                scan item
+                                                                                                dynamic filter (["i_item_sk"])
+                                                                                                    scan item
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan promotion
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk"])
+                                                                                    scan household_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan income_band
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, REPLICATED):
-                                                                            scan household_demographics
+                                                                            dynamic filter (["hd_income_band_sk_91"])
+                                                                                scan household_demographics
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan income_band
@@ -96,11 +108,13 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_city_452", "ca_city_467", "ca_street_name_449", "ca_street_name_464", "ca_street_number_448", "ca_street_number_463", "ca_zip_455", "ca_zip_470", "d_year_254", "d_year_284", "d_year_314", "i_product_name_507", "s_store_name_343", "s_zip_363", "ss_item_sk_134"])
                                     partial aggregation over (ca_city_452, ca_city_467, ca_street_name_449, ca_street_name_464, ca_street_number_448, ca_street_number_463, ca_zip_455, ca_zip_470, d_year_254, d_year_284, d_year_314, i_product_name_507, s_store_name_343, s_zip_363, ss_item_sk_134)
                                         join (INNER, REPLICATED):
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk_461"])
+                                                scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan customer_address
+                                                        dynamic filter (["ca_address_sk_446"])
+                                                            scan customer_address
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
@@ -108,7 +122,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                         join (INNER, REPLICATED):
                                                                             join (INNER, PARTITIONED):
                                                                                 remote exchange (REPARTITION, HASH, ["cd_demo_sk_400"])
-                                                                                    scan customer_demographics
+                                                                                    dynamic filter (["cd_demo_sk_400"])
+                                                                                        scan customer_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk_371"])
                                                                                         join (INNER, REPLICATED):
@@ -121,13 +136,15 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                     join (INNER, PARTITIONED):
                                                                                                                         remote exchange (REPARTITION, HASH, ["ss_item_sk_134", "ss_ticket_number_141"])
                                                                                                                             join (INNER, REPLICATED):
-                                                                                                                                scan store_sales
+                                                                                                                                dynamic filter (["ss_cdemo_sk_136", "ss_customer_sk_135", "ss_hdemo_sk_137", "ss_item_sk_134", "ss_item_sk_134", "ss_item_sk_134", "ss_promo_sk_140", "ss_sold_date_sk_132", "ss_store_sk_139", "ss_ticket_number_141"])
+                                                                                                                                    scan store_sales
                                                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                         scan date_dim
                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                             remote exchange (REPARTITION, HASH, ["sr_item_sk_159", "sr_ticket_number_166"])
-                                                                                                                                scan store_returns
+                                                                                                                                dynamic filter (["sr_item_sk_159", "sr_item_sk_159"])
+                                                                                                                                    scan store_returns
                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                             final aggregation over (cs_item_sk_194)
@@ -136,15 +153,18 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                                         partial aggregation over (cs_item_sk_194)
                                                                                                                                             join (INNER, PARTITIONED):
                                                                                                                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk_194", "cs_order_number_196"])
-                                                                                                                                                    scan catalog_sales
+                                                                                                                                                    dynamic filter (["cs_item_sk_194", "cs_item_sk_194", "cs_order_number_196"])
+                                                                                                                                                        scan catalog_sales
                                                                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk_217", "cr_order_number_231"])
-                                                                                                                                                        scan catalog_returns
+                                                                                                                                                        dynamic filter (["cr_item_sk_217"])
+                                                                                                                                                            scan catalog_returns
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_369"])
                                                                                                                     join (INNER, REPLICATED):
                                                                                                                         join (INNER, REPLICATED):
-                                                                                                                            scan customer
+                                                                                                                            dynamic filter (["c_current_hdemo_sk_372", "c_first_sales_date_sk_375", "c_first_shipto_date_sk_374"])
+                                                                                                                                scan customer
                                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                     scan date_dim
@@ -166,14 +186,16 @@ remote exchange (GATHER, SINGLE, [])
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 join (INNER, REPLICATED):
-                                                                                    scan household_demographics
+                                                                                    dynamic filter (["hd_income_band_sk_433"])
+                                                                                        scan household_demographics
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             scan income_band
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk_440"])
+                                                                                    scan household_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q65.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q65.plan.txt
index d464032d91fc..869d645686cd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q65.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q65.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_item_sk_8", "ss_store_sk_13"])
                             partial aggregation over (ss_item_sk_8, ss_store_sk_13)
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk_8", "ss_sold_date_sk_6", "ss_store_sk_13"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                     remote exchange (REPLICATE, BROADCAST, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["s_store_sk"])
-                                scan store
+                                dynamic filter (["s_store_sk"])
+                                    scan store
                             final aggregation over (ss_store_sk)
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_store_sk"])
@@ -25,7 +27,8 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_store_sk"])
                                                         partial aggregation over (ss_item_sk, ss_store_sk)
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q66.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q66.plan.txt
index b87ae78025f5..ba2954f5d404 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q66.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q66.plan.txt
@@ -15,7 +15,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_ship_mode_sk", "ws_sold_date_sk", "ws_sold_time_sk", "ws_warehouse_sk"])
+                                                                        scan web_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan ship_mode
@@ -41,7 +42,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_ship_mode_sk", "cs_sold_date_sk", "cs_sold_time_sk", "cs_warehouse_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan ship_mode
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q67.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q67.plan.txt
index 60f46f2fcf90..66c2001151d6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q67.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q67.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q68.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q68.plan.txt
index 5feab810ee06..198e4327c76a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q68.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q68.plan.txt
@@ -4,7 +4,8 @@ local exchange (GATHER, SINGLE, [])
             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                        scan customer
+                        dynamic filter (["c_current_addr_sk", "c_customer_sk"])
+                            scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                             final aggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number)
@@ -12,13 +13,15 @@ local exchange (GATHER, SINGLE, [])
                                     partial aggregation over (ca_address_sk, ca_city, ss_customer_sk, ss_ticket_number)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                scan customer_address
+                                                dynamic filter (["ca_address_sk"])
+                                                    scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q69.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q69.plan.txt
index 4b87cab3294e..1ed946056199 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q69.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q69.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (LEFT, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                     join (INNER, REPLICATED):
-                                        scan customer_demographics
+                                        dynamic filter (["cd_demo_sk"])
+                                            scan customer_demographics
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, PARTITIONED):
@@ -17,14 +18,16 @@ local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                 partial aggregation over (ss_customer_sk)
                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                        scan store_sales
+                                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                            scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                             join (INNER, REPLICATED):
-                                                                scan customer
+                                                                dynamic filter (["c_current_addr_sk"])
+                                                                    scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan customer_address
@@ -33,7 +36,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -42,7 +46,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q70.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q70.plan.txt
index 0ba93430749a..9ed44d6f32bd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q70.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q70.plan.txt
@@ -10,13 +10,15 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["s_state"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan store
+                                                    dynamic filter (["s_state"])
+                                                        scan store
                                     single aggregation over (s_state_53)
                                         final aggregation over (s_state_53)
                                             local exchange (GATHER, SINGLE, [])
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                                     partial aggregation over (s_state_53)
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk_4", "ss_store_sk_11"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q71.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q71.plan.txt
index 599dd0ab9f9c..f5d3c7ec8a7e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q71.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q71.plan.txt
@@ -7,19 +7,22 @@ remote exchange (GATHER, SINGLE, [])
                         partial aggregation over (i_brand, i_brand_id, t_hour, t_minute)
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
+                                    local exchange (REPARTITION, ROUND_ROBIN, [])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk", "ws_sold_time_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_sold_time_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_sold_time_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q72.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q72.plan.txt
index 9c47f45ae5a1..cc812789f826 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q72.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q72.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["inv_item_sk"])
                                             join (INNER, REPLICATED):
-                                                scan inventory
+                                                dynamic filter (["inv_date_sk", "inv_item_sk", "inv_quantity_on_hand", "inv_warehouse_sk"])
+                                                    scan inventory
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq_16"])
+                                                            scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
@@ -21,7 +23,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_bill_cdemo_sk", "cs_bill_hdemo_sk", "cs_item_sk", "cs_ship_date_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan household_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q73.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q73.plan.txt
index 8a3c9f5087e6..0ceb0cf526e0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q73.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q73.plan.txt
@@ -3,7 +3,8 @@ remote exchange (GATHER, SINGLE, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, PARTITIONED):
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                    scan customer
+                    dynamic filter (["c_customer_sk"])
+                        scan customer
                 final aggregation over (ss_customer_sk, ss_ticket_number)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
@@ -11,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q74.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q74.plan.txt
index e05771f18836..c8c3d330e7cb 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q74.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q74.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_91"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_91", "ss_sold_date_sk_88"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_68"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_69", "c_customer_id_69"])
+                                                scan customer
                 final aggregation over (c_customer_id_329, c_first_name_336, c_last_name_337, d_year_390)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_329"])
@@ -23,13 +25,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_352"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_352", "ws_sold_date_sk_348"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_328"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_329"])
+                                                scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_customer_id, c_first_name, c_last_name, d_year)
                     local exchange (GATHER, SINGLE, [])
@@ -38,13 +42,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id"])
+                                                scan customer
                 final aggregation over (c_customer_id_508, c_first_name_515, c_last_name_516, d_year_569)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_508"])
@@ -52,7 +58,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_531"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_531", "ws_sold_date_sk_527"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q75.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q75.plan.txt
index fef6864e7254..0513d29cbb4c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q75.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q75.plan.txt
@@ -8,15 +8,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_13, expr, expr_18, i_brand_id_7, i_category_id_9, i_class_id_8, i_manufact_id_10)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                        scan catalog_returns
+                                        dynamic filter (["cr_item_sk", "cr_order_number"])
+                                            scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_7", "i_category_id_9", "i_class_id_8", "i_manufact_id_10"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -24,15 +27,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_51, expr_77, expr_78, i_brand_id_28, i_category_id_32, i_class_id_30, i_manufact_id_34)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                            scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_28", "i_category_id_32", "i_class_id_30", "i_manufact_id_34"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -40,15 +46,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_111, expr_137, expr_138, i_brand_id_88, i_category_id_92, i_class_id_90, i_manufact_id_94)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                        scan web_returns
+                                        dynamic filter (["wr_item_sk", "wr_order_number"])
+                                            scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_88", "i_category_id_92", "i_class_id_90", "i_manufact_id_94"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -59,12 +68,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_221, expr_274, expr_275, i_brand_id_198, i_category_id_202, i_class_id_200, i_manufact_id_204)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk_247", "cr_order_number_261"])
-                                        scan catalog_returns
+                                        dynamic filter (["cr_item_sk_247", "cr_order_number_261"])
+                                            scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk_170", "cs_order_number_172"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_item_sk_170", "cs_sold_date_sk_155"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
@@ -75,12 +86,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_331, expr_377, expr_378, i_brand_id_308, i_category_id_312, i_class_id_310, i_manufact_id_314)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_357", "sr_ticket_number_364"])
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk_357", "sr_ticket_number_364"])
+                                            scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk_278", "ss_ticket_number_285"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_278", "ss_sold_date_sk_276"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
@@ -91,12 +104,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_445, expr_495, expr_496, i_brand_id_422, i_category_id_426, i_class_id_424, i_manufact_id_428)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk_471", "wr_order_number_482"])
-                                        scan web_returns
+                                        dynamic filter (["wr_item_sk_471", "wr_order_number_482"])
+                                            scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk_382", "ws_order_number_396"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_item_sk_382", "ws_sold_date_sk_379"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q76.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q76.plan.txt
index 96f6228260dc..f9599e0446e5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q76.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q76.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_10, d_year_9, expr_134, expr_135, i_category_6)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
@@ -17,12 +18,14 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_51, d_year_47, expr_140, expr_141, i_category_29)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk_17"])
-                                scan item
+                                dynamic filter (["i_item_sk_17"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_sold_date_sk"])
-                                            scan web_sales
+                                            dynamic filter (["ws_sold_date_sk"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["d_date_sk_41"])
                                                 scan date_dim
@@ -31,7 +34,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                 join (INNER, REPLICATED):
-                                    scan catalog_sales
+                                    dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                        scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q77.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q77.plan.txt
index f5f8b7b62eea..b632624a3d15 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q77.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q77.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ss_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -25,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (sr_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_returns
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -38,7 +40,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_call_center_sk"])
                                             partial aggregation over (cs_call_center_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -49,7 +52,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["cr_call_center_sk"])
                                                     partial aggregation over (cr_call_center_sk)
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_returns
+                                                            dynamic filter (["cr_returned_date_sk"])
+                                                                scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -60,7 +64,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ws_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_page_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -73,7 +78,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (wr_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_returns
+                                                        dynamic filter (["wr_returned_date_sk", "wr_web_page_sk"])
+                                                            scan web_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q78.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q78.plan.txt
index e9a4bce6caf7..a13222cb0024 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q78.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q78.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk", "ss_customer_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                    scan store_returns
+                                                    dynamic filter (["sr_item_sk"])
+                                                        scan store_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
                                                     scan web_returns
@@ -38,7 +41,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (LEFT, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                        scan catalog_sales
+                                        dynamic filter (["cs_sold_date_sk"])
+                                            scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
                                             scan catalog_returns
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q79.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q79.plan.txt
index c41171325a3c..733be6f6e8b7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q79.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q79.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q80.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q80.plan.txt
index a4b2da9fdab0..61944a8d3ab3 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q80.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q80.plan.txt
@@ -15,10 +15,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                        scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_item_sk"])
+                                                                            scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -41,10 +43,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_catalog_page_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                        scan catalog_returns
+                                                                        dynamic filter (["cr_item_sk"])
+                                                                            scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -67,10 +71,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_item_sk", "ws_promo_sk", "ws_sold_date_sk", "ws_web_site_sk"])
+                                                                        scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_item_sk"])
+                                                                            scan web_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q81.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q81.plan.txt
index 9e0a80faf301..eef4fb7f8e93 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q81.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q81.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_returns
+                                                dynamic filter (["cr_returned_date_sk", "cr_returning_addr_sk", "cr_returning_customer_sk"])
+                                                    scan catalog_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                             join (INNER, REPLICATED):
-                                scan customer
+                                dynamic filter (["c_current_addr_sk"])
+                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
@@ -37,7 +39,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk_31"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_returns
+                                                                    dynamic filter (["cr_returned_date_sk_21", "cr_returning_addr_sk_31"])
+                                                                        scan catalog_returns
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q82.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q82.plan.txt
index 532952036fc3..d3b691e03fe2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q82.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q82.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"])
                     partial aggregation over (i_current_price, i_item_desc, i_item_id)
                         join (INNER, REPLICATED, can skip output duplicates):
-                            scan store_sales
+                            dynamic filter (["ss_item_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED, can skip output duplicates):
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan inventory
+                                            dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                                scan inventory
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q83.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q83.plan.txt
index d5992a1244c4..9c4f78a6d332 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q83.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q83.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["sr_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk", "sr_returned_date_sk"])
+                                            scan store_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan date_dim
+                                                    dynamic filter (["d_date"])
+                                                        scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (d_date_6)
@@ -20,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["d_date_6"])
                                                                         partial aggregation over (d_date_6)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_8"])
+                                                                                    scan date_dim
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         final aggregation over (d_week_seq_40)
@@ -30,7 +33,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                         scan date_dim
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                        scan item
+                                        dynamic filter (["i_item_id"])
+                                            scan item
             join (INNER, PARTITIONED):
                 final aggregation over (i_item_id_74)
                     local exchange (GATHER, SINGLE, [])
@@ -39,11 +43,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_returns
+                                            dynamic filter (["cr_item_sk", "cr_returned_date_sk"])
+                                                scan catalog_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_99"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_131)
@@ -51,7 +57,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_131"])
                                                                             partial aggregation over (d_date_131)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_133"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             final aggregation over (d_week_seq_165)
@@ -61,22 +68,26 @@ local exchange (GATHER, SINGLE, [])
                                                                                                             scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_73"])
-                                            scan item
+                                            dynamic filter (["i_item_id_74"])
+                                                scan item
                 final aggregation over (i_item_id_201)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["i_item_id_201"])
                             partial aggregation over (i_item_id_201)
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["i_item_sk_200"])
-                                        scan item
+                                        dynamic filter (["i_item_sk_200"])
+                                            scan item
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["wr_item_sk"])
                                             join (INNER, REPLICATED):
-                                                scan web_returns
+                                                dynamic filter (["wr_returned_date_sk"])
+                                                    scan web_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan date_dim
+                                                            dynamic filter (["d_date_226"])
+                                                                scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (d_date_258)
@@ -84,7 +95,8 @@ local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["d_date_258"])
                                                                                 partial aggregation over (d_date_258)
                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                        scan date_dim
+                                                                                        dynamic filter (["d_week_seq_260"])
+                                                                                            scan date_dim
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                 final aggregation over (d_week_seq_292)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q84.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q84.plan.txt
index ec22af2c6a55..b1402e98e5ab 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q84.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q84.plan.txt
@@ -1,23 +1,27 @@
 local exchange (GATHER, SINGLE, [])
     remote exchange (GATHER, SINGLE, [])
         join (INNER, REPLICATED):
-            scan store_returns
+            dynamic filter (["sr_cdemo_sk"])
+                scan store_returns
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPLICATE, BROADCAST, [])
                     join (INNER, REPLICATED):
-                        scan customer_demographics
+                        dynamic filter (["cd_demo_sk"])
+                            scan customer_demographics
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPLICATE, BROADCAST, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan customer
+                                        dynamic filter (["c_current_addr_sk", "c_current_hdemo_sk"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_address
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan household_demographics
+                                                dynamic filter (["hd_income_band_sk"])
+                                                    scan household_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q85.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q85.plan.txt
index 2a72b1dbbed5..eedf6f3329c2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q85.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q85.plan.txt
@@ -6,13 +6,15 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (r_reason_desc)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan customer_address
+                                dynamic filter (["ca_address_sk"])
+                                    scan customer_address
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["cd_demo_sk_6", "cd_education_status_9", "cd_marital_status_8"])
-                                                    scan customer_demographics
+                                                    dynamic filter (["cd_demo_sk_6", "cd_education_status_9", "cd_marital_status_8"])
+                                                        scan customer_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["cd_education_status", "cd_marital_status", "wr_returning_cdemo_sk"])
                                                         join (INNER, PARTITIONED):
@@ -20,13 +22,15 @@ local exchange (GATHER, SINGLE, [])
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan web_sales
+                                                                            dynamic filter (["ws_item_sk", "ws_order_number", "ws_sold_date_sk", "ws_web_page_sk"])
+                                                                                scan web_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                            scan web_returns
+                                                                            dynamic filter (["wr_reason_sk", "wr_refunded_cdemo_sk"])
+                                                                                scan web_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["cd_demo_sk"])
                                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q86.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q86.plan.txt
index cca927926827..38fdc67f5412 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q86.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q86.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (groupid, i_category$gid, i_class$gid)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q87.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q87.plan.txt
index 9f02b3c87024..b342ddb2e44f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q87.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q87.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -27,7 +28,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -42,7 +44,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q88.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q88.plan.txt
index 6e297c60e201..123c3d12c59d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q88.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q88.plan.txt
@@ -12,7 +12,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan time_dim
@@ -29,7 +30,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk_11", "ss_sold_time_sk_7", "ss_store_sk_13"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan time_dim
@@ -46,7 +48,8 @@ cross join:
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_hdemo_sk_87", "ss_sold_time_sk_83", "ss_store_sk_89"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan time_dim
@@ -63,7 +66,8 @@ cross join:
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_hdemo_sk_163", "ss_sold_time_sk_159", "ss_store_sk_165"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan time_dim
@@ -80,7 +84,8 @@ cross join:
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk_239", "ss_sold_time_sk_235", "ss_store_sk_241"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan time_dim
@@ -97,7 +102,8 @@ cross join:
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_hdemo_sk_315", "ss_sold_time_sk_311", "ss_store_sk_317"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan time_dim
@@ -114,7 +120,8 @@ cross join:
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_hdemo_sk_391", "ss_sold_time_sk_387", "ss_store_sk_393"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan time_dim
@@ -131,7 +138,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_hdemo_sk_467", "ss_sold_time_sk_463", "ss_store_sk_469"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan time_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q89.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q89.plan.txt
index 396d705bbc38..221dfc17c333 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q89.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q89.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q90.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q90.plan.txt
index 0ddf21aa574d..0645101dc4e6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q90.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q90.plan.txt
@@ -6,7 +6,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk", "ws_sold_time_sk", "ws_web_page_sk"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan web_page
@@ -23,7 +24,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk_16", "ws_sold_time_sk_7", "ws_web_page_sk_18"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan web_page
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q91.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q91.plan.txt
index 750e4be2dcb9..cae49eea1e14 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q91.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q91.plan.txt
@@ -9,7 +9,8 @@ remote exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cr_returning_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_returns
+                                            dynamic filter (["cr_call_center_sk", "cr_returned_date_sk", "cr_returning_customer_sk"])
+                                                scan catalog_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -20,7 +21,8 @@ remote exchange (GATHER, SINGLE, [])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                             join (INNER, REPLICATED):
-                                                                scan customer
+                                                                dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_current_hdemo_sk"])
+                                                                    scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan household_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q92.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q92.plan.txt
index 55eb5a4a778f..f88e053a3194 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q92.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q92.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk_7"])
                                     partial aggregation over (ws_item_sk_7)
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk_7", "ws_sold_date_sk_4"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q93.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q93.plan.txt
index ca9dc7543db7..e1cd897adff9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q93.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q93.plan.txt
@@ -7,10 +7,12 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk", "ss_ticket_number"])
+                                        scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_reason_sk"])
+                                            scan store_returns
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan reason
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q94.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q94.plan.txt
index a868321dbc78..9ec98f244d16 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q94.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q94.plan.txt
@@ -8,19 +8,22 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["wr_order_number"])
                                     partial aggregation over (wr_order_number)
-                                        scan web_returns
+                                        dynamic filter (["wr_order_number"])
+                                            scan web_returns
                         final aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number_23, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_order_number_23"])
                                     partial aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number_23, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk)
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_23"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q95.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q95.plan.txt
index aaf3edd0ed42..108f553caff7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q95.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q95.plan.txt
@@ -9,29 +9,35 @@ final aggregation over ()
                                 join (INNER, PARTITIONED, can skip output duplicates):
                                     join (INNER, PARTITIONED, can skip output duplicates):
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_101"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_101", "ws_order_number_101", "ws_order_number_101"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["wr_order_number"])
-                                                scan web_returns
+                                                dynamic filter (["wr_order_number", "wr_order_number"])
+                                                    scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_137"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_137"])
+                                                scan web_sales
                     join (INNER, PARTITIONED):
                         final aggregation over (ws_order_number_23)
                             local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (ws_order_number_23)
                                     join (INNER, PARTITIONED, can skip output duplicates):
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_23"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_23", "ws_order_number_23"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_order_number_59"])
-                                                scan web_sales
+                                                dynamic filter (["ws_order_number_59"])
+                                                    scan web_sales
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_order_number"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q96.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q96.plan.txt
index 6ac294895946..e4fdf4d14611 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q96.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q96.plan.txt
@@ -5,7 +5,8 @@ final aggregation over ()
                 join (INNER, REPLICATED):
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
-                            scan store_sales
+                            dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan time_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q97.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q97.plan.txt
index 7b9c83293534..959bbfe9de73 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q97.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q97.plan.txt
@@ -8,7 +8,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"])
                                 partial aggregation over (ss_customer_sk, ss_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"])
                                 partial aggregation over (cs_bill_customer_sk, cs_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q98.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q98.plan.txt
index 9775b6c511f5..7c0caca03f27 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q98.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q98.plan.txt
@@ -9,7 +9,8 @@ remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q99.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q99.plan.txt
index 7f8838ac985a..87cec8152a11 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q99.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/orc/unpartitioned/q99.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_call_center_sk", "cs_ship_date_sk", "cs_ship_mode_sk", "cs_warehouse_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q01.plan.txt
index d091b5f71d8b..9f5479141165 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q01.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q01.plan.txt
@@ -4,7 +4,8 @@ local exchange (GATHER, SINGLE, [])
             join (LEFT, REPLICATED):
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                        scan customer
+                        dynamic filter (["c_customer_sk"])
+                            scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["sr_customer_sk"])
                             join (INNER, REPLICATED):
@@ -13,7 +14,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_store_sk"])
                                             partial aggregation over (sr_customer_sk, sr_store_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan store_returns
+                                                    dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                        scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -31,7 +33,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk_8", "sr_store_sk_12"])
                                                     partial aggregation over (sr_customer_sk_8, sr_store_sk_12)
                                                         join (INNER, REPLICATED):
-                                                            scan store_returns
+                                                            dynamic filter (["sr_returned_date_sk_25"])
+                                                                scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q02.plan.txt
index ebb55d3dc0a5..2e122b9b4261 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q02.plan.txt
@@ -9,15 +9,19 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq"])
                                     partial aggregation over (d_day_name, d_week_seq)
                                         join (INNER, REPLICATED):
-                                            remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                scan web_sales
-                                                scan catalog_sales
+                                            local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                dynamic filter (["ws_sold_date_sk"])
+                                                    scan web_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan date_dim
+                                                    dynamic filter (["d_week_seq", "d_week_seq"])
+                                                        scan date_dim
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["d_week_seq_20"])
-                            scan date_dim
+                            dynamic filter (["d_week_seq_20"])
+                                scan date_dim
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["expr_219"])
                         join (INNER, PARTITIONED):
@@ -27,12 +31,15 @@ remote exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["d_week_seq_124"])
                                             partial aggregation over (d_day_name_134, d_week_seq_124)
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
-                                                        scan catalog_sales
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ws_sold_date_sk_81"])
+                                                            scan web_sales
+                                                        dynamic filter (["cs_sold_date_sk_117"])
+                                                            scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan date_dim
+                                                            dynamic filter (["d_week_seq_124"])
+                                                                scan date_dim
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq_169"])
                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q03.plan.txt
index 70aae3fa1bdd..ede6415850e5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q03.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q04.plan.txt
index 7a475db42e6d..10ebe8629d94 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q04.plan.txt
@@ -10,13 +10,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_869"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk_869", "cs_sold_date_sk_900"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_847"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_848", "c_customer_id_848", "c_customer_id_848"])
+                                                    scan customer
                     final aggregation over (c_birth_country_1558, c_customer_id_1545, c_email_address_1560, c_first_name_1552, c_last_name_1553, c_login_1559, c_preferred_cust_flag_1554, d_year_1606)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_id_1545"])
@@ -24,13 +26,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1567"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_1567", "ws_sold_date_sk_1597"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_1544"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_1545", "c_customer_id_1545"])
+                                                    scan customer
                 join (INNER, PARTITIONED):
                     final aggregation over (c_birth_country_561, c_customer_id_548, c_email_address_563, c_first_name_555, c_last_name_556, c_login_562, c_preferred_cust_flag_557, d_year_609)
                         local exchange (GATHER, SINGLE, [])
@@ -39,13 +43,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_569"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk_569", "cs_sold_date_sk_600"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_547"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_548", "c_customer_id_548"])
+                                                    scan customer
                     final aggregation over (c_birth_country_1258, c_customer_id_1245, c_email_address_1260, c_first_name_1252, c_last_name_1253, c_login_1259, c_preferred_cust_flag_1254, d_year_1306)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_id_1245"])
@@ -53,13 +59,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1267"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_1267", "ws_sold_date_sk_1297"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_1244"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_1245"])
+                                                    scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_birth_country_175, c_customer_id_162, c_email_address_177, c_first_name_169, c_last_name_170, c_login_176, c_preferred_cust_flag_171, d_year_212)
                     local exchange (GATHER, SINGLE, [])
@@ -68,13 +76,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_183"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_183", "ss_sold_date_sk_203"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_161"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_162"])
+                                                scan customer
                 final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id"])
@@ -82,7 +92,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q05.plan.txt
index 169f66124bda..b2230c61d3bf 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q05.plan.txt
@@ -11,9 +11,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (s_store_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan store_sales
-                                                        scan store_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -26,9 +28,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (cp_catalog_page_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan catalog_sales
-                                                        scan catalog_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["cs_catalog_page_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
+                                                        dynamic filter (["cr_catalog_page_sk", "cr_returned_date_sk"])
+                                                            scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -42,13 +46,16 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_site_sk"])
+                                                            scan web_sales
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ws_item_sk_81", "ws_order_number_95"])
-                                                                scan web_sales
+                                                                dynamic filter (["ws_item_sk_81", "ws_order_number_95", "ws_web_site_sk_91"])
+                                                                    scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                    scan web_returns
+                                                                    dynamic filter (["wr_returned_date_sk"])
+                                                                        scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q06.plan.txt
index f25b809ee8ef..67d1f35ddb4e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q06.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q06.plan.txt
@@ -10,11 +10,13 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan date_dim
+                                                            dynamic filter (["d_month_seq"])
+                                                                scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     local exchange (GATHER, SINGLE, [])
@@ -28,7 +30,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                        scan customer
+                                                        dynamic filter (["c_current_addr_sk"])
+                                                            scan customer
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q07.plan.txt
index 32f4763b443d..a8da2880635e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q07.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q08.plan.txt
index 45b29afc325b..c8c9a0381d97 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q08.plan.txt
@@ -5,10 +5,11 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["s_store_name"])
                     partial aggregation over (s_store_name)
                         join (INNER, PARTITIONED):
-                            remote exchange (REPARTITION, HASH, ["substr_34"])
+                            remote exchange (REPARTITION, HASH, ["substring"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -16,7 +17,7 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan store
                             local exchange (GATHER, SINGLE, [])
-                                remote exchange (REPARTITION, HASH, ["substr_35"])
+                                remote exchange (REPARTITION, HASH, ["substring_34"])
                                     final aggregation over (ca_zip)
                                         local exchange (REPARTITION, HASH, ["ca_zip"])
                                             remote exchange (REPARTITION, HASH, ["ca_zip_26"])
@@ -30,7 +31,8 @@ local exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over (ca_zip_16)
                                                                     join (INNER, PARTITIONED):
                                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk_7"])
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk_7"])
+                                                                                scan customer_address
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q09.plan.txt
index 4466a2d88feb..cbcd78f04da6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q09.plan.txt
@@ -1,93 +1,122 @@
-cross join:
-    cross join:
-        cross join:
-            cross join:
-                cross join:
-                    cross join:
-                        cross join:
-                            cross join:
-                                cross join:
-                                    cross join:
-                                        cross join:
-                                            cross join:
-                                                cross join:
-                                                    cross join:
-                                                        cross join:
-                                                            final aggregation over ()
-                                                                local exchange (GATHER, SINGLE, [])
-                                                                    remote exchange (GATHER, SINGLE, [])
-                                                                        partial aggregation over ()
-                                                                            scan store_sales
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    scan reason
-                                                        final aggregation over ()
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    partial aggregation over ()
-                                                                        scan store_sales
+join (LEFT, REPLICATED):
+    join (LEFT, REPLICATED):
+        join (LEFT, REPLICATED):
+            join (LEFT, REPLICATED):
+                join (LEFT, REPLICATED):
+                    join (LEFT, REPLICATED):
+                        join (LEFT, REPLICATED):
+                            join (RIGHT, PARTITIONED):
+                                remote exchange (REPARTITION, HASH, [])
+                                    final aggregation over ()
+                                        local exchange (GATHER, SINGLE, [])
+                                            remote exchange (GATHER, SINGLE, [])
+                                                partial aggregation over ()
+                                                    scan store_sales
+                                local exchange (GATHER, SINGLE, [])
+                                    join (RIGHT, PARTITIONED):
+                                        remote exchange (REPARTITION, HASH, [])
+                                            final aggregation over ()
+                                                local exchange (GATHER, SINGLE, [])
+                                                    remote exchange (GATHER, SINGLE, [])
+                                                        partial aggregation over ()
+                                                            scan store_sales
+                                        local exchange (GATHER, SINGLE, [])
+                                            join (RIGHT, PARTITIONED):
+                                                remote exchange (REPARTITION, HASH, [])
                                                     final aggregation over ()
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over ()
                                                                     scan store_sales
-                                                final aggregation over ()
-                                                    local exchange (GATHER, SINGLE, [])
-                                                        remote exchange (GATHER, SINGLE, [])
-                                                            partial aggregation over ()
-                                                                scan store_sales
-                                            final aggregation over ()
                                                 local exchange (GATHER, SINGLE, [])
-                                                    remote exchange (GATHER, SINGLE, [])
-                                                        partial aggregation over ()
-                                                            scan store_sales
-                                        final aggregation over ()
-                                            local exchange (GATHER, SINGLE, [])
-                                                remote exchange (GATHER, SINGLE, [])
-                                                    partial aggregation over ()
-                                                        scan store_sales
+                                                    join (RIGHT, PARTITIONED):
+                                                        remote exchange (REPARTITION, HASH, [])
+                                                            final aggregation over ()
+                                                                local exchange (GATHER, SINGLE, [])
+                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                        partial aggregation over ()
+                                                                            scan store_sales
+                                                        local exchange (GATHER, SINGLE, [])
+                                                            join (RIGHT, PARTITIONED):
+                                                                remote exchange (REPARTITION, HASH, [])
+                                                                    final aggregation over ()
+                                                                        local exchange (GATHER, SINGLE, [])
+                                                                            remote exchange (GATHER, SINGLE, [])
+                                                                                partial aggregation over ()
+                                                                                    scan store_sales
+                                                                local exchange (GATHER, SINGLE, [])
+                                                                    join (RIGHT, PARTITIONED):
+                                                                        remote exchange (REPARTITION, HASH, [])
+                                                                            final aggregation over ()
+                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                                        partial aggregation over ()
+                                                                                            scan store_sales
+                                                                        local exchange (GATHER, SINGLE, [])
+                                                                            join (RIGHT, PARTITIONED):
+                                                                                remote exchange (REPARTITION, HASH, [])
+                                                                                    final aggregation over ()
+                                                                                        local exchange (GATHER, SINGLE, [])
+                                                                                            remote exchange (GATHER, SINGLE, [])
+                                                                                                partial aggregation over ()
+                                                                                                    scan store_sales
+                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                    join (RIGHT, PARTITIONED):
+                                                                                        remote exchange (REPARTITION, HASH, [])
+                                                                                            final aggregation over ()
+                                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                                                        partial aggregation over ()
+                                                                                                            scan store_sales
+                                                                                        local exchange (GATHER, SINGLE, [])
+                                                                                            remote exchange (REPARTITION, HASH, [])
+                                                                                                scan reason
+                            local exchange (GATHER, SINGLE, [])
+                                remote exchange (REPLICATE, BROADCAST, [])
                                     final aggregation over ()
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (GATHER, SINGLE, [])
                                                 partial aggregation over ()
                                                     scan store_sales
+                        local exchange (GATHER, SINGLE, [])
+                            remote exchange (REPLICATE, BROADCAST, [])
                                 final aggregation over ()
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (GATHER, SINGLE, [])
                                             partial aggregation over ()
                                                 scan store_sales
+                    local exchange (GATHER, SINGLE, [])
+                        remote exchange (REPLICATE, BROADCAST, [])
                             final aggregation over ()
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (GATHER, SINGLE, [])
                                         partial aggregation over ()
                                             scan store_sales
+                local exchange (GATHER, SINGLE, [])
+                    remote exchange (REPLICATE, BROADCAST, [])
                         final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         scan store_sales
+            local exchange (GATHER, SINGLE, [])
+                remote exchange (REPLICATE, BROADCAST, [])
                     final aggregation over ()
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over ()
                                     scan store_sales
+        local exchange (GATHER, SINGLE, [])
+            remote exchange (REPLICATE, BROADCAST, [])
                 final aggregation over ()
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (GATHER, SINGLE, [])
                             partial aggregation over ()
                                 scan store_sales
+    local exchange (GATHER, SINGLE, [])
+        remote exchange (REPLICATE, BROADCAST, [])
             final aggregation over ()
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (GATHER, SINGLE, [])
                         partial aggregation over ()
                             scan store_sales
-        final aggregation over ()
-            local exchange (GATHER, SINGLE, [])
-                remote exchange (GATHER, SINGLE, [])
-                    partial aggregation over ()
-                        scan store_sales
-    final aggregation over ()
-        local exchange (GATHER, SINGLE, [])
-            remote exchange (GATHER, SINGLE, [])
-                partial aggregation over ()
-                    scan store_sales
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q10.plan.txt
index 7d60d2a5fdd5..751f1ac52a8c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q10.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_ship_customer_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -21,14 +22,16 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                 partial aggregation over (ws_bill_customer_sk)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                             join (INNER, REPLICATED):
-                                                scan customer_demographics
+                                                dynamic filter (["cd_demo_sk"])
+                                                    scan customer_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
@@ -37,14 +40,16 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                         partial aggregation over (ss_customer_sk)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan store_sales
+                                                                                dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                                    scan store_sales
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan customer
+                                                                        dynamic filter (["c_current_addr_sk"])
+                                                                            scan customer
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q11.plan.txt
index bca78917b94d..41aaf0c91c75 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q11.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_100"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_100", "ss_sold_date_sk_120"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_78"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_79", "c_customer_id_79"])
+                                                scan customer
                 final aggregation over (c_birth_country_371, c_customer_id_358, c_email_address_373, c_first_name_365, c_last_name_366, c_login_372, c_preferred_cust_flag_367, d_year_419)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_358"])
@@ -23,13 +25,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_380"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_380", "ws_sold_date_sk_410"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_357"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_358"])
+                                                scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year)
                     local exchange (GATHER, SINGLE, [])
@@ -38,13 +42,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id"])
+                                                scan customer
                 final aggregation over (c_birth_country_564, c_customer_id_551, c_email_address_566, c_first_name_558, c_last_name_559, c_login_565, c_preferred_cust_flag_560, d_year_612)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_551"])
@@ -52,7 +58,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_573"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_573", "ws_sold_date_sk_603"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q12.plan.txt
index 6f94c98c5224..04b0eb523fd6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q12.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q13.plan.txt
index 011d5b20fbba..8f205090a87c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q13.plan.txt
@@ -7,7 +7,8 @@ final aggregation over ()
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q14.plan.txt
index c8326b25e125..ce5fda5a2106 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q14.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_6, i_category_id_8, i_class_id_7)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -20,21 +21,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_13)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_13"])
                                                                             partial aggregation over (i_item_sk_13)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_20", "i_category_id_24", "i_class_id_22"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_20", "i_category_id_24", "i_class_id_22"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id, category_id, class_id)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_72", "i_category_id_76", "i_class_id_74"])
                                                                                                 partial aggregation over (i_brand_id_72, i_category_id_76, i_class_id_74)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_41", "ss_sold_date_sk_62"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -45,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_128, i_category_id_132, i_class_id_130)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -56,7 +61,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_184, i_category_id_188, i_class_id_186)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -70,19 +76,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_258"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_324"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_390"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -93,7 +102,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_469, i_category_id_473, i_class_id_471)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_item_sk_440", "cs_sold_date_sk_459"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -101,21 +111,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk_462"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk_462"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_518)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_518"])
                                                                             partial aggregation over (i_item_sk_518)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_525", "i_category_id_529", "i_class_id_527"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_525", "i_category_id_529", "i_class_id_527"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id_542, category_id_544, class_id_543)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_580", "i_category_id_584", "i_class_id_582"])
                                                                                                 partial aggregation over (i_brand_id_580, i_category_id_584, i_class_id_582)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_549", "ss_sold_date_sk_570"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -126,7 +139,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_670, i_category_id_674, i_class_id_672)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk_641", "cs_sold_date_sk_660"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -137,7 +151,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_760, i_category_id_764, i_class_id_762)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk_719", "ws_sold_date_sk_750"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -151,19 +166,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_841"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_907"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_973"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -174,7 +192,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_1052, i_category_id_1056, i_class_id_1054)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_item_sk_1011", "ws_sold_date_sk_1042"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -182,21 +201,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk_1045"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk_1045"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_1101)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_1101"])
                                                                             partial aggregation over (i_item_sk_1101)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_1108", "i_category_id_1112", "i_class_id_1110"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_1108", "i_category_id_1112", "i_class_id_1110"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id_1125, category_id_1127, class_id_1126)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_1163", "i_category_id_1167", "i_class_id_1165"])
                                                                                                 partial aggregation over (i_brand_id_1163, i_category_id_1167, i_class_id_1165)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_1132", "ss_sold_date_sk_1153"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -207,7 +229,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_1253, i_category_id_1257, i_class_id_1255)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk_1224", "cs_sold_date_sk_1243"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -218,7 +241,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_1343, i_category_id_1347, i_class_id_1345)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk_1302", "ws_sold_date_sk_1333"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -232,19 +256,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_1424"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_1490"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_1556"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q15.plan.txt
index f359fbefb40f..f6e8849bd9b5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q15.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                 join (INNER, REPLICATED):
-                                    scan catalog_sales
+                                    dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                        scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                            scan customer
+                                            dynamic filter (["c_current_addr_sk"])
+                                                scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q16.plan.txt
index d97b831a9546..4ff3a5713b44 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q16.plan.txt
@@ -8,19 +8,22 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cr_order_number"])
                                     partial aggregation over (cr_order_number)
-                                        scan catalog_returns
+                                        dynamic filter (["cr_order_number"])
+                                            scan catalog_returns
                         final aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number_22, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_order_number_22"])
                                     partial aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number_22, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique)
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_order_number_22"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan catalog_sales
+                                                                dynamic filter (["cs_call_center_sk", "cs_ship_addr_sk", "cs_ship_date_sk"])
+                                                                    scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q17.plan.txt
index 47c73f484403..7082811c8502 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q17.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_item_desc, i_item_id, s_state)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                scan item
+                                dynamic filter (["i_item_sk"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q18.plan.txt
index 3cdca5dac93e..1b9e7c3ebd46 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q18.plan.txt
@@ -10,14 +10,16 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_cdemo_sk", "cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                                        scan customer
+                                                                        dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk"])
+                                                                            scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q19.plan.txt
index 57e559af38d4..c51217a1957f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q19.plan.txt
@@ -6,18 +6,21 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_brand, i_brand_id, i_manufact, i_manufact_id)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                scan customer_address
+                                dynamic filter (["ca_address_sk"])
+                                    scan customer_address
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                scan customer
+                                                dynamic filter (["c_customer_sk"])
+                                                    scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q20.plan.txt
index 852a9d2a3e5c..2e873503ece8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q20.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q21.plan.txt
index 50e40917c430..2ec2a1799207 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q21.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan inventory
+                                    dynamic filter (["inv_date_sk", "inv_item_sk", "inv_warehouse_sk"])
+                                        scan inventory
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q22.plan.txt
index 2fd28d3f31ed..6f1d958f18df 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q22.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["i_brand", "i_product_name"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan inventory
+                                        dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                            scan inventory
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q23.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q23.plan.txt
index 7cbaa1dbba4d..36966192b554 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q23.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q23.plan.txt
@@ -12,17 +12,20 @@ final aggregation over ()
                                             partial aggregation over (d_date_6, ss_item_sk, substr$gid)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_item_sk"])
+                                                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -33,7 +36,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_42)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_42"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_42"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                     scan customer
@@ -49,7 +53,8 @@ final aggregation over ()
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_70"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_70", "ss_sold_date_sk_90"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
@@ -67,17 +72,20 @@ final aggregation over ()
                                             partial aggregation over (d_date_210, ss_item_sk_184, substr$gid_265)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk_184", "ss_item_sk_184", "ss_sold_date_sk_205"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_item_sk_238"])
+                                                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -88,7 +96,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_273)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_273"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_273"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_296"])
                                                     scan customer
@@ -104,7 +113,8 @@ final aggregation over ()
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_321"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_321", "ss_sold_date_sk_341"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q24.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q24.plan.txt
index d4aee5a72c72..48655336cf12 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q24.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q24.plan.txt
@@ -12,21 +12,25 @@ remote exchange (GATHER, SINGLE, [])
                                             partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["ca_zip", "upper"])
-                                                        scan customer_address
+                                                        dynamic filter (["ca_zip"])
+                                                            scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_birth_country", "s_zip"])
                                                             join (INNER, REPLICATED):
-                                                                scan customer
+                                                                dynamic filter (["c_customer_sk"])
+                                                                    scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, PARTITIONED):
                                                                             remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                                scan store_returns
+                                                                                dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                                                                    scan store_returns
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                                                     join (INNER, REPLICATED):
                                                                                         join (INNER, REPLICATED):
-                                                                                            scan store_sales
+                                                                                            dynamic filter (["ss_item_sk", "ss_store_sk"])
+                                                                                                scan store_sales
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan item
@@ -51,16 +55,20 @@ remote exchange (GATHER, SINGLE, [])
                                                                             join (INNER, PARTITIONED):
                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk_12", "ss_ticket_number_19"])
                                                                                     join (INNER, REPLICATED):
-                                                                                        scan store_sales
+                                                                                        dynamic filter (["ss_customer_sk_13", "ss_item_sk_12", "ss_item_sk_12", "ss_store_sk_17", "ss_ticket_number_19"])
+                                                                                            scan store_sales
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                scan store
+                                                                                                dynamic filter (["s_zip_83"])
+                                                                                                    scan store
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_37", "sr_ticket_number_44"])
-                                                                                        scan store_returns
+                                                                                        dynamic filter (["sr_item_sk_37"])
+                                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_113"])
-                                                                                scan customer
+                                                                                dynamic filter (["c_birth_country_127"])
+                                                                                    scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q25.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q25.plan.txt
index a21872e9dd27..2cf400cb82cd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q25.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q25.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                scan item
+                                dynamic filter (["i_item_sk"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q26.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q26.plan.txt
index 555bb67d3baa..d91ef68bdab5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q26.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q26.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_cdemo_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q27.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q27.plan.txt
index ed0e2e73e9f3..bb3578559862 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q27.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q27.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q29.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q29.plan.txt
index a21872e9dd27..2cf400cb82cd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q29.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q29.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                scan item
+                                dynamic filter (["i_item_sk"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q30.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q30.plan.txt
index 20acb58872da..d37894529112 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q30.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q30.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan web_returns
+                                                dynamic filter (["wr_returned_date_sk", "wr_returning_addr_sk", "wr_returning_customer_sk"])
+                                                    scan web_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                             join (INNER, REPLICATED):
-                                scan customer
+                                dynamic filter (["c_current_addr_sk"])
+                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
@@ -37,7 +39,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk_30"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan web_returns
+                                                                    dynamic filter (["wr_returned_date_sk_44", "wr_returning_addr_sk_30"])
+                                                                        scan web_returns
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q31.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q31.plan.txt
index 0056aa780bc4..68eaa09566a1 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q31.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q31.plan.txt
@@ -11,13 +11,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_9"])
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk_9", "ss_sold_date_sk_26"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_59"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_66", "ca_county_66", "ca_county_66"])
+                                                        scan customer_address
                         final aggregation over (ca_county_140, d_qoy_113, d_year_109)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_140"])
@@ -25,13 +27,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_83"])
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk_83", "ss_sold_date_sk_100"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_133"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_140", "ca_county_140"])
+                                                        scan customer_address
                     join (INNER, PARTITIONED):
                         final aggregation over (ca_county_276, d_qoy_249, d_year_245)
                             local exchange (GATHER, SINGLE, [])
@@ -40,13 +44,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_209"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk_209", "ws_sold_date_sk_236"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_269"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_276", "ca_county_276"])
+                                                        scan customer_address
                         final aggregation over (ca_county_361, d_qoy_334, d_year_330)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_361"])
@@ -54,13 +60,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_294"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk_294", "ws_sold_date_sk_321"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_354"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_361"])
+                                                        scan customer_address
                 join (INNER, PARTITIONED):
                     final aggregation over (ca_county, d_qoy, d_year)
                         local exchange (GATHER, SINGLE, [])
@@ -69,13 +77,15 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                scan customer_address
+                                                dynamic filter (["ca_county"])
+                                                    scan customer_address
                     final aggregation over (ca_county_191, d_qoy_164, d_year_160)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_county_191"])
@@ -83,7 +93,8 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q32.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q32.plan.txt
index e09ec6de273c..02f6814dbdab 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q32.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q32.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk_18"])
                                     partial aggregation over (cs_item_sk_18)
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk_18", "cs_sold_date_sk_37"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q33.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q33.plan.txt
index 1b2427d4e654..b0447bd7c0a9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q33.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q33.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_6"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_22)
@@ -36,7 +38,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_95"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_121)
@@ -62,7 +66,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -72,7 +77,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_196"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_222)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q34.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q34.plan.txt
index e9f7af9e157c..537336239d51 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q34.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q34.plan.txt
@@ -3,7 +3,8 @@ remote exchange (GATHER, SINGLE, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, PARTITIONED):
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                    scan customer
+                    dynamic filter (["c_customer_sk"])
+                        scan customer
                 final aggregation over (ss_customer_sk, ss_ticket_number)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
@@ -11,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q35.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q35.plan.txt
index f1fed4317214..5a7a74e49f1f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q35.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q35.plan.txt
@@ -13,7 +13,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                            scan customer
+                                                            dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_customer_sk"])
+                                                                scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                 scan customer_address
@@ -22,7 +23,8 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                             partial aggregation over (ss_customer_sk)
                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_sold_date_sk"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
@@ -34,7 +36,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -43,7 +46,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q36.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q36.plan.txt
index d640f5ac0d14..06cf870e256c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q36.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q36.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q37.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q37.plan.txt
index 2582d9fa4122..eadc54781cf8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q37.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q37.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"])
                     partial aggregation over (i_current_price, i_item_desc, i_item_id)
                         join (INNER, REPLICATED, can skip output duplicates):
-                            scan catalog_sales
+                            dynamic filter (["cs_item_sk"])
+                                scan catalog_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED, can skip output duplicates):
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan inventory
+                                            dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                                scan inventory
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q38.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q38.plan.txt
index 9f02b3c87024..b342ddb2e44f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q38.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q38.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -27,7 +28,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -42,7 +44,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q39.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q39.plan.txt
index eb2349ef1574..96555d1e77b4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q39.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q39.plan.txt
@@ -10,16 +10,19 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan inventory
+                                                dynamic filter (["inv_date_sk", "inv_item_sk", "inv_item_sk", "inv_warehouse_sk", "inv_warehouse_sk"])
+                                                    scan inventory
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_item_sk"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                scan warehouse
+                                                dynamic filter (["w_warehouse_sk"])
+                                                    scan warehouse
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["inv_item_sk_8", "inv_warehouse_sk_9"])
                         final aggregation over (d_moy_62, inv_item_sk_8, inv_warehouse_sk_9, w_warehouse_name_40)
@@ -29,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan inventory
+                                                    dynamic filter (["inv_date_sk_11", "inv_item_sk_8", "inv_warehouse_sk_9"])
+                                                        scan inventory
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q40.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q40.plan.txt
index 266142fc4c1a..7b700b882104 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q40.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q40.plan.txt
@@ -9,10 +9,12 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (LEFT, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_warehouse_sk"])
+                                                scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                scan catalog_returns
+                                                dynamic filter (["cr_item_sk"])
+                                                    scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q41.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q41.plan.txt
index 58a96c8d1ec2..772ad4b317c4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q41.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q41.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_product_name)
                         single aggregation over (i_manufact, i_manufact_id, i_product_name, unique)
                             join (INNER, REPLICATED, can skip output duplicates):
-                                scan item
+                                dynamic filter (["i_manufact"])
+                                    scan item
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q42.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q42.plan.txt
index 87792b40cd98..534e670ed02a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q42.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q42.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_category, i_category_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q43.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q43.plan.txt
index 9d9e36441a12..b94077c666ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q43.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q43.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     partial aggregation over (d_day_name, s_store_id, s_store_name)
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q45.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q45.plan.txt
index 6a42b74e28db..95918f1b4170 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q45.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q45.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                scan customer
+                                                dynamic filter (["c_current_addr_sk"])
+                                                    scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                     scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q46.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q46.plan.txt
index d675e12143ee..a2a2c32a60a9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q46.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q46.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan store
@@ -27,7 +28,8 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                            scan customer
+                            dynamic filter (["c_current_addr_sk"])
+                                scan customer
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_address_sk_11"])
                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q47.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q47.plan.txt
index 2d63bde52f55..6bda63bab469 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q47.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q47.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan store
+                                                        dynamic filter (["s_company_name", "s_company_name", "s_store_name", "s_store_name"])
+                                                            scan store
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                        scan item
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["i_brand_14", "i_category_18", "s_company_name_102", "s_store_name_90"])
                         final aggregation over (d_moy_63, d_year_61, i_brand_14, i_category_18, s_company_name_102, s_store_name_90)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_31", "ss_sold_date_sk_52", "ss_store_sk_36"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan store
+                                                        dynamic filter (["s_company_name_102", "s_store_name_90"])
+                                                            scan store
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand_14", "i_category_18"])
+                                                        scan item
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_brand_133", "i_category_137", "s_company_name_221", "s_store_name_209"])
                     final aggregation over (d_moy_182, d_year_180, i_brand_133, i_category_137, s_company_name_221, s_store_name_209)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk_150", "ss_sold_date_sk_171", "ss_store_sk_155"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q48.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q48.plan.txt
index dd3059b1afd4..17d20aa59ac5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q48.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q48.plan.txt
@@ -6,7 +6,8 @@ final aggregation over ()
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q49.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q49.plan.txt
index 6f687392953d..e3a416cd5356 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q49.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q49.plan.txt
@@ -12,11 +12,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (wr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                        scan web_returns
+                                                        dynamic filter (["wr_item_sk", "wr_order_number"])
+                                                            scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_sold_date_sk"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -30,11 +32,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (cr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                        scan catalog_returns
+                                                        dynamic filter (["cr_item_sk", "cr_order_number"])
+                                                            scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan catalog_sales
+                                                                dynamic filter (["cs_sold_date_sk"])
+                                                                    scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -48,11 +52,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (sr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                        scan store_returns
+                                                        dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                                            scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q50.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q50.plan.txt
index c2a9d481bf10..8ff8d8dbfebf 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q50.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q50.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                            scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                             join (INNER, REPLICATED):
-                                                scan store_returns
+                                                dynamic filter (["sr_returned_date_sk"])
+                                                    scan store_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q51.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q51.plan.txt
index 6a1ca8bd4aca..32fa4cc52c6c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q51.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q51.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 partial aggregation over (d_date, ws_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                 partial aggregation over (d_date_7, ss_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q52.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q52.plan.txt
index 70aae3fa1bdd..ede6415850e5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q52.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q52.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q53.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q53.plan.txt
index cd10ab3698e6..799e43e0eca0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q53.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q53.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q54.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q54.plan.txt
index f5c3ef3b83c8..851fa255cf39 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q54.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q54.plan.txt
@@ -8,17 +8,19 @@ local exchange (GATHER, SINGLE, [])
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                     partial aggregation over (ss_customer_sk)
-                                        cross join:
-                                            cross join:
+                                        join (LEFT, REPLICATED):
+                                            join (LEFT, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk", "ca_county", "ca_state"])
+                                                                                scan customer_address
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan store
@@ -27,14 +29,17 @@ local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 partial aggregation over (c_current_addr_sk, c_customer_sk)
                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                        scan customer
+                                                                                        dynamic filter (["c_customer_sk"])
+                                                                                            scan customer
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                 join (INNER, REPLICATED, can skip output duplicates):
                                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                                        remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                                                                            scan catalog_sales
-                                                                                                            scan web_sales
+                                                                                                        local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                                                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                                scan catalog_sales
+                                                                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                                scan web_sales
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q55.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q55.plan.txt
index f89f2f078b63..c58f37a50aa2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q55.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q55.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q56.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q56.plan.txt
index 35ea332fb456..30a5e380cbdd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q56.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q56.plan.txt
@@ -10,14 +10,16 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan item
+                                                        dynamic filter (["i_item_id_6"])
+                                                            scan item
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (i_item_id_10)
@@ -37,14 +39,16 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_bill_addr_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan item
+                                                            dynamic filter (["i_item_id_83"])
+                                                                scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (i_item_id_109)
@@ -64,14 +68,16 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan item
+                                                            dynamic filter (["i_item_id_184"])
+                                                                scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (i_item_id_210)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q57.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q57.plan.txt
index 105ad5f39b4a..67402b41d32c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q57.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q57.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                            scan item
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan call_center
+                                                    dynamic filter (["cc_name", "cc_name"])
+                                                        scan call_center
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["cc_name_102", "i_brand_14", "i_category_18"])
                         final aggregation over (cc_name_102, d_moy_74, d_year_72, i_brand_14, i_category_18)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk_40", "cs_item_sk_44", "cs_sold_date_sk_63"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_brand_14", "i_category_18"])
+                                                            scan item
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan call_center
+                                                    dynamic filter (["cc_name_102"])
+                                                        scan call_center
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["cc_name_232", "i_brand_144", "i_category_148"])
                     final aggregation over (cc_name_232, d_moy_204, d_year_202, i_brand_144, i_category_148)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_call_center_sk_170", "cs_item_sk_174", "cs_sold_date_sk_193"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q58.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q58.plan.txt
index 00602f5115c0..6592ac42f887 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q58.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q58.plan.txt
@@ -7,11 +7,13 @@ local exchange (GATHER, SINGLE, [])
                         partial aggregation over (i_item_id)
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan date_dim
+                                                dynamic filter (["d_date"])
+                                                    scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         final aggregation over (d_date_6)
@@ -19,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["d_date_6"])
                                                                     partial aggregation over (d_date_6)
                                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                                            scan date_dim
+                                                                            dynamic filter (["d_week_seq_8"])
+                                                                                scan date_dim
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     local exchange (GATHER, SINGLE, [])
@@ -27,7 +30,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                             scan date_dim
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
-                                        scan item
+                                        dynamic filter (["i_item_id"])
+                                            scan item
             join (INNER, PARTITIONED):
                 final aggregation over (i_item_id_69)
                     local exchange (GATHER, SINGLE, [])
@@ -35,11 +39,13 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_item_id_69)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan date_dim
+                                                    dynamic filter (["d_date_94"])
+                                                        scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (d_date_126)
@@ -47,7 +53,8 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["d_date_126"])
                                                                         partial aggregation over (d_date_126)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_128"])
+                                                                                    scan date_dim
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         local exchange (GATHER, SINGLE, [])
@@ -55,7 +62,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
-                                            scan item
+                                            dynamic filter (["i_item_id_69"])
+                                                scan item
                 final aggregation over (i_item_id_191)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["i_item_id_191"])
@@ -63,11 +71,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_216"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_248)
@@ -75,7 +85,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_248"])
                                                                             partial aggregation over (d_date_248)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_250"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             local exchange (GATHER, SINGLE, [])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q59.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q59.plan.txt
index 7f584558007b..b71b03defefe 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q59.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q59.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["d_day_name", "d_week_seq", "ss_store_sk"])
                                         partial aggregation over (d_day_name, d_week_seq, ss_store_sk)
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq"])
+                                                            scan date_dim
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["expr_203", "s_store_sk"])
                     join (INNER, PARTITIONED):
@@ -29,10 +31,12 @@ local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["d_day_name_85", "d_week_seq_75", "ss_store_sk_52"])
                                                                 partial aggregation over (d_day_name_85, d_week_seq_75, ss_store_sk_52)
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_sales
+                                                                        dynamic filter (["ss_sold_date_sk_68", "ss_store_sk_52"])
+                                                                            scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_75"])
+                                                                                    scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -43,7 +47,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["s_store_sk_117"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["s_store_id"])
-                                        scan store
+                                        dynamic filter (["s_store_id"])
+                                            scan store
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["s_store_id_118"])
                                             scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q60.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q60.plan.txt
index e96c8c31aabb..34ac61dc445c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q60.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q60.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_6"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_10)
@@ -36,7 +38,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_83"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_109)
@@ -62,7 +66,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -72,7 +77,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_184"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_210)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q61.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q61.plan.txt
index ff3d350a643f..1cd788781e8b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q61.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q61.plan.txt
@@ -9,7 +9,8 @@ cross join:
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -22,7 +23,8 @@ cross join:
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                     join (INNER, REPLICATED):
-                                        scan customer
+                                        dynamic filter (["c_current_addr_sk"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_address
@@ -38,7 +40,8 @@ cross join:
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk_14", "ss_item_sk_13", "ss_sold_date_sk_34", "ss_store_sk_18"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -51,7 +54,8 @@ cross join:
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_sk_98"])
                                 join (INNER, REPLICATED):
-                                    scan customer
+                                    dynamic filter (["c_current_addr_sk_102"])
+                                        scan customer
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q62.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q62.plan.txt
index 61172c74fc4f..26846a9ba0a9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q62.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q62.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_ship_date_sk", "ws_ship_mode_sk", "ws_warehouse_sk", "ws_web_site_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q63.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q63.plan.txt
index 23e28eddc4b7..da2cbd549a64 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q63.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q63.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q64.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q64.plan.txt
index 34baf2cecca6..0eb91cefd6fd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q64.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q64.plan.txt
@@ -9,11 +9,13 @@ remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over (ca_city, ca_city_105, ca_street_name, ca_street_name_102, ca_street_number, ca_street_number_101, ca_zip, ca_zip_108, d_year, d_year_15, d_year_45, i_product_name, s_store_name, s_zip, ss_item_sk)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ca_address_sk_99"])
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk_99"])
+                                                scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
@@ -30,13 +32,15 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                         join (INNER, PARTITIONED):
                                                                                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                                                                                 join (INNER, REPLICATED):
-                                                                                                                    scan store_sales
+                                                                                                                    dynamic filter (["ss_cdemo_sk", "ss_customer_sk", "ss_hdemo_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                                                                        scan store_sales
                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                             scan date_dim
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                                                                    scan store_returns
+                                                                                                                    dynamic filter (["sr_item_sk", "sr_item_sk", "sr_item_sk"])
+                                                                                                                        scan store_returns
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 final aggregation over (cs_item_sk)
@@ -45,21 +49,25 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                             partial aggregation over (cs_item_sk)
                                                                                                                                 join (INNER, PARTITIONED):
                                                                                                                                     remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                                                                                        scan catalog_sales
+                                                                                                                                        dynamic filter (["cs_item_sk", "cs_item_sk", "cs_item_sk", "cs_order_number"])
+                                                                                                                                            scan catalog_sales
                                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                                         remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                                                                                            scan catalog_returns
+                                                                                                                                            dynamic filter (["cr_item_sk", "cr_item_sk"])
+                                                                                                                                                scan catalog_returns
                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                                             scan customer_demographics
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                        scan store
+                                                                                                        dynamic filter (["s_store_name", "s_zip"])
+                                                                                                            scan store
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                                                 join (INNER, REPLICATED):
                                                                                                     join (INNER, REPLICATED):
-                                                                                                        scan customer
+                                                                                                        dynamic filter (["c_current_cdemo_sk", "c_current_hdemo_sk", "c_first_sales_date_sk", "c_first_shipto_date_sk"])
+                                                                                                            scan customer
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan date_dim
@@ -68,7 +76,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                             scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                                                            scan item
+                                                                                            dynamic filter (["i_item_sk"])
+                                                                                                scan item
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPARTITION, HASH, ["cd_demo_sk_75"])
                                                                                     scan customer_demographics
@@ -78,14 +87,16 @@ remote exchange (GATHER, SINGLE, [])
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk"])
+                                                                                    scan household_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan income_band
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, REPLICATED):
-                                                                            scan household_demographics
+                                                                            dynamic filter (["hd_income_band_sk_91"])
+                                                                                scan household_demographics
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan income_band
@@ -97,11 +108,13 @@ remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over (ca_city_452, ca_city_467, ca_street_name_449, ca_street_name_464, ca_street_number_448, ca_street_number_463, ca_zip_455, ca_zip_470, d_year_254, d_year_284, d_year_314, i_product_name_507, s_store_name_343, s_zip_363, ss_item_sk_133)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk_461"])
-                                                scan customer_address
+                                                dynamic filter (["ca_address_sk_461"])
+                                                    scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk_373"])
                                                     join (INNER, REPLICATED):
-                                                        scan customer_address
+                                                        dynamic filter (["ca_address_sk_446"])
+                                                            scan customer_address
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
@@ -118,13 +131,15 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                             join (INNER, PARTITIONED):
                                                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk_133", "ss_ticket_number_140"])
                                                                                                                     join (INNER, REPLICATED):
-                                                                                                                        scan store_sales
+                                                                                                                        dynamic filter (["ss_cdemo_sk_135", "ss_customer_sk_134", "ss_hdemo_sk_136", "ss_item_sk_133", "ss_item_sk_133", "ss_item_sk_133", "ss_promo_sk_139", "ss_sold_date_sk_154", "ss_store_sk_138", "ss_ticket_number_140"])
+                                                                                                                            scan store_sales
                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                 scan date_dim
                                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_158", "sr_ticket_number_165"])
-                                                                                                                        scan store_returns
+                                                                                                                        dynamic filter (["sr_item_sk_158", "sr_item_sk_158"])
+                                                                                                                            scan store_returns
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     final aggregation over (cs_item_sk_193)
@@ -133,10 +148,12 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                                 partial aggregation over (cs_item_sk_193)
                                                                                                                                     join (INNER, PARTITIONED):
                                                                                                                                         remote exchange (REPARTITION, HASH, ["cs_item_sk_193", "cs_order_number_195"])
-                                                                                                                                            scan catalog_sales
+                                                                                                                                            dynamic filter (["cs_item_sk_193", "cs_item_sk_193", "cs_order_number_195"])
+                                                                                                                                                scan catalog_sales
                                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                                             remote exchange (REPARTITION, HASH, ["cr_item_sk_216", "cr_order_number_230"])
-                                                                                                                                                scan catalog_returns
+                                                                                                                                                dynamic filter (["cr_item_sk_216"])
+                                                                                                                                                    scan catalog_returns
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan customer_demographics
@@ -147,7 +164,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_369"])
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan customer
+                                                                                                            dynamic filter (["c_current_cdemo_sk_371", "c_current_hdemo_sk_372", "c_first_sales_date_sk_375", "c_first_shipto_date_sk_374"])
+                                                                                                                scan customer
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -166,14 +184,16 @@ remote exchange (GATHER, SINGLE, [])
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 join (INNER, REPLICATED):
-                                                                                    scan household_demographics
+                                                                                    dynamic filter (["hd_income_band_sk_433"])
+                                                                                        scan household_demographics
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             scan income_band
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk_440"])
+                                                                                    scan household_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q65.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q65.plan.txt
index 0c80486a2845..e709c2b79828 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q65.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q65.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_item_sk_7", "ss_store_sk_12"])
                             partial aggregation over (ss_item_sk_7, ss_store_sk_12)
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk_7", "ss_sold_date_sk_28", "ss_store_sk_12"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                     remote exchange (REPLICATE, BROADCAST, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["s_store_sk"])
-                                scan store
+                                dynamic filter (["s_store_sk"])
+                                    scan store
                             final aggregation over (ss_store_sk)
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_store_sk"])
@@ -25,7 +27,8 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_store_sk"])
                                                         partial aggregation over (ss_item_sk, ss_store_sk)
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q66.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q66.plan.txt
index b87ae78025f5..ba2954f5d404 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q66.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q66.plan.txt
@@ -15,7 +15,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_ship_mode_sk", "ws_sold_date_sk", "ws_sold_time_sk", "ws_warehouse_sk"])
+                                                                        scan web_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan ship_mode
@@ -41,7 +42,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_ship_mode_sk", "cs_sold_date_sk", "cs_sold_time_sk", "cs_warehouse_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan ship_mode
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q67.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q67.plan.txt
index 60f46f2fcf90..66c2001151d6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q67.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q67.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q68.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q68.plan.txt
index 0df5521a9d32..b8cefafe7ca2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q68.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q68.plan.txt
@@ -4,7 +4,8 @@ local exchange (GATHER, SINGLE, [])
             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                        scan customer
+                        dynamic filter (["c_current_addr_sk", "c_customer_sk"])
+                            scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                             final aggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number)
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_addr_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q69.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q69.plan.txt
index d304792469c0..c79f374b67e4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q69.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q69.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -19,7 +20,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["cd_demo_sk"])
-                                                scan customer_demographics
+                                                dynamic filter (["cd_demo_sk"])
+                                                    scan customer_demographics
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                     join (INNER, PARTITIONED):
@@ -28,14 +30,16 @@ local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                     partial aggregation over (ss_customer_sk)
                                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan customer
+                                                                    dynamic filter (["c_current_addr_sk"])
+                                                                        scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan customer_address
@@ -44,7 +48,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q70.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q70.plan.txt
index 0ba93430749a..6782961fcb04 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q70.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q70.plan.txt
@@ -10,13 +10,15 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["s_state"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan store
+                                                    dynamic filter (["s_state"])
+                                                        scan store
                                     single aggregation over (s_state_53)
                                         final aggregation over (s_state_53)
                                             local exchange (GATHER, SINGLE, [])
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                                     partial aggregation over (s_state_53)
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk_26", "ss_store_sk_10"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q71.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q71.plan.txt
index 599dd0ab9f9c..f5d3c7ec8a7e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q71.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q71.plan.txt
@@ -7,19 +7,22 @@ remote exchange (GATHER, SINGLE, [])
                         partial aggregation over (i_brand, i_brand_id, t_hour, t_minute)
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
+                                    local exchange (REPARTITION, ROUND_ROBIN, [])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk", "ws_sold_time_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_sold_time_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_sold_time_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q72.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q72.plan.txt
index 9c47f45ae5a1..cc812789f826 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q72.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q72.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["inv_item_sk"])
                                             join (INNER, REPLICATED):
-                                                scan inventory
+                                                dynamic filter (["inv_date_sk", "inv_item_sk", "inv_quantity_on_hand", "inv_warehouse_sk"])
+                                                    scan inventory
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq_16"])
+                                                            scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
@@ -21,7 +23,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_bill_cdemo_sk", "cs_bill_hdemo_sk", "cs_item_sk", "cs_ship_date_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan household_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q73.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q73.plan.txt
index 8a3c9f5087e6..0ceb0cf526e0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q73.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q73.plan.txt
@@ -3,7 +3,8 @@ remote exchange (GATHER, SINGLE, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, PARTITIONED):
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                    scan customer
+                    dynamic filter (["c_customer_sk"])
+                        scan customer
                 final aggregation over (ss_customer_sk, ss_ticket_number)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
@@ -11,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q74.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q74.plan.txt
index 89fdfff32752..aa0066ea858b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q74.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q74.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_90"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_90", "ss_sold_date_sk_110"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_68"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_69", "c_customer_id_69"])
+                                                scan customer
                 final aggregation over (c_customer_id_329, c_first_name_336, c_last_name_337, d_year_390)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_329"])
@@ -23,13 +25,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_351"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_351", "ws_sold_date_sk_381"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_328"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_329"])
+                                                scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_customer_id, c_first_name, c_last_name, d_year)
                     local exchange (GATHER, SINGLE, [])
@@ -38,13 +42,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id"])
+                                                scan customer
                 final aggregation over (c_customer_id_508, c_first_name_515, c_last_name_516, d_year_569)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_508"])
@@ -52,7 +58,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_530"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_530", "ws_sold_date_sk_560"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q75.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q75.plan.txt
index 72ac1ec6cf65..41b95bbc141b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q75.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q75.plan.txt
@@ -8,15 +8,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_13, expr, expr_18, i_brand_id_7, i_category_id_9, i_class_id_8, i_manufact_id_10)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                        scan catalog_returns
+                                        dynamic filter (["cr_item_sk", "cr_order_number"])
+                                            scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_7", "i_category_id_9", "i_class_id_8", "i_manufact_id_10"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -24,15 +27,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_51, expr_77, expr_78, i_brand_id_28, i_category_id_32, i_class_id_30, i_manufact_id_34)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                            scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_28", "i_category_id_32", "i_class_id_30", "i_manufact_id_34"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -40,15 +46,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_111, expr_137, expr_138, i_brand_id_88, i_category_id_92, i_class_id_90, i_manufact_id_94)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                        scan web_returns
+                                        dynamic filter (["wr_item_sk", "wr_order_number"])
+                                            scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_88", "i_category_id_92", "i_class_id_90", "i_manufact_id_94"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -59,12 +68,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_221, expr_274, expr_275, i_brand_id_198, i_category_id_202, i_class_id_200, i_manufact_id_204)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk_246", "cr_order_number_260"])
-                                        scan catalog_returns
+                                        dynamic filter (["cr_item_sk_246", "cr_order_number_260"])
+                                            scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk_169", "cs_order_number_171"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_item_sk_169", "cs_sold_date_sk_188"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
@@ -75,12 +86,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_331, expr_377, expr_378, i_brand_id_308, i_category_id_312, i_class_id_310, i_manufact_id_314)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_356", "sr_ticket_number_363"])
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk_356", "sr_ticket_number_363"])
+                                            scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk_277", "ss_ticket_number_284"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_277", "ss_sold_date_sk_298"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
@@ -91,12 +104,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_445, expr_495, expr_496, i_brand_id_422, i_category_id_426, i_class_id_424, i_manufact_id_428)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk_470", "wr_order_number_481"])
-                                        scan web_returns
+                                        dynamic filter (["wr_item_sk_470", "wr_order_number_481"])
+                                            scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk_381", "ws_order_number_395"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_item_sk_381", "ws_sold_date_sk_412"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q76.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q76.plan.txt
index 044c8310d542..a13c0fb4d65e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q76.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q76.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_10, d_year_9, expr_134, expr_135, i_category_6)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
@@ -19,7 +20,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_sold_date_sk"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_item_sk"])
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_17"])
                                             scan item
@@ -30,7 +32,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_111, d_year_107, expr_131, expr_133, i_category_89)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan catalog_sales
+                                dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                    scan catalog_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q77.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q77.plan.txt
index f5f8b7b62eea..b632624a3d15 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q77.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q77.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ss_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -25,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (sr_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_returns
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -38,7 +40,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_call_center_sk"])
                                             partial aggregation over (cs_call_center_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -49,7 +52,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["cr_call_center_sk"])
                                                     partial aggregation over (cr_call_center_sk)
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_returns
+                                                            dynamic filter (["cr_returned_date_sk"])
+                                                                scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -60,7 +64,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ws_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_page_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -73,7 +78,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (wr_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_returns
+                                                        dynamic filter (["wr_returned_date_sk", "wr_web_page_sk"])
+                                                            scan web_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q78.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q78.plan.txt
index e9a4bce6caf7..a13222cb0024 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q78.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q78.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk", "ss_customer_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                    scan store_returns
+                                                    dynamic filter (["sr_item_sk"])
+                                                        scan store_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
                                                     scan web_returns
@@ -38,7 +41,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (LEFT, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                        scan catalog_sales
+                                        dynamic filter (["cs_sold_date_sk"])
+                                            scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
                                             scan catalog_returns
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q79.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q79.plan.txt
index c41171325a3c..733be6f6e8b7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q79.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q79.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q80.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q80.plan.txt
index a4b2da9fdab0..61944a8d3ab3 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q80.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q80.plan.txt
@@ -15,10 +15,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                        scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_item_sk"])
+                                                                            scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -41,10 +43,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_catalog_page_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                        scan catalog_returns
+                                                                        dynamic filter (["cr_item_sk"])
+                                                                            scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -67,10 +71,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_item_sk", "ws_promo_sk", "ws_sold_date_sk", "ws_web_site_sk"])
+                                                                        scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_item_sk"])
+                                                                            scan web_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q81.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q81.plan.txt
index 88dfbd2615ea..097a1be6f2e1 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q81.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q81.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_returns
+                                                dynamic filter (["cr_returned_date_sk", "cr_returning_addr_sk", "cr_returning_customer_sk"])
+                                                    scan catalog_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPLICATE, BROADCAST, [])
                             join (INNER, REPLICATED):
-                                scan customer
+                                dynamic filter (["c_current_addr_sk"])
+                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
@@ -37,7 +39,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk_30"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_returns
+                                                                    dynamic filter (["cr_returned_date_sk_47", "cr_returning_addr_sk_30"])
+                                                                        scan catalog_returns
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q82.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q82.plan.txt
index 532952036fc3..d3b691e03fe2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q82.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q82.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"])
                     partial aggregation over (i_current_price, i_item_desc, i_item_id)
                         join (INNER, REPLICATED, can skip output duplicates):
-                            scan store_sales
+                            dynamic filter (["ss_item_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED, can skip output duplicates):
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan inventory
+                                            dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                                scan inventory
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q83.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q83.plan.txt
index 108710add4fd..5adb2dfd0e20 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q83.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q83.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["sr_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk", "sr_returned_date_sk"])
+                                            scan store_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan date_dim
+                                                    dynamic filter (["d_date"])
+                                                        scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (d_date_6)
@@ -20,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["d_date_6"])
                                                                         partial aggregation over (d_date_6)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_8"])
+                                                                                    scan date_dim
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         final aggregation over (d_week_seq_40)
@@ -30,7 +33,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                         scan date_dim
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                        scan item
+                                        dynamic filter (["i_item_id"])
+                                            scan item
             join (INNER, PARTITIONED):
                 final aggregation over (i_item_id_74)
                     local exchange (GATHER, SINGLE, [])
@@ -39,11 +43,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_returns
+                                            dynamic filter (["cr_item_sk", "cr_returned_date_sk"])
+                                                scan catalog_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_99"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_131)
@@ -51,7 +57,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_131"])
                                                                             partial aggregation over (d_date_131)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_133"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             final aggregation over (d_week_seq_165)
@@ -61,7 +68,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                             scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_73"])
-                                            scan item
+                                            dynamic filter (["i_item_id_74"])
+                                                scan item
                 final aggregation over (i_item_id_201)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["i_item_id_201"])
@@ -69,11 +77,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan web_returns
+                                            dynamic filter (["wr_item_sk", "wr_returned_date_sk"])
+                                                scan web_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_226"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_258)
@@ -81,7 +91,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_258"])
                                                                             partial aggregation over (d_date_258)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_260"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             final aggregation over (d_week_seq_292)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q84.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q84.plan.txt
index ec22af2c6a55..b1402e98e5ab 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q84.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q84.plan.txt
@@ -1,23 +1,27 @@
 local exchange (GATHER, SINGLE, [])
     remote exchange (GATHER, SINGLE, [])
         join (INNER, REPLICATED):
-            scan store_returns
+            dynamic filter (["sr_cdemo_sk"])
+                scan store_returns
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPLICATE, BROADCAST, [])
                     join (INNER, REPLICATED):
-                        scan customer_demographics
+                        dynamic filter (["cd_demo_sk"])
+                            scan customer_demographics
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPLICATE, BROADCAST, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan customer
+                                        dynamic filter (["c_current_addr_sk", "c_current_hdemo_sk"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_address
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan household_demographics
+                                                dynamic filter (["hd_income_band_sk"])
+                                                    scan household_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q85.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q85.plan.txt
index 23eed8958c96..fc6d26559bc9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q85.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q85.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (r_reason_desc)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan customer_demographics
+                                dynamic filter (["cd_demo_sk_6", "cd_education_status_9", "cd_marital_status_8"])
+                                    scan customer_demographics
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["wr_refunded_addr_sk"])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan web_sales
+                                                                        dynamic filter (["ws_item_sk", "ws_order_number", "ws_sold_date_sk", "ws_web_page_sk"])
+                                                                            scan web_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_reason_sk", "wr_refunded_cdemo_sk"])
+                                                                            scan web_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q86.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q86.plan.txt
index cca927926827..38fdc67f5412 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q86.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q86.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (groupid, i_category$gid, i_class$gid)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q87.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q87.plan.txt
index 9f02b3c87024..b342ddb2e44f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q87.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q87.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -27,7 +28,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -42,7 +44,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q88.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q88.plan.txt
index 6e297c60e201..fbeb9bec31cc 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q88.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q88.plan.txt
@@ -12,7 +12,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan time_dim
@@ -29,7 +30,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk_10", "ss_sold_time_sk_6", "ss_store_sk_12"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan time_dim
@@ -46,7 +48,8 @@ cross join:
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_hdemo_sk_86", "ss_sold_time_sk_82", "ss_store_sk_88"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan time_dim
@@ -63,7 +66,8 @@ cross join:
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_hdemo_sk_162", "ss_sold_time_sk_158", "ss_store_sk_164"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan time_dim
@@ -80,7 +84,8 @@ cross join:
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk_238", "ss_sold_time_sk_234", "ss_store_sk_240"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan time_dim
@@ -97,7 +102,8 @@ cross join:
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_hdemo_sk_314", "ss_sold_time_sk_310", "ss_store_sk_316"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan time_dim
@@ -114,7 +120,8 @@ cross join:
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_hdemo_sk_390", "ss_sold_time_sk_386", "ss_store_sk_392"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan time_dim
@@ -131,7 +138,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_hdemo_sk_466", "ss_sold_time_sk_462", "ss_store_sk_468"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan time_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q89.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q89.plan.txt
index 396d705bbc38..221dfc17c333 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q89.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q89.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q90.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q90.plan.txt
index 0ddf21aa574d..0324ff34e833 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q90.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q90.plan.txt
@@ -6,7 +6,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk", "ws_sold_time_sk", "ws_web_page_sk"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan web_page
@@ -23,7 +24,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk_15", "ws_sold_time_sk_6", "ws_web_page_sk_17"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan web_page
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q91.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q91.plan.txt
index 2d679f5abc8e..11e637bca84b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q91.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q91.plan.txt
@@ -8,17 +8,20 @@ remote exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_returns
+                                        dynamic filter (["cr_call_center_sk", "cr_returned_date_sk", "cr_returning_customer_sk"])
+                                            scan catalog_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                        scan customer_address
+                                                        dynamic filter (["ca_address_sk"])
+                                                            scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan customer
+                                                                    dynamic filter (["c_current_cdemo_sk", "c_current_hdemo_sk"])
+                                                                        scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q92.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q92.plan.txt
index 2dfed78f9a62..26d64d4d3541 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q92.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q92.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk_6"])
                                     partial aggregation over (ws_item_sk_6)
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk_6", "ws_sold_date_sk_37"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q93.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q93.plan.txt
index ca9dc7543db7..e1cd897adff9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q93.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q93.plan.txt
@@ -7,10 +7,12 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk", "ss_ticket_number"])
+                                        scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_reason_sk"])
+                                            scan store_returns
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan reason
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q94.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q94.plan.txt
index 63dd284f1694..6da19f5a9549 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q94.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q94.plan.txt
@@ -8,19 +8,22 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["wr_order_number"])
                                     partial aggregation over (wr_order_number)
-                                        scan web_returns
+                                        dynamic filter (["wr_order_number"])
+                                            scan web_returns
                         final aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number_22, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_order_number_22"])
                                     partial aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number_22, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk)
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_22"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q95.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q95.plan.txt
index 5e42003378f2..ee593ef8a918 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q95.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q95.plan.txt
@@ -9,29 +9,35 @@ final aggregation over ()
                                 join (INNER, PARTITIONED, can skip output duplicates):
                                     join (INNER, PARTITIONED, can skip output duplicates):
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_100"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_100", "ws_order_number_100", "ws_order_number_100"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["wr_order_number"])
-                                                scan web_returns
+                                                dynamic filter (["wr_order_number", "wr_order_number"])
+                                                    scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_136"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_136"])
+                                                scan web_sales
                     join (INNER, PARTITIONED):
                         final aggregation over (ws_order_number_22)
                             local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (ws_order_number_22)
                                     join (INNER, PARTITIONED, can skip output duplicates):
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_22"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_22", "ws_order_number_22"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_order_number_58"])
-                                                scan web_sales
+                                                dynamic filter (["ws_order_number_58"])
+                                                    scan web_sales
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_order_number"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q96.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q96.plan.txt
index 6ac294895946..e4fdf4d14611 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q96.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q96.plan.txt
@@ -5,7 +5,8 @@ final aggregation over ()
                 join (INNER, REPLICATED):
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
-                            scan store_sales
+                            dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan time_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q97.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q97.plan.txt
index 7b9c83293534..959bbfe9de73 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q97.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q97.plan.txt
@@ -8,7 +8,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"])
                                 partial aggregation over (ss_customer_sk, ss_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"])
                                 partial aggregation over (cs_bill_customer_sk, cs_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q98.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q98.plan.txt
index 9775b6c511f5..7c0caca03f27 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q98.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q98.plan.txt
@@ -9,7 +9,8 @@ remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q99.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q99.plan.txt
index e7f593fe04e2..99580251ab0a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q99.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/partitioned/q99.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_call_center_sk", "cs_ship_date_sk", "cs_ship_mode_sk", "cs_warehouse_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q01.plan.txt
index 114fb89fe851..821640079948 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q01.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q01.plan.txt
@@ -4,7 +4,8 @@ local exchange (GATHER, SINGLE, [])
             join (LEFT, REPLICATED):
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                        scan customer
+                        dynamic filter (["c_customer_sk"])
+                            scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["sr_customer_sk"])
                             join (INNER, REPLICATED):
@@ -13,7 +14,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_store_sk"])
                                             partial aggregation over (sr_customer_sk, sr_store_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan store_returns
+                                                    dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                        scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -31,7 +33,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk_9", "sr_store_sk_13"])
                                                     partial aggregation over (sr_customer_sk_9, sr_store_sk_13)
                                                         join (INNER, REPLICATED):
-                                                            scan store_returns
+                                                            dynamic filter (["sr_returned_date_sk_6"])
+                                                                scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q02.plan.txt
index ebb55d3dc0a5..599edf949617 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q02.plan.txt
@@ -9,15 +9,19 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq"])
                                     partial aggregation over (d_day_name, d_week_seq)
                                         join (INNER, REPLICATED):
-                                            remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                scan web_sales
-                                                scan catalog_sales
+                                            local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                dynamic filter (["ws_sold_date_sk"])
+                                                    scan web_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan date_dim
+                                                    dynamic filter (["d_week_seq", "d_week_seq"])
+                                                        scan date_dim
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["d_week_seq_20"])
-                            scan date_dim
+                            dynamic filter (["d_week_seq_20"])
+                                scan date_dim
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["expr_219"])
                         join (INNER, PARTITIONED):
@@ -27,12 +31,15 @@ remote exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["d_week_seq_124"])
                                             partial aggregation over (d_day_name_134, d_week_seq_124)
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
-                                                        scan catalog_sales
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ws_sold_date_sk_48"])
+                                                            scan web_sales
+                                                        dynamic filter (["cs_sold_date_sk_84"])
+                                                            scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan date_dim
+                                                            dynamic filter (["d_week_seq_124"])
+                                                                scan date_dim
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq_169"])
                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q03.plan.txt
index 70aae3fa1bdd..ede6415850e5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q03.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q04.plan.txt
index a6efbe49650b..a7206f469c83 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q04.plan.txt
@@ -10,13 +10,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_870"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk_870", "cs_sold_date_sk_867"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_847"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_848", "c_customer_id_848", "c_customer_id_848"])
+                                                    scan customer
                     final aggregation over (c_birth_country_1558, c_customer_id_1545, c_email_address_1560, c_first_name_1552, c_last_name_1553, c_login_1559, c_preferred_cust_flag_1554, d_year_1606)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_id_1545"])
@@ -24,13 +26,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1568"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_1568", "ws_sold_date_sk_1564"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_1544"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_1545", "c_customer_id_1545"])
+                                                    scan customer
                 join (INNER, PARTITIONED):
                     final aggregation over (c_birth_country_561, c_customer_id_548, c_email_address_563, c_first_name_555, c_last_name_556, c_login_562, c_preferred_cust_flag_557, d_year_609)
                         local exchange (GATHER, SINGLE, [])
@@ -39,13 +43,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_570"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk_570", "cs_sold_date_sk_567"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_547"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_548", "c_customer_id_548"])
+                                                    scan customer
                     final aggregation over (c_birth_country_1258, c_customer_id_1245, c_email_address_1260, c_first_name_1252, c_last_name_1253, c_login_1259, c_preferred_cust_flag_1254, d_year_1306)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_id_1245"])
@@ -53,13 +59,15 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1268"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_1268", "ws_sold_date_sk_1264"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_1244"])
-                                                scan customer
+                                                dynamic filter (["c_customer_id_1245"])
+                                                    scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_birth_country_175, c_customer_id_162, c_email_address_177, c_first_name_169, c_last_name_170, c_login_176, c_preferred_cust_flag_171, d_year_212)
                     local exchange (GATHER, SINGLE, [])
@@ -68,13 +76,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_184"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_184", "ss_sold_date_sk_181"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_161"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_162"])
+                                                scan customer
                 final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id"])
@@ -82,7 +92,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q05.plan.txt
index a837004a655b..9be0861f4b8a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q05.plan.txt
@@ -11,9 +11,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (s_store_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan store_sales
-                                                        scan store_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -26,9 +28,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (cp_catalog_page_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan catalog_sales
-                                                        scan catalog_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["cs_catalog_page_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
+                                                        dynamic filter (["cr_catalog_page_sk", "cr_returned_date_sk"])
+                                                            scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -42,13 +46,16 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_site_sk"])
+                                                            scan web_sales
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ws_item_sk_82", "ws_order_number_96"])
-                                                                scan web_sales
+                                                                dynamic filter (["ws_item_sk_82", "ws_order_number_96", "ws_web_site_sk_92"])
+                                                                    scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                    scan web_returns
+                                                                    dynamic filter (["wr_returned_date_sk"])
+                                                                        scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q06.plan.txt
index f25b809ee8ef..67d1f35ddb4e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q06.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q06.plan.txt
@@ -10,11 +10,13 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan date_dim
+                                                            dynamic filter (["d_month_seq"])
+                                                                scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     local exchange (GATHER, SINGLE, [])
@@ -28,7 +30,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                        scan customer
+                                                        dynamic filter (["c_current_addr_sk"])
+                                                            scan customer
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q07.plan.txt
index 32f4763b443d..a8da2880635e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q07.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q08.plan.txt
index 45b29afc325b..c8c9a0381d97 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q08.plan.txt
@@ -5,10 +5,11 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["s_store_name"])
                     partial aggregation over (s_store_name)
                         join (INNER, PARTITIONED):
-                            remote exchange (REPARTITION, HASH, ["substr_34"])
+                            remote exchange (REPARTITION, HASH, ["substring"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -16,7 +17,7 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan store
                             local exchange (GATHER, SINGLE, [])
-                                remote exchange (REPARTITION, HASH, ["substr_35"])
+                                remote exchange (REPARTITION, HASH, ["substring_34"])
                                     final aggregation over (ca_zip)
                                         local exchange (REPARTITION, HASH, ["ca_zip"])
                                             remote exchange (REPARTITION, HASH, ["ca_zip_26"])
@@ -30,7 +31,8 @@ local exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over (ca_zip_16)
                                                                     join (INNER, PARTITIONED):
                                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk_7"])
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk_7"])
+                                                                                scan customer_address
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q09.plan.txt
index 5660bb85f04e..cbcd78f04da6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q09.plan.txt
@@ -1,93 +1,122 @@
-cross join:
-    cross join:
-        cross join:
-            cross join:
-                cross join:
-                    cross join:
-                        cross join:
-                            cross join:
-                                cross join:
-                                    cross join:
-                                        cross join:
-                                            cross join:
-                                                cross join:
-                                                    cross join:
-                                                        final aggregation over ()
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    partial aggregation over ()
-                                                                        scan store_sales
-                                                        cross join:
-                                                            final aggregation over ()
-                                                                local exchange (GATHER, SINGLE, [])
-                                                                    remote exchange (GATHER, SINGLE, [])
-                                                                        partial aggregation over ()
-                                                                            scan store_sales
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    scan reason
+join (LEFT, REPLICATED):
+    join (LEFT, REPLICATED):
+        join (LEFT, REPLICATED):
+            join (LEFT, REPLICATED):
+                join (LEFT, REPLICATED):
+                    join (LEFT, REPLICATED):
+                        join (LEFT, REPLICATED):
+                            join (RIGHT, PARTITIONED):
+                                remote exchange (REPARTITION, HASH, [])
+                                    final aggregation over ()
+                                        local exchange (GATHER, SINGLE, [])
+                                            remote exchange (GATHER, SINGLE, [])
+                                                partial aggregation over ()
+                                                    scan store_sales
+                                local exchange (GATHER, SINGLE, [])
+                                    join (RIGHT, PARTITIONED):
+                                        remote exchange (REPARTITION, HASH, [])
+                                            final aggregation over ()
+                                                local exchange (GATHER, SINGLE, [])
+                                                    remote exchange (GATHER, SINGLE, [])
+                                                        partial aggregation over ()
+                                                            scan store_sales
+                                        local exchange (GATHER, SINGLE, [])
+                                            join (RIGHT, PARTITIONED):
+                                                remote exchange (REPARTITION, HASH, [])
                                                     final aggregation over ()
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over ()
                                                                     scan store_sales
-                                                final aggregation over ()
-                                                    local exchange (GATHER, SINGLE, [])
-                                                        remote exchange (GATHER, SINGLE, [])
-                                                            partial aggregation over ()
-                                                                scan store_sales
-                                            final aggregation over ()
                                                 local exchange (GATHER, SINGLE, [])
-                                                    remote exchange (GATHER, SINGLE, [])
-                                                        partial aggregation over ()
-                                                            scan store_sales
-                                        final aggregation over ()
-                                            local exchange (GATHER, SINGLE, [])
-                                                remote exchange (GATHER, SINGLE, [])
-                                                    partial aggregation over ()
-                                                        scan store_sales
+                                                    join (RIGHT, PARTITIONED):
+                                                        remote exchange (REPARTITION, HASH, [])
+                                                            final aggregation over ()
+                                                                local exchange (GATHER, SINGLE, [])
+                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                        partial aggregation over ()
+                                                                            scan store_sales
+                                                        local exchange (GATHER, SINGLE, [])
+                                                            join (RIGHT, PARTITIONED):
+                                                                remote exchange (REPARTITION, HASH, [])
+                                                                    final aggregation over ()
+                                                                        local exchange (GATHER, SINGLE, [])
+                                                                            remote exchange (GATHER, SINGLE, [])
+                                                                                partial aggregation over ()
+                                                                                    scan store_sales
+                                                                local exchange (GATHER, SINGLE, [])
+                                                                    join (RIGHT, PARTITIONED):
+                                                                        remote exchange (REPARTITION, HASH, [])
+                                                                            final aggregation over ()
+                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                                        partial aggregation over ()
+                                                                                            scan store_sales
+                                                                        local exchange (GATHER, SINGLE, [])
+                                                                            join (RIGHT, PARTITIONED):
+                                                                                remote exchange (REPARTITION, HASH, [])
+                                                                                    final aggregation over ()
+                                                                                        local exchange (GATHER, SINGLE, [])
+                                                                                            remote exchange (GATHER, SINGLE, [])
+                                                                                                partial aggregation over ()
+                                                                                                    scan store_sales
+                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                    join (RIGHT, PARTITIONED):
+                                                                                        remote exchange (REPARTITION, HASH, [])
+                                                                                            final aggregation over ()
+                                                                                                local exchange (GATHER, SINGLE, [])
+                                                                                                    remote exchange (GATHER, SINGLE, [])
+                                                                                                        partial aggregation over ()
+                                                                                                            scan store_sales
+                                                                                        local exchange (GATHER, SINGLE, [])
+                                                                                            remote exchange (REPARTITION, HASH, [])
+                                                                                                scan reason
+                            local exchange (GATHER, SINGLE, [])
+                                remote exchange (REPLICATE, BROADCAST, [])
                                     final aggregation over ()
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (GATHER, SINGLE, [])
                                                 partial aggregation over ()
                                                     scan store_sales
+                        local exchange (GATHER, SINGLE, [])
+                            remote exchange (REPLICATE, BROADCAST, [])
                                 final aggregation over ()
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (GATHER, SINGLE, [])
                                             partial aggregation over ()
                                                 scan store_sales
+                    local exchange (GATHER, SINGLE, [])
+                        remote exchange (REPLICATE, BROADCAST, [])
                             final aggregation over ()
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (GATHER, SINGLE, [])
                                         partial aggregation over ()
                                             scan store_sales
+                local exchange (GATHER, SINGLE, [])
+                    remote exchange (REPLICATE, BROADCAST, [])
                         final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         scan store_sales
+            local exchange (GATHER, SINGLE, [])
+                remote exchange (REPLICATE, BROADCAST, [])
                     final aggregation over ()
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over ()
                                     scan store_sales
+        local exchange (GATHER, SINGLE, [])
+            remote exchange (REPLICATE, BROADCAST, [])
                 final aggregation over ()
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (GATHER, SINGLE, [])
                             partial aggregation over ()
                                 scan store_sales
+    local exchange (GATHER, SINGLE, [])
+        remote exchange (REPLICATE, BROADCAST, [])
             final aggregation over ()
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (GATHER, SINGLE, [])
                         partial aggregation over ()
                             scan store_sales
-        final aggregation over ()
-            local exchange (GATHER, SINGLE, [])
-                remote exchange (GATHER, SINGLE, [])
-                    partial aggregation over ()
-                        scan store_sales
-    final aggregation over ()
-        local exchange (GATHER, SINGLE, [])
-            remote exchange (GATHER, SINGLE, [])
-                partial aggregation over ()
-                    scan store_sales
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q10.plan.txt
index 7d60d2a5fdd5..751f1ac52a8c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q10.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_ship_customer_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -21,14 +22,16 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                 partial aggregation over (ws_bill_customer_sk)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                             join (INNER, REPLICATED):
-                                                scan customer_demographics
+                                                dynamic filter (["cd_demo_sk"])
+                                                    scan customer_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
@@ -37,14 +40,16 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                         partial aggregation over (ss_customer_sk)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan store_sales
+                                                                                dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                                    scan store_sales
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan customer
+                                                                        dynamic filter (["c_current_addr_sk"])
+                                                                            scan customer
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q11.plan.txt
index 19f529a8c0c8..d6c17e531127 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q11.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_101"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_101", "ss_sold_date_sk_98"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_78"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_79", "c_customer_id_79"])
+                                                scan customer
                 final aggregation over (c_birth_country_371, c_customer_id_358, c_email_address_373, c_first_name_365, c_last_name_366, c_login_372, c_preferred_cust_flag_367, d_year_419)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_358"])
@@ -23,13 +25,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_381"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_381", "ws_sold_date_sk_377"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_357"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_358"])
+                                                scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_birth_country, c_customer_id, c_email_address, c_first_name, c_last_name, c_login, c_preferred_cust_flag, d_year)
                     local exchange (GATHER, SINGLE, [])
@@ -38,13 +42,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id"])
+                                                scan customer
                 final aggregation over (c_birth_country_564, c_customer_id_551, c_email_address_566, c_first_name_558, c_last_name_559, c_login_565, c_preferred_cust_flag_560, d_year_612)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_551"])
@@ -52,7 +58,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_574"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_574", "ws_sold_date_sk_570"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q12.plan.txt
index 6f94c98c5224..04b0eb523fd6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q12.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q13.plan.txt
index 011d5b20fbba..8f205090a87c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q13.plan.txt
@@ -7,7 +7,8 @@ final aggregation over ()
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q14.plan.txt
index c8326b25e125..6e0414b614d4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q14.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_6, i_category_id_8, i_class_id_7)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -20,21 +21,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_13)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_13"])
                                                                             partial aggregation over (i_item_sk_13)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_20", "i_category_id_24", "i_class_id_22"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_20", "i_category_id_24", "i_class_id_22"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id, category_id, class_id)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_72", "i_category_id_76", "i_class_id_74"])
                                                                                                 partial aggregation over (i_brand_id_72, i_category_id_76, i_class_id_74)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_42", "ss_sold_date_sk_40"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -45,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_128, i_category_id_132, i_class_id_130)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -56,7 +61,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_184, i_category_id_188, i_class_id_186)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -70,19 +76,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_236"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_291"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_357"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -93,7 +102,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_469, i_category_id_473, i_class_id_471)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_item_sk_441", "cs_sold_date_sk_426"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -101,21 +111,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk_462"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk_462"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_518)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_518"])
                                                                             partial aggregation over (i_item_sk_518)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_525", "i_category_id_529", "i_class_id_527"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_525", "i_category_id_529", "i_class_id_527"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id_542, category_id_544, class_id_543)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_580", "i_category_id_584", "i_class_id_582"])
                                                                                                 partial aggregation over (i_brand_id_580, i_category_id_584, i_class_id_582)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_550", "ss_sold_date_sk_548"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -126,7 +139,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_670, i_category_id_674, i_class_id_672)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk_642", "cs_sold_date_sk_627"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -137,7 +151,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_760, i_category_id_764, i_class_id_762)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk_720", "ws_sold_date_sk_717"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -151,19 +166,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_819"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_874"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_940"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -174,7 +192,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (i_brand_id_1052, i_category_id_1056, i_class_id_1054)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_item_sk_1012", "ws_sold_date_sk_1009"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -182,21 +201,24 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["i_item_sk_1045"])
-                                                                    scan item
+                                                                    dynamic filter (["i_item_sk_1045"])
+                                                                        scan item
                                                                 final aggregation over (i_item_sk_1101)
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["i_item_sk_1101"])
                                                                             partial aggregation over (i_item_sk_1101)
                                                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                                                     remote exchange (REPARTITION, HASH, ["i_brand_id_1108", "i_category_id_1112", "i_class_id_1110"])
-                                                                                        scan item
+                                                                                        dynamic filter (["i_brand_id_1108", "i_category_id_1112", "i_class_id_1110"])
+                                                                                            scan item
                                                                                     final aggregation over (brand_id_1125, category_id_1127, class_id_1126)
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["i_brand_id_1163", "i_category_id_1167", "i_class_id_1165"])
                                                                                                 partial aggregation over (i_brand_id_1163, i_category_id_1167, i_class_id_1165)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan store_sales
+                                                                                                            dynamic filter (["ss_item_sk_1133", "ss_sold_date_sk_1131"])
+                                                                                                                scan store_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -207,7 +229,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_1253, i_category_id_1257, i_class_id_1255)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan catalog_sales
+                                                                                                            dynamic filter (["cs_item_sk_1225", "cs_sold_date_sk_1210"])
+                                                                                                                scan catalog_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -218,7 +241,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 partial aggregation over (i_brand_id_1343, i_category_id_1347, i_class_id_1345)
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan web_sales
+                                                                                                            dynamic filter (["ws_item_sk_1303", "ws_sold_date_sk_1300"])
+                                                                                                                scan web_sales
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -232,19 +256,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_1402"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_1457"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_1523"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q15.plan.txt
index f359fbefb40f..f6e8849bd9b5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q15.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                 join (INNER, REPLICATED):
-                                    scan catalog_sales
+                                    dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                        scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                            scan customer
+                                            dynamic filter (["c_current_addr_sk"])
+                                                scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q16.plan.txt
index 5bae326d9635..cec3471287c3 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q16.plan.txt
@@ -8,19 +8,22 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cr_order_number"])
                                     partial aggregation over (cr_order_number)
-                                        scan catalog_returns
+                                        dynamic filter (["cr_order_number"])
+                                            scan catalog_returns
                         final aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number_23, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_order_number_23"])
                                     partial aggregation over (ca_state, cc_county, cs_call_center_sk, cs_ext_ship_cost, cs_net_profit, cs_order_number_23, cs_ship_addr_sk, cs_ship_date_sk, cs_warehouse_sk, d_date, unique)
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_order_number_23"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan catalog_sales
+                                                                dynamic filter (["cs_call_center_sk", "cs_ship_addr_sk", "cs_ship_date_sk"])
+                                                                    scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q17.plan.txt
index 47c73f484403..7082811c8502 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q17.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_item_desc, i_item_id, s_state)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                scan item
+                                dynamic filter (["i_item_sk"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q18.plan.txt
index 3cdca5dac93e..1b9e7c3ebd46 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q18.plan.txt
@@ -10,14 +10,16 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_cdemo_sk", "cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                                        scan customer
+                                                                        dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk"])
+                                                                            scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q19.plan.txt
index 57e559af38d4..c51217a1957f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q19.plan.txt
@@ -6,18 +6,21 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_brand, i_brand_id, i_manufact, i_manufact_id)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                scan customer_address
+                                dynamic filter (["ca_address_sk"])
+                                    scan customer_address
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                scan customer
+                                                dynamic filter (["c_customer_sk"])
+                                                    scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q20.plan.txt
index 852a9d2a3e5c..2e873503ece8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q20.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q21.plan.txt
index 50e40917c430..2ec2a1799207 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q21.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan inventory
+                                    dynamic filter (["inv_date_sk", "inv_item_sk", "inv_warehouse_sk"])
+                                        scan inventory
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q22.plan.txt
index 2fd28d3f31ed..6f1d958f18df 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q22.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["i_brand", "i_product_name"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan inventory
+                                        dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                            scan inventory
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q23.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q23.plan.txt
index 789f96505ed5..2df6cf04552c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q23.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q23.plan.txt
@@ -12,17 +12,20 @@ final aggregation over ()
                                             partial aggregation over (d_date_6, ss_item_sk, substr$gid)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_item_sk"])
+                                                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -33,7 +36,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_43)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_43"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_43"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                     scan customer
@@ -49,7 +53,8 @@ final aggregation over ()
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_71"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_71", "ss_sold_date_sk_68"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
@@ -67,17 +72,20 @@ final aggregation over ()
                                             partial aggregation over (d_date_210, ss_item_sk_185, substr$gid_265)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk_185", "ss_item_sk_185", "ss_sold_date_sk_183"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_item_sk_238"])
+                                                                scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -88,7 +96,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_274)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_274"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_274"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_296"])
                                                     scan customer
@@ -104,7 +113,8 @@ final aggregation over ()
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_322"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_322", "ss_sold_date_sk_319"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q24.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q24.plan.txt
index 5126cd62beeb..c8901f95e598 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q24.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q24.plan.txt
@@ -12,21 +12,25 @@ remote exchange (GATHER, SINGLE, [])
                                             partial aggregation over (c_first_name, c_last_name, ca_state, i_color, i_current_price, i_manager_id, i_size, i_units, s_state, s_store_name)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["ca_zip", "upper"])
-                                                        scan customer_address
+                                                        dynamic filter (["ca_zip"])
+                                                            scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_birth_country", "s_zip"])
                                                             join (INNER, REPLICATED):
-                                                                scan customer
+                                                                dynamic filter (["c_customer_sk"])
+                                                                    scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, PARTITIONED):
                                                                             remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                                scan store_returns
+                                                                                dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                                                                    scan store_returns
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                                                     join (INNER, REPLICATED):
                                                                                         join (INNER, REPLICATED):
-                                                                                            scan store_sales
+                                                                                            dynamic filter (["ss_item_sk", "ss_store_sk"])
+                                                                                                scan store_sales
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan item
@@ -51,16 +55,20 @@ remote exchange (GATHER, SINGLE, [])
                                                                             join (INNER, PARTITIONED):
                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk_13", "ss_ticket_number_20"])
                                                                                     join (INNER, REPLICATED):
-                                                                                        scan store_sales
+                                                                                        dynamic filter (["ss_customer_sk_14", "ss_item_sk_13", "ss_item_sk_13", "ss_store_sk_18", "ss_ticket_number_20"])
+                                                                                            scan store_sales
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                scan store
+                                                                                                dynamic filter (["s_zip_83"])
+                                                                                                    scan store
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_38", "sr_ticket_number_45"])
-                                                                                        scan store_returns
+                                                                                        dynamic filter (["sr_item_sk_38"])
+                                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_113"])
-                                                                                scan customer
+                                                                                dynamic filter (["c_birth_country_127"])
+                                                                                    scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q25.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q25.plan.txt
index a21872e9dd27..2cf400cb82cd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q25.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q25.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                scan item
+                                dynamic filter (["i_item_sk"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q26.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q26.plan.txt
index 555bb67d3baa..d91ef68bdab5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q26.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q26.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_cdemo_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q27.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q27.plan.txt
index ed0e2e73e9f3..bb3578559862 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q27.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q27.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q29.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q29.plan.txt
index a21872e9dd27..2cf400cb82cd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q29.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q29.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_item_desc, i_item_id, s_store_id, s_store_name)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                scan item
+                                dynamic filter (["i_item_sk"])
+                                    scan item
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_returned_date_sk"])
+                                                                            scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q30.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q30.plan.txt
index 22aacc68d139..681776bd3a09 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q30.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q30.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan web_returns
+                                                dynamic filter (["wr_returned_date_sk", "wr_returning_addr_sk", "wr_returning_customer_sk"])
+                                                    scan web_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                             join (INNER, REPLICATED):
-                                scan customer
+                                dynamic filter (["c_current_addr_sk"])
+                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
@@ -37,7 +39,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["wr_returning_addr_sk_31"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan web_returns
+                                                                    dynamic filter (["wr_returned_date_sk_21", "wr_returning_addr_sk_31"])
+                                                                        scan web_returns
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q31.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q31.plan.txt
index c89b05c7d74d..2486fa37f74f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q31.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q31.plan.txt
@@ -11,13 +11,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_10"])
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk_10", "ss_sold_date_sk_4"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_59"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_66", "ca_county_66", "ca_county_66"])
+                                                        scan customer_address
                         final aggregation over (ca_county_140, d_qoy_113, d_year_109)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_140"])
@@ -25,13 +27,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_84"])
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk_84", "ss_sold_date_sk_78"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_133"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_140", "ca_county_140"])
+                                                        scan customer_address
                     join (INNER, PARTITIONED):
                         final aggregation over (ca_county_276, d_qoy_249, d_year_245)
                             local exchange (GATHER, SINGLE, [])
@@ -40,13 +44,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_210"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk_210", "ws_sold_date_sk_203"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_269"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_276", "ca_county_276"])
+                                                        scan customer_address
                         final aggregation over (ca_county_361, d_qoy_334, d_year_330)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_361"])
@@ -54,13 +60,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_295"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk_295", "ws_sold_date_sk_288"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_354"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_361"])
+                                                        scan customer_address
                 join (INNER, PARTITIONED):
                     final aggregation over (ca_county, d_qoy, d_year)
                         local exchange (GATHER, SINGLE, [])
@@ -69,13 +77,15 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                scan customer_address
+                                                dynamic filter (["ca_county"])
+                                                    scan customer_address
                     final aggregation over (ca_county_191, d_qoy_164, d_year_160)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_county_191"])
@@ -83,7 +93,8 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q32.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q32.plan.txt
index d2a7e4049c81..c5607e291e5b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q32.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q32.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk_19"])
                                     partial aggregation over (cs_item_sk_19)
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk_19", "cs_sold_date_sk_4"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q33.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q33.plan.txt
index 1b2427d4e654..b0447bd7c0a9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q33.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q33.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_6"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_22)
@@ -36,7 +38,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_95"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_121)
@@ -62,7 +66,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -72,7 +77,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_196"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_manufact_id_222)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q34.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q34.plan.txt
index e9f7af9e157c..537336239d51 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q34.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q34.plan.txt
@@ -3,7 +3,8 @@ remote exchange (GATHER, SINGLE, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, PARTITIONED):
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                    scan customer
+                    dynamic filter (["c_customer_sk"])
+                        scan customer
                 final aggregation over (ss_customer_sk, ss_ticket_number)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
@@ -11,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q35.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q35.plan.txt
index f1fed4317214..5a7a74e49f1f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q35.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q35.plan.txt
@@ -13,7 +13,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                            scan customer
+                                                            dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_customer_sk"])
+                                                                scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                 scan customer_address
@@ -22,7 +23,8 @@ local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                             partial aggregation over (ss_customer_sk)
                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_sold_date_sk"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
@@ -34,7 +36,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -43,7 +46,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q36.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q36.plan.txt
index d640f5ac0d14..06cf870e256c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q36.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q36.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q37.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q37.plan.txt
index 2582d9fa4122..eadc54781cf8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q37.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q37.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"])
                     partial aggregation over (i_current_price, i_item_desc, i_item_id)
                         join (INNER, REPLICATED, can skip output duplicates):
-                            scan catalog_sales
+                            dynamic filter (["cs_item_sk"])
+                                scan catalog_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED, can skip output duplicates):
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan inventory
+                                            dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                                scan inventory
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q38.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q38.plan.txt
index 9f02b3c87024..b342ddb2e44f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q38.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q38.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -27,7 +28,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -42,7 +44,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q39.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q39.plan.txt
index 657fe01edba1..ef6b7c34e1a2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q39.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q39.plan.txt
@@ -10,16 +10,19 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan inventory
+                                                dynamic filter (["inv_date_sk", "inv_item_sk", "inv_item_sk", "inv_warehouse_sk", "inv_warehouse_sk"])
+                                                    scan inventory
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_item_sk"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                scan warehouse
+                                                dynamic filter (["w_warehouse_sk"])
+                                                    scan warehouse
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["inv_item_sk_9", "inv_warehouse_sk_10"])
                         final aggregation over (d_moy_62, inv_item_sk_9, inv_warehouse_sk_10, w_warehouse_name_40)
@@ -29,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan inventory
+                                                    dynamic filter (["inv_date_sk_8", "inv_item_sk_9", "inv_warehouse_sk_10"])
+                                                        scan inventory
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q40.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q40.plan.txt
index 266142fc4c1a..7b700b882104 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q40.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q40.plan.txt
@@ -9,10 +9,12 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (LEFT, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_warehouse_sk"])
+                                                scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                scan catalog_returns
+                                                dynamic filter (["cr_item_sk"])
+                                                    scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q41.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q41.plan.txt
index 58a96c8d1ec2..772ad4b317c4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q41.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q41.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_product_name)
                         single aggregation over (i_manufact, i_manufact_id, i_product_name, unique)
                             join (INNER, REPLICATED, can skip output duplicates):
-                                scan item
+                                dynamic filter (["i_manufact"])
+                                    scan item
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q42.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q42.plan.txt
index 87792b40cd98..534e670ed02a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q42.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q42.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_category, i_category_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q43.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q43.plan.txt
index 9d9e36441a12..b94077c666ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q43.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q43.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     partial aggregation over (d_day_name, s_store_id, s_store_name)
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q45.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q45.plan.txt
index 6a42b74e28db..95918f1b4170 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q45.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q45.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                scan customer
+                                                dynamic filter (["c_current_addr_sk"])
+                                                    scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                     scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q46.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q46.plan.txt
index d675e12143ee..a2a2c32a60a9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q46.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q46.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan store
@@ -27,7 +28,8 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                            scan customer
+                            dynamic filter (["c_current_addr_sk"])
+                                scan customer
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_address_sk_11"])
                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q47.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q47.plan.txt
index 2d63bde52f55..deca457a85b4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q47.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q47.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan store
+                                                        dynamic filter (["s_company_name", "s_company_name", "s_store_name", "s_store_name"])
+                                                            scan store
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                        scan item
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["i_brand_14", "i_category_18", "s_company_name_102", "s_store_name_90"])
                         final aggregation over (d_moy_63, d_year_61, i_brand_14, i_category_18, s_company_name_102, s_store_name_90)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_32", "ss_sold_date_sk_30", "ss_store_sk_37"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan store
+                                                        dynamic filter (["s_company_name_102", "s_store_name_90"])
+                                                            scan store
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_brand_14", "i_category_18"])
+                                                        scan item
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_brand_133", "i_category_137", "s_company_name_221", "s_store_name_209"])
                     final aggregation over (d_moy_182, d_year_180, i_brand_133, i_category_137, s_company_name_221, s_store_name_209)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk_151", "ss_sold_date_sk_149", "ss_store_sk_156"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q48.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q48.plan.txt
index dd3059b1afd4..17d20aa59ac5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q48.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q48.plan.txt
@@ -6,7 +6,8 @@ final aggregation over ()
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q49.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q49.plan.txt
index 6f687392953d..e3a416cd5356 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q49.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q49.plan.txt
@@ -12,11 +12,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (wr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                        scan web_returns
+                                                        dynamic filter (["wr_item_sk", "wr_order_number"])
+                                                            scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_sold_date_sk"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -30,11 +32,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (cr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                        scan catalog_returns
+                                                        dynamic filter (["cr_item_sk", "cr_order_number"])
+                                                            scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan catalog_sales
+                                                                dynamic filter (["cs_sold_date_sk"])
+                                                                    scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
@@ -48,11 +52,13 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (sr_item_sk)
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                        scan store_returns
+                                                        dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                                            scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q50.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q50.plan.txt
index c2a9d481bf10..8ff8d8dbfebf 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q50.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q50.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                            scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
                                             join (INNER, REPLICATED):
-                                                scan store_returns
+                                                dynamic filter (["sr_returned_date_sk"])
+                                                    scan store_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q51.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q51.plan.txt
index 6a1ca8bd4aca..32fa4cc52c6c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q51.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q51.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 partial aggregation over (d_date, ws_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                 partial aggregation over (d_date_7, ss_item_sk)
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q52.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q52.plan.txt
index 70aae3fa1bdd..ede6415850e5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q52.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q52.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q53.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q53.plan.txt
index cd10ab3698e6..799e43e0eca0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q53.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q53.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q54.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q54.plan.txt
index f5c3ef3b83c8..851fa255cf39 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q54.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q54.plan.txt
@@ -8,17 +8,19 @@ local exchange (GATHER, SINGLE, [])
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                     partial aggregation over (ss_customer_sk)
-                                        cross join:
-                                            cross join:
+                                        join (LEFT, REPLICATED):
+                                            join (LEFT, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, PARTITIONED):
                                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                         join (INNER, REPLICATED):
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk", "ca_county", "ca_state"])
+                                                                                scan customer_address
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan store
@@ -27,14 +29,17 @@ local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 partial aggregation over (c_current_addr_sk, c_customer_sk)
                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                        scan customer
+                                                                                        dynamic filter (["c_customer_sk"])
+                                                                                            scan customer
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                 join (INNER, REPLICATED, can skip output duplicates):
                                                                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                                                                        remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                                                                            scan catalog_sales
-                                                                                                            scan web_sales
+                                                                                                        local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                                                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                                scan catalog_sales
+                                                                                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                                scan web_sales
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q55.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q55.plan.txt
index f89f2f078b63..c58f37a50aa2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q55.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q55.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q56.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q56.plan.txt
index 35ea332fb456..30a5e380cbdd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q56.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q56.plan.txt
@@ -10,14 +10,16 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan item
+                                                        dynamic filter (["i_item_id_6"])
+                                                            scan item
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (i_item_id_10)
@@ -37,14 +39,16 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_bill_addr_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan item
+                                                            dynamic filter (["i_item_id_83"])
+                                                                scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (i_item_id_109)
@@ -64,14 +68,16 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         join (INNER, REPLICATED):
-                                                            scan item
+                                                            dynamic filter (["i_item_id_184"])
+                                                                scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     final aggregation over (i_item_id_210)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q57.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q57.plan.txt
index 105ad5f39b4a..df6922eae03b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q57.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q57.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                            scan item
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan call_center
+                                                    dynamic filter (["cc_name", "cc_name"])
+                                                        scan call_center
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["cc_name_102", "i_brand_14", "i_category_18"])
                         final aggregation over (cc_name_102, d_moy_74, d_year_72, i_brand_14, i_category_18)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk_41", "cs_item_sk_45", "cs_sold_date_sk_30"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_brand_14", "i_category_18"])
+                                                            scan item
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan call_center
+                                                    dynamic filter (["cc_name_102"])
+                                                        scan call_center
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["cc_name_232", "i_brand_144", "i_category_148"])
                     final aggregation over (cc_name_232, d_moy_204, d_year_202, i_brand_144, i_category_148)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_call_center_sk_171", "cs_item_sk_175", "cs_sold_date_sk_160"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q58.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q58.plan.txt
index 00602f5115c0..6592ac42f887 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q58.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q58.plan.txt
@@ -7,11 +7,13 @@ local exchange (GATHER, SINGLE, [])
                         partial aggregation over (i_item_id)
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan date_dim
+                                                dynamic filter (["d_date"])
+                                                    scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         final aggregation over (d_date_6)
@@ -19,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["d_date_6"])
                                                                     partial aggregation over (d_date_6)
                                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                                            scan date_dim
+                                                                            dynamic filter (["d_week_seq_8"])
+                                                                                scan date_dim
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     local exchange (GATHER, SINGLE, [])
@@ -27,7 +30,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                             scan date_dim
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
-                                        scan item
+                                        dynamic filter (["i_item_id"])
+                                            scan item
             join (INNER, PARTITIONED):
                 final aggregation over (i_item_id_69)
                     local exchange (GATHER, SINGLE, [])
@@ -35,11 +39,13 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_item_id_69)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan date_dim
+                                                    dynamic filter (["d_date_94"])
+                                                        scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (d_date_126)
@@ -47,7 +53,8 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["d_date_126"])
                                                                         partial aggregation over (d_date_126)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_128"])
+                                                                                    scan date_dim
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         local exchange (GATHER, SINGLE, [])
@@ -55,7 +62,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                 scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
-                                            scan item
+                                            dynamic filter (["i_item_id_69"])
+                                                scan item
                 final aggregation over (i_item_id_191)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["i_item_id_191"])
@@ -63,11 +71,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_216"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_248)
@@ -75,7 +85,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_248"])
                                                                             partial aggregation over (d_date_248)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_250"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             local exchange (GATHER, SINGLE, [])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q59.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q59.plan.txt
index ae30fe8f578e..933affe1eb9a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q59.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q59.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["d_day_name", "d_week_seq", "ss_store_sk"])
                                         partial aggregation over (d_day_name, d_week_seq, ss_store_sk)
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq"])
+                                                            scan date_dim
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["expr_203", "s_store_sk"])
                     join (INNER, PARTITIONED):
@@ -29,10 +31,12 @@ local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["d_day_name_85", "d_week_seq_75", "ss_store_sk_53"])
                                                                 partial aggregation over (d_day_name_85, d_week_seq_75, ss_store_sk_53)
                                                                     join (INNER, REPLICATED):
-                                                                        scan store_sales
+                                                                        dynamic filter (["ss_sold_date_sk_46", "ss_store_sk_53"])
+                                                                            scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_75"])
+                                                                                    scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -43,7 +47,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["s_store_sk_117"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["s_store_id"])
-                                        scan store
+                                        dynamic filter (["s_store_id"])
+                                            scan store
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["s_store_id_118"])
                                             scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q60.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q60.plan.txt
index e96c8c31aabb..34ac61dc445c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q60.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q60.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_6"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_10)
@@ -36,7 +38,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -46,7 +49,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_83"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_109)
@@ -62,7 +66,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -72,7 +77,8 @@ local exchange (GATHER, SINGLE, [])
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan item
+                                                    dynamic filter (["i_item_id_184"])
+                                                        scan item
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (i_item_id_210)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q61.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q61.plan.txt
index f5183d67d01e..e5538ffe3d08 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q61.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q61.plan.txt
@@ -9,7 +9,8 @@ cross join:
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -22,7 +23,8 @@ cross join:
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                     join (INNER, REPLICATED):
-                                        scan customer
+                                        dynamic filter (["c_current_addr_sk"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_address
@@ -38,7 +40,8 @@ cross join:
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk_15", "ss_item_sk_14", "ss_sold_date_sk_12", "ss_store_sk_19"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -51,7 +54,8 @@ cross join:
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["c_customer_sk_98"])
                                 join (INNER, REPLICATED):
-                                    scan customer
+                                    dynamic filter (["c_current_addr_sk_102"])
+                                        scan customer
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q62.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q62.plan.txt
index 61172c74fc4f..26846a9ba0a9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q62.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q62.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_ship_date_sk", "ws_ship_mode_sk", "ws_warehouse_sk", "ws_web_site_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q63.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q63.plan.txt
index 23e28eddc4b7..da2cbd549a64 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q63.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q63.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q64.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q64.plan.txt
index 69658a2c0896..b2f61e308b27 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q64.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q64.plan.txt
@@ -9,11 +9,13 @@ remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over (ca_city, ca_city_105, ca_street_name, ca_street_name_102, ca_street_number, ca_street_number_101, ca_zip, ca_zip_108, d_year, d_year_15, d_year_45, i_product_name, s_store_name, s_zip, ss_item_sk)
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ca_address_sk_99"])
-                                            scan customer_address
+                                            dynamic filter (["ca_address_sk_99"])
+                                                scan customer_address
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
@@ -30,13 +32,15 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                         join (INNER, PARTITIONED):
                                                                                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                                                                                                 join (INNER, REPLICATED):
-                                                                                                                    scan store_sales
+                                                                                                                    dynamic filter (["ss_cdemo_sk", "ss_customer_sk", "ss_hdemo_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                                                                        scan store_sales
                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                             scan date_dim
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                                                                    scan store_returns
+                                                                                                                    dynamic filter (["sr_item_sk", "sr_item_sk", "sr_item_sk"])
+                                                                                                                        scan store_returns
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 final aggregation over (cs_item_sk)
@@ -45,21 +49,25 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                             partial aggregation over (cs_item_sk)
                                                                                                                                 join (INNER, PARTITIONED):
                                                                                                                                     remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                                                                                        scan catalog_sales
+                                                                                                                                        dynamic filter (["cs_item_sk", "cs_item_sk", "cs_item_sk", "cs_order_number"])
+                                                                                                                                            scan catalog_sales
                                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                                         remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                                                                                            scan catalog_returns
+                                                                                                                                            dynamic filter (["cr_item_sk", "cr_item_sk"])
+                                                                                                                                                scan catalog_returns
                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                                             scan customer_demographics
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                        scan store
+                                                                                                        dynamic filter (["s_store_name", "s_zip"])
+                                                                                                            scan store
                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                                                 join (INNER, REPLICATED):
                                                                                                     join (INNER, REPLICATED):
-                                                                                                        scan customer
+                                                                                                        dynamic filter (["c_current_cdemo_sk", "c_current_hdemo_sk", "c_first_sales_date_sk", "c_first_shipto_date_sk"])
+                                                                                                            scan customer
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan date_dim
@@ -68,7 +76,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                             scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                                                            scan item
+                                                                                            dynamic filter (["i_item_sk"])
+                                                                                                scan item
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPARTITION, HASH, ["cd_demo_sk_75"])
                                                                                     scan customer_demographics
@@ -78,14 +87,16 @@ remote exchange (GATHER, SINGLE, [])
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk"])
+                                                                                    scan household_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan income_band
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, REPLICATED):
-                                                                            scan household_demographics
+                                                                            dynamic filter (["hd_income_band_sk_91"])
+                                                                                scan household_demographics
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan income_band
@@ -97,11 +108,13 @@ remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over (ca_city_452, ca_city_467, ca_street_name_449, ca_street_name_464, ca_street_number_448, ca_street_number_463, ca_zip_455, ca_zip_470, d_year_254, d_year_284, d_year_314, i_product_name_507, s_store_name_343, s_zip_363, ss_item_sk_134)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk_461"])
-                                                scan customer_address
+                                                dynamic filter (["ca_address_sk_461"])
+                                                    scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk_373"])
                                                     join (INNER, REPLICATED):
-                                                        scan customer_address
+                                                        dynamic filter (["ca_address_sk_446"])
+                                                            scan customer_address
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
@@ -118,13 +131,15 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                             join (INNER, PARTITIONED):
                                                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk_134", "ss_ticket_number_141"])
                                                                                                                     join (INNER, REPLICATED):
-                                                                                                                        scan store_sales
+                                                                                                                        dynamic filter (["ss_cdemo_sk_136", "ss_customer_sk_135", "ss_hdemo_sk_137", "ss_item_sk_134", "ss_item_sk_134", "ss_item_sk_134", "ss_promo_sk_140", "ss_sold_date_sk_132", "ss_store_sk_139", "ss_ticket_number_141"])
+                                                                                                                            scan store_sales
                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                                 scan date_dim
                                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_159", "sr_ticket_number_166"])
-                                                                                                                        scan store_returns
+                                                                                                                        dynamic filter (["sr_item_sk_159", "sr_item_sk_159"])
+                                                                                                                            scan store_returns
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     final aggregation over (cs_item_sk_194)
@@ -133,10 +148,12 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                                 partial aggregation over (cs_item_sk_194)
                                                                                                                                     join (INNER, PARTITIONED):
                                                                                                                                         remote exchange (REPARTITION, HASH, ["cs_item_sk_194", "cs_order_number_196"])
-                                                                                                                                            scan catalog_sales
+                                                                                                                                            dynamic filter (["cs_item_sk_194", "cs_item_sk_194", "cs_order_number_196"])
+                                                                                                                                                scan catalog_sales
                                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                                             remote exchange (REPARTITION, HASH, ["cr_item_sk_217", "cr_order_number_231"])
-                                                                                                                                                scan catalog_returns
+                                                                                                                                                dynamic filter (["cr_item_sk_217"])
+                                                                                                                                                    scan catalog_returns
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                 scan customer_demographics
@@ -147,7 +164,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_369"])
                                                                                                     join (INNER, REPLICATED):
                                                                                                         join (INNER, REPLICATED):
-                                                                                                            scan customer
+                                                                                                            dynamic filter (["c_current_cdemo_sk_371", "c_current_hdemo_sk_372", "c_first_sales_date_sk_375", "c_first_shipto_date_sk_374"])
+                                                                                                                scan customer
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
@@ -166,14 +184,16 @@ remote exchange (GATHER, SINGLE, [])
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 join (INNER, REPLICATED):
-                                                                                    scan household_demographics
+                                                                                    dynamic filter (["hd_income_band_sk_433"])
+                                                                                        scan household_demographics
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             scan income_band
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk_440"])
+                                                                                    scan household_demographics
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q65.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q65.plan.txt
index d464032d91fc..869d645686cd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q65.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q65.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_item_sk_8", "ss_store_sk_13"])
                             partial aggregation over (ss_item_sk_8, ss_store_sk_13)
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk_8", "ss_sold_date_sk_6", "ss_store_sk_13"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                     remote exchange (REPLICATE, BROADCAST, [])
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["s_store_sk"])
-                                scan store
+                                dynamic filter (["s_store_sk"])
+                                    scan store
                             final aggregation over (ss_store_sk)
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_store_sk"])
@@ -25,7 +27,8 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_store_sk"])
                                                         partial aggregation over (ss_item_sk, ss_store_sk)
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q66.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q66.plan.txt
index b87ae78025f5..ba2954f5d404 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q66.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q66.plan.txt
@@ -15,7 +15,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_ship_mode_sk", "ws_sold_date_sk", "ws_sold_time_sk", "ws_warehouse_sk"])
+                                                                        scan web_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan ship_mode
@@ -41,7 +42,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_ship_mode_sk", "cs_sold_date_sk", "cs_sold_time_sk", "cs_warehouse_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan ship_mode
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q67.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q67.plan.txt
index 60f46f2fcf90..66c2001151d6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q67.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q67.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q68.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q68.plan.txt
index 0df5521a9d32..b8cefafe7ca2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q68.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q68.plan.txt
@@ -4,7 +4,8 @@ local exchange (GATHER, SINGLE, [])
             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                        scan customer
+                        dynamic filter (["c_current_addr_sk", "c_customer_sk"])
+                            scan customer
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                             final aggregation over (ca_city, ss_addr_sk, ss_customer_sk, ss_ticket_number)
@@ -15,7 +16,8 @@ local exchange (GATHER, SINGLE, [])
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_addr_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q69.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q69.plan.txt
index d304792469c0..c79f374b67e4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q69.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q69.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -19,7 +20,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["cd_demo_sk"])
-                                                scan customer_demographics
+                                                dynamic filter (["cd_demo_sk"])
+                                                    scan customer_demographics
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_current_cdemo_sk"])
                                                     join (INNER, PARTITIONED):
@@ -28,14 +30,16 @@ local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                                     partial aggregation over (ss_customer_sk)
                                                                         join (INNER, REPLICATED, can skip output duplicates):
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                                scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan customer
+                                                                    dynamic filter (["c_current_addr_sk"])
+                                                                        scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan customer_address
@@ -44,7 +48,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q70.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q70.plan.txt
index 0ba93430749a..9ed44d6f32bd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q70.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q70.plan.txt
@@ -10,13 +10,15 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["s_state"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan store
+                                                    dynamic filter (["s_state"])
+                                                        scan store
                                     single aggregation over (s_state_53)
                                         final aggregation over (s_state_53)
                                             local exchange (GATHER, SINGLE, [])
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                                     partial aggregation over (s_state_53)
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk_4", "ss_store_sk_11"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q71.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q71.plan.txt
index 599dd0ab9f9c..f5d3c7ec8a7e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q71.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q71.plan.txt
@@ -7,19 +7,22 @@ remote exchange (GATHER, SINGLE, [])
                         partial aggregation over (i_brand, i_brand_id, t_hour, t_minute)
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
+                                    local exchange (REPARTITION, ROUND_ROBIN, [])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk", "ws_sold_time_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_sold_time_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_sold_time_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q72.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q72.plan.txt
index 9c47f45ae5a1..cc812789f826 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q72.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q72.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["inv_item_sk"])
                                             join (INNER, REPLICATED):
-                                                scan inventory
+                                                dynamic filter (["inv_date_sk", "inv_item_sk", "inv_quantity_on_hand", "inv_warehouse_sk"])
+                                                    scan inventory
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq_16"])
+                                                            scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
@@ -21,7 +23,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_bill_cdemo_sk", "cs_bill_hdemo_sk", "cs_item_sk", "cs_ship_date_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan household_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q73.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q73.plan.txt
index 8a3c9f5087e6..0ceb0cf526e0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q73.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q73.plan.txt
@@ -3,7 +3,8 @@ remote exchange (GATHER, SINGLE, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, PARTITIONED):
                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                    scan customer
+                    dynamic filter (["c_customer_sk"])
+                        scan customer
                 final aggregation over (ss_customer_sk, ss_ticket_number)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
@@ -11,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q74.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q74.plan.txt
index e05771f18836..c8c3d330e7cb 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q74.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q74.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_91"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk_91", "ss_sold_date_sk_88"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_68"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_69", "c_customer_id_69"])
+                                                scan customer
                 final aggregation over (c_customer_id_329, c_first_name_336, c_last_name_337, d_year_390)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_329"])
@@ -23,13 +25,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_352"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_352", "ws_sold_date_sk_348"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_328"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id_329"])
+                                                scan customer
             join (INNER, PARTITIONED):
                 final aggregation over (c_customer_id, c_first_name, c_last_name, d_year)
                     local exchange (GATHER, SINGLE, [])
@@ -38,13 +42,15 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_customer_id"])
+                                                scan customer
                 final aggregation over (c_customer_id_508, c_first_name_515, c_last_name_516, d_year_569)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["c_customer_id_508"])
@@ -52,7 +58,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_531"])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_bill_customer_sk_531", "ws_sold_date_sk_527"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q75.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q75.plan.txt
index fef6864e7254..0513d29cbb4c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q75.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q75.plan.txt
@@ -8,15 +8,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_13, expr, expr_18, i_brand_id_7, i_category_id_9, i_class_id_8, i_manufact_id_10)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                        scan catalog_returns
+                                        dynamic filter (["cr_item_sk", "cr_order_number"])
+                                            scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_7", "i_category_id_9", "i_class_id_8", "i_manufact_id_10"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -24,15 +27,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_51, expr_77, expr_78, i_brand_id_28, i_category_id_32, i_class_id_30, i_manufact_id_34)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk", "sr_ticket_number"])
+                                            scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_28", "i_category_id_32", "i_class_id_30", "i_manufact_id_34"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -40,15 +46,18 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_111, expr_137, expr_138, i_brand_id_88, i_category_id_92, i_class_id_90, i_manufact_id_94)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                        scan web_returns
+                                        dynamic filter (["wr_item_sk", "wr_order_number"])
+                                            scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_id_88", "i_category_id_92", "i_class_id_90", "i_manufact_id_94"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -59,12 +68,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_221, expr_274, expr_275, i_brand_id_198, i_category_id_202, i_class_id_200, i_manufact_id_204)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk_247", "cr_order_number_261"])
-                                        scan catalog_returns
+                                        dynamic filter (["cr_item_sk_247", "cr_order_number_261"])
+                                            scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk_170", "cs_order_number_172"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_item_sk_170", "cs_sold_date_sk_155"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
@@ -75,12 +86,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_331, expr_377, expr_378, i_brand_id_308, i_category_id_312, i_class_id_310, i_manufact_id_314)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk_357", "sr_ticket_number_364"])
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk_357", "sr_ticket_number_364"])
+                                            scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_item_sk_278", "ss_ticket_number_285"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_278", "ss_sold_date_sk_276"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
@@ -91,12 +104,14 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (d_year_445, expr_495, expr_496, i_brand_id_422, i_category_id_426, i_class_id_424, i_manufact_id_428)
                                 join (RIGHT, PARTITIONED, can skip output duplicates):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk_471", "wr_order_number_482"])
-                                        scan web_returns
+                                        dynamic filter (["wr_item_sk_471", "wr_order_number_482"])
+                                            scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_item_sk_382", "ws_order_number_396"])
                                             join (INNER, REPLICATED, can skip output duplicates):
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_item_sk_382", "ws_sold_date_sk_379"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q76.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q76.plan.txt
index 044c8310d542..a13c0fb4d65e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q76.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q76.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_10, d_year_9, expr_134, expr_135, i_category_6)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
@@ -19,7 +20,8 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_sold_date_sk"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["ws_item_sk"])
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_17"])
                                             scan item
@@ -30,7 +32,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_111, d_year_107, expr_131, expr_133, i_category_89)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan catalog_sales
+                                dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                    scan catalog_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q77.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q77.plan.txt
index f5f8b7b62eea..b632624a3d15 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q77.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q77.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ss_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -25,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (sr_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_returns
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -38,7 +40,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_call_center_sk"])
                                             partial aggregation over (cs_call_center_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -49,7 +52,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["cr_call_center_sk"])
                                                     partial aggregation over (cr_call_center_sk)
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_returns
+                                                            dynamic filter (["cr_returned_date_sk"])
+                                                                scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -60,7 +64,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ws_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_page_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -73,7 +78,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (wr_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_returns
+                                                        dynamic filter (["wr_returned_date_sk", "wr_web_page_sk"])
+                                                            scan web_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q78.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q78.plan.txt
index e9a4bce6caf7..a13222cb0024 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q78.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q78.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk", "ss_customer_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                    scan store_returns
+                                                    dynamic filter (["sr_item_sk"])
+                                                        scan store_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
                                                     scan web_returns
@@ -38,7 +41,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (LEFT, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                        scan catalog_sales
+                                        dynamic filter (["cs_sold_date_sk"])
+                                            scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
                                             scan catalog_returns
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q79.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q79.plan.txt
index c41171325a3c..733be6f6e8b7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q79.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q79.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q80.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q80.plan.txt
index a4b2da9fdab0..61944a8d3ab3 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q80.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q80.plan.txt
@@ -15,10 +15,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                        scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_item_sk"])
+                                                                            scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -41,10 +43,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_catalog_page_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                        scan catalog_returns
+                                                                        dynamic filter (["cr_item_sk"])
+                                                                            scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -67,10 +71,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_item_sk", "ws_promo_sk", "ws_sold_date_sk", "ws_web_site_sk"])
+                                                                        scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_item_sk"])
+                                                                            scan web_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q81.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q81.plan.txt
index f07bffd03de9..e4567eae50a0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q81.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q81.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk"])
                                             join (INNER, REPLICATED):
-                                                scan catalog_returns
+                                                dynamic filter (["cr_returned_date_sk", "cr_returning_addr_sk", "cr_returning_customer_sk"])
+                                                    scan catalog_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPLICATE, BROADCAST, [])
                             join (INNER, REPLICATED):
-                                scan customer
+                                dynamic filter (["c_current_addr_sk"])
+                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
@@ -37,7 +39,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["cr_returning_addr_sk_31"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_returns
+                                                                    dynamic filter (["cr_returned_date_sk_21", "cr_returning_addr_sk_31"])
+                                                                        scan catalog_returns
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q82.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q82.plan.txt
index 532952036fc3..d3b691e03fe2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q82.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q82.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_current_price", "i_item_desc", "i_item_id"])
                     partial aggregation over (i_current_price, i_item_desc, i_item_id)
                         join (INNER, REPLICATED, can skip output duplicates):
-                            scan store_sales
+                            dynamic filter (["ss_item_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     join (INNER, REPLICATED, can skip output duplicates):
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan inventory
+                                            dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                                scan inventory
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q83.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q83.plan.txt
index 108710add4fd..5adb2dfd0e20 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q83.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q83.plan.txt
@@ -8,11 +8,13 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["sr_item_sk"])
                                     join (INNER, REPLICATED):
-                                        scan store_returns
+                                        dynamic filter (["sr_item_sk", "sr_returned_date_sk"])
+                                            scan store_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan date_dim
+                                                    dynamic filter (["d_date"])
+                                                        scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (d_date_6)
@@ -20,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["d_date_6"])
                                                                         partial aggregation over (d_date_6)
                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                scan date_dim
+                                                                                dynamic filter (["d_week_seq_8"])
+                                                                                    scan date_dim
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         final aggregation over (d_week_seq_40)
@@ -30,7 +33,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                         scan date_dim
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["i_item_sk"])
-                                        scan item
+                                        dynamic filter (["i_item_id"])
+                                            scan item
             join (INNER, PARTITIONED):
                 final aggregation over (i_item_id_74)
                     local exchange (GATHER, SINGLE, [])
@@ -39,11 +43,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["cr_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan catalog_returns
+                                            dynamic filter (["cr_item_sk", "cr_returned_date_sk"])
+                                                scan catalog_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_99"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_131)
@@ -51,7 +57,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_131"])
                                                                             partial aggregation over (d_date_131)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_133"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             final aggregation over (d_week_seq_165)
@@ -61,7 +68,8 @@ local exchange (GATHER, SINGLE, [])
                                                                                                             scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["i_item_sk_73"])
-                                            scan item
+                                            dynamic filter (["i_item_id_74"])
+                                                scan item
                 final aggregation over (i_item_id_201)
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["i_item_id_201"])
@@ -69,11 +77,13 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["wr_item_sk"])
                                         join (INNER, REPLICATED):
-                                            scan web_returns
+                                            dynamic filter (["wr_item_sk", "wr_returned_date_sk"])
+                                                scan web_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan date_dim
+                                                        dynamic filter (["d_date_226"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_date_258)
@@ -81,7 +91,8 @@ local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["d_date_258"])
                                                                             partial aggregation over (d_date_258)
                                                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                                                    scan date_dim
+                                                                                    dynamic filter (["d_week_seq_260"])
+                                                                                        scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             final aggregation over (d_week_seq_292)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q84.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q84.plan.txt
index ec22af2c6a55..b1402e98e5ab 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q84.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q84.plan.txt
@@ -1,23 +1,27 @@
 local exchange (GATHER, SINGLE, [])
     remote exchange (GATHER, SINGLE, [])
         join (INNER, REPLICATED):
-            scan store_returns
+            dynamic filter (["sr_cdemo_sk"])
+                scan store_returns
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPLICATE, BROADCAST, [])
                     join (INNER, REPLICATED):
-                        scan customer_demographics
+                        dynamic filter (["cd_demo_sk"])
+                            scan customer_demographics
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPLICATE, BROADCAST, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan customer
+                                        dynamic filter (["c_current_addr_sk", "c_current_hdemo_sk"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_address
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan household_demographics
+                                                dynamic filter (["hd_income_band_sk"])
+                                                    scan household_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q85.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q85.plan.txt
index 23eed8958c96..fc6d26559bc9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q85.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q85.plan.txt
@@ -6,26 +6,30 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (r_reason_desc)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan customer_demographics
+                                dynamic filter (["cd_demo_sk_6", "cd_education_status_9", "cd_marital_status_8"])
+                                    scan customer_demographics
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_address_sk"])
+                                                        scan customer_address
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["wr_refunded_addr_sk"])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan web_sales
+                                                                        dynamic filter (["ws_item_sk", "ws_order_number", "ws_sold_date_sk", "ws_web_page_sk"])
+                                                                            scan web_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan date_dim
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_reason_sk", "wr_refunded_cdemo_sk"])
+                                                                            scan web_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q86.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q86.plan.txt
index cca927926827..38fdc67f5412 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q86.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q86.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (groupid, i_category$gid, i_class$gid)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q87.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q87.plan.txt
index 9f02b3c87024..b342ddb2e44f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q87.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q87.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -27,7 +28,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -42,7 +44,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q88.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q88.plan.txt
index 6e297c60e201..123c3d12c59d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q88.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q88.plan.txt
@@ -12,7 +12,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan time_dim
@@ -29,7 +30,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk_11", "ss_sold_time_sk_7", "ss_store_sk_13"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan time_dim
@@ -46,7 +48,8 @@ cross join:
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_hdemo_sk_87", "ss_sold_time_sk_83", "ss_store_sk_89"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan time_dim
@@ -63,7 +66,8 @@ cross join:
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_hdemo_sk_163", "ss_sold_time_sk_159", "ss_store_sk_165"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan time_dim
@@ -80,7 +84,8 @@ cross join:
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk_239", "ss_sold_time_sk_235", "ss_store_sk_241"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan time_dim
@@ -97,7 +102,8 @@ cross join:
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_hdemo_sk_315", "ss_sold_time_sk_311", "ss_store_sk_317"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan time_dim
@@ -114,7 +120,8 @@ cross join:
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_hdemo_sk_391", "ss_sold_time_sk_387", "ss_store_sk_393"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan time_dim
@@ -131,7 +138,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_hdemo_sk_467", "ss_sold_time_sk_463", "ss_store_sk_469"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan time_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q89.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q89.plan.txt
index 396d705bbc38..221dfc17c333 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q89.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q89.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q90.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q90.plan.txt
index 0ddf21aa574d..0645101dc4e6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q90.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q90.plan.txt
@@ -6,7 +6,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk", "ws_sold_time_sk", "ws_web_page_sk"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan web_page
@@ -23,7 +24,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk_16", "ws_sold_time_sk_7", "ws_web_page_sk_18"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan web_page
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q91.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q91.plan.txt
index 2d679f5abc8e..11e637bca84b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q91.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q91.plan.txt
@@ -8,17 +8,20 @@ remote exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_returns
+                                        dynamic filter (["cr_call_center_sk", "cr_returned_date_sk", "cr_returning_customer_sk"])
+                                            scan catalog_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                        scan customer_address
+                                                        dynamic filter (["ca_address_sk"])
+                                                            scan customer_address
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan customer
+                                                                    dynamic filter (["c_current_cdemo_sk", "c_current_hdemo_sk"])
+                                                                        scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q92.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q92.plan.txt
index 55eb5a4a778f..f88e053a3194 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q92.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q92.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk_7"])
                                     partial aggregation over (ws_item_sk_7)
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk_7", "ws_sold_date_sk_4"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q93.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q93.plan.txt
index ca9dc7543db7..e1cd897adff9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q93.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q93.plan.txt
@@ -7,10 +7,12 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk", "ss_ticket_number"])
+                                        scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_reason_sk"])
+                                            scan store_returns
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan reason
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q94.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q94.plan.txt
index d027a28cdae5..2a9b2ecdeee5 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q94.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q94.plan.txt
@@ -8,19 +8,22 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["wr_order_number"])
                                     partial aggregation over (wr_order_number)
-                                        scan web_returns
+                                        dynamic filter (["wr_order_number"])
+                                            scan web_returns
                         final aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number_23, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ws_order_number_23"])
                                     partial aggregation over (ca_state, d_date, unique, web_company_name, ws_ext_ship_cost, ws_net_profit, ws_order_number_23, ws_ship_addr_sk, ws_ship_date_sk, ws_warehouse_sk, ws_web_site_sk)
                                         join (INNER, REPLICATED, can skip output duplicates):
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_23"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q95.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q95.plan.txt
index aaf3edd0ed42..108f553caff7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q95.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q95.plan.txt
@@ -9,29 +9,35 @@ final aggregation over ()
                                 join (INNER, PARTITIONED, can skip output duplicates):
                                     join (INNER, PARTITIONED, can skip output duplicates):
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_101"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_101", "ws_order_number_101", "ws_order_number_101"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["wr_order_number"])
-                                                scan web_returns
+                                                dynamic filter (["wr_order_number", "wr_order_number"])
+                                                    scan web_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_137"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_137"])
+                                                scan web_sales
                     join (INNER, PARTITIONED):
                         final aggregation over (ws_order_number_23)
                             local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (ws_order_number_23)
                                     join (INNER, PARTITIONED, can skip output duplicates):
                                         remote exchange (REPARTITION, HASH, ["ws_order_number_23"])
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number_23", "ws_order_number_23"])
+                                                scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ws_order_number_59"])
-                                                scan web_sales
+                                                dynamic filter (["ws_order_number_59"])
+                                                    scan web_sales
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ws_order_number"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q96.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q96.plan.txt
index 6ac294895946..e4fdf4d14611 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q96.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q96.plan.txt
@@ -5,7 +5,8 @@ final aggregation over ()
                 join (INNER, REPLICATED):
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
-                            scan store_sales
+                            dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan time_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q97.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q97.plan.txt
index 7b9c83293534..959bbfe9de73 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q97.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q97.plan.txt
@@ -8,7 +8,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"])
                                 partial aggregation over (ss_customer_sk, ss_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"])
                                 partial aggregation over (cs_bill_customer_sk, cs_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q98.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q98.plan.txt
index 9775b6c511f5..7c0caca03f27 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q98.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q98.plan.txt
@@ -9,7 +9,8 @@ remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q99.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q99.plan.txt
index e7f593fe04e2..99580251ab0a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q99.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg/parquet/unpartitioned/q99.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_call_center_sk", "cs_ship_date_sk", "cs_ship_mode_sk", "cs_warehouse_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q01.plan.txt
index 745fed707f31..40cb14e1003f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q01.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q01.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_store_sk"])
                                             partial aggregation over (sr_customer_sk, sr_store_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan store_returns
+                                                    dynamic filter (["sr_customer_sk", "sr_returned_date_sk", "sr_store_sk"])
+                                                        scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -30,7 +31,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["sr_customer_sk_9", "sr_store_sk_13"])
                                             partial aggregation over (sr_customer_sk_9, sr_store_sk_13)
                                                 join (INNER, REPLICATED):
-                                                    scan store_returns
+                                                    dynamic filter (["sr_returned_date_sk_6"])
+                                                        scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q02.plan.txt
index f26bc3efa106..46e333a0c7ce 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q02.plan.txt
@@ -12,15 +12,19 @@ remote exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["d_day_name", "d_week_seq"])
                                                 partial aggregation over (d_day_name, d_week_seq)
                                                     join (INNER, REPLICATED):
-                                                        remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                            scan web_sales
-                                                            scan catalog_sales
+                                                        local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                            dynamic filter (["ws_sold_date_sk"])
+                                                                scan web_sales
+                                                            dynamic filter (["cs_sold_date_sk"])
+                                                                scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                scan date_dim
+                                                                dynamic filter (["d_week_seq", "d_week_seq"])
+                                                                    scan date_dim
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["d_week_seq_20"])
-                            scan date_dim
+                            dynamic filter (["d_week_seq_20"])
+                                scan date_dim
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["expr_219"])
                         join (INNER, PARTITIONED):
@@ -33,12 +37,15 @@ remote exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["d_day_name_134", "d_week_seq_124"])
                                                         partial aggregation over (d_day_name_134, d_week_seq_124)
                                                             join (INNER, REPLICATED):
-                                                                remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                                    scan web_sales
-                                                                    scan catalog_sales
+                                                                local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                                    dynamic filter (["ws_sold_date_sk_48"])
+                                                                        scan web_sales
+                                                                    dynamic filter (["cs_sold_date_sk_84"])
+                                                                        scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                        scan date_dim
+                                                                        dynamic filter (["d_week_seq_124"])
+                                                                            scan date_dim
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_week_seq_169"])
                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q03.plan.txt
index 33752e693e6c..79ab5d5f2dc7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q03.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q04.plan.txt
index e48665bec1f3..1c6e49f74566 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q04.plan.txt
@@ -13,10 +13,12 @@ local exchange (GATHER, SINGLE, [])
                                                 join (INNER, REPLICATED):
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
-                                                            scan store_sales
+                                                            dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                                scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                                scan customer
+                                                                dynamic filter (["c_customer_id", "c_customer_id", "c_customer_id", "c_customer_id", "c_customer_id"])
+                                                                    scan customer
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -29,10 +31,12 @@ local exchange (GATHER, SINGLE, [])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_184"])
-                                                                scan store_sales
+                                                                dynamic filter (["ss_customer_sk_184", "ss_sold_date_sk_181"])
+                                                                    scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_161"])
-                                                                    scan customer
+                                                                    dynamic filter (["c_customer_id_162", "c_customer_id_162", "c_customer_id_162", "c_customer_id_162"])
+                                                                        scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -45,10 +49,12 @@ local exchange (GATHER, SINGLE, [])
                                                 join (INNER, REPLICATED):
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_570"])
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_bill_customer_sk_570", "cs_sold_date_sk_567"])
+                                                                scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_547"])
-                                                                scan customer
+                                                                dynamic filter (["c_customer_id_548", "c_customer_id_548", "c_customer_id_548"])
+                                                                    scan customer
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -61,10 +67,12 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, REPLICATED):
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk_870"])
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk_870", "cs_sold_date_sk_867"])
+                                                            scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_847"])
-                                                            scan customer
+                                                            dynamic filter (["c_customer_id_848", "c_customer_id_848"])
+                                                                scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -77,10 +85,12 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1268"])
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_customer_sk_1268", "ws_sold_date_sk_1264"])
+                                                        scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_customer_sk_1244"])
-                                                        scan customer
+                                                        dynamic filter (["c_customer_id_1245"])
+                                                            scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -93,7 +103,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_1568"])
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_1568", "ws_sold_date_sk_1564"])
+                                                    scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_1544"])
                                                     scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q05.plan.txt
index a837004a655b..9be0861f4b8a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q05.plan.txt
@@ -11,9 +11,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (s_store_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan store_sales
-                                                        scan store_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -26,9 +28,11 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (cp_catalog_page_id)
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan catalog_sales
-                                                        scan catalog_returns
+                                                    local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                        dynamic filter (["cs_catalog_page_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
+                                                        dynamic filter (["cr_catalog_page_sk", "cr_returned_date_sk"])
+                                                            scan catalog_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -42,13 +46,16 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_site_sk"])
+                                                            scan web_sales
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ws_item_sk_82", "ws_order_number_96"])
-                                                                scan web_sales
+                                                                dynamic filter (["ws_item_sk_82", "ws_order_number_96", "ws_web_site_sk_92"])
+                                                                    scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                    scan web_returns
+                                                                    dynamic filter (["wr_returned_date_sk"])
+                                                                        scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q06.plan.txt
index c89d18969b08..512c56c4d431 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q06.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q06.plan.txt
@@ -13,16 +13,19 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                            scan customer
+                                                            dynamic filter (["c_current_addr_sk", "c_customer_sk"])
+                                                                scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                 scan customer_address
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
-                                                        scan store_sales
+                                                        dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan date_dim
+                                                    dynamic filter (["d_month_seq"])
+                                                        scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q07.plan.txt
index 601bf97db238..7bae158b739d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q07.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q08.plan.txt
index 45b29afc325b..c8c9a0381d97 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q08.plan.txt
@@ -5,10 +5,11 @@ local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["s_store_name"])
                     partial aggregation over (s_store_name)
                         join (INNER, PARTITIONED):
-                            remote exchange (REPARTITION, HASH, ["substr_34"])
+                            remote exchange (REPARTITION, HASH, ["substring"])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -16,7 +17,7 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan store
                             local exchange (GATHER, SINGLE, [])
-                                remote exchange (REPARTITION, HASH, ["substr_35"])
+                                remote exchange (REPARTITION, HASH, ["substring_34"])
                                     final aggregation over (ca_zip)
                                         local exchange (REPARTITION, HASH, ["ca_zip"])
                                             remote exchange (REPARTITION, HASH, ["ca_zip_26"])
@@ -30,7 +31,8 @@ local exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over (ca_zip_16)
                                                                     join (INNER, PARTITIONED):
                                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk_7"])
-                                                                            scan customer_address
+                                                                            dynamic filter (["ca_address_sk_7"])
+                                                                                scan customer_address
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                                                                 scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q09.plan.txt
index 4466a2d88feb..510c370f94d9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q09.plan.txt
@@ -1,93 +1,122 @@
-cross join:
-    cross join:
-        cross join:
-            cross join:
-                cross join:
-                    cross join:
-                        cross join:
-                            cross join:
-                                cross join:
-                                    cross join:
-                                        cross join:
-                                            cross join:
-                                                cross join:
-                                                    cross join:
-                                                        cross join:
+join (LEFT, REPLICATED):
+    join (LEFT, REPLICATED):
+        join (LEFT, REPLICATED):
+            join (LEFT, REPLICATED):
+                join (LEFT, REPLICATED):
+                    join (LEFT, REPLICATED):
+                        join (LEFT, REPLICATED):
+                            join (LEFT, REPLICATED):
+                                join (LEFT, REPLICATED):
+                                    join (LEFT, REPLICATED):
+                                        join (LEFT, REPLICATED):
+                                            join (LEFT, REPLICATED):
+                                                join (LEFT, REPLICATED):
+                                                    join (LEFT, REPLICATED):
+                                                        join (RIGHT, PARTITIONED):
+                                                            remote exchange (REPARTITION, HASH, [])
+                                                                final aggregation over ()
+                                                                    local exchange (GATHER, SINGLE, [])
+                                                                        remote exchange (GATHER, SINGLE, [])
+                                                                            partial aggregation over ()
+                                                                                scan store_sales
+                                                            local exchange (GATHER, SINGLE, [])
+                                                                remote exchange (REPARTITION, HASH, [])
+                                                                    scan reason
+                                                        local exchange (GATHER, SINGLE, [])
+                                                            remote exchange (REPLICATE, BROADCAST, [])
+                                                                final aggregation over ()
+                                                                    local exchange (GATHER, SINGLE, [])
+                                                                        remote exchange (GATHER, SINGLE, [])
+                                                                            partial aggregation over ()
+                                                                                scan store_sales
+                                                    local exchange (GATHER, SINGLE, [])
+                                                        remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over ()
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (GATHER, SINGLE, [])
                                                                         partial aggregation over ()
                                                                             scan store_sales
-                                                            local exchange (GATHER, SINGLE, [])
-                                                                remote exchange (GATHER, SINGLE, [])
-                                                                    scan reason
+                                                local exchange (GATHER, SINGLE, [])
+                                                    remote exchange (REPLICATE, BROADCAST, [])
                                                         final aggregation over ()
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (GATHER, SINGLE, [])
                                                                     partial aggregation over ()
                                                                         scan store_sales
+                                            local exchange (GATHER, SINGLE, [])
+                                                remote exchange (REPLICATE, BROADCAST, [])
                                                     final aggregation over ()
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (GATHER, SINGLE, [])
                                                                 partial aggregation over ()
                                                                     scan store_sales
+                                        local exchange (GATHER, SINGLE, [])
+                                            remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over ()
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (GATHER, SINGLE, [])
                                                             partial aggregation over ()
                                                                 scan store_sales
+                                    local exchange (GATHER, SINGLE, [])
+                                        remote exchange (REPLICATE, BROADCAST, [])
                                             final aggregation over ()
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (GATHER, SINGLE, [])
                                                         partial aggregation over ()
                                                             scan store_sales
+                                local exchange (GATHER, SINGLE, [])
+                                    remote exchange (REPLICATE, BROADCAST, [])
                                         final aggregation over ()
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         scan store_sales
+                            local exchange (GATHER, SINGLE, [])
+                                remote exchange (REPLICATE, BROADCAST, [])
                                     final aggregation over ()
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (GATHER, SINGLE, [])
                                                 partial aggregation over ()
                                                     scan store_sales
+                        local exchange (GATHER, SINGLE, [])
+                            remote exchange (REPLICATE, BROADCAST, [])
                                 final aggregation over ()
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (GATHER, SINGLE, [])
                                             partial aggregation over ()
                                                 scan store_sales
+                    local exchange (GATHER, SINGLE, [])
+                        remote exchange (REPLICATE, BROADCAST, [])
                             final aggregation over ()
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (GATHER, SINGLE, [])
                                         partial aggregation over ()
                                             scan store_sales
+                local exchange (GATHER, SINGLE, [])
+                    remote exchange (REPLICATE, BROADCAST, [])
                         final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         scan store_sales
+            local exchange (GATHER, SINGLE, [])
+                remote exchange (REPLICATE, BROADCAST, [])
                     final aggregation over ()
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over ()
                                     scan store_sales
+        local exchange (GATHER, SINGLE, [])
+            remote exchange (REPLICATE, BROADCAST, [])
                 final aggregation over ()
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (GATHER, SINGLE, [])
                             partial aggregation over ()
                                 scan store_sales
+    local exchange (GATHER, SINGLE, [])
+        remote exchange (REPLICATE, BROADCAST, [])
             final aggregation over ()
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (GATHER, SINGLE, [])
                         partial aggregation over ()
                             scan store_sales
-        final aggregation over ()
-            local exchange (GATHER, SINGLE, [])
-                remote exchange (GATHER, SINGLE, [])
-                    partial aggregation over ()
-                        scan store_sales
-    final aggregation over ()
-        local exchange (GATHER, SINGLE, [])
-            remote exchange (GATHER, SINGLE, [])
-                partial aggregation over ()
-                    scan store_sales
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q10.plan.txt
index 38d3383a9e95..5159357d1daa 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q10.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                    scan customer
+                                                    dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_customer_sk"])
+                                                        scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                         scan customer_address
@@ -23,7 +24,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                 partial aggregation over (ss_customer_sk)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -32,7 +34,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -41,7 +44,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q11.plan.txt
index 85b1c1e26444..b71be0b52614 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q11.plan.txt
@@ -11,10 +11,12 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
-                                                    scan store_sales
+                                                    dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                        scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                        scan customer
+                                                        dynamic filter (["c_customer_id", "c_customer_id", "c_customer_id"])
+                                                            scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -27,10 +29,12 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, REPLICATED):
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_101"])
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk_101", "ss_sold_date_sk_98"])
+                                                            scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_78"])
-                                                            scan customer
+                                                            dynamic filter (["c_customer_id_79", "c_customer_id_79"])
+                                                                scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -43,10 +47,12 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_381"])
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_customer_sk_381", "ws_sold_date_sk_377"])
+                                                        scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_customer_sk_357"])
-                                                        scan customer
+                                                        dynamic filter (["c_customer_id_358"])
+                                                            scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -59,7 +65,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_574"])
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_574", "ws_sold_date_sk_570"])
+                                                    scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_550"])
                                                     scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q12.plan.txt
index eeb765082686..848f91f552f6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q12.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q13.plan.txt
index a67a188b354a..ecae84f425b2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q13.plan.txt
@@ -8,7 +8,8 @@ final aggregation over ()
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q14.plan.txt
index 9564a6bbd144..ae87b2cc383d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q14.plan.txt
@@ -14,10 +14,12 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_item_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                        scan item
+                                                                        dynamic filter (["i_item_sk"])
+                                                                            scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -32,10 +34,12 @@ local exchange (GATHER, SINGLE, [])
                                                                                     partial aggregation over (i_brand_id_72, i_category_id_76, i_class_id_74)
                                                                                         join (INNER, REPLICATED):
                                                                                             join (INNER, REPLICATED):
-                                                                                                scan store_sales
+                                                                                                dynamic filter (["ss_item_sk_42", "ss_sold_date_sk_40"])
+                                                                                                    scan store_sales
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                        scan item
+                                                                                                        dynamic filter (["i_brand_id_72", "i_category_id_76", "i_class_id_74"])
+                                                                                                            scan item
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan date_dim
@@ -43,10 +47,12 @@ local exchange (GATHER, SINGLE, [])
                                                                                     partial aggregation over (i_brand_id_128, i_category_id_132, i_class_id_130)
                                                                                         join (INNER, REPLICATED):
                                                                                             join (INNER, REPLICATED):
-                                                                                                scan catalog_sales
+                                                                                                dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                                                                    scan catalog_sales
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                        scan item
+                                                                                                        dynamic filter (["i_brand_id_128", "i_category_id_132", "i_class_id_130"])
+                                                                                                            scan item
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan date_dim
@@ -54,10 +60,12 @@ local exchange (GATHER, SINGLE, [])
                                                                                     partial aggregation over (i_brand_id_184, i_category_id_188, i_class_id_186)
                                                                                         join (INNER, REPLICATED):
                                                                                             join (INNER, REPLICATED):
-                                                                                                scan web_sales
+                                                                                                dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                                                                    scan web_sales
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                        scan item
+                                                                                                        dynamic filter (["i_brand_id_184", "i_category_id_188", "i_class_id_186"])
+                                                                                                            scan item
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan date_dim
@@ -71,19 +79,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_236"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_291"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_357"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -96,10 +107,12 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["cs_item_sk_441"])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan catalog_sales
+                                                                dynamic filter (["cs_item_sk_441", "cs_item_sk_441", "cs_sold_date_sk_426"])
+                                                                    scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                        scan item
+                                                                        dynamic filter (["i_item_sk_462"])
+                                                                            scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -114,10 +127,12 @@ local exchange (GATHER, SINGLE, [])
                                                                                     partial aggregation over (i_brand_id_580, i_category_id_584, i_class_id_582)
                                                                                         join (INNER, REPLICATED):
                                                                                             join (INNER, REPLICATED):
-                                                                                                scan store_sales
+                                                                                                dynamic filter (["ss_item_sk_550", "ss_sold_date_sk_548"])
+                                                                                                    scan store_sales
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                        scan item
+                                                                                                        dynamic filter (["i_brand_id_580", "i_category_id_584", "i_class_id_582"])
+                                                                                                            scan item
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan date_dim
@@ -125,10 +140,12 @@ local exchange (GATHER, SINGLE, [])
                                                                                     partial aggregation over (i_brand_id_670, i_category_id_674, i_class_id_672)
                                                                                         join (INNER, REPLICATED):
                                                                                             join (INNER, REPLICATED):
-                                                                                                scan catalog_sales
+                                                                                                dynamic filter (["cs_item_sk_642", "cs_sold_date_sk_627"])
+                                                                                                    scan catalog_sales
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                        scan item
+                                                                                                        dynamic filter (["i_brand_id_670", "i_category_id_674", "i_class_id_672"])
+                                                                                                            scan item
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan date_dim
@@ -136,10 +153,12 @@ local exchange (GATHER, SINGLE, [])
                                                                                     partial aggregation over (i_brand_id_760, i_category_id_764, i_class_id_762)
                                                                                         join (INNER, REPLICATED):
                                                                                             join (INNER, REPLICATED):
-                                                                                                scan web_sales
+                                                                                                dynamic filter (["ws_item_sk_720", "ws_sold_date_sk_717"])
+                                                                                                    scan web_sales
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                        scan item
+                                                                                                        dynamic filter (["i_brand_id_760", "i_category_id_764", "i_class_id_762"])
+                                                                                                            scan item
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan date_dim
@@ -153,19 +172,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_819"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_874"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_940"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -178,10 +200,12 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ws_item_sk_1012"])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan web_sales
+                                                                dynamic filter (["ws_item_sk_1012", "ws_item_sk_1012", "ws_sold_date_sk_1009"])
+                                                                    scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                        scan item
+                                                                        dynamic filter (["i_item_sk_1045"])
+                                                                            scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -196,10 +220,12 @@ local exchange (GATHER, SINGLE, [])
                                                                                     partial aggregation over (i_brand_id_1163, i_category_id_1167, i_class_id_1165)
                                                                                         join (INNER, REPLICATED):
                                                                                             join (INNER, REPLICATED):
-                                                                                                scan store_sales
+                                                                                                dynamic filter (["ss_item_sk_1133", "ss_sold_date_sk_1131"])
+                                                                                                    scan store_sales
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                        scan item
+                                                                                                        dynamic filter (["i_brand_id_1163", "i_category_id_1167", "i_class_id_1165"])
+                                                                                                            scan item
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan date_dim
@@ -207,10 +233,12 @@ local exchange (GATHER, SINGLE, [])
                                                                                     partial aggregation over (i_brand_id_1253, i_category_id_1257, i_class_id_1255)
                                                                                         join (INNER, REPLICATED):
                                                                                             join (INNER, REPLICATED):
-                                                                                                scan catalog_sales
+                                                                                                dynamic filter (["cs_item_sk_1225", "cs_sold_date_sk_1210"])
+                                                                                                    scan catalog_sales
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                        scan item
+                                                                                                        dynamic filter (["i_brand_id_1253", "i_category_id_1257", "i_class_id_1255"])
+                                                                                                            scan item
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan date_dim
@@ -218,10 +246,12 @@ local exchange (GATHER, SINGLE, [])
                                                                                     partial aggregation over (i_brand_id_1343, i_category_id_1347, i_class_id_1345)
                                                                                         join (INNER, REPLICATED):
                                                                                             join (INNER, REPLICATED):
-                                                                                                scan web_sales
+                                                                                                dynamic filter (["ws_item_sk_1303", "ws_sold_date_sk_1300"])
+                                                                                                    scan web_sales
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                        scan item
+                                                                                                        dynamic filter (["i_brand_id_1343", "i_category_id_1347", "i_class_id_1345"])
+                                                                                                            scan item
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan date_dim
@@ -235,19 +265,22 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (GATHER, SINGLE, [])
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk_1402"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_sold_date_sk_1457"])
+                                                                scan catalog_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     partial aggregation over ()
                                                         join (INNER, REPLICATED):
-                                                            scan web_sales
+                                                            dynamic filter (["ws_sold_date_sk_1523"])
+                                                                scan web_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q15.plan.txt
index e5ded0b0be26..ee3238f14ac3 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q15.plan.txt
@@ -9,10 +9,12 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
-                                            scan catalog_sales
+                                            dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                scan customer
+                                                dynamic filter (["c_current_addr_sk"])
+                                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q16.plan.txt
index 7e65b01be8f0..5a0158146bea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q16.plan.txt
@@ -11,7 +11,8 @@ final aggregation over ()
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk", "cs_order_number", "cs_ship_addr_sk", "cs_ship_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q17.plan.txt
index 87eb28cc04c6..1d5e752363bc 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q17.plan.txt
@@ -13,13 +13,16 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
-                                                            scan store_sales
+                                                            dynamic filter (["ss_customer_sk", "ss_customer_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
-                                                                scan store_returns
+                                                                dynamic filter (["sr_customer_sk", "sr_item_sk", "sr_item_sk", "sr_returned_date_sk"])
+                                                                    scan store_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"])
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q18.plan.txt
index 73489f21c61a..d557802488be 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q18.plan.txt
@@ -12,13 +12,15 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_cdemo_sk", "cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan customer_demographics
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                        scan customer
+                                                        dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk"])
+                                                            scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q19.plan.txt
index 80b275f4556f..2f9a85fad6bc 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q19.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -20,7 +21,8 @@ local exchange (GATHER, SINGLE, [])
                                                         scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                scan customer
+                                                dynamic filter (["c_current_addr_sk"])
+                                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q20.plan.txt
index 88b06a88754d..1e1dff9ee7b0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q20.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q21.plan.txt
index f7af6a33b1a8..64508562e6d2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q21.plan.txt
@@ -7,7 +7,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan inventory
+                                    dynamic filter (["inv_date_sk", "inv_item_sk", "inv_warehouse_sk"])
+                                        scan inventory
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan warehouse
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q22.plan.txt
index d323affadfc0..4cf902b7c8d7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q22.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (groupid, i_brand$gid, i_category$gid, i_class$gid, i_product_name$gid)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan inventory
+                                dynamic filter (["inv_date_sk", "inv_item_sk"])
+                                    scan inventory
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q23.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q23.plan.txt
index 511a84380045..6a879ef6f154 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q23.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q23.plan.txt
@@ -7,7 +7,8 @@ final aggregation over ()
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                 join (INNER, REPLICATED):
-                                    scan catalog_sales
+                                    dynamic filter (["cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                        scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -21,7 +22,8 @@ final aggregation over ()
                                                         partial aggregation over (d_date_6, ss_item_sk, substr$gid)
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
@@ -35,7 +37,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_43)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_43"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_43"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
                                                     scan customer
@@ -51,7 +54,8 @@ final aggregation over ()
                                                                 join (INNER, REPLICATED):
                                                                     join (INNER, PARTITIONED):
                                                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk_71"])
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_71", "ss_sold_date_sk_68"])
+                                                                                scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_93"])
                                                                                 scan customer
@@ -64,7 +68,8 @@ final aggregation over ()
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                                 join (INNER, REPLICATED):
-                                    scan web_sales
+                                    dynamic filter (["ws_bill_customer_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                        scan web_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
@@ -78,7 +83,8 @@ final aggregation over ()
                                                         partial aggregation over (d_date_210, ss_item_sk_185, substr$gid_265)
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_item_sk_185", "ss_sold_date_sk_183"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
@@ -92,7 +98,8 @@ final aggregation over ()
                                     partial aggregation over (ss_customer_sk_274)
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk_274"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_274"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_296"])
                                                     scan customer
@@ -108,7 +115,8 @@ final aggregation over ()
                                                                 join (INNER, REPLICATED):
                                                                     join (INNER, PARTITIONED):
                                                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk_322"])
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_customer_sk_322", "ss_sold_date_sk_319"])
+                                                                                scan store_sales
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPARTITION, HASH, ["c_customer_sk_344"])
                                                                                 scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q24.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q24.plan.txt
index b712f100f8e4..82cb67d72051 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q24.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q24.plan.txt
@@ -18,19 +18,23 @@ remote exchange (GATHER, SINGLE, [])
                                                                     join (INNER, REPLICATED):
                                                                         join (INNER, PARTITIONED):
                                                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                                                scan store_sales
+                                                                                dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_item_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                                    scan store_sales
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                                    scan store_returns
+                                                                                    dynamic filter (["sr_item_sk"])
+                                                                                        scan store_returns
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                scan store
+                                                                                dynamic filter (["s_zip"])
+                                                                                    scan store
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan item
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                                    scan customer
+                                                                    dynamic filter (["c_birth_country"])
+                                                                        scan customer
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ca_zip", "upper"])
                                                             scan customer_address
@@ -52,19 +56,23 @@ remote exchange (GATHER, SINGLE, [])
                                                                             join (INNER, REPLICATED):
                                                                                 join (INNER, PARTITIONED):
                                                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk_13", "ss_ticket_number_20"])
-                                                                                        scan store_sales
+                                                                                        dynamic filter (["ss_customer_sk_14", "ss_item_sk_13", "ss_item_sk_13", "ss_store_sk_18", "ss_ticket_number_20"])
+                                                                                            scan store_sales
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPARTITION, HASH, ["sr_item_sk_38", "sr_ticket_number_45"])
-                                                                                            scan store_returns
+                                                                                            dynamic filter (["sr_item_sk_38"])
+                                                                                                scan store_returns
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                                        scan store
+                                                                                        dynamic filter (["s_zip_83"])
+                                                                                            scan store
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan item
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_113"])
-                                                                            scan customer
+                                                                            dynamic filter (["c_birth_country_127"])
+                                                                                scan customer
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["ca_zip_142", "upper_159"])
                                                                     scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q25.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q25.plan.txt
index 5f793a1f9c6e..09709465b13f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q25.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q25.plan.txt
@@ -13,13 +13,16 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
-                                                            scan store_sales
+                                                            dynamic filter (["ss_customer_sk", "ss_customer_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
-                                                                scan store_returns
+                                                                dynamic filter (["sr_customer_sk", "sr_item_sk", "sr_item_sk", "sr_returned_date_sk"])
+                                                                    scan store_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"])
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q26.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q26.plan.txt
index 347ca6778d5b..c6cff2a89dae 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q26.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q26.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_bill_cdemo_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q27.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q27.plan.txt
index bcef59d52b23..7003410a773b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q27.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q27.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_cdemo_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q29.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q29.plan.txt
index 5f793a1f9c6e..09709465b13f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q29.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q29.plan.txt
@@ -13,13 +13,16 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
-                                                            scan store_sales
+                                                            dynamic filter (["ss_customer_sk", "ss_customer_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
-                                                                scan store_returns
+                                                                dynamic filter (["sr_customer_sk", "sr_item_sk", "sr_item_sk", "sr_returned_date_sk"])
+                                                                    scan store_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"])
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q30.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q30.plan.txt
index c5703ddeb4b0..0cd35f85a48b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q30.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q30.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ca_state, wr_returning_customer_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_returns
+                                                        dynamic filter (["wr_returned_date_sk", "wr_returning_addr_sk", "wr_returning_customer_sk"])
+                                                            scan web_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -21,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                                             scan customer_address
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                    scan customer
+                                    dynamic filter (["c_current_addr_sk"])
+                                        scan customer
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPLICATE, BROADCAST, [])
                                 scan customer_address
@@ -35,7 +37,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ca_state_85, wr_returning_customer_sk_28)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_returns
+                                                        dynamic filter (["wr_returned_date_sk_21", "wr_returning_addr_sk_31"])
+                                                            scan web_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q31.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q31.plan.txt
index df6b6fc65b3d..2a344ef2b24e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q31.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q31.plan.txt
@@ -13,13 +13,15 @@ remote exchange (GATHER, SINGLE, [])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_addr_sk", "ss_sold_date_sk"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                            scan customer_address
+                                                            dynamic filter (["ca_county", "ca_county", "ca_county", "ca_county", "ca_county"])
+                                                                scan customer_address
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ca_county_66", NullableValue{type=integer, value=1}, NullableValue{type=integer, value=2000}])
                                         final aggregation over (ca_county_66, d_qoy_39, d_year_35)
@@ -29,13 +31,15 @@ remote exchange (GATHER, SINGLE, [])
                                                         join (INNER, PARTITIONED):
                                                             remote exchange (REPARTITION, HASH, ["ss_addr_sk_10"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_addr_sk_10", "ss_sold_date_sk_4"])
+                                                                        scan store_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan date_dim
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_59"])
-                                                                    scan customer_address
+                                                                    dynamic filter (["ca_county_66", "ca_county_66", "ca_county_66", "ca_county_66"])
+                                                                        scan customer_address
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_140", NullableValue{type=integer, value=1}, NullableValue{type=integer, value=2000}])
                                     final aggregation over (ca_county_140, d_qoy_113, d_year_109)
@@ -45,13 +49,15 @@ remote exchange (GATHER, SINGLE, [])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["ss_addr_sk_84"])
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_addr_sk_84", "ss_sold_date_sk_78"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["ca_address_sk_133"])
-                                                                scan customer_address
+                                                                dynamic filter (["ca_county_140", "ca_county_140", "ca_county_140"])
+                                                                    scan customer_address
                         final aggregation over (ca_county_191, d_qoy_164, d_year_160)
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_county_191", "d_qoy_164", "d_year_160"])
@@ -59,13 +65,15 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_184"])
-                                                    scan customer_address
+                                                    dynamic filter (["ca_county_191", "ca_county_191"])
+                                                        scan customer_address
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["ca_county_276", NullableValue{type=integer, value=1}, NullableValue{type=integer, value=2000}])
                             final aggregation over (ca_county_276, d_qoy_249, d_year_245)
@@ -75,13 +83,15 @@ remote exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_210"])
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_addr_sk_210", "ws_sold_date_sk_203"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk_269"])
-                                                        scan customer_address
+                                                        dynamic filter (["ca_county_276"])
+                                                            scan customer_address
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["ca_county_361", NullableValue{type=integer, value=1}, NullableValue{type=integer, value=2000}])
                         final aggregation over (ca_county_361, d_qoy_334, d_year_330)
@@ -91,7 +101,8 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk_295"])
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_addr_sk_295", "ws_sold_date_sk_288"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q32.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q32.plan.txt
index 1657af22cbdb..968a164ff256 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q32.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q32.plan.txt
@@ -7,7 +7,8 @@ final aggregation over ()
                         remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan catalog_sales
+                                    dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                        scan catalog_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan item
@@ -19,7 +20,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["cs_item_sk_19"])
                                     partial aggregation over (cs_item_sk_19)
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_sold_date_sk_4"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q33.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q33.plan.txt
index d324980bbf82..abf2492e5e3f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q33.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q33.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -21,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                                         scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_6"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over (i_manufact_id_22)
@@ -39,7 +41,8 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_addr_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -48,7 +51,8 @@ local exchange (GATHER, SINGLE, [])
                                                         scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_95"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over (i_manufact_id_121)
@@ -66,7 +70,8 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -75,7 +80,8 @@ local exchange (GATHER, SINGLE, [])
                                                         scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_manufact_id_196"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over (i_manufact_id_222)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q34.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q34.plan.txt
index 9fa2321b1023..ea466ae6a37a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q34.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q34.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q35.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q35.plan.txt
index 73a457ec34b8..003c60e00a1d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q35.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q35.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                    scan customer
+                                                    dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_customer_sk"])
+                                                        scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                         scan customer_address
@@ -23,7 +24,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                 partial aggregation over (ss_customer_sk)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -32,7 +34,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -41,7 +44,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q36.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q36.plan.txt
index 55d12e9b5b03..738be5e4e0d9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q36.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q36.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q37.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q37.plan.txt
index dcb283c4ad40..80d881ec6876 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q37.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q37.plan.txt
@@ -8,10 +8,12 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["inv_item_sk"])
                                 join (INNER, REPLICATED, can skip output duplicates):
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan inventory
+                                        dynamic filter (["inv_date_sk", "inv_item_sk", "inv_item_sk"])
+                                            scan inventory
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                scan item
+                                                dynamic filter (["i_item_sk"])
+                                                    scan item
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q38.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q38.plan.txt
index 9f02b3c87024..b342ddb2e44f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q38.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q38.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -27,7 +28,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -42,7 +44,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q39.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q39.plan.txt
index 122ab8c8efdb..c80dc1618147 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q39.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q39.plan.txt
@@ -10,13 +10,16 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan inventory
+                                                dynamic filter (["inv_date_sk", "inv_item_sk", "inv_item_sk", "inv_warehouse_sk", "inv_warehouse_sk"])
+                                                    scan inventory
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_item_sk"])
+                                                            scan item
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan warehouse
+                                                    dynamic filter (["w_warehouse_sk"])
+                                                        scan warehouse
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -29,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan inventory
+                                                    dynamic filter (["inv_date_sk_8", "inv_item_sk_9", "inv_warehouse_sk_10"])
+                                                        scan inventory
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q40.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q40.plan.txt
index e7cf03046da5..c5cd0958469b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q40.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q40.plan.txt
@@ -9,10 +9,12 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (LEFT, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_warehouse_sk"])
+                                                scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                scan catalog_returns
+                                                dynamic filter (["cr_item_sk"])
+                                                    scan catalog_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan warehouse
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q41.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q41.plan.txt
index 1fab708be592..b584563182db 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q41.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q41.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (i_manufact_14, i_manufact_id, i_product_name, unique)
                                     join (INNER, PARTITIONED, can skip output duplicates):
                                         remote exchange (REPARTITION, HASH, ["i_manufact_14"])
-                                            scan item
+                                            dynamic filter (["i_manufact_14"])
+                                                scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["i_manufact"])
                                                 scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q42.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q42.plan.txt
index 17cc12f10e9e..b35f518a9b70 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q42.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q42.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_category, i_category_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q43.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q43.plan.txt
index 9d9e36441a12..b94077c666ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q43.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q43.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     partial aggregation over (d_day_name, s_store_id, s_store_name)
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q45.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q45.plan.txt
index f5f43d9d45fc..fb7def869ad6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q45.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q45.plan.txt
@@ -11,10 +11,12 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_customer_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                        scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                        scan customer
+                                                        dynamic filter (["c_current_addr_sk"])
+                                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q46.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q46.plan.txt
index efaf54844c16..e5c140b8be39 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q46.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q46.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk", "ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -26,7 +27,8 @@ local exchange (GATHER, SINGLE, [])
                                                 scan customer_address
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                        scan customer
+                        dynamic filter (["c_current_addr_sk"])
+                            scan customer
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPLICATE, BROADCAST, [])
                     scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q47.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q47.plan.txt
index 4ca1badb4e72..b81758420c9d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q47.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q47.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan store
+                                                    dynamic filter (["s_company_name", "s_company_name", "s_store_name", "s_store_name"])
+                                                        scan store
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["i_brand_14", "i_category_18", "s_company_name_102", "s_store_name_90"])
                         final aggregation over (d_moy_63, d_year_61, i_brand_14, i_category_18, s_company_name_102, s_store_name_90)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_item_sk_32", "ss_sold_date_sk_30", "ss_store_sk_37"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_14", "i_category_18"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan store
+                                                    dynamic filter (["s_company_name_102", "s_store_name_90"])
+                                                        scan store
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["i_brand_133", "i_category_137", "s_company_name_221", "s_store_name_209"])
                     final aggregation over (d_moy_182, d_year_180, i_brand_133, i_category_137, s_company_name_221, s_store_name_209)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk_151", "ss_sold_date_sk_149", "ss_store_sk_156"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q48.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q48.plan.txt
index 4a2b8f72cb73..a3a54b6b1076 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q48.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q48.plan.txt
@@ -7,7 +7,8 @@ final aggregation over ()
                         remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q49.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q49.plan.txt
index 01a7bb96b2df..e1f12dfe4663 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q49.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q49.plan.txt
@@ -13,7 +13,8 @@ local exchange (GATHER, SINGLE, [])
                                                 join (INNER, REPLICATED):
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                            scan web_sales
+                                                            dynamic filter (["ws_item_sk", "ws_order_number", "ws_sold_date_sk"])
+                                                                scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
                                                                 scan web_returns
@@ -31,7 +32,8 @@ local exchange (GATHER, SINGLE, [])
                                                 join (INNER, REPLICATED):
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                            scan catalog_sales
+                                                            dynamic filter (["cs_item_sk", "cs_order_number", "cs_sold_date_sk"])
+                                                                scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
                                                                 scan catalog_returns
@@ -49,7 +51,8 @@ local exchange (GATHER, SINGLE, [])
                                                 join (INNER, REPLICATED):
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                            scan store_sales
+                                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_ticket_number"])
+                                                                scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
                                                                 scan store_returns
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q50.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q50.plan.txt
index 8f8ad7edeffc..aba0a89c6ee6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q50.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q50.plan.txt
@@ -9,10 +9,12 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk", "ss_ticket_number"])
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["sr_customer_sk", "sr_item_sk", "sr_ticket_number"])
-                                                scan store_returns
+                                                dynamic filter (["sr_returned_date_sk"])
+                                                    scan store_returns
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q51.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q51.plan.txt
index ed5e8607b930..8dfcb212f038 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q51.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q51.plan.txt
@@ -10,7 +10,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["d_date", "ws_item_sk"])
                                         partial aggregation over (d_date, ws_item_sk)
                                             join (INNER, REPLICATED):
-                                                scan web_sales
+                                                dynamic filter (["ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -21,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["d_date_7", "ss_item_sk"])
                                         partial aggregation over (d_date_7, ss_item_sk)
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q52.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q52.plan.txt
index 33752e693e6c..79ab5d5f2dc7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q52.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q52.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_year, i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q53.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q53.plan.txt
index cd10ab3698e6..799e43e0eca0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q53.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q53.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q54.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q54.plan.txt
index 4ad40cb0a086..b49678e02521 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q54.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q54.plan.txt
@@ -8,8 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["customer_sk"])
                                     partial aggregation over (customer_sk)
-                                        cross join:
-                                            cross join:
+                                        join (LEFT, REPLICATED):
+                                            join (LEFT, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
                                                         join (INNER, PARTITIONED):
@@ -22,9 +22,11 @@ local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPARTITION, HASH, ["customer_sk"])
                                                                                         join (INNER, REPLICATED, can skip output duplicates):
                                                                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                                                                remote exchange (REPARTITION, ROUND_ROBIN, [])
-                                                                                                    scan catalog_sales
-                                                                                                    scan web_sales
+                                                                                                local exchange (REPARTITION, ROUND_ROBIN, [])
+                                                                                                    dynamic filter (["cs_bill_customer_sk", "cs_bill_customer_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                                                                        scan catalog_sales
+                                                                                                    dynamic filter (["ws_bill_customer_sk", "ws_bill_customer_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                                                                        scan web_sales
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                                         scan item
@@ -33,13 +35,16 @@ local exchange (GATHER, SINGLE, [])
                                                                                                     scan date_dim
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                                                            scan customer
+                                                                                            dynamic filter (["c_current_addr_sk", "c_customer_sk"])
+                                                                                                scan customer
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
-                                                                            scan store_sales
+                                                                            dynamic filter (["ss_sold_date_sk"])
+                                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
-                                                                    scan customer_address
+                                                                    dynamic filter (["ca_county", "ca_state"])
+                                                                        scan customer_address
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q55.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q55.plan.txt
index 0322599f01e5..72d129c6fab1 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q55.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q55.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (i_brand, i_brand_id)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q56.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q56.plan.txt
index 94868da0baf9..d765fb4305b2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q56.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q56.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -21,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                                         scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_item_id_6"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over (i_item_id_10)
@@ -39,7 +41,8 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_addr_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -48,7 +51,8 @@ local exchange (GATHER, SINGLE, [])
                                                         scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_item_id_83"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over (i_item_id_109)
@@ -66,7 +70,8 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -75,7 +80,8 @@ local exchange (GATHER, SINGLE, [])
                                                         scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_item_id_184"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over (i_item_id_210)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q57.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q57.plan.txt
index cedf585a1320..7af8d6925f24 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q57.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q57.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand", "i_brand", "i_category", "i_category"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan call_center
+                                                    dynamic filter (["cc_name", "cc_name"])
+                                                        scan call_center
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["cc_name_102", "i_brand_14", "i_category_18"])
                         final aggregation over (cc_name_102, d_moy_74, d_year_72, i_brand_14, i_category_18)
@@ -30,16 +33,19 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_call_center_sk_41", "cs_item_sk_45", "cs_sold_date_sk_30"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                            scan item
+                                                            dynamic filter (["i_brand_14", "i_category_18"])
+                                                                scan item
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan call_center
+                                                    dynamic filter (["cc_name_102"])
+                                                        scan call_center
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["cc_name_232", "i_brand_144", "i_category_148"])
                     final aggregation over (cc_name_232, d_moy_204, d_year_202, i_brand_144, i_category_148)
@@ -49,7 +55,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_call_center_sk_171", "cs_item_sk_175", "cs_sold_date_sk_160"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q58.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q58.plan.txt
index 53badf386c82..97ffbcf71797 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q58.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q58.plan.txt
@@ -10,19 +10,23 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["d_date"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_item_id", "i_item_id"])
+                                                            scan item
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan date_dim
+                                                    dynamic filter (["d_date"])
+                                                        scan date_dim
                                     final aggregation over (d_date_6)
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["d_date_6"])
                                                 partial aggregation over (d_date_6)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq_8"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 local exchange (GATHER, SINGLE, [])
@@ -36,19 +40,23 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["d_date_94"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_item_id_69"])
+                                                            scan item
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan date_dim
+                                                    dynamic filter (["d_date_94"])
+                                                        scan date_dim
                                     final aggregation over (d_date_126)
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["d_date_126"])
                                                 partial aggregation over (d_date_126)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq_128"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 local exchange (GATHER, SINGLE, [])
@@ -62,19 +70,22 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_date_216"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                scan date_dim
+                                                dynamic filter (["d_date_216"])
+                                                    scan date_dim
                                 final aggregation over (d_date_248)
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["d_date_248"])
                                             partial aggregation over (d_date_248)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan date_dim
+                                                    dynamic filter (["d_week_seq_250"])
+                                                        scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             local exchange (GATHER, SINGLE, [])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q59.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q59.plan.txt
index 6cd84ea7c15a..7d8e5431f182 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q59.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q59.plan.txt
@@ -13,16 +13,20 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["d_day_name", "d_week_seq", "ss_store_sk"])
                                                     partial aggregation over (d_day_name, d_week_seq, ss_store_sk)
                                                         join (INNER, REPLICATED):
-                                                            scan store_sales
+                                                            dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                                scan store_sales
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                                    scan date_dim
+                                                                    dynamic filter (["d_week_seq", "d_week_seq"])
+                                                                        scan date_dim
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPLICATE, BROADCAST, [])
-                                scan store
+                                dynamic filter (["s_store_id"])
+                                    scan store
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPLICATE, BROADCAST, [])
-                            scan date_dim
+                            dynamic filter (["d_week_seq_20"])
+                                scan date_dim
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPARTITION, HASH, ["expr_203", "s_store_id_118"])
                     join (INNER, REPLICATED):
@@ -36,10 +40,12 @@ local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["d_day_name_85", "d_week_seq_75", "ss_store_sk_53"])
                                                         partial aggregation over (d_day_name_85, d_week_seq_75, ss_store_sk_53)
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk_46", "ss_store_sk_53"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                                        scan date_dim
+                                                                        dynamic filter (["d_week_seq_75"])
+                                                                            scan date_dim
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q60.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q60.plan.txt
index 94868da0baf9..d765fb4305b2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q60.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q60.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ss_addr_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_addr_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -21,7 +22,8 @@ local exchange (GATHER, SINGLE, [])
                                                         scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_item_id_6"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over (i_item_id_10)
@@ -39,7 +41,8 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_addr_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_addr_sk", "cs_item_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -48,7 +51,8 @@ local exchange (GATHER, SINGLE, [])
                                                         scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_item_id_83"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over (i_item_id_109)
@@ -66,7 +70,8 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_addr_sk"])
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_addr_sk", "ws_item_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -75,7 +80,8 @@ local exchange (GATHER, SINGLE, [])
                                                         scan customer_address
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan item
+                                                    dynamic filter (["i_item_id_184"])
+                                                        scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over (i_item_id_210)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q61.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q61.plan.txt
index fcb22ec7edbe..6999fdb4fa23 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q61.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q61.plan.txt
@@ -11,7 +11,8 @@ cross join:
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_customer_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan store
@@ -23,7 +24,8 @@ cross join:
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                            scan customer
+                                            dynamic filter (["c_current_addr_sk"])
+                                                scan customer
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                     scan customer_address
@@ -41,7 +43,8 @@ cross join:
                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_15"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk_15", "ss_item_sk_14", "ss_sold_date_sk_12", "ss_store_sk_19"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan store
@@ -50,7 +53,8 @@ cross join:
                                                     scan date_dim
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_98"])
-                                            scan customer
+                                            dynamic filter (["c_current_addr_sk_102"])
+                                                scan customer
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ca_address_sk_118"])
                                     scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q62.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q62.plan.txt
index f1d8bc82fb42..257d17398b22 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q62.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q62.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_ship_date_sk", "ws_ship_mode_sk", "ws_warehouse_sk", "ws_web_site_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan warehouse
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q63.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q63.plan.txt
index 23e28eddc4b7..da2cbd549a64 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q63.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q63.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q64.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q64.plan.txt
index 4c035100b9ff..a4fff9f00857 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q64.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q64.plan.txt
@@ -29,29 +29,35 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk"])
                                                                                                                     join (INNER, PARTITIONED):
                                                                                                                         remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                                                                                            scan store_sales
+                                                                                                                            dynamic filter (["ss_addr_sk", "ss_cdemo_sk", "ss_customer_sk", "ss_hdemo_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk", "ss_ticket_number"])
+                                                                                                                                scan store_sales
                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                             remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                                                                                scan store_returns
+                                                                                                                                dynamic filter (["sr_item_sk", "sr_item_sk", "sr_item_sk"])
+                                                                                                                                    scan store_returns
                                                                                                                 final aggregation over (cs_item_sk)
                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                         remote exchange (REPARTITION, HASH, ["cs_item_sk"])
                                                                                                                             partial aggregation over (cs_item_sk)
                                                                                                                                 join (INNER, PARTITIONED):
                                                                                                                                     remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                                                                                        scan catalog_sales
+                                                                                                                                        dynamic filter (["cs_item_sk", "cs_item_sk", "cs_item_sk", "cs_order_number"])
+                                                                                                                                            scan catalog_sales
                                                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                                                         remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                                                                                            scan catalog_returns
+                                                                                                                                            dynamic filter (["cr_item_sk", "cr_item_sk"])
+                                                                                                                                                scan catalog_returns
                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                     scan date_dim
                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                                                scan store
+                                                                                                                dynamic filter (["s_store_name", "s_zip"])
+                                                                                                                    scan store
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                                                                        scan customer
+                                                                                                        dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_current_hdemo_sk", "c_first_sales_date_sk", "c_first_shipto_date_sk"])
+                                                                                                            scan customer
                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                                     scan date_dim
@@ -69,10 +75,12 @@ remote exchange (GATHER, SINGLE, [])
                                                                                     scan promotion
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk"])
+                                                                                    scan household_demographics
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
-                                                                            scan household_demographics
+                                                                            dynamic filter (["hd_income_band_sk_91"])
+                                                                                scan household_demographics
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                                     scan customer_address
@@ -87,7 +95,8 @@ remote exchange (GATHER, SINGLE, [])
                                                     scan income_band
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                scan item
+                                                dynamic filter (["i_item_sk"])
+                                                    scan item
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["s_store_name_343", "s_zip_363", "ss_item_sk_134"])
                         final aggregation over (ca_city_452, ca_city_467, ca_street_name_449, ca_street_name_464, ca_street_number_448, ca_street_number_463, ca_zip_455, ca_zip_470, d_year_254, d_year_284, d_year_314, i_product_name_507, s_store_name_343, s_zip_363, ss_item_sk_134)
@@ -116,20 +125,24 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                     remote exchange (REPARTITION, HASH, ["ss_item_sk_134"])
                                                                                                                         join (INNER, PARTITIONED):
                                                                                                                             remote exchange (REPARTITION, HASH, ["ss_item_sk_134", "ss_ticket_number_141"])
-                                                                                                                                scan store_sales
+                                                                                                                                dynamic filter (["ss_addr_sk_138", "ss_cdemo_sk_136", "ss_customer_sk_135", "ss_hdemo_sk_137", "ss_item_sk_134", "ss_item_sk_134", "ss_item_sk_134", "ss_promo_sk_140", "ss_sold_date_sk_132", "ss_store_sk_139", "ss_ticket_number_141"])
+                                                                                                                                    scan store_sales
                                                                                                                             local exchange (GATHER, SINGLE, [])
                                                                                                                                 remote exchange (REPARTITION, HASH, ["sr_item_sk_159", "sr_ticket_number_166"])
-                                                                                                                                    scan store_returns
+                                                                                                                                    dynamic filter (["sr_item_sk_159", "sr_item_sk_159"])
+                                                                                                                                        scan store_returns
                                                                                                                     final aggregation over (cs_item_sk_194)
                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                             remote exchange (REPARTITION, HASH, ["cs_item_sk_194"])
                                                                                                                                 partial aggregation over (cs_item_sk_194)
                                                                                                                                     join (INNER, PARTITIONED):
                                                                                                                                         remote exchange (REPARTITION, HASH, ["cs_item_sk_194", "cs_order_number_196"])
-                                                                                                                                            scan catalog_sales
+                                                                                                                                            dynamic filter (["cs_item_sk_194", "cs_item_sk_194", "cs_order_number_196"])
+                                                                                                                                                scan catalog_sales
                                                                                                                                         local exchange (GATHER, SINGLE, [])
                                                                                                                                             remote exchange (REPARTITION, HASH, ["cr_item_sk_217", "cr_order_number_231"])
-                                                                                                                                                scan catalog_returns
+                                                                                                                                                dynamic filter (["cr_item_sk_217"])
+                                                                                                                                                    scan catalog_returns
                                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                                                         scan date_dim
@@ -138,7 +151,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                                                                     scan store
                                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_369"])
-                                                                                                            scan customer
+                                                                                                            dynamic filter (["c_current_addr_sk_373", "c_current_cdemo_sk_371", "c_current_hdemo_sk_372", "c_first_sales_date_sk_375", "c_first_shipto_date_sk_374"])
+                                                                                                                scan customer
                                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                                         scan date_dim
@@ -156,10 +170,12 @@ remote exchange (GATHER, SINGLE, [])
                                                                                         scan promotion
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                                                    scan household_demographics
+                                                                                    dynamic filter (["hd_income_band_sk_433"])
+                                                                                        scan household_demographics
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                                                scan household_demographics
+                                                                                dynamic filter (["hd_income_band_sk_440"])
+                                                                                    scan household_demographics
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk_446"])
                                                                         scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q65.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q65.plan.txt
index eeb6db7ddd46..131cccbcb743 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q65.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q65.plan.txt
@@ -12,13 +12,15 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_store_sk"])
                                                 partial aggregation over (ss_item_sk, ss_store_sk)
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["s_store_sk"])
-                            scan store
+                            dynamic filter (["s_store_sk"])
+                                scan store
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["ss_store_sk_13"])
                         final aggregation over (ss_item_sk_8, ss_store_sk_13)
@@ -26,7 +28,8 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["ss_item_sk_8", "ss_store_sk_13"])
                                     partial aggregation over (ss_item_sk_8, ss_store_sk_13)
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk_8", "ss_sold_date_sk_6"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q66.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q66.plan.txt
index 77fab6dca7b0..f7d7f00e146a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q66.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q66.plan.txt
@@ -15,7 +15,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_ship_mode_sk", "ws_sold_date_sk", "ws_sold_time_sk", "ws_warehouse_sk"])
+                                                                        scan web_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan warehouse
@@ -41,7 +42,8 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
                                                                 join (INNER, REPLICATED):
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_ship_mode_sk", "cs_sold_date_sk", "cs_sold_time_sk", "cs_warehouse_sk"])
+                                                                        scan catalog_sales
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan warehouse
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q67.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q67.plan.txt
index 6b438220e703..0650be596e8e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q67.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q67.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q68.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q68.plan.txt
index efaf54844c16..e5c140b8be39 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q68.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q68.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_addr_sk", "ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -26,7 +27,8 @@ local exchange (GATHER, SINGLE, [])
                                                 scan customer_address
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                        scan customer
+                        dynamic filter (["c_current_addr_sk"])
+                            scan customer
             local exchange (GATHER, SINGLE, [])
                 remote exchange (REPLICATE, BROADCAST, [])
                     scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q69.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q69.plan.txt
index 08db8f535af9..9148d4f49236 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q69.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q69.plan.txt
@@ -11,7 +11,8 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["c_current_addr_sk"])
-                                                    scan customer
+                                                    dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_customer_sk"])
+                                                        scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                         scan customer_address
@@ -23,7 +24,8 @@ local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                 partial aggregation over (ss_customer_sk)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -32,7 +34,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                             partial aggregation over (ws_bill_customer_sk)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_sold_date_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -41,7 +44,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_ship_customer_sk"])
                                         partial aggregation over (cs_ship_customer_sk)
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q70.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q70.plan.txt
index 8dcce2a51198..f780e63bd1a6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q70.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q70.plan.txt
@@ -10,13 +10,15 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["s_state"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan store
+                                                    dynamic filter (["s_state"])
+                                                        scan store
                                     single aggregation over (s_state_53)
                                         final aggregation over (s_state_53)
                                             local exchange (GATHER, SINGLE, [])
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                                     partial aggregation over (s_state_53)
                                                         join (INNER, REPLICATED):
                                                             join (INNER, REPLICATED):
-                                                                scan store_sales
+                                                                dynamic filter (["ss_sold_date_sk_4", "ss_store_sk_11"])
+                                                                    scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan store
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q71.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q71.plan.txt
index 599dd0ab9f9c..f5d3c7ec8a7e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q71.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q71.plan.txt
@@ -7,19 +7,22 @@ remote exchange (GATHER, SINGLE, [])
                         partial aggregation over (i_brand, i_brand_id, t_hour, t_minute)
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    remote exchange (REPARTITION, ROUND_ROBIN, [])
+                                    local exchange (REPARTITION, ROUND_ROBIN, [])
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_item_sk", "ws_sold_date_sk", "ws_sold_time_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                         join (INNER, REPLICATED):
-                                            scan catalog_sales
+                                            dynamic filter (["cs_item_sk", "cs_sold_date_sk", "cs_sold_time_sk"])
+                                                scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_sold_time_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q72.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q72.plan.txt
index 5bf29d2e5757..6b583db84753 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q72.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q72.plan.txt
@@ -15,10 +15,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk"])
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_bill_cdemo_sk", "cs_bill_hdemo_sk", "cs_item_sk", "cs_item_sk", "cs_quantity", "cs_ship_date_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["inv_item_sk"])
-                                                                        scan inventory
+                                                                        dynamic filter (["inv_date_sk", "inv_item_sk", "inv_warehouse_sk"])
+                                                                            scan inventory
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan warehouse
@@ -33,7 +35,8 @@ local exchange (GATHER, SINGLE, [])
                                                         scan household_demographics
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan date_dim
+                                                    dynamic filter (["d_week_seq"])
+                                                        scan date_dim
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q73.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q73.plan.txt
index 9fa2321b1023..ea466ae6a37a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q73.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q73.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q74.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q74.plan.txt
index 7f85ff20613d..d88c6fd0f089 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q74.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q74.plan.txt
@@ -11,10 +11,12 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
-                                                    scan store_sales
+                                                    dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                        scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                        scan customer
+                                                        dynamic filter (["c_customer_id", "c_customer_id", "c_customer_id"])
+                                                            scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -27,10 +29,12 @@ local exchange (GATHER, SINGLE, [])
                                             join (INNER, REPLICATED):
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["ss_customer_sk_91"])
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk_91", "ss_sold_date_sk_88"])
+                                                            scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["c_customer_sk_68"])
-                                                            scan customer
+                                                            dynamic filter (["c_customer_id_69", "c_customer_id_69"])
+                                                                scan customer
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan date_dim
@@ -43,10 +47,12 @@ local exchange (GATHER, SINGLE, [])
                                         join (INNER, REPLICATED):
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_352"])
-                                                    scan web_sales
+                                                    dynamic filter (["ws_bill_customer_sk_352", "ws_sold_date_sk_348"])
+                                                        scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_customer_sk_328"])
-                                                        scan customer
+                                                        dynamic filter (["c_customer_id_329"])
+                                                            scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -59,7 +65,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk_531"])
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk_531", "ws_sold_date_sk_527"])
+                                                    scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["c_customer_sk_507"])
                                                     scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q75.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q75.plan.txt
index 742b7fa1b05f..9551936be224 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q75.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q75.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
                                         join (INNER, REPLICATED, can skip output duplicates):
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_brand_id_7", "i_category_id_9", "i_class_id_8", "i_manufact_id_10"])
+                                                            scan item
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -26,10 +28,12 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
                                         join (INNER, REPLICATED, can skip output duplicates):
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_brand_id_28", "i_category_id_32", "i_class_id_30", "i_manufact_id_34"])
+                                                            scan item
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -42,10 +46,12 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
                                         join (INNER, REPLICATED, can skip output duplicates):
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan web_sales
+                                                dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_brand_id_88", "i_category_id_92", "i_class_id_90", "i_manufact_id_94"])
+                                                            scan item
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -61,7 +67,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["cs_item_sk_170", "cs_order_number_172"])
                                         join (INNER, REPLICATED, can skip output duplicates):
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan catalog_sales
+                                                dynamic filter (["cs_item_sk_170", "cs_sold_date_sk_155"])
+                                                    scan catalog_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan item
@@ -77,7 +84,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ss_item_sk_278", "ss_ticket_number_285"])
                                         join (INNER, REPLICATED, can skip output duplicates):
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan store_sales
+                                                dynamic filter (["ss_item_sk_278", "ss_sold_date_sk_276"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan item
@@ -93,7 +101,8 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["ws_item_sk_382", "ws_order_number_396"])
                                         join (INNER, REPLICATED, can skip output duplicates):
                                             join (INNER, REPLICATED, can skip output duplicates):
-                                                scan web_sales
+                                                dynamic filter (["ws_item_sk_382", "ws_sold_date_sk_379"])
+                                                    scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q76.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q76.plan.txt
index 0a0569f12272..716b205b4567 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q76.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q76.plan.txt
@@ -6,7 +6,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_10, d_year_9, expr_134, expr_135, i_category_6)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
@@ -18,7 +19,8 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk"])
-                                    scan web_sales
+                                    dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                        scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["i_item_sk_17"])
                                         scan item
@@ -29,7 +31,8 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (d_qoy_111, d_year_107, expr_131, expr_133, i_category_89)
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan catalog_sales
+                                dynamic filter (["cs_item_sk", "cs_sold_date_sk"])
+                                    scan catalog_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q77.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q77.plan.txt
index f5f8b7b62eea..b632624a3d15 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q77.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q77.plan.txt
@@ -12,7 +12,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ss_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_sold_date_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -25,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (sr_store_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_returns
+                                                        dynamic filter (["sr_returned_date_sk", "sr_store_sk"])
+                                                            scan store_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -38,7 +40,8 @@ local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["cs_call_center_sk"])
                                             partial aggregation over (cs_call_center_sk)
                                                 join (INNER, REPLICATED):
-                                                    scan catalog_sales
+                                                    dynamic filter (["cs_sold_date_sk"])
+                                                        scan catalog_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
@@ -49,7 +52,8 @@ local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["cr_call_center_sk"])
                                                     partial aggregation over (cr_call_center_sk)
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_returns
+                                                            dynamic filter (["cr_returned_date_sk"])
+                                                                scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -60,7 +64,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ws_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_sold_date_sk", "ws_web_page_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -73,7 +78,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (wr_web_page_sk)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan web_returns
+                                                        dynamic filter (["wr_returned_date_sk", "wr_web_page_sk"])
+                                                            scan web_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q78.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q78.plan.txt
index 50161185b413..b36f1794209d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q78.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q78.plan.txt
@@ -10,10 +10,12 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                scan store_sales
+                                                dynamic filter (["ss_customer_sk", "ss_customer_sk", "ss_item_sk", "ss_sold_date_sk"])
+                                                    scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                    scan store_returns
+                                                    dynamic filter (["sr_item_sk"])
+                                                        scan store_returns
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -24,7 +26,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                scan web_sales
+                                                dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                    scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
                                                     scan web_returns
@@ -40,7 +43,8 @@ local exchange (GATHER, SINGLE, [])
                                     join (INNER, REPLICATED):
                                         join (LEFT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                scan catalog_sales
+                                                dynamic filter (["cs_sold_date_sk"])
+                                                    scan catalog_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
                                                     scan catalog_returns
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q79.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q79.plan.txt
index 1447d7cc49e6..6b367ec922f9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q79.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q79.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_customer_sk", "ss_hdemo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q80.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q80.plan.txt
index 2c4af4d32334..fbd86708e27a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q80.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q80.plan.txt
@@ -15,10 +15,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                                                    scan store_sales
+                                                                    dynamic filter (["ss_item_sk", "ss_promo_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                                        scan store_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                                                        scan store_returns
+                                                                        dynamic filter (["sr_item_sk"])
+                                                                            scan store_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -41,10 +43,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["cs_item_sk", "cs_order_number"])
-                                                                    scan catalog_sales
+                                                                    dynamic filter (["cs_catalog_page_sk", "cs_item_sk", "cs_promo_sk", "cs_sold_date_sk"])
+                                                                        scan catalog_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["cr_item_sk", "cr_order_number"])
-                                                                        scan catalog_returns
+                                                                        dynamic filter (["cr_item_sk"])
+                                                                            scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -67,10 +71,12 @@ local exchange (GATHER, SINGLE, [])
                                                         join (INNER, REPLICATED):
                                                             join (LEFT, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                                    scan web_sales
+                                                                    dynamic filter (["ws_item_sk", "ws_promo_sk", "ws_sold_date_sk", "ws_web_site_sk"])
+                                                                        scan web_sales
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                        scan web_returns
+                                                                        dynamic filter (["wr_item_sk"])
+                                                                            scan web_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q81.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q81.plan.txt
index 972242886adc..0d3738f08f76 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q81.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q81.plan.txt
@@ -13,7 +13,8 @@ local exchange (GATHER, SINGLE, [])
                                                 partial aggregation over (ca_state, cr_returning_customer_sk)
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_returns
+                                                            dynamic filter (["cr_returned_date_sk", "cr_returning_addr_sk", "cr_returning_customer_sk"])
+                                                                scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan date_dim
@@ -22,7 +23,8 @@ local exchange (GATHER, SINGLE, [])
                                                                 scan customer_address
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                        scan customer
+                                        dynamic filter (["c_current_addr_sk"])
+                                            scan customer
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["ca_address_sk_4"])
                                 scan customer_address
@@ -36,7 +38,8 @@ local exchange (GATHER, SINGLE, [])
                                             partial aggregation over (ca_state_88, cr_returning_customer_sk_28)
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan catalog_returns
+                                                        dynamic filter (["cr_returned_date_sk_21", "cr_returning_addr_sk_31"])
+                                                            scan catalog_returns
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q82.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q82.plan.txt
index 03845b26cd85..76a98ec7ec18 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q82.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q82.plan.txt
@@ -8,10 +8,12 @@ local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["inv_item_sk"])
                                 join (INNER, REPLICATED, can skip output duplicates):
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan inventory
+                                        dynamic filter (["inv_date_sk", "inv_item_sk", "inv_item_sk"])
+                                            scan inventory
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                scan item
+                                                dynamic filter (["i_item_sk"])
+                                                    scan item
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q83.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q83.plan.txt
index d2cc6b9db027..38f65608751f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q83.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q83.plan.txt
@@ -10,19 +10,23 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["d_date"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_returns
+                                                dynamic filter (["sr_item_sk", "sr_returned_date_sk"])
+                                                    scan store_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_item_id", "i_item_id"])
+                                                            scan item
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan date_dim
+                                                    dynamic filter (["d_date"])
+                                                        scan date_dim
                                     final aggregation over (d_date_6)
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["d_date_6"])
                                                 partial aggregation over (d_date_6)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq_8"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_week_seq_40)
@@ -38,19 +42,23 @@ local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["d_date_99"])
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan catalog_returns
+                                                dynamic filter (["cr_item_sk", "cr_returned_date_sk"])
+                                                    scan catalog_returns
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan item
+                                                        dynamic filter (["i_item_id_74"])
+                                                            scan item
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
-                                                    scan date_dim
+                                                    dynamic filter (["d_date_99"])
+                                                        scan date_dim
                                     final aggregation over (d_date_131)
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["d_date_131"])
                                                 partial aggregation over (d_date_131)
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan date_dim
+                                                        dynamic filter (["d_week_seq_133"])
+                                                            scan date_dim
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 final aggregation over (d_week_seq_165)
@@ -66,19 +74,22 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["d_date_226"])
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan web_returns
+                                            dynamic filter (["wr_item_sk", "wr_returned_date_sk"])
+                                                scan web_returns
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
-                                                scan date_dim
+                                                dynamic filter (["d_date_226"])
+                                                    scan date_dim
                                 final aggregation over (d_date_258)
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["d_date_258"])
                                             partial aggregation over (d_date_258)
                                                 join (INNER, REPLICATED, can skip output duplicates):
-                                                    scan date_dim
+                                                    dynamic filter (["d_week_seq_260"])
+                                                        scan date_dim
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             final aggregation over (d_week_seq_292)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q84.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q84.plan.txt
index bc64fca2ef08..ded9c6e8c286 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q84.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q84.plan.txt
@@ -6,16 +6,19 @@ local exchange (GATHER, SINGLE, [])
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan customer
+                                dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_current_cdemo_sk", "c_current_hdemo_sk"])
+                                    scan customer
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan customer_address
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
-                                    scan customer_demographics
+                                    dynamic filter (["cd_demo_sk"])
+                                        scan customer_demographics
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPLICATE, BROADCAST, [])
-                                scan household_demographics
+                                dynamic filter (["hd_income_band_sk"])
+                                    scan household_demographics
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPLICATE, BROADCAST, [])
                             scan income_band
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q85.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q85.plan.txt
index 7ea94ada1e8c..338366b7d7e4 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q85.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q85.plan.txt
@@ -13,16 +13,19 @@ local exchange (GATHER, SINGLE, [])
                                                 join (INNER, REPLICATED):
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["ws_item_sk", "ws_order_number"])
-                                                            scan web_sales
+                                                            dynamic filter (["ws_item_sk", "ws_order_number", "ws_sold_date_sk", "ws_web_page_sk"])
+                                                                scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["wr_item_sk", "wr_order_number"])
-                                                                scan web_returns
+                                                                dynamic filter (["wr_reason_sk", "wr_refunded_addr_sk", "wr_refunded_cdemo_sk", "wr_returning_cdemo_sk"])
+                                                                    scan web_returns
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan web_page
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
-                                                        scan customer_demographics
+                                                        dynamic filter (["cd_education_status", "cd_marital_status"])
+                                                            scan customer_demographics
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan customer_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q86.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q86.plan.txt
index cca927926827..38fdc67f5412 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q86.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q86.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             partial aggregation over (groupid, i_category$gid, i_class$gid)
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan web_sales
+                                        dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                            scan web_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q87.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q87.plan.txt
index 9f02b3c87024..b342ddb2e44f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q87.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q87.plan.txt
@@ -12,7 +12,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ss_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_customer_sk", "ss_sold_date_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -27,7 +28,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan catalog_sales
+                                                        dynamic filter (["cs_bill_customer_sk", "cs_sold_date_sk"])
+                                                            scan catalog_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
@@ -42,7 +44,8 @@ final aggregation over ()
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_bill_customer_sk"])
                                                     join (INNER, REPLICATED, can skip output duplicates):
-                                                        scan web_sales
+                                                        dynamic filter (["ws_bill_customer_sk", "ws_sold_date_sk"])
+                                                            scan web_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q88.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q88.plan.txt
index 4b767256bab5..f881cc28eb00 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q88.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q88.plan.txt
@@ -12,7 +12,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan household_demographics
@@ -29,7 +30,8 @@ cross join:
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
                                                     join (INNER, REPLICATED):
-                                                        scan store_sales
+                                                        dynamic filter (["ss_hdemo_sk_11", "ss_sold_time_sk_7", "ss_store_sk_13"])
+                                                            scan store_sales
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan household_demographics
@@ -46,7 +48,8 @@ cross join:
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan store_sales
+                                                    dynamic filter (["ss_hdemo_sk_87", "ss_sold_time_sk_83", "ss_store_sk_89"])
+                                                        scan store_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan household_demographics
@@ -63,7 +66,8 @@ cross join:
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
-                                                scan store_sales
+                                                dynamic filter (["ss_hdemo_sk_163", "ss_sold_time_sk_159", "ss_store_sk_165"])
+                                                    scan store_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan household_demographics
@@ -80,7 +84,8 @@ cross join:
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_hdemo_sk_239", "ss_sold_time_sk_235", "ss_store_sk_241"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan household_demographics
@@ -97,7 +102,8 @@ cross join:
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan store_sales
+                                        dynamic filter (["ss_hdemo_sk_315", "ss_sold_time_sk_311", "ss_store_sk_317"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan household_demographics
@@ -114,7 +120,8 @@ cross join:
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan store_sales
+                                    dynamic filter (["ss_hdemo_sk_391", "ss_sold_time_sk_387", "ss_store_sk_393"])
+                                        scan store_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan household_demographics
@@ -131,7 +138,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan store_sales
+                                dynamic filter (["ss_hdemo_sk_467", "ss_sold_time_sk_463", "ss_store_sk_469"])
+                                    scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan household_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q89.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q89.plan.txt
index 396d705bbc38..221dfc17c333 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q89.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q89.plan.txt
@@ -9,7 +9,8 @@ local exchange (GATHER, SINGLE, [])
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk", "ss_store_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q90.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q90.plan.txt
index 5e6f7dd4cbdb..3b4a8070b84f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q90.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q90.plan.txt
@@ -6,7 +6,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk", "ws_sold_time_sk", "ws_web_page_sk"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan household_demographics
@@ -23,7 +24,8 @@ cross join:
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
                             join (INNER, REPLICATED):
-                                scan web_sales
+                                dynamic filter (["ws_ship_hdemo_sk_16", "ws_sold_time_sk_7", "ws_web_page_sk_18"])
+                                    scan web_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan household_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q91.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q91.plan.txt
index 8fc536c72b7c..2bb29d2be645 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q91.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q91.plan.txt
@@ -13,7 +13,8 @@ remote exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["cr_returning_customer_sk"])
                                                     join (INNER, REPLICATED):
                                                         join (INNER, REPLICATED):
-                                                            scan catalog_returns
+                                                            dynamic filter (["cr_call_center_sk", "cr_returned_date_sk", "cr_returning_customer_sk"])
+                                                                scan catalog_returns
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan call_center
@@ -22,7 +23,8 @@ remote exchange (GATHER, SINGLE, [])
                                                                 scan date_dim
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["c_customer_sk"])
-                                                        scan customer
+                                                        dynamic filter (["c_current_addr_sk", "c_current_cdemo_sk", "c_current_hdemo_sk"])
+                                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["ca_address_sk"])
                                                 scan customer_address
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q92.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q92.plan.txt
index 335e21c50b65..4c49dec76d51 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q92.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q92.plan.txt
@@ -7,7 +7,8 @@ final aggregation over ()
                         remote exchange (REPARTITION, HASH, ["ws_item_sk"])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
-                                    scan web_sales
+                                    dynamic filter (["ws_item_sk", "ws_sold_date_sk"])
+                                        scan web_sales
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan item
@@ -19,7 +20,8 @@ final aggregation over ()
                                 remote exchange (REPARTITION, HASH, ["ws_item_sk_7"])
                                     partial aggregation over (ws_item_sk_7)
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_sold_date_sk_4"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q93.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q93.plan.txt
index ca9dc7543db7..e1cd897adff9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q93.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q93.plan.txt
@@ -7,10 +7,12 @@ local exchange (GATHER, SINGLE, [])
                         join (INNER, REPLICATED):
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["ss_item_sk", "ss_ticket_number"])
-                                    scan store_sales
+                                    dynamic filter (["ss_item_sk", "ss_ticket_number"])
+                                        scan store_sales
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["sr_item_sk", "sr_ticket_number"])
-                                        scan store_returns
+                                        dynamic filter (["sr_reason_sk"])
+                                            scan store_returns
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan reason
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q94.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q94.plan.txt
index db9807f4e190..13e930d9647f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q94.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q94.plan.txt
@@ -11,7 +11,8 @@ final aggregation over ()
                                         join (INNER, REPLICATED):
                                             join (INNER, REPLICATED):
                                                 join (INNER, REPLICATED):
-                                                    scan web_sales
+                                                    dynamic filter (["ws_order_number", "ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                        scan web_sales
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q95.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q95.plan.txt
index 8bc70721a079..c7056e07c2a7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q95.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q95.plan.txt
@@ -9,7 +9,8 @@ final aggregation over ()
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan web_sales
+                                            dynamic filter (["ws_order_number", "ws_order_number", "ws_ship_addr_sk", "ws_ship_date_sk", "ws_web_site_sk"])
+                                                scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan date_dim
@@ -24,20 +25,24 @@ final aggregation over ()
                                     partial aggregation over (ws_order_number_23)
                                         join (INNER, PARTITIONED, can skip output duplicates):
                                             remote exchange (REPARTITION, HASH, ["ws_order_number_23"])
-                                                scan web_sales
+                                                dynamic filter (["ws_order_number_23", "ws_order_number_23"])
+                                                    scan web_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["ws_order_number_59"])
-                                                    scan web_sales
+                                                    dynamic filter (["ws_order_number_59"])
+                                                        scan web_sales
                         final aggregation over (wr_order_number)
                             local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (wr_order_number)
                                     join (INNER, PARTITIONED, can skip output duplicates):
                                         remote exchange (REPARTITION, HASH, ["wr_order_number"])
-                                            scan web_returns
+                                            dynamic filter (["wr_order_number"])
+                                                scan web_returns
                                         local exchange (GATHER, SINGLE, [])
                                             join (INNER, PARTITIONED, can skip output duplicates):
                                                 remote exchange (REPARTITION, HASH, ["ws_order_number_101"])
-                                                    scan web_sales
+                                                    dynamic filter (["ws_order_number_101"])
+                                                        scan web_sales
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["ws_order_number_137"])
                                                         scan web_sales
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q96.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q96.plan.txt
index a942f9abdebe..da321e261edc 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q96.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q96.plan.txt
@@ -5,7 +5,8 @@ final aggregation over ()
                 join (INNER, REPLICATED):
                     join (INNER, REPLICATED):
                         join (INNER, REPLICATED):
-                            scan store_sales
+                            dynamic filter (["ss_hdemo_sk", "ss_sold_time_sk", "ss_store_sk"])
+                                scan store_sales
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan household_demographics
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q97.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q97.plan.txt
index 7b9c83293534..959bbfe9de73 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q97.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q97.plan.txt
@@ -8,7 +8,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["ss_customer_sk", "ss_item_sk"])
                                 partial aggregation over (ss_customer_sk, ss_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan store_sales
+                                        dynamic filter (["ss_sold_date_sk"])
+                                            scan store_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
@@ -17,7 +18,8 @@ final aggregation over ()
                             remote exchange (REPARTITION, HASH, ["cs_bill_customer_sk", "cs_item_sk"])
                                 partial aggregation over (cs_bill_customer_sk, cs_item_sk)
                                     join (INNER, REPLICATED, can skip output duplicates):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_sold_date_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan date_dim
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q98.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q98.plan.txt
index 6db78ab06afe..283ba871c286 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q98.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q98.plan.txt
@@ -9,7 +9,8 @@ remote exchange (GATHER, SINGLE, [])
                                 partial aggregation over (i_category, i_class, i_current_price, i_item_desc, i_item_id)
                                     join (INNER, REPLICATED):
                                         join (INNER, REPLICATED):
-                                            scan store_sales
+                                            dynamic filter (["ss_item_sk", "ss_sold_date_sk"])
+                                                scan store_sales
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan item
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q99.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q99.plan.txt
index fd69bb055770..8173d66e2929 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q99.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpcds/iceberg_small_files/parquet/unpartitioned/q99.plan.txt
@@ -8,7 +8,8 @@ local exchange (GATHER, SINGLE, [])
                             join (INNER, REPLICATED):
                                 join (INNER, REPLICATED):
                                     join (INNER, REPLICATED):
-                                        scan catalog_sales
+                                        dynamic filter (["cs_call_center_sk", "cs_ship_date_sk", "cs_ship_mode_sk", "cs_warehouse_sk"])
+                                            scan catalog_sales
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan warehouse
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q02.plan.txt
index b593422eaaf0..7d59421d48f6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q02.plan.txt
@@ -8,15 +8,18 @@ remote exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["partkey_23"])
                                 partial aggregation over (partkey_23)
                                     join (INNER, REPLICATED):
-                                        scan partsupp
+                                        dynamic filter (["partkey_23", "suppkey_24"])
+                                            scan partsupp
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan supplier
+                                                    dynamic filter (["nationkey_34"])
+                                                        scan supplier
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan nation
+                                                                dynamic filter (["regionkey_43"])
+                                                                    scan nation
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan region
@@ -25,18 +28,21 @@ remote exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["suppkey_6"])
                                     join (INNER, REPLICATED):
-                                        scan partsupp
+                                        dynamic filter (["partkey_5", "suppkey_6"])
+                                            scan partsupp
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan part
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["suppkey"])
                                         join (INNER, REPLICATED):
-                                            scan supplier
+                                            dynamic filter (["nationkey"])
+                                                scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan nation
+                                                        dynamic filter (["regionkey"])
+                                                            scan nation
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan region
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q03.plan.txt
index 4a9e1323a310..6b20d8824865 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q03.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 partial aggregation over (orderdate, orderkey_5, shippriority)
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["orderkey_5"])
-                            scan lineitem
+                            dynamic filter (["orderkey_5"])
+                                scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                        scan orders
+                                        dynamic filter (["custkey_0"])
+                                            scan orders
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["custkey"])
                                             scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q04.plan.txt
index 5d0194bd4f62..ad4b7720ec2f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q04.plan.txt
@@ -6,7 +6,8 @@ remote exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["orderpriority"])
                         partial aggregation over (orderpriority)
                             join (INNER, REPLICATED):
-                                scan orders
+                                dynamic filter (["orderkey"])
+                                    scan orders
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         final aggregation over (orderkey_0)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q05.plan.txt
index cb04cfef04bd..e36da99b8389 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q05.plan.txt
@@ -8,15 +8,18 @@ remote exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["nationkey_14", "orderkey_5"])
                                     join (INNER, REPLICATED):
-                                        scan lineitem
+                                        dynamic filter (["orderkey_5", "suppkey"])
+                                            scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan supplier
+                                                    dynamic filter (["nationkey_14", "nationkey_14"])
+                                                        scan supplier
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan nation
+                                                                dynamic filter (["nationkey_21", "regionkey"])
+                                                                    scan nation
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan region
@@ -24,7 +27,8 @@ remote exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["nationkey", "orderkey"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                                scan orders
+                                                dynamic filter (["custkey_0"])
+                                                    scan orders
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                                     scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q07.plan.txt
index e334b46ac4d6..26c5762a8549 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q07.plan.txt
@@ -9,22 +9,26 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["orderkey_5"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["custkey"])
-                                            scan orders
+                                            dynamic filter (["custkey", "orderkey_5"])
+                                                scan orders
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["custkey_11"])
                                                 join (INNER, REPLICATED):
-                                                    scan customer
+                                                    dynamic filter (["nationkey_14"])
+                                                        scan customer
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan nation
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey"])
                                         join (INNER, REPLICATED):
-                                            scan lineitem
+                                            dynamic filter (["suppkey_0"])
+                                                scan lineitem
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan supplier
+                                                        dynamic filter (["nationkey"])
+                                                            scan supplier
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q08.plan.txt
index 34062f9cadd6..63b7df527b73 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q08.plan.txt
@@ -10,14 +10,16 @@ remote exchange (GATHER, SINGLE, [])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["suppkey_6"])
                                             join (INNER, REPLICATED):
-                                                scan lineitem
+                                                dynamic filter (["orderkey", "partkey_5", "suppkey_6"])
+                                                    scan lineitem
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan part
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["suppkey"])
                                                 join (INNER, REPLICATED):
-                                                    scan supplier
+                                                    dynamic filter (["nationkey"])
+                                                        scan supplier
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan nation
@@ -25,15 +27,18 @@ remote exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey_11"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["custkey"])
-                                                scan orders
+                                                dynamic filter (["custkey"])
+                                                    scan orders
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey_17"])
                                                     join (INNER, REPLICATED):
-                                                        scan customer
+                                                        dynamic filter (["nationkey_20"])
+                                                            scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
-                                                                    scan nation
+                                                                    dynamic filter (["regionkey"])
+                                                                        scan nation
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan region
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q09.plan.txt
index 8b8f3844d639..87d5b62f892d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q09.plan.txt
@@ -13,13 +13,16 @@ remote exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["suppkey_6"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["partkey_5"])
-                                                            scan lineitem
+                                                            dynamic filter (["orderkey", "partkey_5", "partkey_5", "suppkey_6", "suppkey_6"])
+                                                                scan lineitem
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["partkey"])
-                                                                scan part
+                                                                dynamic filter (["partkey"])
+                                                                    scan part
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["suppkey"])
-                                                        scan supplier
+                                                        dynamic filter (["nationkey", "suppkey"])
+                                                            scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["suppkey_12"])
                                                     scan partsupp
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q10.plan.txt
index 4b45077ce17c..a2e906334bc6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q10.plan.txt
@@ -6,13 +6,15 @@ local exchange (GATHER, SINGLE, [])
                     partial aggregation over (acctbal, address, comment_7, custkey_6, name, name_12, phone)
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["orderkey"])
-                                scan lineitem
+                                dynamic filter (["orderkey"])
+                                    scan lineitem
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                     join (INNER, REPLICATED):
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["custkey_6"])
-                                                scan customer
+                                                dynamic filter (["custkey_6", "nationkey"])
+                                                    scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                                     scan orders
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q11.plan.txt
index bfc5af4b5bb2..6783b012d01c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q11.plan.txt
@@ -7,11 +7,13 @@ remote exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             partial aggregation over (partkey)
                                 join (INNER, REPLICATED):
-                                    scan partsupp
+                                    dynamic filter (["suppkey"])
+                                        scan partsupp
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan supplier
+                                                dynamic filter (["nationkey"])
+                                                    scan supplier
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan nation
@@ -22,11 +24,13 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         join (INNER, REPLICATED):
-                                            scan partsupp
+                                            dynamic filter (["suppkey_12"])
+                                                scan partsupp
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan supplier
+                                                        dynamic filter (["nationkey_22"])
+                                                            scan supplier
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q12.plan.txt
index 7fb5b836dfa9..78a29b890283 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q12.plan.txt
@@ -7,7 +7,8 @@ remote exchange (GATHER, SINGLE, [])
                         partial aggregation over (shipmode)
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["orderkey"])
-                                    scan orders
+                                    dynamic filter (["orderkey"])
+                                        scan orders
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                         scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q13.plan.txt
index e30665fcb33b..e730726f91ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q13.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over (custkey)
                                         join (RIGHT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                                scan orders
+                                                dynamic filter (["custkey_0"])
+                                                    scan orders
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                                     scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q14.plan.txt
index e46c0418a759..e19b87ce562d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q14.plan.txt
@@ -4,7 +4,8 @@ final aggregation over ()
             partial aggregation over ()
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["partkey_0"])
-                        scan part
+                        dynamic filter (["partkey_0"])
+                            scan part
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q15.plan.txt
index c95f702a6873..27a7aac79447 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q15.plan.txt
@@ -3,7 +3,8 @@ remote exchange (GATHER, SINGLE, [])
         remote exchange (REPARTITION, ROUND_ROBIN, [])
             join (INNER, REPLICATED):
                 join (INNER, REPLICATED):
-                    scan supplier
+                    dynamic filter (["suppkey"])
+                        scan supplier
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPLICATE, BROADCAST, [])
                             final aggregation over (suppkey_0)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q16.plan.txt
index 97eea04d0aa1..5c88eb77e918 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q16.plan.txt
@@ -12,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["suppkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["partkey"])
-                                                        scan partsupp
+                                                        dynamic filter (["partkey"])
+                                                            scan partsupp
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["partkey_0"])
                                                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q17.plan.txt
index 0d192b20aa3d..28d5c917aabb 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q17.plan.txt
@@ -5,7 +5,8 @@ final aggregation over ()
                 cross join:
                     join (LEFT, REPLICATED):
                         join (INNER, REPLICATED):
-                            scan lineitem
+                            dynamic filter (["partkey"])
+                                scan lineitem
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q18.plan.txt
index 463aec3e5325..94f7b5b1f75e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q18.plan.txt
@@ -5,13 +5,15 @@ local exchange (GATHER, SINGLE, [])
                 partial aggregation over (custkey_0, name, orderdate, orderkey_5, totalprice)
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["orderkey_5"])
-                            scan lineitem
+                            dynamic filter (["orderkey_5"])
+                                scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
                                         join (INNER, REPLICATED):
-                                            scan orders
+                                            dynamic filter (["custkey_0", "orderkey"])
+                                                scan orders
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     single aggregation over (orderkey_11)
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q19.plan.txt
index fa00639798fe..3280029142dd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q19.plan.txt
@@ -4,7 +4,8 @@ final aggregation over ()
             partial aggregation over ()
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["partkey"])
-                        scan lineitem
+                        dynamic filter (["partkey"])
+                            scan lineitem
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey_0"])
                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q20.plan.txt
index 89b191d4eafd..d4ca3430cd60 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q20.plan.txt
@@ -12,12 +12,14 @@ remote exchange (GATHER, SINGLE, [])
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["partkey_21", "suppkey_22"])
                                                     partial aggregation over (partkey_21, suppkey_22)
-                                                        scan lineitem
+                                                        dynamic filter (["partkey_21", "suppkey_22", "suppkey_22"])
+                                                            scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["partkey", "suppkey_6"])
                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                     remote exchange (REPARTITION, HASH, ["partkey"])
-                                                        scan partsupp
+                                                        dynamic filter (["partkey", "suppkey_6"])
+                                                            scan partsupp
                                                     final aggregation over (partkey_13)
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["partkey_13"])
@@ -30,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["suppkey"])
                         join (INNER, REPLICATED):
-                            scan supplier
+                            dynamic filter (["nationkey"])
+                                scan supplier
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q21.plan.txt
index 1460eaa40b15..b61ccb423b60 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q21.plan.txt
@@ -13,17 +13,20 @@ local exchange (GATHER, SINGLE, [])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["orderkey"])
                                                         join (INNER, REPLICATED):
-                                                            scan lineitem
+                                                            dynamic filter (["orderkey", "orderkey", "suppkey_0"])
+                                                                scan lineitem
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     join (INNER, REPLICATED):
-                                                                        scan supplier
+                                                                        dynamic filter (["nationkey"])
+                                                                            scan supplier
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 scan nation
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["orderkey_5"])
-                                                            scan orders
+                                                            dynamic filter (["orderkey_5"])
+                                                                scan orders
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["orderkey_17"])
                                                         scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q22.plan.txt
index 0cc72848180d..c67a76eab602 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q22.plan.txt
@@ -8,7 +8,8 @@ remote exchange (GATHER, SINGLE, [])
                             join (LEFT, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     cross join:
-                                        scan customer
+                                        dynamic filter (["acctbal"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over ()
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q02.plan.txt
index b593422eaaf0..7d59421d48f6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q02.plan.txt
@@ -8,15 +8,18 @@ remote exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["partkey_23"])
                                 partial aggregation over (partkey_23)
                                     join (INNER, REPLICATED):
-                                        scan partsupp
+                                        dynamic filter (["partkey_23", "suppkey_24"])
+                                            scan partsupp
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan supplier
+                                                    dynamic filter (["nationkey_34"])
+                                                        scan supplier
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan nation
+                                                                dynamic filter (["regionkey_43"])
+                                                                    scan nation
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan region
@@ -25,18 +28,21 @@ remote exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["suppkey_6"])
                                     join (INNER, REPLICATED):
-                                        scan partsupp
+                                        dynamic filter (["partkey_5", "suppkey_6"])
+                                            scan partsupp
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan part
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["suppkey"])
                                         join (INNER, REPLICATED):
-                                            scan supplier
+                                            dynamic filter (["nationkey"])
+                                                scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan nation
+                                                        dynamic filter (["regionkey"])
+                                                            scan nation
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan region
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q03.plan.txt
index 4a9e1323a310..6b20d8824865 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q03.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 partial aggregation over (orderdate, orderkey_5, shippriority)
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["orderkey_5"])
-                            scan lineitem
+                            dynamic filter (["orderkey_5"])
+                                scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                        scan orders
+                                        dynamic filter (["custkey_0"])
+                                            scan orders
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["custkey"])
                                             scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q04.plan.txt
index 91dcfd113534..655ae9102c9b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q04.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                             partial aggregation over (orderkey_0)
-                                                scan lineitem
+                                                dynamic filter (["orderkey_0"])
+                                                    scan lineitem
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey"])
                                         scan orders
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q05.plan.txt
index 11e54014a4ca..9121d88b28be 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q05.plan.txt
@@ -8,15 +8,18 @@ remote exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["nationkey_13", "orderkey_5"])
                                     join (INNER, REPLICATED):
-                                        scan lineitem
+                                        dynamic filter (["orderkey_5", "suppkey"])
+                                            scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan supplier
+                                                    dynamic filter (["nationkey_13", "nationkey_13"])
+                                                        scan supplier
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan nation
+                                                                dynamic filter (["nationkey_20", "regionkey"])
+                                                                    scan nation
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan region
@@ -24,7 +27,8 @@ remote exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["nationkey", "orderkey"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                                scan orders
+                                                dynamic filter (["custkey_0"])
+                                                    scan orders
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                                     scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q07.plan.txt
index 4a90291c58c0..633ef6f13abe 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q07.plan.txt
@@ -8,11 +8,13 @@ remote exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["orderkey"])
                                     join (INNER, REPLICATED):
-                                        scan lineitem
+                                        dynamic filter (["orderkey", "suppkey_0"])
+                                            scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan supplier
+                                                    dynamic filter (["nationkey"])
+                                                        scan supplier
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan nation
@@ -20,11 +22,13 @@ remote exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey_5"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["custkey"])
-                                                scan orders
+                                                dynamic filter (["custkey"])
+                                                    scan orders
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey_10"])
                                                     join (INNER, REPLICATED):
-                                                        scan customer
+                                                        dynamic filter (["nationkey_13"])
+                                                            scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q08.plan.txt
index c196a44d68e0..ff8b232c10f2 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q08.plan.txt
@@ -11,29 +11,34 @@ remote exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["custkey"])
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["orderkey_11"])
-                                                    scan orders
+                                                    dynamic filter (["custkey", "orderkey_11"])
+                                                        scan orders
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["orderkey"])
                                                         join (INNER, REPLICATED):
-                                                            scan lineitem
+                                                            dynamic filter (["partkey_5", "suppkey_6"])
+                                                                scan lineitem
                                                             local exchange (GATHER, SINGLE, [])
                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                     scan part
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["custkey_16"])
                                                 join (INNER, REPLICATED):
-                                                    scan customer
+                                                    dynamic filter (["nationkey_19"])
+                                                        scan customer
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan nation
+                                                                dynamic filter (["regionkey"])
+                                                                    scan nation
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan region
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["suppkey"])
                                         join (INNER, REPLICATED):
-                                            scan supplier
+                                            dynamic filter (["nationkey"])
+                                                scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q09.plan.txt
index 24be20eb1056..af09415d00c0 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q09.plan.txt
@@ -13,13 +13,16 @@ remote exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["suppkey_6"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["partkey_5"])
-                                                            scan lineitem
+                                                            dynamic filter (["orderkey", "partkey_5", "partkey_5", "suppkey_6", "suppkey_6"])
+                                                                scan lineitem
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["partkey"])
-                                                                scan part
+                                                                dynamic filter (["partkey"])
+                                                                    scan part
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["suppkey"])
-                                                        scan supplier
+                                                        dynamic filter (["nationkey", "suppkey"])
+                                                            scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["suppkey_12"])
                                                     scan partsupp
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q10.plan.txt
index 60df9b930b5b..1fefeddf8854 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q10.plan.txt
@@ -6,12 +6,14 @@ local exchange (GATHER, SINGLE, [])
                     join (INNER, REPLICATED):
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["custkey_5"])
-                                scan customer
+                                dynamic filter (["custkey_5", "nationkey"])
+                                    scan customer
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey"])
-                                            scan lineitem
+                                            dynamic filter (["orderkey"])
+                                                scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                                 scan orders
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q11.plan.txt
index bfc5af4b5bb2..6783b012d01c 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q11.plan.txt
@@ -7,11 +7,13 @@ remote exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             partial aggregation over (partkey)
                                 join (INNER, REPLICATED):
-                                    scan partsupp
+                                    dynamic filter (["suppkey"])
+                                        scan partsupp
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan supplier
+                                                dynamic filter (["nationkey"])
+                                                    scan supplier
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan nation
@@ -22,11 +24,13 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         join (INNER, REPLICATED):
-                                            scan partsupp
+                                            dynamic filter (["suppkey_12"])
+                                                scan partsupp
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan supplier
+                                                        dynamic filter (["nationkey_22"])
+                                                            scan supplier
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q12.plan.txt
index 7fb5b836dfa9..78a29b890283 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q12.plan.txt
@@ -7,7 +7,8 @@ remote exchange (GATHER, SINGLE, [])
                         partial aggregation over (shipmode)
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["orderkey"])
-                                    scan orders
+                                    dynamic filter (["orderkey"])
+                                        scan orders
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                         scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q13.plan.txt
index e30665fcb33b..e730726f91ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q13.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over (custkey)
                                         join (RIGHT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                                scan orders
+                                                dynamic filter (["custkey_0"])
+                                                    scan orders
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                                     scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q14.plan.txt
index e46c0418a759..e19b87ce562d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q14.plan.txt
@@ -4,7 +4,8 @@ final aggregation over ()
             partial aggregation over ()
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["partkey_0"])
-                        scan part
+                        dynamic filter (["partkey_0"])
+                            scan part
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q15.plan.txt
index 02ee343d1df5..267f9607142a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q15.plan.txt
@@ -4,7 +4,8 @@ remote exchange (GATHER, SINGLE, [])
             join (INNER, REPLICATED):
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["suppkey"])
-                        scan supplier
+                        dynamic filter (["suppkey"])
+                            scan supplier
                     final aggregation over (suppkey_0)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["suppkey_0"])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q16.plan.txt
index 97eea04d0aa1..5c88eb77e918 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q16.plan.txt
@@ -12,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["suppkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["partkey"])
-                                                        scan partsupp
+                                                        dynamic filter (["partkey"])
+                                                            scan partsupp
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["partkey_0"])
                                                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q17.plan.txt
index 72a457f937bf..f58bebb3d049 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q17.plan.txt
@@ -8,11 +8,13 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["partkey_6"])
                                     partial aggregation over (partkey_6)
-                                        scan lineitem
+                                        dynamic filter (["partkey_6"])
+                                            scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["partkey"])
                                 join (INNER, REPLICATED):
-                                    scan lineitem
+                                    dynamic filter (["partkey"])
+                                        scan lineitem
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q18.plan.txt
index b9b41cc41b90..792f3516048e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q18.plan.txt
@@ -5,14 +5,16 @@ local exchange (GATHER, SINGLE, [])
                 partial aggregation over (custkey_0, name, orderdate, orderkey_5, totalprice)
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["orderkey_5"])
-                            scan lineitem
+                            dynamic filter (["orderkey_5"])
+                                scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["orderkey"])
-                                                scan orders
+                                                dynamic filter (["custkey_0", "orderkey"])
+                                                    scan orders
                                             single aggregation over (orderkey_10)
                                                 final aggregation over (orderkey_10)
                                                     local exchange (GATHER, SINGLE, [])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q19.plan.txt
index fa00639798fe..3280029142dd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q19.plan.txt
@@ -4,7 +4,8 @@ final aggregation over ()
             partial aggregation over ()
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["partkey"])
-                        scan lineitem
+                        dynamic filter (["partkey"])
+                            scan lineitem
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey_0"])
                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q20.plan.txt
index 89b191d4eafd..d4ca3430cd60 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q20.plan.txt
@@ -12,12 +12,14 @@ remote exchange (GATHER, SINGLE, [])
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["partkey_21", "suppkey_22"])
                                                     partial aggregation over (partkey_21, suppkey_22)
-                                                        scan lineitem
+                                                        dynamic filter (["partkey_21", "suppkey_22", "suppkey_22"])
+                                                            scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["partkey", "suppkey_6"])
                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                     remote exchange (REPARTITION, HASH, ["partkey"])
-                                                        scan partsupp
+                                                        dynamic filter (["partkey", "suppkey_6"])
+                                                            scan partsupp
                                                     final aggregation over (partkey_13)
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["partkey_13"])
@@ -30,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["suppkey"])
                         join (INNER, REPLICATED):
-                            scan supplier
+                            dynamic filter (["nationkey"])
+                                scan supplier
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q21.plan.txt
index d62c188bfd61..93b1f2c4fada 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q21.plan.txt
@@ -9,22 +9,26 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (commitdate, exists, name, name_11, nationkey, orderkey_16, orderstatus, receiptdate, suppkey_0, unique)
                                     join (RIGHT, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey_36"])
-                                            scan lineitem
+                                            dynamic filter (["orderkey_36"])
+                                                scan lineitem
                                         final aggregation over (commitdate, name, name_11, nationkey, orderkey_16, orderstatus, receiptdate, suppkey_0, unique_59)
                                             local exchange (GATHER, SINGLE, [])
                                                 partial aggregation over (commitdate, name, name_11, nationkey, orderkey_16, orderstatus, receiptdate, suppkey_0, unique_59)
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["orderkey_16"])
-                                                            scan lineitem
+                                                            dynamic filter (["orderkey_16"])
+                                                                scan lineitem
                                                         local exchange (GATHER, SINGLE, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["orderkey"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan lineitem
+                                                                        dynamic filter (["orderkey", "suppkey_0"])
+                                                                            scan lineitem
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 join (INNER, REPLICATED):
-                                                                                    scan supplier
+                                                                                    dynamic filter (["nationkey"])
+                                                                                        scan supplier
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q22.plan.txt
index 0cc72848180d..c67a76eab602 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q22.plan.txt
@@ -8,7 +8,8 @@ remote exchange (GATHER, SINGLE, [])
                             join (LEFT, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     cross join:
-                                        scan customer
+                                        dynamic filter (["acctbal"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over ()
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q02.plan.txt
index 358da707a03d..bc5e2e079616 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q02.plan.txt
@@ -8,15 +8,18 @@ remote exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["partkey_19"])
                                 partial aggregation over (partkey_19)
                                     join (INNER, REPLICATED):
-                                        scan partsupp
+                                        dynamic filter (["partkey_19", "suppkey_20"])
+                                            scan partsupp
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan supplier
+                                                    dynamic filter (["nationkey_29"])
+                                                        scan supplier
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan nation
+                                                                dynamic filter (["regionkey_37"])
+                                                                    scan nation
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan region
@@ -26,18 +29,21 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["suppkey_5"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["partkey_4"])
-                                            scan partsupp
+                                            dynamic filter (["partkey_4", "suppkey_5"])
+                                                scan partsupp
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["partkey"])
                                                 scan part
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["suppkey"])
                                         join (INNER, REPLICATED):
-                                            scan supplier
+                                            dynamic filter (["nationkey"])
+                                                scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan nation
+                                                        dynamic filter (["regionkey"])
+                                                            scan nation
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan region
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q03.plan.txt
index f5cf1c82bd37..6b43a2922b47 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q03.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 partial aggregation over (orderdate, orderkey_4, shippriority)
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                            scan lineitem
+                            dynamic filter (["orderkey_4"])
+                                scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                        scan orders
+                                        dynamic filter (["custkey_0"])
+                                            scan orders
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["custkey"])
                                             scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q04.plan.txt
index 91dcfd113534..655ae9102c9b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q04.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                             partial aggregation over (orderkey_0)
-                                                scan lineitem
+                                                dynamic filter (["orderkey_0"])
+                                                    scan lineitem
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey"])
                                         scan orders
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q05.plan.txt
index 8d476b717a72..552e5f5d8101 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q05.plan.txt
@@ -9,20 +9,24 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["nationkey", "suppkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                                            scan lineitem
+                                            dynamic filter (["orderkey_4", "suppkey"])
+                                                scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                                        scan orders
+                                                        dynamic filter (["custkey_0"])
+                                                            scan orders
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["custkey"])
                                                             join (INNER, REPLICATED):
-                                                                scan customer
+                                                                dynamic filter (["nationkey", "nationkey"])
+                                                                    scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, REPLICATED):
-                                                                            scan nation
+                                                                            dynamic filter (["nationkey_17", "regionkey"])
+                                                                                scan nation
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan region
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q07.plan.txt
index 64d5f1fecd08..eb126c8e6c5d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q07.plan.txt
@@ -9,22 +9,26 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                                            scan orders
+                                            dynamic filter (["custkey", "orderkey_4"])
+                                                scan orders
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                                 join (INNER, REPLICATED):
-                                                    scan lineitem
+                                                    dynamic filter (["suppkey_0"])
+                                                        scan lineitem
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan supplier
+                                                                dynamic filter (["nationkey"])
+                                                                    scan supplier
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan nation
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["custkey_8"])
                                         join (INNER, REPLICATED):
-                                            scan customer
+                                            dynamic filter (["nationkey_11"])
+                                                scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q08.plan.txt
index 88f8a11f4445..6bf9dc00784b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q08.plan.txt
@@ -12,28 +12,33 @@ remote exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["custkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["orderkey_9"])
-                                                        scan orders
+                                                        dynamic filter (["custkey", "orderkey_9"])
+                                                            scan orders
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["orderkey"])
                                                             join (INNER, REPLICATED):
-                                                                scan lineitem
+                                                                dynamic filter (["partkey_4", "suppkey_5"])
+                                                                    scan lineitem
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan part
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey_13"])
                                                     join (INNER, REPLICATED):
-                                                        scan customer
+                                                        dynamic filter (["nationkey_16"])
+                                                            scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
-                                                                    scan nation
+                                                                    dynamic filter (["regionkey"])
+                                                                        scan nation
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan region
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["suppkey"])
-                                            scan supplier
+                                            dynamic filter (["nationkey"])
+                                                scan supplier
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q09.plan.txt
index a55a51f232bd..fdb31d6425ed 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q09.plan.txt
@@ -13,13 +13,16 @@ remote exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["suppkey_5"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["partkey_4"])
-                                                            scan lineitem
+                                                            dynamic filter (["orderkey", "partkey_4", "partkey_4", "suppkey_5", "suppkey_5"])
+                                                                scan lineitem
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["partkey"])
-                                                                scan part
+                                                                dynamic filter (["partkey"])
+                                                                    scan part
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["suppkey"])
-                                                        scan supplier
+                                                        dynamic filter (["nationkey", "suppkey"])
+                                                            scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["suppkey_10"])
                                                     scan partsupp
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q10.plan.txt
index 7ab0ad56a3f1..1d813f011e8f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q10.plan.txt
@@ -6,12 +6,14 @@ local exchange (GATHER, SINGLE, [])
                     join (INNER, REPLICATED):
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["custkey_4"])
-                                scan customer
+                                dynamic filter (["custkey_4", "nationkey"])
+                                    scan customer
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey"])
-                                            scan lineitem
+                                            dynamic filter (["orderkey"])
+                                                scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                                 scan orders
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q11.plan.txt
index bfc5af4b5bb2..23b8747ebbc8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q11.plan.txt
@@ -7,11 +7,13 @@ remote exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             partial aggregation over (partkey)
                                 join (INNER, REPLICATED):
-                                    scan partsupp
+                                    dynamic filter (["suppkey"])
+                                        scan partsupp
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan supplier
+                                                dynamic filter (["nationkey"])
+                                                    scan supplier
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan nation
@@ -22,11 +24,13 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         join (INNER, REPLICATED):
-                                            scan partsupp
+                                            dynamic filter (["suppkey_10"])
+                                                scan partsupp
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan supplier
+                                                        dynamic filter (["nationkey_19"])
+                                                            scan supplier
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q12.plan.txt
index 7fb5b836dfa9..78a29b890283 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q12.plan.txt
@@ -7,7 +7,8 @@ remote exchange (GATHER, SINGLE, [])
                         partial aggregation over (shipmode)
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["orderkey"])
-                                    scan orders
+                                    dynamic filter (["orderkey"])
+                                        scan orders
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                         scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q13.plan.txt
index e30665fcb33b..e730726f91ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q13.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over (custkey)
                                         join (RIGHT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                                scan orders
+                                                dynamic filter (["custkey_0"])
+                                                    scan orders
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                                     scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q14.plan.txt
index e46c0418a759..e19b87ce562d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q14.plan.txt
@@ -4,7 +4,8 @@ final aggregation over ()
             partial aggregation over ()
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["partkey_0"])
-                        scan part
+                        dynamic filter (["partkey_0"])
+                            scan part
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q15.plan.txt
index b9a65952a467..7658f101858e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q15.plan.txt
@@ -4,7 +4,8 @@ remote exchange (GATHER, SINGLE, [])
             join (INNER, REPLICATED):
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["suppkey"])
-                        scan supplier
+                        dynamic filter (["suppkey"])
+                            scan supplier
                     final aggregation over (suppkey_0)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["suppkey_0"])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q16.plan.txt
index bd14aff914fd..a1efdba535c6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q16.plan.txt
@@ -12,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["suppkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["partkey"])
-                                                        scan partsupp
+                                                        dynamic filter (["partkey"])
+                                                            scan partsupp
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["partkey_0"])
                                                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q17.plan.txt
index 30539653b56b..87f067c1d9e9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q17.plan.txt
@@ -8,11 +8,13 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["partkey_5"])
                                     partial aggregation over (partkey_5)
-                                        scan lineitem
+                                        dynamic filter (["partkey_5"])
+                                            scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["partkey"])
                                 join (INNER, REPLICATED):
-                                    scan lineitem
+                                    dynamic filter (["partkey"])
+                                        scan lineitem
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q18.plan.txt
index 296a79e4c9cf..b5af485ab287 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q18.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["custkey_0"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey"])
-                                            scan orders
+                                            dynamic filter (["custkey_0", "orderkey", "orderkey"])
+                                                scan orders
                                         single aggregation over (orderkey_8)
                                             final aggregation over (orderkey_8)
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["orderkey_8"])
                                                         partial aggregation over (orderkey_8)
-                                                            scan lineitem
+                                                            dynamic filter (["orderkey_8"])
+                                                                scan lineitem
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["custkey"])
                                         scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q19.plan.txt
index e46c0418a759..e19b87ce562d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q19.plan.txt
@@ -4,7 +4,8 @@ final aggregation over ()
             partial aggregation over ()
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["partkey_0"])
-                        scan part
+                        dynamic filter (["partkey_0"])
+                            scan part
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q20.plan.txt
index cb79004dac3a..c8ab7dea8470 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q20.plan.txt
@@ -12,12 +12,14 @@ remote exchange (GATHER, SINGLE, [])
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["partkey_18", "suppkey_19"])
                                                     partial aggregation over (partkey_18, suppkey_19)
-                                                        scan lineitem
+                                                        dynamic filter (["partkey_18", "suppkey_19", "suppkey_19"])
+                                                            scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["partkey", "suppkey_5"])
                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                     remote exchange (REPARTITION, HASH, ["partkey"])
-                                                        scan partsupp
+                                                        dynamic filter (["partkey", "suppkey_5"])
+                                                            scan partsupp
                                                     final aggregation over (partkey_11)
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["partkey_11"])
@@ -30,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["suppkey"])
                         join (INNER, REPLICATED):
-                            scan supplier
+                            dynamic filter (["nationkey"])
+                                scan supplier
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q21.plan.txt
index a5c8b20e6ec8..91b44cd52391 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q21.plan.txt
@@ -11,16 +11,19 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (commitdate, name, name_9, nationkey, orderkey_13, orderstatus, receiptdate, suppkey_0, unique_54)
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["orderkey_13"])
-                                                    scan lineitem
+                                                    dynamic filter (["orderkey_13"])
+                                                        scan lineitem
                                                 local exchange (GATHER, SINGLE, [])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["orderkey"])
                                                             join (INNER, REPLICATED):
-                                                                scan lineitem
+                                                                dynamic filter (["orderkey", "suppkey_0"])
+                                                                    scan lineitem
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, REPLICATED):
-                                                                            scan supplier
+                                                                            dynamic filter (["nationkey"])
+                                                                                scan supplier
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q22.plan.txt
index eba30d3c79d1..520878bed01b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/partitioned/q22.plan.txt
@@ -8,7 +8,8 @@ remote exchange (GATHER, SINGLE, [])
                             join (LEFT, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     cross join:
-                                        scan customer
+                                        dynamic filter (["acctbal"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over ()
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q02.plan.txt
index 358da707a03d..bc5e2e079616 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q02.plan.txt
@@ -8,15 +8,18 @@ remote exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["partkey_19"])
                                 partial aggregation over (partkey_19)
                                     join (INNER, REPLICATED):
-                                        scan partsupp
+                                        dynamic filter (["partkey_19", "suppkey_20"])
+                                            scan partsupp
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan supplier
+                                                    dynamic filter (["nationkey_29"])
+                                                        scan supplier
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan nation
+                                                                dynamic filter (["regionkey_37"])
+                                                                    scan nation
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan region
@@ -26,18 +29,21 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["suppkey_5"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["partkey_4"])
-                                            scan partsupp
+                                            dynamic filter (["partkey_4", "suppkey_5"])
+                                                scan partsupp
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["partkey"])
                                                 scan part
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["suppkey"])
                                         join (INNER, REPLICATED):
-                                            scan supplier
+                                            dynamic filter (["nationkey"])
+                                                scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan nation
+                                                        dynamic filter (["regionkey"])
+                                                            scan nation
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan region
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q03.plan.txt
index f5cf1c82bd37..6b43a2922b47 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q03.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 partial aggregation over (orderdate, orderkey_4, shippriority)
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                            scan lineitem
+                            dynamic filter (["orderkey_4"])
+                                scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                        scan orders
+                                        dynamic filter (["custkey_0"])
+                                            scan orders
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["custkey"])
                                             scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q04.plan.txt
index 91dcfd113534..655ae9102c9b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q04.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                             partial aggregation over (orderkey_0)
-                                                scan lineitem
+                                                dynamic filter (["orderkey_0"])
+                                                    scan lineitem
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey"])
                                         scan orders
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q05.plan.txt
index 8d476b717a72..552e5f5d8101 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q05.plan.txt
@@ -9,20 +9,24 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["nationkey", "suppkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                                            scan lineitem
+                                            dynamic filter (["orderkey_4", "suppkey"])
+                                                scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                                        scan orders
+                                                        dynamic filter (["custkey_0"])
+                                                            scan orders
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["custkey"])
                                                             join (INNER, REPLICATED):
-                                                                scan customer
+                                                                dynamic filter (["nationkey", "nationkey"])
+                                                                    scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, REPLICATED):
-                                                                            scan nation
+                                                                            dynamic filter (["nationkey_17", "regionkey"])
+                                                                                scan nation
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan region
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q07.plan.txt
index 64d5f1fecd08..eb126c8e6c5d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q07.plan.txt
@@ -9,22 +9,26 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                                            scan orders
+                                            dynamic filter (["custkey", "orderkey_4"])
+                                                scan orders
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                                 join (INNER, REPLICATED):
-                                                    scan lineitem
+                                                    dynamic filter (["suppkey_0"])
+                                                        scan lineitem
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan supplier
+                                                                dynamic filter (["nationkey"])
+                                                                    scan supplier
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan nation
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["custkey_8"])
                                         join (INNER, REPLICATED):
-                                            scan customer
+                                            dynamic filter (["nationkey_11"])
+                                                scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q08.plan.txt
index 88f8a11f4445..6bf9dc00784b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q08.plan.txt
@@ -12,28 +12,33 @@ remote exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["custkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["orderkey_9"])
-                                                        scan orders
+                                                        dynamic filter (["custkey", "orderkey_9"])
+                                                            scan orders
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["orderkey"])
                                                             join (INNER, REPLICATED):
-                                                                scan lineitem
+                                                                dynamic filter (["partkey_4", "suppkey_5"])
+                                                                    scan lineitem
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan part
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey_13"])
                                                     join (INNER, REPLICATED):
-                                                        scan customer
+                                                        dynamic filter (["nationkey_16"])
+                                                            scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
-                                                                    scan nation
+                                                                    dynamic filter (["regionkey"])
+                                                                        scan nation
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan region
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["suppkey"])
-                                            scan supplier
+                                            dynamic filter (["nationkey"])
+                                                scan supplier
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q09.plan.txt
index a55a51f232bd..fdb31d6425ed 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q09.plan.txt
@@ -13,13 +13,16 @@ remote exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["suppkey_5"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["partkey_4"])
-                                                            scan lineitem
+                                                            dynamic filter (["orderkey", "partkey_4", "partkey_4", "suppkey_5", "suppkey_5"])
+                                                                scan lineitem
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["partkey"])
-                                                                scan part
+                                                                dynamic filter (["partkey"])
+                                                                    scan part
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["suppkey"])
-                                                        scan supplier
+                                                        dynamic filter (["nationkey", "suppkey"])
+                                                            scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["suppkey_10"])
                                                     scan partsupp
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q10.plan.txt
index 7ab0ad56a3f1..1d813f011e8f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q10.plan.txt
@@ -6,12 +6,14 @@ local exchange (GATHER, SINGLE, [])
                     join (INNER, REPLICATED):
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["custkey_4"])
-                                scan customer
+                                dynamic filter (["custkey_4", "nationkey"])
+                                    scan customer
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey"])
-                                            scan lineitem
+                                            dynamic filter (["orderkey"])
+                                                scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                                 scan orders
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q11.plan.txt
index bfc5af4b5bb2..23b8747ebbc8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q11.plan.txt
@@ -7,11 +7,13 @@ remote exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             partial aggregation over (partkey)
                                 join (INNER, REPLICATED):
-                                    scan partsupp
+                                    dynamic filter (["suppkey"])
+                                        scan partsupp
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan supplier
+                                                dynamic filter (["nationkey"])
+                                                    scan supplier
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan nation
@@ -22,11 +24,13 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         join (INNER, REPLICATED):
-                                            scan partsupp
+                                            dynamic filter (["suppkey_10"])
+                                                scan partsupp
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan supplier
+                                                        dynamic filter (["nationkey_19"])
+                                                            scan supplier
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q12.plan.txt
index 7fb5b836dfa9..78a29b890283 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q12.plan.txt
@@ -7,7 +7,8 @@ remote exchange (GATHER, SINGLE, [])
                         partial aggregation over (shipmode)
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["orderkey"])
-                                    scan orders
+                                    dynamic filter (["orderkey"])
+                                        scan orders
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                         scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q13.plan.txt
index e30665fcb33b..e730726f91ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q13.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over (custkey)
                                         join (RIGHT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                                scan orders
+                                                dynamic filter (["custkey_0"])
+                                                    scan orders
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                                     scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q14.plan.txt
index e46c0418a759..e19b87ce562d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q14.plan.txt
@@ -4,7 +4,8 @@ final aggregation over ()
             partial aggregation over ()
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["partkey_0"])
-                        scan part
+                        dynamic filter (["partkey_0"])
+                            scan part
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q15.plan.txt
index b9a65952a467..7658f101858e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q15.plan.txt
@@ -4,7 +4,8 @@ remote exchange (GATHER, SINGLE, [])
             join (INNER, REPLICATED):
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["suppkey"])
-                        scan supplier
+                        dynamic filter (["suppkey"])
+                            scan supplier
                     final aggregation over (suppkey_0)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["suppkey_0"])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q16.plan.txt
index bd14aff914fd..a1efdba535c6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q16.plan.txt
@@ -12,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["suppkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["partkey"])
-                                                        scan partsupp
+                                                        dynamic filter (["partkey"])
+                                                            scan partsupp
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["partkey_0"])
                                                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q17.plan.txt
index 30539653b56b..87f067c1d9e9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q17.plan.txt
@@ -8,11 +8,13 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["partkey_5"])
                                     partial aggregation over (partkey_5)
-                                        scan lineitem
+                                        dynamic filter (["partkey_5"])
+                                            scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["partkey"])
                                 join (INNER, REPLICATED):
-                                    scan lineitem
+                                    dynamic filter (["partkey"])
+                                        scan lineitem
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q18.plan.txt
index 296a79e4c9cf..b5af485ab287 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q18.plan.txt
@@ -9,13 +9,15 @@ local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["custkey_0"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey"])
-                                            scan orders
+                                            dynamic filter (["custkey_0", "orderkey", "orderkey"])
+                                                scan orders
                                         single aggregation over (orderkey_8)
                                             final aggregation over (orderkey_8)
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["orderkey_8"])
                                                         partial aggregation over (orderkey_8)
-                                                            scan lineitem
+                                                            dynamic filter (["orderkey_8"])
+                                                                scan lineitem
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["custkey"])
                                         scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q19.plan.txt
index e46c0418a759..e19b87ce562d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q19.plan.txt
@@ -4,7 +4,8 @@ final aggregation over ()
             partial aggregation over ()
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["partkey_0"])
-                        scan part
+                        dynamic filter (["partkey_0"])
+                            scan part
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q20.plan.txt
index cb79004dac3a..c8ab7dea8470 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q20.plan.txt
@@ -12,12 +12,14 @@ remote exchange (GATHER, SINGLE, [])
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["partkey_18", "suppkey_19"])
                                                     partial aggregation over (partkey_18, suppkey_19)
-                                                        scan lineitem
+                                                        dynamic filter (["partkey_18", "suppkey_19", "suppkey_19"])
+                                                            scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["partkey", "suppkey_5"])
                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                     remote exchange (REPARTITION, HASH, ["partkey"])
-                                                        scan partsupp
+                                                        dynamic filter (["partkey", "suppkey_5"])
+                                                            scan partsupp
                                                     final aggregation over (partkey_11)
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["partkey_11"])
@@ -30,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["suppkey"])
                         join (INNER, REPLICATED):
-                            scan supplier
+                            dynamic filter (["nationkey"])
+                                scan supplier
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q21.plan.txt
index 313eb576ce37..ec175600cf53 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q21.plan.txt
@@ -11,19 +11,23 @@ local exchange (GATHER, SINGLE, [])
                                         partial aggregation over (commitdate, name, name_9, nationkey, orderkey_13, orderstatus, receiptdate, suppkey_0, unique_54)
                                             join (INNER, PARTITIONED):
                                                 remote exchange (REPARTITION, HASH, ["orderkey_13"])
-                                                    scan lineitem
+                                                    dynamic filter (["orderkey_13"])
+                                                        scan lineitem
                                                 local exchange (GATHER, SINGLE, [])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                                                            scan orders
+                                                            dynamic filter (["orderkey_4"])
+                                                                scan orders
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                                                 join (INNER, REPLICATED):
-                                                                    scan lineitem
+                                                                    dynamic filter (["suppkey_0"])
+                                                                        scan lineitem
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             join (INNER, REPLICATED):
-                                                                                scan supplier
+                                                                                dynamic filter (["nationkey"])
+                                                                                    scan supplier
                                                                                 local exchange (GATHER, SINGLE, [])
                                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                                         scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q22.plan.txt
index eba30d3c79d1..520878bed01b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/orc/unpartitioned/q22.plan.txt
@@ -8,7 +8,8 @@ remote exchange (GATHER, SINGLE, [])
                             join (LEFT, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     cross join:
-                                        scan customer
+                                        dynamic filter (["acctbal"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over ()
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q02.plan.txt
index 075fb157c432..7542f4c5507a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q02.plan.txt
@@ -8,15 +8,18 @@ remote exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["partkey_19"])
                                 partial aggregation over (partkey_19)
                                     join (INNER, REPLICATED):
-                                        scan partsupp
+                                        dynamic filter (["partkey_19", "suppkey_20"])
+                                            scan partsupp
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan supplier
+                                                    dynamic filter (["nationkey_29"])
+                                                        scan supplier
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan nation
+                                                                dynamic filter (["regionkey_37"])
+                                                                    scan nation
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan region
@@ -25,18 +28,21 @@ remote exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["suppkey_5"])
                                     join (INNER, REPLICATED):
-                                        scan partsupp
+                                        dynamic filter (["partkey_4", "suppkey_5"])
+                                            scan partsupp
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan part
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["suppkey"])
                                         join (INNER, REPLICATED):
-                                            scan supplier
+                                            dynamic filter (["nationkey"])
+                                                scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan nation
+                                                        dynamic filter (["regionkey"])
+                                                            scan nation
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan region
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q03.plan.txt
index f5cf1c82bd37..6b43a2922b47 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q03.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 partial aggregation over (orderdate, orderkey_4, shippriority)
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                            scan lineitem
+                            dynamic filter (["orderkey_4"])
+                                scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                        scan orders
+                                        dynamic filter (["custkey_0"])
+                                            scan orders
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["custkey"])
                                             scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q04.plan.txt
index 91dcfd113534..655ae9102c9b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q04.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                             partial aggregation over (orderkey_0)
-                                                scan lineitem
+                                                dynamic filter (["orderkey_0"])
+                                                    scan lineitem
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey"])
                                         scan orders
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q05.plan.txt
index 8d476b717a72..552e5f5d8101 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q05.plan.txt
@@ -9,20 +9,24 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["nationkey", "suppkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                                            scan lineitem
+                                            dynamic filter (["orderkey_4", "suppkey"])
+                                                scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                                        scan orders
+                                                        dynamic filter (["custkey_0"])
+                                                            scan orders
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["custkey"])
                                                             join (INNER, REPLICATED):
-                                                                scan customer
+                                                                dynamic filter (["nationkey", "nationkey"])
+                                                                    scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, REPLICATED):
-                                                                            scan nation
+                                                                            dynamic filter (["nationkey_17", "regionkey"])
+                                                                                scan nation
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan region
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q07.plan.txt
index 64d5f1fecd08..eb126c8e6c5d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q07.plan.txt
@@ -9,22 +9,26 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                                            scan orders
+                                            dynamic filter (["custkey", "orderkey_4"])
+                                                scan orders
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                                 join (INNER, REPLICATED):
-                                                    scan lineitem
+                                                    dynamic filter (["suppkey_0"])
+                                                        scan lineitem
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan supplier
+                                                                dynamic filter (["nationkey"])
+                                                                    scan supplier
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan nation
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["custkey_8"])
                                         join (INNER, REPLICATED):
-                                            scan customer
+                                            dynamic filter (["nationkey_11"])
+                                                scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q08.plan.txt
index 88f8a11f4445..6bf9dc00784b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q08.plan.txt
@@ -12,28 +12,33 @@ remote exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["custkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["orderkey_9"])
-                                                        scan orders
+                                                        dynamic filter (["custkey", "orderkey_9"])
+                                                            scan orders
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["orderkey"])
                                                             join (INNER, REPLICATED):
-                                                                scan lineitem
+                                                                dynamic filter (["partkey_4", "suppkey_5"])
+                                                                    scan lineitem
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan part
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey_13"])
                                                     join (INNER, REPLICATED):
-                                                        scan customer
+                                                        dynamic filter (["nationkey_16"])
+                                                            scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
-                                                                    scan nation
+                                                                    dynamic filter (["regionkey"])
+                                                                        scan nation
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan region
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["suppkey"])
-                                            scan supplier
+                                            dynamic filter (["nationkey"])
+                                                scan supplier
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q09.plan.txt
index a55a51f232bd..fdb31d6425ed 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q09.plan.txt
@@ -13,13 +13,16 @@ remote exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["suppkey_5"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["partkey_4"])
-                                                            scan lineitem
+                                                            dynamic filter (["orderkey", "partkey_4", "partkey_4", "suppkey_5", "suppkey_5"])
+                                                                scan lineitem
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["partkey"])
-                                                                scan part
+                                                                dynamic filter (["partkey"])
+                                                                    scan part
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["suppkey"])
-                                                        scan supplier
+                                                        dynamic filter (["nationkey", "suppkey"])
+                                                            scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["suppkey_10"])
                                                     scan partsupp
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q10.plan.txt
index 7ab0ad56a3f1..1d813f011e8f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q10.plan.txt
@@ -6,12 +6,14 @@ local exchange (GATHER, SINGLE, [])
                     join (INNER, REPLICATED):
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["custkey_4"])
-                                scan customer
+                                dynamic filter (["custkey_4", "nationkey"])
+                                    scan customer
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey"])
-                                            scan lineitem
+                                            dynamic filter (["orderkey"])
+                                                scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                                 scan orders
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q11.plan.txt
index bfc5af4b5bb2..23b8747ebbc8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q11.plan.txt
@@ -7,11 +7,13 @@ remote exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             partial aggregation over (partkey)
                                 join (INNER, REPLICATED):
-                                    scan partsupp
+                                    dynamic filter (["suppkey"])
+                                        scan partsupp
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan supplier
+                                                dynamic filter (["nationkey"])
+                                                    scan supplier
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan nation
@@ -22,11 +24,13 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         join (INNER, REPLICATED):
-                                            scan partsupp
+                                            dynamic filter (["suppkey_10"])
+                                                scan partsupp
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan supplier
+                                                        dynamic filter (["nationkey_19"])
+                                                            scan supplier
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q12.plan.txt
index 7fb5b836dfa9..78a29b890283 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q12.plan.txt
@@ -7,7 +7,8 @@ remote exchange (GATHER, SINGLE, [])
                         partial aggregation over (shipmode)
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["orderkey"])
-                                    scan orders
+                                    dynamic filter (["orderkey"])
+                                        scan orders
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                         scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q13.plan.txt
index e30665fcb33b..e730726f91ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q13.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over (custkey)
                                         join (RIGHT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                                scan orders
+                                                dynamic filter (["custkey_0"])
+                                                    scan orders
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                                     scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q14.plan.txt
index e46c0418a759..e19b87ce562d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q14.plan.txt
@@ -4,7 +4,8 @@ final aggregation over ()
             partial aggregation over ()
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["partkey_0"])
-                        scan part
+                        dynamic filter (["partkey_0"])
+                            scan part
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q15.plan.txt
index b9a65952a467..7658f101858e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q15.plan.txt
@@ -4,7 +4,8 @@ remote exchange (GATHER, SINGLE, [])
             join (INNER, REPLICATED):
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["suppkey"])
-                        scan supplier
+                        dynamic filter (["suppkey"])
+                            scan supplier
                     final aggregation over (suppkey_0)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["suppkey_0"])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q16.plan.txt
index bd14aff914fd..a1efdba535c6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q16.plan.txt
@@ -12,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["suppkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["partkey"])
-                                                        scan partsupp
+                                                        dynamic filter (["partkey"])
+                                                            scan partsupp
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["partkey_0"])
                                                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q17.plan.txt
index 30539653b56b..87f067c1d9e9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q17.plan.txt
@@ -8,11 +8,13 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["partkey_5"])
                                     partial aggregation over (partkey_5)
-                                        scan lineitem
+                                        dynamic filter (["partkey_5"])
+                                            scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["partkey"])
                                 join (INNER, REPLICATED):
-                                    scan lineitem
+                                    dynamic filter (["partkey"])
+                                        scan lineitem
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q18.plan.txt
index 65c3835cf86a..f90cfa8176d7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q18.plan.txt
@@ -5,14 +5,16 @@ local exchange (GATHER, SINGLE, [])
                 partial aggregation over (custkey_0, name, orderdate, orderkey_4, totalprice)
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                            scan lineitem
+                            dynamic filter (["orderkey_4"])
+                                scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["orderkey"])
-                                                scan orders
+                                                dynamic filter (["custkey_0", "orderkey"])
+                                                    scan orders
                                             single aggregation over (orderkey_8)
                                                 final aggregation over (orderkey_8)
                                                     local exchange (GATHER, SINGLE, [])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q19.plan.txt
index fa00639798fe..3280029142dd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q19.plan.txt
@@ -4,7 +4,8 @@ final aggregation over ()
             partial aggregation over ()
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["partkey"])
-                        scan lineitem
+                        dynamic filter (["partkey"])
+                            scan lineitem
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey_0"])
                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q20.plan.txt
index cb79004dac3a..c8ab7dea8470 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q20.plan.txt
@@ -12,12 +12,14 @@ remote exchange (GATHER, SINGLE, [])
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["partkey_18", "suppkey_19"])
                                                     partial aggregation over (partkey_18, suppkey_19)
-                                                        scan lineitem
+                                                        dynamic filter (["partkey_18", "suppkey_19", "suppkey_19"])
+                                                            scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["partkey", "suppkey_5"])
                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                     remote exchange (REPARTITION, HASH, ["partkey"])
-                                                        scan partsupp
+                                                        dynamic filter (["partkey", "suppkey_5"])
+                                                            scan partsupp
                                                     final aggregation over (partkey_11)
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["partkey_11"])
@@ -30,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["suppkey"])
                         join (INNER, REPLICATED):
-                            scan supplier
+                            dynamic filter (["nationkey"])
+                                scan supplier
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q21.plan.txt
index 7d0cc36c8856..6422bcb9e7e6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q21.plan.txt
@@ -9,22 +9,26 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (commitdate, exists, name, name_9, nationkey, orderkey_13, orderstatus, receiptdate, suppkey_0, unique)
                                     join (RIGHT, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey_32"])
-                                            scan lineitem
+                                            dynamic filter (["orderkey_32"])
+                                                scan lineitem
                                         final aggregation over (commitdate, name, name_9, nationkey, orderkey_13, orderstatus, receiptdate, suppkey_0, unique_54)
                                             local exchange (GATHER, SINGLE, [])
                                                 partial aggregation over (commitdate, name, name_9, nationkey, orderkey_13, orderstatus, receiptdate, suppkey_0, unique_54)
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["orderkey_13"])
-                                                            scan lineitem
+                                                            dynamic filter (["orderkey_13"])
+                                                                scan lineitem
                                                         local exchange (GATHER, SINGLE, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["orderkey"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan lineitem
+                                                                        dynamic filter (["orderkey", "suppkey_0"])
+                                                                            scan lineitem
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 join (INNER, REPLICATED):
-                                                                                    scan supplier
+                                                                                    dynamic filter (["nationkey"])
+                                                                                        scan supplier
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q22.plan.txt
index eba30d3c79d1..520878bed01b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/partitioned/q22.plan.txt
@@ -8,7 +8,8 @@ remote exchange (GATHER, SINGLE, [])
                             join (LEFT, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     cross join:
-                                        scan customer
+                                        dynamic filter (["acctbal"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over ()
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q02.plan.txt
index 075fb157c432..7542f4c5507a 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q02.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q02.plan.txt
@@ -8,15 +8,18 @@ remote exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["partkey_19"])
                                 partial aggregation over (partkey_19)
                                     join (INNER, REPLICATED):
-                                        scan partsupp
+                                        dynamic filter (["partkey_19", "suppkey_20"])
+                                            scan partsupp
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 join (INNER, REPLICATED):
-                                                    scan supplier
+                                                    dynamic filter (["nationkey_29"])
+                                                        scan supplier
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan nation
+                                                                dynamic filter (["regionkey_37"])
+                                                                    scan nation
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan region
@@ -25,18 +28,21 @@ remote exchange (GATHER, SINGLE, [])
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["suppkey_5"])
                                     join (INNER, REPLICATED):
-                                        scan partsupp
+                                        dynamic filter (["partkey_4", "suppkey_5"])
+                                            scan partsupp
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 scan part
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["suppkey"])
                                         join (INNER, REPLICATED):
-                                            scan supplier
+                                            dynamic filter (["nationkey"])
+                                                scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan nation
+                                                        dynamic filter (["regionkey"])
+                                                            scan nation
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan region
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q03.plan.txt
index f5cf1c82bd37..6b43a2922b47 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q03.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q03.plan.txt
@@ -5,12 +5,14 @@ local exchange (GATHER, SINGLE, [])
                 partial aggregation over (orderdate, orderkey_4, shippriority)
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                            scan lineitem
+                            dynamic filter (["orderkey_4"])
+                                scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                        scan orders
+                                        dynamic filter (["custkey_0"])
+                                            scan orders
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["custkey"])
                                             scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q04.plan.txt
index 91dcfd113534..655ae9102c9b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q04.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q04.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                             partial aggregation over (orderkey_0)
-                                                scan lineitem
+                                                dynamic filter (["orderkey_0"])
+                                                    scan lineitem
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey"])
                                         scan orders
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q05.plan.txt
index 8d476b717a72..552e5f5d8101 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q05.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q05.plan.txt
@@ -9,20 +9,24 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["nationkey", "suppkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                                            scan lineitem
+                                            dynamic filter (["orderkey_4", "suppkey"])
+                                                scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                                        scan orders
+                                                        dynamic filter (["custkey_0"])
+                                                            scan orders
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["custkey"])
                                                             join (INNER, REPLICATED):
-                                                                scan customer
+                                                                dynamic filter (["nationkey", "nationkey"])
+                                                                    scan customer
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         join (INNER, REPLICATED):
-                                                                            scan nation
+                                                                            dynamic filter (["nationkey_17", "regionkey"])
+                                                                                scan nation
                                                                             local exchange (GATHER, SINGLE, [])
                                                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                                                     scan region
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q07.plan.txt
index 64d5f1fecd08..eb126c8e6c5d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q07.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q07.plan.txt
@@ -9,22 +9,26 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                                            scan orders
+                                            dynamic filter (["custkey", "orderkey_4"])
+                                                scan orders
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                                 join (INNER, REPLICATED):
-                                                    scan lineitem
+                                                    dynamic filter (["suppkey_0"])
+                                                        scan lineitem
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             join (INNER, REPLICATED):
-                                                                scan supplier
+                                                                dynamic filter (["nationkey"])
+                                                                    scan supplier
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan nation
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["custkey_8"])
                                         join (INNER, REPLICATED):
-                                            scan customer
+                                            dynamic filter (["nationkey_11"])
+                                                scan customer
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q08.plan.txt
index 88f8a11f4445..6bf9dc00784b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q08.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q08.plan.txt
@@ -12,28 +12,33 @@ remote exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["custkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["orderkey_9"])
-                                                        scan orders
+                                                        dynamic filter (["custkey", "orderkey_9"])
+                                                            scan orders
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["orderkey"])
                                                             join (INNER, REPLICATED):
-                                                                scan lineitem
+                                                                dynamic filter (["partkey_4", "suppkey_5"])
+                                                                    scan lineitem
                                                                 local exchange (GATHER, SINGLE, [])
                                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                                         scan part
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey_13"])
                                                     join (INNER, REPLICATED):
-                                                        scan customer
+                                                        dynamic filter (["nationkey_16"])
+                                                            scan customer
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 join (INNER, REPLICATED):
-                                                                    scan nation
+                                                                    dynamic filter (["regionkey"])
+                                                                        scan nation
                                                                     local exchange (GATHER, SINGLE, [])
                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                             scan region
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["suppkey"])
-                                            scan supplier
+                                            dynamic filter (["nationkey"])
+                                                scan supplier
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPLICATE, BROADCAST, [])
                                         scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q09.plan.txt
index a55a51f232bd..fdb31d6425ed 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q09.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q09.plan.txt
@@ -13,13 +13,16 @@ remote exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["suppkey_5"])
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["partkey_4"])
-                                                            scan lineitem
+                                                            dynamic filter (["orderkey", "partkey_4", "partkey_4", "suppkey_5", "suppkey_5"])
+                                                                scan lineitem
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["partkey"])
-                                                                scan part
+                                                                dynamic filter (["partkey"])
+                                                                    scan part
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPARTITION, HASH, ["suppkey"])
-                                                        scan supplier
+                                                        dynamic filter (["nationkey", "suppkey"])
+                                                            scan supplier
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["suppkey_10"])
                                                     scan partsupp
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q10.plan.txt
index 7ab0ad56a3f1..1d813f011e8f 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q10.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q10.plan.txt
@@ -6,12 +6,14 @@ local exchange (GATHER, SINGLE, [])
                     join (INNER, REPLICATED):
                         join (INNER, PARTITIONED):
                             remote exchange (REPARTITION, HASH, ["custkey_4"])
-                                scan customer
+                                dynamic filter (["custkey_4", "nationkey"])
+                                    scan customer
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     join (INNER, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey"])
-                                            scan lineitem
+                                            dynamic filter (["orderkey"])
+                                                scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                                 scan orders
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q11.plan.txt
index bfc5af4b5bb2..23b8747ebbc8 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q11.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q11.plan.txt
@@ -7,11 +7,13 @@ remote exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             partial aggregation over (partkey)
                                 join (INNER, REPLICATED):
-                                    scan partsupp
+                                    dynamic filter (["suppkey"])
+                                        scan partsupp
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             join (INNER, REPLICATED):
-                                                scan supplier
+                                                dynamic filter (["nationkey"])
+                                                    scan supplier
                                                 local exchange (GATHER, SINGLE, [])
                                                     remote exchange (REPLICATE, BROADCAST, [])
                                                         scan nation
@@ -22,11 +24,13 @@ remote exchange (GATHER, SINGLE, [])
                                 remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over ()
                                         join (INNER, REPLICATED):
-                                            scan partsupp
+                                            dynamic filter (["suppkey_10"])
+                                                scan partsupp
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     join (INNER, REPLICATED):
-                                                        scan supplier
+                                                        dynamic filter (["nationkey_19"])
+                                                            scan supplier
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                 scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q12.plan.txt
index 7fb5b836dfa9..78a29b890283 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q12.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q12.plan.txt
@@ -7,7 +7,8 @@ remote exchange (GATHER, SINGLE, [])
                         partial aggregation over (shipmode)
                             join (INNER, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["orderkey"])
-                                    scan orders
+                                    dynamic filter (["orderkey"])
+                                        scan orders
                                 local exchange (GATHER, SINGLE, [])
                                     remote exchange (REPARTITION, HASH, ["orderkey_0"])
                                         scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q13.plan.txt
index e30665fcb33b..e730726f91ea 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q13.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q13.plan.txt
@@ -10,7 +10,8 @@ remote exchange (GATHER, SINGLE, [])
                                     partial aggregation over (custkey)
                                         join (RIGHT, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["custkey_0"])
-                                                scan orders
+                                                dynamic filter (["custkey_0"])
+                                                    scan orders
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                                     scan customer
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q14.plan.txt
index e46c0418a759..e19b87ce562d 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q14.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q14.plan.txt
@@ -4,7 +4,8 @@ final aggregation over ()
             partial aggregation over ()
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["partkey_0"])
-                        scan part
+                        dynamic filter (["partkey_0"])
+                            scan part
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey"])
                             scan lineitem
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q15.plan.txt
index b9a65952a467..7658f101858e 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q15.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q15.plan.txt
@@ -4,7 +4,8 @@ remote exchange (GATHER, SINGLE, [])
             join (INNER, REPLICATED):
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["suppkey"])
-                        scan supplier
+                        dynamic filter (["suppkey"])
+                            scan supplier
                     final aggregation over (suppkey_0)
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["suppkey_0"])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q16.plan.txt
index bd14aff914fd..a1efdba535c6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q16.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q16.plan.txt
@@ -12,7 +12,8 @@ remote exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["suppkey"])
                                                 join (INNER, PARTITIONED):
                                                     remote exchange (REPARTITION, HASH, ["partkey"])
-                                                        scan partsupp
+                                                        dynamic filter (["partkey"])
+                                                            scan partsupp
                                                     local exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPARTITION, HASH, ["partkey_0"])
                                                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q17.plan.txt
index 30539653b56b..87f067c1d9e9 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q17.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q17.plan.txt
@@ -8,11 +8,13 @@ final aggregation over ()
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPARTITION, HASH, ["partkey_5"])
                                     partial aggregation over (partkey_5)
-                                        scan lineitem
+                                        dynamic filter (["partkey_5"])
+                                            scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["partkey"])
                                 join (INNER, REPLICATED):
-                                    scan lineitem
+                                    dynamic filter (["partkey"])
+                                        scan lineitem
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPLICATE, BROADCAST, [])
                                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q18.plan.txt
index 65c3835cf86a..f90cfa8176d7 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q18.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q18.plan.txt
@@ -5,14 +5,16 @@ local exchange (GATHER, SINGLE, [])
                 partial aggregation over (custkey_0, name, orderdate, orderkey_4, totalprice)
                     join (INNER, PARTITIONED):
                         remote exchange (REPARTITION, HASH, ["orderkey_4"])
-                            scan lineitem
+                            dynamic filter (["orderkey_4"])
+                                scan lineitem
                         local exchange (GATHER, SINGLE, [])
                             remote exchange (REPARTITION, HASH, ["orderkey"])
                                 join (INNER, PARTITIONED):
                                     remote exchange (REPARTITION, HASH, ["custkey_0"])
                                         join (INNER, PARTITIONED):
                                             remote exchange (REPARTITION, HASH, ["orderkey"])
-                                                scan orders
+                                                dynamic filter (["custkey_0", "orderkey"])
+                                                    scan orders
                                             single aggregation over (orderkey_8)
                                                 final aggregation over (orderkey_8)
                                                     local exchange (GATHER, SINGLE, [])
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q19.plan.txt
index fa00639798fe..3280029142dd 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q19.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q19.plan.txt
@@ -4,7 +4,8 @@ final aggregation over ()
             partial aggregation over ()
                 join (INNER, PARTITIONED):
                     remote exchange (REPARTITION, HASH, ["partkey"])
-                        scan lineitem
+                        dynamic filter (["partkey"])
+                            scan lineitem
                     local exchange (GATHER, SINGLE, [])
                         remote exchange (REPARTITION, HASH, ["partkey_0"])
                             scan part
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q20.plan.txt
index cb79004dac3a..c8ab7dea8470 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q20.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q20.plan.txt
@@ -12,12 +12,14 @@ remote exchange (GATHER, SINGLE, [])
                                             local exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPARTITION, HASH, ["partkey_18", "suppkey_19"])
                                                     partial aggregation over (partkey_18, suppkey_19)
-                                                        scan lineitem
+                                                        dynamic filter (["partkey_18", "suppkey_19", "suppkey_19"])
+                                                            scan lineitem
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPARTITION, HASH, ["partkey", "suppkey_5"])
                                                 join (INNER, PARTITIONED, can skip output duplicates):
                                                     remote exchange (REPARTITION, HASH, ["partkey"])
-                                                        scan partsupp
+                                                        dynamic filter (["partkey", "suppkey_5"])
+                                                            scan partsupp
                                                     final aggregation over (partkey_11)
                                                         local exchange (GATHER, SINGLE, [])
                                                             remote exchange (REPARTITION, HASH, ["partkey_11"])
@@ -30,7 +32,8 @@ remote exchange (GATHER, SINGLE, [])
                 local exchange (GATHER, SINGLE, [])
                     remote exchange (REPARTITION, HASH, ["suppkey"])
                         join (INNER, REPLICATED):
-                            scan supplier
+                            dynamic filter (["nationkey"])
+                                scan supplier
                             local exchange (GATHER, SINGLE, [])
                                 remote exchange (REPLICATE, BROADCAST, [])
                                     scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q21.plan.txt
index 7d0cc36c8856..6422bcb9e7e6 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q21.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q21.plan.txt
@@ -9,22 +9,26 @@ local exchange (GATHER, SINGLE, [])
                                 partial aggregation over (commitdate, exists, name, name_9, nationkey, orderkey_13, orderstatus, receiptdate, suppkey_0, unique)
                                     join (RIGHT, PARTITIONED):
                                         remote exchange (REPARTITION, HASH, ["orderkey_32"])
-                                            scan lineitem
+                                            dynamic filter (["orderkey_32"])
+                                                scan lineitem
                                         final aggregation over (commitdate, name, name_9, nationkey, orderkey_13, orderstatus, receiptdate, suppkey_0, unique_54)
                                             local exchange (GATHER, SINGLE, [])
                                                 partial aggregation over (commitdate, name, name_9, nationkey, orderkey_13, orderstatus, receiptdate, suppkey_0, unique_54)
                                                     join (INNER, PARTITIONED):
                                                         remote exchange (REPARTITION, HASH, ["orderkey_13"])
-                                                            scan lineitem
+                                                            dynamic filter (["orderkey_13"])
+                                                                scan lineitem
                                                         local exchange (GATHER, SINGLE, [])
                                                             join (INNER, PARTITIONED):
                                                                 remote exchange (REPARTITION, HASH, ["orderkey"])
                                                                     join (INNER, REPLICATED):
-                                                                        scan lineitem
+                                                                        dynamic filter (["orderkey", "suppkey_0"])
+                                                                            scan lineitem
                                                                         local exchange (GATHER, SINGLE, [])
                                                                             remote exchange (REPLICATE, BROADCAST, [])
                                                                                 join (INNER, REPLICATED):
-                                                                                    scan supplier
+                                                                                    dynamic filter (["nationkey"])
+                                                                                        scan supplier
                                                                                     local exchange (GATHER, SINGLE, [])
                                                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                                                             scan nation
diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q22.plan.txt
index eba30d3c79d1..520878bed01b 100644
--- a/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q22.plan.txt
+++ b/testing/trino-tests/src/test/resources/sql/presto/tpch/iceberg/parquet/unpartitioned/q22.plan.txt
@@ -8,7 +8,8 @@ remote exchange (GATHER, SINGLE, [])
                             join (LEFT, PARTITIONED):
                                 remote exchange (REPARTITION, HASH, ["custkey"])
                                     cross join:
-                                        scan customer
+                                        dynamic filter (["acctbal"])
+                                            scan customer
                                         local exchange (GATHER, SINGLE, [])
                                             remote exchange (REPLICATE, BROADCAST, [])
                                                 final aggregation over ()